diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index e1b9078ec3f..c538614fd0f 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -19,11 +19,11 @@
 #
 ##############################################################################
 {
-    "name" : "eInvoicing",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "category": 'Accounting & Finance',
-    "description": """
+    'name' : 'eInvoicing',
+    'version' : '1.1',
+    'author' : 'OpenERP SA',
+    'category' : 'Accounting & Finance',
+    'description' : """
 Accounting and Financial Management.
 ====================================
 
@@ -44,14 +44,13 @@ Creates a dashboard for accountants that includes:
     * Company Analysis
     * Graph of Treasury
 
-The processes like maintaining of general ledger is done through the defined financial Journals (entry move line orgrouping is maintained through journal) for a particular
-financial year and for preparation of vouchers there is a module named account_voucher.
+The processes like maintaining of general ledger is done through the defined financial Journals (entry move line orgrouping is maintained through journal) 
+for a particular financial year and for preparation of vouchers there is a module named account_voucher.
     """,
     'website': 'http://www.openerp.com',
     'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
-    'init_xml': [],
-    "depends" : ["base_setup", "product", "analytic", "process", "board", "edi"],
-    'update_xml': [
+    'depends' : ['base_setup', 'product', 'analytic', 'process', 'board', 'edi'],
+    'data': [
         'security/account_security.xml',
         'security/ir.model.access.csv',
         'account_menuitem.xml',
@@ -64,6 +63,8 @@ financial year and for preparation of vouchers there is a module named account_v
         'wizard/account_use_model_view.xml',
         'account_installer.xml',
         'wizard/account_period_close_view.xml',
+        'wizard/account_reconcile_view.xml',
+        'wizard/account_unreconcile_view.xml',
         'account_view.xml',
         'account_report.xml',
         'account_financial_report_data.xml',
@@ -86,14 +87,12 @@ financial year and for preparation of vouchers there is a module named account_v
         'wizard/account_journal_select_view.xml',
         'wizard/account_change_currency_view.xml',
         'wizard/account_validate_move_view.xml',
-        'wizard/account_unreconcile_view.xml',
         'wizard/account_report_general_ledger_view.xml',
         'wizard/account_invoice_state_view.xml',
         'wizard/account_report_partner_balance_view.xml',
         'wizard/account_report_account_balance_view.xml',
         'wizard/account_report_aged_partner_balance_view.xml',
         'wizard/account_report_partner_ledger_view.xml',
-        'wizard/account_reconcile_view.xml',
         'wizard/account_reconcile_partner_process_view.xml',
         'wizard/account_automatic_reconcile_view.xml',
         'wizard/account_financial_report_view.xml',
@@ -122,12 +121,20 @@ financial year and for preparation of vouchers there is a module named account_v
         'ir_sequence_view.xml',
         'company_view.xml',
         'board_account_view.xml',
-        "edi/invoice_action_data.xml",
-        "account_bank_view.xml",
-        "res_config_view.xml",
-        "account_pre_install.yml"
+        'edi/invoice_action_data.xml',
+        'account_bank_view.xml',
+        'res_config_view.xml',
+        'account_pre_install.yml'
     ],
-    'demo_xml': [
+    'js': [
+        'static/src/js/account_move_reconciliation.js',
+    ],
+    'qweb' : [
+        "static/src/xml/account_move_reconciliation.xml",
+    ],
+    'css':['static/src/css/account_move_reconciliation.css'
+    ],
+    'demo': [
         'demo/account_demo.xml',
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',
@@ -152,6 +159,5 @@ financial year and for preparation of vouchers there is a module named account_v
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0080331923549',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/account.py b/addons/account/account.py
index fa30b20f2ca..cfba30856a9 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -30,6 +30,8 @@ from osv import fields, osv
 import decimal_precision as dp
 from tools.translate import _
 from tools.float_utils import float_round
+from openerp import SUPERUSER_ID
+import tools
 
 _logger = logging.getLogger(__name__)
 
@@ -109,7 +111,7 @@ class account_payment_term_line(osv.osv):
         'days': fields.integer('Number of Days', required=True, help="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."),
         'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
-        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True),
+        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True, ondelete='cascade'),
     }
     _defaults = {
         'value': 'balance',
@@ -153,6 +155,7 @@ class account_account_type(osv.osv):
         return res
 
     def _save_report_type(self, cr, uid, account_type_id, field_name, field_value, arg, context=None):
+        field_value = field_value or 'none'
         obj_data = self.pool.get('ir.model.data')
         obj_financial_report = self.pool.get('account.financial.report')
         #unlink if it exists somewhere in the financial reports related to BS or PL
@@ -179,7 +182,7 @@ class account_account_type(osv.osv):
  'Balance' will generally be used for cash accounts.
  'Detail' will copy each existing journal item of the previous year, even the reconciled ones.
  'Unreconciled' will copy only the journal items that were unreconciled on the first day of the new fiscal year."""),
-        'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category',
+        'report_type': fields.function(_get_current_report_type, fnct_inv=_save_report_type, type='selection', string='P&L / BS Category', store=True,
             selection= [('none','/'),
                         ('income', _('Profit & Loss (Income account)')),
                         ('expense', _('Profit & Loss (Expense account)')),
@@ -225,7 +228,7 @@ class account_account(osv.osv):
         while pos < len(args):
 
             if args[pos][0] == 'code' and args[pos][1] in ('like', 'ilike') and args[pos][2]:
-                args[pos] = ('code', '=like', str(args[pos][2].replace('%', ''))+'%')
+                args[pos] = ('code', '=like', tools.ustr(args[pos][2].replace('%', ''))+'%')
             if args[pos][0] == 'journal_id':
                 if not args[pos][2]:
                     del args[pos]
@@ -297,7 +300,6 @@ class account_account(osv.osv):
             if aml_query.strip():
                 wheres.append(aml_query.strip())
             filters = " AND ".join(wheres)
-            _logger.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.:
@@ -313,7 +315,6 @@ class account_account(osv.osv):
                        " GROUP BY l.account_id")
             params = (tuple(children_and_consolidated),) + query_params
             cr.execute(request, params)
-            _logger.debug('Status: %s',(cr.statusmessage))
 
             for row in cr.dictfetchall():
                 accounts[row['id']] = row
@@ -540,10 +541,18 @@ class account_account(osv.osv):
                 return False
         return True
 
+    def _check_company_account(self, cr, uid, ids, context=None):
+        for account in self.browse(cr, uid, ids, context=context):
+            if account.parent_id:
+                if account.company_id != account.parent_id.company_id:
+                    return False
+        return True
+
     _constraints = [
         (_check_recursion, 'Error!\nYou cannot create recursive accounts.', ['parent_id']),
         (_check_type, 'Configuration Error!\nYou cannot define children to an account with internal type different of "View".', ['type']),
         (_check_account_type, 'Configuration Error!\nYou cannot select an account type with a deferral method different of "Unreconciled" for accounts with internal type "Payable/Receivable".', ['user_type','type']),
+        (_check_company_account, 'Error!\nYou cannot create an account which has parent account of different company.', ['parent_id']),
     ]
     _sql_constraints = [
         ('code_company_uniq', 'unique (code,company_id)', 'The code of the account must be unique per company !')
@@ -582,6 +591,8 @@ class account_account(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
+        if isinstance(ids, (int, long)):
+                    ids = [ids]
         reads = self.read(cr, uid, ids, ['name', 'code'], context=context)
         res = []
         for record in reads:
@@ -591,13 +602,13 @@ class account_account(osv.osv):
             res.append((record['id'], name))
         return res
 
-    def copy(self, cr, uid, id, default={}, context=None, done_list=[], local=False):
+    def copy(self, cr, uid, id, default=None, context=None, done_list=None, local=False):
+        default = {} if default is None else default.copy()
+        if done_list is None:
+            done_list = []
         account = self.browse(cr, uid, id, context=context)
         new_child_ids = []
-        if not default:
-            default = {}
-        default = default.copy()
-        default['code'] = (account['code'] or '') + '(copy)'
+        default.update(code=_("%s (copy)") % (account['code'] or ''))
         if not local:
             done_list = []
         if account.id in done_list:
@@ -678,7 +689,7 @@ class account_journal_view(osv.osv):
     _name = "account.journal.view"
     _description = "Journal View"
     _columns = {
-        'name': fields.char('Journal View', size=64, required=True),
+        'name': fields.char('Journal View', size=64, required=True, translate=True),
         'columns_id': fields.one2many('account.journal.column', 'view_id', 'Columns')
     }
     _order = "name"
@@ -744,9 +755,11 @@ class account_journal(osv.osv):
         'profit_account_id' : fields.many2one('account.account', 'Profit Account'),
         'loss_account_id' : fields.many2one('account.account', 'Loss Account'),
         'internal_account_id' : fields.many2one('account.account', 'Internal Transfers Account', select=1),
+        'cash_control' : fields.boolean('Cash Control', help='If you want the journal should be control at opening/closing, check this option'),
     }
 
     _defaults = {
+        'cash_control' : False,
         'with_last_closing_balance' : False,
         'user_id': lambda self, cr, uid, context: uid,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
@@ -771,14 +784,15 @@ class account_journal(osv.osv):
         (_check_currency, 'Configuration error!\nThe currency chosen should be shared by the default accounts too.', ['currency','default_debit_account_id','default_credit_account_id']),
     ]
 
-    def copy(self, cr, uid, id, default={}, context=None, done_list=[], local=False):
+    def copy(self, cr, uid, id, default=None, context=None, done_list=None, local=False):
+        default = {} if default is None else default.copy()
+        if done_list is None:
+            done_list = []
         journal = self.browse(cr, uid, id, context=context)
-        if not default:
-            default = {}
-        default = default.copy()
-        default['code'] = (journal['code'] or '') + '(copy)'
-        default['name'] = (journal['name'] or '') + '(copy)'
-        default['sequence_id'] = False
+        default.update(
+            code=_("%s (copy)") % (journal['code'] or ''),
+            name=_("%s (copy)") % (journal['name'] or ''),
+            sequence_id=False)
         return super(account_journal, self).copy(cr, uid, id, default, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -815,7 +829,7 @@ class account_journal(osv.osv):
         if not 'sequence_id' in vals or not vals['sequence_id']:
             # if we have the right to create a journal, we should be able to
             # create it's sequence.
-            vals.update({'sequence_id': self.create_sequence(cr, 1, vals, context)})
+            vals.update({'sequence_id': self.create_sequence(cr, SUPERUSER_ID, vals, context)})
         return super(account_journal, self).create(cr, uid, vals, context)
 
     def name_get(self, cr, user, ids, context=None):
@@ -830,6 +844,10 @@ class account_journal(osv.osv):
 
         @return: Returns a list of tupples containing id, name
         """
+        if not ids:
+            return []
+        if isinstance(ids, (int, long)):
+            ids = [ids]
         result = self.browse(cr, user, ids, context=context)
         res = []
         for rs in result:
@@ -997,7 +1015,7 @@ class account_period(osv.osv):
         'date_stop': fields.date('End of Period', required=True, states={'done':[('readonly',True)]}),
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
         'state': fields.selection([('draft','Open'), ('done','Closed')], 'Status', readonly=True,
-                                  help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
+                                  help='When monthly periods are created. The status is \'Draft\'. At the end of monthly period it is in \'Done\' status.'),
         'company_id': fields.related('fiscalyear_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
     _defaults = {
@@ -1124,7 +1142,7 @@ class account_journal_period(osv.osv):
         'icon': fields.function(_icon_get, string='Icon', type='char', size=32),
         'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."),
         'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'Status', required=True, readonly=True,
-                                  help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
+                                  help='When journal period is created. The status is \'Draft\'. If a report is printed it comes to \'Printed\' status. When all transactions are done, it comes in \'Done\' status.'),
         'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
         'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True)
     }
@@ -1167,7 +1185,8 @@ class account_fiscalyear(osv.osv):
         'end_journal_period_id':fields.many2one('account.journal.period','End of Year Entries Journal', readonly=True),
     }
 
-    def copy(self, cr, uid, id, default={}, context=None):
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = {} if default is None else default.copy()
         default.update({
             'period_ids': [],
             'end_journal_period_id': False
@@ -1271,7 +1290,7 @@ class account_move(osv.osv):
         'period_id': fields.many2one('account.period', 'Period', required=True, states={'posted':[('readonly',True)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, states={'posted':[('readonly',True)]}),
         'state': fields.selection([('draft','Unposted'), ('posted','Posted')], 'Status', required=True, readonly=True,
-            help='All manually created new journal entries are usually in the state \'Unposted\', but you can set the option to skip that state on the related journal. In that case, they will behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' state.'),
+            help='All manually created new journal entries are usually in the status \'Unposted\', but you can set the option to skip that status on the related journal. In that case, they will behave as journal entries automatically created by the system on document validation (invoices, bank statements...) and will be created in \'Posted\' status.'),
         'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}),
         'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'),
         'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True),
@@ -1369,7 +1388,7 @@ class account_move(osv.osv):
         balance = 0.0
         for line in line_ids:
             if line[2]:
-                balance += (line[2]['debit'] or 0.00)- (line[2]['credit'] or 0.00)
+                balance += (line[2].get('debit',0.00)- (line[2].get('credit',0.00)))
         return {'value': {'balance': balance}}
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -1392,7 +1411,7 @@ class account_move(osv.osv):
                 if not l[0]:
                     l[2].update({
                         'reconcile_id':False,
-                        'reconcil_partial_id':False,
+                        'reconcile_partial_id':False,
                         'analytic_lines':False,
                         'invoice':False,
                         'ref':False,
@@ -1420,15 +1439,18 @@ class account_move(osv.osv):
         if 'line_id' in vals:
             c = context.copy()
             c['novalidate'] = True
+            c['period_id'] = vals['period_id']
+            c['journal_id'] = vals['journal_id']
+            c['date'] = vals['date']
             result = super(account_move, self).create(cr, uid, vals, c)
             self.validate(cr, uid, [result], context)
         else:
             result = super(account_move, self).create(cr, uid, vals, context)
         return result
 
-    def copy(self, cr, uid, id, default={}, context=None):
-        if context is None:
-            context = {}
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = {} if default is None else default.copy()
+        context = {} if context is None else context.copy()
         default.update({
             'state':'draft',
             'name':'/',
@@ -1854,7 +1876,7 @@ class account_tax(osv.osv):
 
     def get_precision_tax():
         def change_digit_tax(cr):
-            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account')
             return (16, res+2)
         return change_digit_tax
 
@@ -1897,7 +1919,7 @@ class account_tax(osv.osv):
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
         'company_id': fields.many2one('res.company', 'Company', required=True),
-        'description': fields.char('Tax Code',size=32),
+        'description': fields.char('Tax Code'),
         'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
         'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
 
@@ -2258,7 +2280,10 @@ class account_model(osv.osv):
     _defaults = {
         'legend': lambda self, cr, uid, context:_('You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s: To Specify Year \n%(month)s: To Specify Month \n%(date)s: Current Date\n\ne.g. My model on %(date)s'),
     }
-    def generate(self, cr, uid, ids, datas={}, context=None):
+
+    def generate(self, cr, uid, ids, data=None, context=None):
+        if data is None:
+            data = {}
         move_ids = []
         entry = {}
         account_move_obj = self.pool.get('account.move')
@@ -2269,8 +2294,8 @@ class account_model(osv.osv):
         if context is None:
             context = {}
 
-        if datas.get('date', False):
-            context.update({'date': datas['date']})
+        if data.get('date', False):
+            context.update({'date': data['date']})
 
         move_date = context.get('date', time.strftime('%Y-%m-%d'))
         move_date = datetime.strptime(move_date,"%Y-%m-%d")
@@ -2332,6 +2357,16 @@ class account_model(osv.osv):
 
         return move_ids
 
+    def onchange_journal_id(self, cr, uid, ids, journal_id, context=None):
+        company_id = False
+
+        if journal_id:
+            journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
+            if journal.company_id.id:
+                company_id = journal.company_id.id
+
+        return {'value': {'company_id': company_id}}
+
 account_model()
 
 class account_model_line(osv.osv):
@@ -2446,10 +2481,10 @@ class account_subscription_line(osv.osv):
         all_moves = []
         obj_model = self.pool.get('account.model')
         for line in self.browse(cr, uid, ids, context=context):
-            datas = {
+            data = {
                 'date': line.date,
             }
-            move_ids = obj_model.generate(cr, uid, [line.subscription_id.model_id.id], datas, context)
+            move_ids = obj_model.generate(cr, uid, [line.subscription_id.model_id.id], data, context)
             tocheck[line.subscription_id.id] = True
             self.write(cr, uid, [line.id], {'move_id':move_ids[0]})
             all_moves.extend(move_ids)
@@ -2497,7 +2532,7 @@ class account_account_template(osv.osv):
         'reconcile': fields.boolean('Allow Reconciliation', help="Check this option if you want the user to reconcile entries in this account."),
         'shortcut': fields.char('Shortcut', size=12),
         'note': fields.text('Note'),
-        'parent_id': fields.many2one('account.account.template', 'Parent Account Template', ondelete='cascade'),
+        'parent_id': fields.many2one('account.account.template', 'Parent Account Template', ondelete='cascade', domain=[('type','=','view')]),
         'child_parent_ids':fields.one2many('account.account.template', 'parent_id', 'Children'),
         'tax_ids': fields.many2many('account.tax.template', 'account_account_template_tax_rel', 'account_id', 'tax_id', 'Default Taxes'),
         'nocreate': fields.boolean('Optional create', help="If checked, the new chart of accounts will not contain this by default."),
@@ -2510,20 +2545,9 @@ class account_account_template(osv.osv):
         'nocreate': False,
     }
 
-    def _check_type(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        accounts = self.browse(cr, uid, ids, context=context)
-        for account in accounts:
-            if account.parent_id and account.parent_id.type != 'view':
-                return False
-        return True
-
     _check_recursion = check_cycle
     _constraints = [
         (_check_recursion, 'Error!\nYou cannot create recursive account templates.', ['parent_id']),
-        (_check_type, 'Configuration Error!\nYou cannot define children to an account that has internal type other than  "View".', ['type']),
-
     ]
 
     def name_get(self, cr, uid, ids, context=None):
@@ -2755,7 +2779,6 @@ class account_chart_template(osv.osv):
         'property_account_income_categ': fields.many2one('account.account.template', 'Income Category Account'),
         'property_account_expense': fields.many2one('account.account.template', 'Expense Account on Product Template'),
         'property_account_income': fields.many2one('account.account.template', 'Income Account on Product Template'),
-        'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
         'property_account_income_opening': fields.many2one('account.account.template', 'Opening Entries Income Account'),
         'property_account_expense_opening': fields.many2one('account.account.template', 'Opening Entries Expense Account'),
     }
@@ -2804,7 +2827,7 @@ class account_tax_template(osv.osv):
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."),
-        'description': fields.char('Internal Name', size=32),
+        'description': fields.char('Internal Name'),
         'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Use In', required=True,),
         'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
     }
@@ -2993,6 +3016,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
     _columns = {
         'company_id':fields.many2one('res.company', 'Company', required=True),
+        'currency_id': fields.many2one('res.currency', 'Currency', help="Currency as per company's country."),
         'only_one_chart_template': fields.boolean('Only One Chart Template Available'),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
         'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Cash and Banks', required=True),
@@ -3003,6 +3027,13 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         'purchase_tax_rate': fields.float('Purchase Tax(%)'),
         'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'),
     }
+
+    def onchange_company_id(self, cr, uid, ids, company_id, context=None):
+        currency_id = False
+        if company_id:
+            currency_id = self.pool.get('res.company').browse(cr, uid, company_id, context=context).currency_id.id
+        return {'value': {'currency_id': currency_id}}
+
     def onchange_tax_rate(self, cr, uid, ids, rate=False, context=None):
         return {'value': {'purchase_tax_rate': rate or False}}
 
@@ -3033,6 +3064,13 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             res.update({'bank_accounts_id': [{'acc_name': _('Cash'), 'account_type': 'cash'},{'acc_name': _('Bank'), 'account_type': 'bank'}]})
         if 'company_id' in fields:
             res.update({'company_id': self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0].company_id.id})
+        if 'currency_id' in fields:
+            company_id = res.get('company_id') or False
+            if company_id:
+                company_obj = self.pool.get('res.company')
+                country_id = company_obj.browse(cr, uid, company_id, context=context).country_id.id
+                currency_id = company_obj.on_change_country(cr, uid, company_id, country_id, context=context)['value']['currency_id']
+                res.update({'currency_id': currency_id})
 
         ids = self.pool.get('account.chart.template').search(cr, uid, [('visible', '=', True)], context=context)
         if ids:
@@ -3188,7 +3226,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             ('property_account_income_categ','product.category','account.account'),
             ('property_account_expense','product.template','account.account'),
             ('property_account_income','product.template','account.account'),
-            ('property_reserve_and_surplus_account','res.company','account.account')
         ]
         template = self.pool.get('account.chart.template').browse(cr, uid, chart_template_id, context=context)
         for record in todo_list:
@@ -3211,7 +3248,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                     property_obj.create(cr, uid, vals, context=context)
         return True
 
-    def _install_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, acc_ref={}, taxes_ref={}, tax_code_ref={}, context=None):
+    def _install_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, acc_ref=None, taxes_ref=None, tax_code_ref=None, context=None):
         '''
         This function recursively loads the template objects and create the real objects from them.
 
@@ -3229,6 +3266,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             * a last identical containing the mapping of tax code templates and tax codes
         :rtype: tuple(dict, dict, dict)
         '''
+        if acc_ref is None:
+            acc_ref = {}
+        if taxes_ref is None:
+            taxes_ref = {}
+        if tax_code_ref is None:
+            tax_code_ref = {}
         template = self.pool.get('account.chart.template').browse(cr, uid, template_id, context=context)
         if template.parent_id:
             tmp1, tmp2, tmp3 = self._install_template(cr, uid, template.parent_id.id, company_id, code_digits=code_digits, acc_ref=acc_ref, taxes_ref=taxes_ref, tax_code_ref=tax_code_ref, context=context)
@@ -3241,7 +3284,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         tax_code_ref.update(tmp3)
         return acc_ref, taxes_ref, tax_code_ref
 
-    def _load_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, account_ref={}, taxes_ref={}, tax_code_ref={}, context=None):
+    def _load_template(self, cr, uid, template_id, company_id, code_digits=None, obj_wizard=None, account_ref=None, taxes_ref=None, tax_code_ref=None, context=None):
         '''
         This function generates all the objects from the templates
 
@@ -3259,6 +3302,12 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             * a last identical containing the mapping of tax code templates and tax codes
         :rtype: tuple(dict, dict, dict)
         '''
+        if account_ref is None:
+            account_ref = {}
+        if taxes_ref is None:
+            taxes_ref = {}
+        if tax_code_ref is None:
+            tax_code_ref = {}
         template = self.pool.get('account.chart.template').browse(cr, uid, template_id, context=context)
         obj_tax_code_template = self.pool.get('account.tax.code.template')
         obj_acc_tax = self.pool.get('account.tax')
@@ -3337,19 +3386,18 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         ir_values_obj = self.pool.get('ir.values')
         obj_wizard = self.browse(cr, uid, ids[0])
         company_id = obj_wizard.company_id.id
+        self.pool.get('res.company').write(cr, uid, [company_id], {'currency_id': obj_wizard.currency_id.id})
         # If the floats for sale/purchase rates have been filled, create templates from them
         self._create_tax_templates_from_rates(cr, uid, obj_wizard, company_id, context=context)
 
         # Install all the templates objects and generate the real objects
         acc_template_ref, taxes_ref, tax_code_ref = self._install_template(cr, uid, obj_wizard.chart_template_id.id, company_id, code_digits=obj_wizard.code_digits, obj_wizard=obj_wizard, context=context)
 
-        # write values of default taxes for product
+        # write values of default taxes for product as super user
         if obj_wizard.sale_tax and taxes_ref:
-            ir_values_obj.set(cr, uid, key='default', key2=False, name="taxes_id", company=company_id,
-                                models =[('product.product',False)], value=[taxes_ref[obj_wizard.sale_tax.id]])
+            ir_values_obj.set_default(cr, SUPERUSER_ID, 'product.product', "taxes_id", [taxes_ref[obj_wizard.sale_tax.id]], for_all_users=True, company_id=company_id)
         if obj_wizard.purchase_tax and taxes_ref:
-                ir_values_obj.set(cr, uid, key='default', key2=False, name="supplier_taxes_id", company=company_id,
-                                models =[('product.product',False)], value=[taxes_ref[obj_wizard.purchase_tax.id]])
+            ir_values_obj.set_default(cr, SUPERUSER_ID, 'product.product', "supplier_taxes_id", [taxes_ref[obj_wizard.purchase_tax.id]], for_all_users=True, company_id=company_id)
 
         # Create Bank journals
         self._create_bank_journals_from_o2m(cr, uid, obj_wizard, company_id, acc_template_ref, context=context)
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 2117f6e49ea..066f8d1abec 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -39,7 +39,6 @@ class account_analytic_line(osv.osv):
     }
 
     _defaults = {
-        'date': fields.date.context_today,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
     }
     _order = 'date desc'
@@ -108,7 +107,7 @@ class account_analytic_line(osv.osv):
         if journal_id:
             journal = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
             if journal.type == 'sale':
-                product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context)
+                product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context=context)
                 if product_price_type_ids:
                     pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
         # Take the company currency as the reference one
diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py
index ef146128a67..2323f8aaa8a 100644
--- a/addons/account/account_bank.py
+++ b/addons/account/account_bank.py
@@ -29,12 +29,12 @@ class bank(osv.osv):
         'currency_id': fields.related('journal_id', 'currency', type="many2one", relation='res.currency', readonly=True,
             string="Currency", help="Currency of the related account journal."),
     }
-    def create(self, cr, uid, data, context={}):
+    def create(self, cr, uid, data, context=None):
         result = super(bank, self).create(cr, uid, data, context=context)
         self.post_write(cr, uid, [result], context=context)
         return result
 
-    def write(self, cr, uid, ids, data, context={}):
+    def write(self, cr, uid, ids, data, context=None):
         result = super(bank, self).write(cr, uid, ids, data, context=context)
         self.post_write(cr, uid, ids, context=context)
         return result
@@ -43,13 +43,17 @@ class bank(osv.osv):
         "Return the name to use when creating a bank journal"
         return (bank.bank_name or '') + ' ' + bank.acc_number
 
-    def _prepare_name_get(self, cr, uid, bank_type_obj, bank_obj, context=None):
-        """Add ability to have %(currency_name)s in the format_layout of
-        res.partner.bank.type"""
-        bank_obj._data[bank_obj.id]['currency_name'] = bank_obj.currency_id and bank_obj.currency_id.name or ''
-        return super(bank, self)._prepare_name_get(cr, uid, bank_type_obj, bank_obj, context=context)
+    def _prepare_name_get(self, cr, uid, bank_dicts, context=None):
+        """Add ability to have %(currency_name)s in the format_layout of res.partner.bank.type"""
+        currency_ids = list(set(data['currency_id'][0] for data in bank_dicts if data['currency_id']))
+        currencies = self.pool.get('res.currency').browse(cr, uid, currency_ids, context=context)
+        currency_name = dict((currency.id, currency.name) for currency in currencies)
 
-    def post_write(self, cr, uid, ids, context={}):
+        for data in bank_dicts:
+            data['currency_name'] = data['currency_id'] and currency_name[data['currency_id'][0]] or ''
+        return super(bank, self)._prepare_name_get(cr, uid, bank_dicts, context=context)
+
+    def post_write(self, cr, uid, ids, context=None):
         if isinstance(ids, (int, long)):
           ids = [ids]
 
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 8df291a98d1..4422537007f 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -61,7 +61,7 @@ class account_bank_statement(osv.osv):
         return res
 
     def _get_period(self, cr, uid, context=None):
-        periods = self.pool.get('account.period').find(cr, uid)
+        periods = self.pool.get('account.period').find(cr, uid,context=context)
         if periods:
             return periods[0]
         return False
@@ -123,8 +123,8 @@ class account_bank_statement(osv.osv):
                                    ('open','Open'), # used by cash statements
                                    ('confirm', 'Closed')],
                                    'Status', required=True, readonly="1",
-                                   help='When new statement is created the state will be \'Draft\'.\n'
-                                        'And after getting confirmation from the bank it will be in \'Confirmed\' state.'),
+                                   help='When new statement is created the status will be \'Draft\'.\n'
+                                        'And after getting confirmation from the bank it will be in \'Confirmed\' status.'),
         'currency': fields.function(_currency, string='Currency',
             type='many2one', relation='res.currency'),
         'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'),
@@ -304,7 +304,7 @@ class account_bank_statement(osv.osv):
             'date': st_line.date,
             'ref': st_line.ref,
             'move_id': move_id,
-            'partner_id': partner_id,
+            'partner_id': par_id,
             'account_id': acc_id,
             'credit': credit,
             'debit': debit,
@@ -430,7 +430,7 @@ class account_bank_statement(osv.osv):
                     'name': st_number,
                     'balance_end_real': st.balance_end
             }, context=context)
-            self.message_append_note(cr, uid, [st.id], body=_('Statement %s is confirmed, journal items are created.') % (st_number,), context=context)
+            self.message_post(cr, uid, [st.id], body=_('Statement %s confirmed, journal items were created.') % (st_number,), context=context)
         return self.write(cr, uid, ids, {'state':'confirm'}, context=context)
 
     def button_cancel(self, cr, uid, ids, context=None):
@@ -447,20 +447,24 @@ class account_bank_statement(osv.osv):
         return self.write(cr, uid, done, {'state':'draft'}, context=context)
 
     def _compute_balance_end_real(self, cr, uid, journal_id, context=None):
-        cr.execute('SELECT balance_end_real \
-                FROM account_bank_statement \
-                WHERE journal_id = %s AND NOT state = %s \
-                ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
-        res = cr.fetchone()
+        res = False
+        if journal_id:
+            cr.execute('SELECT balance_end_real \
+                    FROM account_bank_statement \
+                    WHERE journal_id = %s AND NOT state = %s \
+                    ORDER BY date DESC,id DESC LIMIT 1', (journal_id, 'draft'))
+            res = cr.fetchone()
         return res and res[0] or 0.0
 
     def onchange_journal_id(self, cr, uid, statement_id, journal_id, context=None):
+        if not journal_id:
+            return {}
         balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context)
 
-        journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id', 'company_id'], context=context)
-        account_id = journal_data['default_debit_account_id']
+        journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['company_id', 'currency'], context=context)
         company_id = journal_data['company_id']
-        return {'value': {'balance_start': balance_start, 'account_id': account_id, 'company_id': company_id}}
+        currency_id = journal_data['currency'] or self.pool.get('res.company').browse(cr, uid, company_id[0], context=context).currency_id.id
+        return {'value': {'balance_start': balance_start, 'company_id': company_id, 'currency': currency_id}}
 
     def unlink(self, cr, uid, ids, context=None):
         stat = self.read(cr, uid, ids, ['state'], context=context)
@@ -482,6 +486,19 @@ class account_bank_statement(osv.osv):
         default['move_line_ids'] = []
         return super(account_bank_statement, self).copy(cr, uid, id, default, context=context)
 
+    def button_journal_entries(self, cr, uid, ids, context=None):
+      ctx = (context or {}).copy()
+      ctx['journal_id'] = self.browse(cr, uid, ids[0], context=context).journal_id.id
+      return {
+        'view_type':'form',
+        'view_mode':'tree',
+        'res_model':'account.move.line',
+        'view_id':False,
+        'type':'ir.actions.act_window',
+        'domain':[('statement_id','in',ids)],
+        'context':ctx,
+      }
+
 account_bank_statement()
 
 class account_bank_statement_line(osv.osv):
diff --git a/addons/account/account_bank_view.xml b/addons/account/account_bank_view.xml
index 8ceb8a91885..ef793a1bef5 100644
--- a/addons/account/account_bank_view.xml
+++ b/addons/account/account_bank_view.xml
@@ -15,7 +15,7 @@
                 <group name="accounting" col="2" colspan="2" attrs="{'invisible': [('company_id','=', False)]}">
                     <separator string="Accounting Information" colspan="2"/>
                     <field name="journal_id"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                 </group>
             </group>
         </field>
@@ -28,7 +28,7 @@
         <field name="inherit_id" ref="base.view_partner_bank_tree"/>
         <field name="arch" type="xml">
             <field name="acc_number" position="after">
-                <field name="currency_id"/>
+                <field name="currency_id" groups="base.group_multi_currency"/>
             </field>
         </field>
     </record>
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index 9af0dcf60f4..c1f30824461 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -78,7 +78,7 @@ class account_cash_statement(osv.osv):
         """
         res = {}
         for statement in self.browse(cr, uid, ids, context=context):
-            if statement.journal_id.type not in ('cash',):
+            if (statement.journal_id.type not in ('cash',)) or (not statement.journal_id.cash_control):
                 continue
             start = end = 0
             for line in statement.details_ids:
@@ -194,12 +194,27 @@ class account_cash_statement(osv.osv):
             journal = self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context)
         if journal and (journal.type == 'cash') and not vals.get('details_ids'):
             vals['details_ids'] = []
+
+            last_pieces = None
+
+            if journal.with_last_closing_balance == True:
+                domain = [('journal_id', '=', journal.id),
+                          ('state', '=', 'confirm')]
+                last_bank_statement_ids = self.search(cr, uid, domain, limit=1, order='create_date desc', context=context)
+                if last_bank_statement_ids:
+                    last_bank_statement = self.browse(cr, uid, last_bank_statement_ids[0], context=context)
+
+                    last_pieces = dict(
+                        (line.pieces, line.number_closing) for line in last_bank_statement.details_ids
+                    )
+
             for value in journal.cashbox_line_ids:
                 nested_values = {
                     'number_closing' : 0,
-                    'number_opening' : 0,
+                    'number_opening' : last_pieces.get(value.pieces, 0) if isinstance(last_pieces, dict) else 0,
                     'pieces' : value.pieces
                 }
+
                 vals['details_ids'].append([0, False, nested_values])
 
         res_id = super(account_cash_statement, self).create(cr, uid, vals, context=context)
@@ -274,13 +289,13 @@ class account_cash_statement(osv.osv):
         super(account_cash_statement, self).button_confirm_bank(cr, uid, ids, context=context)
         absl_proxy = self.pool.get('account.bank.statement.line')
 
-        TABLES = (('Profit', 'profit_account_id'), ('Loss', 'loss_account_id'),)
+        TABLES = ((_('Profit'), 'profit_account_id'), (_('Loss'), 'loss_account_id'),)
 
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.difference == 0.0:
                 continue
 
-            for item_label, item_account in TALBES:
+            for item_label, item_account in TABLES:
                 if getattr(obj.journal_id, item_account):
                     raise osv.except_osv(_('Error!'),
                                          _('There is no %s Account on the journal %s.') % (item_label, obj.journal_id.name,))
diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index c92d4eda602..58e824a6250 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -14,8 +14,12 @@
                     </footer>
                 </footer>
                 <separator string="title" position="replace">
+                    <p class="oe_grey">
+                        Select a configuration package to setup automatically your
+                        taxes and chart of accounts.
+                    </p>
                     <group>
-                        <field name="charts"/>
+                        <field name="charts" class="oe_inline"/>
                     </group>
                     <group string="Configure your Fiscal Year" groups="account.group_account_user">
                         <field name="has_default_company" invisible="1" />
@@ -32,7 +36,7 @@
         </record>
 
         <record id="action_account_configuration_installer" model="ir.actions.act_window">
-            <field name="name">Configure your Chart of Accounts</field>
+            <field name="name">Configure Accounting Data</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.installer</field>
             <field name="view_id" ref="view_account_configuration_installer"/>
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 012bde42eff..3e86c4963b7 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -185,6 +185,7 @@ class account_invoice(osv.osv):
     _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)]}),
+        'supplier_invoice_number': fields.char('Supplier Invoice Number', size=64, help="The reference of this invoice as provided by the supplier.", readonly=True, states={'draft':[('readonly',False)]}),
         'type': fields.selection([
             ('out_invoice','Customer Invoice'),
             ('in_invoice','Supplier Invoice'),
@@ -206,15 +207,15 @@ class account_invoice(osv.osv):
             ('open','Open'),
             ('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 \'Paid\' state is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled. \
-            \n* The \'Cancelled\' state is used when user cancel invoice.'),
+            ],'Status', select=True, readonly=True,
+            help=' * The \'Draft\' status is used when a user is encoding a new and unconfirmed Invoice. \
+            \n* The \'Pro-forma\' when invoice is in Pro-forma status,invoice does not have an invoice number. \
+            \n* The \'Open\' status is used when user create invoice,a invoice number is generated.Its in open status till user does not pay invoice. \
+            \n* The \'Paid\' status is set automatically when the invoice is paid. Its related journal entries may or may not be reconciled. \
+            \n* The \'Cancelled\' status is used when user cancel invoice.'),
         'sent': fields.boolean('Sent', readonly=True, help="It indicates that the invoice has been sent."),
         'date_invoice': fields.date('Invoice Date', readonly=True, states={'draft':[('readonly',False)]}, select=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)]}, select=True,
+        'date_due': fields.date('Due Date', readonly=True, states={'draft':[('readonly',False)]}, select=True,
             help="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."),
         'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}),
@@ -253,7 +254,7 @@ class account_invoice(osv.osv):
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Account'), states={'open':[('readonly',True)],'close':[('readonly',True)]}),
+        'check_total': fields.float('Verification Total', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
         'reconciled': fields.function(_reconciled, string='Paid/Reconciled', type='boolean',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ?
@@ -395,18 +396,24 @@ class account_invoice(osv.osv):
         template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
-        ctx = dict(context, active_model='account.invoice', active_id=ids[0])
-        ctx.update({'mail.compose.template_id': template_id})
+        ctx = dict(context)
+        ctx.update({
+            'default_model': 'account.invoice',
+            'default_res_id': ids[0],
+            'default_use_template': True,
+            'default_template_id': template_id,
+            'default_composition_mode': 'comment',
+            })
         return {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'mail.compose.message',
-                'views': [(res_id, 'form')],
-                'view_id': res_id,
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-                'context': ctx,
-                'nodestroy': True,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'mail.compose.message',
+            'views': [(res_id, 'form')],
+            'view_id': res_id,
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'context': ctx,
+            'nodestroy': True,
         }
 
     def confirm_paid(self, cr, uid, ids, context=None):
@@ -425,7 +432,7 @@ class account_invoice(osv.osv):
             if t['state'] in ('draft', 'cancel') and t['internal_number']== False:
                 unlink_ids.append(t['id'])
             else:
-                raise osv.except_osv(_('Invalid Action!'), _('You cannot delete an invoice which is open or paid. You should refund it instead.'))
+                raise osv.except_osv(_('Invalid Action!'), _('You can not delete an invoice which is not cancelled. You should refund it instead.'))
         osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
         return True
 
@@ -503,8 +510,10 @@ class account_invoice(osv.osv):
         if journal_id:
             journal = self.pool.get('account.journal').browse(cr, uid, journal_id, context=context)
             currency_id = journal.currency and journal.currency.id or journal.company_id.currency_id.id
+            company_id = journal.company_id.id
             result = {'value': {
                     'currency_id': currency_id,
+                    'company_id': company_id,
                     }
                 }
         return result
@@ -767,17 +776,20 @@ class account_invoice(osv.osv):
                 if not key in tax_key:
                     raise osv.except_osv(_('Warning!'), _('Taxes are missing!\nClick on compute button.'))
 
-    def compute_invoice_totals(self, cr, uid, inv, company_currency, ref, invoice_move_lines):
+    def compute_invoice_totals(self, cr, uid, inv, company_currency, ref, invoice_move_lines, context=None):
+        if context is None:
+            context={}
         total = 0
         total_currency = 0
         cur_obj = self.pool.get('res.currency')
         for i in invoice_move_lines:
             if inv.currency_id.id != company_currency:
+                context.update({'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
                 i['currency_id'] = inv.currency_id.id
                 i['amount_currency'] = i['price']
                 i['price'] = cur_obj.compute(cr, uid, inv.currency_id.id,
                         company_currency, i['price'],
-                        context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
+                        context=context)
             else:
                 i['amount_currency'] = False
                 i['currency_id'] = False
@@ -854,8 +866,11 @@ class account_invoice(osv.osv):
             self.check_tax_lines(cr, uid, inv, compute_taxes, ait_obj)
 
             # I disabled the check_total feature
-            #if inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0):
-            #    raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe real total does not match the computed total.'))
+            group_check_total_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'group_supplier_inv_check_total')[1]
+            group_check_total = self.pool.get('res.groups').browse(cr, uid, group_check_total_id, context=context)
+            if group_check_total and uid in [x.id for x in group_check_total.users]:
+                if (inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0)):
+                    raise osv.except_osv(_('Bad total !'), _('Please verify the price of the invoice !\nThe encoded total does not match the computed total.'))
 
             if inv.payment_term:
                 total_fixed = total_percent = 0
@@ -887,7 +902,7 @@ class account_invoice(osv.osv):
             # create one move line for the total and possibly adjust the other lines amount
             total = 0
             total_currency = 0
-            total, total_currency, iml = self.compute_invoice_totals(cr, uid, inv, company_currency, ref, iml)
+            total, total_currency, iml = self.compute_invoice_totals(cr, uid, inv, company_currency, ref, iml, context=ctx)
             acc_id = inv.account_id.id
 
             name = inv['name'] or '/'
@@ -969,13 +984,13 @@ class account_invoice(osv.osv):
                 for i in line:
                     i[2]['period_id'] = period_id
 
+            ctx.update(invoice=inv)
             move_id = move_obj.create(cr, uid, move, context=ctx)
             new_move_name = move_obj.browse(cr, uid, move_id, context=ctx).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}, context=ctx)
             # 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:
-            ctx.update({'invoice':inv})
             move_obj.post(cr, uid, [move_id], context=ctx)
         self._log_event(cr, uid, ids)
         return True
@@ -1045,7 +1060,7 @@ class account_invoice(osv.osv):
                 if obj_inv.type in ('out_invoice', 'out_refund'):
                     ctx = self.get_log_context(cr, uid, context=ctx)
                 message = _("Invoice  '%s' is validated.") % name
-                self.message_append_note(cr, uid, [inv_id], body=message, context=context)
+                self.message_post(cr, uid, [inv_id], body=message, context=context)
         return True
 
     def action_cancel(self, cr, uid, ids, *args):
@@ -1095,10 +1110,10 @@ class account_invoice(osv.osv):
         if not ids:
             return []
         types = {
-                'out_invoice': 'CI: ',
-                'in_invoice': 'SI: ',
-                'out_refund': 'OR: ',
-                'in_refund': 'SR: ',
+                'out_invoice': 'Invoice ',
+                'in_invoice': 'Sup. Invoice ',
+                'out_refund': 'Refund ',
+                'in_refund': 'Supplier Refund ',
                 }
         return [(r['id'], (r['number']) or types[r['type']] + (r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')]
 
@@ -1127,7 +1142,7 @@ class account_invoice(osv.osv):
         return map(lambda x: (0,0,x), lines)
 
     def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
-        invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id'])
+        invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id', 'company_id'])
         obj_invoice_line = self.pool.get('account.invoice.line')
         obj_invoice_tax = self.pool.get('account.invoice.tax')
         obj_journal = self.pool.get('account.journal')
@@ -1175,7 +1190,7 @@ class account_invoice(osv.osv):
                     'name': description,
                 })
             # take the id part of the tuple returned for many2one fields
-            for field in ('partner_id',
+            for field in ('partner_id', 'company_id',
                     'account_id', 'currency_id', 'payment_term', 'journal_id'):
                 invoice[field] = invoice[field] and invoice[field][0]
             # create the new invoice
@@ -1275,7 +1290,7 @@ class account_invoice(osv.osv):
             # TODO: use currency's formatting function
             msg = _("Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining).") % \
                     (name, pay_amount, code, invoice.amount_total, code, total, code)
-            self.message_append_note(cr, uid, [inv_id], body=msg, context=context)
+            self.message_post(cr, uid, [inv_id], body=msg, context=context)
             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
@@ -1288,26 +1303,29 @@ class account_invoice(osv.osv):
 
     def _get_document_type(self, type):
         type_dict = {
-                'out_invoice': 'Customer invoice',
-                'in_invoice': 'Supplier invoice',
-                'out_refund': 'Customer Refund',
-                'in_refund': 'Supplier Refund',
+                # Translation markers will have no effect at runtime, only used to properly flag export
+                'out_invoice': _('Customer invoice'),
+                'in_invoice': _('Supplier invoice'),
+                'out_refund': _('Customer Refund'),
+                'in_refund': _('Supplier Refund'),
         }
         return type_dict.get(type, 'Invoice')
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id],body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>created</b>.") % (self._get_document_type(obj.type)),
+                subtype="account.mt_invoice_new", context=context)
 
     def confirm_paid_send_note(self, cr, uid, ids, context=None):
          for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s <b>paid</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>paid</b>.") % (self._get_document_type(obj.type)),
+                subtype="account.mt_invoice_paid", context=context)
 
     def invoice_cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s <b>cancelled</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s <b>cancelled</b>.") % (self._get_document_type(obj.type)),
+                context=context)
 
-account_invoice()
 
 class account_invoice_line(osv.osv):
 
@@ -1346,7 +1364,8 @@ class account_invoice_line(osv.osv):
     _description = "Invoice Line"
     _columns = {
         'name': fields.text('Description', required=True),
-        'origin': fields.char('Source', size=256, help="Reference of the document that produced this invoice."),
+        'origin': fields.char('Source Document', size=256, help="Reference of the document that produced this invoice."),
+        'sequence': fields.integer('Sequence', help="Gives the sequence of this line when displaying the invoice."),
         'invoice_id': fields.many2one('account.invoice', 'Invoice Reference', ondelete='cascade', select=True),
         'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'),
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
@@ -1361,10 +1380,19 @@ class account_invoice_line(osv.osv):
         'company_id': fields.related('invoice_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
         'partner_id': fields.related('invoice_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True)
     }
+
+    def _default_account_id(self, cr, uid, context=None):
+        # XXX this gets the default account for the user's company,
+        # it should get the default account for the invoice's company
+        # however, the invoice's company does not reach this point
+        prop = self.pool.get('ir.property').get(cr, uid, 'property_account_income_categ', 'product.category', context=context)
+        return prop and prop.id or False
+
     _defaults = {
         'quantity': 1,
         'discount': 0.0,
         'price_unit': _price_unit_default,
+        'account_id': _default_account_id,
     }
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -1386,7 +1414,7 @@ class account_invoice_line(osv.osv):
             context = {}
         company_id = company_id if company_id != None else context.get('company_id',False)
         context = dict(context)
-        context.update({'company_id': company_id})
+        context.update({'company_id': company_id, 'force_company': company_id})
         if not partner_id:
             raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
         if not product:
@@ -1473,10 +1501,11 @@ class account_invoice_line(osv.osv):
             prod = self.pool.get('product.product').browse(cr, uid, product, context=context)
             prod_uom = self.pool.get('product.uom').browse(cr, uid, uom, context=context)
             if prod.uom_id.category_id.id != prod_uom.category_id.id:
-                 warning = {
+                warning = {
                     'title': _('Warning!'),
                     'message': _('The selected unit of measure is not compatible with the unit of measure of the product.')
-            }
+                }
+                res['value'].update({'uos_id': prod.uom_id.id})
             return {'value': res['value'], 'warning': warning}
         return res
 
@@ -1540,16 +1569,19 @@ class account_invoice_line(osv.osv):
     def onchange_account_id(self, cr, uid, ids, product_id, partner_id, inv_type, fposition_id, account_id):
         if not account_id:
             return {}
-        taxes = self.pool.get('account.account').browse(cr, uid, account_id).tax_ids
+        unique_tax_ids = []
         fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id) or False
-        tax_ids = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
-
-        product_change_result = self.product_id_change(cr, uid, ids, product_id, False, type=inv_type,
-                                                       partner_id=partner_id, fposition_id=fposition_id)
-        unique_tax_ids = set(tax_ids)
-        if product_change_result and 'value' in product_change_result and 'invoice_line_tax_id' in product_change_result['value']:
-            unique_tax_ids |= set(product_change_result['value']['invoice_line_tax_id'])
-        return {'value':{'invoice_line_tax_id': list(unique_tax_ids)}}
+        account = self.pool.get('account.account').browse(cr, uid, account_id)
+        if not product_id:
+            taxes = account.tax_ids
+            unique_tax_ids = self.pool.get('account.fiscal.position').map_tax(cr, uid, fpos, taxes)
+        else:
+            product_change_result = self.product_id_change(cr, uid, ids, product_id, False, type=inv_type,
+                partner_id=partner_id, fposition_id=fposition_id,
+                company_id=account.company_id.id)
+            if product_change_result and 'value' in product_change_result and 'invoice_line_tax_id' in product_change_result['value']:
+                unique_tax_ids = product_change_result['value']['invoice_line_tax_id']
+        return {'value':{'invoice_line_tax_id': unique_tax_ids}}
 
 account_invoice_line()
 
@@ -1634,14 +1666,13 @@ class account_invoice_tax(osv.osv):
 
         for line in inv.invoice_line:
             for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, line.product_id, inv.partner_id)['taxes']:
-                tax['price_unit'] = cur_obj.round(cr, uid, cur, tax['price_unit'])
                 val={}
                 val['invoice_id'] = inv.id
                 val['name'] = tax['name']
                 val['amount'] = tax['amount']
                 val['manual'] = False
                 val['sequence'] = tax['sequence']
-                val['base'] = tax['price_unit'] * line['quantity']
+                val['base'] = cur_obj.round(cr, uid, cur, tax['price_unit'] * line['quantity'])
 
                 if inv.type in ('out_invoice','in_invoice'):
                     val['base_code_id'] = tax['base_code_id']
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 143c5514141..d3697b13ea9 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -127,7 +127,7 @@
                     <field name="user_id"/>
                     <field name="date_due"/>
                     <field name="origin"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="residual" sum="Residual Amount"/>
                     <field name="amount_untaxed" sum="Untaxed Amount"/>
                     <field name="amount_total" sum="Total Amount"/>
@@ -143,13 +143,11 @@
             <field name="arch" type="xml">
                 <form string="Supplier Invoice" version="7.0">
                 <header>
-                    <span groups="base.group_user">
-                        <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight"/>
-                        <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' />
+                        <button name="invoice_open" states="draft,proforma2" string="Validate" class="oe_highlight" groups="account.group_account_invoice"/>
+                        <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid' groups="account.group_account_invoice"/>
                         <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
-                        <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                        <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" groups="account.group_account_invoice"/>
                         <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                    </span>
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Supplier Invoice">
@@ -171,11 +169,12 @@
                               domain="[('supplier', '=', True)]"/>
                             <field name="fiscal_position" widget="selection"/>
                             <field name="origin"/>
-			                <label for="reference_type"/>
-			                <div>
+                            <field name="supplier_invoice_number"/>
+                            <label for="reference_type"/>
+                            <div>
                                 <field name="reference_type" class="oe_inline oe_edit_only"/>
                                 <field name="reference" class="oe_inline"/>
-			                </div>
+                            </div>
                         </group>
                         <group>
                             <field name="date_invoice"/>
@@ -184,38 +183,45 @@
                                 name="account_id" groups="account.group_account_user"/>
                             <field name="journal_id" groups="account.group_account_user"
                                 on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
-                            <field name="currency_id"/>
+                            <field name="currency_id" groups="base.group_multi_currency"/>
+                            <field name="check_total" groups="account.group_supplier_inv_check_total"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Invoice">
-                            <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
+                            <field context="{'partner_id': partner_id, 'price_type': context.get('price_type') or False, 'type': type}" name="invoice_line">
                                 <tree string="Invoice lines" editable="bottom">
-                                    <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" groups="base.group_account_user"/>
-                                    <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
-                                    <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                                    <field name="product_id"
+                                        on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+                                    <field name="name"/>
+                                    <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                                    <field name="account_id" groups="account.group_account_user"
+                                        domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '!=', 'view')]"
+                                        on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
+                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"
+                                        domain="[('type','!=','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]"/>
                                     <field name="quantity"/>
+                                    <field name="uos_id" groups="product.group_uom"
+                                        on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                                     <field name="price_unit"/>
+                                    <field name="discount" groups="sale.group_discount_per_so_line"/>
+                                    <field name="invoice_line_tax_id" widget="many2many_tags" context="{'type':parent.type}"
+                                        domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                                     <field name="price_subtotal"/>
-                                    <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id,parent.partner_id,parent.type,parent.fiscal_position,account_id)" invisible="1"/>
-                                    <!-- Removed if subtotal is set -->
-                                    <field name="name" invisible="1"/>
-                                    <field name="uos_id" invisible="1"/>
                                 </tree>
                             </field>
                             <group class="oe_subtotal_footer oe_right">
-                                <field name="amount_untaxed"/>
+                                <field name="amount_untaxed" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 <div>
                                     <label for="amount_tax"/>
                                     <button name="button_reset_taxes" states="draft,proforma2"
                                         string="(update)" class="oe_link oe_edit_only"
                                         type="object" help="Recompute taxes and total"/>
                                 </div>
-                                <field name="amount_tax" nolabel="1"/>
-                                <field name="amount_total" class="oe_subtotal_footer_separator"/>
+                                <field name="amount_tax" nolabel="1" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                <field name="amount_total" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
 
-                                <field name="residual"/>
+                                <field name="residual" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 <field name="reconciled" invisible="1"/>
                             </group>
                             <div style="width: 50%%">
@@ -265,15 +271,15 @@
                                     <field name="debit"/>
                                     <field name="credit"/>
                                     <field name="amount_currency"/>
-                                    <field name="currency_id"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                 </tree>
                             </field>
                         </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
@@ -285,20 +291,18 @@
             <field name="arch" type="xml">
                 <form string="Invoice" version="7.0">
                 <header>
-                    <span groups="base.group_user">
-                        <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight"/>
-                        <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight"/>
-                        <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}"/>
-                        <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}"/>
-                        <button name="invoice_open" states="draft" string="Validate" class="oe_highlight"/>
-                        <button name="invoice_open" states="proforma2" string="Validate"/>
-                        <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
-                        <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='paid'/>
-                        <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
-                        <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
-                        <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                        <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
-                    </span>
+                    <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
+                    <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',True), ('state', '!=', 'open')]}" class="oe_highlight" groups="base.group_user"/>
+                    <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
+                    <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
+                    <button name="invoice_open" states="draft" string="Validate" class="oe_highlight" groups="base.group_user"/>
+                    <button name="invoice_open" states="proforma2" string="Validate" groups="base.group_user"/>
+                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' states='open,proforma2,paid' groups="base.group_user"/>
+                    <button name="invoice_cancel" states="draft,proforma2,open" string="Cancel" groups="base.group_no_one"/>
+                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" groups="base.group_user"/>
+                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <!--button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/-->
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Invoice">
@@ -316,7 +320,7 @@
                             <field string="Customer" name="partner_id"
                                 on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                                 groups="base.group_user" context="{'search_default_customer':1, 'show_address': 1}"
-                                options='{"always_reload": true}'/>
+                                options='{"always_reload": True}'/>
                             <field name="fiscal_position" widget="selection" />
                         </group>
                         <group>
@@ -326,8 +330,8 @@
                             <field domain="[('company_id', '=', company_id),('type','=', 'receivable')]"
                                 name="account_id" groups="account.group_account_user"/>
 
-                            <label for="currency_id"/>
-                            <div>
+                            <label for="currency_id" groups="base.group_multi_currency"/>
+                            <div groups="base.group_multi_currency">
                                 <field name="currency_id" class="oe_inline"/>
                                 <!-- note fp: I don't think we need this feature ?
                                 <button name="%(action_account_change_currency)d" type="action"
@@ -342,31 +346,36 @@
                         <page string="Invoice Lines">
                             <field name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}">
                                 <tree string="Invoice Lines" editable="bottom">
-                                    <field name="invoice_line_tax_id" invisible="1"/>
-                                    <field name="product_id" />
+                                    <field name="product_id"
+                                        on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                                     <field name="name"/>
+                                    <field name="company_id" groups="base.group_multi_company" readonly="1"/>
                                     <field name="account_id" groups="account.group_account_user"
-                                        domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]"
+                                        domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '!=', 'view')]"
                                         on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
+                                    <field name="account_analytic_id" groups="analytic.group_analytic_accounting"
+                                        domain="[('type','!=','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]"/>
                                     <field name="quantity"/>
                                     <field name="uos_id" groups="product.group_uom"
                                         on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
                                     <field name="price_unit"/>
                                     <field name="discount" groups="sale.group_discount_per_so_line"/>
+                                    <field name="invoice_line_tax_id" widget="many2many_tags" context="{'type':parent.type}"
+                                        domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
                             <group class="oe_subtotal_footer oe_right">
-                                <field name="amount_untaxed"/>
+                                <field name="amount_untaxed" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 <div>
                                     <label for="amount_tax"/>
                                     <button name="button_reset_taxes" states="draft,proforma2"
                                         string="(update)" class="oe_link oe_edit_only"
                                         type="object" help="Recompute taxes and total"/>
                                 </div>
-                                <field name="amount_tax" nolabel="1"/>
-                                <field name="amount_total" class="oe_subtotal_footer_separator"/>
-                                <field name="residual" groups="account.group_account_user"/>
+                                <field name="amount_tax" nolabel="1" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                <field name="amount_total" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                <field name="residual" groups="account.group_account_user" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 <field name="reconciled" invisible="1"/>
                             </group>
                             <group>
@@ -418,16 +427,16 @@
                                     <field name="journal_id" groups="base.group_user"/>
                                     <field name="debit"/>
                                     <field name="credit"/>
-                                    <field name="amount_currency"/>
-                                    <field name="currency_id"/>
+                                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                 </tree>
                             </field>
                         </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                 </div>
                 </form>
             </field>
@@ -438,7 +447,7 @@
             <field name="model">account.invoice</field>
             <field name="arch" type="xml">
                 <search string="Search Invoice">
-                    <field name="number" string="Invoice" filter_domain="['|', ('number','ilike',self),('origin','ilike',self)]"/>
+                    <field name="number" string="Invoice" filter_domain="['|','|', ('number','ilike',self), ('origin','ilike',self), ('supplier_invoice_number', 'ilike', self)]"/>
                     <filter name="draft" icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Invoices"/>
                     <filter name="proforma" icon="terp-gtk-media-pause" string="Proforma" domain="[('state','=','proforma2')]" help="Proforma Invoices" groups="account.group_proforma_invoices"/>
                     <filter name="invoices" icon="terp-dolar" string="Invoices" domain="[('state','not in',['draft','cancel'])]" help="Proforma/Open/Paid Invoices"/>
@@ -447,7 +456,6 @@
                     <filter domain="[('user_id','=',uid)]" help="My Invoices" icon="terp-personal"/>
                     <field name="partner_id"/>
                     <field name="user_id" string="Salesperson"/>
-                    <field name="journal_id"/>
                     <field name="period_id" string="Period"/>
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index 9ac6f98661c..a2fbf11963b 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -30,7 +30,7 @@
         <menuitem id="menu_analytic" parent="menu_analytic_accounting" name="Accounts" groups="analytic.group_analytic_accounting"/>
         <menuitem id="menu_journals" sequence="15" name="Journals" parent="menu_finance_configuration" groups="group_account_manager"/>
         <menuitem id="menu_configuration_misc" name="Miscellaneous" parent="menu_finance_configuration" sequence="55"/>
-        <menuitem id="base.menu_action_currency_form" parent="menu_configuration_misc" sequence="20" groups="base.group_no_one"/>
+        <menuitem id="base.menu_action_currency_form" name="Currencies" parent="menu_configuration_misc" sequence="20" groups="base.group_no_one"/>
         <menuitem id="menu_finance_generic_reporting" name="Generic Reporting" parent="menu_finance_reports" sequence="100"/>
         <menuitem id="menu_finance_entries" name="Journal Entries" parent="menu_finance" sequence="5" groups="group_account_user,group_account_manager"/>
         <menuitem id="menu_account_reports" name="Financial Reports" parent="menu_finance_configuration" sequence="30" />
@@ -44,7 +44,7 @@
         <menuitem id="menu_finance_periodical_processing_billing" name="Billing" parent="menu_finance_periodical_processing" sequence="35"/>
 
         <menuitem id="next_id_22" name="Partners" parent="menu_finance_generic_reporting" sequence="1"/>
-        <menuitem id="menu_multi_currency" name="Multi-Currencies" parent="menu_finance_generic_reporting" sequence="10"/>
+        <menuitem id="menu_multi_currency" name="Multi-Currencies" parent="menu_finance_generic_reporting" sequence="10" groups="base.group_multi_currency"/>
         <menuitem
             parent="account.menu_finance_legal_statement"
             id="final_accounting_reports"
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 18ab1a779a3..302a74c27af 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -208,15 +208,17 @@ class account_move_line(osv.osv):
             if type(period_id) == str:
                 ids = period_obj.search(cr, uid, [('name', 'ilike', period_id)])
                 context.update({
-                    'period_id': ids[0]
+                    'period_id': ids and ids[0] or False
                 })
         return context
 
     def _default_get(self, cr, uid, fields, context=None):
         if context is None:
             context = {}
-        if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
+        if not context.get('journal_id', False):
             context['journal_id'] = context.get('search_default_journal_id')
+        if not context.get('period_id', False):
+            context['period_id'] = context.get('search_default_period_id')
         account_obj = self.pool.get('account.account')
         period_obj = self.pool.get('account.period')
         journal_obj = self.pool.get('account.journal')
@@ -226,6 +228,9 @@ class account_move_line(osv.osv):
         partner_obj = self.pool.get('res.partner')
         currency_obj = self.pool.get('res.currency')
         context = self.convert_to_period(cr, uid, context)
+        #pass the right context when search_defaul_journal_id
+        if context.get('search_default_journal_id',False):
+            context['journal_id'] = context.get('search_default_journal_id')
         # Compute simple values
         data = super(account_move_line, self).default_get(cr, uid, fields, context=context)
         # Starts: Manual entry from account.move form
@@ -480,7 +485,7 @@ class account_move_line(osv.osv):
         'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
         '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", help="The move of this entry line.", select=2, required=True),
+        'move_id': fields.many2one('account.move', 'Journal Entry', ondelete="cascade", help="The move of this entry line.", select=2, required=True),
         'narration': fields.related('move_id','narration', type='text', relation='account.move', string='Internal Note'),
         'ref': fields.related('move_id', 'ref', string='Reference', type='char', size=64, store=True),
         'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1),
@@ -509,8 +514,7 @@ class account_move_line(osv.osv):
         'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'),
         'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8),
         'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'),
-        'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'Status', readonly=True,
-                                  help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'),
+        'state': fields.selection([('draft','Unbalanced'), ('valid','Balanced')], 'Status', readonly=True),
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."),
         'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\
                     "this field will contain the basic amount(without tax)."),
@@ -557,6 +561,7 @@ class account_move_line(osv.osv):
         'journal_id': lambda self, cr, uid, c: c.get('journal_id', False),
         'credit': 0.0,
         'debit': 0.0,
+        'amount_currency': 0.0,
         'account_id': lambda self, cr, uid, c: c.get('account_id', False),
         'period_id': lambda self, cr, uid, c: c.get('period_id', False),
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.move.line', context=c)
@@ -577,7 +582,7 @@ class account_move_line(osv.osv):
         lines = self.browse(cr, uid, ids, context=context)
         for l in lines:
             if l.account_id.type == 'view':
-                raise osv.except_osv(_('Error!'), _('You cannot create journal items on “View” type account %s %s.') % (l.account_id.code, l.account_id.name))
+                return False
         return True
 
     def _check_no_closed(self, cr, uid, ids, context=None):
@@ -703,7 +708,9 @@ class account_move_line(osv.osv):
             context = {}
         if context and context.get('next_partner_only', False):
             if not context.get('partner_id', False):
-                partner = self.get_next_partner_only(cr, uid, offset, context)
+                partner = self.list_partners_to_reconcile(cr, uid, context=context)
+                if partner:
+                    partner = partner[0]
             else:
                 partner = context.get('partner_id', False)
             if not partner:
@@ -711,26 +718,26 @@ class account_move_line(osv.osv):
             args.append(('partner_id', '=', partner[0]))
         return super(account_move_line, self).search(cr, uid, args, offset, limit, order, context, count)
 
-    def get_next_partner_only(self, cr, uid, offset=0, context=None):
+    def list_partners_to_reconcile(self, cr, uid, context=None):
         cr.execute(
              """
-             SELECT p.id
-             FROM res_partner p
-             RIGHT JOIN (
-                SELECT l.partner_id AS partner_id, SUM(l.debit) AS debit, SUM(l.credit) AS credit
+             SELECT partner_id
+             FROM (
+                SELECT l.partner_id, p.last_reconciliation_date, SUM(l.debit) AS debit, SUM(l.credit) AS credit
                 FROM account_move_line l
-                LEFT JOIN account_account a ON (a.id = l.account_id)
-                    LEFT JOIN res_partner p ON (l.partner_id = p.id)
+                RIGHT JOIN account_account a ON (a.id = l.account_id)
+                RIGHT JOIN res_partner p ON (l.partner_id = p.id)
                     WHERE a.reconcile IS TRUE
                     AND l.reconcile_id IS NULL
                     AND (p.last_reconciliation_date IS NULL OR l.date > p.last_reconciliation_date)
                     AND l.state <> 'draft'
-                    GROUP BY l.partner_id
-                ) AS s ON (p.id = s.partner_id)
+                    GROUP BY l.partner_id, p.last_reconciliation_date
+                ) AS s
                 WHERE debit > 0 AND credit > 0
-                ORDER BY p.last_reconciliation_date LIMIT 1 OFFSET %s""", (offset, )
-            )
-        return cr.fetchone()
+                ORDER BY last_reconciliation_date""")
+        ids = cr.fetchall()
+        ids = len(ids) and [x[0] for x in ids] or []
+        return self.pool.get('res.partner').name_get(cr, uid, ids, context=context)
 
     def reconcile_partial(self, cr, uid, ids, type='auto', context=None, writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False):
         move_rec_obj = self.pool.get('account.move.reconcile')
@@ -910,8 +917,8 @@ class account_move_line(osv.osv):
 
         if lines and lines[0]:
             partner_id = lines[0].partner_id and lines[0].partner_id.id or False
-            if partner_id and context and context.get('stop_reconcile', False):
-                partner_obj.write(cr, uid, [partner_id], {'last_reconciliation_date': time.strftime('%Y-%m-%d %H:%M:%S')})
+            if partner_id and not partner_obj.has_something_to_reconcile(cr, uid, partner_id, context=context):
+                partner_obj.mark_as_reconciled(cr, uid, [partner_id], context=context)
         return r_id
 
     def view_header_get(self, cr, user, view_id, view_type, context=None):
@@ -926,6 +933,8 @@ class account_move_line(osv.osv):
             return res
         if (not context.get('journal_id', False)) or (not context.get('period_id', False)):
             return False
+        if context.get('search_default_journal_id', False):
+            context['journal_id'] = context.get('search_default_journal_id')
         cr.execute('SELECT code FROM account_journal WHERE id = %s', (context['journal_id'], ))
         j = cr.fetchone()[0] or ''
         cr.execute('SELECT code FROM account_period WHERE id = %s', (context['period_id'], ))
@@ -966,7 +975,7 @@ class account_move_line(osv.osv):
         if context is None:
             context = {}
         result = super(account_move_line, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
-        if view_type != 'tree':
+        if (view_type != 'tree') or view_id:
             #Remove the toolbar from the form view
             if view_type == 'form':
                 if result.get('toolbar', False):
@@ -1095,7 +1104,7 @@ class account_move_line(osv.osv):
                                 'has been confirmed.') % res[2])
         return res
 
-    def _remove_move_reconcile(self, cr, uid, move_ids=[], context=None):
+    def _remove_move_reconcile(self, cr, uid, move_ids=None, context=None):
         # Function remove move rencocile ids related with moves
         obj_move_line = self.pool.get('account.move.line')
         obj_move_rec = self.pool.get('account.move.reconcile')
@@ -1184,12 +1193,12 @@ class account_move_line(osv.osv):
         jour_period_obj = self.pool.get('account.journal.period')
         cr.execute('SELECT state FROM account_journal_period WHERE journal_id = %s AND period_id = %s', (journal_id, period_id))
         result = cr.fetchall()
+        journal = journal_obj.browse(cr, uid, journal_id, context=context)
+        period = period_obj.browse(cr, uid, period_id, context=context)
         for (state,) in result:
             if state == 'done':
-                raise osv.except_osv(_('Error!'), _('You cannot add/modify entries in a closed journal.'))
+                raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed period %s of journal %s.' % (period.name,journal.name)))                
         if not result:
-            journal = journal_obj.browse(cr, uid, journal_id, context=context)
-            period = period_obj.browse(cr, uid, period_id, context=context)
             jour_period_obj.create(cr, uid, {
                 'name': (journal.code or journal.name)+':'+(period.name or ''),
                 'journal_id': journal.id,
@@ -1225,16 +1234,16 @@ class account_move_line(osv.osv):
                 vals['company_id'] = company_id[0]
         if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']:
             raise osv.except_osv(_('Bad Account!'), _('You cannot use an inactive account.'))
-        if 'journal_id' in vals:
+        if 'journal_id' in vals and vals['journal_id']:
             context['journal_id'] = vals['journal_id']
-        if 'period_id' in vals:
+        if 'period_id' in vals and vals['period_id']:
             context['period_id'] = vals['period_id']
         if ('journal_id' not in context) and ('move_id' in vals) and vals['move_id']:
             m = move_obj.browse(cr, uid, vals['move_id'])
             context['journal_id'] = m.journal_id.id
             context['period_id'] = m.period_id.id
         #we need to treat the case where a value is given in the context for period_id as a string
-        if 'period_id' not in context or not isinstance(context.get('period_id', ''), (int, long)):
+        if 'period_id' in context and not isinstance(context.get('period_id', ''), (int, long)):
             period_candidate_ids = self.pool.get('account.period').name_search(cr, uid, name=context.get('period_id',''))
             if len(period_candidate_ids) != 1:
                 raise osv.except_osv(_('Error!'), _('No period found or more than one period found for the given date.'))
@@ -1244,6 +1253,9 @@ class account_move_line(osv.osv):
         self._update_journal_check(cr, uid, context['journal_id'], context['period_id'], context)
         move_id = vals.get('move_id', False)
         journal = journal_obj.browse(cr, uid, context['journal_id'], context=context)
+        vals['journal_id'] = vals.get('journal_id') or context.get('journal_id')
+        vals['period_id'] = vals.get('period_id') or context.get('period_id')
+        vals['date'] = vals.get('date') or context.get('date')
         if not move_id:
             if journal.centralisation:
                 #Check for centralisation
diff --git a/addons/account/account_report.xml b/addons/account/account_report.xml
index d258bb0b140..0017409f416 100644
--- a/addons/account/account_report.xml
+++ b/addons/account/account_report.xml
@@ -41,13 +41,5 @@
             groups="group_account_user,group_account_manager"
             parent="account.menu_finance_generic_reporting" sequence="3"/>
 
-        <report id="account_account_balance_landscape"
-            string="Account balance"
-            model="account.account"
-            name="account.account.balance.landscape"
-            rml="account/report/account_balance_landscape.rml"
-            auto="False"
-            menu="False"/>
-
     </data>
 </openerp>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5bf45aab487..f7d64f43405 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -101,28 +101,29 @@
             <field name="model">account.period</field>
             <field name="arch" type="xml">
                 <form string="Account Period" version="7.0">
-	                <header>
-	                    <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
-	                    <field name="state" widget="statusbar" nolabel="1"/>
-	                </header>
-	                <sheet>
-		                <group>
-		                    <group>
-		                        <field name="name"/>
-		                        <field name="fiscalyear_id" widget="selection"/>
-		                        <label for="date_start" string="Duration"/>
-		                        <div>
-		                            <field name="date_start" class="oe_inline" nolabel="1"/> - 
-		                            <field name="date_stop" nolabel="1" class="oe_inline"/>
-		                        </div>
-		                    </group>
-		                    <group>
-		                        <field name="code"/>
-		                        <field name="special"/>
-		                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-		                    </group>
-		                </group>
-	                </sheet>
+                    <header>
+                        <button string="Close Period" name="%(account.action_account_period_close)d" type="action" class="oe_highlight" states="draft"/>
+                        <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
+                        <field name="state" widget="statusbar" nolabel="1"/>
+                    </header>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="fiscalyear_id" widget="selection"/>
+                                <label for="date_start" string="Duration"/>
+                                <div>
+                                    <field name="date_start" class="oe_inline" nolabel="1"/> -
+                                    <field name="date_stop" nolabel="1" class="oe_inline"/>
+                                </div>
+                            </group>
+                            <group>
+                                <field name="code"/>
+                                <field name="special"/>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            </group>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -181,7 +182,7 @@
                 <form string="Account" version="7.0">
                     <label for="code" class="oe_edit_only" string="Account Code and Name"/>
                     <h1>
-                        <field name="code" class="oe_inline" placeholder="Account code" style="width: 6em"/> - 
+                        <field name="code" class="oe_inline" placeholder="Account code" style="width: 6em"/> -
                         <field name="name" class="oe_inline" placeholder="Account name"/>
                     </h1>
                     <group>
@@ -204,7 +205,7 @@
                                 attrs="{'invisible':[('type','!=','consolidation')]}"
                                 widget="many2many_tags"/>
                         </group>
-                        <group>
+                        <group groups="base.group_multi_currency">
                             <field name="currency_id"/>
                             <field name="currency_mode" attrs="{'readonly': [('currency_id','=',False)]}"/>
                         </group>
@@ -252,16 +253,6 @@
                 </tree>
             </field>
         </record>
-        <record id="view_treasory_graph" model="ir.ui.view">
-           <field name="name">account.treasury.graph</field>
-           <field name="model">account.account</field>
-           <field name="arch" type="xml">
-               <graph string="Treasury Analysis" type="bar">
-                  <field name="name"/>
-                  <field name="balance" operator="+"/>
-               </graph>
-         </field>
-      </record>
         <record id="action_account_form" model="ir.actions.act_window">
             <field name="name">Accounts</field>
             <field name="res_model">account.account</field>
@@ -311,11 +302,11 @@
             <field name="domain">[('parent_id','=',False)]</field>
         </record>
 
-         <record id="view_account_gain_loss_tree" model="ir.ui.view">
+        <record id="view_account_gain_loss_tree" model="ir.ui.view">
            <field name="name">Unrealized Gain or Loss</field>
             <field name="model">account.account</field>
             <field name="arch" type="xml">
-                <tree string="Unrealized Gains and losses">
+                <tree string="Unrealized Gains and losses" create="false">
                     <field name="code"/>
                     <field name="name"/>
                     <field name="parent_id" invisible="1"/>
@@ -331,7 +322,7 @@
             </field>
         </record>
 
-          <record id="action_account_gain_loss" model="ir.actions.act_window">
+        <record id="action_account_gain_loss" model="ir.actions.act_window">
             <field name="name">Unrealized Gain or Loss</field>
             <field name="res_model">account.account</field>
             <field name="view_type">form</field>
@@ -489,7 +480,7 @@
                         <group>
                             <field name="default_debit_account_id" attrs="{'required':[('type','in', ('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             <field name="default_credit_account_id" attrs="{'required':[('type','in',('cash', 'bank'))]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="currency"/>
+                            <field name="currency" groups="base.group_multi_currency"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
                     </group>
@@ -515,19 +506,20 @@
                             <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
                             <field colspan="4" name="account_control_ids" nolabel="1"/>
                         </page>
-                        <page string="Cash Registers" attrs="{'invisible':[('type', '!=', 'cash')]}">
+                        <page string="Cash Registers">
                             <group>
                                 <group string="Accounts">
-                                    <field name="profit_account_id"/>
-                                    <field name="loss_account_id"/>
+                                    <field name="profit_account_id" domain="[('type','!=','view')]"/>
+                                    <field name="loss_account_id" domain="[('type','!=','view')]"/>
                                     <field name="internal_account_id"/>
                                 </group>
                                 <group string="Miscellaneous">
                                     <field name="with_last_closing_balance"/>
+                                    <field name="cash_control"/>
                                 </group>
                             </group>
-                            <separator string="Available Coins" colspan="4" />
-                            <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4">
+                            <separator string="Available Coins" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)] }"/>
+                            <field name="cashbox_line_ids" nolabel="1" string="Unit Of Currency Definition" colspan="4" attrs="{'invisible' : [('cash_control', '=', False)]}">
                                 <tree string="CashBox Lines" editable="bottom">
                                     <field name="pieces" />
                                 </tree>
@@ -641,13 +633,10 @@
                                 <field name="period_id" class="oe_inline"/>
                             </div>
                             <field name='company_id' widget="selection" groups="base.group_multi_company" />
+                            <field name="currency" invisible="1"/>
                         </group><group>
-                            <label for="balance_start"/>
-                            <div>
-                                <field name="balance_start" class="oe_inline"/>
-                                <field name="currency" class="oe_inline"/>
-                            </div>
-                            <field name="balance_end_real"/>
+                            <field name="balance_start" widget="monetary" options='{"currency_field" : "currency"}'/>
+                            <field name="balance_end_real" widget="monetary" options='{"currency_field" : "currency"}'/>
                         </group>
                     </group>
 
@@ -661,7 +650,7 @@
                                     <field name="ref"/>
                                     <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]" name="account_id"/>
+                                    <field name="account_id" options='{"no_open":True}' domain="[('journal_id','=',parent.journal_id), ('company_id', '=', parent.company_id)]"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                     <field name="amount"/>
                                 </tree>
@@ -672,7 +661,7 @@
                                         <field name="ref"/>
                                         <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
                                         <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                        <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]" name="account_id"/>
+                                        <field name="account_id" domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view'), ('company_id', '=', parent.company_id)]"/>
                                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                         <field name="amount"/>
                                         <field name="sequence" readonly="0"/>
@@ -682,15 +671,24 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Journal Entries" name="move_live_ids">
-                            <field name="move_line_ids"/>
-                        </page>
                     </notebook>
                 </sheet>
                 </form>
             </field>
         </record>
 
+        <record id="view_bank_statement_form_journal_items" model="ir.ui.view">
+            <field name="name">account.bank.statement.journal.items.form.inherit</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="view_bank_statement_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='import_buttons']" position="inside">
+                    <button name="button_journal_entries"
+                            string="Journal Items" type="object"
+                            attrs="{'invisible':[('state','!=','confirm')]}"/>
+                </xpath>
+            </field>
+        </record>
 
         <record id="action_bank_statement_tree" model="ir.actions.act_window">
             <field name="name">Bank Statements</field>
@@ -1047,6 +1045,25 @@
     Entries lines
     -->
 
+        <record id="view_move_line_tree_reconcile" model="ir.ui.view">
+            <field name="model">account.move.line</field>
+            <field eval="24" name="priority"/>
+            <field name="arch" type="xml">
+                <tree_account_reconciliation colors="red:state == 'draft';black:state == 'valid'" string="Journal Items to Reconcile" create="false" version="7.0">
+                    <field name="date"/>
+                    <field name="move_id"/>
+                    <field name="ref"/>
+                    <field name="name"/>
+                    <field name="partner_id"/>
+                    <field name="account_id"/>
+                    <field name="reconcile_partial_id"/>
+                    <field name="state" invisible="1"/>
+                    <field name="debit" sum="Total debit"/>
+                    <field name="credit" sum="Total credit"/>
+                </tree_account_reconciliation>
+            </field>
+        </record>
+
         <record id="view_move_line_tree" model="ir.ui.view">
             <field name="name">account.move.line.tree</field>
             <field name="model">account.move.line</field>
@@ -1067,10 +1084,10 @@
                     <field name="account_tax_id"/>
                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
                     <field name="amount_currency" attrs="{'readonly':[('state','=','valid')]}"/>
-                    <field name="currency_id" attrs="{'readonly':[('state','=','valid')]}"/>
+                    <field name="currency_id" attrs="{'readonly':[('state','=','valid')]}" groups="base.group_multi_currency"/>
                     <field name="reconcile_partial_id"/>
                     <field name="reconcile_id"/>
-                    <field name="state"/>
+                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -1081,65 +1098,65 @@
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
                 <form string="Journal Item" version="7.0">
-                    <sheet> 
-	                    <group>
-	                        <group>
-		                        <field name="name"/>
-		                        <field name="ref"/>
-		                        <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
-	                        </group>
-	                        <group>
-		                        <field name="journal_id"/>
-		                        <field name="period_id"/>
-		                        <field name="company_id" required="1" groups="base.group_multi_company"/>
-	                        </group>
-	                    </group>
-	                    <notebook colspan="4">
-	                        <page string="Information">
-	                            <group>
-	                                <group string="Amount">
-	                                    <field name="account_id" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
-	                                    <field name="debit"/>
-	                                    <field name="credit"/>
-	                                    <field name="quantity"/>
-	                                </group>
-	                                <group string="Accounting Documents">
-	                                    <field name="invoice" readonly="True"/>
-	                                    <field name="move_id" required="False"/>
-	                                    <field name="statement_id" readonly="True"/>
-	                                </group>
-	                                <group string="Dates">
-	                                    <field name="date"/>
-	                                    <field name="date_maturity"/>
-	                                    <field name="date_created" readonly="True"/>
-	                                </group>
-	                                <group string="Taxes">
-	                                    <field name="tax_code_id"/>
-	                                    <field name="tax_amount"/>
-	                                    <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
-	                                </group>
-	                                <group attrs="{'readonly':[('state','=','valid')]}" string="Currency">
-	                                    <field name="currency_id"/>
-	                                    <field name="amount_currency"/>
-	                                </group>
-	                                <group string="Reconciliation">
-	                                    <field name="reconcile_id"/>
-	                                    <field name="reconcile_partial_id"/>
-	                                </group>
-	                                <group string="States">
-	                                    <field name="state"/>
-	                                    <field name="blocked"/>
-	                                </group>
-	                                <group groups="analytic.group_analytic_accounting" string="Analytic">
-	                                    <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
-	                                </group>
-	                            </group>
-	                            <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
-	                        </page>
-	                        <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
-	                            <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
-	                        </page>
-	                    </notebook>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="ref"/>
+                                <field name="partner_id" on_change="onchange_partner_id(False,partner_id,account_id,debit,credit,date)"/>
+                            </group>
+                            <group>
+                                <field name="journal_id"/>
+                                <field name="period_id"/>
+                                <field name="company_id" required="1" groups="base.group_multi_company"/>
+                            </group>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Information">
+                                <group>
+                                    <group string="Amount">
+                                        <field name="account_id" domain="[('company_id', '=', company_id), ('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
+                                        <field name="debit"/>
+                                        <field name="credit"/>
+                                        <field name="quantity"/>
+                                    </group>
+                                    <group string="Accounting Documents">
+                                        <field name="invoice" readonly="True"/>
+                                        <field name="move_id" required="False"/>
+                                        <field name="statement_id" readonly="True"/>
+                                    </group>
+                                    <group string="Dates">
+                                        <field name="date"/>
+                                        <field name="date_maturity"/>
+                                        <field name="date_created" readonly="True"/>
+                                    </group>
+                                    <group string="Taxes">
+                                        <field name="tax_code_id"/>
+                                        <field name="tax_amount"/>
+                                        <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
+                                    </group>
+                                    <group attrs="{'readonly':[('state','=','valid')]}" string="Currency" groups="base.group_multi_currency">
+                                        <field name="currency_id" invisible="1"/>
+                                        <field name="amount_currency" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                    </group>
+                                    <group string="Reconciliation">
+                                        <field name="reconcile_id"/>
+                                        <field name="reconcile_partial_id"/>
+                                    </group>
+                                    <group string="States">
+                                        <field name="state"/>
+                                        <field name="blocked"/>
+                                    </group>
+                                    <group groups="analytic.group_analytic_accounting" string="Analytic">
+                                        <field name="analytic_account_id" domain="[('parent_id','!=',False)]"/>
+                                    </group>
+                                </group>
+                                <field name="narration" colspan="4" nolabel="1" placeholder="Add an internal note..."/>
+                            </page>
+                            <page string="Analytic Lines" groups="analytic.group_analytic_accounting">
+                                <field name="analytic_lines" context="{'default_general_account_id':account_id, 'default_name': name, 'default_date':date, 'amount': (debit or 0.0)-(credit or 0.0)}"/>
+                            </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>
@@ -1166,8 +1183,8 @@
                                 <field name="credit"/>
 
                                 <separator colspan="4" string="Optional Information"/>
-                                <field name="currency_id"/>
-                                <field name="amount_currency"/>
+                                <field name="currency_id" invisible="1"/>
+                                <field name="amount_currency" groups="base.group_multi_currency" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 <field name="quantity"/>
                                 <field name="move_id" required="False"/>
                                 <newline/>
@@ -1222,8 +1239,8 @@
                     <field name="move_id" string="Number (Move)"/>
                     <field name="account_id"/>
                     <field name="partner_id"/>
-                    <field name="journal_id" context="{'journal_id':self}"/>
-                    <field name="period_id" context="{'period_id':self}"/>
+                    <field name="journal_id" context="{'journal_id':self}" widget="selection"/> <!-- it's important to keep widget='selection' in this filter viewbecause without that the value passed in the context is not the ID but the textual value (name) of the selected journal -->
+                    <field name="period_id" context="{'period_id':self}" widget="selection"/> <!-- it's important to keep the widget='selection' in this field, for the same reason as explained above -->
                     <group expand="0" string="Group By...">
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal_id'}"/>
@@ -1294,16 +1311,6 @@
     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="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>
@@ -1327,8 +1334,8 @@
             <field name="arch" type="xml">
                 <form string="Account Entry" version="7.0">
                 <header>
-                    <button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight"/>
-                    <button name="button_cancel" states="posted" string="Cancel" type="object"/>
+                    <button name="button_validate" states="draft" string="Post" type="object" class="oe_highlight" groups="account.group_account_invoice"/>
+                    <button name="button_cancel" states="posted" string="Cancel" type="object" groups="account.group_account_invoice"/>
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet string="Journal Entries" >
@@ -1348,7 +1355,7 @@
                             <field name="date"/>
                             <field name="to_check"/>
                             <field name="amount" invisible="1"/>
-                        </group>	
+                        </group>
                     </group>
                     <notebook>
                         <page string="Journal Items">
@@ -1394,7 +1401,7 @@
                                                     <field name="account_tax_id" domain="[('parent_id','=',False)]"/>
                                                 </group>
 
-                                                <group string="Currency">
+                                                <group string="Currency" groups="base.group_multi_currency">
                                                     <field name="currency_id"/>
                                                     <field name="amount_currency"/>
                                                 </group>
@@ -1432,7 +1439,7 @@
                                     <field name="credit" sum="Total Credit"/>
                                     <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
                                     <field name="amount_currency"/>
-                                    <field name="currency_id"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                     <field name="tax_code_id"/>
                                     <field name="tax_amount"/>
                                     <field name="state"/>
@@ -1477,7 +1484,7 @@
             <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,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
             <field name="help" type="html">
@@ -1521,7 +1528,6 @@
 
         <record id="action_move_line_search" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
-            <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.move.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -1540,15 +1546,27 @@
             <field name="act_window_id" ref="action_move_line_search"/>
         </record>
 
-        <act_window
-            context="{'search_default_next_partner':1,'view_mode':True}"
-            id="action_account_manual_reconcile" name="Journal Items"
-            res_model="account.move.line"
-            view_id="view_move_line_tree"/>
-
+        <record id="action_account_manual_reconcile" model="ir.actions.act_window">
+            <field name="context">{'search_default_unreconciled': 1,'view_mode':True}</field>
+            <field name="name">Journal Items to Reconcile</field>
+            <field name="res_model">account.move.line</field>
+            <field name="view_id" ref="view_move_line_tree_reconcile"/>
+            <field name="view_mode">tree_account_reconciliation</field>
+            <field name="help" type="html">
+                <p>
+                    No journal items found.
+                </p>
+            </field>
+        </record>
+        <menuitem
+             name="Journal Items to Reconcile"
+             action="action_account_manual_reconcile"
+             id="menu_manual_reconcile_bank"
+             sequence="20"
+             parent="account.menu_finance_bank_and_cash"/>
 
         <menuitem
-             name="Manual Reconciliation" icon="STOCK_EXECUTE"
+             name="Manual Reconciliation"
              action="action_account_manual_reconcile"
              id="menu_manual_reconcile"
              parent="account.periodical_processing_reconciliation"/>
@@ -1650,8 +1668,8 @@
                 <form string="Journal Entry Model" version="7.0">
                     <group col="4">
                         <field name="name"/>
-                        <field name="journal_id"/>
-                        <field name="company_id" widget='selection' groups="base.group_multi_company"/>
+                        <field name="journal_id" on_change="onchange_journal_id(journal_id)"/>
+                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
 
                     <field name="lines_id" widget="one2many_list"/>
@@ -1727,8 +1745,10 @@
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
                 <form string="Payment Term" version="7.0">
-                    <field name="name"/>
-                    <field name="sequence"/>
+                    <group>
+                        <field name="name"/>
+                        <field name="sequence"/>
+                    </group>
                     <group>
                         <group string="Amount Computation">
                             <field name="value"/>
@@ -1776,12 +1796,11 @@
             <field name="model">account.payment.term</field>
             <field name="arch" type="xml">
                 <form string="Payment Term" version="7.0">
-                    <group>
+                    <group col="4">
                         <field name="name"/>
                         <field name="active"/>
                     </group>
-                    <separator string="Description on Invoices"/>
-                    <field name="note"/>
+                    <field name="note" placeholder="Note for the invoice..."/>
                     <separator string="Computation"/>
                     <field name="line_ids"/>
                 </form>
@@ -1840,7 +1859,7 @@
             </field>
         </record>
 
-         <record id="view_subscription_search" model="ir.ui.view">
+        <record id="view_subscription_search" model="ir.ui.view">
             <field name="name">account.subscription.search</field>
             <field name="model">account.subscription</field>
             <field name="arch" type="xml">
@@ -1852,7 +1871,7 @@
                     <field name="model_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Model" icon="terp-folder-orange" domain="[]" context="{'group_by':'model_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                     </group>
                 </search>
             </field>
@@ -1970,7 +1989,7 @@
                     <field name="credit" sum="Total credit"/>
                     <field name="account_tax_id"/>
                     <field name="analytic_account_id" domain="[('parent_id','!=',False)]" groups="analytic.group_analytic_accounting"/>
-                    <field name="state"/>
+                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -2010,7 +2029,7 @@
            src_model="account.journal"/>
 
         <act_window
-            context="{'search_default_reconcile_id':False, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
+            context="{'search_default_unreconciled':True, 'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
             domain="[('account_id.reconcile', '=', True),('account_id.type', 'in', ['receivable', 'payable'])]"
             id="act_account_partner_account_move_all"
             name="Receivables &amp; Payables"
@@ -2046,7 +2065,7 @@
             id="account_template_folder"
             name="Templates"
             parent="menu_finance_accounting"
-            groups="base.group_multi_company"/>
+            groups="account.group_account_manager"/>
         <menuitem
             id="account_template_taxes"
             name="Taxes"
@@ -2075,7 +2094,7 @@
                                 <field name="type"/>
                                 <field name="user_type"/>
 
-                                <field name="currency_id"/>
+                                <field name="currency_id" groups="base.group_multi_currency"/>
                                 <field name="reconcile"/>
                                 <field name="chart_template_id"/>
                             </group>
@@ -2149,7 +2168,8 @@
                         <field name="visible" />
                         <field name="complete_tax_set" />
                     </group>
-                    <field name="tax_template_ids" colspan="4" readonly="1" nolabel="1"/>
+                    <separator string="Default Taxes" colspan="4"/>
+                    <field name="tax_template_ids" colspan="4"  nolabel="1"/>
                     <separator string="Properties" colspan="4"/>
                     <group col="4">
                         <field name="property_account_receivable" domain="[('id', 'child_of', [account_root_id])]"/>
@@ -2160,7 +2180,6 @@
                         <field name="property_account_income" domain="[('id', 'child_of', [account_root_id])]"/>
                         <field name="property_account_income_opening" domain="[('id', 'child_of', [account_root_id])]"/>
                         <field name="property_account_expense_opening" domain="[('id', 'child_of', [account_root_id])]"/>
-                        <field name="property_reserve_and_surplus_account" />
                     </group>
                 </form>
             </field>
@@ -2368,20 +2387,15 @@
                 <group string="res_config_contents" position="replace">
                     <field name="only_one_chart_template" invisible="1"/>
                     <field name="complete_tax_set" invisible="1"/>
-                    <div groups="base.group_multi_company">
-                        <label for="company_id"/>
-                        <field name="company_id" widget="selection"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
-                    </div>
-                    <group>
-                        <div attrs="{'invisible': [('only_one_chart_template','=',True)]}">
-                            <label for="chart_template_id"/>
+                    <group col="1">
+                        <group attrs="{'invisible': [('only_one_chart_template','=',True)]}">
                             <field name="chart_template_id" widget="selection" on_change="onchange_chart_template_id(chart_template_id)" domain="[('visible','=', True)]"/>
-                        </div>
-                        <newline/>
-                        <group groups="account.group_account_user">
-                            <field name="code_digits"/>
+                        </group>
+                        <group groups="base.group_multi_company">
+                            <field name="company_id" widget="selection" on_change="onchange_company_id(company_id)"/> <!-- we assume that this wizard will be run only by administrators and as this field may cause problem if hidden (because of the default company of the user removed from the selection because already configured), we simply choosed to remove the group "multi company" of it -->
                         </group>
                         <group>
+                            <field name="currency_id" class="oe_inline"/>
                             <field name="sale_tax" attrs="{'invisible': [('complete_tax_set', '!=', True)]}" domain="[('chart_template_id', '=', chart_template_id),('parent_id','=',False),('type_tax_use','in',('sale','all'))]"/>
                             <label for="sale_tax_rate" string="Sale Tax" attrs="{'invisible': [('complete_tax_set', '=', True)]}"/>
                             <div attrs="{'invisible': [('complete_tax_set', '=', True)]}">
@@ -2393,17 +2407,10 @@
                                 <field name="purchase_tax_rate" class="oe_inline"/> %%
                             </div>
                         </group>
+                        <group groups="account.group_account_user">
+                            <field name="code_digits"/>
+                        </group>
                     </group>
-                    <div groups="account.group_account_user">
-                        <label for="bank_accounts_id" string="Bank Information"/>
-                        <field name="bank_accounts_id">
-                            <tree editable="bottom">
-                                <field name="acc_name"/>
-                                <field name="account_type"/>
-                                <field name="currency_id" widget="selection"/>
-                            </tree>
-                        </field>
-                    </div>
                 </group>
             </field>
         </record>
@@ -2417,32 +2424,6 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        <record id="ir_actions_server_action_wizard_multi_chart" model="ir.actions.server">
-            <field name="type">ir.actions.server</field>
-            <field name="condition">True</field>
-            <field name="state">code</field>
-            <field name="model_id" ref="base.model_ir_actions_todo"/>
-            <field eval="5" name="sequence"/>
-            <field name="code">
-# check for unconfigured companies
-account_installer_obj = self.pool.get('account.installer')
-account_installer_obj.check_unconfigured_cmp(cr, uid, context=context)
-action_ids = []
-# fetch the act_window actions related to chart of account configuration
-# we use ir.actions.todo to enable the possibility for other modules to insert their own
-# wizards during the configuration process
-ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'action_wizard_multi_chart')
-if ref:
-    action_ids += [ref[1]]
-ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'action_account_configuration_installer')
-if ref:
-    action_ids += [ref[1]]
-todo_ids = pool.get('ir.actions.todo').search(cr, uid, [('action_id', 'in', action_ids)], context=context)
-pool.get('ir.actions.todo').write(cr, uid, todo_ids, {'state':'open'}, context=context)
-action = pool.get('res.config').next(cr, uid, [], context)
-</field>
-           <field name="name">New Company Financial Setting</field>
-        </record>
 
         <record id="account_account_graph" model="ir.ui.view">
             <field name="name">account.account.graph</field>
@@ -2548,7 +2529,7 @@ action = pool.get('res.config').next(cr, uid, [], context)
                 <header>
                     <button name="button_confirm_cash" states="open" string="Close CashBox" type="object" class="oe_highlight"/>
                     <button name="button_open" states="draft" string="Open CashBox" type="object" class="oe_highlight"/>
-                    <button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
+                    <button name="button_cancel" states="confirm,open" string="Cancel" type="object"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet string="Statement">
@@ -2627,12 +2608,12 @@ action = pool.get('res.config').next(cr, uid, [], context)
                     <group col="6" colspan="4">
                         <group col="2" colspan="2">
                             <separator string="Opening Balance" colspan="4"/>
-                            <field name="balance_start" readonly="1" string="Opening Cash Control"/>
-                            <field name="last_closing_balance" readonly="1" string="Last Closing Balance" />
-                            <field name="total_entry_encoding" />
+                            <field name="balance_start" readonly="1" string="Opening Cash Control" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                            <field name="last_closing_balance" readonly="1" string="Last Closing Balance" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                            <field name="total_entry_encoding" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                         </group>
                         <group string="Closing Balance">
-                            <field name="balance_end"/>
+                            <field name="balance_end" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                         </group>
                     </group>
                 </sheet>
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index 630c551c5ca..abbc81ade2b 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -12,16 +12,6 @@
             <field name="domain">[('year','=',time.strftime('%Y'))]</field>
         </record>
 
-        <record id="action_treasory_graph" model="ir.actions.act_window">
-            <field name="name">Treasury</field>
-            <field name="res_model">account.account</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-            <field name="domain">[('type','=','liquidity')]</field>
-            <field name="context">{'default_type': 'liquidity'}</field>
-            <field name="view_id" ref="account.view_treasory_graph"/>
-        </record>
-
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
             <field name="model">board.board</field>
@@ -29,12 +19,8 @@
                 <form string="Account Board" version="7.0">
                     <board style="2-1">
                         <column>
-                            <action name="%(account.action_invoice_tree1)d" creatable="true" string="Draft Customer Invoices" domain="[('state','in',('draft','proforma2')), ('type','=','out_invoice')]"/>
                             <action name="%(action_company_analysis_tree)d" string="Company Analysis"/>
                         </column>
-                        <column>
-                            <action name="%(action_treasory_graph)d" string="Treasury"/>
-                        </column>
                     </board>
                 </form>
             </field>
diff --git a/addons/account/company.py b/addons/account/company.py
index 1ec9b8c55da..409216f29f0 100644
--- a/addons/account/company.py
+++ b/addons/account/company.py
@@ -32,14 +32,6 @@ class res_company(osv.osv):
             help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
         'paypal_account': fields.char("Paypal Account", size=128, help="Paypal username (usually email) for receiving online payments."),
         'overdue_msg': fields.text('Overdue Payments Message', translate=True),
-        'property_reserve_and_surplus_account': fields.property(
-            'account.account',
-            type='many2one',
-            relation='account.account',
-            string="Reserve and Profit/Loss Account",
-            view_load=True,
-            domain="[('type', '=', 'other')]",
-            help="This account is used for transferring Profit/Loss (If It is Profit: Amount will be added, Loss : Amount will be deducted.), as calculated in Profit & Loss Report"),
     }
 
     _defaults = {
diff --git a/addons/account/company_view.xml b/addons/account/company_view.xml
index 447622b57c5..d5ab6d7753a 100644
--- a/addons/account/company_view.xml
+++ b/addons/account/company_view.xml
@@ -15,18 +15,5 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="view_company_inherit_1_form">
-            <field name="name">res.company.form.inherit</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="model">res.company</field>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='account_grp']" position="inside">
-                    <field name="property_reserve_and_surplus_account"/>
-                    <field name="tax_calculation_rounding_method"/>
-                    <field name="paypal_account"  placeholder="e.g. sales@openerp.com"/>
-                </xpath>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index e8899d0348a..dd27cfbab4e 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -518,7 +518,6 @@
         <!--
         Account Statement Sequences
         -->
-
         <record id="sequence_reconcile" model="ir.sequence.type">
             <field name="name">Account Reconcile</field>
             <field name="code">account.reconcile</field>
@@ -554,8 +553,6 @@
             <field eval="1" name="number_next"/>
             <field eval="1" name="number_increment"/>
         </record>
-
-
         <!--
         Invoice requests (deprecated)
         -->
@@ -564,7 +561,14 @@
             <field name="object">account.invoice</field>
         </record>
 
-
-
+        <!-- mail: subtypes -->
+        <record id="mt_invoice_new" model="mail.message.subtype">
+            <field name="name">created</field>
+            <field name="res_model">account.invoice</field>
+        </record>
+        <record id="mt_invoice_paid" model="mail.message.subtype">
+            <field name="name">paid</field>
+            <field name="res_model">account.invoice</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/account/data/configurable_account_chart.xml b/addons/account/data/configurable_account_chart.xml
index 18e22a5e4f2..eca52109597 100644
--- a/addons/account/data/configurable_account_chart.xml
+++ b/addons/account/data/configurable_account_chart.xml
@@ -45,7 +45,6 @@
         <record id="conf_chart0" model="account.account.template">
             <field name="code">0</field>
             <field name="name">Configurable Account Chart</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="data_account_type_view"/>
         </record>
@@ -382,7 +381,6 @@
             <field name="property_account_income_categ" ref="conf_a_sale"/>
             <field name="property_account_income_opening" ref="conf_o_income"/>
             <field name="property_account_expense_opening" ref="conf_o_expense"/>
-            <field name="property_reserve_and_surplus_account" ref="conf_a_reserve_and_surplus"/>
             <field name="complete_tax_set" eval="False"/>
         </record>
 
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index baa94450f02..984711eceef 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -19,7 +19,6 @@
         <record id="chart0" model="account.account">
             <field name="code">X0</field>
             <field name="name">Chart For Automated Tests</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="data_account_type_view"/>
         </record>
@@ -123,6 +122,14 @@
             <field name="type">other</field>
             <field name="user_type" ref="data_account_type_income"/>
         </record>
+        <record id="usd_bnk" model="account.account">
+            <field name="code">X11007</field>
+            <field name="name">USD Bank Account - (test)</field>
+            <field ref="cas" name="parent_id"/>
+            <field name="type">liquidity</field>
+            <field name="user_type" ref="data_account_type_asset"/>
+            <field name="currency_id" ref="base.USD"/>
+        </record>
 
         <record model="account.account" id="liabilities_view">
             <field name="name">Liabilities - (test)</field>
@@ -297,14 +304,6 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
 
-        <record forcecreate="True" id="property_reserve_and_surplus_account" model="ir.property">
-            <field name="name">property_account_receivable</field>
-            <field name="fields_id" search="[('model','=','res.company'),('name','=','property_reserve_and_surplus_account')]"/>
-            <field eval="'account.account,'+str(rsa)" name="value"/>
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-
-
         <!--
         Account Journal
         -->
@@ -361,8 +360,8 @@
             <field name="type">bank</field>
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_bank_journal"/>
-            <field model="account.account" name="default_debit_account_id" ref="cash"/>
-            <field model="account.account" name="default_credit_account_id" ref="cash"/>
+            <field model="account.account" name="default_debit_account_id" ref="bnk"/>
+            <field model="account.account" name="default_credit_account_id" ref="bnk"/>
             <field name="analytic_journal_id" ref="sit"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
@@ -381,6 +380,16 @@
             <field name="name">Cash Journal - (test)</field>
             <field name="code">TCSH</field>
             <field name="type">cash</field>
+            <field name="profit_account_id" model="account.account" ref="rsa" />
+            <field name="loss_account_id" model="account.account" ref="rsa" />
+            <field name="internal_account_id" model="account.account" ref="rsa" />
+            <field name="with_last_closing_balance" eval="True" />
+            <!--
+                 Usually, cash payment methods requires a control at opening and closing.
+                 Bot for demo data, it's better to avoid the control step so that people
+                 that test OpenERP arrive directly in the touchscreen UI.
+            -->
+            <field name="cash_control" eval="False"/>
             <field name="view_id" ref="account_journal_bank_view"/>
             <field name="sequence_id" ref="sequence_cash_journal"/>
             <field model="account.account" name="default_debit_account_id" ref="cash"/>
@@ -408,6 +417,16 @@
             <field eval="True" name="centralisation"/>
             <field name="user_id" ref="base.user_root"/>
         </record>
+
+        <record id="bank_journal_usd" model="account.journal">
+            <field name="name">USD Bank Journal - (test)</field>
+            <field name="code">TUBK</field>
+            <field name="type">bank</field>
+            <field name="view_id" ref="account_journal_bank_view"/>
+            <field model="account.account" name="default_debit_account_id" ref="usd_bnk"/>
+            <field model="account.account" name="default_credit_account_id" ref="usd_bnk"/>
+            <field name="currency" ref="base.USD"/>
+        </record>
         <!--
         Product income and expense accounts, default parameters
         -->
diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml
index 0eec6d27785..d86ebca3537 100644
--- a/addons/account/edi/invoice_action_data.xml
+++ b/addons/account/edi/invoice_action_data.xml
@@ -40,7 +40,7 @@
             <field name="name">Automated Invoice Notification Mail</field>
             <field name="email_from">${object.user_id.email or object.company_id.email or 'noreply@localhost'}</field>
             <field name="subject">${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })</field>
-            <field name="email_to">${object.partner_id.email or ''}</field>
+            <field name="email_recipients">${object.partner_id.id}</field>
             <field name="model_id" ref="account.model_account_invoice"/>
             <field name="auto_delete" eval="True"/>
             <field name="body_html"><![CDATA[
@@ -123,64 +123,6 @@
     </div>
 </div>
             ]]></field>
-            <field name="body_text"><![CDATA[
-Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
-
-A new invoice is available for ${object.partner_id.name}:
-       | Invoice number: *${object.number}*
-       | Invoice total: *${object.amount_total} ${object.currency_id.name}*
-       | Invoice date: ${object.date_invoice}
-       % if object.origin:
-       | Order reference: ${object.origin}
-       % endif
-       | Your contact: ${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-
-You can view the invoice document, download it and pay online using the following link:
-    ${ctx.get('edi_web_url_view') or 'n/a'}
-
-% if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'):
-<% 
-comp_name = quote(object.company_id.name)
-inv_number = quote(object.number)
-paypal_account = quote(object.company_id.paypal_account)
-inv_amount = quote(str(object.amount_total))
-cur_name = quote(object.currency_id.name)
-paypal_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s"\
-             "&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Invoice_PayNow_%s" % \
-             (paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)
-%>
-It is also possible to directly pay with Paypal:
-    ${paypal_url}
-% endif
-
-If you have any question, do not hesitate to contact us.
-
-
-Thank you for choosing ${object.company_id.name}!
-
-
---
-${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-${object.company_id.name}
-% if object.company_id.street:
-${object.company_id.street or ''}
-% endif
-% if object.company_id.street2:
-${object.company_id.street2}
-% endif
-% if object.company_id.city or object.company_id.zip:
-${object.company_id.zip or ''} ${object.company_id.city or ''}
-% endif
-% if object.company_id.country_id:
-${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
-% endif
-% if object.company_id.phone:
-Phone: ${object.company_id.phone}
-% endif
-% if object.company_id.website:
-${object.company_id.website or ''}
-% endif
-            ]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 174002a8d8d..0d5439719e2 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -9538,7 +9538,7 @@ msgid "Refund"
 msgstr ""
 
 #. module: account
-#: model:email.template,body_text:account.email_template_edi_invoice
+#: model:email.template,body:account.email_template_edi_invoice
 msgid "\n"
 "Hello${object.address_invoice_id.name and ' ' or ''}${object.address_invoice_id.name or ''},\n"
 "\n"
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po
index 7b7fbd86233..21c6d81db1e 100644
--- a/addons/account/i18n/ar.po
+++ b/addons/account/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -145,6 +145,7 @@ msgstr "تسوية"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "المرجع"
 
@@ -163,13 +164,13 @@ msgstr ""
 "إزالتها."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "تحذير!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "يومية ممتنوعة"
@@ -233,7 +234,7 @@ msgstr ""
 "لتظهر على الفواتير."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "فاتورة '%s' ستدفع علي الأجزاء التالية: %s%s of %s%s (%s%s المتبقي)"
@@ -249,7 +250,7 @@ msgid "Belgian Reports"
 msgstr "تقارير دولة بلجيكا"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "لايمكن اضافة أو تعديل البيانات في دفتر يومية مقفل."
@@ -297,7 +298,7 @@ msgid "St."
 msgstr "شارع"
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "الشركة في سطر حساب الفاتورة تختلف عن الشركة في الفاتورة"
@@ -587,8 +588,10 @@ msgid "The accountant confirms the statement."
 msgstr "الحساب يؤكد الكشف"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -646,7 +649,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "المسلسل الرئيسي لابد أن يختلف من الحالي !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "لا توجد نقطة فاصلة في التاريخ أو توجد أكثر من نقطة."
@@ -657,7 +660,7 @@ msgid "Tax Code Amount"
 msgstr "مبلغ رمز الضريبة"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "شباب العمال الاشتراكي."
@@ -684,8 +687,8 @@ msgid "Journal Period"
 msgstr "فترة السجل"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "الشركة يجب ان تكون واحدة لجميع المدخلات حتى يمكن تسويتها"
@@ -764,6 +767,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "يمكن تغيير العملة في مسودة الفتورة"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "التقرير المالي"
@@ -779,12 +783,13 @@ msgstr "التقرير المالي"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "نوع"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -917,12 +922,13 @@ msgid "Create 3 Months Periods"
 msgstr "إنشاء فترة 3 اشهر"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "مستحق"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1006,7 +1012,7 @@ msgstr ""
 "المبلغ الرئيسي (دون الضريبة)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "لا أستطيع تحديد النرميز الأصلي للحساب النموذجي!"
@@ -1039,10 +1045,10 @@ msgid "Code"
 msgstr "رمز"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1107,7 +1113,7 @@ msgstr ""
 "وخصوصياتها."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1155,7 +1161,7 @@ msgstr "قيود دفتر اليومية غير متوازنة"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "مصرف"
@@ -1252,7 +1258,7 @@ msgid "The move of this entry line."
 msgstr "الحركة لخط هذا القيد"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1275,7 +1281,7 @@ msgid "Entry Label"
 msgstr "تسمية القيد"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "لا يمكنك تعديل/مسح يومية بقيود لهذه الفترة"
@@ -1360,14 +1366,15 @@ msgid "Taxes"
 msgstr "الضرائب"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "اختر بداية و نهاية للفترة"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "الأرباح و الخسائر"
 
@@ -1422,6 +1429,7 @@ msgid "Journal Items Analysis"
 msgstr "تحليل عناصر اليومية"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "شركاء"
@@ -1446,8 +1454,10 @@ msgid "Central Journal"
 msgstr "اليومية العامة"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1679,6 +1689,7 @@ msgid "Separated Journal Sequences"
 msgstr "مسلسلات اليومية منفصلة"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "مسئول"
@@ -1708,7 +1719,7 @@ msgid "Year Sum"
 msgstr "جمع السنة"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1783,7 +1794,7 @@ msgid "Customer Ref:"
 msgstr "مرجع العميل"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "المستخدم %s ليس لديه صلاحيات الكتابة و التحرير ليومية %s!"
@@ -2111,7 +2122,7 @@ msgid "Pro-forma"
 msgstr "كمسألة شكلية"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2141,7 +2152,7 @@ msgid "Search Chart of Account Templates"
 msgstr "بحث قوالب دليل الحسابات"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2162,7 +2173,7 @@ msgstr "لا يمكن تعديل الشركه المتسجله في المجله
 #. module: account
 #: report:account.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "رمز العميل"
 
 #. module: account
 #: view:account.installer:0
@@ -2194,7 +2205,7 @@ msgid "Description"
 msgstr "وصف"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2213,7 +2224,7 @@ msgid "Income Account"
 msgstr "حساب الدخل"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "لا يوجد دفتر يومية للمبيعات أو المشتريات معرف!"
@@ -2221,7 +2232,7 @@ msgstr "لا يوجد دفتر يومية للمبيعات أو المشتريا
 #. module: account
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "رقم الحساب RIB أو IBAN غير صحيح"
 
 #. module: account
 #: view:product.category:0
@@ -2253,6 +2264,7 @@ msgstr "قالب المنتج"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2262,6 +2274,7 @@ msgstr "قالب المنتج"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2309,10 +2322,10 @@ msgstr "اتركه فارغ لجميع السنوات المالية المفت
 #. module: account
 #: field:account.invoice.report,account_line_id:0
 msgid "Account Line"
-msgstr ""
+msgstr "سطر الحساب"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2326,6 +2339,8 @@ msgid ""
 "'Setup Your Bank Accounts' tool that will automatically create the accounts "
 "and journals for you."
 msgstr ""
+"إعداد يوميات المحاسبة. لحسابات البنوك، ينصح بإستخدام قسم \"إعداد حسابات "
+"البنك\" فهذا سينتج الحسابات و اليوميات تلقائياً."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
@@ -2343,7 +2358,7 @@ msgid "Main Sequence"
 msgstr "المسلسل الرئيسي"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2418,7 +2433,7 @@ msgid "Account Tax Code"
 msgstr "كود الحساب الضريبي"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2435,7 +2450,7 @@ msgstr ""
 #: model:account.payment.term,name:account.account_payment_term_advance
 #: model:account.payment.term,note:account.account_payment_term_advance
 msgid "30% Advance End 30 Days"
-msgstr ""
+msgstr "30% مقدما لنهاية 30 يوم"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2509,7 +2524,7 @@ msgid "Account Model Entries"
 msgstr "إدخالات نماذج الحسابات"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2569,10 +2584,9 @@ msgstr "هذا التقرير يعطي لمحة عامة عن وضع  يومية
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr ""
+msgstr "سطر حركة حساب التسوية (إلغاء)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2604,7 +2618,7 @@ msgid "Accounts"
 msgstr "حسابات"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "خطأ في الإعدادات!"
@@ -2665,7 +2679,7 @@ msgstr "يمكن للحساب أن يكون رمز رئيسي للضريبة أ
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model, they must be positive!"
-msgstr ""
+msgstr "خطا في قيمة حساب المدين/الدائن في النموذج,يجب ان يكونوا ايجابيين"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
@@ -2700,7 +2714,7 @@ msgstr "تواريخ"
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr ""
+msgstr "قالب المخطط الرئيسي"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -2712,7 +2726,7 @@ msgstr "حساب الضرائب الرئيسي"
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly !"
-msgstr ""
+msgstr "لم يتم تكوين العملة الجديدة بشكل صحيح"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -2726,6 +2740,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "رصيد الشريك العمري"
@@ -2769,7 +2784,7 @@ msgstr "الإعدادات المالية للشركة الجديدة"
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Chart of Accounts"
-msgstr ""
+msgstr "تكوين مخططاتك الحسابية"
 
 #. module: account
 #: view:account.use.model:0
@@ -2777,14 +2792,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "سيقوم هذا المعالج بإنشاء قيود محاسبية تكرارية"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "لا يوجد مسلسل معرف لهذه اليومية !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2796,7 +2811,7 @@ msgstr "عليك بتعريف يومية تحليلية في يومية '%s' !"
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance!"
-msgstr ""
+msgstr "انت تحتاج ليوميه إفتتاحية شاملة علامة المركزيه لضبط الرصيد المبدئي!"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -2808,7 +2823,7 @@ msgstr "رموز الضريبة"
 #. module: account
 #: view:account.account:0
 msgid "Unrealized Gains and losses"
-msgstr ""
+msgstr "الأرباح و الخسائر الغير محققة"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
@@ -2889,12 +2904,12 @@ msgid "Base Code Amount"
 msgstr "مبلغ الرمز الرئيسي"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
 "refund it instead."
-msgstr ""
+msgstr "لا يمكنك حذف فاتورة مفتوحة او تم دفعها. يمكنك القيام بعملية رد."
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
@@ -2902,10 +2917,10 @@ msgid "Default Sale Tax"
 msgstr "ضريبة البيع الإفتراضية"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
-msgstr ""
+msgstr "يتم التحقق من صحة الفاتورة '%s'"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2942,12 +2957,14 @@ msgid "Fiscal Position"
 msgstr "الوضع المالي"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
 "Click on compute to update the tax base."
 msgstr ""
+"القاعده الضريبيه مختلفه!\n"
+"انقر علي الحساب لتحديث القاعده الضريبيه."
 
 #. module: account
 #: field:account.partner.ledger,page_split:0
@@ -2996,7 +3013,7 @@ msgstr "عملة الفاتورة"
 #: field:accounting.report,account_report_id:0
 #: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
 msgid "Account Reports"
-msgstr ""
+msgstr "تقارير الحساب"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -3021,7 +3038,7 @@ msgstr "قائمة قالب الضريبة"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
-msgstr ""
+msgstr "بيع/شراء الدفاتر اليومية"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -3096,7 +3113,7 @@ msgid "View"
 msgstr "عرض"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3110,7 +3127,7 @@ msgstr "سطور تحليلية"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma Invoices"
-msgstr ""
+msgstr "الفواتير المفترضة"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
@@ -3125,7 +3142,7 @@ msgstr "دين العميل"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month: 0"
-msgstr ""
+msgstr "  يوم من الشهر"
 
 #. module: account
 #: view:account.subscription:0
@@ -3172,7 +3189,7 @@ msgstr ""
 #. module: account
 #: view:report.account.sales:0
 msgid "This months' Sales by type"
-msgstr ""
+msgstr "هذه شهور المبيعات وفقا لنوع"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3182,7 +3199,7 @@ msgstr "حساب التسوية / إلغاءها"
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "The description must be unique per company!"
-msgstr ""
+msgstr "وصف لكل شركة يجب ان تكون فريد!"
 
 #. module: account
 #: help:account.account.type,close_method:0
@@ -3284,7 +3301,7 @@ msgstr "إعداد برنامج المحاسبة"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: 0.02"
-msgstr ""
+msgstr "  قيمة الرصيد:0.02"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -3299,7 +3316,7 @@ msgid "Starting Balance"
 msgstr "رصيد أول المدة"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "لا يوجد شريك معرف !"
@@ -3314,7 +3331,7 @@ msgstr "إغلاق الفترة"
 #. module: account
 #: field:account.financial.report,display_detail:0
 msgid "Display details"
-msgstr ""
+msgstr "عرض التقاصيل"
 
 #. module: account
 #: report:account.overdue:0
@@ -3353,10 +3370,10 @@ msgid "Chart of Tax"
 msgstr "خريطة الضريبة"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
-msgstr ""
+msgstr "الرصيد الختامي ينبغي ان يكون نفس الرصيد المحسوب"
 
 #. module: account
 #: view:account.journal:0
@@ -3433,17 +3450,18 @@ msgstr ""
 #. module: account
 #: view:account.invoice.line:0
 msgid "Quantity :"
-msgstr ""
+msgstr "الكمية"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
-msgstr ""
+msgstr "طول الفترة (أيام)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
-msgstr ""
+msgstr "طيع البيع/الشراء اليومية"
 
 #. module: account
 #: field:account.invoice.report,state:0
@@ -3470,12 +3488,12 @@ msgstr "تقرير المبيعات حسب نوع الحساب"
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr ""
+msgstr "بنود يوميه لم تتم تسويتها"
 
 #. module: account
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr ""
+msgstr "رمز العملة يجب ان يكون فريدا لكل شركة"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3483,7 +3501,7 @@ msgid "Detail"
 msgstr "تفاصيل"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3491,6 +3509,10 @@ msgid ""
 "amount greater than the total invoiced amount. The latest line of your "
 "payment term must be of type 'balance' to avoid rounding issues."
 msgstr ""
+"لا يمكن انشاء الفاتوره !\n"
+"شروط الدفع من المحتمل أن تكون غير مضبوطه لانه يعطي الكميه المحسوبه اكبر من "
+"المبلغ الاجمالي في الفاتوره. أخر سطر من شروط الدفع يجب ان يكون من نوع \" "
+"المتوازن\" لتجنب مشاكل تقريب الأرقام."
 
 #. module: account
 #: report:account.invoice:0
@@ -3498,9 +3520,16 @@ msgid "VAT :"
 msgstr "ضريبة القيمة المضافة:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3521,10 +3550,10 @@ msgid "Centralised counterpart"
 msgstr "النظير المركزي"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
-msgstr ""
+msgstr "لا يمكن انشاء وحدات يوميه علي \"عرض \"الحساب%s%s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -3546,6 +3575,7 @@ msgstr "(إذا لم تختار سنة مالية سيتم التعامل مع 
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3573,10 +3603,17 @@ msgstr "(إذا لم تختار سنة مالية سيتم التعامل مع 
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "تاريخ"
 
@@ -3593,7 +3630,6 @@ msgstr "إلغاء التسوية"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3607,7 +3643,7 @@ msgid "Chart of Accounts Template"
 msgstr "قالب شجرة الحسابات"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3619,7 +3655,7 @@ msgstr ""
 "الرجاء حدد شريك عليها!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "بعض القيود تمت تسويتها من قبل !"
@@ -3650,13 +3686,15 @@ msgstr "الميزانيات"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "لا مرشحات"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Pro-forma Invoices"
-msgstr ""
+msgstr "شكل الفاتورة"
 
 #. module: account
 #: view:res.partner:0
@@ -3733,7 +3771,7 @@ msgid "Analytic Items"
 msgstr "عناصر تحليلية"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "لا يمكن تغيير الضريبة !"
@@ -3746,7 +3784,7 @@ msgstr "#القيود"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft Refund"
-msgstr ""
+msgstr "إنشاء مشروع استرداد"
 
 #. module: account
 #: view:account.state.open:0
@@ -3764,13 +3802,15 @@ msgid "Mapping"
 msgstr "مقابلة"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
 "centralised counterpart box in the related journal from the configuration "
 "menu."
 msgstr ""
+"لا يمكن إنشاء فاتوره في يوميه مركزيه. قم بإلغاء التحديد علي مربع المناظره "
+"المركزيه المتعلق بقيد اليوميه من قائمة الإعدادت."
 
 #. module: account
 #: field:account.account,name:0
@@ -3778,6 +3818,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3791,10 +3832,10 @@ msgid "Account Aged Trial balance Report"
 msgstr "ميزان المراجعة للحسابات المعمرة"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
-msgstr ""
+msgstr "لا يمكن انشاء عناصر اليومية لحساب مغلق%s%s"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -3805,7 +3846,7 @@ msgstr "التاريخ الفعلي"
 #: model:ir.actions.act_window,name:account.action_bank_tree
 #: model:ir.ui.menu,name:account.menu_action_bank_tree
 msgid "Setup your Bank Accounts"
-msgstr ""
+msgstr "اعداد الحسابات المصرفية الخاصة بك"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
@@ -3837,6 +3878,7 @@ msgid ""
 "The fiscalyear, periods or chart of account chosen have to belong to the "
 "same company."
 msgstr ""
+"السنة المالية.الفترات او المخطط للحساب تختار علي ان تنتمي إلى نفس الشركة"
 
 #. module: account
 #: model:ir.actions.todo.category,name:account.category_accounting_configuration
@@ -3852,7 +3894,7 @@ msgstr "المحاسبة"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current year"
-msgstr ""
+msgstr "قيود اليومية مع فترة في العام الحالي"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3870,6 +3912,8 @@ msgid ""
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
 msgstr ""
+"قيمة الخسارة أو الربح بسبب التغيرات في سعر الصرف عند القيام بعمليات مالية  "
+"متعددة العملات."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3949,7 +3993,7 @@ msgstr "متوسط النسبة"
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr ""
+msgstr "عرض الحسابات"
 
 #. module: account
 #: view:account.state.open:0
@@ -3990,7 +4034,7 @@ msgstr "اذا تم وضع الحقل النشط لخطأ, ستسمح لك بإ
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr ""
+msgstr "نشر عناصر اليومية"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4005,12 +4049,12 @@ msgstr "مسودة المدخلات"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month= -1"
-msgstr ""
+msgstr "  يوم في الشهر = -١"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Number of Days: 30"
-msgstr ""
+msgstr "  عدد الأيام: ٣٠"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -4021,7 +4065,7 @@ msgstr "إختصار"
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The start date of the fiscal year must be before his end date."
-msgstr ""
+msgstr "خطأ! يجب أن يكون تاريخ بدء السنة المالية يكون قبل تاريخ نهايتها"
 
 #. module: account
 #: view:account.account:0
@@ -4080,6 +4124,8 @@ msgid ""
 "You haven't supplied enough argument to compute the initial balance, please "
 "select a period and journal in the context."
 msgstr ""
+"لم تكن قد قدمت الوسيطه الكافيه لحساب التوازن المبدأي من فضلك اختار الفتره "
+"وقيد اليوميه علي هذا السياق"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -4118,18 +4164,20 @@ msgid "Month"
 msgstr "شهر"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
 "some non legal fields or you must unconfirm the journal entry first! \n"
 "%s"
 msgstr ""
+"انت لا تستطيع عمل  هذا التعديل علي تأكيد الدخول! انت تستطيع تغير بعض الحقول "
+"الغير قانونيه تماما  او يجب عدم تعديل  ادخال القيود اليوميه اولا! %s"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr ""
+msgstr "حساب باي بال"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
@@ -4145,7 +4193,7 @@ msgstr "ملحوظة"
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Reverse balance sign"
-msgstr ""
+msgstr "عكس علامة التوازن"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -4157,7 +4205,7 @@ msgstr "حساب المتأخرات"
 #: code:addons/account/account.py:184
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr ""
+msgstr "الميزانية العامة (حسابات الخصوم)"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4175,7 +4223,7 @@ msgid "Account Base Code"
 msgstr "رمز حساب الأساس"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "لا يوجد حساب مصروف معرف لهذا المنتج: \"%s\" (id:%d)"
@@ -4253,7 +4301,7 @@ msgstr "المعالجة الدورية"
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "لا يمكنك إنشاء سطر تحليلي في حساب للعرض."
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4282,7 +4330,7 @@ msgstr "خريطة الحساب"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Main Title 1 (bold, underlined)"
-msgstr ""
+msgstr "العنوان الرئيسي(سميك,تحته خط)"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -4303,7 +4351,7 @@ msgstr "إحصائيات الفواتير"
 #. module: account
 #: field:account.account,exchange_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "سعر الصرف"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@@ -4336,7 +4384,7 @@ msgstr "غير مطبق"
 #. module: account
 #: field:account.chart.template,visible:0
 msgid "Can be Visible?"
-msgstr ""
+msgstr "هل تكون واضحة؟"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
@@ -4351,7 +4399,7 @@ msgstr "أوراق دائنة"
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
-msgstr ""
+msgstr "اسم الفترة يجب ان يكون فريد لكل شركة"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4371,6 +4419,9 @@ msgid ""
 "you want to generate accounts of this template only when loading its child "
 "template."
 msgstr ""
+"وضع هذا  للخطأ لو انك لا تريد هذا النموذج لكي يستخدم منشطا في المعالجة التي "
+"تنشأ رسم البياني المحاسبي من النموذج . هذا يكون مفيد عندما تريد انشاء حسابات "
+"من هذا النموذج فقط عندما يتم تحميل النموذج الصغير"
 
 #. module: account
 #: view:account.use.model:0
@@ -4384,11 +4435,11 @@ msgid "Allow Reconciliation"
 msgstr "السماح بالتسوية"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
-msgstr ""
+msgstr "لا يمكنك تعديل الشركة لهذه الفترة حيث ان بعض عناصر اليومية موجودة"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -4418,10 +4469,10 @@ msgid "Recurring Models"
 msgstr "نماذج التكرارات"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
-msgstr ""
+msgstr "خطا الترميز"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4430,6 +4481,7 @@ msgstr "٤"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "تغيير"
 
@@ -4474,7 +4526,7 @@ msgid "Example"
 msgstr "مثال"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4490,10 +4542,10 @@ msgid "Keep empty to use the income account"
 msgstr "لإستخدام حساب الدخل اتركه فارغ"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
-msgstr ""
+msgstr "ضريبة الشراء %0.2f%%"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -4518,7 +4570,7 @@ msgstr "تخصيص الحساب"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "عميل"
@@ -4534,7 +4586,7 @@ msgid "Cancelled Invoice"
 msgstr "فاتورة ملغاة"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4590,7 +4642,7 @@ msgid "Income Account on Product Template"
 msgstr "الحساب الوارد على القالب المنتج"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4599,6 +4651,7 @@ msgstr ""
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
 msgstr ""
+"$(الموضوع-معرف_الشركة.الاسم)الفاتورة$(المرجع$(الموضوع.الرقم او 'n/a'))"
 
 #. module: account
 #: help:res.partner,last_reconciliation_date:0
@@ -4615,18 +4668,20 @@ msgstr "سنة مالية جديدة"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "الفواتير"
 
 #. module: account
 #: view:account.invoice:0
 msgid "My invoices"
-msgstr ""
+msgstr "الفواتير"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
@@ -4649,7 +4704,7 @@ msgstr "مفوتر"
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
-msgstr ""
+msgstr "نشر قيود اليومية"
 
 #. module: account
 #: view:account.use.model:0
@@ -4663,6 +4718,8 @@ msgid ""
 "account if this is a Customer Invoice or Supplier Refund, otherwise a "
 "Partner bank account number."
 msgstr ""
+"رقم الحساب البنكي الذي تم دفع الفاتوره. حساب الشركة المصرفي اذا كان  يمثل "
+"فاتوره العميل او استرداد مورد ذلك رقم حساب المصرفي للشريك"
 
 #. module: account
 #: view:account.state.open:0
@@ -4712,12 +4769,12 @@ msgstr ""
 #: code:addons/account/account.py:923
 #, python-format
 msgid "Opening Period"
-msgstr ""
+msgstr "افتتاح الفترة"
 
 #. module: account
 #: view:account.move:0
 msgid "Journal Entries to Review"
-msgstr ""
+msgstr "لاستعراض قيود اليومية"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4756,26 +4813,24 @@ msgid "Journal Items"
 msgstr "عناصر اليومية"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "خطأ"
@@ -4838,6 +4893,8 @@ msgid ""
 "From this view, have an analysis of your treasury. It sums the balance of "
 "every accounting entries made on liquidity accounts per period."
 msgstr ""
+"بمجرد النظر تحليل الماليه الخاصة بك. يجمع هذا التوازن من كل القيود الحسابيه "
+"الصادره ف فتره سيوله الحسابات"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -4858,7 +4915,7 @@ msgstr "حركات"
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this month"
-msgstr ""
+msgstr "مبيع اليومية لهذا الشهر"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
@@ -4879,10 +4936,10 @@ msgstr "للغلق"
 #. module: account
 #: field:account.treasury.report,date:0
 msgid "Beginning of Period Date"
-msgstr ""
+msgstr "بداية تاريخ الفترة"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4908,7 +4965,7 @@ msgid "Child Tax Accounts"
 msgstr "الحسابات الضريبية للانتاج"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "بداية الفترة يجب أن تكون أقل من نهاية الفترة"
@@ -4931,6 +4988,7 @@ msgstr "رصيد تحليلي -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4963,7 +5021,7 @@ msgstr "تحركات الهدف"
 #: model:account.payment.term,name:account.account_payment_term_net
 #: model:account.payment.term,note:account.account_payment_term_net
 msgid "30 Net Days"
-msgstr ""
+msgstr "صافي ٣٠ يوم"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -4974,6 +5032,8 @@ msgstr "نوع الفترة"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "مدفوعات"
 
@@ -5006,13 +5066,16 @@ msgid ""
 "encode the sale and purchase rates or choose from list of taxes. This last "
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
+"من المنطقي انك تساعد علي الاختيار لو انك تريد ان تقترح علي  المستخدم  انه "
+"يقوم بتشفير معدلات البيع والشراء او يختار من قائمة الضرائب . الاختيار الاخير "
+" يفترض  ان مجموعه من الضرائب المحدده  في هذا النموذج  تكون قد اكتملت."
 
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
 #: model:ir.model,name:account.model_account_financial_report
 msgid "Account Report"
-msgstr ""
+msgstr "تقرير الحساب"
 
 #. module: account
 #: field:account.journal.column,name:0
@@ -5047,7 +5110,7 @@ msgid "Line 1:"
 msgstr "الخط 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "خطأ بالسلامة !"
@@ -5080,6 +5143,7 @@ msgstr "نتيجة التسوية"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "الميزانية العمومية"
@@ -5093,7 +5157,7 @@ msgstr "اليوميات العامة"
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date in Period"
-msgstr ""
+msgstr "فحص البيانات في الفتره"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
@@ -5156,6 +5220,7 @@ msgstr "تقرير"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5195,7 +5260,7 @@ msgstr "مسمى للأم"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Accounts with a past deadline."
-msgstr ""
+msgstr "تحليل الحسابات المرتبطه بالموعد النهائي السابق"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -5232,7 +5297,7 @@ msgstr "إحصائيات القيود التحليلية"
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Cash and Banks"
-msgstr ""
+msgstr "النقدية و البنوك"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
@@ -5285,7 +5350,6 @@ msgstr "تقرير الحساب/الحساب المشترك"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "إتصالات"
 
@@ -5298,7 +5362,7 @@ msgstr "محاسبة تحليلية"
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include Initial Balances"
-msgstr ""
+msgstr "نشمل الارصدة الابتدائية"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -5311,7 +5375,7 @@ msgstr "رد مال للعميل"
 #: constraint:account.move:0
 msgid ""
 "You can not create more than one move per period on centralized journal"
-msgstr ""
+msgstr "لا يمكنك إنشاء أكثر من حركة لكل فترة في يومية مركزية"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5329,7 +5393,7 @@ msgstr "أُنشأ تقرير الفواتير في خلال اخر 15 يومً
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Number of Days: 14"
-msgstr ""
+msgstr "  عدد الايام:14"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
@@ -5337,13 +5401,13 @@ msgid "End of Year Entries Journal"
 msgstr "قيود اليومية الختامية للسنة"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5352,7 +5416,7 @@ msgstr "خطأ في الإعدادات!"
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
-msgstr ""
+msgstr "المبلغ للدفع"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5393,7 +5457,7 @@ msgstr "تغيير العملة"
 #. module: account
 #: view:account.invoice:0
 msgid "This action will erase taxes"
-msgstr ""
+msgstr "هذا الفعل سوف يمحو الضرائب"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
@@ -5416,10 +5480,9 @@ msgstr "حسابات تحليلية"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer Invoices And Refunds"
-msgstr ""
+msgstr "فواتير العملاء، والمبالغ المستردة"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5462,7 +5525,7 @@ msgstr "رقم (حركة)"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries during last 7 days"
-msgstr ""
+msgstr "قيود تحليلية خلال اخر 7 أيام"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -5536,7 +5599,7 @@ msgstr "فتح صندو النقدية"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Automatic formatting"
-msgstr ""
+msgstr "تنسيق تلقائي"
 
 #. module: account
 #: code:addons/account/account.py:963
@@ -5545,6 +5608,8 @@ msgid ""
 "No fiscal year defined for this date !\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
+"لا يوجد سنة مالية  محددة بهذا التاريخ.الرجاء انشاء واحدة من تكوين في قائمة "
+"المحاسبة"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5590,7 +5655,7 @@ msgid "Generate Opening Entries"
 msgstr "إنشاء القيود الإفتتاحية"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "تمت تسويتها!"
@@ -5603,7 +5668,7 @@ msgstr "منهج المحاسبة للمبلغ الضريبي."
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due Date Computation"
-msgstr ""
+msgstr "حساب تاريخ المستحق"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
@@ -5623,14 +5688,14 @@ msgid "Child Accounts"
 msgstr "حسابات فرعية"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr ""
+msgstr "نقل اسم(معرف):%s(%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "إلغاء"
@@ -5650,7 +5715,7 @@ msgstr "الدخل"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "مورِّد"
@@ -5680,7 +5745,7 @@ msgid "Account n°"
 msgstr "الحساب"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "مرجع حر"
@@ -5695,7 +5760,9 @@ msgstr "تقييم"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "حسابات الدائنون و المدينون"
@@ -5801,19 +5868,19 @@ msgid "Filter by"
 msgstr "ترشيح بـ"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
-msgstr ""
+msgstr "لديك تعبير خاطئ\"%(...)s\"في نموذجك"
 
 #. module: account
 #: field:account.bank.statement.line,date:0
 msgid "Entry Date"
-msgstr ""
+msgstr "ادخال الناريخ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "لا يمكنك إستخدام حساب غير نشط!"
@@ -5827,14 +5894,14 @@ msgstr "المدخلات ليست من نفس الحساب او تم تسويت
 #. module: account
 #: help:account.bank.statement,balance_end:0
 msgid "Balance as calculated based on Starting Balance and transaction lines"
-msgstr ""
+msgstr "الرصيد محسوب علي اساس بدايه الرصيد و المعاملات الحسابيه التي تمت"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly !"
-msgstr ""
+msgstr "العملة الحالية غير معرفة بشكل صحيح"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
@@ -5854,8 +5921,8 @@ msgid "Number of Days"
 msgstr "عدد الأيام"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5870,7 +5937,7 @@ msgstr "فترة  : %s"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
 msgid "Review your Financial Journals"
-msgstr ""
+msgstr "مراجعه القيود اليوميه الماليه الخاصه بك"
 
 #. module: account
 #: help:account.tax,name:0
@@ -5904,7 +5971,7 @@ msgstr "رد للعملاء"
 #. module: account
 #: field:account.account,foreign_balance:0
 msgid "Foreign Balance"
-msgstr ""
+msgstr "رصيد اجنبي"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -5917,7 +5984,7 @@ msgid "Multipication factor for Base code"
 msgstr "عامل المضاعفة لكود القاعدة"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "غير مطبق"
@@ -5940,7 +6007,7 @@ msgstr ""
 #. module: account
 #: view:account.subscription:0
 msgid "Running Subscription"
-msgstr ""
+msgstr "إشتراك مفعلة"
 
 #. module: account
 #: report:account.invoice:0
@@ -5956,6 +6023,8 @@ msgstr "تحليل القيود التحليلية"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "سابق"
 
@@ -5966,13 +6035,15 @@ msgid ""
 "You can not define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+"خطأ في الإعدادات!\n"
+"لا يمكنك تحديد فرع لحساب مع نوع داخلي مختلف من \"عرض\"! "
 
 #. module: account
 #: help:res.partner.bank,journal_id:0
 msgid ""
 "This journal will be created automatically for this bank account when you "
 "save the record"
-msgstr ""
+msgstr "دفتر اليومية سوف ينشا تلقائيا لهذا الحساب البنكي عند حفظ هذا السجل"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -6050,7 +6121,7 @@ msgstr "هذا نموذج لقيود حسابات تكرارية"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax_rate:0
 msgid "Sales Tax(%)"
-msgstr ""
+msgstr "ضريبة المبيعات(%)"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -6083,6 +6154,9 @@ msgid ""
 "choice assumes that the set of tax defined for the chosen template is "
 "complete"
 msgstr ""
+"من المنطقي ان يساعدك علي الاختيار لو انت تريد ان تقترح علي المستخدم تشفير "
+"معدلات البيع والشراء او استخدام الحقول العاديه m2o.هذا الاختيار الأخير يفترض "
+"وضع الضريبه المعرفه من اجل اختيار النموذج تكون مكتمله"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -6097,12 +6171,12 @@ msgstr "الشركات"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Open and Paid Invoices"
-msgstr ""
+msgstr "فتح ودفع الفواتير"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children flat"
-msgstr ""
+msgstr "عرض الفرع الثابت"
 
 #. module: account
 #: code:addons/account/account.py:629
@@ -6110,7 +6184,7 @@ msgstr ""
 msgid ""
 "You can not remove/desactivate an account which is set on a customer or "
 "supplier."
-msgstr ""
+msgstr "لا يمكنك إزالة / إلغاء حساب الذي تم تعيينه كأحد العملاء أو الموردين."
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -6195,7 +6269,7 @@ msgstr "الدائنون"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "يجب ان تكون الشركة هي نفسها لها الصلة بحسابها و فترتها."
 
 #. module: account
 #: view:account.invoice:0
@@ -6225,7 +6299,7 @@ msgstr "صندوق نقدية"
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_equity
 msgid "Equity"
-msgstr ""
+msgstr "الأسهم"
 
 #. module: account
 #: selection:account.tax,type:0
@@ -6234,6 +6308,8 @@ msgstr "النسبة"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "يومية و شريك"
 
@@ -6243,10 +6319,10 @@ msgid "Power"
 msgstr "طاقة"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
-msgstr ""
+msgstr "لا يمكن انشاء رمز قيد يوميه غير مستخدم"
 
 #. module: account
 #: view:project.account.analytic.line:0
@@ -6285,6 +6361,7 @@ msgid "Applicable Type"
 msgstr "نوع قابل للتطبيق"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "مرجع الفاتورة"
@@ -6357,7 +6434,7 @@ msgstr "إنشاء إختياري"
 msgid ""
 "You cannot change the owner company of an account that already contains "
 "journal items."
-msgstr ""
+msgstr "لا يمكنك تغيير شركة مالكة لحساب يحتوي بالفعل علي عناصر يومية."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -6414,7 +6491,7 @@ msgstr "للقراءة فقط"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Valuation: Balance"
-msgstr ""
+msgstr "  تقييم: الميزانية"
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
@@ -6431,7 +6508,7 @@ msgstr "يجب ان تكون النسبة المئوية لأجل الدفع م
 #. module: account
 #: field:account.installer,has_default_company:0
 msgid "Has Default Company"
-msgstr ""
+msgstr "لديه شركة افتراضية"
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
@@ -6453,7 +6530,7 @@ msgstr "يومية تحليلية"
 #: code:addons/account/account.py:622
 #, python-format
 msgid "You can not desactivate an account that contains some journal items."
-msgstr ""
+msgstr "لا يمكنك الغاء حساب يحتوي علي بعض عناصر اليومية"
 
 #. module: account
 #: view:account.entries.report:0
@@ -6509,11 +6586,11 @@ msgstr "إحصائيات  القيود التحليلية"
 #: code:addons/account/account.py:624
 #, python-format
 msgid "You can not remove an account containing journal items."
-msgstr ""
+msgstr "لا يمكنك حذف حساب يحتوي علي عناصر اليومية."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "القيود: "
@@ -6526,10 +6603,10 @@ msgstr "إنشاء قيد يومية تكرارية يدوياً في يومية
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr ""
+msgstr "العملة لها علاقة بحساب اليومية."
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "غير قادر على انشاء تحرك بين الشركات المختلفة"
@@ -6556,7 +6633,7 @@ msgstr ""
 #: code:addons/account/account.py:183
 #, python-format
 msgid "Balance Sheet (Asset account)"
-msgstr ""
+msgstr "الميزانية العمومية(حساب الاصول)"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6575,13 +6652,13 @@ msgstr "والحالة هي السحب"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "إجمالي الخصم"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "المدخل \"%s\" غير صالح !"
@@ -6623,7 +6700,7 @@ msgstr "كود بايثون"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current period"
-msgstr ""
+msgstr "قيود اليومية  بفترات خاصة الفترة الحالية"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -6649,31 +6726,32 @@ msgstr "إنشاء قيد"
 #: code:addons/account/account.py:182
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr ""
+msgstr "الأرباح و الخسائر (حساب المصاريف)"
 
 #. module: account
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6685,12 +6763,12 @@ msgstr "خطأ !"
 #. module: account
 #: field:account.financial.report,style_overwrite:0
 msgid "Financial Report Style"
-msgstr ""
+msgstr "هيئة التقرير المالي"
 
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Preserve balance sign"
-msgstr ""
+msgstr "المحافظه علي علامة التوازن"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -6705,8 +6783,8 @@ msgid "Printed"
 msgstr "مطبوع"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "خطأ :"
@@ -6749,6 +6827,8 @@ msgid ""
 "row to display the amount of debit/credit/balance that precedes the filter "
 "you've set."
 msgstr ""
+"إذا اخترت ترشيح علي حسب تاريخ أو فترة.هذا الحقل يتيح لك اضافة صف لعرض كمية "
+"حساب المدين/حساب الدائن/الميزانية التي سبق تعيينها بالترشيح"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6765,7 +6845,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "إعرض تقرير ليدجر مع شريك واحد لكل صفحة"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6891,7 +6971,7 @@ msgstr ""
 #: field:account.chart.template,complete_tax_set:0
 #: field:wizard.multi.charts.accounts,complete_tax_set:0
 msgid "Complete Set of Taxes"
-msgstr ""
+msgstr "مجموعة كاملة من الضرائب"
 
 #. module: account
 #: view:account.chart.template:0
@@ -6910,6 +6990,9 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"رجاءً حدد كود البنك (BIC/Swift) لحسابات البنوك من نوع IBAN وذلك لإجراء "
+"عمليات مقبولة."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -6924,7 +7007,7 @@ msgid "Total:"
 msgstr "الإجمالي:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6951,10 +7034,10 @@ msgstr "رموز الفرعي"
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Sales"
-msgstr ""
+msgstr "الضرائب المستخدمة في المبيعات"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7027,14 +7110,14 @@ msgid "Source Document"
 msgstr "مستند المصدر"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
-msgstr ""
+msgstr "لا يمكنك إزالة قيد يومية مرحل \"%s\" !"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7048,7 +7131,7 @@ msgstr "تسوية القوائم"
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
 msgid "Accounting Report"
-msgstr ""
+msgstr "تقارير محاسبية"
 
 #. module: account
 #: report:account.invoice:0
@@ -7075,7 +7158,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr ""
+msgstr "التسلسل الهرمي للتقارير المالية"
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
@@ -7139,21 +7222,23 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "هل انت متأكد أنك تريد فتح هذه الفاتورة ؟"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
 "configuration of the accounting menu."
 msgstr ""
+"لا يمكن العثور علي الرسم البياني المحاسبي, يجب ان تنشأ واحد من تشكيل القائمة "
+"الحسابيه"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
 msgid "Opening Entries Expense Account"
-msgstr ""
+msgstr "قتح قيود حساب المصروف"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "مدخلات المحاسبة"
@@ -7193,12 +7278,12 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr ""
+msgstr "قيود مرحلة"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For percent enter a ratio between 0-1."
-msgstr ""
+msgstr "للنسبة أدخل كسر بين رقمي ٠ - ١."
 
 #. module: account
 #: report:account.invoice:0
@@ -7211,7 +7296,7 @@ msgstr "تاريخ الفاتورة"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "تجميع حسب السنة لتاريخ الفاتورة"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -7272,7 +7357,7 @@ msgstr "ضريبة المشتريات الإفتراضية"
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
 msgid "Opening Entries Income Account"
-msgstr ""
+msgstr "فتح قيود حساب الدخل"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7290,7 +7375,7 @@ msgstr ""
 "لإنشاء ضرائب محددة في مجال مخصص."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "ينبغي عليك اختيار الفترات التي تمتد الى نفس الشركة"
@@ -7298,7 +7383,7 @@ msgstr "ينبغي عليك اختيار الفترات التي تمتد الى
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
 msgid "Review your Payment Terms"
-msgstr ""
+msgstr "معاينة شروط الدفع"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
@@ -7313,7 +7398,7 @@ msgstr "إنشاء قيود"
 #. module: account
 #: view:res.partner:0
 msgid "Information About the Bank"
-msgstr ""
+msgstr "معلومات عن البنك"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
@@ -7321,8 +7406,8 @@ msgid "Reporting"
 msgstr "التقارير"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7335,7 +7420,7 @@ msgstr "تحذير"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_analytic_open
 msgid "Contracts/Analytic Accounts"
-msgstr ""
+msgstr "العقود /الحسابات التحليليه"
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
@@ -7384,7 +7469,7 @@ msgstr "استخدم النموذج"
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)!"
-msgstr ""
+msgstr "لم يتم قبول الرصيد الإفتتاحي (قيمة سالبة)!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7409,7 +7494,7 @@ msgstr "خط الفاتورة"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr ""
+msgstr "المبالغ المسترده من العملاء والموردين"
 
 #. module: account
 #: field:account.financial.report,sign:0
@@ -7417,18 +7502,18 @@ msgid "Sign on Reports"
 msgstr "إمضاء التقرير"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
-msgstr ""
+msgstr "الفترات لانشاء قيود الافتتاحيه لاتوجد"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
 msgid "Root/View"
-msgstr ""
+msgstr "جذور / عرض او نظره"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7463,13 +7548,14 @@ msgid "Optional Information"
 msgstr "معلومات خيارية"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "دفتر اليومية يجب أن يتضمن حساب إفتراضي دائن و أخر مدين"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7490,7 +7576,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_multi_currency
 msgid "Multi-Currencies"
-msgstr ""
+msgstr "متعدد العملة"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
@@ -7498,13 +7584,13 @@ msgid "Maturity Date"
 msgstr "تاريخ الاستحقاق"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "حساب سئ !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "يومية المبيعات"
@@ -7521,7 +7607,7 @@ msgid "Invoice Tax"
 msgstr "ضريبة الفاتورة"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "لا يوجد رقم للقطعة !"
@@ -7530,7 +7616,7 @@ msgstr "لا يوجد رقم للقطعة !"
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr ""
+msgstr "المسلسل الهرمي لتقارير الحسابات"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -7541,11 +7627,15 @@ msgid ""
 "few new accounts (You don't need to define the whole structure that is "
 "common to both several times)."
 msgstr ""
+"هذا الحقل الاختاري يسمح لك بربط نوذج الحساب بنموذج مخطط معين الذي ربما يختلف "
+"من واحده الاصل ينتمي الي الجذر . هذا يسمحلك بتحديد النموذجالمخطط الذي يتمدد "
+"واستكمال ذلك بقليل من الحسابات الجديده(انك لاتحتاج لتحديد كل البناء الذي "
+"يكون شائع لعدة مرات"
 
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr ""
+msgstr "قيود يومية غير مرحلة"
 
 #. module: account
 #: view:product.product:0
@@ -7571,10 +7661,10 @@ msgstr "إلى"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
-msgstr ""
+msgstr "تعديل العملة"
 
 #. module: account
 #: field:account.fiscalyear.close,fy_id:0
@@ -7593,6 +7683,8 @@ msgstr "إلغاء الفواتير المختارة"
 msgid ""
 "This field is used to generate legal reports: profit and loss, balance sheet."
 msgstr ""
+"يستخدم هذا الحقل لإعداد التقارير القانونية: الأرباح و الخسائر و الميزانية "
+"العمومية."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
@@ -7602,6 +7694,9 @@ msgid ""
 "terms for each letter. Each customer or supplier can be assigned to one of "
 "these payment terms."
 msgstr ""
+"شروط الدفع  هي من شروط دفع العميل او المورد للفاتوره في واحد او مدفوعات "
+"عديده .  تذكير العملاء المتكررين سوف يستخدموا شروط الدفع لكل حرف. كل عميل او "
+"مورد يمكن ان يرمز لواحده من هذه شروط الدفع"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -7619,16 +7714,18 @@ msgstr "مايو"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "حسابات الدائنون"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
-msgstr ""
+msgstr "الضرائب العلميه المحدده لكنها لا تكون في اسطر الفاتوره"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
@@ -7640,7 +7737,7 @@ msgstr "القوالب لجدول الحساب"
 msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones."
-msgstr ""
+msgstr "تسلسل الحقل يستخدم لترتيب الموارد من ادني تسلسل الي الاعلي منها"
 
 #. module: account
 #: field:account.tax.code,code:0
@@ -7669,7 +7766,7 @@ msgstr "اسم التقرير"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "نقدي"
@@ -7681,15 +7778,15 @@ msgid "Account Destination"
 msgstr "وجهة الحساب"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7720,17 +7817,17 @@ msgstr "مسلسل"
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "خطأ ! لا يمكن إنشاء فئات متداخلة."
 
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr ""
+msgstr "كمية اختيارية للقيود."
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Parent Report"
-msgstr ""
+msgstr "تقرير رئيسي"
 
 #. module: account
 #: view:account.state.open:0
@@ -7779,7 +7876,7 @@ msgstr "    ٧ أيام    "
 #. module: account
 #: field:account.bank.statement,balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "ميزانية محسوبة"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -7845,13 +7942,14 @@ msgstr "ثابت"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "تحذير !"
@@ -7903,11 +8001,11 @@ msgid "Select a currency to apply on the invoice"
 msgstr "اختر عملة للفاتورة"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
-msgstr ""
+msgstr "حساب المصرف المعرف في الدليل المحاسبي المحدد ليس لديه رمز."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:108
@@ -7916,7 +8014,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "لايمكن السجل %s/الشكلية/الغاء الفاتورة."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "لا سطور للفاتورة !"
@@ -7984,6 +8082,11 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
+"الرسم البياني المحاسبي الطبيعي هو بناء يحدد عن طريق المتطلبات القانونيه "
+"للبلد . تحليل بناء الرسم البياني المحاسبي يجب ان يعكس احتياجات العمل الخاص "
+"بك من تقارير التكاليف والايرادات . الهيكل التنظيمي يكون عادتا من العقود "
+"والمشاريع والمنتجات او الاقسام . معظم العمليات المفتوحة (البورصه) (الفواتير -"
+"المصروفات-الجدول الزمني).تنشا قيود تحليليه متعلقه بالحساب"
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -7991,7 +8094,7 @@ msgid "Deferral Method"
 msgstr "طريقة التأجيل"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "تم دفع الفاتورة ‘%s‘."
@@ -8019,7 +8122,7 @@ msgstr ""
 #: help:account.account,reconcile:0
 msgid ""
 "Check this box if this account allows reconciliation of journal items."
-msgstr ""
+msgstr "فحص هذا الصندوق لو ان هذا الحساب يسمح بتحقيق الملائمه للبنود اليوميه"
 
 #. module: account
 #: help:account.period,state:0
@@ -8049,7 +8152,7 @@ msgstr "قيود تحليلية"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "This Months Sales by type"
-msgstr ""
+msgstr "مبيعات هذه الشهور وفقا للنوع"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8057,7 +8160,7 @@ msgid "Associated Partner"
 msgstr "شريك متحد"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "يجب عليك اولاً اختيار شريك !"
@@ -8081,6 +8184,13 @@ msgid ""
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' state is used when user cancel invoice."
 msgstr ""
+" حاله المسوده بتتعمل لما المستخدم يكون يعمل فاتوره جديده و مش متأكد منها.\n"
+"الفاتوره المبدئيه بتتعمل لما يكون الاتفاق مبدئيومش بيكون ليها رقم.\n"
+"الحاله المفتوحه لما المستخدم يعمل فاتوره ويكون ليها رقم وتفضل مفتوحه طالما "
+"ثمن الفاتوره متسددتش.\n"
+" تتحول اوتوماتيكي لفاتوره مسدده لما العميل يسدد ثمنها وممكن تتعدل القيود "
+"اليوميه المتعلقه بيها.\n"
+"حاله الالغاء هي تستخدم لما العميل يلغي فاتوره."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -8105,11 +8215,11 @@ msgstr ""
 "الضرائب مع اكواد تتعلق بالبيان القانوني وفقاً لبلدكم."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
-msgstr ""
+msgstr "لم نستطع ايجاد اي دليل محاسبي لحسابات هذه الشركة، يجب انشاء واحدة."
 
 #. module: account
 #: view:account.invoice:0
@@ -8127,7 +8237,7 @@ msgid "Choose Fiscal Year"
 msgstr "اختار السنة المالية"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "يومية تسديد الشراء"
@@ -8140,12 +8250,12 @@ msgstr "للضرائب ادخل النسبة % بين 0 و 1."
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current Accounts"
-msgstr ""
+msgstr "الحسابات الحالية"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "رتب حسب تاريخ الفاتورة"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -8186,6 +8296,8 @@ msgid ""
 "Total amount (in Company currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"المبلغ الاجمالي (بعملة الشركة) للعمليات المالية التي عقدت بالعملة الثانوية "
+"لهذا الحساب."
 
 #. module: account
 #: report:account.invoice:0
@@ -8215,12 +8327,14 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "احسب الكود للضرائب مشتملة على القيم"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
 "unreconcile related payment entries first!"
 msgstr ""
+"انك لا تستطيع الغاءالفاتوره التي تم دفع جزء منها !انك تحتاج عدم توفيق متعلق "
+"بقيود الدفع اولا"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
@@ -8230,7 +8344,7 @@ msgstr "حساب التصنيف الوارد"
 #. module: account
 #: field:account.account,adjusted_balance:0
 msgid "Adjusted Balance"
-msgstr ""
+msgstr "الرصيد المعدل"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -8251,7 +8365,7 @@ msgstr "المبلغ الاساسي/الضريبة"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Valuation: Percent"
-msgstr ""
+msgstr "  تقييم: النسبة المئوية"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -8320,7 +8434,7 @@ msgstr "الدفع"
 #: field:account.bank.statement,balance_end_real:0
 #: field:account.treasury.report,ending_balance:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "رصيد ختامي"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -8351,15 +8465,17 @@ msgstr "تقرير مشترك للحساب"
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "current month"
-msgstr ""
+msgstr "الشهر الجاري"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
 "Please create one."
 msgstr ""
+"لايوجد فترة معرفةلهذا التاريخ:%s!\n"
+"قم بإنشاء واحدة."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
@@ -8387,7 +8503,7 @@ msgstr "أنواع الحساب"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: n.a"
-msgstr ""
+msgstr "  قيمة المبلغ: غير معروف"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8433,10 +8549,12 @@ msgstr "سدد اليومية"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "ترشيح بـ"
 
@@ -8457,7 +8575,7 @@ msgstr ""
 #, python-format
 msgid ""
 "In order to close a period, you must first post related journal entries."
-msgstr ""
+msgstr "لكي تغلق الفتره  يجب ان تعمل قيود يوميه متعلقه بالفتره"
 
 #. module: account
 #: view:account.entries.report:0
@@ -8472,10 +8590,10 @@ msgid "The partner account used for this invoice."
 msgstr "يستخدم حساب الشريك لهذه الفاتورة."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
-msgstr ""
+msgstr "ضرائب  %.2f%%"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8495,7 +8613,7 @@ msgid "Payment Term Line"
 msgstr "سطر شروط السداد"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "يومية المشتريات"
@@ -8581,10 +8699,10 @@ msgid "Unpaid Invoices"
 msgstr "فواتير غير مدفوعة"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
-msgstr ""
+msgstr "مصطلح الدفع للمورد  ليس لديه خط  دفع الأجل!"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -8621,7 +8739,7 @@ msgstr "حساب تعيين المالية"
 #. module: account
 #: view:board.board:0
 msgid "Draft Customer Invoices"
-msgstr ""
+msgstr "مسوده قوائم حساب العملاء"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_configuration_misc
@@ -8649,12 +8767,12 @@ msgstr "اسم اليومية"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr ""
+msgstr "قيود اليوميه للشريك القادمه للتطابق"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Smallest Text"
-msgstr ""
+msgstr "أصغر نص"
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
@@ -8687,7 +8805,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "اتركه فارغ لكل السنوات المالية المفتوحة"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "تم تأكيد تحرك الحساب (%s) للمركزية!"
@@ -8700,13 +8818,16 @@ msgid ""
 msgstr "تم التعبير عن المبلغ في عملة اخرى اختيارية اذا كانت مدخل عملة متعدد."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
 "Make sure you have configured payment terms properly !\n"
 "The latest payment term line should be of the type \"Balance\" !"
 msgstr ""
+"لايسمح لك باعطاء صلاحيه لقيود غير متوازنه\n"
+"تأكد انك قمت بشروط الدفع بشكل صحيح\n"
+"اخر سطر من شروط الدفع يجب ان يكون من نوع المتوازن"
 
 #. module: account
 #: view:account.account:0
@@ -8778,10 +8899,10 @@ msgid "Contact Address"
 msgstr "عنوان جهة الإتصال"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
-msgstr ""
+msgstr "نموذج خاطئ !"
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -8802,6 +8923,11 @@ msgid ""
 "accounts that are typically more credited than debited and that you would "
 "like to print as positive amounts in your reports; e.g.: Income account."
 msgstr ""
+"كل الحسابات التي عادت يكون فيها الجانب المدين اكبر من الدائن ولذلك يظهر لك "
+"قيم سالبه في التقارير الخاصه بك فيجب ان تكون عكس علامه التوازن مثال ذلك "
+"حسابات المصروفات وينطبق الشئ نفسه عل اذا كانت الحسابات عادة يكون فيها جانب "
+"الدائن اكبر من جانب المدين فان ذلك يظهر لك قيم موجبه في التقارير الخاصه بك "
+"مثال ذلك حساب الدخل"
 
 #. module: account
 #: field:res.partner,contract_ids:0
@@ -8813,12 +8939,14 @@ msgstr "عقود"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "مجهول"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "يومية القيود الإفتتاحية"
@@ -8839,10 +8967,10 @@ msgstr ""
 "الخسارة: سيتم خصم المبلغ.)، والذي يحسب من تقرير الربح والخسارة"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
-msgstr ""
+msgstr "من فضلك حدد تسلسل دفاتير اليومية التي لها علاقة بهذه الفاتورة"
 
 #. module: account
 #: view:account.move:0
@@ -8850,12 +8978,12 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.move.line,narration:0
 msgid "Internal Note"
-msgstr ""
+msgstr "ملاحظة داخلية"
 
 #. module: account
 #: view:report.account.sales:0
 msgid "This year's Sales by type"
-msgstr ""
+msgstr "مبيعات هذه السنة وفقا للنوع"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -8908,7 +9036,7 @@ msgstr "سطور القيود"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
 msgid "Review your Financial Accounts"
-msgstr ""
+msgstr "معاينة حساباتك المالية"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
@@ -8929,7 +9057,7 @@ msgid "Period from"
 msgstr "من الفترة"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "يومية رد المبيعات"
@@ -8976,7 +9104,7 @@ msgid "Purchase Tax(%)"
 msgstr "ضريبة المشتريات (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "قم بإنشاء سطور للفاتورة."
@@ -8989,10 +9117,10 @@ msgstr "عزيزي سيدي / سيدتي،"
 #. module: account
 #: field:account.vat.declaration,display_detail:0
 msgid "Display Detail"
-msgstr ""
+msgstr "عرض التفاصيل"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9029,11 +9157,9 @@ msgstr "نهاية الفترة"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
-msgstr ""
+msgstr "تقارير مالية"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9045,6 +9171,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9065,6 +9192,7 @@ msgstr "بداية الفترة"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "إتجاه التحليل"
 
@@ -9084,7 +9212,7 @@ msgstr "عرض اليومية"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "إجمالي الإئتمان"
@@ -9152,6 +9280,7 @@ msgstr "كشوف حساب البنك"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9232,7 +9361,7 @@ msgstr ""
 "الحسابات\"."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "يجب إختيار الحسابات للتسوية"
@@ -9258,7 +9387,6 @@ msgstr ""
 "مفتوحا تبعا لأنشطة الشركة خلال فترة محددة."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "ترشيح بـ"
@@ -9280,7 +9408,7 @@ msgid "Move"
 msgstr "نقل"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "لا يمكنك تغيير الضريبة, يجب عليك ازالة واعادة انشاء الخطوط !"
@@ -9288,7 +9416,7 @@ msgstr "لا يمكنك تغيير الضريبة, يجب عليك ازالة و
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 365 days"
-msgstr ""
+msgstr "قيود تحليلية لآخر ٣٦٥ يوم"
 
 #. module: account
 #: report:account.central.journal:0
@@ -9336,7 +9464,7 @@ msgid "Consolidated Children"
 msgstr "فرعي موحد"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9346,7 +9474,7 @@ msgstr "يجب ان يكون لليومية نظير مركزي بدون تخط
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
-msgstr ""
+msgstr "فواتير العميل و المورد"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -9385,7 +9513,7 @@ msgstr "رصيد الحساب التحليلي"
 msgid ""
 "No opening/closing period defined, please create one to set the initial "
 "balance!"
-msgstr ""
+msgstr "لا يوجد فتح/اغلاق فترة محددة,لرجاء إنشاء واحد لضبط الرصيد الأولي"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9397,6 +9525,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9434,6 +9563,10 @@ msgid ""
 "journals. Select 'Opening/Closing Situation' for entries generated for new "
 "fiscal years."
 msgstr ""
+"تحديد البيع بدفع الفواتير اليوميه للعميل.تحديد الشراء بفواتير اليوميه "
+"للمورد. تحديد النقديه ب القيود اليوميه المستخدمه في مدفوعات العميل والمورد. "
+"تحديد العام بالعمليات اليوميه المتنوعة. تحديد حالات الفتح والقفل بانشاء قيود "
+"يوميه للسنه الماليه الجديده"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
@@ -9453,6 +9586,7 @@ msgstr "إشتراك القيد"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9460,6 +9594,7 @@ msgstr "إشتراك القيد"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9486,6 +9621,8 @@ msgid ""
 "It indicates that the invoice has been paid and the journal entry of the "
 "invoice has been reconciled with one or several journal entries of payment."
 msgstr ""
+"يوضح هذا ان الفاتوره تم دفعها والقيود اليوميه للفاتوره تكون متطابقه مع واحده "
+"وعدة قيود يوميه من الدفع"
 
 #. module: account
 #: view:account.invoice:0
@@ -9502,7 +9639,7 @@ msgid "Unreconciled"
 msgstr "غير مسوي"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "إجمالي سئ!"
@@ -9567,7 +9704,7 @@ msgid "Comparison"
 msgstr "مقارنة"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "خطأ غير معروف"
@@ -9605,6 +9742,7 @@ msgstr "التحقق من حركة الحساب"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9636,7 +9774,7 @@ msgstr ""
 #: code:addons/account/account.py:181
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr ""
+msgstr "الأرباح و الخسائر(حساب الدخل)"
 
 #. module: account
 #: constraint:account.account:0
@@ -9645,6 +9783,9 @@ msgid ""
 "You can not select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 msgstr ""
+"التكوين الخطأ!\n"
+"لا يمكنك اختيار  نوع الحساب باستخدام  طريقة التأجيل المختلفه \"عدم "
+"المساواه\" للحسابات من النوع الداخلي \"الدفع / القبض\" "
 
 #. module: account
 #: view:account.model:0
@@ -9681,7 +9822,7 @@ msgstr "عام"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 30 days"
-msgstr ""
+msgstr "قيود تحليلة لاخر 30 يوما"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -9708,9 +9849,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "فترات"
 
@@ -9738,7 +9881,7 @@ msgstr "أبريل/ نيسان"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr ""
+msgstr "تقرير للربح (الخسارة) المقدم"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -9762,7 +9905,7 @@ msgstr ""
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 2 (bold)"
-msgstr ""
+msgstr "عنوان ٢ (سميك)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -9802,6 +9945,8 @@ msgid ""
 "When new statement is created the state will be 'Draft'.\n"
 "And after getting confirmation from the bank it will be in 'Confirmed' state."
 msgstr ""
+"عندما يتم انشاء بيانا جديدا فان هذا يكون في حاله المسوده\n"
+"وبعد الحصول علي تأكيد من المصرف البنكي سيكون في حاله مؤكده"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period
@@ -9878,6 +10023,7 @@ msgstr "مرحَلة"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9922,10 +10068,10 @@ msgstr "مسلسل السنوات المالية"
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "No detail"
-msgstr ""
+msgstr "لا تفاصيل"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "لا يوجد حساب دخل معرّف لهذا المنتج: \"%s\" (id:%d)"
@@ -9933,14 +10079,14 @@ msgstr "لا يوجد حساب دخل معرّف لهذا المنتج: \"%s\" (
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "لا يمنك إنشاء عناصر يومية في حساب مغلق."
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
 #: model:ir.actions.act_window,name:account.action_account_gain_loss
 #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
 msgid "Unrealized Gain or Loss"
-msgstr ""
+msgstr "مكاسب أو خسائر غير محققة"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9953,14 +10099,15 @@ msgstr "حالات"
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
 msgid "Auto-email confirmed invoices"
-msgstr ""
+msgstr "رسائل لتأكيد الفواتير"
 
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr ""
+msgstr "إجمالي المحقق"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9981,6 +10128,7 @@ msgstr "اليومية: الكل"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9995,7 +10143,9 @@ msgstr "اليومية: الكل"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10005,6 +10155,8 @@ msgstr "اليومية: الكل"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10083,7 +10235,7 @@ msgstr "حسابات فارغة؟ "
 #. module: account
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "يجب أن يكون اليومية و الفترة مرتبطين لشركة واحدة."
 
 #. module: account
 #: view:account.invoice:0
@@ -10113,7 +10265,7 @@ msgstr ""
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "انشاء دليل الحسابات من قالب للدليل"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -10165,6 +10317,7 @@ msgstr "فاتورة المورد"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10184,7 +10337,7 @@ msgstr "مدين"
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 3 (bold, smaller)"
-msgstr ""
+msgstr "عنوان ٣ (سميك، أصغر)"
 
 #. module: account
 #: field:account.invoice,invoice_line:0
@@ -10198,8 +10351,10 @@ msgstr "خطأ ! لا يمكنك انشاء قوالب الحاسب العودي
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
-msgstr ""
+msgstr "رقم قيد اليومية"
 
 #. module: account
 #: view:account.subscription:0
@@ -10213,9 +10368,11 @@ msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
 "contains journal items!"
 msgstr ""
+"انك لا تستطيع تغير نوع الحساب من حساب مقفل الي اي نوع اخر  الذي يحتوي علي "
+"عناصر قيود اليوميه"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "قيد اليومية مسوي بالفعل"
@@ -10238,7 +10395,7 @@ msgstr "مدى"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr ""
+msgstr "تحليل البنود اليوميه مرتبطه بالقيود اليوميه للشراء"
 
 #. module: account
 #: help:account.account,type:0
@@ -10251,8 +10408,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "مع حركات"
@@ -10290,7 +10449,7 @@ msgstr "طباعة اليوميات التحليلية"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "مجموعة من شهر تاريخ الفاتورة"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -10373,8 +10532,8 @@ msgid "Statistic Reports"
 msgstr "تقارير إحصائية"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "حساب سئ!"
@@ -10382,7 +10541,7 @@ msgstr "حساب سئ!"
 #. module: account
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted by"
-msgstr ""
+msgstr "قيود يوميه مصنفه حسب"
 
 #. module: account
 #: help:account.move,state:0
@@ -10400,7 +10559,7 @@ msgid "Accounts Mapping"
 msgstr "مقابلة الحسابات"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "الفاتورة '%s' منتظرة  للتحقق."
@@ -10417,7 +10576,7 @@ msgstr "نوفمبر/تشرين الثاني"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: refund invoice, reconcile and create a new draft invoice"
-msgstr ""
+msgstr "تعديل : فاتوره مبلغ معاد , التوفيق وانشاء مسوده فاتوره جديده"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -10590,6 +10749,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10667,6 +10827,8 @@ msgstr "إكتمال"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "مستقبل"
 
@@ -11700,3 +11862,9 @@ msgstr ""
 #~ "لا يمكن إنشاء تسلسل تلقائي لهذه الجزئية!\n"
 #~ "\n"
 #~ "ضع تسلسل في تعريف اليومية للترقيم التلقائي أو خلق سلسلة يدويا لهذه الجزئية."
+
+#~ msgid "Install your Chart of Accounts"
+#~ msgstr "تنصيب دليلك المحاسبي"
+
+#~ msgid "Description On Invoices"
+#~ msgstr "الوصف في الفاتوره"
diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po
index 568b62eb13a..4151c2f5039 100644
--- a/addons/account/i18n/bg.po
+++ b/addons/account/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:00+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -146,6 +146,7 @@ msgstr "Обедини"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Означение"
 
@@ -164,16 +165,16 @@ msgstr ""
 "без да го изтривате."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Предупреждение!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
-msgstr ""
+msgstr "Различни дневници"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -189,7 +190,7 @@ msgstr "Всички аналитични записи"
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
-msgstr ""
+msgstr "Име на колона"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:95
@@ -234,7 +235,7 @@ msgstr ""
 "Отметнете ако не искате в тази фактура да участват ДДС свързани данъци"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Фактура '%s' е частично платена: %s%s от %s%s (%s%s остатък)"
@@ -250,7 +251,7 @@ msgid "Belgian Reports"
 msgstr "Белгийски отчети"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Не може да добавяте/променяте записи в закрит дневник."
@@ -300,7 +301,7 @@ msgid "St."
 msgstr "Ул."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -589,8 +590,10 @@ msgid "The accountant confirms the statement."
 msgstr "Счетоводителят потвърждава декларацията."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -649,7 +652,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Главната последователност трябва да е различна от настоящата!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "Липса на период или множество намерени периоди за тази дата."
@@ -660,7 +663,7 @@ msgid "Tax Code Amount"
 msgstr "Сума за данъчен код"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -687,8 +690,8 @@ msgid "Journal Period"
 msgstr "Период на дневник"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -767,6 +770,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Можете да сменяте валутата само на фактури в статус проект (чернова)"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Финансов отчет"
@@ -782,12 +786,13 @@ msgstr "Финансов отчет"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Тип"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -923,12 +928,13 @@ msgid "Create 3 Months Periods"
 msgstr "Раздели на тримесечни периоди"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "За плащане"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1010,7 +1016,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1043,10 +1049,10 @@ msgid "Code"
 msgstr "Код"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1110,7 +1116,7 @@ msgstr ""
 "повече информация за съответното счетоводство и неговите спицифики."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1159,7 +1165,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Банка"
@@ -1256,7 +1262,7 @@ msgid "The move of this entry line."
 msgstr "Движение по този ред от запис"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1279,7 +1285,7 @@ msgid "Entry Label"
 msgstr "Етикет на запис"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "Не може да променяте/изтривате дневник със записи от този период !"
@@ -1365,14 +1371,15 @@ msgid "Taxes"
 msgstr "Данъци"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Задайте начален и краен период"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Отчет за приходите и разходите"
 
@@ -1427,6 +1434,7 @@ msgid "Journal Items Analysis"
 msgstr "Анализ на журналните единици"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Партньори"
@@ -1451,8 +1459,10 @@ msgid "Central Journal"
 msgstr "Централен дневник"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1683,6 +1693,7 @@ msgid "Separated Journal Sequences"
 msgstr "Разделени журнални последователности"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Отговорник"
@@ -1713,7 +1724,7 @@ msgid "Year Sum"
 msgstr "Годишна сума"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1789,7 +1800,7 @@ msgid "Customer Ref:"
 msgstr "Отпратка към клиент:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2112,7 +2123,7 @@ msgid "Pro-forma"
 msgstr "Про-форма"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2136,7 +2147,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Търсене в шаблони за сметкоплан"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2185,7 +2196,7 @@ msgid "Description"
 msgstr "Описание"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2204,7 +2215,7 @@ msgid "Income Account"
 msgstr "Приходна сметка"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Няма счетоводен дневник за продажби/покупки!"
@@ -2244,6 +2255,7 @@ msgstr "Шаблон за продукт"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2253,6 +2265,7 @@ msgstr "Шаблон за продукт"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2303,7 +2316,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2334,7 +2347,7 @@ msgid "Main Sequence"
 msgstr "Основна последователност"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2408,7 +2421,7 @@ msgid "Account Tax Code"
 msgstr "Данъчен код"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2489,7 +2502,7 @@ msgid "Account Model Entries"
 msgstr "Запис на модела на сметка"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2555,7 +2568,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2587,7 +2599,7 @@ msgid "Accounts"
 msgstr "Сметки"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Грешка при настройване!"
@@ -2708,6 +2720,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Стар партньорски баланс"
@@ -2755,14 +2768,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Този помощник ще създаде повтарящи се счетоводни записи"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Не са зададени последоватености за този дневник !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2865,7 +2878,7 @@ msgid "Base Code Amount"
 msgstr "Сума по основен код"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2878,7 +2891,7 @@ msgid "Default Sale Tax"
 msgstr "Данък продажба по подразбиране"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2919,7 +2932,7 @@ msgid "Fiscal Position"
 msgstr "Фискална позиция"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3073,7 +3086,7 @@ msgid "View"
 msgstr "Изглед"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3265,7 +3278,7 @@ msgid "Starting Balance"
 msgstr "Начален баланс"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Не е зададен партньор !"
@@ -3319,7 +3332,7 @@ msgid "Chart of Tax"
 msgstr "Графика на данък"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3402,6 +3415,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3448,7 +3462,7 @@ msgid "Detail"
 msgstr "Подробно"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3463,9 +3477,16 @@ msgid "VAT :"
 msgstr "ДДС :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3486,7 +3507,7 @@ msgid "Centralised counterpart"
 msgstr "Централизирано копие"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3513,6 +3534,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3540,10 +3562,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Дата"
 
@@ -3560,7 +3589,6 @@ msgstr "Връщане приравняване"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3574,7 +3602,7 @@ msgid "Chart of Accounts Template"
 msgstr "Диаграма на шаблони на сметка"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3583,7 +3611,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Някой записи вече са били приравнени !"
@@ -3614,6 +3642,8 @@ msgstr "Бюджети"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3698,7 +3728,7 @@ msgid "Analytic Items"
 msgstr "Аналитични артикули"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Не може да се сменя данъка !"
@@ -3729,7 +3759,7 @@ msgid "Mapping"
 msgstr "Планиране"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3743,6 +3773,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3756,7 +3787,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4076,7 +4107,7 @@ msgid "Month"
 msgstr "Месец"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4133,7 +4164,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Няма зададена сметка разходи за този продукт: \"%s\" (id:%d)"
@@ -4340,7 +4371,7 @@ msgid "Allow Reconciliation"
 msgstr "Разрешаване на приравняване"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4374,7 +4405,7 @@ msgid "Recurring Models"
 msgstr "Повтарящи се модели"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4386,6 +4417,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Промяна"
 
@@ -4430,7 +4462,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4446,7 +4478,7 @@ msgid "Keep empty to use the income account"
 msgstr "Запазете празно за да изпозвате сметката за приходи"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4474,7 +4506,7 @@ msgstr "Свързване на сметки"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Клиент"
@@ -4490,7 +4522,7 @@ msgid "Cancelled Invoice"
 msgstr "Отменена фактура"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4542,7 +4574,7 @@ msgid "Income Account on Product Template"
 msgstr "Сметка приход в шаблона за продукт"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4567,11 +4599,13 @@ msgstr "Нова финансова година"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Фактури"
 
@@ -4708,26 +4742,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Грешка"
@@ -4830,7 +4862,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4856,7 +4888,7 @@ msgid "Child Tax Accounts"
 msgstr "Подчинени сметки за данъци"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4879,6 +4911,7 @@ msgstr "Аналитичен баланс -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4922,6 +4955,8 @@ msgstr "Вид период"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Плащания"
 
@@ -4996,7 +5031,7 @@ msgid "Line 1:"
 msgstr "Ред 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Грешка за цялостност !"
@@ -5029,6 +5064,7 @@ msgstr "Резултат от изравняване"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Баланс"
@@ -5105,6 +5141,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5234,7 +5271,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Комуникация"
 
@@ -5286,13 +5322,13 @@ msgid "End of Year Entries Journal"
 msgstr "Днвеник за записи в края на годината"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5366,7 +5402,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5532,7 +5567,7 @@ msgid "Generate Opening Entries"
 msgstr "Създаване на начални записи"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Вече равнено!"
@@ -5565,14 +5600,14 @@ msgid "Child Accounts"
 msgstr "Подчинени сметки"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Отписване"
@@ -5592,7 +5627,7 @@ msgstr "Приход"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Доставчик"
@@ -5622,7 +5657,7 @@ msgid "Account n°"
 msgstr "Сметка n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Свободна отпратка"
@@ -5637,7 +5672,9 @@ msgstr "Оценяване"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Сметки за получаване и плащане"
@@ -5733,7 +5770,7 @@ msgid "Filter by"
 msgstr "Подреждане по"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5744,8 +5781,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Не може да използвате неактивна сметка!"
@@ -5786,8 +5823,8 @@ msgid "Number of Days"
 msgstr "Брой дни"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5849,7 +5886,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "не е реализирано"
@@ -5886,6 +5923,8 @@ msgstr "Анализ аналитични записи"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Предишен"
 
@@ -6160,6 +6199,8 @@ msgstr "Процентно"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Дневник и партньор"
 
@@ -6169,7 +6210,7 @@ msgid "Power"
 msgstr "Степенуване"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6211,6 +6252,7 @@ msgid "Applicable Type"
 msgstr "Приложими видове"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Отпратка на фактура"
@@ -6434,8 +6476,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Записи: "
@@ -6451,7 +6493,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Не може да създаде движение между различни фирми"
@@ -6490,13 +6532,13 @@ msgstr "Състоянието е чернова"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Общ дебит"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Запис \"%s\" е невалиден !"
@@ -6568,25 +6610,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6618,8 +6661,8 @@ msgid "Printed"
 msgstr "Отпечатан"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6674,7 +6717,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6828,7 +6871,7 @@ msgid "Total:"
 msgstr "Общо:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6866,7 +6909,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6934,14 +6977,14 @@ msgid "Source Document"
 msgstr "Документ източник"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7037,8 +7080,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Сигурни ли сте че искате да отворите тази фактура?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7051,7 +7094,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Записи на сметка"
@@ -7187,7 +7230,7 @@ msgstr ""
 "програмистите да създадат специфичен данък в потребителски домейн."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7218,8 +7261,8 @@ msgid "Reporting"
 msgstr "Справки"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7308,7 +7351,7 @@ msgid "Sign on Reports"
 msgstr "Подпис върху справки"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7319,7 +7362,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7354,13 +7397,14 @@ msgid "Optional Information"
 msgstr "Допълнителна информация"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Дневника трябва да има сметки по подрабиране за кредит и дебит"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7389,13 +7433,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Грешна сметка !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Дневник продажби"
@@ -7412,7 +7456,7 @@ msgid "Invoice Tax"
 msgstr "Данък на фактура"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Няма номер на цена !"
@@ -7462,7 +7506,7 @@ msgstr "До"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7510,13 +7554,15 @@ msgstr "Май"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Разплащателни сметки"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7560,7 +7606,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "В брой"
@@ -7572,15 +7618,15 @@ msgid "Account Destination"
 msgstr "Предназначение на Сметката"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7732,13 +7778,14 @@ msgstr "Фиксиран"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Предупреждение !"
@@ -7790,7 +7837,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Изберете валута за фактурата"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7803,7 +7850,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Не може да %s проект/проформа/отказ на фактура"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Няма фактурни редове!"
@@ -7877,7 +7924,7 @@ msgid "Deferral Method"
 msgstr "Отложен метод"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Фактура '%s' е платена."
@@ -7941,7 +7988,7 @@ msgid "Associated Partner"
 msgstr "Асоцииран партньор"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Първо трябва да изберете партньор !"
@@ -7987,7 +8034,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8009,7 +8056,7 @@ msgid "Choose Fiscal Year"
 msgstr "Изберете финансова година"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Дневник обезщетения за покупки"
@@ -8098,7 +8145,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Изчисляващ код за данъци, включени в цените"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8228,7 +8275,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8307,10 +8354,12 @@ msgstr "Дневник за обещетения"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Филтриране по"
 
@@ -8343,7 +8392,7 @@ msgid "The partner account used for this invoice."
 msgstr "Партньорска сметка използвана за тази фактура"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8366,7 +8415,7 @@ msgid "Payment Term Line"
 msgstr "Ред на условие за плащане"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Дневник за поръчки"
@@ -8451,7 +8500,7 @@ msgid "Unpaid Invoices"
 msgstr "Неплатени фактури"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8558,7 +8607,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Оставете празно за всички отворени данъчни години"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "Движение по сметка (%s) за централизиране е потвърдено!"
@@ -8572,7 +8621,7 @@ msgstr ""
 "Сумата изразена във възможна друга валута ако записа е в повече валути"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8645,7 +8694,7 @@ msgid "Contact Address"
 msgstr "Адрес за контакт"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8680,12 +8729,14 @@ msgstr "Договори"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "неизвестен"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Отваряне на Журнал със записи"
@@ -8704,7 +8755,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8792,7 +8843,7 @@ msgid "Period from"
 msgstr "Период от"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Дневник обезщетения за продажби"
@@ -8839,7 +8890,7 @@ msgid "Purchase Tax(%)"
 msgstr "Данък покупка (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8855,7 +8906,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8891,8 +8942,6 @@ msgstr "Край на период"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8907,6 +8956,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8927,6 +8977,7 @@ msgstr "Начало на период"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Ръководтсво за анализ"
 
@@ -8946,7 +8997,7 @@ msgstr "Изглед на дневник"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Общо кредит"
@@ -9011,6 +9062,7 @@ msgstr "Банкови извлечения"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9086,7 +9138,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Трябва да изберете сметки за изравняване"
@@ -9108,7 +9160,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Филтри по"
@@ -9130,7 +9181,7 @@ msgid "Move"
 msgstr "Преместване"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9189,7 +9240,7 @@ msgid "Consolidated Children"
 msgstr "Косолидирани подчинени сметки"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9250,6 +9301,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9306,6 +9358,7 @@ msgstr "Абонамент за запис"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9313,6 +9366,7 @@ msgstr "Абонамент за запис"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9355,7 +9409,7 @@ msgid "Unreconciled"
 msgstr "Неприравнен"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Грешна обща сума !"
@@ -9414,7 +9468,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Непозната грешка"
@@ -9453,6 +9507,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9551,9 +9606,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Периоди"
 
@@ -9715,6 +9772,7 @@ msgstr "Публикувано"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9762,7 +9820,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Няма зададена приходна сметка за продукта: \"%s\" (id:%d)"
@@ -9798,6 +9856,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9818,6 +9877,7 @@ msgstr "Журнал: Всички"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9832,7 +9892,9 @@ msgstr "Журнал: Всички"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9842,6 +9904,8 @@ msgstr "Журнал: Всички"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9995,6 +10059,7 @@ msgstr "Фактура за доставчик"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10028,6 +10093,8 @@ msgstr "Грешка! Не може да създавате рекурсивни
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -10045,7 +10112,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Записа вече е приравнен"
@@ -10081,8 +10148,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "С движения"
@@ -10198,8 +10267,8 @@ msgid "Statistic Reports"
 msgstr "Статистически отчети"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Грешна сметка!"
@@ -10225,7 +10294,7 @@ msgid "Accounts Mapping"
 msgstr "Свързване на сметки"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Фактура '%s' очаква проверка."
@@ -10415,6 +10484,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10488,6 +10558,8 @@ msgstr "Падеж"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Бъдеще"
 
diff --git a/addons/account/i18n/br.po b/addons/account/i18n/br.po
index b2f7c91d8c8..0d8148ae1b8 100644
--- a/addons/account/i18n/br.po
+++ b/addons/account/i18n/br.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:00+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Daveenn"
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "N'hallit ket ouzhpennañ/kemmañ enmontoù en ur marilh serr"
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po
index 6efe46078a0..519962854b4 100644
--- a/addons/account/i18n/bs.po
+++ b/addons/account/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:00+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -141,6 +141,7 @@ msgstr "Uskladi"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referenca"
 
@@ -157,13 +158,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -225,7 +226,7 @@ msgstr ""
 "pojavljuje na fakturama."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -241,7 +242,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -287,7 +288,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -561,8 +562,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -620,7 +623,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -631,7 +634,7 @@ msgid "Tax Code Amount"
 msgstr "Iznos šifre poreza"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -658,8 +661,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -736,6 +739,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -751,12 +755,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tip"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -882,12 +887,13 @@ msgid "Create 3 Months Periods"
 msgstr "Stvori tromjesečno razdoblje"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Krajnji rok"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -965,7 +971,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -998,10 +1004,10 @@ msgid "Code"
 msgstr "Šifra"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1063,7 +1069,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1111,7 +1117,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1203,7 +1209,7 @@ msgid "The move of this entry line."
 msgstr "Prijenos ovog stavke unosa."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1224,7 +1230,7 @@ msgid "Entry Label"
 msgstr "Oznaka stavke"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1309,14 +1315,15 @@ msgid "Taxes"
 msgstr "Porezi"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1371,6 +1378,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1395,8 +1403,10 @@ msgid "Central Journal"
 msgstr "Glavni nalog za knjiženje"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1621,6 +1631,7 @@ msgid "Separated Journal Sequences"
 msgstr "Razdvojeni redoslijedi naloga za knjiženje"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1649,7 +1660,7 @@ msgid "Year Sum"
 msgstr "Godišnja suma"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1722,7 +1733,7 @@ msgid "Customer Ref:"
 msgstr "Referenca kupca"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2045,7 +2056,7 @@ msgid "Pro-forma"
 msgstr "Predračun"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2069,7 +2080,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2118,7 +2129,7 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2137,7 +2148,7 @@ msgid "Income Account"
 msgstr "Konto prihoda"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2177,6 +2188,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2186,6 +2198,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2236,7 +2249,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2267,7 +2280,7 @@ msgid "Main Sequence"
 msgstr "Glavna Sekvenca"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2341,7 +2354,7 @@ msgid "Account Tax Code"
 msgstr "Šifra poreza"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2422,7 +2435,7 @@ msgid "Account Model Entries"
 msgstr "Stavke računa modela"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2486,7 +2499,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2518,7 +2530,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2638,6 +2650,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Zreli saldo partnera"
@@ -2685,14 +2698,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2795,7 +2808,7 @@ msgid "Base Code Amount"
 msgstr "Iznos osnovne šifre"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2808,7 +2821,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2846,7 +2859,7 @@ msgid "Fiscal Position"
 msgstr "Fiskalna pozicija"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3000,7 +3013,7 @@ msgid "View"
 msgstr "Prikaz"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3192,7 +3205,7 @@ msgid "Starting Balance"
 msgstr "Početni saldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3246,7 +3259,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3327,6 +3340,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3373,7 +3387,7 @@ msgid "Detail"
 msgstr "Detalji"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3388,9 +3402,16 @@ msgid "VAT :"
 msgstr "PDV:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3411,7 +3432,7 @@ msgid "Centralised counterpart"
 msgstr "Centralizirana stavka zatvaranja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3437,6 +3458,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3464,10 +3486,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Datum"
 
@@ -3484,7 +3513,6 @@ msgstr "Poništi usklađivanje"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3498,7 +3526,7 @@ msgid "Chart of Accounts Template"
 msgstr "Predložak kontnog plana"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3507,7 +3535,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3538,6 +3566,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3622,7 +3652,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3653,7 +3683,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3667,6 +3697,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3680,7 +3711,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4000,7 +4031,7 @@ msgid "Month"
 msgstr "Mjesec"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4057,7 +4088,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4264,7 +4295,7 @@ msgid "Allow Reconciliation"
 msgstr "Dozvoli usklađivanje"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4298,7 +4329,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4310,6 +4341,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Promjeni"
 
@@ -4354,7 +4386,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4368,7 +4400,7 @@ msgid "Keep empty to use the income account"
 msgstr "Ne popunjavati za upotrebu računa za prihod"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4396,7 +4428,7 @@ msgstr "Mapiranje konta"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Kupac"
@@ -4412,7 +4444,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4464,7 +4496,7 @@ msgid "Income Account on Product Template"
 msgstr "Konto prihoda na predlošku proizvoda"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4489,11 +4521,13 @@ msgstr "Nova fiskalna godina"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Fakture"
 
@@ -4630,26 +4664,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4752,7 +4784,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4776,7 +4808,7 @@ msgid "Child Tax Accounts"
 msgstr "Konta potporeza."
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4799,6 +4831,7 @@ msgstr "Analitički saldo -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4842,6 +4875,8 @@ msgstr "Tip razdoblja"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Plaćanja"
 
@@ -4915,7 +4950,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4948,6 +4983,7 @@ msgstr "Rezultat poravnjavanja"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5024,6 +5060,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5153,7 +5190,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5205,13 +5241,13 @@ msgid "End of Year Entries Journal"
 msgstr "Dnevnik knjiženja završetka godine"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5285,7 +5321,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5450,7 +5485,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5483,14 +5518,14 @@ msgid "Child Accounts"
 msgstr "Podkonta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Otpis"
@@ -5510,7 +5545,7 @@ msgstr "Prihod"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Dobavljač"
@@ -5540,7 +5575,7 @@ msgid "Account n°"
 msgstr "Broj računa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5555,7 +5590,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Konta potraživanja i dugovanja"
@@ -5651,7 +5688,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5662,8 +5699,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5704,8 +5741,8 @@ msgid "Number of Days"
 msgstr "Broj dana"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5767,7 +5804,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5804,6 +5841,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Prošlost"
 
@@ -6078,6 +6117,8 @@ msgstr "Postotak"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6087,7 +6128,7 @@ msgid "Power"
 msgstr "Eksponent"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6127,6 +6168,7 @@ msgid "Applicable Type"
 msgstr "Primjenjivi tip"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Referenca Fakture"
@@ -6348,8 +6390,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6365,7 +6407,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6404,13 +6446,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Ukupan dug"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6482,25 +6524,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6532,8 +6575,8 @@ msgid "Printed"
 msgstr "Ispisano"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6588,7 +6631,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6739,7 +6782,7 @@ msgid "Total:"
 msgstr "Ukupno:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6769,7 +6812,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6837,14 +6880,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6940,8 +6983,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Jeste sigurni da želite otvoriti ovu fakturu ?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6954,7 +6997,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Knjiženja"
@@ -7090,7 +7133,7 @@ msgstr ""
 "razvijateljima da stvaraju posebne poreze u vlastitoj domeni."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7121,8 +7164,8 @@ msgid "Reporting"
 msgstr "Izvještavanje"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7211,7 +7254,7 @@ msgid "Sign on Reports"
 msgstr "Predznak u izvješćima"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7222,7 +7265,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7257,13 +7300,14 @@ msgid "Optional Information"
 msgstr "Dodatne informacije"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7290,13 +7334,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7313,7 +7357,7 @@ msgid "Invoice Tax"
 msgstr "Porez fakture"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7363,7 +7407,7 @@ msgstr "Do"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7411,13 +7455,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Dugovni računi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7461,7 +7507,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Gotovina"
@@ -7473,15 +7519,15 @@ msgid "Account Destination"
 msgstr "Ciljni konto"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7633,13 +7679,14 @@ msgstr "Fiksno"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7691,7 +7738,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7704,7 +7751,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7778,7 +7825,7 @@ msgid "Deferral Method"
 msgstr "Način odgode"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7842,7 +7889,7 @@ msgid "Associated Partner"
 msgstr "Vezani partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7888,7 +7935,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7910,7 +7957,7 @@ msgid "Choose Fiscal Year"
 msgstr "Odaberite fiskalnu godinu"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7999,7 +8046,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Kod za izračun cijena sa uključenim porezima"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8127,7 +8174,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8206,10 +8253,12 @@ msgstr "Nalog za knjiženje povrata"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8242,7 +8291,7 @@ msgid "The partner account used for this invoice."
 msgstr "Račun partnera korišten za ovu fakturu"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8265,7 +8314,7 @@ msgid "Payment Term Line"
 msgstr "Redak uvjeta plaćanja"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8350,7 +8399,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8457,7 +8506,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8470,7 +8519,7 @@ msgid ""
 msgstr "Iznos izražen u opcionalnoj drugoj valuti ako je viševalutni unos."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8543,7 +8592,7 @@ msgid "Contact Address"
 msgstr "Kontakt adresa"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8578,12 +8627,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Nalog za knjiženje otvarajućih stavaka"
@@ -8602,7 +8653,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8690,7 +8741,7 @@ msgid "Period from"
 msgstr "Razdoblje od"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8737,7 +8788,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8753,7 +8804,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8785,8 +8836,6 @@ msgstr "Kraj Perioda"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8801,6 +8850,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8821,6 +8871,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Smjer analiza"
 
@@ -8840,7 +8891,7 @@ msgstr "Pogled knjiženja"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Ukupno potražuje"
@@ -8905,6 +8956,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8980,7 +9032,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -9002,7 +9054,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -9024,7 +9075,7 @@ msgid "Move"
 msgstr "Prijenos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9080,7 +9131,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidirani potomci"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9141,6 +9192,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9197,6 +9249,7 @@ msgstr "Stavka pretplate"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9204,6 +9257,7 @@ msgstr "Stavka pretplate"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9246,7 +9300,7 @@ msgid "Unreconciled"
 msgstr "Neusklađen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9305,7 +9359,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9344,6 +9398,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9442,9 +9497,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Razdoblja"
 
@@ -9606,6 +9663,7 @@ msgstr "Proknjiženo"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9653,7 +9711,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9689,6 +9747,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9709,6 +9768,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9723,7 +9783,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9733,6 +9795,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9886,6 +9950,7 @@ msgstr "Ulazna faktura"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9919,6 +9984,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9936,7 +10003,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9972,8 +10039,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Sa kretanjima"
@@ -10089,8 +10158,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10116,7 +10185,7 @@ msgid "Accounts Mapping"
 msgstr "Mapiranje konta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10306,6 +10375,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10379,6 +10449,8 @@ msgstr "Dospjelost"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Buduće"
 
diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po
index be920cff7d2..40c0d509ba5 100644
--- a/addons/account/i18n/ca.po
+++ b/addons/account/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:00+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -141,6 +141,7 @@ msgstr "Concilia"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referència"
 
@@ -159,13 +160,13 @@ msgstr ""
 "eliminar-ho."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Avís!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -230,7 +231,7 @@ msgstr ""
 "d'impost aparegui en les factures."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Factura '%s' està pagada parcialment: %s%s de %s%s (%s%s restant)"
@@ -246,7 +247,7 @@ msgid "Belgian Reports"
 msgstr "Informes Belgues"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "No podeu afegir/modificar assentaments en un diari tancat."
@@ -292,7 +293,7 @@ msgid "St."
 msgstr "Est."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -587,8 +588,10 @@ msgid "The accountant confirms the statement."
 msgstr "El comptable confirma l'extracte."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -647,7 +650,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "La seqüència principal ha de ser diferent de l'actual!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -658,7 +661,7 @@ msgid "Tax Code Amount"
 msgstr "Import codi impost"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "VENDA"
@@ -685,8 +688,8 @@ msgid "Journal Period"
 msgstr "Diari del període"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -765,6 +768,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Només podeu canviar la moneda per a factures a l'esborrany!"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -780,12 +784,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tipus"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -914,12 +919,13 @@ msgid "Create 3 Months Periods"
 msgstr "Crea períodes trimestrals"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Degut"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1000,7 +1006,7 @@ msgstr ""
 "la suma de la base imposable (sense impost)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1033,10 +1039,10 @@ msgid "Code"
 msgstr "Codi"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1101,7 +1107,7 @@ msgstr ""
 "especificitats."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1149,7 +1155,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banc"
@@ -1245,7 +1251,7 @@ msgid "The move of this entry line."
 msgstr "El moviment d'aquesta línia de l'assentament."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1266,7 +1272,7 @@ msgid "Entry Label"
 msgstr "Etiqueta assentament"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1352,14 +1358,15 @@ msgid "Taxes"
 msgstr "Impostos"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Seleccioneu un període inicial i final"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1414,6 +1421,7 @@ msgid "Journal Items Analysis"
 msgstr "Anàlisi d'elements del diari"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Empreses"
@@ -1438,8 +1446,10 @@ msgid "Central Journal"
 msgstr "Diari central"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1674,6 +1684,7 @@ msgid "Separated Journal Sequences"
 msgstr "Seqüències de diaris separades"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Responsable"
@@ -1704,7 +1715,7 @@ msgid "Year Sum"
 msgstr "Suma de l'any"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1783,7 +1794,7 @@ msgid "Customer Ref:"
 msgstr "Ref. client:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "L'usuari %s no te drets per accedir al diari %s !"
@@ -2111,7 +2122,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2142,7 +2153,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Cerca plantilles de pla comptable"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2194,7 +2205,7 @@ msgid "Description"
 msgstr "Descripció"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2213,7 +2224,7 @@ msgid "Income Account"
 msgstr "Compte d'ingressos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "No s'ha definit un diari comptable de tipus Venda/Compra!"
@@ -2253,6 +2264,7 @@ msgstr "Plantilla del producte"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2262,6 +2274,7 @@ msgstr "Plantilla del producte"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2312,7 +2325,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2345,7 +2358,7 @@ msgid "Main Sequence"
 msgstr "Seqüència principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2419,7 +2432,7 @@ msgid "Account Tax Code"
 msgstr "Codi impost comptable"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2511,7 +2524,7 @@ msgid "Account Model Entries"
 msgstr "Líniees de model d'assentament"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "DESPESA"
@@ -2579,7 +2592,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2611,7 +2623,7 @@ msgid "Accounts"
 msgstr "Comptes"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Error de configuració!"
@@ -2735,6 +2747,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Balanç d'empresa anterior"
@@ -2787,14 +2800,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Aquest assistent crearà assentaments comptables recursius"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "No s'ha definit una seqüència en el diari !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2903,7 +2916,7 @@ msgid "Base Code Amount"
 msgstr "Import codi base"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2916,7 +2929,7 @@ msgid "Default Sale Tax"
 msgstr "Impost de venda per defecte"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Factura '%s' és validada."
@@ -2957,7 +2970,7 @@ msgid "Fiscal Position"
 msgstr "Posició fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3111,7 +3124,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3316,7 +3329,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "No s'ha definit empresa!"
@@ -3372,7 +3385,7 @@ msgid "Chart of Tax"
 msgstr "Pla dels impostos"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3457,6 +3470,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3503,7 +3517,7 @@ msgid "Detail"
 msgstr "Detall"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3518,9 +3532,16 @@ msgid "VAT :"
 msgstr "CIF/NIF:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3542,7 +3563,7 @@ msgid "Centralised counterpart"
 msgstr "Homòleg centralitzat"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3569,6 +3590,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3596,10 +3618,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Data"
 
@@ -3616,7 +3645,6 @@ msgstr "Trenca conciliació"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3630,7 +3658,7 @@ msgid "Chart of Accounts Template"
 msgstr "Plantilla del pla comptable"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3642,7 +3670,7 @@ msgstr ""
 "definiu l'empresa en ell!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Alguns assentaments ja estan conciliats!"
@@ -3673,6 +3701,8 @@ msgstr "Pressupostos"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Sense filtres"
 
@@ -3758,7 +3788,7 @@ msgid "Analytic Items"
 msgstr "Anotacions analítiques"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "No ha estat possible canviar l'impost!"
@@ -3789,7 +3819,7 @@ msgid "Mapping"
 msgstr "Correspondència"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3803,6 +3833,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3816,7 +3847,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Informe de comprovació de venciments en el balanç"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4148,7 +4179,7 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4205,7 +4236,7 @@ msgid "Account Base Code"
 msgstr "Codi base del compte"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4416,7 +4447,7 @@ msgid "Allow Reconciliation"
 msgstr "Permeteu conciliació"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4450,7 +4481,7 @@ msgid "Recurring Models"
 msgstr "Models recursius"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4462,6 +4493,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Canvia"
 
@@ -4506,7 +4538,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4522,7 +4554,7 @@ msgid "Keep empty to use the income account"
 msgstr "Deixar buit pel compte d'ingressos"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4550,7 +4582,7 @@ msgstr "Mapa comptes"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Client"
@@ -4566,7 +4598,7 @@ msgid "Cancelled Invoice"
 msgstr "Factura cancel·lada"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4623,7 +4655,7 @@ msgid "Income Account on Product Template"
 msgstr "Compte d'ingressos en plantilla producte"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4650,11 +4682,13 @@ msgstr "Nou exercici fiscal"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Factures"
 
@@ -4791,26 +4825,24 @@ msgid "Journal Items"
 msgstr "Apunts comptables"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -4918,7 +4950,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4945,7 +4977,7 @@ msgid "Child Tax Accounts"
 msgstr "Comptes impostos filles"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "El període inicial ha de ser més petit que el període final"
@@ -4968,6 +5000,7 @@ msgstr "Balanç analític -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5011,6 +5044,8 @@ msgstr "Període: Unitat de temps"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Pagaments"
 
@@ -5085,7 +5120,7 @@ msgid "Line 1:"
 msgstr "Línia 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Error d'integritat!"
@@ -5118,6 +5153,7 @@ msgstr "Resultat de conciliació"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Balanç de situació"
@@ -5194,6 +5230,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5323,7 +5360,6 @@ msgstr "Informe comptable comú"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Comunicació"
 
@@ -5375,13 +5411,13 @@ msgid "End of Year Entries Journal"
 msgstr "Diari assentaments tancament d'exercici"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5458,7 +5494,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5631,7 +5666,7 @@ msgid "Generate Opening Entries"
 msgstr "Genera assentaments d'obertura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Ja està conciliat!"
@@ -5664,14 +5699,14 @@ msgid "Child Accounts"
 msgstr "Comptes fills"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Desajust"
@@ -5691,7 +5726,7 @@ msgstr "Ingrés"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Proveïdor"
@@ -5721,7 +5756,7 @@ msgid "Account n°"
 msgstr "Compte n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referència lliure"
@@ -5736,7 +5771,9 @@ msgstr "Valoració"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Comptes a cobrar i pagar"
@@ -5843,7 +5880,7 @@ msgid "Filter by"
 msgstr "Filtra per"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5854,8 +5891,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "No podeu utilitzar un compte inactiu!"
@@ -5896,8 +5933,8 @@ msgid "Number of Days"
 msgstr "Número de dies"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5959,7 +5996,7 @@ msgid "Multipication factor for Base code"
 msgstr "Factor de multiplicació per al codi base"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "no implementat"
@@ -5998,6 +6035,8 @@ msgstr "Anàlisi assentaments analítics"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Anterior"
 
@@ -6278,6 +6317,8 @@ msgstr "Percentatge"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Diari i Empresa"
 
@@ -6287,7 +6328,7 @@ msgid "Power"
 msgstr "Força"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6329,6 +6370,7 @@ msgid "Applicable Type"
 msgstr "Tipus aplicable"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Referència factura"
@@ -6560,8 +6602,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Assentaments: "
@@ -6577,7 +6619,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "No s'ha pogut crear moviment entre diferents companyies"
@@ -6626,13 +6668,13 @@ msgstr "L'estat és esborrany"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Total deure"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "L'assentament \"%s\" no és vàlid!"
@@ -6706,25 +6748,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6756,8 +6799,8 @@ msgid "Printed"
 msgstr "Impressió"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6818,7 +6861,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Mostra el llibre major amb una empresa per pàgina."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6980,7 +7023,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7017,7 +7060,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7093,14 +7136,14 @@ msgid "Source Document"
 msgstr "Document d'origen"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7208,8 +7251,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Esteu segur que voleu obrir aquesta factura?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7222,7 +7265,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Assentaments comptabilitat"
@@ -7362,7 +7405,7 @@ msgstr ""
 "personalitzada."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7394,8 +7437,8 @@ msgid "Reporting"
 msgstr "Informe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7492,7 +7535,7 @@ msgid "Sign on Reports"
 msgstr "Signe en informes"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7503,7 +7546,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7538,13 +7581,14 @@ msgid "Optional Information"
 msgstr "Informació opcional"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "El diari ha de tenir un compte haver i deure per defecte."
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7573,13 +7617,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Compte incorrecte!"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Diari de vendes"
@@ -7596,7 +7640,7 @@ msgid "Invoice Tax"
 msgstr "Impost de factura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Cap tros de número!"
@@ -7646,7 +7690,7 @@ msgstr "Fins"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7694,13 +7738,15 @@ msgstr "Maig"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Comptes a pagar"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7744,7 +7790,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Caixa"
@@ -7756,15 +7802,15 @@ msgid "Account Destination"
 msgstr "Compte destí"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7921,13 +7967,14 @@ msgstr "Fix"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Atenció!"
@@ -7979,7 +8026,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Seleccioneu una moneda per aplicar en la factura."
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7992,7 +8039,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "No es pot %s factura esborrany/proforma/cancel.lada."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "No hi ha línies de factura!"
@@ -8070,7 +8117,7 @@ msgid "Deferral Method"
 msgstr "Mètode tancament"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "La factura '%s' està pagada."
@@ -8136,7 +8183,7 @@ msgid "Associated Partner"
 msgstr "Empresa associada"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Primer heu de seleccionar una empresa!"
@@ -8185,7 +8232,7 @@ msgstr ""
 "país."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8207,7 +8254,7 @@ msgid "Choose Fiscal Year"
 msgstr "Escolliu l'exercici fiscal"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diari d'abonament de compres"
@@ -8299,7 +8346,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Codi pel càlcul dels impostos amb preus inclosos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8440,7 +8487,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8519,10 +8566,12 @@ msgstr "Diari reintegrament"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtra per"
 
@@ -8559,7 +8608,7 @@ msgid "The partner account used for this invoice."
 msgstr "El compte de l'empresa utilitzat per aquesta factura."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8582,7 +8631,7 @@ msgid "Payment Term Line"
 msgstr "Línia de termini de pagament"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diari de compres"
@@ -8670,7 +8719,7 @@ msgid "Unpaid Invoices"
 msgstr "Factures impagades"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8779,7 +8828,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Deixar-ho buit per obrir tots els exercicis fiscals."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "El moviment comptable (%s) per a centralització ha estat confirmat!"
@@ -8794,7 +8843,7 @@ msgstr ""
 "multi-divisa."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8877,7 +8926,7 @@ msgid "Contact Address"
 msgstr "Adreça contacte"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8912,12 +8961,14 @@ msgstr "Contractes"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "Desconegut"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diari assentaments d'obertura"
@@ -8939,7 +8990,7 @@ msgstr ""
 "de Pèrdues i Guanys."
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -9030,7 +9081,7 @@ msgid "Period from"
 msgstr "Període des de"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diari d'abonament de vendes"
@@ -9077,7 +9128,7 @@ msgid "Purchase Tax(%)"
 msgstr "Impost de la compra (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Creeu algunes línies de factura"
@@ -9093,7 +9144,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9131,8 +9182,6 @@ msgstr "Fi de període"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -9147,6 +9196,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9167,6 +9217,7 @@ msgstr "Període inicial"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Direcció anàlisi"
 
@@ -9186,7 +9237,7 @@ msgstr "Vista diari"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total haver"
@@ -9257,6 +9308,7 @@ msgstr "Extractes bancaris"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9338,7 +9390,7 @@ msgstr ""
 "de contrapartida."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Heu de seleccionar els comptes per a conciliar"
@@ -9367,7 +9419,6 @@ msgstr ""
 "un període específic."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filtres per"
@@ -9389,7 +9440,7 @@ msgid "Move"
 msgstr "Assent."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "No es pot canviar l'impost, ha d'eliminar i recrear les línies!"
@@ -9448,7 +9499,7 @@ msgid "Consolidated Children"
 msgstr "Fills consolidats"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9511,6 +9562,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9567,6 +9619,7 @@ msgstr "Assentament periòdic"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9574,6 +9627,7 @@ msgstr "Assentament periòdic"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9616,7 +9670,7 @@ msgid "Unreconciled"
 msgstr "No conciliat"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Total erroni!"
@@ -9684,7 +9738,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "S'ha produït un error desconegut"
@@ -9723,6 +9777,7 @@ msgstr "Valida moviment comptable"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9827,9 +9882,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Períodes"
 
@@ -9998,6 +10055,7 @@ msgstr "Fixat"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10045,7 +10103,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -10082,6 +10140,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10102,6 +10161,7 @@ msgstr "Diari: Tots"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10116,7 +10176,9 @@ msgstr "Diari: Tots"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10126,6 +10188,8 @@ msgstr "Diari: Tots"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10290,6 +10354,7 @@ msgstr "Factura de proveïdor"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10323,6 +10388,8 @@ msgstr "Error ! No es poden crear plantilles de comptes recursives."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -10340,7 +10407,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "L'assentament ja està conciliat"
@@ -10376,8 +10443,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Amb moviments"
@@ -10502,8 +10571,8 @@ msgid "Statistic Reports"
 msgstr "Informes estadístics"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Compte incorrecte!"
@@ -10529,7 +10598,7 @@ msgid "Accounts Mapping"
 msgstr "Mapa de relacions de comptes"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "La factura '%s' està esperant per ser validada."
@@ -10720,6 +10789,7 @@ msgstr "account.afegeixplantilla.assistent"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10798,6 +10868,8 @@ msgstr "Venciment"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Futur"
 
diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po
index fa77e59bf7e..7d50852645f 100644
--- a/addons/account/i18n/cs.po
+++ b/addons/account/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:00+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: account
@@ -143,6 +143,7 @@ msgstr "Likvidace"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Odkaz"
 
@@ -161,13 +162,13 @@ msgstr ""
 "jeho odebrání."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Varování!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Různý"
@@ -232,7 +233,7 @@ msgstr ""
 "tomuto daňovému kódu žádné DPH"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Faktura '%s' je zaplacená částečně: %s%s z %s%s (zbývá %s%s)"
@@ -248,7 +249,7 @@ msgid "Belgian Reports"
 msgstr "Belgické výkazy"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Nemůžete přidávat/upravovat položky v uzavřené knize."
@@ -294,7 +295,7 @@ msgid "St."
 msgstr "Sv."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Firma řádku faktury nesouhlasí s firmou faktury"
@@ -585,8 +586,10 @@ msgid "The accountant confirms the statement."
 msgstr "Účetní potvrzuje výpis."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -644,7 +647,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Hlavní číselná řada musí být odlišná od současné!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -655,7 +658,7 @@ msgid "Tax Code Amount"
 msgstr "Částka kódu daně"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "KFV"
@@ -682,8 +685,8 @@ msgid "Journal Period"
 msgstr "Období knihy"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Při likvidaci záznamů by u všech měla být stejná firma"
@@ -760,6 +763,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Měnu můžete změnit pouze u Návrhových faktůr !"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Finanční výkaz"
@@ -775,12 +779,13 @@ msgstr "Finanční výkaz"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Typ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -910,12 +915,13 @@ msgid "Create 3 Months Periods"
 msgstr "Vytvořit 3-měsíční období"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Do"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -993,7 +999,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "Nemůžu najít nadřazený kód pro šablonu účtu!"
@@ -1026,10 +1032,10 @@ msgid "Code"
 msgstr "Kód"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1093,7 +1099,7 @@ msgstr ""
 "účtu a jeho specifikách."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1141,7 +1147,7 @@ msgstr "Nevyrovnané položky deníku"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banka"
@@ -1233,7 +1239,7 @@ msgid "The move of this entry line."
 msgstr "Přesun této řádky záznamu"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1254,7 +1260,7 @@ msgid "Entry Label"
 msgstr "Název položky"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "Nemůžete upravit/smazat deník s položkami pro toto období !"
@@ -1339,14 +1345,15 @@ msgid "Taxes"
 msgstr "Daně"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Vyberte počáteční a koncové období"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Zisk a ztráty"
 
@@ -1401,6 +1408,7 @@ msgid "Journal Items Analysis"
 msgstr "Analýza položek deníku"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Partneři"
@@ -1425,8 +1433,10 @@ msgid "Central Journal"
 msgstr "Centrální deník"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1658,6 +1668,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Odopovědné"
@@ -1688,7 +1699,7 @@ msgid "Year Sum"
 msgstr "Roční součet"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1766,7 +1777,7 @@ msgid "Customer Ref:"
 msgstr "Odkaz zákazníka:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "U6ivatel %s nemá práva pro přístup k deníku %s !"
@@ -2091,7 +2102,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2117,7 +2128,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Hledat šablony účtové osnovy"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2168,7 +2179,7 @@ msgid "Description"
 msgstr "Popis"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2187,7 +2198,7 @@ msgid "Income Account"
 msgstr "Účet příjmů"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2227,6 +2238,7 @@ msgstr "Šablona výrobku"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2236,6 +2248,7 @@ msgstr "Šablona výrobku"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2286,7 +2299,7 @@ msgid "Account Line"
 msgstr "Řádek účtu"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2319,7 +2332,7 @@ msgid "Main Sequence"
 msgstr "Hlavní číselná řada"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2393,7 +2406,7 @@ msgid "Account Tax Code"
 msgstr "Daňový kód účtu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2478,7 +2491,7 @@ msgid "Account Model Entries"
 msgstr "Položky modelu účtu"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2537,7 +2550,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2569,7 +2581,7 @@ msgid "Accounts"
 msgstr "Účty"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfigurační chyba!"
@@ -2689,6 +2701,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Starý zůstatek partnera"
@@ -2736,14 +2749,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Průvodce vytvoří opakující se účetní položky"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Pro deník není určena posloupnost !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2846,7 +2859,7 @@ msgid "Base Code Amount"
 msgstr "Částka základního kódu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2861,7 +2874,7 @@ msgid "Default Sale Tax"
 msgstr "Výchozí prodejní daň"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Faktura '%s' je ověřena."
@@ -2899,7 +2912,7 @@ msgid "Fiscal Position"
 msgstr "Finanční pozice"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3046,7 +3059,7 @@ msgid "View"
 msgstr "Pohled"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3240,7 +3253,7 @@ msgid "Starting Balance"
 msgstr "Počáteční zůstatek"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nebyl definován partner !"
@@ -3294,7 +3307,7 @@ msgid "Chart of Tax"
 msgstr "Graf daně"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3379,6 +3392,7 @@ msgstr "Množství :"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Délka období (dny)"
 
@@ -3425,7 +3439,7 @@ msgid "Detail"
 msgstr "Podrobnosti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3440,9 +3454,16 @@ msgid "VAT :"
 msgstr "DPH :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3463,7 +3484,7 @@ msgid "Centralised counterpart"
 msgstr "Centralizované protějšek"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3489,6 +3510,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3516,10 +3538,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Datum"
 
@@ -3536,7 +3565,6 @@ msgstr "Nevyrovnaný"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3550,7 +3578,7 @@ msgid "Chart of Accounts Template"
 msgstr "Šablona Účetní osnovy"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3559,7 +3587,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Některé položky byly již zlikvidovány !"
@@ -3590,6 +3618,8 @@ msgstr "Rozpočet"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Bez filtrů"
 
@@ -3673,7 +3703,7 @@ msgid "Analytic Items"
 msgstr "Analytické položky"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Nelze změnit daň !"
@@ -3704,7 +3734,7 @@ msgid "Mapping"
 msgstr "Mapování"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3718,6 +3748,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3731,7 +3762,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4054,7 +4085,7 @@ msgid "Month"
 msgstr "Měsíc"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4111,7 +4142,7 @@ msgid "Account Base Code"
 msgstr "Základní kód účtu"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Pro tento výrobek nebyl definován nákladový účet: \"%s\" (id:%d)"
@@ -4318,7 +4349,7 @@ msgid "Allow Reconciliation"
 msgstr "Povolit vyrovnání"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4352,7 +4383,7 @@ msgid "Recurring Models"
 msgstr "Model opakování"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4364,6 +4395,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Změnit"
 
@@ -4408,7 +4440,7 @@ msgid "Example"
 msgstr "Příklad"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4424,7 +4456,7 @@ msgid "Keep empty to use the income account"
 msgstr "Nechejte prázdné pro použití příjmového účtu"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4452,7 +4484,7 @@ msgstr "Mapování účtů"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Zákazník"
@@ -4468,7 +4500,7 @@ msgid "Cancelled Invoice"
 msgstr "Zrušené faktury"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4520,7 +4552,7 @@ msgid "Income Account on Product Template"
 msgstr "Příjmový účet na šabloně výrobku"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "Různé"
@@ -4545,11 +4577,13 @@ msgstr "Nový daňový rok"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Faktury"
 
@@ -4686,26 +4720,24 @@ msgid "Journal Items"
 msgstr "Položky deníku"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Chyba"
@@ -4810,7 +4842,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4837,7 +4869,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4860,6 +4892,7 @@ msgstr "Analytický zůstatek -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4903,6 +4936,8 @@ msgstr "Typ období"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Platby"
 
@@ -4976,7 +5011,7 @@ msgid "Line 1:"
 msgstr "Řádek 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Chyba integrity !"
@@ -5009,6 +5044,7 @@ msgstr "Výsledek vyrovnání"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Rozvaha"
@@ -5085,6 +5121,7 @@ msgstr "Výkaz"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5214,7 +5251,6 @@ msgstr "Obecný výkaz účtu"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Komunikace"
 
@@ -5266,13 +5302,13 @@ msgid "End of Year Entries Journal"
 msgstr "Záznamy knihy konce roku"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5346,7 +5382,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Faktury a dobropisy zákazníků"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5512,7 +5547,7 @@ msgid "Generate Opening Entries"
 msgstr "Generovat počáteční položky"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Již vyrovnáno!"
@@ -5545,14 +5580,14 @@ msgid "Child Accounts"
 msgstr "Dětské účty"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Odpis"
@@ -5572,7 +5607,7 @@ msgstr "Příjem"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Dodavatel"
@@ -5602,7 +5637,7 @@ msgid "Account n°"
 msgstr "Účet n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5617,7 +5652,9 @@ msgstr "Ohodnocení"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Účty závazků a pohledávek"
@@ -5716,7 +5753,7 @@ msgid "Filter by"
 msgstr "Filtrovat podle"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Máte nesprávný výraz \"%(...)s\" ve vašem modelu !"
@@ -5727,8 +5764,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Nemůžete použít neaktivní účet!"
@@ -5769,8 +5806,8 @@ msgid "Number of Days"
 msgstr "Počet dní"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5832,7 +5869,7 @@ msgid "Multipication factor for Base code"
 msgstr "Násobek pro základní kód"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "nerealizováno"
@@ -5869,6 +5906,8 @@ msgstr "Analýza analytických záznamů"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Minulý"
 
@@ -6142,6 +6181,8 @@ msgstr "Procenta"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Deník & Partner"
 
@@ -6151,7 +6192,7 @@ msgid "Power"
 msgstr "Síla"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6191,6 +6232,7 @@ msgid "Applicable Type"
 msgstr "Typ platnosti"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Reference faktury"
@@ -6412,8 +6454,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Položky: "
@@ -6429,7 +6471,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Nelze vytvoit pohyb mezi různými společnostmi."
@@ -6470,13 +6512,13 @@ msgstr "Stav je koncept"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Celkový dluh"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Položka \"%s\" není platná !"
@@ -6550,25 +6592,26 @@ msgstr "Zisk & ztráty (Výdajový účet)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6600,8 +6643,8 @@ msgid "Printed"
 msgstr "Vytisknutý"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Chyba"
@@ -6656,7 +6699,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6808,7 +6851,7 @@ msgid "Total:"
 msgstr "Celkem:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6838,7 +6881,7 @@ msgid "Taxes used in Sales"
 msgstr "Daně použité při prodeji"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6906,14 +6949,14 @@ msgid "Source Document"
 msgstr "Zdrojový dokument"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "Nemůžete smazat zaúčtovanou položku deníku \"%s\"!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7011,8 +7054,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Jste si jisti, že chcete otevřít fakturu ?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7025,7 +7068,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Účetní položky"
@@ -7158,7 +7201,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Měli byste vybrat období, které patří ke stejné společnosti"
@@ -7189,8 +7232,8 @@ msgid "Reporting"
 msgstr "Vykazování"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7282,7 +7325,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7293,7 +7336,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7328,13 +7371,14 @@ msgid "Optional Information"
 msgstr "Doplňující informace"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Kniha musí mít výchozí účty Dal a Má dáti"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7361,13 +7405,13 @@ msgid "Maturity Date"
 msgstr "Datum splatnosti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Chybný účet !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Deník tržeb"
@@ -7384,7 +7428,7 @@ msgid "Invoice Tax"
 msgstr "Daň faktury"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Žádné číslo kusu !"
@@ -7434,7 +7478,7 @@ msgstr "Do"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Úprava měny"
@@ -7482,13 +7526,15 @@ msgstr "Květen"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Účty závazků"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7533,7 +7579,7 @@ msgstr "Jméno výkazu"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Hotovost"
@@ -7545,15 +7591,15 @@ msgid "Account Destination"
 msgstr "Cíl účtu"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7702,13 +7748,14 @@ msgstr "Pevné"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Varování !"
@@ -7760,7 +7807,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Vyberte měnu pro použití na faktuře"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7773,7 +7820,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Fakturu nelze %s návrh/proforma/zrušit."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Žádné řádky faktury !"
@@ -7849,7 +7896,7 @@ msgid "Deferral Method"
 msgstr "Metoda zpoždění"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Faktura '%s' je zaplacena."
@@ -7913,7 +7960,7 @@ msgid "Associated Partner"
 msgstr "Přidruženého partnera"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Musíte nejdříve vybrat partnera !"
@@ -7962,7 +8009,7 @@ msgstr ""
 "země."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7984,7 +8031,7 @@ msgid "Choose Fiscal Year"
 msgstr "Vyberte daňový rok"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Deník nákupních dobropisů"
@@ -8071,7 +8118,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8199,7 +8246,7 @@ msgid "current month"
 msgstr "aktuální měsíc"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8280,10 +8327,12 @@ msgstr "Deník dobropisů"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtrovat podle"
 
@@ -8318,7 +8367,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8341,7 +8390,7 @@ msgid "Payment Term Line"
 msgstr "Řádek platebního období"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Deník nákupů"
@@ -8429,7 +8478,7 @@ msgid "Unpaid Invoices"
 msgstr "Nezaplacené faktury"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8536,7 +8585,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Nechejte prázdné pro všechny otevřené finanční roky"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "Pohyb účtu (%s) pro centralizaci byl potvrzen!"
@@ -8550,7 +8599,7 @@ msgstr ""
 "Částka vyjádřena ve volitelné jiné měně, pokud je položka více-měnová."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8623,7 +8672,7 @@ msgid "Contact Address"
 msgstr "Kontaktní adresa"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Nesprávný model !"
@@ -8658,12 +8707,14 @@ msgstr "Smlouvy"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "neznámé"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Počáteční položky deníku"
@@ -8682,7 +8733,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8771,7 +8822,7 @@ msgid "Period from"
 msgstr "Období od"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Kniha dobropisů prodeje"
@@ -8818,7 +8869,7 @@ msgid "Purchase Tax(%)"
 msgstr "Daň nákupu(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Prosíme vytvořete nějaké řádky faktury."
@@ -8834,7 +8885,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -8866,8 +8917,6 @@ msgstr "Konec období"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Finanční výkazy"
@@ -8882,6 +8931,7 @@ msgstr "Finanční výkazy"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8902,6 +8952,7 @@ msgstr "Začátek období"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8921,7 +8972,7 @@ msgstr "Zobrazení deníku"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Celkový úvěř"
@@ -8986,6 +9037,7 @@ msgstr "Bankovní výpisy"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9061,7 +9113,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Musíte vybrat účet pro vyrovnání"
@@ -9083,7 +9135,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filt"
@@ -9105,7 +9156,7 @@ msgid "Move"
 msgstr "Pohyb"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "Nemůžete změnit daň, měli byste odstranit a znovu vytvořit řádky !"
@@ -9163,7 +9214,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidovaný potomek"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9226,6 +9277,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9282,6 +9334,7 @@ msgstr "Vstupní předplatné"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9289,6 +9342,7 @@ msgstr "Vstupní předplatné"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9331,7 +9385,7 @@ msgid "Unreconciled"
 msgstr "Nevyrovnaný"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Špatný součet !"
@@ -9390,7 +9444,7 @@ msgid "Comparison"
 msgstr "Porovnání"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Neznámá chyba"
@@ -9429,6 +9483,7 @@ msgstr "Ověřit pohyb účtu"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9530,9 +9585,11 @@ msgstr "Analytické zápisy za posledních 30 dní"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Období"
 
@@ -9698,6 +9755,7 @@ msgstr "Zaúčtované"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9745,7 +9803,7 @@ msgid "No detail"
 msgstr "Bez podrobností"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Pro tento výrobek není definován příjmový účet: \"%s\" (id: %d)"
@@ -9781,6 +9839,7 @@ msgid "Verification Total"
 msgstr "Kontrolní součet"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9801,6 +9860,7 @@ msgstr "Deník: Všechny"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9815,7 +9875,9 @@ msgstr "Deník: Všechny"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9825,6 +9887,8 @@ msgstr "Deník: Všechny"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9978,6 +10042,7 @@ msgstr "Faktura dodavatele"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10011,6 +10076,8 @@ msgstr "Chyba ! Nemůžete vytvořit rekurzivní šablony účtu."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -10028,7 +10095,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Položka již je srovnaná"
@@ -10064,8 +10131,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "S pohyby"
@@ -10181,8 +10250,8 @@ msgid "Statistic Reports"
 msgstr "Statistické výkazy"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Nesprávný účet!"
@@ -10208,7 +10277,7 @@ msgid "Accounts Mapping"
 msgstr "Mapování účtů"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Faktura '%s' čeká na ověření."
@@ -10399,6 +10468,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10474,6 +10544,8 @@ msgstr "Splatnost"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Budoucnost"
 
diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po
index e87f7bbdc72..c7f7803088e 100644
--- a/addons/account/i18n/da.po
+++ b/addons/account/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:00+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr "Afstem"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Henvisning"
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Advarsel!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr "Belgiske rapporter"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -560,8 +561,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -617,7 +620,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -628,7 +631,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -655,8 +658,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -733,6 +736,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -748,12 +752,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -879,12 +884,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Forfalder"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -962,7 +968,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -995,10 +1001,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1060,7 +1066,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1108,7 +1114,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1200,7 +1206,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1221,7 +1227,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1306,14 +1312,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1368,6 +1375,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1392,8 +1400,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1618,6 +1628,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1646,7 +1657,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1719,7 +1730,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2038,7 +2049,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2062,7 +2073,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2111,7 +2122,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2130,7 +2141,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2170,6 +2181,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2179,6 +2191,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2229,7 +2242,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2260,7 +2273,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2334,7 +2347,7 @@ msgid "Account Tax Code"
 msgstr "Konto momsklasse"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2415,7 +2428,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2479,7 +2492,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2511,7 +2523,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2631,6 +2643,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2678,14 +2691,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2788,7 +2801,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2801,7 +2814,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2839,7 +2852,7 @@ msgid "Fiscal Position"
 msgstr "Nuværende position"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2994,7 +3007,7 @@ msgid "View"
 msgstr "Vis"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3186,7 +3199,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3240,7 +3253,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3321,6 +3334,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3367,7 +3381,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3382,9 +3396,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3405,7 +3426,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3430,6 +3451,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3457,10 +3479,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3477,7 +3506,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3491,7 +3519,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3500,7 +3528,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3531,6 +3559,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3612,7 +3642,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3643,7 +3673,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3657,6 +3687,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3670,7 +3701,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3990,7 +4021,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4047,7 +4078,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4254,7 +4285,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4288,7 +4319,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4300,6 +4331,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4344,7 +4376,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4360,7 +4392,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4388,7 +4420,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4404,7 +4436,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4456,7 +4488,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4481,11 +4513,13 @@ msgstr "Nyt regnskabsår"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4622,26 +4656,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4744,7 +4776,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4768,7 +4800,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4789,6 +4821,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4832,6 +4865,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4905,7 +4940,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4938,6 +4973,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5014,6 +5050,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5141,7 +5178,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5193,13 +5229,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5273,7 +5309,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5436,7 +5471,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5469,14 +5504,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5496,7 +5531,7 @@ msgstr "Indtægt"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Leverandør"
@@ -5526,7 +5561,7 @@ msgid "Account n°"
 msgstr "Konto no."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Fri Reference"
@@ -5541,7 +5576,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5637,7 +5674,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5648,8 +5685,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5690,8 +5727,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5753,7 +5790,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5790,6 +5827,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6063,6 +6102,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6072,7 +6113,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6112,6 +6153,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6330,8 +6372,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6347,7 +6389,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6386,13 +6428,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6460,25 +6502,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6510,8 +6553,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6566,7 +6609,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6717,7 +6760,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6747,7 +6790,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6815,14 +6858,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6918,8 +6961,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6932,7 +6975,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7063,7 +7106,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7094,8 +7137,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7184,7 +7227,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7195,7 +7238,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7230,13 +7273,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7263,13 +7307,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7286,7 +7330,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7336,7 +7380,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7384,13 +7428,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7434,7 +7480,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7446,15 +7492,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7603,13 +7649,14 @@ msgstr "Fast"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Advarsel !"
@@ -7661,7 +7708,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7674,7 +7721,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7748,7 +7795,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7810,7 +7857,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Du må først vælge en partner"
@@ -7856,7 +7903,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7878,7 +7925,7 @@ msgid "Choose Fiscal Year"
 msgstr "Vælg regnskabs år"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7965,7 +8012,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8093,7 +8140,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8172,10 +8219,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8208,7 +8257,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8231,7 +8280,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8316,7 +8365,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8422,7 +8471,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8435,7 +8484,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8508,7 +8557,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8543,12 +8592,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8567,7 +8618,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8653,7 +8704,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8700,7 +8751,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8716,7 +8767,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8748,8 +8799,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8764,6 +8813,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8784,6 +8834,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8803,7 +8854,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8868,6 +8919,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8943,7 +8995,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Vælg konto for afstemning"
@@ -8965,7 +9017,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8987,7 +9038,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9043,7 +9094,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9104,6 +9155,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9160,6 +9212,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9167,6 +9220,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9209,7 +9263,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9268,7 +9322,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9305,6 +9359,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9403,9 +9458,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9567,6 +9624,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9614,7 +9672,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9650,6 +9708,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9670,6 +9729,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9684,7 +9744,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9694,6 +9756,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9847,6 +9911,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9880,6 +9945,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9897,7 +9964,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9933,8 +10000,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10050,8 +10119,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10077,7 +10146,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10267,6 +10336,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10340,6 +10410,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 1a0dfc11029..a0e01b57a8f 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-25 09:07+0000\n"
+"PO-Revision-Date: 2012-10-12 23:18+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:01+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -25,7 +25,7 @@ msgstr "letzten Monat"
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr "Zahlungssystematik"
+msgstr "Zahlungsmothode"
 
 #. module: account
 #: view:account.journal:0
@@ -39,7 +39,7 @@ msgid ""
 "Generic Reporting \\ Taxes \\ Taxes Report'"
 msgstr ""
 "Legen Sie die Reihenfolge der Anzeige im Report 'Finanz \\ Berichte \\ "
-"generische Reports \\ Steuern \\ Steuererklärung' fest"
+"Allgemeine Berichte \\ Steuern \\ Steuererklärung' fest"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -57,12 +57,12 @@ msgstr "Statistische Auswertungen"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma/Open/Paid Invoices"
-msgstr "Proforoma/Offene/Bezahlte Rechnungen"
+msgstr "Proforma / offene bzw. bezahlte Rechnungen"
 
 #. module: account
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr "Restwert"
+msgstr "Verbleibend"
 
 #. module: account
 #: constraint:account.period:0
@@ -72,7 +72,7 @@ msgstr "Fehler! Die Dauer der Periode(n) ist ungültig "
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr "Währung"
+msgstr "Währung des Kontos"
 
 #. module: account
 #: view:account.tax:0
@@ -83,7 +83,7 @@ msgstr "Definition untergeordneter Steuern"
 #: code:addons/account/account_bank_statement.py:302
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr "Journalzeile \"%s\" ist ungültig"
+msgstr "Buchung \"%s\" ist ungültig"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -103,7 +103,7 @@ msgstr "wizard.multi.charts.accounts"
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr "Summe Soll"
+msgstr "Forderungsgesamtsumme"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -111,7 +111,7 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
 msgstr ""
-"Wenn Sie Zahlungen stornieren, sollten Sie alle zugehörigen Belege und "
+"Wenn Sie Zahlungen stornieren, müssen Sie alle zugehörigen Belege und "
 "Buchungen prüfen, da diese nicht automatisch mit gelöscht oder deaktiviert "
 "werden."
 
@@ -122,13 +122,13 @@ msgid ""
 "accounts too."
 msgstr ""
 "Konfigurationsfehler! Die gewählte Währung muss auch bei den Standardkonten "
-"verwendet werden"
+"verwendet werden."
 
 #. module: account
 #: report:account.invoice:0
 #: field:account.invoice.line,origin:0
 msgid "Origin"
-msgstr "Bezug"
+msgstr "Herkunft"
 
 #. module: account
 #: view:account.account:0
@@ -137,7 +137,7 @@ msgstr "Bezug"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr "Ausgleich Nummer"
+msgstr "Ausgleich von Offenen Posten"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -146,6 +146,7 @@ msgstr "Ausgleich Nummer"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referenz"
 
@@ -164,13 +165,13 @@ msgstr ""
 "angezeigt."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Achtung!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "\"verschiedenes\" Journal"
@@ -195,7 +196,7 @@ msgstr "Spaltenbeschriftung"
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr "Journal: %s"
+msgstr "Journal %s"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -204,16 +205,16 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
-"Definiert Typ für das analytische Journal. Wenn ein Beleg (z.B. eine "
-"Rechnung) dann zusätzlich zu den Finanzbuchungen weitere analytische "
-"Buchungen erzeugen soll , prüft OpenERP inwieweit ein analytisches Journal "
-"mit  dem identischem Typ (z.B. Verkauf) existiert."
+"Definiert die Art des analytischen Journals. Wenn ein Beleg (z. B. eine "
+"Rechnung), zusätzlich zu den Finanzbuchungen, weitere analytische Buchungen "
+"erzeugen soll, prüft OpenERP ob ein analytischer Bericht der gleichen Art "
+"(z.B. Verkauf) vorliegt."
 
 #. 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 "Umsatzsteuer Vorlagen"
+msgstr "-Vorlagen für Steuerkonten"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -232,16 +233,14 @@ msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
 msgstr ""
-"Aktivieren, wenn KEINE umsatzsteuerlich relevanten Bezeichnungen auf der "
-"Rechnung erscheinen sollen"
+"Aktivieren, wenn etwaige, in diesen Steuerschlüssel einbezogene, "
+"Steuerbeträge auf der Rechnung nicht erscheinen sollen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr ""
-"Rechnung '%s' ist teilweise bezahlt: %s%s von %s%s (%s%s verbleiben als "
-"offen)"
+msgstr "Rechnung '%s' ist teilweise bezahlt: %s%s von %s%s (%s%s verbleiben)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
@@ -254,12 +253,12 @@ msgid "Belgian Reports"
 msgstr "Auswertungen für Belgien"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
 "Sie können in einem abgeschlossenen Journal keine Buchung vornehmen oder "
-"ändern ."
+"ändern."
 
 #. module: account
 #: help:account.account,user_type:0
@@ -269,13 +268,13 @@ msgid ""
 "entries."
 msgstr ""
 "Der Kontentyp hat Informationscharakter und wird verwendet, um "
-"länderspezifsche Reports zu generieren sowie um den Jahresabschluss zu "
-"steuern und Eröffnungsbilanzbuchungen zu generieren"
+"länderspezifsche Berichte zu generieren sowie den Jahresabschluss zu steuern "
+"und Eröffnungsbilanzbuchungen zu generieren"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Sub-Total :"
-msgstr "Zwischensumme"
+msgstr "Zwischensumme:"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -287,7 +286,7 @@ msgstr "Wiederkehrende Buchungen (Manuell)"
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscalyear"
-msgstr "Beende Geschäftsjahr"
+msgstr "Geschäftsjahr abschließen"
 
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
@@ -297,7 +296,7 @@ msgstr "Erlaube Abschreibung"
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr "Auswahl Periode"
+msgstr "Periode zur Analyse auswählen"
 
 #. module: account
 #: view:account.move.line:0
@@ -305,16 +304,17 @@ msgid "St."
 msgstr "Beleg"
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
-"Unternehmen (Mandant) ist bei  Rechnung und Rechnungszeile nicht identisch."
+"Das Kundenkonto ist einem anderen Unternehmen (Mandant) zugewiesen als der "
+"Rechnungssteller."
 
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr "Bezeichnung Feld"
+msgstr "Feldname"
 
 #. module: account
 #: help:account.installer,charts:0
@@ -322,8 +322,8 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
-"Installiert Kontenplan für Ihr Land, um soweit wie möglich eine Vorlage für "
-"Ihr Unternehmen zu bieten."
+"Installiert landesspezifische Kontenpläne, um soweit wie möglich den Bedarf "
+"Ihres Unternehmens abzudecken."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -334,10 +334,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
-"Konnte kein Journal mit dem Typ %s für Unternehmen finden.\n"
+"Konnte kein Journal mit dem Typ %s für dieses Unternehmen finden.\n"
 "\n"
-"Sie können ein Journal definieren:\n"
-"Konfiguration/Finanzbuchhaltung/Finanzkonten/Journale"
+"Hier können Sie einen Bericht anlegen:\n"
+"Finanzen / Konfiguration / Finanzen / Buchungsjournale"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
@@ -364,7 +364,7 @@ msgstr ""
 #. module: account
 #: view:account.installer:0
 msgid "Configure"
-msgstr "Konfigurieren"
+msgstr "Einrichten"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -389,7 +389,7 @@ msgstr ""
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr "You can not create journal items on an account of type view."
+msgstr "Sie können keine Buchungen in einem Ansichtskonto vornehmen."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -405,7 +405,7 @@ msgstr "account.bank.accounts.wizard"
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr "Erzeugt am"
+msgstr "Erstellungsdatum"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -433,19 +433,19 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
-"Dieses Feld enthält die Sequenz für die Buchungen in diesem Journal. "
-"Hierdurch kann dann die chronologische Reihenfolge der Buchungen "
-"nachvollzogen werden."
+"Dieses Feld enthält beschreibt die Nummerierung für die Buchungen in diesem "
+"Journal. Hierdurch kann dann die chronologische Reihenfolge der Buchungen "
+"sichergestellt werden."
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr "Standard Sollkonto"
+msgstr "Standard Debitorenkonto"
 
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr "Summe Haben"
+msgstr "Habensumme"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -463,7 +463,7 @@ msgstr "Kontenplan Vorlage"
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr "Der optionale Betrag in anderer Währung"
+msgstr "In alternativer Währung dargestellter Betrag"
 
 #. module: account
 #: field:accounting.report,enable_filter:0
@@ -477,10 +477,10 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
-"Bei Erstellung einer Periode für das Journal ist der Status 'Entwurf'. Wenn "
-"dann ein Report für das Journal ausgedruckt wird, wechselt der Status auf "
-"'Gedruckt'. Auf 'Fertig' wechselt dann der Status, wenn alle erforderlichen "
-"Transaktionen hierzu erledigt sind."
+"Bei Erstellung einer Periode für den Bericht ist dieser im Zustand "
+"'Entwurf'. Wenn der Bericht ausgedruckt wird,  wechselt der Status auf "
+"\"Gedruckt\". Auf 'Fertig' wechselt dann der Status, wenn alle Transaktionen "
+"hierzu abgschlossen sind."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -490,11 +490,11 @@ msgid ""
 "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."
 msgstr ""
-"Der Kontenplan Umsatzsteuer ist eine hierachische Ansicht der Steuern über "
-"mehrere Dimensionen. Angezeigt wird nicht nur die Struktur der Steuern, "
-"sondern auch die  aktuellen Verkehrszahlen der jeweiligen Steuern für den "
-"Monat und kummuliert für das Jahr. Die hierachische Struktur kann für Ihren "
-"Bedarf angepasst werden."
+"Der Steuer-Kontenplan ist eine hierachische Ansicht der Steuern über mehrere "
+"Ebenen. Angezeigt werden nicht nur die Struktur der Steuern, sondern auch "
+"die  aktuellen Verkehrszahlen der jeweiligen Steuern für den Monat und "
+"kummuliert für das Jahr. Die hierachische Struktur kann Ihrem Bedarf "
+"angepasst werden."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -529,7 +529,7 @@ msgstr "Journal"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
 msgid "Confirm the selected invoices"
-msgstr "Bestätige die ausgewählten Rechnungen"
+msgstr "Ausgewählte Rechnungen bestätigen"
 
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
@@ -557,12 +557,12 @@ msgstr "Finanzkonto für dieses Journal"
 #: help:account.vat.declaration,chart_account_id:0
 #: help:accounting.report,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr "Wähle Kontenplan"
+msgstr "Kontenplan wählen"
 
 #. module: account
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr "Der Name der Firma darf nur einmal vorkommen!"
+msgstr "Der Unternehmensname muss eindeutig sein!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
@@ -577,7 +577,7 @@ msgstr "Limit"
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "Nicht ausgeglichene Posten"
+msgstr "Unausgeglichener Geschäftsvorgang"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -590,13 +590,13 @@ msgstr "Gegenbuchung"
 #: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr "Steuer Zuordnung"
+msgstr "Steuerzuordnung"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr "Beende Geschäftsjahr"
+msgstr "Geschäftsjahr abschließen"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
@@ -604,8 +604,10 @@ msgid "The accountant confirms the statement."
 msgstr "Der Buchhalter bestätigt den Bankauszug."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -646,12 +648,12 @@ msgstr "Sequenzen"
 #: field:account.financial.report,account_report_id:0
 #: selection:account.financial.report,type:0
 msgid "Report Value"
-msgstr "Bericht Wert"
+msgstr "Berichtswert"
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Taxes Mapping"
-msgstr "Steuern Zuordnung"
+msgstr "Steuerzuordnung"
 
 #. module: account
 #: report:account.central.journal:0
@@ -661,10 +663,11 @@ msgstr "Zentraljournal"
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr "Die Hauptsequenz sollte sich von der derzeitigen unterscheiden !"
+msgstr ""
+"Die übergeordnete Nummerierung muss sich von der derzeitigen unterscheiden!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "Keine oder meherere Perioden für dieses Datum gefunden."
@@ -675,7 +678,7 @@ msgid "Tax Code Amount"
 msgstr "Steuerbetrag"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "VK"
@@ -684,26 +687,26 @@ msgstr "VK"
 #: view:account.period:0
 #: view:account.period.close:0
 msgid "Close Period"
-msgstr "Periode beenden"
+msgstr "Periode abschließen"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr "Auswertung Partnerkonto"
+msgstr "Auswertung Partnerkonto (Sammelkonto)"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr "Start Periode im neuen Geschäftsjahr"
+msgstr "Startbuchungen der Periode"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr "Journal Periode"
+msgstr "Berichtsperiode"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -716,18 +719,18 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
-"The date of your Journal Entry is not in the defined period! You should "
-"change the date or remove this constraint from the journal."
+"Das Datum Ihrer Buchung fällt nicht in die festgelegte Periode. Sie müssen "
+"das Datum anpassen, oder diese Einschränkung vom Bericht entfernen."
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr "Kontoauszug und Saldenliste"
+msgstr "Umsätze nach Konten und Perioden"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr "Wiederöffnen"
+msgstr "Wiedereröffnen"
 
 #. module: account
 #: view:account.use.model:0
@@ -747,12 +750,12 @@ msgstr "Heute ausgeglichene Partner"
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this year"
-msgstr "Verkaufsjournal dieses Jshres"
+msgstr "Verkaufsbericht dieses Jahres"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children with hierarchy"
-msgstr "Zeige Kinder abhängige in der Hierarchie"
+msgstr "Zeige Hierarchie der Kinder"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -781,9 +784,10 @@ msgstr "Gutschriftmethode"
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr "Sie können die Währung nur bei Rechnungen"
+msgstr "Sie können die Währung nur bei Rechnungsentwürfen ändern"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Finanzbericht"
@@ -799,12 +803,13 @@ msgstr "Finanzbericht"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Typ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -826,7 +831,7 @@ msgstr "Referenz des Partners für diese Rechnung."
 #. module: account
 #: view:account.invoice.report:0
 msgid "Supplier Invoices And Refunds"
-msgstr "Lieferanten Rechnungen und Gutschriften"
+msgstr "Lieferantenrechnungen und -gutschriften"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -834,7 +839,7 @@ msgstr "Lieferanten Rechnungen und Gutschriften"
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
-msgstr "Storno Ausgleich Offene Posten"
+msgstr "Stornierung des OP-Ausgleichs"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -864,10 +869,10 @@ msgid ""
 "or Loss you'd realized if those transactions were ended today. Only for "
 "accounts having a secondary currency set."
 msgstr ""
-"Bei Transaktionen mit mehreren Währungen fallen ggf. Währungsgewinne oder "
-"Verluste an. Dieses Menü gibt Ihnen einen Überblick über Gewinne und "
-"Verluste, wenn diese heute realisiert würden. Nur für Konten mit definierter "
-"2.Währung."
+"Bei Geschäftsvorfällen mit mehreren Währungen fallen ggf. Währungsgewinne "
+"oder -verluste an. Dieses Menü gibt Ihnen einen Überblick über Gewinne und "
+"Verluste, wenn diese heute realisiert würden. Betrifft nur Konten mit "
+"Alternativwährung."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -887,7 +892,7 @@ msgstr "Tage"
 #: help:account.account.template,nocreate:0
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
-msgstr "Bei Aktivierung, ist dieses nicht im neuen Kontenplan beiinhaltet."
+msgstr "Bei Aktivierung, ist dieses nicht im neuen Kontenplan enthalten."
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:110
@@ -896,9 +901,8 @@ msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
 msgstr ""
-"Kann keine Rechnung %s erzeugen, die bereits ausgeglichen wurde, hierzu muss "
-"die Zahlung zuerst storniert werden. Sie können lediglich diese Rechnung "
-"ausgleichen."
+"Kann eine bereits beglichene Rechnung nicht %s, dazu muss die Zahlung "
+"zunächst storniert werden. Sie können diese Rechnung lediglich rückerstatten."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -924,7 +928,7 @@ msgstr "Werte"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr "Durch. Zahlungsdauer"
+msgstr "Mittlerer Zahlungsverzug"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_chart
@@ -936,15 +940,16 @@ msgstr "Kontenplan Umsatzsteuer"
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr "Erzeuge 3 Monats Periode"
+msgstr "Lege Quartal an"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Fällig"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,8 +965,8 @@ msgid ""
 "This account does not allow reconciliation! You should update the account "
 "definition to change this."
 msgstr ""
-"Dieses Konto kann nicht ausgeziffert werden. Sie können dies jedoch om Konto "
-"einstellen."
+"Dieses Konto erlaubt keinen Ausgleich. Sie können jedoch die Konto-"
+"Einstellungen diesbezüglich ändern."
 
 #. module: account
 #: view:account.invoice:0
@@ -995,7 +1000,7 @@ msgstr "Verbindlichkeit"
 #. module: account
 #: view:account.entries.report:0
 msgid "Extended Filters..."
-msgstr "Erweiterter Filter..."
+msgstr "Erweiterte Filter..."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
@@ -1005,12 +1010,12 @@ msgstr "Zentrales Buchungsjournal"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr "Gutschrift Verkauf"
+msgstr "Rückerstattung aus Verkauf"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr "Bank Auszug"
+msgstr "Bankauszug"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -1030,7 +1035,7 @@ msgstr ""
 "dann die Basis für die Steuerberechnung ist."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "Finde keinen Code für das übergeordnete Vorlagekonto"
@@ -1060,17 +1065,17 @@ msgstr "Buchungsvorlage"
 #: report:account.partner.balance:0
 #: field:account.period,code:0
 msgid "Code"
-msgstr "Kurzbezeichnung"
+msgstr "Kurzbez."
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "Kein Analytisches Journal!"
+msgstr "Kein Analytischer Bericht!"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1084,23 +1089,23 @@ msgstr "Partner Saldenliste"
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
 msgid "Account Name."
-msgstr "Konto Bezeichnung"
+msgstr "Kontobezeichnung"
 
 #. module: account
 #: field:account.chart.template,property_reserve_and_surplus_account:0
 #: field:res.company,property_reserve_and_surplus_account:0
 msgid "Reserve and Profit/Loss Account"
-msgstr "Konto für vorläufigen Gewinn / Verlust"
+msgstr "Konto für Rücklagen und vorläufigen Gewinn / Verlust"
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr "Woche eines Jahres"
+msgstr "Kalenderwoche (KW)"
 
 #. module: account
 #: field:account.report.general.ledger,landscape:0
 msgid "Landscape Mode"
-msgstr "Überblick"
+msgstr "Querformat"
 
 #. module: account
 #: code:addons/account/account.py:645
@@ -1109,17 +1114,18 @@ msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
 "journal items!"
 msgstr ""
-"Sie können den Typ des Kontos mit Buchungen nicht von '%s' auf '%s' ändern."
+"Sie können den Typ des Kontos nicht von '%s' auf '%s' ändern, da es "
+"Buchungen enthält."
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort by"
-msgstr "Sortiere nach"
+msgstr "Sortieren nach"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr "Wähle zu beendendes Geschäftsjahr"
+msgstr "Wählen Sie das abzuschließende Geschäftsjahr"
 
 #. module: account
 #: help:account.account.template,user_type:0
@@ -1128,11 +1134,11 @@ msgid ""
 "information about the account and its specificities."
 msgstr ""
 "Die Kontotypen wurden für die Abbildung von regionalen Besonderheiten "
-"definiert. Hierdurch können Sie Ihre landestypischen Konto(art)typen "
+"definiert. Hierdurch können Sie Ihre landestypischen Kontoarten/-typen "
 "definieren."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1147,7 +1153,7 @@ msgstr "Anwendbare Optionen"
 #. module: account
 #: report:account.partner.balance:0
 msgid "In dispute"
-msgstr "Nn Vollstreckung"
+msgstr "In Anfechtung"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
@@ -1171,17 +1177,17 @@ msgstr "Verantwortl. Mitarbeiter"
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr "Buche alle wiederkehrenden Buchungen vor dem:"
+msgstr "Anlegen der wiederkehrenden Buchungen vor dem:"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr "OP Buchungen"
+msgstr "Unausgeglichene Buchungen"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1189,7 +1195,7 @@ msgstr "Bank"
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr "Beginn der Periode"
+msgstr "Periodenbeginn"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -1202,13 +1208,14 @@ msgid ""
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
-"Gesamtbetrag der Buchungen dieses Kontos in der definierten 2.Währung"
+"Gesamtbetrag der Buchungen in Alternativwährung in der Alternativwährung "
+"dieses Kontos ausgegeben."
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr "Steuer Zuordnung"
+msgstr "Steuerzuordnung"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -1218,7 +1225,7 @@ msgstr "Haben Zentralisierung"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "All Months Sales by type"
-msgstr "Alle Verkäufe nach Typ"
+msgstr "Alle Verkäufe des Monats nach Typ"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1230,15 +1237,15 @@ msgid ""
 msgstr ""
 "Über das Menü Eingangsrechnungen können Sie Rechnungen Ihrer Lieferanten "
 "eingeben und verwalten. OpenERP kann ausserdem automatisch Rechnungsentwürfe "
-"aus Beschaffungsaufträgen erzeugen. Über diesen Weg können Sie nicht nur den "
-"Zeitpunkt der Rechnungserstellung steuern, sondern auch ob bestellte oder "
-"gelieferte Mengen beim Rechnungsentwurf berücksichtigt werden sollen."
+"aus Beschaffungsaufträgen oder Lieferscheinen erzeugen. Somit können Sie die "
+"Eingangsrechnung mit Ihrem Bestellauftrag und der tatsächlichen Lieferung "
+"überprüfen."
 
 #. 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 "Steuerausweis Vorlagen"
+msgstr "Steuerausweis-Vorlagen"
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -1253,7 +1260,7 @@ msgstr "Dieser Code wird auf Berichten angezeigt"
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Purchases"
-msgstr "Steuern für Einkäufe"
+msgstr "Steuern aus Einkäufen (Vorsteuern)"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1261,12 +1268,12 @@ msgstr "Steuern für Einkäufe"
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr "Steuer"
+msgstr "Steuerschlüssel"
 
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr "Wechselkurse"
+msgstr "Wechselkurs (Verkauf)"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1276,10 +1283,10 @@ msgstr "Situation"
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "Der Buchungssatz dieser Buchungszeile."
+msgstr "Der Buchungssatz dieser Buchungs."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1291,7 +1298,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
 msgid "# of Transaction"
-msgstr "# Transaktionen"
+msgstr "Transaktionsnummer"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -1302,18 +1309,18 @@ msgid "Entry Label"
 msgstr "Buchungstext"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
-"Sie können kein Journal beenden ohne Buchungseintrag für diese Peridode! (-> "
-"Wirtschaftsperiode)"
+"Sie können ein Journal (Buch) mit Buchungen in dieser Periode nicht "
+"verändern / löschen!"
 
 #. module: account
 #: help:account.invoice,origin:0
 #: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
-msgstr "Referenz des Rechnungsdokuments"
+msgstr "Referenz zum Ursprungsdokuments dieser Rechnung."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1324,7 +1331,7 @@ msgstr "Sonstige"
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr "Entwurf Abonnement"
+msgstr "Abonnement im Entwurf"
 
 #. module: account
 #: view:account.account:0
@@ -1358,7 +1365,7 @@ msgstr "Konto"
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr "Inbegriffen in Steuergrundlage"
+msgstr "Im Grundbetrag enthalten"
 
 #. module: account
 #: view:account.entries.report:0
@@ -1386,42 +1393,43 @@ msgstr "Ebene"
 #: model:ir.ui.menu,name:account.menu_tax_report
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr "Umsatzsteuer"
+msgstr "Steuern"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr "Wähle eine Start und Ende Periode"
+msgstr "Wähle eine Start- und eine End-Periode"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
-msgstr "GuV"
+msgstr "Gewinn und Verlust"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr "Vorlage Finanzkonten"
+msgstr "Finanzkontenvorlagen"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr "Suche Kontenplan Umsatzsteuer"
+msgstr "Durchsuche Steuerkontenvorlagen"
 
 #. module: account
 #: view:account.move.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_reconcile_select
 #: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
 msgid "Reconcile Entries"
-msgstr "Buchen OP Ausgleich"
+msgstr "OP-Ausgleich buchen"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr "Fällige Rechnungen"
+msgstr "Fällige Zahlungen"
 
 #. module: account
 #: report:account.third_party_ledger:0
@@ -1437,20 +1445,21 @@ msgstr "Zurücksetzen auf Entwurf"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Bank Information"
-msgstr "Bank Informationen"
+msgstr "Bankinformationen"
 
 #. module: account
 #: view:account.aged.trial.balance:0
 #: view:account.common.report:0
 msgid "Report Options"
-msgstr "Report Optionen"
+msgstr "Berichtsoptionen"
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr "Analyse der Journaleinträge"
+msgstr "Analyse der Buchungen"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Partner"
@@ -1475,12 +1484,14 @@ msgid "Central Journal"
 msgstr "Zentrales Journal"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
-msgstr "Konten mit Saldo"
+msgstr "Konten mit Saldo ungeleich 0"
 
 #. module: account
 #: view:account.tax:0
@@ -1495,17 +1506,17 @@ msgstr "Analytisches Konto f. Kosten"
 #. module: account
 #: view:account.model:0
 msgid "Create entries"
-msgstr "Erzeuge Buchungen"
+msgstr "Buchungen anlegen"
 
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr "# Buchungen"
+msgstr "Buchungsanzahl"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
 msgid "Maximum write-off amount"
-msgstr "Max. Abschreibung"
+msgstr "Höchstbetrag f. Abschreibungen"
 
 #. module: account
 #: view:account.invoice:0
@@ -1516,7 +1527,7 @@ msgstr "Berechne Steuern"
 #: field:account.chart.template,code_digits:0
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr "# Stellenanzahl"
+msgstr "Stellenanzahl"
 
 #. module: account
 #: field:account.journal,entry_posted:0
@@ -1545,7 +1556,7 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr "# Einzelposten "
+msgstr "Anz. Positionen "
 
 #. module: account
 #: help:account.fiscal.position,active:0
@@ -1553,13 +1564,13 @@ msgid ""
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
 msgstr ""
-"Durch Deaktivierung des Aktive Feldes können Sie die Finanzposition "
-"deaktivieren ohne diese zu löschen.."
+"Durch Deaktivierung des Feldes \"Aktiv\" können Sie die Finanzposition "
+"verbergen ohne diese zu löschen."
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr "Eine temporäre Tabelle für Pinnwand Ansichten etc."
+msgstr "Eine temporäre Tabelle für Pinnwand-Ansichten"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
@@ -1576,7 +1587,7 @@ msgstr "Lieferantengutschriften"
 #: selection:account.fiscalyear,state:0
 #: selection:account.period,state:0
 msgid "Closed"
-msgstr "Beendet"
+msgstr "Abgeschlossen"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
@@ -1586,12 +1597,12 @@ msgstr "Wiederkehrende Buchungen"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr "Steuerzuordnung Vorlage"
+msgstr "Vorlagen für die Bilanz"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr "Buchungen OP Ausgleich"
+msgstr "Ausgeglichene Geschäftsvorfälle"
 
 #. module: account
 #: field:account.journal.view,columns_id:0
@@ -1617,7 +1628,7 @@ msgstr "Gruppen"
 #: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr "Nettobetrag"
+msgstr "Nicht versteuert"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -1627,7 +1638,7 @@ msgstr "Gehe zu nächstem Partner"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr "Suche Bankauszug"
+msgstr "Bankauszüge durchsuchen"
 
 #. module: account
 #: view:account.move.line:0
@@ -1644,13 +1655,13 @@ msgstr "Kreditorenkonto"
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Gutschrift Steuerkonto"
+msgstr "Rückvergütung vom Steuerkonto"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Belegzeilen"
+msgstr "Belegpositionen"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1662,13 +1673,14 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
-"Ein Bankauszug beinhaltet alle Zahlungsvorgänge einer bestimmten Periode auf "
-"einem Bankkonto, einer Kreditkarte oder anderen Konten für finanzielle "
-"Transaktionen. Der Eröffnungssaldo sowie der Endsaldo wird für jeden Auszug "
-"automatisch errechnet aus dem Kontosaldo zu Beginn der Buchung eines Auszugs "
-"und den gebuchten finanziellen Transaktionen. Wenn Sie sich in der Spalte "
-"Zahlungsausgleich einer Position in einem Bankauszugs befinden, können Sie "
-"über F1 in das Fenster für den Ausgleich von offenen Posten kommen."
+"Ein Bankauszug (Kontoauszug) beinhaltet alle Zahlungsvorgänge eines "
+"gegebenen Zeitraumes auf einem Bankkonto, einer Kreditkarte oder anderen "
+"Konten für finanzielle Transaktionen. Der Eröffnungssaldo sowie der Endsaldo "
+"wird für jeden Auszug automatisch errechnet aus dem Kontosaldo zu Beginn der "
+"Buchung eines Auszugs und den gebuchten finanziellen Transaktionen. Wenn Sie "
+"sich in der Spalte Zahlungsausgleich einer Position in einem Bankauszugs "
+"befinden, können Sie über F1 in das Fenster für den Ausgleich von offenen "
+"Posten kommen."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -1701,7 +1713,7 @@ msgstr "Rechnung"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr "Abrechenbare Analytische Kosten"
+msgstr "Anrechenbare Analytische Kosten"
 
 #. module: account
 #: view:ir.sequence:0
@@ -1711,12 +1723,13 @@ msgstr "Geschäftsjahr Sequenz"
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr "Unterschiedliche Journal Sequenzen"
+msgstr "Unterteilte Folge von Journalen"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr "Mitarbeiter"
+msgstr "Verantwortlicher"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1724,9 +1737,9 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
-"Storno der Rechnung: Erzeugt eine Gutschrift, bestätige diese und erzeuge "
-"einen Ausgleichsbuchung gegen die Ursprungsrechnung für den Ausgleich des "
-"existierenden offenen Postens."
+"Storno der Rechnung: Erzeugt eine Gutschrift, Sie bestätigen diese und "
+"erzeugen eine Ausgleichsbuchung gegen die Ursprungsrechnung für den "
+"Ausgleich des existierenden offenen Postens."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1742,10 +1755,10 @@ msgstr "Unbekannter Partner"
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
-msgstr "Summe Jahr"
+msgstr "Jahressumme"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1801,7 +1814,7 @@ msgstr "Debitoren & Kreditoren"
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr "Standardauswertung von Journalen"
+msgstr "Auswertung von Sammel-Journalen"
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
@@ -1817,7 +1830,7 @@ msgstr "Analytischer Kontenplan"
 #: view:account.analytic.line:0
 #: view:analytic.entries.report:0
 msgid "My Entries"
-msgstr "Meine Buchungen"
+msgstr "Eigene Buchungen"
 
 #. module: account
 #: report:account.overdue:0
@@ -1825,10 +1838,10 @@ msgid "Customer Ref:"
 msgstr "Kundenreferenz:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr "Benutzer %s hat keinen Zugriff auf das %s Journal!"
+msgstr "Benutzer %s hat keinen Zugriff auf das Journal %s!"
 
 #. module: account
 #: help:account.period,special:0
@@ -1838,7 +1851,7 @@ msgstr "Diese Perioden können sich überschneiden"
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr "Beleg Entwurf"
+msgstr "Belegentwurf"
 
 #. module: account
 #: view:account.tax:0
@@ -1873,7 +1886,7 @@ msgstr "Statistik Rechnungen"
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr "beende Periode"
+msgstr "Periodenabschluss"
 
 #. module: account
 #: view:account.installer:0
@@ -1923,7 +1936,7 @@ msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr "Verkauf/Einkauf Journal"
+msgstr "Verkaufs-/Einkaufsbericht"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1935,7 +1948,7 @@ msgstr "Analytisches Konto"
 #, python-format
 msgid "Please verify that an account is defined in the journal."
 msgstr ""
-"Bitte stellen Sie sicher dass ein Konto für das Journal definiert und "
+"Bitte stellen Sie sicher, dass ein Konto für das Journal definiert und "
 "hinterlegt wurde."
 
 #. module: account
@@ -1953,7 +1966,7 @@ msgstr "Druck Finanzjournal"
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr "Produkt Kategorie"
+msgstr "Produktkategorie"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1967,20 +1980,21 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), as calculated in Profit & "
 "Loss Report"
 msgstr ""
-"Dieses Konto wird automatisch als Saldo der G&V errechnet und in der Bilanz "
-"dargestellt."
+"Dieses Konto wird automatisch als Saldo der GuV errechnet und in der Bilanz "
+"dargestellt (Bei Gewinn wird hinzugerechnet, bei Verlust entsprechend "
+"abgezogen)."
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Comparison between accounting and payment entries"
-msgstr "Abgleich Fibukonten mit Zahlungseingängen"
+msgstr "Vergleich zwischen Fibu-Konten und Zahlungseingängen"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Definition"
-msgstr "Steuer Definition"
+msgstr "Steuerdefinition"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -1988,8 +2002,9 @@ msgid ""
 "Check this box if you want to use a different sequence for each created "
 "journal. Otherwise, all will use the same sequence."
 msgstr ""
-"Hake diese Box an falls Sie unterschiedliche Sequenzen für jedes neue "
-"Journal haben möchten. Ansonsten wird immer das gleiche Journal verwendet."
+"Diese Box anwählen, falls Sie unterschiedliche Sequenzen für jedes neue "
+"Journal verwenden möchten. Ansonsten wird immer die gleiche Folgen-"
+"Nummerierung verwendet."
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -1998,8 +2013,8 @@ msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
 msgstr ""
-"Zusätzliche Anzeige der Währung, wenn die Währung anders ist als die "
-"eingestellte Währung des Unternehmens"
+"Zusätzliche Anzeige der Währung, wenn die Währung sich von der eingestellten "
+"Währung des Unternehmens unterscheidet"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -2014,7 +2029,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
-msgstr "Sie müssen eine Analyse Journal vom Typ '%s' definieren"
+msgstr "Sie müssen eine Analysebericht vom Typ '%s' definieren!"
 
 #. module: account
 #: field:account.installer,config_logo:0
@@ -2029,9 +2044,10 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
-"The selected account of your Journal Entry forces to provide a secondary "
-"currency. You should remove the secondary currency on the account or select "
-"a multi-currency view on the journal."
+"Das ausgewählte Konto Ihrer Buchung erzwingt die Angabe einer "
+"Alternativwährung. Sie müssen die Verwendung einer Alternativwährung in den "
+"Einstellungen des Kontos ausschalten oder aber Mehrwährungsfähigkeit im "
+"Bericht einschalten."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_financial_report_tree
@@ -2124,7 +2140,7 @@ msgstr "Januar"
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr "Prüfvorgänge"
+msgstr "Prüfungen"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2142,7 +2158,7 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
-"Ungültige Periode! Diese überlappen oder liegen außerhalb des "
+"Ungültige Periode! Manche überlappen sich oder liegen außerhalb des "
 "Geschäftsjahres "
 
 #. module: account
@@ -2157,10 +2173,10 @@ msgstr "Sie müssen ein Analyse-Journal für das Journal '%s' deinieren!"
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr "Pro-Forma"
+msgstr "Proforma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2189,10 +2205,10 @@ msgstr ""
 #. module: account
 #: view:account.chart.template:0
 msgid "Search Chart of Account Templates"
-msgstr "Suche Kontenplan Vorlage"
+msgstr "Durchsuche Kontenplan-Vorlagen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2249,7 +2265,7 @@ msgid "Description"
 msgstr "Buchungstext"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "GSE"
@@ -2258,7 +2274,7 @@ msgstr "GSE"
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr "In Weiterbearbeitung"
+msgstr "Laufend"
 
 #. module: account
 #: view:account.chart.template:0
@@ -2268,7 +2284,7 @@ msgid "Income Account"
 msgstr "Erlöskonto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2300,16 +2316,17 @@ msgstr "Änderung zu"
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr "# Menge v. Produkt "
+msgstr "Menge des Produkts Anz. "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr "Vorlage f. Produkte"
+msgstr "Produktvorlage"
 
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2319,6 +2336,7 @@ msgstr "Vorlage f. Produkte"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2366,10 +2384,10 @@ msgstr "Lasse leer für alle offenen Geschäftsjahre"
 #. module: account
 #: field:account.invoice.report,account_line_id:0
 msgid "Account Line"
-msgstr "Buchungszeile"
+msgstr "Kontobuchung"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2405,7 +2423,7 @@ msgid "Main Sequence"
 msgstr "Haupt Sequenz"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2430,7 +2448,7 @@ msgstr "Zahlungsbedingung"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Positions"
-msgstr "Steuerzuordnung"
+msgstr "Bilanzpositionen"
 
 #. module: account
 #: constraint:account.account:0
@@ -2467,7 +2485,7 @@ msgstr "Offen"
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr "Entwurf Status bei Rechnung"
+msgstr "Entwurfsstatus einer Rechnung"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -2478,10 +2496,10 @@ msgstr "Offene Posten Ausgleich bei Partnern"
 #: field:account.tax,tax_code_id:0
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "Umsatzsteuer"
+msgstr "Steuerschlüssel"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2498,7 +2516,7 @@ msgstr ""
 #: model:account.payment.term,name:account.account_payment_term_advance
 #: model:account.payment.term,note:account.account_payment_term_advance
 msgid "30% Advance End 30 Days"
-msgstr "30% Anzahlung, Rest in 30 Tagen"
+msgstr "30% Anzahlung, Rest innerhalb von 30 Tagen"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2546,13 +2564,13 @@ msgstr ""
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr "Zentrales Gegenkonto"
+msgstr "Zentrales Soll-Gegenkonto"
 
 #. module: account
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr "Bestätige Rechnung"
+msgstr "Bestätige Rechnungsentwurf"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2574,7 +2592,7 @@ msgid "Account Model Entries"
 msgstr "Buchungsvorlage"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EK"
@@ -2582,7 +2600,7 @@ msgstr "EK"
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr "Steuern Einkauf"
+msgstr "Steuern des Einkaufs (Vorsteuer)"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2611,7 +2629,7 @@ msgstr "Periode auswählen"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr "Abstimmung von Konten"
+msgstr "Abstimmung von Konten (Ausweis)"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -2632,16 +2650,15 @@ msgstr ""
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
 msgstr ""
-"Diese Auswertung ermöglicht einen Überblick über den Saldo das spezifizierte "
+"Diese Auswertung ermöglicht einen Überblick über den Saldo des angegebenen "
 "Journals."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr "OP-Ausgleich (mit Differenz)"
+msgstr "OP-Ausgleich (Abschreibung)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2673,10 +2690,10 @@ msgid "Accounts"
 msgstr "Finanzkonten"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
-msgstr "Konfigurationsfehler !"
+msgstr "Konfigurationsfehler!"
 
 #. module: account
 #: field:account.invoice.report,price_average:0
@@ -2692,7 +2709,7 @@ msgstr "Datum:"
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Label"
-msgstr "Produktbeschriftung"
+msgstr "Etikett"
 
 #. module: account
 #: view:account.tax:0
@@ -2746,7 +2763,7 @@ msgstr "Automatischer Kontenausgleich"
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr "Bezahlt / OP Ausgleich"
+msgstr "Bezahlt/Beglichen"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
@@ -2777,7 +2794,7 @@ msgstr "Übergeordnete Kontenplan Vorlage"
 #: field:account.tax,parent_id:0
 #: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
-msgstr "Oberkonto Steuer"
+msgstr "Übergeordnetes Steuerkonto"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:59
@@ -2796,6 +2813,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Saldo Partner nach Alter"
@@ -2845,21 +2863,21 @@ msgstr "Konfigurieren Sie Ihren Kontenplan"
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr "Diese Assistent erzeugt wiederkehrende Buchungen."
+msgstr "Dieser Assistent erzeugt wiederkehrende Buchungen."
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
-msgstr "Keine Sequenz für dieses Journal definiert !"
+msgstr "Keine Sequenz für dieses Journal definiert!"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "Sie sollten ein analytisches Journal im '%s' Journal definieren!"
+msgstr "Sie müssen ein analytisches Journal im '%s' Journal definieren!"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -2868,7 +2886,7 @@ msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance!"
 msgstr ""
-"Für die Eröffnungsbilanz  benötigen sie ein Eröffnungsjournal mit "
+"Für die Eröffnungsbilanz benötigen Sie ein Eröffnungsjournal mit "
 "Zentralisierung."
 
 #. module: account
@@ -2964,10 +2982,10 @@ msgstr ""
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr "Steuergrundlage Betrag"
+msgstr "Bemessungsgrundlage Betrag"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2982,7 +3000,7 @@ msgid "Default Sale Tax"
 msgstr "Standard Steuer Verkauf"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Rechnung  '%s' ist validiert."
@@ -3001,7 +3019,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
 msgid "Financial Accounting"
-msgstr "Finanzen"
+msgstr "Finanzbuchhaltung"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report_pl
@@ -3020,16 +3038,16 @@ msgstr "Gewinn und Verlust"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr "Steuerzuordnung"
+msgstr "Bilanz"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
 "Click on compute to update the tax base."
 msgstr ""
-"Die Steuerbasis stimmt nicht!\n"
+"Die Steuergrundlage ist geändert!\n"
 "Drücken Sie Berechnen!"
 
 #. module: account
@@ -3068,12 +3086,12 @@ msgstr "Verantwortlicher Mitarbeiter für dieses Journal"
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr "Suche Periode"
+msgstr "Durchsuche Periode"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr "Währung"
+msgstr "Rechnungswährung"
 
 #. module: account
 #: field:accounting.report,account_report_id:0
@@ -3089,7 +3107,7 @@ msgstr "Vereinbarungen"
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Cash Transaction"
-msgstr "Barkasse Transaktionen"
+msgstr "Bar-Geschäftsvorfälle"
 
 #. module: account
 #: view:res.partner:0
@@ -3099,7 +3117,7 @@ msgstr "Bankkonto"
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr "Umsatzsteuer Vorlagenliste"
+msgstr "Steuer-Vorlagenliste"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
@@ -3119,7 +3137,7 @@ msgstr ""
 "wird. In den meisten Ländern ist \"Durchhschnitt\" die legale Methode, aber "
 "nur wenige Systeme können dies. Für Importe von anderen Systemen muss daher "
 "ggf. der Tageskurs verwendet werden. Eingehende Transkationen verwenden "
-"jedenfalls den Tageskurs."
+"grundsätzlich den Tageskurs."
 
 #. module: account
 #: help:account.chart.template,code_digits:0
@@ -3130,12 +3148,12 @@ msgstr "Anzahl Stellen für Konto"
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
-msgstr "Zeile Bezeichnung"
+msgstr "Zeilenbezeichnung"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Search Fiscalyear"
-msgstr "Suche Geschäftsjahr"
+msgstr "Durchsuche Geschäftsjahr"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -3163,7 +3181,7 @@ msgstr "Abschreibungskonto"
 #: view:account.subscription:0
 #: field:account.subscription,model_id:0
 msgid "Model"
-msgstr "Standard"
+msgstr "Modell"
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
@@ -3179,7 +3197,7 @@ msgid "View"
 msgstr "Ansicht"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3241,7 +3259,7 @@ msgid ""
 msgstr ""
 "Der Assistent wird alle Buchungen für eine bestimmtes Journal innerhalb "
 "einer bestimmten Periode buchen. Sobald die Buchungen erzeugt wurden, können "
-"Sie nicht mehr vorher abgeändert werden."
+"Sie nicht mehr abgeändert werden."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -3388,17 +3406,17 @@ msgid "Starting Balance"
 msgstr "Anfangssaldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
-msgstr "Kein Partner definiert!"
+msgstr "Kein Partner festgelegt!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_close
 #: model:ir.actions.act_window,name:account.action_account_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr "Beende Periode"
+msgstr "Periode abschließen"
 
 #. module: account
 #: field:account.financial.report,display_detail:0
@@ -3421,15 +3439,15 @@ msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
 msgstr ""
-"Der Betrag in einer anderen Währung, insofern normalerweise die "
-"Unternehmenswährung eine andere ist."
+"Der Betrag in der Währung des Kontos angegeben, sofern diese sich von der "
+"Unternehmenswährung unterscheidet."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_select
 msgid "Unreconcile Entries"
-msgstr "Ausgleich Offene Posten zurücksetzen"
+msgstr "OP-Ausgleich stornieren"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
@@ -3444,7 +3462,7 @@ msgid "Chart of Tax"
 msgstr "Steuerkontenplan"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "Der Endsaldo muss mit dem errechneten übereinstimmen!"
@@ -3452,7 +3470,7 @@ msgstr "Der Endsaldo muss mit dem errechneten übereinstimmen!"
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr "Suche Buchungsjournal"
+msgstr "Durchsuche Buchungsjournal"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
@@ -3504,13 +3522,13 @@ msgstr "Suche Buchung"
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr "Umsatzsteuervorgang"
+msgstr "Versteuerungsbezeichnung"
 
 #. module: account
 #: report:account.invoice:0
 #: model:process.node,name:account.process_node_draftinvoices0
 msgid "Draft Invoice"
-msgstr "Entwurf Rechnung"
+msgstr "Rechnungsentwurf"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -3519,8 +3537,8 @@ msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
 msgstr ""
-"Ausgewählte Rechnung(en) kann nicht geändert, das Sie bereits im "
-"'Abgebrochen' oder 'Erledigt' Status ist."
+"Ausgewählte Rechnung(en) kann/können nicht geändert, das Sie bereits im "
+"'Abgebrochen' oder 'Erledigt' Status ist/sind."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -3529,8 +3547,9 @@ msgstr "Menge:"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
-msgstr "Perioden Länge (Tage)"
+msgstr "Periodendauer (Tage)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
@@ -3546,28 +3565,28 @@ msgstr "Rechnungsstatus"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr "Produktkategorien"
+msgstr "Produktkategorie"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr "Erstelle Konto"
+msgstr "Konto anlegen"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
 msgid "Report of the Sales by Account Type"
-msgstr "Auswertung Verkauf nach Kontentyp"
+msgstr "Verkaufsauswertung nach Kontentyp"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr "Nicht ausgeglichen Buchungen"
+msgstr "Nicht ausgeglichene Buchungen"
 
 #. module: account
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr "Der Währungscode muss je Unternehmen eindeutig sein"
+msgstr "Der Währungsschlüssel muss je Unternehmen eindeutig sein"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3575,7 +3594,7 @@ msgid "Detail"
 msgstr "Details"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3592,12 +3611,19 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 msgid "VAT :"
-msgstr "UST:"
+msgstr "USt.:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3620,11 +3646,11 @@ msgid "Centralised counterpart"
 msgstr "Zentralisierung Gegenkonto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
-"Sie dürfen keine Buchungen vom Typ \"Sicht\" für das Konto erzeugen %s %s"
+"Konten vom Typ \"Sicht\" %s %s können für Buchungen nicht verwendet werden"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -3639,13 +3665,15 @@ msgstr "2"
 #. module: account
 #: view:account.chart:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
-msgstr "(Wenn kein Geschäftsjahr ausgewählt wird, werden alle genommen)"
+msgstr ""
+"(Wenn kein Geschäftsjahr ausgewählt wird, werden alle laufenden genommen)"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3673,10 +3701,17 @@ msgstr "(Wenn kein Geschäftsjahr ausgewählt wird, werden alle genommen)"
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Datum"
 
@@ -3693,7 +3728,6 @@ msgstr "Storno Ausgleich"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3707,7 +3741,7 @@ msgid "Chart of Accounts Template"
 msgstr "Vorlage Kontenplan"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3719,7 +3753,7 @@ msgstr ""
 "Bitte ordnen Sie dem Partner eine Zahlungsbedingungen zu."
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Einige Einträge wurden bereits ausgeglichen!"
@@ -3750,6 +3784,8 @@ msgstr "Finanzbudgets"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Keine Filter"
 
@@ -3783,12 +3819,12 @@ msgstr "Anzuwendender Typ (if type=code)"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,product_qty:0
 msgid "Qty"
-msgstr "Menge"
+msgstr "Anz"
 
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
-msgstr "Partner Kontakt Name"
+msgstr "Partner Kontaktperson"
 
 #. module: account
 #: field:account.move.line,blocked:0
@@ -3798,7 +3834,7 @@ msgstr "Rechtsstreit"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr "Suche Analytische Buchungen"
+msgstr "Durchsuche Analytische Buchungen"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
@@ -3835,7 +3871,7 @@ msgid "Analytic Items"
 msgstr "Analytische Buchungen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Die Steuer kann nicht geändert werden!"
@@ -3843,12 +3879,12 @@ msgstr "Die Steuer kann nicht geändert werden!"
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr "# Buchungen"
+msgstr "Anz. Buchungen"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft Refund"
-msgstr "Erzeuge Gutschrift Entwurf"
+msgstr "Erzeuge Gutschriftsentwurf"
 
 #. module: account
 #: view:account.state.open:0
@@ -3858,7 +3894,7 @@ msgstr "Offene Rechnung"
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr "Faktor Steuerberechnung"
+msgstr "Faktor für Steuerberechnung"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -3866,7 +3902,7 @@ msgid "Mapping"
 msgstr "Steuer Umschlüsselung"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3882,6 +3918,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3895,7 +3932,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Auswertung Altersstruktur Forderungen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3943,7 +3980,7 @@ msgid ""
 "same company."
 msgstr ""
 "Das gewählte  Geschäftsjahr, die Periode und das Konto müssen zum selben "
-"UNternehmen gehören."
+"Unternehmen gehören."
 
 #. module: account
 #: model:ir.actions.todo.category,name:account.category_accounting_configuration
@@ -3959,7 +3996,7 @@ msgstr "Finanzen"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current year"
-msgstr "Jaurnalbuchungen des laufenden Jahres"
+msgstr "Journalbuchungen des laufenden Jahres"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3970,7 +4007,7 @@ msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
 msgstr ""
-"Drucke Auswertung / Report mit der Spalte Währung für den Fall dass sich die "
+"Drucke Auswertung/Bericht mit der Spalte Währung für den Fall, dass sich die "
 "Währung der Rechnung von der Standardwährung des Unternehmens unterscheidet"
 
 #. module: account
@@ -3979,7 +4016,7 @@ msgid ""
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
 msgstr ""
-"Währungsgewinne oder Verluste im Zuge von Transaktionen mit mehreren "
+"Währungsgewinne oder Verluste im Zuge von Geschäftsvorfällen mit mehreren "
 "Währungen"
 
 #. module: account
@@ -4071,7 +4108,7 @@ msgstr ""
 #. module: account
 #: field:account.chart,period_from:0
 msgid "Start period"
-msgstr "Beginn der Periode"
+msgstr "Periodenbeginn"
 
 #. module: account
 #: field:account.tax,name:0
@@ -4098,23 +4135,23 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
-"Falls dieses Feld aktiviert wird, kann die Anzeige für das Finanzkonto "
-"versteckt werden."
+"Mit Aktivierung wird die Anzeige für das Finanzkonto verborgen werden. ohne "
+"es löschen zu müssen."
 
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr "Verbuchte Buchungen"
+msgstr "Quittierte Buchungen"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr "Suche Steuervorlage"
+msgstr "Durchsuche Steuervorlagen"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr "Buchungen im Entwurf"
+msgstr "Buchungsentwürfe"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -4135,7 +4172,7 @@ msgstr "Tastenkombination (Shortcut)"
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The start date of the fiscal year must be before his end date."
-msgstr "Fehler! Der Beginn des Jahres muss vor dem Ende liegen."
+msgstr "Fehler! Der Beginn des Geschäftsjahres muss vor dem Ende liegen."
 
 #. module: account
 #: view:account.account:0
@@ -4156,7 +4193,7 @@ msgstr "Kontoart"
 #. module: account
 #: view:res.partner:0
 msgid "Bank Account Owner"
-msgstr "Bankkonto Eigentümer"
+msgstr "Bankkonto-Eigentümer"
 
 #. module: account
 #: report:account.account.balance:0
@@ -4194,8 +4231,8 @@ msgid ""
 "You haven't supplied enough argument to compute the initial balance, please "
 "select a period and journal in the context."
 msgstr ""
-"Sie haben nicht genug Angaben für die Berrechnung des Anfangssaldos gemacht. "
-"Wählen Sie bitte eine Periode und ein Journal!"
+"Sie haben unzureichende Angaben für die Berechnung des Anfangssaldos "
+"gemacht. Wählen Sie bitte eine Periode und ein Journal!"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -4216,12 +4253,12 @@ msgstr "Kassenabschluss"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr "Durch. Zahlungsverzug"
+msgstr "Durchschnittl. Zahlungsverzug"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
-msgstr "Kontotyp"
+msgstr "Kontoart"
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4235,16 +4272,16 @@ msgid "Month"
 msgstr "Monat"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
 "some non legal fields or you must unconfirm the journal entry first! \n"
 "%s"
 msgstr ""
-"Sie dürfen diese Änderung nicht in verbuchten Buchungenmachen! \n"
+"Sie dürfen diese Änderung nicht in quittierten Buchungen machen! \n"
 "Sei können nur einige buchungstechnisch nicht relevante Felder ändern oder "
-"Sie müssen die Buchung vorher auf unbestätigt setzen.\n"
+"Sie müssen die Buchung vorher auf unquittiert zurücksetzen.\n"
 "%s"
 
 #. module: account
@@ -4255,7 +4292,7 @@ msgstr "PayPal Konto"
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr "Referenz ME"
+msgstr "Bezugs-ME"
 
 #. module: account
 #: field:account.account,note:0
@@ -4278,7 +4315,7 @@ msgstr "Fällige Analytische Konten"
 #: code:addons/account/account.py:184
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr "Bilanz (Verbindlichkeit)"
+msgstr "Bilanz (Verbindlichkeiten)"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4293,10 +4330,10 @@ msgstr "Steuerbuchungen"
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr "Steuergrundlage"
+msgstr "Bemessungsgrundlage (Steuern & Gebühren)"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4306,7 +4343,7 @@ msgstr ""
 #. module: account
 #: view:res.partner:0
 msgid "Customer Accounting Properties"
-msgstr "Debitoren Eigenschaften"
+msgstr "Debitoren-Eigenschaften"
 
 #. module: account
 #: help:res.company,paypal_account:0
@@ -4381,7 +4418,8 @@ msgstr "Periodische Buchungen"
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr "Für Sichten dürfen keine Analysezeilen erzeugt werden"
+msgstr ""
+"Sicht-Konten dürfen (auch für) Analysebuchungen nicht bebucht werden."
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4389,8 +4427,8 @@ msgid ""
 "When new move line is created the state will be 'Draft'.\n"
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
-"Wenn die Buchung erzeugt wird, ist der Status 'Entwurf'.\n"
-"* Wenn alle Zahlungen erfolgt sind, wechselt der Status direkt zu 'Gebucht'."
+"Wenn die Buchung angelegt wird, ist der Status 'Entwurf'.\n"
+"* Wenn alle Zahlungen erfolgt sind, wechselt der Status auf 'Gebucht'."
 
 #. module: account
 #: field:account.journal,view_id:0
@@ -4499,6 +4537,10 @@ msgid ""
 "you want to generate accounts of this template only when loading its child "
 "template."
 msgstr ""
+"Setzen Sie hier keinen Haken, wenn Sie nicht möchten, dass diese Vorlage zur "
+"Erzeugung des Kontenplans durch den Assistenten genutzt wird. Das ist "
+"Sinnvoll, wenn Sie untergeordnete Konten nur aus dieser Vorlage anlegen "
+"wollen, wenn Sie eine abgeleitete Vorlage laden."
 
 #. module: account
 #: view:account.use.model:0
@@ -4512,7 +4554,7 @@ msgid "Allow Reconciliation"
 msgstr "Erlaube Ausgleich"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4528,27 +4570,27 @@ msgstr "Auswertungen Analytisches Konto"
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Based On"
-msgstr "Basiert auf"
+msgstr "Basierend auf"
 
 #. module: account
 #: field:account.tax,price_include:0
 #: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
-msgstr "Steuer Inklusive"
+msgstr "Preis inklusive Steuer"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr "Analytisches Journal für Kosten"
+msgstr "Sammelkonto der Journale analytischer Kosten"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Recurring Models"
-msgstr "Wiederkehrende Buchungen"
+msgstr "Wiederkehrende Modelle"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Kodierungsfehler"
@@ -4560,8 +4602,9 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
-msgstr "Ändere Währung"
+msgstr "Wechselgeld"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -4576,7 +4619,7 @@ msgstr "Kontoarten Auswahl"
 #. module: account
 #: help:account.journal,default_credit_account_id:0
 msgid "It acts as a default account for credit amount"
-msgstr "Fungiert als Standard Konto für die Haben Buchung in diesem Journal"
+msgstr "Fungiert als Standardkonto für die Haben Buchung in diesem Journal"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4584,7 +4627,7 @@ msgstr "Fungiert als Standard Konto für die Haben Buchung in diesem Journal"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr "Buche Journaleinträge"
+msgstr "Quittiere Buchungen"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4604,14 +4647,14 @@ msgid "Example"
 msgstr "Beispiel"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
 "The real total does not match the computed total."
 msgstr ""
-"Bitte überprüfen Sie den Rechnungspreis !\n"
-"Dieser Wert entspricht nicht dem Gesamtbetrag der Rechnung."
+"Bitte überprüfen Sie die Rechnungssumme!\n"
+"Dieser Wert entspricht nicht dem errechneten Gesamtbetrag der Rechnung."
 
 #. module: account
 #: view:account.tax:0
@@ -4620,17 +4663,17 @@ msgid "Keep empty to use the income account"
 msgstr "Leer lassen um das Erlöskonto zu nutzen"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
-msgstr "Einkauf Steuer %.2f%%"
+msgstr "Vorsteuer %.2f%%"
 
 #. module: account
 #: view:account.subscription.generate:0
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr "Wiederkehrende Buchungen (Automatisch)"
+msgstr "Buchungen (Automatisch)"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
@@ -4642,13 +4685,13 @@ msgstr "Wähle Steuerkontenplan"
 #: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
-msgstr "Konten Zuordnung"
+msgstr "Kontenzuordnung"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Kunde"
@@ -4664,7 +4707,7 @@ msgid "Cancelled Invoice"
 msgstr "Stornierte Rechnung"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4703,7 +4746,7 @@ msgid ""
 "means you won't be able to modify their accounting fields anymore."
 msgstr ""
 "Alle Buchungen dieses Journals im Status 'Entwurf' werden gebucht. Hierdurch "
-"können Sie dann keine Buchungen mehr vorher abändern."
+"können Sie dann keine Buchungen mehr abändern."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
@@ -4721,7 +4764,7 @@ msgid "Income Account on Product Template"
 msgstr "Erlöskonto für Produktvorlage"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "DIV"
@@ -4748,11 +4791,13 @@ msgstr "Neues Geschäftsjahr"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Rechnung"
 
@@ -4772,7 +4817,7 @@ msgstr "Schecks"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesman"
-msgstr "Mitarbeiter"
+msgstr "Verkäufer"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4782,12 +4827,12 @@ msgstr "Abgerechnet"
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
-msgstr "Verbuchte Buchungen"
+msgstr "Quittierte Buchungen"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Use Model"
-msgstr "Benutze Buchungsvorlage"
+msgstr "Benutze Modellvorlage"
 
 #. module: account
 #: help:account.invoice,partner_bank_id:0
@@ -4797,9 +4842,9 @@ msgid ""
 "Partner bank account number."
 msgstr ""
 "Bankkonto für die Zahlung\r\n"
-"* Kundenrechnungen und Lieferantengutschriften: Ein Bankkonto des "
+"* Bei Kundenrechnungen und Lieferantengutschriften ein Bankkonto des "
 "Unternehmens\r\n"
-"* sonst: ein Bankkonto des Partners"
+"* ansonsten ein Bankkonto des Partners"
 
 #. module: account
 #: view:account.state.open:0
@@ -4809,7 +4854,7 @@ msgstr "Nein"
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
 msgid "The tax basis of the tax declaration."
-msgstr "Die Steuerbasis in der Steuererklärung"
+msgstr "Die Steuergrundlage in der Steuererklärung"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -4820,7 +4865,7 @@ msgstr "Hinzufügen"
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
 msgid "Paid"
-msgstr "bezahlt"
+msgstr "Bezahlt"
 
 #. module: account
 #: view:account.period.close:0
@@ -4835,7 +4880,7 @@ msgstr "Der Bankauszug für den Bankausgleich"
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr "Rechnungen im Entwurf wurden gebucht. "
+msgstr "Rechnungentwürfe wurden genehmigt. "
 
 #. module: account
 #: constraint:account.account.template:0
@@ -4856,7 +4901,7 @@ msgstr "Eröffnungsperiode"
 #. module: account
 #: view:account.move:0
 msgid "Journal Entries to Review"
-msgstr "Buchungen zu überprüfen"
+msgstr "Zu prüfende Buchungen"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4892,29 +4937,27 @@ msgstr "Steuer Anwendung"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr "Journal Zeilen"
+msgstr "Buchungen"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Fehler"
@@ -4926,7 +4969,7 @@ msgstr "Fehler"
 #: field:account.analytic.inverted.balance,date2:0
 #: field:account.analytic.journal.report,date2:0
 msgid "End of period"
-msgstr "Ende Periode"
+msgstr "Periodenende"
 
 #. module: account
 #: view:res.partner:0
@@ -4939,8 +4982,8 @@ msgid ""
 "This report is analysis by partner. It is a PDF report containing one line "
 "per partner representing the cumulative credit balance."
 msgstr ""
-"Der Report erzeugt Analysen nach Partner. Es handelt sich dabei um einen pdf "
-"Report mit jeweils einer Zeile für den Partner"
+"Der Report erzeugt Analysen nach Partner. Es handelt sich dabei um einen PDF-"
+"Report mit jeweils einer Zeile pro Partner"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -5006,7 +5049,7 @@ msgstr "Verkaufsjournal in diesem Monat"
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
 #: model:ir.model,name:account.model_account_vat_declaration
 msgid "Account Vat Declaration"
-msgstr "Auswertung Umsatzsteuer"
+msgstr "Umsatzsteuererklärung (-voranmeldung)"
 
 #. module: account
 #: report:account.invoice:0
@@ -5016,15 +5059,15 @@ msgstr "Preis"
 #. module: account
 #: view:account.period:0
 msgid "To Close"
-msgstr "Zu Beendigen"
+msgstr "Abzuschließen"
 
 #. module: account
 #: field:account.treasury.report,date:0
 msgid "Beginning of Period Date"
-msgstr "Beginn Periode"
+msgstr "Datum des Periodebeginns"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -5043,18 +5086,18 @@ msgstr "Vorlagen"
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr "Steuer Beschreibung"
+msgstr "Steuerbezeichnung"
 
 #. module: account
 #: field:account.tax,child_ids:0
 msgid "Child Tax Accounts"
-msgstr "untergeordnete Steuerkonten"
+msgstr "Untergeordnete Steuerkonten"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr "Beginn der Periode sollte kleiner sein als Ende der Periode"
+msgstr "Periodenbeginn muss vor dem Periodenende liegen"
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -5063,7 +5106,7 @@ msgid ""
 "Check this if the price you use on the product and invoices includes this "
 "tax."
 msgstr ""
-"Aktivieren, wenn der Preis bei Produkt und Rechnung die Steuer beinhaltet"
+"Aktivieren, wenn der Preis bei Produkt und Rechnung diese Steuer beinhaltet"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5073,6 +5116,7 @@ msgstr "Saldo (Anal.)"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5116,8 +5160,10 @@ msgstr "Periodentyp"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
-msgstr "Anzeige Zahlungen"
+msgstr "Zahlungen"
 
 #. module: account
 #: view:account.tax:0
@@ -5194,7 +5240,7 @@ msgid "Line 1:"
 msgstr "Zeile 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integritätsfehler!"
@@ -5212,7 +5258,7 @@ msgstr "Monat"
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr "Nächster Partner für Offene Posten Ausgleich"
+msgstr "Nächster Partner zum Ausgleich offener Posten"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -5227,6 +5273,7 @@ msgstr "Ergebnis Kontoabstimmung"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Bilanz"
@@ -5291,7 +5338,7 @@ msgstr "Verkauf"
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
-msgstr "Report"
+msgstr "Bericht"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -5303,6 +5350,7 @@ msgstr "Report"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5316,7 +5364,7 @@ msgstr "Betrag"
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Validation"
-msgstr "Buchung"
+msgstr "Prüfung"
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -5327,7 +5375,7 @@ msgstr "Steuer auf untergeordnete Datensätze"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr "Steuer Zuordnung Vorlage"
+msgstr "Vorlage zur Steuerzuordnung in der Bilanz"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -5352,7 +5400,7 @@ msgstr "Personenkonto"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transaction"
-msgstr "Transaktion"
+msgstr "Geschäftsvorfall"
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -5364,7 +5412,7 @@ msgstr "Transaktion"
 #: 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 "Benutze diese ID für die Ust. - Voranmeldung"
+msgstr "Benutze diese ID für die Umsatzsteuervoranmeldung"
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
@@ -5379,7 +5427,7 @@ msgstr "Analyt.  Buchungen Statistik"
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Cash and Banks"
-msgstr "Geld und Banken"
+msgstr "Bargeld und Banken"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
@@ -5389,7 +5437,7 @@ msgstr "account.installer"
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr "In Basis Betrag inkludieren"
+msgstr "In Grundbetrag einbeziehen"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5397,7 +5445,7 @@ 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 ""
-"Anzahl der Tage befor das Monatsende berechnet wird. \r\n"
+"Anzahl der zu addierenden Tage bevor das Monatsende berechnet wird. \r\n"
 "Datum = 15.1\r\n"
 "Anzahl Tage = 22\r\n"
 "Tag des Monats = -1\r\n"
@@ -5435,7 +5483,6 @@ msgstr "Standardauswertung Finanzen"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Kommunikation"
 
@@ -5488,22 +5535,22 @@ msgid "End of Year Entries Journal"
 msgstr "Journal Eröffnungsbuchungen"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
-msgstr "Fehler Konfiguration !"
+msgstr "Konfigurationsfehler!"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
-msgstr "Zahlungsbetrag"
+msgstr "Zahlbetrag"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5518,12 +5565,12 @@ msgstr ""
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr "Automatische Buchungen"
+msgstr "Automatische Wiederholungs-Buchungen"
 
 #. module: account
 #: field:account.entries.report,quantity:0
 msgid "Products Quantity"
-msgstr "Produkt Menge"
+msgstr "Produktmenge"
 
 #. module: account
 #: view:account.entries.report:0
@@ -5532,7 +5579,7 @@ msgstr "Produkt Menge"
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr "Nicht gebucht"
+msgstr "Nicht quittiert"
 
 #. module: account
 #: view:account.change.currency:0
@@ -5555,7 +5602,7 @@ msgstr "Buchungen"
 #. module: account
 #: view:account.invoice:0
 msgid "Payment Date"
-msgstr "Datum Zahlung"
+msgstr "Zahlungsdatum"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -5570,7 +5617,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Kunden Rechnungen und Gutschriften"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5584,13 +5630,13 @@ msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
 msgstr ""
-"Spezielles Journal hat keine Buchungspositionen im Entwurfsstadium für diese "
-"Periode."
+"Angegebenes Journal enthält keine Buchungspositionen im Entwurfsstadium für "
+"diese Periode."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
 msgid "Lines to reconcile"
-msgstr "Auszugleichende Buchungen"
+msgstr "Zu begleichende Buchungen"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5633,9 +5679,9 @@ msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
-"Anzahl der maximalen Teilbeträge die für einen gegenseitigen Ausgleich von "
-"Rechnungen und Zahlungen  kombiniert werden dürfen, um automatisch eine "
-"Saldenausgleich für das ausgewählte Konto herbeizuführen."
+"Anzahl der gleichen Teilbeträge die, in der Summe, zum Ausgleich von "
+"Rechnungen aufgebracht werden müssen, um die Stärke des automatischen "
+"Saldenausgleichs für das ausgewählte Konto zu nutzen."
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -5643,14 +5689,14 @@ msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
 msgstr ""
-"Die Sequenz Feld wird benutzt, um in diesem Fall die Zahlungsbedingungen von "
-"der geringsten Sequenz zu höheren Sequenzen sukzessiv durchzuführen."
+"Die Sequenz Feld wird benutzt, um die Zahlungsbedingungen von der geringsten "
+"Sequenz- bzw. Folgennummer beginnend zu sortieren."
 
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr "Steuerzuordnung Vorlage"
+msgstr "Bilanz-Vorlage"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -5668,10 +5714,10 @@ msgid ""
 "finalize your end of year results definitive "
 msgstr ""
 "Wenn keine weiteren Buchungen für dieses Geschäftsjahr generiert werden "
-"sollen können Sie das Jahr abschliessen. Hierdurch werden alle noch offenen "
-"Perioden beendet, wodurch weitere Buchungen in diesem Jahr nicht mehr "
-"möglich sind. Beenden Sie das Jahr erst, wenn Sie definitv keine weiteren "
-"Buchungen mehr tätigen müssen. "
+"sollen, können Sie das Jahr abschliessen. Hierdurch werden alle noch offenen "
+"Perioden beendet. Weitere Buchungen in diesem Jahr sind nicht mehr möglich. "
+"Beenden Sie das Jahr erst, wenn Sie definitv keine weiteren Buchungen mehr "
+"tätigen müssen. "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5700,14 +5746,14 @@ msgid ""
 "No fiscal year defined for this date !\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
-"Es gibt kein Geschäftsjahr für dieses Datum !\n"
+"Es ist kein Geschäftsjahr für dieses Datum angelegt!\n"
 "Bitte legen Sie ein Geschäftsjahr im Konfigurationsmenü des Finanzbereiches "
 "an."
 
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconcile With Write-Off"
-msgstr "Ausgleichen mit Abschreibung"
+msgstr "Ausgleichen durch Abschreibung"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -5748,7 +5794,7 @@ msgid "Generate Opening Entries"
 msgstr "Erstelle Vortragsbuchungen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Bereits ausgeglichen"
@@ -5781,14 +5827,14 @@ msgid "Child Accounts"
 msgstr "untergeordnete Konten"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Buchungsnummer (id): %s  (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Abschreibung"
@@ -5808,7 +5854,7 @@ msgstr "Erlöse"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Lieferant"
@@ -5838,7 +5884,7 @@ msgid "Account n°"
 msgstr "Kontonummer"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Freie Referenz"
@@ -5853,7 +5899,9 @@ msgstr "Berechnungsform"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Debitoren und Kreditoren"
@@ -5872,12 +5920,12 @@ msgstr "Status Offen"
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Max Qty:"
-msgstr "Max. Menge"
+msgstr "Max. Menge:"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice"
-msgstr "Gutschrift Rechnung"
+msgstr "Rechnungsgutschrift"
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
@@ -5891,10 +5939,10 @@ msgid ""
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
-"Durch diese Ansicht können Sie multidimensionale Ansichten auf Ihre "
-"Finanzkonten vornehmen. Diese Perspektive zeigt Ihnen Ihre Salden und "
-"Verkehrszahlen sowie diverse andere Kriterien und Werte die beim Suchdialog "
-"gewählt werden können."
+"Durch diese Ansicht erhalten Sie mehrdimensionale Ansichten auf Ihre "
+"Finanzkonten. Diese Perspektive zeigt Ihnen Ihre Salden und Verkehrszahlen "
+"sowie diverse andere Kriterien und Werte die im Auswahldialog gewählt werden "
+"können."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -5903,9 +5951,9 @@ msgid ""
 "OpenERP allows you to define the tax structure and manage it from this menu. "
 "You can define both numeric and alphanumeric tax codes."
 msgstr ""
-"Die Definition der Umsatzsteuern richtet sich nach der im jeweiligen Land "
-"gültigen Regelung für die Abgabe von Steuererklärungen OpenERP ermöglicht "
-"Ihnen dabei die Struktur der Steuern zu definieren und über dieses Menü zu "
+"Die Definition der Steuern richtet sich nach der im jeweiligen Land gültigen "
+"Regelung für die Abgabe von Steuererklärungen. OpenERP ermöglicht Ihnen "
+"dabei die Struktur der Steuern zu definieren und über dieses Menü zu "
 "verwalten. Sie können sowohl numerische als auch alphanumerische "
 "Zeichenfolgen für die Definition verwenden."
 
@@ -5927,8 +5975,8 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be threated."
 msgstr ""
-"Wählen Sie hier die Berechnungsart dieser Zeile Ihrer Zahlungsbedingung. Sie "
-"sollten dabei mindestens eine letzte Zeile mit der Berechnungsart "
+"Wählen Sie hier die Berechnungsart dieser Position Ihrer Zahlungsbedingung. "
+"Sie sollten dabei mindestens eine letzte Zeile mit der Berechnungsart "
 "'Saldoausgleich' definiert haben."
 
 #. module: account
@@ -5943,7 +5991,7 @@ msgstr "Erzwinge Periode"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,nbr:0
 msgid "# of Lines"
-msgstr "# Positionen"
+msgstr "Anz. Positionen"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -5965,10 +6013,10 @@ msgid "Filter by"
 msgstr "Filter durch"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
-msgstr "Sie haben einen falschen Ausdruck \"%(...)s\" in Ihrem  Model !"
+msgstr "Sie haben einen falschen Ausdruck \"%(...)s\" in Ihrem  Modell!"
 
 #. module: account
 #: field:account.bank.statement.line,date:0
@@ -5976,8 +6024,8 @@ msgid "Entry Date"
 msgstr "Buchungsdatum"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Sie können kein inaktives Konto verwenden!"
@@ -6006,7 +6054,7 @@ msgstr "Die aktuelle Währung ist nicht richtig konfiguriert!"
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr "Rechnung Steuerkonto"
+msgstr "Konto der Rechnungssteuer"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_general_journal
@@ -6020,12 +6068,12 @@ msgid "Number of Days"
 msgstr "Anzahl Tage"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
-msgstr "Fehlerhafte Aktion"
+msgstr "Ungültige Aktion!"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:102
@@ -6041,13 +6089,13 @@ msgstr "Überprüfen Sie Ihre Finanzjournale"
 #. module: account
 #: help:account.tax,name:0
 msgid "This name will be displayed on reports"
-msgstr "Dieser Name wird in Reports angezeigt"
+msgstr "Dieser Name wird in Berichten angezeigt"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
-msgstr "Datum Druck"
+msgstr "Druckdatum"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -6075,7 +6123,7 @@ msgstr "Fremdwährung Saldo"
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr "Journal Periode Bezeichnung"
+msgstr "Bezeichnung der Journal-Periode"
 
 #. module: account
 #: field:account.invoice.tax,factor_base:0
@@ -6083,7 +6131,7 @@ msgid "Multipication factor for Base code"
 msgstr "Multiplikationsfaktor für Steuergrundbetrag"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "nicht implementiert"
@@ -6101,27 +6149,29 @@ msgid ""
 "Forma' state!"
 msgstr ""
 "Ausgewählte Rechnung kann nicht bestätigt werden bevor Sie nicht im Status "
-"'Entwurf' oder 'Pro Forma' ist !"
+"'Entwurf' oder 'Proforma' ist !"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Running Subscription"
-msgstr "aktuelle Abonnements"
+msgstr "Laufende Abonnements"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr "Hinweis Steuerzuordnung"
+msgstr "Hinweis zum Finanzbericht:"
 
 #. module: account
 #: view:analytic.entries.report:0
 #: model:ir.actions.act_window,name:account.action_analytic_entries_report
 #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
 msgid "Analytic Entries Analysis"
-msgstr "Statistik Analysebuchungen"
+msgstr "Statistik der Analysebuchungen"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Vergangenheit"
 
@@ -6133,7 +6183,7 @@ msgid ""
 "\"View\"! "
 msgstr ""
 "Konfigurationsfehler!\n"
-"Das übergeordnete Konto muss den Typ View haben. "
+"Das übergeordnete Konto muss den Typ Sicht haben. "
 
 #. module: account
 #: help:res.partner.bank,journal_id:0
@@ -6152,7 +6202,7 @@ msgstr "Buchung Analysekonto"
 #: view:res.company:0
 #: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr "Text Zahlungserinnerung"
+msgstr "Nachricht der Zahlungserinnerung"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_all_a
@@ -6190,13 +6240,13 @@ msgid ""
 "(i.e. paid) in the system."
 msgstr ""
 "Sobald der Zahlungsausgleich erfolgt ist, wechselt der Status der Rechnung "
-"zu 'Erledigt' ( d.h. Bezahlt)."
+"zu 'Erledigt' (d. h. Bezahlt)."
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,account_root_id:0
 msgid "Root Account"
-msgstr "Oberstes Konto"
+msgstr "Stammkonto"
 
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
@@ -6211,7 +6261,7 @@ msgstr "Analytische Buchung"
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr "Produkt Steuern"
+msgstr "Umsatzsteuern"
 
 #. module: account
 #: help:account.model,name:0
@@ -6232,7 +6282,7 @@ msgstr "Erstelle ein Konto auf Basis der Vorlage"
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr "Konfiguration Auswertungen"
+msgstr "Berichtseinstellungen"
 
 #. module: account
 #: field:account.tax,type:0
@@ -6244,7 +6294,7 @@ msgstr "Steuerart"
 #: 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 "Konto Vorlagen"
+msgstr "Konto-Vorlagen"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,complete_tax_set:0
@@ -6254,14 +6304,14 @@ msgid ""
 "choice assumes that the set of tax defined for the chosen template is "
 "complete"
 msgstr ""
-"Diese Auswähl erlaubt Ihnen die Einkaufs und Verkaufssteuern zu definieren "
+"Diese Auswähl erlaubt Ihnen die Einkaufs- und Verkaufssteuern zu definieren "
 "oder aus einer Liste auszuwählen. Letzteres setzt voraus, dass die Vorlage "
-"komplett ist."
+"vollständig ist."
 
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Statement"
-msgstr "Auswertung Steueranmeldung"
+msgstr "Steueranmeldung"
 
 #. module: account
 #: model:ir.model,name:account.model_res_company
@@ -6285,13 +6335,13 @@ msgid ""
 "You can not remove/desactivate an account which is set on a customer or "
 "supplier."
 msgstr ""
-"Sie können dieses Konto nicht deaktivieren oder löschen, da es bei einem "
-"Kunden oder Lieferanten verwendet wird."
+"Sie können dieses Konto nicht deaktivieren oder löschen, da es einem Kunden "
+"oder Lieferanten zugeordnet ist."
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
 msgid "Select a fiscal year to close"
-msgstr "Wähle Geschäftsjahr für Beendigung"
+msgstr "Wähle abzuschließendes Geschäftsjahr"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
@@ -6306,7 +6356,7 @@ msgstr "IntraCom"
 #. module: account
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Information addendum"
-msgstr "Informationsbeilage"
+msgstr "Informationsanhang"
 
 #. module: account
 #: field:account.chart,fiscalyear:0
@@ -6316,7 +6366,7 @@ msgstr "Geschäftsjahr"
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Partial Reconcile Entries"
-msgstr "Teilausgleich Rechnungen"
+msgstr "Rechnungen mit Teilzahlungen"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -6371,7 +6421,7 @@ msgstr "Debitor"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr "Company must be the same for its related account and period."
+msgstr "Das Unternehmen muss für Konto wie auch Periode das gleiche sein."
 
 #. module: account
 #: view:account.invoice:0
@@ -6396,12 +6446,12 @@ msgstr "Aktuell"
 #. module: account
 #: view:account.bank.statement:0
 msgid "CashBox"
-msgstr "Kassenbuch"
+msgstr "Barkasse"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_equity
 msgid "Equity"
-msgstr "Eigenkapital"
+msgstr "Buchwert"
 
 #. module: account
 #: selection:account.tax,type:0
@@ -6410,19 +6460,21 @@ msgstr "Prozentsatz"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Journal & Partner"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
 msgid "Power"
-msgstr "Power"
+msgstr "Stärke"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
-msgstr "Kann keine nicht verwendeten Journal Code erzeugen."
+msgstr "Kann keinen nicht verwendeten Journal Code erzeugen."
 
 #. module: account
 #: view:project.account.analytic.line:0
@@ -6441,8 +6493,8 @@ msgid ""
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
-"Anzeige, inwieweit diese Steuer im Steuergrundbetrag für die weitere "
-"Berechnung inbegriffen ist, oder nicht."
+"Anzeige, inwieweit diese Steuer im Grundbetrag für die weitere Berechnung "
+"enthalten sein muß, oder nicht."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
@@ -6458,12 +6510,13 @@ msgstr "Umgekehrter Saldo (Anal.)"
 #. module: account
 #: field:account.tax.template,applicable_type:0
 msgid "Applicable Type"
-msgstr "Anwendb. Typ"
+msgstr "Anwendbare Art"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
-msgstr "Rechnungsreferenz"
+msgstr "Rechnungsbezug"
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -6472,16 +6525,16 @@ msgid ""
 "higher ones. The order is important if you have a tax that has several tax "
 "children. In this case, the evaluation order is important."
 msgstr ""
-"Die Sequenz ist für die Sortierung einzelner Steuerpositionen. Die Sequenz "
-"ist wichtig, wenn es mehrere untergeordnete Steuern zu einer "
-"übergeordetneten Obersteuer  gibt."
+"Die Sequenz dient der Sortierung einzelner Steuerpositionen. Die Sequenz ist "
+"wichtig, wenn mehrere untergeordnete Steuern zu einer übergeordneten Steuer "
+"vorliegen."
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: view:account.journal:0
 msgid "Liquidity"
-msgstr "Finanzmittel"
+msgstr "Liquidität"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
@@ -6514,7 +6567,7 @@ msgid ""
 "the tool search to analyse information about analytic entries generated in "
 "the system."
 msgstr ""
-"Durch dieses Ansicht können Sie ihre unterschiedlichen analytischen Konten "
+"Durch diese Ansicht können Sie ihre unterschiedlichen analytischen Konten "
 "unter Berücksichtigung Ihres individullen Informationsbedarfs auswerten. "
 "Benutzen Sie dieses Werkzeug für die Auswertung, der von Ihnen gebuchten "
 "Beträge auf Analysekonten."
@@ -6522,7 +6575,7 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr "Die Journalbezeichnung sollte pro Unternehmen eindeutig sein."
+msgstr "Die Journalbezeichnung muss pro Unternehmen eindeutig sein."
 
 #. module: account
 #: field:account.account.template,nocreate:0
@@ -6543,7 +6596,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "Enter a Start date !"
-msgstr "Geben Sie ein Startdatum ein !"
+msgstr "Geben Sie ein Startdatum ein!"
 
 #. module: account
 #: report:account.invoice:0
@@ -6551,7 +6604,7 @@ msgstr "Geben Sie ein Startdatum ein !"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr "Lieferanten Gutschrift"
+msgstr "Lieferantengutschrift"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
@@ -6599,7 +6652,7 @@ msgstr "  Bewertung: Saldo"
 #. module: account
 #: field:account.invoice.line,uos_id:0
 msgid "Unit of Measure"
-msgstr "ME"
+msgstr "Mengeneinheit"
 
 #. module: account
 #: constraint:account.payment.term.line:0
@@ -6608,7 +6661,7 @@ msgid ""
 "2% "
 msgstr ""
 "Prozentwert für eine Position der Zahlungsbedingung muss zwischen 0 und 1 "
-"sein, z.B. 0.02 für 2% "
+"sein, z. B. 0.02 für 2% "
 
 #. module: account
 #: field:account.installer,has_default_company:0
@@ -6651,7 +6704,7 @@ msgstr "Steuergrundbetrag"
 #. module: account
 #: field:account.model,name:0
 msgid "Model Name"
-msgstr "Buchungsvorlage Bezeichnung"
+msgstr "Modell-Bezeichnung"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
@@ -6694,8 +6747,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "Sie dürfen kein Konto löschen, das Buchungen beinhaltet"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Buchungen: "
@@ -6711,7 +6764,7 @@ msgid "Currency of the related account journal."
 msgstr "Währung des verwendten Buchungsjournals"
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Konnte keine überbetriebliche Buchung erzeugen"
@@ -6727,14 +6780,14 @@ msgid ""
 "account. From this view, you can create and manage the account types you "
 "need for your company."
 msgstr ""
-"Über Kontoarten wird gesteuert mit welcher Logik in den verschiedenen "
+"Über Kontoarten wird gesteuert, mit welcher Logik in den verschiedenen "
 "Journalen gebucht wird. Die Methode für die Abgrenzung beim Jahreswechsel "
 "steuert dabei den Prozess der Buchung beim Jahresabschluss. Die GuV & Bilanz "
 "Positionen steuern den Ausweis für die Auswertungen Bilanz sowie Gewinn und "
 "Verlust. Zum Beispiel könnte eine Kontoart entweder mit einem Konto aus dem "
 "Anlagevermögen, einem Aufwands- oder einem Kreditorenkonto verbunden sein. "
 "Über diese Ansicht können Sie die in Ihrem Unternehmen benötigten Kontoarten "
-"exakt definieren."
+"festlegen."
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -6761,16 +6814,16 @@ msgstr "Status ist Entwurf"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Gesamt Soll"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
-msgstr "Eintrag \"%s\" ist ungültig !"
+msgstr "Eintrag \"%s\" ist ungültig!"
 
 #. module: account
 #: report:account.invoice:0
@@ -6784,7 +6837,7 @@ msgid ""
 "taxes and journals according to the selected template"
 msgstr ""
 "Automatische Konfiguration Ihres Kontenplans, Bankkontos, Steuern und "
-"Journaldefinition resultierend aus der gewählten Vorlage,"
+"Journaldefinition gemäß der gewählten Vorlage,"
 
 #. module: account
 #: help:res.partner,property_account_receivable:0
@@ -6823,12 +6876,12 @@ msgstr ""
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Create"
-msgstr "Erstellen"
+msgstr "Anlegen"
 
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
 msgid "Create entry"
-msgstr "Erzeuge Buchung"
+msgstr "Buchung anlegen"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -6841,49 +6894,50 @@ msgstr "Gewinn & Verlust ( Aufwandskonto )"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
-msgstr "Fehler !"
+msgstr "Fehler!"
 
 #. module: account
 #: field:account.financial.report,style_overwrite:0
 msgid "Financial Report Style"
-msgstr "Finanz Report Stiel"
+msgstr "Stil des Finanzberichts"
 
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Preserve balance sign"
-msgstr "Erhalte Saldo Vorzeichen"
+msgstr "Erhalte Saldo-Vorzeichen"
 
 #. module: account
 #: view:account.vat.declaration:0
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
 #: model:ir.ui.menu,name:account.menu_account_vat_declaration
 msgid "Taxes Report"
-msgstr "Umsatzsteuer"
+msgstr "Umsatzsteuer-Anmeldung"
 
 #. module: account
 #: selection:account.journal.period,state:0
@@ -6891,16 +6945,16 @@ msgid "Printed"
 msgstr "Gedruckt"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
-msgstr "Fehler :"
+msgstr "Fehler:"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Project line"
-msgstr "Budget Projekt"
+msgstr "Projektbudget"
 
 #. module: account
 #: field:account.invoice.tax,manual:0
@@ -6917,11 +6971,11 @@ msgid ""
 "the amounts correspond."
 msgstr ""
 "Damit Ihre Rechnung als bezahlt gekennzeichnet werden kann, müssen Sie einen "
-"Ausgleich durch eine Gegenbuchung herbeiführen, welches üblicherweise eine "
-"Zahlung ist. Durch die Funktion des automatisierten Ausgleichs offener "
-"Posten, nutzen Sie die OpenERP Automatik für die Suche und den Ausgleich von "
-"zusammengehörigen Rechnungen und Zahlungen über eine Prüfung "
-"zuammenpassender Beträge."
+"Ausgleich durch eine Gegenbuchung herbeiführen. Üblicherweise ist dies eine "
+"Zahlung. Durch die Funktion des automatisierten Ausgleichs offener Posten, "
+"nutzen Sie die Automatik von OpenERP den Ausgleich von zusammengehörigen "
+"Rechnungen und Zahlungen über eine Suche zuammenpassender Beträge "
+"durchzuführen."
 
 #. module: account
 #: view:account.move:0
@@ -6937,9 +6991,9 @@ msgid ""
 "row to display the amount of debit/credit/balance that precedes the filter "
 "you've set."
 msgstr ""
-"Wenn ein Tages oder Periodenfilter gewählt wird, können sie mit diesem "
-"Kennzeichen steuern, ob eine Zeile mit Soll/Haben/Saldo ausgegeben wird, die "
-"die Buchungen davor summiert."
+"Wenn ein Filter nach Datum oder Periode gewählt wird, können sie mit diesem "
+"Kennzeichen steuern, ob eine Zeile mit Soll/Haben/Saldo der Ausgabe "
+"vorangestellt wird."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6948,7 +7002,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Journal Entries"
-msgstr "Buchungsbelege"
+msgstr "Buchungen"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
@@ -6956,7 +7010,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Kontoauszug mit einem Partner pro Seite"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6983,9 +7037,9 @@ msgid ""
 "This report is an analysis done by a partner. It is a PDF report containing "
 "one line per partner representing the cumulative credit balance"
 msgstr ""
-"Diese Auswertung analysiert die Salden auf Partnerskonten. Der Bericht "
-"beinhaltet eine PDF Auswertung mit je einer zusammenfassenden "
-"Auswertungszeile je Partner"
+"Diese Auswertung analysiert die Salden auf Partnerskonten. Der PDF-Bericht "
+"beinhaltet eine Auswertung mit je einer zusammenfassenden Auswertungszeile "
+"je Partner"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:61
@@ -7023,7 +7077,7 @@ msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
 "Fehler: Die Standard Mengeneinheit (ME) sowie die Mengeneinheit (ME) bei der "
-"Beschaffung muss in derselben Kategorie sein."
+"Beschaffung müssen derselben Kategorie angehören."
 
 #. module: account
 #: view:account.journal.select:0
@@ -7041,12 +7095,12 @@ msgstr "Anfangssaldo"
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr "Konto OP Ausgleich"
+msgstr "Konto OP-Ausgleich"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Position"
-msgstr "Steuern Zuordnung"
+msgstr "Steuerzuordnung"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -7062,7 +7116,7 @@ msgstr "Umsätze nach Konten und Perioden"
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
 msgid "The payment order is sent to the bank."
-msgstr "Der Zahlungsauftrag wurde an Bank versendet."
+msgstr "Die Zahlungsanweisung wurde der Bank zugesendet."
 
 #. module: account
 #: view:account.balance.report:0
@@ -7123,7 +7177,7 @@ msgid "Total:"
 msgstr "Summe:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7138,11 +7192,11 @@ msgstr ""
 "Sie können Jahr, Monat und Datum für die Anwendung dieser Buchungsvorlage "
 "als Buchungstext  durch folgende Platzhalter definieren:\n"
 "\n"
-"%(year)s: Spezifikation für das Jahr \n"
-"%(month)s: Spezifikation für den Monat \n"
-"%(date)s: Spezifikation für das Datum\n"
+"%(year)s: Festlegung des Jahres \n"
+"%(month)s: Festlegung des Monats \n"
+"%(date)s: Festlegung des heutigen Datums\n"
 "\n"
-"z.B.  Meine Buchungsvorlage am %(date)s"
+"z. B.  Meine Buchungsvorlage am %(date)s"
 
 #. module: account
 #: help:report.invoice.created,origin:0
@@ -7153,7 +7207,7 @@ msgstr "Belegreferenz für diese Rechnung"
 #: field:account.tax.code,child_ids:0
 #: field:account.tax.code.template,child_ids:0
 msgid "Child Codes"
-msgstr "untergeordnete Codes"
+msgstr "untergeordnete Schlüssel"
 
 #. module: account
 #: view:account.tax.template:0
@@ -7161,7 +7215,7 @@ msgid "Taxes used in Sales"
 msgstr "Steuern für Verkäufe"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7206,15 +7260,16 @@ msgid ""
 "automatically based on these data."
 msgstr ""
 "Konfigurieren Sie ie Bankkonten des Unternehmens und wählen Sie diejenigen, "
-"die in den Report Fußzeilen erscheinen sollen.\r\n"
+"die in Fußzeilen des Berichts erscheinen sollen.\r\n"
 "Sie können die Bankkonten in der Liste sortieren. Wenn Sie die Buchhaltung "
-"von OpenERP einsetzen werden automatisch Journale und Konten generiert."
+"von OpenERP einsetzen werden aus diesen Angaben automatisch Journale und "
+"Konten generiert."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
 msgstr ""
-"Ein Bankauszug mit händischen Buchungen erhält zunächst den Status Entwurf."
+"Ein Bankauszug mit händischen Buchungen erhält zunächst den Status 'Entwurf'."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -7230,25 +7285,25 @@ msgstr ""
 "Ihrer Debitoren aufgeteilt in zeitliche Intervalle. Wenn Sie diesen Bericht "
 "öffnen, fragt OpenERP nach dem Unternehmen, der Periode und dem "
 "Zeitintervall für die Auswertung (in Tagen). OpenERP berechnet dann eine "
-"Tabelle mit Kundensalden nach Perioden. Wenn Sie eine Intervalle von 30 "
-"Tagen eingeben, erzeugt OpenERP eine Auswertung der Salden für den letzten "
-"Monat, vorletzten Monat usw. "
+"Tabelle mit Kundensalden nach Perioden. Wenn Sie ein Intervalle von 30 Tagen "
+"eingeben, erzeugt OpenERP eine Auswertung der Salden für den letzten Monat, "
+"vorletzten Monat usw. "
 
 #. module: account
 #: field:account.invoice,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr "Herkunftsverweis"
+msgstr "Herkunftsdokument"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
-msgstr "Sie können keine verbuchten Buchungen löschen \"%s\"!"
+msgstr "Sie können keine quittierten Buchungen löschen \"%s\"!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7262,7 +7317,7 @@ msgstr "Bankauszug Abstimmung"
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
 msgid "Accounting Report"
-msgstr "Report Finanzen"
+msgstr "Finanzbericht"
 
 #. module: account
 #: report:account.invoice:0
@@ -7273,8 +7328,8 @@ msgstr "Steuern:"
 #: help:account.tax,amount:0
 msgid "For taxes of type percentage, enter % ratio between 0-1."
 msgstr ""
-"Für Steuern mit dem Typ Prozent, geben Sie einen Wert zwischen 0 - 1 ein, "
-"z.B. 0.19 für 19%"
+"Für Steuern mit dem Typ Prozent, geben Sie einen Wert zwischen 0 - 1 ein, z. "
+"B.  0.19 für 19%"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -7285,7 +7340,7 @@ msgid ""
 "you can create such entries to automate the postings in the system."
 msgstr ""
 "Eine wiederkehrende Buchung ist ein Geschäftsvorfall, der in regelmässigen "
-"wiederkehrenden Zeitabständen zu buchen ist, z.B. die Buchungen aus "
+"wiederkehrenden Zeitabständen zu buchen ist, z. B. die Buchungen aus "
 "bestimmten Verträgen mit Kunden oder Lieferanten, Mietaufwendungen oder "
 "Erträge aus Abonnements. Durch die Definition wiederkehrender Buchungen "
 "können Sie dafür sorgen, dass diese Geschäftsvorfälle automatisch gebucht "
@@ -7294,7 +7349,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr "Hierarchische Finanz Reports"
+msgstr "Hierarchie der Finanzberichte"
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
@@ -7325,8 +7380,8 @@ msgid ""
 "This date will be used as the invoice date for Refund Invoice and Period "
 "will be chosen accordingly!"
 msgstr ""
-"Dieses Datum wird genutzt als Rechnungsdatum für eine Gutschrift. Die "
-"Buchungsperiode wird dabei gleichlautend eingetragen."
+"Dieses Datum wird als Belegdatum für eine Gutschrift. Die Buchungsperiode "
+"wird dabei passend gewählt."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
@@ -7348,7 +7403,7 @@ msgstr "Positionen"
 #. module: account
 #: view:account.tax.template:0
 msgid "Account Tax Template"
-msgstr "Umsatzsteuer Vorlage"
+msgstr "Umsatzsteuer-Vorlage"
 
 #. module: account
 #: view:account.journal.select:0
@@ -7361,8 +7416,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Sind Sie sicher, daß Sie diese Rechnung öffnen wollen?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7374,10 +7429,10 @@ msgstr ""
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
 msgid "Opening Entries Expense Account"
-msgstr "Eröffnungsbilanz Buchungen Aufwandskonto"
+msgstr "Eröffnungsbuchungen des Aufwandskontos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Buchungen"
@@ -7385,7 +7440,7 @@ msgstr "Buchungen"
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
-msgstr "Basiskonto Vorlage"
+msgstr "Stammkonto Vorlage"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
@@ -7417,7 +7472,7 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr "Verbuchte Buchungen"
+msgstr "Quittierte Buchungen"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
@@ -7440,7 +7495,7 @@ msgstr "Gruppiere nach Rechnungsjahr"
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr "Gesamtschulden eines Kunden"
+msgstr "Gesamtschulden dieses Kunden"
 
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
@@ -7461,7 +7516,7 @@ msgstr "OK"
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
 msgid "Root Tax Code"
-msgstr "Basis Steuerkonto"
+msgstr "Basis Steuerschlüssel"
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -7481,17 +7536,17 @@ msgstr "Beendet am"
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr "Bankauszug Buchungen"
+msgstr "Positionen auf Bankauszug"
 
 #. module: account
 #: field:account.automatic.reconcile,date2:0
 msgid "Ending Date"
-msgstr "Ende Datum"
+msgstr "Enddatum"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr "Standard Steuer Einkauf"
+msgstr "Standard Erwerbssteuer"
 
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
@@ -7514,26 +7569,26 @@ msgstr ""
 "Steuerberechnung gebraucht wird."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
-"Sie sollten Perioden wählen, die für dieses Unternehmen vorhanden sind"
+"Sie sollten Perioden wählen, die dem gleichen Unternehmen zugeordnet sind"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
 msgid "Review your Payment Terms"
-msgstr "Überprüfen Sie Ihre Zahlungskonditionen"
+msgstr "Überprüfen Sie Ihre Zahlungsbedingungen"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
-msgstr "Buchungstext"
+msgstr "Text neuer Buchungen"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries"
-msgstr "Erstelle Buchungen"
+msgstr "Buchungen anlegen"
 
 #. module: account
 #: view:res.partner:0
@@ -7546,8 +7601,8 @@ msgid "Reporting"
 msgstr "Berichtswesen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7571,13 +7626,13 @@ msgstr "Kassenabschluss"
 #: view:account.journal:0
 #: field:res.partner.bank,journal_id:0
 msgid "Account Journal"
-msgstr "Journal Konto"
+msgstr "Konto-Journal"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
 #: model:process.node,name:account.process_node_supplierpaidinvoice0
 msgid "Paid invoice"
-msgstr "Rechnung Bezahlt"
+msgstr "Beglichene Rechnung"
 
 #. module: account
 #: help:account.partner.reconcile.process,next_partner_id:0
@@ -7586,9 +7641,9 @@ msgid ""
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
 msgstr ""
-"Dieses Feld zeigt den nächsten Partner an, der automatisch durch das System "
-"im Rahmen des Ausgleichs offener Posten auf Basis des letztmaligen "
-"Ausgleichs von offenen Posten vorgeschlagen wird."
+"Dieses Feld zeigt automatisch den nächsten Partner an, der im Rahmen des "
+"Ausgleichs offener Posten, auf Basis des letztmaligen Ausgleichs von offenen "
+"Posten, vorgeschlagen wird."
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
@@ -7604,13 +7659,13 @@ msgstr "Domain"
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr "Benutze Buchungsvorlage"
+msgstr "Benutze Modellvorlage"
 
 #. module: account
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)!"
-msgstr "Kann die Anfangsbilanz nicht berechnen (negativer Wert)"
+msgstr "Kann die Anfangsbilanz nicht berechnen (negativer Wert)!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7641,21 +7696,23 @@ msgstr "Kunden und Lieferanten Gutschriften"
 #. module: account
 #: field:account.financial.report,sign:0
 msgid "Sign on Reports"
-msgstr "Sign On Reports"
+msgstr "Vorzeichen in Berichten"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
-msgstr "Die Perioden für die Eröffnungsbilanz konnte nicht gefunden werden."
+msgstr ""
+"Die Perioden zur Erstellung der Eröffnungsbilanz konntennicht gefunden "
+"werden."
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
 msgid "Root/View"
-msgstr "Wurzel/Sicht"
+msgstr "Stamm/Sicht"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "EB"
@@ -7664,7 +7721,7 @@ msgstr "EB"
 #: report:account.invoice:0
 #: view:account.invoice:0
 msgid "PRO-FORMA"
-msgstr "PRO-FORMA"
+msgstr "PROFORMA"
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -7690,13 +7747,14 @@ msgid "Optional Information"
 msgstr "Informationen (Optional)"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Das Journal benötigt einen Standardwert für Debitor und Kreditor"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7723,25 +7781,25 @@ msgstr "Multi-Währung"
 #. module: account
 #: field:account.model.line,date_maturity:0
 msgid "Maturity Date"
-msgstr "Datum Fällig"
+msgstr "Fälligkeitsdatum"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Falsches Konto!"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
-msgstr "Journal Verkauf"
+msgstr "Verkaufs-Journal"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr "Öffne Journalbuchungen"
+msgstr "Öffne Journalbuchungen!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -7749,7 +7807,7 @@ msgid "Invoice Tax"
 msgstr "Umsatzsteuer"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Keine Stückzahl!"
@@ -7758,7 +7816,7 @@ msgstr "Keine Stückzahl!"
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr "Konten Report Hierarchie"
+msgstr "Bericht der Konten-Hierarchie"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -7769,17 +7827,22 @@ msgid ""
 "few new accounts (You don't need to define the whole structure that is "
 "common to both several times)."
 msgstr ""
+"Dieses wahlfreie Feld ermöglicht Ihnen eine Konten-Vorlage von einer "
+"Kontenplan-Vorlage abzuleiten, wobei sich die Konten vom Stamm-Kontenplan "
+"unterscheiden können. So können Sie eine Kontenplan-Vorlage festlegen, die "
+"eine Andere, ggf. auch nur geringfügig, erweitert. (Sie brauchen also nicht "
+"die beiden gemeinsamen Strukturen mehrfach zu definieren)."
 
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr "Nicht verbuchte Buchungen"
+msgstr "Nicht Quittierte Buchungen"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Sales Properties"
-msgstr "Verkauf Eigenschaften"
+msgstr "Verkaufseinstellungen"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
@@ -7789,7 +7852,7 @@ msgstr "Manueller Kontenausgleich"
 #. module: account
 #: report:account.overdue:0
 msgid "Total amount due:"
-msgstr "Gesamtbetrag fällig:"
+msgstr "Fälliger Gesamtbetrag:"
 
 #. module: account
 #: field:account.analytic.chart,to_date:0
@@ -7799,7 +7862,7 @@ msgstr "An"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Währungsanpassung"
@@ -7853,18 +7916,20 @@ msgstr "Mai"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Kreditorenkonten"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
-"Allgemeine Steuern wurden definiert, aber befinden sich nicht auf "
-"Rechnungszeilenebene!"
+"Allgemeine Steuern wurden definiert, aber in den Rechnungspositionensind "
+"keine aufgeführt!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
@@ -7887,17 +7952,17 @@ msgstr "Steuercode Nummer"
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr "Erzeuge Buchungen in Journal"
+msgstr "Buchungen eines Journals quittieren"
 
 #. module: account
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr "Steuern Verkauf"
+msgstr "Verkaufssteuern"
 
 #. module: account
 #: field:account.financial.report,name:0
 msgid "Report Name"
-msgstr "Report Bezeichnung"
+msgstr "Berichtsbezeichnung"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_cash
@@ -7905,38 +7970,38 @@ msgstr "Report Bezeichnung"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
-msgstr "Kasse"
+msgstr "Barkasse"
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
 #: field:account.fiscal.position.account.template,account_dest_id:0
 msgid "Account Destination"
-msgstr "Konto Zuordnung"
+msgstr "Kontozuordnung"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "UserError"
-msgstr "BenutzerFehler"
+msgstr "UserError"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Payment of invoices"
-msgstr "Zahlung von Eingangsrechnungen"
+msgstr "Ausgleich von Eingangsrechnungen"
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -7966,7 +8031,7 @@ msgstr "Optionale Menge in Buchungen"
 #. module: account
 #: view:account.financial.report:0
 msgid "Parent Report"
-msgstr "Übergeordneter Report"
+msgstr "Übergeordneter Bericht"
 
 #. module: account
 #: view:account.state.open:0
@@ -7981,7 +8046,7 @@ msgstr "Verkauf nach Kontotyp"
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr "Verlinke mit automatisch generierten Buchungen"
+msgstr "Verweis auf automatisch generierte Buchungen"
 
 #. module: account
 #: selection:account.installer,period:0
@@ -8037,12 +8102,12 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Reports"
-msgstr "Offizielle Auswertungen"
+msgstr "Offizielle Finanzberichte"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
 msgid "Period Sum"
-msgstr "Summe Periode"
+msgstr "Periodensumme"
 
 #. module: account
 #: help:account.tax,sequence:0
@@ -8051,15 +8116,15 @@ 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 ""
-"Des Feld \"Reihenfolge\" wird benutzt, um die Steuerzeilen aufsteigend zu "
-"sortieren. Die Reihenfolge ist dann von Bedeutung, wenn es eine Steuerart "
-"mit mehreren Steuersätzen gibt. In diesem Fall ist die Reihenfolge für die "
-"Auswahl entscheidend."
+"Des Feld \"Reihenfolge\" (Sequenz) wird benutzt, um die Steuerzeilen "
+"aufsteigend zu sortieren. Die Reihenfolge ist dann von Bedeutung, wenn es "
+"eine Steuerart mit mehreren Steuersätzen gibt. In diesem Fall ist die "
+"Reihenfolge für die Auswahl entscheidend."
 
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr "Barkasse Buchungen"
+msgstr "Barkassenbuchung"
 
 #. module: account
 #: view:account.partner.ledger:0
@@ -8074,7 +8139,7 @@ msgstr "Partner Kontoauszug"
 #. module: account
 #: selection:account.tax.template,type:0
 msgid "Fixed"
-msgstr "Fest"
+msgstr "Fix"
 
 #. module: account
 #: code:addons/account/account.py:629
@@ -8082,32 +8147,33 @@ msgstr "Fest"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
-msgstr "Warnung"
+msgstr "Warnung!"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr "Status Buchungszeile"
+msgstr "Status der Buchung"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
 msgid "Account move line reconcile"
-msgstr "Storno Buchung"
+msgstr "Ausgleich der Buchung"
 
 #. module: account
 #: view:account.subscription.generate:0
 #: model:ir.model,name:account.model_account_subscription_generate
 msgid "Subscription Compute"
-msgstr "Wiederkehrende Buchungen"
+msgstr "Wiederkehrende Buchungen berechnen"
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
@@ -8140,7 +8206,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Wähle eine Währung für diese Rechnung"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -8150,18 +8216,18 @@ msgstr "Das Bankkonto in der ausgewählten Vorlage hat keinen Code"
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #, python-format
 msgid "Can not %s draft/proforma/cancel invoice."
-msgstr "Kann Entwurf/ProForma/Storno für Rechnung %s nicht durchführen"
+msgstr "Kann Entwurf/Proforma/Storno für Rechnung %s nicht durchführen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
-msgstr "Keine Rechnungszeilen !"
+msgstr "Keine Rechnungspositionen!"
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Report Type"
-msgstr "Report Type"
+msgstr "Berichtsart"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8190,8 +8256,8 @@ msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
 msgstr ""
-"Wähle das abzuschliessende Geschäftsjahr für die Buchung in das definierte "
-"Journal für den Jahresabschluss"
+"Wähle das Geschäftsjahr aus dessen Jahres-Abschlussbericht und dessen "
+"Abschluss-Salden entfernt werden sollen"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
@@ -8238,10 +8304,10 @@ msgid "Deferral Method"
 msgstr "Abgrenzung Jahreswechsel"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
-msgstr "Rechnung '%s' wurde bezahlt."
+msgstr "Rechnung '%s' wurde beglichen."
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
@@ -8251,7 +8317,7 @@ msgstr "Automatische Buchung"
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr "Fehler! Sie können keine rekursiven Umsatzsteuern definieren"
+msgstr "Fehler! Sie können keine rekursiven Steuern definieren"
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
@@ -8303,7 +8369,7 @@ msgid "Associated Partner"
 msgstr "Zugehöriger Partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Sie müssen zuerst einen Partner wählen!"
@@ -8360,13 +8426,13 @@ msgstr ""
 "zugeordneten Steuerschlüsseln für die Umsatzsteuererklärung in Ihrem Land."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
 msgstr ""
 "Kann keinen Kontenplan für dieses Unternehmen finden. Sie müssen einen "
-"anlagen!"
+"anlegen!"
 
 #. module: account
 #: view:account.invoice:0
@@ -8384,16 +8450,16 @@ msgid "Choose Fiscal Year"
 msgstr "Wähle Geschäftsjahr"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr "Journal Gutschriften Eingangsrechnungen"
+msgstr "Journal zu Gutschriften aus Eingangsrechnungen"
 
 #. module: account
 #: help:account.tax.template,amount:0
 msgid "For Tax Type percent enter % ratio between 0-1."
 msgstr ""
-"Für den Typ Prozent erfassen Sie einen Wert zwischen 0 und 1, z.B. 0.19 für "
+"Für den Typ Prozent erfassen Sie einen Wert zwischen 0 und 1, z. B. 0.19 für "
 "19%"
 
 #. module: account
@@ -8404,7 +8470,7 @@ msgstr "aktuelle Konten"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by Invoice Date"
-msgstr "Gruppiert je Rechnungsdatum"
+msgstr "Gruppiert nach Rechnungsdatum"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -8446,8 +8512,8 @@ msgid ""
 "Total amount (in Company currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
-"Gesamtbetrag in Unternehmenswährung für  Buchungen in der 2.Währung des "
-"Kontos"
+"Gesamtbetrag in Unternehmenswährung für Buchungen in der Alternativwährung "
+"des Kontos"
 
 #. module: account
 #: report:account.invoice:0
@@ -8478,13 +8544,13 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Berechnungsgrundlage (inkl. Steuer)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
 "unreconcile related payment entries first!"
 msgstr ""
-"Sie können eine teilbezahlte Rechnungen nicht stornieren! Sie müssen der OP-"
+"Sie können eine angezahlte Rechnungen nicht stornieren! Sie müssen der OP-"
 "Ausgleich der Zahlung zuerst rückgängig machen."
 
 #. module: account
@@ -8501,17 +8567,17 @@ msgstr "korrigierter Saldo"
 #: 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 "Steuerzuordnung Vorlage"
+msgstr "Vorlage zum Finanzbericht"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Int.Type"
-msgstr "Int. Typ"
+msgstr "Int. Art"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
 msgid "Tax/Base Amount"
-msgstr "Betrag für Steuerberechnung"
+msgstr "Grundbetrag für Steuerberechnung"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -8558,7 +8624,7 @@ msgstr "Tel.:"
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr "Betriebl. Währung"
+msgstr "Unternehmenswährung"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8622,7 +8688,7 @@ msgid "current month"
 msgstr "laufender Monat"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8671,7 +8737,7 @@ msgstr "  Betrag: NV"
 #: model:process.node,name:account.process_node_supplierreconciliation0
 #, python-format
 msgid "Reconciliation"
-msgstr "Ausgleichen Offene Posten"
+msgstr "Ausgleichen offener Posten"
 
 #. module: account
 #: view:account.chart.template:0
@@ -8708,10 +8774,12 @@ msgstr "Journal Gutschriften"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filter nach"
 
@@ -8751,7 +8819,7 @@ msgid "The partner account used for this invoice."
 msgstr "Partner Finanzkonto dieser Rechnung."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Steuer %.2f%%"
@@ -8774,16 +8842,15 @@ msgid "Payment Term Line"
 msgstr "Zahlungsbedingungen"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
-msgstr "Journal Einkauf"
+msgstr "Einkaufs-Journal"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice: Creates the refund invoice, ready for editing."
-msgstr ""
-"Gutschrift Rechnung: Generiert eine Gutschrift mit Bearbeitungsmöglichkeit"
+msgstr "Rechnungsgutschrift: Legt eine Gutschrift zur Weiterbearbeitung an."
 
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
@@ -8793,7 +8860,7 @@ msgstr "Zwischensumme"
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr "Drucke Auswertung Umsatzsteuer"
+msgstr "Drucke Umsatzsteueranmeldung"
 
 #. module: account
 #: view:account.model.line:0
@@ -8818,12 +8885,12 @@ msgstr "Lieferanten"
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
-msgstr "zugelassene Kontotypen (leer = alle)"
+msgstr "zugelassene Kontoarten (leer = alle)"
 
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Accounting Properties"
-msgstr "Kreditoren Eigenschaften"
+msgstr "Kreditoren-Eigenschaften"
 
 #. module: account
 #: help:account.move.line,amount_residual:0
@@ -8848,7 +8915,7 @@ msgstr "Von"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
 msgid "Fiscalyear Close"
-msgstr "Geschäftsjahr beenden"
+msgstr "Geschäftsjahr abschließen"
 
 #. module: account
 #: sql_constraint:account.account:0
@@ -8862,10 +8929,10 @@ msgid "Unpaid Invoices"
 msgstr "Offene Rechnungen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
-msgstr "Die Zahlungskonditionen des Lieferanten haben keine Zeilen!"
+msgstr "Die Zahlungsbedingungen des Lieferanten enthalten keine Positionen!"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -8930,7 +8997,7 @@ msgstr "Journal Bezeichnung"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr "Op-Ausgleich des nächsten Partners"
+msgstr "OP-Ausgleich des nächsten Partners"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -8948,7 +9015,7 @@ msgid ""
 "Unique number of the invoice, computed automatically when the invoice is "
 "created."
 msgstr ""
-"Einheitliche Rechnungsnummer, automatisch ermittelt bei der Erzeugung der "
+"Eindeutige Rechnungsnummer, automatisch ermittelt bei der Erzeugung der "
 "Rechnung."
 
 #. module: account
@@ -8972,10 +9039,10 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Frei lassen für alle offenen Geschäftsjahre"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr "Die Buchungszeile (%s)"
+msgstr "Die Buchung (%s) wurde zur Sammlung/Zentralisierung genehmigt!"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -8983,11 +9050,11 @@ msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
 msgstr ""
-"Der Betrag in Fremdwährung, wenn es sich um eine Mulit-Währungsbuchung "
+"Der Betrag in Fremdwährung, wenn es sich um eine Fremd-Währungsbuchung "
 "handelt"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -9037,7 +9104,7 @@ msgstr "Erzeugt Sequenz für Anzeige der Bankdetails bei Buchungen"
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Accountant validates the accounting entries coming from the invoice."
-msgstr "Ein Buchhalter verbucht die Buchungssätze einer Rechnung"
+msgstr "Ein Buchhalter quittiert die Buchungssätze einer Rechnung"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
@@ -9067,15 +9134,15 @@ msgstr ""
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr "Auszugleichende Buchungsposten"
+msgstr "Auszugleichende Buchungen"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
 msgid "Contact Address"
-msgstr "Kontakt Adresse"
+msgstr "Kontaktadresse"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Falsches Modell!"
@@ -9088,7 +9155,7 @@ msgstr "Erzwinge Periode"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr "Drucke Partner Saldenliste"
+msgstr "Drucke Partner-Saldenliste"
 
 #. module: account
 #: help:account.financial.report,sign:0
@@ -9099,7 +9166,7 @@ msgid ""
 "accounts that are typically more credited than debited and that you would "
 "like to print as positive amounts in your reports; e.g.: Income account."
 msgstr ""
-"Für Salden die mit umgekehrten Vorzeichen gedruckt werden sollen. zB "
+"Für Salden die mit umgekehrten Vorzeichen gedruckt werden sollen. z. B. "
 "Aufwandskonten negativ, Ertragskonten positiv."
 
 #. module: account
@@ -9112,12 +9179,14 @@ msgstr "Verträge"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "unbekannt"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Start Buchungsjournal"
@@ -9140,10 +9209,10 @@ msgstr ""
 "wird durch die Auswertung Gewinn & Verlust generiert."
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
-msgstr "BItte definieren Sie Sequenzen für das Journal dieser Rechnung."
+msgstr "Bitte legen Sie Sequenzen für das Journal dieser Rechnung fest."
 
 #. module: account
 #: view:account.move:0
@@ -9170,8 +9239,8 @@ msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
 msgstr ""
-"Aktivieren, wenn die Steuerberechnung auf die untergeordneten Steuern beruht "
-"und nicht auf dem Gesamtbetrag"
+"Aktivieren, wenn die Steuerberechnung auf untergeordneten Steuern beruht und "
+"nicht auf dem Gesamtbetrag"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -9231,7 +9300,7 @@ msgid "Period from"
 msgstr "Gültig ab"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Gutschriften Ausgangsrechnungen Journal"
@@ -9278,10 +9347,10 @@ msgid "Purchase Tax(%)"
 msgstr "Steuer Einkauf (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
-msgstr "Bitte erstellen Sie einige Rechnungspositionen"
+msgstr "Bitte erstellen Sie Rechnungspositionen"
 
 #. module: account
 #: report:account.overdue:0
@@ -9294,7 +9363,7 @@ msgid "Display Detail"
 msgstr "Zeige Detail"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "GSV"
@@ -9333,8 +9402,6 @@ msgstr "Ende der Periode"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Finanz Reports"
@@ -9349,6 +9416,7 @@ msgstr "Finanz Reports"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9369,6 +9437,7 @@ msgstr "Start Periode"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Analysezeitraum"
 
@@ -9388,7 +9457,7 @@ msgstr "Ansicht Journal"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Gesamt Haben"
@@ -9402,7 +9471,7 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "Best regards."
-msgstr "Beste Grüsse."
+msgstr "Mit freundlichen Grüssen."
 
 #. module: account
 #: view:account.invoice:0
@@ -9460,6 +9529,7 @@ msgstr "Bankauszüge"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9542,7 +9612,7 @@ msgstr ""
 "Debitorenkonto."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Bitte Konten zum Ausgleich auswählen"
@@ -9572,10 +9642,9 @@ msgstr ""
 "beendet werden soll."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
-msgstr "Filter nch"
+msgstr "Filter nach"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
@@ -9594,10 +9663,10 @@ msgid "Move"
 msgstr "Buchung"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
-msgstr "Die Steuer kann nicht verändert werden. Löschen und Neuerstellen."
+msgstr "Die Steuer kann nicht verändert werden. Löschen und Neuerstellen!"
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -9654,7 +9723,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidierte Konten"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9719,6 +9788,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9740,7 +9810,7 @@ msgstr "Ende der Periode"
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr "Datum fällig"
+msgstr "Fälligkeitsdatum"
 
 #. module: account
 #: view:account.move.journal:0
@@ -9761,7 +9831,7 @@ msgstr ""
 "\"Einkauf\" für Lieferantenrechnungsjournale\r\n"
 "\"Kassa\" oder \"Bank\" für Kunden und Lieferantenzahlungen\r\n"
 "\"Allgemein\" für alles andere.\r\n"
-"\"Eröffnung/Schluss Buchungen\" für Buchungen des Jahresabschlusses"
+"\"Eröffnungs-/Schluss-Buchungen\" für Buchungen des Jahresabschlusses"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
@@ -9771,7 +9841,7 @@ msgstr "Konto Automatische Buchung"
 #. module: account
 #: report:account.overdue:0
 msgid "Maturity date"
-msgstr "Datum Fällig"
+msgstr "Fälligkeitsdatum"
 
 #. module: account
 #: view:account.subscription:0
@@ -9781,6 +9851,7 @@ msgstr "Eingabe automat. Buchung"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9788,6 +9859,7 @@ msgstr "Eingabe automat. Buchung"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9806,7 +9878,7 @@ msgstr "Eingabe automat. Buchung"
 #: field:accounting.report,date_from:0
 #: field:accounting.report,date_from_cmp:0
 msgid "Start Date"
-msgstr "Start Datum"
+msgstr "Anfangsdatum"
 
 #. module: account
 #: help:account.invoice,reconciled:0
@@ -9822,17 +9894,17 @@ msgstr ""
 #: view:account.invoice.report:0
 #: model:process.node,name:account.process_node_supplierdraftinvoices0
 msgid "Draft Invoices"
-msgstr "Entwurf Rechnungen"
+msgstr "Rechnungsentwürfe"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 #: view:account.entries.report:0
 #: view:account.move.line:0
 msgid "Unreconciled"
-msgstr "Offene Posten"
+msgstr "Nicht beglichen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Falsche Summe!"
@@ -9840,7 +9912,7 @@ msgstr "Falsche Summe!"
 #. module: account
 #: field:account.journal,sequence_id:0
 msgid "Entry Sequence"
-msgstr "Eingabe Sequenz"
+msgstr "Eingabereihenfolge"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_tree
@@ -9900,7 +9972,7 @@ msgid "Comparison"
 msgstr "Vergleich"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Unbekannter Fehler"
@@ -9917,7 +9989,7 @@ msgstr ""
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr "Eröffnungs- / Abschlussperiode"
+msgstr "Eröffnungs-/Abschlussperiode"
 
 #. module: account
 #: field:account.account,currency_id:0
@@ -9929,7 +10001,7 @@ msgstr "Alternative Währung"
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr "Buchen"
+msgstr "Buchung quittieren"
 
 #. module: account
 #: field:account.account,credit:0
@@ -9939,6 +10011,7 @@ msgstr "Buchen"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10046,16 +10119,18 @@ msgstr "Analytische Buchungen der letzten 30 Tage"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Perioden"
 
 #. module: account
 #: field:account.invoice.report,currency_rate:0
 msgid "Currency Rate"
-msgstr "Wechsellkurs"
+msgstr "Wechselkurs"
 
 #. module: account
 #: view:account.account:0
@@ -10181,14 +10256,14 @@ msgstr "Kontotyp"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
 msgid "Running Subscriptions"
-msgstr "Entwurf"
+msgstr "Laufende Abbonnements"
 
 #. module: account
 #: view:report.account.sales:0
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Month"
-msgstr "Dieser Monat"
+msgstr "Diesen Monat"
 
 #. module: account
 #: view:account.analytic.balance:0
@@ -10206,7 +10281,7 @@ msgstr "Periode auswählen"
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Posted"
-msgstr "Gebucht"
+msgstr "Quittiert"
 
 #. module: account
 #: report:account.account.balance:0
@@ -10218,6 +10293,7 @@ msgstr "Gebucht"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10235,13 +10311,13 @@ msgstr "Gebucht"
 #: field:accounting.report,date_to:0
 #: field:accounting.report,date_to_cmp:0
 msgid "End Date"
-msgstr "Ende Datum"
+msgstr "Enddatum"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Opening Entries"
-msgstr "Abbrechen Buchen Jahreseröffnung"
+msgstr "Buchen der Jahreseröffnung abbrechen"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
@@ -10262,10 +10338,10 @@ msgstr "Geschäftsjahr Sequenz"
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "No detail"
-msgstr "Kein Detail"
+msgstr "Keine Details"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -10274,7 +10350,7 @@ msgstr ""
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr "You can not create journal items on closed account."
+msgstr "Sie können auf ein abgeschlossenes Konto nicht mehr buchen."
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
@@ -10294,14 +10370,15 @@ msgstr "Status"
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
 msgid "Auto-email confirmed invoices"
-msgstr "automatischer EMail Versand der Rechnungen"
+msgstr "automatischer E-Mail Versand der Rechnungen"
 
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr "Gesamt Prüfsumme"
+msgstr "Zu prüfende Gesamtsumme"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10319,7 +10396,7 @@ msgstr "Bruttobetrag"
 #, python-format
 msgid "Journal: All"
 msgstr ""
-"Journal: AlleErstelle und manage die Finanzjournale des Unternehmens über "
+"Journal: Alle Erstelle und manage die Finanzjournale des Unternehmens über "
 "dieses Menü. Ein Journal ist eine lückenlose und chronologische Aufzeichnung "
 "aller Geschäftsvorfälle in einem Unternehmen in Form der doppelten "
 "Buchhaltung. In Abhängigkeit des Anwendungsumfangs der Buchhaltung sowie der "
@@ -10329,6 +10406,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10343,7 +10421,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10353,6 +10433,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10370,7 +10452,7 @@ msgstr ""
 #: field:analytic.entries.report,company_id:0
 #: field:wizard.multi.charts.accounts,company_id:0
 msgid "Company"
-msgstr "Firma"
+msgstr "Unternehmen"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
@@ -10411,12 +10493,12 @@ msgstr "Vorzeichen f. überg. Steuer"
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr "Test Auswertung Bilanz"
+msgstr "Salden-Bilanz"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr "Beleg Entwurf"
+msgstr "Belegentwürfe"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
@@ -10445,14 +10527,14 @@ msgstr "Rechnungspositionen"
 #. module: account
 #: field:account.chart,period_to:0
 msgid "End period"
-msgstr "Ende Periode"
+msgstr "End-Periode"
 
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
 msgstr ""
-"Die Kurzbezeichnung des Journals sollte eindeutig sein je Unternehmen "
-"(Mandant)."
+"Die Kurzbezeichnung des Journals sollte je Unternehmen (Mandant)eindeutig "
+"sein."
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
@@ -10500,7 +10582,7 @@ msgstr "Auswertung Verkauf nach Konto"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr "Steuerzuordnung"
+msgstr "Konten des Haushaltsberichts"
 
 #. module: account
 #: report:account.invoice:0
@@ -10520,6 +10602,7 @@ msgstr "Eingangsrechnungen"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10549,10 +10632,12 @@ msgstr "Rechnungszeilen"
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr "Fehler ! Rekursive Finanzkontenvorlagen sind nicht erlaubt"
+msgstr "Fehler! Rekursive Finanzkontenvorlagen sind nicht erlaubt."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Belegnummer"
 
@@ -10572,7 +10657,7 @@ msgstr ""
 "mit Buchungen geändert werden."
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Buchung wurde bereits ausgeglichen"
@@ -10614,8 +10699,10 @@ msgstr ""
 "geschlossen für nicht mehr verwendete"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Konten mit Buchungen"
@@ -10669,7 +10756,7 @@ msgstr "Überfällige Forderungen"
 #. module: account
 #: field:account.tax,applicable_type:0
 msgid "Applicability"
-msgstr "Individualberechnung"
+msgstr "Anwendbarkeit"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:165
@@ -10731,16 +10818,16 @@ msgstr "Kontenplan Analysekonten"
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr "verbleibender Restwert nach Zahlung"
+msgstr "Verbleibender, fälliger Restbetrag"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
 msgid "Statistic Reports"
-msgstr "Statistische Auswertungen"
+msgstr "Statistische Berichte"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Falsches Konto!"
@@ -10769,7 +10856,7 @@ msgid "Accounts Mapping"
 msgstr "Zuordnung Finanzkonten"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Rechnung '%s' wartet auf Buchungsfreigabe."
@@ -10897,16 +10984,17 @@ msgstr ""
 "''}${object.address_invoice_id.name or ''},\n"
 "\n"
 "Eine neue Rechnung ist verfügbar: ${object.partner_id.name}:\n"
-"       | Invoice number: *${object.number}*\n"
-"       | Invoice total: *${object.amount_total} ${object.currency_id.name}*\n"
-"       | Invoice date: ${object.date_invoice}\n"
+"       | Rechnungsnummer: *${object.number}*\n"
+"       | Rechnungsbetrag: *${object.amount_total} "
+"${object.currency_id.name}*\n"
+"       | Rechnungsdatum : ${object.date_invoice}\n"
 "       % if object.origin:\n"
 "       | Auftrag: ${object.origin}\n"
 "       % endif\n"
-"       | Ihr Kontakt: ${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
+"       | Ihr Ansprechpartner: ${object.user_id.name} "
+"${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}\n"
 "\n"
-"Sie können dieses Dokument ansehen, herunterladenund Online bezahlen, wenn "
+"Sie können dieses Dokument ansehen, herunterladen und Online bezahlen, wenn "
 "Sie den folgenden Link verwenden:\n"
 "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
 "\n"
@@ -10931,9 +11019,9 @@ msgstr ""
 "    ${paypal_url}\n"
 "% endif\n"
 "\n"
-"Im Falle von Fragen wollen Sie uns bitte kontaktieren.\n"
+"Im Falle von Fragen können Sie uns gerne kontaktieren.\n"
 "\n"
-"Danke, dass Sie ${object.company_id.name} gewählt haben!\n"
+"Danke, dass Sie ${object.company_id.name} Ihr vertrauen schenken!\n"
 "\n"
 "\n"
 "--\n"
@@ -10954,7 +11042,7 @@ msgstr ""
 "or ''} ${object.company_id.country_id.name or ''}\n"
 "% endif\n"
 "% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
+"Tel.: ${object.company_id.phone}\n"
 "% endif\n"
 "% if object.company_id.website:\n"
 "${object.company_id.website or ''}\n"
@@ -10969,7 +11057,7 @@ msgstr "Bankkonten"
 #. module: account
 #: field:res.partner,credit:0
 msgid "Total Receivable"
-msgstr "Gesamt Forderungen"
+msgstr "Forderungsgesamtsumme"
 
 #. module: account
 #: view:account.account:0
@@ -11029,6 +11117,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -11103,17 +11192,19 @@ msgstr "Zentrales Journal"
 #. module: account
 #: report:account.overdue:0
 msgid "Maturity"
-msgstr "überfälllig"
+msgstr "Überfällig"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Zukunft"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr "Suche Journaleinträge"
+msgstr "Durchsuche Buchungen"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -11852,9 +11943,6 @@ msgstr ""
 #~ msgid "3 Months"
 #~ msgstr "3 Monate"
 
-#~ msgid "Standard entries"
-#~ msgstr "Standard Buchung"
-
 #~ msgid ""
 #~ "Check this box if you want to print all entries when printing the General "
 #~ "Ledger, otherwise it will only print its balance."
@@ -12627,9 +12715,6 @@ msgstr ""
 #~ msgid "Calculated Balance"
 #~ msgstr "Berechneter Saldo"
 
-#~ msgid "Open For Unreconciliation"
-#~ msgstr "Öffne Storno Ausgleich"
-
 #, python-format
 #~ msgid "CashBox Balance is not matching with Calculated Balance !"
 #~ msgstr "Kassenbestand passt nicht zu Kontensaldo"
@@ -13194,9 +13279,6 @@ msgstr ""
 #~ msgid "Receivable Accounts"
 #~ msgstr "Debitorenkonten"
 
-#~ msgid "Tax codes"
-#~ msgstr "Umsatzsteuererklärung"
-
 #~ msgid ""
 #~ "Streamlines invoice payment and creates hooks to plug automated payment "
 #~ "systems in."
@@ -13221,9 +13303,6 @@ msgstr ""
 #~ msgid "  day of the month= -1"
 #~ msgstr "  Tag des Monats= -1"
 
-#~ msgid "Reconciliation result"
-#~ msgstr "Ergebnis Kontoabstimmung"
-
 #~ msgid ""
 #~ "You cannot create entries on different periods/journals in the same move"
 #~ msgstr ""
@@ -13356,3 +13435,15 @@ msgstr ""
 
 #~ msgid "Description On Invoices"
 #~ msgstr "Beschreibung auf Rechnungen"
+
+#~ msgid "Open For Unreconciliation"
+#~ msgstr "Öffne zur Stornierung des OP-Ausgleichs"
+
+#~ msgid "Tax codes"
+#~ msgstr "Steuerschlüssel"
+
+#~ msgid "Reconciliation result"
+#~ msgstr "Ergebnis Kontoausgleich"
+
+#~ msgid "Standard entries"
+#~ msgstr "Standard-Buchungen"
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index ef88a09b12d..9d3e4ff5ed7 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:01+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -144,6 +144,7 @@ msgstr "Συμφωνία"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Παραπομπές"
 
@@ -162,13 +163,13 @@ msgstr ""
 "πληρωμής χωρίς να τον διαγράψετε."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Προειδοποίηση"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Ημερολόγιο διαφόρων συμβάντων"
@@ -233,7 +234,7 @@ msgstr ""
 "σχετίζεται με αυτό τον Κωδικό Φόρου."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -250,7 +251,7 @@ msgid "Belgian Reports"
 msgstr "Αναφορές Βελγίου"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -300,7 +301,7 @@ msgid "St."
 msgstr "Κατ."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -330,6 +331,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
+"Δεν μπορεί να βρεθεί λογαριασμός τύπου %s για αυτήν την εταιρία\n"
+"\n"
+"Μπορείς να δημιουργήσεις από το μενού: \n"
+"Παραμετροποίηση/Οικονμική Λογιστικής/Λογαριασμοί/Ημερολόγια"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
@@ -380,6 +385,7 @@ msgstr ""
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
 msgstr ""
+"Δεν μπορείς να καταχωρήσεις εγγραφές ημερολογίου σε λογαριασμό τύπου Όψης"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -592,8 +598,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -651,7 +659,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -662,7 +670,7 @@ msgid "Tax Code Amount"
 msgstr "Ποσό Κωδικού Φόρου"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -689,8 +697,8 @@ msgid "Journal Period"
 msgstr "Ημερολογιακή Περίοδος"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -767,6 +775,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -782,12 +791,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Τύπος"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -915,12 +925,13 @@ msgid "Create 3 Months Periods"
 msgstr "Δημιουργία Τριμηνιαίων Περιόδων"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Λήξη"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -998,7 +1009,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1031,10 +1042,10 @@ msgid "Code"
 msgstr "Κωδικός"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1096,7 +1107,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1144,7 +1155,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Τράπεζα"
@@ -1236,7 +1247,7 @@ msgid "The move of this entry line."
 msgstr "Η κίνηση της γραμμής εγγραφής"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1257,7 +1268,7 @@ msgid "Entry Label"
 msgstr "Ετικέτα Εγγραφής"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1343,14 +1354,15 @@ msgid "Taxes"
 msgstr "Φόροι"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Επιλέξτε αρχική και τελική περίοδο"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1405,6 +1417,7 @@ msgid "Journal Items Analysis"
 msgstr "Ανάλυση Στοιχείων Ημερολογίου"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Συνεργάτες"
@@ -1429,8 +1442,10 @@ msgid "Central Journal"
 msgstr "Κεντρικό Ημερολόγιο"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1655,6 +1670,7 @@ msgid "Separated Journal Sequences"
 msgstr "Διαχωρισμένες Ιεραρχήσεις Ημερολογίου"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Υπεύθυνος"
@@ -1685,7 +1701,7 @@ msgid "Year Sum"
 msgstr "Άθροισμα Έτους"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1758,7 +1774,7 @@ msgid "Customer Ref:"
 msgstr "Παρ. Πελάτη:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2082,7 +2098,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2106,7 +2122,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2155,7 +2171,7 @@ msgid "Description"
 msgstr "Περιγραφή"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2174,7 +2190,7 @@ msgid "Income Account"
 msgstr "Λογαριασμός Εσόδων"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2214,6 +2230,7 @@ msgstr "Πρότυπο Προϊόντος"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2223,6 +2240,7 @@ msgstr "Πρότυπο Προϊόντος"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2273,7 +2291,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2304,7 +2322,7 @@ msgid "Main Sequence"
 msgstr "Κύρια Ιεράρχηση"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2379,7 +2397,7 @@ msgid "Account Tax Code"
 msgstr "Φορολογική Κλίμακα Λογαριασμού"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2460,7 +2478,7 @@ msgid "Account Model Entries"
 msgstr "Εγγραφές Μοντέλου Λογαριασμού"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2524,7 +2542,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2556,7 +2573,7 @@ msgid "Accounts"
 msgstr "Λογαριασμοί"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2676,6 +2693,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Ενηλικιωμένο ισοζύγιο Συνεργάτη"
@@ -2723,14 +2741,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2834,7 +2852,7 @@ msgid "Base Code Amount"
 msgstr "Ποσό Βασικού Κώδικα"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2847,7 +2865,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2885,7 +2903,7 @@ msgid "Fiscal Position"
 msgstr "Φορολογική Θέση"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3040,7 +3058,7 @@ msgid "View"
 msgstr "Όψη"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3232,7 +3250,7 @@ msgid "Starting Balance"
 msgstr "Ισοζύγιο Έναρξης"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Δεν ορίστηκε Συνεργάτης!"
@@ -3286,7 +3304,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3367,6 +3385,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3413,7 +3432,7 @@ msgid "Detail"
 msgstr "Λεπτομέρεια"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3428,9 +3447,16 @@ msgid "VAT :"
 msgstr "ΦΠΑ :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3451,7 +3477,7 @@ msgid "Centralised counterpart"
 msgstr "Συγκεντροποιημένη εγγραφή"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3478,6 +3504,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3505,10 +3532,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -3525,7 +3559,6 @@ msgstr "Ακύρωση Συμφωνίας"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3539,7 +3572,7 @@ msgid "Chart of Accounts Template"
 msgstr "Πρότυπα Λογιστικών Σχεδίων"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3548,7 +3581,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Κάποιες εγγραφές είναι ήδη συμφωνημένες"
@@ -3579,6 +3612,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3664,7 +3699,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Αδύνατη η αλλαγή φόρου"
@@ -3695,7 +3730,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3709,6 +3744,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3722,7 +3758,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4043,7 +4079,7 @@ msgid "Month"
 msgstr "Μήνας"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4100,7 +4136,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4307,7 +4343,7 @@ msgid "Allow Reconciliation"
 msgstr "Να Επιτραπεί Συμφωνία"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4341,7 +4377,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4353,6 +4389,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Αλλαγή"
 
@@ -4397,7 +4434,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4413,7 +4450,7 @@ msgid "Keep empty to use the income account"
 msgstr "Διατηρήστε το κενό για να χρησιμοποιηθεί ο λογαριασμός εσόδων"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4441,7 +4478,7 @@ msgstr "Χαρτογράφηση λογαριασμών"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Πελάτης"
@@ -4457,7 +4494,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4509,7 +4546,7 @@ msgid "Income Account on Product Template"
 msgstr "Λογαριασμός Εσόδων στο Πρότυπο Προϊόντων"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4534,11 +4571,13 @@ msgstr "Νέα Λογιστική Χρήση"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Τιμολόγια"
 
@@ -4677,26 +4716,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Σφάλμα"
@@ -4799,7 +4836,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4827,7 +4864,7 @@ msgid "Child Tax Accounts"
 msgstr "Λογαριασμοί Υπο-φόρων"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4848,6 +4885,7 @@ msgstr "Αναλυτικό ισοζύγιο"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4891,6 +4929,8 @@ msgstr "Τύπος Περιόδου"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Πληρωμές"
 
@@ -4964,7 +5004,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Σφάλμα Ακεραιότητας !"
@@ -4997,6 +5037,7 @@ msgstr "Αποτελέσματα Εκκαθάρισης"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5073,6 +5114,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5203,7 +5245,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5255,13 +5296,13 @@ msgid "End of Year Entries Journal"
 msgstr "Εγγραφές Κλεισίματος Ημερολογίου"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5335,7 +5376,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5502,7 +5542,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5535,14 +5575,14 @@ msgid "Child Accounts"
 msgstr "Ελαχιστοβάθμιοι Λογαριασμοί"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Παραγραφή"
@@ -5562,7 +5602,7 @@ msgstr "Έσοδα"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Προμηθευτής"
@@ -5592,7 +5632,7 @@ msgid "Account n°"
 msgstr "Αρ. Λογαριασμού"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Ελεύθερη Παραπομπή"
@@ -5607,7 +5647,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Εισπρακτέοι και Πληρωτέοι Λογαριασμοί"
@@ -5703,7 +5745,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5714,8 +5756,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Αδύνατη η χρήση ανενεργού λογαριασμού"
@@ -5756,8 +5798,8 @@ msgid "Number of Days"
 msgstr "Αριθμός Ημερών"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5819,7 +5861,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5856,6 +5898,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Περασμένο"
 
@@ -6129,6 +6173,8 @@ msgstr "Ποσοστό"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6138,7 +6184,7 @@ msgid "Power"
 msgstr "Δύναμη"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6178,6 +6224,7 @@ msgid "Applicable Type"
 msgstr "Εφαρμόσιμος Τύπος"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Παραπομπή Τιμολογίου"
@@ -6399,8 +6446,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Εγγραφές: "
@@ -6416,7 +6463,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Αδύνατη η δημιουργία κίνησης μεταξύ διαφορετικών εταιρειών"
@@ -6455,13 +6502,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Σύνολο Χρεώσεων"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Η εγγραφή \"%s\" δεν είναι έγκυρη!"
@@ -6533,25 +6580,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6583,8 +6631,8 @@ msgid "Printed"
 msgstr "Εκτυπωμένο"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6639,7 +6687,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6790,7 +6838,7 @@ msgid "Total:"
 msgstr "Σύνολο:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6820,7 +6868,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6888,14 +6936,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6991,8 +7039,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Είστε βέβαιοι ότι θέλετε να ανοίξετε αυτό το τιμολόγιο;"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7005,7 +7053,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Λογιστικές Εγγραφές"
@@ -7142,7 +7190,7 @@ msgstr ""
 "προσαρμοσμένο περιβάλλον."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7173,8 +7221,8 @@ msgid "Reporting"
 msgstr "Αναφορές"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7263,7 +7311,7 @@ msgid "Sign on Reports"
 msgstr "Πρόσημο στις Αναφορές"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7274,7 +7322,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7309,7 +7357,7 @@ msgid "Optional Information"
 msgstr "Προαιρετική Πληροφορία"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
@@ -7317,6 +7365,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7343,13 +7392,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Λάθος λογαριασμός!"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Ημερολόγιο Πωλήσεων"
@@ -7366,7 +7415,7 @@ msgid "Invoice Tax"
 msgstr "Φόρος Τιμολογίου"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "No piece number !"
@@ -7416,7 +7465,7 @@ msgstr "Σε"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7464,13 +7513,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Λογαριασμοί Πληρωτέοι"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7514,7 +7565,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Μετρητά"
@@ -7526,15 +7577,15 @@ msgid "Account Destination"
 msgstr "Λογαριασμός Προορισμού"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7686,13 +7737,14 @@ msgstr "Σταθερό"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Προσοχή!"
@@ -7744,7 +7796,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7757,7 +7809,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Αδύνατη η %s προσωρινού/προφόρμα/ακυρωμένου τιμολογίου"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7832,7 +7884,7 @@ msgid "Deferral Method"
 msgstr "Μέθοδος Αναβολής"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7896,7 +7948,7 @@ msgid "Associated Partner"
 msgstr "Συσχετιζόμενος Συνεργάτης"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Θα πρέπει πρώτα να επιλέξετε συνεργάτη!"
@@ -7942,7 +7994,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7964,7 +8016,7 @@ msgid "Choose Fiscal Year"
 msgstr "Επιλογή Λογιστικής Χρήσης"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -8053,7 +8105,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Κώδικας Υπολογισμού για Φόρους που συμπεριλαμβάνονται στις τιμές"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8181,7 +8233,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8260,10 +8312,12 @@ msgstr "Ημερολόγιο Επιστροφών"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8296,7 +8350,7 @@ msgid "The partner account used for this invoice."
 msgstr "Ο λογαριασμός συνεργάτη που χρησιμοποιήθηκε στο τιμολόγιο αυτό."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8319,7 +8373,7 @@ msgid "Payment Term Line"
 msgstr "Γραμμή Όρων Πληρωμής"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Ημερολόγιο Αγορών"
@@ -8405,7 +8459,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8513,7 +8567,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8528,7 +8582,7 @@ msgstr ""
 "για εγγαρφή πολλαπλών νομισμάτων."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8601,7 +8655,7 @@ msgid "Contact Address"
 msgstr "Διεύθυνση Επαφής"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8636,12 +8690,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Ημερολόγιο Εγγραφών Ανοίγματος"
@@ -8660,7 +8716,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8748,7 +8804,7 @@ msgid "Period from"
 msgstr "Περίοδος από"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8795,7 +8851,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8811,7 +8867,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8843,8 +8899,6 @@ msgstr "Τέλος Περιόδου"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8859,6 +8913,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8879,6 +8934,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Κατεύθυνση Ανάλυσης"
 
@@ -8898,7 +8954,7 @@ msgstr "Προβολή Ημερολογίου"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Σύνολο πίστωσης"
@@ -8963,6 +9019,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9038,7 +9095,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Πρέπει να επιλέξετε λογαριασμούς για συμφωνία"
@@ -9060,7 +9117,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -9082,7 +9138,7 @@ msgid "Move"
 msgstr "Μετακίνηση"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9142,7 +9198,7 @@ msgid "Consolidated Children"
 msgstr "Ενοποιημένες Υποκατηγορίες"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9203,6 +9259,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9259,6 +9316,7 @@ msgstr "Καταχώρηση προεγγραφής"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9266,6 +9324,7 @@ msgstr "Καταχώρηση προεγγραφής"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9308,7 +9367,7 @@ msgid "Unreconciled"
 msgstr "Μη συμφωνημένα"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Λάθος Σύνολο!"
@@ -9367,7 +9426,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9406,6 +9465,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9504,9 +9564,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Περίοδοι"
 
@@ -9668,6 +9730,7 @@ msgstr "Αποθηεκευμένη"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9715,7 +9778,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9751,6 +9814,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9771,6 +9835,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9785,7 +9850,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9795,6 +9862,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9948,6 +10017,7 @@ msgstr "Τιμολόγιο Προμηθευτή"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9981,6 +10051,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9998,7 +10070,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Η εγγραφή έχει ήδη συμφωνηθεί"
@@ -10034,8 +10106,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Με κινήσεις"
@@ -10152,8 +10226,8 @@ msgid "Statistic Reports"
 msgstr "Στατιστικές Αναφόρές"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Λάθος λογαριασμός!"
@@ -10179,7 +10253,7 @@ msgid "Accounts Mapping"
 msgstr "Χαρτογράφηση Λογαριασμών"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Το Τιμολόγιο '%s' αναμένει επιβεβαίωση."
@@ -10370,6 +10444,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10443,6 +10518,8 @@ msgstr "Ενηλικίωση"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Μελλοντικά"
 
diff --git a/addons/account/i18n/en_GB.po b/addons/account/i18n/en_GB.po
index 1ad3f3dbfca..3fe22bd59cc 100644
--- a/addons/account/i18n/en_GB.po
+++ b/addons/account/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -142,6 +142,7 @@ msgstr "Reconcile"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Reference"
 
@@ -160,13 +161,13 @@ msgstr ""
 "without removing it."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Warning!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,7 +232,7 @@ msgstr ""
 "on invoices"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
@@ -247,7 +248,7 @@ msgid "Belgian Reports"
 msgstr "Belgian Reports"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "You can not add/modify entries in a closed journal."
@@ -293,7 +294,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Invoice line account company does not match with invoice company."
@@ -585,8 +586,10 @@ msgid "The accountant confirms the statement."
 msgstr "The accountant confirms the statement."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -644,7 +647,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Main Sequence must be different from current !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -655,7 +658,7 @@ msgid "Tax Code Amount"
 msgstr "Tax Code Amount"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -682,8 +685,8 @@ msgid "Journal Period"
 msgstr "Journal Period"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "To reconcile the entries company should be the same for all entries"
@@ -760,6 +763,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "You can only change currency for Draft Invoice !"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -775,12 +779,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Type"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -906,12 +911,13 @@ msgid "Create 3 Months Periods"
 msgstr "Create 3 Months Periods"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Due"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -989,7 +995,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1022,10 +1028,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1087,7 +1093,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1135,7 +1141,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1227,7 +1233,7 @@ msgid "The move of this entry line."
 msgstr "The move of this entry line."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1248,7 +1254,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1333,14 +1339,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1395,6 +1402,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1419,8 +1427,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1645,6 +1655,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1673,7 +1684,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1746,7 +1757,7 @@ msgid "Customer Ref:"
 msgstr "Customer Ref:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2065,7 +2076,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2089,7 +2100,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2138,7 +2149,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2157,7 +2168,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2197,6 +2208,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2206,6 +2218,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2256,7 +2269,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2287,7 +2300,7 @@ msgid "Main Sequence"
 msgstr "Main Sequence"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2361,7 +2374,7 @@ msgid "Account Tax Code"
 msgstr "Account Tax Code"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2442,7 +2455,7 @@ msgid "Account Model Entries"
 msgstr "Account Model Entries"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2505,7 +2518,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2537,7 +2549,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Configuration Error!"
@@ -2657,6 +2669,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Aged Partner Balance"
@@ -2704,14 +2717,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2814,7 +2827,7 @@ msgid "Base Code Amount"
 msgstr "Base Code Amount"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2827,7 +2840,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2865,7 +2878,7 @@ msgid "Fiscal Position"
 msgstr "Fiscal Position"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3019,7 +3032,7 @@ msgid "View"
 msgstr "View"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3211,7 +3224,7 @@ msgid "Starting Balance"
 msgstr "Starting Balance"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "No Partner Defined !"
@@ -3265,7 +3278,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3346,6 +3359,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3392,7 +3406,7 @@ msgid "Detail"
 msgstr "Detail"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3407,9 +3421,16 @@ msgid "VAT :"
 msgstr "VAT :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3430,7 +3451,7 @@ msgid "Centralised counterpart"
 msgstr "Centralised counterpart"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3456,6 +3477,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3483,10 +3505,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Date"
 
@@ -3503,7 +3532,6 @@ msgstr "Unreconcile"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3517,7 +3545,7 @@ msgid "Chart of Accounts Template"
 msgstr "Chart of Accounts Template"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3526,7 +3554,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Some entries are already reconciled !"
@@ -3557,6 +3585,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3641,7 +3671,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Unable to change tax !"
@@ -3672,7 +3702,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3686,6 +3716,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3699,7 +3730,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4019,7 +4050,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4076,7 +4107,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4283,7 +4314,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4317,7 +4348,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4329,6 +4360,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4373,7 +4405,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4389,7 +4421,7 @@ msgid "Keep empty to use the income account"
 msgstr "Keep empty to use the income account"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4417,7 +4449,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4433,7 +4465,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4485,7 +4517,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4510,11 +4542,13 @@ msgstr "New Fiscal Year"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4651,26 +4685,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4773,7 +4805,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4800,7 +4832,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4821,6 +4853,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4864,6 +4897,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4937,7 +4972,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integrity Error !"
@@ -4970,6 +5005,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5046,6 +5082,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5175,7 +5212,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5227,13 +5263,13 @@ msgid "End of Year Entries Journal"
 msgstr "End of Year Entries Journal"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5307,7 +5343,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5474,7 +5509,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5507,14 +5542,14 @@ msgid "Child Accounts"
 msgstr "Child Accounts"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Write-Off"
@@ -5534,7 +5569,7 @@ msgstr "Income"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Supplier"
@@ -5564,7 +5599,7 @@ msgid "Account n°"
 msgstr "Account n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Free Reference"
@@ -5579,7 +5614,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Receivable and Payable Accounts"
@@ -5675,7 +5712,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5686,8 +5723,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "You can not use an inactive account!"
@@ -5728,8 +5765,8 @@ msgid "Number of Days"
 msgstr "Number of Days"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5791,7 +5828,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5828,6 +5865,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Past"
 
@@ -6101,6 +6140,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6110,7 +6151,7 @@ msgid "Power"
 msgstr "Power"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6150,6 +6191,7 @@ msgid "Applicable Type"
 msgstr "Applicable Type"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Invoice Reference"
@@ -6373,8 +6415,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6390,7 +6432,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Couldn't create move between different companies"
@@ -6429,13 +6471,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6503,25 +6545,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6553,8 +6596,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6609,7 +6652,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6760,7 +6803,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6790,7 +6833,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6858,14 +6901,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6961,8 +7004,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6975,7 +7018,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7106,7 +7149,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7137,8 +7180,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7227,7 +7270,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7238,7 +7281,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7273,13 +7316,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "The journal must have default credit and debit account"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7306,13 +7350,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Sales Journal"
@@ -7329,7 +7373,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7379,7 +7423,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7427,13 +7471,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7477,7 +7523,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7489,15 +7535,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7649,13 +7695,14 @@ msgstr "Fixed"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Warning !"
@@ -7707,7 +7754,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7720,7 +7767,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Can not %s draft/proforma/cancel invoice."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7794,7 +7841,7 @@ msgid "Deferral Method"
 msgstr "Deferral Method"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7858,7 +7905,7 @@ msgid "Associated Partner"
 msgstr "Associated Partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "You must first select a partner !"
@@ -7904,7 +7951,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7926,7 +7973,7 @@ msgid "Choose Fiscal Year"
 msgstr "Choose Fiscal Year"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -8013,7 +8060,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Compute Code for Taxes Included Prices"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8141,7 +8188,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8220,10 +8267,12 @@ msgstr "Refund Journal"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8256,7 +8305,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8279,7 +8328,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Purchase Journal"
@@ -8364,7 +8413,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8472,7 +8521,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8485,7 +8534,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8558,7 +8607,7 @@ msgid "Contact Address"
 msgstr "Contact Address"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8593,12 +8642,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Opening Entries Journal"
@@ -8617,7 +8668,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8705,7 +8756,7 @@ msgid "Period from"
 msgstr "Period from"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8752,7 +8803,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8768,7 +8819,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8800,8 +8851,6 @@ msgstr "End of Period"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8816,6 +8865,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8836,6 +8886,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Analysis Direction"
 
@@ -8855,7 +8906,7 @@ msgstr "Journal View"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total credit"
@@ -8920,6 +8971,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8995,7 +9047,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "You must select accounts to reconcile"
@@ -9017,7 +9069,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -9039,7 +9090,7 @@ msgid "Move"
 msgstr "Move"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9095,7 +9146,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9156,6 +9207,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9212,6 +9264,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9219,6 +9272,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9261,7 +9315,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9320,7 +9374,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9357,6 +9411,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9455,9 +9510,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9619,6 +9676,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9666,7 +9724,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9702,6 +9760,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9722,6 +9781,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9736,7 +9796,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9746,6 +9808,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9899,6 +9963,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9932,6 +9997,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9949,7 +10016,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9985,8 +10052,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "With movements"
@@ -10102,8 +10171,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10129,7 +10198,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10319,6 +10388,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10392,6 +10462,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/en_US.po b/addons/account/i18n/en_US.po
index fe6dc40692e..fe3ad428696 100644
--- a/addons/account/i18n/en_US.po
+++ b/addons/account/i18n/en_US.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr ""
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2038,7 +2049,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2062,7 +2073,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2111,7 +2122,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2130,7 +2141,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2170,6 +2181,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2179,6 +2191,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2229,7 +2242,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2260,7 +2273,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2334,7 +2347,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2415,7 +2428,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2474,7 +2487,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2506,7 +2518,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2626,6 +2638,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2673,14 +2686,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2783,7 +2796,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2796,7 +2809,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2834,7 +2847,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2981,7 +2994,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3173,7 +3186,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3227,7 +3240,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3308,6 +3321,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3354,7 +3368,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3369,9 +3383,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3392,7 +3413,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3417,6 +3438,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3444,10 +3466,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3464,7 +3493,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3478,7 +3506,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3487,7 +3515,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3518,6 +3546,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3599,7 +3629,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3630,7 +3660,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3644,6 +3674,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3657,7 +3688,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3979,7 +4010,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4036,7 +4067,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4243,7 +4274,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4277,7 +4308,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4289,6 +4320,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4333,7 +4365,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4347,7 +4379,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4375,7 +4407,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4391,7 +4423,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4443,7 +4475,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4468,11 +4500,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4609,26 +4643,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4731,7 +4763,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4755,7 +4787,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4776,6 +4808,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4819,6 +4852,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4892,7 +4927,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4925,6 +4960,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5001,6 +5037,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5128,7 +5165,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5180,13 +5216,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5260,7 +5296,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5423,7 +5458,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5456,14 +5491,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5483,7 +5518,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5513,7 +5548,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5528,7 +5563,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5624,7 +5661,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5635,8 +5672,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5677,8 +5714,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5740,7 +5777,7 @@ msgid "Multipication factor for Base code"
 msgstr "Multiplication factor for Base code"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5777,6 +5814,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6050,6 +6089,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6059,7 +6100,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6099,6 +6140,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6317,8 +6359,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6334,7 +6376,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6373,13 +6415,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6447,25 +6489,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6497,8 +6540,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6553,7 +6596,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6704,7 +6747,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6734,7 +6777,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6802,14 +6845,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6905,8 +6948,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6919,7 +6962,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7050,7 +7093,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7081,8 +7124,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7171,7 +7214,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7182,7 +7225,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7217,13 +7260,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7250,13 +7294,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7273,7 +7317,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7323,7 +7367,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7371,13 +7415,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7421,7 +7467,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7433,15 +7479,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7587,13 +7633,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7645,7 +7692,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7658,7 +7705,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7732,7 +7779,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7794,7 +7841,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7840,7 +7887,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7862,7 +7909,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7949,7 +7996,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8077,7 +8124,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8156,10 +8203,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8192,7 +8241,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8215,7 +8264,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8300,7 +8349,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8406,7 +8455,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8419,7 +8468,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8492,7 +8541,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8527,12 +8576,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8551,7 +8602,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8637,7 +8688,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8684,7 +8735,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8700,7 +8751,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8732,8 +8783,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8748,6 +8797,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8768,6 +8818,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8787,7 +8838,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8852,6 +8903,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8927,7 +8979,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8949,7 +9001,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8971,7 +9022,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9027,7 +9078,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9088,6 +9139,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9144,6 +9196,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9151,6 +9204,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9193,7 +9247,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9252,7 +9306,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9289,6 +9343,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9387,9 +9442,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9551,6 +9608,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9598,7 +9656,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9634,6 +9692,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9654,6 +9713,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9668,7 +9728,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9678,6 +9740,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9831,6 +9895,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9864,6 +9929,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9881,7 +9948,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9917,8 +9984,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10034,8 +10103,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10061,7 +10130,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10251,6 +10320,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10324,6 +10394,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index ae60b0b9c66..2553706cf6d 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:04+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -146,6 +146,7 @@ msgstr "Conciliar"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referencia"
 
@@ -164,13 +165,13 @@ msgstr ""
 "eliminarlo."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diario varios"
@@ -235,7 +236,7 @@ msgstr ""
 "relacionado con este código de impuesto."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -252,7 +253,7 @@ msgid "Belgian Reports"
 msgstr "Informes Belgas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "No puede añadir/modificar asientos en un diario cerrado."
@@ -301,7 +302,7 @@ msgid "St."
 msgstr "Ext."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -600,8 +601,10 @@ msgid "The accountant confirms the statement."
 msgstr "El contable confirma el extracto."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -660,7 +663,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "¡La secuencia principal debe ser diferente de la actual!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -672,7 +675,7 @@ msgid "Tax Code Amount"
 msgstr "Importe código impuesto"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "VEN"
@@ -699,8 +702,8 @@ msgid "Journal Period"
 msgstr "Periodo diario"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -781,6 +784,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "¡Sólo puede cambiar la moneda para facturas en borrador!"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Informe financiero"
@@ -796,12 +800,13 @@ msgstr "Informe financiero"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -935,12 +940,13 @@ msgid "Create 3 Months Periods"
 msgstr "Crear períodos trimestrales"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Debido"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1025,7 +1031,7 @@ msgstr ""
 "contendrá el monto de base imponible (sin impuesto)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "No se puede localizar un padre para la cuenta de la plantilla"
@@ -1058,10 +1064,10 @@ msgid "Code"
 msgstr "Código"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1127,7 +1133,7 @@ msgstr ""
 "tipo contiene más información acerca de la cuenta y sus especificidades."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1175,7 +1181,7 @@ msgstr "Apuntes contables descuadrados"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banco"
@@ -1273,7 +1279,7 @@ msgid "The move of this entry line."
 msgstr "El asiento de este apunte."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1296,7 +1302,7 @@ msgid "Entry Label"
 msgstr "Etiqueta asiento"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1382,14 +1388,15 @@ msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Seleccione un periodo inicial y final"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Pérdidas y Ganancias"
 
@@ -1444,6 +1451,7 @@ msgid "Journal Items Analysis"
 msgstr "Análisis elementos diario"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Empresas"
@@ -1468,8 +1476,10 @@ msgid "Central Journal"
 msgstr "Diario central"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1705,6 +1715,7 @@ msgid "Separated Journal Sequences"
 msgstr "Secuencias de diarios separadas"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Responsable"
@@ -1735,7 +1746,7 @@ msgid "Year Sum"
 msgstr "Suma del año"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1814,7 +1825,7 @@ msgid "Customer Ref:"
 msgstr "Ref. cliente:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "¡El usuario %s no tienen derechos para acceder al diario %s !"
@@ -2150,7 +2161,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2181,7 +2192,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Buscar plantillas de plan contable"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2238,7 +2249,7 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ACOMPRA"
@@ -2257,7 +2268,7 @@ msgid "Income Account"
 msgstr "Cuenta de ingresos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "¡No se ha definido un diario contable de tipo Venta/Compra!"
@@ -2297,6 +2308,7 @@ msgstr "Plantilla de producto"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2306,6 +2318,7 @@ msgstr "Plantilla de producto"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2356,7 +2369,7 @@ msgid "Account Line"
 msgstr "Linea de asiento"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2392,7 +2405,7 @@ msgid "Main Sequence"
 msgstr "Secuencia principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2468,7 +2481,7 @@ msgid "Account Tax Code"
 msgstr "Código impuesto contable"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2562,7 +2575,7 @@ msgid "Account Model Entries"
 msgstr "Contabilidad. Líneas de modelo"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "COMPRA"
@@ -2630,7 +2643,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "Reconcilia linea de asiento (desajuste)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2662,7 +2674,7 @@ msgid "Accounts"
 msgstr "Cuentas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "¡Error de configuración!"
@@ -2786,6 +2798,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Saldos vencidos de empresa"
@@ -2838,14 +2851,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Este asistente creará asientos contables recurrentes"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "¡No se ha definido una secuencia en el diario!"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2956,7 +2969,7 @@ msgid "Base Code Amount"
 msgstr "Importe código base"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2971,7 +2984,7 @@ msgid "Default Sale Tax"
 msgstr "Impuesto de venta por defecto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Factura '%s' es validada."
@@ -3012,7 +3025,7 @@ msgid "Fiscal Position"
 msgstr "Posición fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3167,7 +3180,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3371,7 +3384,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "¡No se ha definido empresa!"
@@ -3427,7 +3440,7 @@ msgid "Chart of Tax"
 msgstr "Plan de impuestos"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "¡El balance cerrado debería ser el mismo que el balance calculado!"
@@ -3512,6 +3525,7 @@ msgstr "Cantidad:"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Longitud del periodo (días)"
 
@@ -3558,7 +3572,7 @@ msgid "Detail"
 msgstr "Detalle"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3573,9 +3587,16 @@ msgid "VAT :"
 msgstr "CIF/NIF:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3596,7 +3617,7 @@ msgid "Centralised counterpart"
 msgstr "Homólogo centralizado"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3624,6 +3645,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3651,10 +3673,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Fecha"
 
@@ -3671,7 +3700,6 @@ msgstr "Romper conciliación"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3685,7 +3713,7 @@ msgid "Chart of Accounts Template"
 msgstr "Plantilla del plan contable"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3697,7 +3725,7 @@ msgstr ""
 "¡Por favor, defina la empresa en él!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "¡Algunos asientos ya están conciliados!"
@@ -3728,6 +3756,8 @@ msgstr "Presupuestos"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "No filtros"
 
@@ -3812,7 +3842,7 @@ msgid "Analytic Items"
 msgstr "Apuntes analíticos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "¡No ha sido posible cambiar el impuesto!"
@@ -3843,7 +3873,7 @@ msgid "Mapping"
 msgstr "Asignaciones"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3860,6 +3890,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3873,7 +3904,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Informe de balance de comprobación de vencimientos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "No puede crear asientos en una cuenta %s %s cerrada"
@@ -4213,7 +4244,7 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4272,7 +4303,7 @@ msgid "Account Base Code"
 msgstr "Código base cuenta"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4487,7 +4518,7 @@ msgid "Allow Reconciliation"
 msgstr "Permitir conciliación"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4523,7 +4554,7 @@ msgid "Recurring Models"
 msgstr "Modelos recurrentes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Error de codificación"
@@ -4535,6 +4566,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Cambiar"
 
@@ -4579,7 +4611,7 @@ msgid "Example"
 msgstr "Ejemplo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4595,7 +4627,7 @@ msgid "Keep empty to use the income account"
 msgstr "Dejarlo vacío para usar la cuenta de ingresos"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Impuesto de compra %2f%%"
@@ -4623,7 +4655,7 @@ msgstr "Mapeo de cuentas"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -4639,7 +4671,7 @@ msgid "Cancelled Invoice"
 msgstr "Factura cancelada"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4696,7 +4728,7 @@ msgid "Income Account on Product Template"
 msgstr "Cuenta de ingresos en plantilla producto"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "Varios"
@@ -4723,11 +4755,13 @@ msgstr "Nuevo ejercicio fiscal"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Facturas"
 
@@ -4870,26 +4904,24 @@ msgid "Journal Items"
 msgstr "Apuntes contables"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -5000,7 +5032,7 @@ msgid "Beginning of Period Date"
 msgstr "Inicio de fecha de periodo"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -5027,7 +5059,7 @@ msgid "Child Tax Accounts"
 msgstr "Cuentas impuestos hijas"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Periodo inicial debería ser más pequeño que el periodo final"
@@ -5050,6 +5082,7 @@ msgstr "Balance analítico -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5093,6 +5126,8 @@ msgstr "Período: Unidad de tiempo"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Pagos"
 
@@ -5171,7 +5206,7 @@ msgid "Line 1:"
 msgstr "Línea 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "¡Error de integridad!"
@@ -5204,6 +5239,7 @@ msgstr "Resultado de conciliación"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Balance de situación"
@@ -5280,6 +5316,7 @@ msgstr "Informe"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5409,7 +5446,6 @@ msgstr "Contabilidad. Informe contable común"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Comunicación"
 
@@ -5462,13 +5498,13 @@ msgid "End of Year Entries Journal"
 msgstr "Diario asientos cierre del ejercicio"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5545,7 +5581,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Facturas y devoluciones de clientes"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5719,7 +5754,7 @@ msgid "Generate Opening Entries"
 msgstr "Generar asientos apertura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "¡Ya está conciliado!"
@@ -5752,14 +5787,14 @@ msgid "Child Accounts"
 msgstr "Cuentas hijas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Nombre del movimiento (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Desajuste"
@@ -5779,7 +5814,7 @@ msgstr "Ingreso"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Proveedor"
@@ -5809,7 +5844,7 @@ msgid "Account n°"
 msgstr "Cuenta n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referencia libre / Nº Fact. Proveedor"
@@ -5824,7 +5859,9 @@ msgstr "Valoración"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Cuentas a cobrar y pagar"
@@ -5932,7 +5969,7 @@ msgid "Filter by"
 msgstr "Filtrar por"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "¡Tiene una expressión errónea \"%(...)s\" en su modelo!"
@@ -5943,8 +5980,8 @@ msgid "Entry Date"
 msgstr "Fecha de Entrada"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "¡No puede utilizar una cuenta inactiva!"
@@ -5986,8 +6023,8 @@ msgid "Number of Days"
 msgstr "Número de días"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -6049,7 +6086,7 @@ msgid "Multipication factor for Base code"
 msgstr "Factor de multiplicación para código base"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "no implementado"
@@ -6088,6 +6125,8 @@ msgstr "Análisis asientos analíticos"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Anterior"
 
@@ -6377,6 +6416,8 @@ msgstr "Porcentaje"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Diario y Empresa"
 
@@ -6386,7 +6427,7 @@ msgid "Power"
 msgstr "Fuerza"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "No puede generar un código de diario que no ha sido usado"
@@ -6428,6 +6469,7 @@ msgid "Applicable Type"
 msgstr "Tipo aplicable"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Referencia factura"
@@ -6661,8 +6703,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "No puede borrar una cuenta que contiene asientos"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Asientos: "
@@ -6678,7 +6720,7 @@ msgid "Currency of the related account journal."
 msgstr "Moneda del diario relacionado"
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "No se ha podido crear movimiento entre diferentes compañías"
@@ -6727,13 +6769,13 @@ msgstr "Estado es borrador"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Total debe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "¡El asiento \"%s\" no es válido!"
@@ -6807,25 +6849,26 @@ msgstr "Pérdidas y ganancias (cuenta de gastos)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6857,8 +6900,8 @@ msgid "Printed"
 msgstr "Impreso"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Error:"
@@ -6921,7 +6964,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Mostrar informe libro mayor con una empresa por página."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -7088,7 +7131,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7125,7 +7168,7 @@ msgid "Taxes used in Sales"
 msgstr "Impuestos usados en ventas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7204,14 +7247,14 @@ msgid "Source Document"
 msgstr "Documento origen"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "¡No puede borrar un asiento asentado \"%s\"¡"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7319,8 +7362,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "¿Está seguro que desea abrir esta factura?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7335,7 +7378,7 @@ msgid "Opening Entries Expense Account"
 msgstr "Apuntes de apertura cuenta de gastos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Asientos contables"
@@ -7474,7 +7517,7 @@ msgstr ""
 "personalizada."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7506,8 +7549,8 @@ msgid "Reporting"
 msgstr "Informe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7604,7 +7647,7 @@ msgid "Sign on Reports"
 msgstr "Signo en informes"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr "El periodo para generar entradas abiertas no ha sido encontrado"
@@ -7615,7 +7658,7 @@ msgid "Root/View"
 msgstr "Raiz/vista"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7650,13 +7693,14 @@ msgid "Optional Information"
 msgstr "Información opcional"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "El diario debe tener una cuenta haber y debe por defecto."
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7685,13 +7729,13 @@ msgid "Maturity Date"
 msgstr "Fecha vencimiento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "¡Cuenta incorrecta!"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Diario de ventas"
@@ -7708,7 +7752,7 @@ msgid "Invoice Tax"
 msgstr "Impuesto de factura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "¡Ningún trozo de número!"
@@ -7763,7 +7807,7 @@ msgstr "Hasta"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Ajustes de moneda"
@@ -7817,13 +7861,15 @@ msgstr "Mayo"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Cuentas a pagar"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7870,7 +7916,7 @@ msgstr "Nombre del informe"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Efectivo"
@@ -7882,15 +7928,15 @@ msgid "Account Destination"
 msgstr "Cuenta destino"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -8047,13 +8093,14 @@ msgstr "Fijo"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "¡Atención!"
@@ -8105,7 +8152,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Seleccione una moneda a aplicar en la factura."
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -8120,7 +8167,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "No se puede %s factura borrador/proforma/cancelada."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "¡No hay líneas de factura!"
@@ -8205,7 +8252,7 @@ msgid "Deferral Method"
 msgstr "Método cierre"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "La factura '%s' está pagada."
@@ -8272,7 +8319,7 @@ msgid "Associated Partner"
 msgstr "Empresa asociada"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "¡Primero debe seleccionar una empresa!"
@@ -8331,7 +8378,7 @@ msgstr ""
 "de acuerdo a su país."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8354,7 +8401,7 @@ msgid "Choose Fiscal Year"
 msgstr "Seleccione el ejercicio fiscal"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diario de abono de compras"
@@ -8447,7 +8494,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Código para el cálculo de los impuestos en precios incluidos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8590,7 +8637,7 @@ msgid "current month"
 msgstr "Mes actual"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8678,10 +8725,12 @@ msgstr "Diario reintegro"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtrar por"
 
@@ -8718,7 +8767,7 @@ msgid "The partner account used for this invoice."
 msgstr "La cuenta de la empresa utilizada para esta factura."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Impuestox %.2f%%"
@@ -8741,7 +8790,7 @@ msgid "Payment Term Line"
 msgstr "Línea de plazo de pago"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diario de compras"
@@ -8829,7 +8878,7 @@ msgid "Unpaid Invoices"
 msgstr "Facturas impagadas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr "¡La forma de pago de proveedor no tiene una línea de forma de pago!"
@@ -8939,7 +8988,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Dejarlo vacío para abrir todos los ejercicios fiscales."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "¡El movimiento contable (%s) para centralización ha sido confirmado!"
@@ -8954,7 +9003,7 @@ msgstr ""
 "multi-divisa."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -9037,7 +9086,7 @@ msgid "Contact Address"
 msgstr "Dirección contacto"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "¡Modelo erroneo!"
@@ -9077,12 +9126,14 @@ msgstr "Contratos"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "desconocido"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diario asientos de apertura"
@@ -9104,7 +9155,7 @@ msgstr ""
 "calcula en el informe de Pérdidas y Ganancias."
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -9196,7 +9247,7 @@ msgid "Period from"
 msgstr "Período desde"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diario de abono de ventas"
@@ -9243,7 +9294,7 @@ msgid "Purchase Tax(%)"
 msgstr "Impuesto compra (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Cree algunas líneas de factura"
@@ -9259,7 +9310,7 @@ msgid "Display Detail"
 msgstr "Mostrar detalles"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "AVENTA"
@@ -9297,8 +9348,6 @@ msgstr "Fin de período"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Informes financieros"
@@ -9313,6 +9362,7 @@ msgstr "Informes financieros"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9333,6 +9383,7 @@ msgstr "Periodo inicial"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Dirección análisis"
 
@@ -9352,7 +9403,7 @@ msgstr "Vista de diario"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total haber"
@@ -9423,6 +9474,7 @@ msgstr "Extractos bancarios"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9504,7 +9556,7 @@ msgstr ""
 "de contrapartida."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Debe seleccionar las cuentas a conciliar"
@@ -9532,7 +9584,6 @@ msgstr ""
 "periodo específico."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filtros por"
@@ -9554,7 +9605,7 @@ msgid "Move"
 msgstr "Asiento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9614,7 +9665,7 @@ msgid "Consolidated Children"
 msgstr "Hijos consolidados"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9679,6 +9730,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9741,6 +9793,7 @@ msgstr "Asiento periódico"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9748,6 +9801,7 @@ msgstr "Asiento periódico"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9792,7 +9846,7 @@ msgid "Unreconciled"
 msgstr "No conciliado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "¡Total erróneo!"
@@ -9860,7 +9914,7 @@ msgid "Comparison"
 msgstr "Comparación"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Error desconocido"
@@ -9899,6 +9953,7 @@ msgstr "Validar movimiento contable"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10003,9 +10058,11 @@ msgstr "Apuntes analíticos de los últimos 30 días"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Periodos"
 
@@ -10176,6 +10233,7 @@ msgstr "Asentado"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10223,7 +10281,7 @@ msgid "No detail"
 msgstr "Sin detalles"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -10260,6 +10318,7 @@ msgid "Verification Total"
 msgstr "Validación total"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10280,6 +10339,7 @@ msgstr "Diario: Todos"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10294,7 +10354,9 @@ msgstr "Diario: Todos"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10304,6 +10366,8 @@ msgstr "Diario: Todos"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10468,6 +10532,7 @@ msgstr "Factura de proveedor"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10501,6 +10566,8 @@ msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Número de asiento"
 
@@ -10520,7 +10587,7 @@ msgstr ""
 "que contenga asientos!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "El asiento ya está conciliado"
@@ -10561,8 +10628,10 @@ msgstr ""
 "débito/crédito), cerradas para cuentas depreciadas."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Con movimientos"
@@ -10687,8 +10756,8 @@ msgid "Statistic Reports"
 msgstr "Informes estadísticos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "¡Cuenta incorrecta!"
@@ -10719,7 +10788,7 @@ msgid "Accounts Mapping"
 msgstr "Mapeo de cuentas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "La factura '%s' está esperando para validación."
@@ -10981,6 +11050,7 @@ msgstr "account.añadirplantilla.asistente"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -11059,6 +11129,8 @@ msgstr "Vencimiento"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Futuro"
 
diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po
index 29bc83e2109..15a06669417 100644
--- a/addons/account/i18n/es_AR.po
+++ b/addons/account/i18n/es_AR.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-03-17 20:16+0000\n"
+"PO-Revision-Date: 2012-11-13 15:01+0000\n"
 "Last-Translator: jpdborgna <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-11-14 04:40+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "Ultimo mes"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -139,13 +139,14 @@ msgstr "Conciliar"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referencia"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr ""
+msgstr "Seleccione el año fiscal "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -155,13 +156,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "¡Advertencia!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -186,7 +187,7 @@ msgstr ""
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr ""
+msgstr "Diario: %s"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -223,10 +224,11 @@ msgstr ""
 "código aparezca en las facturas."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
+"La factura '%s' está parcialmente pagada: %s%s de %s%s (%s%s pendiente)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
@@ -239,7 +241,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "No puede añadir/modificar asientos en un diario cerrado."
@@ -267,7 +269,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscalyear"
-msgstr ""
+msgstr "Cerrar ejercicio fiscal"
 
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
@@ -285,7 +287,7 @@ msgid "St."
 msgstr "Extr."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -334,7 +336,7 @@ msgstr ""
 #. module: account
 #: view:account.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -343,7 +345,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -377,12 +379,12 @@ msgstr "Fecha de creación"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr ""
+msgstr "Devolución de compra"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr ""
+msgstr "Situación de apertura/cierre"
 
 #. module: account
 #: help:account.journal,currency:0
@@ -392,7 +394,7 @@ msgstr "La moneda utilizada para el extracto"
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr "Año fiscal para abrir"
+msgstr "Ejercicio fiscal a abrir"
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -494,7 +496,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "Cuenta utilizada en este diario"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -556,11 +558,13 @@ msgstr "Cerrar un año fiscal"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr ""
+msgstr "El contador confirma la declaración."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -618,7 +622,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -629,7 +633,7 @@ msgid "Tax Code Amount"
 msgstr "Importe de código de impuesto"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "VENTA"
@@ -656,8 +660,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -734,6 +738,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -749,12 +754,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -880,12 +886,13 @@ msgid "Create 3 Months Periods"
 msgstr "Crear Períodos Trimestrales"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Debe"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -963,7 +970,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -996,10 +1003,10 @@ msgid "Code"
 msgstr "Código"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1061,7 +1068,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1109,7 +1116,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1201,7 +1208,7 @@ msgid "The move of this entry line."
 msgstr "El movimiento de esta línea del asiento."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1222,7 +1229,7 @@ msgid "Entry Label"
 msgstr "Etiqueta del asiento"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1308,14 +1315,15 @@ msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1370,6 +1378,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1394,8 +1403,10 @@ msgid "Central Journal"
 msgstr "Diario central"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1620,6 +1631,7 @@ msgid "Separated Journal Sequences"
 msgstr "Secuancias de diarios separados"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1648,7 +1660,7 @@ msgid "Year Sum"
 msgstr "Suma del año"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1721,7 +1733,7 @@ msgid "Customer Ref:"
 msgstr "Ref. cliente:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2044,7 +2056,7 @@ msgid "Pro-forma"
 msgstr "Pro-Forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2068,7 +2080,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2117,7 +2129,7 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2136,7 +2148,7 @@ msgid "Income Account"
 msgstr "Cuenta de ingresos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "¡No se ha definido un diario contable de tipo Venta/Compra!"
@@ -2176,6 +2188,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2185,6 +2198,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2235,7 +2249,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2266,7 +2280,7 @@ msgid "Main Sequence"
 msgstr "Secuencia principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2340,7 +2354,7 @@ msgid "Account Tax Code"
 msgstr "Código de impuesto contable"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2421,7 +2435,7 @@ msgid "Account Model Entries"
 msgstr "Asientos Modelo de Cuenta"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "GASTO"
@@ -2485,7 +2499,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2517,7 +2530,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "¡Error de configuración!"
@@ -2637,6 +2650,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Balance de comprobación de partner"
@@ -2684,14 +2698,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2795,7 +2809,7 @@ msgid "Base Code Amount"
 msgstr "Importe de código base"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2808,7 +2822,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2846,7 +2860,7 @@ msgid "Fiscal Position"
 msgstr "Posición fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3001,7 +3015,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3193,7 +3207,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "No hay partner definido !"
@@ -3247,7 +3261,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3328,6 +3342,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3374,7 +3389,7 @@ msgid "Detail"
 msgstr "Detalle"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3389,9 +3404,16 @@ msgid "VAT :"
 msgstr "CUIT:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3412,7 +3434,7 @@ msgid "Centralised counterpart"
 msgstr "Contrapartida centralizada"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3439,6 +3461,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3466,10 +3489,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Fecha"
 
@@ -3486,7 +3516,6 @@ msgstr "Desconciliar"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3500,7 +3529,7 @@ msgid "Chart of Accounts Template"
 msgstr "Plantilla del plan de cuentas"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3509,7 +3538,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Algunos asientos ya están conciliados !"
@@ -3540,6 +3569,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3625,7 +3656,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "¡No ha sido posible cambiar el impuesto!"
@@ -3656,7 +3687,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3670,6 +3701,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3683,7 +3715,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4003,7 +4035,7 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4060,7 +4092,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4267,7 +4299,7 @@ msgid "Allow Reconciliation"
 msgstr "Permitir conciliación"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4301,7 +4333,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4313,6 +4345,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Cambiar"
 
@@ -4357,7 +4390,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4373,7 +4406,7 @@ msgid "Keep empty to use the income account"
 msgstr "Dejar vacío para usar la cuenta de ingresos"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4401,7 +4434,7 @@ msgstr "Asociación de cuentas"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -4417,7 +4450,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4469,7 +4502,7 @@ msgid "Income Account on Product Template"
 msgstr "Cuenta de ingresos en plantilla del producto"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4494,11 +4527,13 @@ msgstr "Nuevo año fiscal"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Facturas"
 
@@ -4635,26 +4670,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -4757,7 +4790,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4784,7 +4817,7 @@ msgid "Child Tax Accounts"
 msgstr "Cuentas de impuestos hijas"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4807,6 +4840,7 @@ msgstr "Balance analítico -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4850,6 +4884,8 @@ msgstr "Tipo de Período"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Pagos"
 
@@ -4923,7 +4959,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "¡Error de integridad!"
@@ -4956,6 +4992,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5032,6 +5069,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5162,7 +5200,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5214,13 +5251,13 @@ msgid "End of Year Entries Journal"
 msgstr "Diario de asientos de cierre del año"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5294,7 +5331,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5461,7 +5497,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5494,14 +5530,14 @@ msgid "Child Accounts"
 msgstr "Cuentas hijas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Cancelación"
@@ -5521,7 +5557,7 @@ msgstr "Ingresos"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Proveedor"
@@ -5551,7 +5587,7 @@ msgid "Account n°"
 msgstr "Cuenta n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referencia libre"
@@ -5566,7 +5602,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Cuentas a cobrar y pagar"
@@ -5662,7 +5700,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5673,8 +5711,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "No puede utilizar una cuenta inactiva !"
@@ -5715,8 +5753,8 @@ msgid "Number of Days"
 msgstr "Cantidad de días"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5778,7 +5816,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5815,6 +5853,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Anterior"
 
@@ -6088,6 +6128,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6097,7 +6139,7 @@ msgid "Power"
 msgstr "Potencia"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6137,6 +6179,7 @@ msgid "Applicable Type"
 msgstr "Tipo aplicable"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Referencia de Factura"
@@ -6360,8 +6403,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Asientos: "
@@ -6377,7 +6420,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "No se pudo crear el movimiento entre empresas distintas"
@@ -6416,13 +6459,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Total Debe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "El asiento \"%s\" no es válido !"
@@ -6494,25 +6537,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6544,8 +6588,8 @@ msgid "Printed"
 msgstr "Impreso"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6600,7 +6644,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6751,7 +6795,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6781,7 +6825,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6849,14 +6893,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6954,8 +6998,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "¿Está seguro que desea abrir esta factura?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6968,7 +7012,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Asientos contables"
@@ -7104,7 +7148,7 @@ msgstr ""
 "desarrolladores crear impuestos específicos en un dominio a medida"
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7135,8 +7179,8 @@ msgid "Reporting"
 msgstr "Reporte"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7225,7 +7269,7 @@ msgid "Sign on Reports"
 msgstr "Signo en informes"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7236,7 +7280,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7271,13 +7315,14 @@ msgid "Optional Information"
 msgstr "Información opcional"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "El diario debe tener una cuenta haber y debe predeterminada"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7304,13 +7349,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Cuenta incorrecta !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Diario de ventas"
@@ -7327,7 +7372,7 @@ msgid "Invoice Tax"
 msgstr "Impuestos sobre Factura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "No hay número de pieza !"
@@ -7377,7 +7422,7 @@ msgstr "Hasta"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7425,13 +7470,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Cuentas a pagar"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7475,7 +7522,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Efectivo"
@@ -7487,15 +7534,15 @@ msgid "Account Destination"
 msgstr "Cuenta destino"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7647,13 +7694,14 @@ msgstr "Fijo"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "¡Atención!"
@@ -7705,7 +7753,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7718,7 +7766,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "No se puede %s factura borrador/proforma/cancelada."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7792,7 +7840,7 @@ msgid "Deferral Method"
 msgstr "Método de diferimiento"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7856,7 +7904,7 @@ msgid "Associated Partner"
 msgstr "Partner asociado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Primero debe seleccionar un partner !"
@@ -7902,7 +7950,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7924,7 +7972,7 @@ msgid "Choose Fiscal Year"
 msgstr "Elegir Año Fiscal"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -8013,7 +8061,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8109,7 +8157,7 @@ msgstr ""
 #: field:account.bank.statement,balance_end_real:0
 #: field:account.treasury.report,ending_balance:0
 msgid "Ending Balance"
-msgstr "Balance final"
+msgstr "Saldo Final"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -8141,7 +8189,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8220,10 +8268,12 @@ msgstr "Diario de reembolso"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8256,7 +8306,7 @@ msgid "The partner account used for this invoice."
 msgstr "La cuenta del partner utilizada para esta factura."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8279,7 +8329,7 @@ msgid "Payment Term Line"
 msgstr "Línea de término de pago"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diario de compras"
@@ -8364,7 +8414,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8472,7 +8522,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8487,7 +8537,7 @@ msgstr ""
 "moneda."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8560,7 +8610,7 @@ msgid "Contact Address"
 msgstr "Domicilio de Contacto"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8595,12 +8645,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diario asientos de apertura"
@@ -8619,7 +8671,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8707,7 +8759,7 @@ msgid "Period from"
 msgstr "Período desde"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8754,7 +8806,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8770,7 +8822,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8802,8 +8854,6 @@ msgstr "Fin del período"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8818,6 +8868,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8838,6 +8889,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Dirección de análisis"
 
@@ -8857,7 +8909,7 @@ msgstr "Vista de diario"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total haber"
@@ -8922,6 +8974,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8997,7 +9050,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Debe seleccionar las cuentas a conciliar"
@@ -9019,7 +9072,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -9041,7 +9093,7 @@ msgid "Move"
 msgstr "Movimiento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9100,7 +9152,7 @@ msgid "Consolidated Children"
 msgstr "Hijos consolidados"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9161,6 +9213,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9217,6 +9270,7 @@ msgstr "Asiento de subscripción"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9224,6 +9278,7 @@ msgstr "Asiento de subscripción"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9266,7 +9321,7 @@ msgid "Unreconciled"
 msgstr "Desconciliada"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Total erróneo !"
@@ -9325,7 +9380,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9364,6 +9419,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9462,9 +9518,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Períodos"
 
@@ -9626,6 +9684,7 @@ msgstr "Publicado"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9673,7 +9732,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9709,6 +9768,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9729,6 +9789,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9743,7 +9804,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9753,6 +9816,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9906,6 +9971,7 @@ msgstr "Factura de proveedor"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9939,6 +10005,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9956,7 +10024,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "El asiento ya está conciliado"
@@ -9992,8 +10060,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Con movimientos"
@@ -10109,8 +10179,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Cuenta incorrecta !"
@@ -10136,7 +10206,7 @@ msgid "Accounts Mapping"
 msgstr "Asignación de cuentas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10327,6 +10397,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10400,6 +10471,8 @@ msgstr "Vencimiento"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Futuro"
 
diff --git a/addons/account/i18n/es_CL.po b/addons/account/i18n/es_CL.po
index 8c8b600ca61..829de10f8e8 100644
--- a/addons/account/i18n/es_CL.po
+++ b/addons/account/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -147,6 +147,7 @@ msgstr "Reconciliar"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referencia"
 
@@ -165,13 +166,13 @@ msgstr ""
 "eliminarlo."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "¡Atención!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diario varios"
@@ -236,7 +237,7 @@ msgstr ""
 "relacionado con este código de impuesto."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -253,7 +254,7 @@ msgid "Belgian Reports"
 msgstr "Informes Belgas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "No puede añadir/modificar asientos en un diario cerrado."
@@ -302,7 +303,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -576,8 +577,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -633,7 +636,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -644,7 +647,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -671,8 +674,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -749,6 +752,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -764,12 +768,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -895,12 +900,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -978,7 +984,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1011,10 +1017,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1076,7 +1082,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1124,7 +1130,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1216,7 +1222,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1237,7 +1243,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1322,14 +1328,15 @@ msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1384,6 +1391,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1408,8 +1416,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1634,6 +1644,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1662,7 +1673,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1735,7 +1746,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2054,7 +2065,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2078,7 +2089,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2127,7 +2138,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2146,7 +2157,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2186,6 +2197,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2195,6 +2207,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2245,7 +2258,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2276,7 +2289,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2350,7 +2363,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2431,7 +2444,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2492,7 +2505,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2524,7 +2536,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2644,6 +2656,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2691,14 +2704,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2801,7 +2814,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2814,7 +2827,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2852,7 +2865,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3001,7 +3014,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3193,7 +3206,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3247,7 +3260,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3328,6 +3341,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3374,7 +3388,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3389,9 +3403,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3412,7 +3433,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3437,6 +3458,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3464,10 +3486,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3484,7 +3513,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3498,7 +3526,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3507,7 +3535,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3538,6 +3566,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3619,7 +3649,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3650,7 +3680,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3664,6 +3694,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3677,7 +3708,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3997,7 +4028,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4054,7 +4085,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4261,7 +4292,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4295,7 +4326,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4307,6 +4338,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4351,7 +4383,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4365,7 +4397,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4393,7 +4425,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4409,7 +4441,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4461,7 +4493,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4486,11 +4518,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4627,26 +4661,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4749,7 +4781,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4773,7 +4805,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4794,6 +4826,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4837,6 +4870,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4910,7 +4945,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4943,6 +4978,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5019,6 +5055,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5146,7 +5183,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5198,13 +5234,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5278,7 +5314,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5441,7 +5476,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5474,14 +5509,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5501,7 +5536,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5531,7 +5566,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5546,7 +5581,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5642,7 +5679,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5653,8 +5690,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5695,8 +5732,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5758,7 +5795,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5795,6 +5832,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6069,6 +6108,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6078,7 +6119,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6120,6 +6161,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6338,8 +6380,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6355,7 +6397,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6394,13 +6436,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6468,25 +6510,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6518,8 +6561,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6574,7 +6617,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6725,7 +6768,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6755,7 +6798,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6823,14 +6866,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6926,8 +6969,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6940,7 +6983,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7071,7 +7114,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7102,8 +7145,8 @@ msgid "Reporting"
 msgstr "Informes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7192,7 +7235,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7203,7 +7246,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7238,13 +7281,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7271,13 +7315,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7294,7 +7338,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7344,7 +7388,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7392,13 +7436,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7442,7 +7488,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7454,15 +7500,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7608,13 +7654,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7666,7 +7713,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7679,7 +7726,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7760,7 +7807,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7822,7 +7869,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7868,7 +7915,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7890,7 +7937,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7977,7 +8024,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8105,7 +8152,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8191,10 +8238,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8227,7 +8276,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8250,7 +8299,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8335,7 +8384,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8441,7 +8490,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8454,7 +8503,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8527,7 +8576,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8562,12 +8611,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8586,7 +8637,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8672,7 +8723,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8719,7 +8770,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8735,7 +8786,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8767,8 +8818,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8783,6 +8832,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8803,6 +8853,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8822,7 +8873,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8887,6 +8938,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8962,7 +9014,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8984,7 +9036,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -9006,7 +9057,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9062,7 +9113,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9123,6 +9174,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9179,6 +9231,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9186,6 +9239,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9228,7 +9282,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9287,7 +9341,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9324,6 +9378,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9422,9 +9477,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9586,6 +9643,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9633,7 +9691,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9669,6 +9727,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9689,6 +9748,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9703,7 +9763,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9713,6 +9775,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9866,6 +9930,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9899,6 +9964,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9916,7 +9983,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9952,8 +10019,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10069,8 +10138,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10096,7 +10165,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10286,6 +10355,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10359,6 +10429,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/es_CR.po b/addons/account/i18n/es_CR.po
index 4eb1177e32b..e51d78cbd28 100644
--- a/addons/account/i18n/es_CR.po
+++ b/addons/account/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: account
@@ -147,6 +147,7 @@ msgstr "Conciliar"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referencia"
 
@@ -165,13 +166,13 @@ msgstr ""
 "eliminarlo."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diario varios"
@@ -236,7 +237,7 @@ msgstr ""
 "relacionado con este código de impuesto."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -253,7 +254,7 @@ msgid "Belgian Reports"
 msgstr "Informes Belgas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "No puede añadir/modificar asientos en un diario cerrado."
@@ -302,7 +303,7 @@ msgid "St."
 msgstr "Ext."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -601,8 +602,10 @@ msgid "The accountant confirms the statement."
 msgstr "El contable confirma el extracto."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -661,7 +664,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "¡La secuencia principal debe ser diferente de la actual!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -673,7 +676,7 @@ msgid "Tax Code Amount"
 msgstr "Importe código impuesto"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "VEN"
@@ -700,8 +703,8 @@ msgid "Journal Period"
 msgstr "Periodo diario"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -782,6 +785,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "¡Sólo puede cambiar la moneda para facturas en borrador!"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Informe financiero"
@@ -797,12 +801,13 @@ msgstr "Informe financiero"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -936,12 +941,13 @@ msgid "Create 3 Months Periods"
 msgstr "Crear períodos trimestrales"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Debido"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1026,7 +1032,7 @@ msgstr ""
 "contendrá el monto de base imponible (sin impuesto)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "No se puede localizar un padre para la cuenta de la plantilla"
@@ -1059,10 +1065,10 @@ msgid "Code"
 msgstr "Código"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1128,7 +1134,7 @@ msgstr ""
 "tipo contiene más información acerca de la cuenta y sus especificidades."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1176,7 +1182,7 @@ msgstr "Apuntes contables descuadrados"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banco"
@@ -1274,7 +1280,7 @@ msgid "The move of this entry line."
 msgstr "El asiento de este apunte."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1297,7 +1303,7 @@ msgid "Entry Label"
 msgstr "Etiqueta asiento"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1383,14 +1389,15 @@ msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Seleccione un periodo inicial y final"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Pérdidas y Ganancias"
 
@@ -1445,6 +1452,7 @@ msgid "Journal Items Analysis"
 msgstr "Análisis elementos diario"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Empresas"
@@ -1469,8 +1477,10 @@ msgid "Central Journal"
 msgstr "Diario central"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1706,6 +1716,7 @@ msgid "Separated Journal Sequences"
 msgstr "Secuencias de diarios separadas"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Responsable"
@@ -1736,7 +1747,7 @@ msgid "Year Sum"
 msgstr "Suma del año"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1815,7 +1826,7 @@ msgid "Customer Ref:"
 msgstr "Ref. cliente:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "¡El usuario %s no tienen derechos para acceder al diario %s !"
@@ -2151,7 +2162,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2182,7 +2193,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Buscar plantillas de plan contable"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2239,7 +2250,7 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ACOMPRA"
@@ -2258,7 +2269,7 @@ msgid "Income Account"
 msgstr "Cuenta de ingresos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "¡No se ha definido un diario contable de tipo Venta/Compra!"
@@ -2298,6 +2309,7 @@ msgstr "Plantilla de producto"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2307,6 +2319,7 @@ msgstr "Plantilla de producto"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2357,7 +2370,7 @@ msgid "Account Line"
 msgstr "Linea de asiento"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2393,7 +2406,7 @@ msgid "Main Sequence"
 msgstr "Secuencia principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2469,7 +2482,7 @@ msgid "Account Tax Code"
 msgstr "Código impuesto contable"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2563,7 +2576,7 @@ msgid "Account Model Entries"
 msgstr "Contabilidad. Líneas de modelo"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "COMPRA"
@@ -2631,7 +2644,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "Reconcilia linea de asiento (desajuste)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2663,7 +2675,7 @@ msgid "Accounts"
 msgstr "Cuentas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "¡Error de configuración!"
@@ -2787,6 +2799,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Saldos vencidos de empresa"
@@ -2839,14 +2852,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Este asistente creará asientos contables recurrentes"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "¡No se ha definido una secuencia en el diario!"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2957,7 +2970,7 @@ msgid "Base Code Amount"
 msgstr "Importe código base"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2972,7 +2985,7 @@ msgid "Default Sale Tax"
 msgstr "Impuesto de venta por defecto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Factura '%s' es validada."
@@ -3013,7 +3026,7 @@ msgid "Fiscal Position"
 msgstr "Posición fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3168,7 +3181,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3372,7 +3385,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "¡No se ha definido empresa!"
@@ -3428,7 +3441,7 @@ msgid "Chart of Tax"
 msgstr "Plan de impuestos"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "¡El balance cerrado debería ser el mismo que el balance calculado!"
@@ -3513,6 +3526,7 @@ msgstr "Cantidad:"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Longitud del periodo (días)"
 
@@ -3559,7 +3573,7 @@ msgid "Detail"
 msgstr "Detalle"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3578,9 +3592,16 @@ msgid "VAT :"
 msgstr "CIF/NIF:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3601,7 +3622,7 @@ msgid "Centralised counterpart"
 msgstr "Homólogo centralizado"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3629,6 +3650,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3656,10 +3678,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Fecha"
 
@@ -3676,7 +3705,6 @@ msgstr "Romper conciliación"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3690,7 +3718,7 @@ msgid "Chart of Accounts Template"
 msgstr "Plantilla del plan contable"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3702,7 +3730,7 @@ msgstr ""
 "¡Por favor, defina la empresa en él!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "¡Algunos asientos ya están conciliados!"
@@ -3733,6 +3761,8 @@ msgstr "Presupuestos"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "No filtros"
 
@@ -3817,7 +3847,7 @@ msgid "Analytic Items"
 msgstr "Apuntes analíticos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "¡No ha sido posible cambiar el impuesto!"
@@ -3848,7 +3878,7 @@ msgid "Mapping"
 msgstr "Asignaciones"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3865,6 +3895,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3878,7 +3909,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Informe de balance de comprobación de vencimientos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "No puede crear asientos en una cuenta %s %s cerrada"
@@ -4218,7 +4249,7 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4277,7 +4308,7 @@ msgid "Account Base Code"
 msgstr "Código base cuenta"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4492,7 +4523,7 @@ msgid "Allow Reconciliation"
 msgstr "Permitir conciliación"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4528,7 +4559,7 @@ msgid "Recurring Models"
 msgstr "Modelos recurrentes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Error de codificación"
@@ -4540,6 +4571,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Cambiar"
 
@@ -4584,7 +4616,7 @@ msgid "Example"
 msgstr "Ejemplo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4600,7 +4632,7 @@ msgid "Keep empty to use the income account"
 msgstr "Dejarlo vacío para usar la cuenta de ingresos"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Impuesto de compra %2f%%"
@@ -4628,7 +4660,7 @@ msgstr "Mapeo de cuentas"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -4644,7 +4676,7 @@ msgid "Cancelled Invoice"
 msgstr "Factura cancelada"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4701,7 +4733,7 @@ msgid "Income Account on Product Template"
 msgstr "Cuenta de ingresos en plantilla producto"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "Varios"
@@ -4728,11 +4760,13 @@ msgstr "Nuevo ejercicio fiscal"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Facturas"
 
@@ -4875,26 +4909,24 @@ msgid "Journal Items"
 msgstr "Apuntes contables"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -5005,7 +5037,7 @@ msgid "Beginning of Period Date"
 msgstr "Inicio de fecha de periodo"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -5032,7 +5064,7 @@ msgid "Child Tax Accounts"
 msgstr "Cuentas impuestos hijas"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Periodo inicial debería ser más pequeño que el periodo final"
@@ -5055,6 +5087,7 @@ msgstr "Balance analítico -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5098,6 +5131,8 @@ msgstr "Período: Unidad de tiempo"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Pagos"
 
@@ -5176,7 +5211,7 @@ msgid "Line 1:"
 msgstr "Línea 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "¡Error de integridad!"
@@ -5209,6 +5244,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Balance de situación"
@@ -5285,6 +5321,7 @@ msgstr "Informe"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5414,7 +5451,6 @@ msgstr "Contabilidad. Informe contable común"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Comunicación"
 
@@ -5467,13 +5503,13 @@ msgid "End of Year Entries Journal"
 msgstr "Diario asientos cierre del ejercicio"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5550,7 +5586,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Facturas y devoluciones de clientes"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5724,7 +5759,7 @@ msgid "Generate Opening Entries"
 msgstr "Generar asientos apertura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "¡Ya está conciliado!"
@@ -5757,14 +5792,14 @@ msgid "Child Accounts"
 msgstr "Cuentas hijas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Nombre del movimiento (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Desajuste"
@@ -5784,7 +5819,7 @@ msgstr "Ingreso"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Proveedor"
@@ -5814,7 +5849,7 @@ msgid "Account n°"
 msgstr "Cuenta n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referencia libre"
@@ -5829,7 +5864,9 @@ msgstr "Valoración"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Cuentas por Cobrar y por Pagar"
@@ -5937,7 +5974,7 @@ msgid "Filter by"
 msgstr "Filtrar por"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "¡Tiene una expressión errónea \"%(...)s\" en su modelo!"
@@ -5948,8 +5985,8 @@ msgid "Entry Date"
 msgstr "Fecha de Entrada"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "¡No puede utilizar una cuenta inactiva!"
@@ -5991,8 +6028,8 @@ msgid "Number of Days"
 msgstr "Número de días"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -6054,7 +6091,7 @@ msgid "Multipication factor for Base code"
 msgstr "Factor de multiplicación para código base"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "no implementado"
@@ -6093,6 +6130,8 @@ msgstr "Análisis asientos analíticos"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Anterior"
 
@@ -6382,6 +6421,8 @@ msgstr "Porcentaje"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Diario y Empresa"
 
@@ -6391,7 +6432,7 @@ msgid "Power"
 msgstr "Fuerza"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "No puede generar un código de diario que no ha sido usado"
@@ -6433,6 +6474,7 @@ msgid "Applicable Type"
 msgstr "Tipo aplicable"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Referencia factura"
@@ -6666,8 +6708,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "No puede borrar una cuenta que contiene asientos"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Asientos: "
@@ -6683,7 +6725,7 @@ msgid "Currency of the related account journal."
 msgstr "Moneda del diario relacionado"
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "No se ha podido crear movimiento entre diferentes compañías"
@@ -6732,13 +6774,13 @@ msgstr "Estado es borrador"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Total debe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "¡El asiento \"%s\" no es válido!"
@@ -6812,25 +6854,26 @@ msgstr "Pérdidas y ganancias (cuenta de gastos)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6862,8 +6905,8 @@ msgid "Printed"
 msgstr "Impreso"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Error:"
@@ -6926,7 +6969,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Mostrar informe libro mayor con una empresa por página."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -7093,7 +7136,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7130,7 +7173,7 @@ msgid "Taxes used in Sales"
 msgstr "Impuestos usados en ventas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7209,14 +7252,14 @@ msgid "Source Document"
 msgstr "Documento origen"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "¡No puede borrar un asiento asentado \"%s\"¡"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7324,8 +7367,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "¿Está seguro que desea abrir esta factura?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7340,7 +7383,7 @@ msgid "Opening Entries Expense Account"
 msgstr "Apuntes de apertura cuenta de gastos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Asientos contables"
@@ -7479,7 +7522,7 @@ msgstr ""
 "personalizada."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7511,8 +7554,8 @@ msgid "Reporting"
 msgstr "Informe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7609,7 +7652,7 @@ msgid "Sign on Reports"
 msgstr "Signo en informes"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr "El periodo para generar entradas abiertas no ha sido encontrado"
@@ -7620,7 +7663,7 @@ msgid "Root/View"
 msgstr "Raíz/Vista"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7655,13 +7698,14 @@ msgid "Optional Information"
 msgstr "Información opcional"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "El diario debe tener una cuenta haber y debe por defecto."
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7690,13 +7734,13 @@ msgid "Maturity Date"
 msgstr "Fecha vencimiento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "¡Cuenta incorrecta!"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Diario de ventas"
@@ -7713,7 +7757,7 @@ msgid "Invoice Tax"
 msgstr "Impuesto de factura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "¡Ningún trozo de número!"
@@ -7768,7 +7812,7 @@ msgstr "Hasta"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Ajustes de moneda"
@@ -7822,13 +7866,15 @@ msgstr "Mayo"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Cuentas por Pagar"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7875,7 +7921,7 @@ msgstr "Nombre del informe"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Efectivo"
@@ -7887,15 +7933,15 @@ msgid "Account Destination"
 msgstr "Cuenta destino"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -8052,13 +8098,14 @@ msgstr "Fijo"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "¡Atención!"
@@ -8110,7 +8157,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Seleccione una moneda a aplicar en la factura."
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -8125,7 +8172,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "No se puede %s factura borrador/proforma/cancelada."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "¡No hay líneas de factura!"
@@ -8210,7 +8257,7 @@ msgid "Deferral Method"
 msgstr "Método cierre"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "La factura '%s' está pagada."
@@ -8277,7 +8324,7 @@ msgid "Associated Partner"
 msgstr "Empresa asociada"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "¡Primero debe seleccionar una empresa!"
@@ -8336,7 +8383,7 @@ msgstr ""
 "de acuerdo a su país."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8359,7 +8406,7 @@ msgid "Choose Fiscal Year"
 msgstr "Seleccione el ejercicio fiscal"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diario de abono de compras"
@@ -8452,7 +8499,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8595,7 +8642,7 @@ msgid "current month"
 msgstr "Mes actual"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8683,10 +8730,12 @@ msgstr "Diario reintegro"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtrar por"
 
@@ -8723,7 +8772,7 @@ msgid "The partner account used for this invoice."
 msgstr "La cuenta de la empresa utilizada para esta factura."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Tax %.2f%%"
@@ -8746,7 +8795,7 @@ msgid "Payment Term Line"
 msgstr "Línea de plazo de pago"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diario de compras"
@@ -8834,7 +8883,7 @@ msgid "Unpaid Invoices"
 msgstr "Facturas impagadas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr "¡La forma de pago de proveedor no tiene una línea de forma de pago!"
@@ -8944,7 +8993,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Dejarlo vacío para abrir todos los ejercicios fiscales."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "¡El movimiento contable (%s) para centralización ha sido confirmado!"
@@ -8959,7 +9008,7 @@ msgstr ""
 "multi-divisa."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -9045,7 +9094,7 @@ msgid "Contact Address"
 msgstr "Dirección contacto"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "¡Modelo erroneo!"
@@ -9085,12 +9134,14 @@ msgstr "Contratos"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "desconocido"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diario asientos de apertura"
@@ -9112,7 +9163,7 @@ msgstr ""
 "calcula en el informe de Pérdidas y Ganancias."
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -9204,7 +9255,7 @@ msgid "Period from"
 msgstr "Período desde"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diario de abono de ventas"
@@ -9251,7 +9302,7 @@ msgid "Purchase Tax(%)"
 msgstr "Impuesto compra (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Cree algunas líneas de factura"
@@ -9267,7 +9318,7 @@ msgid "Display Detail"
 msgstr "Mostrar detalles"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "AVENTA"
@@ -9305,8 +9356,6 @@ msgstr "Fin de período"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Informes financieros"
@@ -9321,6 +9370,7 @@ msgstr "Informes financieros"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9341,6 +9391,7 @@ msgstr "Periodo inicial"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Dirección análisis"
 
@@ -9360,7 +9411,7 @@ msgstr "Vista de diario"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total haber"
@@ -9431,6 +9482,7 @@ msgstr "Extractos bancarios"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9512,7 +9564,7 @@ msgstr ""
 "cobrar\" de contrapartida."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Debe seleccionar las cuentas a conciliar"
@@ -9540,7 +9592,6 @@ msgstr ""
 "periodo específico."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filtros por"
@@ -9562,7 +9613,7 @@ msgid "Move"
 msgstr "Asiento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9622,7 +9673,7 @@ msgid "Consolidated Children"
 msgstr "Hijos consolidados"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9687,6 +9738,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9749,6 +9801,7 @@ msgstr "Asiento periódico"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9756,6 +9809,7 @@ msgstr "Asiento periódico"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9800,7 +9854,7 @@ msgid "Unreconciled"
 msgstr "No conciliado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "¡Total erróneo!"
@@ -9868,7 +9922,7 @@ msgid "Comparison"
 msgstr "Comparación"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Error desconocido"
@@ -9907,6 +9961,7 @@ msgstr "Validar movimiento contable"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10015,9 +10070,11 @@ msgstr "Apuntes analíticos de los últimos 30 días"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Periodos"
 
@@ -10188,6 +10245,7 @@ msgstr "Asentado"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10235,7 +10293,7 @@ msgid "No detail"
 msgstr "Sin detalles"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -10272,6 +10330,7 @@ msgid "Verification Total"
 msgstr "Validación total"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10292,6 +10351,7 @@ msgstr "Diario: Todos"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10306,7 +10366,9 @@ msgstr "Diario: Todos"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10316,6 +10378,8 @@ msgstr "Diario: Todos"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10480,6 +10544,7 @@ msgstr "Factura de proveedor"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10513,6 +10578,8 @@ msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Número de asiento"
 
@@ -10532,7 +10599,7 @@ msgstr ""
 "que contenga asientos!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "El asiento ya está conciliado"
@@ -10573,8 +10640,10 @@ msgstr ""
 "débito/crédito), cerradas para cuentas depreciadas."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Con movimientos"
@@ -10699,8 +10768,8 @@ msgid "Statistic Reports"
 msgstr "Informes estadísticos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "¡Cuenta incorrecta!"
@@ -10731,7 +10800,7 @@ msgid "Accounts Mapping"
 msgstr "Mapeo de cuentas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "La factura '%s' está esperando para validación."
@@ -10993,6 +11062,7 @@ msgstr "account.añadirplantilla.asistente"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -11071,6 +11141,8 @@ msgstr "Vencimiento"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Futuro"
 
diff --git a/addons/account/i18n/es_DO.po b/addons/account/i18n/es_DO.po
index 08141cff24b..e24ae3b8dfc 100644
--- a/addons/account/i18n/es_DO.po
+++ b/addons/account/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -147,6 +147,7 @@ msgstr "Reconciliar"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referencia"
 
@@ -165,13 +166,13 @@ msgstr ""
 "eliminarlo."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "¡Aviso!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diario varios"
@@ -231,7 +232,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -247,7 +248,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -293,7 +294,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -567,8 +568,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -624,7 +627,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -635,7 +638,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -662,8 +665,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -740,6 +743,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -755,12 +759,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -886,12 +891,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -969,7 +975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1002,10 +1008,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1067,7 +1073,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1115,7 +1121,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1207,7 +1213,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1228,7 +1234,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1313,14 +1319,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1375,6 +1382,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1399,8 +1407,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1625,6 +1635,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1653,7 +1664,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1726,7 +1737,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2045,7 +2056,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2069,7 +2080,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2118,7 +2129,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2137,7 +2148,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2177,6 +2188,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2186,6 +2198,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2236,7 +2249,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2267,7 +2280,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2341,7 +2354,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2422,7 +2435,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2481,7 +2494,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2513,7 +2525,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2633,6 +2645,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2680,14 +2693,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2790,7 +2803,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2803,7 +2816,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2841,7 +2854,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2988,7 +3001,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3180,7 +3193,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3234,7 +3247,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3315,6 +3328,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3361,7 +3375,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3376,9 +3390,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3399,7 +3420,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3424,6 +3445,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3451,10 +3473,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3471,7 +3500,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3485,7 +3513,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3494,7 +3522,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3525,6 +3553,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3606,7 +3636,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3637,7 +3667,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3651,6 +3681,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3664,7 +3695,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3984,7 +4015,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4041,7 +4072,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4248,7 +4279,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4282,7 +4313,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4294,6 +4325,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4338,7 +4370,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4352,7 +4384,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4380,7 +4412,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4396,7 +4428,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4448,7 +4480,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4473,11 +4505,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4614,26 +4648,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4736,7 +4768,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4760,7 +4792,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4781,6 +4813,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4824,6 +4857,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4897,7 +4932,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4930,6 +4965,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5006,6 +5042,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5133,7 +5170,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5185,13 +5221,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5265,7 +5301,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5428,7 +5463,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5461,14 +5496,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5488,7 +5523,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5518,7 +5553,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5533,7 +5568,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5629,7 +5666,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5640,8 +5677,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5682,8 +5719,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5745,7 +5782,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5782,6 +5819,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6055,6 +6094,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6064,7 +6105,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6104,6 +6145,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6322,8 +6364,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6339,7 +6381,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6378,13 +6420,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6452,25 +6494,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6502,8 +6545,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6558,7 +6601,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6709,7 +6752,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6739,7 +6782,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6807,14 +6850,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6910,8 +6953,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6924,7 +6967,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7055,7 +7098,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7086,8 +7129,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7176,7 +7219,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7187,7 +7230,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7222,13 +7265,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7255,13 +7299,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7278,7 +7322,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7328,7 +7372,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7376,13 +7420,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7426,7 +7472,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7438,15 +7484,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7592,13 +7638,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7650,7 +7697,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7663,7 +7710,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7737,7 +7784,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7799,7 +7846,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7845,7 +7892,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7867,7 +7914,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7954,7 +8001,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8082,7 +8129,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8161,10 +8208,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8197,7 +8246,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8220,7 +8269,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8305,7 +8354,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8411,7 +8460,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8424,7 +8473,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8497,7 +8546,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8532,12 +8581,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8556,7 +8607,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8642,7 +8693,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8689,7 +8740,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8705,7 +8756,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8737,8 +8788,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8753,6 +8802,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8773,6 +8823,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8792,7 +8843,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8857,6 +8908,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8932,7 +8984,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8954,7 +9006,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8976,7 +9027,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9032,7 +9083,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9093,6 +9144,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9149,6 +9201,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9156,6 +9209,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9198,7 +9252,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9257,7 +9311,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9294,6 +9348,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9392,9 +9447,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9556,6 +9613,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9603,7 +9661,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9639,6 +9697,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9659,6 +9718,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9673,7 +9733,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9683,6 +9745,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9836,6 +9900,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9869,6 +9934,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9886,7 +9953,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9922,8 +9989,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10039,8 +10108,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10066,7 +10135,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10256,6 +10325,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10329,6 +10399,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po
index 97c15d91fe9..82a67e8a676 100644
--- a/addons/account/i18n/es_EC.po
+++ b/addons/account/i18n/es_EC.po
@@ -10,14 +10,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-07-30 03:26+0000\n"
+"PO-Revision-Date: 2012-10-17 01:09+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -148,6 +148,7 @@ msgstr "Conciliar"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referencia"
 
@@ -166,13 +167,13 @@ msgstr ""
 "eliminarlo."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diario General"
@@ -237,7 +238,7 @@ msgstr ""
 "impuesto aparezca en las facturas."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Factura '%s' esta abonada: %s%s de %s%s (%s%s pendiente)"
@@ -253,7 +254,7 @@ msgid "Belgian Reports"
 msgstr "Reportes de Bélgica"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "No puede agregar/modificar asientos en un diario cerrado."
@@ -302,7 +303,7 @@ msgid "St."
 msgstr "Ext."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Cuenta de facturación no empatacon la de la compañía"
@@ -597,8 +598,10 @@ msgid "The accountant confirms the statement."
 msgstr "El contador confirma los estados de cuenta"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -656,7 +659,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "La secuencia principal debe ser diferente de la actual!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -668,7 +671,7 @@ msgid "Tax Code Amount"
 msgstr "Importe código impuesto"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "DV"
@@ -695,8 +698,8 @@ msgid "Journal Period"
 msgstr "Período de Diario"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -777,6 +780,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "You can only change currency for Draft Invoice !"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Reporte Financiero"
@@ -792,12 +796,13 @@ msgstr "Reporte Financiero"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -932,12 +937,13 @@ msgid "Create 3 Months Periods"
 msgstr "Crear períodos trimestrales"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Deuda"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1022,7 +1028,7 @@ msgstr ""
 "basic amount(without tax)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "No es posible localizar un código padre para la plantilla de cuenta"
@@ -1055,10 +1061,10 @@ msgid "Code"
 msgstr "Código"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1124,7 +1130,7 @@ msgstr ""
 "information about the account and its specificities."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1172,7 +1178,7 @@ msgstr "Elementos de Diario Descuadrados"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banco"
@@ -1270,7 +1276,7 @@ msgid "The move of this entry line."
 msgstr "El asiento de este apunte."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1293,7 +1299,7 @@ msgid "Entry Label"
 msgstr "Etiqueta"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "You can not modify/delete a journal with entries for this period !"
@@ -1378,14 +1384,15 @@ msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Seleccione un período de inicio y fin"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Pérdidas y Ganancias"
 
@@ -1440,6 +1447,7 @@ msgid "Journal Items Analysis"
 msgstr "Analisis de Diario"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Empresas"
@@ -1464,8 +1472,10 @@ msgid "Central Journal"
 msgstr "Diario central"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1702,6 +1712,7 @@ msgid "Separated Journal Sequences"
 msgstr "Secuencias de diarios separadas"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Responsable"
@@ -1732,7 +1743,7 @@ msgid "Year Sum"
 msgstr "Suma Anual"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1811,7 +1822,7 @@ msgid "Customer Ref:"
 msgstr "Cliente Ref:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "El usuario %s no tienen derechos para acceder al diario %s !"
@@ -2147,7 +2158,7 @@ msgid "Pro-forma"
 msgstr "Proforma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2178,7 +2189,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Buscar Plan de Cuentas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2235,7 +2246,7 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2254,7 +2265,7 @@ msgid "Income Account"
 msgstr "Cuenta de Ingreso"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "There is no Accounting Journal of type Sale/Purchase defined!"
@@ -2294,6 +2305,7 @@ msgstr "Plantilla de producto"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2303,6 +2315,7 @@ msgstr "Plantilla de producto"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2353,7 +2366,7 @@ msgid "Account Line"
 msgstr "Línea de Cuenta"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2389,7 +2402,7 @@ msgid "Main Sequence"
 msgstr "Secuencia principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2465,7 +2478,7 @@ msgid "Account Tax Code"
 msgstr "Cuenta de Codigo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2556,7 +2569,7 @@ msgid "Account Model Entries"
 msgstr "Línea de modelo de asiento"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "VENTA"
@@ -2624,7 +2637,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "Reconcilia linea de asiento (desajuste)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2656,7 +2668,7 @@ msgid "Accounts"
 msgstr "Cuentas contables"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Error de Configuración !"
@@ -2778,6 +2790,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Saldo de Empresa Vencido"
@@ -2830,14 +2843,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "This wizard will create recurring accounting entries"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "No sequence defined on the journal !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2946,7 +2959,7 @@ msgid "Base Code Amount"
 msgstr "Importe código base"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2961,7 +2974,7 @@ msgid "Default Sale Tax"
 msgstr "Impuestos por Defecto en Venta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Factura '%s' es validada."
@@ -3002,7 +3015,7 @@ msgid "Fiscal Position"
 msgstr "Tipos de Contribuyentes"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3157,7 +3170,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3360,7 +3373,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "No hay Empresa Definida !"
@@ -3416,7 +3429,7 @@ msgid "Chart of Tax"
 msgstr "Plan de Impuestos"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "¡El balance cerrado debería ser el mismo que el balance calculado!"
@@ -3501,6 +3514,7 @@ msgstr "Cantidad:"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Longitud del período (días)"
 
@@ -3547,7 +3561,7 @@ msgid "Detail"
 msgstr "Detalle"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3562,9 +3576,16 @@ msgid "VAT :"
 msgstr "IVA:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3585,7 +3606,7 @@ msgid "Centralised counterpart"
 msgstr "Homólogo centralizado"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3612,6 +3633,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3639,10 +3661,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Fecha"
 
@@ -3659,7 +3688,6 @@ msgstr "Romper conciliación"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3673,7 +3701,7 @@ msgid "Chart of Accounts Template"
 msgstr "Plantilla del plan contable"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3685,7 +3713,7 @@ msgstr ""
 "Please define partner on it!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Algunas entradas ya están conciliadas !"
@@ -3716,6 +3744,8 @@ msgstr "Presupuestos"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Sin Filtros"
 
@@ -3800,7 +3830,7 @@ msgid "Analytic Items"
 msgstr "Apuntes analíticos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "No se puede cambiar impuesto !"
@@ -3831,7 +3861,7 @@ msgid "Mapping"
 msgstr "Mapping"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3848,6 +3878,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3861,7 +3892,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Account Aged Trial balance Report"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "No puede crear asientos en una cuenta %s %s cerrada"
@@ -4200,7 +4231,7 @@ msgid "Month"
 msgstr "Month"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4259,7 +4290,7 @@ msgid "Account Base Code"
 msgstr "Account Base Code"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4473,7 +4504,7 @@ msgid "Allow Reconciliation"
 msgstr "Permitir conciliación"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4509,7 +4540,7 @@ msgid "Recurring Models"
 msgstr "Recurring Models"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Error de codificación"
@@ -4521,6 +4552,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Cambiar"
 
@@ -4565,7 +4597,7 @@ msgid "Example"
 msgstr "Ejemplo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4581,7 +4613,7 @@ msgid "Keep empty to use the income account"
 msgstr "Dejarlo vacío para usar la cuenta de ingresos"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Impuesto de compra %2f%%"
@@ -4609,7 +4641,7 @@ msgstr "Reemplazo de cuentas"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -4625,7 +4657,7 @@ msgid "Cancelled Invoice"
 msgstr "Facturas Canceladas"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4682,7 +4714,7 @@ msgid "Income Account on Product Template"
 msgstr "Cuentas de ingreso en platilla de productos"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "Varios"
@@ -4708,11 +4740,13 @@ msgstr "Nuevo Ejercicio Fiscal"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Facturas"
 
@@ -4855,26 +4889,24 @@ msgid "Journal Items"
 msgstr "Detalle de asientos Contables"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -4983,7 +5015,7 @@ msgid "Beginning of Period Date"
 msgstr "Inicio de fecha de período"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -5010,7 +5042,7 @@ msgid "Child Tax Accounts"
 msgstr "Cuentas de impuesto hijas"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Período Inicial debe ser menor que el final"
@@ -5032,6 +5064,7 @@ msgstr "Saldo analitico -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5075,6 +5108,8 @@ msgstr "Tipo de Período"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Pagos"
 
@@ -5153,7 +5188,7 @@ msgid "Line 1:"
 msgstr "Linea 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Error de Integridad !"
@@ -5186,6 +5221,7 @@ msgstr "Resultado de conciliación"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Hoja de Balance"
@@ -5262,6 +5298,7 @@ msgstr "Informe"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5391,7 +5428,6 @@ msgstr "Cuenta Comun de Reporte Contable"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Comunicación"
 
@@ -5444,13 +5480,13 @@ msgid "End of Year Entries Journal"
 msgstr "Diario asientos cierre del ejercicio"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5527,7 +5563,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Facturas y Notas de Crédito"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5701,7 +5736,7 @@ msgid "Generate Opening Entries"
 msgstr "Generar Asientos de Apertura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Ya está conciliado"
@@ -5734,14 +5769,14 @@ msgid "Child Accounts"
 msgstr "Cuentas hijas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Movimiento (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Ajuste"
@@ -5761,7 +5796,7 @@ msgstr "Ingreso"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Proveedor"
@@ -5791,7 +5826,7 @@ msgid "Account n°"
 msgstr "Cuenta n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Free Reference"
@@ -5806,7 +5841,9 @@ msgstr "Valuation"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Receivable and Payable Accounts"
@@ -5914,7 +5951,7 @@ msgid "Filter by"
 msgstr "Filter by"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "¡Tiene una expressión errónea \"%(...)s\" en su modelo!"
@@ -5925,8 +5962,8 @@ msgid "Entry Date"
 msgstr "Fecha de Entrada"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "You can not use an inactive account!"
@@ -5968,8 +6005,8 @@ msgid "Number of Days"
 msgstr "Número de días"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -6031,7 +6068,7 @@ msgid "Multipication factor for Base code"
 msgstr "Multipication factor for Base code"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "not implemented"
@@ -6070,6 +6107,8 @@ msgstr "Analytic Entries Analysis"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Past"
 
@@ -6358,6 +6397,8 @@ msgstr "Porcentaje"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Journal & Partner"
 
@@ -6367,7 +6408,7 @@ msgid "Power"
 msgstr "Power"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "No puede generar un código de diario que no ha sido usado"
@@ -6409,6 +6450,7 @@ msgid "Applicable Type"
 msgstr "Tipo aplicable"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Referencia factura"
@@ -6641,8 +6683,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "No puede borrar una cuenta que contiene asientos"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Entries: "
@@ -6658,7 +6700,7 @@ msgid "Currency of the related account journal."
 msgstr "Moneda del diario relacionado"
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Couldn't create move between different companies"
@@ -6707,13 +6749,13 @@ msgstr "State is draft"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Total debe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Entry \"%s\" is not valid !"
@@ -6787,25 +6829,26 @@ msgstr "Pérdidas y ganancias (cuenta de gastos)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6837,8 +6880,8 @@ msgid "Printed"
 msgstr "Impreso"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Error:"
@@ -6901,7 +6944,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Mostrar Mayor con Partner por Página"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -7067,7 +7110,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7105,7 +7148,7 @@ msgid "Taxes used in Sales"
 msgstr "Impuestos usados en ventas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7183,14 +7226,14 @@ msgid "Source Document"
 msgstr "Doc. Fuente"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "¡No puede borrar un asiento asentado \"%s\"¡"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7298,8 +7341,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Esta seguro de abrir esta factura ?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7314,7 +7357,7 @@ msgid "Opening Entries Expense Account"
 msgstr "Apuntes de cuenta de gastos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Entradas contables"
@@ -7327,7 +7370,7 @@ msgstr "Plantilla de cuenta padre"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Configure your Chart of Accounts"
-msgstr ""
+msgstr "Configurar su Plan de Cuentas"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7454,7 +7497,7 @@ msgstr ""
 "personalizada."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "You should have chosen periods that belongs to the same company"
@@ -7485,8 +7528,8 @@ msgid "Reporting"
 msgstr "Informes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7582,7 +7625,7 @@ msgid "Sign on Reports"
 msgstr "Signo en Reporte"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr "El período para generar entradas abiertas no ha sido encontrado"
@@ -7593,7 +7636,7 @@ msgid "Root/View"
 msgstr "Raíz/Vista"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7628,13 +7671,14 @@ msgid "Optional Information"
 msgstr "Información Opcional"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "El diario debe tener cuentas al debe y haber por defecto"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7663,13 +7707,13 @@ msgid "Maturity Date"
 msgstr "Fecha vencimiento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Error en cuenta !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Diario de Ventas"
@@ -7686,7 +7730,7 @@ msgid "Invoice Tax"
 msgstr "Impuestos de factura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "No piece number !"
@@ -7741,7 +7785,7 @@ msgstr "Para"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Ajustes de moneda"
@@ -7795,13 +7839,15 @@ msgstr "Mayo"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Cuentas por pagar"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7848,7 +7894,7 @@ msgstr "Nombre del informe"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Efectivo"
@@ -7860,15 +7906,15 @@ msgid "Account Destination"
 msgstr "Cuenta de destino"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -8025,13 +8071,14 @@ msgstr "Fijo"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Aviso !"
@@ -8083,7 +8130,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Seleccione una moneda para aplicar a la factura"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -8098,7 +8145,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "No puedes %s borrador/proforma/cancelar la factura."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "No hay detalle de Factura !"
@@ -8183,7 +8230,7 @@ msgid "Deferral Method"
 msgstr "Método cierre"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "La factura '%s' está pagada."
@@ -8231,7 +8278,7 @@ msgstr "Balance de Costos Invertido -"
 #. module: account
 #: view:account.move.bank.reconcile:0
 msgid "Open for Bank Reconciliation"
-msgstr ""
+msgstr "Abrir para conciliación bancaria"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -8250,7 +8297,7 @@ msgid "Associated Partner"
 msgstr "Empresa Asociada"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Primero debe seleccionar una empresa !"
@@ -8309,7 +8356,7 @@ msgstr ""
 "deacuerdo a tu pais."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8332,7 +8379,7 @@ msgid "Choose Fiscal Year"
 msgstr "Seleccionar Ejercicio Fiscal"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diario de Reembolso de Compras"
@@ -8422,10 +8469,10 @@ msgstr ""
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code for Taxes Included Prices"
-msgstr ""
+msgstr "Código para el cálculo de los impuestos en precios incluidos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8567,7 +8614,7 @@ msgid "current month"
 msgstr "Mes actual"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8655,10 +8702,12 @@ msgstr "Diario de Reembolsos"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtrar por"
 
@@ -8696,7 +8745,7 @@ msgid "The partner account used for this invoice."
 msgstr "La cuenta de la empresa utilizada para esta factura."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Impuestox %.2f%%"
@@ -8719,7 +8768,7 @@ msgid "Payment Term Line"
 msgstr "Línea de plazo de pago"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diario de Compra"
@@ -8806,7 +8855,7 @@ msgid "Unpaid Invoices"
 msgstr "Facturas sin Pagar"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr "¡La forma de pago de proveedor no tiene detalle de forma de pago!"
@@ -8915,7 +8964,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Vacío para todos los ejercicios fiscales abiertos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "El movimiento contable (%s) para centralización ha sido confirmado!"
@@ -8930,7 +8979,7 @@ msgstr ""
 "multi-divisa."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -9011,7 +9060,7 @@ msgid "Contact Address"
 msgstr "Dirección contacto"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "¡Modelo erróneo!"
@@ -9051,12 +9100,14 @@ msgstr "Contratos"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "Desconocido"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diario de Asiento de Apertura"
@@ -9078,7 +9129,7 @@ msgstr ""
 "Profilt & Loss Report"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Por favor defina la secuencia de diario relacionado ."
@@ -9099,7 +9150,7 @@ msgstr "Ventas de este año por tipo"
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for Period"
-msgstr ""
+msgstr "Resumen de Costos por Período"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -9169,7 +9220,7 @@ msgid "Period from"
 msgstr "Desde"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Sales Refund Journal"
@@ -9216,7 +9267,7 @@ msgid "Purchase Tax(%)"
 msgstr "Imp. de Compra (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Por favor crear algun detalle."
@@ -9232,7 +9283,7 @@ msgid "Display Detail"
 msgstr "Mostrar detalles"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9270,8 +9321,6 @@ msgstr "Final de período"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Informes financieros"
@@ -9286,6 +9335,7 @@ msgstr "Informes financieros"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9306,6 +9356,7 @@ msgstr "Período Inicial"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Dirección de Análisis"
 
@@ -9325,7 +9376,7 @@ msgstr "Vista de Diario"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total crédito"
@@ -9395,6 +9446,7 @@ msgstr "Extracto Bancario"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9475,7 +9527,7 @@ msgstr ""
 "related to this account and the counter-part \"Account receivable\"."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Debe seleccionar cuentas para conciliar"
@@ -9503,7 +9555,6 @@ msgstr ""
 "period."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filtrado Por"
@@ -9525,7 +9576,7 @@ msgid "Move"
 msgstr "Movimiento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "You can not change the tax, you should remove and recreate lines !"
@@ -9570,7 +9621,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconciliation Transactions"
-msgstr ""
+msgstr "Conciliación de transacciones"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
@@ -9584,7 +9635,7 @@ msgid "Consolidated Children"
 msgstr "Hijos Consolidados"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9649,6 +9700,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9675,7 +9727,7 @@ msgstr "Fecha Límite"
 #. module: account
 #: view:account.move.journal:0
 msgid "Standard Entries"
-msgstr ""
+msgstr "Asientos estándar"
 
 #. module: account
 #: help:account.journal,type:0
@@ -9711,6 +9763,7 @@ msgstr "Asiento periódico"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9718,6 +9771,7 @@ msgstr "Asiento periódico"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9762,7 +9816,7 @@ msgid "Unreconciled"
 msgstr "No conciliado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Total erróneo !"
@@ -9828,7 +9882,7 @@ msgid "Comparison"
 msgstr "Comparación"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Error Desconocido"
@@ -9867,6 +9921,7 @@ msgstr "Validar Asiento contable"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9971,9 +10026,11 @@ msgstr "Apuntes analíticos de los últimos 30 días"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Períodos"
 
@@ -10145,6 +10202,7 @@ msgstr "Contabilizado"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10192,7 +10250,7 @@ msgid "No detail"
 msgstr "Sin detalles"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -10229,6 +10287,7 @@ msgid "Verification Total"
 msgstr "Validación total"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10249,6 +10308,7 @@ msgstr "Diario: Todos"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10263,7 +10323,9 @@ msgstr "Diario: Todos"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10273,6 +10335,8 @@ msgstr "Diario: Todos"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10437,6 +10501,7 @@ msgstr "Factura de Proveedor"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10470,6 +10535,8 @@ msgstr "Error ! No puede crear cuentas recursivas"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Número de asiento"
 
@@ -10489,7 +10556,7 @@ msgstr ""
 "que contenga asientos!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Entrada ya esta conciliada"
@@ -10530,8 +10597,10 @@ msgstr ""
 "débito/crédito), cerradas para cuentas depreciadas."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Con movimientos"
@@ -10636,7 +10705,7 @@ msgstr ""
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on Invoices"
-msgstr ""
+msgstr "Descripción en facturas"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
@@ -10654,8 +10723,8 @@ msgid "Statistic Reports"
 msgstr "Reportes Estadisticos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Error en Cuenta !"
@@ -10686,7 +10755,7 @@ msgid "Accounts Mapping"
 msgstr "Intercambio de Cuentas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "La factura '%s' está esperando validación"
@@ -10946,6 +11015,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -11024,6 +11094,8 @@ msgstr "Vencimiento"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Futuro"
 
diff --git a/addons/account/i18n/es_MX.po b/addons/account/i18n/es_MX.po
index 395bb31dec1..fd9514b4164 100644
--- a/addons/account/i18n/es_MX.po
+++ b/addons/account/i18n/es_MX.po
@@ -1,55 +1,49 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-08-17 23:12+0000\n"
-"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-10-15 22:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-17 05:00+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "last month"
+msgstr ""
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr "Sistema de pagos"
+msgstr ""
 
 #. module: account
 #: view:account.journal:0
 msgid "Other Configuration"
-msgstr "Otra configuración"
-
-#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr "No hay ningún diario de cierre definido para el ejercicio fiscal"
-
-#. module: account
-#: code:addons/account/account.py:506
-#, python-format
-msgid ""
-"You cannot remove/deactivate an account which is set as a property to any "
-"Partner."
 msgstr ""
-"No se puede eliminar/desactivar una cuenta que está vinculada a una empresa."
+
+#. module: account
+#: help:account.tax.code,sequence:0
+msgid ""
+"Determine the display order in the report 'Accounting \\ Reporting \\ "
+"Generic Reporting \\ Taxes \\ Taxes Report'"
+msgstr ""
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "Conciliar asiento contable"
-
-#. module: account
-#: field:account.installer.modules,account_voucher:0
-msgid "Voucher Management"
-msgstr "Gestión de recibos"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -57,68 +51,58 @@ msgstr "Gestión de recibos"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Statistics"
-msgstr "Estadísticas de cuentas"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma/Open/Paid Invoices"
+msgstr ""
 
 #. module: account
-#: field:account.invoice,residual:0
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr "Pendiente"
-
-#. module: account
-#: code:addons/account/invoice.py:785
-#, python-format
-msgid "Please define sequence on invoice journal"
-msgstr "Defina una secuencia en el diario de la factura"
+msgstr ""
 
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "¡Error! La duración de el/los período(s) no es válida. "
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr "Moneda contable"
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr "Definición hijos"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:302
+#, python-format
+msgid "Journal item \"%s\" is not valid."
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr "A cobrar vencidos hasta hoy"
-
-#. module: account
-#: field:account.partner.ledger,reconcil:0
-msgid "Include Reconciled Entries"
-msgstr "Incluir asientos conciliados"
-
-#. module: account
-#: view:account.pl.report:0
-msgid ""
-"The Profit and Loss report gives you an overview of your company profit and "
-"loss in a single document"
 msgstr ""
-"El informe de pérdidas y ganancias (P&G) le da una visión global de las "
-"pérdidas y ganancias de su empresa en un único documento"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
-msgstr "Importar desde factura o pago"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
 msgid "wizard.multi.charts.accounts"
-msgstr "wizard.multi.charts.accounts"
+msgstr ""
 
 #. module: account
 #: view:account.move:0
 msgid "Total Debit"
-msgstr "Total debe"
+msgstr ""
 
 #. module: account
 #: view:account.unreconcile:0
@@ -126,51 +110,44 @@ msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
 msgstr ""
-"Si rompe la conciliación de transacciones, también debe verificar todas la "
-"acciones que están relacionadas con esas transacciones porqué no serán "
-"deshabilitadas."
 
 #. module: account
-#: report:account.tax.code.entries:0
-msgid "Accounting Entries-"
-msgstr "Asientos contables"
-
-#. module: account
-#: code:addons/account/account.py:1291
-#, python-format
-msgid "You can not delete posted movement: \"%s\"!"
-msgstr "¡No puede eliminar el movimiento asentado: \"%s\"!"
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 #: field:account.invoice.line,origin:0
 msgid "Origin"
-msgstr "Origen"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
-#: field:account.account,reconcile:0
 #: view:account.automatic.reconcile:0
 #: field:account.move.line,reconcile_id:0
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr "Conciliar"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
 #: field:account.entries.report,ref:0
+#: view:account.invoice:0
 #: field:account.move,ref:0
-#: view:account.move.line:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
-msgstr "Referencia"
+msgstr ""
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr "Seleccione el ejercicio fiscal "
+msgstr ""
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -178,41 +155,40 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar el plazo de pago sin "
-"eliminarlo."
 
 #. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
-msgstr "¡Aviso!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3129
+#, python-format
+msgid "Miscellaneous Journal"
+msgstr ""
 
 #. 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 "Origen cuenta"
+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 "Todos los asientos analíticos"
+msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas en los últimos 15 días"
-
-#. module: account
-#: selection:account.account.type,sign:0
-msgid "Negative"
-msgstr "Negativo"
+#: field:accounting.report,label_filter:0
+msgid "Column Label"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr "Diario: %s"
+msgstr ""
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -221,44 +197,22 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
-"Indica el tipo de diario analítico. Cuando se necesita para un documento "
-"(por ej. una factura) para crear asientos analíticos, OpenERP buscará un "
-"diario coincidente del mismo tipo."
 
 #. 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 "Plantillas impuestos"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr "contabilidad.impuesto"
-
-#. module: account
-#: code:addons/account/account.py:901
-#, python-format
-msgid ""
-"No period defined for this date: %s !\n"
-"Please create a fiscal year."
 msgstr ""
-"¡No se ha definido un periodo para esta fecha: %s !\n"
-"Cree un ejercicio fiscal."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "Seleccionar conciliación línea movimiento"
-
-#. module: account
-#: help:account.model.line,sequence:0
-msgid ""
-"The sequence field is used to order the resources from lower sequences to "
-"higher ones"
 msgstr ""
-"El campo secuencia se utiliza para ordenar los recursos secuencialmente de "
-"menor a mayor."
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -267,76 +221,79 @@ msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
 msgstr ""
-"Marque esta opción si desea que no aparezca en las facturas ningún IVA "
-"relacionado con este código de impuesto."
 
 #. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
-"La factura '%s' está parcialmente pagada: %s%s de %s%s (%s%s pendiente)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr "Los asientos contables son una entrada de la conciliación."
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
 msgid "Belgian Reports"
-msgstr "Informes Belgas"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
-msgstr "No puede añadir/modificar asientos en un diario cerrado."
+msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "Calculated Balance"
-msgstr "Saldo calculado"
+#: help:account.account,user_type:0
+msgid ""
+"Account Type is used for information purpose, to generate country-specific "
+"legal reports, and set the rules to close a fiscal year and generate opening "
+"entries."
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr "Recurrencia manual"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscalyear"
-msgstr "Cerrar ejercicio fiscal"
+msgstr ""
 
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
 msgid "Allow write off"
-msgstr "Permitir desfase"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr "Seleccione el período de análisis"
+msgstr ""
 
 #. module: account
 #: view:account.move.line:0
 msgid "St."
-msgstr "Ext."
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
-"Compañía de la cuenta de la línea de factura no concuerda con la compañía de "
-"la factura."
 
 #. module: account
 #: field:account.journal.column,field:0
 msgid "Field Name"
-msgstr "Nombre del campo"
+msgstr ""
 
 #. module: account
 #: help:account.installer,charts:0
@@ -344,8 +301,6 @@ msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
 msgstr ""
-"Instala el plan contable de la localización que satisface las necesidades "
-"contables de su compañía basadas en su país."
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -356,27 +311,30 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
-"No se encuentra ningún diario contable del tipo %s para esta compañía.\n"
-"\n"
-"Puede crear un diario en el menú: \n"
-"Configuración/Contabilidad financiera/Cuentas/Diarios."
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr "Desconciliar cuenta"
+msgstr ""
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr "Propiedades de compra"
+msgstr ""
+
+#. module: account
+#: help:account.financial.report,style_overwrite:0
+msgid ""
+"You can set up here the format you want this record to be displayed. If you "
+"leave the automatic formatting, it will be computed based on the financial "
+"reports hierarchy (auto-computed field 'level')."
+msgstr ""
 
 #. module: account
 #: view:account.installer:0
-#: view:account.installer.modules:0
 msgid "Configure"
-msgstr "Configurar"
+msgstr ""
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -385,7 +343,7 @@ msgstr "Configurar"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr "Junio"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -394,45 +352,47 @@ msgid ""
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
 msgstr ""
-"Los contables utilizan esta vista para introducir asientos masivamente en "
-"OpenERP. Cuando utiliza los extractos bancarios, registros de caja, o pagos "
-"de cliente/proveedor OpenERP crea automáticamente apuntes contables."
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
-msgstr "cuenta.impuesto.plantilla"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr "cuenta.banco.cuentas.asistente"
+msgstr ""
 
 #. module: account
 #: field:account.move.line,date_created:0
 #: field:account.move.reconcile,create_date:0
 msgid "Creation date"
-msgstr "Fecha creación"
+msgstr ""
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "Abono de compra"
+msgstr ""
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Opening/Closing Situation"
-msgstr "Situación apertura/cierre"
+msgstr ""
 
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "La divisa utilizada para introducir asientos."
+msgstr ""
 
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr "Ejercicio fiscal a abrir"
+msgstr ""
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -440,40 +400,39 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
-"Este campo contiene la información relacionada con la numeración de los "
-"asientos de este diario."
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
 msgid "Default Debit Account"
-msgstr "Cuenta deudora por defecto"
+msgstr ""
 
 #. module: account
 #: view:account.move:0
 msgid "Total Credit"
-msgstr "Total crédito"
-
-#. module: account
-#: selection:account.account.type,sign:0
-msgid "Positive"
-msgstr "Positivo"
+msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open for Unreconciliation"
-msgstr "Abrir para romper conciliación"
+msgstr ""
 
 #. module: account
+#: field:account.account.template,chart_template_id:0
 #: 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 "Plantilla plan contable"
+msgstr ""
 
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr "El importe expresado en otra divisa opcional."
+msgstr ""
+
+#. module: account
+#: field:accounting.report,enable_filter:0
+msgid "Enable Comparison"
+msgstr ""
 
 #. module: account
 #: help:account.journal.period,state:0
@@ -482,9 +441,6 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
-"Cuando se crea el periodo de diario. El estado es 'Borrador'. Si se imprime "
-"un informe, se cambiará el estado a 'Impreso'. Cuando todas las "
-"transacciones se completen, se cambiará el estado a \"Listo\"."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -494,12 +450,6 @@ msgid ""
 "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."
 msgstr ""
-"La tabla impuestos es una vista en árbol reflejando la estructura de tipos "
-"impositivos (o códigos de impuesto) y muestra la situación impositiva "
-"actual. La tabla de impuestos representa la cantidad económica "
-"correspondiente a cada código de la declaración de impuestos de su país. Se "
-"representa en una estructura jerárquica, que puede ser modificada de acuerdo "
-"a sus necesidades."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -509,13 +459,13 @@ msgstr ""
 #: report:account.central.journal:0
 #: view:account.entries.report:0
 #: field:account.entries.report,journal_id:0
-#: report:account.general.ledger:0
 #: view:account.invoice:0
 #: field:account.invoice,journal_id:0
 #: view:account.invoice.report:0
 #: field:account.invoice.report,journal_id:0
 #: field:account.journal.period,journal_id:0
 #: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: view:account.model:0
 #: field:account.model,journal_id:0
 #: view:account.move:0
@@ -523,35 +473,32 @@ msgstr ""
 #: field:account.move.bank.reconcile,journal_id:0
 #: view:account.move.line:0
 #: field:account.move.line,journal_id:0
-#: code:addons/account/account_move_line.py:983
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,journal_id:0
 #: model:ir.actions.report.xml,name:account.account_journal
 #: model:ir.model,name:account.model_account_journal
 #: field:validate.account.move,journal_id:0
-#, python-format
 msgid "Journal"
-msgstr "Diario"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
 msgid "Confirm the selected invoices"
-msgstr "Confirmar las facturas seleccionadas"
+msgstr ""
 
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr "Destino padre"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr "Cuenta utilizada en este diario"
+msgstr ""
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
 #: help:account.balance.report,chart_account_id:0
-#: help:account.bs.report,chart_account_id:0
 #: help:account.central.journal,chart_account_id:0
 #: help:account.common.account.report,chart_account_id:0
 #: help:account.common.journal.report,chart_account_id:0
@@ -560,77 +507,77 @@ msgstr "Cuenta utilizada en este diario"
 #: help:account.general.journal,chart_account_id:0
 #: help:account.partner.balance,chart_account_id:0
 #: help:account.partner.ledger,chart_account_id:0
-#: help:account.pl.report,chart_account_id:0
 #: help:account.print.journal,chart_account_id:0
 #: help:account.report.general.ledger,chart_account_id:0
 #: help:account.vat.declaration,chart_account_id:0
+#: help:accounting.report,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr "Seleccionar plan contable."
+msgstr ""
 
 #. module: account
-#: view:product.product:0
-msgid "Purchase Taxes"
-msgstr "Impuestos de compras"
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr "Abono factura"
+msgstr ""
 
 #. module: account
 #: report:account.overdue:0
 msgid "Li."
-msgstr "Li."
+msgstr ""
 
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "Transacciones no conciliadas"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:348
-#, python-format
-msgid "CashBox Balance is not matching with Calculated Balance !"
-msgstr "¡El saldo de caja no coincide con el saldo calculado!"
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr ""
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr "Mapeo impuestos"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr "Cerrar un ejercicio fiscal"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr "El contable confirma el extracto."
+msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
-#: selection:account.bs.report,display_account:0
 #: selection:account.common.account.report,display_account:0
-#: selection:account.pl.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
-msgstr "Todas"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.report,address_invoice_id:0
 msgid "Invoice Address Name"
-msgstr "Nombre dirección factura"
+msgstr ""
 
 #. module: account
 #: selection:account.installer,period:0
 msgid "3 Monthly"
-msgstr "Trimestral"
+msgstr ""
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -638,166 +585,198 @@ 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 ""
-"Si rompe la conciliación de las transacciones, también debe verificar todas "
-"las acciones que están relacionadas con estas transacciones, ya que no se "
-"desactivarán."
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "   30 Days   "
-msgstr "   30 Días   "
+msgstr ""
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
 msgid "Sequences"
-msgstr "Secuencias"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,account_report_id:0
+#: selection:account.financial.report,type:0
+msgid "Report Value"
+msgstr ""
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Taxes Mapping"
-msgstr "Mapeo de impuestos"
+msgstr ""
 
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr "Diario centralizado"
+msgstr ""
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr "¡La secuencia principal debe ser diferente de la actual!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1266
+#, python-format
+msgid "No period found or more than one period found for the given date."
+msgstr ""
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr "Importe código impuesto"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2779
-#: code:addons/account/installer.py:434
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
-msgstr "VEN"
-
-#. module: account
-#: help:account.bank.statement,balance_end_real:0
-msgid "closing balance entered by the cashbox verifier"
-msgstr "cerrando balance introducido por el verificador de caja"
+msgstr ""
 
 #. module: account
 #: view:account.period:0
 #: view:account.period.close:0
 msgid "Close Period"
-msgstr "Cerrar período"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr "Rapport du compte commun partenaire"
+msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr "Período asientos de apertura"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr "Periodo diario"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
-"Para conciliar los asientos, la compañía debería ser la misma para todos los "
-"asientos"
 
 #. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:302
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Cuentas a cobrar"
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr "Informe del libro mayor"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr "Reabrir"
+msgstr ""
 
 #. module: account
 #: view:account.use.model:0
 msgid "Are you sure you want to create entries?"
-msgstr "¿Está seguro que desea crear los asientos?"
+msgstr ""
 
 #. module: account
-#: selection:account.bank.accounts.wizard,account_type:0
-msgid "Check"
-msgstr "Comprobar"
+#: view:account.invoice:0
+msgid "Print Invoice"
+msgstr ""
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr "Empresas conciliadas hoy"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Sale journal in this year"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "Display children with hierarchy"
+msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
-msgstr "Porcentaje"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr "Planes contables"
+msgstr ""
 
 #. module: account
 #: code:addons/account/project/wizard/project_account_analytic_line.py:47
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr "Asientos analíticos por línea"
+msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: field:account.invoice.refund,filter_refund:0
+msgid "Refund Method"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr "¡Sólo puede cambiar la moneda para facturas en borrador!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
+#: model:ir.ui.menu,name:account.menu_account_report
+msgid "Financial Report"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.journal:0
 #: field:account.analytic.journal,type:0
 #: field:account.bank.statement.line,type:0
+#: field:account.financial.report,type:0
 #: field:account.invoice,type:0
 #: view:account.invoice.report:0
 #: field:account.invoice.report,type:0
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
-msgstr "Tipo"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:747
+#, python-format
+msgid ""
+"Taxes are missing!\n"
+"Click on compute button."
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr "Contabilidad. Línea de subscripción"
+msgstr ""
 
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr "La referencia de la empresa de esta factura."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Supplier Invoices And Refunds"
+msgstr ""
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -805,27 +784,36 @@ msgstr "La referencia de la empresa de esta factura."
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
-msgstr "No conciliación"
+msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_account_analytic_Journal_report
+#: view:account.payment.term.line:0
+msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
-msgstr "Contabilidad. Diario analítico"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr "Conciliación automática"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Due date Computation"
-msgstr "Cálculo fecha vencimiento"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr "C.Diario / Nombre mov."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_gain_loss
+msgid ""
+"When doing multi-currency transactions, you may loose or gain some amount "
+"due to changes of exchange rate. This menu gives you a forecast of the Gain "
+"or Loss you'd realized if those transactions were ended today. Only for "
+"accounts having a secondary currency set."
+msgstr ""
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -834,83 +822,86 @@ msgstr "C.Diario / Nombre mov."
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "September"
-msgstr "Septiembre"
+msgstr ""
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "days"
-msgstr "días"
+msgstr ""
 
 #. module: account
 #: help:account.account.template,nocreate:0
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
-msgstr "Si está marcado, el nuevo plan contable no lo contendrá por defecto."
+msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_invoice_refund.py:110
 #, python-format
 msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
 msgstr ""
-"No se puede %s factura que ya está conciliada, primero debería romper la "
-"conciliación de la factura. Sólo puede hacer un abono (factura "
-"rectificativa) de esta factura."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
 msgid "New Subscription"
-msgstr "Nueva suscripción"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Computation"
-msgstr "Cálculo"
-
-#. module: account
-#: view:account.move.line:0
-msgid "Next Partner to reconcile"
-msgstr "Próxima empresa a conciliar"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1191
-#, 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!"
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: refund invoice and reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,delay_to_pay:0
 msgid "Avg. Delay To Pay"
-msgstr "Retraso promedio a pagar"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_chart
 #: 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 "Tabla de impuestos"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr "Crear períodos trimestrales"
+msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
-msgstr "Debido"
+msgstr ""
 
 #. module: account
-#: view:account.invoice.report:0
-#: field:account.invoice.report,price_total_tax:0
-msgid "Total With Tax"
-msgstr "Total con impuestos"
+#: code:addons/account/account.py:1353
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:835
+#, python-format
+msgid ""
+"This account does not allow reconciliation! You should update the account "
+"definition to change this."
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
@@ -918,49 +909,53 @@ msgstr "Total con impuestos"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Approve"
-msgstr "Aprobar"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.move:0
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr "Importe total"
+msgstr ""
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Consolidation"
-msgstr "Consolidación"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_liability
+#: model:account.financial.report,name:account.account_financial_report_liability0
+#: model:account.financial.report,name:account.account_financial_report_liabilitysum0
+msgid "Liability"
+msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0
 #: view:account.entries.report:0
-#: view:account.invoice.report:0
-#: view:account.move.line:0
 msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr "Diario centralizado"
+msgstr ""
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr "Abono ventas"
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr "Extracto bancario"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr "Línea de movimiento"
+msgstr ""
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -969,19 +964,22 @@ msgid ""
 "amount.If the tax account is base tax code, this field will contain the "
 "basic amount(without tax)."
 msgstr ""
-"Si la cuenta es un una cuenta de tipo impositivo, este campo contendrá el "
-"monto del impuesto. Si la cuenta es un tipo base impositiva, el campo "
-"contendrá el monto de base imponible (sin impuesto)."
+
+#. module: account
+#: code:addons/account/account.py:2613
+#, python-format
+msgid "I can not locate a parent code for the template account!"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr "Compras"
+msgstr ""
 
 #. module: account
 #: field:account.model,lines_id:0
 msgid "Model Entries"
-msgstr "Asientos del modelo"
+msgstr ""
 
 #. module: account
 #: field:account.account,code:0
@@ -998,18 +996,17 @@ msgstr "Asientos del modelo"
 #: report:account.partner.balance:0
 #: field:account.period,code:0
 msgid "Code"
-msgstr "Código"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2083
-#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
-#: code:addons/account/wizard/account_use_model.py:81
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_bank_statement.py:357
+#: code:addons/account/account_invoice.py:73
+#: code:addons/account/account_invoice.py:697
+#: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "¡No diario analítico!"
+msgstr ""
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1018,115 +1015,140 @@ msgstr "¡No diario analítico!"
 #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
 #: model:ir.ui.menu,name:account.menu_account_partner_balance_report
 msgid "Partner Balance"
-msgstr "Balance de empresa"
+msgstr ""
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
 msgid "Account Name."
-msgstr "Nombre cuenta."
+msgstr ""
 
 #. module: account
 #: field:account.chart.template,property_reserve_and_surplus_account:0
 #: field:res.company,property_reserve_and_surplus_account:0
 msgid "Reserve and Profit/Loss Account"
-msgstr "Cuenta de reservas y pérdidas/ganancias"
+msgstr ""
 
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr "Semana del año"
+msgstr ""
 
 #. module: account
-#: field:account.bs.report,display_type:0
-#: field:account.pl.report,display_type:0
 #: field:account.report.general.ledger,landscape:0
 msgid "Landscape Mode"
-msgstr "Modo horizontal"
+msgstr ""
 
 #. module: account
-#: view:board.board:0
-msgid "Customer Invoices to Approve"
-msgstr "Facturas de cliente para aprobar"
+#: code:addons/account/account.py:645
+#, python-format
+msgid ""
+"You cannot change the type of account from '%s' to '%s' type as it contains "
+"journal items!"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort by"
+msgstr ""
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr "Seleccione un ejercicio fiscal para cerrar."
+msgstr ""
 
 #. module: account
-#: help:account.account,user_type:0
 #: help:account.account.template,user_type:0
 msgid ""
 "These types are defined according to your country. The type contains more "
 "information about the account and its specificities."
 msgstr ""
-"Estos tipos se definen de acuerdo a la legislación contable de su país. El "
-"tipo contiene más información acerca de la cuenta y sus especificidades."
+
+#. module: account
+#: code:addons/account/account_move_line.py:856
+#, python-format
+msgid ""
+"You have to provide an account for the write off/exchange difference entry !"
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr "Opciones para su aplicación"
+msgstr ""
 
 #. module: account
 #: report:account.partner.balance:0
 msgid "In dispute"
-msgstr "A cuadrar"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model:ir.ui.menu,name:account.journal_cash_move_lines
 msgid "Cash Registers"
-msgstr "Registros de caja"
-
-#. module: account
-#: selection:account.account.type,report_type:0
-msgid "Profit & Loss (Expense Accounts)"
-msgstr "Pérdidas y Ganancias (cuentas de gastos)"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "-"
-msgstr "-"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.account:0
+#: model:res.groups,name:account.group_account_manager
 msgid "Manager"
-msgstr "Responsable"
+msgstr ""
 
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr "Generar asientos antes:"
+msgstr ""
 
 #. module: account
+#: view:account.move.line:0
+msgid "Unbalanced Journal Items"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
+#: code:addons/account/account.py:3020
+#, python-format
 msgid "Bank"
-msgstr "Banco"
+msgstr ""
 
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr "Inicio del periodo"
+msgstr ""
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr "Confirmar extracto"
+msgstr ""
+
+#. module: account
+#: help:account.account,foreign_balance:0
+msgid ""
+"Total amount (in Secondary currency) for transactions held in secondary "
+"currency for this account."
+msgstr ""
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr "Impuesto sustitución"
+msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Credit Centralisation"
-msgstr "Centralización del haber"
+msgstr ""
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "All Months Sales by type"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1136,20 +1158,27 @@ msgid ""
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
-"Con las facturas de proveedor puede introducir y gestionar facturas emitidas "
-"por sus proveedores. OpenERP también puede generar borradores de factura "
-"automáticamente desde pedidos o albaranes de compra. De esta forma, puede "
-"contrastar la factura de su proveedor con lo comprado o recibido."
+
+#. 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 ""
 
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr "Cancelar facturas"
+msgstr ""
 
 #. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Transacciones no conciliadas"
+#: help:account.journal,code:0
+msgid "The code will be displayed on reports."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Taxes used in Purchases"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1157,50 +1186,66 @@ msgstr "Transacciones no conciliadas"
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr "Código impuesto"
+msgstr ""
 
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr "Tasa de divisas de salida"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr ""
 
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "El asiento de este apunte."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1317
+#, python-format
+msgid ""
+"You can not use this general account in this journal, check the tab 'Entry "
+"Controls' on the related journal !"
+msgstr ""
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
 msgid "# of Transaction"
-msgstr "# de transacción"
+msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
-#: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Entry Label"
-msgstr "Etiqueta asiento"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
-"¡No puede modificar/eliminar un diario con asientos para este período!"
 
 #. module: account
 #: help:account.invoice,origin:0
 #: help:account.invoice.line,origin:0
 msgid "Reference of the document that produced this invoice."
-msgstr "Referencia del documento que ha creado esta factura."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
 #: view:account.journal:0
 msgid "Others"
-msgstr "Otros"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Draft Subscription"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -1212,9 +1257,11 @@ msgstr "Otros"
 #: field:account.entries.report,account_id:0
 #: field:account.invoice,account_id:0
 #: field:account.invoice.line,account_id:0
+#: view:account.invoice.report:0
 #: field:account.invoice.report,account_id:0
 #: field:account.journal,account_control_ids:0
 #: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model.line,account_id:0
 #: view:account.move.line:0
 #: field:account.move.line,account_id:0
@@ -1227,24 +1274,25 @@ msgstr "Otros"
 #: model:ir.model,name:account.model_account_account
 #: field:report.account.sales,account_id:0
 msgid "Account"
-msgstr "Cuenta"
+msgstr ""
 
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr "Incluido en importe base"
+msgstr ""
 
 #. module: account
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.action_account_entries_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
 msgid "Entries Analysis"
-msgstr "Análisis asientos"
+msgstr ""
 
 #. module: account
 #: field:account.account,level:0
+#: field:account.financial.report,level:0
 msgid "Level"
-msgstr "Nivel"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -1259,74 +1307,76 @@ msgstr "Nivel"
 #: model:ir.ui.menu,name:account.menu_tax_report
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr "Impuestos"
+msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr "Seleccione un periodo inicial y final"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
+msgid "Profit and Loss"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr "Plantillas para cuentas"
+msgstr ""
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr "Buscar plantilla impuestos"
-
-#. module: account
-#: report:account.invoice:0
-msgid "Your Reference"
-msgstr "Su referencia"
+msgstr ""
 
 #. module: account
 #: view:account.move.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_reconcile_select
 #: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
 msgid "Reconcile Entries"
-msgstr "Conciliar los asientos"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr "Pagos fuera de plazo"
+msgstr ""
 
 #. module: account
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Initial Balance"
-msgstr "Saldo inicial"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 msgid "Reset to Draft"
-msgstr "Cambiar a borrador"
+msgstr ""
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Bank Information"
-msgstr "Información bancaria"
+msgstr ""
 
 #. module: account
 #: view:account.aged.trial.balance:0
 #: view:account.common.report:0
 msgid "Report Options"
-msgstr "Opciones del informe"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr "Análisis elementos diario"
+msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
-msgstr "Empresas"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1335,94 +1385,74 @@ msgstr "Empresas"
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "Extracto bancario"
-
-#. module: account
-#: view:res.partner:0
-msgid "Bank account owner"
-msgstr "Titular de la cuenta bancaria"
+msgstr ""
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr "Cuenta a cobrar"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr "Diario central"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
-#, python-format
-msgid "You can not use this general account in this journal !"
-msgstr "¡No puede usar esta cuenta general en este diario!"
-
-#. module: account
-#: selection:account.balance.report,display_account:0
-#: selection:account.bs.report,display_account:0
-#: selection:account.common.account.report,display_account:0
-#: selection:account.partner.balance,display_partner:0
-#: selection:account.pl.report,display_account:0
-#: selection:account.report.general.ledger,display_account:0
 #: report:account.account.balance:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
 #: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: selection:account.partner.balance,display_partner:0
+#: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
-msgstr "Con balance si no es igual a 0"
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr "Buscar impuestos"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
 msgid "Account Analytic Cost Ledger"
-msgstr "Contabilidad. Diario de costes analíticos"
+msgstr ""
 
 #. module: account
 #: view:account.model:0
 msgid "Create entries"
-msgstr "Crear asientos"
+msgstr ""
 
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr "Nº de elementos"
+msgstr ""
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
 msgid "Maximum write-off amount"
-msgstr "Importe máximo de desajuste"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 msgid "Compute Taxes"
-msgstr "Calcular impuestos"
+msgstr ""
 
 #. module: account
+#: field:account.chart.template,code_digits:0
 #: field:wizard.multi.charts.accounts,code_digits:0
 msgid "# of Digits"
-msgstr "Núm. de dígitos"
+msgstr ""
 
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr "Omitir estado 'Borrador' para asientos manuales."
+msgstr ""
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,price_total:0
 msgid "Total Without Tax"
-msgstr "Total base"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1432,51 +1462,29 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
-"Un asiento de diario se compone de varias anotaciones, cada una de las "
-"cuales es una operación al debe o al haber. OpenERP crea automáticamente un "
-"asiento por cada documento contable: factura, factura rectificativa (abono), "
-"pago a proveedor, extractos de cuenta bancaria, etc."
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr "Nº de asientos "
+msgstr ""
+
+#. module: account
+#: help:account.fiscal.position,active:0
+msgid ""
+"By unchecking the active field, you may hide a fiscal position without "
+"deleting it."
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr "Una tabla temporal utilizada para la vista de tablero"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr "Facturas rectificativas de proveedor"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid ""
-"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
 msgstr ""
-"Por ejemplo: a 14 días netos 2 por ciento, importe restante a 30 días fin de "
-"mes."
-
-#. module: account
-#: code:addons/account/invoice.py:815
-#, python-format
-msgid ""
-"Cannot create the invoice !\n"
-"The payment term defined gives a computed amount greater than the total "
-"invoiced amount."
-msgstr ""
-"¡No se puede crear la factura!\n"
-"El plazo de pago definido genera un importe superior que el importe total "
-"facturado."
-
-#. module: account
-#: field:account.installer.modules,account_anglo_saxon:0
-msgid "Anglo-Saxon Accounting"
-msgstr "Contabilidad anglo-sajona"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1487,89 +1495,81 @@ msgstr "Contabilidad anglo-sajona"
 #: selection:account.fiscalyear,state:0
 #: selection:account.period,state:0
 msgid "Closed"
-msgstr "Cierre"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr "Asientos recurrentes"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr "Plantilla para posición fiscal"
-
-#. module: account
-#: model:account.tax.code,name:account.account_tax_code_0
-msgid "Tax Code Test"
-msgstr "Test código impuesto"
+msgstr ""
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr "Transacciones conciliadas"
+msgstr ""
 
 #. module: account
 #: field:account.journal.view,columns_id:0
 msgid "Columns"
-msgstr "Columnas"
+msgstr ""
 
 #. module: account
 #: report:account.overdue:0
 msgid "."
-msgstr "."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "and Journals"
-msgstr "y diarios"
+msgstr ""
 
 #. module: account
 #: field:account.journal,groups_id:0
 msgid "Groups"
-msgstr "Grupos"
+msgstr ""
 
 #. module: account
 #: field:account.invoice,amount_untaxed:0
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr "Base"
+msgstr ""
 
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to Next Partner"
-msgstr "Ir a la siguiente empresa"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr "Buscar extractos bancarios"
+msgstr ""
 
 #. module: account
-#: sql_constraint:account.model.line:0
-msgid ""
-"Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+#: view:account.move.line:0
+msgid "Unposted Journal Items"
 msgstr ""
-"¡Valores debe o haber incorrectos en el modelo (debe + haber debe ser mayor "
-"que \"0\")!"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr "Cuenta a pagar"
+msgstr ""
 
 #. module: account
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Cuenta impuestos de reintegros"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Líneas extracto"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1581,29 +1581,23 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
-"Un extracto de cuenta bancaria es un resumen de todas las transacciones "
-"financieras ocurridas en un periodo de tiempo en una cuenta de depósito, una "
-"tarjeta de crédito o cualquier otro tipo de cuenta financiera. El balance "
-"inicial será propuesto automáticamente y el balance de cierre se basará en "
-"su extracto. Situándose sobre la columna Pagos de una línea, puede pulsar F1 "
-"para abrir el formulario de conciliación."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr "Fecha/Código"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,general_account_id:0
 msgid "General Account"
-msgstr "Cuenta general"
+msgstr ""
 
 #. module: account
 #: field:res.partner,debit_limit:0
 msgid "Payable Limit"
-msgstr "Límite a pagar"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -1613,39 +1607,29 @@ msgstr "Límite a pagar"
 #: model:ir.model,name:account.model_account_invoice
 #: model:res.request.link,name:account.req_link_invoice
 msgid "Invoice"
-msgstr "Factura"
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr "Costes analíticos a facturar"
+msgstr ""
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequence"
-msgstr "Secuencia ejercicio fiscal"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr "Secuencias de diarios separadas"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr "Responsable"
-
-#. module: account
-#: report:account.overdue:0
-msgid "Sub-Total :"
-msgstr "Subtotal :"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Ventas por tipo de cuenta"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1653,39 +1637,34 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
-"Cancelar factura: Crea la factura de abono (rectificativa), la valida y "
-"concilia para cancelar la factura actual."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr "Facturación"
+msgstr ""
 
 #. module: account
-#: field:account.chart.template,tax_code_root_id:0
-msgid "Root Tax Code"
-msgstr "Código impuesto raíz"
-
-#. module: account
-#: field:account.partner.ledger,initial_balance:0
-#: field:account.report.general.ledger,initial_balance:0
-msgid "Include initial balances"
-msgstr "Incluir balances iniciales"
+#: code:addons/account/report/account_partner_balance.py:115
+#, python-format
+msgid "Unknown Partner"
+msgstr ""
 
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
-msgstr "Suma del año"
+msgstr ""
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr "Imprimir recibo"
+#: code:addons/account/account_invoice.py:1431
+#, python-format
+msgid ""
+"You selected an Unit of Measure which is not compatible with the product."
+msgstr ""
 
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr "Este asistente cambiará la moneda de la factura"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1694,25 +1673,16 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
-"Muestra el plan de cuentas de su compañía por ejercicio fiscal y filtrado "
-"por periodo. Obtiene una vista en árbol completa de todos los asientos por "
-"código de cuenta que puede expandir haciendo clic sobre una cuenta."
 
 #. module: account
-#: constraint:account.fiscalyear:0
-msgid "Error! You cannot define overlapping fiscal years"
-msgstr "¡Error! No puede definir ejercicios fiscales que se superpongan"
+#: view:account.analytic.account:0
+msgid "Pending Accounts"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
-#, python-format
-msgid "The account is not defined to be reconciled !"
-msgstr "¡No se ha definido la cuenta como conciliable!"
-
-#. module: account
-#: field:account.cashbox.line,pieces:0
-msgid "Values"
-msgstr "Valores"
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr ""
 
 #. module: account
 #: help:account.journal.period,active:0
@@ -1720,226 +1690,196 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
-"Si el campo activo está establecido a falso, le permitirá ocultar el período "
-"de diario sin borrarlo."
 
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
-msgstr "Debe del proveedor"
-
-#. module: account
-#: help:account.model.line,quantity:0
-msgid "The optional quantity on entries"
-msgstr "La cantidad opcional en los asientos"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
 msgid "Receivables & Payables"
-msgstr "Cuentas a cobrar y pagar"
-
-#. module: account
-#: code:addons/account/account_move_line.py:815
-#, python-format
-msgid "You have to provide an account for the write off entry !"
-msgstr "¡Debe indicar una cuenta para el asiento de ajuste!"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr "Contabilidad. Informe diario común"
+msgstr ""
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr "Todas empresas"
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr "Ref. :"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr "Planes de cuentas analíticas"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
+#: view:analytic.entries.report:0
 msgid "My Entries"
-msgstr "Mis asientos"
+msgstr ""
 
 #. module: account
 #: report:account.overdue:0
 msgid "Customer Ref:"
-msgstr "Ref. cliente:"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr "¡El usuario %s no tienen derechos para acceder al diario %s !"
+msgstr ""
 
 #. module: account
 #: help:account.period,special:0
 msgid "These periods can overlap."
-msgstr "Estos períodos se pueden solapar."
+msgstr ""
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr "Extracto borrador"
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Credit Notes"
-msgstr "Declaración de impuestos: Facturas rectificativas"
-
-#. module: account
-#: code:addons/account/account.py:499
-#, python-format
-msgid "You cannot deactivate an account that contains account moves."
-msgstr "No puede desactivar una cuenta que contiene asientos contables."
+msgstr ""
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
-msgstr "Importe haber"
-
-#. module: account
-#: constraint:account.move.line:0
-msgid "You can not create move line on closed account."
-msgstr "No puede crear una línea de movimiento en una cuenta cerrada."
-
-#. module: account
-#: code:addons/account/account.py:519
-#, python-format
-msgid ""
-"You cannot change the type of account from 'Closed' to any other type which "
-"contains account entries!"
 msgstr ""
-"¡No puede cambiar el tipo de cuenta de 'Cerrado' a cualquier otro tipo si "
-"contiene asientos contables!"
 
 #. module: account
-#: view:res.company:0
-msgid "Reserve And Profit/Loss Account"
-msgstr "Cuenta de reservas y pérdidas/ganancias"
+#: code:addons/account/account.py:407
+#: code:addons/account/account.py:412
+#: code:addons/account/account.py:429
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr "¡Valor haber o debe erróneo en el asiento contable!"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
 msgid "Invoices Analysis"
-msgstr "Análisis de facturas"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr "cierre periodo"
+msgstr ""
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure Fiscal Year"
-msgstr "Configurar ejercicio fiscal"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr "Asientos por línea"
+msgstr ""
 
 #. module: account
-#: report:account.tax.code.entries:0
-msgid "A/c Code"
-msgstr "Código cuenta"
+#: field:account.vat.declaration,based_on:0
+msgid "Based on"
+msgstr ""
 
 #. module: account
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr "Asiento contable"
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Invoices"
-msgstr "Declaración de impuestos: Facturas"
+msgstr ""
 
 #. module: account
 #: field:account.cashbox.line,subtotal:0
 msgid "Sub Total"
-msgstr "Subtotal"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
+#: view:account.treasury.report:0
+#: model:ir.actions.act_window,name:account.action_account_treasury_report_all
+#: model:ir.model,name:account.model_account_treasury_report
+#: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
 msgid "Treasury Analysis"
-msgstr "Análisis de tesorería"
+msgstr ""
 
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
+msgid "Sale/Purchase Journal"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr "Cuenta analítica"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:332
+#: code:addons/account/account_bank_statement.py:339
 #, python-format
 msgid "Please verify that an account is defined in the journal."
-msgstr "Compruebe que se ha definido una cuenta en el diario."
+msgstr ""
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
 #: selection:account.move.line,state:0
 msgid "Valid"
-msgstr "Válido"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
 #: model:ir.model,name:account.model_account_print_journal
 msgid "Account Print Journal"
-msgstr "Contabilidad. Imprimir diario"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr "Categoría de producto"
+msgstr ""
 
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "/"
-msgstr "/"
-
-#. module: account
-#: field:account.bs.report,reserve_account_id:0
-msgid "Reserve & Profit/Loss Account"
-msgstr "Cuenta de Reservas y Pérdidas/Ganancias"
-
-#. module: account
-#: help:account.bank.statement,balance_end:0
-msgid "Closing balance based on Starting Balance and Cash Transactions"
 msgstr ""
-"Saldo de cierre calculado a partir del balance inicial y las transiciones de "
-"caja."
+
+#. module: account
+#: help:res.company,property_reserve_and_surplus_account:0
+msgid ""
+"This account is used for transferring Profit/Loss (If It is Profit: Amount "
+"will be added, Loss : Amount will be deducted.), as calculated in Profit & "
+"Loss Report"
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Comparison between accounting and payment entries"
-msgstr "Comparación entre asientos contables y de pago"
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Definition"
-msgstr "Definición de impuestos"
+msgstr ""
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -1947,8 +1887,6 @@ msgid ""
 "Check this box if you want to use a different sequence for each created "
 "journal. Otherwise, all will use the same sequence."
 msgstr ""
-"Marque esta opción si desea utilizar una secuencia diferente para cada "
-"diario creado. De lo contrario, todos utilizarán la misma secuencia."
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -1957,8 +1895,6 @@ msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
 msgstr ""
-"Añade la columna de moneda si la moneda es distinta de la moneda de la "
-"compañía."
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -1966,31 +1902,37 @@ msgid ""
 "If set to True then do not accept the entry if the entry date is not into "
 "the period dates"
 msgstr ""
-"Si se marca esta opción no acepta asientos que la fecha del asiento no esté "
-"dentro de las fechas del periodo."
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_pl_report
-msgid "Account Profit And Loss"
-msgstr "Cuenta de pérdidas y ganancias"
+#: code:addons/account/account_invoice.py:73
+#, python-format
+msgid "You must define an analytic journal of type '%s'!"
+msgstr ""
 
 #. module: account
 #: field:account.installer,config_logo:0
-#: field:account.installer.modules,config_logo:0
 #: field:wizard.multi.charts.accounts,config_logo:0
 msgid "Image"
-msgstr "Imagen"
+msgstr ""
 
 #. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr "Cancelado"
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_financial_report_tree
+msgid "Makes a generic system to draw financial reports easily."
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr "Base imponible"
+msgstr ""
 
 #. module: account
 #: help:account.tax,active:0
@@ -1998,57 +1940,66 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
-"Si el campo activo está desmarcardo, le permitirá ocultar el impuesto sin "
-"eliminarlo."
 
 #. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
+#: view:account.analytic.line:0
+msgid "Analytic Journal Items related to a sale journal."
 msgstr ""
-"si le da un nombre distinto de /, su asiento contable tendrá el mismo nombre "
-"que el extracto. Esto permite que los asientos del extracto tengan las "
-"mismas referencias que el extracto en sí"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_unreconcile
-#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
-#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
-msgid "Unreconcile Entries"
-msgstr "Romper conciliación de los asientos"
+#: selection:account.financial.report,style_overwrite:0
+msgid "Italic Text (smaller)"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print.sale.purchase:0
+msgid "VAT Declaration"
+msgstr ""
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr "Apuntes de conciliación parcial"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
+#: field:account.treasury.report,fiscalyear_id:0
 msgid "Fiscalyear"
-msgstr "Ejercicio fiscal"
+msgstr ""
 
 #. module: account
 #: view:account.journal.select:0
 #: view:project.account.analytic.line:0
 msgid "Open Entries"
-msgstr "Abrir asientos"
+msgstr ""
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr "Cuentas a conciliar"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr "Importa al sistema un extracto desde un fichero electrónico"
+msgstr ""
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import from invoice"
-msgstr "Importa desde factura"
+msgstr ""
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2057,22 +2008,22 @@ msgstr "Importa desde factura"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr "Enero"
+msgstr ""
 
 #. module: account
 #: view:account.journal:0
 msgid "Validations"
-msgstr "Validaciones"
+msgstr ""
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr "Este ejercicio fiscal"
+msgstr ""
 
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr "Plan de impuestos contables"
+msgstr ""
 
 #. module: account
 #: constraint:account.period:0
@@ -2080,8 +2031,12 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
-"¡Periodo inválido! Algunos periodos se superponen o la fecha del periodo no "
-"está dentro del intervalo del ejercicio fiscal. "
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:357
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr ""
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2089,26 +2044,17 @@ msgstr ""
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr "Pro-forma"
+msgstr ""
 
 #. module: account
-#: code:addons/account/installer.py:348
-#, python-format
-msgid " Journal"
-msgstr " Diario"
-
-#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
 msgstr ""
-"No se ha definido una cuenta debe por defecto \n"
-"en el diario \"%s\""
 
 #. module: account
-#: help:account.account,type:0
 #: help:account.account.template,type:0
 #: help:account.entries.report,type:0
 msgid ""
@@ -2118,16 +2064,33 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for depreciated "
 "accounts."
 msgstr ""
-"Esta clasificación se utiliza para diferenciar tipos con efectos especiales "
-"en OpenERP: vista no puede tener asientos, consolidación son cuentas que "
-"pueden tener cuentas hijas para consolidaciones multi-empresa, "
-"pagable/cobrable son para cuentas de empresas (para los cálculos de crédito "
-"/ débito), cerrado es para cuentas de depreciación."
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Search Chart of Account Templates"
-msgstr "Buscar plantillas de plan contable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1292
+#, python-format
+msgid ""
+"Can not create an automatic sequence for this piece!\n"
+"Put a sequence in the journal definition for automatic numbering or create a "
+"sequence manually for this piece."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:787
+#, python-format
+msgid ""
+"You can not modify the company of this journal as its related record exist "
+"in journal items"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Customer Code"
+msgstr ""
 
 #. module: account
 #: view:account.installer:0
@@ -2136,9 +2099,6 @@ msgid ""
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
 msgstr ""
-"El plan contable por defecto se ajusta a su selección de país. Si no existe "
-"un plan contable certificado para el país especificado, se puede instalar "
-"uno genérico que será seleccionado por defecto."
 
 #. module: account
 #: view:account.account.type:0
@@ -2157,91 +2117,107 @@ msgstr ""
 #: field:analytic.entries.report,name:0
 #: field:report.invoice.created,name:0
 msgid "Description"
-msgstr "Descripción"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2844
-#: code:addons/account/installer.py:498
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
-msgstr "ACOMPRA"
+msgstr ""
 
 #. module: account
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr "En proceso"
+msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
 #: field:product.category,property_account_income_categ:0
 #: field:product.template,property_account_income:0
 msgid "Income Account"
-msgstr "Cuenta de ingresos"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr "¡No se ha definido un diario contable de tipo Venta/Compra!"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr ""
 
 #. module: account
 #: view:product.category:0
 msgid "Accounting Properties"
-msgstr "Propiedades de contabilidad"
+msgstr ""
 
 #. module: account
-#: report:account.journal.period.print:0
-#: field:account.print.journal,sort_selection:0
-#: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 msgid "Entries Sorted By"
-msgstr "Asientos ordenados por"
+msgstr ""
 
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr "Cambiar a"
+msgstr ""
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr "Nº ctdad de productos "
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr "Plantilla de producto"
+msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
+#: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
+#: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: field:account.central.journal,fiscalyear_id:0
+#: field:account.common.account.report,fiscalyear_id:0
+#: field:account.common.journal.report,fiscalyear_id:0
+#: field:account.common.partner.report,fiscalyear_id:0
+#: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
+#: field:account.general.journal,fiscalyear_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.journal.period,fiscalyear_id:0
 #: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
+#: field:account.partner.balance,fiscalyear_id:0
+#: field:account.partner.ledger,fiscalyear_id:0
 #: field:account.period,fiscalyear_id:0
+#: field:account.print.journal,fiscalyear_id:0
+#: field:account.report.general.ledger,fiscalyear_id:0
 #: field:account.sequence.fiscalyear,fiscalyear_id:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: report:account.vat.declaration:0
+#: field:account.vat.declaration,fiscalyear_id:0
+#: field:accounting.report,fiscalyear_id:0
+#: field:accounting.report,fiscalyear_id_cmp:0
 #: model:ir.model,name:account.model_account_fiscalyear
 msgid "Fiscal Year"
-msgstr "Ejercicio fiscal"
+msgstr ""
 
 #. module: account
 #: help:account.aged.trial.balance,fiscalyear_id:0
 #: help:account.balance.report,fiscalyear_id:0
-#: help:account.bs.report,fiscalyear_id:0
 #: help:account.central.journal,fiscalyear_id:0
 #: help:account.common.account.report,fiscalyear_id:0
 #: help:account.common.journal.report,fiscalyear_id:0
@@ -2250,22 +2226,57 @@ msgstr "Ejercicio fiscal"
 #: help:account.general.journal,fiscalyear_id:0
 #: help:account.partner.balance,fiscalyear_id:0
 #: help:account.partner.ledger,fiscalyear_id:0
-#: help:account.pl.report,fiscalyear_id:0
 #: help:account.print.journal,fiscalyear_id:0
 #: help:account.report.general.ledger,fiscalyear_id:0
 #: help:account.vat.declaration,fiscalyear_id:0
+#: help:accounting.report,fiscalyear_id:0
+#: help:accounting.report,fiscalyear_id_cmp:0
 msgid "Keep empty for all open fiscal year"
-msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,account_line_id:0
+msgid "Account Line"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1485
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_review_financial_journals_installer
+msgid ""
+"Setup your accounting journals. For bank accounts, it's better to use the "
+"'Setup Your Bank Accounts' tool that will automatically create the accounts "
+"and journals for you."
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr "Asiento contable"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr "Secuencia principal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:403
+#, python-format
+msgid ""
+"In order to delete a bank statement, you must first cancel it to delete "
+"related journal items."
+msgstr ""
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2277,23 +2288,29 @@ msgstr "Secuencia principal"
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr "Plazo de pago"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Positions"
-msgstr "Posiciones fiscales"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
 
 #. module: account
 #: field:account.period.close,sure:0
 msgid "Check this box"
-msgstr "Marque esta opción"
+msgstr ""
 
 #. module: account
 #: view:account.common.report:0
 msgid "Filters"
-msgstr "Filtros"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2308,35 +2325,27 @@ msgstr "Filtros"
 #: selection:report.invoice.created,state:0
 #, python-format
 msgid "Open"
-msgstr "Abierto"
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr "Estado borrador de una factura"
-
-#. module: account
-#: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
-"Marque esta opción si el usuario se le permite conciliar asientos en esta "
-"cuenta."
 
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr "Conciliciación empresa"
+msgstr ""
 
 #. module: account
 #: field:account.tax,tax_code_id:0
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "Código impuesto contable"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2344,23 +2353,28 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
-"No se encuentra ningún diario del tipo %s para esta compañía.\n"
-"\n"
-"Debe crear uno en el menú: \n"
-"Configuración\\Contabilidad financiera\\Cuentas\\Diarios."
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_advance
+#: model:account.payment.term,note:account.account_payment_term_advance
+msgid "30% Advance End 30 Days"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Unreconciled entries"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr "Código base"
+msgstr ""
 
 #. module: account
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
 msgstr ""
-"Indica el orden de secuencia cuando se muestra una lista de impuestos de "
-"factura."
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2368,7 +2382,7 @@ msgstr ""
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr "Signo código base"
+msgstr ""
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2380,24 +2394,17 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
-"Este menú imprime una declaración de IVA basada en facturas o pagos. "
-"Seleccione uno o varios periodos del ejercicio fiscal. La información "
-"necesaria para la declaración de IVA es generada automáticamente por OpenERP "
-"a partir de las facturas (o pagos, en algunos países). Esta información se "
-"actualiza en tiempo real. Es muy útil porque le permite previsualizar en "
-"cualquier momento los impuestos que debe al principio y fin del mes o "
-"trimestre."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr "Centralización del debe"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr "Confirmar facturas borrador"
+msgstr ""
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2406,29 +2413,33 @@ msgstr "Confirmar facturas borrador"
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,day:0
 msgid "Day"
-msgstr "Día"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr "Cuentas a renovar"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr "Contabilidad. Líneas de modelo"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2796
-#: code:addons/account/installer.py:454
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
-msgstr "COMPRA"
+msgstr ""
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr "Impuestos proveedor"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -2439,26 +2450,21 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
-"Si utiliza los plazos de pago, la fecha de vencimiento será calculada "
-"automáticamente en la generación de los asientos contables. Si se mantiene "
-"el plazo de pago y la fecha de vencimiento vacía, significa que es un pago "
-"directo. El plazo de pago podrá calcular varias fechas de vencimiento, por "
-"ejemplo, 50% ahora, 50% en un mes."
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Select period"
-msgstr "Seleccionar período"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr "Declaraciones"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr "Mover nombre"
+msgstr ""
 
 #. module: account
 #: help:res.partner,property_account_position:0
@@ -2466,28 +2472,24 @@ msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
 msgstr ""
-"La posición fiscal calculará los impuestos y las cuentas contables "
-"utilizados para esta empresa."
 
 #. module: account
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
 msgstr ""
-"Este informe le proporciona una visión global sobre la situación de un "
-"diario específico"
 
 #. module: account
-#: constraint:product.category:0
-msgid "Error ! You can not create recursive categories."
-msgstr "¡Error! No puede crear categorías recursivas."
+#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
+msgid "Account move line reconcile (writeoff)"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr "Impuesto"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2498,10 +2500,12 @@ msgstr "Impuesto"
 #: field:account.move.line,analytic_account_id:0
 #: field:account.move.line.reconcile.writeoff,analytic_id:0
 msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
+#: field:account.financial.report,account_ids:0
+#: selection:account.financial.report,type:0
 #: view:account.journal:0
 #: model:ir.actions.act_window,name:account.action_account_form
 #: model:ir.ui.menu,name:account.account_account_menu
@@ -2509,120 +2513,118 @@ msgstr "Cuenta analítica"
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr "Cuentas"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
-msgstr "¡Error de configuración!"
+msgstr ""
 
 #. module: account
-#: view:account.invoice.report:0
 #: field:account.invoice.report,price_average:0
 msgid "Average Price"
-msgstr "Precio promedio"
+msgstr ""
 
 #. module: account
-#: report:account.move.voucher:0
 #: report:account.overdue:0
 msgid "Date:"
-msgstr "Fecha:"
-
-#. module: account
-#: code:addons/account/account.py:640
-#, python-format
-msgid ""
-"You cannot modify company of this journal as its related record exist in "
-"Entry Lines"
 msgstr ""
-"No puede modificar la compañía de este diario porqué ya contiene asientos"
 
 #. module: account
 #: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 msgid "Label"
-msgstr "Etiqueta"
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
+#: view:res.partner.bank:0
 msgid "Accounting Information"
-msgstr "Información contable"
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Special Computation"
-msgstr "Cálculo especial"
+msgstr ""
 
 #. module: account
 #: view:account.move.bank.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
 msgid "Bank reconciliation"
-msgstr "Conciliación bancaria"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 msgid "Disc.(%)"
-msgstr "Desc.(%)"
+msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
-#: report:account.journal.period.print:0
 #: report:account.overdue:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Ref"
-msgstr "Ref."
+msgstr ""
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or a tax code account."
 msgstr ""
-"La cuenta puede ser una cuenta de un código de impuesto base o de un código "
-"de impuesto."
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model, they must be positive!"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr "Conciliación automática"
+msgstr ""
 
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr "Pagado/Conciliado"
+msgstr ""
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr "Código base reintegro"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Extractos bancarios"
+msgstr ""
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr "Verdadero"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.common.report:0
 #: view:account.move:0
 #: view:account.move.line:0
+#: view:accounting.report:0
 msgid "Dates"
-msgstr "Fechas"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,parent_id:0
+msgid "Parent Chart Template"
+msgstr ""
 
 #. module: account
 #: field:account.tax,parent_id:0
 #: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
-msgstr "Cuenta impuestos padre"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not configured properly !"
+msgstr ""
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -2630,26 +2632,30 @@ msgid ""
 "Automatically generate entries based on what has been entered in the  system "
 "before a specific date."
 msgstr ""
-"Genera automáticamente los asientos a partir de lo que se ha entrado en el "
-"sistema antes de una fecha concreta."
 
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr "Saldos vencidos de empresa"
+msgstr ""
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries"
-msgstr "Asientos contables"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Communication Type"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr "Descuento (%)"
+msgstr ""
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -2660,65 +2666,69 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
-"Marque esta opción si no desea que los nuevos asientos pasen por el estado "
-"'No asentado' y por tanto vayan directamente al estado 'Asentado' sin "
-"ninguna validación manual. \n"
-"Tenga en cuenta que los apuntes creados automáticamente por el sistema "
-"siempre obvian ese estado."
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
 msgid "New Company Financial Setting"
-msgstr "Configuración financiera para nueva compañía"
+msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventas por cuenta"
+#: view:account.installer:0
+msgid "Configure Your Chart of Accounts"
+msgstr ""
 
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr "Este asistente creará asientos contables recurrentes"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
-msgstr "¡No se ha definido una secuencia en el diario!"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2083
-#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
-#: code:addons/account/wizard/account_use_model.py:81
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
+#: code:addons/account/account_move_line.py:173
 #, 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'!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:407
+#, python-format
+msgid ""
+"You need an Opening journal with centralisation checked to set the initial "
+"balance!"
+msgstr ""
 
 #. 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 "Códigos de impuestos"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Unrealized Gains and losses"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr "Clientes"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.journal:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
-msgstr "Periodo hasta"
+msgstr ""
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2727,30 +2737,12 @@ msgstr "Periodo hasta"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr "Agosto"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:306
-#, python-format
-msgid ""
-"The statement balance is incorrect !\n"
-"The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
-msgstr "Asientos de pago son la segunda entrada para la conciliación."
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr "Número:"
-
-#. module: account
-#: selection:account.print.journal,sort_selection:0
-msgid "Reference Number"
-msgstr "Número de referencia"
+msgstr ""
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2759,7 +2751,7 @@ msgstr "Número de referencia"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr "Octubre"
+msgstr ""
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -2767,50 +2759,58 @@ msgid ""
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very useful for some reports."
 msgstr ""
-"La cantidad opcional expresadas por esta línea, por ejemplo: el número de "
-"productos vendidos. La cantidad no es un requisito legal, pero es muy útil "
-"para algunos informes."
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 2:"
-msgstr "Línea 2:"
+msgstr ""
 
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr "Requerido"
+msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr "Cuenta de gastos"
+msgstr "Cuenta Costo de Venta"
 
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
 msgstr ""
-"Dejarlo vacío para utilizar el período de la fecha de validación (factura)."
 
 #. module: account
 #: help:account.bank.statement,account_id:0
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
 msgstr ""
-"Utilizado en el dominio de conciliación de extractos, pero no debería ser "
-"usado en otro sitio."
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr "Importe código base"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:401
+#, python-format
+msgid ""
+"You can not delete an invoice which is open or paid. We suggest you to "
+"refund it instead."
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr "Impuesto de venta por defecto"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1025
+#, python-format
+msgid "Invoice  '%s' is validated."
+msgstr ""
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -2819,22 +2819,16 @@ msgid ""
 "between the creation date or the creation date of the entries plus the "
 "partner payment terms."
 msgstr ""
-"La fecha de vencimiento de los asientos generados por este modelo. Puede "
-"elegir entre la fecha de creación o la fecha de creación de los asientos más "
-"los plazos de pago de la empresa."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
 msgid "Financial Accounting"
-msgstr "Contabilidad financiera"
+msgstr ""
 
 #. module: account
-#: view:account.pl.report:0
-#: model:ir.ui.menu,name:account.menu_account_pl_report
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: model:ir.ui.menu,name:account.menu_account_report_pl
 msgid "Profit And Loss"
-msgstr "Pérdidas y ganancias"
+msgstr ""
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -2848,33 +2842,26 @@ msgstr "Pérdidas y ganancias"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: account
-#: help:account.partner.ledger,initial_balance:0
-#: help:account.report.general.ledger,initial_balance:0
-msgid ""
-"It adds initial balance row on report which display previous sum amount of "
-"debit/credit/balance"
 msgstr ""
-"Añade una fila de saldo inicial en el informe que muestra el importe previo "
-"del debe/haber/saldo."
 
 #. module: account
-#: view:account.analytic.line:0
-#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
-msgid "Analytic Entries"
-msgstr "Asientos analíticos"
-
-#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
-"No fiscal year defined for this date !\n"
-"Please create one."
+"Tax base different!\n"
+"Click on compute to update the tax base."
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,page_split:0
+msgid "One Partner Per Page"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_parent_ids:0
+#: field:account.account.template,child_parent_ids:0
+msgid "Children"
 msgstr ""
-"¡No se ha definido un ejercicio fiscal para esta fecha!\n"
-"Por favor, cree uno."
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -2882,7 +2869,7 @@ msgstr ""
 #: model:process.process,name:account.process_process_invoiceprocess0
 #: selection:report.invoice.created,type:0
 msgid "Customer Invoice"
-msgstr "Factura de cliente"
+msgstr ""
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -2890,43 +2877,52 @@ msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
 msgstr ""
-"Indica si el importe del impuesto deberá incluirse en el importe base antes "
-"de calcular los siguientes impuestos."
 
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr "El usuario responsable de este diario"
+msgstr ""
 
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr "Buscar periodo"
+msgstr ""
 
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr "Moneda factura"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,account_report_id:0
+#: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
+msgid "Account Reports"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term,line_ids:0
 msgid "Terms"
-msgstr "Plazos de pago"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Cash Transaction"
-msgstr "Transición de caja"
+msgstr ""
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr "Cuenta bancaria"
+msgstr ""
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr "Lista plantilla impuestos"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
+msgid "Sale/Purchase Journals"
+msgstr ""
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -2937,114 +2933,110 @@ msgid ""
 "software system you may have to use the rate at date. Incoming transactions "
 "always use the rate at date."
 msgstr ""
-"Permite seleccionar la forma en que se calcula la tasa de la divisa actual "
-"en las transacciones de salida. En la mayoría de los países el método legal "
-"es \"Promedio\", pero sólo unos pocos sistemas de software son capaces de "
-"gestionarlo. Por lo tanto, si la importación procede de otro sistema de "
-"software, es posible que tenga que utilizar la tasa \"En fecha\". Las "
-"transacciones de entrada siempre utilizan la tasa \"En fecha\"."
 
 #. module: account
+#: help:account.chart.template,code_digits:0
 #: help:wizard.multi.charts.accounts,code_digits:0
 msgid "No. of Digits to use for account code"
-msgstr "Núm. de dígitos a usar para código de cuenta."
+msgstr ""
 
 #. module: account
 #: field:account.payment.term.line,name:0
 msgid "Line Name"
-msgstr "Nombre línea"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Search Fiscalyear"
-msgstr "Buscar ejercicio fiscal"
+msgstr ""
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Always"
-msgstr "Siempre"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "Month-1"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total Quantity"
-msgstr "Cantidad total"
+msgstr ""
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr "Cuenta de desajuste"
+msgstr ""
 
 #. module: account
 #: field:account.model.line,model_id:0
 #: view:account.subscription:0
 #: field:account.subscription,model_id:0
 msgid "Model"
-msgstr "Modelo"
+msgstr ""
 
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr "La cuenta base de la declaración de impuestos."
+msgstr ""
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
+#: selection:account.financial.report,type:0
 msgid "View"
-msgstr "Vista"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2951
-#, python-format
-msgid "BNK%s"
-msgstr "BNC%s"
-
-#. module: account
-#: code:addons/account/account.py:2906
-#: code:addons/account/installer.py:296
+#: code:addons/account/account.py:3380
+#: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
-msgstr "BANCO"
+msgstr ""
 
 #. module: account
 #: field:account.move.line,analytic_lines:0
 msgid "Analytic lines"
-msgstr "Líneas analíticas"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma Invoices"
+msgstr ""
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr "Archivo electrónico"
+msgstr ""
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Credit"
-msgstr "Haber del cliente"
+msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Plantilla códigos de impuestos"
+#: view:account.payment.term.line:0
+msgid "  Day of the Month: 0"
+msgstr ""
 
 #. module: account
 #: view:account.subscription:0
 msgid "Starts on"
-msgstr "Empieza en"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr "Contabilidad. Libro mayor empresa"
+msgstr ""
 
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr "Indica el orden de secuencia de la columna del diario."
-
-#. module: account
-#: view:account.tax.template:0
-msgid "Tax Declaration"
-msgstr "Declaración de impuestos"
+msgstr ""
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3052,7 +3044,6 @@ msgstr "Declaración de impuestos"
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
 msgstr ""
-"Fuerza a todos los movimientos de esta cuenta tener esta moneda secundaria."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -3060,24 +3051,32 @@ msgid ""
 "This wizard will validate all journal entries of a particular journal and "
 "period. Once journal entries are validated, you can not update them anymore."
 msgstr ""
-"Este asistente validará todos los asientos de un diario y período en "
-"particular. Una vez que se validan los asientos, no se pueden modificar más."
 
 #. 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 "Plantillas para el plan contable"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generar plan contable a partir de una plantilla de plan contable"
+msgid "Set Your Accounting Options"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+msgid "This months' Sales by type"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr "Contabilidad. Romper conciliación. Conciliar"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr ""
 
 #. module: account
 #: help:account.account.type,close_method:0
@@ -3092,27 +3091,23 @@ msgid ""
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
-"Establezca aquí el método que usará el asistente genérico para crear el "
-"asiento de cierre de ejercicio para todas las cuentas de este tipo.\n"
-"\n"
-" 'Ninguno' significa que no se hará nada.\n"
-" 'Saldo' normalmente se usará para cuentas de efectivo.\n"
-" 'Detallado' copiará cada apunte del ejercicio anterior, incluso los no "
-"conciliados.\n"
-" 'Sin conciliar' copiará sólo los apuntes aun no conciliados el primer día "
-"del nuevo ejercicio fiscal."
+
+#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the expense account"
-msgstr "Dejar vacío para la cuenta de gastos"
+msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,journal_ids:0
 #: field:account.analytic.cost.ledger.journal.report,journal:0
 #: field:account.balance.report,journal_ids:0
-#: field:account.bs.report,journal_ids:0
 #: field:account.central.journal,journal_ids:0
 #: field:account.common.account.report,journal_ids:0
 #: field:account.common.journal.report,journal_ids:0
@@ -3121,44 +3116,38 @@ msgstr "Dejar vacío para la cuenta de gastos"
 #: field:account.common.report,journal_ids:0
 #: report:account.general.journal:0
 #: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: view:account.journal.period:0
+#: report:account.partner.balance:0
 #: field:account.partner.balance,journal_ids:0
 #: field:account.partner.ledger,journal_ids:0
-#: field:account.pl.report,journal_ids:0
 #: view:account.print.journal:0
 #: field:account.print.journal,journal_ids:0
 #: field:account.report.general.ledger,journal_ids:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,journal_ids:0
+#: field:accounting.report,journal_ids:0
 #: model:ir.actions.act_window,name:account.action_account_journal_form
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
 #: model:ir.ui.menu,name:account.menu_account_print_journal
 #: model:ir.ui.menu,name:account.menu_action_account_journal_form
 #: model:ir.ui.menu,name:account.menu_journals
 #: model:ir.ui.menu,name:account.menu_journals_report
-#: report:account.account.balance:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.central.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
 msgid "Journals"
-msgstr "Diarios"
+msgstr ""
 
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr "Empresas restantes"
+msgstr ""
 
 #. module: account
 #: view:account.subscription:0
 #: field:account.subscription,lines_id:0
 msgid "Subscription Lines"
-msgstr "Apuntes de asientos periódicos"
+msgstr ""
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -3169,49 +3158,58 @@ msgstr "Apuntes de asientos periódicos"
 #: view:account.tax.template:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Purchase"
-msgstr "Compra"
+msgstr ""
 
 #. module: account
 #: view:account.installer:0
-#: view:account.installer.modules:0
-#: model:ir.actions.act_window,name:account.action_account_installer
 #: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
-msgstr "Configuración aplicaciones contabilidad"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Value amount: 0.02"
+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 "Tablero de contabilidad"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
+#: field:account.treasury.report,starting_balance:0
 msgid "Starting Balance"
-msgstr "Saldo inicial"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
-msgstr "¡No se ha definido empresa!"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_close
 #: model:ir.actions.act_window,name:account.action_account_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr "Cerrar un periodo"
+msgstr ""
 
 #. module: account
-#: field:account.analytic.balance,empty_acc:0
-msgid "Empty Accounts ? "
-msgstr "¿Cuentas vacías? "
+#: field:account.financial.report,display_detail:0
+msgid "Display details"
+msgstr ""
 
 #. module: account
 #: report:account.overdue:0
 msgid "VAT:"
-msgstr "IVA:"
+msgstr ""
+
+#. module: account
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
 
 #. module: account
 #: help:account.analytic.line,amount_currency:0
@@ -3219,65 +3217,53 @@ msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
 msgstr ""
-"El importe expresado en la moneda contable relacionada no es igual al de la "
-"compañía."
 
 #. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr "Diario:"
-
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.invoice:0
-#: selection:account.invoice,state:0
-#: view:account.invoice.report:0
-#: selection:account.invoice.report,state:0
-#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
-#: view:account.subscription:0
-#: selection:account.subscription,state:0
-#: selection:report.invoice.created,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Accounting Chart Configuration"
-msgstr "Configuración plan contable"
+#: model:ir.actions.act_window,name:account.action_account_unreconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
+msgid "Unreconcile Entries"
+msgstr ""
 
 #. module: account
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr "No se imprime en factura"
+msgstr ""
 
 #. module: account
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr "Plan de impuestos"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:315
+#, python-format
+msgid "The closing balance should be the same than the computed balance!"
+msgstr ""
 
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr "Buscar diario"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr "Factura pendiente"
+msgstr ""
 
 #. module: account
+#: view:account.invoice.report:0
 #: selection:account.subscription,period_type:0
+#: view:analytic.entries.report:0
 msgid "year"
-msgstr "año"
+msgstr ""
 
 #. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr "Firma autorizada"
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr ""
 
 #. module: account
 #: view:validate.account.move.lines:0
@@ -3285,61 +3271,38 @@ msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
 msgstr ""
-"Todos los asientos seleccionados serán validados y asentados. Esto significa "
-"que ya no podrá modificar sus campos contables."
-
-#. module: account
-#: code:addons/account/invoice.py:370
-#, 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!"
-
-#. module: account
-#: report:account.account.balance.landscape:0
-msgid "Total :"
-msgstr "Total :"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
 msgid "Transfers"
-msgstr "Transferencias"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  value amount: n.a"
-msgstr "  importe valor: n.a"
+msgstr ""
 
 #. module: account
 #: view:account.chart:0
 msgid "Account charts"
-msgstr "Planes contables"
+msgstr ""
 
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr "Importe impuesto"
-
-#. module: account
-#: view:account.installer:0
-msgid "Your bank and cash accounts"
-msgstr "Sus cuentas bancarias y de caja"
+msgstr ""
 
 #. module: account
 #: view:account.move:0
 msgid "Search Move"
-msgstr "Buscar movimiento"
+msgstr ""
 
 #. module: account
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr "Nombre código de impuesto"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 #: model:process.node,name:account.process_node_draftinvoices0
 msgid "Draft Invoice"
-msgstr "Factura borrador"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -3348,119 +3311,125 @@ msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
 msgstr ""
-"¡La(s) factura(s) seleccionada(s) no se puede cancelar ya que está en estado "
-"'Cancelada' o 'Realizada'!"
 
 #. module: account
-#: code:addons/account/account.py:522
-#, python-format
-msgid ""
-"You cannot change the type of account from '%s' to '%s' type as it contains "
-"account entries!"
+#: view:account.invoice.line:0
+msgid "Quantity :"
 msgstr ""
-"¡No puede cambiar el tipo de cuenta de '%s' a '%s' si contiene asientos "
-"contables!"
 
 #. module: account
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-msgid "Counterpart"
-msgstr "Contrapartida"
+#: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
+msgid "Period Length (days)"
+msgstr ""
 
 #. module: account
-#: view:account.journal:0
-msgid "Invoicing Data"
-msgstr "Datos facturación"
+#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
+msgid "Print Sale/Purchase Journal"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
-msgstr "Estado factura"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr "Categoría de producto"
-
-#. module: account
-#: view:account.move:0
-#: field:account.move,narration:0
-#: view:account.move.line:0
-#: field:account.move.line,narration:0
-msgid "Narration"
-msgstr "Notas"
+msgstr ""
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr "Crear cuenta"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
 msgid "Report of the Sales by Account Type"
-msgstr "Informe de las ventas por tipo de cuenta"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unreconciled Journal Items"
+msgstr ""
+
+#. module: account
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr ""
 
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr "Detalle"
+msgstr ""
 
 #. module: account
-#: field:account.installer,bank_accounts_id:0
-msgid "Your Bank and Cash Accounts"
-msgstr "Sus cuentas de banco y caja"
+#: code:addons/account/account_invoice.py:850
+#, python-format
+msgid ""
+"Can not create the invoice !\n"
+"The related payment term is probably misconfigured as it gives a computed "
+"amount greater than the total invoiced amount. The latest line of your "
+"payment term must be of type 'balance' to avoid rounding issues."
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 msgid "VAT :"
-msgstr "CIF/NIF:"
+msgstr ""
 
 #. module: account
-#: field:account.installer,charts:0
-#: model:ir.actions.act_window,name:account.action_account_chart
-#: model:ir.actions.act_window,name:account.action_account_tree
-#: model:ir.ui.menu,name:account.menu_action_account_tree2
 #: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
+#: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: model:ir.actions.act_window,name:account.action_account_chart
+#: model:ir.actions.act_window,name:account.action_account_tree
+#: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr "Plan contable"
+msgstr ""
 
 #. module: account
 #: view:account.tax.chart:0
 msgid "(If you do not select period it will take all open periods)"
-msgstr "(si no selecciona periodo se usarán todos los periodos abiertos)"
+msgstr ""
 
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr "Homólogo centralizado"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:575
+#, python-format
+msgid "You can not create journal items on a \"view\" account %s %s"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr "Proceso conciliación empresa por empresa"
+msgstr ""
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "2"
-msgstr "2"
+msgstr ""
 
 #. module: account
 #: view:account.chart:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
 msgstr ""
-"(Si no selecciona un ejercicio fiscal se tendrán en cuenta todos los "
-"ejercicios fiscales)"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -3468,7 +3437,6 @@ msgstr ""
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
 #: field:account.bank.statement.line,date:0
-#: selection:account.bs.report,filter:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3478,90 +3446,91 @@ msgstr ""
 #: field:account.entries.report,date:0
 #: selection:account.general.journal,filter:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.invoice.report,date:0
 #: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: view:account.move:0
 #: field:account.move,date:0
 #: field:account.move.line.reconcile.writeoff,date_p:0
 #: report:account.overdue:0
 #: selection:account.partner.balance,filter:0
 #: selection:account.partner.ledger,filter:0
-#: selection:account.pl.report,filter:0
 #: selection:account.print.journal,filter:0
 #: selection:account.print.journal,sort_selection:0
 #: selection:account.report.general.ledger,filter:0
 #: selection:account.report.general.ledger,sortby:0
 #: field:account.subscription.generate,date:0
 #: field:account.subscription.line,date:0
-#: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
 #: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
 #, python-format
 msgid "Date"
-msgstr "Fecha"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Post"
+msgstr ""
 
 #. module: account
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile"
-msgstr "Romper conciliación"
+msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:79
-#, python-format
-msgid "The journal must have default credit and debit account"
-msgstr "El diario debe tener una cuenta haber y debe por defecto."
+#: view:account.analytic.line:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr "Plantilla del plan contable"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
-"La fecha de vencimiento del apunte generado por la línea del modelo '%s' del "
-"modelo '%s' se basa en el plazo de pago de la empresa.\n"
-"¡Por favor, defina la empresa en él!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
-msgstr "¡Algunos asientos ya están conciliados!"
-
-#. module: account
-#: code:addons/account/account.py:1204
-#, python-format
-msgid ""
-"You cannot validate a Journal Entry unless all journal items are in same "
-"chart of accounts !"
 msgstr ""
-"¡No puede validar un asiento hasta que todos los movimientos estén en el "
-"mismo plan contable!"
 
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
-msgstr "Cuenta de impuestos"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
-msgstr "Presupuestos"
+msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
 #: selection:account.balance.report,filter:0
-#: selection:account.bs.report,filter:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3570,22 +3539,25 @@ msgstr "Presupuestos"
 #: selection:account.general.journal,filter:0
 #: selection:account.partner.balance,filter:0
 #: selection:account.partner.ledger,filter:0
-#: selection:account.pl.report,filter:0
 #: selection:account.print.journal,filter:0
 #: selection:account.report.general.ledger,filter:0
 #: selection:account.vat.declaration,filter:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
-msgstr "No filtros"
+msgstr ""
 
 #. module: account
-#: selection:account.analytic.journal,type:0
-msgid "Situation"
-msgstr "Situación"
+#: view:account.invoice.report:0
+msgid "Pro-forma Invoices"
+msgstr ""
 
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr "Historial"
+msgstr ""
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -3594,119 +3566,105 @@ msgid ""
 "If not applicable (computed through a Python code), the tax won't appear on "
 "the invoice."
 msgstr ""
-"Si no es aplicable (calculado a través de un código Python), el impuesto no "
-"aparecerá en la factura."
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
-msgstr "Código aplicable (si tipo=código)"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,product_qty:0
 msgid "Qty"
-msgstr "Cantidad"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.report,address_contact_id:0
 msgid "Contact Address Name"
-msgstr "Nombre dirección contacto"
+msgstr ""
 
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "Litigation"
-msgstr "Desacuerdo"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr "Buscar líneas analíticas"
+msgstr ""
 
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr "Cuenta a pagar"
-
-#. module: account
-#: constraint:account.move:0
-msgid ""
-"You cannot create entries on different periods/journals in the same move"
 msgstr ""
-"No puede crear asientos con movimientos en distintos periodos/diarios"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
 msgid "Payment Order"
-msgstr "Orden de pago"
+msgstr ""
 
 #. module: account
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
 msgstr ""
-"Marque esta opción si desea que el usuario concilie asientos en esta cuenta."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr "Balance contable"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr "Precio unidad"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
 msgid "Analytic Items"
-msgstr "Apuntes analíticos"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
-msgstr "¡No ha sido posible cambiar el impuesto!"
+msgstr ""
 
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr "Nº asientos"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1422
-#, python-format
-msgid ""
-"You selected an Unit of Measure which is not compatible with the product."
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft Refund"
 msgstr ""
-"Ha seleccionado una unidad de medida que no es compatible con el producto."
-
-#. module: account
-#: code:addons/account/invoice.py:473
-#, 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!"
 
 #. module: account
 #: view:account.state.open:0
 msgid "Open Invoice"
-msgstr "Abrir factura"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr "Código impuesto factor multiplicación"
+msgstr ""
 
 #. module: account
 #: view:account.fiscal.position:0
 msgid "Mapping"
-msgstr "Asignaciones"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:932
+#, python-format
+msgid ""
+"You cannot create an invoice on a centralised journal. Uncheck the "
+"centralised counterpart box in the related journal from the configuration "
+"menu."
+msgstr ""
 
 #. module: account
 #: field:account.account,name:0
@@ -3714,35 +3672,69 @@ msgstr "Asignaciones"
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr "Informe de balance de comprobación de vencimientos"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:582
+#, python-format
+msgid "You can not create journal items on a closed account %s %s"
+msgstr ""
 
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
-msgstr "Fecha vigencia"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_tree
+#: model:ir.ui.menu,name:account.menu_action_bank_tree
+msgid "Setup your Bank Accounts"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
 #, python-format
 msgid "Standard Encoding"
-msgstr "Codificación estándar"
+msgstr ""
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr "Diario para asientos analíticos"
+msgstr ""
 
 #. module: account
+#: constraint:account.aged.trial.balance:0
+#: constraint:account.balance.report:0
+#: constraint:account.central.journal:0
+#: constraint:account.common.account.report:0
+#: constraint:account.common.journal.report:0
+#: constraint:account.common.partner.report:0
+#: constraint:account.common.report:0
+#: constraint:account.general.journal:0
+#: constraint:account.partner.balance:0
+#: constraint:account.partner.ledger:0
+#: constraint:account.print.journal:0
+#: constraint:account.report.general.ledger:0
+#: constraint:account.vat.declaration:0
+#: constraint:accounting.report:0
+msgid ""
+"The fiscalyear, periods or chart of account chosen have to belong to the "
+"same company."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.todo.category,name:account.category_accounting_configuration
 #: model:ir.ui.menu,name:account.menu_finance
 #: model:process.node,name:account.process_node_accountingentries0
 #: model:process.node,name:account.process_node_supplieraccountingentries0
@@ -3750,7 +3742,12 @@ msgstr "Diario para asientos analíticos"
 #: view:product.template:0
 #: view:res.partner:0
 msgid "Accounting"
-msgstr "Contabilidad"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Journal Entries with period in current year"
+msgstr ""
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3761,18 +3758,23 @@ msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
 msgstr ""
-"Imprime informe con la columna de la moneda si la moneda es distinta de la "
-"moneda de la compañía."
+
+#. module: account
+#: help:account.account,unrealized_gain_loss:0
+msgid ""
+"Value of Loss or Gain due to changes in exchange rate when doing multi-"
+"currency transactions."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
-msgstr "Contabilidad general"
+msgstr ""
 
 #. module: account
 #: report:account.overdue:0
 msgid "Balance :"
-msgstr "Saldo :"
+msgstr ""
 
 #. module: account
 #: help:account.fiscalyear.close,journal_id:0
@@ -3782,125 +3784,93 @@ msgid ""
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
-"Lo más recomendable es usar un diario dedicado a contener los asientos de "
-"apertura de todos los ejercicios. Tenga en cuenta que lo debería definir con "
-"cuentas de debe/haber por defecto, de tipo 'situación' y con una "
-"contrapartida centralizada."
 
 #. module: account
 #: view:account.installer:0
-#: view:account.installer.modules:0
 #: view:wizard.multi.charts.accounts:0
 msgid "title"
-msgstr "título"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.period:0
 #: view:account.subscription:0
 msgid "Set to Draft"
-msgstr "Cambiar a borrador"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr "Líneas recurrentes"
+msgstr ""
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr "Mostrar empresas"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 msgid "Validate"
-msgstr "Validar"
+msgstr ""
 
 #. module: account
-#: sql_constraint:account.model.line:0
-msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost
+#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
 msgstr ""
-"¡Valor de haber o debe en el modelo erróneo (haber o debe debería ser \"0\")!"
 
 #. module: account
-#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
-msgid ""
-"From this report, you can have an overview of the amount invoiced to your "
-"customer as well as payment delays. The tool search can also be used to "
-"personalise your Invoices reports and so, match this analysis to your needs."
+#: model:account.financial.report,name:account.account_financial_report_assets0
+msgid "Assets"
 msgstr ""
-"A partir de este informe, puede tener una visión general del importe "
-"facturado a sus clientes, así como los retrasos en los pagos. La herramienta "
-"de búsqueda también se puede utilizar para personalizar los informes de las "
-"facturas y por tanto, adaptar este análisis a sus necesidades."
 
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr "Confirmar facturas"
+msgstr ""
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "Average Rate"
-msgstr "Tasa promedio"
+msgstr ""
+
+#. module: account
+#: field:account.balance.report,display_account:0
+#: field:account.common.account.report,display_account:0
+#: field:account.report.general.ledger,display_account:0
+msgid "Display Accounts"
+msgstr ""
 
 #. module: account
 #: view:account.state.open:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(debería romper la conciliación si desea abrir la factura)"
+msgstr ""
 
 #. module: account
-#: field:account.aged.trial.balance,period_from:0
-#: field:account.balance.report,period_from:0
-#: field:account.bs.report,period_from:0
-#: field:account.central.journal,period_from:0
 #: field:account.chart,period_from:0
-#: field:account.common.account.report,period_from:0
-#: field:account.common.journal.report,period_from:0
-#: field:account.common.partner.report,period_from:0
-#: field:account.common.report,period_from:0
-#: field:account.general.journal,period_from:0
-#: field:account.partner.balance,period_from:0
-#: field:account.partner.ledger,period_from:0
-#: field:account.pl.report,period_from:0
-#: field:account.print.journal,period_from:0
-#: field:account.report.general.ledger,period_from:0
-#: field:account.vat.declaration,period_from:0
 msgid "Start period"
-msgstr "Periodo inicial"
+msgstr ""
 
 #. module: account
 #: field:account.tax,name:0
 #: field:account.tax.template,name:0
 #: report:account.vat.declaration:0
 msgid "Tax Name"
-msgstr "Nombre impuesto"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_configuration
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuración"
+msgstr ""
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
 #: model:account.payment.term,note:account.account_payment_term
 msgid "30 Days End of Month"
-msgstr "30 días fin de mes"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
 msgid "Analytic Balance"
-msgstr "Saldo analítico"
-
-#. module: account
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
-msgid "Net Loss"
-msgstr "Pérdida neta"
+msgstr ""
 
 #. module: account
 #: help:account.account,active:0
@@ -3908,23 +3878,42 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar la cuenta sin eliminarla."
+
+#. module: account
+#: view:account.move.line:0
+msgid "Posted Journal Items"
+msgstr ""
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr "Buscar plantillas impuestos"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr "Asientos borrador"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Day of the Month= -1"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Number of Days: 30"
+msgstr ""
 
 #. module: account
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
 msgid "Shortcut"
-msgstr "Abreviación"
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! The start date of the fiscal year must be before his end date."
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -3932,13 +3921,20 @@ msgstr "Abreviación"
 #: view:account.account.template:0
 #: field:account.account.template,user_type:0
 #: view:account.account.type:0
+#: field:account.account.type,name:0
 #: field:account.bank.accounts.wizard,account_type:0
 #: field:account.entries.report,user_type:0
+#: selection:account.financial.report,type:0
 #: model:ir.model,name:account.model_account_account_type
 #: field:report.account.receivable,type:0
 #: field:report.account_type.sales,user_type:0
 msgid "Account Type"
-msgstr "Tipo de cuenta"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Account Owner"
+msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
@@ -3947,12 +3943,12 @@ msgstr "Tipo de cuenta"
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr "Balance de sumas y saldos"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
 msgid "Cancel the Selected Invoices"
-msgstr "Cancelar las facturas seleccionadas"
+msgstr ""
 
 #. module: account
 #: help:product.category,property_account_income_categ:0
@@ -3961,13 +3957,19 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using sale price"
 msgstr ""
-"Esta cuenta se utilizará para valorar el stock saliente para la categoría de "
-"producto actual utilizando el precio de venta."
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "3"
-msgstr "3"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:97
+#, python-format
+msgid ""
+"You haven't supplied enough argument to compute the initial balance, please "
+"select a period and journal in the context."
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -3975,32 +3977,22 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
 msgstr ""
-"Los costes analíticos (hojas de servicios, algunos productos comprados, ...) "
-"provienen de las cuentas analíticas. Estos generan facturas borrador de "
-"proveedor."
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Close CashBox"
-msgstr "Cerrar caja"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr "Retraso promedio deuda"
+msgstr ""
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
-msgstr "Tipo cuenta"
-
-#. module: account
-#: code:addons/account/invoice.py:714
-#, 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!"
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4011,76 +4003,84 @@ msgstr ""
 #: field:report.account.sales,month:0
 #: field:report.account_type.sales,month:0
 msgid "Month"
-msgstr "Mes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1231
+#, python-format
+msgid ""
+"You can not do this modification on a confirmed entry! You can just change "
+"some non legal fields or you must unconfirm the journal entry first! \n"
+"%s"
+msgstr ""
+
+#. module: account
+#: field:res.company,paypal_account:0
+msgid "Paypal Account"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference UoM"
-msgstr "Referencia UdM"
+msgstr ""
 
 #. module: account
 #: field:account.account,note:0
 #: field:account.account.template,note:0
 msgid "Note"
-msgstr "Nota"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,sign:0
+msgid "Reverse balance sign"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Overdue Account"
-msgstr "Cuenta atrasos"
+msgstr ""
 
 #. module: account
-#: selection:account.invoice,state:0
-#: report:account.overdue:0
-msgid "Paid"
-msgstr "Pagado"
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:184
+#, python-format
+msgid "Balance Sheet (Liability account)"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr ""
 
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr "Líneas de impuestos"
+msgstr ""
 
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr "Código base cuenta"
-
-#. module: account
-#: help:account.move,state:0
-msgid ""
-"All manually created new journal entry are usually in the state 'Unposted', "
-"but you can set the option to skip that state on the related journal. In "
-"that case, they will be behave as journal entries automatically created by "
-"the system on document validation (invoices, bank statements...) and will be "
-"created in 'Posted' state."
 msgstr ""
-"Todos los asientos creados manualmente están, por lo general, en el estado "
-"'No asentado', pero puede configurar la opción de omitir ese estado en el "
-"diario correspondiente. En ese caso, se comportan como asientos creados "
-"automáticamente por el sistema en la validación de documentos (facturas, "
-"extractos bancarios, ...) y se crearán en estado 'Asentado'."
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
-"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
 
 #. module: account
 #: view:res.partner:0
 msgid "Customer Accounting Properties"
-msgstr "Propiedades de contabilidad del cliente"
+msgstr ""
 
 #. module: account
-#: field:account.invoice.tax,name:0
-msgid "Tax Description"
-msgstr "Descripción impuesto"
+#: help:res.company,paypal_account:0
+msgid "Paypal username (usually email) for receiving online payments."
+msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
 #: selection:account.balance.report,target_move:0
-#: selection:account.bs.report,target_move:0
 #: selection:account.central.journal,target_move:0
 #: selection:account.chart,target_move:0
 #: selection:account.common.account.report,target_move:0
@@ -4091,58 +4091,57 @@ msgstr "Descripción impuesto"
 #: selection:account.move.journal,target_move:0
 #: selection:account.partner.balance,target_move:0
 #: selection:account.partner.ledger,target_move:0
-#: selection:account.pl.report,target_move:0
 #: selection:account.print.journal,target_move:0
 #: selection:account.report.general.ledger,target_move:0
 #: selection:account.tax.chart,target_move:0
 #: selection:account.vat.declaration,target_move:0
+#: selection:accounting.report,target_move:0
 #: code:addons/account/report/common_report_header.py:68
 #, python-format
 msgid "All Posted Entries"
-msgstr "Todos los asientos asentados"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:357
+#: code:addons/account/account_bank_statement.py:367
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
 msgstr ""
-"Se ha confirmado el extracto %s, se han creado los asientos contables."
-
-#. module: account
-#: constraint:account.fiscalyear:0
-msgid "Error! The duration of the Fiscal Year is invalid. "
-msgstr "¡Error! La duración del ejercicio fiscal no es válido. "
 
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr "Rango mensual"
+msgstr ""
 
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
 msgid "Check if you want to display Accounts with 0 balance too."
-msgstr "Compruebe si también desea mostrar cuentas con saldo 0."
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
 msgid "Compute Code"
-msgstr "Código cálculo"
+msgstr ""
 
 #. module: account
 #: view:account.account.template:0
 msgid "Default taxes"
-msgstr "Impuestos por defecto"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
-msgid "Free Reference"
-msgstr "Referencia libre"
+msgid "End of Fiscal Year Entry"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodical Processing"
-msgstr "Procesamiento periódico"
+msgstr ""
+
+#. module: account
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr ""
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4150,198 +4149,191 @@ msgid ""
 "When new move line is created the state will be 'Draft'.\n"
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
-"Cuando se crea un nuevo apunte, el estado será 'Borrador'.\n"
-"* Cuando se realicen todos los pagos, el estado será 'Válido'"
 
 #. module: account
 #: field:account.journal,view_id:0
 msgid "Display Mode"
-msgstr "Modo de visualización"
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr "Extracto desde factura o pago"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  day of the month: 0"
-msgstr "  día del mes: 0"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
 msgid "Account chart"
-msgstr "Plan contable"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Main Title 1 (bold, underlined)"
+msgstr ""
 
 #. module: account
-#: report:account.account.balance.landscape:0
 #: report:account.analytic.account.balance:0
 #: report:account.central.journal:0
 msgid "Account Name"
-msgstr "Nombre de cuenta"
+msgstr ""
 
 #. module: account
 #: help:account.fiscalyear.close,report_name:0
 msgid "Give name of the new entries"
-msgstr "Indique el nombre de los nuevos asientos."
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr "Estadísticas de facturas"
+msgstr ""
+
+#. module: account
+#: field:account.account,exchange_rate:0
+msgid "Exchange Rate"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr "Han sido introducidos los extractos bancarios en el sistema."
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr "Desfase conciliación"
-
-#. module: account
-#: field:account.model.line,date_maturity:0
-#: report:account.overdue:0
-msgid "Maturity date"
-msgstr "Fecha vencimiento"
+msgstr ""
 
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by Type"
-msgstr "Cuentas por tipo"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
-#: field:account.bank.statement,balance_end_real:0
+#: field:account.bank.statement,balance_end_cash:0
 msgid "Closing Balance"
-msgstr "Saldo de cierre"
+msgstr ""
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
 #, python-format
 msgid "Not implemented"
-msgstr "No implementado"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,visible:0
+msgid "Can be Visible?"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
 msgid "Account Journal Select"
-msgstr "Contabilidad. Seleccionar diario"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Print Invoice"
-msgstr "Imprimir factura"
+msgstr ""
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr "Abonos"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2067
-#: code:addons/account/wizard/account_use_model.py:69
-#, python-format
-msgid "Unable to find a valid period !"
-msgstr "¡No ha sido posible encontrar un período válido!"
-
-#. module: account
-#: report:account.tax.code.entries:0
-msgid "Voucher No"
-msgstr "Núm. de bono"
+#: sql_constraint:account.period:0
+msgid "The name of the period must be unique per company!"
+msgstr ""
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "res_config_contents"
-msgstr "res_config_contenidos"
+msgstr ""
 
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate Transactions"
-msgstr "Romper conciliación transacciones"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,visible:0
+msgid ""
+"Set this to False if you don't want this template to be used actively in the "
+"wizard that generate Chart of Accounts from templates, this is useful when "
+"you want to generate accounts of this template only when loading its child "
+"template."
+msgstr ""
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries From Models"
-msgstr "Crear asientos desde modelos"
+msgstr ""
 
 #. module: account
+#: field:account.account,reconcile:0
 #: field:account.account.template,reconcile:0
 msgid "Allow Reconciliation"
-msgstr "Permitir conciliación"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1082
+#, python-format
+msgid ""
+"You can not modify company of this period as some journal items exists."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr "Estadísticas cuenta analítica"
+msgstr ""
 
 #. module: account
-#: view:wizard.multi.charts.accounts:0
-msgid ""
-"This will automatically configure your chart of accounts, bank accounts, "
-"taxes and journals according to the selected template"
+#: report:account.vat.declaration:0
+msgid "Based On"
 msgstr ""
-"Permite configurar automáticamente su plan contable, cuentas de bancos, "
-"impuestos y diarios según la plantilla seleccionada"
 
 #. module: account
 #: field:account.tax,price_include:0
 #: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
-msgstr "Impuestos incluidos en precio"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr "Contabilidad. Libro de costes analíticos para informe diario"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Recurring Models"
-msgstr "Modelos recurrentes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1266
+#, python-format
+msgid "Encoding error"
+msgstr ""
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "4"
-msgstr "4"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
-msgstr "Cambiar"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:78
-#: code:addons/account/wizard/account_fiscalyear_close.py:81
-#: code:addons/account/wizard/account_move_journal.py:165
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
-#, python-format
-msgid "UserError"
-msgstr "Error de usuario"
+#: selection:account.journal,type:0
+msgid "Bank and Cheques"
+msgstr ""
 
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
-msgstr "Controles de tipo"
+msgstr ""
 
 #. module: account
 #: help:account.journal,default_credit_account_id:0
 msgid "It acts as a default account for credit amount"
-msgstr "Actúa como una cuenta por defecto para los importes en el haber."
-
-#. module: account
-#: help:account.partner.ledger,reconcil:0
-msgid "Consider reconciled entries"
-msgstr "Considerar asientos conciliados."
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4349,101 +4341,112 @@ msgstr "Considerar asientos conciliados."
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr "Asentar asientos"
+msgstr ""
 
 #. module: account
 #: selection:account.invoice,state:0
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Cancelled"
-msgstr "Cancelado"
+msgstr ""
 
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
 msgid "Closing balance based on cashBox"
-msgstr "Saldo de cierre basado en la caja."
-
-#. module: account
-#: constraint:account.account:0
-#: constraint:account.tax.code:0
-msgid "Error ! You can not create recursive accounts."
-msgstr "¡Error! No se pueden crear cuentas recursivas."
-
-#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
 msgstr ""
-"¡No se puede crear la cuenta! \n"
-"¡Asegúrese de que si la cuenta tiene hijos su tipo sea \"Vista\"!"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Example"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:839
+#, python-format
+msgid ""
+"Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3316
+#, python-format
+msgid "Purchase Tax %.2f%%"
+msgstr ""
 
 #. module: account
 #: view:account.subscription.generate:0
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr "Generar asientos"
+msgstr ""
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr "Selecciona plan de impuestos."
+msgstr ""
 
 #. module: account
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
-msgstr "Mapeo de cuentas"
+msgstr ""
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/invoice.py:320
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
-msgstr "Cliente"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirmed"
-msgstr "Confirmado"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 msgid "Cancelled Invoice"
-msgstr "Factura cancelada"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:73
-#, python-format
-msgid "You must define an analytic journal of type '%s' !"
-msgstr "¡Debe definir un diario analítico de tipo '%s'!"
-
-#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
 "the account \"%s - %s\". Clear the secondary currency field of the account "
 "definition if you want to accept all currencies."
 msgstr ""
-"No se pudo crear movimiento con moneda distinta de la moneda secundaria de "
-"la cuenta \"%s - %s\". Borrar el campo de moneda secundaria de la definición "
-"de la cuenta si desea aceptar todas las monedas."
+
+#. module: account
+#: selection:account.bank.statement,state:0
+msgid "New"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.refund,date:0
 msgid "Operation date"
-msgstr "Fecha operación"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation Transactions"
+msgstr ""
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr "Código impuesto reintegro"
+msgstr ""
 
 #. module: account
 #: view:validate.account.move:0
@@ -4451,58 +4454,67 @@ msgid ""
 "All draft account entries in this journal and period will be validated. It "
 "means you won't be able to modify their accounting fields anymore."
 msgstr ""
-"Todos los asientos borrador de este diario y periodo serán validados. Esto "
-"significa que ya no podrá modificar sus campos contables."
 
 #. module: account
-#: report:account.account.balance.landscape:0
-msgid "Account Balance -"
-msgstr "Balance cuenta -"
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr ""
 
 #. module: account
 #: field:account.automatic.reconcile,date1:0
 msgid "Starting Date"
-msgstr "Fecha inicial"
+msgstr ""
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
 msgid "Income Account on Product Template"
-msgstr "Cuenta de ingresos en plantilla producto"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3137
+#, python-format
+msgid "MISC"
+msgstr ""
+
+#. module: account
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr ""
 
 #. module: account
 #: help:res.partner,last_reconciliation_date:0
 msgid ""
 "Date on which the partner accounting entries were reconciled last time"
 msgstr ""
-"Fecha en que los asientos contables de la empresa fueron conciliados por "
-"última vez."
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
-msgstr "Nuevo ejercicio fiscal"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
-msgstr "Facturas"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:804
-#, python-format
-msgid ""
-"Please verify the price of the invoice !\n"
-"The real total does not match the computed total."
+#: view:account.invoice:0
+msgid "My invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
 msgstr ""
-"¡Compruebe el importe de la factura!\n"
-"El total real no concuerda con el total calculado."
 
 #. module: account
 #: view:account.invoice:0
@@ -4510,68 +4522,96 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesman"
-msgstr "Comercial"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Invoiced"
-msgstr "Facturado"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Posted Journal Entries"
+msgstr ""
 
 #. module: account
 #: view:account.use.model:0
 msgid "Use Model"
-msgstr "Usar modelo"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,partner_bank_id:0
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Supplier Refund, otherwise a "
+"Partner bank account number."
+msgstr ""
 
 #. module: account
 #: view:account.state.open:0
 msgid "No"
-msgstr "No"
+msgstr ""
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
 msgid "The tax basis of the tax declaration."
-msgstr "La base del impuesto de la declaración de impuestos."
+msgstr ""
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Add"
-msgstr "Añadir"
+msgstr ""
 
 #. module: account
-#: help:account.invoice,date_invoice:0
-msgid "Keep empty to use the current date"
-msgstr "Dejarlo vacío para utilizar la fecha actual."
-
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banco y cheques"
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+msgid "Paid"
+msgstr ""
 
 #. module: account
 #: view:account.period.close:0
 msgid "Are you sure?"
-msgstr "¿Está seguro?"
+msgstr ""
 
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr "El extracto bancario utilizado para la conciliación bancaria"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr "Facturas borrador son validadas. "
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error!\n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:923
+#, python-format
+msgid "Opening Period"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Journal Entries to Review"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
 msgid "Compute"
-msgstr "Calcular"
+msgstr ""
 
 #. module: account
 #: field:account.tax,type_tax_use:0
 msgid "Tax Application"
-msgstr "Aplicación impuesto"
+msgstr ""
 
 #. module: account
 #: view:account.move:0
@@ -4596,63 +4636,51 @@ msgstr "Aplicación impuesto"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr "Apuntes contables"
+msgstr ""
 
 #. module: account
-#: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
-msgstr "Balance de situación (cuentas de activos)"
-
-#. module: account
-#: report:account.tax.code.entries:0
-msgid "Third Party (Country)"
-msgstr "Tercera parte (país)"
-
-#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
-msgstr "Error"
+msgstr ""
 
 #. module: account
-#: field:account.analytic.Journal.report,date2:0
 #: field:account.analytic.balance,date2:0
 #: field:account.analytic.cost.ledger,date2:0
 #: field:account.analytic.cost.ledger.journal.report,date2:0
 #: field:account.analytic.inverted.balance,date2:0
+#: field:account.analytic.journal.report,date2:0
 msgid "End of period"
-msgstr "Fin del período"
+msgstr ""
 
 #. module: account
 #: view:res.partner:0
 msgid "Bank Details"
-msgstr "Detalles del banco"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:720
-#, python-format
-msgid "Taxes missing !"
-msgstr "¡Faltan impuestos!"
+#: model:ir.actions.act_window,help:account.action_account_partner_balance
+msgid ""
+"This report is analysis by partner. It is a PDF report containing one line "
+"per partner representing the cumulative credit balance."
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -4660,96 +4688,124 @@ msgid ""
 "To print an analytics (or costs) journal for a given period. The report give "
 "code, move name, account number, general amount and analytic amount."
 msgstr ""
-"Para imprimir un diario analítico (o costes) para un periodo determinado. En "
-"el informe se lista el código, el nombre de movimiento, número de cuenta, el "
-"importe general y el importe analítico."
 
 #. module: account
-#: help:account.journal,refund_journal:0
-msgid "Fill this if the journal is to be used for refunds of invoices."
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+msgid "Balance by Type of Account"
 msgstr ""
-"Marque esta opción si el diario se utilizará para facturas rectificativas "
-"(abonos)."
 
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Generate Fiscal Year Opening Entries"
-msgstr "Generar asientos apertura ejercicio fiscal"
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_user
+msgid "Accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_treasury_report_all
+msgid ""
+"From this view, have an analysis of your treasury. It sums the balance of "
+"every accounting entries made on liquidity accounts per period."
+msgstr ""
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr "Agrupar líneas de factura"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.cancel:0
 #: view:account.invoice.confirm:0
 msgid "Close"
-msgstr "Cerrar"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
 msgid "Moves"
-msgstr "Movimientos"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Sale journal in this month"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
 #: model:ir.model,name:account.model_account_vat_declaration
 msgid "Account Vat Declaration"
-msgstr "Contabilidad. Declaración IVA"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Price"
+msgstr ""
 
 #. module: account
 #: view:account.period:0
 msgid "To Close"
-msgstr "Para cerrar"
+msgstr ""
 
 #. module: account
-#: field:account.journal,allow_date:0
-msgid "Check Date not in the Period"
-msgstr "Comprobar fecha no está en el periodo"
+#: field:account.treasury.report,date:0
+msgid "Beginning of Period Date"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
 "You should set the journal to allow cancelling entries if you want to do "
 "that."
 msgstr ""
-"¡No se puede modificar una asiento asentado de este diario!\n"
-"Debe configurar el diario para permitir la cancelación de los asientos si "
-"quiere hacerlo."
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
 msgid "Templates"
-msgstr "Plantillas"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr ""
 
 #. module: account
 #: field:account.tax,child_ids:0
 msgid "Child Tax Accounts"
-msgstr "Cuentas impuestos hijas"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
-msgstr "Periodo inicial debería ser más pequeño que el periodo final"
+msgstr ""
 
 #. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "5"
-msgstr "5"
+#: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
+msgid ""
+"Check this if the price you use on the product and invoices includes this "
+"tax."
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr "Balance analítico -"
+msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
-#: field:account.bs.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
 #: field:account.chart,target_move:0
@@ -4759,75 +4815,91 @@ msgstr "Balance analítico -"
 #: field:account.common.report,target_move:0
 #: report:account.general.journal:0
 #: field:account.general.journal,target_move:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.journal,target_move:0
+#: report:account.partner.balance:0
 #: field:account.partner.balance,target_move:0
 #: field:account.partner.ledger,target_move:0
-#: field:account.pl.report,target_move:0
 #: field:account.print.journal,target_move:0
 #: field:account.report.general.ledger,target_move:0
 #: field:account.tax.chart,target_move:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,target_move:0
-#: report:account.account.balance:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: field:accounting.report,target_move:0
 msgid "Target Moves"
-msgstr "Movimientos destino"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_net
+#: model:account.payment.term,note:account.account_payment_term_net
+msgid "30 Net Days"
+msgstr ""
 
 #. module: account
 #: field:account.subscription,period_type:0
 msgid "Period Type"
-msgstr "Período: Unidad de tiempo"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
-msgstr "Pagos"
+msgstr ""
 
 #. module: account
 #: view:account.tax:0
 msgid "Reverse Compute Code"
-msgstr "Código cálculo inverso"
+msgstr ""
 
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr "Asiento"
+msgstr ""
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
 #: field:account.tax.template,python_compute_inv:0
 msgid "Python Code (reverse)"
-msgstr "Código Python (inverso)"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr "Plazos de pago"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,complete_tax_set:0
+msgid ""
+"This boolean helps you to choose if you want to propose to the user to "
+"encode the sale and purchase rates or choose from list of taxes. This last "
+"choice assumes that the set of tax defined on this template is complete"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+#: field:account.financial.report,children_ids:0
+#: model:ir.model,name:account.model_account_financial_report
+msgid "Account Report"
+msgstr ""
 
 #. module: account
 #: field:account.journal.column,name:0
 msgid "Column Name"
-msgstr "Nombre columna"
+msgstr ""
 
 #. module: account
 #: view:account.general.journal:0
 msgid ""
 "This report gives you an overview of the situation of your general journals"
 msgstr ""
-"Este informe proporciona una vista general de la situación de sus diarios"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -4838,74 +4910,72 @@ msgstr ""
 #: field:report.account.sales,name:0
 #: field:report.account_type.sales,name:0
 msgid "Year"
-msgstr "Año"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
 msgid "Opening Cashbox"
-msgstr "Apertura caja"
+msgstr ""
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Line 1:"
-msgstr "Línea 1:"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
-msgstr "¡Error de integridad!"
+msgstr ""
 
 #. module: account
 #: field:account.tax.template,description:0
 msgid "Internal Name"
-msgstr "Nombre interno"
+msgstr ""
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr "mes"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:293
-#, python-format
-msgid "Journal Item \"%s\" is not valid"
-msgstr "Apunte \"%s\" no es válido"
-
-#. module: account
-#: view:account.payment.term:0
-msgid "Description on invoices"
-msgstr "Descripción en facturas"
+msgstr ""
 
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr "Próxima empresa a conciliar"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
 #: field:account.move.line,tax_code_id:0
 msgid "Tax Account"
-msgstr "Cuenta impuesto"
+msgstr ""
 
 #. module: account
 #: view:account.automatic.reconcile:0
 msgid "Reconciliation Result"
-msgstr "Resultado de conciliación"
+msgstr ""
 
 #. module: account
-#: view:account.bs.report:0
-#: model:ir.actions.act_window,name:account.action_account_bs_report
-#: model:ir.ui.menu,name:account.menu_account_bs_report
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
+#: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
+#: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
-msgstr "Balance de situación"
+msgstr ""
+
+#. module: account
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr ""
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date in Period"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
 msgid "Accounting Reports"
-msgstr "Informes contables"
+msgstr ""
 
 #. module: account
 #: field:account.move,line_id:0
@@ -4913,29 +4983,29 @@ msgstr "Informes contables"
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open
 #: model:ir.actions.act_window,name:account.action_move_line_form
 msgid "Entries"
-msgstr "Asientos"
+msgstr ""
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This Period"
-msgstr "Este periodo"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
 #: field:account.move.line,product_uom_id:0
 msgid "UoM"
-msgstr "UdM"
+msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:138
+#: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "No Period found on Invoice!"
-msgstr "No se encontro un período en la factura"
+msgstr ""
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code (if type=code)"
-msgstr "Código para calcular (si tipo=código)"
+msgstr ""
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -4946,7 +5016,12 @@ msgstr "Código para calcular (si tipo=código)"
 #: view:account.tax.template:0
 #: selection:account.tax.template,type_tax_use:0
 msgid "Sale"
-msgstr "Venta"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Report"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -4958,16 +5033,11 @@ msgstr "Venta"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
-msgstr "Importe"
-
-#. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:41
-#, python-format
-msgid "End of Fiscal Year Entry"
-msgstr "Asiento fin de ejercicio fiscal"
+msgstr ""
 
 #. module: account
 #: model:process.transition,name:account.process_transition_customerinvoice0
@@ -4977,57 +5047,43 @@ msgstr "Asiento fin de ejercicio fiscal"
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Validation"
-msgstr "Validación"
-
-#. module: account
-#: help:account.invoice,reconciled:0
-msgid ""
-"The Journal Entry of the invoice have been totally reconciled with one or "
-"several Journal Entries of payment."
 msgstr ""
-"El asiento de la factura ha sido totalmente conciliado con uno o varios "
-"asientos de pago."
 
 #. module: account
 #: field:account.tax,child_depend:0
 #: field:account.tax.template,child_depend:0
 msgid "Tax on Children"
-msgstr "Impuesto en hijos"
-
-#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
 msgstr ""
-"No puede crear una línea de movimiento en una cuenta a cobrar/a pagar sin "
-"una empresa."
 
 #. module: account
-#: code:addons/account/account.py:2067
-#: code:addons/account/wizard/account_use_model.py:69
-#, python-format
-msgid "No period found !"
-msgstr "¡No se ha encontrado período!"
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr ""
 
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr "Permitir cancelación de asientos"
+msgstr ""
 
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr "Coeficiente para padre"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic Accounts with a past deadline."
+msgstr ""
 
 #. module: account
 #: report:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr "Nombre de Cuenta/Empresa"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transaction"
-msgstr "Transacción"
+msgstr ""
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -5039,33 +5095,32 @@ msgstr "Transacción"
 #: 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 "Utilice este código para la declaración del IVA."
+msgstr ""
 
 #. module: account
-#: view:account.move.line:0
-msgid "Debit/Credit"
-msgstr "Debe/Haber"
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr ""
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr "Estadística de asientos analíticos"
+msgstr ""
 
 #. 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 "Plantillas códigos de impuestos"
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Cash and Banks"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
 msgid "account.installer"
-msgstr "account.instalador"
+msgstr ""
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr "Incluir en importe base"
+msgstr ""
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5073,75 +5128,65 @@ 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 ""
-"Número de días a añadir antes del cálculo del día de mes. Si fecha=15/01, "
-"Número de días=22, Día de mes=-1, entonces la fecha de vencimiento es 28/02."
 
 #. module: account
-#: code:addons/account/account.py:2896
-#: code:addons/account/installer.py:283
-#: code:addons/account/installer.py:295
-#, python-format
-msgid "Bank Journal "
-msgstr "Diario bancario "
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr ""
 
 #. module: account
 #: view:account.journal:0
 msgid "Entry Controls"
-msgstr "Controles de asiento"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.chart:0
 #: view:project.account.analytic.line:0
 msgid "(Keep empty to open the current situation)"
-msgstr "(dejarlo vacío para abrir la situación actual)"
+msgstr ""
 
 #. module: account
-#: field:account.analytic.Journal.report,date1:0
 #: field:account.analytic.balance,date1:0
 #: field:account.analytic.cost.ledger,date1:0
 #: field:account.analytic.cost.ledger.journal.report,date1:0
 #: field:account.analytic.inverted.balance,date1:0
+#: field:account.analytic.journal.report,date1:0
 msgid "Start of period"
-msgstr "Inicio del período"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1193
-#, 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!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
 msgid "Account Common Account Report"
-msgstr "Contabilidad. Informe contable común"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "Communication"
-msgstr "Comunicación"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr "Contabilidad analítica"
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,initial_balance:0
+#: field:account.report.general.ledger,initial_balance:0
+msgid "Include Initial Balances"
+msgstr ""
 
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr "Factura rectificativa de cliente"
+msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
-msgid "Default Taxes"
-msgstr "Impuestos por defecto"
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr ""
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5149,30 +5194,40 @@ msgstr "Impuestos por defecto"
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr "Signo código impuesto"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr "Informe de facturas creadas en los últimos 15 días"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Number of Days: 14"
+msgstr ""
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr "Diario asientos cierre del ejercicio"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/account.py:3463
+#: code:addons/account/account_bank_statement.py:338
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
-msgstr "¡Error de configuración!"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value_amount:0
+msgid "Amount To Pay"
+msgstr ""
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5181,19 +5236,16 @@ msgid ""
 "something to reconcile or not. This figure already count the current partner "
 "as reconciled."
 msgstr ""
-"Estos son las empresas restantes a las que debería comprobar si hay algo "
-"para conciliar o no. Esta cifra ya contabiliza la empresa actual como "
-"conciliada."
 
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr "Líneas de los asientos periódicos"
+msgstr ""
 
 #. module: account
 #: field:account.entries.report,quantity:0
 msgid "Products Quantity"
-msgstr "Cantidad de productos"
+msgstr ""
 
 #. module: account
 #: view:account.entries.report:0
@@ -5202,69 +5254,49 @@ msgstr "Cantidad de productos"
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr "No asentado"
+msgstr ""
 
 #. module: account
 #: view:account.change.currency:0
 #: model:ir.actions.act_window,name:account.action_account_change_currency
 #: model:ir.model,name:account.model_account_change_currency
 msgid "Change Currency"
-msgstr "Cambiar moneda"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "This action will erase taxes"
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Accounting entries."
-msgstr "Asientos contables."
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 msgid "Payment Date"
-msgstr "Fecha de pago"
-
-#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "6"
-msgstr "6"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.account:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
-#: model:ir.actions.act_window,name:account.action_analytic_open
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
-
-#. module: account
-#: help:account.account.type,report_type:0
-msgid ""
-"According value related accounts will be display on respective reports "
-"(Balance Sheet Profit & Loss Account)"
 msgstr ""
-"Según el valor relacionado las cuentas se mostrarán en sus respectivos "
-"informes (Balance de situación contable pérdidas y ganancias)."
 
 #. module: account
-#: field:account.report.general.ledger,sortby:0
-msgid "Sort By"
-msgstr "Ordenar por"
-
-#. module: account
-#: code:addons/account/account.py:1326
-#, python-format
-msgid ""
-"There is no default default credit account defined \n"
-"on journal \"%s\""
+#: view:account.invoice.report:0
+msgid "Customer Invoices And Refunds"
 msgstr ""
-"No se ha definido una cuenta haber por defecto \n"
-"en el diario \"%s\""
 
 #. module: account
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "Importe divisa"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:39
@@ -5273,13 +5305,11 @@ msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
 msgstr ""
-"El diario indicado no tiene asientos contables en estado borrador para este "
-"período"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
 msgid "Lines to reconcile"
-msgstr "Líneas a conciliar"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5294,17 +5324,27 @@ msgstr "Líneas a conciliar"
 #: field:report.account.sales,quantity:0
 #: field:report.account_type.sales,quantity:0
 msgid "Quantity"
-msgstr "Cantidad"
+msgstr ""
 
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr "Número (movimiento)"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "Analytic Entries during last 7 days"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Normal Text"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice Options"
-msgstr "Opciones factura rectificativa (abono)"
+msgstr ""
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -5312,8 +5352,6 @@ msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
-"La potencia de la conciliación automática a seleccionar es el número de los "
-"importes parciales que se pueden combinar para encontrar un saldo a cero."
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -5321,21 +5359,19 @@ msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
 msgstr ""
-"El campo secuencia es usado para ordenar las líneas de plazos de pago en "
-"orden ascendente."
 
 #. module: account
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr "Plantilla de posición fiscal"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.chart:0
 #: view:account.chart:0
 #: view:account.tax.chart:0
 msgid "Open Charts"
-msgstr "Abrir plan contable"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -5345,11 +5381,6 @@ msgid ""
 "impossible any new entry record. Close a fiscal year when you need to "
 "finalize your end of year results definitive "
 msgstr ""
-"Si no debe introducir más asientos en un ejercicio fiscal, lo puede cerrar "
-"desde aquí. Se cerrarán todos los períodos abiertos en este ejercicio que "
-"hará imposible introducir ningún asiento nuevo. Cierre un ejercicio fiscal "
-"cuando necesite finalizar los resultados de fin de ejercicio "
-"definitivamente. "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5359,118 +5390,134 @@ msgstr ""
 #: field:account.print.journal,amount_currency:0
 #: field:account.report.general.ledger,amount_currency:0
 msgid "With Currency"
-msgstr "Con divisa"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Open CashBox"
-msgstr "Abrir caja"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Automatic formatting"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:963
+#, python-format
+msgid ""
+"No fiscal year defined for this date !\n"
+"Please create one from the configuration of the accounting menu."
+msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconcile With Write-Off"
-msgstr "Conciliación con desfase"
+msgstr ""
 
 #. module: account
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
 msgid "Fixed Amount"
-msgstr "Importe fijo"
+msgstr ""
 
 #. module: account
 #: view:account.subscription:0
 msgid "Valid Up to"
-msgstr "Válido hasta"
+msgstr ""
 
 #. module: account
-#: view:board.board:0
-msgid "Aged Receivables"
-msgstr "A cobrar vencidos"
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr "Contabilidad. Conciliación automática"
+msgstr ""
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr "Apunte contable"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
 msgid "Move journal"
-msgstr "Diario movimientos"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Opening Entries"
-msgstr "Generar asientos apertura"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
-msgstr "¡Ya está conciliado!"
+msgstr ""
 
 #. module: account
 #: help:account.tax,type:0
 msgid "The computation method for the tax amount."
-msgstr "El método de cálculo del importe del impuesto."
+msgstr ""
 
 #. module: account
-#: help:account.installer.modules,account_anglo_saxon:0
-msgid ""
-"This module will support the Anglo-Saxons accounting methodology by changing "
-"the accounting logic with stock transactions."
+#: view:account.payment.term.line:0
+msgid "Due Date Computation"
 msgstr ""
-"Este módulo soporta la metodología contable anglosajón, cambiando la lógica "
-"contable en las transacciones de stock."
 
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr "Fecha de creación"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.journal:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journals"
-msgstr "Diarios analíticos"
+msgstr ""
 
 #. module: account
 #: field:account.account,child_id:0
 msgid "Child Accounts"
-msgstr "Cuentas hijas"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1229
+#, python-format
+msgid "Move name (id): %s (%s)"
+msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
-msgstr "Desajuste"
+msgstr ""
 
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr "Total a pagar"
+msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
-msgid "account.analytic.line.extended"
-msgstr "account.analytic.line.extended"
+#: model:account.account.type,name:account.data_account_type_income
+#: model:account.financial.report,name:account.account_financial_report_income0
+msgid "Income"
+msgstr ""
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/invoice.py:322
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
-msgstr "Proveedor"
+msgstr ""
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -5479,67 +5526,71 @@ msgstr "Proveedor"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "March"
-msgstr "Marzo"
+msgstr ""
 
 #. module: account
 #: view:account.account.template:0
 msgid "Account Template"
-msgstr "Plantilla de cuenta"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print.sale.purchase:0
+msgid "VAT"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Account n°"
-msgstr "Cuenta n°"
+msgstr ""
 
 #. module: account
-#: help:account.installer.modules,account_payment:0
-msgid ""
-"Streamlines invoice payment and creates hooks to plug automated payment "
-"systems in."
+#: code:addons/account/account_invoice.py:91
+#, python-format
+msgid "Free Reference"
 msgstr ""
-"Agiliza el pago de facturas y crea interfaces para conectar sistemas de pago "
-"automatizados."
 
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Valuation"
-msgstr "Valoración"
+msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:306
+#: code:addons/account/report/account_aged_partner_balance.py:376
+#: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
-msgstr "Cuentas a cobrar y pagar"
+msgstr ""
 
 #. module: account
 #: field:account.fiscal.position.account.template,position_id:0
 msgid "Fiscal Mapping"
-msgstr "Mapeo fiscal"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
 #: model:ir.model,name:account.model_account_state_open
 msgid "Account State Open"
-msgstr "Contabilidad. Abrir estado"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Max Qty:"
-msgstr "Ctdad máx."
+msgstr ""
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice"
-msgstr "Reintegrar factura"
+msgstr ""
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
 msgid "Invoice Address"
-msgstr "Dirección de factura"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_entries_report_all
@@ -5548,9 +5599,6 @@ msgid ""
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
-"Desde esta vista obtiene un análisis de sus distintas cuentas financieras. "
-"El documento muestra el debe y haber teniendo en consideración algún "
-"criterio que puede seleccionar usando la herramienta de búsqueda."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -5559,10 +5607,6 @@ msgid ""
 "OpenERP allows you to define the tax structure and manage it from this menu. "
 "You can define both numeric and alphanumeric tax codes."
 msgstr ""
-"La definición de los códigos de impuestos depende de la declaración de "
-"impuestos de su país. OpenERP le permite definir y gestionar la estructura "
-"de impuestos desde este menú. Puede definir códigos tanto numéricos como "
-"alfanuméricos."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -5570,8 +5614,6 @@ msgid ""
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
 msgstr ""
-"Le muestra el progreso realizado hoy en el proceso de conciliación. Indica:\n"
-"Empresas conciliadas hoy / (Empresas restantes + Empresas conciliadas hoy)"
 
 #. module: account
 #: help:account.payment.term.line,value:0
@@ -5580,9 +5622,6 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be threated."
 msgstr ""
-"Seleccione aquí el tipo de valoración relacionada con esta línea de plazo de "
-"pago. Tenga en cuenta que debe tener la última línea con el tipo 'Saldo' "
-"para garantizar que el importe total sea procesado."
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -5590,24 +5629,17 @@ msgstr ""
 #: field:report.account.sales,period_id:0
 #: field:report.account_type.sales,period_id:0
 msgid "Force Period"
-msgstr "Forzar período"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,nbr:0
 msgid "# of Lines"
-msgstr "Nº de líneas"
-
-#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
-#, python-format
-msgid "New currency is not confirured properly !"
-msgstr "¡La nueva moneda no está configurada correctamente!"
+msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
 #: field:account.balance.report,filter:0
-#: field:account.bs.report,filter:0
 #: field:account.central.journal,filter:0
 #: field:account.common.account.report,filter:0
 #: field:account.common.journal.report,filter:0
@@ -5616,139 +5648,140 @@ msgstr "¡La nueva moneda no está configurada correctamente!"
 #: field:account.general.journal,filter:0
 #: field:account.partner.balance,filter:0
 #: field:account.partner.ledger,filter:0
-#: field:account.pl.report,filter:0
 #: field:account.print.journal,filter:0
 #: field:account.report.general.ledger,filter:0
 #: field:account.vat.declaration,filter:0
+#: field:accounting.report,filter:0
+#: field:accounting.report,filter_cmp:0
 msgid "Filter by"
-msgstr "Filtrar por"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account.py:2273
+#, python-format
+msgid "You have a wrong expression \"%(...)s\" in your model !"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,date:0
+msgid "Entry Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
-msgstr "¡No puede utilizar una cuenta inactiva!"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:830
 #, 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! "
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end:0
+msgid "Balance as calculated based on Starting Balance and transaction lines"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not configured properly !"
+msgstr ""
 
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr "Cuenta impuestos de facturas"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_general_journal
 #: model:ir.model,name:account.model_account_general_journal
 msgid "Account General Journal"
-msgstr "Contabilidad. Diario general"
-
-#. module: account
-#: code:addons/account/report/common_report_header.py:100
-#: report:account.account.balance:0
-#: report:account.central.journal:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
-#: report:account.vat.declaration:0
-#, python-format
-msgid "No Filter"
-msgstr "Sin filtro"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term.line,days:0
 msgid "Number of Days"
-msgstr "Número de días"
+msgstr ""
 
 #. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "7"
-msgstr "7"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
+#: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
-msgstr "¡Acción no válida!"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:102
 #, python-format
 msgid "Period: %s"
-msgstr "Período: %s"
+msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Template Tax Fiscal Position"
-msgstr "Plantilla posición fiscal impuesto"
+#: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
+msgid "Review your Financial Journals"
+msgstr ""
 
 #. module: account
 #: help:account.tax,name:0
 msgid "This name will be displayed on reports"
-msgstr "Este nombre se mostrará en los informes"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
-msgstr "Fecha impresión"
+msgstr ""
 
 #. module: account
 #: selection:account.account.type,close_method:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
-msgstr "Ninguno"
+msgstr ""
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "  365 Days  "
-msgstr "  365 Días  "
+msgstr ""
 
 #. 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 "Facturas rectificativas de cliente"
+msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "Amount Computation"
-msgstr "Calculo importe"
+#: field:account.account,foreign_balance:0
+msgid "Foreign Balance"
+msgstr ""
 
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr "Nombre diario-período"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.tax,factor_base:0
 msgid "Multipication factor for Base code"
-msgstr "Factor de multiplicación para código base"
+msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:126
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
-msgstr "no implementado"
+msgstr ""
 
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr "Compañía relacionada con este diario"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -5757,36 +5790,56 @@ msgid ""
 "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state!"
 msgstr ""
-"¡La(s) factura(s) seleccionada(s) no se puede confirmar ya que no está en "
-"estado 'Borrador' o 'Pro-forma'!"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Running Subscription"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr "Observación posición fiscal :"
+msgstr ""
 
 #. module: account
 #: view:analytic.entries.report:0
 #: model:ir.actions.act_window,name:account.action_analytic_entries_report
 #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
 msgid "Analytic Entries Analysis"
-msgstr "Análisis asientos analíticos"
+msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
-msgstr "Anterior"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
+#: help:res.partner.bank,journal_id:0
+msgid ""
+"This journal will be created automatically for this bank account when you "
+"save the record"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr "Asiento analítico"
+msgstr ""
 
 #. module: account
 #: view:res.company:0
 #: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr "Mensaje pagos vencidos"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_all_a
@@ -5796,34 +5849,21 @@ msgid ""
 "line of the expense account. OpenERP will propose to you automatically the "
 "Tax related to this account and the counterpart \"Account Payable\"."
 msgstr ""
-"Esta vista puede ser utilizada por los contables para registrar asientos "
-"rápidamente en OpenERP. Si desea registrar una factura de proveedor, "
-"comience registrando el apunte de la cuenta de gastos. OpenERP le propondrá "
-"automáticamente el impuesto asociado a esta cuenta y la \"cuenta a pagar\" "
-"de contrapartida."
 
 #. module: account
 #: field:account.entries.report,date_created:0
 msgid "Date Created"
-msgstr "Fecha de creación"
-
-#. module: account
-#: field:account.payment.term.line,value_amount:0
-msgid "Value Amount"
-msgstr "Valor importe"
-
-#. module: account
-#: help:account.journal,code:0
-msgid ""
-"The code will be used to generate the numbers of the journal entries of this "
-"journal."
 msgstr ""
-"El código se usará para generar los números de los asientos de este diario."
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
+msgid "account.analytic.line.extended"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr "(vacío para período actual)"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
@@ -5831,139 +5871,137 @@ msgid ""
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
 msgstr ""
-"Tan pronto como la conciliación se ha realizado, el estado de la factura se "
-"convierte en \"Realizada\" (es decir, pagada) en el sistema."
-
-#. module: account
-#: code:addons/account/invoice.py:997
-#, python-format
-msgid "Invoice  '%s' is validated."
-msgstr "Factura '%s' es validada."
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,account_root_id:0
 msgid "Root Account"
-msgstr "Cuenta principal"
+msgstr ""
 
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
 msgid "Latest Reconciliation Date"
-msgstr "Fecha última conciliación"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic Line"
-msgstr "Línea analítica"
+msgstr ""
 
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr "Impuestos cliente"
+msgstr ""
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax_rate:0
+msgid "Sales Tax(%)"
+msgstr ""
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account Based on this Template"
-msgstr "Crear una cuenta basada en esta plantilla"
+msgstr ""
 
 #. module: account
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr "Configuración informes"
-
-#. module: account
-#: constraint:account.move.line:0
-msgid "Company must be same for its related account and period."
-msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados."
+msgstr ""
 
 #. module: account
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
 msgid "Tax Type"
-msgstr "Tipo impuesto"
+msgstr ""
 
 #. 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 "Plantillas de cuentas"
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,complete_tax_set:0
+msgid ""
+"This boolean helps you to choose if you want to propose to the user to "
+"encode the sales and purchase rates or use the usual m2o fields. This last "
+"choice assumes that the set of tax defined for the chosen template is "
+"complete"
+msgstr ""
 
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Statement"
-msgstr "Declaración de impuestos"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_res_company
 msgid "Companies"
-msgstr "Compañías"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:532
+#: view:account.invoice.report:0
+msgid "Open and Paid Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "Display children flat"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:629
 #, python-format
 msgid ""
-"You cannot modify Company of account as its related record exist in Entry "
-"Lines"
+"You can not remove/desactivate an account which is set on a customer or "
+"supplier."
 msgstr ""
-"No puede modificar la compañía de la cuenta porqué ya hay apuntes con esta "
-"cuenta"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
 msgid "Select a fiscal year to close"
-msgstr "Seleccionar un ejercicio fiscal a cerrar."
+msgstr ""
 
 #. 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 de todos los impuestos que deben ser instalados por el asistente"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_intracom
 msgid "IntraCom"
-msgstr "IntraCom"
+msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Information addendum"
-msgstr "Información adicional"
+msgstr ""
 
 #. module: account
-#: field:account.aged.trial.balance,fiscalyear_id:0
-#: field:account.balance.report,fiscalyear_id:0
-#: field:account.bs.report,fiscalyear_id:0
-#: field:account.central.journal,fiscalyear_id:0
 #: field:account.chart,fiscalyear:0
-#: field:account.common.account.report,fiscalyear_id:0
-#: field:account.common.journal.report,fiscalyear_id:0
-#: field:account.common.partner.report,fiscalyear_id:0
-#: field:account.common.report,fiscalyear_id:0
-#: field:account.general.journal,fiscalyear_id:0
-#: field:account.partner.balance,fiscalyear_id:0
-#: field:account.partner.ledger,fiscalyear_id:0
-#: field:account.pl.report,fiscalyear_id:0
-#: field:account.print.journal,fiscalyear_id:0
-#: field:account.report.general.ledger,fiscalyear_id:0
-#: field:account.vat.declaration,fiscalyear_id:0
 msgid "Fiscal year"
-msgstr "Ejercicio fiscal"
+msgstr ""
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Partial Reconcile Entries"
-msgstr "Asientos parcialmente conciliados"
+msgstr ""
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 #: view:account.aged.trial.balance:0
-#: view:account.analytic.Journal.report:0
 #: view:account.analytic.balance:0
 #: view:account.analytic.chart:0
 #: view:account.analytic.cost.ledger:0
 #: view:account.analytic.cost.ledger.journal.report:0
 #: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
 #: view:account.automatic.reconcile:0
 #: view:account.bank.statement:0
 #: view:account.change.currency:0
@@ -5973,7 +6011,6 @@ msgstr "Asientos parcialmente conciliados"
 #: view:account.fiscalyear.close.state:0
 #: view:account.invoice:0
 #: view:account.invoice.refund:0
-#: selection:account.invoice.refund,filter_refund:0
 #: view:account.journal.select:0
 #: view:account.move:0
 #: view:account.move.bank.reconcile:0
@@ -5996,95 +6033,84 @@ msgstr "Asientos parcialmente conciliados"
 #: view:validate.account.move.lines:0
 #, python-format
 msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: account
-#: field:account.account.type,name:0
-msgid "Acc. Type Name"
-msgstr "Nombre tipo cuenta"
+msgstr ""
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
+#: model:account.account.type,name:account.data_account_type_receivable
 #: selection:account.entries.report,type:0
 msgid "Receivable"
-msgstr "A cobrar"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 msgid "Other Info"
-msgstr "Otra información"
+msgstr ""
 
 #. module: account
 #: field:account.journal,default_credit_account_id:0
 msgid "Default Credit Account"
-msgstr "Cuenta haber por defecto"
-
-#. module: account
-#: view:account.installer:0
-msgid "Configure Your Accounting Chart"
-msgstr "Configure su plan contable"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  number of days: 30"
-msgstr "  número de días: 30"
+msgstr ""
 
 #. module: account
 #: help:account.analytic.line,currency_id:0
 msgid "The related account currency if not equal to the company one."
-msgstr "La moneda contable relacionada si no es igual a la de la compañía."
+msgstr ""
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current"
-msgstr "Actual"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "CashBox"
-msgstr "Caja"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_cash_equity
+msgid "Equity"
+msgstr "Capital"
 
 #. module: account
 #: selection:account.tax,type:0
 msgid "Percentage"
-msgstr "Porcentaje"
+msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
-msgstr "Diario y Empresa"
+msgstr ""
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
 msgid "Power"
-msgstr "Fuerza"
+msgstr ""
 
 #. module: account
-#: field:account.invoice.refund,filter_refund:0
-msgid "Refund Type"
-msgstr "Tipo abono"
-
-#. module: account
-#: report:account.invoice:0
-msgid "Price"
-msgstr "Precio"
+#: code:addons/account/account.py:3385
+#, python-format
+msgid "Cannot generate an unused journal code."
+msgstr ""
 
 #. module: account
 #: view:project.account.analytic.line:0
 msgid "View Account Analytic Lines"
-msgstr "Ver líneas contables analíticas"
-
-#. module: account
-#: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Liability Accounts)"
-msgstr "Balance de situación (cuentas de riesgos)"
+msgstr ""
 
 #. module: account
 #: field:account.invoice,internal_number:0
 #: field:report.invoice.created,number:0
 msgid "Invoice Number"
-msgstr "Número factura"
+msgstr ""
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -6092,30 +6118,28 @@ msgid ""
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
-"Indica si el importe del impuesto debe ser incluido en el importe base para "
-"el cálculo de los siguientes impuestos."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
 msgid "Reconciliation: Go to Next Partner"
-msgstr "Conciliación: Ir a siguiente empresa"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 msgid "Inverted Analytic Balance"
-msgstr "Saldo analítico invertido"
+msgstr ""
 
 #. module: account
 #: field:account.tax.template,applicable_type:0
 msgid "Applicable Type"
-msgstr "Tipo aplicable"
+msgstr ""
 
 #. module: account
 #: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
-msgstr "Referencia factura"
+msgstr ""
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -6124,22 +6148,19 @@ msgid ""
 "higher ones. The order is important if you have a tax that has several tax "
 "children. In this case, the evaluation order is important."
 msgstr ""
-"El campo secuencia es usado para ordenar las líneas de impuestos de menor a "
-"mayor secuencia. El orden es importante si tiene un impuesto que tiene "
-"varios impuesto hijos. En este caso, el orden de evaluación es importante."
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: view:account.journal:0
 msgid "Liquidity"
-msgstr "Liquidez"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr "Apuntes analíticos"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6148,15 +6169,11 @@ msgid ""
 "year. Note that you can run this wizard many times for the same fiscal year: "
 "it will simply replace the old opening entries with the new ones."
 msgstr ""
-"Este asistente generará los asientos de fin de ejercicio para el ejercicio "
-"fiscal seleccionado. Tenga en cuenta que puede ejecutar este asistente "
-"varias veces para el mismo ejercicio fiscal: simplemente se sustituyen los "
-"asientos de apertura viejos por los nuevos."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
 msgid "Bank and Cash"
-msgstr "Banco y caja"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_analytic_entries_report
@@ -6166,36 +6183,30 @@ msgid ""
 "the tool search to analyse information about analytic entries generated in "
 "the system."
 msgstr ""
-"Desde esta vista, dispone de un análisis de los distintos asientos "
-"analíticos de la cuenta analítica que ha definido para ajustarse a sus "
-"necesidades del negocio. Utilice la herramienta de búsqueda para analizar la "
-"información sobre los asientos analíticos generados en el sistema."
 
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr "¡El nombre del diaro debe ser único por compañía!"
+msgstr ""
 
 #. module: account
 #: field:account.account.template,nocreate:0
 msgid "Optional create"
-msgstr "Crear opcional"
-
-#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
-#, python-format
-msgid "Can not find account chart for this company, Please Create account."
 msgstr ""
-"No se ha encontrado un plan contable para esta compañía. Cree un plan "
-"contable."
 
 #. module: account
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#: code:addons/account/account.py:664
+#, python-format
+msgid ""
+"You cannot change the owner company of an account that already contains "
+"journal items."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "Enter a Start date !"
-msgstr "¡Introduzca una fecha inicial!"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -6203,27 +6214,17 @@ msgstr "¡Introduzca una fecha inicial!"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr "Factura rectificativa de proveedor"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Tablero"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
-msgstr "Apuntes"
+msgstr ""
 
 #. module: account
 #: field:account.move.line,centralisation:0
 msgid "Centralisation"
-msgstr "Centralización"
-
-#. module: account
-#: view:wizard.multi.charts.accounts:0
-msgid "Generate Your Accounting Chart from a Chart Template"
-msgstr "Generar su plan contable desde una plantilla de plan contable"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -6234,6 +6235,7 @@ msgstr "Generar su plan contable desde una plantilla de plan contable"
 #: view:account.bank.statement:0
 #: view:account.chart.template:0
 #: view:account.entries.report:0
+#: view:account.financial.report:0
 #: view:account.fiscalyear:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
@@ -6245,22 +6247,22 @@ msgstr "Generar su plan contable desde una plantilla de plan contable"
 #: view:account.tax.code.template:0
 #: view:analytic.entries.report:0
 msgid "Group By..."
-msgstr "Agrupar por..."
+msgstr ""
 
 #. module: account
 #: field:account.journal.column,readonly:0
 msgid "Readonly"
-msgstr "Sólo lectura"
+msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_account_pl_report
-msgid "Account Profit And Loss Report"
-msgstr "Contabilidad. Informe de pérdida y ganancias"
+#: view:account.payment.term.line:0
+msgid "  Valuation: Balance"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
 msgid "Unit of Measure"
-msgstr "Unidad de medida"
+msgstr ""
 
 #. module: account
 #: constraint:account.payment.term.line:0
@@ -6268,13 +6270,16 @@ msgid ""
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2% "
 msgstr ""
-"Los porcentajes de una línea de plazo de pago deben estar entre 0 y 1. Por "
-"ejemplo: 0.02 para 2% "
+
+#. module: account
+#: field:account.installer,has_default_company:0
+msgid "Has Default Company"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
 msgid "account.sequence.fiscalyear"
-msgstr "contabilidad.secuencia.ejerciciofiscal"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -6285,39 +6290,45 @@ msgstr "contabilidad.secuencia.ejerciciofiscal"
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "Analytic Journal"
-msgstr "Diario analítico"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:622
+#, python-format
+msgid "You can not desactivate an account that contains some journal items."
+msgstr ""
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Reconciled"
-msgstr "Conciliado"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 #: field:account.invoice.tax,base:0
 msgid "Base"
-msgstr "Base"
+msgstr ""
 
 #. module: account
 #: field:account.model,name:0
 msgid "Model Name"
-msgstr "Nombre modelo"
+msgstr ""
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr "Cuenta categoría gastos"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cash Transactions"
-msgstr "Transacciones de caja"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_state_open.py:37
 #, python-format
 msgid "Invoice is already reconciled"
-msgstr "La factura ya está conciliada"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -6326,33 +6337,45 @@ msgstr "La factura ya está conciliada"
 #: field:account.bank.statement.line,note:0
 #: view:account.fiscal.position:0
 #: field:account.fiscal.position,note:0
+#: field:account.fiscal.position.template,note:0
 #: view:account.invoice.line:0
 #: field:account.invoice.line,note:0
 msgid "Notes"
-msgstr "Notas"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_analytic_entries_report
 msgid "Analytic Entries Statistics"
-msgstr "Estadísticas asientos analíticos"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:624
+#, python-format
+msgid "You can not remove an account containing journal items."
+msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
-msgstr "Asientos: "
+msgstr ""
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr "Crear asientos recurrentes manuales en un diario seleccionado."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1393
+#: help:res.partner.bank,currency_id:0
+msgid "Currency of the related account journal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
-msgstr "No se ha podido crear movimiento entre diferentes compañías"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_type_form
@@ -6365,13 +6388,13 @@ msgid ""
 "account. From this view, you can create and manage the account types you "
 "need for your company."
 msgstr ""
-"Un tipo de cuenta es usado para determinar cómo se utiliza una cuenta en "
-"cada diario. El método por defecto de un tipo de cuenta determina el proceso "
-"para el cierre anual. Informes como el informe de balance y el de pérdidas y "
-"ganancias usan la categoría (perdidas/ganancias o balance). Por ejemplo, el "
-"tipo de cuenta puede ser asociado a una cuenta de activos, gastos o pagos. "
-"Desde esta vista, puede crear y gestionar los tipos de cuenta necesarios "
-"para su compañía."
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:183
+#, python-format
+msgid "Balance Sheet (Asset account)"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6380,38 +6403,36 @@ msgid ""
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
 msgstr ""
-"La conciliación bancaria consiste en verificar que su extracto bancario "
-"corresponde con las entradas (o registros) de esa cuenta en su sistema "
-"contable."
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
 msgid "State is draft"
-msgstr "Estado es borrador"
+msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1003
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
-msgstr "Total debe"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
-msgstr "¡El asiento \"%s\" no es válido!"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 msgid "Fax :"
-msgstr "Fax :"
+msgstr ""
 
 #. module: account
-#: report:account.vat.declaration:0
-#: field:account.vat.declaration,based_on:0
-msgid "Based On"
-msgstr "Basado en"
+#: view:wizard.multi.charts.accounts:0
+msgid ""
+"This will automatically configure your chart of accounts, bank accounts, "
+"taxes and journals according to the selected template"
+msgstr ""
 
 #. module: account
 #: help:res.partner,property_account_receivable:0
@@ -6419,8 +6440,6 @@ msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
 msgstr ""
-"Esta cuenta se utilizará en lugar de la cuenta por defecto como la cuenta a "
-"cobrar para la empresa actual."
 
 #. module: account
 #: field:account.tax,python_applicable:0
@@ -6431,16 +6450,12 @@ msgstr ""
 #: field:account.tax.template,python_compute:0
 #: selection:account.tax.template,type:0
 msgid "Python Code"
-msgstr "Código Python"
+msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_balance_sheet.py:70
-#, python-format
-msgid ""
-"Please define the Reserve and Profit/Loss account for current user company !"
+#: view:account.entries.report:0
+msgid "Journal Entries with period in current period"
 msgstr ""
-"¡Defina la cuenta de reservas y pérdidas/ganancias para la compañía del "
-"usuario actual!"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -6448,75 +6463,94 @@ msgid ""
 "Check this box if you want to allow the cancellation the entries related to "
 "this journal or of the invoice related to this journal"
 msgstr ""
-"Marque esta opción si quiere permitir la cancelación de asientos "
-"relacionados con este diario o de la factura relacionada con este diario."
 
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Create"
-msgstr "Crear"
+msgstr ""
 
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
 msgid "Create entry"
-msgstr "Crear asiento"
+msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  valuation: percent"
-msgstr "  valoración: porcentaje"
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:182
+#, python-format
+msgid "Profit & Loss (Expense account)"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:622
+#: code:addons/account/account.py:624
+#: code:addons/account/account.py:963
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
 #: code:addons/account/account_analytic_line.py:90
 #: code:addons/account/account_analytic_line.py:99
-#: code:addons/account/account_bank_statement.py:292
-#: code:addons/account/account_bank_statement.py:305
-#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
-#: code:addons/account/wizard/account_invoice_refund.py:100
-#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/account_bank_statement.py:301
+#: code:addons/account/account_bank_statement.py:314
+#: code:addons/account/account_bank_statement.py:352
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
+#: code:addons/account/wizard/account_invoice_refund.py:108
+#: code:addons/account/wizard/account_invoice_refund.py:110
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
-msgstr "¡Error!"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,style_overwrite:0
+msgid "Financial Report Style"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,sign:0
+msgid "Preserve balance sign"
+msgstr ""
 
 #. module: account
 #: view:account.vat.declaration:0
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
 #: model:ir.ui.menu,name:account.menu_account_vat_declaration
 msgid "Taxes Report"
-msgstr "Informe impuestos"
+msgstr ""
 
 #. module: account
 #: selection:account.journal.period,state:0
 msgid "Printed"
-msgstr "Impreso"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
+#, python-format
+msgid "Error :"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Project line"
-msgstr "Línea de proyecto"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.tax,manual:0
 msgid "Manual"
-msgstr "Manual"
+msgstr ""
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -6527,17 +6561,21 @@ msgid ""
 "reconcile in a series of accounts. It finds entries for each partner where "
 "the amounts correspond."
 msgstr ""
-"Para que una factura se considere pagada, los apuntes contables de la "
-"factura deben estar conciliados con sus contrapartidas, normalmente pagos. "
-"Con la funcionalidad de reconciliación automática, OpenERP realiza su propia "
-"búsqueda de apuntes a conciliar en una serie de cuentas. Encuentra los "
-"apuntes, para cada empresa, cuando las cantidades se correspondan."
 
 #. module: account
 #: view:account.move:0
 #: field:account.move,to_check:0
 msgid "To Review"
-msgstr "A revisar"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"If you selected to filter by date or period, this field allow you to add a "
+"row to display the amount of debit/credit/balance that precedes the filter "
+"you've set."
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6546,12 +6584,29 @@ msgstr "A revisar"
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Journal Entries"
-msgstr "Asientos contables"
+msgstr ""
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
 msgid "Display Ledger Report with One partner per page"
-msgstr "Mostrar informe libro mayor con una empresa por página."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1233
+#, python-format
+msgid ""
+"You can not do this modification on a reconciled entry! You can just change "
+"some non legal fields or you must unreconcile first!\n"
+"%s"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JRNL"
+msgstr ""
 
 #. module: account
 #: view:account.partner.balance:0
@@ -6560,8 +6615,6 @@ msgid ""
 "This report is an analysis done by a partner. It is a PDF report containing "
 "one line per partner representing the cumulative credit balance"
 msgstr ""
-"Este informe es un análisis realizado por una empresa. Es un informe PDF que "
-"contiene una línea por empresa representando el saldo del haber acumulativo."
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:61
@@ -6569,13 +6622,10 @@ msgstr ""
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state"
 msgstr ""
-"Los apuntes seleccionados no tienen ningún movimiento contable en estado "
-"borrador"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
 #: selection:account.balance.report,target_move:0
-#: selection:account.bs.report,target_move:0
 #: selection:account.central.journal,target_move:0
 #: selection:account.chart,target_move:0
 #: selection:account.common.account.report,target_move:0
@@ -6586,45 +6636,44 @@ msgstr ""
 #: selection:account.move.journal,target_move:0
 #: selection:account.partner.balance,target_move:0
 #: selection:account.partner.ledger,target_move:0
-#: selection:account.pl.report,target_move:0
 #: selection:account.print.journal,target_move:0
 #: selection:account.report.general.ledger,target_move:0
 #: selection:account.tax.chart,target_move:0
 #: selection:account.vat.declaration,target_move:0
+#: selection:accounting.report,target_move:0
 #: code:addons/account/report/common_report_header.py:67
-#: model:ir.actions.report.xml,name:account.account_move_line_list
 #, python-format
 msgid "All Entries"
-msgstr "Todos los asientos"
+msgstr ""
 
 #. module: account
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
-"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-"categoría."
 
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr "Seleccionar diario"
+msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: view:account.bank.statement:0
+#: code:addons/account/account.py:420
+#: code:addons/account/account.py:432
 #, python-format
-msgid "Currnt currency is not confirured properly !"
-msgstr "¡La moneda actual no está configurada correctamente!"
+msgid "Opening Balance"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr "Contabilidad. Conciliación"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Position"
-msgstr "Posición fiscal impuestos"
+msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
@@ -6632,26 +6681,23 @@ msgstr "Posición fiscal impuestos"
 #: view:account.report.general.ledger:0
 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
 #: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
-msgstr "Libro mayor"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
 msgid "The payment order is sent to the bank."
-msgstr "La orden de pago ha sido enviada al banco."
+msgstr ""
 
 #. module: account
 #: view:account.balance.report:0
-#: view:account.bs.report:0
 msgid ""
 "This report allows you to print or generate a pdf of your trial balance "
 "allowing you to quickly check the balance of each of your accounts in a "
 "single report"
 msgstr ""
-"Este informe le permite imprimir o generar un pdf de su balance de sumas y "
-"saldos permitiendo comprobar con rapidez el saldo de cada una de sus cuentas "
-"en un único informe."
 
 #. module: account
 #: help:account.move,to_check:0
@@ -6659,28 +6705,30 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
-"Marque esta opción si no está seguro de este asiento y desea marcarlo como "
-"'Para ser revisado' por un experto contable."
 
 #. module: account
-#: help:account.installer.modules,account_voucher:0
-msgid ""
-"Account Voucher module includes all the basic requirements of Voucher "
-"Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
+#: field:account.chart.template,complete_tax_set:0
+#: field:wizard.multi.charts.accounts,complete_tax_set:0
+msgid "Complete Set of Taxes"
 msgstr ""
-"El módulo de recibos (justificantes) contables incluye todos los requisitos "
-"básicos de justificantes bancarios, de caja, ventas, compras, gastos, "
-"contrapartidas, etc... "
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Properties"
-msgstr "Propiedades"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_chart
 msgid "Account tax chart"
-msgstr "Contabilidad. Plan de impuestos"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -6688,12 +6736,14 @@ msgstr "Contabilidad. Plan de impuestos"
 #: report:account.central.journal:0
 #: report:account.general.journal:0
 #: report:account.invoice:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 msgid "Total:"
-msgstr "Total:"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6705,58 +6755,51 @@ msgid ""
 "\n"
 "e.g. My model on %(date)s"
 msgstr ""
-"Puede indicar el año, mes y fecha en el nombre del modelo usando las "
-"siguientes etiquetas :  \n"
-"\n"
-"%(year)s: Para especificar el año \n"
-"%(month)s: Para especificar el mes \n"
-"%(date)s: Fecha actual\n"
-"Ejemplo: Mi modelo del %(date)s"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Cuentas de ingresos"
 
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
-msgstr "Referencia del documento que ha generado este informe de factura."
+msgstr ""
 
 #. module: account
 #: field:account.tax.code,child_ids:0
 #: field:account.tax.code.template,child_ids:0
 msgid "Child Codes"
-msgstr "Códigos hijos"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:473
-#: code:addons/account/wizard/account_invoice_refund.py:137
+#: view:account.tax.template:0
+msgid "Taxes used in Sales"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:504
+#: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
-msgstr "¡Datos insuficientes!"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
-msgstr "Facturas de cliente"
+msgstr ""
 
 #. module: account
 #: field:account.move.line.reconcile,writeoff:0
 msgid "Write-Off amount"
-msgstr "Importe desajuste"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Sales"
-msgstr "Ventas"
+msgstr ""
 
 #. module: account
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr "Columna diario"
+msgstr ""
 
 #. module: account
 #: selection:account.invoice.report,state:0
@@ -6764,13 +6807,21 @@ msgstr "Columna diario"
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
 msgid "Done"
-msgstr "Realizado"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"Configure your company's bank account and select those that must appear on "
+"the report footer. You can reorder banks in the list view. If you use the "
+"accounting application of OpenERP, journals and accounts will be created "
+"automatically based on these data."
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
 msgstr ""
-"Un extracto con entradas manuales se convierte en un extracto borrador."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -6782,48 +6833,46 @@ msgid ""
 "you request an interval of 30 days OpenERP generates an analysis of "
 "creditors for the past month, past two months, and so on. "
 msgstr ""
-"Saldos vencidos de empresa es un informe más detallado de sus efectos a "
-"cobrar por intervalos. Al abrir el informe, OpenERP pregunta por el nombre "
-"de la compañía, el periodo fiscal, y el tamaño del intervalo a analizar (en "
-"días). Luego OpenERP calcula una tabla del saldo deudor por periodo. Así que "
-"si solicita un intervalo de 30 días, OpenERP genera un análisis de todos los "
-"deudores para el mes pasado, últimos dos meses, etc. "
 
 #. module: account
 #: field:account.invoice,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr "Documento origen"
-
-#. module: account
-#: help:account.account.type,sign:0
-msgid ""
-"Allows you to change the sign of the balance amount displayed in the "
-"reports, so that you can see positive figures instead of negative ones in "
-"expenses accounts."
 msgstr ""
-"Permite cambiar el signo del saldo que se muestra en los informes, para que "
-"pueda ver cifras positivas en vez de negativas en cuentas de gastos."
 
 #. module: account
+#: code:addons/account/account.py:1449
+#, python-format
+msgid "You can not delete a posted journal entry \"%s\"!"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.ledger,filter:0
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+#, python-format
 msgid "Unreconciled Entries"
-msgstr "Asientos no conciliados"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
 msgid "Statements Reconciliation"
-msgstr "Conciliación de extractos"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_accounting_report
+msgid "Accounting Report"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 msgid "Taxes:"
-msgstr "Impuestos:"
+msgstr ""
 
 #. module: account
 #: help:account.tax,amount:0
 msgid "For taxes of type percentage, enter % ratio between 0-1."
-msgstr "Para impuestos de tipo porcentaj, introduzca valor % entre 0-1."
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -6833,18 +6882,18 @@ msgid ""
 "an agreement with a customer or a supplier. With Define Recurring Entries, "
 "you can create such entries to automate the postings in the system."
 msgstr ""
-"Un asiento recurrente es un asiento contable que ocurre de forma recurrente "
-"desde una determinada fecha. Por ejemplo la firma de un contrato o un "
-"acuerdo con un cliente o un proveedor. Con la definición de asientos "
-"recurrentes, puede crear estos asientos para automatizar las anotaciones "
-"contables en el sistema."
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
+msgid "Financial Reports Hierarchy"
+msgstr ""
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product UOM"
-msgstr "UdM del producto"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -6854,16 +6903,6 @@ msgid ""
 "basis. You can enter the coins that are in your cash box, and then post "
 "entries when money comes in or goes out of the cash box."
 msgstr ""
-"Un registro de caja le permite gestionar los asientos de caja en sus diarios "
-"de caja. Esta funcionalidad provee una forma fácil de realizar el "
-"seguimiento de los pagos de caja diariamente. Puede introducir las monedas "
-"que tiene en su caja y luego registrar asientos cuando el dinero entra o "
-"sale de la caja."
-
-#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "9"
-msgstr "9"
 
 #. module: account
 #: help:account.invoice.refund,date:0
@@ -6871,84 +6910,68 @@ msgid ""
 "This date will be used as the invoice date for Refund Invoice and Period "
 "will be chosen accordingly!"
 msgstr ""
-"Esta fecha se utilizará como la fecha de facturación de la factura "
-"rectificativa (abono) y el período será elegido en consecuencia."
-
-#. module: account
-#: field:account.aged.trial.balance,period_length:0
-msgid "Period length (days)"
-msgstr "Longitud del período (días)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
 msgid "Monthly Turnover"
-msgstr "Volumen mensual"
+msgstr ""
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr "Líneas analíticas"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
-msgid ""
-"The normal chart of accounts has a structure defined by the legal "
-"requirement of the country. The analytic chart of account structure should "
-"reflect your own business needs in term of costs/revenues reporting. They "
-"are usually structured by contracts, projects, products or departements. "
-"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
-"generate analytic entries on the related account."
 msgstr ""
-"El plan de cuentas normales tiene una estructura predefinida por los "
-"requisitos legales del país. La estructura del plan de cuentas analíticas "
-"debería reflejar las necesidades de su negocio de cara al análisis de costes "
-"e ingresos. Por lo general se estructuran por contratos, proyectos, "
-"productos o departamentos. La mayoría de las operaciones de OpenERP "
-"(facturas, hojas de servicio, gastos, etc) generan asientos analíticos en la "
-"cuenta asociada."
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
 #: field:account.tax.code,line_ids:0
 msgid "Lines"
-msgstr "Líneas"
-
-#. module: account
-#: code:addons/account/invoice.py:521
-#, python-format
-msgid ""
-"Can not find account chart for this company in invoice line account, Please "
-"Create account."
 msgstr ""
-"No se ha encontrado un plan contable para esta compañía en la cuenta de la "
-"línea de factura. Cree una cuenta."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Account Tax Template"
-msgstr "Plantilla de impuestos"
+msgstr ""
 
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr "¿Está seguro que quiere abrir los asientos?"
+msgstr ""
 
 #. module: account
 #: view:account.state.open:0
 msgid "Are you sure you want to open this invoice ?"
-msgstr "¿Está seguro que desea abrir esta factura?"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:963
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
+#, python-format
+msgid ""
+"Can not find a chart of account, you should create one from the "
+"configuration of the accounting menu."
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_opening:0
+msgid "Opening Entries Expense Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
-msgstr "Asientos contables"
+msgstr ""
 
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
-msgstr "Plantilla cuenta padre"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Configure your Chart of Accounts"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6956,57 +6979,12 @@ msgstr "Plantilla cuenta padre"
 #: field:account.move.line,statement_id:0
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement"
-msgstr "Extracto"
+msgstr ""
 
 #. module: account
 #: help:account.journal,default_debit_account_id:0
 msgid "It acts as a default account for debit amount"
-msgstr "Actúa como una cuenta por defecto para importes en el debe."
-
-#. module: account
-#: model:ir.module.module,description:account.module_meta_information
-msgid ""
-"Financial and accounting module that covers:\n"
-"    General accountings\n"
-"    Cost / Analytic accounting\n"
-"    Third party accounting\n"
-"    Taxes management\n"
-"    Budgets\n"
-"    Customer and Supplier Invoices\n"
-"    Bank statements\n"
-"    Reconciliation process by partner\n"
-"    Creates a dashboard for accountants that includes:\n"
-"    * List of uninvoiced quotations\n"
-"    * Graph of aged receivables\n"
-"    * Graph of aged incomes\n"
-"\n"
-"The processes like maintaining of general ledger is done through the defined "
-"financial Journals (entry move line or\n"
-"grouping is maintained through journal) for a particular financial year and "
-"for preparation of vouchers there is a\n"
-"module named account_voucher.\n"
-"    "
 msgstr ""
-"Módulo financiero y contable que cubre:\n"
-"    Contabilidad general\n"
-"    Contabilidad analítica / de costes\n"
-"    Gestión de terceros\n"
-"    Gestión de impuestos\n"
-"    Presupuestos\n"
-"    Facturación de clientes y proveedores\n"
-"    Extractos bancarios\n"
-"    Conciliación por tercero\n"
-"    Crea un cuadro de mandos para contables que incluye:\n"
-"    * Lista de presupuestos sin facturar\n"
-"    * Gráfica de cuentas vencidas a cobrar\n"
-"    * Gráfica de efectos a cobrar\n"
-"\n"
-"Los procesos, como el mantenimiento del libro mayor se realizan a través de "
-"los diarios financieros definidos\n"
-"(los asientos se agrupan por diario) para un ejercicio fiscal determinado; y "
-"para la preparación de recibos \n"
-"existe un módulo llamado account_voucher.\n"
-"    "
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -7014,49 +6992,55 @@ msgid ""
 "You can search for individual account entries through useful information. To "
 "search for account entries, open a journal, then select a record line."
 msgstr ""
-"Puede buscar un asiento contable en concreto a través de información útil. "
-"Para buscar asientos contables, abra un diario, luego seleccione un apunte."
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Posted entries"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value_amount:0
+msgid "For percent enter a ratio between 0-1."
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
 #: field:account.invoice,date_invoice:0
-#: view:account.invoice.report:0
 #: field:report.invoice.created,date_invoice:0
 msgid "Invoice Date"
-msgstr "Fecha factura"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by year of Invoice Date"
+msgstr ""
 
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr "Importe total que este cliente le debe."
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
 msgid "ir.sequence"
-msgstr "ir.secuencia"
+msgstr ""
 
 #. module: account
 #: field:account.journal.period,icon:0
 msgid "Icon"
-msgstr "Icono"
+msgstr ""
 
 #. module: account
 #: view:account.automatic.reconcile:0
 #: view:account.use.model:0
 msgid "Ok"
-msgstr "Aceptar"
+msgstr ""
 
 #. module: account
-#: code:addons/account/report/account_partner_balance.py:115
-#, python-format
-msgid "Unknown Partner"
-msgstr "Empresa desconocida"
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Opening Balance"
-msgstr "Saldo de apertura"
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr ""
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -7065,44 +7049,36 @@ msgid ""
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
 msgstr ""
-"Marque esta opción para que cada asiento de este diario no crea una nueva "
-"contrapartida, sino que comparta la misma contrapartida. Se usa en el cierre "
-"del ejercicio fiscal."
 
 #. module: account
 #: field:account.bank.statement,closing_date:0
 msgid "Closed On"
-msgstr "Cerrado en"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr "Línea de extracto bancario"
+msgstr ""
 
 #. module: account
 #: field:account.automatic.reconcile,date2:0
 msgid "Ending Date"
-msgstr "Fecha final"
+msgstr ""
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr "Impuesto de compra por defecto"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_opening:0
+msgid "Opening Entries Income Account"
+msgstr ""
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: account
-#: help:account.invoice,partner_bank_id:0
-msgid ""
-"Bank Account Number, Company bank account if Invoice is customer or supplier "
-"refund, otherwise Partner bank account number."
 msgstr ""
-"Número de cuenta bancaria, cuenta bancaria de la compañía si la factura es "
-"un abono de cliente o proveedor, si no cuenta bancaria de la empresa cliente "
-"o proveedor."
 
 #. module: account
 #: help:account.tax,domain:0
@@ -7111,52 +7087,71 @@ msgid ""
 "This field is only used if you develop your own module allowing developers "
 "to create specific taxes in a custom domain."
 msgstr ""
-"Este campo sólo se usará si desarrolla su propio módulo permitiendo a los "
-"desarrolladores crear impuestos específicos en una configuración "
-"personalizada."
 
 #. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
-"Debería haber seleccionado periodos que pertenezcan a la misma compañía"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
+msgid "Review your Payment Terms"
+msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
-msgstr "Nombre de nuevos asientos"
+msgstr ""
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries"
-msgstr "Crear asientos"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Information About the Bank"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
 msgid "Reporting"
-msgstr "Informe"
+msgstr ""
 
 #. module: account
-#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
-msgstr "¡El código del diario debe ser único por compañía!"
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_analytic_open
+msgid "Contracts/Analytic Accounts"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
 msgid "Closing Cashbox"
-msgstr "Cierre de caja"
+msgstr ""
 
 #. module: account
 #: view:account.journal:0
+#: field:res.partner.bank,journal_id:0
 msgid "Account Journal"
-msgstr "Diario de contabilidad"
+msgstr ""
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
 #: model:process.node,name:account.process_node_supplierpaidinvoice0
 msgid "Paid invoice"
-msgstr "Factura pagada"
+msgstr ""
 
 #. module: account
 #: help:account.partner.reconcile.process,next_partner_id:0
@@ -7165,25 +7160,28 @@ msgid ""
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
 msgstr ""
-"Este campo muestra la siguiente empresa que será elegida automáticamente por "
-"el sistema para pasar por el proceso de conciliación, basado en el último "
-"día que ha sido conciliada."
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
 msgid "Comment"
-msgstr "Comentario"
+msgstr ""
 
 #. module: account
 #: field:account.tax,domain:0
 #: field:account.tax.template,domain:0
 msgid "Domain"
-msgstr "Dominio"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr "Usar modelo"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:429
+#, python-format
+msgid "Unable to adapt the initial balance (negative value)!"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7193,129 +7191,86 @@ msgid ""
 "line of the expense account, OpenERP will propose to you automatically the "
 "Tax related to this account and the counter-part \"Account Payable\"."
 msgstr ""
-"Esta vista es usada por los contables para registrar asientos masivamente en "
-"OpenERP. Si quiere registrar una factura de proveedor, comience "
-"introduciendo el apunte de la cuenta de gastos. OpenERP le propondrá "
-"automáticamente el impuesto asociado a esta cuenta, y la \"cuenta a pagar\" "
-"de contrapartida."
-
-#. module: account
-#: help:res.company,property_reserve_and_surplus_account:0
-msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
-"will be added, Loss : Amount will be deducted.), Which is calculated from "
-"Profit & Loss Report"
-msgstr ""
-"Esta cuenta se utiliza para transferir las Pérdidas/Ganancias (si es una "
-"Ganancia: Importe será añadido, Pérdida: Importe será deducido), que se "
-"calcula en el informe de Pérdidas y Ganancias."
 
 #. module: account
 #: view:account.invoice.line:0
 #: field:account.invoice.tax,invoice_id:0
 #: model:ir.model,name:account.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "Línea de factura"
-
-#. module: account
-#: field:account.balance.report,display_account:0
-#: field:account.bs.report,display_account:0
-#: field:account.common.account.report,display_account:0
-#: field:account.pl.report,display_account:0
-#: field:account.report.general.ledger,display_account:0
-msgid "Display accounts"
-msgstr "Mostrar cuentas"
-
-#. module: account
-#: field:account.account.type,sign:0
-msgid "Sign on Reports"
-msgstr "Signo en informes"
-
-#. module: account
-#: code:addons/account/account_cash_statement.py:249
-#, python-format
-msgid "You can not have two open register for the same journal"
-msgstr "No puede tener dos registros abiertos para el mismo diario"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  day of the month= -1"
-msgstr "  día del mes= -1"
-
-#. module: account
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "¡Error! No puede crear miembros asociados recursivos."
-
-#. module: account
-#: help:account.journal,type:0
-msgid ""
-"Select 'Sale' for Sale journal to be used at the time of making invoice. "
-"Select 'Purchase' for Purchase Journal to be used at the time of approving "
-"purchase order. Select 'Cash' to be used at the time of making payment. "
-"Select 'General' for miscellaneous operations. Select 'Opening/Closing "
-"Situation' to be used at the time of new fiscal year creation or end of year "
-"entries generation."
 msgstr ""
-"Seleccione 'Ventas' para el diario de ventas que será usado cuando se creen "
-"facturas. Seleccione 'Compras' para el diario a usar cuando se aprueben "
-"pedidos de compra. Seleccione 'Efectivo' (Caja) para que se use a la hora de "
-"hacer pagos. Seleccione 'General' para operaciones misceláneas. Seleccione "
-"'Situación apertura/cierre' para usarlo cuando se crea un nuevo ejercicio "
-"fiscal o la generación del asiento de cierre."
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer And Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,sign:0
+msgid "Sign on Reports"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#, python-format
+msgid "The periods to generate opening entries were not found"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_view
+msgid "Root/View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3138
+#, python-format
+msgid "OPEJ"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
-#: report:account.move.voucher:0
 msgid "PRO-FORMA"
-msgstr "PRO-FORMA"
-
-#. module: account
-#: help:account.installer.modules,account_followup:0
-msgid ""
-"Helps you generate reminder letters for unpaid invoices, including multiple "
-"levels of reminding and customized per-partner policies."
 msgstr ""
-"Le ayuda a generar cartas recordatorias para las facturas pendientes de "
-"pago, incluyendo múltiples niveles de recordatorio y políticas "
-"personalizadas por empresa."
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
-msgstr "Descuadrado"
+msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Normal"
-msgstr "Normal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_email_templates
+#: model:ir.ui.menu,name:account.menu_email_templates
+msgid "Email Templates"
+msgstr ""
 
 #. module: account
 #: view:account.move.line:0
 msgid "Optional Information"
-msgstr "Información opcional"
+msgstr ""
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.journal:0
-#: field:account.journal,user_id:0
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
+#, python-format
+msgid "The journal must have default credit and debit account"
+msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
-msgstr ":"
+msgstr ""
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "At Date"
-msgstr "En fecha"
+msgstr ""
 
 #. module: account
 #: help:account.move.line,date_maturity:0
@@ -7323,72 +7278,122 @@ msgid ""
 "This field is used for payable and receivable journal entries. You can put "
 "the limit date for the payment of this line."
 msgstr ""
-"Este campo se usa para asientos a pagar y a cobrar. Puede introducir la "
-"fecha límite para el pago de esta línea."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1271
+#: model:ir.ui.menu,name:account.menu_multi_currency
+msgid "Multi-Currencies"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date_maturity:0
+msgid "Maturity Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
-msgstr "¡Cuenta incorrecta!"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2777
-#: code:addons/account/installer.py:432
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
-msgstr "Diario de ventas"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr "¡Asientos abiertos!"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
 msgid "Invoice Tax"
-msgstr "Impuesto de factura"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
-msgstr "¡Ningún trozo de número!"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+#: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
+msgid "Account Reports Hierarchy"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,chart_template_id:0
+msgid ""
+"This optional field allow you to link an account template to a specific "
+"chart template that may differ from the one its root parent belongs to. This "
+"allow you to define chart templates that extend another and complete it with "
+"few new accounts (You don't need to define the whole structure that is "
+"common to both several times)."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Unposted Journal Entries"
+msgstr ""
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Sales Properties"
-msgstr "Propiedades de venta"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
 msgid "Manual Reconciliation"
-msgstr "Conciliación manual"
+msgstr ""
 
 #. module: account
 #: report:account.overdue:0
 msgid "Total amount due:"
-msgstr "Importe total debido:"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.chart,to_date:0
 #: field:project.account.analytic.line,to_date:0
 msgid "To"
-msgstr "Hasta"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+#: code:addons/account/account.py:1535
+#, python-format
+msgid "Currency Adjustment"
+msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,fy_id:0
 #: field:account.fiscalyear.close.state,fy_id:0
 msgid "Fiscal Year to close"
-msgstr "Ejercicio fiscal a cerrar"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.cancel:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_cancel
 msgid "Cancel Selected Invoices"
-msgstr "Cancelar facturas seleccionadas"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,report_type:0
+msgid ""
+"This field is used to generate legal reports: profit and loss, balance sheet."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
+msgid ""
+"Payment terms define the conditions to pay a customer or supplier invoice in "
+"one or several payments. Customers periodic reminders will use the payment "
+"terms for each letter. Each customer or supplier can be assigned to one of "
+"these payment terms."
+msgstr ""
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -7397,7 +7402,7 @@ msgstr "Cancelar facturas seleccionadas"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "May"
-msgstr "Mayo"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -7406,53 +7411,94 @@ msgstr "Mayo"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:304
+#: code:addons/account/report/account_aged_partner_balance.py:374
+#: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
-msgstr "Cuentas a pagar"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:741
+#, python-format
+msgid "Global taxes defined, but they are not in invoice lines !"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
-msgstr "Plantillas para el plan contable"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,sequence:0
+msgid ""
+"The sequence field is used to order the resources from lower sequences to "
+"higher ones."
+msgstr ""
 
 #. module: account
 #: field:account.tax.code,code:0
 #: field:account.tax.code.template,code:0
 msgid "Case Code"
-msgstr "Código"
+msgstr ""
 
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr "Asentar asientos de un diario"
+msgstr ""
 
 #. module: account
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr "Impuestos de ventas"
+msgstr ""
 
 #. module: account
+#: field:account.financial.report,name:0
+msgid "Report Name"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_cash
 #: selection:account.analytic.journal,type:0
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
+#: code:addons/account/account.py:3020
+#, python-format
 msgid "Cash"
-msgstr "Efectivo"
+msgstr ""
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
 #: field:account.fiscal.position.account.template,account_dest_id:0
 msgid "Account Destination"
-msgstr "Cuenta destino"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "UserError"
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Payment of invoices"
-msgstr "Pago de facturas"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
+#: field:account.financial.report,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: view:account.journal:0
 #: field:account.journal.column,sequence:0
@@ -7460,44 +7506,45 @@ msgstr "Pago de facturas"
 #: field:account.payment.term.line,sequence:0
 #: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
+#: field:account.tax.code,sequence:0
 #: field:account.tax.template,sequence:0
 msgid "Sequence"
-msgstr "Secuencia"
-
-#. module: account
-#: model:ir.model,name:account.model_account_bs_report
-msgid "Account Balance Sheet Report"
-msgstr "Contabilidad. Informe balance de situación"
-
-#. module: account
-#: help:account.tax,price_include:0
-#: help:account.tax.template,price_include:0
-msgid ""
-"Check this if the price you use on the product and invoices includes this "
-"tax."
 msgstr ""
-"Marque esta opción si el precio que utiliza en el producto y en las facturas "
-"incluye este impuesto."
+
+#. module: account
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: account
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries."
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Parent Report"
+msgstr ""
 
 #. module: account
 #: view:account.state.open:0
 msgid "Yes"
-msgstr "Sí"
+msgstr ""
 
 #. module: account
 #: view:report.account_type.sales:0
 msgid "Sales by Account type"
-msgstr "Ventas por tipo de cuenta"
+msgstr ""
 
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr "Enlace a los asientos generados automáticamente."
+msgstr ""
 
 #. module: account
 #: selection:account.installer,period:0
 msgid "Monthly"
-msgstr "Mensual"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_view
@@ -7508,37 +7555,27 @@ msgid ""
 "in which they will appear. Then you can create a new journal and link your "
 "view to it."
 msgstr ""
-"Aquí puede personalizar una vista de un diario existente o crear una nueva "
-"vista. Las vistas de diarios determinan la forma en la que puede registrar "
-"asientos en sus diarios. Seleccione los campos que desea que aparezcan en un "
-"diario y determine la secuencia en que aparecen. Después puede crear un "
-"diario nuevo y asociarle una vista."
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  number of days: 14"
-msgstr "  número de días: 14"
+#: model:account.account.type,name:account.data_account_type_asset
+msgid "Asset"
+msgstr ""
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "    7 Days    "
-msgstr "    7 Días    "
+msgstr ""
 
 #. module: account
-#: field:account.partner.reconcile.process,progress:0
-msgid "Progress"
-msgstr "Progreso"
+#: field:account.bank.statement,balance_end:0
+msgid "Computed Balance"
+msgstr ""
 
 #. module: account
 #: field:account.account,parent_id:0
-#: view:account.analytic.account:0
+#: field:account.financial.report,parent_id:0
 msgid "Parent"
-msgstr "Padre"
-
-#. module: account
-#: field:account.installer.modules,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr "Planes analíticos múltiples"
+msgstr ""
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -7547,19 +7584,16 @@ 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 ""
-"Día del mes, introduzca -1 para el último día del mes actual. Si es "
-"positivo, indica el día del próximo mes. Introduzca 0 para días netos (de lo "
-"contrario se calcula desde principio del mes)."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Reports"
-msgstr "Informes legales"
+msgstr ""
 
 #. module: account
 #: field:account.tax.code,sum_period:0
 msgid "Period Sum"
-msgstr "Suma del período"
+msgstr ""
 
 #. module: account
 #: help:account.tax,sequence:0
@@ -7568,14 +7602,11 @@ 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 ""
-"El campo secuencia es usado para ordenar las líneas de impuestos de menor a "
-"mayor secuencia. El orden es importante si un impuesto tiene varios impuesto "
-"hijos. En este caso, el orden de evaluación es importante."
 
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr "Línea de caja"
+msgstr ""
 
 #. module: account
 #: view:account.partner.ledger:0
@@ -7585,55 +7616,46 @@ msgstr "Línea de caja"
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 #: model:ir.ui.menu,name:account.menu_account_partner_ledger
 msgid "Partner Ledger"
-msgstr "Libro mayor de empresa"
-
-#. module: account
-#: report:account.account.balance.landscape:0
-msgid "Year :"
-msgstr "Ejercicio :"
+msgstr ""
 
 #. module: account
 #: selection:account.tax.template,type:0
 msgid "Fixed"
-msgstr "Fijo"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
-#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:629
+#: code:addons/account/account.py:642
+#: code:addons/account/account.py:645
+#: code:addons/account/account.py:664
+#: code:addons/account/account.py:787
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
+#: code:addons/account/account_move_line.py:97
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
-msgstr "¡Atención!"
+msgstr ""
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr "Estado de línea movimiento"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
-#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile"
-msgstr "Contabilidad. Conciliar línea movimiento"
+msgstr ""
 
 #. module: account
 #: view:account.subscription.generate:0
 #: model:ir.model,name:account.model_account_subscription_generate
 msgid "Subscription Compute"
-msgstr "Calcular asientos periódicos"
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr "Importe (en palabras):"
+msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
@@ -7647,6 +7669,7 @@ msgstr "Importe (en palabras):"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,partner_id:0
 #: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model.line,partner_id:0
 #: view:account.move:0
 #: field:account.move,partner_id:0
@@ -7657,26 +7680,39 @@ msgstr "Importe (en palabras):"
 #: model:ir.model,name:account.model_res_partner
 #: field:report.invoice.created,partner_id:0
 msgid "Partner"
-msgstr "Empresa"
+msgstr ""
 
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr "Seleccione una moneda a aplicar en la factura."
+msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:100
+#: code:addons/account/account.py:3463
+#, python-format
+msgid ""
+"The bank account defined on the selected chart of accounts hasn't a code."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:108
 #, python-format
 msgid "Can not %s draft/proforma/cancel invoice."
-msgstr "No se puede %s factura borrador/proforma/cancelada."
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
-msgstr "¡No hay líneas de factura!"
+msgstr ""
 
 #. module: account
+#: view:account.financial.report:0
+msgid "Report Type"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
 #: view:account.bank.statement:0
 #: field:account.bank.statement,state:0
 #: field:account.entries.report,move_state:0
@@ -7694,7 +7730,7 @@ msgstr "¡No hay líneas de factura!"
 #: field:account.subscription,state:0
 #: field:report.invoice.created,state:0
 msgid "State"
-msgstr "Estado"
+msgstr ""
 
 #. module: account
 #: help:account.open.closed.fiscalyear,fyear_id:0
@@ -7702,45 +7738,57 @@ msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
 msgstr ""
-"Seleccione el ejercicio fiscal que desea eliminar asientos de su diario de "
-"asientos fin de ejercicio."
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
 msgid "Tax Use In"
-msgstr "Impuesto usado en"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:346
+#: code:addons/account/account_bank_statement.py:315
+#, python-format
+msgid ""
+"The statement balance is incorrect !\n"
+"The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:353
 #, 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."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
+msgid ""
+"The normal chart of accounts has a structure defined by the legal "
+"requirement of the country. The analytic chart of accounts structure should "
+"reflect your own business needs in term of costs/revenues reporting. They "
+"are usually structured by contracts, projects, products or departements. "
+"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
+"generate analytic entries on the related account."
+msgstr ""
 
 #. module: account
 #: field:account.account.type,close_method:0
 msgid "Deferral Method"
-msgstr "Método cierre"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
-msgstr "La factura '%s' está pagada."
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Automatic entry"
-msgstr "Asiento automático"
+msgstr ""
 
 #. module: account
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr "¡Error! No puede crear códigos de impuestos recursivos."
-
-#. module: account
-#: view:account.invoice.line:0
-msgid "Line"
-msgstr "Línea"
+msgstr ""
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
@@ -7748,8 +7796,12 @@ msgid ""
 "If this box is checked, the system will try to group the accounting lines "
 "when generating them from invoices."
 msgstr ""
-"Si esta opción está marcada, el sistema tratará de agrupar las líneas del "
-"asiento cuando se generen desde facturas."
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this box if this account allows reconciliation of journal items."
+msgstr ""
 
 #. module: account
 #: help:account.period,state:0
@@ -7757,63 +7809,70 @@ msgid ""
 "When monthly periods are created. The state is 'Draft'. At the end of "
 "monthly period it is in 'Done' state."
 msgstr ""
-"Cuando se crean los periodos mensuales el estado es 'Borrador'. Al final del "
-"periodo mensual está en estado 'Realizado'."
 
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
 msgid "Inverted Analytic Balance -"
-msgstr "Balance analítico invertido -"
+msgstr ""
 
 #. module: account
 #: view:account.move.bank.reconcile:0
 msgid "Open for Bank Reconciliation"
-msgstr "Abrir para la conciliación bancaria"
+msgstr ""
 
 #. module: account
-#: field:account.partner.ledger,page_split:0
-msgid "One Partner Per Page"
-msgstr "Una empresa por página"
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
 
 #. module: account
-#: field:account.account,child_parent_ids:0
-#: field:account.account.template,child_parent_ids:0
-msgid "Children"
-msgstr "Hijos"
+#: view:report.account_type.sales:0
+msgid "This Months Sales by type"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr "Empresa asociada"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
-msgstr "¡Primero debe seleccionar una empresa!"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,comment:0
 msgid "Additional Information"
-msgstr "Información adicional"
+msgstr ""
 
 #. module: account
-#: view:account.installer:0
-msgid "Bank and Cash Accounts"
-msgstr "Cuentas de banco y caja"
+#: help:account.invoice,state:0
+msgid ""
+" * 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 'Paid' state is set automatically when the invoice is paid. Its "
+"related journal entries may or may not be reconciled.             \n"
+"* The 'Cancelled' state is used when user cancel invoice."
+msgstr ""
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr "Total residual"
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Invoice's state is Open"
-msgstr "Estado de la factura es Abierta"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -7822,55 +7881,49 @@ msgid ""
 "will see the taxes with codes related to your legal statement according to "
 "your country."
 msgstr ""
-"El plan de impuestos se usa para generar sus informes periódicos de "
-"impuestos. Verá los impuestos con códigos relativos a sus requisitos legales "
-"de acuerdo a su país."
 
 #. module: account
-#: view:account.installer.modules:0
-msgid "Add extra Accounting functionalities to the ones already installed."
+#: code:addons/account/account_invoice.py:437
+#, python-format
+msgid ""
+"Can not find a chart of accounts for this company, you should create one."
 msgstr ""
-"Añade funcionalidades contables extras a las que ya tiene instaladas."
-
-#. module: account
-#: report:account.analytic.account.cost_ledger:0
-#: report:account.analytic.account.quantity_cost_ledger:0
-#: model:ir.actions.act_window,name:account.action_account_analytic_cost
-#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
-msgid "Cost Ledger"
-msgstr "Costo contable"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma"
-msgstr "Proforma"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr "Cód. diario/Nombre mov."
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
 msgid "Choose Fiscal Year"
-msgstr "Seleccione el ejercicio fiscal"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2841
-#: code:addons/account/installer.py:495
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr "Diario de abono de compras"
+msgstr ""
 
 #. module: account
 #: help:account.tax.template,amount:0
 msgid "For Tax Type percent enter % ratio between 0-1."
-msgstr "Para los porcentaje del tipo de pago introduzca valor % entre 0-1."
+msgstr ""
 
 #. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "8"
-msgstr "8"
+#: view:account.analytic.account:0
+msgid "Current Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by Invoice Date"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -7878,13 +7931,6 @@ msgid ""
 "Modify Invoice: Cancels the current invoice and creates a new copy of it "
 "ready for editing."
 msgstr ""
-"Modificar factura: Cancela la factura actual y crea una nueva copia "
-"preparada para editar."
-
-#. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
-msgid "Accounting and Financial Management"
-msgstr "Gestión contable y financiera"
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -7893,9 +7939,12 @@ msgstr "Gestión contable y financiera"
 #: view:account.entries.report:0
 #: field:account.entries.report,period_id:0
 #: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: field:account.journal.period,period_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: view:account.move:0
 #: field:account.move,period_id:0
 #: view:account.move.line:0
@@ -7903,39 +7952,32 @@ msgstr "Gestión contable y financiera"
 #: view:account.period:0
 #: field:account.subscription,period_nbr:0
 #: field:account.tax.chart,period_id:0
-#: code:addons/account/account_move_line.py:982
+#: field:account.treasury.report,period_id:0
 #: field:validate.account.move,period_id:0
-#: report:account.account.balance:0
-#: report:account.central.journal:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
-#: report:account.vat.declaration:0
-#, python-format
 msgid "Period"
-msgstr "Período"
+msgstr ""
+
+#. module: account
+#: help:account.account,adjusted_balance:0
+msgid ""
+"Total amount (in Company currency) for transactions held in secondary "
+"currency for this account."
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 msgid "Net Total:"
-msgstr "Base:"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
 msgid "Generic Reporting"
-msgstr "Informes genéricos"
+msgstr ""
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
 msgid "Write-Off Journal"
-msgstr "Diario de desajuste"
+msgstr ""
 
 #. module: account
 #: help:res.partner,property_payment_term:0
@@ -7943,34 +7985,50 @@ msgid ""
 "This payment term will be used instead of the default one for the current "
 "partner"
 msgstr ""
-"Este plazo de pago se utilizará en lugar del plazo por defecto para la "
-"empresa actual."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code for Taxes Included Prices"
-msgstr "Código para el cálculo de los impuestos en precios incluidos"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1042
+#, python-format
+msgid ""
+"You can not cancel an invoice which is partially paid! You need to "
+"unreconcile related payment entries first!"
+msgstr ""
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr "Cuenta de la categoría de ingresos"
+msgstr ""
+
+#. module: account
+#: field:account.account,adjusted_balance:0
+msgid "Adjusted Balance"
+msgstr ""
 
 #. 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 "Plantillas de posiciones fiscales"
+msgstr ""
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Int.Type"
-msgstr "Tipo interno"
+msgstr ""
 
 #. module: account
 #: field:account.move.line,tax_amount:0
 msgid "Tax/Base Amount"
-msgstr "Importe impuestos/base"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "  Valuation: Percent"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -7980,10 +8038,6 @@ msgid ""
 "can easily generate refunds and reconcile them directly from the invoice "
 "form."
 msgstr ""
-"Con las facturas rectificativas (abonos) a clientes puede gestionar las "
-"devoluciones de sus clientes. Una factura rectificativa es un documento que "
-"abona una factura completa o parcialmente. Puede generar fácilmente facturas "
-"rectificativas y conciliarlas directamente desde el formulario de factura."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -7995,40 +8049,46 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
-"Este menú imprime una declaración de IVA basada en facturas o pagos. Puede "
-"seleccionar uno o varios periodos del ejercicio fiscal. La información "
-"necesaria para la declaración de impuestos es generada por OpenERP a partir "
-"de las facturas (o pagos, en algunos países). Esta información se actualiza "
-"en tiempo real; lo cual es muy útil porque le permite previsualizar en "
-"cualquier momento los impuestos a pagar al principio y al final del mes o "
-"trimestre."
 
 #. module: account
 #: report:account.invoice:0
 msgid "Tel. :"
-msgstr "Tel. :"
+msgstr ""
 
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr "Divisa de la compañía"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,chart_account_id:0
+#: field:account.balance.report,chart_account_id:0
+#: field:account.central.journal,chart_account_id:0
+#: field:account.common.account.report,chart_account_id:0
+#: field:account.common.journal.report,chart_account_id:0
+#: field:account.common.partner.report,chart_account_id:0
+#: field:account.common.report,chart_account_id:0
+#: field:account.general.journal,chart_account_id:0
+#: field:account.partner.balance,chart_account_id:0
+#: field:account.partner.ledger,chart_account_id:0
+#: field:account.print.journal,chart_account_id:0
+#: field:account.report.general.ledger,chart_account_id:0
+#: field:account.vat.declaration,chart_account_id:0
+#: field:accounting.report,chart_account_id:0
+msgid "Chart of Account"
+msgstr ""
 
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 msgid "Payment"
-msgstr "Pago"
+msgstr ""
 
 #. module: account
-#: help:account.bs.report,reserve_account_id:0
-msgid ""
-"This Account is used for transfering Profit/Loss (Profit: Amount will be "
-"added, Loss: Amount will be duducted), which is calculated from Profilt & "
-"Loss Report"
+#: field:account.bank.statement,balance_end_real:0
+#: field:account.treasury.report,ending_balance:0
+msgid "Ending Balance"
 msgstr ""
-"Esta cuenta se usa para transferir pérdidas/ganancias (Ganancia: El importe "
-"será añadido, Pérdida: El importe será deducido), que se calcula en el "
-"informe de pérdidas y ganancias."
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -8036,57 +8096,64 @@ msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
 msgstr ""
-"Puede marcar esta opción para indicar este asiento como un litigio con la "
-"empresa asociada."
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
 #: view:account.move.line.reconcile:0
 msgid "Partial Reconcile"
-msgstr "Conciliación parcial"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
 msgid "Account Analytic Inverted Balance"
-msgstr "Contabilidad. Balance invertido analítico"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr "Contabilidad. Informe común"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "current month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1057
+#, python-format
+msgid ""
+"No period defined for this date: %s !\n"
+"Please create one."
+msgstr ""
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
-msgstr "Importación automática del extracto bancario"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_view
 #: model:ir.ui.menu,name:account.menu_action_account_journal_view
 msgid "Journal Views"
-msgstr "Vistas de diario"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr "Conciliar movimientos banco"
+msgstr ""
 
 #. module: account
+#: field:account.financial.report,account_type_ids:0
 #: 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 "Tipos de cuentas"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:897
-#, python-format
-msgid "Cannot create invoice move on centralised journal"
-msgstr "No se puede crear asiento factura en el diario centralizado"
-
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "Categoría Balance / PyG"
+#: view:account.payment.term.line:0
+msgid "  Value amount: n.a"
+msgstr ""
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8100,43 +8167,46 @@ msgstr "Categoría Balance / PyG"
 #: model:process.node,name:account.process_node_supplierreconciliation0
 #, python-format
 msgid "Reconciliation"
-msgstr "Conciliación"
+msgstr ""
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr "Cuenta a cobrar"
+msgstr ""
 
 #. module: account
-#: view:account.bank.statement:0
-msgid "CashBox Balance"
-msgstr "Saldo de caja"
+#: view:account.invoice:0
+msgid ""
+"This button only appears when the state of the invoice is 'paid' (showing "
+"that it has been fully reconciled) and auto-computed boolean 'reconciled' is "
+"False (depicting that it's not the case anymore). In other words, the "
+"invoice has been dereconciled and it does not fit anymore the 'paid' state. "
+"You should press this button to re-open it and let it continue its normal "
+"process after having resolved the eventual exceptions it may have created."
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr "Cerrar estado ejercicio fiscal"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
-#: field:account.journal,refund_journal:0
 msgid "Refund Journal"
-msgstr "Diario reintegro"
+msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
-#: report:account.partner.balance:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
-msgstr "Filtrar por"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -8146,62 +8216,74 @@ msgid ""
 "sales orders or deliveries. You should only confirm them before sending them "
 "to your customers."
 msgstr ""
-"Con las facturas de cliente puede crear y gestionar las facturas de venta "
-"emitidas a sus clientes. OpenERP también puede generar automáticamente "
-"facturas borrador desde los pedidos o desde albaranes. Sólo deberá "
-"confirmarlas antes de ser enviadas a sus clientes."
+
+#. module: account
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid ""
+"In order to close a period, you must first post related journal entries."
+msgstr ""
 
 #. module: account
 #: view:account.entries.report:0
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_company_analysis_tree
 msgid "Company Analysis"
-msgstr "Análisis compañía"
+msgstr ""
 
 #. module: account
 #: help:account.invoice,account_id:0
 msgid "The partner account used for this invoice."
-msgstr "La cuenta de la empresa utilizada para esta factura."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3313
+#, python-format
+msgid "Tax %.2f%%"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Contacts"
+msgstr ""
 
 #. module: account
 #: field:account.tax.code,parent_id:0
 #: view:account.tax.code.template:0
 #: field:account.tax.code.template,parent_id:0
 msgid "Parent Code"
-msgstr "Código padre"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_payment_term_line
 msgid "Payment Term Line"
-msgstr "Línea de plazo de pago"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2794
-#: code:addons/account/installer.py:452
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
-msgstr "Diario de compras"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice: Creates the refund invoice, ready for editing."
 msgstr ""
-"Factura rectificativa: Crea la factura de abono, preparada para editarla."
 
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
 msgid "Subtotal"
-msgstr "Subtotal"
+msgstr ""
 
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr "Imprimir declaración de impuestos"
+msgstr ""
 
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr "Línea de modelo de asiento"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
@@ -8210,30 +8292,23 @@ msgstr "Línea de modelo de asiento"
 #: field:account.invoice.report,date_due:0
 #: field:report.invoice.created,date_due:0
 msgid "Due Date"
-msgstr "Fecha vencimiento"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_supplier
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr "Proveedores"
-
-#. module: account
-#: constraint:account.move:0
-msgid ""
-"You cannot create more than one move per period on centralized journal"
 msgstr ""
-"No puede crear más de un movimiento por periodo en un diario centralizado"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
-msgstr "Tipo de cuentas permitidas (vacío para ningún control)"
+msgstr ""
 
 #. module: account
 #: view:res.partner:0
 msgid "Supplier Accounting Properties"
-msgstr "Propiedades de contabilidad del proveedor"
+msgstr ""
 
 #. module: account
 #: help:account.move.line,amount_residual:0
@@ -8241,96 +8316,114 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
 msgstr ""
-"El importe residual de un apunte a cobrar o a pagar expresado en la moneda "
-"de la compañía."
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "  valuation: balance"
-msgstr "  valoración: saldo"
 
 #. module: account
 #: view:account.tax.code:0
 msgid "Statistics"
-msgstr "Estadísticas"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.chart,from_date:0
 #: field:project.account.analytic.line,from_date:0
 msgid "From"
-msgstr "Desde"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
 msgid "Fiscalyear Close"
-msgstr "Cierre ejercicio fiscal"
+msgstr ""
 
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr "¡El código de la cuenta debe ser único por compañía!"
+msgstr ""
 
 #. module: account
+#: view:account.invoice:0
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid Invoices"
-msgstr "Facturas impagadas"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:504
+#, python-format
+msgid "The payment term of supplier does not have a payment term line!"
+msgstr ""
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
 msgid "Debit amount"
-msgstr "Importe debe"
+msgstr ""
 
 #. module: account
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_treasory_graph
 msgid "Treasury"
-msgstr "Tesorería"
+msgstr ""
 
 #. module: account
 #: view:account.aged.trial.balance:0
-#: view:account.analytic.Journal.report:0
 #: view:account.analytic.balance:0
 #: view:account.analytic.cost.ledger:0
 #: view:account.analytic.cost.ledger.journal.report:0
 #: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
 #: view:account.common.report:0
 msgid "Print"
-msgstr "Imprimir"
+msgstr ""
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Allowed (empty for no control)"
-msgstr "Cuentas permitidas (vacío para ningún control)"
+msgstr ""
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
-#: model:ir.actions.act_window,name:account.action_account_analytic_chart
-#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
-msgid "Chart of Analytic Accounts"
-msgstr "Plan de cuentas analíticas"
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Template Account Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft Customer Invoices"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr "Varios"
+msgstr ""
 
 #. module: account
 #: help:res.partner,debit:0
 msgid "Total amount you have to pay to this supplier."
-msgstr "Importe total que debe pagar a este proveedor."
+msgstr ""
 
 #. module: account
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic Costs"
-msgstr "Costes analíticos"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,name:0
 #: report:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr "Nombre del diario"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Smallest Text"
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_invoice
+msgid "Invoicing & Payments"
+msgstr ""
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -8338,8 +8431,6 @@ msgid ""
 "Unique number of the invoice, computed automatically when the invoice is "
 "created."
 msgstr ""
-"Número único de la factura, calculado automáticamente cuando se valida la "
-"factura."
 
 #. module: account
 #: constraint:account.bank.statement.line:0
@@ -8347,26 +8438,23 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
-"El importe del recibo debe ser el mismo importe que el de la línea del "
-"extracto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
-#, python-format
-msgid "Bad account!"
-msgstr "¡Cuenta incorrecta!"
+#: model:account.account.type,name:account.data_account_type_expense
+#: model:account.financial.report,name:account.account_financial_report_expense0
+msgid "Expense"
+msgstr ""
 
 #. module: account
 #: help:account.chart,fiscalyear:0
 msgid "Keep empty for all open fiscal years"
-msgstr "Dejarlo vacío para abrir todos los ejercicios fiscales."
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr "¡El movimiento contable (%s) para centralización ha sido confirmado!"
+msgstr ""
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -8374,8 +8462,15 @@ msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
 msgstr ""
-"El importe expresado en una otra divisa opcional si se trata de un asiento "
-"multi-divisa."
+
+#. module: account
+#: code:addons/account/account.py:1315
+#, python-format
+msgid ""
+"You can not validate a non-balanced entry !\n"
+"Make sure you have configured payment terms properly !\n"
+"The latest payment term line should be of the type \"Balance\" !"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -8391,6 +8486,7 @@ msgstr ""
 #: field:account.invoice.report,currency_id:0
 #: field:account.journal,currency:0
 #: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model.line,currency_id:0
 #: view:account.move:0
 #: view:account.move.line:0
@@ -8402,22 +8498,20 @@ msgstr ""
 #: field:report.account.sales,currency_id:0
 #: field:report.account_type.sales,currency_id:0
 #: field:report.invoice.created,currency_id:0
+#: field:res.partner.bank,currency_id:0
 msgid "Currency"
-msgstr "Divisa"
+msgstr ""
 
 #. module: account
 #: help:account.bank.statement.line,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of bank statement lines."
 msgstr ""
-"Indica el orden de secuencia cuando se muestra una lista de líneas de "
-"extracto bancario."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Accountant validates the accounting entries coming from the invoice."
 msgstr ""
-"El contable valida los asientos contables provenientes de la factura."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
@@ -8430,78 +8524,70 @@ msgid ""
 "would be referred to as FY 2011. You are not obliged to follow the actual "
 "calendar year."
 msgstr ""
-"Defina el ejercicio fiscal de su compañía de acuerdo a sus necesidades. Un "
-"ejercicio fiscal es un periodo al final del cual se cierran las cuentas "
-"(usualmente 12 meses). El ejercicio fiscal usualmente se referencia por el "
-"año en el que acaba. Por ejemplo, si el ejercicio fiscal de una compañía "
-"termina el 30 de noviembre de 2011, entonces todo lo que haya entre el 1 de "
-"diciembre de 2010 y el 30 de noviembre de 2011 se referencia como EF2011. No "
-"está obligado a seguir el año de calendario real."
 
 #. module: account
+#: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr "Asientos conciliados"
+msgstr ""
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
 msgid "Contact Address"
-msgstr "Dirección contacto"
+msgstr ""
 
 #. module: account
-#: help:account.invoice,state:0
-msgid ""
-" * 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 'Paid' state is set automatically when invoice is paid.            \n"
-"* The 'Cancelled' state is used when user cancel invoice."
+#: code:addons/account/account.py:2273
+#, python-format
+msgid "Wrong model !"
 msgstr ""
-" * El estado 'Borrador' se utiliza cuando un usuario está introduciendo una "
-"nueva factura sin confirmar.             \n"
-"* El estado 'Pro-forma' se utiliza cuando la factura es una Pro-forma sin "
-"número de factura.             \n"
-"* El estado 'Abierto' se utiliza cuando el usuario confirma una factura; se "
-"genera automáticamente un número de factura. Permanece en estado abierto "
-"mientras el usuario no paga la factura.             \n"
-"* El estado 'Pagado' se establece automáticamente cuando se paga la factura. "
-"           \n"
-"* El estado 'Cancelado' se utiliza cuando el usuario cancela la factura."
 
 #. module: account
 #: field:account.invoice.refund,period:0
 msgid "Force period"
-msgstr "Forzar período"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr "Imprimir balance contable de empresa"
+msgstr ""
+
+#. module: account
+#: help:account.financial.report,sign:0
+msgid ""
+"For accounts that are typically more debited than credited and that you "
+"would like to print as negative amounts in your reports, you should reverse "
+"the sign of the balance; e.g.: Expense account. The same applies for "
+"accounts that are typically more credited than debited and that you would "
+"like to print as positive amounts in your reports; e.g.: Income account."
+msgstr ""
 
 #. module: account
 #: field:res.partner,contract_ids:0
 msgid "Contracts"
-msgstr "Contratos"
+msgstr ""
 
 #. module: account
 #: field:account.cashbox.line,ending_id:0
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
+#: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
-msgstr "desconocido"
+msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
+#: code:addons/account/account.py:3130
+#, python-format
 msgid "Opening Entries Journal"
-msgstr "Diario asientos de apertura"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 msgid "Draft invoices are checked, validated and printed."
-msgstr "Facturas borrador son comprobadas, validadas e impresas."
+msgstr ""
 
 #. module: account
 #: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8510,19 +8596,30 @@ msgid ""
 "will be added, Loss: Amount will be deducted.), Which is calculated from "
 "Profilt & Loss Report"
 msgstr ""
-"Esta cuenta se utiliza para transferir las Pérdidas/Ganancias (si es una "
-"Ganancia: Importe será añadido, Pérdida: Importe será deducido), que se "
-"calcula en el informe de Pérdidas y Ganancias."
 
 #. module: account
-#: field:account.invoice,reference_type:0
-msgid "Reference Type"
-msgstr "Tipo de referencia"
+#: code:addons/account/account_invoice.py:819
+#, python-format
+msgid "Please define sequence on the journal related to this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,narration:0
+#: view:account.move.line:0
+#: field:account.move.line,narration:0
+msgid "Internal Note"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+msgid "This year's Sales by type"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for Period"
-msgstr "Resumen de costes por periodo"
+msgstr ""
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -8531,18 +8628,16 @@ msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
 msgstr ""
-"Indica si el cálculo de impuestos se basa en el cálculo de los impuestos "
-"hijos en lugar del importe total."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Given by Python Code"
-msgstr "Calculado por código Python"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal Code"
-msgstr "Código diario"
+msgstr ""
 
 #. module: account
 #: help:account.tax.code,sign:0
@@ -8551,79 +8646,70 @@ msgid ""
 "the amount of this case into its parent. For example, set 1/-1 if you want "
 "to add/substract it."
 msgstr ""
-"Puede indicar aquí el coeficiente que se utilizará cuando se consolide el "
-"importe de este código dentro de su padre. Por ejemplo, indique 1/-1 si "
-"desea sumar/restar el importe."
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
 #: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
-msgstr "Importe residual"
+msgstr ""
 
 #. module: account
 #: field:account.invoice,move_lines:0
 #: field:account.move.reconcile,line_id:0
 msgid "Entry Lines"
-msgstr "Apuntes"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
+msgid "Review your Financial Accounts"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
 #: model:ir.actions.act_window,name:account.action_validate_account_move
 msgid "Open Journal"
-msgstr "Abrir diario"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "KI"
-msgstr "KI"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.journal:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Period from"
-msgstr "Período desde"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2817
-#: code:addons/account/installer.py:476
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
-msgstr "Diario de abono de ventas"
-
-#. module: account
-#: code:addons/account/account.py:927
-#, python-format
-msgid ""
-"You cannot modify company of this period as its related record exist in "
-"Entry Lines"
 msgstr ""
-"No puede modificar la compañía de este periodo porqué ya hay apuntes en este "
-"período."
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 #: view:account.payment.term:0
 msgid "Information"
-msgstr "Información"
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
 msgid "Registered payment"
-msgstr "Pago registrado"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close states of Fiscal year and periods"
-msgstr "Cerrar estados de ejercicio fiscal y periodos"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Product Information"
-msgstr "Información del producto"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8631,41 +8717,40 @@ msgstr "Información del producto"
 #: view:account.move.line:0
 #: model:ir.ui.menu,name:account.next_id_40
 msgid "Analytic"
-msgstr "Analítico"
+msgstr ""
 
 #. module: account
 #: model:process.node,name:account.process_node_invoiceinvoice0
 #: model:process.node,name:account.process_node_supplierinvoiceinvoice0
 msgid "Create Invoice"
-msgstr "Crear factura"
+msgstr ""
 
 #. module: account
-#: field:account.installer,purchase_tax:0
+#: field:wizard.multi.charts.accounts,purchase_tax_rate:0
 msgid "Purchase Tax(%)"
-msgstr "Impuesto compra (%)"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
-msgstr "Cree algunas líneas de factura"
+msgstr ""
 
 #. module: account
 #: report:account.overdue:0
 msgid "Dear Sir/Madam,"
-msgstr "Apreciado Sr./Sra.,"
+msgstr ""
 
 #. module: account
-#: view:account.installer.modules:0
-msgid "Configure Your Accounting Application"
-msgstr "Configure su aplicación de contabilidad"
+#: field:account.vat.declaration,display_detail:0
+msgid "Display Detail"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2820
-#: code:addons/account/installer.py:479
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
-msgstr "AVENTA"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -8673,8 +8758,6 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft invoices."
 msgstr ""
-"Los costes analíticos (hojas de servicios, algunos productos comprados, ...) "
-"provienen de las cuentas analíticas. Estos generan facturas borrador."
 
 #. module: account
 #: help:account.journal,view_id:0
@@ -8684,55 +8767,61 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
-"Establece la vista usada cuando se escriben o consultan asientos en este "
-"diario. La vista le indica a OpenERP qué campos deben ser visibles, "
-"requeridos o de sólo lectura, y en qué orden. Puede crear su propia vista en "
-"cada diario para introducir apuntes más rápido."
 
 #. module: account
 #: field:account.period,date_stop:0
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
 msgid "End of Period"
-msgstr "Fin de período"
+msgstr ""
 
 #. module: account
-#: field:account.installer.modules,account_followup:0
-msgid "Followups Management"
-msgstr "Gestión de seguimientos"
+#: field:account.account,financial_report_ids:0
+#: field:account.account.template,financial_report_ids:0
+#: model:ir.actions.act_window,name:account.action_account_financial_report_tree
+#: model:ir.actions.act_window,name:account.action_account_report
+#: model:ir.ui.menu,name:account.menu_account_reports
+msgid "Financial Reports"
+msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
+#: field:account.aged.trial.balance,period_from:0
+#: field:account.balance.report,period_from:0
 #: report:account.central.journal:0
+#: field:account.central.journal,period_from:0
+#: field:account.common.account.report,period_from:0
+#: field:account.common.journal.report,period_from:0
+#: field:account.common.partner.report,period_from:0
+#: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
-#: report:account.journal.period.print:0
+#: field:account.general.journal,period_from:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: field:account.partner.balance,period_from:0
+#: field:account.partner.ledger,period_from:0
+#: field:account.print.journal,period_from:0
+#: field:account.report.general.ledger,period_from:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: report:account.vat.declaration:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: field:account.vat.declaration,period_from:0
+#: field:accounting.report,period_from:0
+#: field:accounting.report,period_from_cmp:0
 msgid "Start Period"
-msgstr "Periodo inicial"
-
-#. module: account
-#: code:addons/account/account.py:2333
-#, python-format
-msgid "Cannot locate parent code for template account!"
-msgstr "¡No se puede localizar código padre para plantilla de cuentas!"
+msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
-msgstr "Dirección análisis"
+msgstr ""
 
 #. module: account
 #: field:res.partner,ref_companies:0
 msgid "Companies that refers to partner"
-msgstr "Compañías que se refieren a la empresa"
+msgstr ""
 
 #. module: account
 #: view:account.journal:0
@@ -8741,56 +8830,44 @@ msgstr "Compañías que se refieren a la empresa"
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
-msgstr "Vista de diario"
+msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1006
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
-msgstr "Total haber"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 msgid "Accountant validates the accounting entries coming from the invoice. "
 msgstr ""
-"El contable valida los asientos contables provenientes de la factura. "
-
-#. module: account
-#: code:addons/account/invoice.py:1008
-#, python-format
-msgid ""
-"You cannot cancel the Invoice which is Partially Paid! You need to "
-"unreconcile concerned payment entries!"
-msgstr ""
-"¡No puede cancelar la factura que está pagada parcialmente! ¡Es necesario "
-"romper la conciliación de los asientos de pago relacionados!"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Best regards."
-msgstr "Atentamente,"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
-msgstr "Impagada"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr ""
 
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr "Documento: Estado contable del cliente"
+msgstr ""
 
 #. module: account
-#: constraint:account.move.line:0
-msgid "You can not create move line on view account."
-msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
-
-#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
-#, python-format
-msgid "Current currency is not confirured properly !"
-msgstr "¡La moneda actual no está configurada correctamente!"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -8800,130 +8877,92 @@ msgid ""
 "partially. You can easily generate refunds and reconcile them directly from "
 "the invoice form."
 msgstr ""
-"Con facturas rectificativas de proveedor puede gestionar las facturas de "
-"abono que recibe de sus proveedores. Una factura rectificativa es un "
-"documento que abona una factura total o parcialmente. Puede fácilmente "
-"generar facturas rectificativas y conciliarlas directamente desde el "
-"formulario de factura."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr "Cuentas a cobrar"
+msgstr ""
 
 #. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr "Particulares"
-
-#. module: account
-#: selection:account.account.type,report_type:0
-msgid "Profit & Loss (Income Accounts)"
-msgstr "Pérdida y ganancias (cuentas de ingresos)"
-
-#. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Dejarlo vacío para usar la cuenta de ingresos"
+#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
 
 #. module: account
 #: field:account.account,balance:0
 #: report:account.account.balance:0
-#: report:account.account.balance.landscape:0
 #: selection:account.account.type,close_method:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.inverted.balance:0
-#: field:account.bank.statement,balance_end:0
-#: field:account.bank.statement,balance_end_cash:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: field:account.invoice,residual:0
 #: field:account.move.line,balance:0
 #: report:account.partner.balance:0
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,balance:0
 #: field:report.account.receivable,balance:0
 #: field:report.aged.receivable,balance:0
 msgid "Balance"
-msgstr "Saldo pendiente"
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Manually or automatically entered in the system"
-msgstr "Introducido manualmente o automáticamente en el sistema"
+msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
 msgid "Display Account"
-msgstr "Mostrar cuenta"
-
-#. module: account
-#: report:account.tax.code.entries:0
-msgid "("
-msgstr "("
-
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify"
-msgstr "Modificar"
+msgstr ""
 
 #. module: account
 #: view:account.account.type:0
 msgid "Closing Method"
-msgstr "Método de cierre"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_partner_balance
-msgid ""
-"This report is analysis by partner. It is a PDF report containing one line "
-"per partner representing the cumulative credit balance."
 msgstr ""
-"Este informe es el análisis por empresa. Es un informe PDF que contiene una "
-"línea por empresa representando el saldo de crédito acumulativo."
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
+#: model:account.account.type,name:account.data_account_type_payable
 #: selection:account.entries.report,type:0
 msgid "Payable"
-msgstr "A pagar"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Year"
-msgstr "Este año"
+msgstr ""
 
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr "Tablero de contabilidad"
+msgstr ""
 
 #. module: account
 #: view:account.model:0
 #: field:account.model,legend:0
 msgid "Legend"
-msgstr "Leyenda"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Contract Data"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_sale
@@ -8934,35 +8973,17 @@ msgid ""
 "the income account. OpenERP will propose to you automatically the Tax "
 "related to this account and the counter-part \"Account receivable\"."
 msgstr ""
-"Esta vista es usada por los contables para registrar asientos masivamente en "
-"OpenERP. Si quiere registrar una factura de cliente, seleccione el diario y "
-"el periodo en la barra de herramientas de búsqueda. Luego, comience "
-"introduciendo el apunte de la cuenta de ingresos. OpenERP le propondrá "
-"automáticamente el impuesto asociado a esta cuenta, y la \"cuenta a cobrar\" "
-"de contrapartida."
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:391
-#, python-format
-msgid "Cannot delete bank statement(s) which are already confirmed !"
-msgstr ""
-"¡No se puede eliminar extracto(s) bancario(s) que ya esté confirmado!"
-
-#. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
-msgstr "Debe seleccionar las cuentas a conciliar"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_receivable_graph
-msgid "Balance by Type of Account"
-msgstr "Saldo por tipo de cuenta"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 msgid "Accounting entries are the first input of the reconciliation."
-msgstr "Asientos contables son la primera entrada de la conciliación."
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_form
@@ -8974,68 +8995,59 @@ msgid ""
 "closed or left open depending on your company's activities over a specific "
 "period."
 msgstr ""
-"Aquí puede definir un periodo fiscal, un intervalo de tiempo dentro del "
-"ejercicio fiscal de su compañía. Un periodo contable típicamente es un mes o "
-"un trimestre. Usualmente corresponde a los periodos de la declaración de "
-"impuestos. Cree y gestione periodos aquí y decida qué periodo se debería "
-"cerrar o dejar abierto dependiendo de las actividades de su compañía en un "
-"periodo específico."
 
 #. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr "Recibí"
-
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.journal.period.print:0
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
-msgstr "Filtros por"
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr "Entrada manual"
+msgstr ""
 
 #. module: account
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.move.line,move_id:0
 #: field:analytic.entries.report,move_id:0
 msgid "Move"
-msgstr "Asiento"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1168
 #, 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!"
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "Analytic Entries of last 365 days"
+msgstr ""
 
 #. module: account
 #: report:account.central.journal:0
 msgid "A/C No."
-msgstr "Nº cuenta"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr "Extractos bancarios"
+msgstr ""
 
 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
 msgid ""
 "Creates an account with the selected template under this existing parent."
 msgstr ""
-"Crea una cuenta con la plantilla seleccionada debajo el padre existente."
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Date of the day"
-msgstr "Fecha del día"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
@@ -9044,41 +9056,42 @@ msgid ""
 "You have to define the bank account\n"
 "in the journal definition for reconciliation."
 msgstr ""
-"Debe definir la cuenta del banco\n"
-"en la definición del diario para conciliar."
 
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconciliation Transactions"
-msgstr "Conciliación de transacciones"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
-msgstr "Informe común"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
 #: field:account.account,child_consol_ids:0
 msgid "Consolidated Children"
-msgstr "Hijos consolidados"
+msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:82
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
 "state option checked!"
 msgstr ""
-"¡El diario debe tener una contrapartida centralizada sin la opción de omitir "
-"el estado borrador marcada!"
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer And Supplier Invoices"
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment entries"
-msgstr "Asientos de pago"
+msgstr ""
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9087,140 +9100,158 @@ msgstr "Asientos de pago"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "July"
-msgstr "Julio"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
 msgid "Chart of accounts"
-msgstr "Plan contable"
+msgstr ""
 
 #. module: account
 #: field:account.subscription.line,subscription_id:0
 msgid "Subscription"
-msgstr "Asientos periódicos"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_balance
 msgid "Account Analytic Balance"
-msgstr "Contabilidad. Saldo analítico"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:412
+#, python-format
+msgid ""
+"No opening/closing period defined, please create one to set the initial "
+"balance!"
+msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
+#: field:account.aged.trial.balance,period_to:0
+#: field:account.balance.report,period_to:0
 #: report:account.central.journal:0
+#: field:account.central.journal,period_to:0
+#: field:account.common.account.report,period_to:0
+#: field:account.common.journal.report,period_to:0
+#: field:account.common.partner.report,period_to:0
+#: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
-#: report:account.journal.period.print:0
+#: field:account.general.journal,period_to:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: field:account.partner.balance,period_to:0
+#: field:account.partner.ledger,period_to:0
+#: field:account.print.journal,period_to:0
+#: field:account.report.general.ledger,period_to:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: report:account.vat.declaration:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: field:account.vat.declaration,period_to:0
+#: field:accounting.report,period_to:0
+#: field:accounting.report,period_to_cmp:0
 msgid "End Period"
-msgstr "Periodo final"
-
-#. module: account
-#: field:account.aged.trial.balance,chart_account_id:0
-#: field:account.balance.report,chart_account_id:0
-#: field:account.bs.report,chart_account_id:0
-#: field:account.central.journal,chart_account_id:0
-#: field:account.common.account.report,chart_account_id:0
-#: field:account.common.journal.report,chart_account_id:0
-#: field:account.common.partner.report,chart_account_id:0
-#: field:account.common.report,chart_account_id:0
-#: field:account.general.journal,chart_account_id:0
-#: field:account.partner.balance,chart_account_id:0
-#: field:account.partner.ledger,chart_account_id:0
-#: field:account.pl.report,chart_account_id:0
-#: field:account.print.journal,chart_account_id:0
-#: field:account.report.general.ledger,chart_account_id:0
-#: field:account.vat.declaration,chart_account_id:0
-msgid "Chart of account"
-msgstr "Plan contable"
+msgstr ""
 
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr "Fecha vencimiento"
+msgstr ""
 
 #. module: account
 #: view:account.move.journal:0
 msgid "Standard Entries"
-msgstr "Asientos estándares"
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for customer invoices journals. Select 'Purchase' for supplier "
+"invoices journals. Select 'Cash' or 'Bank' for journals that are used in "
+"customer or supplier payments. Select 'General' for miscellaneous operations "
+"journals. Select 'Opening/Closing Situation' for entries generated for new "
+"fiscal years."
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr "Asiento periódico"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:717
-#, python-format
-msgid ""
-"Tax base different !\n"
-"Click on compute to update tax base"
-msgstr "¡Base de impuesto diferente!"
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr ""
 
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr "Asiento periódico"
+msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
-#: field:account.bs.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
 #: field:account.common.account.report,date_from:0
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_start:0
-#: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,date_from:0
 #: field:account.partner.ledger,date_from:0
-#: field:account.pl.report,date_from:0
 #: field:account.print.journal,date_from:0
 #: field:account.report.general.ledger,date_from:0
 #: field:account.subscription,date_start:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,date_from:0
+#: field:accounting.report,date_from:0
+#: field:accounting.report,date_from_cmp:0
 msgid "Start Date"
-msgstr "Fecha inicial"
+msgstr ""
 
 #. module: account
+#: help:account.invoice,reconciled:0
+msgid ""
+"It indicates that the invoice has been paid and the journal entry of the "
+"invoice has been reconciled with one or several journal entries of payment."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.invoice.report:0
 #: model:process.node,name:account.process_node_supplierdraftinvoices0
 msgid "Draft Invoices"
-msgstr "Facturas borrador"
+msgstr ""
 
 #. module: account
 #: selection:account.account.type,close_method:0
 #: view:account.entries.report:0
 #: view:account.move.line:0
 msgid "Unreconciled"
-msgstr "No conciliado"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
-msgstr "¡Total erróneo!"
+msgstr ""
 
 #. module: account
 #: field:account.journal,sequence_id:0
 msgid "Entry Sequence"
-msgstr "Secuencia del asiento"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_tree
@@ -9233,69 +9264,48 @@ msgid ""
 "open period. Close a period when you do not want to record new entries and "
 "want to lock this period for tax related calculation."
 msgstr ""
-"Un periodo es una plazo de tiempo fiscal durante la cual se deben registrar "
-"en asientos las actividades relacionadas con la contabilidad. Lo normal es "
-"un periodo mensual pero, dependiendo del país y las necesidades de su "
-"compañía, podría usar también periodos trimestrales (por ejemplo en España "
-"las PYMES habitualmente usan periodos trimestrales). Cerrar un periodo "
-"impide registrar nuevos asientos, cualquier nuevo asiento deberá anotarse en "
-"el siguiente periodo abierto. Cierre un periodo cuando no vaya a escribir "
-"nuevos asientos y desee bloquear este periodo por motivos relacionados con "
-"el cálculo de impuestos."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr "Pendiente"
+msgstr ""
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr "Desde cuentas analíticas"
-
-#. module: account
-#: field:account.installer.modules,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "Gestión de los pagos a proveedores"
+msgstr ""
 
 #. module: account
 #: field:account.period,name:0
 msgid "Period Name"
-msgstr "Nombre del período"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Code/Date"
-msgstr "Código/Fecha"
+msgstr ""
 
 #. module: account
 #: field:account.account,active:0
 #: field:account.analytic.journal,active:0
+#: field:account.fiscal.position,active:0
 #: field:account.journal.period,active:0
 #: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
-msgstr "Activo"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:354
+#: view:accounting.report:0
+msgid "Comparison"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
-msgstr "Error desconocido"
-
-#. module: account
-#: code:addons/account/account.py:1167
-#, python-format
-msgid ""
-"You cannot validate a non-balanced entry !\n"
-"Make sure you have configured Payment Term properly !\n"
-"It should contain atleast one Payment Term Line with type \"Balance\" !"
 msgstr ""
-"¡ No se puede confirmar un asiento descuadrado !\n"
-"¡ Asegúrese de haber configurado el plazo de pago correctamente !\n"
-"¡ Debería contener al menos una línea de plazo de pago con de tipo \"Saldo\" "
-"!"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -9303,50 +9313,48 @@ msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
 msgstr ""
-"Este cuenta se utilizará en lugar de la cuenta por defecto como la cuenta a "
-"pagar para la empresa actual."
 
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr "Período de apertura/cierre"
+msgstr ""
 
 #. module: account
 #: field:account.account,currency_id:0
 #: field:account.account.template,currency_id:0
 #: field:account.bank.accounts.wizard,currency_id:0
 msgid "Secondary Currency"
-msgstr "Divisa secundaria"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr "Validar movimiento contable"
+msgstr ""
 
 #. module: account
 #: field:account.account,credit:0
 #: report:account.account.balance:0
-#: report:account.account.balance.landscape:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model.line,credit:0
 #: field:account.move.line,credit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
-#: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,credit:0
 #: report:account.vat.declaration:0
 #: field:report.account.receivable,credit:0
 msgid "Credit"
-msgstr "Haber"
+msgstr ""
 
 #. module: account
 #: help:account.invoice.refund,journal_id:0
@@ -9355,25 +9363,26 @@ msgid ""
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
-"Puede seleccionar aquí el diario a usar para la factura rectificativa "
-"(abono) que se creará. Si deja este campo vacío, se usará el mismo diario "
-"que la factura actual."
 
 #. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr "A través de :"
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:181
+#, python-format
+msgid "Profit & Loss (Income account)"
+msgstr ""
 
 #. module: account
-#: view:account.general.journal:0
-#: model:ir.ui.menu,name:account.menu_account_general_journal
-msgid "General Journals"
-msgstr "Diarios generales"
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
 
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr "Modelo de asiento"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -9383,16 +9392,13 @@ msgid ""
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
-"La fecha de vencimiento del apunte generado por la línea del modelo '%s' se "
-"basa en el plazo de pago de la empresa.\n"
-"¡Por favor, defina la empresa en él!"
 
 #. module: account
 #: field:account.cashbox.line,number:0
 #: field:account.invoice,number:0
 #: field:account.move,name:0
 msgid "Number"
-msgstr "Número"
+msgstr ""
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9400,12 +9406,16 @@ msgstr "Número"
 #: selection:account.bank.statement.line,type:0
 #: selection:account.journal,type:0
 msgid "General"
-msgstr "General"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "Analytic Entries of last 30 days"
+msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
 #: selection:account.balance.report,filter:0
-#: selection:account.bs.report,filter:0
 #: selection:account.central.journal,filter:0
 #: view:account.chart:0
 #: selection:account.common.account.report,filter:0
@@ -9419,41 +9429,34 @@ msgstr "General"
 #: field:account.installer,period:0
 #: selection:account.partner.balance,filter:0
 #: selection:account.partner.ledger,filter:0
-#: selection:account.pl.report,filter:0
+#: view:account.print.journal:0
 #: selection:account.print.journal,filter:0
 #: selection:account.report.general.ledger,filter:0
-#: report:account.account.balance:0
-#: report:account.central.journal:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
 #: report:account.vat.declaration:0
 #: view:account.vat.declaration:0
 #: selection:account.vat.declaration,filter:0
+#: view:accounting.report:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
 #: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
 #, python-format
 msgid "Periods"
-msgstr "Periodos"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.report,currency_rate:0
 msgid "Currency Rate"
-msgstr "Tipo de cambio"
+msgstr ""
 
 #. module: account
-#: help:account.payment.term.line,value_amount:0
-msgid "For Value percent enter % ratio between 0-1."
-msgstr "Para porcentajes introduzca valores % entre 0-1."
+#: view:account.account:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
+msgid "Default Taxes"
+msgstr ""
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9462,17 +9465,22 @@ msgstr "Para porcentajes introduzca valores % entre 0-1."
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "April"
-msgstr "Abril"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
+msgid "Profit (Loss) to report"
+msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
 msgid "Open for Reconciliation"
-msgstr "Abrir para conciliación"
+msgstr ""
 
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr "Padre izquierdo"
+msgstr ""
 
 #. module: account
 #: help:account.invoice.refund,filter_refund:0
@@ -9480,27 +9488,17 @@ msgid ""
 "Refund invoice base on this type. You can not Modify and Cancel if the "
 "invoice is already reconciled"
 msgstr ""
-"Factura rectificativa (abono) basada en este tipo. No puede modificar y "
-"cancelar si la factura ya está conciliada."
 
 #. module: account
-#: help:account.installer.modules,account_analytic_plans:0
-msgid ""
-"Allows invoice lines to impact multiple analytic accounts simultaneously."
+#: selection:account.financial.report,style_overwrite:0
+msgid "Title 2 (bold)"
 msgstr ""
-"Permite a las líneas de factura impactar múltiples cuentas analíticas "
-"simultáneamente."
-
-#. module: account
-#: field:account.installer,sale_tax:0
-msgid "Sale Tax(%)"
-msgstr "Impuesto venta (%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree2
 msgid "Supplier Invoices"
-msgstr "Facturas de proveedor"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9516,7 +9514,7 @@ msgstr "Facturas de proveedor"
 #: field:report.account.sales,product_id:0
 #: field:report.account_type.sales,product_id:0
 msgid "Product"
-msgstr "Producto"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move
@@ -9525,23 +9523,23 @@ msgid ""
 "and is the process of transferring debit and credit amounts from a journal "
 "of original entry to a ledger book."
 msgstr ""
-"El proceso de validación de asientos, también llamado 'asentar', transfiere "
-"los importes del debe y haber de la anotación original a un libro mayor."
 
 #. module: account
-#: report:account.tax.code.entries:0
-msgid ")"
-msgstr ")"
+#: help:account.bank.statement,state:0
+msgid ""
+"When new statement is created the state will be 'Draft'.\n"
+"And after getting confirmation from the bank it will be in 'Confirmed' state."
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_period
 msgid "Account period"
-msgstr "Período contable"
+msgstr ""
 
 #. module: account
 #: view:account.subscription:0
 msgid "Remove Lines"
-msgstr "Eliminar líneas"
+msgstr ""
 
 #. module: account
 #: view:account.report.general.ledger:0
@@ -9549,15 +9547,13 @@ msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
-"Este informe le permite imprimir o generar un pdf de su libro mayor con el "
-"detalle de todos sus diarios contables."
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Regular"
-msgstr "Regular"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -9566,33 +9562,28 @@ msgstr "Regular"
 #: field:account.account.template,type:0
 #: field:account.entries.report,type:0
 msgid "Internal Type"
-msgstr "Tipo interno"
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr "Estado:"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
 msgid "Running Subscriptions"
-msgstr "Asientos periódicos en proceso"
+msgstr ""
 
 #. module: account
 #: view:report.account.sales:0
 #: view:report.account_type.sales:0
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "This Month"
-msgstr "Este mes"
+msgstr ""
 
 #. module: account
-#: view:account.analytic.Journal.report:0
 #: view:account.analytic.balance:0
 #: view:account.analytic.cost.ledger:0
 #: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
 #: model:ir.actions.act_window,name:account.action_account_partner_ledger
 msgid "Select Period"
-msgstr "Seleccionar periodo"
+msgstr ""
 
 #. module: account
 #: view:account.entries.report:0
@@ -9600,92 +9591,83 @@ msgstr "Seleccionar periodo"
 #: view:account.move:0
 #: selection:account.move,state:0
 #: view:account.move.line:0
-#: report:account.move.voucher:0
 msgid "Posted"
-msgstr "Asentado"
+msgstr ""
 
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_to:0
 #: field:account.balance.report,date_to:0
-#: field:account.bs.report,date_to:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_to:0
 #: field:account.common.account.report,date_to:0
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,date_stop:0
-#: report:account.journal.period.print:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,date_to:0
 #: field:account.partner.ledger,date_to:0
-#: field:account.pl.report,date_to:0
 #: field:account.print.journal,date_to:0
 #: field:account.report.general.ledger,date_to:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: field:account.vat.declaration,date_to:0
+#: field:accounting.report,date_to:0
+#: field:accounting.report,date_to_cmp:0
 msgid "End Date"
-msgstr "Fecha final"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Opening Entries"
-msgstr "Cancelar asientos de apertura"
+msgstr ""
 
 #. module: account
 #: field:account.payment.term.line,days2:0
 msgid "Day of the Month"
-msgstr "Día del mes"
+msgstr ""
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr "Origen impuesto"
-
-#. module: account
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
-msgid "Net Profit"
-msgstr "Beneficio neto"
+msgstr ""
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequences"
-msgstr "Secuencias ejercicios fiscales"
+msgstr ""
 
 #. module: account
-#: help:account.model,name:0
-msgid "This is a model for recurring accounting entries"
-msgstr "Este es un modelo para asientos contables recurrentes"
+#: selection:account.financial.report,display_detail:0
+msgid "No detail"
+msgstr ""
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
-"No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
 
 #. module: account
-#: report:account.general.ledger:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "JRNL"
-msgstr "LIBRO"
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
 
 #. module: account
-#: view:account.payment.term.line:0
-msgid "  value amount: 0.02"
-msgstr "  importe valor: 0.02"
+#: field:account.account,unrealized_gain_loss:0
+#: model:ir.actions.act_window,name:account.action_account_gain_loss
+#: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
+msgid "Unrealized Gain or Loss"
+msgstr ""
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -9693,37 +9675,58 @@ msgstr "  importe valor: 0.02"
 #: view:account.move.line:0
 #: view:account.period:0
 msgid "States"
-msgstr "Estados"
+msgstr ""
 
 #. module: account
+#: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
+msgid "Auto-email confirmed invoices"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,check_total:0
+msgid "Verification Total"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 #: view:account.analytic.line:0
 #: view:account.bank.statement:0
 #: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
 #: field:report.account.sales,amount_total:0
 #: field:report.account_type.sales,amount_total:0
 #: field:report.invoice.created,amount_total:0
 msgid "Total"
-msgstr "Total"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:97
 #, python-format
 msgid "Journal: All"
-msgstr "Diario: Todos"
+msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
+#: field:account.balance.report,company_id:0
 #: field:account.bank.statement,company_id:0
 #: field:account.bank.statement.line,company_id:0
+#: field:account.central.journal,company_id:0
+#: field:account.common.account.report,company_id:0
+#: field:account.common.journal.report,company_id:0
+#: field:account.common.partner.report,company_id:0
+#: field:account.common.report,company_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
+#: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9733,32 +9736,41 @@ msgstr "Diario: Todos"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
+#: field:account.partner.balance,company_id:0
+#: field:account.partner.ledger,company_id:0
 #: field:account.period,company_id:0
+#: field:account.print.journal,company_id:0
+#: field:account.report.general.ledger,company_id:0
 #: field:account.tax,company_id:0
 #: field:account.tax.code,company_id:0
+#: field:account.treasury.report,company_id:0
+#: field:account.vat.declaration,company_id:0
+#: field:accounting.report,company_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,company_id:0
 #: field:wizard.multi.charts.accounts,company_id:0
 msgid "Company"
-msgstr "Compañía"
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Define Recurring Entries"
-msgstr "Definir asientos recurrentes"
+msgstr ""
 
 #. module: account
 #: field:account.entries.report,date_maturity:0
 msgid "Date Maturity"
-msgstr "Fecha vencimiento"
+msgstr ""
 
 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
 msgid "Total cash transactions"
-msgstr "Total transiciones de caja."
+msgstr ""
 
 #. module: account
 #: help:account.partner.reconcile.process,today_reconciled:0
@@ -9767,74 +9779,57 @@ msgid ""
 "reconciliation process today. The current partner is counted as already "
 "processed."
 msgstr ""
-"Esta cifra representa el número total de empresas que hoy han pasado a "
-"través del proceso de conciliación. La empresa actual se contabiliza como "
-"que ya se ha procesado."
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create Monthly Periods"
-msgstr "Crear períodos mensuales"
+msgstr ""
 
 #. module: account
 #: field:account.tax.code.template,sign:0
 msgid "Sign For Parent"
-msgstr "Signo para padre"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr "Informe de sumas y saldos"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr "Extractos bancarios borrador"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
 msgstr ""
-"Creación manual o automática de asientos de pago acorde a los extractos"
+
+#. module: account
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr ""
+
+#. module: account
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 msgid "Invoice lines"
-msgstr "Líneas de factura"
+msgstr ""
 
 #. module: account
-#: field:account.aged.trial.balance,period_to:0
-#: field:account.balance.report,period_to:0
-#: field:account.bs.report,period_to:0
-#: field:account.central.journal,period_to:0
 #: field:account.chart,period_to:0
-#: field:account.common.account.report,period_to:0
-#: field:account.common.journal.report,period_to:0
-#: field:account.common.partner.report,period_to:0
-#: field:account.common.report,period_to:0
-#: field:account.general.journal,period_to:0
-#: field:account.partner.balance,period_to:0
-#: field:account.partner.ledger,period_to:0
-#: field:account.pl.report,period_to:0
-#: field:account.print.journal,period_to:0
-#: field:account.report.general.ledger,period_to:0
-#: field:account.vat.declaration,period_to:0
 msgid "End period"
-msgstr "Periodo final"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
-#: code:addons/account/wizard/account_invoice_state.py:44
-#: code:addons/account/wizard/account_invoice_state.py:68
-#: code:addons/account/wizard/account_report_balance_sheet.py:70
-#: code:addons/account/wizard/account_state_open.py:37
-#: code:addons/account/wizard/account_validate_account_move.py:39
-#: code:addons/account/wizard/account_validate_account_move.py:61
-#, python-format
-msgid "Warning"
-msgstr "Aviso"
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
@@ -9843,34 +9838,40 @@ msgid ""
 "This account will be used to value outgoing stock for the current product "
 "category using cost price"
 msgstr ""
-"Esta cuenta se utilizará para valorar el stock saliente para la categoría de "
-"producto actual utilizando el precio de coste."
 
 #. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr "En cuenta de :"
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Your Chart of Accounts from a Chart Template"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
+msgid ""
+"From this report, you can have an overview of the amount invoiced to your "
+"customer as well as payment delays. The tool search can also be used to "
+"personalise your Invoices reports and so, match this analysis to your needs."
+msgstr ""
 
 #. module: account
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr "Movimiento de desajuste"
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr "El estado de la factura es Realizada"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
 msgid "Report of the Sales by Account"
-msgstr "Informe de las ventas por cuenta"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr "Contabilidad. Posición fiscal"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
@@ -9880,127 +9881,127 @@ msgstr "Contabilidad. Posición fiscal"
 #: model:process.process,name:account.process_process_supplierinvoiceprocess0
 #: selection:report.invoice.created,type:0
 msgid "Supplier Invoice"
-msgstr "Factura de proveedor"
+msgstr ""
 
 #. module: account
 #: field:account.account,debit:0
 #: report:account.account.balance:0
-#: report:account.account.balance.landscape:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model.line,debit:0
 #: field:account.move.line,debit:0
-#: report:account.move.voucher:0
 #: report:account.partner.balance:0
-#: report:account.tax.code.entries:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,debit:0
 #: report:account.vat.declaration:0
 #: field:report.account.receivable,debit:0
 msgid "Debit"
-msgstr "Debe"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Title 3 (bold, smaller)"
+msgstr ""
 
 #. module: account
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr "Líneas de factura"
+msgstr ""
 
 #. module: account
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
-msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
+msgstr ""
 
 #. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
+#: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
+msgid "Journal Entry Number"
 msgstr ""
-"¡No puede crear una plantilla de cuenta!\n"
-"¡Asegúrese de que si la plantilla de cuenta tiene un padre, que sea de tipo "
-"\"Vista\"! "
 
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
-msgstr "Recurrente"
+msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account.py:642
+#, python-format
+msgid ""
+"You cannot change the type of account from 'Closed' to any other type which "
+"contains journal items!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
-msgstr "El asiento ya está conciliado"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr "Cuentas a cobrar"
+msgstr ""
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr "Plazo de pago de la empresa"
+msgstr ""
 
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr "Intervalo"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1246
-#, python-format
-msgid ""
-"Can not create an automatic sequence for this piece !\n"
-"\n"
-"Put a sequence in the journal definition for automatic numbering or create a "
-"sequence manually for this piece."
 msgstr ""
-"¡No se puede crear una secuencia automática para este asiento!\n"
-"\n"
-"Indique una secuencia en la definición de diario para la numeración "
-"automática o cree manualmente una secuencia para este asiento."
 
 #. module: account
-#: selection:account.balance.report,display_account:0
-#: selection:account.bs.report,display_account:0
-#: selection:account.common.account.report,display_account:0
-#: selection:account.pl.report,display_account:0
-#: selection:account.report.general.ledger,display_account:0
+#: view:account.analytic.line:0
+msgid "Analytic Journal Items related to a purchase journal."
+msgstr ""
+
+#. module: account
+#: help:account.account,type:0
+msgid ""
+"The 'Internal Type' is used for features available on different types of "
+"accounts: view can not have journal items, consolidation are accounts that "
+"can have children accounts for multi-company consolidations, "
+"payable/receivable are for partners accounts (for debit/credit "
+"computations), closed for depreciated accounts."
+msgstr ""
+
+#. module: account
 #: report:account.account.balance:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
 #: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
-msgstr "Con movimientos"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Account Data"
-msgstr "Datos de la cuenta"
+msgstr ""
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr "Plantilla códigos impuestos contables"
+msgstr ""
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
 msgid "Manually"
-msgstr "Manualmente"
+msgstr ""
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10009,58 +10010,62 @@ msgstr "Manualmente"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "December"
-msgstr "Diciembre"
+msgstr ""
 
 #. 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 "Imprimir diarios analíticos"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by month of Invoice Date"
+msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin.Account"
-msgstr "Cuenta fin."
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr "A cobrar vencido"
+msgstr ""
 
 #. module: account
 #: field:account.tax,applicable_type:0
 msgid "Applicability"
-msgstr "Aplicación"
+msgstr ""
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:165
 #, python-format
 msgid "This period is already closed !"
-msgstr "¡Este período ya está cerrado!"
+msgstr ""
 
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr "La otra divisa opcional si es un asiento multi-divisa."
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
 msgstr ""
-"Importación del extracto en el sistema desde una factura de proveedor o "
-"cliente"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr "Facturación"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
+#: view:account.analytic.account:0
 msgid "Parent Account"
-msgstr "Cuenta padre"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -10072,46 +10077,59 @@ msgid ""
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
 msgstr ""
-"Cree y gestione los periodos de su compañía desde este menú. Se utiliza un "
-"diario para registrar transacciones de todos los datos contables relativos "
-"al día a día del negocio de su compañía utilizando el sistema contable de "
-"doble entrada. Dependiendo de la naturaleza de sus actividades y el número "
-"de transacciones diarias, una compañía puede mantener diversos tipos de "
-"diarios especializados como un diario de caja, un diario de compra, un "
-"diario de venta, ..."
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on Invoices"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr "Contabilidad. Plan analítico"
+msgstr ""
 
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr "Importe debido restante."
+msgstr ""
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
 msgid "Statistic Reports"
-msgstr "Informes estadísticos"
+msgstr ""
 
 #. module: account
-#: field:account.installer,progress:0
-#: field:account.installer.modules,progress:0
-#: field:wizard.multi.charts.accounts,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso de la configuración"
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
+#, python-format
+msgid "Bad account!"
+msgstr ""
+
+#. module: account
+#: field:account.print.journal,sort_selection:0
+msgid "Entries Sorted by"
+msgstr ""
+
+#. module: account
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entries are usually in the state "
+"'Unposted', but you can set the option to skip that state on the related "
+"journal. In that case, they will be behave as journal entries automatically "
+"created by the system on document validation (invoices, bank statements...) "
+"and will be created in 'Posted' state."
+msgstr ""
 
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Accounts Mapping"
-msgstr "Mapeo de cuentas"
+msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
-msgstr "La factura '%s' está esperando para validación."
+msgstr ""
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10120,60 +10138,126 @@ msgstr "La factura '%s' está esperando para validación."
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "November"
-msgstr "Noviembre"
+msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_account_installer_modules
-msgid "account.installer.modules"
-msgstr "cuenta.instalador.módulos"
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: refund invoice, reconcile and create a new draft invoice"
+msgstr ""
 
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
 msgstr ""
-"La cuenta de ingresos o gastos relacionada con el producto seleccionado."
-
-#. module: account
-#: code:addons/account/account_move_line.py:1117
-#, python-format
-msgid "The date of your Journal Entry is not in the defined period!"
-msgstr "¡La fecha de su asiento no está en el periodo definido!"
 
 #. module: account
 #: field:account.subscription,period_total:0
 msgid "Number of Periods"
-msgstr "Número de periodos"
+msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr "Diario general"
+msgstr ""
 
 #. module: account
 #: view:account.invoice:0
 msgid "Search Invoice"
-msgstr "Buscar factura"
+msgstr ""
 
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
 #: view:account.invoice.refund:0
-#: selection:account.invoice.refund,filter_refund:0
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "Factura rectificativa"
+msgstr ""
 
 #. module: account
-#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+#: model:email.template,body_text:account.email_template_edi_invoice
+msgid ""
+"\n"
+"Hello${object.address_invoice_id.name and ' ' or "
+"''}${object.address_invoice_id.name or ''},\n"
+"\n"
+"A new invoice is available for ${object.partner_id.name}:\n"
+"       | Invoice number: *${object.number}*\n"
+"       | Invoice total: *${object.amount_total} ${object.currency_id.name}*\n"
+"       | Invoice date: ${object.date_invoice}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the invoice document, download it and pay online using the "
+"following link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"inv_number = quote(object.number)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"inv_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s\"\\\n"
+"             "
+"\"&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn"
+"=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr "Cuentas de banco"
+msgstr ""
 
 #. module: account
 #: field:res.partner,credit:0
 msgid "Total Receivable"
-msgstr "Total a cobrar"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -10181,58 +10265,58 @@ msgstr "Total a cobrar"
 #: view:account.journal:0
 #: view:account.move.line:0
 msgid "General Information"
-msgstr "Información general"
+msgstr ""
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Accounting Documents"
-msgstr "Documentos contables"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr "Contabilidad. Validar líneas movimiento"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
 #: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
 msgid "Cost Ledger (Only quantities)"
-msgstr "Costo contable (sólo cantidades)"
+msgstr ""
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr "El estado de la factura es Realizada."
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 msgid "As soon as the reconciliation is done, the invoice can be paid."
 msgstr ""
-"Tan pronto como la conciliación se realice, la factura estará pagada."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr "Buscar plantillas cuentas"
+msgstr ""
 
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Manual Invoice Taxes"
-msgstr "Impuestos factura manual"
+msgstr ""
 
 #. module: account
 #: field:account.account,parent_right:0
 msgid "Parent Right"
-msgstr "Padre derecho"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
 msgid "account.addtmpl.wizard"
-msgstr "account.añadirplantilla.asistente"
+msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10240,14 +10324,14 @@ msgstr "account.añadirplantilla.asistente"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Partner's"
-msgstr "De empresas"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
 #: view:ir.sequence:0
 #: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
 msgid "Fiscal Years"
-msgstr "Ejercicios fiscales"
+msgstr ""
 
 #. module: account
 #: help:account.analytic.journal,active:0
@@ -10255,19 +10339,17 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar el diario analítico sin "
-"eliminarlo."
 
 #. module: account
 #: field:account.analytic.line,ref:0
 msgid "Ref."
-msgstr "Ref."
+msgstr ""
 
 #. module: account
 #: field:account.use.model,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
-msgstr "Modelo de asiento"
+msgstr ""
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10276,7 +10358,15 @@ msgstr "Modelo de asiento"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr "Febrero"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -10285,28 +10375,30 @@ msgstr "Febrero"
 #: field:account.invoice,partner_bank_id:0
 #: field:account.invoice.report,partner_bank_id:0
 msgid "Bank Account"
-msgstr "Cuenta bancaria"
+msgstr ""
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_central_journal
 #: model:ir.model,name:account.model_account_central_journal
 msgid "Account Central Journal"
-msgstr "Diario central contable"
+msgstr ""
 
 #. module: account
 #: report:account.overdue:0
 msgid "Maturity"
-msgstr "Vencimiento"
+msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
-msgstr "Futuro"
+msgstr ""
 
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr "Buscar líneas asientos"
+msgstr ""
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -10318,35 +10410,32 @@ msgstr "Buscar líneas asientos"
 #: help:account.tax.template,ref_tax_sign:0
 #: help:account.tax.template,tax_sign:0
 msgid "Usually 1 or -1."
-msgstr "Normalmente 1 o -1."
+msgstr ""
 
 #. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Template Account Fiscal Mapping"
-msgstr "Mapeo fiscal de modelo de cuenta"
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
+msgstr ""
 
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr "Cuenta de gastos en plantilla producto"
+msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
-msgid "Amount currency"
-msgstr "Moneda del importe"
+#: help:accounting.report,label_filter:0
+msgid ""
+"This label will be displayed on report to show the balance computed for the "
+"given comparison filter."
+msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, 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!"
-
-#. module: account
-#: code:addons/account/account.py:501
-#, python-format
-msgid "You cannot remove an account which has account entries!. "
-msgstr "¡No puede eliminar una cuenta que contiene asientos contables! "
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -10359,13 +10448,6 @@ msgid ""
 "certain amount of information. They have to be certified by an external "
 "auditor annually."
 msgstr ""
-"Cree y gestione las cuentas que necesite para codificar asientos en los "
-"diarios. Una cuenta es parte de un plan de cuentas que permite a su compañía "
-"registrar todo tipo de transacciones de crédito y débito. Las compañías "
-"presentan sus cuentas anuales en dos partes principales: El balance y la "
-"cuenta de pérdidas y ganancias. Las cuentas anuales de una compañía son "
-"requeridas por ley para que contengan cierta cantidad de información. Tienen "
-"que ser certificadas por un auditor externo anualmente."
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
@@ -10373,1405 +10455,3 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
-"El importe residual de un apunte a cobrar o a pagar expresado en su moneda "
-"(puede ser diferente de la moneda de la compañía)."
-
-#. module: account
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-msgid "Assets"
-msgstr "Activo"
-
-#. module: account
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-msgid "Liabilities"
-msgstr "Pasivos"
-
-#, python-format
-#~ msgid "The statement balance is incorrect !\n"
-#~ msgstr "¡El balance del extracto bancario es incorrecto!\n"
-
-#, python-format
-#~ msgid ""
-#~ "You can specify year, month and date in the name of the model using the "
-#~ "following labels:\n"
-#~ "\n"
-#~ "%(year)s : To Specify Year \n"
-#~ "%(month)s : To Specify Month \n"
-#~ "%(date)s : Current Date\n"
-#~ "\n"
-#~ "e.g. My model on %(date)s"
-#~ msgstr ""
-#~ "Puede indicar año, mes y fecha en el nombre del modelo utilizando las "
-#~ "etiquetas siguientes:\n"
-#~ "\n"
-#~ "%(year)s: Indica año\n"
-#~ "%(month)s: Indica mes\n"
-#~ "%(date)s: Fecha actual\n"
-#~ "\n"
-#~ "por ej. Mi modelo de %(date)s"
-
-#~ msgid "Unpaid Supplier Invoices"
-#~ msgstr "Facturas de proveedor sin pagar"
-
-#~ msgid "Confirm statement from draft"
-#~ msgstr "Confirmar extracto desde borrador"
-
-#~ msgid "Asset"
-#~ msgstr "Activo"
-
-#~ msgid "Select Message"
-#~ msgstr "Seleccionar mensaje"
-
-#~ msgid "Unreconciled entries"
-#~ msgstr "Asientos no conciliados"
-
-#~ msgid "Print Taxes Report"
-#~ msgstr "Imprimir informe de impuestos"
-
-#~ msgid "Unreconcile entries"
-#~ msgstr "Romper conciliación de los asientos"
-
-#~ msgid "Confirm draft invoices"
-#~ msgstr "Confirmar facturas borrador"
-
-#~ msgid "Charts of Account"
-#~ msgstr "Planes contables"
-
-#~ msgid "Move line select"
-#~ msgstr "Seleccionar línea movimineto"
-
-#~ msgid "Entry label"
-#~ msgstr "Ref. asiento"
-
-#~ msgid "Aged Trial Balance"
-#~ msgstr "Balance de comprobación anterior"
-
-#~ msgid "Recurrent Entries"
-#~ msgstr "Asientos recurrentes"
-
-#~ msgid ""
-#~ "Gives the view used when writing or browsing entries in this journal. The "
-#~ "view tell Open ERP which fields should be visible, required or readonly and "
-#~ "in which order. You can create your own view for a faster encoding in each "
-#~ "journal."
-#~ msgstr ""
-#~ "Indica la vista utilizada para introducir o mostrar asientos en este diario. "
-#~ "La vista indica a OpenERP que campos deberían ser visibles, requeridos o "
-#~ "sólo lectura y en qué orden. Puede crear su propia vista para codificar más "
-#~ "rápido en cada diario."
-
-#~ msgid "Account Num."
-#~ msgstr "Núm. cuenta"
-
-#~ msgid "Delta Debit"
-#~ msgstr "Diferencia debe"
-
-#, python-format
-#~ msgid "No analytic journal !"
-#~ msgstr "¡No diario analítico!"
-
-#~ msgid "Debit Trans."
-#~ msgstr "Trans. debe"
-
-#~ msgid "Total entries"
-#~ msgstr "Total asientos"
-
-#~ msgid "Payment Reconcilation"
-#~ msgstr "Conciliación del pago"
-
-#~ msgid "Contra"
-#~ msgstr "Contra"
-
-#~ msgid "Confirm statement with/without reconciliation from draft statement"
-#~ msgstr ""
-#~ "Confirmar extracto bancario con/sin conciliación a partir del extracto "
-#~ "borrador"
-
-#~ msgid "Supplier invoice"
-#~ msgstr "Factura de proveedor"
-
-#~ msgid "Reconcile Paid"
-#~ msgstr "Pago conciliado"
-
-#~ msgid "Printing Date"
-#~ msgstr "Fecha de impresión"
-
-#~ msgid "Mvt"
-#~ msgstr "Mov."
-
-#~ msgid "Fiscal Position Accounts Mapping"
-#~ msgstr "Mapeo cuentas posición fiscal"
-
-#~ msgid "Contact"
-#~ msgstr "Contacto"
-
-#~ msgid "Account Entry Reconcile"
-#~ msgstr "Conciliación asiento contable"
-
-#~ msgid "Keep empty if the fiscal year belongs to several companies."
-#~ msgstr "Dejarlo vacío si el ejercicio fiscal pertenece a varias compañías"
-
-#~ msgid "Analytic Invoice"
-#~ msgstr "Factura analítica"
-
-#~ msgid "Sign for parent"
-#~ msgstr "Signo para el padre"
-
-#~ msgid "Can be draft or validated"
-#~ msgstr "Puede ser borrador o válido"
-
-#~ msgid "Partial Payment"
-#~ msgstr "Pago parcial"
-
-#~ msgid "Move Lines Created."
-#~ msgstr "Movimientos creados."
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Partner account"
-#~ msgstr "Cuenta de la empresa"
-
-#~ msgid "(Keep empty for all open fiscal years)"
-#~ msgstr "(dejarlo vacío para todos los ejercicios fiscales abiertos)"
-
-#~ msgid "Move Lines"
-#~ msgstr "Líneas movimiento"
-
-#, 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"
-
-#~ msgid "Account cost and revenue by journal"
-#~ msgstr "Costo y retorno de la cuenta por diario"
-
-#~ msgid "Bank Reconciliation"
-#~ msgstr "Conciliación bancaria"
-
-#~ msgid "Print Journal"
-#~ msgstr "Imprimir diario"
-
-#~ msgid "Cancel Invoice"
-#~ msgstr "Cancelar factura"
-
-#~ msgid "Select Chart of Accounts"
-#~ msgstr "Seleccionar plan contable"
-
-#~ msgid "Printing Date :"
-#~ msgstr "Fecha de impresión :"
-
-#~ msgid "End date"
-#~ msgstr "Fecha final"
-
-#~ msgid "Entries by Statements"
-#~ msgstr "Asientos por extractos bancarios"
-
-#~ msgid "analytic Invoice"
-#~ msgstr "Factura analítica"
-
-#~ msgid "Grand total"
-#~ msgstr "Suma total"
-
-#~ msgid "Fiscal Position Taxes Mapping"
-#~ msgstr "Mapeo de impuestos posición fiscal"
-
-#~ msgid "New Supplier Invoice"
-#~ msgstr "Nueva factura de proveedor"
-
-#~ msgid "Amount paid"
-#~ msgstr "Importe pagado"
-
-#~ msgid "Voucher Nb"
-#~ msgstr "Núm. de bono"
-
-#~ msgid "Total write-off"
-#~ msgstr "Desajuste total"
-
-#~ msgid "New Analytic Account"
-#~ msgstr "Nueva cuenta analítica"
-
-#~ msgid "Standard entry"
-#~ msgstr "Asiento estándar"
-
-#~ msgid "Tax Report"
-#~ msgstr "Informe impuestos"
-
-#~ msgid "Are you sure you want to close the fiscal year ?"
-#~ msgstr "¿Está seguro que desea cerrar el ejercicio fiscal?"
-
-#~ msgid "Bank Receipt"
-#~ msgstr "Recibo bancario"
-
-#~ msgid "Invoice import"
-#~ msgstr "Importe factura"
-
-#, python-format
-#~ msgid ""
-#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
-#~ msgstr "El balance previsto (%.2f) es diferente del calculado. (%.2f)"
-
-#~ msgid "Ending Balance"
-#~ msgstr "Saldo final"
-
-#~ msgid "Analytic Credit"
-#~ msgstr "Haber analítico"
-
-#~ msgid "Continue"
-#~ msgstr "Continuar"
-
-#~ msgid "Value"
-#~ msgstr "Valor"
-
-#~ msgid "Select invoices you want to pay and manages advances"
-#~ msgstr "Seleccionar facturas que desea pagar y gestionar anticipos"
-
-#~ msgid "Compute Entry Dates"
-#~ msgstr "Calcular fechas asiento"
-
-#~ msgid "Display History"
-#~ msgstr "Mostrar historial"
-
-#~ msgid "        Start date"
-#~ msgstr "        Fecha inicial"
-
-#~ msgid "Display accounts "
-#~ msgstr "Mostrar cuentas "
-
-#~ msgid "Statement reconcile line"
-#~ msgstr "Línea de conciliación de extracto"
-
-#~ msgid "Close states"
-#~ msgstr "Cerrar estados"
-
-#~ msgid "Income"
-#~ msgstr "Ingreso"
-
-#~ msgid "Print General Journal"
-#~ msgstr "Imprimir diario general"
-
-#~ msgid "Invoice Movement"
-#~ msgstr "Asiento factura"
-
-#~ msgid "Legal Statements"
-#~ msgstr "Declaraciones oficiales"
-
-#~ msgid "Open for reconciliation"
-#~ msgstr "Abrir para la conciliación"
-
-#~ msgid "VAT"
-#~ msgstr "IVA"
-
-#~ msgid "Account to reconcile"
-#~ msgstr "Cuenta a conciliar"
-
-#~ msgid "Partner Ref."
-#~ msgstr "Ref. empresa"
-
-#~ msgid "Total quantity"
-#~ msgstr "Cantidad total"
-
-#~ msgid "Third party"
-#~ msgstr "Terceros"
-
-#~ msgid "Costs & Revenues"
-#~ msgstr "Costos e Ingresos"
-
-#~ msgid "Account Number"
-#~ msgstr "Número de cuenta"
-
-#~ msgid "Skip"
-#~ msgstr "Saltar"
-
-#~ msgid "Gives the sequence order when displaying a list of account types."
-#~ msgstr ""
-#~ "Proporciona el orden de secuencia al mostrar una lista de tipos de cuenta."
-
-#~ msgid "Include in base amount"
-#~ msgstr "Incluir en importe base"
-
-#~ msgid "Delta Credit"
-#~ msgstr "Diferencia haber"
-
-#~ msgid "Pre-generated invoice from control"
-#~ msgstr "Factura pre-generada de control"
-
-#~ msgid "Valid Entries"
-#~ msgstr "Asientos válidos"
-
-#~ msgid "Cost Legder for period"
-#~ msgstr "Coste contable por período"
-
-#~ msgid "New Statement"
-#~ msgstr "Nuevo extracto bancario"
-
-#~ msgid "Reconciliation of entries from invoice(s) and payment(s)"
-#~ msgstr "Conciliación de asientos de factura(s) y pago(s)"
-
-#~ msgid "Print Central Journal"
-#~ msgstr "Imprimir diario central"
-
-#~ msgid "Next"
-#~ msgstr "Siguiente"
-
-#~ msgid ""
-#~ "The fiscal position will determine taxes and the accounts used for the the "
-#~ "partner."
-#~ msgstr ""
-#~ "La posición fiscal determinará los impuestos y las cuentas utilizadas para "
-#~ "la empresa."
-
-#~ msgid "Account Manager"
-#~ msgstr "Gestor contable"
-
-#~ msgid "Start date"
-#~ msgstr "Fecha inicial"
-
-#~ msgid "Untaxed amount"
-#~ msgstr "Base imponible"
-
-#~ msgid "Pay invoice"
-#~ msgstr "Pagar factura"
-
-#~ msgid "Draft Customer Invoices"
-#~ msgstr "Facturas de cliente en borrador"
-
-#~ msgid "Sort by:"
-#~ msgstr "Ordenar por:"
-
-#~ msgid "To Be Verified"
-#~ msgstr "Para ser verificado"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "          Start date"
-#~ msgstr "          Fecha inicial"
-
-#~ msgid "Analytic Journal Report"
-#~ msgstr "Informe analítico de diario"
-
-#, python-format
-#~ msgid "No sequence defined in the journal !"
-#~ msgstr "¡No se ha definido una secuencia en el diario!"
-
-#~ msgid "Expense"
-#~ msgstr "Gasto"
-
-#~ msgid "Options"
-#~ msgstr "Opciones"
-
-#~ msgid "Customer Invoice Process"
-#~ msgstr "Proceso de factura de cliente"
-
-#~ msgid "Validate Account Moves"
-#~ msgstr "Validar asientos contables"
-
-#~ msgid "Unpaid invoices"
-#~ msgstr "Facturas sin pagar"
-
-#~ msgid "Payment Reconcile"
-#~ msgstr "Conciliación pago"
-
-#~ msgid "Statements reconciliation"
-#~ msgstr "Conciliación de extractos bancarios"
-
-#~ msgid "Validated accounting entries."
-#~ msgstr "Asientos contables validados."
-
-#~ msgid "Draft Supplier Invoices"
-#~ msgstr "Facturas de proveedor en borrador"
-
-#~ msgid ""
-#~ "Exception made of a mistake of our side, it seems that the following bills "
-#~ "stay unpaid. Please, take appropriate measures in order to carry out this "
-#~ "payment in the next 8 days."
-#~ msgstr ""
-#~ "A no ser que hubiera un error por nuestra parte, las facturas siguientes nos "
-#~ "constan como impagadas. Por favor, tome las medidas apropiadas para realizar "
-#~ "el pago de las mismas en los próximos 8 días."
-
-#~ msgid "x Checks Journal"
-#~ msgstr "x Diario de cheques"
-
-#, 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."
-
-#~ msgid "Create subscription entries"
-#~ msgstr "Crear asientos periódicos"
-
-#~ msgid "Create a Fiscal Year"
-#~ msgstr "Crear un ejercicio fiscal"
-
-#~ msgid "Date Invoiced"
-#~ msgstr "Fecha factura"
-
-#~ msgid "Liability"
-#~ msgstr "Pasivo"
-
-#~ msgid "Statement Entries"
-#~ msgstr "Asientos de extractos"
-
-#~ msgid "Automatic reconciliation"
-#~ msgstr "Conciliación automática"
-
-#~ msgid "Import Invoice"
-#~ msgstr "Importar factura"
-
-#~ msgid "Account No."
-#~ msgstr "Núm. cuenta"
-
-#~ msgid "Date End"
-#~ msgstr "Fecha final"
-
-#~ msgid "Entries Encoding by Line"
-#~ msgstr "Codificación de asientos por línea"
-
-#~ msgid "Entries Reconcile"
-#~ msgstr "Asientos conciliados"
-
-#~ msgid "From analytic accounts, Create invoice."
-#~ msgstr "Desde cuentas analíticas, crear factura."
-
-#~ msgid "Taxes Reports"
-#~ msgstr "Informes de impuestos"
-
-#, python-format
-#~ msgid "Already Reconciled"
-#~ msgstr "Ya conciliado"
-
-#~ msgid "Equity"
-#~ msgstr "Patrimonio"
-
-#~ msgid "Generic Reports"
-#~ msgstr "Informes genéricos"
-
-#~ msgid "Account Analytic Lines Analysis"
-#~ msgstr "Análisis líneas analíticas contables"
-
-#~ msgid "Analytic Chart of Accounts"
-#~ msgstr "Plan de cuentas analíticas"
-
-#~ msgid "Select Period and Journal for Validation"
-#~ msgstr "Selecione período y diario para la validación"
-
-#~ msgid "O_k"
-#~ msgstr "_Aceptar"
-
-#~ msgid "_Go"
-#~ msgstr "_Ir"
-
-#~ msgid "New Customer Invoice"
-#~ msgstr "Nueva factura de cliente"
-
-#~ msgid "Analytic account costs and revenues"
-#~ msgstr "Cuenta analítica costes y retornos"
-
-#~ msgid "Are you sure you want to refund this invoice ?"
-#~ msgstr "¿Está seguro que quiere reintegrar esta factura?"
-
-#~ msgid "Open State"
-#~ msgstr "Estado abierto"
-
-#~ msgid "From statement, create entries"
-#~ msgstr "A partir de extractos, crear asientos"
-
-#~ msgid "1cm 27.7cm 20cm 27.7cm"
-#~ msgstr "1cm 27.7cm 20cm 27.7cm"
-
-#~ msgid "Accounting Statement"
-#~ msgstr "Extracto contable"
-
-#, 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!"
-
-#~ msgid "Reconcilation of entries from payment order."
-#~ msgstr "Conciliación de asientos de órdenes de pago."
-
-#~ msgid "Analytic Journal -"
-#~ msgstr "Diario analítico -"
-
-#~ msgid "Analytic Debit"
-#~ msgstr "Debe analítico"
-
-#~ msgid ""
-#~ "The maturity date of the generated entries for this model. You can chosse "
-#~ "between the date of the creation action or the the date of the creation of "
-#~ "the entries plus the partner payment terms."
-#~ msgstr ""
-#~ "La fecha de vencimiento de los asientos generados para este modelo. Puede "
-#~ "escoger entre la fecha de la acción de creación o la fecha de la creación de "
-#~ "los asientos más los plazos de pago de la empresa."
-
-#~ msgid "Document"
-#~ msgstr "Documento"
-
-#~ msgid "Cancel selected invoices"
-#~ msgstr "Cancelar las facturas seleccionadas"
-
-#~ msgid "Reconcilate the entries from payment"
-#~ msgstr "Conciliar los asientos desde pago"
-
-#~ msgid "Proposed invoice to be checked, validated and printed"
-#~ msgstr "Factura propuesta para ser comprobada, validada e impresa"
-
-#~ msgid ""
-#~ "The account moves of the invoice have been reconciled with account moves of "
-#~ "the payment(s)."
-#~ msgstr ""
-#~ "Los asientos de la factura han sido conciliados con los asientos del pago(s)."
-
-#~ msgid "Close Fiscal Year with new entries"
-#~ msgstr "Cerrar ejercicio fiscal con nuevos asientos"
-
-#~ msgid "Statement encoding produces payment entries"
-#~ msgstr "Codificación de extractos crea asientos de pago"
-
-#~ msgid "Additionnal Information"
-#~ msgstr "Información adicional"
-
-#~ msgid "Third Party Ledger"
-#~ msgstr "Libro mayor de terceros"
-
-#~ msgid "Partner Accounts"
-#~ msgstr "Cuentas de empresa"
-
-#~ msgid ""
-#~ "If a default tax if given in the partner it only override taxes from account "
-#~ "(or product) of the same group."
-#~ msgstr ""
-#~ "Si a la empresa se le ha asignado un impuesto por defecto, éste sólo anulará "
-#~ "impuestos de la cuenta (o producto) del mismo grupo."
-
-#~ msgid "Real Entries"
-#~ msgstr "Asientos reales"
-
-#~ msgid "Import invoice"
-#~ msgstr "Importar factura"
-
-#~ msgid "Invoice line"
-#~ msgstr "Línea de factura"
-
-#~ msgid ""
-#~ "All draft account entries in this journal and period will be validated. It "
-#~ "means you won't be able to modify their accouting fields."
-#~ msgstr ""
-#~ "Todos los asientos contables borrador de este diario y período serán "
-#~ "validados. Esto significa que no podrá modificar sus campos contables."
-
-#~ msgid "Pay and reconcile"
-#~ msgstr "Pagar y conciliar"
-
-#~ msgid "Entry Model"
-#~ msgstr "Modelo de asiento"
-
-#~ msgid "Journal code"
-#~ msgstr "Código del diario"
-
-#~ msgid "Entry encoding"
-#~ msgstr "Codificación asiento"
-
-#~ msgid "Define Fiscal Years and Select Charts of Account"
-#~ msgstr "Definir ejercicios fiscales y seleccionar plan contable"
-
-#~ msgid ""
-#~ "Check this box if you want to print all entries when printing the General "
-#~ "Ledger, otherwise it will only print its balance."
-#~ msgstr ""
-#~ "Marque esta opción si quiere imprimir todas los asientos al imprimir el "
-#~ "libro mayor general, de lo contrario imprimirá solamente su balance."
-
-#~ msgid "By date"
-#~ msgstr "Por fecha"
-
-#~ msgid "Account Configure Wizard "
-#~ msgstr "Asistente de configuración contabilidad "
-
-#~ msgid "Select Chart"
-#~ msgstr "Seleccionar plan contable"
-
-#, python-format
-#~ msgid "The journal must have centralised counterpart"
-#~ msgstr "El diario debe tener un homólogo centralizado"
-
-#~ msgid "Payment Entries"
-#~ msgstr "Asientos de pago"
-
-#~ msgid ""
-#~ "If no account is specified, the reconciliation will be made using every "
-#~ "accounts that can be reconcilied"
-#~ msgstr ""
-#~ "Si no se especifica ninguna cuenta, la conciliación se hará utilizando cada "
-#~ "cuenta que pueda ser conciliada"
-
-#~ msgid "Other"
-#~ msgstr "Otro"
-
-#~ msgid "Movement"
-#~ msgstr "Movimiento"
-
-#~ msgid "Encode manually the statement"
-#~ msgstr "Codificar manualmente el extracto"
-
-#~ msgid "Financial Journals"
-#~ msgstr "Diarios financieros"
-
-#~ msgid ""
-#~ "Gives the type of the analytic journal. When a document (eg: an invoice) "
-#~ "needs to create analytic entries, Open ERP will look for a matching journal "
-#~ "of the same type."
-#~ msgstr ""
-#~ "Indica el tipo del diario analítico. Cuando un documento (por ej.: una "
-#~ "factura) necesita crear asientos analíticos, OpenERP buscará un diario que "
-#~ "corresponda del mismo tipo."
-
-#~ msgid "Import from your bank statements"
-#~ msgstr "Importar desde los extractos bancarios"
-
-#~ msgid "Select entries"
-#~ msgstr "Seleccionar los asientos"
-
-#~ msgid "Base on"
-#~ msgstr "Basado en"
-
-#~ msgid "Cash Payment"
-#~ msgstr "Pago de caja"
-
-#~ msgid ""
-#~ "Indicate if the tax computation is based on the value computed for the "
-#~ "computation of child taxes or based on the total amount."
-#~ msgstr ""
-#~ "Indica si el cálculo del impuesto está basado en el valor calculado por el "
-#~ "cómputo de impuestos hijos o basado en el importe total."
-
-#~ msgid "Account Move"
-#~ msgstr "Asiento"
-
-#~ msgid "Taxed Amount"
-#~ msgstr "Importe impuestos"
-
-#~ msgid "Subtotal w/o tax"
-#~ msgstr "Subtotal sin imp."
-
-#~ msgid "Invoice Ref"
-#~ msgstr "Ref. factura"
-
-#~ msgid "       Include Reconciled Entries"
-#~ msgstr "       Incluir asientos conciliados"
-
-#~ msgid "Credit Trans."
-#~ msgstr "Trans. haber"
-
-#~ msgid "Search Entries"
-#~ msgstr "Buscar asientos"
-
-#~ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-#~ msgstr "Costes analíticos para refacturar compras, hojas de servicios, ..."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Name of the fiscal year as displayed in reports."
-#~ msgstr "Nombre del ejercicio fiscal que se muestra en informes."
-
-#~ msgid "Third party (Country)"
-#~ msgstr "Terceros (país)"
-
-#~ msgid "The sequence gives the display order for a list of journals"
-#~ msgstr "La secuencia indica el orden a mostrar en una lista de diarios"
-
-#~ msgid "Payment date"
-#~ msgstr "Fecha de pago"
-
-#~ msgid "Unpaid Customer Invoices"
-#~ msgstr "Facturas de cliente sin pagar"
-
-#~ msgid "Journal/Payment Mode"
-#~ msgstr "Diario/Modo de pago"
-
-#~ msgid "Canceled Invoice"
-#~ msgstr "Factura cancelada"
-
-#~ msgid "Import file from your bank statement"
-#~ msgstr "Importar archivo desde extracto bancario"
-
-#~ msgid "Bank Payment"
-#~ msgstr "Pago bancario"
-
-#~ msgid "Manually statement"
-#~ msgstr "Extracto manual"
-
-#~ msgid "End of Year Treatments"
-#~ msgstr "Tratamientos de fin de año"
-
-#~ msgid "File statement"
-#~ msgstr "Archivo de extractos"
-
-#~ msgid "Entry Model Line"
-#~ msgstr "Línea del modelo de asiento"
-
-#~ msgid "Set starting and ending balance for control"
-#~ msgstr "Indicar balance inicial y final para control"
-
-#~ msgid "JNRL"
-#~ msgstr "JNRL"
-
-#~ msgid "General Ledger -"
-#~ msgstr "Libro mayor -"
-
-#~ msgid "Quantities"
-#~ msgstr "Cantidades"
-
-#~ msgid "Date Start"
-#~ msgstr "Fecha inicial"
-
-#~ msgid "Number of entries are generated"
-#~ msgstr "Número de asientos que se han generado"
-
-#~ msgid "By Date"
-#~ msgstr "Por fecha"
-
-#~ msgid "The date of the generated entries"
-#~ msgstr "La fecha en que se generaron los asientos"
-
-#~ msgid "Modify Invoice"
-#~ msgstr "Modificar factura"
-
-#~ msgid "Entries Encoding by Move"
-#~ msgstr "Asientos codificados por apunte"
-
-#~ msgid "Filter on Partners"
-#~ msgstr "Filtrar por empresas"
-
-#~ msgid "Analytic Entries by Journal"
-#~ msgstr "Asientos analíticos por diario"
-
-#~ msgid "Valid entries from invoice"
-#~ msgstr "Asientos válidos desde factura"
-
-#~ msgid "Crebit"
-#~ msgstr "Haber"
-
-#~ msgid ""
-#~ "Indicate if the amount of tax must be included in the base amount for the "
-#~ "computation of the next taxes"
-#~ msgstr ""
-#~ "Indique si el importe del impuesto debe ser incluido en el importe base para "
-#~ "el cálculo de otros impuestos"
-
-#~ msgid "Journal name"
-#~ msgstr "Nombre del diario"
-
-#~ msgid "Import invoice from statement"
-#~ msgstr "Importar archivo desde extracto"
-
-#~ msgid "Import from invoices or payments"
-#~ msgstr "Importar desde facturas o pagos"
-
-#~ msgid "Reconcile entries"
-#~ msgstr "Conciliar los asientos"
-
-#~ msgid "Journal - Period"
-#~ msgstr "Diario - Período"
-
-#~ msgid "Print Aged Trial Balance"
-#~ msgstr "Imprimir balance de comprobación anterior"
-
-#~ msgid "General Credit"
-#~ msgstr "Haber general"
-
-#~ msgid "Date payment"
-#~ msgstr "Fecha de pago"
-
-#~ msgid "A/c No."
-#~ msgstr "Nº cuenta"
-
-#~ msgid "Account cost and revenue by journal (This Month)"
-#~ msgstr "Costo y retorno de la cuenta por diario (este mes)"
-
-#~ msgid "Open for unreconciliation"
-#~ msgstr "Abrir para romper conciliación"
-
-#~ msgid "OK"
-#~ msgstr "Aceptar"
-
-#~ msgid "Control Invoice"
-#~ msgstr "Controlar factura"
-
-#~ msgid "Account Balance"
-#~ msgstr "Saldo cuenta"
-
-#~ msgid "Analytic Check"
-#~ msgstr "Comprobación analítica"
-
-#~ msgid "account.analytic.journal"
-#~ msgstr "account.analytic.journal"
-
-#~ msgid "Select parent account"
-#~ msgstr "Seleccionar cuenta padre"
-
-#~ msgid "Payment amount"
-#~ msgstr "Importe a pagar"
-
-#~ msgid "All Months"
-#~ msgstr "Todos los meses"
-
-#~ msgid "Link to the automatically generated account moves."
-#~ msgstr "Enlace al asiento contable generado automáticamente."
-
-#~ msgid "Have a number and entries are generated"
-#~ msgstr "Obtener un número y los asientos son generados"
-
-#~ msgid "Analytic Check -"
-#~ msgstr "Comprobación analítica -"
-
-#~ msgid "Group invoice lines"
-#~ msgstr "Agrupar líneas de factura"
-
-#~ msgid "Total amount"
-#~ msgstr "Importe total"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
-
-#~ msgid "Tax Group"
-#~ msgstr "Grupo de Impuestos"
-
-#~ msgid "Import invoices"
-#~ msgstr "Importar facturas"
-
-#~ msgid "Maintains Invoice sequences with Fiscal Year"
-#~ msgstr "Mantiene secuencias de factura con ejercicio fiscal"
-
-#~ msgid "Subscription Periods"
-#~ msgstr "Repetición de los asientos periódicos"
-
-#~ msgid "Write-Off journal"
-#~ msgstr "Diario de desajuste"
-
-#~ msgid "Full Payment"
-#~ msgstr "Pago completo"
-
-#~ msgid "Journal Purchase"
-#~ msgstr "Diario de compras"
-
-#~ msgid "Cash Receipt"
-#~ msgstr "Recibo de caja"
-
-#~ msgid "Encode manually statement comes into the draft statement"
-#~ msgstr "Codificar el extracto manualmente lo convierte en extracto borrador"
-
-#~ msgid "Accounting entries at statement's confirmation"
-#~ msgstr "Asientos contables en la confirmación del extracto"
-
-#, 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"
-
-#~ msgid "Date Filter"
-#~ msgstr "Filtrado por fecha"
-
-#~ msgid "Choose Journal and Payment Date"
-#~ msgstr "Seleccionar diario y fecha de pago"
-
-#~ msgid "Supplier Invoice Process"
-#~ msgstr "Proceso factura de proveedor"
-
-#~ msgid "Page"
-#~ msgstr "Página"
-
-#~ msgid "Receivable and Payable"
-#~ msgstr "A cobrar y pagar"
-
-#~ msgid "Amount reconciled"
-#~ msgstr "Importe conciliado"
-
-#~ msgid "Subscription Entries"
-#~ msgstr "Asientos periódicos"
-
-#, python-format
-#~ msgid "Closing of fiscal year cancelled, please check the box !"
-#~ msgstr "¡Cierre del ejercicio fiscal cancelado, por favor marque la caja!"
-
-#~ msgid "PRO-FORMA Customer Invoices"
-#~ msgstr "Facturas de cliente PRO-FORMA"
-
-#~ msgid "Analytic Journal Definition"
-#~ msgstr "Definición de diario analítico"
-
-#~ msgid ""
-#~ "This field allow you to choose the accounting journals you want for "
-#~ "filtering the invoices. If you left this field empty, it will search on all "
-#~ "sale, purchase and cash journals."
-#~ msgstr ""
-#~ "Este campo le permite seleccionar los diarios contables que desea para "
-#~ "filtrar las facturas. Si deja este campo vacío, buscará en todos los diarios "
-#~ "de venta, compra y de caja."
-
-#~ msgid "List of Accounts"
-#~ msgstr "Listado de cuentas"
-
-#, python-format
-#~ msgid "Closing of states cancelled, please check the box !"
-#~ msgstr "¡Cierre de estados cancelado, por favor marque la caja!"
-
-#~ msgid "Validate Account Entries"
-#~ msgstr "Validar asientos contables"
-
-#~ msgid "Entries of Open Analytic Journals"
-#~ msgstr "Asientos de diarios analíticos abiertos"
-
-#~ msgid "Current Date"
-#~ msgstr "Fecha actual"
-
-#~ msgid "Journal Sale"
-#~ msgstr "Diario de ventas"
-
-#~ msgid "Print VAT Decl."
-#~ msgstr "Imprimir declaración IVA"
-
-#~ msgid "Financial Accounts"
-#~ msgstr "Cuentas generales"
-
-#~ msgid "Account Configure"
-#~ msgstr "Configurar cuenta"
-
-#~ msgid "Print Journal -"
-#~ msgstr "Impresión diario -"
-
-#~ msgid "Models Definition"
-#~ msgstr "Definición de modelos de asientos"
-
-#~ msgid "Reconcile Entries."
-#~ msgstr "Asientos conciliados."
-
-#~ msgid "Paid invoice when reconciled."
-#~ msgstr "Pagar factura cuando se concilie."
-
-#~ msgid "General Debit"
-#~ msgstr "Debe general"
-
-#~ msgid "Name of the fiscal year as displayed on screens."
-#~ msgstr "Nombre del ejercicio fiscal que se muestra en pantalla."
-
-#~ msgid "Statement Process"
-#~ msgstr "Proceso de extracto"
-
-#~ msgid "Statement reconcile"
-#~ msgstr "Conciliación extracto"
-
-#~ msgid ""
-#~ "The optional quantity expressed by this line, eg: number of product sold. "
-#~ "The quantity is not a legal requirement but is very usefull for some reports."
-#~ msgstr ""
-#~ "La cantidad opcional expresada por esta línea, por ej.: cantidad de producto "
-#~ "vendido. La cantidad no es un requisito legal pero es muy útil para algunos "
-#~ "informes."
-
-#, python-format
-#~ msgid "No Data Available"
-#~ msgstr "No hay datos disponibles"
-
-#~ msgid "J.C. or Move name"
-#~ msgstr "Cód. diario o asiento"
-
-#~ msgid "Journal de vente"
-#~ msgstr "Diario de ventas"
-
-#~ msgid "Parent Analytic Account"
-#~ msgstr "Cuenta analítica padre"
-
-#~ msgid "Date or Code"
-#~ msgstr "Fecha o código"
-
-#~ msgid "Journal d'ouverture"
-#~ msgstr "Diario de apertura"
-
-#~ msgid "Import Invoices in Statement"
-#~ msgstr "Importar facturas en extracto"
-
-#, 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!"
-
-#~ msgid "Maximum Quantity"
-#~ msgstr "Cantidad máxima"
-
-#, 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."
-
-#~ msgid "Accounting and financial management"
-#~ msgstr "Gestión contable y financiera"
-
-#~ msgid "The sequence used for invoice numbers in this journal."
-#~ msgstr "La secuencia utilizada para los números de factura en este diario."
-
-#~ msgid "Error ! The duration of the Fiscal Year is invalid. "
-#~ msgstr "¡Error! La duración del ejercicio fiscal no es correcta. "
-
-#~ msgid "Account Code"
-#~ msgstr "Código cuenta"
-
-#, 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"
-
-#~ msgid "Journal de frais"
-#~ msgstr "Diario de gastos"
-
-#~ msgid ""
-#~ "Check this box if you don't want new account moves to pass through the "
-#~ "'draft' state and instead goes directly to the 'posted state' without any "
-#~ "manual validation."
-#~ msgstr ""
-#~ "Marque esta opción si no desea que nuevos asientos contables pasen por el "
-#~ "estado 'Borrador' y, por el contrario, pasen directamente al estado "
-#~ "\"Fijado\" sin ningún tipo de validación manual."
-
-#~ msgid ""
-#~ "If a default tax is given in the partner it only overrides taxes from "
-#~ "accounts (or products) in the same group."
-#~ msgstr ""
-#~ "Si se indica en la empresa un impuesto por defecto sólo anula los impuestos "
-#~ "de las cuentas (o productos) en el mismo grupo."
-
-#~ msgid "Fiscal Position Template Account Mapping"
-#~ msgstr "Mapeo cuentas plantilla posición fiscal"
-
-#~ msgid "Journal d'extourne"
-#~ msgstr "Diario de inversión"
-
-#~ msgid "Journal de Banque CHF"
-#~ msgstr "Diario de banco"
-
-#~ msgid ""
-#~ "Financial and accounting module that covers:\n"
-#~ "    General accounting\n"
-#~ "    Cost / Analytic accounting\n"
-#~ "    Third party accounting\n"
-#~ "    Taxes management\n"
-#~ "    Budgets\n"
-#~ "    Customer and Supplier Invoices\n"
-#~ "    Bank statements\n"
-#~ "    "
-#~ msgstr ""
-#~ "Módulo de contabilidad financiera y analítica que cubre:\n"
-#~ "    Contabilidad general\n"
-#~ "    Costes / contabilidad analítica\n"
-#~ "    Contabilidad de terceros\n"
-#~ "    Gestión de impuestos\n"
-#~ "    Presupuestos\n"
-#~ "    Facturas de clientes y proveedores\n"
-#~ "    Extractos de cuentas bancarias\n"
-#~ "    "
-
-#~ msgid ""
-#~ "This account will be used instead of the default one to value outgoing stock "
-#~ "for the current product"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará en lugar de la cuenta por defecto para valorar el "
-#~ "stock saliente para el producto actual."
-
-#~ msgid ""
-#~ "This account will be used to value outgoing stock for the current product "
-#~ "category"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará para valorar el stock saliente para la categoría de "
-#~ "producto actual."
-
-#~ msgid ""
-#~ "This account will be used instead of the default one to value incoming stock "
-#~ "for the current product"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará en lugar de la cuenta por defecto para valorar el "
-#~ "stock entrante para el producto actual."
-
-#~ msgid "By Date and Period"
-#~ msgstr "Por fecha y período"
-
-#, python-format
-#~ msgid ""
-#~ "No period defined for this date !\n"
-#~ "Please create a fiscal year."
-#~ msgstr ""
-#~ "¡No se ha definido un período para esta fecha!\n"
-#~ "Por favor, cree un ejercicio fiscal."
-
-#~ msgid " Close states of Fiscal year and periods"
-#~ msgstr " Cerrar estados de ejercicio fiscal y períodos"
-
-#~ msgid "By Period"
-#~ msgstr "Por período"
-
-#~ msgid "Filter on Periods"
-#~ msgstr "Filtrar por períodos"
-
-#~ msgid "Select Date-Period"
-#~ msgstr "Seleccionar fecha-período"
-
-#~ msgid "Force all moves for this account to have this secondary currency."
-#~ msgstr ""
-#~ "Fuerza a todos los movimientos de esta cuenta que tengan esta divisa "
-#~ "secundaria."
-
-#~ msgid "The currency of the journal"
-#~ msgstr "La divisa del diario"
-
-#~ msgid "Skip 'Draft' State for Created Entries"
-#~ msgstr "Omitir estado 'Borrador ' al crear asientos"
-
-#~ msgid "Error! You can not create recursive analytic accounts."
-#~ msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#~ msgid ""
-#~ "If the Tax account is tax code account, this field will contain the taxed "
-#~ "amount.If the tax account is base tax code,                    this field "
-#~ "will contain the basic amount(without tax)."
-#~ msgstr ""
-#~ "Si la cuenta de impuestos es una cuenta código de impuestos, este campo "
-#~ "contendrá el importe con impuestos. Si la cuenta de impuestos es el código "
-#~ "de impuestos base, este campo contendrá el importe base (sin impuestos)."
-
-#~ msgid "The Account can either be a base tax code or tax code account."
-#~ msgstr ""
-#~ "La cuenta puede ser un código de impuestos base o una cuenta código de "
-#~ "impuestos."
-
-#~ msgid ""
-#~ "This type is used to differenciate types with special effects in Open ERP: "
-#~ "view can not have entries, consolidation are accounts that can have children "
-#~ "accounts for multi-company consolidations, payable/receivable are for "
-#~ "partners accounts (for debit/credit computations), closed for deprecated "
-#~ "accounts."
-#~ msgstr ""
-#~ "Este tipo sirve para diferenciar los tipos de cuenta con características "
-#~ "especiales en OpenERP: Vista no puede tener asientos, consolidación son "
-#~ "cuentas que pueden tener cuentas hijas para consolidaciones multi-compañía, "
-#~ "a cobrar/a pagar son cuentas para las empresas (para cálculos de débito / "
-#~ "crédito), cerrado para cuentas obsoletas."
-
-#~ msgid ""
-#~ "These types are defined according to your country. The type contain more "
-#~ "information about the account and it's specificities."
-#~ msgstr ""
-#~ "Estos tipos se definen de acuerdo a su país. El tipo contiene más "
-#~ "información acerca de la cuenta y sus especificidades."
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Error: Número BVR inválido (checksum erróneo)."
-
-#~ msgid "Full Account Name"
-#~ msgstr "Nombre completo de la cuenta"
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "Error: La referencia BVR es necesaria."
-
-#~ msgid "Fiscal Position Template Tax Mapping"
-#~ msgstr "Mapeo de impuestos en plantilla posiciones fiscales"
-
-#~ msgid "Draft Supplier Refunds"
-#~ msgstr "Facturas rectificativas (abono) de proveedor en borrador"
-
-#~ msgid "Unpaid Supplier Refunds"
-#~ msgstr "Facturas rectificativas (abono) de proveedor sin pagar"
-
-#~ msgid "Credit Note"
-#~ msgstr "Factura rectificativa (abono)"
-
-#~ msgid "Draft Customer Refunds"
-#~ msgstr "Facturas rectificativas (abono) de cliente en borrador"
-
-#~ msgid "New Supplier Refund"
-#~ msgstr "Nueva factura rectificativa (abono) de proveedor"
-
-#~ msgid "x Expenses Credit Notes Journal"
-#~ msgstr "x Diario facturas rectificativas (abono) de gastos"
-
-#~ msgid "Unpaid Customer Refunds"
-#~ msgstr "Facturas rectificativas (abono) de cliente sin pagar"
-
-#~ msgid "New Customer Refund"
-#~ msgstr "Nueva factura rectificativa (abono) de cliente"
-
-#~ msgid "Journal Voucher"
-#~ msgstr "Diario de comprobantes"
-
-#~ msgid ""
-#~ "This account will be used to value incoming stock for the current product "
-#~ "category"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará para valuar el stock entrante para la categoría "
-#~ "actual de producto"
-
-#~ msgid "to :"
-#~ msgstr "a :"
-
-#~ msgid "Message"
-#~ msgstr "Mensaje"
-
-#~ msgid "Period from :"
-#~ msgstr "Periodo desde :"
-
-#~ msgid "Overdue Payment Report Message"
-#~ msgstr "Mensaje para reporte de pagos vencidos"
-
-#~ msgid "Overdue Payment Message"
-#~ msgstr "Mensaje pagos vencidos"
-
-#~ msgid "Entries Encoding"
-#~ msgstr "Codificación de asientos"
-
-#~ msgid "Specify The Message for the Overdue Payment Report."
-#~ msgstr "Especificar el mensaje para el informe de pagos vencidos"
-
-#~ msgid "Financial Management"
-#~ msgstr "Contabilidad y finanzas"
-
-#~ msgid "wizard.company.setup"
-#~ msgstr "wizard.company.setup"
-
-#~ msgid "asgfas"
-#~ msgstr "asgfas"
-
-#~ msgid "Partner Other Ledger"
-#~ msgstr "Asociar Otro Libro Mayor"
-
-#~ msgid "3 Months"
-#~ msgstr "Trimestral"
-
-#~ msgid "The amount in the currency of the journal"
-#~ msgstr "El importe en la divisa del diario."
-
-#~ msgid "All periods if empty"
-#~ msgstr "Todos los períodos si está vacío."
-
-#~ msgid "Date/Period Filter"
-#~ msgstr "Filtrar por fecha/período"
-
-#~ msgid "Entry Name"
-#~ msgstr "Descripción"
-
-#~ msgid "Generate entries before:"
-#~ msgstr "Generar asientos hasta:"
-
-#~ msgid "Account Entry Line"
-#~ msgstr "Apunte"
-
-#~ msgid "Header"
-#~ msgstr "Encabezado"
-
-#~ msgid "<drawRightString x=\"19.8cm\" y=\"28cm\">"
-#~ msgstr "<drawRightString x=\"19.8cm\" y=\"28cm\">"
-
-#~ msgid "COL 2"
-#~ msgstr "COL 2"
-
-#~ msgid "</drawRightString>"
-#~ msgstr "</drawRightString>"
-
-#~ msgid "TITLE COMPANY"
-#~ msgstr "TÍTULO COMPAÑÍA"
-
-#~ msgid "logo"
-#~ msgstr "logo"
-
-#~ msgid "<drawString x=\"4.6cm\" y=\"28.7cm\">"
-#~ msgstr "<drawString x=\"4.6cm\" y=\"28.7cm\">"
-
-#~ msgid "COL 1"
-#~ msgstr "COL 1"
-
-#~ msgid "<stroke color=\"darkblue\"/>"
-#~ msgstr "<stroke color=\"darkblue\"/>"
-
-#, python-format
-#~ msgid "UnknownError"
-#~ msgstr "Error desconocido"
-
-#~ msgid "<fill color=\"darkblue\"/>"
-#~ msgstr "<fill color=\"darkblue\"/>"
-
-#~ msgid "</drawString>"
-#~ msgstr "</drawString>"
-
-#~ msgid ""
-#~ "Example: 14 days 2%, 30 days net\n"
-#~ "1. Line 1: percent 0.02 14 days\n"
-#~ "2. Line 2: balance 30 days"
-#~ msgstr ""
-#~ "Ejemplo: 14 días 2%, 30 días el resto\n"
-#~ "1. Línea 1: Porcentaje 0.02 14 días\n"
-#~ "2. Línea 2: Saldo 30 días"
-
-#~ msgid "Balance Brought Forward"
-#~ msgstr "Saldo inicial"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#, python-format
-#~ msgid "Account move line \"%s\" is not valid"
-#~ msgstr "El apunte \"%s\" no es válido."
-
-#~ msgid ""
-#~ "This field is used for payable and receivable entries. You can put the limit "
-#~ "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 este apunte."
-
-#~ 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 el apunte en desacuerdo con la empresa "
-#~ "asociada"
-
-#~ msgid "Account Entry Lines"
-#~ msgstr "Apuntes contables"
-
-#~ msgid "Invoice Sequence"
-#~ msgstr "Secuencia de facturas"
-
-#, python-format
-#~ msgid "Invoice "
-#~ msgstr "Factura "
-
-#, python-format
-#~ msgid "is validated."
-#~ msgstr "está validada."
-
-#~ msgid "Chart of Account"
-#~ msgstr "Plan contable"
-
-#~ msgid "Balance:"
-#~ msgstr "Balance:"
diff --git a/addons/account/i18n/es_PY.po b/addons/account/i18n/es_PY.po
index 4c4943ade57..fd3b6c2c72f 100644
--- a/addons/account/i18n/es_PY.po
+++ b/addons/account/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -143,6 +143,7 @@ msgstr "Reconciliar"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referencia"
 
@@ -161,13 +162,13 @@ msgstr ""
 "eliminarlo."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "¡Cuidado!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -232,7 +233,7 @@ msgstr ""
 "relacionado con este código de impuesto."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -249,7 +250,7 @@ msgid "Belgian Reports"
 msgstr "Informes Belgas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "No puede añadir/modificar asientos en un diario cerrado."
@@ -295,7 +296,7 @@ msgid "St."
 msgstr "Ext."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -590,8 +591,10 @@ msgid "The accountant confirms the statement."
 msgstr "El contable confirma el extracto."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -650,7 +653,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "¡La secuencia principal debe ser diferente de la actual!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -661,7 +664,7 @@ msgid "Tax Code Amount"
 msgstr "Importe código impuesto"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "VENTA"
@@ -688,8 +691,8 @@ msgid "Journal Period"
 msgstr "Periodo diario"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -768,6 +771,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "¡Sólo puede cambiar la moneda para facturas en borrador!"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -783,12 +787,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -917,12 +922,13 @@ msgid "Create 3 Months Periods"
 msgstr "Crear períodos trimestrales"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Debe"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1003,7 +1009,7 @@ msgstr ""
 "contendrá el monto de base imponible (sin impuesto)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1036,10 +1042,10 @@ msgid "Code"
 msgstr "Código"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1103,7 +1109,7 @@ msgstr ""
 "tipo contiene más información acerca de la cuenta y sus especificidades."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1151,7 +1157,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banco"
@@ -1247,7 +1253,7 @@ msgid "The move of this entry line."
 msgstr "El asiento de este apunte."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1268,7 +1274,7 @@ msgid "Entry Label"
 msgstr "Línea de asiento"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1354,14 +1360,15 @@ msgid "Taxes"
 msgstr "Impuestos"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Seleccione un periodo inicial y final"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1416,6 +1423,7 @@ msgid "Journal Items Analysis"
 msgstr "Análisis elementos diario"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Socio"
@@ -1440,8 +1448,10 @@ msgid "Central Journal"
 msgstr "Diario central"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1676,6 +1686,7 @@ msgid "Separated Journal Sequences"
 msgstr "Secuencias de diarios separadas"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Responsable"
@@ -1706,7 +1717,7 @@ msgid "Year Sum"
 msgstr "Suma del año"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1785,7 +1796,7 @@ msgid "Customer Ref:"
 msgstr "Ref. cliente:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "¡El usuario %s no tienen derechos para acceder al diario %s !"
@@ -2114,7 +2125,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2145,7 +2156,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Buscar plantillas de plan contable"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2197,7 +2208,7 @@ msgid "Description"
 msgstr "Descripción"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ACOMPRA"
@@ -2216,7 +2227,7 @@ msgid "Income Account"
 msgstr "Cuenta de ingresos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "¡No se ha definido un diario contable de tipo Venta/Compra!"
@@ -2256,6 +2267,7 @@ msgstr "Plantilla de producto"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2265,6 +2277,7 @@ msgstr "Plantilla de producto"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2315,7 +2328,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2348,7 +2361,7 @@ msgid "Main Sequence"
 msgstr "Secuencia principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2422,7 +2435,7 @@ msgid "Account Tax Code"
 msgstr "Código impuesto contable"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2516,7 +2529,7 @@ msgid "Account Model Entries"
 msgstr "Contabilidad. Líneas de modelo"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "COMPRA"
@@ -2584,7 +2597,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2616,7 +2628,7 @@ msgid "Accounts"
 msgstr "Cuentas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "¡Error de configuración!"
@@ -2740,6 +2752,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Saldos vencidos de empresa"
@@ -2792,14 +2805,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Este asistente creará asientos contables recurrentes"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "¡No se ha definido una secuencia en el diario!"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2908,7 +2921,7 @@ msgid "Base Code Amount"
 msgstr "Importe código base"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2921,7 +2934,7 @@ msgid "Default Sale Tax"
 msgstr "Impuesto de venta por defecto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2962,7 +2975,7 @@ msgid "Fiscal Position"
 msgstr "Posición fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3117,7 +3130,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3321,7 +3334,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "¡No se ha definido empresa!"
@@ -3377,7 +3390,7 @@ msgid "Chart of Tax"
 msgstr "Plan de impuestos"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3462,6 +3475,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3508,7 +3522,7 @@ msgid "Detail"
 msgstr "Detalle"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3523,9 +3537,16 @@ msgid "VAT :"
 msgstr "IVA"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3546,7 +3567,7 @@ msgid "Centralised counterpart"
 msgstr "Homólogo centralizado"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3573,6 +3594,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3600,10 +3622,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Fecha"
 
@@ -3620,7 +3649,6 @@ msgstr "Romper conciliación"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3634,7 +3662,7 @@ msgid "Chart of Accounts Template"
 msgstr "Plantilla del plan contable"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3646,7 +3674,7 @@ msgstr ""
 "¡Por favor, defina la empresa en él!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "¡Algunos asientos ya están conciliados!"
@@ -3677,6 +3705,8 @@ msgstr "Presupuestos"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Sin filtros"
 
@@ -3761,7 +3791,7 @@ msgid "Analytic Items"
 msgstr "Apuntes analíticos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "¡No ha sido posible cambiar el impuesto!"
@@ -3792,7 +3822,7 @@ msgid "Mapping"
 msgstr "Relaciones"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3806,6 +3836,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3819,7 +3850,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Informe de balance de comprobación de vencimientos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4151,7 +4182,7 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4208,7 +4239,7 @@ msgid "Account Base Code"
 msgstr "Código base cuenta"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4419,7 +4450,7 @@ msgid "Allow Reconciliation"
 msgstr "Permitir conciliación"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4453,7 +4484,7 @@ msgid "Recurring Models"
 msgstr "Modelos recurrentes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4465,6 +4496,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Modificar"
 
@@ -4509,7 +4541,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4525,7 +4557,7 @@ msgid "Keep empty to use the income account"
 msgstr "Dejarlo vacío para usar la cuenta de ingresos"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4553,7 +4585,7 @@ msgstr "Mapeo de cuentas"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -4569,7 +4601,7 @@ msgid "Cancelled Invoice"
 msgstr "Factura cancelada"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4626,7 +4658,7 @@ msgid "Income Account on Product Template"
 msgstr "Cuenta de ingresos en plantilla producto"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4653,11 +4685,13 @@ msgstr "Nuevo ejercicio fiscal"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Facturas"
 
@@ -4794,26 +4828,24 @@ msgid "Journal Items"
 msgstr "Registros del diario"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Error!"
@@ -4921,7 +4953,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4948,7 +4980,7 @@ msgid "Child Tax Accounts"
 msgstr "Cuentas impuestos hijas"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Periodo inicial debería ser más pequeño que el periodo final"
@@ -4971,6 +5003,7 @@ msgstr "Balance analítico -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5014,6 +5047,8 @@ msgstr "Tipo de periodo"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Pagos"
 
@@ -5088,7 +5123,7 @@ msgid "Line 1:"
 msgstr "Línea 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "¡Error de integridad!"
@@ -5121,6 +5156,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Hoja de balance"
@@ -5197,6 +5233,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5327,7 +5364,6 @@ msgstr "Contabilidad. Informe contable común"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Comunicación"
 
@@ -5379,13 +5415,13 @@ msgid "End of Year Entries Journal"
 msgstr "Diario asientos cierre del ejercicio"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5462,7 +5498,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5636,7 +5671,7 @@ msgid "Generate Opening Entries"
 msgstr "Generar asientos apertura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "¡Ya está conciliado!"
@@ -5669,14 +5704,14 @@ msgid "Child Accounts"
 msgstr "Cuentas hijas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Cancelar Dividas"
@@ -5696,7 +5731,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Proveedor"
@@ -5726,7 +5761,7 @@ msgid "Account n°"
 msgstr "Cuenta n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referencia libre"
@@ -5741,7 +5776,9 @@ msgstr "Valoración"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Cuentas por cobrar y pagar"
@@ -5849,7 +5886,7 @@ msgid "Filter by"
 msgstr "Filtrar por"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5860,8 +5897,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "¡No puede utilizar una cuenta inactiva!"
@@ -5902,8 +5939,8 @@ msgid "Number of Days"
 msgstr "Número de Días"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5965,7 +6002,7 @@ msgid "Multipication factor for Base code"
 msgstr "Factor de multiplicación para código base"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "sin implementar"
@@ -6004,6 +6041,8 @@ msgstr "Análisis asientos analíticos"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Anterior"
 
@@ -6285,6 +6324,8 @@ msgstr "Porcentaje"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Diario y Empresa"
 
@@ -6294,7 +6335,7 @@ msgid "Power"
 msgstr "Fuerza"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6336,6 +6377,7 @@ msgid "Applicable Type"
 msgstr "Tipo aplicable"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Referencia factura"
@@ -6567,8 +6609,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Asientos: "
@@ -6584,7 +6626,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "No se ha podido crear movimiento entre diferentes compañías"
@@ -6633,13 +6675,13 @@ msgstr "Estado es borrador"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Total Debito"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "¡El asiento \"%s\" no es válido!"
@@ -6713,25 +6755,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6763,8 +6806,8 @@ msgid "Printed"
 msgstr "Impreso"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6824,7 +6867,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Mostrar informe libro mayor con una empresa por página."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6985,7 +7028,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7022,7 +7065,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7097,14 +7140,14 @@ msgid "Source Document"
 msgstr "Documento origen"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7212,8 +7255,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "¿Está seguro que desea abrir esta factura?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7226,7 +7269,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Asientos contables"
@@ -7366,7 +7409,7 @@ msgstr ""
 "personalizada."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7398,8 +7441,8 @@ msgid "Reporting"
 msgstr "Informe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7496,7 +7539,7 @@ msgid "Sign on Reports"
 msgstr "Signo en informes"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7507,7 +7550,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7542,13 +7585,14 @@ msgid "Optional Information"
 msgstr "Información opcional"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "El diario debe tener una cuenta haber y debe por defecto."
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7577,13 +7621,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "¡Cuenta incorrecta!"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Diario de ventas"
@@ -7600,7 +7644,7 @@ msgid "Invoice Tax"
 msgstr "Impuesto de factura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "¡Ningún trozo de número!"
@@ -7650,7 +7694,7 @@ msgstr "Hasta"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7698,13 +7742,15 @@ msgstr "Mayo"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Cuentas por pagar"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7748,7 +7794,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Dinero en efectivo"
@@ -7760,15 +7806,15 @@ msgid "Account Destination"
 msgstr "Cuenta destino"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7925,13 +7971,14 @@ msgstr "Fijo"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "¡Atención!"
@@ -7983,7 +8030,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Seleccione una moneda a aplicar en la factura."
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7996,7 +8043,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "No se puede %s factura borrador/proforma/cancelada."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "¡No hay líneas de factura!"
@@ -8072,7 +8119,7 @@ msgid "Deferral Method"
 msgstr "Método cierre"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "La factura '%s' está pagada."
@@ -8138,7 +8185,7 @@ msgid "Associated Partner"
 msgstr "Empresa asociada"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "¡Primero debe seleccionar una empresa!"
@@ -8187,7 +8234,7 @@ msgstr ""
 "de acuerdo a su país."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8209,7 +8256,7 @@ msgid "Choose Fiscal Year"
 msgstr "Seleccione el ejercicio fiscal"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diario de abono de compras"
@@ -8300,7 +8347,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8441,7 +8488,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8520,10 +8567,12 @@ msgstr "Diario reintegro"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtrar por"
 
@@ -8560,7 +8609,7 @@ msgid "The partner account used for this invoice."
 msgstr "La cuenta de la empresa utilizada para esta factura."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8583,7 +8632,7 @@ msgid "Payment Term Line"
 msgstr "Línea de plazo de pago"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diario de compras"
@@ -8672,7 +8721,7 @@ msgid "Unpaid Invoices"
 msgstr "Facturas no pagas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8782,7 +8831,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Dejarlo vacío para abrir todos los ejercicios fiscales."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "¡El movimiento contable (%s) para centralización ha sido confirmado!"
@@ -8797,7 +8846,7 @@ msgstr ""
 "multi-divisa."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8880,7 +8929,7 @@ msgid "Contact Address"
 msgstr "Dirección contacto"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8915,12 +8964,14 @@ msgstr "Contratos"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "desconocido"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diario asientos de apertura"
@@ -8942,7 +8993,7 @@ msgstr ""
 "calcula en el informe de Pérdidas y Ganancias."
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -9033,7 +9084,7 @@ msgid "Period from"
 msgstr "Período desde"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diario de abono de ventas"
@@ -9080,7 +9131,7 @@ msgid "Purchase Tax(%)"
 msgstr "Impuesto compra (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Cree algunas líneas de factura"
@@ -9096,7 +9147,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "AVENTA"
@@ -9134,8 +9185,6 @@ msgstr "Fin de período"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -9150,6 +9199,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9170,6 +9220,7 @@ msgstr "Periodo inicial"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Dirección análisis"
 
@@ -9189,7 +9240,7 @@ msgstr "Vista de diario"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total Credito"
@@ -9259,6 +9310,7 @@ msgstr "Extractos bancarios"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9340,7 +9392,7 @@ msgstr ""
 "de contrapartida."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Debe seleccionar las cuentas a conciliar"
@@ -9368,7 +9420,6 @@ msgstr ""
 "periodo específico."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filtros por"
@@ -9390,7 +9441,7 @@ msgid "Move"
 msgstr "Asiento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9450,7 +9501,7 @@ msgid "Consolidated Children"
 msgstr "Hijos consolidados"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9513,6 +9564,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9569,6 +9621,7 @@ msgstr "Asiento periódico"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9576,6 +9629,7 @@ msgstr "Asiento periódico"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9618,7 +9672,7 @@ msgid "Unreconciled"
 msgstr "No conciliado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "¡Total erróneo!"
@@ -9686,7 +9740,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Error desconocido"
@@ -9725,6 +9779,7 @@ msgstr "Validar movimiento contable"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9829,9 +9884,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Periodos"
 
@@ -9999,6 +10056,7 @@ msgstr "Fijado"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10046,7 +10104,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -10083,6 +10141,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10103,6 +10162,7 @@ msgstr "Diario: Todos"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10117,7 +10177,9 @@ msgstr "Diario: Todos"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10127,6 +10189,8 @@ msgstr "Diario: Todos"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10290,6 +10354,7 @@ msgstr "Factura de Proveedor"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10323,6 +10388,8 @@ msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -10340,7 +10407,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "El asiento ya está conciliado"
@@ -10376,8 +10443,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Con movimientos"
@@ -10502,8 +10571,8 @@ msgid "Statistic Reports"
 msgstr "Informes estadísticos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "¡Cuenta incorrecta!"
@@ -10529,7 +10598,7 @@ msgid "Accounts Mapping"
 msgstr "Mapeo de cuentas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "La factura '%s' está esperando para validación."
@@ -10721,6 +10790,7 @@ msgstr "account.añadirplantilla.asistente"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10799,6 +10869,8 @@ msgstr "Vencimiento"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Futuro"
 
diff --git a/addons/account/i18n/es_UY.po b/addons/account/i18n/es_UY.po
index ba90609e994..a3758547837 100644
--- a/addons/account/i18n/es_UY.po
+++ b/addons/account/i18n/es_UY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-15 04:40+0000\n"
-"X-Generator: Launchpad (build 15801)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -147,6 +147,7 @@ msgstr "Reconciliar"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referencia"
 
@@ -165,13 +166,13 @@ msgstr ""
 "eliminarlo."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "¡Cuidado!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diario varios"
@@ -236,7 +237,7 @@ msgstr ""
 "relacionado con este código de impuesto."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -253,7 +254,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "No puede añadir/modificar asientos en un diario cerrado."
@@ -302,7 +303,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -590,8 +591,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -647,7 +650,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -658,7 +661,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -685,8 +688,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -763,6 +766,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -778,12 +782,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -912,12 +917,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -995,7 +1001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1028,10 +1034,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1093,7 +1099,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1141,7 +1147,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1233,7 +1239,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1254,7 +1260,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1339,14 +1345,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1401,6 +1408,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1425,8 +1433,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1655,6 +1665,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1685,7 +1696,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1758,7 +1769,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2077,7 +2088,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2101,7 +2112,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2150,7 +2161,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2169,7 +2180,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2209,6 +2220,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2218,6 +2230,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2268,7 +2281,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2299,7 +2312,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2373,7 +2386,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2454,7 +2467,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2513,7 +2526,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2545,7 +2557,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2665,6 +2677,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2712,14 +2725,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2822,7 +2835,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2837,7 +2850,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2875,7 +2888,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3028,7 +3041,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3220,7 +3233,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3274,7 +3287,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3355,6 +3368,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3401,7 +3415,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3416,9 +3430,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3439,7 +3460,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3464,6 +3485,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3491,10 +3513,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3511,7 +3540,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3525,7 +3553,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3534,7 +3562,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3565,6 +3593,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3646,7 +3676,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3677,7 +3707,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3691,6 +3721,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3704,7 +3735,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4024,7 +4055,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4081,7 +4112,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4288,7 +4319,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4322,7 +4353,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4334,6 +4365,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4378,7 +4410,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4392,7 +4424,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4420,7 +4452,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4436,7 +4468,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4488,7 +4520,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4513,11 +4545,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4657,26 +4691,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4779,7 +4811,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4803,7 +4835,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4824,6 +4856,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4867,6 +4900,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4940,7 +4975,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4973,6 +5008,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5049,6 +5085,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5176,7 +5213,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5228,13 +5264,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5308,7 +5344,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Facturas y Notas de Crédito de clientes"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5471,7 +5506,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5504,14 +5539,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5531,7 +5566,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5561,7 +5596,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5576,7 +5611,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5672,7 +5709,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5683,8 +5720,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5725,8 +5762,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5788,7 +5825,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5825,6 +5862,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6098,6 +6137,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6107,7 +6148,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6147,6 +6188,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6365,8 +6407,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6382,7 +6424,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6421,13 +6463,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6495,25 +6537,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6545,8 +6588,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6601,7 +6644,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6752,7 +6795,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6782,7 +6825,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6850,14 +6893,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6955,8 +6998,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6969,7 +7012,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7100,7 +7143,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7131,8 +7174,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7221,7 +7264,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7232,7 +7275,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7267,13 +7310,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7300,13 +7344,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7323,7 +7367,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7373,7 +7417,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7421,13 +7465,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7471,7 +7517,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7483,15 +7529,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7637,13 +7683,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7695,7 +7742,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7708,7 +7755,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7782,7 +7829,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7844,7 +7891,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7890,7 +7937,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7912,7 +7959,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diario de reembolso de compras"
@@ -7999,7 +8046,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8131,7 +8178,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8210,10 +8257,12 @@ msgstr "Diario reembolso"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8246,7 +8295,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8269,7 +8318,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8355,7 +8404,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8461,7 +8510,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8474,7 +8523,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8547,7 +8596,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8582,12 +8631,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8606,7 +8657,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8692,7 +8743,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diario de reembolso de ventas"
@@ -8739,7 +8790,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8755,7 +8806,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8787,8 +8838,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8803,6 +8852,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8823,6 +8873,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8842,7 +8893,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8911,6 +8962,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8986,7 +9038,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -9008,7 +9060,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -9030,7 +9081,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9086,7 +9137,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9147,6 +9198,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9203,6 +9255,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9210,6 +9263,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9252,7 +9306,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9311,7 +9365,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9348,6 +9402,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9449,9 +9504,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9615,6 +9672,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9662,7 +9720,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9698,6 +9756,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9718,6 +9777,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9732,7 +9792,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9742,6 +9804,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9895,6 +9959,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9928,6 +9993,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9945,7 +10012,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9981,8 +10048,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10098,8 +10167,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10125,7 +10194,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10385,6 +10454,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10458,6 +10528,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/es_VE.po b/addons/account/i18n/es_VE.po
index c32209098e9..7bf43eb840d 100644
--- a/addons/account/i18n/es_VE.po
+++ b/addons/account/i18n/es_VE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -145,6 +145,7 @@ msgstr "Reconciliar"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referencia"
 
@@ -161,13 +162,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -229,7 +230,7 @@ msgstr ""
 "relacionado con este código de impuesto."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -245,7 +246,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -291,7 +292,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -565,8 +566,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -622,7 +625,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -633,7 +636,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -660,8 +663,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -738,6 +741,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -753,12 +757,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -884,12 +889,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -967,7 +973,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1000,10 +1006,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1065,7 +1071,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1113,7 +1119,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1205,7 +1211,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1226,7 +1232,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1311,14 +1317,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1373,6 +1380,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1397,8 +1405,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1623,6 +1633,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1651,7 +1662,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1724,7 +1735,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2043,7 +2054,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2067,7 +2078,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2116,7 +2127,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2135,7 +2146,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2175,6 +2186,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2184,6 +2196,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2234,7 +2247,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2265,7 +2278,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2339,7 +2352,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2427,7 +2440,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2486,7 +2499,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2518,7 +2530,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2638,6 +2650,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2685,14 +2698,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2795,7 +2808,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2808,7 +2821,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2846,7 +2859,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2993,7 +3006,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3185,7 +3198,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3239,7 +3252,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3320,6 +3333,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3366,7 +3380,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3381,9 +3395,16 @@ msgid "VAT :"
 msgstr "RIF"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3404,7 +3425,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3429,6 +3450,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3456,10 +3478,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3476,7 +3505,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3490,7 +3518,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3499,7 +3527,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3530,6 +3558,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3611,7 +3641,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3642,7 +3672,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3656,6 +3686,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3669,7 +3700,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3989,7 +4020,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4046,7 +4077,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4253,7 +4284,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4287,7 +4318,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4299,6 +4330,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4343,7 +4375,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4357,7 +4389,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4385,7 +4417,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4401,7 +4433,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4453,7 +4485,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4478,11 +4510,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4619,26 +4653,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4741,7 +4773,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4765,7 +4797,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4786,6 +4818,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4829,6 +4862,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4902,7 +4937,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4935,6 +4970,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5011,6 +5047,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5138,7 +5175,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5190,13 +5226,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5270,7 +5306,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5433,7 +5468,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5466,14 +5501,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5493,7 +5528,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5523,7 +5558,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5538,7 +5573,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5634,7 +5671,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5645,8 +5682,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5687,8 +5724,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5750,7 +5787,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5787,6 +5824,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6062,6 +6101,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6071,7 +6112,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6111,6 +6152,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6329,8 +6371,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6346,7 +6388,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6385,13 +6427,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6459,25 +6501,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6509,8 +6552,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6565,7 +6608,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6716,7 +6759,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6746,7 +6789,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6814,14 +6857,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6917,8 +6960,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6931,7 +6974,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7062,7 +7105,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7093,8 +7136,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7183,7 +7226,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7194,7 +7237,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7229,13 +7272,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7262,13 +7306,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7285,7 +7329,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7335,7 +7379,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7383,13 +7427,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7433,7 +7479,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7445,15 +7491,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7599,13 +7645,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7657,7 +7704,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7670,7 +7717,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7744,7 +7791,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7806,7 +7853,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7852,7 +7899,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7874,7 +7921,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7961,7 +8008,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8096,7 +8143,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8175,10 +8222,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8211,7 +8260,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8234,7 +8283,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8319,7 +8368,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8425,7 +8474,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8438,7 +8487,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8511,7 +8560,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8546,12 +8595,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8570,7 +8621,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8656,7 +8707,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8703,7 +8754,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8719,7 +8770,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8751,8 +8802,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8767,6 +8816,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8787,6 +8837,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8806,7 +8857,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8871,6 +8922,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8946,7 +8998,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8968,7 +9020,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8990,7 +9041,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9046,7 +9097,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9107,6 +9158,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9163,6 +9215,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9170,6 +9223,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9212,7 +9266,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9271,7 +9325,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9308,6 +9362,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9406,9 +9461,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9570,6 +9627,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9617,7 +9675,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9653,6 +9711,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9673,6 +9732,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9687,7 +9747,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9697,6 +9759,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9850,6 +9914,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9883,6 +9948,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9900,7 +9967,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9936,8 +10003,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10053,8 +10122,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10080,7 +10149,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10270,6 +10339,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10343,6 +10413,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index 6dcc8d00181..74e76419369 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:00+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -139,6 +139,7 @@ msgstr "Võrdle"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Viide"
 
@@ -157,13 +158,13 @@ msgstr ""
 "maksetähtaeg seda kustutamata."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Hoiatus!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -225,7 +226,7 @@ msgstr ""
 "KM."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Arve '%s' on makstud osaliselt: %s%s on tasutud %s%s (%s%s maksmata)"
@@ -241,7 +242,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Teie ei saa lisada/muuta suletud päeviku kirjeid."
@@ -287,7 +288,7 @@ msgid "St."
 msgstr "Tk."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -561,8 +562,10 @@ msgid "The accountant confirms the statement."
 msgstr "Raamatupidaja kinnitab selle avalduse"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -618,7 +621,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Pea"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -629,7 +632,7 @@ msgid "Tax Code Amount"
 msgstr "Maksukoodi summa"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -656,8 +659,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -734,6 +737,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -749,12 +753,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tüüp"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -880,12 +885,13 @@ msgid "Create 3 Months Periods"
 msgstr "Loo 3 kuupikkused perioodid"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Tähtaeg"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -963,7 +969,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -996,10 +1002,10 @@ msgid "Code"
 msgstr "Kood"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1061,7 +1067,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1109,7 +1115,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Pank"
@@ -1201,7 +1207,7 @@ msgid "The move of this entry line."
 msgstr "Selle rea liigutus."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1222,7 +1228,7 @@ msgid "Entry Label"
 msgstr "Kirje silt"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1307,14 +1313,15 @@ msgid "Taxes"
 msgstr "Maksud"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Vali algus ja lõpp periood"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1369,6 +1376,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Partnerid"
@@ -1393,8 +1401,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1619,6 +1629,7 @@ msgid "Separated Journal Sequences"
 msgstr "Eraldatud päeviku järjekorrad"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Vastutav"
@@ -1647,7 +1658,7 @@ msgid "Year Sum"
 msgstr "Aasta kokkuvõtte"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1720,7 +1731,7 @@ msgid "Customer Ref:"
 msgstr "Kliendi viide:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Kasutajal %s ei ole õigusi et siseneda %s arveraamatusse !"
@@ -2039,7 +2050,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2063,7 +2074,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2112,7 +2123,7 @@ msgid "Description"
 msgstr "Kirjeldus"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2131,7 +2142,7 @@ msgid "Income Account"
 msgstr "Tulude konto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2171,6 +2182,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2180,6 +2192,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2230,7 +2243,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2261,7 +2274,7 @@ msgid "Main Sequence"
 msgstr "Peajärjestus"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2335,7 +2348,7 @@ msgid "Account Tax Code"
 msgstr "Konto maksukood"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2416,7 +2429,7 @@ msgid "Account Model Entries"
 msgstr "Konto mudeli kirjed"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2475,7 +2488,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2507,7 +2519,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2627,6 +2639,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Aegunud partneri bilanss"
@@ -2674,14 +2687,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2784,7 +2797,7 @@ msgid "Base Code Amount"
 msgstr "Aluse koodi summa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2797,7 +2810,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2835,7 +2848,7 @@ msgid "Fiscal Position"
 msgstr "Finantspositsioon"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2982,7 +2995,7 @@ msgid "View"
 msgstr "Vaade"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3174,7 +3187,7 @@ msgid "Starting Balance"
 msgstr "Algbilanss"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Partner ei ole määratud !"
@@ -3228,7 +3241,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3309,6 +3322,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3355,7 +3369,7 @@ msgid "Detail"
 msgstr "Detail"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3370,9 +3384,16 @@ msgid "VAT :"
 msgstr "KM :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3393,7 +3414,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3418,6 +3439,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3445,10 +3467,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -3465,7 +3494,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3479,7 +3507,7 @@ msgid "Chart of Accounts Template"
 msgstr "Kontoplaani mall"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3488,7 +3516,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3519,6 +3547,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3600,7 +3630,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3631,7 +3661,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3645,6 +3675,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3658,7 +3689,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3978,7 +4009,7 @@ msgid "Month"
 msgstr "Kuu"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4035,7 +4066,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4242,7 +4273,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4276,7 +4307,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4288,6 +4319,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Muuda"
 
@@ -4332,7 +4364,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4348,7 +4380,7 @@ msgid "Keep empty to use the income account"
 msgstr "Hoia tühjana, et kasutada tulude kontot"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4376,7 +4408,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Klient"
@@ -4392,7 +4424,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4444,7 +4476,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4469,11 +4501,13 @@ msgstr "Uus majandusaasta"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Arved"
 
@@ -4610,26 +4644,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Viga"
@@ -4732,7 +4764,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4756,7 +4788,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4778,6 +4810,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4821,6 +4854,8 @@ msgstr "Perioodi tüüp"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Maksed"
 
@@ -4894,7 +4929,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Terviklikkuse viga !"
@@ -4927,6 +4962,7 @@ msgstr "Võrdluse tulemus"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5003,6 +5039,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5130,7 +5167,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5182,13 +5218,13 @@ msgid "End of Year Entries Journal"
 msgstr "Aastalõpu kirjete päevik"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5262,7 +5298,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5427,7 +5462,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5460,14 +5495,14 @@ msgid "Child Accounts"
 msgstr "Alamkontod"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Mahakandmine"
@@ -5487,7 +5522,7 @@ msgstr "Tulu"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Tarnija"
@@ -5517,7 +5552,7 @@ msgid "Account n°"
 msgstr "Konto nr."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5532,7 +5567,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Nõuete ja võlgade kontod"
@@ -5628,7 +5665,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5639,8 +5676,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Sa ei saa kasutada mitteaktiivset kontot!"
@@ -5681,8 +5718,8 @@ msgid "Number of Days"
 msgstr "Päevade arv"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5744,7 +5781,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5781,6 +5818,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Endine"
 
@@ -6054,6 +6093,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6063,7 +6104,7 @@ msgid "Power"
 msgstr "Aste"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6103,6 +6144,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6321,8 +6363,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6338,7 +6380,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6377,13 +6419,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Deebetsumma"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6451,25 +6493,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6501,8 +6544,8 @@ msgid "Printed"
 msgstr "Prinditud"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6557,7 +6600,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6708,7 +6751,7 @@ msgid "Total:"
 msgstr "Kokku:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6738,7 +6781,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6806,14 +6849,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6909,8 +6952,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Oled sa kindel, et soovid avada seda arvet?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6923,7 +6966,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7054,7 +7097,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7085,8 +7128,8 @@ msgid "Reporting"
 msgstr "Aruandlus"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7175,7 +7218,7 @@ msgid "Sign on Reports"
 msgstr "Märk aruannetes"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7186,7 +7229,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7221,13 +7264,14 @@ msgid "Optional Information"
 msgstr "Valikuline info"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Päevik peab sisaldama vaikimisi kreedit ja deebet kontosid"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7254,13 +7298,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Müügipäevik"
@@ -7277,7 +7321,7 @@ msgid "Invoice Tax"
 msgstr "Arve Maks"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7327,7 +7371,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7375,13 +7419,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Võlgade kontod"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7425,7 +7471,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Kassa"
@@ -7437,15 +7483,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7594,13 +7640,14 @@ msgstr "Fikseeritud"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Ettevaatust !"
@@ -7652,7 +7699,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7665,7 +7712,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7739,7 +7786,7 @@ msgid "Deferral Method"
 msgstr "Edasilükkamise meetod"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7801,7 +7848,7 @@ msgid "Associated Partner"
 msgstr "Seotud partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Sa pead esmalt valima partneri !"
@@ -7847,7 +7894,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7869,7 +7916,7 @@ msgid "Choose Fiscal Year"
 msgstr "Vali majandusaasta"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7956,7 +8003,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Arvuta kood maksuga hindadele"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8084,7 +8131,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8163,10 +8210,12 @@ msgstr "Hüvitiste päevik"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8199,7 +8248,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8222,7 +8271,7 @@ msgid "Payment Term Line"
 msgstr "Maksetingimuste Rida"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Ostupäevik"
@@ -8307,7 +8356,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8413,7 +8462,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8426,7 +8475,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8499,7 +8548,7 @@ msgid "Contact Address"
 msgstr "Kontaktaadress"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8534,12 +8583,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8558,7 +8609,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8644,7 +8695,7 @@ msgid "Period from"
 msgstr "Periood alates"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8691,7 +8742,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8707,7 +8758,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8739,8 +8790,6 @@ msgstr "Perioodi lõpp"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8755,6 +8804,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8775,6 +8825,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Analüüsi suund"
 
@@ -8794,7 +8845,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Krediitsumma"
@@ -8859,6 +8910,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8934,7 +8986,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8956,7 +9008,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8978,7 +9029,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9034,7 +9085,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9095,6 +9146,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9151,6 +9203,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9158,6 +9211,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9200,7 +9254,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9259,7 +9313,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9296,6 +9350,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9394,9 +9449,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Perioodid"
 
@@ -9558,6 +9615,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9605,7 +9663,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9641,6 +9699,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9661,6 +9720,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9675,7 +9735,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9685,6 +9747,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9838,6 +9902,7 @@ msgstr "Tarnija arve"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9871,6 +9936,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9888,7 +9955,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9924,8 +9991,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Liikumistega"
@@ -10041,8 +10110,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10068,7 +10137,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10258,6 +10327,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10331,6 +10401,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po
index 02a2f81d73a..349e9dcfbfa 100644
--- a/addons/account/i18n/eu.po
+++ b/addons/account/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr ""
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr "Kontularitza Zerga Kodea"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr "Emaitzen adiskidetza"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po
index 674cd5034a8..56ac1f6fc48 100644
--- a/addons/account/i18n/fa.po
+++ b/addons/account/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:03+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "مرجع‌"
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr "ثابت"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "هشدار!"
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/fa_AF.po b/addons/account/i18n/fa_AF.po
index 3bc3db4cd87..d24dfff8dcb 100644
--- a/addons/account/i18n/fa_AF.po
+++ b/addons/account/i18n/fa_AF.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr ""
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po
index e9a1633c35c..de5b6ef3b4e 100644
--- a/addons/account/i18n/fi.po
+++ b/addons/account/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:01+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -143,6 +143,7 @@ msgstr "Suoritus"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Viite"
 
@@ -161,13 +162,13 @@ msgstr ""
 "poistamatta sitä."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Varoitus!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -230,7 +231,7 @@ msgid ""
 msgstr "Valitse tämä jos et halua ALV:tä liitettävän verokoodeihin laskuilla"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Lasku '%s' on osittain maksettu: %s%s määrästä %s%s (%s%s jäljellä)"
@@ -246,7 +247,7 @@ msgid "Belgian Reports"
 msgstr "Belgialaiset raportit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Et voi muokata merkintöjä suljetussa päiväkirjassa."
@@ -292,7 +293,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Laskurivin tilin yritys ei täsmää laskun yritykseen"
@@ -568,8 +569,10 @@ msgid "The accountant confirms the statement."
 msgstr "Kirjanpitäjä vahvistaa tiliotteen."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -627,7 +630,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Pääjärjestyksen tulee olla eri nykyiseen nähden!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -638,7 +641,7 @@ msgid "Tax Code Amount"
 msgstr "Verokoodin määrä"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -665,8 +668,8 @@ msgid "Journal Period"
 msgstr "Päiväkirjan jakso"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -744,6 +747,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Voit vaihtaa valuutan vain luonnostilassa olevalle laskulle"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Talousraportti"
@@ -759,12 +763,13 @@ msgstr "Talousraportti"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tyyppi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -892,12 +897,13 @@ msgid "Create 3 Months Periods"
 msgstr "Luo 3 kuukauden jakso"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "kuluessa"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -975,7 +981,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1008,10 +1014,10 @@ msgid "Code"
 msgstr "Koodi"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1073,7 +1079,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1121,7 +1127,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Pankki"
@@ -1213,7 +1219,7 @@ msgid "The move of this entry line."
 msgstr "Merkinnän rivin siirto."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1234,7 +1240,7 @@ msgid "Entry Label"
 msgstr "Merkinnän nimike"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1320,14 +1326,15 @@ msgid "Taxes"
 msgstr "Verot"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Valitse alku ja loppujakso"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Tuotto ja menetys"
 
@@ -1382,6 +1389,7 @@ msgid "Journal Items Analysis"
 msgstr "päiväkirjamerkintöjen analyysi"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Kumppanit"
@@ -1406,8 +1414,10 @@ msgid "Central Journal"
 msgstr "Keskitetty päiväkirja"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1632,6 +1642,7 @@ msgid "Separated Journal Sequences"
 msgstr "Erotellut päiväkirjan sarjat"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Vastuuhenkilö"
@@ -1662,7 +1673,7 @@ msgid "Year Sum"
 msgstr "Vuoden summa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1735,7 +1746,7 @@ msgid "Customer Ref:"
 msgstr "Asiakkaan Viite:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Käyttäjällä %s ei ole oikeuksia päiväkirjaan %s !"
@@ -2062,7 +2073,7 @@ msgid "Pro-forma"
 msgstr "Proforma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2086,7 +2097,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2135,7 +2146,7 @@ msgid "Description"
 msgstr "Kuvaus"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2154,7 +2165,7 @@ msgid "Income Account"
 msgstr "Tulotili"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2194,6 +2205,7 @@ msgstr "Tuotteen malli"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2203,6 +2215,7 @@ msgstr "Tuotteen malli"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2253,7 +2266,7 @@ msgid "Account Line"
 msgstr "Tilin rivi"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2284,7 +2297,7 @@ msgid "Main Sequence"
 msgstr "Pääjakso"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2358,7 +2371,7 @@ msgid "Account Tax Code"
 msgstr "Tilin verokoodi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2439,7 +2452,7 @@ msgid "Account Model Entries"
 msgstr "Tilimallin merkinnät"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2502,7 +2515,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2534,7 +2546,7 @@ msgid "Accounts"
 msgstr "Tilit"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfiguraatio virhe!"
@@ -2654,6 +2666,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Tase kumppanien erääntyvistä"
@@ -2701,14 +2714,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Velho luo toistuvat kirjanpitoviennit"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2811,7 +2824,7 @@ msgid "Base Code Amount"
 msgstr "Peruskoodin määrä"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2824,7 +2837,7 @@ msgid "Default Sale Tax"
 msgstr "Oletus myyntivero"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2862,7 +2875,7 @@ msgid "Fiscal Position"
 msgstr "Talouskanta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3016,7 +3029,7 @@ msgid "View"
 msgstr "Näkymä"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3210,7 +3223,7 @@ msgid "Starting Balance"
 msgstr "Aloitus balanssi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Ei kumppania määriteltynä!"
@@ -3264,7 +3277,7 @@ msgid "Chart of Tax"
 msgstr "Verotaulukko"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3345,6 +3358,7 @@ msgstr "Määrä :"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Jakson pituus (päivää)"
 
@@ -3391,7 +3405,7 @@ msgid "Detail"
 msgstr "Yksityiskohdat"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3406,9 +3420,16 @@ msgid "VAT :"
 msgstr "ALV:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3429,7 +3450,7 @@ msgid "Centralised counterpart"
 msgstr "Keskitetty vastine"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3454,6 +3475,7 @@ msgstr "(Jos et valitse tilikautta, käytetään kaikkia avoimia tilikausia)"
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3481,10 +3503,17 @@ msgstr "(Jos et valitse tilikautta, käytetään kaikkia avoimia tilikausia)"
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Päiväys"
 
@@ -3501,7 +3530,6 @@ msgstr "Poista suoritukset"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3515,7 +3543,7 @@ msgid "Chart of Accounts Template"
 msgstr "Tilikarttamalli"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3524,7 +3552,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Joillakin merkinnöillä on jo maksusuoritus!"
@@ -3555,6 +3583,8 @@ msgstr "Budjetit"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Ei suotimia"
 
@@ -3638,7 +3668,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Veroa ei voida muuttaa!"
@@ -3669,7 +3699,7 @@ msgid "Mapping"
 msgstr "Mäppäys"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3683,6 +3713,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3696,7 +3727,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4016,7 +4047,7 @@ msgid "Month"
 msgstr "Kuukausi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4073,7 +4104,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Tälle tuotteelle ei ole määritetty kulutiliä: \"%s\" (id:%d)"
@@ -4280,7 +4311,7 @@ msgid "Allow Reconciliation"
 msgstr "Salli suoritusmerkinnät"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4314,7 +4345,7 @@ msgid "Recurring Models"
 msgstr "Toistuvat mallit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4326,6 +4357,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Muuta"
 
@@ -4370,7 +4402,7 @@ msgid "Example"
 msgstr "Esim."
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4386,7 +4418,7 @@ msgid "Keep empty to use the income account"
 msgstr "Jätä tyhjäksi käyttääksesi tulotiliä"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4414,7 +4446,7 @@ msgstr "Tilikartoitus"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Asiakas"
@@ -4430,7 +4462,7 @@ msgid "Cancelled Invoice"
 msgstr "Peruutettu lasku"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4482,7 +4514,7 @@ msgid "Income Account on Product Template"
 msgstr "Tili tuloille tuotteen mallissa"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4507,11 +4539,13 @@ msgstr "Uusi tilikausi"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Laskut"
 
@@ -4648,26 +4682,24 @@ msgid "Journal Items"
 msgstr "Päiväkirjan tapahtumat"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Virhe"
@@ -4770,7 +4802,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4797,7 +4829,7 @@ msgid "Child Tax Accounts"
 msgstr "Alemmat verotilit"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Alkuperiodin tulee olla aikaisempi kuin loppuperiodin"
@@ -4818,6 +4850,7 @@ msgstr "Analyyttinen saldo -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4861,6 +4894,8 @@ msgstr "Kauden tyyppi"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Maksut"
 
@@ -4934,7 +4969,7 @@ msgid "Line 1:"
 msgstr "Rivi 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Eheysvirhe!"
@@ -4967,6 +5002,7 @@ msgstr "Suoritusajon tulos"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Tilinpäätös"
@@ -5043,6 +5079,7 @@ msgstr "Ilmoita"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5173,7 +5210,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Viestintä"
 
@@ -5225,13 +5261,13 @@ msgid "End of Year Entries Journal"
 msgstr "Päätösmerkintöjen päiväkirja"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5305,7 +5341,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5471,7 +5506,7 @@ msgid "Generate Opening Entries"
 msgstr "Luo avausviennit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "On jo täsmäytetty!"
@@ -5504,14 +5539,14 @@ msgid "Child Accounts"
 msgstr "Alemmat tilit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Arvonalennus"
@@ -5531,7 +5566,7 @@ msgstr "Tulo"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Toimittaja"
@@ -5561,7 +5596,7 @@ msgid "Account n°"
 msgstr "Tilinro."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Avoin viite"
@@ -5576,7 +5611,9 @@ msgstr "Arvostus"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Saatavat ja maksettavat tilit"
@@ -5672,7 +5709,7 @@ msgid "Filter by"
 msgstr "Suodata"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5683,8 +5720,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Et voi käyttää käytöstä poistettua tiliä!"
@@ -5725,8 +5762,8 @@ msgid "Number of Days"
 msgstr "Päivien lukumäärä"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5788,7 +5825,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "ei toteutettu"
@@ -5825,6 +5862,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Mennyt"
 
@@ -6098,6 +6137,8 @@ msgstr "Prosenttiosuus"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Päiväkirja & kumppani"
 
@@ -6107,7 +6148,7 @@ msgid "Power"
 msgstr "Voima"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6147,6 +6188,7 @@ msgid "Applicable Type"
 msgstr "Sovellettava tyyppi"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Laskuviite"
@@ -6368,8 +6410,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Merkinnät: "
@@ -6385,7 +6427,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Ei voida luoda siirtoa eri yritysten välille"
@@ -6424,13 +6466,13 @@ msgstr "Tila on luonnos"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Kokonais debet"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Merkintä \"%s\" ei ole kelvollinen!"
@@ -6500,25 +6542,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6550,8 +6593,8 @@ msgid "Printed"
 msgstr "Tulostettu"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6606,7 +6649,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6759,7 +6802,7 @@ msgid "Total:"
 msgstr "Yhteensä:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6789,7 +6832,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6857,14 +6900,14 @@ msgid "Source Document"
 msgstr "Lähdedokumentti"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6960,8 +7003,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Haluatko varmasti avata tämän laskun?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6974,7 +7017,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Kirjanpidon merkinnät"
@@ -7110,7 +7153,7 @@ msgstr ""
 "kehittäjien luoda tiettyjä veroja muokatulla toimialueella."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7141,8 +7184,8 @@ msgid "Reporting"
 msgstr "Raportointi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7231,7 +7274,7 @@ msgid "Sign on Reports"
 msgstr "Etumerkki raporteissa"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7242,7 +7285,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7277,13 +7320,14 @@ msgid "Optional Information"
 msgstr "Lisätiedot"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Päiväkirjassa täyttyy olla oletus kredit- ja debet-tilit."
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7310,13 +7354,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Virheellinen tili!"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Myyntipäiväkirja"
@@ -7333,7 +7377,7 @@ msgid "Invoice Tax"
 msgstr "Laskuta vero"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Ei osan numeroa!"
@@ -7383,7 +7427,7 @@ msgstr "päättyen"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7431,13 +7475,15 @@ msgstr "Toukokuu"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Maksettavat tilit"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7481,7 +7527,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Käteinen"
@@ -7493,15 +7539,15 @@ msgid "Account Destination"
 msgstr "Kirjanpidon kohde"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7653,13 +7699,14 @@ msgstr "Kiinteä"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Varoitus!"
@@ -7711,7 +7758,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Valitse laskun valuutta"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7724,7 +7771,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Ei voi %s vedos/proforma/peruuttaa laskua"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Ei laskurivejä !"
@@ -7798,7 +7845,7 @@ msgid "Deferral Method"
 msgstr "Jaksotusmenetelmä"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Lasku '%s' on maksettu."
@@ -7862,7 +7909,7 @@ msgid "Associated Partner"
 msgstr "Yhteistyökumppani"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Sinun täytyy ensiksi valita yhteistyökumppani!"
@@ -7908,7 +7955,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7930,7 +7977,7 @@ msgid "Choose Fiscal Year"
 msgstr "Valitse tilikausi"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -8019,7 +8066,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Laske koodi hinnoille joissa on vero mukana"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8147,7 +8194,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8226,10 +8273,12 @@ msgstr "Hyvityspäiväkirja"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Suodata käyttäen"
 
@@ -8262,7 +8311,7 @@ msgid "The partner account used for this invoice."
 msgstr "Kumppanitiliä käytetään tälle laskulle."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8285,7 +8334,7 @@ msgid "Payment Term Line"
 msgstr "Maksuehtorivi"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Ostopäiväkirja"
@@ -8370,7 +8419,7 @@ msgid "Unpaid Invoices"
 msgstr "Maksamattomat laskut"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8476,7 +8525,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Jätä tyhjäksi niin käytetään kaikkia avoimia kirjanpitovuosia"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8491,7 +8540,7 @@ msgstr ""
 "monivaluuttainen merkintä."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8564,7 +8613,7 @@ msgid "Contact Address"
 msgstr "Yhteysosoite"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8599,12 +8648,14 @@ msgstr "Sopimukset"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "Tuntematon"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Avauspäiväkirja"
@@ -8623,7 +8674,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8710,7 +8761,7 @@ msgid "Period from"
 msgstr "Ajanjakso alkaen"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8757,7 +8808,7 @@ msgid "Purchase Tax(%)"
 msgstr "Oston vero (%9"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Ole hyvä ja luo laskurivejä"
@@ -8773,7 +8824,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8805,8 +8856,6 @@ msgstr "Jakson päätös"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8821,6 +8870,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8841,6 +8891,7 @@ msgstr "Aloita jakso"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Analyysiohjaus"
 
@@ -8860,7 +8911,7 @@ msgstr "Päiväkirjanäkymä"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Kokonaisluotto"
@@ -8925,6 +8976,7 @@ msgstr "Pankin tiliotteet"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9000,7 +9052,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Valitse tilit suorituksille"
@@ -9022,7 +9074,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Suotimet"
@@ -9044,7 +9095,7 @@ msgid "Move"
 msgstr "Siirto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9103,7 +9154,7 @@ msgid "Consolidated Children"
 msgstr "Yhdistetyt alatilit"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9164,6 +9215,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9220,6 +9272,7 @@ msgstr "Ennakkomaksun merkintä"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9227,6 +9280,7 @@ msgstr "Ennakkomaksun merkintä"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9269,7 +9323,7 @@ msgid "Unreconciled"
 msgstr "Suorittamaton"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Epäkelpo loppusumma!"
@@ -9328,7 +9382,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
@@ -9366,6 +9420,7 @@ msgstr "Vahvista tilisiirto"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9464,9 +9519,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Jaksot"
 
@@ -9628,6 +9685,7 @@ msgstr "Postitettu"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9675,7 +9733,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Tulotiliä ei ole määritelty tälle tuotteelle: \"%s\" (id:%d)"
@@ -9711,6 +9769,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9731,6 +9790,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9745,7 +9805,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9755,6 +9817,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9908,6 +9972,7 @@ msgstr "Toimittajan lasku"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9941,6 +10006,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9958,7 +10025,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Merkintä on jo suoritettu"
@@ -9994,8 +10061,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Siirtojen kanssa"
@@ -10111,8 +10180,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Virheellinen tili!"
@@ -10138,7 +10207,7 @@ msgid "Accounts Mapping"
 msgstr "Tilien kartoitus"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10328,6 +10397,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10401,6 +10471,8 @@ msgstr "Erääntyneet"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Tulevat"
 
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index ab44d01d9d1..5a013ceacb9 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,24 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-20 16:18+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-10-30 15:48+0000\n"
+"Last-Translator: Frederic Clementi - Camptocamp.com "
+"<frederic.clementi@camptocamp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:03+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
 "Vous ne pouvez pas ajouter/modifier des écritures dans un journal cloturé."
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Certaines écritures sont déjà lettrées !"
@@ -151,7 +152,7 @@ msgstr "Définition des enfants"
 #: code:addons/account/account_bank_statement.py:302
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr "Écriture \"%s\" n'est pas équilibrée"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -213,6 +214,7 @@ msgstr "Lettrer"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Référence"
 
@@ -231,13 +233,13 @@ msgstr ""
 "règlement sans les supprimer."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Attention !"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Journal des opérations diverses"
@@ -302,7 +304,7 @@ msgstr ""
 "n'apparaisse sur les factures"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -363,7 +365,7 @@ msgid "St."
 msgstr "Ext."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -662,8 +664,10 @@ msgid "The accountant confirms the statement."
 msgstr "Le comptable confirme le relevé."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -722,7 +726,7 @@ msgstr ""
 "La séquence principale doit être différente de la séquence courante !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -734,7 +738,7 @@ msgid "Tax Code Amount"
 msgstr "Montant de la taxe"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -761,8 +765,8 @@ msgid "Journal Period"
 msgstr "Période de journal"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -843,6 +847,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Vous ne pouvez changer la devise que pour les factures brouillon !"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Rapport financier"
@@ -858,12 +863,13 @@ msgstr "Rapport financier"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Type"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -999,12 +1005,13 @@ msgid "Create 3 Months Periods"
 msgstr "Créer des périodes trimestrielles"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Due"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1089,7 +1096,7 @@ msgstr ""
 "alors ce champ contient le montant de base (hors taxe)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "Impossible de trouver un code parent pour le modèle de compte !"
@@ -1122,10 +1129,10 @@ msgid "Code"
 msgstr "Code"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1191,7 +1198,7 @@ msgstr ""
 "spécificités des comptes."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1240,7 +1247,7 @@ msgstr "Écritures déséquilibrées"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banque"
@@ -1341,7 +1348,7 @@ msgid "The move of this entry line."
 msgstr "Le mouvement de cette ligne d'écriture"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1364,7 +1371,7 @@ msgid "Entry Label"
 msgstr "Libellé de la pièce comptable"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1450,14 +1457,15 @@ msgid "Taxes"
 msgstr "Taxes"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Sélectionnez un début et une fin de période"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Pertes et profits"
 
@@ -1512,6 +1520,7 @@ msgid "Journal Items Analysis"
 msgstr "Analyse des écritures comptables"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Partenaires"
@@ -1536,8 +1545,10 @@ msgid "Central Journal"
 msgstr "Journal centralisé"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1598,10 +1609,9 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
-"Une pièce comptable est composée de plusieurs écritures comptables, chacune "
-"étant soit un débit soit un crédit. OpenERP crée automatiquement une pièce "
-"comptable par document comptable : facture, avoir, paiement de fournisseur, "
-"relevés bancaires, etc."
+"Un écriture est composée de plusieurs lignes, chacune étant soit un débit "
+"soit un crédit. OpenERP crée automatiquement une écriture par document "
+"comptable : facture, avoir, paiement de fournisseur, relevés bancaires, etc."
 
 #. module: account
 #: view:account.entries.report:0
@@ -1693,7 +1703,7 @@ msgstr "Recherche d'un relevé bancaire"
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr "Pièces non comptabiliisées"
+msgstr "Ecritures brouillon"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1774,6 +1784,7 @@ msgid "Separated Journal Sequences"
 msgstr "Séquences de journaux séparées"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Responsable"
@@ -1804,7 +1815,7 @@ msgid "Year Sum"
 msgstr "Total de l'exercice"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1881,7 +1892,7 @@ msgid "Customer Ref:"
 msgstr "Référence Client:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "L'utilisateur %s n'a pas le droit d'accéder au journal %s !"
@@ -2216,7 +2227,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2247,7 +2258,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Chercher un modèle de plan comptable"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2304,7 +2315,7 @@ msgid "Description"
 msgstr "Description"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2323,7 +2334,7 @@ msgid "Income Account"
 msgstr "Compte de revenus"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Aucun journal de type ventes/achats n'a été défini !"
@@ -2363,6 +2374,7 @@ msgstr "Modèle de produit"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2372,6 +2384,7 @@ msgstr "Modèle de produit"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2422,7 +2435,7 @@ msgid "Account Line"
 msgstr "Ligne du compte"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2459,14 +2472,12 @@ msgid "Main Sequence"
 msgstr "Séquence principale"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
 msgstr ""
-"Pour supprimer un relevé bancaire vous devez préalablement supprimer les "
-"lignes rapprochées."
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2535,7 +2546,7 @@ msgid "Account Tax Code"
 msgstr "Code du compte taxe"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2628,7 +2639,7 @@ msgid "Account Model Entries"
 msgstr "Modèle d'écriture comptable"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2695,7 +2706,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "Ligne d'écriture lettrée (écriture d'écart)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2727,7 +2737,7 @@ msgid "Accounts"
 msgstr "Comptes"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Erreur de paramétrage !"
@@ -2853,6 +2863,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Balance agée des tiers"
@@ -2905,14 +2916,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Cet assistant va générer les écritures comptables récurrentes"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Aucune séquence n'a été définie pour ce journal !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -3022,7 +3033,7 @@ msgid "Base Code Amount"
 msgstr "Montant Hors Taxe"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -3037,7 +3048,7 @@ msgid "Default Sale Tax"
 msgstr "Taxe de vente par défaut"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "La facture '%s' est validée."
@@ -3078,7 +3089,7 @@ msgid "Fiscal Position"
 msgstr "Position fiscale"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3235,7 +3246,7 @@ msgid "View"
 msgstr "Vue"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3440,7 +3451,7 @@ msgid "Starting Balance"
 msgstr "Solde initial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Pas de partenaire défini !"
@@ -3496,7 +3507,7 @@ msgid "Chart of Tax"
 msgstr "Plan de taxes"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "Le solde final doit être égal au solde calculé!"
@@ -3582,6 +3593,7 @@ msgstr "Quantité :"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Durée de la période (jours)"
 
@@ -3615,7 +3627,7 @@ msgstr "État des ventes par type de compte"
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr "Ecritures non lettrées"
+msgstr "Ecritures non léttrées"
 
 #. module: account
 #: sql_constraint:res.currency:0
@@ -3628,7 +3640,7 @@ msgid "Detail"
 msgstr "Détail"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3648,9 +3660,16 @@ msgid "VAT :"
 msgstr "TVA"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3673,7 +3692,7 @@ msgid "Centralised counterpart"
 msgstr "Centralisation"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3701,6 +3720,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3728,10 +3748,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Date"
 
@@ -3748,7 +3775,6 @@ msgstr "Annuler le rapprochement"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3762,7 +3788,7 @@ msgid "Chart of Accounts Template"
 msgstr "Modèle de plan comptable"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3799,6 +3825,8 @@ msgstr "Budgets"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Aucun filtre"
 
@@ -3870,7 +3898,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
 msgid "Account balance"
-msgstr "Balance des comptes"
+msgstr "Balance générale"
 
 #. module: account
 #: report:account.invoice:0
@@ -3884,7 +3912,7 @@ msgid "Analytic Items"
 msgstr "Écritures analytiques"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Impossible de changer la taxe !"
@@ -3915,7 +3943,7 @@ msgid "Mapping"
 msgstr "Correspondance"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3931,6 +3959,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3941,10 +3970,10 @@ msgstr "Nom"
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr "Rapport du solde de la balance agée"
+msgstr "Balance agée"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "Vous ne pouvez pas saisir d'écritures dans un compte clôturé %s %s"
@@ -4150,7 +4179,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr "Ecritures saisies"
+msgstr "Ecritures validées"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4213,7 +4242,7 @@ msgstr "Titulaire du compte bancaire"
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr "Balance des comptes"
+msgstr "Balance générale"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -4283,7 +4312,7 @@ msgid "Month"
 msgstr "Mois"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4343,7 +4372,7 @@ msgid "Account Base Code"
 msgstr "Code de base de compte"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4555,7 +4584,7 @@ msgid "Allow Reconciliation"
 msgstr "Autoriser le lettrage"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4591,7 +4620,7 @@ msgid "Recurring Models"
 msgstr "Modèles récurrents"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Erreur d'encodage"
@@ -4603,6 +4632,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Change"
 
@@ -4627,7 +4657,7 @@ msgstr "Sert de compte par défaut pour le crédit"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr "Comptabiliser les pièces comptables dans le journal"
+msgstr "Valider les écritures"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4647,7 +4677,7 @@ msgid "Example"
 msgstr "Exemple"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4663,7 +4693,7 @@ msgid "Keep empty to use the income account"
 msgstr "Laisser vide pour utiliser le compte de revenu"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Taxe sur les achats %.2f%%"
@@ -4691,7 +4721,7 @@ msgstr "Affectation des comptes"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Client"
@@ -4707,7 +4737,7 @@ msgid "Cancelled Invoice"
 msgstr "Facture annulée"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4764,7 +4794,7 @@ msgid "Income Account on Product Template"
 msgstr "Modèle d'imputation des charges"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "OD"
@@ -4791,11 +4821,13 @@ msgstr "Nouvel exercice comptable"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Factures"
 
@@ -4893,7 +4925,7 @@ msgstr ""
 #: code:addons/account/account.py:923
 #, python-format
 msgid "Opening Period"
-msgstr "Période ouverte"
+msgstr "Période d'ouverture"
 
 #. module: account
 #: view:account.move:0
@@ -4937,26 +4969,24 @@ msgid "Journal Items"
 msgstr "Écritures comptables"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Erreur"
@@ -5067,7 +5097,7 @@ msgid "Beginning of Period Date"
 msgstr "Date de début de période"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -5094,7 +5124,7 @@ msgid "Child Tax Accounts"
 msgstr "Comptes de taxe enfant"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "La période de début doit précéder la période de fin"
@@ -5117,6 +5147,7 @@ msgstr "Balance Analytique -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5160,6 +5191,8 @@ msgstr "Type de période"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Règlements"
 
@@ -5237,7 +5270,7 @@ msgid "Line 1:"
 msgstr "Ligne 1 :"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Erreur d'Intégrité !"
@@ -5270,6 +5303,7 @@ msgstr "Résultat du lettrage"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Bilan"
@@ -5346,6 +5380,7 @@ msgstr "Rapport"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5476,7 +5511,6 @@ msgstr "Rapports de comptabilité courants"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Communication"
 
@@ -5530,13 +5564,13 @@ msgid "End of Year Entries Journal"
 msgstr "Journal des opérations de fin d'année"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5575,7 +5609,7 @@ msgstr "Quantité de produits"
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr "Non comptabilisé"
+msgstr "Non validée"
 
 #. module: account
 #: view:account.change.currency:0
@@ -5613,7 +5647,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Factures et avoirs clients"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5788,10 +5821,10 @@ msgstr "Journal d'écriture"
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Opening Entries"
-msgstr "Générer les écritures d'ouverture"
+msgstr "Générer l'écriture d'ouverture"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Déjà lettrée !"
@@ -5824,14 +5857,14 @@ msgid "Child Accounts"
 msgstr "Comptes fils"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Nom du mouvement (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Ajustement"
@@ -5851,7 +5884,7 @@ msgstr "Produits"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Fournisseur"
@@ -5881,7 +5914,7 @@ msgid "Account n°"
 msgstr "Compte n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Référence libre"
@@ -5896,7 +5929,9 @@ msgstr "Valorisation"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Comptes de tiers"
@@ -6006,7 +6041,7 @@ msgid "Filter by"
 msgstr "Filtrer par"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Vous avez une expression incorrecte \"%(...)s\" dans votre modèle !"
@@ -6017,8 +6052,8 @@ msgid "Entry Date"
 msgstr "Date de saisie"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Vous ne pouvez pas utiliser un compte inactif!"
@@ -6059,8 +6094,8 @@ msgid "Number of Days"
 msgstr "Nombre de jours"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -6122,7 +6157,7 @@ msgid "Multipication factor for Base code"
 msgstr "Facteur de multiplication du code de base"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "non implémenté"
@@ -6161,6 +6196,8 @@ msgstr "Analyse des écritures analytiques"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Passée"
 
@@ -6451,6 +6488,8 @@ msgstr "Pourcentage"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Journal et partenaire"
 
@@ -6460,7 +6499,7 @@ msgid "Power"
 msgstr "Puissance"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Impossible de générer un code de journal inutilisé."
@@ -6502,6 +6541,7 @@ msgid "Applicable Type"
 msgstr "Applicable ?"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Référence de la facture"
@@ -6735,8 +6775,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "Vous ne pouvez pas supprimer un compte qui contient des écritures."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Écritures : "
@@ -6752,7 +6792,7 @@ msgid "Currency of the related account journal."
 msgstr "Devise du journal lié."
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Impossible de créer des mouvements entre différentes sociétés"
@@ -6801,13 +6841,13 @@ msgstr "À l'état \"Brouillon\""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Total débit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "L'écriture \"%s\" n'est pas valide !"
@@ -6879,25 +6919,26 @@ msgstr "Produits & charges (Comptes de gestion)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6929,8 +6970,8 @@ msgid "Printed"
 msgstr "Imprimé"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Erreur :"
@@ -6993,7 +7034,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Afficher le grand livre avec un partenaire par page"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -7074,7 +7115,7 @@ msgstr "Sélection du journal"
 #: code:addons/account/account.py:432
 #, python-format
 msgid "Opening Balance"
-msgstr "Solde initial"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
@@ -7161,7 +7202,7 @@ msgid "Total:"
 msgstr "Total :"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7198,7 +7239,7 @@ msgid "Taxes used in Sales"
 msgstr "Taxes sur les ventes"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7278,14 +7319,14 @@ msgid "Source Document"
 msgstr "Document d'origine"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "Vous ne pouvez pas supprimer une pièce comptabilisée \"%s\"!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7396,8 +7437,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Confirmez-vous l'ouverture de cette facture ?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7412,7 +7453,7 @@ msgid "Opening Entries Expense Account"
 msgstr "Compte de charge pour les écritures d'ouverture"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Écritures comptables"
@@ -7552,7 +7593,7 @@ msgstr ""
 "domaine spécifique."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Vous devriez choisir des périodes appartenant à la même société"
@@ -7583,8 +7624,8 @@ msgid "Reporting"
 msgstr "Rapports"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7681,11 +7722,10 @@ msgid "Sign on Reports"
 msgstr "Signes sur les Rapports"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
-msgstr ""
-"Les périodes pour générer les écritures d'ouverture n'ont pas été trouvées."
+msgstr "Aucune période d'ouverture trouvée"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
@@ -7693,7 +7733,7 @@ msgid "Root/View"
 msgstr "Racine/vue"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "AN"
@@ -7728,13 +7768,14 @@ msgid "Optional Information"
 msgstr "Information optionnelle"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Le journal doit posséder un compte de crédit et débit par défaut"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7763,13 +7804,13 @@ msgid "Maturity Date"
 msgstr "Date d'échéance"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Compte incorrect !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Journal des ventes"
@@ -7778,7 +7819,7 @@ msgstr "Journal des ventes"
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr "Écritures ouvertes !"
+msgstr ""
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -7786,7 +7827,7 @@ msgid "Invoice Tax"
 msgstr "Taxe"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Pas de numéro de pièce !"
@@ -7815,7 +7856,7 @@ msgstr ""
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr "Pièces non comptabilisées"
+msgstr "Ecritures non validées"
 
 #. module: account
 #: view:product.product:0
@@ -7841,7 +7882,7 @@ msgstr "au"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Écarts de change"
@@ -7895,13 +7936,15 @@ msgstr "Mai"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Comptes fournisseurs"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7930,7 +7973,7 @@ msgstr "Code de la case"
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr "Comptabiliser les pièces comptables d'un journal"
+msgstr "Valider les écritures"
 
 #. module: account
 #: view:product.product:0
@@ -7948,7 +7991,7 @@ msgstr "Nom du rapport"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Liquidités"
@@ -7960,15 +8003,15 @@ msgid "Account Destination"
 msgstr "Compte de destination"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -8115,7 +8158,7 @@ msgstr "Ligne de caisse"
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 #: model:ir.ui.menu,name:account.menu_account_partner_ledger
 msgid "Partner Ledger"
-msgstr "Grand Livre"
+msgstr "Livre des tiers"
 
 #. module: account
 #: selection:account.tax.template,type:0
@@ -8128,13 +8171,14 @@ msgstr "Fixe"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Avertissement !"
@@ -8186,7 +8230,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Choisissez une devise à appliquer à la facture"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -8199,7 +8243,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Impossible de %s une facture brouillon/proforma/annulée."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Aucune ligne de facture !"
@@ -8284,7 +8328,7 @@ msgid "Deferral Method"
 msgstr "Méthode de report à nouveau"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "La facture \"%s\" est réglée"
@@ -8312,7 +8356,7 @@ msgstr ""
 #: help:account.account,reconcile:0
 msgid ""
 "Check this box if this account allows reconciliation of journal items."
-msgstr "Cochez si le compte autorise le lettrage des pièces."
+msgstr "Cochez si le compte autorise le lettrage des écritures."
 
 #. module: account
 #: help:account.period,state:0
@@ -8350,7 +8394,7 @@ msgid "Associated Partner"
 msgstr "Partenaire Associé"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Vous devez d'abord sélectionner un partenaire !"
@@ -8409,7 +8453,7 @@ msgstr ""
 "formulaire de déclaration fiscal de votre pays."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8433,7 +8477,7 @@ msgid "Choose Fiscal Year"
 msgstr "Choisissez l'exercice comptable"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Journal des avoirs d'achats"
@@ -8526,7 +8570,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Code de calcul pour les taxes comprises"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8669,7 +8713,7 @@ msgid "current month"
 msgstr "Mois en cours"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8756,10 +8800,12 @@ msgstr "Journal d'avoirs"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtré par"
 
@@ -8799,7 +8845,7 @@ msgid "The partner account used for this invoice."
 msgstr "Le compte partenaire utilisé pour cette facture"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Taxe %.2f%%"
@@ -8822,7 +8868,7 @@ msgid "Payment Term Line"
 msgstr "Détail des conditions de règlement"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Journal des achats"
@@ -8909,7 +8955,7 @@ msgid "Unpaid Invoices"
 msgstr "Factures impayées"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -9020,7 +9066,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Conserver vide pour tous les exercices comptables ouverts"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "L'écriture (%s) de centralisation a été confirmé !"
@@ -9035,7 +9081,7 @@ msgstr ""
 "multi devise."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -9120,7 +9166,7 @@ msgid "Contact Address"
 msgstr "Adresse du contact"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Modèle non cohérent !"
@@ -9161,15 +9207,17 @@ msgstr "Contrats"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "inconnu"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
-msgstr "Journal des écritures d'ouverture"
+msgstr "Journal d'ouverture"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
@@ -9189,7 +9237,7 @@ msgstr ""
 "Pertes"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -9281,7 +9329,7 @@ msgid "Period from"
 msgstr "Période du"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Journal des avoirs de ventes"
@@ -9328,7 +9376,7 @@ msgid "Purchase Tax(%)"
 msgstr "Taxe à l'achat (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Créer quelques lignes de facture SVP."
@@ -9344,7 +9392,7 @@ msgid "Display Detail"
 msgstr "Afficher le détail"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9382,8 +9430,6 @@ msgstr "Fin de période"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Rapports financiers"
@@ -9398,6 +9444,7 @@ msgstr "Rapports financiers"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9418,6 +9465,7 @@ msgstr "Période de début"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Direction d'Analyse"
 
@@ -9437,7 +9485,7 @@ msgstr "Vue journal"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total crédit"
@@ -9509,6 +9557,7 @@ msgstr "Relevés bancaires"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9590,7 +9639,7 @@ msgstr ""
 "partie \"compte client\"."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Vous devez sélectionner les comptes à lettrer"
@@ -9619,7 +9668,6 @@ msgstr ""
 "durant une période spécifique."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filtrés par"
@@ -9641,7 +9689,7 @@ msgid "Move"
 msgstr "N° d'écriture"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9691,7 +9739,7 @@ msgid "Consolidated Children"
 msgstr "Enfants consolidés"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9756,6 +9804,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9818,6 +9867,7 @@ msgstr "Écriture d'abonnement"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9825,6 +9875,7 @@ msgstr "Écriture d'abonnement"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9869,7 +9920,7 @@ msgid "Unreconciled"
 msgstr "Non lettré"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Total incorrect !"
@@ -9937,7 +9988,7 @@ msgid "Comparison"
 msgstr "Comparaison"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Erreur inconnue"
@@ -9952,7 +10003,7 @@ msgstr "Ce compte de tiers remplacera le compte par défaut."
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr "Ouverture/clôture d'exercice"
+msgstr "Période d'ouverture/clôture"
 
 #. module: account
 #: field:account.account,currency_id:0
@@ -9974,6 +10025,7 @@ msgstr "Valider les mouvements de compte"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10081,9 +10133,11 @@ msgstr "Imputations analytiques des 30 derniers jours"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Périodes"
 
@@ -10255,6 +10309,7 @@ msgstr "Validé"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10278,7 +10333,7 @@ msgstr "Date de fin"
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Opening Entries"
-msgstr "Annuler les écritures d'ouvertures"
+msgstr "Annuler l'écriture d'ouverture"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
@@ -10302,7 +10357,7 @@ msgid "No detail"
 msgstr "Aucun détail"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -10339,6 +10394,7 @@ msgid "Verification Total"
 msgstr "Total"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10359,6 +10415,7 @@ msgstr "Journal : Tous"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10373,7 +10430,9 @@ msgstr "Journal : Tous"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10383,6 +10442,8 @@ msgstr "Journal : Tous"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10441,7 +10502,7 @@ msgstr "Signer pour le parent"
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr "Rapport sur la balance des comptes"
+msgstr "Balance générale"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -10546,6 +10607,7 @@ msgstr "Facture fournisseur"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10579,6 +10641,8 @@ msgstr "Erreur ! Vous ne pouvez pas créer de modèles de compte récursifs"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "N° écriture dans le journal"
 
@@ -10598,7 +10662,7 @@ msgstr ""
 "autre état car il contient des écritures!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "L'écriture est déjà lettrée"
@@ -10621,7 +10685,7 @@ msgstr "Intervalle"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr "Imputations analytiques relatives au journal des achats."
+msgstr "Ecritures analytiques relatives au journal des achats."
 
 #. module: account
 #: help:account.account,type:0
@@ -10640,8 +10704,10 @@ msgstr ""
 "fermés."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Avec mouvements"
@@ -10765,8 +10831,8 @@ msgid "Statistic Reports"
 msgstr "Rapports statistiques"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Compte Incorrect !"
@@ -10798,7 +10864,7 @@ msgid "Accounts Mapping"
 msgstr "Affectation des comptes"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "La facture '%s' est en attente de validation."
@@ -11058,6 +11124,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -11135,13 +11202,15 @@ msgstr "Échu"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Future"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr "Rechercher des écritures comptables"
+msgstr "Recherche par ligne d'écritures"
 
 #. module: account
 #: help:account.tax,base_sign:0
diff --git a/addons/account/i18n/fr_BE.po b/addons/account/i18n/fr_BE.po
index a511d97eb7a..eacdf3c5eca 100644
--- a/addons/account/i18n/fr_BE.po
+++ b/addons/account/i18n/fr_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr ""
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1646,7 +1657,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1719,7 +1730,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2038,7 +2049,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2062,7 +2073,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2111,7 +2122,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2130,7 +2141,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2170,6 +2181,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2179,6 +2191,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2229,7 +2242,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2260,7 +2273,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2334,7 +2347,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2415,7 +2428,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2474,7 +2487,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2506,7 +2518,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2626,6 +2638,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2673,14 +2686,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2783,7 +2796,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2796,7 +2809,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2834,7 +2847,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2981,7 +2994,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3173,7 +3186,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3227,7 +3240,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3308,6 +3321,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3354,7 +3368,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3369,9 +3383,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3392,7 +3413,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3417,6 +3438,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3444,10 +3466,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3464,7 +3493,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3478,7 +3506,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3487,7 +3515,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3518,6 +3546,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3599,7 +3629,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3630,7 +3660,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3644,6 +3674,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3657,7 +3688,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3977,7 +4008,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4034,7 +4065,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4241,7 +4272,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4275,7 +4306,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4287,6 +4318,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4331,7 +4363,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4345,7 +4377,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4373,7 +4405,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4389,7 +4421,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4441,7 +4473,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4466,11 +4498,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4607,26 +4641,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4729,7 +4761,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4753,7 +4785,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4774,6 +4806,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4817,6 +4850,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4890,7 +4925,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4923,6 +4958,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4999,6 +5035,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5126,7 +5163,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5178,13 +5214,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5258,7 +5294,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5421,7 +5456,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5454,14 +5489,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5481,7 +5516,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5511,7 +5546,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5526,7 +5561,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5622,7 +5659,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5633,8 +5670,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5675,8 +5712,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5738,7 +5775,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5775,6 +5812,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6048,6 +6087,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6057,7 +6098,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6097,6 +6138,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6315,8 +6357,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6332,7 +6374,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6371,13 +6413,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6445,25 +6487,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6495,8 +6538,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6551,7 +6594,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6702,7 +6745,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6732,7 +6775,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6800,14 +6843,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6903,8 +6946,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6917,7 +6960,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7048,7 +7091,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7079,8 +7122,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7169,7 +7212,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7180,7 +7223,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7215,13 +7258,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7248,13 +7292,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7271,7 +7315,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7321,7 +7365,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7369,13 +7413,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7419,7 +7465,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7431,15 +7477,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7585,13 +7631,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7643,7 +7690,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7656,7 +7703,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7730,7 +7777,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7792,7 +7839,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7838,7 +7885,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7860,7 +7907,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Journal Remboursements Achats"
@@ -7947,7 +7994,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8075,7 +8122,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8154,10 +8201,12 @@ msgstr "Journal des Remboursements"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8190,7 +8239,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8213,7 +8262,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8299,7 +8348,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8405,7 +8454,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8418,7 +8467,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8491,7 +8540,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8526,12 +8575,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8550,7 +8601,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8636,7 +8687,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8683,7 +8734,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8699,7 +8750,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8731,8 +8782,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8747,6 +8796,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8767,6 +8817,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8786,7 +8837,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8851,6 +8902,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8926,7 +8978,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8948,7 +9000,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8970,7 +9021,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9026,7 +9077,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9087,6 +9138,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9143,6 +9195,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9150,6 +9203,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9192,7 +9246,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9251,7 +9305,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9288,6 +9342,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9386,9 +9441,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9550,6 +9607,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9597,7 +9655,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9633,6 +9691,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9653,6 +9712,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9667,7 +9727,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9677,6 +9739,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9830,6 +9894,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9863,6 +9928,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9880,7 +9947,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9916,8 +9983,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10033,8 +10102,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10060,7 +10129,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10250,6 +10319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10323,6 +10393,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index cb8bd94487b..56327a5e1b4 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:01+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -143,6 +143,7 @@ msgstr "Conciliar"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referencia"
 
@@ -161,13 +162,13 @@ msgstr ""
 "sen eliminalo."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "¡Atención!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -232,7 +233,7 @@ msgstr ""
 "Imposto apareza nas facturas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "A factura '%s' é pagada parcialmente: %s%s de %s%s (%s%s restantes)"
@@ -248,7 +249,7 @@ msgid "Belgian Reports"
 msgstr "Informes Belgas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Non podes engadir/modificar as entradas nun diario pechado."
@@ -294,7 +295,7 @@ msgid "St."
 msgstr "Ext."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -589,8 +590,10 @@ msgid "The accountant confirms the statement."
 msgstr "O Contable confirma o extracto."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -648,7 +651,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "¡A Secuencia Principal debe ser distinta da actual!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -659,7 +662,7 @@ msgid "Tax Code Amount"
 msgstr "Imposto sobre Valor Código"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -686,8 +689,8 @@ msgid "Journal Period"
 msgstr "Período de diario"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -766,6 +769,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "¡Só pode cambiar a moeda para as Factura Borrador!"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -781,12 +785,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -914,12 +919,13 @@ msgid "Create 3 Months Periods"
 msgstr "Crear Períodos Trimestrales"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Debido"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1000,7 +1006,7 @@ msgstr ""
 "este campo contén o importe de base(sen imposto)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1033,10 +1039,10 @@ msgid "Code"
 msgstr "Código"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1100,7 +1106,7 @@ msgstr ""
 "informacións sobre a conta e as súas particularidades."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1148,7 +1154,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banco"
@@ -1244,7 +1250,7 @@ msgid "The move of this entry line."
 msgstr "O movemento desta liña de asento."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1265,7 +1271,7 @@ msgid "Entry Label"
 msgstr "Etiqueta asento"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1351,14 +1357,15 @@ msgid "Taxes"
 msgstr "Impostos"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Seleccione un  período de inicio e un de final"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1413,6 +1420,7 @@ msgid "Journal Items Analysis"
 msgstr "Análise de elementos do diario"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Empresas"
@@ -1437,8 +1445,10 @@ msgid "Central Journal"
 msgstr "Diario Central"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1673,6 +1683,7 @@ msgid "Separated Journal Sequences"
 msgstr "Secuencias Separadas de Diario"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Responsable"
@@ -1703,7 +1714,7 @@ msgid "Year Sum"
 msgstr "Suma Anual"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1781,7 +1792,7 @@ msgid "Customer Ref:"
 msgstr "Ref do Cliente:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "¡O usuario %s non ten permisos para acceder ó diario %s!"
@@ -2108,7 +2119,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2137,7 +2148,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Busca as Plantillas do Plan de Contas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2189,7 +2200,7 @@ msgid "Description"
 msgstr "Descrición"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2208,7 +2219,7 @@ msgid "Income Account"
 msgstr "Conta de Ingresos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "¡Non hai definido un Diario Contable de tipo Compra/Venta!"
@@ -2248,6 +2259,7 @@ msgstr "Modelo de Producto"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2257,6 +2269,7 @@ msgstr "Modelo de Producto"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2307,7 +2320,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2340,7 +2353,7 @@ msgid "Main Sequence"
 msgstr "Secuencia Principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2414,7 +2427,7 @@ msgid "Account Tax Code"
 msgstr "Código impuesto contable"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2506,7 +2519,7 @@ msgid "Account Model Entries"
 msgstr "Modelos de Apuntes Contables"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2573,7 +2586,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2605,7 +2617,7 @@ msgid "Accounts"
 msgstr "Contas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "¡Erro de Configuración!"
@@ -2728,6 +2740,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Saldos Vencidos de Empresa"
@@ -2780,14 +2793,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Este asistente creará apuntes contables recorrentes"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "¡Non hai secuencia definida no diario!"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2894,7 +2907,7 @@ msgid "Base Code Amount"
 msgstr "Importe Código Base"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2907,7 +2920,7 @@ msgid "Default Sale Tax"
 msgstr "Imposto de Venta por Defecto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2948,7 +2961,7 @@ msgid "Fiscal Position"
 msgstr "Posición Fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3103,7 +3116,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3307,7 +3320,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "¡Non hai empresa definida!"
@@ -3362,7 +3375,7 @@ msgid "Chart of Tax"
 msgstr "Plan de Imposto"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3448,6 +3461,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3494,7 +3508,7 @@ msgid "Detail"
 msgstr "Detalle"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3509,9 +3523,16 @@ msgid "VAT :"
 msgstr "IVE:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3532,7 +3553,7 @@ msgid "Centralised counterpart"
 msgstr "Contrapartida centralizada"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3558,6 +3579,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3585,10 +3607,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Data"
 
@@ -3605,7 +3634,6 @@ msgstr "Romper conciliación"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3619,7 +3647,7 @@ msgid "Chart of Accounts Template"
 msgstr "Plantilla de Plan de contas"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3631,7 +3659,7 @@ msgstr ""
 "¡Por favor, defina a empresa nel!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "¡Algúns apuntes xa están conciliados!"
@@ -3662,6 +3690,8 @@ msgstr "Orzamentos"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Sen Filtros"
 
@@ -3746,7 +3776,7 @@ msgid "Analytic Items"
 msgstr "Elementos analíticos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "¡Imposible cambialo idioma!"
@@ -3777,7 +3807,7 @@ msgid "Mapping"
 msgstr "Mapeando"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3791,6 +3821,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3804,7 +3835,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Informe de balance de comprobación de vencementos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4135,7 +4166,7 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4192,7 +4223,7 @@ msgid "Account Base Code"
 msgstr "Código base conta"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4402,7 +4433,7 @@ msgid "Allow Reconciliation"
 msgstr "Permitir conciliación"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4436,7 +4467,7 @@ msgid "Recurring Models"
 msgstr "Modelos recurrentes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4448,6 +4479,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Cambiar"
 
@@ -4492,7 +4524,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4508,7 +4540,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4536,7 +4568,7 @@ msgstr "Mapeo de contas"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -4552,7 +4584,7 @@ msgid "Cancelled Invoice"
 msgstr "Factura cancelada"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4609,7 +4641,7 @@ msgid "Income Account on Product Template"
 msgstr "Conta de ingresos en plantilla producto"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4635,11 +4667,13 @@ msgstr "Novo exercicio fiscal"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Facturas"
 
@@ -4776,26 +4810,24 @@ msgid "Journal Items"
 msgstr "Elementos de diario"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4901,7 +4933,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4928,7 +4960,7 @@ msgid "Child Tax Accounts"
 msgstr "Contas impuestos fillas"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "O período inicial debería ser mais pequeno que o período final"
@@ -4949,6 +4981,7 @@ msgstr "Balance analítico"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4992,6 +5025,8 @@ msgstr "Tipo de período"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Pagos"
 
@@ -5066,7 +5101,7 @@ msgid "Line 1:"
 msgstr "Liña 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "¡Erro de integridade!"
@@ -5099,6 +5134,7 @@ msgstr "Resultado da conciliación"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Balance de situación"
@@ -5175,6 +5211,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5304,7 +5341,6 @@ msgstr "Contabilidade. Informe contable común"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Comunicación"
 
@@ -5356,13 +5392,13 @@ msgid "End of Year Entries Journal"
 msgstr "Diario asentos peche do exercicio"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5438,7 +5474,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5611,7 +5646,7 @@ msgid "Generate Opening Entries"
 msgstr "Xerar asentos de apertura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "¡Xa está conciliado!"
@@ -5644,14 +5679,14 @@ msgid "Child Accounts"
 msgstr "Contas Fillas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Desaxuste"
@@ -5671,7 +5706,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Proveedor"
@@ -5701,7 +5736,7 @@ msgid "Account n°"
 msgstr "Conta nº"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referencia libre"
@@ -5716,7 +5751,9 @@ msgstr "Valoración"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Contas a cobrar e pagar"
@@ -5823,7 +5860,7 @@ msgid "Filter by"
 msgstr "Filtrar por"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5834,8 +5871,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "¡Non pode empregar unha conta inactiva!"
@@ -5876,8 +5913,8 @@ msgid "Number of Days"
 msgstr "Número de Días"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5939,7 +5976,7 @@ msgid "Multipication factor for Base code"
 msgstr "Factor de multiplicación para código base"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "non implementado"
@@ -5978,6 +6015,8 @@ msgstr "Análisis asentos analíticos"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Anterior"
 
@@ -6256,6 +6295,8 @@ msgstr "Porcentaxe"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Diario e Empresa"
 
@@ -6265,7 +6306,7 @@ msgid "Power"
 msgstr "Enerxía"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6307,6 +6348,7 @@ msgid "Applicable Type"
 msgstr "Tipo aplicable"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6525,8 +6567,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6542,7 +6584,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6581,13 +6623,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6657,25 +6699,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6707,8 +6750,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6763,7 +6806,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6914,7 +6957,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6944,7 +6987,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7012,14 +7055,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7115,8 +7158,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7129,7 +7172,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7260,7 +7303,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7291,8 +7334,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7381,7 +7424,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7392,7 +7435,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7427,13 +7470,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "O diario debe tener conta de débito e crédito por defecto"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7460,13 +7504,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7483,7 +7527,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7533,7 +7577,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7581,13 +7625,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7631,7 +7677,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Efectivo"
@@ -7643,15 +7689,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7797,13 +7843,14 @@ msgstr "Fixo"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Aviso !"
@@ -7855,7 +7902,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7868,7 +7915,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7942,7 +7989,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -8004,7 +8051,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8050,7 +8097,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8072,7 +8119,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -8159,7 +8206,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8287,7 +8334,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8366,10 +8413,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8402,7 +8451,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8425,7 +8474,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8510,7 +8559,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8616,7 +8665,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8629,7 +8678,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8702,7 +8751,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8737,12 +8786,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8761,7 +8812,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8847,7 +8898,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8894,7 +8945,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8910,7 +8961,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8942,8 +8993,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8958,6 +9007,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8978,6 +9028,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8997,7 +9048,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -9067,6 +9118,7 @@ msgstr "Extractos Bancarios"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9142,7 +9194,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -9164,7 +9216,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -9186,7 +9237,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9242,7 +9293,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9303,6 +9354,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9359,6 +9411,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9366,6 +9419,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9408,7 +9462,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9467,7 +9521,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9504,6 +9558,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9602,9 +9657,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Periodos"
 
@@ -9766,6 +9823,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9813,7 +9871,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9849,6 +9907,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9869,6 +9928,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9883,7 +9943,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9893,6 +9955,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10050,6 +10114,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10083,6 +10148,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -10100,7 +10167,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -10136,8 +10203,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Con movementos"
@@ -10253,8 +10322,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10280,7 +10349,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10470,6 +10539,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10546,6 +10616,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po
index 5056d4f6eee..aae94731d3a 100644
--- a/addons/account/i18n/gu.po
+++ b/addons/account/i18n/gu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 18:17+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-10-17 04:15+0000\n"
+"Last-Translator: Amit Rasmiya (OpenERP) <Unknown>\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: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:01+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -51,7 +51,7 @@ msgstr ""
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Statistics"
-msgstr ""
+msgstr "આંકડાકીય માહિતી"
 
 #. module: account
 #: view:account.invoice:0
@@ -140,6 +140,7 @@ msgstr "reconcile"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "સંદર્ભ"
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
-msgstr "ચેતવણી"
+msgstr "ચેતવણી!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -201,7 +202,7 @@ msgstr ""
 #: 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 "ટેક્સ નમૂનાઓ"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr "સ્ટેટ્મેંટ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "પ્રકાર"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr "ખાતાઓ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "રેખાંકન ભૂલ"
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr "જુઓ"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr "વિગત"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "તારીખ"
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr "મહિનો"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr "૪"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "બદલો"
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr "નવું નાણાંકીય વર્ષ"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "ઈનવોઈસ"
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "ભૂલ"
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "ચૂકવણીઓ"
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr "ઘાતાંક"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "કુલ ઉધાર"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr "છપાયેલ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr "કુલ:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr "વૈકલ્પિક જાણકારી"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr "પ્રતિ"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr "ચોક્કસ"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "ચેતવણી"
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr "નાણાંકીય વર્ષની પસંદગી"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "કુલ જમા"
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr "ખસેડો"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po
index fdb2f44a827..83628e5a9f6 100644
--- a/addons/account/i18n/he.po
+++ b/addons/account/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:01+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr "סטטוס אישור"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "ייחוס"
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po
index db761c54d65..74896f57d14 100644
--- a/addons/account/i18n/hi.po
+++ b/addons/account/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:02+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr "समाधान"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "संदर्भ"
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "चेतावनी!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "विविध जर्नल"
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr "बेल्जियम रिपोर्ट"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr "स्टo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po
index a48300a0d23..4c8ed4d7481 100644
--- a/addons/account/i18n/hr.po
+++ b/addons/account/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:04+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -141,6 +141,7 @@ msgstr "Zatvaranje IOS-a"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Vezna oznaka"
 
@@ -157,13 +158,13 @@ msgid ""
 msgstr "Omogućuje skrivanje neaktivnih uvjeta plaćanja."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -225,7 +226,7 @@ msgid ""
 msgstr "Označite ako ovaj porez ne želite ispisivati na računima."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Račun '%s' je djelomično plaćen: %s%s od %s%s (%s%s preostalo)"
@@ -241,7 +242,7 @@ msgid "Belgian Reports"
 msgstr "Belgian Reports"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Ne možete dodavati/mijenjati stavke u zatvorenom dnevniku."
@@ -287,7 +288,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Konto na stavci računa ne pripada organizaciji sa zaglavlja računa."
@@ -578,8 +579,10 @@ msgid "The accountant confirms the statement."
 msgstr "Knjigovođa potvrđuje izvod."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -637,7 +640,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Glavna serija mora biti različita od trenutne !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -648,7 +651,7 @@ msgid "Tax Code Amount"
 msgstr "Iznos porezne grupe"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "IRA"
@@ -675,8 +678,8 @@ msgid "Journal Period"
 msgstr "Period dnevnika"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Sve stavke zatvaranja moraju biti iz iste organizacije"
@@ -753,6 +756,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Valuta se može mijenjati samo na računima u stanju 'Nacrt'!"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Financijski izvještaj"
@@ -768,12 +772,13 @@ msgstr "Financijski izvještaj"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Vrsta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -901,12 +906,13 @@ msgid "Create 3 Months Periods"
 msgstr "Stvori tromjesečna razdoblja"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Dospijeće"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -984,7 +990,7 @@ msgid ""
 msgstr "Porez ili osnovica poreza ovisno o poreznoj grupi."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1017,10 +1023,10 @@ msgid "Code"
 msgstr "Šifra"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1084,7 +1090,7 @@ msgstr ""
 "information about the account and its specificities."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1132,7 +1138,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banka"
@@ -1228,7 +1234,7 @@ msgid "The move of this entry line."
 msgstr "Temeljnica"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1249,7 +1255,7 @@ msgid "Entry Label"
 msgstr "Oznaka stavke"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "Ne možete mjenjati/brisati dnevnike sa stavkama za ovo razdoblje!"
@@ -1334,14 +1340,15 @@ msgid "Taxes"
 msgstr "Porezi"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Odaberite početni i zavšni period"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "RDG"
 
@@ -1396,6 +1403,7 @@ msgid "Journal Items Analysis"
 msgstr "Analiza stavki dnevnika"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Partneri"
@@ -1420,8 +1428,10 @@ msgid "Central Journal"
 msgstr "Glavni dnevnik"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1655,6 +1665,7 @@ msgid "Separated Journal Sequences"
 msgstr "Odvojeni brojači dnevnika"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Odgovoran"
@@ -1685,7 +1696,7 @@ msgid "Year Sum"
 msgstr "Godišnja suma"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1762,7 +1773,7 @@ msgid "Customer Ref:"
 msgstr "Vezna oznaka kupca:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Korisnik %s nema prava pristupa dnevniku %s !"
@@ -2087,7 +2098,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2118,7 +2129,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Traži predloške kontnog plana"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2170,7 +2181,7 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2189,7 +2200,7 @@ msgid "Income Account"
 msgstr "Konto prihoda"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Nije definiran dnevnik tipa Prodaja/Nabava!"
@@ -2229,6 +2240,7 @@ msgstr "Predložak proizvoda"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2238,6 +2250,7 @@ msgstr "Predložak proizvoda"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2288,7 +2301,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2321,7 +2334,7 @@ msgid "Main Sequence"
 msgstr "Glavna br. serija"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2395,7 +2408,7 @@ msgid "Account Tax Code"
 msgstr "Porezna grupa za porez"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2486,7 +2499,7 @@ msgid "Account Model Entries"
 msgstr "Stavke modela"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "URA"
@@ -2552,7 +2565,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2584,7 +2596,7 @@ msgid "Accounts"
 msgstr "Konta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Greška u konfiguraciji!"
@@ -2706,6 +2718,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Struktura IOS-a partnera"
@@ -2758,14 +2771,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Asistent za kreiranje ponavljajućih temeljnica"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Nije definiran brojač na dnevniku!"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2871,7 +2884,7 @@ msgid "Base Code Amount"
 msgstr "Iznos osnovice"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2884,7 +2897,7 @@ msgid "Default Sale Tax"
 msgstr "Uobičajeni porezi prodaje"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "račun  '%s' je validiran."
@@ -2924,7 +2937,7 @@ msgid "Fiscal Position"
 msgstr "Fiskalna pozicija"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3076,7 +3089,7 @@ msgid "View"
 msgstr "Pogled"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3277,7 +3290,7 @@ msgid "Starting Balance"
 msgstr "Početni saldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nije definiran partner !"
@@ -3333,7 +3346,7 @@ msgid "Chart of Tax"
 msgstr "Stablo poreza"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3418,6 +3431,7 @@ msgstr "Količina :"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3464,7 +3478,7 @@ msgid "Detail"
 msgstr "Detalji"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3479,9 +3493,16 @@ msgid "VAT :"
 msgstr "PDV :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3502,7 +3523,7 @@ msgid "Centralised counterpart"
 msgstr "Centralizirana stavka zatvaranja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3527,6 +3548,7 @@ msgstr "(ostavite prazno za sve otvorene fiskalne godine)"
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3554,10 +3576,17 @@ msgstr "(ostavite prazno za sve otvorene fiskalne godine)"
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Datum"
 
@@ -3574,7 +3603,6 @@ msgstr "Otvori stavke"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3588,7 +3616,7 @@ msgid "Chart of Accounts Template"
 msgstr "Predložak kontnog plana"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3600,7 +3628,7 @@ msgstr ""
 "Please define partner on it!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Neke stavke su već zatvorene !"
@@ -3631,6 +3659,8 @@ msgstr "Budžeti"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Bez filtera"
 
@@ -3715,7 +3745,7 @@ msgid "Analytic Items"
 msgstr "Analitičke stavke"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Nemoguće promijeniti taksu!"
@@ -3746,7 +3776,7 @@ msgid "Mapping"
 msgstr "Mapiranje"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3760,6 +3790,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3773,7 +3804,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Bruto bilanca (Aged Trial balance)"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4103,7 +4134,7 @@ msgid "Month"
 msgstr "Mjesec"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4160,7 +4191,7 @@ msgid "Account Base Code"
 msgstr "Porezna grupa osnovice"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Nije definiran konto troška za proizvod: \"%s\" (id:%d)"
@@ -4369,7 +4400,7 @@ msgid "Allow Reconciliation"
 msgstr "Allow Reconciliation"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4403,7 +4434,7 @@ msgid "Recurring Models"
 msgstr "Ponavljajući modeli"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4415,6 +4446,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Promjeni"
 
@@ -4459,7 +4491,7 @@ msgid "Example"
 msgstr "Primjer"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4476,7 +4508,7 @@ msgid "Keep empty to use the income account"
 msgstr "Ostavite prazno za konto prihoda"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4504,7 +4536,7 @@ msgstr "Mapiranje konta"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Kupac"
@@ -4520,7 +4552,7 @@ msgid "Cancelled Invoice"
 msgstr "Otkazani račun"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4575,7 +4607,7 @@ msgid "Income Account on Product Template"
 msgstr "Račun prihoda na predlošku proizvoda"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4600,11 +4632,13 @@ msgstr "Nova poslovna godina"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Računi"
 
@@ -4741,26 +4775,24 @@ msgid "Journal Items"
 msgstr "Stavke glavne knjige"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Greška"
@@ -4867,7 +4899,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4893,7 +4925,7 @@ msgid "Child Tax Accounts"
 msgstr "Podređeni porezi"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Start period should be smaller then End period"
@@ -4914,6 +4946,7 @@ msgstr "Analitički saldo -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4957,6 +4990,8 @@ msgstr "Tip razdoblja"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Plaćanja"
 
@@ -5030,7 +5065,7 @@ msgid "Line 1:"
 msgstr "Linija 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Greška Integriteta !"
@@ -5063,6 +5098,7 @@ msgstr "Rezultat zatvaranja"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Bilanca stanja"
@@ -5139,6 +5175,7 @@ msgstr "Izvještaj"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5268,7 +5305,6 @@ msgstr "Account Common Account Report"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Veza"
 
@@ -5320,13 +5356,13 @@ msgid "End of Year Entries Journal"
 msgstr "Dnevnik knjiženja kraja godine"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5403,7 +5439,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Izlazni računi i odobrenja"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5574,7 +5609,7 @@ msgid "Generate Opening Entries"
 msgstr "Kreiraj početno stanje"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Već zatvoreno!"
@@ -5607,14 +5642,14 @@ msgid "Child Accounts"
 msgstr "Podređena konta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Naziv knjiženja (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Otpis"
@@ -5634,7 +5669,7 @@ msgstr "Prihod"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Dobavljač"
@@ -5664,7 +5699,7 @@ msgid "Account n°"
 msgstr "Konto br."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Slobodna vezna oznaka"
@@ -5679,7 +5714,9 @@ msgstr "Vrijednost"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Konta potraživanja i dugovanja partnera"
@@ -5787,7 +5824,7 @@ msgid "Filter by"
 msgstr "Filtriraj po"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5798,8 +5835,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Ne mozete koristiti neaktivan konto!"
@@ -5840,8 +5877,8 @@ msgid "Number of Days"
 msgstr "Broj dana"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5903,7 +5940,7 @@ msgid "Multipication factor for Base code"
 msgstr "Koeficijent za poreznu grupu osnovice"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "nije implementirano"
@@ -5942,6 +5979,8 @@ msgstr "Analiza analitičkih stavki"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Prošlost"
 
@@ -6221,6 +6260,8 @@ msgstr "Postotak"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Dnevnik i partner"
 
@@ -6230,7 +6271,7 @@ msgid "Power"
 msgstr "Eksponent"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6271,6 +6312,7 @@ msgid "Applicable Type"
 msgstr "Primjenjivi tip"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Poziv na br."
@@ -6501,8 +6543,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Stavke: "
@@ -6518,7 +6560,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Ne mogu napraviti temeljnicu između dvije različite tvrtke"
@@ -6567,13 +6609,13 @@ msgstr "Stanje je 'Nacrt'"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Total debit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Stavka \"%s\" nije ispravna !"
@@ -6647,25 +6689,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6697,8 +6740,8 @@ msgid "Printed"
 msgstr "Ispisano"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Greška :"
@@ -6757,7 +6800,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Jedan partner po stranici"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6918,7 +6961,7 @@ msgid "Total:"
 msgstr "Ukupno:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6955,7 +6998,7 @@ msgid "Taxes used in Sales"
 msgstr "Porezi prodaje"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7028,14 +7071,14 @@ msgid "Source Document"
 msgstr "Izvorni dokument"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7142,8 +7185,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Sigurno želite otvoriti ovaj račun?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7156,7 +7199,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Stavke računovodstva"
@@ -7294,7 +7337,7 @@ msgstr ""
 "razvijateljima da stvaraju posebne poreze u vlastitoj domeni."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "You should have chosen periods that belongs to the same company"
@@ -7325,8 +7368,8 @@ msgid "Reporting"
 msgstr "Izvještavanje"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7421,7 +7464,7 @@ msgid "Sign on Reports"
 msgstr "Predznak u izvješćima"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7432,7 +7475,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7467,7 +7510,7 @@ msgid "Optional Information"
 msgstr "Opcionalne informacije"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
@@ -7475,6 +7518,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7502,13 +7546,13 @@ msgid "Maturity Date"
 msgstr "Datum dospijeća"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Pogrešan konto !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Dnevnik prodaje"
@@ -7525,7 +7569,7 @@ msgid "Invoice Tax"
 msgstr "Porezi računa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Ne postoji broj dijela !"
@@ -7575,7 +7619,7 @@ msgstr "Do"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7623,13 +7667,15 @@ msgstr "Svibanj"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Konta obveza"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7673,7 +7719,7 @@ msgstr "Naziv izvještaja"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Gotovina"
@@ -7685,15 +7731,15 @@ msgid "Account Destination"
 msgstr "Ciljni konto"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7850,13 +7896,14 @@ msgstr "Fiksno"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Upozorenje!"
@@ -7908,7 +7955,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Odaberite valutu računa"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7921,7 +7968,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Nije moguće %s račun u stanju nacrt/proforma/otkazan."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Nema stavaka računa !"
@@ -7999,7 +8046,7 @@ msgid "Deferral Method"
 msgstr "Način odgode"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Račun '%s' je  plaćen."
@@ -8065,7 +8112,7 @@ msgid "Associated Partner"
 msgstr "Povezani partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Morate prvo odabrati partnera !"
@@ -8114,7 +8161,7 @@ msgstr ""
 "your country."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8136,7 +8183,7 @@ msgid "Choose Fiscal Year"
 msgstr "Izaberite fiskalnu godinu"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Dnevnik odobrenja dobavljača"
@@ -8226,7 +8273,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Kod za izračun cijena sa uključenim porezima"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8366,7 +8413,7 @@ msgid "current month"
 msgstr "tekući mjesec"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8447,10 +8494,12 @@ msgstr "Dnevnik povrata"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtriraj po"
 
@@ -8487,7 +8536,7 @@ msgid "The partner account used for this invoice."
 msgstr "Konto partnera za ovaj račun"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8510,7 +8559,7 @@ msgid "Payment Term Line"
 msgstr "Redak uvjeta plaćanja"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Dnevnik URA"
@@ -8596,7 +8645,7 @@ msgid "Unpaid Invoices"
 msgstr "Neplaćeni računi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8703,7 +8752,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Prazno za sve otvorene fiskalne godine"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "The account move (%s) for centralisation has been confirmed!"
@@ -8716,7 +8765,7 @@ msgid ""
 msgstr "Iznos u drugoj valuti ."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8797,7 +8846,7 @@ msgid "Contact Address"
 msgstr "Kontakt adresa"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8832,12 +8881,14 @@ msgstr "Ugovori"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "nepoznato"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Dnevnik početnog stanja"
@@ -8859,7 +8910,7 @@ msgstr ""
 "dobiti / gubitku"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8949,7 +9000,7 @@ msgid "Period from"
 msgstr "Od perioda"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Dnevnik odobrenja kupcima"
@@ -8996,7 +9047,7 @@ msgid "Purchase Tax(%)"
 msgstr "Porez nabave(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Molim upišite stavke računa."
@@ -9012,7 +9063,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9050,8 +9101,6 @@ msgstr "Kraj perioda"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Financijska izvješća"
@@ -9066,6 +9115,7 @@ msgstr "Financijska izvješća"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9086,6 +9136,7 @@ msgstr "Od perioda"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Smjer analize"
 
@@ -9105,7 +9156,7 @@ msgstr "Pogled dnevnika"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total credit"
@@ -9174,6 +9225,7 @@ msgstr "Izvodi banke"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9255,7 +9307,7 @@ msgstr ""
 "partnera."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Morate odabrati konta za zatvaranje"
@@ -9282,7 +9334,6 @@ msgstr ""
 "Preporuča se zatvaranje perioda nakon predaje porezne prijave."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filtriraj po"
@@ -9304,7 +9355,7 @@ msgid "Move"
 msgstr "Temeljnica"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "You can not change the tax, you should remove and recreate lines !"
@@ -9363,7 +9414,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidirana konta"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9426,6 +9477,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9482,6 +9534,7 @@ msgstr "Stavka pretplate"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9489,6 +9542,7 @@ msgstr "Stavka pretplate"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9531,7 +9585,7 @@ msgid "Unreconciled"
 msgstr "Otvoren"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Pogrešan ukupni iznos !"
@@ -9597,7 +9651,7 @@ msgid "Comparison"
 msgstr "Usporedba"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Nepoznata greška"
@@ -9636,6 +9690,7 @@ msgstr "Validate Account Move"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9738,9 +9793,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Razdoblja"
 
@@ -9909,6 +9966,7 @@ msgstr "Proknjiženo"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9956,7 +10014,7 @@ msgid "No detail"
 msgstr "Bez detalja"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Ne postoji konto prihoda za ovaj proizvod: \"%s\" (id:%d)"
@@ -9992,6 +10050,7 @@ msgid "Verification Total"
 msgstr "Kontrola uk. iznosa"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10012,6 +10071,7 @@ msgstr "Dnevnik: Svi"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10026,7 +10086,9 @@ msgstr "Dnevnik: Svi"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10036,6 +10098,8 @@ msgstr "Dnevnik: Svi"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10196,6 +10260,7 @@ msgstr "Ulazni račun"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10229,6 +10294,8 @@ msgstr "Greška ! Ne možete kreirati rekurzivne predloške konta."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -10246,7 +10313,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Stavka je već zatvorena"
@@ -10282,8 +10349,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Sa stavkama"
@@ -10405,8 +10474,8 @@ msgid "Statistic Reports"
 msgstr "Statistički izvještaji"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Pogrešan konto!"
@@ -10432,7 +10501,7 @@ msgid "Accounts Mapping"
 msgstr "Mapiranje konta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Račun '%s' čeka potvrdu."
@@ -10622,6 +10691,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10700,6 +10770,8 @@ msgstr "Dospjeće"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Budućnost"
 
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 61398c197ee..82c7fc09154 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:04+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:02+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -141,6 +141,7 @@ msgstr "Párosítás"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Hivatkozás"
 
@@ -158,13 +159,13 @@ msgstr ""
 "Ha az aktív mező nincs bejelölve, nem használható a fizetési feltétel."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Figyelem!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -229,7 +230,7 @@ msgstr ""
 "megjelenni a számlákon."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -246,7 +247,7 @@ msgid "Belgian Reports"
 msgstr "Belga kimutatások"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -294,7 +295,7 @@ msgid "St."
 msgstr "Áll."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -588,8 +589,10 @@ msgid "The accountant confirms the statement."
 msgstr "A könyvelő jóváhagyja a kivonatot."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -647,7 +650,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "A fő sorszámnak el kell térnie az aktuálistól!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -658,7 +661,7 @@ msgid "Tax Code Amount"
 msgstr "Adógyűjtő összege"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -685,8 +688,8 @@ msgid "Journal Period"
 msgstr "Könyvelési időszak"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Minden párosítandó tételnek ugyanahhoz a vállalathoz kell tartoznia."
@@ -763,6 +766,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Csak tervezet állapotú számlában változtathatja meg a pénznemet!"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -778,12 +782,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Típus"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -913,12 +918,13 @@ msgid "Create 3 Months Periods"
 msgstr "Negyedéves időszakok létrehozása"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Esedékes"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -998,7 +1004,7 @@ msgstr ""
 "ha adóalapgyűjtő, akkor az adóalap összegét."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1031,10 +1037,10 @@ msgid "Code"
 msgstr "Kód"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1098,7 +1104,7 @@ msgstr ""
 "sajátosságairól."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1146,7 +1152,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1244,7 +1250,7 @@ msgid "The move of this entry line."
 msgstr "A tételsor bizonylatszáma."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1265,7 +1271,7 @@ msgid "Entry Label"
 msgstr "Megjegyzés"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1352,14 +1358,15 @@ msgid "Taxes"
 msgstr "Adók"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Válassza ki a kezdő és a záró időszakot"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1414,6 +1421,7 @@ msgid "Journal Items Analysis"
 msgstr "Könyvelési tételsorok elemzése"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Partnerek"
@@ -1438,8 +1446,10 @@ msgid "Central Journal"
 msgstr "Központi napló"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1672,6 +1682,7 @@ msgid "Separated Journal Sequences"
 msgstr "Elkülönített napló sorszámok"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Felelős"
@@ -1702,7 +1713,7 @@ msgid "Year Sum"
 msgstr "Év összesen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1779,7 +1790,7 @@ msgid "Customer Ref:"
 msgstr "Vevő hiv.:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "%s felhasználónak nincs hozzáférési joga a(z) %s naplóhoz!"
@@ -2106,7 +2117,7 @@ msgid "Pro-forma"
 msgstr "Pro forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2137,7 +2148,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Számlatükör sablon keresése"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2189,7 +2200,7 @@ msgid "Description"
 msgstr "Leírás"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2208,7 +2219,7 @@ msgid "Income Account"
 msgstr "Árbevétel főkönyvi számla"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Nem határoztak meg értékesítés/beszerzés típusú naplót!"
@@ -2248,6 +2259,7 @@ msgstr "Terméksablon"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2257,6 +2269,7 @@ msgstr "Terméksablon"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2307,7 +2320,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2340,7 +2353,7 @@ msgid "Main Sequence"
 msgstr "Fő sorszám"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2414,7 +2427,7 @@ msgid "Account Tax Code"
 msgstr "Adógyűjtő kód"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2503,7 +2516,7 @@ msgid "Account Model Entries"
 msgstr "Modelltételek"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2569,7 +2582,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2601,7 +2613,7 @@ msgid "Accounts"
 msgstr "Főkönyvi számlák"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Beállítási hiba!"
@@ -2723,6 +2735,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Korosított folyószámla kivonat"
@@ -2775,14 +2788,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Ez a varázsló ismétlődő könyvelési tételeket hoz létre"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "A naplóra nem határoztak meg sorszámot!"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2888,7 +2901,7 @@ msgid "Base Code Amount"
 msgstr "Adóalapgyűjtő összege"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2901,7 +2914,7 @@ msgid "Default Sale Tax"
 msgstr "Alapértelmezett fizetendő ÁFA"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "'%s' számla jóváhagyásra került."
@@ -2942,7 +2955,7 @@ msgid "Fiscal Position"
 msgstr "ÁFA pozíció"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3093,7 +3106,7 @@ msgid "View"
 msgstr "Gyűjtő"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3295,7 +3308,7 @@ msgid "Starting Balance"
 msgstr "Nyitó egyenleg"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nem adott meg partnert!"
@@ -3349,7 +3362,7 @@ msgid "Chart of Tax"
 msgstr "Adókivonat"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3434,6 +3447,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3480,7 +3494,7 @@ msgid "Detail"
 msgstr "Tételes"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3495,9 +3509,16 @@ msgid "VAT :"
 msgstr "ÁFA :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3518,7 +3539,7 @@ msgid "Centralised counterpart"
 msgstr "Központi ellenszámla"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3544,6 +3565,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3571,10 +3593,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Dátum"
 
@@ -3591,7 +3620,6 @@ msgstr "Párosítás visszavonása"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3605,7 +3633,7 @@ msgid "Chart of Accounts Template"
 msgstr "Számlatükör sablon"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3617,7 +3645,7 @@ msgstr ""
 "Kérem, adja meg a partnert!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Néhány tétel már párosított!"
@@ -3648,6 +3676,8 @@ msgstr "Üzleti tervek"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Nincs szűrő"
 
@@ -3731,7 +3761,7 @@ msgid "Analytic Items"
 msgstr "Gyűjtőkód tételek"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Az adót nem lehet megváltoztatni!"
@@ -3762,7 +3792,7 @@ msgid "Mapping"
 msgstr "Leképezés"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3776,6 +3806,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3789,7 +3820,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Korosított folyószámla kivonat"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4119,7 +4150,7 @@ msgid "Month"
 msgstr "Hónap"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4176,7 +4207,7 @@ msgid "Account Base Code"
 msgstr "Adóalapgyűjtő kód"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4387,7 +4418,7 @@ msgid "Allow Reconciliation"
 msgstr "Párosítás engedélyezése"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4421,7 +4452,7 @@ msgid "Recurring Models"
 msgstr "Ismétlődő modellek"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4433,6 +4464,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Átváltás"
 
@@ -4477,7 +4509,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4493,7 +4525,7 @@ msgid "Keep empty to use the income account"
 msgstr "-"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4521,7 +4553,7 @@ msgstr "Főkönyvi számla leképezés"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Vevő"
@@ -4537,7 +4569,7 @@ msgid "Cancelled Invoice"
 msgstr "Érvénytelenített számla"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4595,7 +4627,7 @@ msgid "Income Account on Product Template"
 msgstr "Árbevétel főkönyvi számla a terméksablonban"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4620,11 +4652,13 @@ msgstr "Új üzleti év"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Számlák"
 
@@ -4761,26 +4795,24 @@ msgid "Journal Items"
 msgstr "Könyvelési tételsorok"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Hiba"
@@ -4889,7 +4921,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4916,7 +4948,7 @@ msgid "Child Tax Accounts"
 msgstr "Alárendelt adószámlák"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "A kezdő időszaknak korábbinak kell lenni a záró időszaknál."
@@ -4937,6 +4969,7 @@ msgstr "Gyűjtőkód kivonat -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4980,6 +5013,8 @@ msgstr "Időszak típusa"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Kifizetések"
 
@@ -5053,7 +5088,7 @@ msgid "Line 1:"
 msgstr "1. sor:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integritás hiba!"
@@ -5086,6 +5121,7 @@ msgstr "Párosítás eredménye"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Mérleg"
@@ -5162,6 +5198,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5294,7 +5331,6 @@ msgstr "Általános főkönyvi számla kimutatás"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Kommunikáció"
 
@@ -5346,13 +5382,13 @@ msgid "End of Year Entries Journal"
 msgstr "Záró/nyitó napló"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5428,7 +5464,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5598,7 +5633,7 @@ msgid "Generate Opening Entries"
 msgstr "Nyitó tételek előállítása"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Már párosítva!"
@@ -5631,14 +5666,14 @@ msgid "Child Accounts"
 msgstr "Alárendelt számlák"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Különbözet leírása"
@@ -5658,7 +5693,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Szállító"
@@ -5688,7 +5723,7 @@ msgid "Account n°"
 msgstr "Számla száma"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Szabad hivatkozás"
@@ -5703,7 +5738,9 @@ msgstr "Értékelés"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Vevő és szállító számlák"
@@ -5811,7 +5848,7 @@ msgid "Filter by"
 msgstr "Szűrés"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5822,8 +5859,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Inaktív számlát nem használhat!"
@@ -5865,8 +5902,8 @@ msgid "Number of Days"
 msgstr "Napok száma"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5928,7 +5965,7 @@ msgid "Multipication factor for Base code"
 msgstr "Adóalapgyűjtő szorzótényezője"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "Nem valósult meg!"
@@ -5967,6 +6004,8 @@ msgstr "Gyűjtőkód tételek elemzése"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Múlt"
 
@@ -6242,6 +6281,8 @@ msgstr "Százalék"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Napló és partner"
 
@@ -6251,7 +6292,7 @@ msgid "Power"
 msgstr "Max. tételszám"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6293,6 +6334,7 @@ msgid "Applicable Type"
 msgstr "Alkalmazható típus"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Számlahivatkozás"
@@ -6521,8 +6563,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Tételek: "
@@ -6538,7 +6580,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "A rendszer nem tud létrehozni eltérő vállalatok közötti mozgásokat."
@@ -6586,13 +6628,13 @@ msgstr "Az állapot: tervezet."
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Tartozik összesen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "A(z) \"%s\" tétel nem érvényes!"
@@ -6666,25 +6708,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6716,8 +6759,8 @@ msgid "Printed"
 msgstr "Kinyomtatva"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6776,7 +6819,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Egy oldalon csak egy partner jelenik meg a kimutatásban"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6934,7 +6977,7 @@ msgid "Total:"
 msgstr "Összesen:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6972,7 +7015,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7048,14 +7091,14 @@ msgid "Source Document"
 msgstr "Forrásbizonylat"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7161,8 +7204,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Biztos benne, hogy meg akarja nyitni ezt a számlát?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7175,7 +7218,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Könyvelési tételek"
@@ -7313,7 +7356,7 @@ msgstr ""
 "adók létrehozását teszi lehetővé."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7345,8 +7388,8 @@ msgid "Reporting"
 msgstr "Kimutatások"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7441,7 +7484,7 @@ msgid "Sign on Reports"
 msgstr "Kimutatásokban megjelenő előjel"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7452,7 +7495,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7487,7 +7530,7 @@ msgid "Optional Information"
 msgstr "Válaszható információ"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
@@ -7496,6 +7539,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7524,13 +7568,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Hibás főkönyvi számla!"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Kimenő számla napló"
@@ -7547,7 +7591,7 @@ msgid "Invoice Tax"
 msgstr "Adó"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Nem adott meg darabszámot!"
@@ -7597,7 +7641,7 @@ msgstr "Záró dátum"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7645,13 +7689,15 @@ msgstr "Május"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Szállító számlák"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7695,7 +7741,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Pénztár"
@@ -7707,15 +7753,15 @@ msgid "Account Destination"
 msgstr "Eredeti számla helyébe lépő számla"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7872,13 +7918,14 @@ msgstr "Fix összeg"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Figyelem!"
@@ -7930,7 +7977,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Válassza ki az alkalmazandó új pénznemet"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7944,7 +7991,7 @@ msgstr ""
 "%s nem készíthető tervezet/pro forma/érvénytelenített állapotú számlához."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Nincsenek számlasorok!"
@@ -8020,7 +8067,7 @@ msgid "Deferral Method"
 msgstr "Évnyitási módszer"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "'%s' számla kiegyenlítésre került."
@@ -8086,7 +8133,7 @@ msgid "Associated Partner"
 msgstr "Társult partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Először partnert kell választani!"
@@ -8135,7 +8182,7 @@ msgstr ""
 "tartalmazza az adókat."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8157,7 +8204,7 @@ msgid "Choose Fiscal Year"
 msgstr "Üzleti év kiválasztása"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Bejövő jóváíró számla napló"
@@ -8248,7 +8295,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Számítási kód (ha az ár tartalmazza az adót)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8384,7 +8431,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8463,10 +8510,12 @@ msgstr "Jóváíró számla napló"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Szűrés"
 
@@ -8503,7 +8552,7 @@ msgid "The partner account used for this invoice."
 msgstr "Vevő/szállító főkönyvi számla"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8526,7 +8575,7 @@ msgid "Payment Term Line"
 msgstr "Fizetési feltétel sor"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Bejövő számla napló"
@@ -8615,7 +8664,7 @@ msgid "Unpaid Invoices"
 msgstr "Rendezetlen számlák"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8724,7 +8773,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Hagyja üresen, ha minden nyitott évre akarja listázni."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "A(z) '%s' tétel a központosításhoz jóváhagyásra került!"
@@ -8738,7 +8787,7 @@ msgstr ""
 "Szabadon választott más pénznemben kifejezett összeg, ha a tétel devizás."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8814,7 +8863,7 @@ msgid "Contact Address"
 msgstr "Cím"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8849,12 +8898,14 @@ msgstr "Szerződések"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "Ismeretlen"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Nyitó tételek naplója"
@@ -8876,7 +8927,7 @@ msgstr ""
 "hozzáadódik, a veszteség levonódik)."
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8966,7 +9017,7 @@ msgid "Period from"
 msgstr "Kezdő időszak"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Kimenő jóváíró számla napló"
@@ -9013,7 +9064,7 @@ msgid "Purchase Tax(%)"
 msgstr "Előzetesen felszámított ÁFA(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Kérem, hozzon létre számlasorokat!"
@@ -9029,7 +9080,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9068,8 +9119,6 @@ msgstr "Időszak vége"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -9084,6 +9133,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9104,6 +9154,7 @@ msgstr "Kezdő időszak"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Elemzés iránya"
 
@@ -9123,7 +9174,7 @@ msgstr "Naplónézet"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Követel összesen"
@@ -9192,6 +9243,7 @@ msgstr "Bankkivonatok"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9271,7 +9323,7 @@ msgstr ""
 "felajánlja az ehhez kapcsolt ÁFA számlát és a vevő ellenszámlát."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Ki kell választania a párosítandó főkönyvi számlákat!"
@@ -9297,7 +9349,6 @@ msgstr ""
 "eldöntheti, hogy a vállalat tevékenységétől függően mikor zárja le azokat."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Szűrés"
@@ -9319,7 +9370,7 @@ msgid "Move"
 msgstr "Bizonylat száma"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9381,7 +9432,7 @@ msgid "Consolidated Children"
 msgstr "Konszolidált számlák"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9444,6 +9495,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9500,6 +9552,7 @@ msgstr "Tétel előjegyzés"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9507,6 +9560,7 @@ msgstr "Tétel előjegyzés"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9549,7 +9603,7 @@ msgid "Unreconciled"
 msgstr "Rendezetlen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Hibás összesen!"
@@ -9614,7 +9668,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Ismeretlen hiba"
@@ -9653,6 +9707,7 @@ msgstr "Könyvelési tételek jóváhagyása"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9757,9 +9812,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Időszakok"
 
@@ -9925,6 +9982,7 @@ msgstr "Könyvelt"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9972,7 +10030,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -10009,6 +10067,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10029,6 +10088,7 @@ msgstr "Napló: mindegyik"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10043,7 +10103,9 @@ msgstr "Napló: mindegyik"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10053,6 +10115,8 @@ msgstr "Napló: mindegyik"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10215,6 +10279,7 @@ msgstr "Bejövő számla"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10248,6 +10313,8 @@ msgstr "Hiba! Nem hozhat létre rekurzív főkönyvi számla sablonokat."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -10265,7 +10332,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "A tétel már párosított!"
@@ -10301,8 +10368,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Amelyeken van mozgás"
@@ -10422,8 +10491,8 @@ msgid "Statistic Reports"
 msgstr "Statisztikák"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Hibás főkönyvi számla!"
@@ -10449,7 +10518,7 @@ msgid "Accounts Mapping"
 msgstr "Főkönyvi számla leképezés"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "'%s' számla jóváhagyásra vár."
@@ -10640,6 +10709,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10715,6 +10785,8 @@ msgstr "Esedékesség"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Jövő"
 
diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po
index 0545ca97ae6..63b5d72e59c 100644
--- a/addons/account/i18n/id.po
+++ b/addons/account/i18n/id.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-06 10:35+0000\n"
-"Last-Translator: Budi Iskandar <Unknown>\n"
+"PO-Revision-Date: 2012-08-24 02:50+0000\n"
+"Last-Translator: Ginandjar Satyanagara <Unknown>\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: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:02+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -43,7 +43,7 @@ msgstr ""
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "Rekonsiliasi Ayat-ayat Jurnal"
+msgstr ""
 
 #. module: account
 #: view:account.account:0
@@ -61,7 +61,7 @@ msgstr "Proforma/Terbuka/Terbayar Faktur"
 #. module: account
 #: field:report.invoice.created,residual:0
 msgid "Residual"
-msgstr "Sisa"
+msgstr "Tersisa"
 
 #. module: account
 #: constraint:account.period:0
@@ -145,6 +145,7 @@ msgstr "Rekonsiliasi"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referensi"
 
@@ -163,13 +164,13 @@ msgstr ""
 "menyembunyikan syarat pembayaran tanpa menghapusnya"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Perhatian!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Jurnal Lain-lain"
@@ -234,7 +235,7 @@ msgstr ""
 "ini tertera dalam tagihan"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -251,7 +252,7 @@ msgid "Belgian Reports"
 msgstr "Laporan menurut standar Belgia"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -302,7 +303,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -599,8 +600,10 @@ msgid "The accountant confirms the statement."
 msgstr "Akuntan ini mengukuhkan pernyataan tersebut."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -659,7 +662,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Urutan Utama harus berbeda dari yang sekarang !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -672,7 +675,7 @@ msgid "Tax Code Amount"
 msgstr "Jumlah Kode Pajak"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -699,8 +702,8 @@ msgid "Journal Period"
 msgstr "Periode Jurnal"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -781,6 +784,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Anda hanya dapat merubah mata uang untuk Konsep Tagihan"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Laporan Keuangan"
@@ -796,12 +800,13 @@ msgstr "Laporan Keuangan"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Jenis"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -939,12 +944,13 @@ msgid "Create 3 Months Periods"
 msgstr "Membuat Periode dalam Triwulan"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Jatuh Tempo"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1029,7 +1035,7 @@ msgstr ""
 "ini hanya akan berisi nilai dasarnya (tanpa pajak)"
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "Saya tidak dapat menempatkan kode induk untuk salinan akun ini"
@@ -1062,10 +1068,10 @@ msgid "Code"
 msgstr "Kode"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1131,7 +1137,7 @@ msgstr ""
 "lanjut tentang akun dan kekhususannya."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1179,7 +1185,7 @@ msgstr "jurnal item tidak balance"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1278,7 +1284,7 @@ msgid "The move of this entry line."
 msgstr "Perpindahan dari baris catatan ini"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1301,7 +1307,7 @@ msgid "Entry Label"
 msgstr "Judul Catatan"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1387,14 +1393,15 @@ msgid "Taxes"
 msgstr "Pajak-pajak"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Pilih periode awal dan akhir"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Laba/Rugi"
 
@@ -1449,6 +1456,7 @@ msgid "Journal Items Analysis"
 msgstr "Analisis Butir-butir Jurnal"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Para Mitra"
@@ -1473,8 +1481,10 @@ msgid "Central Journal"
 msgstr "Jurnal Pusat"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1711,6 +1721,7 @@ msgid "Separated Journal Sequences"
 msgstr "Urutan Jurnal yang terpisah"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Bertanggung Jawab"
@@ -1741,7 +1752,7 @@ msgid "Year Sum"
 msgstr "Jumlah Setahun"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1819,7 +1830,7 @@ msgid "Customer Ref:"
 msgstr "Ref. Pelanggan:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "User% s tidak memiliki hak untuk mengakses jurnal% s!"
@@ -2149,7 +2160,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2180,7 +2191,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Cari template grafik akun"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2232,7 +2243,7 @@ msgid "Description"
 msgstr "Keterangan"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2251,7 +2262,7 @@ msgid "Income Account"
 msgstr "Akun pendapatan"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Tidak ada Jurnal Akuntansi tipe of Sale / Purchase didefinisikan!"
@@ -2291,6 +2302,7 @@ msgstr "Produk Template"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2300,6 +2312,7 @@ msgstr "Produk Template"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2350,7 +2363,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2381,7 +2394,7 @@ msgid "Main Sequence"
 msgstr "Urutan Utama"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2455,7 +2468,7 @@ msgid "Account Tax Code"
 msgstr "Kode Akun Pajak"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2544,7 +2557,7 @@ msgid "Account Model Entries"
 msgstr "Catatan Contoh Akun"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2610,7 +2623,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2642,7 +2654,7 @@ msgid "Accounts"
 msgstr "Akun"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfigurasi error !"
@@ -2764,6 +2776,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2816,14 +2829,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Panduan ini akan membuat entri akuntansi yang berulang"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Tidak ada sequence yang didefinisikan di jurnal ini!"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2932,7 +2945,7 @@ msgid "Base Code Amount"
 msgstr "Dasar pengenakan pajak"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2945,7 +2958,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2983,7 +2996,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3130,7 +3143,7 @@ msgid "View"
 msgstr "Tampilan"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3322,7 +3335,7 @@ msgid "Starting Balance"
 msgstr "Saldo Awal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3376,7 +3389,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3457,6 +3470,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3503,7 +3517,7 @@ msgid "Detail"
 msgstr "Rincian"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3518,9 +3532,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3541,7 +3562,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3566,6 +3587,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3593,10 +3615,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Tanggal"
 
@@ -3613,7 +3642,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3627,7 +3655,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3639,7 +3667,7 @@ msgstr ""
 "Mohon tetapkan mitra !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3670,6 +3698,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3751,7 +3781,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3782,7 +3812,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3796,6 +3826,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3809,7 +3840,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4129,7 +4160,7 @@ msgid "Month"
 msgstr "Bulan"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4186,7 +4217,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4393,7 +4424,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4427,7 +4458,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4439,6 +4470,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Ubah"
 
@@ -4483,7 +4515,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4497,7 +4529,7 @@ msgid "Keep empty to use the income account"
 msgstr "Biarkan kosong untuk menggunkan akun pendapatan"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4525,7 +4557,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4541,7 +4573,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4593,7 +4625,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4618,11 +4650,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4759,26 +4793,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4881,7 +4913,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4908,7 +4940,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4929,6 +4961,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4972,6 +5005,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -5045,7 +5080,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -5078,6 +5113,7 @@ msgstr "Hasil rekonsiliasi"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5154,6 +5190,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5281,7 +5318,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5333,13 +5369,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5413,7 +5449,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5583,7 +5618,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5616,14 +5651,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Menghapus"
@@ -5643,7 +5678,7 @@ msgstr "Pendapatan"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Pemasok"
@@ -5673,7 +5708,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5688,7 +5723,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5784,7 +5821,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5795,8 +5832,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5837,8 +5874,8 @@ msgid "Number of Days"
 msgstr "Jumlah Hari"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5900,7 +5937,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5937,6 +5974,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6210,6 +6249,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6219,7 +6260,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6259,6 +6300,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6477,8 +6519,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6494,7 +6536,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6533,13 +6575,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Total debit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Catatan \"%s\" tidak sah !"
@@ -6607,25 +6649,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6657,8 +6700,8 @@ msgid "Printed"
 msgstr "Tercetak"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6713,7 +6756,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6868,7 +6911,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6898,7 +6941,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6966,14 +7009,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7074,8 +7117,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Apakah anda yakin ingin membuka faktur ini ?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7088,7 +7131,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Transaksi Akuntansi"
@@ -7224,7 +7267,7 @@ msgstr ""
 "pajak sendiri"
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7255,8 +7298,8 @@ msgid "Reporting"
 msgstr "Pelaporan"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7345,7 +7388,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7356,7 +7399,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7391,13 +7434,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7424,13 +7468,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Jurnal Penjualan"
@@ -7447,7 +7491,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7497,7 +7541,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7545,13 +7589,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7595,7 +7641,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7607,15 +7653,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7761,13 +7807,14 @@ msgstr "Baku"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7819,7 +7866,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7832,7 +7879,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7906,7 +7953,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7968,7 +8015,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -8014,7 +8061,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8036,7 +8083,7 @@ msgid "Choose Fiscal Year"
 msgstr "Pilih Tahun Buku"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -8123,7 +8170,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8251,7 +8298,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8330,10 +8377,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8366,7 +8415,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8389,7 +8438,7 @@ msgid "Payment Term Line"
 msgstr "Detail Termin Pembayaran"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8476,7 +8525,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8582,7 +8631,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8597,7 +8646,7 @@ msgstr ""
 "catatan dengan beberapa mata uang."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8670,7 +8719,7 @@ msgid "Contact Address"
 msgstr "Alamat Kontak"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8705,12 +8754,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8729,7 +8780,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8815,7 +8866,7 @@ msgid "Period from"
 msgstr "Dari periode"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8862,7 +8913,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8878,7 +8929,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8910,8 +8961,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8926,6 +8975,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8946,6 +8996,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8965,7 +9016,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total Kredit"
@@ -9030,6 +9081,7 @@ msgstr "Pernyataan Bank"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9111,7 +9163,7 @@ msgstr ""
 "kontra-bagian \"Piutang\"."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -9133,7 +9185,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -9155,7 +9206,7 @@ msgid "Move"
 msgstr "memindahkan"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9211,7 +9262,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9272,6 +9323,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9328,6 +9380,7 @@ msgstr "Catatan Berlangganan"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9335,6 +9388,7 @@ msgstr "Catatan Berlangganan"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9377,7 +9431,7 @@ msgid "Unreconciled"
 msgstr "Belum direkonsoliasi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9436,7 +9490,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9473,6 +9527,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9574,9 +9629,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Periode"
 
@@ -9741,6 +9798,7 @@ msgstr "Posted"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9788,7 +9846,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9824,6 +9882,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9844,6 +9903,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9858,7 +9918,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9868,6 +9930,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10021,6 +10085,7 @@ msgstr "Faktur Pembelian"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10054,6 +10119,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -10071,7 +10138,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Catatan telah direkonsiliasi"
@@ -10107,8 +10174,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10232,8 +10301,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10259,7 +10328,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10449,6 +10518,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10525,6 +10595,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Masa Depan"
 
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 42480a0f728..f76d1ed6afd 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:02+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -147,6 +147,7 @@ msgstr "Riconciliazione"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Riferimento"
 
@@ -165,13 +166,13 @@ msgstr ""
 "pagamento senza eliminarli."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Attenzione!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Sezionali vari"
@@ -236,7 +237,7 @@ msgstr ""
 "aliquote IVA collegate a questo codice imposta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -253,7 +254,7 @@ msgid "Belgian Reports"
 msgstr "Reports belgi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -303,7 +304,7 @@ msgid "St."
 msgstr "Via"
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -603,8 +604,10 @@ msgid "The accountant confirms the statement."
 msgstr "Il contabile conferma la registrazione"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -662,7 +665,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "La sequenza principale deve essere diversa dalla attuale!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -674,7 +677,7 @@ msgid "Tax Code Amount"
 msgstr "Importo codice imposta"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -701,8 +704,8 @@ msgid "Journal Period"
 msgstr "Periodo del Sezionale"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -783,6 +786,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Puoi cambiare la valuta solamente per le fatture in \"Bozza\"!"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Report finanziari"
@@ -798,12 +802,13 @@ msgstr "Report finanziari"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -939,12 +944,13 @@ msgid "Create 3 Months Periods"
 msgstr "Creazione Periodi di 3 Mesi"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Dovuto"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1029,7 +1035,7 @@ msgstr ""
 "(imposta esclusa)"
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "Non è stato trovato un codice padre per il conto template!"
@@ -1062,10 +1068,10 @@ msgid "Code"
 msgstr "Codice"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1131,7 +1137,7 @@ msgstr ""
 "informazioni ulteriori sul conto e le sue funzioni."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1179,7 +1185,7 @@ msgstr "Sbilancio nelle registrazioni contabili"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banca"
@@ -1278,7 +1284,7 @@ msgid "The move of this entry line."
 msgstr "Il movimento cui appartiene questa registrazione contabile"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1301,7 +1307,7 @@ msgid "Entry Label"
 msgstr "Descrizione della registrazione"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1388,14 +1394,15 @@ msgid "Taxes"
 msgstr "Imposte"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Seleziona un periodo di inizio e fine"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Utili e Perdite"
 
@@ -1450,6 +1457,7 @@ msgid "Journal Items Analysis"
 msgstr "Analisi Movimenti Contabili"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Partners"
@@ -1474,8 +1482,10 @@ msgid "Central Journal"
 msgstr "Sezionale centralizzato"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1712,6 +1722,7 @@ msgid "Separated Journal Sequences"
 msgstr "Sequenze Separate per Sezionale"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Responsabile"
@@ -1742,7 +1753,7 @@ msgid "Year Sum"
 msgstr "Somma anno"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1821,7 +1832,7 @@ msgid "Customer Ref:"
 msgstr "Rif. cliente:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "L'utente %s non ha diritti di accesso al Sezionale %s!"
@@ -2156,7 +2167,7 @@ msgid "Pro-forma"
 msgstr "Proforma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2184,7 +2195,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Ricerca template di piano dei conti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2241,7 +2252,7 @@ msgid "Description"
 msgstr "Descrizione"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2260,7 +2271,7 @@ msgid "Income Account"
 msgstr "Conto di ricavo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Manca un Sezionale di tipo : vendite/acquisti !"
@@ -2300,6 +2311,7 @@ msgstr "Template di prodotto"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2309,6 +2321,7 @@ msgstr "Template di prodotto"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2359,7 +2372,7 @@ msgid "Account Line"
 msgstr "Voce conto"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2393,7 +2406,7 @@ msgid "Main Sequence"
 msgstr "Sequenza principale"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2469,7 +2482,7 @@ msgid "Account Tax Code"
 msgstr "Conto imposta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2560,7 +2573,7 @@ msgid "Account Model Entries"
 msgstr "Modello voci di bilancio"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2627,7 +2640,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "Movimento contabile di riconciliazione (storno)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2659,7 +2671,7 @@ msgid "Accounts"
 msgstr "Conti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Errore di configurazione!"
@@ -2784,6 +2796,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Estratto Conto Partner Periodico"
@@ -2834,14 +2847,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Questo wizard crea voci contabili ricorrenti."
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Manca la definizione di una sequenza per il Sezionale."
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2951,7 +2964,7 @@ msgid "Base Code Amount"
 msgstr "Importo codice base"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2966,7 +2979,7 @@ msgid "Default Sale Tax"
 msgstr "Imposta di default per le vendite"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Fattura '%s' validata."
@@ -3006,7 +3019,7 @@ msgid "Fiscal Position"
 msgstr "Posizione fiscale"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3162,7 +3175,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3367,7 +3380,7 @@ msgid "Starting Balance"
 msgstr "Bilancio di apertura"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Non è stato definito alcun Partner!"
@@ -3422,7 +3435,7 @@ msgid "Chart of Tax"
 msgstr "Piano delle imposte"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3508,6 +3521,7 @@ msgstr "Quantità :"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Lunghezza periodo (giorni)"
 
@@ -3554,7 +3568,7 @@ msgid "Detail"
 msgstr "Dettaglio"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3574,9 +3588,16 @@ msgid "VAT :"
 msgstr "IVA"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3598,7 +3619,7 @@ msgid "Centralised counterpart"
 msgstr "Contropartita centralizzata"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3627,6 +3648,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3654,10 +3676,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Data"
 
@@ -3674,7 +3703,6 @@ msgstr "Annulla riconciliazione"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3688,7 +3716,7 @@ msgid "Chart of Accounts Template"
 msgstr "Template di piano dei conti"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3699,7 +3727,7 @@ msgstr ""
 "'%s' è basata sui termini di pagamento del partner!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Alcune registrazioni sono già riconciliate !"
@@ -3730,6 +3758,8 @@ msgstr "Budget"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Nessun Filtro"
 
@@ -3815,7 +3845,7 @@ msgid "Analytic Items"
 msgstr "Movimenti Anal"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Non posso cambiare la tassa !"
@@ -3846,7 +3876,7 @@ msgid "Mapping"
 msgstr "Corrispondenza"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3863,6 +3893,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3876,7 +3907,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Estratto Conto Periodico"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4217,7 +4248,7 @@ msgid "Month"
 msgstr "Mese"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4278,7 +4309,7 @@ msgid "Account Base Code"
 msgstr "Conto imponibile"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Manca un conto di spesa definito per questo prodotto: \"%s\" (id:%d)"
@@ -4493,7 +4524,7 @@ msgid "Allow Reconciliation"
 msgstr "Ammette la riconciliazione."
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4529,7 +4560,7 @@ msgid "Recurring Models"
 msgstr "Modelli per operazioni periodiche"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Errore di codifica"
@@ -4541,6 +4572,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Modifica"
 
@@ -4585,7 +4617,7 @@ msgid "Example"
 msgstr "Esempio"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4601,7 +4633,7 @@ msgid "Keep empty to use the income account"
 msgstr "Lasciare vuoto per usare il conto di ricavo"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Imposta su acquisti %.2f%%"
@@ -4629,7 +4661,7 @@ msgstr "Corrispondenza dei conti"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -4645,7 +4677,7 @@ msgid "Cancelled Invoice"
 msgstr "Fattura annullata"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4703,7 +4735,7 @@ msgid "Income Account on Product Template"
 msgstr "Conto entrate per il prodotto"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "MISC"
@@ -4730,11 +4762,13 @@ msgstr "Nuovo anno fiscale"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Fatture"
 
@@ -4877,26 +4911,24 @@ msgid "Journal Items"
 msgstr "Voci sezionale"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Errore"
@@ -5007,7 +5039,7 @@ msgid "Beginning of Period Date"
 msgstr "Inizio del periodo data"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -5033,7 +5065,7 @@ msgid "Child Tax Accounts"
 msgstr "Conti imposta figli"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Inizio periodo deve essere minore di fine periodo"
@@ -5055,6 +5087,7 @@ msgstr "Bilancio analitico -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5098,6 +5131,8 @@ msgstr "Tipo di periodo"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Pagamenti"
 
@@ -5175,7 +5210,7 @@ msgid "Line 1:"
 msgstr "Linea 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Errore di Integrità!"
@@ -5208,6 +5243,7 @@ msgstr "Risultato riconciliato"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Bilancio"
@@ -5284,6 +5320,7 @@ msgstr "Report"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5414,7 +5451,6 @@ msgstr "Account Common Account Report"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Comunicazione"
 
@@ -5468,13 +5504,13 @@ msgid "End of Year Entries Journal"
 msgstr "Registrazioni di sezionale di fine anno"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5550,7 +5586,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Fatture e Note di Credito clienti"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5725,7 +5760,7 @@ msgid "Generate Opening Entries"
 msgstr "Genera scritture di apertura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Gia' riconciliato !"
@@ -5758,14 +5793,14 @@ msgid "Child Accounts"
 msgstr "Conto figlio"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Movimento nome (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Storno"
@@ -5785,7 +5820,7 @@ msgstr "Entrata"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Fornitore"
@@ -5815,7 +5850,7 @@ msgid "Account n°"
 msgstr "Conto n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Riferimenti vari"
@@ -5830,7 +5865,9 @@ msgstr "Valorizzazione"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Conti di credito e debito"
@@ -5937,7 +5974,7 @@ msgid "Filter by"
 msgstr "Filtra per"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "L'espressione \"%(...)s\" nel modello è errata!"
@@ -5948,8 +5985,8 @@ msgid "Entry Date"
 msgstr "Data di Registrazione"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Non si può usare un conto non attivo!"
@@ -5991,8 +6028,8 @@ msgid "Number of Days"
 msgstr "Numero di Giorni"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -6054,7 +6091,7 @@ msgid "Multipication factor for Base code"
 msgstr "Fattore di moltiplicazione per l'imponibile"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "non implementato"
@@ -6093,6 +6130,8 @@ msgstr "Analisi scritture analitiche"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Passato"
 
@@ -6384,6 +6423,8 @@ msgstr "Percentuale"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Sezionale & Partner"
 
@@ -6393,7 +6434,7 @@ msgid "Power"
 msgstr "Power"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Non è possibile generare un codice sezionale inutilizzato."
@@ -6435,6 +6476,7 @@ msgid "Applicable Type"
 msgstr "Tipi applicabili"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "riferimento fattura"
@@ -6671,8 +6713,8 @@ msgstr ""
 "Non è possibile rimuovere un conto contenente registrazioni contabili."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Registrazioni: "
@@ -6688,7 +6730,7 @@ msgid "Currency of the related account journal."
 msgstr "Valuta del relativo sezionale"
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Non si puo' creaare un movimento fra aziende diverse"
@@ -6736,13 +6778,13 @@ msgstr "Stato in \"bozza\""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Totale debiti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "La voce \"%s\" non è valida !"
@@ -6817,25 +6859,26 @@ msgstr "Utili & Perdite (Conti Attivi)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6867,8 +6910,8 @@ msgid "Printed"
 msgstr "Stampato"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Errore :"
@@ -6932,7 +6975,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Mostra il libro mastro con un partner per pagina"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -7101,7 +7144,7 @@ msgid "Total:"
 msgstr "Totale:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7137,7 +7180,7 @@ msgid "Taxes used in Sales"
 msgstr "Imposte utilizzate in Vendite"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7217,7 +7260,7 @@ msgid "Source Document"
 msgstr "Documento di origine"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
@@ -7225,7 +7268,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7334,8 +7377,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Sei sicuro di voler aprire questa fattura?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7350,7 +7393,7 @@ msgid "Opening Entries Expense Account"
 msgstr "Movimenti aperti su conto di spesa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Registrazioni contabili"
@@ -7490,7 +7533,7 @@ msgstr ""
 "dominio personalizzato."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Bisognerebbe aver scelto periodi relativi alla stessa azienda"
@@ -7521,8 +7564,8 @@ msgid "Reporting"
 msgstr "Reportistica"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7619,7 +7662,7 @@ msgid "Sign on Reports"
 msgstr "Segno nei report"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7631,7 +7674,7 @@ msgid "Root/View"
 msgstr "Radice/Vista"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7666,13 +7709,14 @@ msgid "Optional Information"
 msgstr "Informazioni aggiuntive"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Il sezionale deve avere un conto predefinito di credito e debito"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7702,13 +7746,13 @@ msgid "Maturity Date"
 msgstr "Data di scadenza"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Conto sbagliato !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Sezionale Vendite"
@@ -7725,7 +7769,7 @@ msgid "Invoice Tax"
 msgstr "Imposta della fattura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Nessun numero pezzo!"
@@ -7780,7 +7824,7 @@ msgstr "A"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Rettifica Valuta"
@@ -7834,13 +7878,15 @@ msgstr "Maggio"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Conti di Debito"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "Imposte globali definite ma non presenti nelle voci fattura!"
@@ -7886,7 +7932,7 @@ msgstr "Nome Report"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Contante"
@@ -7898,15 +7944,15 @@ msgid "Account Destination"
 msgstr "Conto di Destinazione"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -8063,13 +8109,14 @@ msgstr "Fisso"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Attenzione !"
@@ -8121,7 +8168,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Scegliere una valuta da applicare alla fattura"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -8135,7 +8182,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Non è possibile eseguire %s bozza/proforma/cancella fattura."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Mancano voci nella fattura !"
@@ -8219,7 +8266,7 @@ msgid "Deferral Method"
 msgstr "Metodo riapertura conti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "La fattura '%s' e' pagata"
@@ -8287,7 +8334,7 @@ msgid "Associated Partner"
 msgstr "Partner associato"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Bisogna prima selezionare un partner!"
@@ -8347,7 +8394,7 @@ msgstr ""
 "della propria Nazione."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8371,7 +8418,7 @@ msgid "Choose Fiscal Year"
 msgstr "Seleziona l'Anno Fiscale"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Sezionale Note di Credito Fornitori"
@@ -8464,7 +8511,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Codice per il calcolo delle tasse incluse nel prezzo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8606,7 +8653,7 @@ msgid "current month"
 msgstr "mese corrente"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8695,10 +8742,12 @@ msgstr "Sezionale Storni"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtra per"
 
@@ -8737,7 +8786,7 @@ msgid "The partner account used for this invoice."
 msgstr "Il conto del partner utilizzato per questa fattura."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Imposta %.2f%%"
@@ -8760,7 +8809,7 @@ msgid "Payment Term Line"
 msgstr "Riga termine di pagamento"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Sezionale Acquisti"
@@ -8847,7 +8896,7 @@ msgid "Unpaid Invoices"
 msgstr "Fatture Non Pagate"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8958,7 +9007,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Lasciare vuoto per tutti gli anni fiscali aperti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8973,7 +9022,7 @@ msgstr ""
 "L'importo espresso in un'altra valuta opzionale, se c'è una voce multivaluta."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -9060,7 +9109,7 @@ msgid "Contact Address"
 msgstr "Indirizzo contatto"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Modello errato !"
@@ -9100,12 +9149,14 @@ msgstr "Contratti"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "sconosciuto"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Sezionale delle voci di apertura"
@@ -9127,7 +9178,7 @@ msgstr ""
 "prospetto Utili & Perdite"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -9219,7 +9270,7 @@ msgid "Period from"
 msgstr "Periodo da"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Sezionale Note di Credito"
@@ -9266,7 +9317,7 @@ msgid "Purchase Tax(%)"
 msgstr "Imposta acquisti (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Creare voci della fattura"
@@ -9282,7 +9333,7 @@ msgid "Display Detail"
 msgstr "Mostra dettagli"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9321,8 +9372,6 @@ msgstr "Fine del periodo"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Report Finanziari"
@@ -9337,6 +9386,7 @@ msgstr "Report Finanziari"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9357,6 +9407,7 @@ msgstr "Periodo di inizio"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Analisi della direzione"
 
@@ -9376,7 +9427,7 @@ msgstr "Vista sezionale"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Totale crediti"
@@ -9448,6 +9499,7 @@ msgstr "Estratti Conto Bancari"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9529,7 +9581,7 @@ msgstr ""
 "Credito\"."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Occorre scegliere un conto da riconciliare"
@@ -9557,7 +9609,6 @@ msgstr ""
 "delle attività dell'azienda per un determinato periodo."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filtra per"
@@ -9579,7 +9630,7 @@ msgid "Move"
 msgstr "Movimento contabile"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9638,7 +9689,7 @@ msgid "Consolidated Children"
 msgstr "Sottoconti consolidati"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9703,6 +9754,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9765,6 +9817,7 @@ msgstr "Sottoscrizione Scrittura"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9772,6 +9825,7 @@ msgstr "Sottoscrizione Scrittura"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9816,7 +9870,7 @@ msgid "Unreconciled"
 msgstr "Non riconciliate"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Totale errato !"
@@ -9884,7 +9938,7 @@ msgid "Comparison"
 msgstr "Confronto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Errore sconosciuto"
@@ -9923,6 +9977,7 @@ msgstr "Convalida movimento in conto"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10031,9 +10086,11 @@ msgstr "Registrazioni analitiche degli ultimi 30 giorni"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Periodi"
 
@@ -10205,6 +10262,7 @@ msgstr "Confermato"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10252,7 +10310,7 @@ msgid "No detail"
 msgstr "Nessun dettagio"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Non e' definito un conto per incassi per il prodotto: \"%s\" (id:%d)"
@@ -10289,6 +10347,7 @@ msgid "Verification Total"
 msgstr "Verifica del Totale"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10309,6 +10368,7 @@ msgstr "Sezionale : Tutti"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10323,7 +10383,9 @@ msgstr "Sezionale : Tutti"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10333,6 +10395,8 @@ msgstr "Sezionale : Tutti"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10496,6 +10560,7 @@ msgstr "Fattura fornitore"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10529,6 +10594,8 @@ msgstr "Errore! Non puoi creare un modello di conto ricorsivo"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Numero Registrazione Contabile"
 
@@ -10548,7 +10615,7 @@ msgstr ""
 "contabili  da 'Chiuso' ad un qualsiasi altro tipo!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "La registrazione è già stata riconciliata"
@@ -10590,8 +10657,10 @@ msgstr ""
 "ammortizzati."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Con i movimenti"
@@ -10717,8 +10786,8 @@ msgid "Statistic Reports"
 msgstr "Report statistici"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Conto sbagliato !"
@@ -10750,7 +10819,7 @@ msgid "Accounts Mapping"
 msgstr "Corrispondenza dei conti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "La fattura '%s'  aspetta di esere validata"
@@ -11012,6 +11081,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -11090,6 +11160,8 @@ msgstr "Scadenza"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Futuro"
 
diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po
index 1a96374656e..d1d00a194d5 100644
--- a/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:02+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr "消し込み"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "参照"
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr "アクティブ項目がFalseに設定されている場合、支払条件を削除することなく非表示にできます。"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "警告"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "その他の仕訳帳"
@@ -224,7 +225,7 @@ msgid ""
 msgstr "この税金コードに関連するどんな消費税項目も請求書上に表示されることを望まない場合は、このボックスをチェックして下さい。"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "請求書 %s は部分的に支払われます：%s%s / %s%s（%s%s 残り）"
@@ -240,7 +241,7 @@ msgid "Belgian Reports"
 msgstr "ベルギーのレポート"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "閉鎖仕訳帳のエントリーを追加 / 削除することはできません。"
@@ -288,7 +289,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "請求書行のアカウントの会社が請求書の会社と一致しません。"
@@ -573,8 +574,10 @@ msgid "The accountant confirms the statement."
 msgstr "会計士は取引明細書を確認します。"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -630,7 +633,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "主となる順序は現在と異なる必要があります。"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "所定の日付のために期間が見つからないか、複数の期間が見つかりました。"
@@ -641,7 +644,7 @@ msgid "Tax Code Amount"
 msgstr "税金コード金額"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -668,8 +671,8 @@ msgid "Journal Period"
 msgstr "仕訳帳期間"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "エントリーを消し込みするために、会社は全てのエントリーに対して同じであるべきです。"
@@ -746,6 +749,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "ドラフト請求書に対しては通貨のみ変更できます。"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "財務レポート"
@@ -761,12 +765,13 @@ msgstr "財務レポート"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "タイプ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -896,12 +901,13 @@ msgid "Create 3 Months Periods"
 msgstr "3ヶ月期間の作成"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "期日"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -981,7 +987,7 @@ msgstr ""
 "。"
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "テンプレートアカウントのための親コードが見つかりません。"
@@ -1014,10 +1020,10 @@ msgid "Code"
 msgstr "コード"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1079,7 +1085,7 @@ msgid ""
 msgstr "これらのタイプはあなたの国に従って定義されています。タイプはアカウントとその特殊性についての多くの情報を含んでいます。"
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1127,7 +1133,7 @@ msgstr "不均衡状態の仕訳帳項目"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "銀行"
@@ -1221,7 +1227,7 @@ msgid "The move of this entry line."
 msgstr "このエントリー行を移動します。"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1242,7 +1248,7 @@ msgid "Entry Label"
 msgstr "エントリーラベル"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "この期間の仕訳帳エントリーの変更や削除はできません。"
@@ -1327,14 +1333,15 @@ msgid "Taxes"
 msgstr "税金"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "開始、終了期間を選択"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "損益"
 
@@ -1389,6 +1396,7 @@ msgid "Journal Items Analysis"
 msgstr "仕訳帳項目分析"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "パートナ"
@@ -1413,8 +1421,10 @@ msgid "Central Journal"
 msgstr "中央仕訳帳"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1643,6 +1653,7 @@ msgid "Separated Journal Sequences"
 msgstr "切り離された仕訳帳順序"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "担当"
@@ -1671,7 +1682,7 @@ msgid "Year Sum"
 msgstr "年間合計"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1746,7 +1757,7 @@ msgid "Customer Ref:"
 msgstr "顧客の参照："
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "ユーザ %s は仕訳帳 %s にアクセスする権限を持っていません。"
@@ -2066,7 +2077,7 @@ msgid "Pro-forma"
 msgstr "プロフォーマ"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2093,7 +2104,7 @@ msgid "Search Chart of Account Templates"
 msgstr "勘定科目表テンプレートの検索"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2146,7 +2157,7 @@ msgid "Description"
 msgstr "説明"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2165,7 +2176,7 @@ msgid "Income Account"
 msgstr "損益勘定"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "会計仕訳帳売上 / 仕入タイプの定義がないことはありません。"
@@ -2205,6 +2216,7 @@ msgstr "製品テンプレート"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2214,6 +2226,7 @@ msgstr "製品テンプレート"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2264,7 +2277,7 @@ msgid "Account Line"
 msgstr "アカウント行"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2296,7 +2309,7 @@ msgid "Main Sequence"
 msgstr "主順序"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2370,7 +2383,7 @@ msgid "Account Tax Code"
 msgstr "税金コードアカウント"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2458,7 +2471,7 @@ msgid "Account Model Entries"
 msgstr "アカウントモデルエントリー"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2519,7 +2532,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "アカウント移動行の消し込み（償却）"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2551,7 +2563,7 @@ msgid "Accounts"
 msgstr "アカウント"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "設定エラー"
@@ -2671,6 +2683,7 @@ msgstr "所定の日付より前にシステムに入力された内容に基づ
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "パートナ残高年齢表"
@@ -2720,14 +2733,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "このウィザードは定期会計エントリーを作成します。"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "この仕訳帳には順序が定義されていません。"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2831,7 +2844,7 @@ msgid "Base Code Amount"
 msgstr "基本コードの金額"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2844,7 +2857,7 @@ msgid "Default Sale Tax"
 msgstr "デフォルト消費税（売上）"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "請求書 %s は検証されます。"
@@ -2882,7 +2895,7 @@ msgid "Fiscal Position"
 msgstr "会計ポジション"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3033,7 +3046,7 @@ msgid "View"
 msgstr "ビュー"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3231,7 +3244,7 @@ msgid "Starting Balance"
 msgstr "期首残高"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "パートナが定義されていません。"
@@ -3285,7 +3298,7 @@ msgid "Chart of Tax"
 msgstr "税金チャート"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "決算残高は計算された残高と等しくなければなりません。"
@@ -3366,6 +3379,7 @@ msgstr "数量"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "期間の長さ（日数）"
 
@@ -3412,7 +3426,7 @@ msgid "Detail"
 msgstr "詳細"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3430,9 +3444,16 @@ msgid "VAT :"
 msgstr "消費税："
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3453,7 +3474,7 @@ msgid "Centralised counterpart"
 msgstr "相手方の一元化"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr "ビューアカウントでは仕訳帳項目を作ることはできません %s %s"
@@ -3478,6 +3499,7 @@ msgstr "（会計年度を選択しない場合は、全ての開いている会
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3505,10 +3527,17 @@ msgstr "（会計年度を選択しない場合は、全ての開いている会
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "日付"
 
@@ -3525,7 +3554,6 @@ msgstr "未消し込み"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3539,7 +3567,7 @@ msgid "Chart of Accounts Template"
 msgstr "勘定科目表テンプレート"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3550,7 +3578,7 @@ msgstr ""
 "その上にパートナを定義して下さい。"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "幾つかのエントリーは既に消し込み済です。"
@@ -3581,6 +3609,8 @@ msgstr "予算"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "フィルタなし"
 
@@ -3662,7 +3692,7 @@ msgid "Analytic Items"
 msgstr "分析項目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "税金を変更することはできません。"
@@ -3693,7 +3723,7 @@ msgid "Mapping"
 msgstr "マッピング"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3707,6 +3737,7 @@ msgstr "一元化された仕訳帳上で請求書の作成はできません。
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3720,7 +3751,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "アカウント年齢試算表レポート"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "閉鎖アカウントで仕訳帳項目の作成はできません %s %s"
@@ -4042,7 +4073,7 @@ msgid "Month"
 msgstr "月"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4101,7 +4132,7 @@ msgid "Account Base Code"
 msgstr "アカウント基本コード"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "この製品のために定義された費用勘定がありません：%s（ID：%d）"
@@ -4312,7 +4343,7 @@ msgid "Allow Reconciliation"
 msgstr "消し込みの許可"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4346,7 +4377,7 @@ msgid "Recurring Models"
 msgstr "循環モデル"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "エンコーディングエラー"
@@ -4358,6 +4389,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "変更"
 
@@ -4402,7 +4434,7 @@ msgid "Example"
 msgstr "例"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4418,7 +4450,7 @@ msgid "Keep empty to use the income account"
 msgstr "収益勘定を使うためは空のままとします。"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "消費税（仕入） %.2f%%"
@@ -4446,7 +4478,7 @@ msgstr "アカウントマッピング"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "顧客"
@@ -4462,7 +4494,7 @@ msgid "Cancelled Invoice"
 msgstr "キャンセル済請求書"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4516,7 +4548,7 @@ msgid "Income Account on Product Template"
 msgstr "製品テンプレート上の損益勘定"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "その他"
@@ -4541,11 +4573,13 @@ msgstr "新会計年度"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "請求書"
 
@@ -4684,26 +4718,24 @@ msgid "Journal Items"
 msgstr "仕訳帳項目"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "エラー"
@@ -4807,7 +4839,7 @@ msgid "Beginning of Period Date"
 msgstr "期首日"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4833,7 +4865,7 @@ msgid "Child Tax Accounts"
 msgstr "子税金アカウント"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "期首日は期末日より小さくなければなりません。"
@@ -4854,6 +4886,7 @@ msgstr "分析残高 -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4897,6 +4930,8 @@ msgstr "期間のタイプ"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "支払"
 
@@ -4972,7 +5007,7 @@ msgid "Line 1:"
 msgstr "行１："
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "整合性エラー。"
@@ -5005,6 +5040,7 @@ msgstr "消し込み結果"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "貸借対照表"
@@ -5081,6 +5117,7 @@ msgstr "レポート"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5208,7 +5245,6 @@ msgstr "アカウント共通アカウントレポート"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "通信"
 
@@ -5260,13 +5296,13 @@ msgid "End of Year Entries Journal"
 msgstr "年度エントリー仕訳帳の末尾"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5341,7 +5377,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "顧客請求書と返金"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5508,7 +5543,7 @@ msgid "Generate Opening Entries"
 msgstr "開始エントリーの生成"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "既に消し込み済です。"
@@ -5541,14 +5576,14 @@ msgid "Child Accounts"
 msgstr "子アカウント"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "移動名（ID）：%s（%s）"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "償却"
@@ -5568,7 +5603,7 @@ msgstr "収入"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "仕入先"
@@ -5598,7 +5633,7 @@ msgid "Account n°"
 msgstr "アカウント番号"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "自由参照"
@@ -5613,7 +5648,9 @@ msgstr "評価"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "売掛金と買掛金"
@@ -5716,7 +5753,7 @@ msgid "Filter by"
 msgstr "フィルタ"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "モデルの中に誤った式があります：%(...)s"
@@ -5727,8 +5764,8 @@ msgid "Entry Date"
 msgstr "入力日"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "非アクティブなアカウントを使うことはできません。"
@@ -5769,8 +5806,8 @@ msgid "Number of Days"
 msgstr "日数"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5832,7 +5869,7 @@ msgid "Multipication factor for Base code"
 msgstr "基本コードの倍率"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "未実装"
@@ -5869,6 +5906,8 @@ msgstr "分析エントリーの分析"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "過去"
 
@@ -6148,6 +6187,8 @@ msgstr "パーセンテージ"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "仕訳帳とパートナ"
 
@@ -6157,7 +6198,7 @@ msgid "Power"
 msgstr "電力"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6197,6 +6238,7 @@ msgid "Applicable Type"
 msgstr "適切なタイプ"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "請求書参照"
@@ -6421,8 +6463,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "仕訳帳項目を含むアカウントは削除できません。"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "エントリー： "
@@ -6438,7 +6480,7 @@ msgid "Currency of the related account journal."
 msgstr "関連するアカウント仕訳帳の通貨です。"
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "異なる会社の間に移動の作成はできませんでした。"
@@ -6481,13 +6523,13 @@ msgstr "ドラフト状態"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "借方合計"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "エントリー %s は有効ではありません。"
@@ -6555,25 +6597,26 @@ msgstr "損益計算書（費用勘定）"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6605,8 +6648,8 @@ msgid "Printed"
 msgstr "印刷済"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "エラー："
@@ -6664,7 +6707,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6819,7 +6862,7 @@ msgid "Total:"
 msgstr "合計:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6857,7 +6900,7 @@ msgid "Taxes used in Sales"
 msgstr "売上で使われる税金"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6930,14 +6973,14 @@ msgid "Source Document"
 msgstr "基となるドキュメント"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "記帳された仕訳帳エントリー %s を削除することはできません。"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7037,8 +7080,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "この請求書を本当に開きますか？"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7051,7 +7094,7 @@ msgid "Opening Entries Expense Account"
 msgstr "費用勘定の開始エントリー"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "会計エントリー"
@@ -7184,7 +7227,7 @@ msgid ""
 msgstr "この項目は、カスタムドメイン内に特別な税金を作成することを許された開発者によって、あなた自身のモジュールを開発する場合にのみ使われます"
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "同じ会社に属する期間を選択すべきです。"
@@ -7215,8 +7258,8 @@ msgid "Reporting"
 msgstr "レポート"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7307,7 +7350,7 @@ msgid "Sign on Reports"
 msgstr "レポートに署名"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr "開始エントリーを生成するための期間が見つかりませんでした。"
@@ -7318,7 +7361,7 @@ msgid "Root/View"
 msgstr "ルート / ビュー"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7353,13 +7396,14 @@ msgid "Optional Information"
 msgstr "オプション情報"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "仕訳帳はデフォルトの貸方、借方アカウントを持つ必要があります。"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7386,13 +7430,13 @@ msgid "Maturity Date"
 msgstr "満期日"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "良質でないアカウント"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "売上仕訳帳"
@@ -7409,7 +7453,7 @@ msgid "Invoice Tax"
 msgstr "請求書税金"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "ピース番号がありません。"
@@ -7462,7 +7506,7 @@ msgstr "まで"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "通貨調整"
@@ -7512,13 +7556,15 @@ msgstr "5月"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "買掛金"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "全体的な税金は定義されていますが、請求書行にそれらが存在しません。"
@@ -7562,7 +7608,7 @@ msgstr "レポート名"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "現金"
@@ -7574,15 +7620,15 @@ msgid "Account Destination"
 msgstr "アカウントの宛先"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7733,13 +7779,14 @@ msgstr "固定"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "警告"
@@ -7791,7 +7838,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "請求書に適用する通貨の選択"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7804,7 +7851,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "請求書 %s はドラフト / プロフォーマ / キャンセルできません。"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "請求書行がありません。"
@@ -7883,7 +7930,7 @@ msgid "Deferral Method"
 msgstr "繰延法"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "請求書 %s は支払済です。"
@@ -7945,7 +7992,7 @@ msgid "Associated Partner"
 msgstr "関連パートナ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "最初にパートナを選択して下さい。"
@@ -7996,7 +8043,7 @@ msgid ""
 msgstr "税金のチャートは定期税金計算書を生成するために使用されます。国に応じた法律上の計算書に関連したコードとともに税金が表示されます。"
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8018,7 +8065,7 @@ msgid "Choose Fiscal Year"
 msgstr "会計年度の選択"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "仕入返金仕訳帳"
@@ -8105,7 +8152,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "税込価格の計算コード"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8238,7 +8285,7 @@ msgid "current month"
 msgstr "今月"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8322,10 +8369,12 @@ msgstr "仕訳帳の返金"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "フィルタ"
 
@@ -8360,7 +8409,7 @@ msgid "The partner account used for this invoice."
 msgstr "パートナアカウントはこの請求書に使用されています。"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "税金 %.2f%%"
@@ -8383,7 +8432,7 @@ msgid "Payment Term Line"
 msgstr "支払条件行"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "仕入仕訳帳"
@@ -8468,7 +8517,7 @@ msgid "Unpaid Invoices"
 msgstr "未払請求書"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr "仕入先の支払条件は支払条件行を持っていません。"
@@ -8574,7 +8623,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "全ての開いている会計年度は空に保つ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "一元化のためのアカウントの移動（%s）が確認されました。"
@@ -8587,7 +8636,7 @@ msgid ""
 msgstr "多通貨エントリーの場合は金額はオプションである他の通貨により表わされます。"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8666,7 +8715,7 @@ msgid "Contact Address"
 msgstr "コンタクト先住所"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "誤ったモデルです。"
@@ -8703,12 +8752,14 @@ msgstr "契約"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "不明"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "仕訳帳の開始エントリー"
@@ -8728,7 +8779,7 @@ msgstr ""
 "このアカウントは損益計算書から計算された利益 / 損失を転送（利益の場合は金額は加算され、損失であれば減算されます）するために使われます。"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "この請求書と関連する仕訳帳上に順序を定義して下さい。"
@@ -8815,7 +8866,7 @@ msgid "Period from"
 msgstr "期間の開始日"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "売上返金仕訳帳"
@@ -8862,7 +8913,7 @@ msgid "Purchase Tax(%)"
 msgstr "消費税（仕入）（%）"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "いくらかの請求書行を作成して下さい。"
@@ -8878,7 +8929,7 @@ msgid "Display Detail"
 msgstr "詳細情報の表示"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8912,8 +8963,6 @@ msgstr "期末日"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "財務レポート"
@@ -8928,6 +8977,7 @@ msgstr "財務レポート"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8948,6 +8998,7 @@ msgstr "期首日"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "分析指示"
 
@@ -8967,7 +9018,7 @@ msgstr "仕訳帳ビュー"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "合計貸方"
@@ -9034,6 +9085,7 @@ msgstr "銀行取引明細書"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9111,7 +9163,7 @@ msgstr ""
 "択します。それから、損益勘定のエントリー行を開始します。OpenERPはこのアカウントに関係する税金と相手方の売掛金を自動的に提案します。"
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "消し込みのためにアカウントを選択する必要があります。"
@@ -9135,7 +9187,6 @@ msgstr ""
 "期間を作成して管理します。そして、期間は閉じられるべきなのか、特定の期間にわたる会社の活動に応じて開いたままにしておくのかを決めます。"
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "フィルタ"
@@ -9157,7 +9208,7 @@ msgid "Move"
 msgstr "移動"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "税金を変更することはできません。行を削除して再作成する必要があります。"
@@ -9215,7 +9266,7 @@ msgid "Consolidated Children"
 msgstr "統合された子"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9276,6 +9327,7 @@ msgstr "期首日 / 期末日が定義されていません。それらを作成
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9335,6 +9387,7 @@ msgstr "サブスクリプションエントリー"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9342,6 +9395,7 @@ msgstr "サブスクリプションエントリー"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9385,7 +9439,7 @@ msgid "Unreconciled"
 msgstr "未消し込み"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "合計が誤っています。"
@@ -9447,7 +9501,7 @@ msgid "Comparison"
 msgstr "比較"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "不明なエラー"
@@ -9484,6 +9538,7 @@ msgstr "アカウント移動の検証"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9586,9 +9641,11 @@ msgstr "過去30日間の分析エントリー"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "期間"
 
@@ -9752,6 +9809,7 @@ msgstr "記帳済"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9799,7 +9857,7 @@ msgid "No detail"
 msgstr "詳細なし"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "この製品のために定義された損益勘定がありません：%s（ID：%d）"
@@ -9835,6 +9893,7 @@ msgid "Verification Total"
 msgstr "検証合計"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9855,6 +9914,7 @@ msgstr "仕訳帳：全て"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9869,7 +9929,9 @@ msgstr "仕訳帳：全て"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9879,6 +9941,8 @@ msgstr "仕訳帳：全て"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10034,6 +10098,7 @@ msgstr "仕入先請求書"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10067,6 +10132,8 @@ msgstr "エラー。再帰的なアカウントテンプレートの作成はで
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "仕訳帳エントリー番号"
 
@@ -10084,7 +10151,7 @@ msgid ""
 msgstr "アカウントタイプは閉鎖のものから他のタイプには変更できません。それは仕訳帳項目を含んでいます。"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "エントリーは既に消し込み済です。"
@@ -10123,8 +10190,10 @@ msgstr ""
 "貸方計算のため）です。閉鎖は原価償却のためのアカウントです。"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "変動"
@@ -10242,8 +10311,8 @@ msgid "Statistic Reports"
 msgstr "統計情報レポート"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "誤ったアカウントです。"
@@ -10272,7 +10341,7 @@ msgid "Accounts Mapping"
 msgstr "アカウントマッピング"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "請求書 %s は検証待ちです。"
@@ -10530,6 +10599,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10606,6 +10676,8 @@ msgstr "満期"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "将来"
 
diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po
index f2a4108c0a7..21906fdebe9 100644
--- a/addons/account/i18n/kab.po
+++ b/addons/account/i18n/kab.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:02+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Tamselyut"
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/kk.po b/addons/account/i18n/kk.po
index 276dcfbf453..c22d52e65d7 100644
--- a/addons/account/i18n/kk.po
+++ b/addons/account/i18n/kk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:02+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Сілтеме"
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Түрі"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Мерзімі"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr "Коды"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr "Сипаттамасы"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr "Тіркелгілер"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po
index 48d31016ebb..97190afb1c9 100644
--- a/addons/account/i18n/ko.po
+++ b/addons/account/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:02+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr ""
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr "코드"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr "계정 세금 코드"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "통합성 오류!"
@@ -4921,6 +4956,7 @@ msgstr "재조정 결과"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr "퍼센트"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr "합계:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "컨트롤을 위한 시작 및 종료 밸런스 설정"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "현금"
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr "다중 통화 엔트리의 경우, 선택적인 다른 통화로 표현된 금액"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "기간"
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "무브먼트와 함께"
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/lo.po b/addons/account/i18n/lo.po
index 7b8fce547bf..f799422d5d4 100644
--- a/addons/account/i18n/lo.po
+++ b/addons/account/i18n/lo.po
@@ -8,20 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-18 17:01+0000\n"
+"PO-Revision-Date: 2012-08-20 18:21+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:02+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "ເດືອນແລ້ວນີ້"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -71,7 +71,7 @@ msgstr ""
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr "ເງີນຕາສໍາລັບບັນຊີ"
+msgstr "ເງີນຕາສຳລັບບັນຊີ"
 
 #. module: account
 #: view:account.tax:0
@@ -122,7 +122,7 @@ msgstr ""
 #: report:account.invoice:0
 #: field:account.invoice.line,origin:0
 msgid "Origin"
-msgstr "ຮາກຕົ້້ນ"
+msgstr "ຮາກຕົ້ນ"
 
 #. module: account
 #: view:account.account:0
@@ -131,7 +131,7 @@ msgstr "ຮາກຕົ້້ນ"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr ""
+msgstr "ສົມຕໍ່"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr ""
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "ລະວັງ !"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -299,7 +300,7 @@ msgstr "ຊື່ຫ້ອງ"
 msgid ""
 "Installs localized accounting charts to match as closely as possible the "
 "accounting needs of your company based on your country."
-msgstr ""
+msgstr "ຕິດຕັ້ງ"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:63
@@ -314,7 +315,7 @@ msgstr "ບໍ່ສາມາດຄົ້ນພົບລາຍວັນບັນ
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr ""
+msgstr "ບັນຊີຍັງບໍ່ທັນສົມຕໍ່"
 
 #. module: account
 #: view:product.product:0
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po
index 1b46ff09453..27f02e25101 100644
--- a/addons/account/i18n/lt.po
+++ b/addons/account/i18n/lt.po
@@ -13,14 +13,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:03+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "praeitą mėnesį"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -141,6 +141,7 @@ msgstr "Sugretinti"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Nuoroda"
 
@@ -159,13 +160,13 @@ msgstr ""
 "terminą jo nepašalinus."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Įspėjimas!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -184,7 +185,7 @@ msgstr "Visi analitiniai įrašai"
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
-msgstr ""
+msgstr "Stulpelio pavadinimas"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:95
@@ -227,7 +228,7 @@ msgstr ""
 "mokesčio kodu būtų rodomas sąskaitoje faktūroje."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -243,7 +244,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Jūs negalite pridėti/keisti įrašų uždarytame žurnale."
@@ -271,7 +272,7 @@ msgstr "Pasirinktinas pasikartojančių įrašų kūrimas"
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscalyear"
-msgstr ""
+msgstr "Uždaryti Finansinius Metus"
 
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
@@ -289,7 +290,7 @@ msgid "St."
 msgstr "g."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -381,7 +382,7 @@ msgstr "Sukūrimo data"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr ""
+msgstr "Pirkimų grąžinimas"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -488,7 +489,7 @@ msgstr "Žurnalas"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
 msgid "Confirm the selected invoices"
-msgstr ""
+msgstr "Patvirtinti pasirinktas sąskaitas"
 
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
@@ -516,7 +517,7 @@ msgstr ""
 #: help:account.vat.declaration,chart_account_id:0
 #: help:accounting.report,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "Pasirinkite sąskaitų planą"
 
 #. module: account
 #: sql_constraint:res.company:0
@@ -526,7 +527,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr ""
+msgstr "Sąskaitos grąžinimas"
 
 #. module: account
 #: report:account.overdue:0
@@ -563,8 +564,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -622,7 +625,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -633,7 +636,7 @@ msgid "Tax Code Amount"
 msgstr "Mokesčio kodo suma"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -660,8 +663,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -676,7 +679,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr ""
+msgstr "Didžiosios Knygos Ataskaita"
 
 #. module: account
 #: view:account.invoice:0
@@ -738,6 +741,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -753,12 +757,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tipas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -884,12 +889,13 @@ msgid "Create 3 Months Periods"
 msgstr "Sukurti 3 mėnesių periodus"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Iki"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -967,7 +973,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1000,10 +1006,10 @@ msgid "Code"
 msgstr "Kodas"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1065,7 +1071,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1113,7 +1119,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1205,7 +1211,7 @@ msgid "The move of this entry line."
 msgstr "Šio įrašo eilutės perkėlimas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1226,7 +1232,7 @@ msgid "Entry Label"
 msgstr "Įrašo žymė"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1311,14 +1317,15 @@ msgid "Taxes"
 msgstr "Mokesčiai"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1373,6 +1380,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1397,8 +1405,10 @@ msgid "Central Journal"
 msgstr "Centrinis žurnalas"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1548,7 +1558,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr ""
+msgstr "Nepatvirtintos įrašo eilutės"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1623,6 +1633,7 @@ msgid "Separated Journal Sequences"
 msgstr "Atskiros žurnalo sekos"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1651,7 +1662,7 @@ msgid "Year Sum"
 msgstr "Metinė suma"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1724,7 +1735,7 @@ msgid "Customer Ref:"
 msgstr "Kliento nuoroda"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2047,7 +2058,7 @@ msgid "Pro-forma"
 msgstr "Išankstinė sąskaita"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2076,7 +2087,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2125,7 +2136,7 @@ msgid "Description"
 msgstr "Aprašymas"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2144,7 +2155,7 @@ msgid "Income Account"
 msgstr "Pajamų sąskaita"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2184,6 +2195,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2193,6 +2205,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2243,7 +2256,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2274,7 +2287,7 @@ msgid "Main Sequence"
 msgstr "Pagrindinė seka"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2348,7 +2361,7 @@ msgid "Account Tax Code"
 msgstr "Sąskaitos mokesčio kodas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2429,7 +2442,7 @@ msgid "Account Model Entries"
 msgstr "Sąskaitos modelio įrašai"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2488,7 +2501,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2520,7 +2532,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2640,6 +2652,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Partnerio skolų balansas"
@@ -2687,14 +2700,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2724,7 +2737,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr ""
+msgstr "Klientai"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -2797,7 +2810,7 @@ msgid "Base Code Amount"
 msgstr "Bazės suma"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2810,7 +2823,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2848,7 +2861,7 @@ msgid "Fiscal Position"
 msgstr "Fiskalinė pozicija"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2995,7 +3008,7 @@ msgid "View"
 msgstr "Žiūrėti"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3187,7 +3200,7 @@ msgid "Starting Balance"
 msgstr "Pradinis likutis"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nėra nurodyta partnerio !"
@@ -3241,7 +3254,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3322,6 +3335,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3355,7 +3369,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr ""
+msgstr "Nesugretintos įrašų eilutės"
 
 #. module: account
 #: sql_constraint:res.currency:0
@@ -3368,7 +3382,7 @@ msgid "Detail"
 msgstr "Išsamiai"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3383,9 +3397,16 @@ msgid "VAT :"
 msgstr "PVM:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3406,10 +3427,11 @@ msgid "Centralised counterpart"
 msgstr "Automatiškai kurti balansą."
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
+"Negalima kurti įrašų eilučių sąskaitoje %s %s kurios tipas \"peržiūra\""
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -3433,6 +3455,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3460,10 +3483,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Data"
 
@@ -3480,7 +3510,6 @@ msgstr "Panaikinti sugretinimą"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3494,7 +3523,7 @@ msgid "Chart of Accounts Template"
 msgstr "Sąskaitų plano šablonas"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3503,7 +3532,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Kai kurie įrašai jau yra sugretinti !"
@@ -3534,6 +3563,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3617,7 +3648,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Negalima pakeisti mokesčio !"
@@ -3648,7 +3679,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3662,6 +3693,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3675,7 +3707,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3872,7 +3904,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr ""
+msgstr "Patvirtintos įrašų eilutės"
 
 #. module: account
 #: view:account.tax.template:0
@@ -3996,7 +4028,7 @@ msgid "Month"
 msgstr "Mėnuo"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4053,7 +4085,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4260,7 +4292,7 @@ msgid "Allow Reconciliation"
 msgstr "Leisti sugretinti"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4294,7 +4326,7 @@ msgid "Recurring Models"
 msgstr "Pasikartojantys modeliai"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4306,6 +4338,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Keisti"
 
@@ -4330,7 +4363,7 @@ msgstr ""
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr ""
+msgstr "Patvirtinti įrašus"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4350,7 +4383,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4364,7 +4397,7 @@ msgid "Keep empty to use the income account"
 msgstr "Norėdami naudoti pajamų sąskaitą, palikite tuščią"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4392,7 +4425,7 @@ msgstr "Sąskaitų nustatymai"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Klientas"
@@ -4408,7 +4441,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4460,7 +4493,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4485,11 +4518,13 @@ msgstr "Nauji fiskaliniai metai"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Sąskaitos faktūros"
 
@@ -4519,7 +4554,7 @@ msgstr ""
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
-msgstr ""
+msgstr "Patvirtinti įrašai"
 
 #. module: account
 #: view:account.use.model:0
@@ -4587,7 +4622,7 @@ msgstr ""
 #. module: account
 #: view:account.move:0
 msgid "Journal Entries to Review"
-msgstr ""
+msgstr "Įrašai peržiūrai"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4623,29 +4658,27 @@ msgstr "Mokesčio taikymas"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr ""
+msgstr "Įrašų eilutės"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Klaida"
@@ -4748,7 +4781,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4775,7 +4808,7 @@ msgid "Child Tax Accounts"
 msgstr "Vaikinė mokesčio sąskaita"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4798,6 +4831,7 @@ msgstr "Analitinis balansas -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4841,6 +4875,8 @@ msgstr "Periodo tipas"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Mokėjimai"
 
@@ -4914,7 +4950,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integracijos klaida !"
@@ -4947,6 +4983,7 @@ msgstr "Sugretinimo rezultatas"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5023,6 +5060,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5152,7 +5190,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5204,13 +5241,13 @@ msgid "End of Year Entries Journal"
 msgstr "Fiskalinių metų uždarymo įrašų žurnalas"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5284,7 +5321,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5449,7 +5485,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5482,14 +5518,14 @@ msgid "Child Accounts"
 msgstr "Vaikinės sąskaitos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Nurašymas"
@@ -5509,7 +5545,7 @@ msgstr "Pajamos"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Tiekėjas"
@@ -5539,7 +5575,7 @@ msgid "Account n°"
 msgstr "Sąskaitos Nr."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Nuoroda"
@@ -5554,7 +5590,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Debetinės ir kreditinės sąskaitos"
@@ -5650,7 +5688,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5661,8 +5699,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Negalite naudoti neaktyvios sąskaitos!"
@@ -5703,8 +5741,8 @@ msgid "Number of Days"
 msgstr "Dienų skaičius"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5766,7 +5804,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5803,6 +5841,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Praeitis"
 
@@ -6076,6 +6116,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6085,7 +6127,7 @@ msgid "Power"
 msgstr "Galia"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6125,6 +6167,7 @@ msgid "Applicable Type"
 msgstr "Taikomas tipas"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Sąskaitos faktūros nuoroda"
@@ -6148,7 +6191,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr ""
+msgstr "Analitinių įrašų eilutės"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6340,11 +6383,11 @@ msgstr ""
 #: code:addons/account/account.py:624
 #, python-format
 msgid "You can not remove an account containing journal items."
-msgstr ""
+msgstr "Negalima ištrinti sąskaitos kurioje egzistuoja įrašų eilutės."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Įrašai: "
@@ -6360,7 +6403,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Negalima sukurti DK įrašų skirtingoms įmonėms"
@@ -6399,13 +6442,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Iš viso debeto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Įrašas \"%s\" yra nepatvirtintas !"
@@ -6474,25 +6517,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6524,8 +6568,8 @@ msgid "Printed"
 msgstr "Atspausdintas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6572,7 +6616,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Journal Entries"
-msgstr ""
+msgstr "Įrašai"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
@@ -6580,7 +6624,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6731,7 +6775,7 @@ msgid "Total:"
 msgstr "Iš viso:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6761,7 +6805,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6829,14 +6873,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6924,7 +6968,7 @@ msgstr "Sąskaitos mokesčio šablonas"
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr ""
+msgstr "Ar tikrai norite atidaryti įrašus?"
 
 #. module: account
 #: view:account.state.open:0
@@ -6932,8 +6976,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Ar jūs tikras, kad norite atidaryti šią sąskaitą ?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6946,7 +6990,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Apskaitos įrašai"
@@ -7077,7 +7121,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7108,8 +7152,8 @@ msgid "Reporting"
 msgstr "Ataskaitos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7198,7 +7242,7 @@ msgid "Sign on Reports"
 msgstr "Ženklas ataskaitose"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7209,7 +7253,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7244,7 +7288,7 @@ msgid "Optional Information"
 msgstr "Papildoma informacija"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
@@ -7252,6 +7296,7 @@ msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7278,13 +7323,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Bloga sąskaita !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Pardavimų žurnalas"
@@ -7301,7 +7346,7 @@ msgid "Invoice Tax"
 msgstr "Sąskaitos faktūros mokesčiai"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Nenurodytas numeris !"
@@ -7325,7 +7370,7 @@ msgstr ""
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr ""
+msgstr "Nepatvirtinti įrašai"
 
 #. module: account
 #: view:product.product:0
@@ -7351,7 +7396,7 @@ msgstr "Iki"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7399,13 +7444,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Kreditinės sąskaitos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7431,7 +7478,7 @@ msgstr "Įvykio kodas"
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr ""
+msgstr "Patvirtinti žurnalo įrašus"
 
 #. module: account
 #: view:product.product:0
@@ -7449,7 +7496,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Grynieji"
@@ -7461,15 +7508,15 @@ msgid "Account Destination"
 msgstr "Sąskaita tikslas"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7618,13 +7665,14 @@ msgstr "Fiksuotas"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Įspėjimas!"
@@ -7676,7 +7724,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7689,7 +7737,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7763,7 +7811,7 @@ msgid "Deferral Method"
 msgstr "Metų pabaigos veiksmas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7825,7 +7873,7 @@ msgid "Associated Partner"
 msgstr "Susijęs partneris"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Visų pirma turite pasirinkti partnerį !"
@@ -7871,7 +7919,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7893,7 +7941,7 @@ msgid "Choose Fiscal Year"
 msgstr "Pasirinkite mokestinius metus"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7980,7 +8028,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Skaičiuoti mokesčių kodus įtraukiant kainas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8108,7 +8156,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8187,10 +8235,12 @@ msgstr "Grąžinimų žurnalas"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8223,7 +8273,7 @@ msgid "The partner account used for this invoice."
 msgstr "Partnerio sąskaita naudojama šioje sąskaitoje faktūroje."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8246,7 +8296,7 @@ msgid "Payment Term Line"
 msgstr "Mokėjimo terminų eilutės"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Pirkimo žurnalas"
@@ -8284,7 +8334,7 @@ msgstr "Mokėjimo terminas"
 #: model:ir.ui.menu,name:account.menu_account_supplier
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr ""
+msgstr "Tiekėjai"
 
 #. module: account
 #: view:account.journal:0
@@ -8331,7 +8381,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8439,7 +8489,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8454,7 +8504,7 @@ msgstr ""
 "valiutų įrašai."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8527,7 +8577,7 @@ msgid "Contact Address"
 msgstr "Kontaktinis adresas"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8562,12 +8612,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Atviri žurnalo įrašai"
@@ -8586,7 +8638,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8674,7 +8726,7 @@ msgid "Period from"
 msgstr "Periodas nuo"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8721,7 +8773,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8737,7 +8789,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8769,8 +8821,6 @@ msgstr "Periodo pabaiga"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8785,6 +8835,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8805,6 +8856,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Analizės kryptis"
 
@@ -8824,7 +8876,7 @@ msgstr "Žurnalo vaizdas"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Iš viso kredito"
@@ -8889,6 +8941,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8964,7 +9017,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Jūs turite pasirinkti sąskaitas sugretinimui"
@@ -8986,7 +9039,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -9008,7 +9060,7 @@ msgid "Move"
 msgstr "DK įrašas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9064,7 +9116,7 @@ msgid "Consolidated Children"
 msgstr "Konsoliduotos sąskaitos"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9125,6 +9177,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9181,6 +9234,7 @@ msgstr "Periodiniai įrašai"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9188,6 +9242,7 @@ msgstr "Periodiniai įrašai"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9230,7 +9285,7 @@ msgid "Unreconciled"
 msgstr "Nesugretinta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Bloga suma !"
@@ -9289,7 +9344,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9328,6 +9383,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9426,9 +9482,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Periodai"
 
@@ -9590,6 +9648,7 @@ msgstr "Užregistruota"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9637,7 +9696,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9673,6 +9732,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9693,6 +9753,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9707,7 +9768,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9717,6 +9780,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9870,6 +9935,7 @@ msgstr "Tiekėjo sąskaita faktūra"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9903,6 +9969,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9920,7 +9988,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Įrašas jau yra sugretintas"
@@ -9956,8 +10024,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Su DK įrašais"
@@ -10073,8 +10143,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Netinkama sąskaita !"
@@ -10100,7 +10170,7 @@ msgid "Accounts Mapping"
 msgstr "Sąskaitų nustatymai"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10290,6 +10360,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10363,13 +10434,15 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Ateitis"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr ""
+msgstr "Ieškoti įrašų eilučių"
 
 #. module: account
 #: help:account.tax,base_sign:0
diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po
index 65c0faadc14..d995bbb415b 100644
--- a/addons/account/i18n/lv.po
+++ b/addons/account/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:05+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:02+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -142,6 +142,7 @@ msgstr "Savienot"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Atsauce"
 
@@ -160,13 +161,13 @@ msgstr ""
 "objektu to neizdzēšot."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Uzmanību!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -231,7 +232,7 @@ msgstr ""
 "nodokļa kodu, tiktu parādīts rēķinos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Rēķins '%s' ir apmaksāts daļēji: %s%s no %s%s (%s%s atlicis)"
@@ -249,7 +250,7 @@ msgid "Belgian Reports"
 msgstr "Beļģijas atskaites"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Jūs nevarat pievienot/modificēt grāmatojumus slēgtā žurnālā."
@@ -295,7 +296,7 @@ msgid "St."
 msgstr "Izr."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Rēķina rindas konta uzņēmums neatbilst rēķina uzņēmumam."
@@ -588,8 +589,10 @@ msgid "The accountant confirms the statement."
 msgstr "Grāmatvedim jāapstiprina izraksts."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -647,7 +650,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Pamata secībai ir jāatšķiras no tekošās!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -658,7 +661,7 @@ msgid "Tax Code Amount"
 msgstr "Summa pēc Nodokļa Koda"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "REL"
@@ -685,8 +688,8 @@ msgid "Journal Period"
 msgstr "Žurnāla periods"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Kontējumu sasaisti var veikt tikai viena uzņēmuma ietvaros"
@@ -763,6 +766,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Tikai rēķina Melnrakstam ir iespējams mainīt valūtu!"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -778,12 +782,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Veids"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -913,12 +918,13 @@ msgid "Create 3 Months Periods"
 msgstr "Veidot 3-Mēnešu Periodus"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Nav apmaksāts"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -998,7 +1004,7 @@ msgstr ""
 "ir nodokļu bāze, tad  šajā laukā tiek attēlota bāze (bez nodokļa)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1031,10 +1037,10 @@ msgid "Code"
 msgstr "Kods"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1098,7 +1104,7 @@ msgstr ""
 "papildus pielietošanas modeļus."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1146,7 +1152,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banka"
@@ -1242,7 +1248,7 @@ msgid "The move of this entry line."
 msgstr "Grāmatojuma kontējums"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1263,7 +1269,7 @@ msgid "Entry Label"
 msgstr "Grāmatojuma Birka"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1350,14 +1356,15 @@ msgid "Taxes"
 msgstr "Nodokļi"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Izvēlieties sākuma un beigu periodu"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1412,6 +1419,7 @@ msgid "Journal Items Analysis"
 msgstr "Žurnāla grāmatojumu Analīze"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Partneri"
@@ -1436,8 +1444,10 @@ msgid "Central Journal"
 msgstr "Virsgrāmata"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1671,6 +1681,7 @@ msgid "Separated Journal Sequences"
 msgstr "Atsevišķa Žurnāla Numerācija"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Atbildīgais"
@@ -1701,7 +1712,7 @@ msgid "Year Sum"
 msgstr "Summa par Gadu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1779,7 +1790,7 @@ msgid "Customer Ref:"
 msgstr "Klienta Atsauce:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Lietotajam %s nav pieejas tiesību žurnālam %s !"
@@ -2106,7 +2117,7 @@ msgid "Pro-forma"
 msgstr "Priekšapmaksas"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2132,7 +2143,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Meklēt Kontu Plāna Parauga veidnī"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2184,7 +2195,7 @@ msgid "Description"
 msgstr "Apraksts"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2203,7 +2214,7 @@ msgid "Income Account"
 msgstr "Ieņēmumu Konts"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2244,6 +2255,7 @@ msgstr "Produkta Veidne"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2253,6 +2265,7 @@ msgstr "Produkta Veidne"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2303,7 +2316,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2336,7 +2349,7 @@ msgid "Main Sequence"
 msgstr "Galvenā Secība"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2410,7 +2423,7 @@ msgid "Account Tax Code"
 msgstr "Konta Nodokļa Kods"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2499,7 +2512,7 @@ msgid "Account Model Entries"
 msgstr "Tipveida ieraksti"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "IEP"
@@ -2565,7 +2578,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2597,7 +2609,7 @@ msgid "Accounts"
 msgstr "Konti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfigurācijas kļūda!"
@@ -2719,6 +2731,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Savstarpējo Norēķinu Bilance"
@@ -2769,14 +2782,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Ar šī vedņa palīdzību tiek veidoti regulārie grāmatojumi"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Žurnālam nav definēta numerācija!"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2881,7 +2894,7 @@ msgid "Base Code Amount"
 msgstr "Bāzes Koda Summa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2894,7 +2907,7 @@ msgid "Default Sale Tax"
 msgstr "Noklusējuma Pārdošanas Nodoklis"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2934,7 +2947,7 @@ msgid "Fiscal Position"
 msgstr "Nodokļu Profils"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3088,7 +3101,7 @@ msgid "View"
 msgstr "Skatījums"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3290,7 +3303,7 @@ msgid "Starting Balance"
 msgstr "Sākuma Bilance"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nav definēts Partneris!"
@@ -3345,7 +3358,7 @@ msgid "Chart of Tax"
 msgstr "Nodokļu Plāns"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3429,6 +3442,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3475,7 +3489,7 @@ msgid "Detail"
 msgstr "Detaļas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3490,9 +3504,16 @@ msgid "VAT :"
 msgstr "PVN :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3513,7 +3534,7 @@ msgid "Centralised counterpart"
 msgstr "Žurnālu kopsavilkums"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3539,6 +3560,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3566,10 +3588,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Datums"
 
@@ -3586,7 +3615,6 @@ msgstr "Atsaistīt"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3600,7 +3628,7 @@ msgid "Chart of Accounts Template"
 msgstr "Kontu Plāns (Veidne)"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3609,7 +3637,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Daži kontējumi ir jau sasaistīti!"
@@ -3640,6 +3668,8 @@ msgstr "Budžeti"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Nav Filtru"
 
@@ -3723,7 +3753,7 @@ msgid "Analytic Items"
 msgstr "Analītiskie Ieraksti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Nav iespējams mainīt nodokli!"
@@ -3754,7 +3784,7 @@ msgid "Mapping"
 msgstr "Aizvietošana"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3768,6 +3798,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3781,7 +3812,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4107,7 +4138,7 @@ msgid "Month"
 msgstr "Mēnesis"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4164,7 +4195,7 @@ msgid "Account Base Code"
 msgstr "Konta Bāzes Kods"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Produktam \"%s\" (id:%d) nav definēts izdevumu konts."
@@ -4373,7 +4404,7 @@ msgid "Allow Reconciliation"
 msgstr "Atļaut Sasaisti"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4407,7 +4438,7 @@ msgid "Recurring Models"
 msgstr "Periodiskie Modeļi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4419,6 +4450,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Mainīt"
 
@@ -4463,7 +4495,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4479,7 +4511,7 @@ msgid "Keep empty to use the income account"
 msgstr "Atstāt tukšu, lai izmantotu ieņēmumu kontu"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4507,7 +4539,7 @@ msgstr "Kontu Sasaiste"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Klients"
@@ -4523,7 +4555,7 @@ msgid "Cancelled Invoice"
 msgstr "Atcelts Rēķins"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4580,7 +4612,7 @@ msgid "Income Account on Product Template"
 msgstr "Ieņēmumu Konts Produkta Veidnē"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4605,11 +4637,13 @@ msgstr "Jauns Fiskālais Gads"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Rēķini"
 
@@ -4746,26 +4780,24 @@ msgid "Journal Items"
 msgstr "Kontējumi"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Kļūda"
@@ -4871,7 +4903,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4897,7 +4929,7 @@ msgid "Child Tax Accounts"
 msgstr "Apakšnodokļu Konti"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Sākuma periodam jābūt pirms Beigu perioda"
@@ -4918,6 +4950,7 @@ msgstr "Analītiskā Bilance -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4961,6 +4994,8 @@ msgstr "Perioda Tips"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Maksājumi"
 
@@ -5034,7 +5069,7 @@ msgid "Line 1:"
 msgstr "Rinda nr.1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integritātes kļūda !"
@@ -5067,6 +5102,7 @@ msgstr "Saistīšanas rezultāts"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Bilance"
@@ -5143,6 +5179,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5272,7 +5309,6 @@ msgstr "Grāmatvedības Vispārējās Atskaites"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Saziņa"
 
@@ -5324,13 +5360,13 @@ msgid "End of Year Entries Journal"
 msgstr "Gada Slēguma Ierakstu Žurnāls"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5404,7 +5440,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5570,7 +5605,7 @@ msgid "Generate Opening Entries"
 msgstr "Grāmatot Sākuma Atlikumus"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Sasaiste ir jau veikta!"
@@ -5603,14 +5638,14 @@ msgid "Child Accounts"
 msgstr "Apakškonti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Norakstīšana"
@@ -5630,7 +5665,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Piegādātājs"
@@ -5660,7 +5695,7 @@ msgid "Account n°"
 msgstr "Konta numurs"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Atsauce"
@@ -5675,7 +5710,9 @@ msgstr "Novērtēšana"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Ieņēmumu un Izdevumu Konti"
@@ -5777,7 +5814,7 @@ msgid "Filter by"
 msgstr "Filtrēt pēc"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5788,8 +5825,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Nevar izmantot neaktīvu lietotāju!"
@@ -5830,8 +5867,8 @@ msgid "Number of Days"
 msgstr "Dienu Skaits"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5893,7 +5930,7 @@ msgid "Multipication factor for Base code"
 msgstr "Bāzes koda reizinājuma faktors"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "nav realizēts"
@@ -5932,6 +5969,8 @@ msgstr "Analītisko Ierakstu Analīze"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Iepriekšējie"
 
@@ -6207,6 +6246,8 @@ msgstr "Procentuālā attiecība"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Žurnāls un Partneris"
 
@@ -6216,7 +6257,7 @@ msgid "Power"
 msgstr "Pakāpe:"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6258,6 +6299,7 @@ msgid "Applicable Type"
 msgstr "Pielietojamais Tips"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Rēķina Atsauce"
@@ -6481,8 +6523,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Ieraksti: "
@@ -6498,7 +6540,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Nevar izveidot vienu grāmatojumu dažādiem uzņēmumiem"
@@ -6547,13 +6589,13 @@ msgstr "Statuss neapstiprināts"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Debeta summa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Ieraksts \"%s\" nav derīgs!"
@@ -6625,25 +6667,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6675,8 +6718,8 @@ msgid "Printed"
 msgstr "Drukāts"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6736,7 +6779,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Atsevišķa lapa katram partnerim"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6890,7 +6933,7 @@ msgid "Total:"
 msgstr "Summa:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6928,7 +6971,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6996,14 +7039,14 @@ msgid "Source Document"
 msgstr "Pamatojuma Dokuments"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7100,8 +7143,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Vai vēlaties atvērt šo rēķinu?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7114,7 +7157,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Grāmatvedības Ieraksti"
@@ -7247,7 +7290,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7279,8 +7322,8 @@ msgid "Reporting"
 msgstr "Atskaites"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7375,7 +7418,7 @@ msgid "Sign on Reports"
 msgstr "Parakstīt Atskaites"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7386,7 +7429,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7421,13 +7464,14 @@ msgid "Optional Information"
 msgstr "Papildus informācija"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Jānorāda žurnāla noklusētie kredīta un debeta konti"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7456,13 +7500,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Nederīgs konts!"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Realizācijas Žurnāls"
@@ -7479,7 +7523,7 @@ msgid "Invoice Tax"
 msgstr "Rēķina Nodoklis"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Vienībai nav definēts numurs!"
@@ -7529,7 +7573,7 @@ msgstr "Līdz"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7577,13 +7621,15 @@ msgstr "Maijs"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Izdevumu Konti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7627,7 +7673,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Skaidrā nauda"
@@ -7639,15 +7685,15 @@ msgid "Account Destination"
 msgstr "Mērķa Kontējums"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7796,13 +7842,14 @@ msgstr "Fiksēts"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Uzmanību!"
@@ -7854,7 +7901,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Izvēlēties rēķina valūtu"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7867,7 +7914,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Nevar %s melnraksta/proforma/atceltu rēķinu."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Nav Rēķina Rindu!"
@@ -7942,7 +7989,7 @@ msgid "Deferral Method"
 msgstr "Atliktā maksājuma Metode"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Rēķins \"%s\" ir apmaksāts."
@@ -8008,7 +8055,7 @@ msgid "Associated Partner"
 msgstr "Saistītais Partneris"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Vispirms jāizvēlas partneris!"
@@ -8055,7 +8102,7 @@ msgstr ""
 "Nodokļu kontu plāns tiek izmantots, lai veidotu ikmēneša nodokļu deklarāciju."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8077,7 +8124,7 @@ msgid "Choose Fiscal Year"
 msgstr "Fiskālā Gada Izvēle"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Iepirkumu Kredītrēķinu Žurnāls"
@@ -8164,7 +8211,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8295,7 +8342,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8374,10 +8421,12 @@ msgstr "Kredītrēķinu Žurnāls"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtrēt Pēc"
 
@@ -8413,7 +8462,7 @@ msgid "The partner account used for this invoice."
 msgstr "Rēķinā izmantotais partnera konts."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8436,7 +8485,7 @@ msgid "Payment Term Line"
 msgstr "Apmaksas Noteikumu Rinda"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Iepirkuma Žurnāls"
@@ -8521,7 +8570,7 @@ msgid "Unpaid Invoices"
 msgstr "Neapmaksātie Rēķini"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8628,7 +8677,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Atstāt tukšu visiem atvērtajiem fiskālajiem gadiem"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "Grāmatojums (%s) ir apstiprināts centralizācijai!"
@@ -8641,7 +8690,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8714,7 +8763,7 @@ msgid "Contact Address"
 msgstr "Kontaktadrese"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8749,12 +8798,14 @@ msgstr "Līgumi"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "nezināms"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Sākuma Atlikumu Kontējumu Žurnāls"
@@ -8775,7 +8826,7 @@ msgstr ""
 "Zaudējumi: Summa tiks atņemta.). Tiek izmantots Peļņas/Zaudējumu aprēķinā."
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8861,7 +8912,7 @@ msgid "Period from"
 msgstr "No perioda"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Realizācija. Kredītrēķinu Žurnāls"
@@ -8908,7 +8959,7 @@ msgid "Purchase Tax(%)"
 msgstr "Iepirkumu Nodoklis(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Ievadiet rēķina rindas"
@@ -8924,7 +8975,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8962,8 +9013,6 @@ msgstr "Perioda Beigas"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8978,6 +9027,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8998,6 +9048,7 @@ msgstr "Sākuma Periods"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Analīzes Dimensija"
 
@@ -9017,7 +9068,7 @@ msgstr "Žurnāla Skatījumi"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Kredīta summa"
@@ -9082,6 +9133,7 @@ msgstr "Bankas Izraksti"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9157,7 +9209,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Jāizvēlas  kontus savienošanai"
@@ -9184,7 +9236,6 @@ msgstr ""
 "atkarībā no uzņēmuma aktivitātes noteiktā periodā."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filtrē Pēc"
@@ -9206,7 +9257,7 @@ msgid "Move"
 msgstr "Grāmatojums"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "Nav  iespējams mainīt nodokli,  dzēst un izveidot rindas no jauna!"
@@ -9264,7 +9315,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidētie Konti"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9325,6 +9376,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9381,6 +9433,7 @@ msgstr "Regulārie Grāmatvedības Kontējumi"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9388,6 +9441,7 @@ msgstr "Regulārie Grāmatvedības Kontējumi"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9430,7 +9484,7 @@ msgid "Unreconciled"
 msgstr "Nesaistīts"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Kļūdaina kopsumma!"
@@ -9489,7 +9543,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Nezināma Kļūda"
@@ -9526,6 +9580,7 @@ msgstr "Apstiprināt Grāmatojumu"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9624,9 +9679,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Periodi"
 
@@ -9790,6 +9847,7 @@ msgstr "Grāmatots"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9837,7 +9895,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Produktam nav definēts ieņēmumu konts: \"%s\" (id:%d)"
@@ -9873,6 +9931,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9893,6 +9952,7 @@ msgstr "Žurnāls: Visi"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9907,7 +9967,9 @@ msgstr "Žurnāls: Visi"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9917,6 +9979,8 @@ msgstr "Žurnāls: Visi"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10070,6 +10134,7 @@ msgstr "Ienākošais Rēķins"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10103,6 +10168,8 @@ msgstr "Kļūda! Nevar veidot rekursīvas kontu veidnes."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -10120,7 +10187,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Kontējums jau ir sasaistīts"
@@ -10156,8 +10223,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Ar grāmatojumiem"
@@ -10273,8 +10342,8 @@ msgid "Statistic Reports"
 msgstr "Statistiskās Atskaites"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Nederīgs Konts!"
@@ -10300,7 +10369,7 @@ msgid "Accounts Mapping"
 msgstr "Kontu Savienošana"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Rēķins \"%s\" gaida apstiprināšanu."
@@ -10490,6 +10559,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10566,6 +10636,8 @@ msgstr "Saistības"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Nākotnē"
 
diff --git a/addons/account/i18n/mk.po b/addons/account/i18n/mk.po
index fd49bf8cec4..32f7f537236 100644
--- a/addons/account/i18n/mk.po
+++ b/addons/account/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:03+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -146,6 +146,7 @@ msgstr "Порамни"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Референца"
 
@@ -164,13 +165,13 @@ msgstr ""
 "рокот за плаќање без да го отстраните."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Внимание!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Картица разно"
@@ -235,7 +236,7 @@ msgstr ""
 "појавува на фактурите"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Фактурата '%s' е платена делумно: %s%s од %s%s (%s%s преостанува)"
@@ -251,7 +252,7 @@ msgid "Belgian Reports"
 msgstr "Белгиски извештаи"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Не можете да додавате/менувате влезови во затворена картица."
@@ -300,7 +301,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -594,8 +595,10 @@ msgid "The accountant confirms the statement."
 msgstr "Сметководителот ја потврдува изјавата."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -653,7 +656,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Главната секвенца мора да се разликува од тековната !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "Не е пронајден период или има повеќе од еден период за даден датум."
@@ -664,7 +667,7 @@ msgid "Tax Code Amount"
 msgstr "Конто на даночен код"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -691,8 +694,8 @@ msgid "Journal Period"
 msgstr "Период на картица"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -772,6 +775,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Можете да ја промените единствено валутата за Нацрт фактурата !"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Финансиски извештај"
@@ -787,12 +791,13 @@ msgstr "Финансиски извештај"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Тип"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -928,12 +933,13 @@ msgid "Create 3 Months Periods"
 msgstr "Креирај 3 месечен период"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "До"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1015,7 +1021,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1048,10 +1054,10 @@ msgid "Code"
 msgstr "Код"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1117,7 +1123,7 @@ msgstr ""
 "информации за контото и неговите особености."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1166,7 +1172,7 @@ msgstr "Небалансирани ставки во картица"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Банка"
@@ -1265,7 +1271,7 @@ msgid "The move of this entry line."
 msgstr "Движење на оваа ставка од записот."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1288,7 +1294,7 @@ msgid "Entry Label"
 msgstr "Ознака на запис"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "Не можете да измените/избришете картица со влезови за овој период !"
@@ -1373,14 +1379,15 @@ msgid "Taxes"
 msgstr "Даноци"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Изберете период на започнување и завршување"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Профит и загуба"
 
@@ -1435,6 +1442,7 @@ msgid "Journal Items Analysis"
 msgstr "Анализи на ставки од картица"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Партнери"
@@ -1459,8 +1467,10 @@ msgid "Central Journal"
 msgstr "Централна картица"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1697,6 +1707,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Одговорен"
@@ -1727,7 +1738,7 @@ msgid "Year Sum"
 msgstr "Годишна сума"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1805,7 +1816,7 @@ msgid "Customer Ref:"
 msgstr "Реф. на добавувач:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Корисникот %s нема право на пристап до %s картица !"
@@ -2141,7 +2152,7 @@ msgid "Pro-forma"
 msgstr "Про-фактура"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2165,7 +2176,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Барај урнеци на контен план"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2222,7 +2233,7 @@ msgid "Description"
 msgstr "Опис"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2241,7 +2252,7 @@ msgid "Income Account"
 msgstr "Приходна сметка"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Нема дефинирано Сметководствена картица од типот Продажба/Набавка!"
@@ -2281,6 +2292,7 @@ msgstr "Урнек на производ"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2290,6 +2302,7 @@ msgstr "Урнек на производ"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2340,7 +2353,7 @@ msgid "Account Line"
 msgstr "Ставка на конто"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2374,7 +2387,7 @@ msgid "Main Sequence"
 msgstr "Главна секвенца"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2450,7 +2463,7 @@ msgid "Account Tax Code"
 msgstr "Код на данокот на контото"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2542,7 +2555,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2608,7 +2621,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2640,7 +2652,7 @@ msgid "Accounts"
 msgstr "Конта"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Грешка конфигурација!"
@@ -2764,6 +2776,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2816,14 +2829,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Овој волшебник ќе креира повторливи сметководствени записи"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Нема дефинирано секвенца за картицата !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2933,7 +2946,7 @@ msgid "Base Code Amount"
 msgstr "Износ на основен код"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2948,7 +2961,7 @@ msgid "Default Sale Tax"
 msgstr "Стандарден данок на продажба"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Фактурата  '%s' е потврдена."
@@ -2989,7 +3002,7 @@ msgid "Fiscal Position"
 msgstr "Фискална позиција"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3145,7 +3158,7 @@ msgid "View"
 msgstr "Преглед"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3341,7 +3354,7 @@ msgid "Starting Balance"
 msgstr "Почетен биланс"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Нема дефинирано партнер !"
@@ -3397,7 +3410,7 @@ msgid "Chart of Tax"
 msgstr "Графикон на данок"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "Завршниот биланс треба да биде ист како пресметаниот биланс!"
@@ -3483,6 +3496,7 @@ msgstr "Количина :"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Должина на периодот (денови)"
 
@@ -3529,7 +3543,7 @@ msgid "Detail"
 msgstr "Детали"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3548,9 +3562,16 @@ msgid "VAT :"
 msgstr "ДДВ :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3571,7 +3592,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr "Не може да креирате ставки на картица на конто за \"преглед\" %s %s"
@@ -3598,6 +3619,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3625,10 +3647,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Датум"
 
@@ -3645,7 +3674,6 @@ msgstr "Непорамнето"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3659,7 +3687,7 @@ msgid "Chart of Accounts Template"
 msgstr "Урнек за контен план"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3668,7 +3696,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Некои записи се веќе порамнети !"
@@ -3699,6 +3727,8 @@ msgstr "Буџети"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Нема филтри"
 
@@ -3784,7 +3814,7 @@ msgid "Analytic Items"
 msgstr "Аналитички ставки"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Не може да се промени данокот !"
@@ -3815,7 +3845,7 @@ msgid "Mapping"
 msgstr "Мапирање"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3829,6 +3859,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3842,7 +3873,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "Не можете да креирате ставки на картица на затворено конто %s %s"
@@ -4176,7 +4207,7 @@ msgid "Month"
 msgstr "Месец"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4237,7 +4268,7 @@ msgid "Account Base Code"
 msgstr "Основен код на контото"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Нема дефинирано конто за трошоци за овој производ: \"%s\" (id:%d)"
@@ -4446,7 +4477,7 @@ msgid "Allow Reconciliation"
 msgstr "Дозволи порамнување"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4483,7 +4514,7 @@ msgid "Recurring Models"
 msgstr "Модели на повторување"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Кодирање на грешка"
@@ -4495,6 +4526,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Промени"
 
@@ -4539,7 +4571,7 @@ msgid "Example"
 msgstr "Пример"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4555,7 +4587,7 @@ msgid "Keep empty to use the income account"
 msgstr "Оставете празно за да употребите конто за приходи"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Данок на набавка %.2f%%"
@@ -4583,7 +4615,7 @@ msgstr "Мапирање на конто"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Клиент"
@@ -4599,7 +4631,7 @@ msgid "Cancelled Invoice"
 msgstr "Откажи фактура"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4657,7 +4689,7 @@ msgid "Income Account on Product Template"
 msgstr "Конто на приходи на урнек за производ"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "MISC"
@@ -4683,11 +4715,13 @@ msgstr "Нова фискална година"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Фактури"
 
@@ -4827,26 +4861,24 @@ msgid "Journal Items"
 msgstr "Ставки во картица"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Грешка"
@@ -4954,7 +4986,7 @@ msgid "Beginning of Period Date"
 msgstr "Датум на започнување на период"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4981,7 +5013,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Почетниот период мора да биде помал од крајниот период"
@@ -5004,6 +5036,7 @@ msgstr "Аналитички биланс -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5047,6 +5080,8 @@ msgstr "Тип на период"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Плаќања"
 
@@ -5120,7 +5155,7 @@ msgid "Line 1:"
 msgstr "Линија 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Грешка интегритет !"
@@ -5153,6 +5188,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Биланс"
@@ -5229,6 +5265,7 @@ msgstr "Извештај"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5359,7 +5396,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Комуникација"
 
@@ -5413,13 +5449,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5496,7 +5532,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Фактури и поврати на клиент"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5670,7 +5705,7 @@ msgid "Generate Opening Entries"
 msgstr "Генерирај записи за отварање"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Веќе порамнето!"
@@ -5703,14 +5738,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Премести име (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Отпиши"
@@ -5730,7 +5765,7 @@ msgstr "Приход"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Добавувач"
@@ -5760,7 +5795,7 @@ msgid "Account n°"
 msgstr "Бр. на конто"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Слободна референца"
@@ -5775,7 +5810,9 @@ msgstr "Проценка"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Конта побарувања и плаќања"
@@ -5881,7 +5918,7 @@ msgid "Filter by"
 msgstr "Филтрирај по"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Имате погрешен израз \"%(...)s\" во вашиот модел !"
@@ -5892,8 +5929,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Не можете да користите неактивна сметка!"
@@ -5936,8 +5973,8 @@ msgid "Number of Days"
 msgstr "Број на денови"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5999,7 +6036,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "не е имплементирано"
@@ -6038,6 +6075,8 @@ msgstr "Анализи на аналитички записи"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Минато"
 
@@ -6317,6 +6356,8 @@ msgstr "Процент"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Картица и партнер"
 
@@ -6326,7 +6367,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Не може да генерира неупотребен код на картица."
@@ -6368,6 +6409,7 @@ msgid "Applicable Type"
 msgstr "Тип кој може да се примени"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Референца на фактура"
@@ -6591,8 +6633,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "Не можете да отстраните конто кое содржи ставки во картицата."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Записи: "
@@ -6608,7 +6650,7 @@ msgid "Currency of the related account journal."
 msgstr "Валута на поврзаната картица на контото."
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Не можете да креирате движење помеѓу различни компании"
@@ -6650,13 +6692,13 @@ msgstr "Состојбата е нацрт"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Вкупно задолжување"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Записот \"%s\" не е валиден !"
@@ -6730,25 +6772,26 @@ msgstr "Профит & Загуба (Конто за трошоци)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6780,8 +6823,8 @@ msgid "Printed"
 msgstr "Испечатено"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Грешка :"
@@ -6839,7 +6882,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Прикажува извештај од главна книга со еден партнер по страна"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -7004,7 +7047,7 @@ msgid "Total:"
 msgstr "Вкупно:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7034,7 +7077,7 @@ msgid "Taxes used in Sales"
 msgstr "Даноци кои се користат во продажбите"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7102,14 +7145,14 @@ msgid "Source Document"
 msgstr "Изворен документ"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "Не можете да избришете објавен запис на картица \"%s\"!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7207,8 +7250,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Дали сакате да ја отворите оваа фактура ?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7223,7 +7266,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Сметководствени записи"
@@ -7354,7 +7397,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Треба да изберете периоди кои припаѓааат на иста компанија"
@@ -7385,8 +7428,8 @@ msgid "Reporting"
 msgstr "Известување"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7478,7 +7521,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr "Периоди за генерирање на отворени записи не се пронајдени"
@@ -7489,7 +7532,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7524,13 +7567,14 @@ msgid "Optional Information"
 msgstr "Опциони информации"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Картицата мора да има стандардно кредитно и дебитно конто"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7557,13 +7601,13 @@ msgid "Maturity Date"
 msgstr "Датум на доспевање"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Грешка сметка !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Продажна картица"
@@ -7580,7 +7624,7 @@ msgid "Invoice Tax"
 msgstr "Данок на фактура"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7630,7 +7674,7 @@ msgstr "До"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Подесување на валута"
@@ -7680,13 +7724,15 @@ msgstr "Мај"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7731,7 +7777,7 @@ msgstr "Име на извештај"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Готовина"
@@ -7743,15 +7789,15 @@ msgid "Account Destination"
 msgstr "Дестинација на конто"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7897,13 +7943,14 @@ msgstr "Фиксно"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Внимание !"
@@ -7955,7 +8002,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Изберете валута за да ја примените на фактурата"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7968,7 +8015,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Не може %s нацрт/про-фактура/откажи фактура."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Нема ставки во фактурата !"
@@ -8052,7 +8099,7 @@ msgid "Deferral Method"
 msgstr "Deferral Method"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Фактурата '%s' е платена."
@@ -8120,7 +8167,7 @@ msgid "Associated Partner"
 msgstr "Поврзан партнер"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Мора првин да изберете партнер !"
@@ -8178,7 +8225,7 @@ msgstr ""
 "your country."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8201,7 +8248,7 @@ msgid "Choose Fiscal Year"
 msgstr "Избери фискална година"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Картица повлечи нарачка"
@@ -8293,7 +8340,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8436,7 +8483,7 @@ msgid "current month"
 msgstr "тековен месец"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8523,10 +8570,12 @@ msgstr "Картица повлечи"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Филтрирај по"
 
@@ -8565,7 +8614,7 @@ msgid "The partner account used for this invoice."
 msgstr "Сметка на партнерот употребена за оваа фактура."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Данок %.2f%%"
@@ -8588,7 +8637,7 @@ msgid "Payment Term Line"
 msgstr "Ставка рок на плаќање"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Картица за набавки"
@@ -8675,7 +8724,7 @@ msgid "Unpaid Invoices"
 msgstr "Неплатени фактури"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr "Рокот на плаќање на добавувачот нема ставка рок на плаќање!"
@@ -8783,7 +8832,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Чувај празно за сите отворени фискални години"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "The account move (%s) for centralisation has been confirmed!"
@@ -8798,7 +8847,7 @@ msgstr ""
 "entry."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8884,7 +8933,7 @@ msgid "Contact Address"
 msgstr "Контакт адреса"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Погрешен модел !"
@@ -8924,12 +8973,14 @@ msgstr "Договори"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "непознато"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Opening Entries Journal"
@@ -8951,7 +9002,7 @@ msgstr ""
 "Profilt & Loss Report"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Дефинирајте секвенца на картицата поврзана со оваа фактура."
@@ -9042,7 +9093,7 @@ msgid "Period from"
 msgstr "Период од"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Картица повлечи продажби"
@@ -9089,7 +9140,7 @@ msgid "Purchase Tax(%)"
 msgstr "Данок на нарачки(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Креирајте ставки на фактурата."
@@ -9105,7 +9156,7 @@ msgid "Display Detail"
 msgstr "Прикажи детали"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9143,8 +9194,6 @@ msgstr "Крај на период"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Финансиски извештаи"
@@ -9159,6 +9208,7 @@ msgstr "Финансиски извештаи"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9179,6 +9229,7 @@ msgstr "Започни период"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Насоки за анализи"
 
@@ -9198,7 +9249,7 @@ msgstr "Преглед на картица"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Вкупно кредит"
@@ -9269,6 +9320,7 @@ msgstr "Банкарски изводи"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9349,7 +9401,7 @@ msgstr ""
 "related to this account and the counter-part \"Account receivable\"."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Морате да селектирате сметки за порамнување"
@@ -9377,7 +9429,6 @@ msgstr ""
 "активностите на вашата компанија во текот на одреден период."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Филтрирај по"
@@ -9399,7 +9450,7 @@ msgid "Move"
 msgstr "Премести"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9458,7 +9509,7 @@ msgid "Consolidated Children"
 msgstr "Consolidated Children"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9523,6 +9574,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9584,6 +9636,7 @@ msgstr "Entry Subscription"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9591,6 +9644,7 @@ msgstr "Entry Subscription"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9635,7 +9689,7 @@ msgid "Unreconciled"
 msgstr "Непорамнето"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Грешка вкупно !"
@@ -9701,7 +9755,7 @@ msgid "Comparison"
 msgstr "Споредување"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Непозната грешка"
@@ -9740,6 +9794,7 @@ msgstr "Потврди движење на сметка"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9847,9 +9902,11 @@ msgstr "Аналитички записи од последните 30 дено
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Периоди"
 
@@ -10020,6 +10077,7 @@ msgstr "Posted"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10067,7 +10125,7 @@ msgid "No detail"
 msgstr "Нема детали"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Нема приходна сметка дефинирано за овој производ: \"%s\" (id:%d)"
@@ -10103,6 +10161,7 @@ msgid "Verification Total"
 msgstr "Verification Total"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10123,6 +10182,7 @@ msgstr "Картица: Сите"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10137,7 +10197,9 @@ msgstr "Картица: Сите"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10147,6 +10209,8 @@ msgstr "Картица: Сите"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10307,6 +10371,7 @@ msgstr "Фактура на добавувач"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10340,6 +10405,8 @@ msgstr "Error ! You can not create recursive account templates."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Број на запис на картица"
 
@@ -10359,7 +10426,7 @@ msgstr ""
 "contains journal items!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Записот е скоро порамнет"
@@ -10400,8 +10467,10 @@ msgstr ""
 "computations), closed for depreciated accounts."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "With movements"
@@ -10524,8 +10593,8 @@ msgid "Statistic Reports"
 msgstr "Статистички извештаи"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Грешка сметка!"
@@ -10556,7 +10625,7 @@ msgid "Accounts Mapping"
 msgstr "Accounts Mapping"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Фактурата '%s' чека за потврдување."
@@ -10815,6 +10884,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10893,6 +10963,8 @@ msgstr "Доспевање"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Иднина"
 
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index b94027a9411..5e900aad665 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:36+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:03+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -146,6 +146,7 @@ msgstr "Тулгах"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Дугаар"
 
@@ -164,13 +165,13 @@ msgstr ""
 "устгалгүйгээр нуух боломжийг олгоно."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Анхааруулга!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Бусад Журнал"
@@ -235,7 +236,7 @@ msgstr ""
 "тооцохгүй"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "'%s' нэхэмжлэл хэсэгчлэн төлөгдсөн: %s%s of %s%s (%s%s үлдэгдэл)"
@@ -251,7 +252,7 @@ msgid "Belgian Reports"
 msgstr "Белги тайлан"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Та хаагдсан журналд гүйлгээ нэмэх/засварлах боломжгүй."
@@ -300,7 +301,7 @@ msgid "St."
 msgstr "Хүндэт."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -592,8 +593,10 @@ msgid "The accountant confirms the statement."
 msgstr "Нягтлан ордерийн гүйлгээг батлана."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -651,7 +654,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Үндсэн дараалал нь одоогийн дарааллаас ялгаатай байх ёстой !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -664,7 +667,7 @@ msgid "Tax Code Amount"
 msgstr "Татварын кодын дүн"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -691,8 +694,8 @@ msgid "Journal Period"
 msgstr "Журналын мөчлөг"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -772,6 +775,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Та зөвхөн ноорог нэхэмжлэлийн валютыг солих боломжтой !"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Санхүүгийн тайлан"
@@ -787,12 +791,13 @@ msgstr "Санхүүгийн тайлан"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Төрөл"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -928,12 +933,13 @@ msgid "Create 3 Months Periods"
 msgstr "3 сарын мөчлөг үүсгэх"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Төлөлт"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1018,7 +1024,7 @@ msgstr ""
 "(татваргүй дүнг) агуулна."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "Үлгэр дансны эцэг кодыг олж чадсангүй!"
@@ -1051,10 +1057,10 @@ msgid "Code"
 msgstr "Код"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1120,7 +1126,7 @@ msgstr ""
 "данснуудын тухай мэдээллийг агуулдаг тул энэ мэдээллийг тодорхойлж өгдөг."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1170,7 +1176,7 @@ msgstr "Баланс бариагүй журналын бичилт"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Банк"
@@ -1267,7 +1273,7 @@ msgid "The move of this entry line."
 msgstr "Уг журналын бичилтийг агуулж буй ажил гүйлгээ."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1290,7 +1296,7 @@ msgid "Entry Label"
 msgstr "Гүйлгээний нэр"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "Та энэ мөчлөгийн энэ журналд бичилт засварлах/устгах боломжгүй !"
@@ -1375,14 +1381,15 @@ msgid "Taxes"
 msgstr "Татвар"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Эхлэх дуусах мөчлөгийг сонго"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Ашиг, Алдагдал"
 
@@ -1437,6 +1444,7 @@ msgid "Journal Items Analysis"
 msgstr "Журналын бичилт шинжилгээ"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Харилцагч"
@@ -1461,8 +1469,10 @@ msgid "Central Journal"
 msgstr "Төв журнал"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1698,6 +1708,7 @@ msgid "Separated Journal Sequences"
 msgstr "Журналын дугаарлалтыг салгах"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Хариуцагч"
@@ -1728,7 +1739,7 @@ msgid "Year Sum"
 msgstr "Жилийн нийлбэр"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1806,7 +1817,7 @@ msgid "Customer Ref:"
 msgstr "Захаиалагчийн сурвалж:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "%s хэрэглэгч %s журналд хандах эрхгүй байна !"
@@ -2141,7 +2152,7 @@ msgid "Pro-forma"
 msgstr "Про-форма"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2170,7 +2181,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Дансны Модны Үлгэр Хайх"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2225,7 +2236,7 @@ msgid "Description"
 msgstr "Тайлбар"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2244,7 +2255,7 @@ msgid "Income Account"
 msgstr "Орлогын данс"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2285,6 +2296,7 @@ msgstr "Барааны загвар"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2294,6 +2306,7 @@ msgstr "Барааны загвар"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2344,7 +2357,7 @@ msgid "Account Line"
 msgstr "Санхүүгийн мөр"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2377,7 +2390,7 @@ msgid "Main Sequence"
 msgstr "Үндсэн дараалал"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2453,7 +2466,7 @@ msgid "Account Tax Code"
 msgstr "Татварын дансны код"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2544,7 +2557,7 @@ msgid "Account Model Entries"
 msgstr "Дансны загвар гүйлгээ"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2610,7 +2623,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "Дансны тулгалтын мөрийн хөдөлгөөн (найдваргүй авлага)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2642,7 +2654,7 @@ msgid "Accounts"
 msgstr "Данс"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Тохиргооны алдаа!"
@@ -2766,6 +2778,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Харилцагчийн балансын насжилт"
@@ -2817,14 +2830,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Энэ визард давтан гүйлгээний бичилт үүсгэнэ"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Журнал дээр дугаарлалт тодорхойлогдоогүй байна !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2931,7 +2944,7 @@ msgid "Base Code Amount"
 msgstr "Суурь ангилалын дүн"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2946,7 +2959,7 @@ msgid "Default Sale Tax"
 msgstr "Борлуулалтын Татварын Анхны Утга"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "'%s' нэхэмжлэл шалгагдлаа."
@@ -2987,7 +3000,7 @@ msgid "Fiscal Position"
 msgstr "Санхүүгийн харгалзаа"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3143,7 +3156,7 @@ msgid "View"
 msgstr "Харах"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3347,7 +3360,7 @@ msgid "Starting Balance"
 msgstr "Нээлтийн үлдэгдэл"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Харилцагч алга !"
@@ -3401,7 +3414,7 @@ msgid "Chart of Tax"
 msgstr "Татварын мод"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "Хаалтын баланс нь тооцоолсон баланстай ижил байх ёстой!"
@@ -3486,6 +3499,7 @@ msgstr "Тоо хэмжээ"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Мөчлөгийн урт (өдөрөөр)"
 
@@ -3532,7 +3546,7 @@ msgid "Detail"
 msgstr "Задаргаа"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3552,9 +3566,16 @@ msgid "VAT :"
 msgstr "НӨАТ :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3575,7 +3596,7 @@ msgid "Centralised counterpart"
 msgstr "Хуулбар гүйлгээнд хэрэглэгдэх"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3603,6 +3624,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3630,10 +3652,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Огноо"
 
@@ -3650,7 +3679,6 @@ msgstr "Тулгалтыг арилгах"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3664,7 +3692,7 @@ msgid "Chart of Accounts Template"
 msgstr "Загвар дансны мод"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3676,7 +3704,7 @@ msgstr ""
 "Үүнд харилагчийг тодорхойлно уу!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Зарим гүйлгээнүүд аль хэдий нь тулгагдсан байна !"
@@ -3707,6 +3735,8 @@ msgstr "Төсөв"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Шүүлтгүй"
 
@@ -3792,7 +3822,7 @@ msgid "Analytic Items"
 msgstr "Шинжилгээний бичилтүүд"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Татварыг солих боломжгүй !"
@@ -3823,7 +3853,7 @@ msgid "Mapping"
 msgstr "Харгалзуулалт"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3839,6 +3869,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3852,7 +3883,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Харилцагчийн балансын насжилт тайлан"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "Хаагдсан данс дээр журналын бичилтийг үүсгэх боломжгүй %s %s"
@@ -3944,7 +3975,7 @@ msgstr "Ерөнхий данс бүртгэл"
 #. module: account
 #: report:account.overdue:0
 msgid "Balance :"
-msgstr "Баланс :"
+msgstr "Үлдэгдэл"
 
 #. module: account
 #: help:account.fiscalyear.close,journal_id:0
@@ -4188,7 +4219,7 @@ msgid "Month"
 msgstr "Сар"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4249,7 +4280,7 @@ msgid "Account Base Code"
 msgstr "Account Base Code"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Энэ бараанд зарлагын данс алга:\"%s\" (id:%d)"
@@ -4462,7 +4493,7 @@ msgid "Allow Reconciliation"
 msgstr "Тулгалтыг зөвшөөрөх"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4498,7 +4529,7 @@ msgid "Recurring Models"
 msgstr "Давтан гүйлгээний загвар"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Боловсруулах алдаа"
@@ -4510,6 +4541,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Солих"
 
@@ -4554,7 +4586,7 @@ msgid "Example"
 msgstr "Жишээ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4571,7 +4603,7 @@ msgstr ""
 "Татварын дүнг орлогын дансанд бичих бол татварын дансыг хоосон орхино"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Худалдан авалтын Татвар %.2f%%"
@@ -4599,7 +4631,7 @@ msgstr "Дансны харгалзаа"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Захиалагч"
@@ -4615,7 +4647,7 @@ msgid "Cancelled Invoice"
 msgstr "Цуцлагдсан нэхэмжлэл"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4673,7 +4705,7 @@ msgid "Income Account on Product Template"
 msgstr "Барааны загвар дээрх орлогын данс"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "БУСАД"
@@ -4698,11 +4730,13 @@ msgstr "Шинэ санхүүгийн жил"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Нэхэмжлэл"
 
@@ -4844,26 +4878,24 @@ msgid "Journal Items"
 msgstr "Журналын бичилт"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Алдаа"
@@ -4973,7 +5005,7 @@ msgid "Beginning of Period Date"
 msgstr "Мөчлөгийн огнооны эхлэл"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4999,7 +5031,7 @@ msgid "Child Tax Accounts"
 msgstr "Дэд татварууд"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Эхлэх мөчлөг нь дуусах мөчлөгөөс өмнөх хугацааных байх ёстой"
@@ -5023,6 +5055,7 @@ msgstr "Аналитик баланс -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5066,6 +5099,8 @@ msgstr "Мөчлөгийн төрөл"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Төлбөр"
 
@@ -5144,7 +5179,7 @@ msgid "Line 1:"
 msgstr "Мөр 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Өгөгдлийн алдаа !"
@@ -5177,6 +5212,7 @@ msgstr "Гүйцээлтийн үр дүн"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Баланс тайлан"
@@ -5190,7 +5226,7 @@ msgstr "Ерөнхий журнал"
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date in Period"
-msgstr "Мөчлөг дахь Огноог Шалгана уу"
+msgstr "Огноо мөчлөгийг шалгах"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
@@ -5253,6 +5289,7 @@ msgstr "Тайлан"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5382,9 +5419,8 @@ msgstr "Дансны Ерөнхий Дансны Тайлан"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
-msgstr "Харилцаа холбоо"
+msgstr "Гүйлгээний утга"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
@@ -5395,7 +5431,7 @@ msgstr "Аналитик санхүү"
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include Initial Balances"
-msgstr "Эхлэлийн Балансыг оруулах"
+msgstr "Эхний үлдэгдэл багтах"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -5436,13 +5472,13 @@ msgid "End of Year Entries Journal"
 msgstr "Жилийн хаалтын бичилтийн журнал"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5519,7 +5555,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Захиалагчийн Нэхэмжлэл болон Буцаалтууд"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5692,7 +5727,7 @@ msgid "Generate Opening Entries"
 msgstr "Санхүүгийн жилийн нээлтийн гүйлгээ тохируулах"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Аль хэдий нь тулгагдсан!"
@@ -5725,14 +5760,14 @@ msgid "Child Accounts"
 msgstr "Дэд дансууд"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr "Зөөх нэр (id): %s (%s)"
+msgstr "Гүйлгээний нэр (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Зөрүү"
@@ -5752,7 +5787,7 @@ msgstr "Орлого"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Нийлүүлэгч"
@@ -5782,7 +5817,7 @@ msgid "Account n°"
 msgstr "Данс n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Бусад холбогдол"
@@ -5797,7 +5832,9 @@ msgstr "Үнэлгээ"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Авлага өглөгийн данс"
@@ -5904,7 +5941,7 @@ msgid "Filter by"
 msgstr "Шүүлтүүр"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Танын илэрхийлэл таны моделд буруу байна \"%(...)s\" !"
@@ -5915,8 +5952,8 @@ msgid "Entry Date"
 msgstr "Бичилтийн Огноо"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Та идэвхигүй дансыг хэрэглэх боломжгүй!"
@@ -5958,8 +5995,8 @@ msgid "Number of Days"
 msgstr "Өдрийн дугаар"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -6021,7 +6058,7 @@ msgid "Multipication factor for Base code"
 msgstr "Суурь кодын үржүүлэх коэффициент"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "хэрэгжүүлээгүй"
@@ -6060,6 +6097,8 @@ msgstr "Аналитик гүйлгээ шинжилгээ"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Өнгөрсөн"
 
@@ -6348,6 +6387,8 @@ msgstr "Хувь"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Журнал & Харилцагч"
 
@@ -6357,7 +6398,7 @@ msgid "Power"
 msgstr "Хүч"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Хэрэглэгдээгүй журналын кодыг үүсгэж чадахгүй."
@@ -6399,6 +6440,7 @@ msgid "Applicable Type"
 msgstr "Хэрэглэх төрөл"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Нэхэмжлэлийн дугаарлалт"
@@ -6627,8 +6669,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "Журналын бичилтүүд агуулж байгаа дансыг устгаж болохгүй."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Гүйлгээ: "
@@ -6644,7 +6686,7 @@ msgid "Currency of the related account journal."
 msgstr "Санхүүгийн холбогдох журналын валют"
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Компани хооронд гүйлгээ хийх боломжгүй"
@@ -6661,7 +6703,7 @@ msgid ""
 "need for your company."
 msgstr ""
 "Дансны төрөл нь данс журнал яаж хэрэглэгдэхийг тодорхойлдог. Санхүүгийн "
-"хойшлуулах арга нь тогтмол хугацааны хаалтууд дээр хийгдэх боловсруулалтыг "
+"хойшлогдсон арга нь тогтмол хугацааны хаалтууд дээр хийгдэх боловсруулалтыг "
 "хэлдэг. Баланс тайлан, Ашиг-Алдагдлын тайлан зэрэг нь (ашиг/алдагдал болон "
 "баланс тайлан) ангилалуудыг хэрэглэдэг. Жишээлбэл: дансны төрөл нь хөрөнгө, "
 "авлага, өглөгтэй холбогдсон байж болно. Энэ харагдацаас өөрийн компанид "
@@ -6691,13 +6733,13 @@ msgstr "Төлөв нь ноорог"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Нийт дебит"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "\"%s\" гүйлгээ алга !"
@@ -6769,25 +6811,26 @@ msgstr "Ашиг-Алдагдал (Зардлын данс)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6819,8 +6862,8 @@ msgid "Printed"
 msgstr "Хэвлэгдсэн"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Алдаа :"
@@ -6882,7 +6925,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Харилцагчийн дэвтэр хэлэхдээ нэг харилцагчийг нэг хуудсанд харуулах"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -7048,7 +7091,7 @@ msgid "Total:"
 msgstr "Нийт:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7086,7 +7129,7 @@ msgid "Taxes used in Sales"
 msgstr "Борлуулалтад хэрэглэгддэг татвар"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7162,14 +7205,14 @@ msgid "Source Document"
 msgstr "Эх баримт"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "Илгээгдсэн журналын бичилт \"%s\"-ийг устгах боломжгүй!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7274,8 +7317,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Та энэ нэхэмжлэлийг нээхдээ итгэлтэй байна уу ?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7289,7 +7332,7 @@ msgid "Opening Entries Expense Account"
 msgstr "Нээлтийн Бичилтүүдийн Зардлын Дансдууд"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Дансны бичилт"
@@ -7427,7 +7470,7 @@ msgstr ""
 "ялгаатай татварын жагсаалтууд гарах боломжтой."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Та нэг компаны мөчлөгүүдээс сонгох хэрэгтэй"
@@ -7458,8 +7501,8 @@ msgid "Reporting"
 msgstr "Тайлан"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7555,7 +7598,7 @@ msgid "Sign on Reports"
 msgstr "Тайлан дээрх тэмдэг"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr "Нээлтийн бичилтүүдийг үүсгэх мөчлөг олдсонгүй."
@@ -7566,7 +7609,7 @@ msgid "Root/View"
 msgstr "Язгуур/Харагдац"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7601,13 +7644,14 @@ msgid "Optional Information"
 msgstr "Туслах мэдээлэл"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Энэ журнал үндсэн дебит, кредит данстай байх ёстой"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7636,13 +7680,13 @@ msgid "Maturity Date"
 msgstr "Боловсорч гүйцэх огноо"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Буруу данс !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Борлуулалтын журнал"
@@ -7659,7 +7703,7 @@ msgid "Invoice Tax"
 msgstr "Татварын нэхэмжлэл"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Хэсгийн Дугаар Алга !"
@@ -7713,7 +7757,7 @@ msgstr "Хүртэл"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Валютын Тохиргоо"
@@ -7767,13 +7811,15 @@ msgstr "5 сар"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Өглөгийн данс"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7821,7 +7867,7 @@ msgstr "Тайлангийн нэр"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Бэлэн мөнгө"
@@ -7833,15 +7879,15 @@ msgid "Account Destination"
 msgstr "Солих данс"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7997,13 +8043,14 @@ msgstr "Тогтмол утга"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Анхааруулга !"
@@ -8055,7 +8102,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Нэхэмжлэлд хэрэглэх валютаа сонго"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -8069,7 +8116,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "%s нэхэмжлэлийг ноорог/проформа/цуцлах боломжгүй."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Нэхэмжлэлийн мөр алга !"
@@ -8119,8 +8166,9 @@ msgid ""
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
-"Хуулга тайлан буруу байна !\n"
-"Таамаглагдсан утга (%.2f) нь тооцоолсон (%.2f) утгаас ялгаатай байна."
+"Ордерийн үлдэгдэл буруу байна !\n"
+"Ордерийн эцсийн үлдэгдэл (%.2f) нь тооцоолсон үлдэгдэлтэй (%.2f) тохирохгүй "
+"байна."
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:353
@@ -8148,10 +8196,10 @@ msgstr ""
 #. module: account
 #: field:account.account.type,close_method:0
 msgid "Deferral Method"
-msgstr "Хаагдах хэлбэр"
+msgstr "Хойшлогдсон Арга"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "'%s' нэхэмжлэл төлөгдсөн."
@@ -8219,7 +8267,7 @@ msgid "Associated Partner"
 msgstr "Холбогдох харилцагч"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Та эхлээд харилцагч сонгох хэрэгтэй !"
@@ -8276,7 +8324,7 @@ msgstr ""
 "хуулийн шаардлагын дагуух татварыг кодын хамт харах болно."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8298,7 +8346,7 @@ msgid "Choose Fiscal Year"
 msgstr "Санхүүгийн жил сонгох"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Худалдан авалтын буцаалтын журнал"
@@ -8390,7 +8438,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Үнийн дүнд шингэсэн татварыг тооцоолох програмчлалын код"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8532,7 +8580,7 @@ msgid "current month"
 msgstr "Энэ сар"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8620,10 +8668,12 @@ msgstr "Буцаалтын журнал"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Шүүлтүүр"
 
@@ -8663,7 +8713,7 @@ msgid "The partner account used for this invoice."
 msgstr "Уг нэхэмжлэл дээр хэрэглэгдэх харилцагчийн данс"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Татвар %.2f%%"
@@ -8686,7 +8736,7 @@ msgid "Payment Term Line"
 msgstr "төлбөрийн нөхцөлийн шугам"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Худалдан авалтын журнал"
@@ -8773,7 +8823,7 @@ msgid "Unpaid Invoices"
 msgstr "Төлөгдөөгүй нэхэмжлэл"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8870,7 +8920,8 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
-"Энэ ваучерийн тоо хэмжээ тайлангийн мөр дэх тоо хэмжээтэй ижил байх ёстой."
+"Энэ ваучерийн төлбөрийн мөнгөн дүн ордерийн гүйлгээний мөр дээрх дүнтэй ижил "
+"байх ёстой."
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_expense
@@ -8884,7 +8935,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Хоосон орхивол бүх нээлттэй санхүүгийн жилийг тооцно"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "Төвлөрүүлэх дансны хөдөлгөөн (%s) батлагдсан!"
@@ -8899,7 +8950,7 @@ msgstr ""
 "дүн бичнэ."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8981,7 +9032,7 @@ msgid "Contact Address"
 msgstr "Холбоо барих хаяг"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Буруу модел !"
@@ -9021,12 +9072,14 @@ msgstr "Гэрээнүүд"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "үл мэдэх"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Нээлтийн гүйлгээний журнал"
@@ -9047,7 +9100,7 @@ msgstr ""
 "нэмэгдэж, Алдагдал бол: дүн хорогдоно). Ашиг-Алдагдлын Тайлангаас бодогдоно."
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Энэ нэхэмжлэлд холбогдох журналын дарааллыг тодорхойлно уу."
@@ -9137,7 +9190,7 @@ msgid "Period from"
 msgstr "Эхлэл мөчлөг"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Борлуулалтын буцаалтын журнал"
@@ -9184,7 +9237,7 @@ msgid "Purchase Tax(%)"
 msgstr "Худалдан авалтын татвар(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Нэхэмжлэлийн мөр үүсгэнэ үү."
@@ -9200,7 +9253,7 @@ msgid "Display Detail"
 msgstr "Дэлгэрэнгүйг харуулах"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9238,8 +9291,6 @@ msgstr "Мөчлөгийн төгсгөл"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Санхүүгийн Тайлангууд"
@@ -9254,6 +9305,7 @@ msgstr "Санхүүгийн Тайлангууд"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9274,6 +9326,7 @@ msgstr "Эхлэх мөчлөг"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Анализын чиглэл"
 
@@ -9293,7 +9346,7 @@ msgstr "Журналын харагдац"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Нийт кредит"
@@ -9362,6 +9415,7 @@ msgstr "Банкны хуулгууд"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9443,7 +9497,7 @@ msgstr ""
 "автоматаар санал болгоно."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Та тулгах дансаа сонгох шаардлагатай"
@@ -9470,7 +9524,6 @@ msgstr ""
 "ажиллагаанаас хамааруулан хийх боломжтой."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Шүүлт"
@@ -9492,7 +9545,7 @@ msgid "Move"
 msgstr "Ажил гүйлгээ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "Та татварыг өөрчлөх боломжгүй, харин устгаад шинээр үүсгэж болно !"
@@ -9550,7 +9603,7 @@ msgid "Consolidated Children"
 msgstr "Нэгтгэсэн дэд дансууд"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9613,6 +9666,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9674,6 +9728,7 @@ msgstr "Гүйлгээний тэмдэглэл"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9681,6 +9736,7 @@ msgstr "Гүйлгээний тэмдэглэл"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9725,7 +9781,7 @@ msgid "Unreconciled"
 msgstr "Тулгагдаагүй"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Нийлбэр буруу !"
@@ -9790,7 +9846,7 @@ msgid "Comparison"
 msgstr "Харьцуулалт"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Үл мэдэгдэх Алдаа"
@@ -9827,6 +9883,7 @@ msgstr "Ажил гүйлгээ батлах"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9868,6 +9925,9 @@ msgid ""
 "You can not select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 msgstr ""
+"Тохиргооны алдаа! \n"
+"Дотоод төрөл нь \"Өглөг/Авлага\" төрөлтэй дансдын хувьд хойшлогдсон аргатай "
+"дансанд \"Тулгахгүй\"-с өөр төрлийг сонгож болохгүй! "
 
 #. module: account
 #: view:account.model:0
@@ -9931,9 +9991,11 @@ msgstr "Сүүлийн 30 өдөрийн Шинжилгээний Бичилтү
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Мөчлөг"
 
@@ -10104,6 +10166,7 @@ msgstr "Батлагдсан"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10151,7 +10214,7 @@ msgid "No detail"
 msgstr "Дэлгэрэнгүй байхгүй"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Энэ бараанд орлогын данс тодорхойлогдоогүй байна: \"%s\" (id:%d)"
@@ -10187,6 +10250,7 @@ msgid "Verification Total"
 msgstr "Шалгах Дүн"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10207,6 +10271,7 @@ msgstr "Жургал: Бүгд"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10221,7 +10286,9 @@ msgstr "Жургал: Бүгд"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10231,6 +10298,8 @@ msgstr "Жургал: Бүгд"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10391,6 +10460,7 @@ msgstr "Нийлүүлэгчийн нэхэмжлэл"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10424,6 +10494,8 @@ msgstr "Алдаа ! Тойрог хамааралтай дансны үлгэр
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Журналын бичилтийн дугаар"
 
@@ -10443,7 +10515,7 @@ msgstr ""
 "төрөл рүү хөрвүүлэх боломжгүй!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Бичилт аль хэдий нь тулгагдсан"
@@ -10484,8 +10556,10 @@ msgstr ""
 "хэрэггүй болсон данс байна."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Гүйлгээтэй"
@@ -10607,8 +10681,8 @@ msgid "Statistic Reports"
 msgstr "Статистик тайлан"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Буруу данс!"
@@ -10639,7 +10713,7 @@ msgid "Accounts Mapping"
 msgstr "Дансны харгалзаа"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "'%s' нэхэмжлэл хяналт хүлээж байна."
@@ -10901,6 +10975,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10979,6 +11054,8 @@ msgstr "Гүйцээх огноо"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Ирээдүй"
 
diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po
index 19af0a3e4dd..9aa810a183a 100644
--- a/addons/account/i18n/nb.po
+++ b/addons/account/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:03+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -39,6 +39,8 @@ msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
 msgstr ""
+"Bestem visningsrekkefølgen i rapporten «Regnskap \\ Rapportering \\ Generic "
+"Rapportering \\ Skatter \\ skatte Rapport"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -76,13 +78,13 @@ msgstr "Kontovaluta"
 #. module: account
 #: view:account.tax:0
 msgid "Children Definition"
-msgstr ""
+msgstr "barne Definisjon"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:302
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr ""
+msgstr "Journal element «% s\" er ikke gyldig."
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -119,6 +121,7 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"Konfigurasjon feil! Den valgte valutaen bør deles av standard kontoer også."
 
 #. module: account
 #: report:account.invoice:0
@@ -142,6 +145,7 @@ msgstr "Avstem"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referanse"
 
@@ -160,13 +164,13 @@ msgstr ""
 "betalingsbetingelsene uten å fjerne dem."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Advarsel!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diverse journal"
@@ -231,7 +235,7 @@ msgstr ""
 "Skattekoden skal vises på fakturaer"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Faktura '%s' er delbetalt:%s%s av %s%s (%s%s gjenstår)"
@@ -247,7 +251,7 @@ msgid "Belgian Reports"
 msgstr "Belgiske rapporter"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Du kan ikke legge til/endre registreringer i en lukket journal"
@@ -259,6 +263,9 @@ msgid ""
 "legal reports, and set the rules to close a fiscal year and generate opening "
 "entries."
 msgstr ""
+"Kontotype brukes for informasjons formål, å generere landsspesifikke "
+"juridiske rapporter og angi reglene for å lukke et regnskapsår og generere "
+"åpning oppføringer."
 
 #. module: account
 #: report:account.overdue:0
@@ -293,7 +300,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Fakturalinje konto firma stemmer ikke med faktura firma."
@@ -344,6 +351,9 @@ msgid ""
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
 msgstr ""
+"Du kan sette opp formatet du ønsker denne posten skal vises. Hvis du lar den "
+"automatiske formateringen, vil det bli beregnet basert på økonomiske "
+"rapporter hierarkiet (auto-computertomographie feltet 'nivå')."
 
 #. module: account
 #: view:account.installer:0
@@ -373,7 +383,7 @@ msgstr ""
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Du kan ikke lage journalregistreringer på konto av typen vis"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -460,6 +470,9 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
+"Når tidsskriftet periode er opprettet. Staten er \"Kladd\". Hvis en rapport "
+"skrives det kommer til \"Trykt \"tilstand. Når alle transaksjoner er gjort, "
+"kommer det i Ferdig tilstand"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -469,6 +482,11 @@ msgid ""
 "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."
 msgstr ""
+"Figur av Skattedirektoratet er en trevisning reflekterer strukturen i "
+"skattesaker (eller avgiftskoder) og viser gjeldende skattemessige situasjon. "
+"Skattesystemet diagram representerer mengden av hvert område av "
+"selvangivelsen for landet ditt. Det er presentert i en hierarkisk struktur, "
+"som kan bli endret for å passe dine behov."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -578,8 +596,10 @@ msgid "The accountant confirms the statement."
 msgstr "Regnskapsfører bekrefter konto."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -637,7 +657,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Hovedsekvensen må være anderledes en gjeldende"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -649,7 +669,7 @@ msgid "Tax Code Amount"
 msgstr "Avgiftskodebeløp"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -663,7 +683,7 @@ msgstr "Lukk periode"
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr ""
+msgstr "Konto Felles Partner Rapport"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
@@ -676,8 +696,8 @@ msgid "Journal Period"
 msgstr "Journalperiode"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -689,6 +709,8 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"Datoen for din bilagsregistrering ikke er i den definerte perioden! Du bør "
+"endre datoen eller fjerne denne begrensningen fra tidsskriftet."
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
@@ -755,6 +777,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Dukan bare endre valuta for fakturakladder !"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Finansrapport"
@@ -770,12 +793,13 @@ msgstr "Finansrapport"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Type"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -787,7 +811,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr ""
+msgstr "Konto Abonnement Linje"
 
 #. module: account
 #: help:account.invoice,reference:0
@@ -835,6 +859,10 @@ msgid ""
 "or Loss you'd realized if those transactions were ended today. Only for "
 "accounts having a secondary currency set."
 msgstr ""
+"Når du gjør multi-valuta transaksjoner, kan du miste eller få noen mengde på "
+"grunn av endringer i valutakursen. Denne menyen gir deg en prognose av "
+"gevinsten eller tapet du hadde innsett hvis disse transaksjonene ble "
+"avsluttet i dag. Bare for kontoer som har en sekundær valuta sett."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -863,6 +891,8 @@ msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
 msgstr ""
+"Kan ikke% s faktura som allerede er forsonet, bør fakturaen ikke avstemte "
+"først. Du kan bare tilbakebetale denne fakturaen."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -903,17 +933,20 @@ msgid "Create 3 Months Periods"
 msgstr "Lag en 3 måneders periode"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Forfall"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"!"
 msgstr ""
+"Du kan ikke validere dette bilagsregistrering fordi kontoen \"% s\" ikke "
+"hører til kontoplan \"% s\"!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:835
@@ -922,6 +955,8 @@ msgid ""
 "This account does not allow reconciliation! You should update the account "
 "definition to change this."
 msgstr ""
+"Denne kontoen tillater ikke avstemming! Du bør oppdatere konto definisjonen "
+"å endre dette."
 
 #. module: account
 #: view:account.invoice:0
@@ -984,12 +1019,15 @@ msgid ""
 "amount.If the tax account is base tax code, this field will contain the "
 "basic amount(without tax)."
 msgstr ""
+"Dersom Skatt kontoen er en skatt kode konto, vil dette feltet inneholde "
+"skattlagt beløp. Vis skatte kontoen er base skatt kode, dette feltet vil "
+"inneholde grunnbeløpet (uten skatt)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
-msgstr ""
+msgstr "Jeg kan ikke finne en forelder kode for mal konto!"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1019,10 +1057,10 @@ msgid "Code"
 msgstr "Kode"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1065,6 +1103,8 @@ msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
 "journal items!"
 msgstr ""
+"Du kan ikke endre kontotype fra '% s' til '% s' type som inneholder "
+"tidsskrift vare!"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
@@ -1086,7 +1126,7 @@ msgstr ""
 "om kontoen og dens egenskaper."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1096,7 +1136,7 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "anvendbarhe Alternativer"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1130,12 +1170,12 @@ msgstr "Opprett registreringer før:"
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr ""
+msgstr "Ubalanserte Journal Elementer"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1156,6 +1196,8 @@ msgid ""
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Totalt beløp (i videregående valuta) for transaksjoner som ble holdt i "
+"videregående valuta for denne kontoen."
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1181,6 +1223,10 @@ msgid ""
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
+"Med leverandørfakturaer kan du gå inn og administrere fakturaer utstedt av "
+"dine leverandører. OpenERP kan også generere utkast fakturaer automatisk fra "
+"innkjøpsordrer eller kvitteringer. På denne måten kan du kontrollere at "
+"fakturaen fra leverandøren i henhold til hva du har kjøpt eller mottatt."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
@@ -1227,12 +1273,14 @@ msgid "The move of this entry line."
 msgstr "The move of this entry line."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal !"
 msgstr ""
+"Du kan ikke bruke denne generelle konto i dette tidsskriftet, sjekk fanen "
+"'Entry Controls' på den relaterte tidsskriftet!"
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@@ -1245,10 +1293,10 @@ msgstr "Ant. transaksjon"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Entry Label"
-msgstr "Entry Label"
+msgstr "Posteringstekst"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1269,7 +1317,7 @@ msgstr "Andre"
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr ""
+msgstr "utkast abonnement"
 
 #. module: account
 #: view:account.account:0
@@ -1310,7 +1358,7 @@ msgstr "Inkludert i grunnbeløp"
 #: model:ir.actions.act_window,name:account.action_account_entries_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
 msgid "Entries Analysis"
-msgstr ""
+msgstr "Tilgang analyse"
 
 #. module: account
 #: field:account.account,level:0
@@ -1334,14 +1382,15 @@ msgid "Taxes"
 msgstr "Avgifter"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Velg en start- og sluttperiode"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Resultatregnskap"
 
@@ -1396,6 +1445,7 @@ msgid "Journal Items Analysis"
 msgstr "Analyse av journaloppføringer"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Partnere"
@@ -1420,8 +1470,10 @@ msgid "Central Journal"
 msgstr "Hovedjournal"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1482,6 +1534,10 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
+"En bilagsregistrering består av flere journaler elementer, som hver er enten "
+"en debet eller kreditt transaksjon. OpenERP oppretter automatisk en "
+"bilagsregistrering per regnskap dokumentet: faktura, tilbakebetaling, "
+"leverandør betaling, kontoutskrifter, etc."
 
 #. module: account
 #: view:account.entries.report:0
@@ -1494,6 +1550,8 @@ msgid ""
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
 msgstr ""
+"Ved å fjerne det aktive feltet, kan du skjule en finanspolitisk posisjon "
+"uten å slette den."
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
@@ -1601,6 +1659,12 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
+"En kontoutskrift er en oppsummering av alle finansielle transaksjoner det "
+"skjer over en gitt tidsperiode på en innskuddskonto, kredittkort eller en "
+"annen type økonomisk konto. Utgangspunktet balansen vil bli foreslått "
+"automatisk og utgående balanse er å finne på kontoutskriften din. Når du er "
+"i Betaling kolonne på en linje, kan du trykke F1 for å åpne forsoning "
+"skjemaet."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -1638,7 +1702,7 @@ msgstr "Analytiske kostnader å fakturere"
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequence"
-msgstr ""
+msgstr "Regnskapsåret sekvens"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
@@ -1646,6 +1710,7 @@ msgid "Separated Journal Sequences"
 msgstr "Separate journalsekvenser"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Ansvarlig"
@@ -1656,6 +1721,8 @@ msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
 msgstr ""
+"Avbryt Faktura: Oppretter tilbakebetalingen faktura, validere og forsone det "
+"å avbryte den aktuelle fakturaen."
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1674,7 +1741,7 @@ msgid "Year Sum"
 msgstr "Sum for året"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1692,11 +1759,13 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
+"Vis din bedrift kontoplan per regnskapsår og filtrere etter periode. Ha en "
+"komplett trevisning av alle journaler pr kontokode ved å klikke på en konto."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr ""
+msgstr "Ventende kontoer"
 
 #. module: account
 #: view:account.tax.template:0
@@ -1709,6 +1778,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
+"Dersom det aktive feltet er satt til False, vil det tillate deg å skjule "
+"tidsskriftet perioden uten å fjerne det."
 
 #. module: account
 #: view:res.partner:0
@@ -1723,7 +1794,7 @@ msgstr "Debitorer og kreditorer"
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr ""
+msgstr "Felles konto Journal Rapport"
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
@@ -1747,7 +1818,7 @@ msgid "Customer Ref:"
 msgstr "Kundens ref:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Bruker %s har ikke rettigheter til %s journal !"
@@ -1835,7 +1906,7 @@ msgstr "Subtotal"
 #: model:ir.model,name:account.model_account_treasury_report
 #: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "statskassens Analyse"
 
 #. module: account
 #: constraint:res.company:0
@@ -1868,7 +1939,7 @@ msgstr "Gyldig"
 #: model:ir.actions.act_window,name:account.action_account_print_journal
 #: model:ir.model,name:account.model_account_print_journal
 msgid "Account Print Journal"
-msgstr ""
+msgstr "Konto Print Journal"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
@@ -1887,12 +1958,15 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), as calculated in Profit & "
 "Loss Report"
 msgstr ""
+"Denne kontoen brukes for overføring Gevinst / tap (Vis det er Gevinst: "
+"Beløpe vil bli lagt til, tap: Beløpet blir trukket.) Som beregnes i "
+"Resultatregnskap Report"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Comparison between accounting and payment entries"
-msgstr ""
+msgstr "Sammenligning mellom regnskap og betaling oppføringer"
 
 #. module: account
 #: view:account.tax:0
@@ -1906,6 +1980,8 @@ msgid ""
 "Check this box if you want to use a different sequence for each created "
 "journal. Otherwise, all will use the same sequence."
 msgstr ""
+"Sjekk denne boksen hvis du ønsker å bruke en annen sekvens for hver "
+"opprettet journal. Ellers vil alle bruke samme sekvens."
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -1914,6 +1990,8 @@ msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
 msgstr ""
+"Det legger valutaen kolonne hvis valutaen er forskjellig enn selskapet "
+"valutaen"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -1921,6 +1999,8 @@ msgid ""
 "If set to True then do not accept the entry if the entry date is not into "
 "the period dates"
 msgstr ""
+"Hvis den er satt til True ikke godta oppføringen hvis Påmeldingsfrist ikke "
+"er i perioden datoer."
 
 #. module: account
 #: code:addons/account/account_invoice.py:73
@@ -1941,11 +2021,14 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Den valgte kontoen av dine Bilagsregistrering blir tvunget for å gi en "
+"sekundær valuta. Du bør fjerne den sekundære valuta på konto eller velg en "
+"flervaluta syn på tidsskriftet."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_financial_report_tree
 msgid "Makes a generic system to draw financial reports easily."
-msgstr ""
+msgstr "Gjør et generisk system for å tegne finansielle rapporter enkelt."
 
 #. module: account
 #: view:account.invoice:0
@@ -1959,6 +2042,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Dersom det aktive feltet er satt til False, vil det tillate deg å skjule "
+"skatt uten å fjerne det."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -2013,7 +2098,7 @@ msgstr "Konto for avstemming"
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr ""
+msgstr "Importer av uttalelsen i systemet fra en elektronisk fil"
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
@@ -2050,6 +2135,8 @@ msgid ""
 "Invalid period ! Some periods overlap or the date period is not in the scope "
 "of the fiscal year. "
 msgstr ""
+"Ugyldig periode! Enkelte perioder overlapper eller dato perioden er ikke i "
+"omfanget av regnskapsåret. "
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:357
@@ -2066,12 +2153,15 @@ msgid "Pro-forma"
 msgstr "Proforma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Det er ingen standard. \n"
+"Standard belastningskonto definert\n"
+"på tidsskriftet \"% s\""
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2083,6 +2173,11 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for depreciated "
 "accounts."
 msgstr ""
+"Denne typen blir brukt til å differensiere typer med spesielle effekter i "
+"OpenERP: view kan ikke ha oppføringer, konsolidering er kontoer som kan få "
+"barne kontoer for flere firma konsolideringer, betales / mottas er for "
+"samarbeidspartnere kontoer (for debet / kreditt beregninger), stengt for "
+"nedskrevne kontoer."
 
 #. module: account
 #: view:account.chart.template:0
@@ -2090,13 +2185,16 @@ msgid "Search Chart of Account Templates"
 msgstr "Søk kontoplanmal"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Kan ikke opprette en automatisk sekvens for dette stykket!\n"
+"Sett en sekvens i tidsskriftet definisjonen for automatisk nummerering eller "
+"opprette en sekvens manuelt for dette stykket."
 
 #. module: account
 #: code:addons/account/account.py:787
@@ -2105,6 +2203,8 @@ msgid ""
 "You can not modify the company of this journal as its related record exist "
 "in journal items"
 msgstr ""
+"Du kan ikke endre selskapet av magasinet som dens tilhørende rekord finnes i "
+"tidsskriftet varer"
 
 #. module: account
 #: report:account.invoice:0
@@ -2118,6 +2218,9 @@ msgid ""
 "certified Chart of Accounts exists for your specified country, a generic one "
 "can be installed and will be selected by default."
 msgstr ""
+"Standardinnstillingen Kontoplan er tilsvarende ditt valg av land. Hvis ingen "
+"sertifisert Kontoplan finnes for ditt angitte landet, kan en generisk bli "
+"installert og vil bli valgt som standard."
 
 #. module: account
 #: view:account.account.type:0
@@ -2139,10 +2242,10 @@ msgid "Description"
 msgstr "Beskrivelse"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
-msgstr ""
+msgstr "ECNJ"
 
 #. module: account
 #: view:account.subscription:0
@@ -2158,7 +2261,7 @@ msgid "Income Account"
 msgstr "Inntektskonto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Det er ikke opprettet regnskapsjournal av type salg eller innkjøp!"
@@ -2198,6 +2301,7 @@ msgstr "Produktmal"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2207,6 +2311,7 @@ msgstr "Produktmal"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2257,12 +2362,14 @@ msgid "Account Line"
 msgstr "Konteringslinje"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
 msgstr ""
+"Det er ingen standard.\n"
+"Standard kreditt konto definert på tidsskriftet \"% s\""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_financial_journals_installer
@@ -2271,6 +2378,9 @@ msgid ""
 "'Setup Your Bank Accounts' tool that will automatically create the accounts "
 "and journals for you."
 msgstr ""
+"Sett opp ditt regnskap tidsskrifter. For bankkonti, er det bedre å bruke "
+"\"Setup bankkontoer Verktøyet som vil automatisk opprette kontoer og "
+"tidsskrifter for deg."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
@@ -2280,7 +2390,7 @@ msgstr "Kontopostering"
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -2288,12 +2398,14 @@ msgid "Main Sequence"
 msgstr "Hovedsekvens"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
 msgstr ""
+"For å slette en kontoutskrift, må du først avbryte det å slette relaterte "
+"tidsskriftet elementer."
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2311,7 +2423,7 @@ msgstr "Betalingsbetingelser"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Positions"
-msgstr ""
+msgstr "skattemessige posisjoner"
 
 #. module: account
 #: constraint:account.account:0
@@ -2362,7 +2474,7 @@ msgid "Account Tax Code"
 msgstr "Konto avgiftskode"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2370,6 +2482,9 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
+"Kan ikke finne noen konto journal av% s for denne bedriften.\n"
+"Du kan opprette en i menyen:\n"
+"Configuration \\ Financial Accounting \\ regnskap \\ Journals."
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_advance
@@ -2391,7 +2506,7 @@ msgstr "Basiskode"
 #. module: account
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
-msgstr ""
+msgstr "Gir sekvensen ordre når det viser en liste over faktura skatt."
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2411,11 +2526,18 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Denne menyen skriver en merverdiavgift erklæring basert på fakturaer eller "
+"betalinger. Velg en eller flere perioder av regnskapsåret. Informasjonen som "
+"kreves for en selvangivelse blir automatisk generert av OpenERP fra "
+"fakturaer (eller utbetalinger, i noen land). Disse dataene blir oppdatert i "
+"sanntid. Det er veldig nyttig fordi det lar deg forhåndsvise til enhver tid "
+"den skatten som du skylder på begynnelsen og slutten av måneden eller "
+"kvartalet."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr ""
+msgstr "Debet Sentralisering"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -2435,15 +2557,15 @@ msgstr "Dag"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr ""
+msgstr "Kontoer for å fornye"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr ""
+msgstr "Konto Modell oppføringer"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2493,20 +2615,23 @@ msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
 msgstr ""
+"Den finanspolitiske stillingen vil bestemme skatter og regnskapet brukes for "
+"partneren."
 
 #. module: account
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
 msgstr ""
+"Denne rapporten gir deg en oversikt over situasjonen til en bestemt "
+"tidsskrift"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr ""
+msgstr "Konto trekk linje forsonet (writeoff)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2538,7 +2663,7 @@ msgid "Accounts"
 msgstr "Konto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfigurasjonsfeil!"
@@ -2594,7 +2719,7 @@ msgstr "Ref"
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or a tax code account."
-msgstr ""
+msgstr "Kontoen kan enten være en base skatt kode eller en skatt kode konto"
 
 #. module: account
 #: sql_constraint:account.model.line:0
@@ -2615,7 +2740,7 @@ msgstr "Betalt/avstemt"
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr ""
+msgstr "Tilbakebetaling Base kode."
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2634,7 +2759,7 @@ msgstr "Datoer"
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr ""
+msgstr "Forelder figur mal."
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -2654,10 +2779,13 @@ msgid ""
 "Automatically generate entries based on what has been entered in the  system "
 "before a specific date."
 msgstr ""
+"Automatisk genererer oppføringer basert på hva som har blitt lagt inn i "
+"systemet før en bestemt dato."
 
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Aldersfordelt partnersaldo"
@@ -2687,12 +2815,17 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
+"Merk denne boksen hvis du ikke vil at nye posteringer for å passere gjennom "
+"\"utkast\" staten og i stedet går direkte til \"postet statens uten manuell "
+"validering.\n"
+"Merk at posteringer som opprettes automatisk av systemet er alltid hopper "
+"over staten."
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
 msgid "New Company Financial Setting"
-msgstr ""
+msgstr "Ny selskap finansiell innstilling"
 
 #. module: account
 #: view:account.installer:0
@@ -2702,21 +2835,21 @@ msgstr "Konfigurer din kontoplan"
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr ""
+msgstr "Denne veiviseren vil skape gjentakende regnskapspostene."
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Ingen sekvens angitt i journal !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "Du må definere en analytisk journal på '% s' dagbok!"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -2725,6 +2858,8 @@ msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance!"
 msgstr ""
+"Du trenger en åpning tidsskrift med sentralisering sjekket for å sette den "
+"innledende balanse!"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -2763,7 +2898,7 @@ msgstr "August"
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
-msgstr ""
+msgstr "Betaling oppføringer er den andre inngangen på forsoning."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2780,6 +2915,9 @@ msgid ""
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very useful for some reports."
 msgstr ""
+"Den optimale mengden uttrykt denne linjen, for eksempel: antall solgte "
+"produkt. Mengden er ikke et juridisk krav, men er svært nyttig for noen "
+"rapporter."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -2808,6 +2946,7 @@ msgstr "La stå blank for å benytte samme periode bekreftelses(faktura)dato."
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
 msgstr ""
+"Brukt i setningen forsoning domene, men bør ikke brukes andre steder."
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -2815,7 +2954,7 @@ msgid "Base Code Amount"
 msgstr "Basiskode beløp"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2830,7 +2969,7 @@ msgid "Default Sale Tax"
 msgstr "Standard salgsavgift"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Faktura '%s' er godkjent."
@@ -2842,6 +2981,9 @@ msgid ""
 "between the creation date or the creation date of the entries plus the "
 "partner payment terms."
 msgstr ""
+"Forfallsdatoen for genererte oppføringer for denne modellen. Du kan velge "
+"mellom opprettelsesdatoen eller opprettelsesdatoen av oppføringene pluss "
+"samarbeidslandene betalingsvilkårene."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -2868,12 +3010,14 @@ msgid "Fiscal Position"
 msgstr "Regnskapsstatus"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
 "Click on compute to update the tax base."
 msgstr ""
+"Skattegrunnlag annerledes!\n"
+"Klikk på datamaskinen for å oppdatere skattegrunnlaget."
 
 #. module: account
 #: field:account.partner.ledger,page_split:0
@@ -2900,6 +3044,8 @@ msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
 msgstr ""
+"Still hvis mengden av skatt må inkluderes i grunnbeløpet før du kan regne de "
+"neste skattene."
 
 #. module: account
 #: help:account.journal,user_id:0
@@ -3020,7 +3166,7 @@ msgid "View"
 msgstr "Vis"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3049,7 +3195,7 @@ msgstr "Kundekreditt"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month: 0"
-msgstr ""
+msgstr "  Dagen i måneden: 0"
 
 #. module: account
 #: view:account.subscription:0
@@ -3059,12 +3205,12 @@ msgstr "Starter på"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr ""
+msgstr "Konto Partner ledger"
 
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr ""
+msgstr "Gir sekvensen for å merke kolonne."
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3072,6 +3218,7 @@ msgstr ""
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
 msgstr ""
+"Tvinger alle trekk for denne kontoen til å ha denne sekundære valuta."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -3079,6 +3226,8 @@ msgid ""
 "This wizard will validate all journal entries of a particular journal and "
 "period. Once journal entries are validated, you can not update them anymore."
 msgstr ""
+"Denne veiviseren vil validere alle posteringer på en bestemt journal og "
+"periode. Når bilag er validert, kan du ikke oppdatere dem lenger."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -3094,7 +3243,7 @@ msgstr ""
 #. module: account
 #: view:report.account.sales:0
 msgid "This months' Sales by type"
-msgstr ""
+msgstr "Denne måneds Salgssentral etter type"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3193,12 +3342,12 @@ msgstr "Innkjøp"
 #: view:account.installer:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
-msgstr ""
+msgstr "Regnskap programkonfigurasjon"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: 0.02"
-msgstr ""
+msgstr "  Verdi beløp: 0.02"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -3213,7 +3362,7 @@ msgid "Starting Balance"
 msgstr "Inngående saldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Ingen partner er definert!"
@@ -3238,7 +3387,7 @@ msgstr "MVA:"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
 
 #. module: account
 #: help:account.analytic.line,amount_currency:0
@@ -3246,6 +3395,8 @@ msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
 msgstr ""
+"Beløpet uttrykt i den tilknyttede kontoen valuta hvis ikke lik den selskapet "
+"en."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -3267,15 +3418,15 @@ msgid "Chart of Tax"
 msgstr "Avgiftsplan"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
-msgstr ""
+msgstr "Den utgående balanse bør være den samme enn den beregnede balanse!"
 
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr ""
+msgstr "Søk Konto Journal"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
@@ -3300,6 +3451,8 @@ msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
 msgstr ""
+"Alle valgte posteringer blir validert og postet. Det betyr at du ikke kunne "
+"endre sine regnskapsprinsipper felt lenger."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -3325,7 +3478,7 @@ msgstr "Søk bevegelse"
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
-msgstr ""
+msgstr "Skatt saksnavnet"
 
 #. module: account
 #: report:account.invoice:0
@@ -3340,6 +3493,8 @@ msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
 msgstr ""
+"Valgte fakturaer) kan ikke kanselleres som de er allerede i \"Avlyst\" eller "
+"\"ferdig\" stat!"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -3348,6 +3503,7 @@ msgstr "Kvantum :"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Periodelengde (dager)"
 
@@ -3394,7 +3550,7 @@ msgid "Detail"
 msgstr "Detaljert"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3402,6 +3558,11 @@ msgid ""
 "amount greater than the total invoiced amount. The latest line of your "
 "payment term must be of type 'balance' to avoid rounding issues."
 msgstr ""
+"Kan ikke opprette fakturaen!\n"
+"Den tilhørende innbetaling sikt er trolig feilkonfigurert som det gir en "
+"beregnet beløp større enn det totale fakturerte beløpet. Den siste linjen "
+"din betalingsfrist må være av typen \"balanse\" for å unngå avrunding "
+"problemer."
 
 #. module: account
 #: report:account.invoice:0
@@ -3409,9 +3570,16 @@ msgid "VAT :"
 msgstr "MVA:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3432,15 +3600,15 @@ msgid "Centralised counterpart"
 msgstr "Centralised counterpart"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
-msgstr ""
+msgstr "Du kan ikke opprette journal elementer på en \"vis\"-kontoen% s% s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr ""
+msgstr "Forsoningsprosess partner med partner"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3457,6 +3625,7 @@ msgstr "(Hvis du ikke velger regnsk.år vil alle åpne regnsk.år bli valgt)"
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3484,10 +3653,17 @@ msgstr "(Hvis du ikke velger regnsk.år vil alle åpne regnsk.år bli valgt)"
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Dato"
 
@@ -3504,7 +3680,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3518,16 +3693,19 @@ msgid "Chart of Accounts Template"
 msgstr "Kontoplanmal"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"Forfallsdato kommandolinjen generert av modellens linje '% s' modell '% s' "
+"er basert på partner betaling sikt!\n"
+"Vennligst definere partner på det!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Noen regsitreringer er allerede avstemt!"
@@ -3558,6 +3736,8 @@ msgstr "Budsjetter"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Ingen filter"
 
@@ -3585,7 +3765,7 @@ msgstr ""
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Applicable Code (if type=code)"
-msgstr ""
+msgstr "Gjelder kode (hvis type = kode)"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -3623,6 +3803,8 @@ msgstr "Betalingsoppdrag"
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
 msgstr ""
+"Sjekk dette alternativet hvis du vil at brukeren skal avstemme oppføringer i "
+"denne kontoen."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
@@ -3641,7 +3823,7 @@ msgid "Analytic Items"
 msgstr "Analytiske registreringer"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Ikke mulig å endre avgift!"
@@ -3664,7 +3846,7 @@ msgstr "Åpne faktura"
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr ""
+msgstr "Multiplikasjonsfaktor Skatt kode"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -3672,13 +3854,16 @@ msgid "Mapping"
 msgstr "Avgiftskartlegging"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
 "centralised counterpart box in the related journal from the configuration "
 "menu."
 msgstr ""
+"Du kan ikke opprette en faktura på en sentralisert journal. Fjern merkingen "
+"den sentraliserte motpart boksen i den aktuelle tidsskriftet fra "
+"konfigurasjonsmenyen."
 
 #. module: account
 #: field:account.account,name:0
@@ -3686,6 +3871,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3696,10 +3882,10 @@ msgstr "Navn"
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr ""
+msgstr "Konto Aldret saldobalansen Rapport"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "Du kan ikke lage journaloppføringer på en lukket konto %s %s"
@@ -3745,6 +3931,8 @@ msgid ""
 "The fiscalyear, periods or chart of account chosen have to belong to the "
 "same company."
 msgstr ""
+"Regnskapsåret, perioder eller en oversikt over kontoen valgt å tilhøre samme "
+"selskap"
 
 #. module: account
 #: model:ir.actions.todo.category,name:account.category_accounting_configuration
@@ -3771,6 +3959,8 @@ msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
 msgstr ""
+"Skriv rapport med valutaen kolonne hvis valutaen er forskjellig enn "
+"selskapet valutaen"
 
 #. module: account
 #: help:account.account,unrealized_gain_loss:0
@@ -3778,6 +3968,8 @@ msgid ""
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
 msgstr ""
+"Verdi av tap eller gevinst som følge av endringer i valutakursen når du gjør "
+"flere valutatransaksjoner."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3797,6 +3989,10 @@ msgid ""
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
+"Det beste praksis her er å bruke et tidsskrift dedikert til inneholde de "
+"første oppføringene i alle regnskapsår. Merk at du bør definere det med "
+"standard debet / kreditt-kontoer, av typen \"situasjon\" og med en "
+"sentralisert motpart."
 
 #. module: account
 #: view:account.installer:0
@@ -3832,7 +4028,7 @@ msgstr "Valider"
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 msgid "Cost Ledger"
-msgstr ""
+msgstr "Kostnad merker"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
@@ -3891,6 +4087,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Dersom det aktive feltet er satt til False, vil det tillate deg å skjule "
+"kontoen uten å fjerne det."
 
 #. module: account
 #: view:account.move.line:0
@@ -3905,7 +4103,7 @@ msgstr "Søk avgiftsmaler"
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr ""
+msgstr "utkastene"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -3926,7 +4124,7 @@ msgstr "Snarvei"
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The start date of the fiscal year must be before his end date."
-msgstr ""
+msgstr "Feil! Startdatoen for regnskapsåret må være før han sluttdato."
 
 #. module: account
 #: view:account.account:0
@@ -3985,6 +4183,8 @@ msgid ""
 "You haven't supplied enough argument to compute the initial balance, please "
 "select a period and journal in the context."
 msgstr ""
+"Du har ikke levert nok argument til å beregne utgangsposisjonen balanse, "
+"vennligst velg en periode og tidsskrift i sammenheng."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -3992,11 +4192,13 @@ msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft supplier invoices."
 msgstr ""
+"Analytiske kostnader (timelister, noen kjøpte produkter, ...) kommer fra "
+"analytiske kontoer. Disse genererer utkast leverandørfakturaer."
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Close CashBox"
-msgstr ""
+msgstr "Lukk Cash Box"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4021,18 +4223,22 @@ msgid "Month"
 msgstr "Måned"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
 "some non legal fields or you must unconfirm the journal entry first! \n"
 "%s"
 msgstr ""
+"Du kan ikke gjøre denne endringen på en bekreftet oppføring! Du kan bare "
+"endre noen ikke juridiske felt, eller du må bekrefte bilagsregistreringen "
+"først!\n"
+"% s"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr ""
+msgstr "Paypal-konto"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
@@ -4048,19 +4254,19 @@ msgstr "Notat"
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Reverse balance sign"
-msgstr ""
+msgstr "Omvendt balanse tegn"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Overdue Account"
-msgstr ""
+msgstr "forfalt konto"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:184
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr ""
+msgstr "Balanse (Ansvar konto)"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4075,10 +4281,10 @@ msgstr "Avgiftslinjer"
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr ""
+msgstr "Konto Base kode"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4093,6 +4299,7 @@ msgstr "Innstillinger for kundekontering"
 #: help:res.company,paypal_account:0
 msgid "Paypal username (usually email) for receiving online payments."
 msgstr ""
+"Paypal brukernavn (vanligvis e-post) for å motta elektroniske betalinger."
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -4121,7 +4328,7 @@ msgstr "Alle posteringer"
 #: code:addons/account/account_bank_statement.py:367
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr ""
+msgstr "Uttalelse% s er bekreftet, er tidsskriftet elementer opprettet."
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -4131,7 +4338,7 @@ msgstr "Måned periode"
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
 msgid "Check if you want to display Accounts with 0 balance too."
-msgstr ""
+msgstr "Sjekk om du vil vise regnskap med 0 balanse også."
 
 #. module: account
 #: view:account.tax:0
@@ -4147,7 +4354,7 @@ msgstr "Standard avgifter"
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr ""
+msgstr "Slutt av regnskapsåret oppføring."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -4157,7 +4364,7 @@ msgstr "Periodevis kjøring"
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Du kan ikke opprette analytisk linje på visning konto."
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4165,6 +4372,8 @@ msgid ""
 "When new move line is created the state will be 'Draft'.\n"
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
+"Når den nye trekk linjen opprettes staten vil være \"kladd\".\n"
+"* Når alle betalingene er gjort vil det være i \"Gyldig\" tilstand."
 
 #. module: account
 #: field:account.journal,view_id:0
@@ -4210,7 +4419,7 @@ msgstr "Vekslingsrate"
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "Kontoutskrifter føres i systemet."
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:133
@@ -4253,7 +4462,7 @@ msgstr "Kreditnotaer"
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
-msgstr ""
+msgstr "Navnet på perioden må være unikt per selskap!"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4273,11 +4482,14 @@ msgid ""
 "you want to generate accounts of this template only when loading its child "
 "template."
 msgstr ""
+"Sett denne til FALSE hvis du ikke vil at denne malen skal brukes aktivt i "
+"veiviseren som genererer Kontoplan fra maler, er dette nyttig når du vil "
+"generere kontoer i denne malen bare ved lasting sin barnet mal."
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries From Models"
-msgstr ""
+msgstr "Lag oppføringer fra modeller"
 
 #. module: account
 #: field:account.account,reconcile:0
@@ -4286,11 +4498,13 @@ msgid "Allow Reconciliation"
 msgstr "Tillat Avstemning"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
 msgstr ""
+"Du kan ikke endre selskap av denne perioden som noen journal elementer "
+"eksisterer."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -4311,7 +4525,7 @@ msgstr "Avgift inkl. i prisen"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr ""
+msgstr "Konto analytiske kostnad ledger For journal rapporter."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
@@ -4320,7 +4534,7 @@ msgid "Recurring Models"
 msgstr "Periodiske modeller"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Kodefeil"
@@ -4332,6 +4546,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Endre"
 
@@ -4348,7 +4563,7 @@ msgstr "Type kontroll"
 #. module: account
 #: help:account.journal,default_credit_account_id:0
 msgid "It acts as a default account for credit amount"
-msgstr ""
+msgstr "Det fungerer som en standard konto for kredittbeløpet"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4376,12 +4591,14 @@ msgid "Example"
 msgstr "Eksempel"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
 "The real total does not match the computed total."
 msgstr ""
+"Vennligst bekreft prisen på fakturaen!\n"
+"Den virkelige totale stemmer ikke beregnet total."
 
 #. module: account
 #: view:account.tax:0
@@ -4390,7 +4607,7 @@ msgid "Keep empty to use the income account"
 msgstr "Beholdes blankt til bruk for inntektskonto"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4412,13 +4629,13 @@ msgstr "Velg avgiftsplan"
 #: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
-msgstr ""
+msgstr "Konto Kartlegging"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Kunde"
@@ -4434,13 +4651,16 @@ msgid "Cancelled Invoice"
 msgstr "Annulert faktura"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
 "the account \"%s - %s\". Clear the secondary currency field of the account "
 "definition if you want to accept all currencies."
 msgstr ""
+"Kunne ikke opprette farten med annen valuta enn den sekundære valuta kontoen "
+"«% s -% s\". Fjerne den sekundære valutafelt av kontoen definisjonen hvis du "
+"vil godta alle valutaer."
 
 #. module: account
 #: selection:account.bank.statement,state:0
@@ -4469,6 +4689,9 @@ msgid ""
 "All draft account entries in this journal and period will be validated. It "
 "means you won't be able to modify their accounting fields anymore."
 msgstr ""
+"Alle utkast konto oppføringer i dette tidsskriftet og perioden vil bli "
+"validert. Det betyr at du ikke vil være i stand til å endre sine regnskap "
+"felt lenger."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
@@ -4486,7 +4709,7 @@ msgid "Income Account on Product Template"
 msgstr "Inntekstkonto for produkt mal"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "DIV"
@@ -4494,13 +4717,13 @@ msgstr "DIV"
 #. module: account
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
+msgstr "${objekt.firma_id.navn} faktura(Ref ${objekt.nummer or 'n/a' })"
 
 #. module: account
 #: help:res.partner,last_reconciliation_date:0
 msgid ""
 "Date on which the partner accounting entries were reconciled last time"
-msgstr ""
+msgstr "Dato for når partner regnskapspostene ble forlikt siste gang"
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
@@ -4511,18 +4734,20 @@ msgstr "Nytt regnskapsår"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Fakturaer"
 
 #. module: account
 #: view:account.invoice:0
 msgid "My invoices"
-msgstr ""
+msgstr "Mine fakturaer."
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
@@ -4545,7 +4770,7 @@ msgstr "Fakturert"
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
-msgstr ""
+msgstr "Skrevet bilagsregistrering"
 
 #. module: account
 #: view:account.use.model:0
@@ -4559,6 +4784,9 @@ msgid ""
 "account if this is a Customer Invoice or Supplier Refund, otherwise a "
 "Partner bank account number."
 msgstr ""
+"Bankkontonummer som fakturaen skal betales. En av selskapets bankkonto hvis "
+"dette er en kunde faktura eller Leverandør Refusjon, ellers en Partner "
+"kontonummer."
 
 #. module: account
 #: view:account.state.open:0
@@ -4603,17 +4831,20 @@ msgid ""
 "You can not define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+"Konfigurasjon Feil!\n"
+"Du kan ikke definere barn på en konto med typen intern forskjellige av "
+"\"View\"! "
 
 #. module: account
 #: code:addons/account/account.py:923
 #, python-format
 msgid "Opening Period"
-msgstr ""
+msgstr "åpningsperioden"
 
 #. module: account
 #: view:account.move:0
 msgid "Journal Entries to Review"
-msgstr ""
+msgstr "Bilagsregistreringer til gjennomsyn"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4652,26 +4883,24 @@ msgid "Journal Items"
 msgstr "Journalregistreringer"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Feil"
@@ -4696,6 +4925,8 @@ msgid ""
 "This report is analysis by partner. It is a PDF report containing one line "
 "per partner representing the cumulative credit balance."
 msgstr ""
+"Denne rapporten er analyse av partner. Det er en PDF rapport som inneholder "
+"en linje per partner som representerer den kumulative tilgodehavende."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -4703,21 +4934,24 @@ msgid ""
 "To print an analytics (or costs) journal for a given period. The report give "
 "code, move name, account number, general amount and analytic amount."
 msgstr ""
+"Slik skriver du ut en Analytisk(eller kostnadene) journal for en gitt "
+"periode. Rapporten gir kode, flytte navn, kontonummer, generelle beløpet og "
+"analytisk beløp."
 
 #. module: account
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Fakturanummer må være unik pr. firma!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Balanse ved Kontotype"
 
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Generate Fiscal Year Opening Entries"
-msgstr ""
+msgstr "Generere regnskapsåret Åpningstider oppføringer"
 
 #. module: account
 #: model:res.groups,name:account.group_account_user
@@ -4730,6 +4964,8 @@ msgid ""
 "From this view, have an analysis of your treasury. It sums the balance of "
 "every accounting entries made on liquidity accounts per period."
 msgstr ""
+"Fra denne visningen har en analyse av egne ditt. Det summerer balansen av "
+"hver regnskapspostene gjort på likviditet kontoer per periode."
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -4774,13 +5010,16 @@ msgid "Beginning of Period Date"
 msgstr "Dato for periodestart"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
 "You should set the journal to allow cancelling entries if you want to do "
 "that."
 msgstr ""
+"Du kan ikke endre en publisert oppføring av dette tidsskriftet!\n"
+"Du bør sette tidsskriftet å tillate kansellering oppføringer hvis du ønsker "
+"å gjøre det."
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
@@ -4798,7 +5037,7 @@ msgid "Child Tax Accounts"
 msgstr "Underordnede avgiftskonti"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Startperiode skal være før sluttperiode"
@@ -4819,6 +5058,7 @@ msgstr "Analytisk saldo -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4845,7 +5085,7 @@ msgstr "Analytisk saldo -"
 #: field:account.vat.declaration,target_move:0
 #: field:accounting.report,target_move:0
 msgid "Target Moves"
-msgstr ""
+msgstr "målet beveger seg"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_net
@@ -4862,13 +5102,15 @@ msgstr "Periodetype"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Betalinger"
 
 #. module: account
 #: view:account.tax:0
 msgid "Reverse Compute Code"
-msgstr ""
+msgstr "Reversere Beregn kode"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
@@ -4894,6 +5136,9 @@ msgid ""
 "encode the sale and purchase rates or choose from list of taxes. This last "
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
+"Dette boolean hjelper deg å velge om du ønsker å foreslå for brukeren å kode "
+"salg og kjøp priser eller velge fra listen over skatter. Denne siste valg "
+"forutsetter at mengden av skatt er definert på denne malen er ferdig"
 
 #. module: account
 #: view:account.financial.report:0
@@ -4912,6 +5157,7 @@ msgstr "Kolonnenavn"
 msgid ""
 "This report gives you an overview of the situation of your general journals"
 msgstr ""
+"Denne rapporten gir en oversikt over situasjonen i de generelle tidsskriftene"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -4935,7 +5181,7 @@ msgid "Line 1:"
 msgstr "Linje 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integritetsfeil!"
@@ -4968,6 +5214,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Balanse"
@@ -5044,6 +5291,7 @@ msgstr "Rapport"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5068,7 +5316,7 @@ msgstr "Avg. på underliggende"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr ""
+msgstr "Mal Skatt Regnskap posisjon"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -5083,7 +5331,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Accounts with a past deadline."
-msgstr ""
+msgstr "Analytisk kontoer med  fortid tidsfrist."
 
 #. module: account
 #: report:account.partner.balance:0
@@ -5115,7 +5363,7 @@ msgstr "Fremdrift"
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Analytic Entries Stats"
-msgstr ""
+msgstr "Analytisk innlegg Statistikk"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
@@ -5155,7 +5403,7 @@ msgstr "Registreringskontroll"
 #: view:account.analytic.chart:0
 #: view:project.account.analytic.line:0
 msgid "(Keep empty to open the current situation)"
-msgstr ""
+msgstr "(Hold tom for å åpne dagens situasjon)"
 
 #. module: account
 #: field:account.analytic.balance,date1:0
@@ -5169,11 +5417,10 @@ msgstr "Periodestart"
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
 msgid "Account Common Account Report"
-msgstr ""
+msgstr "Felles konto Rapporter"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Kommunikasjon"
 
@@ -5200,6 +5447,7 @@ msgstr "Kreditnota"
 msgid ""
 "You can not create more than one move per period on centralized journal"
 msgstr ""
+"Du kan ikke opprette mer enn ett trekk per periode på sentralisert journal"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5225,13 +5473,13 @@ msgid "End of Year Entries Journal"
 msgstr "Årsavslutningsjournal"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5249,11 +5497,14 @@ msgid ""
 "something to reconcile or not. This figure already count the current partner "
 "as reconciled."
 msgstr ""
+"Dette er de gjenværende partnere for hvem du bør sjekke om det er noe å "
+"forsone eller ikke. Dette tallet allerede telle nåværende partner som "
+"avstemmes."
 
 #. module: account
 #: view:account.subscription.line:0
 msgid "Subscription lines"
-msgstr ""
+msgstr "abonnement linjer"
 
 #. module: account
 #: field:account.entries.report,quantity:0
@@ -5305,7 +5556,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Kundefakturaer og kreditnotaer"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5319,6 +5569,8 @@ msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
 msgstr ""
+"Spesifisert Journal har ikke noen konto flytte oppføringer i utkast for "
+"denne perioden"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
@@ -5358,7 +5610,7 @@ msgstr "Normal tekst"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice Options"
-msgstr ""
+msgstr "Tilbakebetaling  alternativer for faktura"
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -5366,6 +5618,8 @@ msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
+"Antall delvise beløp som kan kombineres for å finne en balanse punkt kan "
+"velges som kraften i den automatiske forsoning"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -5397,6 +5651,10 @@ msgid ""
 "impossible any new entry record. Close a fiscal year when you need to "
 "finalize your end of year results definitive "
 msgstr ""
+"Hvis ingen flere oppføringer bør registreres i et regnskapsår, kan du lukke "
+"det herfra. Det vil lukke alle åpne perioder i dette året som vil gjøre "
+"umulig noen nye oppføringen posten. Lukk et regnskapsår når du trenger for å "
+"fullføre slutten av året resultater definitive "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5425,6 +5683,8 @@ msgid ""
 "No fiscal year defined for this date !\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
+"Ingen regnskapsåret definert for denne datoen!\n"
+"Kan du opprette en fra konfigurasjonen av regnskap menyen."
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5461,7 +5721,7 @@ msgstr "Journalregistrering"
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
 msgid "Move journal"
-msgstr ""
+msgstr "Flytt journal"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
@@ -5470,7 +5730,7 @@ msgid "Generate Opening Entries"
 msgstr "Opprett inngående registreringer"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Allerede avstemt!"
@@ -5503,14 +5763,14 @@ msgid "Child Accounts"
 msgstr "Underordnede konti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr ""
+msgstr "Flytt navn (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Nedskrivning"
@@ -5530,7 +5790,7 @@ msgstr "Inntekt"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Leverandør"
@@ -5560,7 +5820,7 @@ msgid "Account n°"
 msgstr "Kontonr."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Fri referanse"
@@ -5575,7 +5835,9 @@ msgstr "Vurdering"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Debitor og kreditor konti"
@@ -5613,6 +5875,9 @@ msgid ""
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
+"Fra denne visningen har en analyse av de ulike finansielle kontoer. "
+"Dokumentet viser debet og kredit tar i betraktning noen kriterier du kan "
+"velge ved hjelp av søkeverktøyet."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -5621,6 +5886,9 @@ msgid ""
 "OpenERP allows you to define the tax structure and manage it from this menu. "
 "You can define both numeric and alphanumeric tax codes."
 msgstr ""
+"Skatte-kodens definisjon avhenger av selvangivelsen i ditt land. OpenERP lar "
+"deg definere skatt struktur og administrere den fra denne menyen. Du kan "
+"definere både numeriske og alfanumeriske skatt koder."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -5628,6 +5896,8 @@ msgid ""
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
 msgstr ""
+"Viser deg fremdriften i dag på forsoningsprosessen. Gitt av\n"
+"Partnere forsonet dag \\ (øvrige partnere + Partners Forsonet dag)"
 
 #. module: account
 #: help:account.payment.term.line,value:0
@@ -5636,6 +5906,9 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be threated."
 msgstr ""
+"Velg her hva slags verdivurdering knyttet til denne betalingsfrist linjen. "
+"Vær oppmerksom på at du bør ha din siste linje med typen 'Balance' for å "
+"sikre at hele beløpet vil bli threated."
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -5643,7 +5916,7 @@ msgstr ""
 #: field:report.account.sales,period_id:0
 #: field:report.account_type.sales,period_id:0
 msgid "Force Period"
-msgstr ""
+msgstr "Kraft Periode."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5671,7 +5944,7 @@ msgid "Filter by"
 msgstr "Filtrer etter"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5682,8 +5955,8 @@ msgid "Entry Date"
 msgstr "Registreringsdato"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Du kan ikke bruke en inaktiv konto!"
@@ -5698,13 +5971,15 @@ msgstr "Posteringer tilhører ikke samme konto eller er allerede avstemt! "
 #: help:account.bank.statement,balance_end:0
 msgid "Balance as calculated based on Starting Balance and transaction lines"
 msgstr ""
+"Egenkapital beregnet er basert på start Balanse og transaksjonskostnader "
+"linjer"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly !"
-msgstr ""
+msgstr "Dagens valuta er ikke riktig konfigurert!"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
@@ -5716,7 +5991,7 @@ msgstr "Faktura avgiftskonto"
 #: model:ir.actions.act_window,name:account.action_account_general_journal
 #: model:ir.model,name:account.model_account_general_journal
 msgid "Account General Journal"
-msgstr ""
+msgstr "Konto Generelt Journal"
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -5724,8 +5999,8 @@ msgid "Number of Days"
 msgstr "Antall dager"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5740,7 +6015,7 @@ msgstr "Periode: %s"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
 msgid "Review your Financial Journals"
-msgstr ""
+msgstr "Gjennomgå finansielle tidsskrifter"
 
 #. module: account
 #: help:account.tax,name:0
@@ -5774,7 +6049,7 @@ msgstr "Kreditnota"
 #. module: account
 #: field:account.account,foreign_balance:0
 msgid "Foreign Balance"
-msgstr ""
+msgstr "Utenlandsk Balanse"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -5787,7 +6062,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "ikke implementert"
@@ -5804,16 +6079,18 @@ msgid ""
 "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state!"
 msgstr ""
+"Valgt Faktura (e) kan ikke bekreftes som de ikke er i \"Kladd\" eller \"pro-"
+"forma\" state!"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Running Subscription"
-msgstr ""
+msgstr "Kjører Abonnement"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Regnskapsåret posisjon Bemerkning:"
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -5824,6 +6101,8 @@ msgstr "Ananlyse av analytiske registreringer"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Forrige"
 
@@ -5834,6 +6113,9 @@ msgid ""
 "You can not define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+"Konfigurasjon Feil!\n"
+"Du kan ikke definere barn på en konto med typen intern forskjellige av "
+"\"View\"! "
 
 #. module: account
 #: help:res.partner.bank,journal_id:0
@@ -5841,6 +6123,8 @@ msgid ""
 "This journal will be created automatically for this bank account when you "
 "save the record"
 msgstr ""
+"Denne journalen vil bli opprettet automatisk for denne bankkontoen når du "
+"lagrer posten"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -5861,6 +6145,10 @@ msgid ""
 "line of the expense account. OpenERP will propose to you automatically the "
 "Tax related to this account and the counterpart \"Account Payable\"."
 msgstr ""
+"Dette synet kan brukes av regnskapsførere for å raskt registrere oppføringer "
+"i OpenERP. Hvis du ønsker å spille inn en leverandørfaktura, start ved å ta "
+"opp linjen i regning. OpenERP vil foreslå for deg automatisk Skatt knyttet "
+"til denne kontoen, og motstykket \"utbetaling\"."
 
 #. module: account
 #: field:account.entries.report,date_created:0
@@ -5883,12 +6171,14 @@ msgid ""
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
 msgstr ""
+"Så snart avstemmingen er gjort, blir fakturaens staten til \"ferdig\" (dvs. "
+"betalt) i systemet."
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,account_root_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "root-kontoen"
 
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
@@ -5908,7 +6198,7 @@ msgstr "Kundeavgifter"
 #. module: account
 #: help:account.model,name:0
 msgid "This is a model for recurring accounting entries"
-msgstr ""
+msgstr "Dette er en modell for gjentakende regnskapspostene"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax_rate:0
@@ -5946,6 +6236,9 @@ msgid ""
 "choice assumes that the set of tax defined for the chosen template is "
 "complete"
 msgstr ""
+"Dette boolean hjelper deg å velge om du ønsker å foreslå for brukeren å kode "
+"salg og kjøp priser eller bruke de vanlige m2o feltene. Dette siste valget "
+"forutsetter at settet av skatt definert for den valgte malen er ferdig"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -5974,6 +6267,8 @@ msgid ""
 "You can not remove/desactivate an account which is set on a customer or "
 "supplier."
 msgstr ""
+"Du kan ikke fjerne / deaktivere en konto som er satt på en kunde eller "
+"leverandør."
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -5983,7 +6278,7 @@ msgstr "Velg et regnskapsår som skal avsluttes"
 #. 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 "Liste over alle skatter som må installeres av veiviseren"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_intracom
@@ -6058,7 +6353,7 @@ msgstr "Fordring"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "Selskapet må være den samme for tilhørende konto og periode"
 
 #. module: account
 #: view:account.invoice:0
@@ -6097,16 +6392,18 @@ msgstr "Prosentdel"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
-msgstr ""
+msgstr "Journal & Partner"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
 msgid "Power"
-msgstr ""
+msgstr "Styrke"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Kan ikke lage en ubenyttet journalkode"
@@ -6114,7 +6411,7 @@ msgstr "Kan ikke lage en ubenyttet journalkode"
 #. module: account
 #: view:project.account.analytic.line:0
 msgid "View Account Analytic Lines"
-msgstr ""
+msgstr "Vis Analytiske konto Linjer"
 
 #. module: account
 #: field:account.invoice,internal_number:0
@@ -6128,6 +6425,8 @@ msgid ""
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
+"Indikerer om hvor mye skatt må inkluderes i grunnbeløpet for beregning av de "
+"neste skatter"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
@@ -6138,14 +6437,15 @@ msgstr "Avstemming: Gå til neste partner"
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
 msgid "Inverted Analytic Balance"
-msgstr ""
+msgstr "Omvendt Analytisk Balanse"
 
 #. module: account
 #: field:account.tax.template,applicable_type:0
 msgid "Applicable Type"
-msgstr ""
+msgstr "Gjeldende type"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Fakturareferanse"
@@ -6181,6 +6481,10 @@ msgid ""
 "year. Note that you can run this wizard many times for the same fiscal year: "
 "it will simply replace the old opening entries with the new ones."
 msgstr ""
+"Denne veiviseren vil generere slutten av året bilagsregistreringer av "
+"utvalgte regnskapsår. Vær oppmerksom på at du kan kjøre denne veiviseren "
+"mange ganger for samme regnskapsår: det vil bare erstatte de gamle "
+"åpningstider oppføringer med de nye."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
@@ -6195,6 +6499,10 @@ msgid ""
 "the tool search to analyse information about analytic entries generated in "
 "the system."
 msgstr ""
+"Fra denne visningen har en analyse av de ulike analytiske oppføringer etter "
+"analytiske kontoen du har definert som passer din bedrift trenger. Bruk "
+"verktøyet søk å analysere informasjon om analytiske oppføringer genereres i "
+"systemet."
 
 #. module: account
 #: sql_constraint:account.journal:0
@@ -6204,7 +6512,7 @@ msgstr "Navnet på journalen må være unikt per firma !"
 #. module: account
 #: field:account.account.template,nocreate:0
 msgid "Optional create"
-msgstr ""
+msgstr "Opprett valgfritt"
 
 #. module: account
 #: code:addons/account/account.py:664
@@ -6213,6 +6521,8 @@ msgid ""
 "You cannot change the owner company of an account that already contains "
 "journal items."
 msgstr ""
+"Du kan ikke endre selskapets eier på en konto som allerede inneholder "
+"tidsskriftet elementer."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -6236,7 +6546,7 @@ msgstr "Posteringslinjer"
 #. module: account
 #: field:account.move.line,centralisation:0
 msgid "Centralisation"
-msgstr ""
+msgstr "Sentralisering"
 
 #. module: account
 #: view:account.account:0
@@ -6311,6 +6621,7 @@ msgstr "Analytisk journal"
 #, python-format
 msgid "You can not desactivate an account that contains some journal items."
 msgstr ""
+"Du kan ikke deaktivere en konto som inneholder noen journal elementer."
 
 #. module: account
 #: view:account.entries.report:0
@@ -6360,7 +6671,7 @@ msgstr "Notater"
 #. module: account
 #: model:ir.model,name:account.model_analytic_entries_report
 msgid "Analytic Entries Statistics"
-msgstr ""
+msgstr "Analytisk Innlegg Statistikk"
 
 #. module: account
 #: code:addons/account/account.py:624
@@ -6369,8 +6680,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "Du kan ikke fjerne en konto som har journalføringer"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Regsitreringer: "
@@ -6383,10 +6694,10 @@ msgstr "Lag manuelle periodiske registrering i valgt journal."
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr ""
+msgstr "Valutaen til beslektet konto journal."
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Kunne ikke lage bevegelse mellom ulike firmaer"
@@ -6425,13 +6736,13 @@ msgstr "Status er utkast"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Total debet"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Registrering \"%s\" er ikke gyldig"
@@ -6501,25 +6812,26 @@ msgstr "Resultatregnskap (kostnadskonti)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6551,8 +6863,8 @@ msgid "Printed"
 msgstr "Utkrift"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Feil :"
@@ -6607,7 +6919,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6758,7 +7070,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6788,7 +7100,7 @@ msgid "Taxes used in Sales"
 msgstr "Avgifter benyttet i salg"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6856,14 +7168,14 @@ msgid "Source Document"
 msgstr "Kildedokument"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6959,8 +7271,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Er du sikker på at du vil åpne denne fakturaen ?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6973,7 +7285,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Regnskapsregistreringer"
@@ -7106,7 +7418,7 @@ msgstr ""
 "utviklere å opprette spesifikke avgifter innenfor et spesielt område"
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Du skulle valgt perioder son tilhører samme firma"
@@ -7137,8 +7449,8 @@ msgid "Reporting"
 msgstr "Rapportering"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7227,7 +7539,7 @@ msgid "Sign on Reports"
 msgstr "Sign on Reports"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7238,7 +7550,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7273,13 +7585,14 @@ msgid "Optional Information"
 msgstr "Tilleggsopplysninger"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Journalen må have default kredit og debit konto"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7306,13 +7619,13 @@ msgid "Maturity Date"
 msgstr "Forfallsdato"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Feil konto!"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Salgsjournal"
@@ -7329,7 +7642,7 @@ msgid "Invoice Tax"
 msgstr "Faktura avgift"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Ikke noe antallsnummer!"
@@ -7379,7 +7692,7 @@ msgstr "Til"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Valutajustering"
@@ -7427,13 +7740,15 @@ msgstr "Mai"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Betalbare konti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7477,7 +7792,7 @@ msgstr "Rapportnavn"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Kontant"
@@ -7489,15 +7804,15 @@ msgid "Account Destination"
 msgstr "Account Destination"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7649,13 +7964,14 @@ msgstr "Fast"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Advarsel !"
@@ -7707,7 +8023,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Velg en valuta for fakturaen"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7720,7 +8036,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Kan ikke %s utkast/proforma/kansellere faktura"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Ingen fakturalinjer!"
@@ -7794,7 +8110,7 @@ msgid "Deferral Method"
 msgstr "Utettelsesmetode"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Faktura '%s' er betalt."
@@ -7856,7 +8172,7 @@ msgid "Associated Partner"
 msgstr "Samarbeidspartner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Du må først velge en partner!"
@@ -7902,7 +8218,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7924,7 +8240,7 @@ msgid "Choose Fiscal Year"
 msgstr "Velg regnskapsår"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Leverandør kreditnota-journal"
@@ -8011,7 +8327,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Beregningskode for avgifter inkludert i prisene"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8139,7 +8455,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8220,10 +8536,12 @@ msgstr "Refusjonsjournal"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtrer etter"
 
@@ -8256,7 +8574,7 @@ msgid "The partner account used for this invoice."
 msgstr "Partnerkonto benyttet for denne faktura."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8279,7 +8597,7 @@ msgid "Payment Term Line"
 msgstr "Betalingsbet.linje"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Innkjøpsjournal"
@@ -8364,7 +8682,7 @@ msgid "Unpaid Invoices"
 msgstr "Ubetalte fakturaer"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8470,7 +8788,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "La feltet være blankt for å vise alle åpne regnskapsår"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8485,7 +8803,7 @@ msgstr ""
 "flervaluta."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8558,7 +8876,7 @@ msgid "Contact Address"
 msgstr "Kontaktadresse"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8593,12 +8911,14 @@ msgstr "Kontrakter"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "unknown"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8617,7 +8937,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8703,7 +9023,7 @@ msgid "Period from"
 msgstr "Fra periode"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Refusjonsjournal"
@@ -8750,7 +9070,7 @@ msgid "Purchase Tax(%)"
 msgstr "Innkjøpsavgift(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Vennligst opprett fakturalinje(er)"
@@ -8766,7 +9086,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -8798,8 +9118,6 @@ msgstr "Periodeslutt"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8814,6 +9132,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8834,6 +9153,7 @@ msgstr "Periodestart"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Analyseretning"
 
@@ -8853,7 +9173,7 @@ msgstr "Journalvisning"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total kredit"
@@ -8918,6 +9238,7 @@ msgstr "Bankbekreftelse"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8993,7 +9314,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Du må velge konti for avstemming"
@@ -9015,7 +9336,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filtrert med"
@@ -9037,7 +9357,7 @@ msgid "Move"
 msgstr "Bevegelse"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9093,7 +9413,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9154,6 +9474,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9210,6 +9531,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9217,6 +9539,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9259,7 +9582,7 @@ msgid "Unreconciled"
 msgstr "Ikke avstemt"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Feil sum !"
@@ -9318,7 +9641,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Ukjent feil"
@@ -9355,6 +9678,7 @@ msgstr "Bekreft kontobevegelser"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9453,9 +9777,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Perioder"
 
@@ -9617,6 +9943,7 @@ msgstr "Postert"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9664,7 +9991,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9700,6 +10027,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9720,6 +10048,7 @@ msgstr "Journal: Alle"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9734,7 +10063,9 @@ msgstr "Journal: Alle"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9744,6 +10075,8 @@ msgstr "Journal: Alle"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9897,6 +10230,7 @@ msgstr "Leverandørfaktura"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9930,6 +10264,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9947,7 +10283,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Postering er allerede avstemt"
@@ -9983,8 +10319,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Med bevegelser"
@@ -10100,8 +10438,8 @@ msgid "Statistic Reports"
 msgstr "Statistikkrapporter"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Feil konto!"
@@ -10127,7 +10465,7 @@ msgid "Accounts Mapping"
 msgstr "Kontomapping"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Faktura '%s' avventer validering."
@@ -10317,6 +10655,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10390,6 +10729,8 @@ msgstr "Dager over forfall"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Fremtidig"
 
@@ -11471,3 +11812,9 @@ msgstr ""
 
 #~ msgid "Install your Chart of Accounts"
 #~ msgstr "Installer din kontoplan"
+
+#~ msgid "Open For Unreconciliation"
+#~ msgstr "Åpen for Unreconciliation"
+
+#~ msgid "Aged Trial Balance"
+#~ msgstr "Eldre Prøve Balanse"
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index df7a15b17a9..34fde1a578c 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -7,17 +7,17 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-28 12:47+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"PO-Revision-Date: 2012-08-26 14:01+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:03+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:00+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integriteitsfout !"
@@ -152,6 +152,7 @@ msgstr "Letter af"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referentie"
 
@@ -170,13 +171,13 @@ msgstr ""
 "deze te verwijderen."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Memoriaal"
@@ -241,7 +242,7 @@ msgstr ""
 "facturen wilt."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Factuur '%s' is deels betaald: %s%s of %s%s (%s%s resteert)"
@@ -257,7 +258,7 @@ msgid "Belgian Reports"
 msgstr "Belgische overzichten"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -308,7 +309,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Factuurregel bedrijf komt niet overeen met factuur bedrijf."
@@ -607,8 +608,10 @@ msgid "The accountant confirms the statement."
 msgstr "De accountant bevestigt het afschrift."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -666,7 +669,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Hoofdvolgorde moet afwijken van de huidige !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -678,7 +681,7 @@ msgid "Tax Code Amount"
 msgstr "Belastingbedrag"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "VKB"
@@ -687,7 +690,7 @@ msgstr "VKB"
 #: view:account.period:0
 #: view:account.period.close:0
 msgid "Close Period"
-msgstr "Afsluit periode"
+msgstr "Periode afsluiten"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
@@ -705,8 +708,8 @@ msgid "Journal Period"
 msgstr "Dagboek periode"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -787,6 +790,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "U kunt de valuta alleen wijzigen bij concept facturen !"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Financieel rapport"
@@ -802,12 +806,13 @@ msgstr "Financieel rapport"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Type"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -944,12 +949,13 @@ msgid "Create 3 Months Periods"
 msgstr "Maak 3 maandelijkse periodes"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Tot"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1035,7 +1041,7 @@ msgstr ""
 "wordt berekend."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "Ik kan een ouder code voor de sjabloon account niet vinden!"
@@ -1068,10 +1074,10 @@ msgid "Code"
 msgstr "Code"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1137,7 +1143,7 @@ msgstr ""
 "informatie over de rekening en de bijbehorende kenmerken."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1187,7 +1193,7 @@ msgstr "Journaalpostregels  in onbelans"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1282,10 +1288,10 @@ msgstr "Situatie"
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "De verplaatsing van deze boekingsregel"
+msgstr "De mutatie van deze boekingsregel"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1308,7 +1314,7 @@ msgid "Entry Label"
 msgstr "Boekingslabel"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1394,14 +1400,15 @@ msgid "Taxes"
 msgstr "Belastingen"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Begin- en eindperiode selecteren"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Winst en verlies"
 
@@ -1456,6 +1463,7 @@ msgid "Journal Items Analysis"
 msgstr "Analyse journaalposten"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Relaties"
@@ -1480,8 +1488,10 @@ msgid "Central Journal"
 msgstr "Centraal dagboek"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1649,7 +1659,7 @@ msgstr "Crediteur"
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "Rekening te vorderen belasting"
+msgstr "Belasting rekening (bij credit)"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1716,6 +1726,7 @@ msgid "Separated Journal Sequences"
 msgstr "Afzonderlijke dagboek reeksen"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Verantwoordelijke"
@@ -1746,7 +1757,7 @@ msgid "Year Sum"
 msgstr "Jaar bedrag"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1825,7 +1836,7 @@ msgid "Customer Ref:"
 msgstr "Klant ref:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Gebruiker %s heeft geen toegangsrechten voor dagboek %s !"
@@ -1848,7 +1859,7 @@ msgstr "Belastingaangifte: Credit facturen"
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
-msgstr "Creditbedrag"
+msgstr "Bedrag credit"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -2163,7 +2174,7 @@ msgid "Pro-forma"
 msgstr "Proforma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2195,7 +2206,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Rekeningschema sjablonen zoeken"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2252,7 +2263,7 @@ msgid "Description"
 msgstr "Omschrijving"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "CIKB"
@@ -2268,10 +2279,10 @@ msgstr "Lopend"
 #: field:product.category,property_account_income_categ:0
 #: field:product.template,property_account_income:0
 msgid "Income Account"
-msgstr "Opbrengsten verkoop rekening"
+msgstr "Omzetrekening"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Er is geen inkoop- of verkoop-dagboek ingesteld!"
@@ -2311,6 +2322,7 @@ msgstr "Product sjabloon"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2320,6 +2332,7 @@ msgstr "Product sjabloon"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2370,7 +2383,7 @@ msgid "Account Line"
 msgstr "Rekening regel"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2393,7 +2406,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr "Boeking"
+msgstr "Journaalpost"
 
 #. module: account
 #: constraint:res.partner:0
@@ -2407,7 +2420,7 @@ msgid "Main Sequence"
 msgstr "Hoofdreeks"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2483,7 +2496,7 @@ msgid "Account Tax Code"
 msgstr "Belastingrubriek"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2510,7 +2523,7 @@ msgstr "Onafgeletterde boekingen"
 #: field:account.invoice.tax,base_code_id:0
 #: field:account.tax.template,base_code_id:0
 msgid "Base Code"
-msgstr "Basiscode"
+msgstr "Grondslag"
 
 #. module: account
 #: help:account.invoice.tax,sequence:0
@@ -2523,7 +2536,7 @@ msgstr "Bepaalt de volgorde bij afbeelden lijst van factuur belasting."
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr "Basiscode teken (+/-)"
+msgstr "Grondslag teken (+/-)"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2573,7 +2586,7 @@ msgid "Account Model Entries"
 msgstr "Account Model Entries"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "IKB"
@@ -2639,7 +2652,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "Afletteren journaalboeking (met afschrijven)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2671,7 +2683,7 @@ msgid "Accounts"
 msgstr "Grootboekrekeningen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Configuratiefout!"
@@ -2751,7 +2763,7 @@ msgstr "Betaald/Afgeletterd"
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr "Credit basiscode"
+msgstr "Credit grondslag"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2796,6 +2808,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Ouderdomsanalyse per relatie"
@@ -2835,7 +2848,7 @@ msgstr ""
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
 msgid "New Company Financial Setting"
-msgstr "Nieuwe financiële regeling configureren voor dit bedrijf"
+msgstr "Nieuwe financiële administratie configureren voor dit bedrijf"
 
 #. module: account
 #: view:account.installer:0
@@ -2848,14 +2861,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Deze assistent genereert herhalende boekingen"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Er is geen nummering gedefinieerd voor dit dagboek!"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2944,7 +2957,7 @@ msgstr "Verplicht"
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr "Inkoopwaarde verkopen"
+msgstr "Kostenrekening"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -2962,10 +2975,10 @@ msgstr ""
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr "Basiscode bedrag"
+msgstr "Grondslag"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2980,7 +2993,7 @@ msgid "Default Sale Tax"
 msgstr "Standaard belasting op verkopen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Factuur '%s' is gevalideerd."
@@ -3021,7 +3034,7 @@ msgid "Fiscal Position"
 msgstr "Fiscale positie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3177,7 +3190,7 @@ msgid "View"
 msgstr "Aanzicht"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3248,7 +3261,7 @@ msgstr "Grootboekrekening sjablonen"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Stel uw financiële instellingen in"
 
 #. module: account
 #: view:report.account.sales:0
@@ -3379,7 +3392,7 @@ msgid "Starting Balance"
 msgstr "Beginsaldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Geen relatie gedefinieerd!"
@@ -3435,7 +3448,7 @@ msgid "Chart of Tax"
 msgstr "Belastingschema"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "Het eindsaldo dient gelijk te zijn aan het berekende saldo!"
@@ -3520,6 +3533,7 @@ msgstr "Hoeveelheid:"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Periode lengte (dagen)"
 
@@ -3566,7 +3580,7 @@ msgid "Detail"
 msgstr "Detail"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3586,9 +3600,16 @@ msgid "VAT :"
 msgstr "BTW"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3610,7 +3631,7 @@ msgid "Centralised counterpart"
 msgstr "Centrale tegenrekening"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr "U kunt geen boekingen maken op een zichtrekening %s %s"
@@ -3637,6 +3658,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3664,10 +3686,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Datum"
 
@@ -3684,7 +3713,6 @@ msgstr "Maak afletteren ongedaan"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3698,7 +3726,7 @@ msgid "Chart of Accounts Template"
 msgstr "Template grootboekschema"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3710,7 +3738,7 @@ msgstr ""
 "nog een relatie definiëren!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Enkele mutaties zijn reeds afgeletterd !"
@@ -3741,6 +3769,8 @@ msgstr "Budgetten"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Geen filters"
 
@@ -3817,7 +3847,7 @@ msgstr "Saldo"
 #: report:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr "Eenheidsprijs"
+msgstr "Prijs"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
@@ -3825,7 +3855,7 @@ msgid "Analytic Items"
 msgstr "Kostenplaatsenboekingen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Kan belasting niet wijzigen!"
@@ -3856,7 +3886,7 @@ msgid "Mapping"
 msgstr "Verdeling"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3872,6 +3902,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3882,10 +3913,10 @@ msgstr "Naam"
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr "Grootboek meerjarig proefbalansrapport"
+msgstr "Grootboek meerjarige proefbalans"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4226,7 +4257,7 @@ msgid "Month"
 msgstr "Maand"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4284,10 +4315,10 @@ msgstr "Belastingregels"
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr "Basiscode"
+msgstr "Grondslag"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4505,7 +4536,7 @@ msgid "Allow Reconciliation"
 msgstr "Afletteren toestaan"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4538,10 +4569,10 @@ msgstr "Kostenplaats grootboek"
 #: model:ir.actions.act_window,name:account.action_model_form
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Recurring Models"
-msgstr "Herhalende modellen"
+msgstr "Herhalende boekingen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Coderingsfout"
@@ -4553,6 +4584,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Verander"
 
@@ -4597,7 +4629,7 @@ msgid "Example"
 msgstr "Voorbeeld"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4610,10 +4642,10 @@ msgstr ""
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Keep empty to use the income account"
-msgstr "Laat leeg om de opbrengsten verkoop rekening te gebruiken"
+msgstr "Laat leeg om de omzetrekening te gebruiken"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Inkoop belastigen %.2f%%"
@@ -4641,7 +4673,7 @@ msgstr "Vervangingstabel grootboekrekeningen"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Klant"
@@ -4657,7 +4689,7 @@ msgid "Cancelled Invoice"
 msgstr "Geannuleerde factuur"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4711,10 +4743,10 @@ msgstr "Startdatum"
 #. module: account
 #: field:account.chart.template,property_account_income:0
 msgid "Income Account on Product Template"
-msgstr "Opbrengsten verkoop rekening op product sjabloon"
+msgstr "Omzetrekening op product sjabloon"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "MEM"
@@ -4740,11 +4772,13 @@ msgstr "Nieuw boekjaar"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Facturen"
 
@@ -4887,26 +4921,24 @@ msgid "Journal Items"
 msgstr "Journaalpostregels"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Fout"
@@ -5003,7 +5035,7 @@ msgstr "Rekening belasting aangifte"
 #. module: account
 #: report:account.invoice:0
 msgid "Price"
-msgstr "Prijs"
+msgstr "Bedrag"
 
 #. module: account
 #: view:account.period:0
@@ -5016,16 +5048,16 @@ msgid "Beginning of Period Date"
 msgstr "Begindatum van de periode"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
 "You should set the journal to allow cancelling entries if you want to do "
 "that."
 msgstr ""
-"U kunt geen boekingen in dit dagboek wijzigen !\n"
-"U dient 'Maak verwijderen boekingen mogelijk' aan te vinken indien u dit "
-"wilt doen."
+"U kunt geen boekingen in dit dagboek wijzigen of annuleren!\n"
+"U dient 'Maak het annuleren boekingen mogelijk' in het betreffende dagboek "
+"aan te vinken indien u dit wilt doen."
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
@@ -5043,7 +5075,7 @@ msgid "Child Tax Accounts"
 msgstr "Onderliggende belastingrekeningen"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Beginperiode moet voor de eindperiode liggen"
@@ -5066,6 +5098,7 @@ msgstr "Kostenplaats balans -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5109,6 +5142,8 @@ msgstr "Periodetype"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Betalingen"
 
@@ -5132,7 +5167,7 @@ msgstr "Python Code (reverse)"
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr "Betalingsconditie"
+msgstr "Betalingscondities"
 
 #. module: account
 #: help:account.chart.template,complete_tax_set:0
@@ -5213,6 +5248,7 @@ msgstr "Afletterresultaat"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Balans"
@@ -5289,6 +5325,7 @@ msgstr "Rapport"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5419,14 +5456,13 @@ msgstr "Algemeen grootboekrekening rapport"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Communicatie"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
 msgid "Analytic Accounting"
-msgstr "Kostenplaats dagboeken"
+msgstr "Kostenplaatsen"
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
@@ -5473,13 +5509,13 @@ msgid "End of Year Entries Journal"
 msgstr "Jaarafsluiting dagboek"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5555,7 +5591,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Klant facturen en terugbetalingen"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5688,7 +5723,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconcile With Write-Off"
-msgstr "Letter af met afboekingen"
+msgstr "Letter af met afboeken verschil"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -5729,7 +5764,7 @@ msgid "Generate Opening Entries"
 msgstr "Genereer opening boekingen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Al in overeenstemming"
@@ -5762,14 +5797,14 @@ msgid "Child Accounts"
 msgstr "Subrekeningen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Mutatienaam (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Boek af"
@@ -5789,7 +5824,7 @@ msgstr "Opbrengst"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Leverancier"
@@ -5819,7 +5854,7 @@ msgid "Account n°"
 msgstr "Rekening n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Vrije referentie"
@@ -5827,14 +5862,16 @@ msgstr "Vrije referentie"
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Valuation"
-msgstr "Raming"
+msgstr "Soort"
 
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Debiteuren en crediteuren rekeningen"
@@ -5942,7 +5979,7 @@ msgid "Filter by"
 msgstr "Filter op"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "U heeft een ongeldinge expressie \"%(...)s\" in uw model!"
@@ -5953,8 +5990,8 @@ msgid "Entry Date"
 msgstr "Invoerdatum"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Een niet-actieve grootboekrekening kan niet worden gebruikt!"
@@ -5981,7 +6018,7 @@ msgstr "Huidige valuta is niet correct geconfigureerd!"
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr "Rekening af te dragen belasting"
+msgstr "Belasting rekening"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_general_journal
@@ -5995,8 +6032,8 @@ msgid "Number of Days"
 msgstr "Aantal Dagen"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -6055,10 +6092,10 @@ msgstr "Naam dagboekperiode"
 #. module: account
 #: field:account.invoice.tax,factor_base:0
 msgid "Multipication factor for Base code"
-msgstr "Vermenigvuldigingsfactor voor basiscode"
+msgstr "Vermenigvuldigingsfactor voor grondslag"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "niet geïmplementeerd"
@@ -6097,6 +6134,8 @@ msgstr "Kostenplaatsanalyse"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Verleden"
 
@@ -6389,6 +6428,8 @@ msgstr "Percentage"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Dagboek & Relatie"
 
@@ -6398,7 +6439,7 @@ msgid "Power"
 msgstr "Kracht"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Het is niet mogelijk een ongebruikte rekeningcode te genereren"
@@ -6440,6 +6481,7 @@ msgid "Applicable Type"
 msgstr "Van toepassing zijnde type"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Factuurreferentie"
@@ -6676,8 +6718,8 @@ msgstr ""
 "journaalpostregels bevat."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Boekingen: "
@@ -6693,7 +6735,7 @@ msgid "Currency of the related account journal."
 msgstr "Valuta van het gerelateerde dagboek."
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Kon niet verplaatsen tussen de twee bedrijven"
@@ -6741,13 +6783,13 @@ msgstr "Status is concept"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Totaal debet"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Invoer \"%s\" is ongeldig !"
@@ -6822,25 +6864,26 @@ msgstr "Winst & verlies (Kosten rekening)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6872,8 +6915,8 @@ msgid "Printed"
 msgstr "Afgedrukt"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Fout:"
@@ -6936,7 +6979,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Geef grootboekrekening rapport weer met één relatie per pagina"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -7104,7 +7147,7 @@ msgid "Total:"
 msgstr "Totaal:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7142,7 +7185,7 @@ msgid "Taxes used in Sales"
 msgstr "Belastingen gebruikt bij verkoop"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7221,7 +7264,7 @@ msgid "Source Document"
 msgstr "Bron document"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
@@ -7229,7 +7272,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7273,7 +7316,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr "Financieel rapporthistorie"
+msgstr "Financiele rapporten hiërarchie"
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
@@ -7337,8 +7380,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Weet u zeker dat u deze factuur wilt openen ?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7353,7 +7396,7 @@ msgid "Opening Entries Expense Account"
 msgstr "Opening kostenrekening"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Boekingen"
@@ -7473,7 +7516,7 @@ msgstr "Standaard belastingen op inkopen"
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
 msgid "Opening Entries Income Account"
-msgstr "Openingsboekingen voor de opbrengsten  rekening"
+msgstr "Openingsboekingen voor de omzetrekening"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7492,7 +7535,7 @@ msgstr ""
 "domein aan te maken."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "U moet periodes kiezen welke behoren tot hetzelfde bedrijf"
@@ -7523,8 +7566,8 @@ msgid "Reporting"
 msgstr "Rapportages"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7548,7 +7591,7 @@ msgstr "Kas sluiten"
 #: view:account.journal:0
 #: field:res.partner.bank,journal_id:0
 msgid "Account Journal"
-msgstr "Rekeningdagboek"
+msgstr "Bankboek"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -7621,7 +7664,7 @@ msgid "Sign on Reports"
 msgstr "Teken op rapporten"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr "De periodes om een opening te maken zijn niet gevonden."
@@ -7632,7 +7675,7 @@ msgid "Root/View"
 msgstr "Basis/Weergave"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "OPEN"
@@ -7667,13 +7710,14 @@ msgid "Optional Information"
 msgstr "Optionele informatie"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Het dagboek heeft een standaard credit en debet rekening nodig"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7702,13 +7746,13 @@ msgid "Maturity Date"
 msgstr "Vervaldatum"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Foute rekening !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Verkoopboek"
@@ -7725,7 +7769,7 @@ msgid "Invoice Tax"
 msgstr "Invoice Tax"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Geen onderdeelnummer !"
@@ -7781,7 +7825,7 @@ msgstr "Aan"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Valuta aaanpassing"
@@ -7835,13 +7879,15 @@ msgstr "Mei"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Crediteuren"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7887,7 +7933,7 @@ msgstr "Rapportnaam"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Kas"
@@ -7899,15 +7945,15 @@ msgid "Account Destination"
 msgstr "Bestemming"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7980,7 +8026,7 @@ msgid ""
 "view to it."
 msgstr ""
 "Hier kunt u een bestaande dagboekweergave aanmaken of wijzigen. Een "
-"dagboekweergave bepaald de manier waarop uw boekingen kunt kanen in uw "
+"dagboekweergave bepaald de manier waarop uw boekingen kunt maken in uw "
 "dagboek. Selecteer de velden welke in uw dagboek moeten worden weergegeven "
 "en bepaal de volgorde van weergave. Vervolgens kunt u een nieuw dagboek "
 "aanmaken en deze koppelen aan de weergave."
@@ -8065,13 +8111,14 @@ msgstr "Vastgezet"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Waarschuwing!"
@@ -8123,7 +8170,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "selectere een valuta. welke wordt toegepast op de factuur"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -8137,7 +8184,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Kan niet %s concept/pro-forma/annuleer factuur."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Geen factuurregels!"
@@ -8221,7 +8268,7 @@ msgid "Deferral Method"
 msgstr "Afsluitmethode"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Factuur '%s' is betaald."
@@ -8289,7 +8336,7 @@ msgid "Associated Partner"
 msgstr "Gekoppelde relatie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Selecteer eerst een relatie"
@@ -8350,7 +8397,7 @@ msgstr ""
 "belastingaangifteformulier."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8373,7 +8420,7 @@ msgid "Choose Fiscal Year"
 msgstr "Kies een boekjaar"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Credit inkoopboek"
@@ -8466,7 +8513,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Bereken code voor prijzen inclusief belastingen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8591,7 +8638,7 @@ msgstr ""
 #: field:account.move.line,reconcile_partial_id:0
 #: view:account.move.line.reconcile:0
 msgid "Partial Reconcile"
-msgstr "Letter deels af"
+msgstr "Letter (bij  verschil gedeeltelijk) af"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
@@ -8610,7 +8657,7 @@ msgid "current month"
 msgstr "huidige maand"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8640,7 +8687,7 @@ msgstr "Bankmutatie afletteren"
 #: 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 "Categoriën grootboekrekeningen"
+msgstr "Grootboekrekeningen categorieën"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -8696,10 +8743,12 @@ msgstr "Credit factuur dagboek"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filter op"
 
@@ -8738,7 +8787,7 @@ msgid "The partner account used for this invoice."
 msgstr "De gebruikte relatie voor deze factuur"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Belasting %.2f%%"
@@ -8761,7 +8810,7 @@ msgid "Payment Term Line"
 msgstr "Betalingsconditie regel"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Inkoopboek"
@@ -8848,16 +8897,16 @@ msgid "Unpaid Invoices"
 msgstr "Onbetaalde facturen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
-"De betalingsconditie van de leverancier heeft geen betalingconditieregels!"
+"De betalingsconditie van de leverancier heeft geen betalingsconditieregels!"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
 msgid "Debit amount"
-msgstr "Debet bedrag"
+msgstr "Bedrag Debet"
 
 #. module: account
 #: view:board.board:0
@@ -8959,7 +9008,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "houd open voor alle fiscale jaren"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "De rekeningmutatie (%s) voor centralisatie is bevestigd!"
@@ -8974,7 +9023,7 @@ msgstr ""
 "valuta boeking is."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -9058,7 +9107,7 @@ msgid "Contact Address"
 msgstr "Adres contactpersoon"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Verkeerde model!"
@@ -9087,7 +9136,7 @@ msgstr ""
 "teken van de balans om te draaien. Bijvoorbeeld voor de opbrengsten verkoop "
 "rekening. Hetzelfde geld voor rekeningen welke normaliter meer credit zijn "
 "dan debet en welke u wilt afdrukken als positief bedrag in uw rapporten, "
-"bijvoorbeeld de inkomsten rekening."
+"bijvoorbeeld de omzetrekening."
 
 #. module: account
 #: field:res.partner,contract_ids:0
@@ -9099,12 +9148,14 @@ msgstr "Contracten"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "onbekend"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Openingsbalans"
@@ -9126,7 +9177,7 @@ msgstr ""
 "gebracht) welke is berekend bij het winst & verlies rapport"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Geef de volgorde weer bij het dagboek gerelateerd aan deze factuur."
@@ -9217,7 +9268,7 @@ msgid "Period from"
 msgstr "Periode van"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Credit verkoopboek"
@@ -9264,7 +9315,7 @@ msgid "Purchase Tax(%)"
 msgstr "Inkoop belastingen (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Maak factuurregels aan."
@@ -9280,7 +9331,7 @@ msgid "Display Detail"
 msgstr "Details weergeven"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "CVKB"
@@ -9318,8 +9369,6 @@ msgstr "Einde van periode"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Financiële rapportages"
@@ -9334,6 +9383,7 @@ msgstr "Financiële rapportages"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9354,6 +9404,7 @@ msgstr "Start periode"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Analyserichting"
 
@@ -9373,7 +9424,7 @@ msgstr "Dagboekweergave"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Totaal credit"
@@ -9443,6 +9494,7 @@ msgstr "Bankafschriften"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9519,12 +9571,12 @@ msgstr ""
 "Dit formulier wordt gebruikt door boekhouders voor het invoeren van grote "
 "hoeveelheden boekingen in OpenERP. Indien u een klantfactuur wilt boeken, "
 "selecteert u het dagboek en de periode in de zoekbalk. Beging vervolgens met "
-"het vastleggen van de regel voor de opbrengsten verkoop rekening, OpenERP "
-"zal u automatisch de een voorstel doen voor de belastingen, gerelateerd aan "
-"deze rekening en de tegenrekening \"Debiteuren\""
+"het vastleggen van de regel voor de omzetrekening, OpenERP zal u automatisch "
+"de een voorstel doen voor de belastingen, gerelateerd aan deze rekening en "
+"de tegenrekening \"Debiteuren\""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Selecteer af te letteren rekeningen"
@@ -9552,7 +9604,6 @@ msgstr ""
 "van uw bedrijfsactiviteiten over een specifieke periode."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filter op"
@@ -9574,7 +9625,7 @@ msgid "Move"
 msgstr "Mutatie"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9634,7 +9685,7 @@ msgid "Consolidated Children"
 msgstr "Geconsolideerde dochters"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9698,6 +9749,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9759,6 +9811,7 @@ msgstr "Verdelingsboeking"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9766,6 +9819,7 @@ msgstr "Verdelingsboeking"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9811,7 +9865,7 @@ msgid "Unreconciled"
 msgstr "Onafgeletterd"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Fout totaal !"
@@ -9877,7 +9931,7 @@ msgid "Comparison"
 msgstr "Vergelijking"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Onbekende fout"
@@ -9917,6 +9971,7 @@ msgstr "Bevestig rekeningmutatie"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9949,7 +10004,7 @@ msgstr ""
 #: code:addons/account/account.py:181
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr "Winst & verlies (Omzet rekening)"
+msgstr "Winst & verlies (Omzetrekening)"
 
 #. module: account
 #: constraint:account.account:0
@@ -10025,9 +10080,11 @@ msgstr "Kostenplaatsboekingen van de laatste 30 dagen"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Periodes"
 
@@ -10199,6 +10256,7 @@ msgstr "Geboekt"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10246,11 +10304,11 @@ msgid "No detail"
 msgstr "Geen detail"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
-"Er is geen opbrengstrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
+"Er is geen omzetrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -10284,6 +10342,7 @@ msgid "Verification Total"
 msgstr "Verificatie totaal"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10304,6 +10363,7 @@ msgstr "Dagboek: Alle"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10318,7 +10378,9 @@ msgstr "Dagboek: Alle"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10328,6 +10390,8 @@ msgstr "Dagboek: Alle"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10489,6 +10553,7 @@ msgstr "Inkoopfactuur"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10522,6 +10587,8 @@ msgstr "Fout ! U kunt geen recursieve sjablonen voor rekeningen maken"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Journaalpost nummer"
 
@@ -10541,7 +10608,7 @@ msgstr ""
 "soort welke al journaalposten bevat."
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Boekings is reeds afgeletterd"
@@ -10583,8 +10650,10 @@ msgstr ""
 "voor afgeschreven rekeningen."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Met mutaties"
@@ -10704,11 +10773,11 @@ msgstr "Resterend openstaand bedrag."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
 msgid "Statistic Reports"
-msgstr "Statistische rapporten"
+msgstr "Analyse rapporten"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Foute rekening !"
@@ -10740,7 +10809,7 @@ msgid "Accounts Mapping"
 msgstr "Rekeningen Indelen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Factuur '%s' is in afwachting van validatie."
@@ -10765,7 +10834,7 @@ msgstr ""
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
 msgstr ""
-"De opbrengsten of kostenrekening gerelateerd aan het gekozen produkt."
+"De opbrengsten of kostenrekening gerelateerd aan het gekozen product."
 
 #. module: account
 #: field:account.subscription,period_total:0
@@ -11002,6 +11071,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -11080,6 +11150,8 @@ msgstr "Vervaldatum"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Toekomst"
 
@@ -11234,9 +11306,6 @@ msgstr ""
 #~ msgid "Account Entry Line"
 #~ msgstr "Boekingsregel"
 
-#~ msgid "Aged Trial Balance"
-#~ msgstr "Historische trial balance"
-
 #~ msgid "Recurrent Entries"
 #~ msgstr "Periodieke boekingen"
 
@@ -13206,5 +13275,8 @@ msgstr ""
 #~ msgid "Tax codes"
 #~ msgstr "Belastingrubrieken"
 
+#~ msgid "Aged Trial Balance"
+#~ msgstr "Ouderdomsanalyse"
+
 #~ msgid "Income Accounts"
-#~ msgstr "Opbrengsten verkoop rekening"
+#~ msgstr "Omzetrekening"
diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po
index 3690eb805d7..4d74007fdc1 100644
--- a/addons/account/i18n/nl_BE.po
+++ b/addons/account/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -145,6 +145,7 @@ msgstr "Afpunten"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referentie"
 
@@ -163,13 +164,13 @@ msgstr ""
 "zonder dat u deze verwijdert."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Waarschuwing!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diversendagboek"
@@ -234,7 +235,7 @@ msgstr ""
 "afdrukken op facturen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -251,7 +252,7 @@ msgid "Belgian Reports"
 msgstr "Belgische rapporten"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "In een afgesloten journaal kunt u geen boekingen wijzigen/toevoegen."
@@ -300,7 +301,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -596,8 +597,10 @@ msgid "The accountant confirms the statement."
 msgstr "De boekhouder bevestigt het uittreksel."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -655,7 +658,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Hoofdvolgorde mag niet gelijk zijn aan de huidige volgorde."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -667,7 +670,7 @@ msgid "Tax Code Amount"
 msgstr "Btw-bedrag"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "VK"
@@ -694,8 +697,8 @@ msgid "Journal Period"
 msgstr "Journaalperiode"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -776,6 +779,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "U kunt alleen de munt van voorlopige facturen wijzigen."
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Financieel rapport"
@@ -791,12 +795,13 @@ msgstr "Financieel rapport"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Type"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -931,12 +936,13 @@ msgid "Create 3 Months Periods"
 msgstr "Trimestriële perioden maken"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Vervallen"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1021,7 +1027,7 @@ msgstr ""
 "het basisbedrag (exclusief btw)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "Kan hoofdcode voor sjabloonrekening niet vinden."
@@ -1054,10 +1060,10 @@ msgid "Code"
 msgstr "Code"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1123,7 +1129,7 @@ msgstr ""
 "informatie over de rekening en de bijbehorende kenmerken."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1171,7 +1177,7 @@ msgstr "Boekingen niet in evenwicht"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1269,7 +1275,7 @@ msgid "The move of this entry line."
 msgstr "De beweging van deze boekingslijn."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1292,7 +1298,7 @@ msgid "Entry Label"
 msgstr "Boekingslabel"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1379,14 +1385,15 @@ msgid "Taxes"
 msgstr "Btw"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Begin- en eindperiode kiezen"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Winst en verlies"
 
@@ -1441,6 +1448,7 @@ msgid "Journal Items Analysis"
 msgstr "Analyse van de boekingslijnen"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Relaties"
@@ -1465,8 +1473,10 @@ msgid "Central Journal"
 msgstr "Centralisatiedagboek"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1701,6 +1711,7 @@ msgid "Separated Journal Sequences"
 msgstr "Afzonderlijke journaalnummering"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Verantwoordelijke"
@@ -1731,7 +1742,7 @@ msgid "Year Sum"
 msgstr "Jaartotaal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1809,7 +1820,7 @@ msgid "Customer Ref:"
 msgstr "Klantenref."
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Gebruiker %s heeft geen toegang tot journaal %s."
@@ -2144,7 +2155,7 @@ msgid "Pro-forma"
 msgstr "Pro forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2176,7 +2187,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Zoeken in sjablonen boekhoudplan"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2233,7 +2244,7 @@ msgid "Description"
 msgstr "Omschrijving"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "AKCN"
@@ -2252,7 +2263,7 @@ msgid "Income Account"
 msgstr "Opbrengstenrekening"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Er is geen aankoop- of verkoopjournaal ingesteld."
@@ -2292,6 +2303,7 @@ msgstr "Productsjabloon"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2301,6 +2313,7 @@ msgstr "Productsjabloon"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2351,7 +2364,7 @@ msgid "Account Line"
 msgstr "Rekeninglijn"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2387,7 +2400,7 @@ msgid "Main Sequence"
 msgstr "Hoofdvolgorde"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2463,7 +2476,7 @@ msgid "Account Tax Code"
 msgstr "Btw-code"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2554,7 +2567,7 @@ msgid "Account Model Entries"
 msgstr "Rekeningmodelboekingen"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "AK"
@@ -2620,7 +2633,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "Afpunten boekingslijnen (afschrijving)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2652,7 +2664,7 @@ msgid "Accounts"
 msgstr "Rekeningen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Configuratiefout"
@@ -2774,6 +2786,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Ageingbalans relaties"
@@ -2826,14 +2839,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Deze wizard maakt de terugkerende boekingen."
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Er is geen volgorde ingesteld voor dit journaal."
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2943,7 +2956,7 @@ msgid "Base Code Amount"
 msgstr "Basisbedrag"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2958,7 +2971,7 @@ msgid "Default Sale Tax"
 msgstr "Standaard verkoop-btw"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Factuur '%s' is goedgekeurd."
@@ -2999,7 +3012,7 @@ msgid "Fiscal Position"
 msgstr "Fiscale positie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3155,7 +3168,7 @@ msgid "View"
 msgstr "Weergave"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3358,7 +3371,7 @@ msgid "Starting Balance"
 msgstr "Beginbalans"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Geen relatie gedefinieerd"
@@ -3414,7 +3427,7 @@ msgid "Chart of Tax"
 msgstr "Btw-plan"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "Het eindsaldo moet gelijk zijn aan het berekende saldo."
@@ -3499,6 +3512,7 @@ msgstr "Hoeveelheid:"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Lengte periode (dagen)"
 
@@ -3545,7 +3559,7 @@ msgid "Detail"
 msgstr "Detail"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3565,9 +3579,16 @@ msgid "VAT :"
 msgstr "Btw:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3589,7 +3610,7 @@ msgid "Centralised counterpart"
 msgstr "Gecentraliseerde tegenboeking"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr "U kunt niet boeken op een weergaverekening %s %s."
@@ -3614,6 +3635,7 @@ msgstr "(Als u geen boekjaar kiest, worden alle geopende boekjaren genomen)"
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3641,10 +3663,17 @@ msgstr "(Als u geen boekjaar kiest, worden alle geopende boekjaren genomen)"
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Datum"
 
@@ -3661,7 +3690,6 @@ msgstr "Afpunten ongedaan maken"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3675,7 +3703,7 @@ msgid "Chart of Accounts Template"
 msgstr "Sjablonen boekhoudplan"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3687,7 +3715,7 @@ msgstr ""
 "Gelieve een relatie in te stellen."
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Bepaalde boekingen zijn al afgepunt."
@@ -3718,6 +3746,8 @@ msgstr "Budgetten"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Geen filters"
 
@@ -3801,7 +3831,7 @@ msgid "Analytic Items"
 msgstr "Analytische lijnen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Kan btw niet veranderen"
@@ -3832,7 +3862,7 @@ msgid "Mapping"
 msgstr "Koppeling"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3849,6 +3879,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3862,7 +3893,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Ageingbalans"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "U kunt niet boeken op een afgesloten rekening %s %s."
@@ -4196,7 +4227,7 @@ msgid "Month"
 msgstr "Maand"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4257,7 +4288,7 @@ msgid "Account Base Code"
 msgstr "Rekening basisvak"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4470,7 +4501,7 @@ msgid "Allow Reconciliation"
 msgstr "Afpunten toelaten"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4505,7 +4536,7 @@ msgid "Recurring Models"
 msgstr "Boekingsmodellen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Coderingsfout"
@@ -4517,6 +4548,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Wijzigen"
 
@@ -4561,7 +4593,7 @@ msgid "Example"
 msgstr "Voorbeeld"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4577,7 +4609,7 @@ msgid "Keep empty to use the income account"
 msgstr "Leeg laten voor opbrengstenrekening"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Aankoop-btw %.2f%%"
@@ -4605,7 +4637,7 @@ msgstr "Rekeningen koppelen"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Klant"
@@ -4621,7 +4653,7 @@ msgid "Cancelled Invoice"
 msgstr "Geannuleerde factuur"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4678,7 +4710,7 @@ msgid "Income Account on Product Template"
 msgstr "Inkomstenrekening van productsjabloon"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "DIV"
@@ -4704,11 +4736,13 @@ msgstr "Nieuw boekjaar"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Facturen"
 
@@ -4851,26 +4885,24 @@ msgid "Journal Items"
 msgstr "Boekingslijnen"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Fout"
@@ -4980,7 +5012,7 @@ msgid "Beginning of Period Date"
 msgstr "Begin van periode"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -5007,7 +5039,7 @@ msgid "Child Tax Accounts"
 msgstr "Afhankelijke btw-rekeningen"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "De beginperiode moet voor de eindperiode liggen"
@@ -5029,6 +5061,7 @@ msgstr "Analytische balans -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5072,6 +5105,8 @@ msgstr "Periodetype"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Betalingen"
 
@@ -5148,7 +5183,7 @@ msgid "Line 1:"
 msgstr "Lijn 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integriteitsfout"
@@ -5181,6 +5216,7 @@ msgstr "Afpuntresultaat"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Balans"
@@ -5257,6 +5293,7 @@ msgstr "Rapport"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5386,7 +5423,6 @@ msgstr "Gemeenschappelijke rekening"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Communicatie"
 
@@ -5440,13 +5476,13 @@ msgid "End of Year Entries Journal"
 msgstr "Journaal afsluitingsboekingen"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5523,7 +5559,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Verkoopfacturen en -creditnota's"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5696,7 +5731,7 @@ msgid "Generate Opening Entries"
 msgstr "Openingsboekingen maken"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Al afgepunt"
@@ -5729,14 +5764,14 @@ msgid "Child Accounts"
 msgstr "Afhankelijke rekeningen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Boekingsnaam (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Afschrijving"
@@ -5756,7 +5791,7 @@ msgstr "Inkomsten"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Leverancier"
@@ -5786,7 +5821,7 @@ msgid "Account n°"
 msgstr "Rekeningnr."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Vrije referentie"
@@ -5801,7 +5836,9 @@ msgstr "Waardering"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Te ontvangen en te betalen"
@@ -5908,7 +5945,7 @@ msgid "Filter by"
 msgstr "Filteren op"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "U heeft een verkeerde expressie \"%(...)s\" in uw model."
@@ -5919,8 +5956,8 @@ msgid "Entry Date"
 msgstr "Boekingsdatum"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Een niet-actieve rekening kan niet worden gebruikt."
@@ -5962,8 +5999,8 @@ msgid "Number of Days"
 msgstr "Aantal dagen"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -6025,7 +6062,7 @@ msgid "Multipication factor for Base code"
 msgstr "Vermenigvuldigingsfactor basisvak"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "niet geïmplementeerd"
@@ -6064,6 +6101,8 @@ msgstr "Analyse analytische boekingen"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Vorige"
 
@@ -6353,6 +6392,8 @@ msgstr "Percentage"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Journaal & Relatie"
 
@@ -6362,7 +6403,7 @@ msgid "Power"
 msgstr "Kracht"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Kan geen ongebruikte journaalcode maken."
@@ -6404,6 +6445,7 @@ msgid "Applicable Type"
 msgstr "Van toepassing zijnde type"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Factuurreferentie"
@@ -6631,8 +6673,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "U kunt een rekening met boekingen niet verwijderen."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Boekingen: "
@@ -6648,7 +6690,7 @@ msgid "Currency of the related account journal."
 msgstr "Munt van het betrokken journaal."
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Kan geen beweging maken tussen verschillende firma's."
@@ -6695,13 +6737,13 @@ msgstr "Status is voorlopig"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Totaal debet"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Boeking \"%s\" is ongeldig."
@@ -6775,25 +6817,26 @@ msgstr "Winst en verlies (kostenrekening)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6825,8 +6868,8 @@ msgid "Printed"
 msgstr "Afgedrukt"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Fout:"
@@ -6887,7 +6930,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Historiek met een relatie per pagina"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -7053,7 +7096,7 @@ msgid "Total:"
 msgstr "Totaal:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7092,7 +7135,7 @@ msgid "Taxes used in Sales"
 msgstr "Btw gebruikt voor verkopen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7170,14 +7213,14 @@ msgid "Source Document"
 msgstr "Brondocument"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "U kunt de bevestigde boeking \"%s\" niet verwijderen."
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7281,8 +7324,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Weet u zeker dat u deze factuur wilt boeken?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7297,7 +7340,7 @@ msgid "Opening Entries Expense Account"
 msgstr "Kostenrekening openingsboekingen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Boekingen"
@@ -7435,7 +7478,7 @@ msgstr ""
 "ontwikkelaars specifieke btw maken in een aangepast domein."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "U moet perioden van dezelfde firma kiezen"
@@ -7466,8 +7509,8 @@ msgid "Reporting"
 msgstr "Rapportering"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7562,7 +7605,7 @@ msgid "Sign on Reports"
 msgstr "Teken op rapporten"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr "Geen perioden gevonden om openingsboekingen te maken"
@@ -7573,7 +7616,7 @@ msgid "Root/View"
 msgstr "Root/weergave"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "OPEN"
@@ -7608,13 +7651,14 @@ msgid "Optional Information"
 msgstr "Optionele informatie"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Het journaal moet een standaard debet– en creditrekening hebben."
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7643,13 +7687,13 @@ msgid "Maturity Date"
 msgstr "Vervaldatum"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Verkeerde rekening"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Verkoopjournaal"
@@ -7666,7 +7710,7 @@ msgid "Invoice Tax"
 msgstr "Factuur-btw"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Geen stuknummer"
@@ -7721,7 +7765,7 @@ msgstr "Tot"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Muntaanpassing"
@@ -7774,13 +7818,15 @@ msgstr "Mei"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Te betalen rekeningen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "Globale btw gedefinieerd, maar niet op de factuurlijnen."
@@ -7825,7 +7871,7 @@ msgstr "Rapportnaam"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Kas"
@@ -7837,15 +7883,15 @@ msgid "Account Destination"
 msgstr "Doelrekening"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -8001,13 +8047,14 @@ msgstr "Vast"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Waarschuwing"
@@ -8059,7 +8106,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Kies de munt voor de factuur"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -8073,7 +8120,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Kan voorlopige/pro forma/geannuleerde factuur niet %s."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Geen factuurlijnen"
@@ -8156,7 +8203,7 @@ msgid "Deferral Method"
 msgstr "Overdrachtsmethode"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Factuur '%s' is betaald."
@@ -8224,7 +8271,7 @@ msgid "Associated Partner"
 msgstr "Gekoppelde relatie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "U moet eerst een relatie kiezen."
@@ -8282,7 +8329,7 @@ msgstr ""
 "de vakken in functie van de wettelijke vereisten van uw land."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8304,7 +8351,7 @@ msgid "Choose Fiscal Year"
 msgstr "Boekjaar kiezen"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Aankoopcreditnotajournaal"
@@ -8397,7 +8444,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Bereken code voor prijzen inclusief btw"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8538,7 +8585,7 @@ msgid "current month"
 msgstr "huidige maand"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8624,10 +8671,12 @@ msgstr "Creditnotajournaal"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filteren op"
 
@@ -8666,7 +8715,7 @@ msgid "The partner account used for this invoice."
 msgstr "De centralisatierekening voor deze factuur."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Btw %.2f%%"
@@ -8689,7 +8738,7 @@ msgid "Payment Term Line"
 msgstr "Betalingslijn"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Aankoopjournaal"
@@ -8775,7 +8824,7 @@ msgid "Unpaid Invoices"
 msgstr "Openstaande facturen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr "De betalingsvoorwaarde van de leverancier heeft geen betalingslijn."
@@ -8885,7 +8934,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Leeg laten voor alle geopende boekjaren"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "De beweging (%s) voor de centralisering is bevestigd."
@@ -8900,7 +8949,7 @@ msgstr ""
 "in meerdere munten."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8983,7 +9032,7 @@ msgid "Contact Address"
 msgstr "Adres contactpersoon"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Verkeerde model"
@@ -9023,12 +9072,14 @@ msgstr "Contracten"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "onbekend"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Openingsjournaal"
@@ -9050,7 +9101,7 @@ msgstr ""
 "basis van Winst– en verliesrapport."
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Stel een reeks in voor het journaal van deze factuur."
@@ -9141,7 +9192,7 @@ msgid "Period from"
 msgstr "Periode van"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Verkoopcreditnotajournaal"
@@ -9188,7 +9239,7 @@ msgid "Purchase Tax(%)"
 msgstr "Aankoop-btw (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Gelieve factuurlijnen toe te voegen."
@@ -9204,7 +9255,7 @@ msgid "Display Detail"
 msgstr "Details tonen"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "VKCN"
@@ -9242,8 +9293,6 @@ msgstr "Einde periode"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Financiële rapporten"
@@ -9258,6 +9307,7 @@ msgstr "Financiële rapporten"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9278,6 +9328,7 @@ msgstr "Beginperiode"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Analyserichting"
 
@@ -9297,7 +9348,7 @@ msgstr "Journaalweergave"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Totaal credit"
@@ -9366,6 +9417,7 @@ msgstr "Rekeninguittreksels"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9445,7 +9497,7 @@ msgstr ""
 "voorstellen en de centralisatierekening voor de klant."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "U moet af te punten rekeningen kiezen."
@@ -9472,7 +9524,6 @@ msgstr ""
 "functie van de activiteiten gedurende een bepaalde periode."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filteren op"
@@ -9494,7 +9545,7 @@ msgid "Move"
 msgstr "Beweging"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9553,7 +9604,7 @@ msgid "Consolidated Children"
 msgstr "Afhankelijke consolidatierekeningen"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9618,6 +9669,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9678,6 +9730,7 @@ msgstr "Abonnementboeking"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9685,6 +9738,7 @@ msgstr "Abonnementboeking"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9729,7 +9783,7 @@ msgid "Unreconciled"
 msgstr "Niet afgepunt"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Verkeerd totaal"
@@ -9794,7 +9848,7 @@ msgid "Comparison"
 msgstr "Vergelijking"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Onbekende fout"
@@ -9833,6 +9887,7 @@ msgstr "Beweging valideren"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9939,9 +9994,11 @@ msgstr "Analytische boekingen van de laatste 30 dagen"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Perioden"
 
@@ -10111,6 +10168,7 @@ msgstr "Geboekt"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10158,7 +10216,7 @@ msgid "No detail"
 msgstr "Geen details"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -10195,6 +10253,7 @@ msgid "Verification Total"
 msgstr "Controletotaal"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10215,6 +10274,7 @@ msgstr "Jounraal: alle"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10229,7 +10289,9 @@ msgstr "Jounraal: alle"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10239,6 +10301,8 @@ msgstr "Jounraal: alle"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10400,6 +10464,7 @@ msgstr "Aankoopfactuur"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10433,6 +10498,8 @@ msgstr "U kunt niet dezelfde rekeningsjablonen maken."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Boekingsnummer"
 
@@ -10452,7 +10519,7 @@ msgstr ""
 "er boekingen zijn."
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "De boeking is al afgepunt"
@@ -10494,8 +10561,10 @@ msgstr ""
 "gebruikt voor oude, ongebruikte rekeningen."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Met bewegingen"
@@ -10616,8 +10685,8 @@ msgid "Statistic Reports"
 msgstr "Statistieken"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Verkeerde rekening"
@@ -10646,7 +10715,7 @@ msgid "Accounts Mapping"
 msgstr "Rekeningen koppelen"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Factuur '%s' wacht op validering."
@@ -10906,6 +10975,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10984,6 +11054,8 @@ msgstr "Vervaldatum"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Toekomst"
 
diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po
index a80c4a7ccf9..0e6a210ae94 100644
--- a/addons/account/i18n/oc.po
+++ b/addons/account/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:03+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referéncia"
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr "Ext."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tipe"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr "Còde"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr "Taxas"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr "Referéncia Client:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr "Facturas provesidor en espèra de règlament"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr "Modèl d'escritura comptabla"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr "Afichatge"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr "Detalh"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr "TVA :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr "Centralizacion"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Data"
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr "Mes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Error d'Integritat !"
@@ -4921,6 +4956,7 @@ msgstr "Resultat del letratge"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr "Comptes enfant"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Ajustament"
@@ -5479,7 +5514,7 @@ msgstr "Produches"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr "Compte n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr "Percentatge"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr "Poténcia"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr "Aplicable ?"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Debit total"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr "Estampat"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Liquiditats"
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Direccion d'Analisi"
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Credit total"
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr "Desplaçar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr "Enfants consolidats"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po
index f6932d78d03..f6d77aa35c2 100644
--- a/addons/account/i18n/pl.po
+++ b/addons/account/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:03+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -145,6 +145,7 @@ msgstr "Uzgodnienie"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Odnośnik"
 
@@ -163,13 +164,13 @@ msgstr ""
 "jej wtedy usuwać)."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Uwaga!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Dziennik PK"
@@ -234,7 +235,7 @@ msgstr ""
 "rejestrem podatkowym pojawił się na fakturach."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -251,7 +252,7 @@ msgid "Belgian Reports"
 msgstr "Raporty belgijskie"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, 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."
@@ -299,7 +300,7 @@ msgid "St."
 msgstr "Zest."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Firma w pozycji faktury nie odpowiada firmie w fakturze."
@@ -594,8 +595,10 @@ msgid "The accountant confirms the statement."
 msgstr "Księgowy potwierdza wyciąg."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -653,7 +656,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Główna numeracja musi być inna niż aktualna !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "Nie znaleziono żadnego lub znaleziono kilka okresów dla tej daty."
@@ -664,7 +667,7 @@ msgid "Tax Code Amount"
 msgstr "Kwota do rejestru podatku"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "DS"
@@ -691,8 +694,8 @@ msgid "Journal Period"
 msgstr "Okres dziennika"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Do uzgodnień zapisów firma musi być ta sama dla wszystkich zapisów"
@@ -771,6 +774,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Możesz zmienić walutę tylko w projektach faktur"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Raport Finansowy"
@@ -786,12 +790,13 @@ msgstr "Raport Finansowy"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Typ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -926,12 +931,13 @@ msgid "Create 3 Months Periods"
 msgstr "Utwórz okresy 3 miesięczne"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Termin"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1015,7 +1021,7 @@ msgstr ""
 "podstawy (bez podatku)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "Nie można ustalić konta nadrzędnego dla szablonu konta"
@@ -1048,10 +1054,10 @@ msgid "Code"
 msgstr "Kod"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1116,7 +1122,7 @@ msgstr ""
 "koncie i jego specyfice."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1164,7 +1170,7 @@ msgstr "Zapisy niezbilansowane"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1256,7 +1262,7 @@ msgid "The move of this entry line."
 msgstr "Zapis dla tej pozycji."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1279,7 +1285,7 @@ msgid "Entry Label"
 msgstr "Etykieta zapisu"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "Nie możesz modyfikować/usuwać dziennika z zapisami dla tego okresu !"
@@ -1364,14 +1370,15 @@ msgid "Taxes"
 msgstr "Podatki"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Wybierz okres początkowy i końcowy"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Zayski i straty"
 
@@ -1426,6 +1433,7 @@ msgid "Journal Items Analysis"
 msgstr "Analiza elementów dziennika"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Partnerzy"
@@ -1450,8 +1458,10 @@ msgid "Central Journal"
 msgstr "Konta dziennika"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1573,7 +1583,7 @@ msgstr "Kolumny"
 #. module: account
 #: report:account.overdue:0
 msgid "."
-msgstr ""
+msgstr "."
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -1682,6 +1692,7 @@ msgid "Separated Journal Sequences"
 msgstr "Oddzielne numeracje dzienników"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Odpowiedzialny"
@@ -1712,7 +1723,7 @@ msgid "Year Sum"
 msgstr "Suma roku"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1789,7 +1800,7 @@ msgid "Customer Ref:"
 msgstr "Odnośnik klienta:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Użytkownik %s nie ma praw dostępu do dziennika %s !"
@@ -1920,7 +1931,7 @@ msgstr "Kategoria Produktu"
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "/"
-msgstr ""
+msgstr "/"
 
 #. module: account
 #: help:res.company,property_reserve_and_surplus_account:0
@@ -2119,7 +2130,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2149,7 +2160,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Przeszukaj szablon planu kont"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2203,7 +2214,7 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "FZK"
@@ -2222,7 +2233,7 @@ msgid "Income Account"
 msgstr "Konto przychodów"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Brak dziennika typu Sprzedaż/Zakupy!"
@@ -2262,6 +2273,7 @@ msgstr "Szablon produktu"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2271,6 +2283,7 @@ msgstr "Szablon produktu"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2321,7 +2334,7 @@ msgid "Account Line"
 msgstr "Pozycja konta"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2356,7 +2369,7 @@ msgid "Main Sequence"
 msgstr "Sekwencja główna"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2430,7 +2443,7 @@ msgid "Account Tax Code"
 msgstr "Rejestr podatkowy"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2520,7 +2533,7 @@ msgid "Account Model Entries"
 msgstr "Zapisy modelu kont"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "DZ"
@@ -2586,7 +2599,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "Uzgodnienie pozycji zapisu (odpis)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2618,7 +2630,7 @@ msgid "Accounts"
 msgstr "Konta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Błąd konfiguracji!"
@@ -2740,6 +2752,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Saldo przeterminowanych płatności partnera"
@@ -2791,14 +2804,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Ten kreator utworzy zapisy powtarzalne"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Brak definicji numeracji w dzienniku"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2905,7 +2918,7 @@ msgid "Base Code Amount"
 msgstr "Kwota do rejestru podstawy"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2919,7 +2932,7 @@ msgid "Default Sale Tax"
 msgstr "Domyślny podatek sprzedaży"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Faktura  '%s' jest zatwierdzona."
@@ -2959,7 +2972,7 @@ msgid "Fiscal Position"
 msgstr "Obszar podatkowy"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3115,7 +3128,7 @@ msgid "View"
 msgstr "Widok"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3309,7 +3322,7 @@ msgid "Starting Balance"
 msgstr "Saldo początkowe"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nie zdefiniowano partnera !"
@@ -3363,7 +3376,7 @@ msgid "Chart of Tax"
 msgstr "Rejestry podatkowe"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "Wprowadzony stan końcowy powinien być taki sam jak obliczony !"
@@ -3448,6 +3461,7 @@ msgstr "Ilość:"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Długość okresu w dniach"
 
@@ -3494,7 +3508,7 @@ msgid "Detail"
 msgstr "Szczegół"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3512,9 +3526,16 @@ msgid "VAT :"
 msgstr "NIP :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3537,7 +3558,7 @@ msgid "Centralised counterpart"
 msgstr "Centralizacja przeciwnej strony"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr "Nie możesz tworzyć zapisów na kontach \"widok\" %s %s"
@@ -3550,7 +3571,7 @@ msgstr "Proces uzgodnienia kolejno dla partnerów"
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #. module: account
 #: view:account.chart:0
@@ -3564,6 +3585,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3591,10 +3613,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Data"
 
@@ -3611,7 +3640,6 @@ msgstr "Skasuj uzgodnienie"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3625,7 +3653,7 @@ msgid "Chart of Accounts Template"
 msgstr "Szablon planów kont"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3637,7 +3665,7 @@ msgstr ""
 "Podaj partnera!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Niektóre zapisy są już uzgodnione"
@@ -3668,6 +3696,8 @@ msgstr "Budżety"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Brak filtrów"
 
@@ -3753,7 +3783,7 @@ msgid "Analytic Items"
 msgstr "Zapisy analityczne"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Nie można zmienić podatku !"
@@ -3784,7 +3814,7 @@ msgid "Mapping"
 msgstr "Mapowanie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3800,6 +3830,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3813,7 +3844,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Raport próbny płatności przeterminowanych"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "Nie możesz tworzyć zapisów na koncie zamkniętym %s %s"
@@ -3918,7 +3949,7 @@ msgstr ""
 #: view:account.installer:0
 #: view:wizard.multi.charts.accounts:0
 msgid "title"
-msgstr ""
+msgstr "tytuł"
 
 #. module: account
 #: view:account.invoice:0
@@ -4094,7 +4125,7 @@ msgstr ""
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "3"
-msgstr ""
+msgstr "3"
 
 #. module: account
 #: code:addons/account/account_move_line.py:97
@@ -4143,7 +4174,7 @@ msgid "Month"
 msgstr "Miesiąc"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4204,7 +4235,7 @@ msgid "Account Base Code"
 msgstr "Rejstr główny"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4417,7 +4448,7 @@ msgid "Allow Reconciliation"
 msgstr "Zezwól na uzgodnienie"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4451,7 +4482,7 @@ msgid "Recurring Models"
 msgstr "Modele powtarzalne"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Błąd danych"
@@ -4459,10 +4490,11 @@ msgstr "Błąd danych"
 #. module: account
 #: selection:account.automatic.reconcile,power:0
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Zmień"
 
@@ -4507,7 +4539,7 @@ msgid "Example"
 msgstr "Przykład"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4523,7 +4555,7 @@ msgid "Keep empty to use the income account"
 msgstr "Pozostaw puste, aby stosować konto dochodowe"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Podatek zakupowy %.2f%%"
@@ -4551,7 +4583,7 @@ msgstr "Mapowanie konta"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Klient"
@@ -4567,7 +4599,7 @@ msgid "Cancelled Invoice"
 msgstr "Anulowana faktura"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4624,7 +4656,7 @@ msgid "Income Account on Product Template"
 msgstr "Konto dochodu w szablonie produktu"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4649,11 +4681,13 @@ msgstr "Nowy rok podatkowy"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Faktury"
 
@@ -4795,26 +4829,24 @@ msgid "Journal Items"
 msgstr "Pozycje zapisów"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Błąd"
@@ -4923,7 +4955,7 @@ msgid "Beginning of Period Date"
 msgstr "Data początku okresu"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4950,7 +4982,7 @@ msgid "Child Tax Accounts"
 msgstr "Podatki podrzędne"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Data początkowa powinna być wcześniejsza niż koniec okresu"
@@ -4972,6 +5004,7 @@ msgstr "Bilans analityczny -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5015,6 +5048,8 @@ msgstr "Typ okresu"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Płatności"
 
@@ -5091,7 +5126,7 @@ msgid "Line 1:"
 msgstr "Pozycja 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Błąd integracji !"
@@ -5124,6 +5159,7 @@ msgstr "Rezultat uzgodnienia"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Bilans"
@@ -5200,6 +5236,7 @@ msgstr "Raport"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5329,7 +5366,6 @@ msgstr "Raport księgowy ogólny"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Komunikacja"
 
@@ -5383,13 +5419,13 @@ msgid "End of Year Entries Journal"
 msgstr "Dziennik zapisów końca roku"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5465,7 +5501,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Faktury i korekty dla klientów"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5634,7 +5669,7 @@ msgid "Generate Opening Entries"
 msgstr "Generuj zapisy otwarcia"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Już uzgodnione"
@@ -5667,14 +5702,14 @@ msgid "Child Accounts"
 msgstr "Konta podrzędne"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Nazwa zapisu (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Odpis"
@@ -5694,7 +5729,7 @@ msgstr "Dochody"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Dostawca"
@@ -5724,7 +5759,7 @@ msgid "Account n°"
 msgstr "Nr konta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Odnośnik"
@@ -5739,7 +5774,9 @@ msgstr "Wycena"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Konta należności i zobowiązań"
@@ -5844,7 +5881,7 @@ msgid "Filter by"
 msgstr "Filtruj wg"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Masz błędne wyrażenie \"%(...)s\" w twoim modelu !"
@@ -5855,8 +5892,8 @@ msgid "Entry Date"
 msgstr "Data wprowadzenia"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Nie możesz używać nieaktywnego konta!"
@@ -5897,8 +5934,8 @@ msgid "Number of Days"
 msgstr "Liczba dni"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5960,7 +5997,7 @@ msgid "Multipication factor for Base code"
 msgstr "Współczynnik dla rejestru podstawy"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "nie zaimplementowane"
@@ -5999,6 +6036,8 @@ msgstr "Analiza zapisów analitycznych"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Przeszłość"
 
@@ -6279,6 +6318,8 @@ msgstr "Procentowo"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Dziennik i Partner"
 
@@ -6288,7 +6329,7 @@ msgid "Power"
 msgstr "Moc"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6330,6 +6371,7 @@ msgid "Applicable Type"
 msgstr "Dozwolony typ"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Odnośnik faktury"
@@ -6556,8 +6598,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "Nie można usunąć konta zawierającego zapisy."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Zapisy: "
@@ -6573,7 +6615,7 @@ msgid "Currency of the related account journal."
 msgstr "Waluta dziennika"
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Nie można tworzyć zapisów pomiędzy różnymi firmami"
@@ -6616,13 +6658,13 @@ msgstr "Stan jest Projekt"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Suma Winien"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Zapis \"%s\" jest niedozwolony !"
@@ -6696,25 +6738,26 @@ msgstr "Rachunek zysków i strat (konta wydatków)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6746,8 +6789,8 @@ msgid "Printed"
 msgstr "Wydrukowano"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Błąd :"
@@ -6802,7 +6845,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Wyświetl raport z każdym partnerem na osobnej stronie"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6961,7 +7004,7 @@ msgid "Total:"
 msgstr "Suma:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6991,7 +7034,7 @@ msgid "Taxes used in Sales"
 msgstr "Podatki stosowane w sprzedaży"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7064,14 +7107,14 @@ msgid "Source Document"
 msgstr "Dokument źródłowy"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "Nie możesz usuwać zaksięgowanych zapisów \"%s\"!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7169,8 +7212,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Jesteś pewna(wien), że chcesz otworzyć tę fakturę ?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7183,7 +7226,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Zapisy księgowe"
@@ -7319,7 +7362,7 @@ msgstr ""
 "specyficzne podatki we własnej domenie."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Wybierz okresy należące do tej samej firmy"
@@ -7350,8 +7393,8 @@ msgid "Reporting"
 msgstr "Raportowanie"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7447,7 +7490,7 @@ msgid "Sign on Reports"
 msgstr "Znak w raportach"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7458,7 +7501,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "DO"
@@ -7493,13 +7536,14 @@ msgid "Optional Information"
 msgstr "Informacje dodatkowe"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Dziennik musi mieć domyślne konto Winien i Ma."
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7528,13 +7572,13 @@ msgid "Maturity Date"
 msgstr "Termin płatności"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Złe konto !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Dziennik sprzedaży"
@@ -7551,7 +7595,7 @@ msgid "Invoice Tax"
 msgstr "Podatek faktury"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Brak ilości !"
@@ -7601,7 +7645,7 @@ msgstr "Do"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7649,13 +7693,15 @@ msgstr "Maj"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Konta zobowiązań"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7699,7 +7745,7 @@ msgstr "Nazwa raportu"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Gotówka"
@@ -7711,15 +7757,15 @@ msgid "Account Destination"
 msgstr "Konto docelowe"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7871,13 +7917,14 @@ msgstr "Stały"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Ostrzeżenie !"
@@ -7929,7 +7976,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Wybierz walutę dla faktury"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7942,7 +7989,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Nie można %s faktury projektowanej/proforma/anulowanej."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Brak pozycji faktury"
@@ -8025,7 +8072,7 @@ msgid "Deferral Method"
 msgstr "Metoda odroczeń"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Faktura '%s' została zapłacona."
@@ -8092,7 +8139,7 @@ msgid "Associated Partner"
 msgstr "Przypisany partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Musisz najpierw wybrać partnera"
@@ -8148,7 +8195,7 @@ msgstr ""
 "podatkowych."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8170,7 +8217,7 @@ msgid "Choose Fiscal Year"
 msgstr "Wybierz rok podatkowy"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Dziennik korekt zakupu"
@@ -8261,7 +8308,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Wylicz kod dla cen z podatkiem"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8398,7 +8445,7 @@ msgid "current month"
 msgstr "bieżący miesiąc"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8484,10 +8531,12 @@ msgstr "Dziennik korekt"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtruj wg"
 
@@ -8522,7 +8571,7 @@ msgid "The partner account used for this invoice."
 msgstr "Konto partnera stosowane dla tej faktury"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Podatek %.2f%%"
@@ -8545,7 +8594,7 @@ msgid "Payment Term Line"
 msgstr "Pozycja warunków płatności"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Dziennik zakupów"
@@ -8631,7 +8680,7 @@ msgid "Unpaid Invoices"
 msgstr "Niezapłacone faktury"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr "Warunek płatności dostawcy nie ma pozycji!"
@@ -8737,7 +8786,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Pozostaw puste dla wszystkich otwartych lat podatkowych"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "Zapis (%s) dla centralizacji został zatwierdzony!"
@@ -8750,7 +8799,7 @@ msgid ""
 msgstr "Wartość wyrażona w drugiej walucie, jeśli zapis jest wielowalutowy."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8827,7 +8876,7 @@ msgid "Contact Address"
 msgstr "Adres kontaktu"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Niepoprawny model!"
@@ -8865,12 +8914,14 @@ msgstr "Umowy"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "nieznany"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Dziennik zapisów otwarcia"
@@ -8892,7 +8943,7 @@ msgstr ""
 "strat."
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Zdefiniuj kolejność w dzienniku dla tej faktury."
@@ -8980,7 +9031,7 @@ msgid "Period from"
 msgstr "Okres od"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Dziennik korekt sprzedaży"
@@ -9027,7 +9078,7 @@ msgid "Purchase Tax(%)"
 msgstr "Podatek zakupu (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Utwórz pozycje faktury."
@@ -9043,7 +9094,7 @@ msgid "Display Detail"
 msgstr "Wyświetl szczegóły"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "FZK"
@@ -9081,8 +9132,6 @@ msgstr "Koniec okresu"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Raporty finansowe"
@@ -9097,6 +9146,7 @@ msgstr "Raporty finansowe"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9117,6 +9167,7 @@ msgstr "Okres początkowy"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Kierunek analizy"
 
@@ -9136,7 +9187,7 @@ msgstr "Widok dziennika"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Suma Ma"
@@ -9203,6 +9254,7 @@ msgstr "Wyciąg bankowy"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9282,7 +9334,7 @@ msgstr ""
 "konto przeciwstawne."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Musisz wybrać konta do uzgodnienia"
@@ -9304,7 +9356,6 @@ msgid ""
 msgstr "Tutaj definiuje się okresy podatkowe."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Fltry po"
@@ -9326,7 +9377,7 @@ msgid "Move"
 msgstr "Zapis"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9386,7 +9437,7 @@ msgid "Consolidated Children"
 msgstr "Skonsolidowane podrzędne"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9451,6 +9502,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9511,6 +9563,7 @@ msgstr "Zapis subskrypcji"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9518,6 +9571,7 @@ msgstr "Zapis subskrypcji"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9562,7 +9616,7 @@ msgid "Unreconciled"
 msgstr "Skasowano uzgodnienie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Zła suma !"
@@ -9621,7 +9675,7 @@ msgid "Comparison"
 msgstr "Porównanie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Nieznany błąd"
@@ -9660,6 +9714,7 @@ msgstr "Zatwierdź zapis"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9763,9 +9818,11 @@ msgstr "Zapisy analityczne ostatnich 30 dni"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Okresy"
 
@@ -9932,6 +9989,7 @@ msgstr "Zaksięgowano"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9979,7 +10037,7 @@ msgid "No detail"
 msgstr "Brak szczegółów"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Brak konta przychodu dla produktu: \"%s\" (id:%d)"
@@ -10015,6 +10073,7 @@ msgid "Verification Total"
 msgstr "Narzędzie weryfikacji"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10035,6 +10094,7 @@ msgstr "Dziennik: Wszystkie"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10049,7 +10109,9 @@ msgstr "Dziennik: Wszystkie"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10059,6 +10121,8 @@ msgstr "Dziennik: Wszystkie"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10217,6 +10281,7 @@ msgstr "Faktura od dostawcy"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10250,6 +10315,8 @@ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnego szablonu kont."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Numer zapisu"
 
@@ -10269,7 +10336,7 @@ msgstr ""
 "konto zawiera zapisy!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Zapis jest już uzgodniony"
@@ -10309,8 +10376,10 @@ msgstr ""
 "oznacza konto nieużywane."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Ze zmianami stanu"
@@ -10426,8 +10495,8 @@ msgid "Statistic Reports"
 msgstr "Raport statystyk"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Złe konto!"
@@ -10453,7 +10522,7 @@ msgid "Accounts Mapping"
 msgstr "Mapowanie kont"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Faktura '%s' czeka na zatwierdzenie."
@@ -10643,6 +10712,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10718,6 +10788,8 @@ msgstr "Termin płatności"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Przyszłość"
 
diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po
index 0d6ce921b02..31b2f7e361f 100644
--- a/addons/account/i18n/pt.po
+++ b/addons/account/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:03+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -145,6 +145,7 @@ msgstr "Reconciliar"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referência"
 
@@ -163,13 +164,13 @@ msgstr ""
 "pagamento sem o remover."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diário Diverso"
@@ -234,7 +235,7 @@ msgstr ""
 "de imposto apareça nas faturas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "A fatura '%s' está parcialmente paga: %s%s de %s%s (falta %s%s)"
@@ -250,7 +251,7 @@ msgid "Belgian Reports"
 msgstr "Relatórios belgas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Não pode adicionar/remover movimentos num diário fechado."
@@ -299,7 +300,7 @@ msgid "St."
 msgstr "Rua"
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -595,8 +596,10 @@ msgid "The accountant confirms the statement."
 msgstr "O contabilista confirma o extrato"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -654,7 +657,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "A sequência principal tem de ser diferente da atual !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -667,7 +670,7 @@ msgid "Tax Code Amount"
 msgstr "Montante de código de imposto"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -694,8 +697,8 @@ msgid "Journal Period"
 msgstr "Período do Diário"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Todos os movimentos a conciliar devem ser da mesma empresa."
@@ -774,6 +777,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Só se pode alterar a Moeda de um rascunho da fatura!"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Relatório Financeiro"
@@ -789,12 +793,13 @@ msgstr "Relatório Financeiro"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -931,12 +936,13 @@ msgid "Create 3 Months Periods"
 msgstr "Criar Períodos de 3 meses"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Limite"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1021,7 +1027,7 @@ msgstr ""
 "conterá um montante básico (sem imposto)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "Não consigo localizar um código ascendente para o template da conta!"
@@ -1054,10 +1060,10 @@ msgid "Code"
 msgstr "Código"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1123,7 +1129,7 @@ msgstr ""
 "tipo contem informação sobre o conteúdo da conta."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1172,7 +1178,7 @@ msgstr "Items Diários Desequilibrados"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banco"
@@ -1270,7 +1276,7 @@ msgid "The move of this entry line."
 msgstr "O movimento desta linha"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1293,7 +1299,7 @@ msgid "Entry Label"
 msgstr "Nome do movimento"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "Não pode modificar/apagar um diário com movimentos neste período !"
@@ -1378,14 +1384,15 @@ msgid "Taxes"
 msgstr "Impostos"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Selecione os períodos de início e de fim"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Lucros e Prejuízos"
 
@@ -1440,6 +1447,7 @@ msgid "Journal Items Analysis"
 msgstr "Análise das linhas de lançamento do diário"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Parceiros"
@@ -1464,8 +1472,10 @@ msgid "Central Journal"
 msgstr "Diário Central"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1702,6 +1712,7 @@ msgid "Separated Journal Sequences"
 msgstr "Sequências do Diário Separadas"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Responsável"
@@ -1732,7 +1743,7 @@ msgid "Year Sum"
 msgstr "Somatório do ano"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1811,7 +1822,7 @@ msgid "Customer Ref:"
 msgstr "Ref.do cliente:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "O utilizador %s não tem direitos de acesso ao diário %s !"
@@ -2146,7 +2157,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2177,7 +2188,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Pesquisar Templates de Plano de Contas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2234,7 +2245,7 @@ msgid "Description"
 msgstr "Descrição"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2253,7 +2264,7 @@ msgid "Income Account"
 msgstr "Conta de despesas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2294,6 +2305,7 @@ msgstr "Template do Artigo"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2303,6 +2315,7 @@ msgstr "Template do Artigo"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2353,7 +2366,7 @@ msgid "Account Line"
 msgstr "Linha de conta"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2389,7 +2402,7 @@ msgid "Main Sequence"
 msgstr "Sequência principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2465,7 +2478,7 @@ msgid "Account Tax Code"
 msgstr "Código do Imposto da Conta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2556,7 +2569,7 @@ msgid "Account Model Entries"
 msgstr "Modelo de Movimentos da Conta"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2621,7 +2634,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "Conciliar movimento da linha da conta (eliminar)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2653,7 +2665,7 @@ msgid "Accounts"
 msgstr "Contas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Erro de Configuração!"
@@ -2776,6 +2788,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Antiguidade saldos de parceiros"
@@ -2828,14 +2841,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Esta assistente vai criar lançamentos contabilísticos recorrentes"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Diário sem sequência definida"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2945,7 +2958,7 @@ msgid "Base Code Amount"
 msgstr "Montante de código base"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2960,7 +2973,7 @@ msgid "Default Sale Tax"
 msgstr "Taxa pré-definida para vendas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Fatura '% s' está validada."
@@ -3001,7 +3014,7 @@ msgid "Fiscal Position"
 msgstr "Posição Fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3156,7 +3169,7 @@ msgid "View"
 msgstr "Vista"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3359,7 +3372,7 @@ msgid "Starting Balance"
 msgstr "Saldo inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nenhum parceiro definido!"
@@ -3414,7 +3427,7 @@ msgid "Chart of Tax"
 msgstr "Plano de impostos"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3501,6 +3514,7 @@ msgstr "Quantidade :"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Duração do período (dias)"
 
@@ -3547,7 +3561,7 @@ msgid "Detail"
 msgstr "Detalhe"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3567,9 +3581,16 @@ msgid "VAT :"
 msgstr "IVA :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3591,7 +3612,7 @@ msgid "Centralised counterpart"
 msgstr "Contrapartida centralizada"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr "Não pode criar items de diário sobre uma conta \"vista\" %s %s"
@@ -3616,6 +3637,7 @@ msgstr "(Se não indicar um exercício, irá considera-los todos em aberto)"
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3643,10 +3665,17 @@ msgstr "(Se não indicar um exercício, irá considera-los todos em aberto)"
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Data"
 
@@ -3663,7 +3692,6 @@ msgstr "Desconciliar"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3677,7 +3705,7 @@ msgid "Chart of Accounts Template"
 msgstr "Template do Plano de Contas"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3689,7 +3717,7 @@ msgstr ""
 "Por favor defina os Paceiros na mesma!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Alguns movimentos já estão reconciliados !"
@@ -3720,6 +3748,8 @@ msgstr "Orçamentos"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Sem filtros"
 
@@ -3804,7 +3834,7 @@ msgid "Analytic Items"
 msgstr "Items Analíticos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Não é possível mudar o imposto!"
@@ -3835,7 +3865,7 @@ msgid "Mapping"
 msgstr "Mapeamento"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3852,6 +3882,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3865,7 +3896,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Relatório de Balancete de Antiguidade de Contas  Experimental"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "Não pode criar items de diário sobre uma conta %s %s fechada"
@@ -4204,7 +4235,7 @@ msgid "Month"
 msgstr "Mês"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4265,7 +4296,7 @@ msgid "Account Base Code"
 msgstr "Código de Conta Base"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4480,7 +4511,7 @@ msgid "Allow Reconciliation"
 msgstr "Permitir reconciliação"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4516,7 +4547,7 @@ msgid "Recurring Models"
 msgstr "Modelos recorrentes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Erro de codificação"
@@ -4528,6 +4559,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Alterar"
 
@@ -4572,7 +4604,7 @@ msgid "Example"
 msgstr "Exemplo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4588,7 +4620,7 @@ msgid "Keep empty to use the income account"
 msgstr "Manter vazia para usar a conta de despesas"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Imposto da Compra %.2f%%"
@@ -4616,7 +4648,7 @@ msgstr "Mapeamento das contas"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -4632,7 +4664,7 @@ msgid "Cancelled Invoice"
 msgstr "Fatura cancelada"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4690,7 +4722,7 @@ msgid "Income Account on Product Template"
 msgstr "Conta de Despesas no Template do Artigo"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "MISC"
@@ -4717,11 +4749,13 @@ msgstr "Novo exercício fiscal"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Faturas"
 
@@ -4864,26 +4898,24 @@ msgid "Journal Items"
 msgstr "Items do Diário"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Erro"
@@ -4994,7 +5026,7 @@ msgid "Beginning of Period Date"
 msgstr "A partir da data do Período"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -5021,7 +5053,7 @@ msgid "Child Tax Accounts"
 msgstr "Contas de imposto dependentes"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "O início do período deve ser anterior ao fim"
@@ -5044,6 +5076,7 @@ msgstr "Balancete Analítico -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5087,6 +5120,8 @@ msgstr "Tipo de período"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Pagamentos"
 
@@ -5163,7 +5198,7 @@ msgid "Line 1:"
 msgstr "Linha 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Erro de Integridade !"
@@ -5196,6 +5231,7 @@ msgstr "Resultado da reconciliação"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Balanço"
@@ -5272,6 +5308,7 @@ msgstr "Relatório"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5401,7 +5438,6 @@ msgstr "Relatório de Contas Comum"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Comunicação"
 
@@ -5454,13 +5490,13 @@ msgid "End of Year Entries Journal"
 msgstr "Diário de Movimentos de Encerramento"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5537,7 +5573,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Faturas e Notas de Crédito de Clientes"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5712,7 +5747,7 @@ msgid "Generate Opening Entries"
 msgstr "Gerar lançamento de abertura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "A reconciliação já foi feita!"
@@ -5745,14 +5780,14 @@ msgid "Child Accounts"
 msgstr "Conta-filha"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Nome movimento (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Fechar"
@@ -5772,7 +5807,7 @@ msgstr "Receita"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Fornecedor"
@@ -5802,7 +5837,7 @@ msgid "Account n°"
 msgstr "Conta nº"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referência livre"
@@ -5817,7 +5852,9 @@ msgstr "Avaliação"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Contas a receber e a pagar"
@@ -5925,7 +5962,7 @@ msgid "Filter by"
 msgstr "Filtrar por"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Tem um erro de expressão \"%(...)s\" no seu modelo!"
@@ -5936,8 +5973,8 @@ msgid "Entry Date"
 msgstr "Data de entrada"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Não pode usar uma conta inativa"
@@ -5978,8 +6015,8 @@ msgid "Number of Days"
 msgstr "Numero de dias"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -6041,7 +6078,7 @@ msgid "Multipication factor for Base code"
 msgstr "Factor de Multiplicação para o código base"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "não implementado"
@@ -6080,6 +6117,8 @@ msgstr "Analíse dos lançamentos analíticos"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Passado"
 
@@ -6372,6 +6411,8 @@ msgstr "Percentagem"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Diário & Parceiro"
 
@@ -6381,7 +6422,7 @@ msgid "Power"
 msgstr "Energia"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Não é possível gerar um código Diário não utilizado."
@@ -6423,6 +6464,7 @@ msgid "Applicable Type"
 msgstr "Tipo aplicável"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Referência da Fatura"
@@ -6655,8 +6697,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "Não pode remover uma conta que contenha items diários."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Movimentos: "
@@ -6672,7 +6714,7 @@ msgid "Currency of the related account journal."
 msgstr "Moeda relacionada com a conta diária."
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Não foi possível criar movimentos entre empresas diferentes"
@@ -6721,13 +6763,13 @@ msgstr "O estado é 'rascunho'"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Total debito"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "A entada \"%s\" não é valida !"
@@ -6801,25 +6843,26 @@ msgstr "Lucro & Prejuízo (conta de Despesa)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6851,8 +6894,8 @@ msgid "Printed"
 msgstr "Impresso"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Erro :"
@@ -6915,7 +6958,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Mostrar o relatório de balancete com um terceiro por página"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -7081,7 +7124,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7119,7 +7162,7 @@ msgid "Taxes used in Sales"
 msgstr "Impostos usados nas vendas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7197,14 +7240,14 @@ msgid "Source Document"
 msgstr "Documento de origem"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "Não pode excluir uma entrada diária publicada \"%s\"!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7310,8 +7353,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Tem a certeza que pretende abrir esta fatura"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7326,7 +7369,7 @@ msgid "Opening Entries Expense Account"
 msgstr "Abertura das entradas da Conta de despesas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Movimentos contabilísticos"
@@ -7465,7 +7508,7 @@ msgstr ""
 "desenvolvedores criar impostos específicos num domínio personalizado."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Deveria ter escolhido períodos que pretensão à mesma empresa"
@@ -7496,8 +7539,8 @@ msgid "Reporting"
 msgstr "Relatórios"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7594,7 +7637,7 @@ msgid "Sign on Reports"
 msgstr "Definir relatórios"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr "Os prazos para gerar entradas de abertura não foram encontrados"
@@ -7605,7 +7648,7 @@ msgid "Root/View"
 msgstr "Origem / Vista"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7640,13 +7683,14 @@ msgid "Optional Information"
 msgstr "Informação Opcional"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "O diário deve possuir um crédito e débito por omissão"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7675,13 +7719,13 @@ msgid "Maturity Date"
 msgstr "Data de vencimento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Má conta !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Diário de Vendas"
@@ -7698,7 +7742,7 @@ msgid "Invoice Tax"
 msgstr "Taxa de faturação"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Nenhum número à parte !"
@@ -7753,7 +7797,7 @@ msgstr "Para"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Ajustar Moeda"
@@ -7807,13 +7851,15 @@ msgstr "Maio"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Contas a pagar"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7860,7 +7906,7 @@ msgstr "Nome do relatório"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Dinheiro"
@@ -7872,15 +7918,15 @@ msgid "Account Destination"
 msgstr "Destino da conta"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -8037,13 +8083,14 @@ msgstr "Fixo"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Aviso!"
@@ -8095,7 +8142,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Selecione uma Moeda a aplicar à fatura"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -8110,7 +8157,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Não é possivel %s rascunho/proforma/cancelar fatura"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Não há linhas na fatura!"
@@ -8194,7 +8241,7 @@ msgid "Deferral Method"
 msgstr "Método de reabertura"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "A fatura '%s' está paga."
@@ -8261,7 +8308,7 @@ msgid "Associated Partner"
 msgstr "Parceiro associado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Primeiro deve selecionar um parceiro !"
@@ -8320,7 +8367,7 @@ msgstr ""
 "extrato legal de acordo com o pais em questão."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8343,7 +8390,7 @@ msgid "Choose Fiscal Year"
 msgstr "Escolha o Ano Fiscal"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diário de retorno de compras"
@@ -8436,7 +8483,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Código de cálculo para preços com imposto incluído"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8578,7 +8625,7 @@ msgid "current month"
 msgstr "mês atual"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8665,10 +8712,12 @@ msgstr "Diário de notas de crédito"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtrar por"
 
@@ -8707,7 +8756,7 @@ msgid "The partner account used for this invoice."
 msgstr "A conta do parceiro usada para esta fatura."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Imposto %.2f%%"
@@ -8730,7 +8779,7 @@ msgid "Payment Term Line"
 msgstr "Linha de prazos de pagamento"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Diário de Compra"
@@ -8819,7 +8868,7 @@ msgid "Unpaid Invoices"
 msgstr "Faturas por pagar"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8927,7 +8976,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Manter vazio para todos os anos fiscais abertos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "O movimento de conta (%s) para centralização foi confirmado!"
@@ -8942,7 +8991,7 @@ msgstr ""
 "moeda."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -9027,7 +9076,7 @@ msgid "Contact Address"
 msgstr "Endereço de contacto"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Modelo errado !"
@@ -9068,12 +9117,14 @@ msgstr "Contratos"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "desconhecido"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diário de Abertura"
@@ -9095,7 +9146,7 @@ msgstr ""
 "calculado a partir do relatório de Receitas & Despesas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Por favor, defina sequência no diário relacionado a esta fatura."
@@ -9186,7 +9237,7 @@ msgid "Period from"
 msgstr "Periodo a partir de"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diário de notas de crédito de vendas"
@@ -9233,7 +9284,7 @@ msgid "Purchase Tax(%)"
 msgstr "Imposto para compras (%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Por favor, crie primeiro algumas linhas na fatura"
@@ -9249,7 +9300,7 @@ msgid "Display Detail"
 msgstr "Mostrar detalhes"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9287,8 +9338,6 @@ msgstr "Fim do período"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Relatório financeiro"
@@ -9303,6 +9352,7 @@ msgstr "Relatório financeiro"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9323,6 +9373,7 @@ msgstr "Início do período"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Direção da analise"
 
@@ -9342,7 +9393,7 @@ msgstr "Vista do Diário"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total credit"
@@ -9412,6 +9463,7 @@ msgstr "Extratos bancários"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9492,7 +9544,7 @@ msgstr ""
 "relacionado e a contrapartida \"Conta a receber\"."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Tem de seleccionar as contas a conciliar"
@@ -9522,7 +9574,6 @@ msgstr ""
 "determinado período."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filtra por"
@@ -9544,7 +9595,7 @@ msgid "Move"
 msgstr "Movimento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "Não pode mudar o imposto, deve remover e recriar as linhas!"
@@ -9603,7 +9654,7 @@ msgid "Consolidated Children"
 msgstr "Dependentes consolidados"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9668,6 +9719,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9729,6 +9781,7 @@ msgstr "Movimentos de subscrição"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9736,6 +9789,7 @@ msgstr "Movimentos de subscrição"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9780,7 +9834,7 @@ msgid "Unreconciled"
 msgstr "Desconciliado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Mau total !"
@@ -9848,7 +9902,7 @@ msgid "Comparison"
 msgstr "Comparação"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Erro desconhecido"
@@ -9887,6 +9941,7 @@ msgstr "Validar movimento"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9993,9 +10048,11 @@ msgstr "Entradas analíticas dos últimos 30 dias"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Períodos"
 
@@ -10166,6 +10223,7 @@ msgstr "Publicado"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10213,7 +10271,7 @@ msgid "No detail"
 msgstr "Sem detalhes"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Não há conta de despesas definida para este artigo:\"%s\" (id:%d)"
@@ -10249,6 +10307,7 @@ msgid "Verification Total"
 msgstr "Verificação total"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10269,6 +10328,7 @@ msgstr "diário: Todos"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10283,7 +10343,9 @@ msgstr "diário: Todos"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10293,6 +10355,8 @@ msgstr "diário: Todos"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10456,6 +10520,7 @@ msgstr "Fatura do fornecedor"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10489,6 +10554,8 @@ msgstr "Erro ! Não pode criar Templates de conta recursivos."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Número de entrada diária"
 
@@ -10508,7 +10575,7 @@ msgstr ""
 "contém items do diário!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "O Movimento já esta reconciliado"
@@ -10549,8 +10616,10 @@ msgstr ""
 "fechada por contas depreciadas."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Com movimentos"
@@ -10673,8 +10742,8 @@ msgid "Statistic Reports"
 msgstr "Relatório estatístico"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Má Conta!"
@@ -10705,7 +10774,7 @@ msgid "Accounts Mapping"
 msgstr "Mapeamento da conta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "A fatura '%s' espera por validação"
@@ -10966,6 +11035,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -11044,6 +11114,8 @@ msgstr "Maturidade"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Futuro"
 
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 6dc0b2d6c1a..915ac8dd34a 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-07-28 14:05+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-10-17 00:11+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@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: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -52,7 +52,7 @@ msgstr "Reconciliar a Entrada de Diário"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Account Statistics"
-msgstr "Estatisticas da conta"
+msgstr "Estatísticas da Conta"
 
 #. module: account
 #: view:account.invoice:0
@@ -145,6 +145,7 @@ msgstr "Reconciliar"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referência"
 
@@ -159,17 +160,17 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
-"Ao desactivar o campo 'activo', permite-lhe ocultar as condições de "
-"pagamento sem as remover."
+"Ao desativar o campo 'Ativo', permite ocultar as condições de pagamento sem "
+"exclui-las."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Aviso!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Diário Diversos"
@@ -211,7 +212,7 @@ msgstr ""
 #: 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 "Modelos de impostos"
+msgstr "Modelo de Impostos"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -234,10 +235,10 @@ msgstr ""
 "(IVA) relativos a este código de imposto apareçam nas faturas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr "Fatura '%s' é parcialmente paga: %s%s of %s%s (%s%s restantes)"
+msgstr "A Fatura '%s' está parcialmente paga: %s%s de %s%s (%s%s restantes)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
@@ -250,10 +251,10 @@ msgid "Belgian Reports"
 msgstr "Relatórios Belgas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, 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."
+msgstr "Você não pode incluir/modificar os lançamentos em um diário fechado."
 
 #. module: account
 #: help:account.account,user_type:0
@@ -263,7 +264,7 @@ msgid ""
 "entries."
 msgstr ""
 "Este tipo de conta é usada para fins de informação, para gerar relatórios "
-"específicos de cada país legalmente, e definir as regras para fechar um ano "
+"legais específicos de cada país, e definir as regras para fechar um ano "
 "fiscal e gerar entradas de abertura."
 
 #. module: account
@@ -276,7 +277,7 @@ msgstr "Subtotal:"
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr "Recorrente Manual"
+msgstr "Recorrência Manual"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -299,7 +300,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -384,7 +385,7 @@ msgstr ""
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
 msgstr ""
-"Você não pode criar itens de diário em uma conta com este tipo de visão."
+"Você não pode criar ítens de diário em uma conta tipo \"Visualizar\"."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -405,7 +406,7 @@ msgstr "Data de criação"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "Compra de Restituição"
+msgstr "Devolução da Venda"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -452,7 +453,7 @@ msgstr "Aberto para Desconciliação"
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr "Modelo de plano"
+msgstr "Modelo de Plano"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
@@ -471,7 +472,7 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
-"Quando o período do diário é criado. O estado inicial é 'Rascunho'. Se um "
+"Quando o período do diário é criado. O estado inicial é 'Provisório'. Se um "
 "relatório for impresso ele se torna 'Impresso'. Quando todas as transações "
 "forem realizadas o estado se altera para 'Realizado'"
 
@@ -560,7 +561,7 @@ msgstr "O nome da empresa deve ser exclusivo!"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr "Fatura de Restituição"
+msgstr "Reembolso da Fatura"
 
 #. module: account
 #: report:account.overdue:0
@@ -576,7 +577,7 @@ msgstr "Transação não conciliada"
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr "Contra-parte"
+msgstr "Contrapartida"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -589,7 +590,7 @@ msgstr "Mapeamento de Impostos"
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
 msgid "Close a Fiscal Year"
-msgstr "Fechar um ano fiscal"
+msgstr "Fechar um Ano Fiscal"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
@@ -597,8 +598,10 @@ msgid "The accountant confirms the statement."
 msgstr "O Contador confirma o extrato."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -644,7 +647,7 @@ msgstr "Valor do Relatório"
 #. module: account
 #: view:account.fiscal.position.template:0
 msgid "Taxes Mapping"
-msgstr "Maper taxas"
+msgstr "Mapear taxas"
 
 #. module: account
 #: report:account.central.journal:0
@@ -657,7 +660,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Sequência Principal deve ser diferente da corrente !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -670,7 +673,7 @@ msgid "Tax Code Amount"
 msgstr "Valor do Código do Imposto"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "DV"
@@ -679,7 +682,7 @@ msgstr "DV"
 #: view:account.period:0
 #: view:account.period.close:0
 msgid "Close Period"
-msgstr "Fechar período"
+msgstr "Fechar Período"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
@@ -697,8 +700,8 @@ msgid "Journal Period"
 msgstr "Período do Diário"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -770,15 +773,16 @@ msgstr "Entradas analíticas por linha"
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr "Método de reembolso"
+msgstr "Método de Reembolso"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr "É permitido alterar a moeda apenas para Fatura Rascunho"
+msgstr "É permitido alterar a moeda apenas para Faturas Provisórias!"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Relatório Financeiro"
@@ -794,19 +798,20 @@ msgstr "Relatório Financeiro"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tipo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
 "Click on compute button."
 msgstr ""
 "Estão faltando impostos!\n"
-"Clique no botão para computar."
+"Clique no botão para calcuar."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -816,7 +821,7 @@ msgstr "linha da Conta de Inscrição"
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr "A referência do parceiro nesta fatura."
+msgstr "A referência do parceiro desta fatura."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -909,7 +914,7 @@ msgstr "Calcular"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: refund invoice and reconcile"
-msgstr "Cancelar: devolução da fatura e reconciliar"
+msgstr "Cancelar: reembolsar fatura e reconciliar"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -935,19 +940,20 @@ msgid "Create 3 Months Periods"
 msgstr "Criar período de 3 meses"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Vencimento"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"!"
 msgstr ""
-"Você não pode validar esta entrada do jornal porque a conta \"%s\" não "
-"pertence ao mapa de contas \"%s\"!"
+"Você não pode validar esta entrada do diário porque a conta \"%s\" não "
+"pertence ao plano de contas \"%s\"!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:835
@@ -972,7 +978,7 @@ msgstr "Aprovar"
 #: view:account.move:0
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr "Quantia total"
+msgstr "Valor Total"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1025,10 +1031,10 @@ msgstr ""
 "base, esse campo conterá a quantia básica (sem impostos)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
-msgstr "Não consigo localizar um código aparente para a conta do modelo!"
+msgstr "Não consigo localizar um código relacionado para a conta do modelo!"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1058,14 +1064,14 @@ msgid "Code"
 msgstr "Código"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "Nenum diário analítico !"
+msgstr "Nenhum Diário Analítico!"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1074,7 +1080,7 @@ msgstr "Nenum diário analítico !"
 #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
 #: model:ir.ui.menu,name:account.menu_account_partner_balance_report
 msgid "Partner Balance"
-msgstr "Saldo do parceiro"
+msgstr "Saldo do Parceiro"
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
@@ -1127,7 +1133,7 @@ msgstr ""
 "informação sobra a contabilidade e suas especificidades."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1177,7 +1183,7 @@ msgstr "Itens de Diário Desequilibrados"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banco"
@@ -1205,7 +1211,7 @@ msgstr ""
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr "Taxa de troca"
+msgstr "Taxa para Troca"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -1215,7 +1221,7 @@ msgstr "Centralização de crédito"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "All Months Sales by type"
-msgstr "Todos os meses de venda por tipo de"
+msgstr "Todas as Vendas do Mês por tipo"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1225,11 +1231,11 @@ msgid ""
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
-"Com Faturas de Forncedores você pode adicionar e administrar faturas "
+"Com Faturas de Fornecedores você pode adicionar e administrar faturas "
 "emitidas por seus fornecedores. OpenERP também pode gerar automaticamente "
-"faturas de rascunho das ordens de compras ou receitas. Dessa forma, você "
-"pode controlar a fatura do seu fornecedor de acordo com o que você comprou "
-"ou recebeu."
+"faturas provisórias dos pedidos de compras ou recebimentos. Dessa forma, "
+"você pode controlar a fatura do seu fornecedor de acordo com o que você "
+"comprou ou recebeu."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
@@ -1263,7 +1269,7 @@ msgstr "Código da taxa"
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr "Taxa de moedas correntes de partida"
+msgstr "Taxa de moedas correntes de saida"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1276,7 +1282,7 @@ msgid "The move of this entry line."
 msgstr "O movimento desta linha de lançamento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1288,7 +1294,7 @@ msgstr ""
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
 msgid "# of Transaction"
-msgstr "# de transações"
+msgstr "# da Transação"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -1296,10 +1302,10 @@ msgstr "# de transações"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Entry Label"
-msgstr "Aba de lançamento"
+msgstr "Descrição do Lançamento"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1309,7 +1315,7 @@ msgstr ""
 #: 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."
+msgstr "Referencia do documento que produziu esta fatura."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1320,7 +1326,7 @@ msgstr "Outros"
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr "Assinatura do Projeto"
+msgstr "Assinatura Provisória"
 
 #. module: account
 #: view:account.account:0
@@ -1385,21 +1391,22 @@ msgid "Taxes"
 msgstr "Taxas"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Selecione um período inicial e final"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Lucros e Perdas"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr "Modelos para contas"
+msgstr "Modelos para Contas"
 
 #. module: account
 #: view:account.tax.code.template:0
@@ -1417,7 +1424,7 @@ msgstr "Reconciliar lançamentos"
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr "Pagamentos atrasados"
+msgstr "Pagamentos Atrasados"
 
 #. module: account
 #: report:account.third_party_ledger:0
@@ -1428,7 +1435,7 @@ msgstr "Balanço inicial"
 #. module: account
 #: view:account.invoice:0
 msgid "Reset to Draft"
-msgstr "Restaurar para o Rascunho"
+msgstr "Voltar para Provisório"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -1439,7 +1446,7 @@ msgstr "Informação Bancária"
 #: view:account.aged.trial.balance:0
 #: view:account.common.report:0
 msgid "Report Options"
-msgstr "Opções de relatório"
+msgstr "Opções de Relatório"
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
@@ -1447,6 +1454,7 @@ msgid "Journal Items Analysis"
 msgstr "Análise de Itens de Diário"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Parceiros"
@@ -1471,8 +1479,10 @@ msgid "Central Journal"
 msgstr "Diário Central"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1486,7 +1496,7 @@ msgstr "Pesquisar Impostos"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
 msgid "Account Analytic Cost Ledger"
-msgstr "Conta Analítica Custo do Livro-Razão"
+msgstr "Conta Analítica Livro-Razão de Custo"
 
 #. module: account
 #: view:account.model:0
@@ -1501,12 +1511,12 @@ msgstr "# de Itens"
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
 msgid "Maximum write-off amount"
-msgstr "Valor máximo da Baixa ou Exclusão"
+msgstr "Valor máximo do ajuste"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Compute Taxes"
-msgstr "Computar Impostos"
+msgstr "Calcular Impostos"
 
 #. module: account
 #: field:account.chart.template,code_digits:0
@@ -1517,7 +1527,7 @@ msgstr "# de dígitos"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr "Ignorar estado 'Rascunho' para entradas manuais"
+msgstr "Ignorar situação 'Provisório para entradas manuais"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1533,10 +1543,10 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
-"Uma entrada do livro consiste em vários itens ddo livro, cada um dos quais "
-"é, um débito ou de uma operação de crédito. OpenERP cria automaticamente uma "
-"entrada por documento contábil: fatura, restituição, pagamento a "
-"fornecedores, extratos bancários, etc."
+"Uma entrada do livro consiste em vários itens do livro, cada um dos quais é, "
+"um débito ou de uma operação de crédito. O OpenERP cria automaticamente uma "
+"entrada por documento contábil: fatura, reembolso, pagamento a fornecedores, "
+"extratos bancários, etc."
 
 #. module: account
 #: view:account.entries.report:0
@@ -1602,7 +1612,7 @@ msgstr "."
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "and Journals"
-msgstr "e diários"
+msgstr "e Diários"
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -1634,7 +1644,7 @@ msgstr "Itens não postados no diário"
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr "Conta pagável"
+msgstr "Conta à Pagar"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
@@ -1675,7 +1685,7 @@ msgstr "Data/Código"
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,general_account_id:0
 msgid "General Account"
-msgstr "Conta geral"
+msgstr "Conta Geral"
 
 #. module: account
 #: field:res.partner,debit_limit:0
@@ -1709,6 +1719,7 @@ msgid "Separated Journal Sequences"
 msgstr "Sequências de diário separadas"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Responsável"
@@ -1736,10 +1747,10 @@ msgstr "Parceiro Desconhecido"
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
-msgstr "Somar ano"
+msgstr "Soma Anual"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1748,7 +1759,7 @@ msgstr "Você selecionou uma unidade que não é compatível com o produto."
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr "Este auxiliar irá alterar a moeda da fatura"
+msgstr "Este assistente irá alterar a moeda da fatura"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1769,7 +1780,7 @@ msgstr "Contas Pendentes"
 #. module: account
 #: view:account.tax.template:0
 msgid "Tax Declaration"
-msgstr "Declaração da taxa"
+msgstr "Declaração de Impostos"
 
 #. module: account
 #: help:account.journal.period,active:0
@@ -1803,7 +1814,7 @@ msgstr "Todos os Parceiros"
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr "Gráficos de Contas Analíticas"
+msgstr "Plano de Contas Analítico"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1814,10 +1825,10 @@ msgstr "Meus Registros"
 #. module: account
 #: report:account.overdue:0
 msgid "Customer Ref:"
-msgstr "Ref.Cliente:"
+msgstr "Ref. Cliente:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Usuário %s não possui permissões para acessar o diário %s !"
@@ -1840,7 +1851,7 @@ msgstr "Declaração de Impostos: Observações de Crédito"
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
-msgstr "Valor do credito"
+msgstr "Valor do crédito"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -1915,12 +1926,12 @@ msgstr "Erro! Você não pode criar empresas recursivas."
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr "Venda/Compra Diário"
+msgstr "Diário de Venda/Compra"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr "Conta analítica"
+msgstr "Centro de Custo"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:339
@@ -1971,7 +1982,7 @@ msgstr "Comparação entre lançamentos de contas e pagamentos"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Definition"
-msgstr "Definição da taxa"
+msgstr "Definição do Imposto"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -2019,7 +2030,7 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
-"A conta selecionada utializa as entradas no diário para fornecer uma moeda "
+"A conta selecionada utiliza as entradas no diário para fornecer uma moeda "
 "secundária. Você deve remover a moeda secundária na conta ou selecione uma "
 "visão multi-moeda no diário."
 
@@ -2027,7 +2038,7 @@ msgstr ""
 #: model:ir.actions.act_window,help:account.action_account_financial_report_tree
 msgid "Makes a generic system to draw financial reports easily."
 msgstr ""
-"Faz um sistema genérico para desenhar relatórios financeiros facilmente."
+"Faz um sistema genérico para exibir relatórios financeiros facilmente."
 
 #. module: account
 #: view:account.invoice:0
@@ -2087,7 +2098,7 @@ msgstr "Ano fiscal"
 #: view:account.journal.select:0
 #: view:project.account.analytic.line:0
 msgid "Open Entries"
-msgstr "Lançamentos abertos"
+msgstr "Abrir Lançamentos"
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
@@ -2152,7 +2163,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2174,7 +2185,7 @@ msgstr ""
 "Este tipo é usado para diferenciar tipos com efeitos especiais no OpenERP: "
 "visualização não pode ter lançamentos, consolidação são contas que possuem "
 "contas filho para consolidação de multi-empresas, pagamentos/recebimentos "
-"são para contas de parceiros (para computação de débito/crédito), fechado é "
+"são para contas de parceiros (para cálculo de débito/crédito), fechado é "
 "para contas de depreciação."
 
 #. module: account
@@ -2183,7 +2194,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Pesquisar Modelos de Planos de Conta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2201,8 +2212,8 @@ msgid ""
 "You can not modify the company of this journal as its related record exist "
 "in journal items"
 msgstr ""
-"Você não pode modificar a empresa desta revista como seu registro "
-"relacionado existem em itens revista"
+"Você não pode modificar a empresa deste diário pois existem itens "
+"relacionados em itens de diários"
 
 #. module: account
 #: report:account.invoice:0
@@ -2240,7 +2251,7 @@ msgid "Description"
 msgstr "Descrição"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "DRC"
@@ -2259,7 +2270,7 @@ msgid "Income Account"
 msgstr "Conta de Receita"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Não existe Diário Contábil do tipo Compra/Venda definido!"
@@ -2294,11 +2305,12 @@ msgstr "# de Quant. de Produtos "
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr "Modelo de produto"
+msgstr "Modelo de Produto"
 
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2308,6 +2320,7 @@ msgstr "Modelo de produto"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2331,7 +2344,7 @@ msgstr "Modelo de produto"
 #: field:accounting.report,fiscalyear_id_cmp:0
 #: model:ir.model,name:account.model_account_fiscalyear
 msgid "Fiscal Year"
-msgstr "Ano fiscal"
+msgstr "Ano Fiscal"
 
 #. module: account
 #: help:account.aged.trial.balance,fiscalyear_id:0
@@ -2358,12 +2371,12 @@ msgid "Account Line"
 msgstr "Linha da Conta"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
-msgstr "Não existe conta de crédito definida no livro \"%s\""
+msgstr "Não existe conta de crédito padrão no diário \"%s\""
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_financial_journals_installer
@@ -2372,9 +2385,9 @@ msgid ""
 "'Setup Your Bank Accounts' tool that will automatically create the accounts "
 "and journals for you."
 msgstr ""
-"Criar diário de contabilidade. De contas bancárias, é melhor usando o "
-"\"criar suas contas bancárias\" ferramenta que irá criar automaticamente "
-"contas e diários para você."
+"Criar seus diários contábeis. Para as contas bancárias é melhor usar o "
+"assistente \"Configure suas Contas Bancárias\" pois irá criar as contas e "
+"diários automaticamente."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
@@ -2384,7 +2397,7 @@ msgstr "Lançamento Contábil"
 #. module: account
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursivamente a membros associados."
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
@@ -2392,14 +2405,14 @@ msgid "Main Sequence"
 msgstr "Sequencia Principal"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
 msgstr ""
-"Para excluir um texto bancário, primeiro você deve cancelá-lo para excluir "
-"itens relacionados ao diário."
+"Para excluir um demonstrativo bancário, primeiro você deve cancelá-lo para "
+"excluir itens relacionados no diário."
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2411,7 +2424,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr "Forma de Pagamento"
+msgstr "Condições de Pagamento"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
@@ -2454,7 +2467,7 @@ msgstr "Aberto"
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr "Estado de rascunho de uma fatura"
+msgstr "Situação provisória da fatura"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -2468,7 +2481,7 @@ msgid "Account Tax Code"
 msgstr "Código da conta de impostos"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2538,7 +2551,7 @@ msgstr "Centralização do débito"
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr "Confirme Faturas de Rascunho"
+msgstr "Confirmar Faturas Provisórias"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2557,10 +2570,10 @@ msgstr "Contas para Renovar"
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr "Modelo de entrada de contas"
+msgstr "Modelo de Entrada de Contas"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "DC"
@@ -2568,7 +2581,7 @@ msgstr "DC"
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr "Impostos do fornecedor"
+msgstr "Impostos do Fornecedor"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2603,7 +2616,7 @@ msgstr "Extratos"
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr "Mover Nome"
+msgstr "Nome da Movimentação"
 
 #. module: account
 #: help:res.partner,property_account_position:0
@@ -2623,10 +2636,9 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr "Linha de movimentação de conta reconciliar (cancelamento de)"
+msgstr "Reconciliar linha de movimentação de conta (baixa)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2642,7 +2654,7 @@ msgstr "Imposto"
 #: field:account.move.line,analytic_account_id:0
 #: field:account.move.line.reconcile.writeoff,analytic_id:0
 msgid "Analytic Account"
-msgstr "Conta analítica"
+msgstr "Conta Analítica"
 
 #. module: account
 #: view:account.account:0
@@ -2658,7 +2670,7 @@ msgid "Accounts"
 msgstr "Contas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Erro de Configuração!"
@@ -2666,7 +2678,7 @@ msgstr "Erro de Configuração!"
 #. module: account
 #: field:account.invoice.report,price_average:0
 msgid "Average Price"
-msgstr "Preço médio"
+msgstr "Preço Médio"
 
 #. module: account
 #: report:account.overdue:0
@@ -2720,7 +2732,8 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model, they must be positive!"
-msgstr "Crédito errado ou valor do débito deve ser positivo!"
+msgstr ""
+"Valor do crédito ou débito errado no modelo, eles devem ser positivo!"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
@@ -2736,7 +2749,7 @@ msgstr "Pago/Reconciliado"
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr "Código Base para Devolução"
+msgstr "Código Base para Reembolso"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2755,7 +2768,7 @@ msgstr "Datas"
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr "Modelo Gráfico Pai"
+msgstr "Modelo de Plano Pai"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -2781,6 +2794,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Saldo anterior do Parceiro"
@@ -2811,10 +2825,10 @@ msgid ""
 "always skipping that state."
 msgstr ""
 "Marque esta caixa se você não quer que novos lançamentos de diário passem "
-"pelo estado 'provisório'. Ao invés disso, eles irão diretamente para o "
-"estado 'postado' sem nenhuma validação manual. \n"
+"pela situação 'provisório'. Ao invés disso, eles irão diretamente para a "
+"situação 'postado' sem nenhuma validação manual. \n"
 "Note que os lançamentos de diário que são automaticamente criados pelo "
-"sistema já pulam o status 'privisório'."
+"sistema já pulam a situação 'provisório'."
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
@@ -2833,18 +2847,18 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Este assistente irá criar lançamentos contábeis periódicos"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Nenhuma seqüência definida no diário !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, 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!"
+msgstr "Você deve definir um diário analítico no diário '%s'!"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -2910,7 +2924,7 @@ msgid ""
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very useful for some reports."
 msgstr ""
-"A quantidade opicional expressa por esta linha, ex: número de produtos "
+"A quantidade opcional expressa por esta linha, ex: número de produtos "
 "vendidos. A quantidade não é uma exigência legal, mas é muito útil para "
 "alguns relatórios."
 
@@ -2922,7 +2936,7 @@ msgstr "Linha 2:"
 #. module: account
 #: field:account.journal.column,required:0
 msgid "Required"
-msgstr "Requerido"
+msgstr "Obrigatório"
 
 #. module: account
 #: view:account.chart.template:0
@@ -2934,7 +2948,7 @@ msgstr "Conta de Despesas"
 #. module: account
 #: help:account.invoice,period_id:0
 msgid "Keep empty to use the period of the validation(invoice) date."
-msgstr "Deixe em branco para usar a data do prazo de validação (fatura)"
+msgstr "Deixe em branco para usar o período da data de validação (fatura)"
 
 #. module: account
 #: help:account.bank.statement,account_id:0
@@ -2950,14 +2964,14 @@ msgid "Base Code Amount"
 msgstr "Valor do código básico"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
 "refund it instead."
 msgstr ""
-"Você não pode excluir uma fatura que esta aberta ou paga. Sugerimos de "
-"restitui-la em seu lugar."
+"Você não pode excluir uma fatura que esta aberta ou paga. Sugerimos que faça "
+"o reembolso."
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
@@ -2965,7 +2979,7 @@ msgid "Default Sale Tax"
 msgstr "Taxa de vendas padrão"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "A fatura '%s' está validada."
@@ -3003,17 +3017,17 @@ msgstr "Lucros e Perdas"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr "Posição fiscal"
+msgstr "Posição Fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
 "Click on compute to update the tax base."
 msgstr ""
-"Base de tributação diferente!\n"
-"Clique no computar para atualizar a base de tributação."
+"Base de impostos diferente!\n"
+"Clique em calcular para atualizar a base de tributação."
 
 #. module: account
 #: field:account.partner.ledger,page_split:0
@@ -3032,7 +3046,7 @@ msgstr "Filhos"
 #: model:process.process,name:account.process_process_invoiceprocess0
 #: selection:report.invoice.created,type:0
 msgid "Customer Invoice"
-msgstr "Fatura de cliente"
+msgstr "Fatura de Cliente"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -3040,8 +3054,8 @@ msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
 msgstr ""
-"Defina se o montante do imposto deve ser incluído na base de cálculo da "
-"quantia antes do cálculo dos próximos impostos."
+"Defina se o valor do imposto deve ser incluído na base de cálculo da quantia "
+"antes do cálculo dos próximos impostos."
 
 #. module: account
 #: help:account.journal,user_id:0
@@ -3077,7 +3091,7 @@ msgstr "Transaçao em dinheiro"
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr "Conta Bancaria"
+msgstr "Conta Bancária"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
@@ -3134,12 +3148,12 @@ msgstr "Mês-1"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total Quantity"
-msgstr "Quantidade total"
+msgstr "Quantidade Total"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr "Conta de amortização"
+msgstr "Conta de ajuste"
 
 #. module: account
 #: field:account.model.line,model_id:0
@@ -3162,7 +3176,7 @@ msgid "View"
 msgstr "Visualizar"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3206,7 +3220,7 @@ msgstr "Livro-razão Conta Parceiros"
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr "Dá a ordem da sequencia da a coluna do diário."
+msgstr "Dá a ordem da sequencia para a coluna do diário."
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3230,7 +3244,7 @@ msgstr ""
 #: 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 "Modelo de plano de contas"
+msgstr "Modelo de Plano de Contas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
@@ -3250,7 +3264,7 @@ msgstr "Reconciliar Conta Desconciliada"
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "The description must be unique per company!"
-msgstr "A descrição deve ser único por empresa!"
+msgstr "A descrição deve ser única por empresa!"
 
 #. module: account
 #: help:account.account.type,close_method:0
@@ -3358,7 +3372,7 @@ msgstr "  Quantia de valor: 0,02"
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr "Painel contábil"
+msgstr "Painel Contábil"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -3367,10 +3381,10 @@ msgid "Starting Balance"
 msgstr "Saldo Inicial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
-msgstr "Número do parceiro definido !"
+msgstr "Nenhum Parceiro definido!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_close
@@ -3392,7 +3406,7 @@ msgstr "IVA (Imposto de Valor Agregado)"
 #. module: account
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr "Inválida Comunicação BBA Estruturado!"
+msgstr "Comunicação estruturada BBA inválida !"
 
 #. module: account
 #: help:account.analytic.line,amount_currency:0
@@ -3414,7 +3428,7 @@ msgstr "Desfazer reconciliação de Lançamentos"
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr "Não imprimível na fatura"
+msgstr "Não mostrar na Fatura"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -3423,15 +3437,15 @@ msgid "Chart of Tax"
 msgstr "Plano de taxas"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
-msgstr "O balanço de encerramento deve ser o mesmo do que o computado!"
+msgstr "O balanço de encerramento deve ser o mesmo que o balanço calculado!"
 
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr "Buscar no diário contavel"
+msgstr "Procurar Diário de Conta"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
@@ -3508,6 +3522,7 @@ msgstr "Quantidade"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Duração do período (dias)"
 
@@ -3519,7 +3534,7 @@ msgstr "Impressão do Diário de Venda / Compra"
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
-msgstr "Status da Fatura"
+msgstr "Situação da Fatura"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -3531,7 +3546,7 @@ msgstr "Categoria do Produto"
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr "Criar conta"
+msgstr "Criar Conta"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
@@ -3541,7 +3556,7 @@ msgstr "Relatório de vendas por tipo de conta"
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr "Itens do Diário Inconciliáveis"
+msgstr "Itens de Diário Irreconciliáveis"
 
 #. module: account
 #: sql_constraint:res.currency:0
@@ -3554,7 +3569,7 @@ msgid "Detail"
 msgstr "Detalhe"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3563,9 +3578,9 @@ msgid ""
 "payment term must be of type 'balance' to avoid rounding issues."
 msgstr ""
 "Não é possível criar a fatura!\n"
-"O prazo de pagamento relacionado está provavelmente errada, pois dá um valor "
-"calculado maior que o montante total faturado. A última linha de seu prazo "
-"de pagamento deve ser de \"igual\" ao tipo para evitar problemas de "
+"A condição de pagamento relacionada provavelmente está mal configurada, pois "
+"dá um valor calculado maior que o valor total faturado. A última linha da "
+"condição de pagamento deve ser do tipo \"saldo\" para evitar problemas de "
 "arredondamento."
 
 #. module: account
@@ -3574,9 +3589,16 @@ msgid "VAT :"
 msgstr "IVA (Imposto de Valor Agregado) :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3584,7 +3606,7 @@ msgstr "IVA (Imposto de Valor Agregado) :"
 #: model:ir.actions.act_window,name:account.action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr "Plano de contas"
+msgstr "Plano de Contas"
 
 #. module: account
 #: view:account.tax.chart:0
@@ -3598,11 +3620,11 @@ msgid "Centralised counterpart"
 msgstr "Contrapartida centralizada"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
-"Você não pode criar itens de jornal em uma conta de \"visualização\" %s %s"
+"Você não pode criar itens de diário em uma conta de \"visualização\" %s %s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -3626,6 +3648,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3653,10 +3676,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Data"
 
@@ -3673,7 +3703,6 @@ msgstr "Não concilidado"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3684,10 +3713,10 @@ msgstr "Usuário"
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr "Modelo de plano de contas"
+msgstr "Modelo de Plano de Contas"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3699,7 +3728,7 @@ msgstr ""
 "Por favor, defina o parceiro sobre ela!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Alguns lançamentos já estão conciliados !"
@@ -3730,6 +3759,8 @@ msgstr "Orçamentos"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Nenhum filtro"
 
@@ -3783,12 +3814,12 @@ msgstr "Pesquisar Linhas Analíticas"
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr "Conta de pagamento"
+msgstr "Conta de Pagamento"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
 msgid "Payment Order"
-msgstr "Ordem de pagamento"
+msgstr "Ordem de Pagamento"
 
 #. module: account
 #: help:account.account.template,reconcile:0
@@ -3807,7 +3838,7 @@ msgstr "Saldo da Conta"
 #: report:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr "Preço unitário"
+msgstr "Preço Unitário"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
@@ -3815,7 +3846,7 @@ msgid "Analytic Items"
 msgstr "Itens Analíticos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Não foi possível alterar o imposto!"
@@ -3828,7 +3859,7 @@ msgstr "#Entradas"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft Refund"
-msgstr "Criar um rascunho de reembolso"
+msgstr "Criar um Reembolso provisório"
 
 #. module: account
 #: view:account.state.open:0
@@ -3838,7 +3869,7 @@ msgstr "Abrir fatura"
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr "Fator de Multipicação do Código Tributário"
+msgstr "Fator de Multiplicação do Código Tributário"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -3846,7 +3877,7 @@ msgid "Mapping"
 msgstr "Mapeamento"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3863,6 +3894,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3876,7 +3908,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Relatório dos Balancetes das Contas Antigas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "Você não pode criar items de jornal em uma conta fechada %s %s"
@@ -3922,8 +3954,8 @@ msgid ""
 "The fiscalyear, periods or chart of account chosen have to belong to the "
 "same company."
 msgstr ""
-"O ano fiscal, períodos ou gráfico de conta escolhidos têm de pertencer à "
-"mesma empresa."
+"O ano fiscal, períodos ou plano de conta escolhidos têm de pertencer à mesma "
+"empresa."
 
 #. module: account
 #: model:ir.actions.todo.category,name:account.category_accounting_configuration
@@ -3970,7 +4002,7 @@ msgstr "Contabilidade Geral"
 #. module: account
 #: report:account.overdue:0
 msgid "Balance :"
-msgstr "Saldo :"
+msgstr "Saldo:"
 
 #. module: account
 #: help:account.fiscalyear.close,journal_id:0
@@ -3980,10 +4012,10 @@ msgid ""
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
-"A melhor prática é usar um diário dedicado paraa conter os lançamentos "
-"abertos de todos os anos fiscais. Observe que você deve defini-la com o "
-"padrão de débito/contas de crédito, do tipo \"situação\" e com uma "
-"contraparte central."
+"A melhor prática é usar um diário dedicado para conter os lançamentos de "
+"abertura de todos os anos fiscais. Observe que você deve defini-la com uma "
+"conta padrão de débito/crédito, do tipo \"situação\" e com uma contrapartida "
+"centralizada."
 
 #. module: account
 #: view:account.installer:0
@@ -4024,17 +4056,17 @@ msgstr "Livro-razão de Custo"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
 msgid "Assets"
-msgstr "Ativos"
+msgstr "Patrimônio"
 
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr "Confirmar faturas"
+msgstr "Confirmar Faturas"
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "Average Rate"
-msgstr "Taxa média"
+msgstr "Taxa Média"
 
 #. module: account
 #: field:account.balance.report,display_account:0
@@ -4094,7 +4126,7 @@ msgstr "Pesquisar Modelos de Impostos"
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr "Lançamentos de Rascunho"
+msgstr "Lançamentos Provisórios"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -4132,7 +4164,7 @@ msgstr ""
 #: field:report.account.receivable,type:0
 #: field:report.account_type.sales,user_type:0
 msgid "Account Type"
-msgstr "Tipo de conta"
+msgstr "Tipo de Conta"
 
 #. module: account
 #: view:res.partner:0
@@ -4215,7 +4247,7 @@ msgid "Month"
 msgstr "Mês"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4224,13 +4256,13 @@ msgid ""
 msgstr ""
 "Você não pode fazer essa modificação em uma entrada confirmada! Você pode "
 "apenas mudar alguns campos não legais ou você deve primeiro desconfirmar a "
-"entrada de diário em primeiro lugar\" \n"
+"entrada de diário\" \n"
 "%s"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr "Contato do Paypal"
+msgstr "Conta do Paypal"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
@@ -4273,10 +4305,10 @@ msgstr "Linhas de Impostos"
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr "Código de Conta Base"
+msgstr "Código Base da Conta"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4286,7 +4318,7 @@ msgstr ""
 #. module: account
 #: view:res.partner:0
 msgid "Customer Accounting Properties"
-msgstr "Propriedades contábeis do cliente"
+msgstr "Propriedades Contábeis do Cliente"
 
 #. module: account
 #: help:res.company,paypal_account:0
@@ -4358,7 +4390,7 @@ msgstr "Processamento periódico"
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr "Você não pode criar uma linha analítica na visualização da conta"
+msgstr "Você não pode criar uma linha analítica em conta de visualização"
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4366,18 +4398,19 @@ msgid ""
 "When new move line is created the state will be 'Draft'.\n"
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
-"Quando novas linas de movimentação são criadas o estado será 'Rascunho'.\n"
-"* Quando todos os pagamentos são concluídos o estado será 'Válido'."
+"Quando novas linhas de movimentação são criadas a situação será "
+"'Provisório'.\n"
+"* Quando todos os pagamentos são concluídos a situação será 'Válido'."
 
 #. module: account
 #: field:account.journal,view_id:0
 msgid "Display Mode"
-msgstr "Modo de exibição"
+msgstr "Modo de Exibição"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr "Extrato da fatura ou do pagamento"
+msgstr "Demonstrativo da fatura ou pagamento"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
@@ -4393,7 +4426,7 @@ msgstr "Título Principal 1 (negrito, sublinhado)"
 #: report:account.analytic.account.balance:0
 #: report:account.central.journal:0
 msgid "Account Name"
-msgstr "Nome da conta"
+msgstr "Nome da Conta"
 
 #. module: account
 #: help:account.fiscalyear.close,report_name:0
@@ -4403,7 +4436,7 @@ msgstr "Dê o nome dos novos lançamentos"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr "Faturas Estatísticas"
+msgstr "Estatísticas das Faturas"
 
 #. module: account
 #: field:account.account,exchange_rate:0
@@ -4419,7 +4452,7 @@ msgstr "Extratos Bancários são lançados no sistema."
 #: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr "Reconcílie a amortização"
+msgstr "Reconciliar o Ajuste"
 
 #. module: account
 #: view:report.account.receivable:0
@@ -4446,12 +4479,12 @@ msgstr "Pode ser Visível?"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
 msgid "Account Journal Select"
-msgstr "Selecionar Livro Contábil"
+msgstr "Selecionar Diário Contábil"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr "Notas de crédito"
+msgstr "Notas de Crédito"
 
 #. module: account
 #: sql_constraint:account.period:0
@@ -4484,27 +4517,27 @@ msgstr ""
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries From Models"
-msgstr "Criar lançamentos dos modelos"
+msgstr "Criar Lançamentos a partir dos Modelos"
 
 #. module: account
 #: field:account.account,reconcile:0
 #: field:account.account.template,reconcile:0
 msgid "Allow Reconciliation"
-msgstr "Permite conciliação"
+msgstr "Permite Conciliação"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
 msgstr ""
-"Você não pode modificara  empresa desse período como alguns itens que existe "
-"do diário."
+"Você não pode modificar a empresa neste período pois existem alguns itens de "
+"diário lançados."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Account Statistics"
-msgstr "Estatísticas da conta analítica"
+msgstr "Estatísticas da Conta Analítica"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -4520,7 +4553,7 @@ msgstr "Taxa incluida no preço"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr "Livro-razão Conta Custo Analítico para o Relatório de Diários"
+msgstr "Livro-razão da Conta Custo Analítico para o Relatório de Diários"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
@@ -4529,7 +4562,7 @@ msgid "Recurring Models"
 msgstr "Modelos Recorrentes"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Erro de codificação"
@@ -4541,6 +4574,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Alterar"
 
@@ -4552,12 +4586,12 @@ msgstr "Banco e Cheques"
 #. module: account
 #: field:account.journal,type_control_ids:0
 msgid "Type Controls"
-msgstr "Controlos de tipo"
+msgstr "Controle de Tipos"
 
 #. module: account
 #: help:account.journal,default_credit_account_id:0
 msgid "It acts as a default account for credit amount"
-msgstr "Ele atua como uma conta padrão para a quantidade de crédito"
+msgstr "Atua como uma conta padrão para o valor do crédito"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4585,7 +4619,7 @@ msgid "Example"
 msgstr "Exemplo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4601,10 +4635,10 @@ msgid "Keep empty to use the income account"
 msgstr "Manter vazio para usar a conta de receita"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
-msgstr "Taxa de Compra %.2f%%"
+msgstr "Impostos de Compra %.2f%%"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -4623,13 +4657,13 @@ msgstr "Selecione um Plano de Impostos"
 #: field:account.fiscal.position,account_ids:0
 #: field:account.fiscal.position.template,account_ids:0
 msgid "Account Mapping"
-msgstr "Mapeamento de contas"
+msgstr "Mapeamento de Contas"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Cliente"
@@ -4645,7 +4679,7 @@ msgid "Cancelled Invoice"
 msgstr "Fatura Cancelada"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4702,7 +4736,7 @@ msgid "Income Account on Product Template"
 msgstr "Conta de Receita no Modelo de Produto"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "MISC"
@@ -4723,17 +4757,19 @@ msgstr ""
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
-msgstr "Novo ano fiscal"
+msgstr "Novo Ano Fiscal"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Faturas"
 
@@ -4753,7 +4789,7 @@ msgstr "Verificar"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesman"
-msgstr "Vendedor"
+msgstr "Representante"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4777,9 +4813,9 @@ msgid ""
 "account if this is a Customer Invoice or Supplier Refund, otherwise a "
 "Partner bank account number."
 msgstr ""
-"Número de conta bancária para que a fatura seja paga. A conta bancária da "
-"empresa, se esta é uma fatura de cliente ou Reembolso Fornecedor, caso "
-"contrário um parceiro número da conta bancária."
+"Número de Conta Bancária para que a fatura seja paga. A conta bancária da "
+"Empresa, se esta for uma Fatura de Cliente ou Reembolso Fornecedor, caso "
+"contrário o número da conta bancária do parceiro."
 
 #. module: account
 #: view:account.state.open:0
@@ -4815,7 +4851,7 @@ msgstr "O extrato bancário utilizado para a reconciliação bancária"
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr "Faturas Rascunho foram validadas. "
+msgstr "As faturas provisórias foram validadas. "
 
 #. module: account
 #: constraint:account.account.template:0
@@ -4848,7 +4884,7 @@ msgstr "Calcular"
 #. module: account
 #: field:account.tax,type_tax_use:0
 msgid "Tax Application"
-msgstr "Aplicação de impostos"
+msgstr "Aplicação de Impostos"
 
 #. module: account
 #: view:account.move:0
@@ -4876,26 +4912,24 @@ msgid "Journal Items"
 msgstr "Itens do Diário"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Erro"
@@ -4912,7 +4946,7 @@ msgstr "Fim de período"
 #. module: account
 #: view:res.partner:0
 msgid "Bank Details"
-msgstr "Detalhes bancários"
+msgstr "Detalhes Bancário"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_partner_balance
@@ -4936,12 +4970,12 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr "Número da fatura deve ser único por empresa!"
+msgstr "O número da fatura deve ser único por Empresa!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr "Saldo por tipo de conta"
+msgstr "Saldo por Tipo de Conta"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -5003,10 +5037,10 @@ msgstr "Para Fechar"
 #. module: account
 #: field:account.treasury.report,date:0
 msgid "Beginning of Period Date"
-msgstr "A partir do período"
+msgstr "Data de Início do Período"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -5014,8 +5048,8 @@ msgid ""
 "that."
 msgstr ""
 "Você não pode modificar um lançamento postado deste diário!\n"
-"Você deveria ajustar o diário para permitir o cancelamento de lançamentos se "
-"você quiser fazer isto."
+"Você precisa configurar o diário para permitir o cancelamento de lançamentos "
+"se você quiser fazer isto."
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
@@ -5025,7 +5059,7 @@ msgstr "Modelos"
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr "Descrição da taxa"
+msgstr "Descrição do Imposto"
 
 #. module: account
 #: field:account.tax,child_ids:0
@@ -5033,7 +5067,7 @@ msgid "Child Tax Accounts"
 msgstr "Contas de impostos derivados (subcontas)"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Período Inicial deve ser anterior ao Período Final"
@@ -5056,6 +5090,7 @@ msgstr "Balanço analítico -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5093,12 +5128,14 @@ msgstr "30 Dias Líquidos"
 #. module: account
 #: field:account.subscription,period_type:0
 msgid "Period Type"
-msgstr "Tipo de período"
+msgstr "Tipo de Período"
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Pagamentos"
 
@@ -5122,7 +5159,7 @@ msgstr "Código python (reverso)"
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr "Formas de Pagamento"
+msgstr "Condições de Pagamento"
 
 #. module: account
 #: help:account.chart.template,complete_tax_set:0
@@ -5152,7 +5189,7 @@ msgstr "Nome da Coluna"
 #: view:account.general.journal:0
 msgid ""
 "This report gives you an overview of the situation of your general journals"
-msgstr "Este relatorio apresenta um resumo da situação dos diários gerais."
+msgstr "Este relatório apresenta um resumo da situação dos diários gerais."
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -5168,7 +5205,7 @@ msgstr "Ano"
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
 msgid "Opening Cashbox"
-msgstr "Abrindo Caixa"
+msgstr "Abrindo o Caixa"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5176,7 +5213,7 @@ msgid "Line 1:"
 msgstr "Linha 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Erro de integridade !"
@@ -5209,9 +5246,10 @@ msgstr "Resultado da conciliação"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
-msgstr "Folha de Balanço"
+msgstr "Balancete"
 
 #. module: account
 #: view:account.general.journal:0
@@ -5222,7 +5260,7 @@ msgstr "Diários Gerais"
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date in Period"
-msgstr "Verifique a Data em Período"
+msgstr "Verifique a Data no Período"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
@@ -5285,10 +5323,11 @@ msgstr "Relatório"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
-msgstr "Montante"
+msgstr "Valor"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_customerinvoice0
@@ -5309,7 +5348,7 @@ msgstr "Imposto nas sub-contas"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr "Modelo de posição da taxa fiscal"
+msgstr "Modelo de Posição Fiscal dos Impostos"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -5324,7 +5363,7 @@ msgstr "Coeficiente para conta principal"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic Accounts with a past deadline."
-msgstr "Contas Analíticas com um prazo passado."
+msgstr "Contas Analíticas Vencidas"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -5371,7 +5410,7 @@ msgstr "account.installer"
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr "Incluir no Montante Base"
+msgstr "Incluir no Valor Base"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5397,7 +5436,7 @@ msgstr "Controles de lançamento"
 #: view:account.analytic.chart:0
 #: view:project.account.analytic.line:0
 msgid "(Keep empty to open the current situation)"
-msgstr "(Manter vazia para abrir a situação atual)"
+msgstr "(Deixe em branco para abrir a situação atual)"
 
 #. module: account
 #: field:account.analytic.balance,date1:0
@@ -5415,7 +5454,6 @@ msgstr "Relatório de Contas da Contabilidade Geral"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Comunicação"
 
@@ -5450,7 +5488,7 @@ msgstr ""
 #: field:account.tax.template,ref_tax_sign:0
 #: field:account.tax.template,tax_sign:0
 msgid "Tax Code Sign"
-msgstr "Sinal código do imposto"
+msgstr "Sinal do Código do Imposto"
 
 #. module: account
 #: model:ir.model,name:account.model_report_invoice_created
@@ -5465,25 +5503,25 @@ msgstr "  Números de Dias: 14"
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr "Diário de lançamentos do fim do ano"
+msgstr "Diário de Lançamentos do Fim do Ano"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
-msgstr "Erro de Configuração !"
+msgstr "Erro de Configuração!"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
-msgstr "Montante a Pagar"
+msgstr "Valor a Pagar"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5513,7 +5551,7 @@ msgstr "Quantidade de Produtos"
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr "Não postado"
+msgstr "Não lançado"
 
 #. module: account
 #: view:account.change.currency:0
@@ -5543,7 +5581,7 @@ msgstr "Data de Pagamento"
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "Contas analíticas"
+msgstr "Contas Analíticas"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5551,7 +5589,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Faturas de Clientes e Reembolsos"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5565,8 +5602,8 @@ msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
 msgstr ""
-"O diário especificado não tem nenhum lançamento de movimento de conta "
-"informado para este período com status provisório"
+"O Diário especificado não tem nenhum lançamento de movimento de conta "
+"informado para este período com situação provisório"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
@@ -5606,7 +5643,7 @@ msgstr "Texto Normal"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice Options"
-msgstr "Opções da Fatura de Devolução"
+msgstr "Opções da Fatura de Reembolso"
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
@@ -5614,9 +5651,8 @@ msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
-"Número de montantes parciais que podem ser combinados para encontrar um "
-"ponto de equilíbrio. Pode ser escolhido como ponto para reconciliação "
-"automática"
+"Número de valores parciais que podem ser combinados para encontrar um ponto "
+"de equilíbrio. Pode ser escolhido como ponto para reconciliação automática"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -5631,14 +5667,14 @@ msgstr ""
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr "Modelo de posição fiscal"
+msgstr "Modelo de Posição Fiscal"
 
 #. module: account
 #: view:account.analytic.chart:0
 #: view:account.chart:0
 #: view:account.tax.chart:0
 msgid "Open Charts"
-msgstr "Abrir planos"
+msgstr "Abrir Planos"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -5680,8 +5716,8 @@ msgid ""
 "No fiscal year defined for this date !\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
-"Ano fiscal não definida para esta data!\n"
-"Por Favor criar um á partir da configuração do menu de contabilidade."
+"Ano fiscal não definido para esta data!\n"
+"Por Favor crie um a partir da configuração no menu de Contabilidade."
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5713,12 +5749,12 @@ msgstr "Reconciliação Automática de Contas"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr "Item Livro"
+msgstr "Item de Diário"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
 msgid "Move journal"
-msgstr "Movimento do Livro"
+msgstr "Diário de Movimento"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
@@ -5727,7 +5763,7 @@ msgid "Generate Opening Entries"
 msgstr "Gerar Lançamentos de Abertura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Já Reconciliado"
@@ -5735,7 +5771,7 @@ msgstr "Já Reconciliado"
 #. module: account
 #: help:account.tax,type:0
 msgid "The computation method for the tax amount."
-msgstr "O método de calculo para o valor do imposto."
+msgstr "O método de cálculo para o valor do imposto."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5745,14 +5781,14 @@ msgstr "Cálculo da Data do Vencimento"
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr "Criar data"
+msgstr "Data de Criação"
 
 #. module: account
 #: view:account.analytic.journal:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journals"
-msgstr "Livros Analíticos"
+msgstr "Diários Analíticos"
 
 #. module: account
 #: field:account.account,child_id:0
@@ -5760,17 +5796,17 @@ msgid "Child Accounts"
 msgstr "Sub-contas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr "Mova nome (id) %s (%s)"
+msgstr "Nome da movimentação (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
-msgstr "Baixa ou exclusão"
+msgstr "Ajuste"
 
 #. module: account
 #: field:res.partner,debit:0
@@ -5787,7 +5823,7 @@ msgstr "Receita"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Fornecedor"
@@ -5804,7 +5840,7 @@ msgstr "Março"
 #. module: account
 #: view:account.account.template:0
 msgid "Account Template"
-msgstr "Modelo de conta"
+msgstr "Modelo de Conta"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
@@ -5817,7 +5853,7 @@ msgid "Account n°"
 msgstr "Conta n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referencia livre"
@@ -5832,7 +5868,9 @@ msgstr "Valorização"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Contas de Pagamento e Recebimento"
@@ -5846,7 +5884,7 @@ msgstr "Mapeamento Fiscal"
 #: model:ir.actions.act_window,name:account.action_account_state_open
 #: model:ir.model,name:account.model_account_state_open
 msgid "Account State Open"
-msgstr "Estado da conta está em aberto"
+msgstr "Contas Abertas"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -5856,12 +5894,12 @@ msgstr "Qtd máx:"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice"
-msgstr "Fatura de Devolução"
+msgstr "Fatura de Reembolso"
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
 msgid "Invoice Address"
-msgstr "Endereço da fatura"
+msgstr "Endereço de Cobrança"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_entries_report_all
@@ -5905,7 +5943,7 @@ msgid ""
 msgstr ""
 "Selecione aqui o tipo de valorização relacionado à linha da forma de "
 "pagamento. Repare que você deve ter a última linha com o tipo 'Saldo' para "
-"garantir que o montante total seja considerado."
+"garantir que o valor total seja considerado."
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -5941,7 +5979,7 @@ msgid "Filter by"
 msgstr "Filtrar por"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Você tem um erro de expressão \"%(...) s\" no seu modelo!"
@@ -5952,8 +5990,8 @@ msgid "Entry Date"
 msgstr "Data de Entrada"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Voce não pode usar uma conta inativa!"
@@ -5994,12 +6032,12 @@ msgid "Number of Days"
 msgstr "Numero de dias"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
-msgstr "Ação invalida !"
+msgstr "Ação inválida!"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:102
@@ -6010,7 +6048,7 @@ msgstr "Período: %s"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
 msgid "Review your Financial Journals"
-msgstr "Reveja seus diários financeiros"
+msgstr "Reveja seus Diários Financeiros"
 
 #. module: account
 #: help:account.tax,name:0
@@ -6049,7 +6087,7 @@ msgstr "Saldo Externo"
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr "Diário-Nome do período"
+msgstr "Nome do Diário-Período"
 
 #. module: account
 #: field:account.invoice.tax,factor_base:0
@@ -6057,7 +6095,7 @@ msgid "Multipication factor for Base code"
 msgstr "Fator de multiplicação para o código Base"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "não implementado"
@@ -6074,13 +6112,13 @@ msgid ""
 "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state!"
 msgstr ""
-"As Notas Fiscais não podem ser confirmadas porque não estão com status "
-"'Provisório' ou 'Pro-Forma'!"
+"As Faturas selecionadas não podem ser confirmadas porque não estão com "
+"situação 'Provisório' ou 'Pro-Forma'!"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Running Subscription"
-msgstr "Assinatura Corrida"
+msgstr "Assinaturas Ativas"
 
 #. module: account
 #: report:account.invoice:0
@@ -6096,6 +6134,8 @@ msgstr "Análise de Lançamentos Analíticos"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Passado"
 
@@ -6156,7 +6196,7 @@ msgstr "account.analytic.line.extended"
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr "(Mantenha vazio para usar o período atual)"
+msgstr "(Deixe em branco para usar o período atual)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierreconcilepaid0
@@ -6164,7 +6204,7 @@ msgid ""
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
 msgstr ""
-"Assim que a reconciliação é feita, os status das faturas mudam para "
+"Assim que a reconciliação é feita, a situação das faturas mudam para "
 "'concluído' (pago) no sistema."
 
 #. module: account
@@ -6186,7 +6226,7 @@ msgstr "Linha Analítica"
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr "Taxas de clientes"
+msgstr "Impostos de Clientes"
 
 #. module: account
 #: help:account.model,name:0
@@ -6213,13 +6253,13 @@ msgstr "Configuração de Relatório"
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
 msgid "Tax Type"
-msgstr "Tipo de taxa"
+msgstr "Tipo de Imposto"
 
 #. 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 "Modelos de conta"
+msgstr "Modelos de Conta"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,complete_tax_set:0
@@ -6247,7 +6287,7 @@ msgstr "Empresas"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Open and Paid Invoices"
-msgstr "Faturas em Aberto e Pagos"
+msgstr "Faturas em Aberto e Pagas"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
@@ -6272,7 +6312,7 @@ msgstr "Selecione um ano fiscal para fechar"
 #. 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 "Listar todas as tacaxa que foram instaladas pelo assitente"
+msgstr "Mostrar todos os impostos que foram instalados pelo assistente"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_intracom
@@ -6347,7 +6387,7 @@ msgstr "Recebimento"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr "Empresa deve ser o mesmo para a sua conta relacionada e período."
+msgstr "A Empresa deve ser a mesma para a conta e período"
 
 #. module: account
 #: view:account.invoice:0
@@ -6386,6 +6426,8 @@ msgstr "Porcentagem"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Diário & Parceiro"
 
@@ -6395,7 +6437,7 @@ msgid "Power"
 msgstr "Energia"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Não é possível gerar um código de diário não utilizado."
@@ -6437,9 +6479,10 @@ msgid "Applicable Type"
 msgstr "Tipo aplicável"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
-msgstr "Referencia fatura"
+msgstr "Referência da Fatura"
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -6498,7 +6541,7 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr "O nome do diário deve ser único por empresa !"
+msgstr "O nome do diário deve ser único por empresa!"
 
 #. module: account
 #: field:account.account.template,nocreate:0
@@ -6512,8 +6555,8 @@ msgid ""
 "You cannot change the owner company of an account that already contains "
 "journal items."
 msgstr ""
-"Você não pode mudar o dono da empresa, de uma conta que já contém itens de "
-"diário."
+"Você não pode mudar a empresa proprietária de uma conta que já contém itens "
+"de diário."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -6575,7 +6618,7 @@ msgstr "  Avaliação: Balanço"
 #. module: account
 #: field:account.invoice.line,uos_id:0
 msgid "Unit of Measure"
-msgstr "Unidade de medida"
+msgstr "Unidade de Medida"
 
 #. module: account
 #: constraint:account.payment.term.line:0
@@ -6605,7 +6648,7 @@ msgstr "account.sequence.fiscalyear"
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "Analytic Journal"
-msgstr "Diário analítico"
+msgstr "Diário Analítico"
 
 #. module: account
 #: code:addons/account/account.py:622
@@ -6627,7 +6670,7 @@ msgstr "Base"
 #. module: account
 #: field:account.model,name:0
 msgid "Model Name"
-msgstr "Nome do modelo"
+msgstr "Nome do Modelo"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
@@ -6670,8 +6713,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "Você não pode remover uma conta que contenha itens de diário."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Lancamentos: "
@@ -6687,10 +6730,10 @@ msgid "Currency of the related account journal."
 msgstr "Moeda da conta do diário relacionada."
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
-msgstr "Não foi possível criar movimentação entre empresas diferentes"
+msgstr "Não é possível criar movimentação entre empresas diferentes"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_type_form
@@ -6731,17 +6774,17 @@ msgstr ""
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
 msgid "State is draft"
-msgstr "O Status é Provisório"
+msgstr "A situação é Provisório"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Débito Total"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Lançamento \"%s\" não é válido"
@@ -6797,7 +6840,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Create"
-msgstr "Criado"
+msgstr "Criar"
 
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
@@ -6809,38 +6852,39 @@ msgstr "Criar lançamento"
 #: code:addons/account/account.py:182
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr "Ganhos e perdas (conta de Despesa)"
+msgstr "Lucros e Perdas (Conta de Despesa)"
 
 #. module: account
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
 #: code:addons/account/wizard/account_use_model.py:44
 #, python-format
 msgid "Error !"
-msgstr "Erro !"
+msgstr "Erro!"
 
 #. module: account
 #: field:account.financial.report,style_overwrite:0
@@ -6857,7 +6901,7 @@ msgstr "Preservar sinal do saldo"
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
 #: model:ir.ui.menu,name:account.menu_account_vat_declaration
 msgid "Taxes Report"
-msgstr "Relatório de taxas"
+msgstr "Relatório de Impostos"
 
 #. module: account
 #: selection:account.journal.period,state:0
@@ -6865,8 +6909,8 @@ msgid "Printed"
 msgstr "Impresso"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Erro :"
@@ -6929,7 +6973,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Apresenta o Livro Razão com um parceiro por página"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6946,7 +6990,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "JRNL"
-msgstr ""
+msgstr "JRNL"
 
 #. module: account
 #: view:account.partner.balance:0
@@ -6964,8 +7008,8 @@ msgstr ""
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state"
 msgstr ""
-"As Linhas de Lançamento selecionadas não possuem nenhum movimento com status "
-"provisório"
+"As Linhas de Lançamento selecionadas não possuem nenhum movimento com "
+"situação Provisório"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -6988,7 +7032,7 @@ msgstr ""
 #: code:addons/account/report/common_report_header.py:67
 #, python-format
 msgid "All Entries"
-msgstr "Todos lançamentos"
+msgstr "Todos os lançamentos"
 
 #. module: account
 #: constraint:product.template:0
@@ -7013,7 +7057,7 @@ msgstr "Saldo de Abertura"
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr "Reconciliação da conta"
+msgstr "Reconciliação da Conta"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
@@ -7053,8 +7097,8 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
-"Marque esta opção se você não estiver seguro sobre o lançamento e quiser "
-"colocar uma observação \"para ser revisado\" por um responsável contábil."
+"Marque esta opção se você tiver dúvidas sobre o lançamento e quiser colocar "
+"uma observação \"para ser revisado\" por um responsável contábil."
 
 #. module: account
 #: field:account.chart.template,complete_tax_set:0
@@ -7070,7 +7114,7 @@ msgstr "Propriedades"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_chart
 msgid "Account tax chart"
-msgstr "Gráfico de contas de taxas"
+msgstr "Plano de Impostos da Conta"
 
 #. module: account
 #: constraint:res.partner.bank:0
@@ -7096,7 +7140,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7133,7 +7177,7 @@ msgid "Taxes used in Sales"
 msgstr "Impostos usados em Vendas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7159,7 +7203,7 @@ msgstr "Vendas"
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr "Coluna do diário"
+msgstr "Coluna do Diário"
 
 #. module: account
 #: selection:account.invoice.report,state:0
@@ -7197,7 +7241,7 @@ msgid ""
 "you request an interval of 30 days OpenERP generates an analysis of "
 "creditors for the past month, past two months, and so on. "
 msgstr ""
-"O Saldo de Parceiro Vencido é um relatório mais detalhado dos seus "
+"O Saldo em Aberto do Parceiro é um relatório mais detalhado dos seus "
 "recebíveis por intervalo. Quando abrir este relatório, o OpenERP pede o nome "
 "da empresa, o período fiscal e o intervalo a ser analisado (em dias). O "
 "OpenERP, então, calcula a tabela de saldo por período. Assim, se você pedir "
@@ -7211,14 +7255,14 @@ msgid "Source Document"
 msgstr "Documento de Origem"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "Você não pode excluir um lançamento do diário publicado \"%s\"!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7237,7 +7281,7 @@ msgstr "Relatório Contábil"
 #. module: account
 #: report:account.invoice:0
 msgid "Taxes:"
-msgstr "Taxas:"
+msgstr "Impostos:"
 
 #. module: account
 #: help:account.tax,amount:0
@@ -7290,7 +7334,7 @@ msgid ""
 "This date will be used as the invoice date for Refund Invoice and Period "
 "will be chosen accordingly!"
 msgstr ""
-"Esta data será usada como a data da Fatura de Devolução e o período será "
+"Esta data será usada como a data da Reembolso da Fatura e o período será "
 "escolhido apropriadamente!"
 
 #. module: account
@@ -7302,7 +7346,7 @@ msgstr "Faturamento Mensal"
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr "Linhas analíticas"
+msgstr "Linhas Analíticas"
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
@@ -7323,26 +7367,26 @@ msgstr "Você tem certeza que deseja abrir os Lançamentos de Diário?"
 #. module: account
 #: view:account.state.open:0
 msgid "Are you sure you want to open this invoice ?"
-msgstr "Você tem a certeza que pretende abrir esta factura?"
+msgstr "Você deseja abrir essa Fatura?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
 "configuration of the accounting menu."
 msgstr ""
-"Não pode encontrar uma tabela de conta, você deve criar uma a partir da "
-"configuração do menu contabilidade."
+"O Plano de Contas não foi criado, você precisa criar um a partir da "
+"configuração no menu Contabilidade."
 
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
 msgid "Opening Entries Expense Account"
-msgstr "Abertura de Contas de Entradas e Despesas"
+msgstr "Abertura de Contas de Despesas"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Lançamentos Contábeis"
@@ -7383,12 +7427,12 @@ msgstr ""
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr "Entradas Postadas"
+msgstr "Entradas lançadas"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For percent enter a ratio between 0-1."
-msgstr "Para porcentagem introduzir um razão entre 0-1."
+msgstr "Para porcentagem introduzir um valor entre 0-1."
 
 #. module: account
 #: report:account.invoice:0
@@ -7396,7 +7440,7 @@ msgstr "Para porcentagem introduzir um razão entre 0-1."
 #: field:account.invoice,date_invoice:0
 #: field:report.invoice.created,date_invoice:0
 msgid "Invoice Date"
-msgstr "Data da fatura"
+msgstr "Data da Fatura"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -7463,7 +7507,7 @@ msgstr "Imposto Padrão de Compra"
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
 msgid "Opening Entries Income Account"
-msgstr "Abertura de Contas e Entradas de Rendas"
+msgstr "Entradas de Abertura da Conta de Receitas"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7482,7 +7526,7 @@ msgstr ""
 "personalizado."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Você deveria ter escolhido períodos que pertencem a mesma empresa"
@@ -7513,8 +7557,8 @@ msgid "Reporting"
 msgstr "Relatórios"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7522,7 +7566,7 @@ msgstr "Relatórios"
 #: code:addons/account/wizard/account_validate_account_move.py:61
 #, python-format
 msgid "Warning"
-msgstr "Mensagem"
+msgstr "Aviso"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_analytic_open
@@ -7538,7 +7582,7 @@ msgstr "Fechamento de Caixa"
 #: view:account.journal:0
 #: field:res.partner.bank,journal_id:0
 msgid "Account Journal"
-msgstr "Diário de conta"
+msgstr "Diário de Conta"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -7571,7 +7615,7 @@ msgstr "Domínio"
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr "Modelo de uso"
+msgstr "Usar modelo"
 
 #. module: account
 #: code:addons/account/account.py:429
@@ -7589,15 +7633,15 @@ msgid ""
 msgstr ""
 "Esta tela é usada por contadores para registrar lançamentos em massa no "
 "OpenERP. Se voce quiser gravar uma fatura de fornecedor, comece registrando "
-"a linha da conta de despesa, o OpenERP irá propor automaticamente as Taxas "
-"relacionadas a esta conta e a contra-partida \"Conta Pagável\"."
+"a linha da conta de despesa, o OpenERP irá propor automaticamente os "
+"impostos relacionados a esta conta e a contra-partida \"Conta Pagável\"."
 
 #. module: account
 #: view:account.invoice.line:0
 #: field:account.invoice.tax,invoice_id:0
 #: model:ir.model,name:account.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "Linha da fatura"
+msgstr "Linha da Fatura"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -7607,13 +7651,13 @@ msgstr "Reembolsos de Clientes e Fornecedores"
 #. module: account
 #: field:account.financial.report,sign:0
 msgid "Sign on Reports"
-msgstr "Assinar relatórios"
+msgstr "Sinal nos Relatórios"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
-msgstr "Os prazos para gerar entradas de abertura não foram encontrados"
+msgstr "Os períodos para gerar entradas de abertura não foram encontrados"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
@@ -7621,10 +7665,10 @@ msgid "Root/View"
 msgstr "Origem/Visualização"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
-msgstr ""
+msgstr "OPEJ"
 
 #. module: account
 #: report:account.invoice:0
@@ -7656,13 +7700,14 @@ msgid "Optional Information"
 msgstr "Informação Opcional"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, 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"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7691,16 +7736,16 @@ msgid "Maturity Date"
 msgstr "Data de Vencimento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Conta errada!"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
-msgstr "Diário de vendas"
+msgstr "Diário de Vendas"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:104
@@ -7711,10 +7756,10 @@ msgstr "Diário com Itens Abertos!"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
 msgid "Invoice Tax"
-msgstr "Taxa de fatura"
+msgstr "Impostos da Fatura"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Nenhum número da parte!"
@@ -7723,7 +7768,7 @@ msgstr "Nenhum número da parte!"
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr "Hierarquia Relatórios da Conta"
+msgstr "Relatórios de Hierarquia da Conta"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -7743,13 +7788,13 @@ msgstr ""
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr "Não Postada Entradas no Diário"
+msgstr "Entradas de Diário não lançadas"
 
 #. module: account
 #: view:product.product:0
 #: view:product.template:0
 msgid "Sales Properties"
-msgstr "Propriedades das vendas"
+msgstr "Propriedades da Venda"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
@@ -7759,7 +7804,7 @@ msgstr "Reconciliação Manual"
 #. module: account
 #: report:account.overdue:0
 msgid "Total amount due:"
-msgstr "Montante total vencido"
+msgstr "Valor total devido:"
 
 #. module: account
 #: field:account.analytic.chart,to_date:0
@@ -7769,7 +7814,7 @@ msgstr "Para"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Ajuste de Moeda"
@@ -7801,10 +7846,10 @@ msgid ""
 "terms for each letter. Each customer or supplier can be assigned to one of "
 "these payment terms."
 msgstr ""
-"Termos de pagamento define as condições para pagamento de um cliente ou "
-"fornecedor em um ou mais pagamentos. Lembretes periódicos irão usar os "
-"termos de pagamento em cada aviso. Cada cliente ou fornecedor pode ser "
-"associado para um desses termos de pagamento."
+"Condições de Pagamento define as condições para pagamento de um cliente ou "
+"fornecedor em um ou mais pagamentos. Lembretes periódicos irão usar as "
+"condições de pagamento em cada aviso. Cada cliente ou fornecedor pode ser "
+"associado a uma dessas condições de pagamento."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -7822,13 +7867,15 @@ msgstr "Maio"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
-msgstr "Contas a pagar"
+msgstr "Contas a Pagar"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "Impostos globais definido, mas não se encontram em linhas de fatura!"
@@ -7836,7 +7883,7 @@ msgstr "Impostos globais definido, mas não se encontram em linhas de fatura!"
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
-msgstr "Modelos para plano de contas"
+msgstr "Modelos para Plano de Contas"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -7861,7 +7908,7 @@ msgstr "Postar Lançamentos de Diário"
 #. module: account
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr "Impostos de venda"
+msgstr "Impostos na Venda"
 
 #. module: account
 #: field:account.financial.report,name:0
@@ -7874,7 +7921,7 @@ msgstr "Nome do Relatório"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Dinheiro"
@@ -7886,15 +7933,15 @@ msgid "Account Destination"
 msgstr "Destino da conta"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7920,7 +7967,7 @@ msgstr "Pagamento de faturas"
 #: field:account.tax.code,sequence:0
 #: field:account.tax.template,sequence:0
 msgid "Sequence"
-msgstr "Sequencia"
+msgstr "Seqüência"
 
 #. module: account
 #: constraint:product.category:0
@@ -7930,7 +7977,7 @@ msgstr "Erro! Você não pode criar categorias recursivas."
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr "Quantidade ideal de entradas."
+msgstr "Quantidade opcional nas entradas."
 
 #. module: account
 #: view:account.financial.report:0
@@ -7975,7 +8022,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_asset
 msgid "Asset"
-msgstr "Ativo"
+msgstr "Patrimônio"
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -7985,7 +8032,7 @@ msgstr "    7 Dias    "
 #. module: account
 #: field:account.bank.statement,balance_end:0
 msgid "Computed Balance"
-msgstr "Balanço computado"
+msgstr "Balanço Calculado"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -8012,7 +8059,7 @@ msgstr "Relatórios Legais"
 #. module: account
 #: field:account.tax.code,sum_period:0
 msgid "Period Sum"
-msgstr "Soma do período"
+msgstr "Soma do Período"
 
 #. module: account
 #: help:account.tax,sequence:0
@@ -8051,21 +8098,22 @@ msgstr "Fixo"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
-msgstr "Atenção !"
+msgstr "Aviso!"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr "Status da Linha de Movimento"
+msgstr "Situação da Linha de Movimento"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
@@ -8109,7 +8157,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Selecione uma moeda para ser usada na fatura"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -8122,7 +8170,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Não pode %s provisório/proforma/cancelar fatura."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Sem Linhas na Fatura !"
@@ -8151,7 +8199,7 @@ msgstr "Tipo de Relatório"
 #: field:account.subscription,state:0
 #: field:report.invoice.created,state:0
 msgid "State"
-msgstr "Estado"
+msgstr "Situação"
 
 #. module: account
 #: help:account.open.closed.fiscalyear,fyear_id:0
@@ -8196,9 +8244,10 @@ msgstr ""
 "Um plano de contas normal tem uma estrutura definida por uma legislação "
 "mínima obrigatória no país. A estrutura do plano de contas analítico deve "
 "refletir sua própria necessidade empresarial em termos de relatórios de "
-"receitas/despesas. Eles são geralmente estruturados por contratos, projetos, "
-"produtos ou departamentos. A maioria das operações do OpenErp (faturas, "
-"planilhas de tempo, despesas, etc) geram uma entrada em uma conta relacionada"
+"receitas/despesas  (Centro de Custo). Eles são geralmente estruturados por "
+"contratos, projetos, produtos ou departamentos. A maioria das operações do "
+"OpenErp (faturas, planilhas de tempo, despesas, etc) geram uma entrada em "
+"uma conta relacionada"
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -8206,7 +8255,7 @@ msgid "Deferral Method"
 msgstr "Método para deferimento"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "A Fatura '%s' está paga."
@@ -8243,8 +8292,8 @@ msgid ""
 "When monthly periods are created. The state is 'Draft'. At the end of "
 "monthly period it is in 'Done' state."
 msgstr ""
-"Quando os períodos mensais são criados. O status é 'Provisório'. No final do "
-"período mensal, seu status será 'Concluído'."
+"Quando os períodos mensais são criados. A situação é 'Provisório'. No final "
+"do período mensal, sua situação será 'Concluído'."
 
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
@@ -8273,7 +8322,7 @@ msgid "Associated Partner"
 msgstr "Parceiro Associado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Voce precisa selecionar um parceiro primeiro !"
@@ -8297,7 +8346,7 @@ msgid ""
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' state is used when user cancel invoice."
 msgstr ""
-" * 'Cotação' é usada quando um usuário está criando uma fatura nova e sem "
+" * 'Provisório' é usada quando um usuário está criando uma fatura nova e sem "
 "confirmação.             \n"
 "* 'Pro-forma' quando uma fatura está em Pro-forma ela não possui um código "
 "de fatura.             \n"
@@ -8317,7 +8366,7 @@ msgstr "Total Residual"
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Invoice's state is Open"
-msgstr "O status da fatura é Aberto"
+msgstr "A situação da fatura é Aberto"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -8326,12 +8375,12 @@ msgid ""
 "will see the taxes with codes related to your legal statement according to "
 "your country."
 msgstr ""
-"A planilha de taxas é usada para gerar sua declaração periódica de impostos. "
-"Você verá as taxas com códigos relacionados à sua declaração legal de acordo "
-"com o país."
+"A planilha de impostos é usada para gerar sua declaração periódica de "
+"impostos. Você verá os impostos com códigos relacionados à sua declaração "
+"legal de acordo com o país."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8354,7 +8403,7 @@ msgid "Choose Fiscal Year"
 msgstr "Escolha o Ano Fiscal"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Diário de Devolução de Compra"
@@ -8368,12 +8417,12 @@ msgstr ""
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current Accounts"
-msgstr "Contas Correntes"
+msgstr "Contas Atuais"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by Invoice Date"
-msgstr "Data da Fatura por grupo"
+msgstr "Agrupar por Data da Fatura"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -8381,8 +8430,8 @@ msgid ""
 "Modify Invoice: Cancels the current invoice and creates a new copy of it "
 "ready for editing."
 msgstr ""
-"Modificação de Fatura: Cancela o fatura atual e cria uma nova cópia para ela "
-"pronta para edição."
+"Modificar Fatura: Cancela a fatura atual e cria uma nova cópia dela pronta "
+"para edição."
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -8431,7 +8480,7 @@ msgstr "Relatório Genérico"
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
 msgid "Write-Off Journal"
-msgstr "Diário de Baixas"
+msgstr "Diário de Ajustes"
 
 #. module: account
 #: help:res.partner,property_payment_term:0
@@ -8447,7 +8496,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Código computacional para Impostos incluídos nos preços"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8526,7 +8575,7 @@ msgstr "Tel. :"
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr "Moeda da empresa"
+msgstr "Moeda da Empresa"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8590,7 +8639,7 @@ msgid "current month"
 msgstr "mês atual"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8677,10 +8726,12 @@ msgstr "Diário de Devolução"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtrar Por"
 
@@ -8692,7 +8743,7 @@ msgid ""
 "sales orders or deliveries. You should only confirm them before sending them "
 "to your customers."
 msgstr ""
-"Com as Faturas de Clientes você pode criar e gerenciar notas de vendas "
+"Com as Faturas de Clientes você pode criar e gerenciar faturas de vendas "
 "emitidas para seus clientes. O OpenERP pode também gerar faturas provisórias "
 "automaticamente a partir de pedidos de venda ou entregas. Você deve apenas "
 "confirma-las antes de enviar para os seus clientes."
@@ -8719,7 +8770,7 @@ msgid "The partner account used for this invoice."
 msgstr "A conta do parceiro usada para esta fatura"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Imposto %.2f%%"
@@ -8739,13 +8790,13 @@ msgstr "Código da Conta-pai"
 #. module: account
 #: model:ir.model,name:account.model_account_payment_term_line
 msgid "Payment Term Line"
-msgstr "Linha da forma de pagamento"
+msgstr "Linha da condição de pagamento"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
-msgstr "Diário de compras"
+msgstr "Diário de Compras"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -8774,7 +8825,7 @@ msgstr "Linha do Modelo de Lançamento de Diário"
 #: field:account.invoice.report,date_due:0
 #: field:report.invoice.created,date_due:0
 msgid "Due Date"
-msgstr "Data de vencimento"
+msgstr "Data de Vencimento"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_supplier
@@ -8826,14 +8877,14 @@ msgstr "O código da conta deve ser único por empresa !"
 #: view:account.invoice:0
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid Invoices"
-msgstr "Faturas Não Pagas"
+msgstr "Faturas em Aberto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
-"O termo de pagamento do fornecedor não possui uma linha de prazo de "
+"A condição de pagamento do fornecedor não possui uma linha de prazo de "
 "pagamento!"
 
 #. module: account
@@ -8894,12 +8945,12 @@ msgstr "Custos Analíticos"
 #: report:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr "Nome do diário"
+msgstr "Nome do Diário"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr "Próxima entrada a reconciliar"
+msgstr "Próxima entrada de parceiro a reconciliar"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -8939,7 +8990,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Deixe vazio para todos os anos fiscais abertos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "O movimento de conta (%s) para centralização foi confirmado!"
@@ -8954,16 +9005,17 @@ msgstr ""
 "moeda"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
 "Make sure you have configured payment terms properly !\n"
 "The latest payment term line should be of the type \"Balance\" !"
 msgstr ""
-"Você não pode validar uma entrada sem balanço!\n"
-"Tenha certeza de que você configurou os termos de pagamento corretamente!\n"
-"A última linha de prazo de pagamento deve ser do tipo \"Balanço\"!"
+"Você não pode validar uma entrada desbalanceada!\n"
+"Tenha certeza de que você configurou as condições de pagamento "
+"corretamente!\n"
+"A última linha de prazo de pagamento deve ser do tipo \"Saldo\"!"
 
 #. module: account
 #: view:account.account:0
@@ -9038,7 +9090,7 @@ msgid "Contact Address"
 msgstr "Endereço do contato"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Modelo errado!"
@@ -9078,12 +9130,14 @@ msgstr "Contratos"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "desconhecido"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Diário de Abertura de Lançamentos"
@@ -9105,7 +9159,7 @@ msgstr ""
 "Relatório de Lucros & Perdas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Defina a sequencia do diário referente a essa fatura."
@@ -9146,7 +9200,7 @@ msgstr "Fornecido por Código Python"
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal Code"
-msgstr "Código do diário"
+msgstr "Código do Diário"
 
 #. module: account
 #: help:account.tax.code,sign:0
@@ -9181,7 +9235,7 @@ msgstr "Reveja as suas contas financeiras"
 #: model:ir.actions.act_window,name:account.action_open_journal_button
 #: model:ir.actions.act_window,name:account.action_validate_account_move
 msgid "Open Journal"
-msgstr "Abrir diário"
+msgstr "Abrir Diário"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9196,7 +9250,7 @@ msgid "Period from"
 msgstr "Período de"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Diário de Devolução de Vendas"
@@ -9235,7 +9289,7 @@ msgstr "Analítico"
 #: model:process.node,name:account.process_node_invoiceinvoice0
 #: model:process.node,name:account.process_node_supplierinvoiceinvoice0
 msgid "Create Invoice"
-msgstr "Criar fatura"
+msgstr "Criar Fatura"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax_rate:0
@@ -9243,7 +9297,7 @@ msgid "Purchase Tax(%)"
 msgstr "Imposto de Compra(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Por favor, crie algumas linhas da fatura."
@@ -9259,7 +9313,7 @@ msgid "Display Detail"
 msgstr "Mostrar Detalhes"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "DRV"
@@ -9297,8 +9351,6 @@ msgstr "Fim do Período"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Relatórios Financeiros"
@@ -9313,6 +9365,7 @@ msgstr "Relatórios Financeiros"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9333,6 +9386,7 @@ msgstr "Período Inicial"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Direção analítica"
 
@@ -9348,14 +9402,14 @@ msgstr "Empresas que referenciam o parceiro"
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
-msgstr "Visão diária"
+msgstr "Visualizar Diário"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
-msgstr "Total de crédito"
+msgstr "Crédito Total"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
@@ -9375,7 +9429,7 @@ msgstr "Não Paga"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr "Modelo de código de taxa"
+msgstr "Modelo do Código do Imposto"
 
 #. module: account
 #: report:account.overdue:0
@@ -9421,6 +9475,7 @@ msgstr "Extratos Bancários"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9483,7 +9538,7 @@ msgstr "Legenda"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Contract Data"
-msgstr "Data do contrato"
+msgstr "Data do Contrato"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_sale
@@ -9502,7 +9557,7 @@ msgstr ""
 "recebimento\"."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Você deve selecionar as contas para reconciliar"
@@ -9530,7 +9585,6 @@ msgstr ""
 "empresa sobre um período específico."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filtros Por"
@@ -9552,7 +9606,7 @@ msgid "Move"
 msgstr "Movimento"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9611,7 +9665,7 @@ msgid "Consolidated Children"
 msgstr "Dependentes consolidados"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9623,7 +9677,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
-msgstr "Faturas de clientes e fornecedores"
+msgstr "Faturas de Clientes e Fornecedores"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -9676,6 +9730,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9737,6 +9792,7 @@ msgstr "Inscrição de Lançamento"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9744,6 +9800,7 @@ msgstr "Inscrição de Lançamento"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9788,7 +9845,7 @@ msgid "Unreconciled"
 msgstr "Não conciliado"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Total inválido!"
@@ -9854,7 +9911,7 @@ msgid "Comparison"
 msgstr "Comparação"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Erro Desconhecido"
@@ -9893,6 +9950,7 @@ msgstr "Validar Movimento de Conta"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9924,7 +9982,7 @@ msgstr ""
 #: code:addons/account/account.py:181
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr "Ganhos e perdas (conta Lucro)"
+msgstr "Lucros & Perdas (conta de receitas)"
 
 #. module: account
 #: constraint:account.account:0
@@ -9999,9 +10057,11 @@ msgstr "Entradas analíticas dos últimos 30 dias"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Períodos"
 
@@ -10094,7 +10154,7 @@ msgid ""
 "When new statement is created the state will be 'Draft'.\n"
 "And after getting confirmation from the bank it will be in 'Confirmed' state."
 msgstr ""
-"Quando um novo statement for criado, a situação será 'Rascunho'.\n"
+"Quando um novo demonstrativo for criado, a situação será 'Provisório'.\n"
 "E após a confirmação do banco a situação será \"Confirmada\"."
 
 #. module: account
@@ -10160,7 +10220,7 @@ msgstr "Selecione o período"
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Posted"
-msgstr "Postado"
+msgstr "Lançado"
 
 #. module: account
 #: report:account.account.balance:0
@@ -10172,6 +10232,7 @@ msgstr "Postado"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10200,13 +10261,13 @@ msgstr "Cancelar lançamentos iniciais"
 #. module: account
 #: field:account.payment.term.line,days2:0
 msgid "Day of the Month"
-msgstr "Dia do mês"
+msgstr "Dia do Mês"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr "Origem da taxa"
+msgstr "Origem do Imposto"
 
 #. module: account
 #: view:ir.sequence:0
@@ -10219,7 +10280,7 @@ msgid "No detail"
 msgstr "Não há detalhes"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Não há conta de entrada definida para este produto:\"%s\" (id:%d)"
@@ -10242,7 +10303,7 @@ msgstr "Perdas ou Ganhos não realizados"
 #: view:account.move.line:0
 #: view:account.period:0
 msgid "States"
-msgstr "Estado"
+msgstr "Situações"
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
@@ -10255,6 +10316,7 @@ msgid "Verification Total"
 msgstr "Verificação total"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10275,6 +10337,7 @@ msgstr "Diário: Todos"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10289,7 +10352,9 @@ msgstr "Diário: Todos"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10299,6 +10364,8 @@ msgstr "Diário: Todos"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10331,7 +10398,7 @@ msgstr "Data de Vencimento"
 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
 msgid "Total cash transactions"
-msgstr "Total de transações do caixa"
+msgstr "Total de transações em dinheiro"
 
 #. module: account
 #: help:account.partner.reconcile.process,today_reconciled:0
@@ -10347,7 +10414,7 @@ msgstr ""
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create Monthly Periods"
-msgstr "Criar períodos mensais"
+msgstr "Criar Períodos Mensais"
 
 #. module: account
 #: field:account.tax.code.template,sign:0
@@ -10410,7 +10477,7 @@ msgstr ""
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Chart of Accounts from a Chart Template"
-msgstr "Crie seu Plano de Contas através de um modelo"
+msgstr "Gere seu Plano de Contas a partir de um modelo"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -10428,12 +10495,12 @@ msgstr ""
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr "Movimentação de Baixa ou Exclusão"
+msgstr "Movimentação de Baixa ou Ajustes"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr "O Status das faturas é Concluído"
+msgstr "A situação da fatura é Concluída"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
@@ -10463,6 +10530,7 @@ msgstr "Fatura do fornecedor"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10487,7 +10555,7 @@ msgstr "Título 3 (em negrito, menor)"
 #. module: account
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr "Linhas da fatura"
+msgstr "Linhas da Fatura"
 
 #. module: account
 #: constraint:account.account.template:0
@@ -10496,6 +10564,8 @@ msgstr "Erro ! Você não pode criar templates recursivos para contas."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Número da Entrada de Diário"
 
@@ -10515,7 +10585,7 @@ msgstr ""
 "contém entradas de diário!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Este lançamento já está conciliado"
@@ -10528,7 +10598,7 @@ msgstr "Contas de recebimento"
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr "Forma de pagamento ao parceiro"
+msgstr "Condições de Pagamento do Parceiro"
 
 #. module: account
 #: field:temp.range,name:0
@@ -10556,8 +10626,10 @@ msgstr ""
 "débito/crédito), fechado para contas de depreciação."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Com movimentos"
@@ -10570,7 +10642,7 @@ msgstr "Dados da conta"
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr "Modelo de codificação da conta de impostos"
+msgstr "Modelo de Código de Impostos da Conta"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
@@ -10590,7 +10662,7 @@ msgstr "Dezembro"
 #: 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 "Imprimir diários analíticos"
+msgstr "Imprimir Diários Analíticos"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -10629,7 +10701,7 @@ msgstr "A outra moeda opcional se este for um lançamento multi-moeda"
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
 msgstr ""
-"Importar da declaração no sistema a partir de uma fatura do fornecedor ou "
+"Importar demonstrativo no sistema a partir de uma fatura de fornecedor ou "
 "cliente"
 
 #. module: account
@@ -10655,7 +10727,7 @@ msgid ""
 msgstr ""
 "Crie e gerencie os diários de sua empresa neste menu. Um diário é usado para "
 "registrar transações de todos os dados contábeis relacionados aos negócios "
-"do dia a dia. Ele usa o sistema de dupla partida para manter os registros. "
+"do dia a dia. Ele usa o sistema de partida dobrada para manter os registros. "
 "Dependendo da natureza das atividades e do número de transações diárias, uma "
 "empresa pode ter vários tipos de diários específicos como um diário de "
 "caixa, um diário de compras, diários de vendas..."
@@ -10673,7 +10745,7 @@ msgstr "Plano de Contas Analíticas"
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr "Quantia restante exata."
+msgstr "Saldo restante em aberto"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
@@ -10681,8 +10753,8 @@ msgid "Statistic Reports"
 msgstr "Relatórios Estatísticos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Conta inválida!"
@@ -10702,10 +10774,10 @@ msgid ""
 "and will be created in 'Posted' state."
 msgstr ""
 "Todas as entradas de diário criadas manualmente ficam na situação 'Não "
-"publicadas', mas você pode definir uma opção para pular esta situação no "
+"lançadas', mas você pode definir uma opção para pular esta situação no "
 "diário relacionado. Neste caso, elas se comportarão como entradas de diário "
-"automaticamente pelo sistema na validação do documento (faturas, extratos "
-"bancários...) e serão criadas na situação 'Publicadas'."
+"criadas automaticamente pelo sistema na validação do documento (faturas, "
+"extratos bancários...) e serão criadas na situação 'Lançadas'."
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -10713,7 +10785,7 @@ msgid "Accounts Mapping"
 msgstr "Mapeando contas"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "A fatura '%s' está aguardando validação."
@@ -10731,7 +10803,7 @@ msgstr "Novembro"
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: refund invoice, reconcile and create a new draft invoice"
 msgstr ""
-"Modificar: fatura reembolso, conciliar e criar um novo projeto de fatura."
+"Modificar: Fatura reembolso, conciliar e criar uma nova fatura provisória."
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -10741,18 +10813,18 @@ msgstr "A conta de receita ou despesa relacionada ao produto selecionado."
 #. module: account
 #: field:account.subscription,period_total:0
 msgid "Number of Periods"
-msgstr "Número de períodos"
+msgstr "Número de Períodos"
 
 #. module: account
 #: report:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr "Diário geral"
+msgstr "Diário Geral"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Search Invoice"
-msgstr "Pesquisar Fatura"
+msgstr "Procurar Fatura"
 
 #. module: account
 #: report:account.invoice:0
@@ -10761,7 +10833,7 @@ msgstr "Pesquisar Fatura"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "Devolução"
+msgstr "Reembolso"
 
 #. module: account
 #: model:email.template,body_text:account.email_template_edi_invoice
@@ -10910,7 +10982,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr "Contas Bancaria"
+msgstr "Contas Bancárias"
 
 #. module: account
 #: field:res.partner,credit:0
@@ -10940,12 +11012,12 @@ msgstr "Validar Linhas de Movimento de Contas"
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
 #: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
 msgid "Cost Ledger (Only quantities)"
-msgstr "Ficha de custos (somente quantidades)"
+msgstr "Razão de Custos (apenas quantidades)"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr "O status da fatura é Concluído."
+msgstr "A situação da fatura é Concluído."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
@@ -10955,7 +11027,7 @@ msgstr "Assim que a reconciliação é feita, a fatura pode ser paga."
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr "Pesquisar Templates de Conta"
+msgstr "Pesquisar Modelos  de Conta"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -10974,6 +11046,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10988,7 +11061,7 @@ msgstr "Do parceiro"
 #: view:ir.sequence:0
 #: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
 msgid "Fiscal Years"
-msgstr "Anos fiscais"
+msgstr "Anos Fiscais"
 
 #. module: account
 #: help:account.analytic.journal,active:0
@@ -11008,7 +11081,7 @@ msgstr "Ref."
 #: field:account.use.model,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
-msgstr "Model de conta"
+msgstr "Modelo de Conta"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -11037,7 +11110,7 @@ msgstr ""
 #: field:account.invoice,partner_bank_id:0
 #: field:account.invoice.report,partner_bank_id:0
 msgid "Bank Account"
-msgstr "Conta bancária"
+msgstr "Conta Bancária"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_central_journal
@@ -11048,10 +11121,12 @@ msgstr "Diário de Contas Central"
 #. module: account
 #: report:account.overdue:0
 msgid "Maturity"
-msgstr "Validade"
+msgstr "Vencimento"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Futuro"
 
@@ -11668,9 +11743,6 @@ msgstr ""
 #~ msgid "Positive"
 #~ msgstr "Positivo"
 
-#~ msgid "Generate Chart of Accounts from a Chart Template"
-#~ msgstr "Gerar plano de contas de um modelo de plano"
-
 #~ msgid "Partner Ref."
 #~ msgstr "Código parceiro"
 
@@ -12100,9 +12172,6 @@ msgstr ""
 #~ msgid "Total write-off"
 #~ msgstr "Total da baixa"
 
-#~ msgid "Compute Code for Taxes included prices"
-#~ msgstr "Código computacional para Impostos incluídos nos preços"
-
 #~ msgid "Journal de vente"
 #~ msgstr "Diário de vendas"
 
@@ -13292,3 +13361,9 @@ msgstr ""
 
 #~ msgid "Description On Invoices"
 #~ msgstr "Descrição em Faturas"
+
+#~ msgid "Generate Chart of Accounts from a Chart Template"
+#~ msgstr "Gerar o Plano de Contas a partir de um modelo"
+
+#~ msgid "Compute Code for Taxes included prices"
+#~ msgstr "Calcular o valor para Impostos incluídos nos preços"
diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po
index 150c7f0e10d..38f2af2deac 100644
--- a/addons/account/i18n/ro.po
+++ b/addons/account/i18n/ro.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 18:28+0000\n"
+"PO-Revision-Date: 2012-10-17 08:24+0000\n"
 "Last-Translator: filsys <office@filsystem.ro>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:06+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:04+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -146,6 +146,7 @@ msgstr "Reconciliati"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referinta"
 
@@ -164,13 +165,13 @@ msgstr ""
 "ascundeti termenul plata fara a-l sterge."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Avertizare!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Jurnal Diverse"
@@ -235,7 +236,7 @@ msgstr ""
 "apara pe facturi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Factura '%s' este platita partial: %s%s din %s%s (a mai ramas %s%s)"
@@ -251,7 +252,7 @@ msgid "Belgian Reports"
 msgstr "Rapoarte belgiene"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Nu puteti adauga/modifica inregistrarile dintr-un jurnal inchis."
@@ -300,7 +301,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -600,8 +601,10 @@ msgid "The accountant confirms the statement."
 msgstr "Contabilul confirma extrasul de cont."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -659,7 +662,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Secventa Principala trebuie sa fie diferita de secventa actuala !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -672,7 +675,7 @@ msgid "Tax Code Amount"
 msgstr "Valoare Cod Fiscal"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -699,8 +702,8 @@ msgid "Journal Period"
 msgstr "Perioada Jurnal"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -781,6 +784,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Puteti schimba moneda doar pentru Factura Ciorna!"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Raport Financiar"
@@ -796,12 +800,13 @@ msgstr "Raport Financiar"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tip"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -938,12 +943,13 @@ msgid "Create 3 Months Periods"
 msgstr "Creati Perioade de 3 luni"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Scadent(a)"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1028,7 +1034,7 @@ msgstr ""
 "contine suma de baza (fara impozit)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "Nu pot localiza un cod principal pentru contul sablon!"
@@ -1061,10 +1067,10 @@ msgid "Code"
 msgstr "Cod"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1130,7 +1136,7 @@ msgstr ""
 "mai multe informatii despre cont si specificul acestuia."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1180,7 +1186,7 @@ msgstr "Elemente Neechilibrate Jurnal"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banca"
@@ -1279,7 +1285,7 @@ msgid "The move of this entry line."
 msgstr "Miscarea acestei linii a inregistrarii."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1302,7 +1308,7 @@ msgid "Entry Label"
 msgstr "Eticheta Inregistrare"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1388,14 +1394,15 @@ msgid "Taxes"
 msgstr "Taxe"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Selectati o perioada de inceput si una de sfarsit"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Profit si Pierdere"
 
@@ -1450,6 +1457,7 @@ msgid "Journal Items Analysis"
 msgstr "Analiza Elementelor din Jurnal"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Parteneri"
@@ -1474,8 +1482,10 @@ msgid "Central Journal"
 msgstr "Jurnal Central"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1712,6 +1722,7 @@ msgid "Separated Journal Sequences"
 msgstr "Secvente Separate de Jurnal"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Responsabil"
@@ -1742,7 +1753,7 @@ msgid "Year Sum"
 msgstr "Suma anuala"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1821,7 +1832,7 @@ msgid "Customer Ref:"
 msgstr "Referinta Client:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Utilizatorul %s nu are dreptul de a accesa jurnalul %s !"
@@ -2156,7 +2167,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2187,7 +2198,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Cautati Sabloane Plan de Conturi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2244,7 +2255,7 @@ msgid "Description"
 msgstr "Descriere"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2263,7 +2274,7 @@ msgid "Income Account"
 msgstr "Cont de venituri"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Nu exista niciun Jurnal Contabil de tipul Vanzare/Achizitie definit!"
@@ -2303,6 +2314,7 @@ msgstr "Sablon Produs"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2312,6 +2324,7 @@ msgstr "Sablon Produs"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2362,7 +2375,7 @@ msgid "Account Line"
 msgstr "Linie Cont"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2398,7 +2411,7 @@ msgid "Main Sequence"
 msgstr "Secventa Principala"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2474,7 +2487,7 @@ msgid "Account Tax Code"
 msgstr "Cont Cod Fiscal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2568,7 +2581,7 @@ msgid "Account Model Entries"
 msgstr "Inregistrari Model Cont"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2634,7 +2647,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "Reconciliere linie miscare cont (pierdere)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2666,7 +2678,7 @@ msgid "Accounts"
 msgstr "Conturi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Eroare de configurare!"
@@ -2790,6 +2802,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Solduri restante partener"
@@ -2841,14 +2854,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Acest wizard va crea inregistrari contabile recurente"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Nicio secventa nu a fost definita in jurnal !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2959,7 +2972,7 @@ msgid "Base Code Amount"
 msgstr "Cuantum Cod Baza"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2974,7 +2987,7 @@ msgid "Default Sale Tax"
 msgstr "Taxa de vanzare Implicita"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Factura '%s' este validata."
@@ -3015,7 +3028,7 @@ msgid "Fiscal Position"
 msgstr "Pozitie fiscala"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3172,7 +3185,7 @@ msgid "View"
 msgstr "Vizualizare"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3244,7 +3257,7 @@ msgstr "Sabloane Planuri de conturi"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Alegeti optiunile contabile potrivite"
 
 #. module: account
 #: view:report.account.sales:0
@@ -3375,7 +3388,7 @@ msgid "Starting Balance"
 msgstr "Soldul initial"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Nici un partener definit !"
@@ -3431,7 +3444,7 @@ msgid "Chart of Tax"
 msgstr "Plan de taxe"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "Soldul final trebuie sa fie la fel ca si soldul calculat!"
@@ -3516,6 +3529,7 @@ msgstr "Cantitate :"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Durata Perioada (zile)"
 
@@ -3562,7 +3576,7 @@ msgid "Detail"
 msgstr "Detalii"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3582,9 +3596,16 @@ msgid "VAT :"
 msgstr "TVA :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3607,7 +3628,7 @@ msgid "Centralised counterpart"
 msgstr "Echivalent centralizat"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3635,6 +3656,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3662,10 +3684,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Data"
 
@@ -3682,7 +3711,6 @@ msgstr "Nereconciliere"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3696,7 +3724,7 @@ msgid "Chart of Accounts Template"
 msgstr "Sablon Plan de Conturi"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3708,7 +3736,7 @@ msgstr ""
 "Va rugam sa ii definiti un partener!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Unele inregistrari sunt deja reconciliate !"
@@ -3739,6 +3767,8 @@ msgstr "Bugete"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Nici un Filtru"
 
@@ -3824,7 +3854,7 @@ msgid "Analytic Items"
 msgstr "Elemente Analitice"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Taxa nu poate fi modificata !"
@@ -3855,7 +3885,7 @@ msgid "Mapping"
 msgstr "Mapare"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3871,6 +3901,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3884,7 +3915,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Verificare Raport sold Cont vechi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "Nu puteti crea elemente ale jurnalului intr-un cont inchis %s %s"
@@ -4224,7 +4255,7 @@ msgid "Month"
 msgstr "Luna"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4285,7 +4316,7 @@ msgid "Account Base Code"
 msgstr "Cod de baza cont"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4501,7 +4532,7 @@ msgid "Allow Reconciliation"
 msgstr "Permiteti Reconciliere"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4537,7 +4568,7 @@ msgid "Recurring Models"
 msgstr "Modele Recurente"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Inregistrare eroare"
@@ -4549,6 +4580,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Modificati"
 
@@ -4593,7 +4625,7 @@ msgid "Example"
 msgstr "Exemplu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4609,7 +4641,7 @@ msgid "Keep empty to use the income account"
 msgstr "Lasati necompletat pentru a utiliza contul de venituri"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Taxa Achizitie %.2f%%"
@@ -4637,7 +4669,7 @@ msgstr "Reprezentare Conturi"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Client"
@@ -4653,7 +4685,7 @@ msgid "Cancelled Invoice"
 msgstr "Factura anulata"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4711,7 +4743,7 @@ msgid "Income Account on Product Template"
 msgstr "Cont venituri specificat in Sablonul Produsului"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "DIVERSE"
@@ -4719,7 +4751,7 @@ msgstr "DIVERSE"
 #. module: account
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr "${obiect.companie_id.nume} Factura (Ref ${obiect.numar sau 'n/a'})"
+msgstr "${object.company_id.name} Factura (Ref ${object.number or 'n/a'})"
 
 #. module: account
 #: help:res.partner,last_reconciliation_date:0
@@ -4738,11 +4770,13 @@ msgstr "An fiscal nou"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Facturi"
 
@@ -4885,26 +4919,24 @@ msgid "Journal Items"
 msgstr "Elementele Jurnalului"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Eroare"
@@ -5015,7 +5047,7 @@ msgid "Beginning of Period Date"
 msgstr "Inceputul Datei perioadei"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -5042,7 +5074,7 @@ msgid "Child Tax Accounts"
 msgstr "Conturi taxe subordonate"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -5066,6 +5098,7 @@ msgstr "Sold Analitic -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5109,6 +5142,8 @@ msgstr "Tipul Perioadei"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Plati"
 
@@ -5188,7 +5223,7 @@ msgid "Line 1:"
 msgstr "Linia 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Eroare de integritate!"
@@ -5221,6 +5256,7 @@ msgstr "Resultatul reconcilierii"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Bilant"
@@ -5297,6 +5333,7 @@ msgstr "Raport"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5427,7 +5464,6 @@ msgstr "Cont Comun Raport Cont"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Comunicare"
 
@@ -5480,13 +5516,13 @@ msgid "End of Year Entries Journal"
 msgstr "Jurnal Inregistrari Sfarsit de an"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5563,7 +5599,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Facturi si Rambursari Client"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5739,7 +5774,7 @@ msgid "Generate Opening Entries"
 msgstr "Generati Inregistrari Deschise"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Deja Reconciliat!"
@@ -5772,14 +5807,14 @@ msgid "Child Accounts"
 msgstr "Conturi subordonate"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Nume miscare (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Pierdere"
@@ -5799,7 +5834,7 @@ msgstr "Venit"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Furnizor"
@@ -5829,7 +5864,7 @@ msgid "Account n°"
 msgstr "Nr. de cont"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Referinta gratuita"
@@ -5844,7 +5879,9 @@ msgstr "Evaluare"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Conturi Incasari si Plati"
@@ -5954,7 +5991,7 @@ msgid "Filter by"
 msgstr "Filtrati dupa"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Aveti o expresie \"%(...)s\" gresita in modelul dumneavoastra !"
@@ -5965,8 +6002,8 @@ msgid "Entry Date"
 msgstr "Data inregistrarii"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Nu puteti folosi un cont inactiv!"
@@ -6007,8 +6044,8 @@ msgid "Number of Days"
 msgstr "Numarul de zile"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -6070,7 +6107,7 @@ msgid "Multipication factor for Base code"
 msgstr "Factor de multiplicare pentru Codul de baza"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "neimplementat"
@@ -6109,6 +6146,8 @@ msgstr "Analiza Inregistrarilor Analitice"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Trecut"
 
@@ -6400,6 +6439,8 @@ msgstr "Procentaj"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Jurnal & Partener"
 
@@ -6409,7 +6450,7 @@ msgid "Power"
 msgstr "Putere"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Nu se poate crea un cod de jurnal nefolosit."
@@ -6451,6 +6492,7 @@ msgid "Applicable Type"
 msgstr "Tipul aplicabil"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Referinta facturii"
@@ -6685,8 +6727,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "Nu puteti sa stergeti un cont care contine elemente ale jurnalului."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Inregistrari: "
@@ -6702,7 +6744,7 @@ msgid "Currency of the related account journal."
 msgstr "Moneda jurnalului contabil asociat."
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Nu s-a putut crea miscarea intre companii diferite."
@@ -6751,13 +6793,13 @@ msgstr "Stadiul este ciorna"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Total debit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Inregistrarea \"%s\" nu este valida !"
@@ -6831,25 +6873,26 @@ msgstr "Profit & Pierdere (Contul de cheltuieli)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6881,8 +6924,8 @@ msgid "Printed"
 msgstr "Tiparit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Eroare :"
@@ -6945,7 +6988,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Afisati Raport Registru cu Un partener pe pagina"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -7115,7 +7158,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7153,7 +7196,7 @@ msgid "Taxes used in Sales"
 msgstr "Taxe folosite in Vanzari"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7232,14 +7275,14 @@ msgid "Source Document"
 msgstr "Document sursa"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "Nu puteti sterge o inregistrare in jurnal \"%s\" afisata!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7347,8 +7390,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Sunteti sigur(a) ca doriti sa deschideti aceasta factura ?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7363,7 +7406,7 @@ msgid "Opening Entries Expense Account"
 msgstr "Inregistrari Deschise Cont de Cheltuieli"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Inregistrari contabile"
@@ -7376,7 +7419,7 @@ msgstr "Sablon Cont Principal"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Configure your Chart of Accounts"
-msgstr ""
+msgstr "Configurati planul de conturi"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7502,7 +7545,7 @@ msgstr ""
 "permita dezvoltatorilor sa creeze taxe specifice intr-un domeniu particular."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Ar fi trebuit sa alegeti perioade care apartin aceleiasi companii"
@@ -7533,8 +7576,8 @@ msgid "Reporting"
 msgstr "Raportare"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7631,7 +7674,7 @@ msgid "Sign on Reports"
 msgstr "Semnati in Rapoarte"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7643,7 +7686,7 @@ msgid "Root/View"
 msgstr "Baza/Vizualizare"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7678,13 +7721,14 @@ msgid "Optional Information"
 msgstr "Informatii optionale"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Jurnalul trebuie să aiba cont implicit de debit si de credit"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7713,13 +7757,13 @@ msgid "Maturity Date"
 msgstr "Data scadenta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Cont eronat !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Jurnal Vanzari"
@@ -7736,7 +7780,7 @@ msgid "Invoice Tax"
 msgstr "Factură fiscală"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Lipsă număr bucăţi !"
@@ -7791,7 +7835,7 @@ msgstr "Catre"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Ajustare Moneda"
@@ -7846,13 +7890,15 @@ msgstr "Mai"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Conturi Plati"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7898,7 +7944,7 @@ msgstr "Nume raport"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Numerar"
@@ -7910,15 +7956,15 @@ msgid "Account Destination"
 msgstr "Destinatie Cont"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -8076,13 +8122,14 @@ msgstr "Fix"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Avertizare !"
@@ -8134,7 +8181,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Selectati o valuta pentru a o aplica pe factura"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -8147,7 +8194,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Imposibil de %s o factura ciorna/proforma/anulata."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Nici o Linie a Facturii !"
@@ -8231,7 +8278,7 @@ msgid "Deferral Method"
 msgstr "Metoda de tergiversare"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Factura '%s' este platita."
@@ -8299,7 +8346,7 @@ msgid "Associated Partner"
 msgstr "Partener asociat"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Mai intai trebuie sa selectati un partener !"
@@ -8358,7 +8405,7 @@ msgstr ""
 "fiscale in functie de tara dumneavoastra."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8382,7 +8429,7 @@ msgid "Choose Fiscal Year"
 msgstr "Alegeti Anul Fiscal"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Jurnal Rambursare Achizitii"
@@ -8475,7 +8522,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Cod pentru calculul preţurilor cu taxe incluse"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8618,7 +8665,7 @@ msgid "current month"
 msgstr "luna curenta"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8706,10 +8753,12 @@ msgstr "Jurnal Rambursari"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtrati dupa"
 
@@ -8749,7 +8798,7 @@ msgid "The partner account used for this invoice."
 msgstr "Contul partener folosit pentru aceasta factura."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Taxa %.2f%%"
@@ -8772,7 +8821,7 @@ msgid "Payment Term Line"
 msgstr "Linie Termeni de plata"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Jurnal Achizitii"
@@ -8859,7 +8908,7 @@ msgid "Unpaid Invoices"
 msgstr "Facturi neplatite"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8968,7 +9017,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Lasati necompletat pentru toti anii fiscali deschisi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "Miscarea contului (%s) pentru centralizare a fost confirmata!"
@@ -8983,7 +9032,7 @@ msgstr ""
 "multi-moneda."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -9068,7 +9117,7 @@ msgid "Contact Address"
 msgstr "Adresa de contact"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Model gresit !"
@@ -9109,12 +9158,14 @@ msgstr "Contracte"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "necunoscut(a)"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Jurnalul Inregistrarilor de deschidere"
@@ -9136,7 +9187,7 @@ msgstr ""
 "calculat din Raportul Profit & Pierdere"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Va rugam sa definiti secventa din jurnalul asociat acestei facturi."
@@ -9227,7 +9278,7 @@ msgid "Period from"
 msgstr "Perioada de la"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Jurnal Rambursare Vanzari"
@@ -9274,7 +9325,7 @@ msgid "Purchase Tax(%)"
 msgstr "Taxa de cumparare(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Va rugam sa creati niste linii ale facturii."
@@ -9290,7 +9341,7 @@ msgid "Display Detail"
 msgstr "Afisati Detaliile"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9329,8 +9380,6 @@ msgstr "Sfarsitul Perioadei"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Rapoarte Financiare"
@@ -9345,6 +9394,7 @@ msgstr "Rapoarte Financiare"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9365,6 +9415,7 @@ msgstr "Inceputul Perioadei"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Directia Analizei"
 
@@ -9384,7 +9435,7 @@ msgstr "Vizualizare Jurnal"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total credit"
@@ -9454,6 +9505,7 @@ msgstr "Extrase de cont"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9535,7 +9587,7 @@ msgstr ""
 "corespondent."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Trebuie sa selectati conturile care vor fi reconciliate"
@@ -9563,7 +9615,6 @@ msgstr ""
 "companiei dumneavoastra de-a lungul unei perioade specifice."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filtre dupa"
@@ -9585,7 +9636,7 @@ msgid "Move"
 msgstr "Miscare"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9645,7 +9696,7 @@ msgid "Consolidated Children"
 msgstr "Subordonati reuniti"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9710,6 +9761,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9772,6 +9824,7 @@ msgstr "Inregistrare Abonament"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9779,6 +9832,7 @@ msgstr "Inregistrare Abonament"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9824,7 +9878,7 @@ msgid "Unreconciled"
 msgstr "Nereconciliat"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Total gresit !"
@@ -9892,7 +9946,7 @@ msgid "Comparison"
 msgstr "Comparatie"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Eroare necunoscuta"
@@ -9931,6 +9985,7 @@ msgstr "Validati Miscarea Contului"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10038,9 +10093,11 @@ msgstr "Inregistrari Analitice in ultimele 30 de zile"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Perioade"
 
@@ -10212,6 +10269,7 @@ msgstr "Afisat"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10259,7 +10317,7 @@ msgid "No detail"
 msgstr "Niciun detaliu"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -10297,6 +10355,7 @@ msgid "Verification Total"
 msgstr "Verificare Total"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10317,6 +10376,7 @@ msgstr "Jurnal: Toate"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10331,7 +10391,9 @@ msgstr "Jurnal: Toate"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10341,6 +10403,8 @@ msgstr "Jurnal: Toate"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10505,6 +10569,7 @@ msgstr "Factura furnizor"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10538,6 +10603,8 @@ msgstr "Eroare! Nu puteti crea sabloane de cont recurente."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Numarul Inregistrarii in Jurnal"
 
@@ -10557,7 +10624,7 @@ msgstr ""
 "elemente ale jurnalului!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Inregistrarea este deja reconciliata"
@@ -10599,8 +10666,10 @@ msgstr ""
 "conturi devalorizate."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Cu miscari"
@@ -10706,7 +10775,7 @@ msgstr ""
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on Invoices"
-msgstr ""
+msgstr "Descriere in facturi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
@@ -10724,8 +10793,8 @@ msgid "Statistic Reports"
 msgstr "Rapoarte Statistice"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Cont gresit !"
@@ -10756,7 +10825,7 @@ msgid "Accounts Mapping"
 msgstr "Reprezentare Conturi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Factura '%s' asteapta validarea."
@@ -10881,74 +10950,71 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"Buna ziua${obiect.adresa_factura_id.nume si ' ' sau "
-"''}${obiect.adresa_factura_id.nume sau ''},\n"
-" \n"
-"O factura noua este disponibila pentru ${obiect.partener_id.nume}:\n"
-"        | Numar factura: *${obiect.numar}*\n"
-"        | Total factura: *${obiect.suma_total} ${obiect.moneda_id.nume}*\n"
-"        | Data facturii: ${obiect.data_facturii}\n"
-"        % daca obiect.origine:\n"
-"        | Referinta comenzii: ${obiect.origine}\n"
-"        % endif\n"
-"        | Contactul dumneavoastra: ${obiect.utilizator_id.nume} "
-"${obiect.utilizator_id.utilizator_e-mail si "
-"'<%s>'%(obiect.utilizator_id.utilizator_e-mail) sau ''}\n"
-" \n"
-"Puteti vizualiza documentul facturii, sa il descarcati si sa o platiti "
-"online folosind link-ul urmator:\n"
-"     ${ctx.get('edi_web_url_vizualizare') sau 'n/a'}\n"
-" \n"
-"% daca obiect.companie_id.cont_paypal si obiect.tip in ('iesire_factura', "
-"'intrare_rambursare'):\n"
-" <% \n"
-" nume_companie = cotare(obiect.companie_id.nume)\n"
-" inv_numar = cotare(obiect.numar)\n"
-" cont_paypal = cotare(obiect.companie_id.cont_paypal)\n"
-" inv_suma = cotare(str(obiect.suma_total))\n"
-" moneda_nume = cotare (obiect.moneda_id.nume)\n"
-" url_paypal = \"https://www.paypal.com/cgi-"
+"Buna ziua ${object.address_invoice_id.name and ' ' or "
+"''}${object.address_invoice_id.name or ''},\n"
+"\n"
+"O noua factura a fost generata pentru  ${object.partner_id.name}:\n"
+"| Numar factura: *${object.number}*\n"
+"| Total factura: *${object.amount_total} ${object.currency_id.name}*\n"
+"| Data factura: ${object.date_invoice}\n"
+"% if object.origin:\n"
+"| Referinta comanda: ${object.origin}\n"
+"% endif\n"
+"| Agentul dumneavoastra: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"Puteti vizualiza documentul, sa il descarcati sau sa il platiti online "
+"accesand urmatorul link:\n"
+"${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"<%\n"
+"comp_name = quote(object.company_id.name)\n"
+"inv_number = quote(object.number)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"inv_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
 "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s\"\\\n"
-"              "
 "\"&invoice=%s&amount=%s&currency_code=%s&button_subtype=services&no_note=1&bn"
 "=OpenERP_Invoice_PayNow_%s\" % \\\n"
-"              "
 "(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
 "\n"
-" %>\n"
-" De asemenea, este posibil sa platiti direct cu :\n"
-"     ${paypal_url}\n"
-" % endif\n"
-" \n"
-"Daca aveti intrebari, nu ezitati sa ne contactati.\n"
-" \n"
+"%>\n"
+"Este posibil sa platiti direct cu Paypal:\n"
+"${paypal_url}\n"
+"% endif\n"
+"\n"
+"Daca aveti intrebari va rugam sa ne contactati.\n"
+"\n"
+"\n"
+"Multumim ca a-ti ales ${object.company_id.name}!\n"
 "\n"
-"Va multumim ca ati ales ${obiect.companie_id.nume}!\n"
-" \n"
 "\n"
 "--\n"
-" ${obiect.utilizator_id.nume} ${obiect.utilizator_id.utilizator_e-mail "
-"si'<%s>'%(obiect.utilizator_id.utilizator_e-mail) sau ''}\n"
-" ${obiect.companie_id.nume}\n"
-" % daca obiect.companie_id.strada:\n"
-" ${obiect.companie_id.strada sau ''}\n"
-" % endif\n"
-" % daca obiect.companie_id.strada2:\n"
-" ${obiect.companie_id.strada2}\n"
-" % endif\n"
-" % daca obiect.companie_id.oras sau obiect.companie_id.cod postal:\n"
-" ${obiect.companie_id.cod postal sau ''} ${obiect.companie_id.oras sau ''}\n"
-" % endif\n"
-" % daca obiect.companie_id.tara_id:\n"
-" ${obiect.companie_id.stat_id si ('%s, ' % obiect.companie_id.stat_id.nume) "
-"sau ''} ${obiect.companie_id.tara_id.nume sau ''}\n"
-" % endif\n"
-" % daca obiect.companie_id.telefon:\n"
-" Telefon: ${obiect.companie_id.telefon}\n"
-" % endif\n"
-" % daca obiect.companie_id.pagina_de_internet:\n"
-" ${obiect.companie_id.pagina_de_internet sau ''}\n"
-" % endif\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Telefon: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
 "            "
 
 #. module: account
@@ -11018,6 +11084,7 @@ msgstr "wizard.cont.addtmpl"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -11096,6 +11163,8 @@ msgstr "Termen"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "La  termen"
 
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 7c0e12834fe..f07753022d5 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-08-17 11:07+0000\n"
+"PO-Revision-Date: 2012-10-31 10:41+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-18 04:58+0000\n"
-"X-Generator: Launchpad (build 15810)\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:03+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -38,6 +38,8 @@ msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
 msgstr ""
+"Определяет порядок вывода в отчёте 'Учет \\ Отчётность \\ Общая отчётность \\"
+" Налоги \\ Отчёт по налогам'"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -81,7 +83,7 @@ msgstr "Определение наследников"
 #: code:addons/account/account_bank_statement.py:302
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr ""
+msgstr "Недопустимый элемент журнала \"%s\""
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -118,6 +120,8 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"Ошибка настройки! Выбранная валюта должна соответствовать валюте счетов по "
+"умолчанию."
 
 #. module: account
 #: report:account.invoice:0
@@ -141,6 +145,7 @@ msgstr "Сверить"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Ссылка"
 
@@ -159,16 +164,16 @@ msgstr ""
 "не удаляя его."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Предупреждение!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
-msgstr ""
+msgstr "Смешанный журнал"
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -229,7 +234,7 @@ msgstr ""
 "налога появился в счетах-фактурах"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Счет '%s' оплачивается частично: %s%s из %s%s (%s%s остаток)"
@@ -245,7 +250,7 @@ msgid "Belgian Reports"
 msgstr "Бельгийские отчеты"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "В не можете добавить/исправить проводки в закрытом журнале"
@@ -293,10 +298,11 @@ msgid "St."
 msgstr "ул."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
+"Позиция счёта-фактуры счёта компании не соответствует компании счёта-фактуры."
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -344,6 +350,9 @@ msgid ""
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
 msgstr ""
+"Здесь вы можете задать формат для вывода этой записи. Если вы оставите "
+"автоформатирование, оно будет вычислено на основе иерархии финансовых "
+"отчётов (автоподсчитанное поле 'уровень')."
 
 #. module: account
 #: view:account.installer:0
@@ -373,7 +382,7 @@ msgstr ""
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Нельзя создать элемент журнала по счету с типом вид."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -547,7 +556,7 @@ msgstr "Название компании должно быть уникальн
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr ""
+msgstr "Возмещение по счёту-фактуре"
 
 #. module: account
 #: report:account.overdue:0
@@ -584,8 +593,10 @@ msgid "The accountant confirms the statement."
 msgstr "Бухгалтер подтверждает документ."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -625,7 +636,7 @@ msgstr "Последовательности"
 #: field:account.financial.report,account_report_id:0
 #: selection:account.financial.report,type:0
 msgid "Report Value"
-msgstr ""
+msgstr "Значение отчёта"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -643,10 +654,10 @@ msgid "Main Sequence must be different from current !"
 msgstr "Основная нумерация должна отличаться от текущей!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
-msgstr ""
+msgstr "Для заданной даты период не найден или найдено более одного периода."
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -654,7 +665,7 @@ msgid "Tax Code Amount"
 msgstr "Объем по коду налога"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "КнП"
@@ -681,8 +692,8 @@ msgid "Journal Period"
 msgstr "Период журнала"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -694,6 +705,8 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"Дата проводки в журнале не в определённом периоде! Вы должны сменить дату "
+"или удалить это ограничение из журнала."
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
@@ -728,7 +741,7 @@ msgstr "Журнал продаж в этом году"
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children with hierarchy"
-msgstr ""
+msgstr "Показ подчинённость с иерархией"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -751,7 +764,7 @@ msgstr "Аналитические проводки по строкам"
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr ""
+msgstr "Способ возмещения"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
@@ -760,6 +773,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Вы можете изменить валюту только в черновике счета !"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Финансовый отчет"
@@ -775,17 +789,20 @@ msgstr "Финансовый отчет"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Тип"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
 "Click on compute button."
 msgstr ""
+"Налоги отсутствуют!\n"
+"Нажмите кнопку вычисления."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -800,7 +817,7 @@ msgstr "Ссылка на партнера в этом счете"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Supplier Invoices And Refunds"
-msgstr ""
+msgstr "Счета поставщиков и возмещения"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -814,6 +831,8 @@ msgstr "Отмена сверки"
 #: view:account.payment.term.line:0
 msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
 msgstr ""
+"За 14 рабочих дней 2 процента, оставшуюся сумму в течение 30 дней в конце "
+"месяца."
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
@@ -838,6 +857,10 @@ msgid ""
 "or Loss you'd realized if those transactions were ended today. Only for "
 "accounts having a secondary currency set."
 msgstr ""
+"При проведении мультивалютных операций, вы можете получить или потерять "
+"некоторую сумму из за изменений обменного курса. Это меню даёт прогноз "
+"дохода или расхода реализованного вами, если эти операции будут завершены "
+"сегодня. Только для счетов имеющих вторичную валюту."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -882,7 +905,7 @@ msgstr "Вычисления"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: refund invoice and reconcile"
-msgstr ""
+msgstr "Отмена: возврат счёта и сверка"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -908,17 +931,20 @@ msgid "Create 3 Months Periods"
 msgstr "Создать квартальные периоды"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Срок"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"!"
 msgstr ""
+"Вы не можете подтвердить эту журнальную проводку, поскольку счёт \"%s\" не "
+"принадлежит плану счетов \"%s\"!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:835
@@ -994,10 +1020,10 @@ msgstr ""
 "содержать базовую сумму (без налога)"
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
-msgstr ""
+msgstr "Не могу найти родительский код для шаблона счёта!"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1027,10 +1053,10 @@ msgid "Code"
 msgstr "Код"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1073,6 +1099,8 @@ msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
 "journal items!"
 msgstr ""
+"Вы не можете сменить тип счёта с '%s' на '%s' так как он содержит элементы "
+"журнала!"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
@@ -1094,11 +1122,11 @@ msgstr ""
 "информации о счете и его особенностях."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
-msgstr ""
+msgstr "Вы должны предоставить счёт для проводки разницы списания/обмена!"
 
 #. module: account
 #: view:account.tax:0
@@ -1137,12 +1165,12 @@ msgstr "Генерировать проводки перед:"
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr ""
+msgstr "Несбалансированные элементы журнала"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Банковский"
@@ -1163,6 +1191,8 @@ msgid ""
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Общая сумма (во вторичной валюте) для операций проведённых во вторичной "
+"валюте для этого счёта."
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1173,12 +1203,12 @@ msgstr "Замещающий налог"
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Credit Centralisation"
-msgstr ""
+msgstr "Централизация кредита"
 
 #. module: account
 #: view:report.account_type.sales:0
 msgid "All Months Sales by type"
-msgstr ""
+msgstr "Все месячные продажи по типу"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1208,12 +1238,12 @@ msgstr "Отменить счета"
 #. module: account
 #: help:account.journal,code:0
 msgid "The code will be displayed on reports."
-msgstr ""
+msgstr "Код будет выводиться в отчётах."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Purchases"
-msgstr ""
+msgstr "Налоги используемые в закупках"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1239,12 +1269,14 @@ msgid "The move of this entry line."
 msgstr "Операция этой проводки"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal !"
 msgstr ""
+"Вы не можете использовать этот общий счёт в этом журнале, проверьте вкладку "
+"'Настройки проводки' по соответствующему журналу!"
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@@ -1260,7 +1292,7 @@ msgid "Entry Label"
 msgstr "Метка проводки"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "Вы не можете изменить/удалить журнал с записями за этот период !"
@@ -1280,7 +1312,7 @@ msgstr "Прочие"
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr ""
+msgstr "Черновая подписка"
 
 #. module: account
 #: view:account.account:0
@@ -1345,14 +1377,15 @@ msgid "Taxes"
 msgstr "Налоги"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Выберите начало и окончание периода"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Прибыли и убытки"
 
@@ -1407,6 +1440,7 @@ msgid "Journal Items Analysis"
 msgstr "Анализ элементов журнала"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Контрагенты"
@@ -1431,8 +1465,10 @@ msgid "Central Journal"
 msgstr "Центральный журнал"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1446,7 +1482,7 @@ msgstr "Искать налоги"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
 msgid "Account Analytic Cost Ledger"
-msgstr "Аналитический счет журнала издержек"
+msgstr "Счет аналитики книги расходов"
 
 #. module: account
 #: view:account.model:0
@@ -1509,6 +1545,7 @@ msgid ""
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
 msgstr ""
+"Сняв флажок активности, вы можете скрыть налоговую позицию без её удаления."
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
@@ -1586,7 +1623,7 @@ msgstr "Искать банковские выписки"
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr ""
+msgstr "Не проведенные элементы журнала"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1653,7 +1690,7 @@ msgstr "Счет"
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr ""
+msgstr "Аналитические затраты в счёт"
 
 #. module: account
 #: view:ir.sequence:0
@@ -1666,6 +1703,7 @@ msgid "Separated Journal Sequences"
 msgstr "Раздельные нумерации журнала"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Ответственный"
@@ -1696,7 +1734,7 @@ msgid "Year Sum"
 msgstr "Годовая сумма"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1721,7 +1759,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr ""
+msgstr "Ожидающие счета"
 
 #. module: account
 #: view:account.tax.template:0
@@ -1750,7 +1788,7 @@ msgstr "Дебиторы и кредиторы"
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr ""
+msgstr "Отчёт общего журнала учёта"
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
@@ -1774,7 +1812,7 @@ msgid "Customer Ref:"
 msgstr "Ссылка на клиента:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Пользователь %s не имеет прав доступа к журналу %s !"
@@ -1805,7 +1843,7 @@ msgstr "Сумма кредита"
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка!"
 
 #. module: account
 #: sql_constraint:account.move.line:0
@@ -1837,7 +1875,7 @@ msgstr "Проводки по позициям"
 #. module: account
 #: field:account.vat.declaration,based_on:0
 msgid "Based on"
-msgstr ""
+msgstr "На основе"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -1872,7 +1910,7 @@ msgstr "Ошибка ! Нельзя создать организации рек
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr ""
+msgstr "Журнал продаж/покупок"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1914,6 +1952,9 @@ msgid ""
 "will be added, Loss : Amount will be deducted.), as calculated in Profit & "
 "Loss Report"
 msgstr ""
+"Этот счёт используется для переноса прибыли/убытка (если это прибыль: сумма "
+"будет добавлена; убыток: сумма будет вычтена.), как вычисляется в отчёте "
+"прибыли и убытка"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
@@ -1959,7 +2000,7 @@ msgstr ""
 #: code:addons/account/account_invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
-msgstr ""
+msgstr "Вы должны определить журнал аналитики типа  '%s'!"
 
 #. module: account
 #: field:account.installer,config_logo:0
@@ -1974,11 +2015,13 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Выбранный счёт проводки в журнале нуждается во вторичной валюте. Вы должны "
+"удалить вторичную валюту по счёту или выбрать мульти-валютный вид по журналу."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_financial_report_tree
 msgid "Makes a generic system to draw financial reports easily."
-msgstr ""
+msgstr "Делает общую систему для простого создания финансовых отчётов."
 
 #. module: account
 #: view:account.invoice:0
@@ -1998,12 +2041,12 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr ""
+msgstr "Элементы журнала аналитика связанные с журналом продаж"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Italic Text (smaller)"
-msgstr ""
+msgstr "Наклонный текст (меньший)"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2021,7 +2064,7 @@ msgstr "Черновик"
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
 msgid "VAT Declaration"
-msgstr ""
+msgstr "Декларация НДС"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
@@ -2092,7 +2135,7 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:357
 #, python-format
 msgid "You have to assign an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "Вы должны назначить журнал аналитики для журнал '%s'!"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2103,7 +2146,7 @@ msgid "Pro-forma"
 msgstr "Проформа"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2133,13 +2176,16 @@ msgid "Search Chart of Account Templates"
 msgstr "Искать шаблоны планов счетов"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Не удается создать автоматическую последовательность для этой части!\n"
+"Задайте нумерацию в настройках журнала для авто-нумерации или создайте "
+"нумерацию вручную для этой части."
 
 #. module: account
 #: code:addons/account/account.py:787
@@ -2148,11 +2194,13 @@ msgid ""
 "You can not modify the company of this journal as its related record exist "
 "in journal items"
 msgstr ""
+"Нельзя изменить компанию этого журнала так, как относящиеся к нему записи "
+"есть в элементах журнала."
 
 #. module: account
 #: report:account.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "Код заказчика"
 
 #. module: account
 #: view:account.installer:0
@@ -2185,10 +2233,10 @@ msgid "Description"
 msgstr "Описание"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
-msgstr ""
+msgstr "ECNJ"
 
 #. module: account
 #: view:account.subscription:0
@@ -2204,7 +2252,7 @@ msgid "Income Account"
 msgstr "Cчёт доходов и расходов"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Не определен журнал покупок / продаж."
@@ -2244,6 +2292,7 @@ msgstr "Шаблон продукта"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2253,6 +2302,7 @@ msgstr "Шаблон продукта"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2303,7 +2353,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2319,6 +2369,9 @@ msgid ""
 "'Setup Your Bank Accounts' tool that will automatically create the accounts "
 "and journals for you."
 msgstr ""
+"Настройте бухгалтерские журналы. Для банковских счетов лучше использовать "
+"инструмент 'Настройка банковских счетов', который автоматически создаст для "
+"вас счета и журналы."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
@@ -2336,12 +2389,14 @@ msgid "Main Sequence"
 msgstr "Основная Последовательность"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
 msgstr ""
+"Для того, чтобы удалить банковскую выписку, сначала надо отменить её для "
+"удаления связанных элементов журнала."
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2410,7 +2465,7 @@ msgid "Account Tax Code"
 msgstr "Код налогового счёта"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2427,7 +2482,7 @@ msgstr ""
 #: model:account.payment.term,name:account.account_payment_term_advance
 #: model:account.payment.term,note:account.account_payment_term_advance
 msgid "30% Advance End 30 Days"
-msgstr ""
+msgstr "30% аванс, остаток в 30 дней"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2474,7 +2529,7 @@ msgstr ""
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr "Централизация Дебета"
+msgstr "Централизация дебета"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -2502,7 +2557,7 @@ msgid "Account Model Entries"
 msgstr "Проводки модели счета"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "ЖР"
@@ -2515,7 +2570,7 @@ msgstr "Налоги поставщиков"
 #. module: account
 #: view:account.entries.report:0
 msgid "entries"
-msgstr ""
+msgstr "проводки"
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -2564,10 +2619,9 @@ msgstr "Этот отчет дает вам обзор ситуации конк
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr ""
+msgstr "Сверка операций по счёту (списание)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2599,7 +2653,7 @@ msgid "Accounts"
 msgstr "Счета"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Ошибка конфигурации!"
@@ -2661,6 +2715,7 @@ msgstr "Счёт может быть неналогооблагаемым или
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model, they must be positive!"
 msgstr ""
+"Неверно значение кредита или дебета в модели, они должны быть положительны!"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
@@ -2695,7 +2750,7 @@ msgstr "Даты"
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr ""
+msgstr "Шаблон родительского плана"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -2707,7 +2762,7 @@ msgstr "Налоговый счёт верхнего уровня"
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly !"
-msgstr ""
+msgstr "Новая валюта не настроен должным образом!"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -2721,6 +2776,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Баланс партнера по периодам"
@@ -2764,7 +2820,7 @@ msgstr "Финансовые настройки новой организаци
 #. module: account
 #: view:account.installer:0
 msgid "Configure Your Chart of Accounts"
-msgstr ""
+msgstr "Настройка плана счетов"
 
 #. module: account
 #: view:account.use.model:0
@@ -2772,14 +2828,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Этот мастер создаст повторяющиеся бухгалтерские проводки"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Нумерация в журнале не определена !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2792,6 +2848,8 @@ msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance!"
 msgstr ""
+"Вам нужно открытие журнала с проверенной централизацией для задания "
+"начального баланса!"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -2803,7 +2861,7 @@ msgstr "Коды налогов"
 #. module: account
 #: view:account.account:0
 msgid "Unrealized Gains and losses"
-msgstr ""
+msgstr "Нереализованные прибыли и убытки"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
@@ -2879,6 +2937,8 @@ msgstr ""
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
 msgstr ""
+"используется в домене сверки выписки, но не должно использоваться ещё где-"
+"либо."
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -2886,12 +2946,13 @@ msgid "Base Code Amount"
 msgstr "Сумма по основному коду"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
 "refund it instead."
 msgstr ""
+"Нельзя удалить открытый или оплаченный счет. Предлагаем сделать его возврат."
 
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
@@ -2899,7 +2960,7 @@ msgid "Default Sale Tax"
 msgstr "Налог с продаж по умолчанию"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Счет  '%s' утвержден."
@@ -2939,12 +3000,14 @@ msgid "Fiscal Position"
 msgstr "Система налогообложения"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
 "Click on compute to update the tax base."
 msgstr ""
+"Налоговая база различается!\n"
+"Нажмите \"Вычислить\" для обновления налоговой базы."
 
 #. module: account
 #: field:account.partner.ledger,page_split:0
@@ -2993,7 +3056,7 @@ msgstr "Валюта счета"
 #: field:accounting.report,account_report_id:0
 #: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
 msgid "Account Reports"
-msgstr ""
+msgstr "Отчеты по счету"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -3018,7 +3081,7 @@ msgstr "Список шаблонов налогов"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
-msgstr ""
+msgstr "Журналы покупок/продаж"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -3060,7 +3123,7 @@ msgstr "Всегда"
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Месяц-1"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3093,7 +3156,7 @@ msgid "View"
 msgstr "Вид"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3107,7 +3170,7 @@ msgstr "Строки аналитики"
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma Invoices"
-msgstr ""
+msgstr "Проформы счетов"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
@@ -3122,7 +3185,7 @@ msgstr "Кредит контрагенту"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month: 0"
-msgstr ""
+msgstr "  День месяца: 0"
 
 #. module: account
 #: view:account.subscription:0
@@ -3132,7 +3195,7 @@ msgstr "Начинается с"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr ""
+msgstr "Книга счёта партнёра"
 
 #. module: account
 #: help:account.journal.column,sequence:0
@@ -3169,12 +3232,12 @@ msgstr ""
 #. module: account
 #: view:report.account.sales:0
 msgid "This months' Sales by type"
-msgstr ""
+msgstr "Продажи этого месяца по типу"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr ""
+msgstr "Сверить не сверенный счёт"
 
 #. module: account
 #: sql_constraint:account.tax:0
@@ -3194,6 +3257,15 @@ msgid ""
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
+"Задайте здесь метод, который будет использован для создания журнальных "
+"проводок конца года для всех счетов этого типа.\n"
+"\n"
+" 'Ничего' - значит ничего не надо делать.\n"
+" 'Баланс' - обычно используется для счетов наличных.\n"
+" 'Детально' - будет скопирована каждая существующая статья журнала "
+"предыдущего года, даже если она сверена.\n"
+" 'Не сверено' - будут скопированы только элементы журнала, которые не "
+"сверены на первый день нового налогового года."
 
 #. module: account
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -3272,7 +3344,7 @@ msgstr "Настройка бухгалтерского учета"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Value amount: 0.02"
-msgstr ""
+msgstr "  Значение суммы: 0.02"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -3287,7 +3359,7 @@ msgid "Starting Balance"
 msgstr "Начальный баланс"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Партнер не определен!"
@@ -3302,7 +3374,7 @@ msgstr "Закрыть период"
 #. module: account
 #: field:account.financial.report,display_detail:0
 msgid "Display details"
-msgstr ""
+msgstr "Вывести подробности"
 
 #. module: account
 #: report:account.overdue:0
@@ -3342,10 +3414,10 @@ msgid "Chart of Tax"
 msgstr "Диаграмма налогов"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
-msgstr ""
+msgstr "Баланс закрытия должен быть таким же, как и подсчитанный баланс!"
 
 #. module: account
 #: view:account.journal:0
@@ -3423,17 +3495,18 @@ msgstr ""
 #. module: account
 #: view:account.invoice.line:0
 msgid "Quantity :"
-msgstr ""
+msgstr "Количество:"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
-msgstr ""
+msgstr "Длина периода (в днях)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
-msgstr ""
+msgstr "Печать журнала продаж/покупок"
 
 #. module: account
 #: field:account.invoice.report,state:0
@@ -3460,12 +3533,12 @@ msgstr "Отчет о продажах по типу счета"
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr ""
+msgstr "Не сверенные элементы журнала"
 
 #. module: account
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr ""
+msgstr "Код валюты должен быть уникальным в компании!"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3473,7 +3546,7 @@ msgid "Detail"
 msgstr "Подробности"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3481,6 +3554,10 @@ msgid ""
 "amount greater than the total invoiced amount. The latest line of your "
 "payment term must be of type 'balance' to avoid rounding issues."
 msgstr ""
+"Невозможно создать счёт!\n"
+"Связанное условие оплаты возможно не настроено, так как даёт подсчитанную "
+"сумму большую, чем общая выставленная сумма. Последняя строка вашего условия "
+"оплаты должна быть типа 'баланс' во избежание проблем округления."
 
 #. module: account
 #: report:account.invoice:0
@@ -3488,9 +3565,16 @@ msgid "VAT :"
 msgstr "НДС:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3509,13 +3593,13 @@ msgstr ""
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised counterpart"
-msgstr ""
+msgstr "Централизованная корреспонденция"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
-msgstr ""
+msgstr "Нельзя создать элементы журнала по счету типа \"вид\" %s %s"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
@@ -3539,6 +3623,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3566,17 +3651,24 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Дата"
 
 #. module: account
 #: view:account.move:0
 msgid "Post"
-msgstr ""
+msgstr "Провести"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -3586,7 +3678,6 @@ msgstr "Не сверено"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3600,7 +3691,7 @@ msgid "Chart of Accounts Template"
 msgstr "Шаблон плана счетов"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3611,7 +3702,7 @@ msgstr ""
 "условии оплаты контрагента."
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Некоторые записи уже сверены!"
@@ -3642,13 +3733,15 @@ msgstr "Бюджеты"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Нет фильтров"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Pro-forma Invoices"
-msgstr ""
+msgstr "Проформы счетов"
 
 #. module: account
 #: view:res.partner:0
@@ -3725,7 +3818,7 @@ msgid "Analytic Items"
 msgstr "Элементы аналитики"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Невозможно изменить налог !"
@@ -3738,7 +3831,7 @@ msgstr "#Проводок"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft Refund"
-msgstr ""
+msgstr "Создать черновик возврата"
 
 #. module: account
 #: view:account.state.open:0
@@ -3756,13 +3849,15 @@ msgid "Mapping"
 msgstr "Соответствие"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
 "centralised counterpart box in the related journal from the configuration "
 "menu."
 msgstr ""
+"Нельзя создать счёт по централизованному журналу. Снимите в меню настройки "
+"флажок централизованной корреспонденции в связанном журнале."
 
 #. module: account
 #: field:account.account,name:0
@@ -3770,6 +3865,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3780,13 +3876,13 @@ msgstr "Название"
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr ""
+msgstr "Сальдовая ведомость по счету"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
-msgstr ""
+msgstr "Нельзя создать элементы журнала по закрытому счету %s %s"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -3797,7 +3893,7 @@ msgstr "Дата вступления в силу"
 #: model:ir.actions.act_window,name:account.action_bank_tree
 #: model:ir.ui.menu,name:account.menu_action_bank_tree
 msgid "Setup your Bank Accounts"
-msgstr ""
+msgstr "Настройка банковских счетов"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
@@ -3829,6 +3925,8 @@ msgid ""
 "The fiscalyear, periods or chart of account chosen have to belong to the "
 "same company."
 msgstr ""
+"Выбранный налоговый год, периоды или план счетов должны принадлежать одной и "
+"той же компании."
 
 #. module: account
 #: model:ir.actions.todo.category,name:account.category_accounting_configuration
@@ -3863,6 +3961,8 @@ msgid ""
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
 msgstr ""
+"Величина прибыли или убытков в связи с изменением обменного курса при "
+"выполнении нескольких валютных операций.."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3882,6 +3982,10 @@ msgid ""
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
+"Здесь лучшей практикой является использование выделенного журнала "
+"содержащего проводки открытия всех налоговых годов. Учтите, что вы должны "
+"определить его со счетами дебета/кредита по умолчанию, типом 'ситуация' и с "
+"централизованной корреспонденцией."
 
 #. module: account
 #: view:account.installer:0
@@ -3939,7 +4043,7 @@ msgstr "Средний курс"
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr ""
+msgstr "Вывод счетов"
 
 #. module: account
 #: view:account.state.open:0
@@ -3982,7 +4086,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr ""
+msgstr "Проведенные элементы журнала"
 
 #. module: account
 #: view:account.tax.template:0
@@ -3997,12 +4101,12 @@ msgstr "Черновые проводки"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Day of the Month= -1"
-msgstr ""
+msgstr "  День месяца= -1"
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  Number of Days: 30"
-msgstr ""
+msgstr "  Количество дней: 30"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -4013,7 +4117,7 @@ msgstr "Горячая клвиша"
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The start date of the fiscal year must be before his end date."
-msgstr ""
+msgstr "Ошибка! Дата начала финансового года, должны быть до его окончания."
 
 #. module: account
 #: view:account.account:0
@@ -4034,7 +4138,7 @@ msgstr "Тип счета"
 #. module: account
 #: view:res.partner:0
 msgid "Bank Account Owner"
-msgstr ""
+msgstr "Владелец банковского счёта"
 
 #. module: account
 #: report:account.account.balance:0
@@ -4072,6 +4176,8 @@ msgid ""
 "You haven't supplied enough argument to compute the initial balance, please "
 "select a period and journal in the context."
 msgstr ""
+"Вы не предоставили достаточно параметров для подсчёта начального баланса, "
+"выберите, пожалуйста, в контексте период и журнал."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -4091,7 +4197,7 @@ msgstr "Закрыть кассу"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "Средн. задержка"
 
 #. module: account
 #: view:account.entries.report:0
@@ -4110,18 +4216,22 @@ msgid "Month"
 msgstr "Месяц"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
 "some non legal fields or you must unconfirm the journal entry first! \n"
 "%s"
 msgstr ""
+"Нельзя сделать это изменение по подтверждённой проводке! Вы можете только "
+"сменить некоторые не легальные поля или сначала вы должны снять "
+"подтверждение журнальной проводки! \n"
+"%s"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr ""
+msgstr "Счет PayPal"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
@@ -4137,19 +4247,19 @@ msgstr "Заметка"
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Reverse balance sign"
-msgstr ""
+msgstr "Сменить знак баланса"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Overdue Account"
-msgstr ""
+msgstr "Cчёт просроченного"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:184
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr ""
+msgstr "Баланс (счёт обязательств)"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4167,7 +4277,7 @@ msgid "Account Base Code"
 msgstr "Основной код счёта"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Счет расходов не определен для этого товара: \"%s\" (id:%d)"
@@ -4181,6 +4291,7 @@ msgstr "Настройки бухучета для заказчика"
 #: help:res.company,paypal_account:0
 msgid "Paypal username (usually email) for receiving online payments."
 msgstr ""
+"Имя пользователя Paypal (обычно e-mail) для получения он-лайновых платежей."
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -4224,7 +4335,7 @@ msgstr "Отметьте, если хотите выводить счета с 0
 #. module: account
 #: view:account.tax:0
 msgid "Compute Code"
-msgstr ""
+msgstr "Вычислить код"
 
 #. module: account
 #: view:account.account.template:0
@@ -4245,7 +4356,7 @@ msgstr "Периодическая обработка"
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Нельзя создать проводку аналитики по счету с типом вид."
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4295,7 +4406,7 @@ msgstr "Статистика по счетам"
 #. module: account
 #: field:account.account,exchange_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "Обменный курс"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@@ -4328,7 +4439,7 @@ msgstr "Не реализовано"
 #. module: account
 #: field:account.chart.template,visible:0
 msgid "Can be Visible?"
-msgstr ""
+msgstr "Может быть видимым?"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
@@ -4343,7 +4454,7 @@ msgstr "Кредит-ноты"
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
-msgstr ""
+msgstr "Название периода должно быть уникальным в компании!"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4363,6 +4474,10 @@ msgid ""
 "you want to generate accounts of this template only when loading its child "
 "template."
 msgstr ""
+"Снимите этот флажок, если вы не хотите активно использовать этот шаблон в "
+"мастере, который создаёт план счетов из шаблонов, это полезно когда вы "
+"хотите создать счета из этого шаблона только при загрузке их подчинённого "
+"шаблона."
 
 #. module: account
 #: view:account.use.model:0
@@ -4376,7 +4491,7 @@ msgid "Allow Reconciliation"
 msgstr "Разрешить сверку"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4401,7 +4516,7 @@ msgstr "Налог включен в цену"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr ""
+msgstr "Счет аналитики книги расходов для отчёта по журналу"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
@@ -4410,10 +4525,10 @@ msgid "Recurring Models"
 msgstr "Повторяющиеся модели"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
-msgstr ""
+msgstr "Ошибка кодирования"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -4422,6 +4537,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Изменить"
 
@@ -4463,10 +4579,10 @@ msgstr "Остаток по кассе"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Example"
-msgstr ""
+msgstr "Пример"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4482,7 +4598,7 @@ msgid "Keep empty to use the income account"
 msgstr "Оставьте пустым для использования доходного счета"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4510,7 +4626,7 @@ msgstr "Отображение счета"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Заказчик"
@@ -4526,7 +4642,7 @@ msgid "Cancelled Invoice"
 msgstr "Отмененный счет"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4540,7 +4656,7 @@ msgstr ""
 #. module: account
 #: selection:account.bank.statement,state:0
 msgid "New"
-msgstr ""
+msgstr "Новый"
 
 #. module: account
 #: field:account.invoice.refund,date:0
@@ -4583,7 +4699,7 @@ msgid "Income Account on Product Template"
 msgstr "Счет доходов и расходов из шаблона ТМЦ"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4608,18 +4724,20 @@ msgstr "Новый учетный год"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Счета"
 
 #. module: account
 #: view:account.invoice:0
 msgid "My invoices"
-msgstr ""
+msgstr "Мои счета"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
@@ -4642,7 +4760,7 @@ msgstr "Выставлен счет"
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
-msgstr ""
+msgstr "Проведенные проводки журнала"
 
 #. module: account
 #: view:account.use.model:0
@@ -4705,12 +4823,12 @@ msgstr ""
 #: code:addons/account/account.py:923
 #, python-format
 msgid "Opening Period"
-msgstr ""
+msgstr "Период открытия"
 
 #. module: account
 #: view:account.move:0
 msgid "Journal Entries to Review"
-msgstr ""
+msgstr "Проводки журнала для проверки"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4749,26 +4867,24 @@ msgid "Journal Items"
 msgstr "Элементы журнала"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -4806,7 +4922,7 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Номер счета должен быть уникальным для компании!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
@@ -4821,7 +4937,7 @@ msgstr "Генерировать записи открытия финансов
 #. module: account
 #: model:res.groups,name:account.group_account_user
 msgid "Accountant"
-msgstr ""
+msgstr "Бухгалтер"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_treasury_report_all
@@ -4849,7 +4965,7 @@ msgstr "Операции"
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this month"
-msgstr ""
+msgstr "Журнал продаж а этом месяце"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
@@ -4870,10 +4986,10 @@ msgstr "Закрыть"
 #. module: account
 #: field:account.treasury.report,date:0
 msgid "Beginning of Period Date"
-msgstr ""
+msgstr "Дата начала периода"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4900,7 +5016,7 @@ msgid "Child Tax Accounts"
 msgstr "Счета субналогов"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Начало периода должно быть меньше, чем конец периода"
@@ -4921,6 +5037,7 @@ msgstr "Остаток по аналитике"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4953,7 +5070,7 @@ msgstr "Цель операции"
 #: model:account.payment.term,name:account.account_payment_term_net
 #: model:account.payment.term,note:account.account_payment_term_net
 msgid "30 Net Days"
-msgstr ""
+msgstr "30 рабочих дней"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -4964,6 +5081,8 @@ msgstr "Тип периода"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Платежи"
 
@@ -5002,7 +5121,7 @@ msgstr ""
 #: field:account.financial.report,children_ids:0
 #: model:ir.model,name:account.model_account_financial_report
 msgid "Account Report"
-msgstr ""
+msgstr "Отчет по счету"
 
 #. module: account
 #: field:account.journal.column,name:0
@@ -5037,7 +5156,7 @@ msgid "Line 1:"
 msgstr "Строка 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Ошибка целостности!"
@@ -5070,6 +5189,7 @@ msgstr "Результат сверки"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Балансовая ведомость"
@@ -5134,7 +5254,7 @@ msgstr "Продажа"
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
-msgstr ""
+msgstr "Отчёт"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -5146,6 +5266,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5222,7 +5343,7 @@ msgstr "Состояние проводок аналитического уче
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Cash and Banks"
-msgstr ""
+msgstr "Наличные и банки"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
@@ -5275,7 +5396,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Назначение"
 
@@ -5302,6 +5422,8 @@ msgstr "Возврат денег клиенту"
 msgid ""
 "You can not create more than one move per period on centralized journal"
 msgstr ""
+"Вы не можете создавать более одного движения за период по централизованному "
+"журналу."
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5327,13 +5449,13 @@ msgid "End of Year Entries Journal"
 msgstr "Журнал проводок конца года"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5342,7 +5464,7 @@ msgstr "Configuration Error !"
 #. module: account
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
-msgstr ""
+msgstr "Сумма к оплате"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5381,7 +5503,7 @@ msgstr "Изменить валюту"
 #. module: account
 #: view:account.invoice:0
 msgid "This action will erase taxes"
-msgstr ""
+msgstr "Это действие сотрет налоги"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
@@ -5407,7 +5529,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5456,7 +5577,7 @@ msgstr ""
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Normal Text"
-msgstr ""
+msgstr "Обычный текст"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -5575,7 +5696,7 @@ msgid "Generate Opening Entries"
 msgstr "Генерировать открывающие проводки"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Уже сверено !"
@@ -5608,14 +5729,14 @@ msgid "Child Accounts"
 msgstr "Субсчета"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Списание"
@@ -5635,7 +5756,7 @@ msgstr "Доход"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Поставщик"
@@ -5665,7 +5786,7 @@ msgid "Account n°"
 msgstr "№ счета"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Свободная Ссылка"
@@ -5680,7 +5801,9 @@ msgstr "Оценка"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Счета дебиторской и кредиторской задолженности"
@@ -5784,7 +5907,7 @@ msgid "Filter by"
 msgstr "Фильтровать по"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5795,8 +5918,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Нельзя использовать неактивный счет !"
@@ -5837,8 +5960,8 @@ msgid "Number of Days"
 msgstr "Кол-во дней"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5900,7 +6023,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "не реализовано"
@@ -5939,6 +6062,8 @@ msgstr "Анализ проводок аналитики"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Прошлые"
 
@@ -6218,6 +6343,8 @@ msgstr "Процент"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Журнал и партнер"
 
@@ -6227,7 +6354,7 @@ msgid "Power"
 msgstr "Мощность"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6267,6 +6394,7 @@ msgid "Applicable Type"
 msgstr "Применимый тип"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Ссылка на счет"
@@ -6498,8 +6626,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Проводки: "
@@ -6515,7 +6643,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Нельзя создать перемещение между разными организациями"
@@ -6556,13 +6684,13 @@ msgstr "Состояние \"Черновик\""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Всего по дебету"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Проводка \"%s\" не верна !"
@@ -6636,25 +6764,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6686,8 +6815,8 @@ msgid "Printed"
 msgstr "Напечатан"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6743,10 +6872,10 @@ msgstr "Записи журнала"
 #. module: account
 #: help:account.partner.ledger,page_split:0
 msgid "Display Ledger Report with One partner per page"
-msgstr "Вывести отчет по регистру с одним партнером на странице"
+msgstr "Вывести отчет по книге с одним партнером на странице"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6906,7 +7035,7 @@ msgid "Total:"
 msgstr "Всего:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6944,7 +7073,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7012,14 +7141,14 @@ msgid "Source Document"
 msgstr "Документ-источник"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7119,8 +7248,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Вы уверены, что хотите открыть данный счет?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7133,7 +7262,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Бухгалтерские проводки"
@@ -7270,7 +7399,7 @@ msgstr ""
 "домена."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Вы должны выбрать периоды принадлежащие одной компании."
@@ -7301,8 +7430,8 @@ msgid "Reporting"
 msgstr "Отчетность"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7393,7 +7522,7 @@ msgid "Sign on Reports"
 msgstr "Знак в отчётах"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7404,7 +7533,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7439,13 +7568,14 @@ msgid "Optional Information"
 msgstr "Доп. информация"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Журнал должен иметь дебитовый и кредитовый счет по умолчанию"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7474,13 +7604,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Неверный счет !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Журнал продаж"
@@ -7497,7 +7627,7 @@ msgid "Invoice Tax"
 msgstr "Налог по счету"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Нет номера части !"
@@ -7547,7 +7677,7 @@ msgstr "По"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7595,13 +7725,15 @@ msgstr "Май"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Кредиторская задолженность"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7645,7 +7777,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Наличные"
@@ -7657,15 +7789,15 @@ msgid "Account Destination"
 msgstr "Счет назначения"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7807,7 +7939,7 @@ msgstr "Строка кассы"
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 #: model:ir.ui.menu,name:account.menu_account_partner_ledger
 msgid "Partner Ledger"
-msgstr "Книга расчетов с контрагентами"
+msgstr "Книга партнера"
 
 #. module: account
 #: selection:account.tax.template,type:0
@@ -7820,13 +7952,14 @@ msgstr "Фиксированный"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Warning !"
@@ -7878,7 +8011,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Выбрать валюту применяемую в счете"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7891,7 +8024,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Нельзя %s черновик/проформу/отмененный счет."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Нет позиций в счете !"
@@ -7966,7 +8099,7 @@ msgid "Deferral Method"
 msgstr "Метод отсрочки"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Счет '%s' оплачен."
@@ -8032,7 +8165,7 @@ msgid "Associated Partner"
 msgstr "Связанный контрагент"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Сначала вы должны выбрать партнера !"
@@ -8078,7 +8211,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8100,7 +8233,7 @@ msgid "Choose Fiscal Year"
 msgstr "Закрыть отчетный год"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Журнал возврата покупок"
@@ -8190,7 +8323,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Код расчета для цен с налогами"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8320,7 +8453,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8399,10 +8532,12 @@ msgstr "Журнал возвратов"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Фильтровать по"
 
@@ -8439,7 +8574,7 @@ msgid "The partner account used for this invoice."
 msgstr "Бух. счет партнера будет использоваться для этого счета."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8462,7 +8597,7 @@ msgid "Payment Term Line"
 msgstr "Позиция условий оплаты"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Журнал покупок"
@@ -8548,7 +8683,7 @@ msgid "Unpaid Invoices"
 msgstr "Неоплаченные счета"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8654,7 +8789,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Оставьте пустым для всех открытых финансовых лет"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8668,7 +8803,7 @@ msgstr ""
 "Сумма выражается в дополнительный валюте, если эта проводка мульти-валютная."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8742,7 +8877,7 @@ msgid "Contact Address"
 msgstr "Адрес контакта"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8777,12 +8912,14 @@ msgstr "Договоры"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "неизвестен"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Журнал проводок открытия"
@@ -8804,7 +8941,7 @@ msgstr ""
 "прибылям и убыткам."
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8892,7 +9029,7 @@ msgid "Period from"
 msgstr "Период с"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Журнал возврата продаж"
@@ -8939,7 +9076,7 @@ msgid "Purchase Tax(%)"
 msgstr "Налог на покупку(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Пожалуйста, создайте позиции счета"
@@ -8955,7 +9092,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8987,8 +9124,6 @@ msgstr "Конец периода"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -9003,6 +9138,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9023,6 +9159,7 @@ msgstr "Начало периода"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Направление анализа"
 
@@ -9042,7 +9179,7 @@ msgstr "Вид журнала"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Всего кредит"
@@ -9107,6 +9244,7 @@ msgstr "Банковские выписки"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9182,7 +9320,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Вы должны выбрать счета для сверки"
@@ -9204,7 +9342,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -9226,7 +9363,7 @@ msgid "Move"
 msgstr "Операция"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9285,7 +9422,7 @@ msgid "Consolidated Children"
 msgstr "Субсчета"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9346,6 +9483,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9402,6 +9540,7 @@ msgstr "Проводка подписки"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9409,6 +9548,7 @@ msgstr "Проводка подписки"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9451,7 +9591,7 @@ msgid "Unreconciled"
 msgstr "Не сверенные"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Плохой итог !"
@@ -9510,7 +9650,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Неизвестная ошибка"
@@ -9549,6 +9689,7 @@ msgstr "Утвердить операцию по счету"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9650,9 +9791,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Периоды"
 
@@ -9733,9 +9876,8 @@ msgid ""
 "and is the process of transferring debit and credit amounts from a journal "
 "of original entry to a ledger book."
 msgstr ""
-"Процесс утверждения записей в журнале так же называется \"разнесением по "
-"счетам\" и это процесс переноса сумм по дебету и и кредиту из  журнала в "
-"главную книгу."
+"Процесс утверждения записей в журнале так же называется \"запись в книгу\" и "
+"это процесс переноса сумм по дебету и и кредиту из  журнала в книгу."
 
 #. module: account
 #: help:account.bank.statement,state:0
@@ -9760,6 +9902,8 @@ msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
+"Этот отчёт позволяет печать или создание pdf-файлов главной книги с "
+"подробностями всех журналов счетов"
 
 #. module: account
 #: selection:account.account,type:0
@@ -9817,6 +9961,7 @@ msgstr "Проведено"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9864,7 +10009,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Не определен счет доходов для ТМЦ: \"%s\" (id:%d)"
@@ -9900,6 +10045,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9920,6 +10066,7 @@ msgstr "Журнал: Все"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9934,7 +10081,9 @@ msgstr "Журнал: Все"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9944,6 +10093,8 @@ msgstr "Журнал: Все"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10103,6 +10254,7 @@ msgstr "Счет поставщика"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10136,6 +10288,8 @@ msgstr "Ошибка ! Нельзя создать рекурсивные шаб
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -10153,7 +10307,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Проводка уже сверена"
@@ -10189,8 +10343,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "С движением"
@@ -10313,8 +10469,8 @@ msgid "Statistic Reports"
 msgstr "Статистические отчеты"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Плохой счет!"
@@ -10340,7 +10496,7 @@ msgid "Accounts Mapping"
 msgstr "Отображение счетов"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Счет '%s' ожидает утверждения."
@@ -10496,7 +10652,7 @@ msgstr "Утвердить операции по счету"
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
 #: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
 msgid "Cost Ledger (Only quantities)"
-msgstr "Книга расходов (только количество)"
+msgstr "Книга расходов (только количества)"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
@@ -10530,6 +10686,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10608,6 +10765,8 @@ msgstr "Срок платежа"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Будущие"
 
@@ -10664,6 +10823,13 @@ msgid ""
 "certain amount of information. They have to be certified by an external "
 "auditor annually."
 msgstr ""
+"Управление счетами необходимыми для записи проводок по журналам. Счёт - "
+"часть книги позволяющая вашей компании регистрировать все виды дебетовых и "
+"кредитовых операций. Компании представляют свои годовые отчёты в двух "
+"основных частях: балансовой ведомости и выписке поступлений (счёт прибыли и "
+"убытка). Годовые счета компании требуются по закону для раскрытия "
+"определённого количества информации. Они должны быть ежегодно удостоверены "
+"внешним аудитором."
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
@@ -11952,9 +12118,6 @@ msgstr ""
 #~ msgid "Bank and Cash Accounts"
 #~ msgstr "Банковские и кассовые счета"
 
-#~ msgid "Cost Ledger for period"
-#~ msgstr "Журнал издержек за период"
-
 #, python-format
 #~ msgid "Cannot locate parent code for template account!"
 #~ msgstr "Не удается найти родительский код для шаблона счета!"
@@ -12243,3 +12406,6 @@ msgstr ""
 #, python-format
 #~ msgid "Global taxes defined, but are not in invoice lines !"
 #~ msgstr "Глобальные налоги определены, но не отражены в строках счёта!"
+
+#~ msgid "Cost Ledger for period"
+#~ msgstr "Книга расходов за период"
diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po
index 9c13d6f7ba0..55dd7e87d89 100644
--- a/addons/account/i18n/si.po
+++ b/addons/account/i18n/si.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:04+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr ""
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po
index 9774aba5fe2..a4a6ede0e9b 100644
--- a/addons/account/i18n/sk.po
+++ b/addons/account/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:04+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr ""
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Varovanie!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Môžete meniť len menu v návrhu faktúry!"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Chyba konfigurácie!"
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7586,13 +7632,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7644,7 +7691,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7657,7 +7704,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7731,7 +7778,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7793,7 +7840,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7839,7 +7886,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7861,7 +7908,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7948,7 +7995,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8076,7 +8123,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8155,10 +8202,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8191,7 +8240,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8214,7 +8263,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8299,7 +8348,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8405,7 +8454,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8418,7 +8467,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8491,7 +8540,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8526,12 +8575,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8550,7 +8601,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8636,7 +8687,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8683,7 +8734,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8699,7 +8750,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8731,8 +8782,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8747,6 +8796,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8767,6 +8817,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8786,7 +8837,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8851,6 +8902,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8926,7 +8978,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8948,7 +9000,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8970,7 +9021,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9026,7 +9077,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9087,6 +9138,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9143,6 +9195,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9150,6 +9203,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9192,7 +9246,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9251,7 +9305,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9288,6 +9342,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9386,9 +9441,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9550,6 +9607,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9597,7 +9655,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9633,6 +9691,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9653,6 +9712,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9667,7 +9727,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9677,6 +9739,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9830,6 +9894,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9863,6 +9928,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9880,7 +9947,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9916,8 +9983,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10033,8 +10102,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10060,7 +10129,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10250,6 +10319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10323,6 +10393,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po
index 77b2947143d..6748e5db3b1 100644
--- a/addons/account/i18n/sl.po
+++ b/addons/account/i18n/sl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-20 16:03+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-01 18:30+0000\n"
+"Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:04+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -142,6 +142,7 @@ msgstr "Uskladi"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Sklic"
 
@@ -160,13 +161,13 @@ msgstr ""
 "skrijete plačilni rok brez da ga odstranite."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Opozorilo!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Razni dnevniki"
@@ -228,7 +229,7 @@ msgid ""
 msgstr "Označie to polje, če želite da se ta davek ne izisuje na računih."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Račun '%s' je plačan delno: %s%s od %s%s (preostalo %s%s)"
@@ -244,7 +245,7 @@ msgid "Belgian Reports"
 msgstr "Belgijska poročila"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "V zaprtem dnevniku ne morete dodajati/spreminjati postavk."
@@ -293,7 +294,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Konto na postavki računa se ne ujema z partenrjem na računu ."
@@ -574,8 +575,10 @@ msgid "The accountant confirms the statement."
 msgstr "Knjigovodja potrjuje izjavo."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -633,7 +636,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Glavno zaporedje mora biti različno od trenutnega!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -645,7 +648,7 @@ msgid "Tax Code Amount"
 msgstr "Znesek davčne stopnje"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -672,8 +675,8 @@ msgid "Journal Period"
 msgstr "Obdobje Dnevnika"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Usklajeni vnosi podjetja bi morali biti enaki za vse vpise"
@@ -752,6 +755,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Valutu lahko spremenite samo če je račun v stanju \"Osnutek\" !"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Računovodsko poročilo"
@@ -767,12 +771,13 @@ msgstr "Računovodsko poročilo"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Vrsta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -904,12 +909,13 @@ msgid "Create 3 Months Periods"
 msgstr "Ustvari tromesečna obdobja"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Zapadlo"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -991,7 +997,7 @@ msgid ""
 msgstr "Davek ali osnova za davek ; odvisno od davčne skupine."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "Ne morem najti nadrejeno kodo za predlogo računa!"
@@ -1024,10 +1030,10 @@ msgid "Code"
 msgstr "Oznaka"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1093,7 +1099,7 @@ msgstr ""
 "kontu in njegovih posebnosti."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1141,7 +1147,7 @@ msgstr "Neuravnotežene postavke dnevnika"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banka"
@@ -1237,7 +1243,7 @@ msgid "The move of this entry line."
 msgstr "Prenos te postavke  ."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1260,7 +1266,7 @@ msgid "Entry Label"
 msgstr "Oznaka postavke"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "Ne morete spreminjati/brisati dnevnik z vpisi za to obdobje!"
@@ -1345,14 +1351,15 @@ msgid "Taxes"
 msgstr "Davki"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Izberite začetno in končno obdobje"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Dobiček in izguba"
 
@@ -1407,6 +1414,7 @@ msgid "Journal Items Analysis"
 msgstr "Analiza postavk dnevnika"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Partnerji"
@@ -1431,8 +1439,10 @@ msgid "Central Journal"
 msgstr "Glavni dnevnik"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1577,7 +1587,7 @@ msgstr "Neobdavčeno"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to Next Partner"
-msgstr ""
+msgstr "Naslednji parner"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1663,6 +1673,7 @@ msgid "Separated Journal Sequences"
 msgstr "Ločeno zaporedje dnevnikov"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Odgovoren"
@@ -1691,7 +1702,7 @@ msgid "Year Sum"
 msgstr "Letni seštevek"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1767,7 +1778,7 @@ msgid "Customer Ref:"
 msgstr "Sklic kupca"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Uporabnik %s nima pravic za dostopanje do %s dnevnika."
@@ -2094,7 +2105,7 @@ msgid "Pro-forma"
 msgstr "Predračun"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2123,7 +2134,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Iskanje  predlog kontnega načrta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2174,7 +2185,7 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2193,7 +2204,7 @@ msgid "Income Account"
 msgstr "Konto prihodkov"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Ni definiranega računovodskega dnevnika prodaje/nakupa."
@@ -2233,6 +2244,7 @@ msgstr "Predloga izdelka"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2242,6 +2254,7 @@ msgstr "Predloga izdelka"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2292,7 +2305,7 @@ msgid "Account Line"
 msgstr "Vrsta računa"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2325,7 +2338,7 @@ msgid "Main Sequence"
 msgstr "Glavno zaporedje"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2401,7 +2414,7 @@ msgid "Account Tax Code"
 msgstr "Oznaka davka"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2486,7 +2499,7 @@ msgid "Account Model Entries"
 msgstr "Postavke modela konta"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2546,7 +2559,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "Uskladitev/odpis"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2578,7 +2590,7 @@ msgid "Accounts"
 msgstr "Konti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Napaka v nastavitvah"
@@ -2699,6 +2711,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Zapadle odprte postavke"
@@ -2748,14 +2761,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Ta čarovnik bo ustvaril ponavljajoče vknjižbe."
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "V dnevniku ni definiranega zaporedja!"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2861,7 +2874,7 @@ msgid "Base Code Amount"
 msgstr "Znesek osnove"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2874,7 +2887,7 @@ msgid "Default Sale Tax"
 msgstr "Privzeti davek prodaje"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "račun  '%s' je potrjen."
@@ -2914,7 +2927,7 @@ msgid "Fiscal Position"
 msgstr "Davčno območje"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3067,7 +3080,7 @@ msgid "View"
 msgstr "Pogled:"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3137,7 +3150,7 @@ msgstr "Predloge kontnih načrtov"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Nastavitve"
 
 #. module: account
 #: view:report.account.sales:0
@@ -3265,7 +3278,7 @@ msgid "Starting Balance"
 msgstr "Začetni saldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Partner ni izbran!"
@@ -3319,7 +3332,7 @@ msgid "Chart of Tax"
 msgstr "Načrt davkov"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "Zaključno stanje se bi moralo ujemati z izračunanim !"
@@ -3400,6 +3413,7 @@ msgstr "Količina :"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Dolžina obdobja (dni)"
 
@@ -3446,7 +3460,7 @@ msgid "Detail"
 msgstr "Podrobno"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3464,9 +3478,16 @@ msgid "VAT :"
 msgstr "DDV:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3487,7 +3508,7 @@ msgid "Centralised counterpart"
 msgstr "Skupen protikonto"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr "Na zbirni %s %s  konto  ni možno knjižiti"
@@ -3512,6 +3533,7 @@ msgstr "( Če ne izberete poslovnega leta bo izbrano tekoče poslovno leto)"
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3539,10 +3561,17 @@ msgstr "( Če ne izberete poslovnega leta bo izbrano tekoče poslovno leto)"
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Datum"
 
@@ -3559,7 +3588,6 @@ msgstr "Prekliči uskladitev"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3573,7 +3601,7 @@ msgid "Chart of Accounts Template"
 msgstr "Predloge kontnih načrtov"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3585,7 +3613,7 @@ msgstr ""
 "Določite partnerja !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Nekatere postavke so že zaprte !"
@@ -3616,6 +3644,8 @@ msgstr "Proračuni"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Brez filtrov"
 
@@ -3698,7 +3728,7 @@ msgid "Analytic Items"
 msgstr "Analitične postavke"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Ne morem spremeniti davka!"
@@ -3729,7 +3759,7 @@ msgid "Mapping"
 msgstr "Mapiranje"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3743,6 +3773,7 @@ msgstr "Ni možno ustvariti računa v centraliziranem dnevniku."
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3756,7 +3787,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Odprti konti po zapadlosti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "Ne morete knjižiti na zaprti konto %s %s"
@@ -4084,7 +4115,7 @@ msgid "Month"
 msgstr "Mesec"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4141,7 +4172,7 @@ msgid "Account Base Code"
 msgstr "Konto osnove"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Stroškovni konto za proizvod:  \"%s\" (id:%d) ni določen"
@@ -4327,7 +4358,7 @@ msgstr "res_config_contents"
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate Transactions"
-msgstr ""
+msgstr "Neusklajene postavke"
 
 #. module: account
 #: help:account.chart.template,visible:0
@@ -4353,7 +4384,7 @@ msgid "Allow Reconciliation"
 msgstr "Dovoli uskladitev"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4387,7 +4418,7 @@ msgid "Recurring Models"
 msgstr "Ponavljajuči modeli"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Napaka kodiranja"
@@ -4399,6 +4430,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Spremeni"
 
@@ -4443,7 +4475,7 @@ msgid "Example"
 msgstr "Primer"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4459,7 +4491,7 @@ msgid "Keep empty to use the income account"
 msgstr "Pustite prazno v primeru konta prihodkov"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Davek   %.2f%%"
@@ -4487,7 +4519,7 @@ msgstr "Povezovanje kontov"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Kupec"
@@ -4503,7 +4535,7 @@ msgid "Cancelled Invoice"
 msgstr "Prekilcani račun"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4526,7 +4558,7 @@ msgstr "Datum dogodka"
 #. module: account
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconciliation Transactions"
-msgstr ""
+msgstr "Naknadno odprte postavke"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -4557,7 +4589,7 @@ msgid "Income Account on Product Template"
 msgstr "Konto prihodkov za predlogo izdelka"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "Razl."
@@ -4582,11 +4614,13 @@ msgstr "Novo poslovno leto"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Računi"
 
@@ -4725,26 +4759,24 @@ msgid "Journal Items"
 msgstr "Postavke"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Napaka"
@@ -4847,7 +4879,7 @@ msgid "Beginning of Period Date"
 msgstr "Začetek obdobja"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4871,7 +4903,7 @@ msgid "Child Tax Accounts"
 msgstr "Podrejeni konti davkov"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Začetno obdobje mora biti pred končnim!"
@@ -4892,6 +4924,7 @@ msgstr "Stanje analitike-"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4935,6 +4968,8 @@ msgstr "Vrsta obdobja"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Plačila"
 
@@ -5010,7 +5045,7 @@ msgid "Line 1:"
 msgstr "Vrstica 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Napaka celovitosti!"
@@ -5043,6 +5078,7 @@ msgstr "Izid usklajevanja"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Bilanca stanja"
@@ -5119,6 +5155,7 @@ msgstr "Poročilo"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5249,7 +5286,6 @@ msgstr "Standardno finančno poročilo"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Komunikacija"
 
@@ -5302,13 +5338,13 @@ msgid "End of Year Entries Journal"
 msgstr "Dnevnik knjižb za zaključek leta"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5383,7 +5419,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Izdani računi in dobropisi"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5550,7 +5585,7 @@ msgid "Generate Opening Entries"
 msgstr "Kreiranje začetnih stanj"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Že usklajeno"
@@ -5583,14 +5618,14 @@ msgid "Child Accounts"
 msgstr "Podrejeni konti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Naziv : %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Odpis"
@@ -5610,7 +5645,7 @@ msgstr "Prihodki"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Dobavitelj"
@@ -5640,7 +5675,7 @@ msgid "Account n°"
 msgstr "Konto št."
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Prosta referenca"
@@ -5655,7 +5690,9 @@ msgstr "Potrjevanje"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Konti terjatev in obveznosti"
@@ -5753,7 +5790,7 @@ msgid "Filter by"
 msgstr "Filtriraj po"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Vnesli ste napačen izraz \"%(...)s\" v vaš model!"
@@ -5764,8 +5801,8 @@ msgid "Entry Date"
 msgstr "Datum vnosa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Ne morete uporabiti neaktivnega konta!"
@@ -5806,8 +5843,8 @@ msgid "Number of Days"
 msgstr "Število dni"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5869,7 +5906,7 @@ msgid "Multipication factor for Base code"
 msgstr "Množitelj za znesek davčne osnove"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "ni implementirano"
@@ -5908,6 +5945,8 @@ msgstr "Analiza analitičnih postavk"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Pretekli"
 
@@ -6007,7 +6046,7 @@ msgstr "Davek(%)"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account Based on this Template"
-msgstr ""
+msgstr "Ustvarite konto na osnovi te predloge"
 
 #. module: account
 #: view:account.account.type:0
@@ -6188,6 +6227,8 @@ msgstr "Odstotek"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Dnevnik&Partner"
 
@@ -6197,7 +6238,7 @@ msgid "Power"
 msgstr "Napajanje"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Ni možno generirati neuporabljene šifre dnevnika."
@@ -6238,6 +6279,7 @@ msgid "Applicable Type"
 msgstr "Predvidena vrsta"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Sklic računa"
@@ -6461,8 +6503,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "Ni možno brisati konta , ki ima vknjižbe!"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Postavke: "
@@ -6478,7 +6520,7 @@ msgid "Currency of the related account journal."
 msgstr "Valuta dnevnika"
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Ni možno ustvariti premika med različnima podjetjema."
@@ -6517,13 +6559,13 @@ msgstr "Status je \"Osnutek\"."
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Skupaj v breme"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Vnos   \"%s\" ni veljaven!"
@@ -6595,25 +6637,26 @@ msgstr "Dobiček&Izguba"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6645,8 +6688,8 @@ msgid "Printed"
 msgstr "Natisnjeno"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Napaka:"
@@ -6703,7 +6746,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Poročilo glavne knjige z enim partnerjem na stran"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6860,7 +6903,7 @@ msgid "Total:"
 msgstr "Skupaj:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6895,7 +6938,7 @@ msgid "Taxes used in Sales"
 msgstr "Davki prodaje"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6965,14 +7008,14 @@ msgid "Source Document"
 msgstr "Izvorni dokument"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "Ni možno brisati že vknjižene postavke \"%s\"!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7070,8 +7113,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Ali res želite odpreti ta račun?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7084,7 +7127,7 @@ msgid "Opening Entries Expense Account"
 msgstr "Otvoritve stroškovnega konta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Računovodske vknjižbe"
@@ -7218,7 +7261,7 @@ msgstr ""
 "ustvarite posebne davka za določene namene."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Izbrati bi morali obdobja , ki pripadajo istemu podjetju"
@@ -7249,8 +7292,8 @@ msgid "Reporting"
 msgstr "Poročila"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7341,7 +7384,7 @@ msgid "Sign on Reports"
 msgstr "Podpis na poročilih"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr "Obdobje ni bilo najdeno"
@@ -7352,7 +7395,7 @@ msgid "Root/View"
 msgstr "Osnova/Pogled"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7387,13 +7430,14 @@ msgid "Optional Information"
 msgstr "Dodatni podatki"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Dnevnik mora imeti privzeta konta za breme in dobro."
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7422,13 +7466,13 @@ msgid "Maturity Date"
 msgstr "Datum zapadlosti"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Napačni konto!"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Dnevnik prodaje"
@@ -7445,7 +7489,7 @@ msgid "Invoice Tax"
 msgstr "Davek računa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Ni številke kosa"
@@ -7497,7 +7541,7 @@ msgstr "Za"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Nastavitev valute"
@@ -7548,13 +7592,15 @@ msgstr "Maj"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Konti obveznosti"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "Davki so določeni , vendar jih ni na postavkah računa!"
@@ -7598,7 +7644,7 @@ msgstr "Naziv poročila"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Gotovina"
@@ -7610,15 +7656,15 @@ msgid "Account Destination"
 msgstr "Ciljni konto"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7767,13 +7813,14 @@ msgstr "Stalno"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Opozorilo!"
@@ -7825,7 +7872,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Izberite valuto na računu"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7838,7 +7885,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Nije možno opraviti operacije na računu %s."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Račun nima postavk!"
@@ -7916,7 +7963,7 @@ msgid "Deferral Method"
 msgstr "Način odloga"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Račun  '%s'  je plačan."
@@ -7982,7 +8029,7 @@ msgid "Associated Partner"
 msgstr "Povezani partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Najprej morate izbrati partnerja!"
@@ -8033,7 +8080,7 @@ msgid ""
 msgstr "Načrt davkov se uporablja za izdelavo mesečnega izračuna davkov."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8055,7 +8102,7 @@ msgid "Choose Fiscal Year"
 msgstr "Izberi poslovno leto"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Dnevnik vračil dobaviteljem"
@@ -8146,7 +8193,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Koda izračuna za davke v cenah"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8276,7 +8323,7 @@ msgid "current month"
 msgstr "tekoči mesec"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8357,10 +8404,12 @@ msgstr "Dnevnik vračil"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filtriraj po"
 
@@ -8395,7 +8444,7 @@ msgid "The partner account used for this invoice."
 msgstr "Partner na računu"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Davek %.2f%%"
@@ -8418,7 +8467,7 @@ msgid "Payment Term Line"
 msgstr "Postavka plačilnih pogojev"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Dnevnik nakupov"
@@ -8503,7 +8552,7 @@ msgid "Unpaid Invoices"
 msgstr "Neplačani računi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr "Dobaviteljevi plačilni pogoji nimajo nobene vrstice!"
@@ -8610,7 +8659,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Pustite prazno za vsa poslovna leta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "Vknjižba na kontu (%s) je potrjena!"
@@ -8623,7 +8672,7 @@ msgid ""
 msgstr "Vrednost v drugi valuti"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8696,7 +8745,7 @@ msgid "Contact Address"
 msgstr "Naslov stika"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Napačen model!"
@@ -8731,12 +8780,14 @@ msgstr "Pogodbe"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "neznano"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Dnevnik otvoritev"
@@ -8755,7 +8806,7 @@ msgid ""
 msgstr "Ta konto se uporablja za prenos dobička/izgube."
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Določiti morate zaporedje v povezanem dnevniku."
@@ -8776,7 +8827,7 @@ msgstr "Prodaja po vrstah"
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for Period"
-msgstr ""
+msgstr "Stroški za obdobje"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -8843,7 +8894,7 @@ msgid "Period from"
 msgstr "Obdobje od"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Dnevnik vračil kupcem"
@@ -8890,7 +8941,7 @@ msgid "Purchase Tax(%)"
 msgstr "Nabavni davek(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Ustvarite postavke računa"
@@ -8906,7 +8957,7 @@ msgid "Display Detail"
 msgstr "Podrobnosti"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -8940,8 +8991,6 @@ msgstr "Konec obdobja"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Finančna poročila"
@@ -8956,6 +9005,7 @@ msgstr "Finančna poročila"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8976,6 +9026,7 @@ msgstr "Začetno obdobje"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Smer analize"
 
@@ -8995,7 +9046,7 @@ msgstr "Pogled dnevnika"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Skupaj v dobro"
@@ -9060,6 +9111,7 @@ msgstr "Bančni izpisek"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9137,7 +9189,7 @@ msgstr ""
 "konta , program vam bo predlagal davek in proti-konto."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Izbrati morate konte za usklajevanje"
@@ -9159,7 +9211,6 @@ msgid ""
 msgstr "Tu lahko določite obračunska obdobja."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filter"
@@ -9181,7 +9232,7 @@ msgid "Move"
 msgstr "Prenos"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "Ni možno spremeniti davka!"
@@ -9237,7 +9288,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidacija podrejenih postavk"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9300,6 +9351,7 @@ msgstr "Ni določeno obdobje otvoritve/zaključka!"
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9356,6 +9408,7 @@ msgstr "Naročnine"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9363,6 +9416,7 @@ msgstr "Naročnine"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9405,7 +9459,7 @@ msgid "Unreconciled"
 msgstr "Neusklajeno"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Napačna skupna vsota!"
@@ -9464,7 +9518,7 @@ msgid "Comparison"
 msgstr "Primerjava"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Neznana napaka"
@@ -9501,6 +9555,7 @@ msgstr "Potrditev vknjižbe"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9605,9 +9660,11 @@ msgstr "Analitične vknjižbe zadnjih 30 dni."
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Obdobja"
 
@@ -9772,6 +9829,7 @@ msgstr "Knjiženo"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9819,7 +9877,7 @@ msgid "No detail"
 msgstr "Ni podrobnosti"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Ni opredeljenega konta prihodkov za ta izdelek:\"%s\" (id:%d)"
@@ -9855,6 +9913,7 @@ msgid "Verification Total"
 msgstr "Orodje za potrjevanje"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9875,6 +9934,7 @@ msgstr "Dnevnik: Vse"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9889,7 +9949,9 @@ msgstr "Dnevnik: Vse"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9899,6 +9961,8 @@ msgstr "Dnevnik: Vse"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10052,6 +10116,7 @@ msgstr "Račun dobavitelja"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10085,6 +10150,8 @@ msgstr "Napaka! Ne morete oblikovati rekurzivnih predlog kontov."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Številka dokumenta"
 
@@ -10103,7 +10170,7 @@ msgstr ""
 "Ni možno spremeniti vrste konta v katerokoli vrsto , ki vsebuje vknjižbe!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Postavka je že usklajena"
@@ -10139,8 +10206,10 @@ msgid ""
 msgstr "Vrsta konta"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "S premiki"
@@ -10238,7 +10307,7 @@ msgstr "Urejanje vrst dnevnikov."
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on Invoices"
-msgstr ""
+msgstr "Opis na računih"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
@@ -10256,8 +10325,8 @@ msgid "Statistic Reports"
 msgstr "Statistična poročila"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Napačni konto!"
@@ -10283,7 +10352,7 @@ msgid "Accounts Mapping"
 msgstr "Mapiranje kontov"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Račun  '%s' čaka na potrditev."
@@ -10542,6 +10611,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10615,6 +10685,8 @@ msgstr "Zapadlost"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Prihodnost"
 
diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po
index 07c5a161ceb..2c86e3f0c4f 100644
--- a/addons/account/i18n/sq.po
+++ b/addons/account/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referenca"
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr "Rr."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr "Kodi i Taksës së Llogarisë"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr "Shënimet e Modelit të Llogarisë"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2477,7 +2490,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2509,7 +2521,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2629,6 +2641,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Balansi i partnerit të vjetëruar"
@@ -2676,14 +2689,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2787,7 +2800,7 @@ msgid "Base Code Amount"
 msgstr "Vlera Kodit Bazik"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2800,7 +2813,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2838,7 +2851,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2987,7 +3000,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3179,7 +3192,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3233,7 +3246,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3314,6 +3327,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3360,7 +3374,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3375,9 +3389,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3398,7 +3419,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3423,6 +3444,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3450,10 +3472,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3470,7 +3499,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3484,7 +3512,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3493,7 +3521,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3524,6 +3552,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3605,7 +3635,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3636,7 +3666,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3650,6 +3680,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3663,7 +3694,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3983,7 +4014,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4040,7 +4071,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4247,7 +4278,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4281,7 +4312,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4293,6 +4324,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4337,7 +4369,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4351,7 +4383,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4379,7 +4411,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4395,7 +4427,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4447,7 +4479,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4472,11 +4504,13 @@ msgstr "Viti i ri fiskal"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4613,26 +4647,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4735,7 +4767,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4759,7 +4791,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4780,6 +4812,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4823,6 +4856,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4896,7 +4931,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4929,6 +4964,7 @@ msgstr "Rezultati i pajtimit"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5005,6 +5041,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5135,7 +5172,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5187,13 +5223,13 @@ msgid "End of Year Entries Journal"
 msgstr "Hyrjet Journal të fundvitit"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5267,7 +5303,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5430,7 +5465,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5463,14 +5498,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5490,7 +5525,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5520,7 +5555,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5535,7 +5570,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5631,7 +5668,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5642,8 +5679,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5684,8 +5721,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5747,7 +5784,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5784,6 +5821,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6057,6 +6096,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6066,7 +6107,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6106,6 +6147,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6324,8 +6366,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6341,7 +6383,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6380,13 +6422,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6454,25 +6496,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6504,8 +6547,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6560,7 +6603,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6711,7 +6754,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6741,7 +6784,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6809,14 +6852,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6912,8 +6955,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6926,7 +6969,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7057,7 +7100,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7088,8 +7131,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7178,7 +7221,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7189,7 +7232,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7224,13 +7267,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7257,13 +7301,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7280,7 +7324,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7330,7 +7374,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7378,13 +7422,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7428,7 +7474,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7440,15 +7486,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7597,13 +7643,14 @@ msgstr "Fikse"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7655,7 +7702,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7668,7 +7715,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7742,7 +7789,7 @@ msgid "Deferral Method"
 msgstr "Metoda e Vonesës"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7804,7 +7851,7 @@ msgid "Associated Partner"
 msgstr "Partneri i Bashkuar"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7850,7 +7897,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7872,7 +7919,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7959,7 +8006,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8087,7 +8134,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8166,10 +8213,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8202,7 +8251,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8225,7 +8274,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8310,7 +8359,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8416,7 +8465,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8429,7 +8478,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8502,7 +8551,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8537,12 +8586,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8561,7 +8612,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8647,7 +8698,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8694,7 +8745,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8710,7 +8761,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8742,8 +8793,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8758,6 +8807,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8778,6 +8828,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8797,7 +8848,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8862,6 +8913,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8937,7 +8989,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8959,7 +9011,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8981,7 +9032,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9037,7 +9088,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9098,6 +9149,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9154,6 +9206,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9161,6 +9214,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9203,7 +9257,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9262,7 +9316,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9299,6 +9353,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9397,9 +9452,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9561,6 +9618,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9608,7 +9666,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9644,6 +9702,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9664,6 +9723,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9678,7 +9738,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9688,6 +9750,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9841,6 +9905,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9874,6 +9939,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9891,7 +9958,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9927,8 +9994,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10044,8 +10113,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10071,7 +10140,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10261,6 +10330,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10334,6 +10404,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po
index 11eff8ff773..48e00dd3e0d 100644
--- a/addons/account/i18n/sr.po
+++ b/addons/account/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:04+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr "Sravnjanje"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referenca"
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -224,7 +225,7 @@ msgstr ""
 "sifru ne pojavi na računima."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -240,7 +241,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -286,7 +287,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -560,8 +561,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -619,7 +622,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -630,7 +633,7 @@ msgid "Tax Code Amount"
 msgstr "Iznos poreza"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -657,8 +660,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -735,6 +738,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -750,12 +754,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tip"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -881,12 +886,13 @@ msgid "Create 3 Months Periods"
 msgstr "Kreiraj 3-mesecni period"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Рок"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -964,7 +970,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -997,10 +1003,10 @@ msgid "Code"
 msgstr "Kod"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1062,7 +1068,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1110,7 +1116,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1202,7 +1208,7 @@ msgid "The move of this entry line."
 msgstr "Osnovica"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1223,7 +1229,7 @@ msgid "Entry Label"
 msgstr "Stavka"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1308,14 +1314,15 @@ msgid "Taxes"
 msgstr "Porezi"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1370,6 +1377,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1394,8 +1402,10 @@ msgid "Central Journal"
 msgstr "Glavni dnevnik"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1620,6 +1630,7 @@ msgid "Separated Journal Sequences"
 msgstr "Odvojene sekvence dnevnika"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1648,7 +1659,7 @@ msgid "Year Sum"
 msgstr "Godišnja suma"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1721,7 +1732,7 @@ msgid "Customer Ref:"
 msgstr "Referenca kupca:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2044,7 +2055,7 @@ msgid "Pro-forma"
 msgstr "Predračun"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2068,7 +2079,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2117,7 +2128,7 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2136,7 +2147,7 @@ msgid "Income Account"
 msgstr "Konto prihoda"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2176,6 +2187,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2185,6 +2197,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2235,7 +2248,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2266,7 +2279,7 @@ msgid "Main Sequence"
 msgstr "Glavna sekvenca"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2340,7 +2353,7 @@ msgid "Account Tax Code"
 msgstr "Poreska tarifa konta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2421,7 +2434,7 @@ msgid "Account Model Entries"
 msgstr "Stavke modela"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2485,7 +2498,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2517,7 +2529,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2637,6 +2649,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Godisnja potraživanja/obaveze partnera"
@@ -2684,14 +2697,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2794,7 +2807,7 @@ msgid "Base Code Amount"
 msgstr "Iznos osnvice"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2807,7 +2820,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2845,7 +2858,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2999,7 +3012,7 @@ msgid "View"
 msgstr "Pregled"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3191,7 +3204,7 @@ msgid "Starting Balance"
 msgstr "Početni saldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3245,7 +3258,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3326,6 +3339,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3372,7 +3386,7 @@ msgid "Detail"
 msgstr "Detalji"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3387,9 +3401,16 @@ msgid "VAT :"
 msgstr "PDV :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3410,7 +3431,7 @@ msgid "Centralised counterpart"
 msgstr "Centralizirana stavka zatvaranja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3437,6 +3458,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3464,10 +3486,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Datum"
 
@@ -3484,7 +3513,6 @@ msgstr "Poništi zatvaranje"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3498,7 +3526,7 @@ msgid "Chart of Accounts Template"
 msgstr "Predložak kontnog plana"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3507,7 +3535,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3538,6 +3566,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3622,7 +3652,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3653,7 +3683,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3667,6 +3697,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3680,7 +3711,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4000,7 +4031,7 @@ msgid "Month"
 msgstr "Mesec"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4057,7 +4088,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4264,7 +4295,7 @@ msgid "Allow Reconciliation"
 msgstr "Dozvoli zatvaranje"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4298,7 +4329,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4310,6 +4341,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Izmeni"
 
@@ -4354,7 +4386,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4368,7 +4400,7 @@ msgid "Keep empty to use the income account"
 msgstr "Ostavite prazno za konto prihoda"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4396,7 +4428,7 @@ msgstr "Mapiranje konta"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Kupac"
@@ -4412,7 +4444,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4464,7 +4496,7 @@ msgid "Income Account on Product Template"
 msgstr "Račun prihoda na predlošku proizvoda"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4489,11 +4521,13 @@ msgstr "Nova poslovna godina"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Računi"
 
@@ -4630,26 +4664,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4752,7 +4784,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4776,7 +4808,7 @@ msgid "Child Tax Accounts"
 msgstr "Podredjeni Poreski nalozi"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4797,6 +4829,7 @@ msgstr "Analitički saldo -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4840,6 +4873,8 @@ msgstr "Tip razdoblja"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Isplate"
 
@@ -4913,7 +4948,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Greška u integritetu!"
@@ -4946,6 +4981,7 @@ msgstr "Rezultat zatvaranja"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5022,6 +5058,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5151,7 +5188,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5203,13 +5239,13 @@ msgid "End of Year Entries Journal"
 msgstr "Dnevnik knjiženja kraja godine"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5283,7 +5319,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5448,7 +5483,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5481,14 +5516,14 @@ msgid "Child Accounts"
 msgstr "Podređena konta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Otpis"
@@ -5508,7 +5543,7 @@ msgstr "Prihod"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Dobavljač"
@@ -5538,7 +5573,7 @@ msgid "Account n°"
 msgstr "Br. računa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5553,7 +5588,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Konta potraživanja i dugovanja partnera"
@@ -5649,7 +5686,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5660,8 +5697,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5702,8 +5739,8 @@ msgid "Number of Days"
 msgstr "Broj Dana"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5765,7 +5802,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5802,6 +5839,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Prošlost"
 
@@ -6075,6 +6114,8 @@ msgstr "Procenat"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6084,7 +6125,7 @@ msgid "Power"
 msgstr "Eksponent"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6124,6 +6165,7 @@ msgid "Applicable Type"
 msgstr "Primjenjivi tip"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Referenca računa"
@@ -6346,8 +6388,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6363,7 +6405,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6402,13 +6444,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Ukupno duguje"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6480,25 +6522,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6530,8 +6573,8 @@ msgid "Printed"
 msgstr "Odstampano"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6586,7 +6629,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6737,7 +6780,7 @@ msgid "Total:"
 msgstr "Ukupno:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6767,7 +6810,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6835,14 +6878,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6938,8 +6981,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Sigurno želite da otvorite ovaj račun?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6952,7 +6995,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Računovodstveni unosi"
@@ -7088,7 +7131,7 @@ msgstr ""
 "programerima da stvaraju posebne poreze u vlastitom domenu."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7119,8 +7162,8 @@ msgid "Reporting"
 msgstr "Izveštavanje"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7209,7 +7252,7 @@ msgid "Sign on Reports"
 msgstr "Predznak na izveštajima"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7220,7 +7263,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7255,13 +7298,14 @@ msgid "Optional Information"
 msgstr "Opcione informacije"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7288,13 +7332,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7311,7 +7355,7 @@ msgid "Invoice Tax"
 msgstr "Porezi računa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7361,7 +7405,7 @@ msgstr "Do"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7409,13 +7453,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Konta obveza"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7459,7 +7505,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Gotovina"
@@ -7471,15 +7517,15 @@ msgid "Account Destination"
 msgstr "Ciljni račun"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7631,13 +7677,14 @@ msgstr "Fiksno"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Upozorenje!"
@@ -7689,7 +7736,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7702,7 +7749,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7776,7 +7823,7 @@ msgid "Deferral Method"
 msgstr "Način odlaganja"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7840,7 +7887,7 @@ msgid "Associated Partner"
 msgstr "Povezani partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7886,7 +7933,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7908,7 +7955,7 @@ msgid "Choose Fiscal Year"
 msgstr "Izaberite fiskalnu godinu"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7996,7 +8043,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Kod za izračun cena sa uključenim porezima"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8124,7 +8171,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8203,10 +8250,12 @@ msgstr "Dnevnik povrata"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8239,7 +8288,7 @@ msgid "The partner account used for this invoice."
 msgstr "Konto partnera za ovu fakturu"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8262,7 +8311,7 @@ msgid "Payment Term Line"
 msgstr "Red uslova plaćanja"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8347,7 +8396,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8454,7 +8503,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8468,7 +8517,7 @@ msgstr ""
 "Iznos troskova u drugoj opcionoj valuti ako je ovo multi-valutni sadrzaj"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8541,7 +8590,7 @@ msgid "Contact Address"
 msgstr "Kontakt Adresa"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8576,12 +8625,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Dnevnik početnog stanja"
@@ -8600,7 +8651,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8688,7 +8739,7 @@ msgid "Period from"
 msgstr "Razdoblje od"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8735,7 +8786,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8751,7 +8802,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8783,8 +8834,6 @@ msgstr "Kraj Perioda"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8799,6 +8848,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8819,6 +8869,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Direkcija Analiza"
 
@@ -8838,7 +8889,7 @@ msgstr "Pogled dnevnika"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Ukupno potražuje"
@@ -8903,6 +8954,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8978,7 +9030,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -9000,7 +9052,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -9022,7 +9073,7 @@ msgid "Move"
 msgstr "Pomeri"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9078,7 +9129,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidirana konta"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9139,6 +9190,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9195,6 +9247,7 @@ msgstr "Stavka pretplate"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9202,6 +9255,7 @@ msgstr "Stavka pretplate"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9244,7 +9298,7 @@ msgid "Unreconciled"
 msgstr "Otvoren"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9303,7 +9357,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9342,6 +9396,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9440,9 +9495,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Razdoblja"
 
@@ -9604,6 +9661,7 @@ msgstr "Proknjiženo"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9651,7 +9709,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9687,6 +9745,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9707,6 +9766,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9721,7 +9781,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9731,6 +9793,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9884,6 +9948,7 @@ msgstr "Račun dobavljača"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9917,6 +9982,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9934,7 +10001,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9970,8 +10037,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Sa prijenosima"
@@ -10087,8 +10156,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10114,7 +10183,7 @@ msgid "Accounts Mapping"
 msgstr "Mapiranje Konta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10304,6 +10373,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10377,6 +10447,8 @@ msgstr "Dospeće"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Buduće"
 
diff --git a/addons/account/i18n/sr@latin.po b/addons/account/i18n/sr@latin.po
index 79f57e9a213..689a27b77c0 100644
--- a/addons/account/i18n/sr@latin.po
+++ b/addons/account/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -142,6 +142,7 @@ msgstr "Sravnjanje"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referenca"
 
@@ -158,13 +159,13 @@ msgid ""
 msgstr "Omogućuje skrivanje neaktivnih uslova plaćanja."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Upozorenje !"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -228,7 +229,7 @@ msgstr ""
 "sifru ne pojavi na računima."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Račun '%s' je delimično plaćen: %s%s od %s%s (%s%s preostalo)"
@@ -244,7 +245,7 @@ msgid "Belgian Reports"
 msgstr "Belgijski Izveštaji"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Ne možete dodavati/menjati stavke u zatvorenom dnevniku."
@@ -290,7 +291,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Konto na stavci računa ne pripada organizaciji sa zaglavlja računa."
@@ -567,8 +568,10 @@ msgid "The accountant confirms the statement."
 msgstr "Knjigovođa potvrđuje izvod."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -626,7 +629,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Glavna serija mora biti različita od trenutne !"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -637,7 +640,7 @@ msgid "Tax Code Amount"
 msgstr "Iznos poreza"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -664,8 +667,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -742,6 +745,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -757,12 +761,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tip"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -888,12 +893,13 @@ msgid "Create 3 Months Periods"
 msgstr "Kreiraj 3-mesecni period"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Рок"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -971,7 +977,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1004,10 +1010,10 @@ msgid "Code"
 msgstr "Kod"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1069,7 +1075,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1117,7 +1123,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1209,7 +1215,7 @@ msgid "The move of this entry line."
 msgstr "Osnovica"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1230,7 +1236,7 @@ msgid "Entry Label"
 msgstr "Stavka"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1315,14 +1321,15 @@ msgid "Taxes"
 msgstr "Porezi"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1377,6 +1384,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1401,8 +1409,10 @@ msgid "Central Journal"
 msgstr "Glavni dnevnik"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1627,6 +1637,7 @@ msgid "Separated Journal Sequences"
 msgstr "Odvojene sekvence dnevnika"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1655,7 +1666,7 @@ msgid "Year Sum"
 msgstr "Godišnja suma"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1728,7 +1739,7 @@ msgid "Customer Ref:"
 msgstr "Referenca kupca:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2051,7 +2062,7 @@ msgid "Pro-forma"
 msgstr "Predračun"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2075,7 +2086,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2124,7 +2135,7 @@ msgid "Description"
 msgstr "Opis"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2143,7 +2154,7 @@ msgid "Income Account"
 msgstr "Konto prihoda"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2183,6 +2194,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2192,6 +2204,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2242,7 +2255,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2273,7 +2286,7 @@ msgid "Main Sequence"
 msgstr "Glavna sekvenca"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2347,7 +2360,7 @@ msgid "Account Tax Code"
 msgstr "Poreska tarifa konta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2428,7 +2441,7 @@ msgid "Account Model Entries"
 msgstr "Stavke modela"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2492,7 +2505,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2524,7 +2536,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2644,6 +2656,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Godisnja potraživanja/obaveze partnera"
@@ -2691,14 +2704,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2801,7 +2814,7 @@ msgid "Base Code Amount"
 msgstr "Iznos osnvice"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2814,7 +2827,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2852,7 +2865,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3006,7 +3019,7 @@ msgid "View"
 msgstr "Pregled"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3198,7 +3211,7 @@ msgid "Starting Balance"
 msgstr "Početni saldo"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3252,7 +3265,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3333,6 +3346,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3379,7 +3393,7 @@ msgid "Detail"
 msgstr "Detalji"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3394,9 +3408,16 @@ msgid "VAT :"
 msgstr "PDV :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3417,7 +3438,7 @@ msgid "Centralised counterpart"
 msgstr "Centralizirana stavka zatvaranja"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3444,6 +3465,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3471,10 +3493,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Datum"
 
@@ -3491,7 +3520,6 @@ msgstr "Poništi zatvaranje"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3505,7 +3533,7 @@ msgid "Chart of Accounts Template"
 msgstr "Predložak kontnog plana"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3514,7 +3542,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3545,6 +3573,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3629,7 +3659,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3660,7 +3690,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3674,6 +3704,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3687,7 +3718,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4007,7 +4038,7 @@ msgid "Month"
 msgstr "Mesec"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4064,7 +4095,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4271,7 +4302,7 @@ msgid "Allow Reconciliation"
 msgstr "Dozvoli zatvaranje"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4305,7 +4336,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4317,6 +4348,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Izmeni"
 
@@ -4361,7 +4393,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4375,7 +4407,7 @@ msgid "Keep empty to use the income account"
 msgstr "Ostavite prazno za konto prihoda"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4403,7 +4435,7 @@ msgstr "Mapiranje konta"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Kupac"
@@ -4419,7 +4451,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4471,7 +4503,7 @@ msgid "Income Account on Product Template"
 msgstr "Račun prihoda na predlošku proizvoda"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4496,11 +4528,13 @@ msgstr "Nova poslovna godina"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Računi"
 
@@ -4637,26 +4671,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4759,7 +4791,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4783,7 +4815,7 @@ msgid "Child Tax Accounts"
 msgstr "Podredjeni Poreski nalozi"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4804,6 +4836,7 @@ msgstr "Analitički saldo -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4847,6 +4880,8 @@ msgstr "Tip razdoblja"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Isplate"
 
@@ -4920,7 +4955,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Greška u integritetu!"
@@ -4953,6 +4988,7 @@ msgstr "Rezultat zatvaranja"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -5029,6 +5065,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5158,7 +5195,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5210,13 +5246,13 @@ msgid "End of Year Entries Journal"
 msgstr "Dnevnik knjiženja kraja godine"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5290,7 +5326,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5455,7 +5490,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5488,14 +5523,14 @@ msgid "Child Accounts"
 msgstr "Podređena konta"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Otpis"
@@ -5515,7 +5550,7 @@ msgstr "Prihod"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Dobavljač"
@@ -5545,7 +5580,7 @@ msgid "Account n°"
 msgstr "Br. računa"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5560,7 +5595,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Konta potraživanja i dugovanja partnera"
@@ -5656,7 +5693,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5667,8 +5704,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5709,8 +5746,8 @@ msgid "Number of Days"
 msgstr "Broj Dana"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5772,7 +5809,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5809,6 +5846,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Prošlost"
 
@@ -6082,6 +6121,8 @@ msgstr "Procenat"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6091,7 +6132,7 @@ msgid "Power"
 msgstr "Eksponent"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6131,6 +6172,7 @@ msgid "Applicable Type"
 msgstr "Primjenjivi tip"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Referenca računa"
@@ -6353,8 +6395,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6370,7 +6412,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6409,13 +6451,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Ukupno duguje"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6487,25 +6529,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6537,8 +6580,8 @@ msgid "Printed"
 msgstr "Odstampano"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6593,7 +6636,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6744,7 +6787,7 @@ msgid "Total:"
 msgstr "Ukupno:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6774,7 +6817,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6842,14 +6885,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6945,8 +6988,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Sigurno želite da otvorite ovaj račun?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6959,7 +7002,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Računovodstveni unosi"
@@ -7095,7 +7138,7 @@ msgstr ""
 "programerima da stvaraju posebne poreze u vlastitom domenu."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7126,8 +7169,8 @@ msgid "Reporting"
 msgstr "Izveštavanje"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7216,7 +7259,7 @@ msgid "Sign on Reports"
 msgstr "Predznak na izveštajima"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7227,7 +7270,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7262,13 +7305,14 @@ msgid "Optional Information"
 msgstr "Opcione informacije"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7295,13 +7339,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7318,7 +7362,7 @@ msgid "Invoice Tax"
 msgstr "Porezi računa"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7368,7 +7412,7 @@ msgstr "Do"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7416,13 +7460,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Konta obveza"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7466,7 +7512,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Gotovina"
@@ -7478,15 +7524,15 @@ msgid "Account Destination"
 msgstr "Ciljni račun"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7638,13 +7684,14 @@ msgstr "Fiksno"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Upozorenje!"
@@ -7696,7 +7743,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7709,7 +7756,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7783,7 +7830,7 @@ msgid "Deferral Method"
 msgstr "Način odlaganja"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7847,7 +7894,7 @@ msgid "Associated Partner"
 msgstr "Povezani partner"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7893,7 +7940,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7915,7 +7962,7 @@ msgid "Choose Fiscal Year"
 msgstr "Izaberite fiskalnu godinu"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -8003,7 +8050,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Kod za izračun cena sa uključenim porezima"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8131,7 +8178,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8210,10 +8257,12 @@ msgstr "Dnevnik povrata"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8246,7 +8295,7 @@ msgid "The partner account used for this invoice."
 msgstr "Konto partnera za ovu fakturu"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8269,7 +8318,7 @@ msgid "Payment Term Line"
 msgstr "Red uslova plaćanja"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8354,7 +8403,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8461,7 +8510,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8475,7 +8524,7 @@ msgstr ""
 "Iznos troskova u drugoj opcionoj valuti ako je ovo multi-valutni sadrzaj"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8548,7 +8597,7 @@ msgid "Contact Address"
 msgstr "Kontakt Adresa"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8583,12 +8632,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Dnevnik početnog stanja"
@@ -8607,7 +8658,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8695,7 +8746,7 @@ msgid "Period from"
 msgstr "Razdoblje od"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8742,7 +8793,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8758,7 +8809,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8790,8 +8841,6 @@ msgstr "Kraj Perioda"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8806,6 +8855,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8826,6 +8876,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Direkcija Analiza"
 
@@ -8845,7 +8896,7 @@ msgstr "Pogled dnevnika"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Ukupno potražuje"
@@ -8910,6 +8961,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8985,7 +9037,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -9007,7 +9059,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -9029,7 +9080,7 @@ msgid "Move"
 msgstr "Pomeri"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9085,7 +9136,7 @@ msgid "Consolidated Children"
 msgstr "Konsolidirana konta"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9146,6 +9197,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9202,6 +9254,7 @@ msgstr "Stavka pretplate"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9209,6 +9262,7 @@ msgstr "Stavka pretplate"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9251,7 +9305,7 @@ msgid "Unreconciled"
 msgstr "Otvoren"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9310,7 +9364,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9349,6 +9403,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9447,9 +9502,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Razdoblja"
 
@@ -9611,6 +9668,7 @@ msgstr "Proknjiženo"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9658,7 +9716,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9694,6 +9752,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9714,6 +9773,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9728,7 +9788,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9738,6 +9800,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9891,6 +9955,7 @@ msgstr "Račun dobavljača"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9924,6 +9989,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9941,7 +10008,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9977,8 +10044,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Sa prijenosima"
@@ -10094,8 +10163,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10121,7 +10190,7 @@ msgid "Accounts Mapping"
 msgstr "Mapiranje Konta"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10311,6 +10380,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10384,6 +10454,8 @@ msgstr "Dospeće"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Buduće"
 
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index cee9ca98236..c824a5422de 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:05+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -145,6 +145,7 @@ msgstr "Avstämning"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Referens"
 
@@ -162,13 +163,13 @@ msgstr ""
 "Du kan gömma ett betalningsvillkor genom att sätta det aktiv till falskt."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Varning!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Övrig journal"
@@ -233,7 +234,7 @@ msgstr ""
 "att visas på fakturor"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "Faktura '%s' är delbetald: %s%s av %s%s (%s%s återstår)"
@@ -249,7 +250,7 @@ msgid "Belgian Reports"
 msgstr "Belgiska rapporter"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Du kan inte lägga till/ändra poster i en stängd journal"
@@ -298,7 +299,7 @@ msgid "St."
 msgstr "Gatan"
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Företaget på fakturaraden stämmer inte med företaget på faktura."
@@ -453,7 +454,7 @@ msgstr "Mall för kontoplan"
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr "The amount expressed in an optional other currency."
+msgstr "Det belopp som uttrycks i en valfri annan valuta."
 
 #. module: account
 #: field:accounting.report,enable_filter:0
@@ -578,7 +579,7 @@ msgstr "Motpart"
 #: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr "Tax Mapping"
+msgstr "Skattemappning"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
@@ -592,8 +593,10 @@ msgid "The accountant confirms the statement."
 msgstr "Bokföraren bekräftar verifikatet."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -616,8 +619,9 @@ 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 ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disable"
+"Om du upphäver avstämningar måste du också verifiera alla åtgärder som är "
+"kopplade till dessa transaktioner, därför dessa kommer inte att bli "
+"inaktiverade."
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -651,7 +655,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Huvudsekvensen skall skilja sig från nuvarande!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "Period saknas eller flera perioder finns för det givna datumet."
@@ -662,7 +666,7 @@ msgid "Tax Code Amount"
 msgstr "Skattekodsbelopp"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -689,8 +693,8 @@ msgid "Journal Period"
 msgstr "Journalperiod"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -771,6 +775,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Ni kan enbart ändra valuta på fakturor som är i utkastläge"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Finansiella rapporter"
@@ -786,12 +791,13 @@ msgstr "Finansiella rapporter"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Typ"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -803,7 +809,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr "Account Subscription Line"
+msgstr "Kontoprenumerationsrad"
 
 #. module: account
 #: help:account.invoice,reference:0
@@ -927,12 +933,13 @@ msgid "Create 3 Months Periods"
 msgstr "Skapa 3-månadersperioder"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
-msgstr "Due"
+msgstr "Att betala"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -1017,7 +1024,7 @@ msgstr ""
 "taxerat belopp  (utan skatt)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "Förälderkonto saknas för kontomallen!"
@@ -1050,14 +1057,14 @@ msgid "Code"
 msgstr "Kod"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "No Analytic Journal !"
+msgstr "Ingen analysjournal !"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1119,7 +1126,7 @@ msgstr ""
 "om  kontoklassen och dess särdrag."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1168,7 +1175,7 @@ msgstr "Obalanserade transaktioner"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Bank"
@@ -1196,12 +1203,12 @@ msgstr ""
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr "Replacement Tax"
+msgstr "Ersättningsskatt"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Credit Centralisation"
-msgstr "Credit Centralisation"
+msgstr "Kredit Centralisering"
 
 #. module: account
 #: view:report.account_type.sales:0
@@ -1216,10 +1223,10 @@ msgid ""
 "purchase orders or receipts. This way, you can control the invoice from your "
 "supplier according to what you purchased or received."
 msgstr ""
-"Med Leverantörs Fakturor kan du ange och hantera fakturor som utfärdats av "
-"dina leverantörer. OpenERP kan även generera utkast på fakturor automatiskt "
-"från inköpsorder eller kvitton. På så sätt kan du styra fakturan från din "
-"leverantör beroende på vad du köpt eller fått."
+"Med Leverantörsfakturor kan du registrera och hantera fakturor som utfärdats "
+"av dina leverantörer. OpenERP kan även generera utkast på fakturor "
+"automatiskt från inköpsorder eller kvitton. På så sätt kan du styra fakturan "
+"från din leverantör beroende på vad du köpt eller tagit emot."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
@@ -1266,7 +1273,7 @@ msgid "The move of this entry line."
 msgstr "Affärshändelsen för transaktionen"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1286,13 +1293,13 @@ msgstr "# Transaktioner"
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Entry Label"
-msgstr "Entry Label"
+msgstr "Postetikett"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
-msgstr "You can not modify/delete a journal with entries for this period !"
+msgstr "Du kan inte ändra / radera en journal med poster i denna perioden!"
 
 #. module: account
 #: help:account.invoice,origin:0
@@ -1374,14 +1381,15 @@ msgid "Taxes"
 msgstr "Momskoder"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Ange en start och en slutperiod"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Resultaträkning"
 
@@ -1436,6 +1444,7 @@ msgid "Journal Items Analysis"
 msgstr "Transaktionsanalyser"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Företag"
@@ -1460,8 +1469,10 @@ msgid "Central Journal"
 msgstr "Central Journal"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1495,7 +1506,7 @@ msgstr "Största belopp att skriva av"
 #. module: account
 #: view:account.invoice:0
 msgid "Compute Taxes"
-msgstr "Beräkna skatt"
+msgstr "Beräkna Moms"
 
 #. module: account
 #: field:account.chart.template,code_digits:0
@@ -1623,7 +1634,7 @@ msgstr "Icke bokförda transaktioner"
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr "Payable Account"
+msgstr "Skuldkonto"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
@@ -1698,6 +1709,7 @@ msgid "Separated Journal Sequences"
 msgstr "Separerade nummerserier för böcker"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Ansvarig"
@@ -1728,7 +1740,7 @@ msgid "Year Sum"
 msgstr "Årtotal"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1804,7 +1816,7 @@ msgid "Customer Ref:"
 msgstr "Kundreferens:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "Användare %s har inte åtkomst till %s journalen !"
@@ -2134,7 +2146,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2165,7 +2177,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Sök kontoplansmallar"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2221,7 +2233,7 @@ msgid "Description"
 msgstr "Beskrivning"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2240,7 +2252,7 @@ msgid "Income Account"
 msgstr "Intäktskonto"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "Kontojournal av typen försäljning/inköp saknas!"
@@ -2280,6 +2292,7 @@ msgstr "Produktmall"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2289,6 +2302,7 @@ msgstr "Produktmall"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2339,7 +2353,7 @@ msgid "Account Line"
 msgstr "Kontorad"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2360,7 +2374,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr "Account Entry"
+msgstr "Kontotransaktion"
 
 #. module: account
 #: constraint:res.partner:0
@@ -2373,7 +2387,7 @@ msgid "Main Sequence"
 msgstr "Huvudsekvens"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2449,7 +2463,7 @@ msgid "Account Tax Code"
 msgstr "Konto, momskod"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2541,7 +2555,7 @@ msgid "Account Model Entries"
 msgstr "Account Model Entries"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2608,7 +2622,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "Transaktionsavstämning (avskrivning)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2640,7 +2653,7 @@ msgid "Accounts"
 msgstr "Konton"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Konfigurationsfel!"
@@ -2763,6 +2776,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Kundreskontra, periodiserad"
@@ -2815,14 +2829,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Denna assistent kommer att skapa återkommande bokföringsposter"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "Nummerserie saknas för denna journal !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2930,7 +2944,7 @@ msgid "Base Code Amount"
 msgstr "Baskodsbelopp"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2945,7 +2959,7 @@ msgid "Default Sale Tax"
 msgstr "Standardmoms"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Fakturan '%s' är granskad."
@@ -2986,7 +3000,7 @@ msgid "Fiscal Position"
 msgstr "Skatteregion"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3138,10 +3152,10 @@ msgstr "Konton som ligger till grund för skattedeklarationen."
 #: selection:account.entries.report,type:0
 #: selection:account.financial.report,type:0
 msgid "View"
-msgstr "Visa"
+msgstr "Vy"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3345,7 +3359,7 @@ msgid "Starting Balance"
 msgstr "Ingående balans"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "No Partner Defined !"
@@ -3401,7 +3415,7 @@ msgid "Chart of Tax"
 msgstr "Skattetabell"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "Stängningsbalansen bör vara samma som beräknad balans!"
@@ -3486,6 +3500,7 @@ msgstr "Kvantitet:"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Periodlängd (dagar)"
 
@@ -3532,7 +3547,7 @@ msgid "Detail"
 msgstr "Detalj"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3552,9 +3567,16 @@ msgid "VAT :"
 msgstr "Moms:"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3575,7 +3597,7 @@ msgid "Centralised counterpart"
 msgstr "Centralised counterpart"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr "Du kan inte skapa transaktioner med rubrikkonton %s %s"
@@ -3602,6 +3624,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3629,10 +3652,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Datum"
 
@@ -3649,7 +3679,6 @@ msgstr "Oavstäm"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3663,7 +3692,7 @@ msgid "Chart of Accounts Template"
 msgstr "Förlaga för kontoplan"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3674,7 +3703,7 @@ msgstr ""
 "\"%s\" bygger på företagets betalningsvillkor! Vänligen ange företag på det!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Vissa poster är redan avstämda !"
@@ -3705,6 +3734,8 @@ msgstr "Budgetar"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Inga filter"
 
@@ -3790,10 +3821,10 @@ msgid "Analytic Items"
 msgstr "Objekttransaktioner"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
-msgstr "Unable to change tax !"
+msgstr "Kan ej ändra Moms !"
 
 #. module: account
 #: field:analytic.entries.report,nbr:0
@@ -3821,7 +3852,7 @@ msgid "Mapping"
 msgstr "Fältmappning"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3837,6 +3868,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3850,7 +3882,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Råbalans, periodiserad"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "Du kan inte skapa transaktioner med rubrikkonton %s %s."
@@ -4186,7 +4218,7 @@ msgid "Month"
 msgstr "Månad"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4246,7 +4278,7 @@ msgid "Account Base Code"
 msgstr "Kontobaskod"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4460,7 +4492,7 @@ msgid "Allow Reconciliation"
 msgstr "Allow Reconciliation"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4495,7 +4527,7 @@ msgid "Recurring Models"
 msgstr "Mallar för återkommande transaktioner"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Fel vid avkodning"
@@ -4507,6 +4539,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Byt"
 
@@ -4551,7 +4584,7 @@ msgid "Example"
 msgstr "Exempel"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4567,7 +4600,7 @@ msgid "Keep empty to use the income account"
 msgstr "Om blankt används intäktskontot"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Inköpsmoms %.2f%%"
@@ -4595,7 +4628,7 @@ msgstr "Account Mapping"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Kund"
@@ -4611,7 +4644,7 @@ msgid "Cancelled Invoice"
 msgstr "Avbrutna fakturor"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4669,7 +4702,7 @@ msgid "Income Account on Product Template"
 msgstr "Income Account on Product Template"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "Övr"
@@ -4694,11 +4727,13 @@ msgstr "Nytt räkenskapsår"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Fakturor"
 
@@ -4841,26 +4876,24 @@ msgid "Journal Items"
 msgstr "Transaktioner"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -4970,7 +5003,7 @@ msgid "Beginning of Period Date"
 msgstr "Början på periodens datum"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4989,7 +5022,7 @@ msgstr "Mallar"
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr "Tax Description"
+msgstr "Moms Beskrivning"
 
 #. module: account
 #: field:account.tax,child_ids:0
@@ -4997,7 +5030,7 @@ msgid "Child Tax Accounts"
 msgstr "Child Tax Accounts"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Startperiod skall vara mindre än slutperiod"
@@ -5020,6 +5053,7 @@ msgstr "Analytic Balance -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5063,6 +5097,8 @@ msgstr "Period Type"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Betalningar"
 
@@ -5141,7 +5177,7 @@ msgid "Line 1:"
 msgstr "Rad 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integrity Error !"
@@ -5174,6 +5210,7 @@ msgstr "Avstämt resultat"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Balansräkning"
@@ -5250,6 +5287,7 @@ msgstr "Rapport"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5379,7 +5417,6 @@ msgstr "Allmän kontorapport"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Kommunikation"
 
@@ -5431,13 +5468,13 @@ msgid "End of Year Entries Journal"
 msgstr "Årsbokslut"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5487,7 +5524,7 @@ msgstr "Ändra valuta"
 #. module: account
 #: view:account.invoice:0
 msgid "This action will erase taxes"
-msgstr "Det här momentet raderar skatten"
+msgstr "Det här momentet uppdaterar momsen"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
@@ -5513,7 +5550,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "Kundfakturor och kreditfakturor"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5685,7 +5721,7 @@ msgid "Generate Opening Entries"
 msgstr "Skapa ingående balanser"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Redan avstämd!"
@@ -5718,14 +5754,14 @@ msgid "Child Accounts"
 msgstr "Underliggande konton"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Transaktions namn (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Avskrivning"
@@ -5745,7 +5781,7 @@ msgstr "Intäkter"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Leverantör"
@@ -5775,7 +5811,7 @@ msgid "Account n°"
 msgstr "Konto Nr"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Meddelande"
@@ -5790,7 +5826,9 @@ msgstr "Värdering"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Fordrings- och skuldkonton"
@@ -5898,7 +5936,7 @@ msgid "Filter by"
 msgstr "Filtrera efter"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Du har fel uttryck \"%(...)s\" i din mall !"
@@ -5909,8 +5947,8 @@ msgid "Entry Date"
 msgstr "Transaktionsdatum"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Du kan inte använda ett inaktivt konto!"
@@ -5951,8 +5989,8 @@ msgid "Number of Days"
 msgstr "Antal dagar"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -6014,7 +6052,7 @@ msgid "Multipication factor for Base code"
 msgstr "Multiplikationsfaktor för baskod"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "inte implementerat"
@@ -6053,6 +6091,8 @@ msgstr "Objektanalys"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Tidigare"
 
@@ -6343,6 +6383,8 @@ msgstr "Procent"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Journal & företag"
 
@@ -6352,7 +6394,7 @@ msgid "Power"
 msgstr "Kraft"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Kan inte generera en oanvänd journalkod."
@@ -6394,6 +6436,7 @@ msgid "Applicable Type"
 msgstr "Tillämplig typ"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Fakturareferens"
@@ -6626,8 +6669,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "Du kan inte radera ett konto som har transaktioner."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Verifikat: "
@@ -6643,7 +6686,7 @@ msgid "Currency of the related account journal."
 msgstr "Valuta på relaterade kontojournaler"
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Kunde inte skapa affärshändelse som berör flera företag"
@@ -6690,13 +6733,13 @@ msgstr "Preleminär status"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Total debet"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Verifikat \"%s\" är inte giltigt !"
@@ -6771,25 +6814,26 @@ msgstr "Resultaträkning (Utgifter)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6821,8 +6865,8 @@ msgid "Printed"
 msgstr "Printed"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Fel :"
@@ -6885,7 +6929,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Visa huvudbok med ett företag per sida"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -7051,7 +7095,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7089,7 +7133,7 @@ msgid "Taxes used in Sales"
 msgstr "Utgående moms"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7167,14 +7211,14 @@ msgid "Source Document"
 msgstr "Källdokument"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "Du kan inte radera ett bokfört verifikat \"%s\"!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7280,8 +7324,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Är du säker på att du vill öppna den här fakturan?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7296,7 +7340,7 @@ msgid "Opening Entries Expense Account"
 msgstr "Ingående balans utgiftskonton"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Accounting Entries"
@@ -7434,7 +7478,7 @@ msgstr ""
 "specifika skatteregler i en anpassad domän."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Du måste välja perioder knutna till samma bolag"
@@ -7465,8 +7509,8 @@ msgid "Reporting"
 msgstr "Rapporter"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7562,7 +7606,7 @@ msgid "Sign on Reports"
 msgstr "Tecken på rapporten"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr "Perioderna som skapar ingående balanser saknas"
@@ -7573,7 +7617,7 @@ msgid "Root/View"
 msgstr "Root-vy"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7608,13 +7652,14 @@ msgid "Optional Information"
 msgstr "Valfri information"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "Journalen måste ha standard kredit och debet-konton"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7643,13 +7688,13 @@ msgid "Maturity Date"
 msgstr "Förfallodag"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Bad account !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Försäljningsjournal"
@@ -7666,7 +7711,7 @@ msgid "Invoice Tax"
 msgstr "Fakturaskatt"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "Stycknummer saknas !"
@@ -7711,7 +7756,7 @@ msgstr "Manuell avstämning"
 #. module: account
 #: report:account.overdue:0
 msgid "Total amount due:"
-msgstr "Total amount due:"
+msgstr "Totalt förfallet belopp:"
 
 #. module: account
 #: field:account.analytic.chart,to_date:0
@@ -7721,7 +7766,7 @@ msgstr "Till"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Valutajusteringar"
@@ -7775,13 +7820,15 @@ msgstr "Maj"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Skuldkonton"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "Globala skatter definierade, men de saknas på fakturaraderna !"
@@ -7825,7 +7872,7 @@ msgstr "Rapportnamn"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Kontant"
@@ -7837,15 +7884,15 @@ msgid "Account Destination"
 msgstr "Account Destination"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -8001,13 +8048,14 @@ msgstr "Fast"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Warning !"
@@ -8059,7 +8107,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Välj valuta för fakturan"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -8072,7 +8120,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Kan inte %s för preliminär-, proforma- eller makuleradfaktura."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "Inga faktura rader !"
@@ -8154,7 +8202,7 @@ msgid "Deferral Method"
 msgstr "Deferral Method"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Fakturan '%s' är betald"
@@ -8220,7 +8268,7 @@ msgid "Associated Partner"
 msgstr "Associerade företag"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "You must first select a partner !"
@@ -8279,7 +8327,7 @@ msgstr ""
 "land."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8301,7 +8349,7 @@ msgid "Choose Fiscal Year"
 msgstr "Välj verksamhetsår"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Inköpskreditjournal"
@@ -8394,7 +8442,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Beräkningskod för momsinkluderade priser"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8537,7 +8585,7 @@ msgid "current month"
 msgstr "Innevarande månad"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8625,10 +8673,12 @@ msgstr "Refund Journal"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Selektera på"
 
@@ -8666,7 +8716,7 @@ msgid "The partner account used for this invoice."
 msgstr "Företagskonton använt för denna faktura"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Skatt %.2f%%"
@@ -8689,7 +8739,7 @@ msgid "Payment Term Line"
 msgstr "Payment Term Line"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Inköpsjournal"
@@ -8721,7 +8771,7 @@ msgstr "Verifikatmallrad"
 #: field:account.invoice.report,date_due:0
 #: field:report.invoice.created,date_due:0
 msgid "Due Date"
-msgstr "Slutdatum"
+msgstr "Förfallodatum"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_supplier
@@ -8776,7 +8826,7 @@ msgid "Unpaid Invoices"
 msgstr "Obetalda fakturor"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr "Betalningsvillkor för leverantörer saknar betalningsvillkorsrader!"
@@ -8883,7 +8933,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Håll tomt för alla öppna räkenskapsår"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "Affärshändelsen (%s) för huvudboken har bekräftats!"
@@ -8894,11 +8944,11 @@ msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
 msgstr ""
-"The amount expressed in an optional other currency if it is a multi-currency "
-"entry."
+"Det belopp som uttrycks i en valfri annan valuta om det är en multivaluta "
+"post."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8980,7 +9030,7 @@ msgid "Contact Address"
 msgstr "Kontaktadress"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Fel mall !"
@@ -9020,12 +9070,14 @@ msgstr "Avtal"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "okänd"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Öppna transaktionsjournal"
@@ -9047,7 +9099,7 @@ msgstr ""
 "resultaträkningsrapporten."
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Vänligen definiera ordningen på journalen knuten till fakturan."
@@ -9138,7 +9190,7 @@ msgid "Period from"
 msgstr "Period från och med"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Kreditjournal"
@@ -9185,7 +9237,7 @@ msgid "Purchase Tax(%)"
 msgstr "Inköpsmoms(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Vänligen skapa några fakturarader."
@@ -9193,7 +9245,7 @@ msgstr "Vänligen skapa några fakturarader."
 #. module: account
 #: report:account.overdue:0
 msgid "Dear Sir/Madam,"
-msgstr "Dear Sir/Madam,"
+msgstr "Hej!"
 
 #. module: account
 #: field:account.vat.declaration,display_detail:0
@@ -9201,7 +9253,7 @@ msgid "Display Detail"
 msgstr "Visa detaljer"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9239,8 +9291,6 @@ msgstr "Slutdatum"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Finansiella rapporter"
@@ -9255,6 +9305,7 @@ msgstr "Finansiella rapporter"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9275,6 +9326,7 @@ msgstr "Startperiod"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Analysis Direction"
 
@@ -9294,7 +9346,7 @@ msgstr "Journalvy"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total credit"
@@ -9322,7 +9374,7 @@ msgstr "Skattekodsmall"
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr "Document: Customer account statement"
+msgstr "Kontoutdrag"
 
 #. module: account
 #: field:account.account.type,report_type:0
@@ -9363,6 +9415,7 @@ msgstr "Kontoutdrag"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9443,7 +9496,7 @@ msgstr ""
 "lämligt motkonto från \"kundfordringar\"."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "Du måste välja konton att stämma av"
@@ -9471,7 +9524,6 @@ msgstr ""
 "under en viss period."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Selektera på"
@@ -9493,7 +9545,7 @@ msgid "Move"
 msgstr "Affärshändelse"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9552,7 +9604,7 @@ msgid "Consolidated Children"
 msgstr "Consolidated Children"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9617,6 +9669,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9668,7 +9721,7 @@ msgstr "Account Subscription"
 #. module: account
 #: report:account.overdue:0
 msgid "Maturity date"
-msgstr "Maturity date"
+msgstr "Förfallodag"
 
 #. module: account
 #: view:account.subscription:0
@@ -9678,6 +9731,7 @@ msgstr "Entry Subscription"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9685,6 +9739,7 @@ msgstr "Entry Subscription"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9729,7 +9784,7 @@ msgid "Unreconciled"
 msgstr "Oavstämd"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Bristande total !"
@@ -9795,7 +9850,7 @@ msgid "Comparison"
 msgstr "Jämförelse"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Okänt fel"
@@ -9834,6 +9889,7 @@ msgstr "Verifiera affärshändelseraderna"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9940,9 +9996,11 @@ msgstr "Objektverifikat senaste 30 dagarna"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Perioder"
 
@@ -10114,6 +10172,7 @@ msgstr "Bokförd"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10161,7 +10220,7 @@ msgid "No detail"
 msgstr "Inga detaljer"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Det finns inget intäktskonto för denna produkt: \"%s\" (id:%d)"
@@ -10197,6 +10256,7 @@ msgid "Verification Total"
 msgstr "Verifikattotal"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10217,6 +10277,7 @@ msgstr "Journal: Alla"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10231,7 +10292,9 @@ msgstr "Journal: Alla"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10241,6 +10304,8 @@ msgstr "Journal: Alla"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10403,6 +10468,7 @@ msgstr "Leverantörsfaktura"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10436,6 +10502,8 @@ msgstr "Fel! Du kan inte skapa rekursiva analyskonton."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Verifikatnummer"
 
@@ -10455,7 +10523,7 @@ msgstr ""
 "transaktioner!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Verifikat är redan avstämd"
@@ -10495,8 +10563,10 @@ msgstr ""
 "konton (för debet/kredit-beräkningar ), stängt för avlutade konton."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "Med affärshändelser"
@@ -10619,8 +10689,8 @@ msgid "Statistic Reports"
 msgstr "Statistikrapport"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Bad account!"
@@ -10651,7 +10721,7 @@ msgid "Accounts Mapping"
 msgstr "Accounts Mapping"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Faktura '%s' väntar på validering."
@@ -10908,6 +10978,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10986,6 +11057,8 @@ msgstr "Maturity"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Framtida"
 
diff --git a/addons/account/i18n/ta.po b/addons/account/i18n/ta.po
index 0ef4bb69732..5fba0cbafd1 100644
--- a/addons/account/i18n/ta.po
+++ b/addons/account/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:05+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr ""
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "எச்சரிக்கை!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr "கணக்கின் வரிக் குறியீடு"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po
index adbf8bd6ad5..99f65b5cf1d 100644
--- a/addons/account/i18n/te.po
+++ b/addons/account/i18n/te.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:07+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:05+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr ""
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "రకం"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr "పన్నులు"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr "వివరణ"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr "ఆదాయ ఖాతా"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr "వివరము"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "తేదీ"
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr "నెల"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "మార్చు"
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr "కొత్త ఆర్థిక సంవత్సరం"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "పొరపాటు"
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "చెల్లింపులు"
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr "సమన్వయ ఫలితం"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr "ఆదాయం"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr "రోజుల సంఖ్య"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr "మొత్తం:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr "ఐచ్చిక సమాచారం"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "నగదు"
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr "స్ఠిర"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "హెచ్చరిక !"
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "తప్పుడు ఖాతా!"
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr "గడువు"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po
index 7761fa6af85..25d293896a9 100644
--- a/addons/account/i18n/th.po
+++ b/addons/account/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:05+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr "กระทบยอด"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "อ้างถึง"
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "คำเตือน!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "คุณไม่สามารถเพิ่ม/แก้ไขรายการในสมุดรายวันที่ปิดบัญชีแล้ว"
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr "ผู้ทำบัญชีรับรองงบการเงิน"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "คุณสามารถเปลี่ยนแปลง invoice ฉบับร่างได้เฉพาะหน่วยเงินตราเท่านั้น"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "ประเภท"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr "สร้างงวด 3 เดือน"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "ครบกำหนด"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr "รหัส"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "ธนาคาร"
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr "ภาษี"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "เลือกระยะเวลาเริ่มต้นและสิ้นสุดรอบบัญชี"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "พาร์ทเนอร์"
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "รับผิดชอบ"
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr "ผลรวมจำนวนปี"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr "ค้นหาตัวอย่างผังบัญชี"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr "รายละเอียด"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr "บัญชีรายได้"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr "รูปแบบสินค้า"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr "รูปแบบสินค้า"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr "รหัสบัญชีภาษี"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr "บัญชี"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "การตั้งค่าผิดพลาด"
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr "แสดงตัวอย่าง"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr "ผังภาษี"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr "รายละเอียด"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "การเตือน"
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr "รายการเคลืี่อนไหวเงินฝาก
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po
index 58419b316d1..76c3ac1a2cf 100644
--- a/addons/account/i18n/tlh.po
+++ b/addons/account/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:05+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -139,6 +139,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr ""
 
@@ -155,13 +156,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -221,7 +222,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -237,7 +238,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -283,7 +284,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -557,8 +558,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -614,7 +617,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -625,7 +628,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -652,8 +655,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -730,6 +733,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -745,12 +749,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -876,12 +881,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -959,7 +965,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -992,10 +998,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1057,7 +1063,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1105,7 +1111,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1197,7 +1203,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1218,7 +1224,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1303,14 +1309,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1365,6 +1372,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1389,8 +1397,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1615,6 +1625,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1643,7 +1654,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1716,7 +1727,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2035,7 +2046,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2059,7 +2070,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2108,7 +2119,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2127,7 +2138,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2167,6 +2178,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2176,6 +2188,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2226,7 +2239,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2257,7 +2270,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2331,7 +2344,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2412,7 +2425,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2471,7 +2484,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2503,7 +2515,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2623,6 +2635,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2670,14 +2683,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2780,7 +2793,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2793,7 +2806,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2831,7 +2844,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2978,7 +2991,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3170,7 +3183,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3224,7 +3237,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3305,6 +3318,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3351,7 +3365,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3366,9 +3380,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3389,7 +3410,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3414,6 +3435,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3441,10 +3463,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3461,7 +3490,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3475,7 +3503,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3484,7 +3512,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3515,6 +3543,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3596,7 +3626,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3627,7 +3657,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3641,6 +3671,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3654,7 +3685,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3974,7 +4005,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4031,7 +4062,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4238,7 +4269,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4272,7 +4303,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4284,6 +4315,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4328,7 +4360,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4342,7 +4374,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4370,7 +4402,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4386,7 +4418,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4438,7 +4470,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4463,11 +4495,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4604,26 +4638,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4726,7 +4758,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4750,7 +4782,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4771,6 +4803,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4814,6 +4847,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4887,7 +4922,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4920,6 +4955,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4996,6 +5032,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5123,7 +5160,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5175,13 +5211,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5255,7 +5291,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5418,7 +5453,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5451,14 +5486,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5478,7 +5513,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5508,7 +5543,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5523,7 +5558,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5619,7 +5656,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5630,8 +5667,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5672,8 +5709,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5735,7 +5772,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5772,6 +5809,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6045,6 +6084,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6054,7 +6095,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6094,6 +6135,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6312,8 +6354,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6329,7 +6371,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6368,13 +6410,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6442,25 +6484,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6492,8 +6535,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6548,7 +6591,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6699,7 +6742,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6729,7 +6772,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6797,14 +6840,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6900,8 +6943,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6914,7 +6957,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7045,7 +7088,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7076,8 +7119,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7166,7 +7209,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7177,7 +7220,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7212,13 +7255,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7245,13 +7289,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7268,7 +7312,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7318,7 +7362,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7366,13 +7410,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7416,7 +7462,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7428,15 +7474,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7582,13 +7628,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7640,7 +7687,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7653,7 +7700,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7727,7 +7774,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7789,7 +7836,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7835,7 +7882,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7857,7 +7904,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7944,7 +7991,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8072,7 +8119,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8151,10 +8198,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8187,7 +8236,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8210,7 +8259,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8295,7 +8344,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8401,7 +8450,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8414,7 +8463,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8487,7 +8536,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8522,12 +8571,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8546,7 +8597,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8632,7 +8683,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8679,7 +8730,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8695,7 +8746,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8727,8 +8778,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8743,6 +8792,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8763,6 +8813,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8782,7 +8833,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8847,6 +8898,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8922,7 +8974,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8944,7 +8996,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8966,7 +9017,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9022,7 +9073,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9083,6 +9134,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9139,6 +9191,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9146,6 +9199,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9188,7 +9242,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9247,7 +9301,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9284,6 +9338,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9382,9 +9437,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9546,6 +9603,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9593,7 +9651,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9629,6 +9687,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9649,6 +9708,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9663,7 +9723,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9673,6 +9735,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9826,6 +9890,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9859,6 +9924,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9876,7 +9943,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9912,8 +9979,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10029,8 +10098,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10056,7 +10125,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10246,6 +10315,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10319,6 +10389,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 26bd0b01273..8d78e560964 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:05+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -44,7 +44,7 @@ msgstr ""
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "Günlük Girişini Uzlaştır"
+msgstr "Günlük Kaydını Uzlaştır"
 
 #. module: account
 #: view:account.account:0
@@ -144,8 +144,9 @@ msgstr "Uzlaşma"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
-msgstr "İlgi"
+msgstr "Referans"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
@@ -162,13 +163,13 @@ msgstr ""
 "saklamanızı sağlayacaktır."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Uyarı!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "Çeşitli Günlük"
@@ -182,7 +183,7 @@ msgstr "Hesap Kaynağı"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
 msgid "All Analytic Entries"
-msgstr "Bütün Analitik Girişler"
+msgstr "Bütün Analiz Girişleri"
 
 #. module: account
 #: field:accounting.report,label_filter:0
@@ -202,9 +203,8 @@ msgid ""
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
 msgstr ""
-"Analitik yevmiye günlüğünün türünü belirtir. Bir belge için (ör: fatura) "
-"analitik giriş oluşturmak gerektiğinde OpenERP aynı tipe uyan yevmiye "
-"defteri arayacaktır."
+"Analiz günlüğünün türünü belirtir. Bir belge için (ör: fatura) analiz girişi "
+"oluşturmak gerektiğinde OpenERP aynı tipe uyan günlük defteri arayacaktır."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -215,7 +215,7 @@ msgstr "Vergi Şablonları"
 #. module: account
 #: model:ir.model,name:account.model_account_tax
 msgid "account.tax"
-msgstr "muhasebe.vergi"
+msgstr "hesap.vergi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
@@ -233,7 +233,7 @@ msgstr ""
 "istemiyorsanız bu kutuyu işaretleyin."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "'%s' nolu fatura kısmen ödendi: (Ödenen %s%s Toplam %s%s Kalan %s%s)"
@@ -241,7 +241,7 @@ msgstr "'%s' nolu fatura kısmen ödendi: (Ödenen %s%s Toplam %s%s Kalan %s%s)"
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr "Muhasebe girişleri uzlaştırmanın girdileridir."
+msgstr "Muhasebe girişleri bir uzlaşmanın girdileridir."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -249,7 +249,7 @@ msgid "Belgian Reports"
 msgstr "Belçika Raporları"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Kapanmış bir günlükte ekleme/değiştirme  yapamazsınız."
@@ -267,14 +267,14 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "Sub-Total :"
-msgstr "Ara Toplam"
+msgstr "Ara Toplam:"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr "El ile Yineleme"
+msgstr "Elle Özyineleme"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -289,7 +289,7 @@ msgstr "Borcu silmeye izin ver"
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr "Analiz için dönem seçin"
+msgstr "İnceleme için dönemi seçin"
 
 #. module: account
 #: view:account.move.line:0
@@ -297,10 +297,10 @@ msgid "St."
 msgstr "Ara Top."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
-msgstr "Fatura satırındaki hesap firması ile fatura firması eşleşmiyor."
+msgstr "Fatura öğesi hesap firması ile fatura firması eşleşmiyor."
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -325,9 +325,9 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
-"Bu şirket için %s tipinde bir hesap yevmiyesi bulunamadı.\n"
+"Bu firma için %s tipinde bir hesap günlüğü bulunamadı.\n"
 "\n"
-"Ayarlar/Finansal Muhasebe/Hesaplar/Yevmiyeler menüsünden\n"
+"Ayarlar/Finansal Muhasebe/Hesaplar/Günlükler menüsünden\n"
 "bir tane yaratabilirsiniz."
 
 #. module: account
@@ -375,18 +375,18 @@ msgid ""
 msgstr ""
 "Bu görünüm, OpenERP de kayıtların toplu olarak girilmesi için muhasebeciler "
 "tarafından kullanılır. Banka Hesap Özetleri, Kasa Kayıtları, veya "
-"Müşteri/Satıcı ödemelerine ait yevmiye girişleri OpenERP tarafından "
+"Müşteri/Satıcı ödemelerine ait günlük girişleri OpenERP tarafından "
 "oluşturulur."
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr "Görünüm tipindeki hesaplarda yevmiye kaydı oluşturamazsınız."
+msgstr "Görünüm tipindeki hesaplarda günlük girişi oluşturamazsınız."
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
-msgstr "muhasebe.vergi.şablon"
+msgstr "hesap.vergi.şablon"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -412,7 +412,7 @@ msgstr "Açma/Kapama Durumu"
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "Hesap özeti girişi için kullanılacak para birimi"
+msgstr "Hesapözeti girişi için kullanılacak para birimi"
 
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
@@ -425,7 +425,7 @@ msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
-"Bu Alan, bu yevmiyenin yevmiye girişleri numaralandırılmasıyla ilintili "
+"Bu Alan, bu günlüğe ait günlük girişleri numaralandırılmasıyla ilintili "
 "bilgi içerir."
 
 #. module: account
@@ -468,7 +468,7 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
-"Yevmiye dönemi oluşturulduğunda, durum 'Taslak' tır. Bir rapor "
+"Günlük dönemi oluşturulduğunda, durum 'Taslak' tır. Bir rapor "
 "yazdırıldığındadurum 'Yazdırılmış' halini alır. Bütün işlemlemler "
 "tamamalandığında durum 'Tamamlandı' halini alır."
 
@@ -513,7 +513,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_journal
 #: field:validate.account.move,journal_id:0
 msgid "Journal"
-msgstr "Yevmiye"
+msgstr "Günlük"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
@@ -528,7 +528,7 @@ msgstr "Ana Hedef"
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr "Bu yevmiyede kullanılan hesap"
+msgstr "Bu günlükte kullanılan hesap"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -593,8 +593,10 @@ msgid "The accountant confirms the statement."
 msgstr "Muhasebeci hesap özetini onaylar."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -653,7 +655,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "Ana dizi şuandakinden farklı olmalı"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "Hiç dönem bulunmadı ya da verilen tarih için birden çok dönem var."
@@ -661,10 +663,10 @@ msgstr "Hiç dönem bulunmadı ya da verilen tarih için birden çok dönem var.
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr "Vergi Kodu Değeri"
+msgstr "Vergi Kodu Tutarı"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -688,11 +690,11 @@ msgstr "Giriş Dönemi Açılışı"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr "Yevmiye Dönemi"
+msgstr "Günlük Dönemi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "Girişin uzlaştırılması için bütün girişler için firma aynı olmalı"
@@ -768,9 +770,10 @@ msgstr "İade Yöntemi"
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr "Sadece proforma faturaların para birimini değiştirebilirsiniz !"
+msgstr "Yalnızca Taslak Faturaların para birimini değiştirebilirsiniz !"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "Mali Rapor"
@@ -786,12 +789,13 @@ msgstr "Mali Rapor"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Tür"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -808,7 +812,7 @@ msgstr "Account Subscription Line"
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr "Bu faturaya ait paydaş kaynağı"
+msgstr "Bu faturaya ait paydaş referansı"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -831,7 +835,7 @@ msgstr "14 Net günde yüzde 2, kalan tutar 30 günde ay sonunda."
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
-msgstr "Analitik Yevmiye Hesabı"
+msgstr "Analiz Günlük Hesabı"
 
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
@@ -926,12 +930,13 @@ msgid "Create 3 Months Periods"
 msgstr "3 Aylık Dönemleri Oluştur"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Vade"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -987,7 +992,7 @@ msgstr "Genişletilmiş Süzgeçler..."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr "Merkezileştirme Yevmiyesi"
+msgstr "Merkezileştirme Günlüğü"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -997,7 +1002,7 @@ msgstr "Satış İadesi"
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr "Banka ekstresi"
+msgstr "Banka hesapözeti"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -1011,12 +1016,12 @@ msgid ""
 "amount.If the tax account is base tax code, this field will contain the "
 "basic amount(without tax)."
 msgstr ""
-"If the Tax account is a tax code account, this field will contain the taxed "
-"amount.If the tax account is base tax code, this field will contain the "
-"basic amount(without tax)."
+"Eğer Vergi hesabı bir vergi kodu hesabı ise bu alan vergilendirilmiş tutarı "
+"içerecektir. Eğe vergi hesabı temel vergi kodu ise bu alan temel tutarı "
+"(vergisiz tutar) içerecektir."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "Şablon hesap için ana kodu bulamıyorum!"
@@ -1049,14 +1054,14 @@ msgid "Code"
 msgstr "Kod"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "Analitik Yevmiye Yok !"
+msgstr "Analiz Günlüğü yok !"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1118,7 +1123,7 @@ msgstr ""
 "information about the account and its specificities."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1138,7 +1143,7 @@ msgstr "İhtilaflı"
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model:ir.ui.menu,name:account.journal_cash_move_lines
 msgid "Cash Registers"
-msgstr "Yazar Kasa"
+msgstr "Yazar Kasalar"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -1166,7 +1171,7 @@ msgstr "Denk olmayan Günlük Maddeleri"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Banka"
@@ -1179,7 +1184,7 @@ msgstr "Dönem Başı"
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr "Ekstreyi Onayla"
+msgstr "Hesapözetini Onayla"
 
 #. module: account
 #: help:account.account,foreign_balance:0
@@ -1188,7 +1193,7 @@ msgid ""
 "currency for this account."
 msgstr ""
 "Bu hesap için ikinci para biriminde yapılan işlemlerin Toplam tutarı (İkinci "
-"para biriminda)."
+"para biriminde)."
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1223,7 +1228,7 @@ msgstr ""
 #: 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 "Vergi Kodu Şablonu"
+msgstr "Vergi Kodu Şablonları"
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -1264,7 +1269,7 @@ msgid "The move of this entry line."
 msgstr "The move of this entry line."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1287,7 +1292,7 @@ msgid "Entry Label"
 msgstr "Giriş Etiketi"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "You can not modify/delete a journal with entries for this period !"
@@ -1341,7 +1346,7 @@ msgstr "Hesap"
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr "Included in base amount"
+msgstr "Matrah tutarına dahildir"
 
 #. module: account
 #: view:account.entries.report:0
@@ -1372,14 +1377,15 @@ msgid "Taxes"
 msgstr "Vergiler"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Başlangıç ve bitiş dönemi seçin"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "Kâr ve Zarar"
 
@@ -1431,9 +1437,10 @@ msgstr "Rapor Seçenekleri"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr "Yevmiye Maddeleri Analizi"
+msgstr "Günlük Maddeleri Analizi"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Paydaşlar"
@@ -1445,7 +1452,7 @@ msgstr "Paydaşlar"
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "Banka Ekstresi"
+msgstr "Banka Hesapözeti"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
@@ -1455,11 +1462,13 @@ msgstr "Alıcılar Hesabı"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr "Merkezi Yevmiye"
+msgstr "Merkezi Günlük"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1488,7 +1497,7 @@ msgstr "Madde Sayısı"
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
 msgid "Maximum write-off amount"
-msgstr "Silinecek en yüksek tutar"
+msgstr "Gider kaydedilecek en yüksek tutar"
 
 #. module: account
 #: view:account.invoice:0
@@ -1520,8 +1529,8 @@ msgid ""
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
 msgstr ""
-"Borç ya da alacak işlemi olmak üzere bir çok yevmiye kalemi içeren Yevmiye "
-"Girişidir. Her hesap belgesi için OpenERP bir tek Yevmiye girişi oluşturur."
+"Borç ya da alacak işlemi olmak üzere bir çok günlük kalemi içeren Günlük "
+"Girişidir. Her hesap belgesi için OpenERP bir tek günlük girişi oluşturur."
 
 #. module: account
 #: view:account.entries.report:0
@@ -1587,7 +1596,7 @@ msgstr "."
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "and Journals"
-msgstr "ve yevmiyeler"
+msgstr "ve Günlükler"
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -1608,7 +1617,7 @@ msgstr "Sonraki paydaşa geç"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr "Banka Ekstrelerini Ara"
+msgstr "Banka Hesapözeti Ara"
 
 #. module: account
 #: view:account.move.line:0
@@ -1631,7 +1640,7 @@ msgstr "Vergi İadesi Hesabı"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "Ekstre Kalemleri"
+msgstr "Hesapözeti öğeleri"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1643,11 +1652,11 @@ msgid ""
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
 msgstr ""
-"Banka hesap özeti, belirli bir tarih aralığında, bir mevduat hesabında, "
-"kredi kartı hesabında veya herhangi bir finansal hesapta yapılan mali "
-"işlemlerin özetidir. Açılış bakiyesi otomatik olarak belirir ve özette "
-"kapanış bakiyesi degörülmelidir. Bir satırda Ödeme kolonunda iken F1 basarak "
-"Uzlaşm Formunu açabilirsiniz."
+"Banka hesapözeti, belirli bir tarih aralığında, bir mevduat hesabında, kredi "
+"kartı hesabında veya herhangi bir finansal hesapta yapılan mali işlemlerin "
+"özetidir. Açılış bakiyesi otomatik olarak belirir ve özette kapanış bakiyesi "
+"degörülmelidir. Bir satırda Ödeme kolonunda iken F1 basarak Uzlaşma Formunu "
+"açabilirsiniz."
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -1690,9 +1699,10 @@ msgstr "Mali Yıl Sırası"
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr "Ayrılmış Yevmiye Sıraları"
+msgstr "Ayrılmış Günlük Sıraları"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Sorumlu"
@@ -1715,7 +1725,7 @@ msgstr "Faturalama"
 #: code:addons/account/report/account_partner_balance.py:115
 #, python-format
 msgid "Unknown Partner"
-msgstr "Bilinmeyen İş Ortağı"
+msgstr "Bilinmeyen Paydaş"
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -1723,7 +1733,7 @@ msgid "Year Sum"
 msgstr "Yıl Toplamı"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1732,7 +1742,7 @@ msgstr "ürünle uyumlu olmayan bir Ölçü Birimi seçtiniz."
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr "This wizard will change the currency of the invoice"
+msgstr "Bu sihirbaz faturanın para birimini değiştirecektir"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1741,9 +1751,9 @@ msgid ""
 "Have a complete tree view of all journal items per account code by clicking "
 "on an account."
 msgstr ""
-"Şirket Hesap Planı, her mali yıl için ve arama süzgeci dönemsel aramaya "
-"ayarlı olarak görünür. Bir hesaba tıklayarak o hesaba ait bütün yevmiye "
-"girişlerinin ağaç görünümü elde edilir."
+"Firma Hesap Planınızı her mali yıl için gösterir ve dönemsel aramaya göre "
+"süzer. Bir hesaba tıklayarak o hesaba ait bütün günlük girişlerinin ağaç "
+"görünümü elde edilir."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1753,7 +1763,7 @@ msgstr "Bekleyen Hesaplar"
 #. module: account
 #: view:account.tax.template:0
 msgid "Tax Declaration"
-msgstr "Tax Declaration"
+msgstr "Vergi Bildirimi"
 
 #. module: account
 #: help:account.journal.period,active:0
@@ -1761,7 +1771,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
-"'Aktif' seçeneği işaretli değilse bu, yevmiye dönemini silmeden gizlemenize "
+"'Etkin' seçeneği işaretli değilse bu, günlük dönemini silmeden gizlemenize "
 "izin verir."
 
 #. module: account
@@ -1782,7 +1792,7 @@ msgstr "Account Common Journal Report"
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr "All Partners"
+msgstr "Bütün Paydaşlar"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -1801,10 +1811,10 @@ msgid "Customer Ref:"
 msgstr "Customer Ref:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr "%s kullanıcısının %s yevmiyesine erişim hakkı bulunmuyor !"
+msgstr "%s kullanıcısının %s günlüğüne erişim hakkı bulunmuyor !"
 
 #. module: account
 #: help:account.period,special:0
@@ -1814,17 +1824,17 @@ msgstr "These periods can overlap."
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr "Taslak Ekstre"
+msgstr "Taslak hesapözeti"
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Credit Notes"
-msgstr "Tax Declaration: Credit Notes"
+msgstr "Vergi Bildirimi: Alacak Dekontları"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
-msgstr "Credit amount"
+msgstr "Alacak tutarı"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -1864,7 +1874,7 @@ msgstr "Entries By Line"
 #. module: account
 #: field:account.vat.declaration,based_on:0
 msgid "Based on"
-msgstr "Temel alınan:"
+msgstr "Temel alınan"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -1875,7 +1885,7 @@ msgstr "Journal Entry"
 #. module: account
 #: view:account.tax:0
 msgid "Tax Declaration: Invoices"
-msgstr "Tax Declaration: Invoices"
+msgstr "Vergi Bildirimi: Faturalar"
 
 #. module: account
 #: field:account.cashbox.line,subtotal:0
@@ -1894,7 +1904,7 @@ msgstr "Maliye İncelemesi"
 #. module: account
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Hata! İç içe tekrarlayan şirketler seçemezsiniz."
+msgstr "Hata! Yinelenen firmalar oluşturamazsınız."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
@@ -1954,7 +1964,7 @@ msgstr "Hesapların ve ödeme girişlerinin karşılaştırılması"
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Definition"
-msgstr "Tax Definition"
+msgstr "Vergi Tanımı"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -1971,9 +1981,7 @@ msgstr ""
 msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
-msgstr ""
-"It adds the currency column if the currency is different then the company "
-"currency"
+msgstr "Eğer para birimi firmanınkinden farklıysa para birimi sütunu ekler"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -2016,7 +2024,7 @@ msgstr "Mali raporları kolaylıkla çizmek için bir genel sistem oluşturur."
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr "Untaxed Amount"
+msgstr "Vergisiz Tutar"
 
 #. module: account
 #: help:account.tax,active:0
@@ -2069,7 +2077,7 @@ msgstr "Fiscalyear"
 #: view:account.journal.select:0
 #: view:project.account.analytic.line:0
 msgid "Open Entries"
-msgstr "Open Entries"
+msgstr "Açık Girişler"
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
@@ -2079,7 +2087,7 @@ msgstr "Accounts to Reconcile"
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr "Import of the statement in the system from an electronic file"
+msgstr "Bir elektronik dosyadan sisteme hesapözeti aktarımı"
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
@@ -2108,7 +2116,7 @@ msgstr "This F.Year"
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr "Account tax charts"
+msgstr "Vergi hesap tabloları"
 
 #. module: account
 #: constraint:account.period:0
@@ -2134,13 +2142,13 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
 msgstr ""
-"Yevmiyede \"%s\" \n"
+"\"%s\" günlüğünde\n"
 "Varsayılan borç hesabı tanımlanmamış"
 
 #. module: account
@@ -2153,11 +2161,10 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for depreciated "
 "accounts."
 msgstr ""
-"This type is used to differentiate types with special effects in OpenERP: "
-"view can not have entries, consolidation are accounts that can have children "
-"accounts for multi-company consolidations, payable/receivable are for "
-"partners accounts (for debit/credit computations), closed for depreciated "
-"accounts."
+"Bu tip OpenERP de özel efektler ile türleri ayırt etmek için kullanılır: "
+"görünümde girişler yapılamaz, birleştirmeler çok-firmalı birleştirmeler için "
+"alt hesapları olan hesaplardır, ödenecek/alınacak paydaş hesapları içindir "
+"(borç/alacak hesaplamaları), amortismana tabi hesaplar için kapalıdır"
 
 #. module: account
 #: view:account.chart.template:0
@@ -2165,7 +2172,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Search Chart of Account Templates"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2219,10 +2226,10 @@ msgstr ""
 #: field:analytic.entries.report,name:0
 #: field:report.invoice.created,name:0
 msgid "Description"
-msgstr "Description"
+msgstr "Açıklama"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2241,10 +2248,10 @@ msgid "Income Account"
 msgstr "Income Account"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr "Tanımlanan Satış/Satınalma tipli Muhasebe yevmiyesi yoktur!"
+msgstr "Tanımlanan Satış/Satınalma tipli Muhasebe Günlüğü yoktur!"
 
 #. module: account
 #: constraint:res.partner.bank:0
@@ -2281,6 +2288,7 @@ msgstr "Ürün Şablonu"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2290,6 +2298,7 @@ msgstr "Ürün Şablonu"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2332,7 +2341,7 @@ msgstr "Fiscal Year"
 #: help:accounting.report,fiscalyear_id:0
 #: help:accounting.report,fiscalyear_id_cmp:0
 msgid "Keep empty for all open fiscal year"
-msgstr "Keep empty for all open fiscal year"
+msgstr "Bütün mali yıllar boş bırakın"
 
 #. module: account
 #: field:account.invoice.report,account_line_id:0
@@ -2340,13 +2349,13 @@ msgid "Account Line"
 msgstr "Hesap Satırı"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
 msgstr ""
-"\"%s\" Yevmiyesinde tanımlı bir varsayılan \n"
+"\"%s\" günlüğünde tanımlı bir varsayılan \n"
 "alacak hesabı yok"
 
 #. module: account
@@ -2376,13 +2385,13 @@ msgid "Main Sequence"
 msgstr "Ana Sıra No"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
 msgstr ""
-"Bir banka hesap özetini silmek için, günlük maddelerinin silmek için onu "
+"Bir banka hesapözetini silmek için, günlük maddelerinin silmek için onu "
 "iptal etmelisiniz."
 
 #. module: account
@@ -2401,7 +2410,7 @@ msgstr "Ödeme Vadesi"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Positions"
-msgstr "Fiscal Positions"
+msgstr "Mali Durumlar"
 
 #. module: account
 #: constraint:account.account:0
@@ -2432,18 +2441,18 @@ msgstr "Filters"
 #: selection:report.invoice.created,state:0
 #, python-format
 msgid "Open"
-msgstr "Open"
+msgstr "Açık"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr "Draft state of an invoice"
+msgstr "Faturanın taslak durumu"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr "Partner Reconciliation"
+msgstr "Paydaş Uzlaşması"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2452,7 +2461,7 @@ msgid "Account Tax Code"
 msgstr "Account Tax Code"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2460,10 +2469,10 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
-"Bu firma için %s tipindehesap yevmiyesi bulunamadı\n"
+"Bu firma için %s tipinde hesap günlüğü bulunamadı\n"
 "\n"
 "Menüde bir tane oluşturabilirsiniz \n"
-"Konfigürason\\Mali Hesap\\Hesaplar\\evmiyeler."
+"Konfigürason\\Mali Hesap\\Hesaplar\\Günlükler."
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_advance
@@ -2493,7 +2502,7 @@ msgstr "Gives the sequence order when displaying a list of invoice tax."
 #: field:account.tax.template,base_sign:0
 #: field:account.tax.template,ref_base_sign:0
 msgid "Base Code Sign"
-msgstr "Ana yasal kod"
+msgstr "Temel Kod İşareti"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2542,7 +2551,7 @@ msgid "Account Model Entries"
 msgstr "Model muhabebe kayıtları"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2566,10 +2575,10 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
-"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."
+"Eğer ödeme koşulları kullanırsanız, vade tarihi muhasebe girişlerinin "
+"oluşturulması sırasında otomatik olarak hesaplanacaktır. Ödeme koşulu ve "
+"vade tarihini boş bırakırsanız, bu peşin ödeme demektir. Ödeme koşulu "
+"çeşitli vade tarihleri hesaplayabilir, örneğin %50 peşin, %50 bir ayda."
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -2579,7 +2588,7 @@ msgstr "Select period"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr "Statements"
+msgstr "Hesapözetleri"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -2592,14 +2601,13 @@ msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
 msgstr ""
-"The fiscal position will determine taxes and the accounts used for the "
-"partner."
+"Mali durum vergileri ve paydaşlar için kullanılan hesapları belirleyecektir."
 
 #. module: account
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
-msgstr "Bu rapor, belirli bir yevmiyenin durumuna gözatmanızı sağlar."
+msgstr "Bu rapor, belirli bir günlüğün durumuna gözatmanızı sağlar."
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
@@ -2607,12 +2615,11 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "Hesap hareket satırı uzlaşması (silme)"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr "Tax"
+msgstr "Vergi"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2639,7 +2646,7 @@ msgid "Accounts"
 msgstr "Accounts"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Configuration Error!"
@@ -2716,7 +2723,7 @@ msgstr "Ödendi/Mütabık"
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr "Refund Base Code"
+msgstr "İade Temel Kodu"
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -2761,9 +2768,10 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr "Aged Partner Balance"
+msgstr "Yaşlandırılmış Paydaş Bakiyesi"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
@@ -2779,7 +2787,7 @@ msgstr "İletişim Türü"
 #. module: account
 #: field:account.invoice.line,discount:0
 msgid "Discount (%)"
-msgstr "İskonto (%)"
+msgstr "İndirim (%)"
 
 #. module: account
 #: help:account.journal,entry_posted:0
@@ -2813,14 +2821,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "Bu sihirbaz yinelenen muhasebe girişleri oluşturu"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "No sequence defined on the journal !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2890,8 +2898,8 @@ msgid ""
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very useful for some reports."
 msgstr ""
-"The optional quantity expressed by this line, eg: number of product sold. "
-"The quantity is not a legal requirement but is very useful for some reports."
+"Bu satırda belirtilen seçmeli miktar, ör: satılan ürün sayısı. Miktar "
+"zorunlu bir gereksinim değildir ama bazı raporlar için çok kullanışlıdır."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -2920,15 +2928,16 @@ msgstr "Keep empty to use the period of the validation(invoice) date."
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
 msgstr ""
-"Uzlaşma özeti alanında kullanılmıştır, başka bir yerde kullanılmamalıdır."
+"Uzlaşma hesapözeti alanında kullanılmıştır, başka bir yerde "
+"kullanılmamalıdır."
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
 msgid "Base Code Amount"
-msgstr "Base Code Amount"
+msgstr "Matrah Kodu Tutarı"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2943,7 +2952,7 @@ msgid "Default Sale Tax"
 msgstr "Varsayılan Satış Vergisi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Fatura '%s' onaylandı."
@@ -2955,9 +2964,9 @@ msgid ""
 "between the creation date or the creation date of the entries plus the "
 "partner payment terms."
 msgstr ""
-"The maturity date of the generated entries for this model. You can choose "
-"between the creation date or the creation date of the entries plus the "
-"partner payment terms."
+"Bu model için oluşturulan kayıtların vade tarihi. Sen oluşturulma tarihi "
+"veya girişlerin oluşturulma tarihi artı paydaş ödeme koşulları arasında "
+"seçim yapabilirsiniz."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -2981,10 +2990,10 @@ msgstr "Profit And Loss"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr "Fiscal Position"
+msgstr "Mali Durum"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2996,7 +3005,7 @@ msgstr ""
 #. module: account
 #: field:account.partner.ledger,page_split:0
 msgid "One Partner Per Page"
-msgstr "One Partner Per Page"
+msgstr "Her Sayfada bir Paydaş"
 
 #. module: account
 #: field:account.account,child_parent_ids:0
@@ -3018,8 +3027,8 @@ msgid ""
 "Set if the amount of tax must be included in the base amount before "
 "computing the next taxes."
 msgstr ""
-"Set if the amount of tax must be included in the base amount before "
-"computing the next taxes."
+"Sonraki vergileri hesaplamadan önce vergi tutarının matrah tutarına dahil "
+"edilip edilmeyeceğini ayarlayın."
 
 #. module: account
 #: help:account.journal,user_id:0
@@ -3034,7 +3043,7 @@ msgstr "Search Period"
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr "Invoice Currency"
+msgstr "Fatura Para Birimi"
 
 #. module: account
 #: field:accounting.report,account_report_id:0
@@ -3050,7 +3059,7 @@ msgstr "Vadeler"
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Cash Transaction"
-msgstr "Cash Transaction"
+msgstr "Kasa İşlemi"
 
 #. module: account
 #: view:res.partner:0
@@ -3112,7 +3121,7 @@ msgstr "Ay-1"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total Quantity"
-msgstr "Total Quantity"
+msgstr "Toplam Miktar"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
@@ -3140,7 +3149,7 @@ msgid "View"
 msgstr "Görünüm"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3179,7 +3188,7 @@ msgstr "Starts on"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr "Account Partner Ledger"
+msgstr "Paydaş Hesabı Defteri"
 
 #. module: account
 #: help:account.journal.column,sequence:0
@@ -3191,7 +3200,8 @@ msgstr "Gives the sequence order to journal column."
 #: help:account.account.template,currency_id:0
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
-msgstr "Forces all moves for this account to have this secondary currency."
+msgstr ""
+"Bu hesap için bütün hareketlerin ikincil para birimi olmasına zorlar."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -3199,8 +3209,8 @@ msgid ""
 "This wizard will validate all journal entries of a particular journal and "
 "period. Once journal entries are validated, you can not update them anymore."
 msgstr ""
-"Sihirbaz belirli yevmiye ve dönelere ait yevmiye girişlerinin hepsini "
-"doğrulayacaktır. Yevmiye girişleri doğrulandıktan sonra bir daha onları "
+"Sihirbaz belirli günlük ve dönemlere ait günlük girişlerinin hepsini "
+"doğrulayacaktır. Günlük girişleri doğrulandıktan sonra bir daha onları "
 "güncelleyemezsiniz."
 
 #. module: account
@@ -3256,7 +3266,7 @@ msgstr ""
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
 #, python-format
 msgid "No End of year journal defined for the fiscal year"
-msgstr "Mali yıl için yol sonu yevmiyesi tanımlanmamış"
+msgstr "Mali yıl için yol sonu günlüğü tanımlanmamış"
 
 #. module: account
 #: view:account.tax:0
@@ -3296,12 +3306,12 @@ msgstr "Masraf hesabında kullanmak için boş bırak"
 #: model:ir.ui.menu,name:account.menu_journals
 #: model:ir.ui.menu,name:account.menu_journals_report
 msgid "Journals"
-msgstr "Journals"
+msgstr "Günlükler"
 
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr "Remaining Partners"
+msgstr "Kalan Paydaşlar"
 
 #. module: account
 #: view:account.subscription:0
@@ -3344,10 +3354,10 @@ msgid "Starting Balance"
 msgstr "Açılış Bakiyesi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
-msgstr "No Partner Defined !"
+msgstr "Tanımlı Paydaş Yok !"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_close
@@ -3377,8 +3387,8 @@ msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
 msgstr ""
-"The amount expressed in the related account currency if not equal to the "
-"company one."
+"Para birimi firmanınkine eşit değilse ilgili hesap para birimi tutarı "
+"ifadesi."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -3400,7 +3410,7 @@ msgid "Chart of Tax"
 msgstr "Vergi Tablosu"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "Kapanış bilançosu hesaplanan bilanço ile aynı olmalı!"
@@ -3433,7 +3443,7 @@ msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
 msgstr ""
-"Seçilen bütün yevmiye girişleri doğrulanacak ve işlenecektir. Bu da; hesap "
+"Seçilen bütün günlük girişleri doğrulanacak ve işlenecektir. Bu da; hesap "
 "alanlarında bir daha değişiklik yapamayacağınız anlamına gelir."
 
 #. module: account
@@ -3449,7 +3459,7 @@ msgstr "Account charts"
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr "Tax Amount"
+msgstr "Vergi Tutarı"
 
 #. module: account
 #: view:account.move:0
@@ -3485,6 +3495,7 @@ msgstr "Miktar:"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "Dönem Süresi (gün)"
 
@@ -3496,7 +3507,7 @@ msgstr "Satış/Satınalma günlüğü yazdır"
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice State"
-msgstr "Invoice State"
+msgstr "Fatura Durumu"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -3523,7 +3534,7 @@ msgstr "Uzlaştırılmamış günlük maddeleri"
 #. module: account
 #: sql_constraint:res.currency:0
 msgid "The currency code must be unique per company!"
-msgstr "Döviz kodu her şirket için tekil olmalı!"
+msgstr "Döviz kodu her firma için benzersiz olmalı!"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3531,7 +3542,7 @@ msgid "Detail"
 msgstr "Detay"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3550,9 +3561,16 @@ msgid "VAT :"
 msgstr "VAT :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3565,7 +3583,7 @@ msgstr "Chart of Accounts"
 #. module: account
 #: view:account.tax.chart:0
 msgid "(If you do not select period it will take all open periods)"
-msgstr "(If you do not select period it will take all open periods)"
+msgstr "(dönem seçmezseniz bütün açık dönemleri alacaktır)"
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -3573,7 +3591,7 @@ msgid "Centralised counterpart"
 msgstr "Merkezileştirme Karşılığı"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr "%s%s \"görünüm\" hesabında günlük maddesi oluşturmazsınız"
@@ -3581,7 +3599,7 @@ msgstr "%s%s \"görünüm\" hesabında günlük maddesi oluşturmazsınız"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr "Reconcilation Process partner by partner"
+msgstr "Paydaş paydaş Uzlaşma İşlemi"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3591,14 +3609,14 @@ msgstr "2"
 #. module: account
 #: view:account.chart:0
 msgid "(If you do not select Fiscal year it will take all open fiscal years)"
-msgstr ""
-"(If you do not select Fiscal year it will take all open fiscal years)"
+msgstr "Mali yıl seçmezseniz bütün açık mali yılları alacaktır)"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3626,10 +3644,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Date"
 
@@ -3646,7 +3671,6 @@ msgstr "Unreconcile"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3660,18 +3684,18 @@ msgid "Chart of Accounts Template"
 msgstr "Hesap Planı Kartları Şablonu"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
-"'%s' Modele ait '%s' model kalemince oluşturulan vade tarihi paydaş ödeme "
+"'%s' Modele ait '%s' model öğesince oluşturulan vade tarihi paydaş ödeme "
 "koşulu baz alınarak oluşturulur. Lütfen hangi paydaş olduğunu belirtiniz."
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Some entries are already reconciled !"
@@ -3702,6 +3726,8 @@ msgstr "Budgets"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "No Filters"
 
@@ -3778,7 +3804,7 @@ msgstr "Hesap bakiyesi"
 #: report:account.invoice:0
 #: field:account.invoice.line,price_unit:0
 msgid "Unit Price"
-msgstr "Unit Price"
+msgstr "Birim Fiyat"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
@@ -3786,7 +3812,7 @@ msgid "Analytic Items"
 msgstr "Çözümsel Kalemler"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Unable to change tax !"
@@ -3804,7 +3830,7 @@ msgstr "Bir iade taslağı oluştur"
 #. module: account
 #: view:account.state.open:0
 msgid "Open Invoice"
-msgstr "Open Invoice"
+msgstr "Fatura Aç"
 
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
@@ -3817,7 +3843,7 @@ msgid "Mapping"
 msgstr "Mapping"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3833,6 +3859,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3846,7 +3873,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Account Aged Trial balance Report"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "Bir kapalı %s%s hesabında günlük maddeleri oluşturmazsınız"
@@ -3949,7 +3976,7 @@ msgid ""
 "counterpart."
 msgstr ""
 "Burada en iyi yöntem, bütün mali yılların açılış girişlerini kapsayan "
-"yevmiyeleri kullanmaktır. Merkezi karşı hesaplı ve tipi \"durum\" olan "
+"günlükleri kullanmaktır. Merkezi karşı hesaplı ve tipi \"durum\" olan "
 "varsayılan alacak/borç hesaplarıyla tanımlamaya dikkat edin."
 
 #. module: account
@@ -4183,7 +4210,7 @@ msgid "Month"
 msgstr "Ay"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4244,7 +4271,7 @@ msgid "Account Base Code"
 msgstr "Hesap Ana Kodu"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "Bu ürün için gider hesabı tanımlanmamıştır: \"%s\" (id:%d)"
@@ -4287,7 +4314,7 @@ msgstr "Tüm İşlenmiş Girişler"
 #: code:addons/account/account_bank_statement.py:367
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr "%s ekstresi onaylanmış, yevmiye kalemleri oluşturulmuştur."
+msgstr "%s hesapözeti onaylanmış, günlük kalemleri oluşturulmuştur."
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -4342,7 +4369,7 @@ msgstr "Görünüş Modu"
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr "Fatura yada ödeme ekstresi"
+msgstr "Fatura yada ödeme hesapözeti"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
@@ -4378,7 +4405,7 @@ msgstr "KUR DÖNÜSÜM"
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr "Bank statements are entered in the system."
+msgstr "Banka hesapözetleri sisteme girilmiştir."
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:133
@@ -4458,7 +4485,7 @@ msgid "Allow Reconciliation"
 msgstr "Allow Reconciliation"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4473,7 +4500,7 @@ msgstr "Analiz Hesabı İstatistiği"
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Based On"
-msgstr "Based On"
+msgstr "Temelli"
 
 #. module: account
 #: field:account.tax,price_include:0
@@ -4493,7 +4520,7 @@ msgid "Recurring Models"
 msgstr "Recurring Models"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "Şifreleme hatası"
@@ -4505,6 +4532,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Change"
 
@@ -4521,7 +4549,7 @@ msgstr "Tip Kontrolleri"
 #. module: account
 #: help:account.journal,default_credit_account_id:0
 msgid "It acts as a default account for credit amount"
-msgstr "It acts as a default account for credit amount"
+msgstr "Alacak tutarı için varsayılan hesap olarak davranır"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4541,7 +4569,7 @@ msgstr "İptal Edildi"
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
 msgid "Closing balance based on cashBox"
-msgstr "Closing balance based on cashBox"
+msgstr "Kasaya göre kapanış bakiyesi"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -4549,7 +4577,7 @@ msgid "Example"
 msgstr "Örnek"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4565,7 +4593,7 @@ msgid "Keep empty to use the income account"
 msgstr "Keep empty to use the income account"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "Satınalma Vergisi %.2f%%"
@@ -4593,7 +4621,7 @@ msgstr "Hesap Eşlemesi"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Müşteri"
@@ -4609,7 +4637,7 @@ msgid "Cancelled Invoice"
 msgstr "Cancelled Invoice"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4646,8 +4674,8 @@ msgid ""
 "All draft account entries in this journal and period will be validated. It "
 "means you won't be able to modify their accounting fields anymore."
 msgstr ""
-"Bu yevmiyeye ve döneme ait bütün taslak hesap girişleri doğrulanacaktır. Bu "
-"da hesap alanlarını değiştiremeyeceğiniz anlamına gelir."
+"Bu günlüğe ve döneme ait bütün taslak hesap girişleri doğrulanacaktır. Bu da "
+"hesap alanlarını değiştiremeyeceğiniz anlamına gelir."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
@@ -4665,7 +4693,7 @@ msgid "Income Account on Product Template"
 msgstr "Ürün Şablonu Gelen Hes."
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "ÇEŞİTLİ"
@@ -4690,11 +4718,13 @@ msgstr "New Fiscal Year"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Faturalar"
 
@@ -4771,7 +4801,7 @@ msgstr "Are you sure?"
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr "The bank statement used for bank reconciliation"
+msgstr "Banka uzlaşması için kullanılan banka hesapözeti"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
@@ -4836,26 +4866,24 @@ msgid "Journal Items"
 msgstr "Journal Items"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Error"
@@ -4880,7 +4908,7 @@ msgid ""
 "This report is analysis by partner. It is a PDF report containing one line "
 "per partner representing the cumulative credit balance."
 msgstr ""
-"Bu rapor ortak tarafından analiz edilmiştir. Her satırda bir paydaş (ortak) "
+"Bu rapor paydaş tarafından incelenmiştir. Her satırda bir paydaş (ortak) "
 "için kümülatif kredi bakiyesi içeren bir PDF raporudur."
 
 #. module: account
@@ -4965,7 +4993,7 @@ msgid "Beginning of Period Date"
 msgstr "Dönem Tarihinin başlangıcı"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4992,7 +5020,7 @@ msgid "Child Tax Accounts"
 msgstr "Child Tax Accounts"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Start period should be smaller then End period"
@@ -5015,6 +5043,7 @@ msgstr "Analytic Balance -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -5058,6 +5087,8 @@ msgstr "Dönem Tipi"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Ödemeler"
 
@@ -5109,7 +5140,7 @@ msgstr "Kolon Adı"
 #: view:account.general.journal:0
 msgid ""
 "This report gives you an overview of the situation of your general journals"
-msgstr "Bu rapor, genel yevmiyelerinizin durumuna göatmanızı sağlar."
+msgstr "Bu rapor, genel günlüklerinizin durumuna göatmanızı sağlar."
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -5125,7 +5156,7 @@ msgstr "Year"
 #. module: account
 #: field:account.bank.statement,starting_details_ids:0
 msgid "Opening Cashbox"
-msgstr "Opening Cashbox"
+msgstr "Kasa Açılışı"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5133,7 +5164,7 @@ msgid "Line 1:"
 msgstr "Line 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integrity Error !"
@@ -5151,7 +5182,7 @@ msgstr "ay"
 #. module: account
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr "Next Partner to Reconcile"
+msgstr "Uzlaşılacak Sonraki Paydaş"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -5166,6 +5197,7 @@ msgstr "Reconciliation Result"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Balance Sheet"
@@ -5174,7 +5206,7 @@ msgstr "Balance Sheet"
 #: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
-msgstr "Genel Yevmiyeler"
+msgstr "Genel Günlükler"
 
 #. module: account
 #: field:account.journal,allow_date:0
@@ -5242,10 +5274,11 @@ msgstr "Rapor"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
-msgstr "Amount"
+msgstr "Tutar"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_customerinvoice0
@@ -5266,7 +5299,7 @@ msgstr "Çocuk vergisi"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr "Template Tax Fiscal Position"
+msgstr "Vergi Mali Durum Şablonu"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -5286,7 +5319,7 @@ msgstr "Süre sonu geçmiş Analiz Hesapları"
 #. module: account
 #: report:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr "(Account/Partner) Name"
+msgstr "(Hesap/Paydaş) Adı"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5328,7 +5361,7 @@ msgstr "account.installer"
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr "Include in Base Amount"
+msgstr "Matrah Tutarına Dahildir"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5336,13 +5369,13 @@ 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 ""
-"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."
+"Ayın gününn hesaplanmasından önce eklenecek gün sayısı. Eğer Tarih=15/01 "
+"ise, Gün Sayısı=22, Ayın Günü=-1, vade tarihi ise 28/02 dir."
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Amount Computation"
-msgstr "Amount Computation"
+msgstr "Tutar Hesaplaması"
 
 #. module: account
 #: view:account.journal:0
@@ -5371,7 +5404,6 @@ msgstr "Account Common Account Report"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "İletişim"
 
@@ -5421,16 +5453,16 @@ msgstr "  Gün Sayısı: 14"
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr "Yevmiye Kayıt Yılı Bitişi"
+msgstr "Yıl Sonu Girişleri Günlüğü"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5448,9 +5480,9 @@ msgid ""
 "something to reconcile or not. This figure already count the current partner "
 "as reconciled."
 msgstr ""
-"This is the remaining partners for who you should check if there is "
-"something to reconcile or not. This figure already count the current partner "
-"as reconciled."
+"Bu uzlaştırılacak veya uzlaştırılmayacak bir şey olup olmadığı kontrol "
+"edilecek kalan paydaşlardır. Bu geçerli paydaşı zaten uzlaşılmış olarak "
+"sayar."
 
 #. module: account
 #: view:account.subscription.line:0
@@ -5476,7 +5508,7 @@ msgstr "Unposted"
 #: model:ir.actions.act_window,name:account.action_account_change_currency
 #: model:ir.model,name:account.model_account_change_currency
 msgid "Change Currency"
-msgstr "Change Currency"
+msgstr "Para Birimi Değiştir"
 
 #. module: account
 #: view:account.invoice:0
@@ -5507,12 +5539,11 @@ msgid "Customer Invoices And Refunds"
 msgstr "Müşteri Faturaları ve İadeleri"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "Amount Currency"
+msgstr "Para Birimi Tutarı"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:39
@@ -5542,7 +5573,7 @@ msgstr "Lines to reconcile"
 #: field:report.account.sales,quantity:0
 #: field:report.account_type.sales,quantity:0
 msgid "Quantity"
-msgstr "Quantity"
+msgstr "Miktar"
 
 #. module: account
 #: view:account.move.line:0
@@ -5586,14 +5617,14 @@ msgstr ""
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr "Fiscal Position Template"
+msgstr "Mali Durum Şablonu"
 
 #. module: account
 #: view:account.analytic.chart:0
 #: view:account.chart:0
 #: view:account.tax.chart:0
 msgid "Open Charts"
-msgstr "Open Charts"
+msgstr "Tablo Aç"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -5615,12 +5646,12 @@ msgstr ""
 #: field:account.print.journal,amount_currency:0
 #: field:account.report.general.ledger,amount_currency:0
 msgid "With Currency"
-msgstr "With Currency"
+msgstr "Bu Para Birimi ile"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Open CashBox"
-msgstr "Open CashBox"
+msgstr "Kasayı Aç"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -5678,10 +5709,10 @@ msgstr "Move journal"
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Opening Entries"
-msgstr "Generate Opening Entries"
+msgstr "Açılşı Girişleri Oluştur"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Already Reconciled!"
@@ -5714,14 +5745,14 @@ msgid "Child Accounts"
 msgstr "Child Accounts"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "Adı (id) taşı : %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Write-Off"
@@ -5741,7 +5772,7 @@ msgstr "Income"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Tedarikçi"
@@ -5771,7 +5802,7 @@ msgid "Account n°"
 msgstr "Account n°"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Serbest Kaynak"
@@ -5786,7 +5817,9 @@ msgstr "Valuation"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Receivable and Payable Accounts"
@@ -5800,7 +5833,7 @@ msgstr "Fiscal Mapping"
 #: model:ir.actions.act_window,name:account.action_account_state_open
 #: model:ir.model,name:account.model_account_state_open
 msgid "Account State Open"
-msgstr "Account State Open"
+msgstr "Hesap Durumu Açık"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -5845,8 +5878,9 @@ msgid ""
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
 msgstr ""
-"Shows you the progress made today on the reconciliation process. Given by \n"
-"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
+"Uzlaşma işlemi üzerinde bugün yapılan gelişmeyi gösterir. Tarafından "
+"verilen\n"
+"Bugünkü Paydaş Uzlaşmaları \\ (Kalan Paydaşlar+ Bugün Uzlaşılan Paydaşlar)"
 
 #. module: account
 #: help:account.payment.term.line,value:0
@@ -5855,9 +5889,9 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be threated."
 msgstr ""
-"Select here the kind of valuation related to this payment term line. Note "
-"that you should have your last line with the type 'Balance' to ensure that "
-"the whole amount will be threated."
+"Brada bu ödeme koşulu öğesiyle ilintili doğrulama türünü seçin. Tüm tutarın "
+"ele alınmasından emin olmak için son öğenin 'Bakiye' türünde olması "
+"gerektiğini unutmayın."
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -5865,7 +5899,7 @@ msgstr ""
 #: field:report.account.sales,period_id:0
 #: field:report.account_type.sales,period_id:0
 msgid "Force Period"
-msgstr "Force Period"
+msgstr "Dönemi Zorla"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5893,7 +5927,7 @@ msgid "Filter by"
 msgstr "Filter by"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "Modelinizde hatalı deyim \"%(...)s\" !"
@@ -5904,8 +5938,8 @@ msgid "Entry Date"
 msgstr "Kayıt Tarihi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "You can not use an inactive account!"
@@ -5946,8 +5980,8 @@ msgid "Number of Days"
 msgstr "Gün Sayısı"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -6001,15 +6035,15 @@ msgstr "Dış Bilanço"
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr "Yevmiye-Dönem Adı"
+msgstr "Günlük-Dönem Adı"
 
 #. module: account
 #: field:account.invoice.tax,factor_base:0
 msgid "Multipication factor for Base code"
-msgstr "Multipication factor for Base code"
+msgstr "Matrah Kodu çarpan faktörü"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "not implemented"
@@ -6037,7 +6071,7 @@ msgstr "Abonelik Sürüyor"
 #. module: account
 #: report:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr "Fiscal Position Remark :"
+msgstr "Mali Durum Açıklaması :"
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -6048,6 +6082,8 @@ msgstr "Analytic Entries Analysis"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Past"
 
@@ -6187,7 +6223,7 @@ msgstr ""
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Statement"
-msgstr "Tax Statement"
+msgstr "Vergi Hesapözeti"
 
 #. module: account
 #: model:ir.model,name:account.model_res_company
@@ -6297,7 +6333,7 @@ msgstr "Alacak"
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr "İlişkili hesap ve dönem için aynı şirket olmalı."
+msgstr "İlişkili hesap ve dönem için firma aynı olmalı."
 
 #. module: account
 #: view:account.invoice:0
@@ -6312,7 +6348,7 @@ msgstr "Varsayılan Alacak Hesabı"
 #. module: account
 #: help:account.analytic.line,currency_id:0
 msgid "The related account currency if not equal to the company one."
-msgstr "The related account currency if not equal to the company one."
+msgstr "İlgili hesap para birimi firmanınkine eşit değilse."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -6322,7 +6358,7 @@ msgstr "Current"
 #. module: account
 #: view:account.bank.statement:0
 msgid "CashBox"
-msgstr "CashBox"
+msgstr "Kasa"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_equity
@@ -6336,8 +6372,10 @@ msgstr "Percentage"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
-msgstr "Journal & Partner"
+msgstr "Günlük & Paydaş"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
@@ -6345,7 +6383,7 @@ msgid "Power"
 msgstr "Power"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "Kullanılmayan bir günlük kodu oluşturulamaz."
@@ -6367,13 +6405,13 @@ msgid ""
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
-"Indicates if the amount of tax must be included in the base amount for the "
-"computation of the next taxes"
+"Sonraki vergilerin hesaplanmasında vergi tutarının matrah tutarına eklenip "
+"eklenmeyeceğini beliritr"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
 msgid "Reconciliation: Go to Next Partner"
-msgstr "Reconciliation: Go to Next Partner"
+msgstr "Uzlaşma: Sonraki Paydaşa Git"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
@@ -6387,6 +6425,7 @@ msgid "Applicable Type"
 msgstr "Applicable Type"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Fatura Referansı"
@@ -6429,7 +6468,7 @@ msgstr ""
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
 msgid "Bank and Cash"
-msgstr "Bank and Cash"
+msgstr "Banka ve Kasa"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_analytic_entries_report
@@ -6443,7 +6482,7 @@ msgstr "Bu görünümde,"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr "Yevmiye adı her firmada benzersiz olmalı."
+msgstr "Günlük adı her firmada eşsiz olmalı."
 
 #. module: account
 #: field:account.account.template,nocreate:0
@@ -6550,7 +6589,7 @@ msgstr "account.sequence.fiscalyear"
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "Analytic Journal"
-msgstr "Analytic Journal"
+msgstr "Analiz Günlüğü"
 
 #. module: account
 #: code:addons/account/account.py:622
@@ -6567,7 +6606,7 @@ msgstr "Reconciled"
 #: report:account.invoice:0
 #: field:account.invoice.tax,base:0
 msgid "Base"
-msgstr "Base"
+msgstr "Matrah"
 
 #. module: account
 #: field:account.model,name:0
@@ -6582,7 +6621,7 @@ msgstr "Gider Kategori Hes."
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cash Transactions"
-msgstr "Cash Transactions"
+msgstr "Kasa İşlemleri"
 
 #. module: account
 #: code:addons/account/wizard/account_state_open.py:37
@@ -6615,8 +6654,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "Günlük maddeleri içeren bir hesabı kaldıramazsınız."
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Entries: "
@@ -6624,8 +6663,7 @@ msgstr "Entries: "
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr ""
-"Seçilen bir yevmiyede manuel olarak yinelen girişler yaratabilirsiniz."
+msgstr "Seçilen bir günlükte elle yinelen girişler yaratabilirsiniz."
 
 #. module: account
 #: help:res.partner.bank,currency_id:0
@@ -6633,7 +6671,7 @@ msgid "Currency of the related account journal."
 msgstr "İlgili hesap günlüğü Para  Birimi."
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Couldn't create move between different companies"
@@ -6649,7 +6687,7 @@ msgid ""
 "account. From this view, you can create and manage the account types you "
 "need for your company."
 msgstr ""
-"Hesap türü, bir hesabın her yevmiyede nasıl kullanıldığını belirlemek için "
+"Hesap türü, bir hesabın her günlükte nasıl kullanıldığını belirlemek için "
 "kullanılır. Bir hesap türüne ait erteleme metodu, yılsonu hesap kapatma "
 "işlemini belirler. Bilanço ve kar zarar raporu gibi raporlar, kategoriyi "
 "(kar/zarar veya bilanço) kullanır. Örneğin, hesap türü aktif hesaba, gider "
@@ -6670,23 +6708,23 @@ msgid ""
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
 msgstr ""
-"Banka uzlaşması, banka hesap özetinin muhasebe sisteminizdeki girişlerle  "
-"(ya da kayıtlarla) uyuşmasının doğrulanmasıdır."
+"Banka uzlaşması, banka hesapözetinin muhasebe sisteminizdeki girişlerle  (ya "
+"da kayıtlarla) uyuşmasının doğrulanmasıdır."
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
 msgid "State is draft"
-msgstr "State is draft"
+msgstr "Durum taslaktır"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Toplam Borç"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Entry \"%s\" is not valid !"
@@ -6702,8 +6740,8 @@ msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
 msgstr ""
-"Bu Hesap Planınızı, banka hesaplarınızı, vergilerinizi ve yevmiyeleri "
-"seçilen şablona uygun olarak otomatikmen yapılandıracaktır."
+"Bu Hesap Planınızı, banka hesaplarınızı, vergilerinizi ve günlüklerinizi "
+"seçilen şablona uygun olarak otomatikman yapılandıracaktır."
 
 #. module: account
 #: help:res.partner,property_account_receivable:0
@@ -6711,8 +6749,8 @@ msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
 msgstr ""
-"This account will be used instead of the default one as the receivable "
-"account for the current partner"
+"Bu hesap, geçerli paydaş için alacak hesabı olarak varsayılanın yerine "
+"kullanılır."
 
 #. module: account
 #: field:account.tax,python_applicable:0
@@ -6760,25 +6798,26 @@ msgstr "Kar & Zarar (Gider hesabı)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6810,8 +6849,8 @@ msgid "Printed"
 msgstr "Yazdırıldı"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "Hata :"
@@ -6838,7 +6877,7 @@ msgstr ""
 "Bir faturanın ödenmiş olarak kabul edilmesi için, fatura girişlerinin "
 "karşılıkları ile, genelde ödemelerle uyuşması gerekir. Otomatik uzlaşma "
 "fonksiyonu ile OpenERP bir hesap serisi içerisinde uzlaştırmak için kendi "
-"aramasını yapar. Her ortak için uyuşan tutarları bulur."
+"aramasını yapar. Her paydaş için uyuşan tutarları bulur."
 
 #. module: account
 #: view:account.move:0
@@ -6870,10 +6909,10 @@ msgstr "Günlük Girdileri"
 #. module: account
 #: help:account.partner.ledger,page_split:0
 msgid "Display Ledger Report with One partner per page"
-msgstr "Display Ledger Report with One partner per page"
+msgstr "Her sayfada Bir paydaş olarak Defter Raporunu Göster"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6900,7 +6939,7 @@ msgid ""
 "This report is an analysis done by a partner. It is a PDF report containing "
 "one line per partner representing the cumulative credit balance"
 msgstr ""
-"Bu rapor bir ortak tarafından yapılmış bir analizdir. Her ortak için tek "
+"Bu rapor bir paydaş tarafından yapılmış bir incelemedir. Her paydaş için tek "
 "satırda kümülatif alacak bakiyelerini gösteren bir PDF raporudur."
 
 #. module: account
@@ -6952,7 +6991,7 @@ msgstr "Günlük Seçimi"
 #: code:addons/account/account.py:432
 #, python-format
 msgid "Opening Balance"
-msgstr "Opening Balance"
+msgstr "Açılış Bakiyesi"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
@@ -6962,7 +7001,7 @@ msgstr "Hesap Mutabakatı"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Position"
-msgstr "Taxes Fiscal Position"
+msgstr "Vergiler Mali Durumu"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -7040,7 +7079,7 @@ msgid "Total:"
 msgstr "Total:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -7078,7 +7117,7 @@ msgid "Taxes used in Sales"
 msgstr "Satışlarda kullanılan Vergiler"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7093,7 +7132,7 @@ msgstr "Müşteri Faturaları"
 #. module: account
 #: field:account.move.line.reconcile,writeoff:0
 msgid "Write-Off amount"
-msgstr "Write-Off amount"
+msgstr "Gider Kaydı tutarı"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -7104,7 +7143,7 @@ msgstr "Satışlar"
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr "Yevmiye Kolonu"
+msgstr "Günlük Sütunu"
 
 #. module: account
 #: selection:account.invoice.report,state:0
@@ -7154,17 +7193,17 @@ msgstr ""
 #: field:account.invoice,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr "Source Document"
+msgstr "Kaynak Belge"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "İşlenmiş günlük girişini \"%s\" silemezsiniz!"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7173,7 +7212,7 @@ msgstr "Unreconciled Entries"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
 msgid "Statements Reconciliation"
-msgstr "Statements Reconciliation"
+msgstr "Hesapözeti Uzlaşması"
 
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
@@ -7223,7 +7262,7 @@ msgid ""
 "basis. You can enter the coins that are in your cash box, and then post "
 "entries when money comes in or goes out of the cash box."
 msgstr ""
-"Kasa Kayıtı, nakit yevmiyelerine yapılan nakit girişlerini yönetmenizi "
+"Bir Yazar Kasa, nakit günlüklerine yapılan nakit girişlerini yönetmenizi "
 "sağlar. Bu özellik, nakit ödemelerin günlük olarak kolayca izlenmesini "
 "sağlar. Kasanızdaki nakit paranın girişini yapabilirsiniz, kasanıza giren, "
 "çıkan nakit parayı işleyebilirsiniz."
@@ -7270,8 +7309,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Bu faturayı açmak istediğinizden emin misiniz?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7286,7 +7325,7 @@ msgid "Opening Entries Expense Account"
 msgstr "Gider Hesabı Açılış Girişleri"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Muhasebe Kayıtları"
@@ -7307,12 +7346,12 @@ msgstr ""
 #: field:account.move.line,statement_id:0
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement"
-msgstr "Ekstre"
+msgstr "Hesapözeti"
 
 #. module: account
 #: help:account.journal,default_debit_account_id:0
 msgid "It acts as a default account for debit amount"
-msgstr "It acts as a default account for debit amount"
+msgstr "Borç hesabı için varsayılan hesap olarak davranır"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -7347,7 +7386,7 @@ msgstr "Fatura Tarihini yıla göre gruplandır"
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr "Total amount this customer owes you."
+msgstr "Bu müşterinin size toplam borç tutarı"
 
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
@@ -7389,7 +7428,7 @@ msgstr "Closed On"
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr "Banka Ekstresi Kalemi"
+msgstr "Banka Hesapözeti Öğesi"
 
 #. module: account
 #: field:account.automatic.reconcile,date2:0
@@ -7422,7 +7461,7 @@ msgstr ""
 "to create specific taxes in a custom domain."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "You should have chosen periods that belongs to the same company"
@@ -7453,8 +7492,8 @@ msgid "Reporting"
 msgstr "Raporlama"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7472,13 +7511,13 @@ msgstr "Sözleşmeler/Analiz Hesapları"
 #. module: account
 #: field:account.bank.statement,ending_details_ids:0
 msgid "Closing Cashbox"
-msgstr "Closing Cashbox"
+msgstr "Kasa Kapanışı"
 
 #. module: account
 #: view:account.journal:0
 #: field:res.partner.bank,journal_id:0
 msgid "Account Journal"
-msgstr "Yevmiye Hesabı"
+msgstr "Günlük Hesabı"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -7493,9 +7532,8 @@ msgid ""
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
 msgstr ""
-"This field shows you the next partner that will be automatically chosen by "
-"the system to go through the reconciliation process, based on the latest day "
-"it have been reconciled."
+"Bu alan, uzlaşma işlemi süresince sistem tarafından seçilen sonraki paydaşı "
+"gösterir, uzlaşılan son gün temel alınır."
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
@@ -7535,7 +7573,7 @@ msgstr ""
 #: field:account.invoice.tax,invoice_id:0
 #: model:ir.model,name:account.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "Fatura Kalemi"
+msgstr "Fatura Öğesi"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -7548,7 +7586,7 @@ msgid "Sign on Reports"
 msgstr "Raporlara Giriş"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr "Açılış girişleri oluşturulacak dönemler bulunamadı"
@@ -7559,7 +7597,7 @@ msgid "Root/View"
 msgstr "Kök/Görünüm"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7594,13 +7632,14 @@ msgid "Optional Information"
 msgstr "Opsiyonel Bilgi"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "The journal must have default credit and debit account"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7629,13 +7668,13 @@ msgid "Maturity Date"
 msgstr "Vade Sonu Tarihi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Bad account !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Satış Günlüğü"
@@ -7644,7 +7683,7 @@ msgstr "Satış Günlüğü"
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr "Yevmiye öğelerini seç !"
+msgstr "Günlük Öğelerini Aç !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -7652,7 +7691,7 @@ msgid "Invoice Tax"
 msgstr "Fatura Vergisi"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "No piece number !"
@@ -7697,7 +7736,7 @@ msgstr "Manuel Uzlaşma"
 #. module: account
 #: report:account.overdue:0
 msgid "Total amount due:"
-msgstr "Total amount due:"
+msgstr "Ödenecek toplam tutar:"
 
 #. module: account
 #: field:account.analytic.chart,to_date:0
@@ -7707,7 +7746,7 @@ msgstr "To"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "Para Birimi Ayarlama"
@@ -7761,13 +7800,15 @@ msgstr "May"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Payable Accounts"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7795,7 +7836,7 @@ msgstr "Servis Talep Kodu"
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr "Yevmiyeye ait girişleri işle"
+msgstr "Günlüğe ait Girişleri İşle"
 
 #. module: account
 #: view:product.product:0
@@ -7813,10 +7854,10 @@ msgstr "Rapor Adı"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
-msgstr "Cash"
+msgstr "Kasa"
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
@@ -7825,15 +7866,15 @@ msgid "Account Destination"
 msgstr "Hedef Hesap"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7869,7 +7910,7 @@ msgstr "Birbirinin alt kategorisi olan kategoriler oluşturamazsınız."
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr "Girişlerde istemli miktar"
+msgstr "Girişlerdeki seçmeli miktar."
 
 #. module: account
 #: view:account.financial.report:0
@@ -7905,10 +7946,10 @@ msgid ""
 "in which they will appear. Then you can create a new journal and link your "
 "view to it."
 msgstr ""
-"Burada varolan bir yevmiye görünüşünü özelleştirebilir ya da yeni bir "
-"görünüş  yaratabilirsiniz. Yevmiye görünümleri yevmiyelerinize kayıt girime "
-"yöntemini belirler. Bir yevmiyede görünmesini istediğiniz alanları seçin ve "
-"görünüş sırasını belirleyin."
+"Burada varolan bir günlük görünüşünü özelleştirebilir ya da yeni bir görünüş "
+" yaratabilirsiniz. Günlük görünümleri günlüklerinize kayıt girme yöntemini "
+"belirler. Bir günlükte görünmesini istediğiniz alanları seçin ve görünüş "
+"sırasını belirleyin."
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_asset
@@ -7966,7 +8007,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr "CashBox Line"
+msgstr "Kasa Öğesi"
 
 #. module: account
 #: view:account.partner.ledger:0
@@ -7976,7 +8017,7 @@ msgstr "CashBox Line"
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 #: model:ir.ui.menu,name:account.menu_account_partner_ledger
 msgid "Partner Ledger"
-msgstr "Partner Ledger"
+msgstr "Paydaş Defteri"
 
 #. module: account
 #: selection:account.tax.template,type:0
@@ -7989,13 +8030,14 @@ msgstr "Sabitlendi"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Warning !"
@@ -8003,7 +8045,7 @@ msgstr "Warning !"
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr "State of Move Line"
+msgstr "Hareket Satırı Durumu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
@@ -8039,15 +8081,15 @@ msgstr "Subscription Compute"
 #: model:ir.model,name:account.model_res_partner
 #: field:report.invoice.created,partner_id:0
 msgid "Partner"
-msgstr "Ortak"
+msgstr "Paydaş"
 
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr "Select a currency to apply on the invoice"
+msgstr "Bu faturaya uygulanacak para birimini seçin"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -8060,7 +8102,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Can not %s draft/proforma/cancel invoice."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "No Invoice Lines !"
@@ -8089,7 +8131,7 @@ msgstr "Rapor Tipi"
 #: field:account.subscription,state:0
 #: field:report.invoice.created,state:0
 msgid "State"
-msgstr "State"
+msgstr "Durum"
 
 #. module: account
 #: help:account.open.closed.fiscalyear,fyear_id:0
@@ -8119,7 +8161,7 @@ msgstr ""
 #: code:addons/account/account_bank_statement.py:353
 #, python-format
 msgid "The account entries lines are not in valid state."
-msgstr "The account entries lines are not in valid state."
+msgstr "Hesap giriş öğeleri geçerli durumda değildir."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
@@ -8143,7 +8185,7 @@ msgid "Deferral Method"
 msgstr "Erteleme Yöntemi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Invoice '%s' is paid."
@@ -8208,13 +8250,13 @@ msgstr "Türe göre Bu Ayki Satışlar"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr "Associated Partner"
+msgstr "İlişkili Paydaş"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
-msgstr "You must first select a partner !"
+msgstr "Önce bir paydaş seçmelisiniz !"
 
 #. module: account
 #: view:account.invoice:0
@@ -8250,13 +8292,13 @@ msgstr ""
 #: view:account.invoice.report:0
 #: field:account.invoice.report,residual:0
 msgid "Total Residual"
-msgstr "Total Residual"
+msgstr "Toplam Bakiye"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Invoice's state is Open"
-msgstr "Invoice's state is Open"
+msgstr "Faturanın durumu Açıktır"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -8270,7 +8312,7 @@ msgstr ""
 "görebilirsiniz."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8292,7 +8334,7 @@ msgid "Choose Fiscal Year"
 msgstr "Choose Fiscal Year"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Purchase Refund Journal"
@@ -8376,8 +8418,7 @@ msgid ""
 "This payment term will be used instead of the default one for the current "
 "partner"
 msgstr ""
-"This payment term will be used instead of the default one for the current "
-"partner"
+"Bu ödeme koşulu geçerli paydaş için varsayılan yerine kullanılacaktır"
 
 #. module: account
 #: view:account.tax.template:0
@@ -8385,7 +8426,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Compute Code for Taxes Included Prices"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8408,7 +8449,7 @@ msgstr "Düzeltilmiş Bilanço"
 #: 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 "Fiscal Position Templates"
+msgstr "Mali Durum Şablonları"
 
 #. module: account
 #: view:account.entries.report:0
@@ -8463,7 +8504,7 @@ msgstr "Tel. :"
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr "Firma Dövizi"
+msgstr "Firma Para Birimi"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8501,8 +8542,8 @@ msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
 msgstr ""
-"You can check this box to mark this journal item as a litigation with the "
-"associated partner"
+"İlşikili paydaşla ilgili bir dava sözkonusu ise bu kutuyu işaretleyerek bu "
+"günlük öğesine not düşebilirsiniz"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -8527,7 +8568,7 @@ msgid "current month"
 msgstr "geçerli ay"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8604,20 +8645,22 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr "Fiscalyear Close state"
+msgstr "Mali Yıl Kapalı durumu"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
 msgid "Refund Journal"
-msgstr "Refund Journal"
+msgstr "İade Günlüğü"
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Filter By"
 
@@ -8647,15 +8690,15 @@ msgstr ""
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_company_analysis_tree
 msgid "Company Analysis"
-msgstr "Company Analysis"
+msgstr "Firma İncelemesi"
 
 #. module: account
 #: help:account.invoice,account_id:0
 msgid "The partner account used for this invoice."
-msgstr "The partner account used for this invoice."
+msgstr "Bu fatura için kullanılan paydaş hesabı"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "Vergi %.2f%%"
@@ -8678,7 +8721,7 @@ msgid "Payment Term Line"
 msgstr "Ödeme Vadesi Satırı"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Purchase Journal"
@@ -8691,12 +8734,12 @@ msgstr "Refund Invoice: Creates the refund invoice, ready for editing."
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
 msgid "Subtotal"
-msgstr "Subtotal"
+msgstr "Ara Toplam"
 
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr "Print Tax Statement"
+msgstr "Vergi Hesapözetini Yazdır"
 
 #. module: account
 #: view:account.model.line:0
@@ -8710,7 +8753,7 @@ msgstr "Journal Entry Model Line"
 #: field:account.invoice.report,date_due:0
 #: field:report.invoice.created,date_due:0
 msgid "Due Date"
-msgstr "Due Date"
+msgstr "Vade Tarihi"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_supplier
@@ -8734,8 +8777,8 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
 msgstr ""
-"Alacak veya borç bakiyeleri yevmiye girişleri firma para birimi olarak ifade "
-"edilir."
+"Alacak veya borç bakiyelerinin günlük girişleri firma para birimi olarak "
+"ifade edilir."
 
 #. module: account
 #: view:account.tax.code:0
@@ -8756,7 +8799,7 @@ msgstr "Fiscalyear Close"
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr "Hesap Kodu her şirket için tekil olmalı !"
+msgstr "Hesap Kodu her firma için benzersiz olmalı !"
 
 #. module: account
 #: view:account.invoice:0
@@ -8765,7 +8808,7 @@ msgid "Unpaid Invoices"
 msgstr "Unpaid Invoices"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr "Tedarikçi ödeme koşulunda ödeme koşulu satırı yok!"
@@ -8773,7 +8816,7 @@ msgstr "Tedarikçi ödeme koşulunda ödeme koşulu satırı yok!"
 #. module: account
 #: field:account.move.line.reconcile,debit:0
 msgid "Debit amount"
-msgstr "Debit amount"
+msgstr "Borç tutarı"
 
 #. module: account
 #: view:board.board:0
@@ -8815,7 +8858,7 @@ msgstr "Miscellaneous"
 #. module: account
 #: help:res.partner,debit:0
 msgid "Total amount you have to pay to this supplier."
-msgstr "Total amount you have to pay to this supplier."
+msgstr "Bu tedarikçiye ödemeniz gereken toplam tutar."
 
 #. module: account
 #: model:process.node,name:account.process_node_analytic0
@@ -8859,7 +8902,7 @@ msgstr ""
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr "Fiş tutarı banka ekstresi tutarı ile aynı olmalı"
+msgstr "Fiş tutarı banka hesapözeti tutarı ile aynı olmalı"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_expense
@@ -8870,10 +8913,10 @@ msgstr "Expense"
 #. module: account
 #: help:account.chart,fiscalyear:0
 msgid "Keep empty for all open fiscal years"
-msgstr "Keep empty for all open fiscal years"
+msgstr "Bütün açık mali yıllar için boş bırakın"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "Merkezileştirme için  (% s) hesap hareketi onaylandı!"
@@ -8884,11 +8927,11 @@ msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
 msgstr ""
-"The amount expressed in an optional other currency if it is a multi-currency "
-"entry."
+"Eğer çoklu-para birimiyse tutar seçenekli olarak başka para biriminde "
+"belirtilir."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8927,7 +8970,7 @@ msgstr ""
 #: field:report.invoice.created,currency_id:0
 #: field:res.partner.bank,currency_id:0
 msgid "Currency"
-msgstr "Currency"
+msgstr "Para Birimi"
 
 #. module: account
 #: help:account.bank.statement.line,sequence:0
@@ -8952,9 +8995,9 @@ msgid ""
 "would be referred to as FY 2011. You are not obliged to follow the actual "
 "calendar year."
 msgstr ""
-"Şirketinizin mali yılını İhtiyaçlarınıza göre tanımlayın. Bir mali yıl bir "
-"şirketin hesaplarının kapandığı dönemin sonudur (genellikle 12 ay). Mali yıl "
-"genellikle bitiş tarihi yılıyla adlandırılır. Örneğin; bir şirketin mali "
+"Firmanızın mali yılını ihtiyaçlarınıza göre tanımlayın. Bir mali yıl bir "
+"firmanın hesaplarının kapandığı dönemin sonudur (genellikle 12 ay). Mali yıl "
+"genellikle bitiş tarihi yılıyla adlandırılır. Örneğin; bir firmanın mali "
 "yılı 30 Kasım 2011 de biterse 1 Aralık 2010 ve 30 Kasım 2011 tarihleri "
 "​​arasındaki her şey FY 2011 olarak anılacaktır. Gerçek takvim yılını "
 "izlemek zorunda değilsiniz."
@@ -8971,7 +9014,7 @@ msgid "Contact Address"
 msgstr "İletişim Adresi"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "Yanlış model !"
@@ -8979,12 +9022,12 @@ msgstr "Yanlış model !"
 #. module: account
 #: field:account.invoice.refund,period:0
 msgid "Force period"
-msgstr "Force period"
+msgstr "Dönemi Zorla"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr "Print Account Partner Balance"
+msgstr "Paydaş Hesabı Bakiyesini Yazdır"
 
 #. module: account
 #: help:account.financial.report,sign:0
@@ -9012,15 +9055,17 @@ msgstr "Contracts"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "unknown"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
-msgstr "Opening Entries Journal"
+msgstr "Açılış Günlük Girişleri"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
@@ -9034,12 +9079,11 @@ msgid ""
 "will be added, Loss: Amount will be deducted.), Which is calculated from "
 "Profilt & Loss Report"
 msgstr ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
-"will be added, Loss: Amount will be deducted.), Which is calculated from "
-"Profilt & Loss Report"
+"Bu Hesap, Kar & Zarar Raporunda hesaplanan Kar/Zarar aktarımı için "
+"kullanılır (Kar ise:Tutar eklenir, Zarar ise: Tutar düşülür)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "Bu faturayla ilgili günlüğe lütfen bir sıra tanımlayın."
@@ -9069,8 +9113,8 @@ msgid ""
 "Set if the tax computation is based on the computation of child taxes rather "
 "than on the total amount."
 msgstr ""
-"Set if the tax computation is based on the computation of child taxes rather "
-"than on the total amount."
+"Vergi hesaplamasının toplam tutara göre mi alt vergilere göre mi "
+"yapılacağını ayarlayın."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -9080,7 +9124,7 @@ msgstr "Given by Python Code"
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal Code"
-msgstr "Journal Code"
+msgstr "Günlük Kodu"
 
 #. module: account
 #: help:account.tax.code,sign:0
@@ -9098,7 +9142,7 @@ msgstr ""
 #: field:account.move.line,amount_residual:0
 #: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount"
-msgstr "Residual Amount"
+msgstr "Bakiye Tutarı"
 
 #. module: account
 #: field:account.invoice,move_lines:0
@@ -9115,7 +9159,7 @@ msgstr "Mali Hesaplarınızı gözden geçirin"
 #: model:ir.actions.act_window,name:account.action_open_journal_button
 #: model:ir.actions.act_window,name:account.action_validate_account_move
 msgid "Open Journal"
-msgstr "Open Journal"
+msgstr "Günlük Aç"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9130,7 +9174,7 @@ msgid "Period from"
 msgstr "Period from"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Sales Refund Journal"
@@ -9177,7 +9221,7 @@ msgid "Purchase Tax(%)"
 msgstr "Purchase Tax(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Please create some invoice lines."
@@ -9193,7 +9237,7 @@ msgid "Display Detail"
 msgstr "Ayrıntıları Görüntüle"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9231,8 +9275,6 @@ msgstr "Dönem Bitişi"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "Mali Raporlar"
@@ -9247,6 +9289,7 @@ msgstr "Mali Raporlar"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9267,13 +9310,14 @@ msgstr "Start Period"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Analysis Direction"
 
 #. module: account
 #: field:res.partner,ref_companies:0
 msgid "Companies that refers to partner"
-msgstr "Companies that refers to partner"
+msgstr "Paydaşa başvurusu olan Firmalar"
 
 #. module: account
 #: view:account.journal:0
@@ -9282,11 +9326,11 @@ msgstr "Companies that refers to partner"
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
-msgstr "Journal View"
+msgstr "Günlük Görünümü"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Toplam Alacak"
@@ -9314,7 +9358,7 @@ msgstr "Vergi Kodu Şablonu"
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr "Document: Customer account statement"
+msgstr "Belge: Müşteri hesap özeti"
 
 #. module: account
 #: field:account.account.type,report_type:0
@@ -9344,7 +9388,7 @@ msgstr "Receivale Accounts"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Bank Statements"
-msgstr "Bank Statements"
+msgstr "Banka Hesapözetleri"
 
 #. module: account
 #: field:account.account,balance:0
@@ -9355,6 +9399,7 @@ msgstr "Bank Statements"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9429,13 +9474,13 @@ msgid ""
 "related to this account and the counter-part \"Account receivable\"."
 msgstr ""
 "Bu görünüm, muhasebeciler tarafından OpenERP de toplu girişler yapmak için "
-"kullanılır. Bir müşteri faturası kaydetmek için arama çubuğundan yevmiye ve "
+"kullanılır. Bir müşteri faturası kaydetmek için arama çubuğundan günlük ve "
 "dönem seçin. Sonra, gelir hesabına giriş satırını kaydetmeye başlayın. "
 "OpenERP size otomatik olarak bu hesapla ve karşı hesap olan \"Satıcılar "
 "Hesabı\" yla ilişkili Vergiyi önerecektir."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "You must select accounts to reconcile"
@@ -9462,7 +9507,6 @@ msgstr ""
 "kapatılmasına ya da açık tutulmasına karar verin."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Filters By"
@@ -9484,7 +9528,7 @@ msgid "Move"
 msgstr "Move"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "You can not change the tax, you should remove and recreate lines !"
@@ -9502,7 +9546,7 @@ msgstr "A/C No."
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr "Banka Ekstreleri"
+msgstr "Banka Hesapözetleri"
 
 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
@@ -9543,13 +9587,13 @@ msgid "Consolidated Children"
 msgstr "Consolidated Children"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
 "state option checked!"
 msgstr ""
-"Bir yevmiyenin, taslak durumu seçeneği seçilmeden geçilmiş merkezi "
+"Bir günlüğün, taslak durumu seçeneğinin işaretlenmesi Atlanmadan merkezi "
 "karşıtının olması gerekir!"
 
 #. module: account
@@ -9608,6 +9652,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9629,7 +9674,7 @@ msgstr "End Period"
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr "Due date"
+msgstr "Vade Tarihi"
 
 #. module: account
 #: view:account.move.journal:0
@@ -9669,6 +9714,7 @@ msgstr "Entry Subscription"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9676,6 +9722,7 @@ msgstr "Entry Subscription"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9720,7 +9767,7 @@ msgid "Unreconciled"
 msgstr "Mutabakatsız"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Bad total !"
@@ -9786,7 +9833,7 @@ msgid "Comparison"
 msgstr "Karşılaştırma"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Bilinmeyen Hata"
@@ -9797,8 +9844,8 @@ msgid ""
 "This account will be used instead of the default one as the payable account "
 "for the current partner"
 msgstr ""
-"This account will be used instead of the default one as the payable account "
-"for the current partner"
+"Bu hesap geçerli paydaşın ödemeler hesabında varsayılan yerine "
+"kullanılacaktır"
 
 #. module: account
 #: field:account.period,special:0
@@ -9810,7 +9857,7 @@ msgstr "Açılış/Kapanış Dönemi"
 #: field:account.account.template,currency_id:0
 #: field:account.bank.accounts.wizard,currency_id:0
 msgid "Secondary Currency"
-msgstr "İkinci Para Birimi"
+msgstr "İkincil Para Birimi"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
@@ -9825,6 +9872,7 @@ msgstr "Hesap Hareketini Doğrula"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9873,7 +9921,7 @@ msgstr ""
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr "Yevmiye Giriş Modeli"
+msgstr "Günlük Giriş Modeli"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -9931,9 +9979,11 @@ msgstr "Son 30 gündeki Analiz Girişleri"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Dönemler"
 
@@ -10016,8 +10066,8 @@ msgid ""
 "and is the process of transferring debit and credit amounts from a journal "
 "of original entry to a ledger book."
 msgstr ""
-"Yevmiye onaylama işlemi, 'büyük deftere işleme' olarak da anılır ve bir "
-"yevmiyeye girilen borç/alacak tutarlarının büyük deftere transfer edilmesi "
+"Günlük onaylama işlemi, 'büyük deftere işleme' olarak da anılır ve bir "
+"günlükte girilen borç/alacak tutarlarının büyük deftere aktarılması "
 "işlemidir."
 
 #. module: account
@@ -10026,7 +10076,7 @@ msgid ""
 "When new statement is created the state will be 'Draft'.\n"
 "And after getting confirmation from the bank it will be in 'Confirmed' state."
 msgstr ""
-"Yeni bir hesap özeti oluşturulduğunda durumu 'Taslak' olacaktır.\n"
+"Yeni bir hesapözeti oluşturulduğunda durumu 'Taslak' olacaktır.\n"
 "Ve bankanın  onayının alınmasından sonra 'Onaylı' durumda olacaktır."
 
 #. module: account
@@ -10045,7 +10095,7 @@ msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
-"Bu rapor, hesaplarınıza ait bütün yevmiyelerinizin ayrıntılarını gösteren "
+"Bu rapor, hesaplarınıza ait bütün günlüklerinizin ayrıntılarını gösteren "
 "büyük defterinizi pdf olarak yazdırmanızı ve oluşturmanızı sağlar."
 
 #. module: account
@@ -10104,6 +10154,7 @@ msgstr "İşlendi"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -10151,7 +10202,7 @@ msgid "No detail"
 msgstr "Ayrıntı yok"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "Bu ürün için tanımlanmış gelir hesabı bulunmuyor: \"%s\" (id:%d)"
@@ -10159,7 +10210,7 @@ msgstr "Bu ürün için tanımlanmış gelir hesabı bulunmuyor: \"%s\" (id:%d)"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr "Kapalı bir hesap için yevmiye kayıtları oluşturamazsınız."
+msgstr "Kapalı hesapta günlük girişi maddeleri oluşturamazsınız."
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
@@ -10187,6 +10238,7 @@ msgid "Verification Total"
 msgstr "Toplamı Doğrulama"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10203,10 +10255,11 @@ msgstr "Toplam"
 #: code:addons/account/wizard/account_move_journal.py:97
 #, python-format
 msgid "Journal: All"
-msgstr "Yevmiye: Tümü"
+msgstr "Günlük: Hepsi"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10221,7 +10274,9 @@ msgstr "Yevmiye: Tümü"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10231,6 +10286,8 @@ msgstr "Yevmiye: Tümü"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10263,7 +10320,7 @@ msgstr "Vade Tarihi"
 #. module: account
 #: help:account.bank.statement,total_entry_encoding:0
 msgid "Total cash transactions"
-msgstr "Toplam Nakit İşlemleri"
+msgstr "Toplam Kasa İşlemleri"
 
 #. module: account
 #: help:account.partner.reconcile.process,today_reconciled:0
@@ -10294,14 +10351,15 @@ msgstr "Geçici Mizan Raporu"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr "Taslak Ekstreler"
+msgstr "Taslak Hesapözetleri"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
 msgstr ""
-"Ekstrelere göre ödeme girişlerinin elle ya da otomatik olarak oluşturulması"
+"Hesapözetlerine göre ödeme girişlerinin elle ya da otomatik olarak "
+"oluşturulması"
 
 #. module: account
 #: field:account.analytic.balance,empty_acc:0
@@ -10326,7 +10384,7 @@ msgstr "Dönem Sonu"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr "Yevmiye kodu her firma için benzersiz olmalı."
+msgstr "Günlük kodu her firma için eşsiz olmalı."
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
@@ -10363,7 +10421,7 @@ msgstr "Write-Off Move"
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr "Fatura durumu Bitti dir."
+msgstr "Fatura durumu Yapıldıdır."
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
@@ -10373,7 +10431,7 @@ msgstr "Hesaplara göre Satış Raporu"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr "Mali Durum Raporu"
+msgstr "Hesapların Mali Durumu"
 
 #. module: account
 #: report:account.invoice:0
@@ -10393,6 +10451,7 @@ msgstr "Tedarikçi Faturası"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10426,6 +10485,8 @@ msgstr "Hata! Yinelemeli hesap şablonları kullanamazsınız."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "Günlük Girişi Numarası"
 
@@ -10445,7 +10506,7 @@ msgstr ""
 "değiştiremezsiniz!"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Giriş zaten uzlaştırılmış"
@@ -10458,7 +10519,7 @@ msgstr "Alıcılar Hesabı"
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr "Paydaş Ödeme Şartı"
+msgstr "Paydaş Ödeme Koşulu"
 
 #. module: account
 #: field:temp.range,name:0
@@ -10480,14 +10541,16 @@ msgid ""
 "computations), closed for depreciated accounts."
 msgstr ""
 "'İç Tür' farklı hesap türlerindeki olan özellikler için kullanılır: görünüm "
-"günlük maddelerini alamaz, birleştirme (konsolidasyon) çoklu şirket "
-"hesaplarının birleştirilmelerinin (konsolidasyonlarının)  alt hesapları "
-"için, borç/alacak paydaş hesapları için (borç/alacak hesaplamaları) , kapalı "
-"değer düşmesi hesapları için."
+"günlük maddelerini alamaz, birleştirme (konsolidasyon) çoklu firma "
+"hesaplarının birleştirilmelerinin alt hesapları için, borç/alacak paydaş "
+"hesapları için (borç/alacak hesaplamaları) , kapalı değer düşmesi hesapları "
+"için."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "With movements"
@@ -10520,7 +10583,7 @@ msgstr "Aralık"
 #: 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 "Yevmiye Analizi Yazdır"
+msgstr "Analiz Günlüğü Yazdır"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -10552,7 +10615,7 @@ msgstr "Bu dönem zaten kapalı !"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr "The optional other currency if it is a multi-currency entry."
+msgstr "Eğer çoklu-para birimiyse seçmeli başka para birimi."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoiceimport0
@@ -10582,12 +10645,11 @@ msgid ""
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
 msgstr ""
-"Bu menüden şirketinize ait yevmiyeleri yaratabilir ve yönetebilirsiniz. "
-"Yevmiye, çifte kayıt usulü muhasebe tutan firmanızın günlük işlemleriyle "
-"ilintili olan tüm muhasebe bilgilerinin kayıt işlemleri için kullanılır. "
-"Günlük işlemlere ve firmanın işleyişine göre çeşitli tiplerde, örneğin, kasa "
-"yevmiyesi, satınalma yevmiyesi, satış yevmiyesi gibi özel yevmiyeler "
-"kullanılır."
+"Bu menüden firmanıza ait günlükleri yaratabilir ve yönetebilirsiniz. Günlük, "
+"çift kayıt usulü muhasebe tutan firmanızın günlük işlemleriyle ilintili olan "
+"tüm muhasebe bilgilerinin kayıt işlemleri için kullanılır. Günlük işlemlere "
+"ve firmanın işleyişine göre çeşitli türlerde, örneğin, kasa günlüğü, "
+"satınalma günlüğü, satış günlüğü gibi özel günlükler kullanılır."
 
 #. module: account
 #: view:account.payment.term:0
@@ -10610,8 +10672,8 @@ msgid "Statistic Reports"
 msgstr "İstatistik Raporları"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Bad account!"
@@ -10642,7 +10704,7 @@ msgid "Accounts Mapping"
 msgstr "Hesap Eşleştirmesi"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Fatura '%s' doğrulanmak için bekliyor."
@@ -10675,7 +10737,7 @@ msgstr "Dönem sayısı"
 #: report:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr "Genel Yevmiye"
+msgstr "Genel Günlük"
 
 #. module: account
 #: view:account.invoice:0
@@ -10769,12 +10831,12 @@ msgstr ""
 "''}${object.address_invoice_id.name or ''},\n"
 "\n"
 "${object.partner_id.name}:\n"
-"       | Invoice number: *${object.number}*\n"
+"       | Fatura Numarası: *${object.number}*\n"
 "       | Fatura toplamı: *${object.amount_total} "
 "${object.currency_id.name}*\n"
 "       | Fatura tarihi: ${object.date_invoice}\n"
 "       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
+"       | Sipariş Referansı: ${object.origin}\n"
 "       % endif\n"
 "       | İlgili kişi: ${object.user_id.name} ${object.user_id.user_email and "
 "'<%s>'%(object.user_id.user_email) or ''}\n"
@@ -10873,7 +10935,7 @@ msgstr "Maliyet Defteri (Yalnız Miktarlar)"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr "Fatrura durumu Bitti dir."
+msgstr "Fatrura durumu Yapıldıdır."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
@@ -10902,6 +10964,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10924,7 +10987,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
 msgstr ""
-"Eğer aktif alan Yanlış'a ayarlıysa, yevmiye analizini silmeden gizlemenizi "
+"Eğer etkin alan Yanlış'a ayarlıysa, analiz günlüğünü silmeden gizlemenizi "
 "sağlar."
 
 #. module: account
@@ -10971,7 +11034,7 @@ msgstr "Banka Hesabı"
 #: model:ir.actions.act_window,name:account.action_account_central_journal
 #: model:ir.model,name:account.model_account_central_journal
 msgid "Account Central Journal"
-msgstr "Merkezi Yevmiye Hesabı"
+msgstr "Merkezi Hesap Günlüğü"
 
 #. module: account
 #: report:account.overdue:0
@@ -10980,13 +11043,15 @@ msgstr "Vade"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "İlerki"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr "Yevmiye Maddelerini Ara"
+msgstr "Günlük Öğesi Ara"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -11038,7 +11103,7 @@ msgid ""
 "certain amount of information. They have to be certified by an external "
 "auditor annually."
 msgstr ""
-"Yevmiye giriş kayıtları yapmak istediğiniz hesapları oluşturun ve yönetin. "
+"Günlük giriş kayıtları yapmak istediğiniz hesapları oluşturun ve yönetin. "
 "Bir hesap, şirketinize ait borç ve alacak işlemlerini kayıt etmenizi "
 "sağlayan büyük defterin bir parçasıdır. Firmalar, yıllık hesaplarını iki ana "
 "bölümde tutar: bilanço ve gelir tablosu (kar ve zarar hesabı). Bir firmanın "
@@ -11051,7 +11116,7 @@ msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
-"Alıcılar ya da satıcılar hesabına ait bir yevmiyede bakiye tutarı, bakiye "
+"Alıcılar ya da satıcılar hesabına ait bir günlükte bakiye tutarı, bakiye "
 "para cinsi ile belirtilir (firma para cinsinden belki farklı olabilir)."
 
 #~ msgid "Description on invoices"
@@ -12298,9 +12363,6 @@ msgstr ""
 #~ msgid "Next"
 #~ msgstr "Next"
 
-#~ msgid "Open for bank reconciliation"
-#~ msgstr "Open for bank reconciliation"
-
 #~ msgid ""
 #~ "It adds initial balance row on report which display previous sum amount of "
 #~ "debit/credit/balance"
@@ -12433,9 +12495,6 @@ msgstr ""
 #~ msgid ")"
 #~ msgstr ")"
 
-#~ msgid "Create an Account based on this template"
-#~ msgstr "Create an Account based on this template"
-
 #~ msgid "JNRL"
 #~ msgstr "JNRL"
 
@@ -12721,4 +12780,10 @@ msgstr ""
 #~ msgstr "Hesap Tablonuzu Kurun"
 
 #~ msgid "Description On Invoices"
-#~ msgstr "Faturalar üzerindeki açıklama"
+#~ msgstr "Faturalar Üzerindeki Açıklama"
+
+#~ msgid "Create an Account based on this template"
+#~ msgstr "Bu şablona göre bir Hesap oluştur"
+
+#~ msgid "Open for bank reconciliation"
+#~ msgstr "Banka uzlaşması için aç"
diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po
index 61c3072260e..3054d20f1d8 100644
--- a/addons/account/i18n/ug.po
+++ b/addons/account/i18n/ug.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:05+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr ""
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr "باج نۇمۇرى"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "ئومۇمىي خارەكتىرلىك خاتالىق!"
@@ -4921,6 +4956,7 @@ msgstr "ھېساباتنى توغىرىلاش نەتىجىسى"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po
index 6caed34bede..db7238593da 100644
--- a/addons/account/i18n/uk.po
+++ b/addons/account/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:05+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -139,6 +139,7 @@ msgstr "Вивірити"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Посилання"
 
@@ -155,13 +156,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -221,7 +222,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -237,7 +238,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "Ви не можете додати/змінити записи в закритому журналі."
@@ -283,7 +284,7 @@ msgid "St."
 msgstr "вул."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -557,8 +558,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -616,7 +619,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -627,7 +630,7 @@ msgid "Tax Code Amount"
 msgstr "Сума ПДВ"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -654,8 +657,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -732,6 +735,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -747,12 +751,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Тип"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -878,12 +883,13 @@ msgid "Create 3 Months Periods"
 msgstr "Створити тримісячні періоди"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Борг"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -961,7 +967,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -994,10 +1000,10 @@ msgid "Code"
 msgstr "Код"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1059,7 +1065,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1107,7 +1113,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1199,7 +1205,7 @@ msgid "The move of this entry line."
 msgstr "Переміщення цього запису"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1220,7 +1226,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1305,14 +1311,15 @@ msgid "Taxes"
 msgstr "Податки"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1367,6 +1374,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1391,8 +1399,10 @@ msgid "Central Journal"
 msgstr "Основний журнал"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1617,6 +1627,7 @@ msgid "Separated Journal Sequences"
 msgstr "Різні Порядки Журналу"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1645,7 +1656,7 @@ msgid "Year Sum"
 msgstr "Річна сума"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1718,7 +1729,7 @@ msgid "Customer Ref:"
 msgstr "Клієнт:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2037,7 +2048,7 @@ msgid "Pro-forma"
 msgstr "Про-форма"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2061,7 +2072,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2110,7 +2121,7 @@ msgid "Description"
 msgstr "Опис"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2129,7 +2140,7 @@ msgid "Income Account"
 msgstr "Рахунок доходів"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2169,6 +2180,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2178,6 +2190,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2228,7 +2241,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2259,7 +2272,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2333,7 +2346,7 @@ msgid "Account Tax Code"
 msgstr "Код податку рахунку"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2414,7 +2427,7 @@ msgid "Account Model Entries"
 msgstr "Записи моделі обліку"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2473,7 +2486,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2505,7 +2517,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2625,6 +2637,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2672,14 +2685,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2782,7 +2795,7 @@ msgid "Base Code Amount"
 msgstr "Сума по базовому коду"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2795,7 +2808,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2833,7 +2846,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2980,7 +2993,7 @@ msgid "View"
 msgstr "Перегляд"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3172,7 +3185,7 @@ msgid "Starting Balance"
 msgstr "Початковий баланс"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3226,7 +3239,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3307,6 +3320,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3353,7 +3367,7 @@ msgid "Detail"
 msgstr "Деталізований"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3368,9 +3382,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3391,7 +3412,7 @@ msgid "Centralised counterpart"
 msgstr "Централізований аналог"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3416,6 +3437,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3443,10 +3465,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Дата"
 
@@ -3463,7 +3492,6 @@ msgstr "Відмінити звірку"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3477,7 +3505,7 @@ msgid "Chart of Accounts Template"
 msgstr "Шаблон Плану Рахунків"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3486,7 +3514,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3517,6 +3545,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3598,7 +3628,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3629,7 +3659,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3643,6 +3673,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3656,7 +3687,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3976,7 +4007,7 @@ msgid "Month"
 msgstr "Місяць"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4033,7 +4064,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4240,7 +4271,7 @@ msgid "Allow Reconciliation"
 msgstr "Дозволити Коригування"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4274,7 +4305,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4286,6 +4317,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Зміна"
 
@@ -4330,7 +4362,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4344,7 +4376,7 @@ msgid "Keep empty to use the income account"
 msgstr "Залишити порожнім для використання рахунку доходу"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4372,7 +4404,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Покупець"
@@ -4388,7 +4420,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4440,7 +4472,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4465,11 +4497,13 @@ msgstr "Новий фінансовий рік"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Інвойси"
 
@@ -4606,26 +4640,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4728,7 +4760,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4752,7 +4784,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4773,6 +4805,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4816,6 +4849,8 @@ msgstr "Тип періоду"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4889,7 +4924,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Помилка Цілісності !"
@@ -4922,6 +4957,7 @@ msgstr "Результат звірки"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4998,6 +5034,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5125,7 +5162,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5177,13 +5213,13 @@ msgid "End of Year Entries Journal"
 msgstr "Журнал Проводок з Закриття Року"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5257,7 +5293,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5421,7 +5456,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5454,14 +5489,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Списати"
@@ -5481,7 +5516,7 @@ msgstr "Дохід"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Постачальник"
@@ -5511,7 +5546,7 @@ msgid "Account n°"
 msgstr "№ рахунку"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5526,7 +5561,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5622,7 +5659,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5633,8 +5670,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5675,8 +5712,8 @@ msgid "Number of Days"
 msgstr "Кількість днів"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5738,7 +5775,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5775,6 +5812,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6048,6 +6087,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6057,7 +6098,7 @@ msgid "Power"
 msgstr "Степінь"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6097,6 +6138,7 @@ msgid "Applicable Type"
 msgstr "Придатний тип"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Посилання на інвойс"
@@ -6315,8 +6357,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6332,7 +6374,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6371,13 +6413,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Всього Дебет"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6445,25 +6487,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6495,8 +6538,8 @@ msgid "Printed"
 msgstr "Роздрукований"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6551,7 +6594,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6702,7 +6745,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6732,7 +6775,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6800,14 +6843,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6903,8 +6946,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Ви впевнені, що хочете відкрити цей інвойс?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6917,7 +6960,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "Бухгалтерські проводки"
@@ -7051,7 +7094,7 @@ msgstr ""
 "користувача."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7082,8 +7125,8 @@ msgid "Reporting"
 msgstr "Звіти"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7172,7 +7215,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7183,7 +7226,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7218,13 +7261,14 @@ msgid "Optional Information"
 msgstr "Додаткова інформація"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7251,13 +7295,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Журнал продажів"
@@ -7274,7 +7318,7 @@ msgid "Invoice Tax"
 msgstr "Податок інвойса"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7324,7 +7368,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7372,13 +7416,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7422,7 +7468,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Каса"
@@ -7434,15 +7480,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7588,13 +7634,14 @@ msgstr "Фіксований"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Попередження !"
@@ -7646,7 +7693,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7659,7 +7706,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7733,7 +7780,7 @@ msgid "Deferral Method"
 msgstr "Метод переносу"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7795,7 +7842,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "Ви повинні спочатку вибрати партнера !"
@@ -7841,7 +7888,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7863,7 +7910,7 @@ msgid "Choose Fiscal Year"
 msgstr "Вибрати Фіскальний Рік"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7950,7 +7997,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8078,7 +8125,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8157,10 +8204,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8193,7 +8242,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8216,7 +8265,7 @@ msgid "Payment Term Line"
 msgstr "Рядок термінів оплати"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8301,7 +8350,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8407,7 +8456,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8420,7 +8469,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8493,7 +8542,7 @@ msgid "Contact Address"
 msgstr "Контактна адреса"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8528,12 +8577,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8552,7 +8603,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8638,7 +8689,7 @@ msgid "Period from"
 msgstr "Період з"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8685,7 +8736,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8701,7 +8752,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8733,8 +8784,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8749,6 +8798,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8769,6 +8819,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8788,7 +8839,7 @@ msgstr "Вигляд журналу"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Всього Кредит"
@@ -8853,6 +8904,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8928,7 +8980,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8950,7 +9002,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8972,7 +9023,7 @@ msgid "Move"
 msgstr "Переміщення"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9028,7 +9079,7 @@ msgid "Consolidated Children"
 msgstr "Об'єднати Дочірні"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9089,6 +9140,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9145,6 +9197,7 @@ msgstr "Вхідна підписка"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9152,6 +9205,7 @@ msgstr "Вхідна підписка"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9194,7 +9248,7 @@ msgid "Unreconciled"
 msgstr "Незвірений"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9253,7 +9307,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9290,6 +9344,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9388,9 +9443,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Періоди"
 
@@ -9552,6 +9609,7 @@ msgstr "Введений"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9599,7 +9657,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9635,6 +9693,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9655,6 +9714,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9669,7 +9729,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9679,6 +9741,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9832,6 +9896,7 @@ msgstr "Інвойс постачальника"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9865,6 +9930,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9882,7 +9949,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9918,8 +9985,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10035,8 +10104,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10062,7 +10131,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10252,6 +10321,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10325,6 +10395,8 @@ msgstr "Готовність"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/ur.po b/addons/account/i18n/ur.po
index 866617b7ae5..ac4fed9c7ce 100644
--- a/addons/account/i18n/ur.po
+++ b/addons/account/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:05+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr ""
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr ""
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index 3d7c8282a66..98f188ee35f 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -144,6 +144,7 @@ msgstr "Đối soát"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "Tham chiếu"
 
@@ -162,13 +163,13 @@ msgstr ""
 "thanh toán mà không cần loại bỏ nó."
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "Cảnh báo!"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -233,7 +234,7 @@ msgstr ""
 "on invoices"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -250,7 +251,7 @@ msgid "Belgian Reports"
 msgstr "Báo cáo của Bỉ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "You can not add/modify entries in a closed journal."
@@ -296,7 +297,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "Invoice line account company does not match with invoice company."
@@ -588,8 +589,10 @@ msgid "The accountant confirms the statement."
 msgstr "Kế toán viên xác nhận báo cáo."
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -647,7 +650,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "trình tự chính phải khác với các hiện tại"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -658,7 +661,7 @@ msgid "Tax Code Amount"
 msgstr "Tax Code Amount"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -685,8 +688,8 @@ msgid "Journal Period"
 msgstr "Chu kỳ của Sổ nhật ký"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "To reconcile the entries company should be the same for all entries"
@@ -763,6 +766,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "Bạn chỉ có thể thay đổi loại tiền cho Hóa đơn Nháp"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -778,12 +782,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "Loại"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -912,12 +917,13 @@ msgid "Create 3 Months Periods"
 msgstr "Tạo các chu kỳ 3 tháng"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "Đến hạn"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -998,7 +1004,7 @@ msgstr ""
 "basic amount(without tax)."
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -1031,10 +1037,10 @@ msgid "Code"
 msgstr "Mã"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1098,7 +1104,7 @@ msgstr ""
 "information about the account and its specificities."
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1146,7 +1152,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "Ngân hàng"
@@ -1242,7 +1248,7 @@ msgid "The move of this entry line."
 msgstr "The move of this entry line."
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1263,7 +1269,7 @@ msgid "Entry Label"
 msgstr "Entry Label"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "You can not modify/delete a journal with entries for this period !"
@@ -1348,14 +1354,15 @@ msgid "Taxes"
 msgstr "Các loại Thuế"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "Chọn một chu kỳ bắt đầu và một chu kỳ kết thúc"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1410,6 +1417,7 @@ msgid "Journal Items Analysis"
 msgstr "Journal Items Analysis"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "Các đối tác"
@@ -1434,8 +1442,10 @@ msgid "Central Journal"
 msgstr "quy trình trung tâm"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1670,6 +1680,7 @@ msgid "Separated Journal Sequences"
 msgstr "Separated Journal Sequences"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "Chịu trách nhiệm"
@@ -1700,7 +1711,7 @@ msgid "Year Sum"
 msgstr "Tổng của năm"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1776,7 +1787,7 @@ msgid "Customer Ref:"
 msgstr "Tham chiếu khách hàng:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "User %s does not have rights to access %s journal !"
@@ -2103,7 +2114,7 @@ msgid "Pro-forma"
 msgstr "Pro-forma"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2132,7 +2143,7 @@ msgid "Search Chart of Account Templates"
 msgstr "Search Chart of Account Templates"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2184,7 +2195,7 @@ msgid "Description"
 msgstr "Mô tả"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2203,7 +2214,7 @@ msgid "Income Account"
 msgstr "Tài khoản thu nhập"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "There is no Accounting Journal of type Sale/Purchase defined!"
@@ -2243,6 +2254,7 @@ msgstr "Product Template"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2252,6 +2264,7 @@ msgstr "Product Template"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2302,7 +2315,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2335,7 +2348,7 @@ msgid "Main Sequence"
 msgstr "Main Sequence"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2409,7 +2422,7 @@ msgid "Account Tax Code"
 msgstr "Mã số thuế"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2496,7 +2509,7 @@ msgid "Account Model Entries"
 msgstr "Account Model Entries"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2562,7 +2575,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2594,7 +2606,7 @@ msgid "Accounts"
 msgstr "Các tài khoản"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "Lỗi cấu hình!"
@@ -2716,6 +2728,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "Aged Partner Balance"
@@ -2768,14 +2781,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "This wizard will create recurring accounting entries"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "No sequence defined on the journal !"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2883,7 +2896,7 @@ msgid "Base Code Amount"
 msgstr "Base Code Amount"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2896,7 +2909,7 @@ msgid "Default Sale Tax"
 msgstr "Default Sale Tax"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "Hóa đơn  '%s' đã được kiểm tra."
@@ -2937,7 +2950,7 @@ msgid "Fiscal Position"
 msgstr "Fiscal Position"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -3091,7 +3104,7 @@ msgid "View"
 msgstr "View"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3294,7 +3307,7 @@ msgid "Starting Balance"
 msgstr "Số dư ban đầu"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "Không có đối tác được định nghĩa"
@@ -3350,7 +3363,7 @@ msgid "Chart of Tax"
 msgstr "Hệ thống Thuế"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3435,6 +3448,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3481,7 +3495,7 @@ msgid "Detail"
 msgstr "Chi tiết"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3496,9 +3510,16 @@ msgid "VAT :"
 msgstr "Thuế GTGT :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3521,7 +3542,7 @@ msgid "Centralised counterpart"
 msgstr "Centralised counterpart"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3547,6 +3568,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3574,10 +3596,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "Ngày"
 
@@ -3594,7 +3623,6 @@ msgstr "Unreconcile"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3608,7 +3636,7 @@ msgid "Chart of Accounts Template"
 msgstr "Hoạch đồ Kế toán Mẫu"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3620,7 +3648,7 @@ msgstr ""
 "Hãy xác định đối tác trên nó"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "Một số bút toán đã được đối soát !"
@@ -3651,6 +3679,8 @@ msgstr "Ngân sách"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "Không có bộ lọc"
 
@@ -3735,7 +3765,7 @@ msgid "Analytic Items"
 msgstr "phân tích mặt hàng"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "Không thể thay đổi thuế !"
@@ -3766,7 +3796,7 @@ msgid "Mapping"
 msgstr "Mapping"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3780,6 +3810,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3793,7 +3824,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "Account Aged Trial balance Report"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -4125,7 +4156,7 @@ msgid "Month"
 msgstr "Tháng"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4182,7 +4213,7 @@ msgid "Account Base Code"
 msgstr "Account Base Code"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4392,7 +4423,7 @@ msgid "Allow Reconciliation"
 msgstr "Cho phép đối soát"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4426,7 +4457,7 @@ msgid "Recurring Models"
 msgstr "Recurring Models"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4438,6 +4469,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "Thay đổi"
 
@@ -4482,7 +4514,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4498,7 +4530,7 @@ msgid "Keep empty to use the income account"
 msgstr "Để trống để sử dụng tài khoản thu nhập"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4526,7 +4558,7 @@ msgstr "Account Mapping"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "Khách hàng"
@@ -4542,7 +4574,7 @@ msgid "Cancelled Invoice"
 msgstr "Hóa đơn đã hủy bỏ"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4599,7 +4631,7 @@ msgid "Income Account on Product Template"
 msgstr "Tài khoản Thu nhập trên Mẫu Sản phẩm"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4625,11 +4657,13 @@ msgstr "Năm tài chính mới"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "Các hóa đơn"
 
@@ -4766,26 +4800,24 @@ msgid "Journal Items"
 msgstr "Journal Items"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "Lỗi"
@@ -4892,7 +4924,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4919,7 +4951,7 @@ msgid "Child Tax Accounts"
 msgstr "Child Tax Accounts"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "Chu kỳ bắt đầu phải nhỏ hơn chu kỳ kết thúc"
@@ -4942,6 +4974,7 @@ msgstr "Analytic Balance -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4985,6 +5018,8 @@ msgstr "Loại chu kỳ"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "Thanh toán"
 
@@ -5059,7 +5094,7 @@ msgid "Line 1:"
 msgstr "Dòng 1:"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "Lỗi toàn vẹn !"
@@ -5092,6 +5127,7 @@ msgstr "Kết quả đối soát"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "Bảng cân đối kế toán"
@@ -5168,6 +5204,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5297,7 +5334,6 @@ msgstr "Account Common Account Report"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "Communication"
 
@@ -5349,13 +5385,13 @@ msgid "End of Year Entries Journal"
 msgstr "End of Year Entries Journal"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5432,7 +5468,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5605,7 +5640,7 @@ msgid "Generate Opening Entries"
 msgstr "Generate Opening Entries"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "Đã được đối soát!"
@@ -5638,14 +5673,14 @@ msgid "Child Accounts"
 msgstr "Tài khoản con"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "Miễn bỏ"
@@ -5665,7 +5700,7 @@ msgstr "Income"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "Nhà cung cấp"
@@ -5695,7 +5730,7 @@ msgid "Account n°"
 msgstr "Tài khoản số"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "Tham chiếu tự do"
@@ -5710,7 +5745,9 @@ msgstr "Định giá"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "Các Tài khoản Phải thu và Phải trả"
@@ -5817,7 +5854,7 @@ msgid "Filter by"
 msgstr "Lọc theo"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5828,8 +5865,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "Bạn không thể sử dụng một tài khoản không hoạt động!"
@@ -5870,8 +5907,8 @@ msgid "Number of Days"
 msgstr "Số ngày"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5933,7 +5970,7 @@ msgid "Multipication factor for Base code"
 msgstr "Multipication factor for Base code"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "chưa được hiện thực"
@@ -5972,6 +6009,8 @@ msgstr "Analytic Entries Analysis"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "Quá khứ"
 
@@ -6252,6 +6291,8 @@ msgstr "Phần trăm"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "Sổ nhật ký & Đối tác"
 
@@ -6261,7 +6302,7 @@ msgid "Power"
 msgstr "Power"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6303,6 +6344,7 @@ msgid "Applicable Type"
 msgstr "Applicable Type"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "Tham chiếu Hóa đơn"
@@ -6533,8 +6575,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "Các bút toán: "
@@ -6550,7 +6592,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "Couldn't create move between different companies"
@@ -6599,13 +6641,13 @@ msgstr "State is draft"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "Tổng nợ"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "Bút toán \"%s\" không hợp lệ !"
@@ -6679,25 +6721,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6729,8 +6772,8 @@ msgid "Printed"
 msgstr "Đã được in"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6789,7 +6832,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "Display Ledger Report with One partner per page"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6948,7 +6991,7 @@ msgid "Total:"
 msgstr "Tổng cộng:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6986,7 +7029,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -7060,14 +7103,14 @@ msgid "Source Document"
 msgstr "Tài liệu gốc"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -7174,8 +7217,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Are you sure you want to open this invoice ?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -7188,7 +7231,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "kế toán Entries"
@@ -7327,7 +7370,7 @@ msgstr ""
 "to create specific taxes in a custom domain."
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "Bạn cần phải có thời gian lựa chọn thuộc về cùng một công ty"
@@ -7358,8 +7401,8 @@ msgid "Reporting"
 msgstr "Báo cáo"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7455,7 +7498,7 @@ msgid "Sign on Reports"
 msgstr "Sign on Reports"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7466,7 +7509,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7501,13 +7544,14 @@ msgid "Optional Information"
 msgstr "Thông tin tùy chọn"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "The journal must have default credit and debit account"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ":"
 
@@ -7536,13 +7580,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "Tài khoản không đúng !"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "Sổ nhật ký Bán hàng"
@@ -7559,7 +7603,7 @@ msgid "Invoice Tax"
 msgstr "Thuế Hóa đơn"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "No piece number !"
@@ -7609,7 +7653,7 @@ msgstr "Đến"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7657,13 +7701,15 @@ msgstr "Tháng Năm"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "Các tài khoản phải trả"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7707,7 +7753,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "Tiền mặt"
@@ -7719,15 +7765,15 @@ msgid "Account Destination"
 msgstr "Account Destination"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7884,13 +7930,14 @@ msgstr "Đã sửa"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "Cảnh báo !"
@@ -7942,7 +7989,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "Chọn một loại tiền để áp dụng cho hóa đơn"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7955,7 +8002,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "Can not %s draft/proforma/cancel invoice."
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "No Invoice Lines !"
@@ -8031,7 +8078,7 @@ msgid "Deferral Method"
 msgstr "Phương pháp hoãn lại"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "Hóa đơn '%s' đã được trả."
@@ -8097,7 +8144,7 @@ msgid "Associated Partner"
 msgstr "Đối tác Liên quan"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "You must first select a partner !"
@@ -8146,7 +8193,7 @@ msgstr ""
 "của mình theo quy định của nước bạn."
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -8168,7 +8215,7 @@ msgid "Choose Fiscal Year"
 msgstr "Chọn năm tài chính"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "Sổ nhật ký Hoàn tiền Mua hàng"
@@ -8259,7 +8306,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "Compute Code for Taxes Included Prices"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8399,7 +8446,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8478,10 +8525,12 @@ msgstr "Sổ nhật ký Hoàn tiền"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "Lọc bởi"
 
@@ -8518,7 +8567,7 @@ msgid "The partner account used for this invoice."
 msgstr "The partner account used for this invoice."
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8541,7 +8590,7 @@ msgid "Payment Term Line"
 msgstr "Payment Term Line"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "Purchase Journal"
@@ -8628,7 +8677,7 @@ msgid "Unpaid Invoices"
 msgstr "Các hóa đơn chưa thanh toán"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8737,7 +8786,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "Keep empty for all open fiscal years"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "Việc di chuyển tài khoản (% s) để tập trung đã được khẳng định!"
@@ -8752,7 +8801,7 @@ msgstr ""
 "entry."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8833,7 +8882,7 @@ msgid "Contact Address"
 msgstr "Địa chỉ liên hệ"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8868,12 +8917,14 @@ msgstr "Các hợp đồng"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "chưa biết"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "Opening Entries Journal"
@@ -8895,7 +8946,7 @@ msgstr ""
 "Profilt & Loss Report"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8986,7 +9037,7 @@ msgid "Period from"
 msgstr "Chu kỳ từ"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "Sales Refund Journal"
@@ -9033,7 +9084,7 @@ msgid "Purchase Tax(%)"
 msgstr "Thuế mua hàng(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "Please create some invoice lines."
@@ -9049,7 +9100,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -9087,8 +9138,6 @@ msgstr "Kết thúc chu kỳ"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -9103,6 +9152,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -9123,6 +9173,7 @@ msgstr "Bắt đầu chu kỳ"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "Analysis Direction"
 
@@ -9142,7 +9193,7 @@ msgstr "Journal View"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "Total credit"
@@ -9212,6 +9263,7 @@ msgstr "Các sổ phụ ngân hàng"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9292,7 +9344,7 @@ msgstr ""
 "related to this account and the counter-part \"Account receivable\"."
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "You must select accounts to reconcile"
@@ -9320,7 +9372,6 @@ msgstr ""
 "khoảng thời gian cụ thể."
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "Các bộ lọc theo"
@@ -9342,7 +9393,7 @@ msgid "Move"
 msgstr "Move"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "You can not change the tax, you should remove and recreate lines !"
@@ -9401,7 +9452,7 @@ msgid "Consolidated Children"
 msgstr "Consolidated Children"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9464,6 +9515,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9520,6 +9572,7 @@ msgstr "Entry Subscription"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9527,6 +9580,7 @@ msgstr "Entry Subscription"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9569,7 +9623,7 @@ msgid "Unreconciled"
 msgstr "Chưa được đối soát"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "Tổng không hợp lệ !"
@@ -9635,7 +9689,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "Lỗi chưa biết"
@@ -9674,6 +9728,7 @@ msgstr "Validate Account Move"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9778,9 +9833,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "Các chu kỳ"
 
@@ -9949,6 +10006,7 @@ msgstr "Posted"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9996,7 +10054,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -10033,6 +10091,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10053,6 +10112,7 @@ msgstr "Journal: Tẩt cả"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -10067,7 +10127,9 @@ msgstr "Journal: Tẩt cả"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -10077,6 +10139,8 @@ msgstr "Journal: Tẩt cả"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -10239,6 +10303,7 @@ msgstr "Hóa đơn nhà cung cấp"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -10272,6 +10337,8 @@ msgstr "Lỗi! Bạn không thể tạo tài khoản đệ quy mẫu."
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -10289,7 +10356,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "Entry is already reconciled"
@@ -10325,8 +10392,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "With movements"
@@ -10449,8 +10518,8 @@ msgid "Statistic Reports"
 msgstr "Các báo cáo thống kê"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "Tài khoản không hợp lệ!"
@@ -10476,7 +10545,7 @@ msgid "Accounts Mapping"
 msgstr "Accounts Mapping"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "Hóa đơn '%s' đang chờ kiểm tra."
@@ -10666,6 +10735,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10744,6 +10814,8 @@ msgstr "Maturity"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "Tương lai"
 
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 46ebba61e4c..d722cd5673b 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-07-11 03:05+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-11-01 08:44+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:04+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -37,7 +37,7 @@ msgstr "其它设置"
 msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
-msgstr "确定以下报表的显示顺序：”会计-报表-通用报表-税-税报表“"
+msgstr "确定以下报表的显示顺序：”会计-报表-通用报表-税务-税务报表“"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -91,7 +91,7 @@ msgstr "应收账款账龄"
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
 msgid "Import from invoice or payment"
-msgstr "从发票或支付款导入"
+msgstr "从发票或付款单导入"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -139,6 +139,7 @@ msgstr "核销"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "关联"
 
@@ -155,13 +156,13 @@ msgid ""
 msgstr "如果设置为false，该付款条款将会被隐藏。"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr "其它凭证簿"
@@ -218,10 +219,10 @@ msgstr "选择凭证行核销"
 msgid ""
 "Check this box if you don't want any VAT related to this Tax Code to appear "
 "on invoices"
-msgstr "勾选此项使发票上不显示增值税"
+msgstr "勾选此项隐藏发票上与此税号相关的增值税信息"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "发票'%s'已部分支付了%s%s ，总金额为：%s%s, 尚余%s%s未付"
@@ -237,7 +238,7 @@ msgid "Belgian Reports"
 msgstr "比利时报表"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr "不能在已关闭的账簿添加或修改分录"
@@ -283,7 +284,7 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr "发票明细的科目公司与发票头的公司不匹配。"
@@ -560,8 +561,10 @@ msgid "The accountant confirms the statement."
 msgstr "财务人员确认的报表"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -617,7 +620,7 @@ msgid "Main Sequence must be different from current !"
 msgstr "序列号必须唯一"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr "根据输入的凭证日期没有找到期间或找到了多个期间"
@@ -628,7 +631,7 @@ msgid "Tax Code Amount"
 msgstr "税金额"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -655,8 +658,8 @@ msgid "Journal Period"
 msgstr "账簿的会计期间"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr "要核销这些凭证，这些凭证所属公司必须一致"
@@ -733,6 +736,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr "你只能对发票草稿修改币种"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "财务报表"
@@ -748,12 +752,13 @@ msgstr "财务报表"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "类型"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -880,12 +885,13 @@ msgid "Create 3 Months Periods"
 msgstr "创建季度"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "到期"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -963,7 +969,7 @@ msgid ""
 msgstr "如果这税科目是一个税编码科目，这字段金额要征税。如果这税科目是一个税基编码，这字段的金额不用征税。"
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr "无法为该科目模板定位其父科目"
@@ -996,10 +1002,10 @@ msgid "Code"
 msgstr "编码"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1061,7 +1067,7 @@ msgid ""
 msgstr "根据您国家定义这些类型,该类型包含有关科目及其具体的信息。"
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1109,7 +1115,7 @@ msgstr "未平财务凭证"
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "银行"
@@ -1201,7 +1207,7 @@ msgid "The move of this entry line."
 msgstr "分录明细的变动"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1222,7 +1228,7 @@ msgid "Entry Label"
 msgstr "分录标签"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr "您不能修改/删除这账簿和在此会计期间的分录！"
@@ -1307,14 +1313,15 @@ msgid "Taxes"
 msgstr "税"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "选择会计期间的开始和结束时间"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "损益类"
 
@@ -1369,6 +1376,7 @@ msgid "Journal Items Analysis"
 msgstr "账簿明细分析"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "业务伙伴"
@@ -1393,8 +1401,10 @@ msgid "Central Journal"
 msgstr "汇总账簿"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1508,7 +1518,7 @@ msgstr "已核销处理"
 #. module: account
 #: field:account.journal.view,columns_id:0
 msgid "Columns"
-msgstr "列"
+msgstr "栏目"
 
 #. module: account
 #: report:account.overdue:0
@@ -1619,6 +1629,7 @@ msgid "Separated Journal Sequences"
 msgstr "分散的账簿序列"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr "负责人"
@@ -1647,7 +1658,7 @@ msgid "Year Sum"
 msgstr "年合计"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1720,7 +1731,7 @@ msgid "Customer Ref:"
 msgstr "客户关联:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr "用户 %s 没有权限访问 %s！"
@@ -2039,7 +2050,7 @@ msgid "Pro-forma"
 msgstr "形式发票"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2063,7 +2074,7 @@ msgid "Search Chart of Account Templates"
 msgstr "搜索科目一览表模板"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2114,7 +2125,7 @@ msgid "Description"
 msgstr "说明"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2133,7 +2144,7 @@ msgid "Income Account"
 msgstr "收益科目"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr "没定义销售/采购 的账簿!"
@@ -2173,6 +2184,7 @@ msgstr "产品模板"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2182,6 +2194,7 @@ msgstr "产品模板"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2232,7 +2245,7 @@ msgid "Account Line"
 msgstr "发票明细"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2263,7 +2276,7 @@ msgid "Main Sequence"
 msgstr "主序列"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2317,7 +2330,7 @@ msgstr "筛选"
 #: selection:report.invoice.created,state:0
 #, python-format
 msgid "Open"
-msgstr "打开"
+msgstr "待支付"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
@@ -2337,7 +2350,7 @@ msgid "Account Tax Code"
 msgstr "税编码"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2423,7 +2436,7 @@ msgid "Account Model Entries"
 msgstr "凭证模板"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2484,7 +2497,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr "凭证行核销（注销）"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2516,7 +2528,7 @@ msgid "Accounts"
 msgstr "科目"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "设置错误!"
@@ -2636,6 +2648,7 @@ msgstr "系统在指定日期前自动生成分录。"
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "业务伙伴以前的余额表"
@@ -2685,14 +2698,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr "该向导将创建一个定期分录"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr "没定义账簿的序列！"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2795,7 +2808,7 @@ msgid "Base Code Amount"
 msgstr "税基金额"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2808,7 +2821,7 @@ msgid "Default Sale Tax"
 msgstr "默认销售税"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "发票 '%s' 已审核"
@@ -2846,7 +2859,7 @@ msgid "Fiscal Position"
 msgstr "财务结构"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2996,7 +3009,7 @@ msgid "View"
 msgstr "视图"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3040,7 +3053,7 @@ msgstr "业务伙伴会计帐本(往来帐)"
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr "指定账簿的序列"
+msgstr "指定账簿栏目的序列"
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3065,7 +3078,7 @@ msgstr "科目一览表模板"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "设置您的会计选项"
 
 #. module: account
 #: view:report.account.sales:0
@@ -3193,7 +3206,7 @@ msgid "Starting Balance"
 msgstr "期初余额"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "未定义业务伙伴！"
@@ -3247,7 +3260,7 @@ msgid "Chart of Tax"
 msgstr "税一览表"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "期末余额与计算出来的余额不平衡."
@@ -3328,6 +3341,7 @@ msgstr "数量"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "期间（天数）"
 
@@ -3374,7 +3388,7 @@ msgid "Detail"
 msgstr "详情"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3391,9 +3405,16 @@ msgid "VAT :"
 msgstr "增值税 :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3414,7 +3435,7 @@ msgid "Centralised counterpart"
 msgstr "汇总副本"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr "凭证中不能使用 “视图” 类型的会计科目 %s %s"
@@ -3439,6 +3460,7 @@ msgstr "如果您不选择会计年度将使用所有开启的会计年度"
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3466,10 +3488,17 @@ msgstr "如果您不选择会计年度将使用所有开启的会计年度"
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "日期"
 
@@ -3486,7 +3515,6 @@ msgstr "反核销"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3500,7 +3528,7 @@ msgid "Chart of Accounts Template"
 msgstr "科目一览表模板"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3511,7 +3539,7 @@ msgstr ""
 "请在业务伙伴里定义它"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr "部分分录已核销！"
@@ -3542,6 +3570,8 @@ msgstr "预算"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "无筛选"
 
@@ -3623,7 +3653,7 @@ msgid "Analytic Items"
 msgstr "分析明细"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "无法更改税目!"
@@ -3654,7 +3684,7 @@ msgid "Mapping"
 msgstr "图表"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3668,6 +3698,7 @@ msgstr "无法在合并（centralised）凭证簿上创建发票，请在凭证
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3681,7 +3712,7 @@ msgid "Account Aged Trial balance Report"
 msgstr "过期的试算表"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr "凭证中不能使用关闭的会计科目 %s %s"
@@ -4001,7 +4032,7 @@ msgid "Month"
 msgstr "月份"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4060,7 +4091,7 @@ msgid "Account Base Code"
 msgstr "税基编码"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "未定义此产品“%s“ (id:%d)的费用科目"
@@ -4269,7 +4300,7 @@ msgid "Allow Reconciliation"
 msgstr "允许核销"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4303,7 +4334,7 @@ msgid "Recurring Models"
 msgstr "定期模型"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "输入错误"
@@ -4315,6 +4346,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "改变"
 
@@ -4359,7 +4391,7 @@ msgid "Example"
 msgstr "例子"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4373,7 +4405,7 @@ msgid "Keep empty to use the income account"
 msgstr "留空为使用利润科目"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "采购税 %.2f%%"
@@ -4401,7 +4433,7 @@ msgstr "科目一览表"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "客户"
@@ -4417,7 +4449,7 @@ msgid "Cancelled Invoice"
 msgstr "已取消的发票"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4469,7 +4501,7 @@ msgid "Income Account on Product Template"
 msgstr "产品模板的收入科目"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "杂项"
@@ -4494,11 +4526,13 @@ msgstr "新的会计年度"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "发票列表"
 
@@ -4634,29 +4668,27 @@ msgstr "税适用"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr "会计凭证行"
+msgstr "会计凭证明细"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "错误"
@@ -4759,7 +4791,7 @@ msgid "Beginning of Period Date"
 msgstr "期间开始日期"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4785,7 +4817,7 @@ msgid "Child Tax Accounts"
 msgstr "子税科目"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "开始日期应小于会计期间的结束日期"
@@ -4806,6 +4838,7 @@ msgstr "辅助核算余额 -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4849,6 +4882,8 @@ msgstr "会计期间类型"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "付款"
 
@@ -4892,7 +4927,7 @@ msgstr "科目报表"
 #. module: account
 #: field:account.journal.column,name:0
 msgid "Column Name"
-msgstr "列名称"
+msgstr "栏目名称"
 
 #. module: account
 #: view:account.general.journal:0
@@ -4922,7 +4957,7 @@ msgid "Line 1:"
 msgstr "第一行"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "完整性错误！"
@@ -4955,6 +4990,7 @@ msgstr "核销结果"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "资产负债表"
@@ -5031,6 +5067,7 @@ msgstr "报表"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5158,7 +5195,6 @@ msgstr "科目合并的科目报表"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "沟通"
 
@@ -5210,13 +5246,13 @@ msgid "End of Year Entries Journal"
 msgstr "账簿的结账分录"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5290,7 +5326,6 @@ msgid "Customer Invoices And Refunds"
 msgstr "客户发票和退款"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5456,7 +5491,7 @@ msgid "Generate Opening Entries"
 msgstr "产生开启分录"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr "已核销！"
@@ -5489,14 +5524,14 @@ msgid "Child Accounts"
 msgstr "子科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "会计凭证号 (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "补差额"
@@ -5516,7 +5551,7 @@ msgstr "收入"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "供应商"
@@ -5546,7 +5581,7 @@ msgid "Account n°"
 msgstr "科目编码"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "无限制的单号"
@@ -5561,7 +5596,9 @@ msgstr "定价"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr "应收款与应付款科目"
@@ -5657,7 +5694,7 @@ msgid "Filter by"
 msgstr "筛选"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "模型中存在错误的表达式 \"%(...)s\""
@@ -5668,8 +5705,8 @@ msgid "Entry Date"
 msgstr "分录日期"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "您不能使用一个停用的科目！"
@@ -5710,8 +5747,8 @@ msgid "Number of Days"
 msgstr "天数"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5773,7 +5810,7 @@ msgid "Multipication factor for Base code"
 msgstr "税率"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "尚未实现"
@@ -5810,6 +5847,8 @@ msgstr "辅助核算分析"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "过去"
 
@@ -6083,6 +6122,8 @@ msgstr "百分比"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr "账簿 & 业务伙伴"
 
@@ -6092,7 +6133,7 @@ msgid "Power"
 msgstr "强制"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "不能生成一个未使用的凭证代码。"
@@ -6132,6 +6173,7 @@ msgid "Applicable Type"
 msgstr "适用类型"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr "发票"
@@ -6350,8 +6392,8 @@ msgid "You can not remove an account containing journal items."
 msgstr "您不能删除已经存在凭证的账户。"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr "凭证： "
@@ -6367,7 +6409,7 @@ msgid "Currency of the related account journal."
 msgstr "货币的关联账户凭证。"
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "无法创建公司之间的过帐"
@@ -6407,13 +6449,13 @@ msgstr "草稿状态"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "借方合计"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr "凭证\"%s\"无效！"
@@ -6481,25 +6523,26 @@ msgstr "损益(费用账户)"
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6531,8 +6574,8 @@ msgid "Printed"
 msgstr "已打印"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "错误："
@@ -6588,7 +6631,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "一页一个业务伙伴的分类帐"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6743,7 +6786,7 @@ msgid "Total:"
 msgstr "合计:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6780,7 +6823,7 @@ msgid "Taxes used in Sales"
 msgstr "销售中用到的税"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6806,7 +6849,7 @@ msgstr "销售"
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr "账簿列"
+msgstr "账簿栏目"
 
 #. module: account
 #: selection:account.invoice.report,state:0
@@ -6852,14 +6895,14 @@ msgid "Source Document"
 msgstr "源单据"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr "你不能删除一个已复核的会计凭证“%s” ！"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6955,8 +6998,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "你确定要打开这发票?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6969,7 +7012,7 @@ msgid "Opening Entries Expense Account"
 msgstr "未分配利润科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "会计分录"
@@ -7100,7 +7143,7 @@ msgid ""
 msgstr "这字段只用于，如果您开发自己的模块允许开发者在自定义域创建特定的税"
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "同一家公司你应该选择一个会计期间"
@@ -7131,8 +7174,8 @@ msgid "Reporting"
 msgstr "报表"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7221,7 +7264,7 @@ msgid "Sign on Reports"
 msgstr "报表上的符号"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr "用于生成期初余额会计凭证的期间不存在"
@@ -7232,7 +7275,7 @@ msgid "Root/View"
 msgstr "根/视图"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7267,13 +7310,14 @@ msgid "Optional Information"
 msgstr "可选信息"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr "这账簿必须要有默认贷方和借方科目"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr "："
 
@@ -7300,13 +7344,13 @@ msgid "Maturity Date"
 msgstr "到期日期"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "无效科目!"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr "销售账簿"
@@ -7323,7 +7367,7 @@ msgid "Invoice Tax"
 msgstr "发票税"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "没会计期间!"
@@ -7375,7 +7419,7 @@ msgstr "到"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "汇兑损益调整"
@@ -7423,13 +7467,15 @@ msgstr "5"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr "应付款科目"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "定义了全局税，但发票行中没有！"
@@ -7473,7 +7519,7 @@ msgstr "报表名称"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "现金"
@@ -7485,15 +7531,15 @@ msgid "Account Destination"
 msgstr "目标科目"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7640,13 +7686,14 @@ msgstr "固定"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "警告 !"
@@ -7698,7 +7745,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr "在发票上选择合适的币别"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7711,7 +7758,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "不能注销 %s 草稿/形式/取消的发票"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "没有发票明细"
@@ -7789,7 +7836,7 @@ msgid "Deferral Method"
 msgstr "递延方法"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "发票 '%s' 已支付。"
@@ -7851,7 +7898,7 @@ msgid "Associated Partner"
 msgstr "相关业务伙伴"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "你必须首先选择一个业务伙伴!"
@@ -7902,7 +7949,7 @@ msgid ""
 msgstr "税目一览表是用来生成您定期的税单。请您按照贵国的税法设置。"
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7924,7 +7971,7 @@ msgid "Choose Fiscal Year"
 msgstr "选择会计年度"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr "采购红字发票账簿"
@@ -8011,7 +8058,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr "含税价格计算代码"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8139,7 +8186,7 @@ msgid "current month"
 msgstr "本月"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8222,10 +8269,12 @@ msgstr "红字发票账簿"
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "筛选"
 
@@ -8258,7 +8307,7 @@ msgid "The partner account used for this invoice."
 msgstr "这发票用这业务伙伴科目"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "税 %.2f%%"
@@ -8281,7 +8330,7 @@ msgid "Payment Term Line"
 msgstr "付款条款明细"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr "采购账簿"
@@ -8366,7 +8415,7 @@ msgid "Unpaid Invoices"
 msgstr "未支付的发票"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr "这个供应商的付款条件没有付款条件行！"
@@ -8472,7 +8521,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "保留空为打开所有的会计年度"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "合并的凭证 (%s) 已确认！"
@@ -8485,7 +8534,7 @@ msgid ""
 msgstr "如果它是一个多货币凭证,这金额表示一个可选的其它货币金额."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8561,7 +8610,7 @@ msgid "Contact Address"
 msgstr "联系地址"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "模型有误！"
@@ -8598,12 +8647,14 @@ msgstr "合同列表"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "未知的"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr "账簿的开账分录"
@@ -8622,7 +8673,7 @@ msgid ""
 msgstr "这科目用于损益(如果是利润：金额就加，损失：金额就减)用作计算损益报表"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr "请为这张发票对应的凭证簿选择编号规则"
@@ -8708,7 +8759,7 @@ msgid "Period from"
 msgstr "会计期间从"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr "销售红字发票账簿"
@@ -8755,7 +8806,7 @@ msgid "Purchase Tax(%)"
 msgstr "进项税(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "请创建发票明细。"
@@ -8771,7 +8822,7 @@ msgid "Display Detail"
 msgstr "显示明细"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -8805,8 +8856,6 @@ msgstr "结束会计期间"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "会计报表"
@@ -8821,6 +8870,7 @@ msgstr "会计报表"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8841,6 +8891,7 @@ msgstr "开始会计期间"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "分析趋势"
 
@@ -8860,7 +8911,7 @@ msgstr "账簿视图"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "贷方合计"
@@ -8926,6 +8977,7 @@ msgstr "银行对账单"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9002,7 +9054,7 @@ msgstr ""
 "此界面用于会计输入正式的单据。如果需要输入一张客户发票，首先选择好账簿和会计期间，然后首先输入利润科目的分录，系统会自动处理相关的税和应收款。"
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr "您必须选择核销科目"
@@ -9026,7 +9078,6 @@ msgstr ""
 "定时间段内是否允许过账"
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "筛选"
@@ -9048,7 +9099,7 @@ msgid "Move"
 msgstr "凭证"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr "您不能更改此税目，请移除并重新创建凭证！"
@@ -9104,7 +9155,7 @@ msgid "Consolidated Children"
 msgstr "合并子科目"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9165,6 +9216,7 @@ msgstr "没有定期开账/关账期间，请创建一个再设置期初余额
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9223,6 +9275,7 @@ msgstr "周期性凭证"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9230,6 +9283,7 @@ msgstr "周期性凭证"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9272,7 +9326,7 @@ msgid "Unreconciled"
 msgstr "反核销"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "坏的合计!"
@@ -9333,7 +9387,7 @@ msgid "Comparison"
 msgstr "比较"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "未知错误"
@@ -9370,6 +9424,7 @@ msgstr "使凭证生效"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9470,9 +9525,11 @@ msgstr "过去30天的成本凭证"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "会计期间"
 
@@ -9585,7 +9642,7 @@ msgstr "本报表让您打印或产生一个由所有账簿生成的总账"
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Regular"
-msgstr "定期"
+msgstr "常规科目"
 
 #. module: account
 #: view:account.account:0
@@ -9636,6 +9693,7 @@ msgstr "已登账"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9683,7 +9741,7 @@ msgid "No detail"
 msgstr "不详"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "没有为此产品  \"%s\" (id:%d)：定义利润科目"
@@ -9719,6 +9777,7 @@ msgid "Verification Total"
 msgstr "检查合计数"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9739,6 +9798,7 @@ msgstr "所有账簿"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9753,7 +9813,9 @@ msgstr "所有账簿"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9763,6 +9825,8 @@ msgstr "所有账簿"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9916,6 +9980,7 @@ msgstr "供应商发票"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9949,6 +10014,8 @@ msgstr "错误！您不能创建递归的科目模板。"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr "会计凭证编号"
 
@@ -9966,7 +10033,7 @@ msgid ""
 msgstr "如果会计科目已经有过会计凭证，且现在是‘关闭’类型，不能改为其他类型。"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr "分录已核销"
@@ -10003,8 +10070,10 @@ msgstr ""
 "内部类型用于对不同类型的科目进行控制：视图科目不能做凭证，合并科目用于在多公司合并中指定子科目，应收应付科目用于业务伙伴，关闭科目用于不再使用的科目。"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "进展"
@@ -10122,8 +10191,8 @@ msgid "Statistic Reports"
 msgstr "统计报表"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "无效科目！"
@@ -10151,7 +10220,7 @@ msgid "Accounts Mapping"
 msgstr "科目一览"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "发票'%s'是等待复核。"
@@ -10406,6 +10475,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10479,13 +10549,15 @@ msgstr "到期日期"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "前景"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr "搜索分录"
+msgstr "搜索会计凭证明细"
 
 #. module: account
 #: help:account.tax,base_sign:0
diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po
index fcf4d3d9a95..473161a6b7d 100644
--- a/addons/account/i18n/zh_HK.po
+++ b/addons/account/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:08+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:06+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -140,6 +140,7 @@ msgstr ""
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "參考"
 
@@ -156,13 +157,13 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
 msgstr ""
@@ -222,7 +223,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr ""
@@ -238,7 +239,7 @@ msgid "Belgian Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
 msgstr ""
@@ -284,7 +285,7 @@ msgid "St."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
@@ -558,8 +559,10 @@ msgid "The accountant confirms the statement."
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -615,7 +618,7 @@ msgid "Main Sequence must be different from current !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
@@ -626,7 +629,7 @@ msgid "Tax Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr ""
@@ -653,8 +656,8 @@ msgid "Journal Period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
 msgstr ""
@@ -731,6 +734,7 @@ msgid "You can only change currency for Draft Invoice !"
 msgstr ""
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr ""
@@ -746,12 +750,13 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
@@ -877,12 +882,13 @@ msgid "Create 3 Months Periods"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
@@ -960,7 +966,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
 msgstr ""
@@ -993,10 +999,10 @@ msgid "Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
@@ -1058,7 +1064,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1106,7 +1112,7 @@ msgstr ""
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr ""
@@ -1198,7 +1204,7 @@ msgid "The move of this entry line."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
@@ -1219,7 +1225,7 @@ msgid "Entry Label"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
 msgstr ""
@@ -1304,14 +1310,15 @@ msgid "Taxes"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr ""
 
@@ -1366,6 +1373,7 @@ msgid "Journal Items Analysis"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr ""
@@ -1390,8 +1398,10 @@ msgid "Central Journal"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
@@ -1616,6 +1626,7 @@ msgid "Separated Journal Sequences"
 msgstr ""
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
 msgstr ""
@@ -1644,7 +1655,7 @@ msgid "Year Sum"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1717,7 +1728,7 @@ msgid "Customer Ref:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
 msgstr ""
@@ -2036,7 +2047,7 @@ msgid "Pro-forma"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
@@ -2060,7 +2071,7 @@ msgid "Search Chart of Account Templates"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2109,7 +2120,7 @@ msgid "Description"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr ""
@@ -2128,7 +2139,7 @@ msgid "Income Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
 msgstr ""
@@ -2168,6 +2179,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2177,6 +2189,7 @@ msgstr ""
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2227,7 +2240,7 @@ msgid "Account Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
@@ -2258,7 +2271,7 @@ msgid "Main Sequence"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
@@ -2332,7 +2345,7 @@ msgid "Account Tax Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2413,7 +2426,7 @@ msgid "Account Model Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr ""
@@ -2472,7 +2485,6 @@ msgid "Account move line reconcile (writeoff)"
 msgstr ""
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
@@ -2504,7 +2516,7 @@ msgid "Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr ""
@@ -2624,6 +2636,7 @@ msgstr ""
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr ""
@@ -2671,14 +2684,14 @@ msgid "This wizard will create recurring accounting entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
@@ -2781,7 +2794,7 @@ msgid "Base Code Amount"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2794,7 +2807,7 @@ msgid "Default Sale Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr ""
@@ -2832,7 +2845,7 @@ msgid "Fiscal Position"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2979,7 +2992,7 @@ msgid "View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3171,7 +3184,7 @@ msgid "Starting Balance"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr ""
@@ -3225,7 +3238,7 @@ msgid "Chart of Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr ""
@@ -3306,6 +3319,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr ""
 
@@ -3352,7 +3366,7 @@ msgid "Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3367,9 +3381,16 @@ msgid "VAT :"
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3390,7 +3411,7 @@ msgid "Centralised counterpart"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr ""
@@ -3415,6 +3436,7 @@ msgstr ""
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3442,10 +3464,17 @@ msgstr ""
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr ""
 
@@ -3462,7 +3491,6 @@ msgstr ""
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
@@ -3476,7 +3504,7 @@ msgid "Chart of Accounts Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
@@ -3485,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
 msgstr ""
@@ -3516,6 +3544,8 @@ msgstr ""
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr ""
 
@@ -3597,7 +3627,7 @@ msgid "Analytic Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr ""
@@ -3628,7 +3658,7 @@ msgid "Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3642,6 +3672,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3655,7 +3686,7 @@ msgid "Account Aged Trial balance Report"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
 msgstr ""
@@ -3975,7 +4006,7 @@ msgid "Month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
@@ -4032,7 +4063,7 @@ msgid "Account Base Code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -4239,7 +4270,7 @@ msgid "Allow Reconciliation"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4273,7 +4304,7 @@ msgid "Recurring Models"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr ""
@@ -4285,6 +4316,7 @@ msgstr ""
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr ""
 
@@ -4329,7 +4361,7 @@ msgid "Example"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4343,7 +4375,7 @@ msgid "Keep empty to use the income account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr ""
@@ -4371,7 +4403,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr ""
@@ -4387,7 +4419,7 @@ msgid "Cancelled Invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4439,7 +4471,7 @@ msgid "Income Account on Product Template"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr ""
@@ -4464,11 +4496,13 @@ msgstr ""
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr ""
 
@@ -4605,26 +4639,24 @@ msgid "Journal Items"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr ""
@@ -4727,7 +4759,7 @@ msgid "Beginning of Period Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
@@ -4751,7 +4783,7 @@ msgid "Child Tax Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr ""
@@ -4772,6 +4804,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4815,6 +4848,8 @@ msgstr ""
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr ""
 
@@ -4888,7 +4923,7 @@ msgid "Line 1:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr ""
@@ -4921,6 +4956,7 @@ msgstr ""
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr ""
@@ -4997,6 +5033,7 @@ msgstr ""
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5124,7 +5161,6 @@ msgstr ""
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr ""
 
@@ -5176,13 +5212,13 @@ msgid "End of Year Entries Journal"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5256,7 +5292,6 @@ msgid "Customer Invoices And Refunds"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
@@ -5419,7 +5454,7 @@ msgid "Generate Opening Entries"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
 msgstr ""
@@ -5452,14 +5487,14 @@ msgid "Child Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr ""
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr ""
@@ -5479,7 +5514,7 @@ msgstr ""
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr ""
@@ -5509,7 +5544,7 @@ msgid "Account n°"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr ""
@@ -5524,7 +5559,9 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
 msgstr ""
@@ -5620,7 +5657,7 @@ msgid "Filter by"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr ""
@@ -5631,8 +5668,8 @@ msgid "Entry Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr ""
@@ -5673,8 +5710,8 @@ msgid "Number of Days"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5736,7 +5773,7 @@ msgid "Multipication factor for Base code"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr ""
@@ -5773,6 +5810,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr ""
 
@@ -6046,6 +6085,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
 msgstr ""
 
@@ -6055,7 +6096,7 @@ msgid "Power"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr ""
@@ -6095,6 +6136,7 @@ msgid "Applicable Type"
 msgstr ""
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
 msgstr ""
@@ -6313,8 +6355,8 @@ msgid "You can not remove an account containing journal items."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
 msgstr ""
@@ -6330,7 +6372,7 @@ msgid "Currency of the related account journal."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr ""
@@ -6369,13 +6411,13 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
 msgstr ""
@@ -6443,25 +6485,26 @@ msgstr ""
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6493,8 +6536,8 @@ msgid "Printed"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr ""
@@ -6549,7 +6592,7 @@ msgid "Display Ledger Report with One partner per page"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
@@ -6700,7 +6743,7 @@ msgid "Total:"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6730,7 +6773,7 @@ msgid "Taxes used in Sales"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6798,14 +6841,14 @@ msgid "Source Document"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
 msgstr ""
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6901,8 +6944,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6915,7 +6958,7 @@ msgid "Opening Entries Expense Account"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr ""
@@ -7046,7 +7089,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr ""
@@ -7077,8 +7120,8 @@ msgid "Reporting"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7167,7 +7210,7 @@ msgid "Sign on Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
 msgstr ""
@@ -7178,7 +7221,7 @@ msgid "Root/View"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr ""
@@ -7213,13 +7256,14 @@ msgid "Optional Information"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
 msgstr ""
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr ""
 
@@ -7246,13 +7290,13 @@ msgid "Maturity Date"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
 msgstr ""
@@ -7269,7 +7313,7 @@ msgid "Invoice Tax"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr ""
@@ -7319,7 +7363,7 @@ msgstr ""
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr ""
@@ -7367,13 +7411,15 @@ msgstr ""
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
@@ -7417,7 +7463,7 @@ msgstr ""
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr ""
@@ -7429,15 +7475,15 @@ msgid "Account Destination"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -7583,13 +7629,14 @@ msgstr "固定"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "警告!"
@@ -7641,7 +7688,7 @@ msgid "Select a currency to apply on the invoice"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
@@ -7654,7 +7701,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr ""
@@ -7728,7 +7775,7 @@ msgid "Deferral Method"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr ""
@@ -7790,7 +7837,7 @@ msgid "Associated Partner"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr ""
@@ -7836,7 +7883,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7858,7 +7905,7 @@ msgid "Choose Fiscal Year"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
 msgstr ""
@@ -7945,7 +7992,7 @@ msgid "Compute Code for Taxes Included Prices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
@@ -8073,7 +8120,7 @@ msgid "current month"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8152,10 +8199,12 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr ""
 
@@ -8188,7 +8237,7 @@ msgid "The partner account used for this invoice."
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr ""
@@ -8211,7 +8260,7 @@ msgid "Payment Term Line"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
 msgstr ""
@@ -8296,7 +8345,7 @@ msgid "Unpaid Invoices"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr ""
@@ -8402,7 +8451,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr ""
@@ -8415,7 +8464,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
@@ -8488,7 +8537,7 @@ msgid "Contact Address"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr ""
@@ -8523,12 +8572,14 @@ msgstr ""
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
 msgstr ""
@@ -8547,7 +8598,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
 msgstr ""
@@ -8633,7 +8684,7 @@ msgid "Period from"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
 msgstr ""
@@ -8680,7 +8731,7 @@ msgid "Purchase Tax(%)"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr ""
@@ -8696,7 +8747,7 @@ msgid "Display Detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr ""
@@ -8728,8 +8779,6 @@ msgstr ""
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr ""
@@ -8744,6 +8793,7 @@ msgstr ""
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8764,6 +8814,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr ""
 
@@ -8783,7 +8834,7 @@ msgstr ""
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr ""
@@ -8848,6 +8899,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8923,7 +8975,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
 msgstr ""
@@ -8945,7 +8997,6 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr ""
@@ -8967,7 +9018,7 @@ msgid "Move"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
 msgstr ""
@@ -9023,7 +9074,7 @@ msgid "Consolidated Children"
 msgstr ""
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
@@ -9084,6 +9135,7 @@ msgstr ""
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9140,6 +9192,7 @@ msgstr ""
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9147,6 +9200,7 @@ msgstr ""
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9189,7 +9243,7 @@ msgid "Unreconciled"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr ""
@@ -9248,7 +9302,7 @@ msgid "Comparison"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr ""
@@ -9285,6 +9339,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9383,9 +9438,11 @@ msgstr ""
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr ""
 
@@ -9547,6 +9604,7 @@ msgstr ""
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9594,7 +9652,7 @@ msgid "No detail"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
@@ -9630,6 +9688,7 @@ msgid "Verification Total"
 msgstr ""
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9650,6 +9709,7 @@ msgstr ""
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9664,7 +9724,9 @@ msgstr ""
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9674,6 +9736,8 @@ msgstr ""
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9827,6 +9891,7 @@ msgstr ""
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9860,6 +9925,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
 msgstr ""
 
@@ -9877,7 +9944,7 @@ msgid ""
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
 msgstr ""
@@ -9913,8 +9980,10 @@ msgid ""
 msgstr ""
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr ""
@@ -10030,8 +10099,8 @@ msgid "Statistic Reports"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr ""
@@ -10057,7 +10126,7 @@ msgid "Accounts Mapping"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr ""
@@ -10247,6 +10316,7 @@ msgstr ""
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10320,6 +10390,8 @@ msgstr ""
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr ""
 
diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po
index f2f3d4279c0..c637258f598 100644
--- a/addons/account/i18n/zh_TW.po
+++ b/addons/account/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-06-20 16:16+0000\n"
+"PO-Revision-Date: 2012-08-21 06:06+0000\n"
 "Last-Translator: Boyce Huang <boyce.huang@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:09+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:07+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -42,7 +42,7 @@ msgstr "確定以下報表的顯示順序：」會計-報表-通用報表-稅-
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "憑證核銷"
+msgstr "帳簿分錄調節"
 
 #. module: account
 #: view:account.account:0
@@ -70,7 +70,7 @@ msgstr "錯誤！此會計期間無效 "
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr "幣種"
+msgstr "幣別"
 
 #. module: account
 #: view:account.tax:0
@@ -81,12 +81,12 @@ msgstr "子項定義"
 #: code:addons/account/account_bank_statement.py:302
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr "憑證\"%s\"無效"
+msgstr "借貸項\"%s\"無效"
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr "應收賬款賬齡"
+msgstr "應收帳款帳齡"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -108,14 +108,14 @@ msgstr "借方合計"
 msgid ""
 "If you unreconciliate transactions, you must also verify all the actions "
 "that are linked to those transactions because they will not be disabled"
-msgstr "如果您反核銷交易，您必須檢查所有與這交易有關的操作，因為他們不會被關閉。"
+msgstr "如果您有未調節交易，您必須檢查所有與此交易有關的操作，因為他們不會被關閉。"
 
 #. module: account
 #: constraint:account.journal:0
 msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
-msgstr "設置錯誤！所選幣種應與預設科目共享。"
+msgstr "設置錯誤！所選幣別應與默認科目共享。"
 
 #. module: account
 #: report:account.invoice:0
@@ -130,7 +130,7 @@ msgstr "來源"
 #: view:account.move.line.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Reconcile"
-msgstr "核銷"
+msgstr "調節"
 
 #. module: account
 #: field:account.bank.statement.line,ref:0
@@ -139,6 +139,7 @@ msgstr "核銷"
 #: field:account.move,ref:0
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
+#: xsl:account.transfer:0
 msgid "Reference"
 msgstr "關聯"
 
@@ -152,30 +153,30 @@ msgstr "選擇會計年度 "
 msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
-msgstr "如果設置為false，該付款條款將會被隱藏。"
+msgstr "如果設置為false，該付款條件將會被隱藏。"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1428
+#: code:addons/account/account_invoice.py:1430
 #, python-format
 msgid "Warning!"
 msgstr "警告！"
 
 #. module: account
-#: code:addons/account/account.py:3112
+#: code:addons/account/account.py:3129
 #, python-format
 msgid "Miscellaneous Journal"
-msgstr "其它憑證簿"
+msgstr "其它帳簿"
 
 #. 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 "來源科目"
 
 #. 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 "所有的輔助核算明細"
 
 #. module: account
 #: field:accounting.report,label_filter:0
@@ -186,7 +187,7 @@ msgstr "欄位標籤"
 #: code:addons/account/wizard/account_move_journal.py:95
 #, python-format
 msgid "Journal: %s"
-msgstr "賬簿：%s"
+msgstr "帳簿：%s"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -194,13 +195,13 @@ msgid ""
 "Gives the type of the analytic journal. When it needs for a document (eg: an "
 "invoice) to create analytic entries, OpenERP will look for a matching "
 "journal of the same type."
-msgstr "定義輔助核算賬簿的類型。當為同一類單據(如：發票) 建立輔助核算，OpenERP將看成一個相同類型。"
+msgstr "定義輔助核算帳簿的類型。當為同一類單據(如：發票) 建立輔助核算分錄，OpenERP將看成一個相同類型。"
 
 #. 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 "稅範本"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -210,7 +211,7 @@ msgstr "account.tax"
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
 msgid "Move line reconcile select"
-msgstr "選擇憑證行核銷"
+msgstr "選擇移動的調節明細"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -221,7 +222,7 @@ msgid ""
 msgstr "勾選此項使發票上不顯示增值稅"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1241
+#: code:addons/account/account_invoice.py:1254
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 msgstr "發票'%s'已部分支付了%s%s ，總金額為：%s%s, 尚餘%s%s未付"
@@ -229,7 +230,7 @@ msgstr "發票'%s'已部分支付了%s%s ，總金額為：%s%s, 尚餘%s%s未
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr "核銷的第一個輸入是會計分錄"
+msgstr "調節的第一個輸入是科目分錄"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -237,10 +238,10 @@ msgid "Belgian Reports"
 msgstr "比利時報表"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1200
+#: code:addons/account/account_move_line.py:1215
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
-msgstr "不能在已關閉的賬簿添加或修改分錄"
+msgstr "不能在已關閉的帳簿中添加或修改分錄"
 
 #. module: account
 #: help:account.account,user_type:0
@@ -248,7 +249,7 @@ msgid ""
 "Account Type is used for information purpose, to generate country-specific "
 "legal reports, and set the rules to close a fiscal year and generate opening "
 "entries."
-msgstr "科目類別用於生成合乎各國財稅規範的報表，設置財年結帳的規則以及生成未登帳憑證"
+msgstr "科目類別是資訊目的，用以產生國家別的法定報表，並建立年度結帳規則及產生開帳分錄"
 
 #. module: account
 #: report:account.overdue:0
@@ -275,7 +276,7 @@ msgstr "允許勾銷"
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr "選擇輔助核算的會計期間"
+msgstr "選擇分析的會計期間"
 
 #. module: account
 #: view:account.move.line:0
@@ -283,10 +284,10 @@ msgid "St."
 msgstr "St."
 
 #. module: account
-#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:560
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
-msgstr "發票明細的科目公司與發票頭的公司不匹配。"
+msgstr "發票明細的科目公司與發票抬頭的公司不匹配。"
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -310,12 +311,12 @@ msgid ""
 "Configuration/Financial Accounting/Accounts/Journals."
 msgstr ""
 "無法找到這公司的 %s 。\n"
-"您可以在選單：設置 / 財務會計 / 賬簿 裡建立。"
+"您可以在選單：設置 / 財務會計 / 帳簿 裡建立。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr "科目反核銷"
+msgstr "科目未調節"
 
 #. module: account
 #: view:product.product:0
@@ -329,7 +330,7 @@ msgid ""
 "You can set up here the format you want this record to be displayed. If you "
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
-msgstr "這裡可以設置你想要記錄顯示格式.如果保留自動,它將基於財務報告結構計算(自動計算欄位\"level\")"
+msgstr "這裡可以設置你想要記錄顯示格式.如果保留自動,它將基於財務報表結構計算(自動計算欄位\"level\")"
 
 #. module: account
 #: view:account.installer:0
@@ -343,7 +344,7 @@ msgstr "設置"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "June"
-msgstr "6"
+msgstr "6月"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -351,12 +352,12 @@ msgid ""
 "This view is used by accountants in order to record entries massively in "
 "OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
 "Cash Registers, or Customer/Supplier payments."
-msgstr "本視圖供財務人員在系統中錄入單據。如果您在系統裡使用銀行對賬單，現金記錄或者客戶/供應商付款, 相應賬簿的明細會由系統自建立。"
+msgstr "本視圖供財務人員在系統中錄入單據。如果您在系統裡使用銀行對帳單，現金記錄或者客戶/供應商付款, 相應帳簿的分錄會由系統自建立。"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr "憑證上不能使用視圖類型的科目"
+msgstr "借貸項不能使用視圖類型的科目"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -377,7 +378,7 @@ msgstr "建立日期"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "採購紅字發票"
+msgstr "進貨退回"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -387,7 +388,7 @@ msgstr "開啟/結束狀態"
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "使用的貨幣"
+msgstr "報表使用的幣別"
 
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
@@ -399,7 +400,7 @@ msgstr "打開會計年度"
 msgid ""
 "This field contains the informatin related to the numbering of the journal "
 "entries of this journal."
-msgstr "這欄位控制該賬簿裡明細的編號"
+msgstr "這欄位控制該帳簿裡分錄的編號"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -427,7 +428,7 @@ msgstr "科目一覽表模板"
 #. module: account
 #: help:account.model.line,amount_currency:0
 msgid "The amount expressed in an optional other currency."
-msgstr "備選幣種所示金額"
+msgstr "其他幣別所示金額"
 
 #. module: account
 #: field:accounting.report,enable_filter:0
@@ -440,7 +441,7 @@ msgid ""
 "When journal period is created. The state is 'Draft'. If a report is printed "
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
-msgstr "當賬簿建立時它的狀態為「草稿」。如果報表已打印狀態變為「已打印」。當所有交易已完成它的狀態為「完成」。"
+msgstr "當帳簿建立時它的狀態為「草稿」。如果報表已列印狀態變為「已列印」。當所有交易已完成它的狀態為「完成」。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -450,6 +451,8 @@ msgid ""
 "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."
 msgstr ""
+"稅的圖表反映的涉稅案件（或稅碼）的結構是一個樹視圖，並顯示當前的納稅情況。稅務圖表代表各個領域為貴國的納稅申報的金額。它在一個層次結構，它可以進行修改，以"
+"適應您的需求。"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -479,7 +482,7 @@ msgstr ""
 #: model:ir.model,name:account.model_account_journal
 #: field:validate.account.move,journal_id:0
 msgid "Journal"
-msgstr "賬簿"
+msgstr "帳簿"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
@@ -494,7 +497,7 @@ msgstr "上級目標"
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr "這賬簿上的科目"
+msgstr "這帳簿上使用的科目"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -522,7 +525,7 @@ msgstr "公司名稱必須唯一！"
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr "紅字發票"
+msgstr "折讓"
 
 #. module: account
 #: report:account.overdue:0
@@ -532,13 +535,13 @@ msgstr "Li."
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "沒核銷的交易"
+msgstr "未調節的交易"
 
 #. module: account
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr "對方"
+msgstr "副本"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -559,8 +562,10 @@ msgid "The accountant confirms the statement."
 msgstr "財務人員確認的報表"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 #: selection:account.tax,type_tax_use:0
 #: selection:account.tax.template,type_tax_use:0
@@ -582,7 +587,7 @@ msgstr "3個月"
 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 "如果執行反核銷, 你必須檢驗鏈接該處理的所有操作. 因為他們不會被禁止."
+msgstr "如果執行未調節的交易, 你必須檢驗鏈接該處理的所有操作. 因為他們不會被禁止."
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -608,7 +613,7 @@ msgstr "稅一覽表"
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr "匯總賬簿"
+msgstr "集中帳簿"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
@@ -616,18 +621,18 @@ msgid "Main Sequence must be different from current !"
 msgstr "序列號必須唯一"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "No period found or more than one period found for the given date."
-msgstr "根據輸入的憑證日期沒有找到期間或找到了多個期間"
+msgstr "根據輸入的日期沒有找到期間或找到了多個期間"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr "稅金額"
+msgstr "稅碼金額"
 
 #. module: account
-#: code:addons/account/account.py:3116
+#: code:addons/account/account.py:3133
 #, python-format
 msgid "SAJ"
 msgstr "SAJ"
@@ -636,12 +641,12 @@ msgstr "SAJ"
 #: view:account.period:0
 #: view:account.period.close:0
 msgid "Close Period"
-msgstr "關閉會計期間"
+msgstr "關帳期間"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr "業務夥伴普通報表"
+msgstr "一般業務夥伴會計報表"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
@@ -651,26 +656,26 @@ msgstr "會計期間的啟用分錄"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr "賬簿的會計期間"
+msgstr "帳簿期間"
 
 #. module: account
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries"
-msgstr "要核銷這些憑證，這些憑證所屬公司必須一致"
+msgstr "要調節這些分錄，這些分錄所屬公司必須一致"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
-msgstr "憑證日期不在所選期間內！可以修改憑證日期或在憑證簿上去掉這個檢查項。"
+msgstr "帳簿分錄日期不在所選期間內！你應該去修改帳簿日期或在帳簿上去掉這個檢查項。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr "總賬報表"
+msgstr "總帳報表"
 
 #. module: account
 #: view:account.invoice:0
@@ -680,22 +685,22 @@ msgstr "重開"
 #. module: account
 #: view:account.use.model:0
 msgid "Are you sure you want to create entries?"
-msgstr "你確定建立分錄?"
+msgstr "你確定要建立分錄?"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr "打印發票"
+msgstr "列印發票"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr "今天的與業務夥伴核銷"
+msgstr "夥伴今天已調節"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this year"
-msgstr "本年度銷售憑證簿"
+msgstr "本年度銷售帳簿"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
@@ -711,14 +716,14 @@ msgstr "百分比"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr "表"
+msgstr "一覽表"
 
 #. module: account
 #: code:addons/account/project/wizard/project_account_analytic_line.py:47
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr "輔助核算明細"
+msgstr "輔助核算項目明細"
 
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
@@ -729,9 +734,10 @@ msgstr "退款方式"
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice !"
-msgstr "你只能對發票草稿修改幣種"
+msgstr "你只能對發票草稿修改幣別"
 
 #. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
 msgstr "財務報表"
@@ -747,17 +753,18 @@ msgstr "財務報表"
 #: view:account.journal:0
 #: field:account.journal,type:0
 #: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
 msgstr "類型"
 
 #. module: account
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account_invoice.py:747
 #, python-format
 msgid ""
 "Taxes are missing!\n"
 "Click on compute button."
-msgstr "沒有選擇稅!"
+msgstr "沒有選擇稅!點擊計算按鈕."
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -780,7 +787,7 @@ msgstr "供應商發票和退款"
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
-msgstr "反核銷"
+msgstr "未調節"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -790,12 +797,12 @@ msgstr "於第14個工作日支付總款2%，餘款至30個工作日所在月之
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
-msgstr "輔助核算賬簿"
+msgstr "輔助核算帳簿"
 
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr "自動核銷"
+msgstr "自動調節"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -810,7 +817,7 @@ msgid ""
 "or Loss you'd realized if those transactions were ended today. Only for "
 "accounts having a secondary currency set."
 msgstr ""
-"多幣種交易時，可能會因為匯率的變動而引起金額的上下浮動。本選單項讓你能瞭解如果交易於本日結算所引起的匯差損益。只對設置了第二幣種的科目有效。"
+"多幣種交易時，可能會因為匯率的變動而引起金額的上下浮動。本選單項讓你能瞭解如果交易於本日結算所引起的匯差損益。只對設置了第二幣別的科目有效。"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -819,7 +826,7 @@ msgstr ""
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -838,7 +845,7 @@ msgstr "如果選中，在新的科目表中預設將不包含此項。"
 msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
-msgstr "該發票 %s 已核銷，除非先將其反核銷。目前只能對該發票做退貨處理。"
+msgstr "該發票 %s 已調節，除非先將其改成未調節。目前只能對該發票做退貨處理。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -853,7 +860,7 @@ msgstr "計算"
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: refund invoice and reconcile"
-msgstr "取消：發票退款並核銷"
+msgstr "取消：發票退款並調節"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -879,17 +886,18 @@ msgid "Create 3 Months Periods"
 msgstr "建立季度"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.overdue:0
 msgid "Due"
 msgstr "到期"
 
 #. module: account
-#: code:addons/account/account.py:1345
+#: code:addons/account/account.py:1353
 #, python-format
 msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"!"
-msgstr "你不能覆核這張會計憑證，因為會計科目 \"%s\"不屬於科目表 \"%s\"！"
+msgstr "你不能覆核這筆分錄，因為會計科目 \"%s\"不屬於科目表 \"%s\"！"
 
 #. module: account
 #: code:addons/account/account_move_line.py:835
@@ -931,27 +939,27 @@ msgstr "負債"
 #. module: account
 #: view:account.entries.report:0
 msgid "Extended Filters..."
-msgstr "增加篩選條件"
+msgstr "增加篩選條件..."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr "匯總賬簿"
+msgstr "集中帳簿"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr "銷售紅字發票"
+msgstr "銷貨退回"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr "銀行對賬單"
+msgstr "銀行對帳單"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr "憑證行"
+msgstr "移動明細"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -962,10 +970,10 @@ msgid ""
 msgstr "如果這稅科目是一個稅編碼科目，這欄位金額要徵稅。如果這稅科目是一個稅基編碼，這欄位的金額不用徵稅。"
 
 #. module: account
-#: code:addons/account/account.py:2596
+#: code:addons/account/account.py:2613
 #, python-format
 msgid "I can not locate a parent code for the template account!"
-msgstr "無法為該科目模板定位其父科目"
+msgstr "無法為該科目模板定位其上層科目"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -975,7 +983,7 @@ msgstr "採購"
 #. module: account
 #: field:account.model,lines_id:0
 msgid "Model Entries"
-msgstr "模型項"
+msgstr "模型分錄"
 
 #. module: account
 #: field:account.account,code:0
@@ -995,14 +1003,14 @@ msgid "Code"
 msgstr "編碼"
 
 #. module: account
-#: code:addons/account/account.py:2268
+#: code:addons/account/account.py:2285
 #: code:addons/account/account_bank_statement.py:357
 #: code:addons/account/account_invoice.py:73
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "沒輔助核算賬簿！"
+msgstr "沒有輔助核算帳簿 !"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1022,7 +1030,7 @@ msgstr "科目名稱"
 #: field:account.chart.template,property_reserve_and_surplus_account:0
 #: field:res.company,property_reserve_and_surplus_account:0
 msgid "Reserve and Profit/Loss Account"
-msgstr "所有者權益類科目"
+msgstr "業主權益類科目"
 
 #. module: account
 #: field:report.account.receivable,name:0
@@ -1040,7 +1048,7 @@ msgstr "橫向模式"
 msgid ""
 "You cannot change the type of account from '%s' to '%s' type as it contains "
 "journal items!"
-msgstr "無法將科目類別從 '%s' 改變為 '%s' ，因為已有憑證使用該科目"
+msgstr "無法將科目類別從 '%s' 改變為 '%s' ，因為已有借貸項使用該科目"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
@@ -1060,7 +1068,7 @@ msgid ""
 msgstr "根據您國家定義這些類型,該類型包含有關科目及其具體的信息。"
 
 #. module: account
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:856
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
@@ -1093,22 +1101,22 @@ msgstr "-"
 #: view:account.analytic.account:0
 #: model:res.groups,name:account.group_account_manager
 msgid "Manager"
-msgstr "經理"
+msgstr "管理者"
 
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr "生成分錄前："
+msgstr "產生分錄前："
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr "未平財務憑證"
+msgstr "未平衡借貸項"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
 #: selection:account.bank.accounts.wizard,account_type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Bank"
 msgstr "銀行"
@@ -1128,7 +1136,7 @@ msgstr "確認報表"
 msgid ""
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
-msgstr "此科目上以第二幣種發生交易的合計金額（第二幣種）"
+msgstr "此科目上以第二幣別發生交易的合計金額（第二幣種）"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1144,7 +1152,7 @@ msgstr "貸方匯總"
 #. module: account
 #: view:report.account_type.sales:0
 msgid "All Months Sales by type"
-msgstr "以銷售類別劃分的銷售匯總"
+msgstr "所有月份的銷售類型"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1159,7 +1167,7 @@ msgstr "供應商發票，您可以輸入和管理你的供應商發出的發票
 #: 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 "稅編碼範本"
 
 #. module: account
 #: view:account.invoice.cancel:0
@@ -1200,12 +1208,12 @@ msgid "The move of this entry line."
 msgstr "分錄明細的變動"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid ""
 "You can not use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal !"
-msgstr "在本憑證簿中不能使用該總賬科目，請檢查相關憑證簿的「科目控制」頁"
+msgstr "在本帳簿中不能使用該總帳科目，請檢查相關帳簿的「分錄控制」頁"
 
 #. module: account
 #: field:account.move.line.reconcile,trans_nbr:0
@@ -1221,10 +1229,10 @@ msgid "Entry Label"
 msgstr "分錄標籤"
 
 #. module: account
-#: code:addons/account/account.py:1129
+#: code:addons/account/account.py:1136
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
-msgstr "您不能修改/刪除這賬簿和在此會計期間的分錄！"
+msgstr "您不能修改/刪除在此期間的帳簿和分錄！"
 
 #. module: account
 #: help:account.invoice,origin:0
@@ -1303,36 +1311,37 @@ msgstr "級別"
 #: model:ir.ui.menu,name:account.menu_tax_report
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr "稅"
+msgstr "稅別"
 
 #. module: account
-#: code:addons/account/wizard/account_financial_report.py:69
-#: code:addons/account/wizard/account_report_common.py:144
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
 #, python-format
 msgid "Select a starting and an ending period"
 msgstr "選擇會計期間的開始和結束時間"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
 msgstr "損益類"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr "科目模板"
+msgstr "科目範本"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr "搜索稅模板"
+msgstr "搜索稅範本"
 
 #. module: account
 #: view:account.move.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_reconcile_select
 #: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
 msgid "Reconcile Entries"
-msgstr "核銷"
+msgstr "調節分錄"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
@@ -1354,7 +1363,7 @@ msgstr "重置為草稿"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Bank Information"
-msgstr "銀行信息"
+msgstr "銀行資訊"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -1365,9 +1374,10 @@ msgstr "報表選項"
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr "賬簿明細分析"
+msgstr "借貸項分析"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
 msgstr "業務夥伴"
@@ -1379,7 +1389,7 @@ msgstr "業務夥伴"
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr "銀行對賬單"
+msgstr "銀行對帳單"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
@@ -1389,20 +1399,22 @@ msgstr "應收科目"
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
-msgstr "匯總賬簿"
+msgstr "集中帳簿"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
-msgstr "餘額不為0"
+msgstr "餘額不能為0"
 
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr "搜索稅種"
+msgstr "搜索稅別"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
@@ -1417,7 +1429,7 @@ msgstr "建立分錄"
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr "# 明細"
+msgstr "明細數"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
@@ -1453,7 +1465,7 @@ msgid ""
 "debit or a credit transaction. OpenERP automatically creates one journal "
 "entry per accounting document: invoice, refund, supplier payment, bank "
 "statements, etc."
-msgstr "賬簿的分錄由多個明細組成，每一分錄含有借方和貸方。 系統會自動建立每個財務單據的賬簿分錄：發票，紅字發票，供應商付款，銀行對賬單等。"
+msgstr "帳簿的分錄由多個借貸項組成，每一分錄含有借方和貸方。 系統會自動建立每個財務單據的帳簿分錄：發票，折讓單，供應商付款，銀行對帳單等。"
 
 #. module: account
 #: view:account.entries.report:0
@@ -1470,13 +1482,13 @@ msgstr "如不勾選該項，可以隱藏而不刪除此應稅條件"
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr "用於儀表盤視圖的臨時表"
+msgstr "用於控制台視圖的臨時表"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr "供應商紅字發票"
+msgstr "供應商折讓"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1497,12 +1509,12 @@ msgstr "定期分錄"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr "財務結構模板"
+msgstr "財務結構範本"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr "已核銷處理"
+msgstr "已調節交易"
 
 #. module: account
 #: field:account.journal.view,columns_id:0
@@ -1517,12 +1529,12 @@ msgstr "."
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "and Journals"
-msgstr "和賬簿"
+msgstr "和帳簿"
 
 #. module: account
 #: field:account.journal,groups_id:0
 msgid "Groups"
-msgstr "組"
+msgstr "群組"
 
 #. module: account
 #: field:account.invoice,amount_untaxed:0
@@ -1533,23 +1545,23 @@ msgstr "未完稅"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to Next Partner"
-msgstr ""
+msgstr "移至下一個業務夥伴"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr "搜索銀行對賬單"
+msgstr "搜索銀行對帳單"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr "未登帳憑證項"
+msgstr "未登借貸項"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr "應付款科目"
+msgstr "應付帳款科目"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
@@ -1561,7 +1573,7 @@ msgstr "退稅科目"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr "銀行對賬單明細"
+msgstr "銀行對帳單明細"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1572,7 +1584,7 @@ msgid ""
 "and the closing balance is to be found on your statement. When you are in "
 "the Payment column of a line, you can press F1 to open the reconciliation "
 "form."
-msgstr "銀行對賬單是在一個銀行帳戶在給定時間內的所有業務，它將自動計算期初餘額和期末結餘。當在一行的付款欄可以按F1可以打開對賬窗口。"
+msgstr "銀行對帳單是在一個銀行帳戶在給定時間內的所有業務，它將自動計算期初餘額和期末結餘。當在一行的付款欄可以按F1可以打開對帳窗口。"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -1589,7 +1601,7 @@ msgstr "一般科目"
 #. module: account
 #: field:res.partner,debit_limit:0
 msgid "Payable Limit"
-msgstr "應付款限額"
+msgstr "應付帳款限額"
 
 #. module: account
 #: report:account.invoice:0
@@ -1615,19 +1627,20 @@ msgstr "會計年度序列"
 #. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr "分散的賬簿序列"
+msgstr "分散的帳簿序列"
 
 #. module: account
+#: field:account.bank.statement,user_id:0
 #: view:account.invoice:0
 msgid "Responsible"
-msgstr "負責人"
+msgstr "Responsible"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid ""
 "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
 "cancel the current invoice."
-msgstr "取消發票：建立紅字發票，使其生效和核對它並取消當前的發票"
+msgstr "取消發票：建立折讓單，使其生效和核對它並取消當前的折讓單"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
@@ -1643,10 +1656,10 @@ msgstr "未確定業務夥伴"
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
-msgstr "年合計"
+msgstr "年度合計"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1429
+#: code:addons/account/account_invoice.py:1431
 #, python-format
 msgid ""
 "You selected an Unit of Measure which is not compatible with the product."
@@ -1655,7 +1668,7 @@ msgstr "您選擇的計量單位不適合本產品。"
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr "該嚮導將改變發票的幣種"
+msgstr "該精靈將改變發票的幣別"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_chart
@@ -1668,7 +1681,7 @@ msgstr "顯示您公司每個會計年度的科目表和過濾的會計週期。
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr "Pending Accounts"
+msgstr "暫存科目"
 
 #. module: account
 #: view:account.tax.template:0
@@ -1705,13 +1718,13 @@ msgstr "所有業務夥伴"
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr "輔助核算項一覽表"
+msgstr "輔助核算項目一覽表"
 
 #. module: account
 #: view:account.analytic.line:0
 #: view:analytic.entries.report:0
 msgid "My Entries"
-msgstr "我的工作區"
+msgstr "我的分錄"
 
 #. module: account
 #: report:account.overdue:0
@@ -1719,10 +1732,10 @@ msgid "Customer Ref:"
 msgstr "客戶關聯:"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:292
+#: code:addons/account/account_cash_statement.py:293
 #, python-format
 msgid "User %s does not have rights to access %s journal !"
-msgstr "用戶 %s 沒有權限訪問 %s！"
+msgstr "使用者 %s 沒有權限存取 %s！"
 
 #. module: account
 #: help:account.period,special:0
@@ -1732,7 +1745,7 @@ msgstr "這會計期間可以重疊"
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr "銀行單據草稿"
+msgstr "銀行對帳單草稿"
 
 #. module: account
 #: view:account.tax:0
@@ -1755,7 +1768,7 @@ msgstr "錯誤！"
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr "錯誤的出納會計分錄"
+msgstr "會計分錄中包含錯誤的借貸值！"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -1777,7 +1790,7 @@ msgstr "設置會計年度"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr "按明細"
+msgstr "分錄明細"
 
 #. module: account
 #: field:account.vat.declaration,based_on:0
@@ -1788,7 +1801,7 @@ msgstr "基於"
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr "會計憑證"
+msgstr "帳簿分錄"
 
 #. module: account
 #: view:account.tax:0
@@ -1817,18 +1830,18 @@ msgstr "錯誤！您不能建立遞歸公司."
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr "銷售/採購 日記帳"
+msgstr "銷售/採購 帳簿"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
-msgstr "輔助核算項"
+msgstr "輔助核算項目"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:339
 #, python-format
 msgid "Please verify that an account is defined in the journal."
-msgstr "請檢查在賬簿中已定義科目。"
+msgstr "請確認在帳簿中的科目已定義。"
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -1840,12 +1853,12 @@ msgstr "生效"
 #: model:ir.actions.act_window,name:account.action_account_print_journal
 #: model:ir.model,name:account.model_account_print_journal
 msgid "Account Print Journal"
-msgstr "打印賬簿"
+msgstr "列印帳簿"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr "產品類別"
+msgstr "產品分類"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -1864,13 +1877,13 @@ msgstr "該科目用於記錄損益金額（如果為收益：金額增加，虧
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Comparison between accounting and payment entries"
-msgstr "比較會計和支付項"
+msgstr "比較科目和應付之間的分錄"
 
 #. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Definition"
-msgstr "稅定義"
+msgstr "稅的定義"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
@@ -1885,20 +1898,20 @@ msgstr "勾選此項, 如果您想每個新建的分錄使用不同的序列，
 msgid ""
 "It adds the currency column if the currency is different then the company "
 "currency"
-msgstr "此選項增加一個幣種，如果公司使用不用的貨幣。"
+msgstr "此選項增加一個幣別，如果公司使用不用的貨幣。"
 
 #. module: account
 #: help:account.journal,allow_date:0
 msgid ""
 "If set to True then do not accept the entry if the entry date is not into "
 "the period dates"
-msgstr "如果設為True當分錄的日期不在會計週期內，將不接受這分錄"
+msgstr "如果設為真實當分錄的日期不在會計週期內，將不接受這分錄"
 
 #. module: account
 #: code:addons/account/account_invoice.py:73
 #, python-format
 msgid "You must define an analytic journal of type '%s'!"
-msgstr "你必須定義一個類型為 '%s'的成本憑證簿！"
+msgstr "你必須定義一個類型為 '%s'的輔助核算帳簿！"
 
 #. module: account
 #: field:account.installer,config_logo:0
@@ -1912,12 +1925,12 @@ msgid ""
 "The selected account of your Journal Entry forces to provide a secondary "
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
-msgstr "憑證上的科目要求輸入一個外幣。你可以在科目設置中去掉這個外幣或在憑證簿設置上選擇一個支持多幣種的輸入界面。"
+msgstr "分錄上的科目要求輸入一個外幣。你可以在科目設置中去掉這個外幣或在帳簿設置選擇一個支持多幣別的輸入界面。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_financial_report_tree
 msgid "Makes a generic system to draw financial reports easily."
-msgstr "使生成財務報表更容易"
+msgstr "做一個通用的系統，來使繪製財務報表能更輕鬆"
 
 #. module: account
 #: view:account.invoice:0
@@ -1935,7 +1948,7 @@ msgstr "如果此欄位設為False，您可以隱藏而不刪除這稅。"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr "與某銷售憑證簿關聯的分析憑證"
+msgstr "關聯到銷售帳簿的輔助核算項目明細。"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -1963,7 +1976,7 @@ msgstr "增值稅申報"
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr "部分分錄行"
+msgstr "部分分錄明細"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -1980,12 +1993,12 @@ msgstr "打開分錄"
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr "科目核銷"
+msgstr "科目調節"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr "從電子文件中導入"
+msgstr "從電子文件導入系統中的聲明"
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
@@ -1999,7 +2012,7 @@ msgstr "導入發票"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr "1"
+msgstr "1月"
 
 #. module: account
 #: view:account.journal:0
@@ -2027,7 +2040,7 @@ msgstr "無效會計期間！會計期間重複或者會計期間不在這會計
 #: code:addons/account/account_bank_statement.py:357
 #, python-format
 msgid "You have to assign an analytic journal on the '%s' journal!"
-msgstr "必須分配一個輔助核算賬簿給\"%s\"賬簿"
+msgstr "必須分配一個輔助核算輔助核算帳簿給\"%s\"帳簿"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2038,12 +2051,12 @@ msgid "Pro-forma"
 msgstr "形式發票"
 
 #. module: account
-#: code:addons/account/account.py:1461
+#: code:addons/account/account.py:1478
 #, python-format
 msgid ""
 "There is no default default debit account defined \n"
 "on journal \"%s\""
-msgstr "在 \"%s\" 沒設定預設借方的科目"
+msgstr "在 \"%s\" 帳簿沒設定預設借方的科目"
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2059,10 +2072,10 @@ msgstr "這類型用來區分特殊結果：視圖不能有分錄，多公司合
 #. module: account
 #: view:account.chart.template:0
 msgid "Search Chart of Account Templates"
-msgstr "搜索科目一覽表模板"
+msgstr "搜索科目一覽表範本"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid ""
 "Can not create an automatic sequence for this piece!\n"
@@ -2070,7 +2083,7 @@ msgid ""
 "sequence manually for this piece."
 msgstr ""
 "無法為此項建立自動序號!\n"
-"請為該憑證簿配置自動序號。"
+"請為該帳簿配置自動序號。"
 
 #. module: account
 #: code:addons/account/account.py:787
@@ -2078,7 +2091,7 @@ msgstr ""
 msgid ""
 "You can not modify the company of this journal as its related record exist "
 "in journal items"
-msgstr "不能修改該憑證簿的公司設置，因為已存在憑證記錄"
+msgstr "不能修改該帳簿的公司設置，因為已存在關聯的借貸項"
 
 #. module: account
 #: report:account.invoice:0
@@ -2113,7 +2126,7 @@ msgid "Description"
 msgstr "說明"
 
 #. module: account
-#: code:addons/account/account.py:3119
+#: code:addons/account/account.py:3136
 #, python-format
 msgid "ECNJ"
 msgstr "ECNJ"
@@ -2132,10 +2145,10 @@ msgid "Income Account"
 msgstr "收益科目"
 
 #. module: account
-#: code:addons/account/account_invoice.py:370
+#: code:addons/account/account_invoice.py:379
 #, python-format
 msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr "沒定義銷售/採購 的賬簿!"
+msgstr "會計科目尚未定義銷售/採購的類型!"
 
 #. module: account
 #: constraint:res.partner.bank:0
@@ -2167,11 +2180,12 @@ msgstr "# 產品數量 "
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr "產品模板"
+msgstr "產品範本"
 
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,fiscalyear_id:0
 #: report:account.central.journal:0
 #: field:account.central.journal,fiscalyear_id:0
@@ -2181,6 +2195,7 @@ msgstr "產品模板"
 #: field:account.common.report,fiscalyear_id:0
 #: view:account.entries.report:0
 #: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,name:0
 #: report:account.general.journal:0
 #: field:account.general.journal,fiscalyear_id:0
@@ -2223,7 +2238,7 @@ msgstr "會計年度"
 #: help:accounting.report,fiscalyear_id:0
 #: help:accounting.report,fiscalyear_id_cmp:0
 msgid "Keep empty for all open fiscal year"
-msgstr "留空為所有開啟的會計年度"
+msgstr "所有已開啟的會計年度都保持空白"
 
 #. module: account
 #: field:account.invoice.report,account_line_id:0
@@ -2231,12 +2246,12 @@ msgid "Account Line"
 msgstr "發票明細"
 
 #. module: account
-#: code:addons/account/account.py:1468
+#: code:addons/account/account.py:1485
 #, python-format
 msgid ""
 "There is no default default credit account defined \n"
 "on journal \"%s\""
-msgstr "\"%s\"上沒有定義預設貸方科目"
+msgstr "\"%s\"帳簿尚未定義預設的貸方科目"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_review_financial_journals_installer
@@ -2244,12 +2259,12 @@ msgid ""
 "Setup your accounting journals. For bank accounts, it's better to use the "
 "'Setup Your Bank Accounts' tool that will automatically create the accounts "
 "and journals for you."
-msgstr "設置憑證簿。最好使用 '設置銀行科目' 來自動建立和設置銀行科目。"
+msgstr "設置你的會計帳簿。最好使用 '設置銀行科目' 來自動建立和設置銀行科目。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr "憑證"
+msgstr "會計分錄"
 
 #. module: account
 #: constraint:res.partner:0
@@ -2262,12 +2277,12 @@ msgid "Main Sequence"
 msgstr "主序列"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
+#: code:addons/account/account_bank_statement.py:403
 #, python-format
 msgid ""
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
-msgstr "要刪除銀行對帳單，必須先取消並刪除相關憑證項"
+msgstr "要刪除銀行對帳單，必須先取消並刪除相關借貸項"
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -2279,7 +2294,7 @@ msgstr "要刪除銀行對帳單，必須先取消並刪除相關憑證項"
 #: model:ir.model,name:account.model_account_payment_term
 #: field:res.partner,property_payment_term:0
 msgid "Payment Term"
-msgstr "付款條款"
+msgstr "付款條件"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
@@ -2291,7 +2306,7 @@ msgstr "財務結構"
 #: constraint:account.account:0
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
-msgstr "錯誤!您不能建立遞歸的科目"
+msgstr "錯誤!您不能建立循環的科目"
 
 #. module: account
 #: field:account.period.close,sure:0
@@ -2316,7 +2331,7 @@ msgstr "篩選"
 #: selection:report.invoice.created,state:0
 #, python-format
 msgid "Open"
-msgstr "打開"
+msgstr "開啟"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
@@ -2327,16 +2342,16 @@ msgstr "草稿狀態的發票"
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr "往來業務核銷"
+msgstr "往來業務調節"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "稅編碼"
+msgstr "會計稅編碼"
 
 #. module: account
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:581
 #, python-format
 msgid ""
 "Can't find any account journal of %s type for this company.\n"
@@ -2344,20 +2359,20 @@ msgid ""
 "You can create one in the menu: \n"
 "Configuration\\Financial Accounting\\Accounts\\Journals."
 msgstr ""
-"無法找到這類型 %s  的賬簿。\n"
+"無法找到這類型 %s  的帳簿。\n"
 "\n"
-"您可以在 設置/財務會計/科目/賬簿 裡設置"
+"您可以在 設置/財務會計/科目/帳簿 裡設置"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_advance
 #: model:account.payment.term,note:account.account_payment_term_advance
 msgid "30% Advance End 30 Days"
-msgstr "預付30%30天內支付餘款"
+msgstr "預付30% 30天內支付餘款"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Unreconciled entries"
-msgstr "憑證反核銷"
+msgstr "未調節分錄"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2388,11 +2403,14 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"此選單列印增值稅發票或付款的聲明。選擇一個或幾個財政年度期間。 "
+"OpenERP從發票（或支付，在一些國家）的納稅申報所需的信息自動產生。這個數據是實時更新。這是非常有用的，因為它使你隨時預覽您在每月或每季度的開始和結束"
+"時欠的稅。"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Debit Centralisation"
-msgstr "借方匯總"
+msgstr "借方彙總"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -2412,15 +2430,15 @@ msgstr "日"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr "延續科目有效期"
+msgstr "延續科目有效期限"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
 msgid "Account Model Entries"
-msgstr "憑證模板"
+msgstr "科目模型分錄"
 
 #. module: account
-#: code:addons/account/account.py:3117
+#: code:addons/account/account.py:3134
 #, python-format
 msgid "EXJ"
 msgstr "EXJ"
@@ -2428,12 +2446,12 @@ msgstr "EXJ"
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr "進項稅"
+msgstr "進項稅額"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "entries"
-msgstr "憑證"
+msgstr "分錄"
 
 #. module: account
 #: help:account.invoice,date_due:0
@@ -2444,7 +2462,7 @@ msgid ""
 "date empty, it means direct payment. The payment term may compute several "
 "due dates, for example 50% now, 50% in one month."
 msgstr ""
-"如果您使用付款條款, 到期將自動生成分錄. 如果付款條款和到期日期為空, 則意味著直接付款. 付款條款可以計算出幾個到期日, 例如現在先付50%, "
+"如果您使用付款條件, 到期將自動生成分錄. 如果付款條件和到期日期為空, 則意味著直接付款. 付款條件可以計算出幾個到期日, 例如現在先付50%, "
 "然後在一個月內支付餘下的50%."
 
 #. module: account
@@ -2460,33 +2478,32 @@ msgstr "報表"
 #. module: account
 #: report:account.analytic.account.journal:0
 msgid "Move Name"
-msgstr "憑證名稱"
+msgstr "移轉名稱"
 
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
 "The fiscal position will determine taxes and the accounts used for the "
 "partner."
-msgstr "財務結構決定業務夥伴用的稅和科目。"
+msgstr "財務結構決定業務夥伴用的稅別和科目。"
 
 #. module: account
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
-msgstr "這報表是您指定賬簿的概述"
+msgstr "這報表是您指定帳簿的概述"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr "憑證行核銷（註銷）"
+msgstr "科目移轉明細調節（核銷）"
 
 #. module: account
-#: model:account.account.type,name:account.account_type_tax
 #: report:account.invoice:0
 #: field:account.invoice,amount_tax:0
 #: field:account.move.line,account_tax_id:0
 msgid "Tax"
-msgstr "稅"
+msgstr "稅額"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2497,7 +2514,7 @@ msgstr "稅"
 #: field:account.move.line,analytic_account_id:0
 #: field:account.move.line.reconcile.writeoff,analytic_id:0
 msgid "Analytic Account"
-msgstr "輔助核算項"
+msgstr "輔助核算項目"
 
 #. module: account
 #: view:account.account:0
@@ -2513,7 +2530,7 @@ msgid "Accounts"
 msgstr "科目"
 
 #. module: account
-#: code:addons/account/account_invoice.py:369
+#: code:addons/account/account_invoice.py:378
 #, python-format
 msgid "Configuration Error!"
 msgstr "設置錯誤!"
@@ -2538,7 +2555,7 @@ msgstr "標籤"
 #: view:account.tax:0
 #: view:res.partner.bank:0
 msgid "Accounting Information"
-msgstr "會計信息"
+msgstr "會計資訊"
 
 #. module: account
 #: view:account.tax:0
@@ -2550,7 +2567,7 @@ msgstr "特殊算法"
 #: view:account.move.bank.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
 msgid "Bank reconciliation"
-msgstr "銀行對賬單"
+msgstr "銀行對帳單"
 
 #. module: account
 #: report:account.invoice:0
@@ -2579,12 +2596,12 @@ msgstr "借貸數值不正確，必須為正值"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr "自動核銷"
+msgstr "自動調節"
 
 #. module: account
 #: field:account.invoice,reconciled:0
 msgid "Paid/Reconciled"
-msgstr "已付/已核銷"
+msgstr "已付/已調節"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
@@ -2595,7 +2612,7 @@ msgstr "退稅基編碼"
 #. module: account
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
-msgstr "True"
+msgstr "真實"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2609,19 +2626,19 @@ msgstr "日期"
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr "父科目表模板"
+msgstr "上層科目表模板"
 
 #. module: account
 #: field:account.tax,parent_id:0
 #: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
-msgstr "父稅科目"
+msgstr "上層稅科目"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly !"
-msgstr "新幣種設置不正確"
+msgstr "新幣別設置不正確"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -2633,6 +2650,7 @@ msgstr "系統在指定日期前自動生成分錄。"
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
 msgstr "業務夥伴以前的餘額表"
@@ -2662,7 +2680,7 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
-"勾選，如果您不想新的分錄跳過「草稿」狀態直接到「已登賬」狀態，中間無需手動審核。\n"
+"勾選，如果您不想新的分錄跳過「草稿」狀態直接到「已登帳」狀態，中間無需手動審核。\n"
 "注意系統自動建立的分錄總是跳過這狀態。"
 
 #. module: account
@@ -2679,21 +2697,21 @@ msgstr "科目表設置"
 #. module: account
 #: view:account.use.model:0
 msgid "This wizard will create recurring accounting entries"
-msgstr "該嚮導將建立一個定期分錄"
+msgstr "該精靈將建立一個定期分錄"
 
 #. module: account
-#: code:addons/account/account.py:1321
+#: code:addons/account/account.py:1329
 #, python-format
 msgid "No sequence defined on the journal !"
-msgstr "沒定義賬簿的序列！"
+msgstr "尚未定義帳簿的序列！"
 
 #. module: account
-#: code:addons/account/account.py:2268
-#: code:addons/account/account_invoice.py:688
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
 #: code:addons/account/account_move_line.py:173
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "您必須定義這 '%s' 的輔助核算賬簿！"
+msgstr "您必須在這 '%s' 的帳簿上先定義輔助核算帳簿！"
 
 #. module: account
 #: code:addons/account/account.py:407
@@ -2701,7 +2719,7 @@ msgstr "您必須定義這 '%s' 的輔助核算賬簿！"
 msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance!"
-msgstr "要設置期初餘額需在憑證簿設置中勾選合併選項"
+msgstr "要設置期初餘額需在帳簿設置中勾選合併選項"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -2719,7 +2737,7 @@ msgstr "未確認損益"
 #: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr "客戶"
+msgstr "客戶／供應商"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -2735,12 +2753,12 @@ msgstr "會計期間到"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr "8"
+msgstr "8月"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
-msgstr "核銷的第二個輸入項是付款分錄"
+msgstr "調節的第二個輸入項是付款分錄"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2749,14 +2767,14 @@ msgstr "核銷的第二個輸入項是付款分錄"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr "10"
+msgstr "10月"
 
 #. module: account
 #: help:account.move.line,quantity:0
 msgid ""
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very useful for some reports."
-msgstr "行顯示的非強制性數量，如：已銷售產品。這數量不是一個強制要求，但對一些報表非常有用。"
+msgstr "這個明細顯示的非強制性數量，如：已銷售產品。這數量不是一個強制要求，但對一些報表非常有用。"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -2784,7 +2802,7 @@ msgstr "留空使用覆核(發票)日期的會計期間"
 #: help:account.bank.statement,account_id:0
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
-msgstr "用於銀行對賬單，但不能使用到別處。"
+msgstr "使用於銀行對帳單調節領域，但不能使用到別處。"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -2792,7 +2810,7 @@ msgid "Base Code Amount"
 msgstr "稅基金額"
 
 #. module: account
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_invoice.py:401
 #, python-format
 msgid ""
 "You can not delete an invoice which is open or paid. We suggest you to "
@@ -2802,10 +2820,10 @@ msgstr "無法刪除已確認或付款的發票。建議您做退款處理。"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr "預設銷售稅"
+msgstr "預設銷項稅額"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1013
+#: code:addons/account/account_invoice.py:1025
 #, python-format
 msgid "Invoice  '%s' is validated."
 msgstr "發票 '%s' 已審核"
@@ -2816,7 +2834,7 @@ msgid ""
 "The maturity date of the generated entries for this model. You can choose "
 "between the creation date or the creation date of the entries plus the "
 "partner payment terms."
-msgstr "這模型生成的到期日期，您可以選擇建立日期或建立日期加上業務夥伴付款條件。"
+msgstr "這模型產生的到期日期，您可以選擇建立日期或建立日期加上業務夥伴付款條件。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -2843,7 +2861,7 @@ msgid "Fiscal Position"
 msgstr "財務結構"
 
 #. module: account
-#: code:addons/account/account_invoice.py:735
+#: code:addons/account/account_invoice.py:744
 #, python-format
 msgid ""
 "Tax base different!\n"
@@ -2881,7 +2899,7 @@ msgstr "如果在計算未來的稅前這稅額必須包含在稅基金額裡，
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr "這用戶負責這賬簿"
+msgstr "此使用者負責此帳簿"
 
 #. module: account
 #: view:account.period:0
@@ -2912,7 +2930,7 @@ msgstr "現金交易"
 #. module: account
 #: view:res.partner:0
 msgid "Bank account"
-msgstr "銀行賬號"
+msgstr "銀行帳號"
 
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
@@ -2922,7 +2940,7 @@ msgstr "稅模板列表"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
-msgstr "銷售/採購 憑證簿"
+msgstr "銷售/採購 帳簿"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -2993,7 +3011,7 @@ msgid "View"
 msgstr "視圖"
 
 #. module: account
-#: code:addons/account/account.py:3363
+#: code:addons/account/account.py:3380
 #: code:addons/account/account_bank.py:90
 #, python-format
 msgid "BNK"
@@ -3037,7 +3055,7 @@ msgstr "業務夥伴會計帳本(往來帳)"
 #. module: account
 #: help:account.journal.column,sequence:0
 msgid "Gives the sequence order to journal column."
-msgstr "指定賬簿的序列"
+msgstr "指定帳簿的序列"
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3051,7 +3069,7 @@ msgstr "強制將這科目的所有憑證轉為第二幣別。"
 msgid ""
 "This wizard will validate all journal entries of a particular journal and "
 "period. Once journal entries are validated, you can not update them anymore."
-msgstr "這嚮導將使指定的會計期間和賬簿的所有分錄生效。一旦生效您不能再修改它們。"
+msgstr "這精靈將使指定的會計期間和帳簿的所有分錄生效。一旦生效您不能再修改它們。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -3062,7 +3080,7 @@ msgstr "科目一覽表模板"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "設定你的會計選項"
 
 #. module: account
 #: view:report.account.sales:0
@@ -3072,7 +3090,7 @@ msgstr "按類別劃分的月度銷售記錄"
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr "科目核銷反核銷"
+msgstr "科目調節未調節"
 
 #. module: account
 #: sql_constraint:account.tax:0
@@ -3094,9 +3112,9 @@ msgid ""
 msgstr ""
 "在這設定科目年終結轉時產生分錄的方法\n"
 "    'None'  不做結轉\n"
-"    'Balance'  年末餘額轉到下年\n"
-"    'Detail'  把該科目上年的所有分錄明細帶入下年，即使已對賬\n"
-"    'Unreconciled'  把該科目未對賬分錄明細帶入下年"
+"    'Balance'  年末餘額轉到隔年\n"
+"    'Detail'  把該科目上年的所有分錄明細帶入隔年，即使已對帳\n"
+"    'Unreconciled'  把該科目未對帳分錄明細帶入隔年"
 
 #. module: account
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -3142,12 +3160,12 @@ msgstr "留空使用這費用科目"
 #: model:ir.ui.menu,name:account.menu_journals
 #: model:ir.ui.menu,name:account.menu_journals_report
 msgid "Journals"
-msgstr "賬簿"
+msgstr "帳簿"
 
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr "業務夥伴剩餘的"
+msgstr "剩餘的業務夥伴"
 
 #. module: account
 #: view:account.subscription:0
@@ -3181,7 +3199,7 @@ msgstr "  值: 0.02"
 #: model:ir.actions.act_window,name:account.open_board_account
 #: model:ir.ui.menu,name:account.menu_board_account
 msgid "Accounting Dashboard"
-msgstr "會計儀表盤"
+msgstr "會計控制台"
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -3190,7 +3208,7 @@ msgid "Starting Balance"
 msgstr "期初餘額"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "No Partner Defined !"
 msgstr "未定義業務夥伴！"
@@ -3229,13 +3247,13 @@ msgstr "如果不是同一公司, 這金額表示相關科目的幣別。"
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_select
 msgid "Unreconcile Entries"
-msgstr "反核銷分錄"
+msgstr "未調節分錄"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr "不打印在發票上"
+msgstr "不列印在發票上"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -3244,7 +3262,7 @@ msgid "Chart of Tax"
 msgstr "稅一覽表"
 
 #. module: account
-#: code:addons/account/account_cash_statement.py:314
+#: code:addons/account/account_cash_statement.py:315
 #, python-format
 msgid "The closing balance should be the same than the computed balance!"
 msgstr "期末餘額與計算出來的餘額不平衡."
@@ -3252,31 +3270,31 @@ msgstr "期末餘額與計算出來的餘額不平衡."
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr "搜索賬簿"
+msgstr "搜尋會計帳簿"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr "待開票"
+msgstr "待開發票"
 
 #. module: account
 #: view:account.invoice.report:0
 #: selection:account.subscription,period_type:0
 #: view:analytic.entries.report:0
 msgid "year"
-msgstr "年"
+msgstr "年度"
 
 #. module: account
 #: view:product.product:0
 msgid "Purchase Taxes"
-msgstr "進項稅"
+msgstr "進項稅額"
 
 #. module: account
 #: view:validate.account.move.lines:0
 msgid ""
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
-msgstr "所有選擇的分錄將生效並過賬，這意味著您將不能修改它們。"
+msgstr "所有選擇的分錄將生效並過帳，這意味著您將不能修改它們。"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -3325,13 +3343,14 @@ msgstr "數量"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
 msgid "Period Length (days)"
 msgstr "期間（天數）"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
-msgstr "打印 銷售/採購 憑證簿"
+msgstr "列印 銷售/採購 帳簿"
 
 #. module: account
 #: field:account.invoice.report,state:0
@@ -3358,7 +3377,7 @@ msgstr "銷售報表的科目類型"
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr "未核銷憑證"
+msgstr "未調節憑證"
 
 #. module: account
 #: sql_constraint:res.currency:0
@@ -3368,10 +3387,10 @@ msgstr "每個公司的貨幣代碼必須唯一"
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr "詳情"
+msgstr "細節"
 
 #. module: account
-#: code:addons/account/account_invoice.py:839
+#: code:addons/account/account_invoice.py:850
 #, python-format
 msgid ""
 "Can not create the invoice !\n"
@@ -3380,7 +3399,7 @@ msgid ""
 "payment term must be of type 'balance' to avoid rounding issues."
 msgstr ""
 "不能建立發票\n"
-"關聯的付款條款可能缺少配置導致給出的計算金額超過總發票金額.最後的付款條款行必須是」平衡「類型以避免四捨五入問題"
+"關聯的付款條件可能缺少配置導致給出的計算金額超過總發票金額.最後的付款條件行必須是「平衡」類型以避免四捨五入問題"
 
 #. module: account
 #: report:account.invoice:0
@@ -3388,9 +3407,16 @@ msgid "VAT :"
 msgstr "增值稅 :"
 
 #. module: account
+#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
 #: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -3403,7 +3429,7 @@ msgstr "科目一覽表"
 #. module: account
 #: view:account.tax.chart:0
 msgid "(If you do not select period it will take all open periods)"
-msgstr "如果您不選擇會計期間，它將取所有開啟的會計期間"
+msgstr "如果您不選擇會計期間，它將使用所有開啟的會計期間"
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -3411,7 +3437,7 @@ msgid "Centralised counterpart"
 msgstr "匯總副本"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
+#: code:addons/account/account_move_line.py:575
 #, python-format
 msgid "You can not create journal items on a \"view\" account %s %s"
 msgstr "憑證中不能使用 「視圖」 類型的會計科目 %s %s"
@@ -3419,7 +3445,7 @@ msgstr "憑證中不能使用 「視圖」 類型的會計科目 %s %s"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr "與業務夥伴核銷的進程"
+msgstr "與業務夥伴調節的過程"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3436,6 +3462,7 @@ msgstr "如果您不選擇會計年度將使用所有開啟的會計年度"
 #: report:account.analytic.account.journal:0
 #: selection:account.balance.report,filter:0
 #: field:account.bank.statement,date:0
+#: field:account.bank.statement.line,date:0
 #: selection:account.central.journal,filter:0
 #: selection:account.common.account.report,filter:0
 #: selection:account.common.journal.report,filter:0
@@ -3463,55 +3490,61 @@ msgstr "如果您不選擇會計年度將使用所有開啟的會計年度"
 #: field:account.subscription.line,date:0
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_general_ledger.py:305
+#: code:addons/account/report/account_general_ledger.py:308
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
+#: code:addons/account/report/common_report_header.py:97
 #: field:analytic.entries.report,date:0
+#, python-format
 msgid "Date"
 msgstr "日期"
 
 #. module: account
 #: view:account.move:0
 msgid "Post"
-msgstr "過賬"
+msgstr "過帳"
 
 #. module: account
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile"
-msgstr "反核銷"
+msgstr "反調節"
 
 #. module: account
 #: view:account.analytic.line:0
-#: field:account.bank.statement,user_id:0
 #: view:account.journal:0
 #: field:account.journal,user_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,user_id:0
 msgid "User"
-msgstr "用戶"
+msgstr "使用者"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr "科目一覽表模板"
+msgstr "科目一覽表模組"
 
 #. module: account
-#: code:addons/account/account.py:2280
+#: code:addons/account/account.py:2297
 #, python-format
 msgid ""
 "Maturity date of entry line generated by model line '%s' of model '%s' is "
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
-"用模型明細  '%s' 產生分錄明細的到期日期，模型  '%s' 基於業務夥伴的付款條款。\n"
+"用模型明細  '%s' 產生分錄明細的到期日期，模型  '%s' 基於業務夥伴的付款條件。\n"
 "請在業務夥伴裡定義它"
 
 #. module: account
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account_move_line.py:846
 #, python-format
 msgid "Some entries are already reconciled !"
-msgstr "部分分錄已核銷！"
+msgstr "部分分錄已調節！"
 
 #. module: account
 #: view:account.tax:0
@@ -3539,6 +3572,8 @@ msgstr "預算"
 #: selection:account.vat.declaration,filter:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
 msgid "No Filters"
 msgstr "無篩選"
 
@@ -3550,7 +3585,7 @@ msgstr "形式發票"
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr "日誌"
+msgstr "歷史記錄"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -3585,12 +3620,12 @@ msgstr "有異議"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr "搜索輔助核算明細"
+msgstr "搜尋輔助核算項目明細"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr "應付賬"
+msgstr "應付帳款科目"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3601,7 +3636,7 @@ msgstr "付款單"
 #: help:account.account.template,reconcile:0
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
-msgstr "勾選此項, 如果您想用戶在這科目核銷分錄。"
+msgstr "勾選此項, 如果您想使用者在這科目調節分錄。"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
@@ -3617,10 +3652,10 @@ msgstr "單價"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
 msgid "Analytic Items"
-msgstr "分析明細"
+msgstr "輔助核算明細"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "Unable to change tax !"
 msgstr "無法更改稅目!"
@@ -3628,7 +3663,7 @@ msgstr "無法更改稅目!"
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr "# 項"
+msgstr "分錄"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
@@ -3638,7 +3673,7 @@ msgstr "建立退款草稿"
 #. module: account
 #: view:account.state.open:0
 msgid "Open Invoice"
-msgstr "未結髮票"
+msgstr "開啟發票"
 
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
@@ -3651,7 +3686,7 @@ msgid "Mapping"
 msgstr "圖表"
 
 #. module: account
-#: code:addons/account/account_invoice.py:921
+#: code:addons/account/account_invoice.py:932
 #, python-format
 msgid ""
 "You cannot create an invoice on a centralised journal. Uncheck the "
@@ -3665,6 +3700,7 @@ msgstr "無法在合併（centralised）憑證簿上建立發票，請在憑證
 #: report:account.analytic.account.inverted.balance:0
 #: field:account.bank.statement,name:0
 #: field:account.chart.template,name:0
+#: report:account.financial.report:0
 #: field:account.model.line,name:0
 #: field:account.move.line,name:0
 #: field:account.move.reconcile,name:0
@@ -3678,10 +3714,10 @@ msgid "Account Aged Trial balance Report"
 msgstr "過期的試算表"
 
 #. module: account
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "You can not create journal items on a closed account %s %s"
-msgstr "憑證中不能使用關閉的會計科目 %s %s"
+msgstr "帳簿中不能使用關閉的會計科目 %s %s"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -3703,7 +3739,7 @@ msgstr "標準編碼"
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr "輔助核算賬簿"
+msgstr "輔助核算分錄帳簿"
 
 #. module: account
 #: constraint:account.aged.trial.balance:0
@@ -3739,7 +3775,7 @@ msgstr "會計"
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current year"
-msgstr "本年度期間的憑證"
+msgstr "本年度期間的帳簿分錄"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -3749,19 +3785,19 @@ msgstr "本年度期間的憑證"
 msgid ""
 "Print Report with the currency column if the currency is different then the "
 "company currency"
-msgstr "如果打印貨幣與報表的貨幣是不同的,那麼使用公司的貨幣"
+msgstr "如果列印貨幣與報表的貨幣是不同的,那麼使用公司的貨幣"
 
 #. module: account
 #: help:account.account,unrealized_gain_loss:0
 msgid ""
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
-msgstr "多幣種交易時所產生的匯兌損益金額"
+msgstr "多幣別交易時所產生的匯兌損益金額"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
-msgstr "一般會計"
+msgstr "一般會計科目"
 
 #. module: account
 #: report:account.overdue:0
@@ -3775,7 +3811,7 @@ msgid ""
 "entries of all fiscal years. Note that you should define it with default "
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
-msgstr "最好使用一個專用的賬簿去控制所有會計年度的開賬分錄。注意您應該設定預設的借方/貸方科目，「狀態」的類型和能匯總賬簿對應。"
+msgstr "最好使用一個專用的帳簿去控制所有會計年度的開帳分錄。注意您應該設定預設的借方/貸方科目，「狀態」的類型和能匯總帳簿對應。"
 
 #. module: account
 #: view:account.installer:0
@@ -3811,7 +3847,7 @@ msgstr "使其生效"
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 msgid "Cost Ledger"
-msgstr "成本分類賬"
+msgstr "成本分類帳"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
@@ -3838,7 +3874,7 @@ msgstr "顯示科目列表"
 #. module: account
 #: view:account.state.open:0
 msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(如果你想打開它發票要反核銷)"
+msgstr "(如果你想打開它發票要反調節)"
 
 #. module: account
 #: field:account.chart,period_from:0
@@ -3856,13 +3892,13 @@ msgstr "稅名稱"
 #: model:account.payment.term,name:account.account_payment_term
 #: model:account.payment.term,note:account.account_payment_term
 msgid "30 Days End of Month"
-msgstr "月結束為30天"
+msgstr "月結60天"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
 msgid "Analytic Balance"
-msgstr "輔助核算餘額"
+msgstr "分析餘額"
 
 #. module: account
 #: help:account.account,active:0
@@ -3874,12 +3910,12 @@ msgstr "如果活動欄位設置為False，您將可以隱藏它而不在科目
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr "已登帳憑證"
+msgstr "已過帳憑證"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr "搜尋稅模板"
+msgstr "搜尋稅模組"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
@@ -3905,7 +3941,7 @@ msgstr "快捷鍵"
 #. module: account
 #: constraint:account.fiscalyear:0
 msgid "Error! The start date of the fiscal year must be before his end date."
-msgstr "錯誤！ 財年的開始日期須小於截止日期"
+msgstr "錯誤！ 財務年度的開始日期須小於截止日期"
 
 #. module: account
 #: view:account.account:0
@@ -3973,7 +4009,7 @@ msgstr "（時間表，一些採購產品，... ...）分析成本來輔助核
 #. module: account
 #: view:account.bank.statement:0
 msgid "Close CashBox"
-msgstr "關閉出納賬"
+msgstr "關閉出納帳"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -3998,20 +4034,20 @@ msgid "Month"
 msgstr "月份"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1216
+#: code:addons/account/account_move_line.py:1231
 #, python-format
 msgid ""
 "You can not do this modification on a confirmed entry! You can just change "
 "some non legal fields or you must unconfirm the journal entry first! \n"
 "%s"
 msgstr ""
-"你不能修改已覆核的會計憑證！你只可以修改一些非關鍵欄位或者先取消覆核這張憑證！\n"
+"你不能修改已覆核的分錄！你只可以修改一些非關鍵欄位或者先取消覆核這筆分錄！\n"
 "%s"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr "Paypal賬戶"
+msgstr "Paypal帳戶"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
@@ -4027,7 +4063,7 @@ msgstr "備註"
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Reverse balance sign"
-msgstr "餘額取反"
+msgstr "反向平衡的標誌"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -4057,7 +4093,7 @@ msgid "Account Base Code"
 msgstr "稅基編碼"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:93
+#: code:addons/account/account_analytic_line.py:91
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
 msgstr "未定義此產品「%s「 (id:%d)的費用科目"
@@ -4070,7 +4106,7 @@ msgstr "客戶會計屬性"
 #. module: account
 #: help:res.company,paypal_account:0
 msgid "Paypal username (usually email) for receiving online payments."
-msgstr "Paypal 用戶名 (通常為 email) 用於接受在線支付。"
+msgstr "Paypal 帳號 (通常為 email) 用於接受在線支付。"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -4093,18 +4129,18 @@ msgstr "Paypal 用戶名 (通常為 email) 用於接受在線支付。"
 #: code:addons/account/report/common_report_header.py:68
 #, python-format
 msgid "All Posted Entries"
-msgstr "所有已登賬憑證"
+msgstr "所有已登帳分錄"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:367
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr "銀行對賬單 %s 確認，建立賬簿裡的明細。"
+msgstr "銀行對帳單 %s 確認，建立帳簿裡的借貸項。"
 
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr "月度"
+msgstr "月區間"
 
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
@@ -4125,7 +4161,7 @@ msgstr "預設稅"
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr "會計年度結賬分錄"
+msgstr "會計年度結帳分錄"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -4135,7 +4171,7 @@ msgstr "定期處理"
 #. module: account
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr "無法在視圖類型的科目上建立分析憑證行"
+msgstr "無法在視圖類型的科目上建立輔助核算頁目明細。"
 
 #. module: account
 #: help:account.move.line,state:0
@@ -4175,7 +4211,7 @@ msgstr "科目名稱"
 #. module: account
 #: help:account.fiscalyear.close,report_name:0
 msgid "Give name of the new entries"
-msgstr "給新條目名稱"
+msgstr "給新項目名稱"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
@@ -4190,18 +4226,18 @@ msgstr "匯率"
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr "把銀行對賬單輸入到系統中。"
+msgstr "把銀行對帳單輸入到系統中。"
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:133
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr "補差額時核銷"
+msgstr "調節時核銷"
 
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by Type"
-msgstr ""
+msgstr "依類型劃分的科目"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4223,7 +4259,7 @@ msgstr "可顯示？"
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
 msgid "Account Journal Select"
-msgstr "選擇賬簿"
+msgstr "選擇帳簿"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4243,7 +4279,7 @@ msgstr "res_config_contents"
 #. module: account
 #: view:account.unreconcile:0
 msgid "Unreconciliate Transactions"
-msgstr ""
+msgstr "反核銷"
 
 #. module: account
 #: help:account.chart.template,visible:0
@@ -4252,7 +4288,7 @@ msgid ""
 "wizard that generate Chart of Accounts from templates, this is useful when "
 "you want to generate accounts of this template only when loading its child "
 "template."
-msgstr "如果你不想在根據模版生成科目表的嚮導裡用這個模版，不要勾選這個欄位。用於你僅需要在用到本模版的子模板時才生成這個模版的會計科目。"
+msgstr "如果你不想在根據模組產生科目表的精靈裡用這個模組，不要勾選這個欄位。用於你僅需要在用到本模組的子模組時才生成這個模組的會計科目。"
 
 #. module: account
 #: view:account.use.model:0
@@ -4263,10 +4299,10 @@ msgstr "按模型建立分錄"
 #: field:account.account,reconcile:0
 #: field:account.account.template,reconcile:0
 msgid "Allow Reconciliation"
-msgstr "允許核銷"
+msgstr "允許調節"
 
 #. module: account
-#: code:addons/account/account.py:1077
+#: code:addons/account/account.py:1082
 #, python-format
 msgid ""
 "You can not modify company of this period as some journal items exists."
@@ -4291,7 +4327,7 @@ msgstr "含稅價"
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr "分析本期成本明細賬的報表"
+msgstr "分析本期成本明細帳的報表"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
@@ -4300,7 +4336,7 @@ msgid "Recurring Models"
 msgstr "定期模型"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1251
+#: code:addons/account/account_move_line.py:1266
 #, python-format
 msgid "Encoding error"
 msgstr "輸入錯誤"
@@ -4312,6 +4348,7 @@ msgstr "4"
 
 #. module: account
 #: view:account.invoice:0
+#: xsl:account.transfer:0
 msgid "Change"
 msgstr "改變"
 
@@ -4336,7 +4373,7 @@ msgstr "它將充當預設帳戶的信貸數額"
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr "登賬"
+msgstr "登帳"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4348,7 +4385,7 @@ msgstr "已取消"
 #. module: account
 #: help:account.bank.statement,balance_end_cash:0
 msgid "Closing balance based on cashBox"
-msgstr "錢箱額"
+msgstr "錢箱結餘金額"
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -4356,7 +4393,7 @@ msgid "Example"
 msgstr "例子"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid ""
 "Please verify the price of the invoice !\n"
@@ -4370,7 +4407,7 @@ msgid "Keep empty to use the income account"
 msgstr "留空為使用利潤科目"
 
 #. module: account
-#: code:addons/account/account.py:3299
+#: code:addons/account/account.py:3316
 #, python-format
 msgid "Purchase Tax %.2f%%"
 msgstr "採購稅 %.2f%%"
@@ -4380,7 +4417,7 @@ msgstr "採購稅 %.2f%%"
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr "生成分錄"
+msgstr "產生分錄"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
@@ -4398,7 +4435,7 @@ msgstr "科目一覽表"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:337
+#: code:addons/account/account_invoice.py:346
 #, python-format
 msgid "Customer"
 msgstr "客戶"
@@ -4414,7 +4451,7 @@ msgid "Cancelled Invoice"
 msgstr "已取消的發票"
 
 #. module: account
-#: code:addons/account/account.py:1567
+#: code:addons/account/account.py:1584
 #, python-format
 msgid ""
 "Couldn't create move with currency different from the secondary currency of "
@@ -4435,7 +4472,7 @@ msgstr "操作日期"
 #. module: account
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconciliation Transactions"
-msgstr ""
+msgstr "反核銷"
 
 #. module: account
 #: field:account.tax,ref_tax_code_id:0
@@ -4448,7 +4485,7 @@ msgstr "退稅編碼"
 msgid ""
 "All draft account entries in this journal and period will be validated. It "
 "means you won't be able to modify their accounting fields anymore."
-msgstr "所有選的會計期間和賬簿裡的分錄草稿都已生效。也就是說您再也不能再修改它們的會計欄位。"
+msgstr "所有選的會計期間和帳簿裡的分錄草稿都已生效。也就是說您再也不能再修改它們的會計欄位。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_configuration
@@ -4466,7 +4503,7 @@ msgid "Income Account on Product Template"
 msgstr "產品模板的收入科目"
 
 #. module: account
-#: code:addons/account/account.py:3120
+#: code:addons/account/account.py:3137
 #, python-format
 msgid "MISC"
 msgstr "雜項"
@@ -4480,7 +4517,7 @@ msgstr "${object.company_id.name} 發票 (編號 ${object.number or 'n/a' })"
 #: help:res.partner,last_reconciliation_date:0
 msgid ""
 "Date on which the partner accounting entries were reconciled last time"
-msgstr "業務夥伴最後一次核銷的日期"
+msgstr "業務夥伴最後一次調節的日期"
 
 #. module: account
 #: field:account.fiscalyear.close,fy2_id:0
@@ -4491,11 +4528,13 @@ msgstr "新的會計年度"
 #: view:account.invoice:0
 #: view:account.tax.template:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
 #: model:ir.actions.act_window,name:account.action_invoice_tree
 #: model:ir.actions.report.xml,name:account.account_invoices
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
+#, python-format
 msgid "Invoices"
 msgstr "發票列表"
 
@@ -4538,7 +4577,7 @@ msgid ""
 "Bank Account Number to which the invoice will be paid. A Company bank "
 "account if this is a Customer Invoice or Supplier Refund, otherwise a "
 "Partner bank account number."
-msgstr "發票的收款銀行帳號。如果是客戶發票或供應商紅字發票，這裡是本公司的銀行賬號，否則這裡是業務夥伴的銀行賬號。"
+msgstr "發票的收款銀行帳號。如果是客戶發票或供應商折讓單，這裡是本公司的銀行帳號，否則這裡是業務夥伴的銀行帳號。"
 
 #. module: account
 #: view:account.state.open:0
@@ -4569,7 +4608,7 @@ msgstr "您確定嗎？"
 #. module: account
 #: help:account.move.line,statement_id:0
 msgid "The bank statement used for bank reconciliation"
-msgstr "這銀行對賬單用於對賬"
+msgstr "這銀行對帳單用於對帳"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
@@ -4631,29 +4670,27 @@ msgstr "稅適用"
 #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
 #, python-format
 msgid "Journal Items"
-msgstr "會計憑證行"
+msgstr "借貸項"
 
 #. module: account
-#: code:addons/account/account.py:1088
-#: code:addons/account/account.py:1090
-#: code:addons/account/account.py:1321
-#: code:addons/account/account.py:1563
-#: code:addons/account/account.py:1567
-#: code:addons/account/account.py:3368
-#: code:addons/account/account_move_line.py:807
-#: code:addons/account/account_move_line.py:830
-#: code:addons/account/account_move_line.py:832
-#: code:addons/account/account_move_line.py:835
-#: code:addons/account/account_move_line.py:837
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_change_currency.py:38
 #: code:addons/account/wizard/account_change_currency.py:59
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
-#: code:addons/account/wizard/account_financial_report.py:69
+#: code:addons/account/wizard/account_financial_report.py:70
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_report_common.py:144
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "Error"
 msgstr "錯誤"
@@ -4684,7 +4721,7 @@ msgstr "這份報表是關於業務夥伴的分析。其中包含每個業務夥
 msgid ""
 "To print an analytics (or costs) journal for a given period. The report give "
 "code, move name, account number, general amount and analytic amount."
-msgstr "打印在這會計期間生成的輔助核算(或成本)賬簿 ,該報表內容為：代碼，憑證名，科目編碼，總金額和輔助核算金額。"
+msgstr "列印在這會計期間生成的輔助核算(或成本)帳簿 ,該報表內容為：代碼，憑證名，科目編碼，總金額和輔助核算金額。"
 
 #. module: account
 #: sql_constraint:account.invoice:0
@@ -4699,7 +4736,7 @@ msgstr "科目餘額"
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Generate Fiscal Year Opening Entries"
-msgstr "生成會計年度開賬分錄"
+msgstr "產生會計年度開帳分錄"
 
 #. module: account
 #: model:res.groups,name:account.group_account_user
@@ -4711,7 +4748,7 @@ msgstr "會計"
 msgid ""
 "From this view, have an analysis of your treasury. It sums the balance of "
 "every accounting entries made on liquidity accounts per period."
-msgstr "在這裡分析貴公司的資金。這裡匯總了每個期間在流動資產科目上的會計憑證。"
+msgstr "在這裡分析貴公司的資金。這裡匯總了每個期間在流動資產科目上的分錄。"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -4756,20 +4793,20 @@ msgid "Beginning of Period Date"
 msgstr "期間開始日期"
 
 #. module: account
-#: code:addons/account/account.py:1351
+#: code:addons/account/account.py:1361
 #, python-format
 msgid ""
 "You can not modify a posted entry of this journal !\n"
 "You should set the journal to allow cancelling entries if you want to do "
 "that."
 msgstr ""
-"您不能修改已登賬的分錄!\n"
-"如需修改請將此賬簿設置為允許作廢分錄。"
+"您不能修改已登帳的分錄!\n"
+"如需修改請將此帳簿設置為允許作廢分錄。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
 msgid "Templates"
-msgstr "模板"
+msgstr "範本"
 
 #. module: account
 #: field:account.invoice.tax,name:0
@@ -4782,7 +4819,7 @@ msgid "Child Tax Accounts"
 msgstr "子稅科目"
 
 #. module: account
-#: code:addons/account/account.py:1090
+#: code:addons/account/account.py:1097
 #, python-format
 msgid "Start period should be smaller then End period"
 msgstr "開始日期應小於會計期間的結束日期"
@@ -4803,6 +4840,7 @@ msgstr "輔助核算餘額 -"
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,target_move:0
 #: report:account.central.journal:0
 #: field:account.central.journal,target_move:0
@@ -4846,6 +4884,8 @@ msgstr "會計期間類型"
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
 msgid "Payments"
 msgstr "付款"
 
@@ -4869,7 +4909,7 @@ msgstr "Python代碼(reverse)"
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr "付款條款"
+msgstr "付款條件"
 
 #. module: account
 #: help:account.chart.template,complete_tax_set:0
@@ -4877,7 +4917,7 @@ msgid ""
 "This boolean helps you to choose if you want to propose to the user to "
 "encode the sale and purchase rates or choose from list of taxes. This last "
 "choice assumes that the set of tax defined on this template is complete"
-msgstr "這個選項用於確定你是否希望提示用戶輸入銷售和採購的稅率，或者是從下拉列表選擇稅。這是設置稅模版的最後一步。"
+msgstr "這個選項用於確定你是否希望提示使用者輸入銷售和採購的稅率，或者是從下拉列表選擇稅。這是設置稅模版的最後一步。"
 
 #. module: account
 #: view:account.financial.report:0
@@ -4919,7 +4959,7 @@ msgid "Line 1:"
 msgstr "第一行"
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid "Integrity Error !"
 msgstr "完整性錯誤！"
@@ -4948,10 +4988,11 @@ msgstr "稅科目"
 #. module: account
 #: view:account.automatic.reconcile:0
 msgid "Reconciliation Result"
-msgstr ""
+msgstr "調節結果"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
 msgstr "資產負債表"
@@ -4960,7 +5001,7 @@ msgstr "資產負債表"
 #: view:account.general.journal:0
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
-msgstr "一般賬簿"
+msgstr "總分類帳"
 
 #. module: account
 #: field:account.journal,allow_date:0
@@ -5028,6 +5069,7 @@ msgstr "報表"
 #: view:account.move.line:0
 #: field:account.tax,amount:0
 #: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,amount:0
 msgid "Amount"
@@ -5052,7 +5094,7 @@ msgstr "基於子稅"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr "稅務的模板"
+msgstr "稅務的模組"
 
 #. module: account
 #: field:account.journal,update_posted:0
@@ -5155,7 +5197,6 @@ msgstr "科目合併的科目報表"
 
 #. module: account
 #: field:account.bank.statement.line,name:0
-#: field:account.invoice,reference:0
 msgid "Communication"
 msgstr "溝通"
 
@@ -5175,7 +5216,7 @@ msgstr "包括初始餘額"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr "客戶紅字發票"
+msgstr "客戶折讓"
 
 #. module: account
 #: constraint:account.move:0
@@ -5204,16 +5245,16 @@ msgstr "  享受現金折扣的天數：14"
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr "賬簿的結賬分錄"
+msgstr "帳簿的年度結帳分錄"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #: code:addons/account/account_bank_statement.py:338
-#: code:addons/account/account_invoice.py:427
-#: code:addons/account/account_invoice.py:527
-#: code:addons/account/account_invoice.py:542
-#: code:addons/account/account_invoice.py:550
-#: code:addons/account/account_invoice.py:572
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
 #: code:addons/account/wizard/account_move_journal.py:63
 #, python-format
 msgid "Configuration Error !"
@@ -5230,7 +5271,7 @@ msgid ""
 "This is the remaining partners for who you should check if there is "
 "something to reconcile or not. This figure already count the current partner "
 "as reconciled."
-msgstr "這是業務夥伴的餘額，您應該檢查出那個已核銷那個未核銷。這數字計算當前業務夥伴要核銷部分。"
+msgstr "這是業務夥伴的餘額，您應該檢查出那個已調節那個未調節。這數字計算當前業務夥伴要調節部分。"
 
 #. module: account
 #: view:account.subscription.line:0
@@ -5249,7 +5290,7 @@ msgstr "產品數量"
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr "未登賬"
+msgstr "未登帳"
 
 #. module: account
 #: view:account.change.currency:0
@@ -5279,7 +5320,7 @@ msgstr "付款日期"
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "輔助核算項"
+msgstr "輔助核算項目"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5287,12 +5328,11 @@ msgid "Customer Invoices And Refunds"
 msgstr "客戶發票和退款"
 
 #. module: account
-#: field:account.analytic.line,amount_currency:0
 #: field:account.entries.report,amount_currency:0
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
-msgstr "金額"
+msgstr "貨幣金額"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:39
@@ -5300,12 +5340,12 @@ msgstr "金額"
 msgid ""
 "Specified Journal does not have any account move entries in draft state for "
 "this period"
-msgstr "指定的賬簿在這會計期間沒有草稿狀態的憑證"
+msgstr "指定的帳簿在這會計期間沒有草稿狀態的分錄"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_move_line
 msgid "Lines to reconcile"
-msgstr "核銷"
+msgstr "調節的行"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5330,7 +5370,7 @@ msgstr "編號"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries during last 7 days"
-msgstr "分析最近7天內的分錄"
+msgstr "最近7天內的輔助核算分錄"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -5340,21 +5380,21 @@ msgstr "普通文本"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice Options"
-msgstr "紅字發票選項"
+msgstr "折讓單選項"
 
 #. module: account
 #: help:account.automatic.reconcile,power:0
 msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
-msgstr "部分金額可以加起來作為找到的平衡點來強制填充自動核銷"
+msgstr "部分金額可以加起來作為找到的平衡點來強制填充自動調節"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
 msgid ""
 "The sequence field is used to order the payment term lines from the lowest "
 "sequences to the higher ones"
-msgstr "這序列欄位用於付款條款的從低到高排序."
+msgstr "這序列欄位用於付款條件的從低到高排序."
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -5377,7 +5417,7 @@ msgid ""
 "impossible any new entry record. Close a fiscal year when you need to "
 "finalize your end of year results definitive "
 msgstr ""
-"如果不希望在這個年度輸入會計憑證，可以在這裡關閉年度。這樣該年度的所有期間都關閉了，不能再記賬了。如果你希望會計報表不會變更請關閉會計年度。 "
+"如果不希望在這個年度輸入分錄，可以在這裡關閉年度。這樣該年度的所有期間都關閉了，不能再記帳了。如果你希望會計報表不會變更請關閉會計年度。 "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5412,7 +5452,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconcile With Write-Off"
-msgstr "補差額時核銷"
+msgstr "調節與核銷"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -5433,7 +5473,7 @@ msgstr "發票數據"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr "科目自動核銷"
+msgstr "科目自動調節"
 
 #. module: account
 #: view:account.move:0
@@ -5444,7 +5484,7 @@ msgstr "明細"
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
 msgid "Move journal"
-msgstr "憑證賬簿"
+msgstr "憑證帳簿"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
@@ -5453,10 +5493,10 @@ msgid "Generate Opening Entries"
 msgstr "產生開啟分錄"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
+#: code:addons/account/account_move_line.py:775
 #, python-format
 msgid "Already Reconciled!"
-msgstr "已核銷！"
+msgstr "已調節！"
 
 #. module: account
 #: help:account.tax,type:0
@@ -5478,7 +5518,7 @@ msgstr "建立日期"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journals"
-msgstr "輔助核算賬簿"
+msgstr "輔助核算帳簿"
 
 #. module: account
 #: field:account.account,child_id:0
@@ -5486,14 +5526,14 @@ msgid "Child Accounts"
 msgstr "子科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account_move_line.py:1229
 #, python-format
 msgid "Move name (id): %s (%s)"
 msgstr "會計憑證號 (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:857
+#: code:addons/account/account_move_line.py:871
 #, python-format
 msgid "Write-Off"
 msgstr "補差額"
@@ -5501,7 +5541,7 @@ msgstr "補差額"
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr "應付款合計"
+msgstr "應付帳款合計"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_income
@@ -5513,7 +5553,7 @@ msgstr "收入"
 #: selection:account.bank.statement.line,type:0
 #: view:account.invoice:0
 #: view:account.invoice.report:0
-#: code:addons/account/account_invoice.py:339
+#: code:addons/account/account_invoice.py:348
 #, python-format
 msgid "Supplier"
 msgstr "供應商"
@@ -5530,7 +5570,7 @@ msgstr "3"
 #. module: account
 #: view:account.account.template:0
 msgid "Account Template"
-msgstr "科目模板"
+msgstr "科目模組"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
@@ -5543,7 +5583,7 @@ msgid "Account n°"
 msgstr "科目編碼"
 
 #. module: account
-#: code:addons/account/account_invoice.py:88
+#: code:addons/account/account_invoice.py:91
 #, python-format
 msgid "Free Reference"
 msgstr "無限制的單號"
@@ -5558,10 +5598,12 @@ msgstr "定價"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:376
 #: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:399
 #, python-format
 msgid "Receivable and Payable Accounts"
-msgstr "應收款與應付款科目"
+msgstr "應收帳款與應付帳款科目"
 
 #. module: account
 #: field:account.fiscal.position.account.template,position_id:0
@@ -5582,7 +5624,7 @@ msgstr "最大數量:"
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice"
-msgstr "紅字發票"
+msgstr "折讓單"
 
 #. module: account
 #: field:account.invoice,address_invoice_id:0
@@ -5610,7 +5652,7 @@ msgstr "稅編碼基於你所在國家的稅務制度定義。OpenERP允許用
 msgid ""
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
-msgstr "顯示您今天核銷的進度，今天業務夥伴的已核銷 / （業務夥伴的餘額 + 今天業務夥伴的已核銷）"
+msgstr "顯示您今天調節的進度，今天業務夥伴的已調節 / （業務夥伴的餘額 + 今天業務夥伴的已調節）"
 
 #. module: account
 #: help:account.payment.term.line,value:0
@@ -5618,7 +5660,7 @@ msgid ""
 "Select here the kind of valuation related to this payment term line. Note "
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be threated."
-msgstr "選擇這付款條款明細的相關定價類別。注意您應該在最後一行的類型為「餘額」以確保已支付全部金額。"
+msgstr "選擇這付款條件明細的相關定價類別。注意您應該在最後一行的類型為「餘額」以確保已支付全部金額。"
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -5632,7 +5674,7 @@ msgstr "強制會計期間"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,nbr:0
 msgid "# of Lines"
-msgstr "# 明細"
+msgstr "明細數"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -5654,7 +5696,7 @@ msgid "Filter by"
 msgstr "篩選"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
 msgstr "模型中存在錯誤的表達式 \"%(...)s\""
@@ -5665,8 +5707,8 @@ msgid "Entry Date"
 msgstr "分錄日期"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "You can not use an inactive account!"
 msgstr "您不能使用一個停用的科目！"
@@ -5699,7 +5741,7 @@ msgstr "發票稅科目"
 #: model:ir.actions.act_window,name:account.action_account_general_journal
 #: model:ir.model,name:account.model_account_general_journal
 msgid "Account General Journal"
-msgstr "一般賬簿"
+msgstr "總分類帳"
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -5707,8 +5749,8 @@ msgid "Number of Days"
 msgstr "天數"
 
 #. module: account
-#: code:addons/account/account_bank_statement.py:402
-#: code:addons/account/account_invoice.py:392
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid action !"
@@ -5734,7 +5776,7 @@ msgstr "這名稱將顯示在報表"
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
-msgstr "打印日期"
+msgstr "列印日期"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -5752,7 +5794,7 @@ msgstr "  365 日  "
 #: 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 "客戶折讓"
 
 #. module: account
 #: field:account.account,foreign_balance:0
@@ -5762,7 +5804,7 @@ msgstr "國外資產"
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr "賬簿 - 會計期間名稱"
+msgstr "帳簿 - 會計期間名稱"
 
 #. module: account
 #: field:account.invoice.tax,factor_base:0
@@ -5770,7 +5812,7 @@ msgid "Multipication factor for Base code"
 msgstr "稅率"
 
 #. module: account
-#: code:addons/account/wizard/account_report_common.py:150
+#: code:addons/account/wizard/account_report_common.py:151
 #, python-format
 msgid "not implemented"
 msgstr "尚未實現"
@@ -5778,7 +5820,7 @@ msgstr "尚未實現"
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr "公司設定的賬簿"
+msgstr "公司設定的帳簿"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -5807,6 +5849,8 @@ msgstr "輔助核算分析"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
 msgid "Past"
 msgstr "過去"
 
@@ -5823,7 +5867,7 @@ msgstr "配置錯誤！ "
 msgid ""
 "This journal will be created automatically for this bank account when you "
 "save the record"
-msgstr "當保存數據時，系統會自動為此銀行賬戶建立像相應的憑證."
+msgstr "當保存數據時，系統會自動為此銀行帳戶建立像相應的憑證."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -5843,7 +5887,7 @@ msgid ""
 "OpenERP. If you want to record a supplier invoice, start by recording the "
 "line of the expense account. OpenERP will propose to you automatically the "
 "Tax related to this account and the counterpart \"Account Payable\"."
-msgstr "這個界面用於會計快速輸入憑證。如果需要記錄供應商發票，先輸入費用行，OpenERP會自動生成對應的稅行和應付賬款行。"
+msgstr "這個界面用於會計快速輸入憑證。如果需要記錄供應商發票，先輸入費用行，OpenERP會自動生成對應的稅行和應付帳款行。"
 
 #. module: account
 #: field:account.entries.report,date_created:0
@@ -5866,6 +5910,8 @@ msgid ""
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
 msgstr ""
+"As soon as the reconciliation is done, the invoice's state turns to “done” "
+"(i.e. paid) in the system."
 
 #. module: account
 #: view:account.chart.template:0
@@ -5896,7 +5942,7 @@ msgstr "這是一個定期分錄模型"
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax_rate:0
 msgid "Sales Tax(%)"
-msgstr "銷售稅(%)"
+msgstr "銷項稅額(%)"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -5907,7 +5953,7 @@ msgstr "根據這個範本建立使用者"
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr "報告設置"
+msgstr "報表設置"
 
 #. module: account
 #: field:account.tax,type:0
@@ -5928,7 +5974,7 @@ msgid ""
 "encode the sales and purchase rates or use the usual m2o fields. This last "
 "choice assumes that the set of tax defined for the chosen template is "
 "complete"
-msgstr "這個選項用於確定你是否希望提示用戶輸入銷售和採購的稅率，或者是打開稅選擇列表。這是設置稅模版的最後一步。"
+msgstr "這個選項用於確定你是否希望提示使用者輸入銷售和採購的稅率，或者是打開稅選擇列表。這是設置稅模版的最後一步。"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -5966,7 +6012,7 @@ msgstr "關閉一個會計年度"
 #. 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 "這精靈列出所有安裝要設置的稅"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_intracom
@@ -6036,7 +6082,7 @@ msgstr "取消"
 #: model:account.account.type,name:account.data_account_type_receivable
 #: selection:account.entries.report,type:0
 msgid "Receivable"
-msgstr "應收款"
+msgstr "應收帳款"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -6080,8 +6126,10 @@ msgstr "百分比"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
+#: code:addons/account/report/account_general_ledger.py:307
+#, python-format
 msgid "Journal & Partner"
-msgstr "賬簿 & 業務夥伴"
+msgstr "帳簿 & 業務夥伴"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
@@ -6089,7 +6137,7 @@ msgid "Power"
 msgstr "強制"
 
 #. module: account
-#: code:addons/account/account.py:3368
+#: code:addons/account/account.py:3385
 #, python-format
 msgid "Cannot generate an unused journal code."
 msgstr "不能生成一個未使用的憑證代碼。"
@@ -6129,9 +6177,10 @@ msgid "Applicable Type"
 msgstr "適用類型"
 
 #. module: account
+#: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
-msgstr "發票"
+msgstr "Invoice Reference"
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -6160,7 +6209,7 @@ msgid ""
 "This wizard will generate the end of year journal entries of selected fiscal "
 "year. Note that you can run this wizard many times for the same fiscal year: "
 "it will simply replace the old opening entries with the new ones."
-msgstr "此嚮導將生成選定會計年度的年結憑證。注意你可以針對相同年度多次運行這個嚮導：新生成的憑證會覆蓋原有憑證。"
+msgstr "此精靈將生成選定會計年度的年結憑證。注意你可以針對相同年度多次運行這個精靈：新生成的憑證會覆蓋原有憑證。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
@@ -6179,7 +6228,7 @@ msgstr "這視圖用於分析貴公司輔助核算項的發生額。用查找功
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr "每個公司的賬簿名稱必須唯一！"
+msgstr "每個公司的帳簿名稱必須唯一！"
 
 #. module: account
 #: field:account.account.template,nocreate:0
@@ -6192,7 +6241,7 @@ msgstr "非強制建立"
 msgid ""
 "You cannot change the owner company of an account that already contains "
 "journal items."
-msgstr "你不能修改已經存在憑證的公司帳戶。"
+msgstr "你不能修改已經存在借貸項的公司帳戶。"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
@@ -6206,7 +6255,7 @@ msgstr "輸入開始日期"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr "供應商紅字發票"
+msgstr "供應商折讓"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
@@ -6239,7 +6288,7 @@ msgstr "匯總"
 #: view:account.tax.code.template:0
 #: view:analytic.entries.report:0
 msgid "Group By..."
-msgstr "分組..."
+msgstr "分類方式..."
 
 #. module: account
 #: field:account.journal.column,readonly:0
@@ -6254,7 +6303,7 @@ msgstr "  估值:平衡"
 #. module: account
 #: field:account.invoice.line,uos_id:0
 msgid "Unit of Measure"
-msgstr "計量單位"
+msgstr "量度單位"
 
 #. module: account
 #: constraint:account.payment.term.line:0
@@ -6282,13 +6331,13 @@ msgstr "account.sequence.fiscalyear"
 #: model:ir.actions.report.xml,name:account.analytic_journal_print
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "Analytic Journal"
-msgstr "輔助核算賬薄"
+msgstr "輔助核算帳薄"
 
 #. module: account
 #: code:addons/account/account.py:622
 #, python-format
 msgid "You can not desactivate an account that contains some journal items."
-msgstr "您不能停用已經存在憑證的賬戶。"
+msgstr "您不能停用已經存在借貸項的帳戶。"
 
 #. module: account
 #: view:account.entries.report:0
@@ -6344,27 +6393,27 @@ msgstr "輔助核算統計"
 #: code:addons/account/account.py:624
 #, python-format
 msgid "You can not remove an account containing journal items."
-msgstr "您不能刪除已經存在憑證的賬戶。"
+msgstr "您不能刪除已經存在借貸項的帳戶。"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:145
-#: code:addons/account/account_move_line.py:933
+#: code:addons/account/account_analytic_line.py:143
+#: code:addons/account/account_move_line.py:947
 #, python-format
 msgid "Entries: "
-msgstr "憑證： "
+msgstr "分錄： "
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr "在選定的賬簿手動建立定期分錄。"
+msgstr "在選定的帳簿手動建立定期分錄。"
 
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr "貨幣的關聯賬戶憑證。"
+msgstr "貨幣的關聯會計帳簿。"
 
 #. module: account
-#: code:addons/account/account.py:1563
+#: code:addons/account/account.py:1580
 #, python-format
 msgid "Couldn't create move between different companies"
 msgstr "無法建立公司之間的過帳"
@@ -6380,7 +6429,7 @@ msgid ""
 "account. From this view, you can create and manage the account types you "
 "need for your company."
 msgstr ""
-"科目類型確定了科目在記賬時如何使用。科目類型的結轉方法確定年結時的流程。分類用於資產負債表和損益表。您可以在這裡建立和管理貴公司的科目類型。"
+"科目類型確定了科目在記帳時如何使用。科目類型的結轉方法確定年結時的流程。分類用於資產負債表和損益表。您可以在這裡建立和管理貴公司的科目類型。"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -6395,7 +6444,7 @@ msgid ""
 "Bank Reconciliation consists of verifying that your bank statement "
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
-msgstr "銀行對賬是核實您的銀行帳戶與本公司該科目內容是否一致。"
+msgstr "銀行對帳是核實您的銀行帳戶與本公司該科目內容是否一致。"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
@@ -6404,16 +6453,16 @@ msgstr "草稿狀態"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1043
+#: code:addons/account/account_move_line.py:1058
 #, python-format
 msgid "Total debit"
 msgstr "借方合計"
 
 #. module: account
-#: code:addons/account/account_move_line.py:808
+#: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "Entry \"%s\" is not valid !"
-msgstr "憑證\"%s\"無效！"
+msgstr "分錄\"%s\"無效！"
 
 #. module: account
 #: report:account.invoice:0
@@ -6425,14 +6474,14 @@ msgstr "傳真:"
 msgid ""
 "This will automatically configure your chart of accounts, bank accounts, "
 "taxes and journals according to the selected template"
-msgstr "將根據選擇的模板自動設置您的科目表、銀行帳號、賬簿"
+msgstr "將根據選擇的模板自動設置您的科目表、銀行帳號、帳簿簿"
 
 #. module: account
 #: help:res.partner,property_account_receivable:0
 msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
-msgstr "這科目將用於替換當前業務夥伴的預設應收款科目"
+msgstr "這科目將用於替換當前業務夥伴的預設應收帳款科目"
 
 #. module: account
 #: field:account.tax,python_applicable:0
@@ -6443,19 +6492,19 @@ msgstr "這科目將用於替換當前業務夥伴的預設應收款科目"
 #: field:account.tax.template,python_compute:0
 #: selection:account.tax.template,type:0
 msgid "Python Code"
-msgstr "Python代碼"
+msgstr "Python程式碼"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current period"
-msgstr "當前期間憑證列表"
+msgstr "當前期間分錄列表"
 
 #. module: account
 #: help:account.journal,update_posted:0
 msgid ""
 "Check this box if you want to allow the cancellation the entries related to "
 "this journal or of the invoice related to this journal"
-msgstr "勾選這裡，則此憑證簿下的會計憑證或發票可以被作廢。"
+msgstr "勾選這裡，則此帳簿下的分錄或發票可以被作廢。"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6472,31 +6521,32 @@ msgstr "建立分錄"
 #: code:addons/account/account.py:182
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr "損益(費用賬戶)"
+msgstr "損益(費用帳戶)"
 
 #. module: account
 #: code:addons/account/account.py:622
 #: code:addons/account/account.py:624
 #: code:addons/account/account.py:963
-#: code:addons/account/account.py:1052
-#: code:addons/account/account.py:1129
-#: code:addons/account/account.py:1344
-#: code:addons/account/account.py:1351
-#: code:addons/account/account.py:2280
-#: code:addons/account/account.py:2596
-#: code:addons/account/account_analytic_line.py:92
-#: code:addons/account/account_analytic_line.py:101
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
+#: code:addons/account/account_analytic_line.py:90
+#: code:addons/account/account_analytic_line.py:99
 #: code:addons/account/account_bank_statement.py:301
 #: code:addons/account/account_bank_statement.py:314
 #: code:addons/account/account_bank_statement.py:352
-#: code:addons/account/account_cash_statement.py:292
-#: code:addons/account/account_cash_statement.py:314
-#: code:addons/account/account_invoice.py:808
-#: code:addons/account/account_invoice.py:839
-#: code:addons/account/account_invoice.py:1030
-#: code:addons/account/account_move_line.py:1200
-#: code:addons/account/account_move_line.py:1216
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
 #: code:addons/account/wizard/account_invoice_refund.py:108
 #: code:addons/account/wizard/account_invoice_refund.py:110
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -6525,11 +6575,11 @@ msgstr "稅務報表"
 #. module: account
 #: selection:account.journal.period,state:0
 msgid "Printed"
-msgstr "已打印"
+msgstr "已列印"
 
 #. module: account
-#: code:addons/account/account_move_line.py:584
-#: code:addons/account/account_move_line.py:591
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
 #, python-format
 msgid "Error :"
 msgstr "錯誤："
@@ -6537,7 +6587,7 @@ msgstr "錯誤："
 #. module: account
 #: view:account.analytic.line:0
 msgid "Project line"
-msgstr "項目明細"
+msgstr "專案細項"
 
 #. module: account
 #: field:account.invoice.tax,manual:0
@@ -6577,7 +6627,7 @@ msgstr "如果你選擇了按日期或期間篩選，可以用這個欄位按所
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Journal Entries"
-msgstr "會計憑證"
+msgstr "分錄"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
@@ -6585,14 +6635,14 @@ msgid "Display Ledger Report with One partner per page"
 msgstr "一頁一個業務夥伴的分類帳"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1218
+#: code:addons/account/account_move_line.py:1233
 #, python-format
 msgid ""
 "You can not do this modification on a reconciled entry! You can just change "
 "some non legal fields or you must unreconcile first!\n"
 "%s"
 msgstr ""
-"你不能對已核銷的會計憑證做這樣的修改！你只能改一些非關鍵欄位或者先反核銷這個憑證！\n"
+"你不能對已核銷的分錄做這樣的修改！你只能改一些非關鍵欄位或者先反核銷這筆分錄！\n"
 "%s"
 
 #. module: account
@@ -6616,7 +6666,7 @@ msgstr "這個報表是每個業務夥伴的往來匯總。這個PDF報表的每
 #, python-format
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state"
-msgstr "所選的憑證沒有為草稿狀態的"
+msgstr "所選的分錄沒有為草稿狀態的"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -6639,18 +6689,18 @@ msgstr "所選的憑證沒有為草稿狀態的"
 #: code:addons/account/report/common_report_header.py:67
 #, python-format
 msgid "All Entries"
-msgstr "所有憑證"
+msgstr "所有分錄"
 
 #. module: account
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "錯誤:預設的計量單位和採購的計量單位必須是同一類型."
+msgstr "錯誤：預設計量單位和採購計量單位必須在同一分類中。"
 
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr "選擇賬簿"
+msgstr "選擇帳簿"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6679,7 +6729,7 @@ msgstr "稅負"
 #: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
-msgstr "總賬"
+msgstr "總帳"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
@@ -6699,7 +6749,7 @@ msgstr "此報表用於生成一個試算平衡表的PDF報表。這樣你可以
 msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
-msgstr "勾選這裡，如果您不確定憑證是否正確，您可以把它標注為「待審核」狀態交由會計師來確定。"
+msgstr "勾選這裡，如果您不確定分錄是否正確，您可以把它標注為「待審核」狀態交由會計師來確定。"
 
 #. module: account
 #: field:account.chart.template,complete_tax_set:0
@@ -6740,7 +6790,7 @@ msgid "Total:"
 msgstr "合計:"
 
 #. module: account
-#: code:addons/account/account.py:2229
+#: code:addons/account/account.py:2246
 #, python-format
 msgid ""
 "You can specify year, month and date in the name of the model using the "
@@ -6752,7 +6802,7 @@ msgid ""
 "\n"
 "e.g. My model on %(date)s"
 msgstr ""
-"可以在憑證模版的名稱上使用年月日變量\n"
+"可以在分錄模版的名稱上使用年月日變量\n"
 "\n"
 "%(year)s：本年\n"
 "%(month)s：本月\n"
@@ -6777,7 +6827,7 @@ msgid "Taxes used in Sales"
 msgstr "銷售中用到的稅"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #: code:addons/account/wizard/account_invoice_refund.py:145
 #, python-format
 msgid "Data Insufficient !"
@@ -6803,7 +6853,7 @@ msgstr "銷售"
 #: view:account.journal.column:0
 #: model:ir.model,name:account.model_account_journal_column
 msgid "Journal Column"
-msgstr "賬簿列"
+msgstr "帳簿欄"
 
 #. module: account
 #: selection:account.invoice.report,state:0
@@ -6821,8 +6871,8 @@ msgid ""
 "accounting application of OpenERP, journals and accounts will be created "
 "automatically based on these data."
 msgstr ""
-"配置貴公司的銀行賬號並選擇需要在報表頁腳顯示的帳號。你可以在列表視圖對銀行排序。如果你使用了OpenERP的會計功能，會基於這些銀行賬號數據自動建立憑證簿"
-"和會計科目。"
+"配置貴公司的銀行帳號並選擇需要在報表頁腳顯示的帳號。你可以在列表視圖對銀行排序。如果你使用了OpenERP的會計功能，會基於這些銀行帳號數據自動建立帳簿和"
+"會計科目。"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
@@ -6839,7 +6889,7 @@ msgid ""
 "you request an interval of 30 days OpenERP generates an analysis of "
 "creditors for the past month, past two months, and so on. "
 msgstr ""
-"業務夥伴過期試算表是某個時間段內應收賬款的詳細的報表。打開這個報表後請輸入公司名稱、會計期間、分析的時間段（按天）。OpenERP會按期間計算應收賬款餘額"
+"業務夥伴過期試算表是某個時間段內應收帳款的詳細的報表。打開這個報表後請輸入公司名稱、會計期間、分析的時間段（按天）。OpenERP會按期間計算應收帳款餘額"
 "。如果你輸入了30天，OpenERP生成業務夥伴前一個月，再前一個月的金額。 "
 
 #. module: account
@@ -6849,14 +6899,14 @@ msgid "Source Document"
 msgstr "源單據"
 
 #. module: account
-#: code:addons/account/account.py:1432
+#: code:addons/account/account.py:1449
 #, python-format
 msgid "You can not delete a posted journal entry \"%s\"!"
-msgstr "你不能刪除一個已覆核的會計憑證「%s」 ！"
+msgstr "你不能刪除一個已覆核的分錄「%s」 ！"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
-#: code:addons/account/report/account_partner_ledger.py:59
+#: code:addons/account/report/account_partner_ledger.py:60
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
@@ -6865,7 +6915,7 @@ msgstr "未核銷分錄"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
 msgid "Statements Reconciliation"
-msgstr "對賬報表"
+msgstr "對帳報表"
 
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
@@ -6889,7 +6939,7 @@ msgid ""
 "from a specific date, i.e. corresponding to the signature of a contract or "
 "an agreement with a customer or a supplier. With Define Recurring Entries, "
 "you can create such entries to automate the postings in the system."
-msgstr "定期憑證是一中在指定時間發生的各種憑證，一般基於與客戶或供應商簽訂的合同。您可以定義定期憑證在系統中自動過賬。"
+msgstr "定期分錄是一中在指定時間發生的各種分錄，一般基於與客戶或供應商簽訂的合同。您可以定義定期分錄在系統中自動過帳。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
@@ -6910,14 +6960,14 @@ msgid ""
 "This feature provides an easy way to follow up cash payments on a daily "
 "basis. You can enter the coins that are in your cash box, and then post "
 "entries when money comes in or goes out of the cash box."
-msgstr "現金記錄用來管理現金日記賬上的收支分錄。這個功能用於跟蹤日常的現金支付。可以輸入你備用現金的金額，然後在現金進出時建立分錄。"
+msgstr "現金記錄用來管理現金帳簿上的收支分錄。這個功能用於追蹤日常的現金支付。可以輸入你備用現金的金額，然後在現金進出時建立分錄。"
 
 #. module: account
 #: help:account.invoice.refund,date:0
 msgid ""
 "This date will be used as the invoice date for Refund Invoice and Period "
 "will be chosen accordingly!"
-msgstr "這日期將用作這紅字發票的發票日期和將選擇相應的會計期間!"
+msgstr "這日期將用作這折讓單的日期和將選擇相應的會計期間!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
@@ -6944,7 +6994,7 @@ msgstr "稅模板"
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr "你確定要顯示這個憑證簿的會計憑證麼？"
+msgstr "你確定要顯示這個帳簿的分錄嗎？"
 
 #. module: account
 #: view:account.state.open:0
@@ -6952,8 +7002,8 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "你確定要打開這發票?"
 
 #. module: account
-#: code:addons/account/account_invoice.py:528
-#: code:addons/account/account_invoice.py:543
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
 #, python-format
 msgid ""
 "Can not find a chart of account, you should create one from the "
@@ -6966,7 +7016,7 @@ msgid "Opening Entries Expense Account"
 msgstr "未分配利潤科目"
 
 #. module: account
-#: code:addons/account/account_move_line.py:999
+#: code:addons/account/account_move_line.py:1014
 #, python-format
 msgid "Accounting Entries"
 msgstr "會計分錄"
@@ -6987,7 +7037,7 @@ msgstr "導入會計科目表"
 #: field:account.move.line,statement_id:0
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement"
-msgstr "對賬單"
+msgstr "對帳單"
 
 #. module: account
 #: help:account.journal,default_debit_account_id:0
@@ -6999,12 +7049,12 @@ msgstr "它將作為一個預設的借方科目"
 msgid ""
 "You can search for individual account entries through useful information. To "
 "search for account entries, open a journal, then select a record line."
-msgstr "要搜索分錄明細，打開一個賬簿，選擇一個記錄。"
+msgstr "要搜索分錄明細，打開一個帳簿，選擇一個記錄。"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr "已覆核的會計憑證呢個"
+msgstr "已登的分錄"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
@@ -7056,7 +7106,7 @@ msgid ""
 "Check this box to determine that each entry of this journal won't create a "
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
-msgstr "勾選此項，在會計年度關閉時, 確定每個賬簿的分錄不會產生新副本, 而是共享同一副本。"
+msgstr "勾選此項，在會計年度關閉時, 確定每個帳簿的分錄不會產生新副本, 而是共享同一副本。"
 
 #. module: account
 #: field:account.bank.statement,closing_date:0
@@ -7066,7 +7116,7 @@ msgstr "關閉在"
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr "銀行對賬單明細"
+msgstr "銀行對帳單明細"
 
 #. module: account
 #: field:account.automatic.reconcile,date2:0
@@ -7097,7 +7147,7 @@ msgid ""
 msgstr "這欄位只用於，如果您開發自己的模塊允許開發者在自定義域建立特定的稅"
 
 #. module: account
-#: code:addons/account/account.py:1088
+#: code:addons/account/account.py:1095
 #, python-format
 msgid "You should have chosen periods that belongs to the same company"
 msgstr "同一家公司你應該選擇一個會計期間"
@@ -7105,7 +7155,7 @@ msgstr "同一家公司你應該選擇一個會計期間"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
 msgid "Review your Payment Terms"
-msgstr "檢查你的付款條件"
+msgstr "檢查您的付款條件"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
@@ -7128,8 +7178,8 @@ msgid "Reporting"
 msgstr "報表"
 
 #. module: account
-#: code:addons/account/account_move_line.py:759
-#: code:addons/account/account_move_line.py:842
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
 #: code:addons/account/wizard/account_invoice_state.py:44
 #: code:addons/account/wizard/account_invoice_state.py:68
 #: code:addons/account/wizard/account_state_open.py:37
@@ -7153,13 +7203,13 @@ msgstr "關閉錢箱"
 #: view:account.journal:0
 #: field:res.partner.bank,journal_id:0
 msgid "Account Journal"
-msgstr "賬簿"
+msgstr "帳簿"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
 #: model:process.node,name:account.process_node_supplierpaidinvoice0
 msgid "Paid invoice"
-msgstr "支付發票"
+msgstr "已支付發票"
 
 #. module: account
 #: help:account.partner.reconcile.process,next_partner_id:0
@@ -7198,7 +7248,7 @@ msgid ""
 "OpenERP. If you want to record a supplier invoice, start by recording the "
 "line of the expense account, OpenERP will propose to you automatically the "
 "Tax related to this account and the counter-part \"Account Payable\"."
-msgstr "此界面用於會計人員正式的記錄。當輸入供應商發票時，請先輸入明細的費用科目，OpenERP將為您自動生成相關的稅和應付款"
+msgstr "此界面用於會計人員正式的記錄。當輸入供應商發票時，請先輸入明細的費用科目，OpenERP將為您自動生成相關的稅和應付帳款"
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7210,7 +7260,7 @@ msgstr "發票明細"
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr "客戶和供應商紅字發票"
+msgstr "客戶和供應商折讓"
 
 #. module: account
 #: field:account.financial.report,sign:0
@@ -7218,10 +7268,10 @@ msgid "Sign on Reports"
 msgstr "報表上的符號"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries were not found"
-msgstr "用於生成期初餘額會計憑證的期間不存在"
+msgstr "用於生成期初餘額分錄的期間不存在"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
@@ -7229,7 +7279,7 @@ msgid "Root/View"
 msgstr "根/視圖"
 
 #. module: account
-#: code:addons/account/account.py:3121
+#: code:addons/account/account.py:3138
 #, python-format
 msgid "OPEJ"
 msgstr "OPEJ"
@@ -7264,13 +7314,14 @@ msgid "Optional Information"
 msgstr "可選信息"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:84
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account"
-msgstr "這賬簿必須要有預設貸方和借方科目"
+msgstr "這帳簿必須要有預設貸方和借方科目"
 
 #. module: account
 #: report:account.general.journal:0
+#: xsl:account.transfer:0
 msgid ":"
 msgstr "："
 
@@ -7284,7 +7335,7 @@ msgstr "當日匯率"
 msgid ""
 "This field is used for payable and receivable journal entries. You can put "
 "the limit date for the payment of this line."
-msgstr "此欄位是用於應付賬款和應收賬款的分錄。您可以用它設置付款明細的最後限期。"
+msgstr "此欄位是用於應付帳款和應收帳款的分錄。您可以用它設置付款明細的最後限期。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_multi_currency
@@ -7297,22 +7348,22 @@ msgid "Maturity Date"
 msgstr "到期日期"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1302
+#: code:addons/account/account_move_line.py:1317
 #, python-format
 msgid "Bad account !"
 msgstr "無效科目!"
 
 #. module: account
-#: code:addons/account/account.py:3108
+#: code:addons/account/account.py:3125
 #, python-format
 msgid "Sales Journal"
-msgstr "銷售賬簿"
+msgstr "銷售帳簿"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:104
 #, python-format
 msgid "Open Journal Items !"
-msgstr "打開賬簿的明細！"
+msgstr "打開帳簿的借貸項！"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -7320,7 +7371,7 @@ msgid "Invoice Tax"
 msgstr "發票稅"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1277
+#: code:addons/account/account_move_line.py:1292
 #, python-format
 msgid "No piece number !"
 msgstr "沒會計期間!"
@@ -7346,7 +7397,7 @@ msgstr ""
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr "未審核的會計憑證"
+msgstr "未登的分錄"
 
 #. module: account
 #: view:product.product:0
@@ -7372,7 +7423,7 @@ msgstr "到"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
-#: code:addons/account/account.py:1518
+#: code:addons/account/account.py:1535
 #, python-format
 msgid "Currency Adjustment"
 msgstr "匯兌損益調整"
@@ -7402,7 +7453,7 @@ msgid ""
 "one or several payments. Customers periodic reminders will use the payment "
 "terms for each letter. Each customer or supplier can be assigned to one of "
 "these payment terms."
-msgstr "付款條款用於客戶或供應商的付款。對客戶的定期催款會在每個催款函中用到付款條件。可以為每個供應商或客戶指定預設付款條件。"
+msgstr "付款條件用於客戶或供應商的付款。對客戶的定期催款會在每個催款函中用到付款條件。可以為每個供應商或客戶指定預設付款條件。"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -7420,13 +7471,15 @@ msgstr "5"
 #: selection:account.common.partner.report,result_selection:0
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:374
 #: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:397
 #, python-format
 msgid "Payable Accounts"
-msgstr "應付款科目"
+msgstr "應付帳款科目"
 
 #. module: account
-#: code:addons/account/account_invoice.py:732
+#: code:addons/account/account_invoice.py:741
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr "定義了全局稅，但發票行中沒有！"
@@ -7452,12 +7505,12 @@ msgstr "事務編碼"
 #. module: account
 #: view:validate.account.move:0
 msgid "Post Journal Entries of a Journal"
-msgstr "賬簿裡的分錄登賬"
+msgstr "帳簿裡的分錄登帳"
 
 #. module: account
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr "銷售稅"
+msgstr "銷項稅額"
 
 #. module: account
 #: field:account.financial.report,name:0
@@ -7470,7 +7523,7 @@ msgstr "報表名稱"
 #: selection:account.bank.accounts.wizard,account_type:0
 #: selection:account.entries.report,type:0
 #: selection:account.journal,type:0
-#: code:addons/account/account.py:3003
+#: code:addons/account/account.py:3020
 #, python-format
 msgid "Cash"
 msgstr "現金"
@@ -7482,21 +7535,21 @@ msgid "Account Destination"
 msgstr "目標科目"
 
 #. module: account
-#: code:addons/account/account.py:1431
-#: code:addons/account/account.py:1460
-#: code:addons/account/account.py:1467
-#: code:addons/account/account_invoice.py:920
-#: code:addons/account/account_move_line.py:1104
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:73
-#: code:addons/account/wizard/account_fiscalyear_close.py:83
-#: code:addons/account/wizard/account_fiscalyear_close.py:86
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
 #: code:addons/account/wizard/account_move_journal.py:165
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "UserError"
-msgstr "用戶錯誤"
+msgstr "使用者錯誤"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
@@ -7526,7 +7579,7 @@ msgstr "錯誤！您不能建立循環分類。"
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr "憑證行中可選的數量"
+msgstr "分錄行中可選的數量"
 
 #. module: account
 #: view:account.financial.report:0
@@ -7546,7 +7599,7 @@ msgstr "銷售科目類型"
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr "鏈接到自動生成的會計憑證行"
+msgstr "鏈接到自動生成的借貸項"
 
 #. module: account
 #: selection:account.installer,period:0
@@ -7562,7 +7615,7 @@ msgid ""
 "in which they will appear. Then you can create a new journal and link your "
 "view to it."
 msgstr ""
-"在這裡您可以修改一個賬簿視圖或建一個新的視圖。賬簿視圖定義您輸入分錄。當您要建立一個新的視圖，選擇您要顯示在視圖上的欄位並指定它們的序列。"
+"在這裡您可以修改一個帳簿視圖或建一個新的視圖。帳簿視圖定義您輸入分錄。當您要建立一個新的視圖，選擇您要顯示在視圖上的欄位並指定它們的序列。"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_asset
@@ -7614,7 +7667,7 @@ msgstr "序列欄位用於稅從低到高排序.。如果稅中有子稅這排
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr "錢箱賬明細"
+msgstr "現金帳明細"
 
 #. module: account
 #: view:account.partner.ledger:0
@@ -7624,7 +7677,7 @@ msgstr "錢箱賬明細"
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 #: model:ir.ui.menu,name:account.menu_account_partner_ledger
 msgid "Partner Ledger"
-msgstr "業務夥伴分類賬"
+msgstr "業務夥伴分類帳"
 
 #. module: account
 #: selection:account.tax.template,type:0
@@ -7637,13 +7690,14 @@ msgstr "固定"
 #: code:addons/account/account.py:645
 #: code:addons/account/account.py:664
 #: code:addons/account/account.py:787
-#: code:addons/account/account.py:1077
-#: code:addons/account/account_invoice.py:732
-#: code:addons/account/account_invoice.py:735
-#: code:addons/account/account_invoice.py:738
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
 #: code:addons/account/account_move_line.py:97
-#: code:addons/account/account_move_line.py:750
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "Warning !"
 msgstr "警告 !"
@@ -7656,7 +7710,7 @@ msgstr "憑證明細的狀態"
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
 msgid "Account move line reconcile"
-msgstr "核銷憑證明細"
+msgstr "調節憑證明細"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -7695,11 +7749,11 @@ msgid "Select a currency to apply on the invoice"
 msgstr "在發票上選擇合適的幣別"
 
 #. module: account
-#: code:addons/account/account.py:3446
+#: code:addons/account/account.py:3463
 #, python-format
 msgid ""
 "The bank account defined on the selected chart of accounts hasn't a code."
-msgstr "所選會計科目表上定義的銀行賬號沒有編碼"
+msgstr "所選會計科目表上定義的銀行帳號沒有編碼"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:108
@@ -7708,7 +7762,7 @@ msgid "Can not %s draft/proforma/cancel invoice."
 msgstr "不能註銷 %s 草稿/形式/取消的發票"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "No Invoice Lines !"
 msgstr "沒有發票明細"
@@ -7758,7 +7812,7 @@ msgid ""
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
-"銀行對賬單餘額不正確！\n"
+"銀行對帳單餘額不正確！\n"
 "預期的餘額是(%.2f)，現在算出來的是(%.2f)"
 
 #. module: account
@@ -7777,8 +7831,8 @@ msgid ""
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
-"會計科目表一般按所在國家的要求有確定的結構。成本科目表按您的業務需求和內部報表自定義。一般包含合同、項目、產品、部門。大多數OpenERP業務（發票、計工"
-"單、報銷等）會生成相關成本科目的成本憑證。"
+"會計科目表一般按所在國家的要求有確定的結構。成本科目表按您的業務需求和內部報表自定義。一般包含合同、項目、產品、部門。大多數OpenERP業務（發票、工時"
+"表、報銷等）會生成相關成本科目的成本分錄。"
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -7786,7 +7840,7 @@ msgid "Deferral Method"
 msgstr "遞延方法"
 
 #. module: account
-#: code:addons/account/account_invoice.py:379
+#: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Invoice '%s' is paid."
 msgstr "發票 '%s' 已支付。"
@@ -7812,7 +7866,7 @@ msgstr "如果勾選此項, 系統將試圖對生成的發票分組"
 #: help:account.account,reconcile:0
 msgid ""
 "Check this box if this account allows reconciliation of journal items."
-msgstr "如果此會計科目需要核銷，勾選這裡"
+msgstr "如果此會計科目需要調節，勾選這裡"
 
 #. module: account
 #: help:account.period,state:0
@@ -7848,7 +7902,7 @@ msgid "Associated Partner"
 msgstr "相關業務夥伴"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1332
+#: code:addons/account/account_invoice.py:1345
 #, python-format
 msgid "You must first select a partner !"
 msgstr "你必須首先選擇一個業務夥伴!"
@@ -7874,9 +7928,9 @@ msgid ""
 msgstr ""
 " 新建的發票是『草稿』狀態。\n"
 "點擊了形式發票按鈕後的發票是『形式發票』狀態，此時沒有發票號。\n"
-"當用戶開好了發票後，點『建立』按鈕發票進入『未付款』狀態，此時分配了發票號。\n"
+"當使用者開好了發票後，點『建立』按鈕發票進入『未付款』狀態，此時分配了發票號。\n"
 "當輸入付款以後發票進入『已付款』狀態。\n"
-"如用戶作廢了發票則進入『已取消』狀態。"
+"如使用者作廢了發票則進入『已取消』狀態。"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -7899,7 +7953,7 @@ msgid ""
 msgstr "稅目一覽表是用來生成您定期的稅單。請您按照貴國的稅法設置。"
 
 #. module: account
-#: code:addons/account/account_invoice.py:428
+#: code:addons/account/account_invoice.py:437
 #, python-format
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
@@ -7921,10 +7975,10 @@ msgid "Choose Fiscal Year"
 msgstr "選擇會計年度"
 
 #. module: account
-#: code:addons/account/account.py:3111
+#: code:addons/account/account.py:3128
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr "採購紅字發票賬簿"
+msgstr "進貨退回帳簿"
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -7988,32 +8042,32 @@ msgstr "不含稅合計:"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
 msgid "Generic Reporting"
-msgstr "通用報告"
+msgstr "通用報表"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
 msgid "Write-Off Journal"
-msgstr "補差額賬簿"
+msgstr "補差額帳簿"
 
 #. module: account
 #: help:res.partner,property_payment_term:0
 msgid ""
 "This payment term will be used instead of the default one for the current "
 "partner"
-msgstr "這付款條款將替代為當前業務夥伴預設的."
+msgstr "這付款條件將替代為當前業務夥伴預設的."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Compute Code for Taxes Included Prices"
-msgstr ""
+msgstr "計算含稅價格代碼"
 
 #. module: account
-#: code:addons/account/account_invoice.py:1030
+#: code:addons/account/account_invoice.py:1042
 #, python-format
 msgid ""
 "You can not cancel an invoice which is partially paid! You need to "
 "unreconcile related payment entries first!"
-msgstr "你不能取消已部分付款的發票！你需要先反核銷對應的付款憑證。"
+msgstr "你不能取消已部分付款的發票！你需要先反核銷對應的付款分錄。"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
@@ -8029,7 +8083,7 @@ msgstr "已調整的餘額"
 #: 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 "財務結構模組"
 
 #. module: account
 #: view:account.entries.report:0
@@ -8053,7 +8107,7 @@ msgid ""
 "refund is a document that credits an invoice completely or partially. You "
 "can easily generate refunds and reconcile them directly from the invoice "
 "form."
-msgstr "在客戶紅字發票您能管理您客戶的欠款單，紅字發票是發票的全部或部分項。您能直接在發票窗口輕鬆生成紅字發票和核對它們。"
+msgstr "在客戶折讓您能管理您客戶的欠款單，折讓單是發票的全部或部分項。您能直接在發票窗口輕鬆生成折讓單和核對它們。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -8065,6 +8119,12 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"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 OpenERP 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."
 
 #. module: account
 #: report:account.invoice:0
@@ -8074,7 +8134,7 @@ msgstr "電話:"
 #. module: account
 #: field:account.account,company_currency_id:0
 msgid "Company Currency"
-msgstr "公司本位幣"
+msgstr "公司貨幣"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8111,13 +8171,13 @@ msgstr "期末結餘"
 msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
-msgstr "您可以勾選此，標記賬簿的明細正與相關業務夥伴在爭議中。"
+msgstr "您可以勾選此，標記帳簿的明細正與相關業務夥伴在爭議中。"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
 #: view:account.move.line.reconcile:0
 msgid "Partial Reconcile"
-msgstr "部分核銷"
+msgstr "部分調節"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
@@ -8136,7 +8196,7 @@ msgid "current month"
 msgstr "本月"
 
 #. module: account
-#: code:addons/account/account.py:1052
+#: code:addons/account/account.py:1057
 #, python-format
 msgid ""
 "No period defined for this date: %s !\n"
@@ -8148,18 +8208,18 @@ msgstr ""
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
-msgstr "自動導入銀行對賬單"
+msgstr "自動導入銀行對帳單"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_journal_view
 #: model:ir.ui.menu,name:account.menu_action_account_journal_view
 msgid "Journal Views"
-msgstr "賬簿視圖"
+msgstr "帳簿視圖"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr "核銷銀行憑證"
+msgstr "調節銀行憑證"
 
 #. module: account
 #: field:account.financial.report,account_type_ids:0
@@ -8185,13 +8245,13 @@ msgstr "  金額：無"
 #: model:process.node,name:account.process_node_supplierreconciliation0
 #, python-format
 msgid "Reconciliation"
-msgstr "核銷"
+msgstr "調節"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr "應收款科目"
+msgstr "應收帳款科目"
 
 #. module: account
 #: view:account.invoice:0
@@ -8203,8 +8263,8 @@ msgid ""
 "You should press this button to re-open it and let it continue its normal "
 "process after having resolved the eventual exceptions it may have created."
 msgstr ""
-"這個按鈕只在發票的狀態是『已付款』的時候才顯示（意味著發票已經全部核銷了），只讀欄位『已核銷』卻是沒有勾選的（實際上不應該這樣）。換句話說，這張發票被反核"
-"銷了，不應該在『已付款』狀態。你應該單擊這個按鈕來更改發票狀態到『未付款』。這樣解決了異常問題後就可以按正常流程繼續處理這張發票了。"
+"這個按鈕只在發票的狀態是『已付款』的時候才顯示（意味著發票已經全部調節了），只讀欄位『已調節』卻是沒有勾選的（實際上不應該這樣）。換句話說，這張發票被反調"
+"節了，不應該在『已付款』狀態。你應該單擊這個按鈕來更改發票狀態到『未付款』。這樣解決了異常問題後就可以按正常流程繼續處理這張發票了。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
@@ -8214,15 +8274,17 @@ msgstr "關閉一個會計年度"
 #. module: account
 #: field:account.invoice.refund,journal_id:0
 msgid "Refund Journal"
-msgstr "紅字發票賬簿"
+msgstr "折讓帳簿"
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.central.journal:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
+#: report:account.third_party_ledger:0
 msgid "Filter By"
 msgstr "篩選"
 
@@ -8240,7 +8302,7 @@ msgstr "客戶發票用於管理要發給客戶的銷售發票。OpenERP可以
 #, python-format
 msgid ""
 "In order to close a period, you must first post related journal entries."
-msgstr "在關閉會計期間之前，請先覆核本期間的會計憑證。"
+msgstr "在關閉會計期間之前，請先覆核本期間的分錄。"
 
 #. module: account
 #: view:account.entries.report:0
@@ -8255,7 +8317,7 @@ msgid "The partner account used for this invoice."
 msgstr "這發票用這業務夥伴科目"
 
 #. module: account
-#: code:addons/account/account.py:3296
+#: code:addons/account/account.py:3313
 #, python-format
 msgid "Tax %.2f%%"
 msgstr "稅 %.2f%%"
@@ -8263,7 +8325,7 @@ msgstr "稅 %.2f%%"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Contacts"
-msgstr "聯繫人"
+msgstr "聯絡人"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
@@ -8275,18 +8337,18 @@ msgstr "上級代碼"
 #. module: account
 #: model:ir.model,name:account.model_account_payment_term_line
 msgid "Payment Term Line"
-msgstr "付款條款明細"
+msgstr "付款條件明細"
 
 #. module: account
-#: code:addons/account/account.py:3109
+#: code:addons/account/account.py:3126
 #, python-format
 msgid "Purchase Journal"
-msgstr "採購賬簿"
+msgstr "採購帳簿"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Refund Invoice: Creates the refund invoice, ready for editing."
-msgstr "紅字發票：建立紅字發票，準備編輯。"
+msgstr "折讓單：建立折讓，準備編輯。"
 
 #. module: account
 #: field:account.invoice.line,price_subtotal:0
@@ -8296,12 +8358,12 @@ msgstr "小計"
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr "打印稅單"
+msgstr "列印稅單"
 
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr "賬簿模型明細"
+msgstr "分錄模型明細"
 
 #. module: account
 #: view:account.invoice:0
@@ -8333,7 +8395,7 @@ msgstr "供應商會計屬性"
 msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
-msgstr "用公司本位幣表示的應收或應付賬簿的餘額。"
+msgstr "用公司本位幣表示的應收或應付分錄的餘額。"
 
 #. module: account
 #: view:account.tax.code:0
@@ -8363,7 +8425,7 @@ msgid "Unpaid Invoices"
 msgstr "未支付的發票"
 
 #. module: account
-#: code:addons/account/account_invoice.py:495
+#: code:addons/account/account_invoice.py:504
 #, python-format
 msgid "The payment term of supplier does not have a payment term line!"
 msgstr "這個供應商的付款條件沒有付款條件行！"
@@ -8388,7 +8450,7 @@ msgstr "資金"
 #: view:account.analytic.journal.report:0
 #: view:account.common.report:0
 msgid "Print"
-msgstr "打印"
+msgstr "列印"
 
 #. module: account
 #: view:account.journal:0
@@ -8398,7 +8460,7 @@ msgstr "允許科目(留空為不限制)"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr "科目一覽模版"
+msgstr "科目一覽模組"
 
 #. module: account
 #: view:board.board:0
@@ -8426,12 +8488,12 @@ msgstr "輔助核算成本"
 #: report:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr "賬簿名稱"
+msgstr "帳簿名稱"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr "要核銷的下一個往來憑證"
+msgstr "要調節的下一個往來分錄"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -8455,7 +8517,7 @@ msgstr "發票建立時自動計算出唯一的發票編號"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr "手工單據的金額必須和對賬單明細上的金額一致"
+msgstr "分錄金額必須和對帳單明細上的金額一致"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_expense
@@ -8469,7 +8531,7 @@ msgid "Keep empty for all open fiscal years"
 msgstr "保留空為打開所有的會計年度"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1105
+#: code:addons/account/account_move_line.py:1120
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
 msgstr "合併的憑證 (%s) 已確認！"
@@ -8482,14 +8544,14 @@ msgid ""
 msgstr "如果它是一個多貨幣憑證,這金額表示一個可選的其它貨幣金額."
 
 #. module: account
-#: code:addons/account/account.py:1307
+#: code:addons/account/account.py:1315
 #, python-format
 msgid ""
 "You can not validate a non-balanced entry !\n"
 "Make sure you have configured payment terms properly !\n"
 "The latest payment term line should be of the type \"Balance\" !"
 msgstr ""
-"你不能覆核沒有平衡的會計憑證！\n"
+"你不能覆核沒有平衡的分錄！\n"
 "請確認你的付款條件配置正確！\n"
 "付款條件的最後一行類型應該是『餘額』！"
 
@@ -8527,7 +8589,7 @@ msgstr "幣別"
 #: help:account.bank.statement.line,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of bank statement lines."
-msgstr "提供顯示銀行對賬單的序列"
+msgstr "提供顯示銀行對帳單的序列"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
@@ -8550,7 +8612,7 @@ msgstr "根據您的需要定義公司的會計年度。每個會計年度會計
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr "核銷分錄"
+msgstr "調節分錄"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
@@ -8558,7 +8620,7 @@ msgid "Contact Address"
 msgstr "聯繫地址"
 
 #. module: account
-#: code:addons/account/account.py:2256
+#: code:addons/account/account.py:2273
 #, python-format
 msgid "Wrong model !"
 msgstr "模型有誤！"
@@ -8571,7 +8633,7 @@ msgstr "強制會計期間"
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr "打印業務夥伴餘額"
+msgstr "列印業務夥伴餘額"
 
 #. module: account
 #: help:account.financial.report,sign:0
@@ -8582,8 +8644,8 @@ msgid ""
 "accounts that are typically more credited than debited and that you would "
 "like to print as positive amounts in your reports; e.g.: Income account."
 msgstr ""
-"對於貸方發生額大於借方發生額的會計科目，你希望在打印報表時顯示餘額的絕對值，你可以對科目的餘額取反；例如：收入科目。對於借方發生額大於貸方發生額的會計科目"
-"，你希望在打印報表時顯示餘額的絕對值，你可以對科目的餘額取反；例如：費用科目。"
+"對於貸方發生額大於借方發生額的會計科目，你希望在列印報表時顯示餘額的絕對值，你可以對科目的餘額取反；例如：收入科目。對於借方發生額大於貸方發生額的會計科目"
+"，你希望在列印報表時顯示餘額的絕對值，你可以對科目的餘額取反；例如：費用科目。"
 
 #. module: account
 #: field:res.partner,contract_ids:0
@@ -8595,20 +8657,22 @@ msgstr "合同列表"
 #: field:account.cashbox.line,starting_id:0
 #: field:account.entries.report,reconcile_id:0
 #: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
 msgid "unknown"
 msgstr "未知的"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
-#: code:addons/account/account.py:3113
+#: code:addons/account/account.py:3130
 #, python-format
 msgid "Opening Entries Journal"
-msgstr "賬簿的開賬分錄"
+msgstr "帳簿的開帳分錄"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 msgid "Draft invoices are checked, validated and printed."
-msgstr "發票草稿待檢查，生效和打印。"
+msgstr "發票草稿待檢查，生效和列印。"
 
 #. module: account
 #: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8619,10 +8683,10 @@ msgid ""
 msgstr "這科目用於損益(如果是利潤：金額就加，損失：金額就減)用作計算損益報表"
 
 #. module: account
-#: code:addons/account/account_invoice.py:808
+#: code:addons/account/account_invoice.py:819
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
-msgstr "請為這張發票對應的憑證簿選擇編號規則"
+msgstr "請為這張發票對應的帳簿選擇編號規則"
 
 #. module: account
 #: view:account.move:0
@@ -8640,7 +8704,7 @@ msgstr "本年按類型分組的銷售"
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for Period"
-msgstr ""
+msgstr "成本分類帳的會計期間"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -8658,7 +8722,7 @@ msgstr "Python代碼"
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal Code"
-msgstr "賬簿編碼"
+msgstr "帳簿編碼"
 
 #. module: account
 #: help:account.tax.code,sign:0
@@ -8679,18 +8743,18 @@ msgstr "餘額"
 #: field:account.invoice,move_lines:0
 #: field:account.move.reconcile,line_id:0
 msgid "Entry Lines"
-msgstr "憑證明細"
+msgstr "分錄明細"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
 msgid "Review your Financial Accounts"
-msgstr "檢查你的會計科目"
+msgstr "檢查您的會計科目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
 #: model:ir.actions.act_window,name:account.action_validate_account_move
 msgid "Open Journal"
-msgstr "未結的賬簿"
+msgstr "未結的帳簿"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8705,10 +8769,10 @@ msgid "Period from"
 msgstr "會計期間從"
 
 #. module: account
-#: code:addons/account/account.py:3110
+#: code:addons/account/account.py:3127
 #, python-format
 msgid "Sales Refund Journal"
-msgstr "銷售紅字發票賬簿"
+msgstr "銷貨折讓帳簿"
 
 #. module: account
 #: view:account.move:0
@@ -8752,7 +8816,7 @@ msgid "Purchase Tax(%)"
 msgstr "進項稅(%)"
 
 #. module: account
-#: code:addons/account/account_invoice.py:810
+#: code:addons/account/account_invoice.py:821
 #, python-format
 msgid "Please create some invoice lines."
 msgstr "請建立發票明細。"
@@ -8768,7 +8832,7 @@ msgid "Display Detail"
 msgstr "顯示明細"
 
 #. module: account
-#: code:addons/account/account.py:3118
+#: code:addons/account/account.py:3135
 #, python-format
 msgid "SCNJ"
 msgstr "SCNJ"
@@ -8778,7 +8842,7 @@ msgstr "SCNJ"
 msgid ""
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft invoices."
-msgstr "從這些發票草稿產生的成本輔助核算項(計工單或原材料投入)。"
+msgstr "從這些發票草稿產生的成本輔助核算項目(工時表或原材料投入)。"
 
 #. module: account
 #: help:account.journal,view_id:0
@@ -8788,8 +8852,8 @@ msgid ""
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
-"選擇在輸入或顯示該憑證簿中的會計憑證行所使用的的視圖。這視圖可以定義欄位是否顯示，是否必輸，是否只讀，按什麼序列顯示。您可以為每個憑證簿定義視圖用於快速輸"
-"入會計憑證行。"
+"選擇在輸入或顯示該帳簿中的借貸項所使用的的視圖。這視圖可以定義欄位是否顯示，是否必輸，是否只讀，按什麼序列顯示。您可以為每個帳簿定義視圖用於快速輸入借貸項"
+"。"
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -8802,8 +8866,6 @@ msgstr "結束會計期間"
 #: field:account.account.template,financial_report_ids:0
 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree
 #: model:ir.actions.act_window,name:account.action_account_report
-#: model:ir.actions.act_window,name:account.action_account_report_bs
-#: model:ir.actions.act_window,name:account.action_account_report_pl
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
 msgstr "會計報表"
@@ -8818,6 +8880,7 @@ msgstr "會計報表"
 #: field:account.common.journal.report,period_from:0
 #: field:account.common.partner.report,period_from:0
 #: field:account.common.report,period_from:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_from:0
 #: report:account.general.ledger:0
@@ -8838,6 +8901,7 @@ msgstr "開始會計期間"
 
 #. module: account
 #: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
 msgid "Analysis Direction"
 msgstr "分析趨勢"
 
@@ -8853,11 +8917,11 @@ msgstr "公司是指業務夥伴"
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
-msgstr "賬簿視圖"
+msgstr "帳簿視圖"
 
 #. module: account
 #: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1046
+#: code:addons/account/account_move_line.py:1061
 #, python-format
 msgid "Total credit"
 msgstr "貸方合計"
@@ -8870,7 +8934,7 @@ msgstr "經會計師生效的發票分錄 "
 #. module: account
 #: report:account.overdue:0
 msgid "Best regards."
-msgstr "最好的祝願"
+msgstr "最好的問候"
 
 #. module: account
 #: view:account.invoice:0
@@ -8880,7 +8944,7 @@ msgstr "未付"
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr "稅編碼模板"
+msgstr "稅編碼模組"
 
 #. module: account
 #: report:account.overdue:0
@@ -8899,20 +8963,19 @@ msgid ""
 "suppliers. A refund is a document that credits an invoice completely or "
 "partially. You can easily generate refunds and reconcile them directly from "
 "the invoice form."
-msgstr ""
-"在供應商紅字發票裡您能管理您從供應商收到的欠款單據。紅字發票是一個單據是發票裡的全部或部分項。您能直接在發票窗口輕鬆生成紅字發票和核對它們。"
+msgstr "在進貨退回裡您能管理您從供應商收到的欠款單據。折讓單是一個單據是發票裡的全部或部分項。您能直接在發票窗口輕鬆生成折讓單和核對它們。"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr "應收款科目"
+msgstr "應收帳款科目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Bank Statements"
-msgstr "銀行對賬單"
+msgstr "銀行對帳單"
 
 #. module: account
 #: field:account.account,balance:0
@@ -8923,6 +8986,7 @@ msgstr "銀行對賬單"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,balance:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -8974,7 +9038,7 @@ msgstr "本年"
 #. module: account
 #: view:board.board:0
 msgid "Account Board"
-msgstr "會計儀表盤"
+msgstr "會計控制台"
 
 #. module: account
 #: view:account.model:0
@@ -8985,7 +9049,7 @@ msgstr "圖表"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Contract Data"
-msgstr "合同信息"
+msgstr "合約資料"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_sale
@@ -8996,18 +9060,18 @@ msgid ""
 "the income account. OpenERP will propose to you automatically the Tax "
 "related to this account and the counter-part \"Account receivable\"."
 msgstr ""
-"此界面用於會計輸入正式的單據。如果需要輸入一張客戶發票，首先選擇好賬簿和會計期間，然後首先輸入利潤科目的分錄，系統會自動處理相關的稅和應收款。"
+"此界面用於會計輸入正式的單據。如果需要輸入一張客戶發票，首先選擇好帳簿和會計期間，然後首先輸入利潤科目的分錄，系統會自動處理相關的稅和應收帳款。"
 
 #. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
 #, python-format
 msgid "You must select accounts to reconcile"
-msgstr "您必須選擇核銷科目"
+msgstr "您必須選擇調節科目"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 msgid "Accounting entries are the first input of the reconciliation."
-msgstr "核銷的第一個輸入是會計分錄。"
+msgstr "調節的第一個輸入是會計分錄。"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_form
@@ -9020,10 +9084,9 @@ msgid ""
 "period."
 msgstr ""
 "這裡定義一個會計期間，把會計年度分成更小的時間區間。會計期間通常是按月或者按季度分期。一般按照稅務申報表定義期間。根據貴公司需求用期間的打開和關閉控制在一"
-"定時間段內是否允許過賬"
+"定時間段內是否允許過帳"
 
 #. module: account
-#: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
 msgstr "篩選"
@@ -9032,7 +9095,7 @@ msgstr "篩選"
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr "手工錄入"
+msgstr "手工鍵入"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -9045,15 +9108,15 @@ msgid "Move"
 msgstr "憑證"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1153
+#: code:addons/account/account_move_line.py:1168
 #, python-format
 msgid "You can not change the tax, you should remove and recreate lines !"
-msgstr "您不能更改此稅目，請移除並重新建立憑證！"
+msgstr "您不能更改此稅目，請移除並重新建立分錄！"
 
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 365 days"
-msgstr "過去365天的成本憑證"
+msgstr "過去365天的成本分錄"
 
 #. module: account
 #: report:account.central.journal:0
@@ -9063,13 +9126,13 @@ msgstr "A/C 號"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr "銀行對賬單"
+msgstr "銀行對帳單"
 
 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
 msgid ""
 "Creates an account with the selected template under this existing parent."
-msgstr "根據現在選定的模板建立一個科目"
+msgstr "根據現在選定的模組建立一個科目"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -9082,7 +9145,7 @@ msgstr "日期中的一天"
 msgid ""
 "You have to define the bank account\n"
 "in the journal definition for reconciliation."
-msgstr "為了對賬，您必須在賬簿中定義一個銀行帳號。"
+msgstr "為了對帳，您必須在帳簿中定義一個銀行帳號。"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -9101,12 +9164,12 @@ msgid "Consolidated Children"
 msgstr "合併子科目"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:87
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
 #, python-format
 msgid ""
 "The journal must have centralised counterpart without the Skipping draft "
 "state option checked!"
-msgstr "匯總的賬簿沒勾上跳過草稿狀態的選項"
+msgstr "匯總的帳簿沒勾上跳過草稿狀態的選項"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -9127,7 +9190,7 @@ msgstr "付款分錄"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "July"
-msgstr "7"
+msgstr "7月"
 
 #. module: account
 #: view:account.account:0
@@ -9150,7 +9213,7 @@ msgstr "輔助核算餘額"
 msgid ""
 "No opening/closing period defined, please create one to set the initial "
 "balance!"
-msgstr "沒有定期開賬/關賬期間，請建立一個再設置期初餘額。"
+msgstr "沒有定期開帳/關帳期間，請建立一個再設置期初餘額。"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9162,6 +9225,7 @@ msgstr "沒有定期開賬/關賬期間，請建立一個再設置期初餘額
 #: field:account.common.journal.report,period_to:0
 #: field:account.common.partner.report,period_to:0
 #: field:account.common.report,period_to:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: field:account.general.journal,period_to:0
 #: report:account.general.ledger:0
@@ -9188,7 +9252,7 @@ msgstr "到期日期"
 #. module: account
 #: view:account.move.journal:0
 msgid "Standard Entries"
-msgstr ""
+msgstr "標準分錄"
 
 #. module: account
 #: help:account.journal,type:0
@@ -9199,13 +9263,13 @@ msgid ""
 "journals. Select 'Opening/Closing Situation' for entries generated for new "
 "fiscal years."
 msgstr ""
-"『銷售』用於客戶發票的憑證簿；『採購』用於供應商發票的憑證簿；『現金』或『銀行』用於客戶或供應商付款的憑證簿。『普通』用於其他各種業務。『初始化』用於生成"
-"新會計年度的年初餘額。"
+"『銷售』用於客戶發票的帳簿；『採購』用於供應商發票的帳簿；『現金』或『銀行』用於客戶或供應商付款的帳簿。『普通』用於其他各種業務。『初始化』用於生成新會計"
+"年度的年初餘額。"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr "週期性憑證科目"
+msgstr "週期性分錄科目"
 
 #. module: account
 #: report:account.overdue:0
@@ -9215,11 +9279,12 @@ msgstr "付款到期日"
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr "週期性憑證"
+msgstr "週期性分錄"
 
 #. module: account
 #: report:account.account.balance:0
 #: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
 #: field:account.balance.report,date_from:0
 #: report:account.central.journal:0
 #: field:account.central.journal,date_from:0
@@ -9227,6 +9292,7 @@ msgstr "週期性憑證"
 #: field:account.common.journal.report,date_from:0
 #: field:account.common.partner.report,date_from:0
 #: field:account.common.report,date_from:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_start:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_from:0
@@ -9252,7 +9318,7 @@ msgstr "開始日期"
 msgid ""
 "It indicates that the invoice has been paid and the journal entry of the "
 "invoice has been reconciled with one or several journal entries of payment."
-msgstr "此欄位表示發票已付款，也就是說這張發票對應的會計憑證與一張或幾張付款對應的會計憑證已核銷。"
+msgstr "此欄位表示發票已付款，也就是說這張發票對應的分錄與一張或幾張付款對應的分錄已調節。"
 
 #. module: account
 #: view:account.invoice:0
@@ -9269,7 +9335,7 @@ msgid "Unreconciled"
 msgstr "反核銷"
 
 #. module: account
-#: code:addons/account/account_invoice.py:828
+#: code:addons/account/account_invoice.py:839
 #, python-format
 msgid "Bad total !"
 msgstr "壞的合計!"
@@ -9290,8 +9356,8 @@ msgid ""
 "open period. Close a period when you do not want to record new entries and "
 "want to lock this period for tax related calculation."
 msgstr ""
-"會計期間是對會計記錄人為規定的時間段。一般按月分期，按貴公司所在國家的需要也可以按季度分期。關閉的會計期間不能繼續記賬，只能記賬在後面的會計期間。如果希望"
-"不能建立新的憑證或發生稅額變動請關閉會計期間。"
+"會計期間是對會計記錄人為規定的時間段。一般按月分期，按貴公司所在國家的需要也可以按季度分期。關閉的會計期間不能繼續記帳，只能記帳在後面的會計期間。如果希望"
+"不能建立新的分錄或發生稅額變動請關閉會計期間。"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -9302,7 +9368,7 @@ msgstr "等待中"
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr "輔助核算項"
+msgstr "輔助核算項目"
 
 #. module: account
 #: field:account.period,name:0
@@ -9330,7 +9396,7 @@ msgid "Comparison"
 msgstr "比較"
 
 #. module: account
-#: code:addons/account/account_invoice.py:372
+#: code:addons/account/account_invoice.py:381
 #, python-format
 msgid "Unknown Error"
 msgstr "未知錯誤"
@@ -9352,7 +9418,7 @@ msgstr "打開/關閉會計期間"
 #: field:account.account.template,currency_id:0
 #: field:account.bank.accounts.wizard,currency_id:0
 msgid "Secondary Currency"
-msgstr "外幣"
+msgstr "第二貨幣"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
@@ -9367,6 +9433,7 @@ msgstr "使憑證生效"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,credit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9389,7 +9456,7 @@ msgid ""
 "You can select here the journal to use for the refund invoice that will be "
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
-msgstr "在這裡您能選擇紅字發票賬簿。如不輸入會使用當前發票的賬簿。"
+msgstr "在這裡您能選擇折讓帳簿。如不輸入會使用當前發票的帳簿。"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -9406,12 +9473,12 @@ msgid ""
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 msgstr ""
 "配置錯誤！\n"
-"對於內部類型是『應收/應付』的會計科目，你需要選擇結轉方式是『未核銷』的科目類型。 "
+"對於內部類型是『應收/應付』的會計科目，你需要選擇結轉方式是『未調節』的科目類型。 "
 
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr "賬簿分錄模型"
+msgstr "帳簿分錄模型"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -9420,7 +9487,7 @@ msgid ""
 "Maturity date of entry line generated by model line '%s' is based on partner "
 "payment term!\n"
 "Please define partner on it!"
-msgstr "週期性憑證行 '%s'生成的生效日期基於業務夥伴的付款條件。請輸入業務夥伴！"
+msgstr "週期性分錄明細 '%s'生成的生效日期基於業務夥伴的付款條件。請輸入業務夥伴！"
 
 #. module: account
 #: field:account.cashbox.line,number:0
@@ -9440,7 +9507,7 @@ msgstr "一般"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 30 days"
-msgstr "過去30天的成本憑證"
+msgstr "過去30天的輔助核算項目明細"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -9467,9 +9534,11 @@ msgstr "過去30天的成本憑證"
 #: view:accounting.report:0
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:99
 #: model:ir.actions.act_window,name:account.action_account_period_form
 #: model:ir.ui.menu,name:account.menu_action_account_period_form
 #: model:ir.ui.menu,name:account.next_id_23
+#, python-format
 msgid "Periods"
 msgstr "會計期間"
 
@@ -9483,7 +9552,7 @@ msgstr "匯率"
 #: field:account.account,tax_ids:0
 #: field:account.account.template,tax_ids:0
 msgid "Default Taxes"
-msgstr "預設稅"
+msgstr "預設稅額"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9492,29 +9561,29 @@ msgstr "預設稅"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "April"
-msgstr "4"
+msgstr "4月"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr "要打印的損益"
+msgstr "要列印的損益"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
 msgid "Open for Reconciliation"
-msgstr "打開核銷"
+msgstr "開啟調節"
 
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr "上級左"
+msgstr "上級左邊"
 
 #. module: account
 #: help:account.invoice.refund,filter_refund:0
 msgid ""
 "Refund invoice base on this type. You can not Modify and Cancel if the "
 "invoice is already reconciled"
-msgstr "紅字發票基於這個類型，如果這發票已經核銷您不能修改或取消它。"
+msgstr "折讓單基於這個類型，如果這發票已經調節您不能修改或取消它。"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9549,7 +9618,7 @@ msgid ""
 "The validation of journal entries process is also called 'ledger posting' "
 "and is the process of transferring debit and credit amounts from a journal "
 "of original entry to a ledger book."
-msgstr "使分錄生效的過程也被稱為「過賬」，也就是把分錄的金額抄寫到賬簿上的過程。"
+msgstr "使分錄生效的過程也被稱為「過帳」，也就是把分錄的金額抄寫到帳簿上的過程。"
 
 #. module: account
 #: help:account.bank.statement,state:0
@@ -9568,14 +9637,14 @@ msgstr "會計期間"
 #. module: account
 #: view:account.subscription:0
 msgid "Remove Lines"
-msgstr "刪除行"
+msgstr "刪除明細"
 
 #. module: account
 #: view:account.report.general.ledger:0
 msgid ""
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
-msgstr "本報表讓您打印或產生一個由所有賬簿生成的總賬"
+msgstr "本報表讓您列印或產生一個由所有帳簿生成的總帳"
 
 #. module: account
 #: selection:account.account,type:0
@@ -9596,7 +9665,7 @@ msgstr "內部類型"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
 msgid "Running Subscriptions"
-msgstr "運行中的週期性憑證"
+msgstr "運行中的週期性分錄"
 
 #. module: account
 #: view:report.account.sales:0
@@ -9621,7 +9690,7 @@ msgstr "選擇會計期間"
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Posted"
-msgstr "已登賬"
+msgstr "已登帳"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9633,6 +9702,7 @@ msgstr "已登賬"
 #: field:account.common.journal.report,date_to:0
 #: field:account.common.partner.report,date_to:0
 #: field:account.common.report,date_to:0
+#: report:account.financial.report:0
 #: field:account.fiscalyear,date_stop:0
 #: report:account.general.journal:0
 #: field:account.general.journal,date_to:0
@@ -9656,7 +9726,7 @@ msgstr "結束日期"
 #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
 #: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
 msgid "Cancel Opening Entries"
-msgstr "取消開賬分錄"
+msgstr "取消開帳分錄"
 
 #. module: account
 #: field:account.payment.term.line,days2:0
@@ -9667,7 +9737,7 @@ msgstr "月天數"
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr "稅源自"
+msgstr "稅額來源"
 
 #. module: account
 #: view:ir.sequence:0
@@ -9680,7 +9750,7 @@ msgid "No detail"
 msgstr "不詳"
 
 #. module: account
-#: code:addons/account/account_analytic_line.py:102
+#: code:addons/account/account_analytic_line.py:100
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr "沒有為此產品  \"%s\" (id:%d)：定義利潤科目"
@@ -9688,7 +9758,7 @@ msgstr "沒有為此產品  \"%s\" (id:%d)：定義利潤科目"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr "憑證上不能使用已關閉的科目"
+msgstr "借貸項上不能使用已關閉的科目"
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
@@ -9716,6 +9786,7 @@ msgid "Verification Total"
 msgstr "檢查合計數"
 
 #. module: account
+#: report:account.aged_trial_balance:0
 #: report:account.analytic.account.balance:0
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9732,10 +9803,11 @@ msgstr "合計"
 #: code:addons/account/wizard/account_move_journal.py:97
 #, python-format
 msgid "Journal: All"
-msgstr "所有賬簿"
+msgstr "所有帳簿"
 
 #. module: account
 #: field:account.account,company_id:0
+#: report:account.account.balance:0
 #: field:account.aged.trial.balance,company_id:0
 #: field:account.analytic.journal,company_id:0
 #: field:account.balance.report,company_id:0
@@ -9750,7 +9822,9 @@ msgstr "所有賬簿"
 #: field:account.entries.report,company_id:0
 #: field:account.fiscal.position,company_id:0
 #: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
 #: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
 #: field:account.installer,company_id:0
 #: field:account.invoice,company_id:0
 #: field:account.invoice.line,company_id:0
@@ -9760,6 +9834,8 @@ msgstr "所有賬簿"
 #: view:account.journal:0
 #: field:account.journal,company_id:0
 #: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
 #: field:account.model,company_id:0
 #: field:account.move,company_id:0
 #: field:account.move.line,company_id:0
@@ -9810,7 +9886,7 @@ msgstr "建立月度會計期間"
 #. module: account
 #: field:account.tax.code.template,sign:0
 msgid "Sign For Parent"
-msgstr "父項的符號"
+msgstr "上級項目的符號"
 
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
@@ -9820,7 +9896,7 @@ msgstr "試算平衡表"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr "銀行對賬單草稿"
+msgstr "銀行對帳單草稿"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
@@ -9836,7 +9912,7 @@ msgstr "科目留空？ "
 #. module: account
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr "所選的憑證簿和期間必須屬於相同公司。"
+msgstr "所選的帳簿和期間必須屬於相同公司。"
 
 #. module: account
 #: view:account.invoice:0
@@ -9851,7 +9927,7 @@ msgstr "結束會計期間"
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr "每個公司的賬簿編碼必須唯一！"
+msgstr "每個公司的帳簿編碼必須唯一！"
 
 #. module: account
 #: help:product.category,property_account_expense_categ:0
@@ -9864,7 +9940,7 @@ msgstr "這科目將被用於當前產品分類的出庫價用成本價。"
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Generate Your Chart of Accounts from a Chart Template"
-msgstr "從科目模版生成會計科目"
+msgstr "從科目模組產生會計科目"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -9872,7 +9948,7 @@ msgid ""
 "From this report, you can have an overview of the amount invoiced to your "
 "customer as well as payment delays. The tool search can also be used to "
 "personalise your Invoices reports and so, match this analysis to your needs."
-msgstr "在這報表中，您可以知道給您的客戶開發票的總金額和拖欠的款項。這工具也可以用來搜索您特定的發票報表等。"
+msgstr "從這份報表中，你可以有一個概述發票給您的客戶，以及拖延支付的金額。搜索工具也可以用來個性化您的發票報表，因此，符合此分析您的需求。"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -9913,6 +9989,7 @@ msgstr "供應商發票"
 #: report:account.analytic.account.inverted.balance:0
 #: report:account.central.journal:0
 #: field:account.entries.report,debit:0
+#: report:account.financial.report:0
 #: report:account.general.journal:0
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
@@ -9946,8 +10023,10 @@ msgstr "錯誤！您不能建立遞歸的科目模板。"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
 msgid "Journal Entry Number"
-msgstr "會計憑證編號"
+msgstr "分錄編號"
 
 #. module: account
 #: view:account.subscription:0
@@ -9960,23 +10039,23 @@ msgstr "定期"
 msgid ""
 "You cannot change the type of account from 'Closed' to any other type which "
 "contains journal items!"
-msgstr "如果會計科目已經有過會計憑證，且現在是『關閉』類型，不能改為其他類型。"
+msgstr "如果會計科目已經有過分錄，且現在是『關閉』類型，不能改為其他類型。"
 
 #. module: account
-#: code:addons/account/account_move_line.py:832
+#: code:addons/account/account_move_line.py:843
 #, python-format
 msgid "Entry is already reconciled"
-msgstr "分錄已核銷"
+msgstr "分錄已調節"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr "應收款科目"
+msgstr "應收帳款科目"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
-msgstr "業務夥伴付款條款"
+msgstr "業務夥伴付款條件"
 
 #. module: account
 #: field:temp.range,name:0
@@ -9986,7 +10065,7 @@ msgstr "範圍"
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr "與採購憑證簿相關的成本憑證"
+msgstr "與採購憑證簿相關的輔助核算帳簿"
 
 #. module: account
 #: help:account.account,type:0
@@ -10000,8 +10079,10 @@ msgstr ""
 "內部類型用於對不同類型的科目進行控制：視圖科目不能做憑證，合併科目用於在多公司合併中指定子科目，應收應付科目用於業務夥伴，關閉科目用於不再使用的科目。"
 
 #. module: account
+#: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
+#: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
 msgstr "進展"
@@ -10009,12 +10090,12 @@ msgstr "進展"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Account Data"
-msgstr "輔助核算項數據"
+msgstr "會計資料"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr "稅編碼模板"
+msgstr "稅編碼模組"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
@@ -10028,13 +10109,13 @@ msgstr "手動"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "December"
-msgstr "12"
+msgstr "12月"
 
 #. 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 "列印輔助核算帳簿"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -10050,7 +10131,7 @@ msgstr "Fin.Account"
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr "舊的應收款"
+msgstr "舊的應收帳款"
 
 #. module: account
 #: field:account.tax,applicable_type:0
@@ -10061,7 +10142,7 @@ msgstr "適用範圍"
 #: code:addons/account/wizard/account_move_journal.py:165
 #, python-format
 msgid "This period is already closed !"
-msgstr "這會計期間已經結束!"
+msgstr "此會計期間已經結束!"
 
 #. module: account
 #: help:account.move.line,currency_id:0
@@ -10095,18 +10176,18 @@ msgid ""
 "may keep several types of specialized journals such as a cash journal, "
 "purchase journal, sales journal..."
 msgstr ""
-"在這選單建立或管理貴公司使用的賬簿。賬簿使用借貸記賬法記錄貴公司的經濟業務記錄每天的業務量，每個公司可以定義不同類型的賬簿，如：現金日記賬、採購賬簿、銷售"
-"賬簿。"
+"在這選單建立或管理貴公司使用的帳簿。帳簿使用借貸記帳法記錄貴公司的經濟業務記錄每天的業務量，每個公司可以定義不同類型的帳簿，如：現金帳簿、採購帳簿、銷售帳"
+"簿。"
 
 #. module: account
 #: view:account.payment.term:0
 msgid "Description on Invoices"
-msgstr ""
+msgstr "發票說明"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr "輔助核算項一覽表"
+msgstr "輔助核算項目一覽表"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -10119,8 +10200,8 @@ msgid "Statistic Reports"
 msgstr "統計報表"
 
 #. module: account
-#: code:addons/account/account_move_line.py:1155
-#: code:addons/account/account_move_line.py:1238
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
 #, python-format
 msgid "Bad account!"
 msgstr "無效科目！"
@@ -10139,8 +10220,8 @@ msgid ""
 "created by the system on document validation (invoices, bank statements...) "
 "and will be created in 'Posted' state."
 msgstr ""
-"所有新建的會計憑證一般來說都是『未過賬』狀態，你可以在憑證簿上設置略過這個狀態。這樣在業務單據（發票、銀行票據）確認的時候系統會自動建立會計憑證並直接是『"
-"已過帳』狀態。"
+"所有新建的分錄一般來說都是『未過帳』狀態，你可以在帳簿設置略過這個狀態。這樣在業務單據（發票、銀行票據）確認的時候系統會自動建立分錄並直接是『已過帳』狀態"
+"。"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -10148,7 +10229,7 @@ msgid "Accounts Mapping"
 msgstr "科目一覽"
 
 #. module: account
-#: code:addons/account/account_invoice.py:364
+#: code:addons/account/account_invoice.py:373
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
 msgstr "發票'%s'是等待覆核。"
@@ -10160,12 +10241,12 @@ msgstr "發票'%s'是等待覆核。"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "November"
-msgstr "11"
+msgstr "11月"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: refund invoice, reconcile and create a new draft invoice"
-msgstr "修改：紅字發票，核銷和新建一個草稿發票。"
+msgstr "修改：折讓單，調節和新建一個草稿折讓單。"
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -10181,7 +10262,7 @@ msgstr "週期次數"
 #: report:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
-msgstr "一般賬簿"
+msgstr "總分類帳"
 
 #. module: account
 #: view:account.invoice:0
@@ -10195,7 +10276,7 @@ msgstr "搜索發票"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "紅字發票"
+msgstr "折讓"
 
 #. module: account
 #: model:email.template,body_text:account.email_template_edi_invoice
@@ -10281,7 +10362,7 @@ msgstr ""
 "% if object.origin:\n"
 "| 訂單號: ${object.origin}\n"
 "% endif\n"
-"| 聯繫人: ${object.user_id.name} ${object.user_id.user_email and "
+"| 聯絡人: ${object.user_id.name} ${object.user_id.user_email and "
 "'<%s>'%(object.user_id.user_email) or ''}\n"
 "\n"
 "你可以查看這張發票，下載並在線支付，地址是：\n"
@@ -10339,12 +10420,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr "銀行賬號"
+msgstr "銀行帳戶"
 
 #. module: account
 #: field:res.partner,credit:0
 msgid "Total Receivable"
-msgstr "應收款合計"
+msgstr "應收帳款合計"
 
 #. module: account
 #: view:account.account:0
@@ -10352,7 +10433,7 @@ msgstr "應收款合計"
 #: view:account.journal:0
 #: view:account.move.line:0
 msgid "General Information"
-msgstr "普通信息"
+msgstr "一般資訊"
 
 #. module: account
 #: view:account.move:0
@@ -10369,7 +10450,7 @@ msgstr "使憑證行生效"
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
 #: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
 msgid "Cost Ledger (Only quantities)"
-msgstr "成本分類賬(只有數量)"
+msgstr "成本分類帳(只有數量)"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
@@ -10379,12 +10460,12 @@ msgstr "已開票"
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 msgid "As soon as the reconciliation is done, the invoice can be paid."
-msgstr "一旦核銷完成，這發票可能已被支付。"
+msgstr "一旦調節完成，這發票可能已被支付。"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr "搜索科目模板"
+msgstr "搜尋科目範本"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -10403,6 +10484,7 @@ msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
 #: field:account.common.partner.report,result_selection:0
 #: report:account.partner.balance:0
 #: field:account.partner.balance,result_selection:0
@@ -10424,7 +10506,7 @@ msgstr "會計年度"
 msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
-msgstr "如果有效欄位設為否，您將可以不必刪除就隱藏輔助核算賬簿。"
+msgstr "如果有效欄位設為否，您將可以不必刪除就隱藏輔助核算帳簿。"
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -10444,7 +10526,7 @@ msgstr "科目模型"
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr "2"
+msgstr "2月"
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -10461,13 +10543,13 @@ msgstr "如果您指定其它名稱，它建立的憑證或分錄將用報表名
 #: field:account.invoice,partner_bank_id:0
 #: field:account.invoice.report,partner_bank_id:0
 msgid "Bank Account"
-msgstr "銀行賬號"
+msgstr "銀行帳號"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_central_journal
 #: model:ir.model,name:account.model_account_central_journal
 msgid "Account Central Journal"
-msgstr "匯總賬簿"
+msgstr "匯總帳簿"
 
 #. module: account
 #: report:account.overdue:0
@@ -10476,6 +10558,8 @@ msgstr "到期日期"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
 msgid "Future"
 msgstr "前景"
 
@@ -10501,12 +10585,12 @@ msgstr "通常用 1或-1"
 #: model:ir.actions.act_window,name:account.action_account_analytic_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Chart of Analytic Accounts"
-msgstr "輔助核算項一覽表"
+msgstr "輔助核算項目一覽表"
 
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr "產品模板的費用科目"
+msgstr "產品模組的費用科目"
 
 #. module: account
 #: help:accounting.report,label_filter:0
@@ -10540,7 +10624,7 @@ msgstr ""
 msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
-msgstr "基於當前幣別的應收或應付款的餘額"
+msgstr "基於當前幣別的應收或應付帳款的餘額"
 
 #~ msgid "Invoice Movement"
 #~ msgstr "发票转移"
@@ -10573,69 +10657,72 @@ msgstr "基於當前幣別的應收或應付款的餘額"
 #~ msgid "Invoices Created Within Past 15 Days"
 #~ msgstr "過去15天開的發票"
 
-#~ msgid "Open For Unreconciliation"
-#~ msgstr "打開反核銷"
-
-#, python-format
-#~ msgid "Receivable Accounts"
-#~ msgstr "應收款科目"
-
-#~ msgid "Go to next partner"
-#~ msgstr "下一個業務夥伴"
-
 #~ msgid "Sales by Account Type"
 #~ msgstr "銷售科目類型"
 
 #~ msgid "Sales by Account"
 #~ msgstr "銷售科目"
 
-#~ msgid "Tax codes"
-#~ msgstr "稅編碼"
-
 #~ msgid "Generate Chart of Accounts from a Chart Template"
 #~ msgstr "從模板產生科目一覽表"
 
-#~ msgid "Accounts by type"
-#~ msgstr "按類型劃分的科目"
-
-#~ msgid "Unreconciliate transactions"
-#~ msgstr "反核銷業務"
-
-#~ msgid "Unreconciliation transactions"
-#~ msgstr "反核銷處理"
-
-#~ msgid "Are you sure ?"
-#~ msgstr "你確定嗎?"
-
-#~ msgid "Reconciliation result"
-#~ msgstr "核銷結果"
-
-#~ msgid "Create an Account based on this template"
-#~ msgstr "基於此模板建立科目"
-
-#~ msgid "Dashboard"
-#~ msgstr "儀表盤"
-
 #~ msgid "Income Accounts"
 #~ msgstr "損益科目"
 
 #~ msgid "Install your Chart of Accounts"
 #~ msgstr "導入會計科目表"
 
+#~ msgid "Open For Unreconciliation"
+#~ msgstr "打開未調節項目"
+
+#, python-format
+#~ msgid "Receivable Accounts"
+#~ msgstr "應收帳款科目"
+
+#~ msgid "Go to next partner"
+#~ msgstr "轉到下一個合作夥伴"
+
+#~ msgid "Tax codes"
+#~ msgstr "稅碼"
+
+#~ msgid "Accounts by type"
+#~ msgstr "Accounts by type"
+
+#~ msgid "Unreconciliate transactions"
+#~ msgstr "未調節交易"
+
+#~ msgid "Unreconciliation transactions"
+#~ msgstr "調節交易"
+
+#~ msgid "Are you sure ?"
+#~ msgstr "你確定?"
+
+#~ msgid "Reconciliation result"
+#~ msgstr "Reconciliation result"
+
+#~ msgid "Create an Account based on this template"
+#~ msgstr "Create an Account based on this template"
+
+#~ msgid "Dashboard"
+#~ msgstr "控制台"
+
 #~ msgid "Open for bank reconciliation"
-#~ msgstr "開始銀行對賬"
+#~ msgstr "Open for bank reconciliation"
 
 #~ msgid "Compute Code for Taxes included prices"
-#~ msgstr "含稅價格計算代碼"
+#~ msgstr "Compute Code for Taxes included prices"
 
 #~ msgid "Cost Ledger for period"
-#~ msgstr "成本分類賬的會計期間"
+#~ msgstr "週期的成本總帳"
 
 #~ msgid "Reconciliation transactions"
-#~ msgstr "核銷交易"
+#~ msgstr "Reconciliation transactions"
 
 #~ msgid "Standard entries"
-#~ msgstr "普通分錄"
+#~ msgstr "標準分錄"
 
 #~ msgid "Description On Invoices"
-#~ msgstr "發票上的描述"
+#~ msgstr "發票上的說明"
+
+#~ msgid "Amount currency"
+#~ msgstr "Amount currency"
diff --git a/addons/account/installer.py b/addons/account/installer.py
index 60a34628b1b..05a0f6b455e 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -45,12 +45,12 @@ class account_installer(osv.osv_memory):
             sorted(((m.name, m.shortdesc)
                     for m in modules.browse(cr, uid, ids, context=context)),
                    key=itemgetter(1)))
-        charts.insert(0, ('configurable', 'Generic Chart Of Accounts'))
+        charts.insert(0, ('configurable', _('Custom')))
         return charts
 
     _columns = {
         # Accounting
-        'charts': fields.selection(_get_charts, 'Chart of Accounts',
+        'charts': fields.selection(_get_charts, 'Accounting Package',
             required=True,
             help="Installs localized accounting charts to match as closely as "
                  "possible the accounting needs of your company based on your "
@@ -119,15 +119,6 @@ class account_installer(osv.osv_memory):
         self.execute_simple(cr, uid, ids, context)
         super(account_installer, self).execute(cr, uid, ids, context=context)
 
-    def action_next(self, cr, uid, ids, context=None):
-        next = self.execute(cr, uid, ids, context=context)
-        for installer in self.browse(cr, uid, ids, context=context):
-            if installer.charts == 'l10n_be':
-                return {'type': 'ir.actions.act_window_close'}
-            else :
-                if next : return next
-                return self.next(cr, uid, ids, context=context)
-
     def execute_simple(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 36fd88183f2..3355363308b 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -20,8 +20,8 @@
 ##############################################################################
 
 from operator import itemgetter
-
 from osv import fields, osv
+import time
 
 class account_fiscal_position(osv.osv):
     _name = 'account.fiscal.position'
@@ -44,17 +44,17 @@ class account_fiscal_position(osv.osv):
             return []
         if not fposition_id:
             return map(lambda x: x.id, taxes)
-        result = []
+        result = set()
         for t in taxes:
             ok = False
             for tax in fposition_id.tax_ids:
                 if tax.tax_src_id.id == t.id:
                     if tax.tax_dest_id:
-                        result.append(tax.tax_dest_id.id)
+                        result.add(tax.tax_dest_id.id)
                     ok=True
             if not ok:
-                result.append(t.id)
-        return result
+                result.add(t.id)
+        return list(result)
 
     def map_account(self, cr, uid, fposition_id, account_id, context=None):
         if not fposition_id:
@@ -77,6 +77,12 @@ class account_fiscal_position_tax(osv.osv):
         'tax_dest_id': fields.many2one('account.tax', 'Replacement Tax')
     }
 
+    _sql_constraints = [
+        ('tax_src_dest_uniq',
+         'unique (position_id,tax_src_id,tax_dest_id)',
+         'A tax fiscal position could be defined only once time on same taxes.')
+    ]
+
 account_fiscal_position_tax()
 
 class account_fiscal_position_account(osv.osv):
@@ -89,6 +95,12 @@ class account_fiscal_position_account(osv.osv):
         'account_dest_id': fields.many2one('account.account', 'Account Destination', domain=[('type','<>','view')], required=True)
     }
 
+    _sql_constraints = [
+        ('account_src_dest_uniq',
+         'unique (position_id,account_src_id,account_dest_id)',
+         'An account fiscal position could be defined only once time on same accounts.')
+    ]
+
 account_fiscal_position_account()
 
 class res_partner(osv.osv):
@@ -145,6 +157,29 @@ class res_partner(osv.osv):
     def _debit_search(self, cr, uid, obj, name, args, context=None):
         return self._asset_difference_search(cr, uid, obj, name, 'payable', args, context=context)
 
+    def has_something_to_reconcile(self, cr, uid, partner_id, context=None):
+        '''
+        at least a debit, a credit and a line older than the last reconciliation date of the partner
+        '''
+        cr.execute('''
+            SELECT l.partner_id, SUM(l.debit) AS debit, SUM(l.credit) AS credit
+            FROM account_move_line l
+            RIGHT JOIN account_account a ON (a.id = l.account_id)
+            RIGHT JOIN res_partner p ON (l.partner_id = p.id)
+            WHERE a.reconcile IS TRUE
+            AND p.id = %s
+            AND l.reconcile_id IS NULL
+            AND (p.last_reconciliation_date IS NULL OR l.date > p.last_reconciliation_date)
+            AND l.state <> 'draft'
+            GROUP BY l.partner_id''', (partner_id,))
+        res = cr.dictfetchone()
+        if res:
+            return bool(res['debit'] and res['credit'])
+        return False
+
+    def mark_as_reconciled(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'last_reconciliation_date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
+
     _columns = {
         'credit': fields.function(_credit_debit_get,
             fnct_search=_credit_search, string='Total Receivable', multi='dc', help="Total amount this customer owes you."),
@@ -174,7 +209,7 @@ class res_partner(osv.osv):
             relation='account.fiscal.position',
             string="Fiscal Position",
             view_load=True,
-            help="The fiscal position will determine taxes and the accounts used for the partner.",
+            help="The fiscal position will determine taxes and accounts used for the partner.",
         ),
         'property_payment_term': fields.property(
             'account.payment.term',
@@ -185,7 +220,7 @@ class res_partner(osv.osv):
             help="This payment term will be used instead of the default one for the current partner"),
         'ref_companies': fields.one2many('res.company', 'partner_id',
             'Companies that refers to partner'),
-        'last_reconciliation_date': fields.datetime('Latest Reconciliation Date', help='Date on which the partner accounting entries were reconciled last time')
+        'last_reconciliation_date': fields.datetime('Latest Reconciliation Date', help='Date on which the partner accounting entries were fully reconciled last time. It differs from the date of the last reconciliation made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 ways: either the last debit/credit entry was reconciled, either the user pressed the button "Fully Reconciled" in the manual reconciliation process')
     }
 
 res_partner()
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index d83571b314e..d17f8c18eee 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -6,13 +6,13 @@
             <field name="name">account.fiscal.position.form</field>
             <field name="model">account.fiscal.position</field>
             <field name="arch" type="xml">
-                <form string="Fiscal Position">
+                <form string="Fiscal Position" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="active"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
-                    <separator string="Mapping"/>
+                    <separator string="Taxes Mapping"/>
                     <field name="tax_ids" widget="one2many_list">
                         <tree string="Tax Mapping" editable="bottom">
                             <field name="tax_src_id" domain="[('parent_id','=',False)]"/>
@@ -23,6 +23,7 @@
                             <field name="tax_dest_id" domain="[('parent_id','=',False)]"/>
                         </form>
                     </field>
+                    <separator string="Accounts Mapping"/>
                     <field name="account_ids" widget="one2many_list">
                         <tree string="Account Mapping" editable="bottom">
                             <field name="account_src_id"/>
@@ -91,32 +92,7 @@
                             <field name="debit"/>
                         </group>
                     </group>
-                    <field name="bank_ids">
-                        <form string="Bank account" version="7.0">
-                            <field name="state"/>
-                            <field name="acc_number"/>
-                            <group>
-                                <group name="owner" string="Bank Account Owner">
-                                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                                    <field name="owner_name"/>
-                                    <label for="street" string="Address"/>
-                                    <div>
-                                        <field name="street" placeholder="Street..."/>
-                                        <div>
-                                            <field name="zip" class="oe_inline" placeholder="ZIP"/>
-                                            <field name="city" class="oe_inline" placeholder="City"/>
-                                        </div>
-                                        <field name="state_id" placeholder="State" options='{"no_open": true}'/>
-                                        <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
-                                    </div>
-                                </group>
-                                <group name="bank" string="Information About the Bank">
-                                    <field name="bank" on_change="onchange_bank_id(bank)"/>
-                                    <field name="bank_name"/>
-                                    <field name="bank_bic" placeholder="e.g. GEBABEBB"/>
-                                </group>
-                            </group>
-                        </form>
+                    <field name="bank_ids" context="{'default_partner_id': active_id, 'form_view_ref': 'base.view_partner_bank_form'}">
                         <tree string="Bank Details">
                             <field name="sequence" invisible="1"/>
                             <field name="acc_number"/>
@@ -138,7 +114,7 @@
             context="{'search_default_partner_id':[active_id], 'default_partner_id': active_id}"
             src_model="res.partner"
             view_type="form"
-            view_mode="tree,form,graph,calendar"/>
+            view_mode="tree,form"/>
 
     </data>
 </openerp>
diff --git a/addons/account/product.py b/addons/account/product.py
index 9be49b4c56a..0a6a0eda10c 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -30,14 +30,14 @@ class product_category(osv.osv):
             relation='account.account',
             string="Income Account",
             view_load=True,
-            help="This account will be used for invoices to value sales for the current product category"),
+            help="This account will be used for invoices to value sales."),
         'property_account_expense_categ': fields.property(
-            'account.account',
+            'account.account',  
             type='many2one',
             relation='account.account',
             string="Expense Account",
             view_load=True,
-            help="This account will be used for invoices to value expenses for the current product category"),
+            help="This account will be used for invoices to value expenses."),
     }
 product_category()
 
@@ -60,14 +60,14 @@ class product_template(osv.osv):
             relation='account.account',
             string="Income Account",
             view_load=True,
-            help="This account will be used for invoices instead of the default one to value sales for the current product"),
+            help="This account will be used for invoices instead of the default one to value sales for the current product."),
         'property_account_expense': fields.property(
             'account.account',
             type='many2one',
             relation='account.account',
             string="Expense Account",
             view_load=True,
-            help="This account will be used for invoices instead of the default one to value expenses for the current product"),
+            help="This account will be used for invoices instead of the default one to value expenses for the current product."),
     }
 
 product_template()
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 659a4f6ac36..9b54647e726 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -7,15 +7,15 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Accounting" groups="base.group_user">
+                    <page string="Accounting" groups="account.group_account_user">
                         <group name="properties">
                             <group>
                                 <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}"/>
                                 <field name="taxes_id" colspan="2" attrs="{'readonly':[('sale_ok','=',0)]}" widget="many2many_tags"/>
                             </group>
                             <group>
-                                <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
-                                <field name="supplier_taxes_id" colspan="2" attrs="{'readonly':[('purchase_ok','=',0)]}" widget="many2many_tags"/>
+                                <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" />
+                                <field name="supplier_taxes_id" colspan="2" widget="many2many_tags"/>
                             </group>
                         </group>
                     </page>
@@ -49,9 +49,11 @@
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
-                        <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                    <xpath expr="//group[@name='parent']" position="inside">
+                        <group name="account_property" string="Account Properties" colspan="2">
+                            <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        </group>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index b53b76969ab..2c4acc6bc45 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -94,8 +94,8 @@
             <field name="state">open</field>
             <field name="partner_id" ref="base.res_partner_19"/>
         </record>
-        <record id="analytic_magasin_bml_1" model="account.analytic.account">
-            <field name="name">Magasin BML 1</field>
+        <record id="analytic_millennium_industries" model="account.analytic.account">
+            <field name="name">Millennium Industries</field>
             <field name="parent_id" ref="analytic_integration"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_15"/>
@@ -121,8 +121,8 @@
             <field name="parent_id" ref="analytic_customers"/>
             <field name="partner_id" ref="base.res_partner_1"/>
         </record>
-        <record id="analytic_distripc" model="account.analytic.account">
-            <field name="name">DistriPC</field>
+        <record id="analytic_deltapc" model="account.analytic.account">
+            <field name="name">Delta PC</field>
             <field name="parent_id" ref="analytic_customers"/>
             <field name="type">normal</field>
             <field name="partner_id" ref="base.res_partner_4"/>
@@ -145,8 +145,8 @@
             <field name="partner_id" ref="base.res_partner_17"/>
             <field name="state">open</field>
         </record>
-        <record id="analytic_leclerc" model="account.analytic.account">
-            <field name="name">Leclerc</field>
+        <record id="analytic_luminous_technologies" model="account.analytic.account">
+            <field name="name">Luminous Technologies</field>
             <field eval="time.strftime('%Y-04-24')" name="date_start"/>
             <field eval="str(time.localtime()[0] + 1) + '-04-24'" name="date"/>
             <field name="type">normal</field>
@@ -161,8 +161,8 @@
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_12"/>
         </record>
-        <record id="analytic_tiny_at_work" model="account.analytic.account">
-            <field name="name">OpenERP SA AT Work</field>
+        <record id="analytic_think_big_systems" model="account.analytic.account">
+            <field name="name">Think Big Systems</field>
             <field name="type">normal</field>
             <field name="parent_id" ref="analytic_partners"/>
             <field name="partner_id" ref="base.res_partner_18"/>
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index e3b902a000f..88cf901fdae 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -35,7 +35,6 @@
                     <field name="partner_id"/>
                     <field name="user_id"/>
                     <group expand="0" string="Group By...">
-                        <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Associated Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Parent Account" icon="terp-folder-green" domain="[]" context="{'group_by':'parent_id'}"/>
                         <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" groups="base.group_no_one"/>
@@ -56,7 +55,7 @@
                     <field name="credit"/>
                     <field name="balance"/>
                     <field name="state" invisible="1"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="date" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
@@ -73,7 +72,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,graph,form</field>
+            <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_account_analytic_account_tree"/>
             <field name="search_view_id" ref="account.view_account_analytic_account_search"/>
         </record>
@@ -114,9 +113,6 @@
             </field>
         </record>
 
-        <menuitem groups="analytic.group_analytic_accounting" id="next_id_40"
-            name="Analytic" parent="account.menu_finance_generic_reporting"
-            sequence="4"/>
 
         <record id="view_account_analytic_line_form" model="ir.ui.view">
             <field name="name">account.analytic.line.form</field>
@@ -137,18 +133,18 @@
                         </group>
                         <group string="Amount">
                             <field name="amount"/>
-                            <label for="amount_currency"/>
-                            <div>
+                            <label for="amount_currency" groups="base.group_multi_currency"/>
+                            <div groups="base.group_multi_currency">
                                 <field name="amount_currency" class="oe_inline"/>
                                 <field name="currency_id" class="oe_inline"/>
                             </div>
                         </group>
                         <group string="Product Information">
-                            <field name="product_id"/>
+                            <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id, journal_id)"/>
                             <label for="unit_amount"/>
                             <div>
-                                <field name="unit_amount" class="oe_inline"/>
-                                <field name="product_uom_id" class="oe_inline"/>
+                                <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
+                                <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, company_id, product_uom_id)" class="oe_inline"/>
                             </div>
                         </group>
                         <group string="General Accounting">
@@ -163,7 +159,7 @@
             <field name="name">account.analytic.line.tree</field>
             <field name="model">account.analytic.line</field>
             <field name="arch" type="xml">
-                <tree editable="top" string="Analytic Entries">
+                <tree string="Analytic Entries">
                     <field name="date"/>
                     <field name="ref" invisible="context.get('to_invoice', False)"/>
                     <field name="name"/>
@@ -186,19 +182,23 @@
                 <search string="Search Analytic Lines">
                     <field name="name" string="Analytic Line"/>
                     <field name="date"/>
-                    <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" icon="terp-camera_test" help="Analytic Journal Items related to a sale journal."/>
-                    <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" icon="terp-purchase" help="Analytic Journal Items related to a purchase journal."/>
-                    <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]" icon="terp-folder-orange"/>
+                    <filter name="sales" string="Sales" domain="[('journal_id.type','=','sale')]" help="Analytic Journal Items related to a sale journal."/>
+                    <filter name="purchases" string="Purchases" domain="[('journal_id.type','=','purchase')]" help="Analytic Journal Items related to a purchase journal."/>
+                    <filter name="others" string="Others" domain="[('journal_id.type','in',('cash','general','situation'))]"/>
                     <separator/>
-                    <filter string="My Entries" domain="[('user_id','=',uid)]" icon="terp-personal"/>
+                    <filter string="My Entries" domain="[('user_id','=',uid)]"/>
                     <field name="account_id"/>
                     <field name="user_id"/>
                     <group string="Group By..." expand="0">
-                        <filter string="Account" context="{'group_by':'account_id'}" icon="terp-folder-green"/>
-                        <filter string="Journal" context="{'group_by':'journal_id'}" icon="terp-folder-orange"/>
-                        <filter string="User" context="{'group_by':'user_id'}" icon="terp-personal"/>
-                        <filter string="Fin.Account" context="{'group_by':'general_account_id'}" icon="terp-folder-green"/>
-                        <filter string="Product" context="{'group_by':'product_id'}" icon="terp-accessories-archiver"/>
+                        <filter string="Analytic Account" context="{'group_by':'account_id'}"/>
+                        <filter string="Fin. Account" context="{'group_by':'general_account_id'}"/>
+                        <filter string="Journal" context="{'group_by':'journal_id'}" name="group_journal"/>
+                        <separator/>
+                        <filter string="Product" context="{'group_by':'product_id'}"/>
+                        <filter string="User" context="{'group_by':'user_id'}"/>
+                        <separator/>
+                        <filter string="Date" context="{'group_by':'date'}" name="group_date"/>
+
                     </group>
                 </search>
             </field>
@@ -247,8 +247,8 @@
                         </group>
                         <group string="Amount">
                             <field name="amount"/>
-                            <label for="amount_currency"/>
-                            <div>
+                            <label for="amount_currency" groups="base.group_multi_currency"/>
+                            <div groups="base.group_multi_currency">
                                 <field name="amount_currency" class="oe_inline"/>
                                 <field name="currency_id" class="oe_inline"/>
                             </div>
@@ -347,25 +347,6 @@
         # Reporting
         #
 
-        <record id="action_account_analytic_journal_tree" model="ir.actions.act_window">
-            <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 groups="analytic.group_analytic_accounting"
-            action="action_account_analytic_journal_tree"
-            id="account_analytic_journal_print" parent="account.next_id_40"/>
-
-
-        <act_window
-            context="{'search_default_account_id': [active_id], 'search_default_user_id': False, 'default_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"/>
 
         <record id="view_account_journal_1" model="ir.ui.view">
             <field name="name">account.journal.form.1</field>
@@ -378,16 +359,5 @@
             </field>
         </record>
 
-     <record id="analytic_accounts_graph" model="ir.ui.view">
-            <field name="name">analytic.accounts.graph</field>
-            <field name="model">account.analytic.account</field>
-            <field name="arch" type="xml">
-                <graph string="Analytic Account Statistics" type="bar">
-                    <field name="complete_name"/>
-                    <field name="balance" operator="+"/>
-                </graph>
-            </field>
-     </record>
-
     </data>
 </openerp>
diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml
index 0c488eac400..1754988f7d6 100644
--- a/addons/account/project/report/analytic_balance.rml
+++ b/addons/account/project/report/analytic_balance.rml
@@ -163,7 +163,7 @@
           <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
@@ -187,7 +187,7 @@
             <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]]</para>
@@ -211,7 +211,7 @@
               <para style="terp_default_Right_9">[[ formatLang(move_g['credit']) ]] </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(move_g['balance'], currency_obj = company.currency_id) ]]</para>
             </td>
             <td>
               <para style="terp_default_Right_9">[[ formatLang(move_g['quantity']) ]]</para>
diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml
index 7500b655ab3..1099a8b8b4e 100644
--- a/addons/account/project/report/cost_ledger.rml
+++ b/addons/account/project/report/cost_ledger.rml
@@ -224,7 +224,7 @@
           <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] </para>
         </td>
         <td>
-          <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_Default_Bold_Right_9_U">[[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -245,7 +245,7 @@
             <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_credit(account,data['form']['date1'],data['form']['date2'])) ]] </para>
           </td>
           <td>
-            <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_Default_Bold_Right_9_U">[[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -266,7 +266,7 @@
               <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['credit']) ]] </para>
             </td>
             <td>
-              <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_Default_Bold_Right_9_U">[[ formatLang( move_g['balance'], currency_obj = company.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -290,7 +290,7 @@
                 <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['credit']) ]] </para>
               </td>
               <td>
-                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
+                <para style="terp_default_9_italic_Rignt">[[ formatLang( move_a['balance'], currency_obj = company.currency_id)]]</para>
               </td>
             </tr>
           </blockTable>
diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml
index f112ec8fbd3..54b6878c407 100644
--- a/addons/account/project/report/inverted_analytic_balance.rml
+++ b/addons/account/project/report/inverted_analytic_balance.rml
@@ -164,7 +164,7 @@
           <para style="terp_tblheader_Details_Right">[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]</para>
@@ -188,7 +188,7 @@
             <para style="terp_tblheader_Details_Right">[[formatLang(move_g['credit'])]]</para>
           </td>
           <td>
-            <para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol]]</para>
+            <para style="terp_tblheader_Details_Right">[[ formatLang(move_g['balance'], currency_obj = company.currency_id)]]</para>
           </td>
           <td>
             <para style="terp_tblheader_Details_Right">[[formatLang(move_g['quantity']) ]]</para>
@@ -212,7 +212,7 @@
               <para style="terp_default_Right_9">[[ formatLang(move_a['credit']) ]] </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(move_a['balance']) ]] [[ company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(move_a['balance'], currency_obj = company.currency_id)]]</para>
             </td>
             <td>
               <para style="terp_default_Right_9">[[ formatLang(move_a['quantity']) ]]</para>
diff --git a/addons/account/project/wizard/account_analytic_chart.py b/addons/account/project/wizard/account_analytic_chart.py
index a10e938e293..92367e27da5 100644
--- a/addons/account/project/wizard/account_analytic_chart.py
+++ b/addons/account/project/wizard/account_analytic_chart.py
@@ -47,4 +47,4 @@ class account_analytic_chart(osv.osv_memory):
         return result
 
 account_analytic_chart()
-# 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/project/wizard/account_analytic_inverted_balance_report.py b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
index 2c9690fee50..95365716a22 100644
--- a/addons/account/project/wizard/account_analytic_inverted_balance_report.py
+++ b/addons/account/project/wizard/account_analytic_inverted_balance_report.py
@@ -52,4 +52,4 @@ class account_analytic_inverted_balance(osv.osv_memory):
             }
 
 account_analytic_inverted_balance()
-# 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/project/wizard/account_analytic_journal_report.py b/addons/account/project/wizard/account_analytic_journal_report.py
index 9a2eee020b1..3d6bf0f5447 100644
--- a/addons/account/project/wizard/account_analytic_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_journal_report.py
@@ -29,6 +29,7 @@ class account_analytic_journal_report(osv.osv_memory):
     _columns = {
         'date1': fields.date('Start of period', required=True),
         'date2': fields.date('End of period', required=True),
+        'analytic_account_journal_id': fields.many2many('account.analytic.journal', 'account_analytic_journal_name', 'journal_line_id', 'journal_print_id', 'Analytic Journals', required=True),
     }
 
     _defaults = {
@@ -40,8 +41,15 @@ class account_analytic_journal_report(osv.osv_memory):
         if context is None:
             context = {}
         data = self.read(cr, uid, ids)[0]
+        ids_list = []
+        if context.get('active_id',False):
+            ids_list.append(context.get('active_id',False))
+        else:
+            record = self.browse(cr,uid,ids[0],context=context)
+            for analytic_record in record.analytic_account_journal_id:
+                ids_list.append(analytic_record.id)
         datas = {
-             'ids': context.get('active_ids',[]),
+             'ids': ids_list,
              'model': 'account.analytic.journal',
              'form': data
                  }
@@ -50,6 +58,18 @@ class account_analytic_journal_report(osv.osv_memory):
             'report_name': 'account.analytic.journal',
             'datas': datas,
             }
+        
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        res = super(account_analytic_journal_report, self).default_get(cr, uid, fields, context=context)
+        if not context.has_key('active_ids'):
+            journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [], context=context)
+        else:
+            journal_ids = context.get('active_ids')
+        if 'analytic_account_journal_id' in fields:
+            res.update({'analytic_account_journal_id': journal_ids})
+        return res
 
 account_analytic_journal_report()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_journal_report_view.xml b/addons/account/project/wizard/account_analytic_journal_report_view.xml
index e4c4cd314db..6d632016ba1 100644
--- a/addons/account/project/wizard/account_analytic_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml
@@ -7,15 +7,16 @@
             <field name="model">account.analytic.journal.report</field>
             <field name="arch" type="xml">
                 <form string="Select Period" version="7.0">
-                    <header>
-                        <button name="check_report" string="Print" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
                     <group col="4">
                         <field name="date1"/>
                         <field name="date2"/>
+                        <field name="analytic_account_journal_id" widget="many2many_tags" class="oe_inline" required="1" colspan="4"/>
                     </group>
+                    <footer>
+                        <button name="check_report" string="Print" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
                 </form>
             </field>
         </record>
@@ -38,6 +39,13 @@
             <field name="key">action</field>
             <field name="model">account.analytic.journal</field>
         </record>
+        
+        <menuitem groups="analytic.group_analytic_accounting" id="next_id_40"
+            name="Analytic" parent="account.menu_finance_generic_reporting"
+            sequence="4"/>
+        <menuitem groups="analytic.group_analytic_accounting"
+            action="account.action_account_analytic_journal"
+            id="account_analytic_journal_print" parent="account.next_id_40"/>
 
     </data>
 </openerp>
diff --git a/addons/account/project/wizard/project_account_analytic_line.py b/addons/account/project/wizard/project_account_analytic_line.py
index e49fbe911cb..54979d79b8a 100644
--- a/addons/account/project/wizard/project_account_analytic_line.py
+++ b/addons/account/project/wizard/project_account_analytic_line.py
@@ -55,4 +55,4 @@ class project_account_analytic_line(osv.osv_memory):
 
 project_account_analytic_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/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 8963ba97376..8a421e3cb36 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -5,7 +5,7 @@
         <field name="name">analytic.entries.report.tree</field>
         <field name="model">analytic.entries.report</field>
         <field name="arch" type="xml">
-            <tree string="Analytic Entries Analysis">
+            <tree string="Analytic Entries Analysis" create="false">
                 <field name="date" invisible="1"/>
                 <field name="year" invisible="1"/>
                 <field name="day" invisible="1"/>
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index c3117e60379..fdda9cb11ce 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -68,7 +68,7 @@ class account_balance(report_sxw.rml_parse, common_report_header):
             return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['id']).company_id.name
         return super(account_balance ,self)._get_account(data)
 
-    def lines(self, form, ids=[], done=None):#, level=1):
+    def lines(self, form, ids=None, done=None):
         def _process_child(accounts, disp_acc, parent):
                 account_rec = [acct for acct in accounts if acct['id']==parent][0]
                 currency_obj = self.pool.get('res.currency')
diff --git a/addons/account/report/account_central_journal.py b/addons/account/report/account_central_journal.py
index d3113b63133..a42712f40d7 100644
--- a/addons/account/report/account_central_journal.py
+++ b/addons/account/report/account_central_journal.py
@@ -105,4 +105,4 @@ class journal_print(report_sxw.rml_parse, common_report_header):
 
 report_sxw.report_sxw('report.account.central.journal', 'account.journal.period', 'addons/account/report/account_central_journal.rml', parser=journal_print, header='internal')
 
-# 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/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 667c61ab78f..551265252cc 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -5,7 +5,7 @@
         <field name="name">account.entries.report.tree</field>
         <field name="model">account.entries.report</field>
         <field name="arch" type="xml">
-            <tree colors="blue:move_state == 'draft';black:move_state == 'posted'" string="Entries Analysis">
+            <tree colors="blue:move_state == 'draft';black:move_state == 'posted'" create="false" string="Entries Analysis">
                 <field name="date" invisible="1"/>
                 <field name="date_created" invisible="1"/>
                 <field name="date_maturity" invisible="1"/>
diff --git a/addons/account/report/account_financial_report.rml b/addons/account/report/account_financial_report.rml
index 6f0ddd0d625..1ee8d5b1858 100644
--- a/addons/account/report/account_financial_report.rml
+++ b/addons/account/report/account_financial_report.rml
@@ -170,12 +170,12 @@
       <tr>
         <td><para style="terp_tblheader_General_Centre">Chart of Accounts</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
-        <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]]</para></td>
+        <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter(data)!='No Filters' and get_filter(data) ]]</para></td>
       </tr>
     <tr>
        <td><para style="terp_default_Centre_8">[[ get_account(data) or removeParentNode('para') ]]</para></td>
        <td><para style="terp_default_Centre_8">[[ get_fiscalyear(data)  or '' ]]</para></td>
-        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filter' and get_filter(data) or removeParentNode('para') ]] </para>
+        <td><para style="terp_default_Centre_8">[[ get_filter(data)=='No Filters' and get_filter(data) or removeParentNode('para') ]] </para>
             <blockTable colWidths="60.0,60.0" style="Table3">[[ get_filter(data)=='Date' or removeParentNode('blockTable') ]]
                 <tr>
                    <td><para style="terp_tblheader_General_Centre">Start Date</para></td>
diff --git a/addons/account/report/account_general_journal.py b/addons/account/report/account_general_journal.py
index 9eb81157dba..0ffa08b31ef 100644
--- a/addons/account/report/account_general_journal.py
+++ b/addons/account/report/account_general_journal.py
@@ -158,4 +158,4 @@ class journal_print(report_sxw.rml_parse, common_report_header):
 
 report_sxw.report_sxw('report.account.general.journal', 'account.journal.period', 'addons/account/report/general_journal.rml', parser=journal_print, header='internal')
 
-# 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/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 294c7fa99cf..38f2392f740 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -299,10 +299,10 @@ class general_ledger(report_sxw.rml_parse, common_report_header):
 
     def _get_sortby(self, data):
         if self.sortby == 'sort_date':
-            return 'Date'
+            return self._translate('Date')
         elif self.sortby == 'sort_journal_partner':
-            return 'Journal & Partner'
-        return 'Date'
+            return self._translate('Journal & Partner')
+        return self._translate('Date')
 
 report_sxw.report_sxw('report.account.general.ledger', 'account.account', 'addons/account/report/account_general_ledger.rml', parser=general_ledger, header='internal')
 report_sxw.report_sxw('report.account.general.ledger_landscape', 'account.account', 'addons/account/report/account_general_ledger_landscape.rml', parser=general_ledger, header='internal landscape')
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index d4362484588..fa2d071695b 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import tools
+import decimal_precision as dp
 from osv import fields,osv
 
 class account_invoice_report(osv.osv):
@@ -27,6 +28,31 @@ class account_invoice_report(osv.osv):
     _description = "Invoices Statistics"
     _auto = False
     _rec_name = 'date'
+
+    def _compute_amounts_in_user_currency(self, cr, uid, ids, field_names, args, context=None):
+        """Compute the amounts in the currency of the user
+        """
+        if context is None:
+            context={}
+        currency_obj = self.pool.get('res.currency')
+        currency_rate_obj = self.pool.get('res.currency.rate')
+        user_currency_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
+        currency_rate_id = currency_rate_obj.search(cr, uid, [('rate', '=', 1)], limit=1, context=context)[0]
+        base_currency_id = currency_rate_obj.browse(cr, uid, currency_rate_id, context=context).currency_id.id
+        res = {}
+        ctx = context.copy()
+        for item in self.browse(cr, uid, ids, context=context):
+            ctx['date'] = item.date
+            price_total = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.price_total, context=ctx)
+            price_average = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.price_average, context=ctx)
+            residual = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.residual, context=ctx)
+            res[item.id] = {
+                'user_currency_price_total': price_total,
+                'user_currency_price_average': price_average,
+                'user_currency_residual': residual,
+            }
+        return res
+
     _columns = {
         'date': fields.date('Date', readonly=True),
         'year': fields.char('Year', size=4, readonly=True),
@@ -47,7 +73,9 @@ class account_invoice_report(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
         'price_total': fields.float('Total Without Tax', readonly=True),
+        'user_currency_price_total': fields.function(_compute_amounts_in_user_currency, string="Total Without Tax", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
         'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
+        'user_currency_price_average': fields.function(_compute_amounts_in_user_currency, string="Average Price", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
         'currency_rate': fields.float('Currency Rate', readonly=True),
         'nbr':fields.integer('# of Lines', readonly=True),
         'type': fields.selection([
@@ -63,12 +91,13 @@ class account_invoice_report(osv.osv):
             ('open','Open'),
             ('paid','Done'),
             ('cancel','Cancelled')
-            ], 'Invoice State', readonly=True),
+            ], 'Invoice Status', readonly=True),
         'date_due': fields.date('Due Date', readonly=True),
         'account_id': fields.many2one('account.account', 'Account',readonly=True),
         'account_line_id': fields.many2one('account.account', 'Account Line',readonly=True),
         'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
         'residual': fields.float('Total Residual', readonly=True),
+        'user_currency_residual': fields.function(_compute_amounts_in_user_currency, string="Total Residual", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
         'delay_to_pay': fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
         'due_delay': fields.float('Avg. Due Delay', readonly=True, group_operator="avg"),
     }
@@ -161,7 +190,7 @@ class account_invoice_report(osv.osv):
                 left join product_uom u on (u.id=ail.uos_id),
                 res_currency_rate cr
                 where cr.id in (select id from res_currency_rate cr2  where (cr2.currency_id = ai.currency_id)
-                and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) limit 1)
+                and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) order by name desc limit 1)
                 group by ail.product_id,
                     ai.date_invoice,
                     ai.id,
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index c22d5d55f45..289db376e5d 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -5,7 +5,7 @@
         <field name="name">account.invoice.report.tree</field>
         <field name="model">account.invoice.report</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')"  string="Invoices Analysis">
+            <tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')" create="false" string="Invoices Analysis">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -28,8 +28,8 @@
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_qty" sum="Qty"/>
                 <!-- <field name="reconciled"  sum="# Reconciled"/> -->
-                <field name="price_total" sum="Total Without Tax"/>
-                <field name="residual"  sum="Total Residual" invisible="context.get('residual_invisible',False)"/>
+                <field name="user_currency_price_total" sum="Total Without Tax"/>
+                <field name="user_currency_residual"  sum="Total Residual" invisible="context.get('residual_invisible',False)"/>
                 <field name="due_delay"  sum="Avg. Due Delay" invisible="context.get('residual_invisible',False)"/>
                 <field name="delay_to_pay"  sum="Avg. Delay To Pay" invisible="context.get('residual_invisible',False)"/>
             </tree>
diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py
index 1b617e9afa4..4ddedc102f5 100644
--- a/addons/account/report/account_print_overdue.py
+++ b/addons/account/report/account_print_overdue.py
@@ -29,34 +29,11 @@ class Overdue(report_sxw.rml_parse):
         super(Overdue, self).__init__(cr, uid, name, context=context)
         self.localcontext.update( {
             'time': time,
-            'adr_get': self._adr_get,
             'getLines': self._lines_get,
             'tel_get': self._tel_get,
             'message': self._message,
         })
         self.context = context
-    def _adr_get(self, partner, type):
-        res = []
-        res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
-        addresses = res_partner.address_get(self.cr, self.uid, [partner.id], [type])
-        adr_id = addresses and addresses[type] or False
-        result = {
-                  'name': False,
-                  'street': False,
-                  'street2': False,
-                  'city': False,
-                  'zip': False,
-                  'state_id':False,
-                  'country_id': False,
-                 }
-        if adr_id:
-            result = res_partner.read(self.cr, self.uid, [adr_id], context=self.context.copy())
-            result[0]['country_id'] = result[0]['country_id'] and result[0]['country_id'][1] or False
-            result[0]['state_id'] = result[0]['state_id'] and result[0]['state_id'][1] or False
-            return result
-
-        res.append(result)
-        return res
 
     def _tel_get(self,partner):
         if not partner:
diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 2d4238823da..dd573580c6c 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -126,15 +126,10 @@
     <blockTable colWidths="286.0,224.0" style="Tableau2">
       <tr>
         <td>
-          <para style="terp_default_9">[[ repeatIn(adr_get(o, 'invoice'),'addr') ]]</para>
         </td>
         <td>
           <para style="terp_default_9">[[ o.title.name or '' ]] [[ o.name ]]</para>
-          <para style="terp_default_9">[[ addr['street'] ]]</para>
-          <para style="terp_default_9">[[ addr['street2'] or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ addr['zip'] ]] [[ addr['city'] ]]</para>
-          <para style="terp_default_9">[[ addr['state_id'] or removeParentNode('para')]]</para>
-          <para style="terp_default_9">[[ addr['country_id'] ]]</para>
+          <para style="terp_default_9">[[ display_address(o) ]]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
@@ -216,7 +211,7 @@
             <para style="terp_default_Right_9">[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ time.strftime('%Y-%m-%d') &gt; formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ time.strftime('%Y-%m-%d') &gt; formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit'], currency_obj = company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ line['blocked'] and 'X' or '' ]]</para>
@@ -241,7 +236,7 @@
           <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] &lt; time.strftime('%Y-%m-%d'), getLines(o)), 0)), currency_obj=company.currency_id) ]]</para>
         </td>
         <td>
           <para style="terp_default_9">
@@ -261,7 +256,7 @@
           <para style="terp_default_Bold_9">Balance :</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0)), currency_obj = company.currency_id) ]]</para>
         </td>
         <td>
           <para style="terp_default_8">
@@ -282,7 +277,7 @@
       <font color="white"> </font>
     </para>
     <section>
-       <para style="terp_default_Bold_9">[[ getLines(o) and removeParentNode('section')]]There is nothing due with this customer</para>
+       <para style="terp_default_Bold_9">[[ getLines(o) and removeParentNode('section')]]There is nothing due with this customer.</para>
     </section>
     <para style="terp_default_9">
       <font color="white"> </font>
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index 59745355c5e..56e324bc361 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -284,4 +284,4 @@ class report_account_sales(osv.osv):
             )""")
 report_account_sales()
 
-# 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/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index 2a0c5987b47..cef1cf54af0 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -160,7 +160,7 @@ class tax_report(report_sxw.rml_parse, common_report_header):
             i+=1
         return res
 
-    def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=[], context=None):
+    def _get_codes(self, based_on, company_id, parent=False, level=0, period_list=None, context=None):
         obj_tc = self.pool.get('account.tax.code')
         ids = obj_tc.search(self.cr, self.uid, [('parent_id','=',parent),('company_id','=',company_id)], order='sequence', context=context)
 
@@ -171,7 +171,11 @@ class tax_report(report_sxw.rml_parse, common_report_header):
             res += self._get_codes(based_on, company_id, code.id, level+1, context=context)
         return res
 
-    def _add_codes(self, based_on, account_list=[], period_list=[], context=None):
+    def _add_codes(self, based_on, account_list=None, period_list=None, context=None):
+        if account_list is None:
+            account_list = []
+        if period_list is None:
+            period_list = []
         res = []
         obj_tc = self.pool.get('account.tax.code')
         for account in account_list:
diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml
index ee21b9e5ec6..be6ae0dfdc9 100644
--- a/addons/account/report/account_treasury_report_view.xml
+++ b/addons/account/report/account_treasury_report_view.xml
@@ -5,7 +5,7 @@
         <field name="name">account.treasury.report.tree</field>
         <field name="model">account.treasury.report</field>
         <field name="arch" type="xml">
-            <tree string="Treasury Analysis">
+            <tree string="Treasury Analysis" create="false">
                 <field name="date" invisible="1"/>
                 <field name="fiscalyear_id"/>
                 <field name="period_id"/>
diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py
index c93c3e02ee3..c5719d98b96 100644
--- a/addons/account/report/common_report_header.py
+++ b/addons/account/report/common_report_header.py
@@ -94,10 +94,10 @@ class common_report_header(object):
     def _get_filter(self, data):
         if data.get('form', False) and data['form'].get('filter', False):
             if data['form']['filter'] == 'filter_date':
-                return 'Date'
+                return self._translate('Date')
             elif data['form']['filter'] == 'filter_period':
-                return 'Periods'
-        return 'No Filter'
+                return self._translate('Periods')
+        return self._translate('No Filters')
 
     def _sum_debit_period(self, period_id, journal_id=None):
         journals = journal_id or self.journal_ids
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 658f87962ff..8f525795d1c 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -43,18 +43,18 @@ class account_config_settings(osv.osv_memory):
             string='Default company currency', help="Main currency of the company."),
         'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
             string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer  will be able to pay your invoices or quotations with a button \"Pay with  Paypal\" in automated emails or through the OpenERP portal."),
-        'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True,
-            string='Bank accounts on reports will display as followed', help="Bank accounts as printed in the footer of each customer  document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."),
+        'company_footer': fields.related('company_id', 'rml_footer', type='text', readonly=True,
+            string='Bank accounts footer preview', help="Bank accounts as printed in the footer of each printed document"),
 
         'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
         'chart_template_id': fields.many2one('account.chart.template', 'Template', domain="[('visible','=', True)]"),
         'code_digits': fields.integer('# of Digits', help="No. of digits to use for account code"),
         'tax_calculation_rounding_method': fields.related('company_id',
             'tax_calculation_rounding_method', type='selection', selection=[
-            ('round_per_line', 'Round per Line'),
-            ('round_globally', 'Round Globally'),
+            ('round_per_line', 'Round per line'),
+            ('round_globally', 'Round globally'),
             ], string='Tax calculation rounding method',
-            help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
+            help="If you select 'Round per line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
         'sale_tax': fields.many2one("account.tax.template", "Default sale tax"),
         'purchase_tax': fields.many2one("account.tax.template", "Default purchase tax"),
         'sale_tax_rate': fields.float('Sales tax (%)'),
@@ -72,40 +72,40 @@ class account_config_settings(osv.osv_memory):
         'sale_refund_journal_id': fields.many2one('account.journal', 'Sale refund journal'),
         'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Credit note sequence'),
         'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next credit note number'),
-        'purchase_journal_id': fields.many2one('account.journal', 'Purchase Journal'),
+        'purchase_journal_id': fields.many2one('account.journal', 'Purchase journal'),
         'purchase_sequence_prefix': fields.related('purchase_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier invoice sequence'),
         'purchase_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier invoice number'),
         'purchase_refund_journal_id': fields.many2one('account.journal', 'Purchase refund journal'),
         'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier credit note sequence'),
         'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier credit note number'),
 
-        'module_account_check_writing': fields.boolean('pay your suppliers by check',
+        'module_account_check_writing': fields.boolean('Pay your suppliers by check',
             help="""This allows you to check writing and printing.
                 This installs the module account_check_writing."""),
-        'module_account_accountant': fields.boolean('full accounting features: journals, legal statements, chart of accounts, etc.',
+        'module_account_accountant': fields.boolean('Full accounting features: journals, legal statements, chart of accounts, etc.',
             help="""If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of  Accounts, ...)"""),
-        'module_account_asset': fields.boolean('assets management',
+        'module_account_asset': fields.boolean('Assets management',
             help="""This allows you to manage the assets owned by a company or a person.
                 It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.
                 This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments,
                 but not accounting (Journal Items, Chart of Accounts, ...)"""),
-        'module_account_budget': fields.boolean('budget management',
+        'module_account_budget': fields.boolean('Budget management',
             help="""This allows accountants to manage analytic and crossovered budgets.
                 Once the master budgets and the budgets are defined,
                 the project managers can set the planned amount on each analytic account.
                 This installs the module account_budget."""),
-        'module_account_payment': fields.boolean('manage payment orders',
+        'module_account_payment': fields.boolean('Manage payment orders',
             help="""This allows you to create and manage your payment orders, with purposes to
                     * serve as base for an easy plug-in of various automated payment mechanisms, and
                     * provide a more efficient way to manage invoice payments.
                 This installs the module account_payment."""),
-        'module_account_voucher': fields.boolean('manage customer payments',
+        'module_account_voucher': fields.boolean('Manage customer payments',
             help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
                 This installs the module account_voucher."""),
-        'module_account_followup': fields.boolean('manage customer payment follow-ups',
+        'module_account_followup': fields.boolean('Manage customer payment follow-ups',
             help="""This allows to automate letters for unpaid invoices, with multi-level recalls.
                 This installs the module account_followup."""),
-        'group_proforma_invoices': fields.boolean('allow pro-forma invoices',
+        'group_proforma_invoices': fields.boolean('Allow pro-forma invoices',
             implied_group='account.group_proforma_invoices',
             help="Allows you to put invoices in pro-forma state."),
         'default_sale_tax': fields.many2one('account.tax', 'Default sale tax',
@@ -114,6 +114,14 @@ class account_config_settings(osv.osv_memory):
             help="This purchase tax will be assigned by default on new products."),
         'decimal_precision': fields.integer('Decimal precision on journal entries',
             help="""As an example, a decimal precision of 2 will allow journal entries  like: 9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: 0.0231 EUR."""),
+        'group_multi_currency': fields.boolean('Allow multi currencies',
+            implied_group='base.group_multi_currency',
+            help="Allows you multi currency environment"),
+        'group_analytic_accounting': fields.boolean('Analytic accounting',
+            implied_group='analytic.group_analytic_accounting',
+            help="Allows you to use the analytic accounting."),
+        'group_check_supplier_invoice_total': fields.boolean('Check the total of supplier invoices', 
+            implied_group="account.group_supplier_inv_check_total"),
     }
 
     def _default_company(self, cr, uid, context=None):
@@ -145,42 +153,45 @@ class account_config_settings(osv.osv_memory):
 
     def onchange_company_id(self, cr, uid, ids, company_id):
         # update related fields
-        company = self.pool.get('res.company').browse(cr, uid, company_id)
-        has_chart_of_accounts = company_id not in self.pool.get('account.installer').get_unconfigured_cmp(cr, uid)
-        fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
-            [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
-             ('company_id', '=', company_id)])
-        values = {
-            'expects_chart_of_accounts': company.expects_chart_of_accounts,
-            'currency_id': company.currency_id.id,
-            'paypal_account': company.paypal_account,
-            'company_footer': company.rml_footer2,
-            'has_chart_of_accounts': has_chart_of_accounts,
-            'has_fiscal_year': bool(fiscalyear_count),
-            'chart_template_id': False,
-            'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
-        }
-        # update journals and sequences
-        for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
-            for suffix in ('_journal_id', '_sequence_prefix', '_sequence_next'):
-                values[journal_type + suffix] = False
-        journal_obj = self.pool.get('account.journal')
-        journal_ids = journal_obj.search(cr, uid, [('company_id', '=', company_id)])
-        for journal in journal_obj.browse(cr, uid, journal_ids):
-            if journal.type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
-                values.update({
-                    journal.type + '_journal_id': journal.id,
-                    journal.type + '_sequence_prefix': journal.sequence_id.prefix,
-                    journal.type + '_sequence_next': journal.sequence_id.number_next,
-                })
-        # update taxes
-        ir_values = self.pool.get('ir.values')
-        taxes_id = ir_values.get_default(cr, uid, 'product.product', 'taxes_id', company_id=company_id)
-        supplier_taxes_id = ir_values.get_default(cr, uid, 'product.product', 'supplier_taxes_id', company_id=company_id)
-        values.update({
-            'default_sale_tax': isinstance(taxes_id, list) and taxes_id[0] or taxes_id,
-            'default_purchase_tax': isinstance(supplier_taxes_id, list) and supplier_taxes_id[0] or supplier_taxes_id,
-        })
+        values = {}
+        values['currency_id'] = False
+        if company_id:
+            company = self.pool.get('res.company').browse(cr, uid, company_id)
+            has_chart_of_accounts = company_id not in self.pool.get('account.installer').get_unconfigured_cmp(cr, uid)
+            fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
+                [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
+                 ('company_id', '=', company_id)])
+            values = {
+                'expects_chart_of_accounts': company.expects_chart_of_accounts,
+                'currency_id': company.currency_id.id,
+                'paypal_account': company.paypal_account,
+                'company_footer': company.rml_footer,
+                'has_chart_of_accounts': has_chart_of_accounts,
+                'has_fiscal_year': bool(fiscalyear_count),
+                'chart_template_id': False,
+                'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
+            }
+            # update journals and sequences
+            for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
+                for suffix in ('_journal_id', '_sequence_prefix', '_sequence_next'):
+                    values[journal_type + suffix] = False
+            journal_obj = self.pool.get('account.journal')
+            journal_ids = journal_obj.search(cr, uid, [('company_id', '=', company_id)])
+            for journal in journal_obj.browse(cr, uid, journal_ids):
+                if journal.type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):
+                    values.update({
+                        journal.type + '_journal_id': journal.id,
+                        journal.type + '_sequence_prefix': journal.sequence_id.prefix,
+                        journal.type + '_sequence_next': journal.sequence_id.number_next,
+                    })
+            # update taxes
+            ir_values = self.pool.get('ir.values')
+            taxes_id = ir_values.get_default(cr, uid, 'product.product', 'taxes_id', company_id=company_id)
+            supplier_taxes_id = ir_values.get_default(cr, uid, 'product.product', 'supplier_taxes_id', company_id=company_id)
+            values.update({
+                'default_sale_tax': isinstance(taxes_id, list) and taxes_id[0] or taxes_id,
+                'default_purchase_tax': isinstance(supplier_taxes_id, list) and supplier_taxes_id[0] or supplier_taxes_id,
+            })
         return {'value': values}
 
     def onchange_chart_template_id(self, cr, uid, ids, chart_template_id, context=None):
@@ -217,6 +228,16 @@ class account_config_settings(osv.osv_memory):
             return {'value': {'date_stop': end_date.strftime('%Y-%m-%d')}}
         return {}
 
+    def open_company_form(self, cr, uid, ids, context=None):
+        config = self.browse(cr, uid, ids[0], context)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Configure your Company',
+            'res_model': 'res.company',
+            'res_id': config.company_id.id,
+            'view_mode': 'form',
+        }
+
     def set_default_taxes(self, cr, uid, ids, context=None):
         """ set default sale and purchase taxes for products """
         ir_values = self.pool.get('ir.values')
@@ -241,6 +262,7 @@ class account_config_settings(osv.osv_memory):
                 'sale_tax_rate': config.sale_tax_rate,
                 'purchase_tax_rate': config.purchase_tax_rate,
                 'complete_tax_set': config.complete_tax_set,
+                'currency_id': config.currency_id.id,
             }, context)
             wizard.execute(cr, uid, [wizard_id], context)
 
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 79a65f70414..52c8c8daaa9 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -121,10 +121,18 @@
                         </div>
                         <label for="id" string="Features"/>
                         <div>
+                            <div name="group_multi_currency">
+                                <field name="group_multi_currency" class="oe_inline"/>
+                                <label for="group_multi_currency"/>
+                            </div>
                             <div>
                                 <field name="module_account_accountant" class="oe_inline"/>
                                 <label for="module_account_accountant"/>
                             </div>
+                            <div>
+                                <field name="group_analytic_accounting" class="oe_inline"/>
+                                <label for="group_analytic_accounting"/>
+                            </div>
                             <div>
                                 <field name="module_account_asset" class="oe_inline"/>
                                 <label for="module_account_asset"/>
@@ -212,6 +220,10 @@
                                 <field name="module_account_check_writing" class="oe_inline"/>
                                 <label for="module_account_check_writing"/>
                             </div>
+                            <div>
+                                <field name="group_check_supplier_invoice_total" class="oe_inline"/>
+                                <label for="group_check_supplier_invoice_total"/>
+                            </div>
                         </div>
                     </group>
                     <separator string="Bank &amp; Cash"/>
@@ -219,12 +231,10 @@
                         <label for="id" string="Configuration"/>
                         <div>
                             <div>
-                                <button name="%(action_bank_tree)d"
-                                    string="Configure your bank accounts"
-                                    icon="gtk-go-forward"
-                                    type="action"
-                                    class="oe_inline oe_link"/>
                                 <label for="company_footer"/>
+                                <button name="open_company_form" type="object"
+                                    string="Configure your company bank accounts" icon="gtk-go-forward"
+                                    class="oe_inline oe_link"/>
                                 <field name="company_footer"/>
                             </div>
                             <div>
@@ -258,7 +268,7 @@
             <field name="target">inline</field>
         </record>
 
-        <menuitem id="menu_account_config" name="Accounting" parent="base.menu_config"
+        <menuitem id="menu_account_config" name="Invoicing" parent="base.menu_config"
             sequence="14" action="action_account_config"/>
 
     </data>
diff --git a/addons/account/res_currency.py b/addons/account/res_currency.py
index 8e02836274a..ce781a1e11a 100644
--- a/addons/account/res_currency.py
+++ b/addons/account/res_currency.py
@@ -45,4 +45,3 @@ class res_currency_account(osv.osv):
 res_currency_account()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index e1a29a6edfb..cc44f866169 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp><data>
+<openerp>
+<data>
 
     <record id="group_account_invoice" model="res.groups">
         <field name="name">Invoicing &amp; Payments</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
+
     <record id="group_account_user" model="res.groups">
         <field name="name">Accountant</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/>
     </record>
+
     <record id="group_account_manager" model="res.groups">
-        <field name="name">Manager</field>
+        <field name="name">Financial Manager</field>
         <field name="category_id" ref="base.module_category_accounting_and_finance"/>
         <field name="implied_ids" eval="[(4, ref('group_account_user'))]"/>
     </record>
@@ -22,102 +26,114 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+    <record id="group_supplier_inv_check_total" model="res.groups">
+        <field name="name">Check Total on supplier invoices</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
     <record id="account_move_comp_rule" model="ir.rule">
         <field name="name">Account Entry</field>
-        <field ref="model_account_move" name="model_id"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_move"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_move_line_comp_rule" model="ir.rule">
-         <field name="name">Entry lines</field>
-        <field model="ir.model" name="model_id" ref="model_account_move_line"/>
-        <field eval="True" name="global"/>
+        <field name="name">Entry lines</field>
+        <field name="model_id" ref="model_account_move_line"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="journal_period_comp_rule" model="ir.rule">
         <field name="name">Journal Period</field>
-        <field model="ir.model" name="model_id" ref="model_account_journal_period"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_journal_period"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
-     
+
 
     <record id="journal_comp_rule" model="ir.rule">
         <field name="name">Journal multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_journal"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_journal"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="analytic_journal_comp_rule" model="ir.rule">
         <field name="name">Analytic journal multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_analytic_journal"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="period_comp_rule" model="ir.rule">
         <field name="name">Period multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_period"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_period"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="fiscal_year_comp_rule" model="ir.rule">
         <field name="name">Fiscal year multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_fiscalyear"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_comp_rule" model="ir.rule">
         <field name="name">Account multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_account"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_account"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_comp_rule" model="ir.rule">
-         <field name="name">Tax multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_tax"/>
-        <field eval="True" name="global"/>
+        <field name="name">Tax multi-company</field>
+        <field name="model_id" ref="model_account_tax"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_code_comp_rule" model="ir.rule">
         <field name="name">Tax code multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_tax_code"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_tax_code"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="invoice_comp_rule" model="ir.rule">
         <field name="name">Invoice multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_invoice"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_invoice"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="invoice_analysis_comp_rule" model="ir.rule">
         <field name="name">Invoice Analysis multi-company</field>
-        <field model="ir.model" name="model_id" ref="model_account_invoice_report"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_invoice_report"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+    </record>
+
+    <record id="entry_analysis_comp_rule" model="ir.rule">
+        <field name="name">Entries Analysis multi-company</field>
+        <field name="model_id" ref="model_account_entries_report"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_fiscal_position_comp_rule" model="ir.rule">
         <field name="name">Account fiscal Mapping company rule</field>
-        <field model="ir.model" name="model_id" ref="model_account_fiscal_position"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_fiscal_position"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_model_comp_rule" model="ir.rule">
         <field name="name">Account model company rule</field>
-        <field model="ir.model" name="model_id" ref="model_account_model"/>
-        <field eval="True" name="global"/>
+        <field name="model_id" ref="model_account_model"/>
+        <field name="global" eval="True"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
@@ -142,4 +158,5 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
-</data></openerp>
+</data>
+</openerp>
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index a5049c0a345..28bedbf65a1 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -82,6 +82,7 @@ access_account_entries_report_invoice,account.entries.report,model_account_entri
 access_account_entries_report_employee,account.entries.report employee,model_account_entries_report,base.group_user,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_user,1,1,1,1
+access_account_journal_cashbox_line,account.journal.cashbox.line,model_account_journal_cashbox_line,account.group_account_user,1,1,1,0
 access_account_journal_view_invoice,account.journal.view invoice,model_account_journal_view,account.group_account_invoice,1,1,1,1
 access_account_journal_column_invoice,account.journal.column invoice,model_account_journal_column,account.group_account_invoice,1,1,1,1
 access_account_invoice_tax_accountant,account.invoice.tax accountant,model_account_invoice_tax,account.group_account_user,1,0,0,0
diff --git a/addons/account/static/src/css/account_move_reconciliation.css b/addons/account/static/src/css/account_move_reconciliation.css
new file mode 100644
index 00000000000..2b407226905
--- /dev/null
+++ b/addons/account/static/src/css/account_move_reconciliation.css
@@ -0,0 +1,19 @@
+
+.openerp .oe_account_reconciliation {
+    border-bottom: 1px solid #CACACA;
+    padding: 5px;
+}
+
+.openerp .oe_account_reconciliation button {
+    margin: 3px;
+}
+
+.openerp .oe_account_reconciliation>div {
+    display: table;
+    width: 100%;
+}
+
+.openerp .oe_account_reconciliation>div>div {
+    display: table-cell;
+    width: 50%:
+}
\ No newline at end of file
diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js
new file mode 100644
index 00000000000..22fe9b7b392
--- /dev/null
+++ b/addons/account/static/src/js/account_move_reconciliation.js
@@ -0,0 +1,129 @@
+openerp.account = function (instance) {
+    var _t = instance.web._t,
+        _lt = instance.web._lt;
+    var QWeb = instance.web.qweb;
+    
+    instance.web.account = {};
+    
+    instance.web.views.add('tree_account_reconciliation', 'instance.web.account.ReconciliationListView');
+    instance.web.account.ReconciliationListView = instance.web.ListView.extend({
+        init: function() {
+            this._super.apply(this, arguments);
+            var self = this;
+            this.current_partner = null;
+            this.on('record_selected', this, function() {
+                if (self.get_selected_ids().length === 0) {
+                    self.$(".oe_account_recon_reconcile").attr("disabled", "");
+                } else {
+                    self.$(".oe_account_recon_reconcile").removeAttr("disabled");
+                }
+            });
+        },
+        load_list: function() {
+            var self = this;
+            var tmp = this._super.apply(this, arguments);
+            if (this.partners) {
+                this.$el.prepend(QWeb.render("AccountReconciliation", {widget: this}));
+                this.$(".oe_account_recon_previous").click(function() {
+                    self.current_partner = (self.current_partner - 1) % self.partners.length;
+                    self.search_by_partner();
+                });
+                this.$(".oe_account_recon_next").click(function() {
+                    self.current_partner = (self.current_partner + 1) % self.partners.length;
+                    self.search_by_partner();
+                });
+                this.$(".oe_account_recon_reconcile").click(function() {
+                    self.reconcile();
+                });
+                this.$(".oe_account_recom_mark_as_reconciled").click(function() {
+                    self.mark_as_reconciled();
+                });
+            }
+            return tmp;
+        },
+        do_search: function(domain, context, group_by) {
+            var self = this;
+            this.last_domain = domain;
+            this.last_context = context;
+            this.last_group_by = group_by;
+            this.old_search = _.bind(this._super, this);
+            var mod = new instance.web.Model("account.move.line", context, domain);
+            return mod.call("list_partners_to_reconcile", []).then(function(result) {
+                var current = self.current_partner !== null ? self.partners[self.current_partner][0] : null;
+                self.partners = result;
+                var index = _.find(_.range(self.partners.length), function(el) {
+                    if (current === self.partners[el][0])
+                        return true;
+                });
+                if (index !== undefined)
+                    self.current_partner = index;
+                else
+                    self.current_partner = self.partners.length == 0 ? null : 0;
+                self.search_by_partner();
+            });
+        },
+        search_by_partner: function() {
+            var self = this;
+            var fct = function() {
+                return self.old_search(new instance.web.CompoundDomain(self.last_domain, 
+                    [["partner_id", "in", self.current_partner === null ? [] :
+                    [self.partners[self.current_partner][0]] ]]), self.last_context, self.last_group_by);
+            };
+            if (self.current_partner === null) {
+                self.last_reconciliation_date = _t("Never");
+                return fct();
+            } else {
+                return new instance.web.Model("res.partner").call("read",
+                    [self.partners[self.current_partner][0], ["last_reconciliation_date"]]).then(function(res) {
+                    self.last_reconciliation_date = 
+                        instance.web.format_value(res.last_reconciliation_date, {"type": "datetime"}, _t("Never"));
+                    return fct();
+                });
+            }
+        },
+        reconcile: function() {
+            var self = this;
+            var ids = this.get_selected_ids();
+            if (ids.length === 0) {
+                instance.web.dialog($("<div />").text(_t("You must choose at least one record.")), {
+                    title: _t("Warning"),
+                    modal: true
+                });
+                return false;
+            }
+
+            new instance.web.Model("ir.model.data").call("get_object_reference", ["account", "action_view_account_move_line_reconcile"]).then(function(result) {
+                var additional_context = _.extend({
+                    active_id: ids[0],
+                    active_ids: ids,
+                    active_model: self.model
+                });
+                return self.rpc("/web/action/load", {
+                    action_id: result[1],
+                    context: additional_context
+                }).done(function (result) {
+                    result.context = _.extend(result.context || {}, additional_context);
+                    result.flags = result.flags || {};
+                    result.flags.new_window = true;
+                    return self.do_action(result, {
+                        on_close: function () {
+                            self.do_search(self.last_domain, self.last_context, self.last_group_by);
+                        }
+                    });
+                });
+            });
+        },
+        mark_as_reconciled: function() {
+            var self = this;
+            var id = self.partners[self.current_partner][0];
+            new instance.web.Model("res.partner").call("mark_as_reconciled", [[id]]).then(function() {
+                self.do_search(self.last_domain, self.last_context, self.last_group_by);
+            });
+        },
+        do_select: function (ids, records) {
+            this.trigger('record_selected')
+            this._super.apply(this, arguments);
+        },
+    });
+    
+};
diff --git a/addons/account/static/src/xml/account_move_reconciliation.xml b/addons/account/static/src/xml/account_move_reconciliation.xml
new file mode 100644
index 00000000000..d7b5301238d
--- /dev/null
+++ b/addons/account/static/src/xml/account_move_reconciliation.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates id="template" xml:space="preserve">
+    
+    <t t-name="AccountReconciliation">
+        <t t-if="widget.current_partner === null">
+            <div class="oe_view_nocontent">
+                <p>
+                    Good job!
+                </p><p>
+                    There is nothing to reconcile. All invoices and payments
+                    have been reconciled, your partner balance is clean.
+                </p>
+            </div>
+        </t>
+        <div class="oe_account_reconciliation">
+            <t t-if="widget.current_partner !== null">
+                <div>
+                    <div>
+                        <button class="oe_account_recon_previous oe_button" href="javascript:void(0)">&lt;</button>
+                        <t t-esc="'' + widget.partners[widget.current_partner][1] + ' (' + (widget.current_partner + 1) + '/' + widget.partners.length + ')'"/>
+                        <button class="oe_account_recon_next oe_button" href="javascript:void(0)">&gt;</button>
+                    </div>
+                    <div>
+                        Last Reconciliation: <t t-esc="widget.last_reconciliation_date" />
+                    </div>
+                </div>
+                <div>
+                    <button class="oe_account_recon_reconcile oe_button oe_highlight" href="javascript:void(0)"
+                        disabled="">Reconcile</button>
+                    <button class="oe_account_recom_mark_as_reconciled oe_button" href="javascript:void(0)">Nothing to reconcile</button>
+                </div>
+            </t>
+        </div>
+    </t>
+
+</templates>
diff --git a/addons/account/test/account_change_currency.yml b/addons/account/test/account_change_currency.yml
index 1f1a412c19e..5f06a20b1ab 100644
--- a/addons/account/test/account_change_currency.yml
+++ b/addons/account/test/account_change_currency.yml
@@ -7,7 +7,7 @@
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 450.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account/test/account_invoice_state.yml b/addons/account/test/account_invoice_state.yml
index 6553635a781..7b995150af0 100644
--- a/addons/account/test/account_invoice_state.yml
+++ b/addons/account/test/account_invoice_state.yml
@@ -7,7 +7,7 @@
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 450.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 64f8ccf838f..7fe3095d47f 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -31,7 +31,6 @@
 -
   !python {model: account.account}: |
     ctx={}
-    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')],'active_id':ref('account.chart0')})
     data_dict = {'chart_account_id':ref('account.chart0')}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_aged_balance_view',wiz_data=data_dict, context=ctx, our_module='account')
@@ -40,7 +39,6 @@
 -
   !python {model: account.account}: |
     ctx={}
-    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
     data_dict = {'chart_account_id':ref('account.chart0'), 'account_report_id': ref('account_financial_report_balancesheet0')}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_report',wiz_data=data_dict, context=ctx, our_module='account')
@@ -49,7 +47,6 @@
 -
   !python {model: account.account}: |
     ctx={}
-    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
     data_dict = {'chart_account_id':ref('account.chart0')}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_balance_menu',wiz_data=data_dict, context=ctx, our_module='account')
@@ -60,7 +57,6 @@
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),
                          ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     ctx={}
-    ctx.update({'model': 'account.journal.period','active_ids':journal_ids})
     data_dict = {'chart_account_id':ref('account.chart0')}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_central_journal',wiz_data=data_dict, context=ctx, our_module='account')
@@ -71,7 +67,6 @@
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),
                          ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     ctx={}
-    ctx.update({'model': 'account.journal.period','active_ids':journal_ids})
     data_dict = {'chart_account_id':ref('account.chart0')}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_general_journal',wiz_data=data_dict, context=ctx, our_module='account')
@@ -80,7 +75,6 @@
 -
   !python {model: account.account}: |
     ctx={}
-    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
     data_dict = {'chart_account_id':ref('account.chart0'),'landscape':False}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_general_ledger_menu',wiz_data=data_dict, context=ctx, our_module='account')
@@ -89,7 +83,6 @@
 -
   !python {model: account.account}: |
     ctx={}
-    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
     data_dict = {'chart_account_id':ref('account.chart0'),'landscape':True}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_general_ledger_menu',wiz_data=data_dict, context=ctx, our_module='account')
@@ -99,7 +92,6 @@
   !python {model: account.journal.period}: |
     journal_ids = [ref('account.sales_journal'),ref('account.refund_sales_journal'),ref('account.expenses_journal'),ref('account.refund_expenses_journal'),ref('account.bank_journal'),ref('account.check_journal'),ref('account.cash_journal')]
     ctx={}
-    ctx.update({'model': 'account.journal.period','active_ids':journal_ids})
     data_dict = {'chart_account_id':ref('account.chart0'), 'period_from':ref('period_1'), 'period_to':ref('period_12')}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_print_journal',wiz_data=data_dict, context=ctx, our_module='account')
@@ -109,7 +101,6 @@
   !python {model: account.account}: |
     ctx={}
     data_dict = {'chart_account_id':ref('account.chart0')}
-    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')],'active_id':ref('account.chart0')})
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_partner_balance',wiz_data=data_dict, context=ctx, our_module='account')
 -
@@ -118,7 +109,6 @@
   !python {model: account.account}: |
     ctx={}
     data_dict = {'chart_account_id':ref('account.chart0'),'page_split': True}
-    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')],'active_id':ref('account.chart0')})
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_partner_ledger',wiz_data=data_dict, context=ctx, our_module='account')
 -
@@ -127,7 +117,6 @@
   !python {model: res.partner}: |
     ctx={}
     data_dict = {'chart_account_id':ref('account.chart0'),'page_split': False}
-    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')],'active_id':ref('account.chart0')})
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_partner_ledger',wiz_data=data_dict, context=ctx, our_module='account')
 -
@@ -135,7 +124,6 @@
 -
   !python {model: account.account}: |
     ctx={}
-    ctx.update({'model': 'account.account','active_ids':[ref('account.chart0')]})
     data_dict = {'chart_account_id':ref('account.chart0'), 'target_move': 'all', 'account_report_id': ref('account_financial_report_balancesheet0')}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_report',wiz_data=data_dict, context=ctx, our_module='account')
diff --git a/addons/account/test/account_sequence_test.yml b/addons/account/test/account_sequence_test.yml
index 3bc4a778794..74dcbce56ba 100644
--- a/addons/account/test/account_sequence_test.yml
+++ b/addons/account/test/account_sequence_test.yml
@@ -20,7 +20,7 @@
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC3] Medium PC'
+        name: '[PC-DEM] PC on Demand'
         price_unit: 900.0
         quantity: 10.0
         product_id: product.product_product_5
diff --git a/addons/account/test/account_supplier_invoice.yml b/addons/account/test/account_supplier_invoice.yml
index ccebd2ea90c..02c3d367050 100644
--- a/addons/account/test/account_supplier_invoice.yml
+++ b/addons/account/test/account_supplier_invoice.yml
@@ -21,14 +21,14 @@
 -
   I create a supplier invoice
 -
-  !record {model: account.invoice, id: account_invoice_supplier0}:
+  !record {model: account.invoice, id: account_invoice_supplier0, view: invoice_supplier_form}:
     account_id: account.a_pay
     check_total: 3000.0
     company_id: base.main_company
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_expense
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 300.0
         product_id: product.product_product_3
         quantity: 10.0
diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index 65ae2877125..df58da6dfea 100644
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -11,21 +11,18 @@
 -
   !record {model: account.move, id: account_move_0}:
     date: !eval time.strftime('%Y-%m-%d')
+    period_id: account.period_6
     journal_id: account.bank_journal
     line_id:
       - account_id: account.cash
         amount_currency: 0.0
         credit: 2000.0
-        date: !eval time.strftime('%Y-%m-%d')
         debit: 0.0
-        journal_id: account.bank_journal
         name: Basic Computer
         partner_id: base.res_partner_12
-        period_id: account.period_6
         ref: '2011010'
         tax_amount: 0.0
     name: /
-    period_id: account.period_6
     ref: '2011010'
     state: draft
 -
@@ -110,4 +107,4 @@
     partial_reconcile = self.trans_rec_reconcile_partial_reconcile(cr, uid, [ref('account_move_line_reconcile0')], {'lang': u'en_US',
       'active_model': 'account.move.line', 'active_ids': ids, 'tz': False, 'active_id': ids[0]})
     move_line = move_line_obj.browse(cr, uid, ids)
-    assert move_line[0].reconcile_partial_id, "Partial reconcilation is not done"
\ No newline at end of file
+    assert move_line[0].reconcile_partial_id, "Partial reconcilation is not done"
diff --git a/addons/account/test/test_edi_invoice.yml b/addons/account/test/test_edi_invoice.yml
index 516be311cf8..80dc098e770 100644
--- a/addons/account/test/test_edi_invoice.yml
+++ b/addons/account/test/test_edi_invoice.yml
@@ -24,7 +24,7 @@
         uos_id: 1
         quantity: 5.0
         price_unit: 100.0
-        name: 'Medium PC'
+        name: 'PC on Demand'
         account_id: account.a_pay
     tax_line:
       - name: sale tax
@@ -104,9 +104,9 @@
                 "__model": "account.invoice.line",
                 "__id": "account:b22acf7a-ddcd-11e0-a4db-701a04e25543.account_invoice_line-1RP3so",
                 "uos_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_uom_unit", "Unit"],
-                "name": "Basic PC",
+                "name": "PC Assemble SC234",
                 "price_unit": 10.0,
-                "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_3", "[PC1] Basic PC"],
+                "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_3", "[PCSC234] PC Assemble SC234"],
                 "quantity": 1.0
         },
         {
@@ -114,9 +114,9 @@
                 "__model": "account.invoice.line",
                 "__id": "account:b22acf7a-ddcd-11e0-a4db-701a04e25543.account_invoice_line-u2XV5",
                 "uos_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_uom_unit", "Unit"],
-                "name": "Medium PC",
+                "name": "PC on Demand",
                 "price_unit": 100.0,
-                "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_5", "[PC3] Medium PC"],
+                "product_id": ["product:b22acf7a-ddcd-11e0-a4db-701a04e25543.product_product_5", "[PC-DEM] PC on Demand"],
                 "quantity": 5.0
         }]
     }
@@ -137,12 +137,12 @@
     assert invoice_new.type == 'in_invoice', "Invoice type was not set properly"
     assert len(invoice_new.invoice_line) == 2, "invoice lines are not same"
     for inv_line in invoice_new.invoice_line:
-        if inv_line.name == 'Basic PC':
+        if inv_line.name == 'PC Assemble SC234':
             assert inv_line.uos_id.name == "Unit" , "uom is not same"
             assert inv_line.price_unit == 10 , "price unit is not same"
             assert inv_line.quantity == 1 , "product qty is not same"
             assert inv_line.price_subtotal == 10, "price sub total is not same"
-        elif inv_line.name == 'Medium PC':
+        elif inv_line.name == 'PC on Demand':
             assert inv_line.uos_id.name == "Unit" , "uom is not same"
             assert inv_line.price_unit == 100 , "price unit is not same"
             assert inv_line.quantity == 5 , "product qty is not same"
diff --git a/addons/account/tests/__init__.py b/addons/account/tests/__init__.py
new file mode 100644
index 00000000000..11fe4186db6
--- /dev/null
+++ b/addons/account/tests/__init__.py
@@ -0,0 +1,4 @@
+from . import test_tax
+
+fast_suite = [test_tax,
+              ]
diff --git a/addons/account/tests/test_tax.py b/addons/account/tests/test_tax.py
new file mode 100644
index 00000000000..a172a17e30d
--- /dev/null
+++ b/addons/account/tests/test_tax.py
@@ -0,0 +1,49 @@
+from openerp.tests.common import TransactionCase
+
+class TestTax(TransactionCase):
+    """Tests for taxes (account.tax)
+
+    We don't really need at this point to link taxes to tax codes
+    (account.tax.code) nor to companies (base.company) to check computation
+    results.
+    """
+
+    def setUp(self):
+        super(TestTax, self).setUp()
+        self.tax_model = self.registry('account.tax')
+
+    def test_programmatic_tax(self):
+        cr, uid = self.cr, self.uid
+        tax_id = self.tax_model.create(cr, uid, dict(
+                name="Programmatic tax",
+                type='code',
+                python_compute='result = 12.0',
+                python_compute_inv='result = 11.0',
+                ))
+
+        tax_records = self.tax_model.browse(cr, uid, [tax_id])
+        res = self.tax_model.compute_all(cr, uid, tax_records, 50.0, 2)
+
+        tax_detail = res['taxes'][0]
+        self.assertEquals(tax_detail['amount'], 24.0)
+        self.assertEquals(res['total_included'], 124.0)
+
+    def test_percent_tax(self):
+        """Test computations done by a 10 percent tax."""
+        cr, uid = self.cr, self.uid
+        tax_id = self.tax_model.create(cr, uid, dict(
+                name="Percent tax",
+                type='percent',
+                amount='0.1',
+                ))
+
+        tax_records = self.tax_model.browse(cr, uid, [tax_id])
+        res = self.tax_model.compute_all(cr, uid, tax_records, 50.0, 2)
+
+        tax_detail = res['taxes'][0]
+        self.assertEquals(tax_detail['amount'], 10.0)
+        self.assertEquals(res['total_included'], 110.0)
+
+        # now the inverse computation
+        res = self.tax_model.compute_inv(cr, uid, tax_records, 55.0, 2)
+        self.assertEquals(res[0]['amount'], 10.0)
diff --git a/addons/account/wizard/account_financial_report_view.xml b/addons/account/wizard/account_financial_report_view.xml
index 8388284be4a..507809e1961 100644
--- a/addons/account/wizard/account_financial_report_view.xml
+++ b/addons/account/wizard/account_financial_report_view.xml
@@ -14,15 +14,19 @@
                 </xpath>
                 <xpath expr="//notebook/page[@string='Filters']" position="after">
                     <page string="Comparison" attrs="{'invisible': [('enable_filter','=',False)]}">
-                        <field name="label_filter" attrs="{'required': [('enable_filter', '=', True)]}"/>
-                        <field name="fiscalyear_id_cmp"/><newline/>
-                        <field name="filter_cmp"/>
-                        <separator string="Dates" colspan="4"/>
-                        <field name="date_from_cmp" attrs="{'readonly':[('filter_cmp', '!=', 'filter_date')], 'required':[('filter_cmp', '=', 'filter_date')]}" colspan="4"/>
-                        <field name="date_to_cmp" attrs="{'readonly':[('filter_cmp', '!=', 'filter_date')], 'required':[('filter_cmp', '=', 'filter_date')]}"  colspan="4"/>
-                        <separator string="Periods" colspan="4"/>
-                        <field name="period_from_cmp" domain="[('fiscalyear_id', '=', fiscalyear_id_cmp)]" attrs="{'readonly':[('filter_cmp','!=','filter_period')], 'required':[('filter_cmp', '=', 'filter_period')]}" colspan="4"/>
-                        <field name="period_to_cmp" domain="[('fiscalyear_id', '=', fiscalyear_id_cmp)]" attrs="{'readonly':[('filter_cmp','!=','filter_period')], 'required':[('filter_cmp', '=', 'filter_period')]}" colspan="4"/>
+                        <group>
+                            <field name="label_filter" attrs="{'required': [('enable_filter', '=', True)]}"/>
+                            <field name="fiscalyear_id_cmp"/><newline/>
+                            <field name="filter_cmp"/>
+                        </group>
+                        <group string="Dates" attrs="{'invisible':[('filter_cmp', '!=', 'filter_date')]}">
+                            <field name="date_from_cmp" attrs="{'required':[('filter_cmp', '=', 'filter_date')]}"/>
+                            <field name="date_to_cmp" attrs="{'required':[('filter_cmp', '=', 'filter_date')]}"/>
+                        </group>
+                        <group string="Periods" attrs="{'invisible':[('filter_cmp', '!=', 'filter_period')]}">
+                            <field name="period_from_cmp" domain="[('fiscalyear_id', '=', fiscalyear_id_cmp)]" attrs="{'required':[('filter_cmp', '=', 'filter_period')]}"/>
+                            <field name="period_to_cmp" domain="[('fiscalyear_id', '=', fiscalyear_id_cmp)]" attrs="{'required':[('filter_cmp', '=', 'filter_period')]}"/>
+                        </group>
                    </page>
                 </xpath>
                 <xpath expr="//notebook/page[@string='Journals']" position="replace">
diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py
index 196c14d3792..dbf815d5218 100644
--- a/addons/account/wizard/account_fiscalyear_close.py
+++ b/addons/account/wizard/account_fiscalyear_close.py
@@ -226,7 +226,7 @@ class account_fiscalyear_close(osv.osv_memory):
         for account in obj_acc_account.browse(cr, uid, account_ids, context={'fiscalyear': fy_id}):
             balance_in_currency = 0.0
             if account.currency_id:
-                cr.execute('SELECT sum(amount_currency) as balance_in_currency FROM account_move_line ' \
+                cr.execute('SELECT sum(COALESCE(amount_currency,0.0)) as balance_in_currency FROM account_move_line ' \
                         'WHERE account_id = %s ' \
                             'AND ' + query_line + ' ' \
                             'AND currency_id = %s', (account.id, account.currency_id.id))
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index b7d278b8849..38a22baa9f1 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -32,11 +32,11 @@ class account_invoice_refund(osv.osv_memory):
     _name = "account.invoice.refund"
     _description = "Invoice Refund"
     _columns = {
-       'date': fields.date('Operation Date', help='This date will be used as the invoice date for credit note and period will be chosen accordingly!'),
+       'date': fields.date('Date', help='This date will be used as the invoice date for credit note and period will be chosen accordingly!'),
        'period': fields.many2one('account.period', 'Force period'),
        'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the credit note that will be created. If you leave that field empty, it will use the same journal as the current invoice.'),
-       'description': fields.char('Description', size=128, required=True),
-       'filter_refund': fields.selection([('refund', 'Create a draft refund'), ('cancel', 'Cancel: create credit note and reconcile'),('modify', 'Modify: create credit note, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Credit note base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
+       'description': fields.char('Reason', size=128, required=True),
+       'filter_refund': fields.selection([('refund', 'Create a draft credit note'), ('cancel', 'Cancel: create credit note and reconcile'),('modify', 'Modify: create credit note, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Credit note base on this type. You can not Modify and Cancel if the invoice is already reconciled'),
     }
 
     def _get_journal(self, cr, uid, context=None):
diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml
index 78a9b085bf1..3945a6f57e6 100644
--- a/addons/account/wizard/account_invoice_refund_view.xml
+++ b/addons/account/wizard/account_invoice_refund_view.xml
@@ -7,19 +7,40 @@
             <field name="model">account.invoice.refund</field>
             <field name="arch" type="xml">
                 <form string="Credit Note" version="7.0">
-                    <separator string="Credit Note Options"/>
-                    <group col="4">
-                         <field name="description"/>
-                         <field name="journal_id" widget='selection'/>
-                         <field name="date"/>
-                         <field name="period"/>
-                         <field name="filter_refund"/>
+                    <group>
+                         <group colspan="2">
+                             <label for="filter_refund"/>
+                             <div>
+                                 <field name="filter_refund" class="oe_inline"/>
+                                 <p attrs="{'invisible':[('filter_refund','&lt;&gt;','refund')]}" class="oe_grey">
+                                    You will be able to edit and validate this
+                                    credit note directly or keep it draft,
+                                    waiting for the document to be issued by
+                                    your supplier/customer.
+                                 </p>
+                                 <p attrs="{'invisible':[('filter_refund','&lt;&gt;','cancel')]}" class="oe_grey">
+                                    Use this option if you want to cancel an invoice you should not
+                                    have issued. The credit note will be created, validated and reconciled
+                                    with the invoice. You will not be able to modify the credit note.
+                                 </p>
+                                 <p attrs="{'invisible':[('filter_refund','&lt;&gt;','modify')]}" class="oe_grey">
+                                    Use this option if you want to cancel an invoice and create a new
+                                    one. The credit note will be created, validated and reconciled
+                                    with the current invoice. A new, draft, invoice will be created 
+                                    so that you can edit it.
+                                 </p>
+                             </div>
+                         </group>
+                         <group>
+                             <field name="description"/>
+                             <field name="journal_id" widget='selection'/>
+                         </group><group>
+                             <field name="date"/>
+                             <field name="period"/>
+                         </group>
                     </group>
-                    <label string="Modify Invoice: Cancels the current invoice and creates a new copy of it ready for editing."/>
-                    <label string="Credit Note: Creates the credit note, ready for editing."/>
-                    <label string="Cancel Invoice: Creates the credit note, validate and reconcile it to cancel the current invoice."/>
                     <footer>
-                        <button string='Refund' name="invoice_refund" type="object" class="oe_highlight"/>
+                        <button string='Create Credit Note' name="invoice_refund" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
@@ -28,7 +49,7 @@
         </record>
 
         <record id="action_account_invoice_refund" model="ir.actions.act_window">
-            <field name="name">Refund</field>
+            <field name="name">Refund Invoice</field>
             <field name="res_model">account.invoice.refund</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/wizard/account_invoice_state.py b/addons/account/wizard/account_invoice_state.py
index 55eab584040..7c7f6882b75 100644
--- a/addons/account/wizard/account_invoice_state.py
+++ b/addons/account/wizard/account_invoice_state.py
@@ -71,4 +71,4 @@ class account_invoice_cancel(osv.osv_memory):
 
 account_invoice_cancel()
 
-# 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_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 11703a4f259..eb636f61b50 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -6,7 +6,12 @@
             <field name="model">account.invoice.confirm</field>
             <field name="arch" type="xml">
                 <form string="Confirm Draft Invoices" version="7.0">
-                    <separator string="Confirm Draft Invoices"/>
+                    <p class="oe_grey">
+                        Once draft invoices are confirmed, you will not be able
+                        to modify them. The invoices will receive a unique
+                        number and journal items will be created in your chart
+                        of accounts.
+                    </p>
                     <footer>
                         <button string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1" class="oe_highlight"/>
                         or
@@ -27,7 +32,6 @@
             <field name="model">account.invoice.cancel</field>
             <field name="arch" type="xml">
                 <form string="Cancel Selected Invoices" version="7.0">
-                    <separator string="Cancel Selected Invoices"/>
                     <footer>
                         <button string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1" class="oe_highlight"/>
                         or
diff --git a/addons/account/wizard/account_journal_select.py b/addons/account/wizard/account_journal_select.py
index 98099925e29..b91c195f6b3 100644
--- a/addons/account/wizard/account_journal_select.py
+++ b/addons/account/wizard/account_journal_select.py
@@ -47,4 +47,4 @@ class account_journal_select(osv.osv_memory):
 
 account_journal_select()
 
-# 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_move_bank_reconcile.py b/addons/account/wizard/account_move_bank_reconcile.py
index 4679089b7cc..2b29bf6b30d 100644
--- a/addons/account/wizard/account_move_bank_reconcile.py
+++ b/addons/account/wizard/account_move_bank_reconcile.py
@@ -61,4 +61,4 @@ the bank account\nin the journal definition for reconciliation.'))
 
 account_move_bank_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_move_journal.py b/addons/account/wizard/account_move_journal.py
index 1353efca1f5..246532d38d7 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -38,7 +38,7 @@ class account_move_journal(osv.osv_memory):
     _defaults = {
         'target_move': 'all'
     }
-    def _get_period(self, cr, uid, context={}):
+    def _get_period(self, cr, uid, context=None):
         """
         Return  default account period value
         """
@@ -92,14 +92,14 @@ class account_move_journal(osv.osv_memory):
 
             journal = False
             if journal_id:
-                journal = journal_pool.read(cr, uid, [journal_id], ['name'])[0]['name']
+                journal = journal_pool.read(cr, uid, journal_id, ['name'], context=context).get('name',False)
                 journal_string = _("Journal: %s") % tools.ustr(journal)
             else:
                 journal_string = _("Journal: All")
 
             period = False
             if period_id:
-                period = period_pool.browse(cr, uid, [period_id], ['name'])[0]['name']
+                period = period_pool.browse(cr, uid, period_id, context=context).name
                 period_string = _("Period: %s") % tools.ustr(period)
 
             open_string = _("Open")
diff --git a/addons/account/wizard/account_move_line_reconcile_select.py b/addons/account/wizard/account_move_line_reconcile_select.py
index 8e57c57884d..e23212c514c 100644
--- a/addons/account/wizard/account_move_line_reconcile_select.py
+++ b/addons/account/wizard/account_move_line_reconcile_select.py
@@ -52,4 +52,4 @@ class account_move_line_reconcile_select(osv.osv_memory):
 
 account_move_line_reconcile_select()
 
-# 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_move_line_select.py b/addons/account/wizard/account_move_line_select.py
index 4a2f40ec708..a99750a36fe 100644
--- a/addons/account/wizard/account_move_line_select.py
+++ b/addons/account/wizard/account_move_line_select.py
@@ -69,4 +69,4 @@ class account_move_line_select(osv.osv_memory):
 
 account_move_line_select()
 
-# 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_move_line_unreconcile_select.py b/addons/account/wizard/account_move_line_unreconcile_select.py
index ad59493503d..26421eb4c0c 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select.py
+++ b/addons/account/wizard/account_move_line_unreconcile_select.py
@@ -41,4 +41,4 @@ class account_move_line_unreconcile_select(osv.osv_memory):
 
 account_move_line_unreconcile_select()
 
-# 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_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py
index b8d64fac0b5..1b5622a589d 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -27,7 +27,7 @@ class account_open_closed_fiscalyear(osv.osv_memory):
     _description = "Choose Fiscal Year"
     _columns = {
        'fyear_id': fields.many2one('account.fiscalyear', \
-                                 'Fiscal Year to Open', required=True, help='Select Fiscal Year which you want to remove entries for its End of year entries journal'),
+                                 'Fiscal Year', required=True, help='Select Fiscal Year which you want to remove entries for its End of year entries journal'),
     }
 
     def remove_entries(self, cr, uid, ids, context=None):
@@ -36,7 +36,7 @@ class account_open_closed_fiscalyear(osv.osv_memory):
         data = self.browse(cr, uid, ids, context=context)[0]
         period_journal = data.fyear_id.end_journal_period_id or False
         if not period_journal:
-            raise osv.except_osv(_('Error!'), _('You have to set the end of the fiscal year for this journal.'))
+            raise osv.except_osv(_('Error!'), _("You have to set the 'End  of Year Entries Journal' for this Fiscal Year which is set after generating opening entries from 'Generate Opening Entries'."))
 
         ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)])
         if ids_move:
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index c2c271af41b..d4cfd398920 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -5,14 +5,18 @@
             <field name="name">account.open.closed.fiscalyear.form</field>
             <field name="model">account.open.closed.fiscalyear</field>
             <field name="arch" type="xml">
-                <form string="Choose Fiscal Year " version="7.0">
+                <form string="Cancel Fiscal Year Opening Entries" version="7.0">
+                    <separator string="Cancel Fiscal Year Opening Entries"/>
+                    <p class="oe_grey">
+This wizard will remove the end of year journal entries of selected fiscal year. Note that you can run this wizard many times for the same fiscal year.
+                    </p>
                     <group>
-                        <field name="fyear_id" domain="[('state','=','draft')]"/>
+                        <field name="fyear_id" domain="[('state','=','draft'), ('end_journal_period_id', '!=', False)]"/>
                     </group>
                     <footer>
-                        <button string="Open" name="remove_entries" type="object" class="oe_highlight"/>
+                        <button string="Cancel Opening Entries" name="remove_entries" type="object" class="oe_highlight"/>
                         or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
+                        <button string="Discard" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py
index 729792e2222..6f6c8f07844 100644
--- a/addons/account/wizard/account_reconcile.py
+++ b/addons/account/wizard/account_reconcile.py
@@ -23,6 +23,7 @@ import time
 
 from osv import fields, osv
 from tools.translate import _
+import decimal_precision as dp
 
 class account_move_line_reconcile(osv.osv_memory):
     """
@@ -32,9 +33,9 @@ class account_move_line_reconcile(osv.osv_memory):
     _description = 'Account move line reconcile'
     _columns = {
         'trans_nbr': fields.integer('# of Transaction', readonly=True),
-        'credit': fields.float('Credit amount', readonly=True),
-        'debit': fields.float('Debit amount', readonly=True),
-        'writeoff': fields.float('Write-Off amount', readonly=True),
+        'credit': fields.float('Credit amount', readonly=True, digits_compute=dp.get_precision('Account')),
+        'debit': fields.float('Debit amount', readonly=True, digits_compute=dp.get_precision('Account')),
+        'writeoff': fields.float('Write-Off amount', readonly=True, digits_compute=dp.get_precision('Account')),
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -86,19 +87,6 @@ class account_move_line_reconcile(osv.osv_memory):
         ids = period_obj.find(cr, uid, dt=date, context=context)
         if ids:
             period_id = ids[0]
-        #stop the reconciliation process by partner (manual reconciliation) only if there is nothing more to reconcile for this partner
-        if 'active_ids' in context and context['active_ids']:
-            tmp_ml_id = account_move_line_obj.browse(cr, uid, context['active_ids'], context)[0]
-            partner_id = tmp_ml_id.partner_id and tmp_ml_id.partner_id.id or False
-            debit_ml_ids = account_move_line_obj.search(cr, uid, [('partner_id', '=', partner_id), ('account_id.reconcile', '=', True), ('reconcile_id', '=', False), ('debit', '>', 0)], context=context)
-            credit_ml_ids = account_move_line_obj.search(cr, uid, [('partner_id', '=', partner_id), ('account_id.reconcile', '=', True), ('reconcile_id', '=', False), ('credit', '>', 0)], context=context)
-            for ml_id in context['active_ids']:
-                if ml_id in debit_ml_ids:
-                    debit_ml_ids.remove(ml_id)
-                if ml_id in credit_ml_ids:
-                    credit_ml_ids.remove(ml_id)
-            if not debit_ml_ids and credit_ml_ids:
-                context.update({'stop_reconcile': True})
         account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
                                         period_id, journal_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
@@ -166,11 +154,10 @@ class account_move_line_reconcile_writeoff(osv.osv_memory):
         if ids:
             period_id = ids[0]
 
-        context.update({'stop_reconcile': True})
         account_move_line_obj.reconcile(cr, uid, context['active_ids'], 'manual', account_id,
                 period_id, journal_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
 account_move_line_reconcile_writeoff()
 
-# 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_reconcile_partner_process.py b/addons/account/wizard/account_reconcile_partner_process.py
index 7cfeff70891..380d25001c7 100644
--- a/addons/account/wizard/account_reconcile_partner_process.py
+++ b/addons/account/wizard/account_reconcile_partner_process.py
@@ -57,10 +57,10 @@ class account_partner_reconcile_process(osv.osv_memory):
     def _get_partner(self, cr, uid, context=None):
         move_line_obj = self.pool.get('account.move.line')
 
-        partner = move_line_obj.get_next_partner_only(cr, uid, offset=1, context=context)
+        partner = move_line_obj.list_partners_to_reconcile(cr, uid, context=context)
         if not partner:
             return False
-        return partner[0]
+        return partner[0][0]
 
     def data_get(self, cr, uid, to_reconcile, today_reconciled, context=None):
         return {'progress': (100 / (float(to_reconcile + today_reconciled) or 1.0)) * today_reconciled}
@@ -100,4 +100,4 @@ class account_partner_reconcile_process(osv.osv_memory):
 
 account_partner_reconcile_process()
 
-# 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_report_account_balance_view.xml b/addons/account/wizard/account_report_account_balance_view.xml
index b2c8ccd3011..3609ee3b4de 100644
--- a/addons/account/wizard/account_report_account_balance_view.xml
+++ b/addons/account/wizard/account_report_account_balance_view.xml
@@ -9,8 +9,7 @@
           <field name="inherit_id" ref="account_common_report_view" />
           <field name="arch" type="xml">
             <data>
-            <xpath expr="//field[@name='journal_ids']" position="replace">
-                <field name="journal_ids" colspan="4" nolabel="1" required="0" readonly="1"/>
+            <xpath expr="//notebook/page[@string='Journals']" position="replace">
             </xpath>
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="display_account"/>
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py
index 02da9a6ab1f..4438484aaaf 100644
--- a/addons/account/wizard/account_report_common.py
+++ b/addons/account/wizard/account_report_common.py
@@ -30,9 +30,11 @@ class account_common_report(osv.osv_memory):
     _description = "Account Common Report"
 
     def onchange_chart_id(self, cr, uid, ids, chart_account_id=False, context=None):
+        res = {}
         if chart_account_id:
             company_id = self.pool.get('account.account').browse(cr, uid, chart_account_id, context=context).company_id.id
-        return {'value': {'company_id': company_id}}
+            res['value'] = {'company_id': company_id}
+        return res
 
     _columns = {
         'chart_account_id': fields.many2one('account.account', 'Chart of Account', help='Select Charts of Accounts', required=True, domain = [('parent_id','=',False)]),
@@ -117,7 +119,11 @@ class account_common_report(osv.osv_memory):
 
     def _get_fiscalyear(self, cr, uid, context=None):
         now = time.strftime('%Y-%m-%d')
-        fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, [('date_start', '<', now), ('date_stop', '>', now)], limit=1 )
+        company_id = False
+        ids = context.get('active_ids', [])
+        if ids:
+            company_id = self.browse(cr, uid, ids[0], context=context).company_id.id
+        fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, [('date_start', '<', now), ('date_stop', '>', now), ('company_id', '=', company_id)], limit=1)
         return fiscalyears and fiscalyears[0] or False
 
     def _get_all_journal(self, cr, uid, context=None):
diff --git a/addons/account/wizard/account_state_open.py b/addons/account/wizard/account_state_open.py
index f75aff365fe..32795f0f5b7 100644
--- a/addons/account/wizard/account_state_open.py
+++ b/addons/account/wizard/account_state_open.py
@@ -41,4 +41,4 @@ class account_state_open(osv.osv_memory):
 
 account_state_open()
 
-# 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_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py
index dc5209ebea0..0dae5aa90a8 100644
--- a/addons/account/wizard/account_subscription_generate.py
+++ b/addons/account/wizard/account_subscription_generate.py
@@ -50,4 +50,4 @@ class account_subscription_generate(osv.osv_memory):
 
 account_subscription_generate()
 
-# 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_unreconcile.py b/addons/account/wizard/account_unreconcile.py
index 0e6c38f9d7c..5494875cf26 100644
--- a/addons/account/wizard/account_unreconcile.py
+++ b/addons/account/wizard/account_unreconcile.py
@@ -50,4 +50,4 @@ class account_unreconcile_reconcile(osv.osv_memory):
 
 account_unreconcile_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/pos_box.py b/addons/account/wizard/pos_box.py
index b4254b5ba84..b5d1cc37776 100644
--- a/addons/account/wizard/pos_box.py
+++ b/addons/account/wizard/pos_box.py
@@ -40,6 +40,10 @@ class CashBox(osv.osv_memory):
 
         return {}
 
+    def _create_bank_statement_line(self, cr, uid, box, record, context=None):
+        values = self._compute_values_for_statement_line(cr, uid, box, record, context=context)
+        return self.pool.get('account.bank.statement.line').create(cr, uid, values, context=context)
+
 
 class CashBoxIn(CashBox):
     _name = 'cash.box.in'
@@ -49,30 +53,24 @@ class CashBoxIn(CashBox):
         'ref' : fields.char('Reference', size=32),
     })
 
-    def _create_bank_statement_line(self, cr, uid, box, record, context=None):
-        absl_proxy = self.pool.get('account.bank.statement.line')
-
-        values = {
+    def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
+        return {
             'statement_id' : record.id,
             'journal_id' : record.journal_id.id,
             'account_id' : record.journal_id.internal_account_id.id,
             'amount' : box.amount or 0.0,
-            'ref' : "%s" % (box.ref or ''),
+            'ref' : '%s' % (box.ref or ''),
             'name' : box.name,
         }
 
-        return absl_proxy.create(cr, uid, values, context=context)
-
 CashBoxIn()
 
 class CashBoxOut(CashBox):
     _name = 'cash.box.out'
 
-    def _create_bank_statement_line(self, cr, uid, box, record, context=None):
-        absl_proxy = self.pool.get('account.bank.statement.line')
-
+    def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
         amount = box.amount or 0.0
-        values = {
+        return {
             'statement_id' : record.id,
             'journal_id' : record.journal_id.id,
             'account_id' : record.journal_id.internal_account_id.id,
@@ -80,6 +78,4 @@ class CashBoxOut(CashBox):
             'name' : box.name,
         }
 
-        return absl_proxy.create(cr, uid, values, context=context)
-
 CashBoxOut()
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index 7c97112b875..980f565b3e5 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -19,34 +19,29 @@
 #
 ##############################################################################
 {
-    "name" : "Accounting and Finance",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "category": 'Accounting & Finance',
-    "sequence": 10,
-    "summary": "Financial and Analytic Accounting",
-    "description": """
-Accounting Access Rights.
-=========================
+    'name' : 'Accounting and Finance',
+    'version' : '1.1',
+    'author' : 'OpenERP SA',
+    'category': 'Accounting & Finance',
+    'sequence': 10,
+    'summary': 'Financial and Analytic Accounting',
+    'description': """
+Accounting Access Rights
+========================
+It gives the Administrator user access to all accounting features such as journal items and the chart of accounts.
 
-This module gives the Admin user the access to all the accounting features
-like the journal items and the chart of accounts.
-
-It assigns manager and user access rights to the Administrator and only
-user rights to Demo user.
-    """,
+It assigns manager and user access rights to the Administrator and only user rights to the Demo user. 
+""",
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    "depends" : ["account_voucher"],
-    'update_xml': [
+    'depends' : ['account_voucher'],
+    'data': [
         'security/account_security.xml',
         'account_accountant_data.xml'
     ],
-    'demo_xml': ['account_accountant_demo.xml'],
+    'demo': ['account_accountant_demo.xml'],
     'test': [],
     'installable': True,
     'auto_install': False,
     'application': True,
-    'certificate': '00395091383933390541',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml
index 57fb229ad12..c7d6eb80bc6 100644
--- a/addons/account_accountant/account_accountant_data.xml
+++ b/addons/account_accountant/account_accountant_data.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- rename root menu "Accounting" -->
-        <record id="account.menu_finance" model="ir.ui.menu">
-            <field name="name">Accounting</field>
-        </record>
+        <!-- Rename root menu "Accounting" -->
+        <!-- Top menu item -->
+        <menuitem name="Accounting"
+            id="account.menu_finance"/>
+        <menuitem id="account.menu_account_config" name="Accounting" parent="base.menu_config"/>
+
     </data>
 
     <data noupdate="1">
@@ -14,22 +16,20 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('account.menu_finance')}"/>
         </record>
-        <record id="todo_open_account_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_account_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
+        </record>
+
+        <!-- Notify all employees of module installation -->
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Accounting and Finance application installed!</field>
+            <field name="body"><![CDATA[<p>With OpenERP's accounting, you get instant access to your financial data, and can setup analytic accounting, forecast taxes, control budgets, easily create and send invoices, record bank statements, etc.</p>
+<p>The accounting features are fully integrated with other OpenERP applications to automate all your processes: creation of customer invoices, control of supplier invoices, point-of-sale integration, automated follow-ups, etc.</p>]]></field>
         </record>
     </data>
-
-    <data noupdate="1">
-        <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Accounting and Finance has been installed.</value>
-            <value>With OpenERP's accounting, you can get an instant access to all your financial data, setup your analytic accounting, forecast your taxes, control your budgets, easily create and send invoices, record bank statements, etc.
-
-The accounting features are fully integrated with others OpenERP applications to automate all your processes: creation of customer invoices, control of supplier invoices, point-of-sale integration, automated follow-ups, etc.</value>
-        </function>
-    </data>
 </openerp>
diff --git a/addons/account_accountant/i18n/ar.po b/addons/account_accountant/i18n/ar.po
index 7abec625d1c..d673e39e781 100644
--- a/addons/account_accountant/i18n/ar.po
+++ b/addons/account_accountant/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "محاسب"
diff --git a/addons/account_accountant/i18n/az.po b/addons/account_accountant/i18n/az.po
index b21f105ce35..bb7e360eda2 100644
--- a/addons/account_accountant/i18n/az.po
+++ b/addons/account_accountant/i18n/az.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/bg.po b/addons/account_accountant/i18n/bg.po
index 9905bbca745..53acbe2378c 100644
--- a/addons/account_accountant/i18n/bg.po
+++ b/addons/account_accountant/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Счетоводител"
diff --git a/addons/account_accountant/i18n/bn.po b/addons/account_accountant/i18n/bn.po
index 0634a92b634..6dac55c3a03 100644
--- a/addons/account_accountant/i18n/bn.po
+++ b/addons/account_accountant/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/bs.po b/addons/account_accountant/i18n/bs.po
index b6539ecf7db..3c33d8c1e2e 100644
--- a/addons/account_accountant/i18n/bs.po
+++ b/addons/account_accountant/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/ca.po b/addons/account_accountant/i18n/ca.po
index 64bd7a38a7b..f04edf61772 100644
--- a/addons/account_accountant/i18n/ca.po
+++ b/addons/account_accountant/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Comptable"
diff --git a/addons/account_accountant/i18n/cs.po b/addons/account_accountant/i18n/cs.po
index db535469c5e..6eef1976e4a 100644
--- a/addons/account_accountant/i18n/cs.po
+++ b/addons/account_accountant/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "účetní"
diff --git a/addons/account_accountant/i18n/da.po b/addons/account_accountant/i18n/da.po
index 52fd3259a1e..526c92ec8f3 100644
--- a/addons/account_accountant/i18n/da.po
+++ b/addons/account_accountant/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Bogholder"
diff --git a/addons/account_accountant/i18n/de.po b/addons/account_accountant/i18n/de.po
index 3533e808dd2..1e1f0c63152 100644
--- a/addons/account_accountant/i18n/de.po
+++ b/addons/account_accountant/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Finanzbuchhaltung Administrator"
diff --git a/addons/account_accountant/i18n/el.po b/addons/account_accountant/i18n/el.po
index 99a3e8e676c..5e262b95518 100644
--- a/addons/account_accountant/i18n/el.po
+++ b/addons/account_accountant/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Λογιστής"
diff --git a/addons/account_accountant/i18n/en_GB.po b/addons/account_accountant/i18n/en_GB.po
index a9c5c344c42..54fe6a4c0e5 100644
--- a/addons/account_accountant/i18n/en_GB.po
+++ b/addons/account_accountant/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/es.po b/addons/account_accountant/i18n/es.po
index bf6cef342ad..32bebb6e5ef 100644
--- a/addons/account_accountant/i18n/es.po
+++ b/addons/account_accountant/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Contable"
diff --git a/addons/account_accountant/i18n/es_CR.po b/addons/account_accountant/i18n/es_CR.po
index 4780cdc0fac..2ebb8dae9dc 100644
--- a/addons/account_accountant/i18n/es_CR.po
+++ b/addons/account_accountant/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #~ msgid "Accountant"
diff --git a/addons/account_accountant/i18n/es_EC.po b/addons/account_accountant/i18n/es_EC.po
index 84b9053798f..acc57b97f03 100644
--- a/addons/account_accountant/i18n/es_EC.po
+++ b/addons/account_accountant/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Contador"
diff --git a/addons/account_accountant/i18n/es_PY.po b/addons/account_accountant/i18n/es_PY.po
index e88734c940b..73e65539deb 100644
--- a/addons/account_accountant/i18n/es_PY.po
+++ b/addons/account_accountant/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/et.po b/addons/account_accountant/i18n/et.po
index c5b4c06cc34..58627002a9e 100644
--- a/addons/account_accountant/i18n/et.po
+++ b/addons/account_accountant/i18n/et.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 
diff --git a/addons/account_accountant/i18n/fa.po b/addons/account_accountant/i18n/fa.po
index 38719a3a01c..26d0fbee300 100644
--- a/addons/account_accountant/i18n/fa.po
+++ b/addons/account_accountant/i18n/fa.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 
diff --git a/addons/account_accountant/i18n/fi.po b/addons/account_accountant/i18n/fi.po
index c9aee02fb2e..0cd077de07a 100644
--- a/addons/account_accountant/i18n/fi.po
+++ b/addons/account_accountant/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Kirjanpitäjä"
diff --git a/addons/account_accountant/i18n/fr.po b/addons/account_accountant/i18n/fr.po
index 7768fc7c2c2..19be91bd7f0 100644
--- a/addons/account_accountant/i18n/fr.po
+++ b/addons/account_accountant/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Comptable"
diff --git a/addons/account_accountant/i18n/gl.po b/addons/account_accountant/i18n/gl.po
index f4844253397..c8d886f7e03 100644
--- a/addons/account_accountant/i18n/gl.po
+++ b/addons/account_accountant/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/he.po b/addons/account_accountant/i18n/he.po
index 7beaa0bcd5a..29c9a1480d4 100644
--- a/addons/account_accountant/i18n/he.po
+++ b/addons/account_accountant/i18n/he.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 
diff --git a/addons/account_accountant/i18n/hi.po b/addons/account_accountant/i18n/hi.po
index 46f602268d8..01ccd0e6e2e 100644
--- a/addons/account_accountant/i18n/hi.po
+++ b/addons/account_accountant/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "लेखापाल"
diff --git a/addons/account_accountant/i18n/hr.po b/addons/account_accountant/i18n/hr.po
index 1dc507ba3e6..80e454d4807 100644
--- a/addons/account_accountant/i18n/hr.po
+++ b/addons/account_accountant/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/hu.po b/addons/account_accountant/i18n/hu.po
index d7eeee039f6..6be45b2f76b 100644
--- a/addons/account_accountant/i18n/hu.po
+++ b/addons/account_accountant/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Könyvelő"
diff --git a/addons/account_accountant/i18n/id.po b/addons/account_accountant/i18n/id.po
index 4229109eaba..ff19b22b68b 100644
--- a/addons/account_accountant/i18n/id.po
+++ b/addons/account_accountant/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Akuntan"
diff --git a/addons/account_accountant/i18n/it.po b/addons/account_accountant/i18n/it.po
index 909ecde299f..f03e0c721df 100644
--- a/addons/account_accountant/i18n/it.po
+++ b/addons/account_accountant/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Contabile"
diff --git a/addons/account_accountant/i18n/ja.po b/addons/account_accountant/i18n/ja.po
index b921378d6cb..4ab380be93b 100644
--- a/addons/account_accountant/i18n/ja.po
+++ b/addons/account_accountant/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/ko.po b/addons/account_accountant/i18n/ko.po
index 132d86d6012..ef27c46876f 100644
--- a/addons/account_accountant/i18n/ko.po
+++ b/addons/account_accountant/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/lo.po b/addons/account_accountant/i18n/lo.po
index b968e6c0727..7c2cf2337df 100644
--- a/addons/account_accountant/i18n/lo.po
+++ b/addons/account_accountant/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "ນາຍບັນຊີ"
diff --git a/addons/account_accountant/i18n/lt.po b/addons/account_accountant/i18n/lt.po
index 9750e53db88..9c45d6ffb89 100644
--- a/addons/account_accountant/i18n/lt.po
+++ b/addons/account_accountant/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/lv.po b/addons/account_accountant/i18n/lv.po
index 274e1fb1b47..ba428353032 100644
--- a/addons/account_accountant/i18n/lv.po
+++ b/addons/account_accountant/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Grāmatvedis"
diff --git a/addons/account_accountant/i18n/mk.po b/addons/account_accountant/i18n/mk.po
index 14331362518..0d45f416127 100644
--- a/addons/account_accountant/i18n/mk.po
+++ b/addons/account_accountant/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/mn.po b/addons/account_accountant/i18n/mn.po
index 1e212202f03..ea242c96427 100644
--- a/addons/account_accountant/i18n/mn.po
+++ b/addons/account_accountant/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Нягтлан бодогч"
diff --git a/addons/account_accountant/i18n/nb.po b/addons/account_accountant/i18n/nb.po
index 6129dcb8f3d..7482f6e3195 100644
--- a/addons/account_accountant/i18n/nb.po
+++ b/addons/account_accountant/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/nl.po b/addons/account_accountant/i18n/nl.po
index 547fec8eba9..76a631cac25 100644
--- a/addons/account_accountant/i18n/nl.po
+++ b/addons/account_accountant/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Accountant"
diff --git a/addons/account_accountant/i18n/nl_BE.po b/addons/account_accountant/i18n/nl_BE.po
index eaa91948d4d..511ef0a5b63 100644
--- a/addons/account_accountant/i18n/nl_BE.po
+++ b/addons/account_accountant/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Accountant"
diff --git a/addons/account_accountant/i18n/oc.po b/addons/account_accountant/i18n/oc.po
index 1c828d35aa2..65a7791f565 100644
--- a/addons/account_accountant/i18n/oc.po
+++ b/addons/account_accountant/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/pl.po b/addons/account_accountant/i18n/pl.po
index febd6ec355d..fc2407e292a 100644
--- a/addons/account_accountant/i18n/pl.po
+++ b/addons/account_accountant/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/pt.po b/addons/account_accountant/i18n/pt.po
index a13ea02f620..1a08e38402d 100644
--- a/addons/account_accountant/i18n/pt.po
+++ b/addons/account_accountant/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Contabilista"
diff --git a/addons/account_accountant/i18n/pt_BR.po b/addons/account_accountant/i18n/pt_BR.po
index 8d29705a690..978c09a50ac 100644
--- a/addons/account_accountant/i18n/pt_BR.po
+++ b/addons/account_accountant/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Contador"
diff --git a/addons/account_accountant/i18n/ro.po b/addons/account_accountant/i18n/ro.po
index 31defc2e3bc..681c7492501 100644
--- a/addons/account_accountant/i18n/ro.po
+++ b/addons/account_accountant/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Contabil"
diff --git a/addons/account_accountant/i18n/ru.po b/addons/account_accountant/i18n/ru.po
index c6ebd572f67..a3505a8be5d 100644
--- a/addons/account_accountant/i18n/ru.po
+++ b/addons/account_accountant/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Бухгалтер"
diff --git a/addons/account_accountant/i18n/sk.po b/addons/account_accountant/i18n/sk.po
index fefe396cde1..bc8ffbf69d4 100644
--- a/addons/account_accountant/i18n/sk.po
+++ b/addons/account_accountant/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Účtovník"
diff --git a/addons/account_accountant/i18n/sl.po b/addons/account_accountant/i18n/sl.po
index b0000a2a54f..c71379697bd 100644
--- a/addons/account_accountant/i18n/sl.po
+++ b/addons/account_accountant/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Računovodja"
diff --git a/addons/account_accountant/i18n/sq.po b/addons/account_accountant/i18n/sq.po
index 453df9cf171..43286e3e1e8 100644
--- a/addons/account_accountant/i18n/sq.po
+++ b/addons/account_accountant/i18n/sq.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 
diff --git a/addons/account_accountant/i18n/sr.po b/addons/account_accountant/i18n/sr.po
index eeaae783bfe..78516ad5d5e 100644
--- a/addons/account_accountant/i18n/sr.po
+++ b/addons/account_accountant/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Књиговођа"
diff --git a/addons/account_accountant/i18n/sr@latin.po b/addons/account_accountant/i18n/sr@latin.po
index f178834f7cc..6e4442d5bb0 100644
--- a/addons/account_accountant/i18n/sr@latin.po
+++ b/addons/account_accountant/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/sv.po b/addons/account_accountant/i18n/sv.po
index 1e641201d0d..c8238804256 100644
--- a/addons/account_accountant/i18n/sv.po
+++ b/addons/account_accountant/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Revisor"
diff --git a/addons/account_accountant/i18n/ta.po b/addons/account_accountant/i18n/ta.po
index ff44ef7440f..482776b6c84 100644
--- a/addons/account_accountant/i18n/ta.po
+++ b/addons/account_accountant/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/th.po b/addons/account_accountant/i18n/th.po
index e1176a5209f..f4ceff7373c 100644
--- a/addons/account_accountant/i18n/th.po
+++ b/addons/account_accountant/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "ผู้ทำบัญชี"
diff --git a/addons/account_accountant/i18n/tr.po b/addons/account_accountant/i18n/tr.po
index 997bd93ee47..7a82ff9a378 100644
--- a/addons/account_accountant/i18n/tr.po
+++ b/addons/account_accountant/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_accountant/i18n/uk.po b/addons/account_accountant/i18n/uk.po
index 83aa90e0b84..6f9f701b1b3 100644
--- a/addons/account_accountant/i18n/uk.po
+++ b/addons/account_accountant/i18n/uk.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 
diff --git a/addons/account_accountant/i18n/vi.po b/addons/account_accountant/i18n/vi.po
index e24850f558c..2af1a44a892 100644
--- a/addons/account_accountant/i18n/vi.po
+++ b/addons/account_accountant/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "Kế toán viên"
diff --git a/addons/account_accountant/i18n/zh_CN.po b/addons/account_accountant/i18n/zh_CN.po
index 4561c598cbd..fde57adaf15 100644
--- a/addons/account_accountant/i18n/zh_CN.po
+++ b/addons/account_accountant/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "会计人员管理"
diff --git a/addons/account_accountant/i18n/zh_TW.po b/addons/account_accountant/i18n/zh_TW.po
index f304c0a0799..5f72e0334ff 100644
--- a/addons/account_accountant/i18n/zh_TW.po
+++ b/addons/account_accountant/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Accountant"
 #~ msgstr "會計師"
diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py
index e0bec840467..7675ef9f38e 100644
--- a/addons/account_analytic_analysis/__openerp__.py
+++ b/addons/account_analytic_analysis/__openerp__.py
@@ -28,25 +28,25 @@
 This module is for modifying account analytic view to show important data to project manager of services companies.
 ===================================================================================================================
 
-Adds menu to show relevant information to each manager.
-You can also view the report of account analytic summary
-user-wise as well as month-wise.
+Adds menu to show relevant information to each manager.You can also view the report of account analytic summary user-wise as well as month-wise.
 """,
-    "author": "Camptocamp",
-    "website": "http://www.camptocamp.com/",
-    "images": ["images/bill_tasks_works.jpeg","images/overpassed_accounts.jpeg"],
-    "depends": ["hr_timesheet_invoice", "sale"], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application
-    "init_xml": [],
-    "update_xml": [
-                    "security/ir.model.access.csv",
-                    "account_analytic_analysis_view.xml",
-                    "account_analytic_analysis_menu.xml",
-                    "account_analytic_analysis_cron.xml",
-                    ],
-    'demo_xml': [],
+    'author': 'Camptocamp',
+    'website': 'http://www.camptocamp.com/',
+    'images': ['images/bill_tasks_works.jpeg','images/overpassed_accounts.jpeg'],
+    'depends': ['hr_timesheet_invoice', 'sale'], #although sale is technically not required to install this module, all menuitems are located under 'Sales' application
+    'data': [
+        'security/ir.model.access.csv',
+        'security/account_analytic_analysis_security.xml',
+        'account_analytic_analysis_view.xml',
+        'account_analytic_analysis_menu.xml',
+        'account_analytic_analysis_cron.xml',
+    ],
+    'css': [
+        'static/src/css/analytic.css'
+    ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0042927202589',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index c84b311f307..0fffde30719 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -74,36 +74,18 @@ class account_analytic_account(osv.osv):
                 for id in ids:
                     res[id][f] = 0.0
                 res2 = {}
-                if parent_ids:
-                    # Amount uninvoiced hours to invoice at sale price
-                    # Warning
-                    # This computation doesn't take care of pricelist !
-                    # Just consider list_price
-                    cr.execute("""SELECT account_analytic_account.id, \
-                                COALESCE(SUM (product_template.list_price * \
-                                    account_analytic_line.unit_amount * \
-                                    ((100-hr_timesheet_invoice_factor.factor)/100)), 0.0) \
-                                    AS ca_to_invoice \
-                            FROM product_template \
-                            JOIN product_product \
-                                ON product_template.id = product_product.product_tmpl_id \
-                            JOIN account_analytic_line \
-                                ON account_analytic_line.product_id = product_product.id \
-                            JOIN account_analytic_journal \
-                                ON account_analytic_line.journal_id = account_analytic_journal.id \
-                            JOIN account_analytic_account \
-                                ON account_analytic_account.id = account_analytic_line.account_id \
-                            JOIN hr_timesheet_invoice_factor \
-                                ON hr_timesheet_invoice_factor.id = account_analytic_account.to_invoice \
-                            WHERE account_analytic_account.id IN %s \
-                                AND account_analytic_line.invoice_id IS NULL \
-                                AND account_analytic_line.to_invoice IS NOT NULL \
-                                AND account_analytic_journal.type = 'general' \
-                            GROUP BY account_analytic_account.id;""", (parent_ids,))
-                    for account_id, sum in cr.fetchall():
-                        if account_id not in res:
-                            res[account_id] = {}
-                        res[account_id][f] = round(sum, dp)
+                for account in accounts:
+                    cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id, name " \
+                            "FROM account_analytic_line as line " \
+                            "WHERE account_id = %s " \
+                                "AND invoice_id is NULL AND to_invoice IS NOT NULL " \
+                            "GROUP BY product_id, user_id, to_invoice, product_uom_id, name", (account.id,))
+
+                    res[account.id][f] = 0.0
+                    for product_id, user_id, factor_id, qty, uom, line_name in cr.fetchall():
+                        price = self.pool.get('account.analytic.line')._get_invoice_price(cr, uid, account, product_id, user_id, qty, context)
+                        factor = self.pool.get('hr_timesheet_invoice.factor').browse(cr, uid, factor_id, context=context)
+                        res[account.id][f] += price * qty * (100-factor.factor or 0.0) / 100.0
 
                 # sum both result on account_id
                 for id in ids:
@@ -451,8 +433,8 @@ class account_analytic_account(osv.osv):
         'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)',
             help="Computes using the formula: (Real Margin / Total Costs) * 100.",
             digits_compute=dp.get_precision('Account')),
-        'fix_price_invoices' : fields.boolean('Fix Price Invoices'),
-        'invoice_on_timesheets' : fields.boolean("Invoice On Timesheets"),
+        'fix_price_invoices' : fields.boolean('Fixed Price'),
+        'invoice_on_timesheets' : fields.boolean("On Timesheets"),
         'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'),
         'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'),
         'hours_qtt_est': fields.float('Estimation of Hours to Invoice'),
@@ -465,7 +447,7 @@ class account_analytic_account(osv.osv):
     def open_sale_order_lines(self,cr,uid,ids,context=None):
         if context is None:
             context = {}
-        sale_ids = self.pool.get('sale.order').search(cr,uid,[('project_id','=',context.get('search_default_project_id',False)),('partner_id','=',context.get('search_default_partner_id',False))])
+        sale_ids = self.pool.get('sale.order').search(cr,uid,[('project_id','=',context.get('search_default_project_id',False)),('partner_id','in',context.get('search_default_partner_id',False))])
         names = [record.name for record in self.browse(cr, uid, ids, context=context)]
         name = _('Sale Order Lines of %s') % ','.join(names)
         return {
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 9e5be21cf70..9eb8fe90895 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -3,13 +3,21 @@
         <menuitem id="base.menu_invoiced" name="Invoicing" parent="base.menu_base_partner" sequence="5"/>
 
         <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">
-            <field name="name">Time &amp; Costs to Invoice</field>
+            <field name="name">Time &amp; Materials to Invoice</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('invoice_id','=',False)]</field>
             <field name="context">{'search_default_to_invoice': 1}</field>
             <field name="search_view_id" ref="account.view_account_analytic_line_filter"/>
+            <field name="help" type="html">
+              <p>
+                You will find here timesheets and purchases you did for
+                contracts that can be reinvoiced to the customer.  If you want
+                to record new activities to invoice, you should use the timesheet
+                menu instead.
+              </p>
+            </field>
         </record>
         <menuitem action="action_hr_tree_invoiced_all" id="menu_action_hr_tree_invoiced_all" parent="base.menu_invoiced" sequence="5"/>
 
@@ -48,7 +56,7 @@
             <field name="name">Contracts to Renew</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_user_id':uid, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1, 'search_default_renew':1}</field>
             <field name="domain">[('type','=','contract')]</field>
             <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
@@ -72,10 +80,19 @@
             <field name="name">Contracts</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
-            <field name="context">{'default_type':'contract'}</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'default_type':'contract', 'search_default_open':1, 'search_default_pending':1}</field>
             <field name="domain">[('type','=','contract')]</field>
             <field name="search_view_id" ref="view_account_analytic_account_overdue_search"/>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click to create a new contract.
+                </p><p>
+                    Use contracts to follow tasks, issues, timesheets or invoicing based on
+                    work done, expenses and/or sales orders. OpenERP will automatically manage
+                    the alerts for the renewal of the contracts to the right salesperson.
+                </p>
+            </field>
         </record>
         <menuitem id="base.menu_sales" name="Sales"
             parent="base.menu_base_partner"
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index cd043749309..fd32edba0a1 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -6,12 +6,11 @@
         Analytic Account form
         -->
 
-        <act_window
-            id="action_sales_order"
-            name="Sales Orders"
-            res_model="sale.order"
-            src_model="account.analytic.account"
-        />
+        <record model="ir.actions.act_window" id="action_sales_order">
+            <field name="name">Sales Orders</field>
+            <field name="res_model">sale.order</field>
+            <field name="src_model">account.analytic.account</field>
+        </record>
 
         <record id="account_analytic_account_form_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form.inherit</field>
@@ -22,30 +21,27 @@
                 <xpath expr='//div[@name="duration"]' position="after" version="7.0">
                     <label for="quantity_max"/>
                     <div>
-                        <field name="quantity_max" class="oe_inline"/> / Remaining: <field name="remaining_hours" class="oe_inline"/> 
+                        <field name="quantity_max" class="oe_inline"/>
                     </div>
                 </xpath>
                 <xpath expr='//group[@name="invoice_on_timesheets"]' position="replace">
-                    <group name='invoice_on_timesheets' string="Invoice on Timesheets Options" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" col="4">
-                        <field name="pricelist_id" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
-                        <field name="to_invoice" widget="selection" attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
-                    </group>
                 </xpath>
-                <xpath expr='//group[@name="master"]' position='after'>
+                <xpath expr='//separator[@name="description"]' position='before'>
                     <separator name="toinvoice" string="Invoicing"/>
-                    <table width="100%%">
+                    <table class="oe_form_analytic_account">
                         <tr>
-                            <th></th>
-                            <th></th>
-                            <th><label string="Est.Tot"/></th>
-                            <th><label string="Invoiced"/></th>
-                            <th><label string="Remaining"/></th>
-                            <th><label string="To Invoice"/></th>
+                            <th class="oe_timesheet_grey" width="160px"></th>
+                            <th class="oe_timesheet_grey" width="25px"></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="Expected"/></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="Invoiced"/></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="Remaining"/></th>
+                            <th class="oe_timesheet_grey" width="100px"><label string="To Invoice"/></th>
+                            <th width="30px"></th>
                             <th></th>
                         </tr><tr>
-                            <td>
+                            <td class="oe_timesheet_grey">
                                 <label for="fix_price_invoices"/>
-                            </td><td>
+                            </td><td class="oe_timesheet_grey">
                                 <field name="fix_price_invoices" class="oe_inline"/>
                             </td><td>
                                 <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
@@ -55,14 +51,28 @@
                                 <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
                             </td><td>
                                 <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <button name="%(action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                                <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
+                            </td><td attrs="{'invisible': [('fix_price_invoices','=',False)]}" class="oe_timesheet_action">
+                                <span attrs="{'invisible': [('fix_price_to_invoice','=',0.0)]}" class="oe_grey">
+                                    <button name="open_sale_order_lines"
+                                        class="oe_link"
+                                        string="⇒ Invoice" type="object"
+                                        context="{'default_partner_id': [partner_id],'default_project_id': active_id,'search_default_uninvoiced': 1,'search_default_project_id': active_id,'search_default_partner_id': [partner_id]}"/>
+                                    or view
+                                </span>
+
+                                <span attrs="{'invisible': [('fix_price_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
+                                    No order to invoice, create
+                                </span>
+                                <button name="%(action_sales_order)d" string="Sale Orders"
+                                    type="action"
+                                    class="oe_link"
+                                    context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id],'search_default_project_id': [active_id],'default_project_id': [active_id]}"
+                                    />
                             </td>
-                        </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
-                            <td>
+                        </tr><tr>
+                            <td class="oe_timesheet_grey">
                                 <label for="invoice_on_timesheets"/>
-                            </td><td>
+                            </td><td class="oe_timesheet_grey">
                                 <field name="invoice_on_timesheets"/>
                             </td><td>
                                 <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
@@ -72,26 +82,56 @@
                                 <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
                             </td><td>
                                 <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
-                                <button name="%(hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice)d" string="Timesheets to Invoice" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
+                            </td><td class="oe_timesheet_action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                                <span attrs="{'invisible': [('ca_to_invoice','=',0.0)]}" class="oe_grey">
+                                    <button name="%(hr_timesheet_invoice.action_hr_timesheet_invoice_create_final)d"
+                                        type="action"
+                                        class="oe_link"
+                                        string="⇒ Invoice"/>
+                                    or view 
+                                </span>
+                                <span attrs="{'invisible': [('ca_to_invoice','&lt;&gt;',0.0)]}" class="oe_grey">
+                                    Nothing to invoice, create 
+                                </span>
+
+                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d"
+                                    string="Timesheets" type="action"
+                                    class="oe_link"
+                                    context="{'default_account_id': active_id,'search_default_account_id': active_id}"/>
                             </td>
                         </tr><tr name='total'>
-                            <th>
+                            <th class="oe_timesheet_grey">
                                 <label string="Total"/>
-                            </th><td>
-                            </td><td>
+                            </th><td class="oe_timesheet_grey">
+                            </td><td class="oe_timesheet_grey">
                                 <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
+                            </td><td class="oe_timesheet_grey">
                                 <field name="invoiced_total" class="oe_inline"/>
-                            </td><td>
+                            </td><td class="oe_timesheet_grey">
                                 <field name="remaining_total" class="oe_inline"/>
-                            </td><td>
+                            </td><td class="oe_timesheet_grey">
                                 <field name="toinvoice_total" class="oe_inline"/>
                             </td><td>
                             </td>
                         </tr>
                     </table>
+                    <group name='invoice_on_timesheets' attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                        <p class="oe_grey oe_edit_only" colspan="2">
+                            When invoicing on timesheet, OpenERP uses the
+                            pricelist of the contract which uses the price
+                            defined on the product related to each employee to
+                            define the customer invoice price rate.
+                        </p>
+                        <group>
+                            <field name="pricelist_id"
+                                class="oe_inline"
+                                attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                            <field name="to_invoice"
+                                class="oe_inline"
+                                widget="selection"
+                                attrs="{'required': [('invoice_on_timesheets', '=', True)]}"/>
+                        </group>
+                    </group>
                  </xpath>
             </field>
         </record>
@@ -116,6 +156,16 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('type','=','template')]</field>
             <field name="context">{'search_default_type':'template','default_type' : 'template'}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click here to create a template of contract.
+                </p><p>
+                    Templates are used to prefigure contract/project that 
+                    can be selected by the salespeople to quickly configure the
+                    terms and conditions of the contract.
+                </p>
+            </field>
+             
         </record>
         <menuitem action="template_of_contract_action" id="menu_template_of_contract_action" parent="base.menu_base_config"/>
     </data>
diff --git a/addons/account_analytic_analysis/i18n/ar.po b/addons/account_analytic_analysis/i18n/ar.po
index 740d5f8ede4..3d1900a919b 100644
--- a/addons/account_analytic_analysis/i18n/ar.po
+++ b/addons/account_analytic_analysis/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po
index a213c766584..eef6e8333c2 100644
--- a/addons/account_analytic_analysis/i18n/bg.po
+++ b/addons/account_analytic_analysis/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/bs.po b/addons/account_analytic_analysis/i18n/bs.po
index 2cc4d488965..1874d93ca2c 100644
--- a/addons/account_analytic_analysis/i18n/bs.po
+++ b/addons/account_analytic_analysis/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/ca.po b/addons/account_analytic_analysis/i18n/ca.po
index 1b0281506fd..79b308a09d4 100644
--- a/addons/account_analytic_analysis/i18n/ca.po
+++ b/addons/account_analytic_analysis/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/cs.po b/addons/account_analytic_analysis/i18n/cs.po
index f8e54e2b70f..bcee76286d6 100644
--- a/addons/account_analytic_analysis/i18n/cs.po
+++ b/addons/account_analytic_analysis/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/da.po b/addons/account_analytic_analysis/i18n/da.po
index 8ba1cbef74b..9a5da18a9c2 100644
--- a/addons/account_analytic_analysis/i18n/da.po
+++ b/addons/account_analytic_analysis/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index 734c7d2409e..31039099924 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/el.po b/addons/account_analytic_analysis/i18n/el.po
index 3b6c447fc73..cfa892608a2 100644
--- a/addons/account_analytic_analysis/i18n/el.po
+++ b/addons/account_analytic_analysis/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/en_GB.po b/addons/account_analytic_analysis/i18n/en_GB.po
index bb41e5bca07..fa10b7c6e71 100644
--- a/addons/account_analytic_analysis/i18n/en_GB.po
+++ b/addons/account_analytic_analysis/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po
index f5a8a7b3ddd..3a60353b480 100644
--- a/addons/account_analytic_analysis/i18n/es.po
+++ b/addons/account_analytic_analysis/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/es_AR.po b/addons/account_analytic_analysis/i18n/es_AR.po
index 7069d4fb8b9..f04c8d1e6e1 100644
--- a/addons/account_analytic_analysis/i18n/es_AR.po
+++ b/addons/account_analytic_analysis/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/es_CR.po b/addons/account_analytic_analysis/i18n/es_CR.po
index ccf33604b95..481c9efd7ef 100644
--- a/addons/account_analytic_analysis/i18n/es_CR.po
+++ b/addons/account_analytic_analysis/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/es_EC.po b/addons/account_analytic_analysis/i18n/es_EC.po
index e94bdf72af4..2730b8650d2 100644
--- a/addons/account_analytic_analysis/i18n/es_EC.po
+++ b/addons/account_analytic_analysis/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/es_PY.po b/addons/account_analytic_analysis/i18n/es_PY.po
index 0734052feb2..8c70133c1c4 100644
--- a/addons/account_analytic_analysis/i18n/es_PY.po
+++ b/addons/account_analytic_analysis/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/et.po b/addons/account_analytic_analysis/i18n/et.po
index 8a4585b58d5..195802ba9bf 100644
--- a/addons/account_analytic_analysis/i18n/et.po
+++ b/addons/account_analytic_analysis/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/fa.po b/addons/account_analytic_analysis/i18n/fa.po
index f2a8daec85a..50445852827 100644
--- a/addons/account_analytic_analysis/i18n/fa.po
+++ b/addons/account_analytic_analysis/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po
index a424186f3c9..c86692174eb 100644
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/fr.po b/addons/account_analytic_analysis/i18n/fr.po
index e59b85cd6bc..e9e950a3620 100644
--- a/addons/account_analytic_analysis/i18n/fr.po
+++ b/addons/account_analytic_analysis/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/gl.po b/addons/account_analytic_analysis/i18n/gl.po
index 2569860e3fb..18d6778c41c 100644
--- a/addons/account_analytic_analysis/i18n/gl.po
+++ b/addons/account_analytic_analysis/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/gu.po b/addons/account_analytic_analysis/i18n/gu.po
index 212a48dd001..2c1f5f15805 100644
--- a/addons/account_analytic_analysis/i18n/gu.po
+++ b/addons/account_analytic_analysis/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/hr.po b/addons/account_analytic_analysis/i18n/hr.po
index 57f925bb0ae..55e03be2645 100644
--- a/addons/account_analytic_analysis/i18n/hr.po
+++ b/addons/account_analytic_analysis/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/hu.po b/addons/account_analytic_analysis/i18n/hu.po
index 540510fdad5..edba04e72a8 100644
--- a/addons/account_analytic_analysis/i18n/hu.po
+++ b/addons/account_analytic_analysis/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/id.po b/addons/account_analytic_analysis/i18n/id.po
index 3793439a6f5..619de804336 100644
--- a/addons/account_analytic_analysis/i18n/id.po
+++ b/addons/account_analytic_analysis/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/it.po b/addons/account_analytic_analysis/i18n/it.po
index c71ad83d9c7..c16a57dee94 100644
--- a/addons/account_analytic_analysis/i18n/it.po
+++ b/addons/account_analytic_analysis/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-17 04:38+0000\n"
-"X-Generator: Launchpad (build 15810)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/ja.po b/addons/account_analytic_analysis/i18n/ja.po
index 0717c254d76..4abd07b0d68 100644
--- a/addons/account_analytic_analysis/i18n/ja.po
+++ b/addons/account_analytic_analysis/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/ko.po b/addons/account_analytic_analysis/i18n/ko.po
index faf5ae7b8d9..e7417dffef8 100644
--- a/addons/account_analytic_analysis/i18n/ko.po
+++ b/addons/account_analytic_analysis/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po
index 916436f53ba..297daa8f75b 100644
--- a/addons/account_analytic_analysis/i18n/lt.po
+++ b/addons/account_analytic_analysis/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/lv.po b/addons/account_analytic_analysis/i18n/lv.po
index e7ab9f18f3d..9cc8f1e003c 100644
--- a/addons/account_analytic_analysis/i18n/lv.po
+++ b/addons/account_analytic_analysis/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/mk.po b/addons/account_analytic_analysis/i18n/mk.po
index 08e4b31724a..f38b65e6f78 100644
--- a/addons/account_analytic_analysis/i18n/mk.po
+++ b/addons/account_analytic_analysis/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/mn.po b/addons/account_analytic_analysis/i18n/mn.po
index 422f50d7512..36b925484b6 100644
--- a/addons/account_analytic_analysis/i18n/mn.po
+++ b/addons/account_analytic_analysis/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/nb.po b/addons/account_analytic_analysis/i18n/nb.po
index 5d31ae76b14..2a9a9a47787 100644
--- a/addons/account_analytic_analysis/i18n/nb.po
+++ b/addons/account_analytic_analysis/i18n/nb.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Time (real)"
-msgstr ""
+msgstr "Omsetning per Tid (ekte)"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
@@ -38,11 +38,13 @@ msgid ""
 "The contracts to be renewed because the deadline is passed or the working "
 "hours are higher than the allocated hours"
 msgstr ""
+"Kontraktene som skal fornyes, fordi fristen er passert eller arbeidstiden er "
+"høyere enn de tildelte timene"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending contracts to renew with your customer"
-msgstr ""
+msgstr "Ventende kontrakter til å fornye med dine kunder"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -50,26 +52,28 @@ msgid ""
 "Number of time (hours/days) (from journal of type 'general') that can be "
 "invoiced if you invoice based on analytic account."
 msgstr ""
+"Antall tid (timer / dager) (fra tidsskrift av typen generell') som kan "
+"faktureres dersom du faktura basert på analytiske konto."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Analytic Accounts with a past deadline in one month."
-msgstr ""
+msgstr "Analytiske Kontoer med en fortid frist på én måned."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupper etter ..."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "End Date"
-msgstr ""
+msgstr "Sluttdato"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Lag faktura"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -87,16 +91,18 @@ msgid ""
 "Number of time you spent on the analytic account (from timesheet). It "
 "computes quantities on all journal of type 'general'."
 msgstr ""
+"Antall tid du brukte på den analytiske konto (fra timeliste). Det beregner "
+"mengder på alle tidsskrift av typen 'slekter"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts in progress"
-msgstr ""
+msgstr "Kontrakter i fremgang"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,is_overdue_quantity:0
 msgid "Overdue Quantity"
-msgstr ""
+msgstr "Forfalt Antall"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
@@ -108,6 +114,11 @@ msgid ""
 "pending accounts and reopen or close the according to the negotiation with "
 "the customer."
 msgstr ""
+"Du vil finne kontraktene som skal fornyes fordi fristen er passert eller "
+"arbeidstiden er høyere enn de tildelte timene. OpenERP setter automatisk "
+"disse analytiske kontoer til den ventende tilstand, for å heve en advarsel "
+"under timelister opptaket. Selgere bør gjennomgå alle ventende kontoer og "
+"åpne eller lukke henhold til forhandlinger med kunden."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -117,7 +128,7 @@ msgstr "Teoretisk omsetning"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Time"
-msgstr ""
+msgstr "fakturerte Tid"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_invoiced_date:0
@@ -131,7 +142,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Renew"
-msgstr ""
+msgstr "Å fornye"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -141,24 +152,25 @@ msgstr "Dato for siste kostnad/arbeid"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Time"
-msgstr ""
+msgstr "Fakturert tid"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid ""
 "A contract in OpenERP is an analytic account having a partner set on it."
 msgstr ""
+"En kontrakt i OpenERP er et analytisk konto med en partner sett på den."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Gjenstående tid"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "Kontrakter til å fornye"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
@@ -168,7 +180,7 @@ msgstr "Teoretisk margin"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid " +1 Month"
-msgstr ""
+msgstr " +1 Måned"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -184,7 +196,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr ""
+msgstr "Venter"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
@@ -199,7 +211,7 @@ msgstr "Beregnet med formelen: Fakturert beløp - totalkostnader"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
-msgstr ""
+msgstr "Overordnet"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -230,7 +242,7 @@ msgstr "Dato for siste fakturerte kostnad"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contract"
-msgstr ""
+msgstr "Kontrakt"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
@@ -265,7 +277,7 @@ msgstr "Gjenstående inntekt"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Time - Total Time"
-msgstr ""
+msgstr "Beregnet ved hjelp av formelen: Maksimal tid - Total tid"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -273,6 +285,8 @@ msgid ""
 "Number of time (hours/days) that can be invoiced plus those that already "
 "have been invoiced."
 msgstr ""
+"Antall (timer / dager) som kan faktureres pluss de som allerede har blitt "
+"fakturert."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_to_invoice:0
@@ -286,7 +300,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
-msgstr ""
+msgstr "Beregnet ved hjelp av formelen: Fakturert beløp / Total tid"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -311,12 +325,12 @@ msgstr "Analytisk konto"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue_all
 msgid "Contracts"
-msgstr ""
+msgstr "Kontrakter"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Manager"
-msgstr ""
+msgstr "Manager"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
@@ -328,21 +342,22 @@ msgstr "Alle ufakturerte oppføringer"
 #: help:account.analytic.account,last_invoice_date:0
 msgid "If invoice from the costs, this is the date of the latest invoiced."
 msgstr ""
+"Hvis faktura fra kostnadene, er dette tidspunktet for den senest fakturerte."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Samarbeidspartner"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Open"
-msgstr ""
+msgstr "Åpen"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts that are not assigned to an account manager."
-msgstr ""
+msgstr "Kontrakter som ikke er tilordnet til en konto manager."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
diff --git a/addons/account_analytic_analysis/i18n/nl.po b/addons/account_analytic_analysis/i18n/nl.po
index 41cd7577dae..991bcfe6f9f 100644
--- a/addons/account_analytic_analysis/i18n/nl.po
+++ b/addons/account_analytic_analysis/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-02-08 09:34+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/nl_BE.po b/addons/account_analytic_analysis/i18n/nl_BE.po
index 78ccf4f7b73..db9eab0db76 100644
--- a/addons/account_analytic_analysis/i18n/nl_BE.po
+++ b/addons/account_analytic_analysis/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/oc.po b/addons/account_analytic_analysis/i18n/oc.po
index 7a559c97a49..c56548c1255 100644
--- a/addons/account_analytic_analysis/i18n/oc.po
+++ b/addons/account_analytic_analysis/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/pl.po b/addons/account_analytic_analysis/i18n/pl.po
index 3749a4bf4a8..ffdd8d772a4 100644
--- a/addons/account_analytic_analysis/i18n/pl.po
+++ b/addons/account_analytic_analysis/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/pt.po b/addons/account_analytic_analysis/i18n/pt.po
index 2698d90410f..4d9be0dc0d1 100644
--- a/addons/account_analytic_analysis/i18n/pt.po
+++ b/addons/account_analytic_analysis/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/pt_BR.po b/addons/account_analytic_analysis/i18n/pt_BR.po
index 7ad7dc9a04e..aa2df49d0c9 100644
--- a/addons/account_analytic_analysis/i18n/pt_BR.po
+++ b/addons/account_analytic_analysis/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
@@ -72,7 +72,7 @@ msgstr "Data Final"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Create Invoice"
-msgstr "Criar Nota Fiscal"
+msgstr "Criar Fatura"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -153,7 +153,7 @@ msgstr "Data da Ultima Despesa/Atividade"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Time"
-msgstr "Hora do Faturamento"
+msgstr "Tempo Faturado"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -213,7 +213,7 @@ msgstr "Calculado através da fórmula: Valor faturado - Custos Totais."
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
-msgstr "Pai"
+msgstr "Superior (Conta-pai)"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
diff --git a/addons/account_analytic_analysis/i18n/ro.po b/addons/account_analytic_analysis/i18n/ro.po
index 32ca1857539..49c2c394623 100644
--- a/addons/account_analytic_analysis/i18n/ro.po
+++ b/addons/account_analytic_analysis/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po
index 5303f4b0448..1a3e065ecfb 100644
--- a/addons/account_analytic_analysis/i18n/ru.po
+++ b/addons/account_analytic_analysis/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/sl.po b/addons/account_analytic_analysis/i18n/sl.po
index 1bf86b75a84..9a6c64bfca8 100644
--- a/addons/account_analytic_analysis/i18n/sl.po
+++ b/addons/account_analytic_analysis/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/sq.po b/addons/account_analytic_analysis/i18n/sq.po
index 8d58b51f016..30ba1c3cfb9 100644
--- a/addons/account_analytic_analysis/i18n/sq.po
+++ b/addons/account_analytic_analysis/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/sr.po b/addons/account_analytic_analysis/i18n/sr.po
index 68c33736dfc..4ca3424b935 100644
--- a/addons/account_analytic_analysis/i18n/sr.po
+++ b/addons/account_analytic_analysis/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/sr@latin.po b/addons/account_analytic_analysis/i18n/sr@latin.po
index 83f976f32e4..562c5b42809 100644
--- a/addons/account_analytic_analysis/i18n/sr@latin.po
+++ b/addons/account_analytic_analysis/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/sv.po b/addons/account_analytic_analysis/i18n/sv.po
index 45ed8ae67fd..14eacda1425 100644
--- a/addons/account_analytic_analysis/i18n/sv.po
+++ b/addons/account_analytic_analysis/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/tlh.po b/addons/account_analytic_analysis/i18n/tlh.po
index 8d403a7bb8c..9039975fb2f 100644
--- a/addons/account_analytic_analysis/i18n/tlh.po
+++ b/addons/account_analytic_analysis/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index 644cad27dd7..944c4559bf4 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/uk.po b/addons/account_analytic_analysis/i18n/uk.po
index 4cfba6eddf2..860b3e1b5a8 100644
--- a/addons/account_analytic_analysis/i18n/uk.po
+++ b/addons/account_analytic_analysis/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/vi.po b/addons/account_analytic_analysis/i18n/vi.po
index b9d12dde4ec..124c9a526f0 100644
--- a/addons/account_analytic_analysis/i18n/vi.po
+++ b/addons/account_analytic_analysis/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/zh_CN.po b/addons/account_analytic_analysis/i18n/zh_CN.po
index 2cf07ab0d43..d2ba2620a03 100644
--- a/addons/account_analytic_analysis/i18n/zh_CN.po
+++ b/addons/account_analytic_analysis/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
diff --git a/addons/account_analytic_analysis/i18n/zh_TW.po b/addons/account_analytic_analysis/i18n/zh_TW.po
index a98e5b58f96..7db4e147d2c 100644
--- a/addons/account_analytic_analysis/i18n/zh_TW.po
+++ b/addons/account_analytic_analysis/i18n/zh_TW.po
@@ -7,95 +7,95 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-09-08 14:56+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-08-18 10:55+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:14+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0
 msgid "Revenue per Time (real)"
-msgstr ""
+msgstr "每小時收入（實際）"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
-msgstr "使用以下公式計算: 最大發票價格-已開發票總計"
+msgstr "計算公式為:最大發票價格- 已開票金額"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
 msgid "Date of the latest work done on this account."
-msgstr ""
+msgstr "這項目的最近的工作完成日期"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid ""
 "The contracts to be renewed because the deadline is passed or the working "
 "hours are higher than the allocated hours"
-msgstr ""
+msgstr "合約需要續簽，因為最後期限已過，或者實際工時超過了計劃工時。"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending contracts to renew with your customer"
-msgstr ""
+msgstr "需要與客戶續簽的合約"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
 msgid ""
 "Number of time (hours/days) (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 with a past deadline in one month."
-msgstr ""
+msgstr "在一個月內到期的成本科目"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類分式..."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "End Date"
-msgstr ""
+msgstr "截止日期"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Create Invoice"
-msgstr ""
+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,theorical_margin:0
 msgid "Computed using the formula: Theorial Revenue - Total Costs"
-msgstr ""
+msgstr "計算公式：理論收入 - 總費用"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_quantity:0
 msgid ""
 "Number of time you spent on the analytic account (from timesheet). It "
 "computes quantities on all journal of type 'general'."
-msgstr ""
+msgstr "你在這個成本科目上花費的時間總數（數據來自工時表）。僅計算類型為“普通”的憑證簿。"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts in progress"
-msgstr ""
+msgstr "正在執行的合約"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,is_overdue_quantity:0
 msgid "Overdue Quantity"
-msgstr ""
+msgstr "超期數量"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
@@ -107,65 +107,67 @@ msgid ""
 "pending accounts and reopen or close the according to the negotiation with "
 "the customer."
 msgstr ""
+"這裡列出需要續簽的合約，原因可能是最後期限已過或者實際工數超出了合同規定的工數。OpenERP自動把這些成本科目設置為“待處理”狀態，目的是在輸入工時表的"
+"時候給出一個警告。銷售員應該查看所有待處理的成本科目並與客戶協商後重新打開或關閉它。"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
 msgid "Theoretical Revenue"
-msgstr "理論營業額"
+msgstr "理論收入"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Time"
-msgstr ""
+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."
-msgstr ""
+msgstr "如果發票來自費用, 這是最近工作日期或已開立發票的費用"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Renew"
-msgstr ""
+msgstr "要續簽的"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
 msgid "Date of Last Cost/Work"
-msgstr ""
+msgstr "最近日期的工作成本"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Time"
-msgstr ""
+msgstr "已開立發票的工時"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid ""
 "A contract in OpenERP is an analytic account having a partner set on it."
-msgstr ""
+msgstr "OpenERP中的合約是指一個被指定了業務夥伴的成本科目。"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "剩餘時間"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "要續簽的合約"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
 msgid "Theoretical Margin"
-msgstr ""
+msgstr "理論的差額"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid " +1 Month"
-msgstr ""
+msgstr " 下個月"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -173,27 +175,27 @@ 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 ""
+msgstr "如果所有成本按正常的銷售價格開票那這項目的成本基於未來的收入."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr ""
+msgstr "等待中"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
 msgid "Uninvoiced Amount"
-msgstr ""
+msgstr "未開票金額"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr ""
+msgstr "計算公式為:發票金額 - 總成本"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
-msgstr ""
+msgstr "上層"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -204,81 +206,81 @@ msgstr "使用者"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin_rate:0
 msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
-msgstr ""
+msgstr "計算公式為:(實際利潤/總成本×100)"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
 msgid "Hours Summary by User"
-msgstr ""
+msgstr "按使用者匯總時間"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
-msgstr ""
+msgstr "已開立發票金額"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr ""
+msgstr "最近的已開立發票日期"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contract"
-msgstr ""
+msgstr "合約"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
-msgstr ""
+msgstr "實際利潤(%)"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
 msgid "Real Margin"
-msgstr ""
+msgstr "實際利潤"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
-msgstr ""
+msgstr "這科目的客戶發票合計"
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
 msgid "Hours summary by month"
-msgstr ""
+msgstr "月的小時數合計"
 
 #. module: account_analytic_analysis
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "錯誤! 你不能建立遞歸的輔助核算項目"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
 msgid "Remaining Revenue"
-msgstr ""
+msgstr "剩餘的收入"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Time - Total Time"
-msgstr ""
+msgstr "計算公式：最大時數 - 總時數"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
 msgid ""
 "Number of time (hours/days) that can be invoiced plus those that already "
 "have been invoiced."
-msgstr ""
+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."
-msgstr ""
+msgstr "如果是輔助核算項目的發票, 剩餘金額你能給客戶開基於總成本的發票"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
-msgstr ""
+msgstr "計算公式：已開票金額/ 總時數"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -297,58 +299,58 @@ msgstr "月"
 #: field:account_analytic_analysis.summary.user,account_id:0
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "輔助核算項"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue_all
 msgid "Contracts"
-msgstr ""
+msgstr "合約"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Manager"
-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,last_invoice_date:0
 msgid "If invoice from the costs, this is the date of the latest invoiced."
-msgstr ""
+msgstr "如按實際成本開票，這是最末開票日期"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "相關業務夥伴"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Open"
-msgstr ""
+msgstr "使用中"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts that are not assigned to an account manager."
-msgstr ""
+msgstr "沒有指定帳戶管理的合約"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 #: field:account_analytic_analysis.summary.month,unit_amount:0
 #: field:account_analytic_analysis.summary.user,unit_amount:0
 msgid "Total Time"
-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 "這項的成本合計,它包括實際成本(發票)和間接成本,如花費的時間表"
 
 #~ msgid "Computed using the formula: Maximum Quantity - Hours Tot."
 #~ msgstr "使用以下公式計算: 最大數量 - 總時間(小時)"
diff --git a/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml b/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
new file mode 100644
index 00000000000..8bcc7f2d7f0
--- /dev/null
+++ b/addons/account_analytic_analysis/security/account_analytic_analysis_security.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+    <record model="res.users" id="base.user_root">
+        <field eval="[(4,ref('sale.group_analytic_accounting'))]" name="groups_id"/>
+    </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/account_analytic_analysis/static/src/css/Makefile b/addons/account_analytic_analysis/static/src/css/Makefile
new file mode 100644
index 00000000000..21462c06dcc
--- /dev/null
+++ b/addons/account_analytic_analysis/static/src/css/Makefile
@@ -0,0 +1,3 @@
+analytic.css: analytic.sass
+	sass -t expanded analytic.sass analytic.css
+
diff --git a/addons/account_analytic_analysis/static/src/css/analytic.css b/addons/account_analytic_analysis/static/src/css/analytic.css
new file mode 100644
index 00000000000..f3e4785de9f
--- /dev/null
+++ b/addons/account_analytic_analysis/static/src/css/analytic.css
@@ -0,0 +1,19 @@
+@charset "utf-8";
+.openerp .oe_form table.oe_form_analytic_account tr {
+  height: 28px;
+}
+.openerp .oe_form table.oe_form_analytic_account tr td, .openerp .oe_form table.oe_form_analytic_account tr th {
+  vertical-align: middle;
+}
+.openerp .oe_form table.oe_form_analytic_account tr td .oe_form_field_float, .openerp .oe_form table.oe_form_analytic_account tr th .oe_form_field_float {
+  float: right;
+  width: auto !important;
+}
+.openerp .oe_form table.oe_form_analytic_account tr td.oe_timesheet_action {
+  width: 250px;
+  padding-left: 7px;
+}
+.openerp .oe_form table.oe_form_analytic_account .oe_timesheet_grey {
+  background-color: #eeeeee;
+  color: #404040;
+}
diff --git a/addons/account_analytic_analysis/static/src/css/analytic.sass b/addons/account_analytic_analysis/static/src/css/analytic.sass
new file mode 100644
index 00000000000..a7065e00f18
--- /dev/null
+++ b/addons/account_analytic_analysis/static/src/css/analytic.sass
@@ -0,0 +1,18 @@
+@charset "utf-8"
+
+.openerp .oe_form
+    table.oe_form_analytic_account
+        tr
+            height: 28px
+            td,th
+                vertical-align: middle
+                .oe_form_field_float
+                    float: right
+                    width: auto !important
+            td.oe_timesheet_action
+                width: 250px
+                padding-left: 7px
+        .oe_timesheet_grey
+            background-color: #eeeeee
+            color: #404040
+        
diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py
index 5ec1fc66c73..0af606821ce 100644
--- a/addons/account_analytic_default/__openerp__.py
+++ b/addons/account_analytic_default/__openerp__.py
@@ -20,12 +20,12 @@
 ##############################################################################
 
 {
-    'name'      : 'Account Analytic Defaults',
-    'version'   : '1.0',
-    "category": 'Accounting & Finance',
+    'name': 'Account Analytic Defaults',
+    'version': '1.0',
+    'category': 'Accounting & Finance',
     'description': """
 Set default values for your analytic accounts.
-=============================================
+==============================================
 
 Allows to automatically select analytic accounts based on criterions:
 ---------------------------------------------------------------------
@@ -35,20 +35,18 @@ Allows to automatically select analytic accounts based on criterions:
     * Company
     * Date
     """,
-    'author'    : 'OpenERP SA',
-    'website'   : 'http://www.openerp.com',
-    'images'   : ['images/analytic_defaults.jpeg'],
-    'depends'   : ['sale'],
-    'init_xml'  : [],
-    'update_xml': [
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'images': ['images/analytic_defaults.jpeg'],
+    'depends': ['sale_stock'],
+    'data': [
         'security/ir.model.access.csv', 
         'security/account_analytic_default_security.xml', 
         'account_analytic_default_view.xml'
     ],
-    'demo_xml'  : [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0074229833581',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_default/i18n/ar.po b/addons/account_analytic_default/i18n/ar.po
index cbb0d991f5d..2e195a87632 100644
--- a/addons/account_analytic_default/i18n/ar.po
+++ b/addons/account_analytic_default/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/bg.po b/addons/account_analytic_default/i18n/bg.po
index bed7f93c408..0bfe0258029 100644
--- a/addons/account_analytic_default/i18n/bg.po
+++ b/addons/account_analytic_default/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/bs.po b/addons/account_analytic_default/i18n/bs.po
index 0ec1004acb4..ac1073284f3 100644
--- a/addons/account_analytic_default/i18n/bs.po
+++ b/addons/account_analytic_default/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/ca.po b/addons/account_analytic_default/i18n/ca.po
index 7a59aedd279..c7d1832ce4e 100644
--- a/addons/account_analytic_default/i18n/ca.po
+++ b/addons/account_analytic_default/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/cs.po b/addons/account_analytic_default/i18n/cs.po
index 300fd81ca47..80fd0e187b0 100644
--- a/addons/account_analytic_default/i18n/cs.po
+++ b/addons/account_analytic_default/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/da.po b/addons/account_analytic_default/i18n/da.po
index 34f0d395237..ed7e12cb130 100644
--- a/addons/account_analytic_default/i18n/da.po
+++ b/addons/account_analytic_default/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po
index ac36c7b96c3..c93d76ee2ad 100644
--- a/addons/account_analytic_default/i18n/de.po
+++ b/addons/account_analytic_default/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/el.po b/addons/account_analytic_default/i18n/el.po
index 4678413377c..59ce84dd622 100644
--- a/addons/account_analytic_default/i18n/el.po
+++ b/addons/account_analytic_default/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -124,7 +124,7 @@ msgstr "Προκαθορισμένη Αναλυτική"
 #. module: account_analytic_default
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Η αναφορά πρέπει να είναι μοναδική ανά Εταιρία"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -180,7 +180,7 @@ msgstr ""
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Γραμμή Παραγγελίας Πώλησης"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/account_analytic_default/i18n/es.po b/addons/account_analytic_default/i18n/es.po
index 1bc2980c771..6b45a4e66df 100644
--- a/addons/account_analytic_default/i18n/es.po
+++ b/addons/account_analytic_default/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/es_AR.po b/addons/account_analytic_default/i18n/es_AR.po
index 443454467b5..ddb401a0bb4 100644
--- a/addons/account_analytic_default/i18n/es_AR.po
+++ b/addons/account_analytic_default/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/es_CR.po b/addons/account_analytic_default/i18n/es_CR.po
index 7fca98d5cec..e46a0785b5f 100644
--- a/addons/account_analytic_default/i18n/es_CR.po
+++ b/addons/account_analytic_default/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/es_EC.po b/addons/account_analytic_default/i18n/es_EC.po
index 3f2ec8ceb24..2598109f6c8 100644
--- a/addons/account_analytic_default/i18n/es_EC.po
+++ b/addons/account_analytic_default/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/es_PY.po b/addons/account_analytic_default/i18n/es_PY.po
index 1d561b24f37..95c6475cdbc 100644
--- a/addons/account_analytic_default/i18n/es_PY.po
+++ b/addons/account_analytic_default/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/et.po b/addons/account_analytic_default/i18n/et.po
index 63ca6937609..6181674ed93 100644
--- a/addons/account_analytic_default/i18n/et.po
+++ b/addons/account_analytic_default/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/fa.po b/addons/account_analytic_default/i18n/fa.po
index 07759348276..e9617c6ed4a 100644
--- a/addons/account_analytic_default/i18n/fa.po
+++ b/addons/account_analytic_default/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/fi.po b/addons/account_analytic_default/i18n/fi.po
index e94cec3c9db..5be12200ec9 100644
--- a/addons/account_analytic_default/i18n/fi.po
+++ b/addons/account_analytic_default/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/fr.po b/addons/account_analytic_default/i18n/fr.po
index 3a9153eb912..cad19b285b6 100644
--- a/addons/account_analytic_default/i18n/fr.po
+++ b/addons/account_analytic_default/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/gl.po b/addons/account_analytic_default/i18n/gl.po
index 3169e64b82b..ea29d7a3124 100644
--- a/addons/account_analytic_default/i18n/gl.po
+++ b/addons/account_analytic_default/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/gu.po b/addons/account_analytic_default/i18n/gu.po
index 7d97395002f..cbf93ee2343 100644
--- a/addons/account_analytic_default/i18n/gu.po
+++ b/addons/account_analytic_default/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/hr.po b/addons/account_analytic_default/i18n/hr.po
index 576580899da..2ff917a5b42 100644
--- a/addons/account_analytic_default/i18n/hr.po
+++ b/addons/account_analytic_default/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/hu.po b/addons/account_analytic_default/i18n/hu.po
index eddd988d95d..564e7129f78 100644
--- a/addons/account_analytic_default/i18n/hu.po
+++ b/addons/account_analytic_default/i18n/hu.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-02-01 18:11+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
+"PO-Revision-Date: 2012-10-09 13:58+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -134,12 +133,14 @@ msgstr "Gyűjtőkód alapértelmezések"
 #. module: account_analytic_default
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Minden vállalkozáshoz egyedi hivatkozás kell!"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Analytical defaults whose end date is greater than today or None"
 msgstr ""
+"A mai napnál későbbi lejáratú vagy nem létező dátumú elemzések "
+"alapértelmezései"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
diff --git a/addons/account_analytic_default/i18n/id.po b/addons/account_analytic_default/i18n/id.po
index 7cda56ff0e8..bddfbdacf0a 100644
--- a/addons/account_analytic_default/i18n/id.po
+++ b/addons/account_analytic_default/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/it.po b/addons/account_analytic_default/i18n/it.po
index 2f85f7aa08c..75a024cfe59 100644
--- a/addons/account_analytic_default/i18n/it.po
+++ b/addons/account_analytic_default/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -23,6 +23,10 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "partner, it will automatically take this as an analytical account)"
 msgstr ""
+"Seleziona un partner che userà il conto analitico specificato nel conto "
+"analitico default (es. creando una nuova fattura cliente o ordine di vendita "
+"verrà assegnato al partner ed in automatico questo valore come conto "
+"analitico)"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -116,6 +120,8 @@ msgstr "Data finale"
 msgid ""
 "select a user which will use analytical account specified in analytic default"
 msgstr ""
+"Seleziona un utente che userà il conto analitico specificato nel conto "
+"analitico di default"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -127,12 +133,12 @@ msgstr "Valori predefiniti Conti analitici"
 #. module: account_analytic_default
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Il riferimento deve essere unico per ogni azienda!"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Analytical defaults whose end date is greater than today or None"
-msgstr ""
+msgstr "Defaults analitici dove la data finale è maggiore di oggi o nulla"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
@@ -179,11 +185,13 @@ msgstr "Data di inizio"
 msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
 msgstr ""
+"Fornisce l'ordine di sequenza quando si visualizza una lista di "
+"distribuzioni analitiche"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Linea d'ordine di vendita"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valido per Visualizzazione Architettura!"
diff --git a/addons/account_analytic_default/i18n/ja.po b/addons/account_analytic_default/i18n/ja.po
index 3eb6e820d0e..112d7b9ee0c 100644
--- a/addons/account_analytic_default/i18n/ja.po
+++ b/addons/account_analytic_default/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/ko.po b/addons/account_analytic_default/i18n/ko.po
index 0aed6e33c19..fe2442f088b 100644
--- a/addons/account_analytic_default/i18n/ko.po
+++ b/addons/account_analytic_default/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po
index 030ee8a2cdc..5e82f664122 100644
--- a/addons/account_analytic_default/i18n/lt.po
+++ b/addons/account_analytic_default/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/lv.po b/addons/account_analytic_default/i18n/lv.po
index 88517d3b8af..b334e47b4d1 100644
--- a/addons/account_analytic_default/i18n/lv.po
+++ b/addons/account_analytic_default/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/mn.po b/addons/account_analytic_default/i18n/mn.po
index c9cb3548d5a..1d575070055 100644
--- a/addons/account_analytic_default/i18n/mn.po
+++ b/addons/account_analytic_default/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/nb.po b/addons/account_analytic_default/i18n/nb.po
index f068865cd1c..51392835a55 100644
--- a/addons/account_analytic_default/i18n/nb.po
+++ b/addons/account_analytic_default/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/nl.po b/addons/account_analytic_default/i18n/nl.po
index 7ed094507a2..a0e7bdb33fe 100644
--- a/addons/account_analytic_default/i18n/nl.po
+++ b/addons/account_analytic_default/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-02-10 11:08+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -118,7 +118,7 @@ msgstr "Einddatum"
 msgid ""
 "select a user which will use analytical account specified in analytic default"
 msgstr ""
-"selecteer een gebruiker die kostenplaats gebruikt in standaard kostenplaats"
+"Selecteer een gebruiker die kostenplaats gebruikt in standaard kostenplaats."
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_default/i18n/nl_BE.po b/addons/account_analytic_default/i18n/nl_BE.po
index a4f37d5d8d8..434ae1705a8 100644
--- a/addons/account_analytic_default/i18n/nl_BE.po
+++ b/addons/account_analytic_default/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/oc.po b/addons/account_analytic_default/i18n/oc.po
index 58707b8aec0..86c7bae7806 100644
--- a/addons/account_analytic_default/i18n/oc.po
+++ b/addons/account_analytic_default/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/pl.po b/addons/account_analytic_default/i18n/pl.po
index 43e60c0e863..ccb0e2d5eee 100644
--- a/addons/account_analytic_default/i18n/pl.po
+++ b/addons/account_analytic_default/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/pt.po b/addons/account_analytic_default/i18n/pt.po
index 8f6c178bcfc..beb62839196 100644
--- a/addons/account_analytic_default/i18n/pt.po
+++ b/addons/account_analytic_default/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/pt_BR.po b/addons/account_analytic_default/i18n/pt_BR.po
index 5e3b41ffd53..3ab40fe2836 100644
--- a/addons/account_analytic_default/i18n/pt_BR.po
+++ b/addons/account_analytic_default/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -48,7 +48,7 @@ msgstr "Atual"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr "Agrupado Por..."
+msgstr "Agrupar Por..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
@@ -113,7 +113,7 @@ msgstr "Lançamentos"
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
-msgstr "Término"
+msgstr "Data Final"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
@@ -128,7 +128,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
 msgid "Analytic Defaults"
-msgstr "Padrões analíticos"
+msgstr "Padrões Analíticos"
 
 #. module: account_analytic_default
 #: sql_constraint:stock.picking:0
@@ -138,7 +138,7 @@ msgstr "A referência deve ser única por empresa!"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Analytical defaults whose end date is greater than today or None"
-msgstr "Padrões de análise, cuja a data final é maior do que hoje ou nenhum."
+msgstr "Padrões Analíticos em que a data é maior que hoje ou nenhum"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
@@ -165,7 +165,7 @@ msgstr "Linha da Fatura"
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr "Conta analítica"
+msgstr "Conta Analítica"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -193,7 +193,7 @@ msgstr ""
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Item de Pedido de Vendas"
+msgstr "Linha do Pedido de Vendas"
 
 #~ msgid "Analytic Distributions"
 #~ msgstr "Distribuição analítica"
diff --git a/addons/account_analytic_default/i18n/ro.po b/addons/account_analytic_default/i18n/ro.po
index f0ff19b1c6e..5a972e999dd 100644
--- a/addons/account_analytic_default/i18n/ro.po
+++ b/addons/account_analytic_default/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/ru.po b/addons/account_analytic_default/i18n/ru.po
index 4a6add5804a..217611f51a5 100644
--- a/addons/account_analytic_default/i18n/ru.po
+++ b/addons/account_analytic_default/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-18 04:58+0000\n"
-"X-Generator: Launchpad (build 15810)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -48,7 +48,7 @@ msgstr "Текущий"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr "Объединять по..."
+msgstr "Группировать по ..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
@@ -91,7 +91,7 @@ msgstr "Продукт"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr "Аналитическое распределение"
+msgstr "Разнесение аналитики"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -139,6 +139,7 @@ msgstr "Ссылка должна быть уникальна для каждо
 #: view:account.analytic.default:0
 msgid "Analytical defaults whose end date is greater than today or None"
 msgstr ""
+"Аналитика по умолчанию с датой окончания большей чем сегодня или без даты"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
diff --git a/addons/account_analytic_default/i18n/sk.po b/addons/account_analytic_default/i18n/sk.po
index 82388991170..0ca56b74d56 100644
--- a/addons/account_analytic_default/i18n/sk.po
+++ b/addons/account_analytic_default/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/sl.po b/addons/account_analytic_default/i18n/sl.po
index 9fe866eb6bf..1aba5f1b3eb 100644
--- a/addons/account_analytic_default/i18n/sl.po
+++ b/addons/account_analytic_default/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/sq.po b/addons/account_analytic_default/i18n/sq.po
index 60c9b41fd8a..98aa9e2bf20 100644
--- a/addons/account_analytic_default/i18n/sq.po
+++ b/addons/account_analytic_default/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/sr.po b/addons/account_analytic_default/i18n/sr.po
index c436b26cc8e..7e01072c7f1 100644
--- a/addons/account_analytic_default/i18n/sr.po
+++ b/addons/account_analytic_default/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/sr@latin.po b/addons/account_analytic_default/i18n/sr@latin.po
index e0718a0aaca..0372e6470b4 100644
--- a/addons/account_analytic_default/i18n/sr@latin.po
+++ b/addons/account_analytic_default/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/sv.po b/addons/account_analytic_default/i18n/sv.po
index 88d57b2e912..e165cfdedae 100644
--- a/addons/account_analytic_default/i18n/sv.po
+++ b/addons/account_analytic_default/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/tlh.po b/addons/account_analytic_default/i18n/tlh.po
index 3174c7894d8..a873ee466c4 100644
--- a/addons/account_analytic_default/i18n/tlh.po
+++ b/addons/account_analytic_default/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po
index e063d01f312..01871c71aad 100644
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/uk.po b/addons/account_analytic_default/i18n/uk.po
index f1ea5a471d4..fee1de2fa86 100644
--- a/addons/account_analytic_default/i18n/uk.po
+++ b/addons/account_analytic_default/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/vi.po b/addons/account_analytic_default/i18n/vi.po
index 2190e37d7d8..ca20290db11 100644
--- a/addons/account_analytic_default/i18n/vi.po
+++ b/addons/account_analytic_default/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po
index e5d6de0c553..23b4ded3be8 100644
--- a/addons/account_analytic_default/i18n/zh_CN.po
+++ b/addons/account_analytic_default/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
diff --git a/addons/account_analytic_default/i18n/zh_TW.po b/addons/account_analytic_default/i18n/zh_TW.po
index d35c6caff39..62d169d4d96 100644
--- a/addons/account_analytic_default/i18n/zh_TW.po
+++ b/addons/account_analytic_default/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-09-08 12:47+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-08-18 11:11+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -23,43 +23,44 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "partner, it will automatically take this as an analytical account)"
 msgstr ""
+"\"選擇一個合作夥伴，這將使用輔助核算預設指定的帳戶（如建立新客戶。客戶遍布發票或銷售訂單，如果我們選擇這個合作夥伴，它會自動輔助核算項目）。"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
 msgid "Analytic Rules"
-msgstr ""
+msgstr "輔助核算規則"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,analytic_id:0
 msgid "Analytical Account"
-msgstr ""
+msgstr "輔助核算項目"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Current"
-msgstr ""
+msgstr "使用中"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類分式..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytical Account"
-msgstr ""
+msgstr "這種輔助核算項目的預設結束日期"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "提貨清單"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Conditions"
-msgstr ""
+msgstr "條件"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,company_id:0
@@ -67,23 +68,23 @@ msgid ""
 "select a company which will use analytical account specified in analytic "
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "company, it will automatically take this as an analytical account)"
-msgstr ""
+msgstr "公司將使用輔助核算預設指定的帳戶（如建立新客戶。客戶遍布發票或銷售訂單，如果我們選擇了這家公司，它會自動輔助核算項目）。"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
-msgstr ""
+msgstr "這種輔助核算項目的預設開始日期"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,product_id:0
 msgid "Product"
-msgstr "商品"
+msgstr "產品"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "輔助核算分配"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -111,24 +112,24 @@ msgstr "結束日期"
 #: help:account.analytic.default,user_id:0
 msgid ""
 "select a user which will use analytical account specified in analytic default"
-msgstr ""
+msgstr "選擇一個使用者將使用輔助核算預設指定的項目。"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
 msgid "Analytic Defaults"
-msgstr ""
+msgstr "輔助核算預設"
 
 #. module: account_analytic_default
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "編號必須在公司內唯一！"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Analytical defaults whose end date is greater than today or None"
-msgstr ""
+msgstr "輔助核算預設的結束日期大於今天“或”無“"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,product_id:0
@@ -136,12 +137,12 @@ msgid ""
 "select a product which will use analytical account specified in analytic "
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "product, it will automatically take this as an analytical account)"
-msgstr ""
+msgstr "選擇一個產品，這將使用輔助核算預設指定的帳戶（如建立新客戶。客戶遍布發票或銷售訂單，如果我們選擇了這個產品，它會自動輔助核算項目）。"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
@@ -152,18 +153,18 @@ msgstr "發票明細"
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "輔助核算項目"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Accounts"
-msgstr "帳號"
+msgstr "帳戶"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: field:account.analytic.default,partner_id:0
 msgid "Partner"
-msgstr "伙伴"
+msgstr "業務夥伴"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_start:0
@@ -174,7 +175,7 @@ msgstr "開始日期"
 #: help:account.analytic.default,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
-msgstr ""
+msgstr "顯示輔助核算分佈列表時，給出的順序。"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py
index a9000cfa490..af5b5654b99 100644
--- a/addons/account_analytic_plans/__openerp__.py
+++ b/addons/account_analytic_plans/__openerp__.py
@@ -26,45 +26,48 @@
     'category': 'Accounting & Finance',
     'description': """
 This module allows to use several analytic plans according to the general journal.
-===================================================================================
+==================================================================================
 
 Here multiple analytic lines are created when the invoice or the entries
 are confirmed.
 
 For example, you can define the following analytic structure:
-  Projects
-      Project 1
-          SubProj 1.1
-          SubProj 1.2
+-------------------------------------------------------------
+  * **Projects**
+      * Project 1
+          + SubProj 1.1
+          
+          + SubProj 1.2
 
-      Project 2
-  Salesman
-      Eric
-      Fabien
+      * Project 2
+      
+  * **Salesman**
+      * Eric
+      
+      * Fabien
 
-Here, we have two plans: Projects and Salesman. An invoice line must
-be able to write analytic entries in the 2 plans: SubProj 1.1 and
-Fabien. The amount can also be split. The following example is for
-an invoice that touches the two subproject and assigned to one salesman:
+Here, we have two plans: Projects and Salesman. An invoice line must be able to write analytic entries in the 2 plans: SubProj 1.1 and Fabien. The amount can also be split.
+ 
+The following example is for an invoice that touches the two subprojects and assigned to one salesman:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+**Plan1:**
 
-Plan1:
-    SubProject 1.1 : 50%
-    SubProject 1.2 : 50%
-Plan2:
+    * SubProject 1.1 : 50%
+    
+    * SubProject 1.2 : 50%
+    
+**Plan2:**
     Eric: 100%
 
-So when this line of invoice will be confirmed, it will generate 3 analytic lines,
-for one account entry.
+So when this line of invoice will be confirmed, it will generate 3 analytic lines,for one account entry.
 
-The analytic plan validates the minimum and maximum percentage at the time of creation
-of distribution models.
+The analytic plan validates the minimum and maximum percentage at the time of creation of distribution models.
         """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/analytic_plan.jpeg'],
     'depends': ['account', 'account_analytic_default'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/account_analytic_plan_security.xml',
         'security/ir.model.access.csv',
         'account_analytic_plans_view.xml',
@@ -72,11 +75,10 @@ of distribution models.
         'wizard/analytic_plan_create_model_view.xml',
         'wizard/account_crossovered_analytic_view.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'test': ['test/acount_analytic_plans_report.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0036417675373',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index 234d6fe0cf8..91caa6936bc 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -262,6 +262,7 @@ account_analytic_plan_instance()
 class account_analytic_plan_instance_line(osv.osv):
     _name = "account.analytic.plan.instance.line"
     _description = "Analytic Instance Line"
+    _rec_name = "analytic_account_id"
     _columns = {
         'plan_id': fields.many2one('account.analytic.plan.instance', 'Plan Id'),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, domain=[('type','<>','view')]),
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index 76d6aeed7b8..e5c02c8640e 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -21,17 +21,17 @@
        <field name="inherit_id" ref="account.view_move_form"/>
        <field name="arch" type="xml">
            <xpath expr="/form/sheet/notebook/page/field[@name='line_id']/tree/field[@name='analytic_account_id']" position="replace">
-               <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
+               <field name="analytics_id" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
            </xpath>
            <xpath expr="/form/sheet/notebook/page/field[@name='line_id']/form/notebook/page/group/group/field[@name='analytic_account_id']" position="replace">
-               <field name="analytics_id" context="{'journal_id':journal_id}" groups="analytic.group_analytic_accounting"/>
+               <field name="analytics_id" context="{'journal_id':parent.journal_id}" groups="analytic.group_analytic_accounting"/>
            </xpath>
        </field>
     </record>
 
     <record id="journal_col11" model="account.journal.column">
         <field eval="&quot;&quot;&quot;Analytic Distribution&quot;&quot;&quot;" name="name"/>
-        <field eval="11" name="sequence"/>
+        <field eval="15" name="sequence"/>
         <field name="view_id" ref="account.account_journal_view"/>
         <field eval="0" name="required"/>
         <field eval="&quot;&quot;&quot;analytics_id&quot;&quot;&quot;" name="field"/>
@@ -276,7 +276,7 @@
                 </field>
             </field>
         </record>
-         <record model="ir.ui.view" id="view_default_inherit_tree">
+        <record model="ir.ui.view" id="view_default_inherit_tree">
             <field name="name">account.analytic.default.tree.plans</field>
             <field name="model">account.analytic.default</field>
             <field name="inherit_id" ref="account_analytic_default.view_account_analytic_default_tree"/>
diff --git a/addons/account_analytic_plans/i18n/ar.po b/addons/account_analytic_plans/i18n/ar.po
index 09a183a75f6..1e73218d7dc 100644
--- a/addons/account_analytic_plans/i18n/ar.po
+++ b/addons/account_analytic_plans/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/bg.po b/addons/account_analytic_plans/i18n/bg.po
index c0af63270d5..1a0518e232d 100644
--- a/addons/account_analytic_plans/i18n/bg.po
+++ b/addons/account_analytic_plans/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/bs.po b/addons/account_analytic_plans/i18n/bs.po
index f15def73e16..eb5c9949fe4 100644
--- a/addons/account_analytic_plans/i18n/bs.po
+++ b/addons/account_analytic_plans/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/ca.po b/addons/account_analytic_plans/i18n/ca.po
index e68f9c39f0d..96a376b94d9 100644
--- a/addons/account_analytic_plans/i18n/ca.po
+++ b/addons/account_analytic_plans/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/cs.po b/addons/account_analytic_plans/i18n/cs.po
index 2ddb3695d78..9c7216a89fc 100644
--- a/addons/account_analytic_plans/i18n/cs.po
+++ b/addons/account_analytic_plans/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/da.po b/addons/account_analytic_plans/i18n/da.po
index a9489556bb9..0d829405255 100644
--- a/addons/account_analytic_plans/i18n/da.po
+++ b/addons/account_analytic_plans/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po
index 9eb1ffd8635..f000304f64d 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_analytic_plans/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-08 08:45+0000\n"
+"PO-Revision-Date: 2012-10-12 23:19+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -471,7 +471,7 @@ msgstr "Analyt. Verrechnungsvorlage"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,code:0
 msgid "Distribution Code"
-msgstr "Kurzbezeichnung"
+msgstr "Verteilungs-Schlüssel"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -526,6 +526,8 @@ msgid ""
 "analytic accounts for each plan set. Then, you must attach a plan set to "
 "your account journals."
 msgstr ""
+"Für jede Kostenrechnung muss ein Stammkonto definiert werden. Dann muss ein "
+"Plan definiert werden"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
diff --git a/addons/account_analytic_plans/i18n/el.po b/addons/account_analytic_plans/i18n/el.po
index 2244480a865..df4e5c489d3 100644
--- a/addons/account_analytic_plans/i18n/el.po
+++ b/addons/account_analytic_plans/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/es.po b/addons/account_analytic_plans/i18n/es.po
index e8d2aa61bea..9c11fe8a72b 100644
--- a/addons/account_analytic_plans/i18n/es.po
+++ b/addons/account_analytic_plans/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/es_AR.po b/addons/account_analytic_plans/i18n/es_AR.po
index 4b10fbc08aa..8cd5cddccea 100644
--- a/addons/account_analytic_plans/i18n/es_AR.po
+++ b/addons/account_analytic_plans/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/es_CR.po b/addons/account_analytic_plans/i18n/es_CR.po
index d74368577ca..587d44a6335 100644
--- a/addons/account_analytic_plans/i18n/es_CR.po
+++ b/addons/account_analytic_plans/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/es_EC.po b/addons/account_analytic_plans/i18n/es_EC.po
index 060c2981488..b375be344e0 100644
--- a/addons/account_analytic_plans/i18n/es_EC.po
+++ b/addons/account_analytic_plans/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/es_PY.po b/addons/account_analytic_plans/i18n/es_PY.po
index 1c6e35c2583..986ca0e57e1 100644
--- a/addons/account_analytic_plans/i18n/es_PY.po
+++ b/addons/account_analytic_plans/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/et.po b/addons/account_analytic_plans/i18n/et.po
index 9fb798a4905..f8004171160 100644
--- a/addons/account_analytic_plans/i18n/et.po
+++ b/addons/account_analytic_plans/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Printing date:"
 #~ msgstr "Trükkimise kuupäev:"
diff --git a/addons/account_analytic_plans/i18n/fa.po b/addons/account_analytic_plans/i18n/fa.po
index ac18d42a208..059efa2d5e0 100644
--- a/addons/account_analytic_plans/i18n/fa.po
+++ b/addons/account_analytic_plans/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/fi.po b/addons/account_analytic_plans/i18n/fi.po
index 193c2bc55a4..f23e3f0c5c3 100644
--- a/addons/account_analytic_plans/i18n/fi.po
+++ b/addons/account_analytic_plans/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index 2bbfdf89760..4df3148f935 100644
--- a/addons/account_analytic_plans/i18n/fr.po
+++ b/addons/account_analytic_plans/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/gl.po b/addons/account_analytic_plans/i18n/gl.po
index a10cf6c8016..4c0be2212ff 100644
--- a/addons/account_analytic_plans/i18n/gl.po
+++ b/addons/account_analytic_plans/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/gu.po b/addons/account_analytic_plans/i18n/gu.po
index 2c90bd64d77..7341ba18436 100644
--- a/addons/account_analytic_plans/i18n/gu.po
+++ b/addons/account_analytic_plans/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/hr.po b/addons/account_analytic_plans/i18n/hr.po
index 4b9abfdbd68..c0b19c5a3e3 100644
--- a/addons/account_analytic_plans/i18n/hr.po
+++ b/addons/account_analytic_plans/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/hu.po b/addons/account_analytic_plans/i18n/hu.po
index 037e1fab1cc..e266641bbf7 100644
--- a/addons/account_analytic_plans/i18n/hu.po
+++ b/addons/account_analytic_plans/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/id.po b/addons/account_analytic_plans/i18n/id.po
index e32abfa4dbe..a1c8e28af16 100644
--- a/addons/account_analytic_plans/i18n/id.po
+++ b/addons/account_analytic_plans/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/it.po b/addons/account_analytic_plans/i18n/it.po
index 5e473fdcbff..3cd1f134f29 100644
--- a/addons/account_analytic_plans/i18n/it.po
+++ b/addons/account_analytic_plans/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/ja.po b/addons/account_analytic_plans/i18n/ja.po
index e9bba1aba2b..12e930d695b 100644
--- a/addons/account_analytic_plans/i18n/ja.po
+++ b/addons/account_analytic_plans/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/ko.po b/addons/account_analytic_plans/i18n/ko.po
index b4a0cc152db..2cf7fd688b3 100644
--- a/addons/account_analytic_plans/i18n/ko.po
+++ b/addons/account_analytic_plans/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po
index 59b4a1e5c9c..4bdda6fb236 100644
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/lv.po b/addons/account_analytic_plans/i18n/lv.po
index 069e0c09311..8deb645d881 100644
--- a/addons/account_analytic_plans/i18n/lv.po
+++ b/addons/account_analytic_plans/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/mn.po b/addons/account_analytic_plans/i18n/mn.po
index b1fdc3ef6d9..239a64967c6 100644
--- a/addons/account_analytic_plans/i18n/mn.po
+++ b/addons/account_analytic_plans/i18n/mn.po
@@ -14,15 +14,15 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid ""
 "This distribution model has been saved.You will be able to reuse it later."
 msgstr ""
-"This distribution model has been saved.You will be able to reuse it later."
+"Энэ тархалтын загвар хадгалагдлаа. Та үүнийг дараа давтан ашиглах боломжтой."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
@@ -32,7 +32,7 @@ msgstr "Төлөвлөгөөний дугаар"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr "From Date"
+msgstr "Эхлэх Огноо"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -40,7 +40,7 @@ msgstr "From Date"
 #: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
 msgid "Crossovered Analytic"
-msgstr "Crossovered Analytic"
+msgstr "Хөндлөн хамаарлын шинжилгээ"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -50,31 +50,31 @@ msgstr "Crossovered Analytic"
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
 msgid "Analytic Plan"
-msgstr "Аналитик төлөвлөгөө"
+msgstr "Шинжилгээний Төлөвлөгөө"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
 #: view:account.crossovered.analytic:0
 #: field:account.crossovered.analytic,journal_ids:0
 msgid "Analytic Journal"
-msgstr "Аналитик Журнал"
+msgstr "Шинжилгээний журнал"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
 msgid "Analytic Plan Line"
-msgstr "Analytic Plan Line"
+msgstr "Шинжилгээний Төлөвлөгөөний Мөр"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "User Error"
-msgstr "User Error"
+msgstr "Хэрэглэгчийн алдаа"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
 msgid "Analytic Plan Instance"
-msgstr "Analytic Plan Instance"
+msgstr "Шинжилгээний Төлөвлөгөөний Тухайн тохиолдол"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/nb.po b/addons/account_analytic_plans/i18n/nb.po
new file mode 100644
index 00000000000..b067d0ca77f
--- /dev/null
+++ b/addons/account_analytic_plans/i18n/nb.po
@@ -0,0 +1,553 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-09-02 09:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid ""
+"This distribution model has been saved.You will be able to reuse it later."
+msgstr ""
+"Denne fordeling modellen har vært lagret. Du vil kunne bruke den senere."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr "Plan ID"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr "Fra dato"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: view:account.crossovered.analytic:0
+#: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
+#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
+msgid "Crossovered Analytic"
+msgstr "Krysset Analyse"
+
+#. 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.model,name:account_analytic_plans.model_account_analytic_plan
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
+msgid "Analytic Plan"
+msgstr "Analytisk Plan"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,journal_id:0
+#: view:account.crossovered.analytic:0
+#: field:account.crossovered.analytic,journal_ids:0
+msgid "Analytic Journal"
+msgstr "Analytisk journal"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
+msgid "Analytic Plan Line"
+msgstr "Analytisk plan linje"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
+#, python-format
+msgid "User Error"
+msgstr "Brukerfeil"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr "Analytisk Plan forekomst"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr "Ok"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
+msgstr "Modell Plan"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
+msgstr "Konto2 ID"
+
+#. module: account_analytic_plans
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Fakturanummer må være unik pr. firma!"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: account_analytic_plans
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Konfigurasjon feil! Den valgte valutaen bør deles av standard kontoer også."
+
+#. module: account_analytic_plans
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Feil kredit eller debet beløp i regnskaps oppføringen !"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
+msgstr "Konto6 ID"
+
+#. module: account_analytic_plans
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
+msgstr "Multi Planer"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Kontoutskriftlinje"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action_installer
+msgid "Define your Analytic Plans"
+msgstr "Definer dine analytiske planer."
+
+#. module: account_analytic_plans
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "Tidsskriftet og perioden valgt å tilhøre samme selskap."
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"Datoen for din bilagsregistrering ikke er i den definerte perioden! Du bør "
+"endre datoen eller fjerne denne begrensningen fra tidsskriftet."
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Journalkoden må være unik pr firma!"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
+msgstr "Analytisk konto Referanse."
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Salgsordrelinje"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
+#: view:analytic.plan.create.model:0
+#, python-format
+msgid "Distribution Model Saved"
+msgstr "Distribusjon Model Lagret"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr "Analytisk distribusjon modeller"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr "Skriv ut"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+#: field:account.analytic.line,percentage:0
+msgid "Percentage"
+msgstr "Prosentdel"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#, python-format
+msgid "A model having this name and code already exists !"
+msgstr "En modell som har dette navnet og koden finnes allerede!"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "No analytic plan defined !"
+msgstr "Ingen analytisk plan definert!"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr "Rate (%)"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan:0
+#: field:account.analytic.plan,plan_ids:0
+#: field:account.journal,plan_id:0
+msgid "Analytic Plans"
+msgstr "Analytiske planer"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Perc(%)"
+msgstr "Prosent (%)"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,max_required:0
+msgid "Maximum Allowed (%)"
+msgstr "Maksimal tillatt (%)"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr "Utskriftsdato"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.line:0
+msgid "Analytic Plan Lines"
+msgstr "Analytisk plan linjer"
+
+#. module: account_analytic_plans
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+"Mengden av bilaget må være det samme beløp som den på setningen linje"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Fakturalinje"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+"Den valgte kontoen av dine Bilagsregistrering blir tvunget for å gi en "
+"sekundær valuta. Du bør fjerne den sekundære valuta på konto eller velg en "
+"flervaluta syn på tidsskriftet."
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
+msgstr "Startdato"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr "Konto ID"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr "Konto5 ID"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr "Analytisk forekomst Linje"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr "root-kontoen"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr "Til Dato."
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:341
+#: code:addons/account_analytic_plans/account_analytic_plans.py:485
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
+msgstr "Du må definere en analytisk journal på '% s' dagbok!"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr "Ikke vis tomme linjer"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr "analytisk.plan.lage.modell.handling"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "Analytisk linje"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr "Analytisk konto"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr "Analytisk konto referanse."
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr "plan navn"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr "standard oppføringer"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr "Journal Elementer"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr "Konto1 ID"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
+msgstr "Minimum tillat(%)"
+
+#. module: account_analytic_plans
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
+msgstr "Root kontoen av denne planen."
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:221
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
+#, python-format
+msgid "Error"
+msgstr "Feil"
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Save This Distribution as a Model"
+msgstr "Lagre denne fordelingen som en modell"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "Du kan ikke lage journalregistreringer på konto av typen vis"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Quantity"
+msgstr "Antall"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
+#, python-format
+msgid "Please put a name and a code before saving the model !"
+msgstr "Kan du sette et navn og en kode før du lagrer modell!"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr "Skriv ut Crossovered Analytisk"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:341
+#: code:addons/account_analytic_plans/account_analytic_plans.py:485
+#, python-format
+msgid "No Analytic Journal !"
+msgstr "Ingen analytisk journal!"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Analytisk konto"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Kontoutskrift"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr "Konto3 ID"
+
+#. module: account_analytic_plans
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr "Du kan ikke opprette analytisk linje på visning konto."
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
+msgstr "Konto4 ID"
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "Selskapet må være den samme for tilhørende konto og periode"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr "Analytiske distribusjons linjer"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "The Total Should be Between %s and %s"
+msgstr "Totalen bør være mellom% s og% s"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr "på"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr "Kontonavn"
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr "Analytisk distribusjon linje"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr "distribusjon kode"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "%"
+msgstr "%"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
+msgstr "100.00%"
+
+#. 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.bank.statement.line,analytics_id:0
+#: field:account.invoice.line,analytics_id:0
+#: field:account.move.line,analytics_id:0
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_default
+msgid "Analytic Distribution"
+msgstr "Analytisk Distribusjon"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr "Kode"
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr "Analytisk.plan.lage.modell"
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
+msgstr "Sluttdato"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr "Distribusjons modeller"
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,help:account_analytic_plans.account_analytic_plan_form_action_installer
+msgid ""
+"To setup a multiple analytic plans environment, you must define the root "
+"analytic accounts for each plan set. Then, you must attach a plan set to "
+"your account journals."
+msgstr ""
+"Å sette opp en flere analytiske planer for miljøet, må du definere de "
+"grunnleggende analytiske regnskap for hver plan sett. Deretter må du legge "
+"en plan satt til din konto tidsskrifter."
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "Du kan ikke lage journal elementer på en lukket konto."
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Navnet på journalen må være unikt per firma !"
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:234
+#, python-format
+msgid "Value Error"
+msgstr "Verdi Feil"
diff --git a/addons/account_analytic_plans/i18n/nl.po b/addons/account_analytic_plans/i18n/nl.po
index 38b049504f6..ef0aa44a554 100644
--- a/addons/account_analytic_plans/i18n/nl.po
+++ b/addons/account_analytic_plans/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-02-12 11:32+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/nl_BE.po b/addons/account_analytic_plans/i18n/nl_BE.po
index feaba980b61..2e9da9d4351 100644
--- a/addons/account_analytic_plans/i18n/nl_BE.po
+++ b/addons/account_analytic_plans/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/oc.po b/addons/account_analytic_plans/i18n/oc.po
index 0bf8c06514f..8a116dffb3e 100644
--- a/addons/account_analytic_plans/i18n/oc.po
+++ b/addons/account_analytic_plans/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/pl.po b/addons/account_analytic_plans/i18n/pl.po
index 101c44c6cbb..9b3f3519204 100644
--- a/addons/account_analytic_plans/i18n/pl.po
+++ b/addons/account_analytic_plans/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/pt.po b/addons/account_analytic_plans/i18n/pt.po
index 7c7294f348f..d6464124b83 100644
--- a/addons/account_analytic_plans/i18n/pt.po
+++ b/addons/account_analytic_plans/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/pt_BR.po b/addons/account_analytic_plans/i18n/pt_BR.po
index 6a436b361d4..da7de9776c3 100644
--- a/addons/account_analytic_plans/i18n/pt_BR.po
+++ b/addons/account_analytic_plans/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -49,7 +49,7 @@ msgstr "Analítico Cruzado"
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
 msgid "Analytic Plan"
-msgstr "Plano analítico"
+msgstr "Plano Analítico"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
@@ -68,7 +68,7 @@ msgstr "Linha do Plano Analítico"
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "User Error"
-msgstr "Erro de usuário"
+msgstr "Erro de Usuário"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
@@ -93,7 +93,7 @@ msgstr "Id Conta2"
 #. module: account_analytic_plans
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr "O número da fatura deve ser único por empresa!"
+msgstr "O Número da Fatura deve ser único por Empresa!"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -241,7 +241,7 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
-"O montante do voucher deverá ser o mesmo valor que o na linha do extrato"
+"O valor do recibo deve ser o mesmo valor da linha equivalente no extrato"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice_line
@@ -396,12 +396,12 @@ msgstr "Imprimir Cruzamento Analítico"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:485
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "Nenum Diário Analítico !"
+msgstr "Nenhum Diário Analítico!"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr "Conta analítica"
+msgstr "Conta Analítica"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
@@ -416,7 +416,7 @@ msgstr "ID Conta3"
 #. module: account_analytic_plans
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr "Você não pode criar uma linha analítica na visualização da conta"
+msgstr "Você não pode criar uma linha analítica em conta de visualização"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
diff --git a/addons/account_analytic_plans/i18n/ro.po b/addons/account_analytic_plans/i18n/ro.po
index 9d84d1326ec..2ebc401aecf 100644
--- a/addons/account_analytic_plans/i18n/ro.po
+++ b/addons/account_analytic_plans/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/ru.po b/addons/account_analytic_plans/i18n/ru.po
index e8031d92cca..d9d8015272a 100644
--- a/addons/account_analytic_plans/i18n/ru.po
+++ b/addons/account_analytic_plans/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-04-15 19:38+0000\n"
+"PO-Revision-Date: 2012-10-25 12:32+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
@@ -92,7 +92,7 @@ msgstr "Счет 2 уровня"
 #. module: account_analytic_plans
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Номер счета должен быть уникальным для компании!"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -105,6 +105,8 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"Ошибка настройки! Выбранная валюта должна соответствовать валюте счетов по "
+"умолчанию."
 
 #. module: account_analytic_plans
 #: sql_constraint:account.move.line:0
@@ -129,17 +131,17 @@ msgstr "Позиция банковской выписки"
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action_installer
 msgid "Define your Analytic Plans"
-msgstr ""
+msgstr "Определить аналитический план счетов"
 
 #. module: account_analytic_plans
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Неверна структурная связь BBA!"
 
 #. module: account_analytic_plans
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "Журнал и период должны относиться к одной компании."
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
@@ -147,6 +149,8 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"Дата проводки в журнале не в определённом периоде! Вы должны сменить дату "
+"или удалить это ограничение из журнала."
 
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
@@ -249,6 +253,8 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Выбранный счёт проводки в журнале нуждается во вторичной валюте. Вы должны "
+"удалить вторичную валюту по счёту или выбрать мульти-валютный вид по журналу."
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -305,7 +311,7 @@ msgstr "analytic.plan.create.model.action"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Позиция аналитики"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -363,7 +369,7 @@ msgstr "Сохранить это разнесение как шаблон"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Нельзя создать элемент журнала по счету с типом вид."
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -406,7 +412,7 @@ msgstr "Счет 3 уровня"
 #. module: account_analytic_plans
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Нельзя создать проводку аналитики по счету с типом вид."
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
@@ -427,7 +433,7 @@ msgstr "Счет 4 уровня"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "Для счета и периода должна быть одна компания."
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
@@ -513,11 +519,14 @@ msgid ""
 "analytic accounts for each plan set. Then, you must attach a plan set to "
 "your account journals."
 msgstr ""
+"Для настройки нескольких планов счетов аналитики, вы должны определить "
+"корневые счета аналитики для каждого набора плана. Затем вы можете "
+"прикрепить набор плана к вашим учётным журналам."
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Нельзя создать элемент журнала по закрытому счету ."
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
diff --git a/addons/account_analytic_plans/i18n/sl.po b/addons/account_analytic_plans/i18n/sl.po
index bba0b20f1ab..41862952fbc 100644
--- a/addons/account_analytic_plans/i18n/sl.po
+++ b/addons/account_analytic_plans/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/sq.po b/addons/account_analytic_plans/i18n/sq.po
index ad220a722bd..7f64dd5cca5 100644
--- a/addons/account_analytic_plans/i18n/sq.po
+++ b/addons/account_analytic_plans/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/sr.po b/addons/account_analytic_plans/i18n/sr.po
index d09eb9ee4f6..86455594c41 100644
--- a/addons/account_analytic_plans/i18n/sr.po
+++ b/addons/account_analytic_plans/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/sr@latin.po b/addons/account_analytic_plans/i18n/sr@latin.po
index d40b0db6ea5..e09b97606e8 100644
--- a/addons/account_analytic_plans/i18n/sr@latin.po
+++ b/addons/account_analytic_plans/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/sv.po b/addons/account_analytic_plans/i18n/sv.po
index 0664ccf65ac..5eb89c1798a 100644
--- a/addons/account_analytic_plans/i18n/sv.po
+++ b/addons/account_analytic_plans/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/tlh.po b/addons/account_analytic_plans/i18n/tlh.po
index 2ec43c63ecc..af1bcaf80c6 100644
--- a/addons/account_analytic_plans/i18n/tlh.po
+++ b/addons/account_analytic_plans/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index 9c0f62cfcb3..2eb73c9e98a 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/uk.po b/addons/account_analytic_plans/i18n/uk.po
index fadf2c2100c..f0503e0b04d 100644
--- a/addons/account_analytic_plans/i18n/uk.po
+++ b/addons/account_analytic_plans/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/vi.po b/addons/account_analytic_plans/i18n/vi.po
index d31062f84eb..add15e80abf 100644
--- a/addons/account_analytic_plans/i18n/vi.po
+++ b/addons/account_analytic_plans/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/zh_CN.po b/addons/account_analytic_plans/i18n/zh_CN.po
index fcf9539949d..24f35abfc27 100644
--- a/addons/account_analytic_plans/i18n/zh_CN.po
+++ b/addons/account_analytic_plans/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
diff --git a/addons/account_analytic_plans/i18n/zh_TW.po b/addons/account_analytic_plans/i18n/zh_TW.po
index c96de9287a2..cd7e59abd2a 100644
--- a/addons/account_analytic_plans/i18n/zh_TW.po
+++ b/addons/account_analytic_plans/i18n/zh_TW.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-20 01:47+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid ""
 "This distribution model has been saved.You will be able to reuse it later."
-msgstr ""
+msgstr "此分配模式已儲存，你將可以稍後使用它。"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,plan_id:0
 msgid "Plan Id"
-msgstr ""
+msgstr "計劃名稱"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "From Date"
-msgstr ""
+msgstr "從日期"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -38,7 +38,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic
 #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic
 msgid "Crossovered Analytic"
-msgstr ""
+msgstr "交叉輔助核算"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -48,137 +48,137 @@ msgstr ""
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action
 msgid "Analytic Plan"
-msgstr ""
+msgstr "輔助核算計劃"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,journal_id:0
 #: view:account.crossovered.analytic:0
 #: field:account.crossovered.analytic,journal_ids:0
 msgid "Analytic Journal"
-msgstr ""
+msgstr "輔助核算帳簿"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
 msgid "Analytic Plan Line"
-msgstr ""
+msgstr "輔助核算計劃明細"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "User Error"
-msgstr ""
+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
 #: view:analytic.plan.create.model:0
 msgid "Ok"
-msgstr ""
+msgstr "確定"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,plan_id:0
 msgid "Model's Plan"
-msgstr ""
+msgstr "模型的計劃"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account2_ids:0
 msgid "Account2 Id"
-msgstr ""
+msgstr "帳戶2名稱"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "每間公司的發票號碼必須是唯一的"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Amount"
-msgstr ""
+msgstr "數量"
 
 #. module: account_analytic_plans
 #: constraint:account.journal:0
 msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
-msgstr ""
+msgstr "設置錯誤！所選幣別應與默認科目共享。"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "會計分錄中包含錯誤的借貸數值！"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
 msgid "Account6 Id"
-msgstr ""
+msgstr "帳戶2名稱"
 
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
 msgid "Multi Plans"
-msgstr ""
+msgstr "多元計劃"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "銀行對賬單明細"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action_installer
 msgid "Define your Analytic Plans"
-msgstr ""
+msgstr "定義你的輔助核算計劃"
 
 #. module: account_analytic_plans
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "BBA傳輸結構有誤！"
 
 #. module: account_analytic_plans
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "所選的帳簿和期間必須屬於相同公司。"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
-msgstr ""
+msgstr "分錄日期不在所選期間內！可以修改憑證日期或在帳簿上去掉這個檢查項。"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "每個公司的帳簿編碼必須唯一！"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
 msgid "Analytic Account Reference"
-msgstr ""
+msgstr "輔助核算項目參考"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "銷貨單明㚼"
+msgstr "銷售訂單明細"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:47
 #: view:analytic.plan.create.model:0
 #, python-format
 msgid "Distribution Model Saved"
-msgstr ""
+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 ""
+msgstr "輔助核算分配模式"
 
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
 msgid "Print"
-msgstr ""
+msgstr "列印"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -190,52 +190,52 @@ msgstr "百分比"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:221
 #, python-format
 msgid "A model having this name and code already exists !"
-msgstr ""
+msgstr "這個名稱和代碼的模型已經存在！"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "No analytic plan defined !"
-msgstr ""
+msgstr "沒有定義的輔助核算計劃！"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,rate:0
 msgid "Rate (%)"
-msgstr ""
+msgstr "比率 (%)"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
 #: field:account.analytic.plan,plan_ids:0
 #: field:account.journal,plan_id:0
 msgid "Analytic Plans"
-msgstr ""
+msgstr "輔助核算計劃"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "百分比(%)"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
 msgid "Maximum Allowed (%)"
-msgstr ""
+msgstr "充許的最大值 (%)"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Printing date"
-msgstr ""
+msgstr "列印日期"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 msgid "Analytic Plan Lines"
-msgstr ""
+msgstr "輔助核算計劃明細"
 
 #. module: account_analytic_plans
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "憑證金額必須和對賬單明細上的金額一致"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice_line
@@ -248,7 +248,7 @@ msgid ""
 "The selected account of your Journal Entry forces to provide a secondary "
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
-msgstr ""
+msgstr "分錄上的科目要求輸入一個外幣。你可以在科目設置中去掉這個外幣或在帳簿設置上選擇一個支持多幣別的輸入界面。"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -263,89 +263,89 @@ msgstr "開始日期"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
 msgid "Account Id"
-msgstr ""
+msgstr "帳戶名稱"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account5_ids:0
 msgid "Account5 Id"
-msgstr ""
+msgstr "帳戶5名稱"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
 msgid "Analytic Instance Line"
-msgstr ""
+msgstr "輔助核算實例明細"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,root_analytic_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "子帳戶"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "To Date"
-msgstr ""
+msgstr "到日期"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:341
 #: code:addons/account_analytic_plans/account_analytic_plans.py:485
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "你必須在'%s'帳簿上去定義輔助核算帳簿!"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,empty_line:0
 msgid "Dont show empty lines"
-msgstr ""
+msgstr "不顯示空白行"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
 msgid "analytic.plan.create.model.action"
-msgstr ""
+msgstr "analytic.plan.create.model.action"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "輔助核算明細"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account :"
-msgstr ""
+msgstr "輔助核算項目 :"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Analytic Account Reference:"
-msgstr ""
+msgstr "輔助核算項目參考:"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,name:0
 msgid "Plan Name"
-msgstr ""
+msgstr "計劃名稱"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan,default_instance_id:0
 msgid "Default Entries"
-msgstr ""
+msgstr "默認分錄"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "借貸項"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
 msgid "Account1 Id"
-msgstr ""
+msgstr "帳戶名稱"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
 msgid "Minimum Allowed (%)"
-msgstr ""
+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
 #: code:addons/account_analytic_plans/account_analytic_plans.py:221
@@ -353,17 +353,17 @@ msgstr ""
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "錯誤"
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Save This Distribution as a Model"
-msgstr ""
+msgstr "儲存這個分佈作為模型"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "借貸項不能使用視圖類型的科目"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -374,39 +374,39 @@ msgstr "數量"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38
 #, python-format
 msgid "Please put a name and a code before saving the model !"
-msgstr ""
+msgstr "保存模型前，請放入一個名稱和代碼！"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
 msgid "Print Crossovered Analytic"
-msgstr ""
+msgstr "列印交叉輔助核算"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:341
 #: code:addons/account_analytic_plans/account_analytic_plans.py:485
 #, python-format
 msgid "No Analytic Journal !"
-msgstr ""
+msgstr "沒有輔助核算帳簿 !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "輔助核算項目"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "銀行對賬單"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
 msgid "Account3 Id"
-msgstr ""
+msgstr "帳戶3名稱"
 
 #. module: account_analytic_plans
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "無法在視圖類型的項目上建立輔助核算項目明細"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
@@ -417,58 +417,58 @@ msgstr "發票"
 #: view:account.crossovered.analytic:0
 #: view:analytic.plan.create.model:0
 msgid "Cancel"
-msgstr "取消"
+msgstr "刪除"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
 msgid "Account4 Id"
-msgstr ""
+msgstr "帳戶4名稱"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "科目和期間必須屬於同一個公司"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Lines"
-msgstr ""
+msgstr "輔助核算分配明細"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:234
 #, python-format
 msgid "The Total Should be Between %s and %s"
-msgstr ""
+msgstr "總合應該介於 %s 和 %s 之間"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "at"
-msgstr "於"
+msgstr "在"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Account Name"
-msgstr "帳號名稱"
+msgstr "帳戶名稱"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.instance.line:0
 msgid "Analytic Distribution Line"
-msgstr ""
+msgstr "輔助核算分配明細"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,code:0
 msgid "Distribution Code"
-msgstr ""
+msgstr "分配代碼"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "100.00%"
-msgstr ""
+msgstr "100.00%"
 
 #. module: account_analytic_plans
 #: field:account.analytic.default,analytics_id:0
@@ -479,22 +479,22 @@ msgstr ""
 #: field:account.move.line,analytics_id:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "輔助核算分配"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "帳簿"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Code"
-msgstr ""
+msgstr "代碼"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
 msgid "analytic.plan.create.model"
-msgstr ""
+msgstr "analytic.plan.create.model"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,date2:0
@@ -504,7 +504,7 @@ msgstr "結束日期"
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
 msgid "Distribution Models"
-msgstr ""
+msgstr "分配模型"
 
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,help:account_analytic_plans.account_analytic_plan_form_action_installer
@@ -512,12 +512,12 @@ msgid ""
 "To setup a multiple analytic plans environment, you must define the root "
 "analytic accounts for each plan set. Then, you must attach a plan set to "
 "your account journals."
-msgstr ""
+msgstr "要設置多個環境輔助核算計劃，你必須為每個計劃設定的子輔助核算項目定義。然後，你必須附上計劃設定到您的帳戶帳簿。"
 
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "憑證上不能使用已關閉的科目"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -527,15 +527,19 @@ msgstr "公司"
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "每個公司的帳簿名稱必須唯一！"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:234
 #, python-format
 msgid "Value Error"
-msgstr ""
+msgstr "數值錯誤"
+
+#~ msgid ""
+#~ "This distribution model has been saved. You will be able to reuse it later."
+#~ msgstr "這種分配模式已被保存。你以後將能夠重複使用它。"
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.py b/addons/account_analytic_plans/report/crossovered_analytic.py
index 3e8eec81c55..5b22f5e266c 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.py
+++ b/addons/account_analytic_plans/report/crossovered_analytic.py
@@ -34,7 +34,7 @@ class crossovered_analytic(report_sxw.rml_parse):
         })
         self.base_amount = 0.00
 
-    def find_children(self,ref_ids):
+    def find_children(self, ref_ids):
         to_return_ids = []
         final_list = []
         parent_list = []
@@ -53,7 +53,7 @@ class crossovered_analytic(report_sxw.rml_parse):
         final_list.extend(set_list)
         return final_list #to_return_ids[0]
 
-    def set_account(self,cats):
+    def set_account(self, cats):
         lst = []
         category = self.pool.get('account.analytic.account').read(self.cr, self.uid, cats)
         for cat in category:
@@ -62,7 +62,7 @@ class crossovered_analytic(report_sxw.rml_parse):
                 lst.extend(self.set_account(cat['child_ids']))
         return lst
 
-    def _ref_lines(self,form):
+    def _ref_lines(self, form):
         result = []
         res = {}
         acc_pool = self.pool.get('account.analytic.account')
@@ -112,7 +112,9 @@ class crossovered_analytic(report_sxw.rml_parse):
         result.append(res)
         return result
 
-    def _lines(self, form, ids={}):
+    def _lines(self, form, ids=None):
+        if ids is None:
+            ids = {}
         if not ids:
             ids = self.ids
 
diff --git a/addons/account_anglo_saxon/__init__.py b/addons/account_anglo_saxon/__init__.py
index 07b514d0327..440f8e87df7 100644
--- a/addons/account_anglo_saxon/__init__.py
+++ b/addons/account_anglo_saxon/__init__.py
@@ -23,4 +23,4 @@ import stock
 import purchase
 import invoice
 
-# 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_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py
index 5073d6522e3..6482a110f1d 100644
--- a/addons/account_anglo_saxon/__openerp__.py
+++ b/addons/account_anglo_saxon/__openerp__.py
@@ -19,32 +19,33 @@
 ##############################################################################
 
 {
-    "name": "Anglo-Saxon Accounting",
-    "version": "1.2",
-    "author": "OpenERP SA, Veritos",
-    "website": "http://openerp.com - http://veritos.nl",
-    "description": """
+    'name': 'Anglo-Saxon Accounting',
+    'version': '1.2',
+    'author': 'OpenERP SA, Veritos',
+    'website': 'http://openerp.com - http://veritos.nl',
+    'description': """
 This module supports the Anglo-Saxon accounting methodology by changing the accounting logic with stock transactions.
 =====================================================================================================================
 
-The difference between the Anglo-Saxon accounting countries and the Rhine (or also called 
-Continental accounting) countries is the moment of taking the Cost of Goods Sold versus 
-Cost of Sales. Anglo-Saxons accounting does take the cost when sales invoice is created, 
-Continental accounting will take the cost at the moment the goods are shipped.
+The difference between the Anglo-Saxon accounting countries and the Rhine 
+(or also called Continental accounting) countries is the moment of taking 
+the Cost of Goods Sold versus Cost of Sales. Anglo-Saxons accounting does 
+take the cost when sales invoice is created, Continental accounting will 
+take the cost at the moment the goods are shipped.
 
-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 when the invoice is created to 
-transfer this amount to the debtor or creditor account. Secondly, price differences between 
-actual purchase price and fixed product standard price are booked on a separate account.""",
-    "images": ["images/account_anglo_saxon.jpeg"],
-    "depends": ["product", "purchase"],
-    "category": "Accounting & Finance",
-    "init_xml": [],
-    "demo_xml": [],
-    "update_xml": ["product_view.xml",],
-    "auto_install": False,
-    "installable": True,
-    "certificate":"00557423080410733581",
+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 when the invoice is created to transfer this amount to the 
+debtor or creditor account. Secondly, price differences between actual 
+purchase price and fixed product standard price are booked on a separate 
+account.""",
+    'images': ['images/account_anglo_saxon.jpeg'],
+    'depends': ['product', 'purchase'],
+    'category': 'Accounting & Finance',
+    'demo': [],
+    'data': ['product_view.xml',],
+    'auto_install': False,
+    'installable': True,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_anglo_saxon/i18n/ar.po b/addons/account_anglo_saxon/i18n/ar.po
index c505a035f63..2fddc689841 100644
--- a/addons/account_anglo_saxon/i18n/ar.po
+++ b/addons/account_anglo_saxon/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/bg.po b/addons/account_anglo_saxon/i18n/bg.po
index 8a286fe612c..10d40d2c09c 100644
--- a/addons/account_anglo_saxon/i18n/bg.po
+++ b/addons/account_anglo_saxon/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/ca.po b/addons/account_anglo_saxon/i18n/ca.po
index 70742ee8e8c..c904c18c515 100644
--- a/addons/account_anglo_saxon/i18n/ca.po
+++ b/addons/account_anglo_saxon/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/da.po b/addons/account_anglo_saxon/i18n/da.po
index aea4b6a02ba..64c213a9248 100644
--- a/addons/account_anglo_saxon/i18n/da.po
+++ b/addons/account_anglo_saxon/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/de.po b/addons/account_anglo_saxon/i18n/de.po
index 6796e4e9f92..a4e2742c718 100644
--- a/addons/account_anglo_saxon/i18n/de.po
+++ b/addons/account_anglo_saxon/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/el.po b/addons/account_anglo_saxon/i18n/el.po
index 99d813cfa80..420ec8b54e4 100644
--- a/addons/account_anglo_saxon/i18n/el.po
+++ b/addons/account_anglo_saxon/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/en_GB.po b/addons/account_anglo_saxon/i18n/en_GB.po
index 9347028d3b2..c790e3a941e 100644
--- a/addons/account_anglo_saxon/i18n/en_GB.po
+++ b/addons/account_anglo_saxon/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/es.po b/addons/account_anglo_saxon/i18n/es.po
index 48709ef712b..6c741bddaa5 100644
--- a/addons/account_anglo_saxon/i18n/es.po
+++ b/addons/account_anglo_saxon/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/es_CR.po b/addons/account_anglo_saxon/i18n/es_CR.po
index 83c1143f963..d164226d658 100644
--- a/addons/account_anglo_saxon/i18n/es_CR.po
+++ b/addons/account_anglo_saxon/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/i18n/es_EC.po b/addons/account_anglo_saxon/i18n/es_EC.po
index 6dd4d142ff5..71cb0d561ea 100644
--- a/addons/account_anglo_saxon/i18n/es_EC.po
+++ b/addons/account_anglo_saxon/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/es_PY.po b/addons/account_anglo_saxon/i18n/es_PY.po
index 90a5fda44c9..c440df807fc 100644
--- a/addons/account_anglo_saxon/i18n/es_PY.po
+++ b/addons/account_anglo_saxon/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/et.po b/addons/account_anglo_saxon/i18n/et.po
index f9c394c0a91..aec41ca350b 100644
--- a/addons/account_anglo_saxon/i18n/et.po
+++ b/addons/account_anglo_saxon/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/fa.po b/addons/account_anglo_saxon/i18n/fa.po
index e1698b7e3ab..fd1ae514cd1 100644
--- a/addons/account_anglo_saxon/i18n/fa.po
+++ b/addons/account_anglo_saxon/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/fi.po b/addons/account_anglo_saxon/i18n/fi.po
index b950aaeb708..7f53b0011d1 100644
--- a/addons/account_anglo_saxon/i18n/fi.po
+++ b/addons/account_anglo_saxon/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/fr.po b/addons/account_anglo_saxon/i18n/fr.po
index aacada8d9d7..7db6e8d4e87 100644
--- a/addons/account_anglo_saxon/i18n/fr.po
+++ b/addons/account_anglo_saxon/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/gl.po b/addons/account_anglo_saxon/i18n/gl.po
index 2c296b1a3ef..80d2239a577 100644
--- a/addons/account_anglo_saxon/i18n/gl.po
+++ b/addons/account_anglo_saxon/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/gu.po b/addons/account_anglo_saxon/i18n/gu.po
index 36feb24c82c..ae460499a9d 100644
--- a/addons/account_anglo_saxon/i18n/gu.po
+++ b/addons/account_anglo_saxon/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/hi.po b/addons/account_anglo_saxon/i18n/hi.po
index 8ad0d5efe9f..4d192728e02 100644
--- a/addons/account_anglo_saxon/i18n/hi.po
+++ b/addons/account_anglo_saxon/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/hr.po b/addons/account_anglo_saxon/i18n/hr.po
index 3c89cf6add7..1468bff80cd 100644
--- a/addons/account_anglo_saxon/i18n/hr.po
+++ b/addons/account_anglo_saxon/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/hu.po b/addons/account_anglo_saxon/i18n/hu.po
index 267f43fcd9d..412b8ebf38b 100644
--- a/addons/account_anglo_saxon/i18n/hu.po
+++ b/addons/account_anglo_saxon/i18n/hu.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/id.po b/addons/account_anglo_saxon/i18n/id.po
index 1c91019d009..7d694f1e8ba 100644
--- a/addons/account_anglo_saxon/i18n/id.po
+++ b/addons/account_anglo_saxon/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/it.po b/addons/account_anglo_saxon/i18n/it.po
index 697274406ac..b3b6614386e 100644
--- a/addons/account_anglo_saxon/i18n/it.po
+++ b/addons/account_anglo_saxon/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/ja.po b/addons/account_anglo_saxon/i18n/ja.po
index ce8621c0f5c..f0764c82d5d 100644
--- a/addons/account_anglo_saxon/i18n/ja.po
+++ b/addons/account_anglo_saxon/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/lv.po b/addons/account_anglo_saxon/i18n/lv.po
index 06b97bab881..50610070790 100644
--- a/addons/account_anglo_saxon/i18n/lv.po
+++ b/addons/account_anglo_saxon/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/mn.po b/addons/account_anglo_saxon/i18n/mn.po
index 2962ac11237..3fc9a2cb0a8 100644
--- a/addons/account_anglo_saxon/i18n/mn.po
+++ b/addons/account_anglo_saxon/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/nb.po b/addons/account_anglo_saxon/i18n/nb.po
new file mode 100644
index 00000000000..b04bddf39b6
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/nb.po
@@ -0,0 +1,101 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-27 15:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Ordrereferanse må være unik pr. firma!"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr " Regnskapsmessig Eiendom"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Produktkategori"
+
+#. module: account_anglo_saxon
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "Referanse må være unik pr firma!"
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr "Feil! Du kan ikke lage uendelig struktur med uendelige kategorier."
+
+#. module: account_anglo_saxon
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Feil: Standard målenheter og kjøp målenheter må være i samme kategori."
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Fakturalinje"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "Innkjøpsordre"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr "Produktmal"
+
+#. 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 "Pris forskjell konto"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr "Plukkliste"
+
+#. module: account_anglo_saxon
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Fakturanummer må være unik pr. firma!"
+
+#. 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 ""
+"Denne kontoen vil bli brukt til verdi prisforskjellen mellom kjøpesum og "
+"kostpris."
diff --git a/addons/account_anglo_saxon/i18n/nl.po b/addons/account_anglo_saxon/i18n/nl.po
index 244499ff008..abca460a389 100644
--- a/addons/account_anglo_saxon/i18n/nl.po
+++ b/addons/account_anglo_saxon/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/nl_BE.po b/addons/account_anglo_saxon/i18n/nl_BE.po
index 9f518d20355..a404baf7dbf 100644
--- a/addons/account_anglo_saxon/i18n/nl_BE.po
+++ b/addons/account_anglo_saxon/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/oc.po b/addons/account_anglo_saxon/i18n/oc.po
index c3c4fb03061..4d21e59d226 100644
--- a/addons/account_anglo_saxon/i18n/oc.po
+++ b/addons/account_anglo_saxon/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/pl.po b/addons/account_anglo_saxon/i18n/pl.po
index e89cd0dff5b..43710f01233 100644
--- a/addons/account_anglo_saxon/i18n/pl.po
+++ b/addons/account_anglo_saxon/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
@@ -30,7 +30,7 @@ msgstr " Właściwości konta"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Kategoria Produktu"
 
 #. module: account_anglo_saxon
 #: sql_constraint:stock.picking:0
@@ -77,7 +77,7 @@ msgstr "Konto różnic cenowych"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
diff --git a/addons/account_anglo_saxon/i18n/pt.po b/addons/account_anglo_saxon/i18n/pt.po
index 0f645953378..7b6090fa4f2 100644
--- a/addons/account_anglo_saxon/i18n/pt.po
+++ b/addons/account_anglo_saxon/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/pt_BR.po b/addons/account_anglo_saxon/i18n/pt_BR.po
index e576ba95ef4..a3e0a495d80 100644
--- a/addons/account_anglo_saxon/i18n/pt_BR.po
+++ b/addons/account_anglo_saxon/i18n/pt_BR.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr "Referência de ordem deve ser única por empresa!"
+msgstr "A Referência do Pedido deve ser única por Empresa!"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -62,18 +62,18 @@ msgstr "Linha da Fatura"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_purchase_order
 msgid "Purchase Order"
-msgstr "Ordem de Compra"
+msgstr "Pedido de Compra"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
 msgid "Product Template"
-msgstr "Modelo de produto"
+msgstr "Modelo de Produto"
 
 #. 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 "Diferença de preço de Conta"
+msgstr "Conta da Diferença de Preço"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice
@@ -83,12 +83,12 @@ msgstr "Fatura"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
 msgid "Picking List"
-msgstr "lista de opções"
+msgstr "Lista de Separação"
 
 #. module: account_anglo_saxon
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr "O número da fatura deve ser único por Empresa!"
+msgstr "O Número da Fatura deve ser único por Empresa!"
 
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0
diff --git a/addons/account_anglo_saxon/i18n/ro.po b/addons/account_anglo_saxon/i18n/ro.po
index abaf7111b6a..c2d37f20a88 100644
--- a/addons/account_anglo_saxon/i18n/ro.po
+++ b/addons/account_anglo_saxon/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/ru.po b/addons/account_anglo_saxon/i18n/ru.po
index aae5f408fd0..9fbfc9d72f1 100644
--- a/addons/account_anglo_saxon/i18n/ru.po
+++ b/addons/account_anglo_saxon/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/sl.po b/addons/account_anglo_saxon/i18n/sl.po
index c156f35a491..a2f0538345a 100644
--- a/addons/account_anglo_saxon/i18n/sl.po
+++ b/addons/account_anglo_saxon/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/sq.po b/addons/account_anglo_saxon/i18n/sq.po
index 7e5bd0d6573..c92b17d9c51 100644
--- a/addons/account_anglo_saxon/i18n/sq.po
+++ b/addons/account_anglo_saxon/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/sr@latin.po b/addons/account_anglo_saxon/i18n/sr@latin.po
index 9e7c64c6b6b..155a0059c52 100644
--- a/addons/account_anglo_saxon/i18n/sr@latin.po
+++ b/addons/account_anglo_saxon/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/sv.po b/addons/account_anglo_saxon/i18n/sv.po
index a5dc819ae9f..10e758f8806 100644
--- a/addons/account_anglo_saxon/i18n/sv.po
+++ b/addons/account_anglo_saxon/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/ta.po b/addons/account_anglo_saxon/i18n/ta.po
index 3aac0850d5c..d6b7b896f09 100644
--- a/addons/account_anglo_saxon/i18n/ta.po
+++ b/addons/account_anglo_saxon/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/tr.po b/addons/account_anglo_saxon/i18n/tr.po
index 96e340bf356..1dc4fcbce79 100644
--- a/addons/account_anglo_saxon/i18n/tr.po
+++ b/addons/account_anglo_saxon/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/zh_CN.po b/addons/account_anglo_saxon/i18n/zh_CN.po
index 196d205fa70..72769df8743 100644
--- a/addons/account_anglo_saxon/i18n/zh_CN.po
+++ b/addons/account_anglo_saxon/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
diff --git a/addons/account_anglo_saxon/i18n/zh_TW.po b/addons/account_anglo_saxon/i18n/zh_TW.po
index 811eba4ac06..2b4d1c1a796 100644
--- a/addons/account_anglo_saxon/i18n/zh_TW.po
+++ b/addons/account_anglo_saxon/i18n/zh_TW.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-09-27 10:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-18 11:26+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "訂單編號在同一公司內必需唯一!"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
 msgid " Accounting Property"
-msgstr ""
+msgstr " 會計屬性"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
@@ -35,23 +35,23 @@ msgstr "產品分類"
 #. module: account_anglo_saxon
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "編號必須在同一公司內唯一！"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "錯誤！您不能建立循環分類。"
 
 #. module: account_anglo_saxon
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Invalid BBA Structured Communication !"
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "錯誤:預設的計量單位和採購的計量單位必須是同一類型."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
@@ -61,7 +61,7 @@ msgstr "發票明細"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_purchase_order
 msgid "Purchase Order"
-msgstr "購貨單"
+msgstr "採購單"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
@@ -72,7 +72,7 @@ msgstr "產品範本"
 #: field:product.category,property_account_creditor_price_difference_categ:0
 #: field:product.template,property_account_creditor_price_difference:0
 msgid "Price Difference Account"
-msgstr ""
+msgstr "價格差異帳戶"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice
@@ -87,7 +87,7 @@ msgstr "提貨清單"
 #. module: account_anglo_saxon
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "發票號碼必須在同一公司內唯一!"
 
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0
@@ -95,7 +95,7 @@ msgstr ""
 msgid ""
 "This account will be used to value price difference between purchase price "
 "and cost price."
-msgstr ""
+msgstr "此帳戶將被使用於衡量採購價及成本價之間的價差。"
 
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "訂單參考不能重覆！"
diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
index 693283b870b..26271015b7e 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -40,7 +40,7 @@ class account_invoice_line(osv.osv):
 
         if inv.type in ('out_invoice','out_refund'):
             for i_line in inv.invoice_line:
-                if i_line.product_id:
+                if i_line.product_id and i_line.product_id.valuation == 'real_time':
                     if inv.type == 'out_invoice':
                         # debit account dacc will be the output account
                         # first check the product, if empty check the category
@@ -87,7 +87,7 @@ class account_invoice_line(osv.osv):
                             })
         elif inv.type in ('in_invoice','in_refund'):
             for i_line in inv.invoice_line:
-                if i_line.product_id:
+                if i_line.product_id and i_line.product_id.valuation == 'real_time':
                     if i_line.product_id.type != 'service':
                         # get the price difference account at the product
                         acc = i_line.product_id.property_account_creditor_price_difference and i_line.product_id.property_account_creditor_price_difference.id
diff --git a/addons/account_anglo_saxon/product.py b/addons/account_anglo_saxon/product.py
index a2a5f7e6e95..87ca24753d6 100644
--- a/addons/account_anglo_saxon/product.py
+++ b/addons/account_anglo_saxon/product.py
@@ -38,14 +38,14 @@ class product_category(osv.osv):
             relation='account.account',
             string="Income Account",
             view_load=True,
-            help="This account will be used to value outgoing stock for the current product category using sale price"),
+            help="This account will be used to value outgoing stock using sale price."),
         'property_account_expense_categ': fields.property(
             'account.account',
             type='many2one',
             relation='account.account',
             string="Expense Account",
             view_load=True,
-            help="This account will be used to value outgoing stock for the current product category using cost price"),                
+            help="This account will be used to value outgoing stock using cost price."),
 
     }
 product_category()
@@ -68,14 +68,14 @@ class product_template(osv.osv):
             relation='account.account',
             string="Income Account",
             view_load=True,
-            help="This account will be used to value outgoing stock for the current product category using sale price"),
+            help="This account will be used to value outgoing stock using sale price."),
         'property_account_expense': fields.property(
             'account.account',
             type='many2one',
             relation='account.account',
             string="Expense Account",
             view_load=True,
-            help="This account will be used to value outgoing stock for the current product category using cost price"),                
+            help="This account will be used to value outgoing stock using cost price."),
 
     }
 product_template()
diff --git a/addons/account_anglo_saxon/product_view.xml b/addons/account_anglo_saxon/product_view.xml
index 4acc69b7595..43029616c5b 100644
--- a/addons/account_anglo_saxon/product_view.xml
+++ b/addons/account_anglo_saxon/product_view.xml
@@ -29,10 +29,10 @@
         <record id="view_category_property_form" model="ir.ui.view">
             <field name="name">product.category.property.form.inherit.stock</field>
             <field name="model">product.category</field>
-            <field name="inherit_id" ref="product.product_category_form_view"/>
+            <field name="inherit_id" ref="account.view_category_property_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/sheet//group[@name='account_property']" position="inside">
+                    <xpath expr="//field[@name='property_account_income_categ']" position="before">
                         <field name="property_account_creditor_price_difference_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                     </xpath>
                 </data>
diff --git a/addons/account_anglo_saxon/sale.py b/addons/account_anglo_saxon/sale.py
deleted file mode 100644
index e2cfa7bbb3b..00000000000
--- a/addons/account_anglo_saxon/sale.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- 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/>.     
-#
-##############################################################################
-
-from osv import fields, osv
-
-#class sale_order_line(osv.osv):
-#    _name = 'sale.order.line'
-#    _description = 'Sale Order line'
-#    _inherit = 'sale.order.line'
-#
-#    def invoice_line_create(self, cr, uid, ids, context={}):
-#        line_ids = super('sale_order_line',self).invoice_line_create(cr, uid, ids, context)
-#        invoice_line_obj = self.pool.get('account.invoice.line')
-#        for line in invoice_line_obj.browse(cr, uid, line_ids):
-#            if line.product_id:
-#                    a =  line.product_id.product_tmpl_id.property_stock_account_output and line.product_id.product_tmpl_id.property_stock_account_output.id
-#                    if not a:
-#                        a = line.product_id.categ_id.property_stock_account_output_categ and line.product_id.categ_id.property_stock_account_output_categ.id
-#                    if a:
-#                        a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
-#                        invoice_line_obj.write(cr, uid, line.id, {'account_id':a})
-#
-#sale_order_line()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_asset/__openerp__.py b/addons/account_asset/__openerp__.py
index 2cf79e9d30d..93bfd18a7cb 100644
--- a/addons/account_asset/__openerp__.py
+++ b/addons/account_asset/__openerp__.py
@@ -20,42 +20,40 @@
 ##############################################################################
 
 {
-    "name" : "Assets Management",
-    "version" : "1.0",
-    "depends" : ["account"],
-    "author" : "OpenERP S.A.",
-    "description": """
+    'name': 'Assets Management',
+    'version': '1.0',
+    'depends': ['account'],
+    'author': 'OpenERP S.A.',
+    'description': """
 Financial and accounting asset management.
 ==========================================
 
-This Module manages the assets owned by a company or an individual. It will keep track of depreciation's occurred on those assets.
-And it allows to create Move's of the depreciation lines.
+This Module manages the assets owned by a company or an individual. It will keep 
+track of depreciation's occurred on those assets. And it allows to create Move's 
+of the depreciation lines.
 
     """,
-    "website" : "http://www.openerp.com",
-    "category" : "Accounting & Finance",
-    "sequence": 32,
-    "init_xml" : [
-    ],
-    "demo_xml" : [ 'account_asset_demo.xml'
-    ],
+    'website': 'http://www.openerp.com',
+    'category': 'Accounting & Finance',
+    'sequence': 32,
+    'demo': [ 'account_asset_demo.xml'],
     'test': [
         'test/account_asset_demo.yml',
         'test/account_asset.yml',
         'test/account_asset_wizard.yml',
     ],
-    "update_xml" : [
-        "security/account_asset_security.xml",
-        "security/ir.model.access.csv",
-        "wizard/account_asset_change_duration_view.xml",
-        "wizard/wizard_asset_compute_view.xml",
-        "account_asset_view.xml",
-        "account_asset_invoice_view.xml",
-        "report/account_asset_report_view.xml",
+    'data': [
+        'security/account_asset_security.xml',
+        'security/ir.model.access.csv',
+        'wizard/account_asset_change_duration_view.xml',
+        'wizard/wizard_asset_compute_view.xml',
+        'account_asset_view.xml',
+        'account_asset_invoice_view.xml',
+        'report/account_asset_report_view.xml',
     ],
-    "auto_install": False,
-    "installable": True,
-    "application": False,
+    'auto_install': False,
+    'installable': True,
+    'application': False,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index b6828062a85..a44226e76c8 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -75,7 +75,7 @@ class account_asset_asset(osv.osv):
     _name = 'account.asset.asset'
     _description = 'Asset'
 
-    def _get_period(self, cr, uid, context={}):
+    def _get_period(self, cr, uid, context=None):
         periods = self.pool.get('account.period').find(cr, uid)
         if periods:
             return periods[0]
@@ -134,10 +134,11 @@ class account_asset_asset(osv.osv):
 
     def compute_depreciation_board(self, cr, uid, ids, context=None):
         depreciation_lin_obj = self.pool.get('account.asset.depreciation.line')
+        currency_obj = self.pool.get('res.currency')
         for asset in self.browse(cr, uid, ids, context=context):
             if asset.value_residual == 0.0:
                 continue
-            posted_depreciation_line_ids = depreciation_lin_obj.search(cr, uid, [('asset_id', '=', asset.id), ('move_check', '=', True)])
+            posted_depreciation_line_ids = depreciation_lin_obj.search(cr, uid, [('asset_id', '=', asset.id), ('move_check', '=', True)],order='depreciation_date desc')
             old_depreciation_line_ids = depreciation_lin_obj.search(cr, uid, [('asset_id', '=', asset.id), ('move_id', '=', False)])
             if old_depreciation_line_ids:
                 depreciation_lin_obj.unlink(cr, uid, old_depreciation_line_ids, context=context)
@@ -148,7 +149,12 @@ class account_asset_asset(osv.osv):
             else:
                 # depreciation_date = 1st January of purchase year
                 purchase_date = datetime.strptime(asset.purchase_date, '%Y-%m-%d')
-                depreciation_date = datetime(purchase_date.year, 1, 1)
+                #if we already have some previous validated entries, starting date isn't 1st January but last entry + method period
+                if (len(posted_depreciation_line_ids)>0):
+                    last_depreciation_date = datetime.strptime(depreciation_lin_obj.browse(cr,uid,posted_depreciation_line_ids[0],context=context).depreciation_date, '%Y-%m-%d')
+                    depreciation_date = (last_depreciation_date+relativedelta(months=+asset.method_period))
+                else:
+                    depreciation_date = datetime(purchase_date.year, 1, 1)
             day = depreciation_date.day
             month = depreciation_date.month
             year = depreciation_date.year
@@ -158,6 +164,10 @@ class account_asset_asset(osv.osv):
             for x in range(len(posted_depreciation_line_ids), undone_dotation_number):
                 i = x + 1
                 amount = self._compute_board_amount(cr, uid, asset, i, residual_amount, amount_to_depr, undone_dotation_number, posted_depreciation_line_ids, total_days, depreciation_date, context=context)
+                company_currency = asset.company_id.currency_id.id
+                current_currency = asset.currency_id.id
+                # compute amount into company currency
+                amount = currency_obj.compute(cr, uid, current_currency, company_currency, amount, context=context)
                 residual_amount -= amount
                 vals = {
                      'amount': amount,
@@ -176,7 +186,9 @@ class account_asset_asset(osv.osv):
                 year = depreciation_date.year
         return True
 
-    def validate(self, cr, uid, ids, context={}):
+    def validate(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         return self.write(cr, uid, ids, {
             'state':'open'
         }, context)
@@ -189,7 +201,7 @@ class account_asset_asset(osv.osv):
 
     def _amount_residual(self, cr, uid, ids, name, args, context=None):
         cr.execute("""SELECT
-                l.asset_id as id, round(SUM(abs(l.debit-l.credit))) AS amount
+                l.asset_id as id, SUM(abs(l.debit-l.credit)) AS amount
             FROM
                 account_move_line l
             WHERE
@@ -224,9 +236,9 @@ class account_asset_asset(osv.osv):
         'child_ids': fields.one2many('account.asset.asset', 'parent_id', 'Children Assets'),
         'purchase_date': fields.date('Purchase Date', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'state': fields.selection([('draft','Draft'),('open','Running'),('close','Close')], 'Status', required=True,
-                                  help="When an asset is created, the state is 'Draft'.\n" \
-                                       "If the asset is confirmed, the state goes in 'Running' and the depreciation lines can be posted in the accounting.\n" \
-                                       "You can manually close an asset when the depreciation is over. If the last line of depreciation is posted, the asset automatically goes in that state."),
+                                  help="When an asset is created, the status is 'Draft'.\n" \
+                                       "If the asset is confirmed, the status goes in 'Running' and the depreciation lines can be posted in the accounting.\n" \
+                                       "You can manually close an asset when the depreciation is over. If the last line of depreciation is posted, the asset automatically goes in that status."),
         'active': fields.boolean('Active'),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}),
         'method': fields.selection([('linear','Linear'),('degressive','Degressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose the method to use to compute the amount of depreciation lines.\n"\
@@ -304,7 +316,7 @@ class account_asset_asset(osv.osv):
         default.update({'depreciation_line_ids': [], 'state': 'draft'})
         return super(account_asset_asset, self).copy(cr, uid, id, default, context=context)
 
-    def _compute_entries(self, cr, uid, ids, period_id, context={}):
+    def _compute_entries(self, cr, uid, ids, period_id, context=None):
         result = []
         period_obj = self.pool.get('account.period')
         depreciation_obj = self.pool.get('account.asset.depreciation.line')
@@ -347,10 +359,10 @@ class account_asset_depreciation_line(osv.osv):
         'sequence': fields.integer('Sequence', required=True),
         'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True),
         'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'),
-        'amount': fields.float('Depreciation Amount', required=True),
-        'remaining_value': fields.float('Amount to Depreciate', required=True),
+        'amount': fields.float('Depreciation Amount', digits_compute=dp.get_precision('Account'), required=True),
+        'remaining_value': fields.float('Amount to Depreciate', digits_compute=dp.get_precision('Account'),required=True),
         'depreciated_value': fields.float('Amount Already Depreciated', required=True),
-        'depreciation_date': fields.char('Depreciation Date', size=64, select=1),
+        'depreciation_date': fields.date('Depreciation Date', select=1),
         'move_id': fields.many2one('account.move', 'Depreciation Entry'),
         'move_check': fields.function(_get_move_check, method=True, type='boolean', string='Posted', store=True)
     }
@@ -365,16 +377,15 @@ class account_asset_depreciation_line(osv.osv):
         move_line_obj = self.pool.get('account.move.line')
         currency_obj = self.pool.get('res.currency')
         created_move_ids = []
+        asset_ids = []
         for line in self.browse(cr, uid, ids, context=context):
-            if currency_obj.is_zero(cr, uid, line.asset_id.currency_id, line.remaining_value):
-                can_close = True
-            depreciation_date = line.asset_id.prorata and line.asset_id.purchase_date or time.strftime('%Y-%m-%d')
+            depreciation_date = time.strftime('%Y-%m-%d')
             period_ids = period_obj.find(cr, uid, depreciation_date, context=context)
             company_currency = line.asset_id.company_id.currency_id.id
             current_currency = line.asset_id.currency_id.id
             context.update({'date': depreciation_date})
             amount = currency_obj.compute(cr, uid, current_currency, company_currency, line.amount, context=context)
-            sign = line.asset_id.category_id.journal_id.type = 'purchase' and 1 or -1
+            sign = (line.asset_id.category_id.journal_id.type == 'purchase' and 1) or -1
             asset_name = line.asset_id.name
             reference = line.name
             move_vals = {
@@ -397,8 +408,8 @@ class account_asset_depreciation_line(osv.osv):
                 'period_id': period_ids and period_ids[0] or False,
                 'journal_id': journal_id,
                 'partner_id': partner_id,
-                'currency_id': company_currency <> current_currency and  current_currency or False,
-                'amount_currency': company_currency <> current_currency and - sign * line.amount or 0.0,
+                'currency_id': company_currency != current_currency and  current_currency or False,
+                'amount_currency': company_currency != current_currency and - sign * line.amount or 0.0,
                 'date': depreciation_date,
             })
             move_line_obj.create(cr, uid, {
@@ -411,16 +422,19 @@ class account_asset_depreciation_line(osv.osv):
                 'period_id': period_ids and period_ids[0] or False,
                 'journal_id': journal_id,
                 'partner_id': partner_id,
-                'currency_id': company_currency <> current_currency and  current_currency or False,
-                'amount_currency': company_currency <> current_currency and sign * line.amount or 0.0,
+                'currency_id': company_currency != current_currency and  current_currency or False,
+                'amount_currency': company_currency != current_currency and sign * line.amount or 0.0,
                 'analytic_account_id': line.asset_id.category_id.account_analytic_id.id,
                 'date': depreciation_date,
                 'asset_id': line.asset_id.id
             })
             self.write(cr, uid, line.id, {'move_id': move_id}, context=context)
             created_move_ids.append(move_id)
-            if can_close:
-                asset_obj.write(cr, uid, [line.asset_id.id], {'state': 'close'}, context=context)
+            asset_ids.append(line.asset_id.id)
+        # we re-evaluate the assets to determine whether we can close them
+        for asset in asset_obj.browse(cr, uid, list(set(asset_ids)), context=context):
+            if currency_obj.is_zero(cr, uid, asset.currency_id, asset.value_residual):
+                asset.write({'state': 'close'})
         return created_move_ids
 
 account_asset_depreciation_line()
diff --git a/addons/account_asset/account_asset_invoice.py b/addons/account_asset/account_asset_invoice.py
index 700832881c4..4b38834bdc3 100644
--- a/addons/account_asset/account_asset_invoice.py
+++ b/addons/account_asset/account_asset_invoice.py
@@ -57,6 +57,7 @@ class account_invoice_line(osv.osv):
                     'partner_id': line.invoice_id.partner_id.id,
                     'company_id': line.invoice_id.company_id.id,
                     'currency_id': line.invoice_id.currency_id.id,
+                    'purchase_date' : line.invoice_id.date_invoice,
                 }
                 changed_vals = asset_obj.onchange_category_id(cr, uid, [], vals['category_id'], context=context)
                 vals.update(changed_vals['value'])
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index c230f63e204..520ee733e73 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -100,36 +100,36 @@
                         </group>
                         <group>
                             <field name="purchase_date"/>
-                            <field name="currency_id"/>
+                            <field name="currency_id" groups="base.group_multi_currency"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company" on_change="onchange_company_id(company_id)"/>
                         </group>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
-	                        <group>
-	                            <group>
-	                                <field name="purchase_value"/>
-	                                <field name="salvage_value"/>
-	                                <field name="value_residual"/>
+                            <group>
+                                <group>
+                                    <field name="purchase_value" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                    <field name="salvage_value" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                    <field name="value_residual" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                     <field name="partner_id"/>
-	                            </group>
-	                            <group>
-	                                <field name="method"/>
-	                                <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
+                                </group>
+                                <group>
+                                    <field name="method"/>
+                                    <field name="method_progress_factor" attrs="{'invisible':[('method','=','linear')], 'required':[('method','=','degressive')]}"/>
                                     <label for="method_time"/>
                                     <div>
-	                                    <field name="method_time" on_change="onchange_method_time(method_time)" class="oe_inline"/>
-	                                    <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" class="oe_inline" colspan="1"/>
+                                        <field name="method_time" on_change="onchange_method_time(method_time)" class="oe_inline"/>
+                                        <button name="%(action_asset_modify)d" states="open" string="Change Duration" type="action" icon="terp-stock_effects-object-colorize" class="oe_inline" colspan="1"/>
                                     </div>
-	                                <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
-	                                <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
-	                                <field name="method_period"/>
-	                                <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
-	                            </group>
-	                        </group>
+                                    <field name="prorata" attrs="{'invisible': [('method_time','=','end')]}"/>
+                                    <field name="method_number" attrs="{'invisible':[('method_time','=','end')], 'required':[('method_time','=','number')]}"/>
+                                    <field name="method_period"/>
+                                    <field name="method_end" attrs="{'required': [('method_time','=','end')], 'invisible':[('method_time','=','number')]}"/>
+                                </group>
+                            </group>
                         </page>
                         <page string="Depreciation Board">
-                            <field name="depreciation_line_ids" mode="tree,graph">
+                            <field name="depreciation_line_ids" mode="tree">
                                 <tree string="Depreciation Lines" colors="blue:(move_check == False);black:(move_check == True)">
                                     <field name="depreciation_date"/>
                                     <field name="sequence" invisible="1"/>
@@ -159,11 +159,6 @@
                                         </group>
                                     </group>
                                 </form>
-                                <graph type="bar">
-                                    <field name="name"/>
-                                    <field name="amount"/>
-                                    <field name="depreciated_value"/>
-                                </graph>
                             </field>
                             <button type="object" name="compute_depreciation_board" string="Compute" icon="terp-stock_format-scientific" colspan="2" attrs="{'invisible':[('state','=','close')]}"/>
                         </page>
@@ -192,7 +187,7 @@
                 <field name="partner_id"/>
                 <field name="purchase_value"/>
                 <field name="value_residual"/>
-                <field name="currency_id"/>
+                <field name="currency_id" groups="base.group_multi_currency"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="state"/>
             </tree>
@@ -211,7 +206,7 @@
                 <field name="purchase_date"/>
                 <field name="purchase_value"/>
                 <field name="value_residual"/>
-                <field name="currency_id"/>
+                <field name="currency_id" groups="base.group_multi_currency"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="state"/>
             </tree>
diff --git a/addons/account_asset/i18n/ar.po b/addons/account_asset/i18n/ar.po
index ae66d61ebbe..004559967fb 100644
--- a/addons/account_asset/i18n/ar.po
+++ b/addons/account_asset/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/ca.po b/addons/account_asset/i18n/ca.po
index a7bc0eb372f..9ca707b822a 100755
--- a/addons/account_asset/i18n/ca.po
+++ b/addons/account_asset/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/cs.po b/addons/account_asset/i18n/cs.po
index 197a3751fc0..7456d75be42 100644
--- a/addons/account_asset/i18n/cs.po
+++ b/addons/account_asset/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: account_asset
diff --git a/addons/account_asset/i18n/da.po b/addons/account_asset/i18n/da.po
index 2796fd1a85f..78c4ef59a3b 100644
--- a/addons/account_asset/i18n/da.po
+++ b/addons/account_asset/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po
index 07f094ed24c..983f63abec4 100755
--- a/addons/account_asset/i18n/de.po
+++ b/addons/account_asset/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/es.po b/addons/account_asset/i18n/es.po
index 0d098e93c1c..e0c2ccb477f 100755
--- a/addons/account_asset/i18n/es.po
+++ b/addons/account_asset/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -74,7 +74,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.history,name:0
 msgid "History name"
-msgstr "Nombre histórico"
+msgstr "Nombre del histórico"
 
 #. module: account_asset
 #: field:account.asset.asset,company_id:0
@@ -569,7 +569,7 @@ msgstr "Buscar categoría de activo"
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
-msgstr ""
+msgstr "Asistente de confirmación de depreciación de activo"
 
 #. module: account_asset
 #: field:account.asset.asset,active:0
diff --git a/addons/account_asset/i18n/es_AR.po b/addons/account_asset/i18n/es_AR.po
index 173bed5f355..8a6e702fa50 100644
--- a/addons/account_asset/i18n/es_AR.po
+++ b/addons/account_asset/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/es_CR.po b/addons/account_asset/i18n/es_CR.po
index 5a814afb640..666546ebeb9 100755
--- a/addons/account_asset/i18n/es_CR.po
+++ b/addons/account_asset/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: account_asset
diff --git a/addons/account_asset/i18n/es_EC.po b/addons/account_asset/i18n/es_EC.po
index fde61116e0c..f8808695ed9 100644
--- a/addons/account_asset/i18n/es_EC.po
+++ b/addons/account_asset/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/et.po b/addons/account_asset/i18n/et.po
index 567f7223177..8d75dca7974 100644
--- a/addons/account_asset/i18n/et.po
+++ b/addons/account_asset/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/fi.po b/addons/account_asset/i18n/fi.po
index dd067444993..453fb5a69e0 100644
--- a/addons/account_asset/i18n/fi.po
+++ b/addons/account_asset/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/fr.po b/addons/account_asset/i18n/fr.po
index e660a078653..825564b6c8a 100755
--- a/addons/account_asset/i18n/fr.po
+++ b/addons/account_asset/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/gu.po b/addons/account_asset/i18n/gu.po
index b8b437094a6..7e4d38d312a 100644
--- a/addons/account_asset/i18n/gu.po
+++ b/addons/account_asset/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/hr.po b/addons/account_asset/i18n/hr.po
index b01e487b053..36c7cc160f1 100644
--- a/addons/account_asset/i18n/hr.po
+++ b/addons/account_asset/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/id.po b/addons/account_asset/i18n/id.po
index 2cc9adb97ae..d89a8b3e7a5 100644
--- a/addons/account_asset/i18n/id.po
+++ b/addons/account_asset/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/ja.po b/addons/account_asset/i18n/ja.po
index 6b303942324..09a308bda02 100644
--- a/addons/account_asset/i18n/ja.po
+++ b/addons/account_asset/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/lt.po b/addons/account_asset/i18n/lt.po
index 859ef9e2065..c9918df2071 100644
--- a/addons/account_asset/i18n/lt.po
+++ b/addons/account_asset/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/mn.po b/addons/account_asset/i18n/mn.po
index af6b4e278ee..88c57af4191 100644
--- a/addons/account_asset/i18n/mn.po
+++ b/addons/account_asset/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/nb.po b/addons/account_asset/i18n/nb.po
new file mode 100644
index 00000000000..67953721f81
--- /dev/null
+++ b/addons/account_asset/i18n/nb.po
@@ -0,0 +1,839 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-28 14:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr "Eiendeler i utkastet og åpen stater"
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr "Slutt dato"
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "restverdi"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr "Avskr. utgiftskonto"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "Beregn eiendel"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr "bruttobeløp"
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
+#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr "Eiendel"
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr ""
+"Angir at den første avskrivninger oppføring for denne eiendelen må gjøres "
+"fra kjøpsdato i stedet for første januar"
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr "Historie navn"
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0 view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr "Modifiser"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "Løper"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr "avskrivningsbeløpet"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "eiendeler Analyse"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr "Grunn"
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr "degressive faktor"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "Eiendel kategorier"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr ""
+"Denne veiviseren vil legge inn avskrivning linjer som kjører eiendeler som "
+"tilhører den valgte perioden."
+
+#. module: account_asset
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr "Inngang"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr "Avskrivninger linjer"
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr "det er mengden du har tenkt å ha du ikke kan avskrive."
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr "Avskrivninger  Dato"
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "Eiendel Konto"
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr "Skrevet Beløp"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr "Eiendeler"
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr "avskrivnings konto"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr "Avskrivnings Inngang"
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "Feil kredit eller debet beløp i regnskaps oppføringen !"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr "Ant. Avskrivninger linjer"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr "Eiendeler i utkast"
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr "Sluttdato"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "Referanse"
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr "Konto Eiendel"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr "Beregn Eiendeler"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr "Sekvens av svekkelsen"
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr "Periode lengde"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr "Kladd"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "Dato for kjøpsavtalen"
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr "Beregner Avskrivninger innen angitt intervall"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr "Endre Varighet"
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "Analytisk konto"
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "Beregningsmetoden"
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr "Oppgi her tiden under 2 avskrivninger, i måneder."
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr ""
+"Prorata temporis kan bare brukes for tiden metoden \"antall avskrivninger\"."
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"Metode for å beregne datoene og antall avskrivninger linjer.\n"
+"Antall Avskrivninger: Fest antall avskrivninger linjer og tiden mellom to "
+"avskrivninger.\n"
+"Sluttdato: Velg mellom 2 avskrivninger og datoen avskrivninger vil ikke gå "
+"utover."
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr "Bruttoverdi "
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr "Feil! Du kan ikke lage rekrusive eiendeler."
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr "Tiden i måneden mellom to avskrivninger"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+msgstr "År"
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr "Endre eiendel"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr "Annen informasjon"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr "Restverdi"
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr "Eiendel kategori"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr "Satt til Lukk."
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr "Beregn eiendeler"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr "Endre eiendel."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr "Eiendeler i lukket tilstand"
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr "overordnede Eiendel"
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr "Eiendel historie"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr "Eiendeler som er kjøpt i inneværende år"
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Fakturalinje"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+"Den valgte kontoen av dine Bilagsregistrering blir tvunget for å gi en "
+"sekundær valuta. Du bør fjerne den sekundære valuta på konto eller velg en "
+"flervaluta syn på tidsskriftet."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr "Avskrivninger Styret"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "Journal Elementer"
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr "Ikke resultatført beløp"
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr "tid Metode"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr ""
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"Datoen for din bilagsregistrering ikke er i den definerte perioden! Du bør "
+"endre datoen eller fjerne denne begrensningen fra tidsskriftet."
+
+#. module: account_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr "Notat"
+
+#. module: account_asset
+#: help:account.asset.asset,method:0 help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+"Velg metoden som skal brukes for å beregne mengden av avskrivninger linjer.\n"
+"* Lineær: Beregnet på grunnlag av: bruttoverdi / Antall Avskrivninger\n"
+"* Degressiv: Beregnet på grunnlag av: restverdi * degressiv faktor"
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"Velg metoden som skal brukes for å beregne datoene og antall avskrivninger "
+"linjer.\n"
+" * Antall Avskrivninger: Fest antall avskrivninger linjer og tiden mellom to "
+"avskrivninger.\n"
+" * Sluttdato: Velg mellom 2 avskrivninger og datoen avskrivninger vil ikke "
+"gå utover."
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr "Eiendeler i rennende staten"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr "Lukket"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr "Størrelsen på avskrivningene linjer"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr "Postet avskrivninger linjer"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "Selskapet må være den samme for tilhørende konto og periode"
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr "Barn Eiendeler"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr "Dato av avskrivninger"
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr "Bruker"
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr "Eiendeler som er kjøpt i inneværende måned"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "Du kan ikke lage journalregistreringer på konto av typen vis"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr "Utvidet Filtere ..."
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr "Beregn"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr "Søk eiendel Kategori"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr "eiendel.avskrivninger.bekreftelse.veiviseren"
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr "Lukket eiendel"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr "State av eiendel."
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr "Avskrivninger Navn"
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr "Historie"
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Fakturanummer må være unik pr. firma!"
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "Periode"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr "Genrelt"
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr ""
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr "Gjennomgå eiendel kategorier"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr "Lukke"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "Avskrivningsmetode"
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr "Kjøpsdato"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr ""
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr ""
+"Velg den perioden du ønsker å automatisk legge inn avskrivninger linjer av "
+"kjører eiendeler."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr "Nåværende"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr "Beløp å avskrive"
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr "Hopp over Utkast stat"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr "Avskrivninger datoer"
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr "Beløp Allerede Avskrives"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr "Lagt inn"
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that state."
+msgstr ""
+"Når en eiendel er opprettet, er staten \"Kladd\".\n"
+"Dersom eiendelen er bekreftet, går staten i 'Running' og avskrivninger "
+"linjer kan bli lagt i regnskapssystemet.\n"
+"Du kan manuelt lukke et aktivum når avskrivningen er over. Hvis den siste "
+"linjen av avskrivninger er lagt ut, går eiendelen automatisk i den "
+"tilstanden."
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr ""
+"Sjekk dette hvis du ønsker å automatisk bekrefte eiendeler i denne "
+"kategorien når laget av fakturaer."
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "Sett som utkast"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr "Lineær"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr "Måned-1"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr "Eiendel avskrinings linje"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr "Eiendel kategori"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr "Eiendeler som er kjøpt i forrige måned."
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr "Opprettet eiendel trekk."
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "Du kan ikke lage journal elementer på en lukket konto."
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr ""
+"Fra denne rapporten, kan du ha en oversikt over alle avskrivninger. "
+"Verktøyet søk kan også brukes til å tilpasse dine eiendeler rapporter og så "
+"matche denne analysen til dine behov;"
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr "Angi tiden mellom to avskrivninger, i måneder"
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr "Antall Avskrivninger"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr ""
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+msgstr "Innlegg Avskrivninger linjer"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr "Bekreft eiendel"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr "Eiendel Hierarki."
+
+#~ msgid "Asset durations to modify"
+#~ msgstr "Eiendel lengder å endre"
+
+#~ msgid "Analytic information"
+#~ msgstr "analytisk informasjon"
+
+#~ msgid "Accounting information"
+#~ msgstr "Regnskapsopplysninger"
diff --git a/addons/account_asset/i18n/nl.po b/addons/account_asset/i18n/nl.po
index bced4186945..dc30678fe86 100644
--- a/addons/account_asset/i18n/nl.po
+++ b/addons/account_asset/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-06-28 12:49+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -116,7 +116,7 @@ msgstr "Oorzaak"
 #: field:account.asset.asset,method_progress_factor:0
 #: field:account.asset.category,method_progress_factor:0
 msgid "Degressive Factor"
-msgstr "Degressieve factor"
+msgstr "Degressief factor"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
@@ -156,7 +156,7 @@ msgstr ""
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
 msgid "Depreciation Date"
-msgstr "fschrijvingsdatum"
+msgstr "Afschrijvingsdatum"
 
 #. module: account_asset
 #: field:account.asset.category,account_asset_id:0
@@ -324,7 +324,7 @@ msgstr "Fout! Het is niet mogelijk recursieve activa te maken."
 #. module: account_asset
 #: help:account.asset.history,method_period:0
 msgid "Time in month between two depreciations"
-msgstr "Tijd in maanden tussen twee waardeverminderingen"
+msgstr "Tijd in maanden tussen twee afschrijvingen"
 
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,name:0
@@ -351,7 +351,7 @@ msgstr "Restwaarde"
 #. module: account_asset
 #: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
 msgid "Asset Category"
-msgstr "Asset categorie"
+msgstr "Activa categorie"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -418,7 +418,7 @@ msgstr "Maand"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation Board"
-msgstr "Afschrijving dashboard"
+msgstr "Afschrijvingskaart"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_move_line
@@ -472,7 +472,7 @@ msgstr ""
 "Kies de methode welke gebruikt kan worden om de hoeveelheid "
 "afschrijvingsregels te berekenen.\n"
 "   * Lineaire: Berekend op basis van: Bruto waarde / Aantal Afschrijvingen\n"
-"   * Degressieve: Berekend op basis van: Restwaarde * Degressieve Factor"
+"   * Degressief: Berekend op basis van: Restwaarde * Degressief Factor"
 
 #. module: account_asset
 #: help:account.asset.asset,method_time:0
@@ -660,7 +660,7 @@ msgstr "Aankoopdatum"
 #: selection:account.asset.asset,method:0
 #: selection:account.asset.category,method:0
 msgid "Degressive"
-msgstr "Degressieve"
+msgstr "Degressief"
 
 #. module: account_asset
 #: help:asset.depreciation.confirmation.wizard,period_id:0
@@ -690,7 +690,7 @@ msgstr "Sla concept status over"
 #: view:account.asset.asset:0 view:account.asset.category:0
 #: view:account.asset.history:0
 msgid "Depreciation Dates"
-msgstr "Afschrijvingsdatum"
+msgstr "Afschrijvingsdata"
 
 #. module: account_asset
 #: field:account.asset.asset,currency_id:0
@@ -813,7 +813,7 @@ msgstr "Geef hier de tijd tussen twee afschrijvingen, in maanden"
 #: selection:account.asset.history,method_time:0
 #: field:asset.modify,method_number:0
 msgid "Number of Depreciations"
-msgstr "Aantal waardeverminderingen"
+msgstr "Aantal afschrijvingen"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/nl_BE.po b/addons/account_asset/i18n/nl_BE.po
index b608dd8ff05..c09860bdef0 100644
--- a/addons/account_asset/i18n/nl_BE.po
+++ b/addons/account_asset/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/pl.po b/addons/account_asset/i18n/pl.po
index 9805c996047..faa0e4585e4 100755
--- a/addons/account_asset/i18n/pl.po
+++ b/addons/account_asset/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -46,7 +46,7 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupuj wg..."
 
 #. module: account_asset
 #: field:asset.asset.report,gross_value:0
@@ -84,7 +84,7 @@ msgstr ""
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Modify"
-msgstr ""
+msgstr "Modyfikuj"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0 view:asset.asset.report:0
@@ -316,7 +316,7 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -397,7 +397,7 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Month"
-msgstr ""
+msgstr "Miesiąc"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/pt.po b/addons/account_asset/i18n/pt.po
index bbd480b263c..ba324c5fd3c 100755
--- a/addons/account_asset/i18n/pt.po
+++ b/addons/account_asset/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/pt_BR.po b/addons/account_asset/i18n/pt_BR.po
index 36ae09d2b8e..e539640c6a1 100644
--- a/addons/account_asset/i18n/pt_BR.po
+++ b/addons/account_asset/i18n/pt_BR.po
@@ -9,18 +9,19 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-07-28 14:07+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in draft and open states"
-msgstr "Ativos em projeto e estados abertos"
+msgstr "Patrimônios em situação Provisório e Aberta"
 
 #. module: account_asset
 #: field:account.asset.category,method_end:0
@@ -41,12 +42,12 @@ msgstr "Depr.Contas de despesas"
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
 msgid "Compute Asset"
-msgstr "Calcule os Ativos"
+msgstr "Calcular Patrimônio"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Group By..."
-msgstr "Agrupado Por..."
+msgstr "Agrupar Por..."
 
 #. module: account_asset
 #: field:asset.asset.report,gross_value:0
@@ -60,7 +61,7 @@ msgstr "Valor Bruto"
 #: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
 #: model:ir.model,name:account_asset.model_account_asset_asset
 msgid "Asset"
-msgstr "Ativo"
+msgstr "Patrimônio"
 
 #. module: account_asset
 #: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
@@ -68,7 +69,7 @@ msgid ""
 "Indicates that the first depreciation entry for this asset have to be done "
 "from the purchase date instead of the first January"
 msgstr ""
-"Indica que a primeira entrada de depreciação para este ativo foi feita pela "
+"Indica que a primeira entrada de depreciação para este bem foi feita pela "
 "data de entrada em vez de primeiro de Janeiro"
 
 #. module: account_asset
@@ -97,7 +98,7 @@ msgstr "Executando"
 #. module: account_asset
 #: field:account.asset.depreciation.line,amount:0
 msgid "Depreciation Amount"
-msgstr "Montante de Depreciação"
+msgstr "Valor de Depreciação"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -105,7 +106,7 @@ msgstr "Montante de Depreciação"
 #: model:ir.model,name:account_asset.model_asset_asset_report
 #: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
 msgid "Assets Analysis"
-msgstr "Análise de Ativos"
+msgstr "Análise de Patrimônios"
 
 #. module: account_asset
 #: field:asset.modify,name:0
@@ -122,7 +123,7 @@ msgstr "Fator Degressiva"
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
 #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
 msgid "Asset Categories"
-msgstr "Categorias de Ativos"
+msgstr "Categorias de Patrimônio"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
@@ -138,7 +139,7 @@ msgstr ""
 #: field:account.move.line,entry_ids:0
 #: model:ir.actions.act_window,name:account_asset.act_entries_open
 msgid "Entries"
-msgstr "Entradas"
+msgstr "Lançamentos"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -160,12 +161,12 @@ msgstr "Data de Depreciação"
 #. module: account_asset
 #: field:account.asset.category,account_asset_id:0
 msgid "Asset Account"
-msgstr "Conta de Ativo"
+msgstr "Conta do Patrimônio"
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
 msgid "Posted Amount"
-msgstr "Valor Postado"
+msgstr "Valor Lançado"
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:asset.asset.report:0
@@ -174,7 +175,7 @@ msgstr "Valor Postado"
 #: model:ir.ui.menu,name:account_asset.menu_finance_assets
 #: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
 msgid "Assets"
-msgstr "Ativos"
+msgstr "Patrimônios"
 
 #. module: account_asset
 #: field:account.asset.category,account_depreciation_id:0
@@ -205,7 +206,7 @@ msgstr "# Linhas de Depreciação"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in draft state"
-msgstr "Ativos em estados de rascunho"
+msgstr "Patrimônios em situação Provisório"
 
 #. module: account_asset
 #: field:account.asset.asset,method_end:0
@@ -228,13 +229,13 @@ msgstr "Comunicação estruturada BBA inválida !"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Account Asset"
-msgstr "Ativo de Contas"
+msgstr "Conta Patrimonial"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
 #: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
 msgid "Compute Assets"
-msgstr "Calcule os Ativos"
+msgstr "Calcular Patrimônio"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,sequence:0
@@ -253,12 +254,12 @@ msgstr "Duração do Período"
 #: selection:account.asset.asset,state:0 view:asset.asset.report:0
 #: selection:asset.asset.report,state:0
 msgid "Draft"
-msgstr "Rascunho"
+msgstr "Provisório"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Date of asset purchase"
-msgstr "Data de compras de ativos"
+msgstr "Data da compra do bem"
 
 #. module: account_asset
 #: help:account.asset.asset,method_number:0
@@ -268,7 +269,7 @@ msgstr "Calcula a depreciação dentro do intervalo especificado"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
-msgstr "Altera a Duração"
+msgstr "Alterar Duração"
 
 #. module: account_asset
 #: field:account.asset.category,account_analytic_id:0
@@ -303,7 +304,7 @@ msgid ""
 "Ending Date: Choose the time between 2 depreciations and the date the "
 "depreciations won't go beyond."
 msgstr ""
-"O método usado para computar as datas e números das linhas de depreciações.\n"
+"O método usado para calcular as datas e números das linhas de depreciações.\n"
 "Número de Depreciações: Defina o número de depreciações entre 2 "
 "depreciações.\n"
 "Data Final: Escolha o tempo entre 2 depreciações e a data não irá além"
@@ -333,7 +334,7 @@ msgstr "Ano"
 #: model:ir.actions.act_window,name:account_asset.action_asset_modify
 #: model:ir.model,name:account_asset.model_asset_modify
 msgid "Modify Asset"
-msgstr "Modificar Ativos"
+msgstr "Modificar Patrimônio"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -348,7 +349,7 @@ msgstr "Valor de Salvamento"
 #. module: account_asset
 #: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
 msgid "Asset Category"
-msgstr "Categoria de Ativos"
+msgstr "Categoria do Patrimônio"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -358,43 +359,43 @@ msgstr "Definir para Fechar"
 #. module: account_asset
 #: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
 msgid "Compute assets"
-msgstr "Calcular ativos"
+msgstr "Calcular patrimônios"
 
 #. module: account_asset
 #: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
 msgid "Modify asset"
-msgstr "Modificar ativo"
+msgstr "Modificar patrimônio"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in closed state"
-msgstr "Ativos em estados fechados"
+msgstr "Patrimônios em situação fechado"
 
 #. module: account_asset
 #: field:account.asset.asset,parent_id:0
 msgid "Parent Asset"
-msgstr "Ativo Relacionado"
+msgstr "Patrimônio Relacionado"
 
 #. module: account_asset
 #: view:account.asset.history:0
 #: model:ir.model,name:account_asset.model_account_asset_history
 msgid "Asset history"
-msgstr "Histórico do ativo"
+msgstr "Histórico do Bem"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets purchased in current year"
-msgstr "Ativos adquiridos no ano em curso"
+msgstr "Bens adquiridos este ano"
 
 #. module: account_asset
 #: field:account.asset.asset,state:0 field:asset.asset.report,state:0
 msgid "State"
-msgstr "Estado"
+msgstr "Situação"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
-msgstr "Linha de Fatura"
+msgstr "Linha da Fatura"
 
 #. module: account_asset
 #: constraint:account.move.line:0
@@ -425,7 +426,7 @@ msgstr "Itens do Diário"
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
-msgstr "Valor Não Postada"
+msgstr "Valor não lançado"
 
 #. module: account_asset
 #: field:account.asset.asset,method_time:0
@@ -490,7 +491,7 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in running state"
-msgstr "Ativos em uso"
+msgstr "Bens em uso"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -511,7 +512,7 @@ msgstr "Quantidade de Linhas de Depreciação"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Posted depreciation lines"
-msgstr "Linhas de depreciação publicadas"
+msgstr "Linhas de depreciação lançadas"
 
 #. module: account_asset
 #: constraint:account.move.line:0
@@ -521,7 +522,7 @@ msgstr "Empresa deve ser a mesma para a sua conta relacionada e período."
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
 msgid "Children Assets"
-msgstr "Ativos Filhos"
+msgstr "Patrimônios filhos"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -541,7 +542,7 @@ msgstr "Data"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets purchased in current month"
-msgstr "Ativos adquiridos no mês atual"
+msgstr "Bens adquiridos no mês atual"
 
 #. module: account_asset
 #: constraint:account.move.line:0
@@ -562,7 +563,7 @@ msgstr "Calcular"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Search Asset Category"
-msgstr "Escolha a Categoria do Ativo"
+msgstr "Procurar Categoria de Patrimônio"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
@@ -577,12 +578,12 @@ msgstr "Ativo"
 #. module: account_asset
 #: model:ir.actions.wizard,name:account_asset.wizard_asset_close
 msgid "Close asset"
-msgstr "Fechar ativo"
+msgstr "Fechar patrimônio"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
 msgid "State of Asset"
-msgstr "Situação do Ativo"
+msgstr "Situação do Patrimônio"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,name:0
@@ -597,7 +598,7 @@ msgstr "Histórico"
 #. module: account_asset
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr "O número da fatura deve ser único por Empresa!"
+msgstr "O Número da Fatura deve ser único por Empresa!"
 
 #. module: account_asset
 #: field:asset.depreciation.confirmation.wizard,period_id:0
@@ -627,7 +628,7 @@ msgstr "Fatura"
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
 msgid "Review Asset Categories"
-msgstr "Reveja as Categorias de Ativos"
+msgstr "Reveja as Categorias Patrimoniais"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
@@ -663,7 +664,7 @@ msgid ""
 "lines of running assets"
 msgstr ""
 "Escolha o período em que você deseja publicar as linhas de depreciação de "
-"ativos automaticamente"
+"bens automaticamente"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -678,7 +679,7 @@ msgstr "Valor a Depreciar"
 #. module: account_asset
 #: field:account.asset.category,open_asset:0
 msgid "Skip Draft State"
-msgstr "Pular a Situação de Esboço"
+msgstr "Pular a Situação Provisório"
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:account.asset.category:0
@@ -716,11 +717,12 @@ msgid ""
 "You can manually close an asset when the depreciation is over. If the last "
 "line of depreciation is posted, the asset automatically goes in that state."
 msgstr ""
-"Quando um ativo é criado, a situação é 'Provisória'\n"
+"Quando um patrimônio é criado, a situação é 'Provisório'\n"
 "Se o ativo é confirmado, a situação muda para 'Em andamento' e a depreciação "
 "pode ser lançada na contabilidade.\n"
-"Você pode fechar um ativo quando a depreciação acabar. Se a última linha da "
-"depreciação for lançada, o ativo automaticamente muda para esta situação."
+"Você pode fechar um patrimônio quando a depreciação acabar. Se a última "
+"linha da depreciação for lançada, o patrimônio automaticamente muda para "
+"esta situação."
 
 #. module: account_asset
 #: field:account.asset.category,name:0
@@ -755,14 +757,14 @@ msgstr "Mês-1"
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
 msgid "Asset depreciation line"
-msgstr "Linha de depreciação de bem"
+msgstr "Linha de depreciação do bem"
 
 #. module: account_asset
 #: field:account.asset.asset,category_id:0 view:account.asset.category:0
 #: field:asset.asset.report,asset_category_id:0
 #: model:ir.model,name:account_asset.model_account_asset_category
 msgid "Asset category"
-msgstr "Categoria de Ativo"
+msgstr "Categoria do Patrimônio"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -820,19 +822,46 @@ msgstr "Lançar Linhas de Depreciação"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Confirm Asset"
-msgstr "Confirmar Ativo"
+msgstr "Confirmar Patrimônio"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
 #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
 msgid "Asset Hierarchy"
-msgstr "Hierarquia do ativo"
+msgstr "Hierarquia do Patrimônio"
 
-#~ msgid "Asset durations to modify"
-#~ msgstr "Ativos para modificar durações"
+#~ msgid "Open Assets"
+#~ msgstr "Ativos em aberto"
+
+#~ msgid "Progressive"
+#~ msgstr "Progressivo"
+
+#~ msgid "Open entries"
+#~ msgstr "Entradas em aberto"
+
+#~ msgid "Method"
+#~ msgstr "Método"
+
+#~ msgid "General info"
+#~ msgstr "Informações gerais"
+
+#~ msgid "View"
+#~ msgstr "Visualizar"
 
 #~ msgid "Analytic information"
 #~ msgstr "Informação Analítica"
 
 #~ msgid "Accounting information"
 #~ msgstr "Informações Contábeis"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para Arquitetura da View"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome do modelo Inválido na definição da ação"
+
+#~ msgid "Asset durations to modify"
+#~ msgstr "Bens para modificar duração"
diff --git a/addons/account_asset/i18n/ro.po b/addons/account_asset/i18n/ro.po
index a8b18ebc985..749a939168c 100644
--- a/addons/account_asset/i18n/ro.po
+++ b/addons/account_asset/i18n/ro.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-04-18 07:47+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-10-17 08:25+0000\n"
+"Last-Translator: filsys <office@filsystem.ro>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -440,12 +440,12 @@ msgstr "Metoda Timp"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic Information"
-msgstr ""
+msgstr "Informatii analitice"
 
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Asset Durations to Modify"
-msgstr ""
+msgstr "Durata de modificat"
 
 #. module: account_asset
 #: constraint:account.move.line:0
@@ -486,11 +486,11 @@ msgid ""
 "depreciations won't go beyond."
 msgstr ""
 "Alegeti metoda care va fi folosita pentru a calcula datele si numarul "
-"liniilor devalorizarii.\n"
-"  * Numarul Devalorizarilor: Fixati numarul liniilor devalorizarii si "
-"perioada dintre 2 devalorizari.\n"
-"  * Data de sfarsit: Alegeti perioada dintre 2 devalorizari si data pe care "
-"devalorizarile nu o vor depasi."
+"liniilor amortizarii.\n"
+"* Numarul Amortizarilor: Fixati numarul liniilor amortizarii si perioada "
+"dintre 2 amortizari.\n"
+"* Data de sfarsit: Alegeti perioada dintre 2 amortizari si data pe care "
+"amortizarile nu o vor depasi."
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -622,7 +622,7 @@ msgstr "Prorata Temporis"
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Informații contabile"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice
diff --git a/addons/account_asset/i18n/ru.po b/addons/account_asset/i18n/ru.po
index accd427cfd2..de08998c030 100644
--- a/addons/account_asset/i18n/ru.po
+++ b/addons/account_asset/i18n/ru.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in draft and open states"
-msgstr ""
+msgstr "Активы в состоянии \"Черновик\" и \"Открыто\""
 
 #. module: account_asset
 #: field:account.asset.category,method_end:0
@@ -31,12 +31,12 @@ msgstr "Дата окончания"
 #. module: account_asset
 #: field:account.asset.asset,value_residual:0
 msgid "Residual Value"
-msgstr ""
+msgstr "Остаточная стоимость"
 
 #. module: account_asset
 #: field:account.asset.category,account_expense_depreciation_id:0
 msgid "Depr. Expense Account"
-msgstr ""
+msgstr "Счет амортизационных отчислений"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
@@ -46,12 +46,12 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Группировать по ..."
 
 #. module: account_asset
 #: field:asset.asset.report,gross_value:0
 msgid "Gross Amount"
-msgstr ""
+msgstr "Общая сумма"
 
 #. module: account_asset
 #: view:account.asset.asset:0 field:account.asset.asset,name:0
@@ -68,6 +68,8 @@ msgid ""
 "Indicates that the first depreciation entry for this asset have to be done "
 "from the purchase date instead of the first January"
 msgstr ""
+"Показывает, что первая проводка амортизации для этого актива должна быть "
+"сделана с даты приобретения, а не с первого января."
 
 #. module: account_asset
 #: field:account.asset.history,name:0
@@ -79,23 +81,23 @@ msgstr ""
 #: field:account.asset.category,company_id:0 view:asset.asset.report:0
 #: field:asset.asset.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Компания"
 
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Modify"
-msgstr ""
+msgstr "Изменить"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0 view:asset.asset.report:0
 #: selection:asset.asset.report,state:0
 msgid "Running"
-msgstr ""
+msgstr "Выполняется"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,amount:0
 msgid "Depreciation Amount"
-msgstr ""
+msgstr "Сумма амортизации"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -103,7 +105,7 @@ msgstr ""
 #: model:ir.model,name:account_asset.model_asset_asset_report
 #: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
 msgid "Assets Analysis"
-msgstr ""
+msgstr "Анализ активов"
 
 #. module: account_asset
 #: field:asset.modify,name:0
@@ -120,7 +122,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
 #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
 msgid "Asset Categories"
-msgstr ""
+msgstr "Категории активов"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
@@ -140,7 +142,7 @@ msgstr "Записи"
 #: view:account.asset.asset:0
 #: field:account.asset.asset,depreciation_line_ids:0
 msgid "Depreciation Lines"
-msgstr ""
+msgstr "Позиции амортизации"
 
 #. module: account_asset
 #: help:account.asset.asset,salvage_value:0
@@ -151,17 +153,17 @@ msgstr ""
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
 msgid "Depreciation Date"
-msgstr ""
+msgstr "Дата амортизации"
 
 #. module: account_asset
 #: field:account.asset.category,account_asset_id:0
 msgid "Asset Account"
-msgstr ""
+msgstr "Счет активов"
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
 msgid "Posted Amount"
-msgstr ""
+msgstr "Проведенная сумма"
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:asset.asset.report:0
@@ -175,7 +177,7 @@ msgstr "Основные средства"
 #. module: account_asset
 #: field:account.asset.category,account_depreciation_id:0
 msgid "Depreciation Account"
-msgstr ""
+msgstr "Счет амортизации"
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:account.asset.category:0
@@ -186,22 +188,22 @@ msgstr "Примечания"
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_id:0
 msgid "Depreciation Entry"
-msgstr ""
+msgstr "Проводка амортизации"
 
 #. module: account_asset
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Ошибочное значение проводки по дебету или кредиту !"
 
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,nbr:0
 msgid "# of Depreciation Lines"
-msgstr ""
+msgstr "# позиций амортизации"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in draft state"
-msgstr ""
+msgstr "Активы в состоянии \"Черновик\""
 
 #. module: account_asset
 #: field:account.asset.asset,method_end:0
@@ -209,12 +211,12 @@ msgstr ""
 #: selection:account.asset.category,method_time:0
 #: selection:account.asset.history,method_time:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Дата окончания"
 
 #. module: account_asset
 #: field:account.asset.asset,code:0
 msgid "Reference"
-msgstr ""
+msgstr "Ссылка"
 
 #. module: account_asset
 #: constraint:account.invoice:0
@@ -224,7 +226,7 @@ msgstr ""
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Account Asset"
-msgstr ""
+msgstr "Счет активов"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
@@ -235,7 +237,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.depreciation.line,sequence:0
 msgid "Sequence of the depreciation"
-msgstr ""
+msgstr "Нумерация амортизации"
 
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
@@ -243,7 +245,7 @@ msgstr ""
 #: field:account.asset.history,method_period:0
 #: field:asset.modify,method_period:0
 msgid "Period Length"
-msgstr ""
+msgstr "Длина периода"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0 view:asset.asset.report:0
@@ -254,17 +256,17 @@ msgstr "Черновик"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Date of asset purchase"
-msgstr ""
+msgstr "Дата приобретения актива"
 
 #. module: account_asset
 #: help:account.asset.asset,method_number:0
 msgid "Calculates Depreciation within specified interval"
-msgstr ""
+msgstr "Вычислить амортизацию за период"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
-msgstr ""
+msgstr "Изменить длительность"
 
 #. module: account_asset
 #: field:account.asset.category,account_analytic_id:0
@@ -274,7 +276,7 @@ msgstr "Счет аналитики"
 #. module: account_asset
 #: field:account.asset.asset,method:0 field:account.asset.category,method:0
 msgid "Computation Method"
-msgstr ""
+msgstr "Метод вычисления"
 
 #. module: account_asset
 #: help:account.asset.asset,method_period:0
@@ -301,49 +303,49 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.asset,purchase_value:0
 msgid "Gross value "
-msgstr ""
+msgstr "Общая сумма "
 
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You can not create recursive assets."
-msgstr ""
+msgstr "Ошибка ! Нельзя создавать рекурсивные активы."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
 msgid "Time in month between two depreciations"
-msgstr ""
+msgstr "Время в месяцах между двумя амортизациями"
 
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Год"
 
 #. module: account_asset
 #: view:asset.modify:0
 #: model:ir.actions.act_window,name:account_asset.action_asset_modify
 #: model:ir.model,name:account_asset.model_asset_modify
 msgid "Modify Asset"
-msgstr ""
+msgstr "Изменить актив"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Other Information"
-msgstr ""
+msgstr "Прочая информация"
 
 #. module: account_asset
 #: field:account.asset.asset,salvage_value:0
 msgid "Salvage Value"
-msgstr ""
+msgstr "Ликвидационная стоимость"
 
 #. module: account_asset
 #: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
 msgid "Asset Category"
-msgstr ""
+msgstr "Категория актива"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Set to Close"
-msgstr ""
+msgstr "Установить в \"Закрыто\""
 
 #. module: account_asset
 #: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
@@ -358,12 +360,12 @@ msgstr "Изменить основное средство"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in closed state"
-msgstr ""
+msgstr "Активы в состоянии \"Закрыто\""
 
 #. module: account_asset
 #: field:account.asset.asset,parent_id:0
 msgid "Parent Asset"
-msgstr ""
+msgstr "Родительский актив"
 
 #. module: account_asset
 #: view:account.asset.history:0
@@ -374,7 +376,7 @@ msgstr "История основного средства"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets purchased in current year"
-msgstr ""
+msgstr "Активы, приобретенные в этом месяце"
 
 #. module: account_asset
 #: field:account.asset.asset,state:0 field:asset.asset.report,state:0
@@ -384,7 +386,7 @@ msgstr "Область/штат"
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Позиция счета"
 
 #. module: account_asset
 #: constraint:account.move.line:0
@@ -397,22 +399,22 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Month"
-msgstr ""
+msgstr "Месяц"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation Board"
-msgstr ""
+msgstr "Панель амортизации"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Элементы журнала"
 
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
-msgstr ""
+msgstr "Не проведенная сумма"
 
 #. module: account_asset
 #: field:account.asset.asset,method_time:0
@@ -472,7 +474,7 @@ msgstr ""
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Closed"
-msgstr ""
+msgstr "Закрыто"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
@@ -483,27 +485,27 @@ msgstr "Контрагент"
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
 msgid "Amount of Depreciation Lines"
-msgstr ""
+msgstr "Сумма по позициям амортизации"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Posted depreciation lines"
-msgstr ""
+msgstr "Проведенные позиции амортизации"
 
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "Для счета и периода должна быть одна компания."
 
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
 msgid "Children Assets"
-msgstr ""
+msgstr "Подчиненные активы"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Date of depreciation"
-msgstr ""
+msgstr "Дата амортизации"
 
 #. module: account_asset
 #: field:account.asset.history,user_id:0
@@ -518,27 +520,27 @@ msgstr "Дата"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets purchased in current month"
-msgstr ""
+msgstr "Активы, приобретенные в этом месяце"
 
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Нельзя создать элемент журнала по счету с типом вид."
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Расширенные фильтры..."
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
 msgid "Compute"
-msgstr ""
+msgstr "Вычислить"
 
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Search Asset Category"
-msgstr ""
+msgstr "Поиск категории актива"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
@@ -558,12 +560,12 @@ msgstr "Закрытое основное средство"
 #. module: account_asset
 #: field:account.asset.depreciation.line,parent_state:0
 msgid "State of Asset"
-msgstr ""
+msgstr "Состояние актива"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,name:0
 msgid "Depreciation Name"
-msgstr ""
+msgstr "Название амортизации"
 
 #. module: account_asset
 #: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
@@ -573,17 +575,17 @@ msgstr "История"
 #. module: account_asset
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Номер счета должен быть уникальным для компании!"
 
 #. module: account_asset
 #: field:asset.depreciation.confirmation.wizard,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Период"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "General"
-msgstr ""
+msgstr "Общий"
 
 #. module: account_asset
 #: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
@@ -598,39 +600,39 @@ msgstr ""
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Счет"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
 msgid "Review Asset Categories"
-msgstr ""
+msgstr "Проверить категории актива"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отменена"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
 msgid "Close"
-msgstr ""
+msgstr "Закрыть"
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:account.asset.category:0
 msgid "Depreciation Method"
-msgstr ""
+msgstr "Метод амортизации"
 
 #. module: account_asset
 #: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
 #: field:asset.asset.report,purchase_date:0
 msgid "Purchase Date"
-msgstr ""
+msgstr "Дата покупки"
 
 #. module: account_asset
 #: selection:account.asset.asset,method:0
 #: selection:account.asset.category,method:0
 msgid "Degressive"
-msgstr ""
+msgstr "Нисходящий"
 
 #. module: account_asset
 #: help:asset.depreciation.confirmation.wizard,period_id:0
@@ -642,44 +644,44 @@ msgstr ""
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Current"
-msgstr ""
+msgstr "Текущий"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,remaining_value:0
 msgid "Amount to Depreciate"
-msgstr ""
+msgstr "Сумма амортизации"
 
 #. module: account_asset
 #: field:account.asset.category,open_asset:0
 msgid "Skip Draft State"
-msgstr ""
+msgstr "Пропустить стадию \"Черновик\""
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:account.asset.category:0
 #: view:account.asset.history:0
 msgid "Depreciation Dates"
-msgstr ""
+msgstr "Даты амортизации"
 
 #. module: account_asset
 #: field:account.asset.asset,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Валюта"
 
 #. module: account_asset
 #: field:account.asset.category,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Журнал"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciated_value:0
 msgid "Amount Already Depreciated"
-msgstr ""
+msgstr "Сумма уже самортизирована"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0 field:asset.asset.report,move_check:0
 msgid "Posted"
-msgstr ""
+msgstr "Проведено"
 
 #. module: account_asset
 #: help:account.asset.asset,state:0
@@ -694,7 +696,7 @@ msgstr ""
 #. module: account_asset
 #: field:account.asset.category,name:0
 msgid "Name"
-msgstr ""
+msgstr "Название"
 
 #. module: account_asset
 #: help:account.asset.category,open_asset:0
@@ -706,7 +708,7 @@ msgstr ""
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Установить в \"Черновик\""
 
 #. module: account_asset
 #: selection:account.asset.asset,method:0
@@ -717,24 +719,24 @@ msgstr "Линейный"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Месяц-1"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
 msgid "Asset depreciation line"
-msgstr ""
+msgstr "Позиция амортизации актива"
 
 #. module: account_asset
 #: field:account.asset.asset,category_id:0 view:account.asset.category:0
 #: field:asset.asset.report,asset_category_id:0
 #: model:ir.model,name:account_asset.model_account_asset_category
 msgid "Asset category"
-msgstr ""
+msgstr "Категория актива"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets purchased in last month"
-msgstr ""
+msgstr "Активы, приобретенные в прошлом месяце"
 
 #. module: account_asset
 #: code:addons/account_asset/wizard/wizard_asset_compute.py:49
@@ -745,7 +747,7 @@ msgstr ""
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Нельзя создать элемент журнала по закрытому счету ."
 
 #. module: account_asset
 #: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
@@ -769,7 +771,7 @@ msgstr ""
 #: selection:account.asset.history,method_time:0
 #: field:asset.modify,method_number:0
 msgid "Number of Depreciations"
-msgstr ""
+msgstr "Число амортизаций"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -784,13 +786,13 @@ msgstr ""
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Confirm Asset"
-msgstr ""
+msgstr "Подтвердить актив"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
 #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
 msgid "Asset Hierarchy"
-msgstr ""
+msgstr "Структура активов"
 
 #~ msgid "Child assets"
 #~ msgstr "Потомок основных средств"
@@ -908,3 +910,9 @@ msgstr ""
 
 #~ msgid "Localisation"
 #~ msgstr "Локализация"
+
+#~ msgid "Analytic information"
+#~ msgstr "Аналитическая информация"
+
+#~ msgid "Accounting information"
+#~ msgstr "Информация учета"
diff --git a/addons/account_asset/i18n/sl.po b/addons/account_asset/i18n/sl.po
index 7e1c5324747..31525c63d00 100644
--- a/addons/account_asset/i18n/sl.po
+++ b/addons/account_asset/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/sr@latin.po b/addons/account_asset/i18n/sr@latin.po
index 687d211dad9..d3cd3e6eb8e 100644
--- a/addons/account_asset/i18n/sr@latin.po
+++ b/addons/account_asset/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/sv.po b/addons/account_asset/i18n/sv.po
index bd58ffc7e57..2979037cf1a 100755
--- a/addons/account_asset/i18n/sv.po
+++ b/addons/account_asset/i18n/sv.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in draft and open states"
-msgstr "Tillgångar i preleminär eller öppen status"
+msgstr "Inventarier i preleminär eller öppen status"
 
 #. module: account_asset
 #: field:account.asset.category,method_end:0
@@ -129,8 +129,8 @@ msgid ""
 "This wizard will post the depreciation lines of running assets that belong "
 "to the selected period."
 msgstr ""
-"Denna guide vill lagra avskrivningsrader för aktuella tillgångar som tillhör "
-"vald period."
+"Denna guide vill lagra avskrivningsrader för aktuella inventarier som "
+"tillhör vald period."
 
 #. module: account_asset
 #: field:account.asset.asset,account_move_line_ids:0
@@ -173,7 +173,7 @@ msgstr "Bokfört belopp"
 #: model:ir.ui.menu,name:account_asset.menu_finance_assets
 #: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
 msgid "Assets"
-msgstr "Tillgångar"
+msgstr "Inventarier"
 
 #. module: account_asset
 #: field:account.asset.category,account_depreciation_id:0
@@ -204,7 +204,7 @@ msgstr "# avskrivningsrader"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in draft state"
-msgstr "Tillgångar i preleminär status"
+msgstr "Inventarier i preleminär status"
 
 #. module: account_asset
 #: field:account.asset.asset,method_end:0
@@ -316,7 +316,7 @@ msgstr "Brutto värde "
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You can not create recursive assets."
-msgstr "Fel! Du kan inte skapa tillgångar rekursivt."
+msgstr "Fel! Du kan inte skapa inventarier rekursivt."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
@@ -368,7 +368,7 @@ msgstr "Ändra tillgång"
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in closed state"
-msgstr "Tillgångar i status \"stängd\""
+msgstr "Inventarier i status \"stängd\""
 
 #. module: account_asset
 #: field:account.asset.asset,parent_id:0
@@ -384,7 +384,7 @@ msgstr "Tillgångshistorik"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets purchased in current year"
-msgstr "Tillgångar införskaffade innehvarande år"
+msgstr "Inventarier införskaffade innehvarande år"
 
 #. module: account_asset
 #: field:account.asset.asset,state:0 field:asset.asset.report,state:0
@@ -489,7 +489,7 @@ msgstr ""
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in running state"
-msgstr "Aktiva tillgångar"
+msgstr "Aktiva inventarier"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -520,7 +520,7 @@ msgstr "Bolaget måste överenstämma för alla konton och perioder."
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
 msgid "Children Assets"
-msgstr "Undertillgångar"
+msgstr "Underinventarier"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -540,7 +540,7 @@ msgstr "Datum"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets purchased in current month"
-msgstr "Tillgångar som anskaffats innevarande månad"
+msgstr "Inventarier som anskaffats innevarande månad"
 
 #. module: account_asset
 #: constraint:account.move.line:0
@@ -661,7 +661,7 @@ msgid ""
 "lines of running assets"
 msgstr ""
 "Välj period för vilken du vill automatiskt bokföra avskrivningsrader för "
-"aktuella tillgångar"
+"aktuella inventarier"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -731,7 +731,7 @@ msgid ""
 "Check this if you want to automatically confirm the assets of this category "
 "when created by invoices."
 msgstr ""
-"Kryssa denna ruta om du automatiskt vill bekräfta tillgångar i denna "
+"Kryssa denna ruta om du automatiskt vill bekräfta inventarier i denna "
 "kategori när det skapas via leverantörsfakturor."
 
 #. module: account_asset
@@ -765,7 +765,7 @@ msgstr "Tillgångskategori"
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets purchased in last month"
-msgstr "Tillgångar inköpta under senaste månaden"
+msgstr "Inventarier inköpta under senaste månaden"
 
 #. module: account_asset
 #: code:addons/account_asset/wizard/wizard_asset_compute.py:49
diff --git a/addons/account_asset/i18n/tr.po b/addons/account_asset/i18n/tr.po
index acf1738c717..02601de8e93 100644
--- a/addons/account_asset/i18n/tr.po
+++ b/addons/account_asset/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/vi.po b/addons/account_asset/i18n/vi.po
index 4a8f6634164..bb957b3aa97 100644
--- a/addons/account_asset/i18n/vi.po
+++ b/addons/account_asset/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/zh_CN.po b/addons/account_asset/i18n/zh_CN.po
index fe6952fc69e..76c37b3797b 100644
--- a/addons/account_asset/i18n/zh_CN.po
+++ b/addons/account_asset/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
diff --git a/addons/account_asset/i18n/zh_TW.po b/addons/account_asset/i18n/zh_TW.po
new file mode 100644
index 00000000000..630e8d7ed3e
--- /dev/null
+++ b/addons/account_asset/i18n/zh_TW.po
@@ -0,0 +1,814 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-20 01:50+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in draft and open states"
+msgstr "資產在草稿和開放的狀態"
+
+#. module: account_asset
+#: field:account.asset.category,method_end:0
+#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
+msgid "Ending date"
+msgstr "結束日期"
+
+#. module: account_asset
+#: field:account.asset.asset,value_residual:0
+msgid "Residual Value"
+msgstr "剩餘價值"
+
+#. module: account_asset
+#: field:account.asset.category,account_expense_depreciation_id:0
+msgid "Depr. Expense Account"
+msgstr "折舊費用科目"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Compute Asset"
+msgstr "計算資產"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Group By..."
+msgstr "群組依據..."
+
+#. module: account_asset
+#: field:asset.asset.report,gross_value:0
+msgid "Gross Amount"
+msgstr "總額"
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,name:0
+#: field:account.asset.depreciation.line,asset_id:0
+#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0
+#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
+#: model:ir.model,name:account_asset.model_account_asset_asset
+msgid "Asset"
+msgstr "資產"
+
+#. module: account_asset
+#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
+msgid ""
+"Indicates that the first depreciation entry for this asset have to be done "
+"from the purchase date instead of the first January"
+msgstr "顯示固定資產的第一筆折舊分錄必須是以採購日期開始而不是一月一日"
+
+#. module: account_asset
+#: field:account.asset.history,name:0
+msgid "History name"
+msgstr "歷史名稱"
+
+#. module: account_asset
+#: field:account.asset.asset,company_id:0
+#: field:account.asset.category,company_id:0 view:asset.asset.report:0
+#: field:asset.asset.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Modify"
+msgstr "變動"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Running"
+msgstr "運行"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,amount:0
+msgid "Depreciation Amount"
+msgstr "折舊金額"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report
+#: model:ir.model,name:account_asset.model_asset_asset_report
+#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
+msgid "Assets Analysis"
+msgstr "資產分析"
+
+#. module: account_asset
+#: field:asset.modify,name:0
+msgid "Reason"
+msgstr "原因"
+
+#. module: account_asset
+#: field:account.asset.asset,method_progress_factor:0
+#: field:account.asset.category,method_progress_factor:0
+msgid "Degressive Factor"
+msgstr "遞減因素"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
+msgid "Asset Categories"
+msgstr "資產類別"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid ""
+"This wizard will post the depreciation lines of running assets that belong "
+"to the selected period."
+msgstr "此精靈將所選擇期間使用中固定資產的資產折舊計算入帳。"
+
+#. module: account_asset
+#: field:account.asset.asset,account_move_line_ids:0
+#: field:account.move.line,entry_ids:0
+#: model:ir.actions.act_window,name:account_asset.act_entries_open
+msgid "Entries"
+msgstr "分錄"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+#: field:account.asset.asset,depreciation_line_ids:0
+msgid "Depreciation Lines"
+msgstr "折舊明細"
+
+#. module: account_asset
+#: help:account.asset.asset,salvage_value:0
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr "這是你已計劃好的金額，你可以不折舊。"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciation_date:0
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
+msgid "Depreciation Date"
+msgstr "折舊日期"
+
+#. module: account_asset
+#: field:account.asset.category,account_asset_id:0
+msgid "Asset Account"
+msgstr "資產科目"
+
+#. module: account_asset
+#: field:asset.asset.report,posted_value:0
+msgid "Posted Amount"
+msgstr "發佈金額"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.asset.report:0
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form
+#: model:ir.ui.menu,name:account_asset.menu_finance_assets
+#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
+msgid "Assets"
+msgstr "資產"
+
+#. module: account_asset
+#: field:account.asset.category,account_depreciation_id:0
+msgid "Depreciation Account"
+msgstr "折舊科目"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
+msgid "Notes"
+msgstr "備註"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_id:0
+msgid "Depreciation Entry"
+msgstr "折舊分錄"
+
+#. module: account_asset
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "會計分錄中包含錯誤的借貸數值！"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,nbr:0
+msgid "# of Depreciation Lines"
+msgstr "# 折舊明細"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in draft state"
+msgstr "在草稿狀態的資產"
+
+#. module: account_asset
+#: field:account.asset.asset,method_end:0
+#: selection:account.asset.asset,method_time:0
+#: selection:account.asset.category,method_time:0
+#: selection:account.asset.history,method_time:0
+msgid "Ending Date"
+msgstr "結束日期"
+
+#. module: account_asset
+#: field:account.asset.asset,code:0
+msgid "Reference"
+msgstr "參考"
+
+#. module: account_asset
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "BBA傳輸結構有誤！"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Account Asset"
+msgstr "科目資產"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
+#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
+msgid "Compute Assets"
+msgstr "計算資產"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,sequence:0
+msgid "Sequence of the depreciation"
+msgstr "序列的折舊"
+
+#. module: account_asset
+#: field:account.asset.asset,method_period:0
+#: field:account.asset.category,method_period:0
+#: field:account.asset.history,method_period:0
+#: field:asset.modify,method_period:0
+msgid "Period Length"
+msgstr "週期長度"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 view:asset.asset.report:0
+#: selection:asset.asset.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of asset purchase"
+msgstr "資產購買日期"
+
+#. module: account_asset
+#: help:account.asset.asset,method_number:0
+msgid "Calculates Depreciation within specified interval"
+msgstr "在指定的時間間隔計算折舊"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Change Duration"
+msgstr "更改時間"
+
+#. module: account_asset
+#: field:account.asset.category,account_analytic_id:0
+msgid "Analytic account"
+msgstr "分析科目"
+
+#. module: account_asset
+#: field:account.asset.asset,method:0 field:account.asset.category,method:0
+msgid "Computation Method"
+msgstr "計算方法"
+
+#. module: account_asset
+#: help:account.asset.asset,method_period:0
+msgid "State here the time during 2 depreciations, in months"
+msgstr "在這裡說明2個折舊期間的月份"
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid ""
+"Prorata temporis can be applied only for time method \"number of "
+"depreciations\"."
+msgstr "時間的方法只能按時間的比例 \"折舊數量\"."
+
+#. module: account_asset
+#: help:account.asset.history,method_time:0
+msgid ""
+"The method to use to compute the dates and number of depreciation lines.\n"
+"Number of Depreciations: Fix the number of depreciation lines and the time "
+"between 2 depreciations.\n"
+"Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"使用的方法來計算折舊線的日期和數量。\n"
+"數量折舊。修正折舊明細的數量和時間之間折舊\n"
+"結束日期：選擇2折舊，折舊將無法超越的日期之間的時間。"
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_value:0
+msgid "Gross value "
+msgstr "總值 "
+
+#. module: account_asset
+#: constraint:account.asset.asset:0
+msgid "Error ! You can not create recursive assets."
+msgstr "錯誤！你不能建立遞延資產。"
+
+#. module: account_asset
+#: help:account.asset.history,method_period:0
+msgid "Time in month between two depreciations"
+msgstr "兩個折舊方法中的月份"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,name:0
+msgid "Year"
+msgstr "年度"
+
+#. module: account_asset
+#: view:asset.modify:0
+#: model:ir.actions.act_window,name:account_asset.action_asset_modify
+#: model:ir.model,name:account_asset.model_asset_modify
+msgid "Modify Asset"
+msgstr "修改資產"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Other Information"
+msgstr "其他資訊"
+
+#. module: account_asset
+#: field:account.asset.asset,salvage_value:0
+msgid "Salvage Value"
+msgstr "殘值"
+
+#. module: account_asset
+#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
+msgid "Asset Category"
+msgstr "資產類別"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Close"
+msgstr "設置為關閉"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
+msgid "Compute assets"
+msgstr "計算資產"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify
+msgid "Modify asset"
+msgstr "修改資產"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Assets in closed state"
+msgstr "在封閉狀態的資產"
+
+#. module: account_asset
+#: field:account.asset.asset,parent_id:0
+msgid "Parent Asset"
+msgstr "母公司資產"
+
+#. module: account_asset
+#: view:account.asset.history:0
+#: model:ir.model,name:account_asset.model_account_asset_history
+msgid "Asset history"
+msgstr "資產曆史記錄"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current year"
+msgstr "在本年度購買的資產"
+
+#. module: account_asset
+#: field:account.asset.asset,state:0 field:asset.asset.report,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "發票明細"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr "分錄上的科目要求輸入一個外幣。你可以在科目設置中去掉這個外幣或在日記帳設置上選擇一個支持多幣別的輸入界面。"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month"
+msgstr "月"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Depreciation Board"
+msgstr "折舊板"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_move_line
+msgid "Journal Items"
+msgstr "帳簿項目"
+
+#. module: account_asset
+#: field:asset.asset.report,unposted_value:0
+msgid "Unposted Amount"
+msgstr "未過帳金額"
+
+#. module: account_asset
+#: field:account.asset.asset,method_time:0
+#: field:account.asset.category,method_time:0
+#: field:account.asset.history,method_time:0
+msgid "Time Method"
+msgstr "時間的方法"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Analytic Information"
+msgstr "輔助核算資訊"
+
+#. module: account_asset
+#: view:asset.modify:0
+msgid "Asset Durations to Modify"
+msgstr "待修改的資產年限"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr "你的帳簿分錄的日期不是在規定的時間內！您應該更改日期或從帳簿中刪除這個限制。"
+
+#. module: account_asset
+#: field:account.asset.asset,note:0 field:account.asset.category,note:0
+#: field:account.asset.history,note:0
+msgid "Note"
+msgstr "備註"
+
+#. module: account_asset
+#: help:account.asset.asset,method:0 help:account.asset.category,method:0
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n"
+"  * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"
+msgstr ""
+"選擇使用的方法來計算折舊明細的數量。\n"
+"  * 線性：計算基礎：總值/數量折舊\n"
+"  * 遞減的基礎上計算：剩餘價值遞減因素"
+
+#. module: account_asset
+#: help:account.asset.asset,method_time:0
+#: help:account.asset.category,method_time:0
+msgid ""
+"Choose the method to use to compute the dates and number of depreciation "
+"lines.\n"
+"  * Number of Depreciations: Fix the number of depreciation lines and the "
+"time between 2 depreciations.\n"
+"  * Ending Date: Choose the time between 2 depreciations and the date the "
+"depreciations won't go beyond."
+msgstr ""
+"選擇使用的方法來計算折舊方法的日期和數量。\n"
+"  * 折舊數量: 修正兩個折舊方法間的時間與數量\n"
+"  * 結束日期：選擇兩個折舊方法間無法超越的日期的時間。"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets in running state"
+msgstr "資產運行狀態"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Closed"
+msgstr "關閉"
+
+#. module: account_asset
+#: field:account.asset.asset,partner_id:0
+#: field:asset.asset.report,partner_id:0
+msgid "Partner"
+msgstr "夥伴"
+
+#. module: account_asset
+#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
+msgid "Amount of Depreciation Lines"
+msgstr "折舊明細的金額"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Posted depreciation lines"
+msgstr "發表折舊明細"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "科目和期間必須屬於同一個公司"
+
+#. module: account_asset
+#: field:account.asset.asset,child_ids:0
+msgid "Children Assets"
+msgstr "子資產"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Date of depreciation"
+msgstr "折舊日期"
+
+#. module: account_asset
+#: field:account.asset.history,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: account_asset
+#: field:account.asset.history,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in current month"
+msgstr "當月購買的資產"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "借貸項不能使用視圖類型的科目"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Extended Filters..."
+msgstr "延長篩選..."
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
+msgid "Compute"
+msgstr "計算"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Search Asset Category"
+msgstr "搜索資產類別"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
+msgid "asset.depreciation.confirmation.wizard"
+msgstr "asset.depreciation.confirmation.wizard"
+
+#. module: account_asset
+#: field:account.asset.asset,active:0
+msgid "Active"
+msgstr "活躍"
+
+#. module: account_asset
+#: model:ir.actions.wizard,name:account_asset.wizard_asset_close
+msgid "Close asset"
+msgstr "報廢資產"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,parent_state:0
+msgid "State of Asset"
+msgstr "資產狀態"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,name:0
+msgid "Depreciation Name"
+msgstr "折舊名稱"
+
+#. module: account_asset
+#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
+msgid "History"
+msgstr "歷史記錄"
+
+#. module: account_asset
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "每家公司的發票號碼必須是唯一的!"
+
+#. module: account_asset
+#: field:asset.depreciation.confirmation.wizard,period_id:0
+msgid "Period"
+msgstr "期間"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "General"
+msgstr "一般"
+
+#. module: account_asset
+#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
+msgid "Prorata Temporis"
+msgstr "按時間比例"
+
+#. module: account_asset
+#: view:account.asset.category:0
+msgid "Accounting Information"
+msgstr "會計資訊"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_invoice
+msgid "Invoice"
+msgstr "發票"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
+msgid "Review Asset Categories"
+msgstr "檢視資產類別"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
+msgid "Cancel"
+msgstr "刪除"
+
+#. module: account_asset
+#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
+msgid "Close"
+msgstr "關閉"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+msgid "Depreciation Method"
+msgstr "折舊方法"
+
+#. module: account_asset
+#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
+#: field:asset.asset.report,purchase_date:0
+msgid "Purchase Date"
+msgstr "採購日期"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Degressive"
+msgstr "遞減"
+
+#. module: account_asset
+#: help:asset.depreciation.confirmation.wizard,period_id:0
+msgid ""
+"Choose the period for which you want to automatically post the depreciation "
+"lines of running assets"
+msgstr "選擇您要自動過帳使用固定資產折舊費用的期間"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Current"
+msgstr "當前"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,remaining_value:0
+msgid "Amount to Depreciate"
+msgstr "折舊的金額"
+
+#. module: account_asset
+#: field:account.asset.category,open_asset:0
+msgid "Skip Draft State"
+msgstr "跳過草稿狀態"
+
+#. module: account_asset
+#: view:account.asset.asset:0 view:account.asset.category:0
+#: view:account.asset.history:0
+msgid "Depreciation Dates"
+msgstr "折舊日期"
+
+#. module: account_asset
+#: field:account.asset.asset,currency_id:0
+msgid "Currency"
+msgstr "貨幣"
+
+#. module: account_asset
+#: field:account.asset.category,journal_id:0
+msgid "Journal"
+msgstr "帳簿"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,depreciated_value:0
+msgid "Amount Already Depreciated"
+msgstr "已折舊金額"
+
+#. module: account_asset
+#: field:account.asset.depreciation.line,move_check:0
+#: view:asset.asset.report:0 field:asset.asset.report,move_check:0
+msgid "Posted"
+msgstr "過帳"
+
+#. module: account_asset
+#: help:account.asset.asset,state:0
+msgid ""
+"When an asset is created, the state is 'Draft'.\n"
+"If the asset is confirmed, the state goes in 'Running' and the depreciation "
+"lines can be posted in the accounting.\n"
+"You can manually close an asset when the depreciation is over. If the last "
+"line of depreciation is posted, the asset automatically goes in that state."
+msgstr ""
+"當資產被建立時，狀態是'草稿'.\n"
+"如果該資產被確認，其狀態改為“運行中”，並過帳入會計折舊明細裏。\n"
+"如果折舊的最後一次已經過帳，該資產自動歸到該狀態，當折舊完畢時，你可以手動關閉資產​​。"
+
+#. module: account_asset
+#: field:account.asset.category,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: account_asset
+#: help:account.asset.category,open_asset:0
+msgid ""
+"Check this if you want to automatically confirm the assets of this category "
+"when created by invoices."
+msgstr "當你在建立發票時，如果你想要自動確認固定資產類別，必須先檢查這個"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Set to Draft"
+msgstr "設置為草稿"
+
+#. module: account_asset
+#: selection:account.asset.asset,method:0
+#: selection:account.asset.category,method:0
+msgid "Linear"
+msgstr "直線"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Month-1"
+msgstr "月-1"
+
+#. module: account_asset
+#: model:ir.model,name:account_asset.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr "資產折舊明細"
+
+#. module: account_asset
+#: field:account.asset.asset,category_id:0 view:account.asset.category:0
+#: field:asset.asset.report,asset_category_id:0
+#: model:ir.model,name:account_asset.model_account_asset_category
+msgid "Asset category"
+msgstr "資產類別"
+
+#. module: account_asset
+#: view:asset.asset.report:0
+msgid "Assets purchased in last month"
+msgstr "在上個月購買的資產"
+
+#. module: account_asset
+#: code:addons/account_asset/wizard/wizard_asset_compute.py:49
+#, python-format
+msgid "Created Asset Moves"
+msgstr "建立資產轉移"
+
+#. module: account_asset
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "你不能在新建的帳簿項目上使用已關閉的帳戶"
+
+#. module: account_asset
+#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report
+msgid ""
+"From this report, you can have an overview on all depreciation. The tool "
+"search can also be used to personalise your Assets reports and so, match "
+"this analysis to your needs;"
+msgstr "從這個報表，您可以總覽所有的資產折舊。搜尋工具可以符合您的分析需求，用來個人化您的資產報表;"
+
+#. module: account_asset
+#: help:account.asset.category,method_period:0
+msgid "State here the time between 2 depreciations, in months"
+msgstr "在這裏說明這幾個月內，兩個已提折舊之間的時間"
+
+#. module: account_asset
+#: field:account.asset.asset,method_number:0
+#: selection:account.asset.asset,method_time:0
+#: field:account.asset.category,method_number:0
+#: selection:account.asset.category,method_time:0
+#: field:account.asset.history,method_number:0
+#: selection:account.asset.history,method_time:0
+#: field:asset.modify,method_number:0
+msgid "Number of Depreciations"
+msgstr "折舊的數量"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Create Move"
+msgstr "建立移轉"
+
+#. module: account_asset
+#: view:asset.depreciation.confirmation.wizard:0
+msgid "Post Depreciation Lines"
+msgstr "已過帳折舊明細"
+
+#. module: account_asset
+#: view:account.asset.asset:0
+msgid "Confirm Asset"
+msgstr "已確認資產"
+
+#. module: account_asset
+#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree
+#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree
+msgid "Asset Hierarchy"
+msgstr "資產層級"
+
+#~ msgid "Analytic information"
+#~ msgstr "分析資訊"
+
+#~ msgid "Asset durations to modify"
+#~ msgstr "資產期間修改"
+
+#~ msgid "Accounting information"
+#~ msgstr "會計資訊"
diff --git a/addons/account_asset/report/account_asset_report.py b/addons/account_asset/report/account_asset_report.py
index 000967a555c..583e5534613 100644
--- a/addons/account_asset/report/account_asset_report.py
+++ b/addons/account_asset/report/account_asset_report.py
@@ -50,7 +50,7 @@ class asset_asset_report(osv.osv):
                 select 
                     min(dl.id) as id,
                     dl.name as name,
-                    to_date(dl.depreciation_date, 'YYYY-MM-DD') as depreciation_date,
+                    dl.depreciation_date as depreciation_date,
                     a.purchase_date as purchase_date,
                     (CASE WHEN (select min(d.id) from account_asset_depreciation_line as d
                                 left join account_asset_asset as ac ON (ac.id=d.asset_id)
@@ -77,7 +77,7 @@ class asset_asset_report(osv.osv):
                 from account_asset_depreciation_line dl
                     left join account_asset_asset a on (dl.asset_id=a.id)
                 group by 
-                    dl.amount,dl.asset_id,to_date(dl.depreciation_date, 'YYYY-MM-DD'),dl.name,
+                    dl.amount,dl.asset_id,dl.depreciation_date,dl.name,
                     a.purchase_date, dl.move_check, a.state, a.category_id, a.partner_id, a.company_id,
                     a.purchase_value, a.id, a.salvage_value
         )""")
diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index bc598011086..4865196c4a8 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -6,7 +6,7 @@
         <field name="name">asset.asset.report.tree</field>
         <field name="model">asset.asset.report</field>
         <field name="arch" type="xml">
-            <tree string="Assets">
+            <tree string="Assets" create="false">
                 <field name="name" invisible="1"/>
                 <field name="asset_id" invisible="1"/>
                 <field name="asset_category_id" invisible="1"/>
diff --git a/addons/account_bank_statement_extensions/__openerp__.py b/addons/account_bank_statement_extensions/__openerp__.py
index a3765d33622..7571eef3e54 100644
--- a/addons/account_bank_statement_extensions/__openerp__.py
+++ b/addons/account_bank_statement_extensions/__openerp__.py
@@ -30,19 +30,20 @@ Module that extends the standard account_bank_statement_line object for improved
 ===================================================================================================
 
 This module adds:
+-----------------
     - valuta date
     - batch payments
     - traceability of changes to bank statement lines
     - bank statement line views
     - bank statements balances report
-    - performance improvements for digital import of bank statement (via 'ebanking_import' context flag)
-    - name_search on res.partner.bank enhanced to allow search on bank and iban account numbers
+    - performance improvements for digital import of bank statement (via 
+      'ebanking_import' context flag)
+    - name_search on res.partner.bank enhanced to allow search on bank 
+      and iban account numbers
     ''',
     'depends': ['account'],
-    'demo_xml': [],
-    'init_xml': [
-    ],
-    'update_xml' : [
+    'demo': [],
+    'data' : [
         'security/ir.model.access.csv',
         'account_bank_statement_view.xml',
         'account_bank_statement_report.xml',
diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py
index 6eeda843dc5..3d097d3c757 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement.py
+++ b/addons/account_bank_statement_extensions/account_bank_statement.py
@@ -105,8 +105,7 @@ account_bank_statement_line_global()
 class account_bank_statement_line(osv.osv):
     _inherit = 'account.bank.statement.line'
     _columns = {
-        'date': fields.date('Entry Date', required=True, states={'confirm': [('readonly', True)]}),
-        'val_date': fields.date('Valuta Date', states={'confirm': [('readonly', True)]}),
+        'val_date': fields.date('Value Date', states={'confirm': [('readonly', True)]}),
         'globalisation_id': fields.many2one('account.bank.statement.line.global', 'Globalisation ID',
             states={'confirm': [('readonly', True)]},
             help="Code to identify transactions belonging to the same globalisation level within a batch payment"),
diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index 30b2778817c..adc2963c803 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -72,12 +72,12 @@
           <field name="date" readonly="1"/>
           <field name="val_date" readonly="1"/>
           <field name="name"/>
-          <field name="statement_id" readonly="1"/>
+          <field name="statement_id"/>
           <field name="ref" readonly="1"/>
           <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
           <field name="type" on_change="onchange_type(partner_id, type)"/>
-          <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
-          <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
+          <field name="account_id"/>
+          <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type', '&lt;&gt;', 'view')]"/>
           <field name="amount" readonly="1" sum="Total Amount"/>
           <field name="globalisation_id" string="Glob. Id"/>
           <field name="globalisation_amount" string="Glob. Am."/>
@@ -100,8 +100,8 @@
               <field name="ref" readonly="0"/>
               <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
               <field name="type" on_change="onchange_type(partner_id, type)"/>
-              <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
-              <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
+              <field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/>
+              <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('type', '&lt;&gt;', 'view')]"/>
               <field name="amount"/>
               <field name="globalisation_id"/>
               <field name="sequence" readonly="0"/>
@@ -148,13 +148,13 @@
       <field name="name">Bank Statement Lines</field>
       <field name="res_model">account.bank.statement.line</field>
       <field name="view_type">form</field>
-      <field name="view_mode">tree,graph,form</field>
+      <field name="view_mode">tree,form</field>
       <field name="context">{'block_statement_line_delete' : 1}</field>
       <field name="search_view_id" ref="view_bank_statement_line_filter"/>
       <field name="view_id" ref="view_bank_statement_line_list"/>
     </record>
 
-    <menuitem action="action_bank_statement_line" id="bank_statement_line" parent="account.menu_finance_bank_and_cash" sequence="20"/>
+    <menuitem action="action_bank_statement_line" id="bank_statement_line" parent="account.menu_finance_bank_and_cash" sequence="20" groups="base.group_no_one"/>
 
   </data>
 </openerp>
diff --git a/addons/account_bank_statement_extensions/i18n/ar.po b/addons/account_bank_statement_extensions/i18n/ar.po
index b5f820bb0af..5ec544da24e 100644
--- a/addons/account_bank_statement_extensions/i18n/ar.po
+++ b/addons/account_bank_statement_extensions/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -32,12 +32,12 @@ msgstr "مصدق عليه"
 #: view:account.bank.statement:0
 #: view:account.bank.statement.line:0
 msgid "Glob. Id"
-msgstr ""
+msgstr "معرف عالمي"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "CODA"
-msgstr ""
+msgstr "المقطع الختامي"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,parent_id:0
@@ -289,6 +289,7 @@ msgid ""
 "Code to identify transactions belonging to the same globalisation level "
 "within a batch payment"
 msgstr ""
+"كود تعريف المعاملات التى تنتمى الى نفس مستوى العالمي من خلال دفعة السداد"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/de.po b/addons/account_bank_statement_extensions/i18n/de.po
index 708ae0a932e..cab0c915e99 100644
--- a/addons/account_bank_statement_extensions/i18n/de.po
+++ b/addons/account_bank_statement_extensions/i18n/de.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Search Bank Transactions"
-msgstr "Suche Bank Transkationen"
+msgstr "Suche Banktransaktionen"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -64,7 +64,7 @@ msgstr "Der Bankauszug oder die Kontonummer sind falsch."
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Group By..."
-msgstr "Gruppiere je..."
+msgstr "Gruppiert nach..."
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,state:0
@@ -203,8 +203,8 @@ msgid ""
 "valid payments"
 msgstr ""
 "\n"
-"Bitte definieren Sie BIC/SWIFT Code für die Bank um mit IBAN Konten zahlen "
-"zu können."
+"Bitte definieren Sie den BIC/SWIFT Code für die Bank um mit IBAN Konten "
+"zahlen zu können."
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
@@ -300,7 +300,7 @@ msgstr "Buchungszeilen im Entwurf"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Glob. Am."
-msgstr ""
+msgstr "Gesamtbetrag"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
@@ -358,7 +358,7 @@ msgstr "Buchungszeilen"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 msgid "Child Batch Payments"
-msgstr ""
+msgstr "Anhängende Überweisungs-Stapel"
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
@@ -379,4 +379,4 @@ msgstr "Gesamtbetrag"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,globalisation_id:0
 msgid "Globalisation ID"
-msgstr ""
+msgstr "Sammler ID"
diff --git a/addons/account_bank_statement_extensions/i18n/es.po b/addons/account_bank_statement_extensions/i18n/es.po
index 19c05e3dc1c..3c56f9b61fd 100644
--- a/addons/account_bank_statement_extensions/i18n/es.po
+++ b/addons/account_bank_statement_extensions/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -32,12 +32,12 @@ msgstr "Confirmado"
 #: view:account.bank.statement:0
 #: view:account.bank.statement.line:0
 msgid "Glob. Id"
-msgstr ""
+msgstr "Id global"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "CODA"
-msgstr ""
+msgstr "CODA"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,parent_id:0
@@ -93,23 +93,23 @@ msgstr "Confirma las lineas seleccionadas"
 #: report:bank.statement.balance.report:0
 #: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
 msgid "Bank Statement Balances Report"
-msgstr ""
+msgstr "Informe de balances de extractos bancarios"
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 msgid "Cancel Lines"
-msgstr ""
+msgstr "Cancelación de las líneas"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
 msgid "Batch Payment Info"
-msgstr ""
+msgstr "Información del pago por lote"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Confirm Lines"
-msgstr ""
+msgstr "Confirmación de las líneas"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
@@ -118,80 +118,82 @@ msgid ""
 "Delete operation not allowed !             Please go to the associated bank "
 "statement in order to delete and/or modify this bank statement line"
 msgstr ""
+"¡La operación de borrado no está permitida! Por favor vaya al extracto "
+"bancario asociado para borrar y/o modificar la línea del extracto."
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 #: field:account.bank.statement.line,journal_id:0
 #: report:bank.statement.balance.report:0
 msgid "Journal"
-msgstr ""
+msgstr "Diario"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Confirmed Statement Lines."
-msgstr ""
+msgstr "Lineas de extracto confirmadas"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Credit Transactions."
-msgstr ""
+msgstr "Transacciones de crédito"
 
 #. module: account_bank_statement_extensions
 #: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
 msgid "cancel selected statement lines."
-msgstr ""
+msgstr "Eliminar las lineas de extracto seleccionadas"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_number:0
 msgid "Counterparty Number"
-msgstr ""
+msgstr "Contrapartida"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 msgid "Transactions"
-msgstr ""
+msgstr "Transacciones"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Advertencia"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Saldo de cierre"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 #: field:account.bank.statement.line,globalisation_amount:0
 msgid "Glob. Amount"
-msgstr ""
+msgstr "Importe global"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Debit Transactions."
-msgstr ""
+msgstr "Transacciones de débito"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Confirmed lines cannot be changed anymore."
-msgstr ""
+msgstr "Las líneas confirmadas no pueden ser modificadas."
 
 #. module: account_bank_statement_extensions
 #: constraint:res.partner.bank:0
@@ -200,76 +202,83 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"Por favor defina el código BIC/Swift del banco para una cuenta de tipo IBAN "
+"para realizar pagos válidos"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
 msgid "Valuta Date"
-msgstr ""
+msgstr "Fecha de conversión"
 
 #. module: account_bank_statement_extensions
 #: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
 msgid "Confirm selected statement lines."
-msgstr ""
+msgstr "Confirmar las líneas de extracto seleccionadas"
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
 msgstr ""
+"¿Estás seguro que quiere cancelar las líneas del extracto bancario "
+"seleccionadas?"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
-msgstr ""
+msgstr "ISO 20022"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "Manual"
-msgstr ""
+msgstr "Manual"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Credit"
-msgstr ""
+msgstr "Haber"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Importe"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Cuenta fin."
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_currency:0
 msgid "Counterparty Currency"
-msgstr ""
+msgstr "Moneda de la contrapartida"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_bic:0
 msgid "Counterparty BIC"
-msgstr ""
+msgstr "BIC de la contrapartida"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,child_ids:0
 msgid "Child Codes"
-msgstr ""
+msgstr "Códigos hijos"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
 msgstr ""
+"¿Está seguro que desea confirmar las líneas del extracto bancario "
+"seleccionadas?"
 
 #. module: account_bank_statement_extensions
 #: constraint:account.bank.statement.line:0
@@ -277,6 +286,8 @@ msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
 msgstr ""
+"El importe del recibo debe ser el mismo importe que el de la línea del "
+"extracto"
 
 #. module: account_bank_statement_extensions
 #: help:account.bank.statement.line,globalisation_id:0
@@ -284,91 +295,94 @@ msgid ""
 "Code to identify transactions belonging to the same globalisation level "
 "within a batch payment"
 msgstr ""
+"Código para identificar las transacciones pertenecientes al mismo nivel "
+"global en un pago por lotes"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Draft Statement Lines."
-msgstr ""
+msgstr "Líneas de extracto en borrador."
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Glob. Am."
-msgstr ""
+msgstr "Imp. global"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Línea de extracto bancario"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,code:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_name:0
 msgid "Counterparty Name"
-msgstr ""
+msgstr "Nombre de la contrapartida"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,name:0
 msgid "Communication"
-msgstr ""
+msgstr "Comunicación"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Cuentas bancarias"
 
 #. module: account_bank_statement_extensions
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
 msgstr ""
+"El diario y periodo seleccionados tienen que pertenecer a la misma compañía."
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Extracto bancario"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement Line"
-msgstr ""
+msgstr "Línea de extracto"
 
 #. module: account_bank_statement_extensions
 #: sql_constraint:account.bank.statement.line.global:0
 msgid "The code must be unique !"
-msgstr ""
+msgstr "¡El código debe ser único!"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,bank_statement_line_ids:0
 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
 #: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
 msgid "Bank Statement Lines"
-msgstr ""
+msgstr "Líneas de extracto bancario"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 msgid "Child Batch Payments"
-msgstr ""
+msgstr "Pagos en lote hijos"
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 #: view:confirm.statement.line:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement Lines"
-msgstr ""
+msgstr "Líneas de extracto"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Importe total"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,globalisation_id:0
 msgid "Globalisation ID"
-msgstr ""
+msgstr "ID global"
diff --git a/addons/account_bank_statement_extensions/i18n/es_CR.po b/addons/account_bank_statement_extensions/i18n/es_CR.po
index 2fc4c48ee6f..5407cb3682b 100644
--- a/addons/account_bank_statement_extensions/i18n/es_CR.po
+++ b/addons/account_bank_statement_extensions/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/es_EC.po b/addons/account_bank_statement_extensions/i18n/es_EC.po
index 56a742bca4a..811d251e79c 100644
--- a/addons/account_bank_statement_extensions/i18n/es_EC.po
+++ b/addons/account_bank_statement_extensions/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -32,17 +32,17 @@ msgstr "Confirmado"
 #: view:account.bank.statement:0
 #: view:account.bank.statement.line:0
 msgid "Glob. Id"
-msgstr ""
+msgstr "Glob. Id"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "CODA"
-msgstr ""
+msgstr "CODA"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,parent_id:0
 msgid "Parent Code"
-msgstr ""
+msgstr "Código padre"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -54,62 +54,62 @@ msgstr "Débito"
 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
 #: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
 msgid "Cancel selected statement lines"
-msgstr ""
+msgstr "Cancelar las líneas seleccionadas"
 
 #. module: account_bank_statement_extensions
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "La CC y/o IBAN no es válido"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 #: selection:account.bank.statement.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Borrador"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement"
-msgstr ""
+msgstr "Extracto"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
 #: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
 msgid "Confirm selected statement lines"
-msgstr ""
+msgstr "Confirma las líneas seleccionadas"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 #: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
 msgid "Bank Statement Balances Report"
-msgstr ""
+msgstr "Balances de Extractos Bancarios"
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 msgid "Cancel Lines"
-msgstr ""
+msgstr "Cancelar Detalle"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
 msgid "Batch Payment Info"
-msgstr ""
+msgstr "Batch de Pago"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Confirm Lines"
-msgstr ""
+msgstr "Confirmar Detalle"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
@@ -118,80 +118,82 @@ msgid ""
 "Delete operation not allowed !             Please go to the associated bank "
 "statement in order to delete and/or modify this bank statement line"
 msgstr ""
+"Operación de borrado no permitida ! Por favor ir al extracto asociado para "
+"borrar y/o modificar"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 #: field:account.bank.statement.line,journal_id:0
 #: report:bank.statement.balance.report:0
 msgid "Journal"
-msgstr ""
+msgstr "Diario"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Confirmed Statement Lines."
-msgstr ""
+msgstr "Confirmar Detalle"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Credit Transactions."
-msgstr ""
+msgstr "Transacciones de Crédito"
 
 #. module: account_bank_statement_extensions
 #: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
 msgid "cancel selected statement lines."
-msgstr ""
+msgstr "Cancelar el detalle seleccionado"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_number:0
 msgid "Counterparty Number"
-msgstr ""
+msgstr "Número de Contraparte"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 msgid "Transactions"
-msgstr ""
+msgstr "Transacciones"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Aviso"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Saldo al Cierre"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 #: field:account.bank.statement.line,globalisation_amount:0
 msgid "Glob. Amount"
-msgstr ""
+msgstr "Monto Global"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Debit Transactions."
-msgstr ""
+msgstr "Transacciones de Débito"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Confirmed lines cannot be changed anymore."
-msgstr ""
+msgstr "Detalles confirmados no podrán ser modificados"
 
 #. module: account_bank_statement_extensions
 #: constraint:res.partner.bank:0
@@ -200,83 +202,86 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"Por favor defina el código BIC/Swift en el banco de cuentas IBAN para "
+"realizar pagos válidos"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
 msgid "Valuta Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: account_bank_statement_extensions
 #: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
 msgid "Confirm selected statement lines."
-msgstr ""
+msgstr "Confirmar detalle seleccionado"
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
-msgstr ""
+msgstr "Seguro de cancelar el detalle seleccionado ?"
 
 #. module: account_bank_statement_extensions
 #: report:bank.statement.balance.report:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "ISO 20022"
-msgstr ""
+msgstr "ISO 20022"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
 
 #. module: account_bank_statement_extensions
 #: selection:account.bank.statement.line.global,type:0
 msgid "Manual"
-msgstr ""
+msgstr "Manual"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Credit"
-msgstr ""
+msgstr "Crédito"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Monto"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Fin.Account"
-msgstr ""
+msgstr "Cuenta Fin."
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_currency:0
 msgid "Counterparty Currency"
-msgstr ""
+msgstr "Moneda de Contraparte"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_bic:0
 msgid "Counterparty BIC"
-msgstr ""
+msgstr "BIC"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,child_ids:0
 msgid "Child Codes"
-msgstr ""
+msgstr "Códigos hijos"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
-msgstr ""
+msgstr "Seguro de confirmar el detalle seleccionado ?"
 
 #. module: account_bank_statement_extensions
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "EL monto del comprobante debe ser el mismo del extracto"
 
 #. module: account_bank_statement_extensions
 #: help:account.bank.statement.line,globalisation_id:0
@@ -288,87 +293,88 @@ msgstr ""
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Draft Statement Lines."
-msgstr ""
+msgstr "Detalle borrador"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Glob. Am."
-msgstr ""
+msgstr "Glob. Am."
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Detalle de Extracto"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,code:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,counterparty_name:0
 msgid "Counterparty Name"
-msgstr ""
+msgstr "Descripción"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,name:0
 msgid "Communication"
-msgstr ""
+msgstr "Comunicación"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Cuentas Bancarias"
 
 #. module: account_bank_statement_extensions
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
 msgstr ""
+"El diario y periodo seleccionados tienen que pertenecer a la misma compañía"
 
 #. module: account_bank_statement_extensions
 #: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Extracto Bancario"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement Line"
-msgstr ""
+msgstr "Línea de extracto"
 
 #. module: account_bank_statement_extensions
 #: sql_constraint:account.bank.statement.line.global:0
 msgid "The code must be unique !"
-msgstr ""
+msgstr "Código debe ser único"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line.global,bank_statement_line_ids:0
 #: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
 #: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
 msgid "Bank Statement Lines"
-msgstr ""
+msgstr "Detalle de extracto"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
 msgid "Child Batch Payments"
-msgstr ""
+msgstr "Pagos por Batch"
 
 #. module: account_bank_statement_extensions
 #: view:cancel.statement.line:0
 #: view:confirm.statement.line:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Statement Lines"
-msgstr ""
+msgstr "Detalle de Extracto"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Monto total"
 
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,globalisation_id:0
 msgid "Globalisation ID"
-msgstr ""
+msgstr "ID"
diff --git a/addons/account_bank_statement_extensions/i18n/fi.po b/addons/account_bank_statement_extensions/i18n/fi.po
index 9874186c1e9..befe0c32a09 100644
--- a/addons/account_bank_statement_extensions/i18n/fi.po
+++ b/addons/account_bank_statement_extensions/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/fr.po b/addons/account_bank_statement_extensions/i18n/fr.po
index 4ca607db81e..5700cea5db4 100644
--- a/addons/account_bank_statement_extensions/i18n/fr.po
+++ b/addons/account_bank_statement_extensions/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/gu.po b/addons/account_bank_statement_extensions/i18n/gu.po
index e2e1d0827da..5c36d49b276 100644
--- a/addons/account_bank_statement_extensions/i18n/gu.po
+++ b/addons/account_bank_statement_extensions/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/it.po b/addons/account_bank_statement_extensions/i18n/it.po
index d1df722e511..7f9fa3589dc 100644
--- a/addons/account_bank_statement_extensions/i18n/it.po
+++ b/addons/account_bank_statement_extensions/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/ja.po b/addons/account_bank_statement_extensions/i18n/ja.po
index cc44aaa19db..c83968fb100 100644
--- a/addons/account_bank_statement_extensions/i18n/ja.po
+++ b/addons/account_bank_statement_extensions/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/mn.po b/addons/account_bank_statement_extensions/i18n/mn.po
index c120bd90901..d1216b1aa84 100644
--- a/addons/account_bank_statement_extensions/i18n/mn.po
+++ b/addons/account_bank_statement_extensions/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/nb.po b/addons/account_bank_statement_extensions/i18n/nb.po
new file mode 100644
index 00000000000..c8b6b014acb
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/nb.po
@@ -0,0 +1,382 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-28 12:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Søk Bank Transaksjon"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Bekreftet"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "Glob. Id"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "overordnede kode"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Debet"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Avbryt valgte setning linjer"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "RIB og / eller IBAN er ikke gyldig"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Kladd"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Uttalelse"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Bekreft utvalgte uttalelse linjer"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Bank erklæring Balanserer Rapporter"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Avbryt linjer"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Satsvis Betalingsinformasjon"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Bekreft linjer."
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+"Slett operasjonen ikke tillatt! Vennligst gå til den tilknyttede "
+"kontoutskrift for å slette og / eller endre denne kontoutskrift linjen."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Type"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Bekreftet erklæring linjer."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Kreditt transaksjoner."
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "Avbryte utvalgte uttalelse linjer."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Motpart nummer"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Transaksjoner"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr "Advarsel"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Sluttsaldo"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "glob Beløp"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Debet transaksjoner."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Utvidet Filtere ..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Bekreftet samband kan ikke lenger endres."
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Vennligst definere BIC / Swift-kode på bank for bank typen IBAN-konto for å "
+"fatte gyldige betalinger"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr "Valuta dato"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr "Bekreft utvalgte uttalelse linjer"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr "Er du sikker på at du vil avbryte de valgte kontoutskrift linjer?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Manuell"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Kredit"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Beløp"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Fin.Konto"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Motpart Valuta"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "Motpart BIC"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Underordnet kode"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr "Er du sikker på at du vil bekrefte de valgte kontoutskrift linjer?"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+"Mengden av bilaget må være det samme beløp som den på setningen linje"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Kode for å identifisere transaksjoner tilhører samme globalisering nivå "
+"innenfor en batch betaling"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Utkast linjer."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr "Glob.Am."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Kontoutskriftlinje"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Kode"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Motpartens navn"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "Kommunikasjon"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Bankkontoer"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "Tidsskriftet og perioden valgt å tilhøre samme selskap."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Kontoutskrift"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "erklæring Linje"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "Koden må være unik!"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Kontoutskrift linjer."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Underholdene Batch Betalinger."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Erklæring linjer"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Totalt beløp"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "Globalisering ID"
diff --git a/addons/account_bank_statement_extensions/i18n/nl.po b/addons/account_bank_statement_extensions/i18n/nl.po
index 98ddcaf1384..aef69711524 100644
--- a/addons/account_bank_statement_extensions/i18n/nl.po
+++ b/addons/account_bank_statement_extensions/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/pl.po b/addons/account_bank_statement_extensions/i18n/pl.po
index d8099b40e2d..761553bfc80 100644
--- a/addons/account_bank_statement_extensions/i18n/pl.po
+++ b/addons/account_bank_statement_extensions/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/pt.po b/addons/account_bank_statement_extensions/i18n/pt.po
index 7125c58ac79..fd3be788edc 100644
--- a/addons/account_bank_statement_extensions/i18n/pt.po
+++ b/addons/account_bank_statement_extensions/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/pt_BR.po b/addons/account_bank_statement_extensions/i18n/pt_BR.po
new file mode 100644
index 00000000000..22b9f97f1bf
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/pt_BR.po
@@ -0,0 +1,385 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-09-11 18:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "Procurar Transações Bancárias"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "ID Global"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "Código da Conta-pai"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "Débito"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "Cancelar linhas de instrução selecionadas"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "A RIB e/ ou IBAN não é válido."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "Situação"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "Provisório"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "Demonstrativo"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "Confirme as linhas do demonstrativo selecionadas"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "Relatório de Balanço Bancário"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "Cancelar Linhas"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "Informações de Pagamento em Lote"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "Confirmar Linhas"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr ""
+"Não é permitido excluir! Vá a linha do demonstrativo bancário associada para "
+"excluir ou modificar esta linha do demonstrativo"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "Diário"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "Linhas do Demonstrativo Confirmadas."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "Transações de Crédito"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "cancelar linhas do demonstrativo selecionadas."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "Número da Contrapartida"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "Transações"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "Saldo final"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "Data"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "Valor Global"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "Transações de Débito."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "Filtros Extendidos..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "Linhas confirmadas não podem ser alteradas."
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Por favor defina o BIC/Swift code no Banco para o tipo de conta IBAN para "
+"fazer pagamentos válidos"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr "Data do Crédito"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr "Confirmar as linhas do demonstrativo."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr ""
+"Você tem certeza de que deseja cancelar as Linhas de Demonstrativo Bancário "
+"selecionadas?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "Manual"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "Crédito"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "Valor"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Conta Fin."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "Moeda da Contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "BIC da Contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "Códigos derivados (sub-contas)"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr ""
+"Você deseja confirmar as Linhas do Demonstrativo Bancário selecionadas?"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+"O valor do recibo deve ser o mesmo valor da linha equivalente no extrato"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+"Código para identificar transações que pertencem ao nível de globalização "
+"dentro de um mesmo lote de pagamento"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "Linhas de Demonstrativo Provisórias."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr "Glob. Am."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "Linha do Demonstrativo Bancário"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "Código"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "Nome da Contrapartida"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "Comunicação"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Contas Bancárias"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "O diário e o período escolhido tem que pertencer à mesma empresa."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Extrato Bancário"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "Linha do Demonstrativo"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "O código precisa ser único!"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "Linhas do Demonstrativo Bancário"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "Lote de Pagamentos Filho"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "Linhas do Demonstrativo"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "Valor Total"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "ID Globalização"
diff --git a/addons/account_bank_statement_extensions/i18n/ro.po b/addons/account_bank_statement_extensions/i18n/ro.po
index 2562c1e3531..32fe8fd3098 100644
--- a/addons/account_bank_statement_extensions/i18n/ro.po
+++ b/addons/account_bank_statement_extensions/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/sr@latin.po b/addons/account_bank_statement_extensions/i18n/sr@latin.po
index 6218b46876b..1d9012eb7ba 100644
--- a/addons/account_bank_statement_extensions/i18n/sr@latin.po
+++ b/addons/account_bank_statement_extensions/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/sv.po b/addons/account_bank_statement_extensions/i18n/sv.po
index dabc9a40c41..f5c62886438 100644
--- a/addons/account_bank_statement_extensions/i18n/sv.po
+++ b/addons/account_bank_statement_extensions/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/tr.po b/addons/account_bank_statement_extensions/i18n/tr.po
index b49b2b49ab1..90ede5c5a40 100644
--- a/addons/account_bank_statement_extensions/i18n/tr.po
+++ b/addons/account_bank_statement_extensions/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/zh_CN.po b/addons/account_bank_statement_extensions/i18n/zh_CN.po
index cb519388417..630146a8383 100644
--- a/addons/account_bank_statement_extensions/i18n/zh_CN.po
+++ b/addons/account_bank_statement_extensions/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
diff --git a/addons/account_bank_statement_extensions/i18n/zh_TW.po b/addons/account_bank_statement_extensions/i18n/zh_TW.po
new file mode 100644
index 00000000000..3aa1b77729b
--- /dev/null
+++ b/addons/account_bank_statement_extensions/i18n/zh_TW.po
@@ -0,0 +1,376 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-22 02:20+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr "搜尋銀行交易"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Confirmed"
+msgstr "確認"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement:0
+#: view:account.bank.statement.line:0
+msgid "Glob. Id"
+msgstr "全球ID"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "CODA"
+msgstr "CODA"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,parent_id:0
+msgid "Parent Code"
+msgstr "上層代碼"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit"
+msgstr "借方"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_cancel_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_cancel_statement_line
+msgid "Cancel selected statement lines"
+msgstr "取消選定的對帳單明細"
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "RIB/IBAN 無效"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Group By..."
+msgstr "分類方式..."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: selection:account.bank.statement.line,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement"
+msgstr "對帳單"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_confirm_statement_line
+#: model:ir.model,name:account_bank_statement_extensions.model_confirm_statement_line
+msgid "Confirm selected statement lines"
+msgstr "確認選定的對帳單明細"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+#: model:ir.actions.report.xml,name:account_bank_statement_extensions.bank_statement_balance_report
+msgid "Bank Statement Balances Report"
+msgstr "銀行對帳單餘額報表"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Cancel Lines"
+msgstr "刪除明細"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr "批次付款方式"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirm Lines"
+msgstr "確認明細"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid ""
+"Delete operation not allowed !             Please go to the associated bank "
+"statement in order to delete and/or modify this bank statement line"
+msgstr "不允許刪除操作 !             請到相關的銀行對帳單，以便刪除和/或修改本銀行對帳單明細"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,type:0
+msgid "Type"
+msgstr "類型"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,journal_id:0
+#: report:bank.statement.balance.report:0
+msgid "Journal"
+msgstr "帳簿"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Confirmed Statement Lines."
+msgstr "已確認對帳單明細."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr "信用交易."
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_cancel_statement_line
+msgid "cancel selected statement lines."
+msgstr "刪除所選之對帳單明細."
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr "交易對方數量"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Transactions"
+msgstr "交易"
+
+#. module: account_bank_statement_extensions
+#: code:addons/account_bank_statement_extensions/account_bank_statement.py:130
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Closing Balance"
+msgstr "期末餘額"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Date"
+msgstr "日期"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+#: field:account.bank.statement.line,globalisation_amount:0
+msgid "Glob. Amount"
+msgstr "全球金額"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr "借方交易."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr "進階篩選..."
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Confirmed lines cannot be changed anymore."
+msgstr "已確認明細不能再做任何更改."
+
+#. module: account_bank_statement_extensions
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"請為 IBAN類型的銀行指定 BIC/Swift代碼，以便自動付款。"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr "幣值日期"
+
+#. module: account_bank_statement_extensions
+#: model:ir.actions.act_window,help:account_bank_statement_extensions.action_confirm_statement_line
+msgid "Confirm selected statement lines."
+msgstr "確認選定的對帳單明細."
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+msgid "Are you sure you want to cancel the selected Bank Statement lines ?"
+msgstr "你確定要刪除選定的銀行對帳單明細 ?"
+
+#. module: account_bank_statement_extensions
+#: report:bank.statement.balance.report:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "ISO 20022"
+msgstr "ISO 20022"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Notes"
+msgstr "筆記"
+
+#. module: account_bank_statement_extensions
+#: selection:account.bank.statement.line.global,type:0
+msgid "Manual"
+msgstr "手冊"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Credit"
+msgstr "貸方"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,amount:0
+msgid "Amount"
+msgstr "金額"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Fin.Account"
+msgstr "Fin.Account"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr "交易對方幣別"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr "交易對方 BIC"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,child_ids:0
+msgid "Child Codes"
+msgstr "下層代碼"
+
+#. module: account_bank_statement_extensions
+#: view:confirm.statement.line:0
+msgid "Are you sure you want to confirm the selected Bank Statement lines ?"
+msgstr "你確定要確認所選定的銀行對帳單明細 ?"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr "憑證金額必須和對帳單明細上的金額一致"
+
+#. module: account_bank_statement_extensions
+#: help:account.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr "交易碼用來確認屬於同樣全球層次的批次付款"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Draft Statement Lines."
+msgstr "聲明草稿明細."
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Glob. Am."
+msgstr "Glob. Am."
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "銀行對帳單明細"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,code:0
+msgid "Code"
+msgstr "代碼"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr "交易對方名稱"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,name:0
+msgid "Communication"
+msgstr "通訊"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "銀行帳號"
+
+#. module: account_bank_statement_extensions
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr "所選的帳簿和期間必須屬於相同公司。"
+
+#. module: account_bank_statement_extensions
+#: model:ir.model,name:account_bank_statement_extensions.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "銀行對帳單"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Line"
+msgstr "對帳單明細"
+
+#. module: account_bank_statement_extensions
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr "代碼必須是唯一的 !"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line.global,bank_statement_line_ids:0
+#: model:ir.actions.act_window,name:account_bank_statement_extensions.action_bank_statement_line
+#: model:ir.ui.menu,name:account_bank_statement_extensions.bank_statement_line
+msgid "Bank Statement Lines"
+msgstr "銀行對帳單明細"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line.global:0
+msgid "Child Batch Payments"
+msgstr "下級批次付款"
+
+#. module: account_bank_statement_extensions
+#: view:cancel.statement.line:0
+#: view:confirm.statement.line:0
+msgid "Cancel"
+msgstr "刪除"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Statement Lines"
+msgstr "對帳單明細"
+
+#. module: account_bank_statement_extensions
+#: view:account.bank.statement.line:0
+msgid "Total Amount"
+msgstr "總金額"
+
+#. module: account_bank_statement_extensions
+#: field:account.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr "全球化 ID"
diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index e03c66c2132..222178b940c 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -32,23 +32,26 @@ Once the Budgets are defined (in Invoicing/Budgets/Budgets), the Project Manager
 can set the planned amount on each Analytic Account.
 
 The accountant has the possibility to see the total of amount planned for each
-Budget in order to ensure the total planned is not greater/lower than what he planned
-for this Budget. Each list of record can also be switched to a graphical view of it.
+Budget in order to ensure the total planned is not greater/lower than what he 
+planned for this Budget. Each list of record can also be switched to a graphical 
+view of it.
 
 Three reports are available:
+----------------------------
+    1. The first is available from a list of Budgets. It gives the spreading, for 
+       these Budgets, of the Analytic Accounts.
 
-    1. The first is available from a list of Budgets. It gives the spreading, for these Budgets, of the Analytic Accounts.
+    2. The second is a summary of the previous one, it only gives the spreading, 
+       for the selected Budgets, of the Analytic Accounts.
 
-    2. The second is a summary of the previous one, it only gives the spreading, for the selected Budgets, of the Analytic Accounts.
-
-    3. The last one is available from the Analytic Chart of Accounts. It gives the spreading, for the selected Analytic Accounts of Budgets.
+    3. The last one is available from the Analytic Chart of Accounts. It gives 
+       the spreading, for the selected Analytic Accounts of Budgets.
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/budget.jpeg','images/budgetary_position.jpeg'],
     'depends': ['account'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'security/account_budget_security.xml',
         'account_budget_view.xml',
@@ -59,13 +62,12 @@ Three reports are available:
         'wizard/account_budget_crossovered_summary_report_view.xml',
         'wizard/account_budget_crossovered_report_view.xml',
     ],
-    'demo_xml': ['account_budget_demo.xml'],
+    'demo': ['account_budget_demo.xml'],
     'test':[
-            'test/account_budget.yml',
-            'test/account_budget_report.yml',
-            ],
+        'test/account_budget.yml',
+        'test/account_budget_report.yml',
+    ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0043819694157',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 21f9cc69b8a..35194e96b82 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-    <!-- budget form and tree view from account module *********************************** -->
-        <record id="action_account_budget_post_tree" model="ir.actions.act_window">
-            <field name="name">Budgets</field>
-            <field name="res_model">account.budget.post</field>
-            <field name="view_type">tree</field>
-        </record>
-        <menuitem action="action_account_budget_post_tree" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>
+
+        <menuitem name="Budgets" id="menu_action_account_budget_post_tree" parent="account.menu_finance_generic_reporting" sequence="6"/>
 
         <!--
     Budgets
@@ -62,12 +57,7 @@
                             <field name="account_ids"/>
                         </page>
                         <page string="Budget Lines">
-                            <field name="crossovered_budget_line" widget="one2many_list" mode="graph,tree">
-                                <graph type="bar" string="Lines">
-                                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                                    <field name="planned_amount" operator="+"/>
-                                    <field group="True" name="general_budget_id"/>
-                                </graph>
+                            <field name="crossovered_budget_line" widget="one2many_list" mode="tree">
                                 <tree string="Budget Lines"  editable="top">
                                     <field name="crossovered_budget_id"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
@@ -230,7 +220,17 @@
         <menuitem parent="next_id_31"
             id="menu_act_crossovered_budget_view"
             action="act_crossovered_budget_view" sequence="1" />
-
+        
+       <record id="view_crossovered_budget_line_search" model="ir.ui.view">
+            <field name="name">account.budget.line.search</field>
+            <field name="model">crossovered.budget.lines</field>
+            <field name="arch" type="xml">
+                <search string="Budget Lines">
+                    <field name="analytic_account_id"/>
+                </search>
+            </field>
+        </record>
+        
         <record model="ir.ui.view" id="view_crossovered_budget_line_tree">
             <field name="name">crossovered.budget.line.tree</field>
             <field name="model">crossovered.budget.lines</field>
@@ -294,13 +294,13 @@
 
 
         <record model="ir.ui.view" id="view_account_analytic_account_form_inherit_budget">
-            <field name="name">account.analytic.account.form.inherot.budget</field>
+            <field name="name">account.analytic.account.form.inherit.budget</field>
             <field name="model">account.analytic.account</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Budget Lines">
-                            <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree,graph">
+                    <page string="Budget Lines" groups="account.group_account_user">
+                            <field name="crossovered_budget_line" widget="one2many_list" colspan="4" nolabel="1" mode="tree">
                                 <tree string="Budget Lines" editable="top">
                                     <field name="crossovered_budget_id"/>
                                     <field name="general_budget_id"/>
@@ -320,11 +320,6 @@
                                     <field name="paid_date"/>
                                     <field name="planned_amount"/>
                                 </form>
-                                <graph type="bar" string="Lines">
-                                    <field name="general_budget_id" />
-                                    <field name="planned_amount" operator="+"/>
-                                    <field group="True" name="analytic_account_id"/>
-                                </graph>
                             </field>
                     </page>
                 </notebook>
diff --git a/addons/account_budget/i18n/ar.po b/addons/account_budget/i18n/ar.po
index 7d1f78a5233..7113558fc6b 100644
--- a/addons/account_budget/i18n/ar.po
+++ b/addons/account_budget/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/bg.po b/addons/account_budget/i18n/bg.po
index bce91c3e4bd..bdd93e34acf 100644
--- a/addons/account_budget/i18n/bg.po
+++ b/addons/account_budget/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/bs.po b/addons/account_budget/i18n/bs.po
index 6d96d1e8f02..4cb7eeff080 100644
--- a/addons/account_budget/i18n/bs.po
+++ b/addons/account_budget/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/ca.po b/addons/account_budget/i18n/ca.po
index 1c65cf8ae38..0282ab6a6d0 100644
--- a/addons/account_budget/i18n/ca.po
+++ b/addons/account_budget/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/cs.po b/addons/account_budget/i18n/cs.po
index b8b009210e2..809b07a3b06 100644
--- a/addons/account_budget/i18n/cs.po
+++ b/addons/account_budget/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/da.po b/addons/account_budget/i18n/da.po
index ada307c7b39..ee8e2d6c9fe 100644
--- a/addons/account_budget/i18n/da.po
+++ b/addons/account_budget/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/de.po b/addons/account_budget/i18n/de.po
index 19a03edd6a9..175ec2e39e6 100644
--- a/addons/account_budget/i18n/de.po
+++ b/addons/account_budget/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/el.po b/addons/account_budget/i18n/el.po
index b68d0cd9c7b..389d2789b49 100644
--- a/addons/account_budget/i18n/el.po
+++ b/addons/account_budget/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/en_GB.po b/addons/account_budget/i18n/en_GB.po
index e927af2641f..c2e02845445 100644
--- a/addons/account_budget/i18n/en_GB.po
+++ b/addons/account_budget/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po
index f0e2c52498b..290dec20e21 100644
--- a/addons/account_budget/i18n/es.po
+++ b/addons/account_budget/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/es_AR.po b/addons/account_budget/i18n/es_AR.po
index 00ffd590e27..c69b0069ed2 100644
--- a/addons/account_budget/i18n/es_AR.po
+++ b/addons/account_budget/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/es_CR.po b/addons/account_budget/i18n/es_CR.po
index 6838f94b8a2..6f504c24c7a 100644
--- a/addons/account_budget/i18n/es_CR.po
+++ b/addons/account_budget/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: account_budget
diff --git a/addons/account_budget/i18n/es_EC.po b/addons/account_budget/i18n/es_EC.po
index ae3d9e74cfd..fad771f9feb 100644
--- a/addons/account_budget/i18n/es_EC.po
+++ b/addons/account_budget/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/es_PY.po b/addons/account_budget/i18n/es_PY.po
index 68cd637fce9..e25d41eab0f 100644
--- a/addons/account_budget/i18n/es_PY.po
+++ b/addons/account_budget/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/et.po b/addons/account_budget/i18n/et.po
index a3a1b81f150..a5344e7b6d4 100644
--- a/addons/account_budget/i18n/et.po
+++ b/addons/account_budget/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/fa.po b/addons/account_budget/i18n/fa.po
index 0985fd3efe5..f8617d194f4 100644
--- a/addons/account_budget/i18n/fa.po
+++ b/addons/account_budget/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/fi.po b/addons/account_budget/i18n/fi.po
index 4ca1190e2da..543a76c2407 100644
--- a/addons/account_budget/i18n/fi.po
+++ b/addons/account_budget/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: view:account.budget.post:0
diff --git a/addons/account_budget/i18n/fr.po b/addons/account_budget/i18n/fr.po
index 08dd6eaf6e1..3e00575201b 100644
--- a/addons/account_budget/i18n/fr.po
+++ b/addons/account_budget/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/gl.po b/addons/account_budget/i18n/gl.po
index 16270e6a307..041159a790e 100644
--- a/addons/account_budget/i18n/gl.po
+++ b/addons/account_budget/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/gu.po b/addons/account_budget/i18n/gu.po
index ed80865e3ea..f4d46e36ca7 100644
--- a/addons/account_budget/i18n/gu.po
+++ b/addons/account_budget/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/he.po b/addons/account_budget/i18n/he.po
index 58e75184fd7..f1db849c397 100644
--- a/addons/account_budget/i18n/he.po
+++ b/addons/account_budget/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/hi.po b/addons/account_budget/i18n/hi.po
index f1c3473eaa2..ff5e4833217 100644
--- a/addons/account_budget/i18n/hi.po
+++ b/addons/account_budget/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/hr.po b/addons/account_budget/i18n/hr.po
index 722ca409217..8d665e558ba 100644
--- a/addons/account_budget/i18n/hr.po
+++ b/addons/account_budget/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/hu.po b/addons/account_budget/i18n/hu.po
index e8da9e6e80b..bcebea7c7b9 100644
--- a/addons/account_budget/i18n/hu.po
+++ b/addons/account_budget/i18n/hu.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-30 16:38+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
+"PO-Revision-Date: 2012-10-09 13:49+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -138,7 +137,7 @@ msgstr ""
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "The Budget '%s' has no accounts!"
-msgstr ""
+msgstr "A '%s' költségvetésnek nincs számlaszáma!"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -259,7 +258,7 @@ msgstr "Üzleti terv"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve Budgets"
-msgstr ""
+msgstr "Költségvetés jóváhagyása"
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
@@ -359,7 +358,7 @@ msgstr "Nyomtatás"
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoretical Amount"
-msgstr ""
+msgstr "Elméleti mennyiség"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
@@ -421,7 +420,7 @@ msgstr "Elemzési időszak"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Draft Budgets"
-msgstr ""
+msgstr "Előzetes, tervezett költségvetés"
 
 #, python-format
 #~ msgid "The General Budget '%s' has no Accounts!"
diff --git a/addons/account_budget/i18n/id.po b/addons/account_budget/i18n/id.po
index d305feced1a..b3bd6ee2fae 100644
--- a/addons/account_budget/i18n/id.po
+++ b/addons/account_budget/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po
index 6b1a8109371..79146697bd7 100644
--- a/addons/account_budget/i18n/it.po
+++ b/addons/account_budget/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/ja.po b/addons/account_budget/i18n/ja.po
index 8566153ce98..4a93ef1b8e8 100644
--- a/addons/account_budget/i18n/ja.po
+++ b/addons/account_budget/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/ko.po b/addons/account_budget/i18n/ko.po
index 2df1f164632..657537ea6d6 100644
--- a/addons/account_budget/i18n/ko.po
+++ b/addons/account_budget/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/lo.po b/addons/account_budget/i18n/lo.po
index 620bb714962..a1a492ff790 100644
--- a/addons/account_budget/i18n/lo.po
+++ b/addons/account_budget/i18n/lo.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-19 15:50+0000\n"
+"PO-Revision-Date: 2012-10-09 16:05+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -31,7 +31,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
 #: report:account.budget:0
@@ -126,6 +126,14 @@ msgid ""
 "revenue per analytic account and monitor its evolution based on the actuals "
 "realised during that period."
 msgstr ""
+"ງົບປະມານແມ່ນຄາດຄະເນລາຍໄດ້ຂອງບໍລິສັດຂອງທ່ານແລະຄ່າໃຊ້ຈ່າຍຄາດວ່າຈະສໍາລັບໄລຍະເວລາ"
+"ໃນອະນາຄົດໄດ້. ມີງົບປະມານ, "
+"ບໍລິສັດສາມາດລະມັດລະວັງເບິ່ງວິທີການເງິນຫຼາຍປານເຂົາເຈົ້າໄດ້ຖືກກິນໃນໄລຍະເວລາໃນໄລ"
+"ຍະໃດຫນຶ່ງ, ແລະສະວິທີທີ່ດີທີ່ສຸດເພື່ອແບ່ງມັນໃນບັນດາປະເພດຂອງລາຍການຕ່າງໆ. "
+"ໂດຍການຮັກສາຕິດຕາມບ່ອນທີ່ເງິນຂອງທ່ານດີ, ທ່ານອາດຈະມີຫນ້ອຍອາດຈະ overspend, "
+"ແລະອື່ນໆທີ່ອາດຈະຕອບສະຫນອງໄດ້ຕາມເປົ້າຫມາຍທາງດ້ານການເງິນຂອງທ່ານ. "
+"ຄາດງົບປະມານໂດຍ detailing ລາຍຮັບຄາດວ່າຈະຕໍ່ບັນຊີແຍກທາດແລະຕິດຕາມກວດກາຂອງຕົນ "
+"evolution ອີງຕາມຕົວຈິງໃນ realized ໃນໄລຍະນັ້ນ."
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
@@ -170,7 +178,7 @@ msgstr "ເພື່ອຮັບຮູ້"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "ປັບກັບຮ່າງ"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -203,7 +211,7 @@ msgstr ""
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
 msgid "Practical Amount"
-msgstr ""
+msgstr "ຈໍານວນເງິນປະຕິບັດໄດ້"
 
 #. module: account_budget
 #: field:crossovered.budget,date_to:0
@@ -292,7 +300,7 @@ msgstr ""
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "ຍົກເລີກ"
 
 #. module: account_budget
 #: view:crossovered.budget:0
diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index 89af4fa4fef..6a8081d0880 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/lv.po b/addons/account_budget/i18n/lv.po
index 6efe0bc9d85..d6986e2266a 100644
--- a/addons/account_budget/i18n/lv.po
+++ b/addons/account_budget/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/mn.po b/addons/account_budget/i18n/mn.po
index 4b76fbe062b..136288ea187 100644
--- a/addons/account_budget/i18n/mn.po
+++ b/addons/account_budget/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/nb.po b/addons/account_budget/i18n/nb.po
index e3fff9e6d91..4da14a04a5f 100644
--- a/addons/account_budget/i18n/nb.po
+++ b/addons/account_budget/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po
index 798d32be1d9..33185890e0a 100644
--- a/addons/account_budget/i18n/nl.po
+++ b/addons/account_budget/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-02-08 09:47+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/nl_BE.po b/addons/account_budget/i18n/nl_BE.po
index de8d867f2c8..dedeee50021 100644
--- a/addons/account_budget/i18n/nl_BE.po
+++ b/addons/account_budget/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/oc.po b/addons/account_budget/i18n/oc.po
index 8cf503c4e81..7154c572066 100644
--- a/addons/account_budget/i18n/oc.po
+++ b/addons/account_budget/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/pl.po b/addons/account_budget/i18n/pl.po
index 9fdc8fe1040..5b4c02002b7 100644
--- a/addons/account_budget/i18n/pl.po
+++ b/addons/account_budget/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/pt.po b/addons/account_budget/i18n/pt.po
index 32648e3c01a..1fbddadb475 100644
--- a/addons/account_budget/i18n/pt.po
+++ b/addons/account_budget/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/pt_BR.po b/addons/account_budget/i18n/pt_BR.po
index 4b78fd586eb..9e5e0b00da4 100644
--- a/addons/account_budget/i18n/pt_BR.po
+++ b/addons/account_budget/i18n/pt_BR.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr "Usuário responsável"
+msgstr "Usuário Responsável"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -45,7 +45,7 @@ msgstr "Confirmar"
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
 msgid "Validate User"
-msgstr "Validar usuário"
+msgstr "Validar Usuário"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
@@ -91,7 +91,7 @@ msgstr "Moeda:"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
 msgid "Account Budget crossvered report"
-msgstr "Relatório de Conta orçamento contrapartida"
+msgstr "Relatório da Conta de Orçamento Cruzado"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -111,7 +111,7 @@ msgstr "para"
 #. module: account_budget
 #: field:crossovered.budget,state:0
 msgid "Status"
-msgstr "Estado"
+msgstr "Situação"
 
 #. module: account_budget
 #: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view
@@ -160,7 +160,7 @@ msgstr "Moeda"
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Total :"
-msgstr "Total :"
+msgstr "Total:"
 
 #. module: account_budget
 #: field:account.budget.post,company_id:0
@@ -177,7 +177,7 @@ msgstr "Para Aprovar"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Reset to Draft"
-msgstr "Voltar para Rascunho"
+msgstr "Voltar para Provisório"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -202,7 +202,7 @@ msgstr "Completo"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr "Amt prático"
+msgstr "Valor Real"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -222,7 +222,7 @@ msgstr "Data Final"
 #: model:ir.model,name:account_budget.model_account_budget_analytic
 #: model:ir.model,name:account_budget.model_account_budget_report
 msgid "Account Budget report for analytic account"
-msgstr "Relatório de orçamento conta analítica"
+msgstr "Relatório de Orçamento para conta analítica"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -238,7 +238,7 @@ msgstr "Nome"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 msgid "Budget Line"
-msgstr "Item de Orçamento"
+msgstr "Linha de Orçamento"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -310,7 +310,7 @@ msgstr "Aprovar"
 #: field:crossovered.budget,date_from:0
 #: field:crossovered.budget.lines,date_from:0
 msgid "Start Date"
-msgstr "Data de Início"
+msgstr "Data Inicial"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -330,13 +330,13 @@ msgstr "Início do período"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
 msgid "Account Budget  crossvered summary report"
-msgstr "Relatório resumido do orçamento contrapartida"
+msgstr "Relatório resumido do orçamento cruzado"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Theoretical Amt"
-msgstr "Amt teórico"
+msgstr "Valor Teórico"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -359,7 +359,7 @@ msgstr "Imprimir"
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoretical Amount"
-msgstr "Valor Planejado"
+msgstr "Valor Teórico"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
@@ -421,7 +421,7 @@ msgstr "Análise de"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Draft Budgets"
-msgstr "Rascunho de Orçamentos"
+msgstr "Orçamentos Provisórios"
 
 #~ msgid "% performance"
 #~ msgstr "% desempenho"
diff --git a/addons/account_budget/i18n/ro.po b/addons/account_budget/i18n/ro.po
index a2c04140666..1b5fb155a72 100644
--- a/addons/account_budget/i18n/ro.po
+++ b/addons/account_budget/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/ru.po b/addons/account_budget/i18n/ru.po
index 33e71223201..8f2d6fcb3a8 100644
--- a/addons/account_budget/i18n/ru.po
+++ b/addons/account_budget/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/sl.po b/addons/account_budget/i18n/sl.po
index 4215930aac6..9887543a177 100644
--- a/addons/account_budget/i18n/sl.po
+++ b/addons/account_budget/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/sq.po b/addons/account_budget/i18n/sq.po
index 69de997a85c..37714a3a310 100644
--- a/addons/account_budget/i18n/sq.po
+++ b/addons/account_budget/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/sr.po b/addons/account_budget/i18n/sr.po
index ec6710033d0..23f8af582f5 100644
--- a/addons/account_budget/i18n/sr.po
+++ b/addons/account_budget/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/sr@latin.po b/addons/account_budget/i18n/sr@latin.po
index a00e25952be..2c95400dc1e 100644
--- a/addons/account_budget/i18n/sr@latin.po
+++ b/addons/account_budget/i18n/sr@latin.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-04-17 05:29+0000\n"
-"Last-Translator: Maroje Delibasic <Unknown>\n"
+"Last-Translator: MD <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/sv.po b/addons/account_budget/i18n/sv.po
index dbffb445368..182ea743962 100644
--- a/addons/account_budget/i18n/sv.po
+++ b/addons/account_budget/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/tlh.po b/addons/account_budget/i18n/tlh.po
index b766b767335..8a91bd2df12 100644
--- a/addons/account_budget/i18n/tlh.po
+++ b/addons/account_budget/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index 23b3ffff6d5..be06a1d0acc 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/uk.po b/addons/account_budget/i18n/uk.po
index d5018a2f05e..1b94e4011fc 100644
--- a/addons/account_budget/i18n/uk.po
+++ b/addons/account_budget/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/vi.po b/addons/account_budget/i18n/vi.po
index fa381a172ef..6206d14a67b 100644
--- a/addons/account_budget/i18n/vi.po
+++ b/addons/account_budget/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/zh_CN.po b/addons/account_budget/i18n/zh_CN.po
index d3d13c788f2..f1a8ddff4d4 100644
--- a/addons/account_budget/i18n/zh_CN.po
+++ b/addons/account_budget/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
diff --git a/addons/account_budget/i18n/zh_TW.po b/addons/account_budget/i18n/zh_TW.po
index 037621ffbbc..dc6e15e59ee 100644
--- a/addons/account_budget/i18n/zh_TW.po
+++ b/addons/account_budget/i18n/zh_TW.po
@@ -7,35 +7,35 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-01-23 17:15+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-08-22 03:26+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
 msgid "Responsible User"
-msgstr "負責用戶"
+msgstr "負責的使用者"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Confirmed"
-msgstr "確認"
+msgstr "已確認"
 
 #. module: account_budget
 #: 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
 #: report:account.budget:0
 msgid "Printed at:"
-msgstr ""
+msgstr "列印在:"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -45,17 +45,17 @@ msgstr "確認"
 #. module: account_budget
 #: field:crossovered.budget,validating_user_id:0
 msgid "Validate User"
-msgstr ""
+msgstr "驗證使用者"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
 msgid "Print Summary"
-msgstr ""
+msgstr "列印摘要"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
 msgid "Paid Date"
-msgstr "付款日期"
+msgstr "支付日期"
 
 #. module: account_budget
 #: field:account.budget.analytic,date_to:0
@@ -63,7 +63,7 @@ msgstr "付款日期"
 #: field:account.budget.crossvered.summary.report,date_to:0
 #: field:account.budget.report,date_to:0
 msgid "End of period"
-msgstr ""
+msgstr "期末"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -74,14 +74,14 @@ msgstr "草稿"
 #. module: account_budget
 #: report:account.budget:0
 msgid "at"
-msgstr "於"
+msgstr "在"
 
 #. module: account_budget
 #: view:account.budget.report:0
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_analytic
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_report
 msgid "Print Budgets"
-msgstr ""
+msgstr "列印預算"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -91,12 +91,12 @@ msgstr "貨幣:"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
 msgid "Account Budget crossvered report"
-msgstr ""
+msgstr "帳戶混合預算報表"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Validated"
-msgstr "已驗證"
+msgstr "驗證"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,percentage:0
@@ -106,7 +106,7 @@ msgstr "百分比"
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "to"
-msgstr "至"
+msgstr "到"
 
 #. module: account_budget
 #: field:crossovered.budget,state:0
@@ -125,24 +125,26 @@ msgid ""
 "revenue per analytic account and monitor its evolution based on the actuals "
 "realised during that period."
 msgstr ""
+"預算是未來期間公司的預期損益表。在預算中，公司可以小心觀察特定期間的現金，並思考將其區分成不同類別的最好方法。藉著現金流的規劃記錄，您比較不會超支，因而比"
+"較可能達到公司的財務目標。按分析帳戶的收入細項預測預算並在該期間監控其實際發生過程。"
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "The Budget '%s' has no accounts!"
-msgstr ""
+msgstr "預算裏 '%s' 沒有科目!"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "%"
-msgstr ""
+msgstr "%"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Description"
-msgstr "說明"
+msgstr "描述"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -164,25 +166,25 @@ msgstr "公司"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve"
-msgstr ""
+msgstr "批准"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Reset to Draft"
-msgstr "退回至草案"
+msgstr "重設為草稿"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,planned_amount:0
 msgid "Planned Amount"
-msgstr ""
+msgstr "計劃金額"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Perc(%)"
-msgstr ""
+msgstr "百分比(%)"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -194,7 +196,7 @@ msgstr "完成"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr ""
+msgstr "實際金額"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -202,7 +204,7 @@ msgstr ""
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,practical_amount:0
 msgid "Practical Amount"
-msgstr ""
+msgstr "實際金額"
 
 #. module: account_budget
 #: field:crossovered.budget,date_to:0
@@ -214,12 +216,12 @@ msgstr "結束日期"
 #: model:ir.model,name:account_budget.model_account_budget_analytic
 #: model:ir.model,name:account_budget.model_account_budget_report
 msgid "Account Budget report for analytic account"
-msgstr ""
+msgstr "輔助核算項目的預算報告"
 
 #. module: account_budget
 #: view:account.analytic.account:0
 msgid "Theoritical Amount"
-msgstr ""
+msgstr "理論金額"
 
 #. module: account_budget
 #: field:account.budget.post,name:0
@@ -251,7 +253,7 @@ msgstr "預算"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve Budgets"
-msgstr ""
+msgstr "通過預算"
 
 #. module: account_budget
 #: code:addons/account_budget/account_budget.py:119
@@ -263,13 +265,13 @@ msgstr "錯誤!"
 #: field:account.budget.post,code:0
 #: field:crossovered.budget,code:0
 msgid "Code"
-msgstr ""
+msgstr "代碼"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
 #: view:account.budget.crossvered.report:0
 msgid "This wizard is used to print budget"
-msgstr ""
+msgstr "這個精靈被使用在列印預算"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
@@ -286,17 +288,17 @@ msgstr "預算"
 #. module: account_budget
 #: view:account.budget.crossvered.summary.report:0
 msgid "This wizard is used to print summary of budgets"
-msgstr ""
+msgstr "這個精靈被使用在列印彙總預算"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
 msgid "Cancelled"
-msgstr "取消"
+msgstr "已刪除"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Approve"
-msgstr ""
+msgstr "核準"
 
 #. module: account_budget
 #: field:crossovered.budget,date_from:0
@@ -309,7 +311,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
 #: field:account.budget.analytic,date_from:0
@@ -317,18 +319,18 @@ msgstr ""
 #: field:account.budget.crossvered.summary.report,date_from:0
 #: field:account.budget.report,date_from:0
 msgid "Start of period"
-msgstr ""
+msgstr "開始期間"
 
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
 msgid "Account Budget  crossvered summary report"
-msgstr ""
+msgstr "科目預算混合彙總報表"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Theoretical Amt"
-msgstr ""
+msgstr "理論金額"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -336,7 +338,7 @@ msgstr ""
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "Select Dates Period"
-msgstr ""
+msgstr "選擇日期期間"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -344,20 +346,20 @@ msgstr ""
 #: view:account.budget.crossvered.summary.report:0
 #: view:account.budget.report:0
 msgid "Print"
-msgstr ""
+msgstr "列印"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: view:crossovered.budget:0
 #: field:crossovered.budget.lines,theoritical_amount:0
 msgid "Theoretical Amount"
-msgstr ""
+msgstr "理論金額"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,analytic_account_id:0
 #: model:ir.model,name:account_budget.model_account_analytic_account
 msgid "Analytic Account"
-msgstr "分析科目"
+msgstr "核助核算項目"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -368,13 +370,13 @@ msgstr "預算 :"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Planned Amt"
-msgstr ""
+msgstr "計畫金額"
 
 #. module: account_budget
 #: view:account.budget.post:0
 #: field:account.budget.post,account_ids:0
 msgid "Accounts"
-msgstr ""
+msgstr "科目"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -397,23 +399,23 @@ msgstr "預算明細"
 #: view:account.budget.report:0
 #: view:crossovered.budget:0
 msgid "Cancel"
-msgstr "取消"
+msgstr "刪除"
 
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "錯誤！您不能建立循環的輔助核算項目"
 
 #. module: account_budget
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Analysis from"
-msgstr ""
+msgstr "分析從"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Draft Budgets"
-msgstr ""
+msgstr "草稿預算"
 
 #~ msgid "Budget Management"
 #~ msgstr "預算管理"
diff --git a/addons/account_budget/report/analytic_account_budget_report.py b/addons/account_budget/report/analytic_account_budget_report.py
index aa5d39f8d49..e29af98b6a3 100644
--- a/addons/account_budget/report/analytic_account_budget_report.py
+++ b/addons/account_budget/report/analytic_account_budget_report.py
@@ -35,7 +35,9 @@ class analytic_account_budget_report(report_sxw.rml_parse):
         })
         self.context = context
 
-    def funct(self, object, form, ids={}, done=None, level=1):
+    def funct(self, object, form, ids=None, done=None, level=1):
+        if ids is None:
+            ids = {}
         if not ids:
             ids = self.ids
         if not done:
@@ -153,7 +155,7 @@ class analytic_account_budget_report(report_sxw.rml_parse):
                 tot['perc'] = float(tot['prac'] / tot['theo']) * 100
         return result
 
-    def funct_total(self,form):
+    def funct_total(self, form):
         result = []
         res = {}
         res = {
@@ -167,4 +169,4 @@ class analytic_account_budget_report(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.account.analytic.account.budget', 'account.analytic.account', 'addons/account_budget/report/analytic_account_budget_report.rml',parser=analytic_account_budget_report,header='internal')
 
-# 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_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py
index 7681f9268d9..c7d4ba58f68 100644
--- a/addons/account_budget/report/budget_report.py
+++ b/addons/account_budget/report/budget_report.py
@@ -34,7 +34,9 @@ class budget_report(report_sxw.rml_parse):
         })
         self.context = context
 
-    def funct(self, object, form, ids={}, done=None, level=1):
+    def funct(self, object, form, ids=None, done=None, level=1):
+        if ids is None:
+            ids = {}
         if not ids:
             ids = self.ids
         if not done:
diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py
index b70b7da34bb..9f2f59fe715 100644
--- a/addons/account_budget/report/crossovered_budget_report.py
+++ b/addons/account_budget/report/crossovered_budget_report.py
@@ -37,7 +37,9 @@ class budget_report(report_sxw.rml_parse):
         })
         self.context = context
 
-    def funct(self, object, form, ids={}, done=None, level=1):
+    def funct(self, object, form, ids=None, done=None, level=1):
+        if ids is None:
+            ids = {}
         if not ids:
             ids = self.ids
         if not done:
diff --git a/addons/account_budget/security/account_budget_security.xml b/addons/account_budget/security/account_budget_security.xml
index 1fbcd82e86c..46a3efebb5c 100644
--- a/addons/account_budget/security/account_budget_security.xml
+++ b/addons/account_budget/security/account_budget_security.xml
@@ -22,6 +22,10 @@
             <field eval="True" name="global"/>
             <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
         </record>
+        
+        <record model="res.users" id="base.user_root">
+            <field eval="[(4,ref('analytic.group_analytic_accounting'))]" name="groups_id"/>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/account_budget/security/ir.model.access.csv b/addons/account_budget/security/ir.model.access.csv
index 131f4424568..f4174f72782 100644
--- a/addons/account_budget/security/ir.model.access.csv
+++ b/addons/account_budget/security/ir.model.access.csv
@@ -4,4 +4,4 @@ access_account_budget_post,account.budget.post,model_account_budget_post,account
 access_account_budget_post_accountant,account.budget.post accountant,model_account_budget_post,account.group_account_user,1,1,1,1
 access_crossovered_budget_accountant,crossovered.budget accountant,model_crossovered_budget,account.group_account_user,1,1,1,1
 access_crossovered_budget_lines_accountant,crossovered.budget.lines accountant,model_crossovered_budget_lines,account.group_account_user,1,1,1,1
-access_budget,crossovered.budget.lines manager,model_crossovered_budget_lines,base.group_user,1,0,0,0
+access_budget,crossovered.budget.lines manager,model_crossovered_budget_lines,base.group_user,1,1,1,0
diff --git a/addons/account_budget/wizard/account_budget_analytic.py b/addons/account_budget/wizard/account_budget_analytic.py
index 3e3b4b0fa9d..6397ee87c76 100644
--- a/addons/account_budget/wizard/account_budget_analytic.py
+++ b/addons/account_budget/wizard/account_budget_analytic.py
@@ -52,4 +52,4 @@ class account_budget_analytic(osv.osv_memory):
 
 account_budget_analytic()
 
-# 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_budget/wizard/account_budget_crossovered_report.py b/addons/account_budget/wizard/account_budget_crossovered_report.py
index ff6b6492a5a..e120bc47caa 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_report.py
@@ -53,4 +53,4 @@ class account_budget_crossvered_report(osv.osv_memory):
 
 account_budget_crossvered_report()
 
-# 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_budget/wizard/account_budget_report.py b/addons/account_budget/wizard/account_budget_report.py
index fdae4c94adf..6ef22c649e9 100644
--- a/addons/account_budget/wizard/account_budget_report.py
+++ b/addons/account_budget/wizard/account_budget_report.py
@@ -54,4 +54,4 @@ class account_budget_report(osv.osv_memory):
 
 account_budget_report()
 
-# 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_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py
index c616cc9d5e0..468840c19d5 100644
--- a/addons/account_cancel/__openerp__.py
+++ b/addons/account_cancel/__openerp__.py
@@ -20,28 +20,24 @@
 ##############################################################################
 
 {
-    "name" : "Cancel Journal Entries",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "category": 'Accounting & Finance',
-    "description": """
-Allows cancelling accounting entries.
-=====================================
+    'name': 'Cancel Journal Entries',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'category': 'Accounting & Finance',
+    'description': """
+Allows canceling accounting entries.
+====================================
 
-This module adds 'Allow Cancelling Entries' field on form view of account journal.
+This module adds 'Allow Canceling Entries' field on form view of account journal.
 If set to true it allows user to cancel entries & invoices.
     """,
     'website': 'http://www.openerp.com',
-    "images" : ["images/account_cancel.jpeg"],
-    "depends" : ["account"],
-    'init_xml': [],
-    'update_xml': ['account_cancel_view.xml' ],
-    'demo_xml': [],
+    'images': ['images/account_cancel.jpeg'],
+    'depends' : ['account'],
+    'data': ['account_cancel_view.xml' ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    "certificate" : "001101250473177981989",
-
-
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_cancel/i18n/ar.po b/addons/account_cancel/i18n/ar.po
index aaa31957565..0377c93df50 100644
--- a/addons/account_cancel/i18n/ar.po
+++ b/addons/account_cancel/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/bg.po b/addons/account_cancel/i18n/bg.po
index 9c19f451b5f..2b225887959 100644
--- a/addons/account_cancel/i18n/bg.po
+++ b/addons/account_cancel/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/bn.po b/addons/account_cancel/i18n/bn.po
index ae1b51ddce6..1406e1c000f 100644
--- a/addons/account_cancel/i18n/bn.po
+++ b/addons/account_cancel/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/br.po b/addons/account_cancel/i18n/br.po
index 407e2433827..5e3315ff8c4 100644
--- a/addons/account_cancel/i18n/br.po
+++ b/addons/account_cancel/i18n/br.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/bs.po b/addons/account_cancel/i18n/bs.po
index 68a9d3b3aa7..444e3ea25f4 100644
--- a/addons/account_cancel/i18n/bs.po
+++ b/addons/account_cancel/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ca.po b/addons/account_cancel/i18n/ca.po
index 911a5238e29..896d56921f5 100644
--- a/addons/account_cancel/i18n/ca.po
+++ b/addons/account_cancel/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/cs.po b/addons/account_cancel/i18n/cs.po
index 69e6499ebd1..817a8de0569 100644
--- a/addons/account_cancel/i18n/cs.po
+++ b/addons/account_cancel/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/da.po b/addons/account_cancel/i18n/da.po
index 4b3a78448c1..7abb0825b15 100644
--- a/addons/account_cancel/i18n/da.po
+++ b/addons/account_cancel/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/de.po b/addons/account_cancel/i18n/de.po
index 3e1348293a2..f0b63e8334f 100644
--- a/addons/account_cancel/i18n/de.po
+++ b/addons/account_cancel/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/el.po b/addons/account_cancel/i18n/el.po
index 57befebdd3e..0aa95c49534 100644
--- a/addons/account_cancel/i18n/el.po
+++ b/addons/account_cancel/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/en_GB.po b/addons/account_cancel/i18n/en_GB.po
index 42adc32b6c3..00d6de293d4 100644
--- a/addons/account_cancel/i18n/en_GB.po
+++ b/addons/account_cancel/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/es.po b/addons/account_cancel/i18n/es.po
index e25cb036437..3a03ef6d2b4 100644
--- a/addons/account_cancel/i18n/es.po
+++ b/addons/account_cancel/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/es_CL.po b/addons/account_cancel/i18n/es_CL.po
index 096b94248ae..309726a07ec 100644
--- a/addons/account_cancel/i18n/es_CL.po
+++ b/addons/account_cancel/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/es_CR.po b/addons/account_cancel/i18n/es_CR.po
index 171087774ec..6ed3623e1f4 100644
--- a/addons/account_cancel/i18n/es_CR.po
+++ b/addons/account_cancel/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: account_cancel
diff --git a/addons/account_cancel/i18n/es_EC.po b/addons/account_cancel/i18n/es_EC.po
index 1398dd1f2e1..8cf82c86e33 100644
--- a/addons/account_cancel/i18n/es_EC.po
+++ b/addons/account_cancel/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/es_MX.po b/addons/account_cancel/i18n/es_MX.po
index c3029cd8d53..e181a3f3bf9 100644
--- a/addons/account_cancel/i18n/es_MX.po
+++ b/addons/account_cancel/i18n/es_MX.po
@@ -1,38 +1,23 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-11-23 09:43+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-10-22 17:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:48+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
-#: model:ir.module.module,description:account_cancel.module_meta_information
-msgid ""
-"\n"
-"    Module adds 'Allow cancelling entries' field on form view of account "
-"journal. If set to true it allows user to cancel entries & invoices.\n"
-"    "
-msgstr ""
-"\n"
-"    Este módulo añade el campo 'Permitir la cancelación de asientos' en la "
-"vista de formulario de los diarios contables. Si está marcado, permite a los "
-"usuarios cancelar los asientos y las facturas.\n"
-"    "
-
-#. module: account_cancel
-#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
-msgid "Account Cancel"
-msgstr "Cancelar asientos/facturas"
+#: view:account.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
diff --git a/addons/account_cancel/i18n/es_PY.po b/addons/account_cancel/i18n/es_PY.po
index f1aac7d58de..69d769a31ee 100644
--- a/addons/account_cancel/i18n/es_PY.po
+++ b/addons/account_cancel/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/fa.po b/addons/account_cancel/i18n/fa.po
index 8048b6b3b33..7b831409290 100644
--- a/addons/account_cancel/i18n/fa.po
+++ b/addons/account_cancel/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/fi.po b/addons/account_cancel/i18n/fi.po
index fb1cf13b684..7b76d27e597 100644
--- a/addons/account_cancel/i18n/fi.po
+++ b/addons/account_cancel/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/fr.po b/addons/account_cancel/i18n/fr.po
index 1b1784d8ad2..afaea5c462f 100644
--- a/addons/account_cancel/i18n/fr.po
+++ b/addons/account_cancel/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/gl.po b/addons/account_cancel/i18n/gl.po
index 86797d2dde7..78886aff33f 100644
--- a/addons/account_cancel/i18n/gl.po
+++ b/addons/account_cancel/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/gu.po b/addons/account_cancel/i18n/gu.po
index 58480f941a2..6105a231980 100644
--- a/addons/account_cancel/i18n/gu.po
+++ b/addons/account_cancel/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/hi.po b/addons/account_cancel/i18n/hi.po
index 7aa3d8aa80c..1c5b0e2e0bf 100644
--- a/addons/account_cancel/i18n/hi.po
+++ b/addons/account_cancel/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/hr.po b/addons/account_cancel/i18n/hr.po
index db58a966eec..a1b2ab84480 100644
--- a/addons/account_cancel/i18n/hr.po
+++ b/addons/account_cancel/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/hu.po b/addons/account_cancel/i18n/hu.po
index 3ca0f0d8769..b31b1f9cbb1 100644
--- a/addons/account_cancel/i18n/hu.po
+++ b/addons/account_cancel/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/id.po b/addons/account_cancel/i18n/id.po
index bfc7fb7aaad..0c1026c17a0 100644
--- a/addons/account_cancel/i18n/id.po
+++ b/addons/account_cancel/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/it.po b/addons/account_cancel/i18n/it.po
index 40560c332b1..19eb1d252e2 100644
--- a/addons/account_cancel/i18n/it.po
+++ b/addons/account_cancel/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ja.po b/addons/account_cancel/i18n/ja.po
index c8b8fa11289..087b3fb894c 100644
--- a/addons/account_cancel/i18n/ja.po
+++ b/addons/account_cancel/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/kk.po b/addons/account_cancel/i18n/kk.po
index ebafa545e91..d48bf623204 100644
--- a/addons/account_cancel/i18n/kk.po
+++ b/addons/account_cancel/i18n/kk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/lo.po b/addons/account_cancel/i18n/lo.po
index fae207db983..319512041f0 100644
--- a/addons/account_cancel/i18n/lo.po
+++ b/addons/account_cancel/i18n/lo.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-17 13:43+0000\n"
+"PO-Revision-Date: 2012-08-20 18:45+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "ຍົກເລີກ"
 
 #~ msgid "Account Cancel"
 #~ msgstr "ລົບລ້າງບັນຊີ"
diff --git a/addons/account_cancel/i18n/lt.po b/addons/account_cancel/i18n/lt.po
index 3a0c1b085b0..f16f339935f 100644
--- a/addons/account_cancel/i18n/lt.po
+++ b/addons/account_cancel/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/lv.po b/addons/account_cancel/i18n/lv.po
index 8ca194c5283..8fcea1cf7fc 100644
--- a/addons/account_cancel/i18n/lv.po
+++ b/addons/account_cancel/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/mk.po b/addons/account_cancel/i18n/mk.po
index 59020fc5fa0..0aeecc3f2dc 100644
--- a/addons/account_cancel/i18n/mk.po
+++ b/addons/account_cancel/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/mn.po b/addons/account_cancel/i18n/mn.po
index cc370b08354..351e7280fe1 100644
--- a/addons/account_cancel/i18n/mn.po
+++ b/addons/account_cancel/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/nb.po b/addons/account_cancel/i18n/nb.po
index 4e9abc32573..66c8b09b13c 100644
--- a/addons/account_cancel/i18n/nb.po
+++ b/addons/account_cancel/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/nl.po b/addons/account_cancel/i18n/nl.po
index 6cee73e6711..8dbab246054 100644
--- a/addons/account_cancel/i18n/nl.po
+++ b/addons/account_cancel/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/nl_BE.po b/addons/account_cancel/i18n/nl_BE.po
index a4477070dce..a3350d79740 100644
--- a/addons/account_cancel/i18n/nl_BE.po
+++ b/addons/account_cancel/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/oc.po b/addons/account_cancel/i18n/oc.po
index e29ad650d46..d0299c58890 100644
--- a/addons/account_cancel/i18n/oc.po
+++ b/addons/account_cancel/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/pl.po b/addons/account_cancel/i18n/pl.po
index 4b66b2cc888..e9e075ed360 100644
--- a/addons/account_cancel/i18n/pl.po
+++ b/addons/account_cancel/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/pt.po b/addons/account_cancel/i18n/pt.po
index 20282eb195c..06c9898c54b 100644
--- a/addons/account_cancel/i18n/pt.po
+++ b/addons/account_cancel/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/pt_BR.po b/addons/account_cancel/i18n/pt_BR.po
index 57d1cc13292..be6f44e4601 100644
--- a/addons/account_cancel/i18n/pt_BR.po
+++ b/addons/account_cancel/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ro.po b/addons/account_cancel/i18n/ro.po
index 6a09a8ee9cd..e00eaa2ef28 100644
--- a/addons/account_cancel/i18n/ro.po
+++ b/addons/account_cancel/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ru.po b/addons/account_cancel/i18n/ru.po
index 86ba63bb88f..20c60613518 100644
--- a/addons/account_cancel/i18n/ru.po
+++ b/addons/account_cancel/i18n/ru.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отменена"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/account_cancel/i18n/sl.po b/addons/account_cancel/i18n/sl.po
index d5f8531e17f..3c631328737 100644
--- a/addons/account_cancel/i18n/sl.po
+++ b/addons/account_cancel/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/sq.po b/addons/account_cancel/i18n/sq.po
index 614bca851ca..3952dffb6b0 100644
--- a/addons/account_cancel/i18n/sq.po
+++ b/addons/account_cancel/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/sr.po b/addons/account_cancel/i18n/sr.po
index 64736104a78..1cee2b99004 100644
--- a/addons/account_cancel/i18n/sr.po
+++ b/addons/account_cancel/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/sr@latin.po b/addons/account_cancel/i18n/sr@latin.po
index 8b4f06a7198..779c13dcf94 100644
--- a/addons/account_cancel/i18n/sr@latin.po
+++ b/addons/account_cancel/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/sv.po b/addons/account_cancel/i18n/sv.po
index 2ba466f1ac3..e1090244203 100644
--- a/addons/account_cancel/i18n/sv.po
+++ b/addons/account_cancel/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/ta.po b/addons/account_cancel/i18n/ta.po
index 2b560da88ef..b7511040e4f 100644
--- a/addons/account_cancel/i18n/ta.po
+++ b/addons/account_cancel/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/tr.po b/addons/account_cancel/i18n/tr.po
index cfa6e01ef02..8c06820eedb 100644
--- a/addons/account_cancel/i18n/tr.po
+++ b/addons/account_cancel/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/vi.po b/addons/account_cancel/i18n/vi.po
index fb5ef52a296..ef539a09730 100644
--- a/addons/account_cancel/i18n/vi.po
+++ b/addons/account_cancel/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/zh_CN.po b/addons/account_cancel/i18n/zh_CN.po
index e278b7de7e8..c1f5fd56d6d 100644
--- a/addons/account_cancel/i18n/zh_CN.po
+++ b/addons/account_cancel/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_cancel
 #: view:account.invoice:0
diff --git a/addons/account_cancel/i18n/zh_TW.po b/addons/account_cancel/i18n/zh_TW.po
new file mode 100644
index 00000000000..5f45f4caf2c
--- /dev/null
+++ b/addons/account_cancel/i18n/zh_TW.po
@@ -0,0 +1,23 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-18 11:29+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_cancel
+#: view:account.invoice:0
+msgid "Cancel"
+msgstr "取消"
diff --git a/addons/account_chart/__openerp__.py b/addons/account_chart/__openerp__.py
index c0c9245a477..8f619cd1471 100644
--- a/addons/account_chart/__openerp__.py
+++ b/addons/account_chart/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Template of Charts of Accounts',
     'version': '1.1',
-    "category": 'Hidden/Dependency',
+    'category': 'Hidden/Dependency',
     'description': """
 Remove minimal account chart.
 =============================
@@ -33,10 +33,8 @@ Deactivates minimal chart of accounts.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
-    'init_xml': [],
-    'update_xml': [],
-    'demo_xml': [],
+    'data': [],
+    'demo': [],
     'installable': True,
-    'certificate': '0073332443901',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_chart/i18n/ar.po b/addons/account_chart/i18n/ar.po
index c25e6004b77..f415e4e05d9 100644
--- a/addons/account_chart/i18n/ar.po
+++ b/addons/account_chart/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/bg.po b/addons/account_chart/i18n/bg.po
index dc705fe1696..d3dc193275e 100644
--- a/addons/account_chart/i18n/bg.po
+++ b/addons/account_chart/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/bs.po b/addons/account_chart/i18n/bs.po
index a58f592929f..a16cdbea23c 100644
--- a/addons/account_chart/i18n/bs.po
+++ b/addons/account_chart/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/ca.po b/addons/account_chart/i18n/ca.po
index 1654e9e1d37..0b76dff1e53 100644
--- a/addons/account_chart/i18n/ca.po
+++ b/addons/account_chart/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/cs.po b/addons/account_chart/i18n/cs.po
index f0273cbec36..5f97f990c7a 100644
--- a/addons/account_chart/i18n/cs.po
+++ b/addons/account_chart/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/da.po b/addons/account_chart/i18n/da.po
index e553aecee56..b5ba23f7939 100644
--- a/addons/account_chart/i18n/da.po
+++ b/addons/account_chart/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/de.po b/addons/account_chart/i18n/de.po
index f11f2590e9e..e381c34450e 100644
--- a/addons/account_chart/i18n/de.po
+++ b/addons/account_chart/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/el.po b/addons/account_chart/i18n/el.po
index 9bf602bd2cb..aab2ddb52dd 100644
--- a/addons/account_chart/i18n/el.po
+++ b/addons/account_chart/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/en_GB.po b/addons/account_chart/i18n/en_GB.po
index 56e729bdfb3..3ffb259fbb2 100644
--- a/addons/account_chart/i18n/en_GB.po
+++ b/addons/account_chart/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/es.po b/addons/account_chart/i18n/es.po
index c4c4c3b22b9..5c72f955d39 100644
--- a/addons/account_chart/i18n/es.po
+++ b/addons/account_chart/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/es_AR.po b/addons/account_chart/i18n/es_AR.po
index 5b70e32423c..dfe0ce96576 100644
--- a/addons/account_chart/i18n/es_AR.po
+++ b/addons/account_chart/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/es_CL.po b/addons/account_chart/i18n/es_CL.po
index cebdead21f5..e69a189e265 100644
--- a/addons/account_chart/i18n/es_CL.po
+++ b/addons/account_chart/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/es_CR.po b/addons/account_chart/i18n/es_CR.po
index 065d5207e5a..c98c605d191 100644
--- a/addons/account_chart/i18n/es_CR.po
+++ b/addons/account_chart/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: account_chart
diff --git a/addons/account_chart/i18n/es_EC.po b/addons/account_chart/i18n/es_EC.po
index 3b3375869a1..ca0cf9770cf 100644
--- a/addons/account_chart/i18n/es_EC.po
+++ b/addons/account_chart/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/es_PY.po b/addons/account_chart/i18n/es_PY.po
index 16f91edc4a3..18759167078 100644
--- a/addons/account_chart/i18n/es_PY.po
+++ b/addons/account_chart/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/et.po b/addons/account_chart/i18n/et.po
index 89bd135b95d..88835dff508 100644
--- a/addons/account_chart/i18n/et.po
+++ b/addons/account_chart/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/eu.po b/addons/account_chart/i18n/eu.po
index ed67ea33b5c..c13ea5d611d 100644
--- a/addons/account_chart/i18n/eu.po
+++ b/addons/account_chart/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/fa.po b/addons/account_chart/i18n/fa.po
index 8fd549fdb60..a0cefd3565d 100644
--- a/addons/account_chart/i18n/fa.po
+++ b/addons/account_chart/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/fi.po b/addons/account_chart/i18n/fi.po
index 82a04e98ad9..422bfb25f6b 100644
--- a/addons/account_chart/i18n/fi.po
+++ b/addons/account_chart/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/fr.po b/addons/account_chart/i18n/fr.po
index 5762d356fa8..a4280c85fed 100644
--- a/addons/account_chart/i18n/fr.po
+++ b/addons/account_chart/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/gl.po b/addons/account_chart/i18n/gl.po
index 51ad708bf68..9feba1f42ec 100644
--- a/addons/account_chart/i18n/gl.po
+++ b/addons/account_chart/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/gu.po b/addons/account_chart/i18n/gu.po
index 490fd165563..d82d21b8e2c 100644
--- a/addons/account_chart/i18n/gu.po
+++ b/addons/account_chart/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/hi.po b/addons/account_chart/i18n/hi.po
index c4ff39bbc1f..d252a8f644b 100644
--- a/addons/account_chart/i18n/hi.po
+++ b/addons/account_chart/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/hr.po b/addons/account_chart/i18n/hr.po
index 0d8d213c408..71cbc5cb1a1 100644
--- a/addons/account_chart/i18n/hr.po
+++ b/addons/account_chart/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/hu.po b/addons/account_chart/i18n/hu.po
index 642590879a8..af72e130fc7 100644
--- a/addons/account_chart/i18n/hu.po
+++ b/addons/account_chart/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/id.po b/addons/account_chart/i18n/id.po
index 0d366426840..86336a06635 100644
--- a/addons/account_chart/i18n/id.po
+++ b/addons/account_chart/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/it.po b/addons/account_chart/i18n/it.po
index e015b6fe89a..7c36d42b12f 100644
--- a/addons/account_chart/i18n/it.po
+++ b/addons/account_chart/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/ja.po b/addons/account_chart/i18n/ja.po
index 2e1c282d1ce..f51e1bdcbde 100644
--- a/addons/account_chart/i18n/ja.po
+++ b/addons/account_chart/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/ko.po b/addons/account_chart/i18n/ko.po
index bd21b86a513..a95a366dba4 100644
--- a/addons/account_chart/i18n/ko.po
+++ b/addons/account_chart/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/lo.po b/addons/account_chart/i18n/lo.po
index d01a6edd1d0..fc5c715f9a1 100644
--- a/addons/account_chart/i18n/lo.po
+++ b/addons/account_chart/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/lt.po b/addons/account_chart/i18n/lt.po
index ce7044729be..06c5c8060d2 100644
--- a/addons/account_chart/i18n/lt.po
+++ b/addons/account_chart/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
@@ -24,4 +24,4 @@ msgstr "Ištrinti pavyzdinį sąskaitų planą"
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
-msgstr ""
+msgstr "Sąskaitų planas"
diff --git a/addons/account_chart/i18n/lv.po b/addons/account_chart/i18n/lv.po
index af93ab5aa37..ab01041a75f 100644
--- a/addons/account_chart/i18n/lv.po
+++ b/addons/account_chart/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/mk.po b/addons/account_chart/i18n/mk.po
index d49b49e0ed7..d192d6741cc 100644
--- a/addons/account_chart/i18n/mk.po
+++ b/addons/account_chart/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/mn.po b/addons/account_chart/i18n/mn.po
index b2435368dde..94456bdf85d 100644
--- a/addons/account_chart/i18n/mn.po
+++ b/addons/account_chart/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/nb.po b/addons/account_chart/i18n/nb.po
index 5bb30d8fb30..0b689170856 100644
--- a/addons/account_chart/i18n/nb.po
+++ b/addons/account_chart/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/nl.po b/addons/account_chart/i18n/nl.po
index b429d58d918..758afda5ef8 100644
--- a/addons/account_chart/i18n/nl.po
+++ b/addons/account_chart/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/nl_BE.po b/addons/account_chart/i18n/nl_BE.po
index 24196d565e6..a18d1a99aa6 100644
--- a/addons/account_chart/i18n/nl_BE.po
+++ b/addons/account_chart/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/oc.po b/addons/account_chart/i18n/oc.po
index 40e8189b421..aefd5c1b697 100644
--- a/addons/account_chart/i18n/oc.po
+++ b/addons/account_chart/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/pl.po b/addons/account_chart/i18n/pl.po
index 097f475ffe7..84581187b61 100644
--- a/addons/account_chart/i18n/pl.po
+++ b/addons/account_chart/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/pt.po b/addons/account_chart/i18n/pt.po
index 7559575fa21..84b8c687603 100644
--- a/addons/account_chart/i18n/pt.po
+++ b/addons/account_chart/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/pt_BR.po b/addons/account_chart/i18n/pt_BR.po
index 3d4c53d8dbb..41604e1f8cd 100644
--- a/addons/account_chart/i18n/pt_BR.po
+++ b/addons/account_chart/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/ro.po b/addons/account_chart/i18n/ro.po
index 60eae200f69..84c60d3c429 100644
--- a/addons/account_chart/i18n/ro.po
+++ b/addons/account_chart/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/ru.po b/addons/account_chart/i18n/ru.po
index 6ceec3b8e46..a100b98f228 100644
--- a/addons/account_chart/i18n/ru.po
+++ b/addons/account_chart/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/sk.po b/addons/account_chart/i18n/sk.po
index 90c4c32ef51..5975d665ecc 100644
--- a/addons/account_chart/i18n/sk.po
+++ b/addons/account_chart/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/sl.po b/addons/account_chart/i18n/sl.po
index 1319b05553b..55c034b97cf 100644
--- a/addons/account_chart/i18n/sl.po
+++ b/addons/account_chart/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/sq.po b/addons/account_chart/i18n/sq.po
index 91f467ebee7..517aad30934 100644
--- a/addons/account_chart/i18n/sq.po
+++ b/addons/account_chart/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/sr.po b/addons/account_chart/i18n/sr.po
index 7b0c32a1d9d..e3c60918feb 100644
--- a/addons/account_chart/i18n/sr.po
+++ b/addons/account_chart/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/sr@latin.po b/addons/account_chart/i18n/sr@latin.po
index 1d017b3b4fb..db268f2b5e5 100644
--- a/addons/account_chart/i18n/sr@latin.po
+++ b/addons/account_chart/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/sv.po b/addons/account_chart/i18n/sv.po
index 5b185db92a0..4df753f9db2 100644
--- a/addons/account_chart/i18n/sv.po
+++ b/addons/account_chart/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/ta.po b/addons/account_chart/i18n/ta.po
index afecfd5b6d9..3399c3c75d3 100644
--- a/addons/account_chart/i18n/ta.po
+++ b/addons/account_chart/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/th.po b/addons/account_chart/i18n/th.po
index ff26a0dde5a..6f13de0fb8f 100644
--- a/addons/account_chart/i18n/th.po
+++ b/addons/account_chart/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/tr.po b/addons/account_chart/i18n/tr.po
index 0663f7790c4..5303ace2314 100644
--- a/addons/account_chart/i18n/tr.po
+++ b/addons/account_chart/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/uk.po b/addons/account_chart/i18n/uk.po
index 20b356bfe15..1a677190d8b 100644
--- a/addons/account_chart/i18n/uk.po
+++ b/addons/account_chart/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/vi.po b/addons/account_chart/i18n/vi.po
index 6a87602d75a..a6fc7fdebd8 100644
--- a/addons/account_chart/i18n/vi.po
+++ b/addons/account_chart/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/zh_CN.po b/addons/account_chart/i18n/zh_CN.po
index 06300cd388f..b4cf4593c55 100644
--- a/addons/account_chart/i18n/zh_CN.po
+++ b/addons/account_chart/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
diff --git a/addons/account_chart/i18n/zh_TW.po b/addons/account_chart/i18n/zh_TW.po
index 35ffaa07200..337a8fe1d4b 100644
--- a/addons/account_chart/i18n/zh_TW.po
+++ b/addons/account_chart/i18n/zh_TW.po
@@ -7,21 +7,21 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2009-04-10 14:08+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-19 10:21+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_chart
 #: model:ir.module.module,description:account_chart.module_meta_information
 msgid "Remove minimal account chart"
-msgstr ""
+msgstr "移除小的會計科目表"
 
 #. module: account_chart
 #: model:ir.module.module,shortdesc:account_chart.module_meta_information
 msgid "Charts of Accounts"
-msgstr ""
+msgstr "會計科目表"
diff --git a/addons/account_check_writing/__openerp__.py b/addons/account_check_writing/__openerp__.py
index faba82928ed..f5a2355b002 100644
--- a/addons/account_check_writing/__openerp__.py
+++ b/addons/account_check_writing/__openerp__.py
@@ -19,29 +19,24 @@
 #
 ##############################################################################
 {
-    "name" : "Check Writing",
-    "version" : "1.1",
-    "author" : "OpenERP SA, NovaPoint Group",
-    "category": "Generic Modules/Accounting",
-    "description": """
+    'name': 'Check Writing',
+    'version': '1.1',
+    'author': 'OpenERP SA, NovaPoint Group',
+    'category': 'Generic Modules/Accounting',
+    'description': """
 Module for the Check Writing and Check Printing.
+================================================
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    "depends" : [
-        "account_voucher",
-        ],
-    'update_xml': [
+    'depends' : ['account_voucher'],
+    'data': [
         'account_check_writing_report.xml',
         'account_view.xml',
         'account_voucher_view.xml',
         'account_check_writing_data.xml',
     ],
-    'demo_xml': [
-        'account_demo.xml',
-    ],
-    'test': [
-    ],
+    'demo': ['account_demo.xml'],
+    'test': [],
     'installable': True,
     'active': False,
 }
diff --git a/addons/account_check_writing/i18n/ar.po b/addons/account_check_writing/i18n/ar.po
index f24f4ba35e4..4afbdce932e 100644
--- a/addons/account_check_writing/i18n/ar.po
+++ b/addons/account_check_writing/i18n/ar.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
 msgid "Check on Top"
-msgstr ""
+msgstr "شيك في الأعلى"
 
 #. module: account_check_writing
 #: model:ir.actions.act_window,help:account_check_writing.action_write_check
@@ -42,7 +42,7 @@ msgstr "طباعة الشيك"
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
 msgid "Check in middle"
-msgstr ""
+msgstr "شيك في المنتصف"
 
 #. module: account_check_writing
 #: help:res.company,check_layout:0
@@ -55,7 +55,7 @@ msgstr ""
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
 msgid "Check on bottom"
-msgstr ""
+msgstr "شيك في النهاية"
 
 #. module: account_check_writing
 #: constraint:res.company:0
@@ -66,11 +66,12 @@ msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
 msgstr ""
+"قم بباختيار هذه الخانة اذا أردت أن يتم استخدام دفتر اليومية في كتابة الشيكات"
 
 #. module: account_check_writing
 #: field:account.journal,allow_check_writing:0
 msgid "Allow Check writing"
-msgstr ""
+msgstr "السماح بطباعة الشيك"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
@@ -124,7 +125,7 @@ msgstr "الدفع"
 #. module: account_check_writing
 #: field:account.journal,use_preprint_check:0
 msgid "Use Preprinted Check"
-msgstr ""
+msgstr "استخدام الصكوك المطبوعة مسبقاً"
 
 #. module: account_check_writing
 #: sql_constraint:res.company:0
@@ -198,4 +199,7 @@ msgstr "فتح رصيد"
 #. module: account_check_writing
 #: field:res.company,check_layout:0
 msgid "Choose Check layout"
-msgstr ""
+msgstr "اختيار تصميم الصك"
+
+#~ msgid "Default Check layout"
+#~ msgstr "التصميم الافتراضي للصك"
diff --git a/addons/account_check_writing/i18n/de.po b/addons/account_check_writing/i18n/de.po
index 782d10fa9b4..ad4f03f786f 100644
--- a/addons/account_check_writing/i18n/de.po
+++ b/addons/account_check_writing/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/es.po b/addons/account_check_writing/i18n/es.po
index 9cd3327c821..c473e077210 100644
--- a/addons/account_check_writing/i18n/es.po
+++ b/addons/account_check_writing/i18n/es.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-09 19:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-09 12:09+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-11-10 04:59+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
 msgid "Check on Top"
-msgstr ""
+msgstr "Cheque en la parte de arriba"
 
 #. module: account_check_writing
 #: model:ir.actions.act_window,help:account_check_writing.action_write_check
@@ -30,6 +30,10 @@ msgid ""
 "and an amount for the payment, OpenERP will propose to reconcile your "
 "payment with the open supplier invoices or bills.You can print the check"
 msgstr ""
+"El formulario de pagos con cheque permite hacer el seguimiento de los pagos "
+"realizados a proveedores especialmente con cheque. Cuando selecciona el "
+"proveedor, medio de pago e importe, OpenERP propondrá reconciliar su pago "
+"con las facturas o recibos abiertos. Puede imprimir el cheque"
 
 #. module: account_check_writing
 #: view:account.voucher:0
@@ -37,12 +41,12 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
 #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
 msgid "Print Check"
-msgstr ""
+msgstr "Imprimir cheque"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
 msgid "Check in middle"
-msgstr ""
+msgstr "Cheque en el centro"
 
 #. module: account_check_writing
 #: help:res.company,check_layout:0
@@ -51,102 +55,106 @@ msgid ""
 "Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
 "bottom is compatible with Peachtree, ACCPAC and DacEasy only"
 msgstr ""
+"Cheque en la parte de arriba es compatible con Quicken, Quickbooks y "
+"Microsoft Money. Cheque en el medio es compatible con PeachTree, ACCPAC y "
+"DacEasy. Cheque en la parte de abajo es compatible con Peachtree, ACCPAC y "
+"DacEasy exclusivamente"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
 msgid "Check on bottom"
-msgstr ""
+msgstr "Cheque en la parte de abajo"
 
 #. module: account_check_writing
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "¡Error! No puede crear compañías recursivas."
 
 #. module: account_check_writing
 #: help:account.journal,allow_check_writing:0
 msgid "Check this if the journal is to be used for writing checks."
-msgstr ""
+msgstr "Revise si el diario es usado para registrar cheques."
 
 #. module: account_check_writing
 #: field:account.journal,allow_check_writing:0
 msgid "Allow Check writing"
-msgstr ""
+msgstr "Permitir escribir cheques"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "Diario"
 
 #. module: account_check_writing
 #: model:ir.actions.act_window,name:account_check_writing.action_write_check
 #: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
 msgid "Write Checks"
-msgstr ""
+msgstr "Escribir cheques"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Discount"
-msgstr ""
+msgstr "Descuento"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Original Amount"
-msgstr ""
+msgstr "Importe original"
 
 #. module: account_check_writing
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Configuración"
 
 #. module: account_check_writing
 #: field:account.voucher,allow_check:0
 msgid "Allow Check Writing"
-msgstr ""
+msgstr "Permitir escribir cheques"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Payment"
-msgstr ""
+msgstr "Pagos"
 
 #. module: account_check_writing
 #: field:account.journal,use_preprint_check:0
 msgid "Use Preprinted Check"
-msgstr ""
+msgstr "Usar cheque preimpreso"
 
 #. module: account_check_writing
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "¡El nombre de la compañía debe ser único!"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Due Date"
-msgstr ""
+msgstr "Fecha de vencimiento"
 
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: account_check_writing
 #: view:res.company:0
 msgid "Default Check Layout"
-msgstr ""
+msgstr "Comprobar formato por defecto"
 
 #. module: account_check_writing
 #: constraint:account.journal:0
@@ -154,46 +162,51 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"¡Error de configuración! La divisa escogida debe ser la de las cuentas por "
+"defecto."
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
 msgid "Balance Due"
-msgstr ""
+msgstr "Saldo pendiente"
 
 #. module: account_check_writing
 #: report:account.print.check.bottom:0
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Check Amount"
-msgstr ""
+msgstr "Importe del cheque"
 
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_account_voucher
 msgid "Accounting Voucher"
-msgstr ""
+msgstr "Comprobante contable"
 
 #. module: account_check_writing
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "¡El nombre del diaro debe ser único por compañía!"
 
 #. module: account_check_writing
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "¡El código del diario debe ser único por compañía!"
 
 #. module: account_check_writing
 #: field:account.voucher,amount_in_word:0
 msgid "Amount in Word"
-msgstr ""
+msgstr "Cantidad en palabras"
 
 #. module: account_check_writing
 #: report:account.print.check.top:0
 msgid "Open Balance"
-msgstr ""
+msgstr "Saldo Inicial"
 
 #. module: account_check_writing
 #: field:res.company,check_layout:0
 msgid "Choose Check layout"
-msgstr ""
+msgstr "Elija el formato del cheque."
+
+#~ msgid "Default Check layout"
+#~ msgstr "Formato de cheque por defecto"
diff --git a/addons/account_check_writing/i18n/es_CR.po b/addons/account_check_writing/i18n/es_CR.po
index 151bd209860..810df5858f8 100644
--- a/addons/account_check_writing/i18n/es_CR.po
+++ b/addons/account_check_writing/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/es_EC.po b/addons/account_check_writing/i18n/es_EC.po
new file mode 100644
index 00000000000..4507c594555
--- /dev/null
+++ b/addons/account_check_writing/i18n/es_EC.po
@@ -0,0 +1,210 @@
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-10-18 19:01+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Cheque on Top"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+"El pago de cheques permite rastrear el pago a sus proveedores. Cuando "
+"selecciona un proveedor, el método de pago y monto, OpenERP propondrá "
+"conciliarlo con tu factura, y podrá imprimir el cheque."
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "Imprimir Cheque"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Cheque in middle"
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Cheque on bottom"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Error! No puede crear compañías recursivas."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr "Activar si este diario es usado para emitir cheques"
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Permitir emisión de cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "Escribir Cheque"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "Descuento"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "Monto Inicial"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Permitir Emisión de Cheques"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Pagos"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Usar cheque preimpreso"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "¡El nombre de la compañía debe ser único!"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr "Fecha de vencimiento"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Compañias"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr "Formato por Defecto"
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Error de Configuración! La moneda seleccionada debe ser compartida por las "
+"cuentas por defecto tambíen"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "Saldo Deudor"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr "Monto Cheque"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Comprobantes de Pago"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "El nombre del diaro debe ser único por compañía !"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "El código del diario debe ser único por compañía !"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Monto en Letras"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Saldo Inicial"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "Elegir diseño de cheque"
+
+#~ msgid "Default Check layout"
+#~ msgstr "Diseño de cheque por defecto"
diff --git a/addons/account_check_writing/i18n/fi.po b/addons/account_check_writing/i18n/fi.po
index 1386d61bc8f..b90ab8b361d 100644
--- a/addons/account_check_writing/i18n/fi.po
+++ b/addons/account_check_writing/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/fr.po b/addons/account_check_writing/i18n/fr.po
index a60704a6499..5272cb92251 100644
--- a/addons/account_check_writing/i18n/fr.po
+++ b/addons/account_check_writing/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/gu.po b/addons/account_check_writing/i18n/gu.po
index 5fd6d7190cd..ea2f6e01a02 100644
--- a/addons/account_check_writing/i18n/gu.po
+++ b/addons/account_check_writing/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/ja.po b/addons/account_check_writing/i18n/ja.po
index f9b91b98418..7a1181b65c7 100644
--- a/addons/account_check_writing/i18n/ja.po
+++ b/addons/account_check_writing/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/lt.po b/addons/account_check_writing/i18n/lt.po
new file mode 100644
index 00000000000..35e98d451ad
--- /dev/null
+++ b/addons/account_check_writing/i18n/lt.po
@@ -0,0 +1,199 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-11-16 06:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-17 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr ""
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr ""
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Aprašas"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Žurnalas"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr ""
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr ""
diff --git a/addons/account_check_writing/i18n/mn.po b/addons/account_check_writing/i18n/mn.po
index fb86e3b5cc6..2e664d3323e 100644
--- a/addons/account_check_writing/i18n/mn.po
+++ b/addons/account_check_writing/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/nb.po b/addons/account_check_writing/i18n/nb.po
new file mode 100644
index 00000000000..3dd26bcd2b8
--- /dev/null
+++ b/addons/account_check_writing/i18n/nb.po
@@ -0,0 +1,210 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-27 15:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Sjekk på topp"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+"Sjekk betaling skjema kan du spore betalingen du gjør til dine leverandører "
+"spesielt med sjekk. Når du velger en leverandør, betalingsmetode og et beløp "
+"for betalingen, vil OpenERP foreslå å forene betalingen med åpne "
+"leverandørfakturaer eller bills.You kan skrive ut sjekken"
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "Skriv ut sjekk"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Skjekk i midten"
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+"Sjekk på toppen er kompatibel med Quicken, QuickBooks og Microsoft Penger. "
+"Sjekk i midten er kompatibel med Peachtree, ACCPAC og DacEasy. Sjekk på "
+"bunnen er kompatibel med Peachtree, ACCPAC og DacEasy bare"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Skjekk på bunnen"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr "Sjekk dette hvis journalen skal brukes til å skrive sjekker."
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Tillat skjekk skriving"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "Skive skjekker"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "Rabatt"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "Opprinnelig beløp"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Tillat å skrive skjekk"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Betaling"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Bruk Forhåndstrykt Sjekk"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Firmanavn må være unikt !"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr "Utløps Dato"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Firmaer"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Konfigurasjon feil! Den valgte valutaen bør deles av standard kontoer også."
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "balanse grunn"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr "Sjekk Beløp"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Regnskapsmessig kupong"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Navnet på journalen må være unikt per firma !"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Journalkoden må være unik pr firma!"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Beløp i Ord"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Åpen balanse"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "Velg Sjekk oppsettet"
+
+#~ msgid "Default Check layout"
+#~ msgstr "Standard Sjekk oppsettet"
diff --git a/addons/account_check_writing/i18n/nl.po b/addons/account_check_writing/i18n/nl.po
index 6b033259e8e..f210344eccd 100644
--- a/addons/account_check_writing/i18n/nl.po
+++ b/addons/account_check_writing/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/pl.po b/addons/account_check_writing/i18n/pl.po
new file mode 100644
index 00000000000..7170c503576
--- /dev/null
+++ b/addons/account_check_writing/i18n/pl.po
@@ -0,0 +1,199 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-10-25 16:56+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr ""
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr ""
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Dziennik"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr ""
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Konfiguracja"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr ""
diff --git a/addons/account_check_writing/i18n/pt.po b/addons/account_check_writing/i18n/pt.po
index 4eb8ddbd42f..d9dabf5f6fd 100644
--- a/addons/account_check_writing/i18n/pt.po
+++ b/addons/account_check_writing/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/pt_BR.po b/addons/account_check_writing/i18n/pt_BR.po
index eafd011d5db..f695ff3b805 100644
--- a/addons/account_check_writing/i18n/pt_BR.po
+++ b/addons/account_check_writing/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-07-28 21:24+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
@@ -186,7 +187,7 @@ msgstr "Comprovante Contábil"
 #. module: account_check_writing
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr "O nome do diário deve ser único por empresa !"
+msgstr "O nome do diário deve ser único por empresa!"
 
 #. module: account_check_writing
 #: sql_constraint:account.journal:0
@@ -206,7 +207,7 @@ msgstr "Saldo em Aberto"
 #. module: account_check_writing
 #: field:res.company,check_layout:0
 msgid "Choose Check layout"
-msgstr "Escolha o layout do cheque"
+msgstr "Escolha o Layout do Cheque"
 
 #~ msgid "Default Check layout"
-#~ msgstr "Modelo de Cheque Padrão"
+#~ msgstr "Modelo Padrão de Cheque"
diff --git a/addons/account_check_writing/i18n/ro.po b/addons/account_check_writing/i18n/ro.po
index 03611eeeeac..7daed5926b6 100644
--- a/addons/account_check_writing/i18n/ro.po
+++ b/addons/account_check_writing/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/sr@latin.po b/addons/account_check_writing/i18n/sr@latin.po
index 33f05183ed9..62533ab1316 100644
--- a/addons/account_check_writing/i18n/sr@latin.po
+++ b/addons/account_check_writing/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/sv.po b/addons/account_check_writing/i18n/sv.po
index 8e23e6fc1cc..6ff7dd6ae78 100644
--- a/addons/account_check_writing/i18n/sv.po
+++ b/addons/account_check_writing/i18n/sv.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
 msgid "Check on Top"
-msgstr ""
+msgstr "Checken högst upp"
 
 #. module: account_check_writing
 #: model:ir.actions.act_window,help:account_check_writing.action_write_check
@@ -30,6 +30,11 @@ msgid ""
 "and an amount for the payment, OpenERP will propose to reconcile your "
 "payment with the open supplier invoices or bills.You can print the check"
 msgstr ""
+"I checkbetalningsformuläret kan du spåra betalningar du gör till dina "
+"leverantörer speciellt med check. När du väljer en leverantör, "
+"betalningsmetod och ett belopp för betalning kommer OpenERP matcha din "
+"betalning med de öppna leverantörsfakturorna eller räkningarna. Du kan "
+"skriva ut checken"
 
 #. module: account_check_writing
 #: view:account.voucher:0
@@ -42,7 +47,7 @@ msgstr "Skriv ut check"
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
 msgid "Check in middle"
-msgstr ""
+msgstr "Checken i mitten"
 
 #. module: account_check_writing
 #: help:res.company,check_layout:0
@@ -55,7 +60,7 @@ msgstr ""
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
 msgid "Check on bottom"
-msgstr ""
+msgstr "Checken längst ner"
 
 #. module: account_check_writing
 #: constraint:res.company:0
@@ -107,7 +112,7 @@ msgstr "Ursprungligt belopp"
 #. module: account_check_writing
 #: view:res.company:0
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguration"
 
 #. module: account_check_writing
 #: field:account.voucher,allow_check:0
@@ -136,7 +141,7 @@ msgstr ""
 #: report:account.print.check.middle:0
 #: report:account.print.check.top:0
 msgid "Due Date"
-msgstr ""
+msgstr "Förfallodatum"
 
 #. module: account_check_writing
 #: model:ir.model,name:account_check_writing.model_res_company
diff --git a/addons/account_check_writing/i18n/tr.po b/addons/account_check_writing/i18n/tr.po
index 1bcae9fcdbe..9d0f27df01d 100644
--- a/addons/account_check_writing/i18n/tr.po
+++ b/addons/account_check_writing/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/zh_CN.po b/addons/account_check_writing/i18n/zh_CN.po
index 8ddc5956799..8a3b1794198 100644
--- a/addons/account_check_writing/i18n/zh_CN.po
+++ b/addons/account_check_writing/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_check_writing
 #: selection:res.company,check_layout:0
diff --git a/addons/account_check_writing/i18n/zh_TW.po b/addons/account_check_writing/i18n/zh_TW.po
new file mode 100644
index 00000000000..b4bbd324aca
--- /dev/null
+++ b/addons/account_check_writing/i18n/zh_TW.po
@@ -0,0 +1,205 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-22 06:48+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"Language-Team: Cenoq\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "支票位於頂部"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+"付款支票表單用來跟蹤你對供應商的支票付款。選擇了一個供應商、付款方式、付款金額以後，OpenERP會建議你對未核銷的供應商發票進行核銷。你可以列印支票。"
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "列印支票"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "支票位於中間"
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+"支票位於頂部與Quicken, QuickBooks 和 Microsoft Money兼容。支票位於中間與Peachtree, ACCPAC 和 "
+"DacEasy兼容。支票位於底部只與Peachtree, ACCPAC 和 DacEasy兼容。"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "支票位於底部"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "錯誤！您不能創建遞歸公司."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr "如果這個帳簿用於開支票，請勾選這裡。"
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "允許開支票"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "描述"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "帳簿"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "開支票"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "折扣"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "原始金額"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "設置"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "允許開支票"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "付款"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "使用套表列印的支票"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "公司名稱必須唯一！"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr "到期日期"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "公司"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr "預設支票版型"
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr "設置錯誤！所選幣種應與默認科目共享。"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "截止餘額"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr "支票金額"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "手工憑證"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "每個公司的帳簿名稱必須唯一！"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "每個公司的帳簿編碼必須唯一！"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "金額大寫"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "期初餘額"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "選擇支票版型"
+
+#~ msgid "Default Check layout"
+#~ msgstr "默認支票格式"
diff --git a/addons/account_check_writing/report/check_print.py b/addons/account_check_writing/report/check_print.py
index f8e048beb2d..fd52c96b9aa 100644
--- a/addons/account_check_writing/report/check_print.py
+++ b/addons/account_check_writing/report/check_print.py
@@ -32,7 +32,6 @@ class report_print_check(report_sxw.rml_parse):
             'time': time,
             'get_lines': self.get_lines,
             'fill_stars' : self.fill_stars,
-            'get_zip_line': self.get_zip_line,
         })
     def fill_stars(self, amount):
         amount = amount.replace('Dollars','')
@@ -41,25 +40,6 @@ class report_print_check(report_sxw.rml_parse):
             return ' '.join([amount,'*'*stars])
 
         else: return amount
-
-    def get_zip_line(self, address):
-        '''
-        Get the address line
-        '''
-        ret = ''
-        if address:
-            if address.city:
-                ret += address.city
-            if address.state_id:
-                if address.state_id.name:
-                    if ret:
-                        ret += ', '
-                    ret += address.state_id.name
-            if address.zip:
-                if ret:
-                    ret += ' '
-                ret += address.zip
-        return ret
     
     def get_lines(self, voucher_lines):
         result = []
diff --git a/addons/account_check_writing/report/check_print_bottom.rml b/addons/account_check_writing/report/check_print_bottom.rml
index bb499a8aac1..f9add2fe60b 100644
--- a/addons/account_check_writing/report/check_print_bottom.rml
+++ b/addons/account_check_writing/report/check_print_bottom.rml
@@ -281,10 +281,7 @@
               </td>
               <td>
                 <para style="P15">[[ voucher.partner_id.name ]]</para>
-                <para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
-                <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
-                <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
-                <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
+                <para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
               </td>
             </tr>
           </blockTable>
diff --git a/addons/account_check_writing/report/check_print_middle.rml b/addons/account_check_writing/report/check_print_middle.rml
index 5a2f83f20a2..b1fffca662d 100644
--- a/addons/account_check_writing/report/check_print_middle.rml
+++ b/addons/account_check_writing/report/check_print_middle.rml
@@ -237,10 +237,7 @@
               </td>
               <td>
                 <para style="P15">[[ voucher.partner_id.name ]]</para>
-                <para style="P15">[[ voucher.partner_id.street or removeParentNode('para') ]]</para>
-                <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
-                <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
-                <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
+                <para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
               </td>
             </tr>
           </blockTable>
diff --git a/addons/account_check_writing/report/check_print_top.rml b/addons/account_check_writing/report/check_print_top.rml
index 41526605f47..9a4d633e680 100644
--- a/addons/account_check_writing/report/check_print_top.rml
+++ b/addons/account_check_writing/report/check_print_top.rml
@@ -153,9 +153,7 @@
               </td>
               <td>
                 <para style="P9">[[ voucher.partner_id.name ]] </para>
-                <para style="P15">[[ voucher.partner_id.street2 or removeParentNode('para') ]]</para>
-                <para style="P15">[[ get_zip_line(voucher.partner_id) ]] </para>
-                <para style="P15">[[ voucher.partner_id.country_id.name]]</para>
+                <para style="P15">[[ display_address(voucher.partner_id) or removeParentNode('para') ]]</para>
               </td>
               <td>
                 <para/>
diff --git a/addons/account_followup/__init__.py b/addons/account_followup/__init__.py
index 4bfe3186298..ffa88c40a32 100644
--- a/addons/account_followup/__init__.py
+++ b/addons/account_followup/__init__.py
@@ -23,4 +23,4 @@ import account_followup
 import wizard
 import report
 
-# 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_followup/__openerp__.py b/addons/account_followup/__openerp__.py
index e8724b01b4e..87b04c18219 100644
--- a/addons/account_followup/__openerp__.py
+++ b/addons/account_followup/__openerp__.py
@@ -28,30 +28,27 @@ Module to automate letters for unpaid invoices, with multi-level recalls.
 ==========================================================================
 
 You can define your multiple levels of recall through the menu:
+---------------------------------------------------------------
+    **Invoicing** / **Configuration** / **Miscellaneous** / **Follow-ups**
 
-    Invoicing/Configuration/Miscellaneous/Follow-ups
-
-Once it is defined, you can automatically print recalls every day through simply 
-clicking on the menu:
-
-    Invoicing/Periodical Processing/Billing/Send follow-ups
+Once it is defined, you can automatically print recalls every day through simply clicking on the menu:
+------------------------------------------------------------------------------------------------------
+    **Invoicing** / **Periodical Processing** / **Billing** / **Send follow-ups**
 
 It will generate a PDF with all the letters according to the the different levels 
 of recall defined. You can define different policies for different companies. You 
 can also send mail to the customer.
 
-Note that if you want to check the follow-up level for a given partner/account 
-entry, you can do from in the menu:
-
-    Invoicing/Reporting/Generic Reporting/Partners/Follow-ups Sent
+Note that if you want to check the follow-up level for a given partner/account entry, you can do from in the menu:
+------------------------------------------------------------------------------------------------------------------
+    **Invoicing** / **Reporting** / **Generic Reporting** / **Partners** / **Follow-ups Sent**
 
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/follow_ups.jpeg','images/send_followups.jpeg'],
     'depends': ['account_accountant', 'mail'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/account_followup_security.xml',
         'security/ir.model.access.csv',
         'wizard/account_followup_print_view.xml',
@@ -60,14 +57,13 @@ entry, you can do from in the menu:
         'account_followup_view.xml',
         'account_followup_data.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'test': [
         'test/account_followup.yml',
         'test/account_followup_report.yml',
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0072481076453',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_followup/i18n/ar.po b/addons/account_followup/i18n/ar.po
index 4dd27dbfc9c..620fc1e2f1b 100644
--- a/addons/account_followup/i18n/ar.po
+++ b/addons/account_followup/i18n/ar.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-10-08 15:59+0000\n"
+"Last-Translator: waleed bazaza <waleed_bazaza@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -42,7 +42,7 @@ msgstr "متابعة"
 #: help:account.followup.print.all,test_print:0
 msgid ""
 "Check if you want to print followups without changing followups level."
-msgstr ""
+msgstr "اختر هذه الخانة إذا أردت طباعة المتابعات بدون تغيير متوى المتابعات."
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -101,7 +101,7 @@ msgstr "الدليل"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow up Entries with period in current year"
-msgstr ""
+msgstr "مدخلات المتابعات بفترات في السنة الحالية"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -314,6 +314,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"جميع رسائل البريد الالكتروني قد أرسلت بنجاح للشركاء:.\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: constraint:account_followup.followup.line:0
@@ -362,6 +365,11 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"\n"
+"رسالة البريد الالكتروني قد أرسلت للشركاء التاليين.!\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: help:account.followup.print,date:0
@@ -503,7 +511,7 @@ msgstr "تقرير المتابعة"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Steps"
-msgstr ""
+msgstr "خطوات المتابعة"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
@@ -514,7 +522,7 @@ msgstr "فترة"
 #: code:addons/account_followup/wizard/account_followup_print.py:307
 #, python-format
 msgid "Followup Summary"
-msgstr ""
+msgstr "خلاصة المتابعة"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -535,7 +543,7 @@ msgstr "مستوى اعلى متابعة"
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
 msgid "Review Invoicing Follow-Ups"
-msgstr ""
+msgstr "استعراض متابعة الفوترة"
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -595,7 +603,7 @@ msgstr "الوصف"
 #. module: account_followup
 #: constraint:account_followup.followup:0
 msgid "Only One Followup by Company."
-msgstr ""
+msgstr "متابعة واحدة غقط من الشركة."
 
 #. module: account_followup
 #: view:account_followup.stat:0
diff --git a/addons/account_followup/i18n/bg.po b/addons/account_followup/i18n/bg.po
index 89c9dcd52d0..6420dabb2d6 100644
--- a/addons/account_followup/i18n/bg.po
+++ b/addons/account_followup/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/bs.po b/addons/account_followup/i18n/bs.po
index 73ab7f81ded..20ce759778c 100644
--- a/addons/account_followup/i18n/bs.po
+++ b/addons/account_followup/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/ca.po b/addons/account_followup/i18n/ca.po
index f0985aebde3..daa7828662c 100644
--- a/addons/account_followup/i18n/ca.po
+++ b/addons/account_followup/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/cs.po b/addons/account_followup/i18n/cs.po
index 2bc4d4a49af..a543075b4e0 100644
--- a/addons/account_followup/i18n/cs.po
+++ b/addons/account_followup/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/da.po b/addons/account_followup/i18n/da.po
index 70a6db009aa..9880ae05991 100644
--- a/addons/account_followup/i18n/da.po
+++ b/addons/account_followup/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po
index 88884a45119..2e28029ce72 100644
--- a/addons/account_followup/i18n/de.po
+++ b/addons/account_followup/i18n/de.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Followup"
-msgstr "Suche Zahlungserinnerung"
+msgstr "Suche Mahnung"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -31,7 +31,7 @@ msgstr "Gruppierung..."
 #: view:res.company:0
 #: field:res.company,follow_up_msg:0
 msgid "Follow-up Message"
-msgstr "Zahlungserinnerung Benachrichtigung"
+msgstr "Mitteilung zur Zahlungserinnerung"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -72,14 +72,17 @@ msgstr ""
 "\n"
 "Geehrte(r) %(partner_name)s,\n"
 "\n"
-"Wir bedauern, dass Ihr Konto trotz Übersendung einer Mahnung überfällig ist\n"
+"Wir bedauern, dass Ihr Konto trotz Übersendung einer Erinnerung weiterhin "
+"unbeglichen ist.\n"
 "\n"
-"Wenn Sie die unmittelbare Bezahlung verabsäumen, müssen wir Ihr Konto still "
-"legen, d.h. dass wir Sie zukünftig nicht mehr beliefern können.\n"
-"Bitte fürhen Sie die Zahlung innerhalb der nächsten 8 Tage durch.\n"
+"Wenn Sie die Bezahlung weiterhin versäumen, sehen wir uns gezwungen Ihr "
+"Konto still zu legen. D.h. dass wir Sie zukünftig nicht mehr beliefern "
+"werden. Darüber hinaus entsteht auf unserer Seite Aufwand, den wir ggf. an "
+"Sie weitergeben müssen.\n"
+"Bitte führen Sie die Zahlung innerhalb der nächsten 8 Tage durch.\n"
 "\n"
-"Wenn es mit der Rechnung ein uns unbekanntes Problem gibt, wenden Sie sich "
-"bitte unmittelbar an unsere Buchhaltung.\n"
+"Wenn es mit der Rechnung ein uns nicht nachvollziehbares Problem gibt, "
+"wenden Sie sich bitte vertrauensvoll an unsere Buchhaltung.\n"
 "\n"
 "Details der überfälligen Zahlungen finden Sie weiter unten.\n"
 "\n"
@@ -101,13 +104,15 @@ msgstr "Rechnungsdatum"
 #. module: account_followup
 #: field:account.followup.print.all,email_subject:0
 msgid "Email Subject"
-msgstr "EMail Betreff"
+msgstr "EMail-Betreff"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_followup_stat
 msgid ""
 "Follow up on the reminders sent over to your partners for unpaid invoices."
-msgstr "Zahlungserinnerungen an Partner für unbezahlte Rechnungen"
+msgstr ""
+"Mahnung an Partner nach bereits erfolgter Erinnerung, wegen unbeglichener "
+"Rechnungen."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -118,7 +123,7 @@ msgstr "Legende"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow up Entries with period in current year"
-msgstr "Mahnungen mit Buchungen im laufenden Jahr"
+msgstr "Mahnungen aus Perioden des laufenden Jahres"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -133,7 +138,7 @@ msgstr "Betrag"
 #. module: account_followup
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr "Falscher Buchungsbetrag in Soll oder Haben"
+msgstr "Falscher Soll- oder Habenbetrag in der Buchung!"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -144,7 +149,7 @@ msgstr "Nettotage"
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-Ups"
-msgstr "Erinnerungen"
+msgstr ""
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
@@ -162,13 +167,13 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
-"The date of your Journal Entry is not in the defined period! You should "
-"change the date or remove this constraint from the journal."
+"Das Datum Ihrer Buchung fällt nicht in die festgelegte Periode. Sie müssen "
+"das Datum anpassen, oder diese Einschränkung vom Bericht entfernen."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(heading)s: Move line header"
-msgstr "%(heading)s: Buchungsposition Kopf"
+msgstr "%(heading)s: Titelzeile der Buchungen"
 
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
@@ -201,7 +206,7 @@ msgstr "Partner"
 #: code:addons/account_followup/wizard/account_followup_print.py:142
 #, python-format
 msgid "Invoices Reminder"
-msgstr "Erinnerung für zu zahlende Rechnungen"
+msgstr "Erinnerung an zu zahlende Rechnungen"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
@@ -211,7 +216,7 @@ msgstr "Zahlungserinnerung"
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "End of Month"
-msgstr "Ende Monat"
+msgstr "Monatsende"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -221,7 +226,7 @@ msgstr "Kein Verzug"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(user_signature)s: User name"
-msgstr "%(user_signature)s: Name Benutzer"
+msgstr "%(user_signature)s: Benutzername"
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
@@ -248,13 +253,14 @@ msgstr "Ref."
 #: help:account_followup.followup.line,sequence:0
 msgid "Gives the sequence order when displaying a list of follow-up lines."
 msgstr ""
-"Zeigt die Reihenfolge bei der Anzeige einer Liste von Zahlungserinnerungen"
+"Gibt die Reihenfolge bei der Anzeige einer Liste von Zahlungserinnerungen "
+"vor."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,email_body:0
 msgid "Email body"
-msgstr "Email Haupttext"
+msgstr "EMail Haupttext"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
@@ -280,7 +286,7 @@ msgstr "Sende EMail in Sprache d. Partners"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Partner Selection"
-msgstr "Partner Auswahl"
+msgstr "Partnerauswahl"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -301,18 +307,21 @@ msgstr ""
 "\n"
 "Guten Tag  %( partner_name)s,\n"
 "\n"
-"unter der Annahme eines Fehlers unsererseits,  bleiben die folgenden nicht "
-"bezahlten Rechnungsbeträge offen zur Zahlung. Bitte ergreifen Sie die "
-"erforderlichen Massnahmen, um das neue Mahnwesen in den nächsten 8 Tagen zu "
-"aktivieren. Sollte die Zahlung zeitlich nach diesem Emailversand erfolgen "
-"können Sie bitte diese Benachrichtigung ignorieren.\n"
+"in unseren Unterlagen stehen die folgenden Rechnungen zur Zahlung aus. Bitte "
+"überprüfen Sie dies auf Ihrer Seite und ergreifen Sie die erforderlichen "
+"Massnahmen innerhalb der nächsten 8 Tage. Sollte die Zahlung zeitlich nach "
+"dieser Mitteilung erfolgen, können Sie bitte diese Benachrichtigung "
+"ignorieren. \n"
+"Sollte uns unerwartet ein Fehler unterlaufen sein, so bitten wir dies zu "
+"entschuldigen, und hoffen, dass Sie uns helfen diese Angelegenheit zu "
+"bereinigen.\n"
 "\n"
 "Freundliche Grüsse\n"
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
-msgstr "gedruckte Nachricht"
+msgstr "gedruckte Mitteilung"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -321,7 +330,7 @@ msgstr "gedruckte Nachricht"
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send followups"
-msgstr "Sende Zahlungserinnerung"
+msgstr "Versende Mahnungen"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
@@ -342,7 +351,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Alle E-mails wurden erfolgreiche an folgende Partner versendet:.\n"
+"Alle E-mails wurden erfolgreich an folgende Partner versendet:\n"
 "\n"
 "%s"
 
@@ -352,8 +361,8 @@ msgid ""
 "Your description is invalid, use the right legend or %% if you want to use "
 "the percent character."
 msgstr ""
-"Ihre Beschreibung ist ungültig. verwenden Sie %% wenn Sie ein Prozentzeichen "
-"eingeben wollen"
+"Ihre Beschreibung ist ungültig, verwenden Sie %% wenn Sie ein Prozentzeichen "
+"eingeben wollen."
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -362,9 +371,10 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
-"The selected account of your Journal Entry forces to provide a secondary "
-"currency. You should remove the secondary currency on the account or select "
-"a multi-currency view on the journal."
+"Das ausgewählte Konto Ihrer Buchung erfordert die Angabe einer "
+"Alternativwährung. Sie müssen die Verwendung einer Alternativwährung in den "
+"Einstellungen des Kontos ausschalten oder aber eine mehrwährungsfähige "
+"Ansicht im Beicht verwenden."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -374,12 +384,12 @@ msgstr "Versende EMails"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
 msgid "Followup Statistics by Partner"
-msgstr "Statistik Zahlungserinnerungen"
+msgstr "Statistik über Zahlungserinnerungen"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Message"
-msgstr "Nachricht"
+msgstr "Mitteilung"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
@@ -398,7 +408,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"E-Mail ist erfolgreich an folgende Partners versendet worden. !\n"
+"E-Mail ist erfolgreich an folgende Partners versendet worden:\n"
 "\n"
 "%s"
 
@@ -413,7 +423,7 @@ msgstr ""
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
-msgstr "Datum der Erinnerung"
+msgstr "Datum für Versand der Mahnung(en)"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:56
@@ -424,57 +434,59 @@ msgstr "Wähle Partner"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
-msgstr "E-Mail-Einstellungen"
+msgstr "EMail-Einstellungen"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
-msgstr "Drucke Erinnerungen"
+msgstr "Drucke Mahnungen"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
 msgid "Latest Follow-up"
-msgstr "Spätestes Datum Zahlungserinnerung"
+msgstr "Letzte Mahnung"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup Statistics"
-msgstr "Erinnerungen Statistik"
+msgstr "Mahnungsstatistik"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s: User Name"
-msgstr "%(user_signature)s: Name Benutzer"
+msgstr "%(user_signature)s: Benutzername"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
 msgid "Journal Items"
-msgstr "Journal Zeilen"
+msgstr "Buchungen"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr "You can not create journal items on an account of type view."
+msgstr "Sie können keine Buchungen in einem Ansichtskonto vornehmen."
 
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
-msgstr "Sende EMail Bestätigung"
+msgstr "Versende Bestätigung per EMail"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Total:"
-msgstr "Gesamt:"
+msgstr "Summe:"
 
 #. module: account_followup
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
+msgstr ""
+"Fehler! Sie können Unternehmen nicht rekursiv (auf sich selbst bezogen) "
+"anlegen."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
-msgstr "%(company_name)s: Name der Firma"
+msgstr "%(company_name)s: Unternehmensname d. Benutzers"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
@@ -485,32 +497,32 @@ msgstr "Unternehmen"
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,summary:0
 msgid "Summary"
-msgstr "Übersicht"
+msgstr "Zusammenfassung"
 
 #. module: account_followup
 #: field:account_followup.stat,credit:0
 msgid "Credit"
-msgstr "Haben"
+msgstr "Punkte"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Maturity Date"
-msgstr "Datum Fällig"
+msgstr "Fällingkeitsdatum"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s: Partner Name"
-msgstr "%(partner_name)s: Partner Name"
+msgstr "%(partner_name)s: Partnername"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-Up lines"
-msgstr "Zahlungserinnerung Positionen"
+msgstr "Mahnungspositionen"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_currency)s: User's Company Currency"
-msgstr "%(company_currency)s: eigene Währung"
+msgstr "%(company_currency)s: Unternehmenswährung"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -522,13 +534,13 @@ msgstr "Saldo"
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
 msgid "Type of Term"
-msgstr "Zahlungsbedingungen"
+msgstr "Zahlungsziel"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
 #: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Followup & Send Mail to Customers"
-msgstr "Drucke Erinnerung & Sende EMail zu Kunden"
+msgstr "Drucke Mahnung & Sende EMail an Kunden"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
@@ -539,7 +551,7 @@ msgstr "Letzte Buchung"
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Followup Report"
-msgstr "Bericht Zahlungserinnerungen"
+msgstr "Bericht über Mahnungen"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -555,7 +567,7 @@ msgstr "Periode"
 #: code:addons/account_followup/wizard/account_followup_print.py:307
 #, python-format
 msgid "Followup Summary"
-msgstr "Mahnverfolgung Zusammenfassung"
+msgstr "Zusammenfassung der Mahnungen"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -566,22 +578,22 @@ msgstr "Abbrechen"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
-msgstr "In Verzug"
+msgstr "Rechtsstreit"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
 msgid "Max Follow Up Level"
-msgstr "Max. Mahnstufe"
+msgstr "Höchste Mahnstufe"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
 msgid "Review Invoicing Follow-Ups"
-msgstr "Überarbeiten Mahnungen"
+msgstr "Mahnungen sichten"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr "Company must be the same for its related account and period."
+msgstr "Das Unternehmen muss für Konto und Periode das gleiche sein."
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form
@@ -592,13 +604,13 @@ msgid ""
 "and you can manage the multi language of messages."
 msgstr ""
 "Definieren Sie die Mahnstufen und die dazugehörigen Nachrichten und Fristen. "
-"Verwenden Sie die Variablen lt. Legende, dann können Sie die Mahnungen "
-"mehrsprachig verwalten."
+"Verwenden Sie die Variablen gemäß der Legende, und verwalten Sie die "
+"Mahnungen mehrsprachig."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 msgid "Payable Items"
-msgstr "Zahlbare Beträge"
+msgstr "Ausstehende Beträge"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:298
@@ -609,13 +621,14 @@ msgid ""
 "%s"
 msgstr ""
 "E-Mail wurde wegen fehlender E-Mail-Adresse an folgende Partner NICHT "
-"versandt!\n"
+"versandt:\n"
+"\n"
 "%s"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(followup_amount)s: Total Amount Due"
-msgstr "%(followup_amount)s: Gesamtbetrag Verbindkichk."
+msgstr "%(followup_amount)s: Fälliger Gesamtbetrag"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -626,12 +639,12 @@ msgstr "%(date)s: aktuelles Datum"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Including journal entries marked as a litigation"
-msgstr "Beinhaltet Buchungen im Verfahren"
+msgstr "Beinhaltet Buchungen aus lfd. Rechtsstreitigkeiten"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Followup Level"
-msgstr "Stufe Zahlungserinnerung"
+msgstr "Mahnstufe"
 
 #. module: account_followup
 #: field:account_followup.followup,description:0
@@ -647,12 +660,12 @@ msgstr "Nur eine Mahnung je Unternehmen"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "This Fiscal year"
-msgstr "Dieses Fiskaljahr"
+msgstr "Dieses Geschäftsjahr"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Partner entries"
-msgstr "Partner Buchungen"
+msgstr "Partnereinträge"
 
 #. module: account_followup
 #: help:account.followup.print.all,partner_lang:0
@@ -660,8 +673,9 @@ msgid ""
 "Do not change message text, if you want to send email in partner language, "
 "or configure from company"
 msgstr ""
-"Wechseln Sie nicht diese Text Message, wenn EMails in einer Fremdsprache,  "
-"an Partner gesendet werden sollen"
+"Ändern Sie den Mitteilungstext nicht, wenn EMails in einer Fremdsprache an "
+"Partner gesendet werden sollen oder Sie diesen  Text aus den "
+"Unternehmenseinstellungen heraus konfigurieren."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
@@ -673,12 +687,12 @@ msgstr "Forderungen"
 #: model:ir.actions.act_window,name:account_followup.action_followup_stat
 #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
 msgid "Follow-ups Sent"
-msgstr "Versendete Erinnerungen"
+msgstr "Versendete Mahnungen"
 
 #. module: account_followup
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr "Der Name der Firma darf nur einmal vorkommen!"
+msgstr "Der Unternehmensname muss eindeutig sein!"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
@@ -715,7 +729,7 @@ msgstr "Dokument: Kundenkonto"
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total credit"
-msgstr "Gesamt Haben"
+msgstr "Gesamtforderung"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -744,8 +758,8 @@ msgstr ""
 "Sollte innerhalb der nächsten 8 Tage keine Zahlung erfolgen, werden wir die "
 "erforderlichen rechtlichen Schritte einleiten.\n"
 "\n"
-"Wir hoffen nach wie vor, dass diese Aktivität nicht nötig sein wird. Details "
-"der fälligen Postionen finden Sie unten.\n"
+"Wir hoffen nach wie vor, dass diese sich als unnötig erweist. Details der "
+"fälligen Forderungen finden Sie unten.\n"
 "\n"
 "Für alle Rückfragen in dieser Angelegenheit, zögern Sie nicht unsere "
 "Finanzabteilung zu kontaktieren.\n"
@@ -755,7 +769,7 @@ msgstr ""
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr "You can not create journal items on closed account."
+msgstr "Sie können auf ein abgeschlossenes Konto nicht mehr buchen."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -780,22 +794,22 @@ msgstr "Kunden Referenz:"
 #. module: account_followup
 #: field:account.followup.print.all,test_print:0
 msgid "Test Print"
-msgstr "Test Druck"
+msgstr "Testdruck"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(partner_name)s: Partner name"
-msgstr "%(partner_name)s: Partner name"
+msgstr "%(partner_name)s: Partnername"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Latest Followup Date"
-msgstr "Letzte Aktualisierung"
+msgstr "Letzte Mahnung"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
-msgstr "Zahlungserinnerung Kriterien"
+msgstr "Mahngründe"
 
 #~ msgid "All payable entries"
 #~ msgstr "Alle offenen Posten"
diff --git a/addons/account_followup/i18n/el.po b/addons/account_followup/i18n/el.po
index 3457209c5bd..61eec471ae4 100644
--- a/addons/account_followup/i18n/el.po
+++ b/addons/account_followup/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/es.po b/addons/account_followup/i18n/es.po
index f71af7f30c8..509397f7985 100644
--- a/addons/account_followup/i18n/es.po
+++ b/addons/account_followup/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/es_AR.po b/addons/account_followup/i18n/es_AR.po
index 7119654c183..9048e566c7d 100644
--- a/addons/account_followup/i18n/es_AR.po
+++ b/addons/account_followup/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/es_CR.po b/addons/account_followup/i18n/es_CR.po
index 3cb7b90e91f..4e1ff75243e 100644
--- a/addons/account_followup/i18n/es_CR.po
+++ b/addons/account_followup/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/es_EC.po b/addons/account_followup/i18n/es_EC.po
index 6832ef0c9a0..08000602d33 100644
--- a/addons/account_followup/i18n/es_EC.po
+++ b/addons/account_followup/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/es_PY.po b/addons/account_followup/i18n/es_PY.po
index 9ac76a3af75..1140283dfd1 100644
--- a/addons/account_followup/i18n/es_PY.po
+++ b/addons/account_followup/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/et.po b/addons/account_followup/i18n/et.po
index 4b91eb4715e..7fd347eb442 100644
--- a/addons/account_followup/i18n/et.po
+++ b/addons/account_followup/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/fa.po b/addons/account_followup/i18n/fa.po
index 8cba255bb1b..49191ed1f7c 100644
--- a/addons/account_followup/i18n/fa.po
+++ b/addons/account_followup/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/fi.po b/addons/account_followup/i18n/fi.po
index 43090136ab0..b5f5be6ef12 100644
--- a/addons/account_followup/i18n/fi.po
+++ b/addons/account_followup/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/fr.po b/addons/account_followup/i18n/fr.po
index 360351250ad..ae5487ea4bd 100644
--- a/addons/account_followup/i18n/fr.po
+++ b/addons/account_followup/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/gl.po b/addons/account_followup/i18n/gl.po
index f5c36ba0af8..ad8fa4906c2 100644
--- a/addons/account_followup/i18n/gl.po
+++ b/addons/account_followup/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po
index 5b119e6ec86..7cc10ca95f5 100644
--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/hu.po b/addons/account_followup/i18n/hu.po
index b435383f9ab..d617fde6086 100644
--- a/addons/account_followup/i18n/hu.po
+++ b/addons/account_followup/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/id.po b/addons/account_followup/i18n/id.po
index 6d76ba2772d..862aa4d12f5 100644
--- a/addons/account_followup/i18n/id.po
+++ b/addons/account_followup/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/it.po b/addons/account_followup/i18n/it.po
index 29c50145039..fd72a350fb8 100644
--- a/addons/account_followup/i18n/it.po
+++ b/addons/account_followup/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -43,6 +43,7 @@ msgstr "Follow-Up"
 msgid ""
 "Check if you want to print followups without changing followups level."
 msgstr ""
+"Verifica se vuoi stampate followups senza cambiare il livello di followup."
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -91,6 +92,7 @@ msgstr "Oggetto Email"
 msgid ""
 "Follow up on the reminders sent over to your partners for unpaid invoices."
 msgstr ""
+"Follow up sui solleciti inviati ai tuoi partner per fattura non pagate"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -101,7 +103,7 @@ msgstr "Legenda"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow up Entries with period in current year"
-msgstr ""
+msgstr "Followup con periodo entro l'anno corrente"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -111,7 +113,7 @@ msgstr "Ok"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Amount"
-msgstr ""
+msgstr "Importo"
 
 #. module: account_followup
 #: sql_constraint:account.move.line:0
@@ -145,6 +147,8 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"La data della registrazione contabile non è presente nel periodo definito! "
+"Occorre cambiare la data o rimuovere questo vincolo dal sezionale."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -298,7 +302,7 @@ msgstr "Invia i follow up"
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Partner to Remind"
-msgstr "Partner a cui ricordare"
+msgstr "Partner da sollecitare"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
@@ -314,6 +318,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Tutte le e-mail sono state inviate con successo ai partner:\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: constraint:account_followup.followup.line:0
@@ -321,6 +328,8 @@ msgid ""
 "Your description is invalid, use the right legend or %% if you want to use "
 "the percent character."
 msgstr ""
+"La descrizione non è valida, utilizza la legenda a destra oppure %% se vuoi "
+"usare il carattere percentuale."
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -329,6 +338,9 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Il conto selezionato del sezionale di appartenenza necessita di una valuta "
+"secondaria. Occorre rimuovere la valuta secondaria dal conto oppure "
+"selezionare una vista multivaluta nel sezionale."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -343,7 +355,7 @@ msgstr "Statistiche follow up per partner"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Message"
-msgstr ""
+msgstr "Messaggio"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
@@ -360,12 +372,19 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"\n"
+"E-mail correttamente inviate ai seguenti Partners. !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: help:account.followup.print,date:0
 msgid ""
 "This field allow you to select a forecast date to plan your follow-ups"
 msgstr ""
+"Questo campo ti permette di selezionare una data prevista per pianificare i "
+"tuoi follow-ups"
 
 #. module: account_followup
 #: field:account.followup.print,date:0
@@ -406,12 +425,12 @@ msgstr "%(user_signature)s: Nome utente"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
 msgid "Journal Items"
-msgstr "Voci Giornale"
+msgstr "Voci Sezionale"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Non è possibile effettuare registrazioni su un conto di tipo vista."
 
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
@@ -421,7 +440,7 @@ msgstr "Conferma email inviata"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Total:"
-msgstr ""
+msgstr "Totale:"
 
 #. module: account_followup
 #: constraint:res.company:0
@@ -501,7 +520,7 @@ msgstr "Report follow up"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Steps"
-msgstr ""
+msgstr "Passi di follow-ups"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
@@ -533,12 +552,12 @@ msgstr "Massimo livello follow up"
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
 msgid "Review Invoicing Follow-Ups"
-msgstr ""
+msgstr "Verifica follow-ups fatturazione"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "L'azienda deve essere la stessa per il conto ed il relativo periodo"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form
@@ -548,6 +567,10 @@ msgid ""
 "code to adapt the email content to the good context (good name, good date) "
 "and you can manage the multi language of messages."
 msgstr ""
+"Definisci livelli di follow-up ed i relativi messaggi e ritardi. Per ogni "
+"passo, specifica il messaggio ed i giorni di ritardo. Usa la legenda per "
+"adattare al meglio i contesti delle email. Gestisci da qui anche messaggi in "
+"altre lingue."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -562,6 +585,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"E-Mail non inviate ai seguenti Partner, E-mail non disponibile !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -577,7 +603,7 @@ msgstr "%(date)s: Data corrente"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Including journal entries marked as a litigation"
-msgstr ""
+msgstr "Incluse le registrazioni marcate come contenzioso"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -593,7 +619,7 @@ msgstr "Descrizione"
 #. module: account_followup
 #: constraint:account_followup.followup:0
 msgid "Only One Followup by Company."
-msgstr ""
+msgstr "Solo un followup per azienda."
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -611,6 +637,8 @@ msgid ""
 "Do not change message text, if you want to send email in partner language, "
 "or configure from company"
 msgstr ""
+"Non modificare il testo del messaggio se vuoi inviare le email nel "
+"linguaggio del Partner, oppure configuralo dall'azienda."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
@@ -627,7 +655,7 @@ msgstr "Follow up inviati"
 #. module: account_followup
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Il nome azienda deve essere univoco!"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
@@ -659,7 +687,7 @@ msgstr "Giorni di dilazione"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr ""
+msgstr "Documento: Rendiconto cliente"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -690,6 +718,7 @@ msgstr ""
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
 msgstr ""
+"Non è possibile creare registrazioni contabili su di un conto chiuso."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -714,7 +743,7 @@ msgstr "Rif. Cliente:"
 #. module: account_followup
 #: field:account.followup.print.all,test_print:0
 msgid "Test Print"
-msgstr ""
+msgstr "Stampa di prova"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
diff --git a/addons/account_followup/i18n/ja.po b/addons/account_followup/i18n/ja.po
index 74fd6764a0b..0e0e6178371 100644
--- a/addons/account_followup/i18n/ja.po
+++ b/addons/account_followup/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/ko.po b/addons/account_followup/i18n/ko.po
index efb0aeb8001..c1e59d59e2c 100644
--- a/addons/account_followup/i18n/ko.po
+++ b/addons/account_followup/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po
index 74135010f80..b71ce2c9b8f 100644
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/mn.po b/addons/account_followup/i18n/mn.po
index 728a4c80c16..19a15fc74c0 100644
--- a/addons/account_followup/i18n/mn.po
+++ b/addons/account_followup/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -133,7 +133,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
-msgstr ""
+msgstr "Баланс > 0"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -183,7 +183,7 @@ msgstr "Харилцагч"
 #: code:addons/account_followup/wizard/account_followup_print.py:142
 #, python-format
 msgid "Invoices Reminder"
-msgstr ""
+msgstr "Үнийн нэхэмжлэл сануулах"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
@@ -258,7 +258,7 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Partner Selection"
-msgstr ""
+msgstr "Харилцагч сонгох"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -329,7 +329,7 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Send Mails"
-msgstr ""
+msgstr "Мэйлүүд илгээх"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
@@ -372,12 +372,12 @@ msgstr ""
 #: code:addons/account_followup/wizard/account_followup_print.py:56
 #, python-format
 msgid "Select Partners"
-msgstr ""
+msgstr "Сонгосон харилцагч"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
-msgstr ""
+msgstr "Имэйл тохируулах"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -427,7 +427,7 @@ msgstr ""
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
-msgstr ""
+msgstr "%(company_name)s:Хэрэглэгчдийн компани нэр"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
@@ -453,7 +453,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s: Partner Name"
-msgstr ""
+msgstr "%(partner_name)s: Харилцагчийн нэр"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -475,7 +475,7 @@ msgstr "Тэнцэл"
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
 msgid "Type of Term"
-msgstr ""
+msgstr "Төрөлийн хугацаа"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
@@ -655,7 +655,7 @@ msgstr ""
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr ""
+msgstr "Баримт: Үйлчлүүлэгчийн дансны тодорхойлолт"
 
 #. module: account_followup
 #: view:account.move.line:0
diff --git a/addons/account_followup/i18n/nb.po b/addons/account_followup/i18n/nb.po
index cb7879bff40..aa12c09c889 100644
--- a/addons/account_followup/i18n/nb.po
+++ b/addons/account_followup/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -43,7 +43,7 @@ msgstr "Oppfølging"
 #: help:account.followup.print.all,test_print:0
 msgid ""
 "Check if you want to print followups without changing followups level."
-msgstr ""
+msgstr "Sjekk om du vil skrive ut oppfølging uten å endre oppfølging nivå."
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -68,6 +68,25 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Kjære% (PARTNER_NAME) s,\n"
+"\n"
+"Vi er skuffet over å se at til tross for å sende en påminnelse, at kontoen "
+"er nå alvorlig forfalt.\n"
+"\n"
+"Det er viktig at umiddelbar betaling er gjort, ellers vil vi måtte vurdere å "
+"plassere en stopp på din konto som gjør at vi ikke lenger vil være i stand "
+"til å levere din bedrift med (varer / tjenester).\n"
+"Vennligst ta nødvendige tiltak for å gjennomføre denne betalingen i de neste "
+"8 dagene.\n"
+"\n"
+"Hvis det er et problem med å betale fakturaen som vi ikke er klar over, ikke "
+"nøl med å ta kontakt med vår regnskapsavdelingen på (+32) .10.68.94.39. slik "
+"at vi kan løse saken raskt.\n"
+"\n"
+"Detaljer om forfalte innbetalinger skrives under.\n"
+"\n"
+"Med vennlig hilsen,\n"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -104,7 +123,7 @@ msgstr "Forklaring"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow up Entries with period in current year"
-msgstr ""
+msgstr "Følge opp oppføringer med perioden i inneværende år"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -114,7 +133,7 @@ msgstr "Ok"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Amount"
-msgstr ""
+msgstr "Beløp"
 
 #. module: account_followup
 #: sql_constraint:account.move.line:0
@@ -148,11 +167,13 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"Datoen for din bilagsregistrering ikke er i den definerte perioden! Du bør "
+"endre datoen eller fjerne denne begrensningen fra tidsskriftet."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(heading)s: Move line header"
-msgstr ""
+msgstr "% (posisjon) s: Flytt linje til topptekst"
 
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
@@ -232,13 +253,13 @@ msgstr "Ref"
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
 msgid "Gives the sequence order when displaying a list of follow-up lines."
-msgstr ""
+msgstr "Gir rekkefølgen av når du viser en liste over oppfølging linjer."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,email_body:0
 msgid "Email body"
-msgstr ""
+msgstr "E-post kroppen"
 
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
@@ -282,6 +303,18 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Kjære% (PARTNER_NAME) s,\n"
+"\n"
+"Unntak gjøres dersom det var en feil av oss, synes det som om følgende beløp "
+"forblir ubetalt. Vennligst ta nødvendige tiltak for å gjennomføre denne "
+"betalingen i de neste 8 dagene.\n"
+"\n"
+"Ville betalingen er gjennomført etter denne posten ble sendt, kan du se bort "
+"fra denne meldingen. Ikke nøl med å ta kontakt med vår regnskapsavdelingen "
+"på (+32) .10.68.94.39.\n"
+"\n"
+"Med vennlig hilsen,\n"
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
@@ -316,6 +349,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"Alle e-poster har blitt sendt til Partnere:.\n"
+"\n"
+"% s"
 
 #. module: account_followup
 #: constraint:account_followup.followup.line:0
@@ -323,6 +359,8 @@ msgid ""
 "Your description is invalid, use the right legend or %% if you want to use "
 "the percent character."
 msgstr ""
+"Din beskrivelse er ugyldig, bruk riktig legende eller%% hvis du ønsker å "
+"bruke prosent karakter."
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -331,6 +369,9 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Den valgte kontoen av dine Bilagsregistrering blir tvunget for å gi en "
+"sekundær valuta. Du bør fjerne den sekundære valuta på konto eller velg en "
+"flervaluta syn på tidsskriftet."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -345,7 +386,7 @@ msgstr "Oppfølgings statistikk per Partner"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Message"
-msgstr ""
+msgstr "Beskjed"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
@@ -362,6 +403,11 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"\n"
+"E-post sendes til følgende Partners vellykket. !\n"
+"\n"
+"% s"
 
 #. module: account_followup
 #: help:account.followup.print,date:0
@@ -405,7 +451,7 @@ msgstr "Oppfølgings statistikk"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s: User Name"
-msgstr ""
+msgstr "%(Brukers_signatur)s: bruker navn"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
@@ -415,7 +461,7 @@ msgstr "Journal Elementer"
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Du kan ikke lage journalregistreringer på konto av typen vis"
 
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
@@ -425,7 +471,7 @@ msgstr "Send e-post bekreftelse"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Total:"
-msgstr ""
+msgstr "Totalt:"
 
 #. module: account_followup
 #: constraint:res.company:0
@@ -435,7 +481,7 @@ msgstr "Feil! Dukan ikke opprette rekursive firmaer."
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
-msgstr ""
+msgstr "% (Firma_navn) s: Brukerens Firmanavn"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
@@ -461,7 +507,7 @@ msgstr "Forfallsdato"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s: Partner Name"
-msgstr ""
+msgstr "% (Partner_Navn) s: Partner Navn"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -471,7 +517,7 @@ msgstr "Oppfølgings linjer"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_currency)s: User's Company Currency"
-msgstr ""
+msgstr "% (Selskap_Valuta) s: Brukerens Selskap Valuta"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -505,7 +551,7 @@ msgstr "Oppfølgingsrapport"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Steps"
-msgstr ""
+msgstr "Oppfølgning's trinn"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
@@ -537,12 +583,12 @@ msgstr "Maks Oppfølgings Nivå"
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
 msgid "Review Invoicing Follow-Ups"
-msgstr ""
+msgstr "Anmeldelse Fakturering oppfølging"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "Selskapet må være den samme for tilhørende konto og periode"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form
@@ -552,11 +598,15 @@ msgid ""
 "code to adapt the email content to the good context (good name, good date) "
 "and you can manage the multi language of messages."
 msgstr ""
+"Definer oppfølging nivåer og deres relaterte meldinger og forsinkelse. For "
+"hvert trinn, angir meldingen og forsinkelsen. Bruk legenden å vite med kode "
+"for å tilpasse e-innhold til den gode konteksten (godt navn, god dato), og "
+"du kan administrere flere språk av meldinger."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 msgid "Payable Items"
-msgstr ""
+msgstr "leverandørgjeld elementer"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:298
@@ -566,11 +616,14 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"E-post sendes ikke til følgende Partnere, E-post ikke tilgjengelig!\n"
+"\n"
+"% s"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(followup_amount)s: Total Amount Due"
-msgstr ""
+msgstr "% (followup_Beløp) s: totalbeløpet"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -581,7 +634,7 @@ msgstr "%(date)s: Gjeldende Dato"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Including journal entries marked as a litigation"
-msgstr ""
+msgstr "Inkludert posteringer merket som en rettssak"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -597,7 +650,7 @@ msgstr "Beskrivelse"
 #. module: account_followup
 #: constraint:account_followup.followup:0
 msgid "Only One Followup by Company."
-msgstr ""
+msgstr "Bare En Oppfølging av Selskapet."
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -621,7 +674,7 @@ msgstr ""
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
 msgid "Receivable Items"
-msgstr ""
+msgstr "Mottas elementer"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -633,7 +686,7 @@ msgstr "Oppfølginger sendt"
 #. module: account_followup
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Firmanavn må være unikt !"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
@@ -650,7 +703,7 @@ msgstr "Første bevegelse"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Li."
-msgstr ""
+msgstr "Li."
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -665,7 +718,7 @@ msgstr "Dager forsinket"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr ""
+msgstr "Dokument: Kundens kontoutskrift"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -691,11 +744,26 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"Kjære% (Partner_nanvn) s,\n"
+"\n"
+"Til tross for flere purringer, er kontoen din fortsatt ikke avgjort.\n"
+"\n"
+"Med mindre full betaling skjer i neste 8 dagene, deretter søksmål om "
+"tilbakebetaling av gjelden vil bli tatt uten ytterligere varsel.\n"
+"\n"
+"Jeg stoler på at denne handlingen vil være unødvendig og detaljer på grunn "
+"betalinger skrives under.\n"
+"\n"
+"Ved eventuelle spørsmål angående denne saken, ikke nøl med å ta kontakt med "
+"vår regnskapsavdelingen på (+32) .10.68.94.39.\n"
+"\n"
+"Med vennlig hilsen,\n"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Du kan ikke lage journal elementer på en lukket konto."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -710,7 +778,7 @@ msgstr "Sekvens"
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s: User's Company Name"
-msgstr ""
+msgstr "%(Firma_Navn)s : Brukerens firma navn"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -720,7 +788,7 @@ msgstr "Kunde ref:"
 #. module: account_followup
 #: field:account.followup.print.all,test_print:0
 msgid "Test Print"
-msgstr ""
+msgstr "Prøv Skriv ut"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index 8f250461157..6847f869c0e 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-02-18 15:14+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -709,7 +709,7 @@ msgstr "Eerste boeking"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Li."
-msgstr "Li."
+msgstr "Bt."
 
 #. module: account_followup
 #: view:account.followup.print:0
diff --git a/addons/account_followup/i18n/nl_BE.po b/addons/account_followup/i18n/nl_BE.po
index 573ac7385a5..2dec012784b 100644
--- a/addons/account_followup/i18n/nl_BE.po
+++ b/addons/account_followup/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/oc.po b/addons/account_followup/i18n/oc.po
index bb4a625e9b3..f801b6edfbd 100644
--- a/addons/account_followup/i18n/oc.po
+++ b/addons/account_followup/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/pl.po b/addons/account_followup/i18n/pl.po
index adb74c73554..1f44f898437 100644
--- a/addons/account_followup/i18n/pl.po
+++ b/addons/account_followup/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -24,7 +24,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupuj wg..."
 
 #. module: account_followup
 #: view:res.company:0
@@ -338,7 +338,7 @@ msgstr ""
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Message"
-msgstr ""
+msgstr "Wiadomość"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po
index c7493dc9a03..46d28dcd34d 100644
--- a/addons/account_followup/i18n/pt.po
+++ b/addons/account_followup/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/pt_BR.po b/addons/account_followup/i18n/pt_BR.po
index c251dd4b15f..a270ccecc81 100644
--- a/addons/account_followup/i18n/pt_BR.po
+++ b/addons/account_followup/i18n/pt_BR.po
@@ -8,18 +8,19 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-07-28 20:47+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Followup"
-msgstr "Pesquisar Acompanhamento"
+msgstr "Pesquisar Cobrança"
 
 #. module: account_followup
 #: view:account_followup.stat:0
@@ -30,13 +31,13 @@ msgstr "Agrupar Por..."
 #: view:res.company:0
 #: field:res.company,follow_up_msg:0
 msgid "Follow-up Message"
-msgstr "Mensagem do Acompanhamento"
+msgstr "Menagem de Cobrança"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
 msgid "Follow-Up"
-msgstr "Acompanhamento"
+msgstr "Cobrança"
 
 #. module: account_followup
 #: help:account.followup.print.all,test_print:0
@@ -100,7 +101,7 @@ msgstr "Empresa"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Invoice Date"
-msgstr "Data de Faturamento"
+msgstr "Data da Fatura"
 
 #. module: account_followup
 #: field:account.followup.print.all,email_subject:0
@@ -134,7 +135,7 @@ msgstr "Ok"
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Amount"
-msgstr "Quantidade"
+msgstr "Valor"
 
 #. module: account_followup
 #: sql_constraint:account.move.line:0
@@ -150,7 +151,7 @@ msgstr "Dias Líquidos"
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-Ups"
-msgstr "Acompanhamentos"
+msgstr "Cobranças"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
@@ -168,8 +169,8 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
-"A data do lançamento não está definida no período. Você precisa alterar a "
-"data ou remover esse lançamento do diário."
+"A data da entrada no diário não está no período definido! Você deve alterar "
+"a data ou remover essa restrição do diário."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -179,7 +180,7 @@ msgstr "%(heading)s: Cabeçalho da linha de movimento"
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
 msgid "Follow-up"
-msgstr "Acompanhamento"
+msgstr "Cobrança"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -254,7 +255,7 @@ msgstr "Ref"
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
 msgid "Gives the sequence order when displaying a list of follow-up lines."
-msgstr "Define a sequência ao mostrar a lista de linhas de acompanhamento."
+msgstr "Define a sequência ao mostrar a lista de linhas de cobrança."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -265,13 +266,13 @@ msgstr "Corpo do e-mail"
 #. module: account_followup
 #: field:account.move.line,followup_line_id:0
 msgid "Follow-up Level"
-msgstr "Nível de Acompanhamento"
+msgstr "Nível de Cobrança"
 
 #. module: account_followup
 #: field:account_followup.stat,date_followup:0
 #: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
-msgstr "Último acompanhamento"
+msgstr "Última cobrança"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -329,7 +330,7 @@ msgstr "Mensagem Impressa"
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send followups"
-msgstr "Enviar acompanhamentos"
+msgstr "Enviar cobranças"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
@@ -340,7 +341,7 @@ msgstr "Parceiros para Lembrete"
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
 msgid "Follow Ups"
-msgstr "Acompanhamentos"
+msgstr "Cobranças"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:296
@@ -360,7 +361,7 @@ msgid ""
 "Your description is invalid, use the right legend or %% if you want to use "
 "the percent character."
 msgstr ""
-"Sua descrição é inválida, use a legenda direita ou%%, se você quiser usar o "
+"Sua descrição é inválida, use a legenda correta ou%%, se você quiser usar o "
 "caractere de porcentagem."
 
 #. module: account_followup
@@ -370,7 +371,7 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
-"A conta selecionada utializa as entradas no diário para fornecer uma moeda "
+"A conta selecionada utiliza as entradas no diário para fornecer uma moeda "
 "secundária. Você deve remover a moeda secundária na conta ou selecione uma "
 "visão multi-moeda no diário."
 
@@ -382,7 +383,7 @@ msgstr "Enviar Emails"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
 msgid "Followup Statistics by Partner"
-msgstr "Estatística de Acompanhamento por Parceiro"
+msgstr "Estatística de Cobrança por Parceiro"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -415,13 +416,12 @@ msgstr ""
 msgid ""
 "This field allow you to select a forecast date to plan your follow-ups"
 msgstr ""
-"Este campo permite escolher uma data prevista para planejar seus "
-"acompanhamentos"
+"Este campo permite escolher uma data futura para planejar suas cobranças"
 
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
-msgstr "Data de Envio do Acompanhamento"
+msgstr "Data para o Envio da Cobrança"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:56
@@ -437,17 +437,17 @@ msgstr "Configurações de Email"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
-msgstr "Imprimir Acompanhamentos"
+msgstr "Imprimir Cobranças"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
 msgid "Latest Follow-up"
-msgstr "Último Acompanhamento"
+msgstr "Última Cobrança"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup Statistics"
-msgstr "Estatísticas de Acompanhamento"
+msgstr "Estatísticas de Cobrança"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -514,7 +514,7 @@ msgstr "%(partner_name)s: Nome do Parceiro"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-Up lines"
-msgstr "Linhas de acompanhamento"
+msgstr "Linhas de Cobrança"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -537,7 +537,7 @@ msgstr "Tipo da Condição"
 #: model:ir.model,name:account_followup.model_account_followup_print
 #: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Followup & Send Mail to Customers"
-msgstr "Imprimir Acompanhamento e Enviar Email para os Clientes"
+msgstr "Imprimir Cobranças & Enviar email para os Clientes"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
@@ -548,7 +548,7 @@ msgstr "Última movimentação"
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Followup Report"
-msgstr "Relatório de Acompanhamento"
+msgstr "Relatório de Cobrança"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -564,7 +564,7 @@ msgstr "Período"
 #: code:addons/account_followup/wizard/account_followup_print.py:307
 #, python-format
 msgid "Followup Summary"
-msgstr "Resumo de Acompanhamento"
+msgstr "Resumo de Cobrança"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -580,7 +580,7 @@ msgstr "Litígio"
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
 msgid "Max Follow Up Level"
-msgstr "Máximo Nível de Acompanhamento"
+msgstr "Nível Máximo de Cobrança"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
@@ -590,7 +590,7 @@ msgstr "Rever as Cobranças de Pagamento"
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr "Empresa deve ser a mesma para a sua conta relacionada e período."
+msgstr "A Empresa deve ser a mesma para a conta e período"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form
@@ -641,7 +641,7 @@ msgstr "Incluindo os itens de diário marcados como em protesto"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Followup Level"
-msgstr "Nível de Acompanhamento"
+msgstr "Nível de Cobrança"
 
 #. module: account_followup
 #: field:account_followup.followup,description:0
@@ -683,12 +683,12 @@ msgstr "Itens Recebíveis"
 #: model:ir.actions.act_window,name:account_followup.action_followup_stat
 #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
 msgid "Follow-ups Sent"
-msgstr "Acompanhamentos Enviados"
+msgstr "Cobranças Enviadas"
 
 #. module: account_followup
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr "O nome da empresa deve ser único !"
+msgstr "O nome da empresa deve ser exclusivo!"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
@@ -791,7 +791,7 @@ msgstr "Ref Cliente :"
 #. module: account_followup
 #: field:account.followup.print.all,test_print:0
 msgid "Test Print"
-msgstr "Teste Impressão"
+msgstr "Testar Impressão"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -801,12 +801,12 @@ msgstr "%(partner_name)s: Nome do parceiro"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Latest Followup Date"
-msgstr "Última Data de Acompanhamento"
+msgstr "Data da Última Cobrança"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
-msgstr "Critérios de Acompanhamento"
+msgstr "Critérios de Cobrança"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
diff --git a/addons/account_followup/i18n/ro.po b/addons/account_followup/i18n/ro.po
index db0d29d4500..67050892367 100644
--- a/addons/account_followup/i18n/ro.po
+++ b/addons/account_followup/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/ru.po b/addons/account_followup/i18n/ru.po
index bd5ba04e76f..5e6c72ed8bc 100644
--- a/addons/account_followup/i18n/ru.po
+++ b/addons/account_followup/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/sl.po b/addons/account_followup/i18n/sl.po
index 1e71c4cb125..73c6f7d4b4f 100644
--- a/addons/account_followup/i18n/sl.po
+++ b/addons/account_followup/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/sq.po b/addons/account_followup/i18n/sq.po
index b44cd5c6f58..15ff34d7dbb 100644
--- a/addons/account_followup/i18n/sq.po
+++ b/addons/account_followup/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/sr.po b/addons/account_followup/i18n/sr.po
index 863e1ae1bbe..99d5b5298dd 100644
--- a/addons/account_followup/i18n/sr.po
+++ b/addons/account_followup/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/sr@latin.po b/addons/account_followup/i18n/sr@latin.po
index 5c5304b7509..07fd2bf0b0c 100644
--- a/addons/account_followup/i18n/sr@latin.po
+++ b/addons/account_followup/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/sv.po b/addons/account_followup/i18n/sv.po
index 5fff49b0020..9e633da349b 100644
--- a/addons/account_followup/i18n/sv.po
+++ b/addons/account_followup/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/tlh.po b/addons/account_followup/i18n/tlh.po
index 087c721d2f2..4f3ede77182 100644
--- a/addons/account_followup/i18n/tlh.po
+++ b/addons/account_followup/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index f896cda953c..12b059de47b 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/uk.po b/addons/account_followup/i18n/uk.po
index 29812d27719..40a8db37319 100644
--- a/addons/account_followup/i18n/uk.po
+++ b/addons/account_followup/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/vi.po b/addons/account_followup/i18n/vi.po
index 47338e5fe08..2e9dc2a22b2 100644
--- a/addons/account_followup/i18n/vi.po
+++ b/addons/account_followup/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po
index 460aefa1e9b..4c8e7cb29ac 100644
--- a/addons/account_followup/i18n/zh_CN.po
+++ b/addons/account_followup/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
diff --git a/addons/account_followup/i18n/zh_TW.po b/addons/account_followup/i18n/zh_TW.po
index 98081712fa6..42f222e7cd2 100644
--- a/addons/account_followup/i18n/zh_TW.po
+++ b/addons/account_followup/i18n/zh_TW.po
@@ -7,42 +7,42 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-24 12:49+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 msgid "Search Followup"
-msgstr ""
+msgstr "搜尋催款"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類方式..."
 
 #. module: account_followup
 #: view:res.company:0
 #: field:res.company,follow_up_msg:0
 msgid "Follow-up Message"
-msgstr "跟進訊息"
+msgstr "催款訊息"
 
 #. module: account_followup
 #: view:account_followup.followup:0
 #: field:account_followup.followup,followup_line:0
 msgid "Follow-Up"
-msgstr "跟進"
+msgstr "催款"
 
 #. module: account_followup
 #: help:account.followup.print.all,test_print:0
 msgid ""
 "Check if you want to print followups without changing followups level."
-msgstr ""
+msgstr "檢查催款等級沒有改變，如果你想要列印催款"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
@@ -67,6 +67,20 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"親愛的 %(partner_name)s,\n"
+"\n"
+"我們遺憾的看到，儘管已發送提醒，您的帳戶現在是嚴重逾期。\n"
+"\n"
+"重要的是立即付款，否則我們將不得不考慮將停止對您的帳戶，這意味著我們將不再能夠提供與貴公司（產品/服務）。\n"
+"\n"
+"請採取適當的措施，在未來的8天內付款\n"
+"\n"
+"如果有支付發票的問題，我們都沒有意識到，不要猶豫，聯繫我們的會計部門 (+32).10.68.94.39. 因此，我們可以迅速解決問題。\n"
+"\n"
+"下面印到期付款的細節。\n"
+"\n"
+"最好的問候，\n"
 
 #. module: account_followup
 #: field:account_followup.followup,company_id:0
@@ -84,89 +98,89 @@ msgstr "發票日期"
 #. module: account_followup
 #: field:account.followup.print.all,email_subject:0
 msgid "Email Subject"
-msgstr "電郵主旨"
+msgstr "電子郵件主題"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_followup_stat
 msgid ""
 "Follow up on the reminders sent over to your partners for unpaid invoices."
-msgstr ""
+msgstr "您的業務夥伴發送提醒後續未付發票."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
 msgid "Legend"
-msgstr ""
+msgstr "圖表"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow up Entries with period in current year"
-msgstr ""
+msgstr "在本年度期間跟分錄"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Ok"
-msgstr ""
+msgstr "確定"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Amount"
-msgstr ""
+msgstr "金額"
 
 #. module: account_followup
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "會計分錄中包含錯誤的借貸值！"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
 msgid "Net Days"
-msgstr "淨日數"
+msgstr "淨天數"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form
 #: model:ir.ui.menu,name:account_followup.account_followup_menu
 msgid "Follow-Ups"
-msgstr "跟進"
+msgstr "催款"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Balance > 0"
-msgstr ""
+msgstr "差額 > 0"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "借方合計"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
-msgstr ""
+msgstr "分錄日期不在所選期間內！可以修改憑證日期或在簿帳上去掉這個檢查項。"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(heading)s: Move line header"
-msgstr ""
+msgstr "%(heading)s: 移動抬頭"
 
 #. module: account_followup
 #: field:account.followup.print,followup_id:0
 msgid "Follow-up"
-msgstr "跟進"
+msgstr "催款"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "VAT:"
-msgstr "增埴稅(VAT):"
+msgstr "增值稅:"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,partner_id:0
 #: field:account_followup.stat.by.partner,partner_id:0
 msgid "Partner"
-msgstr "伙伴"
+msgstr "合夥人"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
@@ -176,18 +190,18 @@ msgstr "日期 :"
 #. module: account_followup
 #: field:account.followup.print.all,partner_ids:0
 msgid "Partners"
-msgstr "伙伴"
+msgstr "合夥人"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:142
 #, python-format
 msgid "Invoices Reminder"
-msgstr ""
+msgstr "發票提醒"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup
 msgid "Account Follow Up"
-msgstr ""
+msgstr "帳戶催款"
 
 #. module: account_followup
 #: selection:account_followup.followup.line,start:0
@@ -202,12 +216,12 @@ msgstr "非訴訟"
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(user_signature)s: User name"
-msgstr ""
+msgstr "%(user_signature)s: 用戶名"
 
 #. module: account_followup
 #: field:account_followup.stat,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "借方"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -215,49 +229,49 @@ msgid ""
 "This feature allows you to send reminders to partners with pending invoices. "
 "You can send them the default message for unpaid invoices or manually enter "
 "a message should you need to remind them of a specific information."
-msgstr ""
+msgstr "如果您需要一個特定的資訊此功能允許您向業務夥伴發送未付發票提醒，你可以向他們發送預設的訊息，或手動輸入訊息以提醒他們。"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Ref"
-msgstr "參考"
+msgstr "編號"
 
 #. module: account_followup
 #: help:account_followup.followup.line,sequence:0
 msgid "Gives the sequence order when displaying a list of follow-up lines."
-msgstr ""
+msgstr "輸入序列用於顯示催款列表."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: field:account.followup.print.all,email_body:0
 msgid "Email body"
-msgstr "電郵內容"
+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,date_followup:0
 #: field:account_followup.stat.by.partner,date_followup:0
 msgid "Latest followup"
-msgstr "最新跟進"
+msgstr "最近的催款"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Select Partners to Remind"
-msgstr ""
+msgstr "選擇業務夥伴，以提醒"
 
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
-msgstr ""
+msgstr "用業務夥伴的語言發送的電子郵件"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Partner Selection"
-msgstr ""
+msgstr "業務夥伴的選擇"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
@@ -275,11 +289,18 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"尊敬的 %(partner_name)s,\n"
+"\n"
+"下列金額尚未付款，如屬例外，那就是我們的錯誤. 請採取適當的措施，在未來的8天內付款\n"
+"\n"
+"如果您在收到此信前已經付款了，請忽略這封信。並與我們的會計部門聯繫。\n"
+"最好的祝福,\n"
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
 msgid "Printed Message"
-msgstr ""
+msgstr "Printed Message"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -288,18 +309,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_followup.action_account_followup_print_all
 #: model:ir.ui.menu,name:account_followup.account_followup_print_menu
 msgid "Send followups"
-msgstr ""
+msgstr "發送催款"
 
 #. module: account_followup
 #: view:account_followup.stat.by.partner:0
 msgid "Partner to Remind"
-msgstr ""
+msgstr "提醒業務夥伴"
 
 #. module: account_followup
 #: field:account_followup.followup.line,followup_id:0
 #: field:account_followup.stat,followup_id:0
 msgid "Follow Ups"
-msgstr "跟進"
+msgstr "催款"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:296
@@ -309,6 +330,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"所有的郵件已成功發送至合作傢伴:.\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: constraint:account_followup.followup.line:0
@@ -316,6 +340,8 @@ msgid ""
 "Your description is invalid, use the right legend or %% if you want to use "
 "the percent character."
 msgstr ""
+"Your description is invalid, use the right legend or %% if you want to use "
+"the percent character."
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -323,7 +349,7 @@ msgid ""
 "The selected account of your Journal Entry forces to provide a secondary "
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
-msgstr ""
+msgstr "分錄上的科目要求輸入一個外幣。你可以在科目設置中去掉這個外幣或在帳簿設置上選擇一個支持多幣別的輸入界面。"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -333,17 +359,17 @@ msgstr "發送郵件"
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner
 msgid "Followup Statistics by Partner"
-msgstr ""
+msgstr "通過夥伴的催款統計"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Message"
-msgstr ""
+msgstr "訊息"
 
 #. module: account_followup
 #: field:account_followup.stat,blocked:0
 msgid "Blocked"
-msgstr "封鎖"
+msgstr "已封鎖"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:299
@@ -355,78 +381,83 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"\n"
+"\n"
+"郵件成功發送至以下合作傢伴 !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: help:account.followup.print,date:0
 msgid ""
 "This field allow you to select a forecast date to plan your follow-ups"
-msgstr ""
+msgstr "此欄位，讓你選擇一個計劃催款的預測日期"
 
 #. module: account_followup
 #: field:account.followup.print,date:0
 msgid "Follow-up Sending Date"
-msgstr ""
+msgstr "催款發送日期"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:56
 #, python-format
 msgid "Select Partners"
-msgstr ""
+msgstr "選擇業務夥伴"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Email Settings"
-msgstr "電郵設定"
+msgstr "設置電子郵件"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "Print Follow Ups"
-msgstr ""
+msgstr "列印催款"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
 msgid "Latest Follow-up"
-msgstr "最新跟進"
+msgstr "最近的催款"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_stat
 msgid "Followup Statistics"
-msgstr "跟進統計"
+msgstr "催款統計"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(user_signature)s: User Name"
-msgstr ""
+msgstr "%(user_signature)s: 用戶名"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "借貸項"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "借貸項不能使用視圖類型的科目"
 
 #. module: account_followup
 #: field:account.followup.print.all,email_conf:0
 msgid "Send email confirmation"
-msgstr "發送電郵確認"
+msgstr "確認發送電子郵件"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Total:"
-msgstr ""
+msgstr "總計:"
 
 #. module: account_followup
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "錯誤！您不能建立循環的公司."
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_name)s: User's Company name"
-msgstr ""
+msgstr "%(company_name)s: 使用者公司名稱"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_res_company
@@ -442,72 +473,72 @@ msgstr "摘要"
 #. module: account_followup
 #: field:account_followup.stat,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "貸方"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "到期日"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(partner_name)s: Partner Name"
-msgstr ""
+msgstr "%(partner_name)s: 業務夥伴名稱"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Follow-Up lines"
-msgstr "跟進明細"
+msgstr "催款明細"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(company_currency)s: User's Company Currency"
-msgstr ""
+msgstr "%(company_currency)s: 使用者公司貨幣"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: field:account_followup.stat,balance:0
 #: field:account_followup.stat.by.partner,balance:0
 msgid "Balance"
-msgstr "結餘"
+msgstr "餘額"
 
 #. module: account_followup
 #: field:account_followup.followup.line,start:0
 msgid "Type of Term"
-msgstr "條款類型"
+msgstr "條件類型"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_print
 #: model:ir.model,name:account_followup.model_account_followup_print_all
 msgid "Print Followup & Send Mail to Customers"
-msgstr ""
+msgstr "列印催款和發送郵件給客戶"
 
 #. module: account_followup
 #: field:account_followup.stat,date_move_last:0
 #: field:account_followup.stat.by.partner,date_move_last:0
 msgid "Last move"
-msgstr "最後行動"
+msgstr "最近"
 
 #. module: account_followup
 #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report
 msgid "Followup Report"
-msgstr "跟進報告"
+msgstr "催款報表"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Steps"
-msgstr ""
+msgstr "催款步驟"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "會計期間"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:307
 #, python-format
 msgid "Followup Summary"
-msgstr ""
+msgstr "催款摘要"
 
 #. module: account_followup
 #: view:account.followup.print:0
@@ -518,22 +549,22 @@ msgstr "取消"
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Litigation"
-msgstr "訴訟"
+msgstr "有爭議"
 
 #. module: account_followup
 #: field:account_followup.stat.by.partner,max_followup_id:0
 msgid "Max Follow Up Level"
-msgstr "最高跟進層次"
+msgstr "最高催款等級"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
 msgid "Review Invoicing Follow-Ups"
-msgstr ""
+msgstr "檢視發票催款"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "科目和期間必須屬於同一個公司"
 
 #. module: account_followup
 #: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form
@@ -543,11 +574,13 @@ msgid ""
 "code to adapt the email content to the good context (good name, good date) "
 "and you can manage the multi language of messages."
 msgstr ""
+"定義催款等級和他們相關訊息和延遲。對於每個步驟，指定延遲的訊息和天數。使用圖例以了解使用的代碼，以適應電子郵件內容的良好環境（好名字，好日期），你可以管理"
+"多國語言的郵件。"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
 msgid "Payable Items"
-msgstr ""
+msgstr "應付款"
 
 #. module: account_followup
 #: code:addons/account_followup/wizard/account_followup_print.py:298
@@ -557,27 +590,30 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"電子郵件無法發送給以下的業務夥伴, 電子郵件尚未提供 !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(followup_amount)s: Total Amount Due"
-msgstr ""
+msgstr "%(followup_amount)s: 總應付金額"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 #: view:account_followup.followup.line:0
 msgid "%(date)s: Current Date"
-msgstr "%(date)s: 當前日期"
+msgstr "%(date)s: 現在日期"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Including journal entries marked as a litigation"
-msgstr ""
+msgstr "包括訴訟標記的帳簿分錄"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Followup Level"
-msgstr "跟進層次"
+msgstr "催款等級"
 
 #. module: account_followup
 #: field:account_followup.followup,description:0
@@ -588,41 +624,41 @@ msgstr "說明"
 #. module: account_followup
 #: constraint:account_followup.followup:0
 msgid "Only One Followup by Company."
-msgstr ""
+msgstr "公司目前只有一筆催款."
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "This Fiscal year"
-msgstr "本財政年度"
+msgstr "本會計年度"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Partner entries"
-msgstr ""
+msgstr "業務夥伴分錄"
 
 #. module: account_followup
 #: help:account.followup.print.all,partner_lang:0
 msgid ""
 "Do not change message text, if you want to send email in partner language, "
 "or configure from company"
-msgstr ""
+msgstr "不要改變訊息文字，如果你想要在公司用業務夥伴的語言或設置發送電子郵件"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
 msgid "Receivable Items"
-msgstr ""
+msgstr "應收款"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 #: model:ir.actions.act_window,name:account_followup.action_followup_stat
 #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow
 msgid "Follow-ups Sent"
-msgstr ""
+msgstr "發送催款"
 
 #. module: account_followup
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "公司名稱必須唯一！"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
@@ -634,32 +670,32 @@ msgstr "名稱"
 #: field:account_followup.stat,date_move:0
 #: field:account_followup.stat.by.partner,date_move:0
 msgid "First move"
-msgstr "首個行動"
+msgstr "首先"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Li."
-msgstr "訴訟"
+msgstr "Li."
 
 #. module: account_followup
 #: view:account.followup.print:0
 msgid "Continue"
-msgstr "繼續"
+msgstr "下一步"
 
 #. module: account_followup
 #: field:account_followup.followup.line,delay:0
 msgid "Days of delay"
-msgstr "延誤日子"
+msgstr "拖延天數"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Document : Customer account statement"
-msgstr ""
+msgstr "文件 : 客戶帳戶對帳單"
 
 #. module: account_followup
 #: view:account.move.line:0
 msgid "Total credit"
-msgstr ""
+msgstr "貸方合計"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
@@ -680,51 +716,63 @@ msgid ""
 "\n"
 "Best Regards,\n"
 msgstr ""
+"\n"
+"親愛的 %(partner_name)s,\n"
+"\n"
+"儘管多次提醒，您的帳戶仍然沒有得到解決。\n"
+"\n"
+"除非在接下來的8天內全額付款，不然將採取法律行動追討債務，恕不另行通知。\n"
+"\n"
+"我相信，這一行動將被證明是不必要的，下面列印已到期付款的明細。\n"
+"\n"
+"在有關此事的任何疑問的情況下，不要猶豫，聯繫我們的會計部門 (+32).10.68.94.39.\n"
+"\n"
+"最好的祝福,\n"
 
 #. module: account_followup
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "憑證上不能使用已關閉的科目"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(line)s: Ledger Posting lines"
-msgstr ""
+msgstr "%(line)s: 分類帳過帳明細"
 
 #. module: account_followup
 #: field:account_followup.followup.line,sequence:0
 msgid "Sequence"
-msgstr "次序"
+msgstr "序列"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "%(company_name)s: User's Company Name"
-msgstr ""
+msgstr "%(company_name)s: 用戶的公司名稱"
 
 #. module: account_followup
 #: report:account_followup.followup.print:0
 msgid "Customer Ref :"
-msgstr "客戶參考 :"
+msgstr "客戶 :"
 
 #. module: account_followup
 #: field:account.followup.print.all,test_print:0
 msgid "Test Print"
-msgstr ""
+msgstr "測試列印"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
 msgid "%(partner_name)s: Partner name"
-msgstr "%(partner_name)s: 伙伴名稱"
+msgstr "%(partner_name)s: 業務夥伴名稱"
 
 #. module: account_followup
 #: view:account_followup.stat:0
 msgid "Latest Followup Date"
-msgstr "最後跟進日期"
+msgstr "最近催款日期"
 
 #. module: account_followup
 #: model:ir.model,name:account_followup.model_account_followup_followup_line
 msgid "Follow-Up Criteria"
-msgstr ""
+msgstr "催款標準"
 
 #~ msgid "Currency"
 #~ msgstr "貨幣"
diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index 8d64ce30f6b..593430691aa 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -30,7 +30,6 @@ class report_rappel(report_sxw.rml_parse):
         self.localcontext.update({
             'time': time,
             'ids_to_objects': self._ids_to_objects,
-            'adr_get': self._adr_get,
             'getLines': self._lines_get,
             'get_text': self._get_text
         })
@@ -43,11 +42,6 @@ class report_rappel(report_sxw.rml_parse):
                 all_lines.append(line)
         return all_lines
 
-    def _adr_get(self, stat_line, type):
-        res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
-        adr = res_partner.address_get(self.cr, self.uid, [stat_line.partner_id.id], [type])[type]
-        return adr and res_partner.read(self.cr, self.uid, [adr]) or [{}]
-
     def _lines_get(self, stat_by_partner_line):
         pool = pooler.get_pool(self.cr.dbname)
         moveline_obj = pool.get('account.move.line')
diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml
index 3d096ecf3ac..7f2242991de 100644
--- a/addons/account_followup/report/account_followup_print.rml
+++ b/addons/account_followup/report/account_followup_print.rml
@@ -129,15 +129,10 @@
     <blockTable colWidths="298.0,234.0" style="Tableau2">
       <tr>
         <td>
-          <para style="terp_default_9">[[ repeatIn(adr_get(o,'invoice'),'a' )]]</para>
         </td>
         <td>
           <para style="terp_default_9">[[ o.partner_id.name or '' ]]</para>
-          <para style="terp_default_9">[[ a['street'] or '']]</para>
-          <para style="terp_default_9">[[ a['street2'] or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[ a['zip'] or '' ]] [[ a['city'] or '' ]]</para>
-          <para style="terp_default_9">[[( a['state_id'] and a['state_id'][1]) or removeParentNode('para') ]]</para>
-          <para style="terp_default_9">[[( a['country_id'] and a['country_id'][1]) or '']]</para>
+          <para style="terp_default_9">[[ display_address(o.partner_id) or '']]</para>
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
diff --git a/addons/account_followup/wizard/__init__.py b/addons/account_followup/wizard/__init__.py
index aea714d2a86..ad072c5b7d8 100644
--- a/addons/account_followup/wizard/__init__.py
+++ b/addons/account_followup/wizard/__init__.py
@@ -21,4 +21,4 @@
 
 import account_followup_print
 
-# 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_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index d151d2171a4..5791bacbed0 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -209,12 +209,10 @@ class account_followup_print_all(osv.osv_memory):
                 to_update[str(id)]= {'level': fups[followup_line_id][1], 'partner_id': stat_line_id}
         return {'partner_ids': partner_list, 'to_update': to_update}
 
-    def do_mail(self ,cr, uid, ids, context=None):
+    def do_mail(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         move_obj = self.pool.get('account.move.line')
         user_obj = self.pool.get('res.users')
-        line_obj = self.pool.get('account_followup.stat')
-        mail_message = self.pool.get('mail.message')
 
         if context is None:
             context = {}
@@ -235,13 +233,7 @@ class account_followup_print_all(osv.osv_memory):
                     total_amt += line.debit - line.credit
                 dest = False
                 if partner:
-                    if partner.type=='contact':
-                        if adr.email:
-                            dest = [partner.email]
-                    if (not dest) and partner.type=='default':
-                        if partner.email:
-                            dest = [partner.email]
-                src = tools.config.options['email_from']
+                    dest = [partner.email]
                 if not data.partner_lang:
                     body = data.email_body
                 else:
@@ -281,7 +273,12 @@ class account_followup_print_all(osv.osv_memory):
                 msg = ''
                 if dest:
                     try:
-                        mail_message.schedule_with_attach(cr, uid, src, dest, sub, body, context=context)
+                        vals = {'state': 'outgoing',
+                                'subject': sub,
+                                'body_html': '<pre>%s</pre>' % body,
+                                'email_to': dest,
+                                'email_from': data_user.email or tools.config.options['email_from']}
+                        self.pool.get('mail.mail').create(cr, uid, vals, context=context)
                         msg_sent += partner.name + '\n'
                     except Exception, e:
                         raise osv.except_osv('Error !', e )
diff --git a/addons/account_payment/__init__.py b/addons/account_payment/__init__.py
index 6188de6a9da..82a05aa73e9 100644
--- a/addons/account_payment/__init__.py
+++ b/addons/account_payment/__init__.py
@@ -29,4 +29,4 @@ import account_move_line
 import account_invoice
 import report
 
-# 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_payment/__openerp__.py b/addons/account_payment/__openerp__.py
index 9e7209a348e..66d0201b2fe 100644
--- a/addons/account_payment/__openerp__.py
+++ b/addons/account_payment/__openerp__.py
@@ -20,26 +20,31 @@
 ##############################################################################
 
 {
-    "name": "Suppliers Payment Management",
-    "version": "1.1",
-    "author": "OpenERP SA",
-    "category": "Accounting & Finance",
-    "description": """
+    'name': 'Suppliers Payment Management',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'category': 'Accounting & Finance',
+    'description': """
 Module to manage the payment of your supplier invoices.
 =======================================================
 
-This module allows you to create and manage your payment orders, with purposes to 
+This module allows you to create and manage your payment orders, with purposes to
+--------------------------------------------------------------------------------- 
     * serve as base for an easy plug-in of various automated payment mechanisms.
     * provide a more efficient way to manage invoice payment.
 
 Warning:
---------
-The confirmation of a payment order does _not_ create accounting entries, it just records the fact that you gave your payment order to your bank. The booking of your order must be encoded as usual through a bank statement. Indeed, it's only when you get the confirmation from your bank that your order has been accepted that you can book it in your accounting. To help you with that operation, you have a new option to import payment orders as bank statement lines.
+~~~~~~~~
+The confirmation of a payment order does _not_ create accounting entries, it just 
+records the fact that you gave your payment order to your bank. The booking of 
+your order must be encoded as usual through a bank statement. Indeed, it's only 
+when you get the confirmation from your bank that your order has been accepted 
+that you can book it in your accounting. To help you with that operation, you 
+have a new option to import payment orders as bank statement lines.
     """,
     'images': ['images/payment_mode.jpeg','images/payment_order.jpeg'],
     'depends': ['account','account_voucher'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/account_payment_security.xml',
         'security/ir.model.access.csv',
         'wizard/account_payment_pay_view.xml',
@@ -51,7 +56,7 @@ The confirmation of a payment order does _not_ create accounting entries, it jus
         'account_invoice_view.xml',
         'account_payment_report.xml',
     ],
-    'demo_xml': ['account_payment_demo.xml'],
+    'demo': ['account_payment_demo.xml'],
     'test': [
         'test/account_payment_demo.yml',
         'test/cancel_payment_order.yml',
@@ -60,6 +65,5 @@ The confirmation of a payment order does _not_ create accounting entries, it jus
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0061703998541',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py
index fd787863c7d..7138540fa3b 100644
--- a/addons/account_payment/account_invoice.py
+++ b/addons/account_payment/account_invoice.py
@@ -50,4 +50,4 @@ class Invoice(osv.osv):
 
 Invoice()
 
-# 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_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index cbbeb949b3c..047b472e53b 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -26,7 +26,7 @@ from tools.translate import _
 class account_move_line(osv.osv):
     _inherit = "account.move.line"
 
-    def amount_to_pay(self, cr, uid, ids, name, arg={}, context=None):
+    def amount_to_pay(self, cr, uid, ids, name, arg=None, context=None):
         """ Return the amount still to pay regarding all the payemnt orders
         (excepting cancelled orders)"""
         if not ids:
@@ -117,4 +117,4 @@ class account_move_line(osv.osv):
 
 account_move_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/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 1d4c46df029..84eeddfb5db 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -19,11 +19,14 @@
 #
 ##############################################################################
 
+import logging
 import time
 
 from osv import osv, fields
 import netsvc
 
+_logger = logging.getLogger(__name__)
+
 class payment_mode(osv.osv):
     _name= 'payment.mode'
     _description= 'Payment Mode'
@@ -70,9 +73,7 @@ class payment_order(osv.osv):
 
     #dead code
     def get_wizard(self, type):
-        logger = netsvc.Logger()
-        logger.notifyChannel("Warning!", netsvc.LOG_WARNING,
-                "No wizard is found for the payment type '%s'." % type)
+        _logger.warning("No wizard found for the payment type '%s'.", type)
         return None
 
     def _total(self, cursor, user, ids, name, args, context=None):
@@ -95,7 +96,7 @@ class payment_order(osv.osv):
             ('cancel', 'Cancelled'),
             ('open', 'Confirmed'),
             ('done', 'Done')], 'Status', select=True,
-            help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'),
+            help='When an order is placed the status is \'Draft\'.\n Once the bank is confirmed the status is set to \'Confirmed\'.\n Then the order is paid the status is \'Done\'.'),
         'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}),
         'total': fields.function(_total, string="Total", type='float'),
         'user_id': fields.many2one('res.users', 'Responsible', required=True, states={'done': [('readonly', True)]}),
@@ -139,7 +140,9 @@ class payment_order(osv.osv):
         wf_service.trg_validate(uid, 'payment.order', ids[0], 'done', cr)
         return True
 
-    def copy(self, cr, uid, id, default={}, context=None):
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
         default.update({
             'state': 'draft',
             'line_ids': [],
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index e3e9b2ae558..4d69c2d7315 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -30,8 +30,8 @@
                     <field name="debit" sum="Total debit"/>
                     <field name="credit" sum="Total credit"/>
                     <field name="amount_to_pay"/>
-                    <field name="amount_currency"/>
-                    <field name="currency_id"/>
+                    <field name="amount_currency" groups="base.group_multi_currency"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="period_id" invisible="1"/>
                 </tree>
             </field>
@@ -131,8 +131,8 @@
                                         <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode,parent.date_prefered,parent.date_scheduled,currency,company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)] "/>
                                         <separator colspan="4" string="Transaction Information"/>
                                         <field name="date"/>
-                                        <label for="amount_currency"/>
-                                        <div>
+                                        <label for="amount_currency" groups="base.group_multi_currency"/>
+                                        <div groups="base.group_multi_currency">
                                             <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
                                             <field name="currency" nolabel="1" class="oe_inline"/>
                                         </div>
@@ -151,8 +151,8 @@
                                 </page>
                                 <page string="Information">
                                     <group col="4" string="General Information">
-                                        <label for="amount"/>
-                                        <div>
+                                        <label for="amount" groups="base.group_multi_currency"/>
+                                        <div groups="base.group_multi_currency">
                                             <field name="amount" class="oe_inline"/>
                                             <field name="company_currency" class="oe_inline"/>
                                         </div>
@@ -171,8 +171,8 @@
                             <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                             <field name="ml_maturity_date"/>
                             <field name="date"/>
-                            <field name="amount_currency" string="Amount"/>
-                            <field name="currency"/>
+                            <field name="amount_currency" string="Amount" groups="base.group_multi_currency"/>
+                            <field name="currency" groups="base.group_multi_currency"/>
                             <field name="name"/>
                             <field name="amount" sum="Total in Company Currency" invisible="1"/>
                         </tree>
@@ -257,8 +257,8 @@
                                 <field name="move_line_id" on_change="onchange_move_line(move_line_id, False, currency, company_currency)" domain="[('reconcile_id','=', False), ('credit', '>',0),('amount_to_pay','>',0)]"/>
                                 <separator colspan="4" string="Transaction Information"/>
                                 <field name="date"/>
-                                <label for="amount_currency"/>
-                                <div>
+                                <label for="amount_currency" groups="base.group_multi_currency"/>
+                                <div groups="base.group_multi_currency">
                                     <field name="amount_currency" on_change="onchange_amount(amount_currency,currency,company_currency)" class="oe_inline"/>
                                     <field name="currency" class="oe_inline"/>
                                 </div>
@@ -277,8 +277,11 @@
                         </page>
                         <page string="Information">
                             <group col="4" string="General Information">
-                                <field name="amount"/>
-                                <field name="company_currency" nolabel="1"/>
+                                <label for="amoun"/>
+                                <div>
+                                    <field name="amount" class="oe_inline"/>
+                                    <field name="company_currency" class="oe_inline"/>
+                                </div>
                             </group>
                             <group col="4" string="Entry Information">
                                 <field name="create_date"/>
@@ -302,8 +305,8 @@
                     <field name="partner_id"/>
                     <field name="communication"/>
                     <field name="amount" sum="Amount Total"/>
-                    <field name="amount_currency" sum="Currency Amount Total"/>
-                    <field name="currency"/>
+                    <field name="amount_currency" sum="Currency Amount Total" groups="base.group_multi_currency"/>
+                    <field name="currency" groups="base.group_multi_currency"/>
                     <field name="bank_id" domain="[('partner_id', '=', partner_id)]"/>
                     <field name="move_line_id" on_change="onchange_move_line(move_line_id,parent.mode)"/>
                     <field name="create_date"/>
diff --git a/addons/account_payment/i18n/am.po b/addons/account_payment/i18n/am.po
index cdff07a1d48..26359786873 100644
--- a/addons/account_payment/i18n/am.po
+++ b/addons/account_payment/i18n/am.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ar.po b/addons/account_payment/i18n/ar.po
index 4da0565ae04..08f79fe837f 100644
--- a/addons/account_payment/i18n/ar.po
+++ b/addons/account_payment/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/bg.po b/addons/account_payment/i18n/bg.po
index 383f94a8dd3..6a9ec94a781 100644
--- a/addons/account_payment/i18n/bg.po
+++ b/addons/account_payment/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/bs.po b/addons/account_payment/i18n/bs.po
index efe3f38cad6..3339cb2e69d 100644
--- a/addons/account_payment/i18n/bs.po
+++ b/addons/account_payment/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ca.po b/addons/account_payment/i18n/ca.po
index a84f8012838..50053252009 100644
--- a/addons/account_payment/i18n/ca.po
+++ b/addons/account_payment/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/cs.po b/addons/account_payment/i18n/cs.po
index 3c75dc1f81d..1d03b58d3bb 100644
--- a/addons/account_payment/i18n/cs.po
+++ b/addons/account_payment/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/da.po b/addons/account_payment/i18n/da.po
index 06a360cf94b..6aca81b0445 100644
--- a/addons/account_payment/i18n/da.po
+++ b/addons/account_payment/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po
index 336eb3e41cc..0e1054bd485 100644
--- a/addons/account_payment/i18n/de.po
+++ b/addons/account_payment/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/el.po b/addons/account_payment/i18n/el.po
index e14c3ec9369..38cefc44404 100644
--- a/addons/account_payment/i18n/el.po
+++ b/addons/account_payment/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es.po b/addons/account_payment/i18n/es.po
index af303b2da58..6b738572058 100644
--- a/addons/account_payment/i18n/es.po
+++ b/addons/account_payment/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es_AR.po b/addons/account_payment/i18n/es_AR.po
index 43eccde767e..7ceb0f5e254 100644
--- a/addons/account_payment/i18n/es_AR.po
+++ b/addons/account_payment/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es_CL.po b/addons/account_payment/i18n/es_CL.po
index 5bcfc3c3402..8588df21d53 100644
--- a/addons/account_payment/i18n/es_CL.po
+++ b/addons/account_payment/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es_CR.po b/addons/account_payment/i18n/es_CR.po
index 2fc5e479428..5d606cef3d4 100644
--- a/addons/account_payment/i18n/es_CR.po
+++ b/addons/account_payment/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/es_EC.po b/addons/account_payment/i18n/es_EC.po
index 91ee05f2c15..83ee21a4bd1 100644
--- a/addons/account_payment/i18n/es_EC.po
+++ b/addons/account_payment/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/es_PY.po b/addons/account_payment/i18n/es_PY.po
index 0e9907a9b2c..dbc5150bf61 100644
--- a/addons/account_payment/i18n/es_PY.po
+++ b/addons/account_payment/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/et.po b/addons/account_payment/i18n/et.po
index 6d602e1afc7..e7d7d8baa6c 100644
--- a/addons/account_payment/i18n/et.po
+++ b/addons/account_payment/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/fa.po b/addons/account_payment/i18n/fa.po
index 589d0d70800..9755b0f835b 100644
--- a/addons/account_payment/i18n/fa.po
+++ b/addons/account_payment/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/fi.po b/addons/account_payment/i18n/fi.po
index 1047ad36f80..6357c2c2622 100644
--- a/addons/account_payment/i18n/fi.po
+++ b/addons/account_payment/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/fr.po b/addons/account_payment/i18n/fr.po
index 8103582191f..a253437a2ad 100644
--- a/addons/account_payment/i18n/fr.po
+++ b/addons/account_payment/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: view:account.move.line:0
diff --git a/addons/account_payment/i18n/gl.po b/addons/account_payment/i18n/gl.po
index 58612b36752..6ceff9c3298 100644
--- a/addons/account_payment/i18n/gl.po
+++ b/addons/account_payment/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/hi.po b/addons/account_payment/i18n/hi.po
index fad17d86886..62409c46d51 100644
--- a/addons/account_payment/i18n/hi.po
+++ b/addons/account_payment/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/hr.po b/addons/account_payment/i18n/hr.po
index 1d3b242fcfe..975f600d4b5 100644
--- a/addons/account_payment/i18n/hr.po
+++ b/addons/account_payment/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/hu.po b/addons/account_payment/i18n/hu.po
index 5dde8ca6903..6cf5d93741c 100644
--- a/addons/account_payment/i18n/hu.po
+++ b/addons/account_payment/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/id.po b/addons/account_payment/i18n/id.po
index e8c991b1d4b..aba66bf2070 100644
--- a/addons/account_payment/i18n/id.po
+++ b/addons/account_payment/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/it.po b/addons/account_payment/i18n/it.po
index 6baa529016d..396f74831b5 100644
--- a/addons/account_payment/i18n/it.po
+++ b/addons/account_payment/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ja.po b/addons/account_payment/i18n/ja.po
index 43a2ad83c8f..fb2f9ac7f8c 100644
--- a/addons/account_payment/i18n/ja.po
+++ b/addons/account_payment/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ko.po b/addons/account_payment/i18n/ko.po
index 7667f77ed96..50e4b4e120e 100644
--- a/addons/account_payment/i18n/ko.po
+++ b/addons/account_payment/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index 4df5a8fb489..37ab0a39e2c 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/lv.po b/addons/account_payment/i18n/lv.po
index a8592eb846e..3895cde262c 100644
--- a/addons/account_payment/i18n/lv.po
+++ b/addons/account_payment/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -62,6 +62,9 @@ msgid ""
 " Once the bank is confirmed the state is set to 'Confirmed'.\n"
 " Then the order is paid the state is 'Done'."
 msgstr ""
+"Kad maksājuma uzdevums ir atzīmēts kā \"Melnraksts\".\n"
+" Tiklīdz banka to ir apstiprinājusi, tas tiek atzīmēts kā \"Apstiprināts\"\n"
+" Kad maksājuma uzdevums ir apmaksāts, tas tiek atzīmēts kā \"Pabeigts\"."
 
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
@@ -69,6 +72,8 @@ msgid ""
 "The amount which should be paid at the current date\n"
 "minus the amount which is already in payment order"
 msgstr ""
+"Summa, kura jāapmaksā pašreizējā datumā\n"
+"bez summas, kura jau ir maksājuma uzdevumā"
 
 #. module: account_payment
 #: field:payment.line,company_id:0
@@ -117,7 +122,7 @@ msgstr "Konta Ieraksta Rinda"
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "_Add to payment order"
-msgstr ""
+msgstr "_Pievienot maksājuma uzdevumam"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
@@ -160,7 +165,7 @@ msgstr "Atsauce"
 #. module: account_payment
 #: sql_constraint:payment.line:0
 msgid "The payment line name must be unique!"
-msgstr ""
+msgstr "Maksājuma rindas nosaukumam jābūt unikālam!"
 
 #. module: account_payment
 #: constraint:account.invoice:0
@@ -257,6 +262,10 @@ msgid ""
 "by you.'Directly' stands for the direct execution.'Due date' stands for the "
 "scheduled date of execution."
 msgstr ""
+"Izvēlēties opciju Maksājuma uzdevumam:\r\n"
+"\"Noteikts\" apzīmē jūsu norādīto datumu.\r\n"
+"\"Tieši\" apzīmē tiešo izpildi.\r\n"
+"\"Apmaksas termiņš\" apzīmē izpildei plānoto datumu."
 
 #. module: account_payment
 #: code:addons/account_payment/account_move_line.py:110
@@ -277,7 +286,7 @@ msgstr "Izpildes datums"
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "Maksājuma Režīma Bankas vai Kases Žurnāls"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -293,7 +302,7 @@ msgstr "Mērķa Konts"
 #. module: account_payment
 #: view:payment.line:0
 msgid "Desitination Account"
-msgstr ""
+msgstr "Mērķa Konts"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -376,6 +385,7 @@ msgid ""
 "If no payment date is specified, the bank will treat this payment line "
 "directly"
 msgstr ""
+"Ja maksājuma datums nav norādīts, banka apstrādās maksājuma rindu tiešā veidā"
 
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_populate_statement
@@ -390,7 +400,7 @@ msgstr "Maksājuma Režīms"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Value Date"
-msgstr ""
+msgstr "Valutācijas Datums"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -437,7 +447,7 @@ msgstr "Kredīta summa"
 #. module: account_payment
 #: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
-msgstr ""
+msgstr "Izvēlēties datumu, ja Vēlamajam Datumam jābūt noteiktam."
 
 #. module: account_payment
 #: field:payment.order,user_id:0
@@ -495,7 +505,7 @@ msgstr "Izveides datums"
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "ADD"
-msgstr ""
+msgstr "Pievienot"
 
 #. module: account_payment
 #: view:account.bank.statement:0
@@ -600,7 +610,7 @@ msgstr ""
 #. module: account_payment
 #: help:payment.line,amount:0
 msgid "Payment amount in the company currency"
-msgstr ""
+msgstr "Maksājuma summa uzņēmuma valūtā"
 
 #. module: account_payment
 #: view:payment.order.create:0
@@ -654,7 +664,7 @@ msgstr "Maksājums"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Payment Order / Payment"
-msgstr ""
+msgstr "Maksājuma Uzdevums / Maksājums"
 
 #. module: account_payment
 #: field:payment.line,move_line_id:0
@@ -723,7 +733,7 @@ msgstr ""
 #. module: account_payment
 #: help:payment.mode,bank_id:0
 msgid "Bank Account for the Payment Mode"
-msgstr ""
+msgstr "Maksājuma Režīma Bankas Konts"
 
 #~ msgid "You can not create move line on closed account."
 #~ msgstr "Nav iespējams veikt grāmatojumus slēgtā kontā."
diff --git a/addons/account_payment/i18n/mn.po b/addons/account_payment/i18n/mn.po
index 3a9951574bc..dc747807e08 100644
--- a/addons/account_payment/i18n/mn.po
+++ b/addons/account_payment/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -62,9 +62,9 @@ msgid ""
 " Once the bank is confirmed the state is set to 'Confirmed'.\n"
 " Then the order is paid the state is 'Done'."
 msgstr ""
-"Захиалга үүсгэгдсэн дараагаараа 'Ноорог' төлөвтэй байдаг.\n"
+"Төлбөрийн баримт үүсэхдээ 'Ноорог' төлөвтэй байна.\n"
 " Банк баталгаажуулсан дараа төлөв нь 'Батлагдсан' төлөвтэй болдог.\n"
-" Дараа нь төлөлгдсөн дараа төлөв нь 'Хийгдсэн' болдог."
+" Улмаар төлбөр төлөлт бүртгэгдэхэд төлөв нь 'Дууссан' болно."
 
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
@@ -112,7 +112,7 @@ msgstr "Ашиглагдсан Данс"
 #: field:payment.line,ml_maturity_date:0
 #: field:payment.order.create,duedate:0
 msgid "Due Date"
-msgstr "Товлосон огноо"
+msgstr "Эцсийн огноо"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -264,9 +264,9 @@ msgid ""
 "by you.'Directly' stands for the direct execution.'Due date' stands for the "
 "scheduled date of execution."
 msgstr ""
-"Төлбөрийн баримтыг тохируулах: 'Тогтсон' гэдэг нь таны заасан огноо. 'Шууд' "
-"гэдэг нь шууд гүйцэтгэнэ. 'Товлосон огноо' гэдэг нь гүйцэтгэх өдрийг "
-"төлөвлөхийг илэрхийлнэ."
+"Төлбөр төлөлтийн тохируулга: 'Тогтмол' гэдэг нь таны урьдаас тохируулсан "
+"огноо. 'Шууд' гэдэг нь шууд гүйцэтгэнэ. 'Эцсийн огноо' гэдэг нь төлөвлөсөн "
+"огноогоор гүйцэтгэгдэнэ."
 
 #. module: account_payment
 #: code:addons/account_payment/account_move_line.py:110
@@ -282,7 +282,7 @@ msgstr "Нийт дебит"
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution date"
-msgstr "Гүйцэтгэх огноо"
+msgstr "Биелсэн огноо"
 
 #. module: account_payment
 #: help:payment.mode,journal:0
@@ -350,7 +350,7 @@ msgstr "Банкны тайлан тэнцлийн мөр"
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Due date"
-msgstr "Товлосон огноо"
+msgstr "Эцсийн огноо"
 
 #. module: account_payment
 #: field:account.invoice,amount_to_pay:0
@@ -549,7 +549,7 @@ msgstr "Компаний хэмжээнд нэхэмжлэлийн дугаар
 #. module: account_payment
 #: field:payment.line,name:0
 msgid "Your Reference"
-msgstr "Таны дугаар"
+msgstr "Таны холбогдол"
 
 #. module: account_payment
 #: view:payment.order:0
diff --git a/addons/account_payment/i18n/nb.po b/addons/account_payment/i18n/nb.po
index 13f0b550741..25d70b4d922 100644
--- a/addons/account_payment/i18n/nb.po
+++ b/addons/account_payment/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -30,12 +30,12 @@ msgstr "Leverandørs valuta"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Set to draft"
-msgstr ""
+msgstr "Satt Til UTKAST."
 
 #. module: account_payment
 #: help:payment.order,mode:0
 msgid "Select the Payment Mode to be applied."
-msgstr ""
+msgstr "Velg betaling modul som skal brukes."
 
 #. module: account_payment
 #: view:payment.mode:0
@@ -53,7 +53,7 @@ msgstr "Betalingslinjer"
 #: field:payment.line,info_owner:0
 #: view:payment.order:0
 msgid "Owner Account"
-msgstr ""
+msgstr "Eier Til kontoen"
 
 #. module: account_payment
 #: help:payment.order,state:0
@@ -62,6 +62,9 @@ msgid ""
 " Once the bank is confirmed the state is set to 'Confirmed'.\n"
 " Then the order is paid the state is 'Done'."
 msgstr ""
+"Når en ordre er plassert staten er \"Kladd\".\n"
+"Når banken er bekreftet staten er satt til \"bekreftet\".\n"
+"Da ordren er betalt staten Ferdig."
 
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
@@ -69,6 +72,8 @@ msgid ""
 "The amount which should be paid at the current date\n"
 "minus the amount which is already in payment order"
 msgstr ""
+"Det beløp som skal betales på den aktuelle datoen minus beløpet som allerede "
+"er i betaling for."
 
 #. module: account_payment
 #: field:payment.line,company_id:0
@@ -80,28 +85,28 @@ msgstr "Firma"
 #. module: account_payment
 #: field:payment.order,date_prefered:0
 msgid "Preferred date"
-msgstr ""
+msgstr "Ønsket date."
 
 #. module: account_payment
 #: model:res.groups,name:account_payment.group_account_payment
 msgid "Accounting / Payments"
-msgstr ""
+msgstr "Regnskap / betalinger"
 
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Free"
-msgstr ""
+msgstr "Gratis"
 
 #. module: account_payment
 #: view:payment.order.create:0
 #: field:payment.order.create,entries:0
 msgid "Entries"
-msgstr ""
+msgstr "Inngang"
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Used Account"
-msgstr ""
+msgstr "Brukerens Konto."
 
 #. module: account_payment
 #: field:payment.line,ml_maturity_date:0
@@ -112,12 +117,12 @@ msgstr "Forfallsdato"
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "Konto kommandolinjen"
 
 #. module: account_payment
 #: view:payment.order.create:0
 msgid "_Add to payment order"
-msgstr ""
+msgstr "_Legg Til betaling for"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
@@ -134,22 +139,22 @@ msgstr "Beløp"
 #. module: account_payment
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Feil kredit eller debet beløp i regnskaps oppføringen !"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Total in Company Currency"
-msgstr ""
+msgstr "Totalt i Selskapets Valuta."
 
 #. module: account_payment
 #: selection:payment.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "AVLYST"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
 msgid "New Payment Order"
-msgstr ""
+msgstr "Ny betalings ordre."
 
 #. module: account_payment
 #: report:payment.order:0
@@ -160,12 +165,12 @@ msgstr "Referanse"
 #. module: account_payment
 #: sql_constraint:payment.line:0
 msgid "The payment line name must be unique!"
-msgstr ""
+msgstr "Betalingen linjen må være unikt!"
 
 #. module: account_payment
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Ugyldig BBA Strukturert Kommunikasjon!"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -179,11 +184,13 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"Datoen for din bilagsregistrering ikke er i den definerte perioden! Du bør "
+"endre datoen eller fjerne denne begrensningen fra tidsskriftet."
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Directly"
-msgstr ""
+msgstr "Direkte"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_line_form
@@ -191,18 +198,18 @@ msgstr ""
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Payment Line"
-msgstr ""
+msgstr "Betalings linje."
 
 #. module: account_payment
 #: view:payment.line:0
 msgid "Amount Total"
-msgstr ""
+msgstr "Total BELØP."
 
 #. module: account_payment
 #: view:payment.order:0
 #: selection:payment.order,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Bekreftet"
 
 #. module: account_payment
 #: help:payment.line,ml_date_created:0
@@ -217,19 +224,19 @@ msgstr ""
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Structured"
-msgstr ""
+msgstr "Strukturert."
 
 #. module: account_payment
 #: view:payment.order:0
 #: field:payment.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Stat"
 
 #. module: account_payment
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Transaction Information"
-msgstr ""
+msgstr "Transaksjons informasjon."
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
@@ -238,17 +245,17 @@ msgstr ""
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Betaling modus"
 
 #. module: account_payment
 #: field:payment.line,ml_date_created:0
 msgid "Effective Date"
-msgstr ""
+msgstr "Behandlingsdato"
 
 #. module: account_payment
 #: field:payment.line,ml_inv_ref:0
 msgid "Invoice Ref."
-msgstr ""
+msgstr "Faktura ref."
 
 #. module: account_payment
 #: help:payment.order,date_prefered:0
@@ -262,90 +269,90 @@ msgstr ""
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Feil !"
 
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "Total belastning."
 
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution date"
-msgstr ""
+msgstr "Iverksettelses datoen."
 
 #. module: account_payment
 #: help:payment.mode,journal:0
 msgid "Bank or Cash Journal for the Payment Mode"
-msgstr ""
+msgstr "Bank Eller minibank Journal for betaling Modus."
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Fixed date"
-msgstr ""
+msgstr "Fast dato"
 
 #. module: account_payment
 #: field:payment.line,info_partner:0
 #: view:payment.order:0
 msgid "Destination Account"
-msgstr ""
+msgstr "Mål Konto."
 
 #. module: account_payment
 #: view:payment.line:0
 msgid "Desitination Account"
-msgstr ""
+msgstr "Mål Konto."
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Search Payment Orders"
-msgstr ""
+msgstr "Søk betalings ordre."
 
 #. module: account_payment
 #: field:payment.line,create_date:0
 msgid "Created"
-msgstr ""
+msgstr "Opprettet"
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Select Invoices to Pay"
-msgstr ""
+msgstr "Velg fakturaer Som Skal betales."
 
 #. module: account_payment
 #: view:payment.line:0
 msgid "Currency Amount Total"
-msgstr ""
+msgstr "Total valuta beløp."
 
 #. module: account_payment
 #: view:payment.order:0
 msgid "Make Payments"
-msgstr ""
+msgstr "Utfør betalinger."
 
 #. module: account_payment
 #: field:payment.line,state:0
 msgid "Communication Type"
-msgstr ""
+msgstr "Kommuniksjonstype"
 
 #. module: account_payment
 #: field:payment.line,partner_id:0
 #: field:payment.mode,partner_id:0
 #: report:payment.order:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
 msgid "Bank statement line"
-msgstr ""
+msgstr "Kontoutskrift linje."
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
 msgid "Due date"
-msgstr ""
+msgstr "Forfallsdato"
 
 #. module: account_payment
 #: field:account.invoice,amount_to_pay:0
 msgid "Amount to be paid"
-msgstr ""
+msgstr "Beløpet Søm skål betales."
 
 #. module: account_payment
 #: constraint:account.move.line:0
@@ -354,16 +361,19 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Den valgte kontoen av dine Bilagsregistrering blir tvunget for å gi en "
+"sekundær valuta. Du bør fjerne den sekundære valuta på konto eller velg en "
+"flervaluta syn på tidsskriftet."
 
 #. module: account_payment
 #: report:payment.order:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account_payment
 #: view:account.payment.make.payment:0
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #. module: account_payment
 #: help:payment.line,info_owner:0
diff --git a/addons/account_payment/i18n/nl.po b/addons/account_payment/i18n/nl.po
index 16e3e01c755..1c75326c415 100644
--- a/addons/account_payment/i18n/nl.po
+++ b/addons/account_payment/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-02-12 11:33+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/nl_BE.po b/addons/account_payment/i18n/nl_BE.po
index 12cd63f1aa6..10e3e82fb9a 100644
--- a/addons/account_payment/i18n/nl_BE.po
+++ b/addons/account_payment/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/oc.po b/addons/account_payment/i18n/oc.po
index 456a4e969a6..9bed9e37c60 100644
--- a/addons/account_payment/i18n/oc.po
+++ b/addons/account_payment/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/pl.po b/addons/account_payment/i18n/pl.po
index 551912364f1..aa1dd1cbcaa 100644
--- a/addons/account_payment/i18n/pl.po
+++ b/addons/account_payment/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/pt.po b/addons/account_payment/i18n/pt.po
index 5ca50badccc..d6a66321b96 100644
--- a/addons/account_payment/i18n/pt.po
+++ b/addons/account_payment/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/pt_BR.po b/addons/account_payment/i18n/pt_BR.po
index 46bb3fb57ab..ae8438c8824 100644
--- a/addons/account_payment/i18n/pt_BR.po
+++ b/addons/account_payment/i18n/pt_BR.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
-msgstr "Data programada se alterada"
+msgstr "Data prevista, se fixa"
 
 #. module: account_payment
 #: field:payment.line,currency:0
@@ -29,7 +29,7 @@ msgstr "Moeda do Parceiro"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Set to draft"
-msgstr "Definir como Rascunho"
+msgstr "Definir como Provisório"
 
 #. module: account_payment
 #: help:payment.order,mode:0
@@ -40,7 +40,7 @@ msgstr "Selecione o modo de pagamento a ser aplicado."
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Group By..."
-msgstr "Agrupado Por..."
+msgstr "Agrupar Por..."
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
@@ -61,9 +61,10 @@ msgid ""
 " Once the bank is confirmed the state is set to 'Confirmed'.\n"
 " Then the order is paid the state is 'Done'."
 msgstr ""
-"Quando um pedido é colocado o Estado é 'Rascunho'.\n"
-" Uma vez que o banco for confirmado, o estado é definido como 'Confirmado'.\n"
-" A ordem é paga, o estado é 'Concluído'."
+"Quando um pedido é criado a situação é 'Provisório'.\n"
+" Uma vez que o banco for confirmado, a situação é definido como "
+"'Confirmado'.\n"
+" A ordem é paga, a situação é 'Concluído'."
 
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
@@ -71,7 +72,7 @@ msgid ""
 "The amount which should be paid at the current date\n"
 "minus the amount which is already in payment order"
 msgstr ""
-"A quantidade que deve ser paga na data atual\n"
+"O valor que deve ser pago na data atual\n"
 "menos a quantidade que já está na ordem de pagamento"
 
 #. module: account_payment
@@ -94,7 +95,7 @@ msgstr "Contabilidade / Pagamentos"
 #. module: account_payment
 #: selection:payment.line,state:0
 msgid "Free"
-msgstr "Livre"
+msgstr "Gratuito"
 
 #. module: account_payment
 #: view:payment.order.create:0
@@ -169,7 +170,7 @@ msgstr "A linha de pagamento precisa ser única!"
 #. module: account_payment
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr "Inválida Comunicação BBA Estruturado!"
+msgstr "Comunicação estruturada BBA inválida !"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
@@ -183,8 +184,8 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
-"A data do lançamento não está definida no período. Você precisa alterar a "
-"data ou remover esse lançamento do diário."
+"A data da entrada no diário não está no período definido! Você deve alterar "
+"a data ou remover essa restrição do diário."
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -213,7 +214,7 @@ msgstr "Confirmado"
 #. module: account_payment
 #: help:payment.line,ml_date_created:0
 msgid "Invoice Effective Date"
-msgstr "Data efetiva Documento Fiscal"
+msgstr "Data Efetiva da Fatura"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -229,7 +230,7 @@ msgstr "Estruturado"
 #: view:payment.order:0
 #: field:payment.order,state:0
 msgid "State"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -254,7 +255,7 @@ msgstr "Data Efetiva"
 #. module: account_payment
 #: field:payment.line,ml_inv_ref:0
 msgid "Invoice Ref."
-msgstr "Ref. Doc Fiscal"
+msgstr "Ref da Fatura"
 
 #. module: account_payment
 #: help:payment.order,date_prefered:0
@@ -271,7 +272,7 @@ msgstr ""
 #: code:addons/account_payment/account_move_line.py:110
 #, python-format
 msgid "Error !"
-msgstr "Erro !"
+msgstr "Erro!"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -297,7 +298,7 @@ msgstr "Data Fixa"
 #: field:payment.line,info_partner:0
 #: view:payment.order:0
 msgid "Destination Account"
-msgstr "Conta Destino"
+msgstr "Conta de Destino"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -317,7 +318,7 @@ msgstr "Criado"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Select Invoices to Pay"
-msgstr "Selecione Documentos Fiscais a Pagar"
+msgstr "Selecione as Faturas para Pagamento"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -327,7 +328,7 @@ msgstr "Valor Total em Moeda"
 #. module: account_payment
 #: view:payment.order:0
 msgid "Make Payments"
-msgstr "Efetuar pagamentos"
+msgstr "Efetuar Pagamentos"
 
 #. module: account_payment
 #: field:payment.line,state:0
@@ -344,7 +345,7 @@ msgstr "Parceiro"
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
 msgid "Bank statement line"
-msgstr "Item de Extrato Bancário"
+msgstr "Linha de Extrato Bancário"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -363,7 +364,7 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
-"A conta selecionada utializa as entradas no diário para fornecer uma moeda "
+"A conta selecionada utiliza as entradas no diário para fornecer uma moeda "
 "secundária. Você deve remover a moeda secundária na conta ou selecione uma "
 "visão multi-moeda no diário."
 
@@ -394,7 +395,7 @@ msgstr ""
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_populate_statement
 msgid "Account Payment Populate Statement"
-msgstr "Preencher e Extrato da Conta de Pagamentos"
+msgstr "Preencher o Extrato da Conta de Pagamentos"
 
 #. module: account_payment
 #: help:payment.mode,name:0
@@ -420,7 +421,7 @@ msgstr "Valor do pagamento na moeda do parceiro"
 #: view:payment.order:0
 #: selection:payment.order,state:0
 msgid "Draft"
-msgstr "Rascunho"
+msgstr "Provisório"
 
 #. module: account_payment
 #: help:payment.line,communication2:0
@@ -451,7 +452,7 @@ msgstr "Crédito Total"
 #. module: account_payment
 #: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
-msgstr "Selecione uma data se você escolheu uma Data Preferida a ser fixada."
+msgstr "Selecione uma data se você escolheu uma Data Preferida fixa."
 
 #. module: account_payment
 #: field:payment.order,user_id:0
@@ -542,17 +543,17 @@ msgstr "Conta de realizar pagamentos"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Invoice Ref"
-msgstr "Ref Doc Fiscal"
+msgstr "Ref da Fatura"
 
 #. module: account_payment
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr "Número da fatura deve ser único por empresa!"
+msgstr "O Número da Fatura deve ser único por Empresa!"
 
 #. module: account_payment
 #: field:payment.line,name:0
 msgid "Your Reference"
-msgstr "Sua referência"
+msgstr "Sua Referência"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -574,7 +575,7 @@ msgstr "Concluído"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_invoice
 msgid "Invoice"
-msgstr "Documento Fiscal"
+msgstr "Fatura"
 
 #. module: account_payment
 #: field:payment.line,communication:0
@@ -592,7 +593,7 @@ msgstr "Cancelar"
 #. module: account_payment
 #: field:payment.line,bank_id:0
 msgid "Destination Bank Account"
-msgstr "Conta bancária de destino"
+msgstr "Conta Bancária de Destino"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -603,7 +604,7 @@ msgstr "Informações"
 #. module: account_payment
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr "Empresa deve ser a mesma para a sua conta relacionada e período."
+msgstr "A Empresa deve ser a mesma para a conta e período"
 
 #. module: account_payment
 #: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
@@ -664,7 +665,7 @@ msgstr "Confirmar Pagamento"
 #: field:payment.line,company_currency:0
 #: report:payment.order:0
 msgid "Company Currency"
-msgstr "Moeda da empresa"
+msgstr "Moeda da Empresa"
 
 #. module: account_payment
 #: model:ir.ui.menu,name:account_payment.menu_main_payment
@@ -742,12 +743,12 @@ msgstr "Modo de Pagamento"
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_create_payment_order
 msgid "Populate Payment"
-msgstr "Popular Pagamento"
+msgstr "Preencher Pagamento"
 
 #. module: account_payment
 #: help:payment.mode,bank_id:0
 msgid "Bank Account for the Payment Mode"
-msgstr "Conta Bancária para a Condição de Pagamento"
+msgstr "Conta Bancária para o Modo de Pagamento"
 
 #~ msgid "Payment Management"
 #~ msgstr "Gestão de Pagamento"
diff --git a/addons/account_payment/i18n/ro.po b/addons/account_payment/i18n/ro.po
index 582c7f104c3..780b5e6e81a 100644
--- a/addons/account_payment/i18n/ro.po
+++ b/addons/account_payment/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po
index 7a3ff827f36..1e6be01c6c6 100644
--- a/addons/account_payment/i18n/ru.po
+++ b/addons/account_payment/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sl.po b/addons/account_payment/i18n/sl.po
index 638aefdaf6b..9b193c22158 100644
--- a/addons/account_payment/i18n/sl.po
+++ b/addons/account_payment/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sq.po b/addons/account_payment/i18n/sq.po
index 8a899514680..d0514a6c54d 100644
--- a/addons/account_payment/i18n/sq.po
+++ b/addons/account_payment/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sr.po b/addons/account_payment/i18n/sr.po
index 3725ee94d91..fd29b2446f0 100644
--- a/addons/account_payment/i18n/sr.po
+++ b/addons/account_payment/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sr@latin.po b/addons/account_payment/i18n/sr@latin.po
index c940641dc25..94ff281d4ee 100644
--- a/addons/account_payment/i18n/sr@latin.po
+++ b/addons/account_payment/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/sv.po b/addons/account_payment/i18n/sv.po
index 4e5d59101a9..0178b7f371b 100644
--- a/addons/account_payment/i18n/sv.po
+++ b/addons/account_payment/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/tlh.po b/addons/account_payment/i18n/tlh.po
index d7d47640709..a404b912624 100644
--- a/addons/account_payment/i18n/tlh.po
+++ b/addons/account_payment/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index 2af566ccefd..88547cdfb28 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/uk.po b/addons/account_payment/i18n/uk.po
index 649f2523ce8..72c4581a0b2 100644
--- a/addons/account_payment/i18n/uk.po
+++ b/addons/account_payment/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/vi.po b/addons/account_payment/i18n/vi.po
index 2ab557ace0a..8f69d6c6859 100644
--- a/addons/account_payment/i18n/vi.po
+++ b/addons/account_payment/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index b331766a5fd..20cb178fe73 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-10 15:03+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-10-30 15:45+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:04+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -653,7 +653,7 @@ msgstr "公司币别"
 #: view:payment.line:0
 #: view:payment.order:0
 msgid "Payment"
-msgstr "付款"
+msgstr "支付"
 
 #. module: account_payment
 #: report:payment.order:0
diff --git a/addons/account_payment/i18n/zh_TW.po b/addons/account_payment/i18n/zh_TW.po
index b492a307642..e92a1b0a731 100644
--- a/addons/account_payment/i18n/zh_TW.po
+++ b/addons/account_payment/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-29 15:27+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:12+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -24,7 +24,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.line,currency:0
 msgid "Partner Currency"
-msgstr "伙伴貨幣"
+msgstr "業務夥伴貨幣"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -40,7 +40,7 @@ msgstr "選取要應用之付款模式。"
 #: view:payment.mode:0
 #: view:payment.order:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: account_payment
 #: field:payment.order,line_ids:0
@@ -84,7 +84,7 @@ msgstr "首選日期"
 #. module: account_payment
 #: model:res.groups,name:account_payment.group_account_payment
 msgid "Accounting / Payments"
-msgstr ""
+msgstr "會計/付款"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -111,7 +111,7 @@ msgstr "到期日"
 #. module: account_payment
 #: view:account.move.line:0
 msgid "Account Entry Line"
-msgstr ""
+msgstr "會計分錄明細"
 
 #. module: account_payment
 #: view:payment.order.create:0
@@ -222,7 +222,7 @@ msgstr ""
 #: view:payment.order:0
 #: field:payment.order,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -307,7 +307,7 @@ msgstr ""
 #. module: account_payment
 #: view:payment.order:0
 msgid "Select Invoices to Pay"
-msgstr ""
+msgstr "選擇要付款的發票"
 
 #. module: account_payment
 #: view:payment.line:0
@@ -329,12 +329,12 @@ msgstr "通訊類型"
 #: field:payment.mode,partner_id:0
 #: report:payment.order:0
 msgid "Partner"
-msgstr "伙伴"
+msgstr "業務夥伴"
 
 #. module: account_payment
 #: field:payment.line,bank_statement_line_id:0
 msgid "Bank statement line"
-msgstr ""
+msgstr "銀行對帳單明細"
 
 #. module: account_payment
 #: selection:payment.order,date_prefered:0
@@ -399,7 +399,7 @@ msgstr "付款類型"
 #. module: account_payment
 #: help:payment.line,amount_currency:0
 msgid "Payment amount in the partner currency"
-msgstr "以伙伴貨幣計算之付款總額"
+msgstr "以業務夥伴貨幣計算之付款總額"
 
 #. module: account_payment
 #: view:payment.order:0
@@ -441,7 +441,7 @@ msgstr ""
 #. module: account_payment
 #: field:payment.order,user_id:0
 msgid "User"
-msgstr ""
+msgstr "使用者"
 
 #. module: account_payment
 #: field:account.payment.populate.statement,lines:0
@@ -504,7 +504,7 @@ msgstr "匯入付款明細"
 #. module: account_payment
 #: field:account.move.line,amount_to_pay:0
 msgid "Amount to pay"
-msgstr "要付總額"
+msgstr "應付總額"
 
 #. module: account_payment
 #: field:payment.line,amount:0
diff --git a/addons/account_payment/report/__init__.py b/addons/account_payment/report/__init__.py
index e9d7f4013ac..c73a5f33001 100644
--- a/addons/account_payment/report/__init__.py
+++ b/addons/account_payment/report/__init__.py
@@ -20,4 +20,4 @@
 ##############################################################################
 
 import payment_order
-# 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_payment/report/order.rml b/addons/account_payment/report/order.rml
index 973588e5410..7ad897890e4 100644
--- a/addons/account_payment/report/order.rml
+++ b/addons/account_payment/report/order.rml
@@ -256,10 +256,10 @@
             <para style="terp_default_Centre_9">[[line.date=='False' and '-' or formatLang(line.date,date=True) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[formatLang(line.amount) or '-' ]] [[get_company_currency_symbol()]] </para>
+            <para style="terp_default_Right_9">[[formatLang(line.amount, currency_obj= user.company_id.currency_id) or '-' ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency) ]] [[ line.currency.symbol]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(line.amount_currency, currency_obj= line.currency)]]</para>
           </td>
         </tr>
       </blockTable>
@@ -275,10 +275,10 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_amount_total(o)) or '' ]] [[get_company_currency_symbol()]] </para>
+          <para style="terp_default_Right_9">[[ formatLang(get_amount_total(o), currency_obj= user.company_id.currency_id) or '' ]] </para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o)) or '' ]] [[get_company_currency_symbol()]] </para>
+          <para style="terp_default_Right_9">[[ formatLang(get_amount_total_in_currency(o), currency_obj= user.company_id.currency_id) or '' ]] </para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account_payment/report/payment_order.py b/addons/account_payment/report/payment_order.py
index 0b2a8061906..5f9708f876c 100644
--- a/addons/account_payment/report/payment_order.py
+++ b/addons/account_payment/report/payment_order.py
@@ -32,7 +32,6 @@ class payment_order(report_sxw.rml_parse):
             'time': time,
             'get_invoice_name': self._get_invoice_name,
             'get_company_currency': self._get_company_currency,
-            'get_company_currency_symbol': self._get_company_currency_symbol,
             'get_amount_total_in_currency': self._get_amount_total_in_currency,
             'get_amount_total': self._get_amount_total,
             'get_account_name': self._get_account_name,
@@ -72,10 +71,6 @@ class payment_order(report_sxw.rml_parse):
         user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
         return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False
 
-    def _get_company_currency_symbol(self):
-        pool = pooler.get_pool(self.cr.dbname)
-        user = pool.get('res.users').browse(self.cr, self.uid, self.uid)
-        return user.company_id and user.company_id.currency_id and user.company_id.currency_id.symbol or False
 
     def _get_account_name(self,bank_id):
         if bank_id:
@@ -87,4 +82,4 @@ class payment_order(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.payment.order', 'payment.order', 'addons/account_payment/report/payment_order.rml', parser=payment_order, header="external")
 
-# 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_payment/wizard/__init__.py b/addons/account_payment/wizard/__init__.py
index 1c5aefacc78..35b907cd337 100644
--- a/addons/account_payment/wizard/__init__.py
+++ b/addons/account_payment/wizard/__init__.py
@@ -23,4 +23,4 @@ import account_payment_order
 import account_payment_populate_statement
 import account_payment_pay
 
-# 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_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index 713784798fc..455475b0ae5 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):
                     'partner_id': line.partner_id and line.partner_id.id or False,
                     'communication': line.ref or '/',
                     'date': date_to_pay,
-                    'currency': line.invoice and line.invoice.currency_id.id or False,
+                    'currency': (line.invoice and line.invoice.currency_id.id) or line.journal_id.currency.id or line.journal_id.company_id.currency_id.id,
                 }, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
@@ -120,4 +120,4 @@ class payment_order_create(osv.osv_memory):
 
 payment_order_create()
 
-# 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_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py
index 6bcb04fa490..3c16618f3d2 100644
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@@ -56,4 +56,4 @@ class account_payment_make_payment(osv.osv_memory):
 
 account_payment_make_payment()
 
-# 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_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index 6f2d9d02dbc..fffe6c17b92 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -86,24 +86,24 @@ class account_payment_populate_statement(osv.osv_memory):
                         'name': line.name,
                         'partner_id': line.partner_id.id,
                         'journal_id': statement.journal_id.id,
-                        'account_id': result.get('account_id', statement.journal_id.default_credit_account_id.id),
+                        'account_id': result['value'].get('account_id', statement.journal_id.default_credit_account_id.id),
                         'company_id': statement.company_id.id,
                         'currency_id': statement.currency.id,
                         'date': line.date or time.strftime('%Y-%m-%d'),
                         'amount': abs(amount),
-                        'period_id': statement.period_id.id
+                        'period_id': statement.period_id.id,
                 }
                 voucher_id = voucher_obj.create(cr, uid, voucher_res, context=context)
-                voucher_line_dict =  False
-                if result['value']['line_ids']:
-                    for line_dict in result['value']['line_ids']:
-                        move_line = move_line_obj.browse(cr, uid, line_dict['move_line_id'], context)
-                        if line.move_line_id.move_id.id == move_line.move_id.id:
-                            voucher_line_dict = line_dict
+
+                voucher_line_dict =  {}
+                for line_dict in result['value']['line_cr_ids'] + result['value']['line_dr_ids']:
+                    move_line = move_line_obj.browse(cr, uid, line_dict['move_line_id'], context)
+                    if line.move_line_id.move_id.id == move_line.move_id.id:
+                        voucher_line_dict = line_dict
+
                 if voucher_line_dict:
                     voucher_line_dict.update({'voucher_id': voucher_id})
                     voucher_line_obj.create(cr, uid, voucher_line_dict, context=context)
-
                 st_line_id = statement_line_obj.create(cr, uid, {
                     'name': line.order_id.reference or '?',
                     'amount': - amount,
@@ -120,4 +120,4 @@ class account_payment_populate_statement(osv.osv_memory):
 
 account_payment_populate_statement()
 
-# 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_sequence/__init__.py b/addons/account_sequence/__init__.py
index b6707106d4b..e85a910f037 100644
--- a/addons/account_sequence/__init__.py
+++ b/addons/account_sequence/__init__.py
@@ -22,4 +22,4 @@
 import account_sequence
 import account_sequence_installer
 
-# 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_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py
index 0f860d400e9..2c4b157303f 100644
--- a/addons/account_sequence/__openerp__.py
+++ b/addons/account_sequence/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Entries Sequence Numbering',
     'version': '1.1',
-    "category": 'Accounting & Finance',
+    'category': 'Accounting & Finance',
     'description': """
 This module maintains internal sequence number for accounting entries.
 ======================================================================
@@ -30,6 +30,7 @@ This module maintains internal sequence number for accounting entries.
 Allows you to configure the accounting sequences to be maintained.
 
 You can customize the following attributes of the sequence:
+-----------------------------------------------------------
     * Prefix
     * Suffix
     * Next Number
@@ -40,16 +41,14 @@ You can customize the following attributes of the sequence:
     'website': 'http://www.openerp.com',
     'images': ['images/internal_sequence_number.jpeg'],
     'depends': ['account'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'account_sequence_data.xml',
         'account_sequence_installer_view.xml',
         'account_sequence.xml'
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '00475376442024623469',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_sequence/account_sequence_data.xml b/addons/account_sequence/account_sequence_data.xml
index 1ad362b3979..b2d40412d0d 100644
--- a/addons/account_sequence/account_sequence_data.xml
+++ b/addons/account_sequence/account_sequence_data.xml
@@ -43,6 +43,18 @@
             <field eval="True" name="required"/>
             <field eval="2" name="sequence"/>
         </record>
+	<record id="sequence_journal" model="ir.sequence.type">
+	    <field name="name">Account Journal</field>
+	    <field name="code">account.journal</field>
+	</record>
+
+	<record id="sequence_journal_seq" model="ir.sequence">
+	    <field name="name">Account journal sequence</field>
+	    <field name="code">account.journal</field>
+	    <field name="prefix">AJ</field>
+	    <field eval="1" name="number_next"/>
+	    <field eval="1" name="number_increment"/>
+	</record>
     </data>
 
 </openerp>
diff --git a/addons/account_sequence/i18n/ar.po b/addons/account_sequence/i18n/ar.po
index 62ce83132eb..36384c7d051 100644
--- a/addons/account_sequence/i18n/ar.po
+++ b/addons/account_sequence/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/bg.po b/addons/account_sequence/i18n/bg.po
index 2204c1a5bcc..d83779b8f0d 100644
--- a/addons/account_sequence/i18n/bg.po
+++ b/addons/account_sequence/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/ca.po b/addons/account_sequence/i18n/ca.po
index da884f1f9d2..086e60a4ccb 100644
--- a/addons/account_sequence/i18n/ca.po
+++ b/addons/account_sequence/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/da.po b/addons/account_sequence/i18n/da.po
index 680949241ad..287cc25a78f 100644
--- a/addons/account_sequence/i18n/da.po
+++ b/addons/account_sequence/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/de.po b/addons/account_sequence/i18n/de.po
index 718541ec268..ff91b1f03a0 100644
--- a/addons/account_sequence/i18n/de.po
+++ b/addons/account_sequence/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/el.po b/addons/account_sequence/i18n/el.po
new file mode 100644
index 00000000000..3d388820a7f
--- /dev/null
+++ b/addons/account_sequence/i18n/el.po
@@ -0,0 +1,214 @@
+# Greek translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-09-15 17:55+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Greek <el@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+"Η εταιρία πρέπει να είναι ίδια για τους σχετικούς λογαριασμούς και περίοδο"
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Επόμενος αριθμός αυτής της ακολουθίας"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Επόμενος Αριθμός"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Αριθμός Προσαύξησης"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
diff --git a/addons/account_sequence/i18n/es.po b/addons/account_sequence/i18n/es.po
index 8bc9c2a9e15..202fb101b8f 100644
--- a/addons/account_sequence/i18n/es.po
+++ b/addons/account_sequence/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/es_CR.po b/addons/account_sequence/i18n/es_CR.po
index 537710a59de..905b0bbf04f 100644
--- a/addons/account_sequence/i18n/es_CR.po
+++ b/addons/account_sequence/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: account_sequence
diff --git a/addons/account_sequence/i18n/es_EC.po b/addons/account_sequence/i18n/es_EC.po
new file mode 100644
index 00000000000..4434aa6929b
--- /dev/null
+++ b/addons/account_sequence/i18n/es_EC.po
@@ -0,0 +1,226 @@
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-10-18 19:13+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr "Configuración de Secuencia de Cuentas"
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr ""
+"No puede crear más de un movimiento por periodo en un diario centralizado"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr "La compañía debe ser la misma para su cuenta y periodos relacionados"
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr "Número de secuencia interno"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Próximo número de secuencia"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Próximo número"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Incremento del número"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr "El próximo número de la secuencia se incrementa en este número"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr "Configurar su  Secuencia de la Cuentas"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Valor Sufijo del registro de la secuencia"
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+"Esta secuencia se utilizará para gestionar el número interno de los asientos "
+"relacionados con este diario."
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr "Relleno del número"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Asientos Contables"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr "Número interno"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr "No puede crear asientos en una cuenta de tipo vista"
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+"OpenERP automáticamente añade '0'a la izquierda del 'siguiente número' para "
+"obtener el tamaño de relleno necesario."
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr "No puede crear asientos en cuentas cerradas"
+
+#. module: account_sequence
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"¡Error de configuración! La moneda elegida debe ser también la misma en las "
+"cuentas por defecto"
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "¡Valor erróneo en el debe o en el haber del asiento contable!"
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr "Secuencia interna"
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr "Valor del prefijo del registro para la secuencia."
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Detalle Contable"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Sufijo"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Imágen"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "¡El nombre del diario debe ser único por compañía!"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+"La cuenta selecionada de su diario obliga a tener una moneda secundaria. "
+"Usted debería eliminar la moneda secundaria de la cuenta o asignar una vista "
+"de multi-moneda al diario."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+"¡La fecha de su asiento no está en el periodo definido! Usted debería "
+"cambiar la fecha o borrar esta restricción del diario."
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Prefijo"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "El código del diario debe ser único por compañía !"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr "Instaladot de Secuencias contables"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+"Puede realzar la Aplicación de Secuencia de la Cuenta mediante instalación ."
diff --git a/addons/account_sequence/i18n/es_PY.po b/addons/account_sequence/i18n/es_PY.po
index 84ae36d039a..8236d9ebd28 100644
--- a/addons/account_sequence/i18n/es_PY.po
+++ b/addons/account_sequence/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/fa.po b/addons/account_sequence/i18n/fa.po
index c4b7d24c412..f43fd979e3a 100644
--- a/addons/account_sequence/i18n/fa.po
+++ b/addons/account_sequence/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/fr.po b/addons/account_sequence/i18n/fr.po
index 0983f50e322..ce1f7f12e35 100644
--- a/addons/account_sequence/i18n/fr.po
+++ b/addons/account_sequence/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/gl.po b/addons/account_sequence/i18n/gl.po
index 9a578eee3ce..e589a7424f2 100644
--- a/addons/account_sequence/i18n/gl.po
+++ b/addons/account_sequence/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/hr.po b/addons/account_sequence/i18n/hr.po
index a8c9281bdc3..5efec2b80a6 100644
--- a/addons/account_sequence/i18n/hr.po
+++ b/addons/account_sequence/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/hu.po b/addons/account_sequence/i18n/hu.po
index d7bb6b461ac..6989166b3b4 100644
--- a/addons/account_sequence/i18n/hu.po
+++ b/addons/account_sequence/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/id.po b/addons/account_sequence/i18n/id.po
index 1d36c808b78..55454d57278 100644
--- a/addons/account_sequence/i18n/id.po
+++ b/addons/account_sequence/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/it.po b/addons/account_sequence/i18n/it.po
index 600c451df17..ad5d2c0c712 100644
--- a/addons/account_sequence/i18n/it.po
+++ b/addons/account_sequence/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/ja.po b/addons/account_sequence/i18n/ja.po
index facdcb8035a..be011516f99 100644
--- a/addons/account_sequence/i18n/ja.po
+++ b/addons/account_sequence/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/lv.po b/addons/account_sequence/i18n/lv.po
index c20737eb1d3..7acc6131bb0 100644
--- a/addons/account_sequence/i18n/lv.po
+++ b/addons/account_sequence/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/nb.po b/addons/account_sequence/i18n/nb.po
index c2dd186a39b..791e53d8a5e 100644
--- a/addons/account_sequence/i18n/nb.po
+++ b/addons/account_sequence/i18n/nb.po
@@ -14,25 +14,26 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 #: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
 msgid "Account Sequence Application Configuration"
-msgstr ""
+msgstr "Konto Sekvens Programkonfigurasjon"
 
 #. module: account_sequence
 #: constraint:account.move:0
 msgid ""
 "You can not create more than one move per period on centralized journal"
 msgstr ""
+"Du kan ikke opprette mer enn ett trekk per periode på sentralisert journal"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "Selskapet må være den samme for tilhørende konto og periode"
 
 #. module: account_sequence
 #: help:account.move,internal_sequence_number:0
@@ -53,32 +54,32 @@ msgstr "Neste nummer"
 #. module: account_sequence
 #: field:account.sequence.installer,number_increment:0
 msgid "Increment Number"
-msgstr ""
+msgstr "Inkrementnummer"
 
 #. module: account_sequence
 #: help:account.sequence.installer,number_increment:0
 msgid "The next number of the sequence will be incremented by this number"
-msgstr ""
+msgstr "Neste nummer av sekvensen vil bli inkrementert med dette nummeret"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "Configure Your Account Sequence Application"
-msgstr ""
+msgstr "Konfigurere kontoens Sekvens applikasjon"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Konfigurer"
 
 #. module: account_sequence
 #: help:account.sequence.installer,suffix:0
 msgid "Suffix value of the record for the sequence"
-msgstr ""
+msgstr "Suffiks verdi av posten for sekvensen"
 
 #. module: account_sequence
 #: field:account.sequence.installer,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: account_sequence
 #: help:account.journal,internal_sequence_id:0
@@ -86,27 +87,29 @@ msgid ""
 "This sequence will be used to maintain the internal number for the journal "
 "entries related to this journal."
 msgstr ""
+"Denne sekvensen vil bli brukt til å opprettholde den interne tall for "
+"bilagsregistreringer knyttet til dette tidsskriftet"
 
 #. module: account_sequence
 #: field:account.sequence.installer,padding:0
 msgid "Number padding"
-msgstr ""
+msgstr "antall polstring"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Journal Elementer"
 
 #. module: account_sequence
 #: field:account.move,internal_sequence_number:0
 #: field:account.move.line,internal_sequence_number:0
 msgid "Internal Number"
-msgstr ""
+msgstr "intern Nummer"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Du kan ikke lage journalregistreringer på konto av typen vis"
 
 #. module: account_sequence
 #: help:account.sequence.installer,padding:0
@@ -114,16 +117,18 @@ msgid ""
 "OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
 "get the required padding size."
 msgstr ""
+"OpenERP vil legger automatisk noen '0 'til venstre' Neste Nummer 'å få den "
+"nødvendige polstring størrelse."
 
 #. module: account_sequence
 #: field:account.sequence.installer,name:0
 msgid "Name"
-msgstr ""
+msgstr "Navn"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Du kan ikke lage journal elementer på en lukket konto."
 
 #. module: account_sequence
 #: constraint:account.journal:0
@@ -131,46 +136,47 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"Konfigurasjon feil! Den valgte valutaen bør deles av standard kontoer også."
 
 #. module: account_sequence
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Feil kredit eller debet beløp i regnskaps oppføringen !"
 
 #. module: account_sequence
 #: field:account.journal,internal_sequence_id:0
 msgid "Internal Sequence"
-msgstr ""
+msgstr "Intern Sekvens"
 
 #. module: account_sequence
 #: help:account.sequence.installer,prefix:0
 msgid "Prefix value of the record for the sequence"
-msgstr ""
+msgstr "Prefiks verdi av posten for sekvensen"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_move
 msgid "Account Entry"
-msgstr ""
+msgstr "Konto Inngang"
 
 #. module: account_sequence
 #: field:account.sequence.installer,suffix:0
 msgid "Suffix"
-msgstr ""
+msgstr "Suffiks"
 
 #. module: account_sequence
 #: field:account.sequence.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Bilde"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "title"
-msgstr ""
+msgstr "tittel"
 
 #. module: account_sequence
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Navnet på journalen må være unikt per firma !"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
@@ -179,6 +185,9 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Den valgte kontoen av dine Bilagsregistrering blir tvunget for å gi en "
+"sekundær valuta. Du bør fjerne den sekundære valuta på konto eller velg en "
+"flervaluta syn på tidsskriftet."
 
 #. module: account_sequence
 #: constraint:account.move.line:0
@@ -186,28 +195,30 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"Datoen for din bilagsregistrering ikke er i den definerte perioden! Du bør "
+"endre datoen eller fjerne denne begrensningen fra tidsskriftet."
 
 #. module: account_sequence
 #: field:account.sequence.installer,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Prefiks"
 
 #. module: account_sequence
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Journalkoden må være unik pr firma!"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_sequence_installer
 msgid "account.sequence.installer"
-msgstr ""
+msgstr "Konto.Sekvens.Installatør"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "Journal"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "You can enhance the Account Sequence Application by installing ."
-msgstr ""
+msgstr "Du kan forbedre kontoens Sekvens applikasjon ved å installere."
diff --git a/addons/account_sequence/i18n/nl.po b/addons/account_sequence/i18n/nl.po
index d0535129425..01dba6a0592 100644
--- a/addons/account_sequence/i18n/nl.po
+++ b/addons/account_sequence/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-02-13 09:23+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -161,7 +161,7 @@ msgstr "Voorvoegsel voor het record voor de reeks"
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_move
 msgid "Account Entry"
-msgstr "Boeking"
+msgstr "Journaalpost"
 
 #. module: account_sequence
 #: field:account.sequence.installer,suffix:0
diff --git a/addons/account_sequence/i18n/nl_BE.po b/addons/account_sequence/i18n/nl_BE.po
index 8259d9264b7..02c0fa02f53 100644
--- a/addons/account_sequence/i18n/nl_BE.po
+++ b/addons/account_sequence/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/pl.po b/addons/account_sequence/i18n/pl.po
index a0e060edec3..85d81e73560 100644
--- a/addons/account_sequence/i18n/pl.po
+++ b/addons/account_sequence/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/pt.po b/addons/account_sequence/i18n/pt.po
index 62d979afd35..b093ce0e549 100644
--- a/addons/account_sequence/i18n/pt.po
+++ b/addons/account_sequence/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/pt_BR.po b/addons/account_sequence/i18n/pt_BR.po
index 155b3f73640..010cc07355d 100644
--- a/addons/account_sequence/i18n/pt_BR.po
+++ b/addons/account_sequence/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -33,7 +33,7 @@ msgstr ""
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr "Empresa deve ser a mesma para a sua conta relacionada e período."
+msgstr "A Empresa deve ser a mesma para a conta e período"
 
 #. module: account_sequence
 #: help:account.move,internal_sequence_number:0
@@ -64,7 +64,7 @@ msgstr "O próximo número da sequência será incrementada com este número"
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "Configure Your Account Sequence Application"
-msgstr "Configure Seu Aplicativo de Sequência de Conta"
+msgstr "Configure a Aplicação da Sequência da Conta"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -110,7 +110,7 @@ msgstr "Número Interno"
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
 msgstr ""
-"Você não pode criar itens de diário em uma conta com este tipo de visão."
+"Você não pode criar ítens de diário em uma conta tipo \"Visualizar\"."
 
 #. module: account_sequence
 #: help:account.sequence.installer,padding:0
@@ -153,7 +153,7 @@ msgstr "Sequência Interna"
 #. module: account_sequence
 #: help:account.sequence.installer,prefix:0
 msgid "Prefix value of the record for the sequence"
-msgstr "Prefixo de registro para a sequência"
+msgstr "Prefixo do registro para a sequência"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_move
@@ -173,7 +173,7 @@ msgstr "Imagem"
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "title"
-msgstr "Titulo"
+msgstr "título"
 
 #. module: account_sequence
 #: sql_constraint:account.journal:0
@@ -187,7 +187,7 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
-"A conta selecionada utializa as entradas no diário para fornecer uma moeda "
+"A conta selecionada utiliza as entradas no diário para fornecer uma moeda "
 "secundária. Você deve remover a moeda secundária na conta ou selecione uma "
 "visão multi-moeda no diário."
 
@@ -197,8 +197,8 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
-"A data do lançamento não está definida no período. Você precisa alterar a "
-"data ou remover esse lançamento do diário."
+"A data da entrada no diário não está no período definido! Você deve alterar "
+"a data ou remover essa restrição do diário."
 
 #. module: account_sequence
 #: field:account.sequence.installer,prefix:0
diff --git a/addons/account_sequence/i18n/ro.po b/addons/account_sequence/i18n/ro.po
index e27178ec962..7f3845062f4 100644
--- a/addons/account_sequence/i18n/ro.po
+++ b/addons/account_sequence/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/ru.po b/addons/account_sequence/i18n/ru.po
index b41afaf6a43..25ac94089c3 100644
--- a/addons/account_sequence/i18n/ru.po
+++ b/addons/account_sequence/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
@@ -28,11 +28,13 @@ msgstr "Настройка нумерации по счету"
 msgid ""
 "You can not create more than one move per period on centralized journal"
 msgstr ""
+"Вы не можете создавать более одного движения за период по централизованному "
+"журналу."
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "Для счета и периода должна быть одна компания."
 
 #. module: account_sequence
 #: help:account.move,internal_sequence_number:0
@@ -108,7 +110,7 @@ msgstr "Внутренний номер"
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Нельзя создать элемент журнала по счету с типом вид."
 
 #. module: account_sequence
 #: help:account.sequence.installer,padding:0
@@ -127,7 +129,7 @@ msgstr "Название"
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Нельзя создать элемент журнала по закрытому счету ."
 
 #. module: account_sequence
 #: constraint:account.journal:0
@@ -135,6 +137,8 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"Ошибка настройки! Выбранная валюта должна соответствовать валюте счетов по "
+"умолчанию."
 
 #. module: account_sequence
 #: sql_constraint:account.move.line:0
@@ -183,6 +187,8 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Выбранный счёт проводки в журнале нуждается во вторичной валюте. Вы должны "
+"удалить вторичную валюту по счёту или выбрать мульти-валютный вид по журналу."
 
 #. module: account_sequence
 #: constraint:account.move.line:0
@@ -190,6 +196,8 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"Дата проводки в журнале не в определённом периоде! Вы должны сменить дату "
+"или удалить это ограничение из журнала."
 
 #. module: account_sequence
 #: field:account.sequence.installer,prefix:0
diff --git a/addons/account_sequence/i18n/sq.po b/addons/account_sequence/i18n/sq.po
index 269cf8c9e29..b2ab4dae402 100644
--- a/addons/account_sequence/i18n/sq.po
+++ b/addons/account_sequence/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/sr@latin.po b/addons/account_sequence/i18n/sr@latin.po
index 1c5a8bc5d56..65ecdcee6ae 100644
--- a/addons/account_sequence/i18n/sr@latin.po
+++ b/addons/account_sequence/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/sv.po b/addons/account_sequence/i18n/sv.po
index 16b52fb84f8..52243443d9d 100644
--- a/addons/account_sequence/i18n/sv.po
+++ b/addons/account_sequence/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/tr.po b/addons/account_sequence/i18n/tr.po
index 7ec22c1ca6b..708f452f9ab 100644
--- a/addons/account_sequence/i18n/tr.po
+++ b/addons/account_sequence/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/vi.po b/addons/account_sequence/i18n/vi.po
index 9a751c9d442..488f246f696 100644
--- a/addons/account_sequence/i18n/vi.po
+++ b/addons/account_sequence/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/zh_CN.po b/addons/account_sequence/i18n/zh_CN.po
index e5a2aa297e8..4b11d74cc6e 100644
--- a/addons/account_sequence/i18n/zh_CN.po
+++ b/addons/account_sequence/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
diff --git a/addons/account_sequence/i18n/zh_TW.po b/addons/account_sequence/i18n/zh_TW.po
index 98f81b11053..867f39251c5 100644
--- a/addons/account_sequence/i18n/zh_TW.po
+++ b/addons/account_sequence/i18n/zh_TW.po
@@ -8,31 +8,31 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-09-27 11:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-28 02:48+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 #: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
 msgid "Account Sequence Application Configuration"
-msgstr ""
+msgstr "帳戶序列的應用配置"
 
 #. module: account_sequence
 #: constraint:account.move:0
 msgid ""
 "You can not create more than one move per period on centralized journal"
-msgstr ""
+msgstr "餘額憑證簿每個期間只能有一張會計憑證"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "科目和期間必須屬於同一個公司"
 
 #. module: account_sequence
 #: help:account.move,internal_sequence_number:0
@@ -43,12 +43,12 @@ msgstr "內部序列號碼"
 #. module: account_sequence
 #: help:account.sequence.installer,number_next:0
 msgid "Next number of this sequence"
-msgstr "本序列下個號碼"
+msgstr "本序列下一個編號"
 
 #. module: account_sequence
 #: field:account.sequence.installer,number_next:0
 msgid "Next Number"
-msgstr "下個號碼"
+msgstr "下一個編號"
 
 #. module: account_sequence
 #: field:account.sequence.installer,number_increment:0
@@ -58,22 +58,22 @@ msgstr "編號增量"
 #. module: account_sequence
 #: help:account.sequence.installer,number_increment:0
 msgid "The next number of the sequence will be incremented by this number"
-msgstr "序列下個號碼按此數字遞增"
+msgstr "這序列的下一編號將以此數增加"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "Configure Your Account Sequence Application"
-msgstr ""
+msgstr "設置會計序列應用程式"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "Configure"
-msgstr "設定"
+msgstr "設置"
 
 #. module: account_sequence
 #: help:account.sequence.installer,suffix:0
 msgid "Suffix value of the record for the sequence"
-msgstr ""
+msgstr "序號的後綴"
 
 #. module: account_sequence
 #: field:account.sequence.installer,company_id:0
@@ -85,7 +85,7 @@ msgstr "公司"
 msgid ""
 "This sequence will be used to maintain the internal number for the journal "
 "entries related to this journal."
-msgstr ""
+msgstr "此序列用於當前帳簿的所有會計分錄。"
 
 #. module: account_sequence
 #: field:account.sequence.installer,padding:0
@@ -95,25 +95,25 @@ msgstr "數字位數"
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "借貸項"
 
 #. module: account_sequence
 #: field:account.move,internal_sequence_number:0
 #: field:account.move.line,internal_sequence_number:0
 msgid "Internal Number"
-msgstr "內部號碼"
+msgstr "內部編號"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "借貸項不能使用視圖類型的科目"
 
 #. module: account_sequence
 #: help:account.sequence.installer,padding:0
 msgid ""
 "OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
 "get the required padding size."
-msgstr ""
+msgstr "OpenERP將自動新增幾個“0”在“下一個數字”左側滿足填充要求."
 
 #. module: account_sequence
 #: field:account.sequence.installer,name:0
@@ -123,19 +123,19 @@ msgstr "名稱"
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "你不能在已關閉的會計科目建立分錄"
 
 #. module: account_sequence
 #: constraint:account.journal:0
 msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
-msgstr ""
+msgstr "設置錯誤！所選幣別應與預設科目共享。"
 
 #. module: account_sequence
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "會計分錄中包含錯誤的借貸值！"
 
 #. module: account_sequence
 #: field:account.journal,internal_sequence_id:0
@@ -145,32 +145,32 @@ msgstr "內部序列"
 #. module: account_sequence
 #: help:account.sequence.installer,prefix:0
 msgid "Prefix value of the record for the sequence"
-msgstr ""
+msgstr "序列號的前綴"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_move
 msgid "Account Entry"
-msgstr ""
+msgstr "會計分錄"
 
 #. module: account_sequence
 #: field:account.sequence.installer,suffix:0
 msgid "Suffix"
-msgstr ""
+msgstr "後綴"
 
 #. module: account_sequence
 #: field:account.sequence.installer,config_logo:0
 msgid "Image"
-msgstr "圖像"
+msgstr "圖片"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "title"
-msgstr ""
+msgstr "標題"
 
 #. module: account_sequence
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "每個公司的帳簿名稱必須唯一！"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
@@ -178,39 +178,39 @@ msgid ""
 "The selected account of your Journal Entry forces to provide a secondary "
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
-msgstr ""
+msgstr "分錄上的科目要求輸入一個外幣。你可以在科目設置中去掉這個外幣或在日記帳設置上選擇一個支持多幣種的輸入界面。"
 
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
-msgstr ""
+msgstr "分錄日期不在所選期間內！可以修改憑證日期或在日記帳上去掉這個檢查項。"
 
 #. module: account_sequence
 #: field:account.sequence.installer,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "前綴"
 
 #. module: account_sequence
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "每個公司的帳簿編碼必須唯一！"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_sequence_installer
 msgid "account.sequence.installer"
-msgstr ""
+msgstr "account.sequence.installer"
 
 #. module: account_sequence
 #: model:ir.model,name:account_sequence.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "帳簿"
 
 #. module: account_sequence
 #: view:account.sequence.installer:0
 msgid "You can enhance the Account Sequence Application by installing ."
-msgstr ""
+msgstr "你可以用安裝的方式來擴充會計序列應用程式"
 
 #~ msgid "Configuration Progress"
 #~ msgstr "配置進度"
diff --git a/addons/account_voucher/__init__.py b/addons/account_voucher/__init__.py
index 9796f81d5e5..2b1478d9fa0 100644
--- a/addons/account_voucher/__init__.py
+++ b/addons/account_voucher/__init__.py
@@ -24,4 +24,4 @@ import invoice
 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/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 16ea771d123..927fda19182 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -20,60 +20,62 @@
 ##############################################################################
 
 {
-    "name" : "eInvoicing & Payments",
-    "version" : "1.0",
-    "author" : 'OpenERP SA',
-    "summary": 'Send Invoices and Track Payments',
-    "description": """
-eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation Entries", "Adjustment Entries", "Closing or Opening Entries" for Sales, Purchase, Bank, Cash, Expense, Contra.
-==============================================================================================================================================================================================
+    'name' : 'eInvoicing & Payments',
+    'version' : '1.0',
+    'author' : 'OpenERP SA',
+    'summary': 'Send Invoices and Track Payments',
+    'description': """
+Invoicing & Payments by Accounting Voucher & Receipts
+======================================================
+The specific and easy-to-use Invoicing system in OpenERP allows you to keep track of your accounting, even when you are not an accountant. It provides an easy way to follow up on your suppliers and customers. 
 
-    * Voucher Entry
-    * Voucher Receipt [Sales & Purchase]
-    * Voucher Payment [Customer & Supplier]
-    * Cheque Register
+You could use this simplified accounting in case you work with an (external) account to keep your books, and you still want to keep track of payments. 
+
+The Invoicing system includes receipts and vouchers (an easy way to keep track of sales and purchases). It also offers you an easy method of registering payments, without having to encode complete abstracts of account.
+
+This module manages:
+
+* Voucher Entry
+* Voucher Receipt [Sales & Purchase]
+* Voucher Payment [Customer & Supplier]
     """,
-    "category": 'Accounting & Finance',
-    "sequence": 4,
-    "website" : "http://openerp.com",
-    "images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"],
-    "depends" : ["account"],
-    "init_xml" : [
+    'category': 'Accounting & Finance',
+    'sequence': 4,
+    'website' : 'http://openerp.com',
+    'images' : ['images/customer_payment.jpeg','images/journal_voucher.jpeg','images/sales_receipt.jpeg','images/supplier_voucher.jpeg'],
+    'depends' : ['account'],
+    'demo' : [],
+    'data' : [
+        'security/ir.model.access.csv',
+        'account_voucher_sequence.xml',
+        'account_voucher_workflow.xml',
+        'account_voucher_report.xml',
+        'wizard/account_statement_from_invoice_view.xml',
+        'account_voucher_view.xml',
+        'voucher_payment_receipt_view.xml',
+        'voucher_sales_purchase_view.xml',
+        'account_voucher_wizard.xml',
+        'account_voucher_pay_invoice.xml',
+        'report/account_voucher_sales_receipt_view.xml',
+        'security/account_voucher_security.xml',
         'account_voucher_data.xml',
     ],
-
-    "demo_xml" : [],
-
-    "update_xml" : [
-        "security/ir.model.access.csv",
-        "account_voucher_sequence.xml",
-        "account_voucher_workflow.xml",
-        "account_voucher_report.xml",
-        "wizard/account_statement_from_invoice_view.xml",
-        "account_voucher_view.xml",
-        "voucher_payment_receipt_view.xml",
-        "voucher_sales_purchase_view.xml",
-        "account_voucher_wizard.xml",
-        "account_voucher_pay_invoice.xml",
-        "report/account_voucher_sales_receipt_view.xml",
-        "security/account_voucher_security.xml"
+    'test' : [
+        'test/case5_suppl_usd_usd.yml',
+        'test/account_voucher.yml',
+        'test/sales_receipt.yml',
+        'test/sales_payment.yml',
+        'test/account_voucher_report.yml',
+        'test/case1_usd_usd.yml',
+        'test/case2_usd_eur_debtor_in_eur.yml',
+        'test/case2_usd_eur_debtor_in_usd.yml',
+        'test/case3_eur_eur.yml',
+        'test/case4_cad_chf.yml',
+        'test/case_eur_usd.yml',
     ],
-    "test" : [
-        "test/account_voucher.yml",
-        "test/sales_receipt.yml",
-        "test/sales_payment.yml",
-        "test/account_voucher_report.yml",
-        "test/case1_usd_usd.yml",
-        "test/case2_usd_eur_debtor_in_eur.yml",
-        "test/case2_usd_eur_debtor_in_usd.yml",
-        "test/case3_eur_eur.yml",
-        "test/case4_cad_chf.yml",
-        "test/case_eur_usd.yml",
-    ],
-    'certificate': '0037580727101',
-    "auto_install": False,
-    "application": True,
-    "installable": True,
+    'auto_install': False,
+    'application': True,
+    'installable': True,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 223705af85e..32be8c34929 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -32,16 +32,31 @@ class res_company(osv.osv):
     _columns = {
         'income_currency_exchange_account_id': fields.many2one(
             'account.account',
-            string="Income Currency Rate",
+            string="Gain Exchange Rate Account",
             domain="[('type', '=', 'other')]",),
         'expense_currency_exchange_account_id': fields.many2one(
             'account.account',
-            string="Expense Currency Rate",
+            string="Loss Exchange Rate Account",
             domain="[('type', '=', 'other')]",),
     }
 
 res_company()
 
+class account_config_settings(osv.osv_memory):
+    _inherit = 'account.config.settings'
+    _columns = {
+        'income_currency_exchange_account_id': fields.related(
+            'company_id', 'income_currency_exchange_account_id',
+            type='many2one',
+            relation='account.account',
+            string="Gain Exchange Rate Account"),
+        'expense_currency_exchange_account_id': fields.related(
+            'company_id', 'expense_currency_exchange_account_id',
+            type="many2one",
+            relation='account.account',
+            string="Loss Exchange Rate Account"),
+    }
+
 class account_voucher(osv.osv):
     def _check_paid(self, cr, uid, ids, name, args, context=None):
         res = {}
@@ -252,6 +267,7 @@ class account_voucher(osv.osv):
     _order = "date desc, id desc"
 #    _rec_name = 'number'
     _columns = {
+        'active': fields.boolean('Active', help="By default, reconciliation vouchers made on draft bank statements are set as inactive, which allow to hide the customer/supplier payment while the bank statement isn't confirmed."),
         'type':fields.selection([
             ('sale','Sale'),
             ('purchase','Purchase'),
@@ -278,10 +294,10 @@ class account_voucher(osv.osv):
              ('proforma','Pro-forma'),
              ('posted','Posted')
             ], 'Status', readonly=True, size=32,
-            help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed Voucher. \
-                        \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \
-                        \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.'),
+            help=' * The \'Draft\' status is used when a user is encoding a new and unconfirmed Voucher. \
+                        \n* The \'Pro-forma\' when voucher is in Pro-forma status,voucher does not have an voucher number. \
+                        \n* The \'Posted\' status is used when user create voucher,a voucher number is generated and voucher entries are created in account \
+                        \n* The \'Cancelled\' status is used when user cancel voucher.'),
         'amount': fields.float('Total', digits_compute=dp.get_precision('Account'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'tax_amount':fields.float('Tax Amount', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}),
         'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Transaction reference number."),
@@ -313,6 +329,7 @@ class account_voucher(osv.osv):
         'is_multi_currency': fields.boolean('Multi Currency Voucher', help='Fields with internal purpose only that depicts if the voucher is a multi currency one or not'),
     }
     _defaults = {
+        'active': True,
         'period_id': _get_period,
         'partner_id': _get_partner,
         'journal_id':_get_journal,
@@ -366,8 +383,9 @@ class account_voucher(osv.osv):
             total_tax = 0.0
 
             if not tax[0].price_include:
-                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_amount, 1).get('taxes', []):
-                    total_tax += tax_line.get('amount', 0.0)
+                for line in voucher.line_ids:
+                    for tax_line in tax_pool.compute_all(cr, uid, tax, line.amount, 1).get('taxes', []):
+                        total_tax += tax_line.get('amount', 0.0)
                 total += total_tax
             else:
                 for line in voucher.line_ids:
@@ -398,31 +416,31 @@ class account_voucher(osv.osv):
 
         line_ids = resolve_o2m_operations(cr, uid, line_pool, line_ids, ["amount"], context)
 
+        total_tax = 0.0
         for line in line_ids:
             line_amount = 0.0
             line_amount = line.get('amount',0.0)
+
+            if tax_id:
+                tax = [tax_pool.browse(cr, uid, tax_id, context=context)]
+                if partner_id:
+                    partner = partner_pool.browse(cr, uid, partner_id, context=context) or False
+                    taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
+                    tax = tax_pool.browse(cr, uid, taxes, context=context)
+
+                if not tax[0].price_include:
+                    for tax_line in tax_pool.compute_all(cr, uid, tax, line_amount, 1).get('taxes', []):
+                        total_tax += tax_line.get('amount')
+
             voucher_total += line_amount
-
-        total = voucher_total
-        total_tax = 0.0
-        if tax_id:
-            tax = [tax_pool.browse(cr, uid, tax_id, context=context)]
-            if partner_id:
-                partner = partner_pool.browse(cr, uid, partner_id, context=context) or False
-                taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
-                tax = tax_pool.browse(cr, uid, taxes, context=context)
-
-            if not tax[0].price_include:
-                for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes', []):
-                    total_tax += tax_line.get('amount')
-                total += total_tax
+        total = voucher_total + total_tax
 
         res.update({
-            'amount':total or voucher_total,
-            'tax_amount':total_tax
+            'amount': total or voucher_total,
+            'tax_amount': total_tax
         })
         return {
-            'value':res
+            'value': res
         }
 
     def onchange_term_id(self, cr, uid, ids, term_id, amount):
@@ -547,6 +565,19 @@ class account_voucher(osv.osv):
         vals = self.recompute_payment_rate(cr, uid, ids, res, currency_id, date, ttype, journal_id, amount, context=context)
         for key in vals.keys():
             res[key].update(vals[key])
+        #TODO: onchange_partner_id() should not returns [pre_line, line_dr_ids, payment_rate...] for type sale, and not 
+        # [pre_line, line_cr_ids, payment_rate...] for type purchase.
+        # We should definitively split account.voucher object in two and make distinct on_change functions. In the 
+        # meanwhile, bellow lines must be there because the fields aren't present in the view, what crashes if the 
+        # onchange returns a value for them
+        if ttype == 'sale':
+            del(res['value']['line_dr_ids'])
+            del(res['value']['pre_line'])
+            del(res['value']['payment_rate'])
+        elif ttype == 'purchase':
+            del(res['value']['line_cr_ids'])
+            del(res['value']['pre_line'])
+            del(res['value']['payment_rate'])
         return res
 
     def recompute_voucher_lines(self, cr, uid, ids, partner_id, journal_id, price, currency_id, ttype, date, context=None):
@@ -588,7 +619,7 @@ class account_voucher(osv.osv):
 
         #set default values
         default = {
-            'value': {'line_ids': [] ,'line_dr_ids': [] ,'line_cr_ids': [] ,'pre_line': False,},
+            'value': {'line_dr_ids': [] ,'line_cr_ids': [] ,'pre_line': False,},
         }
 
         #drop existing lines
@@ -667,6 +698,7 @@ class account_voucher(osv.osv):
 
         #voucher line creation
         for line in account_move_lines:
+
             if _remove_noise_in_o2m():
                 continue
 
@@ -683,14 +715,14 @@ class account_voucher(osv.osv):
                 'move_line_id':line.id,
                 'account_id':line.account_id.id,
                 'amount_original': amount_original,
-                'amount': (move_line_found == line.id) and min(price, amount_unreconciled) or 0.0,
+                'amount': (move_line_found == line.id) and min(abs(price), amount_unreconciled) or 0.0,
                 'date_original':line.date,
                 'date_due':line.date_maturity,
                 'amount_unreconciled': amount_unreconciled,
                 'currency_id': line_currency_id,
             }
-
-            #split voucher amount by most old first, but only for lines in the same currency
+            #in case a corresponding move_line hasn't been found, we now try to assign the voucher amount
+            #on existing invoices: we split voucher amount by most old first, but only for lines in the same currency
             if not move_line_found:
                 if currency_id == line_currency_id:
                     if line.credit:
@@ -771,8 +803,10 @@ class account_voucher(osv.osv):
         if account_id and account_id.tax_ids:
             tax_id = account_id.tax_ids[0].id
 
-        vals = self.onchange_price(cr, uid, ids, line_ids, tax_id, partner_id, context)
-        vals['value'].update({'tax_id':tax_id,'amount': amount})
+        vals = {'value':{} }
+        if ttype in ('sale', 'purchase'):
+            vals = self.onchange_price(cr, uid, ids, line_ids, tax_id, partner_id, context)
+            vals['value'].update({'tax_id':tax_id,'amount': amount})
         currency_id = False
         if journal.currency:
             currency_id = journal.currency.id
@@ -782,9 +816,16 @@ class account_voucher(osv.osv):
             vals[key].update(res[key])
         return vals
 
+    def button_proforma_voucher(self, cr, uid, ids, context=None):
+        context = context or {}
+        wf_service = netsvc.LocalService("workflow")
+        for vid in ids:
+            wf_service.trg_validate(uid, 'account.voucher', vid, 'proforma_voucher', cr)
+        return {'type': 'ir.actions.act_window_close'}
+
     def proforma_voucher(self, cr, uid, ids, context=None):
         self.action_move_line_create(cr, uid, ids, context=context)
-        return {'type': 'ir.actions.act_window_close'}
+        return True
 
     def action_cancel_draft(self, cr, uid, ids, context=None):
         wf_service = netsvc.LocalService("workflow")
@@ -842,7 +883,7 @@ class account_voucher(osv.osv):
             res['account_id'] = account_id
         return {'value':res}
 
-    def _sel_context(self, cr, uid, voucher_id,context=None):
+    def _sel_context(self, cr, uid, voucher_id, context=None):
         """
         Select the context to use accordingly if it needs to be multicurrency or not.
 
@@ -915,6 +956,9 @@ class account_voucher(osv.osv):
         if voucher_brw.number:
             name = voucher_brw.number
         elif voucher_brw.journal_id.sequence_id:
+            if not voucher_brw.journal_id.sequence_id.active:
+                raise osv.except_osv(_('Configuration Error !'),
+                    _('Please activate the sequence of selected journal !'))
             name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id, context=context)
         else:
             raise osv.except_osv(_('Error!'),
@@ -950,11 +994,11 @@ class account_voucher(osv.osv):
         if amount_residual > 0:
             account_id = line.voucher_id.company_id.expense_currency_exchange_account_id
             if not account_id:
-                raise osv.except_osv(_('Warning!'),_("First you have to configure the 'Income Currency Rate' on the company, then create accounting entry for currency rate difference."))
+                raise osv.except_osv(_('Insufficient Configuration!'),_("You should configure the 'Loss Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."))
         else:
             account_id = line.voucher_id.company_id.income_currency_exchange_account_id
             if not account_id:
-                raise osv.except_osv(_('Warning!'),_("First you have to configure the 'Expense Currency Rate' on the company, then create accounting entry for currency rate difference."))
+                raise osv.except_osv(_('Insufficient Configuration!'),_("You should configure the 'Gain Exchange Rate Account' in the accounting settings, to manage automatically the booking of accounting entries related to differences between exchange rates."))
         # Even if the amount_currency is never filled, we need to pass the foreign currency because otherwise
         # the receivable/payable account may have a secondary currency, which render this field mandatory
         account_currency_id = company_currency <> current_currency and current_currency or False
@@ -1045,7 +1089,10 @@ class account_voucher(osv.osv):
             # if the amount encoded in voucher is equal to the amount unreconciled, we need to compute the
             # currency rate difference
             if line.amount == line.amount_unreconciled:
-                currency_rate_difference = line.move_line_id.amount_residual - amount
+                if not line.move_line_id.amount_residual:
+                    raise osv.except_osv(_('Wrong bank statement line'),_("You have to delete the bank statement line which the payment was reconciled to manually. Please check the payment of the partner %s by the amount of %s.")%(line.voucher_id.partner_id.name, line.voucher_id.amount))
+                sign = voucher_brw.type in ('payment', 'purchase') and -1 or 1
+                currency_rate_difference = sign * (line.move_line_id.amount_residual - amount)
             else:
                 currency_rate_difference = 0.0
             move_line = {
@@ -1174,6 +1221,7 @@ class account_voucher(osv.osv):
                 account_id = voucher_brw.partner_id.property_account_receivable.id
             else:
                 account_id = voucher_brw.partner_id.property_account_payable.id
+            sign = voucher_brw.type == 'payment' and -1 or 1
             move_line = {
                 'name': write_off_name or name,
                 'account_id': account_id,
@@ -1182,7 +1230,7 @@ class account_voucher(osv.osv):
                 'date': voucher_brw.date,
                 'credit': diff > 0 and diff or 0.0,
                 'debit': diff < 0 and -diff or 0.0,
-                'amount_currency': company_currency <> current_currency and voucher_brw.writeoff_amount or False,
+                'amount_currency': company_currency <> current_currency and (sign * -1 * voucher_brw.writeoff_amount) or False,
                 'currency_id': company_currency <> current_currency and current_currency or False,
                 'analytic_account_id': voucher_brw.analytic_id and voucher_brw.analytic_id.id or False,
             }
@@ -1266,7 +1314,9 @@ class account_voucher(osv.osv):
                 self.reconcile_send_note(cr, uid, [voucher.id], context=context)
         return True
 
-    def copy(self, cr, uid, id, default={}, context=None):
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
         default.update({
             'state': 'draft',
             'number': False,
@@ -1293,17 +1343,17 @@ class account_voucher(osv.osv):
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             message = "%s <b>created</b>." % self._document_type[obj.type or False]
-            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+            self.message_post(cr, uid, [obj.id], body=message, subtype="account_voucher.mt_voucher", context=context)
 
     def post_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             message = "%s '%s' is <b>posted</b>." % (self._document_type[obj.type or False], obj.move_id.name)
-            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+            self.message_post(cr, uid, [obj.id], body=message, subtype="account_voucher.mt_voucher", context=context)
 
     def reconcile_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             message = "%s <b>reconciled</b>." % self._document_type[obj.type or False]
-            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+            self.message_post(cr, uid, [obj.id], body=message, subtype="account_voucher.mt_voucher", context=context)
 
 account_voucher()
 
@@ -1378,7 +1428,7 @@ class account_voucher_line(osv.osv):
     }
 
     def onchange_reconcile(self, cr, uid, ids, reconcile, amount, amount_unreconciled, context=None):
-        vals = { 'amount': 0.0}
+        vals = {'amount': 0.0}
         if reconcile:
             vals = { 'amount': amount_unreconciled}
         return {'value': vals}
@@ -1460,6 +1510,15 @@ account_voucher_line()
 class account_bank_statement(osv.osv):
     _inherit = 'account.bank.statement'
 
+    def button_confirm_bank(self, cr, uid, ids, context=None):
+        voucher_obj = self.pool.get('account.voucher')
+        voucher_ids = []
+        for statement in self.browse(cr, uid, ids, context=context):
+            voucher_ids += [line.voucher_id.id for line in statement.line_ids if line.voucher_id]
+        if voucher_ids:
+            voucher_obj.write(cr, uid, voucher_ids, {'active': True}, context=context)
+        return super(account_bank_statement, self).button_confirm_bank(cr, uid, ids, context=context)
+
     def button_cancel(self, cr, uid, ids, context=None):
         voucher_obj = self.pool.get('account.voucher')
         for st in self.browse(cr, uid, ids, context=context):
@@ -1495,6 +1554,16 @@ account_bank_statement()
 class account_bank_statement_line(osv.osv):
     _inherit = 'account.bank.statement.line'
 
+    def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
+        res = super(account_bank_statement_line, self).onchange_partner_id(cr, uid, ids, partner_id, context=context)
+        if 'value' not in res:
+            res['value'] = {}
+        res['value'].update({'voucher_id' : False})
+        return res
+
+    def onchange_amount(self, cr, uid, ids, amount, context=None):
+        return {'value' :  {'voucher_id' : False}}
+
     def _amount_reconciled(self, cursor, user, ids, name, args, context=None):
         if not ids:
             return {}
@@ -1521,7 +1590,7 @@ class account_bank_statement_line(osv.osv):
     _columns = {
         'amount_reconciled': fields.function(_amount_reconciled,
             string='Amount reconciled', type='float'),
-        'voucher_id': fields.many2one('account.voucher', 'Payment'),
+        'voucher_id': fields.many2one('account.voucher', 'Reconciliation'),
     }
 
     def unlink(self, cr, uid, ids, context=None):
diff --git a/addons/account_voucher/account_voucher_data.xml b/addons/account_voucher/account_voucher_data.xml
index 8be2851a434..fc008e479e9 100644
--- a/addons/account_voucher/account_voucher_data.xml
+++ b/addons/account_voucher/account_voucher_data.xml
@@ -1,16 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data noupdate="1">
+
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module eInvoicing &amp; Payments has been installed.</value>
-            <value>OpenERP's electronic invoicing allows to ease and fasten the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">eInvoicing &amp; Payments application installed!</field>
+            <field name="body"><![CDATA[<p>OpenERP's electronic invoicing accelerates the creation of invoices and collection of customer payments. Invoices are created in a few clicks and your customers receive them by email. They can pay online and/or import them in their own system.</p>
+<p>You can track customer payments easily and automate follow-ups. You get an overview of the discussion with your customers on each invoice for easier traceability. For advanced accounting features, you should install the "Accounting and Finance" module.</p>]]></field>
+        </record>
 
-You can track customer payments easily and automate the reminders. You get an overview of the discussion with your customers on each invoice to ensure a full traceability.
+        <!-- mail: subtypes -->
+        <record id="mt_voucher" model="mail.message.subtype">
+            <field name="name">Status Change</field>
+            <field name="res_model">account.voucher</field>
+        </record>
 
-If you want to use advanced accounting features, you should install the "Accounting and Finance" module.</value>
-        </function>
     </data>
 </openerp>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 64e1cf22156..2cb393f4008 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -34,6 +34,7 @@
             </field>
         </record>
 
+        <!-- where and when is this view used?? -->
         <record model="ir.ui.view" id="view_voucher_form">
             <field name="name">account.voucher.form</field>
             <field name="model">account.voucher</field>
@@ -47,16 +48,18 @@
                       <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                   </header>
                   <sheet string="Accounting Voucher">
-                    <group col="6" colspan="4">
+                    <group col="4" colspan="4">
                         <field name="partner_id" required="1" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
-                        <field name="payment_rate_currency_id" invisible="1"/>
                         <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id)"/>
                         <field name="journal_id" widget="selection" on_change="onchange_journal_voucher(line_ids, tax_id, amount, partner_id, journal_id, type)"/>
                         <field name="type" required="1"/>
                         <field name="name" colspan="2"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         <field name="reference"/>
+                        <field name="number"/>
+                        <field name="currency_id" groups="base.group_multi_currency"/>
                         <field name="account_id" widget="selection" invisible="True"/>
+                        <field name="payment_rate_currency_id" invisible="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Voucher Entry">
@@ -69,20 +72,16 @@
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                 </tree>
                             </field>
-                            <group col="3">
-                                <group string="Internal Notes">
-                                    <field name="narration" colspan="2" nolabel="1"/>
-                                </group>
-                                <group string="Other Information">
-                                    <field name="number"/>
-                                    <field name="currency_id"/>
-                                </group>
-                                <group col="4" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
-                                    <separator string="Total" colspan="4"/>
-                                    <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection"/>
+                            <group>
+                                <field name="narration" nolabel="1" placeholder="Internal Notes"/>
+                                <group class="oe_subtotal_footer oe_right" attrs="{'invisible':[('type','in',['payment', 'receipt', False])]}">
+                                    <field name="tax_id" on_change="onchange_price(line_ids, tax_id, partner_id)" widget="selection" nolabel="1"/>
                                     <field name="tax_amount" nolabel="1"/>
-                                    <button type="object" icon="terp-stock_format-scientific" name="compute_tax" string="Compute Tax" attrs="{'invisible': [('state','!=','draft')]}"/>
-                                    <label colspan="1" string=""/><field name="amount" string="Total"/>
+                                    <div class="oe_subtotal_footer_separator">
+                                        <label for="amount"/>
+                                        <button type="object" icon="terp-stock_format-scientific"   name="compute_tax" class="oe_link oe_edit_only" string="(Update)" attrs="{'invisible': [('state','!=','draft')]}"/>
+                                    </div>
+                                    <field name="amount" class="oe_subtotal_footer_separator" nolabel="1"/>
                                 </group>
                             </group>
                         </page>
@@ -110,8 +109,8 @@
                     </notebook>
                   </sheet>
                   <div class="oe_chatter">
-                      <field name="message_ids" widget="mail_thread"/>
                       <field name="message_follower_ids" widget="mail_followers"/>
+                      <field name="message_ids" widget="mail_thread"/>
                   </div>
                 </form>
             </field>
@@ -201,33 +200,29 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='import_buttons']" position="inside">
                     <button name="%(action_view_account_statement_from_invoice_lines)d"
-                            string="Import Invoices" type="action" icon="gtk-execute"
+                            string="Import Invoices" type="action"
                             attrs="{'invisible':[('state','=','confirm')]}"/>
                 </xpath>
             </field>
         </record>
 
-        <record id="view_bank_statement_tree_voucher" model="ir.ui.view">
+        <record id="view_bank_statement_form_voucher" model="ir.ui.view">
             <field name="name">account.bank.statement.voucher.tree.inherit</field>
             <field name="model">account.bank.statement</field>
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/tree/field[@name='amount']" position="after">
-                    <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
+                    <field name="voucher_id" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False}"/>
                 </xpath>
+                <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='sequence']" position="before">
+                    <field name="voucher_id" widget="many2onebutton" options="{'label':{'create':'Reconcile','edit':'Edit Reconciliation'}}" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name, 'default_active': False}"/>
+                </xpath>
+                <field name="amount" position="attributes">
+                    <attribute name="on_change">onchange_amount(amount)</attribute>
+                </field>
             </field>
         </record>
 
-        <record id="view_bank_statement_form_voucher" model="ir.ui.view">
-            <field name="name">account.bank.statement.voucher.form.inherit</field>
-            <field name="model">account.bank.statement</field>
-            <field name="inherit_id" ref="account.view_bank_statement_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='sequence']" position="before">
-                    <field name="voucher_id" context="{'line_type': type, 'default_type': amount &lt; 0 and 'payment' or 'receipt', 'type': amount &lt; 0 and 'payment' or 'receipt', 'default_partner_id': partner_id, 'default_journal_id': parent.journal_id, 'default_amount': abs(amount), 'default_reference': ref, 'default_date': date, 'default_name': name}"/>
-                </xpath>
-            </field>
-        </record>
         <record id="view_cash_statement_tree_voucher" model="ir.ui.view">
             <field name="name">account.cash.statement.voucher.tree.inherit</field>
             <field name="model">account.bank.statement</field>
@@ -250,16 +245,23 @@
             </field>
         </record>
 
-        <!-- res.company form view -->
-        <record model="ir.ui.view" id="view_company_inherit_currency_xchange_form">
-            <field name="name">res.company.form.inherit</field>
-            <field name="inherit_id" ref="base.view_company_form"/>
-            <field name="model">res.company</field>
+        <!-- res.config form view -->
+        <record model="ir.ui.view" id="view_account_settings_currency_xchange_form">
+            <field name="name">account.config.settings.inherit</field>
+            <field name="inherit_id" ref="account.view_account_config_settings"/>
+            <field name="model">account.config.settings</field>
+            <field name="priority">20</field>
             <field name="arch" type="xml">
-                <field name="currency_id" position="after">
-                      <field name="income_currency_exchange_account_id"/>
-                      <field name="expense_currency_exchange_account_id"/>
-                </field>
+                <xpath expr="//div[@name='group_multi_currency']" position="after">
+                    <group attrs="{'invisible': [('group_multi_currency', '&lt;&gt;', True)]}" col="2">
+                        <group>
+                            <field name="income_currency_exchange_account_id"/>
+                            <field name="expense_currency_exchange_account_id"/>
+                        </group>
+                        <group>
+                        </group>
+                    </group>
+                </xpath>
             </field>
         </record>
 
@@ -272,10 +274,9 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('account.menu_finance')}"/>
         </record>
-        <record id="todo_open_invoice_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_invoice_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
         </record>
 
     </data>
diff --git a/addons/account_voucher/i18n/ar.po b/addons/account_voucher/i18n/ar.po
index 19cc4dd6199..62746299c9f 100644
--- a/addons/account_voucher/i18n/ar.po
+++ b/addons/account_voucher/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/bg.po b/addons/account_voucher/i18n/bg.po
index a418dfdb58e..fbce7644a6d 100644
--- a/addons/account_voucher/i18n/bg.po
+++ b/addons/account_voucher/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/bs.po b/addons/account_voucher/i18n/bs.po
index 74b2a07705c..04dd01d19da 100644
--- a/addons/account_voucher/i18n/bs.po
+++ b/addons/account_voucher/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ca.po b/addons/account_voucher/i18n/ca.po
index 0cf64a1c698..39ca8cd5d96 100644
--- a/addons/account_voucher/i18n/ca.po
+++ b/addons/account_voucher/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/cs.po b/addons/account_voucher/i18n/cs.po
index 45b4d271ba9..4ecb352c0f7 100644
--- a/addons/account_voucher/i18n/cs.po
+++ b/addons/account_voucher/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/da.po b/addons/account_voucher/i18n/da.po
index 593276c4514..99371fa2c97 100644
--- a/addons/account_voucher/i18n/da.po
+++ b/addons/account_voucher/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index 3a4899d4d60..56cfd412825 100644
--- a/addons/account_voucher/i18n/de.po
+++ b/addons/account_voucher/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/el.po b/addons/account_voucher/i18n/el.po
index aa7bf516124..f79de0ead37 100644
--- a/addons/account_voucher/i18n/el.po
+++ b/addons/account_voucher/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/es.po b/addons/account_voucher/i18n/es.po
index 9feae6b279b..a6e528e2fa0 100644
--- a/addons/account_voucher/i18n/es.po
+++ b/addons/account_voucher/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/es_AR.po b/addons/account_voucher/i18n/es_AR.po
index 1982a854a6f..3bb8fb7c631 100644
--- a/addons/account_voucher/i18n/es_AR.po
+++ b/addons/account_voucher/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/es_CR.po b/addons/account_voucher/i18n/es_CR.po
index 3a229d2d315..7da8580bba1 100644
--- a/addons/account_voucher/i18n/es_CR.po
+++ b/addons/account_voucher/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/es_EC.po b/addons/account_voucher/i18n/es_EC.po
index 8e0d12a48a4..464ad551873 100644
--- a/addons/account_voucher/i18n/es_EC.po
+++ b/addons/account_voucher/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/es_PY.po b/addons/account_voucher/i18n/es_PY.po
index 27d715405af..2b1646b75f1 100644
--- a/addons/account_voucher/i18n/es_PY.po
+++ b/addons/account_voucher/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/et.po b/addons/account_voucher/i18n/et.po
index 2677094f960..19fd1e4b771 100644
--- a/addons/account_voucher/i18n/et.po
+++ b/addons/account_voucher/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Bank Receipt Voucher"
 #~ msgstr "Panga sissetulekuorder"
diff --git a/addons/account_voucher/i18n/fa.po b/addons/account_voucher/i18n/fa.po
index e4bc1a135fe..874772407a6 100644
--- a/addons/account_voucher/i18n/fa.po
+++ b/addons/account_voucher/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po
index ce3d56b353c..bec649eaea1 100644
--- a/addons/account_voucher/i18n/fr.po
+++ b/addons/account_voucher/i18n/fr.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:31+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-11-07 13:27+0000\n"
+"Last-Translator: Frederic Clementi - Camptocamp.com "
+"<frederic.clementi@camptocamp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-11-08 04:47+0000\n"
+"X-Generator: Launchpad (build 16232)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -469,7 +470,7 @@ msgstr "Délai moyen de règlement"
 #. module: account_voucher
 #: field:res.company,income_currency_exchange_account_id:0
 msgid "Income Currency Rate"
-msgstr "Taux de change d'achat"
+msgstr "Compte de gain de change"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1063
@@ -625,9 +626,9 @@ msgid ""
 "Unable to create accounting entry for currency rate difference. You have to "
 "configure the field 'Income Currency Rate' on the company! "
 msgstr ""
-"Impossible de créer une entrée de la comptabilité à cause de la différence "
-"de taux de change. Vous devez configurer le champ 'Taux de change de vente' "
-"sur  la société! "
+"Impossible de créer une écriture comptable à cause de la différence de taux "
+"de change. Vous devez configurer le champ 'Compte de gain de change' au "
+"niveau du formulaire de la société! "
 
 #. module: account_voucher
 #: view:account.voucher:0 view:sale.receipt.report:0
@@ -671,7 +672,7 @@ msgstr "Juin"
 #. module: account_voucher
 #: field:account.voucher,payment_rate_currency_id:0
 msgid "Payment Rate Currency"
-msgstr ""
+msgstr "Taux de change du paiement"
 
 #. module: account_voucher
 #: field:account.voucher,paid:0
@@ -802,7 +803,7 @@ msgstr "Factures et transactions exceptionnelles"
 #. module: account_voucher
 #: field:res.company,expense_currency_exchange_account_id:0
 msgid "Expense Currency Rate"
-msgstr ""
+msgstr "Compte de perte de change"
 
 #. module: account_voucher
 #: sql_constraint:account.invoice:0
@@ -1089,9 +1090,9 @@ msgid ""
 "Unable to create accounting entry for currency rate difference. You have to "
 "configure the field 'Expense Currency Rate' on the company! "
 msgstr ""
-"Impossible de créer une entrée en comptabilité pour la différence de taux de "
-"change. Vous devez configurer le champ \"Taux de change d'achat\" de la "
-"société ! "
+"Impossible de créer une écriture comptable à cause de la différence de taux "
+"de change. Vous devez configurer le champ 'Compte de perte de change' au "
+"niveau du formulaire de la société! "
 
 #. module: account_voucher
 #: field:account.voucher,type:0
@@ -1156,7 +1157,7 @@ msgstr "Année"
 #. module: account_voucher
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr "Solde initial"
+msgstr "Restant dû"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,amount:0
diff --git a/addons/account_voucher/i18n/gl.po b/addons/account_voucher/i18n/gl.po
index 736234b7473..b08efc211e3 100644
--- a/addons/account_voucher/i18n/gl.po
+++ b/addons/account_voucher/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/gu.po b/addons/account_voucher/i18n/gu.po
index bbb554b0c58..906274d386c 100644
--- a/addons/account_voucher/i18n/gu.po
+++ b/addons/account_voucher/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/hi.po b/addons/account_voucher/i18n/hi.po
index 0b1daa131f6..373df4fc31e 100644
--- a/addons/account_voucher/i18n/hi.po
+++ b/addons/account_voucher/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po
index 0a4281ac06f..2e218f63932 100644
--- a/addons/account_voucher/i18n/hr.po
+++ b/addons/account_voucher/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/hu.po b/addons/account_voucher/i18n/hu.po
index 485789f3010..06cb8de16c5 100644
--- a/addons/account_voucher/i18n/hu.po
+++ b/addons/account_voucher/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/id.po b/addons/account_voucher/i18n/id.po
index 894b99594f5..5f751e886be 100644
--- a/addons/account_voucher/i18n/id.po
+++ b/addons/account_voucher/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/it.po b/addons/account_voucher/i18n/it.po
index 6b9cf4fa9ac..c7c662f09fc 100644
--- a/addons/account_voucher/i18n/it.po
+++ b/addons/account_voucher/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ja.po b/addons/account_voucher/i18n/ja.po
index 651f5bbb2eb..b150f4d65ad 100644
--- a/addons/account_voucher/i18n/ja.po
+++ b/addons/account_voucher/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ko.po b/addons/account_voucher/i18n/ko.po
index 6e165dc2e53..b9ee121f8b8 100644
--- a/addons/account_voucher/i18n/ko.po
+++ b/addons/account_voucher/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index 8518eb45f47..93ab1e00893 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "last month"
-msgstr ""
+msgstr "praeitą mėnesį"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
@@ -30,12 +30,12 @@ msgstr ""
 #: code:addons/account_voucher/account_voucher.py:324
 #, python-format
 msgid "Write-Off"
-msgstr ""
+msgstr "Nurašymas"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Ref"
-msgstr ""
+msgstr "Mokėjimo nuoroda"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -45,7 +45,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Customer Journal Entries"
-msgstr ""
+msgstr "Atviri kliento žurnalo įrašai"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1063
@@ -57,18 +57,18 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0 view:sale.receipt.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupuoti pagal..."
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:797
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
-msgstr ""
+msgstr "Negalima ištrinti kvito(-ū) kuris(-ie) yra atviri arba apmokėti!"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Supplier"
-msgstr ""
+msgstr "Tiekėjas"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -92,7 +92,7 @@ msgstr ""
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Kovas"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
@@ -106,7 +106,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Pay Bill"
-msgstr ""
+msgstr "Apmokėti sąskaitą"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0 field:account.voucher.line,company_id:0
@@ -132,27 +132,27 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "Panaikinti sugretinimą"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Voucher Statistics"
-msgstr ""
+msgstr "Kvito statistika"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate"
-msgstr ""
+msgstr "Patvirtinti"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Diena"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Search Vouchers"
-msgstr ""
+msgstr "Ieškoti kvito"
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
@@ -173,23 +173,23 @@ msgstr ""
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #. module: account_voucher
 #: field:account.voucher.line,reconcile:0
 msgid "Full Reconcile"
-msgstr ""
+msgstr "Pilnas sugretinimas"
 
 #. module: account_voucher
 #: field:account.voucher,date_due:0 field:account.voucher.line,date_due:0
 #: view:sale.receipt.report:0 field:sale.receipt.report,date_due:0
 msgid "Due Date"
-msgstr ""
+msgstr "Mokėjimo terminas"
 
 #. module: account_voucher
 #: field:account.voucher,narration:0
 msgid "Notes"
-msgstr ""
+msgstr "Pastabos"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
@@ -204,7 +204,7 @@ msgstr ""
 #. module: account_voucher
 #: selection:account.voucher,type:0 selection:sale.receipt.report,type:0
 msgid "Sale"
-msgstr ""
+msgstr "Pardavimas"
 
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
@@ -224,32 +224,32 @@ msgstr "Suma"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Options"
-msgstr ""
+msgstr "Mokėjimo pasirinkimai"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Other Information"
-msgstr ""
+msgstr "Kita informacija"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0 selection:sale.receipt.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Atšauktas"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,date:0
 msgid "Date payment"
-msgstr ""
+msgstr "Mokėjimo data"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Banko sąskaitos išrašo eilutė"
 
 #. module: account_voucher
 #: view:account.voucher:0 view:account.voucher.unreconcile:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Panaikinti sugretinimą"
 
 #. module: account_voucher
 #: constraint:account.invoice:0
@@ -259,12 +259,12 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
 msgid "Tax"
-msgstr ""
+msgstr "Mokestis"
 
 #. module: account_voucher
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "Pasirinktas žurnalas ir periodas turi priklausyti tai pačiai įmonei."
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
@@ -281,12 +281,12 @@ msgstr "Analitinė sąskaita"
 #: code:addons/account_voucher/account_voucher.py:931
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Įspėjimas"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
-msgstr ""
+msgstr "Mokėjimo informacija"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -420,7 +420,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
 msgid "Sales Receipt"
-msgstr ""
+msgstr "Pardavimo kvitai"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:797
@@ -717,7 +717,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
 msgid "Journal Vouchers"
-msgstr ""
+msgstr "Žurnalo kvitai"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -835,7 +835,7 @@ msgstr ""
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
 #: view:sale.receipt.report:0
 msgid "Sales Receipt Analysis"
-msgstr ""
+msgstr "Pardavimo kvitų analizė"
 
 #. module: account_voucher
 #: field:account.voucher.line,voucher_id:0
@@ -877,7 +877,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
 msgid "Customer Payment"
-msgstr ""
+msgstr "Kliento mokėjimai"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -963,7 +963,7 @@ msgstr "Žurnalas"
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
 msgid "Supplier Payment"
-msgstr ""
+msgstr "Mokėjimas tiekėjui"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -984,7 +984,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
-msgstr ""
+msgstr "Pirkimo kvitas"
 
 #. module: account_voucher
 #: help:account.voucher,payment_rate:0
@@ -1095,7 +1095,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_sale_receipt_report
 msgid "Sales Receipt Statistics"
-msgstr ""
+msgstr "Pardavimo kvitų statistika"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,year:0
@@ -1318,3 +1318,6 @@ msgstr ""
 
 #~ msgid "Contra Voucher"
 #~ msgstr "Contra kvitas"
+
+#~ msgid "Unreconciliation transactions"
+#~ msgstr "Sugretinimo atšaukimo transakcijos"
diff --git a/addons/account_voucher/i18n/mn.po b/addons/account_voucher/i18n/mn.po
index ae448ef37db..c2940832757 100644
--- a/addons/account_voucher/i18n/mn.po
+++ b/addons/account_voucher/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -104,9 +104,10 @@ msgid ""
 "automatically and you can record the customer payment related to this sales "
 "receipt."
 msgstr ""
-"Барааг захиалагчид борлуулахдаа борлуулалтын баримт эсвэл нэхэмжлэх түүнд "
-"өгч болно. Борлуулалтын баримт батлагдахад журналын бичилт автоматаар "
-"хийгдэж захиалагчийн төлбөрийг холбогдох борлуулалтын баримтанд хөтлөж болно."
+"Та захиалагчид бараа бүтээгдэхүүн зарахдаа түүнд борлуулалтын төлбөрийн "
+"баримт эсвэл нэхэмжлэл өгөх боломжтой. Борлуулалтын төлбөрийн баримт "
+"батлагдмагц тухайн борлуулалттай холбоотой төлбөрийн журналын бичилт "
+"автоматаар үүснэ."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -162,7 +163,7 @@ msgstr "Ваучераар хайх"
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Counterpart Account"
-msgstr "Ижил данс"
+msgstr "Гүйцээлтийн данс"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0 field:account.voucher.line,account_id:0
@@ -183,7 +184,7 @@ msgstr "Тийм"
 #. module: account_voucher
 #: field:account.voucher.line,reconcile:0
 msgid "Full Reconcile"
-msgstr "Бүгдийг Тулгах"
+msgstr "Бүтэн гүйцээлт"
 
 #. module: account_voucher
 #: field:account.voucher,date_due:0 field:account.voucher.line,date_due:0
@@ -234,7 +235,7 @@ msgstr "Дүн"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Options"
-msgstr "Төлбөрийн Сонголтууд"
+msgstr "Төлбөрйин сонголт"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -259,7 +260,7 @@ msgstr "Банкны тайлангийн мөр"
 #. module: account_voucher
 #: view:account.voucher:0 view:account.voucher.unreconcile:0
 msgid "Unreconcile"
-msgstr "Тулгалтыг арилгах"
+msgstr "Гүйцээлтийг цуцлах"
 
 #. module: account_voucher
 #: constraint:account.invoice:0
@@ -280,7 +281,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Counterpart Comment"
-msgstr "Ижил тайлбар"
+msgstr "Гүйцээлтийн тайлбар"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
@@ -297,7 +298,7 @@ msgstr "Анхааруулга"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Information"
-msgstr "Төлбрийн Мэдээлэл"
+msgstr "Төлбөрийн мэдээлэл"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -433,7 +434,7 @@ msgstr "Тулгалтыг арилгаж, бичлэгийг устгахдаа
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt
 msgid "Sales Receipt"
-msgstr "Борлуулалтын баримт"
+msgstr "Борлуулалтын төлбөрийн баримт"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:797
@@ -459,7 +460,7 @@ msgstr "Тулгагдаагүй бичилтүүд"
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Difference Amount"
-msgstr "Зөрүүтэй дүн"
+msgstr "Зөрүү дүн"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,due_delay:0
@@ -469,7 +470,7 @@ msgstr "Дундаж Хугацаа Хэтрэлт"
 #. module: account_voucher
 #: field:res.company,income_currency_exchange_account_id:0
 msgid "Income Currency Rate"
-msgstr "Орлогын Валютын Ханш"
+msgstr "Ханшийн зөрүүний олзын данс"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1063
@@ -508,7 +509,7 @@ msgstr "Харилцагч"
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr "Төлбөрийн зөрүү"
+msgstr "Зөрүүг шийдэх"
 
 #. module: account_voucher
 #: constraint:account.bank.statement.line:0
@@ -528,7 +529,7 @@ msgstr "Үзлэг хийх"
 #: code:addons/account_voucher/account_voucher.py:1103
 #, python-format
 msgid "change"
-msgstr "өөрчлөх"
+msgstr "зөрүү"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -607,7 +608,7 @@ msgstr "Ваучер бүрэн төлөгдлөө."
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile Payment Balance"
-msgstr "Төлбөрийн Балансыг Тулгах"
+msgstr "Төлбөрийн үлдэгдлийг гүйцээх"
 
 #. module: account_voucher
 #: view:account.voucher:0 selection:account.voucher,state:0
@@ -622,8 +623,8 @@ msgid ""
 "Unable to create accounting entry for currency rate difference. You have to "
 "configure the field 'Income Currency Rate' on the company! "
 msgstr ""
-"Ханшийн ялгааны дансны бичилтийг үүсгэх боломжгүй. 'Орлогын Валютын Ханш' "
-"талбарыг компани дээр тохируулах шаардлагатай! "
+"Ханшийн зөрүү бүртгэх санхүүгийн бичилтийг үүсгэх боломжгүй байна. Та "
+"компаны тохиргоо дээрх 'Ханшийн зөрүүний олзын данс' талбарыг бөглөнө үү! "
 
 #. module: account_voucher
 #: view:account.voucher:0 view:sale.receipt.report:0
@@ -638,7 +639,7 @@ msgstr "Татвартай нийлбэр"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Allocation"
-msgstr "Хуваарилалт"
+msgstr "Төлөх дүн"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -776,7 +777,7 @@ msgstr "Нийлүүлэгчийн Журналын Бичилтүүдийг Н
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Allocation"
-msgstr "Нийт Хуваарилалт"
+msgstr "Нийт төлөх дүн"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -791,12 +792,12 @@ msgstr "Илгээх"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Invoices and outstanding transactions"
-msgstr "Нэхэмжлэхүүд болон хэтэрсэн гүйлгээнүүд"
+msgstr "Нэхэмжлэл болон төлөгдөөгүй гүйлгээнүүд"
 
 #. module: account_voucher
 #: field:res.company,expense_currency_exchange_account_id:0
 msgid "Expense Currency Rate"
-msgstr "Зардлын Валютын Ханш"
+msgstr "Ханшийн зөрүүний гарзын данс"
 
 #. module: account_voucher
 #: sql_constraint:account.invoice:0
@@ -864,7 +865,7 @@ msgstr "Борлуулалтын Мэдээлэл"
 #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all
 #: view:sale.receipt.report:0
 msgid "Sales Receipt Analysis"
-msgstr "Борлуулалтын Баримтын Шинжилгээ"
+msgstr "Борлуулалтын төлбөрийн баримтын анализ"
 
 #. module: account_voucher
 #: field:account.voucher.line,voucher_id:0
@@ -906,7 +907,7 @@ msgstr "Журналын бичилтүүд"
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
 msgid "Customer Payment"
-msgstr "Захиалагчийн Төлбөр"
+msgstr "Захиалагчийн төлөлт"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice:0
@@ -932,7 +933,7 @@ msgstr "жил"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Currency Options"
-msgstr "Валютын Сонголтууд"
+msgstr "Валютын сонголт"
 
 #. module: account_voucher
 #: help:account.voucher,payment_option:0
@@ -942,9 +943,9 @@ msgid ""
 "either choose to keep open this difference on the partner's account, or "
 "reconcile it with the payment(s)"
 msgstr ""
-"Энэ талбар нь эцсийн төлсөн дүн болон хуваарилагдсан дүнгийн ялгавар дээр юу "
-"хийхийг сонгодог. Энэ ялгаварыг харилцагчийн данс дээр нээх эсвэл "
-"төлбөрүүдтэй тулгахын аль нэгийг хийж болно."
+"Энэ сонголтоор та төлөх дүн болон төлж буй дүн хоёрыг зөрүүг хэрхэхийг "
+"шийдвэрлэх болно. Та энэ зөрүүг харилцагчийн үлдэгдэл хэвээр үлдээх эсвэл "
+"төлөлтөөр гүйцээх"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -970,12 +971,12 @@ msgstr "Илгээгдсэн Ваучерууд"
 #. module: account_voucher
 #: field:account.voucher,payment_rate:0
 msgid "Exchange Rate"
-msgstr "Солилцооны ханш"
+msgstr "Хөрвүүлэлтийн ханш"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Method"
-msgstr "Төлбөрийн Арга"
+msgstr "Төлбөрийн хэлбэр"
 
 #. module: account_voucher
 #: field:account.voucher.line,name:0
@@ -1008,12 +1009,12 @@ msgstr "Дотоод тэмдэглэл"
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,line_cr_ids:0
 msgid "Credits"
-msgstr ""
+msgstr "Кредит"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount_original:0
 msgid "Original Amount"
-msgstr "Оригиналь Амт"
+msgstr "Жинхэнэ дүн"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
@@ -1027,8 +1028,8 @@ msgid ""
 "The specific rate that will be used, in this voucher, between the selected "
 "currency (in 'Payment Rate Currency' field)  and the voucher currency."
 msgstr ""
-"Энэ ваучерт сонгосон валют ('Төлбөрийн Ханшийн Валют' талбар дахь) болон "
-"ваучерийн валют хооронд хэрэглэгдэх тусгайлсан ханш"
+"Энд тодорхойлсон ханш нь уг ваучерийн валют болон нэхэмжлэлийн валют "
+"хоорондын хөрвүүлэлтэд хэрэглэгдэнэ."
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0 view:account.invoice:0
@@ -1041,7 +1042,7 @@ msgstr "Төлбөр"
 #: view:account.voucher:0 selection:account.voucher,state:0
 #: view:sale.receipt.report:0 selection:sale.receipt.report,state:0
 msgid "Posted"
-msgstr "Илгээгдсэн"
+msgstr "Батлагдсан"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1080,8 +1081,8 @@ msgid ""
 "Unable to create accounting entry for currency rate difference. You have to "
 "configure the field 'Expense Currency Rate' on the company! "
 msgstr ""
-"Ханшийн ялгааны санхүүгийн бичилтийг үүсгэх боломжгүй. 'Зардлын Валютийн "
-"Ханш' талбарыг компани дээр тохируулах шаардлагатай! "
+"Ханшийн зөрүү бүртгэх бичилтийг үүсгэх боломжгүй байна. Та компаны тохиргоо "
+"дээрх 'Ханшийн зөрүүний гарзын данс' талбарыг бөглөнө үү! "
 
 #. module: account_voucher
 #: field:account.voucher,type:0
@@ -1136,7 +1137,7 @@ msgstr "Татвар татахгүй дүн"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_sale_receipt_report
 msgid "Sales Receipt Statistics"
-msgstr "Борлуулалтын Баримтын Шинжилгээ"
+msgstr "Борлуулалтын төлбөрийн баримтын статистик"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,year:0
@@ -1146,7 +1147,7 @@ msgstr "Жил"
 #. module: account_voucher
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr "Нээлттэй Баланс"
+msgstr "Төлөгдөөгүй үлдэгдэл"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,amount:0
diff --git a/addons/account_voucher/i18n/nl.po b/addons/account_voucher/i18n/nl.po
index 5056ef787c3..84eb08244a6 100644
--- a/addons/account_voucher/i18n/nl.po
+++ b/addons/account_voucher/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:01+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-11-17 09:57+0000\n"
+"Last-Translator: Stefan Rijnhart (Therp) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-11-18 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -319,7 +319,7 @@ msgstr "Importeer facturen"
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0 selection:sale.receipt.report,pay_now:0
 msgid "Pay Later or Group Funds"
-msgstr "Betaal later of groepeer fondsen"
+msgstr "Betaal later"
 
 #. module: account_voucher
 #: help:account.voucher,writeoff_amount:0
@@ -683,7 +683,7 @@ msgstr "Betaald"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Terms"
-msgstr "Betalingsconditie"
+msgstr "Betalingscondities"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -846,7 +846,7 @@ msgstr ""
 #: view:account.voucher:0
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
-msgstr "Betalingsintentie"
+msgstr "Journaalbon"
 
 #. module: account_voucher
 #: field:account.voucher,number:0
@@ -1106,7 +1106,7 @@ msgstr "Boekingen veroorzaakt door facturen"
 #. module: account_voucher
 #: field:account.voucher,move_id:0
 msgid "Account Entry"
-msgstr "Boeking"
+msgstr "Journaalpost"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
diff --git a/addons/account_voucher/i18n/nl_BE.po b/addons/account_voucher/i18n/nl_BE.po
index 58d4e69d483..8e86611f2ad 100644
--- a/addons/account_voucher/i18n/nl_BE.po
+++ b/addons/account_voucher/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/oc.po b/addons/account_voucher/i18n/oc.po
index 4193ece4e67..15f7d5a33fa 100644
--- a/addons/account_voucher/i18n/oc.po
+++ b/addons/account_voucher/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/pl.po b/addons/account_voucher/i18n/pl.po
index b735102ea05..370e2037298 100644
--- a/addons/account_voucher/i18n/pl.po
+++ b/addons/account_voucher/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/pt.po b/addons/account_voucher/i18n/pt.po
index f26bff523f2..44c1b658dbb 100644
--- a/addons/account_voucher/i18n/pt.po
+++ b/addons/account_voucher/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po
index 4b7e48e402b..3018d1ebef9 100644
--- a/addons/account_voucher/i18n/pt_BR.po
+++ b/addons/account_voucher/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-07-28 14:28+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -219,17 +220,17 @@ msgstr "Venda"
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
 msgid "Journal Item"
-msgstr "Item Livro"
+msgstr "Item de Diário"
 
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
-msgstr "Vale Multi Moeda"
+msgstr "Comprovantes Multi Moedas"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
 msgid "Amount"
-msgstr "Montante"
+msgstr "Valor"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -264,7 +265,7 @@ msgstr "Não concilidado"
 #. module: account_voucher
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr "Inválida Comunicação BBA Estruturado!"
+msgstr "Comunicação estruturada BBA inválida !"
 
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
@@ -291,7 +292,7 @@ msgstr "Conta Analítica"
 #: code:addons/account_voucher/account_voucher.py:931
 #, python-format
 msgid "Warning"
-msgstr "Atenção"
+msgstr "Aviso"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -356,7 +357,7 @@ msgstr "Período"
 #: view:account.voucher:0 field:account.voucher,state:0
 #: view:sale.receipt.report:0
 msgid "State"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -438,7 +439,7 @@ msgstr "Recibo de Vendas"
 #: code:addons/account_voucher/account_voucher.py:797
 #, python-format
 msgid "Invalid action !"
-msgstr "Ação invalida !"
+msgstr "Ação inválida!"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -507,14 +508,15 @@ msgstr "Parceiro"
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr "Diferença Pagamento"
+msgstr "Diferença do Pagamento"
 
 #. module: account_voucher
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr "O valor do Recibo deve ser o mesmo valor que o da Linha do Movimento"
+msgstr ""
+"O valor do recibo deve ser o mesmo valor da linha equivalente no extrato"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,audit:0
@@ -592,7 +594,7 @@ msgstr ""
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,user_id:0
 msgid "Salesman"
-msgstr "Vendedor"
+msgstr "Representante"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,delay_to_pay:0
@@ -652,8 +654,8 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
-"Marque esta opção se você não estiver seguro sobre o lançamento e quiser "
-"colocar uma observação \"para ser revisado\" por um responsável contábil."
+"Marque esta opção se você tiver dúvidas sobre o lançamento e quiser colocar "
+"uma observação \"para ser revisado\" por um responsável contábil."
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -767,12 +769,12 @@ msgstr "Crédito"
 #: code:addons/account_voucher/account_voucher.py:895
 #, python-format
 msgid "Please define a sequence on the journal !"
-msgstr "Favor definir a seqüencia no Livro !"
+msgstr "Favor definir a sequência no diário!"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr "Abrir o diário de Entradas de Fornecedor"
+msgstr "Abrir Entradas do Diário de Fornecedor"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -959,10 +961,10 @@ msgid ""
 "customer as well as payment delays. The tool search can also be used to "
 "personalise your Invoices reports and so, match this analysis to your needs."
 msgstr ""
-"A partir deste relatório, você pode ter uma visão geral do montante faturado "
+"A partir deste relatório, você pode ter uma visão geral do valor faturado "
 "para o seu cliente, bem como atrasos nos pagamentos. A ferramenta de "
-"pesquisa também podem ser usada para personalizar seus relatórios de faturas "
-"e, portanto, corresponder está análise às suas necessidades."
+"pesquisa também podem ser usadas para personalizar seus relatórios de "
+"faturas e, portanto, corresponder está análise às suas necessidades."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -977,7 +979,7 @@ msgstr "Taxa de Câmbio"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Method"
-msgstr "Forma de Pagamento"
+msgstr "Método de Pagamento"
 
 #. module: account_voucher
 #: field:account.voucher.line,name:0
@@ -994,7 +996,7 @@ msgstr "Maio"
 #: field:account.voucher,journal_id:0 view:sale.receipt.report:0
 #: field:sale.receipt.report,journal_id:0
 msgid "Journal"
-msgstr "Livro"
+msgstr "Diário"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
@@ -1010,7 +1012,7 @@ msgstr "Anotações Internas"
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,line_cr_ids:0
 msgid "Credits"
-msgstr "Creditos"
+msgstr "Créditos"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount_original:0
@@ -1149,7 +1151,7 @@ msgstr "Ano"
 #. module: account_voucher
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr "Saldo Abertura"
+msgstr "Saldo em Aberto"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,amount:0
diff --git a/addons/account_voucher/i18n/ro.po b/addons/account_voucher/i18n/ro.po
index 5ac64605365..52dcb615464 100644
--- a/addons/account_voucher/i18n/ro.po
+++ b/addons/account_voucher/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index 24e3372b721..7dec82b81a2 100644
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sl.po b/addons/account_voucher/i18n/sl.po
index 61cbdba273e..0388eddfacc 100644
--- a/addons/account_voucher/i18n/sl.po
+++ b/addons/account_voucher/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sq.po b/addons/account_voucher/i18n/sq.po
index becd149d89c..bf98aa951d0 100644
--- a/addons/account_voucher/i18n/sq.po
+++ b/addons/account_voucher/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sr.po b/addons/account_voucher/i18n/sr.po
index 24752cb25ad..da3d4415f4c 100644
--- a/addons/account_voucher/i18n/sr.po
+++ b/addons/account_voucher/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sr@latin.po b/addons/account_voucher/i18n/sr@latin.po
index 58b7807f0fd..305fa011ae7 100644
--- a/addons/account_voucher/i18n/sr@latin.po
+++ b/addons/account_voucher/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index efee133f1e8..2601f7f8cb8 100644
--- a/addons/account_voucher/i18n/sv.po
+++ b/addons/account_voucher/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/tlh.po b/addons/account_voucher/i18n/tlh.po
index 0b19d5de81a..d23ebfd8733 100644
--- a/addons/account_voucher/i18n/tlh.po
+++ b/addons/account_voucher/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index 0ba9b64c052..1b7e9389757 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/uk.po b/addons/account_voucher/i18n/uk.po
index 26404f7c9da..c08bde78e44 100644
--- a/addons/account_voucher/i18n/uk.po
+++ b/addons/account_voucher/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/vi.po b/addons/account_voucher/i18n/vi.po
index 7ba805aae58..d7ea8b2828c 100644
--- a/addons/account_voucher/i18n/vi.po
+++ b/addons/account_voucher/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/zh_CN.po b/addons/account_voucher/i18n/zh_CN.po
index c884902bb63..dd9069475d3 100644
--- a/addons/account_voucher/i18n/zh_CN.po
+++ b/addons/account_voucher/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
diff --git a/addons/account_voucher/i18n/zh_TW.po b/addons/account_voucher/i18n/zh_TW.po
index 24835701ca5..938fb9ea3d5 100644
--- a/addons/account_voucher/i18n/zh_TW.po
+++ b/addons/account_voucher/i18n/zh_TW.po
@@ -7,35 +7,35 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2009-01-23 17:15+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-28 02:30+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "last month"
-msgstr ""
+msgstr "上個月"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation Transactions"
-msgstr ""
+msgstr "反核銷"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:324
 #, python-format
 msgid "Write-Off"
-msgstr "注銷"
+msgstr "補差額"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Ref"
-msgstr "付款參考"
+msgstr "付款單編號"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -45,25 +45,25 @@ msgstr "總額"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Customer Journal Entries"
-msgstr ""
+msgstr "未對帳客戶憑證"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1063
 #, python-format
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
-msgstr ""
+msgstr "必須设置\"%s\"的科目和稅碼"
 
 #. module: account_voucher
 #: view:account.voucher:0 view:sale.receipt.report:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:797
 #, python-format
 msgid "Cannot delete Voucher(s) which are already opened or paid !"
-msgstr ""
+msgstr "不能删除已經過帳或對帳的憑證!"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -74,7 +74,7 @@ msgstr "供應商"
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills
 msgid "Bill Payment"
-msgstr "賬單付款"
+msgstr "帳單付款"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
@@ -87,7 +87,7 @@ msgstr "匯入項目"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher_unreconcile
 msgid "Account voucher unreconcile"
-msgstr ""
+msgstr "未對帳的會計憑證"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -101,7 +101,7 @@ msgid ""
 "invoice. When the sales receipt is confirmed, it creates journal items "
 "automatically and you can record the customer payment related to this sales "
 "receipt."
-msgstr ""
+msgstr "銷售產品給客戶時，可以給客戶一張收據或者發票。如果收據已確認，會創建相應的會計憑證。你可以基於這個收據記錄客戶付款。"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -127,12 +127,12 @@ msgstr "交易參考號碼。"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "依發票年份分組"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
 msgid "Unreconcile entries"
-msgstr ""
+msgstr "未對帳條目"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -157,7 +157,7 @@ msgstr "搜尋換領券"
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Counterpart Account"
-msgstr ""
+msgstr "對方科目"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0 field:account.voucher.line,account_id:0
@@ -168,17 +168,17 @@ msgstr "帳號"
 #. module: account_voucher
 #: field:account.voucher,line_dr_ids:0
 msgid "Debits"
-msgstr ""
+msgstr "借方"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Ok"
-msgstr ""
+msgstr "確定"
 
 #. module: account_voucher
 #: field:account.voucher.line,reconcile:0
 msgid "Full Reconcile"
-msgstr ""
+msgstr "全部核銷"
 
 #. module: account_voucher
 #: field:account.voucher,date_due:0 field:account.voucher.line,date_due:0
@@ -199,7 +199,7 @@ msgid ""
 "payment method (=the journal) and the payment amount. OpenERP will propose "
 "to you automatically the reconciliation of this payment with the open "
 "invoices or sales receipts."
-msgstr ""
+msgstr "銷售付款使你能夠輸入你的客戶付過來的款。輸入付款過程中你要輸入客戶、付款方式和金額。系統會自動提示你要和哪張發票或收據對賬。"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0 selection:sale.receipt.report,type:0
@@ -209,12 +209,12 @@ msgstr "減價"
 #. module: account_voucher
 #: field:account.voucher.line,move_line_id:0
 msgid "Journal Item"
-msgstr ""
+msgstr "會計憑證行"
 
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
-msgstr ""
+msgstr "多幣種憑證"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -244,17 +244,17 @@ msgstr "日期付款"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "銀行對賬單明細"
 
 #. module: account_voucher
 #: view:account.voucher:0 view:account.voucher.unreconcile:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "未對帳"
 
 #. module: account_voucher
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "BBA傳輸結構有誤！"
 
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
@@ -264,24 +264,24 @@ msgstr "稅"
 #. module: account_voucher
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "所選的憑證簿和期間必須屬於相同公司。"
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Counterpart Comment"
-msgstr ""
+msgstr "對應備註"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "輔助核算項目"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:927
 #: code:addons/account_voucher/account_voucher.py:931
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -306,14 +306,14 @@ msgstr "匯入發票"
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0 selection:sale.receipt.report,pay_now:0
 msgid "Pay Later or Group Funds"
-msgstr ""
+msgstr "稍後付款或團購"
 
 #. module: account_voucher
 #: help:account.voucher,writeoff_amount:0
 msgid ""
 "Computed as the difference between the amount stated in the voucher and the "
 "sum of allocation on the voucher lines."
-msgstr ""
+msgstr "計算公式 ： 憑證上输入的金额 - 憑證行的金额合計."
 
 #. module: account_voucher
 #: selection:account.voucher,type:0 selection:sale.receipt.report,type:0
@@ -328,38 +328,38 @@ msgstr "銷售明細"
 #. module: account_voucher
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "錯誤！您不能建立遞歸公司."
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "current month"
-msgstr ""
+msgstr "本月"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "會計期間"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,state:0
 #: view:sale.receipt.report:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 msgid "Debit"
-msgstr ""
+msgstr "借方"
 
 #. module: account_voucher
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "公司名稱必須唯一！"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,nbr:0
 msgid "# of Voucher Lines"
-msgstr ""
+msgstr "憑證明細"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,type:0
@@ -369,12 +369,12 @@ msgstr "類型"
 #. module: account_voucher
 #: field:account.voucher.unreconcile,remove:0
 msgid "Want to remove accounting entries too ?"
-msgstr ""
+msgstr "要刪除會計憑證嗎?"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Pro-forma Vouchers"
-msgstr ""
+msgstr "收據"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -387,7 +387,7 @@ msgstr "換領券項目"
 #: code:addons/account_voucher/account_voucher.py:894
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "錯誤 !"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -408,12 +408,12 @@ msgstr "備忘錄"
 #: view:account.invoice:0 code:addons/account_voucher/invoice.py:32
 #, python-format
 msgid "Pay Invoice"
-msgstr "付發票"
+msgstr "付款"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile and cancel this record ?"
-msgstr ""
+msgstr "你確定要反核銷並作廢這條記錄嗎?"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -426,7 +426,7 @@ msgstr "銷售收據"
 #: code:addons/account_voucher/account_voucher.py:797
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "無效操作 !"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -441,12 +441,12 @@ msgstr "七月"
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation"
-msgstr ""
+msgstr "取消對帳"
 
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Difference Amount"
-msgstr ""
+msgstr "差異金額"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,due_delay:0
@@ -456,13 +456,13 @@ msgstr "平均到期延誤"
 #. module: account_voucher
 #: field:res.company,income_currency_exchange_account_id:0
 msgid "Income Currency Rate"
-msgstr ""
+msgstr "收款幣種匯率"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1063
 #, python-format
 msgid "No Account Base Code and Account Tax Code!"
-msgstr ""
+msgstr "沒有科目和稅碼!"
 
 #. module: account_voucher
 #: field:account.voucher,tax_amount:0
@@ -472,7 +472,7 @@ msgstr "稅金總額"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Validated Vouchers"
-msgstr ""
+msgstr "以覆核的憑證"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0 view:account.voucher.line:0
@@ -495,19 +495,19 @@ msgstr "伙伴"
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr ""
+msgstr "付款差額"
 
 #. module: account_voucher
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "憑證金額必須和對賬單明細上的金額一致"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,audit:0
 msgid "To Review"
-msgstr ""
+msgstr "待審查"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:938
@@ -515,7 +515,7 @@ msgstr ""
 #: code:addons/account_voucher/account_voucher.py:1103
 #, python-format
 msgid "change"
-msgstr ""
+msgstr "變更"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -527,7 +527,7 @@ msgstr "支出明細"
 msgid ""
 "Fields with internal purpose only that depicts if the voucher is a multi "
 "currency one or not"
-msgstr ""
+msgstr "此字段由系統內部使用，區分該憑證是否涉及外幣"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,line_ids:0
@@ -543,7 +543,7 @@ msgstr "十二月"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "依發票月份分組"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,month:0
@@ -560,7 +560,7 @@ msgstr "貨幣"
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 msgid "Payable and Receivables"
-msgstr ""
+msgstr "應收應付"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_payment
@@ -569,7 +569,7 @@ msgid ""
 "suppliers. When you select a supplier, the payment method and an amount for "
 "the payment, OpenERP will propose to reconcile your payment with the open "
 "supplier invoices or bills."
-msgstr ""
+msgstr "付款單用於跟踪你對供應商的付款。選擇供應商、付款方式和付款金額，OpenERP會自動提示你要針對哪張供應商發票付款."
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,user_id:0
@@ -584,12 +584,12 @@ msgstr "平均付款延誤"
 #. module: account_voucher
 #: help:account.voucher,paid:0
 msgid "The Voucher has been totally paid."
-msgstr ""
+msgstr "這張憑證已全部付完."
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile Payment Balance"
-msgstr ""
+msgstr "核銷付款餘額"
 
 #. module: account_voucher
 #: view:account.voucher:0 selection:account.voucher,state:0
@@ -603,12 +603,12 @@ msgstr "草稿"
 msgid ""
 "Unable to create accounting entry for currency rate difference. You have to "
 "configure the field 'Income Currency Rate' on the company! "
-msgstr ""
+msgstr "無法創建匯兌損益會計憑證。你要在公司設置頁面上輸入“收款貨幣匯率” 字段! "
 
 #. module: account_voucher
 #: view:account.voucher:0 view:sale.receipt.report:0
 msgid "Draft Vouchers"
-msgstr ""
+msgstr "草稿憑證"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,price_total_tax:0
@@ -618,7 +618,7 @@ msgstr "連稅總額"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Allocation"
-msgstr ""
+msgstr "分配"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -630,7 +630,7 @@ msgstr "八月"
 msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
-msgstr ""
+msgstr "請勾選，如果您不確定分錄而且標記為\"待審核\"給會計專員。"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -645,12 +645,12 @@ msgstr "六月"
 #. module: account_voucher
 #: field:account.voucher,payment_rate_currency_id:0
 msgid "Payment Rate Currency"
-msgstr ""
+msgstr "付款匯率貨幣"
 
 #. module: account_voucher
 #: field:account.voucher,paid:0
 msgid "Paid"
-msgstr ""
+msgstr "已付款"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -660,7 +660,7 @@ msgstr "付款條件"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile this record ?"
-msgstr ""
+msgstr "確定要對此記錄反對賬嗎?"
 
 #. module: account_voucher
 #: field:account.voucher,date:0 field:account.voucher.line,date_original:0
@@ -676,22 +676,22 @@ msgstr "十一月"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加篩選條件..."
 
 #. module: account_voucher
 #: field:account.voucher,paid_amount_in_company_currency:0
 msgid "Paid Amount in Company Currency"
-msgstr ""
+msgstr "按公司本位幣計的付款金額"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
 msgid "Amount reconciled"
-msgstr ""
+msgstr "已對帳金額"
 
 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
 msgid "Write-Off Analytic Account"
-msgstr ""
+msgstr "註銷輔助核算項目"
 
 #. module: account_voucher
 #: selection:account.voucher,pay_now:0 selection:sale.receipt.report,pay_now:0
@@ -701,12 +701,12 @@ msgstr "直接付款"
 #. module: account_voucher
 #: field:account.voucher.line,type:0
 msgid "Dr/Cr"
-msgstr ""
+msgstr "借/貸"
 
 #. module: account_voucher
 #: field:account.voucher,pre_line:0
 msgid "Previous Payments ?"
-msgstr ""
+msgstr "預付款?"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -717,7 +717,7 @@ msgstr "一月"
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
 msgid "Journal Vouchers"
-msgstr ""
+msgstr "傳票"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -727,44 +727,44 @@ msgstr "計算稅項"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "公司"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:462
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\" !"
-msgstr ""
+msgstr "請為憑​​證簿\"%s\" 設置默認借方科目和默認貸方科目"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
 msgid "Credit"
-msgstr ""
+msgstr "貸方"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:895
 #, python-format
 msgid "Please define a sequence on the journal !"
-msgstr ""
+msgstr "在該賬簿請定義一個序列 !"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "打開供應商的分錄"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Allocation"
-msgstr ""
+msgstr "憑證總額"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "依發票日期分組"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Post"
-msgstr ""
+msgstr "過帳"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -774,12 +774,12 @@ msgstr "發票及未完成交易"
 #. module: account_voucher
 #: field:res.company,expense_currency_exchange_account_id:0
 msgid "Expense Currency Rate"
-msgstr ""
+msgstr "費用外幣匯率"
 
 #. module: account_voucher
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "發票號必須在公司範圍內唯一"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,price_total:0
@@ -803,12 +803,16 @@ msgid ""
 "\n"
 "* The 'Cancelled' state is used when user cancel voucher."
 msgstr ""
+" 新建的憑證是草稿狀態\n"
+"當憑證沒有編號的時候是形式放票狀態\n"
+"當憑證有了編號並生成了會計憑證時是已過帳狀態\n"
+"當用戶作廢了憑證後是作廢狀態"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
-msgstr ""
+msgstr "會計憑證"
 
 #. module: account_voucher
 #: field:account.voucher,number:0
@@ -818,7 +822,7 @@ msgstr "編號"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "銀行對賬單"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -864,12 +868,12 @@ msgstr "取消"
 #: selection:account.voucher,state:0 view:sale.receipt.report:0
 #: selection:sale.receipt.report,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "形式發票"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,move_ids:0
 msgid "Journal Items"
-msgstr ""
+msgstr "帳簿明細"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -883,7 +887,7 @@ msgstr "客戶付款"
 #: view:account.statement.from.invoice:0
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice
 msgid "Import Invoices in Statement"
-msgstr ""
+msgstr "在銀行單據裡導入發票"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0 selection:sale.receipt.report,type:0
@@ -898,12 +902,12 @@ msgstr "付款"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "year"
-msgstr ""
+msgstr "年"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Currency Options"
-msgstr ""
+msgstr "外幣選項"
 
 #. module: account_voucher
 #: help:account.voucher,payment_option:0
@@ -912,12 +916,12 @@ msgid ""
 "difference between the paid amount and the sum of allocated amounts. You can "
 "either choose to keep open this difference on the partner's account, or "
 "reconcile it with the payment(s)"
-msgstr ""
+msgstr "此字段用於選擇對已支付金額和已分配金額的差異如何處理。可以選擇保持欠款狀態，也可以用其他付款來核銷。"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to confirm this record ?"
-msgstr ""
+msgstr "你要確認這條紀錄嗎 ?"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt_report_all
@@ -925,17 +929,17 @@ msgid ""
 "From this report, you can have an overview of the amount invoiced to your "
 "customer as well as payment delays. The tool search can also be used to "
 "personalise your Invoices reports and so, match this analysis to your needs."
-msgstr ""
+msgstr "在這報表中，您能了解到給您的客戶開發票的金額以及拖欠款項。這工具也可以用於搜索您特定的發票報表等。"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Posted Vouchers"
-msgstr ""
+msgstr "已過帳憑證"
 
 #. module: account_voucher
 #: field:account.voucher,payment_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "匯率"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -957,7 +961,7 @@ msgstr "五月"
 #: field:account.voucher,journal_id:0 view:sale.receipt.report:0
 #: field:sale.receipt.report,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "帳簿"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
@@ -973,7 +977,7 @@ msgstr "內部備註"
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,line_cr_ids:0
 msgid "Credits"
-msgstr ""
+msgstr "貸方"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount_original:0
@@ -984,14 +988,14 @@ msgstr "原總額"
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
-msgstr ""
+msgstr "採購付款"
 
 #. module: account_voucher
 #: help:account.voucher,payment_rate:0
 msgid ""
 "The specific rate that will be used, in this voucher, between the selected "
 "currency (in 'Payment Rate Currency' field)  and the voucher currency."
-msgstr ""
+msgstr "用於特定的匯率，適用於這張憑證，用於轉換所選貨幣（在“付款匯率貨幣”字段輸入）和憑證貨幣。"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0 view:account.invoice:0
@@ -1004,7 +1008,7 @@ msgstr "付款"
 #: view:account.voucher:0 selection:account.voucher,state:0
 #: view:sale.receipt.report:0 selection:sale.receipt.report,state:0
 msgid "Posted"
-msgstr ""
+msgstr "已登帳"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1024,7 +1028,7 @@ msgstr "供應商發票及未完成交易"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "上月"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -1034,7 +1038,7 @@ msgstr "四月"
 #. module: account_voucher
 #: help:account.voucher,tax_id:0
 msgid "Only for tax excluded from price"
-msgstr ""
+msgstr "僅針對價外稅"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:931
@@ -1042,7 +1046,7 @@ msgstr ""
 msgid ""
 "Unable to create accounting entry for currency rate difference. You have to "
 "configure the field 'Expense Currency Rate' on the company! "
-msgstr ""
+msgstr "無法為匯兌損益創建會計憑證。你必須在公司設置裡輸入“費用貨幣匯率”字段! "
 
 #. module: account_voucher
 #: field:account.voucher,type:0
@@ -1053,12 +1057,12 @@ msgstr "預設類型"
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice
 #: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines
 msgid "Entries by Statement from Invoices"
-msgstr ""
+msgstr "按發票收付款的憑證行"
 
 #. module: account_voucher
 #: field:account.voucher,move_id:0
 msgid "Account Entry"
-msgstr ""
+msgstr "分錄"
 
 #. module: account_voucher
 #: field:account.voucher,reference:0
@@ -1073,7 +1077,7 @@ msgstr "換領券狀態"
 #. module: account_voucher
 #: help:account.voucher,date:0
 msgid "Effective date for accounting entries"
-msgstr ""
+msgstr "會計分錄的生效日期"
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
@@ -1085,7 +1089,7 @@ msgstr "保持開啟"
 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 ""
+msgstr "如果進行取消對賬處理你必須檢驗處理的所有操作。因為他們不會被禁止"
 
 #. module: account_voucher
 #: field:account.voucher.line,untax_amount:0
@@ -1105,7 +1109,7 @@ msgstr "年份"
 #. module: account_voucher
 #: field:account.voucher.line,amount_unreconciled:0
 msgid "Open Balance"
-msgstr ""
+msgstr "未結餘額"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,amount:0
@@ -1150,3 +1154,6 @@ msgstr "總計"
 
 #~ msgid "Write-Off Comment"
 #~ msgstr "注銷評語"
+
+#~ msgid "Unreconciliation transactions"
+#~ msgstr "取消對帳交易"
diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py
index 14b725cbeca..91ba438756e 100644
--- a/addons/account_voucher/invoice.py
+++ b/addons/account_voucher/invoice.py
@@ -27,11 +27,12 @@ class invoice(osv.osv):
 
     def invoice_pay_customer(self, cr, uid, ids, context=None):
         if not ids: return []
+        mod,modid = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_dialog_form')
         inv = self.browse(cr, uid, ids[0], context=context)
         return {
             'name':_("Pay Invoice"),
             'view_mode': 'form',
-            'view_id': False,
+            'view_id': modid,
             'view_type': 'form',
             'res_model': 'account.voucher',
             'type': 'ir.actions.act_window',
@@ -41,13 +42,13 @@ class invoice(osv.osv):
             'context': {
                 'default_partner_id': inv.partner_id.id,
                 'default_amount': inv.type in ('out_refund', 'in_refund') and -inv.residual or inv.residual,
-                'default_name':inv.name,
+                'default_number':inv.name,
                 'close_after_process': True,
-                'invoice_type':inv.type,
-                'invoice_id':inv.id,
+                'invoice_type': inv.type,
+                'invoice_id': inv.id,
                 'default_type': inv.type in ('out_invoice','out_refund') and 'receipt' or 'payment',
                 'type': inv.type in ('out_invoice','out_refund') and 'receipt' or 'payment'
-                }
+            }
         }
 
 invoice()
diff --git a/addons/account_voucher/report/__init__.py b/addons/account_voucher/report/__init__.py
index caeb155adbe..862843352a8 100644
--- a/addons/account_voucher/report/__init__.py
+++ b/addons/account_voucher/report/__init__.py
@@ -23,4 +23,4 @@ import account_voucher
 import account_voucher_print
 import account_voucher_sales_receipt
 
-# 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_voucher/report/account_voucher_print.rml b/addons/account_voucher/report/account_voucher_print.rml
index 923e900887a..9f0f2e1f07e 100644
--- a/addons/account_voucher/report/account_voucher_print.rml
+++ b/addons/account_voucher/report/account_voucher_print.rml
@@ -219,7 +219,7 @@
             <para style="terp_default_9_30cm">[[ p['pname'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ p['amount'] ]] [[ voucher.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(p['amount'], currency_obj=voucher.currency_id) ]]</para>
           </td>
         </tr>
         <tr>
@@ -323,7 +323,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ voucher.amount ]] [[ voucher.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(voucher.amount, currency_obj=voucher.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt.py b/addons/account_voucher/report/account_voucher_sales_receipt.py
index 53aa5cd4a0d..fdadfc6bc94 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt.py
+++ b/addons/account_voucher/report/account_voucher_sales_receipt.py
@@ -52,7 +52,7 @@ class sale_receipt_report(osv.osv):
              ('proforma','Pro-forma'),
              ('posted','Posted'),
              ('cancel','Cancelled')
-            ], 'Voucher State', readonly=True),
+            ], 'Voucher Status', readonly=True),
         'pay_now':fields.selection([
             ('pay_now','Pay Directly'),
             ('pay_later','Pay Later or Group Funds'),
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index 15b2433ec25..fbd40ee17ba 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -6,7 +6,7 @@
         <field name="name">sale.receipt.report.tree</field>
         <field name="model">sale.receipt.report</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')"  string="Sales Receipt Analysis">
+            <tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')" create="false"  string="Sales Receipt Analysis">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
diff --git a/addons/account_voucher/test/account_voucher.yml b/addons/account_voucher/test/account_voucher.yml
index 9cfb9d61229..c9270dc695c 100644
--- a/addons/account_voucher/test/account_voucher.yml
+++ b/addons/account_voucher/test/account_voucher.yml
@@ -1,7 +1,8 @@
 -
   In order to check account voucher module in OpenERP I create a customer voucher
 -
-  !record {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+  !record {model: account.voucher, id: account_voucher_voucherforaxelor0, view: view_sale_receipt_form}:
+    type: sale
     account_id: account.cash
     amount: 1000.0
     company_id: base.main_company
@@ -47,14 +48,14 @@
 -
   Now I create a Vendor Voucher
 -
-  !record {model: account.voucher, id: account_voucher_voucheraxelor0, view: False}:
+  !record {model: account.voucher, id: account_voucher_voucheraxelor0, view: view_voucher_filter_vendor}:
+    type: purchase
     account_id: account.cash
     amount: 1000.0
     company_id: base.main_company
-    currency_id: base.EUR
     journal_id: account.bank_journal
     name: Voucher Axelor
-    narration: Basic PC
+    narration: PC Assemble SC234
     line_dr_ids:
       - account_id: account.cash
         amount: 1000.0
diff --git a/addons/account_voucher/test/account_voucher_report.yml b/addons/account_voucher/test/account_voucher_report.yml
index 85432f747aa..60dc4103553 100644
--- a/addons/account_voucher/test/account_voucher_report.yml
+++ b/addons/account_voucher/test/account_voucher_report.yml
@@ -1,12 +1,13 @@
 -
   Demo for Account Voucher
 -
-  !record {model: account.voucher, id: account_voucher_voucheraxelor0again}:
+  !record {model: account.voucher, id: account_voucher_voucheraxelor0again, view: view_sale_receipt_form}:
+    type: sale
     account_id: account.cash
     company_id: base.main_company
     journal_id: account.bank_journal
     name: Voucher Axelor
-    narration: Basic PC
+    narration: PC Assemble SC234
     amount: 1000.0
     line_ids:
       - account_id: account.cash
diff --git a/addons/account_voucher/test/case1_usd_usd.yml b/addons/account_voucher/test/case1_usd_usd.yml
index 45c352955f4..300d565f229 100644
--- a/addons/account_voucher/test/case1_usd_usd.yml
+++ b/addons/account_voucher/test/case1_usd_usd.yml
@@ -79,7 +79,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -112,7 +112,7 @@
     period_id: account.period_2
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 100.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -216,6 +216,10 @@
             assert move_line.credit == 63.00, "Debtor account has wrong entry."
         elif move_line.amount_currency == 10.00:
             assert move_line.debit == 9.00, "Writeoff amount is wrong."
+        elif move_line.amount_currency == 240.00:
+            assert move_line.debit == 216.00, "Bank entry is wrong."
+        else:
+            assert False, "Unrecognized journal entry"
 -
   I check the residual amount of Invoice1, should be 20 in amount_currency
 -
@@ -237,7 +241,7 @@
 -
   On the first April, I create the second voucher of payment with values 45 USD, journal USD, 
 -
-  !record {model: account.voucher, id: account_voucher_2_case1}:
+  !record {model: account.voucher, id: account_voucher_2_case1, view: view_vendor_receipt_form}:
     account_id: account.cash
     amount: 45.0
     company_id: base.main_company
@@ -323,8 +327,16 @@
             assert move_line.debit == 4.75, "Writeoff amount is wrong."
         elif move_line.debit == 11.5 and move_line.account_id.reconcile:
             assert move_line.amount_currency == 0.0 and move_line.reconcile_id.id == reconcile_a, "Exchange difference entry for the invoice of 100$ is wrong"
+        elif move_line.credit == 11.5:
+            assert move_line.amount_currency == 0.0
         elif move_line.debit == 31.0 and move_line.account_id.reconcile:
             assert move_line.amount_currency == 0.0 and move_line.reconcile_id.id == reconcile_b, "Exchange difference entry for the invoice of 200$ is wrong"
+        elif move_line.credit == 31.0:
+            assert move_line.amount_currency == 0.0
+        elif move_line.amount_currency == 45.00:
+            assert move_line.debit == 42.75, "Bank entry is wrong."
+        else:
+            assert False, "Unrecognized journal entry"
 -
   I check the residual amount of Invoice1, should be 0 in residual currency and 0 in amount_residual and paid
 -
diff --git a/addons/account_voucher/test/case2_suppl_usd_eur.yml b/addons/account_voucher/test/case2_suppl_usd_eur.yml
index cc4c238aaaf..1a0c250395e 100644
--- a/addons/account_voucher/test/case2_suppl_usd_eur.yml
+++ b/addons/account_voucher/test/case2_suppl_usd_eur.yml
@@ -50,7 +50,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_expense
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -85,7 +85,7 @@
     type : in_invoice
     invoice_line:
       - account_id: account.a_expense
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 100.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
index c37783247db..91f8a629cbb 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_eur.yml
@@ -85,7 +85,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -118,7 +118,7 @@
     period_id: account.period_2
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 100.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
index 36593a2b9cd..cc5e819af30 100644
--- a/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
+++ b/addons/account_voucher/test/case2_usd_eur_debtor_in_usd.yml
@@ -85,7 +85,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -118,7 +118,7 @@
     period_id: account.period_2
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 100.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case3_eur_eur.yml b/addons/account_voucher/test/case3_eur_eur.yml
index d70bd41a2ff..37ea7ea981a 100644
--- a/addons/account_voucher/test/case3_eur_eur.yml
+++ b/addons/account_voucher/test/case3_eur_eur.yml
@@ -39,7 +39,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 150.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -72,7 +72,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 80.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account_voucher/test/case4_cad_chf.yml b/addons/account_voucher/test/case4_cad_chf.yml
index 5ca901cdbca..a2b252497cd 100644
--- a/addons/account_voucher/test/case4_cad_chf.yml
+++ b/addons/account_voucher/test/case4_cad_chf.yml
@@ -73,7 +73,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 200.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -164,7 +164,7 @@
 -
   I check that my currency rate difference is correct. 0 in debit with no amount_currency
 -
-  I check that my writeoff is correct. 11.05 credit and 13.26 amount_currency
+  I check that my writeoff is correct. 11.05 credit and -13.26 amount_currency
 -
   !python {model: account.voucher}: |
     voucher = self.search(cr, uid, [('name', '=', 'First payment: Case 4'), ('partner_id', '=', ref('base.res_partner_19'))])
@@ -179,7 +179,7 @@
         elif move_line.debit == 0.00 and move_line.credit == 0.00:
             assert move_line.amount_currency == 0.00, "Incorrect Currency Difference."
         elif move_line.credit == 10.61:
-            assert move_line.amount_currency == 13.26, "Writeoff amount is wrong."
+            assert move_line.amount_currency == -13.26, "Writeoff amount is wrong."
         else:
             assert False, "Wrong entry"
 -
diff --git a/addons/account_voucher/test/case5_suppl_usd_usd.yml b/addons/account_voucher/test/case5_suppl_usd_usd.yml
new file mode 100644
index 00000000000..3cae9667d84
--- /dev/null
+++ b/addons/account_voucher/test/case5_suppl_usd_usd.yml
@@ -0,0 +1,185 @@
+-
+  In order to check the Account_voucher module with multi-currency in OpenERP, 
+  I create a supplier invoices in USD and make the payment in USD but with another exchange rate and with a write-off
+-
+  I create a cash account with currency USD
+-
+  !record {model: account.account, id: account_cash_usd_id}:
+    currency_id: base.USD
+    name: "cash account in usd"
+    code: "Xcash usd"
+    type: 'liquidity'
+    user_type: "account.data_account_type_cash"
+
+-
+  I create currency USD in OpenERP for November of 1.8 Rate
+-
+  !record {model: res.currency.rate, id: nov_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-11-01' %(datetime.now().year)"
+    rate: 1.8
+-
+  I create currency USD in OpenERP for December of 1.5 Rate
+-
+  !record {model: res.currency.rate, id: dec_usd}:
+    currency_id: base.USD
+    name: !eval "'%s-12-01' %(datetime.now().year)"
+    rate: 1.5
+-
+  I set the income and expense currency accounts on the main company
+-
+  !python {model: res.company}: |
+    from datetime import datetime
+    vals = {
+      'income_currency_exchange_account_id': ref('account.o_expense'),
+      'expense_currency_exchange_account_id': ref('account.o_expense')}
+    self.write(cr, uid, ref('base.main_company'), vals)
+-
+  I create a bank journal with EUR as currency
+-
+  !record {model: account.journal, id: bank_journal_EUR}:
+    name: Bank Journal(EUR)
+    code: BEUR
+    type: bank
+    analytic_journal_id: account.sit
+    sequence_id: account.sequence_bank_journal
+    default_debit_account_id: account.cash
+    default_credit_account_id: account.cash
+    company_id: base.main_company
+    view_id: account.account_journal_bank_view
+-
+  I create a bank journal with USD as currency
+-
+  !record {model: account.journal, id: bank_journal_USD}:
+    name: Bank Journal(USD)
+    code: BUSD
+    type: bank
+    analytic_journal_id: account.sit
+    sequence_id: account.sequence_bank_journal
+    default_debit_account_id: account_cash_usd_id
+    default_credit_account_id: account_cash_usd_id
+    currency: base.USD
+    company_id: base.main_company
+    view_id: account.account_journal_bank_view
+-
+  I set the context as would do the action in supplier invoice menuitem
+-
+  !context
+    'default_type': 'in_invoice'
+-
+  I create the invoice on 1st november for 1000 USD
+-
+  !record {model: account.invoice, id: account_supplier_invoice_november, view: account.invoice_supplier_form}:
+    account_id: account.a_pay
+    company_id: base.main_company
+    currency_id: base.USD
+    date_invoice: !eval "'%s-11-01' %(datetime.now().year)"
+    period_id: account.period_1
+    invoice_line:
+      - account_id: account.a_expense
+        name: '[PCSC234] PC Assemble SC234'
+        price_unit: 1000.0
+        quantity: 1.0
+        product_id: product.product_product_3
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_19
+    reference_type: none
+    check_total : 1000
+-
+  I Validate invoice by clicking on Validate button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_supplier_invoice_november}
+-
+  I check that first invoice move is correct for creditor account(debit - credit == -555.56)
+-
+  !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_supplier_invoice_november"))
+    assert invoice_id.move_id, "Move not created for open invoice"
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('account_id', '=', invoice_id.account_id.id)])
+    move_line = move_line_obj.browse(cr, uid, move_lines[0])
+    assert (move_line.debit - move_line.credit == -555.56), "Invoice move is incorrect for creditor account"
+    assert (move_line.amount_currency == -1000), "Amount currency is incorrect for creditor account"
+-
+  I set the context that will be used for the encoding of all the vouchers of this file
+-
+  !context
+    'type': 'payment'
+-
+  I create the voucher of payment with values $950, journal USD
+-
+  !record {model: account.voucher, id: account_voucher_case_5_supplier_flow, view: view_vendor_payment_form}:
+    account_id: account.cash
+    amount: 950.0
+    company_id: base.main_company
+    journal_id: bank_journal_USD
+    name: 'Payment: Case Basic SUPPLIER USD/USD'
+    partner_id: base.res_partner_19
+    period_id: account.period_12
+    date: !eval time.strftime("%Y-12-01")
+    payment_option: 'with_writeoff'
+    writeoff_acc_id: account.a_expense
+    comment: 'Write Off'
+    type: 'payment'
+-
+  I fill $1000 for the previously encoded invoice
+-
+  !python {model: account.voucher}: |
+    import netsvc, time
+    vals = {}
+    voucher_id = self.browse(cr, uid, ref('account_voucher_case_5_supplier_flow'))
+    for item in voucher_id.line_dr_ids:
+        if item.amount_unreconciled == 1000.00:
+            self.pool.get('account.voucher.line').write(cr, uid, [item.id], {'amount': 1000})
+    assert (voucher_id.state=='draft'), "Voucher is not in draft state"
+-
+  I check that writeoff amount computed is -50.0
+-
+  !assert {model: account.voucher, id: account_voucher_case_5_supplier_flow}:
+    - writeoff_amount == -50.0
+-
+  I confirm the voucher
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_case_5_supplier_flow}
+-
+  I check that the move of my voucher is valid and that it is posted
+-
+  !python {model: account.voucher}: |
+    voucher_id = self.browse(cr, uid, ref('account_voucher_case_5_supplier_flow'))
+    assert voucher_id.state == 'posted', "Voucher state is not posted"
+    for move_line in voucher_id.move_id.line_id:
+        assert move_line.state == 'valid', "Voucher move is not valid"
+-
+  I check that my creditor account is correct
+-
+  I check that the bank entry is -$950 and 633.33€ as amount_currency and credit, respectively.
+-
+  I check that the creditor account has 1 new line with $1000 and 666.67€ as amount_currency and debit, respectively.
+-
+  I check that my currency rate difference is correct (111.11€ in debit/credit with no amount_currency)
+-
+  I check that my writeoff is correct. 33.34€ in credit with -$50 as amount currency
+-
+  !python {model: account.voucher}: |
+    voucher_id = self.browse(cr, uid, ref('account_voucher_case_5_supplier_flow'))
+    for move_line in voucher_id.move_id.line_id:
+        if move_line.amount_currency == -950.00:
+            assert move_line.credit == 633.33, "Wrong bank entry."
+        elif move_line.credit == 111.11 or move_line.debit == 111.11:
+            assert move_line.amount_currency == 0.00, "Incorrect Currency Difference."
+        elif move_line.credit == 33.34:
+            assert move_line.amount_currency == -50.0, "Writeoff amount is wrong."
+        elif move_line.debit == 666.67:
+            assert move_line.amount_currency == 1000.0, "Wrong supplier entry."
+        else:
+            assert False, "Wrong entry. Unrecognized account move line"
+-
+  I check the residual amount of invoice, it should be 0 in residual currency and 0 in amount_residual and paid
+-
+   !python {model: account.invoice}: |
+    invoice_id = self.browse(cr, uid, ref("account_supplier_invoice_november"))
+    move_line_obj = self.pool.get('account.move.line')
+    move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)])
+    move_line = move_line_obj.browse(cr, uid, move_lines[0])
+    assert (move_line.amount_residual_currency == 0.0 and move_line.amount_residual == 0.0 and invoice_id.state == 'paid') , "Residual amount is not correct for supplier invoice"
diff --git a/addons/account_voucher/test/case_eur_usd.yml b/addons/account_voucher/test/case_eur_usd.yml
index 2ca2ded1a72..125277191cb 100644
--- a/addons/account_voucher/test/case_eur_usd.yml
+++ b/addons/account_voucher/test/case_eur_usd.yml
@@ -52,7 +52,7 @@
     period_id: account.period_1
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 1000.0
         quantity: 1.0
         product_id: product.product_product_3
diff --git a/addons/account_voucher/test/sales_payment.yml b/addons/account_voucher/test/sales_payment.yml
index 585ce23aace..b71e42add0b 100644
--- a/addons/account_voucher/test/sales_payment.yml
+++ b/addons/account_voucher/test/sales_payment.yml
@@ -7,7 +7,7 @@
     currency_id: base.EUR
     invoice_line:
       - account_id: account.a_sale
-        name: '[PC1] Basic PC'
+        name: '[PCSC234] PC Assemble SC234'
         price_unit: 450.0
         quantity: 1.0
         product_id: product.product_product_3
@@ -45,7 +45,6 @@
         'account_id': ref('account.cash'),
         'amount': 450.0,
         'company_id': ref('base.main_company'),
-        'currency_id': ref('base.EUR'),
         'journal_id': ref('account.bank_journal'),
         'partner_id': ref('base.res_partner_19'),
         'period_id': ref('account.period_8'),
@@ -53,6 +52,10 @@
     }
     if not res['value']['line_cr_ids']:
       res['value']['line_cr_ids'] = [{'type': 'cr', 'account_id': ref('account.a_recv'),}]
+    #clients aren't sending value of readonly fields in the view, and there is a good reason for that, so here the
+    #create should only use values of fields that are not readonly. That's why i'm removing some of these values
+    del(res['value']['line_cr_ids'][0]['date_original'])
+    del(res['value']['line_cr_ids'][0]['date_due'])
     res['value']['line_cr_ids'][0]['amount'] = 450.0
     vals['line_cr_ids'] = [(0,0,i) for i in res['value']['line_cr_ids']]
     id = self.create(cr, uid, vals)
diff --git a/addons/account_voucher/test/sales_receipt.yml b/addons/account_voucher/test/sales_receipt.yml
index f39d784bd42..cf4bc5c46d3 100644
--- a/addons/account_voucher/test/sales_receipt.yml
+++ b/addons/account_voucher/test/sales_receipt.yml
@@ -1,7 +1,7 @@
 - 
   Creating a Voucher Receipt for partner Seagate with amount 30000.0
 - 
-  !record {model: account.voucher, id: account_voucher_seagate_0}:
+  !record {model: account.voucher, id: account_voucher_seagate_0, view: view_sale_receipt_form}:
     account_id: account.a_recv
     amount: 30000.0
     company_id: base.main_company
@@ -53,7 +53,6 @@
         'account_id': ref('account.cash'),
         'amount': 30000.0,
         'company_id': ref('base.main_company'),
-        'currency_id': ref('base.EUR'),
         'journal_id': ref('account.bank_journal'),
         'partner_id': ref('base.res_partner_19'),
         'period_id': ref('account.period_8'),
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 503c3aeaa5e..b6f367601ff 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -54,6 +54,8 @@
                 <form string="Bill Payment" version="7.0">
                     <group col="6">
                         <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Supplier" context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1, 'invoice_currency': currency_id}"/>
+                        <field name="state" invisible="1"/>
+                        <field name="company_id" invisible="1"/>
                         <field name="amount" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                         <field name="journal_id"
                             domain="[('type','in',['bank', 'cash'])]"
@@ -71,6 +73,7 @@
                     </group>
                     <notebook>
                         <page string="Payment Information">
+                        	<label for="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}"/>
                             <field name="line_dr_ids" attrs="{'invisible': [('type', '=', 'receipt')]}" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" colspan="4" nolabel="1" height="140" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Open Supplier Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -84,6 +87,7 @@
                                     <field name="amount" sum="Total Allocation"/>
                                 </tree>
                             </field>
+                            <label for="line_cr_ids" attrs="{'invisible': [('type', '=', 'payment')]}"/>
                             <field name="line_cr_ids" attrs="{'invisible': [('type', '=', 'payment')]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Open Customer Journal Entries" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -102,9 +106,9 @@
                                     <field name="narration" nolabel="1" colspan="2"/>
                                 </group>
                                 <group string="Other Information" col="4">
-                                    <field name="currency_id" colspan="4"/>
+                                    <field name="currency_id" colspan="4" groups="base.group_multi_currency"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                     <field name="number" colspan="4"/>
                                 </group>
@@ -134,11 +138,8 @@
                     <group>
                         <group>
                             <field name="partner_id" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" context="{'invoice_currency':currency_id, 'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"  string="Supplier"/>
-                            <label for="amount" string="Amount"/>
-                            <div>
-                                <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)" class="oe_inline"/>
-                                <field name="currency_id" class="oe_inline"/>
-                            </div>
+                            <field name="currency_id" invisible="1"/>
+                            <field name="amount" invisible="context.get('line_type', False)" on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)" class="oe_inline" widget='monetary' options='{"currency_field": "currency_id"}'/>
                             <field name="journal_id"
                                 domain="[('type','in',['bank', 'cash'])]"
                                 invisible="context.get('line_type', False)"
@@ -155,6 +156,7 @@
                     </group>
                     <notebook>
                         <page string="Payment Information">
+                        	<label for="line_dr_ids"/>
                             <field name="line_dr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
                                 <tree string="Supplier Invoices and Outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -170,6 +172,7 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)"/>
                                 </tree>
                             </field>
+                            <label for="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}"/>
                             <field name="line_cr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -194,12 +197,12 @@
                                         <separator string="Currency Options" colspan="4"/>
                                         <field name="is_multi_currency" invisible="1"/>
                                         <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                        <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
                                         <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                     </group>
                                     <group col="2">
                                         <separator string="Payment Options" colspan="2"/>
-                                        <field name="writeoff_amount"/>
+                                        <field name="writeoff_amount" widget='monetary' options='{"currency_field": "currency_id"}'/>
                                         <field name="payment_option" required="1"/>
                                         <field name="writeoff_acc_id"
                                                attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
@@ -231,16 +234,16 @@
                                    <field name="credit"/>
                                    <field name="state"/>
                                    <field name="reconcile_id"/>
-                                   <field name="amount_currency"/>
-                                   <field name="currency_id"/>
+                                   <field name="amount_currency" groups="base.group_multi_currency"/>
+                                   <field name="currency_id" groups="base.group_multi_currency"/>
                                </tree>
                             </field>
                         </page>
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
@@ -280,31 +283,22 @@
         <menuitem action="action_vendor_payment" icon="STOCK_JUSTIFY_FILL" sequence="12"
             id="menu_action_vendor_payment"  parent="account.menu_finance_payables"/>
 
-        <record model="ir.ui.view" id="view_vendor_receipt_form">
-            <field name="name">account.voucher.receipt.form</field>
+        <record model="ir.ui.view" id="view_vendor_receipt_dialog_form">
+            <field name="name">account.voucher.receipt.dialog.form</field>
             <field name="model">account.voucher</field>
+            <field name="priority">30</field>
             <field name="arch" type="xml">
-                <form string="Receipt" version="7.0">
-                <header>
-                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)" class="oe_highlight"/>
-                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
-                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
-                </header>
-                <sheet>
-                    <h1><field name="number"/></h1>
+                <form string="Payment" version="7.0">
                     <group>
                         <group>
-                            <field name="partner_id" domain="[('customer','=',True)]" required="1" invisible="context.get('line_type', False)" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
-                            <label for="amount" string="Paid Amount"/>
-                            <div>
-                                <field name="amount" class="oe_inline"
-                                    invisible="context.get('line_type', False)"
-                                    on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
-                                <field name="currency_id" class="oe_inline"/>
-                            </div>
-
+                            <field name="state" invisible="1"/>
+                            <field name="partner_id" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Supplier" context="{'search_default_supplier': 1}"/>
+                            <field name="currency_id" invisible="1"/>
+                            <field name="amount" class="oe_inline"
+                                string="Paid Amount"
+                                widget='monetary' options='{"currency_field": "currency_id"}'
+                                invisible="context.get('line_type', False)"
+                                on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
                             <field name="journal_id"
                                 domain="[('type','in',['bank', 'cash'])]"
                                 invisible="context.get('line_type', False)"
@@ -325,9 +319,9 @@
                             <field name="type" invisible="True"/>
                         </group>
                     </group>
-
-                    <notebook>
+                    <notebook invisible="1">
                         <page string="Payment Information" groups="base.group_user">
+                            <label for="line_cr_ids"/>
                             <field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -344,6 +338,7 @@
                                     <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
                                 </tree>
                             </field>
+                            <label for="line_dr_ids" attrs="{'invisible': [('pre_line','=',False)]}"/>
                             <field name="line_dr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
                                 <tree string="Credits" editable="bottom" colors="gray:amount==0">
                                     <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
@@ -366,11 +361,120 @@
                                 <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
                                     <field name="is_multi_currency" invisible="1"/>
                                     <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
-                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)"/>
+                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
                                     <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
                                 </group>
                                 <group>
-                                    <field name="writeoff_amount"/>
+                                    <field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                    <field name="payment_option" required="1"/>
+                                    <field name="writeoff_acc_id"
+                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
+                                           domain="[('type','=','other')]"/>
+                                    <field name="comment"
+                                           attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
+                                    <field name="analytic_id"
+                                           groups="analytic.group_analytic_accounting"/>
+                                </group>
+                            </group>
+                        </page>
+                    </notebook>
+                    <footer>
+                        <button name="button_proforma_voucher" string="Pay" class="oe_highlight" type="object"/> or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+
+        <record model="ir.ui.view" id="view_vendor_receipt_form">
+            <field name="name">account.voucher.receipt.form</field>
+            <field name="model">account.voucher</field>
+            <field name="arch" type="xml">
+                <form string="Receipt" version="7.0">
+                <header invisible="context.get('line_type', False)">
+                    <button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
+                </header>
+                <sheet>
+                    <h1 attrs="{'invisible': [('number','=',False)]}"><field name="number"/></h1>
+                    <group invisible="context.get('line_type', False)">
+                        <group>
+                            <field name="partner_id" domain="[('customer','=',True)]" required="1" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer': 1}"/>
+                            <field name="currency_id" invisible="1"/>
+                            <field name="amount" class="oe_inline"
+                                string="Paid Amount"
+                                widget="monetary" options="{'currency_field': 'currency_id'}"
+                                on_change="onchange_amount(amount, payment_rate, partner_id, journal_id, currency_id, type, date, payment_rate_currency_id, company_id, context)"/>
+                            <field name="journal_id"
+                                domain="[('type','in',['bank', 'cash'])]"
+                                widget="selection"
+                                on_change="onchange_journal(journal_id, line_cr_ids, False, partner_id, date, amount, type, company_id, context)"
+                                string="Payment Method"/>
+                        </group>
+                        <group>
+                            <field name="date" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                            <field name="reference" string="Payment Ref" placeholder="e.g. 003/10"/>
+                            <field name="name" colspan="2" placeholder="e.g. Invoice SAJ/0042"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+
+                            <field name="account_id"
+                                widget="selection"
+                                invisible="True"/>
+                            <field name="pre_line" invisible="1"/>
+                            <field name="type" invisible="True"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Payment Information" groups="base.group_user">
+                            <label for="line_cr_ids" invisible="context.get('line_type', False)"/>
+                            <field name="line_cr_ids" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
+                                <tree string="Invoices and outstanding transactions" editable="bottom" colors="gray:amount==0">
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        required="1"
+                                        groups="account.group_account_user"/>
+                                    <field name="account_id"  groups="base.group_no_one" domain="[('type','=','receivable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" readonly="1" groups="account.group_account_user"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)" groups="account.group_account_user"/>
+                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
+                                </tree>
+                            </field>
+                            <label for="line_dr_ids" attrs="{'invisible': [('pre_line','=',False)]}"/>
+                            <field name="line_dr_ids" attrs="{'invisible': [('pre_line','=',False)]}" context="{'journal_id':journal_id, 'partner_id':partner_id}" on_change="onchange_line_ids(line_dr_ids, line_cr_ids, amount, currency_id, type, context)">
+                                <tree string="Credits" editable="bottom" colors="gray:amount==0">
+                                    <field name="move_line_id" context="{'journal_id':parent.journal_id, 'partner_id':parent.partner_id}"
+                                        on_change="onchange_move_line_id(move_line_id)"
+                                        domain="[('account_id.type','in',('receivable','payable')), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"
+                                        required="1"/>
+                                    <field name="account_id"  groups="base.group_no_one" domain="[('type','=','receivable')]"/>
+                                    <field name="date_original" readonly="1"/>
+                                    <field name="date_due" readonly="1"/>
+                                    <field name="amount_original" readonly="1"/>
+                                    <field name="amount_unreconciled" readonly="1"/>
+                                    <field name="reconcile" on_change="onchange_reconcile(reconcile, amount, amount_unreconciled, context)"/>
+                                    <field name="amount" sum="Total Allocation" on_change="onchange_amount(amount, amount_unreconciled, context)" string="Allocation"/>
+                                </tree>
+                            </field>
+                            <group col="3">
+                                <group>
+                                    <field name="narration" colspan="2" nolabel="1"/>
+                                </group>
+                                <group col="4" attrs="{'invisible':[('currency_id','=',False),('is_multi_currency','=',False)]}">
+                                    <field name="is_multi_currency" invisible="1"/>
+                                    <field name="payment_rate" required="1" on_change="onchange_rate(payment_rate, amount, currency_id, payment_rate_currency_id, company_id, context)" colspan="3"/>
+                                    <field name="payment_rate_currency_id" colspan="1" nolabel="1" on_change="onchange_payment_rate_currency(currency_id, payment_rate, payment_rate_currency_id, date, amount, company_id, context)" groups="base.group_multi_currency"/>
+                                    <field name="paid_amount_in_company_currency" colspan="4" invisible="1"/>
+                                </group>
+                                <group>
+                                    <field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                     <field name="payment_option" required="1"/>
                                     <field name="writeoff_acc_id"
                                            attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
@@ -401,15 +505,15 @@
                                     <field name="state"/>
                                     <field name="reconcile_id"/>
                                     <field name="amount_currency"/>
-                                    <field name="currency_id"/>
+                                    <field name="currency_id" groups="base.group_multi_currency"/>
                                 </tree>
                             </field>
                         </page>
                     </notebook>
                     </sheet>
-                    <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
+                    <div class="oe_chatter" invisible="context.get('line_type', False)">
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 5bcecfa268e..0a0ad94c870 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -50,7 +50,7 @@
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]</field>
-            <field name="context">{'type':'receipt', 'partner_id': partner_id, 'default_reference':reference}</field>
+            <field name="context">{'default_type':'receipt', 'type':'receipt', 'partner_id': partner_id, 'default_reference':reference}</field>
             <field name="view_id" ref="view_vendor_receipt_form"/>
             <field name="target">current</field>
         </record>
@@ -64,7 +64,7 @@
                     <button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
                     <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
-                    <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
+                    <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure you want to cancel this receipt?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
@@ -72,7 +72,8 @@
                     <h1><label for="number" string="Sale Receipt"/> <field name="number" class="oe_inline" readonly="1"/></h1>
                     <group>
                         <group>
-                            <field name="partner_id" domain="[('customer','=',True)]" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true}'/>
+                            <field name="type" invisible="True"/>
+                            <field name="partner_id" domain="[('customer','=',True)]" on_change="onchange_partner_id(partner_id, journal_id, amount, currency_id, type, date, context)" string="Customer" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": True}'/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                         </group>
                         <group>
@@ -80,15 +81,15 @@
                             <field name="date" on_change="onchange_date(date, currency_id, currency_id, amount, company_id, context)"/>
                             <field name="name"/>
                             <field name="paid" invisible="1"/>
+                            <field name="paid_amount_in_company_currency" invisible="1"/>
                             <field name="currency_id" invisible="1"/>
                         </group>
-                        <field name="type" invisible="True"/>
                     </group>
                     <notebook>
                         <page string="Sales Information">
                             <field name="line_cr_ids" on_change="onchange_price(line_cr_ids, tax_id, partner_id)" context="{'journal_id':journal_id, 'type':type, 'partner_id':partner_id}">
                                 <tree string="Sales Lines" editable="bottom">
-                                    <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection" groups="account.group_account_user"/>
+                                    <field name="account_id" domain="[('user_type.report_type','=','income'),('type','!=','view')]" widget="selection"/>
                                     <field name="name"/>
                                     <field name="amount" sum="Total"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
@@ -146,8 +147,8 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
@@ -208,7 +209,7 @@
                     <button name="proforma_voucher" string="Validate" states="draft" class="oe_highlight"/>
                     <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}" class="oe_highlight"/>
                     <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
-                    <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
+                    <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure you want to cancel this receipt?"/>
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
@@ -235,13 +236,14 @@
                                 widget="selection"
                                 on_change="onchange_journal(journal_id, line_dr_ids, tax_id, partner_id, date, amount, type, company_id, context)"
                                 groups="account.group_account_user"/>
+                            <field name="paid_amount_in_company_currency" invisible="1"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Bill Information">
                             <field name="line_dr_ids" on_change="onchange_price(line_dr_ids, tax_id, partner_id)" context="{'journal_id':journal_id,'partner_id':partner_id}">
                                 <tree string="Expense Lines" editable="bottom">
-                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]" groups="account.group_account_user"/>
+                                    <field name="account_id" widget="selection" domain="[('user_type.report_type','=','expense'), ('type','!=','view')]"/>
                                     <field name="name"/>
                                     <field name="amount"/>
                                     <field name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
@@ -301,8 +303,8 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py
index 859a65e7856..6227cd369d3 100644
--- a/addons/analytic/__openerp__.py
+++ b/addons/analytic/__openerp__.py
@@ -20,13 +20,13 @@
 ##############################################################################
 
 {
-    "name" : "Analytic Accounting",
-    "version": "1.1",
-    "author" : "OpenERP SA",
-    "website" : "http://www.openerp.com",
-    "category": 'Hidden/Dependency',
-    "depends" : ["base", "decimal_precision", "mail"],
-    "description": """
+    'name' : 'Analytic Accounting',
+    'version': '1.1',
+    'author' : 'OpenERP SA',
+    'website' : 'http://www.openerp.com',
+    'category': 'Hidden/Dependency',
+    'depends' : ['base', 'decimal_precision', 'mail'],
+    'description': """
 Module for defining analytic accounting object.
 ===============================================
 
@@ -34,16 +34,15 @@ In OpenERP, analytic accounts are linked to general accounts but are treated
 totally independently. So, you can enter various different analytic operations
 that have no counterpart in the general financial accounts.
     """,
-    "init_xml" : [],
-    "update_xml": ['security/analytic_security.xml',
-                   "security/ir.model.access.csv",
-                   "analytic_sequence.xml",
-                   "analytic_view.xml"
-    ],
-    'demo_xml': [
+    'data': [
+        'security/analytic_security.xml',
+        'security/ir.model.access.csv',
+        'analytic_sequence.xml',
+        'analytic_view.xml',
+        'analytic_data.xml'
     ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : "00462253285027988541",
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 3231b1e6d95..708f9b3b196 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -97,24 +97,32 @@ class account_analytic_account(osv.osv):
         return self._compute_level_tree(cr, uid, ids, child_ids, res, fields, context)
 
     def name_get(self, cr, uid, ids, context=None):
-        if isinstance(ids, (int, long)):
-            ids=[ids]
-        if not ids:
-            return []
         res = []
-        for account in self.browse(cr, uid, ids, context=context):
-            data = []
-            acc = account
-            while acc:
-                data.insert(0, acc.name)
-                acc = acc.parent_id
-            data = ' / '.join(data)
-            res.append((account.id, data))
+        if not ids:
+            return res
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        for id in ids:
+            elmt = self.browse(cr, uid, id, context=context)
+            res.append((id, self._get_one_full_name(elmt)))
         return res
 
-    def _complete_name_calc(self, cr, uid, ids, prop, unknow_none, unknow_dict):
-        res = self.name_get(cr, uid, ids)
-        return dict(res)
+    def _get_full_name(self, cr, uid, ids, name=None, args=None, context=None):
+        if context == None:
+            context = {}
+        res = {}
+        for elmt in self.browse(cr, uid, ids, context=context):
+            res[elmt.id] = self._get_one_full_name(elmt)
+        return res
+
+    def _get_one_full_name(self, elmt, level=6):
+        if level<=0:
+            return '...'
+        if elmt.parent_id:
+            parent_path = self._get_one_full_name(elmt.parent_id, level-1) + "/"
+        else:
+            parent_path = ''
+        return parent_path + elmt.name
 
     def _child_compute(self, cr, uid, ids, name, arg, context=None):
         result = {}
@@ -141,7 +149,8 @@ class account_analytic_account(osv.osv):
             if account.company_id:
                 if account.company_id.currency_id.id != value:
                     raise osv.except_osv(_('Error!'), _("If you set a company, the currency selected has to be the same as it's currency. \nYou can remove the company belonging, and thus change the currency, only on analytic account of type 'view'. This can be really usefull for consolidation purposes of several companies charts with different currencies, for example."))
-        return cr.execute("""update account_analytic_account set currency_id=%s where id=%s""", (value, account.id, ))
+        if value:
+            return cr.execute("""update account_analytic_account set currency_id=%s where id=%s""", (value, account.id, ))
 
     def _currency(self, cr, uid, ids, field_name, arg, context=None):
         result = {}
@@ -153,14 +162,14 @@ class account_analytic_account(osv.osv):
         return result
 
     _columns = {
-        'name': fields.char('Account Name', size=128, required=True),
-        'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'),
-        'code': fields.char('Code/Reference', size=24, select=True),
-        'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Project')], 'Type of Account', required=True, 
+        'name': fields.char('Account/Contract Name', size=128, required=True),
+        'complete_name': fields.function(_get_full_name, type='char', string='Full Account Name'),
+        'code': fields.char('Reference', size=24, select=True),
+        'type': fields.selection([('view','Analytic View'), ('normal','Analytic Account'),('contract','Contract or Project'),('template','Template of Contract')], 'Type of Account', required=True,
                                  help="If you select the View Type, it means you won\'t allow to create journal entries using that account.\n"\
                                   "The type 'Analytic account' stands for usual accounts that you only want to use in accounting.\n"\
                                   "If you select Contract or Project, it offers you the possibility to manage the validity and the invoicing options for this account.\n"\
-                                  "The special type 'Template of Project' allows you to define a template with default data that you can reuse easily."),
+                                  "The special type 'Template of Contract' allows you to define a template with default data that you can reuse easily."),
         'template_id': fields.many2one('account.analytic.account', 'Template of Contract'),
         'description': fields.text('Description'),
         'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
@@ -171,20 +180,20 @@ class account_analytic_account(osv.osv):
         'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')),
         'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'),
-        'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'),
+        'quantity_max': fields.float('Prepaid Service Units', help='Sets the higher limit of time to work on the contract, based on the timesheet. (for instance, number of hours in a limited support contract.)'),
         'partner_id': fields.many2one('res.partner', 'Customer'),
         'user_id': fields.many2one('res.users', 'Project Manager'),
         'manager_id': fields.many2one('res.users', 'Account Manager'),
-        'date_start': fields.date('Date Start'),
+        'date_start': fields.date('Start Date'),
         'date': fields.date('Date End', select=True),
         'company_id': fields.many2one('res.company', 'Company', required=False), #not required because we want to allow different companies to use the same chart of account, except for leaf accounts.
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','To Renew'),('close','Closed')], 'Status', required=True,),
-        'currency_id': fields.function(_currency, fnct_inv=_set_company_currency,
+        'currency_id': fields.function(_currency, fnct_inv=_set_company_currency, #the currency_id field is readonly except if it's a view account and if there is no company
             store = {
                 'res.company': (_get_analytic_account, ['currency_id'], 10),
             }, string='Currency', type='many2one', relation='res.currency'),
     }
-    
+
     def on_change_template(self, cr, uid, ids, template_id, context=None):
         if not template_id:
             return {}
@@ -195,7 +204,7 @@ class account_analytic_account(osv.osv):
         res['value']['quantity_max'] = template.quantity_max
         res['value']['description'] = template.description
         return res
-    
+
     def on_change_partner_id(self, cr, uid, ids,partner_id, name, context={}):
         res={}
         if partner_id:
@@ -238,8 +247,11 @@ class account_analytic_account(osv.osv):
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
-        default['code'] = False
-        default['line_ids'] = []
+        analytic = self.browse(cr, uid, id, context=context)
+        default.update(
+            code=False,
+            line_ids=[],
+            name=_("%s (copy)") % (analytic['name']))
         return super(account_analytic_account, self).copy(cr, uid, id, default, context=context)
 
     def on_change_company(self, cr, uid, id, company_id):
@@ -267,27 +279,27 @@ class account_analytic_account(osv.osv):
         if context is None:
             context={}
         if context.get('current_model') == 'project.project':
-            cr.execute("select analytic_account_id from project_project")
-            project_ids = [x[0] for x in cr.fetchall()]
+            project_obj = self.pool.get("account.analytic.account")
+            project_ids = project_obj.search(cr, uid, args)
             return self.name_get(cr, uid, project_ids, context=context)
         if name:
-            account = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
-            if not account:
+            account_ids = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
+            if not account_ids:
                 names=map(lambda i : i.strip(),name.split('/'))
                 for i in range(len(names)):
                     dom=[('name', operator, names[i])]
                     if i>0:
-                        dom+=[('id','child_of',account)]
-                    account = self.search(cr, uid, dom, limit=limit, context=context)
-                newacc = account
+                        dom+=[('id','child_of',account_ids)]
+                    account_ids = self.search(cr, uid, dom, limit=limit, context=context)
+                newacc = account_ids
                 while newacc:
                     newacc = self.search(cr, uid, [('parent_id', 'in', newacc)], limit=limit, context=context)
-                    account += newacc
+                    account_ids += newacc
                 if args:
-                    account = self.search(cr, uid, [('id', 'in', account)] + args, limit=limit, context=context)
+                    account_ids = self.search(cr, uid, [('id', 'in', account_ids)] + args, limit=limit, context=context)
         else:
-            account = self.search(cr, uid, args, limit=limit, context=context)
-        return self.name_get(cr, uid, account, context=context)
+            account_ids = self.search(cr, uid, args, limit=limit, context=context)
+        return self.name_get(cr, uid, account_ids, context=context)
 
     def create(self, cr, uid, vals, context=None):
         contract =  super(account_analytic_account, self).create(cr, uid, vals, context=context)
@@ -297,7 +309,11 @@ class account_analytic_account(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), context=context)
+            message = _("Contract <b>created</b>.")
+            if obj.partner_id:
+                message = _("Contract for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name,)
+            self.message_post(cr, uid, [obj.id], body=message,
+                subtype="analytic.mt_account_status", context=context)
 
 account_analytic_account()
 
@@ -311,13 +327,20 @@ class account_analytic_line(osv.osv):
         'date': fields.date('Date', required=True, select=True),
         'amount': fields.float('Amount', required=True, help='Calculated by multiplying the quantity and the price given in the Product\'s cost price. Always expressed in the company main currency.', digits_compute=dp.get_precision('Account')),
         'unit_amount': fields.float('Quantity', help='Specifies the amount of quantity to count.'),
-        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='cascade', select=True, domain=[('type','<>','view')]),
+        'account_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True, ondelete='restrict', select=True, domain=[('type','<>','view')]),
         'user_id': fields.many2one('res.users', 'User'),
         'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
 
     }
+
+    def _get_default_date(self, cr, uid, context=None):
+        return fields.date.context_today(self, cr, uid, context=context)
+
+    def __get_default_date(self, cr, uid, context=None):
+        return self._get_default_date(cr, uid, context=context)
+
     _defaults = {
-        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'date': __get_default_date,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.analytic.line', context=c),
         'amount': 0.00
     }
diff --git a/addons/analytic/analytic_data.xml b/addons/analytic/analytic_data.xml
new file mode 100644
index 00000000000..67940fb2063
--- /dev/null
+++ b/addons/analytic/analytic_data.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- mail: subtypes -->
+        <record id="mt_account_status" model="mail.message.subtype">
+            <field name="name">Status Change</field>
+            <field name="res_model">account.analytic.account</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 16100e73fff..1277d25de71 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -8,35 +8,47 @@
             <field name="arch" type="xml">
                 <form string="Analytic Account" version="7.0">
                     <sheet string="Analytic Account">
+                        <div class="oe_right oe_button_box" name="buttons">
+                        </div>
+
+                        <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name"/>
-                        </h1>
-                        <group>
+                            <h1>
+                                <field name="name" class="oe_inline"/>
+                            </h1>
+                            <div name="project"/>
+                        </div>
+
+                        <group name="main">
                             <group>
-                                <field name="partner_id" on_change="on_change_partner_id(partner_id, name)" attrs="{'required':[('type','=','contract')]}"/>
-                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
-                                <field name="type"/>
-                                <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
+                                <field name="partner_id" on_change="on_change_partner_id(partner_id, name)"/>
+                                <field name="manager_id"/>
+                                <field name="currency_id" attrs="{'invisible': ['|',('type', '&lt;&gt;', 'view'), ('company_id', '&lt;&gt;', False)]}"/>
                             </group>
                             <group>
                                 <field name="code"/>
-                                <field name="manager_id"/>
+                                <field name="type" invisible="context.get('default_type', False)"/>
+                                <field name="parent_id" on_change="on_change_parent(parent_id)" attrs="{'invisible': [('type','in',['contract','template'])]}"/>
+                                <field name="template_id" on_change="on_change_template(template_id,context)" domain="[('type','=','template')]" attrs="{'invisible': [('type','in',['view', 'normal','template'])]}" context="{'default_type' : 'template'}"/>
                                 <field name="company_id" on_change="on_change_company(company_id)" widget="selection" groups="base.group_multi_company" attrs="{'required': [('type','&lt;&gt;','view')]}"/>
                             </group>
                         </group>
                         <notebook>
                             <page string="Contract Information" name="contract_page" attrs="{'invisible':[('type','not in',['contract', 'template'])]}">
-                                <group name="master">
-                                    <group string="Validity" name="contract">
-                                        <label for="date_start" string="Duration"/>
-                                        <div name="duration">
-                                            <field name="date_start" class="oe_inline"/> - <field name="date" class="oe_inline"/>
-                                        </div>
-                                    </group>
-                                    <group name="project">
-                                        <separator string="Project Management" name="project_sep" invisible="1"/>
-                                    </group>
+                                <group string="Renewal" name="contract">
+                                    <p colspan="2" class="oe_grey oe_edit_only">
+                                        Once the end date of the contract is
+                                        passed or the maximum number of service
+                                        units (e.g. support contract) is
+                                        reached, the account manager is notified 
+                                        by email to renew the contract with the
+                                        customer.
+                                    </p>
+                                    <field name="date_start"/>
+                                    <label for="date" string="End Date"/>
+                                    <div name="duration">
+                                        <field name="date" class="oe_inline"/>
+                                    </div>
                                 </group>
                                 <separator string="Terms and Conditions" name="description"/>
                                 <field name="description"/>
@@ -44,8 +56,8 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
diff --git a/addons/analytic/i18n/ar.po b/addons/analytic/i18n/ar.po
index b7cd840f440..7948dd4a254 100644
--- a/addons/analytic/i18n/ar.po
+++ b/addons/analytic/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/bg.po b/addons/analytic/i18n/bg.po
index 6768c478979..89410f8b7ee 100644
--- a/addons/analytic/i18n/bg.po
+++ b/addons/analytic/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/bs.po b/addons/analytic/i18n/bs.po
index 947ff88bdb5..8107eca3415 100644
--- a/addons/analytic/i18n/bs.po
+++ b/addons/analytic/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/ca.po b/addons/analytic/i18n/ca.po
index 6f0583b2a98..2e12fe91e65 100644
--- a/addons/analytic/i18n/ca.po
+++ b/addons/analytic/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/cs.po b/addons/analytic/i18n/cs.po
index 999adb6d2b9..3eff079f2d2 100644
--- a/addons/analytic/i18n/cs.po
+++ b/addons/analytic/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: czech\n"
 
 #. module: analytic
diff --git a/addons/analytic/i18n/da.po b/addons/analytic/i18n/da.po
index 9d6a4e1d27a..e1d6c0a0582 100644
--- a/addons/analytic/i18n/da.po
+++ b/addons/analytic/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/de.po b/addons/analytic/i18n/de.po
index e46c0bec121..1f9fb6721e7 100644
--- a/addons/analytic/i18n/de.po
+++ b/addons/analytic/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/el.po b/addons/analytic/i18n/el.po
index ee8ecd6d43f..73508f7d888 100644
--- a/addons/analytic/i18n/el.po
+++ b/addons/analytic/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/es.po b/addons/analytic/i18n/es.po
index 846dfbb5d02..9e5107b109b 100644
--- a/addons/analytic/i18n/es.po
+++ b/addons/analytic/i18n/es.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-02-10 17:16+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -129,6 +129,11 @@ msgid ""
 "consolidation purposes of several companies charts with different "
 "currencies, for example."
 msgstr ""
+"Si establece una compañía, la moneda seleccionada debe ser la misma que la "
+"de la compañía.\n"
+"Puede eliminar la compañía propietaria, y entonces cambiar la moneda, sólo "
+"en las cuentas analíticas de tipo 'Vista'. Esto puede ser realmente útil por "
+"ejemplo para la consolidación de varias compañías con monedas diferentes."
 
 #. module: analytic
 #: field:account.analytic.line,user_id:0
diff --git a/addons/analytic/i18n/es_CR.po b/addons/analytic/i18n/es_CR.po
index baad6a17199..662834492db 100644
--- a/addons/analytic/i18n/es_CR.po
+++ b/addons/analytic/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: analytic
diff --git a/addons/analytic/i18n/es_EC.po b/addons/analytic/i18n/es_EC.po
index 594954729f1..6c50ec8c7c7 100644
--- a/addons/analytic/i18n/es_EC.po
+++ b/addons/analytic/i18n/es_EC.po
@@ -9,8 +9,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/es_PY.po b/addons/analytic/i18n/es_PY.po
index 3bec4348cea..746f57a0a65 100644
--- a/addons/analytic/i18n/es_PY.po
+++ b/addons/analytic/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/et.po b/addons/analytic/i18n/et.po
index 0001246b7f9..dab8872c644 100644
--- a/addons/analytic/i18n/et.po
+++ b/addons/analytic/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/fa.po b/addons/analytic/i18n/fa.po
index 3a28ddedcb5..be8f613cc08 100644
--- a/addons/analytic/i18n/fa.po
+++ b/addons/analytic/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/fi.po b/addons/analytic/i18n/fi.po
index 74f8c72c4eb..399077ef867 100644
--- a/addons/analytic/i18n/fi.po
+++ b/addons/analytic/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/fr.po b/addons/analytic/i18n/fr.po
index 1760034fed5..84b092143c7 100644
--- a/addons/analytic/i18n/fr.po
+++ b/addons/analytic/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/gl.po b/addons/analytic/i18n/gl.po
index f3adeee448c..ee29f4162ed 100644
--- a/addons/analytic/i18n/gl.po
+++ b/addons/analytic/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/hr.po b/addons/analytic/i18n/hr.po
index 4e9fd216d01..898fc0b2708 100644
--- a/addons/analytic/i18n/hr.po
+++ b/addons/analytic/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/hu.po b/addons/analytic/i18n/hu.po
index c62ee27292e..6e5f9655ad2 100644
--- a/addons/analytic/i18n/hu.po
+++ b/addons/analytic/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/it.po b/addons/analytic/i18n/it.po
index c85ac4b20bd..8b45c94b34d 100644
--- a/addons/analytic/i18n/it.po
+++ b/addons/analytic/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/ja.po b/addons/analytic/i18n/ja.po
index ee9719d71eb..0db8d32046c 100644
--- a/addons/analytic/i18n/ja.po
+++ b/addons/analytic/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/lv.po b/addons/analytic/i18n/lv.po
index dee1412d4e1..0c06ae98560 100644
--- a/addons/analytic/i18n/lv.po
+++ b/addons/analytic/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/mn.po b/addons/analytic/i18n/mn.po
index e4c42c35164..8250df07442 100644
--- a/addons/analytic/i18n/mn.po
+++ b/addons/analytic/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/nb.po b/addons/analytic/i18n/nb.po
index 9f25e95f47b..2845d33399b 100644
--- a/addons/analytic/i18n/nb.po
+++ b/addons/analytic/i18n/nb.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "underordnede kontoer"
 
 #. module: analytic
 #: field:account.analytic.account,name:0
@@ -30,7 +30,7 @@ msgstr "Kontonavn"
 #. module: analytic
 #: help:account.analytic.line,unit_amount:0
 msgid "Specifies the amount of quantity to count."
-msgstr ""
+msgstr "Angir mengden avnkvantitet å telle."
 
 #. module: analytic
 #: field:account.analytic.account,state:0
@@ -40,7 +40,7 @@ msgstr "Status"
 #. module: analytic
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr ""
+msgstr "kontofører"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -70,11 +70,21 @@ msgid ""
 " 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år en konto er opprettet sin i \"Kladd\" tilstand.\n"
+"* Hvis noen assosiert partner er der, kan det være i 'åpen' tilstand.\n"
+"* Hvis noen ventende balanse er det det kan være i 'Pending \".\n"
+"* Og til slutt når alle transaksjoner er over, kan det være i \"Lukk\" "
+"tilstand.\n"
+"* Prosjektet kan være enten hvis statenes mal \"og\" Running \".\n"
+"  Hvis det er malen så kan vi lage prosjekter basert på mal prosjekter. Hvis "
+"det i 'Running' tilstand er det en normal prosjekt.\n"
+"  Hvis det er å bli vurdert så staten \"Venter\".\n"
+"  Når prosjektet er fullført staten er satt til 'Ferdig'"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. module: analytic
 #: field:account.analytic.account,type:0
@@ -84,12 +94,12 @@ msgstr "Kontotype"
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Pending"
-msgstr ""
+msgstr "Venter"
 
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Analytisk linje"
 
 #. module: analytic
 #: field:account.analytic.account,description:0
@@ -119,6 +129,12 @@ msgid ""
 "consolidation purposes of several companies charts with different "
 "currencies, for example."
 msgstr ""
+"Hvis du angir et selskap, har valutaen valgt å være det samme som det er "
+"valuta.\n"
+"Du kan fjerne selskap som tilhører, og dermed endre valutaen, bare på "
+"analytisk grunn av type 'view'. Dette kan være veldig nyttig for "
+"konsolideringsformål av flere selskaper diagrammer med ulike valutaer, for "
+"eksempel."
 
 #. module: analytic
 #: field:account.analytic.line,user_id:0
@@ -158,12 +174,12 @@ msgstr ""
 #. module: analytic
 #: field:account.analytic.account,child_complete_ids:0
 msgid "Account Hierarchy"
-msgstr ""
+msgstr "konto hierarkiet"
 
 #. module: analytic
 #: help:account.analytic.account,quantity_max:0
 msgid "Sets the higher limit of time to work on the contract."
-msgstr ""
+msgstr "Setter høyere grense av tid til å jobbe på kontrakten."
 
 #. module: analytic
 #: field:account.analytic.account,credit:0
@@ -183,7 +199,7 @@ msgstr "Kontakt"
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Code/Reference"
-msgstr ""
+msgstr "Kode/Referanse"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -194,7 +210,7 @@ msgstr "Annulert"
 #: code:addons/analytic/analytic.py:138
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Feil !"
 
 #. module: analytic
 #: field:account.analytic.account,balance:0
@@ -204,7 +220,7 @@ msgstr "Saldo"
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive analytiske kontoer."
 
 #. module: analytic
 #: help:account.analytic.account,type:0
@@ -212,26 +228,28 @@ msgid ""
 "If you select the View Type, it means you won't allow to create journal "
 "entries using that account."
 msgstr ""
+"Hvis du velger View type, betyr det at du ikke vil tillate å lage "
+"bilagsregistreringer med denne kontoen."
 
 #. module: analytic
 #: field:account.analytic.account,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Sluttdato"
 
 #. module: analytic
 #: field:account.analytic.account,quantity_max:0
 msgid "Maximum Time"
-msgstr ""
+msgstr "Max tid"
 
 #. module: analytic
 #: model:res.groups,name:analytic.group_analytic_accounting
 msgid "Analytic Accounting"
-msgstr ""
+msgstr "Analytisk bokføring"
 
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
 msgid "Full Account Name"
-msgstr ""
+msgstr "Fullt kontonavn"
 
 #. module: analytic
 #: field:account.analytic.line,account_id:0
@@ -242,17 +260,17 @@ msgstr "Analytisk konto"
 #. module: analytic
 #: field:account.analytic.account,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: analytic
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Du kan ikke opprette analytisk linje på visning konto."
 
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "View"
-msgstr ""
+msgstr "Vis"
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
@@ -272,7 +290,7 @@ msgstr "Åpen"
 #. module: analytic
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
-msgstr ""
+msgstr "Analytiske registreringer"
 
 #~ msgid "Draft"
 #~ msgstr "Utkast"
diff --git a/addons/analytic/i18n/nl.po b/addons/analytic/i18n/nl.po
index d19b5d26470..56dec661c8f 100644
--- a/addons/analytic/i18n/nl.po
+++ b/addons/analytic/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-02-10 09:38+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -40,7 +40,7 @@ msgstr "Status"
 #. module: analytic
 #: field:account.analytic.account,user_id:0
 msgid "Account Manager"
-msgstr "Rekeningbeheerder"
+msgstr "Beheerder kostenplaats"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -233,8 +233,8 @@ msgid ""
 "If you select the View Type, it means you won't allow to create journal "
 "entries using that account."
 msgstr ""
-"Als u de soort weergave selecteert, betekent het dat u niet toelaat dat er "
-"geen journaalposten met die rekening gemaakt kunnen worden."
+"Als u de soort weergave selecteert, betekent dat u het niet toelaat dat er "
+"journaalposten op deze rekening gemaakt worden."
 
 #. module: analytic
 #: field:account.analytic.account,date:0
diff --git a/addons/analytic/i18n/nl_BE.po b/addons/analytic/i18n/nl_BE.po
index 6d31b36e315..81a48fcfc13 100644
--- a/addons/analytic/i18n/nl_BE.po
+++ b/addons/analytic/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/pl.po b/addons/analytic/i18n/pl.po
index c854ae1a33e..fa151d273c2 100644
--- a/addons/analytic/i18n/pl.po
+++ b/addons/analytic/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -74,7 +74,7 @@ msgstr ""
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "New"
-msgstr ""
+msgstr "Nowy"
 
 #. module: analytic
 #: field:account.analytic.account,type:0
@@ -192,7 +192,7 @@ msgstr "Anulowano"
 #: code:addons/analytic/analytic.py:138
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Błąd !"
 
 #. module: analytic
 #: field:account.analytic.account,balance:0
diff --git a/addons/analytic/i18n/pt.po b/addons/analytic/i18n/pt.po
index 921be39e2ea..a095293feb4 100644
--- a/addons/analytic/i18n/pt.po
+++ b/addons/analytic/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/pt_BR.po b/addons/analytic/i18n/pt_BR.po
index 7e832d8925d..cada2a2a59c 100644
--- a/addons/analytic/i18n/pt_BR.po
+++ b/addons/analytic/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-07-28 15:08+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
@@ -35,7 +36,7 @@ msgstr "Especifica o total da quantidade para contar."
 #. module: analytic
 #: field:account.analytic.account,state:0
 msgid "State"
-msgstr "Estado"
+msgstr "Situação"
 
 #. module: analytic
 #: field:account.analytic.account,user_id:0
@@ -45,7 +46,7 @@ msgstr "Gerente de Contas"
 #. module: analytic
 #: selection:account.analytic.account,state:0
 msgid "Closed"
-msgstr "Encerrado"
+msgstr "Fechado"
 
 #. module: analytic
 #: field:account.analytic.account,debit:0
@@ -192,12 +193,12 @@ msgstr "Crédito"
 #. module: analytic
 #: field:account.analytic.line,amount:0
 msgid "Amount"
-msgstr "Montante"
+msgstr "Valor"
 
 #. module: analytic
 #: field:account.analytic.account,contact_id:0
 msgid "Contact"
-msgstr "Contatar"
+msgstr "Contato"
 
 #. module: analytic
 #: field:account.analytic.account,code:0
@@ -268,12 +269,12 @@ msgstr "Moeda"
 #. module: analytic
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr "Você não pode criar uma linha analítica na visualização da conta"
+msgstr "Você não pode criar uma linha analítica em conta de visualização"
 
 #. module: analytic
 #: selection:account.analytic.account,type:0
 msgid "View"
-msgstr "Exibir"
+msgstr "Visualizar"
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
diff --git a/addons/analytic/i18n/ro.po b/addons/analytic/i18n/ro.po
index cc5b1b6fd6a..a021f4eb77b 100644
--- a/addons/analytic/i18n/ro.po
+++ b/addons/analytic/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/ru.po b/addons/analytic/i18n/ru.po
index 40563755163..8308cd722fa 100644
--- a/addons/analytic/i18n/ru.po
+++ b/addons/analytic/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/sl.po b/addons/analytic/i18n/sl.po
index 121eb8043ad..ea045e429ca 100644
--- a/addons/analytic/i18n/sl.po
+++ b/addons/analytic/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/sq.po b/addons/analytic/i18n/sq.po
index 823d2f6d6e9..50a07f17c25 100644
--- a/addons/analytic/i18n/sq.po
+++ b/addons/analytic/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/sr.po b/addons/analytic/i18n/sr.po
index bf1a0a64df7..0f2861dc7a6 100644
--- a/addons/analytic/i18n/sr.po
+++ b/addons/analytic/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/sr@latin.po b/addons/analytic/i18n/sr@latin.po
index e9cfafd8b60..036b57253b7 100644
--- a/addons/analytic/i18n/sr@latin.po
+++ b/addons/analytic/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/sv.po b/addons/analytic/i18n/sv.po
index 81b99c9271f..9417547d2c5 100644
--- a/addons/analytic/i18n/sv.po
+++ b/addons/analytic/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/tr.po b/addons/analytic/i18n/tr.po
index cab1f9f84b3..88e4d50af3e 100644
--- a/addons/analytic/i18n/tr.po
+++ b/addons/analytic/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/vi.po b/addons/analytic/i18n/vi.po
index b40698bab4e..142af8d4bc5 100644
--- a/addons/analytic/i18n/vi.po
+++ b/addons/analytic/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/zh_CN.po b/addons/analytic/i18n/zh_CN.po
index 8ca8867d7e8..65f4ff27503 100644
--- a/addons/analytic/i18n/zh_CN.po
+++ b/addons/analytic/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic
 #: field:account.analytic.account,child_ids:0
diff --git a/addons/analytic/i18n/zh_TW.po b/addons/analytic/i18n/zh_TW.po
new file mode 100644
index 00000000000..43f2132ecd1
--- /dev/null
+++ b/addons/analytic/i18n/zh_TW.po
@@ -0,0 +1,283 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-27 12:22+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "子科目"
+
+#. 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
+#: 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 "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
+#: selection:account.analytic.account,state:0
+msgid "New"
+msgstr "新增"
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+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
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "一般"
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: analytic
+#: code:addons/analytic/analytic.py:138
+#, python-format
+msgid ""
+"If you set a company, the currency selected has to be the same as it's "
+"currency. \n"
+"You can remove the company belonging, and thus change the currency, only on "
+"analytic account of type 'view'. This can be really usefull for "
+"consolidation purposes of several companies charts with different "
+"currencies, for example."
+msgstr ""
+"如果選擇公司，請注意保持成本科目貨幣與公司貨幣一致。\n"
+"針對視圖類型的成本科目，你可以把公司字段留空，並修改幣種。這樣你就可以把多個公司不同貨幣的成本科目合併起來。"
+
+#. 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
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "模板"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+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. Always expressed in the company main currency."
+msgstr "計算公式是數量乘以產品成本價。幣別是公司主要幣別。"
+
+#. module: analytic
+#: field:account.analytic.account,child_complete_ids:0
+msgid "Account Hierarchy"
+msgstr "科目階層"
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of time to work on the contract."
+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
+#: field:account.analytic.account,code:0
+msgid "Code/Reference"
+msgstr "編碼/統一編號"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: analytic
+#: code:addons/analytic/analytic.py:138
+#, python-format
+msgid "Error !"
+msgstr "錯誤！"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "差額"
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "錯誤! 你不能建立遞歸的輔助覈算專案"
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account."
+msgstr "如果選擇了 視圖 類型，則你不能在這個輔助核算項上建立輔助覈算憑證"
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "結束日期"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Time"
+msgstr "最長時間"
+
+#. module: analytic
+#: model:res.groups,name:analytic.group_analytic_accounting
+msgid "Analytic Accounting"
+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
+msgid "Analytic Account"
+msgstr "輔助核算項"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Currency"
+msgstr "貨幣"
+
+#. module: analytic
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr "無法在視圖類型的科目上建立輔助核算項目明細"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "視圖"
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+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_contract_expense_project/__init__.py b/addons/analytic_contract_expense_project/__init__.py
deleted file mode 100644
index 05c84916922..00000000000
--- a/addons/analytic_contract_expense_project/__init__.py
+++ /dev/null
@@ -1,24 +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 analytic_contract_expense_project
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project.py b/addons/analytic_contract_expense_project/analytic_contract_expense_project.py
deleted file mode 100644
index efbb8b75a9e..00000000000
--- a/addons/analytic_contract_expense_project/analytic_contract_expense_project.py
+++ /dev/null
@@ -1,37 +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
-
-class project_project(osv.osv):
-    _inherit = "project.project"
-
-    def open_hr_expense(self, cr, uid, ids, context=None):
-        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
-        return self.pool.get('account.analytic.account').open_hr_expense(cr, uid, account_ids, context=context)
-
-    def hr_to_invoice_expense(self, cr, uid, ids, context=None):
-        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
-        return self.pool.get('account.analytic.account').hr_to_invoice_expense(cr, uid, account_ids, context=context)
-
-project_project()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml b/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
deleted file mode 100644
index f461ed224b8..00000000000
--- a/addons/analytic_contract_expense_project/analytic_contract_expense_project_view.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="project_form_expense_form" model="ir.ui.view">
-            <field name="name">project.project.form.expense.inherit</field>
-            <field name="model">project.project</field>
-            <field name="inherit_id" ref="analytic_contract_project.project_account_analytic_account_form"/>
-            <field eval="20" name="priority"/>
-            <field name="arch" type="xml">
-                <xpath expr='//tr[@name="total"]' position='before'>
-                    <tr>
-                        <td>
-                            <label for="charge_expenses"/>
-                        </td><td>
-                            <field name="charge_expenses"/>
-                        </td><td>
-                            <field class="oe_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <field class="oe_inline" name="expense_invoiced" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <field class="oe_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <field class="oe_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <button name="open_hr_expense" string="All Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                            <button name="hr_to_invoice_expense" string="Expenses to Invoice" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td>
-                    </tr>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/analytic_contract_hr_expense/__openerp__.py b/addons/analytic_contract_hr_expense/__openerp__.py
index 6d5cca8b574..8e807923550 100644
--- a/addons/analytic_contract_hr_expense/__openerp__.py
+++ b/addons/analytic_contract_hr_expense/__openerp__.py
@@ -26,18 +26,14 @@
     'category': 'Hidden',
     'description': """
 This module is for modifying account analytic view to show some data related to the hr_expense module.
-
+======================================================================================================
 """,
-    "author": "OpenERP S.A.",
-    "website": "http://www.openerp.com/",
-    "depends": ["hr_expense","account_analytic_analysis"],
-    "init_xml": [],
-    "update_xml": [
-                    "analytic_contract_hr_expense_view.xml",
-                    ],
-    'demo_xml': [],
-    "css" : [
-             ],
+    'author': 'OpenERP S.A.',
+    'website': 'http://www.openerp.com/',
+    'depends': ['hr_expense','account_analytic_analysis'],
+    'data': ['analytic_contract_hr_expense_view.xml'],
+    'demo': [],
+    'css' : [],
     'installable': True,
     'auto_install': True,
 }
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
index 2869eaed86d..5628846a6a0 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense_view.xml
@@ -5,12 +5,13 @@
             <field name="name">account.analytic.account.form.expense.inherit</field>
             <field name="model">account.analytic.account</field>
             <field eval="60" name="priority"/>
+            <field name="inherit_id" ref="account_analytic_analysis.account_analytic_account_form_form"/>
             <field name="arch" type="xml">
                 <xpath expr='//tr[@name="total"]' position='before'>
                     <tr>
-                        <td>
+                        <td class="oe_timesheet_grey">
                             <label for="charge_expenses"/>
-                        </td><td>
+                        </td><td class="oe_timesheet_grey">
                             <field name="charge_expenses"/>
                         </td><td>
                             <field class="oe_form_inline" name="est_expenses" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
@@ -20,11 +21,22 @@
                             <field class="oe_form_inline" name="remaining_expense" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
                         </td><td>
                             <field class="oe_form_inline" name="expense_to_invoice" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                        </td><td>
-                            <group>
-                                <button name="open_hr_expense" string="All Expenses" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                                <button name="hr_to_invoice_expense" string="Expenses to Invoice" type="object" attrs="{'invisible': [('charge_expenses','=',False)]}"/>
-                            </group>
+                        </td><td attrs="{'invisible': [('charge_expenses','=',False)]}" class="oe_timesheet_action">
+                            <span attrs="{'invisible': [('expense_to_invoice','=',0)]}" class="oe_grey">
+                                <button
+                                    name="hr_to_invoice_expense"
+                                    class="oe_link"
+                                    string="⇒ Invoice" type="object"
+                                    />
+                                or view
+                            </span>
+                            <span attrs="{'invisible': [('expense_to_invoice','&lt;&gt;',0)]}" class="oe_grey">
+                                Nothing to invoice, create 
+                            </span>
+                            <button
+                                name="open_hr_expense"
+                                class="oe_link"
+                                string="expenses" type="object"/>
                         </td>
                     </tr>
                 </xpath>
diff --git a/addons/analytic_contract_project/__init__.py b/addons/analytic_contract_project/__init__.py
deleted file mode 100644
index dd60ac32096..00000000000
--- a/addons/analytic_contract_project/__init__.py
+++ /dev/null
@@ -1,24 +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 analytic_contract_project
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_contract_project/analytic_contract_project.py b/addons/analytic_contract_project/analytic_contract_project.py
deleted file mode 100644
index 1ffab1246c9..00000000000
--- a/addons/analytic_contract_project/analytic_contract_project.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
-from tools.translate import _
-
-class project_project(osv.osv):
-    _inherit = 'project.project'
-
-    _defaults = {
-        'use_timesheets': True,
-    }
-
-    def open_sale_order_lines(self,cr,uid,ids,context=None):
-        account_ids = [x.analytic_account_id.id for x in self.browse(cr, uid, ids, context=context)]
-        return self.pool.get('account.analytic.account').open_sale_order_lines(cr, uid, account_ids, context=context)
-
-    def open_timesheets_to_invoice(self,cr,uid,ids,context=None):
-        if context is None:
-            context = {}
-        analytic_account_id = self.browse(cr, uid, ids[0], context=context).analytic_account_id.id
-        context.update({'search_default_account_id': analytic_account_id, 'default_account_id': analytic_account_id, 'search_default_to_invoice': 1})
-        return {
-            'type': 'ir.actions.act_window',
-            'name': _('Timesheet Lines to Invoice'),
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'context': context,
-            'domain' : [('invoice_id','=',False),('to_invoice','!=',False), ('journal_id.type', '=', 'general')],
-            'res_model': 'account.analytic.line',
-            'nodestroy': True,
-        }
-
-    def open_timesheets(self, cr, uid, ids, context=None):
-        """ open Timesheets view """
-        project = self.browse(cr, uid, ids[0], context)
-        try:
-            journal_id = self.pool.get('ir.model.data').get_object(cr, uid, 'hr_timesheet', 'analytic_journal').id
-        except ValueError:
-            journal_id = False
-        view_context = {
-            'search_default_account_id': [project.analytic_account_id.id],
-            'default_account_id': project.analytic_account_id.id,
-            'default_journal_id': journal_id,
-        }
-        return {
-            'type': 'ir.actions.act_window',
-            'name': _('Bill Tasks Works'),
-            'res_model': 'account.analytic.line',
-            'view_type': 'form',
-            'view_mode': 'tree,form',
-            'context': view_context,
-            'nodestroy': True,
-        }
-project_project()
-
-class task(osv.osv):
-    _inherit = "project.task"
-    
-    def create(self, cr, uid, vals, context=None):
-        task_id = super(task, self).create(cr, uid, vals, context=context)
-        task_browse = self.browse(cr, uid, task_id, context=context)
-        if task_browse.project_id.analytic_account_id:
-            self.pool.get('account.analytic.account').message_append_note(cr, uid, [task_browse.project_id.analytic_account_id.id], body=_("Task <em>%s</em> has been <b>created</b>.") % (task_browse.name), context=context)
-        return task_id
-task()
diff --git a/addons/analytic_contract_project/analytic_contract_project_view.xml b/addons/analytic_contract_project/analytic_contract_project_view.xml
deleted file mode 100644
index 84f01e19643..00000000000
--- a/addons/analytic_contract_project/analytic_contract_project_view.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="project_account_analytic_account_form" model="ir.ui.view">
-            <field name="name">project.project.form.inherit</field>
-            <field name="model">project.project</field>
-            <field name="inherit_id" ref="project.edit_project"/>
-            <field eval="18" name="priority"/>
-            <field name="arch" type="xml">
-                <xpath expr='//page[@name="team"]' position='after'>
-                    <page string="Contract Data">
-                        <group>
-                            <group string="Validity">
-                                <label for="date_start" string="Duration"/>
-                                <div name="duration">
-                                    <field name="date_start" class="oe_inline"/> 
-                                    <label attrs="{'invisible':[('date','=',False)]}" class="oe_inline" string=" - "/>
-                                    <field name="date" class="oe_inline"/>
-                                </div>
-                                <label for="quantity_max"/>
-                                <div>
-                                    <field name="quantity_max" class="oe_inline"/>
-                                    <field name="company_uom_id" readonly="1" class="oe_inline"/> / Remaining: 
-                                    <field name="remaining_hours" class="oe_inline"/> 
-                                    <field name="company_uom_id" readonly="1" class="oe_inline"/>
-                                </div>
-                            </group>
-                            <group string="Invoice Options">
-                                <field name="manager_id" />
-                                <field name="pricelist_id" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-                                <field name="to_invoice" widget="selection" attrs="{'invisible': [('invoice_on_timesheets','=',0)]}"/>
-                            </group>
-                        </group>
-                    <separator name="toinvoice" string="Invoicing"/>
-                    <table width="100%%">
-                        <tr>
-                            <th></th>
-                            <th></th>
-                            <th><label string="Est.Tot"/></th>
-                            <th><label string="Invoiced"/></th>
-                            <th><label string="Remaining"/></th>
-                            <th><label string="To Invoice"/></th>
-                            <th></th>
-                        </tr><tr>
-                            <td>
-                                <label for="fix_price_invoices"/>
-                            </td><td>
-                                <field name="fix_price_invoices" class="oe_inline"/>
-                            </td><td>
-                                <field class="oe_inline" name="amount_max" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="ca_invoiced" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="remaining_ca" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="fix_price_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <button name="%(account_analytic_analysis.action_sales_order)d" string="All Sales" type="action" context="{'default_partner_id': [partner_id], 'search_default_partner_id': [partner_id], 'default_project_id': analytic_account_id, 'search_default_project_id': analytic_account_id}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                                <button name="open_sale_order_lines" string="Lines To Invoice" type="object" context="{'default_partner_id': [partner_id],'default_project_id': analytic_account_id,'search_default_uninvoiced': 1,'search_default_project_id': analytic_account_id,'search_default_partner_id': [partner_id]}" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/></td>
-                        </tr><tr attrs="{'invisible':[('use_timesheets','=',False)]}">
-                            <td>
-                                <label for="invoice_on_timesheets"/>
-                            </td><td>
-                                <field name="invoice_on_timesheets"/>
-                            </td><td>
-                                <field class="oe_inline" name="hours_qtt_est" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="timesheet_ca_invoiced" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="remaining_hours_to_invoice" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <field class="oe_inline" name="ca_to_invoice" attrs="{'invisible': [('fix_price_invoices','=',False)]}"/>
-                            </td><td>
-                                <button name="%(hr_timesheet.act_hr_timesheet_line_evry1_all_form)d" string="All Timesheets" type="action" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}" context="{'default_account_id': analytic_account_id,'search_default_account_id': analytic_account_id}"/>
-                                <button name="open_timesheets_to_invoice" string="Timesheets to Invoice" type="object" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td>
-                        </tr><tr name="total">
-                            <th>
-                                <label string="Total"/>
-                            </th><td>
-                            </td><td>
-                                <field name="est_total" class="oe_inline" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}"/>
-                            </td><td>
-                                <field name="invoiced_total" class="oe_inline"/>
-                            </td><td>
-                                <field name="remaining_total" class="oe_inline"/>
-                            </td><td>
-                                <field name="toinvoice_total" class="oe_inline"/>
-                            </td><td>
-                            </td>
-                        </tr>
-                    </table>
-                    <separator string="Terms and Conditions" name="description"/>
-                    <field name="description"/>
-                    </page>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="project_invoice_form" model="ir.ui.view">
-            <field name="name">Inherit project form : Invoicing Data</field>
-            <field name="model">project.project</field>
-            <field name="inherit_id" ref="project.edit_project"/>
-            <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr>
-                        <td><group><field name="use_timesheets"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/></td>
-                    </tr>
-                </xpath>
-            </field>
-        </record>
-
-        <record id="contract_inherited_form" model="ir.ui.view">
-            <field name="name">Inherit contract form : adding UoM</field>
-            <field name="model">account.analytic.account</field>
-            <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
-            <field name="priority">50</field>
-            <field name="arch" type="xml">
-                <xpath expr='//field[@name="remaining_hours"]' position='after'>
-                    <field name="company_uom_id" readonly="1" class="oe_inline"/>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py
index 1c1f345aca0..d788342648c 100644
--- a/addons/analytic_user_function/__openerp__.py
+++ b/addons/analytic_user_function/__openerp__.py
@@ -41,11 +41,9 @@ compatible with older configurations.
     'website': 'http://www.openerp.com',
     'images': ['images/analytic_user_function.jpeg'],
     'depends': ['hr_timesheet_sheet'],
-    'init_xml': [],
-    'update_xml': ['analytic_user_function_view.xml', 'security/ir.model.access.csv'],
-    'demo_xml': [],
+    'data': ['analytic_user_function_view.xml', 'security/ir.model.access.csv'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0082277138269',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py
index 9233845f7eb..c2a7ae8f05a 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -21,39 +21,51 @@
 
 from osv import fields,osv
 from tools.translate import _
+import decimal_precision as dp
 
 class analytic_user_funct_grid(osv.osv):
-
     _name="analytic.user.funct.grid"
-    _description= "Relation table between users and products on a analytic account"
+    _description= "Price per User"
     _columns={
         'user_id': fields.many2one("res.users", "User", required=True,),
-        'product_id': fields.many2one("product.product", "Product", required=True,),
+        'product_id': fields.many2one("product.product", "Service", required=True,),
         'account_id': fields.many2one("account.analytic.account", "Analytic Account", required=True,),
-        }
+        'uom_id': fields.related("product_id", "uom_id", relation="product.uom", string="Unit of Measure", type="many2one", readonly=True),
+        'price': fields.float('Price', digits_compute=dp.get_precision('Product Price'), help="Price per hour for this user.", required=True),
+    }
+    def onchange_user_product_id(self, cr, uid, ids, user_id, product_id, context=None):
+        if not user_id:
+            return {}
+        emp_obj = self.pool.get('hr.employee')
+        emp_id = emp_obj.search(cr, uid, [('user_id', '=', user_id)], context=context)
+        if not emp_id:
+            return {}
 
-analytic_user_funct_grid()
+        value = {}
+        emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
+        if emp.product_id and not product_id:
+            value['product_id'] = emp.product_id.id
+            prod = emp.product_id
+        if product_id:
+            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        if prod:
+            value['price'] = prod.list_price
+            value['uom_id'] = prod.uom_id.id
+        return {'value': value}
 
 
 class account_analytic_account(osv.osv):
-
     _inherit = "account.analytic.account"
     _columns = {
         'user_product_ids': fields.one2many('analytic.user.funct.grid', 'account_id', 'Users/Products Rel.'),
     }
 
-account_analytic_account()
-
 
 class hr_analytic_timesheet(osv.osv):
-
     _inherit = "hr.analytic.timesheet"
-
-
     # Look in account, if no value for the user => look in parent until there is no more parent to look
     # Take the first found... if nothing found => return False
     def _get_related_user_account_recursiv(self, cr, uid, user_id, account_id):
-
         temp=self.pool.get('analytic.user.funct.grid').search(cr, uid, [('user_id', '=', user_id),('account_id', '=', account_id) ])
         account=self.pool.get('account.analytic.account').browse(cr, uid, account_id)
         if temp:
@@ -64,7 +76,6 @@ class hr_analytic_timesheet(osv.osv):
             else:
                 return False
 
-
     def on_change_account_id(self, cr, uid, ids, account_id, user_id=False, unit_amount=0):
         res = {}
         if not (account_id):
@@ -106,12 +117,6 @@ class hr_analytic_timesheet(osv.osv):
         return res
 
     def on_change_user_id(self, cr, uid, ids, user_id, account_id, unit_amount=0):
-        res = {}
-        if not (user_id):
-            #avoid a useless call to super
-            return res
-
-        #get the old values from super
         res = super(hr_analytic_timesheet, self).on_change_user_id(cr, uid, ids, user_id)
 
         if account_id:
@@ -141,7 +146,11 @@ class hr_analytic_timesheet(osv.osv):
                 res ['value']['general_account_id']= a
         return res
 
-hr_analytic_timesheet()
+class account_analytic_line(osv.osv):
+    _inherit = "account.analytic.line"
+    def _get_invoice_price(self, cr, uid, account, product_id, user_id, qty, context = {}):
+        for grid in account.user_product_ids:
+            if grid.user_id.id==user_id:
+                return grid.price
+        return super(account_analytic_line, self)._get_invoice_price(cr, uid, account, product_id, user_id, qty, context)
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/analytic_user_function/analytic_user_function_view.xml b/addons/analytic_user_function/analytic_user_function_view.xml
index 6fa141f480d..490b3026d7f 100644
--- a/addons/analytic_user_function/analytic_user_function_view.xml
+++ b/addons/analytic_user_function/analytic_user_function_view.xml
@@ -7,9 +7,11 @@
             <field name="name">analytic_user_funct_grid.tree</field>
             <field name="model">analytic.user.funct.grid</field>
             <field name="arch" type="xml">
-                <tree string="User's Product for this Analytic Account" editable="bottom">
-                    <field name="user_id" required="1"/>
-                    <field name="product_id" required="1" />
+                <tree string="Invoicing Data" editable="bottom">
+                    <field name="user_id" on_change="onchange_user_product_id(user_id, product_id)"/>
+                    <field name="product_id" on_change="onchange_user_product_id(user_id, product_id)" domain="[('type','=','service')]"/>
+                    <field name="price"/>
+                    <field name="uom_id"/>
                 </tree>
             </field>
         </record>
@@ -18,9 +20,13 @@
             <field name="name">analytic_user_funct_grid.form</field>
             <field name="model">analytic.user.funct.grid</field>
             <field name="arch" type="xml">
-                <form string="User's Product for this Analytic Account">
-                    <field name="user_id" required="1"/>
-                    <field name="product_id" required="1"/>
+                <form string="Invoicing Data">
+                    <group>
+                        <field name="user_id" on_change="onchange_user_product_id(user_id, product_id)"/>
+                        <field name="product_id" domain="[('type','=','service')]" on_change="onchange_user_product_id(user_id, product_id)"/>
+                        <field name="price"/>
+                        <field name="uom_id"/>
+                    </group>
                 </form>
             </field>
         </record>
@@ -29,13 +35,26 @@
         <record model="ir.ui.view" id="view_account_analytic_account_form_inherit">
             <field name="name">account.analytic.account.form</field>
             <field name="model">account.analytic.account</field>
+            <field eval="60" name="priority"/>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//notebook/page" position="after">
-                    <page string="Users/Products Rel.">
-                        <field name="user_product_ids" colspan="4" nolabel="1"/>
-                    </page>
-                </xpath>
+                <separator name="description" position="before">
+                    <div name="user_function_price" attrs="{'invisible': [('invoice_on_timesheets','=',False)]}">
+                        <separator string="Invoice Price Rate per User"/>
+                        <p class="oe_grey oe_edit_only">
+                            Define a specific service (e.g. Senior Consultant)
+                            and price for some users to use these data instead
+                            of the default values when invoicing the customer.
+                        </p>
+                        <p class="oe_grey oe_edit_only">
+                            OpenERP will recursively search on parent accounts
+                            to check if specific conditions are defined for a
+                            specific user. This allows to set invoicing
+                            conditions for a group of contracts.
+                        </p>
+                        <field name="user_product_ids"/>
+                    </div>
+                </separator>
             </field>
         </record>
 
diff --git a/addons/analytic_user_function/i18n/ar.po b/addons/analytic_user_function/i18n/ar.po
index 0946b883f62..f656162013d 100644
--- a/addons/analytic_user_function/i18n/ar.po
+++ b/addons/analytic_user_function/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/bg.po b/addons/analytic_user_function/i18n/bg.po
index 292041a6d8a..02b8ce0b521 100644
--- a/addons/analytic_user_function/i18n/bg.po
+++ b/addons/analytic_user_function/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/bs.po b/addons/analytic_user_function/i18n/bs.po
index 4ba2847a997..d7717c2b3ab 100644
--- a/addons/analytic_user_function/i18n/bs.po
+++ b/addons/analytic_user_function/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/ca.po b/addons/analytic_user_function/i18n/ca.po
index 75dc02c22a6..14fa73f7f23 100644
--- a/addons/analytic_user_function/i18n/ca.po
+++ b/addons/analytic_user_function/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/cs.po b/addons/analytic_user_function/i18n/cs.po
index 9d1ee7a2c75..1294b8cb7c4 100644
--- a/addons/analytic_user_function/i18n/cs.po
+++ b/addons/analytic_user_function/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/da.po b/addons/analytic_user_function/i18n/da.po
index 99d349a0ebd..742ffa3a947 100644
--- a/addons/analytic_user_function/i18n/da.po
+++ b/addons/analytic_user_function/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/de.po b/addons/analytic_user_function/i18n/de.po
index 3c0240759bd..0d2774baeaf 100644
--- a/addons/analytic_user_function/i18n/de.po
+++ b/addons/analytic_user_function/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/el.po b/addons/analytic_user_function/i18n/el.po
index 9d17adc90ca..93dd69e562f 100644
--- a/addons/analytic_user_function/i18n/el.po
+++ b/addons/analytic_user_function/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/en_GB.po b/addons/analytic_user_function/i18n/en_GB.po
index d0da1d90d66..060f9f2971d 100644
--- a/addons/analytic_user_function/i18n/en_GB.po
+++ b/addons/analytic_user_function/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/es.po b/addons/analytic_user_function/i18n/es.po
index 71591e30820..327168c58f4 100644
--- a/addons/analytic_user_function/i18n/es.po
+++ b/addons/analytic_user_function/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/es_AR.po b/addons/analytic_user_function/i18n/es_AR.po
index b333e1832b7..aa0c13c9dca 100644
--- a/addons/analytic_user_function/i18n/es_AR.po
+++ b/addons/analytic_user_function/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/es_CR.po b/addons/analytic_user_function/i18n/es_CR.po
index de924977a01..635ae7281fd 100644
--- a/addons/analytic_user_function/i18n/es_CR.po
+++ b/addons/analytic_user_function/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/es_EC.po b/addons/analytic_user_function/i18n/es_EC.po
index bbfdf51815f..cff6373adc1 100644
--- a/addons/analytic_user_function/i18n/es_EC.po
+++ b/addons/analytic_user_function/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/es_PY.po b/addons/analytic_user_function/i18n/es_PY.po
index 678e157161e..a0db1f4918a 100644
--- a/addons/analytic_user_function/i18n/es_PY.po
+++ b/addons/analytic_user_function/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/et.po b/addons/analytic_user_function/i18n/et.po
index 21d307899eb..7f92bae1dab 100644
--- a/addons/analytic_user_function/i18n/et.po
+++ b/addons/analytic_user_function/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/fa.po b/addons/analytic_user_function/i18n/fa.po
index 1d436e894ac..e5ec9551f31 100644
--- a/addons/analytic_user_function/i18n/fa.po
+++ b/addons/analytic_user_function/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/fi.po b/addons/analytic_user_function/i18n/fi.po
index 3f1a147ab6e..c1a6c0c8eb5 100644
--- a/addons/analytic_user_function/i18n/fi.po
+++ b/addons/analytic_user_function/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/fr.po b/addons/analytic_user_function/i18n/fr.po
index a3845b3eb85..8cb870411af 100644
--- a/addons/analytic_user_function/i18n/fr.po
+++ b/addons/analytic_user_function/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/gl.po b/addons/analytic_user_function/i18n/gl.po
index 545563a4ab1..9092351be34 100644
--- a/addons/analytic_user_function/i18n/gl.po
+++ b/addons/analytic_user_function/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/gu.po b/addons/analytic_user_function/i18n/gu.po
index 9be3e3d69e2..281b7483cf6 100644
--- a/addons/analytic_user_function/i18n/gu.po
+++ b/addons/analytic_user_function/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/hr.po b/addons/analytic_user_function/i18n/hr.po
index 79487597bd8..362a68d52b2 100644
--- a/addons/analytic_user_function/i18n/hr.po
+++ b/addons/analytic_user_function/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: analytic_user_function
diff --git a/addons/analytic_user_function/i18n/hu.po b/addons/analytic_user_function/i18n/hu.po
index 70cb460a7b0..bfcb2a545ad 100644
--- a/addons/analytic_user_function/i18n/hu.po
+++ b/addons/analytic_user_function/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/id.po b/addons/analytic_user_function/i18n/id.po
index baecedbb305..7c2546e4484 100644
--- a/addons/analytic_user_function/i18n/id.po
+++ b/addons/analytic_user_function/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po
index 55a4bf92b20..9e2a76e0e76 100644
--- a/addons/analytic_user_function/i18n/it.po
+++ b/addons/analytic_user_function/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/ja.po b/addons/analytic_user_function/i18n/ja.po
index e67e257c3c9..296acd1de1a 100644
--- a/addons/analytic_user_function/i18n/ja.po
+++ b/addons/analytic_user_function/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/ko.po b/addons/analytic_user_function/i18n/ko.po
index 616b3f155f6..07ce8c8b3d5 100644
--- a/addons/analytic_user_function/i18n/ko.po
+++ b/addons/analytic_user_function/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/lt.po b/addons/analytic_user_function/i18n/lt.po
index d9eff1daaa5..c8d53248898 100644
--- a/addons/analytic_user_function/i18n/lt.po
+++ b/addons/analytic_user_function/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/mn.po b/addons/analytic_user_function/i18n/mn.po
index 825f056bf4b..b6f435f56c2 100644
--- a/addons/analytic_user_function/i18n/mn.po
+++ b/addons/analytic_user_function/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/nb.po b/addons/analytic_user_function/i18n/nb.po
new file mode 100644
index 00000000000..dbc40c1eaa3
--- /dev/null
+++ b/addons/analytic_user_function/i18n/nb.po
@@ -0,0 +1,79 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-27 16:17+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
+msgid "Relation table between users and products on a analytic account"
+msgstr "Forhold bordet mellom brukere og produkter på en analytisk konto."
+
+#. module: analytic_user_function
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr "Du kan ikke endre en oppføring i en Bekreftet / Ferdig timeliste!."
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analytisk konto"
+
+#. module: analytic_user_function
+#: view:account.analytic.account:0
+#: field:account.analytic.account,user_product_ids:0
+msgid "Users/Products Rel."
+msgstr "Brukere / Produkter rel."
+
+#. module: analytic_user_function
+#: field:analytic.user.funct.grid,user_id:0
+msgid "User"
+msgstr "Bruker"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
+msgstr "Det er ingen regning definert for dette produktet: \"% s\" (id:% d)"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Feil !"
+
+#. module: analytic_user_function
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Feil! Du kan ikke opprette rekursive analytiske kontoer."
+
+#. module: analytic_user_function
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Timelistelinje"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
+msgid "User's Product for this Analytic Account"
+msgstr "Brukerens produkt for dette Analytisk konto"
diff --git a/addons/analytic_user_function/i18n/nl.po b/addons/analytic_user_function/i18n/nl.po
index 3dd8f59ac51..0138c103179 100644
--- a/addons/analytic_user_function/i18n/nl.po
+++ b/addons/analytic_user_function/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-02-10 09:35+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/nl_BE.po b/addons/analytic_user_function/i18n/nl_BE.po
index 979cef10b2c..38231af6a66 100644
--- a/addons/analytic_user_function/i18n/nl_BE.po
+++ b/addons/analytic_user_function/i18n/nl_BE.po
@@ -1,63 +1,86 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* analytic_user_function
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\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: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-10-02 07:35+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <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: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
+#: field:analytic.user.funct.grid,product_id:0
+msgid "Product"
+msgstr "Product"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
 msgstr ""
+"Relatietabel tussen gebruikers en producten van een analytische rekening"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,product_id:0
-msgid "Product"
-msgstr ""
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr "In een bevestigde/afgesloten uurrooster kunt u geen regels wijzigen."
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
+#: field:analytic.user.funct.grid,account_id:0
+#: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analytische rekening"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "Rel. gebruikers/producten"
 
 #. module: analytic_user_function
-#: field:analytic_user_funct_grid,user_id:0
+#: field:analytic.user.funct.grid,user_id:0
 msgid "User"
+msgstr "Gebruiker"
+
+#. module: analytic_user_function
+#: code:addons/analytic_user_function/analytic_user_function.py:96
+#: code:addons/analytic_user_function/analytic_user_function.py:131
+#, python-format
+msgid "There is no expense account define for this product: \"%s\" (id:%d)"
 msgstr ""
+"Er is geen kostenrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
-#: 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 !"
+#: code:addons/analytic_user_function/analytic_user_function.py:95
+#: code:addons/analytic_user_function/analytic_user_function.py:130
+#, python-format
+msgid "Error !"
+msgstr "Fout"
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "Analytic User Function"
-msgstr ""
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "U kunt niet dezelfde analytische rekeningen maken."
 
 #. module: analytic_user_function
-#: view:analytic_user_funct_grid:0
+#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr "Uurroosterlijn"
+
+#. module: analytic_user_function
+#: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
-msgstr ""
+msgstr "Product van gebruiker voor deze analytische rekening"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
diff --git a/addons/analytic_user_function/i18n/oc.po b/addons/analytic_user_function/i18n/oc.po
index 30c48c81ff0..1d42339824f 100644
--- a/addons/analytic_user_function/i18n/oc.po
+++ b/addons/analytic_user_function/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/pl.po b/addons/analytic_user_function/i18n/pl.po
index 31cf587a6c0..2432993af65 100644
--- a/addons/analytic_user_function/i18n/pl.po
+++ b/addons/analytic_user_function/i18n/pl.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produkt"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
@@ -60,7 +60,7 @@ msgstr ""
 #: code:addons/analytic_user_function/analytic_user_function.py:130
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Błąd !"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
diff --git a/addons/analytic_user_function/i18n/pt.po b/addons/analytic_user_function/i18n/pt.po
index 26c39e80ad8..b5dc16d6a23 100644
--- a/addons/analytic_user_function/i18n/pt.po
+++ b/addons/analytic_user_function/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/pt_BR.po b/addons/analytic_user_function/i18n/pt_BR.po
index 9950eaa62a8..1160aaa38cc 100644
--- a/addons/analytic_user_function/i18n/pt_BR.po
+++ b/addons/analytic_user_function/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-07-28 16:30+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
@@ -71,7 +72,7 @@ msgstr "Erro! Você não pode criar contas analíticas recursivas"
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Linha de Apontamento de Horas"
+msgstr "Linha da Planilha de Horas"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
diff --git a/addons/analytic_user_function/i18n/ro.po b/addons/analytic_user_function/i18n/ro.po
index fcd38f38a58..63b1b2abbf1 100644
--- a/addons/analytic_user_function/i18n/ro.po
+++ b/addons/analytic_user_function/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/ru.po b/addons/analytic_user_function/i18n/ru.po
index f66189888ef..8e93d6a5a98 100644
--- a/addons/analytic_user_function/i18n/ru.po
+++ b/addons/analytic_user_function/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/sk.po b/addons/analytic_user_function/i18n/sk.po
index 244d7ed2608..90911d1ddb5 100644
--- a/addons/analytic_user_function/i18n/sk.po
+++ b/addons/analytic_user_function/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/sl.po b/addons/analytic_user_function/i18n/sl.po
index 1006946ef98..ce2c342cd7d 100644
--- a/addons/analytic_user_function/i18n/sl.po
+++ b/addons/analytic_user_function/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/sq.po b/addons/analytic_user_function/i18n/sq.po
index 8c37f0b5269..0bde0079110 100644
--- a/addons/analytic_user_function/i18n/sq.po
+++ b/addons/analytic_user_function/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/sr.po b/addons/analytic_user_function/i18n/sr.po
index 5c0648bfa37..7ee8869d5b4 100644
--- a/addons/analytic_user_function/i18n/sr.po
+++ b/addons/analytic_user_function/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/sr@latin.po b/addons/analytic_user_function/i18n/sr@latin.po
index 5f5ab37eb2f..c47e4d70cf9 100644
--- a/addons/analytic_user_function/i18n/sr@latin.po
+++ b/addons/analytic_user_function/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/sv.po b/addons/analytic_user_function/i18n/sv.po
index b7a9799c3b2..e750a485800 100644
--- a/addons/analytic_user_function/i18n/sv.po
+++ b/addons/analytic_user_function/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/tlh.po b/addons/analytic_user_function/i18n/tlh.po
index d4a648c72db..33985023674 100644
--- a/addons/analytic_user_function/i18n/tlh.po
+++ b/addons/analytic_user_function/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index 678a7cde6c7..768f57f0c0b 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/uk.po b/addons/analytic_user_function/i18n/uk.po
index 9556cdc0cf4..236e1796c8b 100644
--- a/addons/analytic_user_function/i18n/uk.po
+++ b/addons/analytic_user_function/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/vi.po b/addons/analytic_user_function/i18n/vi.po
index 5065fb93df2..2be9312edc7 100644
--- a/addons/analytic_user_function/i18n/vi.po
+++ b/addons/analytic_user_function/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/zh_CN.po b/addons/analytic_user_function/i18n/zh_CN.po
index c74a01fc97d..4418d1a3813 100644
--- a/addons/analytic_user_function/i18n/zh_CN.po
+++ b/addons/analytic_user_function/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
diff --git a/addons/analytic_user_function/i18n/zh_TW.po b/addons/analytic_user_function/i18n/zh_TW.po
index 1804d354d22..bf5030632c0 100644
--- a/addons/analytic_user_function/i18n/zh_TW.po
+++ b/addons/analytic_user_function/i18n/zh_TW.po
@@ -7,72 +7,72 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2009-01-23 16:16+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-20 03:00+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "產品"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
-msgstr ""
+msgstr "使用者及產品在核助核算項目的關聯資料表"
 
 #. module: analytic_user_function
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
+msgstr "你不可修改一個已確認/完成的工時表記錄！"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,account_id:0
 #: model:ir.model,name:analytic_user_function.model_account_analytic_account
 msgid "Analytic Account"
-msgstr ""
+msgstr "輔助核算項目"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "使用者/產品 關聯"
 
 #. module: analytic_user_function
 #: field:analytic.user.funct.grid,user_id:0
 msgid "User"
-msgstr ""
+msgstr "使用者"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:96
 #: code:addons/analytic_user_function/analytic_user_function.py:131
 #, python-format
 msgid "There is no expense account define for this product: \"%s\" (id:%d)"
-msgstr ""
+msgstr "此產品未定義費用科目: \"%s\" (id:%d)"
 
 #. module: analytic_user_function
 #: code:addons/analytic_user_function/analytic_user_function.py:95
 #: code:addons/analytic_user_function/analytic_user_function.py:130
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "錯誤！"
 
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "錯誤! 你不能建立遞歸的輔助核算項目"
 
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "工時表明細"
 
 #. module: analytic_user_function
 #: view:analytic.user.funct.grid:0
 msgid "User's Product for this Analytic Account"
-msgstr ""
+msgstr "此輔助核算項目的使用者產品"
diff --git a/addons/anonymization/__openerp__.py b/addons/anonymization/__openerp__.py
index acfc5ac3792..ac63d0e01f1 100644
--- a/addons/anonymization/__openerp__.py
+++ b/addons/anonymization/__openerp__.py
@@ -40,11 +40,7 @@ anonymization process to recover your previous data.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [],
-    'demo_xml': [
-        'anonymization_demo.xml',
-    ],
+    'demo': ['anonymization_demo.xml'],
     'data': [
         'ir.model.fields.anonymization.csv',
         'security/ir.model.access.csv',
@@ -52,7 +48,6 @@ anonymization process to recover your previous data.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '00719010980872226045',
     'images': ['images/anonymization1.jpeg','images/anonymization2.jpeg','images/anonymization3.jpeg'],
 }
 
diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py
index 47e168a12b8..2326a4184ae 100644
--- a/addons/anonymization/anonymization.py
+++ b/addons/anonymization/anonymization.py
@@ -32,13 +32,23 @@ import datetime
 from osv import fields, osv
 from tools.translate import _
 
+from itertools import groupby
+from operator import itemgetter
+
 
 FIELD_STATES = [('clear', 'Clear'), ('anonymized', 'Anonymized'), ('not_existing', 'Not Existing')]
 ANONYMIZATION_STATES = FIELD_STATES + [('unstable', 'Unstable')]
+WIZARD_ANONYMIZATION_STATES = [('clear', 'Clear'), ('anonymized', 'Anonymized'), ('unstable', 'Unstable')]
 ANONYMIZATION_HISTORY_STATE = [('started', 'Started'), ('done', 'Done'), ('in_exception', 'Exception occured')]
 ANONYMIZATION_DIRECTION = [('clear -> anonymized', 'clear -> anonymized'), ('anonymized -> clear', 'anonymized -> clear')]
 
 
+def group(lst, cols):
+    if isinstance(cols, basestring):
+        cols = [cols]
+    return dict((k, [v for v in itr]) for k, itr in groupby(sorted(lst, key=itemgetter(*cols)), itemgetter(*cols)))
+
+
 class ir_model_fields_anonymization(osv.osv):
     _name = 'ir.model.fields.anonymization'
     _rec_name = 'field_id'
@@ -64,11 +74,15 @@ class ir_model_fields_anonymization(osv.osv):
             state = 'anonymized' # all fields are anonymized
         else:
             state = 'unstable' # fields are mixed: this should be fixed
+
         return state
 
     def _check_write(self, cr, uid, context=None):
-        # check that the field is created from the menu and not from an database update
-        # otherwise the database update can crash:
+        """check that the field is created from the menu and not from an database update
+           otherwise the database update can crash:"""
+        if context is None:
+            context = {}
+
         if context.get('manual'):
             global_state = self._get_global_state(cr, uid, context=context)
             if global_state == 'anonymized':
@@ -100,12 +114,16 @@ class ir_model_fields_anonymization(osv.osv):
         # check field state: all should be clear before we can add a new field to anonymize:
         self._check_write(cr, uid, context=context)
 
+        global_state = self._get_global_state(cr, uid, context=context)
+
         if 'field_name' in vals and vals['field_name'] and 'model_name' in vals and vals['model_name']:
             vals['model_id'], vals['field_id'] = self._get_model_and_field_ids(cr, uid, vals, context=context)
 
         # check not existing fields:
         if not vals.get('field_id'):
             vals['state'] = 'not_existing'
+        else:
+            vals['state'] = global_state
 
         res = super(ir_model_fields_anonymization, self).create(cr, uid, vals, context=context)
 
@@ -199,8 +217,6 @@ class ir_model_fields_anonymization(osv.osv):
         'state': lambda *a: 'clear',
     }
 
-ir_model_fields_anonymization()
-
 
 class ir_model_fields_anonymization_history(osv.osv):
     _name = 'ir.model.fields.anonymization.history'
@@ -215,8 +231,6 @@ class ir_model_fields_anonymization_history(osv.osv):
         'filepath': fields.char(string='File path', size=256, readonly=True),
     }
 
-ir_model_fields_anonymization_history()
-
 
 class ir_model_fields_anonymize_wizard(osv.osv_memory):
     _name = 'ir.model.fields.anonymize.wizard'
@@ -242,8 +256,8 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
         'name': fields.char(size=64, string='File Name'),
         'summary': fields.function(_get_summary, type='text', string='Summary'),
         'file_export': fields.binary(string='Export'),
-        'file_import': fields.binary(string='Import'),
-        'state': fields.function(_get_state, string='Status', type='selection', selection=ANONYMIZATION_STATES, readonly=False),
+        'file_import': fields.binary(string='Import', help="This is the file created by the anonymization process. It should have the '.pickle' extention."),
+        'state': fields.function(_get_state, string='Status', type='selection', selection=WIZARD_ANONYMIZATION_STATES, readonly=False),
         'msg': fields.text(string='Message'),
     }
 
@@ -289,10 +303,10 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, *args, **kwargs):
         state = self.pool.get('ir.model.fields.anonymization')._get_global_state(cr, uid, context=context)
-        
+
         if context is None:
             context = {}
-        
+
         step = context.get('step', 'new_window')
 
         res = super(ir_model_fields_anonymize_wizard, self).fields_view_get(cr, uid, view_id, view_type, context, *args, **kwargs)
@@ -311,6 +325,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
                 # clicked in the menu and the fields are already anonymized
                 placeholder.addnext(etree.Element('newline'))
                 placeholder.addnext(etree.Element('field', {'name': 'file_import', 'required': "1"}))
+                placeholder.addnext(etree.Element('label', {'string': 'Anonymization file'}))
                 eview.remove(placeholder)
             elif step == 'just_anonymized':
                 # we just ran the anonymization process, we need the file export field
@@ -340,8 +355,9 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
                 # remove the placeholer:
                 eview.remove(placeholder)
             else:
-                # unstable ?
-                raise
+                msg = "The database anonymization is currently in an unstable state. Some fields are anonymized," + \
+                  " while some fields are not anonymized. You should try to solve this problem before trying to do anything else."
+                raise osv.except_osv('Error !', msg)
 
             res['arch'] = etree.tostring(eview)
 
@@ -354,7 +370,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
         })
         raise osv.except_osv(error_type, error_msg)
 
-    def anonymize_database(self,cr, uid, ids, context=None):
+    def anonymize_database(self, cr, uid, ids, context=None):
         """Sets the 'anonymized' state to defined fields"""
 
         # create a new history record:
@@ -489,9 +505,8 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
                 'target':'new',
         }
 
-    def reverse_anonymize_database(self,cr, uid, ids, context=None):
+    def reverse_anonymize_database(self, cr, uid, ids, context=None):
         """Set the 'clear' state to defined fields"""
-
         ir_model_fields_anonymization_model = self.pool.get('ir.model.fields.anonymization')
         anonymization_history_model = self.pool.get('ir.model.fields.anonymization.history')
 
@@ -515,23 +530,46 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
         wizards = self.browse(cr, uid, ids, context=context)
         for wizard in wizards:
             if not wizard.file_import:
-                msg = "It is not possible to reverse the anonymization process without supplying anonymization export file."
+                msg = "It is not possible to reverse the anonymization process without supplying the anonymization export file."
                 self._raise_after_history_update(cr, uid, history_id, 'Error !', msg)
 
             # reverse the anonymization:
             # load the pickle file content into a data structure:
             data = pickle.loads(base64.decodestring(wizard.file_import))
 
+            migration_fix_obj = self.pool.get('ir.model.fields.anonymization.migration.fix')
+            fix_ids = migration_fix_obj.search(cr, uid, [('target_version', '=', '7.0')])
+            fixes = migration_fix_obj.read(cr, uid, fix_ids, ['model_name', 'field_name', 'query', 'query_type', 'sequence'])
+            fixes = group(fixes, ('model_name', 'field_name'))
+
             for line in data:
                 table_name = self.pool.get(line['model_id'])._table
-                sql = "update %(table)s set %(field)s = %%(value)s where id = %%(id)s" % {
-                    'table': table_name,
-                    'field': line['field_id'],
-                }
-                cr.execute(sql, {
-                    'value': line['value'],
-                    'id': line['id']
-                })
+
+                # check if custom sql exists:
+                key = (line['model_id'], line['field_id'])
+                custom_updates =  fixes.get(key)
+                if custom_updates:
+                    custom_updates.sort(itemgetter('sequence'))
+                    queries = [(record['query'], record['query_type']) for record in custom_updates if record['query_type']]
+                else:
+                    queries = [("update %(table)s set %(field)s = %%(value)s where id = %%(id)s" % {
+                        'table': table_name,
+                        'field': line['field_id'],
+                    }, 'sql')]
+
+                for query in queries:
+                    if query[1] == 'sql':
+                        sql = query[0]
+                        cr.execute(sql, {
+                            'value': line['value'],
+                            'id': line['id']
+                        })
+                    elif query[1] == 'python':
+                        raw_code = query[0]
+                        code = raw_code % line
+                        eval(code)
+                    else:
+                        raise Exception("Unknown query type '%s'. Valid types are: sql, python." % (query['query_type'], ))
 
             # update the anonymization fields:
             ir_model_fields_anonymization_model = self.pool.get('ir.model.fields.anonymization')
@@ -580,7 +618,19 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory):
             res = None
         return res
 
-ir_model_fields_anonymize_wizard()
 
+class ir_model_fields_anonymization_migration_fix(osv.osv):
+    _name = 'ir.model.fields.anonymization.migration.fix'
+    _order = "sequence"
+
+    _columns = {
+        'target_version': fields.char('Target Version'),
+        'model_name': fields.char('Model'),
+        'field_name': fields.char('Field'),
+        'query': fields.text('Query'),
+        'query_type': fields.selection(string='Query', selection=[('sql', 'sql'), ('python', 'python')]),
+        'sequence': fields.integer('Sequence'),
+    }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/anonymization/anonymization_view.xml b/addons/anonymization/anonymization_view.xml
index 5aba288d4f8..fca112eb266 100644
--- a/addons/anonymization/anonymization_view.xml
+++ b/addons/anonymization/anonymization_view.xml
@@ -14,7 +14,6 @@
                     <field name="model_id" on_change="onchange_model_id(model_id)" />
                     <field name="model_name" on_change="onchange_model_name(model_name)" />
                     <field name="field_id"
-                          
                            on_change="onchange_field_id(field_id, model_name)"
                            domain="[('model_id','=',model_id), ('ttype', 'not in', ['function', 'binary', 'many2many', 'many2one', 'one2many', 'reference'])]" />
                     <field name="field_name" on_change="onchange_field_name(field_name, model_name)" />
@@ -76,7 +75,7 @@
         </field>
     </record>
 
-      <!-- ACTION -->
+    <!-- ACTION -->
 
     <record model="ir.actions.act_window" id="action_ir_model_fields_anonymize_wizard">
         <field name="name">Anonymize Database</field>
@@ -163,4 +162,3 @@
 
 </data>
 </openerp>
-
diff --git a/addons/anonymization/i18n/ar.po b/addons/anonymization/i18n/ar.po
index d9bd622d36a..56f774a2184 100644
--- a/addons/anonymization/i18n/ar.po
+++ b/addons/anonymization/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/bg.po b/addons/anonymization/i18n/bg.po
index 077997da680..625ab994373 100644
--- a/addons/anonymization/i18n/bg.po
+++ b/addons/anonymization/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/ca.po b/addons/anonymization/i18n/ca.po
index f9d06b7f8f3..a2ea640c1f5 100644
--- a/addons/anonymization/i18n/ca.po
+++ b/addons/anonymization/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/da.po b/addons/anonymization/i18n/da.po
index 7591437383f..1e7370e8500 100644
--- a/addons/anonymization/i18n/da.po
+++ b/addons/anonymization/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/de.po b/addons/anonymization/i18n/de.po
index 89a07e43ffd..1321f76b685 100644
--- a/addons/anonymization/i18n/de.po
+++ b/addons/anonymization/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/es.po b/addons/anonymization/i18n/es.po
index e90f7453917..79a382f821c 100644
--- a/addons/anonymization/i18n/es.po
+++ b/addons/anonymization/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/es_CR.po b/addons/anonymization/i18n/es_CR.po
index 265374b6027..f7301543a3d 100644
--- a/addons/anonymization/i18n/es_CR.po
+++ b/addons/anonymization/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: anonymization
diff --git a/addons/anonymization/i18n/es_EC.po b/addons/anonymization/i18n/es_EC.po
index 8d3f4c026b7..d96007f3286 100644
--- a/addons/anonymization/i18n/es_EC.po
+++ b/addons/anonymization/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/es_PY.po b/addons/anonymization/i18n/es_PY.po
index 23a18aebc20..becbc08e407 100644
--- a/addons/anonymization/i18n/es_PY.po
+++ b/addons/anonymization/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/et.po b/addons/anonymization/i18n/et.po
index 2b6734f332f..f2741b8bf2e 100644
--- a/addons/anonymization/i18n/et.po
+++ b/addons/anonymization/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/fa.po b/addons/anonymization/i18n/fa.po
index f52798b36ad..174120d9593 100644
--- a/addons/anonymization/i18n/fa.po
+++ b/addons/anonymization/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/fi.po b/addons/anonymization/i18n/fi.po
index dccb53828db..76be84b68cb 100644
--- a/addons/anonymization/i18n/fi.po
+++ b/addons/anonymization/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/fr.po b/addons/anonymization/i18n/fr.po
index 8af5d9839da..3bc8058a41f 100644
--- a/addons/anonymization/i18n/fr.po
+++ b/addons/anonymization/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/gl.po b/addons/anonymization/i18n/gl.po
index e176be68d47..ba3615d7658 100644
--- a/addons/anonymization/i18n/gl.po
+++ b/addons/anonymization/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/hr.po b/addons/anonymization/i18n/hr.po
index 8236c004448..58befad694d 100644
--- a/addons/anonymization/i18n/hr.po
+++ b/addons/anonymization/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/it.po b/addons/anonymization/i18n/it.po
index 02088cfca9d..5d755e8109e 100644
--- a/addons/anonymization/i18n/it.po
+++ b/addons/anonymization/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/ja.po b/addons/anonymization/i18n/ja.po
index 022c436ea8b..c660f328e0e 100644
--- a/addons/anonymization/i18n/ja.po
+++ b/addons/anonymization/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/lv.po b/addons/anonymization/i18n/lv.po
new file mode 100644
index 00000000000..c4ccd17ae50
--- /dev/null
+++ b/addons/anonymization/i18n/lv.po
@@ -0,0 +1,213 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-10-16 20:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr "ir.model.fields.anonymize.wizard"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "Lauka Nosaukums"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "Lauks"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "Stāvoklis"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "Importēt"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.model.fields.anonymization"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "Virziens"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr "Anonimizēti Lauki"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "Datubāzes anonimizācija"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "tīrs -> anonimizēts"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "Anonimizēta"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "nezināms"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objekts"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "Ceļš uz failu"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Datums"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Eksportēt"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "Atgriezt Datubāzes Anonimizāciju"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "Datubāzes Anonimizācija"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "Anonimizēt datubāzi"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "Lauki"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "Notīrīt"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "Kopsavilkums"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr "Anonimizēts lauks"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "Nestabīls"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "Notikusī kļūda"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "Neeksistē"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "Objekta nosaukums"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr "Anonimizācijas Vēsture"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr "ir.model.fields.anonymization.history"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr "Anonimizēt Datubāzi"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "Faila nosaukums"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "anonimizēts -> tīrs"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "Iesākta"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "Izdarīts"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr "Ziņojums"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two fields with the same name on the same object!"
+msgstr "Nevar būt divi lauki ar vienādiem nosaukumiem vienam objektam!"
diff --git a/addons/anonymization/i18n/mn.po b/addons/anonymization/i18n/mn.po
new file mode 100644
index 00000000000..4a4361691e5
--- /dev/null
+++ b/addons/anonymization/i18n/mn.po
@@ -0,0 +1,213 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-10-22 02:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "Тогтмол биш"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr ""
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two fields with the same name on the same object!"
+msgstr ""
diff --git a/addons/anonymization/i18n/nb.po b/addons/anonymization/i18n/nb.po
new file mode 100644
index 00000000000..6bfda1cd9c9
--- /dev/null
+++ b/addons/anonymization/i18n/nb.po
@@ -0,0 +1,213 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-28 12:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr "ir.modell.felt.anonymisere.veiviseren"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "Feltnavn"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "Felt"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "Importer"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.modell.felt.anonymisering"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "Retning"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr "Anonymiserte Felter"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "database anonymisering"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "klar -> anonymiseres"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "Anonymiseres"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "ukjent"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "filbane"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Eksporter"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "Reversere Database anonymisering"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "database anonymisering"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "anonymisere database"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "Felter"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "fjerne"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "Oppsummering"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr "Anonymisert Felt"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "Ustabil"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "unntak oppstod"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "Eksisterer ikke"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "Objektnavn"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr "Anonymisering Historie"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr "ir.modell.felt.anonymisering.historie"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr "Anonymisere Database"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "Filnavn"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "Anonymisert -> klart"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "Startet"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "Utført"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr "Beskjed"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two fields with the same name on the same object!"
+msgstr "Du kan ikke ha to felt med samme navn på samme objekt!"
diff --git a/addons/anonymization/i18n/nl.po b/addons/anonymization/i18n/nl.po
index 09475da38de..4f18432f266 100644
--- a/addons/anonymization/i18n/nl.po
+++ b/addons/anonymization/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-01-18 20:01+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
@@ -68,7 +68,7 @@ msgstr "Database anonimisatie"
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,direction:0
 msgid "clear -> anonymized"
-msgstr "duidelijk -> geanonimiseerd"
+msgstr "zichtbaar -> geanonimiseerd"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization,state:0
@@ -126,7 +126,7 @@ msgstr "Velden"
 #: selection:ir.model.fields.anonymization,state:0
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Clear"
-msgstr "Duidelijk"
+msgstr "Zichtbaar"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
@@ -186,7 +186,7 @@ msgstr "Bestandsnaam"
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,direction:0
 msgid "anonymized -> clear"
-msgstr "geanonimiseerd -> duidelijk"
+msgstr "geanonimiseerd -> zichtbaar"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,state:0
diff --git a/addons/anonymization/i18n/pl.po b/addons/anonymization/i18n/pl.po
index d5fc9c33235..834ba5ee8af 100644
--- a/addons/anonymization/i18n/pl.po
+++ b/addons/anonymization/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
@@ -79,7 +79,7 @@ msgstr ""
 #. module: anonymization
 #: field:ir.model.fields.anonymization,state:0
 msgid "unknown"
-msgstr ""
+msgstr "nieznany"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,model_id:0
diff --git a/addons/anonymization/i18n/pt.po b/addons/anonymization/i18n/pt.po
index 23891b30f46..4945010d74a 100644
--- a/addons/anonymization/i18n/pt.po
+++ b/addons/anonymization/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/pt_BR.po b/addons/anonymization/i18n/pt_BR.po
index e4ec1b320bb..18b616c187c 100644
--- a/addons/anonymization/i18n/pt_BR.po
+++ b/addons/anonymization/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
 "PO-Revision-Date: 2012-07-28 16:33+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/ro.po b/addons/anonymization/i18n/ro.po
index 427f78aa614..667a2bc4525 100644
--- a/addons/anonymization/i18n/ro.po
+++ b/addons/anonymization/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/ru.po b/addons/anonymization/i18n/ru.po
index 73c64b7945c..a0a8d75bf0e 100644
--- a/addons/anonymization/i18n/ru.po
+++ b/addons/anonymization/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/sq.po b/addons/anonymization/i18n/sq.po
index 076ff9e0f9b..a60966393b9 100644
--- a/addons/anonymization/i18n/sq.po
+++ b/addons/anonymization/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/sr@latin.po b/addons/anonymization/i18n/sr@latin.po
index d0d70657e1e..46a54eee549 100644
--- a/addons/anonymization/i18n/sr@latin.po
+++ b/addons/anonymization/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/sv.po b/addons/anonymization/i18n/sv.po
index 681b0791fcb..1148fcd2878 100644
--- a/addons/anonymization/i18n/sv.po
+++ b/addons/anonymization/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
@@ -58,12 +58,12 @@ msgstr ""
 #: view:ir.model.fields.anonymization:0
 #: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
 msgid "Anonymized Fields"
-msgstr ""
+msgstr "Anonymiserade flät"
 
 #. module: anonymization
 #: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
 msgid "Database anonymization"
-msgstr ""
+msgstr "Databas-anonymisering"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymization.history,direction:0
@@ -74,7 +74,7 @@ msgstr ""
 #: selection:ir.model.fields.anonymization,state:0
 #: selection:ir.model.fields.anonymize.wizard,state:0
 msgid "Anonymized"
-msgstr ""
+msgstr "Anonymiserad"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymization,state:0
@@ -109,12 +109,12 @@ msgstr ""
 #. module: anonymization
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Database Anonymization"
-msgstr ""
+msgstr "Databas-anonymisering"
 
 #. module: anonymization
 #: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
 msgid "Anonymize database"
-msgstr ""
+msgstr "Anonymisera databas"
 
 #. module: anonymization
 #: view:ir.model.fields.anonymization.history:0
@@ -137,7 +137,7 @@ msgstr ""
 #. module: anonymization
 #: view:ir.model.fields.anonymization:0
 msgid "Anonymized Field"
-msgstr ""
+msgstr "Anonymiserade fält"
 
 #. module: anonymization
 #: selection:ir.model.fields.anonymize.wizard,state:0
@@ -176,7 +176,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
 #: view:ir.model.fields.anonymize.wizard:0
 msgid "Anonymize Database"
-msgstr ""
+msgstr "Anonymisera databas"
 
 #. module: anonymization
 #: field:ir.model.fields.anonymize.wizard,name:0
diff --git a/addons/anonymization/i18n/tr.po b/addons/anonymization/i18n/tr.po
index 46e2bcd2693..eaf1f9924a0 100644
--- a/addons/anonymization/i18n/tr.po
+++ b/addons/anonymization/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/zh_CN.po b/addons/anonymization/i18n/zh_CN.po
index 1894ddd6df0..fbaabb0ff94 100644
--- a/addons/anonymization/i18n/zh_CN.po
+++ b/addons/anonymization/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/anonymization/i18n/zh_TW.po b/addons/anonymization/i18n/zh_TW.po
new file mode 100644
index 00000000000..3fbf8887857
--- /dev/null
+++ b/addons/anonymization/i18n/zh_TW.po
@@ -0,0 +1,213 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-29 03:38+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr "ir.model.fields.anonymize.wizard"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "欄位名稱"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "欄位"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "匯入"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr "ir.model.fields.anonymization"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr "方向"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr "匿名欄位"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr "資料庫匿名"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr "清楚->匿名"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr "匿名"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "不明"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "物件"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "檔案路徑"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "匯出"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr "回復資料庫匿名"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr "資料庫匿名"
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr "匿名資料庫"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "欄位"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "清除"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr "摘要"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr "匿名欄位"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr "不穩定版"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr "發生意外狀況"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr "不存在"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "物件名稱"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr "匿名紀錄"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr "ir.model.fields.anonymization.history"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr "匿名資料庫"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "檔案名稱"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr "匿名->清楚"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "開始"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "完成"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr "訊息"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two fields with the same name on the same object!"
+msgstr "在同一個物件不能有二個相同名稱的欄位!"
diff --git a/addons/anonymization/security/ir.model.access.csv b/addons/anonymization/security/ir.model.access.csv
index 745913eaa65..e758867ce46 100644
--- a/addons/anonymization/security/ir.model.access.csv
+++ b/addons/anonymization/security/ir.model.access.csv
@@ -3,3 +3,4 @@ access_ir_model_fields_anonymization_group_system,ir_model_fields_anonymization
 access_ir_model_fields_anonymization_user,ir_model_fields_anonymization user,model_ir_model_fields_anonymization,,1,0,0,0
 access_ir_model_fields_anonymization_history_group_system,ir_model_fields_anonymization_history group_user,model_ir_model_fields_anonymization_history,base.group_system,1,1,1,1
 access_ir_model_fields_anonymization_history_user,ir_model_fields_anonymization_history user,model_ir_model_fields_anonymization_history,,1,0,0,0
+access_ir_model_fields_anonymization_migration_fix,access_ir_model_fields_anonymization_migration_fix,model_ir_model_fields_anonymization_migration_fix,,1,1,1,1
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index 2b7fcab8b12..35b520e06f8 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -33,11 +33,10 @@ membership products (schemes).
     """,
     'author': 'OpenERP SA',
     'depends': ['base_setup', 'membership', 'event'],
-    'update_xml': ['security/ir.model.access.csv', 'profile_association.xml'],
-    'demo_xml': [],
+    'data': ['security/ir.model.access.csv', 'profile_association.xml'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0078696047261',
     'images': ['images/association1.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/association/i18n/ar.po b/addons/association/i18n/ar.po
index 3ff745195b7..739417aa789 100644
--- a/addons/association/i18n/ar.po
+++ b/addons/association/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/bg.po b/addons/association/i18n/bg.po
index b43607c6d52..a0b48bb7be5 100644
--- a/addons/association/i18n/bg.po
+++ b/addons/association/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/bs.po b/addons/association/i18n/bs.po
index cab2af59465..59cd8f4a59e 100644
--- a/addons/association/i18n/bs.po
+++ b/addons/association/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/ca.po b/addons/association/i18n/ca.po
index bc454bd6e6f..9c5ad97495b 100644
--- a/addons/association/i18n/ca.po
+++ b/addons/association/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/cs.po b/addons/association/i18n/cs.po
index 27d83e07bb6..c9b6f8cff02 100644
--- a/addons/association/i18n/cs.po
+++ b/addons/association/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: association
diff --git a/addons/association/i18n/da.po b/addons/association/i18n/da.po
index 7f6815471fc..55665f5e1de 100644
--- a/addons/association/i18n/da.po
+++ b/addons/association/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/de.po b/addons/association/i18n/de.po
index d8eb8d897c2..a3aaeb33dc1 100644
--- a/addons/association/i18n/de.po
+++ b/addons/association/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/el.po b/addons/association/i18n/el.po
index 1ec0577e364..32ef4f1d19b 100644
--- a/addons/association/i18n/el.po
+++ b/addons/association/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/en_GB.po b/addons/association/i18n/en_GB.po
index 1e9ccd2b3e9..e7a50af6aa4 100644
--- a/addons/association/i18n/en_GB.po
+++ b/addons/association/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/es.po b/addons/association/i18n/es.po
index 1232ef20d53..fb5d906ab73 100644
--- a/addons/association/i18n/es.po
+++ b/addons/association/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/es_CR.po b/addons/association/i18n/es_CR.po
index 70ea604c27b..026c14b57ca 100644
--- a/addons/association/i18n/es_CR.po
+++ b/addons/association/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: association
diff --git a/addons/association/i18n/es_EC.po b/addons/association/i18n/es_EC.po
index 0f05c6cccd4..3b9165ee580 100644
--- a/addons/association/i18n/es_EC.po
+++ b/addons/association/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/es_PY.po b/addons/association/i18n/es_PY.po
index c2fea1d2c2a..123924ef959 100644
--- a/addons/association/i18n/es_PY.po
+++ b/addons/association/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/et.po b/addons/association/i18n/et.po
index 90311937b6a..1167039b3bc 100644
--- a/addons/association/i18n/et.po
+++ b/addons/association/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/fa.po b/addons/association/i18n/fa.po
index 901bee1b720..a402c758c7e 100644
--- a/addons/association/i18n/fa.po
+++ b/addons/association/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/fi.po b/addons/association/i18n/fi.po
index ae24b237e2d..b120c8cf15b 100644
--- a/addons/association/i18n/fi.po
+++ b/addons/association/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/fr.po b/addons/association/i18n/fr.po
index f46679f7272..f3ec9b3d0f9 100644
--- a/addons/association/i18n/fr.po
+++ b/addons/association/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/gl.po b/addons/association/i18n/gl.po
index 440cfcbb04a..231e101e09e 100644
--- a/addons/association/i18n/gl.po
+++ b/addons/association/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/gu.po b/addons/association/i18n/gu.po
index 3ea90fde54f..e41007b1f09 100644
--- a/addons/association/i18n/gu.po
+++ b/addons/association/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/hr.po b/addons/association/i18n/hr.po
index b103525bdb5..8c51ea00e81 100644
--- a/addons/association/i18n/hr.po
+++ b/addons/association/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/hu.po b/addons/association/i18n/hu.po
index 67859c34803..acbea4f368a 100644
--- a/addons/association/i18n/hu.po
+++ b/addons/association/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/id.po b/addons/association/i18n/id.po
index cc71b25ec6a..494cb22a741 100644
--- a/addons/association/i18n/id.po
+++ b/addons/association/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/it.po b/addons/association/i18n/it.po
index d334090805c..ac9867921fa 100644
--- a/addons/association/i18n/it.po
+++ b/addons/association/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/ja.po b/addons/association/i18n/ja.po
index 9153d9a74e3..2671a56554d 100644
--- a/addons/association/i18n/ja.po
+++ b/addons/association/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/ko.po b/addons/association/i18n/ko.po
index 57f0c5a94d6..b31d00a2af5 100644
--- a/addons/association/i18n/ko.po
+++ b/addons/association/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/lo.po b/addons/association/i18n/lo.po
index e005e99b83c..3ff8881d0bf 100644
--- a/addons/association/i18n/lo.po
+++ b/addons/association/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/lt.po b/addons/association/i18n/lt.po
index 1043aaf470b..75d726851be 100644
--- a/addons/association/i18n/lt.po
+++ b/addons/association/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/lv.po b/addons/association/i18n/lv.po
index 739d186cfc0..5d4332325a9 100644
--- a/addons/association/i18n/lv.po
+++ b/addons/association/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/mn.po b/addons/association/i18n/mn.po
index 3f6e34d0197..eaeac0af3e3 100644
--- a/addons/association/i18n/mn.po
+++ b/addons/association/i18n/mn.po
@@ -14,33 +14,33 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
 msgid "Wiki"
-msgstr ""
+msgstr "Вики"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Event Management"
-msgstr ""
+msgstr "Үйл явдлын менежмент"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,project_gtd:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "Ажлыг Амжуулах"
 
 #. module: association
 #: model:ir.module.module,description:association.module_meta_information
 msgid "This module is to create Profile for Associates"
-msgstr ""
+msgstr "Энэ модуль нь Холбоонуудын хувийн хэрэгийг үүсгэдэг."
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Тохиргооны явц"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -48,21 +48,23 @@ msgid ""
 "Here are specific applications related to the Association Profile you "
 "selected."
 msgstr ""
+"Энд таны сонгосон Холбооны хувийн хэрэгт холбогдох тусгайлсан хэрэглээний "
+"програмууд байна"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "title"
-msgstr ""
+msgstr "гарчиг"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,event_project:0
 msgid "Helps you to manage and organize your events."
-msgstr ""
+msgstr "Үйл явдлаа зохион байгуулж менеж хийхэд тусладаг."
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Зураг"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
@@ -70,6 +72,8 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
+"Зардал нь төсөлтэй холбоотой бол ажилтны зардалыг зохицуулах, хянаж "
+"үйлчлүүлэгчид автоматаар мэдэгдэх боломжтой"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
@@ -77,6 +81,9 @@ msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
+"Ажлыг Амжуулах-АА гэдэг нь өөрийгөө болон өөрийн ажлуудаа зохистой менеж "
+"хийх аргачлал юм. Энэ модуль нь OpenERP-н төслийн менежментийн АА зарчимтэй "
+"бүрэн нийцтэй."
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -86,7 +93,7 @@ msgstr "Нөөцийн менежмент"
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
-msgstr ""
+msgstr "Холбооны хувийн хэрэг"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
@@ -97,7 +104,7 @@ msgstr "Зарпал хянах"
 #: model:ir.actions.act_window,name:association.action_config_install_module
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Association Application Configuration"
-msgstr ""
+msgstr "Холбооны хэрэглээний програмын тохиргоо"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
@@ -105,6 +112,8 @@ msgid ""
 "Lets you create wiki pages and page groups in order to keep track of "
 "business knowledge and share it with and  between your employees."
 msgstr ""
+"Бусадтай бизнесийн мэдлэгээ хуваалцах, суралцахад зориулан вики хуудас "
+"үүсгэх боломж олгоно."
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project:0
@@ -112,24 +121,26 @@ msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
 msgstr ""
+"Даалгаврыг хөтлөх, төлөвлөх зэрэг боломжийн тусламжтайгаар төсөл болон "
+"даалгаврыг менеж хийхэд тусладаг"
 
 #. module: association
 #: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
 msgid "profile.association.config.install_modules_wizard"
-msgstr ""
+msgstr "profile.association.config.install_modules_wizard"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,event_project:0
 msgid "Events"
-msgstr ""
+msgstr "Үйл явдлууд"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "Төслийн менежмент"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "Тохиргоо"
diff --git a/addons/association/i18n/nb.po b/addons/association/i18n/nb.po
new file mode 100644
index 00000000000..347d0773a07
--- /dev/null
+++ b/addons/association/i18n/nb.po
@@ -0,0 +1,144 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2012-08-28 11:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr "Arrangementsledelse"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Å få ting gjort"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr "Denne modulen er å skape profil for Tilknyttede."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr "Konfigurasjonsprosess"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid ""
+"Here are specific applications related to the Association Profile you "
+"selected."
+msgstr ""
+"Her er spesifikke programmer knyttet til foreningen profil du har valgt."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr "tittel"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr "Hjelper deg å administrere og organisere hendelser."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Bilde"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+"Spor og styrer ansattes utgifter, og kan automatisk re-faktura klienter "
+"dersom utgiftene prosjekt-relatert."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD er en metode for å effektivt organisere deg selv og dine oppgaver. Denne "
+"modulen integrerer fullt GTD prinsippet med OpenERP prosjektledelse."
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr "Ressurser ledelse"
+
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Tilknytning profilen"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr "Utgift Sporing"
+
+#. module: association
+#: model:ir.actions.act_window,name:association.action_config_install_module
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Association Application Configuration"
+msgstr "Tilknytning applikasjon konfigurasjon"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+msgid ""
+"Lets you create wiki pages and page groups in order to keep track of "
+"business knowledge and share it with and  between your employees."
+msgstr ""
+"Lar deg opprette wikisider og sidegrupper for å holde oversikt over "
+"virksomheten kunnskap og dele den med og mellom de ansatte."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"Hjelper deg med å håndtere dine prosjekter og oppgaver ved å spore dem, "
+"generere planer, osv..."
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "Profil.foreningen.konfigurasjon.installere_moduler_veiviseren"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "Arrangementer"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Prosjektledelse"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Configure"
+msgstr "Konfigurer"
diff --git a/addons/association/i18n/nl.po b/addons/association/i18n/nl.po
index 9aa7df5a808..ce054e41dd1 100644
--- a/addons/association/i18n/nl.po
+++ b/addons/association/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/pl.po b/addons/association/i18n/pl.po
index 5a11cda73b5..a1f0ef75e27 100644
--- a/addons/association/i18n/pl.po
+++ b/addons/association/i18n/pl.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
 msgid "Wiki"
-msgstr ""
+msgstr "Wiki"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -51,7 +51,7 @@ msgstr ""
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "title"
-msgstr ""
+msgstr "tytuł"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,event_project:0
@@ -61,7 +61,7 @@ msgstr ""
 #. module: association
 #: field:profile.association.config.install_modules_wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Obraz"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
diff --git a/addons/association/i18n/pt.po b/addons/association/i18n/pt.po
index 28d21cab5b6..99f0e8a9858 100644
--- a/addons/association/i18n/pt.po
+++ b/addons/association/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/pt_BR.po b/addons/association/i18n/pt_BR.po
index 3b0e63621fc..34cc82a2db8 100644
--- a/addons/association/i18n/pt_BR.po
+++ b/addons/association/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/ro.po b/addons/association/i18n/ro.po
index 3b3a060fcca..0eacf13bced 100644
--- a/addons/association/i18n/ro.po
+++ b/addons/association/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/ru.po b/addons/association/i18n/ru.po
index 49c43c618a6..5c35ea3cff2 100644
--- a/addons/association/i18n/ru.po
+++ b/addons/association/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/sl.po b/addons/association/i18n/sl.po
index 8a498a3f53b..e7d89130137 100644
--- a/addons/association/i18n/sl.po
+++ b/addons/association/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/sq.po b/addons/association/i18n/sq.po
index d68d232b30c..863ce5c1d10 100644
--- a/addons/association/i18n/sq.po
+++ b/addons/association/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/sr.po b/addons/association/i18n/sr.po
index 27d3633f45e..2fa829406e2 100644
--- a/addons/association/i18n/sr.po
+++ b/addons/association/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/sr@latin.po b/addons/association/i18n/sr@latin.po
index 1b1dc5d30e9..bd1e12dbf6e 100644
--- a/addons/association/i18n/sr@latin.po
+++ b/addons/association/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/sv.po b/addons/association/i18n/sv.po
index fab82541ccc..d075cc6bdbe 100644
--- a/addons/association/i18n/sv.po
+++ b/addons/association/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/tlh.po b/addons/association/i18n/tlh.po
index 1043aaf470b..75d726851be 100644
--- a/addons/association/i18n/tlh.po
+++ b/addons/association/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/tr.po b/addons/association/i18n/tr.po
index 43723dd02e9..835b86c7256 100644
--- a/addons/association/i18n/tr.po
+++ b/addons/association/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/uk.po b/addons/association/i18n/uk.po
index d1b94c925f3..5c2a842492b 100644
--- a/addons/association/i18n/uk.po
+++ b/addons/association/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/vi.po b/addons/association/i18n/vi.po
index f7f2e2fefc7..d0ccb2a50df 100644
--- a/addons/association/i18n/vi.po
+++ b/addons/association/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/zh_CN.po b/addons/association/i18n/zh_CN.po
index 571eb74bc80..af248dfa760 100644
--- a/addons/association/i18n/zh_CN.po
+++ b/addons/association/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
diff --git a/addons/association/i18n/zh_TW.po b/addons/association/i18n/zh_TW.po
index 67fc6de2ce5..d20ce39cac5 100644
--- a/addons/association/i18n/zh_TW.po
+++ b/addons/association/i18n/zh_TW.po
@@ -7,128 +7,128 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-11-12 11:39+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-28 05:27+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
 msgid "Wiki"
-msgstr ""
+msgstr "維基 (Wiki)"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Event Management"
-msgstr ""
+msgstr "事件管理"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,project_gtd:0
 msgid "Getting Things Done"
-msgstr ""
+msgstr "Getting Things Done"
 
 #. module: association
 #: model:ir.module.module,description:association.module_meta_information
 msgid "This module is to create Profile for Associates"
-msgstr ""
+msgstr "此模組設置商會管理的功能"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "設置進度"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid ""
 "Here are specific applications related to the Association Profile you "
 "selected."
-msgstr ""
+msgstr "這裡有與跟商會管理相關的功能"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "title"
-msgstr ""
+msgstr "標題"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,event_project:0
 msgid "Helps you to manage and organize your events."
-msgstr ""
+msgstr "幫您管理和組織事件"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "圖像"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
 msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
-msgstr ""
+msgstr "追蹤和管理員工費用，如果此費用和專案相關則可以自動向客戶開發票"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
-msgstr ""
+msgstr "GTD是一種高效統籌個人的時間和任務的方法。這個模組把GTD方法和OpenERP的專案管理結合在了一起"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Resources Management"
-msgstr ""
+msgstr "資源管理"
 
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
-msgstr ""
+msgstr "商會管理"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
-msgstr ""
+msgstr "費用追蹤"
 
 #. module: association
 #: model:ir.actions.act_window,name:association.action_config_install_module
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Association Application Configuration"
-msgstr ""
+msgstr "商會模組設置"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
 msgid ""
 "Lets you create wiki pages and page groups in order to keep track of "
 "business knowledge and share it with and  between your employees."
-msgstr ""
+msgstr "讓您能夠創建維基(wiki)頁面和頁面組來追蹤業務知識並與您的員工們分享。"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project:0
 msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
-msgstr ""
+msgstr "幫助你管理專案，追蹤任務，生成計劃"
 
 #. module: association
 #: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
 msgid "profile.association.config.install_modules_wizard"
-msgstr ""
+msgstr "profile.association.config.install_modules_wizard"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,event_project:0
 msgid "Events"
-msgstr ""
+msgstr "事件"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "專案管理"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "設置"
diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py
index 9ba403bcee3..41958c84f66 100644
--- a/addons/audittrail/__openerp__.py
+++ b/addons/audittrail/__openerp__.py
@@ -34,16 +34,14 @@ and can check logs.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'wizard/audittrail_view_log_view.xml',
         'audittrail_view.xml',
         'security/ir.model.access.csv',
     ],
-    'demo_xml': ['audittrail_demo.xml'],
+    'demo': ['audittrail_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0062572348749',
     'images': ['images/audittrail1.jpeg','images/audittrail2.jpeg','images/audittrail3.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index aee9fbd9305..54284dee4da 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -25,6 +25,7 @@ from tools.translate import _
 import pooler
 import time
 import tools
+from openerp import SUPERUSER_ID
 
 class audittrail_rule(osv.osv):
     """
@@ -201,7 +202,7 @@ class audittrail_objects_proxy(object_proxy):
             res = value
         return res
 
-    def create_log_line(self, cr, uid, log_id, model, lines=[]):
+    def create_log_line(self, cr, uid, log_id, model, lines=None):
         """
         Creates lines for changed fields with its old and new values
 
@@ -210,6 +211,8 @@ class audittrail_objects_proxy(object_proxy):
         @param model: Object which values are being changed
         @param lines: List of values for line is to be created
         """
+        if lines is None:
+            lines = []
         pool = pooler.get_pool(cr.dbname)
         obj_pool = pool.get(model.model)
         model_pool = pool.get('ir.model')
@@ -252,10 +255,10 @@ class audittrail_objects_proxy(object_proxy):
         pool = pooler.get_pool(cr.dbname)
         resource_pool = pool.get(model)
         model_pool = pool.get('ir.model')
-        model_ids = model_pool.search(cr, 1, [('model', '=', model)])
+        model_ids = model_pool.search(cr, SUPERUSER_ID, [('model', '=', model)])
         model_id = model_ids and model_ids[0] or False
         assert model_id, _("'%s' Model does not exist..." %(model))
-        model = model_pool.browse(cr, 1, model_id)
+        model = model_pool.browse(cr, SUPERUSER_ID, model_id)
 
         # fields to log. currently only used by log on read()
         field_list = []
@@ -322,7 +325,7 @@ class audittrail_objects_proxy(object_proxy):
         data = {}
         resource_pool = pool.get(model.model)
         # read all the fields of the given resources in super admin mode
-        for resource in resource_pool.read(cr, 1, res_ids):
+        for resource in resource_pool.read(cr, SUPERUSER_ID, res_ids):
             values = {}
             values_text = {}
             resource_id = resource['id']
@@ -332,25 +335,30 @@ class audittrail_objects_proxy(object_proxy):
                     continue
                 values[field] = resource[field]
                 # get the textual value of that field for this record
-                values_text[field] = self.get_value_text(cr, 1, pool, resource_pool, method, field, resource[field])
+                values_text[field] = self.get_value_text(cr, SUPERUSER_ID, pool, resource_pool, method, field, resource[field])
 
                 field_obj = resource_pool._all_columns.get(field).column
                 if field_obj._type in ('one2many','many2many'):
                     # check if an audittrail rule apply in super admin mode
-                    if self.check_rules(cr, 1, field_obj._obj, method):
+                    if self.check_rules(cr, SUPERUSER_ID, field_obj._obj, method):
                         # check if the model associated to a *2m field exists, in super admin mode
-                        x2m_model_ids = pool.get('ir.model').search(cr, 1, [('model', '=', field_obj._obj)])
+                        x2m_model_ids = pool.get('ir.model').search(cr, SUPERUSER_ID, [('model', '=', field_obj._obj)])
                         x2m_model_id = x2m_model_ids and x2m_model_ids[0] or False
                         assert x2m_model_id, _("'%s' Model does not exist..." %(field_obj._obj))
-                        x2m_model = pool.get('ir.model').browse(cr, 1, x2m_model_id)
-                        #recursive call on x2m fields that need to be checked too
-                        data.update(self.get_data(cr, 1, pool, resource[field], x2m_model, method))
+                        x2m_model = pool.get('ir.model').browse(cr, SUPERUSER_ID, x2m_model_id)
+                        field_resource_ids = list(set(resource[field]))
+                        if model.model == x2m_model.model:
+                            # we need to remove current resource_id from the many2many to prevent an infinit loop
+                            if resource_id in field_resource_ids:
+                                field_resource_ids.remove(resource_id)
+                        data.update(self.get_data(cr, SUPERUSER_ID, pool, field_resource_ids, x2m_model, method))
+    
             data[(model.id, resource_id)] = {'text':values_text, 'value': values}
         return data
 
-    def prepare_audittrail_log_line(self, cr, uid, pool, model, resource_id, method, old_values, new_values, field_list=[]):
+    def prepare_audittrail_log_line(self, cr, uid, pool, model, resource_id, method, old_values, new_values, field_list=None):
         """
-        This function compares the old data (i.e before the method was executed) and the new data 
+        This function compares the old data (i.e before the method was executed) and the new data
         (after the method was executed) and returns a structure with all the needed information to
         log those differences.
 
@@ -374,35 +382,43 @@ class audittrail_objects_proxy(object_proxy):
                 (model.id, resource_id): []
               }
 
-        The reason why the structure returned is build as above is because when modifying an existing 
+        The reason why the structure returned is build as above is because when modifying an existing
         record, we may have to log a change done in a x2many field of that object
         """
+        if field_list is None:
+            field_list = []
         key = (model.id, resource_id)
         lines = {
             key: []
         }
         # loop on all the fields
         for field_name, field_definition in pool.get(model.model)._all_columns.items():
+            if field_name in ('__last_update', 'id'):
+                continue
             #if the field_list param is given, skip all the fields not in that list
             if field_list and field_name not in field_list:
                 continue
             field_obj = field_definition.column
             if field_obj._type in ('one2many','many2many'):
                 # checking if an audittrail rule apply in super admin mode
-                if self.check_rules(cr, 1, field_obj._obj, method):
+                if self.check_rules(cr, SUPERUSER_ID, field_obj._obj, method):
                     # checking if the model associated to a *2m field exists, in super admin mode
-                    x2m_model_ids = pool.get('ir.model').search(cr, 1, [('model', '=', field_obj._obj)])
+                    x2m_model_ids = pool.get('ir.model').search(cr, SUPERUSER_ID, [('model', '=', field_obj._obj)])
                     x2m_model_id = x2m_model_ids and x2m_model_ids[0] or False
                     assert x2m_model_id, _("'%s' Model does not exist..." %(field_obj._obj))
-                    x2m_model = pool.get('ir.model').browse(cr, 1, x2m_model_id)
+                    x2m_model = pool.get('ir.model').browse(cr, SUPERUSER_ID, x2m_model_id)
                     # the resource_ids that need to be checked are the sum of both old and previous values (because we
                     # need to log also creation or deletion in those lists).
                     x2m_old_values_ids = old_values.get(key, {'value': {}})['value'].get(field_name, [])
                     x2m_new_values_ids = new_values.get(key, {'value': {}})['value'].get(field_name, [])
                     # We use list(set(...)) to remove duplicates.
                     res_ids = list(set(x2m_old_values_ids + x2m_new_values_ids))
+                    if model.model == x2m_model.model:
+                        # we need to remove current resource_id from the many2many to prevent an infinit loop
+                        if resource_id in res_ids:
+                            res_ids.remove(resource_id)
                     for res_id in res_ids:
-                        lines.update(self.prepare_audittrail_log_line(cr, 1, pool, x2m_model, res_id, method, old_values, new_values, field_list))
+                        lines.update(self.prepare_audittrail_log_line(cr, SUPERUSER_ID, pool, x2m_model, res_id, method, old_values, new_values, field_list))
             # if the value value is different than the old value: record the change
             if key not in old_values or key not in new_values or old_values[key]['value'][field_name] != new_values[key]['value'][field_name]:
                 data = {
@@ -415,7 +431,7 @@ class audittrail_objects_proxy(object_proxy):
                 lines[key].append(data)
         return lines
 
-    def process_data(self, cr, uid, pool, res_ids, model, method, old_values={}, new_values={}, field_list=[]):
+    def process_data(self, cr, uid, pool, res_ids, model, method, old_values=None, new_values=None, field_list=None):
         """
         This function processes and iterates recursively to log the difference between the old
         data (i.e before the method was executed) and the new data and creates audittrail log
@@ -434,6 +450,8 @@ class audittrail_objects_proxy(object_proxy):
             on specific fields only.
         :return: True
         """
+        if field_list is None:
+            field_list = []
         # loop on all the given ids
         for res_id in res_ids:
             # compare old and new values and get audittrail log lines accordingly
@@ -441,11 +459,13 @@ class audittrail_objects_proxy(object_proxy):
 
             # if at least one modification has been found
             for model_id, resource_id in lines:
+                name = pool.get(model.model).name_get(cr, uid, [resource_id])[0][1]
                 vals = {
                     'method': method,
                     'object_id': model_id,
                     'user_id': uid,
                     'res_id': resource_id,
+                    'name': name,
                 }
                 if (model_id, resource_id) not in old_values and method not in ('copy', 'read'):
                     # the resource was not existing so we are forcing the method to 'create'
@@ -459,9 +479,9 @@ class audittrail_objects_proxy(object_proxy):
                     vals.update({'method': 'unlink'})
                 # create the audittrail log in super admin mode, only if a change has been detected
                 if lines[(model_id, resource_id)]:
-                    log_id = pool.get('audittrail.log').create(cr, 1, vals)
+                    log_id = pool.get('audittrail.log').create(cr, SUPERUSER_ID, vals)
                     model = pool.get('ir.model').browse(cr, uid, model_id)
-                    self.create_log_line(cr, 1, log_id, model, lines[(model_id, resource_id)])
+                    self.create_log_line(cr, SUPERUSER_ID, log_id, model, lines[(model_id, resource_id)])
         return True
 
     def check_rules(self, cr, uid, model, method):
@@ -475,15 +495,15 @@ class audittrail_objects_proxy(object_proxy):
         """
         pool = pooler.get_pool(cr.dbname)
         if 'audittrail.rule' in pool.models:
-            model_ids = pool.get('ir.model').search(cr, 1, [('model', '=', model)])
+            model_ids = pool.get('ir.model').search(cr, SUPERUSER_ID, [('model', '=', model)])
             model_id = model_ids and model_ids[0] or False
             if model_id:
-                rule_ids = pool.get('audittrail.rule').search(cr, 1, [('object_id', '=', model_id), ('state', '=', 'subscribed')])
-                for rule in pool.get('audittrail.rule').read(cr, 1, rule_ids, ['user_id','log_read','log_write','log_create','log_unlink','log_action','log_workflow']):
+                rule_ids = pool.get('audittrail.rule').search(cr, SUPERUSER_ID, [('object_id', '=', model_id), ('state', '=', 'subscribed')])
+                for rule in pool.get('audittrail.rule').read(cr, SUPERUSER_ID, rule_ids, ['user_id','log_read','log_write','log_create','log_unlink','log_action','log_workflow']):
                     if len(rule['user_id']) == 0 or uid in rule['user_id']:
                         if rule.get('log_'+method,0):
                             return True
-                        elif method not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc', 'unlink', 'write', 'create'):
+                        elif method not in ('default_get','read','fields_view_get','fields_get','search','search_count','name_search','name_get','get','request_get', 'get_sc', 'unlink', 'write', 'create', 'read_group', 'import_data'):
                             if rule['log_action']:
                                 return True
 
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index b041329f6bd..5d5bdcc6c21 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -99,7 +99,7 @@
                         <field name="res_id" readonly="1"/>
                         <field name="object_id" readonly="1"/>
                     </group>
-                    <field name="line_ids" mode="tree,form"
+                    <field name="line_ids" mode="tree"
                         widget="one2many_list" readonly="1">
                         <form string="Log Lines" version="7.0">
                             <group col="4">
@@ -145,7 +145,7 @@
             <field name="name">audittrail.log.tree</field>
             <field name="model">audittrail.log</field>
             <field name="arch" type="xml">
-                <tree string="AuditTrail Logs">
+                <tree string="AuditTrail Logs" create="false">
                     <field name="timestamp"/>
                     <field name="name"/>
                     <field name="object_id"/>
diff --git a/addons/audittrail/i18n/ar.po b/addons/audittrail/i18n/ar.po
index 1c29a935ce3..b278e1ee2d7 100644
--- a/addons/audittrail/i18n/ar.po
+++ b/addons/audittrail/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/bg.po b/addons/audittrail/i18n/bg.po
index ac347f4d327..2c6bda3af7d 100644
--- a/addons/audittrail/i18n/bg.po
+++ b/addons/audittrail/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/bs.po b/addons/audittrail/i18n/bs.po
index e6b244c76ff..526aedf2b64 100644
--- a/addons/audittrail/i18n/bs.po
+++ b/addons/audittrail/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/ca.po b/addons/audittrail/i18n/ca.po
index c29d0e9dac8..120a9689bf7 100644
--- a/addons/audittrail/i18n/ca.po
+++ b/addons/audittrail/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/cs.po b/addons/audittrail/i18n/cs.po
index 828bf4558b9..21d59fa5755 100644
--- a/addons/audittrail/i18n/cs.po
+++ b/addons/audittrail/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/da.po b/addons/audittrail/i18n/da.po
index 4ff3c27e0a7..4063d681107 100644
--- a/addons/audittrail/i18n/da.po
+++ b/addons/audittrail/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/de.po b/addons/audittrail/i18n/de.po
index 50c80e97758..5954350083e 100644
--- a/addons/audittrail/i18n/de.po
+++ b/addons/audittrail/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/el.po b/addons/audittrail/i18n/el.po
index deb2e1dd569..475a5209e50 100644
--- a/addons/audittrail/i18n/el.po
+++ b/addons/audittrail/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/es.po b/addons/audittrail/i18n/es.po
index 5441f71fbfc..5ac142f0dd8 100644
--- a/addons/audittrail/i18n/es.po
+++ b/addons/audittrail/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/es_AR.po b/addons/audittrail/i18n/es_AR.po
index e73c31d1964..6cbd02e2471 100644
--- a/addons/audittrail/i18n/es_AR.po
+++ b/addons/audittrail/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/es_CR.po b/addons/audittrail/i18n/es_CR.po
index d4cae3fee5c..944c2c86994 100644
--- a/addons/audittrail/i18n/es_CR.po
+++ b/addons/audittrail/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: audittrail
diff --git a/addons/audittrail/i18n/es_EC.po b/addons/audittrail/i18n/es_EC.po
index 73d3d55eb91..9dffea29c2c 100644
--- a/addons/audittrail/i18n/es_EC.po
+++ b/addons/audittrail/i18n/es_EC.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-13 03:24+0000\n"
+"PO-Revision-Date: 2012-10-18 19:14+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
@@ -38,12 +38,12 @@ msgstr "Suscrito"
 msgid ""
 "There is already a rule defined on this object\n"
 " You cannot define another: please edit the existing one."
-msgstr ""
+msgstr "Ya existe una regla definida en este objeto"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Subscribed Rule"
-msgstr ""
+msgstr "Regla suscrita"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
@@ -329,7 +329,7 @@ msgstr "Registros auditoría"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Draft  Rule"
-msgstr ""
+msgstr "Regla Borrador"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
diff --git a/addons/audittrail/i18n/es_PY.po b/addons/audittrail/i18n/es_PY.po
index 6b4f377b52c..80c532add1f 100644
--- a/addons/audittrail/i18n/es_PY.po
+++ b/addons/audittrail/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/et.po b/addons/audittrail/i18n/et.po
index 47da3f17e49..40237c387de 100644
--- a/addons/audittrail/i18n/et.po
+++ b/addons/audittrail/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/fa.po b/addons/audittrail/i18n/fa.po
index 2daf322c788..28dd5075950 100644
--- a/addons/audittrail/i18n/fa.po
+++ b/addons/audittrail/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/fi.po b/addons/audittrail/i18n/fi.po
index 5c7d85668d2..fcbd62c4467 100644
--- a/addons/audittrail/i18n/fi.po
+++ b/addons/audittrail/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/fr.po b/addons/audittrail/i18n/fr.po
index f6dc8f994df..ac6995f7bd4 100644
--- a/addons/audittrail/i18n/fr.po
+++ b/addons/audittrail/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/gl.po b/addons/audittrail/i18n/gl.po
index 0acbdb55a05..45233830cb6 100644
--- a/addons/audittrail/i18n/gl.po
+++ b/addons/audittrail/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/gu.po b/addons/audittrail/i18n/gu.po
index f20d363b426..34c8df551b5 100644
--- a/addons/audittrail/i18n/gu.po
+++ b/addons/audittrail/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/hr.po b/addons/audittrail/i18n/hr.po
index 0e27f5afac0..bf5c63016b9 100644
--- a/addons/audittrail/i18n/hr.po
+++ b/addons/audittrail/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/hu.po b/addons/audittrail/i18n/hu.po
index 66f09a44c1a..5c0cbf40879 100644
--- a/addons/audittrail/i18n/hu.po
+++ b/addons/audittrail/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/id.po b/addons/audittrail/i18n/id.po
index eb3b804cd4d..af82e7ec0c7 100644
--- a/addons/audittrail/i18n/id.po
+++ b/addons/audittrail/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/it.po b/addons/audittrail/i18n/it.po
index 642b23c436e..1f8e8cf2355 100644
--- a/addons/audittrail/i18n/it.po
+++ b/addons/audittrail/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/ja.po b/addons/audittrail/i18n/ja.po
index 61f1fb6bf22..4bf6351b86e 100644
--- a/addons/audittrail/i18n/ja.po
+++ b/addons/audittrail/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/ko.po b/addons/audittrail/i18n/ko.po
index 057cbd33e9f..02350531627 100644
--- a/addons/audittrail/i18n/ko.po
+++ b/addons/audittrail/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index 532fe65610b..43cf66ea860 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/lv.po b/addons/audittrail/i18n/lv.po
index 61d6fd9aa3b..ef0f3693a14 100644
--- a/addons/audittrail/i18n/lv.po
+++ b/addons/audittrail/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/mn.po b/addons/audittrail/i18n/mn.po
index eb30f48e60f..282fc4da277 100644
--- a/addons/audittrail/i18n/mn.po
+++ b/addons/audittrail/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/nb.po b/addons/audittrail/i18n/nb.po
index 788c4cd57b8..011859294d3 100644
--- a/addons/audittrail/i18n/nb.po
+++ b/addons/audittrail/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/nl.po b/addons/audittrail/i18n/nl.po
index 553a9c5f171..a60f26a7879 100644
--- a/addons/audittrail/i18n/nl.po
+++ b/addons/audittrail/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-01-18 20:04+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/nl_BE.po b/addons/audittrail/i18n/nl_BE.po
index ef6a93515b2..7f8618db605 100644
--- a/addons/audittrail/i18n/nl_BE.po
+++ b/addons/audittrail/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/oc.po b/addons/audittrail/i18n/oc.po
index e9d5589d68c..61023526326 100644
--- a/addons/audittrail/i18n/oc.po
+++ b/addons/audittrail/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/pl.po b/addons/audittrail/i18n/pl.po
index 2dcf385505d..dd50aa92556 100644
--- a/addons/audittrail/i18n/pl.po
+++ b/addons/audittrail/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
@@ -61,7 +61,7 @@ msgstr ""
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupuj wg..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -72,7 +72,7 @@ msgstr "Stan"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Subskrybuj"
 
 #. module: audittrail
 #: view:audittrail.rule:0
diff --git a/addons/audittrail/i18n/pt.po b/addons/audittrail/i18n/pt.po
index b46a69860ea..ff150204663 100644
--- a/addons/audittrail/i18n/pt.po
+++ b/addons/audittrail/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/pt_BR.po b/addons/audittrail/i18n/pt_BR.po
index e30a3d0374e..0cfba3d2b3f 100644
--- a/addons/audittrail/i18n/pt_BR.po
+++ b/addons/audittrail/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 16:36+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/ro.po b/addons/audittrail/i18n/ro.po
index 587d60e604d..c2cbf240da4 100644
--- a/addons/audittrail/i18n/ro.po
+++ b/addons/audittrail/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po
index 5f2a70a931f..53f50244836 100644
--- a/addons/audittrail/i18n/ru.po
+++ b/addons/audittrail/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/sl.po b/addons/audittrail/i18n/sl.po
index 1697b86b67a..6e930b4f243 100644
--- a/addons/audittrail/i18n/sl.po
+++ b/addons/audittrail/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/sq.po b/addons/audittrail/i18n/sq.po
index 389810e086d..17be0f21014 100644
--- a/addons/audittrail/i18n/sq.po
+++ b/addons/audittrail/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/sr@latin.po b/addons/audittrail/i18n/sr@latin.po
index 00025ee70a0..e6d277c98ce 100644
--- a/addons/audittrail/i18n/sr@latin.po
+++ b/addons/audittrail/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/sv.po b/addons/audittrail/i18n/sv.po
index e930766d88a..018f0952d4d 100644
--- a/addons/audittrail/i18n/sv.po
+++ b/addons/audittrail/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/tlh.po b/addons/audittrail/i18n/tlh.po
index e1d4ce64416..901e71368cc 100644
--- a/addons/audittrail/i18n/tlh.po
+++ b/addons/audittrail/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index 1ff7598fd69..4afe5ebc566 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/uk.po b/addons/audittrail/i18n/uk.po
index b875122b1e7..b4bec7d6af6 100644
--- a/addons/audittrail/i18n/uk.po
+++ b/addons/audittrail/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/vi.po b/addons/audittrail/i18n/vi.po
index a568e124e37..2675d8b4aca 100644
--- a/addons/audittrail/i18n/vi.po
+++ b/addons/audittrail/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 4ce63a2e7f4..fe2a6ccf2d0 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
diff --git a/addons/audittrail/i18n/zh_TW.po b/addons/audittrail/i18n/zh_TW.po
index 2d7323fdeef..0af3ab0390f 100644
--- a/addons/audittrail/i18n/zh_TW.po
+++ b/addons/audittrail/i18n/zh_TW.po
@@ -7,31 +7,31 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-01-23 17:17+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-30 13:46+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:75
 #, python-format
 msgid "WARNING: audittrail is not part of the pool"
-msgstr ""
+msgstr "警告：稽核追蹤不屬於此池"
 
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
 msgid "Log"
-msgstr ""
+msgstr "日誌"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: selection:audittrail.rule,state:0
 msgid "Subscribed"
-msgstr ""
+msgstr "已訂閱"
 
 #. module: audittrail
 #: sql_constraint:audittrail.rule:0
@@ -39,330 +39,332 @@ msgid ""
 "There is already a rule defined on this object\n"
 " You cannot define another: please edit the existing one."
 msgstr ""
+"該對象已經定義了稽核規則。\n"
+"您不能再次定義，請直接編輯現有的稽核規則。"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Subscribed Rule"
-msgstr ""
+msgstr "已訂閱規則"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_rule
 msgid "Audittrail Rule"
-msgstr ""
+msgstr "稽核追蹤規則"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_log_tree
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
 msgid "Audit Logs"
-msgstr ""
+msgstr "稽核日誌"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類方式..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: field:audittrail.rule,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "訂閱(_S)"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 #: selection:audittrail.rule,state:0
 msgid "Draft"
-msgstr ""
+msgstr "草稿"
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value:0
 msgid "Old Value"
-msgstr ""
+msgstr "舊值"
 
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_view_log
 msgid "View log"
-msgstr ""
+msgstr "查看日誌"
 
 #. module: audittrail
 #: help:audittrail.rule,log_read:0
 msgid ""
 "Select this if you want to keep track of read/open on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果你需要追蹤對該對象的任何記錄的讀和打開動作請選擇此項"
 
 #. module: audittrail
 #: field:audittrail.log,method:0
 msgid "Method"
-msgstr ""
+msgstr "方法"
 
 #. module: audittrail
 #: field:audittrail.view.log,from:0
 msgid "Log From"
-msgstr ""
+msgstr "日誌來源"
 
 #. module: audittrail
 #: field:audittrail.log.line,log:0
 msgid "Log ID"
-msgstr ""
+msgstr "日誌標識"
 
 #. module: audittrail
 #: field:audittrail.log,res_id:0
 msgid "Resource Id"
-msgstr ""
+msgstr "資源標識"
 
 #. module: audittrail
 #: help:audittrail.rule,user_id:0
 msgid "if  User is not added then it will applicable for all users"
-msgstr ""
+msgstr "如果未加入使用者則適用於所有使用者"
 
 #. module: audittrail
 #: help:audittrail.rule,log_workflow:0
 msgid ""
 "Select this if you want to keep track of workflow on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果您需要追蹤該對象所有記錄的工作流程請選擇此項"
 
 #. module: audittrail
 #: field:audittrail.rule,user_id:0
 msgid "Users"
-msgstr ""
+msgstr "使用者"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Log Lines"
-msgstr ""
+msgstr "日誌明細"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,object_id:0
 #: field:audittrail.rule,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "對象"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rule"
-msgstr ""
+msgstr "稽核追蹤規則"
 
 #. module: audittrail
 #: field:audittrail.view.log,to:0
 msgid "Log To"
-msgstr ""
+msgstr "記錄到"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value Text: "
-msgstr ""
+msgstr "新值內容： "
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Search Audittrail Rule"
-msgstr ""
+msgstr "搜索稽核追蹤規則"
 
 #. module: audittrail
 #: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
 msgid "Audit Rules"
-msgstr ""
+msgstr "稽核規則"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value : "
-msgstr ""
+msgstr "舊值： "
 
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "資源名稱"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,timestamp:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: audittrail
 #: help:audittrail.rule,log_write:0
 msgid ""
 "Select this if you want to keep track of modification on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果您要追蹤此對象所有記錄的變更請選擇此項。"
 
 #. module: audittrail
 #: field:audittrail.rule,log_create:0
 msgid "Log Creates"
-msgstr ""
+msgstr "建立日誌"
 
 #. module: audittrail
 #: help:audittrail.rule,object_id:0
 msgid "Select object for which you want to generate log."
-msgstr ""
+msgstr "選擇您要生成稽核日誌的對象"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value Text : "
-msgstr ""
+msgstr "舊值內容： "
 
 #. module: audittrail
 #: field:audittrail.rule,log_workflow:0
 msgid "Log Workflow"
-msgstr ""
+msgstr "記錄工作流"
 
 #. module: audittrail
 #: field:audittrail.rule,log_read:0
 msgid "Log Reads"
-msgstr ""
+msgstr "記錄讀操作"
 
 #. module: audittrail
 #: code:addons/audittrail/audittrail.py:76
 #, python-format
 msgid "Change audittrail depends -- Setting rule as DRAFT"
-msgstr ""
+msgstr "修改檢查稽核依賴 - 設定規則為草稿"
 
 #. module: audittrail
 #: field:audittrail.log,line_ids:0
 msgid "Log lines"
-msgstr ""
+msgstr "日誌明細"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_id:0
 msgid "Fields"
-msgstr ""
+msgstr "欄位列表"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "AuditTrail Rules"
-msgstr ""
+msgstr "稽核追蹤規則"
 
 #. module: audittrail
 #: help:audittrail.rule,log_unlink:0
 msgid ""
 "Select this if you want to keep track of deletion on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果你要追蹤所有刪除這個對象記錄的操作請選擇此項"
 
 #. module: audittrail
 #: view:audittrail.log:0
 #: field:audittrail.log,user_id:0
 msgid "User"
-msgstr ""
+msgstr "使用者"
 
 #. module: audittrail
 #: field:audittrail.rule,action_id:0
 msgid "Action ID"
-msgstr ""
+msgstr "動作ID"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Users (if User is not added then it will applicable for all users)"
-msgstr ""
+msgstr "使用者（如果沒有選擇使用者則適用於所有使用者）"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "UnSubscribe"
-msgstr ""
+msgstr "取消訂閱"
 
 #. module: audittrail
 #: field:audittrail.rule,log_unlink:0
 msgid "Log Deletes"
-msgstr ""
+msgstr "記錄刪除操作"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
 msgid "Field Description"
-msgstr ""
+msgstr "欄位說明"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Search Audittrail Log"
-msgstr ""
+msgstr "搜尋稽核追蹤日誌"
 
 #. module: audittrail
 #: field:audittrail.rule,log_write:0
 msgid "Log Writes"
-msgstr ""
+msgstr "記錄修改操作"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "Open Logs"
-msgstr ""
+msgstr "打開日誌"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value_text:0
 msgid "New value Text"
-msgstr ""
+msgstr "新值內容"
 
 #. module: audittrail
 #: field:audittrail.rule,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "規則名稱"
 
 #. module: audittrail
 #: field:audittrail.log.line,new_value:0
 msgid "New Value"
-msgstr ""
+msgstr "新值"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "AuditTrail Logs"
-msgstr ""
+msgstr "稽核追蹤日誌"
 
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "Draft  Rule"
-msgstr ""
+msgstr "草稿規則"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log
 msgid "Audittrail Log"
-msgstr ""
+msgstr "稽核追蹤日誌"
 
 #. module: audittrail
 #: help:audittrail.rule,log_action:0
 msgid ""
 "Select this if you want to keep track of actions on the object of this rule"
-msgstr ""
+msgstr "如果你要追蹤這個對象所有記錄執行的操作請選擇此項"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value : "
-msgstr ""
+msgstr "新值: "
 
 #. module: audittrail
 #: field:audittrail.log.line,old_value_text:0
 msgid "Old value Text"
-msgstr ""
+msgstr "舊值內容"
 
 #. module: audittrail
 #: view:audittrail.view.log:0
 msgid "Cancel"
-msgstr ""
+msgstr "取消"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_view_log
 msgid "View Log"
-msgstr ""
+msgstr "查看日誌"
 
 #. module: audittrail
 #: model:ir.model,name:audittrail.model_audittrail_log_line
 msgid "Log Line"
-msgstr ""
+msgstr "日誌明細"
 
 #. module: audittrail
 #: field:audittrail.rule,log_action:0
 msgid "Log Action"
-msgstr ""
+msgstr "記錄動作"
 
 #. module: audittrail
 #: help:audittrail.rule,log_create:0
 msgid ""
 "Select this if you want to keep track of creation on any record of the "
 "object of this rule"
-msgstr ""
+msgstr "如果你想追蹤此對象所有記錄的建立請選擇此項"
diff --git a/addons/auth_anonymous/__openerp__.py b/addons/auth_anonymous/__openerp__.py
index 95d98e65fea..1246850fe04 100644
--- a/addons/auth_anonymous/__openerp__.py
+++ b/addons/auth_anonymous/__openerp__.py
@@ -1,19 +1,16 @@
 {
- 'name': 'Anonymous',
- 'description': 'Allow anonymous access to OpenERP.',
- 'author': 'OpenERP SA',
- 'version': '1.0',
- 'category': 'Authentication',
- 'website': 'http://www.openerp.com',
- 'installable': True,
- 'depends': ['web'],
- 'data': [
-    'auth_anonymous.xml',
- ],
- 'js': [
-    'static/src/js/auth_anonymous.js',
- ],
- 'qweb': [
-     'static/src/xml/auth_anonymous.xml',
- ],
+    'name': 'Anonymous',
+    'description': """
+Allow anonymous access to OpenERP.
+==================================
+ """,
+    'author': 'OpenERP SA',
+    'version': '1.0',
+    'category': 'Authentication',
+    'website': 'http://www.openerp.com',
+    'installable': True,
+    'depends': ['web'],
+    'data': ['auth_anonymous.xml'],
+    'js': ['static/src/js/auth_anonymous.js'],
+    'qweb': ['static/src/xml/auth_anonymous.xml'],
 }
diff --git a/addons/auth_anonymous/static/src/js/auth_anonymous.js b/addons/auth_anonymous/static/src/js/auth_anonymous.js
index fab2be1fd53..6768bc63ff9 100644
--- a/addons/auth_anonymous/static/src/js/auth_anonymous.js
+++ b/addons/auth_anonymous/static/src/js/auth_anonymous.js
@@ -3,12 +3,12 @@ openerp.auth_anonymous = function(instance) {
     instance.web.Login.include({
         start: function() {
             var self = this;
-            return $.when(this._super()).pipe(function() {
-                var dblist = self._db_list || [];
+            return $.when(this._super()).then(function() {
+                var dblist = self.db_list || [];
                 if (!self.session.session_is_valid() && dblist.length === 1) {
                     self.remember_credentials = false;
                     // XXX get login/pass from server (via a rpc call) ?
-                    return self.do_login(dblist[0], 'anonymous', 'anonymous')
+                    return self.do_login(dblist[0], 'anonymous', 'anonymous');
                 }
 
             });
@@ -26,10 +26,10 @@ openerp.auth_anonymous = function(instance) {
         start: function() {
             var self = this;
             this._super.apply(this, arguments);
-            this.$element.find('.oe_topbar_anonymous_login').click(function() {
+            this.$el.find('.oe_topbar_anonymous_login').click(function() {
                 var p = self.getParent();
                 var am = p.action_manager;
-                p.$element.find('.oe_leftbar').hide();
+                p.$el.find('.oe_leftbar').hide();
                 am.do_action({
                     type:'ir.actions.client',
                     tag:'login',
diff --git a/addons/auth_ldap/__openerp__.py b/addons/auth_ldap/__openerp__.py
index 4e5bc811dca..844f6d9fa84 100644
--- a/addons/auth_ldap/__openerp__.py
+++ b/addons/auth_ldap/__openerp__.py
@@ -19,18 +19,18 @@
 ##############################################################################
 
 {
-    "name" : "Authentication via LDAP",
-    "version" : "1.0",
-    "depends" : ["base"],
-    "images" : ["images/ldap_configuration.jpeg"],
-    "author" : "OpenERP SA",
-    "description": """
+    'name' : 'Authentication via LDAP',
+    'version' : '1.0',
+    'depends' : ['base'],
+    'images' : ['images/ldap_configuration.jpeg'],
+    'author' : 'OpenERP SA',
+    'description': """
 Adds support for authentication by LDAP server.
 ===============================================
 This module allows users to login with their LDAP username and password, and
 will automatically create OpenERP users for them on the fly.
 
-Note: This module only work on servers who have Python's ``ldap`` module installed.
+**Note:** This module only work on servers who have Python's ``ldap`` module installed.
 
 Configuration:
 --------------
@@ -64,7 +64,7 @@ It is also possible to have local OpenERP users in the database along with
 LDAP-authenticated users (the Administrator account is one obvious example).
 
 Here is how it works:
-
+---------------------
     * The system first attempts to authenticate users against the local OpenERP
       database;
     * if this authentication fails (for example because the user has no local
@@ -84,7 +84,7 @@ Template*. If set, this user will be used as template to create the local users
 whenever someone authenticates for the first time via LDAP authentication. This
 allows pre-setting the default groups and menus of the first-time users.
 
-Warning: if you set a password for the user template, this password will be
+**Warning:** if you set a password for the user template, this password will be
          assigned as local password for each new LDAP user, effectively setting
          a *master password* for these users (until manually changed). You
          usually do not want this. One easy way to setup a template user is to
@@ -98,19 +98,16 @@ Interaction with base_crypt:
 The base_crypt module is not compatible with this module, and will disable LDAP
 authentication if installed at the same time.
     """,
-
-
-    "website" : "http://www.openerp.com",
-    "category" : "Authentication",
-    "data" : [
-        "users_ldap_view.xml",
-        "user_ldap_installer.xml",
-        "security/ir.model.access.csv",
+    'website' : 'http://www.openerp.com',
+    'category' : 'Authentication',
+    'data' : [
+        'users_ldap_view.xml',
+        'user_ldap_installer.xml',
+        'security/ir.model.access.csv',
     ],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "001141446349334700221",
-    "external_dependencies" : {
+    'auto_install': False,
+    'installable': True,
+    'external_dependencies' : {
         'python' : ['ldap'],
     }
 }
diff --git a/addons/auth_ldap/i18n/ar.po b/addons/auth_ldap/i18n/ar.po
index ac4e8c166e3..2802ac991f0 100644
--- a/addons/auth_ldap/i18n/ar.po
+++ b/addons/auth_ldap/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/bg.po b/addons/auth_ldap/i18n/bg.po
index 88c3046f420..d0189de2175 100644
--- a/addons/auth_ldap/i18n/bg.po
+++ b/addons/auth_ldap/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/ca.po b/addons/auth_ldap/i18n/ca.po
index 21e8f7cdbed..77177dacb7a 100644
--- a/addons/auth_ldap/i18n/ca.po
+++ b/addons/auth_ldap/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/da.po b/addons/auth_ldap/i18n/da.po
index 2138bbbd12d..fcbd494257a 100644
--- a/addons/auth_ldap/i18n/da.po
+++ b/addons/auth_ldap/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/de.po b/addons/auth_ldap/i18n/de.po
index 1e2690ac43f..b757b753729 100644
--- a/addons/auth_ldap/i18n/de.po
+++ b/addons/auth_ldap/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/es.po b/addons/auth_ldap/i18n/es.po
index d61f5ab542d..42f7b10d8b2 100644
--- a/addons/auth_ldap/i18n/es.po
+++ b/addons/auth_ldap/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/es_CR.po b/addons/auth_ldap/i18n/es_CR.po
index 68539f942a6..25cc012e7c0 100644
--- a/addons/auth_ldap/i18n/es_CR.po
+++ b/addons/auth_ldap/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: users_ldap
diff --git a/addons/auth_ldap/i18n/fi.po b/addons/auth_ldap/i18n/fi.po
index 65460fb1905..280cab7a2f3 100644
--- a/addons/auth_ldap/i18n/fi.po
+++ b/addons/auth_ldap/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/fr.po b/addons/auth_ldap/i18n/fr.po
index 6cf49bbc5ca..4afdfcb6715 100644
--- a/addons/auth_ldap/i18n/fr.po
+++ b/addons/auth_ldap/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/gl.po b/addons/auth_ldap/i18n/gl.po
index 76a6dad3498..17203cee232 100644
--- a/addons/auth_ldap/i18n/gl.po
+++ b/addons/auth_ldap/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/hr.po b/addons/auth_ldap/i18n/hr.po
index 9a4468a6b79..5b170f987aa 100644
--- a/addons/auth_ldap/i18n/hr.po
+++ b/addons/auth_ldap/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/hu.po b/addons/auth_ldap/i18n/hu.po
index a8d39628644..d3b41e2bece 100644
--- a/addons/auth_ldap/i18n/hu.po
+++ b/addons/auth_ldap/i18n/hu.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/it.po b/addons/auth_ldap/i18n/it.po
index 18ac12e8092..c349d2b23eb 100644
--- a/addons/auth_ldap/i18n/it.po
+++ b/addons/auth_ldap/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/ja.po b/addons/auth_ldap/i18n/ja.po
index 7e7c4acdcc0..8004dfe608c 100644
--- a/addons/auth_ldap/i18n/ja.po
+++ b/addons/auth_ldap/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/mn.po b/addons/auth_ldap/i18n/mn.po
index 747ac8973a9..e63fc86659c 100644
--- a/addons/auth_ldap/i18n/mn.po
+++ b/addons/auth_ldap/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/nl.po b/addons/auth_ldap/i18n/nl.po
index 2fee3d03278..004dbe738fe 100644
--- a/addons/auth_ldap/i18n/nl.po
+++ b/addons/auth_ldap/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-09 07:06+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/pl.po b/addons/auth_ldap/i18n/pl.po
index bbc4a3de64f..6624a98c34c 100644
--- a/addons/auth_ldap/i18n/pl.po
+++ b/addons/auth_ldap/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/pt.po b/addons/auth_ldap/i18n/pt.po
index 25bbb3eb12f..2c4c2f6c25c 100644
--- a/addons/auth_ldap/i18n/pt.po
+++ b/addons/auth_ldap/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/pt_BR.po b/addons/auth_ldap/i18n/pt_BR.po
index 373b9d5f71d..9a626a599cb 100644
--- a/addons/auth_ldap/i18n/pt_BR.po
+++ b/addons/auth_ldap/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 22:27+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/ro.po b/addons/auth_ldap/i18n/ro.po
index 20c4a24c4de..1ea94ffd936 100644
--- a/addons/auth_ldap/i18n/ro.po
+++ b/addons/auth_ldap/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/ru.po b/addons/auth_ldap/i18n/ru.po
index 299ca6bef75..519526f0589 100644
--- a/addons/auth_ldap/i18n/ru.po
+++ b/addons/auth_ldap/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/sv.po b/addons/auth_ldap/i18n/sv.po
index 3b175ed8b99..d9d90b3930f 100644
--- a/addons/auth_ldap/i18n/sv.po
+++ b/addons/auth_ldap/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/tr.po b/addons/auth_ldap/i18n/tr.po
index 52268b376bf..ec092971f5d 100644
--- a/addons/auth_ldap/i18n/tr.po
+++ b/addons/auth_ldap/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/i18n/zh_CN.po b/addons/auth_ldap/i18n/zh_CN.po
index a05ad7b1729..c8ed6bc255d 100644
--- a/addons/auth_ldap/i18n/zh_CN.po
+++ b/addons/auth_ldap/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: users_ldap
 #: constraint:res.company:0
diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py
index 47fc41c3645..c2c0ac557bf 100644
--- a/addons/auth_ldap/users_ldap.py
+++ b/addons/auth_ldap/users_ldap.py
@@ -180,8 +180,8 @@ class CompanyLDAP(osv.osv):
         """
         
         user_id = False
-        login = tools.ustr(login)
-        cr.execute("SELECT id, active FROM res_users WHERE login=%s", (login,))
+        login = tools.ustr(login.lower())
+        cr.execute("SELECT id, active FROM res_users WHERE lower(login)=%s", (login,))
         res = cr.fetchone()
         if res:
             if res[1]:
diff --git a/addons/auth_ldap/users_ldap_view.xml b/addons/auth_ldap/users_ldap_view.xml
index c4fc7cebbbe..47c15badd7c 100644
--- a/addons/auth_ldap/users_ldap_view.xml
+++ b/addons/auth_ldap/users_ldap_view.xml
@@ -14,7 +14,7 @@
                                     <field name="ldap_server"/>
                                     <field name="ldap_server_port"/>
                                     <field name="ldap_binddn"/>
-                                    <field name="ldap_password"/>
+                                    <field name="ldap_password" password="True"/>
                                     <field name="ldap_base"/>
                                     <field name="ldap_filter"/>
                                     <field name="create_user"/>
diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py
index 585dc48e11e..1c29ca8c093 100644
--- a/addons/auth_oauth/__openerp__.py
+++ b/addons/auth_oauth/__openerp__.py
@@ -24,27 +24,26 @@
     'name': 'OAuth2 Authentication',
     'version': '1.0',
     'category': 'Tools',
-    'description': """Allow users to login through Google OAuth2.""",
+    'description': """
+Allow users to login through Google OAuth2.
+===========================================
+""",
     'author': 'Victor Tabuenca',
     'maintainer': 'OpenERP s.a.',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'web', 'base_setup'],
     'data': [
         'auth_oauth_data.xml',
-    ],
-    'update_xml': [
+        'auth_oauth_data.yml',
         'auth_oauth_view.xml',
-        'res_config.xml',
-    ],
-    'js': [
-        'static/src/js/auth_oauth.js',
+        'security/ir.model.access.csv'
     ],
+    'js': ['static/src/js/auth_oauth.js'],
     'css': [
         'static/lib/zocial/css/zocial.css',
+        'static/src/css/auth_oauth.css',
     ],
-    'qweb': [
-        'static/src/xml/auth_oauth.xml',
-    ],
+    'qweb': ['static/src/xml/auth_oauth.xml'],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/auth_oauth/auth_oauth_data.xml b/addons/auth_oauth/auth_oauth_data.xml
index 7bb95192e5d..c07359a062c 100644
--- a/addons/auth_oauth/auth_oauth_data.xml
+++ b/addons/auth_oauth/auth_oauth_data.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
+        <record id="provider_openerp" model="auth.oauth.provider">
+            <field name="name">OpenERP Accounts</field>
+            <field name="auth_endpoint">https://accounts.openerp.com/oauth2/auth</field>
+            <field name="scope">userinfo</field>
+            <field name="validation_endpoint">https://accounts.openerp.com/oauth2/tokeninfo</field>
+            <field name="data_endpoint"></field>
+            <field name="css_class">zocial openerp</field>
+            <field name="body">Sign in with OpenERP account</field>
+        </record>
         <record id="provider_facebook" model="auth.oauth.provider">
             <field name="name">Facebook Graph</field>
             <field name="auth_endpoint">https://www.facebook.com/dialog/oauth</field>
diff --git a/addons/auth_oauth/auth_oauth_data.yml b/addons/auth_oauth/auth_oauth_data.yml
new file mode 100644
index 00000000000..af43811a560
--- /dev/null
+++ b/addons/auth_oauth/auth_oauth_data.yml
@@ -0,0 +1,6 @@
+-
+  Use database uuid as client_id for OpenERP oauth provider
+-
+  !python {model: ir.config_parameter}: |
+    oauth = self.pool.get('auth.oauth.provider')
+    oauth.write(cr, uid, [ref('provider_openerp')], {'client_id': self.get_param(cr, uid, 'database.uuid')})
diff --git a/addons/auth_oauth/auth_oauth_view.xml b/addons/auth_oauth/auth_oauth_view.xml
index 475720af9fd..35397d72dbd 100644
--- a/addons/auth_oauth/auth_oauth_view.xml
+++ b/addons/auth_oauth/auth_oauth_view.xml
@@ -4,7 +4,6 @@
         <record model="ir.ui.view" id="view_oauth_provider_form">
             <field name="name">auth.oauth.provider.form</field>
             <field name="model">auth.oauth.provider</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="arch" version="7.0">
                     <sheet>
@@ -26,7 +25,6 @@
         <record model="ir.ui.view" id="view_oauth_provider_list">
             <field name="name">auth.oauth.provider.list</field>
             <field name="model">auth.oauth.provider</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="arch" version="7.0">
                     <field name="name" />
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 2959fa45db1..4c7c5377184 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -1,47 +1,101 @@
+import functools
 import logging
 
 import simplejson
-import werkzeug.urls
-import werkzeug.utils
+from werkzeug.exceptions import BadRequest
 
-import openerp.modules.registry
-import openerp.addons.web.controllers.main
-import openerp.addons.web.common.http as openerpweb
+from openerp import SUPERUSER_ID
+import openerp.addons.web.http as oeweb
+from openerp.addons.web.controllers.main import db_monodb, set_cookie_and_redirect, login_and_redirect
+from openerp.modules.registry import RegistryManager
 
 _logger = logging.getLogger(__name__)
 
-class OAuthController(openerpweb.Controller):
+#----------------------------------------------------------
+# helpers
+#----------------------------------------------------------
+def fragment_to_query_string(func):
+    @functools.wraps(func)
+    def wrapper(self, req, **kw):
+        if not kw:
+            return """<html><head><script>
+                var l = window.location;
+                var q = l.hash.substring(1);
+                var r = '/' + l.search;
+                if(q.length !== 0) {
+                    var s = l.search ? (l.search === '?' ? '' : '&') : '?';
+                    r = l.pathname + l.search + s + q;
+                }
+                window.location = r;
+            </script></head><body></body></html>"""
+        return func(self, req, **kw)
+    return wrapper
+
+
+#----------------------------------------------------------
+# Controller
+#----------------------------------------------------------
+class OAuthController(oeweb.Controller):
     _cp_path = '/auth_oauth'
 
-    @openerpweb.jsonrequest
+    @oeweb.jsonrequest
     def list_providers(self, req, dbname):
-        registry = openerp.modules.registry.RegistryManager.get(dbname)
-        with registry.cursor() as cr:
-            providers = registry.get('auth.oauth.provider')
-            l = providers.read(cr, 1, providers.search(cr, 1, [('enabled','=',True)]))
+        try:
+            registry = RegistryManager.get(dbname)
+            with registry.cursor() as cr:
+                providers = registry.get('auth.oauth.provider')
+                l = providers.read(cr, SUPERUSER_ID, providers.search(cr, SUPERUSER_ID, [('enabled', '=', True)]))
+        except Exception:
+            l = []
         return l
 
-    @openerpweb.httprequest
+    @oeweb.httprequest
+    @fragment_to_query_string
     def signin(self, req, **kw):
         state = simplejson.loads(kw['state'])
         dbname = state['d']
         provider = state['p']
-        registry = openerp.modules.registry.RegistryManager.get(dbname)
+        context = state.get('c', {})
+        registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
             try:
                 u = registry.get('res.users')
-                credentials = u.auth_oauth(cr, 1, provider, kw)
+                credentials = u.auth_oauth(cr, SUPERUSER_ID, provider, kw, context=context)
                 cr.commit()
-                return openerp.addons.web.controllers.main.login_and_redirect(req, *credentials)
+                return login_and_redirect(req, *credentials)
             except AttributeError:
                 # auth_signup is not installed
-                _logger.error("auth_signup not installed on database %s: oauth sign up cancelled."%dbname)
+                _logger.error("auth_signup not installed on database %s: oauth sign up cancelled." % (dbname,))
                 url = "/#action=login&oauth_error=1"
-            except Exception,e:
+            except Exception, e:
                 # signup error
-                _logger.exception('oops')
+                _logger.exception("OAuth2: %s" % str(e))
                 url = "/#action=login&oauth_error=2"
-        return openerp.addons.web.controllers.main.set_cookie_and_redirect(req, url)
 
+        return set_cookie_and_redirect(req, url)
+
+    @oeweb.httprequest
+    def oea(self, req, **kw):
+        """login user via OpenERP Account provider"""
+        dbname = kw.pop('db', None)
+        if not dbname:
+            dbname = db_monodb(req)
+        if not dbname:
+            return BadRequest()
+
+        registry = RegistryManager.get(dbname)
+        with registry.cursor() as cr:
+            IMD = registry['ir.model.data']
+            model, provider_id = IMD.get_object_reference(cr, SUPERUSER_ID, 'auth_oauth', 'provider_openerp')
+            assert model == 'auth.oauth.provider'
+
+        state = {
+            'd': dbname,
+            'p': provider_id,
+            'c': {'no_user_creation': True},
+        }
+
+        kw['state'] = simplejson.dumps(state)
+        return self.signin(req, **kw)
 
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_oauth/res_users.py b/addons/auth_oauth/res_users.py
index 3dbab849942..7e7b3753a4e 100644
--- a/addons/auth_oauth/res_users.py
+++ b/addons/auth_oauth/res_users.py
@@ -1,11 +1,13 @@
 import logging
 
 import urllib
+import urlparse
 import urllib2
 import simplejson
 
 import openerp
 from openerp.osv import osv, fields
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -13,18 +15,36 @@ class res_users(osv.Model):
     _inherit = 'res.users'
 
     _columns = {
-        'oauth_provider_id': fields.many2one('auth.oauth.provider','OAuth Provider'),
+        'oauth_provider_id': fields.many2one('auth.oauth.provider', 'OAuth Provider'),
         'oauth_uid': fields.char('OAuth User ID', help="Oauth Provider user_id"),
-        'oauth_access_token': fields.char('OAuth Token', readonly=True),
+        'oauth_access_token': fields.char('OAuth Access Token', readonly=True),
     }
 
-    def auth_oauth_rpc(self, cr, uid, endpoint, access_token, context=None):
-        params = urllib.urlencode({'access_token':access_token})
-        url = endpoint + '?' + params
+    _sql_constraints = [
+        ('uniq_users_oauth_provider_oauth_uid', 'unique(oauth_provider_id, oauth_uid)', 'OAuth UID must be unique per provider'),
+    ]
+
+    def _auth_oauth_rpc(self, cr, uid, endpoint, access_token, context=None):
+        params = urllib.urlencode({'access_token': access_token})
+        if urlparse.urlparse(endpoint)[4]:
+            url = endpoint + '&' + params
+        else:
+            url = endpoint + '?' + params
         f = urllib2.urlopen(url)
         response = f.read()
         return simplejson.loads(response)
 
+    def _auth_oauth_validate(self, cr, uid, provider, access_token, context=None):
+        """ return the validation data corresponding to the access token """
+        p = self.pool.get('auth.oauth.provider').browse(cr, uid, provider, context=context)
+        validation = self._auth_oauth_rpc(cr, uid, p.validation_endpoint, access_token)
+        if validation.get("error"):
+            raise Exception(validation['error'])
+        if p.data_endpoint:
+            data = self._auth_oauth_rpc(cr, uid, p.data_endpoint, access_token)
+            validation.update(data)
+        return validation
+
     def auth_oauth(self, cr, uid, provider, params, context=None):
         # Advice by Google (to avoid Confused Deputy Problem)
         # if validation.audience != OUR_CLIENT_ID:
@@ -32,38 +52,46 @@ class res_users(osv.Model):
         # else:
         #   continue with the process
         access_token = params.get('access_token')
-        p = self.pool.get('auth.oauth.provider').browse(cr, uid, provider, context=context)
-
-        validation = self.auth_oauth_rpc(cr, uid, p.validation_endpoint, access_token)
-        if validation.get("error"):
-            raise openerp.exceptions.AccessDenied
-        login = validation['email']
+        validation = self._auth_oauth_validate(cr, uid, provider, access_token)
+        # required
         oauth_uid = validation['user_id']
-        name = self.auth_oauth_rpc(cr, uid, p.data_endpoint, access_token)['name']
-
-        credentials = (cr.dbname, login, access_token)
-        res = self.search(cr, uid, [("oauth_uid", "=", oauth_uid)])
+        if not oauth_uid:
+            raise openerp.exceptions.AccessDenied()
+        email = validation.get('email', 'provider_%d_user_%d' % (provider, oauth_uid))
+        login = email
+        # optional
+        name = validation.get('name', email)
+        res = self.search(cr, uid, [("oauth_uid", "=", oauth_uid), ('oauth_provider_id', '=', provider)])
         if res:
-            self.write(cr, uid, res[0], {'oauth_access_token':access_token})
+            assert len(res) == 1
+            user = self.browse(cr, uid, res[0], context=context)
+            login = user.login
+            user.write({'oauth_access_token': access_token})
         else:
-            # New user
+            # New user if signup module available
+            if not hasattr(self, '_signup_create_user'):
+                raise openerp.exceptions.AccessDenied()
+
             new_user = {
                 'name': name,
                 'login': login,
-                'user_email': login,
-                'oauth_provider_id': 1,
+                'user_email': email,
+                'oauth_provider_id': provider,
                 'oauth_uid': oauth_uid,
                 'oauth_access_token': access_token,
                 'active': True,
             }
-            self.auth_signup_create(cr, uid, new_user)
+            # TODO pass signup token to allow attach new user to right partner
+            self._signup_create_user(cr, uid, new_user)
+
+        credentials = (cr.dbname, login, access_token)
         return credentials
 
     def check_credentials(self, cr, uid, password):
         try:
             return super(res_users, self).check_credentials(cr, uid, password)
         except openerp.exceptions.AccessDenied:
-            res = self.search(cr, 1, [('id','=',uid),('oauth_access_token','=',password)])
+            res = self.search(cr, SUPERUSER_ID, [('id', '=', uid), ('oauth_access_token', '=', password)])
             if not res:
                 raise
 
diff --git a/addons/auth_oauth/security/ir.model.access.csv b/addons/auth_oauth/security/ir.model.access.csv
new file mode 100644
index 00000000000..65fd2f54bbf
--- /dev/null
+++ b/addons/auth_oauth/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_auth_oauth_provider,auth_oauth_provider,model_auth_oauth_provider,base.group_system,1,1,1,1
diff --git a/addons/auth_oauth/static/src/css/auth_oauth.css b/addons/auth_oauth/static/src/css/auth_oauth.css
new file mode 100644
index 00000000000..ed6130e3123
--- /dev/null
+++ b/addons/auth_oauth/static/src/css/auth_oauth.css
@@ -0,0 +1,35 @@
+.openerp .oe_application .zocial {
+    font: white;
+}
+
+.openerp .zocial.openerp:before {
+    content: "\E02E";
+    font-style: italic;
+    text-shadow: 0 1px 1px black;
+}
+
+.openerp a.zocial.openerp {
+    float: right;
+    border: 1px solid #222222;
+    color: white;
+    margin: 0;
+    background-color: #b92020;
+    background-image: -webkit-gradient(linear, left top, left bottom, from(#b92020), to(#600606));
+    background-image: -webkit-linear-gradient(top, #b92020, #600606);
+    background-image: -moz-linear-gradient(top, #b92020, #600606);
+    background-image: -ms-linear-gradient(top, #b92020, #600606);
+    background-image: -o-linear-gradient(top, #b92020, #600606);
+    background-image: linear-gradient(to bottom, #b92020, #600606);
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    border-radius: 4px;
+    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
+    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset;
+    text-shadow: none;
+    font-weight: normal;
+}
+
+.openerp .oe_login .oe_oauth_provider_login_button {
+    margin-top: 4px;
+}
diff --git a/addons/auth_oauth/static/src/js/auth_oauth.js b/addons/auth_oauth/static/src/js/auth_oauth.js
index d63631c262d..2aa66877d42 100644
--- a/addons/auth_oauth/static/src/js/auth_oauth.js
+++ b/addons/auth_oauth/static/src/js/auth_oauth.js
@@ -1,26 +1,34 @@
 openerp.auth_oauth = function(instance) {
     var QWeb = instance.web.qweb;
 
-    instance.web.Login = instance.web.Login.extend({
+    instance.web.Login.include({
         start: function(parent, params) {
+            var self = this;
             var d = this._super.apply(this, arguments);
-            this.$element.on('click', 'a.zocial', this.on_oauth_sign_in);
+            this.$el.on('click', 'a.zocial', this.on_oauth_sign_in);
             this.oauth_providers = [];
             if(this.params.oauth_error === 1) {
                 this.do_warn("Sign up error.","Sign up is not allowed on this database.");
             } else if(this.params.oauth_error === 2) {
                 this.do_warn("Authentication error","");
             }
-            return d.then(this.do_oauth_load);
+            return d.done(this.do_oauth_load).fail(function() {
+                self.do_oauth_load([]);
+            });
+        },
+        on_db_loaded: function(result) {
+            this._super.apply(this, arguments);
+            this.$("form [name=db]").change(this.do_oauth_load);
         },
         do_oauth_load: function() {
             var db = this.$("form [name=db]").val();
             if (db) {
-                this.rpc("/auth_oauth/list_providers", { dbname: db }).then(this.on_oauth_loaded);
+                this.rpc("/auth_oauth/list_providers", { dbname: db }).done(this.on_oauth_loaded);
             }
         },
         on_oauth_loaded: function(result) {
             this.oauth_providers = result;
+            this.$('.oe_oauth_provider_login_button').remove();
             var buttons = QWeb.render("auth_oauth.Login.button",{"widget":this});
             this.$(".oe_login_pane form ul").after(buttons);
         },
@@ -28,12 +36,15 @@ openerp.auth_oauth = function(instance) {
             ev.preventDefault();
             var index = $(ev.target).data('index');
             var p = this.oauth_providers[index];
-            var ret = location.protocol+"//"+location.host+"/";
+            var ret = _.str.sprintf('%s//%s/auth_oauth/signin', location.protocol, location.host);
+            if (instance.session.debug) {
+                ret += '?debug';
+            }
             var dbname = self.$("form [name=db]").val();
             var state_object = {
                 d: dbname,
                 p: p.id
-            }
+            };
             var state = JSON.stringify(state_object);
             var params = {
                 response_type: 'token',
@@ -47,16 +58,4 @@ openerp.auth_oauth = function(instance) {
         },
     });
 
-    instance.web.WebClient = instance.web.WebClient.extend({
-        start: function() {
-            this._super.apply(this, arguments);
-            var params = $.deparam(window.location.hash.substring(1));
-            // alert(JSON.stringify(params));
-            if (params.hasOwnProperty('access_token')) {
-                var url = "/auth_oauth/signin" + '?' + $.param(params);
-                window.location = url;
-            }
-        },
-    });
-
 };
diff --git a/addons/auth_oauth/static/src/xml/auth_oauth.xml b/addons/auth_oauth/static/src/xml/auth_oauth.xml
index c2693804e59..76c71b83f10 100644
--- a/addons/auth_oauth/static/src/xml/auth_oauth.xml
+++ b/addons/auth_oauth/static/src/xml/auth_oauth.xml
@@ -2,8 +2,7 @@
 <templates id="template" xml:space="preserve">
 <t t-name="auth_oauth.Login.button">
     <t t-foreach="widget.oauth_providers" t-as="p">
-        <a href="#" t-att-class="p.css_class" t-att-data-index="p_index"><t t-esc="p.body"/></a>
-        <br/>
+        <a href="#" t-attf-class="oe_oauth_provider_login_button #{p.css_class}" t-att-data-index="p_index"><t t-esc="p.body"/></a>
     </t>
 </t>
 </templates>
diff --git a/addons/auth_openid/__openerp__.py b/addons/auth_openid/__openerp__.py
index cd1a12fce7f..10c77f29965 100644
--- a/addons/auth_openid/__openerp__.py
+++ b/addons/auth_openid/__openerp__.py
@@ -24,23 +24,18 @@
     'name': 'OpenID Authentification',
     'version': '2.0',
     'category': 'Tools',
-    'description': """Allow users to login through OpenID.""",
+    'description': """
+Allow users to login through OpenID.
+====================================
+""",
     'author': 'OpenERP s.a.',
     'maintainer': 'OpenERP s.a.',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'web'],
-    'data': [
-        'res_users.xml',
-    ],
-    'js': [
-        'static/src/js/auth_openid.js',
-    ],
-    'css': [
-        'static/src/css/openid.css',
-    ],
-    'qweb': [
-        'static/src/xml/auth_openid.xml',
-    ],
+    'data': ['res_users.xml'],
+    'js': ['static/src/js/auth_openid.js'],
+    'css': ['static/src/css/openid.css'],
+    'qweb': ['static/src/xml/auth_openid.xml'],
     'external_dependencies': {
         'python' : ['openid'],
     },
diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py
index eba711dae7a..be59b9ae5b5 100644
--- a/addons/auth_openid/controllers/main.py
+++ b/addons/auth_openid/controllers/main.py
@@ -22,30 +22,38 @@
 import logging
 import os
 import tempfile
+import getpass
 import urllib
 
 import werkzeug.urls
 import werkzeug.exceptions
 
-from openerp.modules.registry import RegistryManager
-from openerp.addons.web.controllers.main import login_and_redirect, set_cookie_and_redirect
-try:
-    import openerp.addons.web.common.http as openerpweb
-except ImportError:
-    import web.common.http as openerpweb    # noqa
-
 from openid import oidutil
 from openid.store import filestore
 from openid.consumer import consumer
 from openid.cryptutil import randomString
 from openid.extensions import ax, sreg
 
+import openerp
+from openerp import SUPERUSER_ID
+from openerp.modules.registry import RegistryManager
+from openerp.addons.web.controllers.main import login_and_redirect, set_cookie_and_redirect
+
 from .. import utils
 
 _logger = logging.getLogger(__name__)
 oidutil.log = _logger.debug
 
-_storedir = os.path.join(tempfile.gettempdir(), 'openerp-auth_openid-store')
+def get_system_user():
+    """Return system user info string, such as USERNAME-EUID"""
+    info = getpass.getuser()
+    euid = getattr(os, 'geteuid', None) # Non available on some platforms
+    if euid is not None:
+        info = '%s-%d' % (info, euid())
+    return info
+
+_storedir = os.path.join(tempfile.gettempdir(), 
+                         'openerp-auth_openid-%s-store' % get_system_user())
 
 class GoogleAppsAwareConsumer(consumer.GenericConsumer):
     def complete(self, message, endpoint, return_to):
@@ -69,7 +77,7 @@ class GoogleAppsAwareConsumer(consumer.GenericConsumer):
         return super(GoogleAppsAwareConsumer, self).complete(message, endpoint, return_to)
 
 
-class OpenIDController(openerpweb.Controller):
+class OpenIDController(openerp.addons.web.http.Controller):
     _cp_path = '/auth_openid/login'
 
     _store = filestore.FileOpenIDStore(_storedir)
@@ -117,7 +125,7 @@ class OpenIDController(openerpweb.Controller):
     def _get_realm(self, req):
         return req.httprequest.host_url
 
-    @openerpweb.httprequest
+    @openerp.addons.web.http.httprequest
     def verify_direct(self, req, db, url):
         result = self._verify(req, db, url)
         if 'error' in result:
@@ -126,7 +134,7 @@ class OpenIDController(openerpweb.Controller):
             return werkzeug.utils.redirect(result['value'])
         return result['value']
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def verify(self, req, db, url):
         return self._verify(req, db, url)
 
@@ -156,7 +164,7 @@ class OpenIDController(openerpweb.Controller):
             form_html = request.htmlMarkup(realm, redirect_to)
             return {'action': 'post', 'value': form_html, 'session_id': req.session_id}
 
-    @openerpweb.httprequest
+    @openerp.addons.web.http.httprequest
     def process(self, req, **kw):
         session = getattr(req.session, 'openid_session', None)
         if not session:
@@ -176,7 +184,7 @@ class OpenIDController(openerpweb.Controller):
             with registry.cursor() as cr:
                 Modules = registry.get('ir.module.module')
 
-                installed = Modules.search_count(cr, 1, ['&', ('name', '=', 'auth_openid'), ('state', '=', 'installed')]) == 1
+                installed = Modules.search_count(cr, SUPERUSER_ID, ['&', ('name', '=', 'auth_openid'), ('state', '=', 'installed')]) == 1
                 if installed:
 
                     Users = registry.get('res.users')
@@ -196,13 +204,13 @@ class OpenIDController(openerpweb.Controller):
 
                     domain += [('openid_url', '=', openid_url), ('active', '=', True)]
 
-                    ids = Users.search(cr, 1, domain)
+                    ids = Users.search(cr, SUPERUSER_ID, domain)
                     assert len(ids) < 2
                     if ids:
                         user_id = ids[0]
-                        login = Users.browse(cr, 1, user_id).login
+                        login = Users.browse(cr, SUPERUSER_ID, user_id).login
                         key = randomString(utils.KEY_LENGTH, '0123456789abcdef')
-                        Users.write(cr, 1, [user_id], {'openid_key': key})
+                        Users.write(cr, SUPERUSER_ID, [user_id], {'openid_key': key})
                         # TODO fill empty fields with the ones from sreg/ax
                         cr.commit()
 
@@ -224,7 +232,7 @@ class OpenIDController(openerpweb.Controller):
 
         return set_cookie_and_redirect(req, '/#action=login&loginerror=1')
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def status(self, req):
         session = getattr(req.session, 'openid_session', {})
         return {'status': session.get('status'), 'message': session.get('message')}
diff --git a/addons/auth_openid/i18n/ar.po b/addons/auth_openid/i18n/ar.po
index 37e35a4c08c..ec4fa4a985f 100644
--- a/addons/auth_openid/i18n/ar.po
+++ b/addons/auth_openid/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/de.po b/addons/auth_openid/i18n/de.po
index 73334192d1e..d5915a6ca00 100644
--- a/addons/auth_openid/i18n/de.po
+++ b/addons/auth_openid/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
@@ -57,13 +57,12 @@ msgstr "OpenID EMail"
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
-"Die gewählte Firma ist nicht in der Liste der erlaubten Firmen für diesen "
-"Benutzer"
+"Die gewählte Firma ist nicht in der Liste für diesen Benutzer freigegebenen."
 
 #. module: auth_openid
 #: field:res.users,openid_key:0
 msgid "OpenID Key"
-msgstr ""
+msgstr "OpenID Schlüssel"
 
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
@@ -94,7 +93,7 @@ msgstr "Launchpad"
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
 msgid "Google Apps Domain:"
-msgstr ""
+msgstr "Google Apps Domäne:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
@@ -109,7 +108,7 @@ msgstr "OpenID URL:"
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
 msgid "Google Apps Domain"
-msgstr ""
+msgstr "Google Apps Domäne"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
diff --git a/addons/auth_openid/i18n/es.po b/addons/auth_openid/i18n/es.po
index ad97c7dbef9..ce65376e76b 100644
--- a/addons/auth_openid/i18n/es.po
+++ b/addons/auth_openid/i18n/es.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-10 17:21+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/es_CR.po b/addons/auth_openid/i18n/es_CR.po
index 1ca8e020155..c31062aacd3 100644
--- a/addons/auth_openid/i18n/es_CR.po
+++ b/addons/auth_openid/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/fi.po b/addons/auth_openid/i18n/fi.po
index 45ac17fdee5..6a7ec14e204 100644
--- a/addons/auth_openid/i18n/fi.po
+++ b/addons/auth_openid/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/fr.po b/addons/auth_openid/i18n/fr.po
index 681322e566a..8a8f0c2dae5 100644
--- a/addons/auth_openid/i18n/fr.po
+++ b/addons/auth_openid/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/gu.po b/addons/auth_openid/i18n/gu.po
index 4b973ef8187..a66b126fab8 100644
--- a/addons/auth_openid/i18n/gu.po
+++ b/addons/auth_openid/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/ja.po b/addons/auth_openid/i18n/ja.po
index eca5e247046..e7e3d9df59a 100644
--- a/addons/auth_openid/i18n/ja.po
+++ b/addons/auth_openid/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/nb.po b/addons/auth_openid/i18n/nb.po
index ec31859022e..1b67ede6a5d 100644
--- a/addons/auth_openid/i18n/nb.po
+++ b/addons/auth_openid/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
@@ -33,12 +33,12 @@ msgstr "ÅpenID"
 #: field:res.users,openid_url:0
 #: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
 msgid "OpenID URL"
-msgstr ""
+msgstr "ÅpenID URL"
 
 #. module: auth_openid
 #: help:res.users,openid_email:0
 msgid "Used for disambiguation in case of a shared OpenID URL"
-msgstr ""
+msgstr "Brukes for disambiguering i tilfelle av en felles OpenID URL"
 
 #. module: auth_openid
 #: sql_constraint:res.users:0
@@ -59,7 +59,7 @@ msgstr ""
 #. module: auth_openid
 #: field:res.users,openid_key:0
 msgid "OpenID Key"
-msgstr ""
+msgstr "ÅpenID Nøkkel"
 
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
diff --git a/addons/auth_openid/i18n/nl.po b/addons/auth_openid/i18n/nl.po
index 896c9f1c40a..27a4eabc1db 100644
--- a/addons/auth_openid/i18n/nl.po
+++ b/addons/auth_openid/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/pl.po b/addons/auth_openid/i18n/pl.po
new file mode 100644
index 00000000000..65b4019f150
--- /dev/null
+++ b/addons/auth_openid/i18n/pl.po
@@ -0,0 +1,112 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-10-25 17:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-#  auth_openid.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: view:res.users:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:12
+msgid "OpenID"
+msgstr ""
+
+#. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: auth_openid
+#. #-#-#-#-#  auth_openid.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: field:res.users,openid_url:0
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:47
+msgid "OpenID URL"
+msgstr ""
+
+#. module: auth_openid
+#: help:res.users,openid_email:0
+msgid "Used for disambiguation in case of a shared OpenID URL"
+msgstr ""
+
+#. module: auth_openid
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: auth_openid
+#: field:res.users,openid_email:0
+msgid "OpenID Email"
+msgstr ""
+
+#. module: auth_openid
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: auth_openid
+#: field:res.users,openid_key:0
+msgid "OpenID Key"
+msgstr ""
+
+#. module: auth_openid
+#: model:ir.model,name:auth_openid.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:8
+msgid "Password"
+msgstr "Hasło"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:9
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google"
+msgstr "Google"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:10
+msgid "Google Apps"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:11
+msgid "Launchpad"
+msgstr "Launchpad"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:20
+msgid "Google Apps Domain:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:24
+msgid "Username:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:28
+msgid "OpenID URL:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:35
+msgid "Google Apps Domain"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/auth_openid/static/src/xml/auth_openid.xml:41
+msgid "Username"
+msgstr ""
diff --git a/addons/auth_openid/i18n/pt.po b/addons/auth_openid/i18n/pt.po
index fd2e3249596..8c48313e3d0 100644
--- a/addons/auth_openid/i18n/pt.po
+++ b/addons/auth_openid/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/pt_BR.po b/addons/auth_openid/i18n/pt_BR.po
index 00f4ccc2bdc..31676722009 100644
--- a/addons/auth_openid/i18n/pt_BR.po
+++ b/addons/auth_openid/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/ro.po b/addons/auth_openid/i18n/ro.po
index 56e4cefbdce..b82395847e5 100644
--- a/addons/auth_openid/i18n/ro.po
+++ b/addons/auth_openid/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/sk.po b/addons/auth_openid/i18n/sk.po
index ca958ac9a34..c4b7f9aa598 100644
--- a/addons/auth_openid/i18n/sk.po
+++ b/addons/auth_openid/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/sr@latin.po b/addons/auth_openid/i18n/sr@latin.po
index 2ea006976d1..92c63d285d2 100644
--- a/addons/auth_openid/i18n/sr@latin.po
+++ b/addons/auth_openid/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/sv.po b/addons/auth_openid/i18n/sv.po
index 1f3eab314bd..91118cd1de2 100644
--- a/addons/auth_openid/i18n/sv.po
+++ b/addons/auth_openid/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/tr.po b/addons/auth_openid/i18n/tr.po
index cd60e99c9b1..dae4a9a0ba5 100644
--- a/addons/auth_openid/i18n/tr.po
+++ b/addons/auth_openid/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/i18n/zh_CN.po b/addons/auth_openid/i18n/zh_CN.po
index 0cde8ee06b9..0434f8afbed 100644
--- a/addons/auth_openid/i18n/zh_CN.po
+++ b/addons/auth_openid/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. #-#-#-#-#  auth_openid.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: auth_openid
diff --git a/addons/auth_openid/static/src/js/auth_openid.js b/addons/auth_openid/static/src/js/auth_openid.js
index 1417bc471ce..a8901ee80f1 100644
--- a/addons/auth_openid/static/src/js/auth_openid.js
+++ b/addons/auth_openid/static/src/js/auth_openid.js
@@ -8,7 +8,7 @@ instance.web.Login = instance.web.Login.extend({
         this._super.apply(this, arguments);
         var self = this;
 
-        this._default_error_message = this.$element.find('.oe_login_error_message').text();
+        this._default_error_message = this.$el.find('.oe_login_error_message').text();
 
         this.$openid_selected_button = $();
         this.$openid_selected_input = $();
@@ -32,7 +32,7 @@ instance.web.Login = instance.web.Login.extend({
             this.do_openid_select('a[data-url=""]', 'login,password', true);
         }
 
-        this.$element.find('a[data-url]').click(function (event) {
+        this.$el.find('a[data-url]').click(function (event) {
             event.preventDefault();
             var selected_oidh = $(this).attr('href').substr(1);
             if (selected_oidh != self.$openid_selected_provider) {
@@ -48,10 +48,10 @@ instance.web.Login = instance.web.Login.extend({
         var self = this;
 
             self.$openid_selected_button.add(self.$openid_selected_input).removeClass('selected');
-            self.$openid_selected_button = self.$element.find(button).addClass('selected');
+            self.$openid_selected_button = self.$el.find(button).addClass('selected');
 
             var input = _(provider.split(',')).map(function(p) { return 'li[data-provider="'+p+'"]'; }).join(',');
-            self.$openid_selected_input = self.$element.find(input).addClass('selected');
+            self.$openid_selected_input = self.$el.find(input).addClass('selected');
 
             self.$openid_selected_input.find('input:first').focus();
             self.$openid_selected_provider = (self.$openid_selected_button.attr('href') || '').substr(1);
@@ -61,7 +61,7 @@ instance.web.Login = instance.web.Login.extend({
             }
 
             if (!noautosubmit && self.$openid_selected_input.length == 0) {
-                self.$element.find('form').submit();
+                self.$el.find('form').submit();
             }
 
     },
@@ -69,7 +69,7 @@ instance.web.Login = instance.web.Login.extend({
     _check_error: function() {
         var self = this;
         if (this.params.loginerror !== undefined) {
-            this.rpc('/auth_openid/login/status', {}, function(result) {
+            this.rpc('/auth_openid/login/status', {}).done(function(result) {
                 if (_.contains(['success', 'failure'], result.status) && result.message) {
                     self.do_warn('Invalid OpenID Login', result.message);
                 }
@@ -96,7 +96,7 @@ instance.web.Login = instance.web.Login.extend({
                 localStorage.setItem('openid-login', id);
             }
 
-            var db = this.$element.find("form [name=db]").val();
+            var db = this.$el.find("form [name=db]").val();
             var openid_url = dataurl.replace('{id}', id);
 
             this.do_openid_login(db, openid_url);
@@ -106,7 +106,7 @@ instance.web.Login = instance.web.Login.extend({
 
     do_openid_login: function(db, openid_url) {
         var self = this;
-        this.rpc('/auth_openid/login/verify', {'db': db, 'url': openid_url}, function(result) {
+        this.rpc('/auth_openid/login/verify', {'db': db, 'url': openid_url}).done(function(result) {
             if (result.error) {
                 self.do_warn(result.title, result.error);
                 return;
@@ -129,12 +129,12 @@ instance.web.Login = instance.web.Login.extend({
 
     do_warn: function(title, msg) {
         //console.warn(title, msg);
-        this.$element.find('.oe_login_error_message').text(msg).show();
+        this.$el.find('.oe_login_error_message').text(msg).show();
         this._super(title, msg);
     },
 
     reset_error_message: function() {
-        this.$element.find('.oe_login_error_message').text(this._default_error_message);
+        this.$el.find('.oe_login_error_message').text(this._default_error_message);
     }
 
 });
diff --git a/addons/auth_openid/static/src/xml/auth_openid.xml b/addons/auth_openid/static/src/xml/auth_openid.xml
index aa61d161657..6a40439a012 100644
--- a/addons/auth_openid/static/src/xml/auth_openid.xml
+++ b/addons/auth_openid/static/src/xml/auth_openid.xml
@@ -4,7 +4,7 @@
 
     <t t-extend="Login">
         <t t-jquery=".oe_login .oe_login_logo" t-operation="after">
-            <ul class="openid_providers">
+            <ul class="openid_providers oe_semantic_html_override">
                 <li><a href="#login,password" title="Password" data-url="" id="btn_password">Password</a></li>
                 <li><a href="#google" title="Google" data-url="https://www.google.com/accounts/o8/id">Google</a></li>
                 <li><a href="#googleapps" title="Google Apps" data-url="https://www.google.com/accounts/o8/site-xrds?hd={id}">Google</a></li>
diff --git a/addons/auth_reset_password/__init__.py b/addons/auth_reset_password/__init__.py
index 28bbdd18161..8341ccd60c7 100644
--- a/addons/auth_reset_password/__init__.py
+++ b/addons/auth_reset_password/__init__.py
@@ -1 +1,23 @@
-import auth_reset_password
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+import controllers
+import res_users
diff --git a/addons/auth_reset_password/__openerp__.py b/addons/auth_reset_password/__openerp__.py
index 76528bbfeb8..e620d515fa1 100644
--- a/addons/auth_reset_password/__openerp__.py
+++ b/addons/auth_reset_password/__openerp__.py
@@ -1,22 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
 {
- 'name': 'Reset Password',
- 'description': 'Allow users to reset their password from the login page',
- 'author': 'OpenERP SA',
- 'version': '1.0',
- 'category': 'Authentication',
- 'website': 'http://www.openerp.com',
- 'installable': True,
- 'depends': ['auth_anonymous', 'email_template'],
- 'data': [
-     'auth_reset_password.xml',
- ],
- 'js': [
-     'static/src/js/reset_password.js',
- ],
- 'css': [
-     'static/src/css/reset_password.css',
- ],
- 'qweb': [
-     'static/src/xml/reset_password.xml',
- ],
+    'name': 'Reset Password',
+    'description': """
+Allow users to reset their password from the login page.
+========================================================
+""",
+    'author': 'OpenERP SA',
+    'version': '1.0',
+    'category': 'Authentication',
+    'website': 'http://www.openerp.com',
+    'installable': True,
+    'depends': ['auth_signup', 'email_template'],
+    'data': [
+        'auth_reset_password.xml',
+        'res_users_view.xml',
+    ],
+    'js': ['static/src/js/reset_password.js'],
+    'qweb': ['static/src/xml/reset_password.xml'],
 }
diff --git a/addons/auth_reset_password/auth_reset_password.py b/addons/auth_reset_password/auth_reset_password.py
deleted file mode 100644
index 3d1bcbbfa7b..00000000000
--- a/addons/auth_reset_password/auth_reset_password.py
+++ /dev/null
@@ -1,132 +0,0 @@
-import base64
-import hashlib
-import simplejson
-import time
-import urlparse
-
-from openerp.tools import config
-from openerp.osv import osv, fields
-
-TWENTY_FOUR_HOURS = 24 * 60 * 60
-
-def message_sign(data, secret):
-    src = simplejson.dumps([data, secret], indent=None, separators=(',', ':'), sort_keys=True)
-    sign = hashlib.sha1(src).hexdigest()
-    msg = simplejson.dumps([data, sign], indent=None, separators=(',', ':'), sort_keys=True)
-    # pad message to avoid '='
-    pad = (3 - len(msg) % 3) % 3
-    msg = msg + " " * pad
-    msg = base64.urlsafe_b64encode(msg)
-    return msg, sign
-
-def message_check(msg, secret):
-    msg = base64.urlsafe_b64decode(msg)
-    l = simplejson.loads(msg)
-    msg_data = l[0]
-    msg_sign = l[1]
-    tmp, sign = message_sign(msg_data, secret)
-    if msg_sign == sign:
-        return msg_data
-
-class res_users(osv.osv):
-    _inherit = 'res.users'
-
-    _sql_constraints = [
-        ('email_uniq', 'UNIQUE (user_email)', 'You can not have two users with the same email!')
-    ]
-
-    def _auth_reset_password_secret(self, cr, uid, context=None):
-        uuid = self.pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
-        res = {
-            'dbname': cr.dbname,
-            'uuid': uuid,
-            'admin_passwd': config['admin_passwd']
-        }
-        return res
-
-    def _auth_reset_password_host(self, cr, uid, context=None):
-        return self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', '')
-
-    def _auth_reset_password_link(self, cr, uid, ids, context=None):
-        assert len(ids) == 1
-        host = self._auth_reset_password_host(cr, uid, context)
-        secret = self._auth_reset_password_secret(cr, uid, context)
-        msg_src = {
-            'time': time.time(),
-            'uid': ids[0],
-        }
-        msg, sign = message_sign(msg_src, secret)
-        link = urlparse.urljoin(host, '/login?db=%s&login=anonymous&key=anonymous#action=reset_password&token=%s' % (cr.dbname, msg))
-        return link
-
-    def _auth_reset_password_check_token(self, cr, uid, token, context=None):
-        secret = self._auth_reset_password_secret(cr, uid, context)
-        data = message_check(token, secret)
-        if data and (time.time() - data['time'] < TWENTY_FOUR_HOURS):
-            return data
-        return None
-
-    def _auth_reset_password_send_email(self, cr, uid, email_to, tpl_name, res_id, context=None):
-        model, tpl_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'auth_reset_password', tpl_name)
-        assert model == 'email.template'
-
-        msg_id = self.pool.get(model).send_mail(cr, uid, tpl_id, res_id, force_send=False, context=context)
-        MailMessage = self.pool.get('mail.message')
-        MailMessage.write(cr, uid, [msg_id], {'email_to': email_to}, context=context)
-        MailMessage.send(cr, uid, [msg_id], context=context)
-
-    def send_reset_password_request(self, cr, uid, email, context=None):
-        ids = self.pool.get('res.users').search(cr, 1, [('user_email', '=', email)], context=context)
-        if ids:
-            self._auth_reset_password_send_email(cr, 1, email, 'reset_password_email', ids[0], context=context)
-            return True
-        #else:
-        #    _m, company_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'main_company')
-        #    self._auth_reset_password_send_email(cr, uid, email, 'email_no_user', company_id, context=context)
-        return False
-
-class auth_reset_password(osv.TransientModel):
-    _name = 'auth.reset_password'
-    _rec_name = 'password'
-    _columns = {
-        'password': fields.char('Password', size=64),
-        'password_confirmation': fields.char('Confirm Password', size=64),
-        'token': fields.char('Token', size=128),
-        'state': fields.selection([(x, x) for x in 'draft done missmatch error'.split()], required=True),
-    }
-    _defaults = {
-        'state': 'draft',
-    }
-
-    def create(self, cr, uid, values, context=None):
-        # NOTE here, invalid values raises exceptions to avoid storing
-        # sensitive data into the database (which then are available to anyone)
-
-        pw = values.get('password')
-        if not pw or pw != values.get('password_confirmation'):
-            raise osv.except_osv('Error', 'Passwords missmatch')
-
-        Users = self.pool.get('res.users')
-        data = Users._auth_reset_password_check_token(cr, uid, values.get('token', ''))
-        if data:
-            Users.write(cr, 1, data['uid'], {'password': pw}, context=context)
-        else:
-            raise osv.except_osv('Error', 'Invalid token')
-
-        # Dont store password
-        values = {'state': 'done'}
-        return super(auth_reset_password, self).create(cr, uid, values, context)
-
-    def change(self, cr, uid, ids, context=None):
-        return True
-
-    def onchange_pw(self, cr, uid, ids, password, password_confirmation, context=None):
-        if password != password_confirmation:
-            return {'value': {'state': 'missmatch'}}
-        return {'value': {'state': 'draft'}}
-
-    def onchange_token(self, cr, uid, ids, token, context=None):
-        Users = self.pool.get('res.users')
-        if not Users._auth_reset_password_check_token(cr, uid, token, context=context):
-            return {'value': {'state': 'error'}}
-        return {}
diff --git a/addons/auth_reset_password/auth_reset_password.xml b/addons/auth_reset_password/auth_reset_password.xml
index 26ea8878c45..90f08a25899 100644
--- a/addons/auth_reset_password/auth_reset_password.xml
+++ b/addons/auth_reset_password/auth_reset_password.xml
@@ -7,60 +7,15 @@
             <field name="name">Reset Password</field>
             <field name="model_id" ref="base.model_res_users"/>
             <field name="email_from"><![CDATA[${object.company_id.name} <${object.company_id.email}>]]></field>
-            <field name="email_to" eval="False"><!--(set by reset_password module)--></field>
+            <field name="email_to">${object.email}</field>
             <field name="subject">Password reset</field>
-            <field name="body_text"><![CDATA[
-A password reset was requested the OpenERP account linked to this email on ${object._auth_reset_password_host()}
+            <field name="body_html"><![CDATA[
+<p>A password reset was requested for the OpenERP account linked to this email.</p>
 
-You may change your password following this link:
+<p>You may change your password following <a href="${object.signup_url}">this link</a>.</p>
 
-${object._auth_reset_password_link()}
-
-If you don't have asked for password reset, you can safely ignore this email.
-
-]]></field>
+<p>Note: If you did not ask for a password reset, you can safely ignore this email.</p>]]></field>
         </record>
 
-        <!-- TODO get own css -->
-        <record id="reset_password_wizard_form_view" model="ir.ui.view">
-            <field name="name">auth.reset_password.form</field>
-            <field name="model">auth.reset_password</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Reset Password" version="7.0">
-                    <field name="state" invisible="1"/> 
-                    <field name="token" on_change="onchange_token(token)" invisible="1"/>
-                    <group colspan="4" states="draft,missmatch">
-                        <field name="password" required='1' on_change="onchange_pw(password,password_confirmation)"/>
-                        <field name="password_confirmation" required='1' on_change="onchange_pw(password,password_confirmation)"/>
-                        <group colspan="4" states="missmatch">
-                            <div>Passwords missmatch</div>
-                        </group>
-                        <group colspan="2" col="1">
-                            <button string="Change Password" name="change" icon="gtk-dialog-authentication" attrs="{'readonly': [('state', '=', 'missmatch')]}"/>
-                        </group>
-                    </group>
-                    <group colspan="4" states="error" col="1">
-                        <div>Invalid or expired token</div>
-                        <button special="cancel" string="Close"/>
-                    </group>
-                    <group colspan="4" states="done" col="1">
-                        <div>Password changed. We sent you an email confirming the password change.</div>
-                        <button special="cancel" string="Close"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_reset" model="ir.actions.act_window">
-            <field name="name">Reset Password</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">auth.reset_password</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-
     </data>
 </openerp>
diff --git a/addons/profile_tools/__init__.py b/addons/auth_reset_password/controllers/__init__.py
similarity index 76%
rename from addons/profile_tools/__init__.py
rename to addons/auth_reset_password/controllers/__init__.py
index 9a3d6d2fbb6..f40f0ee976e 100644
--- a/addons/profile_tools/__init__.py
+++ b/addons/auth_reset_password/controllers/__init__.py
@@ -2,22 +2,23 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2012-today OpenERP SA (<http://www.openerp.com>)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
 #    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    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.
+#    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 main
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_reset_password/controllers/main.py b/addons/auth_reset_password/controllers/main.py
new file mode 100644
index 00000000000..639945cfc09
--- /dev/null
+++ b/addons/auth_reset_password/controllers/main.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+import logging
+
+import werkzeug
+
+import openerp
+from openerp import SUPERUSER_ID
+from openerp.modules.registry import RegistryManager
+
+_logger = logging.getLogger(__name__)
+
+class Controller(openerp.addons.web.http.Controller):
+    _cp_path = '/auth_reset_password'
+
+    @openerp.addons.web.http.httprequest
+    def reset_password(self, req, dbname, login):
+        """ retrieve user, and perform reset password """
+        url = '/'
+        registry = RegistryManager.get(dbname)
+        with registry.cursor() as cr:
+            try:
+                res_users = registry.get('res.users')
+                res_users.reset_password(cr, SUPERUSER_ID, login)
+                cr.commit()
+                message = 'An email has been sent with credentials to reset your password'
+            except Exception as e:
+                # signup error
+                _logger.exception('error when resetting password')
+                message = e.message
+        url = "/#action=login&error_message=%s" % werkzeug.urls.url_quote(message)
+        return werkzeug.utils.redirect(url)
+
+# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_reset_password/res_users.py b/addons/auth_reset_password/res_users.py
new file mode 100644
index 00000000000..b1039031812
--- /dev/null
+++ b/addons/auth_reset_password/res_users.py
@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+
+from datetime import datetime, timedelta
+
+def now(**kwargs):
+    dt = datetime.now() + timedelta(**kwargs)
+    return dt.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+
+
+class res_users(osv.osv):
+    _inherit = 'res.users'
+
+    def reset_password(self, cr, uid, login, context=None):
+        """ retrieve the user corresponding to login (login or email),
+            and reset their password
+        """
+        user_ids = self.search(cr, uid, [('login', '=', login)], context=context)
+        if not user_ids:
+            user_ids = self.search(cr, uid, [('email', '=', login)], context=context)
+        if len(user_ids) != 1:
+            raise Exception('Reset password: invalid username or email')
+        return self.action_reset_password(cr, uid, user_ids, context=context)
+
+    def action_reset_password(self, cr, uid, ids, context=None):
+        """ create signup token for each user, and send their signup url by email """
+        # prepare reset password signup
+        res_partner = self.pool.get('res.partner')
+        partner_ids = [user.partner_id.id for user in self.browse(cr, uid, ids, context)]
+        res_partner.signup_prepare(cr, uid, partner_ids, expiration=now(days=+1), context=context)
+
+        # send email to users with their signup url
+        template = self.pool.get('ir.model.data').get_object(cr, uid, 'auth_reset_password', 'reset_password_email')
+        assert template._name == 'email.template'
+        for user in self.browse(cr, uid, ids, context):
+            self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, context=context)
+
+        return True
diff --git a/addons/auth_reset_password/res_users_view.xml b/addons/auth_reset_password/res_users_view.xml
new file mode 100644
index 00000000000..9952162ae65
--- /dev/null
+++ b/addons/auth_reset_password/res_users_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="res_users_form_view" model="ir.ui.view">
+            <field name="name">user.form.reset_password</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//sheet/*[1]" position="before">
+                    <div class="oe_right oe_button_box">
+                        <button string="Reset Password" type="object" name="action_reset_password"/>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/auth_reset_password/static/src/css/reset_password.css b/addons/auth_reset_password/static/src/css/reset_password.css
deleted file mode 100644
index dd590365918..00000000000
--- a/addons/auth_reset_password/static/src/css/reset_password.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.openerp .oe_login .oe_login_pane {
-    height: 152px;
-}
-.openerp .oe_login .oe_login_pane ul.oe_login_switch a {
-  color: #eeeeee;
-  margin: 0 8px;
-}
-.openerp .oe_login .oe_login_pane ul.oe_login_switch a:hover {
-  text-decoration: underline;
-}
-
-
diff --git a/addons/auth_reset_password/static/src/js/reset_password.js b/addons/auth_reset_password/static/src/js/reset_password.js
index 13cf070a548..13fe2a39ce5 100644
--- a/addons/auth_reset_password/static/src/js/reset_password.js
+++ b/addons/auth_reset_password/static/src/js/reset_password.js
@@ -1,72 +1,30 @@
 openerp.auth_reset_password = function(instance) {
     var _t = instance.web._t;
+
     instance.web.Login.include({
         start: function() {
-            var $e = this.$element;
-            $e.find('a.oe_login_switch').click(function() {
-                $e.find('ul.oe_login_switch').toggle();
-                var $m = $e.find('form input[name=is_reset_pw]');
-                $m.attr('checked', !$m.is(':checked'));
-            });
+            this.$('a.oe_reset_password').click(this.do_reset_password);
             return this._super();
         },
-        on_submit: function(ev) {
-            if(ev) {
+        do_reset_password: function(ev) {
+            if (ev) {
                 ev.preventDefault();
             }
-
-            var $e = this.$element;
-            var db = $e.find("form [name=db]").val();
+            var db = this.$("form [name=db]").val();
+            var login = this.$("form input[name=login]").val();
             if (!db) {
-                this.do_warn(_t("Login"), _t("No database selected !"));
+                this.do_warn("Login", "No database selected !");
+                return false;
+            } else if (!login) {
+                this.do_warn("Login", "Please enter a username or email address.")
                 return false;
             }
-            var $m = $e.find('form input[name=is_reset_pw]');
-            if ($m.is(':checked')) {
-                var email = $e.find('form input[name=email]').val();
-                return this.do_reset_password(db, email);
-            } else {
-                return this._super(ev);
-            }
-        },
-        do_reset_password: function(db, email) {
-            var self = this;
-            instance.session.session_authenticate(db, 'anonymous', 'anonymous', true).pipe(function () {
-                var func = new instance.web.Model("res.users").get_func("send_reset_password_request");
-                return func(email).then(function(res) {
-                    // show message
-                    self.do_notify(_t('Reset Password'), _.str.sprintf(_t('We have sent an email to %s with further instructions'), email), true);
-                }, function(error, event) {
-                    // no traceback please
-                    event.preventDefault();
-                });
-            }).fail(function(error, event) {
-                // cannot log as anonymous or reset_password not installed
-                self.do_warn(_t('Reset Password'), _.str.sprintf(_t('Reset Password functionnality is not available for database %s'), db), true);
-            });
+            var params = {
+                dbname : db,
+                login: login,
+            };
+            var url = "/auth_reset_password/reset_password?" + $.param(params);
+            window.location = url;
         }
     });
-
-    instance.reset_password = {};
-    instance.reset_password.ResetPassword = instance.web.Widget.extend({
-        init: function(parent, params) {
-            this._super(parent);
-            this.token = (params && params.token) || false;
-        },
-        start: function() {
-            this.do_action({
-                name: 'Reset Password',
-                type: 'ir.actions.act_window',
-                context: {default_token: this.token},
-                res_model: 'auth.reset_password',
-                target: 'new',
-                views: [[false, 'form']]
-            });
-        }
-    });
-
-
-    instance.web.client_actions.add("reset_password", "instance.reset_password.ResetPassword");
-
-
 };
diff --git a/addons/auth_reset_password/static/src/xml/reset_password.xml b/addons/auth_reset_password/static/src/xml/reset_password.xml
index e57334b9c15..841f3906622 100644
--- a/addons/auth_reset_password/static/src/xml/reset_password.xml
+++ b/addons/auth_reset_password/static/src/xml/reset_password.xml
@@ -1,26 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
+<!-- vim:fdl=1: -->
 <templates id="template" xml:space="preserve">
 
 <t t-extend="Login">
-    <t t-jquery="form ul:first">
-        // addClass does not work :(
-        this.attr('class', (this.attr('class') || '') + ' oe_login_switch');
-    </t>
     <t t-jquery="form ul:first li:last" t-operation="after">
-        <li>
-            <a class="oe_login_switch" href="#">Forgot your password?</a>
-        </li>
-    </t>
-    <t t-jquery="form ul:first" t-operation="after">
-        <ul class="oe_login_switch" style="display:none;">
-            <li style="display:none;"><input type="checkbox" name="is_reset_pw"/></li>
-            <li>Email</li>
-            <li><input type="email" name="email"/></li>
-            <li><button name="submit">Reset Password</button></li>
-            <li><a class="oe_login_switch" href="#">&lt; Back</a></li>
-        </ul>
+        <li><a class="oe_reset_password" href="#">Reset password</a></li>
     </t>
 </t>
+
 </templates>
diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index 765a36ef252..9cbeb60638f 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -21,7 +21,10 @@
 
 {
     'name': 'Signup',
-    'description': 'Allow users to sign up',
+    'description': """
+Allow users to sign up.
+=======================
+    """,
     'author': 'OpenERP SA',
     'version': '1.0',
     'category': 'Authentication',
@@ -29,12 +32,11 @@
     'installable': True,
     'depends': ['base_setup'],
     'data': [
+        'auth_signup_data.xml',
         'res_config.xml',
+        'res_users_view.xml',
     ],
-    'js': [
-        'static/src/js/auth_signup.js',
-    ],
-    'qweb': [
-        'static/src/xml/auth_signup.xml',
-    ],
+    'js': ['static/src/js/auth_signup.js'],
+    'css' : ['static/src/css/base.css'],
+    'qweb': ['static/src/xml/auth_signup.xml'],
 }
diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml
new file mode 100644
index 00000000000..39b62148494
--- /dev/null
+++ b/addons/auth_signup/auth_signup_data.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- Default template user for new users signing in -->
+        <record id="default_template_user" model="res.users">
+            <field name="name">Template User</field>
+            <field name="login">portaltemplate</field>
+            <!-- No password: this template user doesn't need to log in -->
+            <field name="password"></field>
+            <field name="active" eval="False"/>
+            <!-- Avoid auto-including this user in any default group, just like a typical portal member -->
+            <field name="groups_id" eval="[(5,)]"/>
+        </record>
+
+        <record id="default_template_user_config" model="ir.config_parameter">
+            <field name="key">auth_signup.template_user_id</field>
+            <field name="value" ref="default_template_user"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 0ed2151d12b..09f9cb23da2 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -1,34 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
 import logging
 
-import werkzeug.urls
-
+import openerp
 from openerp.modules.registry import RegistryManager
-from openerp.addons.web.controllers.main import login_and_redirect
-import openerp.addons.web.common.http as openerpweb
+
+from ..res_users import SignupError
 
 _logger = logging.getLogger(__name__)
 
-class OpenIDController(openerpweb.Controller):
+class Controller(openerp.addons.web.http.Controller):
     _cp_path = '/auth_signup'
 
-    @openerpweb.httprequest
-    def signup(self, req, dbname, name, login, password):
-        url = '/'
+    @openerp.addons.web.http.jsonrequest
+    def retrieve(self, req, dbname, token):
+        """ retrieve the user info (name, login or email) corresponding to a signup token """
+        registry = RegistryManager.get(dbname)
+        user_info = None
+        with registry.cursor() as cr:
+            res_partner = registry.get('res.partner')
+            user_info = res_partner.signup_retrieve_info(cr, openerp.SUPERUSER_ID, token)
+        return user_info
+
+    @openerp.addons.web.http.jsonrequest
+    def signup(self, req, dbname, token, name, login, password):
+        """ sign up a user (new or existing)"""
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
+            res_users = registry.get('res.users')
+            values = {'name': name, 'login': login, 'password': password}
             try:
-                Users = registry.get('res.users')
-                credentials = Users.auth_signup(cr, 1, name, login, password)
-                cr.commit()
-                return login_and_redirect(req, *credentials)
-            except AttributeError:
-                # auth_signup is not installed
-                _logger.exception('attribute error when signup')
-                url = "/#action=auth_signup&error=NA"   # Not Available
-            except Exception:
-                # signup error
-                _logger.exception('error when signup')
-                url = "/#action=auth_signup&error=UE"   # Unexcpected Error
-        return werkzeug.utils.redirect(url)
+                res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
+            except SignupError, e:
+                return {'error': openerp.tools.exception_to_unicode(e)}
+            cr.commit()
+        return {}
 
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py
index 6afd1c5b581..21fce19745c 100644
--- a/addons/auth_signup/res_config.py
+++ b/addons/auth_signup/res_config.py
@@ -20,22 +20,27 @@
 ##############################################################################
 
 from openerp.osv import osv, fields
+from openerp.tools.safe_eval import safe_eval
 
 class base_config_settings(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'auth_signup_uninvited': fields.boolean('allow public users to sign up', help="If unchecked only invited users may sign up"),
+        'auth_signup_uninvited': fields.boolean('Allow external users to sign up', help="If unchecked, only invited users may sign up"),
         'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'),
     }
 
-    def get_default_signup(self, cr, uid, fields, context=None):
+    def get_default_auth_signup_template_user_id(self, cr, uid, fields, context=None):
         icp = self.pool.get('ir.config_parameter')
+        # we use safe_eval on the result, since the value of the parameter is a nonempty string
         return {
-            'auth_signup_template_user_id': icp.get_param(cr, uid, 'auth.signup_template_user_id', 0) or False
+            'auth_signup_uninvited': safe_eval(icp.get_param(cr, uid, 'auth_signup.allow_uninvited', 'False')),
+            'auth_signup_template_user_id': safe_eval(icp.get_param(cr, uid, 'auth_signup.template_user_id', 'False')),
         }
 
-    def set_signup(self, cr, uid, ids, context=None):
+    def set_auth_signup_template_user_id(self, cr, uid, ids, context=None):
         config = self.browse(cr, uid, ids[0], context=context)
         icp = self.pool.get('ir.config_parameter')
-        icp.set_param(cr, uid, 'auth.signup_template_user_id', config.auth_signup_template_user_id.id)
+        # we store the repr of the values, since the value of the parameter is a required string
+        icp.set_param(cr, uid, 'auth_signup.allow_uninvited', repr(config.auth_signup_uninvited))
+        icp.set_param(cr, uid, 'auth_signup.template_user_id', repr(config.auth_signup_template_user_id.id))
diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml
index 49669d36618..9d3eb4eaa5a 100644
--- a/addons/auth_signup/res_config.xml
+++ b/addons/auth_signup/res_config.xml
@@ -12,9 +12,11 @@
                         <field name="auth_signup_uninvited" class="oe_inline"/>
                         <label for="auth_signup_uninvited"/>
                     </div>
-                    <div>
+                    <div attrs="{'invisible':[('auth_signup_uninvited','=',False)]}">
                         <label for="auth_signup_template_user_id"/>
-                        <field name="auth_signup_template_user_id" class="oe_inline"/>
+                        <field name="auth_signup_template_user_id" class="oe_inline"
+                            attrs="{'required': [('auth_signup_uninvited', '=', True)]}"
+                            domain="['|',('active','=',0),('active','=',1)]"/>
                     </div>
                 </xpath>
             </field>
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 1d77a3f9473..973a8da6588 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -1,46 +1,204 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+import random
+import time
+import urllib
+import urlparse
+
 import openerp
-from openerp.osv import osv
+from openerp.osv import osv, fields
+from openerp import SUPERUSER_ID
+from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools.safe_eval import safe_eval
+
+class SignupError(Exception):
+    pass
+
+def random_token():
+    # the token has an entropy of about 120 bits (6 bits/char * 20 chars)
+    chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+    return ''.join(random.choice(chars) for i in xrange(20))
+
+def now():
+    return time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+
+class res_partner(osv.Model):
+    _inherit = 'res.partner'
+
+    def _get_signup_valid(self, cr, uid, ids, name, arg, context=None):
+        dt = now()
+        res = {}
+        for partner in self.browse(cr, uid, ids, context):
+            res[partner.id] = bool(partner.signup_token) and \
+                                (not partner.signup_expiration or dt <= partner.signup_expiration)
+        return res
+
+    def _get_signup_url(self, cr, uid, ids, name, arg, context=None):
+        """ determine a signup url for a given partner """
+        base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+
+        # if required, make sure that every partner without user has a valid signup token
+        if context and context.get('signup_valid'):
+            unsigned_ids = [p.id for p in self.browse(cr, uid, ids, context) if not p.user_ids]
+            self.signup_prepare(cr, uid, unsigned_ids, context=context)
+
+        res = dict.fromkeys(ids, False)
+        for partner in self.browse(cr, uid, ids, context):
+            if partner.signup_token:
+                params = (urllib.quote(cr.dbname), urllib.quote(partner.signup_token))
+                res[partner.id] = urlparse.urljoin(base_url, "#action=login&db=%s&token=%s" % params)
+            elif partner.user_ids:
+                user = partner.user_ids[0]
+                params = (urllib.quote(cr.dbname), urllib.quote(user.login))
+                res[partner.id] = urlparse.urljoin(base_url, "#action=login&db=%s&login=%s" % params)
+        return res
+
+    _columns = {
+        'signup_token': fields.char(size=24, string='Signup Token'),
+        'signup_expiration': fields.datetime(string='Signup Expiration'),
+        'signup_valid': fields.function(_get_signup_valid, type='boolean', string='Signup Token is Valid'),
+        'signup_url': fields.function(_get_signup_url, type='char', string='Signup URL'),
+    }
+
+    def action_signup_prepare(self, cr, uid, ids, context=None):
+        return self.signup_prepare(cr, uid, ids, context=context)
+
+    def signup_prepare(self, cr, uid, ids, expiration=False, context=None):
+        """ generate a new token for the partners with the given validity, if necessary
+            :param expiration: the expiration datetime of the token (string, optional)
+        """
+        for partner in self.browse(cr, uid, ids, context):
+            if expiration or not partner.signup_valid:
+                token = random_token()
+                while self._signup_retrieve_partner(cr, uid, token, context=context):
+                    token = random_token()
+                partner.write({'signup_token': token, 'signup_expiration': expiration})
+        return True
+
+    def _signup_retrieve_partner(self, cr, uid, token,
+            check_validity=False, raise_exception=False, context=None):
+        """ find the partner corresponding to a token, and possibly check its validity
+            :param token: the token to resolve
+            :param check_validity: if True, also check validity
+            :param raise_exception: if True, raise exception instead of returning False
+            :return: partner (browse record) or False (if raise_exception is False)
+        """
+        partner_ids = self.search(cr, uid, [('signup_token', '=', token)], context=context)
+        if not partner_ids:
+            if raise_exception:
+                raise SignupError("Signup token '%s' is not valid" % token)
+            return False
+        partner = self.browse(cr, uid, partner_ids[0], context)
+        if check_validity and not partner.signup_valid:
+            if raise_exception:
+                raise SignupError("Signup token '%s' is no longer valid" % token)
+            return False
+        return partner
+
+    def signup_retrieve_info(self, cr, uid, token, context=None):
+        """ retrieve the user info about the token
+            :return: a dictionary with the user information:
+                - 'db': the name of the database
+                - 'token': the token, if token is valid
+                - 'name': the name of the partner, if token is valid
+                - 'login': the user login, if the user already exists
+                - 'email': the partner email, if the user does not exist
+        """
+        partner = self._signup_retrieve_partner(cr, uid, token, raise_exception=True, context=None)
+        res = {'db': cr.dbname}
+        if partner.signup_valid:
+            res['token'] = token
+            res['name'] = partner.name
+        if partner.user_ids:
+            res['login'] = partner.user_ids[0].login
+        else:
+            res['email'] = partner.email or ''
+        return res
 
 class res_users(osv.Model):
     _inherit = 'res.users'
 
-    def auth_signup_create(self, cr, uid, new_user, context=None):
-        # new_user:
-        #   login
-        #   email
-        #   name (optional)
-        #   partner_id (optional)
-        #   groups (optional)
-        #   sign (for partner_id and groups)
-        #
-        user_template_id = self.pool.get('ir.config_parameter').get_param(cr, uid, 'auth.signup_template_user_id', 0)
-        if user_template_id:
-            self.pool.get('res.users').copy(cr, 1, user_template_id, new_user, context=context)
-        else:
-            self.pool.get('res.users').create(cr, 1, new_user, context=context)
+    def _get_state(self, cr, uid, ids, name, arg, context=None):
+        return dict((user.id, 'new' if not user.login_date else 'reset' if user.signup_token else 'active')
+                    for user in self.browse(cr, uid, ids, context))
 
-    def auth_signup(self, cr, uid, name, login, password, context=None):
-        r = (cr.dbname, login, password)
-        res = self.search(cr, uid, [("login", "=", login)])
-        if res:
-            # Existing user
-            user_id = res[0]
-            try:
-                self.check(cr.dbname, user_id, password)
-                # Same password
-            except openerp.exceptions.AccessDenied:
-                # Different password
-                raise
-        else:
-            # New user
-            new_user = {
-                'name': name,
-                'login': login,
-                'user_email': login,
-                'password': password,
-                'active': True,
-            }
-            self.auth_signup_create(cr, uid, new_user)
-        return r
+    _columns = {
+        'state': fields.function(_get_state, string='Status', type='selection',
+                    selection=[('new', 'New'), ('active', 'Active'), ('reset', 'Resetting Password')]),
+    }
 
-#
+    def signup(self, cr, uid, values, token=None, context=None):
+        """ signup a user, to either:
+            - create a new user (no token), or
+            - create a user for a partner (with token, but no user for partner), or
+            - change the password of a user (with token, and existing user).
+            :param values: a dictionary with field values
+            :param token: signup token (optional)
+            :return: (dbname, login, password) for the signed up user
+        """
+        assert values.get('login') and values.get('password')
+        result = (cr.dbname, values['login'], values['password'])
+
+        if token:
+            # signup with a token: find the corresponding partner id
+            res_partner = self.pool.get('res.partner')
+            partner = res_partner._signup_retrieve_partner(cr, uid, token,
+                                        check_validity=True, raise_exception=True, context=None)
+            # invalidate signup token
+            partner.write({'signup_token': False, 'signup_expiration': False})
+            if partner.user_ids:
+                # user exists, modify its password
+                partner.user_ids[0].write({'password': values['password']})
+            else:
+                # user does not exist: sign up invited user
+                self._signup_create_user(cr, uid, {
+                    'name': partner.name,
+                    'login': values['login'],
+                    'password': values['password'],
+                    'email': values['login'],
+                    'partner_id': partner.id,
+                }, context=context)
+            return result
+
+        # sign up an external user
+        assert values.get('name'), 'Signup: no name given for new user'
+        self._signup_create_user(cr, uid, {
+            'name': values['name'],
+            'login': values['login'],
+            'password': values['password'],
+            'email': values['login'],
+        }, context=context)
+        return result
+
+    def _signup_create_user(self, cr, uid, values, context=None):
+        """ create a new user from the template user """
+        ir_config_parameter = self.pool.get('ir.config_parameter')
+        template_user_id = safe_eval(ir_config_parameter.get_param(cr, uid, 'auth_signup.template_user_id', 'False'))
+        assert template_user_id and self.exists(cr, uid, template_user_id, context=context), 'Signup: invalid template user'
+
+        # check that uninvited users may sign up
+        if 'partner_id' not in values:
+            if not safe_eval(ir_config_parameter.get_param(cr, uid, 'auth_signup.allow_uninvited', 'False')):
+                raise SignupError('Signup is not allowed for uninvited users')
+
+        # create a copy of the template user (attached to a specific partner_id if given)
+        values['active'] = True
+        return self.copy(cr, uid, template_user_id, values, context=context)
diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml
new file mode 100644
index 00000000000..c42e1ab5f41
--- /dev/null
+++ b/addons/auth_signup/res_users_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+
+        <record id="res_users_form_view" model="ir.ui.view">
+            <field name="name">user.form.state</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//sheet" position="before">
+                    <header>
+                        <field name="state" widget="statusbar"/>
+                    </header>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/auth_signup/static/src/css/Makefile b/addons/auth_signup/static/src/css/Makefile
new file mode 100644
index 00000000000..d6b4f4b2fc8
--- /dev/null
+++ b/addons/auth_signup/static/src/css/Makefile
@@ -0,0 +1,3 @@
+base.css: base.sass
+	sass --trace -t expanded base.sass base.css
+
diff --git a/addons/auth_signup/static/src/css/base.css b/addons/auth_signup/static/src/css/base.css
new file mode 100644
index 00000000000..3f97e7a9301
--- /dev/null
+++ b/addons/auth_signup/static/src/css/base.css
@@ -0,0 +1,10 @@
+@charset "utf-8";
+.openerp .oe_login .oe_signup_show {
+  display: none;
+}
+.openerp .oe_login_signup .oe_signup_show {
+  display: block !important;
+}
+.openerp .oe_login_signup .oe_signup_hide {
+  display: none;
+}
diff --git a/addons/auth_signup/static/src/css/base.sass b/addons/auth_signup/static/src/css/base.sass
new file mode 100644
index 00000000000..f97665d192c
--- /dev/null
+++ b/addons/auth_signup/static/src/css/base.sass
@@ -0,0 +1,13 @@
+@charset "utf-8"
+
+.openerp
+    // Regular login form
+    .oe_login
+        .oe_signup_show
+            display: none
+    // Signup form
+    .oe_login_signup
+        .oe_signup_show
+            display: block !important
+        .oe_signup_hide
+            display: none
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index 2ab13aa7598..3025069dece 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -5,56 +5,117 @@ openerp.auth_signup = function(instance) {
     instance.web.Login.include({
         start: function() {
             var self = this;
-            this.$('a.oe_signup').click(function() {
-                var dbname = self.$("form [name=db]").val();
-                self.do_action({
-                    type: 'ir.actions.client',
-                    tag: 'auth_signup.signup',
-                    params: {'dbname': dbname},
-                    target: 'new',
-                    name: 'Sign up'
-                });
-                return true;
-            });
-            return this._super();
-        },
-    });
+            var d = this._super();
 
-
-    instance.auth_signup.Signup = instance.web.Widget.extend({
-        template: 'auth_signup.signup',
-        init: function(parent, params) {
-            this.params = params;
-            return this._super();
-        },
-        start: function() {
-            var self = this;
-            this.$('input[name=password_confirmation]').keyup(function() {
-                var v = $(this).val();
-                var $b = self.$('button');
-                if (_.isEmpty(v) || self.$('input[name=password]').val() === v) {
-                    $b.removeAttr('disabled');
-                } else {
-                    $b.attr('disabled', 'disabled');
-                }
-            });
-
-            this.$('form').submit(function(ev) {
-                if(ev) {
+            // to switch between the signup and regular login form
+            this.$('a.oe_signup_signup').click(function(ev) {
+                if (ev) {
                     ev.preventDefault();
                 }
-                var params = {
-                    dbname : self.params.dbname,
-                    name: self.$('input[name=name]').val(),
-                    login: self.$('input[name=email]').val(),
-                    password: self.$('input[name=password]').val(),
-                };
-                var url = "/auth_signup/signup?" + $.param(params);
-                window.location = url;
+                self.$el.addClass("oe_login_signup");
+                return false;
             });
-            return this._super();
-        }
+            this.$('a.oe_signup_back').click(function(ev) {
+                if (ev) {
+                    ev.preventDefault();
+                }
+                self.$el.removeClass("oe_login_signup");
+                delete self.params.token;
+                return false;
+            });
+
+            // if there is an error message in params, show it then forget it
+            if (self.params.error_message) {
+                this.show_error(self.params.error_message);
+                delete self.params.error_message;
+            }
+
+            // in case of a signup, retrieve the user information from the token
+            if (self.params.db && self.params.token) {
+                d = self.rpc("/auth_signup/retrieve", {dbname: self.params.db, token: self.params.token})
+                        .done(self.on_token_loaded)
+                        .fail(self.on_token_failed);
+            }
+            return d;
+        },
+        on_token_loaded: function(result) {
+            // select the right the database
+            this.selected_db = result.db;
+            this.on_db_loaded([result.db]);
+            if (result.token) {
+                // switch to signup mode, set user name and login
+                this.$el.addClass("oe_login_signup");
+                this.$("form input[name=name]").val(result.name).attr("readonly", "readonly");
+                if (result.login) {
+                    this.$("form input[name=login]").val(result.login).attr("readonly", "readonly");
+                } else {
+                    this.$("form input[name=login]").val(result.email);
+                }
+            } else {
+                // remain in login mode, set login if present
+                delete this.params.token;
+                this.$("form input[name=login]").val(result.login || "");
+            }
+        },
+        on_token_failed: function(result, ev) {
+            if (ev) {
+                ev.preventDefault();
+            }
+            this.show_error("Invalid signup token");
+            delete this.params.db;
+            delete this.params.token;
+        },
+        on_submit: function(ev) {
+            if (ev) {
+                ev.preventDefault();
+            }
+            if (this.$el.hasClass("oe_login_signup")) {
+                // signup user (or reset password)
+                var db = this.$("form [name=db]").val();
+                var name = this.$("form input[name=name]").val();
+                var login = this.$("form input[name=login]").val();
+                var password = this.$("form input[name=password]").val();
+                var confirm_password = this.$("form input[name=confirm_password]").val();
+                if (!db) {
+                    this.do_warn("Login", "No database selected !");
+                    return false;
+                } else if (!name) {
+                    this.do_warn("Login", "Please enter a name.");
+                    return false;
+                } else if (!login) {
+                    this.do_warn("Login", "Please enter a username.");
+                    return false;
+                } else if (!password || !confirm_password) {
+                    this.do_warn("Login", "Please enter a password and confirm it.");
+                    return false;
+                } else if (password !== confirm_password) {
+                    this.do_warn("Login", "Passwords do not match; please retype them.");
+                    return false;
+                }
+                var params = {
+                    dbname : db,
+                    token: this.params.token || "",
+                    name: name,
+                    login: login,
+                    password: password,
+                    //state: $.param(this.params)
+                };
+                
+                var self = this,
+                    super_ = this._super;
+                this.rpc('/auth_signup/signup', params)
+                    .done(function(result) {
+                        if (result.error) {
+                            self.show_error(result.error);
+                        } else {
+                            super_.apply(self, [ev]);
+                        }
+                    });
+            } else {
+                // regular login
+                this._super(ev);
+            }
+        },
     });
-    instance.web.client_actions.add("auth_signup.signup", "instance.auth_signup.Signup");
 
 };
diff --git a/addons/auth_signup/static/src/xml/auth_signup.xml b/addons/auth_signup/static/src/xml/auth_signup.xml
index c2eec846d15..e63bd5863b0 100644
--- a/addons/auth_signup/static/src/xml/auth_signup.xml
+++ b/addons/auth_signup/static/src/xml/auth_signup.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
+<!-- vim:fdl=1: -->
 <templates id="template" xml:space="preserve">
 
-<t t-extend="Login">
-    <t t-jquery="form ul:first li:last" t-operation="after">
-        <li>
-            <a class="oe_signup" href="#">Sign Up</a>
-        </li>
+    <t t-extend="Login">
+        <t t-jquery="form ul:first li:contains('Username')" t-operation="before">
+            <li class="oe_signup_show">Name</li>
+            <li class="oe_signup_show"><input name="name" type="text"/></li>
+        </t>
+        <t t-jquery="form ul:first li:contains('Username')" t-operation="replace">
+            <li class="oe_signup_hide">Username</li>
+            <li class="oe_signup_show">Username (Email)</li>
+        </t>
+        <t t-jquery="form ul:first li:has(input[name=password])" t-operation="after">
+            <li class="oe_signup_show">Confirm Password</li>
+            <li class="oe_signup_show"><input name="confirm_password" type="password"/></li>
+        </t>
+        <t t-jquery="form ul:first li:has(button[name=submit])" t-operation="replace">
+            <li class="oe_signup_hide"><button name="submit">Log in</button></li>
+            <li class="oe_signup_show"><button name="submit">Sign in</button></li>
+        </t>
+        <t t-jquery="form ul:first li:last" t-operation="after">
+            <li><a class="oe_signup_hide oe_signup_signup" href="#">Sign Up</a></li>
+            <li><a class="oe_signup_show oe_signup_back" href="#">Back to Login</a></li>
+        </t>
     </t>
-</t>
-
-<t t-name="auth_signup.signup">
-  <div>
-    <form>
-        Name = <input type="text" name="name"/><br/>
-        Email = <input type="email" name="email"/><br/>
-        Password = <input type="password" name="password"/><br/>
-        Confirmation = <input type="password" name="password_confirmation"/><br/>
-        <button type="submit" disabled="disabled">Signup</button>
-    </form>
-  </div>
-</t>
-
-
 
 </templates>
diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index eff92685313..973567c613f 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -29,24 +29,21 @@ This module allows to implement action rules for any object.
 
 Use automated actions to automatically trigger actions for various screens.
 
-Example: A lead created by a specific user may be automatically set to a specific
+**Example:** A lead created by a specific user may be automatically set to a specific
 sales team, or an opportunity which still has status pending after 14 days might
 trigger an automatic reminder email.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'mail'],
-    'init_xml': [
-        'base_action_rule_data.xml'
-    ],
-    'update_xml': [
+    'data': [
         'base_action_rule_view.xml',
         'security/ir.model.access.csv',
+        'base_action_rule_data.xml'
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001017908446466333429',
     'images': ['images/base_action_rule1.jpeg','images/base_action_rule2.jpeg','images/base_action_rule3.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index b6eacda63c0..856d2626f69 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -19,15 +19,16 @@
 #
 ##############################################################################
 
-from osv import fields, osv, orm
-from tools.translate import _
 from datetime import datetime
 from datetime import timedelta
+import re
+import time
+
+from osv import fields, osv, orm
+from tools.translate import _
 from tools.safe_eval import safe_eval
 from tools import ustr
 import pooler
-import re
-import time
 import tools
 
 
@@ -48,32 +49,21 @@ class base_action_rule(osv.osv):
     _description = 'Action Rules'
 
     def _state_get(self, cr, uid, context=None):
-        """ Get State
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+        """ Get State """
         return self.state_get(cr, uid, context=context)
 
     def state_get(self, cr, uid, context=None):
-        """ Get State
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+        """ Get State """
         return [('', '')]
 
     def priority_get(self, cr, uid, context=None):
-        """ Get Priority
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values """
+        """ Get Priority """
         return [('', '')]
 
     _columns = {
         'name':  fields.char('Rule Name', size=64, required=True),
-        'model_id': fields.many2one('ir.model', 'Object', required=True),
+        'model_id': fields.many2one('ir.model', 'Related Document Model', required=True, domain=[('osv_memory','=', False)]),
+        'model': fields.related('model_id', 'model', type="char", size=256, string='Model'),
         '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."),
@@ -82,6 +72,7 @@ when displaying a list of rules."),
         'trg_date_type':  fields.selection([
             ('none', 'None'),
             ('create', 'Creation Date'),
+            ('write', 'Last Modified Date'),
             ('action_last', 'Last Action Date'),
             ('date', 'Date'),
             ('deadline', 'Deadline'),
@@ -98,78 +89,39 @@ trigger date, like sending a reminder 15 minutes before a meeting."),
         'trg_state_from': fields.selection(_state_get, 'Status', size=16),
         'trg_state_to': fields.selection(_state_get, 'Button Pressed', size=16),
 
-        'act_method': fields.char('Call Object Method', size=64),
         'act_user_id': fields.many2one('res.users', 'Set Responsible to'),
         'act_state': fields.selection(_state_get, 'Set State to', size=16),
-        'act_email_cc': fields.char('Add Watchers (Cc)', size=250, help="\
-These people will receive a copy of the future communication between partner \
-and users by email"),
-        'act_remind_partner': fields.boolean('Remind Partner', help="Check \
-this if you want the rule to send a reminder by email to the partner."),
-        'act_remind_user': fields.boolean('Remind Responsible', help="Check \
-this if you want the rule to send a reminder by email to the user."),
-        'act_reply_to': fields.char('Reply-To', size=64),
-        'act_remind_attach': fields.boolean('Remind with Attachment', help="Check this if you want that all documents attached to the object be attached to the reminder email sent."),
-        'act_mail_to_user': fields.boolean('Mail to Responsible', help="Check\
- this if you want the rule to send an email to the responsible person."),
-        'act_mail_to_watchers': fields.boolean('Mail to Watchers (CC)',
-                                                help="Check this if you want \
-the rule to mark CC(mail to any other person defined in actions)."),
-        'act_mail_to_email': fields.char('Mail to these Emails', size=128, \
-        help="Email-id of the persons whom mail is to be sent"),
-        'act_mail_body': fields.text('Mail body', help="Content of mail"),
+        'act_followers': fields.many2many("res.partner", string="Set Followers"),
         'regex_name': fields.char('Regex on Resource Name', size=128, help="Regular expression for matching name of the resource\
 \ne.g.: 'urgent.*' will search for records having name starting with the string 'urgent'\
 \nNote: This is case sensitive search."),
-        'server_action_id': fields.many2one('ir.actions.server', 'Server Action', help="Describes the action name.\neg:on which object which action to be taken on basis of which condition"),
-        'filter_id':fields.many2one('ir.filters', 'Filter', required=False),
-        'act_email_from' : fields.char('Email From', size=64, required=False,
-                help="Use a python expression to specify the right field on which one than we will use for the 'From' field of the header"),
-        'act_email_to' : fields.char('Email To', size=64, required=False,
-                                     help="Use a python expression to specify the right field on which one than we will use for the 'To' field of the header"),
+        'server_action_ids': fields.one2many('ir.actions.server', 'action_rule_id', 'Server Action', help="Define Server actions.\neg:Email Reminders, Call Object Service, etc.."), #TODO: set domain [('model_id','=',model_id)]
+        'filter_id':fields.many2one('ir.filters', 'Filter', required=False), #TODO: set domain [('model_id','=',model_id.model)]
         'last_run': fields.datetime('Last Run', readonly=1),
     }
 
     _defaults = {
-        'active': lambda *a: True,
-        'trg_date_type': lambda *a: 'none',
-        'trg_date_range_type': lambda *a: 'day',
-        'act_mail_to_user': lambda *a: 0,
-        'act_remind_partner': lambda *a: 0,
-        'act_remind_user': lambda *a: 0,
-        'act_mail_to_watchers': lambda *a: 0,
+        'active': True,
+        'trg_date_type': 'none',
+        'trg_date_range_type': 'day',
     }
 
     _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 post_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.model_id) \
-                        WHERE active")
+                        WHERE active and model = %s", (model,))
         res = cr.fetchall()
         # Check if any rule matching with current object
         for obj_name, rule_id in res:
-            if not (model == obj_name):
-                continue # TODO add this condition in the WHERE clause above.
-            else:
-                obj = self.pool.get(obj_name)
-                # If the rule doesn't involve a time condition, run it immediately
-                # Otherwise we let the scheduler run the action
-                if self.browse(cr, uid, rule_id, context=context).trg_date_type == 'none':
-                    self._action(cr, uid, [rule_id], obj.browse(cr, uid, ids, context=context), context=context)
+            obj = self.pool.get(obj_name)
+            # If the rule doesn't involve a time condition, run it immediately
+            # Otherwise we let the scheduler run the action
+            if self.browse(cr, uid, rule_id, context=context).trg_date_type == 'none':
+                self._action(cr, uid, [rule_id], obj.browse(cr, uid, ids, context=context), context=context)
         return True
 
     def _create(self, old_create, model, context=None):
@@ -232,24 +184,30 @@ the rule to mark CC(mail to any other person defined in actions)."),
         """
         This Function is call by scheduler.
         """
-        rule_pool = self.pool.get('base.action.rule')
-        rule_ids = rule_pool.search(cr, uid, [], context=context)
+        rule_ids = self.search(cr, uid, [], context=context)
         self._register_hook(cr, uid, rule_ids, context=context)
-
-        rules = self.browse(cr, uid, rule_ids, context=context)
-        for rule in rules:
+        if context is None:
+            context = {}
+        for rule in self.browse(cr, uid, rule_ids, context=context):
             model = rule.model_id.model
             model_pool = self.pool.get(model)
             last_run = False
             if rule.last_run:
                 last_run = get_datetime(rule.last_run)
             now = datetime.now()
-            for obj_id in model_pool.search(cr, uid, [], context=context):
-                obj = model_pool.browse(cr, uid, obj_id, context=context)
+            ctx = dict(context)            
+            if rule.filter_id and rule.model_id.model == rule.filter_id.model_id:
+                ctx.update(eval(rule.filter_id.context))
+                obj_ids = model_pool.search(cr, uid, eval(rule.filter_id.domain), context=ctx)
+            else:
+                obj_ids = model_pool.search(cr, uid, [], context=ctx)
+            for obj in model_pool.browse(cr, uid, obj_ids, context=ctx):
                 # Calculate when this action should next occur for this object
                 base = False
                 if rule.trg_date_type=='create' and hasattr(obj, 'create_date'):
                     base = obj.create_date
+                elif rule.trg_date_type=='write' and hasattr(obj, 'write_date'):
+                    base = obj.write_date
                 elif (rule.trg_date_type=='action_last'
                         and hasattr(obj, 'create_date')):
                     if hasattr(obj, 'date_action_last') and obj.date_action_last:
@@ -275,79 +233,25 @@ the rule to mark CC(mail to any other person defined in actions)."),
                     delay = fnct[rule.trg_date_range_type](rule.trg_date_range)
                     action_date = base + delay
                     if (not last_run or (last_run <= action_date < now)):
-                        self._action(cr, uid, [rule.id], [obj], context=context)
-            rule_pool.write(cr, uid, [rule.id], {'last_run': now},
-                            context=context)
-
-    def format_body(self, body):
-        """ Foramat Action rule's body
-            @param self: The object pointer """
-        return body and tools.ustr(body) or ''
-
-    def format_mail(self, obj, body):
-        data = {
-            'object_id': obj.id,
-            'object_subject': hasattr(obj, 'name') and obj.name or False,
-            'object_date': hasattr(obj, 'date') and obj.date or False,
-            'object_description': hasattr(obj, 'description') and obj.description or False,
-            'object_user': hasattr(obj, 'user_id') and (obj.user_id and obj.user_id.name) or '/',
-            'object_user_email': hasattr(obj, 'user_id') and (obj.user_id and \
-                                     obj.user_id.email) or '/',
-            'object_user_phone': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and \
-                                     obj.partner_address_id.phone) or '/',
-            'partner': hasattr(obj, 'partner_id') and (obj.partner_id and obj.partner_id.name) or '/',
-            'partner_email': hasattr(obj, 'partner_address_id') and (obj.partner_address_id and\
-                                         obj.partner_address_id.email) or '/',
-        }
-        return self.format_body(body % data)
-
-    def email_send(self, cr, uid, obj, emails, body, emailfrom=None, context=None):
-        """ send email
-            @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 email: pass the emails
-            @param emailfrom: Pass name the email From else False
-            @param context: A standard dictionary for contextual values """
-
-        if not emailfrom:
-            emailfrom = tools.config.get('email_from', False)
-
-        if context is None:
-            context = {}
-
-        mail_message = self.pool.get('mail.message')
-        body = self.format_mail(obj, body)
-        if not emailfrom:
-            if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.email:
-                emailfrom = obj.user_id.email
-
-        name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
-        emailfrom = tools.ustr(emailfrom)
-        reply_to = emailfrom
-        if not emailfrom:
-            raise osv.except_osv(_('Error!'),
-                    _("No email ID found for your company address."))
-        return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model='base.action.rule', reply_to=reply_to, res_id=obj.id)
-
+                        try:
+                            self._action(cr, uid, [rule.id], obj, context=ctx)
+                            self.write(cr, uid, [rule.id], {'last_run': now}, context=context)
+                        except Exception, e:
+                            import traceback
+                            print traceback.format_exc()
+                        
+                        
 
     def do_check(self, cr, uid, action, obj, context=None):
-        """ check 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 context: A standard dictionary for contextual values """
+        """ check Action """
         if context is None:
             context = {}
         ok = True
-        if action.filter_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:
-                    ok = False
-            else:
-                ok = False
+        if action.filter_id and action.model_id.model == action.filter_id.model_id:
+            ctx = dict(context)
+            ctx.update(eval(action.filter_id.context))
+            obj_ids = self.pool.get(action.model_id.model).search(cr, uid, eval(action.filter_id.domain), context=ctx)
+            ok = ok and obj.id in obj_ids
         if getattr(obj, 'user_id', False):
             ok = ok and (not action.trg_user_id.id or action.trg_user_id.id==obj.user_id.id)
         if getattr(obj, 'partner_id', False):
@@ -378,123 +282,62 @@ the rule to mark CC(mail to any other person defined in actions)."),
         ok = ok and regex_n
         return ok
 
-    def do_action(self, cr, uid, action, model_obj, obj, context=None):
-        """ Do 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 action: pass action
-            @param model_obj: pass Model object
-            @param context: A standard dictionary for contextual values """
+    def do_action(self, cr, uid, action, obj, context=None):
+        """ Do Action """
         if context is None:
             context = {}
+        ctx = dict(context)
+        model_obj = self.pool.get(action.model_id.model)
+        action_server_obj = self.pool.get('ir.actions.server')
+        if action.server_action_ids:
+            ctx.update({'active_model': action.model_id.model, 'active_id':obj.id, 'active_ids':[obj.id]})
+            action_server_obj.run(cr, uid, [x.id for x in action.server_action_ids], context=ctx)
 
-        if action.server_action_id:
-            context.update({'active_id':obj.id, 'active_ids':[obj.id]})
-            self.pool.get('ir.actions.server').run(cr, uid, [action.server_action_id.id], context)
         write = {}
-
         if hasattr(obj, 'user_id') and action.act_user_id:
-            obj.user_id = action.act_user_id
             write['user_id'] = action.act_user_id.id
         if hasattr(obj, 'date_action_last'):
             write['date_action_last'] = time.strftime('%Y-%m-%d %H:%M:%S')
         if hasattr(obj, 'state') and action.act_state:
-            obj.state = action.act_state
             write['state'] = action.act_state
 
-        if hasattr(obj, 'categ_id') and action.act_categ_id:
-            obj.categ_id = action.act_categ_id
-            write['categ_id'] = action.act_categ_id.id
-
         model_obj.write(cr, uid, [obj.id], write, context)
-
-        if hasattr(model_obj, 'remind_user') and action.act_remind_user:
-            model_obj.remind_user(cr, uid, [obj.id], context, attach=action.act_remind_attach)
-        if hasattr(model_obj, 'remind_partner') and action.act_remind_partner:
-            model_obj.remind_partner(cr, uid, [obj.id], context, attach=action.act_remind_attach)
-        if action.act_method:
-            getattr(model_obj, 'act_method')(cr, uid, [obj.id], action, context)
-
-        emails = []
-        if hasattr(obj, 'user_id') and action.act_mail_to_user:
-            if obj.user_id:
-                emails.append(obj.user_id.email)
-
-        if action.act_mail_to_watchers:
-            emails += (action.act_email_cc or '').split(',')
-        if action.act_mail_to_email:
-            emails += (action.act_mail_to_email or '').split(',')
-
-        locals_for_emails = {
-            'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
-            'obj' : obj,
-        }
-
-        if action.act_email_to:
-            emails.append(safe_eval(action.act_email_to, {}, locals_for_emails))
-
-        emails = filter(None, emails)
-        if len(emails) and action.act_mail_body:
-            emails = list(set(emails))
-            email_from = safe_eval(action.act_email_from, {}, locals_for_emails)
-
-            def to_email(text):
-                return re.findall(r'([^ ,<@]+@[^> ,]+)', text or '')
-            emails = to_email(','.join(filter(None, emails)))
-            email_froms = to_email(email_from)
-            if email_froms:
-                self.email_send(cr, uid, obj, emails, action.act_mail_body, emailfrom=email_froms[0])
+        if hasattr(obj, 'state') and hasattr(obj, 'message_post') and action.act_state:
+            model_obj.message_post(cr, uid, [obj], _(action.act_state), context=context)
+        
+        if hasattr(obj, 'message_subscribe') and action.act_followers:
+            exits_followers = [x.id for x in obj.message_follower_ids]
+            new_followers = [x.id for x in action.act_followers if x.id not in exits_followers]
+            if new_followers:
+                model_obj.message_subscribe(cr, uid, [obj.id], new_followers, context=context)
         return True
 
     def _action(self, cr, uid, ids, objects, scrit=None, context=None):
-        """ Do 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 Basic Action Rule’s IDs,
-            @param objects: pass objects
-            @param context: A standard dictionary for contextual values """
+        """ Do Action """
         if context is None:
             context = {}
 
         context.update({'action': True})
         if not scrit:
             scrit = []
-
+        if not isinstance(objects, list):
+            objects = [objects]
         for action in self.browse(cr, uid, ids, context=context):
             for obj in objects:
                 if self.do_check(cr, uid, action, obj, context=context):
-                    model_obj = self.pool.get(action.model_id.model)
-                    self.do_action(cr, uid, action, model_obj, obj, context=context)
+                    self.do_action(cr, uid, action, obj, context=context)
 
         context.update({'action': False})
         return True
 
-    def _check_mail(self, cr, uid, ids, context=None):
-        """ Check Mail
-            @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 Action Rule’s IDs
-            @param context: A standard dictionary for contextual values """
-
-        empty = orm.browse_null()
-        rule_obj = self.pool.get('base.action.rule')
-        for rule in self.browse(cr, uid, ids, context=context):
-            if rule.act_mail_body:
-                try:
-                    rule_obj.format_mail(empty, rule.act_mail_body)
-                except (ValueError, KeyError, TypeError):
-                    return False
-        return True
-
-    _constraints = [
-        (_check_mail, 'Error ! The mail is not well formated.', ['act_mail_body']),
-    ]
-
 base_action_rule()
 
+class actions_server(osv.osv):
+    _inherit = 'ir.actions.server'
+    _columns = {
+        'action_rule_id': fields.many2one("base.action.rule", string="Action Rule")
+    }
+actions_server()
 
 class ir_cron(osv.osv):
     _inherit = 'ir.cron'
diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml
index 0d268438a41..0e855337d22 100644
--- a/addons/base_action_rule/base_action_rule_view.xml
+++ b/addons/base_action_rule/base_action_rule_view.xml
@@ -15,10 +15,11 @@
                     <sheet>
                         <group col="4">
                             <field name="name"/>
-                            <field name="model_id" on_change="onchange_model_id(model_id)"/>
-                            <field name="filter_id" />
+                            <field name="model_id"/>
+                            <field name="filter_id" domain="[('model_id','=',model)]" context="{'default_model_id': model}"/>
                             <field name="sequence"/>
                             <field name="active"/>
+                            <field name="model" invisible="1"/>
                         </group>
                         <notebook>
                             <page string="Conditions">
@@ -31,62 +32,40 @@
                                         <field name="trg_partner_id"/>
                                         <field name="trg_partner_categ_id"/>
                                     </group>
-                                    <group string="Conditions on States">
+                                    <group name="state" string="Conditions on Status">
                                         <field name="trg_state_from"/>
                                         <field name="trg_state_to"/>
                                     </group>
-                                    <group string="Conditions on Timing">
+                                    <group name="timing" string="Conditions on Timing">
                                         <field name="trg_date_type"/>
-                                        <group attrs="{'invisible': [('trg_date_type', '=', 'none')]}">
-                                            <field name="trg_date_range" string="Delay After Trigger Date"/>
-                                            <field name="trg_date_range_type"/>
-                                        </group>
+                                        <field name="trg_date_range" string="Delay After Trigger Date" attrs="{'invisible': [('trg_date_type', '=', 'none')]}"/>
+                                        <field name="trg_date_range_type" attrs="{'invisible': [('trg_date_type', '=', 'none')]}"/>
                                     </group>
                                 </group>
-                                <separator string="Note"/>
-                                <label string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action described in the 'Actions' tab." />
+                                <group string="Note">
+                                    <label string="The rule uses the AND operator. The model must match all non-empty fields so that the rule executes the action  described in the 'Actions' tab." />
+                                </group>
                             </page>
                             <page string="Actions">
-                                <group string="Fields to Change" col="4">
+                                <group name="action_followers">
+                                    <field name="act_followers" widget="many2many_tags"/>
+                                </group>
+                                <group name="action_field" col="4" string="Fields to Change">
                                     <field name="act_user_id"/>
                                     <field name="act_state"/>
                                 </group>
-                                <group col="2" string="Server Action to be Triggered">
-                                    <field name="server_action_id"/>
+                                <group name="action_server" string="Server Actions to be Triggered (eg. Email Reminder, Call Object Method, etc...)" >
+                                    <field name="server_action_ids" domain="[('model_id','=', model_id)]" nolabel="1" context="{'default_model_id': model_id}">
+                                        <tree string="Server Actions">
+                                            <field name="sequence"/>
+                                            <field name="name"/>
+                                            <field name="state"/>
+                                        </tree>
+                                    </field>
                                 </group>
-                            </page>
-                            <page string="Email Actions">
-                                <group col="4">
-                                    <separator colspan="4" string="Email Reminders"/>
-                                    <field name="act_remind_partner"/>
-                                    <field name="act_remind_attach"/>
-                                    <field name="act_remind_user"/>
-                                    <group col="2" colspan="2" attrs="{'invisible': [('act_remind_user','=',False)]}">
-                                        <field name="act_reply_to" attrs="{'required':[('act_remind_user','=',True)]}"/>
-                                    </group>
-                                    <separator colspan="4" string="Email Information"/>
-                                    <field name="act_email_from" />
-                                    <field name="act_email_to" />
-                                    <field name="act_mail_to_user"/>
-                                    <field colspan="4" name="act_mail_to_email"/>
-                                    <field name="act_mail_to_watchers"/>
-                                    <field colspan="4" name="act_email_cc"/>
-                                    <separator colspan="4" string="Email Body"/>
-                                    <field colspan="4" name="act_mail_body" height="250"
-                                        nolabel="1" attrs="{'required':[('act_remind_user','=',True)]}" />
-                                    <separator colspan="4" string="Special Keywords to be Used in the Body"/>
-                                    <label align="0.0" string="%%(object_id)s = Object ID" colspan="2"/>
-                                    <label align="0.0" string="%%(object_subject)s = Object subject" colspan="2"/>
-                                    <label align="0.0" string="%%(object_description)s = Object description" colspan="2"/>
-                                    <label align="0.0" string="%%(object_date)s = Creation date" colspan="2"/>
-                                    <label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
-                                    <label align="0.0" string="%%(partner_email)s = Partner Email" colspan="2"/>
-                                    <label align="0.0" string="%%(object_user)s = Responsible name" colspan="2"/>
-                                    <label align="0.0" string="%%(object_user_email)s = Responsible Email" colspan="2"/>
-                                    <label align="0.0" string="%%(object_user_phone)s = Responsible phone" colspan="2"/>
-                                </group>
-                            </page>
-                        </notebook>
+                                
+                           </page>
+                       </notebook>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/base_action_rule/i18n/ar.po b/addons/base_action_rule/i18n/ar.po
index dad10fc9d06..6b2f6b34bb5 100644
--- a/addons/base_action_rule/i18n/ar.po
+++ b/addons/base_action_rule/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/bg.po b/addons/base_action_rule/i18n/bg.po
index 00ac1646476..2e52fdb368d 100644
--- a/addons/base_action_rule/i18n/bg.po
+++ b/addons/base_action_rule/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/bs.po b/addons/base_action_rule/i18n/bs.po
index 1d0b81fc3ea..9cf3782c4a9 100644
--- a/addons/base_action_rule/i18n/bs.po
+++ b/addons/base_action_rule/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/ca.po b/addons/base_action_rule/i18n/ca.po
index f612d5a0a8f..3bb2bb6c051 100644
--- a/addons/base_action_rule/i18n/ca.po
+++ b/addons/base_action_rule/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/da.po b/addons/base_action_rule/i18n/da.po
index 938b822eab3..fcb638994ef 100644
--- a/addons/base_action_rule/i18n/da.po
+++ b/addons/base_action_rule/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/de.po b/addons/base_action_rule/i18n/de.po
index f24a0dee05e..405b58e8dac 100644
--- a/addons/base_action_rule/i18n/de.po
+++ b/addons/base_action_rule/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/el.po b/addons/base_action_rule/i18n/el.po
index 06491b0a9fd..c6ba5e19da0 100644
--- a/addons/base_action_rule/i18n/el.po
+++ b/addons/base_action_rule/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/es.po b/addons/base_action_rule/i18n/es.po
index e4c51fa1199..5efae77d99b 100644
--- a/addons/base_action_rule/i18n/es.po
+++ b/addons/base_action_rule/i18n/es.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:24+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2012-11-09 12:09+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-11-10 04:59+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -340,7 +339,7 @@ msgstr "Activo"
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
 msgid "No Email ID Found for your Company address!"
-msgstr ""
+msgstr "¡No se ha encontrado Id del e-mail para la dirección de su compañía!"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
diff --git a/addons/base_action_rule/i18n/es_CR.po b/addons/base_action_rule/i18n/es_CR.po
index 3e1c5732fd1..f1a0a7fd4ba 100644
--- a/addons/base_action_rule/i18n/es_CR.po
+++ b/addons/base_action_rule/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: base_action_rule
diff --git a/addons/base_action_rule/i18n/es_EC.po b/addons/base_action_rule/i18n/es_EC.po
index b17bef384aa..f3fa925b11e 100644
--- a/addons/base_action_rule/i18n/es_EC.po
+++ b/addons/base_action_rule/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/es_PY.po b/addons/base_action_rule/i18n/es_PY.po
index 6380bc04f9e..a4d965446dc 100644
--- a/addons/base_action_rule/i18n/es_PY.po
+++ b/addons/base_action_rule/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/fa.po b/addons/base_action_rule/i18n/fa.po
index ef2a5f92039..0fce73b6688 100644
--- a/addons/base_action_rule/i18n/fa.po
+++ b/addons/base_action_rule/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/fi.po b/addons/base_action_rule/i18n/fi.po
index 2ae3bd6bd94..4aed5d387be 100644
--- a/addons/base_action_rule/i18n/fi.po
+++ b/addons/base_action_rule/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/fr.po b/addons/base_action_rule/i18n/fr.po
index 31715853a68..2b751527128 100644
--- a/addons/base_action_rule/i18n/fr.po
+++ b/addons/base_action_rule/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/gl.po b/addons/base_action_rule/i18n/gl.po
index 5d794b1d41e..534d0449370 100644
--- a/addons/base_action_rule/i18n/gl.po
+++ b/addons/base_action_rule/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/gu.po b/addons/base_action_rule/i18n/gu.po
index ca6059780bf..958a39b699e 100644
--- a/addons/base_action_rule/i18n/gu.po
+++ b/addons/base_action_rule/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/hr.po b/addons/base_action_rule/i18n/hr.po
index cc40b2a8fe0..f26984a6724 100644
--- a/addons/base_action_rule/i18n/hr.po
+++ b/addons/base_action_rule/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/hu.po b/addons/base_action_rule/i18n/hu.po
index c70333c8593..e3e54af5080 100644
--- a/addons/base_action_rule/i18n/hu.po
+++ b/addons/base_action_rule/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/it.po b/addons/base_action_rule/i18n/it.po
index b951d476c6c..7c41471c34e 100644
--- a/addons/base_action_rule/i18n/it.po
+++ b/addons/base_action_rule/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/ja.po b/addons/base_action_rule/i18n/ja.po
index aa831b0a595..21dacf75159 100644
--- a/addons/base_action_rule/i18n/ja.po
+++ b/addons/base_action_rule/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/lt.po b/addons/base_action_rule/i18n/lt.po
index a501963ea77..5f44be4df4d 100644
--- a/addons/base_action_rule/i18n/lt.po
+++ b/addons/base_action_rule/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/lv.po b/addons/base_action_rule/i18n/lv.po
index 52940e160cf..3e34fb64387 100644
--- a/addons/base_action_rule/i18n/lv.po
+++ b/addons/base_action_rule/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/mn.po b/addons/base_action_rule/i18n/mn.po
index 168725af3b9..2599c8508cd 100644
--- a/addons/base_action_rule/i18n/mn.po
+++ b/addons/base_action_rule/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/nb.po b/addons/base_action_rule/i18n/nb.po
new file mode 100644
index 00000000000..5c8a90af62f
--- /dev/null
+++ b/addons/base_action_rule/i18n/nb.po
@@ -0,0 +1,536 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-03 16:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_user:0
+msgid ""
+"Check this if you want the rule to send an email to the responsible person."
+msgstr ""
+"Sjekk dette hvis du vil at regelen skal sende en e-post til ansvarlig person."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_partner:0
+msgid "Remind Partner"
+msgstr "Påminn partner"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_categ_id:0
+msgid "Partner Category"
+msgstr "Partner Kategori"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_watchers:0
+msgid "Mail to Watchers (CC)"
+msgstr "Post til overvåkere (CC)"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_to:0
+msgid "Button Pressed"
+msgstr "Knapp trykket"
+
+#. module: base_action_rule
+#: field:base.action.rule,model_id:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_email:0
+msgid "Mail to these Emails"
+msgstr "Send mail til disse e-postene"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_state:0
+msgid "Set State to"
+msgstr "Still stat til"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr "E-post fra"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Body"
+msgstr "E-post kropp"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Days"
+msgstr "Dager"
+
+#. module: base_action_rule
+#: field:base.action.rule,last_run:0
+msgid "Last Run"
+msgstr "Siste kjøring"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:328
+#, python-format
+msgid "Error!"
+msgstr "Feil!"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_reply_to:0
+msgid "Reply-To"
+msgstr "Svar til"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_cc:0
+msgid ""
+"These people will receive a copy of the future communication between partner "
+"and users by email"
+msgstr ""
+"Disse menneskene vil motta en kopi av den fremtidige kommunikasjon mellom "
+"partner og brukere av e-post"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Minutes"
+msgstr "Minutter"
+
+#. module: base_action_rule
+#: field:base.action.rule,name:0
+msgid "Rule Name"
+msgstr "Regelnavn"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_partner:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the partner."
+msgstr ""
+"Sjekk dette hvis du vil at regelen skal sende en påminnelse via e-post til "
+"partneren."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Partner"
+msgstr "Forholdene på Modell Partner"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Deadline"
+msgstr "Frist"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_subject)s = Object subject"
+msgstr "%(object_subject)s = Object subject"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr "E-post påminnelser"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Special Keywords to be Used in the Body"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_state_from:0
+msgid "State"
+msgstr "Stat"
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
+msgid ""
+"Use automated actions to automatically trigger actions for various screens. "
+"Example: a lead created by a specific user may be automatically set to a "
+"specific sales team, or an opportunity which still has status pending after "
+"14 days might trigger an automatic reminder email."
+msgstr ""
+"Bruke automatiserte tiltak for å automatisk utløse tiltak for ulike "
+"skjermer. Eksempel: en leder er opprettet av en bestemt bruker kan bli satt "
+"automatisk til en bestemt salgsteam, eller en mulighet som fortsatt har "
+"status påvente etter 14 dager kan utløse en automatisk påminnelse e-post."
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_to_email:0
+msgid "Email-id of the persons whom mail is to be sent"
+msgstr "E-post ID av personer som post skal sendes"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Action Rule"
+msgstr "Handling regel"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Fields to Change"
+msgstr "Felter å endre"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Creation Date"
+msgstr "Opprettelsesdato"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Last Action Date"
+msgstr "Siste handlingsdato"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Hours"
+msgstr "Timer"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_id)s = Object ID"
+msgstr "%(object_ID)s = Object ID"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Delay After Trigger Date"
+msgstr "Forsinkelse Etter utløser Dato"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_attach:0
+msgid "Remind with Attachment"
+msgstr "Minn med vedlegg"
+
+#. module: base_action_rule
+#: constraint:ir.cron:0
+msgid "Invalid arguments"
+msgstr "Ugyldige argumenter"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_user_id:0
+msgid "Set Responsible to"
+msgstr "Satt Ansvarlig for å"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "None"
+msgstr "Ingen"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_to:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'To' field of the header"
+msgstr ""
+"Bruk en python uttrykk for å angi høyre feltet på hvilken enn vi vil bruke "
+"for Til-feltet på header."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_phone)s = Responsible phone"
+msgstr "% (object_bruker_telefonen) s = Ansvarlig telefon"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid ""
+"The rule uses the AND operator. The model must match all non-empty fields so "
+"that the rule executes the action described in the 'Actions' tab."
+msgstr ""
+"Regelen bruker AND-operatoren. Modellen må matche alle-ikke tomme felt, slik "
+"at regelen utfører handlingen som er beskrevet i \"Handlinger\"-fanen."
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range_type:0
+msgid "Delay type"
+msgstr "forsinkelse typen"
+
+#. module: base_action_rule
+#: help:base.action.rule,regex_name:0
+msgid ""
+"Regular expression for matching name of the resource\n"
+"e.g.: 'urgent.*' will search for records having name starting with the "
+"string 'urgent'\n"
+"Note: This is case sensitive search."
+msgstr ""
+"Regulært uttrykk for matchende navnet på ressursen\n"
+"f.eks: \". haster * 'vil søke etter poster som har navn som starter med "
+"strengen\" haster \"\n"
+"Merk: Dette er små bokstaver søk."
+
+#. module: base_action_rule
+#: field:base.action.rule,act_method:0
+msgid "Call Object Method"
+msgstr "Kall objektmetode"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr "E-post til."
+
+#. module: base_action_rule
+#: help:base.action.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 ""
+"Sjekk dette hvis du vil at regelen skal merkes CC (mail til en annen person "
+"som er definert i handlinger)."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner)s = Partner name"
+msgstr "%(partner)s = Navn på partner"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Note"
+msgstr "Notat"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_email_from:0
+msgid ""
+"Use a python expression to specify the right field on which one than we will "
+"use for the 'From' field of the header"
+msgstr ""
+"Bruk en python uttrykk for å angi høyre feltet på hvilken enn vi vil bruke "
+"for Fra-feltet på overskriften"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_range:0
+msgid "Delay after trigger date"
+msgstr "Forsinkelse etter triggerdato"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions"
+msgstr "Betingelser"
+
+#. module: base_action_rule
+#: help:base.action.rule,trg_date_range:0
+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 ""
+"Forsinkelse Etter utløser Dato, spesifiserer du kan sette et negativt tall. "
+"Hvis du trenger en forsinkelse før avtrekkeren dato, som å sende en "
+"påminnelse 15 minutter før et møte."
+
+#. module: base_action_rule
+#: field:base.action.rule,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: base_action_rule
+#: code:addons/base_action_rule/base_action_rule.py:329
+#, python-format
+msgid "No Email ID Found for your Company address!"
+msgstr ""
+
+#. module: base_action_rule
+#: field:base.action.rule,act_remind_user:0
+msgid "Remind Responsible"
+msgstr "Minn Ansvarlig"
+
+#. module: base_action_rule
+#: help:base.action.rule,sequence:0
+msgid "Gives the sequence order when displaying a list of rules."
+msgstr "Gir sekvens ordre når du viser en liste over regler."
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_range_type:0
+msgid "Months"
+msgstr "Måneder"
+
+#. module: base_action_rule
+#: field:base.action.rule,filter_id:0
+msgid "Filter"
+msgstr "Filtrer"
+
+#. module: base_action_rule
+#: selection:base.action.rule,trg_date_type:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: base_action_rule
+#: help:base.action.rule,server_action_id:0
+msgid ""
+"Describes the action name.\n"
+"eg:on which object which action to be taken on basis of which condition"
+msgstr ""
+"Beskriver handlingens navn.\n"
+"f.eks: på hvilket objekt som tiltak som skal iverksettes på grunnlag av "
+"hvilken tilstand"
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_ir_cron
+msgid "ir.cron"
+msgstr "ir.actions.actions"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_description)s = Object description"
+msgstr "% (object_beskrivelse) s = Object beskrivelse"
+
+#. module: base_action_rule
+#: constraint:base.action.rule:0
+msgid "Error: The mail is not well formated"
+msgstr "Feil: E-posten er ikke godt nok formatert"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Actions"
+msgstr "E-post handlinger"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Email Information"
+msgstr "E-post Informasjon"
+
+#. module: base_action_rule
+#: model:ir.model,name:base_action_rule.model_base_action_rule
+msgid "Action Rules"
+msgstr "Handlingsregler"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_mail_body:0
+msgid "Content of mail"
+msgstr "Innholdet av post"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_user_id:0
+msgid "Responsible"
+msgstr "Ansvarlig"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(partner_email)s = Partner Email"
+msgstr "% (partner_e-post) s = Partner E-post"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_date)s = Creation date"
+msgstr "%(object_dato)s = opprettelsesdato"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user_email)s = Responsible Email"
+msgstr "% (object_brukerens_e-post) s = Ansvarlig e-post"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_body:0
+msgid "Mail body"
+msgstr "Mail kropp"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_user:0
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
+msgstr ""
+"Kryss av her hvis du vil at regelen skal sende en påminnelse til brukeren "
+"via e-post."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Server Action to be Triggered"
+msgstr "Server Tiltak som skal Utløses"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_mail_to_user:0
+msgid "Mail to Responsible"
+msgstr "send mail til ansvarlig"
+
+#. module: base_action_rule
+#: field:base.action.rule,act_email_cc:0
+msgid "Add Watchers (Cc)"
+msgstr "Legg til overvåkere (Cc)"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Model Fields"
+msgstr "Forholdene på Modell Felter"
+
+#. module: base_action_rule
+#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act
+#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form
+msgid "Automated Actions"
+msgstr "Automatiserte handinger"
+
+#. module: base_action_rule
+#: field:base.action.rule,server_action_id:0
+msgid "Server Action"
+msgstr "Tjenerhandling"
+
+#. module: base_action_rule
+#: field:base.action.rule,regex_name:0
+msgid "Regex on Resource Name"
+msgstr "Regex på Ressursnavn"
+
+#. module: base_action_rule
+#: help:base.action.rule,act_remind_attach:0
+msgid ""
+"Check this if you want that all documents attached to the object be attached "
+"to the reminder email sent."
+msgstr ""
+"Kryss av her om du vil at alle dokumenter knyttet til objektet festes til "
+"påminnelse e-post sendt."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on Timing"
+msgstr "Vilkår for timing"
+
+#. module: base_action_rule
+#: field:base.action.rule,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Actions"
+msgstr "Handlinger"
+
+#. module: base_action_rule
+#: help:base.action.rule,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the rule "
+"without removing it."
+msgstr ""
+"Hvis det aktive feltet er satt til False, vil det tillate deg å skjule "
+"regelen uten å fjerne den."
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "%(object_user)s = Responsible name"
+msgstr "% (object_bruker) s = Ansvarlig navn"
+
+#. module: base_action_rule
+#: field:base.action.rule,create_date:0
+msgid "Create Date"
+msgstr "Opprettet dato"
+
+#. module: base_action_rule
+#: view:base.action.rule:0
+msgid "Conditions on States"
+msgstr "Vilkår for tilstander"
+
+#. module: base_action_rule
+#: field:base.action.rule,trg_date_type:0
+msgid "Trigger Date"
+msgstr "Uttløser dato"
+
+#~ msgid "Special Keywords to Be Used in The Body"
+#~ msgstr "Spesielle nøkkelord for bruk i meldingsinnhold"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Ingen E-post ID funnet for din firmaadresse!"
diff --git a/addons/base_action_rule/i18n/nl.po b/addons/base_action_rule/i18n/nl.po
index b70d99d873f..0b631fbc97e 100644
--- a/addons/base_action_rule/i18n/nl.po
+++ b/addons/base_action_rule/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-02 15:02+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/pl.po b/addons/base_action_rule/i18n/pl.po
index da30bd781ef..2eb9a39e540 100644
--- a/addons/base_action_rule/i18n/pl.po
+++ b/addons/base_action_rule/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -46,7 +46,7 @@ msgstr ""
 #. module: base_action_rule
 #: field:base.action.rule,model_id:0
 msgid "Object"
-msgstr ""
+msgstr "Obiekt"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_mail_to_email:0
diff --git a/addons/base_action_rule/i18n/pt.po b/addons/base_action_rule/i18n/pt.po
index fadf1cf4a3d..28769fee6ed 100644
--- a/addons/base_action_rule/i18n/pt.po
+++ b/addons/base_action_rule/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/pt_BR.po b/addons/base_action_rule/i18n/pt_BR.po
index b50b6fe73e7..54b6cdd2c77 100644
--- a/addons/base_action_rule/i18n/pt_BR.po
+++ b/addons/base_action_rule/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 14:59+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -115,7 +116,7 @@ msgstr "Nome da Regra"
 msgid ""
 "Check this if you want the rule to send a reminder by email to the partner."
 msgstr ""
-"Verifique isto se quiser a regra para enviar um aviso por e-mail para o "
+"Selecione aqui se quiser a regra para enviar um aviso por e-mail para o "
 "parceiro."
 
 #. module: base_action_rule
@@ -126,7 +127,7 @@ msgstr "Condições no Modelo de Parceiro"
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
 msgid "Deadline"
-msgstr "Prazo"
+msgstr "Prazo Final"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_partner_id:0
@@ -136,7 +137,7 @@ msgstr "Parceiro"
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_subject)s = Object subject"
-msgstr "%(object_subject)s = Objeto assunto"
+msgstr "%(object_subject)s = Assunto do Objeto"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -151,7 +152,7 @@ msgstr "Palavras Chave especiais para ser Usadas no Corpo"
 #. module: base_action_rule
 #: field:base.action.rule,trg_state_from:0
 msgid "State"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: base_action_rule
 #: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act
diff --git a/addons/base_action_rule/i18n/ro.po b/addons/base_action_rule/i18n/ro.po
index 77f7cbe419a..b9ecd636ec8 100644
--- a/addons/base_action_rule/i18n/ro.po
+++ b/addons/base_action_rule/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/ru.po b/addons/base_action_rule/i18n/ru.po
index 85ec32c4367..bb8568261cb 100644
--- a/addons/base_action_rule/i18n/ru.po
+++ b/addons/base_action_rule/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/sl.po b/addons/base_action_rule/i18n/sl.po
index 50e71449103..9e305feff8a 100644
--- a/addons/base_action_rule/i18n/sl.po
+++ b/addons/base_action_rule/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/sq.po b/addons/base_action_rule/i18n/sq.po
index d92f72b679e..bfff1d3ab4b 100644
--- a/addons/base_action_rule/i18n/sq.po
+++ b/addons/base_action_rule/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/sr.po b/addons/base_action_rule/i18n/sr.po
index d8a0102b30f..0d4f5e69257 100644
--- a/addons/base_action_rule/i18n/sr.po
+++ b/addons/base_action_rule/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/sr@latin.po b/addons/base_action_rule/i18n/sr@latin.po
index 4d471d2c230..e6d580fe25c 100644
--- a/addons/base_action_rule/i18n/sr@latin.po
+++ b/addons/base_action_rule/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/sv.po b/addons/base_action_rule/i18n/sv.po
index bcc7ec3c4bf..65e461a670f 100644
--- a/addons/base_action_rule/i18n/sv.po
+++ b/addons/base_action_rule/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -95,6 +95,8 @@ msgid ""
 "These people will receive a copy of the future communication between partner "
 "and users by email"
 msgstr ""
+"Dessa personer kommer att få en kopia av framtida kommunikationer mellan "
+"företaget och användaren via mail."
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_range_type:0
@@ -111,6 +113,8 @@ msgstr "Regelnamn"
 msgid ""
 "Check this if you want the rule to send a reminder by email to the partner."
 msgstr ""
+"Markera detta om du vill att regeln ska skicka en påminnelse via mail till "
+"företaget."
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -169,7 +173,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Fields to Change"
-msgstr ""
+msgstr "Fält att ändra"
 
 #. module: base_action_rule
 #: selection:base.action.rule,trg_date_type:0
@@ -199,7 +203,7 @@ msgstr "Ledtid efter utlösningsdatum"
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_attach:0
 msgid "Remind with Attachment"
-msgstr ""
+msgstr "Påminn med bifogad fil"
 
 #. module: base_action_rule
 #: constraint:ir.cron:0
@@ -269,7 +273,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(partner)s = Partner name"
-msgstr ""
+msgstr "%(partner)s = Företagsnamn"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -367,7 +371,7 @@ msgstr ""
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Information"
-msgstr ""
+msgstr "E-postinformation"
 
 #. module: base_action_rule
 #: model:ir.model,name:base_action_rule.model_base_action_rule
@@ -377,7 +381,7 @@ msgstr ""
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_body:0
 msgid "Content of mail"
-msgstr ""
+msgstr "E-postinnehåll"
 
 #. module: base_action_rule
 #: field:base.action.rule,trg_user_id:0
@@ -497,3 +501,7 @@ msgstr ""
 
 #~ msgid "Special Keywords to Be Used in The Body"
 #~ msgstr "Speciella nyckelord att använda i brödtexten"
+
+#, python-format
+#~ msgid "No E-Mail ID Found for your Company address!"
+#~ msgstr "Inget E-mail-ID hittat för din bolagsadress!"
diff --git a/addons/base_action_rule/i18n/tr.po b/addons/base_action_rule/i18n/tr.po
index 75fa9df83b3..eed1321b13c 100644
--- a/addons/base_action_rule/i18n/tr.po
+++ b/addons/base_action_rule/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_action_rule/i18n/zh_CN.po b/addons/base_action_rule/i18n/zh_CN.po
index 1dc78ba4bad..b593c2ba179 100644
--- a/addons/base_action_rule/i18n/zh_CN.po
+++ b/addons/base_action_rule/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:50+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-10-25 16:32+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
@@ -315,7 +315,7 @@ msgstr "激活"
 #: code:addons/base_action_rule/base_action_rule.py:329
 #, python-format
 msgid "No Email ID Found for your Company address!"
-msgstr ""
+msgstr "公司地址中没有设置Email !"
 
 #. module: base_action_rule
 #: field:base.action.rule,act_remind_user:0
diff --git a/addons/base_action_rule/i18n/zh_TW.po b/addons/base_action_rule/i18n/zh_TW.po
index 803c62dd641..1c27ba2a1b8 100644
--- a/addons/base_action_rule/i18n/zh_TW.po
+++ b/addons/base_action_rule/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_user:0
diff --git a/addons/base_calendar/__init__.py b/addons/base_calendar/__init__.py
index ec4f5070d63..b6447567083 100644
--- a/addons/base_calendar/__init__.py
+++ b/addons/base_calendar/__init__.py
@@ -21,6 +21,5 @@
 
 import base_calendar
 import crm_meeting
-import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 58f666baa0d..313ddb8453a 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -20,40 +20,37 @@
 ##############################################################################
 
 {
-    "name": "Calendar Layer",
-    "version": "1.0",
-    "depends": ["base", "base_status", "mail", "base_action_rule"],
+    'name': 'Calendar',
+    'version': '1.0',
+    'depends': ['base', 'base_status', 'mail', 'base_action_rule'],
+    'summary': 'Personal & Shared Calendar',
     'description': """
 This is a full-featured calendar system.
 ========================================
 
 It supports:
+------------
     - Calendar of events
-    - Alerts (create requests)
     - Recurring events
-    - Invitations to people
 
 If you need to manage your meetings, you should install the CRM module.
     """,
-    "author": "OpenERP SA",
+    'author': 'OpenERP SA',
     'category': 'Hidden/Dependency',
     'website': 'http://www.openerp.com',
-    "init_xml": [
+    'demo': ['crm_meeting_demo.xml'],
+    'data': [
+        'security/calendar_security.xml',
+        'security/ir.model.access.csv',
+        'base_calendar_view.xml',
+        'crm_meeting_view.xml',
         'base_calendar_data.xml',
         'crm_meeting_data.xml',
     ],
-    "demo_xml": ['crm_meeting_demo.xml'],
-    "update_xml": [
-        'security/calendar_security.xml',
-        'security/ir.model.access.csv',
-        'wizard/base_calendar_invite_attendee_view.xml',
-        'base_calendar_view.xml',
-        'crm_meeting_view.xml',
-    ],
-    "test" : ['test/base_calendar_test.yml'],
-    "installable": True,
-    "auto_install": False,
-    "certificate": "00694071962960352821",
+    'test' : ['test/base_calendar_test.yml'],
+    'installable': True,
+    'application': True,
+    'auto_install': False,
     'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',],
 }
 
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index be3244f8a5b..d225c3f90d9 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -39,11 +39,11 @@ months = {
 
 def get_recurrent_dates(rrulestring, exdate, startdate=None, exrule=None):
     """
-    Get recurrent dates based on Rule string considering exdate and start date
-    @param rrulestring: Rulestring
-    @param exdate: List of exception dates for rrule
-    @param startdate: Startdate for computing recurrent dates
-    @return: List of Recurrent dates
+    Get recurrent dates based on Rule string considering exdate and start date.
+    @param rrulestring: rulestring
+    @param exdate: list of exception dates for rrule
+    @param startdate: startdate for computing recurrent dates
+    @return: list of Recurrent dates
     """
     def todate(date):
         val = parser.parse(''.join((re.compile('\d')).findall(date)))
@@ -67,11 +67,12 @@ def get_recurrent_dates(rrulestring, exdate, startdate=None, exrule=None):
 
 def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
     """
-    This function converts virtual event id into real id of actual event
-    @param base_calendar_id: Id of calendar
-    @param with_date: If value passed to this param it will return dates based on value of withdate + base_calendar_id
+    Convert a "virtual/recurring event id" (type string) into a real event id (type int).
+    E.g. virtual/recurring event id is 4-20091201100000, so it will return 4.
+    @param base_calendar_id: id of calendar
+    @param with_date: if a value is passed to this param it will return dates based on value of withdate + base_calendar_id
+    @return: real event id
     """
-
     if base_calendar_id and isinstance(base_calendar_id, (str, unicode)):
         res = base_calendar_id.split('-')
 
@@ -89,12 +90,13 @@ def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
 
 def real_id2base_calendar_id(real_id, recurrent_date):
     """
-    Convert  real id of record into virtual id using recurrent_date
-    e.g. real id is 1 and recurrent_date is 01-12-2009 10:00:00 then it will return
-        1-20091201100000
-    @return: real id with recurrent date.
+    Convert a real event id (type int) into a "virtual/recurring event id" (type string).
+    E.g. real event id is 1 and recurrent_date is set to 01-12-2009 10:00:00, so
+    it will return 1-20091201100000.
+    @param real_id: real event id
+    @param recurrent_date: real event recurrent date
+    @return: string containing the real id and the recurrent date
     """
-
     if real_id and recurrent_date:
         recurrent_date = time.strftime("%Y%m%d%H%M%S", \
                             time.strptime(recurrent_date, "%Y-%m-%d %H:%M:%S"))
@@ -104,10 +106,10 @@ def real_id2base_calendar_id(real_id, recurrent_date):
 def _links_get(self, cr, uid, context=None):
     """
     Get request link.
-    @param cr: the current row, from the database cursor,
-    @param uid: the current user’s ID for security checks,
-    @param context: A standard dictionary for contextual values
-    @return: list of dictionary which contain object and name and id.
+    @param cr: the current row, from the database cursor
+    @param uid: the current user's ID for security checks
+    @param context: a standard dictionary for contextual values
+    @return: list of dictionary which contain object and name and id
     """
     obj = self.pool.get('res.request.link')
     ids = obj.search(cr, uid, [])
@@ -216,9 +218,9 @@ class calendar_attendee(osv.osv):
 
     def _get_address(self, name=None, email=None):
         """
-        Gives email information in ical CAL-ADDRESS type format
-        @param name: Name for CAL-ADDRESS value
-        @param email: Email address for CAL-ADDRESS value
+        Gives email information in ical CAL-ADDRESS type format.
+        @param name: name for CAL-ADDRESS value
+        @param email: email address for CAL-ADDRESS value
         """
         if name and email:
             name += ':'
@@ -226,13 +228,13 @@ class calendar_attendee(osv.osv):
 
     def _compute_data(self, cr, uid, ids, name, arg, context=None):
         """
-        Compute data on function fields for attendee values .
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of calendar attendee’s IDs.
-        @param name: name of field.
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary of form {id: {'field Name': value'}}.
+        Compute data on function fields for attendee values.
+        @param cr: the current row, from the database cursor
+        @param uid: the current user's ID for security checks
+        @param ids: list of calendar attendee's IDs
+        @param name: name of field
+        @param context: a standard dictionary for contextual values
+        @return: dictionary of form {id: {'field Name': value'}}
         """
         name = name[0]
         result = {}
@@ -297,10 +299,10 @@ class calendar_attendee(osv.osv):
     def _links_get(self, cr, uid, context=None):
         """
         Get request link for ref field in calendar attendee.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
+        @param cr: the current row, from the database cursor
+        @param uid: the current user's id for security checks
         @param context: A standard dictionary for contextual values
-        @return: list of dictionary which contain object and name and id.
+        @return: list of dictionary which contain object and name and id
         """
         obj = self.pool.get('res.request.link')
         ids = obj.search(cr, uid, [])
@@ -310,10 +312,10 @@ class calendar_attendee(osv.osv):
     def _lang_get(self, cr, uid, context=None):
         """
         Get language for language selection field.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values
-        @return: list of dictionary which contain code and name and id.
+        @param cr: the current row, from the database cursor
+        @param uid: the current user's id for security checks
+        @param context: a standard dictionary for contextual values
+        @return: list of dictionary which contain code and name and id
         """
         obj = self.pool.get('res.lang')
         ids = obj.search(cr, uid, [])
@@ -334,7 +336,7 @@ class calendar_attendee(osv.osv):
                     ('non-participant', 'For information Purpose')], 'Role', \
                     help='Participation role for the calendar user'),
         'state': fields.selection([('needs-action', 'Needs Action'),
-                        ('tentative', 'Tentative'),
+                        ('tentative', 'Uncertain'),
                         ('declined', 'Declined'),
                         ('accepted', 'Accepted'),
                         ('delegated', 'Delegated')], 'Status', readonly=True, \
@@ -375,7 +377,6 @@ property or property parameter."),
         'ref': fields.reference('Event Ref', selection=_links_get, size=128),
         'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"),
     }
-
     _defaults = {
         'state': 'needs-action',
         'role': 'req-participant',
@@ -388,12 +389,12 @@ property or property parameter."),
 
     def get_ics_file(self, cr, uid, event_obj, context=None):
         """
-        Returns iCalendar file for the event invitation
-        @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 event_obj: Event object (browse record)
-        @param context: A standard dictionary for contextual values
+        Returns iCalendar file for the event invitation.
+        @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 event_obj: event object (browse record)
+        @param context: a standard dictionary for contextual values
         @return: .ics file content
         """
         res = None
@@ -471,18 +472,10 @@ property or property parameter."),
     def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context=None):
         """
         Send mail for event invitation to event attendees.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of attendee’s IDs.
-        @param email_from: Email address for user sending the mail
-        @param context: A standard dictionary for contextual values
+        @param email_from: email address for user sending the mail
         @return: True
         """
-        if context is None:
-            context = {}
-
         company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
-        mail_message = self.pool.get('mail.message')
         for att in self.browse(cr, uid, ids, context=context):
             sign = att.sent_by_uid and att.sent_by_uid.signature or ''
             sign = '<br>'.join(sign and sign.split('\n') or [])
@@ -508,27 +501,28 @@ property or property parameter."),
                 }
                 body = html_invitation % body_vals
                 if mail_to and email_from:
-                    attach = self.get_ics_file(cr, uid, res_obj, context=context)
-                    mail_message.schedule_with_attach(cr, uid,
-                        email_from,
-                        mail_to,
-                        sub,
-                        body,
-                        attachments=attach and {'invitation.ics': attach} or None,
-                        content_subtype='html',
-                        reply_to=email_from,
-                        context=context
-                    )
+                    ics_file = self.get_ics_file(cr, uid, res_obj, context=context)
+                    vals = {'email_from': email_from,
+                            'email_to': mail_to,
+                            'state': 'outgoing',
+                            'subject': sub,
+                            'body_html': body,
+                            'auto_delete': True}
+                    if ics_file:
+                        vals['attachment_ids'] = [(0,0,{'name': 'invitation.ics',
+                                                        'datas_fname': 'invitation.ics',
+                                                        'datas': str(ics_file).encode('base64')})]
+                    self.pool.get('mail.mail').create(cr, uid, vals, context=context)
             return True
 
     def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv):
         """
         Make entry on email and availbility on change of user_id field.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of calendar attendee’s IDs.
-        @param user_id: Changed value of User id
-        @return: dictionary of value. which put value in email and availability fields.
+        @param cr: the current row, from the database cursor
+        @param uid: the current user's ID for security checks
+        @param ids: list of calendar attendee's IDs
+        @param user_id: changed value of User id
+        @return: dictionary of values which put value in email and availability fields
         """
 
         if not user_id:
@@ -538,24 +532,25 @@ property or property parameter."),
         return {'value': {'email': user.email, 'availability':user.availability}}
 
     def do_tentative(self, cr, uid, ids, context=None, *args):
-        """ Makes event invitation as Tentative
-        @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 calendar attendee’s IDs
-        @param *args: Get Tupple value
-        @param context: A standard dictionary for contextual values
+        """
+        Makes event invitation as Tentative.
+        @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 calendar attendee's IDs
+        @param *args: get Tupple value
+        @param context: a standard dictionary for contextual values
         """
         return self.write(cr, uid, ids, {'state': 'tentative'}, context)
 
     def do_accept(self, cr, uid, ids, context=None, *args):
         """
-        Update state of invitation as Accepted and
-        if the invited user is other then event user it will make a copy of this event for invited user
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of calendar attendee’s IDs.
-        @param context: A standard dictionary for contextual values
+        Update state of invitation as Accepted and if the invited user is other
+        then event user it will make a copy of this event for invited user.
+        @param cr: the current row, from the database cursor
+        @param uid: the current user's ID for security checks
+        @param ids: list of calendar attendee's IDs
+        @param context: a standard dictionary for contextual values
         @return: True
         """
         if context is None:
@@ -564,32 +559,36 @@ property or property parameter."),
         for vals in self.browse(cr, uid, ids, context=context):
             if vals.ref and vals.ref.user_id:
                 mod_obj = self.pool.get(vals.ref._name)
-                defaults = {'user_id': vals.user_id.id, 'organizer_id': vals.ref.user_id.id}
+                res=mod_obj.read(cr,uid,[vals.ref.id],['duration','class'],context)
+                defaults = {'user_id': vals.user_id.id, 'organizer_id': vals.ref.user_id.id,'duration':res[0]['duration'],'class':res[0]['class']}
                 mod_obj.copy(cr, uid, vals.ref.id, default=defaults, context=context)
             self.write(cr, uid, vals.id, {'state': 'accepted'}, context)
 
         return True
 
     def do_decline(self, cr, uid, ids, context=None, *args):
-        """ Marks event invitation as Declined
-        @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 calendar attendee’s IDs
-        @param *args: Get Tupple value
-        @param context: A standard dictionary for contextual values """
+        """
+        Marks event invitation as Declined.
+        @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 calendar attendee's IDs
+        @param *args: get Tupple value
+        @param context: a standard dictionary for contextual values
+        """
         if context is None:
             context = {}
         return self.write(cr, uid, ids, {'state': 'declined'}, context)
 
     def create(self, cr, uid, vals, context=None):
-        """ Overrides orm create method.
+        """
+        Overrides orm create method.
         @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 vals: Get Values
-        @param context: A standard dictionary for contextual values """
-
+        @param cr: the current row, from the database cursor
+        @param uid: the current user's ID for security checks
+        @param vals: get Values
+        @param context: a standard dictionary for contextual values
+        """
         if context is None:
             context = {}
         if not vals.get("email") and vals.get("cn"):
@@ -599,6 +598,7 @@ property or property parameter."),
             vals['cn'] = vals.get("cn")
         res = super(calendar_attendee, self).create(cr, uid, vals, context)
         return res
+
 calendar_attendee()
 
 class res_alarm(osv.osv):
@@ -637,8 +637,8 @@ true, it will allow you to hide the event alarm information without removing it.
         """
         Create Alarm for event.
         @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of res alarm’s IDs.
+        @param uid: the current user's ID for security checks,
+        @param ids: List of res alarm's IDs.
         @param model: Model name.
         @param date: Event date
         @param context: A standard dictionary for contextual values
@@ -711,8 +711,8 @@ true, it will allow you to hide the event alarm information without removing it.
         """
         Delete alarm specified in ids
         @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of res alarm’s IDs.
+        @param uid: the current user's ID for security checks,
+        @param ids: List of res alarm's IDs.
         @param model: Model name for which alarm is to be cleared.
         @return: True
         """
@@ -722,12 +722,12 @@ true, it will allow you to hide the event alarm information without removing it.
         ir_obj = self.pool.get('ir.model')
         model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
         model_obj = self.pool.get(model)
-        for datas in model_obj.browse(cr, uid, ids, context=context):
-            alarm_ids = alarm_obj.search(cr, uid, [('model_id', '=', model_id), ('res_id', '=', datas.id)])
+        for data in model_obj.browse(cr, uid, ids, context=context):
+            alarm_ids = alarm_obj.search(cr, uid, [('model_id', '=', model_id), ('res_id', '=', data.id)])
             if alarm_ids:
                 alarm_obj.unlink(cr, uid, alarm_ids)
                 cr.execute('Update %s set base_calendar_alarm_id=NULL, alarm_id=NULL\
-                            where id=%%s' % model_obj._table,(datas.id,))
+                            where id=%%s' % model_obj._table,(data.id,))
         return True
 
 res_alarm()
@@ -780,7 +780,7 @@ class calendar_alarm(osv.osv):
         Overrides orm create method.
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
-        @param vals: dictionary of fields value.{‘name_of_the_field’: value, ...}
+        @param vals: dictionary of fields value.{'name_of_the_field': value, ...}
         @param context: A standard dictionary for contextual values
         @return: new record id for calendar_alarm.
         """
@@ -805,14 +805,13 @@ class calendar_alarm(osv.osv):
         """Scheduler for event reminder
         @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 calendar alarm’s IDs.
+        @param uid: the current user's ID for security checks,
+        @param ids: List of calendar alarm's IDs.
         @param use_new_cursor: False or the dbname
         @param context: A standard dictionary for contextual values
         """
         if context is None:
             context = {}
-        mail_message = self.pool.get('mail.message')
         current_datetime = datetime.now()
         alarm_ids = self.search(cr, uid, [('state', '!=', 'done')], context=context)
 
@@ -849,36 +848,10 @@ class calendar_alarm(osv.osv):
             else:
                 re_dates = [alarm.trigger_date]
 
-            for r_date in re_dates:
-                ref = alarm.model_id.model + ',' + str(alarm.res_id)
-
-                # search for alreay sent requests
-                #if request_obj.search(cr, uid, [('trigger_date', '=', r_date), ('ref_doc1', '=', ref)], context=context):
-                    #continue
-
-                # Deactivated because of the removing of res.request
-                # TODO: when cleaning calendar module, re-add this in a new mechanism
-                #if alarm.action == 'display':
-                    #value = {
-                       #'name': alarm.name,
-                       #'act_from': alarm.user_id.id,
-                       #'act_to': alarm.user_id.id,
-                       #'body': alarm.description,
-                       #'trigger_date': r_date,
-                       #'ref_doc1': ref
-                    #}
-                    #request_id = request_obj.create(cr, uid, value)
-                    #request_ids = [request_id]
-                    #for attendee in res_obj.attendee_ids:
-                        #if attendee.user_id:
-                            #value['act_to'] = attendee.user_id.id
-                            #request_id = request_obj.create(cr, uid, value)
-                            #request_ids.append(request_id)
-                    #request_obj.request_send(cr, uid, request_ids)
-
+            if re_dates:
                 if alarm.action == 'email':
-                    sub = '[Openobject Reminder] %s' % (alarm.name)
-                    body = """
+                    sub = '[OpenERP Reminder] %s' % (alarm.name)
+                    body = """<pre>
 Event: %s
 Event Date: %s
 Description: %s
@@ -888,20 +861,21 @@ From:
 
 ----
 %s
-
+</pre>
 """  % (alarm.name, alarm.trigger_date, alarm.description, \
                         alarm.user_id.name, alarm.user_id.signature)
                     mail_to = [alarm.user_id.email]
                     for att in alarm.attendee_ids:
                         mail_to.append(att.user_id.email)
                     if mail_to:
-                        mail_message.schedule_with_attach(cr, uid,
-                            tools.config.get('email_from', False),
-                            mail_to,
-                            sub,
-                            body,
-                            context=context
-                        )
+                        vals = {
+                            'state': 'outgoing',
+                            'subject': sub,
+                            'body_html': body,
+                            'email_to': mail_to,
+                            'email_from': tools.config.get('email_from', mail_to),
+                        }
+                        self.pool.get('mail.mail').create(cr, uid, vals, context=context)
             if next_trigger_date:
                 update_vals.update({'trigger_date': next_trigger_date})
             else:
@@ -924,8 +898,8 @@ class calendar_event(osv.osv):
         """Returns duration and/or end date based on values passed
         @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 calendar event’s IDs.
+        @param uid: the current user's ID for security checks,
+        @param ids: List of calendar event's IDs.
         @param start_date: Starting date
         @param duration: Duration between start date and end date
         @param end_date: Ending Datee
@@ -1000,14 +974,14 @@ class calendar_event(osv.osv):
         if not isinstance(ids, list):
             ids = [ids]
 
-        for datas in self.read(cr, uid, ids, ['id','byday','recurrency', 'month_list','end_date', 'rrule_type', 'select1', 'interval', 'count', 'end_type', 'mo', 'tu', 'we', 'th', 'fr', 'sa', 'su', 'exrule', 'day', 'week_list' ], context=context):
-            event = datas['id']
-            if datas.get('interval', 0) < 0:
+        for data in self.read(cr, uid, ids, ['id','byday','recurrency', 'month_list','end_date', 'rrule_type', 'select1', 'interval', 'count', 'end_type', 'mo', 'tu', 'we', 'th', 'fr', 'sa', 'su', 'exrule', 'day', 'week_list' ], context=context):
+            event = data['id']
+            if data.get('interval', 0) < 0:
                 raise osv.except_osv(_('Warning!'), _('Interval cannot be negative.'))
-            if datas.get('count', 0) < 0:
-                raise osv.except_osv(_('Warning!'), _('Count cannot be negative.'))
-            if datas['recurrency']:
-                result[event] = self.compute_rule_string(datas)
+            if data.get('count', 0) <= 0:
+                raise osv.except_osv(_('Warning!'), _('Count cannot be negative or 0.'))
+            if data['recurrency']:
+                result[event] = self.compute_rule_string(data)
             else:
                 result[event] = ""
         return result
@@ -1023,13 +997,12 @@ class calendar_event(osv.osv):
                 super(calendar_event, obj).write(cr, uid, ids, data, context=context)
         return True
 
-
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'sequence': fields.integer('Sequence'),
         'name': fields.char('Description', size=64, required=False, states={'done': [('readonly', True)]}),
         'date': fields.datetime('Date', states={'done': [('readonly', True)]}, required=True,),
-        'date_deadline': fields.datetime('Deadline', states={'done': [('readonly', True)]}, required=True,),
+        'date_deadline': fields.datetime('End Date', states={'done': [('readonly', True)]}, required=True,),
         'create_date': fields.datetime('Created', readonly=True),
         'duration': fields.float('Duration', states={'done': [('readonly', True)]}),
         'description': fields.text('Description', states={'done': [('readonly', True)]}),
@@ -1039,21 +1012,24 @@ class calendar_event(osv.osv):
         'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \
                                                 'Show Time as', states={'done': [('readonly', True)]}),
         'base_calendar_url': fields.char('Caldav URL', size=264),
-        'state': fields.selection([('tentative', 'Tentative'),
-                        ('cancelled', 'Cancelled'),
-                        ('confirmed', 'Confirmed'),
-                        ], 'Status', readonly=True),
+        'state': fields.selection([
+            ('tentative', 'Uncertain'),
+            ('cancelled', 'Cancelled'),
+            ('confirmed', 'Confirmed'),
+            ], 'Status', readonly=True),
         'exdate': fields.text('Exception Date/Times', help="This property \
 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 of time to exclude from the recurring rule."),
         'rrule': fields.function(_get_rulestring, type='char', size=124, \
                     fnct_inv=_rrule_write, store=True, string='Recurrent Rule'),
-        'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \
-                            ('weekly', 'Weekly'), ('monthly', 'Monthly'), \
-                            ('yearly', 'Yearly'),],
-                            'Recurrency', states={'done': [('readonly', True)]},
-                            help="Let the event automatically repeat at that interval"),
+        'rrule_type': fields.selection([
+            ('daily', 'Day(s)'),
+            ('weekly', 'Week(s)'),
+            ('monthly', 'Month(s)'),
+            ('yearly', 'Year(s)')
+            ], 'Recurrency', states={'done': [('readonly', True)]},
+            help="Let the event automatically repeat at that interval"),
         'alarm_id': fields.many2one('res.alarm', 'Reminder', states={'done': [('readonly', True)]},
                         help="Set an alarm at this time, before the event occurs" ),
         'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'),
@@ -1061,7 +1037,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         'recurrent_id': fields.datetime('Recurrent ID date'),
         'vtimezone': fields.selection(_tz_get, size=64, string='Timezone'),
         'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
-        'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent.
+        'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with organizer attribute of VEvent.
         'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}),
         'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence Termination'),
         'interval': fields.integer('Repeat Every', help="Repeat every (Days/Week/Month/Year)"),
@@ -1076,13 +1052,21 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         'select1': fields.selection([('date', 'Date of month'),
                                     ('day', 'Day of month')], 'Option'),
         'day': fields.integer('Date of month'),
-        'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \
-                                   ('WE', 'Wednesday'), ('TH', 'Thursday'), \
-                                   ('FR', 'Friday'), ('SA', 'Saturday'), \
-                                   ('SU', 'Sunday')], 'Weekday'),
-        'byday': fields.selection([('1', 'First'), ('2', 'Second'), \
-                                   ('3', 'Third'), ('4', 'Fourth'), \
-                                   ('5', 'Fifth'), ('-1', 'Last')], 'By day'),
+        'week_list': fields.selection([
+            ('MO', 'Monday'),
+            ('TU', 'Tuesday'),
+            ('WE', 'Wednesday'),
+            ('TH', 'Thursday'),
+            ('FR', 'Friday'),
+            ('SA', 'Saturday'),
+            ('SU', 'Sunday')], 'Weekday'),
+        'byday': fields.selection([
+            ('1', 'First'),
+            ('2', 'Second'),
+            ('3', 'Third'),
+            ('4', 'Fourth'),
+            ('5', 'Fifth'),
+            ('-1', 'Last')], 'By day'),
         'month_list': fields.selection(months.items(), 'Month'),
         'end_date': fields.date('Repeat Until'),
         'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel', \
@@ -1091,8 +1075,40 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         '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."),
         'recurrency': fields.boolean('Recurrent', help="Recurrent Meeting"),
+        'partner_ids': fields.many2many('res.partner', string='Attendees', states={'done': [('readonly', True)]}),
     }
 
+    def create_attendees(self, cr, uid, ids, context):
+        att_obj = self.pool.get('calendar.attendee')
+        user_obj = self.pool.get('res.users')
+        current_user = user_obj.browse(cr, uid, uid, context=context)
+        for event in self.browse(cr, uid, ids, context):
+            attendees = {}
+            for att in event.attendee_ids:
+                attendees[att.partner_id.id] = True
+            new_attendees = []
+            mail_to = []
+            for partner in event.partner_ids:
+                if partner.id in attendees:
+                    continue
+                att_id = self.pool.get('calendar.attendee').create(cr, uid, {
+                    'partner_id': partner.id,
+                    'user_id': partner.user_ids and partner.user_ids[0].id or False,
+                    'ref': self._name+','+str(event.id),
+                    'email': partner.email
+                }, context=context)
+                if partner.email:
+                    mail_to.append(partner.email)
+                self.write(cr, uid, [event.id], {
+                    'attendee_ids': [(4, att_id)]
+                }, context=context)
+                new_attendees.append(att_id)
+
+            if mail_to and current_user.email:
+                att_obj._send_mail(cr, uid, new_attendees, mail_to,
+                    email_from = current_user.email)
+        return True
+
     def default_organizer(self, cr, uid, context=None):
         user_pool = self.pool.get('res.users')
         user = user_pool.browse(cr, uid, uid, context=context)
@@ -1102,9 +1118,9 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         return res
 
     _defaults = {
-            'end_type' : 'count',
-            'count' : 1,
-            'rrule_type' : 'none',
+            'end_type': 'count',
+            'count': 1,
+            'rrule_type': False,
             'state': 'tentative',
             'class': 'public',
             'show_as': 'busy',
@@ -1115,23 +1131,34 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             'organizer': default_organizer,
     }
 
+    def _check_closing_date(self, cr, uid, ids, context=None):
+        for event in self.browse(cr, uid, ids, context=context):
+            if event.date_deadline < event.date:
+                return False
+        return True
+
+    _constraints = [
+        (_check_closing_date, 'Error ! End date cannot be set before start date.', ['date_deadline']),
+    ]
+
     def get_recurrent_ids(self, cr, uid, select, domain, limit=100, context=None):
         """Gives virtual event ids for recurring events based on value of Recurrence Rule
         This method gives ids of dates that comes between start date and end date of calendar views
         @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 uid: the current user's ID for security checks,
         @param limit: The Number of Results to Return """
         if not context:
             context = {}
 
         result = []
-        for data in super(calendar_event, self).read(cr, uid, select, context=context):
+        for data in super(calendar_event, self).read(cr, uid, select, ['rrule', 'exdate', 'exrule', 'date'], context=context):
             if not data['rrule']:
                 result.append(data['id'])
                 continue
             event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
-#                To check: If the start date is replace by event date .. the event date will be changed by that of calendar code
+
+            # TOCHECK: the start date should be replaced by event date; the event date will be changed by that of calendar code
 
             if not data['rrule']:
                 continue
@@ -1177,45 +1204,46 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             ids = list(set(result))
         return ids
 
-    def compute_rule_string(self, datas):
+    def compute_rule_string(self, data):
         """
         Compute rule string according to value type RECUR of iCalendar from the values given.
         @param self: the object pointer
-        @param datas: dictionary of freq and interval value.
+        @param data: dictionary of freq and interval value
+        @return: string containing recurring rule (empty if no rule)
         """
-        def get_week_string(freq, datas):
+        def get_week_string(freq, data):
             weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
             if freq == 'weekly':
-                byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas))
+                byday = map(lambda x: x.upper(), filter(lambda x: data.get(x) and x in weekdays, data))
                 if byday:
                     return ';BYDAY=' + ','.join(byday)
             return ''
 
-        def get_month_string(freq, datas):
+        def get_month_string(freq, data):
             if freq == 'monthly':
-                if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31):
+                if data.get('select1')=='date' and (data.get('day') < 1 or data.get('day') > 31):
                     raise osv.except_osv(_('Error!'), ("Please select a proper day of the month."))
 
-                if datas.get('select1')=='day':
-                    return ';BYDAY=' + datas.get('byday') + datas.get('week_list')
-                elif datas.get('select1')=='date':
-                    return ';BYMONTHDAY=' + str(datas.get('day'))
+                if data.get('select1')=='day':
+                    return ';BYDAY=' + data.get('byday') + data.get('week_list')
+                elif data.get('select1')=='date':
+                    return ';BYMONTHDAY=' + str(data.get('day'))
             return ''
 
-        def get_end_date(datas):
-            if datas.get('end_date'):
-                datas['end_date_new'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + 'T235959Z'
+        def get_end_date(data):
+            if data.get('end_date'):
+                data['end_date_new'] = ''.join((re.compile('\d')).findall(data.get('end_date'))) + 'T235959Z'
 
-            return (datas.get('end_type') == 'count' and (';COUNT=' + str(datas.get('count'))) or '') +\
-                             ((datas.get('end_date_new') and datas.get('end_type') == 'end_date' and (';UNTIL=' + datas.get('end_date_new'))) or '')
+            return (data.get('end_type') == 'count' and (';COUNT=' + str(data.get('count'))) or '') +\
+                             ((data.get('end_date_new') and data.get('end_type') == 'end_date' and (';UNTIL=' + data.get('end_date_new'))) or '')
 
-        freq=datas.get('rrule_type')
-        if freq == 'none':
-            return ''
+        freq = data.get('rrule_type', False)
+        res = ''
+        if freq:
+            interval_srting = data.get('interval') and (';INTERVAL=' + str(data.get('interval'))) or ''
+            res = 'FREQ=' + freq.upper() + get_week_string(freq, data) + interval_srting + get_end_date(data) + get_month_string(freq, data)
 
-        interval_srting = datas.get('interval') and (';INTERVAL=' + str(datas.get('interval'))) or ''
-
-        return 'FREQ=' + freq.upper() + get_week_string(freq, datas) + interval_srting + get_end_date(datas) + get_month_string(freq, datas)
+        return res
 
     def _get_empty_rrule_data(self):
         return  {
@@ -1239,19 +1267,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             'week_list' : False
         }
 
-    #def _write_rrule(self, cr, uid, ids, field_value, rule_date=False, context=None):
-    #    data = self._get_empty_rrule_data()
-    #
-    #    if field_value:
-    #        data['recurrency'] = True
-    #        for event in self.browse(cr, uid, ids, context=context):
-    #            rdate = rule_date or event.date
-    #            update_data = self._parse_rrule(field_value, dict(data), rdate)
-    #            data.update(update_data)
-    #            #parse_rrule
-    #            self.write(cr, uid, event.id, data, context=context)
-
-
     def _parse_rrule(self, rule, data, date_start):
         day_list = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su']
         rrule_type = ['yearly', 'monthly', 'weekly', 'daily']
@@ -1269,7 +1284,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
                 if i in r._byweekday:
                     data[day_list[i]] = True
             data['rrule_type'] = 'weekly'
-        #repeat monthly bynweekday ((weekday, weeknumber), )
+        #repeat monthly by nweekday ((weekday, weeknumber), )
         if r._bynweekday:
             data['week_list'] = day_list[r._bynweekday[0][0]].upper()
             data['byday'] = r._bynweekday[0][1]
@@ -1281,7 +1296,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             data['select1'] = 'date'
             data['rrule_type'] = 'monthly'
 
-        #yearly but for openerp it's monthly, take same information as monthly but interval is 12 times
+        #repeat yearly but for openerp it's monthly, take same information as monthly but interval is 12 times
         if r._bymonth:
             data['interval'] = data['interval'] * 12
 
@@ -1354,7 +1369,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             except Exception:
                 return True
 
-
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
         context = context or {}
         if isinstance(ids, (str, int, long)):
@@ -1375,14 +1389,14 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             data = self.read(cr, uid, event_id, ['date', 'date_deadline', \
                                                 'rrule', 'duration', 'exdate'])
             if data.get('rrule'):
-                data.update(vals)
-                data.update({
-                    'recurrent_uid': real_event_id,
-                    'recurrent_id': data.get('date'),
-                    'rrule_type': 'none',
-                    'rrule': '',
-                    'recurrency' : False,
-                    })
+                data.update(
+                    vals,
+                    recurrent_uid=real_event_id,
+                    recurrent_id=data.get('date'),
+                    rrule_type=False,
+                    rrule='',
+                    recurrency=False,
+                )
 
                 new_id = self.copy(cr, uid, real_event_id, default=data, context=context)
 
@@ -1399,6 +1413,8 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             vals['vtimezone'] = vals['vtimezone'][40:]
 
         res = super(calendar_event, self).write(cr, uid, ids, vals, context=context)
+        if vals.get('partner_ids', False):
+            self.create_attendees(cr, uid, ids, context)
 
         if ('alarm_id' in vals or 'base_calendar_alarm_id' in vals)\
                 or ('date' in vals or 'duration' in vals or 'date_deadline' in vals):
@@ -1424,7 +1440,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         return res
 
     def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
-        # FIXME This whole id mangling has to go!
         if context is None:
             context = {}
         fields2 = fields and fields[:] or None
@@ -1434,10 +1449,12 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             if fields and (f not in fields):
                 fields2.append(f)
 
+        # FIXME This whole id mangling has to go!
         if isinstance(ids, (str, int, long)):
             select = [ids]
         else:
             select = ids
+
         select = map(lambda x: (x, base_calendar_id2real_id(x)), select)
         result = []
 
@@ -1464,7 +1481,10 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             if r['class']=='private':
                 for f in r.keys():
                     if f not in ('id','date','date_deadline','duration','user_id','state'):
-                        r[f] = False
+                        if isinstance(r[f], list):
+                            r[f] = []
+                        else:
+                            r[f] = False
                     if f=='name':
                         r[f] = _('Busy')
 
@@ -1511,7 +1531,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         self.unlink_events(cr, uid, ids, context=context)
         return res
 
-
     def create(self, cr, uid, vals, context=None):
         if context is None:
             context = {}
@@ -1519,24 +1538,17 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
 
-        #updated_vals = self.onchange_dates(cr, uid, [],
-        #    vals.get('date', False),
-        #    vals.get('duration', False),
-        #    vals.get('date_deadline', False),
-        #    vals.get('allday', False),
-        #    context=context)
-        #vals.update(updated_vals.get('value', {}))
-
         res = super(calendar_event, self).create(cr, uid, vals, context)
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)
+        self.create_attendees(cr, uid, [res], context)
         return res
 
     def do_tentative(self, cr, uid, ids, context=None, *args):
         """ Makes event invitation as Tentative
         @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 uid: the current user's ID for security checks,
         @param ids: List of Event IDs
         @param *args: Get Tupple value
         @param context: A standard dictionary for contextual values
@@ -1547,7 +1559,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         """ Makes event invitation as Tentative
         @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 uid: the current user's ID for security checks,
         @param ids: List of Event IDs
         @param *args: Get Tupple value
         @param context: A standard dictionary for contextual values
@@ -1558,7 +1570,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         """ Makes event invitation as Tentative
         @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 uid: the current user's ID for security checks,
         @param ids: List of Event IDs
         @param *args: Get Tupple value
         @param context: A standard dictionary for contextual values
@@ -1579,9 +1591,9 @@ class calendar_todo(osv.osv):
         Get Date
         @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 uid: the current user's ID for security checks,
         @param ids: List of calendar todo's IDs.
-        @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+        @param args: list of tuples of form [(‘name_of_the_field', ‘operator', value), ...].
         @param context: A standard dictionary for contextual values
         """
 
@@ -1595,10 +1607,10 @@ class calendar_todo(osv.osv):
         Set Date
         @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 uid: the current user's ID for security checks,
         @param id: calendar's ID.
         @param value: Get Value
-        @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...].
+        @param args: list of tuples of form [('name_of_the_field', 'operator', value), ...].
         @param context: A standard dictionary for contextual values
         """
 
@@ -1616,36 +1628,6 @@ class calendar_todo(osv.osv):
 
 calendar_todo()
 
-class ir_attachment(osv.osv):
-    _name = 'ir.attachment'
-    _inherit = 'ir.attachment'
-
-    def search_count(self, cr, user, args, context=None):
-        new_args = []
-        for domain_item in args:
-            if isinstance(domain_item, (list, tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_id':
-                new_args.append((domain_item[0], domain_item[1], base_calendar_id2real_id(domain_item[2])))
-            else:
-                new_args.append(domain_item)
-        return super(ir_attachment, self).search_count(cr, user, new_args, context)
-
-    def create(self, cr, uid, vals, context=None):
-        if context:
-            id = context.get('default_res_id', False)
-            context.update({'default_res_id' : base_calendar_id2real_id(id)})
-        return super(ir_attachment, self).create(cr, uid, vals, context=context)
-
-    def search(self, cr, uid, args, offset=0, limit=None, order=None,
-            context=None, count=False):
-        new_args = []
-        for domain_item in args:
-            if isinstance(domain_item, (list, tuple)) and len(domain_item) == 3 and domain_item[0] == 'res_id':
-                new_args.append((domain_item[0], domain_item[1], base_calendar_id2real_id(domain_item[2])))
-            else:
-                new_args.append(domain_item)
-        return super(ir_attachment, self).search(cr, uid, new_args, offset=offset,
-                            limit=limit, order=order, context=context, count=False)
-ir_attachment()
 
 class ir_values(osv.osv):
     _inherit = 'ir.values'
@@ -1656,7 +1638,7 @@ class ir_values(osv.osv):
         Set IR 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 uid: the current user's ID for security checks,
         @param model: Get The Model
         """
 
@@ -1675,7 +1657,7 @@ class ir_values(osv.osv):
         Get IR 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 uid: the current user's ID for security checks,
         @param model: Get The Model
         """
         if context is None:
@@ -1701,8 +1683,8 @@ class ir_model(osv.osv):
         Overrides orm read method.
         @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 IR Model’s IDs.
+        @param uid: the current user's ID for security checks,
+        @param ids: List of IR Model's IDs.
         @param context: A standard dictionary for contextual values
         """
         new_ids = isinstance(ids, (str, int, long)) and [ids] or ids
@@ -1719,24 +1701,24 @@ ir_model()
 
 class virtual_report_spool(web_services.report_spool):
 
-    def exp_report(self, db, uid, object, ids, datas=None, context=None):
+    def exp_report(self, db, uid, object, ids, data=None, context=None):
         """
         Export Report
         @param self: The object pointer
         @param db: get the current database,
-        @param uid: the current user’s ID for security checks,
+        @param uid: the current user's ID for security checks,
         @param context: A standard dictionary for contextual values
         """
 
         if object == 'printscreen.list':
             return super(virtual_report_spool, self).exp_report(db, uid, \
-                            object, ids, datas, context)
+                            object, ids, data, context)
         new_ids = []
         for id in ids:
             new_ids.append(base_calendar_id2real_id(id))
-        if datas.get('id', False):
-            datas['id'] = base_calendar_id2real_id(datas['id'])
-        return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, datas, context)
+        if data.get('id', False):
+            data['id'] = base_calendar_id2real_id(data['id'])
+        return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, data, context)
 
 virtual_report_spool()
 
@@ -1748,8 +1730,8 @@ class res_users(osv.osv):
         Get User Availability
         @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 res user’s IDs.
+        @param uid: the current user's ID for security checks,
+        @param ids: List of res user's IDs.
         @param context: A standard dictionary for contextual values
         """
 
@@ -1778,8 +1760,8 @@ class res_users(osv.osv):
         Get User Availability Function
         @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 res user’s IDs.
+        @param uid: the current user's ID for security checks,
+        @param ids: List of res user's IDs.
         @param context: A standard dictionary for contextual values
         """
 
@@ -1793,5 +1775,4 @@ class res_users(osv.osv):
 
 res_users()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 89066ce74bb..a922521d970 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -1,128 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!-- Attendee form view-->
 
-        <record id="base_calendar_attendee_form_view" model="ir.ui.view">
-            <field name="name">calendar.attendee.form</field>
-            <field name="model">calendar.attendee</field>
-            <field name="arch" type="xml">
-                <form string="Invitation details" version="7.0">
-                    <header>
-                        <button name="do_tentative" states="needs-action,declined,accepted" string="Uncertain" type="object" class="oe_highlight"/>
-                        <button name="do_accept" string="Accept" states="needs-action,tentative,declined" type="object" class="oe_highlight"/>
-                        <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" string="Delegate" type="action" states="needs-action,tentative,declined,accepted" context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
-                        <button name="do_decline" string="Decline" states="needs-action,tentative,accepted" type="object" class="oe_highlight"/>
-                        <field name="state" widget="statusbar"
-                            statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
-                    </header>
-                    <sheet>
-
-                        <div class="oe_title">
-                            <label for="email" string="Invitation To" class="oe_edit_only"/>
-                            <h1>
-                                <field name="email" class="oe_inline"/>
-                                (<field name="language" class="oe_inline"/>)
-                            </h1>
-
-                            <h2>
-                                From <field name="event_date" class="oe_inline"/>
-                                to <field name="event_end_date" class="oe_inline"/>
-                            </h2>
-                        </div>
-                        <group>
-                            <group>
-                                <field name="sent_by_uid" string="Invitation From"/>
-                                <field name="user_id" string="Invited User"/>
-                                <field name="partner_id" string="Contact"/>
-                            </group>
-                            <group>
-                                <field name="cutype" string="Invitation Type"/>
-                                <field name="role" string="Role"/>
-                                <field name="rsvp"/>
-                                <field name="ref" readonly="1"/>
-                            </group>
-                        </group>
-                        <group>
-                            <group string="Delegated From">
-                                <field name="parent_ids" readonly="1" nolabel="1"/>
-                            </group>
-                            <group string="Delegated To" >
-                                <field name="child_ids" readonly="1" nolabel="1"/>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <!--        Attendee tree view-->
-
-        <record id="base_calendar_attendee_tree_view" model="ir.ui.view">
-            <field name="name">calendar.attendee.tree</field>
-            <field name="model">calendar.attendee</field>
-            <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="user_id" invisible="1"/>
-                    <field name="partner_id" invisible="1"/>
-                    <field name="cutype" string="Invitation Type"/>
-                    <field name="state"/>
-                    <field name="rsvp" string="Required to Join"/>
-                </tree>
-            </field>
-        </record>
-
-        <!--        Attendee search view-->
-
-        <record id="base_calendar_attendee_search_view" model="ir.ui.view">
-            <field name="name">calendar.attendee.search</field>
-            <field name="model">calendar.attendee</field>
-            <field name="arch" type="xml">
-                <search string="Search Invitations">
-                    <field name="email" string="Email"/>
-                    <field name="event_date"/>
-                    <filter icon="terp-gtk-jump-to-ltr" name="toreview" string="To Review" domain="[('state','=', 'needs-action')]" help="Invitations To Review"/>
-                    <filter icon="terp-check" string="Accepted" domain="[('state','=', 'accepted')]" help="Accepted Invitations"/>
-                    <filter icon="terp-dialog-close" string="Declined" domain="[('state','=', 'declined')]" help="Declined Invitations"/>
-                    <filter icon="gtk-sort-descending" string="Delegated" domain="[('state','=', 'delegated')]" help="Delegated Invitations"/>
-                    <field name="user_id" string="Responsible"/>
-                    <field name="cutype" string="Invitation type"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
-                        <filter string="Contact" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type" domain="[]" context="{'group_by':'cutype'}"/>
-                        <filter string="Role" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'role'}"/>
-                        <filter string="Required Reply" icon="terp-mail-replied" domain="[]" context="{'group_by':'rsvp'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" help="Invitation Type"
-                            domain="[]" context="{'group_by':'state'}"/>
-                    </group>
-               </search>
-            </field>
-        </record>
-        <record id="action_view_attendee_form" model="ir.actions.act_window">
-             <field name="name">Event Invitations</field>
-             <field name="type">ir.actions.act_window</field>
-             <field name="res_model">calendar.attendee</field>
-             <field name="view_type">form</field>
-             <field name="view_mode">tree,form</field>
-             <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view"/>
-             <field name="context">{'default_sent_by_uid': uid}</field>
-         </record>
-
-        <!-- Calenadar's menu -->
+        <!-- Calendar's menu -->
         <menuitem id="base.menu_calendar_configuration" name="Calendar"
             parent="base.menu_base_config" sequence="50" groups="base.group_no_one"/>
 
-        <!-- Invitation menu -->
-
-         <menuitem id="menu_attendee_invitations"
-            parent="base.menu_calendar_configuration"
-            sequence="10" action="action_view_attendee_form"/>
-
-        <!--        ALARM FORM VIEW-->
-
+        <!-- Alarm form view -->
         <record id="res_alarm_form_view" model="ir.ui.view">
             <field name="name">res.alarm.form</field>
             <field name="model">res.alarm</field>
@@ -141,8 +25,7 @@
             </field>
         </record>
 
-        <!--        ALARM TREE VIEW-->
-
+        <!-- Alarm list view -->
         <record id="res_alarm_tree_view" model="ir.ui.view">
             <field name="name">res.alarm.tree</field>
             <field name="model">res.alarm</field>
@@ -172,15 +55,13 @@
             </field>
         </record>
 
-        <!--        Menu for Alarms-->
-
+        <!-- Alarms menu -->
          <menuitem id="menu_crm_meeting_avail_alarm"
             groups="base.group_no_one"
             action="base_calendar.action_res_alarm_view"
             parent="base.menu_calendar_configuration" sequence="5"/>
 
-        <!-- Event Form View-->
-
+        <!-- Event form view -->
         <record model="ir.ui.view" id="event_form_view">
             <field name="name">Event Form</field>
             <field name="model">calendar.event</field>
@@ -226,10 +107,6 @@
                         <field name="description"/>
                     </page>
                     <page string="Invitation Detail">
-                        <button string="Invite People"
-                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                            icon="terp-partner" type="action"
-                            context="{'model' : 'calendar.event', 'attendee_field':'attendee_ids'}" colspan="2"/>
                         <field name="attendee_ids" colspan="4"
                             nolabel="1" widget="one2many" mode="tree">
                             <tree string="Invitation details" editable="top">
@@ -248,12 +125,6 @@
                                 <button name="do_decline" string="Decline"
                                     states="needs-action,tentative,accepted"
                                     type="object" icon="gtk-cancel"/>
-                                <button
-                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                    string="Delegate" type="action"
-                                    icon="gtk-sort-descending"
-                                    states="needs-action,tentative,declined,accepted"
-                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
                             </tree>
                             <form string="Invitation details" version="7.0">
                                 <notebook colspan="4">
@@ -281,13 +152,6 @@
                                                 states="needs-action,tentative,accepted"
                                                 type="object"
                                                 icon="gtk-cancel"/>
-                                            <button
-                                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                                string="Delegate"
-                                                type="action"
-                                                icon="gtk-sort-descending"
-                                                states="needs-action,tentative,declined,accepted"
-                                                context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}"/>
                                         </group>
                                     </page>
                                     </notebook>
@@ -352,8 +216,7 @@
             </field>
         </record>
 
-        <!-- Event Tree View  -->
-
+        <!-- Event list view -->
         <record model="ir.ui.view" id="event_tree_view">
             <field name="name">Event Tree</field>
             <field name="model">calendar.event</field>
@@ -370,8 +233,7 @@
             </field>
         </record>
 
-        <!-- Event Calendar View  -->
-
+        <!-- Event calendar view -->
         <record model="ir.ui.view" id="event_calendar_view">
             <field name="name">Events Calendar</field>
             <field name="model">calendar.event</field>
@@ -385,8 +247,7 @@
             </field>
         </record>
 
-        <!--     Event Search View-->
-
+        <!-- Event search view -->
         <record id="view_calendar_event_filter" model="ir.ui.view">
             <field name="name">Calendar Events Search</field>
             <field name="model">calendar.event</field>
@@ -411,19 +272,17 @@
         </record>
 
 
-        <!-- Event action  -->
-
+        <!-- Event action -->
         <record id="action_view_event" model="ir.actions.act_window">
                 <field name="name">Events</field>
                 <field name="type">ir.actions.act_window</field>
                 <field name="res_model">calendar.event</field>
                 <field name="view_type">form</field>
-                <field name="view_mode">tree,form,calendar</field>
+                <field name="view_mode">calendar,tree,form</field>
                 <field name="search_view_id" ref="view_calendar_event_filter"/>
             </record>
 
-        <!-- Event menu  -->
-
+        <!-- Event menu -->
         <menuitem id="menu_events"
                 name="Events" parent="base.menu_calendar_configuration"
                 sequence="15" action="action_view_event"/>
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index cb96ff2a4d0..9ceaea671ca 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -43,17 +43,17 @@ class crm_meeting(base_state, osv.Model):
     _name = 'crm.meeting'
     _description = "Meeting"
     _order = "id desc"
-    _inherit = ["calendar.event", 'ir.needaction_mixin', "mail.thread"]
+    _inherit = ["calendar.event", "mail.thread", "ir.needaction_mixin"]
     _columns = {
         # base_state required fields
         'create_date': fields.datetime('Creation Date', readonly=True),
         'write_date': fields.datetime('Write Date', readonly=True),
         'date_open': fields.datetime('Confirmed', readonly=True),
         'date_closed': fields.datetime('Closed', readonly=True),
-        'partner_ids': fields.many2many('res.partner', 'crm_meeting_partner_rel', 'meeting_id','partner_id',
+        'partner_ids': fields.many2many('res.partner', 'crm_meeting_partner_rel', 'meeting_id', 'partner_id',
             string='Attendees', states={'done': [('readonly', True)]}),
         'state': fields.selection(
-                    [('draft', 'Unconfirmed'), ('open', 'Confirmed'), ('cancel', 'Cancelled'), ('done', 'Done')],
+                    [('draft', 'Unconfirmed'), ('open', 'Confirmed')],
                     string='Status', size=16, readonly=True),
         # Meeting fields
         'name': fields.char('Meeting Subject', size=128, required=True, states={'done': [('readonly', True)]}),
@@ -66,17 +66,52 @@ class crm_meeting(base_state, osv.Model):
         'state': 'open',
     }
 
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = default or {}
+        default['attendee_ids'] = False
+        return super(crm_meeting, self).copy(cr, uid, id, default, context)
+
+    def onchange_partner_ids(self, cr, uid, ids, value, context=None):
+        """ The basic purpose of this method is to check that destination partners
+            effectively have email addresses. Otherwise a warning is thrown.
+            :param value: value format: [[6, 0, [3, 4]]]
+        """
+        res = {'value': {}}
+        if not value or not value[0] or not value[0][0] == 6:
+            return
+        res.update(self.check_partners_email(cr, uid, value[0][2], context=context))
+        return res
+
+    def check_partners_email(self, cr, uid, partner_ids, context=None):
+        """ Verify that selected partner_ids have an email_address defined.
+            Otherwise throw a warning. """
+        partner_wo_email_lst = []
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
+            if not partner.email:
+                partner_wo_email_lst.append(partner)
+        if not partner_wo_email_lst:
+            return {}
+        warning_msg = _('The following contacts have no email address :')
+        for partner in partner_wo_email_lst:
+            warning_msg += '\n- %s' % (partner.name)
+        return {'warning': {
+                    'title': _('Email addresses not found'),
+                    'message': warning_msg,
+                    }
+                }
     # ----------------------------------------
     # OpenChatter
     # ----------------------------------------
 
+    # shows events of the day for this user
+    def needaction_domain_get(self, cr, uid, domain=[], context={}):
+        return [('date','<=',time.strftime('%Y-%M-%D 23:59:59')), ('date_deadline','>=', time.strftime('%Y-%M-%D 00:00:00')), ('user_id','=',uid)]
+
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
-        return 'Meeting'
+        return _('Meeting')
 
     def case_open_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Meeting has been <b>confirmed</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Meeting <b>confirmed</b>."), context=context)
 
     def case_close_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Meeting has been <b>done</b>."), context=context)
-
-
+        return self.message_post(cr, uid, ids, body=_("Meeting <b>completed</b>."), context=context)
diff --git a/addons/base_calendar/crm_meeting_data.xml b/addons/base_calendar/crm_meeting_data.xml
index 44838514935..d1cffddc403 100644
--- a/addons/base_calendar/crm_meeting_data.xml
+++ b/addons/base_calendar/crm_meeting_data.xml
@@ -16,6 +16,14 @@
             <field name="name">Off-site Meeting</field>
         </record>
 
+        <record model="crm.meeting.type" id="categ_meet4">
+            <field name="name">Open Discussion</field>
+        </record>
+
+        <record model="crm.meeting.type" id="categ_meet5">
+            <field name="name">Feedback Meeting</field>
+        </record>
+
          <record model="res.request.link" id="request_link_meeting">
             <field name="name">Meeting</field>
             <field name="object">crm.meeting</field>
diff --git a/addons/base_calendar/crm_meeting_demo.xml b/addons/base_calendar/crm_meeting_demo.xml
index 221653e5fc3..6c098e2f949 100644
--- a/addons/base_calendar/crm_meeting_demo.xml
+++ b/addons/base_calendar/crm_meeting_demo.xml
@@ -27,7 +27,7 @@
             <field eval="time.strftime('%Y-%m-05 12:00:00')" name="date"/>
             <field eval="time.strftime('%Y-%m-05 19:00:00')" name="date_deadline"/>
             <field eval="7.0" name="duration"/>
-            <field name="state">draft</field>
+            <field name="state">open</field>
         </record>
 
         <record id="crm_meeting_3" model="crm.meeting">
@@ -39,7 +39,7 @@
             <field eval="time.strftime('%Y-%m-12 15:55:05')" name="date"/>
             <field eval="time.strftime('%Y-%m-12 18:55:05')" name="date_deadline"/>
             <field eval="3.0" name="duration"/>
-            <field name="state">done</field>
+            <field name="state">open</field>
         </record>
 
         <record id="crm_meeting_4" model="crm.meeting">
@@ -61,7 +61,7 @@
             <field eval="time.strftime('%Y-%m-22 11:05:00')" name="date"/>
             <field eval="time.strftime('%Y-%m-22 16:05:00')" name="date_deadline"/>
             <field eval="5" name="duration"/>
-            <field name="state">draft</field>
+            <field name="state">open</field>
         </record>
 
         <record id="crm_meeting_6" model="crm.meeting">
@@ -72,7 +72,7 @@
             <field eval="time.strftime('%Y-%m-18 2:00:00')" name="date"/>
             <field eval="time.strftime('%Y-%m-18 10:30:00')" name="date_deadline"/>
             <field eval="8.5" name="duration"/>
-            <field name="state">done</field>
+            <field name="state">open</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 51d17ed43f8..8590bcb8b49 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -10,14 +10,14 @@
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_meeting"/>
         <field name="state">code</field>
-        <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+        <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
     </record>
     <record id="action_crm_meeting_read" model="ir.values">
         <field name="name">action_crm_meeting_read</field>
         <field name="action_id" ref="actions_server_crm_meeting_read"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_read'))" />
+        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_read'))"/>
         <field name="key">action</field>
-        <field name="model_id" ref="model_crm_meeting" />
+        <field name="model_id" ref="model_crm_meeting"/>
         <field name="model">crm.meeting</field>
         <field name="key2">client_action_multi</field>
     </record>
@@ -28,14 +28,14 @@
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_meeting"/>
         <field name="state">code</field>
-        <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+        <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
     </record>
     <record id="action_crm_meeting_unread" model="ir.values">
         <field name="name">action_crm_meeting_unread</field>
         <field name="action_id" ref="actions_server_crm_meeting_unread"/>
-        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_unread'))" />
+        <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_meeting_unread'))"/>
         <field name="key">action</field>
-        <field name="model_id" ref="model_crm_meeting" />
+        <field name="model_id" ref="model_crm_meeting"/>
         <field name="model">crm.meeting</field>
         <field name="key2">client_action_multi</field>
     </record>
@@ -69,159 +69,147 @@
         <field name="model">crm.meeting</field>
         <field name="arch" type="xml">
             <form string="Meetings" version="7.0">
-                <header>
-                    <field name="state"/>
-                </header>
+                <field name="state" invisible="True"/>
                 <sheet>
                     <div class="oe_title">
                         <div class="oe_edit_only">
-                            <label for="name"/> 
+                            <label for="name"/>
                         </div>
                         <h1>
                             <field name="name"/>
                         </h1>
                         <label for="partner_ids" class="oe_edit_only"/>
                         <h2>
-                            <field name="partner_ids" widget="many2many_tags"/>
+                            <field name="partner_ids" widget="many2many_tags"
+                                context="{'force_email':True}"
+                                on_change="onchange_partner_ids(partner_ids)"/>
                         </h2>
                     </div>
                     <notebook>
-                    <page string="Meeting Detail">
+                    <page string="Meeting Details">
                         <group>
                             <group>
-                                <field name="user_id"/>
+                                <field name="date" string="Starting at"
+                                    on_change="onchange_dates(date, duration, False, allday)"/>
+                                <label for="duration"/>
+                                <div>
+                                    <field name="duration" widget="float_time"
+                                        on_change="onchange_dates(date,duration,False,allday)"
+                                        class="oe_inline" attrs="{'invisible': [('allday','=',True)]}"/>
+                                    <label string="hours" attrs="{'invisible': [('allday','=',True)]}"/>
+                                    (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
+                                    <label for="allday" string="All Day?"/>)
+                                </div>
+                                <field name="date_deadline" groups="base.group_no_one"
+                                    attrs="{'invisible': ['|', ('allday','=',True), ('duration','&lt;', 24)]}"
+                                    on_change="onchange_dates(date,False,date_deadline)"/>
+                            </group>
+                            <group>
+                                <field name="user_id" groups="base.group_no_one"/>
                                 <field name="categ_ids" widget="many2many_tags"/>
                                 <field name="location"/>
                                 <field name="organizer" groups="base.group_no_one"/>
                             </group>
-                            <group>
-                                <label for="date" string="Starting at"/>
-                                <div>
-                                    <field name="date"/>
-                                    <span attrs="{'invisible': [('allday','=',True)]}">
-				        (<field name="duration" widget="float_time"
-                                        on_change="onchange_dates(date,duration,False,allday)"
-                                        class="oe_inline"/> hours)
-			            </span>
 
-                                </div>
-
-                                <label for="date_deadline" />
-                                <div>
-                                    <field name="date_deadline" 
-                                        string="End Date" attrs="{'invisible': [('allday','=',True)]}"
-                                        on_change="onchange_dates(date,False,date_deadline)"/>
-                                    (<field name="allday" on_change="onchange_dates(date,False,False,allday)" class="oe_inline"/>
-                                    <label for="allday" string="All Day?"/>)
-                                </div>
+                        </group>
+                        <label for="description"/>
+                        <field name="description"/>
+                    </page>
+                    <page string="Options">
+                        <group>
+                            <group col="1">
+                                <group>
                                     <field name="recurrency"
-                                        attrs="{'readonly': ['|', ('recurrent_uid','!=',False), ('state','=','done')]}"/>
+                                        attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
+                                </group>
+                                <group attrs="{'invisible': [('recurrency','=',False)]}">
+                                    <label for="interval"/>
+                                    <div>
+                                        <field name="interval" attrs="{'required': [('recurrency','==',True)]}" class="oe_inline"/>
+                                        <field name="rrule_type" attrs="{'required': [('recurrency','==',True)]}" class="oe_inline"/>
+                                    </div>
+                                    <label string="Until" for="end_type"/>
+                                    <div>
+                                        <field name="end_type" attrs="{'required': [('recurrency','==',True)]}" class="oe_inline"/>
+                                        <field name="count" attrs="{'invisible': [('end_type', '!=', 'count')], 'required': [('recurrency','==',True)]}" class="oe_inline"/>
+                                        <field name="end_date" attrs="{'invisible': [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}" class="oe_inline"/>
+                                    </div>
+                                    <label string="Select Weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}"/>
+                                    <group col="2" colspan="1" name="weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
+                                        <field name="mo"/>
+                                        <field name="tu"/>
+                                        <field name="we"/>
+                                        <field name="th"/>
+                                        <field name="fr"/>
+                                        <field name="sa"/>
+                                        <field name="su"/>
+                                    </group>
+
+                                    <label string="Day of Month"
+                                        attrs="{'invisible': [('rrule_type','!=','monthly')]}"/>
+
+                                    <div attrs="{'invisible': [('rrule_type','!=','monthly')]}">
+                                        <field name="select1"/>
+                                        <field name="day"
+                                            attrs="{'required': [('select1','=','date'), ('rrule_type','=','monthly')],
+                                                'invisible': [('select1','=','day')]}"/>
+                                        <field name="byday" string="The"
+                                            attrs="{'required': [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible': [('select1','=','date')]}"/>
+                                        <field name="week_list" nolabel="1"
+                                            attrs="{'required': [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible': [('select1','=','date')]}"/>
+                                    </div>
+
+                                </group>
                             </group>
                             <group>
-                                <field name="alarm_id" widget="selection" />
+                                <field name="alarm_id" widget="selection" groups="base.group_no_one"/>
                                 <field name="class"/>
                                 <field name="show_as"/>
                                 <field name="rrule" invisible="1" readonly="1"/>
                                 <field name="recurrent_id" invisible="1"/>
                                 <field name="recurrent_uid" invisible="1"/>
                             </group>
-                            <group attrs="{'invisible': [('recurrency','=',False)]}">
-                                <label for="interval"/>
-                                <div>
-                                    <field name="interval" class="oe_inline"/>
-                                    <field name="rrule_type" class="oe_inline"/>
-                                </div>
-                                <label string="Until" for="end_type"/>
-                                <div>
-                                    <field name="end_type" class="oe_inline"/>
-                                    <field name="count" attrs="{'invisible' : [('end_type', '!=', 'count')] }" class="oe_inline"/>
-                                    <field name="end_date" attrs="{'invisible' : [('end_type', '!=', 'end_date')], 'required': [('end_type', '=', 'end_date')]}" class="oe_inline"/>
-                                </div>
-                                <label string="Select Weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}"/>
-                                <group col="4" colspan="1" name="weekdays" attrs="{'invisible' :[('rrule_type','not in', ['weekly'])]}">
-                                    <field name="mo" />
-                                    <field name="tu" />
-                                    <field name="we" />
-                                    <field name="th" />
-                                    <field name="fr" />
-                                    <field name="sa" />
-                                    <field name="su" />
-                                </group>
-
-                                <label string="Day of Month"
-                                    attrs="{'invisible' : [('rrule_type','!=','monthly')]}"/>
-
-                                <div attrs="{'invisible' : [('rrule_type','!=','monthly')]}">
-                                    <field name="select1" />
-                                    <field name="day"
-                                        attrs="{'required' : [('select1','=','date'), ('rrule_type','=','monthly')],
-                                            'invisible' : [('select1','=','day')]}" />
-                                    <field name="byday" string="The"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
-                                    <field name="week_list" nolabel="1"
-                                        attrs="{'required' : [('select1','=','day'), ('rrule_type','=','monthly')], 'invisible' : [('select1','=','date')]}" />
-                                </div>
-
-                            </group>
                         </group>
-                        <label for="description"/>
-                        <field name="description"/>
                     </page>
-                    <page string="Invitation Detail">
-                        <button string="Invite People"
-                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                            icon="terp-partner" type="action"
-                            attrs="{'readonly': [('state', '=', 'done')]}"
-                            context="{'model' : 'crm.meeting', 'attendee_field':'attendee_ids'}" colspan="2"/>
+                    <page string="Invitations" groups="base.group_no_one">
                         <field name="attendee_ids" widget="one2many" mode="tree">
                             <tree string="Invitation details" editable="top">
-                                <field name="sent_by_uid" string="From"/>
-                                <field name="user_id" string="To"/>
+                                <field name="partner_id"/>
                                 <field name="email" string="Mail To"/>
-                                <field name="role" />
-                                <field name="state" />
+                                <field name="state"/>
                                 <button name="do_tentative"
                                     states="needs-action,declined,accepted"
                                     string="Uncertain" type="object"
-                                    icon="terp-crm" />
+                                    icon="terp-crm"/>
                                 <button name="do_accept" string="Accept"
                                     states="needs-action,tentative,declined"
-                                    type="object" icon="gtk-apply" />
+                                    type="object" icon="gtk-apply"/>
                                 <button name="do_decline" string="Decline"
                                     states="needs-action,tentative,accepted"
-                                    type="object" icon="gtk-cancel" />
-                                <button
-                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-                                    string="Delegate" type="action"
-                                    icon="gtk-sort-descending"
-                                    states="needs-action,tentative,declined,accepted"
-                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                    type="object" icon="gtk-cancel"/>
                             </tree>
                             <form string="Invitation details" version="7.0">
                                 <header>
                                     <button name="do_tentative" type="object"
                                         states="needs-action,declined,accepted"
-                                        string="Uncertain" icon="terp-crm" />
+                                        string="Uncertain"/>
                                     <button name="do_accept" type="object"
                                         states="needs-action,tentative,declined"
-                                        string="Accept" icon="gtk-apply" />
+                                        string="Accept"/>
                                     <button name="do_decline" type="object"
                                         states="needs-action,tentative,accepted"
-                                        string="Decline" icon="gtk-cancel" />
-                                    <button name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d" type="action"
-                                        states="needs-action,tentative,declined,accepted"
-                                        string="Delegate" icon="gtk-sort-descending"
-                                        context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                        string="Decline"/>
                                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done"/>
                                 </header>
                                 <group>
                                     <group>
-                                        <field name="email" />
-                                        <field name="rsvp" />
-                                        <field name="cutype" />
-                                        <field name="role" />
+                                        <field name="email"/>
+                                        <field name="rsvp"/>
+                                        <field name="cutype"/>
+                                        <field name="role"/>
                                     </group>
                                     <group>
+                                        <field name="partner_id"/>
                                         <field name="user_id"/>
                                     </group>
                                 </group>
@@ -232,8 +220,8 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
                 </div>
             </form>
         </field>
@@ -245,14 +233,13 @@
         <field name="name">CRM - Meetings Tree</field>
         <field name="model">crm.meeting</field>
         <field name="arch" type="xml">
-            <tree string="Meetings" fonts="bold:needaction_pending==True"
-                colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
-                <field name="name" string="Subject" />
+            <tree string="Meetings" fonts="bold:message_unread==True">
+                <field name="name" string="Subject"/>
                 <field name="user_id"/>
                 <field name="date"/>
-                <field name="state"/>
-                <field name="duration" />
-                <field name="needaction_pending" invisible="1"/>
+                <field name="state" invisible="True"/>
+                <field name="duration"/>
+                <field name="message_unread" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -289,9 +276,9 @@
         <field name="arch" type="xml">
             <search string="Search Meetings">
                 <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
-                <filter string="Inbox" help="Unread messages" icon="terp-mail-message-new" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <separator/>
-                <filter string="My Meetings" help="My Meetings" icon="terp-personal" domain="[('user_id','=',uid)]"/>
+                <filter string="My Meetings" help="My Meetings" domain="[('user_id','=',uid)]"/>
                 <field name="user_id"/>
                 <field name="partner_ids"/>
             </search>
@@ -309,9 +296,9 @@
         <field name="context">{"calendar_default_user_id": uid}</field>
         <field name="help" type="html">
           <p class="oe_view_nocontent_create">
-            Click to schedule a new meeting. 
+            Click to schedule a new meeting.
           </p><p>
-            The agenda is shared between employees and fully integrated with
+            The calendar is shared between employees and fully integrated with
             other applications such as the employee holidays or the business
             opportunities.
           </p>
@@ -342,8 +329,9 @@
         <field name="view_id" ref="view_crm_meeting_gantt"/>
     </record>
 
-    <menuitem id="menu_crm_meeting" parent="base.menu_sales" sequence="8"
-        name="Meetings" action="action_crm_meeting"/>
+    <menuitem name="Calendar"
+        id="mail_menu_calendar" parent="mail.mail_my_stuff"
+        sequence="10" action="action_crm_meeting"/>
 
     </data>
 </openerp>
diff --git a/addons/base_calendar/i18n/af.po b/addons/base_calendar/i18n/af.po
index 285a533dfd2..f40ae6b35b3 100644
--- a/addons/base_calendar/i18n/af.po
+++ b/addons/base_calendar/i18n/af.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/ar.po b/addons/base_calendar/i18n/ar.po
index 39b0e504900..137a313486e 100644
--- a/addons/base_calendar/i18n/ar.po
+++ b/addons/base_calendar/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/base_calendar.pot b/addons/base_calendar/i18n/base_calendar.pot
index 628f7af2baa..88ba245051f 100644
--- a/addons/base_calendar/i18n/base_calendar.pot
+++ b/addons/base_calendar/i18n/base_calendar.pot
@@ -1146,7 +1146,7 @@ msgstr ""
 #: selection:calendar.attendee,state:0
 #: selection:calendar.event,state:0
 #: selection:calendar.todo,state:0
-msgid "Tentative"
+msgid "Uncertain"
 msgstr ""
 
 #. module: base_calendar
diff --git a/addons/base_calendar/i18n/bg.po b/addons/base_calendar/i18n/bg.po
index 6e55cc526ff..7dbe8344f9e 100644
--- a/addons/base_calendar/i18n/bg.po
+++ b/addons/base_calendar/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/bn.po b/addons/base_calendar/i18n/bn.po
index 73917a7b9f4..b4a0d786fdd 100644
--- a/addons/base_calendar/i18n/bn.po
+++ b/addons/base_calendar/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/bs.po b/addons/base_calendar/i18n/bs.po
index 5c984726f07..5a509b34c81 100644
--- a/addons/base_calendar/i18n/bs.po
+++ b/addons/base_calendar/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: BOSNIA AND HERZEGOVINA\n"
 "Language: hr\n"
 "X-Poedit-Language: Bosnian\n"
diff --git a/addons/base_calendar/i18n/ca.po b/addons/base_calendar/i18n/ca.po
index b170791e384..222eafc16f3 100644
--- a/addons/base_calendar/i18n/ca.po
+++ b/addons/base_calendar/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/cs.po b/addons/base_calendar/i18n/cs.po
index 820202a9565..15cefdb798e 100644
--- a/addons/base_calendar/i18n/cs.po
+++ b/addons/base_calendar/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/da.po b/addons/base_calendar/i18n/da.po
index 33bcd3f14a0..1e7918012af 100644
--- a/addons/base_calendar/i18n/da.po
+++ b/addons/base_calendar/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/de.po b/addons/base_calendar/i18n/de.po
index 05b6993948b..5feb8140ed1 100644
--- a/addons/base_calendar/i18n/de.po
+++ b/addons/base_calendar/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -817,7 +817,7 @@ msgstr "Termin Erinnerung"
 #: model:ir.actions.act_window,name:base_calendar.action_view_event
 #: model:ir.ui.menu,name:base_calendar.menu_events
 msgid "Events"
-msgstr "Termine Verwaltung"
+msgstr "Ereignisse"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
diff --git a/addons/base_calendar/i18n/el.po b/addons/base_calendar/i18n/el.po
index 34276e2f0ca..97f9bb1c3c5 100644
--- a/addons/base_calendar/i18n/el.po
+++ b/addons/base_calendar/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/es.po b/addons/base_calendar/i18n/es.po
index fcf9531a5e5..f5a60000244 100644
--- a/addons/base_calendar/i18n/es.po
+++ b/addons/base_calendar/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/es_CR.po b/addons/base_calendar/i18n/es_CR.po
index da04bbc22c7..4a6721c1af4 100644
--- a/addons/base_calendar/i18n/es_CR.po
+++ b/addons/base_calendar/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: base_calendar
diff --git a/addons/base_calendar/i18n/es_EC.po b/addons/base_calendar/i18n/es_EC.po
index 1eb9bb7ee48..c5042d6328c 100644
--- a/addons/base_calendar/i18n/es_EC.po
+++ b/addons/base_calendar/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/es_PY.po b/addons/base_calendar/i18n/es_PY.po
index 5f322d703e9..b0f4c30753a 100644
--- a/addons/base_calendar/i18n/es_PY.po
+++ b/addons/base_calendar/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/et.po b/addons/base_calendar/i18n/et.po
index 02c33e5b1c7..b470273cfbe 100644
--- a/addons/base_calendar/i18n/et.po
+++ b/addons/base_calendar/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/fa.po b/addons/base_calendar/i18n/fa.po
index 75ec4eb2611..b95a5af49dc 100644
--- a/addons/base_calendar/i18n/fa.po
+++ b/addons/base_calendar/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/fi.po b/addons/base_calendar/i18n/fi.po
index 3b3250e0842..95a82033538 100644
--- a/addons/base_calendar/i18n/fi.po
+++ b/addons/base_calendar/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/fr.po b/addons/base_calendar/i18n/fr.po
index 78ceb1a8e56..f28f61f7c41 100644
--- a/addons/base_calendar/i18n/fr.po
+++ b/addons/base_calendar/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/gl.po b/addons/base_calendar/i18n/gl.po
index b7b89f5e62e..8b6034c3937 100644
--- a/addons/base_calendar/i18n/gl.po
+++ b/addons/base_calendar/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/hr.po b/addons/base_calendar/i18n/hr.po
index b22f984019a..812dc5a14b6 100644
--- a/addons/base_calendar/i18n/hr.po
+++ b/addons/base_calendar/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/hu.po b/addons/base_calendar/i18n/hu.po
index 3e06b3511a9..00170509aa7 100644
--- a/addons/base_calendar/i18n/hu.po
+++ b/addons/base_calendar/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/id.po b/addons/base_calendar/i18n/id.po
new file mode 100644
index 00000000000..446b0603d18
--- /dev/null
+++ b/addons/base_calendar/i18n/id.po
@@ -0,0 +1,1526 @@
+# Indonesian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-27 02:14+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: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation Type"
+msgstr "Tipe Undangan"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr "Event  dimulai"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Declined Invitations"
+msgstr "Tolak Undangan"
+
+#. module: base_calendar
+#: help:calendar.event,exdate:0
+#: help:calendar.todo,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Properti ini mendefinisikan daftar pengecualian tanggal / waktu untuk "
+"komponen kalender berulang."
+
+#. module: base_calendar
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Perusahaan yang dipilih tidak ada di dalam  perusahaan  diijinkan  untuk "
+"pengguna ini"
+
+#. module: base_calendar
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr "Rabu"
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr "Bulanan"
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Unknown"
+msgstr "Tidak diketahui"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr "Pengguna yang diundang"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr "Undangan"
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Pertemuan yang Berulang"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
+msgid "Alarms"
+msgstr "Alarm"
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr "Minggu"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr "Peran"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr "Detail Undangan"
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr "Keempat"
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1006
+#, python-format
+msgid "Count cannot be negative"
+msgstr "Perhitungan tidak bisa negatif"
+
+#. module: base_calendar
+#: field:calendar.event,day:0
+#: selection:calendar.event,select1:0
+#: field:calendar.todo,day:0
+#: selection:calendar.todo,select1:0
+msgid "Date of month"
+msgstr "Tanggal Bulan"
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr "Umum"
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr ""
+"Merupakan suatu karakter spasi. Masukkan sebuah spasi ke dalam posisi yang "
+"ekuivalen di dalam translasi "
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:418
+#: code:addons/base_calendar/base_calendar.py:1411
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Free"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show Time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Accepted Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1194
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1004
+#, python-format
+msgid "Interval cannot be negative"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#, python-format
+msgid "%s must have an email  address to send mail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:389
+#: code:addons/base_calendar/base_calendar.py:1004
+#: code:addons/base_calendar/base_calendar.py:1006
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+msgid ""
+"If the active field is set to          true, it will allow you to hide the "
+"event alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,organizer:0
+#: field:calendar.event,organizer_id:0
+#: field:calendar.todo,organizer:0
+#: field:calendar.todo,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1411
+#, python-format
+msgid "Group by date not supported, use the calendar view instead"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public for Employees"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that may be assigned to calendar events or "
+"meetings."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:ir.model:0
+msgid "Each model must be unique!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,send_mail:0
+msgid "Check this if you want to send an Email to Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Start Date"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:ir.actions.act_window,name:base_calendar.action_view_event
+#: model:ir.ui.menu,name:base_calendar.menu_events
+msgid "Events"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
+#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
+msgid "Invite Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Models"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Number of repetitions"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Recurrence termination"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitations To Review"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegated Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:389
+#, python-format
+msgid "You cannot duplicate a calendar attendee."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,duration:0
+#: help:res.alarm,duration:0
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "End date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,active:0
+#: help:res.alarm,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,state:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,description:0
+msgid ""
+"Provides a more complete                             description of the "
+"calendar component, than that                             provided by the "
+"\"SUMMARY\" property"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1466
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+#, python-format
+msgid "Busy"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+msgid "Repeat every"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
+#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
+msgid "Event Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirmed Events"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,description:0
+#: view:calendar.event:0
+#: field:calendar.event,description:0
+#: field:calendar.event,name:0
+#: field:calendar.todo,description:0
+#: field:calendar.todo,name:0
+msgid "Description"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr ""
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,name:0
+msgid ""
+"Contains the text to be                      used as the message subject for "
+"email                      or contains the text to be used for display"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,alarm_id:0
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:418
+#, python-format
+msgid "Couldn't Invite because date is not specified!"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,alarm_id:0
+#: help:calendar.todo,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,duration:0
+#: field:calendar.alarm,trigger_duration:0
+#: field:calendar.event,duration:0
+#: field:calendar.todo,date:0
+#: field:calendar.todo,duration:0
+#: field:res.alarm,duration:0
+#: field:res.alarm,trigger_duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,attach:0
+msgid ""
+"* Points to a sound resource,                     which is rendered when the "
+"alarm is triggered for audio,\n"
+"                    * File which is intended to be sent as message "
+"attachments for email,\n"
+"                    * Points to a procedure resource, which is invoked when  "
+"                    the alarm is triggered for procedure."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_calendar/i18n/it.po b/addons/base_calendar/i18n/it.po
index e2beb7c2adb..f7b05f84cf3 100644
--- a/addons/base_calendar/i18n/it.po
+++ b/addons/base_calendar/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/ja.po b/addons/base_calendar/i18n/ja.po
index 9f1150e71c5..0eaefeb87c1 100644
--- a/addons/base_calendar/i18n/ja.po
+++ b/addons/base_calendar/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/ln.po b/addons/base_calendar/i18n/ln.po
index 2c0ec92552c..d1c621da398 100644
--- a/addons/base_calendar/i18n/ln.po
+++ b/addons/base_calendar/i18n/ln.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/lt.po b/addons/base_calendar/i18n/lt.po
index a1966203e76..064cbd809d7 100644
--- a/addons/base_calendar/i18n/lt.po
+++ b/addons/base_calendar/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/lv.po b/addons/base_calendar/i18n/lv.po
index c7c09ccb748..6720d974f02 100644
--- a/addons/base_calendar/i18n/lv.po
+++ b/addons/base_calendar/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/mk.po b/addons/base_calendar/i18n/mk.po
new file mode 100644
index 00000000000..5464a940483
--- /dev/null
+++ b/addons/base_calendar/i18n/mk.po
@@ -0,0 +1,1520 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-17 15:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation Type"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Declined Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exdate:0
+#: help:calendar.todo,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+
+#. module: base_calendar
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Unknown"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
+msgid "Alarms"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1006
+#, python-format
+msgid "Count cannot be negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,day:0
+#: selection:calendar.event,select1:0
+#: field:calendar.todo,day:0
+#: selection:calendar.todo,select1:0
+msgid "Date of month"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:418
+#: code:addons/base_calendar/base_calendar.py:1411
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Free"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show Time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Accepted Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1194
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1004
+#, python-format
+msgid "Interval cannot be negative"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#, python-format
+msgid "%s must have an email  address to send mail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:389
+#: code:addons/base_calendar/base_calendar.py:1004
+#: code:addons/base_calendar/base_calendar.py:1006
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+msgid ""
+"If the active field is set to          true, it will allow you to hide the "
+"event alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,organizer:0
+#: field:calendar.event,organizer_id:0
+#: field:calendar.todo,organizer:0
+#: field:calendar.todo,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1411
+#, python-format
+msgid "Group by date not supported, use the calendar view instead"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public for Employees"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that may be assigned to calendar events or "
+"meetings."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:ir.model:0
+msgid "Each model must be unique!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,send_mail:0
+msgid "Check this if you want to send an Email to Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Start Date"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:ir.actions.act_window,name:base_calendar.action_view_event
+#: model:ir.ui.menu,name:base_calendar.menu_events
+msgid "Events"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
+#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
+msgid "Invite Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Models"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Number of repetitions"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Recurrence termination"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitations To Review"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegated Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:389
+#, python-format
+msgid "You cannot duplicate a calendar attendee."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,duration:0
+#: help:res.alarm,duration:0
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "End date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,active:0
+#: help:res.alarm,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,state:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,description:0
+msgid ""
+"Provides a more complete                             description of the "
+"calendar component, than that                             provided by the "
+"\"SUMMARY\" property"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1466
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+#, python-format
+msgid "Busy"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+msgid "Repeat every"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
+#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
+msgid "Event Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr "Месец"
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirmed Events"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,description:0
+#: view:calendar.event:0
+#: field:calendar.event,description:0
+#: field:calendar.event,name:0
+#: field:calendar.todo,description:0
+#: field:calendar.todo,name:0
+msgid "Description"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr ""
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,name:0
+msgid ""
+"Contains the text to be                      used as the message subject for "
+"email                      or contains the text to be used for display"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,alarm_id:0
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:418
+#, python-format
+msgid "Couldn't Invite because date is not specified!"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,alarm_id:0
+#: help:calendar.todo,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,duration:0
+#: field:calendar.alarm,trigger_duration:0
+#: field:calendar.event,duration:0
+#: field:calendar.todo,date:0
+#: field:calendar.todo,duration:0
+#: field:res.alarm,duration:0
+#: field:res.alarm,trigger_duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,attach:0
+msgid ""
+"* Points to a sound resource,                     which is rendered when the "
+"alarm is triggered for audio,\n"
+"                    * File which is intended to be sent as message "
+"attachments for email,\n"
+"                    * Points to a procedure resource, which is invoked when  "
+"                    the alarm is triggered for procedure."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_calendar/i18n/mn.po b/addons/base_calendar/i18n/mn.po
index b48b2d46188..5cf438e322d 100644
--- a/addons/base_calendar/i18n/mn.po
+++ b/addons/base_calendar/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/nb.po b/addons/base_calendar/i18n/nb.po
index ca8c0757ec6..9888102fc55 100644
--- a/addons/base_calendar/i18n/nb.po
+++ b/addons/base_calendar/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/nl.po b/addons/base_calendar/i18n/nl.po
index 18bd89bc6ec..e8750f1169f 100644
--- a/addons/base_calendar/i18n/nl.po
+++ b/addons/base_calendar/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-06-28 12:45+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/pl.po b/addons/base_calendar/i18n/pl.po
index b2c16fa5ed1..6f8d1f6f92f 100644
--- a/addons/base_calendar/i18n/pl.po
+++ b/addons/base_calendar/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -63,7 +63,7 @@ msgstr "Co miesiąc"
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Unknown"
-msgstr ""
+msgstr "Nieznany"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -565,7 +565,7 @@ msgstr "Przydzielono dla"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "To"
-msgstr ""
+msgstr "Do"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/pt.po b/addons/base_calendar/i18n/pt.po
index a2c2048256d..9caa7aa045b 100644
--- a/addons/base_calendar/i18n/pt.po
+++ b/addons/base_calendar/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/pt_BR.po b/addons/base_calendar/i18n/pt_BR.po
index 384584903f0..74e16326032 100644
--- a/addons/base_calendar/i18n/pt_BR.po
+++ b/addons/base_calendar/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -148,7 +148,7 @@ msgstr "Março"
 #: code:addons/base_calendar/base_calendar.py:1411
 #, python-format
 msgid "Warning !"
-msgstr "Aviso !"
+msgstr "Aviso!"
 
 #. module: base_calendar
 #: field:calendar.event,rrule_type:0
@@ -200,7 +200,7 @@ msgstr "Usuários aos quais a solicitação original foi delegada"
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
 msgid "Event Ref"
-msgstr "Evento de Referência"
+msgstr "Ref do Evento"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -302,7 +302,7 @@ msgstr "Tipo de Convite"
 #. module: base_calendar
 #: help:calendar.attendee,state:0
 msgid "Status of the attendee's participation"
-msgstr "Status da participação dos participantes"
+msgstr "Situação da participação dos participantes"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -314,7 +314,7 @@ msgstr "O evento termina"
 #: view:calendar.attendee:0
 #: view:calendar.event:0
 msgid "Group By..."
-msgstr "Agrupado Por..."
+msgstr "Agrupar Por..."
 
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,email:0
@@ -530,7 +530,7 @@ msgstr "Visibilidade"
 #. module: base_calendar
 #: field:calendar.attendee,rsvp:0
 msgid "Required Reply?"
-msgstr "Solicitar Respota?"
+msgstr "Solicitar Resposta?"
 
 #. module: base_calendar
 #: field:calendar.event,base_calendar_url:0
@@ -580,7 +580,7 @@ msgstr "Solicitar Resposta"
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Participation required"
-msgstr "Participação requerida"
+msgstr "Participação obrigatória"
 
 #. module: base_calendar
 #: field:calendar.event,create_date:0
@@ -591,13 +591,13 @@ msgstr "Criado"
 #. module: base_calendar
 #: sql_constraint:ir.model:0
 msgid "Each model must be unique!"
-msgstr "Cada model precisa ser único"
+msgstr "Cada modelo precisa ser único!"
 
 #. module: base_calendar
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Daily"
-msgstr "Diário"
+msgstr "Diariamente"
 
 #. module: base_calendar
 #: field:calendar.event,class:0
@@ -681,7 +681,7 @@ msgstr "Disponibilidade"
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Individual"
-msgstr "Indivíduo"
+msgstr "Individual"
 
 #. module: base_calendar
 #: help:calendar.event,count:0
@@ -692,12 +692,12 @@ msgstr "Repetir x vezes"
 #. module: base_calendar
 #: field:calendar.alarm,user_id:0
 msgid "Owner"
-msgstr "Dono"
+msgstr "Proprietário"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Delegation Info"
-msgstr "Informação atribuída"
+msgstr "Informação da Atribuição"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -713,7 +713,7 @@ msgstr "Nome comum"
 #: view:calendar.attendee:0
 #: selection:calendar.attendee,state:0
 msgid "Declined"
-msgstr "Rejeitado"
+msgstr "Recusado"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -740,7 +740,7 @@ msgstr "Agrupar"
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Private"
-msgstr "Privado"
+msgstr "Particular"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,contact_ids:0
@@ -789,7 +789,7 @@ msgstr "Regra Recorrente"
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Draft"
-msgstr "Rascunho"
+msgstr "Provisório"
 
 #. module: base_calendar
 #: field:calendar.alarm,attach:0
@@ -1041,7 +1041,7 @@ msgstr "Papel de Participação para o calendário do usuário"
 #: view:calendar.attendee:0
 #: field:calendar.attendee,delegated_to:0
 msgid "Delegated To"
-msgstr "Delegado para"
+msgstr "Atribuído para"
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
@@ -1089,7 +1089,7 @@ msgstr "ID de data recorrente"
 #. module: base_calendar
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr "Você não pode ter dois usuários com o mesmo login !"
+msgstr "Você não pode ter dois usuários com o mesmo login!"
 
 #. module: base_calendar
 #: field:calendar.alarm,state:0
@@ -1099,7 +1099,7 @@ msgstr "Você não pode ter dois usuários com o mesmo login !"
 #: field:calendar.event,state:0
 #: field:calendar.todo,state:0
 msgid "State"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: base_calendar
 #: view:res.alarm:0
@@ -1114,7 +1114,7 @@ msgstr "A Revisar"
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr "Pronto"
+msgstr "Concluído"
 
 #. module: base_calendar
 #: help:calendar.event,interval:0
@@ -1153,7 +1153,7 @@ msgid ""
 "\"SUMMARY\" property"
 msgstr ""
 "Fornece uma descrição mais completa do componente de calendário, do que a "
-"fornecida pela propriedade \"SUMMARY\""
+"fornecida pela propriedade \"RESUMO\""
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -1173,7 +1173,7 @@ msgstr "Ocupado"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
 msgid "Calendar Event"
-msgstr "Evento do calendário"
+msgstr "Evento do Calendário"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
@@ -1546,7 +1546,7 @@ msgstr ""
 #: selection:calendar.event,byday:0
 #: selection:calendar.todo,byday:0
 msgid "Fifth"
-msgstr "Quinta"
+msgstr "Quinto"
 
 #~ msgid "Hourly"
 #~ msgstr "A cada hora"
diff --git a/addons/base_calendar/i18n/ro.po b/addons/base_calendar/i18n/ro.po
index 102064db2fa..d3e3388cee0 100644
--- a/addons/base_calendar/i18n/ro.po
+++ b/addons/base_calendar/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/ru.po b/addons/base_calendar/i18n/ru.po
index d4e3066c025..c691deb8032 100644
--- a/addons/base_calendar/i18n/ru.po
+++ b/addons/base_calendar/i18n/ru.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation Type"
-msgstr ""
+msgstr "Тип приглашения"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_related:0
@@ -31,7 +31,7 @@ msgstr "Начало события"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Declined Invitations"
-msgstr ""
+msgstr "Отклоненные приглашения"
 
 #. module: base_calendar
 #: help:calendar.event,exdate:0
@@ -64,7 +64,7 @@ msgstr "Ежемесячно"
 #. module: base_calendar
 #: selection:calendar.attendee,cutype:0
 msgid "Unknown"
-msgstr ""
+msgstr "Неизвестный"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -116,7 +116,7 @@ msgstr "Четвертый"
 #: code:addons/base_calendar/base_calendar.py:1006
 #, python-format
 msgid "Count cannot be negative"
-msgstr ""
+msgstr "Количество не может быть отрицательным"
 
 #. module: base_calendar
 #: field:calendar.event,day:0
@@ -239,7 +239,7 @@ msgstr "Комната"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Accepted Invitations"
-msgstr ""
+msgstr "Принятые приглашения"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -269,7 +269,7 @@ msgstr "Процедура"
 #: code:addons/base_calendar/base_calendar.py:1004
 #, python-format
 msgid "Interval cannot be negative"
-msgstr ""
+msgstr "Интервал не может быть отрицательным"
 
 #. module: base_calendar
 #: selection:calendar.event,state:0
@@ -281,7 +281,7 @@ msgstr "Отменено"
 #: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
 #, python-format
 msgid "%s must have an email  address to send mail"
-msgstr ""
+msgstr "%s должен иметь эл. почту для отпавки эл. письма"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_interval:0
@@ -420,7 +420,7 @@ msgstr "Участники"
 #: code:addons/base_calendar/base_calendar.py:1411
 #, python-format
 msgid "Group by date not supported, use the calendar view instead"
-msgstr ""
+msgstr "Группировка по дате не поддерживается, используйте вид календаря"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -470,7 +470,7 @@ msgstr "Местоположение"
 #: selection:calendar.event,class:0
 #: selection:calendar.todo,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "Общий для работников"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,send_mail:0
@@ -569,7 +569,7 @@ msgstr "Поручено"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "To"
-msgstr ""
+msgstr "Кому"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
@@ -590,7 +590,7 @@ msgstr "Создано"
 #. module: base_calendar
 #: sql_constraint:ir.model:0
 msgid "Each model must be unique!"
-msgstr ""
+msgstr "Каждая модель должна быть уникальной"
 
 #. module: base_calendar
 #: selection:calendar.event,rrule_type:0
@@ -777,7 +777,7 @@ msgstr "Участник"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "From"
-msgstr ""
+msgstr "От"
 
 #. module: base_calendar
 #: field:calendar.event,rrule:0
@@ -859,7 +859,7 @@ msgstr "Понедельник"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Models"
-msgstr ""
+msgstr "Модели"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -878,7 +878,7 @@ msgstr "Дата события"
 #: selection:calendar.event,end_type:0
 #: selection:calendar.todo,end_type:0
 msgid "Number of repetitions"
-msgstr ""
+msgstr "Количество повторов"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -922,7 +922,7 @@ msgstr "Данные"
 #: field:calendar.event,end_type:0
 #: field:calendar.todo,end_type:0
 msgid "Recurrence termination"
-msgstr ""
+msgstr "Прекращение повторений"
 
 #. module: base_calendar
 #: field:calendar.event,mo:0
@@ -933,7 +933,7 @@ msgstr "Пн"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitations To Review"
-msgstr ""
+msgstr "Приглашения на рассмотрении"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -967,7 +967,7 @@ msgstr "Январь"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Delegated Invitations"
-msgstr ""
+msgstr "Переданные приглашения"
 
 #. module: base_calendar
 #: field:calendar.alarm,trigger_interval:0
@@ -999,7 +999,7 @@ msgstr "Активно"
 #: code:addons/base_calendar/base_calendar.py:389
 #, python-format
 msgid "You cannot duplicate a calendar attendee."
-msgstr ""
+msgstr "Нельзя дублировать участника календаря."
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -1253,7 +1253,7 @@ msgstr "Пригласить людей"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Confirmed Events"
-msgstr ""
+msgstr "Подтвержденные мероприятия"
 
 #. module: base_calendar
 #: field:calendar.attendee,dir:0
diff --git a/addons/base_calendar/i18n/sk.po b/addons/base_calendar/i18n/sk.po
index fcd714dd5d9..527e00fa381 100644
--- a/addons/base_calendar/i18n/sk.po
+++ b/addons/base_calendar/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/sl.po b/addons/base_calendar/i18n/sl.po
index 2e25cad65bf..a9a7c8981b7 100644
--- a/addons/base_calendar/i18n/sl.po
+++ b/addons/base_calendar/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/sq.po b/addons/base_calendar/i18n/sq.po
index e59203cccca..30c372cff1c 100644
--- a/addons/base_calendar/i18n/sq.po
+++ b/addons/base_calendar/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/sr.po b/addons/base_calendar/i18n/sr.po
index fedaef6cbe3..fbd5dd205f3 100644
--- a/addons/base_calendar/i18n/sr.po
+++ b/addons/base_calendar/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/sr@latin.po b/addons/base_calendar/i18n/sr@latin.po
index 26f6f834b13..6836ed2bf96 100644
--- a/addons/base_calendar/i18n/sr@latin.po
+++ b/addons/base_calendar/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/sv.po b/addons/base_calendar/i18n/sv.po
index b7d9ed44e32..59eeac2f5e1 100644
--- a/addons/base_calendar/i18n/sv.po
+++ b/addons/base_calendar/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/th.po b/addons/base_calendar/i18n/th.po
index 3fb9e9872ca..dd501eda38e 100644
--- a/addons/base_calendar/i18n/th.po
+++ b/addons/base_calendar/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/tr.po b/addons/base_calendar/i18n/tr.po
index 506b9468085..d0b5efa83c9 100644
--- a/addons/base_calendar/i18n/tr.po
+++ b/addons/base_calendar/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/zh_CN.po b/addons/base_calendar/i18n/zh_CN.po
index 4c96289a2bb..7bec11c7ab8 100644
--- a/addons/base_calendar/i18n/zh_CN.po
+++ b/addons/base_calendar/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/zh_TW.po b/addons/base_calendar/i18n/zh_TW.po
index ce65fe31cc0..6afe3548d6f 100644
--- a/addons/base_calendar/i18n/zh_TW.po
+++ b/addons/base_calendar/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/static/src/img/icon.png b/addons/base_calendar/static/src/img/icon.png
new file mode 100644
index 00000000000..f612cd9ea4b
Binary files /dev/null and b/addons/base_calendar/static/src/img/icon.png differ
diff --git a/addons/base_calendar/test/base_calendar_test.yml b/addons/base_calendar/test/base_calendar_test.yml
index 2f5ff7945ee..c84f3ce36c3 100644
--- a/addons/base_calendar/test/base_calendar_test.yml
+++ b/addons/base_calendar/test/base_calendar_test.yml
@@ -10,8 +10,7 @@
         duration: 2.5
         location: OpenERP S.A.
         name: Technical Presentation
-        rrule_type: none
--   
+-
   Now I will set recurrence for this event to occur monday and friday of week
 -
     !python {model: calendar.event}: |
@@ -39,10 +38,9 @@
         description: 'All day technical test '
         location: School
         name: All day test event
-        rrule_type: none
 -
   In order to check reminder I will first create reminder
-- 
+-
   !record {model: res.alarm, id: res_alarm_daybeforeeventstarts0}:
     name: 1 Day before event starts
     trigger_duration: 1
@@ -54,24 +52,3 @@
 -
     !python {model: calendar.event}: |
      self.write(cr, uid, [ref("calendar_event_alldaytestevent0")], {'alarm_id': ref("res_alarm_daybeforeeventstarts0")})
--
-  In order to assign attendee I will invite Demo user
-- 
-  !record {model: base_calendar.invite.attendee, id: base_calendar_invite_attendee_0}:
-    type: internal
-    send_mail: False
-    partner_id: base.res_partner_9 # Put bcz of problem in read
-    user_ids:
-      - base.user_demo
--
-  Then I click on Invite Button
--
-    !python {model: base_calendar.invite.attendee}: |
-     self.do_invite(cr, uid, [ref("base_calendar_invite_attendee_0")], {'active_id': ref("calendar_event_alldaytestevent0"), 'model' : 'calendar.event', 'attendee_field':'attendee_ids'})
--
-  Now I will Accept this invitation
--
-    !python {model: calendar.attendee}: |
-        ids = self.search(cr, uid, [('ref', '=', 'calendar.event' + ',' + str(ref("calendar_event_alldaytestevent0")))])
-        if ids:
-            self.do_accept(cr, uid, ids, context=context)
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
deleted file mode 100644
index 344056eb585..00000000000
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ /dev/null
@@ -1,170 +0,0 @@
-# -*- coding: 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/>.
-#
-##############################################################################
-
-from .. import base_calendar
-from osv import fields, osv
-from tools.translate import _
-import tools
-
-
-class base_calendar_invite_attendee(osv.osv_memory):
-    """
-    Invite attendee.
-    """
-
-    _name = "base_calendar.invite.attendee"
-    _description = "Invite Attendees"
-
-    _columns = {
-        'type': fields.selection([('internal', 'Internal User'), \
-              ('external', 'External Email'), \
-              ('partner', 'Partner Contacts')], 'Type', required=True, help="Select whom you want to Invite"),
-        'user_ids': fields.many2many('res.users', 'invite_user_rel',
-                                  'invite_id', 'user_id', 'Users'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
-        'email': fields.char('Email', size=124, help="Provide external email address who will receive this invitation."),
-        'contact_ids': fields.many2many('res.partner', 'invite_contact_rel',
-                                  'invite_id', 'contact_id', 'Contacts'),
-        'send_mail': fields.boolean('Send mail?', help='Check this if you want to \
-send an Email to Invited Person')
-    }
-
-    _defaults = {
-        'type': 'internal',
-        'send_mail': True
-    }
-
-    def do_invite(self, cr, uid, ids, context=None):
-        """
-        Invites attendee for meeting..
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of base calendar invite attendee’s IDs.
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary of {}.
-        """
-
-        if context is None:
-            context = {}
-
-        model = False
-        context_id = context and context.get('active_id', False) or False
-        if not context or not context.get('model'):
-            return {'type': 'ir.actions.act_window_close'}
-        else:
-            model = context.get('model')
-
-        model_field = context.get('attendee_field', False)
-        obj = self.pool.get(model)
-        res_obj = obj.browse(cr, uid, context_id, context=context)
-        att_obj = self.pool.get('calendar.attendee')
-        user_obj = self.pool.get('res.users')
-        current_user = user_obj.browse(cr, uid, uid, context=context)
-
-        for datas in self.read(cr, uid, ids, context=context):
-            type = datas.get('type')
-            vals = []
-            mail_to = []
-            attendees = []
-            ref = {}
-
-            if not model == 'calendar.attendee':
-                if context_id:
-                    ref = {'ref': '%s,%s' % (model, base_calendar.base_calendar_id2real_id(context_id))}
-                else:
-                    return {'type': 'ir.actions.act_window_close'}
-            if type == 'internal':
-
-                if not datas.get('user_ids'):
-                    raise osv.except_osv(_('Error!'), ("Please select any user."))
-                for user_id in datas.get('user_ids'):
-                    user = user_obj.browse(cr, uid, user_id)
-                    res = {
-                           'user_id': user_id,
-                           'email': user.email
-                           }
-                    res.update(ref)
-                    vals.append(res)
-                    if user.email:
-                        mail_to.append(user.email)
-
-            elif  type == 'external' and datas.get('email'):
-                res = {'email': datas['email']}
-                res.update(ref)
-                vals.append(res)
-                mail_to.append(datas['email'])
-
-            elif  type == 'partner':
-                add_obj = self.pool.get('res.partner')
-                for contact in  add_obj.browse(cr, uid, datas['contact_ids']):
-                    res = {
-                           'partner_id': contact.id,
-                           'email': contact.email
-                           }
-                    res.update(ref)
-                    vals.append(res)
-                    if contact.email:
-                        mail_to.append(contact.email)
-
-            for att_val in vals:
-                if model == 'calendar.attendee':
-                    att = att_obj.browse(cr, uid, context_id)
-                    att_val.update({
-                        'parent_ids': [(4, att.id)],
-                        'ref': att.ref and (att.ref._name + ',' +str(att.ref.id)) or False
-                        })
-
-                attendees.append(att_obj.create(cr, uid, att_val))
-            if model_field:
-                for attendee in attendees:
-                    obj.write(cr, uid, res_obj.id, {model_field: [(4, attendee)]})
-
-            if datas.get('send_mail'):
-                if not mail_to:
-                    name =  map(lambda x: x[1], filter(lambda x: type==x[0], \
-                                       self._columns['type'].selection))
-                    raise osv.except_osv(_('Error!'), _("%s must have an email address to send mail.") %(name[0]))
-                att_obj._send_mail(cr, uid, attendees, mail_to, \
-                       email_from = current_user.email or tools.config.get('email_from', False))
-
-        return {'type': 'ir.actions.act_window_close'}
-
-
-    def onchange_partner_id(self, cr, uid, ids, partner_id, *args, **argv):
-        """
-        Make entry on contact_ids on change of partner_id field.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of base calendar invite attendee’s IDs.
-        @param partner_id: id of Partner
-        @return: dictionary of value.
-        """
-
-        if not partner_id:
-            return {'value': {'contact_ids': []}}
-        cr.execute('SELECT id FROM res_partner \
-                         WHERE id=%s or parent_id =%s' , (partner_id,partner_id,))
-        contacts = map(lambda x: x[0], cr.fetchall())
-        return {'value': {'contact_ids': contacts}}
-
-base_calendar_invite_attendee()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml b/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
deleted file mode 100644
index 5510259a7a7..00000000000
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee_view.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!--    Attendee invite wizard-->
-
-        <record id="view_calendar_invite_attendee_wizard"
-            model="ir.ui.view">
-            <field name="name">Invite Attendees</field>
-            <field name="model">base_calendar.invite.attendee</field>
-            <field name="arch" type="xml">
-                <form string="Invite People" version="7.0">
-                    <separator string="Invite People" colspan="4"/>
-                    <field name="type"/>
-                    <field name="send_mail"/>
-                    <notebook colspan="4">
-                        <page string="Data">
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'external')]}">
-                                <field name="email" colspan="4" attrs="{'required': [('type', '=', 'external')]}"/>
-                            </group>
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'internal')]}">
-                                <separator string="Users" colspan="4"/>
-                                <field name="user_ids"  colspan="4" nolabel="1"  height="180"/>
-                                <newline/>
-                            </group>
-                            <group col="2" colspan="6" attrs="{'invisible': [('type', '!=', 'partner')]}">
-                                <field name="partner_id" colspan="2" on_change="onchange_partner_id(partner_id)" attrs="{'required': [('type', '=', 'partner')]}"/>
-                                <newline/>
-                                <separator string="Partner Contacts" colspan="6"/>
-                                <field name="contact_ids"  colspan="4" nolabel="1" domain="[('id', 'child_of', [partner_id])]" attrs="{'readonly': [('type', '!=', 'partner')]}"/>
-                            </group>
-                        </page>
-                    </notebook>
-                    <footer>
-                        <button name="do_invite" string="Invite" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-
-        <!--    Attendee invite action-->
-
-        <record id="action_view_calendar_invite_attendee_wizard" model="ir.actions.act_window">
-            <field name="name">Invite Attendees</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">base_calendar.invite.attendee</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py
index 62edc76b277..97f6c98aeb8 100644
--- a/addons/base_crypt/__openerp__.py
+++ b/addons/base_crypt/__openerp__.py
@@ -19,18 +19,18 @@
 #
 ##############################################################################
 {
-    "name" : "DB Password Encryption",
-    "version" : "1.1",
-    "author" : ['OpenERP SA', "FS3"],
-    "maintainer" : "OpenERP SA",
-    "website" : "http://www.openerp.com",
-    "category" : "Tools",
-    "description": """
+    'name': 'DB Password Encryption',
+    'version': '1.1',
+    'author': ['OpenERP SA', 'FS3'],
+    'maintainer': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'category': 'Tools',
+    'description': """
 Replaces cleartext passwords in the database with a secure hash.
 ================================================================
 
 For your existing user base, the removal of the cleartext passwords occurs 
-immediately when you instal base_crypt.
+immediately when you install base_crypt.
 
 All passwords will be replaced by a secure, salted, cryptographic hash, 
 preventing anyone from reading the original password in the database.
@@ -49,16 +49,15 @@ contain critical data. Appropriate security measures need to be implemented
 by the system administrator in all areas, such as: protection of database
 backups, system files, remote shell access, physical server access.
 
-Interation with LDAP authentication:
-------------------------------------
+Interaction with LDAP authentication:
+-------------------------------------
 This module is currently not compatible with the ``user_ldap`` module and
 will disable LDAP authentication completely if installed at the same time.
 """,
-    "depends" : ["base"],
-    "data" : [],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00721290471310299725",
+    'depends': ['base'],
+    'data': [],
+    'auto_install': False,
+    'installable': True,
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py
index b27dad22363..14e029eb988 100644
--- a/addons/base_crypt/crypt.py
+++ b/addons/base_crypt/crypt.py
@@ -47,7 +47,9 @@ import logging
 magic_md5 = '$1$'
 _logger = logging.getLogger(__name__)
 
-def gen_salt( length=8, symbols=ascii_letters + digits ):
+def gen_salt( length=8, symbols=None):
+    if symbols is None:
+        symbols = ascii_letters + digits
     seed()
     return ''.join( sample( symbols, length ) )
 
@@ -138,18 +140,20 @@ class users(osv.osv):
     # Add handlers for 'input_pw' field.
 
     def set_pw(self, cr, uid, id, name, value, args, context):
-        if not value:
-            raise osv.except_osv(_('Error!'), _("You have to specify a password."))
+        if value:
+            obj = pooler.get_pool(cr.dbname).get('res.users')
+            if not hasattr(obj, "_salt_cache"):
+                obj._salt_cache = {}
 
-        obj = pooler.get_pool(cr.dbname).get('res.users')
-        if not hasattr(obj, "_salt_cache"):
-            obj._salt_cache = {}
+            salt = obj._salt_cache[id] = gen_salt()
+            encrypted = encrypt_md5(value, salt)
 
-        salt = obj._salt_cache[id] = gen_salt()
-        encrypted = encrypt_md5(value, salt)
+        else:
+            #setting a password to '' is allowed. It can be used to inactivate the classic log-in of the user
+            #while the access can still be granted by another login method (openid...)
+            encrypted = ''
         cr.execute('update res_users set password=%s where id=%s',
             (encrypted.encode('utf-8'), int(id)))
-        cr.commit()
         del value
 
     def get_pw( self, cr, uid, ids, name, args, context ):
diff --git a/addons/base_crypt/i18n/ar.po b/addons/base_crypt/i18n/ar.po
index 80276623b9b..87ed34cf79e 100644
--- a/addons/base_crypt/i18n/ar.po
+++ b/addons/base_crypt/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/bg.po b/addons/base_crypt/i18n/bg.po
index 2b865e1863b..9df0a1b3cc8 100644
--- a/addons/base_crypt/i18n/bg.po
+++ b/addons/base_crypt/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/ca.po b/addons/base_crypt/i18n/ca.po
index 492b0b78418..2601d867e30 100644
--- a/addons/base_crypt/i18n/ca.po
+++ b/addons/base_crypt/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/cs.po b/addons/base_crypt/i18n/cs.po
index 3cbf6a15e93..24af4f8d674 100644
--- a/addons/base_crypt/i18n/cs.po
+++ b/addons/base_crypt/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/da.po b/addons/base_crypt/i18n/da.po
index f9a3da26e92..89c00355ce0 100644
--- a/addons/base_crypt/i18n/da.po
+++ b/addons/base_crypt/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/de.po b/addons/base_crypt/i18n/de.po
index 4ff8deba24c..e6a54ca40a9 100644
--- a/addons/base_crypt/i18n/de.po
+++ b/addons/base_crypt/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/el.po b/addons/base_crypt/i18n/el.po
index af7531f7a21..13a5f47a942 100644
--- a/addons/base_crypt/i18n/el.po
+++ b/addons/base_crypt/i18n/el.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/en_GB.po b/addons/base_crypt/i18n/en_GB.po
index fcc5f46ef0d..231085f82ae 100644
--- a/addons/base_crypt/i18n/en_GB.po
+++ b/addons/base_crypt/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/es.po b/addons/base_crypt/i18n/es.po
index 788e31045fd..9d0381e1d36 100644
--- a/addons/base_crypt/i18n/es.po
+++ b/addons/base_crypt/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/es_CL.po b/addons/base_crypt/i18n/es_CL.po
index fc91293928f..a250f223f3f 100644
--- a/addons/base_crypt/i18n/es_CL.po
+++ b/addons/base_crypt/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/es_CR.po b/addons/base_crypt/i18n/es_CR.po
index 1827c9f4c45..47617930537 100644
--- a/addons/base_crypt/i18n/es_CR.po
+++ b/addons/base_crypt/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: base_crypt
diff --git a/addons/base_crypt/i18n/es_PY.po b/addons/base_crypt/i18n/es_PY.po
index d7d01b48249..01c69e5c85d 100644
--- a/addons/base_crypt/i18n/es_PY.po
+++ b/addons/base_crypt/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/et.po b/addons/base_crypt/i18n/et.po
index 038641e8c47..18ae1b51c80 100644
--- a/addons/base_crypt/i18n/et.po
+++ b/addons/base_crypt/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/fa.po b/addons/base_crypt/i18n/fa.po
index 361d519e09c..8da174db34b 100644
--- a/addons/base_crypt/i18n/fa.po
+++ b/addons/base_crypt/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/fi.po b/addons/base_crypt/i18n/fi.po
index d8a6867776e..cf3db6d8b15 100644
--- a/addons/base_crypt/i18n/fi.po
+++ b/addons/base_crypt/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/fr.po b/addons/base_crypt/i18n/fr.po
index e468147fb92..682cd0a69ba 100644
--- a/addons/base_crypt/i18n/fr.po
+++ b/addons/base_crypt/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/gl.po b/addons/base_crypt/i18n/gl.po
index 63fa384c172..a13e9f27757 100644
--- a/addons/base_crypt/i18n/gl.po
+++ b/addons/base_crypt/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/gu.po b/addons/base_crypt/i18n/gu.po
index 374555b520a..5fc2927e876 100644
--- a/addons/base_crypt/i18n/gu.po
+++ b/addons/base_crypt/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/hr.po b/addons/base_crypt/i18n/hr.po
index e2cc5ee9aeb..325acca6a43 100644
--- a/addons/base_crypt/i18n/hr.po
+++ b/addons/base_crypt/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/it.po b/addons/base_crypt/i18n/it.po
index 7a6dfa553a5..2dc7780e53b 100644
--- a/addons/base_crypt/i18n/it.po
+++ b/addons/base_crypt/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/ja.po b/addons/base_crypt/i18n/ja.po
index 39e1cb6755b..667f44d8a52 100644
--- a/addons/base_crypt/i18n/ja.po
+++ b/addons/base_crypt/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/lv.po b/addons/base_crypt/i18n/lv.po
new file mode 100644
index 00000000000..2d8f445fd00
--- /dev/null
+++ b/addons/base_crypt/i18n/lv.po
@@ -0,0 +1,45 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-10-16 16:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: base_crypt
+#: model:ir.model,name:base_crypt.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: base_crypt
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Nevar būt divi lietotāji ar vienādu pieteikuma vārdu!"
+
+#. module: base_crypt
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Izvēlētais uzņēmums nav šim lietotājam atļauto uzņēmumu sarakstā"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:140
+#, python-format
+msgid "Please specify the password !"
+msgstr "Lūdzu norādiet paroli!"
+
+#. module: base_crypt
+#: code:addons/base_crypt/crypt.py:140
+#, python-format
+msgid "Error"
+msgstr "Kļūda"
diff --git a/addons/base_crypt/i18n/mn.po b/addons/base_crypt/i18n/mn.po
index c8525c3c3a8..812fcccf322 100644
--- a/addons/base_crypt/i18n/mn.po
+++ b/addons/base_crypt/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/nb.po b/addons/base_crypt/i18n/nb.po
index 3990ea16a2a..247acbb1fae 100644
--- a/addons/base_crypt/i18n/nb.po
+++ b/addons/base_crypt/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/nl.po b/addons/base_crypt/i18n/nl.po
index c01372f4949..88efcd1675c 100644
--- a/addons/base_crypt/i18n/nl.po
+++ b/addons/base_crypt/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/nl_BE.po b/addons/base_crypt/i18n/nl_BE.po
index 6413919958f..46196197cd5 100644
--- a/addons/base_crypt/i18n/nl_BE.po
+++ b/addons/base_crypt/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/oc.po b/addons/base_crypt/i18n/oc.po
index 2b705735177..322b45f55cc 100644
--- a/addons/base_crypt/i18n/oc.po
+++ b/addons/base_crypt/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/pl.po b/addons/base_crypt/i18n/pl.po
index 59f2e7bd789..8256960970f 100644
--- a/addons/base_crypt/i18n/pl.po
+++ b/addons/base_crypt/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/pt.po b/addons/base_crypt/i18n/pt.po
index 4cda167509c..51170f2474e 100644
--- a/addons/base_crypt/i18n/pt.po
+++ b/addons/base_crypt/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/pt_BR.po b/addons/base_crypt/i18n/pt_BR.po
index 0417bb3155c..3023f5369f2 100644
--- a/addons/base_crypt/i18n/pt_BR.po
+++ b/addons/base_crypt/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/ro.po b/addons/base_crypt/i18n/ro.po
index 6e7ddc37116..e116059c4ad 100644
--- a/addons/base_crypt/i18n/ro.po
+++ b/addons/base_crypt/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/ru.po b/addons/base_crypt/i18n/ru.po
index cc4341d1166..9aa7a4c32ee 100644
--- a/addons/base_crypt/i18n/ru.po
+++ b/addons/base_crypt/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/sk.po b/addons/base_crypt/i18n/sk.po
index 20a9ff9eb4c..f2dfd3b025b 100644
--- a/addons/base_crypt/i18n/sk.po
+++ b/addons/base_crypt/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/sl.po b/addons/base_crypt/i18n/sl.po
index 397ad807ead..61d512865b8 100644
--- a/addons/base_crypt/i18n/sl.po
+++ b/addons/base_crypt/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/sq.po b/addons/base_crypt/i18n/sq.po
index 75f445f53bb..acf16119e6d 100644
--- a/addons/base_crypt/i18n/sq.po
+++ b/addons/base_crypt/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/sr@latin.po b/addons/base_crypt/i18n/sr@latin.po
index 9468e1a6fa7..0122f5b4c7a 100644
--- a/addons/base_crypt/i18n/sr@latin.po
+++ b/addons/base_crypt/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/sv.po b/addons/base_crypt/i18n/sv.po
index 3364a266694..319b81b8414 100644
--- a/addons/base_crypt/i18n/sv.po
+++ b/addons/base_crypt/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/tr.po b/addons/base_crypt/i18n/tr.po
index 49f8f8d5c96..9744c340665 100644
--- a/addons/base_crypt/i18n/tr.po
+++ b/addons/base_crypt/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/vi.po b/addons/base_crypt/i18n/vi.po
index 8e0701467f6..8f81131b30b 100644
--- a/addons/base_crypt/i18n/vi.po
+++ b/addons/base_crypt/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/zh_CN.po b/addons/base_crypt/i18n/zh_CN.po
index c3e2d3dfd27..3e0400cd411 100644
--- a/addons/base_crypt/i18n/zh_CN.po
+++ b/addons/base_crypt/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
diff --git a/addons/base_crypt/i18n/zh_TW.po b/addons/base_crypt/i18n/zh_TW.po
index 291150b71f0..d8fd9926aee 100644
--- a/addons/base_crypt/i18n/zh_TW.po
+++ b/addons/base_crypt/i18n/zh_TW.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-09-27 13:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-19 10:28+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_crypt
 #: model:ir.model,name:base_crypt.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: base_crypt
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "您不能同時登入二個使用者!"
 
 #. module: base_crypt
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "所選的公司不是使用者被允許的公司。"
 
 #. module: base_crypt
 #: code:addons/base_crypt/crypt.py:140
@@ -42,7 +42,7 @@ msgstr "請指定密碼 !"
 #: code:addons/base_crypt/crypt.py:140
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "錯誤"
 
 #~ msgid "Base - Password Encryption"
 #~ msgstr "基礎 - 密碼加密"
diff --git a/addons/import_base/__init__.py b/addons/base_gengo/__init__.py
similarity index 89%
rename from addons/import_base/__init__.py
rename to addons/base_gengo/__init__.py
index 52366e5128a..133fa90dc51 100644
--- a/addons/import_base/__init__.py
+++ b/addons/base_gengo/__init__.py
@@ -11,7 +11,7 @@
 #
 #    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
+#    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
@@ -19,7 +19,8 @@
 #
 ##############################################################################
 
-import import_framework
-import mapper
+import res_company
+import ir_translation
+import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/google_map/__openerp__.py b/addons/base_gengo/__openerp__.py
similarity index 57%
rename from addons/google_map/__openerp__.py
rename to addons/base_gengo/__openerp__.py
index 33e28aa8f84..cc9183f6851 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/base_gengo/__openerp__.py
@@ -18,27 +18,34 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-
 {
-    'name': 'Google Maps on Customers',
-    'version': '1.0',
-    'category': 'Customer Relationship Management',
+    'name': 'Automated Translations through Gengo API',
+    'version': '0.1',
+    'category': 'Tools',
     'description': """
-The module adds Google Map field in partner address.
-====================================================
+Automated Translations through Gengo API
+----------------------------------------
 
-Using this you can directly open Google Map from the URL widget.""",
+This module will install passive scheduler job for automated translations 
+using the Gengo API. To activate it, you must
+1) Configure your Gengo authentication parameters under `Settings > Companies > Gengo Parameters`
+2) Launch the wizard under `Settings > Application Terms > Gengo: Manual Request of Translation` and follow the wizard.
+
+This wizard will activate the CRON job and the Scheduler and will start the automatic translation via Gengo Services for all the terms where you requested it.
+    """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'images': ['images/google_map.jpeg'],
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [ ],
+    'init_xml': ['gengo_sync_schedular_data.xml'],
+    'update_xml': [
+        'ir_translation.xml',
+        'res_company_view.xml',
+        'wizard/base_gengo_translations_view.xml',
+           ],
     'demo_xml': [],
-    'js': ['static/src/js/google_map.js'],
+    'test': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0029498930765',
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/gengo_sync_schedular_data.xml b/addons/base_gengo/gengo_sync_schedular_data.xml
new file mode 100644
index 00000000000..823ca8f14db
--- /dev/null
+++ b/addons/base_gengo/gengo_sync_schedular_data.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!--Scheduler sync Receive Request-->
+        <record id="gengo_sync_receive_request_scheduler" model="ir.cron">
+            <field name="name" >Gengo Sync Translation (Response)</field>
+            <field eval="False" name="active"/>
+            <field name="interval_number">20</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field eval="'base.gengo.translations'" name="model"></field>
+            <field eval="'_sync_response'" name="function"/>
+            <field eval="'(20,)'" name="args"/>
+        </record>
+
+        <!--Scheduler Sync Send Request-->
+        <record id="gengo_sync_send_request_scheduler" model="ir.cron">
+            <field name="name" >Gengo Sync Translation (Request)</field>
+            <field eval="False" name="active"/>
+            <field name="interval_number">20</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field eval="'base.gengo.translations'" name="model"></field>
+            <field eval="'_sync_request'" name="function"/>
+            <field eval="'(20,)'" name="args"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/base_gengo/ir_translation.py b/addons/base_gengo/ir_translation.py
new file mode 100644
index 00000000000..7b864aba8ce
--- /dev/null
+++ b/addons/base_gengo/ir_translation.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+LANG_CODE_MAPPING = {
+    'ar_SA': ('ar', 'Arabic'),
+    'id_ID': ('id', 'Indonesian'),
+    'nl_NL': ('nl', 'Dutch'),
+    'fr_CA': ('fr-ca', 'French (Canada)'),
+    'pl_PL': ('pl', 'Polish'),
+    'zh_TW': ('zh-tw', 'Chinese (Traditional)'),
+    'sv_SE': ('sv', 'Swedish'),
+    'ko_KR': ('ko', 'Korean'),
+    'pt_PT': ('pt', 'Portuguese (Europe)'),
+    'en_US': ('en', 'English'),
+    'ja_JP': ('ja', 'Japanese'),
+    'es_ES': ('es', 'Spanish (Spain)'),
+    'zh_CN': ('zh', 'Chinese (Simplified)'),
+    'de_DE': ('de', 'German'),
+    'fr_FR': ('fr', 'French'),
+    'fr_BE': ('fr', 'French'),
+    'ru_RU': ('ru', 'Russian'),
+    'it_IT': ('it', 'Italian'),
+    'pt_BR': ('pt-br', 'Portuguese (Brazil)')
+}
+
+class ir_translation(osv.Model):
+    _name = "ir.translation"
+    _inherit = "ir.translation"
+    _columns = {
+        'gengo_comment': fields.text("Comments & Activity Linked to Gengo"),
+        'job_id': fields.char('Gengo Job ID', size=32),
+        "gengo_translation": fields.selection([('machine', 'Translation By Machine'),
+                                            ('standard', 'Standard'),
+                                            ('pro', 'Pro'),
+                                            ('ultra', 'Ultra')], "Gengo Translation Service Level", help='You can select here the service level you want for an automatic translation using Gengo.'),
+    }
+
+    def _get_all_supported_languages(self, cr, uid, context=None):
+        flag, gengo = self.pool.get('base.gengo.translations').gengo_authentication(cr, uid, context=context)
+        if not flag:
+            raise osv.except_osv(_('Gengo Authentication Error'), gengo)
+        supported_langs = {}
+        lang_pair = gengo.getServiceLanguagePairs(lc_src='en')
+        if lang_pair['opstat'] == 'ok':
+            for g_lang in lang_pair['response']:
+                if g_lang['lc_tgt'] not in supported_langs:
+                    supported_langs[g_lang['lc_tgt']] = []
+                supported_langs[g_lang['lc_tgt']] += [g_lang['tier']]
+        return supported_langs
+
+    def _get_gengo_corresponding_language(cr, lang):
+        return lang in LANG_CODE_MAPPING and LANG_CODE_MAPPING[lang][0] or lang
+
+    def _check_lang_support(self, cr, uid, ids, context=None):
+        for term in self.browse(cr, uid, ids, context=context):
+            if term.gengo_translation:
+                supported_langs = self._get_all_supported_languages(cr, uid, context=context)
+                if supported_langs:
+                    tier = "nonprofit" if term.gengo_translation == 'machine' else term.gengo_translation
+                    language = self._get_gengo_corresponding_language(term.lang)
+                    if tier not in supported_langs.get(language,[]):
+                        return False
+        return True
+
+    _constraints = [
+        (_check_lang_support, 'The Gengo translation service selected is not supported for this language.', ['gengo_translation'])
+    ]
diff --git a/addons/base_gengo/ir_translation.xml b/addons/base_gengo/ir_translation.xml
new file mode 100644
index 00000000000..ba9667d979e
--- /dev/null
+++ b/addons/base_gengo/ir_translation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_translation_search" model="ir.ui.view">
+            <field name="name">Translations</field>
+            <field name="model">ir.translation</field>
+            <field name="inherit_id" ref="base.view_translation_search"/>
+            <field name="arch" type="xml">
+                <search string="Translations">
+                     <filter string="To Approve In Gengo" domain="[('state','=','inprogress'),('gengo_translation','=',True)]"></filter>
+                </search>
+            </field>
+        </record>
+
+        <!-- ir.translation form view -->
+        <record model="ir.ui.view" id="view_ir_translation_inherit_base_gengo_form">
+            <field name="name">ir.translation.form.inherit</field>
+            <field name="inherit_id" ref="base.view_translation_form"/>
+            <field name="model">ir.translation</field>
+            <field name="arch" type="xml">
+                 <xpath expr="//form[@string='Translations']/sheet" position="inside">
+                    <group string="Gengo Translation Service" col="4" colspan="4">
+                        <field name="gengo_translation" />
+                        <label string="Note: If the translation state is 'In Progress', it means that the translation has to be approved to be uploaded in this system. You are supposed to do that directly by using your Gengo Account"/>
+                        <field name="gengo_comment" nolabel="1" placeholder="Gengo Comments &amp; Activity..." colspan="4"/>
+                    </group>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/import_google/wizard/google_import_message.py b/addons/base_gengo/res_company.py
similarity index 55%
rename from addons/import_google/wizard/google_import_message.py
rename to addons/base_gengo/res_company.py
index bba58cd2250..22d7b343939 100644
--- a/addons/import_google/wizard/google_import_message.py
+++ b/addons/base_gengo/res_company.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -19,26 +19,19 @@
 #
 ##############################################################################
 
-from osv import osv
-from osv import fields
+from osv import fields, osv
 
 
-class google_import_message(osv.osv):
-    """Import Message"""
-    
-    _name = "google.import.message"
-    _description = "Import Message"
+class res_company(osv.Model):
+    _name = "res.company"
+    _inherit = "res.company"
     _columns = {
-        'name': fields.text('Message', readonly=True),
-        }
+           "gengo_private_key": fields.text("Gengo Private Key"),
+           "gengo_public_key": fields.text("Gengo Public Key"),
+           "gengo_comment": fields.text("Comments", help="This comment will be automatically be enclosed in each an every request sent to Gengo"),
+           "gengo_auto_approve": fields.boolean("Auto Approve Translation ?", help="Jobs are Automatically Approved by Gengo."),
+    }
 
-    def default_get(self, cr, uid, fields, context=None):
-        if context == None:
-            context = {}
-        res = super(google_import_message, self).default_get(cr, uid, fields, context=context)
-        res.update({'name': context.get('message')})
-        return res
-
-google_import_message()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+    _defaults = {
+        "gengo_auto_approve": True,
+    }
diff --git a/addons/base_gengo/res_company_view.xml b/addons/base_gengo/res_company_view.xml
new file mode 100644
index 00000000000..0f99efc8ad0
--- /dev/null
+++ b/addons/base_gengo/res_company_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <!-- res.company form view -->
+        <record model="ir.ui.view" id="view_company_inherit_base_gengo_form">
+            <field name="name">res.company.form.inherit</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="model">res.company</field>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook[last()]" position="inside">
+                    <page string="Gengo Parameters">
+                        <group col="2">
+                            <group col="1" string="Public Key">
+                                <field name="gengo_public_key" nolabel="1" placeholder="Add Gengo login Public Key..."/>
+                            </group>
+                            <group col="1" string="Private Key">
+                                <field name="gengo_private_key" password="True" nolabel="1" placeholder="Add Gengo login Private Key..."/>
+                            </group>
+                        </group>
+                        <group col="4">
+                            <field name="gengo_auto_approve"/>
+                        </group>
+                        <group string="Comments for Translator" col="1">
+                            <field name="gengo_comment" nolabel="1" placeholder="Add your comments here for translator...."/>
+                        </group>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/event_project/wizard/__init__.py b/addons/base_gengo/wizard/__init__.py
similarity index 97%
rename from addons/event_project/wizard/__init__.py
rename to addons/base_gengo/wizard/__init__.py
index 2682d3f7b4e..f5dd71be01c 100644
--- a/addons/event_project/wizard/__init__.py
+++ b/addons/base_gengo/wizard/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import event_project_retro
+import base_gengo_translations
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_gengo/wizard/base_gengo_translations.py b/addons/base_gengo/wizard/base_gengo_translations.py
new file mode 100644
index 00000000000..bfd51480141
--- /dev/null
+++ b/addons/base_gengo/wizard/base_gengo_translations.py
@@ -0,0 +1,254 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import logging
+import re
+import time
+
+from openerp.osv import osv, fields
+from openerp import tools
+from openerp.tools.translate import _
+
+_logger = logging.getLogger(__name__)
+
+try:
+    from mygengo import MyGengo
+except ImportError:
+    _logger.warning('Gengo library not found, Gengo features disabled. If you plan to use it, please install the mygengo library from http://pypi.python.org/pypi/mygengo')
+    class MyGengo(object):
+        def __init__(self, *args, **kwargs):
+            # no context for translations - so don't bother
+            raise ImportError('Gengo library not found, please install mygengo from http://pypi.python.org/pypi/mygengo')
+
+GENGO_DEFAULT_LIMIT = 20
+
+DEFAULT_CRON_VALS = {
+    'active': True,
+    'interval_number': 20,
+    'interval_type': 'minutes',
+    'model': "'base.gengo.translations'",
+    'args': "'(%s,)'" % (str(GENGO_DEFAULT_LIMIT)),
+}
+
+class base_gengo_translations(osv.osv_memory):
+
+    _name = 'base.gengo.translations'
+    _columns = {
+        'restart_send_job': fields.boolean("Restart Sending Job"),
+        'lang_id': fields.many2one('res.lang', 'Language', required=True),
+    }
+
+    def gengo_authentication(self, cr, uid, context=None):
+        ''' 
+        This method tries to open a connection with Gengo. For that, it uses the Public and Private
+        keys that are linked to the company (given by Gengo on subscription). It returns a tuple with
+         * as first element: a boolean depicting if the authentication was a success or not
+         * as second element: the connection, if it was a success, or the error message returned by 
+            Gengo when the connection failed.
+            This error message can either be displayed in the server logs (if the authentication was called 
+            by the cron) or in a dialog box (if requested by the user), thus it's important to return it 
+            translated.
+        '''
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if not user.company_id.gengo_public_key or not user.company_id.gengo_private_key:
+            return (False, _("Gengo `Public Key` or `Private Key` are missing. Enter your Gengo authentication parameters under `Settings > Companies > Gengo Parameters`."))
+        try:
+            gengo = MyGengo(
+                public_key=user.company_id.gengo_public_key.encode('ascii'),
+                private_key=user.company_id.gengo_private_key.encode('ascii'),
+            )
+            gengo.getAccountStats()
+            return (True, gengo)
+        except Exception, e:
+            _logger.exception('Gengo connection failed')
+            return (False, _("Gengo connection failed with this message:\n``%s``") % e)
+
+    def do_check_schedular(self, cr, uid, xml_id, name, fn, context=None):
+        """
+        This function is used to reset a cron to its default values, or to recreate it if it was deleted.
+        """
+        cron_pool = self.pool.get('ir.cron')
+        cron_vals = DEFAULT_CRON_VALS.copy()
+        cron_vals.update({'name': name, "function": fn})
+        try:
+            res = []
+            _, res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base_gengo', xml_id)
+            cron_pool.write(cr, uid, [res], cron_vals, context=context)
+        except:
+            #the cron job was not found, probably deleted previously, so we create it again using default values
+            cron_vals.update({'numbercall': -1})
+            return cron_pool.create(cr, uid, cron_vals, context=context)
+
+    def act_update(self, cr, uid, ids, context=None):
+        '''
+        Function called by the wizard.
+        '''
+        if context == None:
+            context = {}
+
+        flag, gengo = self.gengo_authentication(cr, uid, context=context)
+        if not flag:
+            raise osv.except_osv(_('Gengo Authentication Error'), gengo)
+        for wizard in self.browse(cr, uid, ids, context=context):
+            supported_langs = self.pool.get('ir.translation')._get_all_supported_languages(cr, uid, context=context)
+            language = self.pool.get('ir.translation')._get_gengo_corresponding_language(wizard.lang_id.code)
+            if language not in supported_langs:
+                raise osv.except_osv(_("Warning"), _('This language is not supported by the Gengo translation services.'))
+
+            #send immediately a new request for the selected language (if any)
+            ctx = context.copy()
+            ctx['gengo_language'] = wizard.lang_id.id
+            self._sync_request(cr, uid, limit=GENGO_DEFAULT_LIMIT, context=ctx)
+            self._sync_response( cr, uid, limit=GENGO_DEFAULT_LIMIT, context=ctx)
+            #check the cron jobs and eventually restart/recreate them
+            if wizard.restart_send_job:
+                self.do_check_schedular(cr, uid, 'gengo_sync_send_request_scheduler', _('Gengo Sync Translation (Request)'), '_sync_request', context=context)
+            self.do_check_schedular(cr, uid, 'gengo_sync_receive_request_scheduler', _('Gengo Sync Translation (Response)'), '_sync_response', context=context)
+        return {'type': 'ir.actions.act_window_close'}
+
+    def _sync_response(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
+        """
+        This method will be called by cron services to get translations from
+        Gengo. It will read translated terms and comments from Gengo and will 
+        update respective ir.translation in openerp.
+        """
+        translation_pool = self.pool.get('ir.translation')
+        flag, gengo = self.gengo_authentication(cr, uid, context=context)
+        if not flag:
+            _logger.warning("%s", gengo)
+        else:
+            translation_id = translation_pool.search(cr, uid, [('state', '=', 'inprogress'), ('gengo_translation', 'in', ('machine','standard','pro','ultra'))], limit=limit, context=context)
+            for term in translation_pool.browse(cr, uid, translation_id, context=context):
+                up_term = up_comment = 0
+                if term.job_id:
+                    vals={}
+                    job_response = gengo.getTranslationJob(id=term.job_id)
+                    if job_response['opstat'] != 'ok':
+                        _logger.warning("Invalid Response! Skipping translation Terms with `id` %s." % (term.job_id))
+                        continue
+                    if job_response['response']['job']['status'] == 'approved':
+                        vals.update({'state': 'translated',
+                            'value': job_response['response']['job']['body_tgt']})
+                        up_term += 1
+                    job_comment = gengo.getTranslationJobComments(id=term.job_id)
+                    if job_comment['opstat']=='ok':
+                        gengo_comments=""
+                        for comment in job_comment['response']['thread']:
+                            gengo_comments += _('%s\n\n--\n Commented on %s by %s.') % (comment['body'], time.ctime(comment['ctime']), comment['author'])
+                        vals.update({'gengo_comment': gengo_comments})
+                        up_comment += 1
+                    if vals:
+                        translation_pool.write(cr, uid, term.id, vals)
+                    _logger.info("Successfully Updated `%d` terms and %d Comments." % (up_term, up_comment ))
+                else:
+                    _logger.warning("%s", 'Cannot retrieve the Gengo job ID for translation %s: %s' % (term.id, term.src))
+        return True
+
+    def _update_terms(self, cr, uid, response, context=None):
+        """
+        Update the terms after their translation were requested to Gengo
+        """
+        translation_pool = self.pool.get('ir.translation')
+        for jobs in response['jobs']:
+            for t_id, res in jobs.items():
+                vals = {}
+                t_id = int(t_id)
+                tier = translation_pool.read(cr, uid, [t_id], ['gengo_translation'], context=context)[0]['gengo_translation']
+                if tier == "machine":
+                    vals.update({'value': res['body_tgt'], 'state': 'translated'})
+                else:
+                    vals.update({'job_id': res['job_id'], 'state': 'inprogress'})
+                translation_pool.write(cr, uid, [t_id], vals, context=context)
+        return
+
+    def pack_jobs_request(self, cr, uid, term_ids, context=None):
+        ''' prepare the terms that will be requested to gengo and returns them in a dictionary with following format
+            {'jobs': {
+                'term1.id': {...}
+                'term2.id': {...}
+                }
+            }'''
+
+        translation_pool = self.pool.get('ir.translation')
+        jobs = {}
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        auto_approve = 1 if user.company_id.gengo_auto_approve else 0
+        for term in translation_pool.browse(cr, uid, term_ids, context=context):
+            if re.search(r"\w", term.src or ""):
+                jobs[term.id] = {'type': 'text',
+                        'slug': 'single::English to ' + term.lang,
+                        'tier': tools.ustr(term.gengo_translation),
+                        'body_src': term.src,
+                        'lc_src': 'en',
+                        'lc_tgt': translation_pool._get_gengo_corresponding_language(term.lang),
+                        'auto_approve': auto_approve,
+                        'comment': user.company_id.gengo_comment,
+                }
+        return {'jobs': jobs}
+
+
+    def _send_translation_terms(self, cr, uid,  term_ids, context=None):
+        """
+        Send a request to Gengo with all the term_ids in a different job, get the response and update the terms in
+        database accordingly.
+        """
+        flag, gengo = self.gengo_authentication(cr, uid, context=context)
+        if flag:
+            request = self.pack_jobs_request(cr, uid, term_ids, context=context)
+            if request['jobs']:
+                result = gengo.postTranslationJobs(jobs=request)
+                if result['opstat'] == 'ok':
+                    self._update_terms(cr, uid, result['response'], context=context)
+        else:
+            _logger.error(gengo)
+        return True
+
+    def _sync_request(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
+        """
+        This scheduler will send a job request to the gengo , which terms are
+        waiing to be translated and for which gengo_translation is enabled. 
+
+        A special key 'gengo_language' can be passed in the context in order to 
+        request only translations of that language only. Its value is the language 
+        ID in openerp.
+        """
+        if context is None:
+            context = {}
+        language_pool = self.pool.get('res.lang')
+        translation_pool = self.pool.get('ir.translation')
+        try:
+            #by default, the request will be made for all terms that needs it, whatever the language
+            lang_ids = language_pool.search(cr, uid, [], context=context)
+            if context.get('gengo_language'):
+                #but if this specific key is given, then we restrict the request on terms of this language only
+                lang_ids = [context.get('gengo_language')]
+            langs = [lang.code for lang in language_pool.browse(cr, uid, lang_ids, context=context)]
+            #search for the n first terms to translate
+            term_ids = translation_pool.search(cr, uid, [('state', '=', 'to_translate'), ('gengo_translation', 'in', ('machine','standard','pro','ultra')), ('lang', 'in', langs)], limit=limit, context=context)
+            if term_ids:
+                self._send_translation_terms(cr, uid, term_ids, context=context)
+                _logger.info("%s Translation terms have been posted to Gengo successfully", len(term_ids))
+            else:
+                _logger.info('No Translation terms to process.')
+        except Exception, e:
+            _logger.error("%s", e)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_gengo/wizard/base_gengo_translations_view.xml b/addons/base_gengo/wizard/base_gengo_translations_view.xml
new file mode 100644
index 00000000000..7b6be31d042
--- /dev/null
+++ b/addons/base_gengo/wizard/base_gengo_translations_view.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="base_gengo_translation_wizard_from">
+            <field name="name">base.gengo.translation.form</field>
+            <field name="model">base.gengo.translations</field>
+            <field name="arch" type="xml">
+                <form string="Gengo Request Form" version="7.0">
+                    <group>
+                        <field name="lang_id"/>
+                        <field name="restart_send_job"/>
+                    </group>
+                    <footer>
+                        <button name="act_update" string="Send" type="object" class="oe_highlight"/> 
+                        or 
+                        <button name="act_cancel" special="cancel" string="Cancel" type="object" class="oe_link"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_wizard_base_gengo_translations" model="ir.actions.act_window">
+            <field name="name">Gengo: Manual Request of Translation</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">base.gengo.translations</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem action="action_wizard_base_gengo_translations" id="menu_action_wizard_base_gengo_translations" parent="base.menu_translation_app"/>
+
+    </data>
+</openerp>
diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py
index f7778c13f2b..7f966255bbf 100644
--- a/addons/base_iban/__openerp__.py
+++ b/addons/base_iban/__openerp__.py
@@ -21,10 +21,10 @@
 {
     'name': 'IBAN Bank Accounts',
     'version': '1.0',
-    "category": 'Hidden/Dependency',
+    'category': 'Hidden/Dependency',
     'description': """
 This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for it's validity.
-=====================================================================================================================
+======================================================================================================================
 
 The ability to extract the correctly represented local accounts from IBAN accounts 
 with a single statement.
@@ -32,11 +32,9 @@ with a single statement.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': ['base_iban_data.xml'],
-    'update_xml': ['base_iban_view.xml'],
+    'data': ['base_iban_data.xml' , 'base_iban_view.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0050014379549',
     'images': ['images/base_iban1.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py
index c29647a1176..ff492a8d34b 100644
--- a/addons/base_iban/base_iban.py
+++ b/addons/base_iban/base_iban.py
@@ -99,6 +99,8 @@ class res_partner_bank(osv.osv):
             @param iban: IBAN as string
             @return: True if IBAN is valid, False otherwise
         """
+        if not iban:
+            return False
         iban = _format_iban(iban).lower()
         if iban[:2] in _ref_iban and len(iban) != len(_format_iban(_ref_iban[iban[:2]])):
             return False
@@ -128,9 +130,9 @@ class res_partner_bank(osv.osv):
     def _construct_constraint_msg(self, cr, uid, ids, context=None):
 
         def default_iban_check(iban_cn):
-            return iban_cn[0] in string.ascii_lowercase and iban_cn[1] in string.ascii_lowercase
+             return iban_cn and iban_cn[0] in string.ascii_lowercase and iban_cn[1] in string.ascii_lowercase
 
-        iban_country = self.browse(cr, uid, ids)[0].acc_number[:2].lower()
+        iban_country = self.browse(cr, uid, ids)[0].acc_number and self.browse(cr, uid, ids)[0].acc_number[:2].lower()
         if default_iban_check(iban_country):
             if iban_country in _ref_iban:
                 return _('The IBAN does not seem to be correct. You should have entered something like this %s'), \
diff --git a/addons/base_iban/base_iban_data.xml b/addons/base_iban/base_iban_data.xml
index ac481098254..eafc8dfcff8 100644
--- a/addons/base_iban/base_iban_data.xml
+++ b/addons/base_iban/base_iban_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!--
         Default bank account description
diff --git a/addons/base_iban/i18n/ar.po b/addons/base_iban/i18n/ar.po
index 20354e6e56a..fd00ed32c9e 100644
--- a/addons/base_iban/i18n/ar.po
+++ b/addons/base_iban/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/bg.po b/addons/base_iban/i18n/bg.po
index 5d53434ac9b..239193f4304 100644
--- a/addons/base_iban/i18n/bg.po
+++ b/addons/base_iban/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/bs.po b/addons/base_iban/i18n/bs.po
index 8d2df7f4ff5..1736b3981dc 100644
--- a/addons/base_iban/i18n/bs.po
+++ b/addons/base_iban/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ca.po b/addons/base_iban/i18n/ca.po
index c4ef2614aaf..def6af69b4e 100644
--- a/addons/base_iban/i18n/ca.po
+++ b/addons/base_iban/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/cs.po b/addons/base_iban/i18n/cs.po
index a013fb5efc6..5a050d3c79f 100644
--- a/addons/base_iban/i18n/cs.po
+++ b/addons/base_iban/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/da.po b/addons/base_iban/i18n/da.po
index 26106e32450..80b74af7b11 100644
--- a/addons/base_iban/i18n/da.po
+++ b/addons/base_iban/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/de.po b/addons/base_iban/i18n/de.po
index 3e0cc4c6b0a..a82284b79c2 100644
--- a/addons/base_iban/i18n/de.po
+++ b/addons/base_iban/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/el.po b/addons/base_iban/i18n/el.po
index c8c1b2efa7c..5c1c88e0e6b 100644
--- a/addons/base_iban/i18n/el.po
+++ b/addons/base_iban/i18n/el.po
@@ -9,8 +9,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/base_iban/i18n/en_GB.po b/addons/base_iban/i18n/en_GB.po
index 493c44b01ab..fee1a6d0f9e 100644
--- a/addons/base_iban/i18n/en_GB.po
+++ b/addons/base_iban/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/es.po b/addons/base_iban/i18n/es.po
index 358590f6c4e..f19fc8ce5ab 100644
--- a/addons/base_iban/i18n/es.po
+++ b/addons/base_iban/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/es_AR.po b/addons/base_iban/i18n/es_AR.po
index 56ffd7eb5fa..f30ee5fd34f 100644
--- a/addons/base_iban/i18n/es_AR.po
+++ b/addons/base_iban/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/es_CR.po b/addons/base_iban/i18n/es_CR.po
index 03453200453..0ff334b22f5 100644
--- a/addons/base_iban/i18n/es_CR.po
+++ b/addons/base_iban/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/es_EC.po b/addons/base_iban/i18n/es_EC.po
index 08da041356f..078eaf7ab59 100644
--- a/addons/base_iban/i18n/es_EC.po
+++ b/addons/base_iban/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/es_PY.po b/addons/base_iban/i18n/es_PY.po
index 6e6e3c169a2..77768234687 100644
--- a/addons/base_iban/i18n/es_PY.po
+++ b/addons/base_iban/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/et.po b/addons/base_iban/i18n/et.po
index 42ee1cd1c32..8b489fb26f2 100644
--- a/addons/base_iban/i18n/et.po
+++ b/addons/base_iban/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/eu.po b/addons/base_iban/i18n/eu.po
index 6d578b62722..a1db3248590 100644
--- a/addons/base_iban/i18n/eu.po
+++ b/addons/base_iban/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/fa.po b/addons/base_iban/i18n/fa.po
index 74eb31b3b7c..c71a0e04e32 100644
--- a/addons/base_iban/i18n/fa.po
+++ b/addons/base_iban/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/fi.po b/addons/base_iban/i18n/fi.po
index 1865ff5edcd..10ef111f2f8 100644
--- a/addons/base_iban/i18n/fi.po
+++ b/addons/base_iban/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/fr.po b/addons/base_iban/i18n/fr.po
index 8218be30b82..e101d088c87 100644
--- a/addons/base_iban/i18n/fr.po
+++ b/addons/base_iban/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/gl.po b/addons/base_iban/i18n/gl.po
index 5c07a34edc8..f2c25124c0b 100644
--- a/addons/base_iban/i18n/gl.po
+++ b/addons/base_iban/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/gu.po b/addons/base_iban/i18n/gu.po
index 6ffd2adecdf..e6238865bf8 100644
--- a/addons/base_iban/i18n/gu.po
+++ b/addons/base_iban/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/hr.po b/addons/base_iban/i18n/hr.po
index fe48ec8a7c8..f1cdec85c70 100644
--- a/addons/base_iban/i18n/hr.po
+++ b/addons/base_iban/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/hu.po b/addons/base_iban/i18n/hu.po
index 857c5a12a24..37f0a364f64 100644
--- a/addons/base_iban/i18n/hu.po
+++ b/addons/base_iban/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/id.po b/addons/base_iban/i18n/id.po
index f3714bacad1..d29ac2cfd2d 100644
--- a/addons/base_iban/i18n/id.po
+++ b/addons/base_iban/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/it.po b/addons/base_iban/i18n/it.po
index 323690e7154..62f52b56c6c 100644
--- a/addons/base_iban/i18n/it.po
+++ b/addons/base_iban/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ja.po b/addons/base_iban/i18n/ja.po
index aeeb792c4b3..08745090ff3 100644
--- a/addons/base_iban/i18n/ja.po
+++ b/addons/base_iban/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ko.po b/addons/base_iban/i18n/ko.po
index 8a9bc31246c..a9e5f259543 100644
--- a/addons/base_iban/i18n/ko.po
+++ b/addons/base_iban/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/lt.po b/addons/base_iban/i18n/lt.po
index 664bfb9d8ba..9bf153bd618 100644
--- a/addons/base_iban/i18n/lt.po
+++ b/addons/base_iban/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/lv.po b/addons/base_iban/i18n/lv.po
index 08d4821df7a..6bcfc40e6da 100644
--- a/addons/base_iban/i18n/lv.po
+++ b/addons/base_iban/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/mn.po b/addons/base_iban/i18n/mn.po
index d782ae1afd5..6f2ce2f2be6 100644
--- a/addons/base_iban/i18n/mn.po
+++ b/addons/base_iban/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/nb.po b/addons/base_iban/i18n/nb.po
new file mode 100644
index 00000000000..fc386b596a5
--- /dev/null
+++ b/addons/base_iban/i18n/nb.po
@@ -0,0 +1,95 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-28 13:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: base_iban
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Vennligst definere BIC / Swift-kode på bank for bank typen IBAN-konto for å "
+"fatte gyldige betalinger"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:139
+#, python-format
+msgid "This IBAN does not pass the validation check, please verify it"
+msgstr "Dette IBAN passer ikke valideringskontrollen, du bekrefte den."
+
+#. module: base_iban
+#: model:res.partner.bank.type,format_layout:base_iban.bank_iban
+msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
+msgstr "%(bank_navn)s: IBAN %(konto_nummer)s - BIC %(bank_bic)s"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
+msgid "bank_bic"
+msgstr "bank_bic"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
+msgid "zip"
+msgstr "Zip"
+
+#. module: base_iban
+#: help:res.partner.bank,iban:0
+msgid "International Bank Account Number"
+msgstr "Internasjonal bank kontonummer"
+
+#. module: base_iban
+#: model:ir.model,name:base_iban.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Bankkontoer"
+
+#. module: base_iban
+#: model:res.partner.bank.type.field,name:base_iban.bank_country_field
+msgid "country_id"
+msgstr "country_id"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:136
+#, python-format
+msgid ""
+"The IBAN does not seem to be correct. You should have entered something like "
+"this %s"
+msgstr ""
+"IBAN synes ikke å være korrekt. Du bør ha angitt noe sånt som dette% s"
+
+#. module: base_iban
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr "IBAN"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:140
+#, python-format
+msgid "The IBAN is invalid, it should begin with the country code"
+msgstr "IBAN er ugyldig, Det burde begynne med landskode"
+
+#. module: base_iban
+#: model:res.partner.bank.type,name:base_iban.bank_iban
+msgid "IBAN Account"
+msgstr "IBAN Konto"
+
+#. module: base_iban
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "RIB og / eller IBAN er ikke gyldig"
diff --git a/addons/base_iban/i18n/nl.po b/addons/base_iban/i18n/nl.po
index 05e4eee2ce1..f139e1a081d 100644
--- a/addons/base_iban/i18n/nl.po
+++ b/addons/base_iban/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-09 12:05+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/nl_BE.po b/addons/base_iban/i18n/nl_BE.po
index e9844948f6e..26bbc0374ea 100644
--- a/addons/base_iban/i18n/nl_BE.po
+++ b/addons/base_iban/i18n/nl_BE.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-04-20 10:04+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-10-01 11:08+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
@@ -23,22 +23,27 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"Definieer een BIC/Swift-code voor IBAN-rekeningen om geldige betalingen te "
+"maken."
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:139
 #, python-format
 msgid "This IBAN does not pass the validation check, please verify it"
 msgstr ""
+"Dit IBAN-nummer voldoet niet aan de controle. Gelieve het nummer na te "
+"kijken."
 
 #. module: base_iban
 #: model:res.partner.bank.type,format_layout:base_iban.bank_iban
 msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
-msgstr ""
+msgstr "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
 msgid "bank_bic"
-msgstr ""
+msgstr "bank_bic"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -67,6 +72,8 @@ msgid ""
 "The IBAN does not seem to be correct. You should have entered something like "
 "this %s"
 msgstr ""
+"Dit IBAN-nummer lijkt niet juist te zijn. U dient een nummer in te geven in "
+"dit formaat %s."
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
@@ -77,7 +84,7 @@ msgstr "IBAN"
 #: code:addons/base_iban/base_iban.py:140
 #, python-format
 msgid "The IBAN is invalid, it should begin with the country code"
-msgstr ""
+msgstr "Dit IBAN-nummer is ongeldig; het moet beginnen met de landcode."
 
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
@@ -87,7 +94,7 @@ msgstr "IBAN-rekening"
 #. module: base_iban
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "RIB en/of IBAN is niet geldig."
 
 #, python-format
 #~ msgid "The IBAN is invalid, It should begin with the country code"
diff --git a/addons/base_iban/i18n/oc.po b/addons/base_iban/i18n/oc.po
index 15a862dd2d1..4b61c338b58 100644
--- a/addons/base_iban/i18n/oc.po
+++ b/addons/base_iban/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/pl.po b/addons/base_iban/i18n/pl.po
index 40dbd859e66..695ce17b215 100644
--- a/addons/base_iban/i18n/pl.po
+++ b/addons/base_iban/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/pt.po b/addons/base_iban/i18n/pt.po
index e3d9480cfbf..da17db6aad5 100644
--- a/addons/base_iban/i18n/pt.po
+++ b/addons/base_iban/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/pt_BR.po b/addons/base_iban/i18n/pt_BR.po
index 0b108ea282b..5c46a321579 100644
--- a/addons/base_iban/i18n/pt_BR.po
+++ b/addons/base_iban/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 15:02+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ro.po b/addons/base_iban/i18n/ro.po
index fab9e68acea..98cd45e3be7 100644
--- a/addons/base_iban/i18n/ro.po
+++ b/addons/base_iban/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ru.po b/addons/base_iban/i18n/ru.po
index 867bcf68906..d7ffb0c254f 100644
--- a/addons/base_iban/i18n/ru.po
+++ b/addons/base_iban/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sk.po b/addons/base_iban/i18n/sk.po
index c0b1fdb4fd9..26d5e43b80a 100644
--- a/addons/base_iban/i18n/sk.po
+++ b/addons/base_iban/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sl.po b/addons/base_iban/i18n/sl.po
index 27c223defc2..62b61aaa37c 100644
--- a/addons/base_iban/i18n/sl.po
+++ b/addons/base_iban/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
@@ -23,17 +23,19 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"Določite BIC / SWIFT kodo banke za bančni račun tipa IBAN"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:139
 #, python-format
 msgid "This IBAN does not pass the validation check, please verify it"
-msgstr ""
+msgstr "IBAN ni opravil testa pravilnosti, prosim preverite ga"
 
 #. module: base_iban
 #: model:res.partner.bank.type,format_layout:base_iban.bank_iban
 msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
-msgstr ""
+msgstr "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
@@ -66,7 +68,7 @@ msgstr "oznaka_države"
 msgid ""
 "The IBAN does not seem to be correct. You should have entered something like "
 "this %s"
-msgstr ""
+msgstr "IBAN ni pravilen. Vnesite ga v naslednjem formatu: %s"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
@@ -77,7 +79,7 @@ msgstr "IBAN"
 #: code:addons/base_iban/base_iban.py:140
 #, python-format
 msgid "The IBAN is invalid, it should begin with the country code"
-msgstr ""
+msgstr "IBAN ni pravilen, pričeti se mora z oznako države"
 
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
@@ -87,7 +89,7 @@ msgstr "račun IBAN"
 #. module: base_iban
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "RIB in/ali IBAN ni veljaven"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda."
diff --git a/addons/base_iban/i18n/sq.po b/addons/base_iban/i18n/sq.po
index 4090aa42cc2..628f477111d 100644
--- a/addons/base_iban/i18n/sq.po
+++ b/addons/base_iban/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sr.po b/addons/base_iban/i18n/sr.po
index 4a40987c081..2c3aa05a61c 100644
--- a/addons/base_iban/i18n/sr.po
+++ b/addons/base_iban/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sr@latin.po b/addons/base_iban/i18n/sr@latin.po
index 11214cc6efa..0ef6b172ad5 100644
--- a/addons/base_iban/i18n/sr@latin.po
+++ b/addons/base_iban/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/sv.po b/addons/base_iban/i18n/sv.po
index afe9cadd521..ed80fe0be25 100644
--- a/addons/base_iban/i18n/sv.po
+++ b/addons/base_iban/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/ta.po b/addons/base_iban/i18n/ta.po
index 93cf0074ea2..d3416e93310 100644
--- a/addons/base_iban/i18n/ta.po
+++ b/addons/base_iban/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/tlh.po b/addons/base_iban/i18n/tlh.po
index 2f80db9b7ba..165b7a07aea 100644
--- a/addons/base_iban/i18n/tlh.po
+++ b/addons/base_iban/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index 05fec2f7a24..cc5fde93398 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/uk.po b/addons/base_iban/i18n/uk.po
index 099fce5952c..8ed07952c14 100644
--- a/addons/base_iban/i18n/uk.po
+++ b/addons/base_iban/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/vi.po b/addons/base_iban/i18n/vi.po
index a1975f5d742..cbe910b1a52 100644
--- a/addons/base_iban/i18n/vi.po
+++ b/addons/base_iban/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/zh_CN.po b/addons/base_iban/i18n/zh_CN.po
index d82648edc23..e1cbc45bcc4 100644
--- a/addons/base_iban/i18n/zh_CN.po
+++ b/addons/base_iban/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
diff --git a/addons/base_iban/i18n/zh_TW.po b/addons/base_iban/i18n/zh_TW.po
index dbeacb6b2b4..969b85e199a 100644
--- a/addons/base_iban/i18n/zh_TW.po
+++ b/addons/base_iban/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-01-30 12:44+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-19 10:36+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_iban
 #: constraint:res.partner.bank:0
@@ -23,27 +23,29 @@ msgid ""
 "Please define BIC/Swift code on bank for bank type IBAN Account to make "
 "valid payments"
 msgstr ""
+"\n"
+"請為 IBAN類型的銀行指定 BIC/Swift代碼，以便自動付款。"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:139
 #, python-format
 msgid "This IBAN does not pass the validation check, please verify it"
-msgstr ""
+msgstr "此IBAN沒有通過檢核，請查證"
 
 #. module: base_iban
 #: model:res.partner.bank.type,format_layout:base_iban.bank_iban
 msgid "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
-msgstr ""
+msgstr "%(bank_name)s: IBAN %(acc_number)s - BIC %(bank_bic)s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_swift_field
 msgid "bank_bic"
-msgstr ""
+msgstr "bank_bic"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
 msgid "zip"
-msgstr ""
+msgstr "zip"
 
 #. module: base_iban
 #: help:res.partner.bank,iban:0
@@ -53,12 +55,12 @@ msgstr "國際銀行帳號(IBAN)"
 #. module: base_iban
 #: model:ir.model,name:base_iban.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr "銀行帳號"
+msgstr "銀行帳戶"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
-msgstr ""
+msgstr "country_id"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:136
@@ -66,18 +68,18 @@ msgstr ""
 msgid ""
 "The IBAN does not seem to be correct. You should have entered something like "
 "this %s"
-msgstr ""
+msgstr "此IBAN似乎不正確。你應該輸入像 %s 的值。"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
 msgid "IBAN"
-msgstr ""
+msgstr "IBAN"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:140
 #, python-format
 msgid "The IBAN is invalid, it should begin with the country code"
-msgstr ""
+msgstr "此IBAN不正確，它開頭應該是國碼。"
 
 #. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
@@ -87,7 +89,7 @@ msgstr "IBAN 帳號"
 #. module: base_iban
 #: constraint:res.partner.bank:0
 msgid "The RIB and/or IBAN is not valid"
-msgstr ""
+msgstr "RIB/IBAN 無效"
 
 #, python-format
 #~ msgid "The IBAN is invalid, It should begin with the country code"
diff --git a/addons/base_import/__init__.py b/addons/base_import/__init__.py
new file mode 100644
index 00000000000..939a8173e38
--- /dev/null
+++ b/addons/base_import/__init__.py
@@ -0,0 +1,3 @@
+import controllers
+import models
+import test_models
diff --git a/addons/base_import/__openerp__.py b/addons/base_import/__openerp__.py
new file mode 100644
index 00000000000..eb8b4561c7e
--- /dev/null
+++ b/addons/base_import/__openerp__.py
@@ -0,0 +1,44 @@
+{
+    'name': 'Base import',
+    'description': """
+New extensible file import for OpenERP
+======================================
+
+Re-implement openerp's file import system:
+
+* Server side, the previous system forces most of the logic into the
+  client which duplicates the effort (between clients), makes the
+  import system much harder to use without a client (direct RPC or
+  other forms of automation) and makes knowledge about the
+  import/export system much harder to gather as it is spread over
+  3+ different projects.
+
+* In a more extensible manner, so users and partners can build their
+  own front-end to import from other file formats (e.g. OpenDocument
+  files) which may be simpler to handle in their work flow or from
+  their data production sources.
+
+* In a module, so that administrators and users of OpenERP who do not
+  need or want an online import can avoid it being available to users.
+""",
+    'category': 'Uncategorized',
+    'website': 'http://www.openerp.com',
+    'author': 'OpenERP SA',
+    'depends': ['web'],
+    'installable': True,
+    'auto_install': False,
+    'data': [
+        'security/ir.model.access.csv',
+    ],
+    'css': [
+        'static/lib/select2/select2.css',
+        'static/src/css/import.css',
+    ],
+    'js': [
+        'static/lib/select2/select2.js',
+        'static/lib/javascript-state-machine/state-machine.js',
+        'static/src/js/import.js',
+    ],
+    'qweb': ['static/src/xml/import.xml'],
+    'test': ['static/test/states.js'],
+}
diff --git a/addons/base_import/controllers.py b/addons/base_import/controllers.py
new file mode 100644
index 00000000000..c831ffd229d
--- /dev/null
+++ b/addons/base_import/controllers.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+import simplejson
+
+import openerp
+
+class ImportController(openerp.addons.web.http.Controller):
+    _cp_path = '/base_import'
+
+    @openerp.addons.web.http.httprequest
+    def set_file(self, req, file, import_id, jsonp='callback'):
+        import_id = int(import_id)
+
+        written = req.session.model('base_import.import').write(import_id, {
+            'file': file.read(),
+            'file_name': file.filename,
+            'file_type': file.content_type,
+        }, req.session.eval_context(req.context))
+
+        return 'window.top.%s(%s)' % (
+            jsonp, simplejson.dumps({'result': written}))
diff --git a/addons/base_import/models.py b/addons/base_import/models.py
new file mode 100644
index 00000000000..996dbf7964d
--- /dev/null
+++ b/addons/base_import/models.py
@@ -0,0 +1,338 @@
+import csv
+import itertools
+import logging
+import operator
+
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from StringIO import StringIO
+
+import psycopg2
+
+from openerp.osv import orm, fields
+from openerp.tools.translate import _
+
+FIELDS_RECURSION_LIMIT = 2
+ERROR_PREVIEW_BYTES = 200
+_logger = logging.getLogger(__name__)
+class ir_import(orm.TransientModel):
+    _name = 'base_import.import'
+    # allow imports to survive for 12h in case user is slow
+    _transient_max_hours = 12.0
+
+    _columns = {
+        'res_model': fields.char('Model', size=64),
+        'file': fields.binary(
+            'File', help="File to check and/or import, raw binary (not base64)"),
+        'file_name': fields.char('File Name', size=None),
+        'file_type': fields.char('File Type', size=None),
+    }
+
+    def get_fields(self, cr, uid, model, context=None,
+                   depth=FIELDS_RECURSION_LIMIT):
+        """ Recursively get fields for the provided model (through
+        fields_get) and filter them according to importability
+
+        The output format is a list of ``Field``, with ``Field``
+        defined as:
+
+        .. class:: Field
+
+            .. attribute:: id (str)
+
+                A non-unique identifier for the field, used to compute
+                the span of the ``required`` attribute: if multiple
+                ``required`` fields have the same id, only one of them
+                is necessary.
+
+            .. attribute:: name (str)
+
+                The field's logical (OpenERP) name within the scope of
+                its parent.
+
+            .. attribute:: string (str)
+
+                The field's human-readable name (``@string``)
+
+            .. attribute:: required (bool)
+
+                Whether the field is marked as required in the
+                model. Clients must provide non-empty import values
+                for all required fields or the import will error out.
+
+            .. attribute:: fields (list(Field))
+
+                The current field's subfields. The database and
+                external identifiers for m2o and m2m fields; a
+                filtered and transformed fields_get for o2m fields (to
+                a variable depth defined by ``depth``).
+
+                Fields with no sub-fields will have an empty list of
+                sub-fields.
+
+        :param str model: name of the model to get fields form
+        :param int landing: depth of recursion into o2m fields
+        """
+        fields = [{
+            'id': 'id',
+            'name': 'id',
+            'string': _("External ID"),
+            'required': False,
+            'fields': [],
+        }]
+        fields_got = self.pool[model].fields_get(cr, uid, context=context)
+        for name, field in fields_got.iteritems():
+            # an empty string means the field is deprecated, @deprecated must
+            # be absent or False to mean not-deprecated
+            if field.get('deprecated', False) is not False:
+                continue
+            if field.get('readonly'):
+                states = field.get('states')
+                if not states:
+                    continue
+                # states = {state: [(attr, value), (attr2, value2)], state2:...}
+                if not any(attr == 'readonly' and value is False
+                           for attr, value in itertools.chain.from_iterable(
+                                states.itervalues())):
+                    continue
+
+            f = {
+                'id': name,
+                'name': name,
+                'string': field['string'],
+                # Y U NO ALWAYS HAS REQUIRED
+                'required': bool(field.get('required')),
+                'fields': [],
+            }
+
+            if field['type'] in ('many2many', 'many2one'):
+                f['fields'] = [
+                    dict(f, name='id', string=_("External ID")),
+                    dict(f, name='.id', string=_("Database ID")),
+                ]
+            elif field['type'] == 'one2many' and depth:
+                f['fields'] = self.get_fields(
+                    cr, uid, field['relation'], context=context, depth=depth-1)
+
+            fields.append(f)
+
+        # TODO: cache on model?
+        return fields
+
+    def _read_csv(self, record, options):
+        """ Returns a CSV-parsed iterator of all empty lines in the file
+
+        :throws csv.Error: if an error is detected during CSV parsing
+        :throws UnicodeDecodeError: if ``options.encoding`` is incorrect
+        """
+        csv_iterator = csv.reader(
+            StringIO(record.file),
+            quotechar=str(options['quoting']),
+            delimiter=str(options['separator']))
+        csv_nonempty = itertools.ifilter(None, csv_iterator)
+        # TODO: guess encoding with chardet? Or https://github.com/aadsm/jschardet
+        encoding = options.get('encoding', 'utf-8')
+        return itertools.imap(
+            lambda row: [item.decode(encoding) for item in row],
+            csv_nonempty)
+
+    def _match_header(self, header, fields, options):
+        """ Attempts to match a given header to a field of the
+        imported model.
+
+        :param str header: header name from the CSV file
+        :param fields:
+        :param dict options:
+        :returns: an empty list if the header couldn't be matched, or
+                  all the fields to traverse
+        :rtype: list(Field)
+        """
+        for field in fields:
+            # FIXME: should match all translations & original
+            # TODO: use string distance (levenshtein? hamming?)
+            if header == field['name'] \
+              or header.lower() == field['string'].lower():
+                return [field]
+
+        if '/' not in header:
+            return []
+
+        # relational field path
+        traversal = []
+        subfields = fields
+        # Iteratively dive into fields tree
+        for section in header.split('/'):
+            # Strip section in case spaces are added around '/' for
+            # readability of paths
+            match = self._match_header(section.strip(), subfields, options)
+            # Any match failure, exit
+            if not match: return []
+            # prep subfields for next iteration within match[0]
+            field = match[0]
+            subfields = field['fields']
+            traversal.append(field)
+        return traversal
+
+    def _match_headers(self, rows, fields, options):
+        """ Attempts to match the imported model's fields to the
+        titles of the parsed CSV file, if the file is supposed to have
+        headers.
+
+        Will consume the first line of the ``rows`` iterator.
+
+        Returns a pair of (None, None) if headers were not requested
+        or the list of headers and a dict mapping cell indices
+        to key paths in the ``fields`` tree
+
+        :param Iterator rows:
+        :param dict fields:
+        :param dict options:
+        :rtype: (None, None) | (list(str), dict(int: list(str)))
+        """
+        if not options.get('headers'):
+            return None, None
+
+        headers = next(rows)
+        return headers, dict(
+            (index, [field['name'] for field in self._match_header(header, fields, options)] or None)
+            for index, header in enumerate(headers)
+        )
+
+    def parse_preview(self, cr, uid, id, options, count=10, context=None):
+        """ Generates a preview of the uploaded files, and performs
+        fields-matching between the import's file data and the model's
+        columns.
+
+        If the headers are not requested (not options.headers),
+        ``matches`` and ``headers`` are both ``False``.
+
+        :param id: identifier of the import
+        :param int count: number of preview lines to generate
+        :param options: format-specific options.
+                        CSV: {encoding, quoting, separator, headers}
+        :type options: {str, str, str, bool}
+        :returns: {fields, matches, headers, preview} | {error, preview}
+        :rtype: {dict(str: dict(...)), dict(int, list(str)), list(str), list(list(str))} | {str, str}
+        """
+        (record,) = self.browse(cr, uid, [id], context=context)
+        fields = self.get_fields(cr, uid, record.res_model, context=context)
+
+        try:
+            rows = self._read_csv(record, options)
+
+            headers, matches = self._match_headers(rows, fields, options)
+            # Match should have consumed the first row (iif headers), get
+            # the ``count`` next rows for preview
+            preview = itertools.islice(rows, count)
+            return {
+                'fields': fields,
+                'matches': matches or False,
+                'headers': headers or False,
+                'preview': list(preview),
+            }
+        except Exception, e:
+            # Due to lazy generators, UnicodeDecodeError (for
+            # instance) may only be raised when serializing the
+            # preview to a list in the return.
+            _logger.debug("Error during CSV parsing preview", exc_info=True)
+            return {
+                'error': str(e),
+                # iso-8859-1 ensures decoding will always succeed,
+                # even if it yields non-printable characters. This is
+                # in case of UnicodeDecodeError (or csv.Error
+                # compounded with UnicodeDecodeError)
+                'preview': record.file[:ERROR_PREVIEW_BYTES]
+                                .decode( 'iso-8859-1'),
+            }
+
+    def _convert_import_data(self, record, fields, options, context=None):
+        """ Extracts the input browse_record and fields list (with
+        ``False``-y placeholders for fields to *not* import) into a
+        format Model.import_data can use: a fields list without holes
+        and the precisely matching data matrix
+
+        :param browse_record record:
+        :param list(str|bool): fields
+        :returns: (data, fields)
+        :rtype: (list(list(str)), list(str))
+        :raises ValueError: in case the import data could not be converted
+        """
+        # Get indices for non-empty fields
+        indices = [index for index, field in enumerate(fields) if field]
+        if not indices:
+            raise ValueError(_("You must configure at least one field to import"))
+        # If only one index, itemgetter will return an atom rather
+        # than a 1-tuple
+        if len(indices) == 1: mapper = lambda row: [row[indices[0]]]
+        else: mapper = operator.itemgetter(*indices)
+        # Get only list of actually imported fields
+        import_fields = filter(None, fields)
+
+        rows_to_import = self._read_csv(record, options)
+        if options.get('headers'):
+            rows_to_import = itertools.islice(
+                rows_to_import, 1, None)
+        data = [
+            row for row in itertools.imap(mapper, rows_to_import)
+            # don't try inserting completely empty rows (e.g. from
+            # filtering out o2m fields)
+            if any(row)
+        ]
+
+        return data, import_fields
+
+    def do(self, cr, uid, id, fields, options, dryrun=False, context=None):
+        """ Actual execution of the import
+
+        :param fields: import mapping: maps each column to a field,
+                       ``False`` for the columns to ignore
+        :type fields: list(str|bool)
+        :param dict options:
+        :param bool dryrun: performs all import operations (and
+                            validations) but rollbacks writes, allows
+                            getting as much errors as possible without
+                            the risk of clobbering the database.
+        :returns: A list of errors. If the list is empty the import
+                  executed fully and correctly. If the list is
+                  non-empty it contains dicts with 3 keys ``type`` the
+                  type of error (``error|warning``); ``message`` the
+                  error message associated with the error (a string)
+                  and ``record`` the data which failed to import (or
+                  ``false`` if that data isn't available or provided)
+        :rtype: list({type, message, record})
+        """
+        cr.execute('SAVEPOINT import')
+
+        (record,) = self.browse(cr, uid, [id], context=context)
+        try:
+            data, import_fields = self._convert_import_data(
+                record, fields, options, context=context)
+        except ValueError, e:
+            return [{
+                'type': 'error',
+                'message': unicode(e),
+                'record': False,
+            }]
+
+        _logger.info('importing %d rows...', len(data))
+        import_result = self.pool[record.res_model].load(
+            cr, uid, import_fields, data, context=context)
+        _logger.info('done')
+
+        # If transaction aborted, RELEASE SAVEPOINT is going to raise
+        # an InternalError (ROLLBACK should work, maybe). Ignore that.
+        # TODO: to handle multiple errors, create savepoint around
+        #       write and release it in case of write error (after
+        #       adding error to errors array) => can keep on trying to
+        #       import stuff, and rollback at the end if there is any
+        #       error in the results.
+        try:
+            if dryrun:
+                cr.execute('ROLLBACK TO SAVEPOINT import')
+            else:
+                cr.execute('RELEASE SAVEPOINT import')
+        except psycopg2.InternalError:
+            pass
+
+        return import_result['messages']
diff --git a/addons/base_import/security/ir.model.access.csv b/addons/base_import/security/ir.model.access.csv
new file mode 100644
index 00000000000..7ed063df1c2
--- /dev/null
+++ b/addons/base_import/security/ir.model.access.csv
@@ -0,0 +1,15 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_base_import_tests_models_char,base.import.tests.models.char,model_base_import_tests_models_char,base.group_user,1,1,1,1
+access_base_import_tests_models_char_required,base.import.tests.models.char.required,model_base_import_tests_models_char_required,base.group_user,1,1,1,1
+access_base_import_tests_models_char_readonly,base.import.tests.models.char.readonly,model_base_import_tests_models_char_readonly,base.group_user,1,1,1,1
+access_base_import_tests_models_char_states,base.import.tests.models.char.states,model_base_import_tests_models_char_states,base.group_user,1,1,1,1
+access_base_import_tests_models_char_noreadonly,base.import.tests.models.char.noreadonly,model_base_import_tests_models_char_noreadonly,base.group_user,1,1,1,1
+access_base_import_tests_models_char_stillreadonly,base.import.tests.models.char.stillreadonly,model_base_import_tests_models_char_stillreadonly,base.group_user,1,1,1,1
+access_base_import_tests_models_m2o,base.import.tests.models.m2o,model_base_import_tests_models_m2o,base.group_user,1,1,1,1
+access_base_import_tests_models_m2o_related,base.import.tests.models.m2o.related,model_base_import_tests_models_m2o_related,base.group_user,1,1,1,1
+access_base_import_tests_models_m2o_required,base.import.tests.models.m2o.required,model_base_import_tests_models_m2o_required,base.group_user,1,1,1,1
+access_base_import_tests_models_m2o_required_related,base.import.tests.models.m2o.required.related,model_base_import_tests_models_m2o_required_related,base.group_user,1,1,1,1
+access_base_import_tests_models_o2m,base.import.tests.models.o2m,model_base_import_tests_models_o2m,base.group_user,1,1,1,1
+access_base_import_tests_models_o2m_child,base.import.tests.models.o2m.child,model_base_import_tests_models_o2m_child,base.group_user,1,1,1,1
+access_base_import_tests_models_preview,base.import.tests.models.preview,model_base_import_tests_models_preview,base.group_user,1,1,1,1
+
diff --git a/addons/base_import/static/csv/External_id_3rd_party_application_product_categories.csv b/addons/base_import/static/csv/External_id_3rd_party_application_product_categories.csv
new file mode 100644
index 00000000000..5b77f269d85
--- /dev/null
+++ b/addons/base_import/static/csv/External_id_3rd_party_application_product_categories.csv
@@ -0,0 +1,6 @@
+External ID,Name,Parent Category/External ID
+a1,Expenses,product.product_category_all
+a2,Other Products,product.product_category_all
+a3,Sellable Products,product.product_category_all
+a4,Tables,a1
+a5,Seating furniture,a2
diff --git a/addons/base_import/static/csv/External_id_3rd_party_application_products.csv b/addons/base_import/static/csv/External_id_3rd_party_application_products.csv
new file mode 100644
index 00000000000..bf2a5238696
--- /dev/null
+++ b/addons/base_import/static/csv/External_id_3rd_party_application_products.csv
@@ -0,0 +1,6 @@
+External ID,Name,Internal Reference,Category/External ID,Can be Expensed,Can be Purchased,Can be Sold,Sale Price,Cost,Supply Method,Product Type,Procurement Method
+a6,Aluminum Stool,ALS,a5,False,True,True,49.00,25.00,Buy,Stockable Product,Make to Stock
+a7,Chair,CHR,a5,False,True,True,89.00,40.00,Buy,Stockable Product,Make to Stock
+a8,Table,TBL,a4,False,True,True,169.00,100.00,Buy,Stockable Product,Make to Stock
+a9,Software Book Tutorial,SBT,a2,False,True,False,19.00,8.00,Buy,Consumable,Make to Stock
+a10,Fuel,FL,a1,True,False,False,0.30,0.25,Buy,Service,Make to Stock
diff --git a/addons/base_import/static/csv/Name_products.csv b/addons/base_import/static/csv/Name_products.csv
new file mode 100644
index 00000000000..b3fa9b572bd
--- /dev/null
+++ b/addons/base_import/static/csv/Name_products.csv
@@ -0,0 +1,6 @@
+Name,Internal Reference,Can be Expensed,Can be Purchased,Can be Sold,Sale Price,Cost,Supply Method,Product Type,Procurement Method
+Aluminum Stool,ALS,False,True,True,49.00,25.00,Buy,Stockable Product,Make to Stock
+Chair,CHR,False,True,True,89.00,40.00,Buy,Stockable Product,Make to Stock
+Table,TBL,False,True,True,169.00,100.00,Buy,Stockable Product,Make to Stock
+Software Book Tutorial,SBT,False,True,False,19.00,8.00,Buy,Consumable,Make to Stock
+Fuel,FL,True,False,False,0.30,0.25,Buy,Service,Make to Stock
diff --git a/addons/base_import/static/csv/database_import_test.sql b/addons/base_import/static/csv/database_import_test.sql
new file mode 100644
index 00000000000..1f79179145e
--- /dev/null
+++ b/addons/base_import/static/csv/database_import_test.sql
@@ -0,0 +1,155 @@
+--
+-- PostgreSQL database dump
+--
+
+SET statement_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = off;
+SET check_function_bodies = false;
+SET client_min_messages = warning;
+SET escape_string_warning = off;
+
+SET search_path = public, pg_catalog;
+
+SET default_tablespace = '';
+
+SET default_with_oids = false;
+
+--
+-- Name: companies; Type: TABLE; Schema: public; Owner: fp; Tablespace: 
+--
+
+CREATE TABLE companies (
+    id integer NOT NULL,
+    company_name character varying
+);
+
+
+ALTER TABLE public.companies OWNER TO fp;
+
+--
+-- Name: companies_id_seq; Type: SEQUENCE; Schema: public; Owner: fp
+--
+
+CREATE SEQUENCE companies_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.companies_id_seq OWNER TO fp;
+
+--
+-- Name: companies_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: fp
+--
+
+ALTER SEQUENCE companies_id_seq OWNED BY companies.id;
+
+
+--
+-- Name: companies_id_seq; Type: SEQUENCE SET; Schema: public; Owner: fp
+--
+
+SELECT pg_catalog.setval('companies_id_seq', 3, true);
+
+
+--
+-- Name: persons; Type: TABLE; Schema: public; Owner: fp; Tablespace: 
+--
+
+CREATE TABLE persons (
+    id integer NOT NULL,
+    company_id integer,
+    person_name character varying
+);
+
+
+ALTER TABLE public.persons OWNER TO fp;
+
+--
+-- Name: persons_id_seq; Type: SEQUENCE; Schema: public; Owner: fp
+--
+
+CREATE SEQUENCE persons_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+
+ALTER TABLE public.persons_id_seq OWNER TO fp;
+
+--
+-- Name: persons_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: fp
+--
+
+ALTER SEQUENCE persons_id_seq OWNED BY persons.id;
+
+
+--
+-- Name: persons_id_seq; Type: SEQUENCE SET; Schema: public; Owner: fp
+--
+
+SELECT pg_catalog.setval('persons_id_seq', 4, true);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: fp
+--
+
+ALTER TABLE ONLY companies ALTER COLUMN id SET DEFAULT nextval('companies_id_seq'::regclass);
+
+
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: fp
+--
+
+ALTER TABLE ONLY persons ALTER COLUMN id SET DEFAULT nextval('persons_id_seq'::regclass);
+
+
+--
+-- Data for Name: companies; Type: TABLE DATA; Schema: public; Owner: fp
+--
+
+COPY companies (id, company_name) FROM stdin;
+1	Bigees
+2	Organi
+3	Boum
+\.
+
+
+--
+-- Data for Name: persons; Type: TABLE DATA; Schema: public; Owner: fp
+--
+
+COPY persons (id, company_id, person_name) FROM stdin;
+1	1	Fabien
+2	1	Laurence
+3	2	Eric
+4	3	Ramsy
+\.
+
+
+--
+-- Name: companies_pkey; Type: CONSTRAINT; Schema: public; Owner: fp; Tablespace: 
+--
+
+ALTER TABLE ONLY companies
+    ADD CONSTRAINT companies_pkey PRIMARY KEY (id);
+
+
+--
+-- Name: persons_company_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: fp
+--
+
+ALTER TABLE ONLY persons
+    ADD CONSTRAINT persons_company_id_fkey FOREIGN KEY (company_id) REFERENCES companies(id);
+
+
+--
+-- PostgreSQL database dump complete
+--
+
diff --git a/addons/base_import/static/csv/m2m_customers_tags.csv b/addons/base_import/static/csv/m2m_customers_tags.csv
new file mode 100644
index 00000000000..e6d74d4f844
--- /dev/null
+++ b/addons/base_import/static/csv/m2m_customers_tags.csv
@@ -0,0 +1,6 @@
+Name,Reference,Tags,Customer,Street,City,Country
+Credit & Leasing,3,Services,True,Central Avenue 814,Johannesburg,South Africa
+Services & Finance,5,"Consultancy Services,IT Services",True,Grove Road 5,London,United Kingdom
+Hydra Supplies,6,"Manufacturer,Retailer",True,Palm Street 9,Los Angeles,United States
+Bolts & Screws,8,"Wholesaler,Components Buyer",True,Rua Américo 1000,Campinas,Brazil
+National Parts & Supplies,18,"Manufacturer,Wholesaler",True,Guangdong Way 20,Shenzen,China
diff --git a/addons/base_import/static/csv/o2m_purchase_order_lines.csv b/addons/base_import/static/csv/o2m_purchase_order_lines.csv
new file mode 100644
index 00000000000..4778b99cb81
--- /dev/null
+++ b/addons/base_import/static/csv/o2m_purchase_order_lines.csv
@@ -0,0 +1,10 @@
+Order Date,Order Reference,Supplier,Destination,Pricelist,Order Lines / Product,Order Lines / Quantity
+2012-12-15,PO00008,ASUSTeK,Stock,Default Purchase Pricelist,ADPT,20
+,,,,,CARD,30
+,,,,,C-Case,40
+2012-12-15,PO00009,Axelor,Stock,Default Purchase Pricelist,CD,5
+,,,,,CPUa8,15
+2012-12-15,PO000010,China Export,Stock,Default Purchase Pricelist,HDD SH-1,10
+,,,,,HDD SH-2,20
+,,,,,LAP-CUS,35
+,,,,,LAP-E5,40
diff --git a/addons/base_import/static/csv/o2m_suppliers_contacts.csv b/addons/base_import/static/csv/o2m_suppliers_contacts.csv
new file mode 100644
index 00000000000..6c7be9037b8
--- /dev/null
+++ b/addons/base_import/static/csv/o2m_suppliers_contacts.csv
@@ -0,0 +1,8 @@
+Name,Address type,Street,City,Country,Tags,Supplier,Customer,Is a company,Companies that refers to partner / Parent company
+Wood y Wood Pecker,,"Snow Street, 25",Kainuu,Finland,Supplier,1,0,1,
+Roger Pecker,Default,"Snow Street, 27",Kainuu,Finland,Supplier,1,0,0,Wood y Wood Pecker
+Sharon Pecker,Delivery,"Snow Street, 28",Kainuu,Finland,Supplier,1,0,0,Wood y Wood Pecker
+Thomas Pecker,Contact,"Snow Street, 27",Kainuu,Finland,Supplier,1,0,0,Wood y Wood Pecker
+Vicking Direct,,"Atonium Street, 45a",Brussels,Belgium,Supplier,1,0,1,
+Yvan Holiday,Invoice,"Atonium Street, 45b",Brussels,Belgium,Supplier,1,0,0,Vicking Direct
+Jack Unsworth,Contact,"Atonium Street, 45a",Brussels,Belgium,Supplier,1,0,0,Vicking Direct
diff --git a/addons/base_import/static/csv/purchase.order_functional_error_line_cant_adpat.csv b/addons/base_import/static/csv/purchase.order_functional_error_line_cant_adpat.csv
new file mode 100644
index 00000000000..3b428763431
--- /dev/null
+++ b/addons/base_import/static/csv/purchase.order_functional_error_line_cant_adpat.csv
@@ -0,0 +1,6 @@
+"Order Reference","Supplier","Destination","Pricelist","Order Lines / Product","Order Lines / Quantity"
+"PO000020","ASUSTeK","Stock","Default Purchase Pricelist","ADPT",20
+,,,,"CARD",30
+,,,,"C-Case",40
+"PO000021","Axelor","Stock","Default Purchase Pricelist","CD",5
+,,,,"CPUa8",15
diff --git a/addons/base_import/static/lib/javascript-state-machine/LICENSE b/addons/base_import/static/lib/javascript-state-machine/LICENSE
new file mode 100644
index 00000000000..8ad703ca4ef
--- /dev/null
+++ b/addons/base_import/static/lib/javascript-state-machine/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2012 Jake Gordon and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/addons/base_import/static/lib/javascript-state-machine/README.md b/addons/base_import/static/lib/javascript-state-machine/README.md
new file mode 100644
index 00000000000..64c045e69d7
--- /dev/null
+++ b/addons/base_import/static/lib/javascript-state-machine/README.md
@@ -0,0 +1,327 @@
+Javascript Finite State Machine (v2.1.0)
+========================================
+
+This standalone javascript micro-framework provides a finite state machine for your pleasure.
+
+ * You can find the [code here](https://github.com/jakesgordon/javascript-state-machine)
+ * You can find a [description here](http://codeincomplete.com/posts/2011/8/19/javascript_state_machine_v2/)
+ * You can find a [working demo here](http://codeincomplete.com/posts/2011/8/19/javascript_state_machine_v2/example/)
+
+Download
+========
+
+You can download [state-machine.js](https://github.com/jakesgordon/javascript-state-machine/raw/master/state-machine.js),
+or the [minified version](https://github.com/jakesgordon/javascript-state-machine/raw/master/state-machine.min.js)
+
+Alternatively:
+
+    git clone git@github.com:jakesgordon/javascript-state-machine
+
+
+ * All code is in state-machine.js
+ * Minified version provided in state-machine.min.js
+ * No 3rd party library is required
+ * Demo can be found in /index.html
+ * QUnit tests can be found in /test/index.html
+
+Usage
+=====
+
+Include `state-machine.min.js` in your application.
+
+In its simplest form, create a standalone state machine using:
+
+    var fsm = StateMachine.create({
+      initial: 'green',
+      events: [
+        { name: 'warn',  from: 'green',  to: 'yellow' },
+        { name: 'panic', from: 'yellow', to: 'red'    },
+        { name: 'calm',  from: 'red',    to: 'yellow' },
+        { name: 'clear', from: 'yellow', to: 'green'  }
+    ]});
+
+... will create an object with a method for each event:
+
+ * fsm.warn()  - transition from 'green' to 'yellow'
+ * fsm.panic() - transition from 'yellow' to 'red'
+ * fsm.calm()  - transition from 'red' to 'yellow'
+ * fsm.clear() - transition from 'yellow' to 'green'
+
+along with the following members:
+
+ * fsm.current   - contains the current state
+ * fsm.is(s)     - return true if state `s` is the current state
+ * fsm.can(e)    - return true if event `e` can be fired in the current state
+ * fsm.cannot(e) - return true if event `e` cannot be fired in the current state
+
+Multiple 'from' and 'to' states for a single event
+==================================================
+
+If an event is allowed **from** multiple states, and always transitions to the same
+state, then simply provide an array of states in the `from` attribute of an event. However,
+if an event is allowed from multiple states, but should transition **to** a different
+state depending on the current state, then provide multiple event entries with
+the same name:
+
+    var fsm = StateMachine.create({
+      initial: 'hungry',
+      events: [
+        { name: 'eat',  from: 'hungry',                                to: 'satisfied' },
+        { name: 'eat',  from: 'satisfied',                             to: 'full'      },
+        { name: 'eat',  from: 'full',                                  to: 'sick'      },
+        { name: 'rest', from: ['hungry', 'satisfied', 'full', 'sick'], to: 'hungry'    },
+    ]});
+
+This example will create an object with 2 event methods:
+
+ * fsm.eat()
+ * fsm.rest()
+
+The `rest` event will always transition to the `hungry` state, while the `eat` event
+will transition to a state that is dependent on the current state.
+
+>> NOTE: The `rest` event could use a wildcard '*' for the 'from' state if it should be
+allowed from any current state.
+
+>> NOTE: The `rest` event in the above example can also be specified as multiple events with
+the same name if you prefer the verbose approach.
+
+Callbacks
+=========
+
+4 callbacks are available if your state machine has methods using the following naming conventions:
+
+ * onbefore**event** - fired before the event
+ * onleave**state**  - fired when leaving the old state
+ * onenter**state**  - fired when entering the new state
+ * onafter**event**  - fired after the event
+
+You can affect the event in 3 ways:
+
+ * return `false` from an `onbeforeevent` handler to cancel the event.
+ * return `false` from an `onleavestate` handler to cancel the event.
+ * return `ASYNC` from an `onleavestate` handler to perform an asynchronous state transition (see next section)
+
+For convenience, the 2 most useful callbacks can be shortened:
+
+ * on**event** - convenience shorthand for onafter**event**
+ * on**state** - convenience shorthand for onenter**state**
+
+In addition, a generic `onchangestate()` callback can be used to call a single function for _all_ state changes:
+
+All callbacks will be passed the same arguments:
+
+ * **event** name
+ * **from** state
+ * **to** state
+ * _(followed by any arguments you passed into the original event method)_
+
+Callbacks can be specified when the state machine is first created:
+
+    var fsm = StateMachine.create({
+      initial: 'green',
+      events: [
+        { name: 'warn',  from: 'green',  to: 'yellow' },
+        { name: 'panic', from: 'yellow', to: 'red'    },
+        { name: 'calm',  from: 'red',    to: 'yellow' },
+        { name: 'clear', from: 'yellow', to: 'green'  }
+      ],
+      callbacks: {
+        onpanic:  function(event, from, to, msg) { alert('panic! ' + msg);               },
+        onclear:  function(event, from, to, msg) { alert('thanks to ' + msg);            },
+        ongreen:  function(event, from, to)      { document.body.className = 'green';    },
+        onyellow: function(event, from, to)      { document.body.className = 'yellow';   },
+        onred:    function(event, from, to)      { document.body.className = 'red';      },
+      }
+    });
+
+    fsm.panic('killer bees');
+    fsm.clear('sedatives in the honey pots');
+    ...
+
+Additionally, they can be added and removed from the state machine at any time:
+
+    fsm.ongreen       = null;
+    fsm.onyellow      = null;
+    fsm.onred         = null;
+    fsm.onchangestate = function(event, from, to) { document.body.className = to; };
+
+Asynchronous State Transitions
+==============================
+
+Sometimes, you need to execute some asynchronous code during a state transition and ensure the
+new state is not entered until your code has completed.
+
+A good example of this is when you transition out of a `menu` state, perhaps you want to gradually
+fade the menu away, or slide it off the screen and don't want to transition to your `game` state
+until after that animation has been performed.
+
+You can now return `StateMachine.ASYNC` from your `onleavestate` handler and the state machine
+will be _'put on hold'_ until you are ready to trigger the transition using the new `transition()`
+method.
+
+For example, using jQuery effects:
+
+    var fsm = StateMachine.create({
+
+      initial: 'menu',
+
+      events: [
+        { name: 'play', from: 'menu', to: 'game' },
+        { name: 'quit', from: 'game', to: 'menu' }
+      ],
+
+      callbacks: {
+
+        onentermenu: function() { $('#menu').show(); },
+        onentergame: function() { $('#game').show(); },
+
+        onleavemenu: function() {
+          $('#menu').fadeOut('fast', function() {
+            fsm.transition();
+          });
+          return StateMachine.ASYNC; // tell StateMachine to defer next state until we call transition (in fadeOut callback above)
+        },
+
+        onleavegame: function() {
+          $('#game').slideDown('slow', function() {
+            fsm.transition();
+          };
+          return StateMachine.ASYNC; // tell StateMachine to defer next state until we call transition (in slideDown callback above)
+        }
+
+      }
+    });
+
+
+State Machine Classes
+=====================
+
+You can also turn all instances of a  _class_ into an FSM by applying
+the state machine functionality to the prototype, including your callbacks
+in your prototype, and providing a `startup` event for use when constructing
+instances:
+
+    MyFSM = function() {    // my constructor function
+      this.startup();
+    };
+
+    MyFSM.prototype = {
+
+      onpanic: function(event, from, to) { alert('panic');        },
+      onclear: function(event, from, to) { alert('all is clear'); },
+
+      // my other prototype methods
+
+    };
+
+    StateMachine.create({
+      target: MyFSM.prototype,
+      events: [
+        { name: 'startup', from: 'none',   to: 'green'  },
+        { name: 'warn',    from: 'green',  to: 'yellow' },
+        { name: 'panic',   from: 'yellow', to: 'red'    },
+        { name: 'calm',    from: 'red',    to: 'yellow' },
+        { name: 'clear',   from: 'yellow', to: 'green'  }
+      ]});
+
+
+This should be easy to adjust to fit your appropriate mechanism for object construction.
+
+Initialization Options
+======================
+
+How the state machine should initialize can depend on your application requirements, so
+the library provides a number of simple options.
+
+By default, if you dont specify any initial state, the state machine will be in the `'none'`
+state and you would need to provide an event to take it out of this state:
+
+    var fsm = StateMachine.create({
+      events: [
+        { name: 'startup', from: 'none',  to: 'green' },
+        { name: 'panic',   from: 'green', to: 'red'   },
+        { name: 'calm',    from: 'red',   to: 'green' },
+    ]});
+    alert(fsm.current); // "none"
+    fsm.startup();
+    alert(fsm.current); // "green"
+
+If you specify the name of your initial event (as in all the earlier examples), then an
+implicit `startup` event will be created for you and fired when the state machine is constructed.
+
+    var fsm = StateMachine.create({
+      initial: 'green',
+      events: [
+        { name: 'panic', from: 'green', to: 'red'   },
+        { name: 'calm',  from: 'red',   to: 'green' },
+    ]});
+    alert(fsm.current); // "green"
+
+If your object already has a `startup` method you can use a different name for the initial event
+
+    var fsm = StateMachine.create({
+      initial: { state: 'green', event: 'init' },
+      events: [
+        { name: 'panic', from: 'green', to: 'red'   },
+        { name: 'calm',  from: 'red',   to: 'green' },
+    ]});
+    alert(fsm.current); // "green"
+
+Finally, if you want to wait to call the initial state transition event until a later date you
+can `defer` it:
+
+    var fsm = StateMachine.create({
+      initial: { state: 'green', event: 'init', defer: true },
+      events: [
+        { name: 'panic', from: 'green', to: 'red'   },
+        { name: 'calm',  from: 'red',   to: 'green' },
+    ]});
+    alert(fsm.current); // "none"
+    fsm.init();
+    alert(fsm.current); // "green"
+
+Of course, we have now come full circle, this last example is pretty much functionally the
+same as the first example in this section where you simply define your own startup event.
+
+So you have a number of choices available to you when initializing your state machine.
+
+Handling Failures
+======================
+
+By default, if you try to call an event method that is not allowed in the current state, the
+state machine will throw an exception. If you prefer to handle the problem yourself, you can
+define a custom `error` handler:
+
+    var fsm = StateMachine.create({
+      initial: 'green',
+      error: function(eventName, from, to, args, errorCode, errorMessage) {
+        return 'event ' + eventName + ' was naughty :- ' + errorMessage;
+      },
+      events: [
+        { name: 'panic', from: 'green', to: 'red'   },
+        { name: 'calm',  from: 'red',   to: 'green' },
+    ]});
+    alert(fsm.calm()); // "event calm was naughty :- event not allowed in current state green"
+
+Release Notes
+=============
+
+See [RELEASE NOTES](https://github.com/jakesgordon/javascript-state-machine/blob/master/RELEASE_NOTES.md) file.
+
+License
+=======
+
+See [LICENSE](https://github.com/jakesgordon/javascript-state-machine/blob/master/LICENSE) file.
+
+Contact
+=======
+
+If you have any ideas, feedback, requests or bug reports, you can reach me at
+[jake@codeincomplete.com](mailto:jake@codeincomplete.com), or via
+my website: [Code inComplete](http://codeincomplete.com/posts/2011/8/19/javascript_state_machine_v2/)
+
+
+
+
+
diff --git a/addons/base_import/static/lib/javascript-state-machine/RELEASE_NOTES.md b/addons/base_import/static/lib/javascript-state-machine/RELEASE_NOTES.md
new file mode 100644
index 00000000000..06abf402d38
--- /dev/null
+++ b/addons/base_import/static/lib/javascript-state-machine/RELEASE_NOTES.md
@@ -0,0 +1,32 @@
+Version 2.1.0 (January 7th 2012)
+--------------------------------
+
+ * Wrapped in self executing function to be more easily used with loaders like `require.js` or `curl.js` (issue #15)
+ * Allow event to be cancelled by returning `false` from `onleavestate` handler (issue #13) - WARNING: this breaks backward compatibility for async transitions (you now need to return `StateMachine.ASYNC` instead of `false`)
+ * Added explicit return values for event methods (issue #12)
+ * Added support for wildcard events that can be fired 'from' any state (issue #11)
+ * Added support for no-op events that transition 'to' the same state  (issue #5)
+ * extended custom error callback to handle any exceptions caused by caller provided callbacks
+ * added custom error callback to override exception when an illegal state transition is attempted (thanks to cboone)
+ * fixed typos (thanks to cboone)
+ * fixed issue #4 - ensure before/after event hooks are called even if the event doesn't result in a state change 
+
+Version 2.0.0 (August 19th 2011)
+--------------------------------
+
+ * adding support for asynchronous state transitions (see README) - with lots of qunit tests (see test/async.js).
+ * consistent arguments for ALL callbacks, first 3 args are ALWAYS event name, from state and to state, followed by whatever arguments the user passed to the original event method.
+ * added a generic `onchangestate(event,from,to)` callback to detect all state changes with a single function.
+ * allow callbacks to be declared at creation time (instead of having to attach them afterwards)
+ * renamed 'hooks' => 'callbacks'
+ * [read more...](http://codeincomplete.com/posts/2011/8/19/javascript_state_machine_v2/)
+
+Version 1.2.0 (June 21st 2011)
+------------------------------
+ * allows the same event to transition to different states, depending on the current state (see 'Multiple...' section in README.md)
+ * [read more...](http://codeincomplete.com/posts/2011/6/21/javascript_state_machine_v1_2_0/)
+
+Version 1.0.0 (June 1st 2011)
+-----------------------------
+ * initial version
+ * [read more...](http://codeincomplete.com/posts/2011/6/1/javascript_state_machine/)
diff --git a/addons/base_import/static/lib/javascript-state-machine/Rakefile b/addons/base_import/static/lib/javascript-state-machine/Rakefile
new file mode 100644
index 00000000000..beb8702a7f0
--- /dev/null
+++ b/addons/base_import/static/lib/javascript-state-machine/Rakefile
@@ -0,0 +1,8 @@
+
+desc "create minified version of state-machine.js"
+task :minify do
+  require File.expand_path(File.join(File.dirname(__FILE__), 'minifier/minifier'))
+  Minifier.enabled = true
+  Minifier.minify('state-machine.js')
+end
+
diff --git a/addons/base_import/static/lib/javascript-state-machine/index.html b/addons/base_import/static/lib/javascript-state-machine/index.html
new file mode 100644
index 00000000000..2d6cb62617b
--- /dev/null
+++ b/addons/base_import/static/lib/javascript-state-machine/index.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html> 
+<html>
+<head>
+  <title>Javascript Finite State Machine</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
+  <link href="demo/demo.css" media="screen, print" rel="stylesheet" type="text/css" /> 
+</head> 
+ 
+<body> 
+
+  <div id="demo" class='green'>
+
+    <h1> Finite State Machine </h1>
+
+    <div id="controls">
+      <button id="clear" onclick="Demo.clear();">clear</button>
+      <button id="calm"  onclick="Demo.calm();">calm</button>
+      <button id="warn"  onclick="Demo.warn();">warn</button>
+      <button id="panic" onclick="Demo.panic();">panic!</button>
+    </div>
+
+    <div id="diagram">
+    </div>
+
+    <div id="notes">
+      <i>dashed lines are asynchronous state transitions (3 seconds)</i>
+    </div>
+
+    <textarea id="output">
+    </textarea>
+
+  </div>
+
+
+  <script src="state-machine.js"></script>
+  <script src="demo/demo.js"></script>
+
+</body> 
+</html>
diff --git a/addons/base_import/static/lib/javascript-state-machine/state-machine.js b/addons/base_import/static/lib/javascript-state-machine/state-machine.js
new file mode 100644
index 00000000000..0d503ee7bdb
--- /dev/null
+++ b/addons/base_import/static/lib/javascript-state-machine/state-machine.js
@@ -0,0 +1,155 @@
+(function (window) {
+
+  StateMachine = {
+
+    //---------------------------------------------------------------------------
+
+    VERSION: "2.1.0",
+
+    //---------------------------------------------------------------------------
+
+    Result: {
+      SUCCEEDED:    1, // the event transitioned successfully from one state to another
+      NOTRANSITION: 2, // the event was successfull but no state transition was necessary
+      CANCELLED:    3, // the event was cancelled by the caller in a beforeEvent callback
+      ASYNC:        4, // the event is asynchronous and the caller is in control of when the transition occurs
+    },
+
+    Error: {
+      INVALID_TRANSITION: 100, // caller tried to fire an event that was innapropriate in the current state
+      PENDING_TRANSITION: 200, // caller tried to fire an event while an async transition was still pending
+      INVALID_CALLBACK:   300, // caller provided callback function threw an exception
+    },
+
+    WILDCARD: '*',
+    ASYNC: 'async',
+
+    //---------------------------------------------------------------------------
+
+    create: function(cfg, target) {
+
+      var initial   = (typeof cfg.initial == 'string') ? { state: cfg.initial } : cfg.initial; // allow for a simple string, or an object with { state: 'foo', event: 'setup', defer: true|false }
+      var fsm       = target || cfg.target  || {};
+      var events    = cfg.events || [];
+      var callbacks = cfg.callbacks || {};
+      var map       = {};
+
+      var add = function(e) {
+        var from = (e.from instanceof Array) ? e.from : (e.from ? [e.from] : [StateMachine.WILDCARD]); // allow 'wildcard' transition if 'from' is not specified
+        map[e.name] = map[e.name] || {};
+        for (var n = 0 ; n < from.length ; n++)
+          map[e.name][from[n]] = e.to || from[n]; // allow no-op transition if 'to' is not specified
+      };
+
+      if (initial) {
+        initial.event = initial.event || 'startup';
+        add({ name: initial.event, from: 'none', to: initial.state });
+      }
+
+      for(var n = 0 ; n < events.length ; n++)
+        add(events[n]);
+
+      for(var name in map) {
+        if (map.hasOwnProperty(name))
+          fsm[name] = StateMachine.buildEvent(name, map[name]);
+      }
+
+      for(var name in callbacks) {
+        if (callbacks.hasOwnProperty(name))
+          fsm[name] = callbacks[name]
+      }
+
+      fsm.current = 'none';
+      fsm.is      = function(state) { return this.current == state; };
+      fsm.can     = function(event) { return !this.transition && (map[event].hasOwnProperty(this.current) || map[event].hasOwnProperty(StateMachine.WILDCARD)); }
+      fsm.cannot  = function(event) { return !this.can(event); };
+      fsm.error   = cfg.error || function(name, from, to, args, error, msg) { throw msg; }; // default behavior when something unexpected happens is to throw an exception, but caller can override this behavior if desired (see github issue #3)
+
+      if (initial && !initial.defer)
+        fsm[initial.event]();
+
+      return fsm;
+
+    },
+
+    //===========================================================================
+
+    doCallback: function(fsm, func, name, from, to, args) {
+      if (func) {
+        try {
+          return func.apply(fsm, [name, from, to].concat(args));
+        }
+        catch(e) {
+          return fsm.error(name, from, to, args, StateMachine.Error.INVALID_CALLBACK, "an exception occurred in a caller-provided callback function");
+        }
+      }
+    },
+
+    beforeEvent: function(fsm, name, from, to, args) { return StateMachine.doCallback(fsm, fsm['onbefore' + name],                     name, from, to, args); },
+    afterEvent:  function(fsm, name, from, to, args) { return StateMachine.doCallback(fsm, fsm['onafter'  + name] || fsm['on' + name], name, from, to, args); },
+    leaveState:  function(fsm, name, from, to, args) { return StateMachine.doCallback(fsm, fsm['onleave'  + from],                     name, from, to, args); },
+    enterState:  function(fsm, name, from, to, args) { return StateMachine.doCallback(fsm, fsm['onenter'  + to]   || fsm['on' + to],   name, from, to, args); },
+    changeState: function(fsm, name, from, to, args) { return StateMachine.doCallback(fsm, fsm['onchangestate'],                       name, from, to, args); },
+
+
+    buildEvent: function(name, map) {
+      return function() {
+
+        var from  = this.current;
+        var to    = map[from] || map[StateMachine.WILDCARD] || from;
+        var args  = Array.prototype.slice.call(arguments); // turn arguments into pure array
+
+        if (this.transition)
+          return this.error(name, from, to, args, StateMachine.Error.PENDING_TRANSITION, "event " + name + " inappropriate because previous transition did not complete");
+
+        if (this.cannot(name))
+          return this.error(name, from, to, args, StateMachine.Error.INVALID_TRANSITION, "event " + name + " inappropriate in current state " + this.current);
+
+        if (false === StateMachine.beforeEvent(this, name, from, to, args))
+          return StateMachine.CANCELLED;
+
+        if (from === to) {
+          StateMachine.afterEvent(this, name, from, to, args);
+          return StateMachine.NOTRANSITION;
+        }
+
+        // prepare a transition method for use EITHER lower down, or by caller if they want an async transition (indicated by an ASYNC return value from leaveState)
+        var fsm = this;
+        this.transition = function() {
+          fsm.transition = null; // this method should only ever be called once
+          fsm.current = to;
+          StateMachine.enterState( fsm, name, from, to, args);
+          StateMachine.changeState(fsm, name, from, to, args);
+          StateMachine.afterEvent( fsm, name, from, to, args);
+        };
+
+        var leave = StateMachine.leaveState(this, name, from, to, args);
+        if (false === leave) {
+          this.transition = null;
+          return StateMachine.CANCELLED;
+        }
+        else if ("async" === leave) {
+          return StateMachine.ASYNC;
+        }
+        else {
+          if (this.transition)
+            this.transition(); // in case user manually called transition() but forgot to return ASYNC
+          return StateMachine.SUCCEEDED;
+        }
+
+      };
+    }
+
+  }; // StateMachine
+
+  //===========================================================================
+
+  if ("function" === typeof define) {
+    define("statemachine", [], function() { return StateMachine; });
+  }
+  else {
+    window.StateMachine = StateMachine;
+  }
+
+}(this));
+
diff --git a/addons/base_import/static/lib/select2/LICENSE b/addons/base_import/static/lib/select2/LICENSE
new file mode 100644
index 00000000000..627fddef413
--- /dev/null
+++ b/addons/base_import/static/lib/select2/LICENSE
@@ -0,0 +1,12 @@
+Copyright 2012 Igor Vaynberg
+ 
+Version: @@ver@@ Timestamp: @@timestamp@@
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in
+compliance with the License. You may obtain a copy of the License in the LICENSE file, or at:
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and limitations under the License.
\ No newline at end of file
diff --git a/addons/base_import/static/lib/select2/README.md b/addons/base_import/static/lib/select2/README.md
new file mode 100755
index 00000000000..3a6dcaf1ba4
--- /dev/null
+++ b/addons/base_import/static/lib/select2/README.md
@@ -0,0 +1,68 @@
+Select2
+=================
+
+Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results. Look and feel of Select2 is based on the excellent [Chosen](http://harvesthq.github.com/chosen/) library.
+
+To get started -- checkout http://ivaynberg.github.com/select2!
+
+What Does Select2 Support That Chosen Does Not?
+-------------------------------------------------
+
+* Working with large datasets: Chosen requires the entire dataset to be loaded as `option` tags in the DOM, which limits
+it to working with small-ish datasets. Select2 uses a function to find results on-the-fly, which allows it to partially
+load results.
+* Paging of results: Since Select2 works with large datasets and only loads a small amount of matching results at a time
+it has to support paging. Select2 will call the search function when the user scrolls to the bottom of currently loaded
+result set allowing for the 'infinite scrolling' of results.
+* Custom markup for results: Chosen only supports rendering text results because that is the only markup supported by
+`option` tags. Select2 provides an extension point which can be used to produce any kind of markup to represent results.
+* Ability to add results on the fly: Select2 provides the ability to add results from the search term entered by the user, which allows it to be used for
+tagging.
+
+Browser Compatibility
+--------------------
+* IE 8+ (7 mostly works except for [issue with z-index](https://github.com/ivaynberg/select2/issues/37))
+* Chrome 8+
+* Firefox 3.5+
+* Safari 3+
+* Opera 10.6+
+
+Integrations
+------------
+
+* [Wicket-Select2](https://github.com/ivaynberg/wicket-select2) (Java / Apache Wicket)
+* [select2-rails](https://github.com/argerim/select2-rails) (Ruby on Rails)
+* [AngularUI](http://angular-ui.github.com/#directives-select2) ([AngularJS](angularjs.org))
+* [Django](https://github.com/applegrew/django-select2)
+
+Bug tracker
+-----------
+
+Have a bug? Please create an issue here on GitHub!
+
+https://github.com/ivaynberg/select2/issues
+
+
+Mailing list
+------------
+
+Have a question? Ask on our mailing list!
+
+select2@googlegroups.com
+
+https://groups.google.com/d/forum/select2
+
+
+Copyright and License
+---------------------
+
+Copyright 2012 Igor Vaynberg
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in
+compliance with the License. You may obtain a copy of the License in the LICENSE file, or at:
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and limitations under the License.
\ No newline at end of file
diff --git a/addons/base_import/static/lib/select2/release.sh b/addons/base_import/static/lib/select2/release.sh
new file mode 100755
index 00000000000..79eaabd621d
--- /dev/null
+++ b/addons/base_import/static/lib/select2/release.sh
@@ -0,0 +1,77 @@
+#!/bin/bash
+set -e
+
+echo -n "Enter the version for this release: "
+
+read ver
+
+if [ ! $ver ]; then 
+	echo "Invalid version."
+	exit
+fi
+
+name="select2"
+js="$name.js"
+mini="$name.min.js"
+css="$name.css"
+release="$name-$ver"
+releasedir="/tmp/$release"
+tag="release-$ver"
+branch="build-$ver"
+curbranch=`git branch | grep "*" | sed "s/* //"`
+timestamp=$(date)
+tokens="s/@@ver@@/$ver/g;s/\@@timestamp@@/$timestamp/g"
+remote="github"
+
+git branch "$branch"
+git checkout "$branch"
+
+echo "Tokenizing..."
+
+find . -name "$js" | xargs sed -i -e "$tokens"
+find . -name "$css" | xargs sed -i -e "$tokens"
+
+git add "$js"
+git add "$css"
+
+echo "Minifying..."
+
+echo "/*" > "$mini"
+cat LICENSE | sed "$tokens" >> "$mini"
+echo "*/" >> "$mini"
+
+curl -s \
+	-d compilation_level=SIMPLE_OPTIMIZATIONS \
+	-d output_format=text \
+	-d output_info=compiled_code \
+	--data-urlencode "js_code@$js" \
+	http://closure-compiler.appspot.com/compile \
+	>> "$mini"
+
+git add "$mini"
+	
+git commit -m "release $ver"
+
+echo "Tagging..."
+
+git tag -a "$tag" -m "tagged version $ver"
+git push "$remote" --tags
+
+echo "Archiving..."
+
+rm -rf "$releasedir"
+mkdir "$releasedir"
+
+cp $name.* "$releasedir"
+cp spinner.gif "$releasedir"
+cp README.* "$releasedir"
+
+zip -r "$releasedir.zip" "$releasedir"
+rm -rf "$releasedir"
+
+echo "Cleaning Up..."
+
+git checkout "$curbranch"
+git branch -D "$branch"
+
+echo "Done. Release archive created: $releasedir.zip"
diff --git a/addons/base_import/static/lib/select2/select2.css b/addons/base_import/static/lib/select2/select2.css
new file mode 100755
index 00000000000..f0bdfb82f04
--- /dev/null
+++ b/addons/base_import/static/lib/select2/select2.css
@@ -0,0 +1,524 @@
+/*
+Version: @@ver@@ Timestamp: @@timestamp@@
+*/
+.select2-container {
+    position: relative;
+    display: inline-block;
+    /* inline-block for ie7 */
+    zoom: 1;
+    *display: inline;
+    vertical-align: top;
+}
+
+.select2-container,
+.select2-drop,
+.select2-search,
+.select2-search input{
+  /*
+    Force border-box so that % widths fit the parent
+    container without overlap because of margin/padding.
+
+    More Info : http://www.quirksmode.org/css/box.html
+  */
+  -moz-box-sizing: border-box;    /* firefox */
+  -ms-box-sizing: border-box;     /* ie */
+  -webkit-box-sizing: border-box; /* webkit */
+  -khtml-box-sizing: border-box;  /* konqueror */
+  box-sizing: border-box;         /* css3 */
+}
+
+.select2-container .select2-choice {
+    background-color: #fff;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.5, white));
+    background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 50%);
+    background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 50%);
+    background-image: -o-linear-gradient(bottom, #eeeeee 0%, #ffffff 50%);
+    background-image: -ms-linear-gradient(top, #eeeeee 0%, #ffffff 50%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#eeeeee', endColorstr = '#ffffff', GradientType = 0);
+    background-image: linear-gradient(top, #eeeeee 0%, #ffffff 50%);
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+    -moz-background-clip: padding;
+    -webkit-background-clip: padding-box;
+    background-clip: padding-box;
+    border: 1px solid #aaa;
+    display: block;
+    overflow: hidden;
+    white-space: nowrap;
+    position: relative;
+    height: 26px;
+    line-height: 26px;
+    padding: 0 0 0 8px;
+    color: #444;
+    text-decoration: none;
+}
+
+.select2-container.select2-drop-above .select2-choice
+{
+    border-bottom-color: #aaa;
+    -webkit-border-radius:0px 0px 4px 4px;
+    -moz-border-radius:0px 0px 4px 4px;
+    border-radius:0px 0px 4px 4px;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.9, white));
+    background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 90%);
+    background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 90%);
+    background-image: -o-linear-gradient(bottom, #eeeeee 0%, white 90%);
+    background-image: -ms-linear-gradient(top, #eeeeee 0%,#ffffff 90%);
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#eeeeee', endColorstr='#ffffff',GradientType=0 );
+    background-image: linear-gradient(top, #eeeeee 0%,#ffffff 90%);
+}
+
+.select2-container .select2-choice span {
+    margin-right: 26px;
+    display: block;
+    overflow: hidden;
+    white-space: nowrap;
+    -o-text-overflow: ellipsis;
+    -ms-text-overflow: ellipsis;
+    text-overflow: ellipsis;
+}
+
+.select2-container .select2-choice abbr {
+  display: block;
+  position: absolute;
+  right: 26px;
+  top: 8px;
+  width: 12px;
+  height: 12px;
+  font-size: 1px;
+  background: url('select2.png') right top no-repeat;
+  cursor: pointer;
+  text-decoration: none;
+  border:0;
+  outline: 0;
+}
+.select2-container .select2-choice abbr:hover {
+  background-position: right -11px;
+  cursor: pointer;
+}
+
+.select2-drop {
+    background: #fff;
+    color: #000;
+    border: 1px solid #aaa;
+    border-top: 0;
+    position: absolute;
+    top: 100%;
+    -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+    -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+    -o-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+    box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
+    z-index: 9999;
+    width:100%;
+    margin-top:-1px;
+
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
+  border-radius: 0 0 4px 4px;
+}
+
+.select2-drop.select2-drop-above {
+    -webkit-border-radius: 4px 4px 0px 0px;
+    -moz-border-radius: 4px 4px 0px 0px;
+    border-radius: 4px 4px 0px 0px;
+    margin-top:1px;
+    border-top: 1px solid #aaa;
+    border-bottom: 0;
+
+    -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+    -moz-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+    -o-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+    box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
+}
+
+.select2-container .select2-choice div {
+    -webkit-border-radius: 0 4px 4px 0;
+    -moz-border-radius: 0 4px 4px 0;
+    border-radius: 0 4px 4px 0;
+    -moz-background-clip: padding;
+    -webkit-background-clip: padding-box;
+    background-clip: padding-box;
+    background: #ccc;
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #ccc), color-stop(0.6, #eee));
+    background-image: -webkit-linear-gradient(center bottom, #ccc 0%, #eee 60%);
+    background-image: -moz-linear-gradient(center bottom, #ccc 0%, #eee 60%);
+    background-image: -o-linear-gradient(bottom, #ccc 0%, #eee 60%);
+    background-image: -ms-linear-gradient(top, #cccccc 0%, #eeeeee 60%);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '#cccccc', endColorstr = '#eeeeee', GradientType = 0);
+    background-image: linear-gradient(top, #cccccc 0%, #eeeeee 60%);
+    border-left: 1px solid #aaa;
+    position: absolute;
+    right: 0;
+    top: 0;
+    display: block;
+    height: 100%;
+    width: 18px;
+}
+
+.select2-container .select2-choice div b {
+    background: url('select2.png') no-repeat 0 1px;
+    display: block;
+    width: 100%;
+    height: 100%;
+}
+
+.select2-search {
+  display: inline-block;
+    white-space: nowrap;
+    z-index: 10000;
+  min-height: 26px;
+  width: 100%;
+  margin: 0;
+  padding-left: 4px;
+  padding-right: 4px;
+}
+
+.select2-search-hidden {
+  display: block;
+  position: absolute;
+  left: -10000px;
+}
+
+.select2-search input {
+    background: #fff url('select2.png') no-repeat 100% -22px;
+    background: url('select2.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+    background: url('select2.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: url('select2.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: url('select2.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+    background: url('select2.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+    background: url('select2.png') no-repeat 100% -22px, linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+    padding: 4px 20px 4px 5px;
+    outline: 0;
+    border: 1px solid #aaa;
+    font-family: sans-serif;
+    font-size: 1em;
+    width:100%;
+    margin:0;
+    height:auto !important;
+    min-height: 26px;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+    border-radius: 0;
+    -moz-border-radius: 0;
+    -webkit-border-radius: 0;
+}
+
+.select2-drop.select2-drop-above .select2-search input
+{
+    margin-top:4px;
+}
+
+.select2-search input.select2-active {
+    background: #fff url('spinner.gif') no-repeat 100%;
+    background: url('spinner.gif') no-repeat 100%, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
+    background: url('spinner.gif') no-repeat 100%, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: url('spinner.gif') no-repeat 100%, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
+    background: url('spinner.gif') no-repeat 100%, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
+    background: url('spinner.gif') no-repeat 100%, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+    background: url('spinner.gif') no-repeat 100%, linear-gradient(top, #ffffff 85%, #eeeeee 99%);
+}
+
+
+.select2-container-active .select2-choice,
+.select2-container-active .select2-choices {
+    -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
+    -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
+    -o-box-shadow     : 0 0 5px rgba(0,0,0,.3);
+    box-shadow        : 0 0 5px rgba(0,0,0,.3);
+    border: 1px solid #5897fb;
+    outline: none;
+}
+
+.select2-dropdown-open .select2-choice {
+  border: 1px solid #aaa;
+  border-bottom-color: transparent;
+  -webkit-box-shadow: 0 1px 0 #fff inset;
+  -moz-box-shadow   : 0 1px 0 #fff inset;
+  -o-box-shadow     : 0 1px 0 #fff inset;
+  box-shadow        : 0 1px 0 #fff inset;
+  background-color: #eee;
+  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, white), color-stop(0.5, #eeeeee));
+  background-image: -webkit-linear-gradient(center bottom, white 0%, #eeeeee 50%);
+  background-image: -moz-linear-gradient(center bottom, white 0%, #eeeeee 50%);
+  background-image: -o-linear-gradient(bottom, white 0%, #eeeeee 50%);
+  background-image: -ms-linear-gradient(top, #ffffff 0%,#eeeeee 50%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#eeeeee',GradientType=0 );
+  background-image: linear-gradient(top, #ffffff 0%,#eeeeee 50%);
+  -webkit-border-bottom-left-radius : 0;
+  -webkit-border-bottom-right-radius: 0;
+  -moz-border-radius-bottomleft : 0;
+  -moz-border-radius-bottomright: 0;
+  border-bottom-left-radius : 0;
+  border-bottom-right-radius: 0;
+}
+
+.select2-dropdown-open .select2-choice div {
+  background: transparent;
+  border-left: none;
+}
+.select2-dropdown-open .select2-choice div b {
+  background-position: -18px 1px;
+}
+
+/* results */
+.select2-results {
+  margin: 4px 4px 4px 0;
+  padding: 0 0 0 4px;
+  position: relative;
+  overflow-x: hidden;
+  overflow-y: auto;
+  max-height: 200px;
+}
+
+.select2-results ul.select2-result-sub {
+  margin: 0 0 0 0;
+}
+
+.select2-results ul.select2-result-sub > li .select2-result-label { padding-left: 20px }
+.select2-results ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 40px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 60px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 80px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 100px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 110px }
+.select2-results ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub ul.select2-result-sub > li .select2-result-label { padding-left: 120px }
+
+.select2-results li {
+  list-style: none;
+  display: list-item;
+}
+
+.select2-results li.select2-result-with-children > .select2-result-label {
+  font-weight: bold;
+}
+
+.select2-results .select2-result-label {
+  padding: 3px 7px 4px;
+  margin: 0;
+  cursor: pointer;
+}
+
+.select2-results .select2-highlighted {
+  background: #3875d7;
+  color: #fff;
+}
+.select2-results li em {
+  background: #feffde;
+  font-style: normal;
+}
+.select2-results .select2-highlighted em {
+  background: transparent;
+}
+.select2-results .select2-no-results,
+.select2-results .select2-searching,
+.select2-results .select2-selection-limit {
+  background: #f4f4f4;
+  display: list-item;
+}
+
+/*
+disabled look for already selected choices in the results dropdown
+.select2-results .select2-disabled.select2-highlighted {
+    color: #666;
+    background: #f4f4f4;
+    display: list-item;
+    cursor: default;
+}
+.select2-results .select2-disabled {
+  background: #f4f4f4;
+  display: list-item;
+  cursor: default;
+}
+*/
+.select2-results .select2-disabled {
+    display: none;
+}
+
+.select2-more-results.select2-active {
+    background: #f4f4f4 url('spinner.gif') no-repeat 100%;
+}
+
+.select2-more-results {
+  background: #f4f4f4;
+  display: list-item;
+}
+
+/* disabled styles */
+
+.select2-container.select2-container-disabled .select2-choice {
+    background-color: #f4f4f4;
+    background-image: none;
+    border: 1px solid #ddd;
+    cursor: default;
+}
+
+.select2-container.select2-container-disabled .select2-choice div {
+    background-color: #f4f4f4;
+    background-image: none;
+    border-left: 0;
+}
+
+
+/* multiselect */
+
+.select2-container-multi .select2-choices {
+    background-color: #fff;
+      background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
+      background-image: -webkit-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      background-image: -moz-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      background-image: -o-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      background-image: -ms-linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      background-image: linear-gradient(top, #eeeeee 1%, #ffffff 15%);
+      border: 1px solid #aaa;
+      margin: 0;
+      padding: 0;
+      cursor: text;
+      overflow: hidden;
+      height: auto !important;
+      height: 1%;
+      position: relative;
+}
+
+.select2-container-multi .select2-choices {
+    min-height: 26px;
+}
+
+.select2-container-multi.select2-container-active .select2-choices {
+    -webkit-box-shadow: 0 0 5px rgba(0,0,0,.3);
+    -moz-box-shadow   : 0 0 5px rgba(0,0,0,.3);
+    -o-box-shadow     : 0 0 5px rgba(0,0,0,.3);
+    box-shadow        : 0 0 5px rgba(0,0,0,.3);
+    border: 1px solid #5897fb;
+    outline: none;
+}
+.select2-container-multi .select2-choices li {
+  float: left;
+  list-style: none;
+}
+.select2-container-multi .select2-choices .select2-search-field {
+  white-space: nowrap;
+  margin: 0;
+  padding: 0;
+}
+
+.select2-container-multi .select2-choices .select2-search-field input {
+  color: #666;
+  background: transparent !important;
+  font-family: sans-serif;
+  font-size: 100%;
+  height: 15px;
+  padding: 5px;
+  margin: 1px 0;
+  outline: 0;
+  border: 0;
+  -webkit-box-shadow: none;
+  -moz-box-shadow   : none;
+  -o-box-shadow     : none;
+  box-shadow        : none;
+}
+
+.select2-container-multi .select2-choices .select2-search-field input.select2-active {
+    background: #fff url('spinner.gif') no-repeat 100% !important;
+}
+
+.select2-default {
+  color: #999 !important;
+}
+
+.select2-container-multi .select2-choices .select2-search-choice {
+  -webkit-border-radius: 3px;
+  -moz-border-radius   : 3px;
+  border-radius        : 3px;
+  -moz-background-clip   : padding;
+  -webkit-background-clip: padding-box;
+  background-clip        : padding-box;
+  background-color: #e4e4e4;
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f4f4', endColorstr='#eeeeee', GradientType=0 );
+  background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
+  background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -o-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: -ms-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  background-image: linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eeeeee 100%);
+  -webkit-box-shadow: 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+  -moz-box-shadow   : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+  box-shadow        : 0 0 2px #ffffff inset, 0 1px 0 rgba(0,0,0,0.05);
+  color: #333;
+  border: 1px solid #aaaaaa;
+  line-height: 13px;
+  padding: 3px 5px 3px 18px;
+  margin: 3px 0 3px 5px;
+  position: relative;
+  cursor: default;
+}
+.select2-container-multi .select2-choices .select2-search-choice span {
+  cursor: default;
+}
+.select2-container-multi .select2-choices .select2-search-choice-focus {
+  background: #d4d4d4;
+}
+
+.select2-search-choice-close {
+  display: block;
+  position: absolute;
+  right: 3px;
+  top: 4px;
+  width: 12px;
+  height: 13px;
+  font-size: 1px;
+  background: url('select2.png') right top no-repeat;
+  outline: none;
+}
+
+.select2-container-multi .select2-search-choice-close {
+  left: 3px;
+}
+
+
+.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
+  background-position: right -11px;
+}
+.select2-container-multi .select2-choices .select2-search-choice-focus .select2-search-choice-close {
+  background-position: right -11px;
+}
+
+/* disabled styles */
+
+.select2-container-multi.select2-container-disabled .select2-choices{
+    background-color: #f4f4f4;
+    background-image: none;
+    border: 1px solid #ddd;
+    cursor: default;
+}
+
+.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice {
+    background-image: none;
+    background-color: #f4f4f4;
+    border: 1px solid #ddd;
+    padding: 3px 5px 3px 5px;
+}
+
+.select2-container-multi.select2-container-disabled .select2-choices .select2-search-choice .select2-search-choice-close {
+    display: none;
+}
+/* end multiselect */
+
+.select2-result-selectable .select2-match,
+.select2-result-unselectable .select2-result-selectable .select2-match { text-decoration: underline; }
+.select2-result-unselectable .select2-match { text-decoration: none; }
+
+.select2-offscreen { position: absolute; left: -10000px; }
+
+/* Retina-ize icons */
+
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5) {
+	.select2-search input, .select2-search-choice-close, .select2-container .select2-choice abbr, .select2-container .select2-choice div b {
+		background-image: url(select2x2.png) !important;
+		background-repeat: no-repeat !important;
+		background-size: 60px 40px !important;
+	}
+	.select2-search input {
+		background-position: 100% -21px !important;
+	}
+}
\ No newline at end of file
diff --git a/addons/base_import/static/lib/select2/select2.js b/addons/base_import/static/lib/select2/select2.js
new file mode 100755
index 00000000000..42ce0a928b8
--- /dev/null
+++ b/addons/base_import/static/lib/select2/select2.js
@@ -0,0 +1,2407 @@
+/*
+ Copyright 2012 Igor Vaynberg
+
+ Version: @@ver@@ Timestamp: @@timestamp@@
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in
+ compliance with the License. You may obtain a copy of the License in the LICENSE file, or at:
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software distributed under the License is
+ distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and limitations under the License.
+ */
+ (function ($) {
+ 	if(typeof $.fn.each2 == "undefined"){
+ 		$.fn.extend({
+ 			/*
+			* 4-10 times faster .each replacement
+			* use it carefully, as it overrides jQuery context of element on each iteration
+			*/
+			each2 : function (c) {
+				var j = $([0]), i = -1, l = this.length;
+				while (
+					++i < l
+					&& (j.context = j[0] = this[i])
+					&& c.call(j[0], i, j) !== false //"this"=DOM, i=index, j=jQuery object
+				);
+				return this;
+			}
+ 		});
+ 	}
+})(jQuery);
+
+(function ($, undefined) {
+    "use strict";
+    /*global document, window, jQuery, console */
+
+    if (window.Select2 !== undefined) {
+        return;
+    }
+
+    var KEY, AbstractSelect2, SingleSelect2, MultiSelect2, nextUid, sizer;
+
+    KEY = {
+        TAB: 9,
+        ENTER: 13,
+        ESC: 27,
+        SPACE: 32,
+        LEFT: 37,
+        UP: 38,
+        RIGHT: 39,
+        DOWN: 40,
+        SHIFT: 16,
+        CTRL: 17,
+        ALT: 18,
+        PAGE_UP: 33,
+        PAGE_DOWN: 34,
+        HOME: 36,
+        END: 35,
+        BACKSPACE: 8,
+        DELETE: 46,
+        isArrow: function (k) {
+            k = k.which ? k.which : k;
+            switch (k) {
+            case KEY.LEFT:
+            case KEY.RIGHT:
+            case KEY.UP:
+            case KEY.DOWN:
+                return true;
+            }
+            return false;
+        },
+        isControl: function (e) {
+            var k = e.which;
+            switch (k) {
+            case KEY.SHIFT:
+            case KEY.CTRL:
+            case KEY.ALT:
+                return true;
+            }
+
+            if (e.metaKey) return true;
+
+            return false;
+        },
+        isFunctionKey: function (k) {
+            k = k.which ? k.which : k;
+            return k >= 112 && k <= 123;
+        }
+    };
+
+    nextUid=(function() { var counter=1; return function() { return counter++; }; }());
+
+    function indexOf(value, array) {
+        var i = 0, l = array.length, v;
+
+        if (typeof value === "undefined") {
+          return -1;
+        }
+
+        if (value.constructor === String) {
+            for (; i < l; i = i + 1) if (value.localeCompare(array[i]) === 0) return i;
+        } else {
+            for (; i < l; i = i + 1) {
+                v = array[i];
+                if (v.constructor === String) {
+                    if (v.localeCompare(value) === 0) return i;
+                } else {
+                    if (v === value) return i;
+                }
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Compares equality of a and b taking into account that a and b may be strings, in which case localeCompare is used
+     * @param a
+     * @param b
+     */
+    function equal(a, b) {
+        if (a === b) return true;
+        if (a === undefined || b === undefined) return false;
+        if (a === null || b === null) return false;
+        if (a.constructor === String) return a.localeCompare(b) === 0;
+        if (b.constructor === String) return b.localeCompare(a) === 0;
+        return false;
+    }
+
+    /**
+     * Splits the string into an array of values, trimming each value. An empty array is returned for nulls or empty
+     * strings
+     * @param string
+     * @param separator
+     */
+    function splitVal(string, separator) {
+        var val, i, l;
+        if (string === null || string.length < 1) return [];
+        val = string.split(separator);
+        for (i = 0, l = val.length; i < l; i = i + 1) val[i] = $.trim(val[i]);
+        return val;
+    }
+
+    function getSideBorderPadding(element) {
+        return element.outerWidth() - element.width();
+    }
+
+    function installKeyUpChangeEvent(element) {
+        var key="keyup-change-value";
+        element.bind("keydown", function () {
+            if ($.data(element, key) === undefined) {
+                $.data(element, key, element.val());
+            }
+        });
+        element.bind("keyup", function () {
+            var val= $.data(element, key);
+            if (val !== undefined && element.val() !== val) {
+                $.removeData(element, key);
+                element.trigger("keyup-change");
+            }
+        });
+    }
+
+    $(document).delegate("*", "mousemove", function (e) {
+        $.data(document, "select2-lastpos", {x: e.pageX, y: e.pageY});
+    });
+
+    /**
+     * filters mouse events so an event is fired only if the mouse moved.
+     *
+     * filters out mouse events that occur when mouse is stationary but
+     * the elements under the pointer are scrolled.
+     */
+    function installFilteredMouseMove(element) {
+	    element.bind("mousemove", function (e) {
+            var lastpos = $.data(document, "select2-lastpos");
+            if (lastpos === undefined || lastpos.x !== e.pageX || lastpos.y !== e.pageY) {
+                $(e.target).trigger("mousemove-filtered", e);
+            }
+        });
+    }
+
+    /**
+     * Debounces a function. Returns a function that calls the original fn function only if no invocations have been made
+     * within the last quietMillis milliseconds.
+     *
+     * @param quietMillis number of milliseconds to wait before invoking fn
+     * @param fn function to be debounced
+     * @param ctx object to be used as this reference within fn
+     * @return debounced version of fn
+     */
+    function debounce(quietMillis, fn, ctx) {
+        ctx = ctx || undefined;
+        var timeout;
+        return function () {
+            var args = arguments;
+            window.clearTimeout(timeout);
+            timeout = window.setTimeout(function() {
+                fn.apply(ctx, args);
+            }, quietMillis);
+        };
+    }
+
+    /**
+     * A simple implementation of a thunk
+     * @param formula function used to lazily initialize the thunk
+     * @return {Function}
+     */
+    function thunk(formula) {
+        var evaluated = false,
+            value;
+        return function() {
+            if (evaluated === false) { value = formula(); evaluated = true; }
+            return value;
+        };
+    };
+
+    function installDebouncedScroll(threshold, element) {
+        var notify = debounce(threshold, function (e) { element.trigger("scroll-debounced", e);});
+        element.bind("scroll", function (e) {
+            if (indexOf(e.target, element.get()) >= 0) notify(e);
+        });
+    }
+
+    function killEvent(event) {
+        event.preventDefault();
+        event.stopPropagation();
+    }
+
+    function measureTextWidth(e) {
+        if (!sizer){
+        	var style = e[0].currentStyle || window.getComputedStyle(e[0], null);
+        	sizer = $("<div></div>").css({
+	            position: "absolute",
+	            left: "-10000px",
+	            top: "-10000px",
+	            display: "none",
+	            fontSize: style.fontSize,
+	            fontFamily: style.fontFamily,
+	            fontStyle: style.fontStyle,
+	            fontWeight: style.fontWeight,
+	            letterSpacing: style.letterSpacing,
+	            textTransform: style.textTransform,
+	            whiteSpace: "nowrap"
+	        });
+        	$("body").append(sizer);
+        }
+        sizer.text(e.val());
+        return sizer.width();
+    }
+
+    function markMatch(text, term, markup) {
+        var match=text.toUpperCase().indexOf(term.toUpperCase()),
+            tl=term.length;
+
+        if (match<0) {
+            markup.push(text);
+            return;
+        }
+
+        markup.push(text.substring(0, match));
+        markup.push("<span class='select2-match'>");
+        markup.push(text.substring(match, match + tl));
+        markup.push("</span>");
+        markup.push(text.substring(match + tl, text.length));
+    }
+
+    /**
+     * Produces an ajax-based query function
+     *
+     * @param options object containing configuration paramters
+     * @param options.transport function that will be used to execute the ajax request. must be compatible with parameters supported by $.ajax
+     * @param options.url url for the data
+     * @param options.data a function(searchTerm, pageNumber, context) that should return an object containing query string parameters for the above url.
+     * @param options.dataType request data type: ajax, jsonp, other datatatypes supported by jQuery's $.ajax function or the transport function if specified
+     * @param options.traditional a boolean flag that should be true if you wish to use the traditional style of param serialization for the ajax request
+     * @param options.quietMillis (optional) milliseconds to wait before making the ajaxRequest, helps debounce the ajax function if invoked too often
+     * @param options.results a function(remoteData, pageNumber) that converts data returned form the remote request to the format expected by Select2.
+     *      The expected format is an object containing the following keys:
+     *      results array of objects that will be used as choices
+     *      more (optional) boolean indicating whether there are more results available
+     *      Example: {results:[{id:1, text:'Red'},{id:2, text:'Blue'}], more:true}
+     */
+    function ajax(options) {
+        var timeout, // current scheduled but not yet executed request
+            requestSequence = 0, // sequence used to drop out-of-order responses
+            handler = null,
+            quietMillis = options.quietMillis || 100;
+
+        return function (query) {
+            window.clearTimeout(timeout);
+            timeout = window.setTimeout(function () {
+                requestSequence += 1; // increment the sequence
+                var requestNumber = requestSequence, // this request's sequence number
+                    data = options.data, // ajax data function
+                    transport = options.transport || $.ajax,
+                    traditional = options.traditional || false,
+                    type = options.type || 'GET'; // set type of request (GET or POST)
+
+                data = data.call(this, query.term, query.page, query.context);
+
+                if( null !== handler) { handler.abort(); }
+
+                handler = transport.call(null, {
+                    url: options.url,
+                    dataType: options.dataType,
+                    data: data,
+                    type: type,
+                    traditional: traditional,
+                    success: function (data) {
+                        if (requestNumber < requestSequence) {
+                            return;
+                        }
+                        // TODO 3.0 - replace query.page with query so users have access to term, page, etc.
+                        var results = options.results(data, query.page);
+                        query.callback(results);
+                    }
+                });
+            }, quietMillis);
+        };
+    }
+
+    /**
+     * Produces a query function that works with a local array
+     *
+     * @param options object containing configuration parameters. The options parameter can either be an array or an
+     * object.
+     *
+     * If the array form is used it is assumed that it contains objects with 'id' and 'text' keys.
+     *
+     * If the object form is used ti is assumed that it contains 'data' and 'text' keys. The 'data' key should contain
+     * an array of objects that will be used as choices. These objects must contain at least an 'id' key. The 'text'
+     * key can either be a String in which case it is expected that each element in the 'data' array has a key with the
+     * value of 'text' which will be used to match choices. Alternatively, text can be a function(item) that can extract
+     * the text.
+     */
+    function local(options) {
+        var data = options, // data elements
+            dataText,
+            text = function (item) { return ""+item.text; }; // function used to retrieve the text portion of a data item that is matched against the search
+
+        if (!$.isArray(data)) {
+            text = data.text;
+            // if text is not a function we assume it to be a key name
+            if (!$.isFunction(text)) {
+              dataText = data.text; // we need to store this in a separate variable because in the next step data gets reset and data.text is no longer available
+              text = function (item) { return item[dataText]; };
+            }
+            data = data.results;
+        }
+
+        return function (query) {
+            var t = query.term, filtered = { results: [] }, process;
+            if (t === "") {
+                query.callback({results: data});
+                return;
+            }
+
+            process = function(datum, collection) {
+                var group, attr;
+                datum = datum[0];
+                if (datum.children) {
+                    group = {};
+                    for (attr in datum) {
+                        if (datum.hasOwnProperty(attr)) group[attr]=datum[attr];
+                    }
+                    group.children=[];
+                    $(datum.children).each2(function(i, childDatum) { process(childDatum, group.children); });
+                    if (group.children.length) {
+                        collection.push(group);
+                    }
+                } else {
+                    if (query.matcher(t, text(datum))) {
+                        collection.push(datum);
+                    }
+                }
+            };
+
+            $(data).each2(function(i, datum) { process(datum, filtered.results); });
+            query.callback(filtered);
+        };
+    }
+
+    // TODO javadoc
+    function tags(data) {
+        // TODO even for a function we should probably return a wrapper that does the same object/string check as
+        // the function for arrays. otherwise only functions that return objects are supported.
+        if ($.isFunction(data)) {
+            return data;
+        }
+
+        // if not a function we assume it to be an array
+
+        return function (query) {
+            var t = query.term, filtered = {results: []};
+            $(data).each(function () {
+                var isObject = this.text !== undefined,
+                    text = isObject ? this.text : this;
+                if (t === "" || query.matcher(t, text)) {
+                    filtered.results.push(isObject ? this : {id: this, text: this});
+                }
+            });
+            query.callback(filtered);
+        };
+    }
+
+    /**
+     * Checks if the formatter function should be used.
+     *
+     * Throws an error if it is not a function. Returns true if it should be used,
+     * false if no formatting should be performed.
+     *
+     * @param formatter
+     */
+    function checkFormatter(formatter, formatterName) {
+        if ($.isFunction(formatter)) return true;
+        if (!formatter) return false;
+        throw new Error("formatterName must be a function or a falsy value");
+    }
+
+    function evaluate(val) {
+        return $.isFunction(val) ? val() : val;
+    }
+
+    function countResults(results) {
+        var count = 0;
+        $.each(results, function(i, item) {
+            if (item.children) {
+                count += countResults(item.children);
+            } else {
+                count++;
+            }
+        });
+        return count;
+    }
+
+    /**
+     * Default tokenizer. This function uses breaks the input on substring match of any string from the
+     * opts.tokenSeparators array and uses opts.createSearchChoice to create the choice object. Both of those
+     * two options have to be defined in order for the tokenizer to work.
+     *
+     * @param input text user has typed so far or pasted into the search field
+     * @param selection currently selected choices
+     * @param selectCallback function(choice) callback tho add the choice to selection
+     * @param opts select2's opts
+     * @return undefined/null to leave the current input unchanged, or a string to change the input to the returned value
+     */
+    function defaultTokenizer(input, selection, selectCallback, opts) {
+        var original = input, // store the original so we can compare and know if we need to tell the search to update its text
+            dupe = false, // check for whether a token we extracted represents a duplicate selected choice
+            token, // token
+            index, // position at which the separator was found
+            i, l, // looping variables
+            separator; // the matched separator
+
+        if (!opts.createSearchChoice || !opts.tokenSeparators || opts.tokenSeparators.length < 1) return undefined;
+
+        while (true) {
+            index = -1;
+
+            for (i = 0, l = opts.tokenSeparators.length; i < l; i++) {
+                separator = opts.tokenSeparators[i];
+                index = input.indexOf(separator);
+                if (index >= 0) break;
+            }
+
+            if (index < 0) break; // did not find any token separator in the input string, bail
+
+            token = input.substring(0, index);
+            input = input.substring(index + separator.length);
+
+            if (token.length > 0) {
+                token = opts.createSearchChoice(token, selection);
+                if (token !== undefined && token !== null && opts.id(token) !== undefined && opts.id(token) !== null) {
+                    dupe = false;
+                    for (i = 0, l = selection.length; i < l; i++) {
+                        if (equal(opts.id(token), opts.id(selection[i]))) {
+                            dupe = true; break;
+                        }
+                    }
+
+                    if (!dupe) selectCallback(token);
+                }
+            }
+        }
+
+        if (original.localeCompare(input) != 0) return input;
+    }
+
+    /**
+     * blurs any Select2 container that has focus when an element outside them was clicked or received focus
+     *
+     * also takes care of clicks on label tags that point to the source element
+     */
+    $(document).ready(function () {
+        $(document).delegate("*", "mousedown touchend", function (e) {
+            var target = $(e.target).closest("div.select2-container").get(0), attr;
+            if (target) {
+                $(document).find("div.select2-container-active").each(function () {
+                    if (this !== target) $(this).data("select2").blur();
+                });
+            } else {
+                target = $(e.target).closest("div.select2-drop").get(0);
+                $(document).find("div.select2-drop-active").each(function () {
+                    if (this !== target) $(this).data("select2").blur();
+                });
+            }
+
+            target=$(e.target);
+            attr = target.attr("for");
+            if ("LABEL" === e.target.tagName && attr && attr.length > 0) {
+                target = $("#"+attr);
+                target = target.data("select2");
+                if (target !== undefined) { target.focus(); e.preventDefault();}
+            }
+        });
+    });
+
+    /**
+     * Creates a new class
+     *
+     * @param superClass
+     * @param methods
+     */
+    function clazz(SuperClass, methods) {
+        var constructor = function () {};
+        constructor.prototype = new SuperClass;
+        constructor.prototype.constructor = constructor;
+        constructor.prototype.parent = SuperClass.prototype;
+        constructor.prototype = $.extend(constructor.prototype, methods);
+        return constructor;
+    }
+
+    AbstractSelect2 = clazz(Object, {
+
+        // abstract
+        bind: function (func) {
+            var self = this;
+            return function () {
+                func.apply(self, arguments);
+            };
+        },
+
+        // abstract
+        init: function (opts) {
+            var results, search, resultsSelector = ".select2-results";
+
+            // prepare options
+            this.opts = opts = this.prepareOpts(opts);
+
+            this.id=opts.id;
+
+            // destroy if called on an existing component
+            if (opts.element.data("select2") !== undefined &&
+                opts.element.data("select2") !== null) {
+                this.destroy();
+            }
+
+            this.enabled=true;
+            this.container = this.createContainer();
+
+            this.containerId="s2id_"+(opts.element.attr("id") || "autogen"+nextUid());
+            this.containerSelector="#"+this.containerId.replace(/([;&,\.\+\*\~':"\!\^#$%@\[\]\(\)=>\|])/g, '\\$1');
+            this.container.attr("id", this.containerId);
+
+            // cache the body so future lookups are cheap
+            this.body = thunk(function() { return opts.element.closest("body"); });
+
+            if (opts.element.attr("class") !== undefined) {
+                this.container.addClass(opts.element.attr("class").replace(/validate\[[\S ]+] ?/, ''));
+            }
+
+            this.container.css(evaluate(opts.containerCss));
+            this.container.addClass(evaluate(opts.containerCssClass));
+
+            // swap container for the element
+            this.opts.element
+                .data("select2", this)
+                .hide()
+                .before(this.container);
+            this.container.data("select2", this);
+
+            this.dropdown = this.container.find(".select2-drop");
+            this.dropdown.addClass(evaluate(opts.dropdownCssClass));
+            this.dropdown.data("select2", this);
+
+            this.results = results = this.container.find(resultsSelector);
+            this.search = search = this.container.find("input.select2-input");
+
+            search.attr("tabIndex", this.opts.element.attr("tabIndex"));
+
+            this.resultsPage = 0;
+            this.context = null;
+
+            // initialize the container
+            this.initContainer();
+            this.initContainerWidth();
+
+            installFilteredMouseMove(this.results);
+            this.dropdown.delegate(resultsSelector, "mousemove-filtered", this.bind(this.highlightUnderEvent));
+
+            installDebouncedScroll(80, this.results);
+            this.dropdown.delegate(resultsSelector, "scroll-debounced", this.bind(this.loadMoreIfNeeded));
+
+            // if jquery.mousewheel plugin is installed we can prevent out-of-bounds scrolling of results via mousewheel
+            if ($.fn.mousewheel) {
+                results.mousewheel(function (e, delta, deltaX, deltaY) {
+                    var top = results.scrollTop(), height;
+                    if (deltaY > 0 && top - deltaY <= 0) {
+                        results.scrollTop(0);
+                        killEvent(e);
+                    } else if (deltaY < 0 && results.get(0).scrollHeight - results.scrollTop() + deltaY <= results.height()) {
+                        results.scrollTop(results.get(0).scrollHeight - results.height());
+                        killEvent(e);
+                    }
+                });
+            }
+
+            installKeyUpChangeEvent(search);
+            search.bind("keyup-change", this.bind(this.updateResults));
+            search.bind("focus", function () { search.addClass("select2-focused"); if (search.val() === " ") search.val(""); });
+            search.bind("blur", function () { search.removeClass("select2-focused");});
+
+            this.dropdown.delegate(resultsSelector, "mouseup", this.bind(function (e) {
+                if ($(e.target).closest(".select2-result-selectable:not(.select2-disabled)").length > 0) {
+                    this.highlightUnderEvent(e);
+                    this.selectHighlighted(e);
+                } else {
+                    this.focusSearch();
+                }
+                killEvent(e);
+            }));
+
+            // trap all mouse events from leaving the dropdown. sometimes there may be a modal that is listening
+            // for mouse events outside of itself so it can close itself. since the dropdown is now outside the select2's
+            // dom it will trigger the popup close, which is not what we want
+            this.dropdown.bind("click mouseup mousedown", function (e) { e.stopPropagation(); });
+
+            if ($.isFunction(this.opts.initSelection)) {
+                // initialize selection based on the current value of the source element
+                this.initSelection();
+
+                // if the user has provided a function that can set selection based on the value of the source element
+                // we monitor the change event on the element and trigger it, allowing for two way synchronization
+                this.monitorSource();
+            }
+
+            if (opts.element.is(":disabled") || opts.element.is("[readonly='readonly']")) this.disable();
+        },
+
+        // abstract
+        destroy: function () {
+            var select2 = this.opts.element.data("select2");
+            if (select2 !== undefined) {
+                select2.container.remove();
+                select2.dropdown.remove();
+                select2.opts.element
+                    .removeData("select2")
+                    .unbind(".select2")
+                    .show();
+            }
+        },
+
+        // abstract
+        prepareOpts: function (opts) {
+            var element, select, idKey, ajaxUrl;
+
+            element = opts.element;
+
+            if (element.get(0).tagName.toLowerCase() === "select") {
+                this.select = select = opts.element;
+            }
+
+            if (select) {
+                // these options are not allowed when attached to a select because they are picked up off the element itself
+                $.each(["id", "multiple", "ajax", "query", "createSearchChoice", "initSelection", "data", "tags"], function () {
+                    if (this in opts) {
+                        throw new Error("Option '" + this + "' is not allowed for Select2 when attached to a <select> element.");
+                    }
+                });
+            }
+
+            opts = $.extend({}, {
+                populateResults: function(container, results, query) {
+                    var populate,  data, result, children, id=this.opts.id, self=this;
+
+                    populate=function(results, container, depth) {
+
+                        var i, l, result, selectable, compound, node, label, innerContainer, formatted;
+                        for (i = 0, l = results.length; i < l; i = i + 1) {
+
+                            result=results[i];
+                            selectable=id(result) !== undefined;
+                            compound=("children" in result) && result.children.length > 0;
+
+                            node=$("<li></li>");
+                            node.addClass("select2-results-dept-"+depth);
+                            node.addClass("select2-result");
+                            node.addClass(selectable ? "select2-result-selectable" : "select2-result-unselectable");
+                            if (compound) { node.addClass("select2-result-with-children"); }
+                            node.addClass(self.opts.formatResultCssClass(result));
+
+                            label=$("<div></div>");
+                            label.addClass("select2-result-label");
+
+                            formatted=opts.formatResult(result, label, query);
+                            if (formatted!==undefined) {
+                                label.html(self.opts.escapeMarkup(formatted));
+                            }
+
+                            node.append(label);
+
+                            if (compound) {
+
+                                innerContainer=$("<ul></ul>");
+                                innerContainer.addClass("select2-result-sub");
+                                populate(result.children, innerContainer, depth+1);
+                                node.append(innerContainer);
+                            }
+
+                            node.data("select2-data", result);
+                            container.append(node);
+                        }
+                    };
+
+                    populate(results, container, 0);
+                }
+            }, $.fn.select2.defaults, opts);
+
+            if (typeof(opts.id) !== "function") {
+                idKey = opts.id;
+                opts.id = function (e) { return e[idKey]; };
+            }
+
+            if (select) {
+                opts.query = this.bind(function (query) {
+                    var data = { results: [], more: false },
+                        term = query.term,
+                        children, firstChild, process;
+
+                    process=function(element, collection) {
+                        var group;
+                        if (element.is("option")) {
+                            if (query.matcher(term, element.text(), element)) {
+                                collection.push({id:element.attr("value"), text:element.text(), element: element.get(), css: element.attr("class")});
+                            }
+                        } else if (element.is("optgroup")) {
+                            group={text:element.attr("label"), children:[], element: element.get(), css: element.attr("class")};
+                            element.children().each2(function(i, elm) { process(elm, group.children); });
+                            if (group.children.length>0) {
+                                collection.push(group);
+                            }
+                        }
+                    };
+
+                    children=element.children();
+
+                    // ignore the placeholder option if there is one
+                    if (this.getPlaceholder() !== undefined && children.length > 0) {
+                        firstChild = children[0];
+                        if ($(firstChild).text() === "") {
+                            children=children.not(firstChild);
+                        }
+                    }
+
+                    children.each2(function(i, elm) { process(elm, data.results); });
+
+                    query.callback(data);
+                });
+                // this is needed because inside val() we construct choices from options and there id is hardcoded
+                opts.id=function(e) { return e.id; };
+                opts.formatResultCssClass = function(data) { return data.css; }
+            } else {
+                if (!("query" in opts)) {
+                    if ("ajax" in opts) {
+                        ajaxUrl = opts.element.data("ajax-url");
+                        if (ajaxUrl && ajaxUrl.length > 0) {
+                            opts.ajax.url = ajaxUrl;
+                        }
+                        opts.query = ajax(opts.ajax);
+                    } else if ("data" in opts) {
+                        opts.query = local(opts.data);
+                    } else if ("tags" in opts) {
+                        opts.query = tags(opts.tags);
+                        opts.createSearchChoice = function (term) { return {id: term, text: term}; };
+                        opts.initSelection = function (element, callback) {
+                            var data = [];
+                            $(splitVal(element.val(), opts.separator)).each(function () {
+                                var id = this, text = this, tags=opts.tags;
+                                if ($.isFunction(tags)) tags=tags();
+                                $(tags).each(function() { if (equal(this.id, id)) { text = this.text; return false; } });
+                                data.push({id: id, text: text});
+                            });
+
+                            callback(data);
+                        };
+                    }
+                }
+            }
+            if (typeof(opts.query) !== "function") {
+                throw "query function not defined for Select2 " + opts.element.attr("id");
+            }
+
+            return opts;
+        },
+
+        /**
+         * Monitor the original element for changes and update select2 accordingly
+         */
+        // abstract
+        monitorSource: function () {
+            this.opts.element.bind("change.select2", this.bind(function (e) {
+                if (this.opts.element.data("select2-change-triggered") !== true) {
+                    this.initSelection();
+                }
+            }));
+        },
+
+        /**
+         * Triggers the change event on the source element
+         */
+        // abstract
+        triggerChange: function (details) {
+
+            details = details || {};
+            details= $.extend({}, details, { type: "change", val: this.val() });
+            // prevents recursive triggering
+            this.opts.element.data("select2-change-triggered", true);
+            this.opts.element.trigger(details);
+            this.opts.element.data("select2-change-triggered", false);
+
+            // some validation frameworks ignore the change event and listen instead to keyup, click for selects
+            // so here we trigger the click event manually
+            this.opts.element.click();
+
+            // ValidationEngine ignorea the change event and listens instead to blur
+            // so here we trigger the blur event manually if so desired
+            if (this.opts.blurOnChange)
+                this.opts.element.blur();
+        },
+
+
+        // abstract
+        enable: function() {
+            if (this.enabled) return;
+
+            this.enabled=true;
+            this.container.removeClass("select2-container-disabled");
+        },
+
+        // abstract
+        disable: function() {
+            if (!this.enabled) return;
+
+            this.close();
+
+            this.enabled=false;
+            this.container.addClass("select2-container-disabled");
+        },
+
+        // abstract
+        opened: function () {
+            return this.container.hasClass("select2-dropdown-open");
+        },
+
+        // abstract
+        positionDropdown: function() {
+            var offset = this.container.offset(),
+                height = this.container.outerHeight(),
+                width = this.container.outerWidth(),
+                dropHeight = this.dropdown.outerHeight(),
+                viewportBottom = $(window).scrollTop() + document.documentElement.clientHeight,
+                dropTop = offset.top + height,
+                dropLeft = offset.left,
+                enoughRoomBelow = dropTop + dropHeight <= viewportBottom,
+                enoughRoomAbove = (offset.top - dropHeight) >= this.body().scrollTop(),
+                aboveNow = this.dropdown.hasClass("select2-drop-above"),
+                bodyOffset,
+                above,
+                css;
+
+            // console.log("below/ droptop:", dropTop, "dropHeight", dropHeight, "sum", (dropTop+dropHeight)+" viewport bottom", viewportBottom, "enough?", enoughRoomBelow);
+            // console.log("above/ offset.top", offset.top, "dropHeight", dropHeight, "top", (offset.top-dropHeight), "scrollTop", this.body().scrollTop(), "enough?", enoughRoomAbove);
+
+            // fix positioning when body has an offset and is not position: static
+
+            if (this.body().css('position') !== 'static') {
+                bodyOffset = this.body().offset();
+                dropTop -= bodyOffset.top;
+                dropLeft -= bodyOffset.left;
+            }
+
+            // always prefer the current above/below alignment, unless there is not enough room
+
+            if (aboveNow) {
+                above = true;
+                if (!enoughRoomAbove && enoughRoomBelow) above = false;
+            } else {
+                above = false;
+                if (!enoughRoomBelow && enoughRoomAbove) above = true;
+            }
+
+            if (above) {
+                dropTop = offset.top - dropHeight;
+                this.container.addClass("select2-drop-above");
+                this.dropdown.addClass("select2-drop-above");
+            }
+            else {
+                this.container.removeClass("select2-drop-above");
+                this.dropdown.removeClass("select2-drop-above");
+            }
+
+            css = $.extend({
+                top: dropTop,
+                left: dropLeft,
+                width: width
+            }, evaluate(this.opts.dropdownCss));
+
+            this.dropdown.css(css);
+        },
+
+        // abstract
+        shouldOpen: function() {
+            var event;
+
+            if (this.opened()) return false;
+
+            event = jQuery.Event("open");
+            this.opts.element.trigger(event);
+            return !event.isDefaultPrevented();
+        },
+
+        // abstract
+        clearDropdownAlignmentPreference: function() {
+            // clear the classes used to figure out the preference of where the dropdown should be opened
+            this.container.removeClass("select2-drop-above");
+            this.dropdown.removeClass("select2-drop-above");
+        },
+
+        /**
+         * Opens the dropdown
+         *
+         * @return {Boolean} whether or not dropdown was opened. This method will return false if, for example,
+         * the dropdown is already open, or if the 'open' event listener on the element called preventDefault().
+         */
+        // abstract
+        open: function () {
+
+            if (!this.shouldOpen()) return false;
+
+            window.setTimeout(this.bind(this.opening), 1);
+
+            return true;
+        },
+
+        /**
+         * Performs the opening of the dropdown
+         */
+        // abstract
+        opening: function() {
+            var cid = this.containerId, selector = this.containerSelector,
+                scroll = "scroll." + cid, resize = "resize." + cid;
+
+            this.container.parents().each(function() {
+                $(this).bind(scroll, function() {
+                    var s2 = $(selector);
+                    if (s2.length == 0) {
+                        $(this).unbind(scroll);
+                    }
+                    s2.select2("close");
+                });
+            });
+
+            $(window).bind(resize, function() {
+                var s2 = $(selector);
+                if (s2.length == 0) {
+                    $(window).unbind(resize);
+                }
+                s2.select2("close");
+            });
+
+            this.clearDropdownAlignmentPreference();
+
+            if (this.search.val() === " ") { this.search.val(""); }
+
+            this.container.addClass("select2-dropdown-open").addClass("select2-container-active");
+
+            this.updateResults(true);
+
+            if(this.dropdown[0] !== this.body().children().last()[0]) {
+                this.dropdown.detach().appendTo(this.body());
+            }
+
+            this.dropdown.show();
+
+            this.positionDropdown();
+            this.dropdown.addClass("select2-drop-active");
+
+            this.ensureHighlightVisible();
+
+            this.focusSearch();
+        },
+
+        // abstract
+        close: function () {
+            if (!this.opened()) return;
+
+            var self = this;
+
+            this.container.parents().each(function() {
+                $(this).unbind("scroll." + self.containerId);
+            });
+            $(window).unbind("resize." + this.containerId);
+
+            this.clearDropdownAlignmentPreference();
+
+            this.dropdown.hide();
+            this.container.removeClass("select2-dropdown-open").removeClass("select2-container-active");
+            this.results.empty();
+            this.clearSearch();
+
+            this.opts.element.trigger(jQuery.Event("close"));
+        },
+
+        // abstract
+        clearSearch: function () {
+
+        },
+
+        // abstract
+        ensureHighlightVisible: function () {
+            var results = this.results, children, index, child, hb, rb, y, more;
+
+            index = this.highlight();
+
+            if (index < 0) return;
+
+            if (index == 0) {
+
+                // if the first element is highlighted scroll all the way to the top,
+                // that way any unselectable headers above it will also be scrolled
+                // into view
+
+                results.scrollTop(0);
+                return;
+            }
+
+            children = results.find(".select2-result-selectable");
+
+            child = $(children[index]);
+
+            hb = child.offset().top + child.outerHeight();
+
+            // if this is the last child lets also make sure select2-more-results is visible
+            if (index === children.length - 1) {
+                more = results.find("li.select2-more-results");
+                if (more.length > 0) {
+                    hb = more.offset().top + more.outerHeight();
+                }
+            }
+
+            rb = results.offset().top + results.outerHeight();
+            if (hb > rb) {
+                results.scrollTop(results.scrollTop() + (hb - rb));
+            }
+            y = child.offset().top - results.offset().top;
+
+            // make sure the top of the element is visible
+            if (y < 0) {
+                results.scrollTop(results.scrollTop() + y); // y is negative
+            }
+        },
+
+        // abstract
+        moveHighlight: function (delta) {
+            var choices = this.results.find(".select2-result-selectable"),
+                index = this.highlight();
+
+            while (index > -1 && index < choices.length) {
+                index += delta;
+                var choice = $(choices[index]);
+                if (choice.hasClass("select2-result-selectable") && !choice.hasClass("select2-disabled")) {
+                    this.highlight(index);
+                    break;
+                }
+            }
+        },
+
+        // abstract
+        highlight: function (index) {
+            var choices = this.results.find(".select2-result-selectable").not(".select2-disabled");
+
+            if (arguments.length === 0) {
+                return indexOf(choices.filter(".select2-highlighted")[0], choices.get());
+            }
+
+            if (index >= choices.length) index = choices.length - 1;
+            if (index < 0) index = 0;
+
+            choices.removeClass("select2-highlighted");
+
+            $(choices[index]).addClass("select2-highlighted");
+            this.ensureHighlightVisible();
+
+        },
+
+        // abstract
+        countSelectableResults: function() {
+            return this.results.find(".select2-result-selectable").not(".select2-disabled").length;
+        },
+
+        // abstract
+        highlightUnderEvent: function (event) {
+            var el = $(event.target).closest(".select2-result-selectable");
+            if (el.length > 0 && !el.is(".select2-highlighted")) {
+        		var choices = this.results.find('.select2-result-selectable');
+                this.highlight(choices.index(el));
+            } else if (el.length == 0) {
+                // if we are over an unselectable item remove al highlights
+                this.results.find(".select2-highlighted").removeClass("select2-highlighted");
+            }
+        },
+
+        // abstract
+        loadMoreIfNeeded: function () {
+            var results = this.results,
+                more = results.find("li.select2-more-results"),
+                below, // pixels the element is below the scroll fold, below==0 is when the element is starting to be visible
+                offset = -1, // index of first element without data
+                page = this.resultsPage + 1,
+                self=this,
+                term=this.search.val(),
+                context=this.context;
+
+            if (more.length === 0) return;
+            below = more.offset().top - results.offset().top - results.height();
+
+            if (below <= 0) {
+                more.addClass("select2-active");
+                this.opts.query({
+                        term: term,
+                        page: page,
+                        context: context,
+                        matcher: this.opts.matcher,
+                        callback: this.bind(function (data) {
+
+                    // ignore a response if the select2 has been closed before it was received
+                    if (!self.opened()) return;
+
+
+                    self.opts.populateResults.call(this, results, data.results, {term: term, page: page, context:context});
+
+                    if (data.more===true) {
+                        more.detach().appendTo(results).text(self.opts.formatLoadMore(page+1));
+                        window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
+                    } else {
+                        more.remove();
+                    }
+                    self.positionDropdown();
+                    self.resultsPage = page;
+                })});
+            }
+        },
+
+        /**
+         * Default tokenizer function which does nothing
+         */
+        tokenize: function() {
+
+        },
+
+        /**
+         * @param initial whether or not this is the call to this method right after the dropdown has been opened
+         */
+        // abstract
+        updateResults: function (initial) {
+            var search = this.search, results = this.results, opts = this.opts, data, self=this, input;
+
+            // if the search is currently hidden we do not alter the results
+            if (initial !== true && (this.showSearchInput === false || !this.opened())) {
+                return;
+            }
+
+            search.addClass("select2-active");
+
+            function postRender() {
+                results.scrollTop(0);
+                search.removeClass("select2-active");
+                self.positionDropdown();
+            }
+
+            function render(html) {
+                results.html(self.opts.escapeMarkup(html));
+                postRender();
+            }
+
+            if (opts.maximumSelectionSize >=1) {
+                data = this.data();
+                if ($.isArray(data) && data.length >= opts.maximumSelectionSize && checkFormatter(opts.formatSelectionTooBig, "formatSelectionTooBig")) {
+            	    render("<li class='select2-selection-limit'>" + opts.formatSelectionTooBig(opts.maximumSelectionSize) + "</li>");
+            	    return;
+                }
+            }
+
+            if (search.val().length < opts.minimumInputLength && checkFormatter(opts.formatInputTooShort, "formatInputTooShort")) {
+                render("<li class='select2-no-results'>" + opts.formatInputTooShort(search.val(), opts.minimumInputLength) + "</li>");
+                return;
+            }
+            else {
+                render("<li class='select2-searching'>" + opts.formatSearching() + "</li>");
+            }
+
+            // give the tokenizer a chance to pre-process the input
+            input = this.tokenize();
+            if (input != undefined && input != null) {
+                search.val(input);
+            }
+
+            this.resultsPage = 1;
+            opts.query({
+                    term: search.val(),
+                    page: this.resultsPage,
+                    context: null,
+                    matcher: opts.matcher,
+                    callback: this.bind(function (data) {
+                var def; // default choice
+
+                // ignore a response if the select2 has been closed before it was received
+                if (!this.opened()) return;
+
+                // save context, if any
+                this.context = (data.context===undefined) ? null : data.context;
+
+                // create a default choice and prepend it to the list
+                if (this.opts.createSearchChoice && search.val() !== "") {
+                    def = this.opts.createSearchChoice.call(null, search.val(), data.results);
+                    if (def !== undefined && def !== null && self.id(def) !== undefined && self.id(def) !== null) {
+                        if ($(data.results).filter(
+                            function () {
+                                return equal(self.id(this), self.id(def));
+                            }).length === 0) {
+                            data.results.unshift(def);
+                        }
+                    }
+                }
+
+                if (data.results.length === 0 && checkFormatter(opts.formatNoMatches, "formatNoMatches")) {
+                    render("<li class='select2-no-results'>" + opts.formatNoMatches(search.val()) + "</li>");
+                    return;
+                }
+
+                results.empty();
+                self.opts.populateResults.call(this, results, data.results, {term: search.val(), page: this.resultsPage, context:null});
+
+                if (data.more === true && checkFormatter(opts.formatLoadMore, "formatLoadMore")) {
+                    results.append("<li class='select2-more-results'>" + self.opts.escapeMarkup(opts.formatLoadMore(this.resultsPage)) + "</li>");
+                    window.setTimeout(function() { self.loadMoreIfNeeded(); }, 10);
+                }
+
+                this.postprocessResults(data, initial);
+
+                postRender();
+            })});
+        },
+
+        // abstract
+        cancel: function () {
+            this.close();
+        },
+
+        // abstract
+        blur: function () {
+            this.close();
+            this.container.removeClass("select2-container-active");
+            this.dropdown.removeClass("select2-drop-active");
+            // synonymous to .is(':focus'), which is available in jquery >= 1.6
+            if (this.search[0] === document.activeElement) { this.search.blur(); }
+            this.clearSearch();
+            this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
+        },
+
+        // abstract
+        focusSearch: function () {
+            // need to do it here as well as in timeout so it works in IE
+            this.search.show();
+            this.search.focus();
+
+            /* we do this in a timeout so that current event processing can complete before this code is executed.
+             this makes sure the search field is focussed even if the current event would blur it */
+            window.setTimeout(this.bind(function () {
+                // reset the value so IE places the cursor at the end of the input box
+                this.search.show();
+                this.search.focus();
+                this.search.val(this.search.val());
+            }), 10);
+        },
+
+        // abstract
+        selectHighlighted: function () {
+            var index=this.highlight(),
+                highlighted=this.results.find(".select2-highlighted").not(".select2-disabled"),
+                data = highlighted.closest('.select2-result-selectable').data("select2-data");
+            if (data) {
+                highlighted.addClass("select2-disabled");
+                this.highlight(index);
+                this.onSelect(data);
+            }
+        },
+
+        // abstract
+        getPlaceholder: function () {
+            return this.opts.element.attr("placeholder") ||
+                this.opts.element.attr("data-placeholder") || // jquery 1.4 compat
+                this.opts.element.data("placeholder") ||
+                this.opts.placeholder;
+        },
+
+        /**
+         * Get the desired width for the container element.  This is
+         * derived first from option `width` passed to select2, then
+         * the inline 'style' on the original element, and finally
+         * falls back to the jQuery calculated element width.
+         */
+        // abstract
+        initContainerWidth: function () {
+            function resolveContainerWidth() {
+                var style, attrs, matches, i, l;
+
+                if (this.opts.width === "off") {
+                    return null;
+                } else if (this.opts.width === "element"){
+                    return this.opts.element.outerWidth() === 0 ? 'auto' : this.opts.element.outerWidth() + 'px';
+                } else if (this.opts.width === "copy" || this.opts.width === "resolve") {
+                    // check if there is inline style on the element that contains width
+                    style = this.opts.element.attr('style');
+                    if (style !== undefined) {
+                        attrs = style.split(';');
+                        for (i = 0, l = attrs.length; i < l; i = i + 1) {
+                            matches = attrs[i].replace(/\s/g, '')
+                                .match(/width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/);
+                            if (matches !== null && matches.length >= 1)
+                                return matches[1];
+                        }
+                    }
+
+                    if (this.opts.width === "resolve") {
+                        // next check if css('width') can resolve a width that is percent based, this is sometimes possible
+                        // when attached to input type=hidden or elements hidden via css
+                        style = this.opts.element.css('width');
+                        if (style.indexOf("%") > 0) return style;
+
+                        // finally, fallback on the calculated width of the element
+                        return (this.opts.element.outerWidth() === 0 ? 'auto' : this.opts.element.outerWidth() + 'px');
+                    }
+
+                    return null;
+                } else if ($.isFunction(this.opts.width)) {
+                    return this.opts.width();
+                } else {
+                    return this.opts.width;
+               }
+            };
+
+            var width = resolveContainerWidth.call(this);
+            if (width !== null) {
+                this.container.attr("style", "width: "+width);
+            }
+        }
+    });
+
+    SingleSelect2 = clazz(AbstractSelect2, {
+
+        // single
+
+		createContainer: function () {
+            var container = $("<div></div>", {
+                "class": "select2-container"
+            }).html([
+                "    <a href='#' onclick='return false;' class='select2-choice'>",
+                "   <span></span><abbr class='select2-search-choice-close' style='display:none;'></abbr>",
+                "   <div><b></b></div>" ,
+                "</a>",
+                "    <div class='select2-drop select2-offscreen'>" ,
+                "   <div class='select2-search'>" ,
+                "       <input type='text' autocomplete='off' class='select2-input'/>" ,
+                "   </div>" ,
+                "   <ul class='select2-results'>" ,
+                "   </ul>" ,
+                "</div>"].join(""));
+            return container;
+        },
+
+        // single
+        opening: function () {
+            this.search.show();
+            this.parent.opening.apply(this, arguments);
+            this.dropdown.removeClass("select2-offscreen");
+        },
+
+        // single
+        close: function () {
+            if (!this.opened()) return;
+            this.parent.close.apply(this, arguments);
+            this.dropdown.removeAttr("style").addClass("select2-offscreen").insertAfter(this.selection).show();
+        },
+
+        // single
+        focus: function () {
+            this.close();
+            this.selection.focus();
+        },
+
+        // single
+        isFocused: function () {
+            return this.selection[0] === document.activeElement;
+        },
+
+        // single
+        cancel: function () {
+            this.parent.cancel.apply(this, arguments);
+            this.selection.focus();
+        },
+
+        // single
+        initContainer: function () {
+
+            var selection,
+                container = this.container,
+                dropdown = this.dropdown,
+                clickingInside = false;
+
+            this.selection = selection = container.find(".select2-choice");
+
+            this.search.bind("keydown", this.bind(function (e) {
+                if (!this.enabled) return;
+
+                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
+                    // prevent the page from scrolling
+                    killEvent(e);
+                    return;
+                }
+
+                if (this.opened()) {
+                    switch (e.which) {
+                        case KEY.UP:
+                        case KEY.DOWN:
+                            this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
+                            killEvent(e);
+                            return;
+                        case KEY.TAB:
+                        case KEY.ENTER:
+                            this.selectHighlighted();
+                            killEvent(e);
+                            return;
+                        case KEY.ESC:
+                            this.cancel(e);
+                            killEvent(e);
+                            return;
+                    }
+                } else {
+
+                    if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e) || e.which === KEY.ESC) {
+                        return;
+                    }
+
+                    if (this.opts.openOnEnter === false && e.which === KEY.ENTER) {
+                        return;
+                    }
+
+                    this.open();
+
+                    if (e.which === KEY.ENTER) {
+                        // do not propagate the event otherwise we open, and propagate enter which closes
+                        return;
+                    }
+                }
+            }));
+
+            this.search.bind("focus", this.bind(function() {
+                this.selection.attr("tabIndex", "-1");
+            }));
+            this.search.bind("blur", this.bind(function() {
+                if (!this.opened()) this.container.removeClass("select2-container-active");
+                window.setTimeout(this.bind(function() { this.selection.attr("tabIndex", this.opts.element.attr("tabIndex")); }), 10);
+            }));
+
+            selection.bind("mousedown", this.bind(function (e) {
+                clickingInside = true;
+
+                if (this.opened()) {
+                    this.close();
+                    this.selection.focus();
+                } else if (this.enabled) {
+                    this.open();
+                }
+
+                clickingInside = false;
+            }));
+
+            dropdown.bind("mousedown", this.bind(function() { this.search.focus(); }));
+
+            selection.bind("focus", this.bind(function() {
+                this.container.addClass("select2-container-active");
+                // hide the search so the tab key does not focus on it
+                this.search.attr("tabIndex", "-1");
+            }));
+
+            selection.bind("blur", this.bind(function() {
+                if (!this.opened()) {
+                    this.container.removeClass("select2-container-active");
+                }
+                window.setTimeout(this.bind(function() { this.search.attr("tabIndex", this.opts.element.attr("tabIndex")); }), 10);
+            }));
+
+            selection.bind("keydown", this.bind(function(e) {
+                if (!this.enabled) return;
+
+                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
+                    // prevent the page from scrolling
+                    killEvent(e);
+                    return;
+                }
+
+                if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e)
+                 || e.which === KEY.ESC) {
+                    return;
+                }
+
+                if (this.opts.openOnEnter === false && e.which === KEY.ENTER) {
+                    return;
+                }
+
+                if (e.which == KEY.DELETE) {
+                    if (this.opts.allowClear) {
+                        this.clear();
+                    }
+                    return;
+                }
+
+                this.open();
+
+                if (e.which === KEY.ENTER) {
+                    // do not propagate the event otherwise we open, and propagate enter which closes
+                    killEvent(e);
+                    return;
+                }
+
+                // do not set the search input value for non-alpha-numeric keys
+                // otherwise pressing down results in a '(' being set in the search field
+                if (e.which < 48 ) { // '0' == 48
+                    killEvent(e);
+                    return;
+                }
+
+                var keyWritten = String.fromCharCode(e.which).toLowerCase();
+
+                if (e.shiftKey) {
+                    keyWritten = keyWritten.toUpperCase();
+                }
+
+                // focus the field before calling val so the cursor ends up after the value instead of before
+                this.search.focus();
+                this.search.val(keyWritten);
+
+                // prevent event propagation so it doesnt replay on the now focussed search field and result in double key entry
+                killEvent(e);
+            }));
+
+            selection.delegate("abbr", "mousedown", this.bind(function (e) {
+                if (!this.enabled) return;
+                this.clear();
+                killEvent(e);
+                this.close();
+                this.triggerChange();
+                this.selection.focus();
+            }));
+
+            this.setPlaceholder();
+
+            this.search.bind("focus", this.bind(function() {
+                this.container.addClass("select2-container-active");
+            }));
+        },
+
+        // single
+        clear: function() {
+            this.opts.element.val("");
+            this.selection.find("span").empty();
+            this.selection.removeData("select2-data");
+            this.setPlaceholder();
+        },
+
+        /**
+         * Sets selection based on source element's value
+         */
+        // single
+        initSelection: function () {
+            var selected;
+            if (this.opts.element.val() === "") {
+                this.close();
+                this.setPlaceholder();
+            } else {
+                var self = this;
+                this.opts.initSelection.call(null, this.opts.element, function(selected){
+                    if (selected !== undefined && selected !== null) {
+                        self.updateSelection(selected);
+                        self.close();
+                        self.setPlaceholder();
+                    }
+                });
+            }
+        },
+
+        // single
+        prepareOpts: function () {
+            var opts = this.parent.prepareOpts.apply(this, arguments);
+
+            if (opts.element.get(0).tagName.toLowerCase() === "select") {
+                // install the selection initializer
+                opts.initSelection = function (element, callback) {
+                    var selected = element.find(":selected");
+                    // a single select box always has a value, no need to null check 'selected'
+                    if ($.isFunction(callback))
+                        callback({id: selected.attr("value"), text: selected.text()});
+                };
+            }
+
+            return opts;
+        },
+
+        // single
+        setPlaceholder: function () {
+            var placeholder = this.getPlaceholder();
+
+            if (this.opts.element.val() === "" && placeholder !== undefined) {
+
+                // check for a first blank option if attached to a select
+                if (this.select && this.select.find("option:first").text() !== "") return;
+
+                this.selection.find("span").html(this.opts.escapeMarkup(placeholder));
+
+                this.selection.addClass("select2-default");
+
+                this.selection.find("abbr").hide();
+            }
+        },
+
+        // single
+        postprocessResults: function (data, initial) {
+            var selected = 0, self = this, showSearchInput = true;
+
+            // find the selected element in the result list
+
+            this.results.find(".select2-result-selectable").each2(function (i, elm) {
+                if (equal(self.id(elm.data("select2-data")), self.opts.element.val())) {
+                    selected = i;
+                    return false;
+                }
+            });
+
+            // and highlight it
+
+            this.highlight(selected);
+
+            // hide the search box if this is the first we got the results and there are a few of them
+
+            if (initial === true) {
+                showSearchInput = this.showSearchInput = countResults(data.results) >= this.opts.minimumResultsForSearch;
+                this.dropdown.find(".select2-search")[showSearchInput ? "removeClass" : "addClass"]("select2-search-hidden");
+
+                //add "select2-with-searchbox" to the container if search box is shown
+                $(this.dropdown, this.container)[showSearchInput ? "addClass" : "removeClass"]("select2-with-searchbox");
+            }
+
+        },
+
+        // single
+        onSelect: function (data) {
+            var old = this.opts.element.val();
+
+            this.opts.element.val(this.id(data));
+            this.updateSelection(data);
+            this.close();
+            this.selection.focus();
+
+            if (!equal(old, this.id(data))) { this.triggerChange(); }
+        },
+
+        // single
+        updateSelection: function (data) {
+
+            var container=this.selection.find("span"), formatted;
+
+            this.selection.data("select2-data", data);
+
+            container.empty();
+            formatted=this.opts.formatSelection(data, container);
+            if (formatted !== undefined) {
+                container.append(this.opts.escapeMarkup(formatted));
+            }
+
+            this.selection.removeClass("select2-default");
+
+            if (this.opts.allowClear && this.getPlaceholder() !== undefined) {
+                this.selection.find("abbr").show();
+            }
+        },
+
+        // single
+        val: function () {
+            var val, data = null, self = this;
+
+            if (arguments.length === 0) {
+                return this.opts.element.val();
+            }
+
+            val = arguments[0];
+
+            if (this.select) {
+                this.select
+                    .val(val)
+                    .find(":selected").each2(function (i, elm) {
+                        data = {id: elm.attr("value"), text: elm.text()};
+                        return false;
+                    });
+                this.updateSelection(data);
+                this.setPlaceholder();
+            } else {
+                if (this.opts.initSelection === undefined) {
+                    throw new Error("cannot call val() if initSelection() is not defined");
+                }
+                // val is an id. !val is true for [undefined,null,'']
+                if (!val) {
+                    this.clear();
+                    return;
+                }
+                this.opts.element.val(val);
+                this.opts.initSelection(this.opts.element, function(data){
+                    self.opts.element.val(!data ? "" : self.id(data));
+                    self.updateSelection(data);
+                    self.setPlaceholder();
+                });
+            }
+        },
+
+        // single
+        clearSearch: function () {
+            this.search.val("");
+        },
+
+        // single
+        data: function(value) {
+            var data;
+
+            if (arguments.length === 0) {
+                data = this.selection.data("select2-data");
+                if (data == undefined) data = null;
+                return data;
+            } else {
+                if (!value || value === "") {
+                    this.clear();
+                } else {
+                    this.opts.element.val(!value ? "" : this.id(value));
+                    this.updateSelection(value);
+                }
+            }
+        }
+    });
+
+    MultiSelect2 = clazz(AbstractSelect2, {
+
+        // multi
+        createContainer: function () {
+            var container = $("<div></div>", {
+                "class": "select2-container select2-container-multi"
+            }).html([
+                "    <ul class='select2-choices'>",
+                //"<li class='select2-search-choice'><span>California</span><a href="javascript:void(0)" class="select2-search-choice-close"></a></li>" ,
+                "  <li class='select2-search-field'>" ,
+                "    <input type='text' autocomplete='off' class='select2-input'>" ,
+                "  </li>" ,
+                "</ul>" ,
+                "<div class='select2-drop select2-drop-multi' style='display:none;'>" ,
+                "   <ul class='select2-results'>" ,
+                "   </ul>" ,
+                "</div>"].join(""));
+			return container;
+        },
+
+        // multi
+        prepareOpts: function () {
+            var opts = this.parent.prepareOpts.apply(this, arguments);
+
+            // TODO validate placeholder is a string if specified
+
+            if (opts.element.get(0).tagName.toLowerCase() === "select") {
+                // install sthe selection initializer
+                opts.initSelection = function (element,callback) {
+
+                    var data = [];
+                    element.find(":selected").each2(function (i, elm) {
+                        data.push({id: elm.attr("value"), text: elm.text()});
+                    });
+
+                    if ($.isFunction(callback))
+                        callback(data);
+                };
+            }
+
+            return opts;
+        },
+
+        // multi
+        initContainer: function () {
+
+            var selector = ".select2-choices", selection;
+
+            this.searchContainer = this.container.find(".select2-search-field");
+            this.selection = selection = this.container.find(selector);
+
+            this.search.bind("keydown", this.bind(function (e) {
+                if (!this.enabled) return;
+
+                if (e.which === KEY.BACKSPACE && this.search.val() === "") {
+                    this.close();
+
+                    var choices,
+                        selected = selection.find(".select2-search-choice-focus");
+                    if (selected.length > 0) {
+                        this.unselect(selected.first());
+                        this.search.width(10);
+                        killEvent(e);
+                        return;
+                    }
+
+                    choices = selection.find(".select2-search-choice");
+                    if (choices.length > 0) {
+                        choices.last().addClass("select2-search-choice-focus");
+                    }
+                } else {
+                    selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
+                }
+
+                if (this.opened()) {
+                    switch (e.which) {
+                    case KEY.UP:
+                    case KEY.DOWN:
+                        this.moveHighlight((e.which === KEY.UP) ? -1 : 1);
+                        killEvent(e);
+                        return;
+                    case KEY.ENTER:
+                    case KEY.TAB:
+                        this.selectHighlighted();
+                        killEvent(e);
+                        return;
+                    case KEY.ESC:
+                        this.cancel(e);
+                        killEvent(e);
+                        return;
+                    }
+                }
+
+                if (e.which === KEY.TAB || KEY.isControl(e) || KEY.isFunctionKey(e)
+                 || e.which === KEY.BACKSPACE || e.which === KEY.ESC) {
+                    return;
+                }
+
+                if (this.opts.openOnEnter === false && e.which === KEY.ENTER) {
+                    return;
+                }
+
+                this.open();
+
+                if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
+                    // prevent the page from scrolling
+                    killEvent(e);
+                }
+            }));
+
+            this.search.bind("keyup", this.bind(this.resizeSearch));
+
+            this.search.bind("blur", this.bind(function(e) {
+                this.container.removeClass("select2-container-active");
+                this.search.removeClass("select2-focused");
+                this.clearSearch();
+                e.stopImmediatePropagation();
+            }));
+
+            this.container.delegate(selector, "mousedown", this.bind(function (e) {
+                if (!this.enabled) return;
+                if ($(e.target).closest(".select2-search-choice").length > 0) {
+                    // clicked inside a select2 search choice, do not open
+                    return;
+                }
+                this.clearPlaceholder();
+                this.open();
+                this.focusSearch();
+                e.preventDefault();
+            }));
+
+            this.container.delegate(selector, "focus", this.bind(function () {
+                if (!this.enabled) return;
+                this.container.addClass("select2-container-active");
+                this.dropdown.addClass("select2-drop-active");
+                this.clearPlaceholder();
+            }));
+
+            // set the placeholder if necessary
+            this.clearSearch();
+        },
+
+        // multi
+        enable: function() {
+            if (this.enabled) return;
+
+            this.parent.enable.apply(this, arguments);
+
+            this.search.removeAttr("disabled");
+        },
+
+        // multi
+        disable: function() {
+            if (!this.enabled) return;
+
+            this.parent.disable.apply(this, arguments);
+
+            this.search.attr("disabled", true);
+        },
+
+        // multi
+        initSelection: function () {
+            var data;
+            if (this.opts.element.val() === "") {
+                this.updateSelection([]);
+                this.close();
+                // set the placeholder if necessary
+                this.clearSearch();
+            }
+            if (this.select || this.opts.element.val() !== "") {
+                var self = this;
+                this.opts.initSelection.call(null, this.opts.element, function(data){
+                    if (data !== undefined && data !== null) {
+                        self.updateSelection(data);
+                        self.close();
+                        // set the placeholder if necessary
+                        self.clearSearch();
+                    }
+                });
+            }
+        },
+
+        // multi
+        clearSearch: function () {
+            var placeholder = this.getPlaceholder();
+
+            if (placeholder !== undefined  && this.getVal().length === 0 && this.search.hasClass("select2-focused") === false) {
+                this.search.val(placeholder).addClass("select2-default");
+                // stretch the search box to full width of the container so as much of the placeholder is visible as possible
+                this.resizeSearch();
+            } else {
+                // we set this to " " instead of "" and later clear it on focus() because there is a firefox bug
+                // that does not properly render the caret when the field starts out blank
+                this.search.val(" ").width(10);
+            }
+        },
+
+        // multi
+        clearPlaceholder: function () {
+            if (this.search.hasClass("select2-default")) {
+                this.search.val("").removeClass("select2-default");
+            } else {
+                // work around for the space character we set to avoid firefox caret bug
+                if (this.search.val() === " ") this.search.val("");
+            }
+        },
+
+        // multi
+        opening: function () {
+            this.parent.opening.apply(this, arguments);
+
+            this.clearPlaceholder();
+			this.resizeSearch();
+            this.focusSearch();
+        },
+
+        // multi
+        close: function () {
+            if (!this.opened()) return;
+            this.parent.close.apply(this, arguments);
+        },
+
+        // multi
+        focus: function () {
+            this.close();
+            this.search.focus();
+        },
+
+        // multi
+        isFocused: function () {
+            return this.search.hasClass("select2-focused");
+        },
+
+        // multi
+        updateSelection: function (data) {
+            var ids = [], filtered = [], self = this;
+
+            // filter out duplicates
+            $(data).each(function () {
+                if (indexOf(self.id(this), ids) < 0) {
+                    ids.push(self.id(this));
+                    filtered.push(this);
+                }
+            });
+            data = filtered;
+
+            this.selection.find(".select2-search-choice").remove();
+            $(data).each(function () {
+                self.addSelectedChoice(this);
+            });
+            self.postprocessResults();
+        },
+
+        tokenize: function() {
+            var input = this.search.val();
+            input = this.opts.tokenizer(input, this.data(), this.bind(this.onSelect), this.opts);
+            if (input != null && input != undefined) {
+                this.search.val(input);
+                if (input.length > 0) {
+                    this.open();
+                }
+            }
+
+        },
+
+        // multi
+        onSelect: function (data) {
+            this.addSelectedChoice(data);
+            if (this.select) { this.postprocessResults(); }
+
+            if (this.opts.closeOnSelect) {
+                this.close();
+                this.search.width(10);
+            } else {
+                if (this.countSelectableResults()>0) {
+                    this.search.width(10);
+                    this.resizeSearch();
+                    this.positionDropdown();
+                } else {
+                    // if nothing left to select close
+                    this.close();
+                }
+            }
+
+            // since its not possible to select an element that has already been
+            // added we do not need to check if this is a new element before firing change
+            this.triggerChange({ added: data });
+
+            this.focusSearch();
+        },
+
+        // multi
+        cancel: function () {
+            this.close();
+            this.focusSearch();
+        },
+
+        // multi
+        addSelectedChoice: function (data) {
+            var choice=$(
+                    "<li class='select2-search-choice'>" +
+                    "    <div></div>" +
+                    "    <a href='#' onclick='return false;' class='select2-search-choice-close' tabindex='-1'></a>" +
+                    "</li>"),
+                id = this.id(data),
+                val = this.getVal(),
+                formatted;
+
+            formatted=this.opts.formatSelection(data, choice);
+            choice.find("div").replaceWith("<div>"+this.opts.escapeMarkup(formatted)+"</div>");
+            choice.find(".select2-search-choice-close")
+                .bind("mousedown", killEvent)
+                .bind("click dblclick", this.bind(function (e) {
+                if (!this.enabled) return;
+
+                $(e.target).closest(".select2-search-choice").fadeOut('fast', this.bind(function(){
+                    this.unselect($(e.target));
+                    this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");
+                    this.close();
+                    this.focusSearch();
+                })).dequeue();
+                killEvent(e);
+            })).bind("focus", this.bind(function () {
+                if (!this.enabled) return;
+                this.container.addClass("select2-container-active");
+                this.dropdown.addClass("select2-drop-active");
+            }));
+
+            choice.data("select2-data", data);
+            choice.insertBefore(this.searchContainer);
+
+            val.push(id);
+            this.setVal(val);
+        },
+
+        // multi
+        unselect: function (selected) {
+            var val = this.getVal(),
+                data,
+                index;
+
+            selected = selected.closest(".select2-search-choice");
+
+            if (selected.length === 0) {
+                throw "Invalid argument: " + selected + ". Must be .select2-search-choice";
+            }
+
+            data = selected.data("select2-data");
+
+            index = indexOf(this.id(data), val);
+
+            if (index >= 0) {
+                val.splice(index, 1);
+                this.setVal(val);
+                if (this.select) this.postprocessResults();
+            }
+            selected.remove();
+            this.triggerChange({ removed: data });
+        },
+
+        // multi
+        postprocessResults: function () {
+            var val = this.getVal(),
+                choices = this.results.find(".select2-result-selectable"),
+                compound = this.results.find(".select2-result-with-children"),
+                self = this;
+
+            choices.each2(function (i, choice) {
+                var id = self.id(choice.data("select2-data"));
+                if (indexOf(id, val) >= 0) {
+                    choice.addClass("select2-disabled").removeClass("select2-result-selectable");
+                } else {
+                    choice.removeClass("select2-disabled").addClass("select2-result-selectable");
+                }
+            });
+
+            compound.each2(function(i, e) {
+                if (e.find(".select2-result-selectable").length==0) {
+                    e.addClass("select2-disabled");
+                } else {
+                    e.removeClass("select2-disabled");
+                }
+            });
+
+            choices.each2(function (i, choice) {
+                if (!choice.hasClass("select2-disabled") && choice.hasClass("select2-result-selectable")) {
+                    self.highlight(0);
+                    return false;
+                }
+            });
+
+        },
+
+        // multi
+        resizeSearch: function () {
+
+            var minimumWidth, left, maxWidth, containerLeft, searchWidth,
+            	sideBorderPadding = getSideBorderPadding(this.search);
+
+            minimumWidth = measureTextWidth(this.search) + 10;
+
+            left = this.search.offset().left;
+
+            maxWidth = this.selection.width();
+            containerLeft = this.selection.offset().left;
+
+            searchWidth = maxWidth - (left - containerLeft) - sideBorderPadding;
+            if (searchWidth < minimumWidth) {
+                searchWidth = maxWidth - sideBorderPadding;
+            }
+
+            if (searchWidth < 40) {
+                searchWidth = maxWidth - sideBorderPadding;
+            }
+            this.search.width(searchWidth);
+        },
+
+        // multi
+        getVal: function () {
+            var val;
+            if (this.select) {
+                val = this.select.val();
+                return val === null ? [] : val;
+            } else {
+                val = this.opts.element.val();
+                return splitVal(val, this.opts.separator);
+            }
+        },
+
+        // multi
+        setVal: function (val) {
+            var unique;
+            if (this.select) {
+                this.select.val(val);
+            } else {
+                unique = [];
+                // filter out duplicates
+                $(val).each(function () {
+                    if (indexOf(this, unique) < 0) unique.push(this);
+                });
+                this.opts.element.val(unique.length === 0 ? "" : unique.join(this.opts.separator));
+            }
+        },
+
+        // multi
+        val: function () {
+            var val, data = [], self=this;
+
+            if (arguments.length === 0) {
+                return this.getVal();
+            }
+
+            val = arguments[0];
+
+            if (!val) {
+                this.opts.element.val("");
+                this.updateSelection([]);
+                this.clearSearch();
+                return;
+            }
+
+            // val is a list of ids
+            this.setVal(val);
+
+            if (this.select) {
+                this.select.find(":selected").each(function () {
+                    data.push({id: $(this).attr("value"), text: $(this).text()});
+                });
+                this.updateSelection(data);
+            } else {
+                if (this.opts.initSelection === undefined) {
+                    throw new Error("val() cannot be called if initSelection() is not defined")
+                }
+
+                this.opts.initSelection(this.opts.element, function(data){
+                    var ids=$(data).map(self.id);
+                    self.setVal(ids);
+                    self.updateSelection(data);
+                    self.clearSearch();
+                });
+            }
+            this.clearSearch();
+        },
+
+        // multi
+        onSortStart: function() {
+            if (this.select) {
+                throw new Error("Sorting of elements is not supported when attached to <select>. Attach to <input type='hidden'/> instead.");
+            }
+
+            // collapse search field into 0 width so its container can be collapsed as well
+            this.search.width(0);
+            // hide the container
+            this.searchContainer.hide();
+        },
+
+        // multi
+        onSortEnd:function() {
+
+            var val=[], self=this;
+
+            // show search and move it to the end of the list
+            this.searchContainer.show();
+            // make sure the search container is the last item in the list
+            this.searchContainer.appendTo(this.searchContainer.parent());
+            // since we collapsed the width in dragStarted, we resize it here
+            this.resizeSearch();
+
+            // update selection
+
+            this.selection.find(".select2-search-choice").each(function() {
+                val.push(self.opts.id($(this).data("select2-data")));
+            });
+            this.setVal(val);
+            this.triggerChange();
+        },
+
+        // multi
+        data: function(values) {
+            var self=this, ids;
+            if (arguments.length === 0) {
+                 return this.selection
+                     .find(".select2-search-choice")
+                     .map(function() { return $(this).data("select2-data"); })
+                     .get();
+            } else {
+                if (!values) { values = []; }
+                ids = $.map(values, function(e) { return self.opts.id(e)});
+                this.setVal(ids);
+                this.updateSelection(values);
+                this.clearSearch();
+            }
+        }
+    });
+
+    $.fn.select2 = function () {
+
+        var args = Array.prototype.slice.call(arguments, 0),
+            opts,
+            select2,
+            value, multiple, allowedMethods = ["val", "destroy", "opened", "open", "close", "focus", "isFocused", "container", "onSortStart", "onSortEnd", "enable", "disable", "positionDropdown", "data"];
+
+        this.each(function () {
+            if (args.length === 0 || typeof(args[0]) === "object") {
+                opts = args.length === 0 ? {} : $.extend({}, args[0]);
+                opts.element = $(this);
+
+                if (opts.element.get(0).tagName.toLowerCase() === "select") {
+                    multiple = opts.element.attr("multiple");
+                } else {
+                    multiple = opts.multiple || false;
+                    if ("tags" in opts) {opts.multiple = multiple = true;}
+                }
+
+                select2 = multiple ? new MultiSelect2() : new SingleSelect2();
+                select2.init(opts);
+            } else if (typeof(args[0]) === "string") {
+
+                if (indexOf(args[0], allowedMethods) < 0) {
+                    throw "Unknown method: " + args[0];
+                }
+
+                value = undefined;
+                select2 = $(this).data("select2");
+                if (select2 === undefined) return;
+                if (args[0] === "container") {
+                    value=select2.container;
+                } else {
+                    value = select2[args[0]].apply(select2, args.slice(1));
+                }
+                if (value !== undefined) {return false;}
+            } else {
+                throw "Invalid arguments to select2 plugin: " + args;
+            }
+        });
+        return (value === undefined) ? this : value;
+    };
+
+    // plugin defaults, accessible to users
+    $.fn.select2.defaults = {
+        width: "copy",
+        closeOnSelect: true,
+        openOnEnter: true,
+        containerCss: {},
+        dropdownCss: {},
+        containerCssClass: "",
+        dropdownCssClass: "",
+        formatResult: function(result, container, query) {
+            var markup=[];
+            markMatch(result.text, query.term, markup);
+            return markup.join("");
+        },
+        formatSelection: function (data, container) {
+            return data.text;
+        },
+        formatResultCssClass: function(data) {return undefined;},
+        formatNoMatches: function () { return "No matches found"; },
+        formatInputTooShort: function (input, min) { return "Please enter " + (min - input.length) + " more characters"; },
+        formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); },
+        formatLoadMore: function (pageNumber) { return "Loading more results..."; },
+        formatSearching: function () { return "Searching..."; },
+        minimumResultsForSearch: 0,
+        minimumInputLength: 0,
+        maximumSelectionSize: 0,
+        id: function (e) { return e.id; },
+        matcher: function(term, text) {
+            return text.toUpperCase().indexOf(term.toUpperCase()) >= 0;
+        },
+        separator: ",",
+        tokenSeparators: [],
+        tokenizer: defaultTokenizer,
+        escapeMarkup: function (markup) {
+            if (markup && typeof(markup) === "string") {
+                return markup.replace(/&/g, "&amp;");
+            }
+            return markup;
+        },
+        blurOnChange: false
+    };
+
+    // exports
+    window.Select2 = {
+        query: {
+            ajax: ajax,
+            local: local,
+            tags: tags
+        }, util: {
+            debounce: debounce,
+            markMatch: markMatch
+        }, "class": {
+            "abstract": AbstractSelect2,
+            "single": SingleSelect2,
+            "multi": MultiSelect2
+        }
+    };
+
+}(jQuery));
diff --git a/addons/base_import/static/lib/select2/select2.png b/addons/base_import/static/lib/select2/select2.png
new file mode 100644
index 00000000000..1d804ffb996
Binary files /dev/null and b/addons/base_import/static/lib/select2/select2.png differ
diff --git a/addons/base_import/static/lib/select2/select2x2.png b/addons/base_import/static/lib/select2/select2x2.png
new file mode 100644
index 00000000000..4bdd5c961d4
Binary files /dev/null and b/addons/base_import/static/lib/select2/select2x2.png differ
diff --git a/addons/base_import/static/lib/select2/spinner.gif b/addons/base_import/static/lib/select2/spinner.gif
new file mode 100755
index 00000000000..5b33f7e54f4
Binary files /dev/null and b/addons/base_import/static/lib/select2/spinner.gif differ
diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css
new file mode 100644
index 00000000000..00c8bd138a4
--- /dev/null
+++ b/addons/base_import/static/src/css/import.css
@@ -0,0 +1,170 @@
+.oe_import > p {
+    margin-left: 8px;
+    margin-right: 8px;
+    text-align: justify
+}
+
+.oe_import h2 {
+    margin-top: 0;
+    margin-bottom: 5px;
+}
+
+.oe_padding {
+    padding: 13px;
+}
+/* ----------- IMPORT BOX ----------- */
+
+.oe_import .oe_import_box{
+    margin: 16px; 
+    padding: 16px;
+    background: #F0EEEE;
+    border-radius: 3px;
+    border: solid 1px #dddddd;
+    width: 600px;
+}
+.oe_import .oe_import_toggle{
+    margin-top: 8px;
+}
+.oe_import .oe_import_options{
+    margin-top: 8px;
+}
+.oe_import .oe_import_options input{
+    width: 150px;
+}
+
+.oe_import a.oe_import_toggle {
+    display: block;
+}
+.oe_import a.oe_import_toggle:before {
+    content: '+'
+}
+
+.oe_import .oe_import_options p {
+    margin: 0;
+    padding: 0;
+}
+.oe_import .oe_import_options label {
+    display: inline-block;
+    width: 100px;
+    height:32px;
+    line-height:32px;
+    text-align: right;
+}
+
+/* ----------- INITIAL SETUP ------------ */
+
+.openerp .oe_list_buttons .oe_alternative {
+    visibility: visible;
+}
+.openerp .oe_list_buttons.oe_editing .oe_list_button_import {
+    display: none;
+}
+
+.oe_import dd,
+.oe_import .oe_import_toggled,
+.oe_import .oe_import_grid,
+.oe_import .oe_import_error_report,
+.oe_import .oe_import_with_file,
+.oe_import .oe_import_noheaders,
+.oe_import .oe_import_report_more {
+    display: none;
+}
+
+.oe_import.oe_import_preview .oe_import_grid {
+    display: table;
+}
+.oe_import.oe_import_error .oe_import_error_report,
+.oe_import.oe_import_with_file .oe_import_with_file,
+.oe_import.oe_import_noheaders .oe_import_noheaders,
+.oe_import .oe_import_report_showmore .oe_import_report_more {
+    display: block;
+}
+
+.oe_import .oe_import_noheaders {
+    color: #888;
+}
+
+
+.oe_import_selector ul,
+.oe_import_selector li {
+    margin: 0; padding: 0;
+}
+
+/* ------------- ERRORS AND WARNINGS REPORT ------------ */
+
+.oe_import .oe_import_error_report ul{
+    padding-left: 16px;
+}
+.oe_import .oe_import_report {
+    margin-right: 16px;
+    padding: 4px;
+    list-style: none;
+    border-bottom: solid 1px rgba(0,0,0,0.05);
+}
+.oe_import .oe_import_report:first-child{
+    border-top-left-radius: 3px;
+    border-top-right-radius: 3px;
+}
+.oe_import .oe_import_report:last-child{
+    border-bottom-left-radius:3px;
+    border-bottom-right-radius:3px;
+    border-bottom: none;
+}
+.oe_import .oe_import_report_error {
+    background-color: #FFD9DB;
+    color: #AF5F5E;
+}
+.oe_import .oe_import_report_error:last-of-type{
+    border-bottom:none;
+}
+.oe_import .oe_import_report_warning {
+    background-color: #FEFFD9;
+    color: #918743;
+}
+.oe_import .oe_import_report_warning:last-of-type{
+    border-bottom:none;
+}
+.oe_import .oe_import_report_info {
+    background-color: #d3ffd3;
+}
+.oe_import .oe_import_report_info:last-of-type{
+    border-bottom:none;
+}
+
+/* ------------- THE CSV TABLE ------------ */
+
+.oe_import .oe_import_grid{
+    margin: 16px;
+    border-radius:3px;
+    border: solid 1px #909090;
+}
+.oe_import .oe_import_grid tr{
+    height:16px;
+}
+.oe_import .oe_import_grid tr.oe_import_grid-header:first-child{
+    height: 24px;
+    background: #909090;
+    color: white;
+}
+.oe_import .oe_import_grid tr:nth-child(odd){
+    background: rgba(0,0,0,0.05);
+}
+.oe_import .oe_import_grid td{
+    padding: 2px;
+    padding-left: 4px;
+}
+.oe_import .oe_import_grid tr.oe_import_grid-header td:not(:last-child){
+    border-right: 1px solid #707070;
+}
+.oe_import .oe_import_grid td:not(:last-child){
+    border-right: 1px solid #D0D0D0;
+}
+
+.oe_import .oe_import_error_report > p {
+    background: #efc9cb;
+}
+
+.oe_import .select2-results {
+    font-size: 12px;
+}
+
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
new file mode 100644
index 00000000000..d29452cc138
--- /dev/null
+++ b/addons/base_import/static/src/js/import.js
@@ -0,0 +1,448 @@
+openerp.base_import = function (instance) {
+    var QWeb = instance.web.qweb;
+    var _t = instance.web._t;
+    var _lt = instance.web._lt;
+
+    /**
+     * Safari does not deal well at all with raw JSON data being
+     * returned. As a result, we're going to cheat by using a
+     * pseudo-jsonp: instead of getting JSON data in the iframe, we're
+     * getting a ``script`` tag which consists of a function call and
+     * the returned data (the json dump).
+     *
+     * The function is an auto-generated name bound to ``window``,
+     * which calls back into the callback provided here.
+     *
+     * @param {Object} form the form element (DOM or jQuery) to use in the call
+     * @param {Object} attributes jquery.form attributes object
+     * @param {Function} callback function to call with the returned data
+     */
+    function jsonp(form, attributes, callback) {
+        attributes = attributes || {};
+        var options = {jsonp: _.uniqueId('import_callback_')};
+        window[options.jsonp] = function () {
+            delete window[options.jsonp];
+            callback.apply(null, arguments);
+        };
+        if ('data' in attributes) {
+            _.extend(attributes.data, options);
+        } else {
+            _.extend(attributes, {data: options});
+        }
+        _.extend(attributes, {
+            dataType: 'script',
+        });
+        $(form).ajaxSubmit(attributes);
+    }
+
+    // if true, the 'Import', 'Export', etc... buttons will be shown
+    instance.web.ListView.prototype.defaults.import_enabled = true;
+    instance.web.ListView.include({
+        load_list: function () {
+            var self = this;
+            var add_button = false;
+            if (!this.$buttons) {
+                add_button = true;
+            }
+            this._super.apply(this, arguments);
+            if(add_button) {
+                this.$buttons.on('click', '.oe_list_button_import', function() {
+                    self.do_action({
+                        type: 'ir.actions.client',
+                        tag: 'import',
+                        params: {
+                            model: self.dataset.model
+                        }
+                    }, {
+                        on_reverse_breadcrumb: function () {
+                            self.reload();
+                        },
+                    });
+                    return false;
+                });
+            }
+        }
+    });
+
+    instance.web.client_actions.add(
+        'import', 'instance.web.DataImport');
+    instance.web.DataImport = instance.web.Widget.extend({
+        template: 'ImportView',
+        opts: [
+            {name: 'encoding', label: _lt("Encoding:"), value: 'utf-8'},
+            {name: 'separator', label: _lt("Separator:"), value: ','},
+            {name: 'quoting', label: _lt("Quoting:"), value: '"'}
+        ],
+        events: {
+            // 'change .oe_import_grid input': 'import_dryrun',
+            'change .oe_import_file': 'loaded_file',
+            'click .oe_import_file_reload': 'loaded_file',
+            'change input.oe_import_has_header, .oe_import_options input': 'settings_changed',
+            'click a.oe_import_toggle': function (e) {
+                e.preventDefault();
+                var $el = $(e.target);
+                ($el.next().length
+                        ? $el.next()
+                        : $el.parent().next())
+                    .toggle();
+            },
+            'click .oe_import_report a.oe_import_report_count': function (e) {
+                e.preventDefault();
+                $(e.target).parent().toggleClass('oe_import_report_showmore');
+            },
+            'click .oe_import_moreinfo_action a': function (e) {
+                e.preventDefault();
+                // #data will parse the attribute on its own, we don't like
+                // that sort of things
+                var action = JSON.parse($(e.target).attr('data-action'));
+                // FIXME: when JS-side clean_action
+                action.views = _(action.views).map(function (view) {
+                    var id = view[0], type = view[1];
+                    return [
+                        id,
+                        type !== 'tree' ? type
+                          : action.view_type === 'form' ? 'list'
+                          : 'tree'
+                    ];
+                });
+                this.do_action(_.extend(action, {
+                    target: 'new',
+                    flags: {
+                        search_view: true,
+                        display_title: true,
+                        pager: true,
+                        list: {selectable: false}
+                    }
+                }));
+            },
+            // buttons
+            'click .oe_import_validate': 'validate',
+            'click .oe_import_import': 'import',
+            'click .oe_import_cancel': function (e) {
+                e.preventDefault();
+                this.exit();
+            }
+        },
+        init: function (parent, action) {
+            var self = this;
+            this._super.apply(this, arguments);
+            this.res_model = action.params.model;
+            // import object id
+            this.id = null;
+            this.Import = new instance.web.Model('base_import.import');
+        },
+        start: function () {
+            var self = this;
+            this.setup_encoding_picker();
+
+            return $.when(
+                this._super(),
+                this.Import.call('create', [{
+                    'res_model': this.res_model
+                }]).done(function (id) {
+                    self.id = id;
+                    self.$('input[name=import_id]').val(id);
+                })
+            )
+        },
+        setup_encoding_picker: function () {
+            this.$('input.oe_import_encoding').select2({
+                width: '160px',
+                query: function (q) {
+                    var make = function (term) { return {id: term, text: term}; };
+                    var suggestions = _.map(
+                        ('utf-8 utf-16 windows-1252 latin1 latin2 big5 ' +
+                         'gb18030 shift_jis windows-1251 koir8_r').split(/\s+/),
+                        make);
+                    if (q.term) {
+                        suggestions.unshift(make(q.term));
+                    }
+                    q.callback({results: suggestions});
+                },
+                initSelection: function (e, c) {
+                    return c({id: 'utf-8', text: 'utf-8'});
+                }
+            }).select2('val', 'utf-8');
+        },
+
+        import_options: function () {
+            var self = this;
+            var options = {
+                headers: this.$('input.oe_import_has_header').prop('checked')
+            };
+            _(this.opts).each(function (opt) {
+                options[opt.name] =
+                    self.$('input.oe_import_' + opt.name).val();
+            });
+            return options;
+        },
+
+        //- File & settings change section
+        onfile_loaded: function () {
+            this.$('.oe_import_button, .oe_import_file_reload')
+                    .prop('disabled', true);
+            if (!this.$('input.oe_import_file').val()) { return; }
+
+            this.$el.removeClass('oe_import_preview oe_import_error');
+            jsonp(this.$el, {
+                url: '/base_import/set_file'
+            }, this.proxy('settings_changed'));
+        },
+        onpreviewing: function () {
+            var self = this;
+            this.$('.oe_import_button, .oe_import_file_reload')
+                    .prop('disabled', true);
+            this.$el.addClass('oe_import_with_file');
+            // TODO: test that write // succeeded?
+            this.$el.removeClass('oe_import_preview_error oe_import_error');
+            this.$el.toggleClass(
+                'oe_import_noheaders',
+                !this.$('input.oe_import_has_header').prop('checked'));
+            this.Import.call(
+                'parse_preview', [this.id, this.import_options()])
+                .done(function (result) {
+                    var signal = result.error ? 'preview_failed' : 'preview_succeeded';
+                    self[signal](result);
+                });
+        },
+        onpreview_error: function (event, from, to, result) {
+            this.$('.oe_import_options').show();
+            this.$('.oe_import_file_reload').prop('disabled', false);
+            this.$el.addClass('oe_import_preview_error oe_import_error');
+            this.$('.oe_import_error_report').html(
+                    QWeb.render('ImportView.preview.error', result));
+        },
+        onpreview_success: function (event, from, to, result) {
+            this.$('.oe_import_import').removeClass('oe_highlight');
+            this.$('.oe_import_validate').addClass('oe_highlight');
+            this.$('.oe_import_button, .oe_import_file_reload')
+                    .prop('disabled', false);
+            this.$el.addClass('oe_import_preview');
+            this.$('table').html(QWeb.render('ImportView.preview', result));
+
+            if (result.headers.length === 1) {
+                this.$('.oe_import_options').show();
+                this.onresults(null, null, null, [{
+                    type: 'warning',
+                    message: _t("A single column was found in the file, this often means the file separator is incorrect")
+                }]);
+            }
+
+            var $fields = this.$('.oe_import_fields input');
+            this.render_fields_matches(result, $fields);
+            var data = this.generate_fields_completion(result);
+            var item_finder = function (id, items) {
+                items = items || data;
+                for (var i=0; i < items.length; ++i) {
+                    var item = items[i];
+                    if (item.id === id) {
+                        return item;
+                    }
+                    var val;
+                    if (item.children && (val = item_finder(id, item.children))) {
+                        return val;
+                    }
+                }
+                return '';
+            };
+            $fields.select2({
+                allowClear: true,
+                minimumInputLength: 0,
+                data: data,
+                initSelection: function (element, callback) {
+                    var default_value = element.val();
+                    if (!default_value) {
+                        callback('');
+                        return;
+                    }
+
+                    callback(item_finder(default_value));
+                },
+
+                width: 'resolve',
+                dropdownCssClass: 'oe_import_selector'
+            });
+        },
+        generate_fields_completion: function (root) {
+            var basic = [];
+            var regulars = [];
+            var o2m = [];
+            function traverse(field, ancestors, collection) {
+                var subfields = field.fields;
+                var field_path = ancestors.concat(field);
+                var label = _(field_path).pluck('string').join(' / ');
+                var id = _(field_path).pluck('name').join('/');
+
+                // If non-relational, m2o or m2m, collection is regulars
+                if (!collection) {
+                    if (field.name === 'id') {
+                        collection = basic
+                    } else if (_.isEmpty(subfields)
+                            || _.isEqual(_.pluck(subfields, 'name'), ['id', '.id'])) {
+                        collection = regulars;
+                    } else {
+                        collection = o2m;
+                    }
+                }
+
+                collection.push({
+                    id: id,
+                    text: label,
+                    required: field.required
+                });
+
+                for(var i=0, end=subfields.length; i<end; ++i) {
+                    traverse(subfields[i], field_path, collection);
+                }
+            }
+            _(root.fields).each(function (field) {
+                traverse(field, []);
+            });
+
+            var cmp = function (field1, field2) {
+                return field1.text.localeCompare(field2.text);
+
+            };
+            regulars.sort(cmp);
+            o2m.sort(cmp);
+            return basic.concat([
+                { text: _t("Normal Fields"), children: regulars },
+                { text: _t("Relation Fields"), children: o2m }
+            ]);
+        },
+        render_fields_matches: function (result, $fields) {
+            if (_(result.matches).isEmpty()) { return; }
+            $fields.each(function (index, input) {
+                var match = result.matches[index];
+                if (!match) { return; }
+
+                var current_field = result;
+                input.value = _(match).chain()
+                    .map(function (name) {
+                        // WARNING: does both mapping and folding (over the
+                        //          ``field`` iterator variable)
+                        return current_field = _(current_field.fields).find(function (subfield) {
+                            return subfield.name === name;
+                        });
+                    })
+                    .pluck('name')
+                    .value()
+                    .join('/');
+            });
+        },
+
+        //- import itself
+        call_import: function (options) {
+            var fields = this.$('.oe_import_fields input.oe_import_match_field').map(function (index, el) {
+                return $(el).select2('val') || false;
+            }).get();
+            return this.Import.call(
+                'do', [this.id, fields, this.import_options()], options);
+        },
+        onvalidate: function () {
+            return this.call_import({ dryrun: true })
+                .done(this.proxy('validated'));
+        },
+        onimport: function () {
+            var self = this;
+            return this.call_import({ dryrun: false }).done(function (message) {
+                if (!_.any(message, function (message) {
+                        return message.type === 'error' })) {
+                    self['import_succeeded']();
+                    return;
+                }
+                self['import_failed'](message);
+            });
+        },
+        onimported: function () {
+            this.exit();
+        },
+        exit: function () {
+            this.do_action({
+                type: 'ir.actions.client',
+                tag: 'history_back'
+            });
+        },
+        onresults: function (event, from, to, message) {
+            var no_messages = _.isEmpty(message);
+            this.$('.oe_import_import').toggleClass('oe_highlight', no_messages);
+            this.$('.oe_import_validate').toggleClass('oe_highlight', !no_messages);
+            if (no_messages) {
+                message.push({
+                    type: 'info',
+                    message: _t("Everything seems valid.")
+                });
+            }
+            // row indexes come back 0-indexed, spreadsheets
+            // display 1-indexed.
+            var offset = 1;
+            // offset more if header
+            if (this.import_options().headers) { offset += 1; }
+
+            this.$el.addClass('oe_import_error');
+            this.$('.oe_import_error_report').html(
+                QWeb.render('ImportView.error', {
+                    errors: _(message).groupBy('message'),
+                    at: function (rows) {
+                        var from = rows.from + offset;
+                        var to = rows.to + offset;
+                        if (from === to) {
+                            return _.str.sprintf(_t("at row %d"), from);
+                        }
+                        return _.str.sprintf(_t("between rows %d and %d"),
+                                             from, to);
+                    },
+                    more: function (n) {
+                        return _.str.sprintf(_t("(%d more)"), n);
+                    },
+                    info: function (msg) {
+                        if (typeof msg === 'string') {
+                            return _.str.sprintf(
+                                '<div class="oe_import_moreinfo oe_import_moreinfo_message">%s</div>',
+                                _.str.escapeHTML(msg));
+                        }
+                        if (msg instanceof Array) {
+                            return _.str.sprintf(
+                                '<div class="oe_import_moreinfo oe_import_moreinfo_choices">%s <ul>%s</ul></div>',
+                                _.str.escapeHTML(_t("Here are the possible values:")),
+                                _(msg).map(function (msg) {
+                                    return '<li>'
+                                        + _.str.escapeHTML(msg)
+                                    + '</li>';
+                                }).join(''));
+                        }
+                        // Final should be object, action descriptor
+                        return [
+                            '<div class="oe_import_moreinfo oe_import_moreinfo_action">',
+                                _.str.sprintf('<a href="#" data-action="%s">',
+                                        _.str.escapeHTML(JSON.stringify(msg))),
+                                    _.str.escapeHTML(
+                                        _t("Get all possible values")),
+                                '</a>',
+                            '</div>'
+                        ].join('')
+                    },
+                }));
+        },
+    });
+    // FSM-ize DataImport
+    StateMachine.create({
+        target: instance.web.DataImport.prototype,
+        events: [
+            { name: 'loaded_file',
+              from: ['none', 'file_loaded', 'preview_error', 'preview_success', 'results'],
+              to: 'file_loaded' },
+            { name: 'settings_changed',
+              from: ['file_loaded', 'preview_error', 'preview_success', 'results'],
+              to: 'previewing' },
+            { name: 'preview_failed', from: 'previewing', to: 'preview_error' },
+            { name: 'preview_succeeded', from: 'previewing', to: 'preview_success' },
+            { name: 'validate', from: 'preview_success', to: 'validating' },
+            { name: 'validate', from: 'results', to: 'validating' },
+            { name: 'validated', from: 'validating', to: 'results' },
+            { name: 'import', from: ['preview_success', 'results'], to: 'importing' },
+            { name: 'import_succeeded', from: 'importing', to: 'imported'},
+            { name: 'import_failed', from: 'importing', to: 'results' }
+        ]
+    })
+};
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
new file mode 100644
index 00000000000..0da75eb69b9
--- /dev/null
+++ b/addons/base_import/static/src/xml/import.xml
@@ -0,0 +1,399 @@
+<templates>
+    <t t-name="ImportView">
+        <t t-set="_id" t-value="_.uniqueId('export')"/>
+        <form action="" method="post" enctype="multipart/form-data" class="oe_import">
+            <div class="oe_view_manager oe_view_manager_current">
+                <div class="oe_view_manager_header oe_padding">
+                    <h2>
+                        Import a CSV File
+                    </h2>
+                    <input type="hidden" name="session_id"
+                       t-att-value="widget.session.session_id"/>
+                    <input type="hidden" name="import_id"/>
+                    <button type="button" disabled="disabled"
+                            class="oe_button oe_import_button oe_import_validate oe_highlight"
+                        >Validate</button>
+                    <button type="button" disabled="disabled"
+                            class="oe_button oe_import_button oe_import_import"
+                        >Import</button>
+                    <span class="oe_fade">or</span>
+                    <a class="oe_import_cancel" href="#">Cancel</a>
+                </div>
+            </div>
+
+            <p>Select the <a
+                    href="http://en.wikipedia.org/wiki/Comma-separated_values"
+                    class="oe_import_csv" target="_blank">.CSV</a>
+            file to import. If you need a sample importable file, you
+            can use the export tool to generate one.</p>
+            <div class="oe_import_box">
+                <label t-attf-for="file_#{_id}" autofocus="autofocus">CSV File:</label>
+                <input type="file" id-attf-id="file_#{_id}"
+                       name="file" class="oe_import_file"/>
+                <button type="button" class="oe_import_file_reload"
+                        disabled="disabled"
+                        title="Reload data to check changes.">
+                    <img src="/web/static/src/img/icons/gtk-refresh.png"/>
+                </button>
+                <div class="oe_import_with_file">
+                    <a href="#" class="oe_import_toggle">
+                        File Format Options…</a>
+                    <div class="oe_import_toggled oe_import_options">
+                        <p t-foreach="widget.opts" t-as="option">
+                            <!-- no @name, avoid submission when file_update called -->
+                            <label t-attf-for="#{option.name}_#{_id}">
+                                <t t-esc="option.label"/></label>
+                            <input t-attf-id="#{option.name}_#{_id}"
+                                   t-attf-class="oe_import_#{option.name}"
+                                   t-att-value="option.value"/>
+                        </p>
+                    </div>
+                </div>
+            </div>
+
+            <div class="oe_import_with_file oe_padding">
+                <h2>Map your data to OpenERP</h2>
+                <input type="checkbox" class="oe_import_has_header"
+                       id="oe_import_has_header" checked="checked"/>
+                <label for="oe_import_has_header">The first row of the
+                file contains the label of the column</label>
+                <p class="oe_import_noheaders">If the file contains
+                the column names, OpenERP can try auto-detecting the
+                field corresponding to the column. This makes imports
+                simpler especially when the file has many columns.</p>
+
+                <div class="oe_import_error_report"></div>
+                <table class="oe_import_grid" />
+
+                <h2>Frequently Asked Questions</h2>
+
+                <dl>
+                    <dt><a href="#" class="oe_import_toggle">
+                        Need to import data from an other application?</a></dt>
+                    <dd>
+                        <p>In order to re-create relationships between
+                        different records, you should use the unique
+                        identifier from the original application and
+                        map it to the <abbr title="External ID">ID</abbr>
+                        column in OpenERP. When you
+                        import an other record that links to the first
+                        one, use <abbr title="XXX/External ID">XXX/ID</abbr>
+                        to the original unique identifier.</p>
+                        <p>The <abbr title="External ID">ID</abbr>
+                        will also be used to update the original
+                        import if you need to re-import modified data
+                        later, it's thus good practice to specify it
+                        whenever possible</p>
+                    </dd>
+                </dl>
+
+                <dl>
+                    <dt><a href="#" class="oe_import_toggle">
+                        What can I do when the Import preview table isn't 
+                        displayed correctly?</a></dt>
+                    <dd>
+                        <p>By default the Import preview is set on commas as 
+                        field separators and quotation marks as text 
+                        delimiters. If your csv file does not have these 
+                        settings, you can modify the File Format Options 
+                        (displayed under the Browse CSV file bar after you 
+                        select your file).</p> <p>Note that if your CSV file 
+                        has a tabulation as separator, OpenERP will not 
+                        detect the separations. You will need to change the 
+                        file format options in your spreadsheet application. 
+                        See the following question.</p>
+                    </dd>
+                </dl>
+
+                <dl>
+                    <dt><a href="#" class="oe_import_toggle">
+                        How can I change the CSV file format options when 
+                        saving in my spreadsheet application?</a></dt>
+                    <dd>
+                        <p>If you edit and save CSV files in speadsheet 
+                        applications, your computer's regional settings will 
+                        be applied for the separator and delimiter. 
+                        We suggest you use OpenOffice or LibreOffice Calc 
+                        as they will allow you to modify all three options 
+                        (in 'Save As' dialog box > Check the box 'Edit filter 
+                        settings' > Save).</p> <p>Microsoft Excel will allow 
+                        you to modify only the encoding when saving 
+                        (in 'Save As' dialog box > click 'Tools' dropdown 
+                        list > Encoding tab).</p>
+                    </dd>
+                </dl>
+
+                <dl>
+                    <dt><a href="#" class="oe_import_toggle">
+                        What's the difference between Database ID and 
+                        External ID?</a></dt>
+                    <dd>
+                        <p>Some fields define a relationship with another 
+                        object. For example, the country of a contact is a 
+                        link to a record of the 'Country' object. When you 
+                        want to import such fields, OpenERP will have to 
+                        recreate links between the different records. 
+                        To help you import such fields, OpenERP provides 3 
+                        mechanisms. You must use one and only one mechanism 
+                        per field you want to import.</p> <p>For example, to 
+                        reference the country of a contact, OpenERP proposes 
+                        you 3 different fields to import: <ul>
+                        <li>Country: the name or code of the country</li>
+                        <li>Country/Database ID: the unique OpenERP ID for a 
+                        record, defined by the ID postgresql column</li>
+                        <li>Country/External ID: the ID of this record 
+                        referenced in another application (or the .XML file 
+                        that imported it)</li> </ul></p> <p>For the country 
+                        Belgium, you can use one of these 3 ways to import: 
+                        <ul> <li>Country: Belgium</li> <li>Country/Database 
+                        ID: 21</li> <li>Country/External ID: base.be</li>
+                        </ul></p> <p>According to your need, you should use 
+                        one of these 3 ways to reference records in relations. 
+                        Here is when you should use one or the other, 
+                        according to your need: <ul> <li>Use Country: This is 
+                        the easiest way when your data come from CSV files 
+                        that have been created manually.</li> <li>Use 
+                        Country/Database ID: You should rarely use this 
+                        notation. It's mostly used by developers as it's main 
+                        advantage is to never have conflicts (you may have 
+                        several records with the same name, but they always 
+                        have a unique Database ID)</li> <li>Use 
+                        Country/External ID: Use External ID when you import 
+                        data from a third party application.</li> </ul></p> 
+                        <p>When you use External IDs, you can import CSV files 
+                        with the "External ID" column to define the External 
+                        ID of each record you import. Then, you will be able 
+                        to make a reference to that record with columns like 
+                        "Field/External ID". The following two CSV files give 
+                        you an example for Products and their Categories.</p>
+                        <a href="/base_import/static/csv/External_id_3rd_party_application_product_categories.csv">CSV file for categories</a><br/>
+                        <a href="/base_import/static/csv/External_id_3rd_party_application_products.csv">CSV file for Products</a>
+                    </dd>
+                </dl>
+
+                <dl>
+                    <dt><a href="#" class="oe_import_toggle">
+                        What can I do if I have multiple matches for a field?
+                        </a></dt>
+                    <dd>
+                        <p>If for example you have two product categories 
+                        with the child name "Sellable" (ie. "Misc. 
+                        Products/Sellable" &amp; "Other Products/Sellable"),
+                        your validation is halted but you may still import 
+                        your data. However, we recommend you do not import the 
+                        data because they will all be linked to the first 
+                        'Sellable' category found in the Product Category list 
+                        ("Misc. Products/Sellable"). We recommend you modify 
+                        one of the duplicates' values or your product category 
+                        hierarchy.<br/>
+                        However if you do not wish to change your 
+                        configuration of product categories, we recommend you 
+                        use make use of the external ID for this field 
+                        'Category'.</p>
+                    </dd>
+                </dl>
+
+                <dl>
+                    <dt><a href="#" class="oe_import_toggle">
+                        How can I import a many2many relationship field 
+                        (e.g. a customer that has multiple tags)?</a></dt>
+                    <dd>
+                        <p>The tags should be separated by a comma without any 
+                        spacing. For example, if you want you customer to be 
+                        lined to both tags 'Manufacturer' and 'Retailer' 
+                        then you will encode it as follow "Manufacturer,
+                        Retailer" in the same column of your CSV file.</p>
+                        <a href="/base_import/static/csv/m2m_customers_tags.csv">
+                        CSV file for Manufacturer, Retailer</a><br/>
+                    </dd>
+                </dl>
+
+                <dl>
+                    <dt><a href="#" class="oe_import_toggle">
+                        How can I import a one2many relationship (e.g. several 
+                        Order Lines of a Sale Order)?</a></dt>
+                    <dd>
+                        <p>If you want to import sales order having several 
+                        order lines; for each order line, you need to reserve 
+                        a specific row in the CSV file. The first order line 
+                        will be imported on the same row as the information 
+                        relative to order. Any additional lines will need an 
+                        addtional row that does not have any information in 
+                        the fields relative to the order.</p>
+                        <p>As an example, here is 
+                        purchase.order_functional_error_line_cant_adpat.CSV 
+                        file of some quotations you can import, based on demo 
+                        data.</p>
+                        <a href="/base_import/static/csv/purchase.order_functional_error_line_cant_adpat.csv">File for some Quotations</a>
+                        <p>The following CSV file shows how to import purchase 
+                        orders with their respective purchase order lines:</p>
+                        <a href="/base_import/static/csv/o2m_purchase_order_lines.csv">Purchase orders with their respective purchase order lines</a>
+                        <p>The following CSV file shows how to import 
+                        suppliers and their respective contacts</p>
+                        <a href="/base_import/static/csv/o2m_suppliers_contacts.csv">Suppliers and their respective contacts</a>
+                    </dd>
+                </dl>
+
+
+                <dl>
+                    <dt><a href="#" class="oe_import_toggle">
+                        Can I import several times the same record?</a></dt>
+                    <dd>
+                        <p>If you import a file that contains one of the 
+                        column "External ID" or "Database ID", records that 
+                        have already been imported will be modified instead of 
+                        being created. This is very usefull as it allows you 
+                        to import several times the same CSV file while having 
+                        made some changes in between two imports. OpenERP will 
+                        take care of creating or modifying each record 
+                        depending if it's new or not.</p> <p> This feature 
+                        allows you to use the Import/Export tool of OpenERP to 
+                        modify a batch of records in your favorite spreadsheet 
+                        application.</p>
+                    </dd>
+                </dl>
+
+                <dl>
+                    <dt><a href="#" class="oe_import_toggle">
+                        What happens if I do not provide a value for a 
+                        specific field?</a></dt>
+                    <dd>
+                        <p>If you do not set all fields in your CSV file, 
+                        OpenERP will assign the default value for every non 
+                        defined fields. But if you
+                        set fields with empty values in your CSV file, OpenERP 
+                        will set the EMPTY value in the field, instead of 
+                        assigning the default value.</p>
+                    </dd>
+                </dl>
+
+                <dl>
+                    <dt><a href="#" class="oe_import_toggle">
+                        How to export/import different tables from an SQL 
+                        application to OpenERP?</a></dt>
+                    <dd>
+                        <p>If you need to import data from different tables, 
+                        you will have to recreate relations between records 
+                        belonging to different tables. (e.g. if you import 
+                        companies and persons, you will have to recreate the 
+                        link between each person and the company they work 
+                        for).</p> <p>To manage relations between tables, 
+                        you can use the "External ID" facilities of OpenERP. 
+                        The "External ID" of a record is the unique identifier 
+                        of this record in another application. This "External 
+                        ID" must be unique accoss all the records of all 
+                        objects, so it's a good practice to prefix this 
+                        "External ID" with the name of the application or 
+                        table. (like 'company_1', 'person_1' instead of '1')
+                        </p> <p>As an example, suppose you have a SQL database 
+                        with two tables you want to import: companies and 
+                        persons. Each person belong to one company, so you 
+                        will have to recreate the link between a person and 
+                        the company he work for. (If you want to test this 
+                        example, here is a <a href="/base_import/static/csv/database_import_test.sql">
+                        dump of such a PostgreSQL database</a>).</p>
+                        <p>We will first export all companies and their 
+                        "External ID". In PSQL, write the following command:
+                        </p> <p>&#160;&#160;&#160;&#160;copy 
+                        (select 'company_'||id as "External ID",company_name 
+                        as "Name",'True' as "Is a Company" from companies) TO 
+                        '/tmp/company.csv' with CSV HEADER;</p>
+                        <p>This SQL command will create the following CSV file:
+                        <br/>&#160;&#160;&#160;&#160;External ID,Name,Is a Company
+                        <br/>&#160;&#160;&#160;&#160;company_1,Bigees,True
+                        <br/>&#160;&#160;&#160;&#160;company_2,Organi,True
+                        <br/>&#160;&#160;&#160;&#160;company_3,Boum,True</p>
+                        <p>To create the CSV file for persons, linked to 
+                        companies, we will use the following SQL command in 
+                        PSQL:</p> <p>&#160;&#160;&#160;&#160;copy (select 
+                        'person_'||id as "External ID",person_name as 
+                        "Name",'False' as "Is a Company",'company_'||company_id
+                         as "Related Company/External ID" from persons) TO 
+                        '/tmp/person.csv' with CSV</p>
+                        <p>It will produce the following CSV file:
+                        <br/>&#160;&#160;&#160;&#160;External ID,Name,Is a 
+                        Company,Related Company/External ID
+                        <br/>&#160;&#160;&#160;&#160;person_1,Fabien,False,company_1
+                        <br/>&#160;&#160;&#160;&#160;person_2,Laurence,False,company_1
+                        <br/>&#160;&#160;&#160;&#160;person_3,Eric,False,company_2
+                        <br/>&#160;&#160;&#160;&#160;person_4,Ramsy,False,company_3</p>
+                        <p>As you can see in this file, Fabien and Laurence 
+                        are working for the Bigees company (company_1) and 
+                        Eric is working for the Organi company. The relation 
+                        between persons and companies is done using the 
+                        External ID of the companies. We had to prefix the 
+                        "External ID" by the name of the table to avoid a 
+                        conflict of ID between persons and companies (person_1 
+                        and company_1 who shared the same ID 1 in the orignial 
+                        database).</p>
+                        <p>The two files produced are ready to be imported in 
+                        OpenERP without any modifications. After having 
+                        imported these two CSV files, you will have 4 contacts 
+                        and 3 companies. (the firsts two contacts are linked 
+                        to the first company). You must first import the 
+                        companies and then the persons.</p>
+                    </dd>
+                </dl>
+
+            </div>
+        </form>
+    </t>
+
+    <t t-name="ImportView.preview">
+        <tr t-if="headers" class="oe_import_grid-header">
+            <td t-foreach="headers" t-as="header" class="oe_import_grid-cell"
+                ><t t-esc="header"/></td>
+        </tr>
+        <tr class="oe_import_fields">
+            <!-- Iterate on first row to ensure we have all columns -->
+            <td t-foreach="preview[0]" t-as="column">
+                <input placeholder="Don't Import"
+                       class="oe_import_match_field"/>
+            </td>
+        </tr>
+        <tr t-foreach="preview" t-as="row" class="oe_import_grid-row">
+            <td t-foreach="row" t-as="cell" class="oe_import_grid-cell"
+                ><t t-esc="cell"/></td>
+        </tr>
+    </t>
+    <t t-name="ImportView.preview.error">
+        <p>Import preview failed due to: <t t-esc="error"/>. The issue is
+            usually an incorrect file encoding.</p>
+        <p>Here is the start of the file we could not import:</p>
+        <pre><t t-esc="preview"/></pre>
+    </t>
+    <ul t-name="ImportView.error">
+        <li t-foreach="errors" t-as="error"
+            t-attf-class="oe_import_report oe_import_report_#{error_value[0].type}">
+            <t t-call="ImportView.error.each">
+                <t t-set="error" t-value="error_value[0]"/>
+            </t>
+
+            <a href="#" class="oe_import_report_count" t-if="error_value.length gt 1">
+                <t t-esc="more(error_value.length - 1)"/>
+            </a>
+            <ul class="oe_import_report_more" t-if="error_value.length gt 1">
+                <li t-foreach="error_value.length - 1" t-as="index">
+                    <t t-call="ImportView.error.each">
+                        <t t-set="error" t-value="error_value[index + 1]"/>
+                    </t>
+                </li>
+            </ul>
+        </li>
+    </ul>
+    <t t-name="ImportView.error.each">
+        <span class="oe_import_report_message">
+            <t t-esc="error.message"/>
+        </span>
+        <t t-if="error.rows"  t-esc="at(error.rows)"/>
+        <t t-if="error.moreinfo" t-raw="info(error.moreinfo)"/>
+    </t>
+    <t t-extend="ListView.buttons">
+        <t t-jquery="span.oe_alternative">
+            this.attr('t-if', 'widget.options.import_enabled');
+        </t>
+        <t t-jquery="span.oe_alternative" t-operation="append">
+            <a href="#" class="oe_bold oe_list_button_import">Import</a>
+        </t>
+    </t>
+</templates>
diff --git a/addons/base_import/static/test/states.js b/addons/base_import/static/test/states.js
new file mode 100644
index 00000000000..3e349907a6f
--- /dev/null
+++ b/addons/base_import/static/test/states.js
@@ -0,0 +1,6 @@
+$(document).ready(function () {
+    module('foo');
+    test('dummy', function () {
+        ok(42);
+    });
+});
diff --git a/addons/base_import/test_models.py b/addons/base_import/test_models.py
new file mode 100644
index 00000000000..0720ae11eda
--- /dev/null
+++ b/addons/base_import/test_models.py
@@ -0,0 +1,101 @@
+from openerp.osv import orm, fields
+
+def name(n): return 'base_import.tests.models.%s' % n
+
+class char(orm.Model):
+    _name = name('char')
+
+    _columns = {
+        'value': fields.char('unknown', size=None)
+    }
+
+class char_required(orm.Model):
+    _name = name('char.required')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, required=True)
+    }
+
+class char_readonly(orm.Model):
+    _name = name('char.readonly')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, readonly=True)
+    }
+
+class char_states(orm.Model):
+    _name = name('char.states')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, readonly=True, states={'draft': [('readonly', False)]})
+    }
+
+class char_noreadonly(orm.Model):
+    _name = name('char.noreadonly')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, readonly=True, states={'draft': [('invisible', True)]})
+    }
+
+class char_stillreadonly(orm.Model):
+    _name = name('char.stillreadonly')
+
+    _columns = {
+        'value': fields.char('unknown', size=None, readonly=True, states={'draft': [('readonly', True)]})
+    }
+
+# TODO: complex field (m2m, o2m, m2o)
+class m2o(orm.Model):
+    _name = name('m2o')
+
+    _columns = {
+        'value': fields.many2one(name('m2o.related'))
+    }
+class m2o_related(orm.Model):
+    _name = name('m2o.related')
+
+    _columns = {
+        'value': fields.integer()
+    }
+    _defaults = {
+        'value': 42
+    }
+
+class m2o_required(orm.Model):
+    _name = name('m2o.required')
+
+    _columns = {
+        'value': fields.many2one(name('m2o.required.related'), required=True)
+    }
+class m2o_required_related(orm.Model):
+    _name = name('m2o.required.related')
+
+    _columns = {
+        'value': fields.integer()
+    }
+    _defaults = {
+        'value': 42
+    }
+
+class o2m(orm.Model):
+    _name = name('o2m')
+
+    _columns = {
+        'value': fields.one2many(name('o2m.child'), 'parent_id')
+    }
+class o2m_child(orm.Model):
+    _name = name('o2m.child')
+
+    _columns = {
+        'parent_id': fields.many2one(name('o2m')),
+        'value': fields.integer()
+    }
+
+class preview_model(orm.Model):
+    _name = name('preview')
+
+    _columns = {
+        'name': fields.char('Name', size=None),
+        'somevalue': fields.integer('Some Value', required=True),
+        'othervalue': fields.integer('Other Variable'),
+    }
diff --git a/addons/base_import/tests/__init__.py b/addons/base_import/tests/__init__.py
new file mode 100644
index 00000000000..abef28c8ca1
--- /dev/null
+++ b/addons/base_import/tests/__init__.py
@@ -0,0 +1,3 @@
+from . import test_cases
+
+checks = [test_cases]
diff --git a/addons/base_import/tests/test_cases.py b/addons/base_import/tests/test_cases.py
new file mode 100644
index 00000000000..5479ae94428
--- /dev/null
+++ b/addons/base_import/tests/test_cases.py
@@ -0,0 +1,342 @@
+# -*- encoding: utf-8 -*-
+import unittest2
+from openerp.tests.common import TransactionCase
+
+from .. import models
+
+ID_FIELD = {'id': 'id', 'name': 'id', 'string': "External ID", 'required': False, 'fields': []}
+def make_field(name='value', string='unknown', required=False, fields=[]):
+    return [
+        ID_FIELD,
+        {'id': name, 'name': name, 'string': string, 'required': required, 'fields': fields},
+    ]
+
+class test_basic_fields(TransactionCase):
+    def get_fields(self, field):
+        return self.registry('base_import.import')\
+            .get_fields(self.cr, self.uid, 'base_import.tests.models.' + field)
+
+    def test_base(self):
+        """ A basic field is not required """
+        self.assertEqual(self.get_fields('char'), make_field())
+
+    def test_required(self):
+        """ Required fields should be flagged (so they can be fill-required) """
+        self.assertEqual(self.get_fields('char.required'), make_field(required=True))
+
+    def test_readonly(self):
+        """ Readonly fields should be filtered out"""
+        self.assertEqual(self.get_fields('char.readonly'), [ID_FIELD])
+
+    def test_readonly_states(self):
+        """ Readonly fields with states should not be filtered out"""
+        self.assertEqual(self.get_fields('char.states'), make_field())
+
+    def test_readonly_states_noreadonly(self):
+        """ Readonly fields with states having nothing to do with
+        readonly should still be filtered out"""
+        self.assertEqual(self.get_fields('char.noreadonly'), [ID_FIELD])
+
+    def test_readonly_states_stillreadonly(self):
+        """ Readonly fields with readonly states leaving them readonly
+        always... filtered out"""
+        self.assertEqual(self.get_fields('char.stillreadonly'), [ID_FIELD])
+
+    def test_m2o(self):
+        """ M2O fields should allow import of themselves (name_get),
+        their id and their xid"""
+        self.assertEqual(self.get_fields('m2o'), make_field(fields=[
+            {'id': 'value', 'name': 'id', 'string': 'External ID', 'required': False, 'fields': []},
+            {'id': 'value', 'name': '.id', 'string': 'Database ID', 'required': False, 'fields': []},
+        ]))
+    
+    def test_m2o_required(self):
+        """ If an m2o field is required, its three sub-fields are
+        required as well (the client has to handle that: requiredness
+        is id-based)
+        """
+        self.assertEqual(self.get_fields('m2o.required'), make_field(required=True, fields=[
+            {'id': 'value', 'name': 'id', 'string': 'External ID', 'required': True, 'fields': []},
+            {'id': 'value', 'name': '.id', 'string': 'Database ID', 'required': True, 'fields': []},
+        ]))
+
+class test_o2m(TransactionCase):
+    def get_fields(self, field):
+        return self.registry('base_import.import')\
+            .get_fields(self.cr, self.uid, 'base_import.tests.models.' + field)
+
+    def test_shallow(self):
+        self.assertEqual(self.get_fields('o2m'), make_field(fields=[
+            {'id': 'id', 'name': 'id', 'string': 'External ID', 'required': False, 'fields': []},
+            # FIXME: should reverse field be ignored?
+            {'id': 'parent_id', 'name': 'parent_id', 'string': 'unknown', 'required': False, 'fields': [
+                {'id': 'parent_id', 'name': 'id', 'string': 'External ID', 'required': False, 'fields': []},
+                {'id': 'parent_id', 'name': '.id', 'string': 'Database ID', 'required': False, 'fields': []},
+            ]},
+            {'id': 'value', 'name': 'value', 'string': 'unknown', 'required': False, 'fields': []},
+        ]))
+
+class test_match_headers_single(TransactionCase):
+    def test_match_by_name(self):
+        match = self.registry('base_import.import')._match_header(
+            'f0', [{'name': 'f0'}], {})
+
+        self.assertEqual(match, [{'name': 'f0'}])
+
+    def test_match_by_string(self):
+        match = self.registry('base_import.import')._match_header(
+            'some field', [{'name': 'bob', 'string': "Some Field"}], {})
+
+        self.assertEqual(match, [{'name': 'bob', 'string': "Some Field"}])
+
+    def test_nomatch(self):
+        match = self.registry('base_import.import')._match_header(
+            'should not be', [{'name': 'bob', 'string': "wheee"}], {})
+
+        self.assertEqual(match, [])
+
+    def test_recursive_match(self):
+        f = {
+            'name': 'f0',
+            'string': "My Field",
+            'fields': [
+                {'name': 'f0', 'string': "Sub field 0", 'fields': []},
+                {'name': 'f1', 'string': "Sub field 2", 'fields': []},
+            ]
+        }
+        match = self.registry('base_import.import')._match_header(
+            'f0/f1', [f], {})
+
+        self.assertEqual(match, [f, f['fields'][1]])
+
+    def test_recursive_nomatch(self):
+        """ Match first level, fail to match second level
+        """
+        f = {
+            'name': 'f0',
+            'string': "My Field",
+            'fields': [
+                {'name': 'f0', 'string': "Sub field 0", 'fields': []},
+                {'name': 'f1', 'string': "Sub field 2", 'fields': []},
+            ]
+        }
+        match = self.registry('base_import.import')._match_header(
+            'f0/f2', [f], {})
+
+        self.assertEqual(match, [])
+
+class test_match_headers_multiple(TransactionCase):
+    def test_noheaders(self):
+        self.assertEqual(
+            self.registry('base_import.import')._match_headers(
+                [], [], {}),
+            (None, None)
+        )
+    def test_nomatch(self):
+        self.assertEqual(
+            self.registry('base_import.import')._match_headers(
+                iter([
+                    ['foo', 'bar', 'baz', 'qux'],
+                    ['v1', 'v2', 'v3', 'v4'],
+                ]),
+                [],
+                {'headers': True}),
+            (
+                ['foo', 'bar', 'baz', 'qux'],
+                dict.fromkeys(range(4))
+            )
+        )
+
+    def test_mixed(self):
+        self.assertEqual(
+            self.registry('base_import.import')._match_headers(
+                iter(['foo bar baz qux/corge'.split()]),
+                [
+                    {'name': 'bar', 'string': 'Bar'},
+                    {'name': 'bob', 'string': 'Baz'},
+                    {'name': 'qux', 'string': 'Qux', 'fields': [
+                        {'name': 'corge', 'fields': []},
+                     ]}
+                ],
+                {'headers': True}),
+            (['foo', 'bar', 'baz', 'qux/corge'], {
+                0: None,
+                1: ['bar'],
+                2: ['bob'],
+                3: ['qux', 'corge'],
+            })
+        )
+
+class test_preview(TransactionCase):
+    def make_import(self):
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'res.users',
+            'file': u"로그인,언어\nbob,1\n".encode('euc_kr'),
+        })
+        return Import, id
+
+    def test_encoding(self):
+        Import, id = self.make_import()
+        result = Import.parse_preview(self.cr, self.uid, id, {
+                'quoting': '"',
+                'separator': ',',
+        })
+        self.assertTrue('error' in result)
+
+    def test_csv_errors(self):
+        Import, id = self.make_import()
+
+        result = Import.parse_preview(self.cr, self.uid, id, {
+                'quoting': 'foo',
+                'separator': ',',
+                'encoding': 'euc_kr',
+        })
+        self.assertTrue('error' in result)
+
+    def test_csv_errors(self):
+        Import, id = self.make_import()
+
+        result = Import.parse_preview(self.cr, self.uid, id, {
+                'quoting': '"',
+                'separator': 'bob',
+                'encoding': 'euc_kr',
+        })
+        self.assertTrue('error' in result)
+
+    def test_success(self):
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': 'name,Some Value,Counter\n'
+                    'foo,1,2\n'
+                    'bar,3,4\n'
+                    'qux,5,6\n'
+        })
+
+        result = Import.parse_preview(self.cr, self.uid, id, {
+            'quoting': '"',
+            'separator': ',',
+            'headers': True,
+        })
+
+        self.assertEqual(result['matches'], {0: ['name'], 1: ['somevalue'], 2: None})
+        self.assertEqual(result['headers'], ['name', 'Some Value', 'Counter'])
+        # Order depends on iteration order of fields_get
+        self.assertItemsEqual(result['fields'], [
+            {'id': 'id', 'name': 'id', 'string': 'External ID', 'required':False, 'fields': []},
+            {'id': 'name', 'name': 'name', 'string': 'Name', 'required':False, 'fields': []},
+            {'id': 'somevalue', 'name': 'somevalue', 'string': 'Some Value', 'required':True, 'fields': []},
+            {'id': 'othervalue', 'name': 'othervalue', 'string': 'Other Variable', 'required':False, 'fields': []},
+        ])
+        self.assertEqual(result['preview'], [
+            ['foo', '1', '2'],
+            ['bar', '3', '4'],
+            ['qux', '5', '6'],
+        ])
+        # Ensure we only have the response fields we expect
+        self.assertItemsEqual(result.keys(), ['matches', 'headers', 'fields', 'preview'])
+
+class test_convert_import_data(TransactionCase):
+    """ Tests conversion of base_import.import input into data which
+    can be fed to Model.import_data
+    """
+    def test_all(self):
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': 'name,Some Value,Counter\n'
+                    'foo,1,2\n'
+                    'bar,3,4\n'
+                    'qux,5,6\n'
+        })
+        record = Import.browse(self.cr, self.uid, id)
+        data, fields = Import._convert_import_data(
+            record, ['name', 'somevalue', 'othervalue'],
+            {'quoting': '"', 'separator': ',', 'headers': True,})
+
+        self.assertItemsEqual(fields, ['name', 'somevalue', 'othervalue'])
+        self.assertItemsEqual(data, [
+            ('foo', '1', '2'),
+            ('bar', '3', '4'),
+            ('qux', '5', '6'),
+        ])
+
+    def test_filtered(self):
+        """ If ``False`` is provided as field mapping for a column,
+        that column should be removed from importable data
+        """
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': 'name,Some Value,Counter\n'
+                    'foo,1,2\n'
+                    'bar,3,4\n'
+                    'qux,5,6\n'
+        })
+        record = Import.browse(self.cr, self.uid, id)
+        data, fields = Import._convert_import_data(
+            record, ['name', False, 'othervalue'],
+            {'quoting': '"', 'separator': ',', 'headers': True,})
+
+        self.assertItemsEqual(fields, ['name', 'othervalue'])
+        self.assertItemsEqual(data, [
+            ('foo', '2'),
+            ('bar', '4'),
+            ('qux', '6'),
+        ])
+
+    def test_norow(self):
+        """ If a row is composed only of empty values (due to having
+        filtered out non-empty values from it), it should be removed
+        """
+        Import = self.registry('base_import.import')
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': 'name,Some Value,Counter\n'
+                    'foo,1,2\n'
+                    ',3,\n'
+                    ',5,6\n'
+        })
+        record = Import.browse(self.cr, self.uid, id)
+        data, fields = Import._convert_import_data(
+            record, ['name', False, 'othervalue'],
+            {'quoting': '"', 'separator': ',', 'headers': True,})
+
+        self.assertItemsEqual(fields, ['name', 'othervalue'])
+        self.assertItemsEqual(data, [
+            ('foo', '2'),
+            ('', '6'),
+        ])
+
+    def test_nofield(self):
+        Import = self.registry('base_import.import')
+
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': 'name,Some Value,Counter\n'
+                    'foo,1,2\n'
+        })
+
+        record = Import.browse(self.cr, self.uid, id)
+        self.assertRaises(
+            ValueError,
+            Import._convert_import_data,
+            record, [],
+            {'quoting': '"', 'separator': ',', 'headers': True,})
+
+    def test_falsefields(self):
+        Import = self.registry('base_import.import')
+
+        id = Import.create(self.cr, self.uid, {
+            'res_model': 'base_import.tests.models.preview',
+            'file': 'name,Some Value,Counter\n'
+                    'foo,1,2\n'
+        })
+
+        record = Import.browse(self.cr, self.uid, id)
+        self.assertRaises(
+            ValueError,
+            Import._convert_import_data,
+            record, [False, False, False],
+            {'quoting': '"', 'separator': ',', 'headers': True,})
diff --git a/addons/base_module_doc_rst/__openerp__.py b/addons/base_module_doc_rst/__openerp__.py
deleted file mode 100644
index 2f9aa2dac49..00000000000
--- a/addons/base_module_doc_rst/__openerp__.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-
-{
-    'name': 'Generate Docs of Modules',
-    'version': '1.0',
-    'category': 'Tools',
-    'description': """
-This module generates the Technical Guides of selected modules in Restructured Text format (RST).
-=================================================================================================
-
-    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST
-    * It creates a tarball (.tgz file suffix) containing an index file and one file per module
-    * Generates Relationship Graph
-    """,
-    'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [
-        'base_module_doc_rst_view.xml',
-        'wizard/generate_relation_graph_view.xml',
-        'wizard/tech_guide_rst_view.xml',
-        'module_report.xml',
-    ],
-    'demo_xml': [],
-    'installable': True,
-    'certificate': '001288481437217734509',
-    'images': ['images/base_module_doc_rst1.jpeg'],
-}
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_doc_rst/base_module_doc_rst.py b/addons/base_module_doc_rst/base_module_doc_rst.py
deleted file mode 100644
index 06393fa99ff..00000000000
--- a/addons/base_module_doc_rst/base_module_doc_rst.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# -*- 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 os
-import pydot
-import base64
-
-import report
-from osv import fields, osv
-import addons
-
-class module(osv.osv):
-    _inherit = 'ir.module.module'
-    _description = 'Module With Relationship Graph'
-    _columns = {
-        'file_graph': fields.binary('Relationship Graph'),
-            }
-
-    def _get_graphical_representation(self, cr, uid, model_ids, level=1, context=None):
-        obj_model = self.pool.get('ir.model')
-        if level == 0:
-            return tuple()
-        relation = []
-        for id in model_ids:
-            model_data = obj_model.browse(cr, uid, id, context=context)
-            for field in (f for f in model_data.field_id if f.ttype in ('many2many', 'many2one', 'one2many')):
-                relation.append((model_data.model, field.name, field.ttype, field.relation, field.field_description))
-                new_model_ids = obj_model.search(cr, uid, [('model', '=', field.relation)], context=context)
-                if new_model_ids:
-                    model = obj_model.read(cr, uid, new_model_ids, ['id', 'name'], context=context)[0]
-                    relation.extend(self._get_graphical_representation(cr, uid, model['id'], level - 1))
-        return tuple(relation)
-
-    def _get_structure(self, relations, main_element):
-        res = {}
-        for rel in relations:
-            # if we have to display the string along with field name then uncomment the first line n comment the second line
-            res.setdefault(rel[0], set()).add(rel[1])
-            res.setdefault(rel[3], set())
-        val = []
-        for obj, fields in res.items():
-            val.append('"%s" [%s label="{<id>%s|%s}"];' % (obj,
-                                                       obj in main_element and 'fillcolor=yellow, style="filled,rounded"' or "",
-                                                       obj,
-                                                       "|".join(["<%s> %s" % (fn, fn) for fn in fields])))
-        return "\n".join(val)
-
-    def _get_arrow(self, field_type='many2one'):
-        return {
-            'many2one': 'arrowtail="none" arrowhead="normal" color="red" label="m2o"',
-            'many2many': 'arrowtail="crow" arrowhead="crow" color="green" label="m2m"',
-            'one2many': 'arrowtail="none" arrowhead="crow" color="blue" label="o2m"',
-        }[field_type]
-
-    def get_graphical_representation(self, cr, uid, model_ids, context=None):
-        obj_model = self.pool.get('ir.model')
-        if context is None:
-            context = {}
-        res = {}
-        models = []
-        for obj in obj_model.browse(cr, uid, model_ids, context=context):
-            models.append(obj.model)
-        relations = set(self._get_graphical_representation(cr, uid, model_ids, context.get('level', 1)))
-        res[obj.model] = "digraph G {\nnode [style=rounded, shape=record];\n%s\n%s }" % (
-                self._get_structure(relations, models),
-                ''.join('"%s":%s -> "%s":id:n [%s]; // %s\n' % (m, fn, fr, self._get_arrow(ft),ft) for m, fn, ft, fr, fl in relations),
-            )
-        return res
-
-    def _get_module_objects(self, cr, uid, module, context=None):
-        obj_model = self.pool.get('ir.model')
-        obj_mod_data = self.pool.get('ir.model.data')
-        obj_ids = []
-        model_data_ids = obj_mod_data.search(cr, uid, [('module', '=', module), ('model', '=', 'ir.model')], context=context)
-        model_ids = []
-        for mod in obj_mod_data.browse(cr, uid, model_data_ids, context=context):
-            model_ids.append(mod.res_id)
-        models = obj_model.browse(cr, uid, model_ids, context=context)
-        map(lambda x: obj_ids.append(x.id),models)
-        return obj_ids
-
-    def get_relation_graph(self, cr, uid, module_name, context=None):
-        if context is None: context = {}
-        object_ids = self._get_module_objects(cr, uid, module_name, context=context)
-        if not object_ids:
-            return {'module_file': False}
-        context.update({'level': 1})
-        dots = self.get_graphical_representation(cr, uid, object_ids, context=context)
-        # todo: use os.realpath
-        file_path = addons.get_module_resource('base_module_doc_rst')
-        path_png = file_path + "/module.png"
-        for key, val in dots.items():
-           path_dotfile = file_path + "/%s.dot" % (key,)
-           fp = file(path_dotfile, "w")
-           fp.write(val)
-           fp.close()
-        os.popen('dot -Tpng' +' '+ path_dotfile + ' '+ '-o' +' ' + path_png)
-        fp = file(path_png, "r")
-        x = fp.read()
-        fp.close()
-        os.popen('rm ' + path_dotfile + ' ' + path_png)
-        return {'module_file': base64.encodestring(x)}
-
-module()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_module_doc_rst/base_module_doc_rst_view.xml b/addons/base_module_doc_rst/base_module_doc_rst_view.xml
deleted file mode 100644
index b90583ae635..00000000000
--- a/addons/base_module_doc_rst/base_module_doc_rst_view.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <!--
-            Relationship Graph on Module object
-        -->
-
-        <record model="ir.ui.view" id="view_module_module_graph">
-            <field name="name">ir.module.module.form.graph</field>
-            <field name="model">ir.module.module</field>
-            <field name="inherit_id" ref="base.module_form"/>
-            <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Relationship Graph">
-                        <separator colspan="4" string="You can save this image as .png file"/>
-                        <field name="file_graph" widget="image" nolabel="1" />
-                    </page>
-                </notebook>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/base_module_doc_rst/i18n/ar.po b/addons/base_module_doc_rst/i18n/ar.po
deleted file mode 100644
index a940050398d..00000000000
--- a/addons/base_module_doc_rst/i18n/ar.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+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-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
diff --git a/addons/base_module_doc_rst/i18n/ar_AR.po b/addons/base_module_doc_rst/i18n/ar_AR.po
deleted file mode 100644
index a8f499213c8..00000000000
--- a/addons/base_module_doc_rst/i18n/ar_AR.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:39:09+0000\n"
-"PO-Revision-Date: 2009-01-28 00:39:09+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: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot b/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
deleted file mode 100644
index 78f276b1b41..00000000000
--- a/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
+++ /dev/null
@@ -1,89 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+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: base_module_doc_rst
-#: view:ir.module.module:0
-msgid "You can save this image as .png file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:create.relation.graph,init,end:0
-msgid "Ok"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-msgid "(Relationship Graphs generated)"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
-msgid "Module"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_gen_graph
-msgid "Generate Relationship Graph"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-#: view:ir.module.module:0
-#: field:ir.module.module,file_graph:0
-msgid "Relationship Graph"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.report.xml,name:base_module_doc_rst.report_proximity_graph
-msgid "Proximity graph"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/bg.po b/addons/base_module_doc_rst/i18n/bg.po
deleted file mode 100644
index 2bc428938fb..00000000000
--- a/addons/base_module_doc_rst/i18n/bg.po
+++ /dev/null
@@ -1,115 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-03 13:20+0000\n"
-"Last-Translator: Vasil Bojilov Bovilov <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-04 05:53+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
-
-#. module: base_module_doc_rst
-#: view:ir.module.module:0
-msgid "You can save this image as .png file"
-msgstr "Можете да запишете това изображение като .png файл"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Техническо ръководство във формат rst"
-
-#. module: base_module_doc_rst
-#: wizard_button:create.relation.graph,init,end:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-msgid "(Relationship Graphs generated)"
-msgstr "(Генерирана е графика с релациите)"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Изберете фйл в който Техническото ръководство ще бъде написано."
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,description:base_module_doc_rst.module_meta_information
-msgid ""
-"\n"
-"    * This module generates the Technical Guides of selected modules in "
-"Restructured Text format (RST)\n"
-"    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST\n"
-"    * It creates a tarball (.tgz file suffix) containing an index file and "
-"one file per module\n"
-"    * Generates Relationship Graph\n"
-"    "
-msgstr ""
-"\n"
-"    * В този модул се генерират технически ръководства на избрани модули в "
-"преструктуриран текстов формат(RST)\n"
-"* При него се използва сфинкс (http://sphinx.pocoo.org) прилагане на RST\n"
-"* Това създава tarball (. наставка tgz файл), съдържащ индекс файл и файл на "
-"модул\n"
-"* Генерира Връзка Graph\n"
-"    "
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Име на файла"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Създай ръководство във формат rst"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_gen_graph
-msgid "Generate Relationship Graph"
-msgstr "Генериране на графика за релациите"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-#: view:ir.module.module:0
-#: field:ir.module.module,file_graph:0
-msgid "Relationship Graph"
-msgstr "Диаграма на връзките"
-
-#. module: base_module_doc_rst
-#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
-msgid "Module"
-msgstr "Модул"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "файл"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Затвори"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Модул Техническо ръководство като преструктуриран текст "
-
-#. module: base_module_doc_rst
-#: model:ir.actions.report.xml,name:base_module_doc_rst.report_proximity_graph
-msgid "Proximity graph"
-msgstr "Графика на сближаване"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Създай Техническо ръководство във формат rst"
diff --git a/addons/base_module_doc_rst/i18n/bg_BG.po b/addons/base_module_doc_rst/i18n/bg_BG.po
deleted file mode 100644
index 62d7670ea15..00000000000
--- a/addons/base_module_doc_rst/i18n/bg_BG.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:40:23+0000\n"
-"PO-Revision-Date: 2009-01-28 00:40:23+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/bs.po b/addons/base_module_doc_rst/i18n/bs.po
deleted file mode 100644
index a940050398d..00000000000
--- a/addons/base_module_doc_rst/i18n/bs.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+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-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
diff --git a/addons/base_module_doc_rst/i18n/bs_BS.po b/addons/base_module_doc_rst/i18n/bs_BS.po
deleted file mode 100644
index d9f3f3db3e7..00000000000
--- a/addons/base_module_doc_rst/i18n/bs_BS.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:39:46+0000\n"
-"PO-Revision-Date: 2009-01-28 00:39: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: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/ca.po b/addons/base_module_doc_rst/i18n/ca.po
deleted file mode 100644
index 3cf0f8be2f1..00000000000
--- a/addons/base_module_doc_rst/i18n/ca.po
+++ /dev/null
@@ -1,116 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-26 18:22+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: 2011-03-27 06:28+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
-
-#. module: base_module_doc_rst
-#: view:ir.module.module:0
-msgid "You can save this image as .png file"
-msgstr "Podeu desar aquesta imatge com un fitxer. png"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Guia tècnica en format RST"
-
-#. module: base_module_doc_rst
-#: wizard_button:create.relation.graph,init,end:0
-msgid "Ok"
-msgstr "D'acord"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-msgid "(Relationship Graphs generated)"
-msgstr "(Gràfics de relacions generats)"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Seleccioneu un fitxer on la guia tècnica serà escrita."
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,description:base_module_doc_rst.module_meta_information
-msgid ""
-"\n"
-"    * This module generates the Technical Guides of selected modules in "
-"Restructured Text format (RST)\n"
-"    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST\n"
-"    * It creates a tarball (.tgz file suffix) containing an index file and "
-"one file per module\n"
-"    * Generates Relationship Graph\n"
-"    "
-msgstr ""
-"\n"
-"    * Aquest mòdul genera les guies tècniques dels mòduls seleccionats en "
-"RST (Restructured Text format).\n"
-"    * Utilitza la implementació Sphinx d'RST (http://sphinx.pocoo.org).\n"
-"    * Crea un arxiu comprimit (amb extensió .tgz) que conté un fitxer índex "
-"i un fitxer per mòdul.\n"
-"    * Genera un gràfic de relacions.\n"
-"    "
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Nom fitxer"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Crea guia tècnica RST"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_gen_graph
-msgid "Generate Relationship Graph"
-msgstr "Genera gràfic de relacions"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-#: view:ir.module.module:0
-#: field:ir.module.module,file_graph:0
-msgid "Relationship Graph"
-msgstr "Gràfic de relacions"
-
-#. module: base_module_doc_rst
-#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
-msgid "Module"
-msgstr "Mòdul"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "Fitxer"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Tanca"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Guia tècnica d'un mòdul en text reestructurat (RST) "
-
-#. module: base_module_doc_rst
-#: model:ir.actions.report.xml,name:base_module_doc_rst.report_proximity_graph
-msgid "Proximity graph"
-msgstr "Gràfic de proximitat"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Crea guia tècnica en format RST"
diff --git a/addons/base_module_doc_rst/i18n/ca_ES.po b/addons/base_module_doc_rst/i18n/ca_ES.po
deleted file mode 100644
index d19099d184f..00000000000
--- a/addons/base_module_doc_rst/i18n/ca_ES.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:41:01+0000\n"
-"PO-Revision-Date: 2009-01-28 00:41:01+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: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/cs.po b/addons/base_module_doc_rst/i18n/cs.po
deleted file mode 100644
index cffc9c3932d..00000000000
--- a/addons/base_module_doc_rst/i18n/cs.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-03-10 05:46+0000\n"
-"Last-Translator: Konki <pavel.konkol@seznam.cz>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Technická příručka v rst formátu"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "název souboru"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Vytvořit RST technickou příručku"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Prosím zvolte soubor do kterého bude zapsán Technický průvodce."
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "soubor"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Ukončit"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Modul Technického průvodce v přepracovaném znění "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Vytvořit Technického průvodce v rst formátu"
diff --git a/addons/base_module_doc_rst/i18n/cs_CZ.po b/addons/base_module_doc_rst/i18n/cs_CZ.po
deleted file mode 100644
index 3981ae1e4bb..00000000000
--- a/addons/base_module_doc_rst/i18n/cs_CZ.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:43:35+0000\n"
-"PO-Revision-Date: 2009-01-28 00:43:35+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: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/de.po b/addons/base_module_doc_rst/i18n/de.po
deleted file mode 100644
index 61c31134526..00000000000
--- a/addons/base_module_doc_rst/i18n/de.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 11:45+0000\n"
-"Last-Translator: mra (Open ERP) <mra@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Technische Anleitung in rst Format"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Dateiname"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Erzeuge RST technische Anleitung"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Auswahl einer Datei zum Speichern des technischen Anleitung"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "Datei"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Schließen"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Modul technische Anleitung in \"Restrukturiertem Text\" "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Erzeuge technische Anleitung in RST Format"
diff --git a/addons/base_module_doc_rst/i18n/de_DE.po b/addons/base_module_doc_rst/i18n/de_DE.po
deleted file mode 100644
index 27b7bf4eafd..00000000000
--- a/addons/base_module_doc_rst/i18n/de_DE.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:46:14+0000\n"
-"PO-Revision-Date: 2009-01-28 00:46:14+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/el.po b/addons/base_module_doc_rst/i18n/el.po
deleted file mode 100644
index f8af6f16455..00000000000
--- a/addons/base_module_doc_rst/i18n/el.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# Greek 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-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
diff --git a/addons/base_module_doc_rst/i18n/es.po b/addons/base_module_doc_rst/i18n/es.po
deleted file mode 100644
index 3b90ff3c439..00000000000
--- a/addons/base_module_doc_rst/i18n/es.po
+++ /dev/null
@@ -1,116 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-26 18:22+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: 2011-03-27 06:28+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
-
-#. module: base_module_doc_rst
-#: view:ir.module.module:0
-msgid "You can save this image as .png file"
-msgstr "Puede guardar esta imagen como un archivo .png"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Guía técnica en formato RST"
-
-#. module: base_module_doc_rst
-#: wizard_button:create.relation.graph,init,end:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-msgid "(Relationship Graphs generated)"
-msgstr "(Gráficos de relaciones generados)"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Por favor, seleccione un archivo donde la guía técnica será escrita."
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,description:base_module_doc_rst.module_meta_information
-msgid ""
-"\n"
-"    * This module generates the Technical Guides of selected modules in "
-"Restructured Text format (RST)\n"
-"    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST\n"
-"    * It creates a tarball (.tgz file suffix) containing an index file and "
-"one file per module\n"
-"    * Generates Relationship Graph\n"
-"    "
-msgstr ""
-"\n"
-"    * Este módulo genera las guías técnicas de los módulos seleccionados en "
-"RST (Restructured Text format).\n"
-"    * Utiliza la implementación Sphinx de RST (http://sphinx.pocoo.org).\n"
-"    * Crea un archivo comprimido (con extensión .tgz) que contiene un "
-"archivo índice y un archivo por módulo.\n"
-"    * Genera un gráfico de relaciones.\n"
-"    "
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Nombre archivo"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Crear guía técnica RST"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_gen_graph
-msgid "Generate Relationship Graph"
-msgstr "Genera gráfico de relaciones"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-#: view:ir.module.module:0
-#: field:ir.module.module,file_graph:0
-msgid "Relationship Graph"
-msgstr "Gráfico de relaciones"
-
-#. module: base_module_doc_rst
-#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
-msgid "Module"
-msgstr "Módulo"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "Archivo"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Guía técnica de un módulo en texto reestructurado (RST) "
-
-#. module: base_module_doc_rst
-#: model:ir.actions.report.xml,name:base_module_doc_rst.report_proximity_graph
-msgid "Proximity graph"
-msgstr "Gráfico de proximidad"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Crear guía técnica en formato RST"
diff --git a/addons/base_module_doc_rst/i18n/es_AR.po b/addons/base_module_doc_rst/i18n/es_AR.po
deleted file mode 100644
index 462e0807967..00000000000
--- a/addons/base_module_doc_rst/i18n/es_AR.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# Spanish (Argentina) 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-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Guía técnica en formato RST"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Nombre de archivo"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Crear guía técnica RST"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Por favor, seleccione el archivo donde la guía técnica será escrita."
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "Archivo"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Guía técnica de módulo en texto reestructurado (RST) "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Crear guía técnica en formato RST"
diff --git a/addons/base_module_doc_rst/i18n/es_CR.po b/addons/base_module_doc_rst/i18n/es_CR.po
deleted file mode 100644
index 0f8afc153db..00000000000
--- a/addons/base_module_doc_rst/i18n/es_CR.po
+++ /dev/null
@@ -1,112 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 02:49-0600\n"
-"Last-Translator: Carlos Vásquez - CLEARCORP <carlos.vasquez@clearcorp.co.cr>\n"
-"Language-Team: \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-27 06:28+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
-
-#. module: base_module_doc_rst
-#: view:ir.module.module:0
-msgid "You can save this image as .png file"
-msgstr "Puede guardar esta imagen como un archivo .png"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Guía técnica en formato RST"
-
-#. module: base_module_doc_rst
-#: wizard_button:create.relation.graph,init,end:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-msgid "(Relationship Graphs generated)"
-msgstr "(Gráficos de relaciones generados)"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Por favor, seleccione un archivo donde la guía técnica será escrita."
-
-#. module: base_module_doc_rst
-#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
-msgid "Module"
-msgstr "Módulo"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Nombre archivo"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Crear guía técnica RST"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_gen_graph
-msgid "Generate Relationship Graph"
-msgstr "Genera gráfico de relaciones"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-#: view:ir.module.module:0
-#: field:ir.module.module,file_graph:0
-msgid "Relationship Graph"
-msgstr "Gráfico de relaciones"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "Archivo"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.report.xml,name:base_module_doc_rst.report_proximity_graph
-msgid "Proximity graph"
-msgstr "Gráfico de proximidad"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Crear guía técnica en formato RST"
-
-#~ msgid ""
-#~ "\n"
-#~ "    * This module generates the Technical Guides of selected modules in "
-#~ "Restructured Text format (RST)\n"
-#~ "    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST\n"
-#~ "    * It creates a tarball (.tgz file suffix) containing an index file "
-#~ "and one file per module\n"
-#~ "    * Generates Relationship Graph\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    * Este módulo genera las guías técnicas de los módulos seleccionados "
-#~ "en RST (Restructured Text format).\n"
-#~ "    * Utiliza la implementación Sphinx de RST (http://sphinx.pocoo.org).\n"
-#~ "    * Crea un archivo comprimido (con extensión .tgz) que contiene un "
-#~ "archivo índice y un archivo por módulo.\n"
-#~ "    * Genera un gráfico de relaciones.\n"
-#~ "    "
-
-#~ msgid "Module Technical Guide in Restructured Text "
-#~ msgstr "Guía técnica de un módulo en texto reestructurado (RST) "
diff --git a/addons/base_module_doc_rst/i18n/es_ES.po b/addons/base_module_doc_rst/i18n/es_ES.po
deleted file mode 100644
index 98fffcee7f6..00000000000
--- a/addons/base_module_doc_rst/i18n/es_ES.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:53:54+0000\n"
-"PO-Revision-Date: 2009-01-28 00:53:54+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/es_MX.po b/addons/base_module_doc_rst/i18n/es_MX.po
deleted file mode 100644
index 3b90ff3c439..00000000000
--- a/addons/base_module_doc_rst/i18n/es_MX.po
+++ /dev/null
@@ -1,116 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-26 18:22+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: 2011-03-27 06:28+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
-
-#. module: base_module_doc_rst
-#: view:ir.module.module:0
-msgid "You can save this image as .png file"
-msgstr "Puede guardar esta imagen como un archivo .png"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Guía técnica en formato RST"
-
-#. module: base_module_doc_rst
-#: wizard_button:create.relation.graph,init,end:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-msgid "(Relationship Graphs generated)"
-msgstr "(Gráficos de relaciones generados)"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Por favor, seleccione un archivo donde la guía técnica será escrita."
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,description:base_module_doc_rst.module_meta_information
-msgid ""
-"\n"
-"    * This module generates the Technical Guides of selected modules in "
-"Restructured Text format (RST)\n"
-"    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST\n"
-"    * It creates a tarball (.tgz file suffix) containing an index file and "
-"one file per module\n"
-"    * Generates Relationship Graph\n"
-"    "
-msgstr ""
-"\n"
-"    * Este módulo genera las guías técnicas de los módulos seleccionados en "
-"RST (Restructured Text format).\n"
-"    * Utiliza la implementación Sphinx de RST (http://sphinx.pocoo.org).\n"
-"    * Crea un archivo comprimido (con extensión .tgz) que contiene un "
-"archivo índice y un archivo por módulo.\n"
-"    * Genera un gráfico de relaciones.\n"
-"    "
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Nombre archivo"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Crear guía técnica RST"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_gen_graph
-msgid "Generate Relationship Graph"
-msgstr "Genera gráfico de relaciones"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-#: view:ir.module.module:0
-#: field:ir.module.module,file_graph:0
-msgid "Relationship Graph"
-msgstr "Gráfico de relaciones"
-
-#. module: base_module_doc_rst
-#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
-msgid "Module"
-msgstr "Módulo"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "Archivo"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Guía técnica de un módulo en texto reestructurado (RST) "
-
-#. module: base_module_doc_rst
-#: model:ir.actions.report.xml,name:base_module_doc_rst.report_proximity_graph
-msgid "Proximity graph"
-msgstr "Gráfico de proximidad"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Crear guía técnica en formato RST"
diff --git a/addons/base_module_doc_rst/i18n/es_PY.po b/addons/base_module_doc_rst/i18n/es_PY.po
deleted file mode 100644
index fa24e539137..00000000000
--- a/addons/base_module_doc_rst/i18n/es_PY.po
+++ /dev/null
@@ -1,116 +0,0 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-08 17:38+0000\n"
-"Last-Translator: fadel <Unknown>\n"
-"Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-09 06:12+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
-
-#. module: base_module_doc_rst
-#: view:ir.module.module:0
-msgid "You can save this image as .png file"
-msgstr "Puede guardar esta image como un archivo .png"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Guía técnica en formato RST"
-
-#. module: base_module_doc_rst
-#: wizard_button:create.relation.graph,init,end:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-msgid "(Relationship Graphs generated)"
-msgstr "(Generado gráfico de relaciones)"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Por favor, seleccione un archivo donde la guía técnica será escrita."
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,description:base_module_doc_rst.module_meta_information
-msgid ""
-"\n"
-"    * This module generates the Technical Guides of selected modules in "
-"Restructured Text format (RST)\n"
-"    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST\n"
-"    * It creates a tarball (.tgz file suffix) containing an index file and "
-"one file per module\n"
-"    * Generates Relationship Graph\n"
-"    "
-msgstr ""
-"\n"
-"    Este módulo genera las guías técnicas de los módulos seleccionados en "
-"RST\n"
-"Utiliza la implementación Sphinx de RST (http://sphinx.pocoo.org) \n"
-"Crea un archivo comprimido (con extensión .tgz) que contiene un archivo "
-"índice y un archivo por módulo\n"
-"Genera un gráfico de relaciones\n"
-"    "
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Nombre de Archivo"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Crear guía técnica RST"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_gen_graph
-msgid "Generate Relationship Graph"
-msgstr "Genera gráfico de relaciones"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-#: view:ir.module.module:0
-#: field:ir.module.module,file_graph:0
-msgid "Relationship Graph"
-msgstr "Gráfico de Relaciones"
-
-#. module: base_module_doc_rst
-#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
-msgid "Module"
-msgstr "Módulo"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "Archivo"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Guía técnica de un módulo en texto reestructurado (RST) "
-
-#. module: base_module_doc_rst
-#: model:ir.actions.report.xml,name:base_module_doc_rst.report_proximity_graph
-msgid "Proximity graph"
-msgstr "Gráfico de proximidad"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Crear guía técnica en formato RST"
diff --git a/addons/base_module_doc_rst/i18n/es_VE.po b/addons/base_module_doc_rst/i18n/es_VE.po
deleted file mode 100644
index 3b90ff3c439..00000000000
--- a/addons/base_module_doc_rst/i18n/es_VE.po
+++ /dev/null
@@ -1,116 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-26 18:22+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: 2011-03-27 06:28+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
-
-#. module: base_module_doc_rst
-#: view:ir.module.module:0
-msgid "You can save this image as .png file"
-msgstr "Puede guardar esta imagen como un archivo .png"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Guía técnica en formato RST"
-
-#. module: base_module_doc_rst
-#: wizard_button:create.relation.graph,init,end:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-msgid "(Relationship Graphs generated)"
-msgstr "(Gráficos de relaciones generados)"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Por favor, seleccione un archivo donde la guía técnica será escrita."
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,description:base_module_doc_rst.module_meta_information
-msgid ""
-"\n"
-"    * This module generates the Technical Guides of selected modules in "
-"Restructured Text format (RST)\n"
-"    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST\n"
-"    * It creates a tarball (.tgz file suffix) containing an index file and "
-"one file per module\n"
-"    * Generates Relationship Graph\n"
-"    "
-msgstr ""
-"\n"
-"    * Este módulo genera las guías técnicas de los módulos seleccionados en "
-"RST (Restructured Text format).\n"
-"    * Utiliza la implementación Sphinx de RST (http://sphinx.pocoo.org).\n"
-"    * Crea un archivo comprimido (con extensión .tgz) que contiene un "
-"archivo índice y un archivo por módulo.\n"
-"    * Genera un gráfico de relaciones.\n"
-"    "
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Nombre archivo"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Crear guía técnica RST"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_gen_graph
-msgid "Generate Relationship Graph"
-msgstr "Genera gráfico de relaciones"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-#: view:ir.module.module:0
-#: field:ir.module.module,file_graph:0
-msgid "Relationship Graph"
-msgstr "Gráfico de relaciones"
-
-#. module: base_module_doc_rst
-#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
-msgid "Module"
-msgstr "Módulo"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "Archivo"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Guía técnica de un módulo en texto reestructurado (RST) "
-
-#. module: base_module_doc_rst
-#: model:ir.actions.report.xml,name:base_module_doc_rst.report_proximity_graph
-msgid "Proximity graph"
-msgstr "Gráfico de proximidad"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Crear guía técnica en formato RST"
diff --git a/addons/base_module_doc_rst/i18n/et.po b/addons/base_module_doc_rst/i18n/et.po
deleted file mode 100644
index 99584c844c5..00000000000
--- a/addons/base_module_doc_rst/i18n/et.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 11:45+0000\n"
-"Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Tehniline juhis rst formaadis"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "failinimi"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Loo RST tehniline juhis"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Palun vali fail, kuhu tehniline juhis kirjutatakse"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "fail"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Sulge"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Mooduli tehniline juhis ümber korraldatud tekstis "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Loo tehniline juhis rst formaadis"
diff --git a/addons/base_module_doc_rst/i18n/et_EE.po b/addons/base_module_doc_rst/i18n/et_EE.po
deleted file mode 100644
index 682bb6b86b5..00000000000
--- a/addons/base_module_doc_rst/i18n/et_EE.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:44:54+0000\n"
-"PO-Revision-Date: 2009-01-28 00:44:54+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/fi.po b/addons/base_module_doc_rst/i18n/fi.po
deleted file mode 100644
index 22f4ce62c0d..00000000000
--- a/addons/base_module_doc_rst/i18n/fi.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# Finnish 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-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 11:01+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Tekninen opas RST-muodossa"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Tiedoston nimi"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Luo RST tekninen opas"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Valitse mihin tekninen opas luodaan."
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "tiedosto"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Sulje"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Moduulin tekninen opas uudelleen jäsenneltynä tekstinä "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Luo tekninen opas RST-muodossa"
diff --git a/addons/base_module_doc_rst/i18n/fr.po b/addons/base_module_doc_rst/i18n/fr.po
deleted file mode 100644
index 1943d8d679d..00000000000
--- a/addons/base_module_doc_rst/i18n/fr.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 11:45+0000\n"
-"Last-Translator: nel <nel@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-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Guide Technique au format rst"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Nom du Fichier"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Crée le Guide Technical au format rst"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Choisissez un fichier où le Guide Technique sera créé."
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "Fichier"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Fermer"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Module du guide technique en texte restructuré "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Crée le Guide Technique au format rst"
diff --git a/addons/base_module_doc_rst/i18n/fr_FR.po b/addons/base_module_doc_rst/i18n/fr_FR.po
deleted file mode 100644
index 909deadea39..00000000000
--- a/addons/base_module_doc_rst/i18n/fr_FR.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:45:34+0000\n"
-"PO-Revision-Date: 2009-01-28 00:45:34+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: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Guide Technique au format rst"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Nom du Fichier"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Crée le Guide Technical au format rst"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Choisissez un fichier où le Guide Technique sera créé."
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "Fichier"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Fermer"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Crée le Guide Technique au format rst"
-
diff --git a/addons/base_module_doc_rst/i18n/gl.po b/addons/base_module_doc_rst/i18n/gl.po
deleted file mode 100644
index 83cc1c2dc36..00000000000
--- a/addons/base_module_doc_rst/i18n/gl.po
+++ /dev/null
@@ -1,59 +0,0 @@
-# translation of base-module-doc-rst-gl.po to Galego
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: base-module-doc-rst-gl\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: Galego <g11n@mancomun.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Guía técnica en formato RST"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Nome ficheiro"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Crear guía técnica RST"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Por favor, elixa un ficheiro onde gardar a guía técnica."
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "ficheiro"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Pechar"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Guía técnica dun módulo en texto reestruturado (RST) "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Crear guía técnica en formato RST"
diff --git a/addons/base_module_doc_rst/i18n/hr.po b/addons/base_module_doc_rst/i18n/hr.po
deleted file mode 100644
index bfcb8987c84..00000000000
--- a/addons/base_module_doc_rst/i18n/hr.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 11:45+0000\n"
-"Last-Translator: Ivica Perić <ivica.peric@ipsoft-tg.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Tehničko uputstvo u rst formatu"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "ime datoteke"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Stvori RST tehničko uputstvo"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Molimo odaberite datoteku u koju će se zapisati Tehničko uputstvo."
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "datoteka"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Zatvori"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Tehničko uputstvo modula u restruktuiranom tekstu "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Stvori tehničko uputstvo u rst formatu"
diff --git a/addons/base_module_doc_rst/i18n/hr_HR.po b/addons/base_module_doc_rst/i18n/hr_HR.po
deleted file mode 100644
index 5151a6504c7..00000000000
--- a/addons/base_module_doc_rst/i18n/hr_HR.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:42:56+0000\n"
-"PO-Revision-Date: 2009-01-28 00:42:56+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: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/hu.po b/addons/base_module_doc_rst/i18n/hu.po
deleted file mode 100644
index a940050398d..00000000000
--- a/addons/base_module_doc_rst/i18n/hu.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+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-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
diff --git a/addons/base_module_doc_rst/i18n/hu_HU.po b/addons/base_module_doc_rst/i18n/hu_HU.po
deleted file mode 100644
index 18cecdbec9a..00000000000
--- a/addons/base_module_doc_rst/i18n/hu_HU.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:46:53+0000\n"
-"PO-Revision-Date: 2009-01-28 00:46: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: \n"
-"Plural-Forms: \n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/it.po b/addons/base_module_doc_rst/i18n/it.po
deleted file mode 100644
index 51613179592..00000000000
--- a/addons/base_module_doc_rst/i18n/it.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 11:45+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Guida tecnica nel formato 'rst'"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "nome file"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Creazione della Guida Tecnica in 'rst'"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Selezionare un file dove la Guida Tecnica potrebbe essere scritta."
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "file"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Chiudi"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Modulo Guida tecnica in Restructured Text "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Creazione della Guida Tecnica nel formato 'rst'"
diff --git a/addons/base_module_doc_rst/i18n/it_IT.po b/addons/base_module_doc_rst/i18n/it_IT.po
deleted file mode 100644
index 5aa17b8ae4f..00000000000
--- a/addons/base_module_doc_rst/i18n/it_IT.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:47:34+0000\n"
-"PO-Revision-Date: 2009-01-28 00:47:34+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: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/ko.po b/addons/base_module_doc_rst/i18n/ko.po
deleted file mode 100644
index 47f040bb0c2..00000000000
--- a/addons/base_module_doc_rst/i18n/ko.po
+++ /dev/null
@@ -1,58 +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-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+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-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "RST 포맷에 관한 기술 가이드"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "파일명"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "RST 기술 가이드 만들기"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "기술 가이드가 작성될 파일을 선택하십시오."
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "파일"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "닫기"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "재구성된 텍스트 방식의 기술 가이드 모듈 "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "RST 포맷으로 기술 가이드 만들기"
diff --git a/addons/base_module_doc_rst/i18n/lt.po b/addons/base_module_doc_rst/i18n/lt.po
deleted file mode 100644
index 49bffe36d9b..00000000000
--- a/addons/base_module_doc_rst/i18n/lt.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 11:59+0000\n"
-"Last-Translator: Donatas Stonys TeraxIT <donatelonow@hotmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Techninis vadovas rst formate"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "failo pavadinimas"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Sukurti RST techninį vadovą"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Prašome pasirinkti kur turi būti įrašytas techninis vadovas."
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "failas"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Uždaryti"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Sukurti techninį vadovą rst formatu"
diff --git a/addons/base_module_doc_rst/i18n/lt_LT.po b/addons/base_module_doc_rst/i18n/lt_LT.po
deleted file mode 100644
index 85b2e7ccde1..00000000000
--- a/addons/base_module_doc_rst/i18n/lt_LT.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:48:14+0000\n"
-"PO-Revision-Date: 2009-01-28 00:48:14+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/nl.po b/addons/base_module_doc_rst/i18n/nl.po
deleted file mode 100644
index 2f24559a820..00000000000
--- a/addons/base_module_doc_rst/i18n/nl.po
+++ /dev/null
@@ -1,115 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-10 20:02+0000\n"
-"Last-Translator: Wouter Schrijvers <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-11 06:00+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
-
-#. module: base_module_doc_rst
-#: view:ir.module.module:0
-msgid "You can save this image as .png file"
-msgstr "Deze weergave kan als .png bestand opgeslagen worden"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Techische handleiding in rst formaat"
-
-#. module: base_module_doc_rst
-#: wizard_button:create.relation.graph,init,end:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-msgid "(Relationship Graphs generated)"
-msgstr "(Relatiegrafiek wordt gegenereerd)"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Kies een bestand waar de Technische handleiding wordt opgeslagen"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,description:base_module_doc_rst.module_meta_information
-msgid ""
-"\n"
-"    * This module generates the Technical Guides of selected modules in "
-"Restructured Text format (RST)\n"
-"    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST\n"
-"    * It creates a tarball (.tgz file suffix) containing an index file and "
-"one file per module\n"
-"    * Generates Relationship Graph\n"
-"    "
-msgstr ""
-"\n"
-"    * Deze module genereert de Technische Gids voor de geselecteerde modules "
-"in Restructured Text format (RST)\n"
-"    * De Sphinx (http://sphinx.pocoo.org) RST-implementatie wordt gebruikt\n"
-"    * De gecreëerde tarball (.tgz bestandsextensie) bevat een index-bestand "
-"en één bestand per module\n"
-"    * Genereert Relatiegrafiek\n"
-"    "
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "bestandsnaam"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "RST Technische handleiding aanmaken"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_gen_graph
-msgid "Generate Relationship Graph"
-msgstr "Genereer Relatiegrafiek"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-#: view:ir.module.module:0
-#: field:ir.module.module,file_graph:0
-msgid "Relationship Graph"
-msgstr "Relatiegrafiek"
-
-#. module: base_module_doc_rst
-#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
-msgid "Module"
-msgstr "Module"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "bestand"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Sluiten"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Module Technische Handleiding in Restructured Text (rst) "
-
-#. module: base_module_doc_rst
-#: model:ir.actions.report.xml,name:base_module_doc_rst.report_proximity_graph
-msgid "Proximity graph"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Technische handleiding in rst formaat aanmaken"
diff --git a/addons/base_module_doc_rst/i18n/nl_BE.po b/addons/base_module_doc_rst/i18n/nl_BE.po
deleted file mode 100644
index bc31550933a..00000000000
--- a/addons/base_module_doc_rst/i18n/nl_BE.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
diff --git a/addons/base_module_doc_rst/i18n/nl_NL.po b/addons/base_module_doc_rst/i18n/nl_NL.po
deleted file mode 100644
index 412134c83d5..00000000000
--- a/addons/base_module_doc_rst/i18n/nl_NL.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:44:15+0000\n"
-"PO-Revision-Date: 2009-01-28 00:44: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: \n"
-"Plural-Forms: \n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/pl.po b/addons/base_module_doc_rst/i18n/pl.po
deleted file mode 100644
index a940050398d..00000000000
--- a/addons/base_module_doc_rst/i18n/pl.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+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-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
diff --git a/addons/base_module_doc_rst/i18n/pl_PL.po b/addons/base_module_doc_rst/i18n/pl_PL.po
deleted file mode 100644
index be5abf4cb52..00000000000
--- a/addons/base_module_doc_rst/i18n/pl_PL.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:48:56+0000\n"
-"PO-Revision-Date: 2009-01-28 00:48:56+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: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/pt.po b/addons/base_module_doc_rst/i18n/pt.po
deleted file mode 100644
index 221ff43224f..00000000000
--- a/addons/base_module_doc_rst/i18n/pt.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 11:54+0000\n"
-"Last-Translator: mra (Open ERP) <mra@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Manual técnico no formato rst"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Nome do ficheiro"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Criar um manual técnico"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Por favor escolha um ficheiro onde guardar o Manual técnico"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "ficheiro"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Fechar"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Modulo Manual técnico em texto reestruturado "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Criar um manual técnico no formato rst"
diff --git a/addons/base_module_doc_rst/i18n/pt_BR.po b/addons/base_module_doc_rst/i18n/pt_BR.po
deleted file mode 100644
index 683c312e5ce..00000000000
--- a/addons/base_module_doc_rst/i18n/pt_BR.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+0000\n"
-"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Guia Técnico no formato rst"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "nome do arquivo"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Criar o Guia Técnico RST"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Por favor escolha um arquivo onde será escrito o Guia Técnico"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "Arquivo"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "fechar"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Módulo Guia Técnico em Texto Reestruturado "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Criar Guia Técnico no formato rst"
diff --git a/addons/base_module_doc_rst/i18n/pt_PT.po b/addons/base_module_doc_rst/i18n/pt_PT.po
deleted file mode 100644
index 1a1c804428f..00000000000
--- a/addons/base_module_doc_rst/i18n/pt_PT.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:50:20+0000\n"
-"PO-Revision-Date: 2009-01-28 00:50:20+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: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/ro.po b/addons/base_module_doc_rst/i18n/ro.po
deleted file mode 100644
index c7c4d5c3459..00000000000
--- a/addons/base_module_doc_rst/i18n/ro.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 11:55+0000\n"
-"Last-Translator: filsys <office@filsystem.ro>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Ghid Tehnic in format rst"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "Nume Fisier"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Creare Ghid Tehnic RST"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Alegeti un fisier in care va fi creat Ghidul Tehnic"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "fisier"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Inchid"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Modul Ghid Tehnic in text restructurat "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Creare Ghid Tehnic in format rst"
diff --git a/addons/base_module_doc_rst/i18n/ro_RO.po b/addons/base_module_doc_rst/i18n/ro_RO.po
deleted file mode 100644
index 885b36e4d1f..00000000000
--- a/addons/base_module_doc_rst/i18n/ro_RO.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:51:02+0000\n"
-"PO-Revision-Date: 2009-01-28 00:51:02+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: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/ru.po b/addons/base_module_doc_rst/i18n/ru.po
deleted file mode 100644
index 1a180b83e79..00000000000
--- a/addons/base_module_doc_rst/i18n/ru.po
+++ /dev/null
@@ -1,116 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-25 14:11+0000\n"
-"Last-Translator: Stanislav Hanzhin <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-30 06:07+0000\n"
-"X-Generator: Launchpad (build 12758)\n"
-
-#. module: base_module_doc_rst
-#: view:ir.module.module:0
-msgid "You can save this image as .png file"
-msgstr "Вы можете сохранить это изображение как PNG-файл"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Техническое руководство в формате RST"
-
-#. module: base_module_doc_rst
-#: wizard_button:create.relation.graph,init,end:0
-msgid "Ok"
-msgstr "OK"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-msgid "(Relationship Graphs generated)"
-msgstr "(Графы отношений сгенерированны)"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-"Пожалуйста, выберите файл, куда будет записано Техническое руководство"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,description:base_module_doc_rst.module_meta_information
-msgid ""
-"\n"
-"    * This module generates the Technical Guides of selected modules in "
-"Restructured Text format (RST)\n"
-"    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST\n"
-"    * It creates a tarball (.tgz file suffix) containing an index file and "
-"one file per module\n"
-"    * Generates Relationship Graph\n"
-"    "
-msgstr ""
-"\n"
-"    * Этот модуль генерирует Техническое Руководство для выбранных модулей в "
-"формате Restructured Text format (RST)\n"
-"    * Он использует реализацию RST из Sphinx (http://sphinx.pocoo.org)\n"
-"    * Это создает архив (с расширением .tgz), содержащий файл индекса и один "
-"файл на каждый модуль\n"
-"    * Создает граф отношений\n"
-"    "
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "имя файла"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Создать Техническое Руководство в формате RST"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_gen_graph
-msgid "Generate Relationship Graph"
-msgstr "Сгенерировать граф отношений"
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-#: view:ir.module.module:0
-#: field:ir.module.module,file_graph:0
-msgid "Relationship Graph"
-msgstr "Граф отношений"
-
-#. module: base_module_doc_rst
-#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
-msgid "Module"
-msgstr "Модуль"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "файл"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Закрыть"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Техническая документация модуля хранится в формате RST "
-
-#. module: base_module_doc_rst
-#: model:ir.actions.report.xml,name:base_module_doc_rst.report_proximity_graph
-msgid "Proximity graph"
-msgstr "Граф доступности"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Создать Техническое Руководство в формате rst"
diff --git a/addons/base_module_doc_rst/i18n/ru_RU.po b/addons/base_module_doc_rst/i18n/ru_RU.po
deleted file mode 100644
index 5615b1f92c7..00000000000
--- a/addons/base_module_doc_rst/i18n/ru_RU.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:51:45+0000\n"
-"PO-Revision-Date: 2009-01-28 00:51:45+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/sk.po b/addons/base_module_doc_rst/i18n/sk.po
deleted file mode 100644
index 6e7b5c2194a..00000000000
--- a/addons/base_module_doc_rst/i18n/sk.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# Slovak 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-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 11:01+0000\n"
-"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
-"Language-Team: Slovak <sk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Technická príručka vo formáte rst"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "názov súboru"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Vytvoriť RST technickú príručku"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "súbor"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Zavrieť"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Vytvoriť technickú príručku vo formáte rst"
diff --git a/addons/base_module_doc_rst/i18n/sl.po b/addons/base_module_doc_rst/i18n/sl.po
deleted file mode 100644
index 1aa9921b7c1..00000000000
--- a/addons/base_module_doc_rst/i18n/sl.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 12:00+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Tehnična navodila v rst formatu"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "ime datoteke"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Izdelaj RST tehnična navodila"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-"Prosimo, izberite datoteko, v katero se bodo zapisala tehnična navodila"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "datoteka"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Zapri"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-"Modul tehnična navodila in prestrukturiranem besedilu (Restructured Text - "
-"rst) "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Izdelaj tehnična navodila v formatu rst"
diff --git a/addons/base_module_doc_rst/i18n/sl_SL.po b/addons/base_module_doc_rst/i18n/sl_SL.po
deleted file mode 100644
index c096b0e3f26..00000000000
--- a/addons/base_module_doc_rst/i18n/sl_SL.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:52:28+0000\n"
-"PO-Revision-Date: 2009-01-28 00:52:28+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: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/sq.po b/addons/base_module_doc_rst/i18n/sq.po
deleted file mode 100644
index 5e6ac3f66d6..00000000000
--- a/addons/base_module_doc_rst/i18n/sq.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# Albanian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-03-28 15:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Albanian <sq@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-29 06:21+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
-
-#. module: base_module_doc_rst
-#: view:ir.module.module:0
-msgid "You can save this image as .png file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:create.relation.graph,init,end:0
-msgid "Ok"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-msgid "(Relationship Graphs generated)"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,description:base_module_doc_rst.module_meta_information
-msgid ""
-"\n"
-"    * This module generates the Technical Guides of selected modules in "
-"Restructured Text format (RST)\n"
-"    * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST\n"
-"    * It creates a tarball (.tgz file suffix) containing an index file and "
-"one file per module\n"
-"    * Generates Relationship Graph\n"
-"    "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_gen_graph
-msgid "Generate Relationship Graph"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:create.relation.graph,init:0
-#: view:ir.module.module:0
-#: field:ir.module.module,file_graph:0
-msgid "Relationship Graph"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.model,name:base_module_doc_rst.model_ir_module_module
-msgid "Module"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.report.xml,name:base_module_doc_rst.report_proximity_graph
-msgid "Proximity graph"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
diff --git a/addons/base_module_doc_rst/i18n/sr.po b/addons/base_module_doc_rst/i18n/sr.po
deleted file mode 100644
index 0ff33d72e73..00000000000
--- a/addons/base_module_doc_rst/i18n/sr.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# Serbian 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-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Serbian <sr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
diff --git a/addons/base_module_doc_rst/i18n/sr@latin.po b/addons/base_module_doc_rst/i18n/sr@latin.po
deleted file mode 100644
index 0ff33d72e73..00000000000
--- a/addons/base_module_doc_rst/i18n/sr@latin.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# Serbian 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-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Serbian <sr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
diff --git a/addons/base_module_doc_rst/i18n/sv.po b/addons/base_module_doc_rst/i18n/sv.po
deleted file mode 100644
index 898ba7f7be1..00000000000
--- a/addons/base_module_doc_rst/i18n/sv.po
+++ /dev/null
@@ -1,22 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.14\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-22 10:19:32+0000\n"
-"PO-Revision-Date: 2010-11-22 10:19:32+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: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Module Technical Guide in Restructured Text "
-
diff --git a/addons/base_module_doc_rst/i18n/sv_SE.po b/addons/base_module_doc_rst/i18n/sv_SE.po
deleted file mode 100644
index 5c2997e31b8..00000000000
--- a/addons/base_module_doc_rst/i18n/sv_SE.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:54:37+0000\n"
-"PO-Revision-Date: 2009-01-28 00:54:37+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/tlh.po b/addons/base_module_doc_rst/i18n/tlh.po
deleted file mode 100644
index a940050398d..00000000000
--- a/addons/base_module_doc_rst/i18n/tlh.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+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-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
diff --git a/addons/base_module_doc_rst/i18n/tlh_TLH.po b/addons/base_module_doc_rst/i18n/tlh_TLH.po
deleted file mode 100644
index 2fa0653a415..00000000000
--- a/addons/base_module_doc_rst/i18n/tlh_TLH.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:57:32+0000\n"
-"PO-Revision-Date: 2009-01-28 00:57:32+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: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/tr.po b/addons/base_module_doc_rst/i18n/tr.po
deleted file mode 100644
index a940050398d..00000000000
--- a/addons/base_module_doc_rst/i18n/tr.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+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-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
diff --git a/addons/base_module_doc_rst/i18n/tr_TR.po b/addons/base_module_doc_rst/i18n/tr_TR.po
deleted file mode 100644
index da2b62b91e0..00000000000
--- a/addons/base_module_doc_rst/i18n/tr_TR.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:55:20+0000\n"
-"PO-Revision-Date: 2009-01-28 00:55:20+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: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/uk.po b/addons/base_module_doc_rst/i18n/uk.po
deleted file mode 100644
index ae7a0b8c870..00000000000
--- a/addons/base_module_doc_rst/i18n/uk.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 11:57+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-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "Технічна Інструкція в форматі rst"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "назва файлу"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "Створити Технічну Інструкцію RST"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "Будьласка виберіть файл в який буде записано Технічну Інструкцію."
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "файл"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "Закрити"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "Технічна Інструкція Модуля в Структурованому Тексті "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "Створити Технічну Інструкцію в форматі rst"
diff --git a/addons/base_module_doc_rst/i18n/uk_UK.po b/addons/base_module_doc_rst/i18n/uk_UK.po
deleted file mode 100644
index 9c45eea0f6a..00000000000
--- a/addons/base_module_doc_rst/i18n/uk_UK.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:56:04+0000\n"
-"PO-Revision-Date: 2009-01-28 00:56:04+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: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
-
diff --git a/addons/base_module_doc_rst/i18n/ur.po b/addons/base_module_doc_rst/i18n/ur.po
deleted file mode 100644
index 5c2389bcdc0..00000000000
--- a/addons/base_module_doc_rst/i18n/ur.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# Urdu 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-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: Urdu <ur@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "تشکيل ميں تکنيکي مقاله rst"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "فا ٔيل کا نام"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "تشکيل ميں تکنيکي مقاله مرقوب کريں RST"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-"تکنيکي مقاله محفوظ کرنے کے لٔے فا ٔيل کا\r\n"
-"نام"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "فا ٔيل"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "بند کریں"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "دومربوط خط ميں موڈئول تکنيکي مقاله "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "تشکيل ميں تکنيکي مقاله تخليق کريں RST"
diff --git a/addons/base_module_doc_rst/i18n/zh_CN.po b/addons/base_module_doc_rst/i18n/zh_CN.po
deleted file mode 100644
index cfccfd0a673..00000000000
--- a/addons/base_module_doc_rst/i18n/zh_CN.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+0000\n"
-"Last-Translator: Kent L. H. SIU <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr "rst格式的技术文档"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr "文件名"
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr "创建RST格式的技术文档"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr "请选择技术文档保存的文件名。"
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr "文件"
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr "关闭"
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr "reStructured Text格式的模块技术文档 "
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr "创建以rst为格式的技术文档"
diff --git a/addons/base_module_doc_rst/i18n/zh_TW.po b/addons/base_module_doc_rst/i18n/zh_TW.po
deleted file mode 100644
index a940050398d..00000000000
--- a/addons/base_module_doc_rst/i18n/zh_TW.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_doc_rst
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-28 00:58+0000\n"
-"PO-Revision-Date: 2010-01-26 10:55+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-04-24 04:03+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Technical Guide in rst Format"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,name:0
-msgid "filename"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.actions.wizard,name:base_module_doc_rst.wiz_tech_guide_rst
-msgid "Create RST Technical Guide"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Please choose a file where the Technical Guide will be written."
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_field:tech.guide.rst,init,rst_file:0
-msgid "file"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_button:tech.guide.rst,init,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_doc_rst
-#: model:ir.module.module,shortdesc:base_module_doc_rst.module_meta_information
-msgid "Module Technical Guide in Restructured Text "
-msgstr ""
-
-#. module: base_module_doc_rst
-#: wizard_view:tech.guide.rst,init:0
-msgid "Create Technical Guide in rst Format"
-msgstr ""
diff --git a/addons/base_module_doc_rst/module_report.xml b/addons/base_module_doc_rst/module_report.xml
deleted file mode 100644
index e3d4e342472..00000000000
--- a/addons/base_module_doc_rst/module_report.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <report auto="False" id="base.ir_module_reference_print" model="ir.module.module" name="ir.module.reference.graph" rml="base_module_doc_rst/report/ir_module_reference_graph.rml" string="Technical guide"/>
-        <report id="report_proximity_graph" model="ir.module.module" name="proximity.graph" string="Proximity graph"/>
-
-    </data>
-</openerp>
diff --git a/addons/base_module_doc_rst/report/ir_module_reference_graph.rml b/addons/base_module_doc_rst/report/ir_module_reference_graph.rml
deleted file mode 100644
index 40f631fc9c8..00000000000
--- a/addons/base_module_doc_rst/report/ir_module_reference_graph.rml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template title="Introspection report on objects" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="42.0" y1="42.0" width="511" height="758"/>
-		<header>
-			<pageGraphics>
-				<setFont name="Helvetica-Bold" size="9"/>
-				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawRightString x="20cm" y="28.1cm"> Reference Guide </drawRightString>
-				<lineMode width="0.7"/>
-				<stroke color="black"/>
-				<lines>1cm 28cm 20cm 28cm</lines>
-			</pageGraphics>
-		</header>
-
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="module_tbl_heading">
-      <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="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="module_tbl_content">
-      <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="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="depen_tbl">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Tableau3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <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"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Oblique" fontSize="2.0" leading="3" 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="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <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="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.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_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.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_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.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_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" 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="11.0" leading="14" 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_9" fontName="Helvetica" fontSize="9.0" leading="11" 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_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_8_underline" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-  </stylesheet>
-  <images/>
-  <story>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="139.0,220.0,152.0" repeatRows="1" style="Table1">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_header_Centre">Introspection report on objects</para>
-        </td>
-        <td>
-          <para style="terp_header_Centre">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="Text body">[[ repeatIn(objects,'module') ]]</para>
-      <blockTable colWidths="102.0,102.0,102.0,102.0,102.0" style="module_tbl_heading">
-        <tr>
-          <td>
-            <para style="terp_tblheader_General_Centre">Module</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Centre">Name</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Centre">Version</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Centre">Directory</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Centre">Web</para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="102.0,102.0,102.0,102.0,102.0" style="module_tbl_content">
-        <tr>
-          <td>
-            <para style="terp_default_Centre_8">[[ module.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_8">[[ module.shortdesc]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_8">[[module.latest_version]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_8">[[ module.name ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Centre_8">[[ module.website ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="terp_default_8">
-        <font color="white"> </font>
-      </para>
-      <para style="terp_default_8">[[ module.description ]]</para>
-      <para style="terp_default_Bold_8">
-        <font color="white"> </font>
-      </para>
-      <para style="terp_default_8_underline">Reports :</para>
-      <para style="terp_default_8">[[ format(module.reports_by_module) ]]</para>
-      <para style="terp_default_8">
-        <font color="white"> </font>
-      </para>
-      <para style="terp_default_8_underline">Menu :</para>
-      <para style="terp_default_8">[[ format(module.menus_by_module) ]]</para>
-      <para style="terp_default_8">
-        <font color="white"> </font>
-      </para>
-      <para style="terp_default_8_underline">View :</para>
-      <para style="terp_default_8">[[ format(module.views_by_module) ]]</para>
-      <para style="terp_default_8">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="510.0" style="depen_tbl">
-        <tr>
-          <td>
-            <para style="terp_default_8_underline">Dependencies :</para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="terp_default_8">[[ repeatIn(module.dependencies_id,'dependencies_id') ]]</para>
-            <para style="terp_default_8">[[ dependencies_id.name ]] - [[ dependencies_id.state ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <section>
-        <para style="terp_default_9">
-          <font color="white"> </font>
-        </para>
-        <para style="terp_default_9">[[ repeatIn(findobj(module.name) ,'object') ]]</para>
-        <para style="terp_default_1">
-          <font color="white"> </font>
-        </para>
-        <blockTable colWidths="510.0" repeatRows="1" style="Tableau3">
-          <tr>
-            <td>
-              <para style="terp_tblheader_Details">Object: [[ object.model ]] [[ objdoc(object.model) ]]</para>
-            </td>
-          </tr>
-          <tr>
-            <td>
-              <para style="terp_default_9">[[ repeatIn(objdoc2(object.model) or [], 'sline') ]]</para>
-	      <para style="terp_default_9"> [[ sline ]] </para>
-            </td>
-          </tr>
-        </blockTable>
-        <section>
-          <para style="terp_default_1">
-            <font color="white"> </font>
-          </para>
-        </section>
-        <section>
-          <para style="P1">[[ repeatIn(findflds(object.model), 'field') ]]</para>
-          <blockTable colWidths="113.0,397.0" repeatRows="1" style="Table2">
-            <tr>
-              <td>
-                <para style="terp_default_9">[[ field[0] ]]</para>
-              </td>
-              <td>
-                <para style="terp_default_9">[[ field[1].get('string', 'Unknown') ]], [[ field[1]['type'] ]] [[field[1].get('required',False) and ', required']] [[field[1].get('readonly',False) and ', readonly']] </para>
-                <para style="terp_default_9">[[ field[1].get('help', '') ]]</para>
-              </td>
-            </tr>
-          </blockTable>
-          <para style="terp_default_1">
-            <font color="white"> </font>
-          </para>
-        </section>
-      </section>
-       <pageBreak/>
-          <para style="terp_default_9"> [[ module.file_graph and setTag('para','image', {'width':'300.0','height':'250.0'}) ]][[ module.file_graph ]] </para>
-    </section>
-  </story>
-</document>
diff --git a/addons/base_module_doc_rst/report/ir_module_reference_print_graph.py b/addons/base_module_doc_rst/report/ir_module_reference_print_graph.py
deleted file mode 100644
index 62848383000..00000000000
--- a/addons/base_module_doc_rst/report/ir_module_reference_print_graph.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- coding: 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 time
-from report import report_sxw
-
-class ir_module_reference_print_graph(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(ir_module_reference_print_graph, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update({
-            'time': time,
-            'findobj': self._object_find,
-            'objdoc': self._object_doc,
-            'objdoc2': self._object_doc2,
-            'findflds': self._fields_find,
-        })
-    def _object_doc(self, obj):
-        modobj = self.pool.get(obj)
-        strdocs= modobj.__doc__
-        if not strdocs:
-            return None
-        else:
-            strdocs=strdocs.strip().splitlines(True)
-        res = ''
-        for stre in strdocs:
-            if not stre or stre.isspace():
-                break
-            res += stre
-        return res
-
-    def _object_doc2(self, obj):
-        modobj = self.pool.get(obj)
-        strdocs= modobj.__doc__
-        if not strdocs:
-            return None
-        else:
-            strdocs=strdocs.strip().splitlines(True)
-        res = []
-        fou = False
-        for stre in strdocs:
-            if fou:
-                res.append(stre.strip())
-            elif not stre or stre.isspace():
-                fou = True
-        return res
-
-    def _object_find(self, module):
-        ids2 = self.pool.get('ir.model.data').search(self.cr, self.uid, [('module','=',module), ('model','=','ir.model')])
-        ids = []
-        for mod in self.pool.get('ir.model.data').browse(self.cr, self.uid, ids2):
-            ids.append(mod.res_id)
-        modobj = self.pool.get('ir.model')
-        return modobj.browse(self.cr, self.uid, ids)
-
-    def _fields_find(self, obj):
-        modobj = self.pool.get(obj)
-        res = modobj.fields_get(self.cr, self.uid).items()
-        return res
-
-report_sxw.report_sxw('report.ir.module.reference.graph', 'ir.module.module',
-        'addons/base_module_doc_rst/report/ir_module_reference_graph.rml',
-        parser=ir_module_reference_print_graph, header=False)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_doc_rst/report/report_proximity_graph.py b/addons/base_module_doc_rst/report/report_proximity_graph.py
deleted file mode 100644
index 434ecf46b6d..00000000000
--- a/addons/base_module_doc_rst/report/report_proximity_graph.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- 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 time, os
-import pydot
-
-import report,pooler,tools
-
-class report_graph(report.interface.report_int):
-    def __init__(self, name, table):
-        report.interface.report_int.__init__(self, name)
-        self.table = table
-
-    def get_proximity_graph(self, cr, uid, module_id, context=None):
-        pool_obj = pooler.get_pool(cr.dbname)
-        module_obj = pool_obj.get('ir.module.module')
-        nodes = [('base','unknown')]
-        edges = []
-        def get_depend_module(module_id):
-            module_record = module_obj.browse(cr, uid, module_id, context=context)
-            if module_record.name not in nodes:
-                # Add new field ir.module.module object in server side. field name = module_type/
-                nodes.append((module_record.name, "unknown"))
-            if module_record.dependencies_id:
-                for depen in module_record.dependencies_id:
-                    if (module_record.name,depen.name) not in edges:
-                        edges.append((module_record.name,depen.name))
-                    if depen.name == "base":
-                        continue
-                    id = module_obj.browse(cr, uid, module_obj.search(cr, uid, [('name', '=' ,depen.name)]), context=context)
-                    if id:
-                        get_depend_module(id[0].id)
-        get_depend_module(module_id)
-        graph = pydot.Dot(graph_type='digraph',fontsize='10', label="\\nProximity Graph. \\n\\nGray Color-Official Modules, Red  Color-Extra Addons Modules, Blue Color-Community Modules, Purple Color-Unknow Modules"
-                                     , center='1')
-        for node in nodes:
-            if node[1] == "official":
-                graph.add_node(pydot.Node(node[0], style="filled", fillcolor="lightgray"))
-            elif node[1] == "extra_addons":
-                graph.add_node(pydot.Node(node[0], style="filled", fillcolor="red"))
-            elif node[1] == "community":
-                graph.add_node(pydot.Node(node[0], style="filled", fillcolor="#000FFF"))
-            elif node[1] == "unknown":
-                graph.add_node(pydot.Node(node[0], style="filled", fillcolor="purple"))
-        for edge in edges:
-            graph.add_edge(pydot.Edge(edge[0], edge[1]))
-
-        ps_string = graph.create(prog='dot', format='ps')
-        if os.name == "nt":
-            prog = 'ps2pdf.bat'
-        else:
-            prog = 'ps2pdf'
-
-        args = (prog, '-', '-')
-        input, output = tools.exec_command_pipe(*args)
-        input.write(ps_string)
-        input.close()
-        return output.read()
-
-    def create(self, cr, uid, ids, data, context=None):
-        pdf_string = self.get_proximity_graph(cr, uid, context.get('active_id'))
-        return (pdf_string, 'pdf')
-
-report_graph('report.proximity.graph', 'ir.module.module')
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph.py b/addons/base_module_doc_rst/wizard/generate_relation_graph.py
deleted file mode 100644
index 9ac1c8811c3..00000000000
--- a/addons/base_module_doc_rst/wizard/generate_relation_graph.py
+++ /dev/null
@@ -1,38 +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
-
-class create_graph(osv.osv_memory):
-    _name = "create.relation.graph"
-
-    def get_graph(self, cr, uid, datas, context=None):
-        mod_obj = self.pool.get('ir.module.module')
-        modules = mod_obj.browse(cr, uid, context['active_ids'], context=context)
-        for module in modules:
-            module_data = mod_obj.get_relation_graph(cr, uid, module.name, context=context)
-            if module_data['module_file']:
-                mod_obj.write(cr, uid, [module.id], {'file_graph': module_data['module_file']}, context=context)
-        return {'type': 'ir.actions.act_window_close'}
-
-create_graph()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml b/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
deleted file mode 100644
index ed30fc64822..00000000000
--- a/addons/base_module_doc_rst/wizard/generate_relation_graph_view.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <record id="view_relationship_graph" model="ir.ui.view">
-            <field name="name">create.relation.graph.form</field>
-            <field name="model">create.relation.graph</field>
-            <field name="arch" type="xml">
-                <form string="Generate Relationship Graph" version="7.0">
-                    <separator string="Relationship Graphs" colspan="6"/>
-                    <footer>
-                        <button name="get_graph" string="Create Graphs" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <act_window id="generate_relationship_graph_values"
-            name="Generate Relationship Graph"
-            src_model="ir.module.module"
-            res_model="create.relation.graph"
-            view_mode="form"
-            view_id="view_relationship_graph"
-            target="new"
-            key2="client_action_multi"/>
-
-    </data>
-</openerp>
diff --git a/addons/base_module_doc_rst/wizard/tech_guide_rst_view.xml b/addons/base_module_doc_rst/wizard/tech_guide_rst_view.xml
deleted file mode 100644
index 86c7002568c..00000000000
--- a/addons/base_module_doc_rst/wizard/tech_guide_rst_view.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-    <record id="view_technical_guide" model="ir.ui.view">
-        <field name="name">tech.guide.rst.form</field>
-        <field name="model">tech.guide.rst</field>
-        <field name="arch" type="xml">
-            <form string="Create Technical Guide in rst format">
-                <separator string="Technical Guide in rst Format" colspan="4"/>
-                <label string="Please choose a file where the Technical Guide will be written." colspan="4"/>
-                <field name="rst_file" />
-           </form>
-        </field>
-    </record>
-
-    <act_window id="wiz_tech_guide_rst"
-        name="Create RST Technical Guide2"
-        src_model="ir.module.module"
-        res_model="tech.guide.rst"
-        view_mode="form"
-        view_id="view_technical_guide"
-        target="new"
-        key2="client_action_multi"/>
-
-    </data>
-</openerp>
diff --git a/addons/base_module_doc_rst/wizard/tech_rst_guide.py b/addons/base_module_doc_rst/wizard/tech_rst_guide.py
deleted file mode 100644
index da2920046a3..00000000000
--- a/addons/base_module_doc_rst/wizard/tech_rst_guide.py
+++ /dev/null
@@ -1,477 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-
-from osv import osv, fields
-import netsvc
-
-import base64
-import tempfile
-import tarfile
-import httplib
-import os
-
-class RstDoc(object):
-    def __init__(self, module, objects):
-        self.dico = {
-            'name': module.name,
-            'shortdesc': module.shortdesc,
-            'latest_version': module.latest_version,
-            'website': module.website,
-            'description': self._handle_text(module.description.strip() or 'None'),
-            'report_list': self._handle_list_items(module.reports_by_module),
-            'menu_list': self._handle_list_items(module.menus_by_module),
-            'view_list': self._handle_list_items(module.views_by_module),
-            'depends': module.dependencies_id,
-            'quality_certified': bool(module.certificate) and 'yes' or 'no',
-            'official_module': str(module.certificate)[:2] == '00' and 'yes' or 'no',
-            'author': module.author,
-            'quality_certified_label': self._quality_certified_label(module),
-        }
-        self.objects = objects
-        self.module = module
-
-    def _quality_certified_label(self, module):
-        label = ""
-        certificate = module.certificate
-        if certificate and len(certificate) > 1:
-            if certificate[:2] == '00':
-                # addons
-                label = "(Official, Quality Certified)"
-            elif certificate[:2] == '01':
-                # extra addons
-                label = "(Quality Certified)"
-
-        return label
-
-    def _handle_list_items(self, list_item_as_string):
-        list_item_as_string = list_item_as_string.strip()
-        if list_item_as_string:
-            return [item.replace('*', '\*') for item in list_item_as_string.split('\n')]
-        else:
-            return []
-
-    def _handle_text(self, txt):
-        lst = ['  %s' % line for line in txt.split('\n')]
-        return '\n'.join(lst)
-
-    def _get_download_links(self):
-        def _is_connection_status_good(link):
-            server = "openerp.com"
-            status_good = False
-            try:
-                conn = httplib.HTTPConnection(server)
-                conn.request("HEAD", link)
-                res = conn.getresponse()
-                if res.status in (200, ):
-                    status_good = True
-            except (Exception, ), e:
-                logger = netsvc.Logger()
-                msg = "error connecting to server '%s' with link '%s'. Error message: %s" % (server, link, str(e))
-                logger.notifyChannel("base_module_doc_rst", netsvc.LOG_ERROR, msg)
-                status_good = False
-            return status_good
-
-        versions = ('4.2', '5.0', 'trunk')
-        download_links = []
-        for ver in versions:
-            link = 'http://www.openerp.com/download/modules/%s/%s.zip' % (ver, self.dico['name'])
-            if _is_connection_status_good(link):
-                download_links.append("  * `%s <%s>`_" % (ver, link))
-
-        if download_links:
-            res = '\n'.join(download_links)
-        else:
-            res = "(No download links available)"
-        return res
-
-    def _write_header(self):
-        dico = self.dico
-        title = "%s (*%s*)" % (dico['shortdesc'], dico['name'])
-        title_underline = "=" * len(title)
-        dico['title'] = title
-        dico['title_underline'] = title_underline
-        dico['download_links'] = self._get_download_links()
-
-        sl = [
-            "",
-            ".. module:: %(name)s",
-            "    :synopsis: %(shortdesc)s %(quality_certified_label)s",
-            "    :noindex:",
-            ".. ",
-            "",
-            ".. raw:: html",
-            "",
-            "      <br />",
-            """    <link rel="stylesheet" href="../_static/hide_objects_in_sidebar.css" type="text/css" />""",
-            "",
-            """.. tip:: This module is part of the OpenERP software, the leading Open Source """,
-            """  enterprise management system. If you want to discover OpenERP, check our """,
-            """  `screencasts <http://openerp.tv>`_ or download """,
-            """  `OpenERP <http://openerp.com>`_ directly.""",
-            "",
-            ".. raw:: html",
-            "",
-            """    <div class="js-kit-rating" title="" permalink="" standalone="yes" path="/%s"></div>""" % (dico['name'], ),
-            """    <script src="http://js-kit.com/ratings.js"></script>""",
-            "",
-            "%(title)s",
-            "%(title_underline)s",
-            ":Module: %(name)s",
-            ":Name: %(shortdesc)s",
-            ":Version: %(latest_version)s",
-            ":Author: %(author)s",
-            ":Directory: %(name)s",
-            ":Web: %(website)s",
-            ":Official module: %(official_module)s",
-            ":Quality certified: %(quality_certified)s",
-            "",
-            "Description",
-            "-----------",
-            "",
-            "::",
-            "",
-            "%(description)s",
-            "",
-            "Download links",
-            "--------------",
-            "",
-            "You can download this module as a zip file in the following version:",
-            "",
-            "%(download_links)s",
-            "",
-            ""]
-        return '\n'.join(sl) % (dico)
-
-    def _write_reports(self):
-        sl = ["",
-              "Reports",
-              "-------"]
-        reports = self.dico['report_list']
-        if reports:
-            for report in reports:
-                if report:
-                    sl.append("")
-                    sl.append(" * %s" % report)
-        else:
-            sl.extend(["", "None", ""])
-
-        sl.append("")
-        return '\n'.join(sl)
-
-    def _write_menus(self):
-        sl = ["",
-              "Menus",
-              "-------",
-              ""]
-        menus = self.dico['menu_list']
-        if menus:
-            for menu in menus:
-                if menu:
-                    sl.append(" * %s" % menu)
-        else:
-            sl.extend(["", "None", ""])
-
-        sl.append("")
-        return '\n'.join(sl)
-
-    def _write_views(self):
-        sl = ["",
-              "Views",
-              "-----",
-              ""]
-        views = self.dico['view_list']
-        if views:
-            for view in views:
-                if view:
-                    sl.append(" * %s" % view)
-        else:
-            sl.extend(["", "None", ""])
-
-        sl.append("")
-        return '\n'.join(sl)
-
-    def _write_depends(self):
-        sl = ["",
-              "Dependencies",
-              "------------",
-              ""]
-        depends = self.dico['depends']
-        if depends:
-            for dependency in depends:
-                sl.append(" * :mod:`%s`" % (dependency.name))
-        else:
-            sl.extend(["", "None", ""])
-        sl.append("")
-        return '\n'.join(sl)
-
-    def _write_objects(self):
-        def write_field(field_def):
-            if not isinstance(field_def, tuple):
-                logger = netsvc.Logger()
-                msg = "Error on Object %s: field_def: %s [type: %s]" % (obj_name.encode('utf8'), field_def.encode('utf8'), type(field_def))
-                logger.notifyChannel("base_module_doc_rst", netsvc.LOG_ERROR, msg)
-                return ""
-
-            field_name = field_def[0]
-            field_dict = field_def[1]
-            field_required = field_dict.get('required', '') and ', required'
-            field_readonly = field_dict.get('readonly', '') and ', readonly'
-            field_help_s = field_dict.get('help', '')
-            if field_help_s:
-                field_help_s = "*%s*" % (field_help_s)
-                field_help = '\n'.join(['    %s' % line.strip() for line in field_help_s.split('\n')])
-            else:
-                field_help = ''
-
-            sl = ["",
-                  ":%s: %s, %s%s%s" % (field_name, field_dict.get('string', 'Unknown'), field_dict['type'], field_required, field_readonly),
-                  "",
-                  field_help,
-                 ]
-            return '\n'.join(sl)
-
-        sl = ["",
-              "",
-              "Objects",
-              "-------"]
-        if self.objects:
-            for obj in self.objects:
-                obj_name = obj['object'].name
-                obj_model = obj['object'].model
-                title = "Object: %s (%s)" % (obj_name, obj_model)
-                slo = [
-                       "",
-                       title,
-                       '#' * len(title),
-                       "",
-                      ]
-
-                for field in obj['fields']:
-                    slf = [
-                           "",
-                           write_field(field),
-                           "",
-                          ]
-                    slo.extend(slf)
-                sl.extend(slo)
-        else:
-            sl.extend(["", "None", ""])
-
-        return u'\n'.join([a.decode('utf8') for a in sl])
-
-    def _write_relationship_graph(self, module_name=False):
-        sl = ["",
-              "Relationship Graph",
-              "------------------",
-              "",
-              ".. figure:: %s_module.png" % (module_name, ),
-              "  :scale: 50",
-              "  :align: center",
-              ""]
-        sl.append("")
-        return '\n'.join(sl)
-
-    def write(self, module_name=False):
-        s = ''
-        s += self._write_header()
-        s += self._write_depends()
-        s += self._write_reports()
-        s += self._write_menus()
-        s += self._write_views()
-        s += self._write_objects()
-        if module_name:
-            s += self._write_relationship_graph(module_name)
-        return s
-
-
-class wizard_tech_guide_rst(osv.osv_memory):
-    _name = "tech.guide.rst"
-    _columns = {
-        'rst_file': fields.binary('File', required=True, readonly=True),
-    }
-
-    def _generate(self, cr, uid, context):
-        module_model = self.pool.get('ir.module.module')
-        module_ids = context['active_ids']
-
-        module_index = []
-
-        # create a temporary gzipped tarfile:
-        tgz_tmp_filename = tempfile.mktemp('_rst_module_doc.tgz')
-        try:
-            tarf = tarfile.open(tgz_tmp_filename, 'w:gz')
-
-            modules = module_model.browse(cr, uid, module_ids)
-            for module in modules:
-                index_dict = {
-                    'name': module.name,
-                    'shortdesc': module.shortdesc,
-                }
-                module_index.append(index_dict)
-
-                objects = self._get_objects(cr, uid, module)
-                module.test_views = self._get_views(cr, uid, module.id, context=context)
-                rstdoc = RstDoc(module, objects)
-
-                # Append Relationship Graph on rst
-                graph_mod = False
-                module_name = False
-                if module.file_graph:
-                    graph_mod = base64.decodestring(module.file_graph)
-                else:
-                    module_data = module_model.get_relation_graph(cr, uid, module.name, context=context)
-                    if module_data['module_file']:
-                        graph_mod = base64.decodestring(module_data['module_file'])
-                if graph_mod:
-                    module_name = module.name
-                    try:
-                        tmpdir = tempfile.mkdtemp()
-                        tmp_file_graph = tempfile.NamedTemporaryFile()
-                        tmp_file_graph.write(graph_mod)
-                        tmp_file_graph.file.flush()
-                        tarf.add(tmp_file_graph.name, arcname= module.name + '_module.png')
-                    finally:
-                        tmp_file_graph.close()
-
-                out = rstdoc.write(module_name)
-                try:
-                    tmp_file = tempfile.NamedTemporaryFile()
-                    tmp_file.write(out.encode('utf8'))
-                    tmp_file.file.flush() # write content to file
-                    tarf.add(tmp_file.name, arcname=module.name + '.rst')
-                finally:
-                    tmp_file.close()
-
-            # write index file:
-            tmp_file = tempfile.NamedTemporaryFile()
-            out = self._create_index(module_index)
-            tmp_file.write(out.encode('utf8'))
-            tmp_file.file.flush()
-            tarf.add(tmp_file.name, arcname='index.rst')
-        finally:
-            tarf.close()
-
-        f = open(tgz_tmp_filename, 'rb')
-        out = f.read()
-        f.close()
-
-        if os.path.exists(tgz_tmp_filename):
-            try:
-                os.unlink(tgz_tmp_filename)
-            except Exception, e:
-                logger = netsvc.Logger()
-                msg = "Temporary file %s could not be deleted. (%s)" % (tgz_tmp_filename, e)
-                logger.notifyChannel("warning", netsvc.LOG_WARNING, msg)
-
-        return base64.encodestring(out)
-
-    def _get_views(self, cr, uid, module_id, context=None):
-        module_module_obj = self.pool.get('ir.module.module')
-        model_data_obj = self.pool.get('ir.model.data')
-        view_obj = self.pool.get('ir.ui.view')
-        report_obj = self.pool.get('ir.actions.report.xml')
-        menu_obj = self.pool.get('ir.ui.menu')
-        res = {}
-        mlist = module_module_obj.browse(cr, uid, [module_id], context=context)
-        mnames = {}
-        for m in mlist:
-            mnames[m.name] = m.id
-            res[m.id] = {
-                'menus_by_module': [],
-                'reports_by_module': [],
-                'views_by_module': []
-            }
-        view_id = model_data_obj.search(cr, uid, [('module', 'in', mnames.keys()),
-            ('model', 'in', ('ir.ui.view', 'ir.actions.report.xml', 'ir.ui.menu'))])
-        for data_id in model_data_obj.browse(cr, uid, view_id, context):
-            # We use try except, because views or menus may not exist
-            try:
-                key = data_id['model']
-                if key == 'ir.ui.view':
-                    v = view_obj.browse(cr, uid, data_id.res_id)
-                    v_dict = {
-                        'name': v.name,
-                        'inherit': v.inherit_id,
-                        'type': v.type}
-                    res[mnames[data_id.module]]['views_by_module'].append(v_dict)
-                elif key == 'ir.actions.report.xml':
-                    res[mnames[data_id.module]]['reports_by_module'].append(report_obj.browse(cr, uid, data_id.res_id).name)
-                elif key == 'ir.ui.menu':
-                    res[mnames[data_id.module]]['menus_by_module'].append(menu_obj.browse(cr, uid, data_id.res_id).complete_name)
-            except (KeyError, ):
-                pass
-        return res
-
-    def _create_index(self, module_index):
-        sl = ["",
-              ".. _module-technical-guide-link:",
-              "",
-              "Module Technical Guide: Introspection report on objects",
-              "=======================================================",
-              "",
-              ".. toctree::",
-              "    :maxdepth: 1",
-              "",
-              ]
-        for mod in module_index:
-            sl.append("    %s" % mod['name'])
-        sl.append("")
-        return '\n'.join(sl)
-
-    def _get_objects(self, cr, uid, module):
-        res = []
-        objects = self._object_find(cr, uid, module)
-        for obj in objects:
-            fields = self._fields_find(cr, uid, obj.model)
-            dico = {
-                'object': obj,
-                'fields': fields
-            }
-            res.append(dico)
-        return res
-
-    def _object_find(self, cr, uid, module):
-        ir_model_data = self.pool.get('ir.model.data')
-        ids2 = ir_model_data.search(cr, uid, [('module', '=', module.name), ('model', '=', 'ir.model')])
-        ids = []
-        for mod in ir_model_data.browse(cr, uid, ids2):
-            ids.append(mod.res_id)
-        return self.pool.get('ir.model').browse(cr, uid, ids)
-
-    def _fields_find(self, cr, uid, obj):
-        modobj = self.pool.get(obj)
-        if modobj:
-            res = modobj.fields_get(cr, uid).items()
-            return res
-        else:
-            logger = netsvc.Logger()
-            msg = "Object %s not found" % (obj)
-            logger.notifyChannel("base_module_doc_rst", netsvc.LOG_ERROR, msg)
-            return ""
-
-    _defaults = {
-        'rst_file': _generate,
-    }
-
-wizard_tech_guide_rst()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_record/__init__.py b/addons/base_module_record/__init__.py
deleted file mode 100644
index 924e6245c8a..00000000000
--- a/addons/base_module_record/__init__.py
+++ /dev/null
@@ -1,25 +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 base_module_record
-import wizard
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py
deleted file mode 100644
index 4cdc8116217..00000000000
--- a/addons/base_module_record/__openerp__.py
+++ /dev/null
@@ -1,59 +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/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Record and Create Modules',
-    'version': '1.0',
-    'category': 'Tools',
-    'description': """
-This module allows you to create a new module without any development.
-======================================================================
-
-It records all operations on objects during the recording session and produce a 
-.ZIP module. So you can create your own module directly from the OpenERP client.
-
-This version works for creating and updating existing records. It recomputes
-dependencies and links for all types of widgets (many2one, many2many, ...).
-It also support workflows and demo/update data.
-
-This should help you to easily create reusable and publishable modules for custom 
-configurations and demo/testing data.
-
-How to use it?:
-Run Settings/Technical/Module Creation/Export Customizations As a Module wizard. 
-Select datetime criteria of recording and objects to be recorded and Record module.
-    """,
-    'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [
-        'security/ir.model.access.csv',
-        'wizard/base_module_record_object_view.xml',
-        'wizard/base_module_record_data_view.xml',
-    ],
-    'demo_xml': [],
-    'installable': True,
-    'certificate': '0083134865813',
-    'images': ['images/base_module_record1.jpeg','images/base_module_record2.jpeg','images/base_module_record3.jpeg',]
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
deleted file mode 100644
index af63a0cf369..00000000000
--- a/addons/base_module_record/base_module_record.py
+++ /dev/null
@@ -1,504 +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 xml.dom import minidom
-from osv import fields,osv
-import pooler
-import string
-import tools
-
-
-class xElement(minidom.Element):
-    """dom.Element with compact print
-    The Element in minidom has a problem: if printed, adds whitespace
-    around the text nodes. The standard will not ignore that whitespace.
-    This class simply prints the contained nodes in their compact form, w/o
-    added spaces.
-    """
-    def writexml(self, writer, indent="", addindent="", newl=""):
-        writer.write(indent)
-        minidom.Element.writexml(self, writer, indent='', addindent='', newl='')
-        writer.write(newl)
-
-def doc_createXElement(xdoc, tagName):
-        e = xElement(tagName)
-        e.ownerDocument = xdoc
-        return e
-
-import yaml
-from tools import yaml_tag # This import is not unused! Do not remove!
-# Please do not override yaml_tag here: modify it in server bin/tools/yaml_tag.py
-
-class base_module_record(osv.osv):
-    _name = "ir.module.record"
-    _columns = {
-
-    }
-    def __init__(self, *args, **kwargs):
-        self.recording = 0
-        self.recording_data = []
-        self.depends = {}
-        super(base_module_record, self).__init__(*args, **kwargs)
-
-    # To Be Improved
-    def _create_id(self, cr, uid, model, data):
-        i = 0
-        while True:
-            try:
-                name = filter(lambda x: x in string.letters, (data.get('name','') or '').lower())
-            except:
-                name=''
-#            name=data.get('name','') or ''.lower()
-            val = model.replace('.','_')+'_'+ name + str(i)
-            i+=1
-            if val not in self.ids.values():
-                break
-        return val
-
-    def _get_id(self, cr, uid, model, id):
-        if type(id)==type(()):
-            id=id[0]
-        if (model,id) in self.ids:
-            res_id = self.ids[(model,id)]
-            return res_id, False
-        dt = self.pool.get('ir.model.data')
-        dtids = dt.search(cr, uid, [('model','=',model), ('res_id','=',id)])
-        if not dtids:
-            return False, None
-        obj = dt.browse(cr, uid, dtids[0])
-        self.depends[obj.module] = True
-        return obj.module+'.'+obj.name, obj.noupdate
-    
-    def _create_record(self, cr, uid, doc, model, data, record_id, noupdate=False):
-        data_pool = self.pool.get('ir.model.data')
-        model_pool = self.pool.get(model)
-        
-        record = doc.createElement('record')
-        record.setAttribute("id", record_id)
-        record.setAttribute("model", model)
-        record_list = [record]
-        
-        lids  = data_pool.search(cr, uid, [('model','=',model)])
-        res = data_pool.read(cr, uid, lids[:1], ['module'])
-        if res:
-            self.depends[res[0]['module']]=True
-        fields = model_pool.fields_get(cr, uid)
-        for key,val in data.items():
-            if not (val or (fields[key]['type']=='boolean')):
-                continue
-            if (fields[key]['type'] in ('integer','float') or
-                fields[key]['type'] == 'selection' and isinstance(val, int)):
-                field = doc.createElement('field')
-                field.setAttribute("name", key)
-                field.setAttribute("eval", val and str(val) or 'False' )
-                record.appendChild(field)
-            elif fields[key]['type'] in ('boolean',):
-                field = doc.createElement('field')
-                field.setAttribute("name", key)
-                field.setAttribute("eval", val and '1' or '0' )
-                record.appendChild(field)
-            elif fields[key]['type'] in ('many2one',):
-                field = doc.createElement('field')
-                field.setAttribute("name", key)
-                if type(val) in (type(''),type(u'')):
-                    id = val
-                else:
-                    id,update = self._get_id(cr, uid, fields[key]['relation'], val)
-                    noupdate = noupdate or update
-                if not id:
-                    relation_pool = self.pool.get(fields[key]['relation'])
-                    
-                    field.setAttribute("model", fields[key]['relation'])
-                    fld_nm = relation_pool._rec_name
-                    name = relation_pool.read(cr, uid, val,[fld_nm])[fld_nm] or False
-                    field.setAttribute("search", str([(str(fld_nm) ,'=', name)]))
-                else:
-                    field.setAttribute("ref", id)
-                record.appendChild(field)
-            elif fields[key]['type'] in ('one2many',):
-                for valitem in (val or []):
-                    if valitem[0] in (0,1):
-                        if key in model_pool._columns:
-                            model_pool._columns[key]._fields_id
-                        else:
-                            model_pool._inherit_fields[key][2]._fields_id
-                        if valitem[0] == 0:
-                            newid = self._create_id(cr, uid, fields[key]['relation'], valitem[2])
-                            valitem[1]=newid
-                        else:
-                            newid,update = self._get_id(cr, uid, fields[key]['relation'], valitem[1])
-                            if not newid:
-                                newid = self._create_id(cr, uid, fields[key]['relation'], valitem[2])
-                                valitem[1]=newid
-                        self.ids[(fields[key]['relation'], valitem[1])] = newid
-                        
-                        childrecord, update = self._create_record(cr, uid, doc, fields[key]['relation'],valitem[2], newid)
-                        noupdate = noupdate or update
-                        record_list += childrecord
-                    else:
-                        pass
-            elif fields[key]['type'] in ('many2many',):
-                res = []
-                for valitem in (val or []):
-                    if valitem[0]==6:
-                        for id2 in valitem[2]:
-                            id,update = self._get_id(cr, uid, fields[key]['relation'], id2)
-                            self.ids[(fields[key]['relation'],id2)] = id
-                            noupdate = noupdate or update
-                            res.append(id)
-                        field = doc.createElement('field')
-                        field.setAttribute("name", key)
-                        field.setAttribute("eval", "[(6,0,["+','.join(map(lambda x: "ref('%s')" % (x,), res))+'])]')
-                        record.appendChild(field)
-            else:
-                field = doc_createXElement(doc, 'field')
-                field.setAttribute("name", key)
-                field.appendChild(doc.createTextNode(val))
-                record.appendChild(field)
-
-        return record_list, noupdate
-
-    def _create_yaml_record(self, cr, uid, model, data, record_id):
-        record={'model': model, 'id': str(record_id)}
-        
-        model_pool = self.pool.get(model)
-        data_pool = self.pool.get('ir.model.data')
-        lids  = data_pool.search(cr, uid, [('model','=',model)])
-        
-        res = data_pool.read(cr, uid, lids[:1], ['module'])
-        attrs={}
-        if res:
-            self.depends[res[0]['module']]=True
-        fields = model_pool.fields_get(cr, uid)
-        defaults={}
-        try:
-            defaults[model] = model_pool.default_get(cr, uid, data)
-        except:
-            defaults[model]={}
-        for key,val in data.items():  
-            if ((key in defaults[model]) and (val ==  defaults[model][key])) and not(fields[key].get('required',False)):
-                continue
-            if fields[key]['type'] in ('integer','float'):
-                if not val:
-                    val=0.0
-                attrs[key] = val
-            elif not (val or (fields[key]['type']=='function')):
-                continue
-            elif fields[key]['type'] in ('boolean',):
-                if not val:
-                    continue
-                attrs[key] = val
-            elif fields[key]['type'] in ('many2one',):
-                if type(val) in (type(''), type(u'')):
-                    id = val
-                else:
-                    id, update = self._get_id(cr, uid, fields[key]['relation'], val)
-                attrs[key] = str(id)
-            elif fields[key]['type'] in ('one2many',):
-                items=[[]]
-                for valitem in (val or []):
-                    if valitem[0] in (0,1):
-                        if key in model_pool._columns:
-                            fname = model_pool._columns[key]._fields_id
-                        else:
-                            fname = model_pool._inherit_fields[key][2]._fields_id
-                        del valitem[2][fname] #delete parent_field from child's fields list
-                        
-                        childrecord = self._create_yaml_record(cr, uid, fields[key]['relation'],valitem[2], None)
-                        items[0].append(childrecord['attrs'])
-                attrs[key] = items
-            elif fields[key]['type'] in ('many2many',):
-                if (key in defaults[model]) and (val[0][2] ==  defaults[model][key]):
-                    continue
-                res = []
-                for valitem in (val or []):
-                    if valitem[0]==6:
-                        for id2 in valitem[2]:
-                            id,update = self._get_id(cr, uid, fields[key]['relation'], id2)
-                            self.ids[(fields[key]['relation'],id2)] = id
-                            res.append(str(id))
-                        m2m=[res]
-                if m2m[0]:
-                    attrs[key] = m2m
-            else:
-                try:
-                    attrs[key]=str(val)
-                except:
-                    attrs[key]=tools.ustr(val)
-                attrs[key]=attrs[key].replace('"','\'')
-        record['attrs'] = attrs
-        return record
-
-    def get_copy_data(self, cr, uid, model, id, result):
-        res = []
-        obj=self.pool.get(model)
-        data=obj.read(cr, uid,[id])
-        if type(data)==type([]):
-            del data[0]['id']
-            data=data[0]
-        else:
-            del data['id']
-
-        mod_fields = obj.fields_get(cr, uid)
-        for f in filter(lambda a: isinstance(obj._columns[a], fields.function)\
-                    and (not obj._columns[a].store),obj._columns):
-            del data[f]
-            
-        for key,val in data.items():
-            if result.has_key(key):
-                continue
-            if mod_fields[key]['type'] == 'many2one':
-                if type(data[key])==type(True) or type(data[key])==type(1):
-                    result[key]=data[key]
-                elif not data[key]:
-                    result[key] = False
-                else:
-                    result[key]=data[key][0]
-
-            elif mod_fields[key]['type'] in ('one2many',):
-#                continue # due to this start stop recording will not record one2many field
-                rel = mod_fields[key]['relation']
-                if len(data[key]):
-                    res1=[]
-                    for rel_id in data[key]:
-                        res=[0,0]
-                        res.append(self.get_copy_data(cr, uid,rel,rel_id,{}))
-                        res1.append(res)
-                    result[key]=res1
-                else:
-                    result[key]=data[key]
-
-            elif mod_fields[key]['type'] == 'many2many':
-                result[key]=[(6,0,data[key])]
-
-            else:
-                result[key]=data[key]
-        for k,v in obj._inherits.items():
-            del result[v]
-        return result
-
-    def _create_function(self, cr, uid, doc, model, name, record_id):
-        record = doc.createElement('function')
-        record.setAttribute("name", name)
-        record.setAttribute("model", model)
-        record_list = [record]
-
-        value = doc.createElement('value')
-        value.setAttribute('eval', '[ref(\'%s\')]' % (record_id, ))
-        value.setAttribute('model', model)
-
-        record.appendChild(value)
-        return record_list, False
-
-    def _generate_object_xml(self, cr, uid, rec, recv, doc, result=None):
-        record_list = []
-        noupdate = False
-        if rec[3]=='write':
-            for id in rec[4]:
-                id,update = self._get_id(cr, uid, rec[2], id)
-                noupdate = noupdate or update
-                if not id:
-                    continue
-                record,update = self._create_record(cr, uid, doc, rec[2], rec[5], id)
-                noupdate = noupdate or update
-                record_list += record
-                
-        elif rec[4] in ('menu_create',):
-            for id in rec[5]:
-                id,update = self._get_id(cr, uid, rec[3], id)
-                noupdate = noupdate or update
-                if not id:
-                    continue
-                record,update = self._create_function(cr, uid, doc, rec[3], rec[4], id)
-                noupdate = noupdate or update
-                record_list += record
-
-        elif rec[3]=='create':
-            id = self._create_id(cr, uid, rec[2],rec[4])
-            record,noupdate = self._create_record(cr, uid, doc, rec[2], rec[4], id)
-            self.ids[(rec[2], result)] = id
-            record_list += record
-
-        elif rec[3]=='copy':
-            data=self.get_copy_data(cr,uid,rec[2],rec[4],rec[5])
-            copy_rec=(rec[0],rec[1],rec[2],rec[3],rec[4],data,rec[5])
-            rec=copy_rec
-            rec_data=[(self.recording_data[0][0],rec,self.recording_data[0][2],self.recording_data[0][3])]
-            self.recording_data=rec_data
-            id = self._create_id(cr, uid, rec[2],rec[5])
-            record,noupdate = self._create_record(cr, uid, doc, rec[2], rec[5], id)
-            self.ids[(rec[2], result)] = id
-            record_list += record
-
-        return record_list,noupdate
-
-    def _generate_object_yaml(self, cr, uid, rec, result=None):
-        if self.mode=="create":
-            yml_id = self._create_id(cr, uid, rec[2],rec[4])
-            self.ids[(rec[2], result)] = yml_id
-            record = self._create_yaml_record(cr, uid, rec[2], rec[4], yml_id)
-            return record
-        if self.mode=="workflow":
-            id,update = self._get_id(cr, uid, rec[2], rec[4])
-            data = {}
-            data['model'] = rec[2]
-            data['action'] = rec[3]
-            data['ref'] = id
-            return data
-        if self.mode=="write":
-            id,update = self._get_id(cr, uid, rec[2],rec[4][0])
-            record = self._create_yaml_record(cr, uid, rec[2], rec[5], id)
-            return record
-        data=self.get_copy_data(cr,uid,rec[2],rec[4],rec[5])
-        copy_rec=(rec[0],rec[1],rec[2],rec[3],rec[4],data,rec[5])
-        rec=copy_rec
-        rec_data=[(self.recording_data[0][0],rec,self.recording_data[0][2],self.recording_data[0][3])]
-        self.recording_data=rec_data
-        id = self._create_id(cr, uid, rec[2],rec[5])
-        record = self._create_yaml_record(cr, uid, str(rec[2]), rec[5], id)
-        self.ids[(rec[2], result)] = id
-        return record
-
-    def _generate_function_yaml(self, cr, uid, args):
-        db, uid, model, action, ids, context = args
-        temp_context = context.copy()
-        active_id = temp_context['active_id']
-        active_model = temp_context['active_model']
-        active_id, update = self._get_id(cr, uid, active_model, active_id)
-        if not active_id:
-            active_id = 1
-        rec_id, noupdate = self._get_id(cr, uid, model, ids[0])
-        temp_context['active_id'] = "ref('%s')"%unicode(active_id)
-        temp_context['active_ids'][0] = "ref('%s')"%str(active_id)
-        function={}
-        function['model'] = model
-        function['action'] = action
-        attrs = "self.%s(cr, uid, [ref('%s')], {" %(action, rec_id, )
-        for k, v in temp_context.iteritems():
-            if isinstance(v, str):
-                f= "'"+k+"': "+"'%s'"%v + ", "
-            else:
-                v=str(v).replace('"', '')
-                f= "'"+k+"': "+"%s"%v + ", "
-            attrs = attrs + f
-        attrs=str(attrs)+'})'
-        function['attrs'] = attrs
-        return function
-            
-    def _generate_assert_xml(self, rec, doc):
-        pass
-
-    def generate_xml(self, cr, uid):
-        # Create the minidom document
-        if len(self.recording_data):
-            self.ids = {}
-            doc = minidom.Document()
-            terp = doc.createElement("openerp")
-            doc.appendChild(terp)
-            for rec in self.recording_data:
-                if rec[0]=='workflow':
-                    rec_id,noupdate = self._get_id(cr, uid, rec[1][2], rec[1][4])
-                    if not rec_id:
-                        continue
-                    data = doc.createElement("data")
-                    terp.appendChild(data)
-                    wkf = doc.createElement('workflow')
-                    data.appendChild(wkf)
-                    wkf.setAttribute("model", rec[1][2])
-                    wkf.setAttribute("action", rec[1][3])
-                    if noupdate:
-                        data.setAttribute("noupdate", "1")
-                    wkf.setAttribute("ref", rec_id)
-                if rec[0]=='query':
-                    res_list,noupdate = self._generate_object_xml(cr, uid, rec[1], rec[2], doc, rec[3])
-                    data = doc.createElement("data")
-                    if noupdate:
-                        data.setAttribute("noupdate", "1")
-                    if res_list:
-                        terp.appendChild(data)
-                    for res in res_list:
-                        data.appendChild(res)
-                elif rec[0]=='assert':
-                        pass
-            return doc.toprettyxml(indent="\t").encode('utf-8')
-
-    def generate_yaml(self, cr, uid):
-        self.ids = {}
-        if len(self.recording_data):
-            yaml_file='''\n'''
-    
-            for rec in self.recording_data:
-                if rec[1][3] == 'create':
-                    self.mode="create"
-                elif rec[1][3] == 'write':
-                    self.mode="write"
-                elif rec[1][3] == 'copy':
-                    self.mode="copy"
-                elif rec[0] == 'workflow':
-                    self.mode="workflow"
-                elif rec[0] == 'osv_memory_action':
-                    self.mode='osv_memory_action'
-                else:
-                    continue
-                if self.mode == "workflow":
-                    record = self._generate_object_yaml(cr, uid, rec[1],rec[0])
-                    yaml_file += "!comment Performing a workflow action %s on module %s"%(record['action'], record['model']) + '''\n'''
-                    object = yaml.load(unicode('''\n !workflow %s \n'''%record,'iso-8859-1'))
-                    yaml_file += str(object) + '''\n\n'''
-                elif self.mode == 'osv_memory_action':
-                    osv_action = self._generate_function_yaml(cr, uid, rec[1])
-                    yaml_file += "!comment Performing an osv_memory action %s on module %s"%(osv_action['action'], osv_action['model']) + '''\n'''
-                    osv_action = yaml.load(unicode('''\n !python %s \n'''%osv_action,'iso-8859-1'))
-                    yaml_file += str(osv_action) + '''\n'''
-                    attrs = yaml.dump(osv_action.attrs, default_flow_style=False)
-                    attrs = attrs.replace("''", '"')
-                    attrs = attrs.replace("'", '')
-                    yaml_file += attrs + '''\n\n'''
-                else:
-                    record = self._generate_object_yaml(cr, uid, rec[1], rec[3])
-                    if self.mode == "create" or self.mode == "copy":
-                        yaml_file += "!comment Creating a %s record"%(record['model']) + '''\n'''
-                    else:
-                        yaml_file += "!comment Modifying a %s record"%(record['model']) + '''\n'''
-                    object = yaml.load(unicode('''\n !record %s \n'''%record,'iso-8859-1'))
-                    yaml_file += str(object) + '''\n'''
-                    attrs = yaml.dump(object.attrs, default_flow_style=False)
-                    yaml_file += attrs + '''\n\n'''
-                    
-        yaml_result=''''''
-        for line in yaml_file.split('\n'):
-            line=line.replace("''","'")
-            if (line.find('!record') == 0) or (line.find('!workflow') == 0) or (line.find('!python') == 0):
-                line = "- \n" + "  " + line
-            elif line.find('!comment') == 0:
-                line=line.replace('!comment','- \n ')   
-            elif line.find('- -') != -1:
-                line=line.replace('- -','  -')
-                line = "    " + line
-            else:
-                line = "    " + line
-            yaml_result += line + '''\n'''
-            
-        return yaml_result
-
-base_module_record()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_module_record/i18n/ar.po b/addons/base_module_record/i18n/ar.po
deleted file mode 100644
index 4ea3ae5eda5..00000000000
--- a/addons/base_module_record/i18n/ar.po
+++ /dev/null
@@ -1,322 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "فئة"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "معلومات"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "نهاية"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "اختار الاهداف لتسجيلها"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "المؤلف"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "اسم المسار"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "تسجيلات فقط"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "البيانات المستعرضة"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "اسم الملف"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "الإصدار"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "تسجيل الاهداف"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-"إذا كنت تعتقد أن الملحق البرمجي قد يستخدمه آخرون، فيمكنك نشره علي "
-"http://www.openerp.com. في قسم الملحقات البرمجية. يمكنك ذلك من الموقع ذاته "
-"أو بإستخدام الملحق 'base_module_publish' لنشره."
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "تسجيل من التاريخ"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "تسجيل الوحدة"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "تخصيصات التصدير كوحدة"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "شكرا مقدما على مساهمتك."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "قائمة الاهداف التي سيتم تسجيلها"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "وصف شامل"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "اسم الوحدة البرمجية"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "كائنات"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "وحدة ملف الرمز البريدي"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "تم انشاء الملف YAML بنجاح !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "النتيجة, الصق هذا لوحدةxml"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "تمً انشاءه"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "شكرًا لاستخدامك مسجل الوحدة"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "توثيق عنوان الانترنت"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "معدّل"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "سجل"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "تابع"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "تخصيصات التصدير كملف بيانات"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "خطأ"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "بيانات عادية"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "تم"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "إنشاء وحدة"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "نوع البيانات"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "معلومات عن الوحدة"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "النتيجة"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "إلغاء"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "إغلاق"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "تم انشائها وتعديلها"
-
-#~ msgid "Module Record"
-#~ msgstr "تسجيل الوحدة"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "تم انشاء الوحدة بنجاح !"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "اذا كنت تفكر ان الوحدة الخاصة بك لا يمكن ان تهتم بالاشخاص الاخرون, سنفضل ان "
-#~ "تعممها على OpenERP.com, في قسم ‘الوحدات‘. يمكنك عمل ذلك من خلال مواقع الويب "
-#~ "او استخدام خواص وحدة  ‘الاساس_الوحدة_تعميم‘."
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "هذا النموذج يسمح لك لإنشاء وحدة جديدة من دون أي تطور.\n"
-#~ "فإنه يسجل جميع العمليات على المشاريع خلال الدورة والتسجيل\n"
-#~ "تنتج وحدة نمطية. ZIP. لذا يمكنك إنشاء وحدة خاصة بك مباشرة من\n"
-#~ "وOpenERP العميل.\n"
-#~ "\n"
-#~ "هذا الإصدار يعمل لإنشاء واستكمال السجلات الموجودة. انها recomputes\n"
-#~ "التبعيات وصلات لجميع أنواع الحاجيات (many2one، many2many، ...).\n"
-#~ "هذا أيضا دعم سير العمل وعرض / تحديث البيانات.\n"
-#~ "\n"
-#~ "وهذا ينبغي أن تساعدك بسهولة لخلق وحدات قابلة لإعادة الاستخدام وللنشر\n"
-#~ "للحصول على تكوينات مخصصة وعرض البيانات / الاختبار.\n"
-#~ "\n"
-#~ "كيفية استخدامه:\n"
-#~ "تشغيل إدارة / التخصيص / وحدة الإنشاء / تصدير التخصيصات ومعالج وحدة.\n"
-#~ "تحديد معايير التاريخ والوقت من تسجيل والأشياء التي سيتم تسجيلها، وسجل وحدة.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/base_module_record.pot b/addons/base_module_record/i18n/base_module_record.pot
deleted file mode 100644
index 6ed79112949..00000000000
--- a/addons/base_module_record/i18n/base_module_record.pot
+++ /dev/null
@@ -1,261 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+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: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "If you think your module could interest other people, we'd like you to publish it on http://www.openerp.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr ""
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr ""
-
diff --git a/addons/base_module_record/i18n/bg.po b/addons/base_module_record/i18n/bg.po
deleted file mode 100644
index a36ec5ef37c..00000000000
--- a/addons/base_module_record/i18n/bg.po
+++ /dev/null
@@ -1,297 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:01+0000\n"
-"Last-Translator: Tsvetin Vasilev <cecipv@yahoo.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Категория"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Информация"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Автор"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Име на директория"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Име на файла"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Версия"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Запис на модул"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Благодаря предварително за Вашето съдействие."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Пълно описание"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Име на модул"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Модул .zip файл"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Модулът успешно създаден!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Продължи"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Тип на данните"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Информация за модула"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Откажи"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Затвори"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-#~ "символи!"
-
-#~ msgid "Recording Information"
-#~ msgstr "Информация за записа"
-
-#~ msgid "Status"
-#~ msgstr "Състояние"
-
-#~ msgid "Start Recording"
-#~ msgstr "Започни запис"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Модулът успешно създаден!"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Записът спрян"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Продължи предишна сесия"
-
-#~ msgid "Record module"
-#~ msgstr "Запиши модул"
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Съхрани записания модул"
-
-#~ msgid "Stop Recording"
-#~ msgstr "Край на записа"
diff --git a/addons/base_module_record/i18n/bs.po b/addons/base_module_record/i18n/bs.po
deleted file mode 100644
index d954f673099..00000000000
--- a/addons/base_module_record/i18n/bs.po
+++ /dev/null
@@ -1,264 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr ""
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr ""
diff --git a/addons/base_module_record/i18n/ca.po b/addons/base_module_record/i18n/ca.po
deleted file mode 100644
index 73954f1219b..00000000000
--- a/addons/base_module_record/i18n/ca.po
+++ /dev/null
@@ -1,399 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:49+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Categoria"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informació"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Acaba"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Selecciona els objectes a gravar"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nom del directori"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Només registres"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Dades demostració"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nom de fitxer"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versió"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Gravació d'objectes"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Desa des de data"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Mòdul de gravació"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exporta personalitzacions com un mòdul"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Gràcies per endavant per la vostra contribució."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Llista d'objectes que seran gravats"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Descripció completa"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Nom del mòdul"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objectes"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Fitxer .zip del mòdul"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Mòdul creat correctament!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "S'ha creat correctament el fitxer YAML!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Resultat, enganxi això en el xml del mòdul"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Creat(s)"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Gràcies per utilitzar el mòdul de gravació"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL documentació"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Modificat(s)"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Gravació"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Continua"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exporta personalitzacions com un fitxer de dades"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Dades normals"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Accepta"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Creació de mòduls"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tipus de dades"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Informació del mòdul"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Resultat"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Tanca"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Creat(s) & Modificat(s)"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Podeu continuar la sessió de gravació tornant a executar l'assistent 'Inicia "
-#~ "gravació'."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-#~ "especial!"
-
-#~ msgid "Recording Information"
-#~ msgstr "Informació de la gravació"
-
-#~ msgid "Status"
-#~ msgstr "Estat"
-
-#~ msgid "Start Recording"
-#~ msgstr "Inicia la gravació"
-
-#~ msgid "Not Recording"
-#~ msgstr "No gravant"
-
-#~ msgid "Recording information"
-#~ msgstr "Informació de la gravació"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Mòdul creat correctament!"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Continua sessió prèvia"
-
-#~ msgid "Recording"
-#~ msgstr "Gravant"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Gravadora de mòduls"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Si creieu que el vostre mòdul pot interessar a altres, ens agradaria que ho "
-#~ "publiqueu a OpenERP.com, a la secció de 'Mòduls'. Ho podeu fer mitjançant el "
-#~ "lloc web o utilitzant les funcionalitats del mòdul 'base_module_publish'."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "La gravadora de mòduls us permet registrar totes les operacions fetes en el "
-#~ "client d'OpenERP i desar-les com un mòdul. Podreu instal·lar aquest mòdul a "
-#~ "qualsevol base de dades per a reutilitzar-ho i/o publicar-ho."
-
-#~ msgid "Record module"
-#~ msgstr "Mòdul de gravació"
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Desa mòdul gravat"
-
-#~ msgid "Stop Recording"
-#~ msgstr "Atura la gravació"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "La gravació d'OpenERP està aturada. No oblideu desar el mòdul gravat."
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Gravació aturada"
-
-#~ msgid "Module Record"
-#~ msgstr "Gravador de mòduls"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Si creieu que el vostre mòdul podria interessar a altres persones, ens "
-#~ "agradaria que el publiqueu en Openerp.com, a la secció 'Mòduls'. Podeu fer-"
-#~ "ho mitjançant la pàgina web o utilitzant les característiques del mòdul "
-#~ "'base_modul_publish'."
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Aquest mòdul us permet crear un nou mòdul sense cap tipus de "
-#~ "desenvolupament.\n"
-#~ "Grava totes les operacions sobre els objectes durant la sessió "
-#~ "d'enregistrament i\n"
-#~ "produeix un mòdul. *ZIP. D'aquesta forma podeu crear el vostre propi mòdul "
-#~ "directament\n"
-#~ "des del client d'OpenERP.\n"
-#~ "\n"
-#~ "Aquesta versió funciona per crear i actualitzar els registres existents. "
-#~ "Recalcula\n"
-#~ "dependències i enllaços per a tot tipus de ginys (many2one, many2many, "
-#~ "...).\n"
-#~ "També suporta fluxos de treball i dades de demostració/actualització.\n"
-#~ "\n"
-#~ "Això li ajudarà a crear fàcilment mòduls reutilitzables i publicables\n"
-#~ "per a les configuracions personalitzades i dades de demostració/prova.\n"
-#~ "\n"
-#~ "Com utilitzar-ho:\n"
-#~ "Executeu Administració/Personalització/Creació de mòduls/Exporta "
-#~ "personalitzacions com un assistent del mòdul.\n"
-#~ "Seleccioneu la data i hora d'enregistrament i els objectes que es gravaran i "
-#~ "Grava mòdul.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/cs.po b/addons/base_module_record/i18n/cs.po
deleted file mode 100644
index 434fe531e16..00000000000
--- a/addons/base_module_record/i18n/cs.po
+++ /dev/null
@@ -1,328 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:06+0000\n"
-"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
-"Language-Team: Czech <cs@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"X-Poedit-Language: Czech\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Kategorie"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informace"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Ukončit"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Vyberte objekt pro zaznamenání"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Jméno adresáře"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Piouze záznam"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Ukázková data"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Jméno souboru"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Verze"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Zaznamenávání objektů"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-"Pokud myslíte, že váš modul může zajímat jiné lidi, byli bychom rádi, abyste "
-"jej zveřejnili v sekci 'Moduly' na http://www.openerp.com. Můžete to provést "
-"přes webové stránky nebo použitím schopnosti modulu 'base_module_publish'."
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Záznam od data"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Zaznamenávání modulu"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exportovat vlastní úpravy jako modul"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Předem díky za váše přispění."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Seznam objektů k záznamu"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Plný popis"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Jméno modulu"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objekty"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ".ZIP soubor modulu"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Modul úspěšně vytvořen !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "Soubor YAML úspěšně vytvořen !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Výsledek, vložte jej do xml modulu"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Vytvořeno"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Díky za použití Záznamníku modulů"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL dokumentace"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Změněno"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Zaznamenávat"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Pokračovat"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exportovat vlastní úpravy jako datový soubor"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Chyba"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Běžná data"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "OK"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Vytvoření modulu"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Typ dat"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Informace modulu"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Výsledek"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Zrušit"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Uzavřít"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Vytvořeno & upraveno"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Pokud si myslíte, že by váš modul mohl zajímat další lidi, byli bychom rádi, "
-#~ "kdybyste jej zveřejnili na OpenERP.com v sekci 'Moduly'. Můžete to provést "
-#~ "přes webové stránky nebo pomocí funkcí modulu 'base_module_publish'."
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Modul úspěšně vytvořen !"
-
-#~ msgid "Module Record"
-#~ msgstr "Záznam modulu"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Tento modul vám umožňuje vytvořit nový modul bez jakéhokoliv vývoje.\n"
-#~ "Zaznamenává všechny operace nad objekty během relace zaznamenávání a\n"
-#~ "vytváří .ZIP modul. Díky tomu můžete vytvořit váš vlastní modul přímo z\n"
-#~ "klienta OpenERP.\n"
-#~ "\n"
-#~ "Tato verze pracuje pro vytváření a aktualizaci stávajících záznamů. "
-#~ "Přepočítává\n"
-#~ "závislosti a propojuje všechny datové typy pomůcek (many2one, many2many, "
-#~ "...).\n"
-#~ "Podporuje také pracovní toky a demonstrační/aktualziační data.\n"
-#~ "\n"
-#~ "Měl by vám pomoci jednoduše vytvářet znovu použitelné a zveřejnitelné "
-#~ "moduly\n"
-#~ "pro vlastní nastavení a demonstrační/testovací data.\n"
-#~ "\n"
-#~ "Jak jej použít:\n"
-#~ "Spusťte průvodce Správa/Přizpůsobení/Vytváření modulů/Exportovat vlastní "
-#~ "úpravy jako modul.\n"
-#~ "Vyberte častoé kritéria pro záznam a objekty, které mají být zaznamenány a "
-#~ "modul záznamu.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/da.po b/addons/base_module_record/i18n/da.po
deleted file mode 100644
index f402492a4b7..00000000000
--- a/addons/base_module_record/i18n/da.po
+++ /dev/null
@@ -1,265 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-27 08:38+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr ""
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr ""
diff --git a/addons/base_module_record/i18n/de.po b/addons/base_module_record/i18n/de.po
deleted file mode 100644
index d91741b3b2f..00000000000
--- a/addons/base_module_record/i18n/de.po
+++ /dev/null
@@ -1,407 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:02+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Kategorie"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Information"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Ende"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Auswählen der aufzuzeichnenden Objekte"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Verzeichnis"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Nur Datensätze"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Demo Daten"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Dateiname"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Version"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Objekte Aufzeichnen"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-"Wenn Sie glauben, dass Ihr Modul andere interessiert, können Sie dieses auf  "
-"http://www.openerp.com in dem Kapitel Module publizieren. \r\n"
-"Sie können dies direkt auf der Web-Seite machen oder das Modul "
-"base_module_publish verwenden"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Aufzeichnen ab Datum"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Module Aufzeichnung"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Export Personalisierung als Modul"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Danke im voraus für Ihre Hilfe ."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Liste der aufzuzeichnenden Objkete"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Ausführliche Beschreibung"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Modul Bezeichnung"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objekte"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Module .zip Datei"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Modul erfolgreich erzeugt"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "YAML Datei erfolgreich erstellt !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-"Ergebnis, welches Sie als xml Fragment für Ihr Modul verwenden können."
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Erzeugt"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Danke, dass Sie dem Modul Rekorder verwendet haben."
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "Dokumentation URL"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Verändert"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Aufzeichnen"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Fortsetzen"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Export Personalisierung als Datei"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Fehler"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Normale Daten"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "OK"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Export Personalisierung"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Datentyp"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Informationen zum Modul"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Ergebnis"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Schliessen"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Erstellt & Verändert"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-#~ "beinhalten"
-
-#~ msgid "Recording Information"
-#~ msgstr "Aufnahme Information"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Start Recording"
-#~ msgstr "Aufnahme starten"
-
-#~ msgid "Not Recording"
-#~ msgstr "Keine Aufnahme"
-
-#~ msgid "Recording information"
-#~ msgstr "Aufnahme Information"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Modul erfolgreich erzeugt"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Aufzeichung angehalten"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "vorige Sitzung fortsetzen"
-
-#~ msgid "Recording"
-#~ msgstr "Aufnahme"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Modul Rekorder"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Falls Interesse besteht können Sie Ihr Modul aus OpenERP.com anderen "
-#~ "Benutzern zur Verfügung stellen."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "Der Modul Recorder erlaubt es alle Vergänge in OpenERP aufzunehmen und als "
-#~ "Modul zu speichern. Siekönnen dieses Modulein jeder anderen Datenbank "
-#~ "weiterverwendeun und/oder publizieren."
-
-#~ msgid "Record module"
-#~ msgstr "Auzeichen des Modules"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Sie können die Aufzeichnung fortsetzen, indem Sie den \"Start Aufnahme\" "
-#~ "Assistenten neu starten."
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Speichere aufgezeichnetes Modul"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "OpenERP Aufzeichnungsvorgang ist beendet. Vergessen Sie nicht das "
-#~ "aufgezeichnete Modul zu speichern."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Aufnahme stoppen"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Wenn Sie denken, dass Ihr Modul interessant für andere Benutzer sein könnte, "
-#~ "würden wir eine Veröffentlichung auf OpenERP.com begrüssen. Sie können eine "
-#~ "Veröffentlichung mit dem Modul 'base_module_publish' durchführen."
-
-#~ msgid "Module Record"
-#~ msgstr "Recorder Anwendung"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Dieses Modul ermöglicht die einfache Erstellung eines neuen Moduls ohne "
-#~ "Quellcode zu schreiben.\n"
-#~ "Es werden alle Vorgänge zu ausgewählten Objekten während einer aktiven "
-#~ "Sitzung aufgezeichnet, um\n"
-#~ "dann ein Modul in Form eines .zip Archivs zu exportieren. Somit können Sie "
-#~ "sehr einfach Ihr eigenes \n"
-#~ "Modul mit Hilfe des OpenERP Clients erstellen.\n"
-#~ "\n"
-#~ "Aufgezeichnet werden neu erstellte und/oder geänderte Datensätze. Außerdem "
-#~ "werden \n"
-#~ "abhängige Daten sowie existierende Verbindungen aktualisiert (many2one "
-#~ "Widgets, many2many Widgets, ...). \n"
-#~ "Workflows und Demo/Update Daten werden ebenfalls im Rahmen dieses Moduls "
-#~ "unterstützt.\n"
-#~ "\n"
-#~ "Diese Funktion hilft Ihnen z.B. dabei wiederverwendbare Module zu erstellen "
-#~ "und auf diesem Wege individuelle\n"
-#~ "Konfigurationen zu erstellen und diese für Demos bzw. den realen Einsatz zu "
-#~ "nutzen. \n"
-#~ "\n"
-#~ "Wie sollte das Modul angewendet werden? Starten Sie den Assistenten über das "
-#~ "Menü: \n"
-#~ "Administration/Personalisierung/Export Personalisierung/Export "
-#~ "Personalisierung als Modul\n"
-#~ "Wählen Sie dann eine Datum/Zeit Einstellung für den Export der "
-#~ "aufgezeichneten Personalisierung.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/el.po b/addons/base_module_record/i18n/el.po
deleted file mode 100644
index 23f8936236f..00000000000
--- a/addons/base_module_record/i18n/el.po
+++ /dev/null
@@ -1,354 +0,0 @@
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:06+0000\n"
-"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
-"Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"X-Poedit-Country: GREECE\n"
-"X-Poedit-Language: Greek\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Κατηγορία"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Πληροφορίες"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Τέλος"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Επιλιλέξτε τα αντικείμενα για εγγραφή"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Δημιουργός"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Όνομα Φακέλλου"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Μόνο εγγραφές"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Demo Δεδομένα"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Όνομα Αρχείου"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Έκδοση"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Εγγραφή Αντικειμένων"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Εγγραφή από Ημερ/νία"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Εγγραφή Αρθρώματος"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Αποθήκευση Προσαρμογών σε μορφή Αρθρώματος"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Ευχαριστούμε εκ των προτέρων για τη συνεισφορά σας."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Λίστα αντικειμένων προς εγγραφή"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Πλήρης Περιγραφή"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Όνομα Αρθρώματος"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Αντικείμενα"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Αρχείο .zip Αρθρώματος"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Το Άρθρωμα δημιουργήθηκε επιτυχώς!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Αποτέλεσμα, επικόλλησε αυτό στο xml του προσθέτου"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Δημιουργημένο"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Ευχαριστούμε που χρησιμοποιήσατε τον Αντιγραφέα Αρθρώματος"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL Εγχειριδίου Χρήσης"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Τροποποιημένο"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Εγγραφή"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Συνέχεια"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Εξαγωγή Παραμετροποίησης ως αρχείο"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Λάθος"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Κανονικά Δεδομένα"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "OK"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Δημιουργία Αρθρώματος"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Τύπος Δεδομένων"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Πληροφορίες Αρθρώματος"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Αποτέλεσμα"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Ακύρωση"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Κλείσιμο"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Δημιουργημένα και Τροποποιημένα"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Το όνομα πρέπει να ξεκινάει με x_ και να μην περιέχει ειδικούς χαρακτήρες!"
-
-#~ msgid "Recording Information"
-#~ msgstr "Πληροφορίες Εγγραφής"
-
-#~ msgid "Status"
-#~ msgstr "Στάδιο"
-
-#~ msgid "Start Recording"
-#~ msgstr "Έναρξη Εγγραφής"
-
-#~ msgid "Not Recording"
-#~ msgstr "Δεν αντιγράφει"
-
-#~ msgid "Recording information"
-#~ msgstr "Πληροφορίες εγγραφής"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Το Άρθρωμα δημιουργήθηκε επιτυχώς!"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Εγγραφή Σταμάτησε"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Συνέχεια Προηγουμένων"
-
-#~ msgid "Recording"
-#~ msgstr "Αντιγράφει"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Αντιγραφέας Αρθρώματος"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Αν νομίζετε ότι το Άρθρωμά σας μπορεί να ενδιαφέρει και άλλους, σας "
-#~ "παροτρύνουμε να τη δημοσιεύσετε στο OpenERP.com, στο 'Modules' section. "
-#~ "Μπορείτε να το κάνετε μέσω της ιστοσελίδας ή χρησιμοποιώντας τις λειτουργίες "
-#~ "της Ενότητας 'base_module_publish'."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "Ο Αντιγραφέας Αρθρώματος σας επιτρέπει να αντιγράψετε κάθε εργασία που "
-#~ "γίνεται μέσω του Open ERP και να την αποθηκεύσετε σαν Άρθρωμα. Μπορείτε, "
-#~ "μετά, να εγκαταστήσετε αυτό το Άρθρωμά σας σε οποιαδήποτε άλλη βάση "
-#~ "δεδομένων του Open ERP για να τη χρησιμοποιείσετε ή/και να το δημοσιεύσετε."
-
-#~ msgid "Record module"
-#~ msgstr "Εγγραφή Αρθρώματος"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Μπορείτε να συνεχίσετε την εγγραφή μέσω του οδηγού Εκκίνησης Εγγραφής."
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Αποθήκευση Εγγεγραμένου Αρθρώματος"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "Η εγγραφή έχει σταματήσει. Μπορείτε να αποθηκεύσετε το Εγγεγραμένο Άρθρωμα ."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Διακοπή Εγγραφής"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Εάν νομίζεις ότι το πρόσθετο θα ενδιαφέρει και άλλους, θα θέλαμε να το "
-#~ "δημοσιεύσουμε στο OpenERP.com, στο τμήμα 'Πρόσθετα'. Μπορείς να το κάνεις "
-#~ "είται μέσω της ιστοσελίδας ή χρησιμοποιόντας το 'base_module_publish' "
-#~ "πρόσθετο"
-
-#~ msgid "Module Record"
-#~ msgstr "Εγγραφή Προσθέτου"
diff --git a/addons/base_module_record/i18n/es.po b/addons/base_module_record/i18n/es.po
deleted file mode 100644
index b323b231bbd..00000000000
--- a/addons/base_module_record/i18n/es.po
+++ /dev/null
@@ -1,398 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:04+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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Categoría"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Información"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Finalizar"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Seleccionar los objetos a grabar"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nombre del directorio"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Sólo registros"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Datos demostración"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nombre del archivo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versión"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Grabación de objetos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Grabar desde fecha"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Grabación de módulos"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exportar personalizaciones como un módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Gracias de antemano por su contribución."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista de objetos que serán grabados"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Descripción completa"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Nombre del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objetos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Archivo .zip del módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "¡Módulo creado correctamente!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "¡Fichero YAML creado correctamente!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Resultado, pegue esto en el xml de su módulo"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Creado(s)"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Gracias por utilizar el módulo de grabación"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL documentación"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Modificado(s)"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Grabar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Continuar"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exportar personalizaciones como un fichero de datos"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Datos normales"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Aceptar"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Creación del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tipo de datos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Información del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Resultado"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Creado(s) y Modificado(s)"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Recording Information"
-#~ msgstr "Información de la grabación"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Start Recording"
-#~ msgstr "Iniciar la grabación"
-
-#~ msgid "Not Recording"
-#~ msgstr "No grabando"
-
-#~ msgid "Recording information"
-#~ msgstr "Información de la grabación"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "¡Módulo creado correctamente!"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Grabación detenida"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Continuar sesión previa"
-
-#~ msgid "Recording"
-#~ msgstr "Grabando"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Grabadora de módulos"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Si cree que su módulo puede interesar a otros, nos gustaría que lo publicara "
-#~ "en OpenERP.com, en la sección de 'Módulos'. Lo puede hacer a través del "
-#~ "sitio web o utilizando las funcionalidades del módulo 'base_module_publish'."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "La grabadora de módulos le permite registrar todas las operaciones hechas en "
-#~ "el cliente de OpenERP y guardarlas como un módulo. Podrá instalar este "
-#~ "módulo en cualquier base de datos para reutilizarlo y/o publicarlo."
-
-#~ msgid "Record module"
-#~ msgstr "Módulo de grabación"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Puede continuar la sesión de grabación volviendo a ejecutar el asistente "
-#~ "'Iniciar grabación'."
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Guardar módulo grabado"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "La grabación de OpenERP está detenida. No olvide guardar el módulo grabado."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Detener la grabación"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Si cree que su módulo podría interesar a otras personas, nos gustaría que lo "
-#~ "publique en OpenERP.com, en la sección 'Módulos'. Puede hacerlo a través de "
-#~ "la página web o usando las características del módulo 'base_module_publish'."
-
-#~ msgid "Module Record"
-#~ msgstr "Grabador de módulos"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo le permite crear un nuevo módulo sin ningún tipo de desarrollo.\n"
-#~ "Graba todas las operaciones sobre los objetos durante la sesión de grabación "
-#~ "y\n"
-#~ "produce un módulo. ZIP. De esta forma puede crear su propio módulo "
-#~ "directamente\n"
-#~ "desde el cliente de OpenERP.\n"
-#~ "\n"
-#~ "Esta versión funciona para crear y actualizar los registros existentes. "
-#~ "Recalcula\n"
-#~ "dependencias y enlaces para todo tipo de widgets (many2one, many2many, "
-#~ "...).\n"
-#~ "También soporta flujos de trabajo y datos de demostración/actualización.\n"
-#~ "\n"
-#~ "Esto le ayudará a crear fácilmente módulos reutilizables y publicables\n"
-#~ "para las configuraciones personalizadas y datos de demostración/prueba.\n"
-#~ "\n"
-#~ "Cómo utilizarlo:\n"
-#~ "Ejecute Administración/Personalización/Creación de módulos/Exportar "
-#~ "personalizaciones como un asistente de módulo.\n"
-#~ "Seleccione la fecha y hora de grabación y los objetos que se grabarán y "
-#~ "Grabar módulo.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/es_AR.po b/addons/base_module_record/i18n/es_AR.po
deleted file mode 100644
index ac65f7c5211..00000000000
--- a/addons/base_module_record/i18n/es_AR.po
+++ /dev/null
@@ -1,339 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-09-22 15:17+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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Categoría"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Información"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Seleccionar los objetos a registrar"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nombre del directorio"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Sólo registros"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Datos demostración"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nombre del archivo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versión"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Grabación de objetos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Registrar desde la fecha"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Módulo de grabación"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exportar personalizaciones como un módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Gracias de antemano por su contribución."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista de objetos a grabar"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Descripción completa"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Nombre del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objetos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Archivo .zip del módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Creado"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Gracias por utilizar el módulo de grabación"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL documentación"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Modificado"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Registro"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Continuar"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Datos normales"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Aceptar"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Creación del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tipo de datos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Información del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Creado & Modificado"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
-#~ "especial!"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "¡Módulo creado exitosamente!"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Si cree que su módulo puede interesar a otros, nos gustaría que lo publicara "
-#~ "en OpenERP.com, en la sección de 'Módulos'. Lo puede hacer a través del "
-#~ "sitio web o utilizando las funcionalidades del módulo 'base_module_publish'."
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Continuar sesión anterior"
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Guardar módulo grabado"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "La grabación de OpenERP está detenida. No olvide guardar el módulo grabado."
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Puede continuar la sesión de grabación volviendo a ejecutar el asistente "
-#~ "'Iniciar grabación'."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Detener la grabación"
-
-#~ msgid "Recording Information"
-#~ msgstr "Información de la grabación"
-
-#~ msgid "Start Recording"
-#~ msgstr "Iniciar la grabación"
-
-#~ msgid "Not Recording"
-#~ msgstr "No grabando"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Grabación detenida"
-
-#~ msgid "Recording information"
-#~ msgstr "Información de la grabación"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Modulo de grabación"
-
-#~ msgid "Recording"
-#~ msgstr "Grabación"
-
-#~ msgid "Record module"
-#~ msgstr "Módulo de grabación"
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "El modulo de grabación le permite registrar todas las operaciones hechas en "
-#~ "el cliente de OpenERP y guardarlas como un módulo. Podrá instalar este "
-#~ "módulo en cualquier base de datos para reutilizarlo y/o publicarlo."
diff --git a/addons/base_module_record/i18n/es_CR.po b/addons/base_module_record/i18n/es_CR.po
deleted file mode 100644
index a34582c4334..00000000000
--- a/addons/base_module_record/i18n/es_CR.po
+++ /dev/null
@@ -1,282 +0,0 @@
-# Spanish 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: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-15 17:14+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"Language: es\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Categoría"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Información"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Finalizar"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Seleccionar los objetos a grabar"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nombre de directorio"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Sólo registros"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Datos demostración"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nombre del fichero"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versión"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Grabación de objetos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-"Si usted piensa que sus personas de interés Otros módulos se pudo, nos "
-"gustaría que usted lo publique en http://www.openerp.com, en la sección de "
-"'módulos'. Usted puede hacerlo a través de la página web o el uso de las "
-"características de la 'base_module_publish' módulo."
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Grabar desde fecha"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Grabación de módulos"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exportar personalizaciones como un módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Gracias de antemano por su contribución."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista de objetos que serán grabados"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Descripción completa"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Nombre del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objetos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Archivo .zip del módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "¡Fichero YAML creado correctamente!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Resultado, pegue esto en el xml de su módulo"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Creado"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Gracias por utilizar el módulo de grabación"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL documentación"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Modificado"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Registro"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Siguiente"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exportar personalizaciones como un fichero de datos"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Datos normales"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Aceptar"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Creación del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tipo de datos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Información del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Resultado"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Cerrado"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Creado(s) y Modificado(s)"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "El nombre del objeto debe comenzar por x_ y no contener ningún símbolo "
-#~ "especial"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "¡Módulo creado correctamente!"
diff --git a/addons/base_module_record/i18n/es_EC.po b/addons/base_module_record/i18n/es_EC.po
deleted file mode 100644
index 60b576c9e9f..00000000000
--- a/addons/base_module_record/i18n/es_EC.po
+++ /dev/null
@@ -1,397 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-13 04:05+0000\n"
-"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Categoría"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Información"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Finalizar"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Seleccionar los objetos a grabar"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nombre del directorio"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Sólo registros"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Datos demostración"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nombre del archivo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versión"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Grabación de objetos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Grabar desde fecha"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Grabación de módulos"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exportar personalizaciones como un módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Gracias de antemano por su contribución."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista de objetos que serán grabados"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Descripción completa"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Nombre del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objetos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Archivo .zip del módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "¡Fichero YAML creado correctamente!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Resultado, pegue esto en el xml de su módulo"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Creado(s)"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Gracias por utilizar el módulo de grabación"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL documentación"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Modificado(s)"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Grabar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Continuar"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exportar personalizaciones como un fichero de datos"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Datos normales"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Aceptar"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Creación del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tipo de datos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Información del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Resultado"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Cerrado"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Creado(s) & Modificado(s)"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Recording Information"
-#~ msgstr "Información de la grabación"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Start Recording"
-#~ msgstr "Iniciar la grabación"
-
-#~ msgid "Not Recording"
-#~ msgstr "No grabando"
-
-#~ msgid "Recording information"
-#~ msgstr "Información de la grabación"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "¡Módulo creado correctamente!"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Grabación detenida"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Continuar sesión previa"
-
-#~ msgid "Recording"
-#~ msgstr "Grabando"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Grabadora de módulos"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Si cree que su módulo puede interesar a otros, nos gustaría que lo publicara "
-#~ "en OpenERP.com, en la sección de 'Módulos'. Lo puede hacer a través del "
-#~ "sitio web o utilizando las funcionalidades del módulo 'base_module_publish'."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "La grabadora de módulos le permite registrar todas las operaciones hechas en "
-#~ "el cliente de OpenERP y guardarlas como un módulo. Podrá instalar este "
-#~ "módulo en cualquier base de datos para reutilizarlo y/o publicarlo."
-
-#~ msgid "Record module"
-#~ msgstr "Módulo de grabación"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Puede continuar la sesión de grabación volviendo a ejecutar el asistente "
-#~ "'Iniciar grabación'."
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Guardar módulo grabado"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "La grabación de OpenERP está detenida. No olvide guardar el módulo grabado."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Detener la grabación"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Si cree que su módulo podría interesar a otras personas, nos gustaría que lo "
-#~ "publique en OpenERP.com, en la sección 'Módulos'. Puede hacerlo a través de "
-#~ "la página web o usando las características del módulo 'base_module_publish'."
-
-#~ msgid "Module Record"
-#~ msgstr "Grabador de módulos"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo le permite crear un nuevo módulo sin ningún tipo de desarrollo.\n"
-#~ "Graba todas las operaciones sobre los objetos durante la sesión de grabación "
-#~ "y\n"
-#~ "produce un módulo. ZIP. De esta forma puede crear su propio módulo "
-#~ "directamente\n"
-#~ "desde el cliente de OpenERP.\n"
-#~ "\n"
-#~ "Esta versión funciona para crear y actualizar los registros existentes. "
-#~ "Recalcula\n"
-#~ "dependencias y enlaces para todo tipo de widgets (many2one, many2many, "
-#~ "...).\n"
-#~ "También soporta flujos de trabajo y datos de demostración/actualización.\n"
-#~ "\n"
-#~ "Esto le ayudará a crear fácilmente módulos reutilizables y publicables\n"
-#~ "para las configuraciones personalizadas y datos de demostración/prueba.\n"
-#~ "\n"
-#~ "Cómo utilizarlo:\n"
-#~ "Ejecute Administración/Personalización/Creación de módulos/Exportar "
-#~ "personalizaciones como un asistente de módulo.\n"
-#~ "Seleccione la fecha y hora de grabación y los objetos que se grabarán y "
-#~ "Grabar módulo.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/es_MX.po b/addons/base_module_record/i18n/es_MX.po
deleted file mode 100644
index 0b24fc5561a..00000000000
--- a/addons/base_module_record/i18n/es_MX.po
+++ /dev/null
@@ -1,393 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-27 09:19+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: 2011-09-05 05:10+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Categoría"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Información"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest others people, we'd like you to "
-"publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-"the website or using features of the 'base_module_publish' module."
-msgstr ""
-"Si cree que su módulo podría interesar a otras personas, nos gustaría que lo "
-"publique en OpenERP.com, en la sección 'Módulos'. Puede hacerlo a través de "
-"la página web o usando las características del módulo 'base_module_publish'."
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Finalizar"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Seleccionar los objetos a grabar"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nombre del directorio"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Sólo registros"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Datos demostración"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nombre del archivo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versión"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Grabación de objetos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Grabar desde fecha"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Grabación de módulos"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exportar personalizaciones como un módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Gracias de antemano por su contribución."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista de objetos que serán grabados"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Descripción completa"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Nombre del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objetos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Archivo .zip del módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "¡Módulo creado correctamente!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "¡Fichero YAML creado correctamente!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Resultado, pegue esto en el xml de su módulo"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Creado(s)"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Gracias por utilizar el módulo de grabación"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL documentación"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Modificado(s)"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Grabar"
-
-#. module: base_module_record
-#: model:ir.module.module,shortdesc:base_module_record.module_meta_information
-msgid "Module Record"
-msgstr "Grabador de módulos"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Continuar"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exportar personalizaciones como un fichero de datos"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Datos normales"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Aceptar"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Creación del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tipo de datos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Información del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Resultado"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Creado(s) y Modificado(s)"
-
-#. module: base_module_record
-#: model:ir.module.module,description:base_module_record.module_meta_information
-msgid ""
-"\n"
-"This module allows you to create a new module without any development.\n"
-"It records all operations on objects during the recording session and\n"
-"produce a .ZIP module. So you can create your own module directly from\n"
-"the OpenERP client.\n"
-"\n"
-"This version works for creating and updating existing records. It "
-"recomputes\n"
-"dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-"It also support workflows and demo/update data.\n"
-"\n"
-"This should help you to easily create reusable and publishable modules\n"
-"for custom configurations and demo/testing data.\n"
-"\n"
-"How to use it:\n"
-"Run Administration/Customization/Module Creation/Export Customizations As a "
-"Module wizard.\n"
-"Select datetime criteria of recording and objects to be recorded and Record "
-"module.\n"
-"    "
-msgstr ""
-"\n"
-"Este módulo le permite crear un nuevo módulo sin ningún tipo de desarrollo.\n"
-"Graba todas las operaciones sobre los objetos durante la sesión de grabación "
-"y\n"
-"produce un módulo. ZIP. De esta forma puede crear su propio módulo "
-"directamente\n"
-"desde el cliente de OpenERP.\n"
-"\n"
-"Esta versión funciona para crear y actualizar los registros existentes. "
-"Recalcula\n"
-"dependencias y enlaces para todo tipo de widgets (many2one, many2many, "
-"...).\n"
-"También soporta flujos de trabajo y datos de demostración/actualización.\n"
-"\n"
-"Esto le ayudará a crear fácilmente módulos reutilizables y publicables\n"
-"para las configuraciones personalizadas y datos de demostración/prueba.\n"
-"\n"
-"Cómo utilizarlo:\n"
-"Ejecute Administración/Personalización/Creación de módulos/Exportar "
-"personalizaciones como un asistente de módulo.\n"
-"Seleccione la fecha y hora de grabación y los objetos que se grabarán y "
-"Grabar módulo.\n"
-"    "
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Recording Information"
-#~ msgstr "Información de la grabación"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Start Recording"
-#~ msgstr "Iniciar la grabación"
-
-#~ msgid "Not Recording"
-#~ msgstr "No grabando"
-
-#~ msgid "Recording information"
-#~ msgstr "Información de la grabación"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Grabación detenida"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Continuar sesión previa"
-
-#~ msgid "Recording"
-#~ msgstr "Grabando"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Grabadora de módulos"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Si cree que su módulo puede interesar a otros, nos gustaría que lo publicara "
-#~ "en OpenERP.com, en la sección de 'Módulos'. Lo puede hacer a través del "
-#~ "sitio web o utilizando las funcionalidades del módulo 'base_module_publish'."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "La grabadora de módulos le permite registrar todas las operaciones hechas en "
-#~ "el cliente de OpenERP y guardarlas como un módulo. Podrá instalar este "
-#~ "módulo en cualquier base de datos para reutilizarlo y/o publicarlo."
-
-#~ msgid "Record module"
-#~ msgstr "Módulo de grabación"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Puede continuar la sesión de grabación volviendo a ejecutar el asistente "
-#~ "'Iniciar grabación'."
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Guardar módulo grabado"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "La grabación de OpenERP está detenida. No olvide guardar el módulo grabado."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Detener la grabación"
diff --git a/addons/base_module_record/i18n/es_PY.po b/addons/base_module_record/i18n/es_PY.po
deleted file mode 100644
index 7c1e527fede..00000000000
--- a/addons/base_module_record/i18n/es_PY.po
+++ /dev/null
@@ -1,326 +0,0 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-03-08 17:48+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Categoría"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Información"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Finalizar"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Seleccionar los objetos a grabar"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nombre del directorio"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Sólo registros"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Datos demostración"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nombre del archivo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versión"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Grabación de objetos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Grabar desde fecha"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Grabación de módulos"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exportar personalizaciones como un módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Gracias de antemano por su contribución."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista de objetos que serán grabados"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Descripción completa"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Nombre del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objetos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Archivo .zip del módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "¡Fichero YAML creado correctamente!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Resultado, pegue esto en el xml de su módulo"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Creado"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Gracias por utilizar el módulo de grabación"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL documentación"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Modificado(s)"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Grabar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Continuar"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exportar personalizaciones como un fichero de datos"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Error!"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Datos normales"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Aceptar"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Creación del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tipo de datos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Información del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Resultados"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Creado(s) y Modificado(s)"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Si cree que su módulo podría interesar a otras personas, nos gustaría que lo "
-#~ "publique en OpenERP.com, en la sección 'Módulos'. Puede hacerlo a través de "
-#~ "la página web o usando las características del módulo 'base_module_publish'."
-
-#~ msgid "Module successfully created !"
-#~ msgstr "¡Módulo creado correctamente!"
-
-#~ msgid "Module Record"
-#~ msgstr "Grabador de módulos"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo le permite crear un nuevo módulo sin ningún tipo de desarrollo.\n"
-#~ "Graba todas las operaciones sobre los objetos durante la sesión de grabación "
-#~ "y\n"
-#~ "produce un módulo. ZIP. De esta forma puede crear su propio módulo "
-#~ "directamente\n"
-#~ "desde el cliente de OpenERP.\n"
-#~ "\n"
-#~ "Esta versión funciona para crear y actualizar los registros existentes. "
-#~ "Recalcula\n"
-#~ "dependencias y enlaces para todo tipo de widgets (many2one, many2many, "
-#~ "...).\n"
-#~ "También soporta flujos de trabajo y datos de demostración/actualización.\n"
-#~ "\n"
-#~ "Esto le ayudará a crear fácilmente módulos reutilizables y publicables\n"
-#~ "para las configuraciones personalizadas y datos de demostración/prueba.\n"
-#~ "\n"
-#~ "Cómo utilizarlo:\n"
-#~ "Ejecute Administración/Personalización/Creación de módulos/Exportar "
-#~ "personalizaciones como un asistente de módulo.\n"
-#~ "Seleccione la fecha y hora de grabación y los objetos que se grabarán y "
-#~ "Grabar módulo.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/es_VE.po b/addons/base_module_record/i18n/es_VE.po
deleted file mode 100644
index 0b24fc5561a..00000000000
--- a/addons/base_module_record/i18n/es_VE.po
+++ /dev/null
@@ -1,393 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-27 09:19+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: 2011-09-05 05:10+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Categoría"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Información"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest others people, we'd like you to "
-"publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-"the website or using features of the 'base_module_publish' module."
-msgstr ""
-"Si cree que su módulo podría interesar a otras personas, nos gustaría que lo "
-"publique en OpenERP.com, en la sección 'Módulos'. Puede hacerlo a través de "
-"la página web o usando las características del módulo 'base_module_publish'."
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Finalizar"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Seleccionar los objetos a grabar"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nombre del directorio"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Sólo registros"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Datos demostración"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nombre del archivo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versión"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Grabación de objetos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Grabar desde fecha"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Grabación de módulos"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exportar personalizaciones como un módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Gracias de antemano por su contribución."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista de objetos que serán grabados"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Descripción completa"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Nombre del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objetos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Archivo .zip del módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "¡Módulo creado correctamente!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "¡Fichero YAML creado correctamente!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Resultado, pegue esto en el xml de su módulo"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Creado(s)"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Gracias por utilizar el módulo de grabación"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL documentación"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Modificado(s)"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Grabar"
-
-#. module: base_module_record
-#: model:ir.module.module,shortdesc:base_module_record.module_meta_information
-msgid "Module Record"
-msgstr "Grabador de módulos"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Continuar"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exportar personalizaciones como un fichero de datos"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Datos normales"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Aceptar"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Creación del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tipo de datos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Información del módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Resultado"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Creado(s) y Modificado(s)"
-
-#. module: base_module_record
-#: model:ir.module.module,description:base_module_record.module_meta_information
-msgid ""
-"\n"
-"This module allows you to create a new module without any development.\n"
-"It records all operations on objects during the recording session and\n"
-"produce a .ZIP module. So you can create your own module directly from\n"
-"the OpenERP client.\n"
-"\n"
-"This version works for creating and updating existing records. It "
-"recomputes\n"
-"dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-"It also support workflows and demo/update data.\n"
-"\n"
-"This should help you to easily create reusable and publishable modules\n"
-"for custom configurations and demo/testing data.\n"
-"\n"
-"How to use it:\n"
-"Run Administration/Customization/Module Creation/Export Customizations As a "
-"Module wizard.\n"
-"Select datetime criteria of recording and objects to be recorded and Record "
-"module.\n"
-"    "
-msgstr ""
-"\n"
-"Este módulo le permite crear un nuevo módulo sin ningún tipo de desarrollo.\n"
-"Graba todas las operaciones sobre los objetos durante la sesión de grabación "
-"y\n"
-"produce un módulo. ZIP. De esta forma puede crear su propio módulo "
-"directamente\n"
-"desde el cliente de OpenERP.\n"
-"\n"
-"Esta versión funciona para crear y actualizar los registros existentes. "
-"Recalcula\n"
-"dependencias y enlaces para todo tipo de widgets (many2one, many2many, "
-"...).\n"
-"También soporta flujos de trabajo y datos de demostración/actualización.\n"
-"\n"
-"Esto le ayudará a crear fácilmente módulos reutilizables y publicables\n"
-"para las configuraciones personalizadas y datos de demostración/prueba.\n"
-"\n"
-"Cómo utilizarlo:\n"
-"Ejecute Administración/Personalización/Creación de módulos/Exportar "
-"personalizaciones como un asistente de módulo.\n"
-"Seleccione la fecha y hora de grabación y los objetos que se grabarán y "
-"Grabar módulo.\n"
-"    "
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Recording Information"
-#~ msgstr "Información de la grabación"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Start Recording"
-#~ msgstr "Iniciar la grabación"
-
-#~ msgid "Not Recording"
-#~ msgstr "No grabando"
-
-#~ msgid "Recording information"
-#~ msgstr "Información de la grabación"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Grabación detenida"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Continuar sesión previa"
-
-#~ msgid "Recording"
-#~ msgstr "Grabando"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Grabadora de módulos"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Si cree que su módulo puede interesar a otros, nos gustaría que lo publicara "
-#~ "en OpenERP.com, en la sección de 'Módulos'. Lo puede hacer a través del "
-#~ "sitio web o utilizando las funcionalidades del módulo 'base_module_publish'."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "La grabadora de módulos le permite registrar todas las operaciones hechas en "
-#~ "el cliente de OpenERP y guardarlas como un módulo. Podrá instalar este "
-#~ "módulo en cualquier base de datos para reutilizarlo y/o publicarlo."
-
-#~ msgid "Record module"
-#~ msgstr "Módulo de grabación"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Puede continuar la sesión de grabación volviendo a ejecutar el asistente "
-#~ "'Iniciar grabación'."
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Guardar módulo grabado"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "La grabación de OpenERP está detenida. No olvide guardar el módulo grabado."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Detener la grabación"
diff --git a/addons/base_module_record/i18n/et.po b/addons/base_module_record/i18n/et.po
deleted file mode 100644
index 30a6681ae0f..00000000000
--- a/addons/base_module_record/i18n/et.po
+++ /dev/null
@@ -1,337 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:07+0000\n"
-"Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Kategooria"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informatsioon"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Vali objektid salvestamiseks"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Kataloogi nimi"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Ainult kirjed"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Näidisandmed"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Faili nimi"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versioon"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Objektide salvestamine"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Salvestus alates kuupäevast:"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Mooduli salvestamine"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Eksprodi kohandamised moodulina"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Tänud ette sinu panuse eest."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Nimekiri salvestatavatest objektidest"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Täielik kirjeldus"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Mooduli nimi"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objektid"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Mooduli .zip fail"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Moodul edukalt loodud!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Loodud"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Tänud mooduli salvestaja kasutamise eest"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "Dokumentatsiooni URL"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Muudetud"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Salvestus"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Jätka"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Normaalandmed"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Olgu"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Mooduli loomine"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Andmetüüp"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Mooduli informatsioon"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Loobu"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Sulge"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Loodud ja muudetud"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
-
-#~ msgid "Recording Information"
-#~ msgstr "Salvestamise informatsioon"
-
-#~ msgid "Status"
-#~ msgstr "Olek"
-
-#~ msgid "Start Recording"
-#~ msgstr "Alusta salvestamist"
-
-#~ msgid "Not Recording"
-#~ msgstr "Ei salvesta"
-
-#~ msgid "Recording information"
-#~ msgstr "Salvestamise informatsioon"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Moodul edukalt loodud!"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Salvestamine lõppenud"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Jätka eelmist seanssi"
-
-#~ msgid "Recording"
-#~ msgstr "Salvestamine"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Mooduli salvestaja"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Kui sa arvad, et su moodul võiks huvitada teisi inimesi, siis soovime et sa "
-#~ "avaldaksid selle OpenERP.com 'Moodulid' sektsioonis. Sa saad teha seda läbi "
-#~ "veebilehe või kasutades 'base_module_publish' mooduli võimalusi."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "Mooduli salvestaja võimaldab sul salvestada kõik operatsioonid, mis Open ERP "
-#~ "kliendis tehtud, ja salvestada neid moodulina. Sul on võimalik paigaldada "
-#~ "seda moodulit igale andmebaasile, et kasutada uuesti  ja/või avaldada seda."
-
-#~ msgid "Record module"
-#~ msgstr "Salvesta moodul"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Sa saad jätkata salvestamise seanssi taaskäivitades 'alusta salvestamist' "
-#~ "nõustaja."
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Salvesta salvestatud moodul"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr "Open ERP salvestamine on lõppenud. Ära unusta moodulit salvestada."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Peata salvestamine"
diff --git a/addons/base_module_record/i18n/fa.po b/addons/base_module_record/i18n/fa.po
deleted file mode 100644
index 9cdfee7cdba..00000000000
--- a/addons/base_module_record/i18n/fa.po
+++ /dev/null
@@ -1,265 +0,0 @@
-# Persian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-12-19 09:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Persian <fa@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr ""
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr ""
diff --git a/addons/base_module_record/i18n/fi.po b/addons/base_module_record/i18n/fi.po
deleted file mode 100644
index 166b6de7962..00000000000
--- a/addons/base_module_record/i18n/fi.po
+++ /dev/null
@@ -1,339 +0,0 @@
-# Finnish 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:26+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Kategoria"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Tiedot"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Loppu"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Valitse objekteja tallennukseen"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Laatija"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Hakemiston nimi"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Vain tallennukset"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Demotieto (data)"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Tiedoston nimi"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versio"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Objektien tallentaminen"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Päivämäärän tallenteet"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Moduulitallennus"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Vie kustomoinnit moduulina"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Kiitos jo etukäteen panoksestasi."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista objekteista jotka tallennetaan"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Koko kuvaus"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Moduulin nimi"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objektit"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Moduuli .zip-tiedostona"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Moduulin luotu onnistuneesti !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "YAML tiedosto luotu onnistuneesti !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Tulos, liitä tämä moduulisi xml:ään!"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Luotu"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Kiitos, että käytit moduuli nauhuria"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "Dokumentaatio URL"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Muokattu"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Nauhoita"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Jatka"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Vie kustomoinnin datatiedostona"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Virhe"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Normaalit tiedot"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "OK"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Moduulin luonti"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tiedon tyyppi"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Moduulin tiedot"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Tulos"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Peruuta"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Sulje"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Luotu ja muokattu"
-
-#~ msgid "Start Recording"
-#~ msgstr "Aloita nauhoitus"
-
-#~ msgid "Status"
-#~ msgstr "Tila"
-
-#~ msgid "Not Recording"
-#~ msgstr "Nauhoitus ei ole käynnissä"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Nauhoitus lopetettu"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Moduulin luotu onnistuneesti !"
-
-#~ msgid "Recording information"
-#~ msgstr "Nauhoituksen tiedot"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Moduuli nauhuri"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Jatka edellistä istuntoa"
-
-#~ msgid "Recording"
-#~ msgstr "Nauhoittaa"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Voit jatkaa nauhoitus sessiota käynnistämällä 'Aloita nauhoitus' -toiminto "
-#~ "uudelleen."
-
-#~ msgid "Record module"
-#~ msgstr "Nauhoita moduuli"
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Tallenna nauhoitettu moduuli"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "Open ERP nauhoitus on pysäytetty. Älä unohda tallentaa nauhoitettua moduulia."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Lopeta nauhoitus"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
-
-#~ msgid "Recording Information"
-#~ msgstr "Tallennuksen tiedot"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Jos luulet, että tekemäsi moduuli kiinnostaa muita käyttäjiä, haluaisimme "
-#~ "että julkaiset sen OpenERP.com:ssa, \"Modules\" -osiossa. Voit tehdä sen "
-#~ "kotisivulta käyttäen \"base_module_publish\" -moduulin ominaisuuksia."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "Moduulitallentaja sallii sinun nauhoittavan/tallentavan kaikki toiminnot, "
-#~ "jotka on tehty OpenERP -asiakasohjelmalla ja tallentavan ne moduuliksi. "
-#~ "SInun on mahdollista asentaa tämä moduuli mihin tahansa tietokantaan "
-#~ "uudelleenkäyttöä varten ja/tai voit julkaista sen."
diff --git a/addons/base_module_record/i18n/fr.po b/addons/base_module_record/i18n/fr.po
deleted file mode 100644
index c98469cca80..00000000000
--- a/addons/base_module_record/i18n/fr.po
+++ /dev/null
@@ -1,408 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:12+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Catégorie"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informations"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Fin"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Choisissez les objets à enregistrer"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Auteur"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nom du répertoire"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Enregistrements seulement"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Données de démo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nom du fichier"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Version"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Enregistrements des objets"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-"Si vous pensez que votre module peut intéresser d'autres personnes, nous "
-"aimerions que vous le publiez sur http://www.openerp.com, dans la section  "
-"'http://apps.openerp.com/send_branch/'. Vous pouvez le faire par "
-"l'intermédiaire du site Web ou en utilisant le module "
-"\"base_module_publish\"."
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Enregistrer depuis une date"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Enregistrement du module"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exporter le paramétrage sous forme de module"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Merci d'avance pour votre contribution."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Liste des objets à enregistrer"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Description complète"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Nom du module"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objets"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Fichier zip du Module"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Module créé avec succès !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "Fichier YAML créé avec succès !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Résultat ; copier ceci dans le code XML de votre module."
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Créé"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Merci d'avoir utiliser l'enregistreur de module"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "Lien vers la documentation"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Modifié"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Enregistrement"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Continuer"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exporter les paramètrages en tant que fichier de données"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Erreur"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Données normales"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "OK"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Création de module"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Type de données"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Informations sur le module"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Résultat"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Fermer"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Créé et modifié"
-
-#~ msgid "Recording Information"
-#~ msgstr "Information sur l'Enregistrement"
-
-#~ msgid "Status"
-#~ msgstr "État"
-
-#~ msgid "Start Recording"
-#~ msgstr "Démarrer l'enregistrement"
-
-#~ msgid "Not Recording"
-#~ msgstr "Enregistrement en pause"
-
-#~ msgid "Recording information"
-#~ msgstr "Information sur l'Enregistrement"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Module créé avec succès !"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Enregistrement arreté"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Continuer la Session Précédente"
-
-#~ msgid "Recording"
-#~ msgstr "Enregistrement"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Module Enregisteur"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Si vous pensez que votre module peut interresser d'autres personnes, nou "
-#~ "aimerions que vous le publiez sur OpenERP.com dans la section 'Modules'. "
-#~ "Vous pouvez le faire par le site internet ou en utilisant les "
-#~ "fonctionnalités du module 'base_module_publish'."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "Le module recorder vous permet d'enregistrer toutes les manipulations "
-#~ "effectuées dans le client OpenERP et de sauvegarder le tout dans un module. "
-#~ "Vous serez capable d'installer ce module sur toutes vos bases de données "
-#~ "et/ou de le publier."
-
-#~ msgid "Record module"
-#~ msgstr "Enregistrer le Module"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Vous pouvez continuer la session d'enregistrement en relançant l'assisant "
-#~ "\"Commencer l'enregistrement\""
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Sauvegarder le Module Enregistré"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "L'enregistrement OpenERP est arreté. N'oublier pas de sauvegarder le module "
-#~ "enregistré."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Arrêter l'enregistrement"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Si vous pensez que votre module peut intéresser d'autres personnes, nous "
-#~ "souhaiterions que vous le publiiez sur OpenERP.com dans la rubrique "
-#~ "\"Modules\". Vous pouvez le faire sur le site web ou en utilisant le module "
-#~ "\"base_module_publish\"."
-
-#~ 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 contenir aucun caractère "
-#~ "spécial !"
-
-#~ msgid "Module Record"
-#~ msgstr "Enregistrement de module"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Ce module vous permet de créer un nouveau module sans aucun développement.\n"
-#~ "Il enregistre toutes les opérations sur les objets durant la session "
-#~ "d'enregistrement\n"
-#~ "et produit un module .ZIP. Vous pouvez donc créer votre propre module "
-#~ "directement\n"
-#~ "depuis OpenERP.\n"
-#~ "\n"
-#~ "Cette version fonctionne pour la création et la modification "
-#~ "d'enregistrements existants.\n"
-#~ "Elle recalcule les dépendances et les liens pour tous les types de widgets "
-#~ "(many2one,\n"
-#~ "many2many, ...).\n"
-#~ "Elle supporte aussi les workflows et les données de démo et de mise-à-jour.\n"
-#~ "\n"
-#~ "Ceci devrait vous aider à créer des modules réutilisables et publiables pour "
-#~ "des \n"
-#~ "configurations personnalisées et des données de démo et de test.\n"
-#~ "\n"
-#~ "Comment l'utiliser :\n"
-#~ "Exécutez l'assistant Administration/Paramétrage/Création de module/Exporter "
-#~ "les paramétrages comme module.\n"
-#~ "Sélectionnez une date d'enregistrement, les objets à enregistrer et "
-#~ "enregistrez le module.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/gl.po b/addons/base_module_record/i18n/gl.po
deleted file mode 100644
index 2c787a5f6b5..00000000000
--- a/addons/base_module_record/i18n/gl.po
+++ /dev/null
@@ -1,397 +0,0 @@
-# translation of base-module-record-gl.po to Galego
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: base-module-record-gl\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:31+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Galego <g11n@mancomun.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Categoría"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Información"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Final"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Seleccionar os obxectos a gravar"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nome do directorio"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Só rexistros"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Datos demostración"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nome do ficheiro"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versión"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Gravación de obxectos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Gravar desde data"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Gravación de módulos"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exportar personalizacións coma un módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Graciñas de antemán pola súa contribución."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista de obxectos que serán gravados"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Descrición completa"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Nome do módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Obxectos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Archivo .zip do módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "¡Módulo creado correctamente!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "¡Arquivo YAML creado satisfactoriamente!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Resultado, pegar isto ó xml do seu módulo"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Creado(s)"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Graciñas por usar o módulo de gravación"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL documentación"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Modificado(s)"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Gravar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Continuar"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exportar as Personalizacións Como Datos do Arquivo"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Erro"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Datos normais"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Aceptar"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Creación do módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tipo de datos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Información do módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Resultado"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Pechar"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Creado(s) e modificado(s)"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡O nome do obxecto debe comezar con x_ y e non conter ningún carácter "
-#~ "especial!"
-
-#~ msgid "Recording Information"
-#~ msgstr "Información da gravación"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Start Recording"
-#~ msgstr "Iniciar a gravación"
-
-#~ msgid "Not Recording"
-#~ msgstr "Non se está a gravar"
-
-#~ msgid "Recording information"
-#~ msgstr "Información da gravación"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "¡Módulo creado correctamente!"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Gravación detida"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Continuar sesión anterior"
-
-#~ msgid "Recording"
-#~ msgstr "Gravando"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Gravadora de módulos"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Se cre que o seu módulo pode interesar a outros, gustaríanos que o publicara "
-#~ "en OpenERP.com, na sección de 'Módulos'. Pódeo facer a través do sitio web "
-#~ "ou usando as funcionalidades do módulo 'base_module_publish'."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "A gravadora de módulos permítelle rexistrar todas as operacións feitas no "
-#~ "cliente de OpenERP e gardalas coma un módulo. Poderá instalar este módulo en "
-#~ "calquera base de datos para reutilizalo e/ou publicalo."
-
-#~ msgid "Record module"
-#~ msgstr "Módulo de gravación"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Pode continuar a sesión de gravación volvendo a executar o asistente "
-#~ "'Iniciar gravación'."
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Gardar módulo gravado"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "A gravación de OpenERP está detida. Non olvide gardar o módulo gravado."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Deter a gravación"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Se pensa que o seu módulo pode interesar a outras persoas, gustaríanos "
-#~ "publicalo en OpenERP.com, na sección 'Módulos'. Pode facelo a través do "
-#~ "sitio web ou utilizando os recursos do módulo 'base_module_publish."
-
-#~ msgid "Module Record"
-#~ msgstr "Rexistro do Módulo"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo permítelle crear un novo módulo sen ningún desenvolvemento.\n"
-#~ "Rexistra todas as operacións sobre os obxectos durante a sesión de rexistro "
-#~ "e\n"
-#~ "producir un módulo .ZIP. Así pode crear o seu propio módulo directamente\n"
-#~ "dende o cliente de OpenERP.\n"
-#~ "\n"
-#~ "Esta versión traballa para crear e actualizar rexistros existentes. É "
-#~ "recalcula\n"
-#~ "dependencias e enlaza para todo tipo de widgets (many2one, many2many, ...).\n"
-#~ "Tamén permite fluxos de traballo e datos de demostración/actualización.\n"
-#~ "\n"
-#~ "Isto debe axudar a crear facilmente módulos reutilizables e publicábles\n"
-#~ "para configuracións persoalizadas e datos de demostración/proba.\n"
-#~ "\n"
-#~ "Como usalo:\n"
-#~ "Executar Administración/Persoalización/Creación de Módulo/Exportar "
-#~ "persoalizacións Como asistente do Módulo.\n"
-#~ "Seleccione os criterios de data e hora de rexistro e obxectos para ser "
-#~ "rexistrados e Rexistro de módulo.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/hr.po b/addons/base_module_record/i18n/hr.po
deleted file mode 100644
index 72d66b88c7d..00000000000
--- a/addons/base_module_record/i18n/hr.po
+++ /dev/null
@@ -1,395 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * base_module_record
-# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:23+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Vinteh\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"Language: hr\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Kategorija"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informacija"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Kraj"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Izaberite Objekte za Snimanje"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Ime Direktorija"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Samo Zapisi"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Demo Podaci"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Ime datoteke"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Verzija"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Objekti se Snimaju"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Zapis od Datuma"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Modul se Zapisuje"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Izvezi Prilagodbe kao Modul"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Hvala unaprijed na Vašem Doprinosu"
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista Objekata za zapis"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Puni Opis"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Ime Modula"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objekti"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ".zip datoteka Modula"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Modul uspješno kreiran !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Kreiran"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Hvala što ste koristili Snimač  Modula"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL Dokumentacije"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Izmijenjen"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Zapis"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Nastavi"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "uobičajeni Podaci"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "OK"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Kreacija Modula"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tip podataka"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Informacija o Modulu"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Rezultat"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Odustani"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Zatvori"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Kreiran i Izmijenjen"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Snimanje zaustavljeno"
-
-#~ msgid "Recording"
-#~ msgstr "Snimanje"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !"
-
-#~ msgid "Recording Information"
-#~ msgstr "Informacija o Snimanju"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Start Recording"
-#~ msgstr "Počni Snimanje"
-
-#~ msgid "Not Recording"
-#~ msgstr "Ne Zapisuje se"
-
-#~ msgid "Recording information"
-#~ msgstr "Informacija o Snimanju"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Modul uspješno kreiran !"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Nastavi Prethodnu Sesiju"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Snimač Modula"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Ako mislite da bi Vaš Modul mogao nekog zanimati, voljeli bismo da ga "
-#~ "publicirate na OpenERP.com u sekciji \"Modules\". To možete putem weba ili "
-#~ "korištenjem mogućnosti Modula: 'base_module_publish'."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "Snimač Modula omogućuje Vam da snimite svaku operaciju izvršenu u Open ERP "
-#~ "klijentu i izmjene spremite kao Modul. Moći ćete instalirati taj Modul na "
-#~ "bilo kojoj Bazi Podataka za ponovnu uporabu ili publiciranje."
-
-#~ msgid "Record module"
-#~ msgstr "Snimi Modul"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Možete nastaviti snimanje tako da ponovo pokrenete Čarobnjak \"Počni "
-#~ "Snimanje\""
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Spremi Snimljen Modul"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "OpenERP Snimač je zaustavljen. Ne zaboravite spremiti snimljen Modul."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Zaustavi Snimanje"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module.\r\n"
-#~ "Ako mislite da bi vaš modul mogao zanimati druge ljude, voljeli bi smo da ga "
-#~ "objavite na OpenERp.com, u sekciji 'Moduli'. Možete to učiniti kroz web "
-#~ "stranicu ili koristeći modul 'base-module_publish'."
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Ovaj modul omogućuje vam kreiranje novih modula bez programiranja.\n"
-#~ "Bilježi sve operacije na objektima za vrijeme sesije snimanja i kreira .ZIP "
-#~ "modul,\n"
-#~ "Tako da možete kreirati vlastiti modul direktno iz OpenERP klijenta.\n"
-#~ "\n"
-#~ "Ova verzija funkcionira za kreiranje i ažuriranje postojećih zapisa. "
-#~ "Preračunava ovisnosti i povezuje \n"
-#~ "sve tipove widgetas (many2one, many2many, ...).\n"
-#~ "Također podržava dijagrame tijekova i demo podatke.\n"
-#~ "\n"
-#~ "ovo bi vam trebalo pomoći da lako kreirate module za prilagođene "
-#~ "konfiguracije i demo podatke \n"
-#~ "ili podatke za uvoz.\n"
-#~ "\n"
-#~ "Kako koristiti:\n"
-#~ "Pokreni Administracija/Postava/Kreiranje modula/Izvezi prilagodbu kako "
-#~ "asistent modula.\n"
-#~ "Izaberi kriterij datuma i vremena i objekte koji se trebaju bilježiti i "
-#~ "modul.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/hu.po b/addons/base_module_record/i18n/hu.po
deleted file mode 100644
index 3b836c7993e..00000000000
--- a/addons/base_module_record/i18n/hu.po
+++ /dev/null
@@ -1,280 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:25+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Kategória"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Információ"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Befejezés"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Válassza ki, hogy mely tárgyakat szeretné felvenni"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Szerző"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Könyvtárnév"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Csak felvétel"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Minta adatok"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Fájlnév"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Verzió"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Tárgyak felvétele"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Felvétel dátuma"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Modul felvétele"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Export testreszabása modulonként"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Előre is köszönjük a hozzájárulást."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Objektumok listája, melyeket fel kell venni."
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Teljes leírás"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Modul neve"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Tárgyak"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Modul .ZIP fájl"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Modul sikeresen létrehozva!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "YAML fájl sikeresen lértehozva !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Végeredmény, illessze be ezt a modul xml-jébe"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Létrehozás"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Köszönjük, hogy használta a modulfelvevőt."
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "Dokumentáció URL"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Módosítás"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Rekord"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Tovább"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Beállítások exportálása adat fájlként"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Hiba"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Normál adat"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Ok"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Modul létrehozása"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Adat típusa"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Modul információ"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Eredmény"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Mégse"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Zárás"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Létrehozás és Módosítás"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Modul sikeresen létrehozva!"
-
-#~ msgid "Module Record"
-#~ msgstr "Modulrekord"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Ha gondolja, hogy az Ön modulja másokat is érdekelhet, szeretnénk közzétenni "
-#~ "az OpenERP.com oldal 'Modulok' részben. Ezt megteheti a weboldalon "
-#~ "keresztül, vagy a 'base_modul_publish' modul használatával."
diff --git a/addons/base_module_record/i18n/id.po b/addons/base_module_record/i18n/id.po
deleted file mode 100644
index 1c86e5a6d80..00000000000
--- a/addons/base_module_record/i18n/id.po
+++ /dev/null
@@ -1,264 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-11-09 13:46+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr ""
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr ""
diff --git a/addons/base_module_record/i18n/it.po b/addons/base_module_record/i18n/it.po
deleted file mode 100644
index c63ab822e28..00000000000
--- a/addons/base_module_record/i18n/it.po
+++ /dev/null
@@ -1,401 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:39+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Categoria"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informazioni"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Fine"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Scegli gli oggetti da registrare"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autore"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nome Cartella"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Solo registrazioni"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Dati dimostrativi"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nome File"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versione"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Registrazione Oggetti"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Registra per Data"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Registrazione Modulo"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Esporta Personalizzazioni come Moduli"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Grazie per il tuo contributo !"
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista di oggetti che devo essere registrati"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Descrizione Completa"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Nome Modulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Oggetti"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "File .ZIP del Modulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Modulo creato con successo !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "File YAML creato con successo !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Risultato, incolla questo all'XML del modulo"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Creato"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Grazie per aver utilizzato il Modulo di Registrazione"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL Documentazione"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Modificato"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Registra"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Continua"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Esporta Personalizzazioni come File di Dati"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Errore"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Dati normali"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "OK"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Creazione modulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tipo Dati"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Informazioni Modulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Risultato"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Annulla"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Chiudi"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Creati e modificati"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-#~ "speciali!"
-
-#~ msgid "Recording Information"
-#~ msgstr "Informazioni Registrazione"
-
-#~ msgid "Status"
-#~ msgstr "Stato"
-
-#~ msgid "Start Recording"
-#~ msgstr "Inizia Registrazione"
-
-#~ msgid "Not Recording"
-#~ msgstr "Non in fase di registrazione"
-
-#~ msgid "Recording information"
-#~ msgstr "Informazioni Registrazione"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Modulo creato con successo !"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Regsitrazione Fermata"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Continua Sessione Precedente"
-
-#~ msgid "Recording"
-#~ msgstr "Registrazione in corso"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Registratore di Modulo"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Se pensi che il tuo modulo possa interessare altre persone, ci piacerebbe "
-#~ "che lo pubblicassi su OpenERP.com, nella sezione 'Moduli'. Puoi farlo "
-#~ "tramite il sito internet o utilizzando le caratteristiche del modulo "
-#~ "'base_module_publish'."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "Il registratore di modulo permette di registrare ogni operazione fatta nel "
-#~ "client Open ERP e  le salva come modulo. Sarà possibile installare questo "
-#~ "modulo su qualunque database per riusarlo e/o pubblicarlo."
-
-#~ msgid "Record module"
-#~ msgstr "Modulo Registrazione"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "È possibile continuare la sessione di registrazione rilanciando la procedura "
-#~ "guidata 'avviare la registrazione'."
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Salva Modulo Registrato"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "La registrazione Open ERP è fermata. Non dimenticare di salvare i moduli "
-#~ "registrati."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Ferma Registrazione"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Se pensate che il vostro modulo possa essere utile anche ad altre persone, "
-#~ "gradiremmo che lo pubblicaste su OpenERP.com, nella sezione \"Moduli\". La "
-#~ "pubblicazione è fattibile tramite il sito internet oppure usando le "
-#~ "caratteristiche del modulo: \"base_module_publish'"
-
-#~ msgid "Module Record"
-#~ msgstr "Registra modulo"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Questo moduli vi permette di creare un nuovo modulo senza sviluppo alcuno.\n"
-#~ "Esso registra tutte le operazioni sull'oggetto durante la sessione di "
-#~ "registrazione e\n"
-#~ "produce un modulo .ZIP. E' così possibile creare il vostro modulo personale "
-#~ "direttamente dal\n"
-#~ "client OpenERP.\n"
-#~ "\n"
-#~ "Questa versione lavora per creare e aggiornare registrazioni esistenti. Essa "
-#~ "ricalcola dipendenze e collegamenti per tutti i tipi di Widget (molti a uno, "
-#~ "molti a molti, ...).\n"
-#~ "Supporta inoltre i workflow e i dati demo/aggiornamento.\n"
-#~ "\n"
-#~ "Questo dovrebbe aiutare nella creazione semplice, riusabile e pubblicabile "
-#~ "dei moduli, \n"
-#~ "nella personalizzazione, nella configurazione e nell'inserimento di dati "
-#~ "demo / test.\n"
-#~ "\n"
-#~ "Come usarlo:\n"
-#~ "Lancia il wizard: Amministrazione/Personalizzazione/Creazione moduli/Esporta "
-#~ "personalizzazione come un modulo.\n"
-#~ "Seleziona il criterio data / ora della registrazione e gli oggetti "
-#~ "interessati e registra il modulo.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/ja.po b/addons/base_module_record/i18n/ja.po
deleted file mode 100644
index 905c21fc6c0..00000000000
--- a/addons/base_module_record/i18n/ja.po
+++ /dev/null
@@ -1,268 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-24 03:50+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "分類"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "情報"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "終了"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "オブジェクトを記録するための選択"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "著者"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "ディレクトリ名"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "レコードのみ"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "デモデータ"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "ファイル名"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "バージョン"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "オブジェクトの記録"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-"あなたのモジュールに他の人々が興味を持つであろうと思う場合は、http://www.openerp.com "
-"上の\"Modules\"セクションに公開して下さい。これは、Webサイトを通じて、または\"base_module_publish\"モジュールの機能を"
-"使うことで行うことができます。"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "記録開始日"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "モジュールの記録"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "カスタマイズをモジュールとしてエクスポート"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "あなたの貢献に感謝します。"
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "記録されるレコードのリスト"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "全詳細"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "モジュール名"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "オブジェクト"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "モジュールの .zipファイル"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "モジュールの作成が成功しました。"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "YAMLファイルの作成が成功しました。"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "結果として、モジュールのxmlにこれを貼り付けます。"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "作成済"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "モジュールレコーダーの利用に感謝します。"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "ドキュメントURL"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "変更済"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "記録"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "続き"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "カスタマイズをデータファイルとしてエクスポート"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "エラー"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "通常データ"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "モジュールの作成"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "データのタイプ"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "モジュール情報"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "結果"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "キャンセル"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "閉じる"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "作成＆修正済"
diff --git a/addons/base_module_record/i18n/ko.po b/addons/base_module_record/i18n/ko.po
deleted file mode 100644
index 5d8e5c989bf..00000000000
--- a/addons/base_module_record/i18n/ko.po
+++ /dev/null
@@ -1,313 +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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:56+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
-"Language-Team: Korean <ko@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "카테고리"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "정보"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "기록할 오브젝트를 선택하십시오."
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "저자"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "디렉토리 이름"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "레코드 만"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "데모 데이터"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "파일 이름"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "버전"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "오브젝트 기록"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "날짜별 레코드"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "기록 모듈"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "고객화를 모듈로 내보내기"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "귀하의 공헌에 감사드립니다."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "기록될 오브젝트 리스트"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "상세 설명"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "모듈 이름"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "오브젝트"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "모듈 .zip 파일"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "모듈이 생성되었습니다 !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "생성됨"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "모듈 레코더를 이용해 주셔서 감사합니다."
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "문서화 URL"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "수정됨"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "레코드"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "계속"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "일반 데이터"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "모듈 생성"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "데이터 타입"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "모듈 정보"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "취소"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "닫ㄱ"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "생성 및 수정됨"
-
-#~ msgid "Recording Information"
-#~ msgstr "정보 기록"
-
-#~ msgid "Status"
-#~ msgstr "상태"
-
-#~ msgid "Start Recording"
-#~ msgstr "기록 시작"
-
-#~ msgid "Not Recording"
-#~ msgstr "기록하지 않음"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "기록이 중단됨"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "모듈이 생성되었습니다 !"
-
-#~ msgid "Recording information"
-#~ msgstr "정보 기록"
-
-#~ msgid "Module Recorder"
-#~ msgstr "모듈 레코더"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "이전 세션 계속"
-
-#~ msgid "Recording"
-#~ msgstr "기록"
-
-#~ msgid "Record module"
-#~ msgstr "모듈 기로"
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "기록된 모듈 저장"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr "기록이 중단되었습니다. 기록된 모듈의 저장을 잊지 마십시오."
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr "'기록 시작' 위저드를 재시작함으로써 기록 세션을 계속할 수 있습니다."
-
-#~ msgid "Stop Recording"
-#~ msgstr "기록 중단"
diff --git a/addons/base_module_record/i18n/lt.po b/addons/base_module_record/i18n/lt.po
deleted file mode 100644
index e736257582d..00000000000
--- a/addons/base_module_record/i18n/lt.po
+++ /dev/null
@@ -1,264 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-09-08 16:37+0000\n"
-"Last-Translator: Donatas Stonys Blue Whale SEO <donatelonow@hotmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr ""
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr ""
diff --git a/addons/base_module_record/i18n/nl.po b/addons/base_module_record/i18n/nl.po
deleted file mode 100644
index 97a0622dad7..00000000000
--- a/addons/base_module_record/i18n/nl.po
+++ /dev/null
@@ -1,399 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:33+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Categorie"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informatie"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Einde"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Kies de op te nemen objecten"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Auteur"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Mapnaam"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Alleen opname bij"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Demogegevens"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Bestandsnaam"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versie"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Objecten opname"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-"Als u denkt dat uw module interessant is voor andere mensen, pupliceeer het "
-"dan graag op http://www.openerp.com, in de module sectie. Het kan via de "
-"website of via de mogelijkheden van de 'base_module_publish' module."
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Opnemen vanaf datum"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Module Opnemen"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exporteer aanpassingen als een module"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Bijvoorbaat dank voor uw bijdrage."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lijst van objecten die opgenomen moeten worden"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Volledige omschrijving"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Modulenaam"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objecten"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Module .zip Bestand"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Module succesvol aangemaakt"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "YAML bestand maken geslaagd !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Resultaat, plak dit in de xml van uw module"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Aangemaakt"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Bedankt voor het gebruik van de modulerecorder"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "Documentatie URL"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Gewijzigd"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Opnemen"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Doorgaan"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exporteer aanpassingen als gegevensbestand"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Fout"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Normale gegevens"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Ok"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Module aanmaken"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Soort gegevens"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Module Informatie"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Resultaat"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Afsluiten"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Aangemaakt en gewijzigd"
-
-#~ 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 "Recording Information"
-#~ msgstr "Opname Informatie"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Recording information"
-#~ msgstr "Opname informatie"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Module succesvol aangemaakt"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Opname beëindigd"
-
-#~ msgid "Record module"
-#~ msgstr "Module opnemen"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "U kunt verder gaan met de opnamesessie door het herstarten van de 'start "
-#~ "opnemen' assistent."
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Opgenomen Module Opslaan"
-
-#~ msgid "Stop Recording"
-#~ msgstr "Opname stoppen"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Als U denkt dat de module interessant is voor anderen, kunt U deze module "
-#~ "publiceren op OpenERP.com in de 'Modules'-sectie. U kunt dit via de website "
-#~ "doen of gebruik maken van de 'base_module_publish' module."
-
-#~ msgid "Start Recording"
-#~ msgstr "Opname starten"
-
-#~ msgid "Not Recording"
-#~ msgstr "Geen opname"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Module opname"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Doorgaan met vorige sessie"
-
-#~ msgid "Recording"
-#~ msgstr "Bezig met opnemen"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "OpenERP opname is gestopt. Vergeet niet de opgenomen module op te slaan."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "Deze module opname laat u elke gemaakte bewerking in de Open ERP client "
-#~ "opnemen en ze opslaan als een module. U kunt deze module installeren in elke "
-#~ "database voor hergebruik of publicatie."
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Als u denkt dat uw module ander mensen kan interesseren, willen we graag dat "
-#~ "u het publiceert op OpenERP.com, in de 'Modules' sectie. U kunt dat via de "
-#~ "website doen of gebruik maken van de functionaliteit van de "
-#~ "'base_module_publish' module."
-
-#~ msgid "Module Record"
-#~ msgstr "Module opnemen"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Met deze module maakt u een nieuwe module zonder enige ontwikkeling.\n"
-#~ "Het legt alle bewerkingen op objecten vast gedurende de opname sessie en\n"
-#~ "produceert een .ZIP module. Dus u kunt uw eigen module direct vanuit de \n"
-#~ "OpenERP client maken.\n"
-#~ "\n"
-#~ "Deze versie werkt voor maken en wijzigen van bestaande records. Het "
-#~ "herberekent \n"
-#~ "afhankelijkheden en koppelingen voor alle soort verbindingen (many2one, "
-#~ "many2many, ...).\n"
-#~ "Het ondersteunt ook workflows en demo/update data.\n"
-#~ "\n"
-#~ "Dit zou u moeten helpen om eenvoudig herbruikbare en publiceerbare modules "
-#~ "te maken\n"
-#~ "voor maatwerk configuraties en demo/testing data.\n"
-#~ "\n"
-#~ "Hoe te gebruiken:\n"
-#~ "Beheer/Aanpassingen/Module aanmaken/Exporteer aanpassingen als een module "
-#~ "assistent uitvoeren.\n"
-#~ "Selecteer datum/tijd criteria voor opname en op te nemen objecten en begin "
-#~ "met opnemen.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/nl_BE.po b/addons/base_module_record/i18n/nl_BE.po
deleted file mode 100644
index e00633a8baf..00000000000
--- a/addons/base_module_record/i18n/nl_BE.po
+++ /dev/null
@@ -1,269 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-04-24 15:18+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr ""
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
diff --git a/addons/base_module_record/i18n/pl.po b/addons/base_module_record/i18n/pl.po
deleted file mode 100644
index 8d6a98ee5aa..00000000000
--- a/addons/base_module_record/i18n/pl.po
+++ /dev/null
@@ -1,291 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-02-04 01:33+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Kategoria"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informacja"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nazwa katalogu"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nazwa pliku"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Wersja"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr ""
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Pełny opis"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "Strona Dokumentacji"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Kontynuuj"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Rodzaj Danych"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Anuluj"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Zamknij"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Recording Information"
-#~ msgstr "Informacja Nagrywania"
-
-#~ msgid "Status"
-#~ msgstr "Stan"
-
-#~ msgid "Start Recording"
-#~ msgstr "Zacznij nagrywanie"
-
-#~ msgid "Recording information"
-#~ msgstr "Informacje Nagrywania"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Nagrywanie Zatrzymane"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Continuuj Ostatnią Sesję"
-
-#~ msgid "Stop Recording"
-#~ msgstr "Zakończ nagrywanie"
diff --git a/addons/base_module_record/i18n/pt.po b/addons/base_module_record/i18n/pt.po
deleted file mode 100644
index 931db709201..00000000000
--- a/addons/base_module_record/i18n/pt.po
+++ /dev/null
@@ -1,399 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:04+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Categoria"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informação"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Fim"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Escolha os objetos a gravar"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nome do Diretório"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Apenas Registos"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Dados da Demonstração"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nome do Ficheiro"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versão"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Gravação de Objetos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-"Se acha que o seu módulo pode interessar a outras pessoas, nós gostaríamos "
-"que o publicá-se em http://www.openerp.com, na seção 'modules'. Pode fazê-lo "
-"através do site ou do uso de recursos do módulo 'base_module_publish'."
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Gravar a partir da Data"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Gravação do Módulo"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exportar Personalizações como um Módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Os nossos sinceros agradecimentos pela sua contribuição"
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista dos objetos a serem gravados"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Descrição Completa"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Nome do Módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objetos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Ficheiro .zip do Módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Módulo criado com sucesso !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "Ficheiro YALM criado com sucesso!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Resultado, cole este sml no seu módulo"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Criado"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Obrigado por usar o Gravador de Módulos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "Documentação URL"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Modificado"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Gravar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Continuar"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exportar personalizações como ficheiro de dados"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Erro"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Dado Normal"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "OK"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Criação de Módulos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tipo de Dado"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Informação do Módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Resultado"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Fechar"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Criado e modificado"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Módulo criado com sucesso !"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "A gravação do ERP esta parada. Não esqueça de salvar o módulo gravado."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum caracter "
-#~ "especial !"
-
-#~ msgid "Recording Information"
-#~ msgstr "Informação de Gravação"
-
-#~ msgid "Start Recording"
-#~ msgstr "Iniciar a Gravação"
-
-#~ msgid "Not Recording"
-#~ msgstr "Sem Gravação"
-
-#~ msgid "Recording information"
-#~ msgstr "Gravação da informação"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Gravação Parada"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Continuar com a Sessão Anterior"
-
-#~ msgid "Recording"
-#~ msgstr "Em Gravação"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Gravador de Módulos"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Se  pensa que o seu módulo poderá interessar a outras pessoas, nós "
-#~ "gostaríamos de publicá-lo no OpenERP.com, na secção dos ' Módulos'. Pode "
-#~ "fazê-lo através da página web ou utilizar as funcionalidades do módulo "
-#~ "'base_module_publish'."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "O módulo gravador (recorder) permite que grave cada operação feita no "
-#~ "cliente Open ERP e salve-o como um módulo. Poderá ser capaz de instalar este "
-#~ "módulo em qualquer base de dados para reutilização e/ou publicação."
-
-#~ msgid "Record module"
-#~ msgstr "Módulo de Gravação"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Pode continuar a sessão de gravação por relançar o assistente ' começar  a "
-#~ "gravar' ."
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Gravar Módulo Recorded"
-
-#~ msgid "Stop Recording"
-#~ msgstr "Parar Gravação"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Se acha que o seu módulo pode interessar a outras pessoas, então, nós "
-#~ "gostaríamos de o publicar em OpenERP.com, na secção de 'Módulos'. Você pode "
-#~ "fazê-lo através do endereço indicado ou usando as funcionalidades do módulo "
-#~ "'base_module_publish'."
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo permite que crie um novo módulo sem qualquer desenvolvimento.\n"
-#~ "Ele regista todas as operações aos objetos durante a sessão de gravação e\n"
-#~ "produção de um módulo .ZIP. Assim pode criar o seu próprio módulo "
-#~ "diretamente\n"
-#~ "do cliente OpenERP.\n"
-#~ "\n"
-#~ "Esta versão funciona para criar e atualizar registos existentes. ele "
-#~ "recalcula\n"
-#~ "dependências e links para todos os tipos de widgets (many2one, many2many, "
-#~ "...).\n"
-#~ "Ele também suporta fluxos de trabalho e de demonstração / atualização dos "
-#~ "dados.\n"
-#~ "\n"
-#~ "Isso deve ajudá-lo a criar facilmente módulos reutilizáveis ​​e publicáveis\n"
-#~ "para configurações personalizadas e demonstração / testes de dados.\n"
-#~ "\n"
-#~ "Como usá-lo:\n"
-#~ "Executar Administração / Personalização / Criação de Módulo / Exportar "
-#~ "personalizações como um assistente do módulo.\n"
-#~ "Selecione os critérios de data e hora de gravação e objetos para serem "
-#~ "gravados e Gravar módulo.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/pt_BR.po b/addons/base_module_record/i18n/pt_BR.po
deleted file mode 100644
index c813b7fc743..00000000000
--- a/addons/base_module_record/i18n/pt_BR.po
+++ /dev/null
@@ -1,398 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:19+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Categoria"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informação"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Fim"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Escolha objetos para gravar"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor/a"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nome da pasta"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Apenas registros"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Dados de Demonstração"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nome do Arquivo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versão"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Gravação dos Objetos"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-"Se você acha que seu módulo pode interessar outras pessoas, nós gostaríamos "
-"que você publica-se em http://www.openerp.com, na seção 'modules'. Você pode "
-"fazê-lo através do site ou uso de recursos do módulo 'base_module_publish'."
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Registrar desde a data"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Gravando o Módulo"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exportar Personalizações como um Módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Antecipadamente gratos pela sua contribuição"
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista de objetos para serem gravados"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Descrição Completa"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Nome do Módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objetos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Arquivo .zip do módulo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Módulo criado com sucesso !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "Arquivo YAML criado com sucesso !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Resultado, colar isso para seu módulo xml"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Criado"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Obrigado por utilizar o Gravador de Módulos"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL da Documentação"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Modificado"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Gravar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Continuar"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exportar customizações como um arquivo de dados"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Erro"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Dados Normais"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Ok"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Criação do Módulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tipo de Dado"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Informações do Modulo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Resultado"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Fechar"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Criado & Modificado"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
-#~ "especial!"
-
-#~ msgid "Recording"
-#~ msgstr "Gravando"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Gravador de Módulos"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Continuar a Sessão Anterior"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Gravação Interrompida"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Módulo criado com sucesso !"
-
-#~ msgid "Recording information"
-#~ msgstr "Gravando informações"
-
-#~ msgid "Record module"
-#~ msgstr "Gravar módulo"
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Arquivar Módulo Gravado"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Se você acha que seu módulo pode ser de interesse para outras pessoas, nós "
-#~ "gostaríamos de publicá-lo no openERP.com, na sessão de 'Módulos'. Por favor "
-#~ "faça isso no website ou usando as funções do módulo 'base_module_publish'"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "A gravação do Open ERP parou mas ainda não foi arquivada (salva). Não se "
-#~ "esqueça de arquivar o módulo gravado."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "O gravador de módulos permite que você grave cada operação feita no Cliente "
-#~ "Open ERP e salvá-las como um módulo. Você poderá instalar esse módulo em um "
-#~ "banco de dados para reusá-lo e/ou publicá-lo"
-
-#~ msgid "Start Recording"
-#~ msgstr "Iniciar Gravação"
-
-#~ msgid "Recording Information"
-#~ msgstr "Granvando as Informações"
-
-#~ msgid "Status"
-#~ msgstr "Posição"
-
-#~ msgid "Not Recording"
-#~ msgstr "Não Gravando"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Você pode continuar a sessão de gravação se reiniciar o wizard \"iniciar "
-#~ "gravação\"."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Parar gravação"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Se você acha que seu módulo poderia interessar a outra pessoas, nós "
-#~ "gostaríamos que você o publicasse em OpenERP.com, na seção 'Módulos'. Você "
-#~ "pode fazer através do site ou usando os recursos do módulo "
-#~ "'base_module_publish'."
-
-#~ msgid "Module Record"
-#~ msgstr "Registro de Módulo"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo permite criar um novo módulo sem nenhum desenvolvimento.\n"
-#~ "Ele grava todas as operações sobre objetos durante a gravação de sessão e\n"
-#~ "produz um módulo .zip. Assim, você pode criar seu próprio módulo diretamente "
-#~ "do\n"
-#~ "client OpenERP.\n"
-#~ "\n"
-#~ "Esta versão trabalha na criação e atualização de registros existentes. Ela "
-#~ "recalcula\n"
-#~ "dependências e ligações para todos os tipos de controles (muitos-a-um, "
-#~ "muitos-a-muitos, ...).\n"
-#~ "Também suporta workflows e demo/atualização de dados.\n"
-#~ "\n"
-#~ "Como usar:\n"
-#~ "Execute Administração/Customização/Criação de Módulo/Exportar Customização "
-#~ "Como Módulo.\n"
-#~ "Selecione os critérios de data e hora de gravação e os objetos a serem "
-#~ "gravados.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/ro.po b/addons/base_module_record/i18n/ro.po
deleted file mode 100644
index 99f5fc14a1f..00000000000
--- a/addons/base_module_record/i18n/ro.po
+++ /dev/null
@@ -1,405 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:19+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Categorie"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informatii"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.inregistrare.modul"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Incheie"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Alege obiectele care vor fi inregistrate"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Nume Director"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Doar inregistrari"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Date demo"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Nume fisier"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Versiune"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Inregistrare Obiecte"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-"Daca considerati ca alti oameni ar putea fi interesati de modulul "
-"dumneavoastra, ne-ar face placere sa il publicam la adresa "
-"http://www.openerp.com, in sectiunea 'Module'. O puteti face prin "
-"intermediul paginii de Internet sau folosind caracteristicile modulului "
-"'base_module_publish'"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Inregistrare de la Data"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Inregistrare Modul"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exporta Personalizarile ca Modul"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Va multumim anticipat pentru contributia dumneavoastra."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista obiectelor care vor fi inregistrate"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Descriere completa"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Numele Modulului"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Obiecte"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Modul fisier .zip"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Modul creat cu succes !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "Fisierul YAML a fost creat cu succes !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Ca rezultat, lipiti aceasta la modulul d-voastra xml"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Creat(a)"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Multumim pentru ca folositi Modulul Inregistrare"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL Documentatie"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Modificat(a)"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Inregistreaza"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Continuati"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exporta Personalizarile ca Fisier de date"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Eroare"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Date obisnuite"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "OK"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Creare Modul"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tip de date"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Informatii Modul"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Rezultat"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Anuleaza"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Inchide"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Creat & Modificat"
-
-#~ msgid "Status"
-#~ msgstr "Stare"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
-#~ "special !"
-
-#~ msgid "Start Recording"
-#~ msgstr "Start înregistrare"
-
-#~ msgid "Recording Information"
-#~ msgstr "Înregistrare informatii"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Înregistrare oprită"
-
-#~ msgid "Not Recording"
-#~ msgstr "Fără înregistrare"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Modul creat cu succes !"
-
-#~ msgid "Recording information"
-#~ msgstr "Informaţii înregistrare"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Continuă sesiunea precedentă"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Dacă consideraţi că modulul dumneavoastră ar interesa şi pe altcineva, vă "
-#~ "rugăm să-l publicaţi pe OpenERP.com, în secţiunea 'Modules'. O puteţi face "
-#~ "prin intermediul website-ului sau utilizând caracteristicile modulului "
-#~ "'base_module_publish'."
-
-#~ msgid "Recording"
-#~ msgstr "Înregistrare"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Puteţi continua sesiunea de înregistrare relansând utilitarul 'Start "
-#~ "înregistrare'"
-
-#~ msgid "Record module"
-#~ msgstr "Modul înregistrator"
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "Acest modul înregistrator vă permite să înregistraţi fiecare operaţiune "
-#~ "făcută în clientul OpenERP şi să o salvaţi ca modul. Veţi putea să instalaţi "
-#~ "acest modul în orice bază de date şi să îl reutilizaţi şi/sau să îl "
-#~ "republicaţi."
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Salvare modul înregistrat"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "Înregistrarea OpenERP este oprită. Nu uitaţi să salvaţi modulul înregistrat."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Oprire înregistrare"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Modul înregistrator"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Dacă credeți ca modulul dvs poate prezenta interes și pentru alții , vă "
-#~ "invităm să îl publicați pe OpenERP.com în secțiunea 'Modules'. Puteți face "
-#~ "asta fie prin intermediul site-ului , fie folosind facilitățile modulului "
-#~ "'base_module_publish'."
-
-#~ msgid "Module Record"
-#~ msgstr "Inregistrare modul"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Acest modul va permite sa creati un modul nou fara nici o dezvoltare. \n"
-#~ "Inregistreaza toate operatiunile in obiecte in timpul sesiunii de "
-#~ "inregistrare si \n"
-#~ "produce un modul .ZIP. Astfel, puteti crea modulul propriu direct din \n"
-#~ "clientul OpenERP. \n"
-#~ "\n"
-#~ "Aceasta versiune se foloseste la crearea si actualizarea inregistrarilor "
-#~ "existente. Recalculeaza \n"
-#~ "dependentele si link-urile pentru toate tipurile de widget-uri (many2one, "
-#~ "many2many,...). \n"
-#~ "De asemenea, sustine fluxurile de lucru si datele demo/actualizate. \n"
-#~ "\n"
-#~ "Ar trebui sa va ajute sa creati cu usurinta module care pot fi reutilizate "
-#~ "si publicate pentru \n"
-#~ "configurari personalizate si date demo/de testare. \n"
-#~ "\n"
-#~ "Cum se foloseste: \n"
-#~ "Rulati Administrare/Personalizare/Creare Modul/Exporta Personalizari ca "
-#~ "modul wizard.  \n"
-#~ "Selectati criteriile datei inregistrarii si obiectele care vor fi "
-#~ "inregistrate si modulul Inregistreaza.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/ru.po b/addons/base_module_record/i18n/ru.po
deleted file mode 100644
index 8f2fb3bc036..00000000000
--- a/addons/base_module_record/i18n/ru.po
+++ /dev/null
@@ -1,394 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:32+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Категория"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Информация"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Конец"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Выберите объекты для записи"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Автор"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Название директории"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Только записи"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Демонстрационные данные"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Имя файла"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Версия"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Объекты записи"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Запись из данных"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Запись модуля"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Экспортировать настройки как модуль"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Заранее благодарим за ваш вклад"
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Список объектов записан"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Полное описание"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Название модуля"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Объекты"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ".zip файл модуля"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Модуль успешно создан!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "YAML файл создан !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Результат. Вставьте это в XML вашего модуля"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Создана"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Спасибо за использование модуля записи"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "Ссылка на документацию"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Модифицирован"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Запись"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Далее"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Экспорт настроек в виде файла данных"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Ошибка"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Нормализованные данные"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "OK"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Модуль создан"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Тип данных"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Информация модуля"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Результат"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Отмена"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Закрыть"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Создано и Модифицировано"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Recording Information"
-#~ msgstr "Информация записывается"
-
-#~ msgid "Status"
-#~ msgstr "Статус"
-
-#~ msgid "Start Recording"
-#~ msgstr "Начать запись"
-
-#~ msgid "Recording information"
-#~ msgstr "Информация записывается"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Модуль успешно создан!"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Запись остановлена"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Продолжить предыдущую сессию"
-
-#~ msgid "Record module"
-#~ msgstr "Модуль записи"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Вы можете продолжить запись повторным запуском мастера 'Начало записи'."
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Сохранить записанный модуль"
-
-#~ msgid "Stop Recording"
-#~ msgstr "Остановить запись"
-
-#~ msgid "Not Recording"
-#~ msgstr "Не записан"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Если Вы считаете, что Ваш модуль может быть интересен другим людям, мы "
-#~ "советуем Вам опубликовать его на OpenERP.com в разделе 'Modules'. Вы можете "
-#~ "сделать это через сайт или используя возможности из модуля "
-#~ "'base_module_publish'."
-
-#~ msgid "Module Recorder"
-#~ msgstr "Модуль записи"
-
-#~ msgid "Recording"
-#~ msgstr "Записываю"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "Open ERP запись остановлена. Не забудьте сохранить записанныый модуль."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "Модуль записи позволяет записывать любые операции произведенные в клиенте "
-#~ "Open ERP и сохранять их в виде модуля. Вы сможете установить этот модуль на "
-#~ "любую базу данных для повторного использования и/или опубликовать его."
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Этот модуль позволяет создавать новые модули без какой-либо разработки.\n"
-#~ "Он записывает все действия над объектами в процессе своей работы и\n"
-#~ "формирует модуль .ZIP. Можно создавать свои модули напрямую из клиента\n"
-#~ "OpenERP.\n"
-#~ "\n"
-#~ "Эта версия позволяет работать с существующими записями. Она вычисляет\n"
-#~ "зависимости и связь для всех типов виджетов (многие-к-одному, многие-ко-"
-#~ "многим ...).\n"
-#~ "Она также поддерживает рабочие процессы, демо-данные и обновления.\n"
-#~ "\n"
-#~ "Это средство должно облегчить работу по созданию переиспользуемых модулей и\n"
-#~ "возможность их публикации для частных конфигураций и демонстрационные или \n"
-#~ "тестовые данные.\n"
-#~ "\n"
-#~ "Как использовать:\n"
-#~ "Выполните Администрирование/Настройка/Создание модулей/Экспорт настроек в "
-#~ "виде мастера модулей.\n"
-#~ "Укажите параметры даты/времени, записываемые объекты и модуль записи.\n"
-#~ "    "
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Если вы полагаете, что ваш модуль может заинтересовать других людей — можете "
-#~ "опубликовать его на OpenERP.com в разделе «Модули». Это можно сделать "
-#~ "непосредственно на сайте или с помощью функции модуля base_module_publish."
-
-#~ msgid "Module Record"
-#~ msgstr "Модуль записи"
diff --git a/addons/base_module_record/i18n/sk.po b/addons/base_module_record/i18n/sk.po
deleted file mode 100644
index 169939e0c0a..00000000000
--- a/addons/base_module_record/i18n/sk.po
+++ /dev/null
@@ -1,314 +0,0 @@
-# Slovak 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:15+0000\n"
-"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
-"Language-Team: Slovak <sk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Kategória"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informácia"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Len záznamy"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Demo Data"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Názov súboru"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Verzia"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Záznam objektov"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Záznam od dátumu"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Modul záznamu"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Export upraveného modulu"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr ""
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Zoznam objektov, ktoré majú byť zaznamenané"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Plný opis"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Názov modulu"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objekty"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Súbor moduklu .zip"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Modul úspešne vytvorený!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Vytvorené"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL dokumentácia"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Zmenené"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Záznam"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Pokračovať"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Mormálne dáta"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "OK"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Typ dát"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Informácia o module"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Zavrieť"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Vytvorené & Upravené"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Názov objektu musí začínať x_ a nesmie obsahovať žiadne špeciálne znaky!"
-
-#~ msgid "Recording Information"
-#~ msgstr "Zaznamenávanie informácií"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Start Recording"
-#~ msgstr "Odštartovanie záznamu"
-
-#~ msgid "Recording information"
-#~ msgstr "Informácia záznamu"
-
-#~ msgid "Not Recording"
-#~ msgstr "Nie je záznam"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Záznam zastavený"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Modul úspešne vytvorený!"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Modul záznamu"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Pokračovať v poslednej relácii"
-
-#~ msgid "Recording"
-#~ msgstr "Nahrávanie"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "Open ERP nahrávanie je zastavený. Nezabudnite uložiť zaznamenaný modul."
-
-#~ msgid "Record module"
-#~ msgstr "Modul záznamu"
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Uložiť záznam modulu"
-
-#~ msgid "Stop Recording"
-#~ msgstr "Zastaviť nahrávanie"
diff --git a/addons/base_module_record/i18n/sl.po b/addons/base_module_record/i18n/sl.po
deleted file mode 100644
index 886570a4120..00000000000
--- a/addons/base_module_record/i18n/sl.po
+++ /dev/null
@@ -1,327 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:16+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Kategorija"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informacije"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Konec"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Izberi predmete za zapis"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Avtor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Ime imenika"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Samo posnetki"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Demonstracijski podatki"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Ime datoteke"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Različica"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Zapisovanje predmetov"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Posnami od dne"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Snemanje modulov"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Izvozi prilagoditev kot moduk"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Vnaprej hvala za vaš prispevek."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Seznam predmetov za snemanje"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Polni opis"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Ime modula"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Predmeti"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "ZIP datoteka modula"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Modul uspešno izdelan!"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "YAML datoteka uspečno kreirana !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Ustvarjeno"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Hvala ker uporabljate snemalnik modulov"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "Dokumentacijski URL"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Spremenjeni"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Zapis"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Nadaljuj"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Napaka"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Normalni podatki"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "V redu"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Izdelava modula"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tip podatkov"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Informacije o modulu"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Rezultat"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Prekliči"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Zapri"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Izdelano in spremenjeno"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
-#~ msgid "Status"
-#~ msgstr "Stanje"
-
-#~ msgid "Recording"
-#~ msgstr "Snemanje"
-
-#~ msgid "Stop Recording"
-#~ msgstr "Končaj snemanje"
-
-#~ msgid "Not Recording"
-#~ msgstr "Ne snemam"
-
-#~ msgid "Start Recording"
-#~ msgstr "Začni snemanje"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Snemanje ustavljeno"
-
-#~ msgid "Recording information"
-#~ msgstr "Informacije o snemanju"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Modul uspešno izdelan!"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Če menite, da vaš modul zanima tudi druge in bi želeli, da se modul objavi "
-#~ "na OpenERP.com v razdelku \"Modules\", lahko to storite prek spletne strani "
-#~ "ali z uporabo funkcije \"base_module_publish\"."
-
-#~ msgid "Record module"
-#~ msgstr "Posnemi modul"
-
-#~ msgid "Recording Information"
-#~ msgstr "Podatki o posnetku"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Nadaljuj prejšnjo sejo"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Snemalnik modulov"
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Shrani posneti modul"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr "Snemanje OpenERP je zaustavljeno. Ne pozabite posneti modula."
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Snemanje lahko nadaljujete s ponovnim zagonom čarovnika \"Začni snemanje\""
diff --git a/addons/base_module_record/i18n/sq.po b/addons/base_module_record/i18n/sq.po
deleted file mode 100644
index 0d9c13145d8..00000000000
--- a/addons/base_module_record/i18n/sq.po
+++ /dev/null
@@ -1,265 +0,0 @@
-# Albanian 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-08-02 14:38+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Albanian <sq@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr ""
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr ""
diff --git a/addons/base_module_record/i18n/sr.po b/addons/base_module_record/i18n/sr.po
deleted file mode 100644
index 7030822349b..00000000000
--- a/addons/base_module_record/i18n/sr.po
+++ /dev/null
@@ -1,351 +0,0 @@
-# Serbian 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:22+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Serbian <sr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Категорија"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informacija"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Kraj"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Izaberi objekat za cuvanje"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Ime Direktorijuma"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Samo Zapisi"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Demo Podaci"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Ime Fajla"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Verzija"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Objekti se Snimaju"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Zapis od Datuma"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Snimanje Modula"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Izvezi Podesavanja kao Modul"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Hvala unaprijed na Vašem Doprinosu"
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista Objekata za zapis"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Puni Opis"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Naziv Modula"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objekti"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ".zip datoteka Modula"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Modul uspješno kreiran !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "YAML fajl je uspesno kreiran !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Rezultat,  zalepi ovo u tvoj xml modul"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Kreirano"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Hvala što ste koristili Snimač Modula"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL Dokumentacije"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Izmenjen"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Snima"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Nastavi"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Eksportuj POdesavanja kao Data fajl"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Greska"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Obični podaci"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "U redu"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Kreacija Modula"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tip Podataka"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Informacija o Modulu"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Rezultat"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Otkaži"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Zatvori"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Kreiran & Izmijenjen"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "Start Recording"
-#~ msgstr "Počni Snimanje"
-
-#~ msgid "Recording Information"
-#~ msgstr "Informacija o Snimanju"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Not Recording"
-#~ msgstr "Ne Snima"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Snimanje zaustavljeno"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Modul uspješno kreiran !"
-
-#~ msgid "Recording information"
-#~ msgstr "Informacija o Snimanju"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Snimač Modula"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Nastavi Prethodnu Sesiju"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Ako mislite da bi Vaš Modul mogao nekog zanimati, voljeli bismo da ga "
-#~ "publicirate na OpenERP.com u sekciji \"Modules\". To možete putem weba ili "
-#~ "korištenjem mogućnosti Modula: 'base_module_publish'."
-
-#~ msgid "Recording"
-#~ msgstr "Snimanje"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Možete nastaviti snimanje tako da ponovo pokrenete Čarobnjak \"Počni "
-#~ "Snimanje\""
-
-#~ msgid "Record module"
-#~ msgstr "Snimi Modul"
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Sacuvaj Snimljen Modul"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "OpenERP Snimač je zaustavljen. Ne zaboravite da sacuvate snimljen Modul."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "Snimač Modula omogućuje Vam da snimite svaku operaciju izvršenu u Open ERP "
-#~ "klijentu i izmjene spremite kao Modul. Moći ćete instalirati taj Modul na "
-#~ "bilo kojoj Bazi Podataka za ponovnu upotrebu ili publiciranje."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Zaustavi Snimanje"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Ako mislite da vas modul moze zainteresovati i druge ljude, mozete ga "
-#~ "publikovati na OpenERP.com u sekciji 'Moduli'. To mozete uciniti preko "
-#~ "websajta ili koristeci mogucnosti modula 'base_module_publish' ."
-
-#~ msgid "Module Record"
-#~ msgstr "Snimanje Modula"
diff --git a/addons/base_module_record/i18n/sr@latin.po b/addons/base_module_record/i18n/sr@latin.po
deleted file mode 100644
index d1c6d3a41e9..00000000000
--- a/addons/base_module_record/i18n/sr@latin.po
+++ /dev/null
@@ -1,394 +0,0 @@
-# Serbian 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:34+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Serbian <sr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Kategorija"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Informacije"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Kraj"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Izaberi stavke za čuvanje"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Ime fascikle"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Samo zapisi"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Demo podaci"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Ime datoteke"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Verzija"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Zapisi stavki"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Zapis od Datuma"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Zapisivanje modula"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Izvezi podešavanja kao modul"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Hvala unapred na Vašem doprinosu"
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Spisak stavki za zapis"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Puni opis"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Naziv Modula"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Stavka"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ".zip datoteka modula"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Modul uspešno napravljen !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "YAML datoteka uspešno napravljena !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Rezultat,  zalepite ovo u Vaš xml modul"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Napravljeno"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Hvala što ste koristili Zapisivač modula"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "URL Dokumentacija"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Izmenjeno"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Zapis"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Nastavi"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Izvezi podešavanja kao data datoteku"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Greška"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Obični podaci"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "OK"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Pravljenje Modula"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Tip Podataka"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Informacija o modulu"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Rezultat"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Otkaži"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Zatvori"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Kreiran & Izmijenjen"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
-
-#~ msgid "Start Recording"
-#~ msgstr "Počni Snimanje"
-
-#~ msgid "Recording Information"
-#~ msgstr "Informacija o Snimanju"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Not Recording"
-#~ msgstr "Ne Snima"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "Snimanje zaustavljeno"
-
-#~ msgid "Recording information"
-#~ msgstr "Informacija o Snimanju"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Snimač Modula"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "Nastavi Prethodnu Sesiju"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Ako mislite da bi Vaš Modul mogao nekog zanimati, voljeli bismo da ga "
-#~ "publicirate na OpenERP.com u sekciji \"Modules\". To možete putem weba ili "
-#~ "korištenjem mogućnosti Modula: 'base_module_publish'."
-
-#~ msgid "Recording"
-#~ msgstr "Snimanje"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr ""
-#~ "Možete nastaviti snimanje tako da ponovo pokrenete Čarobnjak \"Počni "
-#~ "Snimanje\""
-
-#~ msgid "Record module"
-#~ msgstr "Snimi Modul"
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "Sacuvaj Snimljen Modul"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr ""
-#~ "OpenERP Snimač je zaustavljen. Ne zaboravite da sacuvate snimljen Modul."
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr ""
-#~ "Snimač Modula omogućuje Vam da snimite svaku operaciju izvršenu u Open ERP "
-#~ "klijentu i izmjene spremite kao Modul. Moći ćete instalirati taj Modul na "
-#~ "bilo kojoj Bazi Podataka za ponovnu upotrebu ili publiciranje."
-
-#~ msgid "Stop Recording"
-#~ msgstr "Zaustavi Snimanje"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Ako mislite da Vaš modul može zainteresovati i druge ljude, Voleli bismo da "
-#~ "ga objabvite na OpenERP.com u sekciji 'Moduli'. To možete učiniti preko "
-#~ "vebsajta ili koristeći mogućnosti modula 'base_module_publish' ."
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Modul uspešno napravljen !"
-
-#~ msgid "Module Record"
-#~ msgstr "Zapisivanje modula"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Ovaj modul omogućava da napravite novi modul bez ikakvog razvoja.\n"
-#~ "Zapisuje sve operacije na stavkama za vreme sesija zapisivanaj i\n"
-#~ "pravi .ZIP modul. Tako da možete napraviti sopstvene module direknto iz\n"
-#~ "OpenERP klijenta.\n"
-#~ "\n"
-#~ "Ova verzija radi za pravljenje i izmenu postojećih zapisa. Iznova "
-#~ "obračunava\n"
-#~ "međuzavisnosti i veze između svih tipova vidžeta (man2one, many2many, ...).\n"
-#~ "\n"
-#~ "Ovo bi trebalo da Vam pomogne da lako pravite ponovo upotrebljive module, "
-#~ "koje možete ponovo objaviti,\n"
-#~ "za korisnička podešavanja i demo/testiranje podataka.\n"
-#~ "\n"
-#~ "Kako ga koristiti:\n"
-#~ "Pokrenite Administration/Customization/Module Creation/Export Customizations "
-#~ "kao pomoćni modul.\n"
-#~ "Izaberite datum i vreme kao kriterijume za zapis i stavke za zapis i "
-#~ "zapišite modul.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/sv.po b/addons/base_module_record/i18n/sv.po
deleted file mode 100644
index 4a34f859530..00000000000
--- a/addons/base_module_record/i18n/sv.po
+++ /dev/null
@@ -1,288 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.14\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-08-03 23:19+0000\n"
-"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Kategori"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Information"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Slut"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Välj objekt att spela in"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Upphovsman"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Katalognamn"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Endast poster"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Testdata"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Filnamn"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Version"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Spela in objekt"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-"Om du tror att din modul skulle intressera andra människor, vill vi att du "
-"publicera den på http://www.openerp.com, i \"Modules avsnitt. Du kan göra "
-"det via hemsidan eller genom att använda funktioner i "
-"\"base_module_publish\" modulen."
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Spela in från datum"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Spela in moduler"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Exportera anpassning som modul"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "Tack i förväg för ditt bidrag."
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Lista med objekt som skall spelas in"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Komplett beskrivning"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Modulnamn"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Objekt"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Modulens .zip-fil"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "YAML-filen framgångsrikt skapad !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Resultat, klipp in detta i din moduls xml-fil"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Skapad"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Tack för att du använder modul-inspelaren"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "Dokumentations-URL"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Ändrad"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Spela in"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Fortsätt"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Exportera anpassningar som en data-fil"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Fel"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Normala data"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "OK"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Modulskapande"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Typ av data"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Modulinformation"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Resultat"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "Avbryt"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Stäng"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Skapad och ändrad"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Module Recorder"
-#~ msgstr "Module Recorder"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "Om du tror att din modul kan intressera fler så skulle vi vilja att du "
-#~ "publicerar den på OpenERP.com under \"Modules\" sektionen. Du kan göra det "
-#~ "genom hemsidan eller genom att använda \"base_module_publish\" modulen."
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Modulen framgångsrikt skapad !"
diff --git a/addons/base_module_record/i18n/tlh.po b/addons/base_module_record/i18n/tlh.po
deleted file mode 100644
index 9f20eefb323..00000000000
--- a/addons/base_module_record/i18n/tlh.po
+++ /dev/null
@@ -1,264 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr ""
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr ""
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
deleted file mode 100644
index c0cce843c25..00000000000
--- a/addons/base_module_record/i18n/tr.po
+++ /dev/null
@@ -1,332 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:31+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Sınıf"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Bilgi"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Son"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "Kaydedilecek nesneleri seçin"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Yazan"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Dizin Adı"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "Sadece kayıtlar"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Demo Bilgileri"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Dosya Adı"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Sürüm"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "Nesnelerin kaydı"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-"Eğer modülünüzün başka kullanıcıların ilgisini çekeceğini düşünüyorsanız, "
-"modülünüzü  http://apps.openerp.com sitesinde yayınlamak isteriz. Modül "
-"yayını için yine 'base_module_publish' modülünü de kullanabilirsiniz."
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Tarihten beri kayıtlar"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "Modül Kaydı"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "Özelleştirmeleri modül olarak dışa aktar"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "katkınız için şimdiden teşekkürler"
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "Kaydedilecek nesnelerin listesi"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Tam Açıklama"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Modül Adı"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Nesneler"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Modül .zip dosyası"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Modül başarılı olarak oluşturuldu !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "YAML dosyası başarılı bir şekilde oluşturuldu !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "Sonuç, Bunu modülün XML dosyasına yapıştrın"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Oluşturuldu"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "Modül kaydediciyi kullandığınız için teşekkürler"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "Dokümantasyon URL"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Değiştirildi"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Kayıt"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Devam et"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "Özelleştirmeleri dosya olarak kaydet"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Hata"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Normal Veri"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Tamam"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "Modül Olşturulma"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Veri tipi"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Modül Bilgisi"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "Sonuç"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "İptal"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "Kapat"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "Oluşturuldu & Değiştirildi"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "Nesne adı x_ ile başlamalı ve özel karakterler içermemelidir!"
-
-#~ msgid "Status"
-#~ msgstr "Durum"
-
-#~ msgid "Start Recording"
-#~ msgstr "Kaydı Başlat"
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr "Eğer hazırladığınız modülünüz başka insanların ilgisini çekebili"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Modül başarılı olarak oluşturuldu !"
-
-#~ msgid "Module Record"
-#~ msgstr "Modül Kaydet"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Bu modül kod yazmadan yeni modül geliştirmeye yarar.\n"
-#~ "Nesne üzerinde yaptığınız bütün işlemleri kaydeder ve bir .ZIP dosyasına "
-#~ "kaydeder. \n"
-#~ "Böylece OpenERP istemcisini kullanarak bir modül oluşturabilirsiniz.\n"
-#~ "\n"
-#~ "Bu sürüm yeni kayıt oluşturma ve kayıtları değiştirmek için kullanılabilir. "
-#~ "Bağımlı modüller\n"
-#~ "tekrar hesaplar ve her tip araç (many2one, many2many, ...) ile bağlantı "
-#~ "kurar. \n"
-#~ "\n"
-#~ "Bu modülü kullanarak  tekrar kullanılabilir ve yayınlanabilir modüller "
-#~ "oluşturabilirsiniz.\n"
-#~ "\n"
-#~ "Nasıl Kullanılır:\n"
-#~ "Yönetim / ÖZelleştirmeler / Modül Oluşturma / Özelleştirmeleri modül olarak "
-#~ "dışa aktarma sihirbazı.\n"
-#~ "Kayıt için kaydedilecek nesneleri ve tarih saat bilgisini seçin ve modülü "
-#~ "kaydedin.\n"
-#~ "    "
diff --git a/addons/base_module_record/i18n/uk.po b/addons/base_module_record/i18n/uk.po
deleted file mode 100644
index 3f8f001b113..00000000000
--- a/addons/base_module_record/i18n/uk.po
+++ /dev/null
@@ -1,269 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-09-08 13:52+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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr ""
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
diff --git a/addons/base_module_record/i18n/vi.po b/addons/base_module_record/i18n/vi.po
deleted file mode 100644
index b98c991bc5f..00000000000
--- a/addons/base_module_record/i18n/vi.po
+++ /dev/null
@@ -1,268 +0,0 @@
-# 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.
-# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:23+0000\n"
-"Last-Translator: OpenBMS JSC <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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "Phân loại"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "Thông tin"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "Kết thúc"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "Tác giả"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "Tên thư mục"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "Dữ liệu mẫu"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "Tên tập tin"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "Phiên bản"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "Bản ghi từ Ngày"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr ""
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "Mô tả đầy đủ"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "Tên mô-đun"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "Các đối tượng"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "Tập tin .zip của mô-đun"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "Mô-đun được tạo thành công !"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "Đã tạo"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "Đã sửa đổi"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "Ghi"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "Tiếp tục"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "Lỗi"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "Dữ liệu thông thường"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "Đồng ý"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "Loại dữ liệu"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "Thông tin về mô-đun"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr ""
-
-#~ msgid "Module successfully created !"
-#~ msgstr "Mô-đun được tạo thành công !"
diff --git a/addons/base_module_record/i18n/zh_CN.po b/addons/base_module_record/i18n/zh_CN.po
deleted file mode 100644
index 5c9ee38cad7..00000000000
--- a/addons/base_module_record/i18n/zh_CN.po
+++ /dev/null
@@ -1,372 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:43+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@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: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "分类"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "信息"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr "ir.module.record"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "结束"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr "选择要记录的对象"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "作者"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "目录名"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr "只记录"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "演示数据"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "文件名"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "版本"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr "记录对象"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr "如果你的模块对其他人也有用，我们建议你在apps.openerp.com上发布它。可以在网站上找到发布方法。"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr "记录日期"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr "记录模块"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr "导出自定义模块"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr "感谢你的贡献"
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr "要记录的对象列表"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "完整的说明"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "模块名"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "对象"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "模块zip文件"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr "模块已成功创建！"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr "YMAL 文件创建成功！"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr "结果，粘贴这个到你的模块的xml文件里面"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr "已创建"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr "感谢你使用模块记录"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr "文档URL"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "修改"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr "记录"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "下一步"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr "导出自定义配置到数据文件"
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr "错误"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "普通数据"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr "确定"
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr "模块创建"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "数据类型"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "模块信息"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr "YAML"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "结果"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "取消"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "关闭"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr "创建&修改"
-
-#~ msgid "Status"
-#~ msgstr "状态"
-
-#~ msgid "Recording Information"
-#~ msgstr "记录信息"
-
-#~ msgid "Module successfully created !"
-#~ msgstr "模块已成功创建！"
-
-#~ msgid "Recording"
-#~ msgstr "记录中"
-
-#~ msgid "Stop Recording"
-#~ msgstr "结束记录"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
-
-#~ msgid "Start Recording"
-#~ msgstr "开始记录"
-
-#~ msgid "Not Recording"
-#~ msgstr "不记录"
-
-#~ msgid "Recording information"
-#~ msgstr "记录信息"
-
-#~ msgid "Recording Stopped"
-#~ msgstr "停止记录"
-
-#~ msgid "Continue Previous Session"
-#~ msgstr "继续先前的会话"
-
-#~ msgid "Module Recorder"
-#~ msgstr "模块记录"
-
-#~ msgid ""
-#~ "If you think your module could interrest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr "如果你认为你的模块可以发布给其他人.你可以上网站或使用'base_module_publish'模块"
-
-#~ msgid ""
-#~ "The module recorder allows you to record every operation made in the Open "
-#~ "ERP client and save them as a module. You will be able to install this "
-#~ "module on any database to reuse and/or publish it."
-#~ msgstr "这记录者模块允许你记录客户端的每个操作并保存为一个模块.你能够安装这模块可以再利用或发布"
-
-#~ msgid "Record module"
-#~ msgstr "记录模块"
-
-#~ msgid ""
-#~ "Open ERP recording is stopped. Don't forget to save the recorded module."
-#~ msgstr "停止系统记录不要忘记保存记录"
-
-#~ msgid ""
-#~ "You can continue the recording session by relauching the 'start recording' "
-#~ "wizard."
-#~ msgstr "你可以继续记录这会话. '开始记录' 向导"
-
-#~ msgid "Save Recorded Module"
-#~ msgstr "保存记录模块"
-
-#~ msgid "Module Record"
-#~ msgstr "Module Record"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module allows you to create a new module without any development.\n"
-#~ "It records all operations on objects during the recording session and\n"
-#~ "produce a .ZIP module. So you can create your own module directly from\n"
-#~ "the OpenERP client.\n"
-#~ "\n"
-#~ "This version works for creating and updating existing records. It "
-#~ "recomputes\n"
-#~ "dependencies and links for all types of widgets (many2one, many2many, ...).\n"
-#~ "It also support workflows and demo/update data.\n"
-#~ "\n"
-#~ "This should help you to easily create reusable and publishable modules\n"
-#~ "for custom configurations and demo/testing data.\n"
-#~ "\n"
-#~ "How to use it:\n"
-#~ "Run Administration/Customization/Module Creation/Export Customizations As a "
-#~ "Module wizard.\n"
-#~ "Select datetime criteria of recording and objects to be recorded and Record "
-#~ "module.\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "这个模块可以让你不通过代码开发就创建一个新模块。\n"
-#~ "它会记录你在操作中对象的所有的操作和变量的产生\n"
-#~ "并生成一个.ZIP模块文件。所以你可以直接用OpenERP\n"
-#~ "客户端来创建模块。\n"
-#~ "\n"
-#~ "如何使用它：\n"
-#~ "运行管理/自定义/创建模块/把自定义设置导出为模块向导。\n"
-#~ "选择录制和被录制的对象和记录模块中的日期时间标准。\n"
-#~ "    "
-
-#~ msgid ""
-#~ "If you think your module could interest others people, we'd like you to "
-#~ "publish it on OpenERP.com, in the 'Modules' section. You can do it through "
-#~ "the website or using features of the 'base_module_publish' module."
-#~ msgstr ""
-#~ "如果您觉得你的模块会让其他人感兴趣。我们希望您把它发布到OpenERP.com的模块部分。你可以通过这个网页或者用base_module_publish这"
-#~ "个模块来发布"
diff --git a/addons/base_module_record/i18n/zh_TW.po b/addons/base_module_record/i18n/zh_TW.po
deleted file mode 100644
index c69621ac6f0..00000000000
--- a/addons/base_module_record/i18n/zh_TW.po
+++ /dev/null
@@ -1,264 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_module_record
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-01-30 12:44+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,category:0
-msgid "Category"
-msgstr "分類"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Information"
-msgstr "資訊"
-
-#. module: base_module_record
-#: model:ir.model,name:base_module_record.model_ir_module_record
-msgid "ir.module.record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,info,end:0
-#: wizard_button:base_module_record.module_record_data,save_yaml,end:0
-msgid "End"
-msgstr "結束"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Choose objects to record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,author:0
-msgid "Author"
-msgstr "作者"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,directory_name:0
-msgid "Directory Name"
-msgstr "目錄名稱"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,filter_cond:0
-#: wizard_field:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Records only"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Demo Data"
-msgstr "演示資料"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_filename:0
-msgid "Filename"
-msgstr "檔案名稱"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,version:0
-msgid "Version"
-msgstr "版本"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,init:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-#: wizard_view:base_module_record.module_record_objects,init:0
-msgid "Objects Recording"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid ""
-"If you think your module could interest other people, we'd like you to "
-"publish it on http://www.openerp.com, in the 'Modules' section. You can do "
-"it through the website or using features of the 'base_module_publish' module."
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,check_date:0
-#: wizard_field:base_module_record.module_record_objects,init,check_date:0
-msgid "Record from Date"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-#: wizard_view:base_module_record.module_record_objects,info:0
-#: wizard_view:base_module_record.module_record_objects,save:0
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "Module Recording"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_objects
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_objects
-msgid "Export Customizations As a Module"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Thanks in advance for your contribution."
-msgstr ""
-
-#. module: base_module_record
-#: help:base_module_record.module_record_data,init,objects:0
-#: help:base_module_record.module_record_objects,init,objects:0
-msgid "List of objects to be recorded"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,description:0
-msgid "Full Description"
-msgstr "完整說明"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,name:0
-msgid "Module Name"
-msgstr "模組名稱"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,objects:0
-#: wizard_field:base_module_record.module_record_objects,init,objects:0
-msgid "Objects"
-msgstr "物件"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,save,module_file:0
-#: wizard_field:base_module_record.module_record_objects,save_yaml,yaml_file:0
-msgid "Module .zip File"
-msgstr "模組 .zip 檔"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save:0
-msgid "Module successfully created!"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,save_yaml:0
-msgid "YAML file successfully created !"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,info:0
-#: wizard_view:base_module_record.module_record_data,save_yaml:0
-msgid "Result, paste this to your module's xml"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_data,end:0
-#: wizard_view:base_module_record.module_record_objects,end:0
-msgid "Thanks For using Module Recorder"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,website:0
-msgid "Documentation URL"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Modified"
-msgstr "已修改"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,record:0
-#: wizard_button:base_module_record.module_record_objects,init,record:0
-msgid "Record"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,info,save:0
-msgid "Continue"
-msgstr "繼續"
-
-#. module: base_module_record
-#: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record_data
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_data
-msgid "Export Customizations As Data File"
-msgstr ""
-
-#. module: base_module_record
-#: code:addons/base_module_record/wizard/base_module_save.py:129
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_objects,info,data_kind:0
-msgid "Normal Data"
-msgstr "正常資料"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,end,end:0
-#: wizard_button:base_module_record.module_record_objects,end,end:0
-msgid "OK"
-msgstr ""
-
-#. module: base_module_record
-#: model:ir.ui.menu,name:base_module_record.menu_wizard_base_mod_rec
-msgid "Module Creation"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_objects,info,data_kind:0
-msgid "Type of Data"
-msgstr "資料類型"
-
-#. module: base_module_record
-#: wizard_view:base_module_record.module_record_objects,info:0
-msgid "Module Information"
-msgstr "模組資訊"
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,init,info_yaml:0
-#: wizard_field:base_module_record.module_record_objects,init,info_yaml:0
-msgid "YAML"
-msgstr ""
-
-#. module: base_module_record
-#: wizard_field:base_module_record.module_record_data,info,res_text:0
-#: wizard_field:base_module_record.module_record_data,save_yaml,res_text:0
-msgid "Result"
-msgstr "結果"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_data,init,end:0
-#: wizard_button:base_module_record.module_record_objects,info,end:0
-#: wizard_button:base_module_record.module_record_objects,init,end:0
-msgid "Cancel"
-msgstr "取消"
-
-#. module: base_module_record
-#: wizard_button:base_module_record.module_record_objects,save,end:0
-#: wizard_button:base_module_record.module_record_objects,save_yaml,end:0
-msgid "Close"
-msgstr "關閉"
-
-#. module: base_module_record
-#: selection:base_module_record.module_record_data,init,filter_cond:0
-#: selection:base_module_record.module_record_objects,init,filter_cond:0
-msgid "Created & Modified"
-msgstr ""
diff --git a/addons/base_module_record/security/ir.model.access.csv b/addons/base_module_record/security/ir.model.access.csv
deleted file mode 100644
index 894312eae88..00000000000
--- a/addons/base_module_record/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_ir_module_record,ir.module.record,model_ir_module_record,base.group_system,1,1,1,1
diff --git a/addons/base_module_record/wizard/__init__.py b/addons/base_module_record/wizard/__init__.py
deleted file mode 100644
index 533abfd84dc..00000000000
--- a/addons/base_module_record/wizard/__init__.py
+++ /dev/null
@@ -1,26 +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 base_module_save
-import base_module_record_objects
-import base_module_record_data
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/base_module_record/wizard/base_module_record_data.py b/addons/base_module_record/wizard/base_module_record_data.py
deleted file mode 100644
index cb1e9507495..00000000000
--- a/addons/base_module_record/wizard/base_module_record_data.py
+++ /dev/null
@@ -1,134 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 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 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
-import tools
-from tools.translate import _
-
-import time
-
-class base_module_data(osv.osv_memory):
-    _name = 'base.module.data'
-    _description = "Base Module Data"
-
-    _columns = {
-        'check_date': fields.datetime('Record from Date', required=True),
-        'objects': fields.many2many('ir.model', 'base_module_record_model_rel', 'objects', 'model_id', 'Objects'),
-        'filter_cond': fields.selection([('created', 'Created'), ('modified', 'Modified'), ('created_modified', 'Created & Modified')], 'Records only', required=True),
-        'info_yaml': fields.boolean('YAML'),
-    }
-
-    def _get_default_objects(self, cr, uid, context=None):
-        names = ('ir.ui.view', 'ir.ui.menu', 'ir.model', 'ir.model.fields', 'ir.model.access',
-            'res.partner', 'res.partner.category', 'workflow',
-            'workflow.activity', 'workflow.transition', 'ir.actions.server', 'ir.server.object.lines')
-        return self.pool.get('ir.model').search(cr, uid, [('model', 'in', names)])
-
-    _defaults = {
-        'check_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'objects': _get_default_objects,
-        'filter_cond': 'created',
-    }
-    
-    def _create_xml(self, cr, uid, data, context=None):
-        mod = self.pool.get('ir.module.record')
-        res_xml = mod.generate_xml(cr, uid)
-        return {'res_text': res_xml }
-    
-    def _create_yaml(self, cr, uid, data, context=None):
-        mod = self.pool.get('ir.module.record')
-        res_xml = mod.generate_yaml(cr, uid)
-        return { 'res_text': res_xml }    
-    
-    def record_objects(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        check_date = data['check_date']
-        filter = data['filter_cond']
-        user = (self.pool.get('res.users').browse(cr, uid, uid)).login
-        mod = self.pool.get('ir.module.record')
-        mod_obj = self.pool.get('ir.model')
-        mod.recording_data = []
-        for id in data['objects']:
-            obj_name=(mod_obj.browse(cr, uid, id)).model
-            obj_pool=self.pool.get(obj_name)
-            if filter =='created':
-                search_condition =[('create_date','>',check_date)]
-            elif filter =='modified':
-                search_condition =[('write_date','>',check_date)]
-            elif filter =='created_modified':
-                search_condition =['|',('create_date','>',check_date),('write_date','>',check_date)]
-            if '_log_access' in dir(obj_pool):
-                  if not (obj_pool._log_access):
-                      search_condition=[]
-                  if '_auto' in dir(obj_pool):
-                      if not obj_pool._auto:
-                          continue
-            search_ids=obj_pool.search(cr,uid,search_condition)
-            for s_id in search_ids:
-                 args=(cr.dbname,uid,obj_name,'copy', s_id,{}, context)
-                 mod.recording_data.append(('query', args, {}, s_id))
-         
-        mod_obj = self.pool.get('ir.model.data')
-        if len(mod.recording_data):
-            if data['info_yaml']:
-                res=self._create_yaml(cr, uid, data, context)
-            else:
-                res=self._create_xml(cr, uid, data, context)
-            model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'module_create_xml_view')], context=context)
-            resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-            return {
-                'name': _('Data Recording'),
-                'context': {'default_res_text': tools.ustr(res['res_text'])},
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'base.module.record.data',
-                'views': [(resource_id, 'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-            }
-
-        model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'module_recording_message_view')], context=context)
-        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        return {
-            'name': _('Module Recording'),
-            'context': context,
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'base.module.record.objects',
-            'views': [(resource_id, 'form')],
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }
-
-base_module_data()
-
-class base_module_record_data(osv.osv_memory):
-    _name = 'base.module.record.data'
-    _description = "Base Module Record Data"
-                
-    _columns = {
-        'res_text': fields.text('Result'),
-    }    
-    
-base_module_record_data()
-
-#vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_record/wizard/base_module_record_data_view.xml b/addons/base_module_record/wizard/base_module_record_data_view.xml
deleted file mode 100644
index afe9833c209..00000000000
--- a/addons/base_module_record/wizard/base_module_record_data_view.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="base_module_record_data_view" model="ir.ui.view">
-            <field name="name">base_module_record_data</field>
-            <field name="model">base.module.data</field>
-            <field name="arch" type="xml">
-                <form string="Data Recording" version="7.0">
-                    <group>
-                        <field name="check_date"/>
-                        <field name="filter_cond"/>
-                    </group>
-                    <separator string="Choose objects to record"/>
-                    <field name="objects"/>
-                    <group><field name="info_yaml"/></group>
-                    <footer>
-                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_base_module_record_data">
-            <field name="name">Export Customizations as Data</field>
-            <field name="res_model">base.module.data</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-            <field name="view_id" ref="base_module_record_data_view"/>
-        </record>
-
-            
-        <menuitem
-            parent="menu_wizard_base_mod_rec"
-            name="Export Customizations As Data file"
-            action="action_base_module_record_data"
-            id="menu_wizard_base_module_record_data"/>
-
-        <act_window
-            id="act_base_module_record_data"
-            name="Export Customizations As Data File"
-            res_model="base.module.data"
-            src_model="ir.module.module"
-            view_mode="form"
-            target="new"
-            multi="True"
-            key2="client_action_multi"/>            
-            
-        <record id="module_create_xml_view" model="ir.ui.view">
-            <field name="name">module.create.xml.form</field>
-            <field name="model">base.module.record.data</field>
-            <field name="arch" type="xml">
-                <form string="Data Recording">
-                    <separator string="Result, paste this to your module's xml" colspan="4" />
-                    <field name="res_text" nolabel="1"  colspan="4"/>
-                </form>
-            </field>
-         </record>
-    </data>
-</openerp>            
diff --git a/addons/base_module_record/wizard/base_module_record_object_view.xml b/addons/base_module_record/wizard/base_module_record_object_view.xml
deleted file mode 100644
index fdfb6e9fc66..00000000000
--- a/addons/base_module_record/wizard/base_module_record_object_view.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="base_module_record_objects_view" model="ir.ui.view">
-            <field name="name">base_module_record_objects</field>
-            <field name="model">base.module.record</field>
-            <field name="arch" type="xml">
-                <form string="Objects Recording" version="7.0">
-                    <group>
-                        <field name="check_date"/>
-                        <field name="filter_cond"/>
-                    </group>
-                    <separator string="Choose objects to record"/>
-                    <field name="objects"/>
-                    <group><field name="info_yaml"/></group>
-                    <footer>
-                        <button name="record_objects" string="Record" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_base_module_record_objects">
-            <field name="name">Export Customizations as a Module</field>
-            <field name="res_model">base.module.record</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-            <field name="view_id" ref="base_module_record_objects_view"/>
-        </record>
-
-        <menuitem
-            parent="base.menu_custom"
-            name="Module Creation"
-            id="menu_wizard_base_mod_rec"/>
-            
-        <menuitem
-            parent="menu_wizard_base_mod_rec"
-            name="Export Customizations As a Module"
-            action="action_base_module_record_objects"
-            id="menu_wizard_base_module_record_objects"/>
-
-        <act_window
-            id="act_base_module_record_objects"
-            name="Export Customizations As a Module"
-            res_model="base.module.record"
-            src_model="ir.module.module"
-            view_mode="form"
-            target="new"
-            multi="True"
-            key2="client_action_multi"/>                 
-
-        <record id="module_create_form_view" model="ir.ui.view">
-            <field name="name">module.create.form</field>
-            <field name="model">base.module.record.objects</field>
-            <field name="arch" type="xml">
-                <form string="Module Recording">
-                    <group string="Module successfully created!">
-                        <field name="module_filename"/>
-                        <field name="module_file"/>
-                    </group>
-                    <separator string="Information"/>
-                    <label string="If you think your module could interest other people, we'd like you to publish it on http://www.openerp.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module." align="0.0"/>
-                    <label string="Thanks in advance for your contribution." align="0.0"/>
-                </form>
-            </field>
-         </record>         
-
-        <record model="ir.actions.act_window" id="action_module_created">
-            <field name="name">Module Recording</field>
-            <field name="res_model">base.module.record.objects</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-            <field name="view_id" ref="module_create_form_view"/>
-        </record>
-                        
-        <record id="info_start_form_view" model="ir.ui.view">
-            <field name="name">info.start.form.view</field>
-            <field name="model">base.module.record.objects</field>
-            <field name="arch" type="xml">
-                <form string="Module Recording" version="7.0">
-                    <group string="Module Information">
-                        <field name="name"/>
-                        <field name="directory_name"/>
-                        <field name="version"/>
-                        <field name="author"/>
-                        <field name="website" colspan="4"/>
-                        <field name="category" colspan="4"/>
-                        <field name="data_kind"/>
-                    </group>
-                    <separator string="Description"/>
-                    <field name="description"/>
-                    <footer>
-                        <button string="Continue" name="inter_call" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-         </record>
-         
-        <record id="module_recording_message_view" model="ir.ui.view">
-            <field name="name">module_recording_message</field>
-            <field name="model">base.module.record.objects</field>
-            <field name="arch" type="xml">
-                <form string="Module Recording">
-                    <label string="Thanks For using Module Recorder" colspan="4" align="0.0"/>
-                </form>
-            </field>
-        </record>         
-
-        <record id="yml_save_form_view" model="ir.ui.view">
-            <field name="name">yml.save.form</field>
-            <field name="model">base.module.record.objects</field>
-            <field name="arch" type="xml">
-                <form string="Module Recording">
-                    <separator string="YAML file successfully created !" colspan="4"/>
-                    <newline/>
-                    <field name="yaml_file" filename="module_filename"/>
-                </form>  
-            </field>
-        </record>   
-        
-    </data>
-</openerp>
diff --git a/addons/base_module_record/wizard/base_module_record_objects.py b/addons/base_module_record/wizard/base_module_record_objects.py
deleted file mode 100644
index 22383bc37d6..00000000000
--- a/addons/base_module_record/wizard/base_module_record_objects.py
+++ /dev/null
@@ -1,173 +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
-import tools
-from tools.translate import _
-import base_module_save
-
-import time
-
-class base_module_record(osv.osv_memory):
-    _name = 'base.module.record'
-    _description = "Base Module Record"
-        
-    _columns = {
-        'check_date': fields.datetime('Record from Date', required=True),
-        'objects': fields.many2many('ir.model', 'base_module_record_object_rel', 'objects', 'model_id', 'Objects'),
-        'filter_cond': fields.selection([('created', 'Created'), ('modified', 'Modified'), ('created_modified', 'Created & Modified')], 'Records only', required=True),
-        'info_yaml': fields.boolean('YAML'),
-    }
-
-    def _get_default_objects(self, cr, uid, context=None):
-        names = ('ir.ui.view', 'ir.ui.menu', 'ir.model', 'ir.model.fields', 'ir.model.access',
-            'res.partner', 'res.partner.category', 'workflow',
-            'workflow.activity', 'workflow.transition', 'ir.actions.server', 'ir.server.object.lines')
-        return self.pool.get('ir.model').search(cr, uid, [('model', 'in', names)])
-
-    _defaults = {
-        'check_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'objects': _get_default_objects,
-        'filter_cond': 'created',
-    }
-    
-    def record_objects(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        check_date=data['check_date']
-        filter=data['filter_cond']
-        user=(self.pool.get('res.users').browse(cr,uid,uid)).login
-        mod = self.pool.get('ir.module.record')
-        mod_obj = self.pool.get('ir.model')
-        mod.recording_data = []
-        for id in data['objects']:
-            obj_name=(mod_obj.browse(cr,uid,id)).model
-            obj_pool=self.pool.get(obj_name)
-            if filter =='created':
-                search_condition =[('create_date', '>', check_date)]
-            elif filter =='modified':
-                search_condition =[('write_date', '>', check_date)]
-            elif filter =='created_modified':
-                search_condition =['|',('create_date', '>', check_date), ('write_date', '>', check_date)]
-            if '_log_access' in dir(obj_pool):
-                  if not (obj_pool._log_access):
-                      search_condition=[]
-                  if '_auto' in dir(obj_pool):
-                      if not obj_pool._auto:
-                          continue
-            search_ids = obj_pool.search(cr,uid,search_condition)
-            for s_id in search_ids:
-                 args=(cr.dbname, uid,obj_name, 'copy', s_id,{},context)
-                 mod.recording_data.append(('query', args, {}, s_id))
-         
-        mod_obj = self.pool.get('ir.model.data')
-        if len(mod.recording_data):
-            if data['info_yaml']:
-                mod = self.pool.get('ir.module.record')
-                res=base_module_save._create_yaml(self, cr, uid, data, context)
-                model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'yml_save_form_view')], context=context)
-                resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-                return {
-                    'name': _('Message'),
-                    'context': {'default_yaml_file': tools.ustr(res['yaml_file'])},
-                    'view_type': 'form',
-                    'view_mode': 'form',
-                    'res_model': 'base.module.record.objects',
-                    'views': [(resource_id, 'form')],
-                    'type': 'ir.actions.act_window',
-                    'target': 'new',
-                }
-            else:
-                model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'info_start_form_view')], context=context)
-                resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-                return {
-                    'name': _('Message'),
-                    'context': context,
-                    'view_type': 'form',
-                    'view_mode': 'form',
-                    'res_model': 'base.module.record.objects',
-                    'views': [(resource_id, 'form')],
-                    'type': 'ir.actions.act_window',
-                    'target': 'new',
-                }
-
-        model_data_ids = mod_obj.search(cr, uid, [('model', '=', 'ir.ui.view'), ('name', '=', 'module_recording_message_view')], context=context)
-        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        return {
-            'name': _('Message'),
-            'context': context,
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'base.module.record.objects',
-            'views': [(resource_id, 'form')],
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }      
-
-base_module_record()
-
-class base_module_record_objects(osv.osv_memory):
-    _name = 'base.module.record.objects'
-    _description = "Base Module Record Objects"
-                
-    def inter_call(self,cr,uid,data,context=None):
-        res=base_module_save._create_module(self, cr, uid, data, context)
-        mod_obj = self.pool.get('ir.model.data')
-        model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'module_create_form_view')], context=context)
-        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        context.update(res)
-        
-        return {
-            'name': _('Message'),
-            'context': {
-                'default_module_filename': tools.ustr(res['module_filename']),
-                'default_module_file': tools.ustr(res['module_file']),
-            },
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'base.module.record.objects',
-            'views': [(resource_id, 'form')],
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }
-    
-    _columns = {
-        'name': fields.char('Module Name', size=64, required=True),
-        'directory_name': fields.char('Directory Name', size=32, required=True),
-        'version': fields.char('Version', size=16, required=True),
-        'author': fields.char('Author', size=64, required=True),
-        'category': fields.char('Category', size=64, required=True),
-        'website': fields.char('Documentation URL', size=64, required=True),
-        'description': fields.text('Full Description', required=True),
-        'data_kind': fields.selection([('demo', 'Demo Data'), ('update', 'Normal Data')], 'Type of Data', required=True),
-        'module_file': fields.binary('Module .zip File', filename="module_filename"),
-        'module_filename': fields.char('Filename', size=64),
-        'yaml_file': fields.binary('Module .zip File'),
-    }
-    _defaults = {
-        'author': 'OpenERP SA',
-        'category': 'Vertical Modules/Parametrization',
-        'website': 'http://www.openerp.com',
-        'data_kind': 'update',
-    }    
-   
-base_module_record_objects()
-   
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_record/wizard/base_module_save.py b/addons/base_module_record/wizard/base_module_save.py
deleted file mode 100644
index 5e557472f7e..00000000000
--- a/addons/base_module_record/wizard/base_module_save.py
+++ /dev/null
@@ -1,170 +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 zipfile
-import StringIO
-import base64
-
-import tools
-from tools.translate import _
-from osv import osv, fields
-
-
-def _create_yaml(self, cr, uid, data, context=None):
-    mod = self.pool.get('ir.module.record')
-    try:
-        res_xml = mod.generate_yaml(cr, uid)
-    except Exception, e:
-        raise osv.except_osv(_('Error!'),_(str(e)))
-    return {
-    'yaml_file': base64.encodestring(res_xml),
-}
-    
-def _create_module(self, cr, uid, ids, context=None):
-    mod = self.pool.get('ir.module.record')
-    res_xml = mod.generate_xml(cr, uid)
-    data = self.read(cr, uid, ids, [], context=context)[0]
-    s = StringIO.StringIO()
-    zip = zipfile.ZipFile(s, 'w')
-    dname = data['directory_name']
-    data['update_name'] = ''
-    data['demo_name'] = ''
-    if ['data_kind'] =='demo':
-        data['demo_name'] = '"%(directory_name)s_data.xml"' % data
-    else:
-        data['update_name'] = '"%(directory_name)s_data.xml"' % data
-    data['depends'] = ','.join(map(lambda x: '"'+x+'"', mod.depends.keys()))
-    _terp = """{
-        "name" : "%(name)s",
-        "version" : "%(version)s",
-        "author" : "%(author)s",
-        "website" : "%(website)s",
-        "category" : "%(category)s",
-        "description": \"\"\"%(description)s\"\"\",
-        "depends" : [%(depends)s],
-        "init_xml" : [ ],
-        "demo_xml" : [ %(demo_name)s],
-        "update_xml" : [%(update_name)s],
-        "installable": True
-} """ % data
-    filewrite = {
-        '__init__.py':'#\n# Generated by the OpenERP module recorder !\n#\n',
-        '__openerp__.py':_terp,
-        dname+'_data.xml': res_xml
-    }
-    for name,datastr in filewrite.items():
-        info = zipfile.ZipInfo(dname+'/'+name)
-        info.compress_type = zipfile.ZIP_DEFLATED
-        info.external_attr = 2175008768
-        if not datastr:
-            datastr = ''
-        zip.writestr(info, datastr)
-    zip.close()
-    return {
-        'module_file': base64.encodestring(s.getvalue()),
-        'module_filename': data['directory_name']+'-'+data['version']+'.zip'
-    }
-
-class base_module_save(osv.osv_memory):
-    _name = 'base.module.save'
-    _description = "Base Module Save"
-
-    def default_get(self, cr, uid, fields, context=None):
-        mod = self.pool.get('ir.module.record')
-        result = {}
-        info = "Details of "+str(len(mod.recording_data))+" Operation(s):\n\n"
-        res = super(base_module_save, self).default_get(cr, uid, fields, context=context)
-        for line in mod.recording_data:
-            result.setdefault(line[0],{})
-            result[line[0]].setdefault(line[1][3], {})
-            result[line[0]][line[1][3]].setdefault(line[1][3], 0)
-            result[line[0]][line[1][3]][line[1][3]]+=1
-        for key1,val1 in result.items():
-            info+=key1+"\n"
-            for key2,val2 in val1.items():
-                info+="\t"+key2+"\n"
-                for key3,val3 in val2.items():
-                    info+="\t\t"+key3+" : "+str(val3)+"\n"
-        if 'info_text' in fields:
-            res.update({'info_text': info})
-        if 'info_status' in fields:
-            info_status = mod.recording and 'record' or 'no'
-            res.update({'info_status': info_status})
-        return res
-    
-    _columns = {
-        'info_text': fields.text('Information', readonly=True),
-        'info_status': fields.selection([('no', 'Not Recording'),('record', 'Recording')], 'Status', readonly=True),
-        'info_yaml': fields.boolean('YAML'),
-    }
-
-    def record_save(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        mod = self.pool.get('ir.module.record')
-        mod_obj = self.pool.get('ir.model.data')
-        if len(mod.recording_data):
-            if data['info_yaml']:
-                mod = self.pool.get('ir.module.record')
-                res=_create_yaml(self, cr, uid, data, context)
-                model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'yml_save_form_view')], context=context)
-                resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-                return {
-                    'name': _('Message'),
-                    'context':  {
-                        'default_yaml_file': tools.ustr(res['yaml_file']),
-                        },
-                    'view_type': 'form',
-                    'view_mode': 'form',
-                    'res_model': 'base.module.record.objects',
-                    'views': [(resource_id, 'form')],
-                    'type': 'ir.actions.act_window',
-                    'target': 'new',
-                }
-            else:
-                model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'info_start_form_view')], context=context)
-                resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-                return {
-                    'name': _('Message'),
-                    'context': context,
-                    'view_type': 'form',
-                    'view_mode': 'form',
-                    'res_model': 'base.module.record.objects',
-                    'views': [(resource_id, 'form')],
-                    'type': 'ir.actions.act_window',
-                    'target': 'new',
-                }
-        model_data_ids = mod_obj.search(cr, uid,[('model', '=', 'ir.ui.view'), ('name', '=', 'module_recording_message_view')], context=context)
-        resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        
-        return {
-            'name': _('Message'),
-            'context': context,
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'base.module.record.objects',
-            'views': [(resource_id, 'form')],
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }      
-        
-base_module_save()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/base_module_record/wizard/base_module_save_view.xml b/addons/base_module_record/wizard/base_module_save_view.xml
deleted file mode 100644
index 361e65344f1..00000000000
--- a/addons/base_module_record/wizard/base_module_save_view.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="base_module_save_view" model="ir.ui.view">
-            <field name="name">base_module_save</field>
-            <field name="model">base.module.save</field>
-            <field name="arch" type="xml">
-                <form string="Module Recording" version="7.0">
-                    <group string="Recording Information">
-                        <field name="info_status"/>
-                        <field name="info_text"/>
-                        <field name="info_yaml"/>
-                   </group>
-                    <footer>
-                        <button name="record_save" string="Continue" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_base_module_save">
-            <field name="name">Publish as module</field>
-            <field name="res_model">base.module.save</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-            <field name="view_id" ref="base_module_save_view"/>
-        </record>
-
-        <menuitem
-            parent="menu_wizard_base_mod_rec"
-            name="Publish as Module"
-            action="action_base_module_save"
-            id="menu_wizard_base_module_save"/>
-    
-        <act_window
-            id="act_base_module_save"
-            name="Publish as Module"
-            res_model="base.module.save"
-            src_model="ir.module.module"
-            view_mode="form"
-            target="new"
-            multi="True"
-            key2="client_action_multi"/> 
-    
-    </data>
-</openerp>            
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index 078916b9439..36e15c96877 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -34,12 +34,10 @@ Once you have modified it you can upload the report using the same wizard.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': ['wizard/base_report_design_view.xml'],
-    'update_xml': ['base_report_designer_installer.xml'],
-    'demo_xml': [],
+    'data': ['wizard/base_report_design_view.xml' , 'base_report_designer_installer.xml'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0056379010493',
     'images': ['images/base_report_designer1.jpeg','images/base_report_designer2.jpeg',],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/i18n/ar.po b/addons/base_report_designer/i18n/ar.po
index 69e51ce65f4..eddf5b141b3 100644
--- a/addons/base_report_designer/i18n/ar.po
+++ b/addons/base_report_designer/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/bg.po b/addons/base_report_designer/i18n/bg.po
index 74c7eeece18..e3087df8f40 100644
--- a/addons/base_report_designer/i18n/bg.po
+++ b/addons/base_report_designer/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/bs.po b/addons/base_report_designer/i18n/bs.po
index 64f110e9255..60dbf03faa8 100644
--- a/addons/base_report_designer/i18n/bs.po
+++ b/addons/base_report_designer/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/ca.po b/addons/base_report_designer/i18n/ca.po
index 6c130ab034f..d0fa2082e54 100644
--- a/addons/base_report_designer/i18n/ca.po
+++ b/addons/base_report_designer/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/cs.po b/addons/base_report_designer/i18n/cs.po
index 9ebbf4d7ba5..a2943b0a964 100644
--- a/addons/base_report_designer/i18n/cs.po
+++ b/addons/base_report_designer/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/da.po b/addons/base_report_designer/i18n/da.po
index 226867eaa4f..d58baf0461c 100644
--- a/addons/base_report_designer/i18n/da.po
+++ b/addons/base_report_designer/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/de.po b/addons/base_report_designer/i18n/de.po
index d593bcad8a0..ba9791b42e0 100644
--- a/addons/base_report_designer/i18n/de.po
+++ b/addons/base_report_designer/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/el.po b/addons/base_report_designer/i18n/el.po
index 47a03023b45..541dbab7c87 100644
--- a/addons/base_report_designer/i18n/el.po
+++ b/addons/base_report_designer/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/base_report_designer/i18n/es.po b/addons/base_report_designer/i18n/es.po
index f4dcd282393..d4af36b50d7 100644
--- a/addons/base_report_designer/i18n/es.po
+++ b/addons/base_report_designer/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/es_AR.po b/addons/base_report_designer/i18n/es_AR.po
index ee7edb3b96f..6797182aca2 100644
--- a/addons/base_report_designer/i18n/es_AR.po
+++ b/addons/base_report_designer/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/es_CR.po b/addons/base_report_designer/i18n/es_CR.po
index a870f89bebd..00f86355475 100644
--- a/addons/base_report_designer/i18n/es_CR.po
+++ b/addons/base_report_designer/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/es_EC.po b/addons/base_report_designer/i18n/es_EC.po
index 6c23444b153..8f70520bbd5 100644
--- a/addons/base_report_designer/i18n/es_EC.po
+++ b/addons/base_report_designer/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/es_PY.po b/addons/base_report_designer/i18n/es_PY.po
index a01899f734f..4beb01bc23b 100644
--- a/addons/base_report_designer/i18n/es_PY.po
+++ b/addons/base_report_designer/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/et.po b/addons/base_report_designer/i18n/et.po
index 5efc70656de..c16b6c463e6 100644
--- a/addons/base_report_designer/i18n/et.po
+++ b/addons/base_report_designer/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/fa.po b/addons/base_report_designer/i18n/fa.po
index 9d5d33cfaf7..e6a2bc1ea86 100644
--- a/addons/base_report_designer/i18n/fa.po
+++ b/addons/base_report_designer/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/fi.po b/addons/base_report_designer/i18n/fi.po
index d93802b7c39..bcad2b2f95a 100644
--- a/addons/base_report_designer/i18n/fi.po
+++ b/addons/base_report_designer/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/fr.po b/addons/base_report_designer/i18n/fr.po
index 7523898e211..ad31ac2074a 100644
--- a/addons/base_report_designer/i18n/fr.po
+++ b/addons/base_report_designer/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/gl.po b/addons/base_report_designer/i18n/gl.po
index e6f396b1a14..97825920057 100644
--- a/addons/base_report_designer/i18n/gl.po
+++ b/addons/base_report_designer/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/hr.po b/addons/base_report_designer/i18n/hr.po
index a92c59e55e1..2abdd0965c8 100644
--- a/addons/base_report_designer/i18n/hr.po
+++ b/addons/base_report_designer/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: base_report_designer
diff --git a/addons/base_report_designer/i18n/hu.po b/addons/base_report_designer/i18n/hu.po
index da15613f185..dd1a889462f 100644
--- a/addons/base_report_designer/i18n/hu.po
+++ b/addons/base_report_designer/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/id.po b/addons/base_report_designer/i18n/id.po
index 58bab499879..a288df28cd8 100644
--- a/addons/base_report_designer/i18n/id.po
+++ b/addons/base_report_designer/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po
index 2f9395d68fd..e482dfc1b92 100644
--- a/addons/base_report_designer/i18n/it.po
+++ b/addons/base_report_designer/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/ja.po b/addons/base_report_designer/i18n/ja.po
index 57183a1a570..50c5f1c3dfa 100644
--- a/addons/base_report_designer/i18n/ja.po
+++ b/addons/base_report_designer/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/ko.po b/addons/base_report_designer/i18n/ko.po
index df6a850b0a8..af3f9ca2a14 100644
--- a/addons/base_report_designer/i18n/ko.po
+++ b/addons/base_report_designer/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/lt.po b/addons/base_report_designer/i18n/lt.po
index 64f110e9255..60dbf03faa8 100644
--- a/addons/base_report_designer/i18n/lt.po
+++ b/addons/base_report_designer/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/mn.po b/addons/base_report_designer/i18n/mn.po
index 9f7a2d1b740..74abad9f9d2 100644
--- a/addons/base_report_designer/i18n/mn.po
+++ b/addons/base_report_designer/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/nb.po b/addons/base_report_designer/i18n/nb.po
new file mode 100644
index 00000000000..bc4e397811a
--- /dev/null
+++ b/addons/base_report_designer/i18n/nb.po
@@ -0,0 +1,204 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-04 13:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_sxw
+msgid "base.report.sxw"
+msgstr "basen.rapport.sxw"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "OpenERP Report Designer Configuration"
+msgstr "OpenERP Rapport Designer Konfigurasjon"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid ""
+"This plug-in allows you to create/modify OpenERP Reports into OpenOffice "
+"Writer."
+msgstr ""
+"Denne plug-in tillater deg å lage / endre OpenERP rapporter i OpenOffice "
+"Writer."
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "Upload the modified report"
+msgstr "Laste opp den endrede rapporten"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid "The .SXW report"
+msgstr ".SXW rapport"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_designer_installer
+msgid "base_report_designer.installer"
+msgstr "basen.rapport.designer.installatør"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "_Close"
+msgstr "_Lukk"
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "The RML Report"
+msgstr ""
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Configure"
+msgstr "Konfigurer"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "title"
+msgstr "tittel"
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,report_id:0
+#: field:base.report.sxw,report_id:0
+msgid "Report"
+msgstr "Rapport"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_rml_save
+msgid "base.report.rml.save"
+msgstr "Basen.rapport.rml.lagre"
+
+#. module: base_report_designer
+#: model:ir.ui.menu,name:base_report_designer.menu_action_report_designer_wizard
+msgid "Report Designer"
+msgstr "Rapportdesigner"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,name:0
+msgid "File name"
+msgstr "Filnavn"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.sxw:0
+msgid "Get a report"
+msgstr "Få en rapport"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
+msgid "OpenERP Report Designer"
+msgstr "OpenERP Rapport designer"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Continue"
+msgstr "Fortsett"
+
+#. module: base_report_designer
+#: field:base.report.rml.save,file_rml:0
+msgid "Save As"
+msgstr "Lagre som"
+
+#. module: base_report_designer
+#: help:base_report_designer.installer,plugin_file:0
+msgid ""
+"OpenObject Report Designer plug-in file. Save as this file and install this "
+"plug-in in OpenOffice."
+msgstr ""
+"OpenObject Report Designer plug-in-filen. Lagre som denne filen og "
+"installere denne plugin-modulen i OpenOffice."
+
+#. module: base_report_designer
+#: view:base.report.rml.save:0
+msgid "Save RML FIle"
+msgstr "Lagre RML fil"
+
+#. module: base_report_designer
+#: field:base.report.file.sxw,file_sxw:0
+#: field:base.report.file.sxw,file_sxw_upload:0
+msgid "Your .SXW file"
+msgstr "Din .SXW fil"
+
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Installasjon og Konfigurasjon trinn"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,description:0
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+msgid ""
+"This is the template of your requested report.\n"
+"Save it as a .SXW file and open it with OpenOffice.\n"
+"Don't forget to install the OpenERP SA OpenOffice package to modify it.\n"
+"Once it is modified, re-upload it in OpenERP using this wizard."
+msgstr ""
+"Dette er malen for den forespurte rapporten.\n"
+"Lagre det som en. Sxw fil og åpne den med OpenOffice.\n"
+"Ikke glem å installere OpenERP SA OpenOffice-pakken til å endre det.\n"
+"Når den er modifisert, laste opp det i OpenERP bruke denne veiviseren."
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "Bilde"
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_view_base_report_sxw
+msgid "Base Report sxw"
+msgstr "Basen rapport sxw"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_base_report_file_sxw
+msgid "base.report.file.sxw"
+msgstr "basen.rapport.fil.sxw"
+
+#. module: base_report_designer
+#: field:base_report_designer.installer,plugin_file:0
+msgid "OpenObject Report Designer Plug-in"
+msgstr "OpenObject Rapport Designer Plug-in"
+
+#. module: base_report_designer
+#: model:ir.actions.act_window,name:base_report_designer.action_report_designer_installer
+msgid "OpenERP Report Designer Installation"
+msgstr "OpenERP Rapport Designer Installasjon"
+
+#. module: base_report_designer
+#: view:base.report.file.sxw:0
+#: view:base.report.rml.save:0
+#: view:base.report.sxw:0
+#: view:base_report_designer.installer:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: base_report_designer
+#: model:ir.model,name:base_report_designer.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.handlinger.rapport.xml"
+
+#. module: base_report_designer
+#: view:base.report.sxw:0
+msgid "Select your report"
+msgstr "Velg din rapport"
+
+#~ msgid "The RML report"
+#~ msgstr "RML rapport"
diff --git a/addons/base_report_designer/i18n/nl.po b/addons/base_report_designer/i18n/nl.po
index 6328e1f7176..db574b15f10 100644
--- a/addons/base_report_designer/i18n/nl.po
+++ b/addons/base_report_designer/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/nl_BE.po b/addons/base_report_designer/i18n/nl_BE.po
index 0eddaa594f7..7e78e21390b 100644
--- a/addons/base_report_designer/i18n/nl_BE.po
+++ b/addons/base_report_designer/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/pl.po b/addons/base_report_designer/i18n/pl.po
index 974e7d9f7ce..8bf053f446b 100644
--- a/addons/base_report_designer/i18n/pl.po
+++ b/addons/base_report_designer/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/pt.po b/addons/base_report_designer/i18n/pt.po
index 75ab3d7003a..b82d3e2adfd 100644
--- a/addons/base_report_designer/i18n/pt.po
+++ b/addons/base_report_designer/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/pt_BR.po b/addons/base_report_designer/i18n/pt_BR.po
index 59cc278fc3d..70ec927fafb 100644
--- a/addons/base_report_designer/i18n/pt_BR.po
+++ b/addons/base_report_designer/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
@@ -53,7 +53,7 @@ msgstr "base_report_designer.installer"
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "_Close"
-msgstr "Fe_char"
+msgstr "(_C) Fechar"
 
 #. module: base_report_designer
 #: view:base.report.rml.save:0
@@ -68,7 +68,7 @@ msgstr "Configurar"
 #. module: base_report_designer
 #: view:base_report_designer.installer:0
 msgid "title"
-msgstr "Título"
+msgstr "título"
 
 #. module: base_report_designer
 #: field:base.report.file.sxw,report_id:0
diff --git a/addons/base_report_designer/i18n/ro.po b/addons/base_report_designer/i18n/ro.po
index 2d43a5a7260..4d5ef85068b 100644
--- a/addons/base_report_designer/i18n/ro.po
+++ b/addons/base_report_designer/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/ru.po b/addons/base_report_designer/i18n/ru.po
index 43862ea8489..62d60f89629 100644
--- a/addons/base_report_designer/i18n/ru.po
+++ b/addons/base_report_designer/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sk.po b/addons/base_report_designer/i18n/sk.po
index aa250b44620..44d9e75d12c 100644
--- a/addons/base_report_designer/i18n/sk.po
+++ b/addons/base_report_designer/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sl.po b/addons/base_report_designer/i18n/sl.po
index 14e716a4e04..6351ebedb01 100644
--- a/addons/base_report_designer/i18n/sl.po
+++ b/addons/base_report_designer/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sq.po b/addons/base_report_designer/i18n/sq.po
index ce07a476e57..438021a3651 100644
--- a/addons/base_report_designer/i18n/sq.po
+++ b/addons/base_report_designer/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sr.po b/addons/base_report_designer/i18n/sr.po
index e0b5be44bfe..5661d68aae4 100644
--- a/addons/base_report_designer/i18n/sr.po
+++ b/addons/base_report_designer/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sr@latin.po b/addons/base_report_designer/i18n/sr@latin.po
index a70f5188de5..524abe5109d 100644
--- a/addons/base_report_designer/i18n/sr@latin.po
+++ b/addons/base_report_designer/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/sv.po b/addons/base_report_designer/i18n/sv.po
index 9734f343caf..a66d94f60ca 100644
--- a/addons/base_report_designer/i18n/sv.po
+++ b/addons/base_report_designer/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/tlh.po b/addons/base_report_designer/i18n/tlh.po
index e87980b0a93..25fde2377ff 100644
--- a/addons/base_report_designer/i18n/tlh.po
+++ b/addons/base_report_designer/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index ed538ee41a9..e11d319dc69 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/uk.po b/addons/base_report_designer/i18n/uk.po
index be024249482..bd3cea4b022 100644
--- a/addons/base_report_designer/i18n/uk.po
+++ b/addons/base_report_designer/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/vi.po b/addons/base_report_designer/i18n/vi.po
index 63b34b1f3c7..46ed2c362f3 100644
--- a/addons/base_report_designer/i18n/vi.po
+++ b/addons/base_report_designer/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/zh_CN.po b/addons/base_report_designer/i18n/zh_CN.po
index 45ff4e73170..c568db5da19 100644
--- a/addons/base_report_designer/i18n/zh_CN.po
+++ b/addons/base_report_designer/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/i18n/zh_TW.po b/addons/base_report_designer/i18n/zh_TW.po
index 730a04e2ef6..1f84e876ba1 100644
--- a/addons/base_report_designer/i18n/zh_TW.po
+++ b/addons/base_report_designer/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_report_designer
 #: model:ir.model,name:base_report_designer.model_base_report_sxw
diff --git a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
index a37d46b78a2..436650eb2cd 100644
--- a/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
+++ b/addons/base_report_designer/openerp_sxw2rml/openerp_sxw2rml.py
@@ -42,11 +42,11 @@ import copy
 
 class DomApiGeneral:
     """General DOM API utilities."""
-    def __init__(self,content_string="",file=""):
+    def __init__(self, content_string="", file=""):
         self.content_string = content_string
         self.re_digits = re.compile(r"(.*?\d)(pt|cm|mm|inch|in)")
 
-    def _unitTuple(self,string):
+    def _unitTuple(self, string):
         """Split values and units to a tuple."""
         temp = self.re_digits.findall(string)
         if not temp:
@@ -54,13 +54,15 @@ class DomApiGeneral:
         else:
             return (temp[0])
 
-    def stringPercentToFloat(self,string):
+    def stringPercentToFloat(self, string):
         temp = string.replace("""%""","")
         return float(temp)/100
 
-    def findChildrenByName(self,parent,name,attr_dict={}):
+    def findChildrenByName(self, parent, name, attr_dict=None):
         """Helper functions. Does not work recursively.
         Optional: also test for certain attribute/value pairs."""
+        if attr_dict is None:
+            attr_dict = {}
         children = []
         for c in parent.childNodes:
             if c.nodeType == c.ELEMENT_NODE and c.nodeName == name:
@@ -70,7 +72,7 @@ class DomApiGeneral:
         else:
             return self._selectForAttributes(nodelist=children,attr_dict=attr_dict)
 
-    def _selectForAttributes(self,nodelist,attr_dict):
+    def _selectForAttributes(self, nodelist, attr_dict):
         "Helper function."""
         selected_nodes = []
         for n in nodelist:
@@ -83,7 +85,7 @@ class DomApiGeneral:
                 selected_nodes.append(n)
         return selected_nodes
 
-    def _stringToTuple(self,s):
+    def _stringToTuple(self, s):
         """Helper function."""
         try:
             temp = string.split(s,",")
@@ -91,13 +93,13 @@ class DomApiGeneral:
         except:
             return None
 
-    def _tupleToString(self,t):
+    def _tupleToString(self, t):
         try:
             return self.openOfficeStringUtf8("%s,%s" % (t[0],t[1]))
         except:
             return None
 
-    def _lengthToFloat(self,value):
+    def _lengthToFloat(self, value):
         v = value
         if not self.re_digits.search(v):
             return v
@@ -113,7 +115,7 @@ class DomApiGeneral:
         except:
             return v
 
-    def openOfficeStringUtf8(self,string):
+    def openOfficeStringUtf8(self, string):
         if type(string) == unicode:
             return string.encode("utf-8")
         tempstring = unicode(string,"cp1252").encode("utf-8")
@@ -121,7 +123,7 @@ class DomApiGeneral:
 
 class DomApi(DomApiGeneral):
     """This class provides a DOM-API for XML-Files from an SXW-Archive."""
-    def __init__(self,xml_content,xml_styles):
+    def __init__(self, xml_content, xml_styles):
         DomApiGeneral.__init__(self)
         self.content_dom = xml.dom.minidom.parseString(xml_content)
         self.styles_dom = xml.dom.minidom.parseString(xml_styles)
@@ -145,7 +147,7 @@ class DomApi(DomApiGeneral):
         for s in self.style_dict.keys():
             self.style_properties_dict[s] = self.getStylePropertiesDict(s)
 
-    def updateWithPercents(self,dict,updatedict):
+    def updateWithPercents(self, dict, updatedict):
         """Sometimes you find values like "115%" in the style hierarchy."""
         if not updatedict:
             # no style hierarchies for this style? =>
@@ -244,7 +246,7 @@ class DomApi(DomApiGeneral):
     def toxml(self):
         return self.content_dom.toxml(encoding="utf-8")
 
-    def getStylePropertiesDict(self,style_name):
+    def getStylePropertiesDict(self, style_name):
         res = {}
 
         if self.style_dict[style_name].hasAttribute("style:parent-style-name"):
@@ -265,7 +267,7 @@ class PyOpenOffice(object):
         self.save_pict = save_pict
         self.images = {}
 
-    def oo_read(self,fname):
+    def oo_read(self, fname):
         z = zipfile.ZipFile(fname,"r")
         content = z.read('content.xml')
         style = z.read('styles.xml')
@@ -281,7 +283,7 @@ class PyOpenOffice(object):
         z.close()
         return content,style
 
-    def oo_replace(self,content):
+    def oo_replace(self, content):
         regex = [
             (r"<para[^>]*/>", ""),
             (r"<para(.*)>(.*?)<text:line-break[^>]*/>", "<para$1>$2</para><para$1>"),
@@ -290,7 +292,7 @@ class PyOpenOffice(object):
             content = re.sub(key, val, content)
         return content
 
-    def unpackNormalize(self,sourcefile):
+    def unpackNormalize(self, sourcefile):
         c,s = self.oo_read(sourcefile)
         c = self.oo_replace(c)
         dom = DomApi(c,s)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
index 401cf88b418..43b452b82e2 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/About.py
@@ -52,7 +52,7 @@ if __name__<>'package':
     from lib.gui import *
 
 class About(unohelper.Base, XJobExecutor):
-    def __init__(self,ctx):
+    def __init__(self, ctx):
         self.ctx     = ctx
         self.module  = "openerp_report"
         self.version = "0.1"
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
index a9a18cd9bfa..ba69174ffc6 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/AddAttachment.py
@@ -64,7 +64,7 @@ class AddAttachment(unohelper.Base, XJobExecutor ):
         'PDF' : 'pdf',
         'OpenOffice': 'sxw',
     }
-    def __init__(self,ctx):
+    def __init__(self, ctx):
         self.ctx     = ctx
         self.module  = "openerp_report"
         self.version = "0.1"
@@ -132,7 +132,7 @@ class AddAttachment(unohelper.Base, XJobExecutor ):
         self.win.addButton('btnCancel', -2 - 27 , -5 , 30 , 15, 'Cancel' ,actionListenerProc = self.btnCancel_clicked )
         self.win.doModalDialog("lstResourceType", self.Kind.keys()[0])
 
-    def btnSearch_clicked( self, oActionEvent ):
+    def btnSearch_clicked(self, oActionEvent):
         modelSelectedItem = self.win.getListBoxSelectedItem("lstmodel")
         if modelSelectedItem == "":
             return
@@ -151,7 +151,7 @@ class AddAttachment(unohelper.Base, XJobExecutor ):
         for result in self.aSearchResult:
             self.lstResource.addItem(result[1],result[0])
 
-    def _send_attachment( self, name, data, res_model, res_id ):
+    def _send_attachment(self, name, data, res_model, res_id):
         desktop = getDesktop()
         oDoc2 = desktop.getCurrentComponent()
         docinfo = oDoc2.getDocumentInfo()
@@ -166,7 +166,7 @@ class AddAttachment(unohelper.Base, XJobExecutor ):
 
         return self.sock.execute( database, uid, self.password, 'ir.attachment', 'create', params )
 
-    def send_attachment( self, model, resource_id ):
+    def send_attachment(self, model, resource_id):
         desktop = getDesktop()
         oDoc2 = desktop.getCurrentComponent()
         docinfo = oDoc2.getDocumentInfo()
@@ -187,7 +187,7 @@ class AddAttachment(unohelper.Base, XJobExecutor ):
         data = read_data_from_file( get_absolute_file_path( url ) )
         return self._send_attachment( os.path.basename( url ), data, model, resource_id )
 
-    def btnOkWithoutInformation_clicked( self, oActionEvent ):
+    def btnOkWithoutInformation_clicked(self, oActionEvent):
         desktop = getDesktop()
         oDoc2 = desktop.getCurrentComponent()
         docinfo = oDoc2.getDocumentInfo()
@@ -199,7 +199,7 @@ class AddAttachment(unohelper.Base, XJobExecutor ):
         res = self.send_attachment( docinfo.getUserFieldValue(3), docinfo.getUserFieldValue(2) )
         self.win.endExecute()
 
-    def btnOkWithInformation_clicked(self,oActionEvent):
+    def btnOkWithInformation_clicked(self, oActionEvent):
         if self.win.getListBoxSelectedItem("lstResourceType") == "":
             ErrorDialog( "You have to select a resource type.", "", "Selection Error." )
             return
@@ -221,7 +221,7 @@ class AddAttachment(unohelper.Base, XJobExecutor ):
         res = self.send_attachment( self.dModel[self.win.getListBoxSelectedItem('lstmodel')], resourceid )
         self.win.endExecute()
 
-    def btnCancel_clicked( self, oActionEvent ):
+    def btnCancel_clicked(self, oActionEvent):
         self.win.endExecute()
 
     def doc2pdf(self, strFile):
@@ -262,7 +262,7 @@ class AddAttachment(unohelper.Base, XJobExecutor ):
             # Can be None if len(strFilterSubName) <= 0
             return filename
 
-    def _MakePropertyValue(self, cName = "", uValue = u"" ):
+    def _MakePropertyValue(self, cName="", uValue=u""):
        oPropertyValue = createUnoStruct( "com.sun.star.beans.PropertyValue" )
        if cName:
           oPropertyValue.Name = cName
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
index 75bfd65e1b6..b85a9d9bb06 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Change.py
@@ -59,7 +59,7 @@ if __name__<>"package":
     database="test"
 
 class Change( unohelper.Base, XJobExecutor ):
-    def __init__(self,ctx):
+    def __init__(self, ctx):
         self.ctx     = ctx
         self.module  = "openerp_report"
         self.version = "0.1"
@@ -107,7 +107,7 @@ class Change( unohelper.Base, XJobExecutor ):
             self.lstProtocol.addItem(i,self.lstProtocol.getItemCount() )
         self.win.doModalDialog( "lstProtocol",  protocol)
 
-    def btnNext_clicked(self,oActionEvent):
+    def btnNext_clicked(self, oActionEvent):
         global url
         aVal=''
         #aVal= Fetature used 
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
index bb80c3ecd61..c1fa8b22a85 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertBracesToField.py
@@ -3,31 +3,31 @@
 # Portions of this file are under the following copyright and license:
 #
 #
-#   Copyright (c) 2003-2004 Danny Brewer 
-#   d29583@groovegarden.com 
-# 
-#   This library is free software; you can redistribute it and/or 
-#   modify it under the terms of the GNU Lesser General Public 
-#   License as published by the Free Software Foundation; either 
-#   version 2.1 of the License, or (at your option) any later version. 
-# 
-#   This library 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 
-#   Lesser General Public License for more details. 
-# 
-#   You should have received a copy of the GNU Lesser General Public 
-#   License along with this library; if not, write to the Free Software 
-#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#   See:  http://www.gnu.org/licenses/lgpl.html 
+#   Copyright (c) 2003-2004 Danny Brewer
+#   d29583@groovegarden.com
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License as published by the Free Software Foundation; either
+#   version 2.1 of the License, or (at your option) any later version.
+#
+#   This library 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
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#   See:  http://www.gnu.org/licenses/lgpl.html
+#
 #
-# 
 # and other portions are under the following copyright and license:
 #
 #
 #    OpenERP, Open Source Management Solution>..
-#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>). 
+#    Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
@@ -63,7 +63,7 @@ if __name__<>"package":
 
 class ConvertBracesToField( unohelper.Base, XJobExecutor ):
 
-    def __init__(self,ctx):
+    def __init__(self, ctx):
 
         self.ctx     = ctx
         self.module  = "openerp_report"
@@ -198,7 +198,7 @@ class ConvertBracesToField( unohelper.Base, XJobExecutor ):
             info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
             self.logobj.log_write('ConvertBraceToField', LOG_ERROR, info)
 
-    def getRes(self,sock,sObject,sVar):
+    def getRes(self, sock, sObject, sVar):
         desktop=getDesktop()
         doc =desktop.getCurrentComponent()
         docinfo=doc.getDocumentInfo()
@@ -215,7 +215,9 @@ class ConvertBracesToField( unohelper.Base, XJobExecutor ):
                 sObject = self.getRes(sock,res[myval]['relation'], sVar[sVar.find("/")+1:])
         return sObject
 
-    def getBraces(self,aReportSyntex=[]):
+    def getBraces(self, aReportSyntex=None):
+        if aReportSyntex is None:
+            aReportSyntex = []
         desktop=getDesktop()
         doc = desktop.getCurrentComponent()
         aSearchString=[]
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
index 892061c56b4..ffa88a8cd06 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ConvertFieldsToBraces.py
@@ -57,7 +57,7 @@ if __name__<>"package":
     uid = 3
 
 class ConvertFieldsToBraces( unohelper.Base, XJobExecutor ):
-    def __init__(self,ctx):
+    def __init__(self, ctx):
         self.ctx     = ctx
         self.module  = "openerp_report"
         self.version = "0.1"
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
index 644763595df..d92b2aec14f 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ExportToRML.py
@@ -67,7 +67,7 @@ if __name__<>"package":
 
 
 class ExportToRML( unohelper.Base, XJobExecutor ):
-    def __init__(self,ctx):
+    def __init__(self, ctx):
         self.ctx     = ctx
         self.module  = "openerp_report"
         self.version = "0.1"
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
index 6c0d04d4bf3..9e3b175b67b 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Expression.py
@@ -57,7 +57,7 @@ if __name__<>"package":
     uid = 3
 
 class Expression(unohelper.Base, XJobExecutor ):
-    def __init__(self,sExpression="",sName="", bFromModify=False):
+    def __init__(self, sExpression="", sName="", bFromModify=False):
         LoginTest()
         if not loginstatus and __name__=="package":
             exit(1)
@@ -75,7 +75,7 @@ class Expression(unohelper.Base, XJobExecutor ):
         self.win.doModalDialog("",None)
 
 
-    def btnOk_clicked( self, oActionEvent ):
+    def btnOk_clicked(self, oActionEvent):
         desktop=getDesktop()
         doc = desktop.getCurrentComponent()
         text = doc.Text
@@ -105,7 +105,7 @@ class Expression(unohelper.Base, XJobExecutor ):
             else:
                 ErrorDialog("Please fill appropriate data in Name field or in Expression field.")
 
-    def btnCancel_clicked( self, oActionEvent ):
+    def btnCancel_clicked(self, oActionEvent):
         self.win.endExecute()
 
 if __name__<>"package" and __name__=="__main__":
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
index 513be2e0e64..3e39b528b6b 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Fields.py
@@ -64,7 +64,7 @@ if __name__<>"package":
 
 
 class Fields(unohelper.Base, XJobExecutor ):
-    def __init__(self,sVariable="",sFields="",sDisplayName="",bFromModify=False):
+    def __init__(self, sVariable="", sFields="", sDisplayName="", bFromModify=False):
         LoginTest()
         if not loginstatus and __name__=="package":
             exit(1)
@@ -177,7 +177,7 @@ class Fields(unohelper.Base, XJobExecutor ):
             ErrorDialog("Please insert user define field Field-1 or Field-4","Just go to File->Properties->User Define \nField-1 E.g. http://localhost:8069 \nOR \nField-4 E.g. account.invoice")
             self.win.endExecute()
 
-    def lstbox_selected(self,oItemEvent):
+    def lstbox_selected(self, oItemEvent):
         try:
 
             desktop=getDesktop()
@@ -200,7 +200,7 @@ class Fields(unohelper.Base, XJobExecutor ):
         if self.bModify:
             self.win.setEditText("txtUName",self.sGDisplayName)
 
-    def getRes(self,sock ,sObject,sVar):
+    def getRes(self, sock, sObject, sVar):
         desktop=getDesktop()
         doc =desktop.getCurrentComponent()
         docinfo=doc.getDocumentInfo()
@@ -219,7 +219,7 @@ class Fields(unohelper.Base, XJobExecutor ):
             else:
                 return sObject
 
-    def cmbVariable_selected(self,oItemEvent):
+    def cmbVariable_selected(self, oItemEvent):
         if self.count > 0 :
             try:
                 desktop=getDesktop()
@@ -246,7 +246,7 @@ class Fields(unohelper.Base, XJobExecutor ):
                 info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
                 self.logobj.log_write('Fields', LOG_ERROR, info)
 
-    def btnOk_clicked( self, oActionEvent ):
+    def btnOk_clicked(self, oActionEvent):
         desktop=getDesktop()
         doc = desktop.getCurrentComponent()
         cursor = doc.getCurrentController().getViewCursor()
@@ -281,7 +281,7 @@ class Fields(unohelper.Base, XJobExecutor ):
                 else:
                     ErrorDialog("Please fill appropriate data in Name field \nor select particular value from the list of fields.")
 
-    def btnCancel_clicked( self, oActionEvent ):
+    def btnCancel_clicked(self, oActionEvent):
         self.win.endExecute()
 
 if __name__<>"package" and __name__=="__main__":
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
index ebe2650575d..bc7d439c76d 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ModifyExistingReport.py
@@ -65,7 +65,7 @@ if __name__<>'package':
     uid = 3
 
 class ModifyExistingReport(unohelper.Base, XJobExecutor):
-    def __init__(self,ctx):
+    def __init__(self, ctx):
         self.ctx     = ctx
         self.module  = "openerp_report"
         self.version = "0.1"
@@ -177,10 +177,10 @@ class ModifyExistingReport(unohelper.Base, XJobExecutor):
 
         self.win.endExecute()
 
-    def btnCancel_clicked( self, oActionEvent ):
+    def btnCancel_clicked(self, oActionEvent):
         self.win.endExecute()
 
-    def btnDelete_clicked( self, oActionEvent ):
+    def btnDelete_clicked(self, oActionEvent):
          desktop=getDesktop()
          doc = desktop.getCurrentComponent()
          docinfo=doc.getDocumentInfo()
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
index 6022e44df7a..138c68b690e 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/NewReport.py
@@ -66,7 +66,7 @@ if __name__<>"package":
 #
 #
 class NewReport(unohelper.Base, XJobExecutor):
-    def __init__(self,ctx):
+    def __init__(self, ctx):
         self.ctx     = ctx
         self.module  = "openerp_report"
         self.version = "0.1"
@@ -99,7 +99,7 @@ class NewReport(unohelper.Base, XJobExecutor):
         self.win.addButton('btnCancel',-2 - 70 - 5 ,-5, 35,15,'Cancel' ,actionListenerProc = self.btnCancel_clicked )
         self.win.doModalDialog("",None)
 
-    def btnOk_clicked(self,oActionEvent):
+    def btnOk_clicked(self, oActionEvent):
         desktop=getDesktop()
         doc = desktop.getCurrentComponent()
         docinfo=doc.getDocumentInfo()
@@ -107,7 +107,7 @@ class NewReport(unohelper.Base, XJobExecutor):
         self.logobj.log_write('Module Name',LOG_INFO, ':Module use in creating a report %s  using database %s' % (self.aModuleName[self.lstModule.getSelectedItemPos()], database))
         self.win.endExecute()
 
-    def btnCancel_clicked( self, oActionEvent ):
+    def btnCancel_clicked(self, oActionEvent):
         self.win.endExecute()
 
 if __name__<>"package" and __name__=="__main__":
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
index ca2d9bf2d36..16735d40f4e 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Repeatln.py
@@ -64,7 +64,7 @@ if __name__<>"package":
 
 #class RepeatIn:
 class RepeatIn( unohelper.Base, XJobExecutor ):
-    def __init__(self,sObject="",sVariable="",sFields="",sDisplayName="",bFromModify=False):
+    def __init__(self, sObject="", sVariable="", sFields="", sDisplayName="", bFromModify=False):
         # Interface Design
         LoginTest()
         self.logobj=Logger()
@@ -204,7 +204,7 @@ class RepeatIn( unohelper.Base, XJobExecutor ):
             ErrorDialog("Please Select Appropriate module" ,"Create new report from: \nOpenERP -> Open a New Report")
             self.win.endExecute()
 
-    def lstbox_selected(self,oItemEvent):
+    def lstbox_selected(self, oItemEvent):
         sItem=self.win.getListBoxSelectedItem("lstFields")
         sMain=self.aListRepeatIn[self.win.getListBoxSelectedItemPos("lstFields")]
 
@@ -215,7 +215,7 @@ class RepeatIn( unohelper.Base, XJobExecutor ):
 	    self.win.setEditText("txtName",sMain[sMain.rfind("/")+1:])
 	    self.win.setEditText("txtUName","|-."+sItem[sItem.rfind("/")+1:]+".-|")
 
-    def cmbVariable_selected(self,oItemEvent):
+    def cmbVariable_selected(self, oItemEvent):
 
         if self.count > 0 :
 
@@ -290,7 +290,7 @@ class RepeatIn( unohelper.Base, XJobExecutor ):
         else:
             ErrorDialog("Please fill appropriate data in Object Field or Name field \nor select particular value from the list of fields.")
 
-    def btnCancel_clicked( self, oActionEvent ):
+    def btnCancel_clicked(self, oActionEvent):
         self.win.endExecute()
 
 if __name__<>"package" and __name__=="__main__":
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
index d32f7aa6c20..4568620dc8c 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/SendToServer.py
@@ -72,7 +72,7 @@ class SendtoServer(unohelper.Base, XJobExecutor):
         'HTML' : 'html'
     }
 
-    def __init__(self,ctx):
+    def __init__(self, ctx):
         self.ctx     = ctx
         self.module  = "openerp_report"
         self.version = "0.1"
@@ -136,10 +136,10 @@ class SendtoServer(unohelper.Base, XJobExecutor):
 
         self.win.doModalDialog("lstResourceType", self.Kind.keys()[0])
 
-    def lstbox_selected(self,oItemEvent):
+    def lstbox_selected(self, oItemEvent):
         pass
 
-    def btnCancel_clicked( self, oActionEvent ):
+    def btnCancel_clicked(self, oActionEvent):
         self.win.endExecute()
 
     def btnOk_clicked(self, oActionEvent):
@@ -221,7 +221,7 @@ class SendtoServer(unohelper.Base, XJobExecutor):
         id=self.sock.execute(database, uid, self.password, 'ir.actions.report.xml' ,'create', params)
         return id
 
-    def getInverseFieldsRecord(self,nVal):
+    def getInverseFieldsRecord(self, nVal):
         desktop=getDesktop()
         doc = desktop.getCurrentComponent()
         count=0
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
index ba9817ca20a..c399634bfe5 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/ServerParameter.py
@@ -59,7 +59,7 @@ if __name__<>"package":
     database="test"
 
 class ServerParameter( unohelper.Base, XJobExecutor ):
-    def __init__(self, aVal= None, sURL=""):
+    def __init__(self, aVal=None, sURL=""):
         self.module  = "openerp_report"
         self.version = "0.1"
         desktop=getDesktop()
@@ -116,8 +116,7 @@ class ServerParameter( unohelper.Base, XJobExecutor ):
 
         #self.win.doModalDialog("lstDatabase",docinfo.getUserFieldValue(2))
 
-    def btnOk_clicked(self,oActionEvent):
-
+    def btnOk_clicked(self, oActionEvent):
         sLogin=self.win.getEditText("txtLoginName")
         sPassword=self.win.getEditText("txtPassword")
         global url
@@ -157,11 +156,10 @@ class ServerParameter( unohelper.Base, XJobExecutor ):
             self.logobj.log_write('successful login',LOG_INFO, ': successful login from %s using database %s' % (sLogin, sDatabase))
             self.win.endExecute()
 
-
-    def btnCancel_clicked( self, oActionEvent ):
+    def btnCancel_clicked(self, oActionEvent):
         self.win.endExecute()
 
-    def btnPrevious_clicked(self,oActionEvent):
+    def btnPrevious_clicked(self, oActionEvent):
         self.win.endExecute()
         Change(None)
         self.win.endExecute()
@@ -172,5 +170,4 @@ if __name__<>"package" and __name__=="__main__":
 elif __name__=="package":
     g_ImplementationHelper.addImplementation( ServerParameter, "org.openoffice.openerp.report.serverparam", ("com.sun.star.task.Job",),)
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
index 06bce1f9fa5..13d02c86329 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/Translation.py
@@ -61,7 +61,7 @@ if __name__<>"package":
 
 
 class AddLang(unohelper.Base, XJobExecutor ):
-    def __init__(self,sVariable="",sFields="",sDisplayName="",bFromModify=False):
+    def __init__(self, sVariable="", sFields="", sDisplayName="", bFromModify=False):
         LoginTest()
         if not loginstatus and __name__=="package":
             exit(1)
@@ -157,7 +157,7 @@ class AddLang(unohelper.Base, XJobExecutor ):
             ErrorDialog("Please insert user define field Field-1 or Field-4","Just go to File->Properties->User Define \nField-1 E.g. http://localhost:8069 \nOR \nField-4 E.g. account.invoice")
             self.win.endExecute()
 
-    def lstbox_selected(self,oItemEvent):
+    def lstbox_selected(self, oItemEvent):
         try:
 
             desktop=getDesktop()
@@ -183,7 +183,7 @@ class AddLang(unohelper.Base, XJobExecutor ):
         if self.bModify:
             self.win.setEditText("txtUName",self.sGDisplayName)
 
-    def getRes(self,sock ,sObject,sVar):
+    def getRes(self, sock, sObject, sVar):
         desktop=getDesktop()
         doc =desktop.getCurrentComponent()
         docinfo=doc.getDocumentInfo()
@@ -203,7 +203,7 @@ class AddLang(unohelper.Base, XJobExecutor ):
                 return sObject
 
 
-    def cmbVariable_selected(self,oItemEvent):
+    def cmbVariable_selected(self, oItemEvent):
         if self.count > 0 :
             try:
                 desktop=getDesktop()
@@ -229,7 +229,7 @@ class AddLang(unohelper.Base, XJobExecutor ):
             except:
                 import traceback;traceback.print_exc()
 
-    def btnOk_clicked( self, oActionEvent ):
+    def btnOk_clicked(self, oActionEvent):
         self.bOkay = True
         desktop=getDesktop()
         doc = desktop.getCurrentComponent()
@@ -263,7 +263,7 @@ class AddLang(unohelper.Base, XJobExecutor ):
         else:
             ErrorDialog("Please fill appropriate data in name field \nor select particular value from the list of fields.")
 
-    def btnCancel_clicked( self, oActionEvent ):
+    def btnCancel_clicked(self, oActionEvent):
         self.win.endExecute()
 
 
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
index c0a3e5b5d63..cb86f5f429a 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/error.py
@@ -48,7 +48,7 @@
 if __name__<>"package":
     from gui import *
 class ErrorDialog:
-    def __init__(self,sErrorMsg, sErrorHelpMsg="",sTitle="Error Message"):
+    def __init__(self, sErrorMsg, sErrorHelpMsg="", sTitle="Error Message"):
         self.win = DBModalDialog(50, 50, 150, 90, sTitle)
         self.win.addFixedText("lblErrMsg", 5, 5, 190, 25, sErrorMsg)
         self.win.addFixedText("lblErrHelpMsg", 5, 30, 190, 25, sErrorHelpMsg)
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
index 29f1cd87e46..1b614224147 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/functions.py
@@ -59,7 +59,13 @@ if __name__<>"package":
     database="test"
     uid = 1
 
-def genTree(object,aList,insField,host,level=3, ending=[], ending_excl=[], recur=[], root='', actualroot=""):
+def genTree(object, aList, insField, host, level=3, ending=None, ending_excl=None, recur=None, root='', actualroot=""):
+    if ending is None:
+        ending = []
+    if ending_excl is None:
+        ending_excl = []
+    if recur is None:
+        recur = []
     try:
         global url
         sock=RPCSession(url)
@@ -79,7 +85,7 @@ def genTree(object,aList,insField,host,level=3, ending=[], ending_excl=[], recur
         info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
         obj.log_write('Function', LOG_ERROR, info)
 
-def VariableScope(oTcur,insVariable,aObjectList,aComponentAdd,aItemList,sTableName=""):
+def VariableScope(oTcur, insVariable, aObjectList, aComponentAdd, aItemList, sTableName=""):
     if sTableName.find(".") != -1:
 	for i in range(len(aItemList)):
             if aComponentAdd[i]==sTableName:
@@ -96,7 +102,7 @@ def VariableScope(oTcur,insVariable,aObjectList,aComponentAdd,aItemList,sTableNa
 		    if aObjectList[j][:aObjectList[j].find("(")] == sLVal and sLVal!="":
                         insVariable.append(aObjectList[j])
 
-def getList(aObjectList,host,count):
+def getList(aObjectList, host, count):
     desktop=getDesktop()
     doc =desktop.getCurrentComponent()
     docinfo=doc.getDocumentInfo()
@@ -128,7 +134,7 @@ def getList(aObjectList,host,count):
     else:
         aObjectList.append("List of " + docinfo.getUserFieldValue(3))
 
-def getRelation(sRelName, sItem, sObjName, aObjectList, host ):
+def getRelation(sRelName, sItem, sObjName, aObjectList, host):
         global url
         sock=RPCSession(url)
         global passwd
@@ -143,7 +149,7 @@ def getRelation(sRelName, sItem, sObjName, aObjectList, host ):
 		getRelation(res[k]['relation'], sItem[sItem.find(".")+1:], sObjName,aObjectList,host)
 
 
-def getPath(sPath,sMain):
+def getPath(sPath, sMain):
     desktop=getDesktop()
     doc =desktop.getCurrentComponent()
     oParEnum = doc.getTextFields().createEnumeration()
@@ -161,7 +167,7 @@ def getPath(sPath,sMain):
                         getPath(sPath, sMain)
     return sPath
 
-def EnumDocument(aItemList,aComponentAdd):
+def EnumDocument(aItemList, aComponentAdd):
     desktop = getDesktop()
     parent=""
     bFlag = False
@@ -183,7 +189,7 @@ def EnumDocument(aItemList,aComponentAdd):
             aItemList.append( templist )
         aComponentAdd.append( parent )
 
-def getChildTable(oPar,aItemList,aComponentAdd,sTableName=""):
+def getChildTable(oPar, aItemList, aComponentAdd, sTableName=""):
     sNames = oPar.getCellNames()
     bEmptyTableFlag=True
     for val in sNames:
@@ -229,7 +235,7 @@ def getChildTable(oPar,aItemList,aComponentAdd,sTableName=""):
                 aComponentAdd.append(sTableName+"."+oPar.Name)
     return 0
 
-def getRecersiveSection(oCurrentSection,aSectionList):
+def getRecersiveSection(oCurrentSection, aSectionList):
         desktop=getDesktop()
         doc =desktop.getCurrentComponent()
         oParEnum=doc.getText().createEnumeration()
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py
index 42198337450..f05a836c546 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/logreport.py
@@ -39,11 +39,10 @@ def log_detail(self):
     _logger.setLevel(logging.INFO)
 
 class Logger(object):
-    def log_write(self,name,level,msg):
+    def log_write(self, name, level, msg):
         getattr(_logger,level)(msg)
 
     def shutdown(self):
         logging.shutdown()
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py
index f7c7f636485..5d6f8ca6dbc 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/rpc.py
@@ -52,7 +52,7 @@ class RPCGateway(object):
 
 
 class RPCSession(object):
-    def __init__(self,url):
+    def __init__(self, url):
 
         m = re.match('^(http[s]?://|socket://)([\w.\-]+):(\d{1,5})$', url or '')
 
@@ -152,7 +152,7 @@ class XMLRPCGateway(RPCGateway):
 
         return res
 
-    def execute(self, sDatabase,UID,sPassword,obj, method, *args):
+    def execute(self, sDatabase, UID, sPassword, obj, method, *args):
         global rpc_url
 
         sock = xmlrpclib.ServerProxy(rpc_url + 'object')
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py
index ef22a3a0d51..53dc81f5bc3 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/lib/tools.py
@@ -21,19 +21,19 @@
 ##############################################################################
 import urllib
 
-def get_absolute_file_path( url ):
+def get_absolute_file_path(url):
 	url_unquoted = urllib.unquote(url)
 	return os.name == 'nt' and url_unquoted[1:] or url_unquoted 
 
 # This function reads the content of a file and return it to the caller
-def read_data_from_file( filename ):
+def read_data_from_file(filename):
 	fp = file( filename, "rb" )
 	data = fp.read()
 	fp.close()
 	return data
 
 # This function writes the content to a file
-def write_data_to_file( filename, data ):
+def write_data_to_file(filename, data):
 	fp = file( filename, 'wb' )
 	fp.write( data )
 	fp.close()
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
index 03478651def..b5f5a1501b9 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/bin/script/modify.py
@@ -61,7 +61,7 @@ if __name__<>"package":
     uid = 3
 
 class modify(unohelper.Base, XJobExecutor ):
-    def __init__( self, ctx ):
+    def __init__(self, ctx):
         self.ctx     = ctx
         self.module  = "openerp_report"
         self.version = "0.1"
diff --git a/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py b/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py
index 8954aa8d7a8..c23e0e739bf 100644
--- a/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py
+++ b/addons/base_report_designer/plugin/openerp_report_designer/test/test_fields.py
@@ -10,7 +10,13 @@ import time
 
 sock = xmlrpclib.ServerProxy('http://localhost:8069/xmlrpc/object')
 
-def get(object, level=3, ending=[], ending_excl=[], recur=[], root=''):
+def get(object, level=3, ending=None, ending_excl=None, recur=None, root=''):
+	if ending is None:
+	    ending = []
+	if ending_excl is None:
+	    ending_excl = []
+	if recur is None:
+	    recur = []
 	res = sock.execute('terp', 3, 'admin', 'account.invoice', 'fields_get')
 	key = res.keys()
 	key.sort()
diff --git a/addons/base_report_designer/wizard/base_report_design_view.xml b/addons/base_report_designer/wizard/base_report_design_view.xml
index e0fbb248d84..d2ee1f70dc3 100644
--- a/addons/base_report_designer/wizard/base_report_design_view.xml
+++ b/addons/base_report_designer/wizard/base_report_design_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <record id="view_base_report_sxw" model="ir.ui.view">
             <field name="name">Base Report sxw</field>
             <field name="model">base.report.sxw</field>
@@ -17,7 +18,7 @@
                 </footer>
             </form>
             </field>
-       </record>
+        </record>
 
         <record id="action_view_base_report_sxw" model="ir.actions.act_window">
             <field name="name">Base Report sxw</field>
@@ -43,7 +44,8 @@
             <label colspan="4" string="This is the template of your requested report.&#10;Save it as a .SXW file and open it with OpenOffice.&#10;Don't forget to install the OpenERP SA OpenOffice package to modify it.&#10;Once it is modified, re-upload it in OpenERP using this wizard." align="0.0"/>
             </form>
             </field>
-       </record>
+        </record>
+
         <record id="view_base_report_file_rml" model="ir.ui.view">
             <field name="name">Base Report File sxw</field>
             <field name="model">base.report.rml.save</field>
@@ -55,6 +57,5 @@
             </field>
        </record>
 
-
     </data>
 </openerp>
diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py
index cf69933c84a..e74238ba59c 100644
--- a/addons/base_setup/__openerp__.py
+++ b/addons/base_setup/__openerp__.py
@@ -43,9 +43,7 @@ Shows you a list of applications features to install from.
     'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0086711085869',
     'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',],
-    'js': ['static/src/js/base_setup.js'],
     'css': ['static/src/css/base_setup.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index e07f576aa41..949a39159ac 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -6,9 +6,6 @@
         <record id="base.menu_res_company_global" model="ir.ui.menu">
             <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
         </record>
-        <record id="base.menu_publisher_warranty" model="ir.ui.menu">
-            <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
-        </record>
 
         <!-- Specify your terminology config wiz -->
         <record id="base_setup_terminology_form" model="ir.ui.view">
diff --git a/addons/base_setup/i18n/ar.po b/addons/base_setup/i18n/ar.po
index ac0092f0c19..b1661f7d0bd 100644
--- a/addons/base_setup/i18n/ar.po
+++ b/addons/base_setup/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -77,6 +77,9 @@ msgid ""
 "printed on your reports. You can click on the button 'Preview Header' in "
 "order to check the header/footer of PDF documents."
 msgstr ""
+"ملء بيانات الشركة الخاصة بك (عنوان، والشعار، والحسابات المصرفية) التي سوف "
+"تطبع على تقاريرك. يمكنك النقر على زر \"معاينة رأس الصفحة\"  لفحص رأس / تذييل "
+"الصفحة من وثائق PDF"
 
 #. module: base_setup
 #: field:product.installer,customers:0
@@ -91,7 +94,7 @@ msgstr "مفصّلة"
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Patient"
-msgstr ""
+msgstr "زبون"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_import_create_installer
@@ -100,6 +103,8 @@ msgid ""
 "you can import your existing partners by CSV spreadsheet from \"Import "
 "Data\" wizard"
 msgstr ""
+"إنشاء أو استيراد العملاء واتصالاتهم يدويا من هذا النموذج أو يمكنك استيراد "
+"الشركاء الموجودين من قبل جدول CSV من صندوق حوار\"استيراد البيانات\""
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -154,11 +159,12 @@ msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
 msgstr ""
+"يمكنك استخدام صندوق الحوار لتغيير المصطلحات للعملاء في التطبيق بالكامل."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr ""
+msgstr "مستأجر"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -177,6 +183,9 @@ msgid ""
 "available. If you want to Add new Language, you can add it from 'Load an "
 "Official Translation' wizard  from 'Administration' menu."
 msgstr ""
+"حدد اللغة الافتراضية لواجهة المستخدم كل شيء، عندما تتوفر ترجمات UI. إذا كنت "
+"ترغب في إضافة لغة جديدة، يمكنك إضافته من صندوق حوار 'تحميل ترجمة رسمية \"من "
+"القائمة' إدارة '."
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -185,11 +194,14 @@ msgid ""
 "ones. Afterwards, users are free to change those values on their own user "
 "preference form."
 msgstr ""
+"هذا سوف يحدد المراجع الافتراضية للمستخدمين الجدد وتحديث كافة البرامج "
+"القائمة. بعد ذلك، للمستخدمين الحرية في تغيير تلك القيم على شكل المستخدم "
+"الخاصة بهم التفضيل."
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
 msgid "How do you call a Customer"
-msgstr ""
+msgstr "كيف يمكنك استدعاء عميل"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
@@ -214,7 +226,7 @@ msgstr "المنطقة الزمنية"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "استخدام كلمة أخرى لقول \"العميل\""
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
@@ -243,12 +255,12 @@ msgstr "user.preferences.config"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
 msgid "Create Additional Users"
-msgstr ""
+msgstr "إنشاء مزيد من المستخدمين"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_import_create_installer
 msgid "Create or Import Customers"
-msgstr ""
+msgstr "إنشاء أو استيراد العملاء"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_sugarcrm:0
@@ -258,7 +270,7 @@ msgstr ""
 #. module: base_setup
 #: help:product.installer,customers:0
 msgid "Import or create customers"
-msgstr ""
+msgstr "إنشاء أو استيراد عملاء"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
@@ -278,12 +290,12 @@ msgstr "الشريك"
 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "Specify Your Terminology"
-msgstr ""
+msgstr "حدد المصطلحات الخاصة بك"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,sync_google_contact:0
 msgid "For Sync Google Contact"
-msgstr ""
+msgstr "لمزامنة الاتصال بجوجل"
 
 #~ msgid "Accounting & Finance"
 #~ msgstr "الحسابات و المالية"
diff --git a/addons/base_setup/i18n/bg.po b/addons/base_setup/i18n/bg.po
index cafc439e064..f9bf42cca51 100644
--- a/addons/base_setup/i18n/bg.po
+++ b/addons/base_setup/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po
index ce15b961192..790a4ad3df0 100644
--- a/addons/base_setup/i18n/bs.po
+++ b/addons/base_setup/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/ca.po b/addons/base_setup/i18n/ca.po
index 196bf12f7b8..646d2e3f458 100644
--- a/addons/base_setup/i18n/ca.po
+++ b/addons/base_setup/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po
index 267876129f3..d07b1f0b1ce 100644
--- a/addons/base_setup/i18n/cs.po
+++ b/addons/base_setup/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po
index 75cd997cc55..86a0179ca8d 100644
--- a/addons/base_setup/i18n/da.po
+++ b/addons/base_setup/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po
index 6cc1605fdd6..fa1dfa5d5c7 100644
--- a/addons/base_setup/i18n/de.po
+++ b/addons/base_setup/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -77,9 +77,10 @@ msgid ""
 "printed on your reports. You can click on the button 'Preview Header' in "
 "order to check the header/footer of PDF documents."
 msgstr ""
-"Erfassen Sie die Unternehmensdaten(Adresse, Logo, Bankkonten) die auf den "
+"Erfassen Sie die Unternehmensdaten (Adresse, Logo, Bankkonten) die auf den "
 "Reports gedruckt werden sollen.\r\n"
-"Mit \"Vorschau\" können Sie eine PDF Ausdruck überprüfen"
+"Mit \"Vorschau\" können Sie eine PDF-Vorschau ansehen und die Darstellung "
+"überprüfen."
 
 #. module: base_setup
 #: field:product.installer,customers:0
@@ -103,8 +104,8 @@ msgid ""
 "you can import your existing partners by CSV spreadsheet from \"Import "
 "Data\" wizard"
 msgstr ""
-"Erzeugen oder Importieren Sie Kunden und deren Kontakte manuell in diesem "
-"form oder mit dem Importassistenten von CSV Dateien"
+"Erfassen Sie Kunden und deren Kontakte in diesem Formular manuell oder lesen "
+"Sie vorhandene Daten mit dem Importassistenten aus CSV-Dateien ein"
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -114,12 +115,12 @@ msgstr "Benutzereinstellungen festlegen"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
 msgid "Define default users preferences"
-msgstr "Einstellungen des Defaultbenutzers festlegen"
+msgstr "Standardeeinstellungen für (neue) Benutzer festlegen"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_saleforce:0
 msgid "For Import Saleforce"
-msgstr "für Saleforce Import"
+msgstr "Zum Import von Verkaufskräften"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,quickbooks_ippids:0
@@ -160,7 +161,8 @@ msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
 msgstr ""
-"Mit diesem Assistenten bestimmen Sie den Begriff Kunde für das ganze System"
+"Mit diesem Assistenten können Sie die verwendete Terminologie des gesamten "
+"Systems im Sinne der Kunden verändern."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -205,7 +207,7 @@ msgstr "Wie bezeichnen Sie einen Kunden"
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "Quickbooks Ippids"
-msgstr "Quickbooks Ippids"
+msgstr "Quickbooks Import"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -215,7 +217,7 @@ msgstr "Klient"
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
 msgid "Import Saleforce"
-msgstr "Import Saleforce"
+msgstr "Verkaufsmitarbeiter importieren"
 
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
@@ -225,7 +227,7 @@ msgstr "Zeitzone"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr "Verwenden Sie ein anders Wort für \"Kunde\""
+msgstr "Verwenden Sie ein anderes Wort für \"Kunde\""
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
@@ -237,7 +239,8 @@ msgstr "base.setup.terminology"
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Dieses Kästchen unmarkiert lassen um alle Tips für alle Menüpunkte zusehen"
+"Dieses Kästchen unmarkiert lassen um alle Tips für alle Menüpunkte zu "
+"erhalten"
 
 #. module: base_setup
 #: field:base.setup.terminology,config_logo:0
@@ -255,22 +258,22 @@ msgstr "user.preferences.config"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
 msgid "Create Additional Users"
-msgstr "Erzeuge weitere Benutzer"
+msgstr "Weitere Benutzer anlegen"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_import_create_installer
 msgid "Create or Import Customers"
-msgstr "Erzeuge oder Importiere Kunden"
+msgstr "Kunden anlegen oder importieren"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_sugarcrm:0
 msgid "Import Sugarcrm"
-msgstr "Import Sugarcrm"
+msgstr "Aus Sugarcrm importieren"
 
 #. module: base_setup
 #: help:product.installer,customers:0
 msgid "Import or create customers"
-msgstr "Kunden importieren oder erstellen"
+msgstr "Kunden importieren oder anlegen"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
@@ -280,7 +283,7 @@ msgstr "Vereinfacht"
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
 msgid "For Import Sugarcrm"
-msgstr "Für Sugarcrm Import"
+msgstr "Um aus Sugarcrm zu importieren"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index 8489b0ae0fc..7c17f6025f2 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -25,7 +25,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Guest"
-msgstr ""
+msgstr "Επισκέπτης"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_product_installer
@@ -35,17 +35,17 @@ msgstr ""
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Create"
-msgstr ""
+msgstr "Δημιουργία"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
-msgstr ""
+msgstr "Μέλος"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,sync_google_contact:0
 msgid "Sync Google Contact"
-msgstr ""
+msgstr "Συγχρονισμός Επαφής Google"
 
 #. module: base_setup
 #: help:user.preferences.config,context_tz:0
@@ -57,7 +57,7 @@ msgstr ""
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Import"
-msgstr ""
+msgstr "Εισαγωγή"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -68,6 +68,8 @@ msgstr ""
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Set Company Header and Footer"
 msgstr ""
+"Βάλε τα στοιχεία της Εταιρίας που θα εμφανίζονται στην Κεφαλίδα και στο "
+"Υποσέλιδο"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_base_setup_company
@@ -80,17 +82,17 @@ msgstr ""
 #. module: base_setup
 #: field:product.installer,customers:0
 msgid "Customers"
-msgstr ""
+msgstr "Πελάτες"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Extended"
-msgstr ""
+msgstr "Εκτεταμένο"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Patient"
-msgstr ""
+msgstr "Ασθενής"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_import_create_installer
@@ -103,7 +105,7 @@ msgstr ""
 #. module: base_setup
 #: view:user.preferences.config:0
 msgid "Define Users's Preferences"
-msgstr ""
+msgstr "Καθόρισε τις προτιμήσεις του Χρήστη"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
@@ -137,7 +139,7 @@ msgstr "res_config_contents"
 #. module: base_setup
 #: field:user.preferences.config,view:0
 msgid "Interface"
-msgstr ""
+msgstr "Διεπαφή χρήστη"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_migrade_application_installer_modules
@@ -150,6 +152,8 @@ msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
 msgstr ""
+"Μπορείς να χρησιμοποιήσεις αυτόν τον οδηγό για να αλλάξεις τις ορολογίες για "
+"τους πελάτες σε όλη την εφαρμογή"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -159,12 +163,12 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Customer"
-msgstr ""
+msgstr "Πελάτης"
 
 #. module: base_setup
 #: field:user.preferences.config,context_lang:0
 msgid "Language"
-msgstr ""
+msgstr "Γλώσσα"
 
 #. module: base_setup
 #: help:user.preferences.config,context_lang:0
@@ -185,7 +189,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
 msgid "How do you call a Customer"
-msgstr ""
+msgstr "Πώς καλείς έναν Πελάτη"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
@@ -195,7 +199,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Client"
-msgstr ""
+msgstr "Πελάτης"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
@@ -205,12 +209,12 @@ msgstr ""
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
 msgid "Timezone"
-msgstr ""
+msgstr "Ζώνη ώρας"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "Χρησιμοποίησε μια άλλη λέξη για να πεις \"Πελάτης\""
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
@@ -239,37 +243,37 @@ msgstr ""
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
 msgid "Create Additional Users"
-msgstr ""
+msgstr "Δημιουργία επιπλέον Χρηστών"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_import_create_installer
 msgid "Create or Import Customers"
-msgstr ""
+msgstr "Δημιουργία ή Εισαγωγή Πελατών"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_sugarcrm:0
 msgid "Import Sugarcrm"
-msgstr ""
+msgstr "Εισαγωγή από Sugarcrm"
 
 #. module: base_setup
 #: help:product.installer,customers:0
 msgid "Import or create customers"
-msgstr ""
+msgstr "Εισαγωγή ή δημιουργία πελατών"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Simplified"
-msgstr ""
+msgstr "Απλοποιημένη"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
 msgid "For Import Sugarcrm"
-msgstr ""
+msgstr "Για εισαγωγή από Sugarcrm"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Συνεργάτης"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -279,7 +283,7 @@ msgstr ""
 #. module: base_setup
 #: help:migrade.application.installer.modules,sync_google_contact:0
 msgid "For Sync Google Contact"
-msgstr ""
+msgstr "Για συγχρονισμό με επαφή Google"
 
 #~ msgid ""
 #~ "A profile sets a pre-selection of modules for specific needs. These profiles "
diff --git a/addons/base_setup/i18n/en_GB.po b/addons/base_setup/i18n/en_GB.po
index d528ed9cb39..1ae0ef3e5cc 100644
--- a/addons/base_setup/i18n/en_GB.po
+++ b/addons/base_setup/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po
index e1ba63677a8..60eee84b2f2 100644
--- a/addons/base_setup/i18n/es.po
+++ b/addons/base_setup/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/es_AR.po b/addons/base_setup/i18n/es_AR.po
index 0b2debd9438..65daecb312b 100644
--- a/addons/base_setup/i18n/es_AR.po
+++ b/addons/base_setup/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/es_CL.po b/addons/base_setup/i18n/es_CL.po
index 231559c6416..ab0b12b7574 100644
--- a/addons/base_setup/i18n/es_CL.po
+++ b/addons/base_setup/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/es_CR.po b/addons/base_setup/i18n/es_CR.po
index 297a94dd176..4142acdafc0 100644
--- a/addons/base_setup/i18n/es_CR.po
+++ b/addons/base_setup/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/es_EC.po b/addons/base_setup/i18n/es_EC.po
index 793c92c640b..7e63ed17e9b 100644
--- a/addons/base_setup/i18n/es_EC.po
+++ b/addons/base_setup/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/es_PY.po b/addons/base_setup/i18n/es_PY.po
index e5a19bb8957..668db25a4e1 100644
--- a/addons/base_setup/i18n/es_PY.po
+++ b/addons/base_setup/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/et.po b/addons/base_setup/i18n/et.po
index ad96c2fcb4d..e11aa59e5cc 100644
--- a/addons/base_setup/i18n/et.po
+++ b/addons/base_setup/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po
index 627b8440c4e..f51b16a1161 100644
--- a/addons/base_setup/i18n/fa.po
+++ b/addons/base_setup/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/fi.po b/addons/base_setup/i18n/fi.po
index f20b149b9fa..f62b29cf03a 100644
--- a/addons/base_setup/i18n/fi.po
+++ b/addons/base_setup/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po
index 26bf9f8f08d..2e9ad289f45 100644
--- a/addons/base_setup/i18n/fr.po
+++ b/addons/base_setup/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/gl.po b/addons/base_setup/i18n/gl.po
index 935cb8b98f8..2731331e778 100644
--- a/addons/base_setup/i18n/gl.po
+++ b/addons/base_setup/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/gu.po b/addons/base_setup/i18n/gu.po
index bb9030ae9b2..78ea5699909 100644
--- a/addons/base_setup/i18n/gu.po
+++ b/addons/base_setup/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index c30a09dfcd1..c969c9ebbbf 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po
index bd6f54d7640..2f18cb7241c 100644
--- a/addons/base_setup/i18n/hu.po
+++ b/addons/base_setup/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po
index 4fb5bbfdb93..b6959dfe17f 100644
--- a/addons/base_setup/i18n/id.po
+++ b/addons/base_setup/i18n/id.po
@@ -13,38 +13,38 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
 msgid "Display Tips"
-msgstr ""
+msgstr "Tampilan Bantuan"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Guest"
-msgstr ""
+msgstr "Tamu"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_product_installer
 msgid "product.installer"
-msgstr ""
+msgstr "Pemasangan Produk"
 
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Create"
-msgstr ""
+msgstr "Membuat"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
-msgstr ""
+msgstr "Anggota"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,sync_google_contact:0
 msgid "Sync Google Contact"
-msgstr ""
+msgstr "Sinkronisasikan Kontak Google"
 
 #. module: base_setup
 #: help:user.preferences.config,context_tz:0
@@ -52,21 +52,23 @@ msgid ""
 "Set default for new user's timezone, used to perform timezone conversions "
 "between the server and the client."
 msgstr ""
+"Set zona waktu standar bagi pengguna baru, digunakan untuk melakukan "
+"konversi zona waktu antara server dan klien."
 
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Import"
-msgstr ""
+msgstr "Impor"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Donor"
-msgstr ""
+msgstr "Donor"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Set Company Header and Footer"
-msgstr ""
+msgstr "Buat Kop dan Kaki Surat Perusahaan"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_base_setup_company
@@ -75,21 +77,24 @@ msgid ""
 "printed on your reports. You can click on the button 'Preview Header' in "
 "order to check the header/footer of PDF documents."
 msgstr ""
+"Isi data-data perusahaan Anda (alamat, logo, rekening bank) sehingga itu "
+"dicetak pada laporan Anda. Anda dapat klik pada 'header Preview' tombol "
+"untuk memeriksa header / footer dari dokumen PDF."
 
 #. module: base_setup
 #: field:product.installer,customers:0
 msgid "Customers"
-msgstr ""
+msgstr "Pelanggan"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Extended"
-msgstr ""
+msgstr "Penambahan"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Patient"
-msgstr ""
+msgstr "Telaten"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_import_create_installer
@@ -98,26 +103,29 @@ msgid ""
 "you can import your existing partners by CSV spreadsheet from \"Import "
 "Data\" wizard"
 msgstr ""
+"Buat atau Impor Pelanggan dan kontak mereka secara manual dari form ini atau "
+"Anda dapat mengimpor mitra yang ada dengan spreadsheet CSV dari wizard "
+"\"Impor Data\""
 
 #. module: base_setup
 #: view:user.preferences.config:0
 msgid "Define Users's Preferences"
-msgstr ""
+msgstr "Tetapkan Pengaturan User"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
 msgid "Define default users preferences"
-msgstr ""
+msgstr "Tetapkan Pengaturan User Standar"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_saleforce:0
 msgid "For Import Saleforce"
-msgstr ""
+msgstr "Untuk Import Salesforce"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "For Quickbooks Ippids"
-msgstr ""
+msgstr "Untuk Quickbooks lppids"
 
 #. module: base_setup
 #: help:user.preferences.config,view:0
@@ -126,22 +134,26 @@ msgid ""
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
+"Jika Anda menggunakan OpenERP untuk pertama kalinya kami sangat menyarankan "
+"Anda untuk memilih interface yang sederhana, yang memiliki fitur lebih "
+"sedikit tetapi lebih mudah. Anda selalu dapat beralih kemudian dari "
+"pengaturan pengguna."
 
 #. module: base_setup
 #: view:base.setup.terminology:0
 #: view:user.preferences.config:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: base_setup
 #: field:user.preferences.config,view:0
 msgid "Interface"
-msgstr ""
+msgstr "Antarmuka"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_migrade_application_installer_modules
 msgid "migrade.application.installer.modules"
-msgstr ""
+msgstr "migrade.pemasangan.modul.aplikasi"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -149,21 +161,23 @@ msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
 msgstr ""
+"Anda dapat menggunakan wizard ini untuk mengubah terminologi bagi pelanggan "
+"di seluruh aplikasi."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr ""
+msgstr "Penyewa"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Customer"
-msgstr ""
+msgstr "Pelanggan"
 
 #. module: base_setup
 #: field:user.preferences.config,context_lang:0
 msgid "Language"
-msgstr ""
+msgstr "Bahasa"
 
 #. module: base_setup
 #: help:user.preferences.config,context_lang:0
@@ -172,6 +186,10 @@ msgid ""
 "available. If you want to Add new Language, you can add it from 'Load an "
 "Official Translation' wizard  from 'Administration' menu."
 msgstr ""
+"Mengatur bahasa standar untuk semua antarmuka pengguna, ketika terjemahan UI "
+"yang tersedia. Jika Anda ingin Menambahkan Bahasa baru, Anda dapat "
+"menambahkannya dari 'Mengisikan Terjemahan Resmi' wizard dari menu "
+"'Administrasi'."
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -180,47 +198,51 @@ msgid ""
 "ones. Afterwards, users are free to change those values on their own user "
 "preference form."
 msgstr ""
+"Ini akan mengatur pengaturan standar untuk pengguna baru dan memperbarui "
+"semua yang sudah ada. Setelah itu, pengguna bebas untuk mengubah nilai-nilai "
+"pada formulir pengaturan pengguna sendiri."
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
 msgid "How do you call a Customer"
-msgstr ""
+msgstr "Bagaimana anda menghubungi Pelanggan"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "Quickbooks Ippids"
-msgstr ""
+msgstr "Quickbooks lppids"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Client"
-msgstr ""
+msgstr "Klien"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
 msgid "Import Saleforce"
-msgstr ""
+msgstr "Impor Salesforce"
 
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
 msgid "Timezone"
-msgstr ""
+msgstr "Zona waktu"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "Gunakan kata lain untuk \"Pelanggan\""
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
-msgstr ""
+msgstr "pengaturan.terminologi.dasar"
 
 #. module: base_setup
 #: help:user.preferences.config,menu_tips:0
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
 msgstr ""
+"Centang kotak ini jika anda selalu ingin menampilkan tips di setiap menu"
 
 #. module: base_setup
 #: field:base.setup.terminology,config_logo:0
@@ -228,57 +250,57 @@ msgstr ""
 #: field:product.installer,config_logo:0
 #: field:user.preferences.config,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Gambar"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_user_preferences_config
 msgid "user.preferences.config"
-msgstr ""
+msgstr "konfig.pengaturan.user"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
 msgid "Create Additional Users"
-msgstr ""
+msgstr "Membuat Pengguna Tambahan"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_import_create_installer
 msgid "Create or Import Customers"
-msgstr ""
+msgstr "Buat atau Impor Data Pelanggan"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_sugarcrm:0
 msgid "Import Sugarcrm"
-msgstr ""
+msgstr "Impor Sugarcrm"
 
 #. module: base_setup
 #: help:product.installer,customers:0
 msgid "Import or create customers"
-msgstr ""
+msgstr "Impor atau buat data pelanggan"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Simplified"
-msgstr ""
+msgstr "Sederhana"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
 msgid "For Import Sugarcrm"
-msgstr ""
+msgstr "Untuk impor sugarcrm"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Rekanan"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "Specify Your Terminology"
-msgstr ""
+msgstr "Spesifikasikan Terminologi Anda"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,sync_google_contact:0
 msgid "For Sync Google Contact"
-msgstr ""
+msgstr "Untuk Sinkronisasi Kontak Google"
 
 #~ msgid "Next"
 #~ msgstr "Berikutnya"
diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po
index 7cd8d1c9631..1c51b0fc11c 100644
--- a/addons/base_setup/i18n/it.po
+++ b/addons/base_setup/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/ja.po b/addons/base_setup/i18n/ja.po
index 8d98742ac03..52e506a0615 100644
--- a/addons/base_setup/i18n/ja.po
+++ b/addons/base_setup/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po
index 7b38058fb4c..ec8b53efcf9 100644
--- a/addons/base_setup/i18n/ko.po
+++ b/addons/base_setup/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/lt.po b/addons/base_setup/i18n/lt.po
index 88a52e2b856..6070651a9bc 100644
--- a/addons/base_setup/i18n/lt.po
+++ b/addons/base_setup/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/lv.po b/addons/base_setup/i18n/lv.po
index 9b462559203..735aa86d499 100644
--- a/addons/base_setup/i18n/lv.po
+++ b/addons/base_setup/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/mn.po b/addons/base_setup/i18n/mn.po
index 322ca6fc021..da09ba0731d 100644
--- a/addons/base_setup/i18n/mn.po
+++ b/addons/base_setup/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/nb.po b/addons/base_setup/i18n/nb.po
index f48f270313d..fd9ca6a9bca 100644
--- a/addons/base_setup/i18n/nb.po
+++ b/addons/base_setup/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -53,6 +53,8 @@ msgid ""
 "Set default for new user's timezone, used to perform timezone conversions "
 "between the server and the client."
 msgstr ""
+"Sett standard for nye brukerens tidssone, som brukes til å utføre tidssone "
+"konverteringer mellom serveren og klienten."
 
 #. module: base_setup
 #: selection:product.installer,customers:0
@@ -76,6 +78,9 @@ msgid ""
 "printed on your reports. You can click on the button 'Preview Header' in "
 "order to check the header/footer of PDF documents."
 msgstr ""
+"Fyll ut bedriftens data (adresse, logo, bankkontoer) slik at det er trykt på "
+"rapportene. Du kan klikke på knappen 'Forhåndsvisning Header \"for å sjekke "
+"toppteksten / bunnteksten av PDF-dokumenter."
 
 #. module: base_setup
 #: field:product.installer,customers:0
@@ -90,7 +95,7 @@ msgstr "Utvidet"
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Patient"
-msgstr ""
+msgstr "pasient"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_import_create_installer
@@ -99,6 +104,9 @@ msgid ""
 "you can import your existing partners by CSV spreadsheet from \"Import "
 "Data\" wizard"
 msgstr ""
+"Opprette eller importere kunder og deres kontakter manuelt fra dette "
+"skjemaet, eller du kan importere eksisterende partnere ved hjelp av CSV-"
+"regneark fra \"Importer data\" veiviser."
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -118,7 +126,7 @@ msgstr "For import Saleforce"
 #. module: base_setup
 #: help:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "For Quickbooks Ippids"
-msgstr ""
+msgstr "For Quickbooks Ippids"
 
 #. module: base_setup
 #: help:user.preferences.config,view:0
@@ -127,6 +135,9 @@ msgid ""
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
+"Hvis du bruker OpenERP for første gang vi sterkt anbefale deg å velge "
+"forenklet grensesnitt, som har mindre funksjoner, men er enklere. Du kan "
+"alltid bytte senere fra brukerens preferanser."
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -150,11 +161,13 @@ msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
 msgstr ""
+"Du kan bruke denne veiviseren til å endre terminologier for kunder i hele "
+"programmet."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr ""
+msgstr "leietaker"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -173,6 +186,9 @@ msgid ""
 "available. If you want to Add new Language, you can add it from 'Load an "
 "Official Translation' wizard  from 'Administration' menu."
 msgstr ""
+"Setter standard språk for alle brukergrensesnitt, når UI oversettelser. Hvis "
+"du ønsker å legge til nye språk, kan du legge den fra \"Legge en offisiell "
+"oversettelse 'veiviser fra' Administrasjon 'menyen."
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -181,6 +197,9 @@ msgid ""
 "ones. Afterwards, users are free to change those values on their own user "
 "preference form."
 msgstr ""
+"Dette vil sette standard innstillinger for nye brukere og oppdatere alle "
+"eksisterende. Etterpå, kan brukerne fritt til å endre disse verdiene på sine "
+"egne brukerens preferanser form."
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -190,7 +209,7 @@ msgstr "Hvordan ringer du en kunde"
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "Quickbooks Ippids"
-msgstr ""
+msgstr "Quickbooks Ippids"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -222,6 +241,7 @@ msgstr "base.setup.terminology"
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
 msgstr ""
+"Sjekk ut denne boksen hvis du ønsker å alltid vise tips om hver meny handling"
 
 #. module: base_setup
 #: field:base.setup.terminology,config_logo:0
@@ -274,12 +294,12 @@ msgstr "Partner"
 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "Specify Your Terminology"
-msgstr ""
+msgstr "Spesifiser ditt Terminologi"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,sync_google_contact:0
 msgid "For Sync Google Contact"
-msgstr ""
+msgstr "For Synkroniser Google Kontakt"
 
 #~ msgid "Report Footer 1"
 #~ msgstr "Rapport Bunntekst 1"
diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po
index 24b5869c2c4..6c42bf2be14 100644
--- a/addons/base_setup/i18n/nl.po
+++ b/addons/base_setup/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-15 14:01+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po
index d60b2de9dba..f5607a755eb 100644
--- a/addons/base_setup/i18n/nl_BE.po
+++ b/addons/base_setup/i18n/nl_BE.po
@@ -7,44 +7,44 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-04-24 15:11+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-10-01 11:22+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
 msgid "Display Tips"
-msgstr ""
+msgstr "Tips weergeven"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Guest"
-msgstr ""
+msgstr "Gast"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_product_installer
 msgid "product.installer"
-msgstr ""
+msgstr "product.installer"
 
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Create"
-msgstr ""
+msgstr "Maken"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Member"
-msgstr ""
+msgstr "Lid"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,sync_google_contact:0
 msgid "Sync Google Contact"
-msgstr ""
+msgstr "Google-contacten synchroniseren"
 
 #. module: base_setup
 #: help:user.preferences.config,context_tz:0
@@ -52,21 +52,23 @@ msgid ""
 "Set default for new user's timezone, used to perform timezone conversions "
 "between the server and the client."
 msgstr ""
+"Stel de standaardtijdzone in voor nieuwe gebruikers. Deze wordt gebruikt om "
+"tijdzoneconversies te doen tussen server en client."
 
 #. module: base_setup
 #: selection:product.installer,customers:0
 msgid "Import"
-msgstr ""
+msgstr "Importeren"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Donor"
-msgstr ""
+msgstr "Donor"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Set Company Header and Footer"
-msgstr ""
+msgstr "Stel uw kop- en voettekst in"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_base_setup_company
@@ -75,21 +77,24 @@ msgid ""
 "printed on your reports. You can click on the button 'Preview Header' in "
 "order to check the header/footer of PDF documents."
 msgstr ""
+"Vul uw bedrijfsgegevens in (adres, logo, bankrekeningen), zodat deze worden "
+"afgedrukt op uw rapporten. U kunt op de knop 'Voorbeeld koptekst' klikken om "
+"de koptekst en voettekst van pdf-documenten te controleren."
 
 #. module: base_setup
 #: field:product.installer,customers:0
 msgid "Customers"
-msgstr ""
+msgstr "Klanten"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Extended"
-msgstr ""
+msgstr "Uitgebreid"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Patient"
-msgstr ""
+msgstr "Patiënt"
 
 #. module: base_setup
 #: model:ir.actions.act_window,help:base_setup.action_import_create_installer
@@ -98,26 +103,29 @@ msgid ""
 "you can import your existing partners by CSV spreadsheet from \"Import "
 "Data\" wizard"
 msgstr ""
+"Maak of importeer klanten en contactpersonen manueel vanuit dit scherm. U "
+"kunt ook bestaande klanten importeren vanuit een csv-bestand met de wizard "
+"\"Gegevens importeren\"."
 
 #. module: base_setup
 #: view:user.preferences.config:0
 msgid "Define Users's Preferences"
-msgstr ""
+msgstr "Stel de gebruikersvoorkeuren in"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_user_preferences_config_form
 msgid "Define default users preferences"
-msgstr ""
+msgstr "Stel de standaard gebruikersvoorkeuren in"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_saleforce:0
 msgid "For Import Saleforce"
-msgstr ""
+msgstr "Voor Salesforce-import"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "For Quickbooks Ippids"
-msgstr ""
+msgstr "Voor Quickboos Ippids"
 
 #. module: base_setup
 #: help:user.preferences.config,view:0
@@ -126,6 +134,9 @@ msgid ""
 "simplified interface, which has less features but is easier. You can always "
 "switch later from the user preferences."
 msgstr ""
+"Als u OpenERP voor de eerste keer gebruikt, raden wij u aan de eenvoudige "
+"weergave te kiezen, met minder functies en een eenvoudige werking. U kunt "
+"deze keuze altijd wijzigen via de gebruikersvoorkeuren."
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -136,12 +147,12 @@ msgstr "res_config_contents"
 #. module: base_setup
 #: field:user.preferences.config,view:0
 msgid "Interface"
-msgstr ""
+msgstr "Interface"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_migrade_application_installer_modules
 msgid "migrade.application.installer.modules"
-msgstr ""
+msgstr "migrade.application.installer.modules"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -149,21 +160,23 @@ msgid ""
 "You can use this wizard to change the terminologies for customers in the "
 "whole application."
 msgstr ""
+"Met deze wizard kunt u een andere benaming kiezen voor klanten, die in de "
+"volledige toepassing zal worden gebruikt."
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr ""
+msgstr "Huurder"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Customer"
-msgstr ""
+msgstr "Klant"
 
 #. module: base_setup
 #: field:user.preferences.config,context_lang:0
 msgid "Language"
-msgstr ""
+msgstr "Taal"
 
 #. module: base_setup
 #: help:user.preferences.config,context_lang:0
@@ -172,6 +185,9 @@ msgid ""
 "available. If you want to Add new Language, you can add it from 'Load an "
 "Official Translation' wizard  from 'Administration' menu."
 msgstr ""
+"Kiest de standaardtaal voor de gebruik, als er vertalingen beschikbaar zijn. "
+"Een Nieuwe taal instellen kan via het menu Beheer, Laad een officiële "
+"vertaling."
 
 #. module: base_setup
 #: view:user.preferences.config:0
@@ -180,47 +196,50 @@ msgid ""
 "ones. Afterwards, users are free to change those values on their own user "
 "preference form."
 msgstr ""
+"Hiermee wijst u de standaardinstellingen toe aan nieuwe en bestaande "
+"gebruikers. Een gebruiker kan deze waarden altijd wijzigen via zijn "
+"voorkeuren."
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
 msgid "How do you call a Customer"
-msgstr ""
+msgstr "Hoe wordt een klant bij u genoemd?"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
 msgid "Quickbooks Ippids"
-msgstr ""
+msgstr "Quickbooks Ippids"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Client"
-msgstr ""
+msgstr "Cliënt"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
 msgid "Import Saleforce"
-msgstr ""
+msgstr "Salesforce-import"
 
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
 msgid "Timezone"
-msgstr ""
+msgstr "Tijdzone"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "Gebruik een andere benaming voor Klant"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
 msgid "base.setup.terminology"
-msgstr ""
+msgstr "base.setup.terminology"
 
 #. module: base_setup
 #: help:user.preferences.config,menu_tips:0
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
-msgstr ""
+msgstr "Schakel dit vakje in als u voor elke menuactie tips wilt weergaven."
 
 #. module: base_setup
 #: field:base.setup.terminology,config_logo:0
@@ -233,52 +252,52 @@ msgstr "Afbeelding"
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_user_preferences_config
 msgid "user.preferences.config"
-msgstr ""
+msgstr "user.preferences.config"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_config_access_other_user
 msgid "Create Additional Users"
-msgstr ""
+msgstr "Extra gebruikers maken"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_import_create_installer
 msgid "Create or Import Customers"
-msgstr ""
+msgstr "Klanten maken of importeren"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_sugarcrm:0
 msgid "Import Sugarcrm"
-msgstr ""
+msgstr "SugarCRM-import"
 
 #. module: base_setup
 #: help:product.installer,customers:0
 msgid "Import or create customers"
-msgstr ""
+msgstr "Klanten maken of importeren"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Simplified"
-msgstr ""
+msgstr "Eenvoudig"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
 msgid "For Import Sugarcrm"
-msgstr ""
+msgstr "Voor SugarCRM-import"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "Specify Your Terminology"
-msgstr ""
+msgstr "Kies uw terminologie"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,sync_google_contact:0
 msgid "For Sync Google Contact"
-msgstr ""
+msgstr "Voor synchronisatie met Google-contacten"
 
 #~ msgid "Logo"
 #~ msgstr "Logo"
diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po
index 289f3050e1b..6be29810d28 100644
--- a/addons/base_setup/i18n/pl.po
+++ b/addons/base_setup/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index d9207075140..f04d0aa82df 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index 15e42257467..6c91173430f 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 19:07+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -52,8 +53,8 @@ msgid ""
 "Set default for new user's timezone, used to perform timezone conversions "
 "between the server and the client."
 msgstr ""
-"Defina o padrão para a timezone de novos usuários, usado para fazer "
-"conversões de timezones entre servidor e cliente."
+"Defina o padrão para o fuso horário de novos usuários, usado para fazer "
+"conversões de fuso horário entre servidor e cliente."
 
 #. module: base_setup
 #: selection:product.installer,customers:0
@@ -89,7 +90,7 @@ msgstr "Clientes"
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Extended"
-msgstr "Extendido"
+msgstr "Extendida"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -241,7 +242,8 @@ msgstr "base.setup.terminology"
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
 msgstr ""
-"Confira esta caixa se desejar exibir sempre dicas sobre cada ação do menu."
+"Selecione esta caixa se desejar sempre exibir as dicas sobre cada ação do "
+"menu."
 
 #. module: base_setup
 #: field:base.setup.terminology,config_logo:0
diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po
index e007344d486..75e981c4725 100644
--- a/addons/base_setup/i18n/ro.po
+++ b/addons/base_setup/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po
index 8c51fa9c32e..2fe272e5f35 100644
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-20 19:34+0000\n"
+"PO-Revision-Date: 2012-08-30 17:01+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
@@ -79,12 +79,12 @@ msgstr ""
 #. module: base_setup
 #: field:product.installer,customers:0
 msgid "Customers"
-msgstr ""
+msgstr "Заказчики"
 
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Extended"
-msgstr ""
+msgstr "Расширенный"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -156,7 +156,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Tenant"
-msgstr ""
+msgstr "Арендатор"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -187,7 +187,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
 msgid "How do you call a Customer"
-msgstr ""
+msgstr "Как вы называете заказчика"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,quickbooks_ippids:0
@@ -197,7 +197,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Client"
-msgstr ""
+msgstr "Клиент"
 
 #. module: base_setup
 #: field:migrade.application.installer.modules,import_saleforce:0
@@ -207,7 +207,7 @@ msgstr ""
 #. module: base_setup
 #: field:user.preferences.config,context_tz:0
 msgid "Timezone"
-msgstr ""
+msgstr "Часовой пояс"
 
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
@@ -224,6 +224,8 @@ msgstr ""
 msgid ""
 "Check out this box if you want to always display tips on each menu action"
 msgstr ""
+"Отметьте этот квадратик, если вы хотите всегда выводить советы для каждого "
+"пункта меню"
 
 #. module: base_setup
 #: field:base.setup.terminology,config_logo:0
@@ -261,7 +263,7 @@ msgstr ""
 #. module: base_setup
 #: selection:user.preferences.config,view:0
 msgid "Simplified"
-msgstr ""
+msgstr "Упрощенный"
 
 #. module: base_setup
 #: help:migrade.application.installer.modules,import_sugarcrm:0
@@ -271,7 +273,7 @@ msgstr ""
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
 msgid "Partner"
-msgstr ""
+msgstr "Контрагент"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
diff --git a/addons/base_setup/i18n/sk.po b/addons/base_setup/i18n/sk.po
index 9d07ac17669..471f3dae70e 100644
--- a/addons/base_setup/i18n/sk.po
+++ b/addons/base_setup/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sl.po b/addons/base_setup/i18n/sl.po
index 3e3dc2bba5f..a32c82641e2 100644
--- a/addons/base_setup/i18n/sl.po
+++ b/addons/base_setup/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sq.po b/addons/base_setup/i18n/sq.po
index c9adc0439e5..a3e536e4fce 100644
--- a/addons/base_setup/i18n/sq.po
+++ b/addons/base_setup/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po
index af88f5399eb..af92035f3b5 100644
--- a/addons/base_setup/i18n/sr.po
+++ b/addons/base_setup/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sr@latin.po b/addons/base_setup/i18n/sr@latin.po
index 4ee0f42ddef..87d788bfa09 100644
--- a/addons/base_setup/i18n/sr@latin.po
+++ b/addons/base_setup/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index 1afa9579801..bca1fcf3887 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po
index 87a223c5ef3..19a0ab1fc03 100644
--- a/addons/base_setup/i18n/th.po
+++ b/addons/base_setup/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/tlh.po b/addons/base_setup/i18n/tlh.po
index ebf0897b7d9..c42c7e0bc74 100644
--- a/addons/base_setup/i18n/tlh.po
+++ b/addons/base_setup/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 5a689c8ac10..4eaf273ea4f 100644
--- a/addons/base_setup/i18n/tr.po
+++ b/addons/base_setup/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po
index 9dec941e294..58eea2e1591 100644
--- a/addons/base_setup/i18n/uk.po
+++ b/addons/base_setup/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/vi.po b/addons/base_setup/i18n/vi.po
index 1834e2f8697..ce615c55b47 100644
--- a/addons/base_setup/i18n/vi.po
+++ b/addons/base_setup/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po
index 6f82e95cd6a..7d99724d108 100644
--- a/addons/base_setup/i18n/zh_CN.po
+++ b/addons/base_setup/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po
index 44f5393a043..2d1355bdbbd 100644
--- a/addons/base_setup/i18n/zh_TW.po
+++ b/addons/base_setup/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:02+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:59+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_setup
 #: field:user.preferences.config,menu_tips:0
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 4826a50400d..e7898395d62 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -25,16 +25,17 @@ class base_config_settings(osv.osv_memory):
     _name = 'base.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_multi_company': fields.boolean('manage multiple companies',
+        'module_multi_company': fields.boolean('Manage multiple companies',
             help="""Work in multi-company environments, with appropriate security access between companies.
                 This installs the module multi_company."""),
-        'module_share': fields.boolean('allow documents sharing',
+        'module_share': fields.boolean('Allow documents sharing',
             help="""Share or embbed any screen of openerp."""),
-        'module_portal': fields.boolean('activate the customer/supplier portal',
+        'module_portal': fields.boolean('Activate the customer/supplier portal',
             help="""Give access your customers and suppliers to their documents."""),
-        'module_auth_anonymous': fields.boolean('activate the public portal',
+        'module_auth_anonymous': fields.boolean('Activate the public portal',
             help="""Enable the public part of openerp, openerp becomes a public website."""),
-        'module_auth_oauth': fields.boolean('use external authentication providers, sign in with google, facebook, ...'),
+        'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'),
+        'module_base_import': fields.boolean("Allow users to import data from CSV files"),
     }
 
     def open_company(self, cr, uid, ids, context=None):
@@ -56,17 +57,17 @@ class sale_config_settings(osv.osv_memory):
     _name = 'sale.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_web_linkedin': fields.boolean('get contacts automatically from LinkedIn',
+        'module_web_linkedin': fields.boolean('Get contacts automatically from linkedIn',
             help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""),
         'module_crm': fields.boolean('CRM'),
-        'module_plugin_thunderbird': fields.boolean('enable Thunderbird plugin',
+        'module_plugin_thunderbird': fields.boolean('Enable Thunderbird plug-in',
             help="""The plugin allows you archive email and its attachments to the selected
                 OpenERP objects. You can select a partner, or a lead and
                 attach the selected mail as a .eml file in
                 the attachment of a selected record. You can create documents for CRM Lead,
                 Partner from the selected emails.
                 This installs the module plugin_thunderbird."""),
-        'module_plugin_outlook': fields.boolean('enable Outlook plugin',
+        'module_plugin_outlook': fields.boolean('Enable Outlook plug-in',
             help="""The Outlook plugin allows you to select an object that you would like to add
                 to your email and its attachments from MS Outlook. You can select a partner,
                 or a lead object and archive a selected
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 512c0a3f52e..c06ff6534d7 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -14,9 +14,10 @@
                     </header>
                     <separator string="General Settings"/>
                     <div>
-                        <label string="You will also find several configuration options on your company data:
-                            address for the header and footer, overdue payments texts, etc."/>
-                        <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_inline oe_link"/>
+                        <p>
+                            <label string="You will find more options in your company details: address for the header and footer, overdue payments texts, etc."/>
+                            <button type="object" name="open_company" string="Configure your company data" icon="gtk-execute" class="oe_inline oe_link"/>
+                        </p>
                     </div>
                     <group>
                         <label for="id" string="Options"/>
@@ -59,6 +60,15 @@
                             </div>
                         </div>
                     </group>
+                    <group>
+                        <label for="id" string="Import / Export"/>
+                        <div>
+                            <div>
+                                <field name="module_base_import" class="oe_inline"/>
+                                <label for="module_base_import"/>
+                            </div>
+                        </div>
+                    </group>
                 </form>
             </field>
         </record>
diff --git a/addons/base_setup/res_partner_view.xml b/addons/base_setup/res_partner_view.xml
index 5aa24b3474d..15b80151831 100644
--- a/addons/base_setup/res_partner_view.xml
+++ b/addons/base_setup/res_partner_view.xml
@@ -9,12 +9,11 @@
             <field name="inherit_id" ref="base.res_partner_kanban_view"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@class='oe_kanban_partner_categories']" position="inside">
-                    <t t-foreach="record.category_id.raw_value" t-as="category">
-                        <span class="oe_tag" t-att-data-category_id="category"/>
-                    </t>
+                    <span class="oe_kanban_list_many2many">
+                        <field name="category_id"/>
+                    </span>
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/base_setup/static/src/js/base_setup.js b/addons/base_setup/static/src/js/base_setup.js
deleted file mode 100644
index 4f900a3d69b..00000000000
--- a/addons/base_setup/static/src/js/base_setup.js
+++ /dev/null
@@ -1,24 +0,0 @@
-openerp.base_setup = function(openerp) {
-    /* extend kanban to include the names of partner categories in the kanban view of partners */
-    openerp.web_kanban.KanbanView.include({
-        on_groups_started: function() {
-            var self = this;
-            self._super.apply(this, arguments);
-            if (this.dataset.model === 'res.partner') {
-                /* Set names for partner categories */
-                var category_ids = [];
-                this.$element.find('.oe_kanban_partner_categories span').each(function() {
-                    category_ids.push($(this).data('category_id'));
-                });
-                var dataset = new openerp.web.DataSetSearch(this, 'res.partner.category', self.session.context);
-                dataset.name_get(_.uniq(category_ids)).then(function(result) {
-                    _.each(result, function(value) {
-                        self.$element
-                            .find('.oe_kanban_partner_categories span[data-category_id=' + value[0] + ']')
-                            .html(value[1]);
-                    });
-                });
-            }
-        }
-    });
-};
diff --git a/addons/base_status/__openerp__.py b/addons/base_status/__openerp__.py
index bbd82b703ac..79b6dd2016c 100644
--- a/addons/base_status/__openerp__.py
+++ b/addons/base_status/__openerp__.py
@@ -24,19 +24,17 @@
     'version': '1.0',
     'category': 'Hidden',
     'description': """
-This module handles state and stage. It is derived from the crm_base and
-crm_case classes from crm.
-========================================================================
+This module handles state and stage. It is derived from the crm_base and crm_case classes from crm.
+===================================================================================================
 
- * ``base_state``: state management
- * ``base_stage``: stage management
+    * ``base_state``: state management
+    * ``base_stage``: stage management
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [],
-    'demo_xml': [],
+    'data': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/base_status/base_stage.py b/addons/base_status/base_stage.py
index 775de51394c..86edff46920 100644
--- a/addons/base_status/base_stage.py
+++ b/addons/base_status/base_stage.py
@@ -69,7 +69,7 @@ class base_stage(object):
             return False
         return uid
 
-    def onchange_partner_address_id(self, cr, uid, ids, add, email=False):
+    def onchange_partner_address_id(self, cr, uid, ids, add, email=False, context=None):
         """ This function returns value of partner email based on Partner Address
             :param add: Id of Partner's address
             :param email: Partner's email ID
@@ -77,10 +77,20 @@ class base_stage(object):
         data = {'value': {'email_from': False, 'phone':False}}
         if add:
             address = self.pool.get('res.partner').browse(cr, uid, add)
-            data['value'] = {'email_from': address and address.email or False ,
-                             'phone':  address and address.phone or False}
-        if 'phone' not in self._columns:
-            del data['value']['phone']
+            data['value'] = {'partner_name': address and address.name or False,
+                             'email_from': address and address.email or False,
+                             'phone':  address and address.phone or False,
+                             'street': address and address.street or False,
+                             'street2': address and address.street2 or False,
+                             'city': address and address.city or False,
+                             'state_id': address.state_id and address.state_id.id or False,
+                             'zip': address and address.zip or False,
+                             'country_id': address.country_id and address.country_id.id or False,
+                             }
+        fields = self.fields_get(cr, uid, context=context or {})
+        for key in data['value'].keys():
+            if key not in fields:
+                del data['value'][key]
         return data
 
     def onchange_partner_id(self, cr, uid, ids, part, email=False):
@@ -214,8 +224,6 @@ class base_stage(object):
         cases = self.browse(cr, uid, ids, context=context)
         for case in cases:
             data = {'active': True}
-            if case.stage_id and case.stage_id.state == 'draft':
-                data['date_open'] = fields.datetime.now()
             if not case.user_id:
                 data['user_id'] = uid
             self.case_set(cr, uid, [case.id], 'open', data, context=context)
@@ -292,85 +300,13 @@ class base_stage(object):
         rule_ids = rule_obj.search(cr, uid, [('model_id','=',model_ids[0])], context=context)
         return rule_obj._action(cr, uid, rule_ids, cases, scrit=scrit, context=context)
 
-    def remind_partner(self, cr, uid, ids, context=None, attach=False):
-        return self.remind_user(cr, uid, ids, context, attach,
-                destination=False)
-
-    def remind_user(self, cr, uid, ids, context=None, attach=False, destination=True):
-        mail_message = self.pool.get('mail.message')
-        for case in self.browse(cr, uid, ids, context=context):
-            if not destination and not case.email_from:
-                return False
-            if not case.user_id.email:
-                return False
-            if destination and case.section_id.user_id:
-                case_email = case.section_id.user_id.email
-            else:
-                case_email = case.user_id.email
-
-            src = case_email
-            dest = case.user_id.email or ""
-            body = case.description or ""
-            for message in case.message_ids:
-                if message.email_from and message.body_text:
-                    body = message.body_text
-                    break
-
-            if not destination:
-                src, dest = dest, case.email_from
-                if body and 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)
-
-            attach_to_send = {}
-
-            if attach:
-                attach_ids = self.pool.get('ir.attachment').search(cr, uid, [('res_model', '=', self._name), ('res_id', '=', case.id)])
-                attach_to_send = self.pool.get('ir.attachment').read(cr, uid, attach_ids, ['datas_fname', 'datas'])
-                attach_to_send = dict(map(lambda x: (x['datas_fname'], base64.decodestring(x['datas'])), attach_to_send))
-
-            # Send an email
-            subject = "Reminder: [%s] %s" % (str(case.id), case.name, )
-            mail_message.schedule_with_attach(cr, uid,
-                src,
-                [dest],
-                subject,
-                body,
-                model=self._name,
-                reply_to=case.section_id.reply_to,
-                res_id=case.id,
-                attachments=attach_to_send,
-                context=context
-            )
-        return True
-
+    
     def _check(self, cr, uid, ids=False, context=None):
         """ Function called by the scheduler to process cases for date actions.
             Must be overriden by inheriting classes.
         """
         return True
 
-    def format_body(self, body):
-        return self.pool.get('base.action.rule').format_body(body)
-
-    def format_mail(self, obj, body):
-        return self.pool.get('base.action.rule').format_mail(obj, body)
-
-    def message_thread_followers(self, cr, uid, ids, context=None):
-        res = {}
-        for case in self.browse(cr, uid, ids, context=context):
-            l=[]
-            if case.email_cc:
-                l.append(case.email_cc)
-            if case.user_id and case.user_id.email:
-                l.append(case.user_id.email)
-            res[case.id] = l
-        return res
-
     # ******************************
     # Notifications
     # ******************************
@@ -395,31 +331,31 @@ class base_stage(object):
     def case_open_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>opened</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_close_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>closed</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_cancel_send_note(self, cr, uid, ids, context=None):
         for id in ids:
-            msg = _('%s has been <b>canceled</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            msg = _('%s has been <b>cancelled</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_pending_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s is now <b>pending</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_reset_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>renewed</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_escalate_send_note(self, cr, uid, ids, new_section=None, context=None):
@@ -428,5 +364,5 @@ class base_stage(object):
                 msg = '%s has been <b>escalated</b> to <b>%s</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context), new_section.name)
             else:
                 msg = '%s has been <b>escalated</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], 'System Notification', msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
diff --git a/addons/base_status/base_state.py b/addons/base_status/base_state.py
index 8fa2f92e22a..cebf5537485 100644
--- a/addons/base_status/base_state.py
+++ b/addons/base_status/base_state.py
@@ -179,13 +179,13 @@ class base_state(object):
     # Notifications
     # ******************************
     
-	def case_get_note_msg_prefix(self, cr, uid, id, context=None):
-		return ''
-	
+    def case_get_note_msg_prefix(self, cr, uid, id, context=None):
+        return ''
+
     def case_open_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>opened</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_escalate_send_note(self, cr, uid, ids, new_section=None, context=None):
@@ -194,29 +194,29 @@ class base_state(object):
                 msg = '%s has been <b>escalated</b> to <b>%s</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context), new_section.name)
             else:
                 msg = '%s has been <b>escalated</b>.' % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], 'System Notification', msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_close_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>closed</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_cancel_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>canceled</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_pending_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s is now <b>pending</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
 
     def case_reset_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             msg = _('%s has been <b>renewed</b>.') % (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=msg, context=context)
+            self.message_post(cr, uid, [id], body=msg, context=context)
         return True
diff --git a/addons/base_tools/LICENSE b/addons/base_tools/LICENSE
deleted file mode 100644
index 27a1a4cf453..00000000000
--- a/addons/base_tools/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-OpenERP, Open Source Management Solution
-Copyright © 2010 OpenERP SA (<http://openerp.com>).
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public Lice
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/addons/base_tools/__init__.py b/addons/base_tools/__init__.py
deleted file mode 100644
index 4c241b72be9..00000000000
--- a/addons/base_tools/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# Debian packaging removes blank files, so this comment is added.
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py
deleted file mode 100644
index 8989c6d0a78..00000000000
--- a/addons/base_tools/__openerp__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- encoding: utf-8 -*-
-{
-    "name": "Base Tools",
-    "author": "OpenERP SA",
-    "version": "1.0",
-    "depends": ["base"],
-    "category" : "Hidden/Dependency",
-    'description': """
-Common base for tools modules.
-==============================
-
-Creates menu link for Tools from where tools like survey, lunch, idea are accessible if installed.
-    """,
-    "init_xml": [],
-    "update_xml": [
-        'tools_view.xml'
-    ],
-    "installable": True,
-    "certificate" : "00571588675379342237"
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_tools/i18n/ar.po b/addons/base_tools/i18n/ar.po
index ce6e36edfd3..ccddeb75e65 100644
--- a/addons/base_tools/i18n/ar.po
+++ b/addons/base_tools/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/base_tools.pot b/addons/base_tools/i18n/base_tools.pot
deleted file mode 100644
index f2b6a6b0d6b..00000000000
--- a/addons/base_tools/i18n/base_tools.pot
+++ /dev/null
@@ -1,28 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_tools
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14:58+0000\n"
-"PO-Revision-Date: 2011-01-11 11:14: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: \n"
-"Plural-Forms: \n"
-
-#. module: base_tools
-#: model:ir.module.module,shortdesc:base_tools.module_meta_information
-msgid "Common base for tools modules"
-msgstr ""
-
-#. module: base_tools
-#: model:ir.module.module,description:base_tools.module_meta_information
-msgid "\n"
-"    "
-msgstr ""
-
diff --git a/addons/base_tools/i18n/bg.po b/addons/base_tools/i18n/bg.po
index 2210ac79cd8..aa3ab393c8a 100644
--- a/addons/base_tools/i18n/bg.po
+++ b/addons/base_tools/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/ca.po b/addons/base_tools/i18n/ca.po
index 29e9ffa53d8..56c3e128341 100644
--- a/addons/base_tools/i18n/ca.po
+++ b/addons/base_tools/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/cs.po b/addons/base_tools/i18n/cs.po
index fce3e5173c9..a2e9798da57 100644
--- a/addons/base_tools/i18n/cs.po
+++ b/addons/base_tools/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/da.po b/addons/base_tools/i18n/da.po
index 8e619ba3a85..5f024940e8e 100644
--- a/addons/base_tools/i18n/da.po
+++ b/addons/base_tools/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/de.po b/addons/base_tools/i18n/de.po
index 358b227a138..d9191cbc693 100644
--- a/addons/base_tools/i18n/de.po
+++ b/addons/base_tools/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/en_GB.po b/addons/base_tools/i18n/en_GB.po
index 3c76a999aec..ee997bf10a7 100644
--- a/addons/base_tools/i18n/en_GB.po
+++ b/addons/base_tools/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/es.po b/addons/base_tools/i18n/es.po
index 3592ff30f6d..622fca66e6f 100644
--- a/addons/base_tools/i18n/es.po
+++ b/addons/base_tools/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/es_AR.po b/addons/base_tools/i18n/es_AR.po
index f20afe8f0fc..c79ec4b6a3c 100644
--- a/addons/base_tools/i18n/es_AR.po
+++ b/addons/base_tools/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/es_CL.po b/addons/base_tools/i18n/es_CL.po
index 13d24b56262..509e74a9927 100644
--- a/addons/base_tools/i18n/es_CL.po
+++ b/addons/base_tools/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/es_CR.po b/addons/base_tools/i18n/es_CR.po
index 1be0f97dc63..62b66c50f48 100644
--- a/addons/base_tools/i18n/es_CR.po
+++ b/addons/base_tools/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: base_tools
diff --git a/addons/base_tools/i18n/es_EC.po b/addons/base_tools/i18n/es_EC.po
index 9e3a7fa5414..237170e07f8 100644
--- a/addons/base_tools/i18n/es_EC.po
+++ b/addons/base_tools/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/es_PY.po b/addons/base_tools/i18n/es_PY.po
index 836e2f18c6d..0fec38a64f6 100644
--- a/addons/base_tools/i18n/es_PY.po
+++ b/addons/base_tools/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/fa.po b/addons/base_tools/i18n/fa.po
index 513c9ad4763..54771ccc6f0 100644
--- a/addons/base_tools/i18n/fa.po
+++ b/addons/base_tools/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/fi.po b/addons/base_tools/i18n/fi.po
index 26b13220bcc..60cd6b6c241 100644
--- a/addons/base_tools/i18n/fi.po
+++ b/addons/base_tools/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/fr.po b/addons/base_tools/i18n/fr.po
index 81f8bba5bd0..70e74fba770 100644
--- a/addons/base_tools/i18n/fr.po
+++ b/addons/base_tools/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/gl.po b/addons/base_tools/i18n/gl.po
index 73d28b7c52d..b858bc5446c 100644
--- a/addons/base_tools/i18n/gl.po
+++ b/addons/base_tools/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/gu.po b/addons/base_tools/i18n/gu.po
index fb1f6a68b53..64a8bec323f 100644
--- a/addons/base_tools/i18n/gu.po
+++ b/addons/base_tools/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/hi.po b/addons/base_tools/i18n/hi.po
index 28fec6d1e45..4692172c1fa 100644
--- a/addons/base_tools/i18n/hi.po
+++ b/addons/base_tools/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/hr.po b/addons/base_tools/i18n/hr.po
index b29152210fc..dd567cc71d6 100644
--- a/addons/base_tools/i18n/hr.po
+++ b/addons/base_tools/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/es_MX.po b/addons/base_tools/i18n/hu.po
similarity index 63%
rename from addons/base_tools/i18n/es_MX.po
rename to addons/base_tools/i18n/hu.po
index fdf326b3f0e..64e4ab45ab5 100644
--- a/addons/base_tools/i18n/es_MX.po
+++ b/addons/base_tools/i18n/hu.po
@@ -1,26 +1,26 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Hungarian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-02-15 15:36+0000\n"
+"PO-Revision-Date: 2012-11-13 16:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-11-14 04:40+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
 msgid "Common base for tools modules"
-msgstr "Base común para módulos herramientas"
+msgstr ""
 
 #. module: base_tools
 #: model:ir.module.module,description:base_tools.module_meta_information
@@ -28,5 +28,3 @@ msgid ""
 "\n"
 "    "
 msgstr ""
-"\n"
-"    "
diff --git a/addons/base_tools/i18n/id.po b/addons/base_tools/i18n/id.po
index 43cc9a8128c..bdf40530f81 100644
--- a/addons/base_tools/i18n/id.po
+++ b/addons/base_tools/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/it.po b/addons/base_tools/i18n/it.po
index 45de44ab10c..df8d6587498 100644
--- a/addons/base_tools/i18n/it.po
+++ b/addons/base_tools/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/ja.po b/addons/base_tools/i18n/ja.po
index 0e0ba54d984..70a7357bec4 100644
--- a/addons/base_tools/i18n/ja.po
+++ b/addons/base_tools/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/es_VE.po b/addons/base_tools/i18n/lt.po
similarity index 63%
rename from addons/base_tools/i18n/es_VE.po
rename to addons/base_tools/i18n/lt.po
index fdf326b3f0e..ca675b69a58 100644
--- a/addons/base_tools/i18n/es_VE.po
+++ b/addons/base_tools/i18n/lt.po
@@ -1,26 +1,26 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-02-15 15:36+0000\n"
+"PO-Revision-Date: 2012-08-28 13:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
 msgid "Common base for tools modules"
-msgstr "Base común para módulos herramientas"
+msgstr ""
 
 #. module: base_tools
 #: model:ir.module.module,description:base_tools.module_meta_information
@@ -28,5 +28,3 @@ msgid ""
 "\n"
 "    "
 msgstr ""
-"\n"
-"    "
diff --git a/addons/base_tools/i18n/mn.po b/addons/base_tools/i18n/mn.po
index c441b127833..75b8cc96997 100644
--- a/addons/base_tools/i18n/mn.po
+++ b/addons/base_tools/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/nb.po b/addons/base_tools/i18n/nb.po
index 684b0106523..45834366797 100644
--- a/addons/base_tools/i18n/nb.po
+++ b/addons/base_tools/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/nl.po b/addons/base_tools/i18n/nl.po
index 8053efdf90c..d18535bd8b9 100644
--- a/addons/base_tools/i18n/nl.po
+++ b/addons/base_tools/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/nl_BE.po b/addons/base_tools/i18n/nl_BE.po
index cc75d23f45d..57fa66fd7c8 100644
--- a/addons/base_tools/i18n/nl_BE.po
+++ b/addons/base_tools/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/oc.po b/addons/base_tools/i18n/oc.po
index c883afa9cf9..9ad4e0eab77 100644
--- a/addons/base_tools/i18n/oc.po
+++ b/addons/base_tools/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/pt.po b/addons/base_tools/i18n/pt.po
index 7baf356a56d..d07a00ae211 100644
--- a/addons/base_tools/i18n/pt.po
+++ b/addons/base_tools/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/pt_BR.po b/addons/base_tools/i18n/pt_BR.po
index 30ded991240..7f4b6b60d4d 100644
--- a/addons/base_tools/i18n/pt_BR.po
+++ b/addons/base_tools/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/ro.po b/addons/base_tools/i18n/ro.po
index 3ff47676258..ec03732afcb 100644
--- a/addons/base_tools/i18n/ro.po
+++ b/addons/base_tools/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/ru.po b/addons/base_tools/i18n/ru.po
index cd5fae5dfc5..a11adaf544a 100644
--- a/addons/base_tools/i18n/ru.po
+++ b/addons/base_tools/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sk.po b/addons/base_tools/i18n/sk.po
index 27c3e423d67..f29496d0887 100644
--- a/addons/base_tools/i18n/sk.po
+++ b/addons/base_tools/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sl.po b/addons/base_tools/i18n/sl.po
index 7353b2b7104..1ef6c04ba2f 100644
--- a/addons/base_tools/i18n/sl.po
+++ b/addons/base_tools/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sq.po b/addons/base_tools/i18n/sq.po
index 25249cd7dec..2c7da34a64e 100644
--- a/addons/base_tools/i18n/sq.po
+++ b/addons/base_tools/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sr@latin.po b/addons/base_tools/i18n/sr@latin.po
index 9373de229b2..cd6bacf0f4c 100644
--- a/addons/base_tools/i18n/sr@latin.po
+++ b/addons/base_tools/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/sv.po b/addons/base_tools/i18n/sv.po
index 654947f3d2e..da9b52ab0d8 100644
--- a/addons/base_tools/i18n/sv.po
+++ b/addons/base_tools/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/tr.po b/addons/base_tools/i18n/tr.po
index b3b169dcd2f..59e86ec57ad 100644
--- a/addons/base_tools/i18n/tr.po
+++ b/addons/base_tools/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/vi.po b/addons/base_tools/i18n/vi.po
index 6c0269c1d4a..8d70c69f50a 100644
--- a/addons/base_tools/i18n/vi.po
+++ b/addons/base_tools/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/zh_CN.po b/addons/base_tools/i18n/zh_CN.po
index f61cd1baf1e..a709fb4ef98 100644
--- a/addons/base_tools/i18n/zh_CN.po
+++ b/addons/base_tools/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/i18n/zh_TW.po b/addons/base_tools/i18n/zh_TW.po
index d864c96ee17..12c22dd1af8 100644
--- a/addons/base_tools/i18n/zh_TW.po
+++ b/addons/base_tools/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_tools
 #: model:ir.module.module,shortdesc:base_tools.module_meta_information
diff --git a/addons/base_tools/tools_view.xml b/addons/base_tools/tools_view.xml
deleted file mode 100644
index fbe0e16e31a..00000000000
--- a/addons/base_tools/tools_view.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <!-- Top menu item -->
-        <menuitem name="Tools"
-            id="base.menu_tools"
-            sequence="160"/>
-
-    </data>
-</openerp>
diff --git a/addons/base_vat/__init__.py b/addons/base_vat/__init__.py
index 1d7c143b7dc..2331d5661c1 100644
--- a/addons/base_vat/__init__.py
+++ b/addons/base_vat/__init__.py
@@ -22,4 +22,4 @@
 import res_company
 import base_vat
 
-# 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/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py
index 7b09ee24a58..3071ddf2f5a 100644
--- a/addons/base_vat/__openerp__.py
+++ b/addons/base_vat/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'VAT Number Validation',
     'version': '1.0',
-    "category": 'Hidden/Dependency',
+    'category': 'Hidden/Dependency',
     'description': """
 VAT validation for Partner's VAT numbers.
 =========================================
@@ -33,19 +33,20 @@ be validated for all supported countries. The country is inferred from the
 will be validated using the Belgian rules.
 
 There are two different levels of VAT number validation:
-
- * By default, a simple off-line check is performed using the known validation
-   rules for the country, usually a simple check digit. This is quick and 
-   always available, but allows numbers that are perhaps not truly allocated,
-   or not valid anymore.
- * When the "VAT VIES Check" option is enabled (in the configuration of the user's
-   Company), VAT numbers will be instead submitted to the online EU VIES
-   database, which will truly verify that the number is valid and currently
-   allocated to a EU company. This is a little bit slower than the simple
-   off-line check, requires an Internet connection, and may not be available
-   all the time. If the service is not available or does not support the
-   requested country (e.g. for non-EU countries), a simple check will be performed
-   instead.
+--------------------------------------------------------
+    * By default, a simple off-line check is performed using the known validation
+      rules for the country, usually a simple check digit. This is quick and 
+      always available, but allows numbers that are perhaps not truly allocated,
+      or not valid anymore.
+      
+    * When the "VAT VIES Check" option is enabled (in the configuration of the user's
+      Company), VAT numbers will be instead submitted to the online EU VIES
+      database, which will truly verify that the number is valid and currently
+      allocated to a EU company. This is a little bit slower than the simple
+      off-line check, requires an Internet connection, and may not be available
+      all the time. If the service is not available or does not support the
+      requested country (e.g. for non-EU countries), a simple check will be performed
+      instead.
 
 Supported countries currently include EU countries, and a few non-EU countries
 such as Chile, Colombia, Mexico, Norway or Russia. For unsupported countries,
@@ -57,7 +58,6 @@ only the country code will be validated.
     'data': ['base_vat_view.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0084849360989',
     'images': ['images/1_partner_vat.jpeg'],
 }
 
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index ed2004ced08..51c1663d366 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -109,6 +109,7 @@ class res_partner(osv.osv):
         if not self.check_vat(cr, uid, ids, context=context):
             msg = self._construct_constraint_msg(cr, uid, ids, context=context)
             raise osv.except_osv(_('Error!'), msg)
+        return True
 
     def check_vat(self, cr, uid, ids, context=None):
         user_company = self.pool.get('res.users').browse(cr, uid, uid).company_id
diff --git a/addons/base_vat/base_vat_view.xml b/addons/base_vat/base_vat_view.xml
index ec98b7922de..e5d8d9c92aa 100644
--- a/addons/base_vat/base_vat_view.xml
+++ b/addons/base_vat/base_vat_view.xml
@@ -9,9 +9,9 @@
             <field name="arch" type="xml">
                 <field name="property_account_position" position="after" version="7.0">
                     <label for="vat"/>
-                    <div>
+                    <div name="vat_info">
                         <field name="vat" on_change="vat_change(vat)" placeholder="e.g. BE0477472701" class="oe_inline"/>
-                        <button colspan="2" name="button_check_vat" string="Check VAT" type="object" icon="gtk-execute" class="oe_inline"/>
+                        <button colspan="2" name="button_check_vat" string="Check Validity" type="object" icon="gtk-execute" class="oe_inline"/>
                         <field name="vat_subjected" class="oe_inline"/>
                     </div>
                 </field>
diff --git a/addons/base_vat/i18n/ar.po b/addons/base_vat/i18n/ar.po
index 2106e763eb9..0c1b9a3e61d 100644
--- a/addons/base_vat/i18n/ar.po
+++ b/addons/base_vat/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/bg.po b/addons/base_vat/i18n/bg.po
index d0421385883..1d453fd6cb4 100644
--- a/addons/base_vat/i18n/bg.po
+++ b/addons/base_vat/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/bs.po b/addons/base_vat/i18n/bs.po
index 21ec64eba75..096679e26b4 100644
--- a/addons/base_vat/i18n/bs.po
+++ b/addons/base_vat/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/ca.po b/addons/base_vat/i18n/ca.po
index efdafc716fd..e942380f7a7 100644
--- a/addons/base_vat/i18n/ca.po
+++ b/addons/base_vat/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/cs.po b/addons/base_vat/i18n/cs.po
index 9b5cdb46166..e7f77a802d7 100644
--- a/addons/base_vat/i18n/cs.po
+++ b/addons/base_vat/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/da.po b/addons/base_vat/i18n/da.po
index 46a0d38bba8..f0c2eb87316 100644
--- a/addons/base_vat/i18n/da.po
+++ b/addons/base_vat/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/de.po b/addons/base_vat/i18n/de.po
index 6f2e7f69bc2..6b5cceee3c5 100644
--- a/addons/base_vat/i18n/de.po
+++ b/addons/base_vat/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/el.po b/addons/base_vat/i18n/el.po
index 50af067175f..4e8a019fb25 100644
--- a/addons/base_vat/i18n/el.po
+++ b/addons/base_vat/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/en_AU.po b/addons/base_vat/i18n/en_AU.po
index 08f9bfb1df9..1bab00dbb45 100644
--- a/addons/base_vat/i18n/en_AU.po
+++ b/addons/base_vat/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/en_GB.po b/addons/base_vat/i18n/en_GB.po
index f9d81b8975b..cb1407e392e 100644
--- a/addons/base_vat/i18n/en_GB.po
+++ b/addons/base_vat/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/es.po b/addons/base_vat/i18n/es.po
index 2ea9fab1348..1954d46d886 100644
--- a/addons/base_vat/i18n/es.po
+++ b/addons/base_vat/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/es_AR.po b/addons/base_vat/i18n/es_AR.po
index 628d4a76bba..dafd5bfe143 100644
--- a/addons/base_vat/i18n/es_AR.po
+++ b/addons/base_vat/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/es_CL.po b/addons/base_vat/i18n/es_CL.po
index 99c9f837b78..5e38b24c105 100644
--- a/addons/base_vat/i18n/es_CL.po
+++ b/addons/base_vat/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/es_CR.po b/addons/base_vat/i18n/es_CR.po
index 06705e2cc69..d6e86ef3183 100644
--- a/addons/base_vat/i18n/es_CR.po
+++ b/addons/base_vat/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: base_vat
diff --git a/addons/base_vat/i18n/es_EC.po b/addons/base_vat/i18n/es_EC.po
index a2d118bf826..2e30e9429d3 100644
--- a/addons/base_vat/i18n/es_EC.po
+++ b/addons/base_vat/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/es_MX.po b/addons/base_vat/i18n/es_MX.po
index 57d269be72d..5c45c9ce806 100644
--- a/addons/base_vat/i18n/es_MX.po
+++ b/addons/base_vat/i18n/es_MX.po
@@ -1,70 +1,54 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* base_vat
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-25 18:58+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 00:31+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:10+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
-#: code:addons/base_vat/base_vat.py:87
+#: code:addons/base_vat/base_vat.py:141
 #, python-format
 msgid ""
-"The Vat does not seems to be correct. You should have entered something like "
-"this %s"
-msgstr ""
-"El CIF/NIF parece que no sea correcto. Debería haber introducido algo como "
-"esto %s"
+"This VAT number does not seem to be valid.\n"
+"Note: the expected format is %s"
+msgstr "El RFC no es válido. El formato esperado es %s"
 
 #. module: base_vat
-#: model:ir.module.module,description:base_vat.module_meta_information
-msgid ""
-"\n"
-"    Enable the VAT Number for the partner. Check the validity of that VAT "
-"Number.\n"
-"\n"
-"    This module follows the methods stated at http://sima-pc.com/nif.php "
-"for\n"
-"    checking the validity of VAT Number assigned to partners in European "
-"countries.\n"
-"    "
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
 msgstr ""
-"\n"
-"    Permite la validación del CIF/NIF de las empresas. Comprueba si el "
-"CIF/NIF es un número válido.\n"
-"\n"
-"    Este módulo usa los métodos especificados en http://sima-pc.com/nif.php "
-"para\n"
-"    la validación del CIF/NIF asignado a las empresas de los países "
-"europeos.\n"
-"    "
-
-#. module: base_vat
-#: model:ir.module.module,shortdesc:base_vat.module_meta_information
-msgid "Base VAT - To check VAT number validity"
-msgstr "Base CIF/NIF - Para comprobar la validez de los CIF/NIF"
 
 #. module: base_vat
 #: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "¡Error! No puede crear miembros asociados recursivos."
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
 
 #. module: base_vat
-#: code:addons/base_vat/base_vat.py:88
-#, python-format
-msgid "The VAT is invalid, It should begin with the country code"
-msgstr "El CIF/NIF no es válido, debería empezar con el código del país"
+#: field:res.company,vat_check_vies:0
+msgid "VIES VAT Check"
+msgstr ""
+
+#. module: base_vat
+#: model:ir.model,name:base_vat.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: base_vat
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
@@ -72,27 +56,20 @@ msgid ""
 "Check this box if the partner is subjected to the VAT. It will be used for "
 "the VAT legal statement."
 msgstr ""
-"Marque esta opción si la empresa está sujeta al IVA. Será utilizado para la "
-"declaración legal del IVA."
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr "Empresa"
+msgstr ""
+
+#. module: base_vat
+#: help:res.company,vat_check_vies:0
+msgid ""
+"If checked, Partners VAT numbers will be fully validated against EU's VIES "
+"service rather than via a simple format validation (checksum)."
+msgstr ""
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr "Sujeto a IVA"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid ""
-#~ "Enable the VAT Number for the partner. Check the validity of that VAT Number."
-#~ msgstr ""
-#~ "Activa el IVA (Impuesto Valor Añadido) para la empresa. Comprueba la validez "
-#~ "del CIF/NIF."
-
-#~ msgid "VAT"
-#~ msgstr "IVA"
+msgstr ""
diff --git a/addons/base_vat/i18n/es_PY.po b/addons/base_vat/i18n/es_PY.po
index 411d37719d0..671adffd4d6 100644
--- a/addons/base_vat/i18n/es_PY.po
+++ b/addons/base_vat/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/et.po b/addons/base_vat/i18n/et.po
index c891a06f444..c562106fc1d 100644
--- a/addons/base_vat/i18n/et.po
+++ b/addons/base_vat/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/eu.po b/addons/base_vat/i18n/eu.po
index 684fa52a906..b0835b0f529 100644
--- a/addons/base_vat/i18n/eu.po
+++ b/addons/base_vat/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/fa.po b/addons/base_vat/i18n/fa.po
index db7a5bd78f3..9d4d32d440c 100644
--- a/addons/base_vat/i18n/fa.po
+++ b/addons/base_vat/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/fi.po b/addons/base_vat/i18n/fi.po
index cf78bb2d396..770d4edabb2 100644
--- a/addons/base_vat/i18n/fi.po
+++ b/addons/base_vat/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/fr.po b/addons/base_vat/i18n/fr.po
index 60f1aafb281..2468fdf7932 100644
--- a/addons/base_vat/i18n/fr.po
+++ b/addons/base_vat/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/gl.po b/addons/base_vat/i18n/gl.po
index 7d8b3deec90..4760ac8e69d 100644
--- a/addons/base_vat/i18n/gl.po
+++ b/addons/base_vat/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/gu.po b/addons/base_vat/i18n/gu.po
index 152d33fb712..5fb1b718e69 100644
--- a/addons/base_vat/i18n/gu.po
+++ b/addons/base_vat/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/hr.po b/addons/base_vat/i18n/hr.po
index a3d87478cfb..aa0fb5014bd 100644
--- a/addons/base_vat/i18n/hr.po
+++ b/addons/base_vat/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/hu.po b/addons/base_vat/i18n/hu.po
index 414b4ad1a40..947a190e1a8 100644
--- a/addons/base_vat/i18n/hu.po
+++ b/addons/base_vat/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/id.po b/addons/base_vat/i18n/id.po
index 9530d931747..da1acefab5b 100644
--- a/addons/base_vat/i18n/id.po
+++ b/addons/base_vat/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
@@ -23,31 +23,33 @@ msgid ""
 "This VAT number does not seem to be valid.\n"
 "Note: the expected format is %s"
 msgstr ""
+"Nomor PPN ini tidak valid.\n"
+"Catatang: format yang diharapkan adalah %s"
 
 #. module: base_vat
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Nama Perusahaan harus unik!"
 
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Kesalahan! Anda tidak bisa membuat anggota berulang-ulang"
 
 #. module: base_vat
 #: field:res.company,vat_check_vies:0
 msgid "VIES VAT Check"
-msgstr ""
+msgstr "Cek VIES PPN"
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Perusahaan"
 
 #. module: base_vat
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Gagal! Anda tidak dapat membuat perulangan nama perusahaan"
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
@@ -55,11 +57,13 @@ msgid ""
 "Check this box if the partner is subjected to the VAT. It will be used for "
 "the VAT legal statement."
 msgstr ""
+"Centang kotak ini jika pasangan yang dikontrol terkena PPN. Ini akan "
+"digunakan untuk laporan PPN."
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Rekanan"
 
 #. module: base_vat
 #: help:res.company,vat_check_vies:0
@@ -67,11 +71,13 @@ msgid ""
 "If checked, Partners VAT numbers will be fully validated against EU's VIES "
 "service rather than via a simple format validation (checksum)."
 msgstr ""
+"Jika dicentang, Nomor Mitra PPN akan sepenuhnya divalidasi terhadap layanan "
+"Vies Uni Eropa, bukan melalui validasi format sederhana (checksum)."
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
 msgid "VAT Legal Statement"
-msgstr ""
+msgstr "Hukum PPN"
 
 #~ msgid "VAT"
 #~ msgstr "VAT"
diff --git a/addons/base_vat/i18n/it.po b/addons/base_vat/i18n/it.po
index c3080611eb3..b81a23c5085 100644
--- a/addons/base_vat/i18n/it.po
+++ b/addons/base_vat/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/ja.po b/addons/base_vat/i18n/ja.po
index 0f0e03be0d5..13caaca3f93 100644
--- a/addons/base_vat/i18n/ja.po
+++ b/addons/base_vat/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/ko.po b/addons/base_vat/i18n/ko.po
index 60db4986659..1b9ae7205e1 100644
--- a/addons/base_vat/i18n/ko.po
+++ b/addons/base_vat/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/lt.po b/addons/base_vat/i18n/lt.po
index 885f93714c7..90ac82254fb 100644
--- a/addons/base_vat/i18n/lt.po
+++ b/addons/base_vat/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/lv.po b/addons/base_vat/i18n/lv.po
index 964b20d156d..77caec59d57 100644
--- a/addons/base_vat/i18n/lv.po
+++ b/addons/base_vat/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/mn.po b/addons/base_vat/i18n/mn.po
index 1b88c695f7d..3b0bfaa6218 100644
--- a/addons/base_vat/i18n/mn.po
+++ b/addons/base_vat/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/nb.po b/addons/base_vat/i18n/nb.po
index c1ecc88c1ec..75860a000a7 100644
--- a/addons/base_vat/i18n/nb.po
+++ b/addons/base_vat/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
@@ -35,7 +35,7 @@ msgstr "Firmanavn må være unikt !"
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
 
 #. module: base_vat
 #: field:res.company,vat_check_vies:0
diff --git a/addons/base_vat/i18n/nl.po b/addons/base_vat/i18n/nl.po
index bf40526b59c..75981c4a9b2 100644
--- a/addons/base_vat/i18n/nl.po
+++ b/addons/base_vat/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-08 09:45+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/nl_BE.po b/addons/base_vat/i18n/nl_BE.po
index 04735b811f0..b8e3038225d 100644
--- a/addons/base_vat/i18n/nl_BE.po
+++ b/addons/base_vat/i18n/nl_BE.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-04-24 15:11+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-10-01 11:23+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
@@ -34,7 +34,7 @@ msgstr "De naam van de firma moet uniek zijn"
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "U kunt niet dezelfde verenigingsleden maken."
 
 #. module: base_vat
 #: field:res.company,vat_check_vies:0
diff --git a/addons/base_vat/i18n/oc.po b/addons/base_vat/i18n/oc.po
index 4ce418e8e49..21c443a25bd 100644
--- a/addons/base_vat/i18n/oc.po
+++ b/addons/base_vat/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/pl.po b/addons/base_vat/i18n/pl.po
index 96b0becfbac..b187a64cc74 100644
--- a/addons/base_vat/i18n/pl.po
+++ b/addons/base_vat/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/pt.po b/addons/base_vat/i18n/pt.po
index c0ee7c047fb..78961735d12 100644
--- a/addons/base_vat/i18n/pt.po
+++ b/addons/base_vat/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/pt_BR.po b/addons/base_vat/i18n/pt_BR.po
index 509fd93f422..332e39121e4 100644
--- a/addons/base_vat/i18n/pt_BR.po
+++ b/addons/base_vat/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 18:37+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
@@ -34,7 +35,7 @@ msgstr "O nome da empresa deve ser exclusivo!"
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursivamente a membros associados."
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: base_vat
 #: field:res.company,vat_check_vies:0
diff --git a/addons/base_vat/i18n/ro.po b/addons/base_vat/i18n/ro.po
index 279b786ff60..14507ca3127 100644
--- a/addons/base_vat/i18n/ro.po
+++ b/addons/base_vat/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/ru.po b/addons/base_vat/i18n/ru.po
index 979cd275dab..56d4083f250 100644
--- a/addons/base_vat/i18n/ru.po
+++ b/addons/base_vat/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
@@ -23,31 +23,33 @@ msgid ""
 "This VAT number does not seem to be valid.\n"
 "Note: the expected format is %s"
 msgstr ""
+"Этот номер НДС не кажется действительным.\n"
+"Примечание: обнаруженный формат - %s"
 
 #. module: base_vat
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Название компании должно быть уникальным!"
 
 #. module: base_vat
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: base_vat
 #: field:res.company,vat_check_vies:0
 msgid "VIES VAT Check"
-msgstr ""
+msgstr "Проверка VIES НДС"
 
 #. module: base_vat
 #: model:ir.model,name:base_vat.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Компании"
 
 #. module: base_vat
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать рекурсивные организации."
 
 #. module: base_vat
 #: help:res.partner,vat_subjected:0
@@ -68,6 +70,8 @@ msgid ""
 "If checked, Partners VAT numbers will be fully validated against EU's VIES "
 "service rather than via a simple format validation (checksum)."
 msgstr ""
+"Если помечено, номера НДС партнёров будут полностью проверены через службу "
+"VIES ЕС, а не с помощью простой проверки формата (контрольной суммы)."
 
 #. module: base_vat
 #: field:res.partner,vat_subjected:0
diff --git a/addons/base_vat/i18n/sk.po b/addons/base_vat/i18n/sk.po
index 5c867bd436b..dbce9aa38a9 100644
--- a/addons/base_vat/i18n/sk.po
+++ b/addons/base_vat/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/sl.po b/addons/base_vat/i18n/sl.po
index 8d03fc45a91..dfb72efa8c3 100644
--- a/addons/base_vat/i18n/sl.po
+++ b/addons/base_vat/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/sq.po b/addons/base_vat/i18n/sq.po
index e652f404824..cb38dfd46a1 100644
--- a/addons/base_vat/i18n/sq.po
+++ b/addons/base_vat/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/sr.po b/addons/base_vat/i18n/sr.po
index f356491013b..fa91a6bc351 100644
--- a/addons/base_vat/i18n/sr.po
+++ b/addons/base_vat/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/sr@latin.po b/addons/base_vat/i18n/sr@latin.po
index 8c29e6bbdd4..415d178b409 100644
--- a/addons/base_vat/i18n/sr@latin.po
+++ b/addons/base_vat/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/sv.po b/addons/base_vat/i18n/sv.po
index 708745b60e1..4646e186a1c 100644
--- a/addons/base_vat/i18n/sv.po
+++ b/addons/base_vat/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/th.po b/addons/base_vat/i18n/th.po
index 349d729bf81..5fd803d6fdf 100644
--- a/addons/base_vat/i18n/th.po
+++ b/addons/base_vat/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/tlh.po b/addons/base_vat/i18n/tlh.po
index b54f468be6a..716fe4e4b41 100644
--- a/addons/base_vat/i18n/tlh.po
+++ b/addons/base_vat/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index 5d4a6e8ff30..d6c437f60dd 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/uk.po b/addons/base_vat/i18n/uk.po
index 52c7b0f5157..c4a2a00bb48 100644
--- a/addons/base_vat/i18n/uk.po
+++ b/addons/base_vat/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/vi.po b/addons/base_vat/i18n/vi.po
index 322e5cba3b2..6dc05a2a643 100644
--- a/addons/base_vat/i18n/vi.po
+++ b/addons/base_vat/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/zh_CN.po b/addons/base_vat/i18n/zh_CN.po
index d193213fc00..13e37e30956 100644
--- a/addons/base_vat/i18n/zh_CN.po
+++ b/addons/base_vat/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/i18n/zh_TW.po b/addons/base_vat/i18n/zh_TW.po
index 32fee420d42..0d1d237acaa 100644
--- a/addons/base_vat/i18n/zh_TW.po
+++ b/addons/base_vat/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: base_vat
 #: code:addons/base_vat/base_vat.py:141
diff --git a/addons/base_vat/res_company.py b/addons/base_vat/res_company.py
index e7641db9c68..1c63aa20f07 100644
--- a/addons/base_vat/res_company.py
+++ b/addons/base_vat/res_company.py
@@ -29,4 +29,4 @@ class res_company_vat (osv.osv):
                                               "rather than via a simple format validation (checksum)."),
     }
 
-    
\ No newline at end of file
+    
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index 62986c452be..e699e091176 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -28,30 +28,20 @@
 Lets the user create a custom dashboard.
 ========================================
 
-This module also creates the Administration Dashboard.
-
-The user can also publish notes.
+Allows users to create custom dashboard.
     """,
     'author': 'OpenERP SA',
     'depends': ['base'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'board_view.xml',
         'board_mydashboard_view.xml'
     ],
-    "js": [
-        'static/src/js/dashboard.js',
-    ],
-    "css": [
-        'static/src/css/dashboard.css',
-    ],
-    'qweb': [
-        "static/src/xml/*.xml",
-    ],
-
+    'js': ['static/src/js/dashboard.js'],
+    'css': ['static/src/css/dashboard.css'],
+    'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0076912305725',
     'images': ['images/1_dashboard_definition.jpeg','images/2_publish_note.jpeg','images/3_admin_dashboard.jpeg',],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/board/controllers.py b/addons/board/controllers.py
index 53845c96095..81557f64fa3 100644
--- a/addons/board/controllers.py
+++ b/addons/board/controllers.py
@@ -1,19 +1,14 @@
 # -*- coding: utf-8 -*-
 from xml.etree import ElementTree
 
-try:
-    import openerp.addons.web.common.http as openerpweb
-    from openerp.addons.web.common import nonliterals
-    from openerp.addons.web.controllers.main import load_actions_from_ir_values
-except ImportError:
-    import web.common.http as openerpweb    # noqa
-    from web.common import nonliterals      # noqa
-    from web.controllers.main import load_actions_from_ir_values    # noqa
+import openerp
+from openerp.addons.web import nonliterals
+from openerp.addons.web.controllers.main import load_actions_from_ir_values
 
-class Board(openerpweb.Controller):
+class Board(openerp.addons.web.http.Controller):
     _cp_path = '/board'
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''):
         # FIXME move this method to board.board model
         to_eval = nonliterals.CompoundContext(context_to_save)
diff --git a/addons/board/i18n/ar.po b/addons/board/i18n/ar.po
index b48c5d79065..85362b99dbb 100644
--- a/addons/board/i18n/ar.po
+++ b/addons/board/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/bg.po b/addons/board/i18n/bg.po
index 9d37ca8154c..a0d3eaed488 100644
--- a/addons/board/i18n/bg.po
+++ b/addons/board/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/br.po b/addons/board/i18n/br.po
index be86a2782f0..b5f5a94811d 100644
--- a/addons/board/i18n/br.po
+++ b/addons/board/i18n/br.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/bs.po b/addons/board/i18n/bs.po
index ba84711e94f..b3a2b984724 100644
--- a/addons/board/i18n/bs.po
+++ b/addons/board/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/ca.po b/addons/board/i18n/ca.po
index d6c3690dcb8..074bd4c6280 100644
--- a/addons/board/i18n/ca.po
+++ b/addons/board/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/cs.po b/addons/board/i18n/cs.po
index 0c101046f1d..b284fce346a 100644
--- a/addons/board/i18n/cs.po
+++ b/addons/board/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: board
diff --git a/addons/board/i18n/da.po b/addons/board/i18n/da.po
index 3d12df74deb..6447cdb7ba7 100644
--- a/addons/board/i18n/da.po
+++ b/addons/board/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/de.po b/addons/board/i18n/de.po
index 0176d1174ac..a104a6c44fa 100644
--- a/addons/board/i18n/de.po
+++ b/addons/board/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/el.po b/addons/board/i18n/el.po
index d057596de15..016b0f15e44 100644
--- a/addons/board/i18n/el.po
+++ b/addons/board/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/board/i18n/es.po b/addons/board/i18n/es.po
index 6c2982e5796..403a9efad86 100644
--- a/addons/board/i18n/es.po
+++ b/addons/board/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/es_AR.po b/addons/board/i18n/es_AR.po
index 1e49515318e..6f92a7d182b 100644
--- a/addons/board/i18n/es_AR.po
+++ b/addons/board/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/es_CL.po b/addons/board/i18n/es_CL.po
index 5292e08e6f5..2a0f7a042d8 100644
--- a/addons/board/i18n/es_CL.po
+++ b/addons/board/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/es_CR.po b/addons/board/i18n/es_CR.po
index 8a3b9e2e068..7ffd86d544a 100644
--- a/addons/board/i18n/es_CR.po
+++ b/addons/board/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: board
diff --git a/addons/board/i18n/es_EC.po b/addons/board/i18n/es_EC.po
index 2726e695083..c97ad78d350 100644
--- a/addons/board/i18n/es_EC.po
+++ b/addons/board/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/es_PY.po b/addons/board/i18n/es_PY.po
index 075333f5499..0388fbccc60 100644
--- a/addons/board/i18n/es_PY.po
+++ b/addons/board/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/et.po b/addons/board/i18n/et.po
index d9d89dd1f92..2bfd7946ed2 100644
--- a/addons/board/i18n/et.po
+++ b/addons/board/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/fa.po b/addons/board/i18n/fa.po
index 332aea8a6da..22e2c793a4d 100644
--- a/addons/board/i18n/fa.po
+++ b/addons/board/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/fi.po b/addons/board/i18n/fi.po
index 7ea86e913be..339c4da8e50 100644
--- a/addons/board/i18n/fi.po
+++ b/addons/board/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/fr.po b/addons/board/i18n/fr.po
index 81508a101e9..08e0494f469 100644
--- a/addons/board/i18n/fr.po
+++ b/addons/board/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/gl.po b/addons/board/i18n/gl.po
index c32027813fe..066c3266836 100644
--- a/addons/board/i18n/gl.po
+++ b/addons/board/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/gu.po b/addons/board/i18n/gu.po
index 95568ba71ac..4116d6e6691 100644
--- a/addons/board/i18n/gu.po
+++ b/addons/board/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/hr.po b/addons/board/i18n/hr.po
index 4bd11d70c59..da58d52c73b 100644
--- a/addons/board/i18n/hr.po
+++ b/addons/board/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/hu.po b/addons/board/i18n/hu.po
index acdb3f8266c..22df5534c61 100644
--- a/addons/board/i18n/hu.po
+++ b/addons/board/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/id.po b/addons/board/i18n/id.po
index d89c45aef3b..bef1481c2cc 100644
--- a/addons/board/i18n/id.po
+++ b/addons/board/i18n/id.po
@@ -13,18 +13,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Tahun  "
 
 #. module: board
 #: model:ir.model,name:board.model_board_menu_create
 msgid "Menu Create"
-msgstr ""
+msgstr "Pembuatan Menu"
 
 #. module: board
 #: view:board.menu.create:0
@@ -34,33 +34,33 @@ msgstr "Informasi Menu"
 #. module: board
 #: view:res.users:0
 msgid "Latest Connections"
-msgstr ""
+msgstr "Koneksi Terbaru"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in last month"
-msgstr ""
+msgstr "Log telah dibuat pada bulan yang lalu"
 
 #. module: board
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 msgid "Administration Dashboard"
-msgstr ""
+msgstr "Papan Instrumen Administrasi"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Dikelompokan berdasarkan ..."
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in current year"
-msgstr ""
+msgstr "Log telah dibuat pada tahun yang sedang berjalan"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
 msgid "Board"
-msgstr ""
+msgstr "Papan"
 
 #. module: board
 #: field:board.menu.create,menu_name:0
@@ -71,7 +71,7 @@ msgstr "Nama Menu"
 #: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
 #: view:res.log.report:0
 msgid "Weekly Global Activity"
-msgstr ""
+msgstr "Aktivitas Global Mingguan"
 
 #. module: board
 #: field:board.board.line,name:0
@@ -81,154 +81,154 @@ msgstr "Judul"
 #. module: board
 #: field:res.log.report,nbr:0
 msgid "# of Entries"
-msgstr ""
+msgstr "# dari data tersedia"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Bulan"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in current month"
-msgstr ""
+msgstr "Log telah dibuat pada bulan yang sedang berjalan"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
 #: view:res.log.report:0
 msgid "Monthly Activity per Document"
-msgstr ""
+msgstr "Aktivitas Bulanan per Dokumen"
 
 #. module: board
 #: view:board.board:0
 msgid "Configuration Overview"
-msgstr ""
+msgstr "Gambaran Umum Konfigurasi"
 
 #. 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 "Definisi Dasbor"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Maret"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agustus"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_user_connection_tree
 msgid "User Connections"
-msgstr ""
+msgstr "Koneksi User"
 
 #. module: board
 #: field:res.log.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Tanggal Pembuatan"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Log Analysis"
-msgstr ""
+msgstr "Analisis Log"
 
 #. module: board
 #: field:res.log.report,res_model:0
 msgid "Object"
-msgstr ""
+msgstr "Obyek"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: board
 #: field:board.board,line_ids:0
 msgid "Action Views"
-msgstr ""
+msgstr "Tampilan tindakan"
 
 #. module: board
 #: model:ir.model,name:board.model_res_log_report
 msgid "Log Report"
-msgstr ""
+msgstr "Laporan Log"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:46
 #, python-format
 msgid "Please Insert Dashboard View(s) !"
-msgstr ""
+msgstr "Mohon masukkan tampilan dasbor!"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Hari"
 
 #. module: board
 #: view:board.menu.create:0
 msgid "Create Menu For Dashboard"
-msgstr ""
+msgstr "Buat Menu pada Dasbor/papan instrumen"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board_line
 msgid "Board Line"
-msgstr ""
+msgstr "Garis Badan"
 
 #. module: board
 #: field:board.menu.create,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "Menu Induk"
 
 #. module: board
 #: view:res.log.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Bulan - 1    "
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: board
 #: view:board.board:0
 msgid "Users"
-msgstr ""
+msgstr "Pengguna"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: board
 #: help:board.board.line,sequence:0
 msgid ""
 "Gives the sequence order                         when displaying a list of "
 "board lines."
-msgstr ""
+msgstr "Tentukan runtutan pesanan saat menampilkan daftar garis badan."
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: board
 #: view:board.board:0
@@ -236,18 +236,18 @@ msgstr ""
 #: field:board.board.line,board_id:0
 #: model:ir.ui.menu,name:board.menu_dasboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Dasbor"
 
 #. module: board
 #: code:addons/board/wizard/board_menu_create.py:45
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Kesalahan Pengguna!"
 
 #. module: board
 #: field:board.board.line,action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Tindakan"
 
 #. module: board
 #: field:board.board.line,position:0
@@ -257,17 +257,17 @@ msgstr "Posisi"
 #. module: board
 #: view:res.log.report:0
 msgid "Model"
-msgstr ""
+msgstr "Contoh"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.board_homepage_action
 msgid "Home Page"
-msgstr ""
+msgstr "Halaman Utama"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
 msgid "Latest Activities"
-msgstr ""
+msgstr "Aktivitas Terbaru"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -277,7 +277,7 @@ msgstr "Kiri"
 #. module: board
 #: field:board.board,view_id:0
 msgid "Board View"
-msgstr ""
+msgstr "Tampilan Umum"
 
 #. module: board
 #: selection:board.board.line,position:0
@@ -292,22 +292,22 @@ msgstr "Lebar"
 #. module: board
 #: view:res.log.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Bulan   "
 
 #. module: board
 #: field:board.board.line,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Urutan"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Desember"
 
 #. module: board
 #: view:board.board:0
@@ -323,18 +323,18 @@ msgstr "Tinggi"
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_menu_create
 msgid "Create Board Menu"
-msgstr ""
+msgstr "Buat Menu Utama"
 
 #. module: board
 #: selection:res.log.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
 #. module: board
 #: view:res.log.report:0
 #: field:res.log.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Tahun"
 
 #. module: board
 #: view:board.menu.create:0
@@ -344,7 +344,7 @@ msgstr "Batal"
 #. module: board
 #: view:board.board:0
 msgid "Dashboard View"
-msgstr ""
+msgstr "Tampilan Dasbor"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nama model tidak sah di definsi aksi"
diff --git a/addons/board/i18n/it.po b/addons/board/i18n/it.po
index e1dd6a0fe50..5cc2b7928e4 100644
--- a/addons/board/i18n/it.po
+++ b/addons/board/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -39,7 +39,7 @@ msgstr "Ultime connessioni"
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in last month"
-msgstr ""
+msgstr "Log creati il mese scorso"
 
 #. module: board
 #: view:board.board:0
@@ -55,7 +55,7 @@ msgstr "Raggruppa per..."
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in current year"
-msgstr ""
+msgstr "Log creati quest'anno"
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
@@ -92,7 +92,7 @@ msgstr "Mese"
 #. module: board
 #: view:res.log.report:0
 msgid "Log created in current month"
-msgstr ""
+msgstr "Log creati nel mese corrente"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
@@ -103,7 +103,7 @@ msgstr "Attività mensile per documento"
 #. module: board
 #: view:board.board:0
 msgid "Configuration Overview"
-msgstr ""
+msgstr "Sommario Configurazione"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
@@ -211,7 +211,7 @@ msgstr "Gennaio"
 #. module: board
 #: view:board.board:0
 msgid "Users"
-msgstr ""
+msgstr "Utenti"
 
 #. module: board
 #: selection:res.log.report,month:0
@@ -264,7 +264,7 @@ msgstr "Modello"
 #. module: board
 #: model:ir.actions.act_window,name:board.board_homepage_action
 msgid "Home Page"
-msgstr ""
+msgstr "Pagina Principale"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
diff --git a/addons/board/i18n/ja.po b/addons/board/i18n/ja.po
index 28d18240cfb..3417d624e79 100644
--- a/addons/board/i18n/ja.po
+++ b/addons/board/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/ko.po b/addons/board/i18n/ko.po
index fac5acb9ca6..988cad2d7dd 100644
--- a/addons/board/i18n/ko.po
+++ b/addons/board/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/ln.po b/addons/board/i18n/ln.po
index c38e5e26a64..4974d3b1f59 100644
--- a/addons/board/i18n/ln.po
+++ b/addons/board/i18n/ln.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/lt.po b/addons/board/i18n/lt.po
index 7337810cd6b..c43ff39f032 100644
--- a/addons/board/i18n/lt.po
+++ b/addons/board/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/lv.po b/addons/board/i18n/lv.po
index ade1590ae11..329d7c5bdfb 100644
--- a/addons/board/i18n/lv.po
+++ b/addons/board/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/mn.po b/addons/board/i18n/mn.po
index 35641c11d18..77fd0feb75c 100644
--- a/addons/board/i18n/mn.po
+++ b/addons/board/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/nb.po b/addons/board/i18n/nb.po
new file mode 100644
index 00000000000..420a2a1659b
--- /dev/null
+++ b/addons/board/i18n/nb.po
@@ -0,0 +1,348 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-06 14:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: board
+#: view:res.log.report:0
+msgid "  Year  "
+msgstr "  År  "
+
+#. module: board
+#: model:ir.model,name:board.model_board_menu_create
+msgid "Menu Create"
+msgstr "Meny laget"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Menu Information"
+msgstr "Meny informasjon"
+
+#. module: board
+#: view:res.users:0
+msgid "Latest Connections"
+msgstr "Siste Tilkoblinger"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log created in last month"
+msgstr "Logg opprettet i forrige måned"
+
+#. module: board
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board.open_board_administration_form
+msgid "Administration Dashboard"
+msgstr "Administrasjon kontrollpanel"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log created in current year"
+msgstr "Logg opprettet i gjeldende år."
+
+#. module: board
+#: model:ir.model,name:board.model_board_board
+msgid "Board"
+msgstr "Brett"
+
+#. module: board
+#: field:board.menu.create,menu_name:0
+msgid "Menu Name"
+msgstr "Menynavn"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.board_weekly_res_log_report_action
+#: view:res.log.report:0
+msgid "Weekly Global Activity"
+msgstr "Ukentlig global aktivitet"
+
+#. module: board
+#: field:board.board.line,name:0
+msgid "Title"
+msgstr "Tittel"
+
+#. module: board
+#: field:res.log.report,nbr:0
+msgid "# of Entries"
+msgstr "# av oppføringer"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log created in current month"
+msgstr "Logg opprettet i gjeldende måned."
+
+#. module: board
+#: model:ir.actions.act_window,name:board.board_monthly_res_log_report_action
+#: view:res.log.report:0
+msgid "Monthly Activity per Document"
+msgstr "Månedlig aktivitet per dokument"
+
+#. module: board
+#: view:board.board:0
+msgid "Configuration Overview"
+msgstr "Konfigurasjonsoversikt"
+
+#. 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 "Kontrollpanel Definisjon"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "August"
+msgstr "August"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_user_connection_tree
+msgid "User Connections"
+msgstr "Brukertilkoblinger"
+
+#. module: board
+#: field:res.log.report,creation_date:0
+msgid "Creation Date"
+msgstr "Opprettelsesdato"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Log Analysis"
+msgstr "Logg analyse"
+
+#. module: board
+#: field:res.log.report,res_model:0
+msgid "Object"
+msgstr "Objekt"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: board
+#: field:board.board,line_ids:0
+msgid "Action Views"
+msgstr "Handling Visninger"
+
+#. module: board
+#: model:ir.model,name:board.model_res_log_report
+msgid "Log Report"
+msgstr "Logg rapport"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:46
+#, python-format
+msgid "Please Insert Dashboard View(s) !"
+msgstr "Vennligst Sett Kontrollpanel Vinsning (er)!"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "July"
+msgstr "juli"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Create Menu For Dashboard"
+msgstr "Opprett meny for Kontrollpanel."
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: board
+#: model:ir.model,name:board.model_board_board_line
+msgid "Board Line"
+msgstr "bord Linje"
+
+#. module: board
+#: field:board.menu.create,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Overordnet meny"
+
+#. module: board
+#: view:res.log.report:0
+msgid "    Month-1    "
+msgstr "    Måned-1    "
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: board
+#: view:board.board:0
+msgid "Users"
+msgstr "Brukere"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "November"
+msgstr "November"
+
+#. module: board
+#: help:board.board.line,sequence:0
+msgid ""
+"Gives the sequence order                         when displaying a list of "
+"board lines."
+msgstr "Gir rekkefølgen av når du viser en liste over bord linjer."
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "April"
+msgstr "April"
+
+#. module: board
+#: view:board.board:0
+#: field:board.board,name:0
+#: field:board.board.line,board_id:0
+#: model:ir.ui.menu,name:board.menu_dasboard
+msgid "Dashboard"
+msgstr "Kontrollpanel"
+
+#. module: board
+#: code:addons/board/wizard/board_menu_create.py:45
+#, python-format
+msgid "User Error!"
+msgstr "Bruker feil!"
+
+#. module: board
+#: field:board.board.line,action_id:0
+msgid "Action"
+msgstr "Handling"
+
+#. module: board
+#: field:board.board.line,position:0
+msgid "Position"
+msgstr "Posisjon"
+
+#. module: board
+#: view:res.log.report:0
+msgid "Model"
+msgstr "Modell"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.board_homepage_action
+msgid "Home Page"
+msgstr "Hjemmeside"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_latest_activities_tree
+msgid "Latest Activities"
+msgstr "Senest aktiveter"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Left"
+msgstr "Venstre"
+
+#. module: board
+#: field:board.board,view_id:0
+msgid "Board View"
+msgstr "Bord visning"
+
+#. module: board
+#: selection:board.board.line,position:0
+msgid "Right"
+msgstr "Høyre"
+
+#. module: board
+#: field:board.board.line,width:0
+msgid "Width"
+msgstr "Bredde"
+
+#. module: board
+#: view:res.log.report:0
+msgid "   Month   "
+msgstr "   Måned   "
+
+#. module: board
+#: field:board.board.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "December"
+msgstr "Desember"
+
+#. module: board
+#: view:board.board:0
+#: view:board.menu.create:0
+msgid "Create Menu"
+msgstr "Opprett meny"
+
+#. module: board
+#: field:board.board.line,height:0
+msgid "Height"
+msgstr "Høyde"
+
+#. module: board
+#: model:ir.actions.act_window,name:board.action_board_menu_create
+msgid "Create Board Menu"
+msgstr "Opprett bord meny"
+
+#. module: board
+#: selection:res.log.report,month:0
+msgid "May"
+msgstr "Mai"
+
+#. module: board
+#: view:res.log.report:0
+#: field:res.log.report,name:0
+msgid "Year"
+msgstr "År"
+
+#. module: board
+#: view:board.menu.create:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: board
+#: view:board.board:0
+msgid "Dashboard View"
+msgstr "Kontrollpanel visning"
diff --git a/addons/board/i18n/nl.po b/addons/board/i18n/nl.po
index 6334d6e996c..a51fdb08540 100644
--- a/addons/board/i18n/nl.po
+++ b/addons/board/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-01-27 15:54+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index ff0566f48a3..cc11bb883d2 100644
--- a/addons/board/i18n/nl_BE.po
+++ b/addons/board/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/pl.po b/addons/board/i18n/pl.po
index 2edb6c6409e..ba2869196f4 100644
--- a/addons/board/i18n/pl.po
+++ b/addons/board/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/pt.po b/addons/board/i18n/pt.po
index 42be479b795..9a3843066ea 100644
--- a/addons/board/i18n/pt.po
+++ b/addons/board/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/pt_BR.po b/addons/board/i18n/pt_BR.po
index aaa87347bf6..ebe5ebba398 100644
--- a/addons/board/i18n/pt_BR.po
+++ b/addons/board/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -29,7 +29,7 @@ msgstr "Criar Menu"
 #. module: board
 #: view:board.menu.create:0
 msgid "Menu Information"
-msgstr "Menu de Informação"
+msgstr "Informação do Menu"
 
 #. module: board
 #: view:res.users:0
@@ -45,12 +45,12 @@ msgstr "Log criado no mês passado"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:board.open_board_administration_form
 msgid "Administration Dashboard"
-msgstr "Painel de administração"
+msgstr "Painel de Administração"
 
 #. module: board
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr "Agrupado Por..."
+msgstr "Agrupar Por..."
 
 #. module: board
 #: view:res.log.report:0
@@ -323,7 +323,7 @@ msgstr "Altura"
 #. module: board
 #: model:ir.actions.act_window,name:board.action_board_menu_create
 msgid "Create Board Menu"
-msgstr "Criar menu do quadro"
+msgstr "Criar Menu do Quadro"
 
 #. module: board
 #: selection:res.log.report,month:0
diff --git a/addons/board/i18n/ro.po b/addons/board/i18n/ro.po
index 0f2879f030d..32dae759e12 100644
--- a/addons/board/i18n/ro.po
+++ b/addons/board/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/ru.po b/addons/board/i18n/ru.po
index 7d80b775753..9e6db4ce63d 100644
--- a/addons/board/i18n/ru.po
+++ b/addons/board/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-10-30 10:01+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-10-26 09:05+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
@@ -103,7 +103,7 @@ msgstr "Месячная активность на документ"
 #. module: board
 #: view:board.board:0
 msgid "Configuration Overview"
-msgstr ""
+msgstr "Обзор конфигурации"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_view_board_list_form
@@ -211,7 +211,7 @@ msgstr "Январь"
 #. module: board
 #: view:board.board:0
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"
 
 #. module: board
 #: selection:res.log.report,month:0
@@ -262,7 +262,7 @@ msgstr "Модель"
 #. module: board
 #: model:ir.actions.act_window,name:board.board_homepage_action
 msgid "Home Page"
-msgstr ""
+msgstr "Домашняя страница"
 
 #. module: board
 #: model:ir.actions.act_window,name:board.action_latest_activities_tree
diff --git a/addons/board/i18n/sk.po b/addons/board/i18n/sk.po
index 8a7d736eb3f..a00e921a3e1 100644
--- a/addons/board/i18n/sk.po
+++ b/addons/board/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/sl.po b/addons/board/i18n/sl.po
index ddda1699442..3a918a319fa 100644
--- a/addons/board/i18n/sl.po
+++ b/addons/board/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/sq.po b/addons/board/i18n/sq.po
index fa7c0dc76a4..01acdac24d9 100644
--- a/addons/board/i18n/sq.po
+++ b/addons/board/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/sr.po b/addons/board/i18n/sr.po
index a8d449ac502..abaeb4477b8 100644
--- a/addons/board/i18n/sr.po
+++ b/addons/board/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/sr@latin.po b/addons/board/i18n/sr@latin.po
index 610bd69dc45..03ef51905e1 100644
--- a/addons/board/i18n/sr@latin.po
+++ b/addons/board/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/sv.po b/addons/board/i18n/sv.po
index c352cde3648..4d3b54372f8 100644
--- a/addons/board/i18n/sv.po
+++ b/addons/board/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/th.po b/addons/board/i18n/th.po
index cdcc4e6174b..81b8ddff0f3 100644
--- a/addons/board/i18n/th.po
+++ b/addons/board/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/tlh.po b/addons/board/i18n/tlh.po
index 7bf84fbf9ef..9c73d841f51 100644
--- a/addons/board/i18n/tlh.po
+++ b/addons/board/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index 7a59e38e742..22b735a65b2 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/uk.po b/addons/board/i18n/uk.po
index 68940919d20..ec6de844188 100644
--- a/addons/board/i18n/uk.po
+++ b/addons/board/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/vi.po b/addons/board/i18n/vi.po
index dc9cd71303f..8c0fbddfada 100644
--- a/addons/board/i18n/vi.po
+++ b/addons/board/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/zh_CN.po b/addons/board/i18n/zh_CN.po
index ab29a7bac9a..6541d095bfa 100644
--- a/addons/board/i18n/zh_CN.po
+++ b/addons/board/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/i18n/zh_TW.po b/addons/board/i18n/zh_TW.po
index 9d2080c3759..2c8a7475e3c 100644
--- a/addons/board/i18n/zh_TW.po
+++ b/addons/board/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:18+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: board
 #: view:res.log.report:0
diff --git a/addons/board/static/src/css/Makefile b/addons/board/static/src/css/Makefile
new file mode 100644
index 00000000000..0cb5ae70f4a
--- /dev/null
+++ b/addons/board/static/src/css/Makefile
@@ -0,0 +1,3 @@
+dashboard.css: dashboard.sass
+	sass --trace -t expanded dashboard.sass dashboard.css
+
diff --git a/addons/board/static/src/css/dashboard.css b/addons/board/static/src/css/dashboard.css
index f3d300add2e..f2bbcd07071 100644
--- a/addons/board/static/src/css/dashboard.css
+++ b/addons/board/static/src/css/dashboard.css
@@ -1,3 +1,50 @@
+.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_0 {
+  width: 100%;
+}
+.openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_1, .openerp .oe_dashboard_layout_1 .oe_dashboard_column.index_2 {
+  display: none;
+}
+.openerp .oe_dashboard_layout_1-1 .oe_dashboard_column {
+  width: 50%;
+}
+.openerp .oe_dashboard_layout_1-1 .oe_dashboard_column.index_2 {
+  display: none;
+}
+.openerp .oe_dashboard_layout_1-1-1 .oe_dashboard_column {
+  width: 33%;
+}
+.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_0 {
+  width: 70%;
+}
+.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_1 {
+  width: 30%;
+}
+.openerp .oe_dashboard_layout_2-1 .oe_dashboard_column.index_2 {
+  display: none;
+}
+.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_0 {
+  width: 30%;
+}
+.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_1 {
+  width: 70%;
+}
+.openerp .oe_dashboard_layout_1-2 .oe_dashboard_column.index_2 {
+  display: none;
+}
+.openerp .oe_dashboard_layout_selector ul {
+  white-space: nowrap;
+}
+.openerp .oe_dashboard_layout_selector li {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+  float: left;
+}
+.openerp .oe_dashboard_layout_selector li .oe_dashboard_selected_layout {
+  margin-left: -30px;
+  vertical-align: bottom;
+  margin-bottom: 10px;
+}
 .openerp .oe_dashboard_links {
   text-align: right;
   margin: 0 4px 6px 0;
@@ -50,6 +97,13 @@
   content: "+";
   margin-left: 4px;
 }
+.openerp .oe_dashboard .oe_action .oe_header .oe_header_text {
+  visibility: hidden;
+  cursor: text;
+}
+.openerp .oe_dashboard .oe_action .oe_header span {
+  cursor: pointer;
+}
 .openerp .oe_dashboard .oe_action .oe_header_empty {
   padding-top: 0;
   padding-bottom: 2px;
diff --git a/addons/board/static/src/css/dashboard.sass b/addons/board/static/src/css/dashboard.sass
index dd4d144e918..122b6dc232c 100644
--- a/addons/board/static/src/css/dashboard.sass
+++ b/addons/board/static/src/css/dashboard.sass
@@ -9,6 +9,43 @@
   box-shadow: $bsval
 
 .openerp
+  .oe_dashboard_layout_1 .oe_dashboard_column
+    &.index_0
+      width: 100%
+    &.index_1, &.index_2
+      display: none
+  .oe_dashboard_layout_1-1 .oe_dashboard_column
+    width: 50% 
+    &.index_2
+      display: none
+  .oe_dashboard_layout_1-1-1 .oe_dashboard_column
+    width: 33% 
+  .oe_dashboard_layout_2-1 .oe_dashboard_column
+    &.index_0
+      width: 70%
+    &.index_1
+      width: 30%
+    &.index_2
+      display: none
+  .oe_dashboard_layout_1-2 .oe_dashboard_column
+    &.index_0
+      width: 30%
+    &.index_1
+      width: 70%
+    &.index_2
+      display: none
+  .oe_dashboard_layout_selector
+    ul
+      white-space: nowrap
+    li
+      margin: 0
+      padding: 0
+      list-style-type: none
+      float: left
+      .oe_dashboard_selected_layout
+        margin-left: -30px
+        vertical-align: bottom
+        margin-bottom: 10px
   .oe_dashboard_links
     text-align: right
     margin: 0 4px 6px 0
@@ -49,6 +86,11 @@
         .oe_maximize:after
           content: "+"
           margin-left: 4px
+        .oe_header_text
+          visibility: hidden
+          cursor: text
+        span
+          cursor: pointer
       .oe_header_empty
         padding-top: 0
         padding-bottom: 2px
@@ -81,3 +123,4 @@
           > tbody
             tr:nth-child(odd)
               background: transparent
+
diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index b9df81bf868..eb835c43e22 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -18,18 +18,25 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         var self = this;
         this._super.apply(this, arguments);
 
-        this.$element.find('.oe_dashboard_column').sortable({
+        this.$el.find('.oe_dashboard_column').sortable({
             connectWith: '.oe_dashboard_column',
             handle: '.oe_header',
             scroll: false
-        }).disableSelection().bind('sortstop', self.do_save_dashboard);
+        }).bind('sortstop', self.do_save_dashboard);
 
+        var old_title = this.__parentedParent.get('title');
+        this.__parentedParent.on('load_record', self, function(){
+            self.__parentedParent.set({ 'title': old_title});
+        })
         // Events
-        this.$element.find('.oe_dashboard_link_reset').click(this.on_reset);
-        this.$element.find('.oe_dashboard_link_change_layout').click(this.on_change_layout);
-
-        this.$element.delegate('.oe_dashboard_column .oe_fold', 'click', this.on_fold_action);
-        this.$element.delegate('.oe_dashboard_column .oe_close', 'click', this.on_close_action);
+        this.$el.find('.oe_dashboard_link_reset').click(this.on_reset);
+        this.$el.find('.oe_dashboard_link_change_layout').click(this.on_change_layout);
+        this.$el.find('h2.oe_header span.oe_header_txt').click(function(ev){
+            if(ev.target === ev.currentTarget)
+                self.on_header_string($(ev.target).parent());
+        });
+        this.$el.delegate('.oe_dashboard_column .oe_fold', 'click', this.on_fold_action);
+        this.$el.delegate('.oe_dashboard_column .oe_close', 'click', this.on_close_action);
 
         // Init actions
         _.each(this.node.children, function(column, column_index) {
@@ -39,23 +46,47 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
                 delete(action.attrs.colspan);
                 var action_id = _.str.toNumber(action.attrs.name);
                 if (!_.isNaN(action_id)) {
-                    self.rpc('/web/action/load', {action_id: action_id}, function(result) {
+                    self.rpc('/web/action/load', {action_id: action_id}).done(function(result) {
                         self.on_load_action(result, column_index + '_' + action_index, action.attrs);
                     });
                 }
             });
         });
     },
+    on_header_string:function(h2){
+        var self = this;
+        var span = h2.find('span:first').hide();
+        var input = h2.find('.oe_header_text').css('visibility','visible');
+        var attr = h2.closest(".oe_action").data('action_attrs');
+        var change_string = function(new_name){
+                attr['string'] = new_name;
+                span.text(new_name).show();
+                input.css('visibility','hidden');
+                self.do_save_dashboard();
+        }
+        input.unbind()
+        .val(span.text())
+        .change(function(event){
+            change_string($(this).val());
+        })
+        .keyup(function(event){
+            if(event.keyCode == 27){
+                //esc key to cancel changes
+                input.css('visibility','hidden');
+                span.show();
+            }
+        });
+    },
     on_reset: function() {
         this.rpc('/web/view/undo_custom', {
             view_id: this.view.fields_view.view_id,
             reset: true
-        }, this.do_reload);
+        }).done(this.do_reload);
     },
     on_change_layout: function() {
         var self = this;
         var qdict = {
-            current_layout : this.$element.find('.oe_dashboard').attr('data-layout')
+            current_layout : this.$el.find('.oe_dashboard').attr('data-layout')
         };
         var $dialog = instance.web.dialog($('<div>'), {
                             modal: true,
@@ -70,7 +101,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         });
     },
     do_change_layout: function(new_layout) {
-        var $dashboard = this.$element.find('.oe_dashboard');
+        var $dashboard = this.$el.find('.oe_dashboard');
         var current_layout = $dashboard.attr('data-layout');
         if (current_layout != new_layout) {
             var clayout = current_layout.split('-').length,
@@ -114,10 +145,10 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         var self = this;
         var board = {
                 form_title : this.view.fields_view.arch.attrs.string,
-                style : this.$element.find('.oe_dashboard').attr('data-layout'),
+                style : this.$el.find('.oe_dashboard').attr('data-layout'),
                 columns : []
             };
-        this.$element.find('.oe_dashboard_column').each(function() {
+        this.$el.find('.oe_dashboard_column').each(function() {
             var actions = [];
             $(this).find('.oe_action').each(function() {
                 var action_id = $(this).attr('data-id'),
@@ -138,13 +169,11 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         this.rpc('/web/view/add_custom', {
             view_id: this.view.fields_view.view_id,
             arch: arch
-        }, function() {
-            self.$element.find('.oe_dashboard_link_reset').show();
         });
     },
     on_load_action: function(result, index, action_attrs) {
         var self = this,
-            action = result.result,
+            action = result,
             view_mode = action_attrs.view_mode;
 
         if (action_attrs.context && action_attrs.context['dashboard_merge_domains_contexts'] === false) {
@@ -193,36 +222,40 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
         am.do_action = function (action) {
             self.do_action(action);
         };
-        if (action_attrs.creatable && action_attrs.creatable !== 'false') {
-            var action_id = parseInt(action_attrs.creatable, 10);
-            $action.parent().find('button.oe_dashboard_button_create').click(function() {
-                if (isNaN(action_id)) {
-                    action_orig.flags.default_view = 'form';
-                    self.do_action(action_orig);
-                } else {
-                    self.rpc('/web/action/load', {
-                        action_id: action_id
-                    }, function(result) {
-                        result.result.flags = result.result.flags || {};
-                        result.result.flags.default_view = 'form';
-                        self.do_action(result.result);
-                    });
-                }
-            });
-        }
         if (am.inner_widget) {
-            am.inner_widget.on_mode_switch.add(function(mode) {
+            var new_form_action = function(id, editable) {
                 var new_views = [];
                 _.each(action_orig.views, function(view) {
-                    new_views[view[1] === mode ? 'unshift' : 'push'](view);
+                    new_views[view[1] === 'form' ? 'unshift' : 'push'](view);
                 });
-                if (!new_views.length || new_views[0][1] !== mode) {
-                    new_views.unshift([false, mode]);
+                if (!new_views.length || new_views[0][1] !== 'form') {
+                    new_views.unshift([false, 'form']);
                 }
                 action_orig.views = new_views;
-                action_orig.res_id = am.inner_widget.dataset.ids[am.inner_widget.dataset.index];
+                action_orig.res_id = id;
+                action_orig.flags = {
+                    form: {
+                        "initial_mode": editable ? "edit" : "view",
+                    }
+                };
                 self.do_action(action_orig);
-            });
+            };
+            var list = am.inner_widget.views.list;
+            if (list) {
+                list.deferred.done(function() {
+                    $(list.controller.groups).off('row_link').on('row_link', function(e, id) {
+                        new_form_action(id);
+                    });
+                });
+            }
+            var kanban = am.inner_widget.views.kanban;
+            if (kanban) {
+                kanban.deferred.done(function() {
+                    kanban.controller.open_record = function(id, editable) {
+                        new_form_action(id, editable);
+                    };
+                });
+            }
         }
     },
     renderElement: function() {
@@ -245,11 +278,11 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({
             });
         }
         var rendered = QWeb.render(this.form_template, this);
-        this.$element.html(rendered);
+        this.$el.html(rendered);
     },
     no_result: function() {
         if (this.view.options.action.help) {
-            this.$element.append(
+            this.$el.append(
                 $('<div class="oe_view_nocontent">')
                     .append($('<div>').html(this.view.options.action.help || " "))
             );
@@ -296,13 +329,13 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
     _in_drawer: true,
     start: function () {
         var self = this;
-        this.$element
+        this.$el
             .on('click', 'h4', this.proxy('show_option'))
             .on('submit', 'form', function (e) {
                 e.preventDefault();
                 self.add_dashboard();
             });
-        return this.load_data().then(this.proxy("render_data"));
+        return this.load_data().done(this.proxy("render_data"));
     },
     load_data:function(){
         var board = new instance.web.Model('board.board');
@@ -314,7 +347,7 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
         return new instance.web.Model('ir.model.data')
                 .query(['res_id'])
                 .filter([['name','=','menu_reporting_dashboard']])
-                .first().pipe(function (result) {
+                .first().then(function (result) {
             var menu = _(dashboard_menu).chain()
                 .pluck('children')
                 .flatten(true)
@@ -333,7 +366,7 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
         var self = this;
         var getParent = this.getParent();
         var view_parent = this.getParent().getParent();
-        if (! view_parent.action || ! this.$element.find("select").val()) {
+        if (! view_parent.action || ! this.$el.find("select").val()) {
             this.do_warn("Can't find dashboard action");
             return;
         }
@@ -343,24 +376,24 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
         _.each(data.contexts, context.add, context);
         _.each(data.domains, domain.add, domain);
         this.rpc('/board/add_to_dashboard', {
-            menu_id: this.$element.find("select").val(),
+            menu_id: this.$el.find("select").val(),
             action_id: view_parent.action.id,
             context_to_save: context,
             domain: domain,
             view_mode: view_parent.active_view,
-            name: this.$element.find("input").val()
-        }, function(r) {
+            name: this.$el.find("input").val()
+        }).done(function(r) {
             if (r === false) {
                 self.do_warn("Could not add filter to dashboard");
             } else {
-                self.$element.toggleClass('oe_opened');
+                self.$el.toggleClass('oe_opened');
                 self.do_notify("Filter added to dashboard", '');
             }
         });
     },
     show_option:function(){
-        this.$element.toggleClass('oe_opened');
-        if (! this.$element.hasClass('oe_opened'))
+        this.$el.toggleClass('oe_opened');
+        if (! this.$el.hasClass('oe_opened'))
             return;
         this.$("input").val(this.getParent().fields_view.name || "" );
     }
diff --git a/addons/board/static/src/xml/board.xml b/addons/board/static/src/xml/board.xml
index 13d81d11f8d..03ede793036 100644
--- a/addons/board/static/src/xml/board.xml
+++ b/addons/board/static/src/xml/board.xml
@@ -1,7 +1,7 @@
 <template>
 <t t-name="DashBoard">
     <div class="oe_dashboard_links">
-        <button type="button" class="button oe_dashboard_link_reset" title="Reset Layout.." t-att-style="view.fields_view.custom_view_id ? null : 'display: none'">
+        <button type="button" class="button oe_dashboard_link_reset" title="Reset Layout.." t-att-style="view.fields_view.custom_view_id || session.debug ? null : 'display: none'">
             <img src="/board/static/src/img/layout_2-1.png" width="16" height="16"/>
             <span> Reset </span>
         </button>
@@ -23,13 +23,14 @@
 <t t-name="DashBoard.action">
     <div t-att-data-id="action.attrs.name" class="oe_action">
         <h2 t-attf-class="oe_header #{action.attrs.string ? '' : 'oe_header_empty'}">
-            <t t-esc="action.attrs.string"/>
+            <span class="oe_header_txt"> <t t-esc="action.attrs.string"/> </span>
+            <input class = "oe_header_text" type="text"/>
             <t t-if="!action.attrs.string">&amp;nbsp;</t>
-            <button t-if="action.attrs.creatable and action.attrs.creatable !== 'false'" class="oe_button oe_button_create">Create</button>
             <span class='oe_icon oe_close'></span>
             <span class='oe_icon oe_minimize oe_fold' t-if="!action.attrs.fold"></span>
             <span class='oe_icon oe_maximize oe_fold' t-if="action.attrs.fold"></span>
         </h2>
+        
         <div t-attf-id="#{view.element_id}_action_#{column_index}_#{action_index}" class="oe_content" t-att-style="action.attrs.fold ? 'display: none' : null"></div>
     </div>
 </t>
diff --git a/addons/caldav/__init__.py b/addons/caldav/__init__.py
deleted file mode 100644
index 3c7bf49a8fa..00000000000
--- a/addons/caldav/__init__.py
+++ /dev/null
@@ -1,27 +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 calendar
-import calendar_collection
-import caldav
-import wizard
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py
deleted file mode 100644
index 2946fe77b1f..00000000000
--- a/addons/caldav/__openerp__.py
+++ /dev/null
@@ -1,71 +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/>.
-#
-##############################################################################
-
-
-{
-    "name": "Share Calendar Using CalDAV",
-    "version": "1.1",
-    "depends": [
-                    "base",
-                    "document_webdav",
-                ],
-     'description': """
-This module contains basic functionality for Caldav system.
-===========================================================
-
-  - Webdav server that provides remote access to calendar
-  - Synchronisation of calendar using WebDAV
-  - Customize calendar event and todo attribute with any of OpenERP model
-  - Provides iCal Import/Export functionality
-
-To access Calendars using CalDAV clients, point them to:
-    http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c
-
-To access OpenERP Calendar using WebCal to remote site use the URL like:
-    http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics
-
-    Where,
-        HOSTNAME: Host on which OpenERP server(With webdav) is running
-        PORT : Port on which OpenERP server is running (By Default : 8069)
-        DATABASE_NAME: Name of database on which OpenERP Calendar is created
-        CALENDAR_NAME: Name of calendar to access
-""", 
-    'category': 'Hidden/Dependency', 
-    "author": "OpenERP SA",
-    'website': 'http://www.openerp.com',
-    "init_xml": ["caldav_data.xml"],
-    "demo_xml": [],
-    "update_xml": [
-                    'security/ir.model.access.csv',
-                    'wizard/calendar_event_export_view.xml',
-                    'wizard/calendar_event_import_view.xml',
-                    'wizard/calendar_event_subscribe_view.xml',
-                    'wizard/caldav_browse_view.xml',
-                    'caldav_view.xml',
-                    'caldav_setup.xml'
-                    ],
-    "installable": True,
-    "auto_install": False,
-    "certificate": "00924841426645403741",
-    'images': ['images/calendar_collections.jpeg','images/calendars.jpeg','images/export_ics_file.jpeg'],
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/caldav_data.xml b/addons/caldav/caldav_data.xml
deleted file mode 100644
index 146b8f83476..00000000000
--- a/addons/caldav/caldav_data.xml
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data noupdate="1">
-    
-        <record model="document.directory" id="document.dir_calendars">
-            <field name="name">Calendars</field>
-            <field name="calendar_collection">True</field>
-        </record>    
-    
-        <!--        Event attributes-->
-        <record model="basic.calendar.attributes" id="field_event_comment">
-            <field name="name">comment</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_organizer">
-            <field name="name">organizer</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_uid">
-            <field name="name">uid</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_seq">
-            <field name="name">seq</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_recurrence-id">
-            <field name="name">recurrence-id</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_transp">
-            <field name="name">transp</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_attendee">
-            <field name="name">attendee</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_related">
-            <field name="name">related</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_rrule">
-            <field name="name">rrule</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_dtend">
-            <field name="name">dtend</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_duration">
-            <field name="name">duration</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_valarm">
-            <field name="name">valarm</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_vtimezone">
-            <field name="name">vtimezone</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_priority">
-            <field name="name">priority</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_location">
-            <field name="name">location</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_exrule">
-            <field name="name">exrule</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_resources">
-            <field name="name">resources</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_rstatus">
-            <field name="name">rstatus</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_status">
-            <field name="name">status</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_exdate">
-            <field name="name">exdate</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_dtstamp">
-            <field name="name">dtstamp</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_description">
-            <field name="name">description</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_rdate">
-            <field name="name">rdate</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_dtstart">
-            <field name="name">dtstart</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_class">
-            <field name="name">class</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_x-openobject-model">
-            <field name="name">x-openobject-model</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_created">
-            <field name="name">created</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_url">
-            <field name="name">url</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_summary">
-            <field name="name">summary</field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_event_contact">
-            <field name="name">contact</field>
-            <field name="type">vevent</field>
-        </record>
-
-
-<!--        Todo attributes-->
-
-        <record model="basic.calendar.attributes" id="field_todo_status">
-            <field name="name">status</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_comment">
-            <field name="name">comment</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_attendee">
-            <field name="name">attendee</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_valarm">
-            <field name="name">valarm</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_description">
-            <field name="name">description</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_seq">
-            <field name="name">sequence</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_vtimezone">
-            <field name="name">vtimezone</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_url">
-            <field name="name">url</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_completed">
-            <field name="name">completed</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_percent">
-            <field name="name">percent-complete</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_due">
-            <field name="name">due</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_summary">
-            <field name="name">summary</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_priority">
-            <field name="name">priority</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_exdate">
-            <field name="name">exdate</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_location">
-            <field name="name">location</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_exrule">
-            <field name="name">exrule</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_duration">
-            <field name="name">duration</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_organizer">
-            <field name="name">organizer</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_dtstart">
-            <field name="name">dtstart</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_rrule">
-            <field name="name">rrule</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_class">
-            <field name="name">class</field>
-            <field name="type">vtodo</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_todo_uid">
-            <field name="name">uid</field>
-            <field name="type">vtodo</field>
-        </record>
-
-<!--        Attendee's attributes-->
-
-        <record model="basic.calendar.attributes" id="field_attendee_cn">
-            <field name="name">cn</field>
-            <field name="type">attendee</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_attendee_sent-by">
-            <field name="name">sent-by</field>
-            <field name="type">attendee</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_attendee_language">
-            <field name="name">language</field>
-            <field name="type">attendee</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_attendee_delegated-from">
-            <field name="name">delegated-from</field>
-            <field name="type">attendee</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_attendee_member">
-            <field name="name">member</field>
-            <field name="type">attendee</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_attendee_cutype">
-            <field name="name">cutype</field>
-            <field name="type">attendee</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_attendee_role">
-            <field name="name">role</field>
-            <field name="type">attendee</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_attendee_partstat">
-            <field name="name">partstat</field>
-            <field name="type">attendee</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_attendee_delegated-to">
-            <field name="name">delegated-to</field>
-            <field name="type">attendee</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_attendee_dir">
-            <field name="name">dir</field>
-            <field name="type">attendee</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_attendee_rsvp">
-            <field name="name">rsvp</field>
-            <field name="type">attendee</field>
-        </record>
-
-<!--    Alarm attributes-->
-
-        <record model="basic.calendar.attributes" id="field_alarm_attendee">
-            <field name="name">attendee</field>
-            <field name="type">alarm</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_alarm_trigger_duration">
-            <field name="name">trigger_duration</field>
-            <field name="type">alarm</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_alarm_description">
-            <field name="name">description</field>
-            <field name="type">alarm</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_alarm_attach">
-            <field name="name">attach</field>
-            <field name="type">alarm</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_alarm_trigger_occurs">
-            <field name="name">trigger_occurs</field>
-            <field name="type">alarm</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_alarm_trigger_interval">
-            <field name="name">trigger_interval</field>
-            <field name="type">alarm</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_alarm_summary">
-            <field name="name">summary</field>
-            <field name="type">alarm</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_alarm_duration">
-            <field name="name">duration</field>
-            <field name="type">alarm</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_alarm_repeat">
-            <field name="name">repeat</field>
-            <field name="type">alarm</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_alarm_action">
-            <field name="name">action</field>
-            <field name="type">alarm</field>
-        </record>
-
-        <record model="basic.calendar.attributes" id="field_alarm_trigger_related">
-            <field name="name">trigger_related</field>
-            <field name="type">alarm</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/caldav/caldav_node.py b/addons/caldav/caldav_node.py
deleted file mode 100644
index e32801f5cd5..00000000000
--- a/addons/caldav/caldav_node.py
+++ /dev/null
@@ -1,522 +0,0 @@
-# -*- coding: 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/>.
-#
-##############################################################################
-
-from document_webdav import nodes
-from document.nodes import _str2time, nodefd_static
-import logging
-from orm_utils import get_last_modified
-_logger = logging.getLogger(__name__)
-
-try:
-    from tools.dict_tools import  dict_merge2
-except ImportError:
-    from document.dict_tools import  dict_merge2
-
-# TODO: implement DAV-aware errors, inherit from IOError
-
-# Assuming that we have set global properties right, we mark *all* 
-# directories as having calendar-access.
-nodes.node_dir.http_options = dict_merge2(nodes.node_dir.http_options,
-            { 'DAV': ['calendar-access',] })
-
-class node_calendar_collection(nodes.node_dir):
-    DAV_PROPS = dict_merge2(nodes.node_dir.DAV_PROPS,
-            { "http://calendarserver.org/ns/" : ('getctag',), } )
-    DAV_M_NS = dict_merge2(nodes.node_dir.DAV_M_NS,
-            { "http://calendarserver.org/ns/" : '_get_dav', } )
-
-    def _file_get(self,cr, nodename=False):
-        return []
-
-    def _child_get(self, cr, name=False, parent_id=False, domain=None):
-        dirobj = self.context._dirobj
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        where = [('collection_id','=',self.dir_id)]
-        ext = False
-        if name and name.endswith('.ics'):
-            name = name[:-4]
-            ext = True
-        if name:
-            where.append(('name','=',name))
-        if not domain:
-            domain = []
-        where = where + domain
-        fil_obj = dirobj.pool.get('basic.calendar')
-        ids = fil_obj.search(cr,uid,where,context=ctx)
-        res = []
-        for cal in fil_obj.browse(cr, uid, ids, context=ctx):
-            if (not name) or not ext:
-                res.append(node_calendar(cal.name, self, self.context, cal))
-            if self.context.get('DAV-client', '') in ('iPhone', 'iCalendar'):
-                # these ones must not see the webcal entry.
-                continue
-            if cal.has_webcal and (not name) or ext:
-                res.append(res_node_calendar(cal.name+'.ics', self, self.context, cal))
-            # May be both of them!
-        return res
-
-    def _get_ttag(self, cr):
-        return 'calen-dir-%d' % self.dir_id
-
-    def _get_dav_getctag(self, cr):
-        dirobj = self.context._dirobj
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        where = [('collection_id','=',self.dir_id)]
-        bc_obj = dirobj.pool.get('basic.calendar')
-        
-        res = get_last_modified(bc_obj, cr, uid, where, context=ctx)
-        return _str2time(res)
-
-class node_calendar_res_col(nodes.node_res_obj):
-    """ Calendar collection, as a dynamically created node
-    
-    This class shall be used instead of node_calendar_collection, when the
-    node is under dynamic ones.
-    """
-    DAV_PROPS = dict_merge2(nodes.node_res_obj.DAV_PROPS,
-            { "http://calendarserver.org/ns/" : ('getctag',), } )
-    DAV_M_NS = dict_merge2(nodes.node_res_obj.DAV_M_NS,
-            { "http://calendarserver.org/ns/" : '_get_dav', } )
-
-    def _file_get(self,cr, nodename=False):
-        return []
-
-    def _child_get(self, cr, name=False, parent_id=False, domain=None):
-        dirobj = self.context._dirobj
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        where = [('collection_id','=',self.dir_id)]
-        ext = False
-        if name and name.endswith('.ics'):
-            name = name[:-4]
-            ext = True
-        if name:
-            where.append(('name','=',name))
-        if not domain:
-            domain = []
-        where = where + domain
-        fil_obj = dirobj.pool.get('basic.calendar')
-        ids = fil_obj.search(cr,uid,where,context=ctx)
-        res = []
-        # TODO: shall we use any of our dynamic information??
-        for cal in fil_obj.browse(cr, uid, ids, context=ctx):
-            if (not name) or not ext:
-                res.append(node_calendar(cal.name, self, self.context, cal))
-            if self.context.get('DAV-client', '') in ('iPhone', 'iCalendar'):
-                # these ones must not see the webcal entry.
-                continue
-            if cal.has_webcal and (not name) or ext:
-                res.append(res_node_calendar(cal.name+'.ics', self, self.context, cal))
-            # May be both of them!
-        return res
-
-    def _get_ttag(self, cr):
-        return 'calen-dir-%d' % self.dir_id
-
-    def _get_dav_getctag(self, cr):
-        dirobj = self.context._dirobj
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        where = [('collection_id','=',self.dir_id)]
-        bc_obj = dirobj.pool.get('basic.calendar')
-        
-        res = get_last_modified(bc_obj, cr, uid, where, context=ctx)
-        return _str2time(res)
-
-class node_calendar(nodes.node_class):
-    our_type = 'collection'
-    DAV_PROPS = {
-            "DAV:": ('supported-report-set',),
-            # "http://cal.me.com/_namespace/" : ('user-state',),
-            "http://calendarserver.org/ns/" : ( 'getctag',),
-            'http://groupdav.org/': ('resourcetype',),
-            "urn:ietf:params:xml:ns:caldav" : (
-                    'calendar-description', 
-                    'supported-calendar-component-set',
-                    ),
-            "http://apple.com/ns/ical/": ("calendar-color", "calendar-order"),
-            }
-    DAV_PROPS_HIDDEN = {
-            "urn:ietf:params:xml:ns:caldav" : (
-                    'calendar-data',
-                    'calendar-timezone',
-                    'supported-calendar-data',
-                    'max-resource-size',
-                    'min-date-time',
-                    'max-date-time',
-                    )}
-
-    DAV_M_NS = {
-           "DAV:" : '_get_dav',
-           # "http://cal.me.com/_namespace/": '_get_dav', 
-           'http://groupdav.org/': '_get_gdav',
-           "http://calendarserver.org/ns/" : '_get_dav',
-           "urn:ietf:params:xml:ns:caldav" : '_get_caldav',
-           "http://apple.com/ns/ical/": '_get_apple_cal',
-           }
-
-    http_options = { 'DAV': ['calendar-access'] }
-
-    def __init__(self,path, parent, context, calendar):
-        super(node_calendar,self).__init__(path, parent,context)
-        self.calendar_id = calendar.id
-        self.mimetype = 'application/x-directory'
-        self.create_date = calendar.create_date
-        self.write_date = calendar.write_date or calendar.create_date
-        self.content_length = 0
-        self.displayname = calendar.name
-        self.cal_type = calendar.type
-        self.cal_color = calendar.calendar_color or None
-        self.cal_order = calendar.calendar_order or None
-        try:
-            self.uuser = (calendar.user_id and calendar.user_id.login) or 'nobody'
-        except Exception:
-            self.uuser = 'nobody'
-
-    def _get_dav_getctag(self, cr):
-        dirobj = self.context._dirobj
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-
-        bc_obj = dirobj.pool.get('basic.calendar')
-        res = bc_obj.get_cal_max_modified(cr, uid, [self.calendar_id], self, domain=[], context=ctx)
-        return _str2time(res)
-
-    def _get_dav_user_state(self, cr):
-        #TODO
-        return 'online'
-
-    def get_dav_resourcetype(self, cr):
-        res = [ ('collection', 'DAV:'),
-                ('calendar', 'urn:ietf:params:xml:ns:caldav'),
-                ]
-        if self.context.get('DAV-client', '') == 'GroupDAV':
-            res.append((str(self.cal_type + '-collection'), 'http://groupdav.org/'))
-        return res
-
-    def get_domain(self, cr, filters):
-        # TODO: doc.
-        res = []
-        if not filters:
-            return res
-        if filters.localName == 'calendar-query':
-            res = []
-            for filter_child in filters.childNodes:
-                if filter_child.nodeType == filter_child.TEXT_NODE:
-                    continue
-                if filter_child.localName == 'filter':
-                    for vcalendar_filter in filter_child.childNodes:
-                        if vcalendar_filter.nodeType == vcalendar_filter.TEXT_NODE:
-                            continue
-                        if vcalendar_filter.localName == 'comp-filter':
-                            if vcalendar_filter.getAttribute('name') == 'VCALENDAR':
-                                for vevent_filter in vcalendar_filter.childNodes:
-                                    if vevent_filter.nodeType == vevent_filter.TEXT_NODE:
-                                        continue
-                                    if vevent_filter.localName == 'comp-filter':
-                                        if vevent_filter.getAttribute('name'):
-                                            res = [('type','=',vevent_filter.getAttribute('name').lower() )]
-                                            
-                                        for cfe in vevent_filter.childNodes:
-                                            if cfe.localName == 'time-range':
-                                                if cfe.getAttribute('start'):
-                                                    _log.warning("Ignore start.. ")
-                                                    # No, it won't work in this API
-                                                    #val = cfe.getAttribute('start')
-                                                    #res += [('dtstart','=', cfe)]
-                                                elif cfe.getAttribute('end'):
-                                                    _log.warning("Ignore end.. ")
-                                            else:
-                                                _log.debug("Unknown comp-filter: %s.", cfe.localName)
-                                    else:
-                                        _log.debug("Unknown comp-filter: %s.", vevent_filter.localName)
-                        else:
-                            _log.debug("Unknown filter element: %s.", vcalendar_filter.localName)
-                else:
-                    _log.debug("Unknown calendar-query element: %s.", filter_child.localName)
-            return res
-        elif filters.localName == 'calendar-multiget':
-            # this is not the place to process, as it wouldn't support multi-level
-            # hrefs. So, the code is moved to document_webdav/dav_fs.py
-            pass
-        else:
-            _log.debug("Unknown element in REPORT: %s.", filters.localName)
-        return res
-
-    def children(self, cr, domain=None):
-        return self._child_get(cr, domain=domain)
-
-    def child(self,cr, name, domain=None):
-        res = self._child_get(cr, name, domain=domain)
-        if res:
-            return res[0]
-        return None
-
-
-    def _child_get(self, cr, name=False, parent_id=False, domain=None):
-        dirobj = self.context._dirobj
-        uid = self.context.uid
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        where = []
-        bc_obj = dirobj.pool.get('basic.calendar')
-
-        if name:
-            if name.endswith('.ics'):
-                name = name[:-4]
-            try:
-                if name.isdigit():
-                    where.append(('id','=',int(name)))
-                else:
-                    bca_obj = dirobj.pool.get('basic.calendar.alias')
-                    bc_alias = bca_obj.search(cr, uid, 
-                        [('cal_line_id.calendar_id', '=', self.calendar_id),
-                         ('name', '=', name)] )
-                    if not bc_alias:
-                        return []
-                    bc_val = bca_obj.read(cr, uid, bc_alias, ['res_id',])
-                    where.append(('id', '=', bc_val[0]['res_id']))
-            except ValueError:
-                # if somebody requests any other name than the ones we
-                # generate (non-numeric), it just won't exist
-                return []
-
-        if not domain:
-            domain = []
-
-        # we /could/ be supplying an invalid calendar id to bc_obj, it has to check
-        res = bc_obj.get_calendar_objects(cr, uid, [self.calendar_id], self, domain=where, context=ctx)
-        return res
-
-    def create_child(self, cr, path, data):
-        """ API function to create a child file object and node
-            Return the node_* created
-        """
-        # we ignore the path, it will be re-generated automatically
-        fil_obj = self.context._dirobj.pool.get('basic.calendar')
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        uid = self.context.uid
-
-        res = self.set_data(cr, data)
-        if res and len(res):
-            # We arbitrarily construct only the first node of the data
-            # that have been imported. ICS may have had more elements,
-            # but only one node can be returned here.
-            assert isinstance(res[0], (int, long))
-            fnodes = fil_obj.get_calendar_objects(cr, uid, [self.calendar_id], self,
-                    domain=[('id','=',res[0])], context=ctx)
-            
-            if self.context.get('DAV-client','') in ('iPhone', 'iCalendar',):
-                # For those buggy clients, register the alias
-                bca_obj = fil_obj.pool.get('basic.calendar.alias')
-                ourcal = fil_obj.browse(cr, uid, self.calendar_id)
-                line_id = None
-                for line in ourcal.line_ids:
-                    if line.name == ourcal.type:
-                        line_id = line.id
-                        break
-                assert line_id, "Calendar #%d must have at least one %s line." % \
-                                    (ourcal.id, ourcal.type)
-                if path.endswith('.ics'):
-                    path = path[:-4]
-                bca_obj.create(cr, uid, { 'cal_line_id': line_id, 
-                                    'res_id': res[0], 'name': path}, context=ctx)
-            return fnodes[0]
-        # If we reach this line, it means that we couldn't import any useful
-        # (and matching type vs. our node kind) data from the iCal content.
-        return None
-
-
-    def set_data(self, cr, data, fil_obj = None):
-        uid = self.context.uid
-        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
-        res = calendar_obj.import_cal(cr, uid, data, self.calendar_id)
-        return res
-
-    def get_data_len(self, cr, fil_obj = None):
-        return self.content_length
-
-    def _get_ttag(self,cr):
-        return 'calendar-%d' % (self.calendar_id,)
-
-    def rmcol(self, cr):
-        return False
-
-    def _get_caldav_calendar_data(self, cr):
-        if self.context.get('DAV-client', '') in ('iPhone', 'iCalendar'):
-            # Never return collective data to iClients, they get confused
-            # because they do propfind on the calendar node with Depth=1
-            # and only expect the childrens' data
-            return None
-        res = []
-        for child in self.children(cr):
-            res.append(child._get_caldav_calendar_data(cr))
-        return res
-
-    def open_data(self, cr, mode):
-        return nodefd_static(self, cr, mode)
-
-    def _get_caldav_calendar_description(self, cr):
-        uid = self.context.uid
-        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
-        ctx = self.context.context.copy()
-        ctx.update(self.dctx)
-        try:
-            calendar = calendar_obj.browse(cr, uid, self.calendar_id, context=ctx)
-            return calendar.description or calendar.name
-        except Exception:
-            return None
-
-    def _get_dav_supported_report_set(self, cr):
-        
-        return ('supported-report', 'DAV:', 
-                    ('report','DAV:',
-                            ('principal-match','DAV:')
-                    )
-                )
-
-    def _get_caldav_supported_calendar_component_set(self, cr):
-        return ('comp', 'urn:ietf:params:xml:ns:caldav', None,
-                    {'name': self.cal_type.upper()} )
-        
-    def _get_caldav_calendar_timezone(self, cr):
-        return None #TODO
-        
-    def _get_caldav_supported_calendar_data(self, cr):
-        return ('calendar-data', 'urn:ietf:params:xml:ns:caldav', None,
-                    {'content-type': "text/calendar", 'version': "2.0" } )
-        
-    def _get_caldav_max_resource_size(self, cr):
-        return 65535
-
-    def _get_caldav_min_date_time(self, cr):
-        return "19700101T000000Z"
-
-    def _get_caldav_max_date_time(self, cr):
-        return "21001231T235959Z" # I will be dead by then
-    
-    def _get_apple_cal_calendar_color(self, cr):
-        return self.cal_color
-
-    def _get_apple_cal_calendar_order(self, cr):
-        return self.cal_order
-
-class res_node_calendar(nodes.node_class):
-    our_type = 'file'
-    DAV_PROPS = {
-            "http://calendarserver.org/ns/" : ('getctag',),
-            "urn:ietf:params:xml:ns:caldav" : (
-                    'calendar-description',
-                    'calendar-data',
-                    )}
-    DAV_M_NS = {
-           "http://calendarserver.org/ns/" : '_get_dav',
-           "urn:ietf:params:xml:ns:caldav" : '_get_caldav'}
-
-    http_options = { 'DAV': ['calendar-access'] }
-
-    def __init__(self,path, parent, context, res_obj, res_model=None, res_id=None):
-        super(res_node_calendar,self).__init__(path, parent, context)
-        self.mimetype = 'text/calendar'
-        self.create_date = parent.create_date
-        self.write_date = parent.write_date or parent.create_date
-        self.calendar_id = hasattr(parent, 'calendar_id') and parent.calendar_id or False
-        if res_obj:
-            if not self.calendar_id: self.calendar_id = res_obj.id
-            pr = res_obj.perm_read(context=context, details=False)[0]
-            self.create_date = pr.get('create_date')
-            self.write_date = pr.get('write_date') or pr.get('create_date')
-            self.displayname = res_obj.name
-
-        self.content_length = 0
-
-        self.model = res_model
-        self.res_id = res_id
-
-    def open_data(self, cr, mode):
-        return nodefd_static(self, cr, mode)
-
-    def get_data(self, cr, fil_obj=None):
-        uid = self.context.uid
-        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
-        context = self.context.context.copy()
-        context.update(self.dctx)
-        context.update({'model': self.model, 'res_id':self.res_id})
-        res = calendar_obj.export_cal(cr, uid, [self.calendar_id], context=context)
-        return res
-  
-    def _get_caldav_calendar_data(self, cr):
-        return self.get_data(cr)
-
-    def get_data_len(self, cr, fil_obj = None):
-        return self.content_length
-
-    def set_data(self, cr, data, fil_obj = None):
-        uid = self.context.uid
-        context = self.context.context.copy()
-        context.update(self.dctx)
-        context.update({'model': self.model, 'res_id':self.res_id})
-        calendar_obj = self.context._dirobj.pool.get('basic.calendar')
-        res =  calendar_obj.import_cal(cr, uid, data, self.calendar_id, context=context)
-        return res
-
-    def _get_ttag(self,cr):
-        res = False
-        if self.model and self.res_id:
-            res = '%s_%d' % (self.model, self.res_id)
-        elif self.calendar_id:
-            res = '%d' % (self.calendar_id)
-        return res
-
-    def _get_wtag(self, cr):
-        uid = self.context.uid
-        context = self.context.context
-        if self.model and self.res_id:
-            mod_obj = self.context._dirobj.pool.get(self.model)
-            pr = mod_obj.perm_read(cr, uid, [self.res_id], context=context, details=False)[0]
-            self.write_date = pr.get('write_date') or pr.get('create_date')
-        
-        # Super will use self.write_date, so we should be fine.
-        return super(res_node_calendar, self)._get_wtag(cr)
-
-    def rm(self, cr):
-        uid = self.context.uid
-        res = False
-        if self.type in ('collection','database'):
-            return False
-        if self.model and self.res_id:
-            document_obj = self.context._dirobj.pool.get(self.model)
-            if document_obj:
-                res =  document_obj.unlink(cr, uid, [self.res_id])
-
-        return res
-
-   
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4
diff --git a/addons/caldav/caldav_setup.xml b/addons/caldav/caldav_setup.xml
deleted file mode 100644
index e2e9d7eae5a..00000000000
--- a/addons/caldav/caldav_setup.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <!-- /calendars tree -->
-        <record id="document_directory_calendars0" model="document.directory">
-            <field name="domain">[]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="user_id" eval="False"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field name="storage_id" ref="document.storage_default"/>
-            <field name="type">directory</field>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">calendars</field>
-        </record>
-        <record id="document_directory_resources1" model="document.directory">
-            <field name="domain">[]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="user_id" eval="False"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
-            <field name="type">directory</field>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">resources</field>
-        </record>
-        <record id="document_directory_uids0" model="document.directory">
-            <field name="domain">[('id','=',uid)]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="user_id" eval="False"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
-            <field name="type">ressource</field>
-            <field name="ressource_type_id" ref="base.model_res_users"/>
-            <field eval="[(6,0,[ref('base.group_system')])]" name="group_ids"/>
-            <field name="name">__uids__</field>
-        </record>
-        <record id="document_directory_users0" model="document.directory">
-            <field name="domain">[('id','=',uid)]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="user_id" eval="False"/>
-            <field name="resource_field" ref="base.field_res_users_login"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
-            <field name="storage_id" ref="document.storage_default"/>
-            <field name="type">ressource</field>
-            <field name="ressource_type_id" ref="base.model_res_users"/>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">users</field>
-        </record>
-        <record id="document_directory_dctx_0" model="document.directory.dctx">
-            <field model="document.directory" name="dir_id" ref="document_directory_users0"/>
-            <field name="field">user_id</field>
-            <field name="expr">res_id</field>
-        </record>
-        <record id="document_directory_c0" model="document.directory">
-            <field name="domain">[]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field name="user_id" eval="False"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_users0"/>
-            <field name="storage_id" ref="document.storage_default"/>
-            <field name="type">directory</field>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">c</field>
-            <field eval="1" name="calendar_collection"/>
-        </record>
-        <record id="document_directory_groups1" model="document.directory">
-            <field name="domain">[]</field>
-            <field eval="1" name="resource_find_all"/>
-            <field eval="0" name="ressource_tree"/>
-            <field name="company_id" ref="base.main_company"/>
-            <field model="document.directory" name="parent_id" ref="document_directory_calendars0"/>
-            <field name="storage_id" ref="document.storage_default"/>
-            <field name="type">directory</field>
-            <field eval="[(6,0,[])]" name="group_ids"/>
-            <field name="name">groups</field>
-        </record>
-        <record id="document_webdav_dir_property_calendarhomeset0" model="document.webdav.dir.property">
-            <field model="document.directory" name="dir_id" ref="document_directory_calendars0"/>
-            <field name="namespace">urn:ietf:params:xml:ns:caldav</field>
-            <!-- no parent, it is a global property -->
-            <field name="name">calendar-home-set</field>
-            <field name="value">('href','DAV:','/%s/%s/calendars/users/%s/c' % ('webdav',dbname,username) )</field>
-            <field eval="1" name="do_subst"/>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
deleted file mode 100644
index 9f867a96c6d..00000000000
--- a/addons/caldav/caldav_view.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record model="ir.ui.view" id="view_calendar_collection_form">
-            <field name="name">Calendar Collections : Form</field>
-            <field name="model">document.directory</field>
-            <field name="priority">40</field>
-            <field name="arch" type="xml">
-                <form string="Calendar Collections" version="7.0">
-                    <group col="4">
-                        <field name="name" colspan="4"/>
-                        <field name="user_id"/>
-                        <field name="parent_id"/>
-                        <field name="type"/>
-                        <field name="calendar_collection"/>
-                        <field name="storage_id"/>
-                        <field name="calendar_ids" colspan="4" nolabel="1"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_calendar_collection_tree">
-            <field name="name">Calendar Collections : Tree</field>
-            <field name="model">document.directory</field>
-            <field name="priority">40</field>
-            <field name="arch" type="xml">
-                <tree string="Calendar Collections" toolbar="1">
-                    <field name="name"/>
-                    <field name="parent_id"/>
-                    <field name="user_id"/>
-                    <field name="create_date"/>
-                    <field name="write_date"/>
-                    <field name="type"/>
-                    <field name="calendar_collection"/>
-                    <field name="storage_id"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_calendar_collection_form">
-            <field name="name">Calendar Collections</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">document.directory</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('calendar_collection','=',True)]</field>
-            <field name="context">{'default_calendar_collection': True}</field>
-        </record>
-
-        <record model="ir.actions.act_window" id="document.action_document_directory_form">
-            <field name="name">Document Directory</field>
-            <field name="domain">[('calendar_collection','=',False)]</field>
-        </record>
-
-        <record id="action_dir_view1" model="ir.actions.act_window.view">
-            <field eval="10" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_calendar_collection_tree"/>
-            <field name="act_window_id" ref="action_calendar_collection_form"/>
-        </record>
-
-        <record id="action_dir_view2" model="ir.actions.act_window.view">
-            <field eval="20" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_calendar_collection_form"/>
-            <field name="act_window_id" ref="action_calendar_collection_form"/>
-        </record>
-
-        <menuitem id="menu_calendar" name="Calendar"
-            parent="knowledge.menu_document_configuration" />
-
-        <menuitem action="action_calendar_collection_form"
-            id="menu_calendar_collection" parent="menu_calendar" />
-
-        <record model="ir.ui.view" id="view_caldav_form">
-            <field name="name">Calendar : Form</field>
-            <field name="model">basic.calendar</field>
-            <field name="arch" type="xml">
-                <form string="Calendar" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="type"/>
-                        <field name="user_id"/>
-                        <field name="collection_id" required="1"/>
-                        <field name="has_webcal" groups="base.group_no_one" />
-                        <field name="calendar_color" groups="base.group_no_one" />
-                        <field name="calendar_order" groups="base.group_no_one" />
-                    </group>
-                    <notebook>
-                        <page string="Calendar Lines">
-                            <field name="line_ids" mode="form,tree" colspan="4" nolabel="1">
-                                <form string="Calendar Lines" version="7.0">
-                                    <group col="4">
-                                        <field name="name" required="1"/>
-                                        <field name="object_id" required="1"/>
-                                        <field name="domain"/>
-                                    </group>
-                                    <field name="mapping_ids">
-                                        <tree string="Attributes Mapping" editable="bottom">
-                                            <field name="name" required="1" domain="[('type', '=', parent.name)]"/>
-                                            <field name="fn" />
-                                            <field name="field_id" required="1" domain="[('model_id', '=', parent.object_id)]" />
-                                            <field name="expr" />
-                                        </tree>
-                                        <form string="Attributes Mapping" version="7.0">
-                                            <group col="4">
-                                                <field name="name" required="1" domain="[('type', '=', parent.name)]"/>
-                                                <field name="field_id" domain="[('model_id', '=', parent.object_id)]"
-                                                    required="1" />
-                                                <field name="fn" required="1" />
-                                                <field name="expr" />
-                                            </group>
-                                            <separator string="Value Mapping"/>
-                                            <field name="mapping"/>
-                                        </form>
-                                    </field>
-                                </form>
-                                <tree string="Calendar Lines" editable="bottom">
-                                    <field name="name" />
-                                    <field name="object_id" />
-                                </tree>
-                            </field>
-                        </page>
-                        <page string="Other Info">
-                            <separator string="Description"/>
-                            <field name="description"/>
-                        </page>
-                    </notebook>
-                </form>
-            </field>
-        </record>
-
-
-        <record model="ir.ui.view" id="view_caldav_tree">
-            <field name="name">Calendar : Tree</field>
-            <field name="model">basic.calendar</field>
-            <field name="arch" type="xml">
-                <tree string="Calendars" toolbar="1">
-                    <field name="name"/>
-                    <field name="type"/>
-                    <field name="user_id"/>
-                    <field name="collection_id" required="1"/>
-                    <field name="has_webcal" groups="base.group_no_one" />
-                    <field name="calendar_color" groups="base.group_no_one" />
-                    <field name="calendar_order" groups="base.group_no_one" />
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_caldav_search">
-            <field name="name">Calendar: Search</field>
-            <field name="model">basic.calendar</field>
-            <field name="arch" type="xml">
-                <search string="Calendars">
-                    <field name="name" string="Calendar"/>
-                    <filter string="WebCal" icon="terp-calendar" domain="[('has_webcal', '=', True)]" help="Webcal Calendar"/>
-                    <separator/>
-                    <filter string="Event" icon="terp-calendar" domain="[('type', '=', 'vevent')]"/>
-                    <filter string="Todo" icon="terp-calendar" domain="[('type', '=', 'vtodo')]"/>
-                    <separator/>
-                    <filter string="My Calendar(s)" icon="terp-personal" domain="[('user_id', '=', uid)]" help="My Calendar(s)"/>
-                    <field name="type"/>
-                    <field name="user_id"/>
-                    <field name="collection_id"/>
-                </search>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_caldav_form">
-            <field name="name">Calendars</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">basic.calendar</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <record id="action_caldav_view1" model="ir.actions.act_window.view">
-            <field eval="10" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_caldav_tree"/>
-            <field name="act_window_id" ref="action_caldav_form"/>
-        </record>
-        <record id="action_caldav_view2" model="ir.actions.act_window.view">
-            <field eval="20" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_caldav_form"/>
-            <field name="act_window_id" ref="action_caldav_form"/>
-        </record>
-
-        <menuitem action="action_caldav_form"
-            id="menu_caldav_directories" parent="menu_calendar" />
-
-    </data>
-</openerp>
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
deleted file mode 100644
index 5b6199c376c..00000000000
--- a/addons/caldav/calendar.py
+++ /dev/null
@@ -1,1300 +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 datetime import datetime, timedelta
-from dateutil import parser
-from dateutil.rrule import *
-from osv import osv, fields
-from tools.translate import _
-import math
-import pooler
-import pytz
-import re
-import tools
-import time
-import logging
-from caldav_node import res_node_calendar
-from orm_utils import get_last_modified
-from tools.safe_eval import safe_eval as eval
-_logger = logging.getLogger(__name__)
-
-try:
-    import vobject
-except ImportError:
-    raise osv.except_osv(_('vobject Import Error!'), _('Please install python-vobject from http://vobject.skyhouseconsulting.com/'))
-
-# O-1  Optional and can come only once
-# O-n  Optional and can come more than once
-# R-1  Required and can come only once
-# R-n  Required and can come more than once
-
-def uid2openobjectid(cr, uidval, oomodel, rdate):
-    """ UID To Open Object Id
-        @param cr: the current row, from the database cursor,
-        @param uidval: Get USerId vale
-        @oomodel: Open Object ModelName
-        @param rdate: Get Recurrent Date
-    """
-    __rege = re.compile(r'OpenObject-([\w|\.]+)_([0-9]+)@(\w+)$')
-    if not uidval:
-        return (False, None)
-    wematch = __rege.match(uidval.encode('utf8'))
-    if not wematch:
-        return (False, None)
-    else:
-        model, id, dbname = wematch.groups()
-        model_obj = pooler.get_pool(cr.dbname).get(model)
-        if (not model == oomodel) or (not dbname == cr.dbname):
-            return (False, None)
-        qry = 'SELECT DISTINCT(id) FROM %s' % model_obj._table
-        if rdate:
-            qry += " WHERE recurrent_id=%s"
-            cr.execute(qry, (rdate,))
-            r_id = cr.fetchone()
-            if r_id:
-                return (id, r_id[0])
-            else:
-                return (False, None)
-        cr.execute(qry)
-        ids = map(lambda x: str(x[0]), cr.fetchall())
-        if id in ids:
-            return (id, None)
-        return (False, None)
-
-def openobjectid2uid(cr, uidval, oomodel):
-    """ Gives the value of UID for VEVENT
-        @param cr: the current row, from the database cursor,
-        @param uidval: Id value of the Event
-        @oomodel: Open Object ModelName """
-
-    value = 'OpenObject-%s_%s@%s' % (oomodel, uidval, cr.dbname)
-    return value
-
-def mailto2str(arg):
-    """Take a dict of mail and convert to string.
-    """
-    ret = []
-    if isinstance(arg, dict):
-        args = [arg,]
-    else:
-        args = arg
-
-    for ard in args:
-        rstr = ard.get('name','')
-        if ard.get('company',False):
-            rstr += ' (%s)' % ard.get('company')
-        if ard.get('email'):
-            rstr += ' <%s>' % ard.get('email')
-        ret.append(rstr)
-    return ', '.join(ret)
-
-def str2mailto(emailstr, multi=False):
-    """Split one email string to a dict of name, company, mail parts
-
-       @param multi Return an array, recognize comma-sep
-    """
-    # TODO: move to tools or sth.
-    mege = re.compile(r'([^\(\<]+) *(\((.*?)\))? *(\< ?(.*?) ?\>)? ?(\((.*?)\))? *$')
-
-    mailz= [emailstr,]
-    retz = []
-    if multi:
-        mailz = emailstr.split(',')
-
-    for mas in mailz:
-        m = mege.match(mas.strip())
-        if not m:
-            #one of the rare non-matching strings is "sad" :(
-            retz.append({ 'name': mas.strip() })
-            continue
-            # raise ValueError("Invalid email address %r" % mas)
-        rd = {  'name': m.group(1).strip(),
-                'email': m.group(5), }
-        if m.group(2):
-            rd['company'] = m.group(3).strip()
-        elif m.group(6):
-            rd['company'] = m.group(7).strip()
-
-        if rd['name'].startswith('"') and rd['name'].endswith('"'):
-            rd['name'] = rd['name'][1:-1]
-        retz.append(rd)
-
-    if multi:
-        return retz
-    else:
-        return retz[0]
-
-def get_attribute_mapping(cr, uid, calname, context=None):
-    """ Attribute Mapping with Basic calendar fields and lines
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param calname: Get Calendar name
-        @param context: A standard dictionary for contextual values """
-
-    if context is None:
-        context = {}
-    pool = pooler.get_pool(cr.dbname)
-    field_obj = pool.get('basic.calendar.fields')
-    type_obj = pool.get('basic.calendar.lines')
-    domain = [('object_id.model', '=', context.get('model'))]
-    if context.get('calendar_id'):
-        domain.append(('calendar_id', '=', context.get('calendar_id')))
-    type_id = type_obj.search(cr, uid, domain)
-    fids = field_obj.search(cr, uid, [('type_id', '=', type_id[0])])
-    res = {}
-    for field in field_obj.browse(cr, uid, fids, context=context):
-        attr = field.name.name
-        res[attr] = {}
-        res[attr]['field'] = field.field_id.name
-        res[attr]['type'] = field.field_id.ttype
-        if field.fn == 'datetime_utc':
-            res[attr]['type'] = 'utc'
-        if field.fn == 'hours':
-            res[attr]['type'] = "timedelta"
-        if res[attr]['type'] in ('one2many', 'many2many', 'many2one'):
-            res[attr]['object'] = field.field_id.relation
-        elif res[attr]['type'] in ('selection') and field.mapping:
-            res[attr]['mapping'] = eval(field.mapping)
-    if not res.get('uid', None):
-        res['uid'] = {}
-        res['uid']['field'] = 'id'
-        res['uid']['type'] = "integer"
-    return res
-
-def map_data(cr, uid, obj, context=None):
-    """ Map Data
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,"""
-
-    vals = {}
-    for map_dict in obj.__attribute__:
-        map_val = obj.ical_get(map_dict, 'value')
-        field = obj.ical_get(map_dict, 'field')
-        field_type = obj.ical_get(map_dict, 'type')
-        if field:
-            #ignore write date, this field is resered for the orm
-            if field == 'write_date':
-                continue
-            if field_type == 'selection':
-                if not map_val:
-                    continue
-                if type(map_val) == list and len(map_val): #TOFIX: why need to check this
-                    map_val = map_val[0]
-                mapping = obj.__attribute__[map_dict].get('mapping', False)
-                if mapping:
-                    map_val = mapping.get(map_val.lower(), False)
-                else:
-                    map_val = map_val.lower()
-            if field_type == 'many2many':
-                ids = []
-                if not map_val:
-                    vals[field] = ids
-                    continue
-                model = obj.__attribute__[map_dict].get('object', False)
-                modobj = obj.pool.get(model)
-                for map_vall in map_val:
-                    id = modobj.create(cr, uid, map_vall, context=context)
-                    ids.append(id)
-                vals[field] = [(6, 0, ids)]
-                continue
-            if field_type == 'many2one':
-                id = None
-                if not map_val or not isinstance(map_val, dict):
-                    vals[field] = id
-                    continue
-                model = obj.__attribute__[map_dict].get('object', False)
-                modobj = obj.pool.get(model)
-                # check if the record exists or not
-                key1 = map_val.keys()
-                value1 = map_val.values()
-                domain = [(key1[i], '=', value1[i]) for i in range(len(key1)) if value1[i]]
-                exist_id = modobj.search(cr, uid, domain, context=context)
-                if exist_id:
-                    id = exist_id[0]
-                else:
-                    id = modobj.create(cr, uid, map_val, context=context)
-                vals[field] = id
-                continue
-            if field_type == 'timedelta':
-                if map_val:
-                    vals[field] = (map_val.seconds/float(86400) + map_val.days)
-            vals[field] = map_val
-    return vals
-
-class CalDAV(object):
-    __attribute__ = {}
-
-    def ical_set(self, name, value, type):
-        """ set calendar Attribute
-         @param self: The object pointer,
-         @param name: Get Attribute Name
-         @param value: Get Attribute Value
-         @param type: Get Attribute Type
-        """
-        if name in self.__attribute__ and self.__attribute__[name]:
-            self.__attribute__[name][type] = value
-        return True
-
-    def ical_get(self, name, type):
-        """ Get calendar Attribute
-         @param self: The object pointer,
-         @param name: Get Attribute Name
-         @param type: Get Attribute Type
-        """
-        if self.__attribute__.get(name):
-            val = self.__attribute__.get(name).get(type, None)
-            valtype =  self.__attribute__.get(name).get('type', None)
-            if type == 'value':
-                if valtype and valtype == 'datetime' and val:
-                    if isinstance(val, list):
-                        val = ','.join(map(lambda x: x.strftime('%Y-%m-%d %H:%M:%S'), val))
-                    else:
-                        val = val.strftime('%Y-%m-%d %H:%M:%S')
-            return  val
-        else:
-            return  self.__attribute__.get(name, None)
-
-    def ical_reset(self, type):
-        """ Reset Calendar Attribute
-         @param self: The object pointer,
-         @param type: Get Attribute Type
-        """
-        for name in self.__attribute__:
-            if self.__attribute__[name]:
-                self.__attribute__[name][type] = None
-        return True
-
-    def format_date_tz(self, src_date, tz=None):
-        """ This function converts date into specifice timezone value
-        @param src_date: Date to be converted (datetime.datetime)
-        @return: Converted datetime.datetime object for the date
-        """
-        format = tools.DEFAULT_SERVER_DATETIME_FORMAT
-        date_str = src_date.strftime('%Y-%m-%d %H:%M:%S')
-        res_date = tools.server_to_local_timestamp(date_str, format, format, tz)
-        return datetime.strptime(res_date, "%Y-%m-%d %H:%M:%S")
-
-    def parse_ics(self, cr, uid, child, cal_children=None, context=None):
-        """ parse calendaring and scheduling information
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values """
-
-        att_data = []
-        exdates = []
-        _server_tzinfo = pytz.timezone(tools.get_server_timezone())
-        for cal_data in child.getChildren():
-            if cal_data.name.lower() == 'organizer':
-                dmail = { 'name': cal_data.params.get('CN', ['',])[0],
-                            'email': cal_data.value.lower().replace('mailto:',''),
-                            # TODO: company?
-                }
-                self.ical_set(cal_data.name.lower(), mailto2str(dmail), 'value')
-                continue
-            if cal_data.name.lower() == 'attendee':
-                ctx = context.copy()
-                if cal_children:
-                    ctx.update({'model': cal_children[cal_data.name.lower()]})
-                attendee = self.pool.get('basic.calendar.attendee')
-                att_data.append(attendee.import_cal(cr, uid, cal_data, context=ctx))
-                self.ical_set(cal_data.name.lower(), att_data, 'value')
-                continue
-            if cal_data.name.lower() == 'valarm':
-                alarm = self.pool.get('basic.calendar.alarm')
-                ctx = context.copy()
-                if cal_children:
-                    ctx.update({'model': cal_children[cal_data.name.lower()]})
-                vals = alarm.import_cal(cr, uid, cal_data, context=ctx)
-                self.ical_set(cal_data.name.lower(), vals, 'value')
-                continue
-            if cal_data.name.lower() == 'exdate':
-                exdates += cal_data.value
-                exvals = []
-                for exdate in exdates:
-                    exvals.append(datetime.fromtimestamp(time.mktime(exdate.utctimetuple())).strftime('%Y%m%dT%H%M%S'))
-                self.ical_set(cal_data.name.lower(), ','.join(exvals), 'value')
-                continue
-            if cal_data.name.lower() in self.__attribute__:
-                if cal_data.params.get('X-VOBJ-ORIGINAL-TZID'):
-                    self.ical_set('vtimezone', cal_data.params.get('X-VOBJ-ORIGINAL-TZID'), 'value')
-                    date_local = cal_data.value.astimezone(_server_tzinfo)
-                    self.ical_set(cal_data.name.lower(), date_local, 'value')
-                    continue
-                self.ical_set(cal_data.name.lower(), cal_data.value, 'value')
-        vals = map_data(cr, uid, self, context=context)
-        return vals
-
-    def create_ics(self, cr, uid, datas, name, ical, context=None):
-        """ create calendaring and scheduling information
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param context: A standard dictionary for contextual values """
-
-        if not datas:
-            return
-        timezones = []
-        for data in datas:
-            tzval = None
-            exfield = None
-            exdates = []
-            vevent = ical.add(name)
-            for field in self.__attribute__.keys():
-                map_field = self.ical_get(field, 'field')
-                map_type = self.ical_get(field, 'type')
-                if map_field in data.keys():
-                    if field == 'uid':
-                        model = context.get('model', None)
-                        if not model:
-                            continue
-                        uidval = openobjectid2uid(cr, data[map_field], model)
-                        #Computation for getting events with the same UID (RFC4791 Section4.1)
-                        #START
-                        model_obj = self.pool.get(model)
-                        r_ids = []
-                        if model_obj._columns.get('recurrent_uid', None):
-                            cr.execute('SELECT id FROM %s WHERE recurrent_uid=%%s' % model_obj._table,
-                                        (data[map_field],))
-                            r_ids = map(lambda x: x[0], cr.fetchall())
-                        if r_ids:
-                            r_datas = model_obj.read(cr, uid, r_ids, context=context)
-                            rcal = CalDAV.export_cal(self, cr, uid, r_datas, 'vevent', context=context)
-                            for revents in rcal.contents.get('vevent', []):
-                                ical.contents['vevent'].append(revents)
-                        #END
-                        if data.get('recurrent_uid', None):
-                            # Change the UID value in case of modified event from any recurrent event
-                            uidval = openobjectid2uid(cr, data['recurrent_uid'], model)
-                        vevent.add('uid').value = uidval
-                    elif field == 'attendee' and data[map_field]:
-                        model = self.__attribute__[field].get('object', False)
-                        attendee_obj = self.pool.get('basic.calendar.attendee')
-                        vevent = attendee_obj.export_cal(cr, uid, model, \
-                                     data[map_field], vevent, context=context)
-                    elif field == 'valarm' and data[map_field]:
-                        model = self.__attribute__[field].get('object', False)
-                        ctx = context.copy()
-                        ctx.update({'model': model})
-                        alarm_obj = self.pool.get('basic.calendar.alarm')
-                        vevent = alarm_obj.export_cal(cr, uid, model, \
-                                    data[map_field][0], vevent, context=ctx)
-                    elif field == 'vtimezone' and data[map_field]:
-                        tzval = data[map_field]
-                        if tzval not in timezones:
-                            tz_obj = self.pool.get('basic.calendar.timezone')
-                            ical = tz_obj.export_cal(cr, uid, None, \
-                                         data[map_field], ical, context=context)
-                            timezones.append(data[map_field])
-                        if vevent.contents.get('recurrence-id'):
-                            # Convert recurrence-id field value accroding to timezone value
-                            recurid_val = vevent.contents.get('recurrence-id')[0].value
-                            vevent.contents.get('recurrence-id')[0].params['TZID'] = [tzval.title()]
-                            vevent.contents.get('recurrence-id')[0].value =  self.format_date_tz(recurid_val, tzval.title())
-                        if exfield:
-                            # Set exdates according to timezone value
-                            # This is the case when timezone mapping comes after the exdate mapping
-                            # and we have exdate value available
-                            exfield.params['TZID'] = [tzval.title()]
-                            exdates_updated = []
-                            for exdate in exdates:
-                                exdates_updated.append(self.format_date_tz(parser.parse(exdate), tzval.title()))
-                            exfield.value = exdates_updated
-                    elif field == 'organizer' and data[map_field]:
-                        organizer = str2mailto(data[map_field])
-                        event_org = vevent.add('organizer')
-                        event_org.params['CN'] = [organizer['name']]
-                        event_org.value = 'MAILTO:' + (organizer.get('email') or '')
-                        # TODO: company?
-                    elif data[map_field]:
-                        if map_type in ("char", "text"):
-                            if field in ('exdate'):
-                                exfield = vevent.add(field)
-                                exdates = (data[map_field]).split(',')
-                                if tzval:
-                                    # Set exdates according to timezone value
-                                    # This is the case when timezone mapping comes before the exdate mapping
-                                    # and we have timezone value available
-                                    exfield.params['TZID'] = [tzval.title()]
-                                    exdates_updated = []
-                                    for exdate in exdates:
-                                        exdates_updated.append(self.format_date_tz(parser.parse(exdate), tzval.title()))
-                                    exfield.value = exdates_updated
-                            else:
-                                vevent.add(field).value = tools.ustr(data[map_field])
-                        elif map_type in ('datetime', 'date') and data[map_field]:
-                            dtfield = vevent.add(field)
-                            if tzval:
-                                # Export the date according to the event timezone value
-                                dtfield.params['TZID'] = [tzval.title()]
-                                dtfield.value = self.format_date_tz(parser.parse(data[map_field]), tzval.title())
-                            else:
-                                dtfield.value = parser.parse(data[map_field])
-
-                        elif map_type == 'utc'and data[map_field]:
-                            if tzval:
-                                local = pytz.timezone (tzval.title())
-                                naive = datetime.strptime (data[map_field], "%Y-%m-%d %H:%M:%S")
-                                local_dt = naive.replace (tzinfo = local)
-                                utc_dt = local_dt.astimezone (pytz.utc)
-                                vevent.add(field).value = utc_dt
-                            else:
-                               utc_timezone = pytz.timezone ('UTC')
-                               naive = datetime.strptime (data[map_field], "%Y-%m-%d %H:%M:%S")
-                               local_dt = naive.replace (tzinfo = utc_timezone)
-                               utc_dt = local_dt.astimezone (pytz.utc)
-                               vevent.add(field).value = utc_dt
-
-                        elif map_type == "timedelta":
-                            vevent.add(field).value = timedelta(hours=data[map_field])
-                        elif map_type == "many2one":
-                            vevent.add(field).value = tools.ustr(data.get(map_field)[1])
-                        elif map_type in ("float", "integer"):
-                            vevent.add(field).value = str(data.get(map_field))
-                        elif map_type == "selection":
-                            if not self.ical_get(field, 'mapping'):
-                                vevent.add(field).value = (tools.ustr(data[map_field])).upper()
-                            else:
-                                for key1, val1 in self.ical_get(field, 'mapping').items():
-                                    if val1 == data[map_field]:
-                                        vevent.add(field).value = key1.upper()
-        return vevent
-
-    def check_import(self, cr, uid, vals, 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 vals: Get Values
-            @param context: A standard dictionary for contextual values
-        """
-        if context is None:
-            context = {}
-        ids = []
-        model_obj = self.pool.get(context.get('model'))
-        recur_pool = {}
-        try:
-            for val in vals:
-                # Compute value of duration
-                if 'date_deadline' in val and 'duration' not in val:
-                    start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S')
-                    end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S')
-                    diff = end - start
-                    val['duration'] = (diff.seconds/float(86400) + diff.days) * 24
-                exists, r_id = calendar.uid2openobjectid(cr, val['id'], context.get('model'), \
-                                                                 val.get('recurrent_id'))
-                if val.has_key('create_date'):
-                    val.pop('create_date')
-                u_id = val.get('id', None)
-                val.pop('id')
-                if exists and r_id:
-                    val.update({'recurrent_uid': exists})
-                    model_obj.write(cr, uid, [r_id], val)
-                    ids.append(r_id)
-                elif exists:
-                    model_obj.write(cr, uid, [exists], val)
-                    ids.append(exists)
-                else:
-                    if u_id in recur_pool and val.get('recurrent_id'):
-                        val.update({'recurrent_uid': recur_pool[u_id]})
-                        revent_id = model_obj.create(cr, uid, val)
-                        ids.append(revent_id)
-                    else:
-                        __rege = re.compile(r'OpenObject-([\w|\.]+)_([0-9]+)@(\w+)$')
-                        wematch = __rege.match(u_id.encode('utf8'))
-                        if wematch:
-                            model, recur_id, dbname = wematch.groups()
-                            val.update({'recurrent_uid': recur_id})
-                        event_id = model_obj.create(cr, uid, val)
-                        recur_pool[u_id] = event_id
-                        ids.append(event_id)
-        except Exception:
-            raise
-        return ids
-
-    def export_cal(self, cr, uid, datas, vobj=None, context=None):
-        """ Export Calendar
-            @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 datas: Get Data's for caldav
-            @param context: A standard dictionary for contextual values
-        """
-        try:
-            self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, context)
-            ical = vobject.iCalendar()
-            self.create_ics(cr, uid, datas, vobj, ical, context=context)
-            return ical
-        except:
-            raise  # osv.except_osv(('Error !'), (str(e)))
-
-    def import_cal(self, cr, uid, content, data_id=None, context=None):
-        """ Import Calendar
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param data_id: Get Data’s ID or False
-            @param context: A standard dictionary for contextual values
-        """
-
-        ical_data = content
-        self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, context)
-        parsedCal = vobject.readOne(ical_data)
-        res = []
-        vals = {}
-        for child in parsedCal.getChildren():
-            if child.name.lower() in ('vevent', 'vtodo'):
-                vals = self.parse_ics(cr, uid, child, context=context)
-            else:
-                vals = {}
-                continue
-            if vals: res.append(vals)
-            self.ical_reset('value')
-        return res
-
-class Calendar(CalDAV, osv.osv):
-    _name = 'basic.calendar'
-    _calname = 'calendar'
-
-    __attribute__ = {
-        'prodid': None, # Use: R-1, Type: TEXT, Specifies the identifier for the product that created the iCalendar object.
-        'version': None, # Use: R-1, Type: TEXT, Specifies the identifier corresponding to the highest version number
-                           #             or the minimum and maximum range of the iCalendar specification
-                           #             that is required in order to interpret the iCalendar object.
-        'calscale': None, # Use: O-1, Type: TEXT, Defines the calendar scale used for the calendar information specified in the iCalendar object.
-        'method': None, # Use: O-1, Type: TEXT, Defines the iCalendar object method associated with the calendar object.
-        'vevent': None, # Use: O-n, Type: Collection of Event class
-        'vtodo': None, # Use: O-n, Type: Collection of ToDo class
-        'vjournal': None, # Use: O-n, Type: Collection of Journal class
-        'vfreebusy': None, # Use: O-n, Type: Collection of FreeBusy class
-        'vtimezone': None, # Use: O-n, Type: Collection of Timezone class
-    }
-    _columns = {
-            'name': fields.char("Name", size=64),
-            'user_id': fields.many2one('res.users', 'Owner'),
-            'collection_id': fields.many2one('document.directory', 'Collection', \
-                                           required=True),
-            'type': fields.selection([('vevent', 'Event'), ('vtodo', 'TODO')], \
-                                    string="Type", size=64),
-            'line_ids': fields.one2many('basic.calendar.lines', 'calendar_id', 'Calendar Lines'),
-            'create_date': fields.datetime('Created Date', readonly=True),
-            'write_date': fields.datetime('Write Date', readonly=True),
-            'description': fields.text("Description"),
-            'calendar_color': fields.char('Color', size=20, help="For supporting clients, the color of the calendar entries"),
-            'calendar_order': fields.integer('Order', help="For supporting clients, the order of this folder among the calendars"),
-            'has_webcal': fields.boolean('WebCal', required=True, help="Also export a <name>.ics entry next to the calendar folder, with WebCal content."),
-    }
-
-    _defaults = {
-        'has_webcal': False,
-    }
-
-    def get_calendar_objects(self, cr, uid, ids, parent=None, domain=None, context=None):
-        if context is None:
-            context = {}
-        if not domain:
-            domain = []
-        res = []
-        ctx_res_id = context.get('res_id', None)
-        ctx_model = context.get('model', None)
-        for cal in self.browse(cr, uid, ids):
-            for line in cal.line_ids:
-                if ctx_model and ctx_model != line.object_id.model:
-                    continue
-                if line.name in ('valarm', 'attendee'):
-                    continue
-                line_domain = eval(line.domain or '[]', context)
-                line_domain += domain
-                if ctx_res_id:
-                    line_domain += [('id','=',ctx_res_id)]
-                mod_obj = self.pool.get(line.object_id.model)
-                data_ids = mod_obj.search(cr, uid, line_domain, order="id", context=context)
-                for data in mod_obj.browse(cr, uid, data_ids, context):
-                    ctx = parent and parent.context or None
-                    if hasattr(data, 'recurrent_uid') and data.recurrent_uid:
-                        # Skip for event which is child of other event
-                        continue
-                    node = res_node_calendar('%s.ics' %data.id, parent, ctx, data, line.object_id.model, data.id)
-                    res.append(node)
-        return res
-
-
-    def get_cal_max_modified(self, cr, uid, ids, parent=None, domain=None, context=None):
-        if context is None:
-            context = {}
-        if not domain:
-            domain = []
-        res = None
-        ctx_res_id = context.get('res_id', None)
-        ctx_model = context.get('model', None)
-        for cal in self.browse(cr, uid, ids):
-            for line in cal.line_ids:
-                if ctx_model and ctx_model != line.object_id.model:
-                    continue
-                if line.name in ('valarm', 'attendee'):
-                    continue
-                line_domain = eval(line.domain or '[]', context)
-                line_domain += domain
-                if ctx_res_id:
-                    line_domain += [('id','=',ctx_res_id)]
-                mod_obj = self.pool.get(line.object_id.model)
-                max_data = get_last_modified(mod_obj, cr, uid, line_domain, context=context)
-                if res and res > max_data:
-                    continue
-                res = max_data
-        return res
-
-    def export_cal(self, cr, uid, ids, vobj='vevent', context=None):
-        """ Export Calendar
-            @param ids: List of calendar’s IDs
-            @param vobj: the type of object to export
-            @return the ical data.
-        """
-        if context is None:
-           context = {}
-        ctx_model = context.get('model', None)
-        ctx_res_id = context.get('res_id', None)
-        ical = vobject.iCalendar()
-        for cal in self.browse(cr, uid, ids, context=context):
-            for line in cal.line_ids:
-                if ctx_model and ctx_model != line.object_id.model:
-                    continue
-                if line.name in ('valarm', 'attendee'):
-                    continue
-                domain = eval(line.domain or '[]', context)
-                if ctx_res_id:
-                    domain += [('id','=',ctx_res_id)]
-                mod_obj = self.pool.get(line.object_id.model)
-                data_ids = mod_obj.search(cr, uid, domain, context=context)
-                datas = mod_obj.read(cr, uid, data_ids, context=context)
-                context.update({'model': line.object_id.model,
-                                        'calendar_id': cal.id
-                                        })
-                self.__attribute__ = get_attribute_mapping(cr, uid, line.name, context)
-                self.create_ics(cr, uid, datas, line.name, ical, context=context)
-        return ical.serialize()
-
-    def import_cal(self, cr, uid, content, data_id=None, context=None):
-        """ Import Calendar
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param data_id: Get Data’s ID or False
-            @param context: A standard dictionary for contextual values
-        """
-        if context is None:
-            context = {}
-        vals = []
-        ical_data = content
-        parsedCal = vobject.readOne(ical_data)
-        if not data_id:
-            data_id = self.search(cr, uid, [])[0]
-        cal = self.browse(cr, uid, data_id, context=context)
-        cal_children = {}
-
-        for line in cal.line_ids:
-            cal_children[line.name] = line.object_id.model
-        objs = []
-        checked = True
-        for child in parsedCal.getChildren():
-            if child.name.lower() in cal_children:
-                context.update({'model': cal_children[child.name.lower()],
-                                'calendar_id': cal['id']
-                                })
-                self.__attribute__ = get_attribute_mapping(cr, uid, child.name.lower(), context=context)
-                val = self.parse_ics(cr, uid, child, cal_children=cal_children, context=context)
-                vals.append(val)
-                objs.append(cal_children[child.name.lower()])
-            elif child.name.upper() == 'CALSCALE':
-                if child.value.upper() != 'GREGORIAN':
-                    _logger.warning('How do I handle %s calendars?',child.value)
-            elif child.name.upper() in ('PRODID', 'VERSION'):
-                pass
-            elif child.name.upper().startswith('X-'):
-                _logger.debug("Skipping custom node %s.", child.name)
-            else:
-                _logger.debug("Skipping node %s.", child.name)
-
-        res = []
-        for obj_name in list(set(objs)):
-            obj = self.pool.get(obj_name)
-            if hasattr(obj, 'check_import'):
-                r = obj.check_import(cr, uid, vals, context=context)
-                checked = True
-                res.extend(r)
-
-        if not checked:
-            r = self.check_import(cr, uid, vals, context=context)
-            res.extend(r)
-        return res
-
-Calendar()
-
-
-class basic_calendar_line(osv.osv):
-    """ Calendar Lines """
-
-    _name = 'basic.calendar.lines'
-    _description = 'Calendar Lines'
-
-    _columns = {
-            'name': fields.selection([('vevent', 'Event'), ('vtodo', 'TODO'), \
-                                    ('valarm', 'Alarm'), \
-                                    ('attendee', 'Attendee')], \
-                                    string="Type", size=64),
-            'object_id': fields.many2one('ir.model', 'Object'),
-            'calendar_id': fields.many2one('basic.calendar', 'Calendar', \
-                                       required=True, ondelete='cascade'),
-            'domain': fields.char('Domain', size=124),
-            'mapping_ids': fields.one2many('basic.calendar.fields', 'type_id', 'Fields Mapping')
-    }
-
-    _defaults = {
-        'domain': lambda *a: '[]',
-    }
-
-    def create(self, cr, uid, vals, context=None):
-        """ create calendar's line
-            @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 vals: Get the Values
-            @param context: A standard dictionary for contextual values
-        """
-
-        cr.execute("SELECT COUNT(id) FROM basic_calendar_lines \
-                                WHERE name=%s AND calendar_id=%s",
-                                (vals.get('name'), vals.get('calendar_id')))
-        res = cr.fetchone()
-        if res:
-            if res[0] > 0:
-                raise osv.except_osv(_('Warning!'), _('Cannot create line "%s" more than once.') % (vals.get('name')))
-        return super(basic_calendar_line, self).create(cr, uid, vals, context=context)
-
-basic_calendar_line()
-
-class basic_calendar_alias(osv.osv):
-    """ Mapping of client filenames to ORM ids of calendar records
-
-        Since some clients insist on putting arbitrary filenames on the .ics data
-        they send us, and they won't respect the redirection "Location:" header,
-        we have to store those filenames and allow clients to call our calendar
-        records with them.
-        Note that adding a column to all tables that would possibly hold calendar-
-        mapped data won't work. The user is always allowed to specify more
-        calendars, on any arbitrary ORM object, without need to alter those tables'
-        data or structure
-    """
-    _name = 'basic.calendar.alias'
-    _columns = {
-        'name': fields.char('Filename', size=512, required=True, select=1),
-        'cal_line_id': fields.many2one('basic.calendar.lines', 'Calendar', required=True,
-                        select=1, help='The calendar/line this mapping applies to'),
-        'res_id': fields.integer('Res. ID', required=True, select=1),
-        }
-
-    _sql_constraints = [ ('name_cal_uniq', 'UNIQUE(cal_line_id, name)',
-                _('The same filename cannot apply to two records!')), ]
-
-basic_calendar_alias()
-
-class basic_calendar_attribute(osv.osv):
-    _name = 'basic.calendar.attributes'
-    _description = 'Calendar attributes'
-    _columns = {
-        'name': fields.char("Name", size=64, required=True),
-        'type': fields.selection([('vevent', 'Event'), ('vtodo', 'TODO'), \
-                                    ('alarm', 'Alarm'), \
-                                    ('attendee', 'Attendee')], \
-                                    string="Type", size=64, required=True),
-    }
-
-basic_calendar_attribute()
-
-
-class basic_calendar_fields(osv.osv):
-    """ Calendar fields """
-
-    _name = 'basic.calendar.fields'
-    _description = 'Calendar fields'
-    _order = 'name'
-
-    _columns = {
-        'field_id': fields.many2one('ir.model.fields', 'OpenObject Field'),
-        'name': fields.many2one('basic.calendar.attributes', 'Name', required=True),
-        'type_id': fields.many2one('basic.calendar.lines', 'Type', \
-                                   required=True, ondelete='cascade'),
-        'expr': fields.char("Expression", size=64),
-        'fn': fields.selection([('field', 'Use the field'),
-                        ('const', 'Expression as constant'),
-                        ('hours', 'Interval in hours'),
-                        ('datetime_utc', 'Datetime In UTC'),
-                        ], 'Function'),
-        'mapping': fields.text('Mapping'),
-    }
-
-    _defaults = {
-        'fn': 'field',
-    }
-
-    _sql_constraints = [
-        ( 'name_type_uniq', 'UNIQUE(name, type_id)', 'Cannot map a field more than once.'),
-    ]
-
-    def check_line(self, cr, uid, vals, name, context=None):
-        """ check calendar's line
-            @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 vals: Get Values
-            @param context: A standard dictionary for contextual values
-        """
-        f_obj = self.pool.get('ir.model.fields')
-        field = f_obj.browse(cr, uid, vals['field_id'], context=context)
-        relation = field.relation
-        line_obj = self.pool.get('basic.calendar.lines')
-        l_id = line_obj.search(cr, uid, [('name', '=', name)])
-        if l_id:
-            line = line_obj.browse(cr, uid, l_id, context=context)[0]
-            line_rel = line.object_id.model
-            if (relation != 'NULL') and (not relation == line_rel):
-                raise osv.except_osv(_('Warning!'), _('Please provide proper configuration of "%s" in Calendar Lines.') % (name))
-        return True
-
-    def create(self, cr, uid, vals, context=None):
-        """ Create Calendar's fields
-            @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 vals: Get Values
-            @param context: A standard dictionary for contextual values
-        """
-
-        cr.execute('SELECT name FROM basic_calendar_attributes \
-                            WHERE id=%s', (vals.get('name'),))
-        name = cr.fetchone()
-        name = name[0]
-        if name in ('valarm', 'attendee'):
-            self.check_line(cr, uid, vals, name, context=context)
-        return super(basic_calendar_fields, self).create(cr, uid, vals, context=context)
-
-    def write(self, cr, uid, ids, vals, context=None):
-        """ write Calendar's fields
-            @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 vals: Get Values
-            @param context: A standard dictionary for contextual values
-        """
-
-        if not vals:
-            return
-        for id in ids:
-            field = self.browse(cr, uid, id, context=context)
-            name = field.name.name
-            if name in ('valarm', 'attendee'):
-                self.check_line(cr, uid, vals, name, context=context)
-        return super(basic_calendar_fields, self).write(cr, uid, ids, vals, context)
-
-basic_calendar_fields()
-
-
-class Event(CalDAV, osv.osv_memory):
-    _name = 'basic.calendar.event'
-    _calname = 'vevent'
-    __attribute__ = {
-        'class': None, # Use: O-1, Type: TEXT, Defines the access classification for a calendar  component like "PUBLIC" / "PRIVATE" / "CONFIDENTIAL"
-        'created': None, # Use: O-1, Type: DATE-TIME, Specifies the date and time that the calendar information  was created by the calendar user agent in the calendar store.
-        'description': None, # Use: O-1, Type: TEXT, Provides a more complete description of the calendar component, than that provided by the "SUMMARY" property.
-        'dtstart': None, # Use: O-1, Type: DATE-TIME, Specifies when the calendar component begins.
-        'geo': None, # Use: O-1, Type: FLOAT, Specifies information related to the global position for the activity specified by a calendar component.
-        'last-mod': None, # Use: O-1, Type: DATE-TIME        Specifies the date and time that the information associated with the calendar component was last revised in the calendar store.
-        'location': None, # Use: O-1, Type: TEXT            Defines the intended venue for the activity defined by a calendar component.
-        'organizer': None, # Use: O-1, Type: CAL-ADDRESS, Defines the organizer for a calendar component.
-        'priority': None, # Use: O-1, Type: INTEGER, Defines the relative priority for a calendar component.
-        'dtstamp': None, # Use: O-1, Type: DATE-TIME, Indicates the date/time that the instance of the iCalendar object was created.
-        'seq': None, # Use: O-1, Type: INTEGER, Defines the revision sequence number of the calendar component within a sequence of revision.
-        'status': None, # Use: O-1, Type: TEXT, Defines the overall status or confirmation for the calendar component.
-        'summary': None, # Use: O-1, Type: TEXT, Defines a short summary or subject for the calendar component.
-        'transp': None, # Use: O-1, Type: TEXT, Defines whether an event is transparent or not to busy time searches.
-        'uid': None, # Use: O-1, Type: TEXT, Defines the persistent, globally unique identifier for the calendar component.
-        'url': None, # Use: O-1, Type: URL, Defines a Uniform Resource Locator (URL) associated with the iCalendar object.
-        'recurid': None,
-        'attach': None, # Use: O-n, Type: BINARY, Provides the capability to associate a document object with a calendar component.
-        'attendee': None, # Use: O-n, Type: CAL-ADDRESS, Defines an "Attendee" within a calendar component.
-        'categories': None, # Use: O-n, Type: TEXT, Defines the categories for a calendar component.
-        'comment': None, # Use: O-n, Type: TEXT, Specifies non-processing information intended to provide a comment to the calendar user.
-        'contact': None, # Use: O-n, Type: TEXT, Used to represent contact information or alternately a  reference to contact information associated with the calendar component.
-        'exdate': None, # Use: O-n, Type: DATE-TIME, Defines the list of date/time exceptions for a recurring calendar component.
-        'exrule': None, # Use: O-n, Type: RECUR, Defines a rule or repeating pattern for an exception to a recurrence set.
-        'rstatus': None,
-        'related': None, # Use: O-n, Specify the relationship of the alarm trigger with respect to the start or end of the calendar component.
-                                #  like A trigger set 5 minutes after the end of the event or to-do.---> TRIGGER;related=END:PT5M
-        'resources': None, # Use: O-n, Type: TEXT, Defines the equipment or resources anticipated for an activity specified by a calendar entity like RESOURCES:EASEL,PROJECTOR,VCR, LANGUAGE=fr:1 raton-laveur
-        'rdate': None, # Use: O-n, Type: DATE-TIME, Defines the list of date/times for a recurrence set.
-        'rrule': None, # Use: O-n, Type: RECUR, Defines a rule or repeating pattern for recurring events, to-dos, or time zone definitions.
-        'x-prop': None,
-        'duration': None, # Use: O-1, Type: DURATION, Specifies a positive duration of time.
-        'dtend': None, # Use: O-1, Type: DATE-TIME, Specifies the date and time that a calendar component ends.
-    }
-
-    def export_cal(self, cr, uid, datas, vobj='vevent', context=None):
-        """ Export calendar
-            @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 datas: Get datas
-            @param context: A standard dictionary for contextual values
-        """
-
-        return super(Event, self).export_cal(cr, uid, datas, 'vevent', context=context)
-
-Event()
-
-
-class ToDo(CalDAV, osv.osv_memory):
-    _name = 'basic.calendar.todo'
-    _calname = 'vtodo'
-
-    __attribute__ = {
-                'class': None,
-                'completed': None,
-                'created': None,
-                'description': None,
-                'dtstamp': None,
-                'dtstart': None,
-                'duration': None,
-                'due': None,
-                'geo': None,
-                'last-mod ': None,
-                'location': None,
-                'organizer': None,
-                'percent': None,
-                'priority': None,
-                'recurid': None,
-                'seq': None,
-                'status': None,
-                'summary': None,
-                'uid': None,
-                'url': None,
-                'attach': None,
-                'attendee': None,
-                'categories': None,
-                'comment': None,
-                'contact': None,
-                'exdate': None,
-                'exrule': None,
-                'rstatus': None,
-                'related': None,
-                'resources': None,
-                'rdate': None,
-                'rrule': None,
-            }
-
-    def export_cal(self, cr, uid, datas, vobj='vevent', context=None):
-        """ Export Calendar
-            @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 datas: Get datas
-            @param context: A standard dictionary for contextual values
-        """
-
-        return super(ToDo, self).export_cal(cr, uid, datas, 'vtodo', context=context)
-
-ToDo()
-
-
-class Journal(CalDAV):
-    __attribute__ = {
-    }
-
-
-class FreeBusy(CalDAV):
-    __attribute__ = {
-    'contact': None, # Use: O-1, Type: Text, Represent contact information or alternately a  reference to contact information associated with the calendar component.
-    'dtstart': None, # Use: O-1, Type: DATE-TIME, Specifies when the calendar component begins.
-    'dtend': None, # Use: O-1, Type: DATE-TIME, Specifies the date and time that a calendar component ends.
-    'duration': None, # Use: O-1, Type: DURATION, Specifies a positive duration of time.
-    'dtstamp': None, # Use: O-1, Type: DATE-TIME, Indicates the date/time that the instance of the iCalendar object was created.
-    'organizer': None, # Use: O-1, Type: CAL-ADDRESS, Defines the organizer for a calendar component.
-    'uid': None, # Use: O-1, Type: Text, Defines the persistent, globally unique identifier for the calendar component.
-    'url': None, # Use: O-1, Type: URL, Defines a Uniform Resource Locator (URL) associated with the iCalendar object.
-    'attendee': None, # Use: O-n, Type: CAL-ADDRESS, Defines an "Attendee" within a calendar component.
-    'comment': None, # Use: O-n, Type: TEXT, Specifies non-processing information intended to provide a comment to the calendar user.
-    'freebusy': None, # Use: O-n, Type: PERIOD, Defines one or more free or busy time intervals.
-    'rstatus': None,
-    'X-prop': None,
-    }
-
-
-class Timezone(CalDAV, osv.osv_memory):
-    _name = 'basic.calendar.timezone'
-    _calname = 'vtimezone'
-
-    __attribute__ = {
-    'tzid': {'field': 'tzid'}, # Use: R-1, Type: Text, Specifies the text value that uniquely identifies the "VTIMEZONE" calendar component.
-    'last-mod': None, # Use: O-1, Type: DATE-TIME, Specifies the date and time that the information associated with the calendar component was last revised in the calendar store.
-    'tzurl': None, # Use: O-1, Type: URI, Provides a means for a VTIMEZONE component to point to a network location that can be used to retrieve an up-to-date version of itself.
-    'standardc': {'tzprop': None}, # Use: R-1,
-    'daylightc': {'tzprop': None}, # Use: R-1,
-    'x-prop': None, # Use: O-n, Type: Text,
-    }
-
-    def get_name_offset(self, cr, uid, tzid, context=None):
-        """ Get Name Offset value
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param context: A standard dictionary for contextual values
-        """
-
-        mytz = pytz.timezone(tzid.title())
-        mydt = datetime.now(tz=mytz)
-        offset = mydt.utcoffset()
-        val = offset.days * 24 + float(offset.seconds) / 3600
-        realoffset = '%02d%02d' % (math.floor(abs(val)), \
-                                 round(abs(val) % 1 + 0.01, 2) * 60)
-        realoffset = (val < 0 and ('-' + realoffset) or ('+' + realoffset))
-        return (mydt.tzname(), realoffset)
-
-    def export_cal(self, cr, uid, model, tzid, ical, context=None):
-        """ Export Calendar
-            @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 model: Get Model's name
-            @param context: A standard dictionary for contextual values
-        """
-        if context is None:
-            context = {}
-        ctx = context.copy()
-        ctx.update({'model': model})
-        cal_tz = ical.add('vtimezone')
-        cal_tz.add('TZID').value = tzid.title()
-        tz_std = cal_tz.add('STANDARD')
-        tzname, offset = self.get_name_offset(cr, uid, tzid)
-        tz_std.add("TZOFFSETFROM").value = offset
-        tz_std.add("TZOFFSETTO").value = offset
-        #TODO: Get start date for timezone
-        tz_std.add("DTSTART").value = datetime.strptime('1970-01-01 00:00:00', '%Y-%m-%d %H:%M:%S')
-        tz_std.add("TZNAME").value = tzname
-        return ical
-
-    def import_cal(self, cr, uid, ical_data, context=None):
-        """ Import Calendar
-            @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 ical_data: Get calendar's data
-            @param context: A standard dictionary for contextual values
-        """
-
-        for child in ical_data.getChildren():
-            if child.name.lower() == 'tzid':
-                tzname = child.value
-                self.ical_set(child.name.lower(), tzname, 'value')
-        vals = map_data(cr, uid, self, context=context)
-        return vals
-
-Timezone()
-
-
-class Alarm(CalDAV, osv.osv_memory):
-    _name = 'basic.calendar.alarm'
-    _calname = 'alarm'
-
-    __attribute__ = {
-    'action': None, # Use: R-1, Type: Text, defines the action to be invoked when an alarm is triggered LIKE "AUDIO" / "DISPLAY" / "EMAIL" / "PROCEDURE"
-    'description': None, #      Type: Text, Provides a more complete description of the calendar component, than that provided by the "SUMMARY" property. Use:- R-1 for DISPLAY,Use:- R-1 for EMAIL,Use:- R-1 for PROCEDURE
-    'summary': None, # Use: R-1, Type: Text        Which contains the text to be used as the message subject. Use for EMAIL
-    'attendee': None, # Use: R-n, Type: CAL-ADDRESS, Contain the email address of attendees to receive the message. It can also include one or more. Use for EMAIL
-    'trigger': None, # Use: R-1, Type: DURATION, The "TRIGGER" property specifies a duration prior to the start of an event or a to-do. The "TRIGGER" edge may be explicitly set to be relative to the "START" or "END" of the event or to-do with the "related" parameter of the "TRIGGER" property. The "TRIGGER" property value type can alternatively be set to an absolute calendar date and time of day value. Use for all action like AUDIO, DISPLAY, EMAIL and PROCEDURE
-    'duration': None, #           Type: DURATION, Duration' and 'repeat' are both optional, and MUST NOT occur more than once each, but if one occurs, so MUST the other. Use:- 0-1 for AUDIO, EMAIL and PROCEDURE, Use:- 0-n for DISPLAY
-    'repeat': None, #           Type: INTEGER, Duration' and 'repeat' are both optional, and MUST NOT occur more than once each, but if one occurs, so MUST the other. Use:- 0-1 for AUDIO, EMAIL and PROCEDURE, Use:- 0-n for DISPLAY
-    'attach': None, # Use:- O-n: which MUST point to a sound resource, which is rendered when the alarm is triggered for AUDIO, Use:- O-n: which are intended to be sent as message attachments for EMAIL, Use:- R-1:which MUST point to a procedure resource, which is invoked when the alarm is triggered for PROCEDURE.
-    'x-prop': None,
-    }
-
-    def export_cal(self, cr, uid, model, alarm_id, vevent, context=None):
-        """ Export Calendar
-            @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 model: Get Model's name
-            @param alarm_id: Get Alarm's Id
-            @param context: A standard dictionary for contextual values
-        """
-        valarm = vevent.add('valarm')
-        alarm_object = self.pool.get(model)
-        alarm_data = alarm_object.read(cr, uid, alarm_id, [])
-
-        # Compute trigger data
-        interval = alarm_data['trigger_interval']
-        occurs = alarm_data['trigger_occurs']
-        duration = (occurs == 'after' and alarm_data['trigger_duration']) \
-                                        or -(alarm_data['trigger_duration'])
-        related = alarm_data['trigger_related']
-        trigger = valarm.add('TRIGGER')
-        trigger.params['related'] = [related.upper()]
-        if interval == 'days':
-            delta = timedelta(days=duration)
-        if interval == 'hours':
-            delta = timedelta(hours=duration)
-        if interval == 'minutes':
-            delta = timedelta(minutes=duration)
-        trigger.value = delta
-
-        # Compute other details
-        valarm.add('DESCRIPTION').value = alarm_data['name'] or 'OpenERP'
-        valarm.add('ACTION').value = alarm_data['action']
-        return vevent
-
-    def import_cal(self, cr, uid, ical_data, context=None):
-        """ Import Calendar
-            @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 ical_data: Get calendar's Data
-            @param context: A standard dictionary for contextual values
-        """
-        if context is None:
-            context = {}
-        ctx = context.copy()
-        ctx.update({'model': context.get('model', None)})
-        self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, ctx)
-        for child in ical_data.getChildren():
-            if child.name.lower() == 'trigger':
-                if isinstance(child.value, timedelta):
-                    seconds = child.value.seconds
-                    days = child.value.days
-                    diff = (days * 86400) +  seconds
-                    interval = 'days'
-                    related = 'before'
-                elif isinstance(child.value, datetime):
-                    # TODO
-                    # remember, spec says this datetime is in UTC
-                    raise NotImplementedError("Cannot parse absolute triggers.")
-                if not seconds:
-                    duration = abs(days)
-                    related = days > 0 and 'after' or 'before'
-                elif (abs(diff) / 3600) == 0:
-                    duration = abs(diff / 60)
-                    interval = 'minutes'
-                    related = days >= 0 and 'after' or 'before'
-                else:
-                    duration = abs(diff / 3600)
-                    interval = 'hours'
-                    related = days >= 0 and 'after' or 'before'
-                self.ical_set('trigger_interval', interval, 'value')
-                self.ical_set('trigger_duration', duration, 'value')
-                self.ical_set('trigger_occurs', related.lower(), 'value')
-                if child.params:
-                    if child.params.get('related'):
-                        self.ical_set('trigger_related', child.params.get('related')[0].lower(), 'value')
-            else:
-                self.ical_set(child.name.lower(), child.value.lower(), 'value')
-        vals = map_data(cr, uid, self, context=context)
-        return vals
-
-Alarm()
-
-
-class Attendee(CalDAV, osv.osv_memory):
-    _name = 'basic.calendar.attendee'
-    _calname = 'attendee'
-
-    __attribute__ = {
-    'cutype': None, # Use: 0-1    Specify the type of calendar user specified by the property like "INDIVIDUAL"/"GROUP"/"RESOURCE"/"ROOM"/"UNKNOWN".
-    'member': None, # Use: 0-1    Specify the group or list membership of the calendar user specified by the property.
-    'role': None, # Use: 0-1    Specify the participation role for the calendar user specified by the property like "CHAIR"/"REQ-PARTICIPANT"/"OPT-PARTICIPANT"/"NON-PARTICIPANT"
-    'partstat': None, # Use: 0-1    Specify the participation status for the calendar user specified by the property. like use for VEVENT:- "NEEDS-ACTION"/"ACCEPTED"/"DECLINED"/"TENTATIVE"/"DELEGATED", use for VTODO:-"NEEDS-ACTION"/"ACCEPTED"/"DECLINED"/"TENTATIVE"/"DELEGATED"/"COMPLETED"/"IN-PROCESS" and use for VJOURNAL:- "NEEDS-ACTION"/"ACCEPTED"/"DECLINED".
-    'rsvp': None, # Use: 0-1    Specify whether there is an expectation of a favor of a reply from the calendar user specified by the property value like TRUE / FALSE.
-    'delegated-to': None, # Use: 0-1    Specify the calendar users to whom the calendar user specified by the property has delegated participation.
-    'delegated-from': None, # Use: 0-1    Specify the calendar users that have delegated their participation to the calendar user specified by the property.
-    'sent-by': None, # Use: 0-1    Specify the calendar user that is acting on behalf of the calendar user specified by the property.
-    'cn': None, # Use: 0-1    Specify the common name to be associated with the calendar user specified by the property.
-    'dir': None, # Use: 0-1    Specify reference to a directory entry associated with the calendar user specified by the property.
-    'language': None, # Use: 0-1    Specify the language for text values in a property or property parameter.
-    }
-
-    def import_cal(self, cr, uid, ical_data, context=None):
-        """ Import Calendar
-            @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 ical_data: Get calendar's Data
-            @param context: A standard dictionary for contextual values
-        """
-        if context is None:
-            context = {}
-        ctx = context.copy()
-        ctx.update({'model': context.get('model', None)})
-        self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, ctx)
-        for para in ical_data.params:
-            if para.lower() == 'cn':
-                self.ical_set(para.lower(), ical_data.params[para][0]+':'+ \
-                        ical_data.value, 'value')
-            else:
-                self.ical_set(para.lower(), ical_data.params[para][0].lower(), 'value')
-        if not ical_data.params.get('CN'):
-            self.ical_set('cn', ical_data.value, 'value')
-        vals = map_data(cr, uid, self, context=context)
-        return vals
-
-    def export_cal(self, cr, uid, model, attendee_ids, vevent, context=None):
-        """ Export Calendar
-            @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 model: Get model's name
-            @param attendee_ids: Get Attendee's Id
-            @param context: A standard dictionary for contextual values
-        """
-        if context is None:
-            context = {}
-        attendee_object = self.pool.get(model)
-        ctx = context.copy()
-        ctx.update({'model': model})
-        self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, ctx)
-        for attendee in attendee_object.read(cr, uid, attendee_ids, []):
-            attendee_add = vevent.add('attendee')
-            cn_val = ''
-            for a_key, a_val in self.__attribute__.items():
-                if attendee[a_val['field']] and a_val['field'] != 'cn':
-                    if a_val['type'] in ('text', 'char', 'selection'):
-                        attendee_add.params[a_key] = [str(attendee[a_val['field']])]
-                    elif a_val['type'] == 'boolean':
-                        attendee_add.params[a_key] = [str(attendee[a_val['field']])]
-                if a_val['field'] == 'cn' and attendee[a_val['field']]:
-                    cn_val = [str(attendee[a_val['field']])]
-                    if cn_val:
-                        attendee_add.params['CN'] = cn_val
-            if not attendee['email']:
-                attendee_add.value = 'MAILTO:'
-                #raise osv.except_osv(_('Error!'), _('Attendee must have an Email Id'))
-            elif attendee['email']:
-                attendee_add.value = 'MAILTO:' + attendee['email']
-        return vevent
-
-Attendee()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/calendar_collection.py b/addons/caldav/calendar_collection.py
deleted file mode 100644
index 3a5604b2f67..00000000000
--- a/addons/caldav/calendar_collection.py
+++ /dev/null
@@ -1,90 +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 _
-import caldav_node
-import logging
-_logger = logging.getLogger(__name__)
-
-class calendar_collection(osv.osv):
-    _inherit = 'document.directory' 
-    _columns = {
-        'calendar_collection' : fields.boolean('Calendar Collection'),
-        'calendar_ids': fields.one2many('basic.calendar', 'collection_id', 'Calendars'),
-    }
-    _default = {
-        'calendar_collection' : False,
-    }
-    
-    def _get_root_calendar_directory(self, cr, uid, context=None):
-        objid = self.pool.get('ir.model.data')
-        try:
-            mid = objid._get_id(cr, uid, 'document', 'dir_calendars')
-            if not mid:
-                return False
-            root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
-            root_cal_dir = self.browse(cr,uid, root_id, context=context) 
-            return root_cal_dir.name
-        except Exception:
-            _logger.warning('Cannot set root directory for Calendars:', exc_info=True)
-            return False
-        return False
-
-    def get_node_class(self, cr, uid, ids, dbro=None, dynamic=False, context=None):
-        if dbro is None:
-            dbro = self.browse(cr, uid, ids, context=context)
-
-        if dbro.calendar_collection:
-            if dynamic:
-                return caldav_node.node_calendar_res_col
-            else:
-                return caldav_node.node_calendar_collection
-        else:
-            return super(calendar_collection, self).\
-                    get_node_class(cr, uid, ids, dbro=dbro,dynamic=dynamic, 
-                                    context=context)
-
-    def get_description(self, cr, uid, ids, context=None):
-        #TODO : return description of all calendars
-        return False
-
-    def get_schedule_inbox_URL(self, cr, uid, ids, context=None):
-        calendar_obj = self.pool.get('basic.calendar')
-
-        calendar_ids = calendar_obj.search(cr, uid, [
-            ('user_id', '=', uid), ('collection_id', 'in', ids)
-            ], limit=1, context=context)
-
-        root_cal_dir = self._get_root_calendar_directory(cr, uid, context=context)
-        if not calendar_ids:
-            return root_cal_dir
-        calendar_id = calendar_ids[0]
-        calendar = calendar_obj.browse(cr, uid, calendar_id,
-                context=context)
-        return '%s/%s' %(root_cal_dir, calendar.name)
-
-    def get_schedule_outbox_URL(self, cr, uid, ids, context=None):
-        return self.get_schedule_inbox_URL(cr, uid, ids, context=context)
-    
-calendar_collection()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/doc/all.rst b/addons/caldav/doc/all.rst
deleted file mode 100644
index ab4a32c6f58..00000000000
--- a/addons/caldav/doc/all.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-==========================
-CalDAV How-To
-==========================
-
-
-As from OpenERP v6.0, document_webdav v2.2, the iPhone has been thoroughly
-tested and supported as a Calendaring client for the OpenERP CalDAV module.
-
-However, keep in mind that OpenERP is not a straightforward calendaring
-server, but an ERP application (with more data + structure) which exposes
-that data to calendar clients. That said, the full features that would be
-accessible through the Gtk or Web OpenERP clients cannot be crammed into
-the Calendar clients (such as the iPhone). 
-
-OpenERP server Setup
---------------------
-Some modules need to be installed at the OpenERP server. These are:
-    - caldav: Required, has the reference setup and the necessary
-            underlying code. Will also cause document, document_webdav
-            to be installed.
-    - crm_caldav: Optional, will export the CRM Meetings as a calendar.
-
-These will also install a reference setup of the folders, ready to go.
-The administrator of OpenERP can add more calendars and structure, if
-needed.
-
-DNS server setup
-------------------
-To be documented.
-
-SSL setup
-----------
-It is highly advisable that you also setup SSL to work for the OpenERP
-server. HTTPS is a server-wide feature in OpenERP, which means a 
-certificate will be set at the openerp-server.conf and will be the same
-for XML-RPC, HTTP, WebDAV and CalDAV.
-The iPhone also supports secure connections with SSL, although it does
-not expect a self-signed certificate (or one that is not verified by
-one of the "big" certificate authorities [1] ).
-
-
-[1] I remember one guy that made *lots* of money selling his CA business
-off, and since then uses this money to create a software monopoly.
-
-
-
-
diff --git a/addons/caldav/doc/android.rst b/addons/caldav/doc/android.rst
deleted file mode 100644
index 976ff9b4e27..00000000000
--- a/addons/caldav/doc/android.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-==================================
-Synchronization with Android phone
-==================================
-
-Prerequire
-----------
-There is no buit-in way to synchronize calendar with caldav.
-So you need to install a third part software : Calendar (CalDav) 
-for now it's the only one
-
-configuration
--------------
-
-1. Open Calendar Sync
-   I'll get an interface with 2 tabs
-   Stay on the first one
-   
-2. CaDAV Calendar URL : put the URL given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)
-
-3. Put your openerp username and password
-
-4. If your server don't use SSL, you'll get a warnign, say "Yes"
-
-5. Then you can synchronize manually or custom the settings to synchronize every x minutes.
-
-
-
diff --git a/addons/caldav/doc/caldav_doc.pdf b/addons/caldav/doc/caldav_doc.pdf
deleted file mode 100644
index a9f269aa273..00000000000
--- a/addons/caldav/doc/caldav_doc.pdf
+++ /dev/null
@@ -1,1899 +0,0 @@
-%PDF-1.3
-%���� ReportLab Generated PDF document http://www.reportlab.com
-% 'BasicFonts': class PDFDictionary 
-1 0 obj
-% The standard fonts dictionary
-<< /F1 2 0 R
- /F2 3 0 R
- /F3 4 0 R
- /F4 5 0 R >>
-endobj
-% 'F1': class PDFType1Font 
-2 0 obj
-% Font Helvetica
-<< /BaseFont /Helvetica
- /Encoding /WinAnsiEncoding
- /Name /F1
- /Subtype /Type1
- /Type /Font >>
-endobj
-% 'F2': class PDFType1Font 
-3 0 obj
-% Font Helvetica-Bold
-<< /BaseFont /Helvetica-Bold
- /Encoding /WinAnsiEncoding
- /Name /F2
- /Subtype /Type1
- /Type /Font >>
-endobj
-% 'F3': class PDFType1Font 
-4 0 obj
-% Font Times-Roman
-<< /BaseFont /Times-Roman
- /Encoding /WinAnsiEncoding
- /Name /F3
- /Subtype /Type1
- /Type /Font >>
-endobj
-% 'F4': class PDFType1Font 
-5 0 obj
-% Font Helvetica-Oblique
-<< /BaseFont /Helvetica-Oblique
- /Encoding /WinAnsiEncoding
- /Name /F4
- /Subtype /Type1
- /Type /Font >>
-endobj
-% 'Annot.NUMBER1': class PDFDictionary 
-6 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://openerp.com:8069/webdav/db_1/calendars/) >>
- /Border [ 0
- 0
- 0 ]
- /Rect [ 302.5236
- 129.5936
- 529.8027
- 141.5936 ]
- /Subtype /Link
- /Type /Annot >>
-endobj
-% 'Page1': class PDFPage 
-7 0 obj
-% Page dictionary
-<< /Annots [ 6 0 R ]
- /Contents 33 0 R
- /MediaBox [ 0
- 0
- 595.2756
- 841.8898 ]
- /Parent 32 0 R
- /Resources << /Font 1 0 R
- /ProcSet [ /PDF
- /Text
- /ImageB
- /ImageC
- /ImageI ] >>
- /Rotate 0
- /Trans <<  >>
- /Type /Page >>
-endobj
-% 'Annot.NUMBER2': class PDFDictionary 
-8 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://my.server.ip:8069/webdav/dbname/calendars/) >>
- /Border [ 0
- 0
- 0 ]
- /Rect [ 85.69291
- 663.5936
- 318.0229
- 675.5936 ]
- /Subtype /Link
- /Type /Annot >>
-endobj
-% 'Annot.NUMBER3': class PDFDictionary 
-9 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (https://my.server.ip:8071/) >>
- /Border [ 0
- 0
- 0 ]
- /Rect [ 92.69291
- 516.5936
- 208.6562
- 528.5936 ]
- /Subtype /Link
- /Type /Annot >>
-endobj
-% 'Annot.NUMBER4': class PDFDictionary 
-10 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings) >>
- /Border [ 0
- 0
- 0 ]
- /Rect [ 85.69291
- 294.5936
- 379.7229
- 306.5936 ]
- /Subtype /Link
- /Type /Annot >>
-endobj
-% 'Page2': class PDFPage 
-11 0 obj
-% Page dictionary
-<< /Annots [ 8 0 R
- 9 0 R
- 10 0 R ]
- /Contents 34 0 R
- /MediaBox [ 0
- 0
- 595.2756
- 841.8898 ]
- /Parent 32 0 R
- /Resources << /Font 1 0 R
- /ProcSet [ /PDF
- /Text
- /ImageB
- /ImageC
- /ImageI ] >>
- /Rotate 0
- /Trans <<  >>
- /Type /Page >>
-endobj
-% 'Annot.NUMBER5': class PDFDictionary 
-12 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings) >>
- /Border [ 0
- 0
- 0 ]
- /Rect [ 162.2528
- 690.5936
- 503.8577
- 702.5936 ]
- /Subtype /Link
- /Type /Annot >>
-endobj
-% 'Annot.NUMBER6': class PDFDictionary 
-13 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) >>
- /Border [ 0
- 0
- 0 ]
- /Rect [ 118.6929
- 678.5936
- 422.7329
- 690.5936 ]
- /Subtype /Link
- /Type /Annot >>
-endobj
-% 'Annot.NUMBER7': class PDFDictionary 
-14 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://www.mozilla.org/projects/calendar/lightning/) >>
- /Border [ 0
- 0
- 0 ]
- /Rect [ 62.69291
- 477.5936
- 282.2129
- 489.5936 ]
- /Subtype /Link
- /Type /Annot >>
-endobj
-% 'Annot.NUMBER8': class PDFDictionary 
-15 0 obj
-<< /A << /S /URI
- /Type /Action
- /URI (http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings) >>
- /Border [ 0
- 0
- 0 ]
- /Rect [ 85.69291
- 354.5936
- 379.7229
- 366.5936 ]
- /Subtype /Link
- /Type /Annot >>
-endobj
-% 'Page3': class PDFPage 
-16 0 obj
-% Page dictionary
-<< /Annots [ 12 0 R
- 13 0 R
- 14 0 R
- 15 0 R ]
- /Contents 35 0 R
- /MediaBox [ 0
- 0
- 595.2756
- 841.8898 ]
- /Parent 32 0 R
- /Resources << /Font 1 0 R
- /ProcSet [ /PDF
- /Text
- /ImageB
- /ImageC
- /ImageI ] >>
- /Rotate 0
- /Trans <<  >>
- /Type /Page >>
-endobj
-% 'R17': class PDFCatalog 
-17 0 obj
-% Document Root
-<< /Outlines 19 0 R
- /PageLabels 36 0 R
- /PageMode /UseNone
- /Pages 32 0 R
- /Type /Catalog >>
-endobj
-% 'R18': class PDFInfo 
-18 0 obj
-<< /Author ()
- /CreationDate (D:20110107162650-01'00')
- /Keywords ()
- /Producer (ReportLab http://www.reportlab.com)
- /Subject (\(unspecified\))
- /Title () >>
-endobj
-% 'R19': class PDFOutlines 
-19 0 obj
-<< /Count 15
- /First 20 0 R
- /Last 29 0 R
- /Type /Outlines >>
-endobj
-% 'Outline.0': class OutlineEntryObject 
-20 0 obj
-<< /Count 3
- /Dest [ 7 0 R
- /XYZ
- 62.69291
- 765.0236
- 0 ]
- /First 21 0 R
- /Last 23 0 R
- /Next 24 0 R
- /Parent 19 0 R
- /Title (CalDAV How-To) >>
-endobj
-% 'Outline.13.0': class OutlineEntryObject 
-21 0 obj
-<< /Dest [ 7 0 R
- /XYZ
- 62.69291
- 648.0236
- 0 ]
- /Next 22 0 R
- /Parent 20 0 R
- /Title (OpenERP server Setup) >>
-endobj
-% 'Outline.13.1': class OutlineEntryObject 
-22 0 obj
-<< /Dest [ 7 0 R
- /XYZ
- 62.69291
- 450.0236
- 0 ]
- /Next 23 0 R
- /Parent 20 0 R
- /Prev 21 0 R
- /Title (DNS server setup) >>
-endobj
-% 'Outline.13.2': class OutlineEntryObject 
-23 0 obj
-<< /Dest [ 7 0 R
- /XYZ
- 62.69291
- 402.0236
- 0 ]
- /Parent 20 0 R
- /Prev 22 0 R
- /Title (SSL setup) >>
-endobj
-% 'Outline.1': class OutlineEntryObject 
-24 0 obj
-<< /Dest [ 7 0 R
- /XYZ
- 62.69291
- 276.0236
- 0 ]
- /Next 25 0 R
- /Parent 19 0 R
- /Prev 20 0 R
- /Title (CalDAV with iPhone How-To) >>
-endobj
-% 'Outline.2': class OutlineEntryObject 
-25 0 obj
-<< /Count 2
- /Dest [ 11 0 R
- /XYZ
- 62.69291
- 459.0236
- 0 ]
- /First 26 0 R
- /Last 27 0 R
- /Next 28 0 R
- /Parent 19 0 R
- /Prev 24 0 R
- /Title (Synchronization with Android phone) >>
-endobj
-% 'Outline.14.0': class OutlineEntryObject 
-26 0 obj
-<< /Dest [ 11 0 R
- /XYZ
- 62.69291
- 426.0236
- 0 ]
- /Next 27 0 R
- /Parent 25 0 R
- /Title (Prerequire) >>
-endobj
-% 'Outline.14.1': class OutlineEntryObject 
-27 0 obj
-<< /Dest [ 11 0 R
- /XYZ
- 62.69291
- 366.0236
- 0 ]
- /Parent 25 0 R
- /Prev 26 0 R
- /Title (configuration) >>
-endobj
-% 'Outline.3': class OutlineEntryObject 
-28 0 obj
-<< /Dest [ 11 0 R
- /XYZ
- 62.69291
- 222.0236
- 0 ]
- /Next 29 0 R
- /Parent 19 0 R
- /Prev 25 0 R
- /Title (Synchronization with Evolution's calendar) >>
-endobj
-% 'Outline.4': class OutlineEntryObject 
-29 0 obj
-<< /Count 2
- /Dest [ 16 0 R
- /XYZ
- 62.69291
- 555.0236
- 0 ]
- /First 30 0 R
- /Last 31 0 R
- /Parent 19 0 R
- /Prev 28 0 R
- /Title (Synchronization with Sunbird/Lightning) >>
-endobj
-% 'Outline.15.0': class OutlineEntryObject 
-30 0 obj
-<< /Dest [ 16 0 R
- /XYZ
- 62.69291
- 522.0236
- 0 ]
- /Next 31 0 R
- /Parent 29 0 R
- /Title (Prerequire) >>
-endobj
-% 'Outline.15.1': class OutlineEntryObject 
-31 0 obj
-<< /Dest [ 16 0 R
- /XYZ
- 62.69291
- 462.0236
- 0 ]
- /Parent 29 0 R
- /Prev 30 0 R
- /Title (configuration) >>
-endobj
-% 'R32': class PDFPages 
-32 0 obj
-% page tree
-<< /Count 3
- /Kids [ 7 0 R
- 11 0 R
- 16 0 R ]
- /Type /Pages >>
-endobj
-% 'R33': class PDFStream 
-33 0 obj
-% page stream
-<< /Length 7905 >>
-stream
-1 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 744.0236 cm
-q
-BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (CalDAV How-To) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 714.0236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL .869213 Tw (As from OpenERP v6.0, document_webdav v2.2, the iPhone has been thoroughly tested and supported) Tj T* 0 Tw (as a Calendaring client for the OpenERP CalDAV module.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 660.0236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 40.82 Tm /F1 10 Tf 12 TL .312651 Tw (However, keep in mind that OpenERP is not a straightforward calendaring server, but an ERP application) Tj T* 0 Tw .814104 Tw (\(with more data + structure\) which exposes that data to calendar clients. That said, the full features that) Tj T* 0 Tw 1.645984 Tw (would be accessible through the Gtk or Web OpenERP clients cannot be crammed into the Calendar) Tj T* 0 Tw (clients \(such as the iPhone\).) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 630.0236 cm
-q
-BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (OpenERP server Setup) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 492.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 0 117 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F2 10 Tf 12 TL (Some modules need to be installed at the OpenERP server. These are:) Tj T* ET
-Q
-Q
-BT 1 0 0 1 0 104 Tm  T* ET
-q
-1 0 0 1 10 108 cm
-Q
-q
-1 0 0 1 10 108 cm
-Q
-q
-1 0 0 1 10 72 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 21 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 0 15 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F2 10 Tf 12 TL (caldav: Required, has the reference setup and the necessary) Tj T* ET
-Q
-Q
-BT 1 0 0 1 0 2 Tm  T* ET
-q
-1 0 0 1 10 0 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (underlying code. Will also cause document, document_webdav to be installed.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 10 72 cm
-Q
-q
-1 0 0 1 10 72 cm
-Q
-q
-1 0 0 1 10 54 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (crm_caldav: Optional, will export the CRM Meetings as a calendar.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 10 54 cm
-Q
-q
-1 0 0 1 10 54 cm
-Q
-q
-1 0 0 1 10 36 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (project_caldav: Optional, will export project tasks as calendar.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 10 36 cm
-Q
-q
-1 0 0 1 10 36 cm
-Q
-q
-1 0 0 1 10 0 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 21 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 0 15 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F2 10 Tf 12 TL (http_well_known: Optional, experimental. Will ease bootstrapping,) Tj T* ET
-Q
-Q
-BT 1 0 0 1 0 2 Tm  T* ET
-q
-1 0 0 1 10 0 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (but only when a DNS srv record is also used.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 10 0 cm
-Q
-q
-1 0 0 1 10 0 cm
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 462.0236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL 1.059986 Tw (These will also install a reference setup of the folders, ready to go. The administrator of OpenERP can) Tj T* 0 Tw (add more calendars and structure, if needed.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 432.0236 cm
-q
-BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (DNS server setup) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 414.0236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (To be documented.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 384.0236 cm
-q
-BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (SSL setup) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 318.0236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 52.82 Tm /F1 10 Tf 12 TL .909987 Tw (It is highly advisable that you also setup SSL to work for the OpenERP server. HTTPS is a server-wide) Tj T* 0 Tw .112339 Tw (feature in OpenERP, which means a certificate will be set at the openerp-server.conf and will be the same) Tj T* 0 Tw 1.645366 Tw (for XML-RPC, HTTP, WebDAV and CalDAV. The iPhone also supports secure connections with SSL,) Tj T* 0 Tw .017356 Tw (although it does not expect a self-signed certificate \(or one that is not verified by one of the "big" certificate) Tj T* 0 Tw (authorities [1] \).) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 288.0236 cm
-q
-BT 1 0 0 1 0 16.82 Tm 1.298935 Tw 12 TL /F1 10 Tf 0 0 0 rg ([1] I remember one guy that made ) Tj /F4 10 Tf (lots ) Tj /F1 10 Tf (of money selling his CA business off, and since then uses this) Tj T* 0 Tw (money to create a software monopoly.) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 255.0236 cm
-q
-BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (CalDAV with iPhone How-To) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 237.0236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (For SSL specific configuration see the documentation below) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 219.0236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Now, to setup the calendars, you need to:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 213.0236 cm
-Q
-q
-1 0 0 1 62.69291 213.0236 cm
-Q
-q
-1 0 0 1 62.69291 195.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (1.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Click on the "Settings" and go to the "Mail, Contacts, Calendars" page.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 195.0236 cm
-Q
-q
-1 0 0 1 62.69291 195.0236 cm
-Q
-q
-1 0 0 1 62.69291 177.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (2.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Go to "Add account...") Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 177.0236 cm
-Q
-q
-1 0 0 1 62.69291 177.0236 cm
-Q
-q
-1 0 0 1 62.69291 159.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (3.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Click on "Other") Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 159.0236 cm
-Q
-q
-1 0 0 1 62.69291 159.0236 cm
-Q
-q
-1 0 0 1 62.69291 141.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (4.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (From the "Calendars" group, select "Add CalDAV Account") Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 141.0236 cm
-Q
-q
-1 0 0 1 62.69291 141.0236 cm
-Q
-q
-1 0 0 1 62.69291 111.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 15 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (5.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-BT 1 0 0 1 0 16.82 Tm 4.929069 Tw 12 TL /F1 10 Tf 0 0 0 rg (Enter the host's name \(ie : if the url is ) Tj 0 0 .501961 rg (http://openerp.com:8069/webdav/db_1/calendars/ ) Tj 0 0 0 rg (,) Tj T* 0 Tw (openerp.com is the host\)) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 111.0236 cm
-Q
-q
-1 0 0 1 62.69291 111.0236 cm
-Q
-q
-1 0 0 1 62.69291 93.02362 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (6.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Fill Username and password with your openerp login and password) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 93.02362 cm
-Q
-q
-1 0 0 1 62.69291 93.02362 cm
-Q
- 
-endstream
-
-endobj
-% 'R34': class PDFStream 
-34 0 obj
-% page stream
-<< /Length 8788 >>
-stream
-1 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 747.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (7.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (As a description, you can either leave the server's name or something like "OpenERP calendars".) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 747.0236 cm
-Q
-q
-1 0 0 1 62.69291 747.0236 cm
-Q
-q
-1 0 0 1 62.69291 741.0236 cm
-Q
-q
-1 0 0 1 62.69291 741.0236 cm
-Q
-q
-1 0 0 1 62.69291 723.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (9.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (If you are not using a SSL server, you'll get an error, do not worry and push "Continue") Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 723.0236 cm
-Q
-q
-1 0 0 1 62.69291 723.0236 cm
-Q
-q
-1 0 0 1 62.69291 705.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL .1 0 Td (10.) Tj T* -0.1 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Then click to "Advanced Settings" to specify the right ports and paths.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 705.0236 cm
-Q
-q
-1 0 0 1 62.69291 705.0236 cm
-Q
-q
-1 0 0 1 62.69291 687.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL .1 0 Td (11.) Tj T* -0.1 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Specify the port for the OpenERP server: 8071 for SSL, 8069 without.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 687.0236 cm
-Q
-q
-1 0 0 1 62.69291 687.0236 cm
-Q
-q
-1 0 0 1 62.69291 657.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 15 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL .1 0 Td (12.) Tj T* -0.1 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-BT 1 0 0 1 0 16.82 Tm 1.059461 Tw 12 TL /F1 10 Tf 0 0 0 rg (Set the "Account URL" to the right path of the OpenERP webdav: the url given by the wizard \(ie :) Tj T* 0 Tw 0 0 .501961 rg (http://my.server.ip:8069/webdav/dbname/calendars/ ) Tj 0 0 0 rg (\)) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 657.0236 cm
-Q
-q
-1 0 0 1 62.69291 657.0236 cm
-Q
-q
-1 0 0 1 62.69291 651.0236 cm
-Q
-q
-1 0 0 1 62.69291 651.0236 cm
-Q
-q
-1 0 0 1 62.69291 621.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 15 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL .1 0 Td (11.) Tj T* -0.1 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL 1.14528 Tw (Click on Done. The phone will hopefully connect to the OpenERP server and verify it can use the) Tj T* 0 Tw (account.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 621.0236 cm
-Q
-q
-1 0 0 1 62.69291 621.0236 cm
-Q
-q
-1 0 0 1 62.69291 579.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 27 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL .1 0 Td (12.) Tj T* -0.1 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 28.82 Tm /F1 10 Tf 12 TL 1.036651 Tw (Go to the main menu of the iPhone and enter the Calendar application. Your OpenERP calendars) Tj T* 0 Tw .321235 Tw (will be visible inside the selection of the "Calendars" button. Note that when creating a new calendar) Tj T* 0 Tw (entry, you will have to specify which calendar it should be saved at.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 579.0236 cm
-Q
-q
-1 0 0 1 62.69291 579.0236 cm
-Q
-q
-1 0 0 1 62.69291 549.0236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL 1.121894 Tw (IF you need SSL \(and your certificate is not a verified one, as usual\), then you first will need to let the) Tj T* 0 Tw (iPhone trust that. Follow these steps:) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 543.0236 cm
-Q
-q
-1 0 0 1 62.69291 471.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-BT 1 0 0 1 0 2 Tm  T* ET
-q
-1 0 0 1 20 30 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 0 27 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F2 10 Tf 12 TL (s1. Open Safari and enter the https location of the OpenERP server:) Tj T* ET
-Q
-Q
-BT 1 0 0 1 0 14 Tm  T* ET
-q
-1 0 0 1 10 0 cm
-q
-BT 1 0 0 1 0 16.82 Tm .913314 Tw 12 TL /F1 10 Tf 0 0 .501961 rg (https://my.server.ip:8071/ ) Tj 0 0 0 rg (\(assuming you have the server at "my.server.ip" and the HTTPS port is) Tj T* 0 Tw (the default 8071\)) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 20 0 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 0 15 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F2 10 Tf 12 TL (s2. Safari will try to connect and issue a warning about the certificate) Tj T* ET
-Q
-Q
-BT 1 0 0 1 0 2 Tm  T* ET
-q
-1 0 0 1 10 0 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (used. Inspect the certificate and click "Accept" so that iPhone now trusts it.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 471.0236 cm
-Q
-q
-1 0 0 1 62.69291 438.0236 cm
-q
-BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (Synchronization with Android phone) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 408.0236 cm
-q
-BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (Prerequire) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 378.0236 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL .568409 Tw (There is no buit-in way to synchronize calendar with caldav. So you need to install a third part software :) Tj T* 0 Tw (Calendar \(CalDav\) for now it's the only one) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 348.0236 cm
-q
-BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (configuration) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 336.0236 cm
-Q
-q
-1 0 0 1 62.69291 336.0236 cm
-Q
-q
-1 0 0 1 62.69291 318.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (1.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Open Calendar Sync I'll get an interface with 2 tabs Stay on the first one) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 318.0236 cm
-Q
-q
-1 0 0 1 62.69291 318.0236 cm
-Q
-q
-1 0 0 1 62.69291 288.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 15 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (2.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-BT 1 0 0 1 0 16.82 Tm 20.95698 Tw 12 TL /F1 10 Tf 0 0 0 rg (CaDAV Calendar URL : put the URL given above \(ie :) Tj T* 0 Tw 0 0 .501961 rg (http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings) Tj 0 0 0 rg (\)) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 288.0236 cm
-Q
-q
-1 0 0 1 62.69291 288.0236 cm
-Q
-q
-1 0 0 1 62.69291 270.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (3.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Put your openerp username and password) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 270.0236 cm
-Q
-q
-1 0 0 1 62.69291 270.0236 cm
-Q
-q
-1 0 0 1 62.69291 252.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (4.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (If your server don't use SSL, you'll get a warnign, say "Yes") Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 252.0236 cm
-Q
-q
-1 0 0 1 62.69291 252.0236 cm
-Q
-q
-1 0 0 1 62.69291 234.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (5.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Then you can synchronize manually or custom the settings to synchronize every x minutes.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 234.0236 cm
-Q
-q
-1 0 0 1 62.69291 234.0236 cm
-Q
-q
-1 0 0 1 62.69291 201.0236 cm
-q
-BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (Synchronization with Evolution's calendar) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 189.0236 cm
-Q
-q
-1 0 0 1 62.69291 189.0236 cm
-Q
-q
-1 0 0 1 62.69291 171.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (1.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Go to Calendar View) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 171.0236 cm
-Q
-q
-1 0 0 1 62.69291 171.0236 cm
-Q
-q
-1 0 0 1 62.69291 153.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (2.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-BT 1 0 0 1 0 4.82 Tm 12 TL /F1 10 Tf 0 0 0 rg (File -) Tj (> New -) Tj (> Calendar) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 153.0236 cm
-Q
-q
-1 0 0 1 62.69291 153.0236 cm
-Q
- 
-endstream
-
-endobj
-% 'R35': class PDFStream 
-35 0 obj
-% page stream
-<< /Length 7419 >>
-stream
-1 0 0 1 0 0 cm BT /F1 12 Tf 14.4 TL ET
-q
-1 0 0 1 62.69291 603.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 147 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (3.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 0 141 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F2 10 Tf 12 TL (Fill the form) Tj T* ET
-Q
-Q
-BT 1 0 0 1 0 128 Tm  T* ET
-q
-1 0 0 1 10 132 cm
-Q
-q
-1 0 0 1 10 132 cm
-Q
-q
-1 0 0 1 10 114 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (type : CalDav) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 10 114 cm
-Q
-q
-1 0 0 1 10 114 cm
-Q
-q
-1 0 0 1 10 96 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (name : Whaterver you want \(ie : Meeting\)) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 10 96 cm
-Q
-q
-1 0 0 1 10 96 cm
-Q
-q
-1 0 0 1 10 54 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 27 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-BT 1 0 0 1 0 28.82 Tm 12.05494 Tw 12 TL /F1 10 Tf 0 0 0 rg (url : ) Tj 0 0 .501961 rg (http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings ) Tj 0 0 0 rg (\(ie :) Tj T* 0 Tw 2.623953 Tw 0 0 .501961 rg (http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) Tj 0 0 0 rg (\) the one given on the) Tj T* 0 Tw (top of this window) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 10 54 cm
-Q
-q
-1 0 0 1 10 54 cm
-Q
-q
-1 0 0 1 10 36 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (uncheck "User SSL") Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 10 36 cm
-Q
-q
-1 0 0 1 10 36 cm
-Q
-q
-1 0 0 1 10 18 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Username : Your username \(ie : Demo\)) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 10 18 cm
-Q
-q
-1 0 0 1 10 18 cm
-Q
-q
-1 0 0 1 10 0 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 10.5 0 Td (\177) Tj T* -10.5 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Refresh : everytime you want that evolution synchronize the data with the server) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 10 0 cm
-Q
-q
-1 0 0 1 10 0 cm
-Q
-q
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 603.0236 cm
-Q
-q
-1 0 0 1 62.69291 603.0236 cm
-Q
-q
-1 0 0 1 62.69291 585.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (4.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Click ok and give your openerp password) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 585.0236 cm
-Q
-q
-1 0 0 1 62.69291 585.0236 cm
-Q
-q
-1 0 0 1 62.69291 567.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (5.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (A new calendar named with the name you gave should appear on the left side.) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 567.0236 cm
-Q
-q
-1 0 0 1 62.69291 567.0236 cm
-Q
-q
-1 0 0 1 62.69291 534.0236 cm
-q
-BT 1 0 0 1 0 8.435 Tm 21 TL /F2 17.5 Tf 0 0 0 rg (Synchronization with Sunbird/Lightning) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 504.0236 cm
-q
-BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (Prerequire) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 474.0236 cm
-q
-BT 1 0 0 1 0 16.82 Tm 12.56998 Tw 12 TL /F1 10 Tf 0 0 0 rg (If you are using thunderbird, first you need to install the lightning module) Tj T* 0 Tw 0 0 .501961 rg (http://www.mozilla.org/projects/calendar/lightning/) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 444.0236 cm
-q
-BT 1 0 0 1 0 7.23 Tm 18 TL /F2 15 Tf 0 0 0 rg (configuration) Tj T* ET
-Q
-Q
-q
-1 0 0 1 62.69291 432.0236 cm
-Q
-q
-1 0 0 1 62.69291 432.0236 cm
-Q
-q
-1 0 0 1 62.69291 414.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (1.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Go to Calendar View) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 414.0236 cm
-Q
-q
-1 0 0 1 62.69291 414.0236 cm
-Q
-q
-1 0 0 1 62.69291 396.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (2.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-BT 1 0 0 1 0 4.82 Tm 12 TL /F1 10 Tf 0 0 0 rg (File -) Tj (> New Calendar) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 396.0236 cm
-Q
-q
-1 0 0 1 62.69291 396.0236 cm
-Q
-q
-1 0 0 1 62.69291 378.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (3.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Chosse "On the Network") Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 378.0236 cm
-Q
-q
-1 0 0 1 62.69291 378.0236 cm
-Q
-q
-1 0 0 1 62.69291 348.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 15 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (4.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-BT 1 0 0 1 0 16.82 Tm 13.06331 Tw 12 TL /F1 10 Tf 0 0 0 rg (for format choose CalDav and as location the url given above \(ie :) Tj T* 0 Tw 0 0 .501961 rg (http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings) Tj 0 0 0 rg (\)) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 348.0236 cm
-Q
-q
-1 0 0 1 62.69291 348.0236 cm
-Q
-q
-1 0 0 1 62.69291 330.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (5.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Choose a name and a color for the Calendar, and we advice you to uncheck "alarm") Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 330.0236 cm
-Q
-q
-1 0 0 1 62.69291 330.0236 cm
-Q
-q
-1 0 0 1 62.69291 300.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 15 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (6.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 16.82 Tm /F1 10 Tf 12 TL .23061 Tw (Then put your openerp login and password \(to give the password only check the box "Use password) Tj T* 0 Tw (Manager to remember this password") Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 300.0236 cm
-Q
-q
-1 0 0 1 62.69291 300.0236 cm
-Q
-q
-1 0 0 1 62.69291 282.0236 cm
-0 0 0 rg
-BT /F3 10 Tf 12 TL ET
-q
-1 0 0 1 6 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL 5.66 0 Td (7.) Tj T* -5.66 0 Td ET
-Q
-Q
-q
-1 0 0 1 23 3 cm
-q
-0 0 0 rg
-BT 1 0 0 1 0 4.82 Tm /F1 10 Tf 12 TL (Then Finish, your meetings should appear now in your calendar view) Tj T* ET
-Q
-Q
-q
-Q
-Q
-q
-1 0 0 1 62.69291 282.0236 cm
-Q
-q
-1 0 0 1 62.69291 282.0236 cm
-Q
- 
-endstream
-
-endobj
-% 'R36': class PDFPageLabels 
-36 0 obj
-% Document Root
-<< /Nums [ 0
- 37 0 R
- 1
- 38 0 R
- 2
- 39 0 R ] >>
-endobj
-% 'R37': class PDFPageLabel 
-37 0 obj
-% None
-<< /S /D
- /St 1 >>
-endobj
-% 'R38': class PDFPageLabel 
-38 0 obj
-% None
-<< /S /D
- /St 2 >>
-endobj
-% 'R39': class PDFPageLabel 
-39 0 obj
-% None
-<< /S /D
- /St 3 >>
-endobj
-xref
-0 40
-0000000000 65535 f
-0000000113 00000 n
-0000000245 00000 n
-0000000410 00000 n
-0000000585 00000 n
-0000000754 00000 n
-0000000947 00000 n
-0000001197 00000 n
-0000001510 00000 n
-0000001777 00000 n
-0000002021 00000 n
-0000002288 00000 n
-0000002619 00000 n
-0000002901 00000 n
-0000003185 00000 n
-0000003455 00000 n
-0000003722 00000 n
-0000004051 00000 n
-0000004210 00000 n
-0000004422 00000 n
-0000004548 00000 n
-0000004766 00000 n
-0000004949 00000 n
-0000005143 00000 n
-0000005312 00000 n
-0000005512 00000 n
-0000005767 00000 n
-0000005941 00000 n
-0000006115 00000 n
-0000006332 00000 n
-0000006576 00000 n
-0000006750 00000 n
-0000006908 00000 n
-0000007033 00000 n
-0000015039 00000 n
-0000023928 00000 n
-0000031452 00000 n
-0000031571 00000 n
-0000031648 00000 n
-0000031725 00000 n
-trailer
-<< /ID 
- % ReportLab generated PDF document -- digest (http://www.reportlab.com) 
- [(mv%4\225;\371K\301E+\242\376\216\356E) (mv%4\225;\371K\301E+\242\376\216\356E)] 
-
- /Info 18 0 R
- /Root 17 0 R
- /Size 40 >>
-startxref
-31772
-%%EOF
diff --git a/addons/caldav/doc/evolution.rst b/addons/caldav/doc/evolution.rst
deleted file mode 100644
index 11580ae02ef..00000000000
--- a/addons/caldav/doc/evolution.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-=========================================
-Synchronization with Evolution's calendar
-=========================================
-
-1. Go to Calendar View
-
-2. File -> New -> Calendar
-
-3. Fill the form 
-    - type : CalDav
-    - name : Whaterver you want (ie : Meeting)
-    - url : http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie :
-      http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) 
-      the one given on the top of this window
-    - uncheck "User SSL"
-    - Username : Your username (ie : Demo)
-    - Refresh : everytime you want that evolution synchronize the data with the server
-
-4. Click ok and give your openerp password
-
-5. A new calendar named with the name you gave should appear on the left side.
-
-
diff --git a/addons/caldav/doc/iPhone.rst b/addons/caldav/doc/iPhone.rst
deleted file mode 100644
index 62e66412d56..00000000000
--- a/addons/caldav/doc/iPhone.rst
+++ /dev/null
@@ -1,56 +0,0 @@
-==========================
-CalDAV with iPhone How-To
-==========================
-
-For SSL specific configuration see the documentation below
-
-Now, to setup the calendars, you need to:
-
-1. Click on the "Settings" and go to the "Mail, Contacts, Calendars" page.
-2. Go to "Add account..."
-3. Click on "Other"
-4. From the "Calendars" group, select "Add CalDAV Account"
-
-5. Enter the host's name 
-   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , openerp.com is the host)
-
-6. Fill Username and password with your openerp login and password
-
-7. As a description, you can either leave the server's name or
-   something like "OpenERP calendars".
-
-9. If you are not using a SSL server, you'll get an error, do not worry and push "Continue"
-
-10. Then click to "Advanced Settings" to specify the right
-    ports and paths. 
-    
-11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.
-
-12. Set the "Account URL" to the right path of the OpenERP webdav:
-    the url given by the wizard (ie : http://my.server.ip:8069/webdav/dbname/calendars/ )
-
-11. Click on Done. The phone will hopefully connect to the OpenERP server
-    and verify it can use the account.
-
-12. Go to the main menu of the iPhone and enter the Calendar application.
-    Your OpenERP calendars will be visible inside the selection of the
-    "Calendars" button.
-    Note that when creating a new calendar entry, you will have to specify
-    which calendar it should be saved at.
-
-
-
-IF you need SSL (and your certificate is not a verified one, as usual),
-then you first will need to let the iPhone trust that. Follow these
-steps:
-
-    s1. Open Safari and enter the https location of the OpenERP server:
-      https://my.server.ip:8071/
-      (assuming you have the server at "my.server.ip" and the HTTPS port
-      is the default 8071)
-    s2. Safari will try to connect and issue a warning about the certificate
-      used. Inspect the certificate and click "Accept" so that iPhone
-      now trusts it.
-
-
-
diff --git a/addons/caldav/doc/makefile b/addons/caldav/doc/makefile
deleted file mode 100644
index 4424647b08d..00000000000
--- a/addons/caldav/doc/makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-all: compile clean
-
-concat: all.rst
-	cat all.rst iPhone.rst android.rst evolution.rst sunbird.rst  > compile.rst
-    
-compile: concat
-	rst2pdf compile.rst -o caldav_doc.pdf 
-	
-debug: compile
-
-clean:
-	rm compile.rst 
-
-del: 
-	rm caldav_doc.pdf
diff --git a/addons/caldav/doc/path_discovery.rst b/addons/caldav/doc/path_discovery.rst
deleted file mode 100644
index d2d434b5fb6..00000000000
--- a/addons/caldav/doc/path_discovery.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-===============================
-Discovery of calendar resources
-===============================
-
-1. Srv record
---------------
-Calendar server and port should be advertised by a DNS _srv record. 
-Although this is beyond the capabilities of the OpenERP server, an
-example setup is listed below:
-    -- TODO --
-    
-DNS -> http://our-host-ip:port/
-
-2. Well-known uris
--------------------
-The OpenERP server may have the 'well-known URIs' servlet activated,
-which means that it will advertise its main database and the correct
-location of the main CalDAV resource.
-http://our-host-ip:port/.well-known/caldav -> http://our-host-ip:port/webdav/dbname/calendars/
-
-
-3. Caldav collection
----------------------
-The CalDAV "collection" is not necessarily a calendar or a folder just
-containing calendars under it. It is a DAV resource (aka folder) which
-has special DAV properties, so that clients are redirected to the right
-urls (like per-user calendars etc.).
-
-http://our-host-ip:port/webdav/dbname/calendars/ -> http://our-host-ip:port/webdav/dbname/calendars/users/user-login/c/
-
-4. Calendar home for user
---------------------------
-There can be one dynamic folder per user, which will in turn contain the calendars
-
-http://our-host-ip:port/webdav/dbname/calendars/users/user-login/c/ ->
-http://our-host-ip:port/webdav/dbname/calendars/users/user-login/c/[Meetings, Tasks]
-
-5. Calendars 
---------------
-Each calendar will contain the resource nodes:
-  .../c/Meetings/ -> .../c/Meetings/123.ics
-
-Principal url
diff --git a/addons/caldav/doc/sunbird.rst b/addons/caldav/doc/sunbird.rst
deleted file mode 100644
index 03af175eccc..00000000000
--- a/addons/caldav/doc/sunbird.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-======================================
-Synchronization with Sunbird/Lightning
-======================================
-
-Prerequire
-----------
-If you are using thunderbird, first you need to install the lightning module
-http://www.mozilla.org/projects/calendar/lightning/
-
-configuration
--------------
-
-1. Go to Calendar View
-
-2. File -> New Calendar
-
-3. Chosse "On the Network"
-
-4. for format choose CalDav
-   and as location the url given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)
-   
-5. Choose a name and a color for the Calendar, and we advice you to uncheck "alarm"
-
-6. Then put your openerp login and password (to give the password only check the box "Use password Manager to remember this password"
-
-7. Then Finish, your meetings should appear now in your calendar view
-
-
diff --git a/addons/caldav/i18n/ar.po b/addons/caldav/i18n/ar.po
deleted file mode 100644
index 12629b55991..00000000000
--- a/addons/caldav/i18n/ar.po
+++ /dev/null
@@ -1,1198 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:41+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "رسم خريطة للقيمة"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "عنوان الانترنت لخدمة caldav, استخدم للتزامن"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "اسم الملف"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "تصدير الحدث"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "ورّد الملف ics."
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "إ_غلاق"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "الحاضر"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "لا يمكن عمل الرسم البياني للحقل اكثر من مرة"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"يسمح لك\"الجدول الزمني\" بتخصيص حدث في الجدول الزمني ولعمل ميزة مع اي نموذج "
-"لـOpenERP . ومد وظيفي\r\n"
-"صا الجداول الزمنية iCal. يوفر الخادم Webdav الوصول بعيدًا للجدول الزمني. "
-"يساعدك في مزامنة الاجتماع مع الجداول الزمنية. يمكنك الوصول للجداول الزمنية "
-"بإستخدام عملاء CalDAV, مثل صن بيرد, تقييم الجدول الزمني, الموبايل."
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "تحذير !"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "كائن"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "قيد التنفيذ"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "نموذج تفضيلات المستخدم"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "خدمات"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "التعبير كما هو ثابت"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "تحول"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "تم"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr "الرجاء اعطاء ضبط مناسب من \"%s\" في خطوط الجدول الزمني"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "خدمة Caldav"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr "وقت التاريخ في UTC"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "قيد التنفيذ"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "صدر ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "استخدم الحقل"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "لا يمكن انشاء الخط \"%s\" اكثر من مرة"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "خطوط الجدول الزمني"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "إشتراك للحدث"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "استيراد ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "ال_غاء"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "حدث"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "مجموعة الجدول الزمني"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "خطأ ! لايمكنك إنشاء مسارات متداخلة."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_فتح"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr "التالي"
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "نوع"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Save in .ics format"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "خطأ !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "سمات الجدول الزمني"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "متصفح Caldav"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "هواتف أندرويد"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "تاريخ الإنشاء"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "رسم خريطة السمات"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "مسار"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "اعطي طريقة للتحكم في الجدول الزمني"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "نطاق"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "ا_شترِك"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "مالك"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "التقويم"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-"الرجاء قم بتثبيت بايثون-vobject من http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "تشكيل غير صالح من الملف ics, لا يمكن استيراد الملف"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "حقل  OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "تعريف النتيجة"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "رسالة..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "الجدول الزمني للويب"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "مجموعات الجدول الزمني"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "لا يمكن لاسم الملف نفسه ان يُطبق لتسجيلين!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "لا يمكن أن يكون المسار رئيسي لنفسه!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "التقويمات"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "مجموعة"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "كتابة التاريخ"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "اسم المسار يجب ان يكون فريدا !"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "تفضيلات المستخدم"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "من فضلك أدخل URL صحيح !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "صيغة"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "اختر ملف ICS"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "برامج / أجهزة"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "ارتباط الحقول"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr "أسم المضيف"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "معلومات أخرى"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "أخرى"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr "أجندتي"
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"كذلك صدر مدخل <الاسم>ics إلى جانب ملف السجل الزمني, مع محتوى WebCal ."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "وظيفة"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "وصف"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "يطبق الرسم البياني هذا للجدول الزمني/الخط."
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "رسم بياني"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "نجاح الإستيراد"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "ا_ستيراد"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "إستيراد حدث"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "فاصل زمني بالساعة"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "اسم الملف"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "الاشتراك في السجل الزمني المتباعد"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr "لدعم العملاء, لون مدخلات الجدول الزمني"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "الاسم"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "منبّه"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "يجب ان يكون للحاضرين تعريف للبريد الالكتروني"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "تصدير ملف ICS"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "خطأ ايراد vobject"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "حفظ ملف ICS"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "إضافات/صنبيرد"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "أمر"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "خطأ!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "لون"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "خاص بي"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "حقول التقويم"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "استيراد رسالة"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "اشترك"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "المسار يجب ان يكون له مسار رئيسي أو مخزن"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr "لدعم العملاء, الترتيب لهذا الملف بين السجلات الزمنية"
-
-#~ msgid "Select ICS file"
-#~ msgstr "اختر ملف ICS"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "اعطي طريقة للتحكم في الجدول الزمني"
-
-#~ msgid "Browse caldav"
-#~ msgstr "تصفح caldav"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "المتطلب\n"
-#~ "----------\n"
-#~ "إذا كنت تستخدم ثنبيرد، تحتاج أولا إلى تثبيت وحدة الإضاءة\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/~~V\n"
-#~ "\n"
-#~ "التكوين\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. انتقل إلى عرض الجدول الزمني\n"
-#~ "\n"
-#~ "2. ملف - السجل الزمني الجديد>\n"
-#~ "\n"
-#~ "3. اختار \"على شبكة\"\n"
-#~ "\n"
-#~ "4. لاختيار شكل CalDav\n"
-#~ "ومثل موقع رابط المذكور أعلاه (أي: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "5. اختيار اسم ولون من أجل الجدول الزمني، ونحن ننصحك بعدم اختيار \"الانذار\" "
-#~ "\n"
-#~ "\n"
-#~ "6. ثم ضع كلمة اسر والتسجيل للopenerp (لإعطاء كلمة السر تحقق فقط اختار في "
-#~ "مربع \"استخدم مدير كلمة السر ليتذكر كلمة السر هذه\"\n"
-#~ "\n"
-#~ "7. ثم انهي، ينبغي أن الاجتماعات الخاصة بك تظهر الآن عند عرض الجدول الزمني "
-#~ "الخاص بك\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  * خادم WebDAV الذي يوفر الوصول عن بعد للجدول الزمني\n"
-#~ "* التزامن للجدول الزمني باستخدام WebDAV\n"
-#~ "* تخصيص الاحداث للجدول الزمني TODO مع أي من نموذج OpenERP\n"
-#~ "* يوفر كال الاستيراد / التصدير وظيفيًا\n"
-#~ "\n"
-#~ "للوصول إلى تقويم باستخدام عملاء CalDAV، وأشر لهم:\n"
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "للوصول إلى OpenERP التقويم باستخدام بكال إلى موقع بعيد استخدام URL مثل:\n"
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "حيث،\n"
-#~ "اسم المضيف: المضيف الذي OpenERP الخادم (مع WebDAV) يعمل بنظام التشغيل\n"
-#~ "PORT: المنفذ الذي OpenERP الملقم قيد التشغيل (افتراضيا: 8069)\n"
-#~ "قاعدة البيانات_اسم: اسم قاعدة البيانات التي تم إنشاؤها OpenERP للجدول "
-#~ "الزمني\n"
-#~ "الجدول الزمني_اسم: اسم الجدول الزمني للوصول\n"
-#~ "     "
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "شارك الجدول الزمني بإستخدام CalDAV"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    من أجل تكوين معين SSL راجع الوثائق أدناه\n"
-#~ "\n"
-#~ "الآن، لإعداد والجداول الزمنية، وتحتاج إلى:\n"
-#~ "\n"
-#~ "1. انقر على \"إعدادات\" ثم انتقل إلى \"البريد وجهات الاتصال، الجداول "
-#~ "الزمنية\" صفحة.\n"
-#~ "2. انتقل إلى \"إضافة حساب ...\"\n"
-#~ "3. انقر على \"الآخر\"\n"
-#~ "4. من مجموعة \"الجدول الزمني\"، حدد \"إضافة حساب CalDAV\"\n"
-#~ "\n"
-#~ "5. أدخل اسم المضيف\n"
-#~ "(أي: إذا كان العنوان هو http://openerp.com:8069/webdav/db_1/calendars/، "
-#~ "openerp.com هو المضيف)\n"
-#~ "\n"
-#~ "6. ملء اسم المستخدم وكلمة السر مع تسجيل الدخول وكلمة السر openerp\n"
-#~ "\n"
-#~ "7. كما وصفا، يمكنك إما ترك اسم الملقم أو\n"
-#~ "شيء من هذا القبيل \"التقويمات OpenERP\".\n"
-#~ "\n"
-#~ "9. إذا كنت لا تستخدم ملقم SSL، وستحصل على خطأ، لا تقلق، ودفع \"متابعة\"\n"
-#~ "\n"
-#~ "10. ثم انقر على \"إعدادات متقدمة\" لتحديد حق\n"
-#~ "الموانئ والطرق.\n"
-#~ "\n"
-#~ "11. تحديد المنفذ لخادم OpenERP: 8071 ل SSL، 8069 من دون.\n"
-#~ "\n"
-#~ "12. تعيين \"URL الحساب\" على الطريق الصحيح للWEBDAV OpenERP:\n"
-#~ "رابط معين من قبل المعالج (أي: "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/)\n"
-#~ "\n"
-#~ "11. اضغط على القيام به. سيعمل الهاتف على الاتصال ونأمل إلى خادم OpenERP\n"
-#~ "وتحقق من أنه يمكن استخدام الحساب.\n"
-#~ "\n"
-#~ "12. انتقل إلى القائمة الرئيسية للآيفون وأدخل تطبيق الجدول الزمني.\n"
-#~ "سيكون لديك الجداول الزمنيةOpenERP تكون مرئية داخل اختيار الزر\n"
-#~ "\"الجدول الزمني\" \n"
-#~ "لاحظ أنه عند إنشاء إدخال لجدول زمني جديد، سيكون لديك لتحديد\n"
-#~ "والتي ينبغي حفظها في الجدول الزمني..\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "إذا كنت في حاجة SSL (والشهادة ليست واحدة التحقق منها، كما جرت العادة)،\n"
-#~ "بعد ذلك سوف تحتاج أولا للسماح للثقة فون التي. اتبع\n"
-#~ "الخطوات التالية:\n"
-#~ "\n"
-#~ "S1. افتح سفاري وأدخل الموقع الشبكي لخادم OpenERP:\n"
-#~ "https://my.server.ip:8071/\n"
-#~ "(على افتراض انك تملك الخادم في \"my.server.ip\" والمنفذ HTTPS\n"
-#~ "هو الافتراضي 8071)\n"
-#~ "S2. ورحلات السفاري في محاولة لربط واصدار تحذير حول الشهادة\n"
-#~ "المستخدمة. الاطلاع على شهادة وانقر على \"قبول\" بحيث فون\n"
-#~ "يثق الآن.   \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "المتطلب\n"
-#~ "----------\n"
-#~ "لا توجد وسيلة مبنية في المزامنة للجدول الزمني مع caldav.\n"
-#~ "لذلك تحتاج إلى تثبيت برامج الجزء الثالث: الجدول الزمني(CalDav)\n"
-#~ "حتى الآن هي واحدة فقط\n"
-#~ "\n"
-#~ "الضبط\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. افتح تزامن الجدول الزمني\n"
-#~ "سوف أحصل على واجهة مع 2 من علامات التبويب\n"
-#~ "البقاء على أول واحد\n"
-#~ "\n"
-#~ "2.الجدول الزمني CaDAV URL: ضع عنوان الموقع المذكور أعلاه (أي: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. ضع اسم المستخدم وكلمة السر لـ openerp الخاص بك\n"
-#~ "\n"
-#~ "4. إذا كان الخادم الخاص بك لا تستخدم SSL، ستحصل على تحذير، اختار \"نعم\"\n"
-#~ "\n"
-#~ "5. ثم يمكنك التزامن يدويًا او تخصيص الاعدادات لعمل التزامن لكل x دقائق.\n"
-#~ "    \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1. انتقل إلى عرض الجدول الزمني\n"
-#~ "\n"
-#~ "2. ملف -> جديد -> الجدول الزمني\n"
-#~ "\n"
-#~ "3. تعبئة النموذج\n"
-#~ "- النوع: CalDav\n"
-#~ "- الاسم: مهما تريد (أي: اجتماع)\n"
-#~ "- URL: http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (أي: "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) لل يعط "
-#~ "أحد على رأس هذه النافذة\n"
-#~ "- قم بإلغاء تحديد \"المستخدم SSL\"\n"
-#~ "- اسم المستخدم: اسم المستخدم الخاص بك (أي: تجريبي)\n"
-#~ "- تحديث: في كل مرة تريد أن تطور مزامنة البيانات مع الخادم\n"
-#~ "\n"
-#~ "4. انقر فوق موافق وتعطي كلمة السر openerp\n"
-#~ "\n"
-#~ "5. وينبغي أن يكون الجدول الزمني الجديد اسمه مع الاسم الذي أعطيته أن يظهر على "
-#~ "الجانب الأيسر.     \n"
-#~ "     "
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    يتضمن هذا النموذج الوظائف الأساسية للنظام caldav مثل:\n"
-#~ "- خادم WebDAV الذي يوفر الوصول عن بعد للجدول الزمني\n"
-#~ "- تزامن التقويم باستخدام WebDAV\n"
-#~ "- تخصيص الأحداث والسمة TODO مع أي من نموذج OpenERP\n"
-#~ "- يوفر كال الاستيراد / التصدير وظيفيًا\n"
-#~ "\n"
-#~ "للوصول إلى الجدول الزمني باستخدام عملاء CalDAV، وأشر لهم:\n"
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "للوصول إلى OpenERP التقويم باستخدام بكال إلى موقع بعيد استخدام URL مثل:\n"
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "حيث،\n"
-#~ "اسم المضيف: المضيف الذي OpenERP الخادم (مع WebDAV) يعمل بنظام التشغيل\n"
-#~ "المنفذ: المنفذ الذي OpenERP الملقم قيد التشغيل (افتراضيا: 8069)\n"
-#~ "قاعدة البيانات_اسم: اسم قاعدة البيانات التي تم انشاء الجدول الزمني OpenERP "
-#~ "عليها\n"
-#~ "الجدول الزمني_اسم: اسم الجدول الزمني للوصول إلى\n"
diff --git a/addons/caldav/i18n/bg.po b/addons/caldav/i18n/bg.po
deleted file mode 100644
index 1832b538424..00000000000
--- a/addons/caldav/i18n/bg.po
+++ /dev/null
@@ -1,819 +0,0 @@
-# Bulgarian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-03-21 11:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian <bg@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr ""
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Име на файл"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Затвори"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Участник"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Предупреждение!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Обект"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Да се направи"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Услуги"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "За довършване"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Внасяне на ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Отказ"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Събитие"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr ""
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Отваряне"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Тип"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Грешка!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Дата на създаване"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Директория"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Домейн"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Записване"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Собственик"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Календар"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Съобщение..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr ""
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "Директорията не може да наследява сама себе си!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Календари"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "Името на директорията трябва да бъде уникално"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Израз"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Свързване на полета"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Друга информация"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Друг"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Функция"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Описание"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Успешно импортиране"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Импортиране"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Импортиране на събитие"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Интервал в часове"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Име на файл"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Име"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Аларма"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Подреждане"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Грешка!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Цвят"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Полета в календар"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Импортиране на съобщение"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Записване"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
diff --git a/addons/caldav/i18n/ca.po b/addons/caldav/i18n/ca.po
deleted file mode 100644
index a808e55a7ae..00000000000
--- a/addons/caldav/i18n/ca.po
+++ /dev/null
@@ -1,1225 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:10+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Catalan <ca@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Relacions entre valors"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "URL del servidor CalDAV, utilitzat per a sincronització."
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Fitxer"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exporta esdeveniment"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Indica ruta del calendari remot"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importa fitxer .ics"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Tanca"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Assistent"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "No es pot relacionar un camp més d'una vegada"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"\"Calendaris\" et permeten personalitzar l'agenda d'esdeveniments i tot "
-"atribut amb qualsevol model d'OpenERP. Els Calendaris proporcionen "
-"funcionalitat d'Importació/Exportació iCal. El servidor Webdav proporciona "
-"accés remot al calendari. T'ajuda a sincronitzar calendaris de reunions amb "
-"els clients de calendari. Podeu accedir als calendaris utilitzant clients de "
-"CalDAV, com Sunbird, Avaluació del Calendari, Mòbil."
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Avís!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objecte"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Pendents"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Formulari de preferències de l'usuari"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Serveis"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Expressió com a constant"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolució"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "D'acord"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr "Indiqueu una configuració correcta de \"%s\" en línies de calendari"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Servidor CalDAV"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr "Data i hora en UTC"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "PENDENT"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exporta ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Utilitza el camp"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "No es pot crear la línia \"%s\" més d'una vegada"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Línies de calendari"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Subscriure esdeveniment"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importa un ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Canceŀla"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "base.calendari.esdeveniment"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Esdeveniment"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Col·lecció del calendari"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Error! No podeu crear directoris recursius."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Obre"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tipus"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Desa en format .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Error !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Atributs del calendari"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Exploració de CalDav"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Dispositiu basat en Android"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Data de creació"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Relacions entre atributs"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Directori"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Indica ruta del calendari remot"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domini"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Subscriure"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Propietari"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Calendari"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-"Instal·leu python-vobject des de http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Format de ics incorrecte, el fitxer no es pot importar"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "Camp d'OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "ID recurs"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Missatge..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Col·leccions de calendari"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "El mateix nom de fitxer no es pot associar a dos registres!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "El directori, no pot ser el seu propi pare!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Calendaris"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Col·lecció"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Data d'escriptura"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "El nom del directori ha de ser únic!"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Preferències de l'usuari"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Introduïu una URL correcta!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "base.calendari.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Expressió"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "base.calendari.assistència"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "base.calendari.àlies"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Selecciona fitxer ICS"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Software/Dispositius"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Mapa de camps"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "Mostra CalDAV"
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "base.calendari"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Altra info."
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Altres"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Exporta també una entrada .ics al costat de la carpeta del calendari, amb el "
-"contingut WebCal."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Funció"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Descripció"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "El calendari/línia a la qual aquesta relació es refereix."
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Relacions"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Importació satisfactòria"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importa"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Importa esdeveniment"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Interval en hores"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Nom fitxer"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Subscriu a calendari remot"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-"Per als clients que ho suportin, el color de les entrades del calendari"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nom"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarma"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "base.calendari.alarma"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Els assistents han de tenir un identificador de correu electrònic"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Exporta fitxer .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "Error d'importació vobject!"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Desa fitxer ICS"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Ordre"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Error!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Color"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "EL MEU"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Camps del calendari"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importa missatge"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Subscriure"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "El directori ha de tenir un pare o un emmagatzematge."
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "base.calendari.tot"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-"Per als clients que ho suportin, l'ordre d'aquesta carpeta entre els "
-"calendaris."
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Indica ruta del calendari remot"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Aquest mòdul conté la funcionalitat bàsica per a un sistema caldav com:\n"
-#~ "  - Servidor WebDAV que proporciona accés remot al calendari\n"
-#~ "  - Sincronització del calendari utilitzant WebDAV\n"
-#~ "  - Esdeveniment de calendari personalitzat i atribut tot (per fer) amb "
-#~ "qualsevol model d'OpenERP\n"
-#~ "  - Proporciona funcionalitat Importa/Exporta iCal\n"
-#~ "\n"
-#~ "    Per accedir a calendaris utilitzant clients CalDAV, introduïu en ells "
-#~ "l'adreça:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Per accedir al calendari OpenERP utilitzant WebCal a un lloc remot, "
-#~ "introduïu la URL així:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      On,\n"
-#~ "        HOSTNAME: Host on el servidor OpenERP (amb webdav) s'executa\n"
-#~ "        PORT : Port on el servidor OpenERP s'executa (per defecte: 8069)\n"
-#~ "        DATABASE_NAME: Nom de la base de dades on el calendari OpenERP s'ha "
-#~ "creat\n"
-#~ "        CALENDAR_NAME: Nom del calendari a accedir\n"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Selecciona fitxer ICS"
-
-#~ msgid "Browse caldav"
-#~ msgstr "Mostra CalDAV"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Comparteix calendari utilitzant CalDAV"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Prerequisit\n"
-#~ "------------\n"
-#~ "Si esteu utilitzant Thunderbird, primer heu d'instal·lar l'extensió "
-#~ "Lightning\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "(o instal·lar-la utilitzant Eines -> Complements)\n"
-#~ "\n"
-#~ "Configuració\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Ves a la vista Calendari\n"
-#~ "\n"
-#~ "2. Fitxer -> Nou calendari\n"
-#~ "\n"
-#~ "3. Seleccioneu \"A la xarxa\"\n"
-#~ "\n"
-#~ "4. Seleccioneu el format CalDAV\n"
-#~ "   i com a \"Ubicació\" la URL anterior (exemple: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Seleccioneu un nom i color per al calendari. Li aconsellem desmarcar "
-#~ "\"Mostra alarmes\"\n"
-#~ "\n"
-#~ "6. Després introduïu el seu nom d'usuari i contrasenya d'OpenERP (per "
-#~ "introduir la contrasenya marqueu l'opció \"Utilitza l'administrador de "
-#~ "contrasenyes per recordar aquesta contrasenya\")\n"
-#~ "\n"
-#~ "7. Després Finalitzar, les seves reunions haurien d'aparèixer ara en la "
-#~ "vista de calendari\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  * Servidor WebDAV que proporciona accés remot al calendari\n"
-#~ "  * Sincronització del calendari utilitzant WebDAV\n"
-#~ "  * Personalitza esdeveniments del calendari i atributs de les tasques amb "
-#~ "qualsevol mòdul d'OpenERP\n"
-#~ "  * Proporciona funcionalitat d'Importació/Exportació iCal\n"
-#~ "\n"
-#~ "    Per accedir a calendaris utilitzant clients CalDAV, apunteu-los a:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Per accedir al calendari d'OpenERP utilitzant WebCal en el lloc remot "
-#~ "utilitzeu la URL com:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      On,\n"
-#~ "        HOSTNAME: Host en el qual s'està executant el servidor OpenERP (amb "
-#~ "WebDAV)\n"
-#~ "        PORT: Port en el qual s'està executant el servidor OpenERP (per "
-#~ "defecte: 8069)\n"
-#~ "        DATABASE_NAME: Nom de la base de dades en la qual està el Calendari "
-#~ "d'OpenERP\n"
-#~ "        CALENDAR_NAME: Nom del calendari a accedir\n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1. Ves a la vista de Calendari\n"
-#~ "\n"
-#~ "    2. Fitxer -> Nou -> Calendari\n"
-#~ "\n"
-#~ "    3. Ompliu el formulari\n"
-#~ "        - Tipus: CalDAV\n"
-#~ "        - Nom: El que desitgeu (ex: Reunions)\n"
-#~ "        - URL: "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ex: "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) mostrat "
-#~ "en la part superior d'aquesta finestra\n"
-#~ "        - Desmarqueu \"Utilitza SSL\"\n"
-#~ "        - Usuari: El seu nom d'usuari (ex: Demo)\n"
-#~ "        - Actualitza: Període amb el qual voleu que Evolution sincronitzi "
-#~ "les dades amb el servidor\n"
-#~ "\n"
-#~ "    4. Feu clic sobre Accepta i ingresseu la seva contrasenya d'OpenERP\n"
-#~ "\n"
-#~ "    5. Un nou calendari CalDAV amb el nom que vareu ingressar ha d'aparèixer "
-#~ "en el costat esquerre.     \n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Per a la configuració específica de SSL mireu la documentació a "
-#~ "continuació\n"
-#~ "\n"
-#~ "Ara, per configurar el calendari, és necessari:\n"
-#~ "\n"
-#~ "1. Feu clic sobre \"Configuració\" i ves a la pàgina \"Correu, Contactes, "
-#~ "Calendaris\"\n"
-#~ "2. Ves a \"Agrega compte...\"\n"
-#~ "3. Feu clic sobre \"Altres\"\n"
-#~ "4. Des del grup \"Calendaris\" seleccioneu \"Agrega Compte CalDAV\"\n"
-#~ "5. Ingresseu el nom del host \n"
-#~ "   (ex: si l'URL és http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com és el host)\n"
-#~ "\n"
-#~ "6. Empleneu Usuari i Contrasenya amb el seu usuari i contrasenya d'OpenERP\n"
-#~ "\n"
-#~ "7. Com a Descripció, podeu deixar el nom del servidor o\n"
-#~ "   alguna cosa així com \"Calendaris OpenERP\".\n"
-#~ "\n"
-#~ "8. Si no esteu utilitzant un servidor SSL, obtindreu un error, no es "
-#~ "preocupeu i premeu a \"Continua\"\n"
-#~ "\n"
-#~ "9. A continuació, feu clic en \"Configuració avançada\" per especificar els\n"
-#~ "    ports i rutes correctes\n"
-#~ "    \n"
-#~ "10. Especifiqueu el port per al servidor OpenERP: 8071 per SSL, 8069 sense "
-#~ "SSL.\n"
-#~ "\n"
-#~ "11. Configureu el \"Compte URL\" a la ruta correcta del WebDAV OpenERP:\n"
-#~ "    la URL proposada per l'assistent (ex: "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/)\n"
-#~ "\n"
-#~ "\n"
-#~ "12. Feu clic en Fet. El telèfon es connectarà amb el servidor OpenERP\n"
-#~ "    i comprovareu que podeu utilitzar el compte.\n"
-#~ "\n"
-#~ "13. Ves al menú principal de l'iPhone i ingresseu a l'aplicació Calendari.\n"
-#~ "    Els seus calendaris d'OpenERP seran visibles dins de la selecció del\n"
-#~ "    botó \"Calendaris\".\n"
-#~ "    Noteu que en crear una nova entrada de calendari, haureu d'especificar\n"
-#~ "    en quin calendari ha de desar-se.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Si necessiteu SSL (i el vostre certificat no està verificat, com és usual),\n"
-#~ "primer haureu de dir-li a l'iPhone que confiï en ell. Seguiu aquests\n"
-#~ "passos:\n"
-#~ "\n"
-#~ "    s1. Obriu Safari i ingresseu l'ubicació HTTPS del servidor OpenERP:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assumint que teniu el servidor en \"my.server.ip\" i el port HTTPS\n"
-#~ "      és el valor per defecte 8071)\n"
-#~ "    s2. Safari intentarà connectar-se i emetrà un advertiment sobre el "
-#~ "certificat\n"
-#~ "      utilitzat. Inspeccioneu el certificat i feu clic a \"Accepta\" perquè "
-#~ "l'iPhone\n"
-#~ "      confieu en ell.   \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Prerequisit\n"
-#~ "----------\n"
-#~ "No hi ha forma interna de sincronitzar el calendari amb CalDAV\n"
-#~ "Així que cal instal·lar programari de tercers: Calendari (CalDav)\n"
-#~ "ara per ara és l'única forma\n"
-#~ "\n"
-#~ "Configuració\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Obriu Calendar Sync\n"
-#~ "   Obtindreu una interfície amb 2 pestanyes\n"
-#~ "   Quedeu-vos en la primera\n"
-#~ "   \n"
-#~ "2. URL del Calendari CalDAV: Ingresseu la URL donada a dalt (ex: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Ingresseu el seu nom d'usuari i contrasenya d'OpenERP\n"
-#~ "\n"
-#~ "4. Si el servidor no utilitza SSL, rebreu un avís, respongueu \"Si\"\n"
-#~ "\n"
-#~ "5. Ara podeu sincronitzar manualment o personalitzar la configuració per "
-#~ "sincronitzar cada x minuts.\n"
-#~ "    \n"
-#~ "    "
diff --git a/addons/caldav/i18n/caldav.pot b/addons/caldav/i18n/caldav.pot
deleted file mode 100644
index cdfd0be1490..00000000000
--- a/addons/caldav/i18n/caldav.pot
+++ /dev/null
@@ -1,786 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* caldav
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+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: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr ""
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid "\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid "\"Calendars\" allow you to Customize calendar event and todo attribute with any of OpenERP model.Caledars provide iCal Import/Export functionality.Webdav server that provides remote access to calendar.Help You to synchronize Meeting with Calendars client.You can access Calendars using CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid "\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr ""
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr ""
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr ""
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr ""
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid "\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL like:\n"
-"        http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid "\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck \"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-""
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid "Also export a <name>.ics entry next to the calendar folder, with WebCal content."
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid "\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-
diff --git a/addons/caldav/i18n/da.po b/addons/caldav/i18n/da.po
deleted file mode 100644
index aa94070caf1..00000000000
--- a/addons/caldav/i18n/da.po
+++ /dev/null
@@ -1,819 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-27 08:43+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr ""
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr ""
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr ""
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr ""
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr ""
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
diff --git a/addons/caldav/i18n/de.po b/addons/caldav/i18n/de.po
deleted file mode 100644
index 11197e6096c..00000000000
--- a/addons/caldav/i18n/de.po
+++ /dev/null
@@ -1,1415 +0,0 @@
-# German 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:28+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Mapping Felder"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "URL für caldav Servers zur Datensynchronisation"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"Vorbereitung\n"
-"-------------------\n"
-"In OpenERP funktioniert die  integrierte Kalendersynchronisation per CalDAV "
-"nicht auf Knopfdruck .\n"
-"Sie müssen mindestens zusätzlich folgende Anwendung auf Ihrem System "
-"installieren: \n"
-"Kalender (CalDAV).\n"
-"\n"
-"\n"
-"Konfiguration\n"
-"-----------------\n"
-"\n"
-"1. Starte Kalender Synchronisation\n"
-"    Sie befinden sich in einem Fester mit 2 Aktenreitern\n"
-"    Bleiben Sie auf dem ersten Reiter.\n"
-"\n"
-"2. CaDAV Kalender URL: Geben Sie die o.a. URL ein (zum Beispiel: "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Geben Sie Ihren openerp Benutzernamen und das Passwort ein\n"
-"\n"
-"4. Wenn Ihr Server nicht SSL verwendet, erhalten Sie eine Warnung, die Sie "
-"mit \"Ja\" bestätigen können\n"
-"\n"
-"5. Dann können Sie entweder manuell synchronisieren oder Einstellungen "
-"vornehmen, um alle x Minuten zu synchronisieren.\n"
-"\n"
-"    "
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Dateiname"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exportiere Terminiere"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Erfassen Sie den Pfad für Remote Kalender"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importiere .ics Datei"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "Beenden"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Teilnehmer"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "Das Feld kann nur einmal zugewiesen werden."
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"\"Kalender\" ermöglicht zu jedem OpenERP Model ein Kalenderereignis oder "
-"eine Aufgabe zu definieren.\r\n"
-"iCal Import/Expott Funktionalität.\r\n"
-"WebDav ermölǵlicht externen Web Zugriff. \r\n"
-"CalDav ermöglicht den Zugriff mit externen Programmen wie Sunbird.\r\n"
-"Synchronisierung"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Warnung !"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objekt"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Zu erledigen"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Benutzereigenschaften"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Dienstleistungen"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Ausdruck als Konstante"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolution"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "OK"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-"\n"
-"    1. Wechseln Sie zur Kalenderansicht\n"
-"\n"
-"    2. Datei -> Neu -> Kalender\n"
-"\n"
-"    3. Füllen Sie das Formular aus:\n"
-"        - Typ: CalDav\n"
-"        - Bezeichnung: Geben Sie hier Ihre Bezeichnung ein (z.B. Termine)\n"
-"        - URL: "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (z.B. "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings), siehe "
-"oben im Fenster\n"
-"        - Deaktivieren Sie \"Benutzer SSL\"\n"
-"        - Benutzername: Ihr Benutzername (z.B. Demo)\n"
-"        - Aktualisieren: Jedesmal wenn Sie möchten, dass evolution die Daten "
-"mit dem Server synchronisiert.\n"
-"\n"
-"    4. Klicken Sie auf OK und geben Sie das openerp Passwort ein\n"
-"\n"
-"    5. Ein neuer Kalender mit dem von Ihnen angegebenen Namen sollte auf der "
-"linken Seite erscheinen.\n"
-"     "
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-"Bitte erstellen Sie eine korrekte Konfiguration für \"%s\" in den Terminen."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr "Caldav Server Name Konfiguration"
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "CalDav Server"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr "Datum und Zeit in UTC"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "Offen"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exportiere .ics"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Benutze dieses Feld"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "Kann die Position \"%s\" nicht mehr als einmal erzeugen"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr "Webcal Kalendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Kalenderzeilen"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Einschreiben Event"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Import .ics"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "Abbrechen"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Termin"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Gemeinsame Kalender"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Fehler! Sie können keine rekursiven Ordner erzeugen."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Öffnen"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr "Folgende"
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Typ"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Speichern in .ics Format"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Fehler !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Kalender Merkmale"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Caldav durchsuchen"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Android OS Gerät"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr "Konfigurieren Sie Ihren OpenERP Servernamen. Zum Beispiel : "
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Datum erstellt"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Merkmale Zuordnung"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Verzeichnis"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Gebe Pfad an zum Remote Kalender"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domain"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "Abonnieren"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Besitzer"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Kalender"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-"Bitte installieren Sie python-vobject von "
-"http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-"Ungültiges Format der .ics Datei. Diese Datei kann nicht importiert werden."
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "OpenObject Feld"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "Ressource"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Nachricht..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Gemeinsame Kalender"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-"Der gleiche Dateiname kann kann nicht für zwei Einträge gleichzeitig gelten"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "Das Verzeichnis kann nicht sich selbst übergeordnet werden"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Kalender"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Verzeichnis"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Bearbeitet am"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-"\n"
-"  * Webdav Server bietet Ihnen Remote Access zum Kalender\n"
-"  * Synchronisation von Kalenderdaten durch WebDav Anwendung\n"
-"  * Personalisieren Sie Termin und Aufgaben Attribute der Kalender "
-"abgestimmt zum OpenERP Modul\n"
-"  * Bietet ical Import / Export Funktion\n"
-"\n"
-"Um auf Kalender mit CalDAV-Anwendungen zuzugreifen, geben Sie die folgende "
-"Verbindung ein:\n"
-"         "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"     Um OpenERP Kalender mit WebCal anzubinden, geben Sie auf der Remote "
-"Seite diese URL ein:\n"
-"         "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"       wobei folgendes gilt:\n"
-"         HOSTNAME: Host, auf dem der OpenERP Server (mit WebDAV) läuft\n"
-"         Port: Port, auf dem OpenERP Server läuft (standardmäßig: 8069)\n"
-"         DATABASE_NAME: Name der Datenbank, auf der OpenERP Kalender "
-"erstellt wird\n"
-"     "
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "Das Verzeichnis muss eindeutig sein"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Benutzer Eigenschaften"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Bitte definieren Sie eine existierende URL"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Ausdruck"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Wähle .ics Datei"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Software/Geräte"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Mapping Felder"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-"\n"
-"Vorbereitung\n"
-"-------------------\n"
-"Wenn Sie Thunderbird benutzen, sollten Sie zuerst die Lightning Extension "
-"installieren\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"Konfiguration\n"
-"-------------------\n"
-"\n"
-"1. Gehen Sie zur Kalender Anzeige\n"
-"\n"
-"2. Datei -> Neuer Kalender\n"
-"\n"
-"3. Wählen Sie  \"im Netzwerk\"\n"
-"\n"
-"4. Wählen Sie CalDAV als Format\n"
-"    und als Standort geben Sie die oben angegebenen URL ein (d.h.: "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Wählen Sie eine Bezeichnung und eine beliebige Farbe für den Kalender, "
-"und wir empfehlen Ihnen \"Alarm\" zu deaktivieren\n"
-"\n"
-"6. Dann geben Sie Ihre openerp Benutzer Login und Passwortdaten ein (um das "
-"Passwort zu merken aktivieren Sie das Kontrollkästchen \"Password Manager "
-"anwenden, um dieses Passwort zu speichern\"\n"
-"\n"
-"7. Dann auf den Button Fertig stellen klicken, wodurch Sie Ihre Meetings in "
-"Ihrer Kalenderansicht sehen sollten\n"
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "Caldav durchsuchen"
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr "Servername"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Weitere Info"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Anderes Gerät"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr "Mein(e) Kalender"
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Exportiere zusätzlich einen <Name>.ics Eintrag mit WebCal Inhalt in das "
-"Kalender Verzeichnis."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Funktion"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Beschreibung"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "Der Kalender / Eintrag zu dem die Zuordnung gehört"
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Zuordnung"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Import erfolgreich"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "Import"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Importiere Termin"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervalle in Stunden"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Datei Name"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Abonniere Remote Kalender"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-"Für Clients die dieses unterstützen, die Anzeige der Farbe für Termine im "
-"Kalender"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Name"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Benachrichtigung"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Teilnehmer muss EMail Addresse haben"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Exportiere .ics Datei"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "vobject Importfehler!"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Speichern .ics Datei"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-"\n"
-"    Die spezifische Dokumentation zur  SSL-Konfiguration finden Sie hier\n"
-"\n"
-"Um Kalender einzurichten, gehen Sie wie folgt vor:\n"
-"\n"
-"1. Klicken Sie auf die \"Einstellungen\" und gehen Sie zur \"Mail, Kontakte, "
-"Kalender\" Seite.\n"
-"2. Gehen Sie auf \"Konto hinzufügen ...\"\n"
-"3. Klicken Sie auf \"Andere\"\n"
-"4. Aus der \"Kalender\"-Gruppe, wählen Sie \"CalDAV Konto hinzufügen\"\n"
-"\n"
-"5. Geben Sie die Bezeichnung des Hosts ein\n"
-"    (dh: wenn die URL http://openerp.com:8069/webdav/db_1/calendars/ ist "
-"openerp.com der Host)\n"
-"\n"
-"6. Tragen Sie Ihren Benutzernamen und Passwort für OpenERP ein\n"
-"\n"
-"7. Das Feld Beschreibung können Sie entweder offen lassen, oder den Namen "
-"des Servers oder\n"
-"    z.B. \"OpenERP Kalender\" eingeben.\n"
-"\n"
-"9. Wenn Sie keinen SSL-Server einsetzen, erhalten Sie eine Fehlermeldung, "
-"den Sie einfach durch Klick auf \"Weiter\" übergehen können, \n"
-"\n"
-"10. Dann klicken Sie auf \"Erweiterte Einstellungen\" , um die richtigen "
-"Adressen und Ports zu erfassen.\n"
-"\n"
-"11. Geben Sie den Port für den OpenERP Server ein: 8071 für SSL, 8069 ohne.\n"
-"\n"
-"12. Stellen Sie die \"URL\" auf die rechtige Adresse für OpenERP WebDAV "
-"ein:\n"
-"     Korrekt ist die vom Assistenten angezeigte Adresse (z.B.: "
-"http://my.server.ip:8069/webdav/dbname/calendars/)\n"
-"\n"
-"11. Klicken Sie auf Fertig. Die mobile Anwendung wird dann hoffentlich eine "
-"Verbindung zum OpenERP Server\n"
-"     bekommen, damit Sie dieses Konto prüfen und  verwenden können.\n"
-"\n"
-"12. Gehen Sie zum Hauptmenü, z.B.  des iPhone und öffnen Sie die Kalender-"
-"Anwendung.\n"
-"     Ihre OpenERP Kalender sollten innerhalb der Auswahl nach Klick auf "
-"die\"Kalender\"-Taste\n"
-"     erscheinen.\n"
-"     Beachten Sie, dass Sie beim Erstellen eines neuen Kalender-Eintrags, "
-"angeben werden muss,\n"
-"     in welchen Kalender der Termin gespeichert werden soll.\n"
-"\n"
-"Wenn Sie SSL nutzen (und Ihr Zertifikat ist wie oftmals nicht verifiziert), "
-"dann müssen Sie als Erstes Ihrem iPhone \n"
-"erlauben, eine Verbindung trotzdem herzustellen. Folgen Sie diesen "
-"Schritten:\n"
-"\n"
-"     1. Öffnen Sie Safari und geben Sie den Speicherort des OpenERP HTTPS-"
-"Server ein:\n"
-"       https://my.server.ip:8071/\n"
-"       (vorausgesetzt, Sie haben den Server auf \"my.server.ip\" und den "
-"HTTPS-Port\n"
-"       ist der Standard Port 8071)\n"
-"     2. Safari wird versuchen, eine Verbindung zu bekommen und eine Warnung "
-"bezgl des Zertifikats\n"
-"       ausgeben. Überprüfen Sie das Zertifikat aus und klicken Sie "
-"\"Akzeptieren\", so dass das iPhone\n"
-"       diese URL Adresse als vertrauenswürdig betrachtet .\n"
-"    "
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Auftrag"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Fehler!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Farbe"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "MJ"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Kalender Dateien"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importiere Nachricht"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Abonnieren"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-"Das Verzeichnis muss ein Hauptverzeichnis oder einen Speicher zugewiesen "
-"haben"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-"Für Kalender die dieses unterstützen, die Reihenfolge bei der Ansicht"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Das Objekt muss mit einem x_ beginnen und darf keine Sonderzeichen "
-#~ "beinhalten !"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Erfassen Sie den Pfad für Remote Kalender"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Gemeinsame Kalender mit WebDav"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Wähle .ics Datei"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Dieses Modul beinhaltet die Basisfunktionen für ein caldav "
-#~ "Kalendersystem:  \n"
-#~ "  - WebDav Server, für den Remote Zugriff auf einen Kalender\n"
-#~ "  - Synchronisation von Kalendern durch CalDav Nutzung\n"
-#~ "  - Individuelle Konfiguration der Attribute Termin und Aufgabe für alle "
-#~ "OpenERP Objekte\n"
-#~ "  - Bereitstellung von ical Import/Export Funktionalität\n"
-#~ "\n"
-#~ "    Für einen Zugriff auf Kalender durch CalDav fähige Anwendungen, "
-#~ "verwenden Sie folgende Adresse:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Für einen Remote Zugriff auf OpenERP Kalender via WebCal verwenden Sie "
-#~ "folgendes Adressmuster:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      wobei folgendes gilt:\n"
-#~ "        HOSTNAME: Host auf dem der OpenERP Server (mit WebDav) läuft\n"
-#~ "        PORT: Port auf dem der OpenERP Server läuft (Standard: 8069)\n"
-#~ "        DATABASE_NAME: Name der Datenbank mit dem erstellten OpenERP "
-#~ "Kalender\n"
-#~ "        CALENDAR_NAME: Name des Kalenders, der verbunden werden soll\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Erforderliche Vorbereitungen\n"
-#~ "----------------------------------------\n"
-#~ "Wenn Sie Thunderbird benutzen, müssen Sie zuerst dort das Lightning Kalender "
-#~ "Plugin installieren\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "Konfiguration\n"
-#~ "-------------------\n"
-#~ "\n"
-#~ "1. Gehen Sie zur Kalenderansicht\n"
-#~ "\n"
-#~ "2. Datei -> Neuer Kalender\n"
-#~ "\n"
-#~ "3. Wählen Sie \"Im Netzwerk\"\n"
-#~ "\n"
-#~ "4. Wählen Sie als Format CalDav\n"
-#~ "   und als URL nach dem obigen Muster (z.B. "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Wählen Sie einen Namen und eine Farbe für den Kalender, wir empfehlen "
-#~ "außerdem die Benachrichtung zu deaktivieren.\n"
-#~ "\n"
-#~ "6. Dann geben Sie die OpenERP Anmeldedaten an (aktivieren Sie \"Benutze "
-#~ "Passwort Manager zur Speicherung der Anmeldung\")\n"
-#~ "\n"
-#~ "7. Abschließend beenden Sie des Assistenten, damit Ihre Termine in der "
-#~ "Kalenderansicht erscheinen\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  * WEBDAV Server ermöglichen einen Remote Zugriff auf Kalender.\n"
-#~ "  * Eine Synchronisation von Terminkalendern erfolgt durch den Einsatz von "
-#~ "WEBDAV\n"
-#~ "  * Konfigurieren Sie die Attribute von Terminen und Aufgaben innerhalb der "
-#~ "OpenERP Anwendungen\n"
-#~ "  * Möglichkeit einer Anwendung von ical Import/Export Funktionen\n"
-#~ "\n"
-#~ "    Um Kalender über CalDav Clients zu nutzen, geben Sie dort folgendes "
-#~ "Adressmuster an:\n"
-#~ "        http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/\n"
-#~ "    Um OpenERP Kalender durch WebCal remote anzubinden, verwenden Sie "
-#~ "folgendes URL Adressmuster:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "        Wobei folgendes gilt:\n"
-#~ "        HOSTNAME: Host auf dem der OpenERP Server (mit webdav) läuft\n"
-#~ "        PORT : Port auf dem der OpenERP Server läuft (Standard : 8069)\n"
-#~ "        DATABASE_NAME: Datenbank auf der ein OpenERP Kalender erzeugt wurde\n"
-#~ "        CALENDAR_NAME: Bezeichnung des Kalenders\n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Für eine SSL spezifische Konfiguration lesen Sie bitte die folgenden "
-#~ "Ausführungen:\n"
-#~ "\n"
-#~ "Für das Setup Ihres Kalenders benötigen Sie folgende Schritte:\n"
-#~ "\n"
-#~ "1. Klicken Sie auf  \"Konfiguration\" und wechseln Sie zur \"EMail, "
-#~ "Kontakte, Kalender\" Seite.\n"
-#~ "\n"
-#~ "2. Gehen Sie zu  \"Hinzufügen Benutzer Account\"\n"
-#~ "\n"
-#~ "3. Klicken Sie auf \"Weitere\"\n"
-#~ "\n"
-#~ "4. Über die  \"Kalender\" Gruppe klicken Sie auf: \"Hinzufügen CalDAV "
-#~ "Konto\"\n"
-#~ "\n"
-#~ "5. Geben Sie die Adresse des Hosts ein\n"
-#~ "   (z.B. : url ist http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com ist der Host)\n"
-#~ "\n"
-#~ "6. Tragen Sie  die OpenERP Anmeldedaten ein\n"
-#~ "\n"
-#~ "7. Als Beschreibung können Sie entweder den Servernamen belassen oder\n"
-#~ "   Sie verwenden eine Bezeichnung wie \"OpenERP Kalender\".\n"
-#~ "\n"
-#~ "9. Wenn Sie keinen SSL Server verwenden, erhalten Sie einen Fehler, den Sie "
-#~ "vernachlässigen können und auf \"Weiter\" klicken.\n"
-#~ "\n"
-#~ "10. Dann klicken Sie auf \"Erweiterte Konfiguration\" und spezifizieren dir "
-#~ "richtigen Ports und Pfade. \n"
-#~ "    \n"
-#~ "11. Spezifizieren Sie die korrekten Ports für den OpenERP Server: 8071 für "
-#~ "SSL, 8069 ohne SSL.\n"
-#~ "\n"
-#~ "12. Tragen Sie die \"Amelde URL\" für den richtigen Pfad zu OpenERP CalDav "
-#~ "ein:\n"
-#~ "    Die URL (ie : http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "13. Klicken Sie auf \"Erledigt\". Das iphone wird sich dann hoffentlich mit "
-#~ "dem OpenERP Server verbinden lassen\n"
-#~ "    und prüfen, ob es das angegebene Benutzerkonto verwenden darf.\n"
-#~ "\n"
-#~ "\n"
-#~ "14. Wechseln Sie zum  iPhone and erfassen Sie die Kalender Anwendung.\n"
-#~ "    Ihre OpenERP Kalender werden immer durch Klick auf den \"Kalender\" "
-#~ "Button sichtbar\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Beachten Sie, dass Sie bei der Erstellung von Terminen immer auswählen, "
-#~ "in welchen Kalender\n"
-#~ "    gespeichert werden soll.\n"
-#~ "\n"
-#~ "Wenn Sie SSL benötigen (und Ihr Zertifikat ist kein verfifiziertes "
-#~ "Zertifikat, welches oftmals der Fall ist),\n"
-#~ "müssen Sie zuerst dafür sorgen, dass Ihr iphone das Zertifikat trotzdem als "
-#~ "vertrauenswürdig akzeptiert.\n"
-#~ "Folgen Sie hierzu den folgenden Schritten:\n"
-#~ "\n"
-#~ "    Schritt 1: Öffnen Sie den Safari Browser und geben Sie ide https "
-#~ "Verbindung zu Ihrem OpenERP Server ein:\n"
-#~ "        https://my.server.ip:8071/\n"
-#~ "        (unter der Annahme, dass Ihr Server unter \"my.server.ip\" "
-#~ "erreichbar ist und der HTTPS Port des\n"
-#~ "         Servers dem Standard 8071 entspricht)\n"
-#~ "    Schritt 2: Safari wird einen Verbindungsversuch unternehmen und einen "
-#~ "Warnhinweis zum Zertifkat\n"
-#~ "        ausgeben. Prüfen Sie Ihr Zertifikat und klicken Sie auf "
-#~ "\"Vertrauen\", damit das iphone das Zertifikat\n"
-#~ "        als vertrauenswürdig annimmt.   \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1. Gehen Sie zur Kalenderansicht\n"
-#~ "\n"
-#~ "    2. Datei -> Neu -> Kalender\n"
-#~ "\n"
-#~ "    3. Füllen Sie das Formular aus:\n"
-#~ "        - Typ : CalDav\n"
-#~ "        - Bezeichnugn : Ihre freie Wahl (z.B. : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (z.B. : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings), den Pfad "
-#~ "finden Sie im Kopfbereich dieses Fensters\n"
-#~ "        - Deaktivieren Sie \"User SSL\"\n"
-#~ "        - Benutzer : Ihr Benutzername (z.B. : Demo)\n"
-#~ "        - Aktualisierung : Jedesmal, wenn Sie die Daten der "
-#~ "Kalenderanwendung mit dem Server synchronisieren wollen.\n"
-#~ "\n"
-#~ "    4. Klicken Sie OK und geben Sie die OpenERP Anmeldedaten ein\n"
-#~ "\n"
-#~ "    5. Ein neuer Kalender, mit der von Ihnen hinterlegten Bezeichnung sollte "
-#~ "jetzt auf der linken Seite erscheinen.     \n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Vorbereitungen\n"
-#~ "----------------------\n"
-#~ "\n"
-#~ "Es existiert kein allgemeingültiger Weg für eine OpenERP - CalDAV "
-#~ "Kalendersynchronisation.\n"
-#~ "Insofern müssen Sie zunächst eine  Drittanwendung installieren: Calendar "
-#~ "(CalDav)  \n"
-#~ "Aktuell ist dieses die einzige Möglichkeit.\n"
-#~ "\n"
-#~ "Konfiguration\n"
-#~ "-------------------\n"
-#~ "\n"
-#~ "1. Öffnen Sie Calendar Syn\n"
-#~ "     Sie erhalten eine Anwendung mit 2 Aktenreitern\n"
-#~ "     Verbleiben Sie auf dem ersten Reiter\n"
-#~ "   \n"
-#~ "2. CalDav Calendar URL: Tragen Sie die obige URL ein (z.B.  "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Tragen Sie den OpenERP Benutzer und das Passwort ein\n"
-#~ "\n"
-#~ "4. Wenn Ihr Server kein SSL unterstützt, erhalten Sie eine Warnmeldung, die "
-#~ "Sie mit \"Ja\" bestätigen.\n"
-#~ "\n"
-#~ "5. Dann synchronisieren Sie manuell oder konfigurieren Sie eine automatische "
-#~ "Synchronisation, die alle x Minuten startet.\n"
-#~ "    \n"
-#~ "    "
-
-#~ msgid "Browse caldav"
-#~ msgstr "Caldav durchsuchen"
diff --git a/addons/caldav/i18n/el.po b/addons/caldav/i18n/el.po
deleted file mode 100644
index 002114c9c04..00000000000
--- a/addons/caldav/i18n/el.po
+++ /dev/null
@@ -1,822 +0,0 @@
-# Greek 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:56+0000\n"
-"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr ""
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Όνομα αρχείου"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Εξαγωγή Γεγονότος"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Εισαγωγή ics. αρχείου"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Κλείσιμο"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Συμμετέχοντας"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Προειδοποίηση!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Αντικείμενο"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "ΟΚ"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "TODO"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Εξαγωγή ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Χρησιμοποίησε το πεδίο"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Γραμμές Ημερολογίου"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Εισαγωγή ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Άκυρο"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Συμβάν"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr ""
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Σφάλμα! Δεν μπορείτε να δημιουργήσετε επαναλαμβανόμενους φακέλλους."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Τύπος"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Αποθήκευση σε .ics μορφή"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Σφάλμα!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Κατάλογος"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Τομέας"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Συνδρομή"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Κάτοχος"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Ημερολόγιο"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr ""
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Ημερολόγια"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Συλλογή"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "Αυτό το όνομα διαδρομής πρέπει να είναι μοναδικό"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Έκφραση"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Επιλογή"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Άλλες πληροφορίες"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Λειτουργία"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Περιγραφή"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Αντιστοίχηση"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Εισαγωγή"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Εισαγωγή Συμβάν"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Όνομα αρχείου"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Σφάλμα!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-
-#~ msgid "Select ICS file"
-#~ msgstr "Επιλογή"
diff --git a/addons/caldav/i18n/es.po b/addons/caldav/i18n/es.po
deleted file mode 100644
index d5c1a72818d..00000000000
--- a/addons/caldav/i18n/es.po
+++ /dev/null
@@ -1,1227 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:34+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Relaciones entre valores"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "URL del servidor CalDAV, utilizado para sincronización."
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Nombre del fichero"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exportar evento"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Indicar ruta del calendario remoto"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importar fichero .ics"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Cerrar"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Asistente"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "No se puede relacionar un campo más de una vez"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"\"Calendarios\" te permiten personalizar agenda de eventos y todo atributo "
-"con cualquier modelo de OpenERP. Los Calendarios proporcionan funcionalidad "
-"de Importación/Exportación iCal. El servidor Webdav proporciona acceso "
-"remoto al calendario. Te ayuda a sincronizar calendarios de reuniones con "
-"los clientes de calendario. Puedes acceder a los calendarios usando clientes "
-"de CalDAV, como Sunbird, Evaluación del Calendario, Móvil."
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "¡Aviso!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objeto"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Por hacer"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Formulario de preferencias del usuario"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Servicios"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Expresión como constante"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolución"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr "Indique una configuración correcta de \"%s\" en líneas de calendario"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Servidor CalDAV"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr "Fecha y hora en UTC"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "PENDIENTE"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exportar ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Usar el campo"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "No se puede crear la línea \"%s\" más de una vez"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Líneas de calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Suscribir evento"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importar ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "base.calendario.evento"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Evento"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Colección del calendario"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "¡Error! No puede crear directorios recursivos."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Abrir"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Guardar en formato .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Atributos del calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Exploración de CalDAV"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Dispositivo basado en Android"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Fecha de creación"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Relaciones entre atributos"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Directorio"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Indicar ruta del calendario remoto"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Dominio"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Suscribir"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Propietario"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr "Instale python-vobject desde http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Formato de ics incorrecto, el fichero no se puede importar"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "Campo de OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "ID recurso"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Mensaje..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Colecciones de calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "¡El mismo nombre de fichero no se puede asociar a dos registros!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "¡El directorio no puede ser su propio padre!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Calendarios"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Colección"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Fecha escritura"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "¡El nombre de directorio debe ser único!"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Preferencias del usuario"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "¡Introduza una URL correcta!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "base.calendario.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Expresión"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "base.calendario.asistencia"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "base.calendario.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Seleccionar fichero ICS"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Software/Dispositivos"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Relaciones entre campos"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "Mostrar CalDAV"
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "base.calendario"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Otra información"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Otros"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Exportar también una entrada <nombre>.ics junto a la carpeta del calendario, "
-"con el contenido WebCal."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Función"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "El calendario/línea a la que esta relación se refiere."
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Relaciones"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Importación exitosa"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Importar evento"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervalo en horas"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Nombre del fichero"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Suscribir a calendario remoto"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-"Para clientes que lo soporten, el color de las entradas del calendario"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarma"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "base.calendario.alarma"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Los asistentes deben tener un identificador de correo electrónico"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Exportar fichero .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "¡Error de importación vobject!"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Guardar fichero ICS"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Orden"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Color"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "MI"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Campos del calendario"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importar mensaje"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Suscribir"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "El directorio debe tener un padre o un almacenamiento."
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "base.calendario.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-"Para clientes que lo soporten, el orden de esta carpeta entre los "
-"calendarios."
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Indicar ruta del calendario remoto"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Seleccionar fichero ICS"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Compartir calendario usando CalDAV"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Este módulo contiene la funcionalidad básica para un sistema caldav "
-#~ "como:  \n"
-#~ "  - Servidor WebDAV que proporciona acceso remoto al calendario\n"
-#~ "  - Sincronización del calendario utilizando WebDAV\n"
-#~ "  - Evento de calendario personalizado y atributo todo (por hacer) con "
-#~ "cualquier modelo de OpenERP\n"
-#~ "  - Proporciona funcionalidad Importar/Exportar iCal\n"
-#~ "\n"
-#~ "    Para acceder a calendarios usando clientes CalDAV, introduzca en ellos "
-#~ "la dirección:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Para acceder al calendario OpenERP usando WebCal a un sitio remoto, "
-#~ "introduzca la URL así:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Donde,\n"
-#~ "        HOSTNAME: Host donde el servidor OpenERP (con webdav) se ejecuta\n"
-#~ "        PORT : Puerto donde el servidor OpenERP se ejecuta (por defecto: "
-#~ "8069)\n"
-#~ "        DATABASE_NAME: Nombre de la base de datos donde el calendario "
-#~ "OpenERP se ha creado\n"
-#~ "        CALENDAR_NAME: Nombre del calendario a acceder\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Prerequisito\n"
-#~ "------------\n"
-#~ "Si está usando Thunderbird, primero debe instalar la extensión Lightning\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "(o instalarla usando Herramientas -> Complementos)\n"
-#~ "\n"
-#~ "Configuración\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Ir a la vista Calendario\n"
-#~ "\n"
-#~ "2. Archivo -> Nuevo calendario\n"
-#~ "\n"
-#~ "3. Seleccionar \"En la red\"\n"
-#~ "\n"
-#~ "4. Seleccionar el formato CalDAV\n"
-#~ "   y como \"Ubicación\" la URL anterior (ejemplo: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Seleccionar un nombre y color para el calendario. Le aconsejamos "
-#~ "desmarcar \"Mostrar alarmas\"\n"
-#~ "\n"
-#~ "6. Luego introduzca su nombre de usuario y contraseña de OpenERP (para "
-#~ "introducir la contraseña marque la opción \"Utilizar el administrador de "
-#~ "contraseñas para recordar esta contraseña\")\n"
-#~ "\n"
-#~ "7. Luego Finalizar, sus reuniones deberían aparecer ahora en la vista de "
-#~ "calendario\n"
-
-#~ msgid "Browse caldav"
-#~ msgstr "Mostrar CalDAV"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  * Servidor WebDAV que proporciona acceso remoto al calendario\n"
-#~ "  * Sincronización del calendario usando WebDAV\n"
-#~ "  * Personaliza eventos del calendario y atributos de las tareas con "
-#~ "cualquier módulo de OpenERP\n"
-#~ "  * Proporciona funcionalidad de Importación/Exportación iCal\n"
-#~ "\n"
-#~ "    Para acceder a Calendarios usando clientes CalDAV, apúntelos a:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Para acceder al Calendario de OpenERP usando WebCal al sitio remoto use "
-#~ "la URL como:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Donde,\n"
-#~ "        HOSTNAME: Host en el que se está ejecutando el servidor OpenERP (con "
-#~ "WebDAV)\n"
-#~ "        PORT: Puerto en el que se está ejecutando el servidor OpenERP (por "
-#~ "defecto: 8069)\n"
-#~ "        DATABASE_NAME: Nombre de la base de datos en la que está el "
-#~ "Calendario de OpenERP\n"
-#~ "        CALENDAR_NAME: Nombre del calendario a acceder\n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1. Ir a la vista de Calendario\n"
-#~ "\n"
-#~ "    2. Archivo -> Nuevo -> Calendario\n"
-#~ "\n"
-#~ "    3. Llene el formulario \n"
-#~ "        - Tipo: CalDAV\n"
-#~ "        - Nombre: El que desee (ejm: Reuniones)\n"
-#~ "        - URL: "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ejm: "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) mostrado "
-#~ "en la parte superior de esta ventana\n"
-#~ "        - Desmarque \"Usar SSL\"\n"
-#~ "        - Usuario: Su nombre de usuario (ejm: Demo)\n"
-#~ "        - Actualizar: Período con el que quiere que Evolution sincronice los "
-#~ "datos con el servidor\n"
-#~ "\n"
-#~ "    4. Haga clic sobre Aceptar e ingrese su contraseña de OpenERP\n"
-#~ "\n"
-#~ "    5. Un nuevo calendario CalDAV con el nombre que usted ingresó debe "
-#~ "aparecer en el lado izquierdo.     \n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Prerequisito\n"
-#~ "----------\n"
-#~ "No hay forma interna de sincronizar el calendario con CalDAV\n"
-#~ "Así que hay que instalar software de terceros: Calendario (CalDav) \n"
-#~ "por ahora es la única forma\n"
-#~ "\n"
-#~ "Configuración\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Abra Calendar Sync\n"
-#~ "   Obtendrá un interfaz con 2 pestañas\n"
-#~ "   Permanezca en la primera\n"
-#~ "   \n"
-#~ "2. URL del Calendario CalDAV: Ingrese la URL dada arriba (ejm: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Ingrese su nombre de usuario y contraseña de OpenERP\n"
-#~ "\n"
-#~ "4. Si su servidor no usa SSL, recibirá un aviso, responda \"Si\"\n"
-#~ "\n"
-#~ "5. Ahora puede sincronizar manualmente o personalizar la configuración "
-#~ "parasincronizar cada x minutos.\n"
-#~ "    \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Para la configuración específica de SSL vea la documentación a "
-#~ "continuación\n"
-#~ "\n"
-#~ "Ahora, para configurar el calendario, es necesario:\n"
-#~ "\n"
-#~ "1. Haga clic sobre \"Configuración\" y vaya a la página \"Correo, Contactos, "
-#~ "Calendarios\"\n"
-#~ "2. Vaya a \"Agregar cuenta...\"\n"
-#~ "3. Haga clic sobre \"Otras\"\n"
-#~ "4. Desde el grupo \"Calendarios\" seleccione \"Agregar Cuenta CalDAV\"\n"
-#~ "5. Ingrese el nombre del host \n"
-#~ "   (ejm: si el URL es http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com es el host)\n"
-#~ "\n"
-#~ "6. Llene Usuario y Contraseña con su usuario y contraseña de OpenERP\n"
-#~ "\n"
-#~ "7. Como Descripción, puede dejar el nombre del servidor o\n"
-#~ "    algo así como \"Calendarios OpenERP\".\n"
-#~ "\n"
-#~ "8. Si no está usando un servidor SSL, obtendrá un error, no se preocupe y "
-#~ "pulse en \"Continuar\"\n"
-#~ "\n"
-#~ "9. A continuación, haga clic en \"Configuración avanzada\" para especificar "
-#~ "los\n"
-#~ "    puertos y rutas correctos\n"
-#~ "    \n"
-#~ "10. Especifique el puerto para el servidor OpenERP: 8071 para SSL, 8069 sin "
-#~ "SSL.\n"
-#~ "\n"
-#~ "11. Configure la \"Cuenta URL\" a la ruta correcta del WebDAV OpenERP:\n"
-#~ "    la URL propuesta por el asistente (ejm: "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/)\n"
-#~ "\n"
-#~ "12. Haga clic en Hecho. El teléfono se conectará con el servidor OpenERP\n"
-#~ "    y comprobará que puede utilizar la cuenta.\n"
-#~ "\n"
-#~ "13. Vaya al menú principal del iPhone e ingrese a la aplicación Calendario.\n"
-#~ "    Sus calendarios de OpenERP serán visibles dentro de la selección del\n"
-#~ "    botón \"Calendarios\".\n"
-#~ "    Note que al crear una nueva entrada de calendario, tendrá que "
-#~ "especificar\n"
-#~ "    en qué calendario debe guardarse.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Si usted necesita SSL (y su certificado no está verificado, como es usual),\n"
-#~ "primero tendrá que decirle al iPhone que confíe en él. Siga estos\n"
-#~ "pasos:\n"
-#~ "\n"
-#~ "    s1. Abra Safari e ingrese la ubicación HTTPS del servidor OpenERP:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (asumiendo que tiene el servidor en \"my.server.ip\" y el puerto "
-#~ "HTTPS\n"
-#~ "      es el valor por defecto 8071)\n"
-#~ "    s2. Safari intentará conectarse y emitirá una advertencia sobre el "
-#~ "certificado\n"
-#~ "      utilizado. Inspeccione el certificado y haga clic en \"Aceptar\" para "
-#~ "que el iPhone\n"
-#~ "      confíe en él.   \n"
-#~ "    "
diff --git a/addons/caldav/i18n/es_CR.po b/addons/caldav/i18n/es_CR.po
deleted file mode 100644
index 0d4b50add6b..00000000000
--- a/addons/caldav/i18n/es_CR.po
+++ /dev/null
@@ -1,1393 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-15 18:01+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-"Language: es\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Relaciones entre valores"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "URL del servidor CalDAV, utilizado para sincronización."
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"No hay manera buit-in para sincronizar el calendario con CalDAV.\n"
-"Así que hay que instalar un software de tercera parte: Calendario (CalDAV)\n"
-"por ahora es el único\n"
-"\n"
-"configuración\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"    Voy a tener una interfaz con pestañas 2\n"
-"    Manténgase en la primera una\n"
-"\n"
-"2. CaDAV Calendario URL: poner la URL indicada anteriormente (es decir: "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Ponga su nombre de usuario y contraseña openerp\n"
-"\n"
-"4. Si el servidor no usa SSL, usted obtendrá un warnign, diga \"Sí\"\n"
-"\n"
-"5. A continuación, puede sincronizar de forma manual o por costumbre estos "
-"valores para sincronizar cada x minutos.\n"
-"\n"
-"    "
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Nombre del fichero"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exportar evento"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importar fichero .ics"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Cerrar"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Asistente"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "No se puede relacionar un campo más de una vez"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"\"Calendarios\" te permiten personalizar agenda de eventos y todo atributo "
-"con cualquier modelo de OpenERP. Los Calendarios proporcionan funcionalidad "
-"de Importación/Exportación iCal. El servidor Webdav proporciona acceso "
-"remoto al calendario. Te ayuda a sincronizar calendarios de reuniones con "
-"los clientes de calendario. Puedes acceder a los calendarios usando clientes "
-"de CalDAV, como Sunbird, Evaluación del Calendario, Móvil."
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "¡Aviso!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objeto"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Por hacer"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Formulario de preferencias del usuario"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Servicios"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Expresión como constante"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolución"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-"\n"
-"    1. Ir al Calendario\n"
-"\n"
-"     2. Archivo -> Nuevo -> Calendario\n"
-"\n"
-"     3. Rellene el formulario\n"
-"         - Tipo: CalDav\n"
-"         - Nombre: Whaterver desea (es decir: Reunión)\n"
-"         - Url: "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (es decir: "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) el una "
-"propuesta en la parte superior de esta ventana\n"
-"         - Desmarque la opción \"Usuario SSL\"\n"
-"         - Nombre de Usuario: Su nombre de usuario (es decir: Demo)\n"
-"         - Actualizar: cada vez que quiere que la evolución sincronizar los "
-"datos con el servidor\n"
-"\n"
-"     4. Haga clic en Aceptar y dar su contraseña openerp\n"
-"\n"
-"     5. Un nuevo calendario llamado con el nombre que le dio debe aparecer "
-"en el lado izquierdo.\n"
-"     "
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr "Indique una configuración correcta de \"%s\" en líneas de calendario"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr "Configuración de CalDAV de nombre de host"
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Servidor CalDAV"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr "Fecha y hora en UTC"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "PENDIENTE"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exportar ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Usar el campo"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "No se puede crear la línea \"%s\" más de una vez"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr "Calendario Web Cal"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Líneas de calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Suscribir evento"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importar ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "base.calendario.evento"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Evento"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Colección del calendario"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "¡Error! No puede crear directorios recursivos."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Abrir"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr "Siguiente"
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Guardar en formato .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Atributos del calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Exploración de CalDAV"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Dispositivo basado en Android"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr "Configure el nombre de host OpenERP. Por ejemplo: "
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Fecha de creación"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Relaciones entre atributos"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Directorio"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Indicar ruta del calendario remoto"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Dominio"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Suscribir"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Propietario"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr "Instale python-vobject desde http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Formato de ics incorrecto, el fichero no se puede importar"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "Campo de OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "ID recurso"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Mensaje..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Colecciones de calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "¡El mismo nombre de fichero no se puede asociar a dos registros!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "¡El directorio no puede ser su propio padre!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Calendarios"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Colección"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Fecha escritura"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-"\n"
-"  * Servidor WebDAV que proporciona acceso remoto al calendario\n"
-"   * Sincronización de calendario mediante WebDAV\n"
-"   * Personalizar calendario de eventos y atributos Todo con cualquiera de "
-"modelo de OpenERP\n"
-"   * Proporciona iCal Import / Export funcionalidad\n"
-"\n"
-"     Para acceder a calendarios CalDAV con los clientes, que apuntan a:\n"
-"         "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"     Para acceder a Calendario OpenERP con WebCal al sitio remoto utilizar "
-"la dirección URL como:\n"
-"         "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"       Cuando,\n"
-"         HOSTNAME: host en el que el servidor OpenERP (con WebDAV) se está "
-"ejecutando\n"
-"         PORT: Puerto en el que el servidor OpenERP se está ejecutando (por "
-"defecto: 8069)\n"
-"         DATABASE_NAME: Nombre de la base de datos en el que se crea OpenERP "
-"Calendario\n"
-"     "
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "¡El nombre de directorio debe ser único!"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Preferencias del usuario"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "¡Introduza una URL correcta!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "base.calendario.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Expresión"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "base.calendario.asistencia"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "base.calendario.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Software/Dispositivos"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Relaciones entre campos"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"Si está utilizando Thunderbird, en primer lugar es necesario instalar el "
-"módulo de rayos\n"
-"http://www.mozilla.org/projects/calendar/lightning/~~V\n"
-"\n"
-"configuración\n"
-"-------------\n"
-"\n"
-"1. Ir al Calendario\n"
-"\n"
-"2. Archivo -> Nuevo Calendario\n"
-"\n"
-"3. Consumirlas \"en la red\"\n"
-"\n"
-"4. Elegir formato de CalDav\n"
-"    y como la ubicación de la URL indicada anteriormente (es decir: "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Elegir un nombre y un color para el calendario, y le aconsejamos que "
-"desactive la casilla \"alarma\"\n"
-"\n"
-"6. Luego ponga su nombre de usuario y contraseña OpenERP (para dar la "
-"contraseña sólo marcar la casilla \"Password Manager utiliza para recordar "
-"esta contraseña\"\n"
-"\n"
-"7. A continuación, en Finalizar, sus reuniones deberían aparecer ahora en la "
-"vista de calendario\n"
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr "Nombre de Máquina"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "base.calendario"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Otra información"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Otros"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr "Mi Calendario(s)"
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Exportar también una entrada <nombre>.ics junto a la carpeta del calendario, "
-"con el contenido WebCal."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Función"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr "database.my.openerp.com  or companyserver.com"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "El calendario/línea a la que esta relación se refiere."
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Relaciones"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Importación exitosa"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Importar evento"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervalo en horas"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Nombre del fichero"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Suscribir a calendario remoto"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-"Para clientes que lo soporten, el color de las entradas del calendario"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarma"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "base.calendario.alarma"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Los asistentes deben tener un identificador de correo electrónico"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Exportar fichero .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "¡Error de importación vobject!"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Guardar fichero ICS"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-"\n"
-"    Para la configuración específica de SSL consulte la documentación "
-"siguiente\n"
-"\n"
-"Ahora, para configurar los calendarios, es necesario:\n"
-"\n"
-"1. Haga clic en \"Configuración\" e ir a la \"Mail, Contactos, Calendarios\" "
-"de la página.\n"
-"2. Vaya a \"Añadir cuenta ...\"\n"
-"3. Haga clic en \"Otro\"\n"
-"4. Desde el \"Calendarios\" del grupo, seleccione \"Añadir cuenta CalDAV\"\n"
-"\n"
-"5. Escriba el nombre del host\n"
-"    (es decir: si la URL es http://openerp.com:8069/webdav/db_1/calendars/, "
-"openerp.com es el anfitrión)\n"
-"\n"
-"6. Llena nombre de usuario y contraseña con su nombre de usuario y "
-"contraseña openerp\n"
-"\n"
-"7. Como descripción, puede dejar el nombre del servidor o\n"
-"    algo así como \"calendarios\" OpenERP.\n"
-"\n"
-"9. Si usted no está usando un servidor SSL, usted obtiene un error, no se "
-"preocupe y pulse en \"Continuar\"\n"
-"\n"
-"10. A continuación, haga clic en \"Configuración avanzada\" para especificar "
-"el derecho de\n"
-"     puertos y caminos.\n"
-"\n"
-"11. Especifique el puerto para el servidor de OpenERP: 8071 para SSL, 8069 "
-"sin.\n"
-"\n"
-"12. Establecer la \"URL de la cuenta\" por el camino correcto de la webdav "
-"OpenERP:\n"
-"     la url dada por el asistente (es decir: "
-"http://my.server.ip:8069/webdav/dbname/calendars/)\n"
-"\n"
-"11. Haga clic en Hecho. El teléfono se espera que conectarse al servidor de "
-"OpenERP\n"
-"     y verificar que se puede utilizar la cuenta.\n"
-"\n"
-"12. Ir al menú principal del iPhone y entrar en la aplicación Calendario.\n"
-"     Sus calendarios OpenERP será visible dentro de la selección del\n"
-"     \"Calendarios\" botón.\n"
-"     Tenga en cuenta que cuando se crea una nueva entrada de agenda, se "
-"tendrá que especificar\n"
-"     el calendario que debe ser guardado en el.\n"
-"\n"
-"Cuando usted necesite SSL (y su certificado no es un comprobado, como de "
-"costumbre),\n"
-"entonces primero tendrá que dejar que la confianza que el iPhone. siga "
-"estas\n"
-"pasos:\n"
-"\n"
-"     s1. Abre Safari e introduzca la ubicación del servidor https OpenERP:\n"
-"       https://my.server.ip:8071/\n"
-"       (suponiendo que tiene el servidor en \"my.server.ip\" y el puerto "
-"HTTPS\n"
-"       El valor predeterminado es 8071)\n"
-"     S2. Safari intentará conectarse y emitir una advertencia sobre el "
-"certificado\n"
-"       utilizada. Inspeccione el certificado y haga clic en \"Aceptar\", de "
-"modo que el iPhone\n"
-"       ahora se confía.\n"
-"    "
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Orden"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Color"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "MI"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Campos del calendario"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importar mensaje"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Suscribir"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "El directorio debe tener un padre o un almacenamiento."
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "base.calendario.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-"Para clientes que lo soporten, el orden de esta carpeta entre los "
-"calendarios."
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Indicar ruta del calendario remoto"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Seleccionar fichero ICS"
-
-#~ msgid "Browse caldav"
-#~ msgstr "Mostrar CalDAV"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Compartir calendario usando CalDAV"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Este módulo contiene la funcionalidad básica para un sistema caldav "
-#~ "como:  \n"
-#~ "  - Servidor WebDAV que proporciona acceso remoto al calendario\n"
-#~ "  - Sincronización del calendario utilizando WebDAV\n"
-#~ "  - Evento de calendario personalizado y atributo todo (por hacer) con "
-#~ "cualquier modelo de OpenERP\n"
-#~ "  - Proporciona funcionalidad Importar/Exportar iCal\n"
-#~ "\n"
-#~ "    Para acceder a calendarios usando clientes CalDAV, introduzca en ellos "
-#~ "la dirección:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Para acceder al calendario OpenERP usando WebCal a un sitio remoto, "
-#~ "introduzca la URL así:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Donde,\n"
-#~ "        HOSTNAME: Host donde el servidor OpenERP (con webdav) se ejecuta\n"
-#~ "        PORT : Puerto donde el servidor OpenERP se ejecuta (por defecto: "
-#~ "8069)\n"
-#~ "        DATABASE_NAME: Nombre de la base de datos donde el calendario "
-#~ "OpenERP se ha creado\n"
-#~ "        CALENDAR_NAME: Nombre del calendario a acceder\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Prerequisito\n"
-#~ "------------\n"
-#~ "Si está usando Thunderbird, primero debe instalar la extensión Lightning\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "(o instalarla usando Herramientas -> Complementos)\n"
-#~ "\n"
-#~ "Configuración\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Ir a la vista Calendario\n"
-#~ "\n"
-#~ "2. Archivo -> Nuevo calendario\n"
-#~ "\n"
-#~ "3. Seleccionar \"En la red\"\n"
-#~ "\n"
-#~ "4. Seleccionar el formato CalDAV\n"
-#~ "   y como \"Ubicación\" la URL anterior (ejemplo: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Seleccionar un nombre y color para el calendario. Le aconsejamos "
-#~ "desmarcar \"Mostrar alarmas\"\n"
-#~ "\n"
-#~ "6. Luego introduzca su nombre de usuario y contraseña de OpenERP (para "
-#~ "introducir la contraseña marque la opción \"Utilizar el administrador de "
-#~ "contraseñas para recordar esta contraseña\")\n"
-#~ "\n"
-#~ "7. Luego Finalizar, sus reuniones deberían aparecer ahora en la vista de "
-#~ "calendario\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  * Servidor WebDAV que proporciona acceso remoto al calendario\n"
-#~ "  * Sincronización del calendario usando WebDAV\n"
-#~ "  * Personaliza eventos del calendario y atributos de las tareas con "
-#~ "cualquier módulo de OpenERP\n"
-#~ "  * Proporciona funcionalidad de Importación/Exportación iCal\n"
-#~ "\n"
-#~ "    Para acceder a Calendarios usando clientes CalDAV, apúntelos a:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Para acceder al Calendario de OpenERP usando WebCal al sitio remoto use "
-#~ "la URL como:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Donde,\n"
-#~ "        HOSTNAME: Host en el que se está ejecutando el servidor OpenERP (con "
-#~ "WebDAV)\n"
-#~ "        PORT: Puerto en el que se está ejecutando el servidor OpenERP (por "
-#~ "defecto: 8069)\n"
-#~ "        DATABASE_NAME: Nombre de la base de datos en la que está el "
-#~ "Calendario de OpenERP\n"
-#~ "        CALENDAR_NAME: Nombre del calendario a acceder\n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1. Ir a la vista de Calendario\n"
-#~ "\n"
-#~ "    2. Archivo -> Nuevo -> Calendario\n"
-#~ "\n"
-#~ "    3. Llene el formulario \n"
-#~ "        - Tipo: CalDAV\n"
-#~ "        - Nombre: El que desee (ejm: Reuniones)\n"
-#~ "        - URL: "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ejm: "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) mostrado "
-#~ "en la parte superior de esta ventana\n"
-#~ "        - Desmarque \"Usar SSL\"\n"
-#~ "        - Usuario: Su nombre de usuario (ejm: Demo)\n"
-#~ "        - Actualizar: Período con el que quiere que Evolution sincronice los "
-#~ "datos con el servidor\n"
-#~ "\n"
-#~ "    4. Haga clic sobre Aceptar e ingrese su contraseña de OpenERP\n"
-#~ "\n"
-#~ "    5. Un nuevo calendario CalDAV con el nombre que usted ingresó debe "
-#~ "aparecer en el lado izquierdo.     \n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Prerequisito\n"
-#~ "----------\n"
-#~ "No hay forma interna de sincronizar el calendario con CalDAV\n"
-#~ "Así que hay que instalar software de terceros: Calendario (CalDav) \n"
-#~ "por ahora es la única forma\n"
-#~ "\n"
-#~ "Configuración\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Abra Calendar Sync\n"
-#~ "   Obtendrá un interfaz con 2 pestañas\n"
-#~ "   Permanezca en la primera\n"
-#~ "   \n"
-#~ "2. URL del Calendario CalDAV: Ingrese la URL dada arriba (ejm: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Ingrese su nombre de usuario y contraseña de OpenERP\n"
-#~ "\n"
-#~ "4. Si su servidor no usa SSL, recibirá un aviso, responda \"Si\"\n"
-#~ "\n"
-#~ "5. Ahora puede sincronizar manualmente o personalizar la configuración "
-#~ "parasincronizar cada x minutos.\n"
-#~ "    \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Para la configuración específica de SSL vea la documentación a "
-#~ "continuación\n"
-#~ "\n"
-#~ "Ahora, para configurar el calendario, es necesario:\n"
-#~ "\n"
-#~ "1. Haga clic sobre \"Configuración\" y vaya a la página \"Correo, Contactos, "
-#~ "Calendarios\"\n"
-#~ "2. Vaya a \"Agregar cuenta...\"\n"
-#~ "3. Haga clic sobre \"Otras\"\n"
-#~ "4. Desde el grupo \"Calendarios\" seleccione \"Agregar Cuenta CalDAV\"\n"
-#~ "5. Ingrese el nombre del host \n"
-#~ "   (ejm: si el URL es http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com es el host)\n"
-#~ "\n"
-#~ "6. Llene Usuario y Contraseña con su usuario y contraseña de OpenERP\n"
-#~ "\n"
-#~ "7. Como Descripción, puede dejar el nombre del servidor o\n"
-#~ "    algo así como \"Calendarios OpenERP\".\n"
-#~ "\n"
-#~ "8. Si no está usando un servidor SSL, obtendrá un error, no se preocupe y "
-#~ "pulse en \"Continuar\"\n"
-#~ "\n"
-#~ "9. A continuación, haga clic en \"Configuración avanzada\" para especificar "
-#~ "los\n"
-#~ "    puertos y rutas correctos\n"
-#~ "    \n"
-#~ "10. Especifique el puerto para el servidor OpenERP: 8071 para SSL, 8069 sin "
-#~ "SSL.\n"
-#~ "\n"
-#~ "11. Configure la \"Cuenta URL\" a la ruta correcta del WebDAV OpenERP:\n"
-#~ "    la URL propuesta por el asistente (ejm: "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/)\n"
-#~ "\n"
-#~ "12. Haga clic en Hecho. El teléfono se conectará con el servidor OpenERP\n"
-#~ "    y comprobará que puede utilizar la cuenta.\n"
-#~ "\n"
-#~ "13. Vaya al menú principal del iPhone e ingrese a la aplicación Calendario.\n"
-#~ "    Sus calendarios de OpenERP serán visibles dentro de la selección del\n"
-#~ "    botón \"Calendarios\".\n"
-#~ "    Note que al crear una nueva entrada de calendario, tendrá que "
-#~ "especificar\n"
-#~ "    en qué calendario debe guardarse.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Si usted necesita SSL (y su certificado no está verificado, como es usual),\n"
-#~ "primero tendrá que decirle al iPhone que confíe en él. Siga estos\n"
-#~ "pasos:\n"
-#~ "\n"
-#~ "    s1. Abra Safari e ingrese la ubicación HTTPS del servidor OpenERP:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (asumiendo que tiene el servidor en \"my.server.ip\" y el puerto "
-#~ "HTTPS\n"
-#~ "      es el valor por defecto 8071)\n"
-#~ "    s2. Safari intentará conectarse y emitirá una advertencia sobre el "
-#~ "certificado\n"
-#~ "      utilizado. Inspeccione el certificado y haga clic en \"Aceptar\" para "
-#~ "que el iPhone\n"
-#~ "      confíe en él.   \n"
-#~ "    "
diff --git a/addons/caldav/i18n/es_EC.po b/addons/caldav/i18n/es_EC.po
deleted file mode 100644
index 6d5c18f2350..00000000000
--- a/addons/caldav/i18n/es_EC.po
+++ /dev/null
@@ -1,1216 +0,0 @@
-# Spanish (Ecuador) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-02-23 23:57+0000\n"
-"Last-Translator: Mario Andrés Correa <Unknown>\n"
-"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Relaciones entre valores"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "URL del servidor CalDAV, utilizado para sincronización."
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Nombre del archivo"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exportar evento"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importar archivo .ics"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Cerrar"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Participante"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "No se puede relacionar un campo más de una vez"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "¡Advertencia!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objeto"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Por hacer"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Formulario de preferencias del usuario"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Servicios"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Expresión como constante"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolution"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr "Indique una configuración correcta de \"%s\" en líneas de calendario"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Servidor CalDAV"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "Por hacer"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exportar ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Usar el campo"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "No se puede crear la línea \"%s\" más de una vez"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Líneas de calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Suscribir evento"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importar ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "base.calendario.evento"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Evento"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Colección del calendario"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "¡Error! No puede crear directorios recursivos."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Abrir"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Guardar en formato .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Atributos del calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Exploración de CalDAV"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Dispositivo basado en Android"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Fecha de creación"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Relaciones entre atributos"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Directorio"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Indicar ruta del calendario remoto"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Dominio"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Suscribir"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Propietario"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr "Instale python-vobject desde http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Formato de ics incorrecto, el fichero no se puede importar"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "Campo de OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "ID recurso"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Mensaje..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Colecciones de calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "¡El mismo nombre de fichero no se puede asociar a dos registros!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "¡El directorio no puede ser su propio padre!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Calendarios"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Colección"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Fecha de escritura"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "¡El nombre de directorio debe ser único!"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Preferencias del usuario"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "¡Introduza una URL correcta!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Expresión"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Software/Dispositivos"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Relaciones entre campos"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "base.calendario"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Otra información"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Otro"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Exportar también una entrada <nombre>.ics junto a la carpeta del calendario, "
-"con el contenido WebCal."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Función"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "El calendario/línea a la que esta relación se refiere."
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Relaciones"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Importación exitosa"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Importar evento"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervalo en horas"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Nombre del archivo"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Suscribir a calendario remoto"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-"Para clientes que lo soporten, el color de las entradas del calendario"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarma"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Los asistentes deben tener un identificador de correo electrónico"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Indicar ruta del calendario remoto"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Prerequisito\n"
-#~ "------------\n"
-#~ "Si está usando Thunderbird, primero debe instalar la extensión Lightning\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "(o instalarla usando Herramientas -> Complementos)\n"
-#~ "\n"
-#~ "Configuración\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Ir a la vista Calendario\n"
-#~ "\n"
-#~ "2. Archivo -> Nuevo calendario\n"
-#~ "\n"
-#~ "3. Seleccionar \"En la red\"\n"
-#~ "\n"
-#~ "4. Seleccionar el formato CalDAV\n"
-#~ "   y como \"Ubicación\" la URL anterior (ejemplo: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Seleccionar un nombre y color para el calendario. Le aconsejamos "
-#~ "desmarcar \"Mostrar alarmas\"\n"
-#~ "\n"
-#~ "6. Luego introduzca su nombre de usuario y contraseña de OpenERP (para "
-#~ "introducir la contraseña marque la opción \"Utilizar el administrador de "
-#~ "contraseñas para recordar esta contraseña\")\n"
-#~ "\n"
-#~ "7. Luego Finalizar, sus reuniones deberían aparecer ahora en la vista de "
-#~ "calendario\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  * Servidor WebDAV que proporciona acceso remoto al calendario\n"
-#~ "  * Sincronización del calendario usando WebDAV\n"
-#~ "  * Personaliza eventos del calendario y atributos de las tareas con "
-#~ "cualquier módulo de OpenERP\n"
-#~ "  * Proporciona funcionalidad de Importación/Exportación iCal\n"
-#~ "\n"
-#~ "    Para acceder a Calendarios usando clientes CalDAV, apúntelos a:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Para acceder al Calendario de OpenERP usando WebCal al sitio remoto use "
-#~ "la URL como:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Donde,\n"
-#~ "        HOSTNAME: Host en el que se está ejecutando el servidor OpenERP (con "
-#~ "WebDAV)\n"
-#~ "        PORT: Puerto en el que se está ejecutando el servidor OpenERP (por "
-#~ "defecto: 8069)\n"
-#~ "        DATABASE_NAME: Nombre de la base de datos en la que está el "
-#~ "Calendario de OpenERP\n"
-#~ "        CALENDAR_NAME: Nombre del calendario a acceder\n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1. Ir a la vista de Calendario\n"
-#~ "\n"
-#~ "    2. Archivo -> Nuevo -> Calendario\n"
-#~ "\n"
-#~ "    3. Llene el formulario \n"
-#~ "        - Tipo: CalDAV\n"
-#~ "        - Nombre: El que desee (ejm: Reuniones)\n"
-#~ "        - URL: "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ejm: "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) mostrado "
-#~ "en la parte superior de esta ventana\n"
-#~ "        - Desmarque \"Usar SSL\"\n"
-#~ "        - Usuario: Su nombre de usuario (ejm: Demo)\n"
-#~ "        - Actualizar: Período con el que quiere que Evolution sincronice los "
-#~ "datos con el servidor\n"
-#~ "\n"
-#~ "    4. Haga clic sobre Aceptar e ingrese su contraseña de OpenERP\n"
-#~ "\n"
-#~ "    5. Un nuevo calendario CalDAV con el nombre que usted ingresó debe "
-#~ "aparecer en el lado izquierdo.     \n"
-#~ "     "
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Este módulo contiene la funcionalidad básica para un sistema caldav "
-#~ "como:  \n"
-#~ "  - Servidor WebDAV que proporciona acceso remoto al calendario\n"
-#~ "  - Sincronización del calendario utilizando WebDAV\n"
-#~ "  - Evento de calendario personalizado y atributo todo (por hacer) con "
-#~ "cualquier modelo de OpenERP\n"
-#~ "  - Proporciona funcionalidad Importar/Exportar iCal\n"
-#~ "\n"
-#~ "    Para acceder a calendarios usando clientes CalDAV, introduzca en ellos "
-#~ "la dirección:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Para acceder al calendario OpenERP usando WebCal a un sitio remoto, "
-#~ "introduzca la URL así:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Donde,\n"
-#~ "        HOSTNAME: Host donde el servidor OpenERP (con webdav) se ejecuta\n"
-#~ "        PORT : Puerto donde el servidor OpenERP se ejecuta (por defecto: "
-#~ "8069)\n"
-#~ "        DATABASE_NAME: Nombre de la base de datos donde el calendario "
-#~ "OpenERP se ha creado\n"
-#~ "        CALENDAR_NAME: Nombre del calendario a acceder\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Prerequisito\n"
-#~ "----------\n"
-#~ "No hay forma interna de sincronizar el calendario con CalDAV\n"
-#~ "Así que hay que instalar software de terceros: Calendario (CalDav) \n"
-#~ "por ahora es la única forma\n"
-#~ "\n"
-#~ "Configuración\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Abra Calendar Sync\n"
-#~ "   Obtendrá un interfaz con 2 pestañas\n"
-#~ "   Permanezca en la primera\n"
-#~ "   \n"
-#~ "2. URL del Calendario CalDAV: Ingrese la URL dada arriba (ejm: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Ingrese su nombre de usuario y contraseña de OpenERP\n"
-#~ "\n"
-#~ "4. Si su servidor no usa SSL, recibirá un aviso, responda \"Si\"\n"
-#~ "\n"
-#~ "5. Ahora puede sincronizar manualmente o personalizar la configuración "
-#~ "parasincronizar cada x minutos.\n"
-#~ "    \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Para la configuración específica de SSL vea la documentación a "
-#~ "continuación\n"
-#~ "\n"
-#~ "Ahora, para configurar el calendario, es necesario:\n"
-#~ "\n"
-#~ "1. Haga clic sobre \"Configuración\" y vaya a la página \"Correo, Contactos, "
-#~ "Calendarios\"\n"
-#~ "2. Vaya a \"Agregar cuenta...\"\n"
-#~ "3. Haga clic sobre \"Otras\"\n"
-#~ "4. Desde el grupo \"Calendarios\" seleccione \"Agregar Cuenta CalDAV\"\n"
-#~ "5. Ingrese el nombre del host \n"
-#~ "   (ejm: si el URL es http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com es el host)\n"
-#~ "\n"
-#~ "6. Llene Usuario y Contraseña con su usuario y contraseña de OpenERP\n"
-#~ "\n"
-#~ "7. Como Descripción, puede dejar el nombre del servidor o\n"
-#~ "    algo así como \"Calendarios OpenERP\".\n"
-#~ "\n"
-#~ "8. Si no está usando un servidor SSL, obtendrá un error, no se preocupe y "
-#~ "pulse en \"Continuar\"\n"
-#~ "\n"
-#~ "9. A continuación, haga clic en \"Configuración avanzada\" para especificar "
-#~ "los\n"
-#~ "    puertos y rutas correctos\n"
-#~ "    \n"
-#~ "10. Especifique el puerto para el servidor OpenERP: 8071 para SSL, 8069 sin "
-#~ "SSL.\n"
-#~ "\n"
-#~ "11. Configure la \"Cuenta URL\" a la ruta correcta del WebDAV OpenERP:\n"
-#~ "    la URL propuesta por el asistente (ejm: "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/)\n"
-#~ "\n"
-#~ "12. Haga clic en Hecho. El teléfono se conectará con el servidor OpenERP\n"
-#~ "    y comprobará que puede utilizar la cuenta.\n"
-#~ "\n"
-#~ "13. Vaya al menú principal del iPhone e ingrese a la aplicación Calendario.\n"
-#~ "    Sus calendarios de OpenERP serán visibles dentro de la selección del\n"
-#~ "    botón \"Calendarios\".\n"
-#~ "    Note que al crear una nueva entrada de calendario, tendrá que "
-#~ "especificar\n"
-#~ "    en qué calendario debe guardarse.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Si usted necesita SSL (y su certificado no está verificado, como es usual),\n"
-#~ "primero tendrá que decirle al iPhone que confíe en él. Siga estos\n"
-#~ "pasos:\n"
-#~ "\n"
-#~ "    s1. Abra Safari e ingrese la ubicación HTTPS del servidor OpenERP:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (asumiendo que tiene el servidor en \"my.server.ip\" y el puerto "
-#~ "HTTPS\n"
-#~ "      es el valor por defecto 8071)\n"
-#~ "    s2. Safari intentará conectarse y emitirá una advertencia sobre el "
-#~ "certificado\n"
-#~ "      utilizado. Inspeccione el certificado y haga clic en \"Aceptar\" para "
-#~ "que el iPhone\n"
-#~ "      confíe en él.   \n"
-#~ "    "
-
-#~ msgid "Select ICS file"
-#~ msgstr "Seleccionar archivo ICS"
-
-#~ msgid "Browse caldav"
-#~ msgstr "Explorar CalDAV"
diff --git a/addons/caldav/i18n/es_MX.po b/addons/caldav/i18n/es_MX.po
deleted file mode 100644
index af43498155e..00000000000
--- a/addons/caldav/i18n/es_MX.po
+++ /dev/null
@@ -1,1011 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-18 07:45+0000\n"
-"Last-Translator: Jorge L Tupac-Yupanqui <Unknown>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:54+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Relaciones entre valores"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "URL del servidor CalDAV, utilizado para sincronización."
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Nombre del fichero"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exportar evento"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Indicar ruta del calendario remoto"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importar fichero .ics"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Cerrar"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Asistente"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "No se puede relacionar un campo más de una vez"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:787
-#: code:addons/caldav/calendar.py:877
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "¡Aviso!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objeto"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Por hacer"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Formulario de preferencias del usuario"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Servicios"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Expresión como constante"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolución"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:877
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr "Indique una configuración correcta de \"%s\" en líneas de calendario"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Nombre del fichero"
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Servidor CalDAV"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
-#. module: caldav
-#: help:caldav.browse,caldav_doc_file:0
-msgid "download full caldav Documentation."
-msgstr "Descargue toda la documentación CalDAV."
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"        CALENDAR_NAME: Name of calendar to access\n"
-"     "
-msgstr ""
-"\n"
-"  * Servidor WebDAV que proporciona acceso remoto al calendario\n"
-"  * Sincronización del calendario usando WebDAV\n"
-"  * Personaliza eventos del calendario y atributos de las tareas con "
-"cualquier módulo de OpenERP\n"
-"  * Proporciona funcionalidad de Importación/Exportación iCal\n"
-"\n"
-"    Para acceder a Calendarios usando clientes CalDAV, apúntelos a:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    Para acceder al Calendario de OpenERP usando WebCal al sitio remoto use "
-"la URL como:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Donde,\n"
-"        HOSTNAME: Host en el que se está ejecutando el servidor OpenERP (con "
-"WebDAV)\n"
-"        PORT: Puerto en el que se está ejecutando el servidor OpenERP (por "
-"defecto: 8069)\n"
-"        DATABASE_NAME: Nombre de la base de datos en la que está el "
-"Calendario de OpenERP\n"
-"        CALENDAR_NAME: Nombre del calendario a acceder\n"
-"     "
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:147
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"   \n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-"\n"
-"Prerequisito\n"
-"------------\n"
-"Si está usando Thunderbird, primero debe instalar la extensión Lightning\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"(o instalarla usando Herramientas -> Complementos)\n"
-"\n"
-"Configuración\n"
-"-------------\n"
-"\n"
-"1. Ir a la vista Calendario\n"
-"\n"
-"2. Archivo -> Nuevo calendario\n"
-"\n"
-"3. Seleccionar \"En la red\"\n"
-"\n"
-"4. Seleccionar el formato CalDAV\n"
-"   y como \"Ubicación\" la URL anterior (ejemplo: "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"   \n"
-"5. Seleccionar un nombre y color para el calendario. Le aconsejamos "
-"desmarcar \"Mostrar alarmas\"\n"
-"\n"
-"6. Luego introduzca su nombre de usuario y contraseña de OpenERP (para "
-"introducir la contraseña marque la opción \"Utilizar el administrador de "
-"contraseñas para recordar esta contraseña\")\n"
-"\n"
-"7. Luego Finalizar, sus reuniones deberían aparecer ahora en la vista de "
-"calendario\n"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "PENDIENTE"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exportar ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Usar el campo"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:787
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "No se puede crear la línea \"%s\" más de una vez"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Líneas de calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Suscribir evento"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importar ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "base.calendario.evento"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Evento"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Colección del calendario"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "¡Error! No puede crear directorios recursivos."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Abrir"
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Guardar en formato .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1291
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:128
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form \n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.     \n"
-"     "
-msgstr ""
-"\n"
-"    1. Ir a la vista de Calendario\n"
-"\n"
-"    2. Archivo -> Nuevo -> Calendario\n"
-"\n"
-"    3. Llene el formulario \n"
-"        - Tipo: CalDAV\n"
-"        - Nombre: El que desee (ejm: Reuniones)\n"
-"        - URL: "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ejm: "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) mostrado "
-"en la parte superior de esta ventana\n"
-"        - Desmarque \"Usar SSL\"\n"
-"        - Usuario: Su nombre de usuario (ejm: Demo)\n"
-"        - Actualizar: Período con el que quiere que Evolution sincronice los "
-"datos con el servidor\n"
-"\n"
-"    4. Haga clic sobre Aceptar e ingrese su contraseña de OpenERP\n"
-"\n"
-"    5. Un nuevo calendario CalDAV con el nombre que usted ingresó debe "
-"aparecer en el lado izquierdo.     \n"
-"     "
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Atributos del calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Exploración de CalDAV"
-
-#. module: caldav
-#: model:ir.module.module,description:caldav.module_meta_information
-msgid ""
-"\n"
-"    This module Contains basic functionality for caldav system like:  \n"
-"  - Webdav server that provides remote access to calendar\n"
-"  - Synchronisation of calendar using WebDAV\n"
-"  - Customize calendar event and todo attribute with any of OpenERP model\n"
-"  - Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"        CALENDAR_NAME: Name of calendar to access\n"
-msgstr ""
-"\n"
-"    Este módulo contiene la funcionalidad básica para un sistema caldav "
-"como:  \n"
-"  - Servidor WebDAV que proporciona acceso remoto al calendario\n"
-"  - Sincronización del calendario utilizando WebDAV\n"
-"  - Evento de calendario personalizado y atributo todo (por hacer) con "
-"cualquier modelo de OpenERP\n"
-"  - Proporciona funcionalidad Importar/Exportar iCal\n"
-"\n"
-"    Para acceder a calendarios usando clientes CalDAV, introduzca en ellos "
-"la dirección:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    Para acceder al calendario OpenERP usando WebCal a un sitio remoto, "
-"introduzca la URL así:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Donde,\n"
-"        HOSTNAME: Host donde el servidor OpenERP (con webdav) se ejecuta\n"
-"        PORT : Puerto donde el servidor OpenERP se ejecuta (por defecto: "
-"8069)\n"
-"        DATABASE_NAME: Nombre de la base de datos donde el calendario "
-"OpenERP se ha creado\n"
-"        CALENDAR_NAME: Nombre del calendario a acceder\n"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Dispositivo basado en Android"
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Fecha de creación"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Relaciones entre atributos"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Directorio"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Indicar ruta del calendario remoto"
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "_Ok"
-msgstr "_Aceptar"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Dominio"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Suscribir"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Propietario"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr "Instale python-vobject desde http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Formato de ics incorrecto, el fichero no se puede importar"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "Campo de OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "ID recurso"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Mensaje..."
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Otros"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Colecciones de calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:813
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "¡El mismo nombre de fichero no se puede asociar a dos registros!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "¡El directorio no puede ser su propio padre!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Calendarios"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Colección"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Fecha escritura"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:104
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav) \n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"   \n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"    \n"
-"    "
-msgstr ""
-"\n"
-"Prerequisito\n"
-"----------\n"
-"No hay forma interna de sincronizar el calendario con CalDAV\n"
-"Así que hay que instalar software de terceros: Calendario (CalDav) \n"
-"por ahora es la única forma\n"
-"\n"
-"Configuración\n"
-"-------------\n"
-"\n"
-"1. Abra Calendar Sync\n"
-"   Obtendrá un interfaz con 2 pestañas\n"
-"   Permanezca en la primera\n"
-"   \n"
-"2. URL del Calendario CalDAV: Ingrese la URL dada arriba (ejm: "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Ingrese su nombre de usuario y contraseña de OpenERP\n"
-"\n"
-"4. Si su servidor no usa SSL, recibirá un aviso, responda \"Si\"\n"
-"\n"
-"5. Ahora puede sincronizar manualmente o personalizar la configuración "
-"parasincronizar cada x minutos.\n"
-"    \n"
-"    "
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:53
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name \n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths. \n"
-"    \n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.   \n"
-"    "
-msgstr ""
-"\n"
-"    Para la configuración específica de SSL vea la documentación a "
-"continuación\n"
-"\n"
-"Ahora, para configurar el calendario, es necesario:\n"
-"\n"
-"1. Haga clic sobre \"Configuración\" y vaya a la página \"Correo, Contactos, "
-"Calendarios\"\n"
-"2. Vaya a \"Agregar cuenta...\"\n"
-"3. Haga clic sobre \"Otras\"\n"
-"4. Desde el grupo \"Calendarios\" seleccione \"Agregar Cuenta CalDAV\"\n"
-"5. Ingrese el nombre del host \n"
-"   (ejm: si el URL es http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com es el host)\n"
-"\n"
-"6. Llene Usuario y Contraseña con su usuario y contraseña de OpenERP\n"
-"\n"
-"7. Como Descripción, puede dejar el nombre del servidor o\n"
-"    algo así como \"Calendarios OpenERP\".\n"
-"\n"
-"8. Si no está usando un servidor SSL, obtendrá un error, no se preocupe y "
-"pulse en \"Continuar\"\n"
-"\n"
-"9. A continuación, haga clic en \"Configuración avanzada\" para especificar "
-"los\n"
-"    puertos y rutas correctos\n"
-"    \n"
-"10. Especifique el puerto para el servidor OpenERP: 8071 para SSL, 8069 sin "
-"SSL.\n"
-"\n"
-"11. Configure la \"Cuenta URL\" a la ruta correcta del WebDAV OpenERP:\n"
-"    la URL propuesta por el asistente (ejm: "
-"http://my.server.ip:8069/webdav/dbname/calendars/)\n"
-"\n"
-"12. Haga clic en Hecho. El teléfono se conectará con el servidor OpenERP\n"
-"    y comprobará que puede utilizar la cuenta.\n"
-"\n"
-"13. Vaya al menú principal del iPhone e ingrese a la aplicación Calendario.\n"
-"    Sus calendarios de OpenERP serán visibles dentro de la selección del\n"
-"    botón \"Calendarios\".\n"
-"    Note que al crear una nueva entrada de calendario, tendrá que "
-"especificar\n"
-"    en qué calendario debe guardarse.\n"
-"\n"
-"\n"
-"\n"
-"Si usted necesita SSL (y su certificado no está verificado, como es usual),\n"
-"primero tendrá que decirle al iPhone que confíe en él. Siga estos\n"
-"pasos:\n"
-"\n"
-"    s1. Abra Safari e ingrese la ubicación HTTPS del servidor OpenERP:\n"
-"      https://my.server.ip:8071/\n"
-"      (asumiendo que tiene el servidor en \"my.server.ip\" y el puerto "
-"HTTPS\n"
-"      es el valor por defecto 8071)\n"
-"    s2. Safari intentará conectarse y emitirá una advertencia sobre el "
-"certificado\n"
-"      utilizado. Inspeccione el certificado y haga clic en \"Aceptar\" para "
-"que el iPhone\n"
-"      confíe en él.   \n"
-"    "
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "¡El nombre de directorio debe ser único!"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Preferencias del usuario"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "¡Introduza una URL correcta!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "base.calendario.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Expresión"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "base.calendario.asistencia"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "base.calendario.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Seleccionar fichero ICS"
-
-#. module: caldav
-#: field:caldav.browse,caldav_doc_file:0
-msgid "Caldav Document"
-msgstr "Documento CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Relaciones entre campos"
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "Mostrar CalDAV"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "base.calendario"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Otra información"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Software/Dispositivos"
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Exportar también una entrada <nombre>.ics junto a la carpeta del calendario, "
-"con el contenido WebCal."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Función"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "El calendario/línea a la que esta relación se refiere."
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Relaciones"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Importación exitosa"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Importar evento"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervalo en horas"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Suscribir a calendario remoto"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-"Para clientes que lo soporten, el color de las entradas del calendario"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarma"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "base.calendario.alarma"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1291
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Los asistentes deben tener un identificador de correo electrónico"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Exportar fichero .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "¡Error de importación vobject!"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Guardar fichero ICS"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Orden"
-
-#. module: caldav
-#: model:ir.module.module,shortdesc:caldav.module_meta_information
-msgid "Share Calendar using CalDAV"
-msgstr "Compartir calendario usando CalDAV"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Color"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "MI"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Campos del calendario"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importar mensaje"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Suscribir"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "El directorio debe tener un padre o un almacenamiento."
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "base.calendario.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-"Para clientes que lo soporten, el orden de esta carpeta entre los "
-"calendarios."
diff --git a/addons/caldav/i18n/es_PY.po b/addons/caldav/i18n/es_PY.po
deleted file mode 100644
index 4ebae00d20f..00000000000
--- a/addons/caldav/i18n/es_PY.po
+++ /dev/null
@@ -1,1221 +0,0 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-03-18 12:57+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Relaciones entre valores"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "URL del servidor CalDAV, utilizado para sincronización."
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Nombre del archivo"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exportar evento"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importar fichero .ics"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Cerrar"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Asistente"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "No se puede relacionar un campo más de una vez"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "¡Atención!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objeto"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Por hacer"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Formulario de preferencias del usuario"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Servicios"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Expresión como constante"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolución"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr "Indique una configuración correcta de \"%s\" en líneas de calendario"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Servidor CalDAV"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "POR HACER"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exportar ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Usar el campo"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "No se puede crear la línea \"%s\" más de una vez"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Líneas de calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Suscribir evento"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importar ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "base.calendario.evento"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Evento"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Colección del calendario"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "¡Error! No puede crear directorios recursivos."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Abrir"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Guardar en formato .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Atributos del calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Exploración de CalDAV"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Dispositivo basado en Android"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Fecha de creación"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Relaciones entre atributos"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Carpeta"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Indicar ruta del calendario remoto"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Dominio"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Suscribir"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Dueño"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr "Instale python-vobject desde http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Formato de ics incorrecto, el fichero no se puede importar"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "Campo de OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "ID recurso"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Mensaje..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Colecciones de calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "¡El mismo nombre de fichero no se puede asociar a dos registros!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "¡El directorio no puede ser su propio padre!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Calendarios"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Colección"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Fecha de escritura"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "¡El nombre de carpeta debe ser único!"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Preferencias del usuario"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "¡Introduza una URL correcta!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "base.calendario.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Expresión"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "base.calendario.asistencia"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "base.calendario.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Software/Dispositivos"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Relaciones entre campos"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "base.calendario"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Otra información"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Otros"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Exportar también una entrada <nombre>.ics junto a la carpeta del calendario, "
-"con el contenido WebCal."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Cargo"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "El calendario/línea a la que esta relación se refiere."
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Relaciones"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Importación exitosa"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Importar evento"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervalo en horas"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Nombre del archivo"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Suscribir a calendario remoto"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-"Para clientes que lo soporten, el color de las entradas del calendario"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarma"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "base.calendario.alarma"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Los asistentes deben tener un identificador de correo electrónico"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Exportar fichero .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "¡Error de importación vobject!"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Guardar fichero ICS"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Orden"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Color"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "MI"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Campos del calendario"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importar mensaje"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Suscribir"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "El directorio debe tener un padre o un almacenamiento."
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "base.calendario.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-"Para clientes que lo soporten, el orden de esta carpeta entre los "
-"calendarios."
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Indicar ruta del calendario remoto"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Prerequisito\n"
-#~ "------------\n"
-#~ "Si está usando Thunderbird, primero debe instalar la extensión Lightning\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "(o instalarla usando Herramientas -> Complementos)\n"
-#~ "\n"
-#~ "Configuración\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Ir a la vista Calendario\n"
-#~ "\n"
-#~ "2. Archivo -> Nuevo calendario\n"
-#~ "\n"
-#~ "3. Seleccionar \"En la red\"\n"
-#~ "\n"
-#~ "4. Seleccionar el formato CalDAV\n"
-#~ "   y como \"Ubicación\" la URL anterior (ejemplo: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Seleccionar un nombre y color para el calendario. Le aconsejamos "
-#~ "desmarcar \"Mostrar alarmas\"\n"
-#~ "\n"
-#~ "6. Luego introduzca su nombre de usuario y contraseña de OpenERP (para "
-#~ "introducir la contraseña marque la opción \"Utilizar el administrador de "
-#~ "contraseñas para recordar esta contraseña\")\n"
-#~ "\n"
-#~ "7. Luego Finalizar, sus reuniones deberían aparecer ahora en la vista de "
-#~ "calendario\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  * Servidor WebDAV que proporciona acceso remoto al calendario\n"
-#~ "  * Sincronización del calendario usando WebDAV\n"
-#~ "  * Personaliza eventos del calendario y atributos de las tareas con "
-#~ "cualquier módulo de OpenERP\n"
-#~ "  * Proporciona funcionalidad de Importación/Exportación iCal\n"
-#~ "\n"
-#~ "    Para acceder a Calendarios usando clientes CalDAV, apúntelos a:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Para acceder al Calendario de OpenERP usando WebCal al sitio remoto use "
-#~ "la URL como:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Donde,\n"
-#~ "        HOSTNAME: Host en el que se está ejecutando el servidor OpenERP (con "
-#~ "WebDAV)\n"
-#~ "        PORT: Puerto en el que se está ejecutando el servidor OpenERP (por "
-#~ "defecto: 8069)\n"
-#~ "        DATABASE_NAME: Nombre de la base de datos en la que está el "
-#~ "Calendario de OpenERP\n"
-#~ "        CALENDAR_NAME: Nombre del calendario a acceder\n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1. Ir a la vista de Calendario\n"
-#~ "\n"
-#~ "    2. Archivo -> Nuevo -> Calendario\n"
-#~ "\n"
-#~ "    3. Llene el formulario \n"
-#~ "        - Tipo: CalDAV\n"
-#~ "        - Nombre: El que desee (ejm: Reuniones)\n"
-#~ "        - URL: "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ejm: "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) mostrado "
-#~ "en la parte superior de esta ventana\n"
-#~ "        - Desmarque \"Usar SSL\"\n"
-#~ "        - Usuario: Su nombre de usuario (ejm: Demo)\n"
-#~ "        - Actualizar: Período con el que quiere que Evolution sincronice los "
-#~ "datos con el servidor\n"
-#~ "\n"
-#~ "    4. Haga clic sobre Aceptar e ingrese su contraseña de OpenERP\n"
-#~ "\n"
-#~ "    5. Un nuevo calendario CalDAV con el nombre que usted ingresó debe "
-#~ "aparecer en el lado izquierdo.     \n"
-#~ "     "
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Este módulo contiene la funcionalidad básica para un sistema caldav "
-#~ "como:  \n"
-#~ "  - Servidor WebDAV que proporciona acceso remoto al calendario\n"
-#~ "  - Sincronización del calendario utilizando WebDAV\n"
-#~ "  - Evento de calendario personalizado y atributo todo (por hacer) con "
-#~ "cualquier modelo de OpenERP\n"
-#~ "  - Proporciona funcionalidad Importar/Exportar iCal\n"
-#~ "\n"
-#~ "    Para acceder a calendarios usando clientes CalDAV, introduzca en ellos "
-#~ "la dirección:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Para acceder al calendario OpenERP usando WebCal a un sitio remoto, "
-#~ "introduzca la URL así:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Donde,\n"
-#~ "        HOSTNAME: Host donde el servidor OpenERP (con webdav) se ejecuta\n"
-#~ "        PORT : Puerto donde el servidor OpenERP se ejecuta (por defecto: "
-#~ "8069)\n"
-#~ "        DATABASE_NAME: Nombre de la base de datos donde el calendario "
-#~ "OpenERP se ha creado\n"
-#~ "        CALENDAR_NAME: Nombre del calendario a acceder\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Prerequisito\n"
-#~ "----------\n"
-#~ "No hay forma interna de sincronizar el calendario con CalDAV\n"
-#~ "Así que hay que instalar software de terceros: Calendario (CalDav) \n"
-#~ "por ahora es la única forma\n"
-#~ "\n"
-#~ "Configuración\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Abra Calendar Sync\n"
-#~ "   Obtendrá un interfaz con 2 pestañas\n"
-#~ "   Permanezca en la primera\n"
-#~ "   \n"
-#~ "2. URL del Calendario CalDAV: Ingrese la URL dada arriba (ejm: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Ingrese su nombre de usuario y contraseña de OpenERP\n"
-#~ "\n"
-#~ "4. Si su servidor no usa SSL, recibirá un aviso, responda \"Si\"\n"
-#~ "\n"
-#~ "5. Ahora puede sincronizar manualmente o personalizar la configuración "
-#~ "parasincronizar cada x minutos.\n"
-#~ "    \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Para la configuración específica de SSL vea la documentación a "
-#~ "continuación\n"
-#~ "\n"
-#~ "Ahora, para configurar el calendario, es necesario:\n"
-#~ "\n"
-#~ "1. Haga clic sobre \"Configuración\" y vaya a la página \"Correo, Contactos, "
-#~ "Calendarios\"\n"
-#~ "2. Vaya a \"Agregar cuenta...\"\n"
-#~ "3. Haga clic sobre \"Otras\"\n"
-#~ "4. Desde el grupo \"Calendarios\" seleccione \"Agregar Cuenta CalDAV\"\n"
-#~ "5. Ingrese el nombre del host \n"
-#~ "   (ejm: si el URL es http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com es el host)\n"
-#~ "\n"
-#~ "6. Llene Usuario y Contraseña con su usuario y contraseña de OpenERP\n"
-#~ "\n"
-#~ "7. Como Descripción, puede dejar el nombre del servidor o\n"
-#~ "    algo así como \"Calendarios OpenERP\".\n"
-#~ "\n"
-#~ "8. Si no está usando un servidor SSL, obtendrá un error, no se preocupe y "
-#~ "pulse en \"Continuar\"\n"
-#~ "\n"
-#~ "9. A continuación, haga clic en \"Configuración avanzada\" para especificar "
-#~ "los\n"
-#~ "    puertos y rutas correctos\n"
-#~ "    \n"
-#~ "10. Especifique el puerto para el servidor OpenERP: 8071 para SSL, 8069 sin "
-#~ "SSL.\n"
-#~ "\n"
-#~ "11. Configure la \"Cuenta URL\" a la ruta correcta del WebDAV OpenERP:\n"
-#~ "    la URL propuesta por el asistente (ejm: "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/)\n"
-#~ "\n"
-#~ "12. Haga clic en Hecho. El teléfono se conectará con el servidor OpenERP\n"
-#~ "    y comprobará que puede utilizar la cuenta.\n"
-#~ "\n"
-#~ "13. Vaya al menú principal del iPhone e ingrese a la aplicación Calendario.\n"
-#~ "    Sus calendarios de OpenERP serán visibles dentro de la selección del\n"
-#~ "    botón \"Calendarios\".\n"
-#~ "    Note que al crear una nueva entrada de calendario, tendrá que "
-#~ "especificar\n"
-#~ "    en qué calendario debe guardarse.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Si usted necesita SSL (y su certificado no está verificado, como es usual),\n"
-#~ "primero tendrá que decirle al iPhone que confíe en él. Siga estos\n"
-#~ "pasos:\n"
-#~ "\n"
-#~ "    s1. Abra Safari e ingrese la ubicación HTTPS del servidor OpenERP:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (asumiendo que tiene el servidor en \"my.server.ip\" y el puerto "
-#~ "HTTPS\n"
-#~ "      es el valor por defecto 8071)\n"
-#~ "    s2. Safari intentará conectarse y emitirá una advertencia sobre el "
-#~ "certificado\n"
-#~ "      utilizado. Inspeccione el certificado y haga clic en \"Aceptar\" para "
-#~ "que el iPhone\n"
-#~ "      confíe en él.   \n"
-#~ "    "
-
-#~ msgid "Select ICS file"
-#~ msgstr "Seleccionar fichero ICS"
-
-#~ msgid "Browse caldav"
-#~ msgstr "Mostrar CalDAV"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Compartir calendario usando CalDAV"
diff --git a/addons/caldav/i18n/es_VE.po b/addons/caldav/i18n/es_VE.po
deleted file mode 100644
index af43498155e..00000000000
--- a/addons/caldav/i18n/es_VE.po
+++ /dev/null
@@ -1,1011 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-18 07:45+0000\n"
-"Last-Translator: Jorge L Tupac-Yupanqui <Unknown>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:54+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Relaciones entre valores"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "URL del servidor CalDAV, utilizado para sincronización."
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Nombre del fichero"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exportar evento"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Indicar ruta del calendario remoto"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importar fichero .ics"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Cerrar"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Asistente"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "No se puede relacionar un campo más de una vez"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:787
-#: code:addons/caldav/calendar.py:877
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "¡Aviso!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objeto"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Por hacer"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Formulario de preferencias del usuario"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Servicios"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Expresión como constante"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolución"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:877
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr "Indique una configuración correcta de \"%s\" en líneas de calendario"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Nombre del fichero"
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Servidor CalDAV"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "¡Error!"
-
-#. module: caldav
-#: help:caldav.browse,caldav_doc_file:0
-msgid "download full caldav Documentation."
-msgstr "Descargue toda la documentación CalDAV."
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"        CALENDAR_NAME: Name of calendar to access\n"
-"     "
-msgstr ""
-"\n"
-"  * Servidor WebDAV que proporciona acceso remoto al calendario\n"
-"  * Sincronización del calendario usando WebDAV\n"
-"  * Personaliza eventos del calendario y atributos de las tareas con "
-"cualquier módulo de OpenERP\n"
-"  * Proporciona funcionalidad de Importación/Exportación iCal\n"
-"\n"
-"    Para acceder a Calendarios usando clientes CalDAV, apúntelos a:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    Para acceder al Calendario de OpenERP usando WebCal al sitio remoto use "
-"la URL como:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Donde,\n"
-"        HOSTNAME: Host en el que se está ejecutando el servidor OpenERP (con "
-"WebDAV)\n"
-"        PORT: Puerto en el que se está ejecutando el servidor OpenERP (por "
-"defecto: 8069)\n"
-"        DATABASE_NAME: Nombre de la base de datos en la que está el "
-"Calendario de OpenERP\n"
-"        CALENDAR_NAME: Nombre del calendario a acceder\n"
-"     "
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:147
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"   \n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-"\n"
-"Prerequisito\n"
-"------------\n"
-"Si está usando Thunderbird, primero debe instalar la extensión Lightning\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"(o instalarla usando Herramientas -> Complementos)\n"
-"\n"
-"Configuración\n"
-"-------------\n"
-"\n"
-"1. Ir a la vista Calendario\n"
-"\n"
-"2. Archivo -> Nuevo calendario\n"
-"\n"
-"3. Seleccionar \"En la red\"\n"
-"\n"
-"4. Seleccionar el formato CalDAV\n"
-"   y como \"Ubicación\" la URL anterior (ejemplo: "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"   \n"
-"5. Seleccionar un nombre y color para el calendario. Le aconsejamos "
-"desmarcar \"Mostrar alarmas\"\n"
-"\n"
-"6. Luego introduzca su nombre de usuario y contraseña de OpenERP (para "
-"introducir la contraseña marque la opción \"Utilizar el administrador de "
-"contraseñas para recordar esta contraseña\")\n"
-"\n"
-"7. Luego Finalizar, sus reuniones deberían aparecer ahora en la vista de "
-"calendario\n"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "PENDIENTE"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exportar ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Usar el campo"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:787
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "No se puede crear la línea \"%s\" más de una vez"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Líneas de calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Suscribir evento"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importar ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "base.calendario.evento"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Evento"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Colección del calendario"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "¡Error! No puede crear directorios recursivos."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Abrir"
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Guardar en formato .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1291
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:128
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form \n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.     \n"
-"     "
-msgstr ""
-"\n"
-"    1. Ir a la vista de Calendario\n"
-"\n"
-"    2. Archivo -> Nuevo -> Calendario\n"
-"\n"
-"    3. Llene el formulario \n"
-"        - Tipo: CalDAV\n"
-"        - Nombre: El que desee (ejm: Reuniones)\n"
-"        - URL: "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ejm: "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) mostrado "
-"en la parte superior de esta ventana\n"
-"        - Desmarque \"Usar SSL\"\n"
-"        - Usuario: Su nombre de usuario (ejm: Demo)\n"
-"        - Actualizar: Período con el que quiere que Evolution sincronice los "
-"datos con el servidor\n"
-"\n"
-"    4. Haga clic sobre Aceptar e ingrese su contraseña de OpenERP\n"
-"\n"
-"    5. Un nuevo calendario CalDAV con el nombre que usted ingresó debe "
-"aparecer en el lado izquierdo.     \n"
-"     "
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Atributos del calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Exploración de CalDAV"
-
-#. module: caldav
-#: model:ir.module.module,description:caldav.module_meta_information
-msgid ""
-"\n"
-"    This module Contains basic functionality for caldav system like:  \n"
-"  - Webdav server that provides remote access to calendar\n"
-"  - Synchronisation of calendar using WebDAV\n"
-"  - Customize calendar event and todo attribute with any of OpenERP model\n"
-"  - Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"        CALENDAR_NAME: Name of calendar to access\n"
-msgstr ""
-"\n"
-"    Este módulo contiene la funcionalidad básica para un sistema caldav "
-"como:  \n"
-"  - Servidor WebDAV que proporciona acceso remoto al calendario\n"
-"  - Sincronización del calendario utilizando WebDAV\n"
-"  - Evento de calendario personalizado y atributo todo (por hacer) con "
-"cualquier modelo de OpenERP\n"
-"  - Proporciona funcionalidad Importar/Exportar iCal\n"
-"\n"
-"    Para acceder a calendarios usando clientes CalDAV, introduzca en ellos "
-"la dirección:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    Para acceder al calendario OpenERP usando WebCal a un sitio remoto, "
-"introduzca la URL así:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Donde,\n"
-"        HOSTNAME: Host donde el servidor OpenERP (con webdav) se ejecuta\n"
-"        PORT : Puerto donde el servidor OpenERP se ejecuta (por defecto: "
-"8069)\n"
-"        DATABASE_NAME: Nombre de la base de datos donde el calendario "
-"OpenERP se ha creado\n"
-"        CALENDAR_NAME: Nombre del calendario a acceder\n"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Dispositivo basado en Android"
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Fecha de creación"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Relaciones entre atributos"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Directorio"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Indicar ruta del calendario remoto"
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "_Ok"
-msgstr "_Aceptar"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Dominio"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Suscribir"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Propietario"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr "Instale python-vobject desde http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Formato de ics incorrecto, el fichero no se puede importar"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "Campo de OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "ID recurso"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Mensaje..."
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Otros"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Colecciones de calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:813
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "¡El mismo nombre de fichero no se puede asociar a dos registros!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "¡El directorio no puede ser su propio padre!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Calendarios"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Colección"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Fecha escritura"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:104
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav) \n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"   \n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"    \n"
-"    "
-msgstr ""
-"\n"
-"Prerequisito\n"
-"----------\n"
-"No hay forma interna de sincronizar el calendario con CalDAV\n"
-"Así que hay que instalar software de terceros: Calendario (CalDav) \n"
-"por ahora es la única forma\n"
-"\n"
-"Configuración\n"
-"-------------\n"
-"\n"
-"1. Abra Calendar Sync\n"
-"   Obtendrá un interfaz con 2 pestañas\n"
-"   Permanezca en la primera\n"
-"   \n"
-"2. URL del Calendario CalDAV: Ingrese la URL dada arriba (ejm: "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Ingrese su nombre de usuario y contraseña de OpenERP\n"
-"\n"
-"4. Si su servidor no usa SSL, recibirá un aviso, responda \"Si\"\n"
-"\n"
-"5. Ahora puede sincronizar manualmente o personalizar la configuración "
-"parasincronizar cada x minutos.\n"
-"    \n"
-"    "
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:53
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name \n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths. \n"
-"    \n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.   \n"
-"    "
-msgstr ""
-"\n"
-"    Para la configuración específica de SSL vea la documentación a "
-"continuación\n"
-"\n"
-"Ahora, para configurar el calendario, es necesario:\n"
-"\n"
-"1. Haga clic sobre \"Configuración\" y vaya a la página \"Correo, Contactos, "
-"Calendarios\"\n"
-"2. Vaya a \"Agregar cuenta...\"\n"
-"3. Haga clic sobre \"Otras\"\n"
-"4. Desde el grupo \"Calendarios\" seleccione \"Agregar Cuenta CalDAV\"\n"
-"5. Ingrese el nombre del host \n"
-"   (ejm: si el URL es http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com es el host)\n"
-"\n"
-"6. Llene Usuario y Contraseña con su usuario y contraseña de OpenERP\n"
-"\n"
-"7. Como Descripción, puede dejar el nombre del servidor o\n"
-"    algo así como \"Calendarios OpenERP\".\n"
-"\n"
-"8. Si no está usando un servidor SSL, obtendrá un error, no se preocupe y "
-"pulse en \"Continuar\"\n"
-"\n"
-"9. A continuación, haga clic en \"Configuración avanzada\" para especificar "
-"los\n"
-"    puertos y rutas correctos\n"
-"    \n"
-"10. Especifique el puerto para el servidor OpenERP: 8071 para SSL, 8069 sin "
-"SSL.\n"
-"\n"
-"11. Configure la \"Cuenta URL\" a la ruta correcta del WebDAV OpenERP:\n"
-"    la URL propuesta por el asistente (ejm: "
-"http://my.server.ip:8069/webdav/dbname/calendars/)\n"
-"\n"
-"12. Haga clic en Hecho. El teléfono se conectará con el servidor OpenERP\n"
-"    y comprobará que puede utilizar la cuenta.\n"
-"\n"
-"13. Vaya al menú principal del iPhone e ingrese a la aplicación Calendario.\n"
-"    Sus calendarios de OpenERP serán visibles dentro de la selección del\n"
-"    botón \"Calendarios\".\n"
-"    Note que al crear una nueva entrada de calendario, tendrá que "
-"especificar\n"
-"    en qué calendario debe guardarse.\n"
-"\n"
-"\n"
-"\n"
-"Si usted necesita SSL (y su certificado no está verificado, como es usual),\n"
-"primero tendrá que decirle al iPhone que confíe en él. Siga estos\n"
-"pasos:\n"
-"\n"
-"    s1. Abra Safari e ingrese la ubicación HTTPS del servidor OpenERP:\n"
-"      https://my.server.ip:8071/\n"
-"      (asumiendo que tiene el servidor en \"my.server.ip\" y el puerto "
-"HTTPS\n"
-"      es el valor por defecto 8071)\n"
-"    s2. Safari intentará conectarse y emitirá una advertencia sobre el "
-"certificado\n"
-"      utilizado. Inspeccione el certificado y haga clic en \"Aceptar\" para "
-"que el iPhone\n"
-"      confíe en él.   \n"
-"    "
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "¡El nombre de directorio debe ser único!"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Preferencias del usuario"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "¡Introduza una URL correcta!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "base.calendario.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Expresión"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "base.calendario.asistencia"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "base.calendario.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Seleccionar fichero ICS"
-
-#. module: caldav
-#: field:caldav.browse,caldav_doc_file:0
-msgid "Caldav Document"
-msgstr "Documento CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Relaciones entre campos"
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "Mostrar CalDAV"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "base.calendario"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Otra información"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Software/Dispositivos"
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Exportar también una entrada <nombre>.ics junto a la carpeta del calendario, "
-"con el contenido WebCal."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Función"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "El calendario/línea a la que esta relación se refiere."
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Relaciones"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Importación exitosa"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Importar evento"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervalo en horas"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Suscribir a calendario remoto"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-"Para clientes que lo soporten, el color de las entradas del calendario"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarma"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "base.calendario.alarma"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1291
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Los asistentes deben tener un identificador de correo electrónico"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Exportar fichero .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "¡Error de importación vobject!"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Guardar fichero ICS"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Orden"
-
-#. module: caldav
-#: model:ir.module.module,shortdesc:caldav.module_meta_information
-msgid "Share Calendar using CalDAV"
-msgstr "Compartir calendario usando CalDAV"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Color"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "MI"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Campos del calendario"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importar mensaje"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Suscribir"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "El directorio debe tener un padre o un almacenamiento."
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "base.calendario.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-"Para clientes que lo soporten, el orden de esta carpeta entre los "
-"calendarios."
diff --git a/addons/caldav/i18n/fa.po b/addons/caldav/i18n/fa.po
deleted file mode 100644
index d124a9a1402..00000000000
--- a/addons/caldav/i18n/fa.po
+++ /dev/null
@@ -1,819 +0,0 @@
-# Persian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-12-19 09:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Persian <fa@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr ""
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr ""
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr ""
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr ""
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr ""
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
diff --git a/addons/caldav/i18n/fi.po b/addons/caldav/i18n/fi.po
deleted file mode 100644
index 90bfc5e60ee..00000000000
--- a/addons/caldav/i18n/fi.po
+++ /dev/null
@@ -1,822 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-06-28 09:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr ""
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Tiedostonnimi"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Osallistuja"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Varoitus !"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objekti"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Tehtävät"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Palvelut"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evoluutio"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "OK"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Caldav palvelin"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "Tehtävät"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Käytä kenttää"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Kalenteririvit"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr ""
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr ""
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Virhe! Et voi luoda rekursiivisia kansioita."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tyyppi"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Virhe !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Luontipäivä"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Hakemisto"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Toimialue"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Omistaja"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "kalenteri"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Virheellinen ics formaatti, tiedostoa ei voi tuoda"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Viesti..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr ""
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Kalenterit"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Kokoelma"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "Hakemiston nimen tulee olla uniikki !"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Lauseke"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Ohjelmisto/Laitteet"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Kenttien kartoitukset"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Muu tieto"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Muu"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Toiminto"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Kuvaus"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Mäppäys"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Tuonti onnistui"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Tuo"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Väli tuntia"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Tiedostonimi"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nimi"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Hälytys"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Järjestys"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Virhe!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Väri"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Kalenterikentät"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Tilaa"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "Hakemistolla täytyy olla ylätason hakemisto tai tietovarasto"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Jaa kalenteri käyttäen CalDAV:ia"
diff --git a/addons/caldav/i18n/fr.po b/addons/caldav/i18n/fr.po
deleted file mode 100644
index 17d54e2679d..00000000000
--- a/addons/caldav/i18n/fr.po
+++ /dev/null
@@ -1,1306 +0,0 @@
-# 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:03+0000\n"
-"Last-Translator: Open Net Sàrl <openerp@open-net.ch>\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: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Correspondance de valeur"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "Url the serveur Caldav, utiliser pour la synchronisation"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"Prérequis\n"
-"----------\n"
-"Il n'existe aucun moyen intégré pour synchroniser le calendrier avec "
-"CalDAV.\n"
-"Vous devez donc installer un logiciel troisième partie : Calendrier (CalDAV) "
-"pour l'instant c'est le seul\n"
-"\n"
-"Configuration\n"
-"-------------\n"
-"\n"
-"1. Ouvrir Calendar Sync\n"
-"Vous obtenez une interface avec 2 onglets.\n"
-"La configuration se fait sur le premier.\n"
-"\n"
-"2. CaDAV Calendrier URL: mettre l'URL donnée ci-dessus (ex: "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Mettez votre nom d'utilisateur et mot de passe openerp\n"
-"\n"
-"4. Si votre serveur n'utilise pas SSL, vous aurez un avertissement, cliquez "
-"sur «Oui» pour poursuivre\n"
-"\n"
-"5. Ensuite, vous pouvez synchroniser manuellement ou personnaliser les "
-"paramètres permettant de synchroniser toutes les x minutes.\n"
-"\n"
-"    "
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Nom du fichier"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exporter un évènement"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Indiquer un chemin pour le calendrier distant"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importer un fichier .ics"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Fermer"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Participant"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "Un champ ne peut avoir plus d'une correspondance"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"\"Calendrier\" vous permet de personnaliser les évènements du calendrier et "
-"les attributs des choses à faire avec n'importe quel modèle OpenERP. Le "
-"module \"Calendrier\" fournit une fonctionnalité d'Import/Export au format "
-"iCal. Le serveur Webdav qui fournit un accès distant aux calendriers. Il "
-"vous aide à synchroniser les rendez-vous avec les clients de calendrier. "
-"Vous pouvez accéder aux calendriers en utilisant des clients CalDAV, comme "
-"Sunbird, Calendrier d'Evolution, téléphone portable."
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Avertissement !"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objet"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "À faire"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Formulaire des préférences utilisateur"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Services"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "L'expression représentant une constante"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Évolution"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-"\n"
-"    1. Aller sur la vue calendrier\n"
-"\n"
-"    2. Fichier -> Nouveau -> Calendrier\n"
-"\n"
-"    3. Remplissez le formulaire\n"
-"         - Type : CalDAV\n"
-"         - Nom : ce que vous voulez (par exemple : Reunion)\n"
-"         - Url: "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Reunion\n"
-"            (ex: "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) l'une "
-"donnée sur le dessus de cette fenêtre\n"
-"         - Décochez la case \"User SSL\"\n"
-"         - Nom d'utilisateur : votre nom d'utilisateur (ex: Démo)\n"
-"         - Actualiser : chaque fois que vous voulez que l'évolution de "
-"synchroniser les données avec le serveur\n"
-"\n"
-"    4. Cliquez sur OK et saisissez votre mot de passe openerp\n"
-"\n"
-"    5. Un nouveau calendrier nommé avec le nom que vous avez donné doit "
-"apparaître sur le côté gauche.\n"
-"     "
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-"Veuillez fournir une configuration correcte pour \"%s\" dans les lignes de "
-"calendrier"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr "Configuration du nom d'hôte CalDAV"
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Serveur Caldav"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr "Heure et Date au format UTC"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "Á faire"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exporter un ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Utiliser le champ"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "Impossible de créer la ligne \"%s\" plus d'une fois"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr "Calendrier Webcal"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Lignes de calendrier"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "S'abonner à l'évènement"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importer ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Annuler"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Évènement"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Colleciton de calendrier"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Erreur ! Vous ne pouvez pas créer de répertoires récursifs."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Ouvrir"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr "Suivant"
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Type"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Sauvegarder au format .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Erreur !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Attributs du calendrier"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Naviguer dans CalDav"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Appareil basé sur Androïd"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr "Configurez votre nom d'hôte openerp. Par exemple : "
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Date de création"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Correspondance d'attributs"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Répertoire"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Fournissez un chemin pour le calendrier distant"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domaine"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_S'abonner"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Propriétaire"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Calendrier"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-"Veuillez installer python-vobject from http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-"Format de fichier ics no valide, le fichier ne peut pas être importer"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "CHamp OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "Res. ID"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Message..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Collections de calendrier"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-"Le même non de ficheir ne peut pas être appliquer à 2 enregistrements"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "Un répertoire ne peut pas être son propre parent !"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Calendriers"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Collection"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Date d'écriture"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "Le nom du répertoire doit être unique !"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Préférence utilisateur"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Veuillez fournir un lien correct !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Expression"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Sélectionner un fichier ICS"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Logiciels/Appareils"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Correspondance de champs"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-"\n"
-"Prérequis\n"
-"----------\n"
-"Si vous utilisez Thunderbird, vous devez d'abord installer l'extension "
-"lightning via le gestionnaire de modules complémentaires\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"Configuration\n"
-"-------------\n"
-"    1. Aller sur la vue calendrier\n"
-"\n"
-"    2. Fichier -> Nouveau -> Calendrier\n"
-"\n"
-"    3. Choisir \"sur le réseau\"\n"
-"\n"
-"    4. Choisir CalDav comme format et l'URL donnée ci-dessus\n"
-"                     ex: "
-"http://localhost:8069/webdav/db/calendars/users/demo/c/Meetings) \n"
-"\n"
-"    5. Choisissez un nom et une couleur pour le calendrier, et nous vous "
-"conseillons de décocher la case \"alarme\"\n"
-"\n"
-"    6. Ensuite, mettez votre login et mot de passe openerp (pour donner le "
-"mot de passe uniquement, cochez la case \n"
-"          \"Use Password Manager\" pour se rappeler du mot de passe\n"
-"\n"
-"    7. Puis cliquez sur Terminer, vos réunions devraient apparaître "
-"maintenant dans le calendrier\n"
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "Naviguer dans caldav"
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr "Nom de l'hôte"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Autres Informations"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Autre"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr "Mes calendriers"
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Exporte aussi une prochaine entrée <nom>.ics dans le dossier des "
-"calendriers, avec le contenu WebCal"
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Fonction"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr "database.my.openerp.com  or companyserver.com"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Description"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "Le calendrier/la ligne auquel(le) s'applique la correspondance"
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Correspondance"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Import réussi"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importer"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Importer un évènement"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervalle (en heures)"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Nom du fichier"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "S'abonner à un calendrier distant"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-"Pour les clients qui le supportent, la couleur des entrées de calendrier"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nom"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Rappel"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Le participant doit avoir un identifiant de courriel"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Exporter un fichier .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "Erreur d'importation librairie vobject"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Sauvegarder le fichier ICS"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Commande"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Erreur !"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Couleur"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "MON"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Champs du calendrier"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importer un message"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "S'abonner"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "Le répertoire doit avoir un parent ou un espace de stockage"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-"Pour les clients qui le supportent, l'ordre de ce répertoire parmi les "
-"calendriers"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Indiquer un chemin pour le calendrier distant"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Sélectionner un fichier ICS"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Partager le calendrier en utilisant CalDav"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Ce module contient les fonctionnalités de base d'un système caldav :  \n"
-#~ "  - Serveur WebDAV fournissant un accès distant aux calendriers\n"
-#~ "  - Synchronisation de calendrier avec WebDAV\n"
-#~ "  - Personnalisation des attributs d'évènements et de tâches de calendrier "
-#~ "avec n'importe quel modèle OpenERP\n"
-#~ "  - Fournit les fonctionnalités d'import/export iCal\n"
-#~ "\n"
-#~ "    Pour accéder aux calendriers avec un client CalDAV, voici le lien :\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Pour accéder au calendrier OpenERP en utilisant WebCal, utilisez l'URL "
-#~ ":\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Où,\n"
-#~ "        HOSTNAME : Hôte sur lequel le serveur OpenERP (avec webdav) est "
-#~ "exécuté\n"
-#~ "        PORT : Port sur lequel le serveur OpenERP est exécuté (par défaut : "
-#~ "8069)\n"
-#~ "        DATABASE_NAME : Nom de la base de données dans laquelle le "
-#~ "calendrier OpenERP est créé\n"
-#~ "        CALENDAR_NAME : Nom du calendrier à accéder\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Pré-requis\n"
-#~ "----------\n"
-#~ "Si vous utilisez Thunderbird, vous avez d'abord besoin du module Lightning\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "Configuration\n"
-#~ "----------\n"
-#~ "\n"
-#~ "1. Allez dans Vue Calendrier\n"
-#~ "\n"
-#~ "2. Fichier -> Nouveau calendrier\n"
-#~ "\n"
-#~ "3. Choisissez \"Sur le réseau\"\n"
-#~ "\n"
-#~ "4. pour le format, choisissez CalDAV\n"
-#~ "   et pour l'emplacement, l'adresse donnée plus haut "
-#~ "(http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choisissez un nom et une couleur pour le calendrier, et nous vous "
-#~ "conseillons de décocher \"Alarme\"\n"
-#~ "\n"
-#~ "6. Puis, entrez votre identifiant et votre mot de passe OpenERP (pour garder "
-#~ "le mot de passe, cochez la case \"Utilisez le gestionnaire de mots de passe "
-#~ "pour sauvegarder le mot de passe\"\n"
-#~ "\n"
-#~ " Puis, cliquez sur 'Terminer', vos rendez-vous doivent maintenant apparaître "
-#~ "dans votre vue calendrier\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  * Le serveur Webdav fournit un accès distant au calendrier\n"
-#~ "  * La synchronisation du calendrier en utilisant WebDAV\n"
-#~ "  * Personnalisation des événements du calendrier et des attributs à ajouter "
-#~ "avec n'importe quel modèle OpenERP\n"
-#~ "  * Fournit une fonctionnalité d'import/export iCal\n"
-#~ "\n"
-#~ "    Pour accéder aux calendrier en utilisant des clients CalDAV, pointer les "
-#~ "sur :\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "    Pour accéder au calendrier OpenERP en utisant WebCal depuis un site "
-#~ "distant, utilisez une adresse du type\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Où :\n"
-#~ "        HOSTNAME: Hôte sur lequel le serveur OpenERP (Avec webdav) est "
-#~ "lancé\n"
-#~ "        PORT : Port sur lequel le serveur OpenERP est lancé (Par défaut : "
-#~ "8069)\n"
-#~ "        DATABASE_NAME: Nom de la base de données sur laquelle le calendrier "
-#~ "OpenERP est créé\n"
-#~ "        CALENDAR_NAME: Nom du calendrier auquel accéder\n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1. Allez dans la vue Calendrier\n"
-#~ "\n"
-#~ "    2. Fichier -> Nouveau -> Calendrier\n"
-#~ "\n"
-#~ "    3. Remplissez le formulaire \n"
-#~ "        - type : CalDAV\n"
-#~ "        - nom : Ce que vous voulez (ex: Rendez-Vous)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) le seule "
-#~ "donné au dessus de la fenêtre\n"
-#~ "        - Décochez \"Utiliser SSL\"\n"
-#~ "        - Nom d'utilisateur : Votre nom d'utilisateur (ex : demo)\n"
-#~ "        - Rafraîchissement : chaque fois que vous voulez synchroniser les "
-#~ "données avec le serveur\n"
-#~ "\n"
-#~ "    4. Cliquez sur 'Ok' et donnez votre mot de passe OpenERP\n"
-#~ "\n"
-#~ "    5. A nouveau calendrier appelé avec le nom que vous avez donné sur le "
-#~ "côté gauche.     \n"
-#~ "     "
-
-#~ msgid "Browse caldav"
-#~ msgstr "Naviguer dans caldav"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Pré-requis\n"
-#~ "---------------\n"
-#~ "Il n'y a pas d'outil intégré pour synchroniser le calendrier avec caldav.\n"
-#~ "Vous devez donc installer un logiciel tiers : Calendar (CalDav) \n"
-#~ "Pour le moment, c'est le seul\n"
-#~ "\n"
-#~ "Configuration\n"
-#~ "-------------------\n"
-#~ "\n"
-#~ "1. Ouvrir Calendar Sync\n"
-#~ "   Vous devez tomber sur une interface avec 2 onglets\n"
-#~ "   Restez sur le premier\n"
-#~ "   \n"
-#~ "2. CalDav Calendar URL : mettre ici l'URL donnée plus haut (ex : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Entrez vos nom d'utilisateur et mot de passe OpenERP\n"
-#~ "\n"
-#~ "4. Si votre serveur n'utilise pas SSL, vous aurez un message "
-#~ "d'avertissement, dites \"Oui\"\n"
-#~ "\n"
-#~ "5. Puis, vous pouvez synchroniser manuellement ou définir un paramètre "
-#~ "personnalisé pour synchroniser toutes les x minutes.\n"
-#~ "    \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Pour les configurations SSL particulières, voir la documentation ci-"
-#~ "dessous.\n"
-#~ "\n"
-#~ "Pour configurer les calendriers, il faut :\n"
-#~ "\n"
-#~ "1. Cliquer sur \"Paramètres\" et aller à la page \"Courrier, Contacts, "
-#~ "Calendriers\"\n"
-#~ "2. Aller à \"Ajouter un compte...\"\n"
-#~ "3. Cliquer sur  \"Autre\"\n"
-#~ "4. À partir du groupe \"Calendriers\", sélectionner \"Ajouter un Compte "
-#~ "CalDAV\"\n"
-#~ "5. Entrer le nom de l'hôte \n"
-#~ "   (c'est à dire : si l'URL est "
-#~ "http://openerp.com:8069/webdav/db_1/calendars/ , openerp.com est l'hôte)\n"
-#~ "6. Remplir les champs \"Nom Utilisateur\" et \"Mot de passe\" avec votre "
-#~ "identification et mot de passe OpenERP\n"
-#~ "7. Comme description, on peut laisser le nom du serveur ou mettre quelque-"
-#~ "chose comme \"Calendriers OpenERP\"\n"
-#~ "9. Si vous utilises un serveur SSL, une erreur apparaîtra, ne pas en tenir "
-#~ "compte et activer \"Continuer\"\n"
-#~ "10. Ensuite cliquer sur \"Configuration avancée\" pour définir les ports et "
-#~ "les chemins d'accès\n"
-#~ "11. Définir le port du serveur OpenERP : 8071 avec SSL, sinon 8069\n"
-#~ "12. Définir l' \"URL du compte\" vers le bon chemin d'accès au WebDAV "
-#~ "OpenERP :\n"
-#~ "    l'URL donnée par l'assistant (ex : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "11. Cliquer sur \"Terminé\". Le téléphone se connectera naturellement au "
-#~ "serveur OpenERP et\n"
-#~ "    vérifiera qu'il peut utiliser le compte\n"
-#~ "12. Aller sur le menu principal de l'iPhone et entrer dans l'application "
-#~ "Calendrier.\n"
-#~ "    Vos calendriers OpenERP seront visibles avec la sélection du bouton "
-#~ "\"Calendriers\"\n"
-#~ "    Noter qu'à la création d'une nouvelle entrée de calendrier, il faudra "
-#~ "définir dans quel \n"
-#~ "   calendrier il faudra le sauvegarder.\n"
-#~ "\n"
-#~ "Si SSL est demandé (et, comme de coutume, votre certificat ne sera pas "
-#~ "vérifié), \n"
-#~ "alors il faudra laisser l'iPhone le faire. Suivre les étapes\n"
-#~ "suivantes :\n"
-#~ "\n"
-#~ "    s1. Ouvrir Safari et entrer l'adresse HTTPS du serveur OpenERP :\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (sachant que le serveur est \"my.server.ip\" et que son port HTTPS\n"
-#~ "      est 8071 par défaut)\n"
-#~ "    s2. Safari tentera une connexion et publiera un avertissement relatif au "
-#~ "certificat\n"
-#~ "      utilisé. Vérifier le certificat et cliquer sur \"Accept\" afin que "
-#~ "l'iPhone\n"
-#~ "      le reconnaisse désormais.   \n"
-#~ "    "
diff --git a/addons/caldav/i18n/gl.po b/addons/caldav/i18n/gl.po
deleted file mode 100644
index 352d8d55a97..00000000000
--- a/addons/caldav/i18n/gl.po
+++ /dev/null
@@ -1,1132 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:23+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Galician <gl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Relacións entre valores"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "URL do servidor CalDAV, utilizado para a sincronización."
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Nome do arquivo"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exportar evento"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Indicar ruta do calendario remoto"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importar arquivo .ics"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Pechar"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Asistente"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "Non se pode relacionar un campo máis dunha vez"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"\"Calendarios\" permítelle personalizar o evento do calendario e atributo "
-"TODO con calquera modelo OpenERP.Calendarios presenta a funcionalidade iCal "
-"Import/Export. O servidor Webdav ofrece acceso remoto a calendario. Axúdalle "
-"a sincronizar Meeting co cliente Calendarios.Pode acceder a Calendarios con "
-"clientes CalDAV, como sunbird, Calendar Evaluation, Mobile."
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Aviso!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Obxecto"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Todo"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Formulario de preferencias do usuario"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Servizos"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Expresión como constante"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolución"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr "Indique unha configuración correcta da \"%s\" en liñas de calendario"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Servidor CalDAV"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr "Datahora en GMT"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "TODO"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exportar ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Usar o campo"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "Non se pode crear a liña \"%s\" máis dunha vez"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Liñas de calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Subscribir evento"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importar ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "base.calendario.evento"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Evento"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Colección do calendario"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Erro! Non se poden crear directorios recorrentes."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Abrir"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Gardar en formato .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Erro!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Atributos do calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Exploración de CalDAV"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Dispositivo baseado en Android"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Data de creación"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Relacións entre atributos"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Directorio"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Indicar ruta do calendario remoto"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Dominio"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Subscribir"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Propietario"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr "Instale python-vobject desde http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Formato de ics incorrecto, o arquivo non se pode importar"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "Campo de OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "ID recurso"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Mensaxe..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Coleccións de calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "O mesmo nome de arquivo non se pode asociar a dous rexistros!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "O directorio non pode ser o seu propio pai!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Calendarios"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Colección"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Data de escritura"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "O nome do directorio debe ser único!"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Preferencias do usuario"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Introduza unha URL correcta!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "base.calendario.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Expresión"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "base.calendario.asistencia"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "base.calendario.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Seleccionar arquivo ICS"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Software/Dispositivos"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Mapeo de campos"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "Amosar CalDAV"
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "base.calendario"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Outra información"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Outro"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Exportar tamén unha entrada <nome>.ics xunto á carpeta do calendario, co "
-"contido WebCal."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Cargo"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Descrición"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "O calendario/liña á que esta relación se refire."
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Mapeando"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Importación exitosa"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Importar evento"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervalo en horas"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Nome do arquivo"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Subscribir a calendario remoto"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr "Para clientes que o soporten, a cor das entradas do calendario"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarma"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "base.calendario.alarma"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Os asistentes deben ter un identificador de correo electrónico"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Exportar arquivo .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "Erro de importación vobject!"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Gardar arquivo ICS"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Orde"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Erro!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Cor"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "O MEU/ A MIÑA"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Campos do calendario"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importar mensaxe"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Subscribirse"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "O directorio debe ter un pai ou un almacenamento."
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "base.calendario.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-"Para clientes que o soporten, a orde desta carpeta entre os calendarios."
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Indicar ruta do calendario remoto"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Prerrequisito------------Estase a utilizar Thunderbird, primeiro debe "
-#~ "instalar a extensión "
-#~ "Lightninghttp://www.mozilla.org/projects/calendar/lightning/(ou instalala "
-#~ "usando Ferramentas -> Complementos)Configuración-------------1. Ir á vista "
-#~ "Calendario2. Arquivo -> Novo calendario3. Seleccionar \"Na rede\"4. "
-#~ "Seleccionar o formato CalDAVy como \"Lugar\" a URL anterior (exemplo: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)5. "
-#~ "Seleccionar un nome e color para o calendario. Aconsellámoslle desmarcar "
-#~ "\"Amosar alarmas\"6. Logo introduza o seu nome de usuario e o contrasinal de "
-#~ "OpenERP (para introducir o contrasinal, marque a opción \"Utilizar o "
-#~ "administrador de contrasinais para lembrar este contrasinal\")7. Logo "
-#~ "Finalizar, as súas reunións deberían aparecer agora na vista de calendario\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  * Servidor WebDAV que proporciona acceso remoto ó calendario* "
-#~ "Sincronización do calendario usando WebDAV* Personaliza os eventos do "
-#~ "calendario e os atributos das tarefas con calquera módulo de OpenERP* "
-#~ "Proporciona a funcionalidade de Importación/Exportación iCal\n"
-#~ "Para acceder a Calendarios usando clientes CalDAV, diríxaos a: "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "Para acceder ó Calendario de OpenERP con WebCal para o sitio remoto, use a "
-#~ "URL como: "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics "
-#~ "Onde,HOSTNAME: Host onde se está a executar o servidor OpenERP (con "
-#~ "WebDAV)PORT: Porto onde se está a executar o servidor OpenERP (por defecto: "
-#~ "8069)DATABASE_NAME: Nome da base de datos onde está o Calendario de "
-#~ "OpenERPCALENDAR_NAME: Nome do calendario a acceder\n"
-#~ "     "
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Compartir calendario usando CalDAV"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1. Ir á vista de Calendario2. Arquivo -> Novo -> Calendario3. Encha o "
-#~ "formulario - Tipo: CalDAV- Nome: O que desexe (Ex: Reunións)- URL: "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (Ex: "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) amosado "
-#~ "na parte superior desta fiestra- Desmarque \"Usar SSL\"- Usuario: O seu nome "
-#~ "de usuario (Ex: Demo)- Actualizar: Período co que quere que Evolution "
-#~ "sincronice os datos co servidor4. Faga clic en Aceptar e introduza o seu "
-#~ "contrasinal de OpenERP5. Un novo calendario CalDAV co nome que vostede "
-#~ "introduciu debe aparecer no lado esquerdo.     \n"
-#~ "     "
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Este módulo contén a funcionalidade básica para un sistema caldav como: -"
-#~ " Servidor WebDAV que proporciona acceso remoto ó calendario- Sincronización "
-#~ "do calendario utilizando WebDAV- Evento de calendario personalizado e "
-#~ "atributo todo (por facer) con calquera modelo de OpenERP- Proporciona a "
-#~ "funcionalidade Importar/Exportar iCalPara acceder a calendarios usando "
-#~ "clientes CalDAV, introduza neles o "
-#~ "enderezo:http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c"
-#~ "Para acceder ó calendario OpenERP usando WebCal a un sitio remoto, introduza "
-#~ "a URL "
-#~ "así:http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/CALENDAR_NAME.icsOnde"
-#~ ",HOSTNAME: Host onde se executa o servidor OpenERP (con webdav) PORT : Porto "
-#~ "onde se executa o servidor OpenERP (por defecto: 8069)DATABASE_NAME: Nome da "
-#~ "base de datos onde se creou o calendario OpenERP CALENDAR_NAME: Nome do "
-#~ "calendario a acceder\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Para a configuración específica de SSL, consulte a documentación "
-#~ "seguinte. Agora, para configurar o calendario, cómpre:1. Facer clic en "
-#~ "\"Configuración\" e ir a páxina \"Correo, Contactos, Calendarios\"2. Ir a "
-#~ "\"Engadir conta...\"3. Facer clic en \"Outras\"4. Desde o grupo "
-#~ "\"Calendarios\", seleccionar \"Engadir conta CalDAV\"5. Introducir o nome do "
-#~ "host (Ex: se a URL é http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com é o host)6. Encher o Usuario e o Contrasinal co seu usuario e "
-#~ "contrasinal de OpenERP7. Como Descrición, pode deixar o nome do servidor ou "
-#~ "algo así como \"Calendarios OpenERP\".8. Se non está a utilizar un servidor "
-#~ "SSL, obterá un erro, non se preocupe e prema \"Continuar\"9. A continuación, "
-#~ "facer clic en \"Configuración avanzada\" para especificar os portos e rutas "
-#~ "correctos10. Especificar o porto para o servidor OpenERP: 8071 para SSL, "
-#~ "8069 sen SSL.11. Configurar a \"Conta URL\" na ruta correcta do WebDAV "
-#~ "OpenERP:a URL proposta polo asistente (Ex: "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/)12. Facer clic en Feito. O "
-#~ "teléfono conectarase ó servidor OpenERP e comprobará que pode utilizar a "
-#~ "conta.13. Ir ó menú principal do iPhone e introducir a aplicación "
-#~ "Calendario. Os seus calendarios de OpenERP serán visibles dentro da "
-#~ "selección do botón \"Calendarios\". Observe que ó crear unha nova entrada de "
-#~ "calendario, terá que especificar en que calendario debe gardarse. Se vostede "
-#~ "necesita SSL (e o seu certificado non está verificado, como é usual), "
-#~ "primeiro terá que dicirlle ó iPhone que confíe nel. Siga estes pasos:s1. "
-#~ "Abra Safari e introduza o lugar HTTPS do servidor "
-#~ "OpenERP:https://my.server.ip:8071/(asumindo que ten o servidor en "
-#~ "\"my.server.ip\" e o porto HTTPS é o valor por defecto 8071)s2. Safari "
-#~ "tentará conectarse e emitirá unha advertencia sobre o certificado utilizado. "
-#~ "Inspeccione o certificado e faga clic en \"Aceptar\" para que o iPhone "
-#~ "confíe nel.   \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Prerrequisito----------Non hai forma interna de sincronizar o calendario con "
-#~ "CalDAVAsí que hai que instalar software de terceiros: Calendario (CalDav) "
-#~ "polo de agora é a única formaConfiguración-------------1. Abra Calendar "
-#~ "SyncObterá unha interface con dúas pestanasPermaneza na primeira2. URL do "
-#~ "Calendario CalDAV: Introduza a URL arriba proporcionada (Ex: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)3. Introduza "
-#~ "o seu nome de usuario e o contrasinal de OpenERP4. Se o seu servidor non usa "
-#~ "SSL, recibirá un aviso, responda \"Si\"5. Agora pode sincronizar manualmente "
-#~ "ou personalizar a configuración para sincronizar cada x minutos.\n"
-#~ "    \n"
-#~ "    "
-
-#~ msgid "Select ICS file"
-#~ msgstr "Seleccionar arquivo ICS"
-
-#~ msgid "Browse caldav"
-#~ msgstr "Amosar CalDAV"
diff --git a/addons/caldav/i18n/hr.po b/addons/caldav/i18n/hr.po
deleted file mode 100644
index 08a30c94ccf..00000000000
--- a/addons/caldav/i18n/hr.po
+++ /dev/null
@@ -1,836 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * caldav
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:31+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Mapiranje vrijednosti"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "Url of the caldav server, use for synchronization"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Datoteka"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Event Export"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Provide Path for Remote Calendar"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Import .ics File"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Zatvori"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Attendee"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "Can not map a field more than once"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Object"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Za obaviti"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Povlašteni obrazac korisnika"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Services"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Expression as constant"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolution"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "U redu"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Caldav Server"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr "Datetime In UTC"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "Za napraviti"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Export ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Use the field"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Calendar Lines"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Pretplata na događaje"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Uvezi ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Cancel"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Događaj"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Kalendar Kolekcija"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Pogreška! Ne možete stvarati rekurzivne mape."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Otvori"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Vrsta"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Save in .ics format"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Calendar attributes"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Caldav Browse"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Android based device"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Datum kreiranja"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Mapiranje Atributa"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Mapa"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Provide path for remote calendar"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domena"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Pretplati"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Vlasnik"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Kalendar"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "OpenObject Field"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "Res. ID"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Message..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Calendar Collections"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "The same filename cannot apply to two records!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "Mapa ne može biti sama sebi nadređena!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Calendars"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Zbirka"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Write Date"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "The directory name must be unique !"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "User Preference"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Expression"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Select ICS File"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Software/Uređaji"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Mapiranje polja"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "Browse Caldav"
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Ostale informacije"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Ostale"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"akođer izvoz <name>. ICS ulazak uz mapu Kalendar, s WebCal sadržajem."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Funkcija"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "Kalendar/redak na koji se primjenjije ovo mapiranje"
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Mapiranje"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Uvezi"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Event Import"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Interval u satima"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Ime datoteke"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Pretplata na drugi udaljeni kalendar"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr "For supporting clients, the color of the calendar entries"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Naziv"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarm"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Export .ics File"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Save ICS file"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Order"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Color"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "MY"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Calendar fields"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Uvezi poruku"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Subscribe"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "Mapa mora imati roditelja ili pohranu (storage)"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "osnovno.kalendar.za napraviti"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr "For supporting clients, the order of this folder among the calendars"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Provide path for Remote Calendar"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Select ICS file"
-
-#~ msgid "Browse caldav"
-#~ msgstr "Browse caldav"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Share Calendar using CalDAV"
diff --git a/addons/caldav/i18n/hu.po b/addons/caldav/i18n/hu.po
deleted file mode 100644
index 0904c951922..00000000000
--- a/addons/caldav/i18n/hu.po
+++ /dev/null
@@ -1,831 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * caldav
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:31+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Érték leképezés"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Fájlnév"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Esemény exportálása"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Adja meg a távoli naptár elérési útját"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr ".ics fájl importálása"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Résztvevő"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Vigyázat !"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Tárgy"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Tennivaló"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Szolgáltatások"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "CalDAV szerver"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "Tennivaló"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "ISC exportálása"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Használja a mezőt"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Naptársorok"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Feliratkozás az eseményre"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "ICS importálása"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Esemény"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Naptárgyűjtemény"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Hiba! Nem hozhat létre körkörös mappahivatkozást."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Típus"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Mentse .ics formátumban"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Hiba !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Naptár attributumok"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "CalDAV böngészése"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Létrehozás dátuma"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Attributumok leképezése"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Könyvtár"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Adja meg a távoli naptár elérési útját"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domain"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Tulajdonos"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Naptár"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Az ICS formátum érvénytelen, a fájlt nem lehet importálni"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Üzenet..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Naptárgyűjtemények"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Naptárak"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Gyűjtemény"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Dátum írása"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "A könyvtár nevének egyedinek kell lennie !"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Kérjük, adja meg a megfelelő URL-t!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Kifejezés"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "ICS fájl kiválasztása"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Szoftver/Eszközök"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Mezők leképezése"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "CalDAV böngészése"
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Egyéb információ"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Egyéb"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Funkció"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Leírás"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Leképezés"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Sikeres importálás"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Esemény importálása"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervallum órákban"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Fájl neve"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Név"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Figyelmeztetés"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr ".ics fájl exportálása"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "ICS fájl mentése"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Megrendelés"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Hiba!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Színek"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Naptármezők"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Üzenet importálása"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Feliratkozás"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Adja meg a távoli naptár elérési útját"
-
-#~ msgid "Select ICS file"
-#~ msgstr "ICS fájl kiválasztása"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "CalDAV segítségével ossza meg a naptárát"
-
-#~ msgid "Browse caldav"
-#~ msgstr "CalDAV böngészése"
diff --git a/addons/caldav/i18n/it.po b/addons/caldav/i18n/it.po
deleted file mode 100644
index d1a4e5d9c16..00000000000
--- a/addons/caldav/i18n/it.po
+++ /dev/null
@@ -1,1105 +0,0 @@
-# Italian 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:24+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Mappatura Valore"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "URL del server caldav, utilizzare per sincronizzazione"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Nome File"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Esportazione evento"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Fornire il percorso per il Calendario Remoto"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importa file .ICS"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Chiuso"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Partecipante"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "Non è possibile mappare un campo più di una volta"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Attenzione!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Oggetto"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Da fare"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Modulo preferenze utente"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Servizi"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Espressione come costante"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evoluzione"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-"Per favore fornire la corretta configurazione di \"%s\" nelle linee del "
-"Calendario"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Server caldav"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "DA FARE"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Esporta ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Usa il campo"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "Non è possibile creare più di una volta linee: \"%s\""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Linee calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Iscrizione Evento"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importa ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Annulla"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Evento"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Collezione Calendario"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Errore! Non è possibile creare Cartelle ricorsive."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Apri"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Salva nel formato .ICS"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Errore !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Attributi calendario"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Sfoglia caldav"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Dispositivo basato su Android"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Data di Creazione"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Mappatura Attributi"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Cartella"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Fornire il percorso del calendario remoto"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Dominio"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Sottoscrivi"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Proprietario"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-"Per favore installare python-vobject da "
-"http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Formato non valido dell ics, il file non può essere importato"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "Campo OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "ID Ris."
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Messaggio..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Collezioni calendario"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "Lo stesso nome file non può essere applicato a due record!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "La cartella non può essere padre di sè stessa!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Calendari"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Collezione"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Scrivi data"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "Il nome della cartella deve essere unico!"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Preferenze utente"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Per favore fornire l'URL corretto!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Espressione"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Selezionare il file ICS"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Software / Dispositivi"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Mappatura Campi"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "Sfoglia caldav"
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Altre Informazioni"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Altro"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Esportare una <name>.ics vicino alla cartella calendario, con contenuto "
-"WebCal."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Funzione"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Descrizione"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "Applicare la mappatura calendario/linea a"
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Mappatura"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Importazione effettuata con successo"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importa"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Importa evento"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervallo in ore"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Nome file"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Sottoscriversi ad un Calendario remoto"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr "Per il client supportati, il colore delle voci calendario"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Allarme"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Il partecipante deve avere un ID email"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Esporta file .ICS"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "Errore importazione vobject!"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Salva file ISC"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird / Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Ordine"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Errore!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Colore"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "MIEI"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Campi calendario"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importa messaggio"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Sottoscrivi"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "La Cartella deve avere un padre o uno storage"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
-#~ "speciale!"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Fornire il percorso per il Calendario Remoto"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Selezionare il file ICS"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Condividere il calendario usando CalDav"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Questo modulo contiene funzionalità base per sistemi CalDAV come:  \n"
-#~ "  - Server WebDAV che fornisce un accesso remoto al calendario\n"
-#~ "  - Sincronizzazione di calendari usando WebDAV\n"
-#~ "  - Personalizzazione evento calendario e attributi con ogni modello di "
-#~ "OpenERP\n"
-#~ "  - Fornisce funzionalità di importazione / esportazione iCal\n"
-#~ "\n"
-#~ "    Per accedere ai calendari usando i client CalDAV, puntare a:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Per accedere al calendario OpenERP usare WebCAL al sito remoto usando "
-#~ "l'URL:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Dove,\n"
-#~ "        HOSTNAME: host (con webdav) dove sta girando il server OpenERP\n"
-#~ "        PORT: porta in cui sta \"ascoltando\" il server OpenERP (per "
-#~ "default: 8069)\n"
-#~ "        DATABAE_NAME: Nome del database su cui il calendario OpenERP è stato "
-#~ "creato\n"
-#~ "        CALENDAR_NAME: Nome del calendario a cui accedere\n"
-
-#~ msgid "Browse caldav"
-#~ msgstr "Sfoglia caldav"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1. Andate nella vista calendario\n"
-#~ "\n"
-#~ "    2. File -> Nuovo -> Calendario\n"
-#~ "\n"
-#~ "    3. Compilare il modulo \n"
-#~ "        - tipo: Caldav\n"
-#~ "        - nome: quello che volete (es. Meeting)\n"
-#~ "        - URL: "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (es : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) quello "
-#~ "fornito all'inizio di questa videata\n"
-#~ "        - Togliere la spunta \"Usa SSL\"\n"
-#~ "        - Nome utente: Il vostro nome utente (es.: demo)\n"
-#~ "        - Refresh: quante volte volete che evolution sincronizzi i dati con "
-#~ "il server\n"
-#~ "\n"
-#~ "    4. Cliccare OK e fornire la vostra password di OpenERP\n"
-#~ "\n"
-#~ "    5. Un nuovo calendario chiamata con il nome da voi fornito dovrebbe "
-#~ "comparire sul lato sinistro.     \n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Prerequisiti\n"
-#~ "----------\n"
-#~ "Se state utilizzando Thunderbird, prima è necessario installare il modulo "
-#~ "lightning\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configurazione\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Andare in visualizzazione calendario\n"
-#~ "\n"
-#~ "2. File -> Nuovo calendario\n"
-#~ "\n"
-#~ "3. Scegliere \"Sulla rete\"\n"
-#~ "\n"
-#~ "4. Per il formato scegliere CalDav\n"
-#~ "   e come luogo scegliere l'URL qui fornito (es. "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Scegliere un nome ed un colore per il calendario, consigliamo di togliere "
-#~ "la spunta su \"Mostra allarmi\"\n"
-#~ "\n"
-#~ "6. Inserire poi il vostro login e password di OpenERP (per non dover più "
-#~ "fornire la password spuntare \"Usa il password manager per ricordare questa "
-#~ "password\"\n"
-#~ "\n"
-#~ "7. Il processo è completo, i vostri meeting dovrebbero apparire ora sulla "
-#~ "vista calendario\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  * Server WebDav che fornisce un accesso remoto al calendario\n"
-#~ "  * Sincronizzazione di calendario utilizzando WebDav\n"
-#~ "  * Personalizza eventi calendari e attributi con ogni modello OpenERP\n"
-#~ "  * Fornisce funzionalità di import / export iCal\n"
-#~ "\n"
-#~ "    Per accedere ai calendario utilizzando client CalDav, farli puntare a:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Per accedere al calendario OpenERP utilizzando WebCal da sito remoto "
-#~ "utilizzare un URL tipo:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Dove,\n"
-#~ "        HOSTNAME: Host dove risiede il server OpenERP (con WebDav attivo)\n"
-#~ "        PORT: porta su cui sta girando il server OpenERP (di default è "
-#~ "8069)\n"
-#~ "        DATABASE_NAME: Nome del database su cui il calendario OpenERP è "
-#~ "stato creato\n"
-#~ "        CALENDAR_NAME: Nome del calendario a cui accedere\n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Prerequisiti\n"
-#~ "---------\n"
-#~ "Non c'è un modo pre costruito di sincronizzare un calendario con caldav.\n"
-#~ "E' perciò necessario installare software di terze parti: Calendario "
-#~ "(CalDav), \n"
-#~ "per ora, è il solo\n"
-#~ "\n"
-#~ "configurazione\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Aprire sincronizzazione calendario\n"
-#~ "   Io fornisco un'interfaccia con 2 tabulazioni\n"
-#~ "   Stare sul primo\n"
-#~ "   \n"
-#~ "2. URL calendario Caldav: mettere l'URL qui fornito (es: "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Fornire il vostro utente e password di openerp\n"
-#~ "\n"
-#~ "4. Se il vostro server non utilizza SSL, avrete un avviso, confermate con "
-#~ "\"Sì\"\n"
-#~ "\n"
-#~ "5. Fatto questo potrete sincronizzare manualmente o personalizzare le "
-#~ "impostazioni di sincronizzazione ogni x minuti.\n"
-#~ "    \n"
-#~ "    "
diff --git a/addons/caldav/i18n/ja.po b/addons/caldav/i18n/ja.po
deleted file mode 100644
index e2282c72122..00000000000
--- a/addons/caldav/i18n/ja.po
+++ /dev/null
@@ -1,959 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-08 02:42+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "価値の配分"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "caldavサーバのURL。同期化に使われます。"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"事前要求事項\n"
-"----------\n"
-"CalDAVとのカレンダー同期を行う組み込みの方法はありません。\n"
-"サードパーティのソフトウェアのインストールが必要です：Calendar（CalDAV）が現在唯一です。\n"
-"\n"
-"設定\n"
-"-------------\n"
-"\n"
-"1. Calendar Syncを開きます。\n"
-"    ２つのタブのインタフェースが現れます。\n"
-"    最初のタブに留まります。\n"
-"\n"
-"2. CaDAV Calendar URL：そのURL にアクセスします（即ち "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings）。\n"
-"\n"
-"3. OpenERPのユーザ名とパスワードを入力します。\n"
-"\n"
-"4. サーバがSSLを使わない場合は警告を受けます。\"Yes\"を応答します。\n"
-"\n"
-"5. すると、手動で同期、または x分毎に同期を設定するカスタマイズが可能です。\n"
-"\n"
-"    "
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "ファイル名"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "イベントのエクスポート"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "遠隔カレンダーへの経路を指定して下さい。"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr ".ics ファイルのインポート"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "閉じる(_C)"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "出席者"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "項目を重複して割当てることはできません。"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"カレンダーはOpenERPモデルの全てとともにカレンダーイベントとToDo属性のカスタマイズが可能です。カレンダーはiCalのインポート / "
-"エクスポートを提供します。WebDAVサーバはカレンダーへのリモートアクセスを提供します。カレンダークライアントとともにミーティングの同期を手伝います。S"
-"unbird、Calendar Evaluation、MobileのようにCalDAVクライアントを使ってカレンダーにアクセスできます。"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "警告"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "オブジェクト"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "作業項目"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "ユーザ参照票"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "サービス"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "定数の表現"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "評価"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "OK"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-"\n"
-"    1. カレンダービューへ行く\n"
-"\n"
-"    2. ファイル -> 新規 -> カレンダー\n"
-"\n"
-"    3. フォームを埋める\n"
-"        ・ タイプ：CalDav\n"
-"        ・ 名前：好みの名前（例：会議）\n"
-"        ・ "
-"URL：http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings （例： "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings）このウィンドウに与えら"
-"れたもの\n"
-"        ・ \"SSL使用\"のチェックを外す\n"
-"        ・ ユーザ名：あなたのユーザ名（例：demo）\n"
-"        ・ リフレッシュ：サーバとデータの同期を行う好みの時間間隔\n"
-"\n"
-"    4. OKをクリックし、OpenERPのパスワードを入力\n"
-"\n"
-"    5. 名付けをした新しいカレンダーが左側に表示\n"
-"     "
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr "カレンダー行の \"%s\" を正しく設定して下さい。"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr "Caldav のホスト名の設定"
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Caldav サーバ"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr "協定世界時の日付と時間"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "i フォン"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "実行すべきこと"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "ICS をエクスポートする"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "この項目を使用"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "複数の \"%s\" 行を作ることはできません。"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr "Webcal カレンダー"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "カレンダー行"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "イベントの予定"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "ICSをインポート"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "キャンセル( _C )"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "イベント"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "カレンダー収集"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "エラー：ディレクトリを重複して作ることはできません。"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "開く( _O )"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr "次へ"
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "タイプ"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr ".ics 形式で保存"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "エラー"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "カレンダーの特性"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Caldavブラウズ"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "アンドロイド搭載デバイス"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr "OpenERPのホスト名を設定して下さい。例えば： "
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "作成日"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "特性のマッピング"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "ディレクトリ"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "遠隔カレンダーへの経路を指定して下さい。"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "ドメイン"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "継読する ( _S )"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "所有者"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "カレンダー"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-"http://vobject.skyhouseconsulting.com/ からpython-vobjectをダウンロードして、インストールして下さい。"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "ICS の形式が正しくありません。ファイルをインポートできません。"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "OpenObject 項目"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "応答ID"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "メッセージ…"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "カレンダー収集"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "同じファイル名を2つのレコードに適用することはできません。"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "ディレクトリはそれ自身の親になれません。"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "カレンダー"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "集合"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "記入日"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-"\n"
-"  ・ WebDAVサーバはカレンダーにリモートアクセスを提供\n"
-"  ・ WebDAVを使ってカレンダーの同期\n"
-"  ・ 全てのOpenERPモデルとともにカレンダーイベントとToDo属性をカスタマイズ\n"
-"  ・ iCalのインポート / エクスポート機能を提供\n"
-"\n"
-"    CalDAVクライアントを使ってカレンダーにアクセスする先：\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    WebCalを使ってOpenERPカレンダーにアクセスするためのリモートサイトのURL：\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      場所\n"
-"        HOSTNAME：稼動中のOpenERPサーバ（WebDAVとともに）ホスト名\n"
-"        PORT：稼動中のOpenERPサーバのポート（デフォルト：8069）\n"
-"        DATABASE_NAME：作成されたOpenERPカレンダーのデータベース名\n"
-"     "
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "ディレクトリ名は固有でなければいけません。"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "ユーザ参照"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "正しいURLを指定して下さい。"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "表現"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "ICS ファイルの選択"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "ソフトウェア / デバイス"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "項目マッピング"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-"\n"
-"事前要求事項\n"
-"----------\n"
-"Thunderbirdを使っている場合、最初にlightningモジュールをインストールする必要があります。\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"設定\n"
-"-------------\n"
-"1. カレンダービューへ行く\n"
-"\n"
-"2. ファイル -> 新規カレンダー\n"
-"\n"
-"3. \"ネットワークで\"を選択\n"
-"\n"
-"4. フォーマットとしてCalDAVを選択\n"
-"   "
-"場所としてURLを指定（例：http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings）"
-"\n"
-"\n"
-"5. カレンダーの名前と色を選択。警報のチェックを外すのが望ましい\n"
-"\n"
-"6. OpenERPのログイン名とパスワードを入力（パスワード入力を１回だけとする場合はパスワードを記憶するをチェック）\n"
-"\n"
-"7. 完了すると、その時にはカレンダービューにミーティングが現れる\n"
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "caldav を表示する"
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr "ホスト名"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "他の情報"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "その他"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr "私のカレンダー"
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr "また、<name>.ics エントリーを隣のカレンダーフォルダにWebCalコンテンツとともにインポートします。"
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "機能"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr "database.my.openerp.com or companyserver.com"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "詳細"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "このマッピングのカレンダー / 行の適用先"
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "マッピング"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "正しくインポートしました。"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "インポート( _I )"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "イベントのインポート"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "時間間隔"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "ファイル名"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "遠隔カレンダを継読する。"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr "サポートするクライアントのカレンダーエントリーの色"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "氏名"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "警報"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "出席者はEメールIDを持っていなければいけません。"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr ".ics ファイルをエクスポートする。"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "vobject のインポートエラー"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "ICS ファイルを保存する"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-"\n"
-"    SSL固有の設定は以下のドキュメントを参照して下さい。\n"
-"\n"
-"カレンダーの設定のために次のことをする必要があります：\n"
-"\n"
-"1. 設定をクリックし、メール、コンタクト、カレンダーページに行きます。\n"
-"2. アカウントを追加に進みます。\n"
-"3. その他をクリックします。\n"
-"4. カレンダーグループからCalDAVアカウントの追加を選択します。\n"
-"\n"
-"5. ホスト名を入力します。\n"
-"   （例：URLが http://openerp.com:8069/webdav/db_1/calendars/ "
-"であれば、openerp.comのホスト）\n"
-"\n"
-"6. OpenERPのユーザ名とパスワードを埋めます。\n"
-"\n"
-"7. 詳細として、サーバ名かOpenERPカレンダーの類の何れかを残すことができます。\n"
-"\n"
-"9. SSLサーバを使わない場合、エラーが発生します。気に留めず継続を押下します。\n"
-"\n"
-"10. 詳細設定をクリックし正しいポートとパスを設定します。\n"
-"\n"
-"11. OpenERPサーバのポートを指定：SSLは8071、他は8069\n"
-"\n"
-"12. アカウントURLにOpenERP WebDAVの正しいパスを設定します。\n"
-"    URLはウィザードにより与えられます（例：http://my.server.ip:8069/webdav/dbname/calendars/）\n"
-"\n"
-"13. 完了をクリック。上手くいけば電話はOpenERPサーバに接続詞アカウントの使用を検証します。\n"
-"\n"
-"14. iPhoneのメインメニューに行き、カレンダーアプリケーションに入ります。\n"
-"　　あなたのOpenERPカレンダーはカレンダーボタンの選択の内側に表示される。\n"
-"　　新しいカレンダーエントリーを作成する時、保存されるカレンダーの指定が必要であることに注意して下さい。\n"
-"\n"
-"SSLを必要とする場合は（証明書はいつものように検証済ではない）、最初に次の手順でiPhoneに信頼させることが必要です。\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"\n"
-"    s1. Safari（ブラウザ）を開いてOpenERPサーバのhttpsの場所を入力します：\n"
-"　      https://my.server.ip:8071/\n"
-"      （サーバが\"my.server.ip\"にありHTTPSポートがデフォルトの8071と想定)\n"
-"    s2. Safariは接続してその証明書が使われたことを警告します。証明書を検証し、同意するとiPhoneは信頼します。\n"
-"    "
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "順序"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "エラー"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "色"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "カレンダー項目"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "インポートメッセージ"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "継読する"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "ディレクトリは親あるいはストレージを持っていなければいけません。"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr "サポートするクライアントのカレンダー中のフォルダ並び順"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "遠隔カレンダーへの経路を指定して下さい。"
-
-#~ msgid "Select ICS file"
-#~ msgstr "ICS ファイルを選んで下さい。"
-
-#~ msgid "Browse caldav"
-#~ msgstr "caldav を表示する"
diff --git a/addons/caldav/i18n/lv.po b/addons/caldav/i18n/lv.po
deleted file mode 100644
index 968ddefdbd8..00000000000
--- a/addons/caldav/i18n/lv.po
+++ /dev/null
@@ -1,828 +0,0 @@
-# Latvian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:18+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Latvian <lv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Vērtību kartēšana"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Faila nosaukums"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Pasākumu eksports"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Norādiet ceļu uz attālināto kalendāru"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importēt .ics failu"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Aizvērt"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Dalībnieks"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "Nevar kartēt lauku vairāk par vienu reizi"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Uzmanību!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objekts"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Izdarīt"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Izteiksme kā konstante"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Labi"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "TODO"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Eksportēt ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Lietot šo lauku"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "Nevar izveidot irndu \"%s\" vairāk par vienu reizi"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Kalendāra rindas"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Pierakstīšanas uz pasākumiem"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importēt ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Atcelt"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Notikums"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Kalendāru kolekcija"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Kļūda! Nevar veidot rekursīvas mapes."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tips"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Saglabāt .ics formātā"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Kļūda!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Kalendāra īpašības"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Izveides Datums"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Īpašību kartēšana"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Mape"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Norādiet ceļu uz attālināto kalendāru"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domēns"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Pierakstīties"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Īpašnieks"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Kalendārs"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Nekorekts ics formāts, nevar importēt failu."
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "OpenObject lauks"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "Res. ID"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Ziņojums..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Kalendāru kolekcijas"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "Nevar pielietot vienu faila nosaukumu diviem ierakstiem!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "Mape nevar būt virsmape pati sev!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Kalendāri"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Kolekcija"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "Mapes nosaukumam jābūt unikālam!"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Lūdzu, norādie korektu URL!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Izteiksme"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Izvēlēties ICS failus"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Lauku Sasaiste"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Cita informācija"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Funkcija"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Apraksts"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Kartēšana"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importēt"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Pasākumu imports"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervāls stundās"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Faila nosaukums"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Pierakstīties uz attālināto kalendāru"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nosaukums"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Atgādinājums"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Dalībniekam jābūt e-pasta ID"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Eksportēt .ics failu"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "vobject Importa Kļūda!"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Saglabāt ICS failu"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Secība"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Kļūda!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Krāsa"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "Mans"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Kalendāra lauki"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importēt ziņojumus"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Pierakstīties"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-
-#~ msgid "Select ICS file"
-#~ msgstr "Izvēlēties ICS failus"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Norādiet ceļu uz attālināto kalendāru"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Dalīties kalendārā lietotj CalDAV"
diff --git a/addons/caldav/i18n/mn.po b/addons/caldav/i18n/mn.po
deleted file mode 100644
index c54fff471b3..00000000000
--- a/addons/caldav/i18n/mn.po
+++ /dev/null
@@ -1,821 +0,0 @@
-# Mongolian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-08-10 08:54+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-11 05:46+0000\n"
-"X-Generator: Launchpad (build 15780)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr ""
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Энгийн талбар"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr ""
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Каледарын Цуглуулга"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr ""
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Андройд дээр суурилсан төхөөрөмж"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-"Уучлаарай python-vobject эндээс http://vobject.skyhouseconsulting.com/ "
-"суулгана уу"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Мессеж"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr ""
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Програм /Төхөөрөмжүүд"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "vobject Импорт алдаа !"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "ICS файл хадгалах"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Импортын Мессеж"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
diff --git a/addons/caldav/i18n/nl.po b/addons/caldav/i18n/nl.po
deleted file mode 100644
index a0bc6b68738..00000000000
--- a/addons/caldav/i18n/nl.po
+++ /dev/null
@@ -1,1369 +0,0 @@
-# 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:56+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <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: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Waarde verdeling"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "Url van de caldav server, gebruikt voor synchronisatie"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"Voorwoord\n"
-"----------\n"
-"Er is geen ingebouwde manier om agenda te synchroniseren met CalDAV.\n"
-"Zodoende is het noodzakelijk om software van derden te installeren: Calendar "
-"(CalDav)\n"
-"Dit is voor nu is het de enige mogelijkheid\n"
-"\n"
-"configuratie\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"    UW krijgt een scherm met 2 tabs\n"
-"    Blijf op de eerste tab\n"
-"\n"
-"2. CaDAV Kalender URL: Geef hier de URL in zoals eerder aangegeven (bijv: "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Voer uw OpenERP gebruikersnaam en wachtwoord in\n"
-"\n"
-"4. Als uw server geen gebruik maken van SSL, krijg u een waarchuwing, zeg "
-"\"Ja\"\n"
-"\n"
-"5. Dan kunt u handmatig synchroniseren of handmatig instellingen maken om "
-"elke x minuten te synchroniseren.\n"
-"\n"
-"    "
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Bestandsnaam"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Gebeurtenis exporteren"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Vul het pad naar de remote agenda in"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importeren .ics bestand"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Sluiten"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Deelnemer"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "Kan een veld niet meer dan één keer indelen"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"\"Agenda\" laat u gebeurtenissen en taken onderhouden met elk OpenERP model. "
-"Agenda heeft iCal Import/Export functies en een Webdav server die in externe "
-"toegang voorziet. U kunt Agenda synchroniseren met uw agenda client. U "
-"krijgt toegang tot Agenda via CalDAV cliënten zoals thunderbird, evolution, "
-"mobiel."
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Waarschuwing !"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Object"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Te doen"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Gebruiker voorkeuren formulier"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Services"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Expressie als constante"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolution"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-"\n"
-"    1. Ga naar kalanderweergave\n"
-"\n"
-"    2. Bestand -> Nieuw -> Kalender\n"
-"\n"
-"    3. Vul het formulier in;\n"
-"        - type : CalDav\n"
-"        - naam : Wat uwilt (bijv. : Bespreking)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) degene "
-"welke wordt aangegeven bovenaan dit scherm\n"
-"        - uitvinken \"User SSL\"\n"
-"        - gebruikersnaam: Uw naam (bijv. : Demo)\n"
-"        - ververs: iedere keer dat de data met de server wordt "
-"gesynchroniseerd.\n"
-"\n"
-"    4. Klik op ok en geef uw OpenERP wachtwoord in\n"
-"\n"
-"    5. Een nieuwe kalender met de naam die u zojuist heeft gekozen moet "
-"verschijnen aan de linkerzijde.\n"
-"     "
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr "Vul aub juiste configuratie van \"%s\" in bij agendaregels"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr "Caldav's hostnaam configuratie"
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Caldav Server"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr "Datetime in UTC"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "TE DOEN"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "ICS exporteren"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Het veld gebruiken"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "Kan regel \"%s\" niet meer dan eens maken"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr "Webcal kalendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Agendaregels"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Gebeurtenis inschrijven"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "ICS importeren"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Annuleren"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Gebeurtenis"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Agenda collectie"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Fout ! U kunt geen recursieve mappen maken."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Openen"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr "Volgende"
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Soort"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Opslaan in .ics indeling"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Fout !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Agenda kenmerken"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Caldav Browse"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Android gebaseerd apparaat"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr "Configureer de OpenERP hostnaam. Bijvoorbeeld: "
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Datum gemaakt"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Kenmerk verdeling"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Map"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Pad naar remote agenda invullen"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domein"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Inschrijven"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Eigenaar"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Agenda"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-"Installeer aub python-vobject via http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Ongeldig formaat van ics, bestand kan niet worden geïmporteerd"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "OpenObject veld"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "Res. ID"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Bericht..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Agenda mappen"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "Dezelfde bestandsnaam kan niet gebruikt worden voor twee records!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "Map kan niet bovenliggend aan zichzelf zijn!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Agenda's"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Agendamap"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Schrijfdatum"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-"\n"
-"  * WebDAV-server die op afstand toegang biedt tot agenda\n"
-"   * Synchronisatie van agenda met behulp van WebDAV\n"
-"   * Aanpassen agenda-item en todo attribuut met een van OpenERP model\n"
-"   * Biedt iCal Import / Export functionaliteit\n"
-"\n"
-"     Om agenda's met behulp van CalDAV clients te benaderen, verwijs deze "
-"naar:\n"
-"         "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"     Om een OpenERP agenda met webcal naar externe site gebruik de URL:\n"
-"         "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"       waar;\n"
-"         HOSTNAME: Host waarop OpenERP server (met WebDAV) draait\n"
-"         PORT: Port waarop OpenERP server draait (standaard: 8069)\n"
-"         Database_name: Naam van de databank waarop OpenERP agenda is "
-"gemaakt\n"
-"     "
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "De mapnaam moet uniek zijn!"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Gebruikers voorkeuren"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Vul aub een correcte URL in !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Expressie"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "ICS bestand selecteren"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Software/apparaten"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Velden verdeling"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-"\n"
-"Voorwoord\n"
-"-------------\n"
-"Als u Thunderbird gebruikt, dient u eerst de 'lightning' module te "
-"installeren\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuratie\n"
-"-------------\n"
-"\n"
-"1. Ga naar de kalenderweergave\n"
-"\n"
-"2. Bestand -> Nieuwe agenda\n"
-"\n"
-"3. Kies \"Op het netwerk\"\n"
-"\n"
-"4. Voor het formaat kiest u CalDav\n"
-"    en de locatie van de url hierboven gegeven (bijv: "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Kies een naam en een kleur voor de Agenda, en wij adviseren u het vinkje "
-"\"alarm\" uit te vinken\n"
-"\n"
-"6. Geef vervolgens uw OpenERP gebruikersnaam en het wachtwoord in\n"
-"\n"
-"7. Klik vervolgens op Voltooien. Uw afspraken woerden nu weergegeven in uw "
-"agenda\n"
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "Browse Caldav"
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr "Hostnaam"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Overige info"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Overig"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr "Mijn kalender(s)"
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Ook een <naam>.ics bestand naar de agendamap exporteren, met WebCal inhoud."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Functie"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr "database.my.openerp.com  of bedrijfsserver.com"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Omschrijving"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "De agendaregel heeft betrekking op"
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Verdeling"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Importeren succesvol"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importeren"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Gebeurtenis importeren"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Interval in uren"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Bestandsnaam"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Inschrijven op remote agenda"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr "Voor ondersteunde clients, de kleur van de agenda items"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Naam"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarm"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Deelnemer moet een emailadres hebben"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Exporteren .ics bestand"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "vobject import fout!"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "ICS bestand opslaan"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-"\n"
-"    Voor SSL-specifieke configuratie raadpleegt u de documentatie hieronder\n"
-"\n"
-"Om de agenda's in te stellen, dient u:\n"
-"\n"
-"1. Klik op de \"Instelingen\" en ga naar de \"Mail, Contacten, Agenda's\" "
-"pagina.\n"
-"2. Ga naar \"Account toevoegen ...\"\n"
-"3. Klik op \"Andere\"\n"
-"4. Van de \"Agenda\" groep, selecteer \"Toevoegen CalDAV Account\"\n"
-"\n"
-"5. Voer de hostnaam\n"
-"    (bijv.: als de url is http://openerp.com:8069/webdav/db_1/calendars/, "
-"openerp.com is de gastheer)\n"
-"\n"
-"6. Vul uw OpenERP gebruikersnaam en wachtwoord in\n"
-"\n"
-"7. Als een beschrijving, kunt u de server naam laten staan of\n"
-"    iets als \"OpenERP agenada's\".\n"
-"\n"
-"9. Als u geen gebruik maakt  van een SSL-server, krijgt u een foutmelding. "
-"Maakt u geen zorgen en druk op \"Doorgaan\"\n"
-"\n"
-"10. Klik vervolgens op de \"Geavanceerde instellingen\" een geeft in de "
-"jusite\n"
-"     poorten en paden.\n"
-"\n"
-"11. Geef de poort voor de OpenERP server: 8071 voor SSL, 8069 zonder.\n"
-"\n"
-"12. Stel de \"Account-URL\" op het juiste pad van de OpenERP webdav:\n"
-"     de url gegeven door de wizard (bijv: "
-"http://my.server.ip:8069/webdav/dbname/calendars/)\n"
-"\n"
-"11. Klik op Gereed. De telefoon zal hopelijk verbinding met de server "
-"OpenERP\n"
-"     en controleer of het de account kan gebruiken.\n"
-"\n"
-"12. Ga naar het hoofdmenu van de iPhone en daar ga naar de Agenda.\n"
-"     De OpenERP kalenders zijn  zichtbaar in de keuze van de Agenda's\n"
-"     Merk op dat wanneer u een nieuw agenda-item maakt, Moet u aangeven\n"
-"     voor welke kalender deze moet worden opgeslagen.\n"
-"\n"
-"Als u SSL nodig heeft (en uw certificaat is niet een geverifieerde, zoals "
-"meestal),\n"
-"dan moet u de iPhone dat eerst vertrouwen. Volg deze\n"
-"stappen:\n"
-"\n"
-"     s1. Open Safari en voer de https locatie van de OpenERP server:\n"
-"       https://my.server.ip:8071/\n"
-"       (ervan uitgaande dat je de server op \"my.server.ip\" en de HTTPS-"
-"poort\n"
-"       is de standaard 8071)\n"
-"     s2. Safari zal proberen verbinding te maken en een waarschuwing geven "
-"over het gebruikte certificaat.\n"
-"       Controleer het certificaat en klik op \"Accepteer\", zodat de iPhone "
-"het nu vertrouwt\n"
-"    "
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Volgorde"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Fout!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Kleur"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "MIJN"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Agenda velden"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Bericht importeren"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Inschrijven"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "Map moet een bovenliggende map hebben of opslag zijn"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-"Voor ondersteunende clients, de volgorde van deze map onder de agenda's"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Vul het pad naar de remote agenda in"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Agenda delen middels CalDAV"
-
-#~ msgid "Select ICS file"
-#~ msgstr "ICS bestand selecteren"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Deze module bevat basis functionaliteit voor een caldav systeem zoals:  "
-#~ "\n"
-#~ "  - Webdav server die voorziet in remote access voor de agenda\n"
-#~ "  - Synchronisatie van agenda gebruikmakend van WebDAV\n"
-#~ "  - Aanpassen agenda gebeurtenis en todo attribuut met elk OpenERP model\n"
-#~ "  - Voorzet in iCal Import/Export functionaliteit\n"
-#~ "\n"
-#~ "    Voor toegang tot agenda's met CalDAV clienten, stuur ze naar:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Voor toegang tot aganda's met WebCal naar remote site gebruik een URL "
-#~ "zoals:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Waarbij,\n"
-#~ "        HOSTNAME: Host waarop OpenERP server(met webdav) draait\n"
-#~ "        PORT : Poort waarop OpenERP server draait (standaard : 8069)\n"
-#~ "        DATABASE_NAME: Databasenaam waarin OpenERP agenda is gemaakt\n"
-#~ "        CALENDAR_NAME: te benaderen Agenda naam\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vereist\n"
-#~ "----------\n"
-#~ "Als u Thunderbird gebruikt moet u eerst de lightning module installeren\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuratie\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Ga naar Agenda weergave\n"
-#~ "\n"
-#~ "2. Bestand -> Nieuwe agenda\n"
-#~ "\n"
-#~ "3. Kies \"Op het netwerk\"\n"
-#~ "\n"
-#~ "4. voor formaat kies CalDav\n"
-#~ "   en als locatie de hierboven genoemde url (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Kies een naam en kleur voor de agenda, and we adviseren on \"alarm\" uit "
-#~ "te zetten\n"
-#~ "\n"
-#~ "6. Voer vervolgens uw openerp gebruiker en wachtwoord in (zet \"Gebruik "
-#~ "password Manager om dit wachtwoord te onthouden\" aan)\n"
-#~ "\n"
-#~ "7. Dan afsluiten, uw afspraken zouden nu in de agenda weergave te zien "
-#~ "moeten zijn\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  * Webdav server die remote toegang tot agenda geeft\n"
-#~ "  * Synchronisatie van aganda via WebDAV\n"
-#~ "  * Aanpassen agenda gebeurtenis en todo attribuut met elk OpenERP model\n"
-#~ "  * Voorziet in iCal Import/Export functionaliteit\n"
-#~ "\n"
-#~ "    Om agenda's te benaderen via CalDAV clients, verwijs ze naar:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Om de OpenERP agenda te benaderen via WebCal naar remote site gebruik de "
-#~ "URL zoals:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Waarbij,\n"
-#~ "        HOSTNAME: Host computer waarop OpenERP server(met webdav) draait\n"
-#~ "        PORT : Poort waarop OpenERP server draait (standaard : 8069)\n"
-#~ "        DATABASE_NAME: Naam van de database waarin de OpenERP agenda is "
-#~ "gemaakt\n"
-#~ "        CALENDAR_NAME: Naam van te benaderen agenda\n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1. Ga naar agenda weergave\n"
-#~ "\n"
-#~ "    2. Bestand -> Nieuw -> Agenda\n"
-#~ "\n"
-#~ "    3. Vul het formulier in \n"
-#~ "        - type : CalDav\n"
-#~ "        - naam : Wat je maar wilt (bijv : Afspraken)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (bijv : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) \n"
-#~ "        - zet \"User SSL\" uit\n"
-#~ "        - Username : uw gebruikersnaam (bijv : Demo)\n"
-#~ "        - Refresh : hoevaak u wilt dat evolution de gegevens synchroniseert "
-#~ "met de server\n"
-#~ "\n"
-#~ "    4. Klik OK en geeft uw openerp wachtwoord\n"
-#~ "\n"
-#~ "    5. Een nieuwe agenda met de door u opgegeven naam zou aan de linkerzijde "
-#~ "moeten verschijnen.     \n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "vereiste\n"
-#~ "----------\n"
-#~ "Er is geen ingebouwde manier om de agenda te synchroniseren met caldav.\n"
-#~ "U moet software van derden installeren: Calendar (CalDav) \n"
-#~ "voor het moment is dat de enigste\n"
-#~ "\n"
-#~ "configuratie\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   U krijgt een interface met 2 tabbalden\n"
-#~ "   Blijf op de eerste\n"
-#~ "   \n"
-#~ "2. CalDAV Calendar URL : vul de bovengenoemde url in (bijv : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Vul uw openerp gebruikersnaam en wachtwoord in\n"
-#~ "\n"
-#~ "4. Als uw server geen SSL gebruikt, krijgt u een waarschuwing, antwoord met "
-#~ "\"Yes\"\n"
-#~ "\n"
-#~ "5. Dan kunt u handmatig synchroniseren of de instellingen aanpassen om elke "
-#~ "x minuten te synchroniseren.\n"
-#~ "    \n"
-#~ "    "
-
-#~ msgid "Browse caldav"
-#~ msgstr "Browse caldav"
diff --git a/addons/caldav/i18n/pl.po b/addons/caldav/i18n/pl.po
deleted file mode 100644
index 6c44c905de3..00000000000
--- a/addons/caldav/i18n/pl.po
+++ /dev/null
@@ -1,837 +0,0 @@
-# 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:19+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <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: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Mapowanie wartości"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Nazwa pliku"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Eksport zdarzeń"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Wprowadź ścieżkę dla zewnętrznego kalendarza"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importuj plik .ics"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Zamknij"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Uczestnicy"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Ostrzeżenie !"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Obiekt"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Do zrobienia"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Wyrażenie jako stała"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr "Podaj poprawną konfigurację \"%s\" w pozycjach kalendarza"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Eksport ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Zastosuj pole"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "Nie można tworzyć pozycji \"%s\" więcej niż raz"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Pozycje kalendarza"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Subskrypcja zdarzeń"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importuj ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Anuluj"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Zdarzenie"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Kolekcja kalendarzy"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Błąd! Nie możesz tworzyć rekurencyjnych katalogów."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Typ"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Zapisz w formacie .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Błąd !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Atrybuty kalendarza"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Data utworzenia"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Mapowanie atrybutów"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Katalog"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Wporwadź ścieżkę dla drugiego kalendarza."
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domena"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Subskrybuj"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Właściciel"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Kalendarz"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "Pole OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Wiadomość..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr ""
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Kolekcje kalendarzy"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "Ten sam plik nie może dotyczyć dwóch rekordów !"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "Katalog nie może być nadrzędny dla samego siebie !"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Kalendarze"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Kolekcja"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "Nazwa katalogu musi być unikalna !"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Wprowadź poprawny URL !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Wyrażenie"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Wybierz plik ICS"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Mapowanie pól"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Inne informacje"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Również eksportuj zapis <nazwa>.ics następny za katalogiem kalendarza z "
-"zawartością WebCal."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Funkcja"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "Kalendarz/Pozycja, której dotyczy mapowanie"
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Mapowanie"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importuj"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Import zdarzeń"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Interwał w godzinach"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Nazwa pliku"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Subskrybuj inny kalendarz"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr "Kolor zapisów kalendarza (dla programów akceptujących kolory)"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nazwa"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarm"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Uczestnik musi mieć id email"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Eksportuj plik .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Zapisz plik ICS"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Kolejność"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Błąd!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Kolor"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Pola kalendarza"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importuj wiadomość"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Subskrybuj"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "Katalog musi mieć katalog nadrzędny lub nazwę napędu."
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-"Kolejność katalogu w kalendarzach (dla klientów obsługujących kolejność)"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Wprowadź ścieżkę dla zewnętrznego kalendarza"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Wybierz plik ICS"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Współdziel kalendarz stosująć CalDAV"
diff --git a/addons/caldav/i18n/pt.po b/addons/caldav/i18n/pt.po
deleted file mode 100644
index b9d8dd58005..00000000000
--- a/addons/caldav/i18n/pt.po
+++ /dev/null
@@ -1,1376 +0,0 @@
-# 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-31 15:16+0000\n"
-"Last-Translator: ThinkOpen Solutions <Unknown>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Valor da relação"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "Url do servidor caldav, usado para sincronização"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"Pré requerem\n"
-"----------\n"
-"Não há nenhuma maneira buit-in para sincronizar o calendário com o CalDAV.\n"
-"Então, precisa instalar uma terceira parte do software : Calendário "
-"(CalDav)\n"
-"por enquanto é o único\n"
-"\n"
-"configuração\n"
-"-------------\n"
-"\n"
-"1. Abrir Sincronizador do Calendário\n"
-"    Vou pegar uma interface com 2 abas\n"
-"    Fique sobre a primeira\n"
-"\n"
-"2. CaDAV URL Calendário: colocar a URL dado acima (ou seja: "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Coloque o seu nome de utilizador e senha OpenERP\n"
-"\n"
-"4. Se o servidor não usar SSL, vai ter um aviso, a dizer \"Sim\"\n"
-"\n"
-"5. Depois, pode sincronizar manualmente ou personalizado as configurações "
-"para sincronizar a cada x minutos.\n"
-"\n"
-"    "
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Nome do Ficheiro"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exportação de evento"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importar ICS"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Fechar"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Participante"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "Não é possível relacionar um campo mais de uma vez"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"\"Calendars\" permite que se personalize o calendário de eventos e atribua "
-"tarefas com qualquer um dos modelos OpenERP. Os calendários fornecem "
-"funcionalidades iCal de Importação / Exportação. O servidor Webdav  que "
-"fornece o acesso remoto ao calendário. Ajuda a sincronizar Reuniões com "
-"clientes do Calendário. Pode aceder aos calendários ao usar clientes CalDAV, "
-"como sunbird, Calendar Evaluation, Mobile."
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Aviso!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objeto"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "A fazer"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Formulário de preferências do utilizador"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Serviços"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Expressão como constante"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolução"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-"\n"
-"    1. Ir para vista calendário\n"
-"\n"
-"     2. Ficheiro -> Novo -> Calendário\n"
-"\n"
-"     3. Preencha o formulário\n"
-"         - Tipo: CalDav\n"
-"         - Nome: O que quiser (ou seja: Reunião)\n"
-"         - Url: "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie: "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) um dado "
-"no topo desta janela\n"
-"         - Desmarque a opção \"Utilizador SSL\"\n"
-"         - Nome de utilizador: O seu nome de utilizador (ou seja: Demo)\n"
-"         - Atualizar: sempre que quer que a evolução sincronizar os dados "
-"com o servidor\n"
-"\n"
-"     4. Clique em OK e dê a sua password OpenERP\n"
-"\n"
-"     5. Um novo calendário nomeado com o nome que deu deve aparecer no lado "
-"esquerdo.\n"
-"     "
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-"Por favor, forneça a configuração adequada das \"%s\" Linhas no Calendário"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr "CalDAV configuração do nome do host"
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Servidor Caldav"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr "Na data, hora UTC"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "TODO"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exportar ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "use o campo"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "Não é possível criar linha \"%s\" mais de uma vez"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr "Calendário Webcal"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Linhas Calendário"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Inscrição em evento"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importar ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Evento"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Coleção Calendário"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Erro! Não é possível criar Pastas recursivas."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Abrir"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr "Próximo"
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Guardar no formato ICS"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Erro!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Atributos do Calendário"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Pesquisa Caldav"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Android dispositivo baseado"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr "Configure o seu hostname do OpenERP. Por exemplo: "
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Data de criação"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Atributos da relação"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Directório"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Forneça o caminho para a agenda remota"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domínio"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Subscreva"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Dono"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Calendário"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-"Por favor, instale o python-vobject a partir de "
-"http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "ICS com formato inválido. O ficheiro não pode ser importado."
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "Aberto o Campo do objeto"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "Res. ID"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "mensagem..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Coleções do calendário"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "Não pode haver dois registos com o mesmo nome de ficheiro."
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "Uma pasta não pode ser ascendente de sí própria"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Calendários"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Coleção"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Escreva Data"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-"\n"
-"  * Servidor WebDAV que fornece acesso remoto ao calendário\n"
-"  * A sincronização do calendário usando o WebDAV\n"
-"  * Personalizar o calendário de eventos e atributo de tarefas com qualquer "
-"modelo do OpenERP\n"
-"  * Fornece a funcionalidade Importar / Exportar da iCal\n"
-"\n"
-"    Para aceder aos Calendários usando clientes CalDAV, apontá-los para:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    Para aceder ao calendário do OpenERP usando WebCal para o site remoto "
-"usar a URL como:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"       Sempre que,\n"
-"         HOSTNAME: Anfitrião em que o servidor OpenERP(com WebDAV) em "
-"execução\n"
-"         PORT: Porta na qual o servidor OpenERP está a ser executado (por "
-"padrão: 8069)\n"
-"         DATABASE_NAME: Nome da base de dados em que o calendário  do "
-"OpenERP é criado\n"
-"     "
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "O nome da pasta tem de ser único !"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Preferências de utilizador"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Por favor, indique um URL válido!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Expressão"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Selecione o ficheiro ICS"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Software/Devices"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Relação dos campos"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-"\n"
-"Pré requere\n"
-"----------\n"
-"Se estiver a usar o thunderbird, primeiro tem que instalar o módulo "
-"lightning\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuração\n"
-"-------------\n"
-"\n"
-"1. Ir para Vista do Calendário\n"
-"\n"
-"2. Ficheiro -> Novo Calendário\n"
-"\n"
-"3. Escolha \"Na Rede\"\n"
-"\n"
-"4. para o formato escolha CalDav\n"
-"    e como a localização do URL dada acima (ou seja: "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Escolha um nome e uma cor para o calendário, e aconselhamos que desmarque "
-"a opção \"alarme\"\n"
-"\n"
-"6. Em seguida, coloque o seu login e senha OpenERP (para dar a senha só tem "
-"que marcar a caixa \"Gerador de senhas para lembrar esta senha\"\n"
-"\n"
-"7. Em seguida termine, as suas reuniões devem aparecer agora na vista do "
-"calendário\n"
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "Pesquisa Caldav"
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr "HostName"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Outras informações"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Outros"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr "Meu Calendário(s)"
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Também exportar um  <name>.ics entrada ao lado da pasta de calendário, com "
-"conteúdo WebCal."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Função"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr "database.my.openerp.com or companyserver.com"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Descrição"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "O calendário/linha desta relação aplica-se a"
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Relação"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Importação bem sucedida"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Importação de evento"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervalo (em horas)"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Nome do ficheiro"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Subscreva o Calendário Remoto"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr "Para o suporte de clientes, a cor das movimentos do calendário"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarme"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Participante deve ter um E-mail Id"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Exportar o ficheiro ICS"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "vobject Erro a Importar!"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Guardar o ficheiro ICS"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-"\n"
-"    Para a configuração específica SSL consulte a documentação abaixo\n"
-"\n"
-"Agora, para configurar os calendários, precisa:\n"
-"\n"
-"1. Clique em \"Configurações\" e vá para a página \"Mail, Contatos, "
-"Calendários\".\n"
-"2. Vá para \"Adicionar conta ...\"\n"
-"3. Clique em \"Outros\"\n"
-"4. No grupo \"Calendários\", selecione \"Adicionar Conta CalDAV\"\n"
-"\n"
-"5. Digite o nome do host\n"
-"    (ou seja: se a url seja http://openerp.com:8069/webdav/db_1/calendars/, "
-"openerp.com é o host)\n"
-"\n"
-"6. Preencha Nome de utilizador e senha com seu login e senha OpenERP\n"
-"\n"
-"7. Como uma descrição, pode deixar o nome do servidor ou\n"
-"    algo como \"calendários OpenERP\".\n"
-"\n"
-"9. Se não estiver a usar um servidor SSL, obterá um erro, não se preocupe e "
-"clique em \"Continuar\"\n"
-"\n"
-"10. De seguida, clique em \"Configurações avançadas\" para especificar os "
-"portos e caminhos corretos.\n"
-"\n"
-"11. Especifique o porto para o servidor OpenERP: 8071 para SSL, sem o 8069 "
-".\n"
-"\n"
-"12. Defina a \" Conta URL\" para o caminho certo do webdav OpenERP:\n"
-"     a url dada pelo assistente (ou seja: "
-"http://my.server.ip:8069/webdav/dbname/calendars/)\n"
-"\n"
-"11. Clique em Concluído. O telemóvel irá conetar-se ao servidor OpenERP\n"
-"     e verificar se consegue usar a conta.\n"
-"\n"
-"12. Vá para o menu principal do iPhone e entre na aplicação do calendário.\n"
-"     Os seus calendários OpenERP serão visíveis dentro da seleção do botão\n"
-"     \"Calendários\".\n"
-"     Note que ao criar uma nova entrada na agenda, terá que especificar\n"
-"     qual o calendário que deve ser guardado.\n"
-"\n"
-"Se precisa do SSL (e o seu certificado não está verificado, como de "
-"costume),\n"
-"em seguida, primeiro terá que deixar a confiança do iPhone. Siga estes\n"
-"passos:\n"
-"\n"
-"     s1. Abra o Safari e digite o local https do servidor do OpenERP:\n"
-"       https://my.server.ip:8071/\n"
-"       (supondo que tem o servidor em \"my.server.ip\" e a porta HTTPS\n"
-"       é o padrão 8071)\n"
-"     s2. Safari irá tentar conetar-se e emitir um aviso sobre o certificado\n"
-"       usado. Inspecione o certificado e clique em \"Aceitar\" para  que o "
-"iPhone \n"
-"       agora confia nele.\n"
-"    "
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Ordem"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Erro!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Cor"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "MY"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Campos do calendário"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importar mensagem"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Inscrição"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "A pasta tem de ter um ascendente ou um armazenamento"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr "Para clientes do suporte, a ordem desta pasta entre calendários"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Selecione o ficheiro ICS"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Forneça o caminho para o Calendário Remoto"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Compartilhar Calendário usando CalDAV"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  * O servidor Webdav que fornece o acesso remoto para o calendário\n"
-#~ "  * Sincronização de calendário usando WebDAV\n"
-#~ "  * Customize calendário de eventos e de tarefas com qualquer atributo do "
-#~ "modelo OpenERP\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Pré requesitos\n"
-#~ "----------\n"
-#~ "Se estiver a usar o  thunderbird, primeiro é necessário instalar o módulo "
-#~ "Lightning\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuração\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Ir para visualização de calendário\n"
-#~ "\n"
-#~ "2. Arquivo -> Novo Calendário\n"
-#~ "\n"
-#~ "3. Escolha \"Na rede\"\n"
-#~ "\n"
-#~ "4. para este formato escolha CalDav\n"
-#~ "   e como a localização do url acima (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Escolha o nome e a cor para o calendário, e aconselhamos que desmarque o "
-#~ "\"alarme\"\n"
-#~ "\n"
-#~ "6. Em seguida, coloque o seu login e senha OpenERP (seleccione a caixa para "
-#~ "guardar senha \"Usar para lembrar esta senha\"\n"
-#~ "\n"
-#~ "7. Depois em Concluir, as suas reuniões devem aparecer agora na sua opção "
-#~ "calendário\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1. Ir para visualização do calendário\n"
-#~ "\n"
-#~ "    2. Arquivo -> Novo -> Calendário\n"
-#~ "\n"
-#~ "    3. Preencha o formulário \n"
-#~ "        - tipo : CalDav\n"
-#~ "        - nome : a sua escolha (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) o mesmo "
-#~ "que foi dado no topo desta janela\n"
-#~ "        - Desmarque \"User SSL\"\n"
-#~ "        - Nome utilizador : O seu nome de utilizador (ie : Demo)\n"
-#~ "        - Actualizar : sempre que quiser sincronizar os dados com o "
-#~ "servidor\n"
-#~ "\n"
-#~ "    4. Clique em OK e dê a sua password do OpenERP\n"
-#~ "\n"
-#~ "    5. Um novo nome de calendário dado por si deverá aparecer no lado "
-#~ "esquerdo.     \n"
-#~ "     "
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Este módulo contêm funcionalidades básicas para o sistema caldav :  \n"
-#~ "  - Servidor Webdav que fornece acesso remoto para o calendário\n"
-#~ "  - Sincronização do calendário usando WebDAV\n"
-#~ "  - Personalize o calendário de eventos e de tarefas com qualquer atributo "
-#~ "do modelo OpenERP\n"
-#~ "  - Fornece a funcionalidade Importar/Exportar iCal\n"
-#~ "\n"
-#~ "    Para acederaos cliente do calendário a usar CalDAV, direccione-os para:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Para aceder ao calendário OpenERP usando WebCal para o site remoto usar "
-#~ "o URL:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      onde,\n"
-#~ "        HOSTNAME: Host no qual o servidor OpenERP (com webdav) está em "
-#~ "execução\n"
-#~ "        PORT : Porta na qual o servidor OpenERP está em execução (Por padrão "
-#~ ": 8069)\n"
-#~ "        DATABASE_NAME: Nome do banco de dados em que o calendário OpenERP é "
-#~ "criado\n"
-#~ "        CALENDAR_NAME: Nome do calendário para o acesso\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Pré-requesitos\n"
-#~ "----------\n"
-#~ "Não existe nenhuma maneira built-in para sincronizar calendário com caldav.\n"
-#~ "É necessário instalar a terceira parte do software: Calendário (CalDav) \n"
-#~ "por enquanto é o único\n"
-#~ "\n"
-#~ "configuração\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Abrir sincronização do calendário\n"
-#~ "   Irá aparecer uma interface com duas abas\n"
-#~ "   Mantenha-se na primeira\n"
-#~ "   \n"
-#~ "2. O URL do calendário CalDAV : coloque o URL dado acima (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Coloque o seu nome de utilizador e senha do openerp\n"
-#~ "\n"
-#~ "4. Se o seu servidor não usar SSL, se deseja receber um aviso \"Sim\"\n"
-#~ "\n"
-#~ "5. Depois, pode sincronizar manualmente ou personalize as configurações para "
-#~ "sincronizar a cada x minutos.\n"
-#~ "    \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Para a configuração específica SSL consulte a documentação abaixo\n"
-#~ "\n"
-#~ "Agora, para configurar os calendários, é necessário:\n"
-#~ "\n"
-#~ "1. Clique em \"Configurações\" e vá para a página \"E-Mail, Contactos, "
-#~ "Calendários\".\n"
-#~ "2. Ir para \"Adicionar conta...\"\n"
-#~ "3. Clique \"Outros\"\n"
-#~ "4. A partir do grupo \"Calendários\" , seleccione \"Adicionar conta "
-#~ "CalDAV\"\n"
-#~ "\n"
-#~ "5. Insira nome do host \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com é o  host)\n"
-#~ "\n"
-#~ "6. Preencha o nome de utilizador e senha com o seu login e senha do openerp\n"
-#~ "\n"
-#~ "7. Como uma descrição, você pode deixar o nome do servidor ou\n"
-#~ "   algo como \"Calendários OpenERP\".\n"
-#~ "\n"
-#~ "9. Se não estiver a usar um servidor SSL, irá dar um erro, carregue em "
-#~ "\"Continuar\"\n"
-#~ "\n"
-#~ "10. Seleccione \"Configurações avançadas\" para especificar os direito\n"
-#~ "    dos portes de envio. \n"
-#~ "    \n"
-#~ "11. Especifique os portes ao servidor OpenERP: 8071 para SSL, sem 8069.\n"
-#~ "\n"
-#~ "12. Seleccione \"Conta URL\" para o caminho certo do OpenERP webdav:\n"
-#~ "    o URL dado pelo assistente (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Clique em concluir. O telefone irá conectar-se com o servidor OpenERP\n"
-#~ "    e verificar se pode usar a conta.\n"
-#~ "\n"
-#~ "12. Vá para o menu principal do iPhone e entre na aplicação Calendário.\n"
-#~ "    Os seus calendários OpenERP serão visíveis dentro da secção\n"
-#~ "    \"Calendários\".\n"
-#~ "    Note que ao criar uma nova entrada no calendário, terá que especificar\n"
-#~ "    em que calendário que deve ser guardado.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Se precisar de  SSL (e o certificado não é certificado , como de costume),\n"
-#~ "então, terá que o certificar na iPhone. Siga estes\n"
-#~ "passos:\n"
-#~ "\n"
-#~ "    s1. Abra o Safari e insira a localização https do servidor OpenERP:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assumindo que tem o servidor em \"my.server.ip\" e a porta HTTPS \n"
-#~ "      de padrão 8071)\n"
-#~ "    s2. O Safari irá tentar conectar-se e emitir um aviso sobre o "
-#~ "certificado\n"
-#~ "      usado. Inspeccione o certificado e clique em \"Aceitar\" para que a "
-#~ "iPhone\n"
-#~ "      certifique agora.   \n"
-#~ "    "
-
-#~ msgid "Browse caldav"
-#~ msgstr "Pesquisa caldav"
diff --git a/addons/caldav/i18n/pt_BR.po b/addons/caldav/i18n/pt_BR.po
deleted file mode 100644
index bdecb867de0..00000000000
--- a/addons/caldav/i18n/pt_BR.po
+++ /dev/null
@@ -1,879 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-28 18:39+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Mapeamento de Valor"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "URL do servidor caldav, use para sincronização"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Nome do Arquivo"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exportar Evento"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Forneça o caminho para o Calendário Remoto"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importar Arquivo .ics"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Fechar"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Participante"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "Não é possível mapear um campo mais de uma vez"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Atenção!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objeto"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "À Fazer"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Preferências do usuário"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Serviços"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Expressão tão constante"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolução"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-"Por favor, forneça a configuração apropriada de \"%s\" nas Linhas do "
-"Calendário"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr "Configuração do host name do Caldav"
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Servidor Caldav"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "À Fazer"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exportar ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Usar o campo"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "Não é possível criar a linha \"%s\" mais de uma vez"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Linhas do Calendário"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Inscrever-se no Evento"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importar ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Evento"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Coleção do Calendário"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Erro! Você não pode criar diretórios recursivos."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Abrir"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr "Próximo"
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Salvar em formato .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Erro!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Atributos do Calendário"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Folhear Caldav"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Dispositivo baseado no Android"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Data de Criação"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Mapeamento dos Atributos"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Diretório"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Forneça do caminho para o calendário remoto"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domínio"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Inscrever-se"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Proprietário"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Calendário"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-"Por favor instale python-vobject de http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Formato inválido para ics, arquivo não pode ser importado"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "Campo OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Menssagem..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr ""
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "O mesmo arquivo não pode ser aplicado para dois registros!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "Diretório não pode ser pai de si mesmo!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Calendários"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Coleção"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Escrever Data"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "O nome do diretório deve ser único!"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Preferência de Usuário"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Por favor, forneça a URL correta!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Expressão"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Selecionar arquivo ICS"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Mapeamento de Campos"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Outras Informações"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Outro"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Função"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Descrição"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "O calendário/linha deste mapeamento se aplica para"
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Mapeamento"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Importação bem sucedida"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Importar Evento"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervalo em horas"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Nome do arquivo"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Inscrever-se para o Calendário Remoto"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarme"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Participante deve ter um ID de E-mail"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Exportar Arquivo .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "Erro de importação vobject"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Salvar arquivo ICS"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Ordem"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Erro!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Cor"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "MEU"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Campos do Calendário"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importar Menssagem"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Inscrever-se"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Forneça o caminho para o Calendário Remoto"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Este módulo contém funcionalidades básicas para sistema CalDAV, como:  \n"
-#~ "  - Servidor WebDAV para acesso remoto ao calendário\n"
-#~ "  - Sincronização do calendário usando WebDAV\n"
-#~ "  - Evento customizado e atributo à fazer com qualquer modelo do OpenERP\n"
-#~ "  - Fornece funcionalidade Importar/Exportar iCal\n"
-#~ "\n"
-#~ "    Para acessar Calendários usando clientes CalDAV, use:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Para acessar o Calendário OpenERP usando WebCal para um site remoto, use "
-#~ "a URL como:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Onde,\n"
-#~ "        HOSTNAME: Host onde o servidor OpenERP(com webdav) está rodando\n"
-#~ "        PORT :Porta onde o servidor OpenERP está rodando (Por padrão : "
-#~ "8069)\n"
-#~ "        DATABASE_NAME: Nome do banco de dados onde o Calendário OpenERP foi "
-#~ "criado\n"
-#~ "        CALENDAR_NAME: Nome do calendário para acesso\n"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Selecionar arquivo ICS"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Compartilhar Calendário usando CalDAV"
diff --git a/addons/caldav/i18n/ro.po b/addons/caldav/i18n/ro.po
deleted file mode 100644
index 4d23eb013cb..00000000000
--- a/addons/caldav/i18n/ro.po
+++ /dev/null
@@ -1,1382 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:31+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Valoare Mapare"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "Url al serverului caldav, folositi pentru sincronizare"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"Pre-cerinte\n"
-" ----------\n"
-"Nu exista nicio modalitate predefinita de a sinctoniza calendar cu candav.\n"
-"Prin urmare, trebuie sa instalati un program tert : Calendar (CalDav)\n"
-"pentru moment este singurul\n"
-"\n"
-"configurare\n"
-" -------------\n"
-" \n"
-"1. Deschideti Calendar Sync\n"
-"   Obtineti o interfata cu 2 taburi\n"
-"    Ramaneti pe primul\n"
-"\n"
-"2. URL Calendar CalDAV : introduceti URL-ul dat mai sus (adica: "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Introduceti numele de utilizator si parola openerp\n"
-"\n"
-"4. Daca serverul dumneavoastra nu foloseste SSl, veti primi un mesaj de "
-"avertizare, spuneti \"Da\"\n"
-"\n"
-"5. Apoi puteti sa sincronizati manual sau sa personalizati setarile pentru a "
-"va sincroniza la fiecare x minute.\n"
-"\n"
-"    "
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Numele fisierului"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Export Eveniment"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Furnizeaza pista pentru Remote Calendar"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importa fisiere .ics"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Inchide"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Participant"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "Nu se poate proiecta un camp decat odata"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"\"Calendare\" va permite sa personalizati evenimentul calendar si atributul "
-"de efectuat cu orice model OpenERP. Calendarele ofera functionalitatea iCal "
-"Import/Export. Serverul webdav care ofera acces de departe la calendar va "
-"ajuta sa va sincronizati intalnirile cu clientii Calendar. Puteti accesa "
-"Calendar folosind clientii CalDAV, precum sunbird, Evaluarea Calendar, "
-"Mobilul."
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Avertizare !"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Obiect"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "De efectuat"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Formular preferinte utilizator"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Servicii"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Expresia ca si constanta"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolutie"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Bine"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-"\n"
-"    1. Mergeti la Vizualizarea Calendar\n"
-" \n"
-"    2. Fisier -> Nou -> Calendar\n"
-" \n"
-"    3. Completati formularul\n"
-"         - tip : CalDav\n"
-"         - nume : Oricare doriti (de exemplu: Intalnire)\n"
-"         - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie :\n"
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) cel dat "
-"in partea de sus a acestei ferestre\n"
-"        - debifati \"Utilizator SSL\"\n"
-"        - Nume de utilizator : Numele dumneavoastra de utilizator (de ex: "
-"Demo)\n"
-"        - Actualizeaza : oricand doriti sa sincronizati datele cu serverul\n"
-"\n"
-"    4. Faceti click pe ok si introduceti-va parola openerp\n"
-"\n"
-"    5. Ar trebui sa apara un calendar nou cu numele dat de dumneavoastra in "
-"partea stanga.\n"
-"     "
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-"Va rugam asigurati configurarea adecvata a \"%s\" in Liniile Calendar"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr "Configurare nume gazda Caldav"
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Server Caldav"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr "Data in UTC"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "DE EFECTUAT"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exporta ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Folositi campul"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "Nu poate fi creata linia \"%s\" decat odata"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr "Calendar Webcal"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Linii Calendar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Abonare eveniment"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importa ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Anuleaza"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "eveniment.de_baza.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Eveniment"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Colectie Calendar"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Eroare! Nu puteti crea Directoare recursive."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Deschide"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr "Urmatorul"
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tip"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Salveaza in format .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Eroare !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Atribute Calendar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Rasfoire Caldav"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Dispozitiv bazat pe Android"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr "Configurati-va propriul nume de gazda openerp. De exemplu : "
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Data crearii"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Atribute Mapare"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Director"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Asigura calea spre calendar la distanta"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domeniu"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Abonare"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Proprietar"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Calendar"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-"Va rugam instalati python-vobject din http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Format nevalid al ics, fisierul nu poate fi importat"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "Campul OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "Res. ID"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Mesaj..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Colectii Calendar"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "Acelasi nume de fisier nu poate fi aplicat la doua inregistrari!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "Directorul nu poate fi parinte lui insusi!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Calendare"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Colectie"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Scrieti data"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-"\n"
-"  * Serverul Webdav care asigura accesul la distanta la calendar\n"
-"  * Sincronizarea calendarului folosind WebDAV\n"
-"  * Personalizeaza evenimentul calendar si atributul de efectuat cu orice "
-"model OpenERP\n"
-"  * Asigura functionalitatea Import/Export iCal\n"
-" \n"
-"    Pentru a accesa Calendare folosind clientii CalDAV, directionati-i la "
-"adresa:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    Pentru a accesa OpenERP Calendar folosind WebCal la un site la distanta "
-"folositi un URL precum:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"    Unde,\n"
-"        HOSTNAME (nume gazda): Gazda unde ruleaza serverul OpenERP (cu "
-"webdav)\n"
-"        PORT : Portul unde ruleaza serverul OpenERP (Implicit : 8069)\n"
-"        NUME_BAZA_DE_DATE: Numele bazei de date unde este creat OpenERP "
-"Calendar\n"
-"     "
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "Numele directorului trebuie sa fie unic !"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Preferinta Utilizatorului"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Furnizati URL adecvat !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "fus_orar.calendar.baza"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Expresie"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "participant.calendar.baza"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "alias.calendar.baza"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Selectati fisierul ICS"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Program/Dispozitive"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Mapare Campuri"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-"\n"
-"Conditie prealabila\n"
-" ----------\n"
-" Daca folositi thunderbird, mai intai trebuie sa instalati modulul "
-"lightning\n"
-" http://www.mozilla.org/projects/calendar/lightning/\n"
-" \n"
-"configurare\n"
-" -------------\n"
-" \n"
-"1. Mergeti la Vizualizare Calendar\n"
-" \n"
-"2. Fisier -> Calendar Nou\n"
-" \n"
-"3. Alegeti \"In Retea\"\n"
-" \n"
-"4. pentru format alegeti CalDav\n"
-"   iar ca locatie url-ul de mai sus: (adica : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-" \n"
-"5. Alegeti un nume si o culoare pentru Calendar, si va sfatuim sa debifati "
-"\"alarma\"\n"
-"\n"
-"6. Apoi introduceti-va numele de autentificare si parola (pentru a scrie "
-"parola trebuie doar sa bifati casuta \"Foloseste Administrator parola pentru "
-"a tine minte aceasta parola\"\n"
-"\n"
-"7. Apoi Finalizeaza, intalnirile dumneavoastra ar trebui sa apara acum in "
-"vizualizarea calendar\n"
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "Rasfoieste caldav"
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr "Nume gazda"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "calendar.baza"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Alte informatii"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Altele"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr "Calendarul (Calendarele) mele"
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"De asemenea exporta o inregistrare <nume>.ics in folderul calendar, cu "
-"continut WebCal."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Functie"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr "baza_mea_de_date.openerp.com sau serverulcompaniei.com"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Descriere"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "Calendarul/linia la care se aplica aceasta mapare"
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Mapare"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Importul a avut succes"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importa"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Import Eveniment"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Interval in ore"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Nume fisier"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Abonati-va la Calendarul la distanta"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr "Pentru sustinerea clientilor, culoarea inregistrarilor in calendar"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Nume"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarma"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "alarma.calendar.baza"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Participantul trebuie sa aiba un Id de email"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Exporta fisierul .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "Eroare Import vobject!"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Salveaza fisierul ICS"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-"\n"
-"    Pentu configurarea specifica SSL vedeti documentatia de mai jos\n"
-" \n"
-"Acum, pentru a configura calendarele, trebuie sa:\n"
-" \n"
-"1. Faceti click pe \"Setari\" si mergeti la pagina \"Mail, Contacte, "
-"Calendare\".\n"
-" 2. Mergeti la \"Adauga un cont...\"\n"
-" 3. Faceti click pe \"Altele\"\n"
-" 4. Din grupul \"Calendare\", selectati \"Adauga Contul CalDAV\"\n"
-" \n"
-"5. Introduceti numele gazdei\n"
-"    (adica : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-" \n"
-"6. Completati Numele de utilizator si parola cu numele dumneavoastra de "
-"autentificare si parola openerp\n"
-" \n"
-"7. Ca descriere, puteti lasa numele serverului sau\n"
-"    ceva de genul \"OpenERP calendare\".\n"
-" \n"
-"9. Daca nu folositi un server SSL, veti primi o eroare, dar nu va faceti "
-"griji si apasati \"Continua\"\n"
-" \n"
-"10. Apoi faceti click pe \"Setari Avansate\" pentru a specifica\n"
-"     porturile si caile corecte.\n"
-" \n"
-"11. Specificati portul pentru serverul OpenERP: 8071 pentru SSL, 8069 fara "
-"el.\n"
-" \n"
-"12. Setati \"Contul URL\" in calea corecta a lui OpenERP webdav:\n"
-"     url-ul dat de wizard (adica: "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-" \n"
-"11. Faceti click pe Efectuat. Speram ca telefonul se va conecta la serverul "
-"OpenERP\n"
-"     si va verifica daca poate folosi contul.\n"
-" \n"
-"12. Mergeti la meniul principal din iPhone si introduceti aplicatia "
-"Calendar.\n"
-"     Calendarele dumneavoastra OpenERP vor fi vizibile in interiorul "
-"selectarii\n"
-"     butonului \"Calendare\".\n"
-"     Atentie la faptul ca atunci cand creati o inregistrare in calendar, va "
-"trebui sa specificati\n"
-"     in care calendar ar trebui salvata.\n"
-" \n"
-"Daca aveti nevoie de SSL (si atestatul d-voastra nu e unul verificat, ca de "
-"obicei),\n"
-"atunci va trebui sa lasati ca iPhone sa aiba incredere in el. Urmati acesti\n"
-"pasi:\n"
-"\n"
-"    s1. Deschideti Safari si introduceti locatia https a serverului "
-"OpenERP:\n"
-"      https://my.server.ip:8071/\n"
-"      (presupunand ca aveti serverul la \"my.server.ip\", iar portul HTTPS\n"
-"      este cel predefinit 8071)\n"
-"    s2. Safari va incerca sa se conecteze si va emite o avertizare "
-"referitoare la atestatul\n"
-"      folosit. erificati atestatul si faceti click pe \"Accepta\" astfel ca "
-"iPhone\n"
-"      poate avea acum incredere in el.\n"
-"    "
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Comanda"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Eroare!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Culoare"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "Al meu"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Campuri Calendar"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Importa Mesajul"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Abonare"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "Directorul trebuie sa aiba un parinte sau o arhiva"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "de _efectuat.calendar.baza"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr "Pentru sustinerea clientilor, ordinea acestui folder intre calendare"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Furnizeaza pista pentru Remote Calendar"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  *Serverul Webdav care asigura accesul la distanta la calendar\n"
-#~ "\t*Sincronizarea calendarului folosind WebDAV\n"
-#~ "\t*Personalizarea evenimenimentelor calendar si atributul de efectuat cu "
-#~ "orice model OpenERP\n"
-#~ "\t*Asigura functionalitatea Import/Export iCal\n"
-#~ "\n"
-#~ "\tPentru a accesa Calendare folosind clientii CalDAV, indreptati-i spre:\n"
-#~ "\t\thttp://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "\tUnde,\n"
-#~ "\t\tHOSTNAME: Gazda unde ruleaza serverul OpenERP (cu webdav)\n"
-#~ "\t\tPORT: Portul pe care ruleaza serverul OpenERP (predefinit : 8069)\n"
-#~ "\t\tDATABASE_NAME: Numele bazei de date in care este creat Calendarul "
-#~ "OpenERP\n"
-#~ "\t\tCALENDAR_NAME: Numele calendarului de accesat\n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Cerinta prealabila\n"
-#~ "----------\n"
-#~ "Daca folositi thunderbird, mai intai trebuie sa instalati modulul lightning "
-#~ "(fulger)\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configurare\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Mergeti in Vizualizare Calendar\n"
-#~ "\n"
-#~ "2. Fisier -> Calendar Nou\n"
-#~ "\n"
-#~ "3. Selectati \"In Retea\"\n"
-#~ "\n"
-#~ "4. pentru format selectati CalDav\n"
-#~ "\tsi drept locatie url specificat mai sus (adica : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\t\n"
-#~ "5. Selectati un nume si o culoare pentru Calendar, iar noi va sfatuim sa nu "
-#~ "bifati \"alarma\"\n"
-#~ "\n"
-#~ "6. Apoi va introduceti autentificarea si parola openerp (pentru a scrie "
-#~ "parola doar bifati casuta \"Folositi gestiunea parolei pentru a retine "
-#~ "aceasta parola\"\n"
-#~ "\n"
-#~ "7. Apoi Sfarsit, sedintele dumneavoastra ar trebui sa apara acum in "
-#~ "vizualizarea calendar\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1. Mergeti la Vizualizare Calendar\n"
-#~ "\n"
-#~ "\t\t2. Fisier -> Nou -> Calendar\n"
-#~ "\n"
-#~ "\t\t3. Completati formularul \n"
-#~ "\t\t\t-tip : CalDav\n"
-#~ "\t\t\t-nume : Orice nume doriti (de exemplu : Sedinte)\n"
-#~ "\t\t\t-url : http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings "
-#~ "(adica : http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) "
-#~ "cel dat in partea de sus a acestei ferestre\n"
-#~ "\t\t\t-nu bifati \"User SSL\"\n"
-#~ "\t\t\t-Nume utilizator : numele dumneavoastra de utilizator (si anume : "
-#~ "Demo)\n"
-#~ "\t\t\t-Refresh : ori de cate ori doriti ca evolutia sa sincronizeze datele "
-#~ "cu serverul\n"
-#~ "\n"
-#~ "\t\t4. Click ok si scrieti parola dumneavoastra openerp\n"
-#~ "\n"
-#~ "\t\t5. Un calendar nou denumit cu numele pe care i l-ati dat ar trebui sa "
-#~ "apara in partea stanga.     \n"
-#~ "     "
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Acest modul Contine functionalitatea de baza pentru sistemul caldav, "
-#~ "precum: \t\n"
-#~ "\t- Serverul webdav care asigura accesl la distanta la calendar\n"
-#~ "\t- Sincronizarea calendarului folosind WebDAV\n"
-#~ "\t- Personalizarea evenimentului din caledar si atributul de efectuat cu "
-#~ "orice model OpenERP\n"
-#~ "\t- Asigura functionalitatea Importa/Exporta iCal\n"
-#~ "\n"
-#~ "\tPentru a accesa Calendare folosind clientii CalDAV, indreptati-i spre:\n"
-#~ "\t\thttp://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "\tPentru a accesa Calendarul OpenERP folosind WebCal la site-ul la distanta "
-#~ "folositi un URL precum:\n"
-#~ "\t\thttp://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "\t\tUnde,\n"
-#~ "\t\t\tHOSTNAME: Gazda unde ruleaza serverul OpenERP(cu webdav)\n"
-#~ "\t\t\tPORT :Portul unde ruleaza serverul OpenERP (predefinit : 8069)\n"
-#~ "\t\t\tDATABASE_NAME: Numele bazei de date in care este creat Calendarul "
-#~ "OpenERP\n"
-#~ "\t\t\tCALENDAR_NAME: Numele calendarului de accesat\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Conditie prealabila\n"
-#~ "----------\n"
-#~ "Nu exista o modalitate integrata pentru a sincroniza calendarul cu caldav.\n"
-#~ "Prin urmare, daca trebuie sa instalati un program tert : Calendar (CalDav)\n"
-#~ "este singurul pentru moment\n"
-#~ "\n"
-#~ "configurare\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Deschideti Calendar Sync\n"
-#~ "\tObtineti o interfata cu 2 taburi\n"
-#~ "\t\n"
-#~ "2. CalDAV Calendar URL : scrieti URL-ul dat mai sus (adica : "
-#~ "http://host.com:8069/webdav/db/calendare/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Introduceti numele de utilizator si parola openerp\n"
-#~ "\n"
-#~ "4. Daca serverul dumneavoastra nu foloseste SSL, veti primi o avertizare, "
-#~ "click \"Da\"\n"
-#~ "\n"
-#~ "5. Apoi puteti sincroniza manual sau puteti personaliza setarile pentru a se "
-#~ "sincroniza la fiecare x minute.\n"
-#~ "    \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Pentru configurarea specifica SSL vedeti documentatia de mai jos\n"
-#~ "\n"
-#~ "Acum, pentru a configura calendarele, trebuie sa:\n"
-#~ "\n"
-#~ "1. Faceti click pe \"Setari\" si mergeti la pagina \"Mail, Contacte, "
-#~ "Calendare\"\n"
-#~ "2. Mergeti la \"Adauga cont...\"\n"
-#~ "3. Faceti click pe \"Altele\"\n"
-#~ "4. Din grupul \"Calendare\", selectati \"Adauga Contul CAlDav\"\n"
-#~ "\n"
-#~ "5. Introduceti numele gazdei \n"
-#~ "\t(si anume : daca url-ul este "
-#~ "http://openerp.com:8069/webdav/db_1/calendars/, gazda este openerp.com)\n"
-#~ "\n"
-#~ "6. Introduceti Numele utilizatorului si parola cu autentificarea si parola "
-#~ "openerp\n"
-#~ "\n"
-#~ "7. Ca descriere, puteti lasa numele serverului sau\n"
-#~ "\tceva precum \"calendare OpenERP\".\n"
-#~ "\n"
-#~ "9. Daca nu folositi un server SSL, veti avea o eroare, dar nu va ingrijorati "
-#~ "si apasati \"Continua\"\n"
-#~ "\n"
-#~ "10. Apoi faceti click pe \"Setari Avansate\" pentru a specifica \n"
-#~ "\t\tporturile si caile corecte.   \n"
-#~ "\t\n"
-#~ "11. Specificati portul pentru serverul OpenERP: 8071 pentru SSL, 8069 fara.\n"
-#~ "\n"
-#~ "12. Setati \"Cont URL\" pentru calea corecta a lui OpenERP webdav:\n"
-#~ "\turl-ul dat de wizard (si anume : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Faceti click pe Efectuat. Speram ca telefonul se va conecta la serverul "
-#~ "OpenERP\n"
-#~ "\tsi pentru verificare puteti foloci contul.\n"
-#~ "\n"
-#~ "12. Mergeti in meniul principal al iPhone-ului si introduceti aplicatia "
-#~ "Calendar.\n"
-#~ "\tCalendarele dumneavoastra OpenERP vor fi vizibile in interiorul selectiei "
-#~ "\n"
-#~ "\tbutonului \"Calendare\".\n"
-#~ "\tObservati ca atunci cand creati o noua inregistrare in calendar, trebuie "
-#~ "sa specificati\n"
-#~ "\tin care calendar doriti sa fie salvata.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "DACA aveti nevoie de SSL (iar atestatul dumneavoastra nu este unul "
-#~ "verificat, ca de obicei), \n"
-#~ "atunci mai intai trebuie sa lasati iPhone-ul sa aiba incredere in el. Urmati "
-#~ "acesti \n"
-#~ "pasi:\n"
-#~ "\n"
-#~ "\t\ts1.  Deschideti Safari si introduceti locatia https a serverului "
-#~ "OpenERP:\n"
-#~ "\t\t  https://my.server.ip:8071/\n"
-#~ "\t\t  (presupunand ca aveti serverul la \"my.server.ip\" si ca portul HTTPS\n"
-#~ "\t\t  este predefinit 8071)\n"
-#~ "\t\ts2. Safari va incerca sa se conecteze si va emite un avertisment despre "
-#~ "atestatul\n"
-#~ "\t\t  folosit. Verificati atestatul si faceti click pe \"Accepta\" astfel ca "
-#~ "iPhone-ul\n"
-#~ "\t\t  acum are incredere in el.   \n"
-#~ "    "
-
-#~ msgid "Select ICS file"
-#~ msgstr "Selectati fisierul ICS"
-
-#~ msgid "Browse caldav"
-#~ msgstr "Rasfoieste caldav"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Partajati Calendarul folosind CalDAV"
diff --git a/addons/caldav/i18n/ru.po b/addons/caldav/i18n/ru.po
deleted file mode 100644
index 41a0abf7166..00000000000
--- a/addons/caldav/i18n/ru.po
+++ /dev/null
@@ -1,1213 +0,0 @@
-# Russian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:09+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Отображение значения"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "Url caldav сервера, используется для синхронизации"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Имя файла"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Экспорт события"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Введите путь к удаленному календарю"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Импортировать .ics файл"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Закрыть"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Участник"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "Невозможно переназначить поле более одного раза"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"\"Календари\" позволяют настроить события и список дел с использованием "
-"любой модели OpenERP. Календари позволяют импортировать/экспортировать в "
-"iCal. Webdav сервер позволяет осуществлять удаленный доступ к календарю. "
-"Помогает синхронизировать встречи с клиентами. Вы можете получить доступ к "
-"календарям с помощью CalDAV клиентов, таких как sunbird, Calendar "
-"Evaluation, Mobile."
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Внимание!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Объект"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Список задач"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Форма настроек пользователя"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Сервисы"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Выражение как константа"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolution"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "ОК"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr "Пожалуйста, настройте \"%s\" правильным образом."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Сервер Caldav"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr "Дата и время в UTC"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "TODO"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Экспортировать ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Используйте поле"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "Нельзя создать запись \"%s\" более одного раза"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Записи календаря"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Подписка на событие"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Импортировать ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Отменить"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Событие"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Коллекция календаря"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Ошибка! Нельзя создавать вложенные директории."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Открыть"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Тип"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Сохранить в формате .ics"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Ошибка !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Атрибуты календаря"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Обзор Caldav"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Android устройство"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Дата создания"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Отображение атрибутов"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Каталог"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "Введите путь к удаленному календарю"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Домен"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Подписаться"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Владелец"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Календарь"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-"Пожалуйста, установите python-vobject с "
-"http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "Неверный формат ics файла, импортирование не возможно"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "Поле OpenObject"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "ID Ресурса"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Сообщение..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Коллекции календаря"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "Нелья применять одинаковое название файла к двум записям!"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "Каталог не может быть родительским для самого себя!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Календари"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Коллекция"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Дата записи"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "Имя каталога должно быть уникальным!"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "Настройки пользователя"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Введите верный URL!"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Выражение"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Выберит ICS файл"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "Программы/Устройства"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Соответствие полей"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "Обзор caldav"
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Прочая информация"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Прочие"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Экспортировать также <name>.ics с содержимым WebCal вместе с каталогом "
-"календаря."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Функция"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Описание"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "Календарь/строка, к которым применяется это соответствие"
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Соответствие"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "Импортировано успешно"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Импорт"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Импорт события"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Интервал в часах"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Имя файла"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Подписаться на удаленный календарь"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr "Для поддерживающих клиентов: цвет записи в календаре"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Название"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Уведомление"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Участник должен иметь Email"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Экспортировать .ics файл"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "Ошибка импорта vobject!"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Сохранить ICS файл"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Порядок"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Ошибка!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Цвет"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "MY"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Поля календаря"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Импортировать сообщение"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Подписаться"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "Каталог должен иметь родителя или хранилище"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-"Положение этого каталога среди календарей (только для клиентов, "
-"поддерживающих эту функцию)"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Введите путь к удаленному календарю"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Требование\n"
-#~ "----------\n"
-#~ "Если вы используете thunderbird, сперва необходимо установить модуль "
-#~ "lightning\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "настройка\n"
-#~ "----------\n"
-#~ "\n"
-#~ "1. Переключитесь в вид календаря\n"
-#~ "\n"
-#~ "2. Файл -> Новый календарь\n"
-#~ "\n"
-#~ "3. Выберите \"Сетевой календар\"\n"
-#~ "\n"
-#~ "4. формат установите на CalDav\n"
-#~ "   и адрес указанный выше (т.е. "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Выберите название и цвет календаря, и мы советуем отключить галочку "
-#~ "\"уведомлять\"\n"
-#~ "\n"
-#~ "6. Затем введите ваш логин и пароль от openerp (для работы только с паролем "
-#~ "установите галочку на \"Использовать менеджер паролей\"\n"
-#~ "\n"
-#~ "7. Нажмите Финиш, и ваши встречи должны появится в окне календаря\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  *Webdav сервер, обеспечивающий удаленный доступ к календарю\n"
-#~ "  *Синхронизация календаря с помощью WebDAV\n"
-#~ "  *Настроить события и список дел в календаре с использованием модели "
-#~ "OpenERP\n"
-#~ "  *Позволяет импорт/экспорт в iCal\n"
-#~ "\n"
-#~ "    Для получения доступа к календарям через CalDAV клиентов настройте их к "
-#~ "адресу:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Для получения доступа к календарю через WebCal используйте адрес вида:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Где\n"
-#~ "        HOSTNAME: Хост, на котором работает сервер OpenERP (с webdav)\n"
-#~ "        PORT: Порт, на котором работает сервер OpenERP(По-умолчанию 8069)\n"
-#~ "        DATABASE_NAME: Название базы данных, в котором создан календарь\n"
-#~ "        CALENDAR_NAME: Название календаря\n"
-#~ "     "
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Открыть доступ к календарю через Caldav"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1. Перейдите в режим календаря\n"
-#~ "\n"
-#~ "    2. Файл -> Новый -> Календарь\n"
-#~ "\n"
-#~ "    3. Заполните форму \n"
-#~ "        - тип : CalDav\n"
-#~ "        - название : На ваше усмотрение (напр. Встречи)\n"
-#~ "        - url: "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (напр. "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) указанный "
-#~ "в верхней части окна\n"
-#~ "        - уберите \"Использовать SSL\"\n"
-#~ "        - Имя пользователя: Ваше имя (напр. Demo)\n"
-#~ "        - Обновить: каждый раз, когда вы хотите синхронизироваться с "
-#~ "сервером\n"
-#~ "\n"
-#~ "    4. Нажмите ОК и введите пароль от OpenERP\n"
-#~ "\n"
-#~ "    5. Новый календарь с указанным вами названием должен появится слева.     "
-#~ "\n"
-#~ "     "
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Данный модуль содержит базовые функции caldav, такие как  \n"
-#~ "  - Webdav сервер для удаленного доступа к календарю\n"
-#~ "  - Синхронизация календаря через Webdav\n"
-#~ "  - Настройка событий и списка дел в календаре с любым модулем OpenERP\n"
-#~ "  - Позволяет импортировать/экспортировать в iCal.\n"
-#~ "\n"
-#~ "    Для доступа к календарям через CalDAV клиенты настройте из на адрес:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    Для доступа к календарю через WebCal, настройте его на адрес вида:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      , где\n"
-#~ "        HOSTNAME: Хост, на котором запущен OpenERP (c webdav)\n"
-#~ "        PORT : Порт, на котором работает OpenERP (По-умолчанию 8069)\n"
-#~ "        DATABASE_NAME: Название базы данных, в которой создан календарь\n"
-#~ "        CALENDAR_NAME: Название календаря\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    Для настроек спецефичных для SSL смотрите документацию ниже\n"
-#~ "\n"
-#~ "Для настройки календарей вам нужно сделать следующее:\n"
-#~ "\n"
-#~ "1. Нажмите \"Настройки\", затем выберите \"Почта, Контакты, Календари\".\n"
-#~ "2. Выберите \"Добавить аккаунт...\"\n"
-#~ "3. Нажмите на  \"Другой\"\n"
-#~ "4. Из группы \"Календари\" выберите \"Добавить аккаунт CalDAV\"\n"
-#~ "\n"
-#~ "5. Введите имя хоста\n"
-#~ "   (т.е. если url выглядит как "
-#~ "http://openerp.com:8069/webdav/db_1/calendars/ , то openerp.com будет "
-#~ "хостом)\n"
-#~ "\n"
-#~ "6. Заполните имя пользователя и пароль, так же как и у вашего аккаунта в "
-#~ "openerp.\n"
-#~ "\n"
-#~ "7. Вы можете добавить описание или название сервера или напр. \"Календари "
-#~ "OpenERP\".\n"
-#~ "\n"
-#~ "9. Если вы не пользуетесь SSL сервером, вы получите ошибку, не беспокойтесь "
-#~ "о ней, нажмите \"Продолжить\"\n"
-#~ "\n"
-#~ "10. Затем нажмите на \"Расширенные настройки\" для установки порта и пути.\n"
-#~ "    \n"
-#~ "11. Настройте порт OpenERP сервера: 8071 для SSL, 8069 для обычного.\n"
-#~ "\n"
-#~ "12. Введите \"URL аккаунта\" справа в OpenERP webdav:\n"
-#~ "    url заданный мастером (т.е. : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Нажмите на Выполнено. Телефон подключится к серверу OpenERP и проверит "
-#~ "возможность использования аккаунта.\n"
-#~ "\n"
-#~ "12. Откройте главное меню iPhone и запустите приложение Календарь.\n"
-#~ "    Ваши календари из OpenERP будут видны после выбора \n"
-#~ "    кнопки \"Календари\".\n"
-#~ "    Заметьте, что при создании новой записи в календари вам нужно будет "
-#~ "выбирать\n"
-#~ "    в каком календаре ее хранить.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "Если вы желаете использовать SSL (и ваш сертификат как обычно не проверен),\n"
-#~ "тогда вам нужно будет сообщить iPhone доверять ему. Следуйте данным \n"
-#~ "шагам:\n"
-#~ "\n"
-#~ "    шаг1. Откройте Safari и введите https путь к серверу OpenERP:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (предполагается, что адрес \"my.server.ip\" и стандартный порт HTTPS\n"
-#~ "      8071)\n"
-#~ "    s2. Safari попытается подключится и выведет сообщение об использовании \n"
-#~ "      сертификата. Нажмите \"Принять\" и iPhone\n"
-#~ "      будет ему доверять.   \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "Требование\n"
-#~ "----------\n"
-#~ "Встроенного средства синхронизации календаря с Caldav не существует.\n"
-#~ "Следовательно вам нужно установить стороннее ПО: Календар (CalDav) \n"
-#~ "пока это единственный вариант\n"
-#~ "\n"
-#~ "настройка\n"
-#~ "----------\n"
-#~ "\n"
-#~ "1. Откройте Синхронизация календаря\n"
-#~ "   Появится окно с двумя вкладками\n"
-#~ "   Мы будем работать с первой\n"
-#~ "   \n"
-#~ "2. URL календаря CalDAV: вставьте показанный выше URL (т.е. : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Наберите свой логин и пароль\n"
-#~ "\n"
-#~ "4. Если ваш сервер не использует SSL, вы получите предупреждение, Нажмите "
-#~ "\"Да\"\n"
-#~ "\n"
-#~ "5. Затем вы можете синхронизировать вручную или настроить на синхронизацию "
-#~ "каждые х минут.\n"
-#~ "    \n"
-#~ "    "
-
-#~ msgid "Select ICS file"
-#~ msgstr "Выберит ICS файл"
-
-#~ msgid "Browse caldav"
-#~ msgstr "Обзор caldav"
diff --git a/addons/caldav/i18n/sq.po b/addons/caldav/i18n/sq.po
deleted file mode 100644
index c21a765abbb..00000000000
--- a/addons/caldav/i18n/sq.po
+++ /dev/null
@@ -1,825 +0,0 @@
-# Albanian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-03-28 15:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Albanian <sq@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:58+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr ""
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr ""
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr ""
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr ""
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr ""
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Emri i objektit duhet të fillojë me x_ dhe nuk duhet të përmbajë shkronja të "
-#~ "veçanta."
diff --git a/addons/caldav/i18n/sr.po b/addons/caldav/i18n/sr.po
deleted file mode 100644
index a509c9bc3ee..00000000000
--- a/addons/caldav/i18n/sr.po
+++ /dev/null
@@ -1,835 +0,0 @@
-# Serbian 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:19+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Serbian <sr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Mapiranje Vrednosti"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "IMe Fajla"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exportuj Dogadjaj"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Daje put za udaljeni Kalendar"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Uvezi .ics Fajl"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Close"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Ucesnik"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Upozorenje !"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objekat"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Ekspresija kao konstanta"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "OK"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "ZaUraditi"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Izvezi ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Koristite polje"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Linije Kalendara"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Prijavi Dogadjaj"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Uvezi ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Cancel"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Dogadjaj"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Kolekcija Kalendara"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Greska ! Ne mozes kreirati rekursivne direktorijume."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tip"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "sacuvaj u .ics formatu"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Greska !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Atributi Kalendara"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Kreirano Datuma"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Atributi Mapiranja"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Direktorijum"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "daje putanju do udaljenog Kalendara"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domain"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Subscribe"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Vlasnik"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Kalendar"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "OpenObject polje"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Poruka ..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebPoziv"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Kolekcija Kalendara"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "Isto ime fajla ne moze odgovarati za dva zapisa"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Kalendari"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Kolekcija"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Molim dajte ispravnu URL adresu !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Ekspresija"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Izaberi ICS Fajl"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Mapiranje polja"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Ostale informacije"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Takodje iznesi i sadrzaj <ime>na iz polja odmah do foldera kalendara, "
-"zajedno sa WebCal sadrzajem."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Funkcija"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "Kalendar/Linija ovo se mapiranje odnosi na"
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Mapiranje"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Import"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Uvezi Dogadjaj"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervali u satima"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Ime Fajla"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Pretplati se na Udaljeni Kalendar"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr "Zbog podrske klijentima. boja sadrzaja Kalendara"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Ime"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarm"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Ucesnik mora imati Licni Email"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Izvezi .ics Fajl"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Sacuvaj ICS Fajl"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Redosled"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Greska !"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Boja"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Polja Kalendara"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Uvezi Poruku"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Pretplati se"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr "Za podrsku klijentima, redosled foldera izmedju kalendara"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Daje put za udaljeni Kalendar"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Deli kalendar koriscenjem CalDAV-a"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Izaberi ICS Fajl"
diff --git a/addons/caldav/i18n/sr@latin.po b/addons/caldav/i18n/sr@latin.po
deleted file mode 100644
index 0f94225fc16..00000000000
--- a/addons/caldav/i18n/sr@latin.po
+++ /dev/null
@@ -1,835 +0,0 @@
-# Serbian latin 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:04+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Serbian latin <sr@latin@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Mapiranje Vrednosti"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "IMe Fajla"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exportuj Dogadjaj"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Daje put za udaljeni Kalendar"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Uvezi .ics Fajl"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Close"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Ucesnik"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Upozorenje !"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Predmet"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Ekspresija kao konstanta"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "OK"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "ZaUraditi"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Izvezi ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Koristite polje"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Linije Kalendara"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Prijavi Dogadjaj"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Uvezi ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Cancel"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Dogadjaj"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "Kolekcija Kalendara"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Greska ! Ne mozes kreirati rekursivne direktorijume."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Tip"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "sacuvaj u .ics formatu"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Greska !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Atributi Kalendara"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Kreirano Datuma"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "Atributi Mapiranja"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Direktorijum"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "daje putanju do udaljenog Kalendara"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domain"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Subscribe"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Vlasnik"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Kalendar"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "OpenObject polje"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Poruka ..."
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebPoziv"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "Kolekcija Kalendara"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "Isto ime fajla ne moze odgovarati za dva zapisa"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Kalendari"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Kolekcija"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "Molim dajte ispravnu URL adresu !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Ekspresija"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "Izaberi ICS Fajl"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Mapiranje polja"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Ostale informacije"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-"Takodje iznesi i sadrzaj <ime>na iz polja odmah do foldera kalendara, "
-"zajedno sa WebCal sadrzajem."
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Funkcija"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "Kalendar/Linija ovo se mapiranje odnosi na"
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Mapiranje"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Import"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "Uvezi Dogadjaj"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "Intervali u satima"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Ime Fajla"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "Pretplati se na Udaljeni Kalendar"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr "Zbog podrske klijentima. boja sadrzaja Kalendara"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Ime"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Alarm"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "Ucesnik mora imati Licni Email"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "Izvezi .ics Fajl"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "Sacuvaj ICS Fajl"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Redosled"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Greska !"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Boja"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "Polja Kalendara"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "Uvezi Poruku"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Pretplati se"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr "Za podrsku klijentima, redosled foldera izmedju kalendara"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Daje put za udaljeni Kalendar"
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "Deli kalendar koriscenjem CalDAV-a"
-
-#~ msgid "Select ICS file"
-#~ msgstr "Izaberi ICS Fajl"
diff --git a/addons/caldav/i18n/sv.po b/addons/caldav/i18n/sv.po
deleted file mode 100644
index 48327be8519..00000000000
--- a/addons/caldav/i18n/sv.po
+++ /dev/null
@@ -1,873 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-08-03 22:58+0000\n"
-"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Värdemappning"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "Url till caldav-servern, används för synkronisering"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"Förutsättningar\n"
-"----------\n"
-"Det finns inget egentlig inbyggd metod för att synkronisera två "
-"kalenderservrar med CalDAV.\n"
-"Så denna modul tillför denna funktion.\n"
-"\n"
-"\n"
-"konfiguration\n"
-"-------------\n"
-"\n"
-"1. Öppna Kalender Sync\n"
-"    Jag får ett gränssnitt med 2 flikar\n"
-"    Bo på den första\n"
-"\n"
-"2. CaDAV Kalender URL: sätta URL ovan (dvs. "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Sätt ditt openerp användarnamn och lösenord\n"
-"\n"
-"4. Om din server inte använder SSL, får du en warnign, säger \"Yes\"\n"
-"\n"
-"5. Sedan kan du synkronisera manuellt eller anpassad inställningarna för att "
-"synkronisera varje x minuter.\n"
-"\n"
-"    "
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Filnamn"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Exportera händelser"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "Importera  .ics fil"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Stäng"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Deltagare"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "Kan bara mappa ett fält en gång"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"\"Kalendrar\" kan du anpassa kalendern händelse och att-göra-attribut med "
-"någon av OpenERP modell. Caledars ger iCal Import / Export "
-"functionality.Webdav server som ger fjärråtkomst till calendar.Help du "
-"synkronisera Möte med kalendrar client.You kan komma kalendrar med CalDAV "
-"kunder, som Sunbird, Kalender utvärdering, Mobile."
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Varning!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Objekt"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Att göra"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Användarinställningsformulär"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Tjänster"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evolution"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-"\n"
-"    1. Gå till Kalendervyn\n"
-"\n"
-"2. Arkiv -> Nytt -> Kalender\n"
-"\n"
-"3. Fylla i formuläret\n"
-"    - Typ: CalDAV\n"
-"    - Namn: Vad du vill ha (dvs: Möte)\n"
-"    - URL: http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings "
-"(dvs. http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) "
-"adressen i din webbläsare\n"
-"    - Avmarkera \"Använd SSL\"\n"
-"    - Användarnamn: Ditt användarnamn (dvs. Demo)\n"
-"    - Uppdatera: varje gång du vill att kalenderklienten synkronisera data "
-"med servern\n"
-"\n"
-"4. Klicka på OK och ge ditt openerp lösenord\n"
-"\n"
-"5. En ny kalender namnges med det namn du gav ska visas på vänster sida.\n"
-"     "
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Caldav-server"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "ATT GÖRA"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "Exportera ICS"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Använd fältet"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "Kan inte skapa raden \"%s\" mer än en gång"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Kalenderrader"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "Importera ICS"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Avbryt"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Evenemang"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr ""
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Fel! Ni kan inte skapa rekursiva kataloger."
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "_Öppna"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr "Nästa"
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "Typ"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "Spara i .ics format"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "Fel !"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "Kalenderattribut"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Kalenderbläddring"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "Android-enhet"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "Skapad datum"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "Katalog"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "Domän"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "_Prenumerera"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "Ägare"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "Kalender"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "Meddelande"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "Katalogen kan inte ha sig själv som förälder!"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "Kalendrar"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "Samling"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "Avtalsdatum"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "Katalognamnet måste vara unikt !"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "Uttryck"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "Fältmappning"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr "Värddator"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "Annan information"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "Övrigt"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr "Mina kalendrar"
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "Funktion"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr "database.my.openerp.com  or companyserver.com"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "Beskrivning"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "Fältmappning"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "_Importera"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Filnamn"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "Namn"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "Larm"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "Sortera"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Fel!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "Färg"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "Prenumerera"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "Katalogen måste ha en förälder eller en lagringsplats"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Ange en sökväg till den främmande kalendern"
diff --git a/addons/caldav/i18n/tr.po b/addons/caldav/i18n/tr.po
deleted file mode 100644
index 3d1e8ec948b..00000000000
--- a/addons/caldav/i18n/tr.po
+++ /dev/null
@@ -1,847 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:22+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "Değer Eşleme"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "Caldav sunucusu url'si, senkronize etmek için kullanın"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"Öncelikgerektiren\n"
-"----------\n"
-"Burada caldav ile senkronize edilmiş yerleşik bir takvimi yoktur.\n"
-"Bu yüzden üçüncü parti bir yazılım yüklemeiz gerekir : Calendar (CalDav)\n"
-"sadece bir tanedir\n"
-"\n"
-"Ayarlar\n"
-"-------------\n"
-"\n"
-"1.Calendar Sync ' yi açın\n"
-"   Ben iki sekme ile bir arayüz alacağım.\n"
-"   İlk seferde bekleyin\n"
-"\n"
-"2. CaDAV Calendar URL: yukarıda verilen URL'yi yerleştirin (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Kullanıcı adınızı ve parolayınızı yazınız.\n"
-"\n"
-"4. Eğer sunucu SSL kullanmıyorsa, bir uyarı alacaksınız, \"Evet\" deyin.\n"
-"\n"
-"5. Daha sonra manuel olarak senkronize edebilir veya özel ayarlarınızı "
-"istediğiniz her x dakikada değiştirebilirsiniz.\n"
-"\n"
-"    "
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "Dosya ismi"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "Olay Dışaaktarımı"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "Uzaktan Takvim yolunu belirt"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr ".ics Dosyası İçe aktar"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "_Kapat"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "Katılımcı"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "Birden çok alan eşleştirilemiyor"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "Uyarı!"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "Nesne"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "Yapılacaklar"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "Kullanıcı tercih Formu"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "Hizmetler"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "Sabit İfade"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "Evrim"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "Tamam"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr ""
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Caldav Sunucusu"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "YAPILACAK"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "ICS Dışaaktar"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "Alanı Kullan"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "\"%s\" Satırı birden çok oluşturulamıyor"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "Takvim Satırları"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "Olay aboneliği"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "ICS içeaktar"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "_Vazgeç"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "temel.Etkinlik.olay"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "Etkinlik"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr ""
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr ""
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr ""
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr ""
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr ""
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "Dosya adı"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr ""
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr ""
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr ""
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr ""
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "Hata!"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr ""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr ""
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr ""
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr ""
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr ""
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr ""
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr ""
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "Uzaktan Takvim yolunu belirt"
diff --git a/addons/caldav/i18n/zh_CN.po b/addons/caldav/i18n/zh_CN.po
deleted file mode 100644
index e0f06bc0d64..00000000000
--- a/addons/caldav/i18n/zh_CN.po
+++ /dev/null
@@ -1,1238 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:41+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@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: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Value Mapping"
-msgstr "值列表"
-
-#. module: caldav
-#: help:caldav.browse,url:0
-msgid "Url of the caldav server, use for synchronization"
-msgstr "caldav服务器网址，用于同步"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:99
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"There is no buit-in way to synchronize calendar with caldav.\n"
-"So you need to install a third part software : Calendar (CalDav)\n"
-"for now it's the only one\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Open Calendar Sync\n"
-"   I'll get an interface with 2 tabs\n"
-"   Stay on the first one\n"
-"\n"
-"2. CaDAV Calendar URL : put the URL given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"3. Put your openerp username and password\n"
-"\n"
-"4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-"\n"
-"5. Then you can synchronize manually or custom the settings to synchronize "
-"every x minutes.\n"
-"\n"
-"    "
-msgstr ""
-"\n"
-"前提\n"
-"--------------\n"
-"没有内置的用caldav支持同步日程的方式。\n"
-"你需要安装第三方软件 CalDav。\n"
-"\n"
-"配置步骤\n"
-"--------------\n"
-"1. 打开日程同步\n"
-"    有两个标签页\n"
-"    保持在第一个\n"
-"2. "
-"CalDav日程链接：输入上面给出的地址（例如：http://host.com:8069/webdav/db/calendars/users/demo/c"
-"/Meetings）\n"
-"\n"
-"3.输入你的openerp用户名和密码\n"
-"\n"
-"4.如果你的服务器没有使用安全连接，会看到一个警告，单击 ”是“\n"
-"\n"
-"5. 你可以自动同步也可以自定义设置为每隔几分钟同步\n"
-"\n"
-"    "
-
-#. module: caldav
-#: field:basic.calendar.alias,name:0
-msgid "Filename"
-msgstr "文件名"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_export
-msgid "Event Export"
-msgstr "事件导出"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Provide Path for Remote Calendar"
-msgstr "提供远程日程表路径"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
-msgid "Import .ics File"
-msgstr "导入 .ics 文件"
-
-#. module: caldav
-#: view:caldav.browse:0
-#: view:calendar.event.export:0
-msgid "_Close"
-msgstr "关闭(_C)："
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Attendee"
-msgstr "参与者"
-
-#. module: caldav
-#: sql_constraint:basic.calendar.fields:0
-msgid "Can not map a field more than once"
-msgstr "不能映射，相关字段多于一个"
-
-#. module: caldav
-#: model:ir.actions.act_window,help:caldav.action_caldav_form
-msgid ""
-"\"Calendars\" allow you to Customize calendar event and todo attribute with "
-"any of OpenERP model.Caledars provide iCal Import/Export "
-"functionality.Webdav server that provides remote access to calendar.Help You "
-"to synchronize Meeting with Calendars client.You can access Calendars using "
-"CalDAV clients, like sunbird, Calendar Evaluation, Mobile."
-msgstr ""
-"“日程表”允许你在系统的任何模型里自定义日程表事件和代办事项属性。日程表提供ical的导入/导出功能。\r\n"
-"WebDay服务器提供远程访问日程表。帮助你同步日程表客户端的会议。你能用 CalDAV客户端sunbird，Calendar "
-"Evaluation，手机访问日程表。"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#: code:addons/caldav/calendar.py:879
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Warning !"
-msgstr "警告！"
-
-#. module: caldav
-#: field:basic.calendar.lines,object_id:0
-msgid "Object"
-msgstr "对象"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Todo"
-msgstr "待办事项"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_user_preference
-msgid "User preference Form"
-msgstr "用户编好"
-
-#. module: caldav
-#: field:user.preference,service:0
-msgid "Services"
-msgstr "服务"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Expression as constant"
-msgstr "表达式常量"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Evolution"
-msgstr "演变"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-msgid "Ok"
-msgstr "确定"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:123
-#, python-format
-msgid ""
-"\n"
-"    1. Go to Calendar View\n"
-"\n"
-"    2. File -> New -> Calendar\n"
-"\n"
-"    3. Fill the form\n"
-"        - type : CalDav\n"
-"        - name : Whaterver you want (ie : Meeting)\n"
-"        - url : "
-"http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-"http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-"given on the top of this window\n"
-"        - uncheck \"User SSL\"\n"
-"        - Username : Your username (ie : Demo)\n"
-"        - Refresh : everytime you want that evolution synchronize the data "
-"with the server\n"
-"\n"
-"    4. Click ok and give your openerp password\n"
-"\n"
-"    5. A new calendar named with the name you gave should appear on the left "
-"side.\n"
-"     "
-msgstr ""
-"\n"
-"    1. 进入日程表视图\n"
-"\n"
-"2. 文件 - 新建 - 日程表\n"
-"\n"
-"3. 填写表单：\n"
-"- 类型：CalDav\n"
-"- 名称：简单描述\n"
-"- 地址：url : http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings "
-"(例如 : http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)，请参考此窗口上部给出的地址"
-"\n"
-"- 不要勾选 \"使用SSL\"\n"
-"- 用户名：您的用户名\n"
-"- 刷新：每次你需要与服务器数据同步\n"
-"\n"
-"4.单击OK并输入openerp密码\n"
-"\n"
-"5. 新的日程表会出现在界面的左侧。\n"
-"     "
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:879
-#, python-format
-msgid "Please provide proper configuration of \"%s\" in Calendar Lines"
-msgstr "在日程表明细中请为 \"%s\" 进行合适的设置"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Caldav's host name configuration"
-msgstr "CalDav主机名设置"
-
-#. module: caldav
-#: field:caldav.browse,url:0
-msgid "Caldav Server"
-msgstr "Caldav 服务器"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Datetime In UTC"
-msgstr "标准时间"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "iPhone"
-msgstr "iPhone"
-
-#. module: caldav
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "TODO"
-msgstr "待办"
-
-#. module: caldav
-#: view:calendar.event.export:0
-msgid "Export ICS"
-msgstr "导出ics格式日程表"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Use the field"
-msgstr "用这个字段"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:789
-#, python-format
-msgid "Can not create line \"%s\" more than once"
-msgstr "不能重复创建行 \"%s\""
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Webcal Calendar"
-msgstr "Webcal Calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,line_ids:0
-#: model:ir.model,name:caldav.model_basic_calendar_lines
-msgid "Calendar Lines"
-msgstr "日程记录"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_subscribe
-msgid "Event subscribe"
-msgstr "订阅事件"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import ICS"
-msgstr "导入ics日程文件"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: view:calendar.event.subscribe:0
-#: view:user.preference:0
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_event
-msgid "basic.calendar.event"
-msgstr "basic.calendar.event"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: selection:basic.calendar,type:0
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Event"
-msgstr "事件"
-
-#. module: caldav
-#: field:document.directory,calendar_collection:0
-#: field:user.preference,collection:0
-msgid "Calendar Collection"
-msgstr "日程集"
-
-#. module: caldav
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "错误:你无法建立递归的目录"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "_Open"
-msgstr "打开(_O)"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Next"
-msgstr "下一个"
-
-#. module: caldav
-#: field:basic.calendar,type:0
-#: field:basic.calendar.attributes,type:0
-#: field:basic.calendar.fields,type_id:0
-#: field:basic.calendar.lines,name:0
-msgid "Type"
-msgstr "类型"
-
-#. module: caldav
-#: help:calendar.event.export,name:0
-msgid "Save in .ics format"
-msgstr "保存为ics格式"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Error !"
-msgstr "错误！"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attributes
-msgid "Calendar attributes"
-msgstr "日程表属性"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_caldav_browse
-msgid "Caldav Browse"
-msgstr "Caldav 浏览"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Android based device"
-msgstr "基于安卓的设备"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "Configure your openerp hostname. For example : "
-msgstr "配置你的openerp主机。例如： "
-
-#. module: caldav
-#: field:basic.calendar,create_date:0
-msgid "Created Date"
-msgstr "创建日期"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Attributes Mapping"
-msgstr "属性匹配"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_document_directory
-msgid "Directory"
-msgstr "目录"
-
-#. module: caldav
-#: field:calendar.event.subscribe,url_path:0
-msgid "Provide path for remote calendar"
-msgstr "输入远程日程表的路径"
-
-#. module: caldav
-#: field:basic.calendar.lines,domain:0
-msgid "Domain"
-msgstr "过滤条件"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "_Subscribe"
-msgstr "订阅(_S)"
-
-#. module: caldav
-#: field:basic.calendar,user_id:0
-msgid "Owner"
-msgstr "所有者"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar.alias,cal_line_id:0
-#: field:basic.calendar.lines,calendar_id:0
-#: model:ir.ui.menu,name:caldav.menu_calendar
-#: field:user.preference,calendar:0
-msgid "Calendar"
-msgstr "日程表"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid ""
-"Please install python-vobject from http://vobject.skyhouseconsulting.com/"
-msgstr ""
-"请安装 python-vobject\r\n"
-"http://vobject.skyhouseconsulting.com/"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:63
-#, python-format
-msgid "Invalid format of the ics, file can not be imported"
-msgstr "ics文件格式错误，无法导入"
-
-#. module: caldav
-#: selection:user.preference,service:0
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#. module: caldav
-#: field:basic.calendar.fields,field_id:0
-msgid "OpenObject Field"
-msgstr "对象字段"
-
-#. module: caldav
-#: field:basic.calendar.alias,res_id:0
-msgid "Res. ID"
-msgstr "资源ID"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Message..."
-msgstr "消息"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,has_webcal:0
-msgid "WebCal"
-msgstr "WebCal"
-
-#. module: caldav
-#: view:document.directory:0
-#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
-#: model:ir.ui.menu,name:caldav.menu_calendar_collection
-msgid "Calendar Collections"
-msgstr "日程集"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:815
-#: sql_constraint:basic.calendar.alias:0
-#, python-format
-msgid "The same filename cannot apply to two records!"
-msgstr "两条记录不能用同一个文件名"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory cannot be parent of itself!"
-msgstr "目录不能设为自己的上级目录。"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:document.directory,calendar_ids:0
-#: model:ir.actions.act_window,name:caldav.action_caldav_form
-#: model:ir.ui.menu,name:caldav.menu_caldav_directories
-msgid "Calendars"
-msgstr "日程表"
-
-#. module: caldav
-#: field:basic.calendar,collection_id:0
-msgid "Collection"
-msgstr "集合"
-
-#. module: caldav
-#: field:basic.calendar,write_date:0
-msgid "Write Date"
-msgstr "修改日期"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:32
-#, python-format
-msgid ""
-"\n"
-"  * Webdav server that provides remote access to calendar\n"
-"  * Synchronisation of calendar using WebDAV\n"
-"  * Customize calendar event and todo attribute with any of OpenERP model\n"
-"  * Provides iCal Import/Export functionality\n"
-"\n"
-"    To access Calendars using CalDAV clients, point them to:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"    To access OpenERP Calendar using WebCal to remote site use the URL "
-"like:\n"
-"        "
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"      Where,\n"
-"        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-"        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-"        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-"created\n"
-"     "
-msgstr ""
-"\n"
-"  提供远程访问日程表的Webdav服务器\n"
-"用WebDAV同步日程表\n"
-"设置日程事件和任意OpenERP模型的待办属性\n"
-"支持iCal的导入导出功能\n"
-"\n"
-"要用CalDAV客户端访问日程表，指向：\n"
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-"\n"
-"用WebCal访问远端OpenERP日程表，使用以下地址：\n"
-"http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-"\n"
-"其中：\n"
-"HOSTNAME：正在运行的OpenERP服务器\n"
-"PORT：OpenERP服务器的端口\n"
-"DATABASE_NAME:OpenERP日程表所在的数据库\n"
-"     "
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "The directory name must be unique !"
-msgstr "目录名必须唯一！"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "User Preference"
-msgstr "用户首选项"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Please provide Proper URL !"
-msgstr "请输入正确的地址"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_timezone
-msgid "basic.calendar.timezone"
-msgstr "basic.calendar.timezone"
-
-#. module: caldav
-#: field:basic.calendar.fields,expr:0
-msgid "Expression"
-msgstr "表达式"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_attendee
-msgid "basic.calendar.attendee"
-msgstr "basic.calendar.attendee"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alias
-msgid "basic.calendar.alias"
-msgstr "basic.calendar.alias"
-
-#. module: caldav
-#: view:calendar.event.import:0
-#: field:calendar.event.import,file_path:0
-msgid "Select ICS File"
-msgstr "选择ics文件"
-
-#. module: caldav
-#: field:user.preference,device:0
-msgid "Software/Devices"
-msgstr "软件 / 设备"
-
-#. module: caldav
-#: field:basic.calendar.lines,mapping_ids:0
-msgid "Fields Mapping"
-msgstr "字段映射"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:141
-#, python-format
-msgid ""
-"\n"
-"Prerequire\n"
-"----------\n"
-"If you are using thunderbird, first you need to install the lightning "
-"module\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"configuration\n"
-"-------------\n"
-"\n"
-"1. Go to Calendar View\n"
-"\n"
-"2. File -> New Calendar\n"
-"\n"
-"3. Chosse \"On the Network\"\n"
-"\n"
-"4. for format choose CalDav\n"
-"   and as location the url given above (ie : "
-"http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-"\n"
-"5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-"\"alarm\"\n"
-"\n"
-"6. Then put your openerp login and password (to give the password only check "
-"the box \"Use password Manager to remember this password\"\n"
-"\n"
-"7. Then Finish, your meetings should appear now in your calendar view\n"
-msgstr ""
-"\n"
-"前提\n"
-"--------\n"
-"如果你正在用thunderbird，你要首先安装 lightning 模块\n"
-"http://www.mozilla.org/projects/calendar/lightning/\n"
-"\n"
-"配置\n"
-"--------\n"
-"\n"
-"1.进入日程表视图\n"
-"\n"
-"2. 文件 - 新日程表\n"
-"\n"
-"3. 选择 ”在网络上“\n"
-"\n"
-"4. 格式选择 CalDav\n"
-"    "
-"地址输入以上给出的地址，例如：http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings"
-"\n"
-"\n"
-"5. 输入日程表的名称和颜色，我们建议您不要勾选 ”提醒“\n"
-"\n"
-"6. 然后输入您的openerp用户名和密码（勾选”用密码管理器来记住这个密码“以免重复输入）\n"
-"\n"
-"7. 然后完成。你的日程会在日程表上显示出来。\n"
-
-#. module: caldav
-#: view:caldav.browse:0
-msgid "Browse Caldav"
-msgstr "浏览caldav"
-
-#. module: caldav
-#: field:user.preference,host_name:0
-msgid "Host Name"
-msgstr "主机名"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar
-msgid "basic.calendar"
-msgstr "basic.calendar"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "Other Info"
-msgstr "其它信息"
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Other"
-msgstr "其它"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "My Calendar(s)"
-msgstr "我的日程表"
-
-#. module: caldav
-#: help:basic.calendar,has_webcal:0
-msgid ""
-"Also export a <name>.ics entry next to the calendar folder, with WebCal "
-"content."
-msgstr "并且在日程表目录后生成一个 日程表名称.ics文件"
-
-#. module: caldav
-#: field:basic.calendar.fields,fn:0
-msgid "Function"
-msgstr "功能"
-
-#. module: caldav
-#: view:user.preference:0
-msgid "database.my.openerp.com  or companyserver.com"
-msgstr "database.my.openerp.com 或者 companyserver.com"
-
-#. module: caldav
-#: view:basic.calendar:0
-#: field:basic.calendar,description:0
-#: view:caldav.browse:0
-#: field:caldav.browse,description:0
-msgid "Description"
-msgstr "描述"
-
-#. module: caldav
-#: help:basic.calendar.alias,cal_line_id:0
-msgid "The calendar/line this mapping applies to"
-msgstr "日程表对应于"
-
-#. module: caldav
-#: field:basic.calendar.fields,mapping:0
-msgid "Mapping"
-msgstr "映射"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_import.py:86
-#, python-format
-msgid "Import Sucessful"
-msgstr "导入成功"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "_Import"
-msgstr "导入(_I)"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_calendar_event_import
-msgid "Event Import"
-msgstr "导入事件"
-
-#. module: caldav
-#: selection:basic.calendar.fields,fn:0
-msgid "Interval in hours"
-msgstr "间隔小时数"
-
-#. module: caldav
-#: field:calendar.event.export,name:0
-msgid "File name"
-msgstr "文件名"
-
-#. module: caldav
-#: view:calendar.event.subscribe:0
-msgid "Subscribe to Remote Calendar"
-msgstr "订阅远程日程表"
-
-#. module: caldav
-#: help:basic.calendar,calendar_color:0
-msgid "For supporting clients, the color of the calendar entries"
-msgstr "为支持彩色的客户端指定此日程表颜色"
-
-#. module: caldav
-#: field:basic.calendar,name:0
-#: field:basic.calendar.attributes,name:0
-#: field:basic.calendar.fields,name:0
-msgid "Name"
-msgstr "名称"
-
-#. module: caldav
-#: selection:basic.calendar.attributes,type:0
-#: selection:basic.calendar.lines,name:0
-msgid "Alarm"
-msgstr "提醒"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_alarm
-msgid "basic.calendar.alarm"
-msgstr "basic.calendar.alarm"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:1293
-#, python-format
-msgid "Attendee must have an Email Id"
-msgstr "参与者必须有邮件地址"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
-msgid "Export .ics File"
-msgstr "导出 .ics 文件"
-
-#. module: caldav
-#: code:addons/caldav/calendar.py:41
-#, python-format
-msgid "vobject Import Error!"
-msgstr "vobject导入出错"
-
-#. module: caldav
-#: field:calendar.event.export,file_path:0
-msgid "Save ICS file"
-msgstr "保存ics文件"
-
-#. module: caldav
-#: code:addons/caldav/wizard/caldav_browse.py:50
-#, python-format
-msgid ""
-"\n"
-"    For SSL specific configuration see the documentation below\n"
-"\n"
-"Now, to setup the calendars, you need to:\n"
-"\n"
-"1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-"page.\n"
-"2. Go to \"Add account...\"\n"
-"3. Click on \"Other\"\n"
-"4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-"\n"
-"5. Enter the host's name\n"
-"   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-"openerp.com is the host)\n"
-"\n"
-"6. Fill Username and password with your openerp login and password\n"
-"\n"
-"7. As a description, you can either leave the server's name or\n"
-"   something like \"OpenERP calendars\".\n"
-"\n"
-"9. If you are not using a SSL server, you'll get an error, do not worry and "
-"push \"Continue\"\n"
-"\n"
-"10. Then click to \"Advanced Settings\" to specify the right\n"
-"    ports and paths.\n"
-"\n"
-"11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-"\n"
-"12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-"    the url given by the wizard (ie : "
-"http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-"\n"
-"11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-"    and verify it can use the account.\n"
-"\n"
-"12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-"    Your OpenERP calendars will be visible inside the selection of the\n"
-"    \"Calendars\" button.\n"
-"    Note that when creating a new calendar entry, you will have to specify\n"
-"    which calendar it should be saved at.\n"
-"\n"
-"IF you need SSL (and your certificate is not a verified one, as usual),\n"
-"then you first will need to let the iPhone trust that. Follow these\n"
-"steps:\n"
-"\n"
-"    s1. Open Safari and enter the https location of the OpenERP server:\n"
-"      https://my.server.ip:8071/\n"
-"      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-"      is the default 8071)\n"
-"    s2. Safari will try to connect and issue a warning about the "
-"certificate\n"
-"      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-"      now trusts it.\n"
-"    "
-msgstr ""
-"\n"
-"    1.单击设置并进入“邮件、联系人、日程表”页面\n"
-"2.进入 “添加帐号”\n"
-"3.单击 “其他”\n"
-"4.在“日程表”组，选择“添加CalDAV帐号”\n"
-"5.输入主机名（例如，地址是http://openerp.com:8069/webdav/db_1/calendars/ , "
-"主机名就是openerp.com ）\n"
-"6.在用户名和密码字段输入你的openerp用户名和密码\n"
-"7.输入描述。可以是服务器名字也可以是其他文本\n"
-"8.如果你没有用SSL服务器，会看到一个报错，别担心，单击“继续”\n"
-"9.单击“高级设置”输入端口和地址\n"
-"10.输入openerp服务器端口号：8071用于SSL，8069用于非SSL\n"
-"11.设置“帐号地址”到正确的openerp webdav地址：\n"
-"地址已由向导给出：（例如：http://my.server.ip:8069/webdav/dbname/calendars/）\n"
-"12.单击完成。手机会尝试连接openerp服务器并验证帐号。\n"
-"13.进入iPhone的主菜单，并进入日程表应用。你的openerp日程表会在日程表按钮上可见。\n"
-"注意，你要新建日程记录的时候，你要指定你要保存在哪个日程表里。\n"
-"\n"
-"如果你需要SSL（一般来说你的服务器无法提供认证），你需要先让你的iPhone信任这个服务器。\n"
-"按以下步骤操作：\n"
-"\n"
-"1.打开Safari浏览器并输入https开头的OpenERP服务器地址：如https://my.server.ip:8071/\n"
-"\n"
-"2.Safari会试图连接并给出一个关于认证的警告。忽略警告并单击“接受”以便iPhone信任这个地址。\n"
-"    "
-
-#. module: caldav
-#: selection:user.preference,device:0
-msgid "Sunbird/Thunderbird"
-msgstr "Sunbird/Thunderbird"
-
-#. module: caldav
-#: field:basic.calendar,calendar_order:0
-msgid "Order"
-msgstr "顺序"
-
-#. module: caldav
-#: code:addons/caldav/wizard/calendar_event_subscribe.py:59
-#, python-format
-msgid "Error!"
-msgstr "错误！"
-
-#. module: caldav
-#: field:basic.calendar,calendar_color:0
-msgid "Color"
-msgstr "颜色"
-
-#. module: caldav
-#: view:basic.calendar:0
-msgid "MY"
-msgstr "我的"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_fields
-msgid "Calendar fields"
-msgstr "日程表字段"
-
-#. module: caldav
-#: view:calendar.event.import:0
-msgid "Import Message"
-msgstr "导入信息"
-
-#. module: caldav
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
-#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
-msgid "Subscribe"
-msgstr "订阅"
-
-#. module: caldav
-#: sql_constraint:document.directory:0
-msgid "Directory must have a parent or a storage"
-msgstr "目录必须具有上级目录或一个存储区"
-
-#. module: caldav
-#: model:ir.model,name:caldav.model_basic_calendar_todo
-msgid "basic.calendar.todo"
-msgstr "basic.calendar.todo"
-
-#. module: caldav
-#: help:basic.calendar,calendar_order:0
-msgid "For supporting clients, the order of this folder among the calendars"
-msgstr "针对支持排序的客户端，此日程表所在的位置"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "If you are using thunderbird, first you need to install the lightning "
-#~ "module\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Go to Calendar View\n"
-#~ "\n"
-#~ "2. File -> New Calendar\n"
-#~ "\n"
-#~ "3. Chosse \"On the Network\"\n"
-#~ "\n"
-#~ "4. for format choose CalDav\n"
-#~ "   and as location the url given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "   \n"
-#~ "5. Choose a name and a color for the Calendar, and we advice you to uncheck "
-#~ "\"alarm\"\n"
-#~ "\n"
-#~ "6. Then put your openerp login and password (to give the password only check "
-#~ "the box \"Use password Manager to remember this password\"\n"
-#~ "\n"
-#~ "7. Then Finish, your meetings should appear now in your calendar view\n"
-#~ msgstr ""
-#~ "\n"
-#~ "前提：\n"
-#~ "如果你用的是thunderbird，首先要安装lightning模块\n"
-#~ "http://www.mozilla.org/projects/calendar/lightning/\n"
-#~ "配置过程：\n"
-#~ "1.进入日程表视图\n"
-#~ "2.文件-新日程表\n"
-#~ "3.选择从网络\n"
-#~ "4.格式选择CalDav，地址输入上述地址，如：http://host.com:8069/webdav/db/calendars/users/demo/c"
-#~ "/Meetings\n"
-#~ "5.选择日程表的名称和颜色，建议你不选择提醒\n"
-#~ "6.输入你的OpenERP用户名和密码（可以让密码管理器记住密码）\n"
-#~ "7.点结束。你的会议将在日程表中显示。\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "  * Webdav server that provides remote access to calendar\n"
-#~ "  * Synchronisation of calendar using WebDAV\n"
-#~ "  * Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  * Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "  WebDav服务器允许远程访问日程表\n"
-#~ "用WebDav同步日程表\n"
-#~ "设置日程表事件和待办事项与OpenERP的任意对象关联\n"
-#~ "提供iCal的导入导出\n"
-#~ "\n"
-#~ "要用CalDAV客户端访问日程表，指定路径为：\n"
-#~ "http://主机名:端口/webdav/数据库名/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "要从远端访问OpenERP的日程表请使用地址：\n"
-#~ "http://主机名:端口/webdav/数据库名/Calendars/日程表名.ics\n"
-#~ "\n"
-#~ "这里，\n"
-#~ "主机名：OpenERP服务器所在的主机名\n"
-#~ "端口：OpenERP Server运行的端口（默认是8069）\n"
-#~ "数据库名称：日程表所在的数据库\n"
-#~ "日程表名：要访问的日程表\n"
-#~ "     "
-
-#~ msgid "Share Calendar using CalDAV"
-#~ msgstr "和Caldav共享日程"
-
-#~ msgid ""
-#~ "\n"
-#~ "    This module Contains basic functionality for caldav system like:  \n"
-#~ "  - Webdav server that provides remote access to calendar\n"
-#~ "  - Synchronisation of calendar using WebDAV\n"
-#~ "  - Customize calendar event and todo attribute with any of OpenERP model\n"
-#~ "  - Provides iCal Import/Export functionality\n"
-#~ "\n"
-#~ "    To access Calendars using CalDAV clients, point them to:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "    To access OpenERP Calendar using WebCal to remote site use the URL "
-#~ "like:\n"
-#~ "        "
-#~ "http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics\n"
-#~ "\n"
-#~ "      Where,\n"
-#~ "        HOSTNAME: Host on which OpenERP server(With webdav) is running\n"
-#~ "        PORT : Port on which OpenERP server is running (By Default : 8069)\n"
-#~ "        DATABASE_NAME: Name of database on which OpenERP Calendar is "
-#~ "created\n"
-#~ "        CALENDAR_NAME: Name of calendar to access\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    本模块包括caldav服务器的基本功能：\n"
-#~ "WebDav服务器允许远程访问日程表\n"
-#~ "用WebDav同步日程表\n"
-#~ "设置日程表事件和待办事项与OpenERP的任意对象关联\n"
-#~ "提供iCal的导入导出\n"
-#~ "\n"
-#~ "要用CalDAV客户端访问日程表，指定路径为：\n"
-#~ "http://主机名:端口/webdav/数据库名/calendars/users/USERNAME/c\n"
-#~ "\n"
-#~ "要从远端访问OpenERP的日程表请使用地址：\n"
-#~ "http://主机名:端口/webdav/数据库名/Calendars/日程表名.ics\n"
-#~ "\n"
-#~ "这里，\n"
-#~ "主机名：OpenERP服务器所在的主机名\n"
-#~ "端口：OpenERP Server运行的端口（默认是8069）\n"
-#~ "数据库名称：日程表所在的数据库\n"
-#~ "日程表名：要访问的日程表\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    1. Go to Calendar View\n"
-#~ "\n"
-#~ "    2. File -> New -> Calendar\n"
-#~ "\n"
-#~ "    3. Fill the form \n"
-#~ "        - type : CalDav\n"
-#~ "        - name : Whaterver you want (ie : Meeting)\n"
-#~ "        - url : "
-#~ "http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : "
-#~ "http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one "
-#~ "given on the top of this window\n"
-#~ "        - uncheck \"User SSL\"\n"
-#~ "        - Username : Your username (ie : Demo)\n"
-#~ "        - Refresh : everytime you want that evolution synchronize the data "
-#~ "with the server\n"
-#~ "\n"
-#~ "    4. Click ok and give your openerp password\n"
-#~ "\n"
-#~ "    5. A new calendar named with the name you gave should appear on the left "
-#~ "side.     \n"
-#~ "     "
-#~ msgstr ""
-#~ "\n"
-#~ "    1.进入日程表视图\n"
-#~ "2.文件-新建-日程表\n"
-#~ "3.输入表单\n"
-#~ "类型：CalDav\n"
-#~ "名称：任意输入\n"
-#~ "url：http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings \n"
-#~ "使用SSL：否\n"
-#~ "用户名：你的OpenERP用户名\n"
-#~ "刷新：你希望每次都和服务器同步\n"
-#~ "4.点击确定并输入你的OpenERP密码\n"
-#~ "5.新的日程表会出现在左侧     \n"
-#~ "     "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "    For SSL specific configuration see the documentation below\n"
-#~ "\n"
-#~ "Now, to setup the calendars, you need to:\n"
-#~ "\n"
-#~ "1. Click on the \"Settings\" and go to the \"Mail, Contacts, Calendars\" "
-#~ "page.\n"
-#~ "2. Go to \"Add account...\"\n"
-#~ "3. Click on \"Other\"\n"
-#~ "4. From the \"Calendars\" group, select \"Add CalDAV Account\"\n"
-#~ "\n"
-#~ "5. Enter the host's name \n"
-#~ "   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , "
-#~ "openerp.com is the host)\n"
-#~ "\n"
-#~ "6. Fill Username and password with your openerp login and password\n"
-#~ "\n"
-#~ "7. As a description, you can either leave the server's name or\n"
-#~ "   something like \"OpenERP calendars\".\n"
-#~ "\n"
-#~ "9. If you are not using a SSL server, you'll get an error, do not worry and "
-#~ "push \"Continue\"\n"
-#~ "\n"
-#~ "10. Then click to \"Advanced Settings\" to specify the right\n"
-#~ "    ports and paths. \n"
-#~ "    \n"
-#~ "11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.\n"
-#~ "\n"
-#~ "12. Set the \"Account URL\" to the right path of the OpenERP webdav:\n"
-#~ "    the url given by the wizard (ie : "
-#~ "http://my.server.ip:8069/webdav/dbname/calendars/ )\n"
-#~ "\n"
-#~ "11. Click on Done. The phone will hopefully connect to the OpenERP server\n"
-#~ "    and verify it can use the account.\n"
-#~ "\n"
-#~ "12. Go to the main menu of the iPhone and enter the Calendar application.\n"
-#~ "    Your OpenERP calendars will be visible inside the selection of the\n"
-#~ "    \"Calendars\" button.\n"
-#~ "    Note that when creating a new calendar entry, you will have to specify\n"
-#~ "    which calendar it should be saved at.\n"
-#~ "\n"
-#~ "\n"
-#~ "\n"
-#~ "IF you need SSL (and your certificate is not a verified one, as usual),\n"
-#~ "then you first will need to let the iPhone trust that. Follow these\n"
-#~ "steps:\n"
-#~ "\n"
-#~ "    s1. Open Safari and enter the https location of the OpenERP server:\n"
-#~ "      https://my.server.ip:8071/\n"
-#~ "      (assuming you have the server at \"my.server.ip\" and the HTTPS port\n"
-#~ "      is the default 8071)\n"
-#~ "    s2. Safari will try to connect and issue a warning about the "
-#~ "certificate\n"
-#~ "      used. Inspect the certificate and click \"Accept\" so that iPhone\n"
-#~ "      now trusts it.   \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "    SSL相关的配置参见最后的部分\n"
-#~ "首先设置日程表\n"
-#~ "1.点击设置，进入邮件、联系人和日程表页面\n"
-#~ "2.进入添加帐号\n"
-#~ "3.点击其他\n"
-#~ "4.从日程表组，选择增加CalDav帐号\n"
-#~ "5.输入服务器主机名\n"
-#~ "6.输入OpenERP的用户名和密码\n"
-#~ "7.描述可以输入服务器名也可以任意输入\n"
-#~ "9.如果不用SSL服务器会得到一个报错，点继续\n"
-#~ "10.点击高级设置\n"
-#~ "11.输入openerp服务器的端口，8071是SSL，8069是普通的\n"
-#~ "12.输入向导给定的url地址\n"
-#~ "13.点击完成。iphone会试图连接openerp服务器并验证用户名和密码\n"
-#~ "14.从iphone主画面进入日程表会看到openerp的日程表，每次输入新日程时要选择属于哪个日程表。\n"
-#~ "\n"
-#~ "如果你需要SSL连接，先用浏览器打开openERP的服务器地址，如https://my.server.ip:8071/，然后在证书警告信息后选择接受，则i"
-#~ "phone已信任你的openerp服务器。   \n"
-#~ "    "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "Prerequire\n"
-#~ "----------\n"
-#~ "There is no buit-in way to synchronize calendar with caldav.\n"
-#~ "So you need to install a third part software : Calendar (CalDav) \n"
-#~ "for now it's the only one\n"
-#~ "\n"
-#~ "configuration\n"
-#~ "-------------\n"
-#~ "\n"
-#~ "1. Open Calendar Sync\n"
-#~ "   I'll get an interface with 2 tabs\n"
-#~ "   Stay on the first one\n"
-#~ "   \n"
-#~ "2. CaDAV Calendar URL : put the URL given above (ie : "
-#~ "http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)\n"
-#~ "\n"
-#~ "3. Put your openerp username and password\n"
-#~ "\n"
-#~ "4. If your server don't use SSL, you'll get a warnign, say \"Yes\"\n"
-#~ "\n"
-#~ "5. Then you can synchronize manually or custom the settings to synchronize "
-#~ "every x minutes.\n"
-#~ "    \n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "前提：\n"
-#~ "没有与caldav同步的内置功能\n"
-#~ "需要安装第三方软件Calendar(CalDav)\n"
-#~ "就安装一个就够了\n"
-#~ "\n"
-#~ "配置：\n"
-#~ "1.打开日程表同步 输入第一个标签页就可以了\n"
-#~ "2.CalDAV日程表地址，输入上面给出的地址\n"
-#~ "3.输入你的openerp用户名和密码\n"
-#~ "4.如果你不用SSL，会得到一个警告，选择是\n"
-#~ "5.可以手动同步也可以设置每隔多少分钟同步一次\n"
-#~ "    \n"
-#~ "    "
-
-#~ msgid "Select ICS file"
-#~ msgstr "选择ics文件"
-
-#~ msgid "Browse caldav"
-#~ msgstr "浏览caldav"
-
-#~ msgid "Provide path for Remote Calendar"
-#~ msgstr "提供远程日程表路径"
diff --git a/addons/caldav/orm_utils.py b/addons/caldav/orm_utils.py
deleted file mode 100644
index b154d54d1aa..00000000000
--- a/addons/caldav/orm_utils.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010 OpenERP SA (www.openerp.com)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-
-if True: # we need this indentation level ;)
-
-    def get_last_modified(self, cr, user, args, context=None, access_rights_uid=None):
-        """Return the last modification date of objects in 'domain'
-        This function has similar semantics to orm.search(), apart from the
-        limit, offset and order arguments, which make no sense here.
-        It is useful when we want to find if the table (aka set of records)
-        has any modifications we should update at the client.
-        """
-        if context is None:
-            context = {}
-        self.pool.get('ir.model.access').check(cr, access_rights_uid or user, self._name, 'read', True)
-
-        query = self._where_calc(cr, user, args, context=context)
-        self._apply_ir_rules(cr, user, query, 'read', context=context)
-        from_clause, where_clause, where_clause_params = query.get_sql()
-
-        where_str = where_clause and (" WHERE %s" % where_clause) or ''
-
-        cr.execute('SELECT MAX(COALESCE("%s".write_date, "%s".create_date)) FROM ' % (self._table, self._table) + 
-                    from_clause + where_str ,
-                    where_clause_params)
-        res = cr.fetchall()
-        return res[0][0]
-
-#eof
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/security/ir.model.access.csv b/addons/caldav/security/ir.model.access.csv
deleted file mode 100644
index 34fbdcc0b02..00000000000
--- a/addons/caldav/security/ir.model.access.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_basic_calendar_lines,basic.calendar.lines,model_basic_calendar_lines,base.group_user,1,1,1,1
-access_basic_calendar_attributes,basic.calendar.attributes,model_basic_calendar_attributes,base.group_user,1,1,1,1
-access_basic_calendar_fields,basic.calendar.fields,model_basic_calendar_fields,base.group_user,1,1,1,1
-access_basic_calendar,basic.calendar,model_basic_calendar,base.group_user,1,1,1,1
-access_basic_calendar_alias,basic.calendar.alias,model_basic_calendar_alias,base.group_user,1,1,1,1
diff --git a/addons/caldav/wizard/__init__.py b/addons/caldav/wizard/__init__.py
deleted file mode 100644
index 059be057b61..00000000000
--- a/addons/caldav/wizard/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: 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 calendar_event_export
-import calendar_event_import
-import calendar_event_subscribe
-import caldav_browse
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/caldav_browse.py b/addons/caldav/wizard/caldav_browse.py
deleted file mode 100644
index 03ccfd3f294..00000000000
--- a/addons/caldav/wizard/caldav_browse.py
+++ /dev/null
@@ -1,279 +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 import config
-import base64
-import addons
-from tools.translate import _
-import tools
-
-class caldav_browse(osv.osv_memory):
-
-    __doc = {
-    'other' : _("""
-  * Webdav server that provides remote access to calendar
-  * Synchronisation of calendar using WebDAV
-  * Customize calendar event and todo attribute with any of OpenERP model
-  * Provides iCal Import/Export functionality
-
-    To access Calendars using CalDAV clients, point them to:
-        http://HOSTNAME:PORT/webdav/DATABASE_NAME/calendars/users/USERNAME/c
-
-    To access OpenERP Calendar using WebCal to remote site use the URL like:
-        http://HOSTNAME:PORT/webdav/DATABASE_NAME/Calendars/CALENDAR_NAME.ics
-
-      Where,
-        HOSTNAME: Host on which OpenERP server(With webdav) is running
-        PORT : Port on which OpenERP server is running (By Default : 8069)
-        DATABASE_NAME: Name of database on which OpenERP Calendar is created
-     """),
-
-     'iphone' : _("""
-    For SSL specific configuration see the documentation below
-
-Now, to setup the calendars, you need to:
-
-1. Click on the "Settings" and go to the "Mail, Contacts, Calendars" page.
-2. Go to "Add account..."
-3. Click on "Other"
-4. From the "Calendars" group, select "Add CalDAV Account"
-
-5. Enter the host's name
-   (ie : if the url is http://openerp.com:8069/webdav/db_1/calendars/ , openerp.com is the host)
-
-6. Fill Username and password with your openerp login and password
-
-7. As a description, you can either leave the server's name or
-   something like "OpenERP calendars".
-
-9. If you are not using a SSL server, you'll get an error, do not worry and push "Continue"
-
-10. Then click to "Advanced Settings" to specify the right
-    ports and paths.
-
-11. Specify the port for the OpenERP server: 8071 for SSL, 8069 without.
-
-12. Set the "Account URL" to the right path of the OpenERP webdav:
-    the url given by the wizard (ie : http://my.server.ip:8069/webdav/dbname/calendars/ )
-
-11. Click on Done. The phone will hopefully connect to the OpenERP server
-    and verify it can use the account.
-
-12. Go to the main menu of the iPhone and enter the Calendar application.
-    Your OpenERP calendars will be visible inside the selection of the
-    "Calendars" button.
-    Note that when creating a new calendar entry, you will have to specify
-    which calendar it should be saved at.
-
-IF you need SSL (and your certificate is not a verified one, as usual),
-then you first will need to let the iPhone trust that. Follow these
-steps:
-
-    s1. Open Safari and enter the https location of the OpenERP server:
-      https://my.server.ip:8071/
-      (assuming you have the server at "my.server.ip" and the HTTPS port
-      is the default 8071)
-    s2. Safari will try to connect and issue a warning about the certificate
-      used. Inspect the certificate and click "Accept" so that iPhone
-      now trusts it.
-    """),
-    'android' : _("""
-Prerequire
-----------
-There is no buit-in way to synchronize calendar with caldav.
-So you need to install a third part software : Calendar (CalDav)
-for now it's the only one
-
-configuration
--------------
-
-1. Open Calendar Sync
-   I'll get an interface with 2 tabs
-   Stay on the first one
-
-2. CaDAV Calendar URL : put the URL given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)
-
-3. Put your openerp username and password
-
-4. If your server don't use SSL, you'll get a warnign, say "Yes"
-
-5. Then you can synchronize manually or custom the settings to synchronize every x minutes.
-
-    """),
-    
-     'evolution' : _("""
-    1. Go to Calendar View
-
-    2. File -> New -> Calendar
-
-    3. Fill the form
-        - type : CalDav
-        - name : Whaterver you want (ie : Meeting)
-        - url : http://HOST:PORT/webdav/DB_NAME/calendars/users/USER/c/Meetings (ie : http://localhost:8069/webdav/db_1/calendars/users/demo/c/Meetings) the one given on the top of this window
-        - uncheck "User SSL"
-        - Username : Your username (ie : Demo)
-        - Refresh : everytime you want that evolution synchronize the data with the server
-
-    4. Click ok and give your openerp password
-
-    5. A new calendar named with the name you gave should appear on the left side.
-     """),
-
-     'thunderbird' : _("""
-Prerequire
-----------
-If you are using thunderbird, first you need to install the lightning module
-http://www.mozilla.org/projects/calendar/lightning/
-
-configuration
--------------
-
-1. Go to Calendar View
-
-2. File -> New Calendar
-
-3. Chosse "On the Network"
-
-4. for format choose CalDav
-   and as location the url given above (ie : http://host.com:8069/webdav/db/calendars/users/demo/c/Meetings)
-
-5. Choose a name and a color for the Calendar, and we advice you to uncheck "alarm"
-
-6. Then put your openerp login and password (to give the password only check the box "Use password Manager to remember this password"
-
-7. Then Finish, your meetings should appear now in your calendar view
-"""),
-    }
-    _name = 'caldav.browse'
-    _description = 'Caldav Browse'
-
-    _columns = {
-        'url' : fields.char('Caldav Server', size=264, required=True, help="Url of the caldav server, use for synchronization"),
-        #'doc_link':fields.char('Caldav Documentation', size="264", help="The link to Caldav Online Documentation.", readonly=True),
-        'description':fields.text('Description', readonly=True)
-    }
-
-    def default_get(self, cr, uid, fields, context=None):
-        pref_obj = self.pool.get('user.preference')
-        pref_ids = pref_obj.browse(cr, uid ,context.get('rec_id',False), context=context)
-        res = {}
-        host = context.get('host')
-        if not config.get_misc('webdav','enable',True):
-            raise Exception("WebDAV is disabled, cannot continue.")
-        user_pool = self.pool.get('res.users')
-        current_user = user_pool.browse(cr, uid, uid, context=context)
-        #TODO write documentation
-        res['description'] = self.__doc['other']
-        if pref_ids:
-            pref_ids = pref_ids[0]
-            if pref_ids.device == 'iphone':
-                url = host + '/'+ pref_ids.service + '/' + cr.dbname + '/'+'calendars/'
-            else :
-                url = host + '/'+ pref_ids.service + '/' + cr.dbname + '/'+'calendars/'+ 'users/'+ current_user.login + '/'+ pref_ids.collection.name+ '/'+ pref_ids.calendar.name
-
-            res['description'] = self.__doc.get(pref_ids.device , self.__doc['other'])
-        file = open(addons.get_module_resource('caldav','doc', 'caldav_doc.pdf'),'rb')
-        res['caldav_doc_file'] = base64.encodestring(file.read())
-
-        #res['doc_link'] = 'http://doc.openerp.com/'
-        res['url'] = url
-        return res
-
-    def browse_caldav(self, cr, uid, ids, context):
-        return {}
-
-caldav_browse()
-
-class user_preference(osv.osv_memory):
-
-    _name = 'user.preference'
-    _description = 'User preference Form'
-
-    _columns = {
-               'collection' :fields.many2one('document.directory', "Calendar Collection", required=True, domain = [('calendar_collection', '=', True)]),
-               'calendar' :fields.many2one('basic.calendar', 'Calendar', required=True),
-               'service': fields.selection([('webdav','CalDAV')], "Services"),
-               'device' : fields.selection([('other', 'Other'), ('iphone', 'iPhone'), ('android', 'Android based device'),('thunderbird', 'Sunbird/Thunderbird'), ('evolution','Evolution')], "Software/Devices"),
-               'host_name': fields.char('Host Name', size=64, required=True),
-    }
-
-    def _get_default_calendar(self, cr, uid, context):
-        if context == None:
-            context = {}
-        name = context.get('cal_name')
-        collection_obj = self.pool.get('basic.calendar')
-        ids = collection_obj.search(cr, uid, [('name', '=', name)])
-        return ids[0]
-
-    def _get_default_collection(self, cr, uid, context):
-        collection_obj = self.pool.get('document.directory')
-        ids = collection_obj.search(cr, uid, [('name', '=', 'c')])
-        return ids[0]
-    
-    def _get_default_host(self, cr, uid, context):
-
-        return self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context)
-
-    _defaults={
-              'service': 'webdav',
-              'collection' : _get_default_collection,
-              'calendar' : _get_default_calendar,
-              'device' : 'other',
-              'host_name':_get_default_host
-
-    }
-
-    def open_window(self, cr, uid, ids, context=None):
-        obj_model = self.pool.get('ir.model.data')
-        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','caldav_Browse')])
-        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
-        context.update({'rec_id': ids})
-        return {
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'caldav.browse',
-            'views': [(resource_id,'form')],
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-            'context': context,
-        }
-
-    def next_window(self, cr, uid, ids, context=None):
-        obj_model = self.pool.get('ir.model.data')
-        host_name  = self.browse (cr,uid,ids)[0].host_name
-        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','user_prefernce_form')])
-        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
-        context.update({'res_id': ids,'host':host_name})
-        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        return {
-            'view_type': 'form',
-            'view_mode': 'form',
-            'res_model': 'user.preference',
-            'views': [(resource_id,'form')],
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-            'context': context,
-        }
-
-user_preference()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
deleted file mode 100644
index c02eb3dea19..00000000000
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-    <record id="caldav_browse_form" model="ir.ui.view">
-            <field name="name">caldav_Browse</field>
-            <field name="model">caldav.browse</field>
-            <field name="arch" type="xml">
-                <form string="Browse Caldav" version="7.0">
-                    <sheet>
-                        <group>
-                            <separator string="Browse Caldav" colspan="4"/>
-                            <field name="url" colspan="2" />
-                            <separator string="Help" colspan="4"/>
-                            <group colspan="4"><div>
-                                1. Webdav server that provides remote access to calendar<br/>
-                                2. Synchronisation of calendar using WebDAV<br/>
-                                3. Customize calendar event and todo attribute with any of OpenERP model<br/>
-                                4. Provides iCal Import/Export functionality
-                           <br/></div></group>
-                           <group colspan="4"><div>
-                           To access Calendars using CalDAV clients, point them to:
-        http://<i>HOSTNAME</i>:<i>PORT</i>/webdav/<i>DATABASE_NAME</i>/calendars/users/<i>USERNAME</i>/c</div></group>
-                            <group colspan="4"><div>
-                            To access OpenERP Calendar using WebCal to remote site use the URL like:
-        http://<i>HOSTNAME</i>:<i>PORT</i>/webdav/<i>DATABASE_NAME</i>/Calendars/<i>CALENDAR_NAME</i>.ics</div></group>
-                            <group colspan="4"><div>
-                            <i>
-        HOSTNAME: Host on which OpenERP server(With webdav) is running<br/>
-        PORT : Port on which OpenERP server is running (By Default : 8069)<br/>
-        DATABASE_NAME: Name of database on which OpenERP Calendar is created</i>
-        </div></group>
-                            
-                        </group>
-                    </sheet>
-                    <footer>
-                        <button special="cancel" string="_Close" icon="gtk-close"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record id="host_prefernce_form" model="ir.ui.view">
-            <field name="name">host_preference</field>
-           <field name="model">user.preference</field>
-            <field name="arch" type="xml">
-               <form string="Caldav's host name configuration" version="7.0">
-                    <header>
-                        <button name="next_window" string="Next" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <sheet>
-                        <group>
-                            <field name="host_name" colspan="2" width="250" placeholder="e.g. company.my.openerp.com"/>
-                        </group>
-                    </sheet>
-               </form>
-            </field>
-        </record>
-
-     <record id="user_prefernce_form" model="ir.ui.view">
-            <field name="name">user_preference</field>
-            <field name="model">user.preference</field>
-            <field name="arch" type="xml">
-                <form string="User Preference" version="7.0">
-                    <header>
-                        <button name="open_window" string="_Open" type="object" icon="gtk-ok" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </header>
-                    <sheet>
-                        <group>
-                            <field name="service" readonly="1"/>
-                            <field name="collection" invisible="1" />
-                            <field name="calendar"  domain="[('collection_id','=', collection)]" readonly="1"/>
-                            <field name="device"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        
-    </data>
-</openerp>
diff --git a/addons/caldav/wizard/calendar_event_export.py b/addons/caldav/wizard/calendar_event_export.py
deleted file mode 100644
index 0a55f8b4fbe..00000000000
--- a/addons/caldav/wizard/calendar_event_export.py
+++ /dev/null
@@ -1,67 +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
-from tools.translate import _
-import netsvc
-import pooler
-import time
-import tools
-import wizard
-import base64
-
-class calendar_event_export(osv.osv_memory):
-    """
-    Export Calendar Event.
-    """
-
-    def default_get(self, cr, uid, fields, context=None):
-        """
-        Get Default value for Name field.
-        """
-        if context is None:
-            context = {}
-        else:
-            context= context.copy()
-        context['uid'] = uid
-        model = context.get('model', 'basic.calendar')
-        model_obj = self.pool.get(model)
-        res = super(calendar_event_export, self).default_get( cr, uid, fields, context=context)
-        name = 'OpenERP %s.ics' % (model_obj._description)
-        if 'name' in fields:
-            res.update({'name': name})
-        if 'file_path' in fields:
-            calendar = model_obj.export_cal(cr, uid, context['active_ids'], context=context)
-            res.update({'file_path': base64.encodestring(calendar)})
-        return  res
-
-    _name = "calendar.event.export"
-    _description = "Event Export"
-
-    _columns = {
-              'file_path':fields.binary('Save ICS file', filters='*.ics', readonly=True),
-              'name':fields.char('File name', size=34, required=True, help='Save in .ics format')
-               }
-
-calendar_event_export()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/calendar_event_export_view.xml b/addons/caldav/wizard/calendar_event_export_view.xml
deleted file mode 100644
index 0675f8bc00b..00000000000
--- a/addons/caldav/wizard/calendar_event_export_view.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_calendar_event_export" model="ir.ui.view">
-            <field name="name">calendar.event.export.form</field>
-            <field name="model">calendar.event.export</field>
-            <field name="arch" type="xml">
-                <form string="Export ICS">
-                    <group colspan="4" >
-                         <field name="name"/>
-                         <field name="file_path" colspan="4" width="300"/>
-                    </group>
-               </form>
-            </field>
-        </record>
-
-        <act_window id="action_calendar_event_export_values"
-            key2="client_action_multi" name="Export .ics File"
-            res_model="calendar.event.export" src_model="basic.calendar"
-            view_id="view_calendar_event_export"
-            view_mode="form" target="new" view_type="form" />
-
-    </data>
-</openerp>
diff --git a/addons/caldav/wizard/calendar_event_import.py b/addons/caldav/wizard/calendar_event_import.py
deleted file mode 100644
index 3c0229692cb..00000000000
--- a/addons/caldav/wizard/calendar_event_import.py
+++ /dev/null
@@ -1,94 +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
-from tools.translate import _
-import netsvc
-import pooler
-import time
-import tools
-import wizard
-import base64
-
-class calendar_event_import(osv.osv_memory):
-    """
-    Import Calendar Event.
-    """
-    cnt = 0
-
-    def process_imp_ics(self, cr, uid, ids, context=None):
-        """
-        Process Import ics File.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of calendar event import’s IDs
-        @return: dictionary of calendar evet import  window with Import successful msg.
-        """
-        if context is None:
-            context = {}
-        else:
-            context = context.copy()
-        context['uid'] = uid
-
-        for data in self.read(cr, uid, ids, context=context):
-            model = data.get('model', 'basic.calendar')
-            model_obj = self.pool.get(model)
-            context.update({'model': model})
-            data_obj = self.pool.get('ir.model.data')
-            id2 = data_obj._get_id(cr, uid, 'caldav', 'view_calendar_event_import_display')
-            if id2:
-                 id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-            vals = None
-            try:
-                vals = model_obj.import_cal(cr, uid, base64.decodestring(data['file_path']), context['active_id'], context)
-            except:
-                raise osv.except_osv(_('Warning!'),_('Invalid format of the ics, file cannot be imported.'))
-            global cnt
-            if vals:
-                cnt = len(vals)
-            value = {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'calendar.event.import',
-                'views': [(id2,'form'),(False,'tree'),(False,'calendar'),(False,'graph')],
-                'type': 'ir.actions.act_window',
-                'target': 'new'
-            }
-            return value
-
-    _name = "calendar.event.import"
-    _description = "Event Import"
-
-    _columns = {
-                  'file_path': fields.binary('Select ICS File', filters='*.ics', required=True),
-                  'msg': fields.text('', readonly=True),
-               }
-
-    def _get_msg(self, cr, uid, context):
-        return _('Import Sucessful')
-        
-    _defaults = {
-               'msg': _get_msg,
-               }
-
-calendar_event_import()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml
deleted file mode 100644
index a908765782e..00000000000
--- a/addons/caldav/wizard/calendar_event_import_view.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_calendar_event_import" model="ir.ui.view">
-            <field name="name">calendar.event.import.form</field>
-            <field name="model">calendar.event.import</field>
-            <field name="arch" type="xml">
-                <form string="Import ICS" version="7.0">
-                    <group colspan="4" >
-                         <separator string="Select ICS File"/>
-                         <field name="file_path" colspan="4" width="500" nolabel="1"/>
-                    </group>
-                    <footer>
-                        <button name="process_imp_ics"  string="_Import" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
-               </form>
-            </field>
-        </record>
-        
-        <record id="view_calendar_event_import_display" model="ir.ui.view">
-            <field name="name">calendar.event.import.form.display</field>
-            <field name="model">calendar.event.import</field>
-            <field name="arch" type="xml">
-                <form string="Import Message">
-                    <group colspan="4" >
-                          <field name="msg" colspan="4" width="300" nolabel="1"/>
-                    </group>
-               </form>
-            </field>
-        </record>
-        
-       <act_window id="action_calendar_event_import_values"
-            key2="client_action_multi" name="Import .ics File"
-            res_model="calendar.event.import" src_model="basic.calendar"
-            view_id="view_calendar_event_import"
-            view_mode="form" target="new" view_type="form" />
-    </data>
-</openerp>
diff --git a/addons/caldav/wizard/calendar_event_subscribe.py b/addons/caldav/wizard/calendar_event_subscribe.py
deleted file mode 100644
index f4f9e22cc60..00000000000
--- a/addons/caldav/wizard/calendar_event_subscribe.py
+++ /dev/null
@@ -1,97 +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
-from tools.translate import _
-import netsvc
-import pooler
-import time
-import tools
-import wizard
-import base64
-import urllib
-
-class calendar_event_subscribe(osv.osv_memory):
-    """
-    Subscribe  Calendar Event.
-    """
-    cnt = 0
-
-    def process_imp_ics(self, cr, uid, ids, context=None):
-        """
-        process ics file.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of calendar event subscribe’s IDs
-        @return: dictionary of calendar evet subscribe  window with Import successful msg.
-        """
-        global cnt
-        if context is None:
-            context = {}
-        else:
-            context = context.copy()
-        context['uid'] = uid
-
-        for data in self.read(cr, uid, ids, context=context):
-            try:
-                f =  urllib.urlopen(data['url_path'])
-                caldata = f.fp.read()
-                f.close()
-            except Exception,e:
-                raise osv.except_osv(_('Error!'), _('Please provide Proper URL !'))
-            model = data.get('model', 'basic.calendar')
-            model_obj = self.pool.get(model)
-            context.update({'url': data['url_path'],
-                                    'model': data.get('model', 'basic.calendar')})
-            vals = model_obj.import_cal(cr, uid, base64.encodestring(caldata), \
-                                            context['active_id'],  context)
-            if vals:
-                cnt = vals['count']
-            data_obj = self.pool.get('ir.model.data')
-            id2 = data_obj._get_id(cr, uid, 'caldav', 'view_calendar_event_subscribe_display')
-            if id2:
-                 id2 = data_obj.browse(cr, uid, id2, context=context).res_id
-
-            value = {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'calendar.event.subscribe',
-                'views': [(id2,'form'),(False,'tree'),(False,'calendar'),(False,'graph')],
-                'type': 'ir.actions.act_window',
-                'target': 'new'
-            }
-            return value
-
-    _name = "calendar.event.subscribe"
-    _description = "Event subscribe"
-
-    _columns = {
-                'url_path': fields.char('Provide path for remote calendar', size=124, required=True),
-                'msg': fields.text('', readonly=True),
-
-               }
-    _defaults = {
-               'msg':lambda *a:'Import Sucessful.'
-               }
-
-calendar_event_subscribe()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/caldav/wizard/calendar_event_subscribe_view.xml b/addons/caldav/wizard/calendar_event_subscribe_view.xml
deleted file mode 100644
index 5bd9f72ef2d..00000000000
--- a/addons/caldav/wizard/calendar_event_subscribe_view.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_calendar_event_subscribe" model="ir.ui.view">
-            <field name="name">calendar.event.subscribe.form</field>
-            <field name="model">calendar.event.subscribe</field>
-            <field name="arch" type="xml">
-                <form string="Subscribe to Remote Calendar" version="7.0">
-                    <group colspan="4" >
-                         <separator string="Provide Path for Remote Calendar"/>
-                          <field name="url_path" colspan="4" width="300" nolabel="1" widget="url"/>
-                    </group>
-                    <footer>
-                        <button name="process_imp_ics"  string="_Subscribe" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
-               </form>
-            </field>
-        </record>
-        
-        <record id="view_calendar_event_subscribe_display" model="ir.ui.view">
-            <field name="name">calendar.event.subscribe.form.display</field>
-            <field name="model">calendar.event.subscribe</field>
-            <field name="arch" type="xml">
-                <form string="Message...">
-                    <group colspan="4" >
-                          <field name="msg" colspan="4" width="300" nolabel="1"/>
-                    </group>
-               </form>
-            </field>
-        </record>
-        
-        <record id="action_calendar_event_subscribe" model="ir.actions.act_window">
-            <field name="name">Subscribe</field>
-            <field name="res_model">calendar.event.subscribe</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_calendar_event_subscribe"/> 
-           <field name="target">new</field>
-        </record>
-        
-        <act_window id="action_calendar_event_subscribe_values"
-            key2="client_action_multi" name="Subscribe"
-            res_model="calendar.event.subscribe" src_model="basic.calendar"
-            view_mode="form" target="new" view_type="form" />
-        
-    </data>
-</openerp>
diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py
index 3ce79a382ca..453312233f6 100644
--- a/addons/claim_from_delivery/__openerp__.py
+++ b/addons/claim_from_delivery/__openerp__.py
@@ -18,23 +18,23 @@
 #
 ##############################################################################
 {
-    "name" : "Claim on Deliveries",
-    "version" : "1.0",
-    "author" : "OpenERP SA",
-    "category" : "Warehouse Management",
-    "depends" : ["base", "crm_claim", "stock"],
-    "init_xml" : [],
-    "demo_xml" : [],
-    "description": '''
+    'name' : 'Claim on Deliveries',
+    'version' : '1.0',
+    'author' : 'OpenERP SA',
+    'category' : 'Warehouse Management',
+    'depends' : ['base', 'crm_claim', 'stock'],
+    'demo' : [],
+    'description': """
 Create a claim from a delivery order.
 =====================================
 
 Adds a Claim link to the delivery order.
-''',
-    "update_xml" : ["claim_delivery_view.xml"],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "001101649349223746957",
+""",
+    'data' : [
+              'claim_delivery_view.xml',
+              'claim_delivery_data.xml',],
+    'auto_install': False,
+    'installable': True,
     'images': ['images/1_claim_link_delivery_order.jpeg'],
 }
 
diff --git a/addons/claim_from_delivery/claim_delivery_data.xml b/addons/claim_from_delivery/claim_delivery_data.xml
new file mode 100644
index 00000000000..1b69087d4b8
--- /dev/null
+++ b/addons/claim_from_delivery/claim_delivery_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record model="res.request.link" id="request_link_claim_from_delivery">
+            <field name="name">Delivery Order</field>
+            <field name="object">stock.picking.out</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/claim_from_delivery/claim_delivery_view.xml b/addons/claim_from_delivery/claim_delivery_view.xml
index f345484b4a9..9187b1d11ca 100644
--- a/addons/claim_from_delivery/claim_delivery_view.xml
+++ b/addons/claim_from_delivery/claim_delivery_view.xml
@@ -1,11 +1,27 @@
 <openerp>
     <data>
 
-        <act_window id="action_claim_from_delivery" name="Claim"
-            domain="[]" target="current"
-            context="{'default_partner_id': partner_id}"
-            view_mode="form" res_model="crm.claim"
-            src_model="stock.picking" />
+        <record id="action_claim_from_delivery" model="ir.actions.act_window">
+            <field name="name">Claim From Delivery</field>
+            <field name="res_model">crm.claim</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="crm_claim.crm_case_claims_tree_view"/>
+            <field name="context">{'default_ref': 'stock.picking.out,'+str(context.get('active_id', False))}</field>
+            <field name="domain">[('ref','=','stock.picking.out,'+str(context.get('active_id',False)))]</field>
+        </record>
+
+        <record id="crm_claim_from_delivery" model="ir.ui.view">
+            <field name="name">crm.claim.from_delivery.form</field>
+            <field name="model">stock.picking.out</field>
+            <field name="inherit_id" ref="stock.view_picking_out_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="/form/sheet/h1" position="before">
+                    <div class="oe_right oe_button_box">
+                        <button name="%(action_claim_from_delivery)d" string="Claims" type="action"/>
+                    </div>
+                </xpath>
+            </field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/claim_from_delivery/i18n/ar.po b/addons/claim_from_delivery/i18n/ar.po
index aa43e8979ed..33e8240f631 100644
--- a/addons/claim_from_delivery/i18n/ar.po
+++ b/addons/claim_from_delivery/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/bg.po b/addons/claim_from_delivery/i18n/bg.po
index 8f3edd63cf6..110de0f2fb4 100644
--- a/addons/claim_from_delivery/i18n/bg.po
+++ b/addons/claim_from_delivery/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/ca.po b/addons/claim_from_delivery/i18n/ca.po
index 89524a879d2..79866f8f8bb 100644
--- a/addons/claim_from_delivery/i18n/ca.po
+++ b/addons/claim_from_delivery/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/cs.po b/addons/claim_from_delivery/i18n/cs.po
index 1626b76f63a..30698821f85 100644
--- a/addons/claim_from_delivery/i18n/cs.po
+++ b/addons/claim_from_delivery/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/da.po b/addons/claim_from_delivery/i18n/da.po
index 07e48b83e7a..81044dba536 100644
--- a/addons/claim_from_delivery/i18n/da.po
+++ b/addons/claim_from_delivery/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/de.po b/addons/claim_from_delivery/i18n/de.po
index 75d1e08d1d5..36c5c1a90e4 100644
--- a/addons/claim_from_delivery/i18n/de.po
+++ b/addons/claim_from_delivery/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/en_GB.po b/addons/claim_from_delivery/i18n/en_GB.po
index 22e5a013c29..0c48e14b977 100644
--- a/addons/claim_from_delivery/i18n/en_GB.po
+++ b/addons/claim_from_delivery/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/es.po b/addons/claim_from_delivery/i18n/es.po
index 8cb0530bd0a..d2d7d6890c0 100644
--- a/addons/claim_from_delivery/i18n/es.po
+++ b/addons/claim_from_delivery/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/es_AR.po b/addons/claim_from_delivery/i18n/es_AR.po
index 776a02a7a1e..5e973955d43 100644
--- a/addons/claim_from_delivery/i18n/es_AR.po
+++ b/addons/claim_from_delivery/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/es_CL.po b/addons/claim_from_delivery/i18n/es_CL.po
index feafbf2cb2d..638f531af1b 100644
--- a/addons/claim_from_delivery/i18n/es_CL.po
+++ b/addons/claim_from_delivery/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/es_CR.po b/addons/claim_from_delivery/i18n/es_CR.po
index d13a6842622..10d11882592 100644
--- a/addons/claim_from_delivery/i18n/es_CR.po
+++ b/addons/claim_from_delivery/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/es_EC.po b/addons/claim_from_delivery/i18n/es_EC.po
index d62844470d5..7eaf3e1ab3b 100644
--- a/addons/claim_from_delivery/i18n/es_EC.po
+++ b/addons/claim_from_delivery/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/es_PY.po b/addons/claim_from_delivery/i18n/es_PY.po
index 3c5f79daba4..148e6620e1f 100644
--- a/addons/claim_from_delivery/i18n/es_PY.po
+++ b/addons/claim_from_delivery/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/fa.po b/addons/claim_from_delivery/i18n/fa.po
index 9508fc50c6d..2a185ee980f 100644
--- a/addons/claim_from_delivery/i18n/fa.po
+++ b/addons/claim_from_delivery/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/fi.po b/addons/claim_from_delivery/i18n/fi.po
index 18a9ea34990..6c7f7889f7c 100644
--- a/addons/claim_from_delivery/i18n/fi.po
+++ b/addons/claim_from_delivery/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/fr.po b/addons/claim_from_delivery/i18n/fr.po
index db0094d32e3..04adcf17e8e 100644
--- a/addons/claim_from_delivery/i18n/fr.po
+++ b/addons/claim_from_delivery/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/gl.po b/addons/claim_from_delivery/i18n/gl.po
index 709d62b5c33..65a6fa28e22 100644
--- a/addons/claim_from_delivery/i18n/gl.po
+++ b/addons/claim_from_delivery/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/gu.po b/addons/claim_from_delivery/i18n/gu.po
index 76fdd111015..8b66e8aaa7d 100644
--- a/addons/claim_from_delivery/i18n/gu.po
+++ b/addons/claim_from_delivery/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/hr.po b/addons/claim_from_delivery/i18n/hr.po
index 145a68b44ef..fe59e3b7558 100644
--- a/addons/claim_from_delivery/i18n/hr.po
+++ b/addons/claim_from_delivery/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/hu.po b/addons/claim_from_delivery/i18n/hu.po
index 97d5c4d3370..2b7b8a87aab 100644
--- a/addons/claim_from_delivery/i18n/hu.po
+++ b/addons/claim_from_delivery/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/id.po b/addons/claim_from_delivery/i18n/id.po
index 9cce9e49aa8..6ae6881a9db 100644
--- a/addons/claim_from_delivery/i18n/id.po
+++ b/addons/claim_from_delivery/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/it.po b/addons/claim_from_delivery/i18n/it.po
index 19ce39fd161..452246d3cc7 100644
--- a/addons/claim_from_delivery/i18n/it.po
+++ b/addons/claim_from_delivery/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/ja.po b/addons/claim_from_delivery/i18n/ja.po
index 9fb966e961c..3db2e65f59a 100644
--- a/addons/claim_from_delivery/i18n/ja.po
+++ b/addons/claim_from_delivery/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/lo.po b/addons/claim_from_delivery/i18n/lo.po
new file mode 100644
index 00000000000..dcb7e7411a4
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/lo.po
@@ -0,0 +1,23 @@
+# Lao translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-20 18:44+0000\n"
+"Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
+"Language-Team: Lao <lo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "ຕໍ່ຮ້ອງ"
diff --git a/addons/claim_from_delivery/i18n/lt.po b/addons/claim_from_delivery/i18n/lt.po
new file mode 100644
index 00000000000..03ac2ad03ee
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/lt.po
@@ -0,0 +1,23 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-11-15 13:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-16 04:36+0000\n"
+"X-Generator: Launchpad (build 16272)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr ""
diff --git a/addons/claim_from_delivery/i18n/mn.po b/addons/claim_from_delivery/i18n/mn.po
index ff61eea02ca..837e1b1258a 100644
--- a/addons/claim_from_delivery/i18n/mn.po
+++ b/addons/claim_from_delivery/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/nb.po b/addons/claim_from_delivery/i18n/nb.po
index 0d9bf875e6e..f2598e31aff 100644
--- a/addons/claim_from_delivery/i18n/nb.po
+++ b/addons/claim_from_delivery/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/nl.po b/addons/claim_from_delivery/i18n/nl.po
index 1ccf984e01d..9470c7b9012 100644
--- a/addons/claim_from_delivery/i18n/nl.po
+++ b/addons/claim_from_delivery/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/nl_BE.po b/addons/claim_from_delivery/i18n/nl_BE.po
new file mode 100644
index 00000000000..303557b14a3
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/nl_BE.po
@@ -0,0 +1,23 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-10-01 11:24+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <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: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "Klacht"
diff --git a/addons/claim_from_delivery/i18n/oc.po b/addons/claim_from_delivery/i18n/oc.po
index 4fcc3cc1c72..e49b9ba08af 100644
--- a/addons/claim_from_delivery/i18n/oc.po
+++ b/addons/claim_from_delivery/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/pt.po b/addons/claim_from_delivery/i18n/pt.po
index b8105bf16d0..1ee34006ec0 100644
--- a/addons/claim_from_delivery/i18n/pt.po
+++ b/addons/claim_from_delivery/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/pt_BR.po b/addons/claim_from_delivery/i18n/pt_BR.po
index 74042c2d572..e59c92f9c04 100644
--- a/addons/claim_from_delivery/i18n/pt_BR.po
+++ b/addons/claim_from_delivery/i18n/pt_BR.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
 msgid "Claim"
-msgstr "Reinvindicação"
+msgstr "Solicitação"
 
 #~ msgid "Claim from delivery"
 #~ msgstr "Reinvindicação da entrega"
diff --git a/addons/claim_from_delivery/i18n/ro.po b/addons/claim_from_delivery/i18n/ro.po
index 28055a7dc9f..428f976733b 100644
--- a/addons/claim_from_delivery/i18n/ro.po
+++ b/addons/claim_from_delivery/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/ru.po b/addons/claim_from_delivery/i18n/ru.po
index 5ca1012b26a..1bc5eb40b16 100644
--- a/addons/claim_from_delivery/i18n/ru.po
+++ b/addons/claim_from_delivery/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/sl.po b/addons/claim_from_delivery/i18n/sl.po
index 713d13c4d84..34a6c78a171 100644
--- a/addons/claim_from_delivery/i18n/sl.po
+++ b/addons/claim_from_delivery/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/sq.po b/addons/claim_from_delivery/i18n/sq.po
index b8d0c7ce7f5..133242e56d8 100644
--- a/addons/claim_from_delivery/i18n/sq.po
+++ b/addons/claim_from_delivery/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/sr.po b/addons/claim_from_delivery/i18n/sr.po
index aa2e3e864dc..3a5e4c3b6d9 100644
--- a/addons/claim_from_delivery/i18n/sr.po
+++ b/addons/claim_from_delivery/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/sr@latin.po b/addons/claim_from_delivery/i18n/sr@latin.po
index 0eae21cbd15..4f706be2cbe 100644
--- a/addons/claim_from_delivery/i18n/sr@latin.po
+++ b/addons/claim_from_delivery/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/sv.po b/addons/claim_from_delivery/i18n/sv.po
index 6f68be6c37d..78a4c723ea7 100644
--- a/addons/claim_from_delivery/i18n/sv.po
+++ b/addons/claim_from_delivery/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/ta.po b/addons/claim_from_delivery/i18n/ta.po
index 022574dc4b9..e21024dbdc8 100644
--- a/addons/claim_from_delivery/i18n/ta.po
+++ b/addons/claim_from_delivery/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/tr.po b/addons/claim_from_delivery/i18n/tr.po
index 7eba8080701..e3b4328f26e 100644
--- a/addons/claim_from_delivery/i18n/tr.po
+++ b/addons/claim_from_delivery/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/zh_CN.po b/addons/claim_from_delivery/i18n/zh_CN.po
index f3a9d38234d..c8743c7ef04 100644
--- a/addons/claim_from_delivery/i18n/zh_CN.po
+++ b/addons/claim_from_delivery/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
diff --git a/addons/claim_from_delivery/i18n/zh_TW.po b/addons/claim_from_delivery/i18n/zh_TW.po
new file mode 100644
index 00000000000..4aaed51c328
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/zh_TW.po
@@ -0,0 +1,23 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-19 10:24+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: claim_from_delivery
+#: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
+msgid "Claim"
+msgstr "索賠"
diff --git a/addons/import_google/__init__.py b/addons/contacts/__init__.py
similarity index 91%
rename from addons/import_google/__init__.py
rename to addons/contacts/__init__.py
index 7ca8ce67ab3..26c654db9dd 100644
--- a/addons/import_google/__init__.py
+++ b/addons/contacts/__init__.py
@@ -19,6 +19,3 @@
 #
 ##############################################################################
 
-import partner
-import wizard
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_base/__openerp__.py b/addons/contacts/__openerp__.py
similarity index 72%
rename from addons/import_base/__openerp__.py
rename to addons/contacts/__openerp__.py
index 294f864a0e3..3b4df183478 100644
--- a/addons/import_base/__openerp__.py
+++ b/addons/contacts/__openerp__.py
@@ -20,21 +20,24 @@
 ##############################################################################
 
 {
-    'name': 'Framework for Complex Import',
-    'version': '0.9',
-    'category': 'Hidden/Dependency',
+    'name': 'Address Book',
+    'version': '1.0',
+    'category': 'Tools',
     'description': """
-This module provide a class import_framework to help importing complex data from
-other software.
-    """,
+This module gives you a quick view of your address book, accessible from your home page.
+You can track your suppliers, customers and other contacts.
+""",
     'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'depends': ['base','mail'],
-    'init_xml': [],
-    'update_xml': ["import_base_view.xml"],
-    'demo_xml': [],
-    'test': [], #TODO provide test
+    'website': 'http://openerp.com',
+    'summary': 'Contacts, People and Companies',
+    'depends': [
+        'mail',
+    ],
+    'data': [
+        'contacts_view.xml',
+    ],
     'installable': True,
+    'application': True,
     'auto_install': False,
 }
 
diff --git a/addons/contacts/contacts_view.xml b/addons/contacts/contacts_view.xml
new file mode 100644
index 00000000000..4908653aa2b
--- /dev/null
+++ b/addons/contacts/contacts_view.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" ?>
+<openerp>
+  <data>
+
+
+    <record id="action_contacts" model="ir.actions.act_window">
+        <field name="name">Contacts</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.partner</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">kanban,tree,form</field>
+        <field name="search_view_id" ref="base.view_res_partner_filter"/>
+        <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
+            Click to add a contact in your address book.
+          </p><p>
+            OpenERP helps you easily track all activities related to
+            a customer; discussions, history of business opportunities,
+            documents, etc.
+          </p>
+        </field>
+    </record>
+
+    <record id="action_contacts_view_kanban" model="ir.actions.act_window.view">
+        <field eval="0" name="sequence"/>
+        <field name="view_mode">kanban</field>
+        <field name="view_id" ref="base.res_partner_kanban_view"/>
+        <field name="act_window_id" ref="action_contacts"/>
+    </record>
+    <record id="action_contacts_view_tree" model="ir.actions.act_window.view">
+        <field name="sequence" eval="1"/>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="base.view_partner_tree"/>
+        <field name="act_window_id" ref="action_contacts"/>
+    </record>
+    <record id="action_contacts_view_form" model="ir.actions.act_window.view">
+        <field eval="2" name="sequence"/>
+        <field name="view_mode">form</field>
+        <field name="view_id" ref="base.view_partner_form"/>
+        <field name="act_window_id" ref="action_contacts"/>
+    </record>
+    
+    <menuitem name="Contacts" 
+        id="menu_contacts" 
+        parent="mail.mail_my_stuff" 
+        sequence="11" 
+        action="action_contacts"
+        groups="base.group_user,base.group_partner_manager"/>
+
+  </data>
+</openerp>
+
+
diff --git a/addons/contacts/static/src/img/icon.png b/addons/contacts/static/src/img/icon.png
new file mode 100644
index 00000000000..dc9f8ee3422
Binary files /dev/null and b/addons/contacts/static/src/img/icon.png differ
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 643908c1098..03885f541d0 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -24,38 +24,27 @@
     'name': 'CRM',
     'version': '1.0',
     'category': 'Customer Relationship Management',
-    "sequence": 2,
-    "summary": "Leads, Opportunities, Agenda",
+    'sequence': 2,
+    'summary': 'Leads, Opportunities, Phone Calls',
     'description': """
-The generic OpenERP Customer Relationship Management.
+The generic OpenERP Customer Relationship Management
 =====================================================
 
-This system enables a group of people to intelligently and efficiently manage
-leads, opportunities, meeting, phonecall.
+This application enables a group of people to intelligently and efficiently manage leads, opportunities, meetings and phone calls.
 
-It manages key tasks such as communication, identification, prioritization,
-assignment, resolution and notification.
+It manages key tasks such as communication, identification, prioritization, assignment, resolution and notification.
 
-OpenERP ensures that all cases are successfully tracked by users, customers and
-suppliers. It can automatically send reminders, escalate the request, trigger
-specific methods and lots of other actions based on your own enterprise rules.
+OpenERP ensures that all cases are successfully tracked by users, customers and suppliers. It can automatically send reminders, escalate the request, trigger specific methods and many other actions based on your own enterprise rules.
 
-The greatest thing about this system is that users don't need to do anything
-special. They can just send email to the request tracker. OpenERP will take
-care of thanking them for their message, automatically routing it to the
-appropriate staff and make sure all future correspondence gets to the right
-place.
+The greatest thing about this system is that users don't need to do anything special. The CRM module has an email gateway for the synchronization interface between mails and OpenERP. That way, users can just send emails to the request tracker.
 
-The CRM module has a email gateway for the synchronisation interface
-between mails and OpenERP.
+OpenERP will take care of thanking them for their message, automatically routing it to the appropriate staff and make sure all future correspondence gets to the right place.
 
-Creates a dashboard for CRM that includes:
-------------------------------------------
-    * List of New Leads
-    * List of My Opportunities
-    * List of My Next Meetings
-    * Planned Revenue by Stage and User (graph)
-    * Opportunities by Stage (graph)
+
+Dashboard for CRM will include:
+-------------------------------
+* Planned Revenue by Stage and User (graph)
+* Opportunities by Stage (graph)
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
@@ -70,12 +59,11 @@ Creates a dashboard for CRM that includes:
         'board',
         'fetchmail'
     ],
-    'init_xml': [
+    'data': [
         'crm_data.xml',
         'crm_lead_data.xml',
         'crm_phonecall_data.xml',
-    ],
-    'update_xml': [
+
         'security/crm_security.xml',
         'security/ir.model.access.csv',
 
@@ -97,9 +85,7 @@ Creates a dashboard for CRM that includes:
         'crm_lead_view.xml',
         'crm_lead_menu.xml',
 
-        'crm_meeting_view.xml',
         'crm_meeting_menu.xml',
-        'crm_meeting_shortcut_data.xml',
 
         'crm_phonecall_view.xml',
         'crm_phonecall_menu.xml',
@@ -111,30 +97,31 @@ Creates a dashboard for CRM that includes:
 
         'res_partner_view.xml',
         'board_crm_view.xml',
-        
+
         'res_config_view.xml',
 
     ],
-    'demo_xml': [
+    'demo': [
         'crm_demo.xml',
         'crm_lead_demo.xml',
         'crm_phonecall_demo.xml',
+        'crm_action_rule_demo.xml',
     ],
     'test': [
-            'test/process/communication_with_customer.yml',
-            'test/process/lead2opportunity2win.yml',
-            'test/process/merge_opportunity.yml',
-            'test/process/cancel_lead.yml',
-            'test/process/action_rule.yml',
-            'test/process/segmentation.yml',
-            'test/ui/crm_demo.yml',
-            'test/ui/duplicate_lead.yml',
-            'test/ui/delete_lead.yml'
-             ],
+        'test/process/communication_with_customer.yml',
+        'test/process/lead2opportunity2win.yml',
+        'test/process/merge_opportunity.yml',
+        'test/process/cancel_lead.yml',
+        'test/process/action_rule.yml',
+        'test/process/segmentation.yml',
+        'test/process/phonecalls.yml',
+        'test/ui/crm_demo.yml',
+        'test/ui/duplicate_lead.yml',
+        'test/ui/delete_lead.yml',
+    ],
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0079056041421',
     'images': ['images/sale_crm_crm_dashboard.png', 'images/crm_dashboard.jpeg','images/leads.jpeg','images/meetings.jpeg','images/opportunities.jpeg','images/outbound_calls.jpeg','images/stages.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index 16ed1e4c5ad..d80183b80c9 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -2,22 +2,6 @@
 <openerp>
      <data>
         <!-- CRM dashboard -->
-        <record model="ir.actions.act_window" id="act_my_oppor">
-            <field name="name">My Opportunities</field>
-            <field name="res_model">crm.lead</field>
-            <field name="view_mode">tree</field>
-            <field name="domain">[('user_id','=',uid),('type', '=', 'opportunity'),('state','not in',('cancel','done'))]</field>
-            <field name="view_id" ref="crm.crm_case_tree_view_oppor"/>
-        </record>
-
-        <record model="ir.actions.act_window" id="act_crm_tag_tree_view_leads_all">
-            <field name="name">New Leads</field>
-            <field name="res_model">crm.lead</field>
-            <field name="view_mode">tree</field>
-            <field name="domain">[('user_id','=',uid),('state','=','draft'),('type','=','lead')]</field>
-            <field name="view_id" ref="crm.crm_case_tree_view_leads"/>
-        </record>
-
         <record model="ir.ui.view" id="view_crm_opportunity_stage_graph">
             <field name="name">Opportunities By Stage - Graph</field>
             <field name="model">crm.lead.report</field>
@@ -70,11 +54,9 @@
                 <form string="Statistics Dashboard" version="7.0">
                     <board style="1-1">
                         <column>
-                            <action string="New Leads" name="%(act_crm_tag_tree_view_leads_all)d"/>
-                            <action string="My Opportunities" name="%(act_my_oppor)d"/>
+                            <action string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d"/>
                         </column>
                         <column>
-                            <action string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d"/>
                             <action string="Opportunities by Stage" name="%(act_opportunity_stage)d"/>
                         </column>
                     </board>
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index b45b8ea8712..368656224ac 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -58,7 +58,7 @@ class crm_case_channel(osv.osv):
 
 class crm_case_stage(osv.osv):
     """ Model for case stages. This models the main stages of a document
-        management flow. Main CRM objects (leads, opportunities, project 
+        management flow. Main CRM objects (leads, opportunities, project
         issues, ...) will now use only stages, instead of state and stages.
         Stages are for example used to display the kanban view of records.
     """
@@ -75,7 +75,9 @@ class crm_case_stage(osv.osv):
         'requirements': fields.text('Requirements'),
         'section_ids':fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', string='Sections',
                         help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."),
-        'state': fields.selection(AVAILABLE_STATES, 'State', required=True, help="The related state for the stage. The state of your document will automatically change regarding the selected stage. For example, if a stage is related to the state 'Close', when your document reaches this stage, it will be automatically have the 'closed' state."),
+        'state': fields.selection(AVAILABLE_STATES, 'Related Status', required=True,
+            help="The status of your document will automatically change regarding the selected stage. " \
+                "For example, if a stage is related to the status 'Close', when your document reaches this stage, it is automatically closed."),
         'case_default': fields.boolean('Common to All Teams',
                         help="If you check this field, this stage will be proposed by default on each sales team. It will not assign this stage to existing teams."),
         'fold': fields.boolean('Hide in Views when Empty',
@@ -90,15 +92,17 @@ class crm_case_stage(osv.osv):
     _defaults = {
         'sequence': lambda *args: 1,
         'probability': lambda *args: 0.0,
-        'state': 'draft',
+        'state': 'open',
         'fold': False,
         'type': 'both',
+        'case_default': True,
     }
 
 class crm_case_section(osv.osv):
     """ Model for sales teams. """
     _name = "crm.case.section"
     _inherits = {'mail.alias': 'alias_id'}
+    _inherit = "mail.thread"
     _description = "Sales Teams"
     _order = "complete_name"
 
@@ -111,7 +115,6 @@ class crm_case_section(osv.osv):
         '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."),
-        'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
         'change_responsible': fields.boolean('Reassign Escalated', help="When escalating to this team override the salesman with the team leader."),
         'user_id': fields.many2one('res.users', 'Team Leader'),
         'member_ids':fields.many2many('res.users', 'sale_member_rel', 'section_id', 'member_id', 'Team Members'),
@@ -122,18 +125,17 @@ class crm_case_section(osv.osv):
         'note': fields.text('Description'),
         'working_hours': fields.float('Working Hours', digits=(16,2 )),
         'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True, 
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
                                     help="The email address associated with this team. New emails received will automatically "
                                          "create new leads assigned to the team."),
     }
-    
+
     def _get_stage_common(self, cr, uid, context):
         ids = self.pool.get('crm.case.stage').search(cr, uid, [('case_default','=',1)], context=context)
         return ids
 
     _defaults = {
         'active': 1,
-        'allow_unlink': 1,
         'stage_ids': _get_stage_common,
         'alias_domain': False, # always hide alias during creation
     }
@@ -161,12 +163,12 @@ class crm_case_section(osv.osv):
                 name = record['parent_id'][1] + ' / ' + name
             res.append((record['id'], name))
         return res
-    
+
     def create(self, cr, uid, vals, context=None):
         mail_alias = self.pool.get('mail.alias')
         if not vals.get('alias_id'):
             vals.pop('alias_name', None) # prevent errors during copy()
-            alias_id = mail_alias.create_unique_alias(cr, uid, 
+            alias_id = mail_alias.create_unique_alias(cr, uid,
                     {'alias_name': vals['name']},
                     model_name="crm.lead",
                     context=context)
@@ -174,7 +176,7 @@ class crm_case_section(osv.osv):
         res = super(crm_case_section, self).create(cr, uid, vals, context)
         mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'section_id': res, 'type':'lead'}}, context)
         return res
-        
+
     def unlink(self, cr, uid, ids, context=None):
         # Cascade-delete mail aliases as well, as they should not exist without the sales team.
         mail_alias = self.pool.get('mail.alias')
@@ -213,7 +215,6 @@ class crm_case_resource_type(osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
 
-
 def _links_get(self, cr, uid, context=None):
     """Gets links value for reference field"""
     obj = self.pool.get('res.request.link')
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index 3e3bdc90d08..4a8ee98fbae 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -41,34 +41,15 @@ class base_action_rule(osv.osv):
         'regex_history' : fields.char('Regular Expression on Case History', size=128),
         'act_section_id': fields.many2one('crm.case.section', 'Set Team to'),
         'act_categ_id': fields.many2one('crm.case.categ', 'Set Category to'),
-        'act_mail_to_partner': fields.boolean('Mail to Partner',
-                                              help="Check this if you want the rule to send an email to the partner."),
     }
 
-    def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context=None):
-        mail_message = self.pool.get('mail.message')
-        body = self.format_mail(obj, body)
-        if not emailfrom:
-            if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.email:
-                emailfrom = obj.user_id.email
-
-        name = '[%d] %s' % (obj.id, tools.ustr(obj.name))
-        emailfrom = tools.ustr(emailfrom)
-        if hasattr(obj, 'section_id') and obj.section_id and obj.section_id.alias_id:
-            reply_to = obj.section_id.alias_id.name_get()[0][1]
-        else:
-            reply_to = emailfrom
-        if not emailfrom:
-            raise osv.except_osv(_('Error!'), _("There is no email for your company address."))
-        return mail_message.schedule_with_attach(cr, uid, emailfrom, emails, name, body, model=obj._name, reply_to=reply_to, res_id=obj.id)
-
     def do_check(self, cr, uid, action, obj, context=None):
         ok = super(base_action_rule, self).do_check(cr, uid, action, obj, context=context)
 
         if hasattr(obj, 'section_id'):
             ok = ok and (not action.trg_section_id or action.trg_section_id.id == obj.section_id.id)
-        if hasattr(obj, 'categ_id'):
-            ok = ok and (not action.trg_categ_id or action.trg_categ_id.id == obj.categ_id.id)
+        if hasattr(obj, 'categ_ids'):
+            ok = ok and (not action.trg_categ_id or action.trg_categ_id.id in [x.id for x in obj.categ_ids])
 
         #Cheking for history
         regex = action.regex_history
@@ -90,36 +71,18 @@ class base_action_rule(osv.osv):
             ok = ok and res_count
         return ok
 
-    def do_action(self, cr, uid, action, model_obj, obj, context=None):
+    def do_action(self, cr, uid, action, obj, context=None):
+        res = super(base_action_rule, self).do_action(cr, uid, action, obj, context=context)
+        model_obj = self.pool.get(action.model_id.model)
         write = {}
         if hasattr(action, 'act_section_id') and action.act_section_id:
-            obj.section_id = action.act_section_id
             write['section_id'] = action.act_section_id.id
 
-        if hasattr(obj, 'email_cc') and action.act_email_cc:
-            if '@' in (obj.email_cc or ''):
-                emails = obj.email_cc.split(",")
-                if  obj.act_email_cc not in emails:# and '<'+str(action.act_email_cc)+">" not in emails:
-                    write['email_cc'] = obj.email_cc + ',' + obj.act_email_cc
-            else:
-                write['email_cc'] = obj.act_email_cc
-
-        # Put state change by rule in communication history
-        if hasattr(obj, 'state') and hasattr(obj, 'message_append') and action.act_state:
-            model_obj.message_append(cr, uid, [obj], _(action.act_state))
+        if hasattr(action, 'act_categ_id') and action.act_categ_id:
+            write['categ_ids'] = [(4, action.act_categ_id.id)]
 
         model_obj.write(cr, uid, [obj.id], write, context)
-        super(base_action_rule, self).do_action(cr, uid, action, model_obj, obj, context=context)
-        emails = []
-
-        if hasattr(obj, 'email_from') and action.act_mail_to_partner:
-            emails.append(obj.email_from)
-        emails = filter(None, emails)
-        if len(emails) and action.act_mail_body:
-            emails = list(set(emails))
-            self.email_send(cr, uid, obj, emails, action.act_mail_body)
-        return True
-
+        return res
 
     def state_get(self, cr, uid, context=None):
         """Gets available states for crm"""
diff --git a/addons/crm/crm_action_rule_demo.xml b/addons/crm/crm_action_rule_demo.xml
new file mode 100644
index 00000000000..85cb8de1ac9
--- /dev/null
+++ b/addons/crm/crm_action_rule_demo.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+        <!-- email server actions -->
+        <record id="action_email_reminder_lead" model="ir.actions.server">
+            <field name="name">Reminder to User</field>
+            <field name="model_id" ref="model_crm_lead"/>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="state">email</field>
+            <field name="email">object.user_id.email</field>
+            <field name="subject">Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' +object.partner_id.name or '']]</field>
+            <field name="message">Hello [[object.user_id.name]], 
+can you check following lead, it's not open since 5 days ?
+
+Lead: [[object.id ]]
+Description:
+
+    [[object.description]]
+
+Thanks,
+            </field>
+        </record>
+
+        <record id="action_email_reminder_customer_lead" model="ir.actions.server">
+            <field name="name">Reminder to Customer</field>
+            <field name="model_id" ref="model_crm_lead"/>
+            <field name="condition">True</field>
+            <field name="type">ir.actions.server</field>
+            <field name="state">email</field>
+            <field name="email">object.email_from</field>
+            <field name="subject">Reminder on Lead: [[object.id ]]</field>
+            <field name="message">Hello [[object.partner_id and object.partner_id.name or '']], 
+your following lead is not open since 5 days.
+
+Lead: [[object.id ]]
+Description:
+
+    [[object.description]]
+
+Thanks,
+            </field>
+        </record>
+
+        <record id="filter_draft_lead" model="ir.filters">
+            <field name="name">Filter on leads which are draft.</field>
+            <field name="model_id">crm.lead</field>
+            <field name="domain">[('state','=','draft')]</field>
+        </record>
+
+        <!-- automated actions -->
+        <record id="rule_set_reminder_lead" model="base.action.rule">
+            <field name="name">Set Auto Reminder on leads which are not open since 5 days.</field>
+            <field name="model_id" ref="model_crm_lead"/>
+            <field name="sequence">1</field>
+            <field name="filter_id" ref="filter_draft_lead"/>
+            <field name="trg_date_type">create</field>
+            <field name="trg_date_range">5</field>
+            <field name="trg_date_range_type">day</field>
+            <field name="server_action_ids" eval="[(6,0,[ref('action_email_reminder_customer_lead'), ref('action_email_reminder_lead')])]"/>
+        </record>
+
+        <record id="filter_usa_lead" model="ir.filters">
+            <field name="name">Filter on leads which come from USA.</field>
+            <field name="model_id">crm.lead</field>
+            <field name="domain">[('country_id','=','United States')]</field>
+        </record>
+
+        <record id="rule_set_followers_lead" model="base.action.rule">
+            <field name="name">Set Auto Followers on leads which are urgent and come from USA.</field>
+            <field name="model_id" ref="model_crm_lead"/>
+            <field name="sequence">2</field>
+            <field name="regex_name">urgent.*</field>
+            <field name="filter_id" ref="filter_usa_lead"/>
+            <field name="act_followers" eval="[(6,0,[ref('base.res_partner_4'), ref('base.res_partner_5'), ref('base.res_partner_6')])]"/>
+            <field name="act_user_id" ref="base.user_root"/>
+            <field name="act_section_id" ref="section_sales_department"/>
+            <field name="trg_date_type">create</field>
+            <field name="trg_date_range">0</field>
+            <field name="trg_date_range_type">minutes</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/crm/crm_action_rule_view.xml b/addons/crm/crm_action_rule_view.xml
index f2a5f57702d..e21b74de382 100644
--- a/addons/crm/crm_action_rule_view.xml
+++ b/addons/crm/crm_action_rule_view.xml
@@ -7,53 +7,21 @@
             <field name="model">base.action.rule</field>
             <field name="inherit_id" ref="base_action_rule.view_base_action_rule_form"/>
             <field name="arch" type="xml">
-                <group name="partner" position="after">
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Condition on Communication History"/>
+                <xpath expr="//group[@name='partner']" position="after">
+                    <group name="case" string="Conditions on Case Fields">
+                        <field name="trg_section_id" widget="selection"/>
+                        <field name="trg_categ_id"/>
+                    </group>
+                    <group name="communication" string="Conditions on Communication History">
                         <field name="regex_history"/>
                         <field name="trg_max_history"/>
                     </group>
-                </group>
-            </field>
-       </record>
-
-       <record id="view_base_action_rule_line_form2" model="ir.ui.view">
-            <field name="name">base.action.rule.form2.inherit</field>
-            <field name="model">base.action.rule</field>
-            <field name="inherit_id" ref="base_action_rule.view_base_action_rule_form"/>
-            <field name="arch" type="xml">
-                <group name="partner" position="after">
-                    <group col="2" colspan="2">
-                        <separator colspan="4" string="Condition Case Fields"/>
-                        <field name="trg_section_id"  widget="selection"/>
-                        <field name="trg_categ_id"/>
-                    </group>
-                </group>
-            </field>
-       </record>
-
-       <record id="view_base_action_rule_line_form3" model="ir.ui.view">
-            <field name="name">base.action.rule.form3.inherit</field>
-            <field name="model">base.action.rule</field>
-            <field name="inherit_id" ref="base_action_rule.view_base_action_rule_form"/>
-            <field name="arch" type="xml">
-                <field name="act_user_id" position="after">
+                </xpath>
+                <xpath expr="//field[@name='act_user_id']" position="after">
                     <field name="act_section_id"/>
                     <field name="act_categ_id"/>
-                </field>
+                </xpath>
             </field>
        </record>
-       
-       <record id="view_base_action_rule_line_form4" model="ir.ui.view">
-            <field name="name">base.action.rule.form4.inherit</field>
-            <field name="model">base.action.rule</field>
-            <field name="inherit_id" ref="base_action_rule.view_base_action_rule_form"/>
-            <field name="arch" type="xml">
-                <field name="act_mail_to_user" position="after">
-                    <field name="act_mail_to_partner"/>
-                </field>
-            </field>
-       </record>
-
     </data>
 </openerp>
diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index c5671385e56..f2bf56e34ac 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -8,10 +8,9 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('base.menu_base_partner')}"/>
         </record>
-        <record id="todo_open_crm_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_crm_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
         </record>
 
         <record model="crm.case.channel" id="crm_case_channel_website">
@@ -55,21 +54,21 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module CRM has been installed</value>
-            <value>From the top menu Sales, you can: trace leads and opportunities, get accurate forecast on your sales pipeline, plan meetings and phonecalls, get realtime statistics and efficiently organize the communication with your prospects.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">CRM application installed!</field>
+            <field name="body"><![CDATA[<p>From the top Sales menu you can track leads and opportunities, get accurate forecast on your sales pipeline, plan meetings and phonecalls, get realtime statistics and efficiently organize the communication with your prospects.</p>
+<p>To manage quotations and sale orders, install the "Sales Management" application.</p>]]></field>
+        </record>
 
-To manage quotations and sale orders, install the module "Sales Management".</value>
-        </function>
-        
         <record model="mail.alias" id="default_sales_alias">
             <field name="alias_name">sales</field>
             <field name="alias_model_id" ref="model_crm_lead"/>
             <field name="alias_user_id" ref="base.user_root"/>
             <field name="alias_defaults">{'type':'lead'}</field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index 551e4e93fb8..203193dc3bc 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -1,46 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
+
         <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/> 
+            <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/>
         </record>
 
-    <record id="ir_ui_view_sc_calendar_demo" model="ir.ui.view_sc">
-        <field name="name">Meetings</field>
-        <field name="resource">ir.ui.menu</field>
-        <field name="user_id" ref="base.user_demo"/>
-        <field name="res_id" ref="base_calendar.menu_crm_meeting"/>
-    </record>
-
-    <record model="crm.case.section" id="crm_case_section_1">
+        <record model="crm.case.section" id="crm_case_section_1">
             <field name="name">Sales Marketing Department</field>
             <field name="code">SMD</field>
-            <field name="parent_id" ref="crm.section_sales_department"></field>
-    </record>
+            <field name="parent_id" ref="crm.section_sales_department"/>
+        </record>
 
-    <record model="crm.case.section" id="crm_case_section_2">
+        <record model="crm.case.section" id="crm_case_section_2">
             <field name="name">Support Department</field>
             <field name="code">SPD</field>
-            <field name="parent_id" ref="crm.section_sales_department"></field>
-    </record>
+            <field name="parent_id" ref="crm.section_sales_department"/>
+        </record>
 
-    <record model="crm.case.section" id="crm_case_section_3">
+        <record model="crm.case.section" id="crm_case_section_3">
             <field name="name">Direct Marketing</field>
             <field name="code">DM</field>
-            <field name="parent_id" ref="crm.section_sales_department"></field>
-    </record>
+            <field name="parent_id" ref="crm.section_sales_department"/>
+        </record>
 
-    <record model="crm.case.section" id="crm_case_section_4">
+        <record model="crm.case.section" id="crm_case_section_4">
             <field name="name">Online Support</field>
             <field name="code">OS</field>
-            <field name="parent_id" ref="crm.crm_case_section_2"></field>
-    </record>
+            <field name="parent_id" ref="crm.crm_case_section_2"/>
+        </record>
 
-    <record model="crm.segmentation" id="crm_segmentation0">
-        <field name="name">OpenERP partners</field>
-        <field name="exclusif">True</field>
-        <field name="categ_id" ref="base.res_partner_category_2"/>
-    </record>
+        <record model="crm.segmentation" id="crm_segmentation0">
+            <field name="name">OpenERP partners</field>
+            <field name="exclusif">True</field>
+            <field name="categ_id" ref="base.res_partner_category_2"/>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 146417a7abb..877cc25404f 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -19,15 +19,16 @@
 #
 ##############################################################################
 
-import binascii
 from base_status.base_stage import base_stage
 import crm
 from datetime import datetime
-from mail.mail_message import to_email
 from osv import fields, osv
 import time
 import tools
 from tools.translate import _
+from tools import html2plaintext
+
+from base.res.res_partner import format_address
 
 CRM_LEAD_PENDING_STATES = (
     crm.AVAILABLE_STATES[2][0], # Cancelled
@@ -35,13 +36,12 @@ CRM_LEAD_PENDING_STATES = (
     crm.AVAILABLE_STATES[4][0], # Pending
 )
 
-class crm_lead(base_stage, osv.osv):
+class crm_lead(base_stage, format_address, osv.osv):
     """ CRM Lead Case """
     _name = "crm.lead"
     _description = "Lead/Opportunity"
     _order = "priority,date_action,id desc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
-    _mail_compose_message = True
+    _inherit = ['mail.thread','ir.needaction_mixin']
 
     def _get_default_section_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
@@ -50,7 +50,7 @@ class crm_lead(base_stage, osv.osv):
     def _get_default_stage_id(self, cr, uid, context=None):
         """ Gives default stage_id """
         section_id = self._get_default_section_id(cr, uid, context=context)
-        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft'), ('type', '=', 'both')], context=context)
+        return self.stage_find(cr, uid, [], section_id, [('state', '=', 'draft')], context=context)
 
     def _resolve_section_id_from_context(self, cr, uid, context=None):
         """ Returns ID of section based on the value of 'section_id'
@@ -90,8 +90,8 @@ class crm_lead(base_stage, osv.osv):
         search_domain = []
         section_id = self._resolve_section_id_from_context(cr, uid, context=context)
         if section_id:
-            search_domain += ['|', '&', ('section_ids', '=', section_id), ('fold', '=', False)]
-        search_domain += ['|', ('id', 'in', ids), '&', ('case_default', '=', True), ('fold', '=', False)]
+            search_domain += ['|', ('section_ids', '=', section_id)]
+        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
         # retrieve type from the context (if set: choose 'type' or 'both')
         type = self._resolve_type_from_context(cr, uid, context=context)
         if type:
@@ -101,7 +101,18 @@ class crm_lead(base_stage, osv.osv):
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
         result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
-        return result
+
+        fold = {}
+        for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):
+            fold[stage.id] = stage.fold or False
+
+        return result, fold
+
+    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        res = super(crm_lead,self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+        if view_type == 'form':
+            res['arch'] = self.fields_view_get_address(cr, user, res['arch'], context=context)
+        return res
 
     _group_by_full = {
         'stage_id': _read_group_stage_ids
@@ -175,19 +186,9 @@ class crm_lead(base_stage, osv.osv):
         else:
             return [('id', '=', '0')]
 
-    def _get_email_subject(self, cr, uid, ids, fields, args, context=None):
-        res = {}
-        for obj in self.browse(cr, uid, ids, context=context):
-            res[obj.id] = ''
-            for msg in obj.message_ids:
-                if msg.email_from:
-                    res[obj.id] = msg.subject
-                    break
-        return res
-
     _columns = {
         'partner_id': fields.many2one('res.partner', 'Partner', ondelete='set null',
-            select=True, help="Optional linked partner, usually after conversion of the lead"),
+            select=True, help="Linked partner (optional). Usually created when converting the lead."),
 
         'id': fields.integer('ID', readonly=True),
         'name': fields.char('Subject', size=64, required=True, select=1),
@@ -213,7 +214,7 @@ class crm_lead(base_stage, osv.osv):
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'date_closed': fields.datetime('Closed', readonly=True),
         'stage_id': fields.many2one('crm.case.stage', 'Stage',
-                        domain="['&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"),
+                        domain="['&', ('fold', '=', False), '&', '|', ('section_ids', '=', section_id), ('case_default', '=', True), '|', ('type', '=', type), ('type', '=', 'both')]"),
         'user_id': fields.many2one('res.users', 'Salesperson'),
         'referred': fields.char('Referred By', size=64),
         'date_open': fields.datetime('Opened', readonly=True),
@@ -222,13 +223,8 @@ class crm_lead(base_stage, osv.osv):
         'day_close': fields.function(_compute_day, string='Days to Close', \
                                 multi='day_close', type="float", store=True),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=crm.AVAILABLE_STATES, string="State", readonly=True,
-                help='The state is set to \'Draft\', when a case is created.\
-                      If the case is in progress the state is set to \'Open\'.\
-                      When the case is over, the state is set to \'Done\'.\
-                      If the case needs to be reviewed then the state is \
-                      set to \'Pending\'.'),
-        'subjects': fields.function(_get_email_subject, fnct_search=_history_search, string='Subject of Email', type='char', size=64),
+                selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
+                help='The Status is set to \'Draft\', when a case is created. If the case is in progress the Status is set to \'Open\'. When the case is over, the Status is set to \'Done\'. If the case needs to be reviewed then the Status is  set to \'Pending\'.'),
 
         # Only used for type opportunity
         'probability': fields.float('Success Rate (%)',group_operator="avg"),
@@ -236,7 +232,7 @@ class crm_lead(base_stage, osv.osv):
         'ref': fields.reference('Reference', selection=crm._links_get, size=128),
         'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
         'phone': fields.char("Phone", size=64),
-        'date_deadline': fields.date('Expected Closing'),
+        'date_deadline': fields.date('Expected Closing', help="Estimate of the date on which the opportunity will be won."),
         'date_action': fields.date('Next Action Date', select=True),
         'title_action': fields.char('Next Action', size=64),
         'color': fields.integer('Color Index'),
@@ -251,7 +247,7 @@ class crm_lead(base_stage, osv.osv):
         'street2': fields.char('Street2', size=128),
         'zip': fields.char('Zip', change_default=True, size=24),
         'city': fields.char('City', size=128),
-        'state_id': fields.many2one("res.country.state", 'State', domain="[('country_id','=',country_id)]"),
+        'state_id': fields.many2one("res.country.state", 'State'),
         'country_id': fields.many2one('res.country', 'Country'),
         'phone': fields.char('Phone', size=64),
         'fax': fields.char('Fax', size=64),
@@ -278,6 +274,10 @@ class crm_lead(base_stage, osv.osv):
 
     def create(self, cr, uid, vals, context=None):
         obj_id = super(crm_lead, self).create(cr, uid, vals, context)
+        section_id = self.browse(cr, uid, obj_id, context=context).section_id
+        if section_id:
+            followers = [follow.id for follow in section_id.message_follower_ids]
+            self.message_subscribe(cr, uid, [obj_id], followers, context=context)
         self.create_send_note(cr, uid, [obj_id], context=context)
         return obj_id
 
@@ -291,19 +291,23 @@ class crm_lead(base_stage, osv.osv):
 
     def on_change_partner(self, cr, uid, ids, partner_id, context=None):
         result = {}
+        values = {}
         if partner_id:
             partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
             values = {
-                'partner_name' : partner.name, 
+                'partner_name' : partner.name,
                 'street' : partner.street,
                 'street2' : partner.street2,
                 'city' : partner.city,
                 'state_id' : partner.state_id and partner.state_id.id or False,
                 'country_id' : partner.country_id and partner.country_id.id or False,
+                'email_from' : partner.email,
+                'phone' : partner.phone,
+                'mobile' : partner.mobile,
+                'fax' : partner.fax,
             }
         return {'value' : values}
 
-
     def _check(self, cr, uid, ids=False, context=None):
         """ Override of the base.stage method.
             Function called by the scheduler to process cases for date actions
@@ -320,7 +324,7 @@ class crm_lead(base_stage, osv.osv):
         cases = self.browse(cr, uid, ids2, context=context)
         return self._action(cr, uid, cases, False, context=context)
 
-    def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
+    def stage_find(self, cr, uid, cases, section_id, domain=None, order='sequence', context=None):
         """ Override of the base.stage method
             Parameter of the stage search taken from the lead:
             - type: stage type must be the same or 'both'
@@ -333,6 +337,9 @@ class crm_lead(base_stage, osv.osv):
         # collect all section_ids
         section_ids = []
         types = ['both']
+        if not cases :
+            type = context.get('default_type')
+            types += [type]
         if section_id:
             section_ids.append(section_id)
         for lead in cases:
@@ -448,7 +455,7 @@ class crm_lead(base_stage, osv.osv):
         oldest_id = opportunity_ids[0]
         return self.browse(cr, uid, oldest_id, context=context)
 
-    def _mail_body_text(self, cr, uid, lead, fields, title=False, context=None):
+    def _mail_body(self, cr, uid, lead, fields, title=False, context=None):
         body = []
         if title:
             body.append("%s\n" % (title))
@@ -485,11 +492,12 @@ class crm_lead(base_stage, osv.osv):
         for opportunity in opportunities:
             subject.append(opportunity.name)
             title = "%s : %s" % (merge_message, opportunity.name)
-            details.append(self._mail_body_text(cr, uid, opportunity, fields, title=title, context=context))
+            details.append(self._mail_body(cr, uid, opportunity, fields, title=title, context=context))
 
-        subject = subject[0] + ", ".join(subject[1:])
+        # Chatter message's subject
+        subject = subject[0] + ": " + ", ".join(subject[1:])
         details = "\n\n".join(details)
-        return self.message_append_note(cr, uid, [opportunity_id], subject=subject, body=details)
+        return self.message_post(cr, uid, [opportunity_id], body=details, subject=subject, context=context)
 
     def _merge_opportunity_history(self, cr, uid, opportunity_id, opportunities, context=None):
         message = self.pool.get('mail.message')
@@ -545,7 +553,7 @@ class crm_lead(base_stage, osv.osv):
         oldest = self._merge_find_oldest(cr, uid, ids, context=context)
         if ctx_opportunities :
             first_opportunity = ctx_opportunities[0]
-            tail_opportunities = opportunities_list
+            tail_opportunities = opportunities_list + ctx_opportunities[1:]
         else:
             first_opportunity = opportunities_list[0]
             tail_opportunities = opportunities_list[1:]
@@ -556,19 +564,18 @@ class crm_lead(base_stage, osv.osv):
 
         data = self._merge_data(cr, uid, ids, oldest, fields, context=context)
 
-        # merge data into first opportunity
-        self.write(cr, uid, [first_opportunity.id], data, context=context)
-
-        #copy message and attachements into the first opportunity
+        # Merge messages and attachements into the first opportunity
         self._merge_opportunity_history(cr, uid, first_opportunity.id, tail_opportunities, context=context)
         self._merge_opportunity_attachments(cr, uid, first_opportunity.id, tail_opportunities, context=context)
 
-        #Notification about loss of information
+        # Merge notifications about loss of information
         self._merge_notification(cr, uid, first_opportunity, opportunities, context=context)
-        #delete tail opportunities
+        # Write merged data into first opportunity
+        self.write(cr, uid, [first_opportunity.id], data, context=context)
+        # Delete tail opportunities
         self.unlink(cr, uid, [x.id for x in tail_opportunities], context=context)
 
-        #open first opportunity
+        # Open first opportunity
         self.case_open(cr, uid, [first_opportunity.id])
         return first_opportunity.id
 
@@ -577,13 +584,16 @@ class crm_lead(base_stage, osv.osv):
         contact_id = False
         if customer:
             contact_id = self.pool.get('res.partner').address_get(cr, uid, [customer.id])['default']
+
         if not section_id:
             section_id = lead.section_id and lead.section_id.id or False
+
         if section_id:
             stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1), ('section_ids','=', section_id)])
         else:
             stage_ids = crm_stage.search(cr, uid, [('sequence','>=',1)])
         stage_id = stage_ids and stage_ids[0] or False
+
         return {
                 'planned_revenue': lead.planned_revenue,
                 'probability': lead.probability,
@@ -594,30 +604,25 @@ class crm_lead(base_stage, osv.osv):
                 'stage_id': stage_id or False,
                 'date_action': time.strftime('%Y-%m-%d %H:%M:%S'),
                 'date_open': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'email_from': customer and customer.email or lead.email_from,
+                'phone': customer and customer.phone or lead.phone,
         }
 
     def convert_opportunity(self, cr, uid, ids, partner_id, user_ids=False, section_id=False, context=None):
-        partner = self.pool.get('res.partner')
-        mail_message = self.pool.get('mail.message')
         customer = False
         if partner_id:
+            partner = self.pool.get('res.partner')
             customer = partner.browse(cr, uid, partner_id, context=context)
         for lead in self.browse(cr, uid, ids, context=context):
             if lead.state in ('done', 'cancel'):
                 continue
-            if user_ids or section_id:
-                self.allocate_salesman(cr, uid, [lead.id], user_ids, section_id, context=context)
-
             vals = self._convert_opportunity_data(cr, uid, lead, customer, section_id, context=context)
             self.write(cr, uid, [lead.id], vals, context=context)
-
             self.convert_opportunity_send_note(cr, uid, lead, context=context)
-            #TOCHECK: why need to change partner details in all messages of lead ?
-            if lead.partner_id:
-                msg_ids = [ x.id for x in lead.message_ids]
-                mail_message.write(cr, uid, msg_ids, {
-                        'partner_id': lead.partner_id.id
-                    }, context=context)
+
+        if user_ids or section_id:
+            self.allocate_salesman(cr, uid, ids, user_ids, section_id, context=context)
+
         return True
 
     def _lead_create_contact(self, cr, uid, lead, name, is_company, parent_id=False, context=None):
@@ -629,7 +634,7 @@ class crm_lead(base_stage, osv.osv):
             'parent_id': parent_id,
             'phone': lead.phone,
             'mobile': lead.mobile,
-            'email': lead.email_from and to_email(lead.email_from)[0],
+            'email': lead.email_from and tools.email_split(lead.email_from)[0],
             'fax': lead.fax,
             'title': lead.title and lead.title.id or False,
             'function': lead.function,
@@ -649,7 +654,7 @@ class crm_lead(base_stage, osv.osv):
         partner_id =  False
         if lead.partner_name and lead.contact_name:
             partner_id = self._lead_create_contact(cr, uid, lead, lead.partner_name, True, context=context)
-            self._lead_create_contact(cr, uid, lead, lead.contact_name, False, partner_id, context=context)
+            partner_id = self._lead_create_contact(cr, uid, lead, lead.contact_name, False, partner_id, context=context)
         elif lead.partner_name and not lead.contact_name:
             partner_id = self._lead_create_contact(cr, uid, lead, lead.partner_name, True, context=context)
         elif not lead.partner_name and lead.contact_name:
@@ -670,7 +675,7 @@ class crm_lead(base_stage, osv.osv):
 
     def convert_partner(self, cr, uid, ids, action='create', partner_id=False, context=None):
         """
-        This function convert partner based on action.
+        Convert partner based on action.
         if action is 'create', create new partner with contact and assign lead to new partner_id.
         otherwise assign lead to specified partner_id
         """
@@ -685,24 +690,6 @@ class crm_lead(base_stage, osv.osv):
             partner_ids[lead.id] = partner_id
         return partner_ids
 
-    def _send_mail_to_salesman(self, cr, uid, lead, context=None):
-        """
-        Send mail to salesman with updated Lead details.
-        @ lead: browse record of 'crm.lead' object.
-        """
-        #TOFIX: mail template should be used here instead of fix subject, body text.
-        message = self.pool.get('mail.message')
-        email_to = lead.user_id and lead.user_id.email
-        if not email_to:
-            return False
-
-        email_from = lead.section_id and lead.section_id.user_id and lead.section_id.user_id.email or email_to
-        partner = lead.partner_id and lead.partner_id.name or lead.partner_name
-        subject = "lead %s converted into opportunity" % lead.name
-        body = "Info \n Id : %s \n Subject: %s \n Partner: %s \n Description : %s " % (lead.id, lead.name, lead.partner_id.name, lead.description)
-        return message.schedule_with_attach(cr, uid, email_from, [email_to], subject, body)
-
-
     def allocate_salesman(self, cr, uid, ids, user_ids, team_id=False, context=None):
         index = 0
         for lead_id in ids:
@@ -787,25 +774,21 @@ class crm_lead(base_stage, osv.osv):
             'default_user_id': uid,
             'default_section_id': opportunity.section_id and opportunity.section_id.id or False,
             'default_email_from': opportunity.email_from,
-            'default_state': 'open',
             'default_name': opportunity.name,
         }
         return res
 
-    def unlink(self, cr, uid, ids, context=None):
-        for lead in self.browse(cr, uid, ids, context):
-            if (not lead.section_id.allow_unlink) and (lead.state != 'draft'):
-                raise osv.except_osv(_('Error!'),
-                    _("You cannot delete lead '%s' because it is not in 'Draft' state. " \
-                      "You can still cancel it, instead of deleting it.") % lead.name)
-        return super(crm_lead, self).unlink(cr, uid, ids, context)
-
     def write(self, cr, uid, ids, vals, context=None):
         if vals.get('stage_id') and not vals.get('probability'):
             # change probability of lead(s) if required by stage
             stage = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context)
             if stage.on_change:
                 vals['probability'] = stage.probability
+        if vals.get('section_id'):
+            section_id = self.pool.get('crm.case.section').browse(cr, uid, vals.get('section_id'), context=context)
+            if section_id:
+                vals.setdefault('message_follower_ids', [])
+                vals['message_follower_ids'] += [(4, follower.id) for follower in section_id.message_follower_ids]
         return super(crm_lead,self).write(cr, uid, ids, vals, context)
 
     # ----------------------------------------
@@ -818,16 +801,17 @@ class crm_lead(base_stage, osv.osv):
             This override updates the document according to the email.
         """
         if custom_values is None: custom_values = {}
+
+        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
         custom_values.update({
             'name':  msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': desc,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
         })
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
             custom_values['priority'] = msg.get('priority')
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from', False), context=context))
         return super(crm_lead, self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
@@ -840,18 +824,18 @@ class crm_lead(base_stage, osv.osv):
         if update_vals is None: update_vals = {}
 
         if msg.get('priority') in dict(crm.AVAILABLE_PRIORITIES):
-            vals['priority'] = msg.get('priority')
+            update_vals['priority'] = msg.get('priority')
         maps = {
             'cost':'planned_cost',
             'revenue': 'planned_revenue',
             'probability':'probability',
         }
-        for line in msg.get('body_text', '').split('\n'):
+        for line in msg.get('body', '').split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
                 key = maps.get(res.group(1).lower())
-                vals[key] = res.group(2).lower()
+                update_vals[key] = res.group(2).lower()
 
         return super(crm_lead, self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
 
@@ -859,15 +843,10 @@ class crm_lead(base_stage, osv.osv):
     # OpenChatter methods and notifications
     # ----------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(crm_lead, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('crm.case.stage').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
 
     def case_get_note_msg_prefix(self, cr, uid, lead, context=None):
         if isinstance(lead, (int, long)):
@@ -877,35 +856,39 @@ class crm_lead(base_stage, osv.osv):
     def create_send_note(self, cr, uid, ids, context=None):
         for id in ids:
             message = _("%s has been <b>created</b>.")% (self.case_get_note_msg_prefix(cr, uid, id, context=context))
-            self.message_append_note(cr, uid, [id], body=message, context=context)
+            self.message_post(cr, uid, [id], body=message, context=context)
         return True
 
     def case_mark_lost_send_note(self, cr, uid, ids, context=None):
         message = _("Opportunity has been <b>lost</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def case_mark_won_send_note(self, cr, uid, ids, context=None):
         message = _("Opportunity has been <b>won</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def schedule_phonecall_send_note(self, cr, uid, ids, phonecall_id, action, context=None):
         phonecall = self.pool.get('crm.phonecall').browse(cr, uid, [phonecall_id], context=context)[0]
         if action == 'log': prefix = 'Logged'
         else: prefix = 'Scheduled'
         message = _("<b>%s a call</b> for the <em>%s</em>.") % (prefix, phonecall.date)
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def _lead_set_partner_send_note(self, cr, uid, ids, context=None):
         for lead in self.browse(cr, uid, ids, context=context):
             message = _("%s <b>partner</b> is now set to <em>%s</em>." % (self.case_get_note_msg_prefix(cr, uid, lead, context=context), lead.partner_id.name))
-            lead.message_append_note(body=message)
+            lead.message_post(body=message)
         return True
 
     def convert_opportunity_send_note(self, cr, uid, lead, context=None):
         message = _("Lead has been <b>converted to an opportunity</b>.")
-        lead.message_append_note(body=message)
+        lead.message_post(body=message)
         return True
 
-crm_lead()
+    def onchange_state(self, cr, uid, ids, state_id, context=None):
+        if state_id:
+            country_id=self.pool.get('res.country.state').browse(cr, uid, state_id, context).country_id.id
+            return {'value':{'country_id':country_id}}
+        return {}
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 04f91933f66..f734a839ff4 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -55,7 +55,7 @@
         <record model="crm.case.stage" id="stage_lead7">
             <field name="name">Dead</field>
             <field eval="1" name="case_default"/>
-            <field eval="True" name="fold"/>
+            <field eval="False" name="fold"/>
             <field name="state">cancel</field>
             <field eval="'0'" name="probability"/>
             <field eval="'16'" name="sequence"/>
diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml
index ed51c525335..7849125282e 100644
--- a/addons/crm/crm_lead_demo.xml
+++ b/addons/crm/crm_lead_demo.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
     <data noupdate="1">
-        <!-- 
-            Demo Leads
-            -->
 
+        <!--  Demo Leads -->
         <record id="crm_case_1" model="crm.lead">
             <field name="type">lead</field>
             <field name="name">Plan to Attend a Training</field>
@@ -23,12 +21,12 @@
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">1</field>
             <field name="section_id" ref="crm_case_section_4"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field name="description">Hello,
-I am Jason from Le Club SARL,
-I am intertested to attend Training organized in your company,
-Can you send details,</field>
+I am Jason from Le Club SARL.
+I am intertested to attend a training organized in your company.
+Can you send me the details ?</field>
             <field eval="1" name="active"/>
         </record>
 
@@ -47,9 +45,8 @@ Can you send details,</field>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">4</field>
             <field name="section_id" ref="crm_case_section_3"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
-            <field name="description">Want to know features and benifits to use the new software.</field>
             <field eval="1" name="active"/>
         </record>
 
@@ -109,9 +106,10 @@ Can you send details,</field>
             <field name="channel_id" ref="crm_case_channel_website"/>
             <field name="priority">3</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
-            <field name="description">Hi, Can you send a quotation for 20 Computers with speakers? 
+            <field name="description">Hi,
+Can you send me a quotation for 20 computers with speakers?
 Regards,
 Carrie Helle,
 Purchase Manager
@@ -136,7 +134,7 @@ Contact: +1 813 494 5005</field>
             <field name="channel_id" ref=""/>
             <field name="priority">3</field>
             <field name="section_id" ref="crm_case_section_4"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
         </record>
@@ -195,7 +193,7 @@ Contact: +1 813 494 5005</field>
             <field name="channel_id" ref="crm_case_channel_phone"/>
             <field name="priority">2</field>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="stage_lead1"/>
             <field eval="1" name="active"/>
         </record>
@@ -216,8 +214,9 @@ Contact: +1 813 494 5005</field>
             <field name="section_id" ref="crm_case_section_3"/>
             <field name="user_id" ref=""/>
             <field name="stage_id" ref="stage_lead1"/>
-            <field name="description">hi,
-I want to know specification and cost of laptops of your company.
+            <field name="description">Hi,
+I would like to know more about specification and cost of laptops of your company.
+
 Thanks,
 Andrew</field>
             <field eval="1" name="active"/>
@@ -261,25 +260,20 @@ Andrew</field>
             <field eval="1" name="active"/>
         </record>
 
-
-        <!--        Call Function to Cancel the leads (set as Dead) -->
+        <!-- Call Function to Cancel the leads (set as Dead) -->
         <function model="crm.lead" name="case_cancel"
             eval="[ ref('crm_case_12'), ref('crm_case_7'),
                     ref('crm_case_3'), ref('crm_case_8')],
                   {'install_mode': True}"
         />
-        <!--        Call Function to set the leads as Unread -->
+
+        <!-- Call Function to set the leads as Unread -->
         <function model="crm.lead" name="message_mark_as_unread"
             eval="[ ref('crm_case_1'), ref('crm_case_2'),
                     ref('crm_case_5'), ref('crm_case_11')], {}"
         />
 
-
-        <!-- 
-            Demo Opportunities
-            -->
-
-
+        <!-- Demo Opportunities -->
         <record id="crm_case_13" model="crm.lead">
             <field name="type">opportunity</field>
             <field name="name">Plan to buy 60 keyboards and mouses</field>
@@ -298,7 +292,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-12')" name="date_action"/>
             <field name="title_action">Meeting for pricing information.</field>
             <field name="section_id" ref="crm_case_section_3"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="1" name="active"/>
         </record>
@@ -343,7 +337,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-10')" name="date_action"/>
             <field name="title_action">Call to ask system requirement</field>
             <field name="section_id" ref="crm_case_section_3"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="1" name="active"/>
         </record>
@@ -412,7 +406,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-4')" name="date_action"/>
             <field name="title_action">Call to define real needs about training</field>
             <field name="section_id" ref="crm_case_section_2"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead3"/>
             <field eval="1" name="active"/>
         </record>
@@ -435,7 +429,7 @@ Andrew</field>
             <field eval="time.strftime('%Y-%m-5')" name="date_action"/>
             <field name="title_action">Ask for the good receprion of the proposition</field>
             <field name="section_id" ref="crm_case_section_1"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="1" name="active"/>
         </record>
@@ -467,7 +461,7 @@ Andrew</field>
             <field name="channel_id" ref="crm_case_channel_phone"/>
             <field name="priority">3</field>
             <field name="section_id" ref="crm_case_section_4"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead8"/>
             <field eval="1" name="active"/>
         </record>
@@ -485,7 +479,7 @@ Andrew</field>
             <field name="channel_id" ref="crm_case_channel_email"/>
             <field name="priority">3</field>
             <field name="section_id" ref="crm_case_section_4"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead8"/>
             <field eval="1" name="active"/>
         </record>
@@ -520,7 +514,7 @@ Andrew</field>
             <field name="priority">5</field>
             <field eval="time.strftime('%Y-%m-6')" name="date_deadline"/>
             <field name="section_id" ref="section_sales_department"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead6"/>
             <field eval="1" name="active"/>
         </record>
@@ -543,64 +537,78 @@ Andrew</field>
             <field name="priority">2</field>
             <field name="title_action">Conf call with technical service</field>
             <field name="section_id" ref="crm_case_section_2"/>
-            <field name="user_id" ref="base.user_admin"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="stage_id" ref="crm.stage_lead4"/>
             <field eval="1" name="active"/>
         </record>
 
         <!-- Some messages linked to the previous opportunity -->
         <record id="message_email0" model="mail.message">
-            <field name="subject">Kitchen design</field>
+            <field name="subject">Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Email0 inquiry]]></field>
+            <field name="body">&lt;![CDATA[Email0 inquiry]]&gt;&lt;div&gt;&lt;font size="2"&gt;Hello,&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font size="2"&gt;&lt;br&gt;&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font size="2"&gt;I am interested in your company's product and I plan to buy a new laptop having latest technologies and affordable price.&lt;/font&gt;&lt;/div&gt;&lt;div&gt;&lt;font size="2"&gt;Can you please send me product catalogue?&lt;/font&gt;&lt;/div&gt;</field>
             <field name="type">email</field>
-            <field name="state">sent</field>
-            <field name="user_id" ref="base.user_root"></field>
         </record>
         <record id="message_note0" model="mail.message">
-            <field name="subject">Reply</field>
+            <field name="subject">Re: Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Internal note0]]></field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"></field>
+            <field name="body">Dear Customer,
+Thanks for showing interest in our products.
+We have attached the catalogue,
+We would like to know your interests, so let us know when we can call you for more details.
+
+Regards</field>
+            <field name="parent_id" ref="message_email0"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
         <record id="message_note0_comment0" model="mail.message">
-            <field name="subject">Reply</field>
+            <field name="subject">Re: Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[comment on note0]]></field>
-            <field name="parent_id" ref="message_note0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"></field>
+            <field name="body">&lt;div&gt;Thanks for the information,&lt;/div&gt;&lt;div&gt;I will visit the store soon.&lt;/div&gt;</field>
+            <field name="parent_id" ref="message_note0"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
         <record id="message_note0_comment1" model="mail.message">
-            <field name="subject">Reply</field>
+            <field name="subject">Re: Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[comment1 on note0]]></field>
-            <field name="parent_id" ref="message_note0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"></field>
+            <field name="body">&lt;font color="#1f1f1f"&gt;Can you tell me if the store is open at 9:00 PM?&lt;/b&gt;&lt;/font&gt;</field>
+            <field name="parent_id" ref="message_note0"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
         <record id="message_email1" model="mail.message">
-            <field name="subject">Your inquiry</field>
+            <field name="subject">Re: Plan to buy a Laptop</field>
             <field name="model">crm.lead</field>
             <field name="res_id" ref="crm_case_15"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[hello, outgoing email]]></field>
+            <field name="body">Yes, its open till 10:00 PM, you are welcome!</field>
             <field name="type">email</field>
-            <field name="state">received</field>
-            <field name="user_id" ref="base.user_root"></field>
+            <field name="author_id" ref="base.partner_root"/>
+        </record>
+        <record id="message_email_12" model="mail.message">
+            <field name="subject">Inquiry</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_1"/>
+            <field name="body">Hello,
+I am Jason from Le Club SARL.
+I am intertested to attend a training organized in your company.
+Can you send me the details ?</field>
+            <field name="type">email</field>
+        </record>
+        <record id="message_email_13" model="mail.message">
+            <field name="subject">Need Details</field>
+            <field name="model">crm.lead</field>
+            <field name="res_id" ref="crm_case_2"/>
+            <field name="body">Want to know features and benifits to use the new software.</field>
+            <field name="type">comment</field>
         </record>
 
-
-        <!--        Call Function to set the opportunities as Unread -->
+        <!-- Call Function to set the opportunities as Unread -->
         <function model="crm.lead" name="message_mark_as_unread"
             eval="[ ref('crm_case_15'), ref('crm_case_16'),
                     ref('crm_case_23'), ref('crm_case_19')], {}"
diff --git a/addons/crm/crm_lead_menu.xml b/addons/crm/crm_lead_menu.xml
index 04758f4ffe0..208d92a6684 100644
--- a/addons/crm/crm_lead_menu.xml
+++ b/addons/crm/crm_lead_menu.xml
@@ -14,12 +14,13 @@
           <p class="oe_view_nocontent_create">
             Click to create an unqualified lead. 
           </p><p>
-            A lead is usually the first step in your sales cycle. It can be
-            a contact with a new prospect, a company you target, a contact form
-            filled in your website, etc.
+            Use leads if you need a qualification step before creating an
+            opportunity or a customer. It can be a business card you received,
+            a contact form filled in your website, or a file of unqualified
+            prospects you import, etc.
           </p><p>
             Once qualified, the lead can be converted into a business
-            opportunity and a new customer in your address book.
+            opportunity and/or a new customer in your address book.
           </p>
         </field>
     </record>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index f2c923844ec..465982ee3aa 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -9,14 +9,14 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_crm_lead"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_crm_lead_unread" model="ir.values">
             <field name="name">action_crm_lead_unread</field>
             <field name="action_id" ref="actions_server_crm_lead_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_unread'))" />
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_unread'))"/>
             <field name="key">action</field>
-            <field name="model_id" ref="model_crm_lead" />
+            <field name="model_id" ref="model_crm_lead"/>
             <field name="model">crm.lead</field>
             <field name="key2">client_action_multi</field>
         </record>
@@ -27,14 +27,14 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_crm_lead"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_crm_lead_read" model="ir.values">
             <field name="name">action_crm_lead_read</field>
             <field name="action_id" ref="actions_server_crm_lead_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_read'))" />
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_crm_lead_read'))"/>
             <field name="key">action</field>
-            <field name="model_id" ref="model_crm_lead" />
+            <field name="model_id" ref="model_crm_lead"/>
             <field name="model">crm.lead</field>
             <field name="key2">client_action_multi</field>
         </record>
@@ -132,8 +132,6 @@
                 <header>
                     <button name="%(crm.action_crm_lead2opportunity_partner)d" string="Convert to Opportunity" type="action"
                             states="draft,open,pending" help="Convert to Opportunity" class="oe_highlight"/>
-                    <button name="case_escalate" string="Escalate" type="object"
-                            states="draft,open,pending"/>
                     <button name="case_reset" string="Reset" type="object"
                             states="cancel"/>
                     <button name="case_cancel" string="Cancel" type="object"
@@ -145,7 +143,7 @@
                     <div class="oe_right oe_button_box" name="buttons">
                         <button type="action"
                             name="%(act_crm_opportunity_crm_phonecall_new)d"
-                            string="Phone Calls" />
+                            string="Phone Calls"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only" string="Lead Description"/>
@@ -155,27 +153,27 @@
                         <group>
                             <field name="partner_name" string="Company Name"/>
                             <field name="partner_id" string="Customer"
-                                on_change="on_change_partner(partner_id)" />
+                                on_change="on_change_partner(partner_id)" options='{"create_name_field": "name"}'/>
                             <label for="street" string="Address"/>
                             <div>
                                 <field name="street" placeholder="Street..."/>
                                 <field name="street2"/>
                                 <div class="address_format">
                                     <field name="city" placeholder="City" style="width: 40%%"/>
-                                    <field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
+                                    <field name="state_id" on_change="onchange_state(state_id)" options='{"no_open": True}' placeholder="State" style="width: 24%%"/>
                                     <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                 </div>
-                                <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
+                                <field name="country_id" placeholder="Country" options='{"no_open": True}'/>
                             </div>
                         </group>
                         <group>
-                            <label for="contact_name" />
+                            <label for="contact_name"/>
                             <div>
                                 <field name="contact_name" class="oe_inline"/>,
-                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline" options='{"no_open": true}'/>
+                                <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" class="oe_inline" options='{"no_open": True}'/>
                             </div>
                             <field name="email_from" widget="email"/>
-                            <field name="function" />
+                            <field name="function"/>
                             <field name="phone"/>
                             <field name="mobile"/>
                             <field name="fax"/>
@@ -188,7 +186,11 @@
                         </group>
                         <group>
                             <field name="user_id"/>
-                            <field name="section_id"/>
+                            <label for="section_id"/>
+                            <div>
+                                <field name="section_id"/>
+                                <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending"/>
+                            </div>
                             <field name="type" invisible="1"/>
                         </group>
                         <group>
@@ -207,22 +209,22 @@
                             <group string="Categorization">
                                 <field name="company_id"
                                     groups="base.group_multi_company"
-                                    widget="selection" colspan="2" />
+                                    widget="selection" colspan="2"/>
                                 <field name="type_id" widget="selection"/>
                                 <field name="channel_id" widget="selection"/>
                                 <field name="referred"/>
                                 <field name="state" groups="base.group_no_one"/>
                             </group>
                             <group string="Mailings">
-                                <field name="opt_out" />
+                                <field name="opt_out"/>
                             </group>
                         </group>
                     </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
             </form>
         </field>
@@ -246,23 +248,22 @@
             <field name="name">Leads</field>
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
-                <tree string="Leads" fonts="bold:needaction_pending==True" colors="grey:state in ('cancel', 'done')">
+                <tree string="Leads" fonts="bold:message_unread==True" colors="grey:state in ('cancel', 'done')">
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name"/>
                     <field name="contact_name"/>
-                    <field name="country_id" invisible="context.get('invisible_country', True)" />
+                    <field name="country_id" invisible="context.get('invisible_country', True)"/>
                     <field name="email_from"/>
                     <field name="phone"/>
                     <field name="stage_id"/>
                     <field name="user_id" invisible="1"/>
-                    <field name="section_id" invisible="context.get('invisible_section', True)" />
-                    <field name="state" groups="base.group_no_one"/>
+                    <field name="section_id" invisible="context.get('invisible_section', True)"/>
+                    <field name="state" invisible="1"/>
                     <field name="type_id" invisible="1"/>
                     <field name="referred" invisible="1"/>
                     <field name="channel_id" invisible="1"/>
-                    <field name="subjects" invisible="1"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -275,8 +276,8 @@
             <field name="arch" type="xml">
                 <calendar string="Leads Generation"
                     date_start="date_action" color="user_id">
-                    <field name="name" />
-                    <field name="partner_name" />
+                    <field name="name"/>
+                    <field name="partner_name"/>
                 </calendar>
             </field>
         </record>
@@ -296,23 +297,16 @@
                     <field name="user_id"/>
                     <field name="partner_address_email"/>
                     <field name="message_summary"/>
-                    <field name="needaction_pending"/>
+                    <field name="message_unread"/>
                     <templates>
-                        <t t-name="lead_details">
-                            <ul class="oe_kanban_tooltip">
-                                <li t-if="record.phone.raw_value"><b>Phone:</b> <field name="phone"/></li>
-                                <li><b>Probability:</b> <field name="probability"/>%%</li>
-                                <li><b>Creation date:</b> <field name="create_date"/></li>
-                                <li t-if="record.date_deadline.raw_value"><b>Date Deadline:</b> <field name="date_deadline"/></li>
-                            </ul>
-                        </t>
+                        <field name="date_deadline"/>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
-                                        <li><a type="edit" >Edit...</a></li>
-                                        <li><a type="delete">Delete</a></li>
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><a name="%(mail.action_email_compose_message_wizard)d" type="action">Send Email</a></li>
                                         <li><a name="%(opportunity2phonecall_act)d" type="action">Log Call</a></li>
                                         <li><a name="action_makeMeeting" type="object">Schedule Meeting</a></li>
@@ -342,7 +336,6 @@
                                         <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                     </div>
                                     <div class="oe_kanban_footer_left">
-                                        <t t-if="record.needaction_pending.raw_value"><span class="oe_kanban_mail_new">New</span></t>
                                         <t t-raw="record.message_summary.raw_value"/>
                                     </div>
                                 </div>
@@ -361,16 +354,14 @@
             <field name="arch" type="xml">
                 <search string="Search Leads">
                     <field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
-                    <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]" />
-                    <!-- subjects is not set as store=True so, it is placed outside filter_domain-->
-                    <field name="subjects"/>
+                    <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]"/>
                     <field name="create_date"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" name="new" help="New Leads" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-camera_test" string="Open" name="open" domain="[('state','=','open')]"/>
+                    <filter icon="terp-camera_test" string="In Progress" name="open" domain="[('state','=','open')]"/>
                     <separator/>
-                    <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads" />
+                    <filter string="Unassigned Leads" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Leads"/>
                     <separator/>
                     <filter string="Leads Assigned to Me or My Team(s)" icon="terp-personal+" context="{'invisible_section': False}"
                             domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]"
@@ -382,11 +373,10 @@
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}"/>
                         <filter string="Referrer" icon="terp-personal" domain="[]" context="{'group_by':'referred'}"/>
-                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
-                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
+                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
+                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Creation" help="Create date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                     </group>
                     <group string="Display">
@@ -414,8 +404,6 @@
                                 states="draft,open,pending" class="oe_highlight"/>
                         <button name="case_mark_lost" string="Mark Lost" type="object"
                                 states="draft,open" class="oe_highlight"/>
-                        <button name="case_escalate" string="Escalate" type="object"
-                                states="open" />
                         <field name="stage_id" widget="statusbar" clickable="True"/>
                     </header>
                     <sheet>
@@ -427,7 +415,7 @@
                                 name="action_makeMeeting"
                                 type="object"
                                 context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"
-                                />
+                               />
                         </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
@@ -435,7 +423,7 @@
                             <label for="planned_revenue" class="oe_edit_only"/>
                             <h2>
                                 <field name="planned_revenue" class="oe_inline"/>
-                                <field name="company_currency" class="oe_inline"/> at
+                                <field name="company_currency" class="oe_inline" groups="base.group_multi_currency"/> at
                                 <field name="probability" class="oe_inline" widget="integer"/>%% success rate
                             </h2>
                         </div>
@@ -461,7 +449,11 @@
 
                             <group>
                                 <field name="user_id"/>
-                                <field name="section_id" colspan="1" widget="selection"/>
+                                <label for="section_id"/>
+                                <div>
+                                    <field name="section_id" widget="selection"/>
+                                    <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending"/>
+                                </div>
                             </group>
                             <group>
                                 <field name="categ_ids"
@@ -485,20 +477,20 @@
                                         <field name="street2"/>
                                         <div class="address_format">
                                             <field name="city" placeholder="City" style="width: 40%%"/>
-                                            <field name="state_id" options='{"no_open": true}' placeholder="State" style="width: 24%%"/>
+                                            <field name="state_id" options='{"no_open": True}' on_change="onchange_state(state_id)" placeholder="State" style="width: 24%%"/>
                                             <field name="zip" placeholder="ZIP" style="width: 34%%"/>
                                         </div>
-                                        <field name="country_id" placeholder="Country" options='{"no_open": true}'/>
+                                        <field name="country_id" placeholder="Country" options='{"no_open": True}'/>
                                     </div>
                                 </group>
 
                                 <group>
-                                    <label for="contact_name" />
+                                    <label for="contact_name"/>
                                     <div>
                                         <field name="contact_name" class="oe_inline"/>
-                                        <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": true}' class="oe_inline"/>
+                                        <field name="title" placeholder="Title" domain="[('domain', '=', 'contact')]" options='{"no_open": True}' class="oe_inline"/>
                                     </div>
-                                    <field name="function" />
+                                    <field name="function"/>
                                     <field name="mobile"/>
                                     <field name="fax"/>
                                 </group>
@@ -508,14 +500,14 @@
                                     <field name="channel_id" widget="selection"/>
                                 </group>
                                 <group string="Mailings">
-                                    <field name="opt_out" />
+                                    <field name="opt_out"/>
                                 </group>
                                 <group string="Misc">
                                     <field name="active"/>
                                     <field name="day_open" groups="base.group_no_one"/>
                                     <field name="day_close" groups="base.group_no_one"/>
                                     <field name="referred"/>
-                                    <field name="state" groups="base.group_no_one"/>
+                                    <field name="state" invisible="1"/>
                                     <field name="type" invisible="1"/>
                                 </group>
                                 <group string="References">
@@ -533,8 +525,8 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
@@ -545,25 +537,24 @@
             <field name="name">Opportunities Tree</field>
             <field name="model">crm.lead</field>
             <field name="arch" type="xml">
-                <tree string="Opportunities" fonts="bold:needaction_pending==True" colors="gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
+                <tree string="Opportunities" fonts="bold:message_unread==True" colors="gray:state in ('cancel', 'done');red:date_deadline and (date_deadline &lt; current_date)">
                     <field name="date_deadline" invisible="1"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name" string="Opportunity"/>
                     <field name="partner_id" string="Customer"/>
-                    <field name="country_id" invisible="context.get('invisible_country', True)" />
+                    <field name="country_id" invisible="context.get('invisible_country', True)"/>
                     <field name="date_action"/>
-                    <field name="title_action" />
+                    <field name="title_action"/>
                     <field name="channel_id" invisible="1"/>
                     <field name="type_id" invisible="1"/>
-                    <field name="subjects" invisible="1"/>
                     <field name="stage_id"/>
                     <field name="planned_revenue" sum="Expected Revenues"/>
                     <field name="probability" widget="progressbar" avg="Avg. of Probability"/>
-                    <field name="section_id" invisible="context.get('invisible_section', True)" />
+                    <field name="section_id" invisible="context.get('invisible_section', True)"/>
                     <field name="user_id"/>
                     <field name="priority" invisible="1"/>
                     <field name="state" groups="base.group_no_one"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -577,32 +568,30 @@
                 <search string="Search Opportunities">
                     <field name="name" string="Opportunity / Customer"
                         filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
-                    <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]" />
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" help="Unread messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" help="New Opportunities" name="new" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-camera_test" string="Open" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
+                    <filter icon="terp-camera_test" string="In Progress" help="Open Opportunities" name="open" domain="[('state','=','open')]"/>
                     <separator/>
-                    <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities" />
+                    <filter string="Unassigned Opportunities" icon="terp-personal-" domain="[('user_id','=', False)]" help="Unassigned Opportunities"/>
                     <separator/>
                     <filter string="Opportunities Assigned to Me or My Team(s)"  icon="terp-personal+"
                             domain="['|', ('section_id.user_id','=',uid), ('section_id.member_ids', 'in', [uid])]" context="{'invisible_section': False}"
-                            help="Opportunities that are assigned to either me or one of the sale teams I manage" />
+                            help="Opportunities that are assigned to either me or one of the sale teams I manage"/>
                     <field name="user_id"/>
-                    <field name="country_id"/>
-                    <field name="partner_id"/>
                     <field name="section_id" context="{'invisible_section': False, 'default_section_id': self}"/>
+                    <field name="partner_id"/>
                     <group expand="0" string="Group By..." colspan="16">
-                        <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}" />
+                        <filter string="Salesperson" 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="Customer" help="Partner" icon="terp-personal+" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
-                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
+                        <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                        <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}"/>
                         <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}"/>
-                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}"/>
                         <filter string="Creation" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
-                        <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}" />
+                        <filter string="Exp.Closing" icon="terp-go-month" help="Expected Closing" domain="[]" context="{'group_by':'date_deadline'}"/>
                     </group>
                     <group string="Display">
                         <filter string="Show Sales Team" icon="terp-personal+" context="{'invisible_section': False}" domain="[]" help="Show Sales Team"/>
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 13171d95b9b..62fc53364ee 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -44,7 +44,7 @@ class crm_meeting(osv.Model):
     def create_send_note(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        # update context: if come from phonecall, default state values can make the message_append_note crash
+        # update context: if come from phonecall, default state values can make the message_post crash
         context.pop('default_state', False)
         for meeting in self.browse(cr, uid, ids, context=context):
             # in the message, transpose meeting.date to the timezone of the current user
@@ -53,14 +53,14 @@ class crm_meeting(osv.Model):
             if meeting.opportunity_id: # meeting can be create from phonecalls or opportunities, therefore checking for the parent
                 lead = meeting.opportunity_id
                 message = _("Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (lead.name, meeting_date_tz)
-                lead.message_append_note(_('System Notification'), message)
+                lead.message_post(body=message)
             elif meeting.phonecall_id:
                 phonecall = meeting.phonecall_id
                 message = _("Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (phonecall.name, meeting_date_tz)
-                phonecall.message_append_note(body=message)
+                phonecall.message_post(body=message)
             else:
                 message = _("A meeting has been <b>scheduled</b> on <em>%s</em>.") % (meeting_date_tz)
-            meeting.message_append_note(body=message)
+            meeting.message_post(body=message)
         return True
 
 class calendar_attendee(osv.osv):
diff --git a/addons/crm/crm_meeting_shortcut_data.xml b/addons/crm/crm_meeting_shortcut_data.xml
deleted file mode 100644
index 45488da8a82..00000000000
--- a/addons/crm/crm_meeting_shortcut_data.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data noupdate="1">
-
-        <record id="ir_ui_view_sc_calendar0" model="ir.ui.view_sc">
-            <field name="name">Meetings</field>
-            <field name="resource">ir.ui.menu</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="res_id" ref="base_calendar.menu_crm_meeting"/>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
deleted file mode 100644
index d7f59267a30..00000000000
--- a/addons/crm/crm_meeting_view.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-    <!-- Calendar Attendee Form View -->
-
-    <record id="attendee_form_view_inherit" model="ir.ui.view">
-            <field name="name">calendar.attendee.form.inherit</field>
-            <field name="model">calendar.attendee</field>
-            <field name="inherit_id" ref="base_calendar.base_calendar_attendee_form_view"/>
-            <field name="arch" type="xml">
-                <field name="ref" position="after">
-                    <field name="categ_id" string="Event Type"/>
-                </field>
-            </field>
-    </record>
-
-    </data>
-</openerp>
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index da08f97250a..bac33815794 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -32,7 +32,7 @@ class crm_phonecall(base_state, osv.osv):
     _name = "crm.phonecall"
     _description = "Phonecall"
     _order = "id desc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread']
     _columns = {
         # base_state required fields
         'date_action_last': fields.datetime('Last Action', readonly=1),
@@ -50,10 +50,10 @@ class crm_phonecall(base_state, osv.osv):
                                     ('cancel', 'Cancelled'),
                                     ('done', 'Held'),],
                         string='Status', size=16, readonly=True,
-                        help='The state is set to \'Todo\', when a case is created.\
-                                If the case is in progress the state is set to \'Open\'.\
-                                When the call is over, the state is set to \'Held\'.\
-                                If the call needs to be done then the state is set to \'Not Held\'.'),
+                        help='The status is set to \'Todo\', when a case is created.\
+                                If the case is in progress the status is set to \'Open\'.\
+                                When the call is over, the status is set to \'Held\'.\
+                                If the call needs to be done then the status is set to \'Not Held\'.'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
         'date_open': fields.datetime('Opened', readonly=True),
         # phonecall fields
@@ -177,11 +177,11 @@ class crm_phonecall(base_state, osv.osv):
         if context is None:
             context = {}
         partner_ids = {}
+        force_partner_id = partner_id
         for call in self.browse(cr, uid, ids, context=context):
             if action == 'create':
-               if not partner_id:
-                   partner_id = self._call_create_partner(cr, uid, call, context=context)
-               self._call_create_partner_address(cr, uid, call, partner_id, context=context)
+                partner_id = force_partner_id or self._call_create_partner(cr, uid, call, context=context)
+                self._call_create_partner_address(cr, uid, call, partner_id, context=context)
             self._call_set_partner(cr, uid, [call.id], partner_id, context=context)
             partner_ids[call.id] = partner_id
         return partner_ids
@@ -266,7 +266,7 @@ class crm_phonecall(base_state, osv.osv):
     
     def case_reset_send_note(self, cr, uid, ids, context=None):
         message = _('Phonecall has been <b>reset and set as open</b>.')
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def case_open_send_note(self, cr, uid, ids, context=None):
         lead_obj = self.pool.get('crm.lead')
@@ -280,11 +280,11 @@ class crm_phonecall(base_state, osv.osv):
                 message = _("Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and <b>scheduled</b> on <em>%s</em>.") % (lead.name, phonecall_date_str)
             else:
                 message = _("Phonecall has been <b>created and opened</b>.")
-            phonecall.message_append_note(body=message)
+            phonecall.message_post(body=message)
         return True
 
     def _call_set_partner_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Partner has been <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Partner has been <b>created</b>."), context=context)
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/crm_phonecall_demo.xml b/addons/crm/crm_phonecall_demo.xml
index cbfb74a8e04..f441c29a7e6 100644
--- a/addons/crm/crm_phonecall_demo.xml
+++ b/addons/crm/crm_phonecall_demo.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
     <data noupdate="1">
-    <!-- 
-        ((((((((((( Demo Cases ))))))))))) 
-    -->
+
+        <!--  Demo Cases  -->
         <record id="crm_phonecall_1" model="crm.phonecall">
             <field eval="time.strftime('%Y-%m-04 10:45:36')" name="date"/>
             <field name="partner_id" ref="base.res_partner_11"/>
@@ -47,7 +46,7 @@
             <field eval="time.strftime('%Y-%m-21 14:10:23')" name="date"/>
             <field eval="'3'" name="priority"/>
             <field name="user_id" ref="base.user_root"/>
-            <field name="name">Wanted information about pricing of Laptops</field>
+            <field name="name">Wanted information about pricing of laptops</field>
             <field name="state">done</field>
             <field name="partner_phone">(077) 582-4035</field>
             <field name="partner_mobile">(077) 341-3591</field>
@@ -79,6 +78,7 @@
             <field eval="time.strftime('%Y-%m-28 14:15:30')" name="date"/>
             <field name="categ_id" ref="crm.categ_phone2"/>
             <field eval="8.56" name="duration"/>
-        </record>    
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml
index ba8c4768c09..2344604a294 100644
--- a/addons/crm/crm_phonecall_menu.xml
+++ b/addons/crm/crm_phonecall_menu.xml
@@ -2,14 +2,6 @@
 <openerp>
 <data>
 
-    <act_window
-        id="crm_case_categ_phone_create_partner"
-        name="Schedule a Call"
-        res_model="crm.phonecall"
-        view_mode="calendar,tree,form"
-        context="{'search_default_partner_id': [active_id], 'default_duration': 1.0, 'default_partner_id': active_id}"
-        groups="base.group_sale_salesman"
-        />
 
     <!-- TO CONFIRM: This is fine -->
     <!-- act_window
@@ -123,7 +115,7 @@
             OpenERP allows you to easily define all the calls to be done
             by your sales team and follow up based on their summary.
           </p><p>  
-            You can use the import feature to massicely import a new list of
+            You can use the import feature to massively import a new list of
             prospects to qualify.
           </p>
         </field>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index 3b5162288a4..9cb09e71be2 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -9,7 +9,7 @@
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_phonecall"/>
         <field name="state">code</field>
-        <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+        <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
     </record>
     <record id="action_crm_phonecall_unread" model="ir.values">
         <field name="name">action_crm_phonecall_unread</field>
@@ -27,7 +27,7 @@
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_crm_phonecall"/>
         <field name="state">code</field>
-        <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+        <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
     </record>
     <record id="action_crm_phonecall_read" model="ir.values">
         <field name="name">action_crm_phonecall_read</field>
@@ -66,25 +66,23 @@
         <field name="name">CRM - Phone Calls Tree</field>
         <field name="model">crm.phonecall</field>
         <field name="arch" type="xml">
-            <tree fonts="bold:needaction_pending==True" colors="gray:state in ('cancel','done');blue:state in ('pending',)" string="Phone Calls">
-                <field name="needaction_pending" invisible="1"/>
+            <tree colors="gray:state in ('cancel','done');blue:state in ('pending',)" string="Phone Calls">
                 <field name="date"/>
                 <field name="name"/>
                 <field name="partner_id"/>
-                <field name="partner_phone"/>
-                <field name="user_id"/>
-                <field name="categ_id" invisible="1"/>
-                <field name="create_date" invisible="1"/>
-                <field name="opportunity_id" invisible="1"/>
-                <field name="needaction_pending" invisible="1"/>
+                <button string="Meeting"
+                    states="open,pending" icon="gtk-redo"
+                     name="action_make_meeting" type="object"/>
                 <button string="Convert to Opportunity"
                     name="%(phonecall2opportunity_act)d"
                     states="open,pending"
                     icon="gtk-index"
                     type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}"/>
-                <button string="Meeting"
-                    states="open,pending" icon="gtk-redo"
-                     name="action_make_meeting" type="object"/>
+                <field name="partner_phone"/>
+                <field name="user_id"/>
+                <field name="categ_id" invisible="1"/>
+                <field name="create_date" invisible="1"/>
+                <field name="opportunity_id" invisible="1"/>
                 <field name="state"/>
                 <button name="case_open" string="Confirm" type="object"
                         states="draft,pending" icon="gtk-go-forward"/>
@@ -106,56 +104,55 @@
         <field name="arch" type="xml">
             <form string="Phone Call" version="7.0">
             <header>
-                <button name="case_close" string="Held" type="object" class="oe_highlight"
+                <button name="case_close" string="Call Done" type="object" class="oe_highlight"
                         states="open,pending"/>
                 <button name="case_reset" string="Reset to Todo" type="object"
                         states="cancel"/>
-                <button string="Convert to Opportunity"
-                        name="%(phonecall2opportunity_act)d"
-                        type="action"
-                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'open')]}"/>
-                <button string="Convert to Opportunity" class="oe_highlight"
-                        name="%(phonecall2opportunity_act)d"
-                        type="action"
-                        attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state','!=', 'done')]}"/>
-                <button string="Schedule Other Call"
-                        name="%(phonecall_to_phonecall_act)d"
-                        type="action"/>
-                <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
                 <button name="case_cancel" string="Cancel" type="object"
                         states="draft,open,pending"/>
                 <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done"/>
             </header>
-            <sheet string="Phone Call">
-                  <div class="oe_title">
-                      <div class="oe_edit_only">
-                          <label for="name" string="Title"/>
-                      </div>
-                      <h1><field name="name" required="1"/></h1>
-                      <div class="oe_edit_only">
-                        <label for="partner_phone" string="Phone"/>
-                      </div>
-                      <h2><field name="partner_phone"/></h2>
-                  </div>
-                 <group col="4">
-                    <field name="date"/>
-                    <field name="user_id"/>
-                    <field name="duration" widget="float_time"/>
-                    <field name="section_id" colspan="1" widget="selection"/>
-                    <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                    <field name="categ_id" widget="selection"
-                        domain="[('object_id.model', '=', 'crm.phonecall')]"/>
-                    <field name="partner_mobile"/>
-                    <field name="priority"/>
-                    <field name="opportunity_id"/>
-                </group>
-
-                <field name="description" placeholder="Description..."/>
-            </sheet>
-            <div class="oe_chatter">
-                <field name="message_ids" widget="mail_thread"/>
-                <field name="message_follower_ids" widget="mail_followers"/>
-            </div>
+                <sheet string="Phone Call">
+                    <div class="oe_right"> 
+                        <button string="Convert to Opportunity"
+                            name="%(phonecall2opportunity_act)d"
+                            type="action"
+                            attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state', 'not in', ('open', 'done'))]}"/>
+                        <button string="Schedule Other Call"
+                                name="%(phonecall_to_phonecall_act)d"
+                                type="action"/>
+                        <button string="Schedule a Meeting" name="action_make_meeting" type="object"/>
+                    </div>
+                    <div class="oe_title">
+                        <div class="oe_edit_only">
+                            <label for="name"/>
+                        </div>
+                        <h1><field name="name" required="1"/></h1>
+                        <div class="oe_edit_only">
+                            <label for="partner_phone" string="Phone"/>
+                        </div>
+                        <h2><field name="partner_phone"/></h2>
+                    </div>
+  
+                    <group col="4">
+                        <field name="date"/>
+                        <field name="user_id"/>
+                        <field name="duration" widget="float_time"/>
+                        <field name="section_id" colspan="1" widget="selection"/>
+                        <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                        <field name="email_from" invisible="1"/> <!--not needed because of the chatter, thus invisible, but must be in the view as it's returned by onchange_partner_id()-->
+                        <field name="categ_id" widget="selection"
+                            domain="[('object_id.model', '=', 'crm.phonecall')]"/>
+                        <field name="partner_mobile"/>
+                        <field name="priority"/>
+                        <field name="opportunity_id"/>
+                    </group>
+                    <field name="description" placeholder="Description..."/>
+                </sheet>
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
             </form>
         </field>
     </record>
@@ -166,7 +163,7 @@
         <field name="name">CRM - Logged Phone Calls Tree</field>
         <field name="model">crm.phonecall</field>
         <field name="arch" type="xml">
-            <tree string="Phone Calls" fonts="bold:needaction_pending==True" editable="top">
+            <tree string="Phone Calls" editable="top">
                 <field name="date"/>
                 <field name="name"/>
                 <field name="partner_id"
@@ -180,7 +177,6 @@
                 <field name="state" invisible="1"/>
                 <field name="create_date" invisible="1"/>
                 <field name="opportunity_id" invisible="1"/>
-                <field name="needaction_pending" invisible="1"/>
                 <button string="Schedule Other Call"
                     icon="terp-call-start"
                     name="%(phonecall_to_phonecall_act)d"
@@ -219,7 +215,6 @@
             <search string="Search Phonecalls">
                <field name="name" string="Phonecalls"/>
                <field name="date"/>
-               <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                <separator/>
                <filter icon="terp-gtk-go-back-rtl" string="To Do" name="current" domain="[('state','=','open')]"/>
                <separator/>
diff --git a/addons/crm/crm_segmentation.py b/addons/crm/crm_segmentation.py
index 9cafe950410..b87d6a3b653 100644
--- a/addons/crm/crm_segmentation.py
+++ b/addons/crm/crm_segmentation.py
@@ -56,6 +56,7 @@ added to partners that match the segmentation criterions after computation.'),
             @param uid: the current user’s ID for security checks,
             @param ids: List of Process continue’s IDs"""
 
+        partner_obj = self.pool.get('res.partner')
         categs = self.read(cr, uid, ids, ['categ_id', 'exclusif', 'partner_id',\
                                  'sales_purchase_active', 'profiling_active'])
         for categ in categs:
@@ -80,9 +81,11 @@ added to partners that match the segmentation criterions after computation.'),
                 for pid in to_remove_list:
                     partners.remove(pid)
 
-            for partner_id in partners:
-                cr.execute('insert into res_partner_res_partner_category_rel (category_id,partner_id) \
-                        values (%s,%s)', (categ['categ_id'][0], partner_id))
+            for partner in partner_obj.browse(cr, uid, partners):
+                category_ids = [categ_id.id for categ_id in partner.category_id]
+                if categ['categ_id'][0] not in category_ids:
+                    cr.execute('insert into res_partner_res_partner_category_rel (category_id,partner_id) \
+                            values (%s,%s)', (categ['categ_id'][0], partner.id))
 
             self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
         return True
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b51f1288b95..99d3752529e 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -24,9 +24,9 @@
             parent="base.menu_base_config" sequence="45" groups="base.group_sale_salesman"/>
 
         <menuitem id="base.next_id_64" name="Sales"
-            parent="base.menu_reporting" sequence="1" />
+            parent="base.menu_reporting" sequence="1"/>
 
-        <menuitem id="base.menu_sales_configuration_misc" name="Miscellaneous" parent="base.menu_base_config" sequence="75"/>
+        <menuitem id="base.menu_sales_configuration_misc" name="Miscellaneous" parent="base.menu_base_config" sequence="81"/>
 
 
         <!-- crm.case.channel -->
@@ -86,7 +86,7 @@
                             <field name="parent_id"/>
                             <field name="code"/>
                         </group>
-                        
+
                         <group>
                             <field name="user_id"/>
                             <field name="resource_calendar_id"/>
@@ -102,10 +102,25 @@
                                     <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
                                  </div>
                                 <field name="change_responsible"/>
-                                <field name="allow_unlink"/>
                             </group>
                             <separator string="Team Members"/>
-                            <field name="member_ids"/>
+                            <field name="member_ids" widget="many2many_kanban">
+                                <kanban quick_create="false" create="true">
+                                    <field name="name"/>
+                                    <templates>
+                                        <t t-name="kanban-box">
+                                            <div style="position: relative">
+                                                <a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
+                                                <div class="oe_module_vignette">
+                                                    <div class="oe_module_desc">
+                                                        <field name="name"/>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </t>
+                                    </templates>
+                                </kanban>
+                            </field>
                         </page>
                         <page string="Stages">
                             <separator string="Select Stages for this Sales Team"/>
@@ -115,6 +130,10 @@
                             <field name="note"/>
                         </page>
                     </notebook>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers" help="Followers of this salesteam follow automatically all opportunities related to this salesteam."/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -143,7 +162,7 @@
             <field name="view_id" ref="crm_case_section_view_tree"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to define a new sales team. 
+                Click to define a new sales team.
               </p><p>
                 Use sales team to organize your different salespersons or
                 departments into separate teams. Each team will work in
@@ -183,7 +202,7 @@
                 <form string="Stage" version="7.0">
                     <group col="4">
                         <field name="name"/>
-                        <field name="state" string="Related State" />
+                        <field name="state"/>
                         <field name="probability"/>
                         <field name="type"/>
                         <field name="on_change"/>
@@ -208,7 +227,7 @@
         </record>
 
 
-     <!-- Case Categories Form View -->
+        <!-- Case Categories Form View -->
 
         <record id="crm_case_categ-view" model="ir.ui.view">
             <field name="name">crm.case.categ.form</field>
@@ -218,7 +237,7 @@
                     <group>
                         <field name="name"/>
                         <field name="section_id"/>
-                        <field name="object_id"  invisible="1" />
+                        <field name="object_id" invisible="1"/>
                     </group>
                 </form>
             </field>
@@ -277,7 +296,7 @@
          <menuitem action="crm_case_resource_type_act"
             id="menu_crm_case_resource_type_act" sequence="4"
             groups="base.group_no_one"
-            parent="base.menu_crm_config_lead" />
+            parent="base.menu_crm_config_lead"/>
 
         <record id="crm_case_section_act_tree" model="ir.actions.act_window">
             <field name="name">Cases by Sales Team</field>
@@ -334,13 +353,13 @@
                         <button name="process_start"
                             states="not running"
                             string="Compute Segmentation" type="object"
-                            icon="gtk-execute" />
+                            icon="gtk-execute"/>
                         <button name="process_stop" states="running"
                             string="Stop Process" type="object"
-                            icon="gtk-cancel" />
+                            icon="gtk-cancel"/>
                         <button name="process_continue" states="running"
                             string="Continue Process" type="object"
-                            icon="gtk-go-forward" />
+                            icon="gtk-go-forward"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <group col="4">
@@ -392,7 +411,7 @@
             <field name="view_mode">tree,form</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to define a new customer segmentation. 
+                Click to define a new customer segmentation.
               </p><p>
                 Create specific categories which you can assign to your
                 contacts to better manage your interactions with them. The
@@ -405,7 +424,7 @@
        <menuitem action="crm_segmentation_tree-act"
             id="menu_crm_segmentation-act"
             groups="base.group_no_one" sequence="15"
-            parent="base.menu_base_config" />
+            parent="base.menu_base_config"/>
 
         <!-- menu for the working time -->
         <menuitem action="resource.action_resource_calendar_form" id="menu_action_resource_calendar_form" parent="resource.menu_resource_config" sequence="1"/>
@@ -446,13 +465,11 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        
-        <menuitem id="menu_crm_payment_mode" name="Fund Raising"
-            parent="base.menu_base_config" sequence="85" groups="crm.group_fund_raising"/>
-            
+
         <menuitem action="action_crm_payment_mode"
             id="menu_crm_payment_mode_act"
+            groups="base.group_no_one"
             name="Payment Modes"
-            parent="menu_crm_payment_mode" />
+            parent="base.menu_crm_config_lead"/>
     </data>
 </openerp>
diff --git a/addons/crm/i18n/ar.po b/addons/crm/i18n/ar.po
index 6f47d36d620..6aa9674d832 100644
--- a/addons/crm/i18n/ar.po
+++ b/addons/crm/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -140,7 +140,7 @@ msgstr "سنوياً"
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr ""
+msgstr "انشاء يوم"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -218,7 +218,7 @@ msgstr "إلغاء الإشتراك"
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Recurrence termination"
-msgstr ""
+msgstr "تكرار الإنهاء"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:323
@@ -402,7 +402,7 @@ msgstr "تاريخ التحديث"
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr ""
+msgstr "قائد المجموعة"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
@@ -432,7 +432,7 @@ msgstr "فئة"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunity / Customer"
-msgstr ""
+msgstr "زبون متوقع/زبون"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -478,7 +478,7 @@ msgstr "اجتماع عادي او تليفوني للفرصة"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mail Gateway"
-msgstr ""
+msgstr "بوابة الإيميل الإلكتروني"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
@@ -535,7 +535,7 @@ msgstr "البريد الإلكتروني"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phonecalls during last 7 days"
-msgstr ""
+msgstr "المكالمات خلال 7 أيام السابقة"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -639,7 +639,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,creation_month:0
 msgid "Creation Month"
-msgstr ""
+msgstr "إنشاء شهر"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
@@ -691,7 +691,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmans"
-msgstr ""
+msgstr "رجال مبيعات"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -701,7 +701,7 @@ msgstr "الربح المحتمل"
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr ""
+msgstr "إنشاء شهر"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -927,7 +927,7 @@ msgstr "تحذير !"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current year"
-msgstr ""
+msgstr "المكالمات التلفونية التي تمت في العام الحالي"
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -967,7 +967,7 @@ msgstr "لقاءاتي"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Todays's Phonecalls"
-msgstr ""
+msgstr "المكالمات التلفونية لهذا اليوم"
 
 #. module: crm
 #: view:board.board:0
@@ -1039,7 +1039,7 @@ msgstr "مسؤول"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr ""
+msgstr "مشاهدة الفرص فقط"
 
 #. module: crm
 #: view:res.partner:0
@@ -1049,7 +1049,7 @@ msgstr "السابق"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr ""
+msgstr "عروض جديدة"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1064,12 +1064,12 @@ msgstr "من"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert into Opportunities"
-msgstr ""
+msgstr "تحويل إلى فرص"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr ""
+msgstr "عرض فريق المبيعات"
 
 #. module: crm
 #: view:res.partner:0
@@ -1127,7 +1127,7 @@ msgstr "تاريخ الإنشاء"
 #. module: crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "الفرص الخاصة بي"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
@@ -1173,7 +1173,7 @@ msgstr "رسال للشريك"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Call Details"
-msgstr ""
+msgstr "تفاصيل المكالمة"
 
 #. module: crm
 #: field:crm.meeting,class:0
@@ -1183,7 +1183,7 @@ msgstr "تعليم كـ"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "سجل المكالمة"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
@@ -1198,7 +1198,7 @@ msgstr "حقول شروط الحالة"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr ""
+msgstr "المكالمات الهاتفية التي هي في حالة انتظار"
 
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,stage_ids:0
@@ -1242,7 +1242,7 @@ msgstr "تم انجاز هوية الشريك الاقصى"
 msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
-msgstr ""
+msgstr "ضبط هذه المرحلة سيغير احتمال التغيير تلقائيا على هذه الفرصة."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
@@ -1274,7 +1274,7 @@ msgstr "اسم الفرصة"
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
-msgstr ""
+msgstr "يوم الإغلاق المتوقع"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1295,6 +1295,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"إذا قمت بتحديد هذا الحقل، سيتم اقتراح هذه المرحلة بشكل افتراضي على كل فريق "
+"المبيعات. ولن يتم تعيين هذه المرحلة للفرق الموجودة."
 
 #. module: crm
 #: field:crm.meeting,fr:0
@@ -1338,7 +1340,7 @@ msgstr "ضع منبه لهذا الوقت, قبل الحدث"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr ""
+msgstr "موعد المكالمة"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1426,7 +1428,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "تاريخ المكالمة"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1819,7 +1821,7 @@ msgstr "أعلى"
 #. module: crm
 #: help:crm.lead.report,creation_year:0
 msgid "Creation year"
-msgstr ""
+msgstr "سنة الإنشاء"
 
 #. module: crm
 #: view:crm.case.section:0 view:crm.lead:0 field:crm.lead,description:0
@@ -2108,7 +2110,7 @@ msgstr "الإحتمال"
 #. module: crm
 #: view:crm.lead:0
 msgid "Pending Opportunities"
-msgstr ""
+msgstr "فرص معلقة"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
@@ -2276,7 +2278,7 @@ msgstr "عدد الإيام لفتح الحالة"
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Number of repetitions"
-msgstr ""
+msgstr "عدد التكرر"
 
 #. module: crm
 #: field:crm.lead,phone:0 field:crm.opportunity2phonecall,phone:0
@@ -2426,7 +2428,7 @@ msgstr "مشغول"
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
-msgstr ""
+msgstr "تاريخ الإنشاء"
 
 #. module: crm
 #: field:crm.meeting,interval:0
@@ -2802,7 +2804,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "لون الفهرس"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2945,7 +2947,7 @@ msgstr "قناة"
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.meeting:0
 #: view:crm.phonecall:0 view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "فريقي للمبيعات"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -3422,7 +3424,7 @@ msgstr "خاص"
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "عام لكل الموظفيين"
 
 #. module: crm
 #: field:crm.lead,function:0
@@ -3461,7 +3463,7 @@ msgstr "الاهتمام بالاجزاء"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "فرص جديدة"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
@@ -3629,7 +3631,7 @@ msgstr "مسلسل"
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "مرشد تركيب البريد الإلكتروني"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3666,7 +3668,7 @@ msgstr "سنة"
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متداخلين."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
@@ -4128,3 +4130,6 @@ msgstr "نشرة الأخبار"
 #~ "انشيء مراحل محددة التي يمكن ان تساعد مبيعاتك افضل من تنظيم خط المبيعات "
 #~ "بإبقائهم لفر المبيعات الخاصة بهم. سيسمح لك ذلك لتعقب بسهولة كيفية تعيين "
 #~ "الفرص المحددة في دورة المبيعات."
+
+#~ msgid "Assigned opportunities to"
+#~ msgstr "تعيين فرص لـ"
diff --git a/addons/crm/i18n/bg.po b/addons/crm/i18n/bg.po
index 80da84dc659..70511c98a64 100644
--- a/addons/crm/i18n/bg.po
+++ b/addons/crm/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/bs.po b/addons/crm/i18n/bs.po
index 8c1c7147d63..c1b714fe94f 100644
--- a/addons/crm/i18n/bs.po
+++ b/addons/crm/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/ca.po b/addons/crm/i18n/ca.po
index 0b2865fd8eb..7dacd8196bf 100644
--- a/addons/crm/i18n/ca.po
+++ b/addons/crm/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/cs.po b/addons/crm/i18n/cs.po
index 1fcad11184a..a6aef0d4fcf 100644
--- a/addons/crm/i18n/cs.po
+++ b/addons/crm/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/da.po b/addons/crm/i18n/da.po
index c7245d4ea56..a2cc2258529 100644
--- a/addons/crm/i18n/da.po
+++ b/addons/crm/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/de.po b/addons/crm/i18n/de.po
index 1feb0d2dca0..0170792c659 100644
--- a/addons/crm/i18n/de.po
+++ b/addons/crm/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/el.po b/addons/crm/i18n/el.po
index 3a6a7810706..8aedb4e1ccb 100644
--- a/addons/crm/i18n/el.po
+++ b/addons/crm/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/crm/i18n/es.po b/addons/crm/i18n/es.po
index e907f9a594f..a72a6ec2305 100644
--- a/addons/crm/i18n/es.po
+++ b/addons/crm/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-10 17:48+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"PO-Revision-Date: 2012-11-09 12:10+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@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: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-11-10 04:59+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -172,7 +172,7 @@ msgstr "Mes esperado de cierre"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assigned Opportunities to"
-msgstr ""
+msgstr "Oportunidades asignadas a"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_id:0 view:crm.lead.report:0
@@ -598,7 +598,7 @@ msgstr "Fecha de fin"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "Planificar/Registrar una llamada"
 
 #. module: crm
 #: constraint:base.action.rule:0
@@ -792,7 +792,7 @@ msgstr "Siguiente"
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Period"
-msgstr ""
+msgstr "Días por periodo"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -959,7 +959,7 @@ msgstr "Días para abrir"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show Time as"
-msgstr ""
+msgstr "Mostrar hora como"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -1342,7 +1342,7 @@ msgstr "Fecha escritura"
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of Recurrency"
-msgstr ""
+msgstr "Fin de recurrencia"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1392,6 +1392,12 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"El estado se establece a 'Para hacer' cuando se crea el caso.\n"
+"Si es caso está en marcha, el estado se establece a 'Abierto.\n"
+"Cuando la llamada se termina, el estado se establece en 'Realizada'.         "
+"                         \n"
+"Si la llamada está pendiente de ser realizada, entonces el estado se "
+"establece en 'Pendiente'."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1449,7 +1455,7 @@ msgstr "Oportunidades por categorías"
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_marketing_department
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "Departamento de ventas y marketing"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1900,7 +1906,7 @@ msgstr "Responder a"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select Stages for this Sales Team"
-msgstr ""
+msgstr "Seleccione etapas para este equipo de ventas"
 
 #. module: crm
 #: view:board.board:0
@@ -2015,7 +2021,7 @@ msgstr "Ubicación"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr ""
+msgstr "Transformación masiva de iniciativa a oportunidad"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2777,7 +2783,7 @@ msgstr "e-mail del contacto"
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred by"
-msgstr ""
+msgstr "Referido por"
 
 #. module: crm
 #: view:crm.lead:0 model:ir.model,name:crm.model_crm_add_note
@@ -3541,7 +3547,7 @@ msgstr "Nuevas oportunidades"
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "No se encontró dirección de e-mail para el contacto de su compañía"
 
 #. module: crm
 #: field:crm.lead.report,email:0
@@ -3561,7 +3567,7 @@ msgstr "Oportunidades por usuario y equipo"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "Cambiar a 'Para hacer'"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
@@ -3643,6 +3649,10 @@ msgid ""
 "partner. From the phone call form, you can trigger a request for another "
 "call, a meeting or an opportunity."
 msgstr ""
+"Esta herramienta permite registrar sus llamadas entrantes sobre la marcha. "
+"Cada llamada que recibe aparecerá en el formulario de la empresa para trazar "
+"cada contacto que tiene con una empresa. Desde el formulario de llamadas, "
+"puede lanzar una petición para otra llamada, una reunión u oportunidad."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3673,6 +3683,10 @@ msgid ""
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
 msgstr ""
+"Controle el origen de sus iniciativas y oportunidades de venta mediante la "
+"creación de canales específicos que se usarán en la creación de documentos "
+"en el sistema. Algunos ejemplos de canales son: Sitio web, llamada "
+"telefónica, distribuidores, ..."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
@@ -3740,7 +3754,7 @@ msgstr "Año"
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "¡Error! No puede crear miembros asociados recursivamente."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
diff --git a/addons/crm/i18n/es_AR.po b/addons/crm/i18n/es_AR.po
index 5cfa38acddd..6d169bf5d2c 100644
--- a/addons/crm/i18n/es_AR.po
+++ b/addons/crm/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/es_CR.po b/addons/crm/i18n/es_CR.po
index d4a599a743f..0a0a8003abf 100644
--- a/addons/crm/i18n/es_CR.po
+++ b/addons/crm/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: crm
diff --git a/addons/crm/i18n/es_EC.po b/addons/crm/i18n/es_EC.po
index a05a3e29d81..253432c4d52 100644
--- a/addons/crm/i18n/es_EC.po
+++ b/addons/crm/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/es_PY.po b/addons/crm/i18n/es_PY.po
index 416d532cc04..a67a893a876 100644
--- a/addons/crm/i18n/es_PY.po
+++ b/addons/crm/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/et.po b/addons/crm/i18n/et.po
index 25802b9a2a9..6522a62d5ee 100644
--- a/addons/crm/i18n/et.po
+++ b/addons/crm/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index 3ae63371b03..f2971a37bb9 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/fr.po b/addons/crm/i18n/fr.po
index b74c8c53f39..9c9dbd01393 100644
--- a/addons/crm/i18n/fr.po
+++ b/addons/crm/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2921,6 +2921,12 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"Les appels programmés liste tous les appels qui sont à faire par les équipes "
+"commerciales. Un commercial peut enregistrer les informations à propos d'un "
+"appel dans la vue formulaire. Ces informations seront stockées dans la fiche "
+"du partenaire pour enregistrer tous les contacts que vous avez avec un "
+"client. Vous pouvez également importer un fichier .CSV avec une liste des "
+"appels à effectuer par vos équipes commerciales."
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
diff --git a/addons/crm/i18n/gl.po b/addons/crm/i18n/gl.po
index 7e3d5d226d4..56154bfbcba 100644
--- a/addons/crm/i18n/gl.po
+++ b/addons/crm/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/gu.po b/addons/crm/i18n/gu.po
index 4c2f4784b89..5074dade74e 100644
--- a/addons/crm/i18n/gu.po
+++ b/addons/crm/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -26,7 +26,7 @@ msgstr ""
 #: view:crm.lead:0 selection:crm.lead,type:0 view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr ""
+msgstr "લીડ"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
@@ -46,12 +46,12 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Visibility"
-msgstr "દૃશ્યતા"
+msgstr "દૃશ્યમાનતા"
 
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr "શીર્ષક"
+msgstr "શિર્ષક"
 
 #. module: crm
 #: field:crm.meeting,show_as:0
@@ -82,7 +82,7 @@ msgstr " "
 #. module: crm
 #: view:crm.lead.report:0 field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "બંધ કરવા માં વિલંબ"
 
 #. module: crm
 #: view:crm.lead:0
@@ -151,7 +151,7 @@ msgstr ""
 #. module: crm
 #: view:crm.case.section:0
 msgid "Configuration"
-msgstr ""
+msgstr "રુપરેખાંકન"
 
 #. module: crm
 #: view:crm.case.resource.type:0 view:crm.lead:0 field:crm.lead,type_id:0
@@ -191,12 +191,12 @@ msgstr ""
 #: model:ir.model,name:crm.model_res_partner
 #: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
-msgstr ""
+msgstr "ભાગીદાર"
 
 #. module: crm
 #: field:crm.meeting,organizer:0 field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "આયોજક"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -239,12 +239,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
-msgstr ""
+msgstr "નવું ઇમેઇલ મોકલો"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr ""
+msgstr "માપદંડ"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -254,12 +254,12 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,section_ids:0
 msgid "Sections"
-msgstr ""
+msgstr "વિભાગ"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
-msgstr ""
+msgstr "ભેગું કરો (_M)"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -271,7 +271,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "સાર્વજનિક"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
@@ -285,19 +285,19 @@ msgstr ""
 #: field:crm.phonecall,state:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "State"
-msgstr ""
+msgstr "સ્થિતિ"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
 #: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Categories"
-msgstr ""
+msgstr "શ્રેણીઓ"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Dates"
-msgstr ""
+msgstr "તારીખો"
 
 #. module: crm
 #: help:crm.lead,optout:0
@@ -315,7 +315,7 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:735
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "કોઈ વિષય નથી"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
@@ -336,7 +336,7 @@ msgstr ""
 #: field:crm.phonecall,partner_contact:0
 #: field:crm.phonecall2phonecall,contact_name:0
 msgid "Contact"
-msgstr ""
+msgstr "સંપર્ક"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -346,7 +346,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "="
-msgstr ""
+msgstr "="
 
 #. module: crm
 #: field:base.action.rule,regex_history:0
@@ -382,17 +382,17 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication"
-msgstr ""
+msgstr "સંદેશાવ્યવહાર"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "મંગળવાર"
 
 #. module: crm
 #: field:crm.lead,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "અદ્યતન(અપડેટ) તારીખ"
 
 #. module: crm
 #: field:crm.case.section,user_id:0
@@ -420,7 +420,7 @@ msgstr ""
 #: field:crm.phonecall.report,categ_id:0
 #: field:crm.phonecall2phonecall,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "શ્રેણી"
 
 #. module: crm
 #: view:crm.lead:0
@@ -435,7 +435,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Privacy"
-msgstr ""
+msgstr "ગોપનીયતા"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_stage_form_installer
@@ -490,7 +490,7 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "August"
-msgstr ""
+msgstr "ઓગસ્ટ"
 
 #. module: crm
 #: code:addons/crm/crm.py:433 view:crm.lead:0 view:res.partner:0
@@ -506,24 +506,24 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr ""
+msgstr "કરવાનું"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "June"
-msgstr ""
+msgstr "જૂન"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Not Running"
-msgstr ""
+msgstr "ચાલી રહ્યુ નથી"
 
 #. module: crm
 #: field:crm.lead,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "ઈ-મેઇલ"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -535,7 +535,7 @@ msgstr ""
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "October"
-msgstr ""
+msgstr "ઓક્ટોબર"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -550,7 +550,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,name:0
 msgid "Summary"
-msgstr ""
+msgstr "સારાંશ"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -577,7 +577,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "અંતિમ તારીખ"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
@@ -615,7 +615,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "પ્રગતિમાં છે"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -643,7 +643,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0
 msgid "Details"
-msgstr ""
+msgstr "વિગતો"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index 2340d287655..fd5c67fb51d 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/hu.po b/addons/crm/i18n/hu.po
index bd06c62b8bf..5b03499b5d6 100644
--- a/addons/crm/i18n/hu.po
+++ b/addons/crm/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -285,7 +285,7 @@ msgstr "Kampányok"
 #: field:crm.phonecall,state:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Állapot"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -528,7 +528,7 @@ msgstr "E-mail"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phonecalls during last 7 days"
-msgstr ""
+msgstr "Telefonhívások az elmúlt 7 napban"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -951,7 +951,7 @@ msgstr "Találkozóim"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Todays's Phonecalls"
-msgstr ""
+msgstr "Mai telefonhívások"
 
 #. module: crm
 #: view:board.board:0
@@ -1082,7 +1082,7 @@ msgstr "Értékesítési osztály"
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "State of Mind"
-msgstr ""
+msgstr "Hozzáállás"
 
 #. module: crm
 #: field:crm.lead,type:0 field:crm.lead.report,type:0
@@ -1316,7 +1316,7 @@ msgstr ""
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr ""
+msgstr "Hívás ütemezése"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1384,7 +1384,7 @@ msgstr "Kiterjesztett szűrők…"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in closed state"
-msgstr ""
+msgstr "Lezárt állapotú telefonhívások"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -2118,7 +2118,7 @@ msgstr "Új partner létrehozása"
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Scheduled Calls"
-msgstr ""
+msgstr "Ütemezett hívások"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
@@ -2128,7 +2128,7 @@ msgstr "Kezdő dátum"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Scheduled Phonecalls"
-msgstr ""
+msgstr "Ütemezett telefonhívások"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3107,7 +3107,7 @@ 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 "Logged Calls"
-msgstr ""
+msgstr "Naplózott hívások"
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -3293,7 +3293,7 @@ msgstr "Zárás"
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "Hívás ütemezése"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -3823,3 +3823,6 @@ msgstr "Hírlevél"
 
 #~ msgid "CRM Application Configuration"
 #~ msgstr "CRM alkalmazások beállítása"
+
+#~ msgid "Schedule call"
+#~ msgstr "Hívás ütemezése"
diff --git a/addons/crm/i18n/id.po b/addons/crm/i18n/id.po
index f20c865c3ae..3fccfc5daff 100644
--- a/addons/crm/i18n/id.po
+++ b/addons/crm/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/it.po b/addons/crm/i18n/it.po
index bc7892e81e4..ddf1ce0d7b6 100644
--- a/addons/crm/i18n/it.po
+++ b/addons/crm/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-11 05:45+0000\n"
-"X-Generator: Launchpad (build 15780)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po
index da328c74334..5587661d489 100644
--- a/addons/crm/i18n/ja.po
+++ b/addons/crm/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/ko.po b/addons/crm/i18n/ko.po
index b860d5723c3..d130eb83f94 100644
--- a/addons/crm/i18n/ko.po
+++ b/addons/crm/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/lo.po b/addons/crm/i18n/lo.po
index 8b2166bf3c7..a0020d63e7b 100644
--- a/addons/crm/i18n/lo.po
+++ b/addons/crm/i18n/lo.po
@@ -8,25 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-01-17 11:18+0000\n"
+"PO-Revision-Date: 2012-08-20 19:07+0000\n"
 "Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr ""
+msgstr "ຮ່ອມຮອຍ"
 
 #. module: crm
 #: view:crm.lead:0 selection:crm.lead,type:0 view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr ""
+msgstr "ຮ່ອມຮອຍ"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
@@ -36,7 +36,7 @@ msgstr "ຕ້ອງການບໍລິການ"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Monthly"
-msgstr "ປາຈໍາເດືອນ"
+msgstr "ປາຈຳເດືອນ"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
@@ -61,7 +61,7 @@ msgstr "ໃຫ້ເຫັນເເບບນີ້້"
 #. module: crm
 #: field:crm.meeting,day:0 selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr "ວັນທີປະຈໍາເດືອນ"
+msgstr "ວັນທີປະຈຳເດືອນ"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -71,7 +71,7 @@ msgstr "ມື້ນີ້"
 #. module: crm
 #: view:crm.lead2opportunity.partner:0 view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr ""
+msgstr "ເລືອກໂອກາດ"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall2opportunity:0
@@ -87,7 +87,7 @@ msgstr "ເຍື້ອນໄປເພື່ອປິດ"
 #. module: crm
 #: view:crm.lead:0
 msgid "Previous Stage"
-msgstr "ຂັ້້ນກ່ອນ"
+msgstr "ຂັ້ນກ່ອນ"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:28
@@ -136,12 +136,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr "ປະຈໍາປີ"
+msgstr "ປະຈຳປີ"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr ""
+msgstr "ມື້ສ້າງ"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -151,7 +151,7 @@ msgstr "ຊື່ກົດການ"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Configuration"
-msgstr ""
+msgstr "ສ້ອມຕັ້ງ"
 
 #. module: crm
 #: view:crm.case.resource.type:0 view:crm.lead:0 field:crm.lead,type_id:0
@@ -163,12 +163,12 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "ຊອກຫາໂອກາດ"
 
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
 msgid "Expected closing month"
-msgstr ""
+msgstr "ເດອືນຖ້າຈະປິດ"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -244,7 +244,7 @@ msgstr "ສົ່ງອີເມລໃໝ່"
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr ""
+msgstr "ແນວເລືອກ"
 
 #. module: crm
 #: view:crm.segmentation:0
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index d227f7fc04f..173e4b80e54 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: lt\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/lv.po b/addons/crm/i18n/lv.po
index 1a443c3c9f3..d7c46451408 100644
--- a/addons/crm/i18n/lv.po
+++ b/addons/crm/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/mn.po b/addons/crm/i18n/mn.po
index 2bdbd4087af..b82412c0983 100644
--- a/addons/crm/i18n/mn.po
+++ b/addons/crm/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -627,7 +627,7 @@ msgstr ""
 #: code:addons/crm/crm_meeting.py:93
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr "Уулзалт  '%s'  батлагдсан байх."
+msgstr "'%s' уулзалт батлагдав."
 
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
@@ -2436,7 +2436,7 @@ msgstr "Хамгийн их завсар"
 #: selection:crm.lead.report,state:0 view:res.partner:0
 #, python-format
 msgid "Open"
-msgstr "Нээх"
+msgstr "Нээлттэй"
 
 #. module: crm
 #: field:crm.lead,city:0
diff --git a/addons/crm/i18n/nb.po b/addons/crm/i18n/nb.po
index 8fd92e37c2a..383ab540a67 100644
--- a/addons/crm/i18n/nb.po
+++ b/addons/crm/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -219,7 +219,7 @@ msgstr "Mul-ut"
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Recurrence termination"
-msgstr ""
+msgstr "Avslutning av gjentagelse"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:323
@@ -235,6 +235,9 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"Leads Analysis tillater deg å sjekke ulik CRM relatert informasjon. Sjekk "
+"for behandlingsforsinkelser, antall svar gitt og e-poster sendt. Du kan "
+"sortere analysen på forskjellige måterer for å få detaljert analyse."
 
 #. module: crm
 #: view:crm.lead:0
@@ -305,6 +308,8 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
+"Hvis opt-out er sjekket, har denne kontakten nektet å motta e-post eller "
+"avsluttet abonnementet på en kampanje."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -351,7 +356,7 @@ msgstr "="
 #. module: crm
 #: field:base.action.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "Vanlig uttrykk på sakshistorikken"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:274
@@ -411,6 +416,8 @@ msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
 msgstr ""
+"Denne skildrer normal/gjennomsnittlig sannsynlighet for at saken på dette "
+"stadiet kan bli en suksess"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0 view:crm.lead:0
@@ -447,6 +454,12 @@ msgid ""
 "Revenue\" and the \"Expected Closing Date.\" You should also have a look at "
 "the tooltip of the field \"Change Probability Automatically\"."
 msgstr ""
+"Stadier vil tillate selgere til enkelt å spore hvordan en bestemt anledning "
+"er plassert i salgssyklusen. For å effektivt håndtere salgskanalen, er det "
+"viktig å definere vilkår for å gå til neste trinn. Eksempel: for å sette en "
+"mulighet som \"kvalifisert\", må du angi \"forventet inntekt\" og "
+"\"forventet sluttdato.\" Du bør også ta en titt på verktøytipset på feltet "
+"\"Endre Sannsynlighetsregning automatisk\"."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -461,12 +474,12 @@ msgstr "Sted for arrangement"
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Gjentagelsesregel"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Normalt møte eller telefonmøte for anledningen"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -568,6 +581,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 ""
+"Standard sinnstilstand for perioden foregående 'Maksimum Intervall' "
+"beregning. Dette er startskuddet sinnstilstand som standard hvis partneren "
+"har noe tilfelle."
 
 #. module: crm
 #: field:crm.lead,partner_address_name:0
@@ -587,12 +603,12 @@ msgstr ""
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Feil: E-posten er ikke godt nok formatert"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
-msgstr ""
+msgstr "Profilerende alternativer"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -655,11 +671,13 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
+"Definerer en regel eller et repeterende mønster av tid til å utelukke "
+"gjentagelsesregelen."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Leads skjema"
 
 #. module: crm
 #: view:crm.segmentation:0 model:ir.model,name:crm.model_crm_segmentation
@@ -675,6 +693,11 @@ msgid ""
 "using the caldav interface.\n"
 "        "
 msgstr ""
+"Møtekalenderen deles mellom salgsteam og er fullt integrert med andre "
+"programmer for eksempel for de ansattes ferie eller forretningsavtaler. Du "
+"kan også synkronisere møter med mobiltelefonen ved hjelp av CalDAV-"
+"grensesnittet.\n"
+"        "
 
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
@@ -720,6 +743,11 @@ msgid ""
 "opportunities, you can assign the following stage to the team: Territory, "
 "Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost."
 msgstr ""
+"Definer salgsteam til å strukturere din salgsorganisasjon og tilordne "
+"brukere til hver gruppe. Du bør også definere salgsstadium til hver gruppe. "
+"Som et eksempel, hvis du bruker Solutions Salgsteknikker for å spore dine "
+"muligheter, kan du tilordne følgende stadium til teamet: territoriet, "
+"Kvalifiserte, kvalifiserte sponsorer, Forslag, Forhandlinger, Vunnet/Tapt."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:718 view:crm.lead:0 selection:crm.lead,type:0
@@ -772,7 +800,7 @@ msgstr "Pr. dag"
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr ""
+msgstr "Sett team til"
 
 #. module: crm
 #: view:calendar.attendee:0 field:calendar.attendee,categ_id:0
@@ -791,6 +819,8 @@ msgid ""
 "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
 "should better cancel it, instead of deleting it."
 msgstr ""
+"Du kan ikke slette lead '% s'; det må være i status 'Utkast' for å bli "
+"slettet. Du bør avbryte det i stedet for å slette det."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:451
@@ -840,6 +870,8 @@ msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
+"Denne egenskapen definerer listen over dato-/klokkeslettunntakene for en "
+"gjentagende kalenderkomponent."
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
@@ -849,12 +881,12 @@ msgstr "Konvertert til salgsmulighet "
 #. module: crm
 #: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+msgstr "Gjentagende møte"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "Ikke fordelte telefonsamtaler"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead2opportunity.partner,opportunity_ids:0
@@ -920,7 +952,7 @@ msgstr "Telefonsamtaler utført i år"
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dager til åpning"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1006,6 +1038,8 @@ msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
 msgstr ""
+"Hvis det aktive feltet er satt til sant, vil det tillate deg å skjule "
+"hendelsesalarm informasjon uten å fjerne den."
 
 #. module: crm
 #: view:crm.lead:0
@@ -1076,7 +1110,7 @@ msgstr "Vunnet"
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Passert frist"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
@@ -1129,7 +1163,7 @@ msgstr "År for samtale"
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "Tilbakevendende ID"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:res.partner:0
@@ -1175,12 +1209,12 @@ msgstr "Logg samtalen"
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "La arrangementet automatisk gjenta ved det intervallet"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition Case Fields"
-msgstr ""
+msgstr "Tilstand Sak Felter."
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1209,6 +1243,8 @@ msgid ""
 "Create specific phone call categories to better define the type of calls "
 "tracked in the system."
 msgstr ""
+"Lag spesifikke telefonsamtalekategorier for å definere typen samtaler som "
+"spores i systemet."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1228,6 +1264,7 @@ msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
 msgstr ""
+"Å sette dette stadiet vil endre sannsynligheten automatiskt på muligheten."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
@@ -1267,6 +1304,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
 msgstr ""
+"Dersom det aktive feltet er satt til sant, vil det tillate deg å skjule "
+"salgsteamet uten å fjerne det."
 
 #. module: crm
 #: field:crm.lead,street2:0
@@ -1279,6 +1318,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"Hvis du krysser av dette feltet, vil stadiet bli foreslått som standard på "
+"hvert salgsteam. Det vil ikke tildele dette stadiet til eksisterende team."
 
 #. module: crm
 #: field:crm.meeting,fr:0
@@ -1348,6 +1389,10 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"Statusen blir satt til 'Å gjøre' når en sak er opprettet.\n"
+"Hvis saken er i progresjon er statusen satt til 'Åpen'.\n"
+"Når samtalen er over settes statusen til 'Hold'.\n"
+"Hvis samtalen er nødt til å bli ferdig er statusen satt til 'Ikke Hold'."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1439,7 +1484,7 @@ msgstr "Planlegg et møte"
 #: code:addons/crm/crm_lead.py:431
 #, python-format
 msgid "Merged opportunities"
-msgstr ""
+msgstr "Sammenslåtte muligheter"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer
@@ -1453,6 +1498,9 @@ msgid ""
 "better manage your interactions with them. The segmentation tool is able to "
 "assign categories to partners according to criteria you set."
 msgstr ""
+"Lag konkrete samarbeidskategorier som du kan tilordne til dine partnere for "
+"å bedre administrere ditt samspill med dem. Segmenteringsverktøyet er i "
+"stand til å tildele kategorier til partnere i henhold til kriterier du angir."
 
 #. module: crm
 #: field:crm.case.section,code:0
@@ -1462,7 +1510,7 @@ msgstr "Kode"
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "Underordnet team"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1529,7 +1577,7 @@ msgstr "E-post"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "Telefonsamtalekategorier"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1547,11 +1595,13 @@ msgid ""
 "The name of the future partner that will be created while converting the "
 "lead into opportunity"
 msgstr ""
+"Navnet på fremtidig partner som vil bli dannet ved konvertering av lead til "
+"mulighet"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "Feil! Du kan ikke knytte salgsteam i uendelig struktur."
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
@@ -1578,7 +1628,7 @@ msgstr "Salgssum"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "Velg dag for å repetere møtet"
 
 #. module: crm
 #: selection:crm.meeting,state:0
@@ -1594,6 +1644,11 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
+"Muligheter Analyse gir deg en umiddelbar tilgang til dine muligheter med "
+"informasjon som forventet inntekt, planlagte kostnader, tapte tidsfrister "
+"eller antall interaksjoner per mulighet. Denne rapporten er i hovedsak brukt "
+"av salgssjef for å gjøre det periodiske gjennomgang med de lagene av "
+"salgspipeline."
 
 #. module: crm
 #: field:crm.case.categ,name:0 field:crm.lead,name:0
@@ -1613,6 +1668,9 @@ msgid ""
 "organise their sales pipeline. Stages will allow them to easily track how a "
 "specific lead or opportunity is positioned in the sales cycle."
 msgstr ""
+"Legg bestemte stadier til potensielle kunder og muligheter slik at salget "
+"til bedre organisere sin salgspipeline. Stadier vil tillate dem å enkelt "
+"spore hvordan en bestemt bly eller mulighet er plassert i salgsperioden."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
@@ -1632,7 +1690,7 @@ msgstr "Fødselsdato"
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "Den"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -1668,6 +1726,9 @@ msgid ""
 "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
 "users, but also external parties, such as a customer."
 msgstr ""
+"Med møteinvitasjoner kan du opprette og administrere møteinvitasjoner "
+"sendt/sendes til dine kolleger/samarbeidspartnere. Du kan ikke bare invitere "
+"OpenERP brukere, men også eksterne parter, for eksempel en kunde."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1687,7 +1748,7 @@ msgstr "Leads/muligheter som er i utført status"
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Forsinkelse til lukking"
 
 #. module: crm
 #: field:crm.meeting,we:0
@@ -1703,7 +1764,7 @@ msgstr "Mulig forhandler"
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the saleman with the team leader."
-msgstr ""
+msgstr "Når eskalere til dette laget overstyre saleman med lagleder."
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
@@ -1719,7 +1780,7 @@ msgstr "Grupper etter..."
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
-msgstr ""
+msgstr "Valgfritt knyttet partner, vanligvis etter konvertering fra lead"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1809,7 +1870,7 @@ msgstr "Verdi"
 #. module: crm
 #: help:crm.lead,type:0 help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "Type brukes for å skille leads og muligheter"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0
@@ -1854,7 +1915,7 @@ msgstr "Lead / kunde"
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "Prospektet konverterer til forretningspartner"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
@@ -1939,7 +2000,7 @@ msgstr "Use The Sales Purchase Rules"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr ""
+msgstr "Føre til muligheter partner"
 
 #. module: crm
 #: field:crm.lead,location_id:0 field:crm.meeting,location:0
@@ -1959,7 +2020,7 @@ msgstr "Svar"
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "Planlegg et normalt møte eller et telefonmøte"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
@@ -1973,6 +2034,7 @@ msgid ""
 "Create different meeting categories to better organize and classify your "
 "meetings."
 msgstr ""
+"Lag ulike møtekategorier for å bedre organisere og klassifisere dine møter."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -1987,12 +2049,12 @@ msgstr "Planlagt dato"
 #. module: crm
 #: field:crm.meeting,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "CalDAV URL"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "Forventede inntekter"
 
 #. module: crm
 #: field:crm.lead,contact_name:0
@@ -2002,19 +2064,21 @@ msgstr "Kontaktnavn"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads creating during last 7 days"
-msgstr ""
+msgstr "Leads skapt i løpet av de siste 7 dagene"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
 msgstr ""
+"Er du sikker på at du vil lage en samarbeidspartner basert på denne "
+"telefonsamtalen?"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "July"
-msgstr ""
+msgstr "juli"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -2025,28 +2089,33 @@ msgid ""
 "The opportunities and sales order displayed, will automatically be filtered "
 "according to his team."
 msgstr ""
+"Definer et salgsteam til å organisere dine forskjellige selgere eller "
+"salgsavdelinger i separate lag. Hvert lag skal jobbe i sin egen liste over "
+"muligheter, salgsordrer, osv. Hver bruker kan angi et standardteam i sine "
+"brukerinnstillinger. De mulighetene og salgsordrene som vises, vil "
+"automatisk bli filtrert i henhold til sitt team."
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "Vis bare lead"
 
 #. module: crm
 #: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "Gjenta x ganger"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr ""
+msgstr "Salgsteam"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "Lead til partner"
 
 #. module: crm
 #: view:crm.segmentation:0 field:crm.segmentation.line,segmentation_id:0
@@ -2057,12 +2126,12 @@ msgstr "Segmentering"
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Team"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr ""
+msgstr "Leads/muligheter som er i stadium Ny"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
@@ -2078,13 +2147,13 @@ msgstr "Sannsynlighet"
 #. module: crm
 #: view:crm.lead:0
 msgid "Pending Opportunities"
-msgstr ""
+msgstr "Ventende Muligheter"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Please select more than one opportunity from the list view."
-msgstr ""
+msgstr "Vær vennlig å velg mer enn en mulighet fra listen"
 
 #. module: crm
 #: view:crm.lead.report:0 field:crm.meeting,month_list:0
@@ -2098,7 +2167,7 @@ msgstr "Måned"
 #: model:ir.ui.menu,name:crm.menu_crm_case_categ0_act_leads
 #: model:process.node,name:crm.process_node_leads0
 msgid "Leads"
-msgstr ""
+msgstr "Leads"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2126,17 +2195,17 @@ msgstr "Opprett en ny partner"
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Scheduled Calls"
-msgstr ""
+msgstr "Planlagte samtaler"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Startdato"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Scheduled Phonecalls"
-msgstr ""
+msgstr "Planlagte telefonsamtaler"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2146,12 +2215,13 @@ msgstr "Avslå"
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "E-post for bruker"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
 msgstr ""
+"Hvis opt-in er krysset av, har denne kontakten akseptert å motta e-poster."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2187,7 +2257,7 @@ msgstr "Lukket"
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr ""
+msgstr "Total av planlagt inntekt"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2197,7 +2267,7 @@ msgstr "Åpne muligheter"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "Internt møte"
 
 #. module: crm
 #: code:addons/crm/crm.py:454 selection:crm.add.note,state:0 view:crm.lead:0
@@ -2215,7 +2285,7 @@ msgstr "Kundemøte"
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "Global CC"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2228,7 +2298,7 @@ msgstr "Telefonsamtaler"
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Search"
-msgstr ""
+msgstr "Scenen Søk"
 
 #. module: crm
 #: help:crm.lead.report,delay_open:0 help:crm.phonecall.report,delay_open:0
@@ -2257,7 +2327,7 @@ msgstr "Aktiv"
 #: code:addons/crm/crm_lead.py:856
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr ""
+msgstr "Stadium for mulighet '%s' er endret til '%s'."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -2282,7 +2352,7 @@ msgstr "Usikker"
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages."
-msgstr ""
+msgstr "Brukt til å ordne nivåer"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:276
@@ -2306,7 +2376,7 @@ msgstr "Minske (0>1)"
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
 msgid "Exp. Closing Day"
-msgstr ""
+msgstr "Forvenet sluttdag"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
@@ -2323,7 +2393,7 @@ msgstr "Ukentlig"
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
 #: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
 msgid "Opportunities Analysis"
-msgstr ""
+msgstr "Analyse av muligheter"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2333,7 +2403,7 @@ msgstr "Div."
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_crm
 msgid "Sales"
-msgstr ""
+msgstr "Salg"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
@@ -2342,11 +2412,13 @@ msgid ""
 "You can not escalate, you are already at the top level regarding your sales-"
 "team category."
 msgstr ""
+"Du kan ikke eskalere, du er allerede på øverste nivå når det gjelder din "
+"salgs-team kategori."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8 view:crm.meeting:0
 msgid "Other"
-msgstr ""
+msgstr "Andre"
 
 #. module: crm
 #: view:crm.meeting:0 selection:crm.meeting,state:0
@@ -2356,7 +2428,7 @@ msgstr "Ferdig"
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "Gjenta hver (Dag/Uke/Måned/År)"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2373,42 +2445,42 @@ msgstr "Åpne"
 #. module: crm
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "By"
 
 #. module: crm
 #: view:crm.lead:0 view:res.partner:0
 msgid "History"
-msgstr "historikk"
+msgstr "Historikk"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Busy"
-msgstr ""
+msgstr "Opptatt"
 
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
-msgstr ""
+msgstr "Dato for opprettelse"
 
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "Gjenta hvert"
 
 #. module: crm
 #: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "Gjentagende"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in last month"
-msgstr ""
+msgstr "Telefonsamtaler utført forrige måned"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr ""
+msgstr "Mine åpne muligheter"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
@@ -2418,12 +2490,12 @@ msgstr "Maksimal kommunikasjonshistorikk"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr ""
+msgstr "Inviter folk"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "Møtetype"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2436,6 +2508,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"Statusen er satt til 'Utkast', når en sak er opprettet.\n"
+"Hvis saken er under progresjon er statusen satt til 'Åpen'.\n"
+"Når saken er over, er statusen satt til 'Ferdig'.\n"
+"Hvis saken må bli sett igjennom er statusen satt til 'Avventer'."
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
@@ -2445,7 +2521,7 @@ msgstr "Sluttdato"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Tredje"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2459,7 +2535,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Opportunities"
-msgstr ""
+msgstr "Ikke fordelte muligheter"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2469,18 +2545,18 @@ msgstr "# e-post"
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "Søk leads"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Forsinkelse før åpning"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "Gjentagelsesperiode"
 
 #. module: crm
 #: field:crm.meeting,week_list:0
@@ -2490,7 +2566,7 @@ msgstr "Ukedag"
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "Referent"
 
 #. module: crm
 #: field:crm.lead,id:0 field:crm.meeting,id:0 field:crm.phonecall,id:0
@@ -2503,11 +2579,13 @@ msgid ""
 "From which campaign (seminar, marketing campaign, mass mailing, ...) did "
 "this contact come from?"
 msgstr ""
+"Fra hvilken kampanje (seminar, markedsføringskampanje, masseutsendelse, ...) "
+"kom denne kontakten kommer fra?"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Deltagerinformasjon"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2517,7 +2595,7 @@ msgstr "Segmenteringstest"
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "Brukernavn"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2527,23 +2605,23 @@ msgstr "Fortsett prosess"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current year"
-msgstr ""
+msgstr "Leads/muligheter laget i inneværende år"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "Telefonsamtale til partner"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Tildel til"
 
 #. module: crm
 #: field:crm.add.note,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "Sett ny status til"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0 field:crm.meeting,date_action_last:0
@@ -2560,17 +2638,17 @@ msgstr "Varighet"
 #. module: crm
 #: view:crm.lead:0
 msgid "Show countries"
-msgstr ""
+msgstr "Vis land"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Salesman"
-msgstr ""
+msgstr "Velg selger"
 
 #. module: crm
 #: view:board.board:0
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Salgskonsoll"
 
 #. module: crm
 #: field:crm.lead.report,nbr:0 field:crm.phonecall.report,nbr:0
@@ -2580,7 +2658,7 @@ msgstr "# Saker"
 #. module: crm
 #: help:crm.meeting,section_id:0 help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "Salgsteamet saken tilhører."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -2590,12 +2668,12 @@ msgstr "Søndag"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "Fjerde"
 
 #. module: crm
 #: selection:crm.add.note,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Uforandret"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
@@ -2611,12 +2689,12 @@ msgstr "Fax"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current month"
-msgstr ""
+msgstr "Leads/muligheter laget i inneværende måned"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "Tildelt"
 
 #. module: crm
 #: field:crm.lead,company_id:0 view:crm.lead.report:0
@@ -2628,7 +2706,7 @@ msgstr "Firma"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "Fredag"
 
 #. module: crm
 #: field:crm.meeting,allday:0
@@ -2643,12 +2721,12 @@ msgstr "Obligatorisk / valgfri"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr ""
+msgstr "Ikke fordelte leads"
 
 #. module: crm
 #: field:crm.lead,subjects:0
 msgid "Subject of Email"
-msgstr ""
+msgstr "Emne på e-post"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
@@ -2661,7 +2739,7 @@ msgstr "Møteinvitasjoner"
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Todo"
-msgstr ""
+msgstr "Å gjøre"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
@@ -2671,7 +2749,7 @@ msgstr "Objektnavn"
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr ""
+msgstr "E-postadresse til kontakt"
 
 #. module: crm
 #: field:crm.lead,referred:0
@@ -2681,13 +2759,13 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0 model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Legg til internt notat"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:853
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr ""
+msgstr "Stadium for lead '%s' er endret til '%s'."
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -2703,7 +2781,7 @@ msgstr "Meldinger"
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr ""
+msgstr "Kommunikasjonskanal (e-post, direkte, telefon, ...)"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
@@ -2726,7 +2804,7 @@ msgstr "Avbrutt"
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr ""
+msgstr "Notat"
 
 #. module: crm
 #: view:board.board:0
@@ -2752,12 +2830,12 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Fargeindeks"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "Lenker"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2767,6 +2845,10 @@ msgid ""
 "instance reflect your product structure or the different types of sales you "
 "do."
 msgstr ""
+"Lag spesifikke kategorier som passer bedriftens aktiviteter for å bedre "
+"klassifisere og analysere dine potensielle kunder og muligheter. Slike "
+"kategorier kan for eksempel reflektere produktets struktur eller ulike typer "
+"salg du gjør."
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -2774,6 +2856,8 @@ msgid ""
 "If the partner has not purchased (or bought) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
 msgstr ""
+"Hvis samarbeidspartneren ikke har kjøpt i en periode, reduseres "
+"sinnstilstand med denne faktoren. Det er multiplikasjon"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2783,11 +2867,15 @@ msgid ""
 "several criteria and drill down the information, by adding more groups in "
 "the report."
 msgstr ""
+"Ut fra denne rapporten kan du analysere resultatene av salgsteamet, basert "
+"på deres telefonsamtaler. Du kan gruppere eller filtrere informasjon i "
+"henhold til flere kriterier og bore ned informasjon, ved å legge flere "
+"grupper i rapporten."
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "Antall e-poster"
 
 #. module: crm
 #: field:crm.phonecall,name:0 view:res.partner:0
@@ -2797,7 +2885,7 @@ msgstr "Samtalesammendrag"
 #. module: crm
 #: view:crm.lead:0
 msgid "Todays' Leads"
-msgstr ""
+msgstr "Dagens leads"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -2817,13 +2905,13 @@ msgstr "Operatør"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "Telefonsamtale til telefonsamtale"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "Planlegg/logg samtale"
 
 #. module: crm
 #: selection:crm.meeting,state:0
@@ -2833,7 +2921,7 @@ msgstr "Bekreftet"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
-msgstr ""
+msgstr "Planlagt inntekt pr. bruker og stadium"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2843,7 +2931,7 @@ msgstr "Bekreft"
 #. module: crm
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr ""
+msgstr "Søn"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -2858,12 +2946,12 @@ msgstr "Valgfritt uttrykk"
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "Dag i måneden"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor_stage
 msgid "Planned Revenue By Stage"
-msgstr ""
+msgstr "Planlagt inntekt pr. stadium"
 
 #. module: crm
 #: selection:crm.add.note,state:0 model:crm.case.stage,name:crm.stage_lead1
@@ -2887,7 +2975,7 @@ msgstr "Kanal"
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.meeting:0
 #: view:crm.phonecall:0 view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Mine salgsteam"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2897,34 +2985,38 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"Sjekk om kategorien er begrenset til partnere som svarer til grupperingens "
+"kriterier.\n"
+"Hvis sjekket, fjern kategorien fra partnere som ikke svarer til "
+"grupperingens kriterier"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Unntak dato/tider"
 
 #. module: crm
 #: help:crm.meeting,date_deadline:0
 msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
-msgstr ""
+msgstr "Tidsfrist er automatisk beregnet fra Startdato + Varighet"
 
 #. module: crm
 #: field:crm.lead,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Stat (USA)"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "Opprette forretningsmuligheter fra Leads"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM Dashboard"
-msgstr ""
+msgstr "CRM Dashboard"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
@@ -2934,17 +3026,17 @@ msgstr "Trenger informasjon"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr ""
+msgstr "Prospekt salgsmulighet"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr ""
+msgstr "Sett kategori til"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr ""
+msgstr "E-post til"
 
 #. module: crm
 #: field:crm.meeting,th:0
@@ -2966,7 +3058,7 @@ msgstr "Daglig"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_stage_form_installer
 msgid "Review Sales Stages"
-msgstr ""
+msgstr "Gjennomgå salgstadier"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
@@ -2976,13 +3068,13 @@ msgstr "Kvalifikasjon"
 #. module: crm
 #: field:crm.lead,partner_address_email:0
 msgid "Partner Contact Email"
-msgstr ""
+msgstr "Partners kontakt e-post"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:48
 #, python-format
 msgid "A partner is already defined."
-msgstr ""
+msgstr "En samarbeidspartner er allerede definert"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -2992,7 +3084,7 @@ msgstr "Første"
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
 msgid "Exp. Closing Month"
-msgstr ""
+msgstr "Forventet måned for lukking"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3009,7 +3101,7 @@ msgstr "Vilkår for kommunikasjonslogg"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Date of Call"
-msgstr ""
+msgstr "Dato for samtale"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3026,7 +3118,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Tidssone"
 
 #. module: crm
 #: field:crm.meeting,sa:0
@@ -3042,12 +3134,12 @@ msgstr "Selger"
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "Forventet lukking"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "Mulighet for telefonsamtale"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
@@ -3057,12 +3149,12 @@ msgstr "Tillater å slette saker som ikke er utkast"
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Repeat"
-msgstr ""
+msgstr "Gjenta"
 
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr ""
+msgstr "Forventet år for lukking"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3072,7 +3164,7 @@ msgstr "Partnernavn"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
 msgid "Outbound"
-msgstr ""
+msgstr "Utgående"
 
 #. module: crm
 #: field:crm.lead,date_open:0 field:crm.phonecall,date_open:0
@@ -3082,7 +3174,7 @@ msgstr "Åpnet"
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr ""
+msgstr "Gruppemedlemmer"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:crm.phonecall:0
@@ -3092,12 +3184,12 @@ msgstr "Kontakter"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "Interesse i data"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Invitasjonsdetaljer"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
@@ -3111,18 +3203,20 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Disse e-postadressene vil bli lagt til kopi-feltet for alle inngående og "
+"utgående e-poster før de sendes. Skill flere e-postadresser med komma."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Logged Calls"
-msgstr ""
+msgstr "Loggede samtaler"
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "Sannsynlighet for suksess"
 
 #. module: crm
 #: code:addons/crm/crm.py:466 selection:crm.lead.report,state:0
@@ -3134,12 +3228,12 @@ msgstr "Utkast"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "Hendelser pr. salgsteam"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "Deltakere"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall:0
@@ -3152,7 +3246,7 @@ msgstr "Møte"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "Kategori for hendelse"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -3162,7 +3256,7 @@ msgstr "7 dager"
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr ""
+msgstr "Planlagte inntekter pr. stadium og bruker"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3180,7 +3274,7 @@ msgstr "Normal"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
 #, python-format
 msgid "Closed/Cancelled Leads can not be converted into Opportunity"
-msgstr ""
+msgstr "Lukkede/annullerte Leads kan ikke bli konvertert til en mulighet"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
@@ -3191,12 +3285,12 @@ msgstr "Møtekategorier"
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "Du må kanskje bekrefte at denne partneren ikke allerede finnes."
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Forsinkelse før åpning"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0 field:crm.phonecall.report,user_id:0
@@ -3207,20 +3301,20 @@ msgstr "Bruker"
 #: code:addons/crm/crm.py:446
 #, python-format
 msgid "The case '%s' has been cancelled."
-msgstr ""
+msgstr "Saken '%s' har blitt annullert."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "Muligheter pr. stadium"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3237,18 +3331,18 @@ msgstr "Kontrakt"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
 msgid "Twitter Ads"
-msgstr ""
+msgstr "Twitter-annonser"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:336
 #, python-format
 msgid "The opportunity '%s' has been been won."
-msgstr ""
+msgstr "Anledningen '%s' er vunnet"
 
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "Felles for alle team"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:831 code:addons/crm/wizard/crm_add_note.py:28
@@ -3264,17 +3358,17 @@ msgstr "Planlagt omsetning"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "Trenger rådgivning"
 
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "Feil! Du kan ikke lage profiler i uendelig struktur."
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
 msgid "Expected closing year"
-msgstr ""
+msgstr "Forventet sluttår"
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0 field:crm.meeting,partner_address_id:0
@@ -3285,7 +3379,7 @@ msgstr "Partnerkontakt"
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Gjentagende ID dato"
 
 #. module: crm
 #: sql_constraint:res.users:0
@@ -3302,7 +3396,7 @@ msgstr "Lukk"
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "Planlegg en samtale"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -3312,17 +3406,17 @@ msgstr "Kategorisering"
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "Logg samtale"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Handlingsregler"
 
 #. module: crm
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Gjentagende"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
@@ -3342,17 +3436,17 @@ msgstr "Til"
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "Opprettet dato"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "Privat"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "Offentlig for ansatte"
 
 #. module: crm
 #: field:crm.lead,function:0
@@ -3362,7 +3456,7 @@ msgstr "Funksjon"
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "_Legg til"
 
 #. module: crm
 #: field:crm.case.section,note:0 view:crm.meeting:0
@@ -3374,7 +3468,7 @@ msgstr "Beskrivelse"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current month"
-msgstr ""
+msgstr "Telefonsamtaler gjort i inneværende måned"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3386,18 +3480,18 @@ msgstr "Mai"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "Interesse i tilbehør"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "Nye muligheter"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "Ingen e-post funnet for adressen til selskapet ditt!"
 
 #. module: crm
 #: field:crm.lead.report,email:0
@@ -3412,22 +3506,22 @@ msgstr "Gate"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr ""
+msgstr "Muligheter pr.  bruker og team"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "Tilbakestill til Å gjøre"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Arbeidstid"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "Telefonsamtaler"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,is_customer_add:0
@@ -3469,7 +3563,7 @@ msgstr "Tapt"
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit"
-msgstr ""
+msgstr "Endre"
 
 #. module: crm
 #: field:crm.lead,country_id:0 view:crm.lead.report:0
@@ -3484,7 +3578,7 @@ msgstr "Land"
 #: selection:crm.lead2opportunity.partner.mass,name:0 view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Konverter til salgsmulighet"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -3499,6 +3593,10 @@ msgid ""
 "partner. From the phone call form, you can trigger a request for another "
 "call, a meeting or an opportunity."
 msgstr ""
+"Dette verktøyet lar deg logge av alle innkommende samtaler på sparket. Hver "
+"samtale du får vises på samarbeidspartnerskjemaet for å spore hver kontakt "
+"du har med en partner. Fra telefonsamtale skjemaet, kan du utløse en "
+"anmodning om en annen samtale, et møte eller en mulighet."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3510,17 +3608,17 @@ msgstr "April"
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "Kampanjenavn"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
-msgstr ""
+msgstr "Profilering"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "Telefonsamtaler pr. bruker og seksjon"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_channel_action
@@ -3529,6 +3627,9 @@ msgid ""
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
 msgstr ""
+"Spor fra hvor dine potensielle kunder kommer ved å opprette spesielle "
+"kanaler som vil bli oppdatert ved opprettelse av dokumenter i systemet. Noen "
+"eksempler på kanaler kan være: nettside, telefonsamtale, forhandler, etc."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
@@ -3539,7 +3640,7 @@ msgstr "Slå sammen med eksisterende salgsmulighet"
 #. module: crm
 #: field:crm.meeting,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Valg"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
@@ -3549,7 +3650,7 @@ msgstr "Forhandling"
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
-msgstr ""
+msgstr "Forventet lukking"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0 field:crm.meeting,sequence:0
@@ -3559,12 +3660,12 @@ msgstr "Sekvens"
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Veiviser for opprettelse av e-post"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr ""
+msgstr "Godta"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -3579,29 +3680,29 @@ msgstr "Sekund"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "Proposition"
-msgstr ""
+msgstr "Preposisjon"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Lukkingsdato"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Feil! Du kan ikke lage uendelig struktur av assosierte medlemmer."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "Nyhetsbrev"
 
 #, python-format
 #~ msgid "Warning!"
@@ -4067,3 +4168,15 @@ msgstr ""
 
 #~ msgid "Schedule/Log a call"
 #~ msgstr "Planlegg/logg en samtale"
+
+#~ msgid "Select stages for this Sales Team"
+#~ msgstr "Velg nivå for dette salgsteamet"
+
+#~ msgid "Referred By"
+#~ msgstr "Henvist av"
+
+#~ msgid "Assigned opportunities to"
+#~ msgstr "Tildelte muligheter til"
+
+#~ msgid "End of recurrency"
+#~ msgstr "Slutt på gjentagelse"
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index b89ce3c905f..c79dbf1875c 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-06-01 08:42+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:58+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -465,7 +465,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr "Prospectanalyse"
+msgstr "Prospect analyse"
 
 #. module: crm
 #: help:crm.meeting,location:0
@@ -654,7 +654,7 @@ msgstr "Aanmaak maand"
 #: field:crm.case.section,resource_calendar_id:0
 #: model:ir.ui.menu,name:crm.menu_action_resource_calendar_form
 msgid "Working Time"
-msgstr "Gewerkte tijd"
+msgstr "Werktijd"
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -696,8 +696,8 @@ msgid ""
 msgstr ""
 "De afsprakenagenda wordt gedeeld tussen verkoppteams en is volledig "
 "geïntegreerd met andere toepassingen zoals vakantiedagen en prospects. U "
-"kunt afspraken ook synchroniseren met uw mobiele telefoon via het caldav "
-"interface.\n"
+"kunt afspraken ook synchroniseren met uw mobiele telefoon via een caldav "
+"koppeling.\n"
 "        "
 
 #. module: crm
@@ -879,7 +879,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr "Converteer naar prospect "
+msgstr "Converteren naar prospect "
 
 #. module: crm
 #: help:crm.meeting,recurrency:0
@@ -1222,7 +1222,7 @@ msgstr "Conditie dossier velden"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr "Telefoongesprekken in de staat 'lopend'"
+msgstr "Telefoongesprekken met de status 'in behandeling'"
 
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,stage_ids:0
@@ -1274,7 +1274,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr "Telefoongesprek Analyse"
+msgstr "Telefoongesprek analyse"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
@@ -1295,7 +1295,7 @@ msgstr "Kanaalnaam"
 #. module: crm
 #: field:crm.partner2opportunity,name:0 field:crm.phonecall2opportunity,name:0
 msgid "Opportunity Name"
-msgstr "Naam verkoopkans"
+msgstr "Naam prospect"
 
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
@@ -1680,7 +1680,7 @@ msgid ""
 msgstr ""
 "Specifieke fases toevoegen aan leads en prospects waarmee uw verkoop de "
 "pijplijn beter kan organiseren. Fases geven de mogelijkheid om beter inzicht "
-"te krijgen in waar een prospect zich bevindt in de verkoopproces."
+"te krijgen in waar een prospect zich bevindt in het verkoopproces."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
@@ -1932,7 +1932,7 @@ msgstr "Prospect word omgezet naar relatie"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert To Opportunity"
-msgstr "Converteer naar prospect"
+msgstr "Converteren naar prospect"
 
 #. module: crm
 #: view:crm.case.channel:0
@@ -3188,7 +3188,7 @@ msgstr "Verwachte sluiting"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr "Verkoopkans naar Telefoongesprek"
+msgstr "Prospect naar Telefoongesprek"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
diff --git a/addons/crm/i18n/nl_BE.po b/addons/crm/i18n/nl_BE.po
index 3380a752fa6..ee762be11c7 100644
--- a/addons/crm/i18n/nl_BE.po
+++ b/addons/crm/i18n/nl_BE.po
@@ -1,178 +1,179 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* crm
-#
+# * crm
+# Els Van Vossel <evv@agaplan.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2009-04-10 09:40+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2012-10-02 07:29+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
+"Language-Team: Els Van Vossel\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+"Language: nl\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr ""
+msgstr "# Leads"
 
 #. module: crm
 #: view:crm.lead:0 selection:crm.lead,type:0 view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr ""
+msgstr "Lead"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Need Services"
-msgstr ""
+msgstr "Heeft diensten nodig"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Monthly"
-msgstr ""
+msgstr "Maandelijks"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "Fase van zaak"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Visibility"
-msgstr ""
+msgstr "Zichtbaarheid"
 
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr ""
+msgstr "Titel"
 
 #. module: crm
 #: field:crm.meeting,show_as:0
 msgid "Show as"
-msgstr ""
+msgstr "Weergeven als"
 
 #. module: crm
 #: field:crm.meeting,day:0 selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr ""
+msgstr "Dag van de maand"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Today"
-msgstr ""
+msgstr "Vandaag"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0 view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr ""
+msgstr "Opportuniteiten kiezen"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall2opportunity:0
 #: view:crm.phonecall2phonecall:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: crm
 #: view:crm.lead.report:0 field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Dagen tot afsluiten"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Previous Stage"
-msgstr ""
+msgstr "Vorige fase"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:28
 #, python-format
 msgid "Can not add note!"
-msgstr ""
+msgstr "Kan geen notitie toevoegen"
 
 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Fasenaam"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Analysis"
-msgstr ""
+msgstr "Analyse CRM Leads"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 #. module: crm
 #: sql_constraint:crm.case.section:0
 msgid "The code of the sales team must be unique !"
-msgstr ""
+msgstr "De code van het verkoopteam moet uniek zijn"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:553
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
-msgstr ""
+msgstr "Lead '%s' is omgezet naar een opportuniteit."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:294
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr ""
+msgstr "Lead '%s' is gesloten."
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Exp. Closing"
-msgstr ""
+msgstr "Verw. sluiting"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr ""
+msgstr "Jaarlijks"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr ""
+msgstr "Creatiedatum"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Regelnaam"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Configuration"
-msgstr ""
+msgstr "Instellingen"
 
 #. module: crm
 #: view:crm.case.resource.type:0 view:crm.lead:0 field:crm.lead,type_id:0
 #: view:crm.lead.report:0 field:crm.lead.report,type_id:0
 #: model:ir.model,name:crm.model_crm_case_resource_type
 msgid "Campaign"
-msgstr ""
+msgstr "Campagne"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "Opportuniteiten zoeken"
 
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
 msgid "Expected closing month"
-msgstr ""
+msgstr "Verwachte afsluitmaand"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assigned Opportunities to"
-msgstr ""
+msgstr "Opportuniteiten toegewezen aan"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_id:0 view:crm.lead.report:0
@@ -190,41 +191,41 @@ msgstr ""
 #: model:ir.model,name:crm.model_res_partner
 #: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #. module: crm
 #: field:crm.meeting,organizer:0 field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "Organisator"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 msgid "Schedule Other Call"
-msgstr ""
+msgstr "Nog een gesprek plannen"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:216
 #: model:crm.case.categ,name:crm.categ_meet3 view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
-msgstr ""
+msgstr "Telefoongesprek"
 
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Uitschrijven"
 
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Recurrence termination"
-msgstr ""
+msgstr "Einde recurrentie"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:323
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
-msgstr ""
+msgstr "Opportuniteit '%s' is als verloren ingesteld."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -234,49 +235,52 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"Met de leadsanalyse kunt u CRM-informatie opvolgen, zoals de "
+"behandelingstermijn, het aantal antwoorden en de verzonden e-mails. U kunt "
+"uw leadsanalyse sorteren volgens diverse groepen voor een accurate analyse."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Nieuwe mail versturen"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr ""
+msgstr "Criteria"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
-msgstr ""
+msgstr "Uitgesloten antwoorden:"
 
 #. module: crm
 #: field:crm.case.stage,section_ids:0
 msgid "Sections"
-msgstr ""
+msgstr "Secties"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
-msgstr ""
+msgstr "_Samenvoegen"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_lead
 #: model:ir.ui.menu,name:crm.menu_report_crm_leads_tree
 msgid "Leads Analysis"
-msgstr ""
+msgstr "Leadanalyse"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "Openbaar"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_resource_type_act
 msgid "Campaigns"
-msgstr ""
+msgstr "Campagnes"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,state:0 view:crm.lead.report:0
@@ -284,19 +288,19 @@ msgstr ""
 #: field:crm.phonecall,state:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act
 #: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Categories"
-msgstr ""
+msgstr "Categorieën"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Dates"
-msgstr ""
+msgstr "Datums"
 
 #. module: crm
 #: help:crm.lead,optout:0
@@ -304,22 +308,24 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
+"Als uitschrijven is aangevinkt, wil deze contactpersoon niet langer mails "
+"krijgen, of hij heeft zich uitgeschreven van een campagne."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr ""
+msgstr "Prospectrelatie"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:735
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Geen onderwerp"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Google Adwords 2"
-msgstr ""
+msgstr "Google Adwords 2"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -327,7 +333,7 @@ msgstr ""
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Link to an existing partner"
-msgstr ""
+msgstr "Koppelen aan een bestaande relatie"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,contact_id:0 view:crm.meeting:0
@@ -335,74 +341,74 @@ msgstr ""
 #: field:crm.phonecall,partner_contact:0
 #: field:crm.phonecall2phonecall,contact_name:0
 msgid "Contact"
-msgstr ""
+msgstr "Contactpersoon"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Delegate"
-msgstr ""
+msgstr "Delegeren"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "="
-msgstr ""
+msgstr "="
 
 #. module: crm
 #: field:base.action.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "Expressie op historiek van zaak"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:274
 #, python-format
 msgid "The lead '%s' has been opened."
-msgstr ""
+msgstr "Lead '%s' is geopend."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr ""
+msgstr "Vergadering voor opportuniteit"
 
 #. module: crm
 #: help:crm.lead.report,delay_close:0 help:crm.phonecall.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Aantal dagen tot afsluiten van zaak"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr ""
+msgstr "Als een project/opportuniteit reëel wordt"
 
 #. module: crm
 #: view:res.partner:0 field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "Leads en opportuniteiten"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication"
-msgstr ""
+msgstr "Communicatie"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Dinsdag"
 
 #. module: crm
 #: field:crm.lead,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Bijwerkingsdatum"
 
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr ""
+msgstr "Teamleider"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
 #: field:crm.lead2opportunity.partner.mass,name:0
 msgid "Select Action"
-msgstr ""
+msgstr "Actie selecteren"
 
 #. module: crm
 #: help:crm.case.stage,probability:0
@@ -410,6 +416,8 @@ msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
 msgstr ""
+"Dit percentage drukt de standaard/gemiddelde slaagkans uit voor de zaak in "
+"deze fase."
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0 view:crm.lead:0
@@ -419,22 +427,22 @@ msgstr ""
 #: field:crm.phonecall.report,categ_id:0
 #: field:crm.phonecall2phonecall,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categorie"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunity / Customer"
-msgstr ""
+msgstr "Opportuniteit / klant"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "#Opportuniteiten"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Privacy"
-msgstr ""
+msgstr "Privacy"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_stage_form_installer
@@ -446,120 +454,126 @@ msgid ""
 "Revenue\" and the \"Expected Closing Date.\" You should also have a look at "
 "the tooltip of the field \"Change Probability Automatically\"."
 msgstr ""
+"Met fasen kunnen verkopers vlot opvolgen waar een specifieke opportuniteit "
+"zich bevindt in de verkoopcyclus. Om uw verkooppijplijn efficiënt te kunnen "
+"opvolgen, moet u de voorwaarden voor het doorgaan naar de volgende fase "
+"eenduidig vastleggen. Voorbeeld: een opportuniteit komt op 'Gekwalificeerd' "
+"wanneer \"Verwachte opbrengst\" en \"Verwachte afsluitdatum\" zijn ingevuld. "
+"Lees ook eens de tip bij het veld \"Kans automatisch bijwerken\"."
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr ""
+msgstr "Opportuniteitenanalyse"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "Plaats van de gebeurtenis"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Recurrente regel"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Gewone of telefonische vergadering over opportuniteit"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mail Gateway"
-msgstr ""
+msgstr "Mailgateway"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "Allereerste contact met een nieuwe prospect"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0 view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_partner2opportunity
 #: model:ir.actions.act_window,name:crm.crm_partner2opportunity
 msgid "Create Opportunity"
-msgstr ""
+msgstr "Opportuniteit maken"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Augustus"
 
 #. module: crm
 #: code:addons/crm/crm.py:433 view:crm.lead:0 view:res.partner:0
 #, python-format
 msgid "Escalate"
-msgstr ""
+msgstr "Escaleren"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mailings"
-msgstr ""
+msgstr "Mailings"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr ""
+msgstr "Nog te doen"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Not Running"
-msgstr ""
+msgstr "Niet actief"
 
 #. module: crm
 #: field:crm.lead,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phonecalls during last 7 days"
-msgstr ""
+msgstr "Telefoongesprekken van de afgelopen 7 dagen"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Included Answers :"
-msgstr ""
+msgstr "Inbegrepen antwoorden:"
 
 #. module: crm
 #: help:crm.meeting,email_from:0 help:crm.phonecall,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Deze mensen zullen een e-mail krijgen."
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Samenvatting"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "State of Mind Computation"
-msgstr ""
+msgstr "Berekening humeur"
 
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr ""
+msgstr "Zaakcategorie"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
@@ -567,36 +581,38 @@ 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 ""
+"Standaardhumeur voor de periode vóór de berekening van 'Max. interval'. Dit "
+"is het beginhumeur als er voor de relatie geen gebeurtenis is."
 
 #. module: crm
 #: field:crm.lead,partner_address_name:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "Contactpersoon relatie"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "End date"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "Een gesprek plannen/noteren"
 
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Fout: de mail heeft het verkeerde formaat."
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
-msgstr ""
+msgstr "Profileringsopties"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr ""
+msgstr "#Telefoongesprekken"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -604,17 +620,19 @@ msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
 msgstr ""
+"De relatiecategorie die wordt toegewezen aan relaties die voldoen aan de "
+"segmenteringscriteria."
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:93
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr ""
+msgstr "Vergadering '%s' is bevestigd."
 
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Lopende"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -622,27 +640,29 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
 msgstr ""
+"Het e-mailadres in 'Antwoord naar' voor alle e-mails die door OpenERP voor "
+"zaken van dit verkoopteam worden verstuurd."
 
 #. module: crm
 #: field:crm.lead.report,creation_month:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Creatiemaand"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
 #: model:ir.ui.menu,name:crm.menu_action_resource_calendar_form
 msgid "Working Time"
-msgstr ""
+msgstr "Werkuren"
 
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr ""
+msgstr "Relatiesegmenteringslijnen"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0
 msgid "Details"
-msgstr ""
+msgstr "Details"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
@@ -650,16 +670,18 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
+"Definieert een regel of een herhalend tijdspatroon die van de recurrente "
+"regel moet worden uitgesloten."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "Leadformulier"
 
 #. module: crm
 #: view:crm.segmentation:0 model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr ""
+msgstr "Relatiesegmentering"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_meet
@@ -670,41 +692,46 @@ msgid ""
 "using the caldav interface.\n"
 "        "
 msgstr ""
+"De kalender van vergaderingen wordt door de verkoopteams gedeeld en is "
+"volledig geïntegreerd met andere toepassingen zoals werknemersvakantie of "
+"opportuniteiten. U kunt vergaderingen ook synchroniseren met uw gsm via de "
+"caldav-interface.\n"
+"        "
 
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmans"
-msgstr ""
+msgstr "Verkopers"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Verwachte opbrengst"
 
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr ""
+msgstr "Creatiemaand"
 
 #. module: crm
 #: help:crm.segmentation,name:0
 msgid "The name of the segmentation."
-msgstr ""
+msgstr "Naam van de segmentering"
 
 #. module: crm
 #: field:crm.case.stage,probability:0 field:crm.lead,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "Kans (%)"
 
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Firmamunt"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "Leads maken"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_view_form_installer
@@ -715,6 +742,11 @@ msgid ""
 "opportunities, you can assign the following stage to the team: Territory, "
 "Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost."
 msgstr ""
+"Maak verkoopteams om uw verkooporganisatie te structureren en voeg "
+"gebruikers toe aan elk team. Maak ook verkoopfasen per team/ Als u "
+"technieken zoals Solutions Selling gebruikt, kunt u vb. de volgende fasen "
+"aan een team toekennen: Territorium, Gekwalificeerd, Gekwalificeerde "
+"sponsors, Voorstel, Onderhandeling, Gewonnen/Verloren."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:718 view:crm.lead:0 selection:crm.lead,type:0
@@ -722,62 +754,62 @@ msgstr ""
 #: field:crm.meeting,opportunity_id:0
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Opportuniteit"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in last month"
-msgstr ""
+msgstr "Leads/opportuniteiten van de afgelopen maand"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
-msgstr ""
+msgstr "Televisie"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Stop Process"
-msgstr ""
+msgstr "Verwerking stoppen"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Maand-1"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr ""
+msgstr "Telefoongesprekken zoeken"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall2partner:0
 msgid "Continue"
-msgstr ""
+msgstr "Doorgaan"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Period"
-msgstr ""
+msgstr "Dagen per periode"
 
 #. module: crm
 #: field:crm.meeting,byday:0
 msgid "By day"
-msgstr ""
+msgstr "Per dag"
 
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr ""
+msgstr "Team instellen op"
 
 #. module: crm
 #: view:calendar.attendee:0 field:calendar.attendee,categ_id:0
 msgid "Event Type"
-msgstr ""
+msgstr "Gebeurtenistype"
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr ""
+msgstr "Exclusief"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:832
@@ -786,48 +818,50 @@ msgid ""
 "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
 "should better cancel it, instead of deleting it."
 msgstr ""
+"U kunt lead '%s' niet verwijderen; daarvoor moet de lead in status "
+"'Voorlopig' staan. U kunt de lead beter annuleren."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:451
 #, python-format
 msgid "From %s : %s"
-msgstr ""
+msgstr "Van %s : %s"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
 msgid "Creation Year"
-msgstr ""
+msgstr "Creatiejaar"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
 #: field:crm.phonecall.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Creatiedatum"
 
 #. module: crm
 #: field:crm.lead,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Referentie 2"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Sales Purchase"
-msgstr ""
+msgstr "Aankoop/verkoop"
 
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
 msgid "Used to compute open days"
-msgstr ""
+msgstr "Dient om dagen geopend te berekenen"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule Meeting"
-msgstr ""
+msgstr "Vergadering beleggen"
 
 #. module: crm
 #: view:crm.case.stage:0 field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Vereisten"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -835,21 +869,23 @@ msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
+"Met dit kenmerk definieert u de lijst van uitzonderingen qua datum/tijd voor "
+"een recurrent kalenderonderdeel."
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr ""
+msgstr "Omzetten naar opportuniteit "
 
 #. module: crm
 #: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+msgstr "Recurrente vergadering"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "Niet-toegewezen telefoongesprekken"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead2opportunity.partner,opportunity_ids:0
@@ -859,45 +895,45 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_opp
 #: model:process.node,name:crm.process_node_opportunities0
 msgid "Opportunities"
-msgstr ""
+msgstr "Opportuniteiten"
 
 #. module: crm
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr ""
+msgstr "Relatiecategorie"
 
 #. module: crm
 #: view:crm.add.note:0
 #: model:ir.actions.act_window,name:crm.action_crm_add_note
 msgid "Add Note"
-msgstr ""
+msgstr "Notitie toevoegen"
 
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
 msgid "Supplier"
-msgstr ""
+msgstr "Leverancier"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Als gewonnen markeren"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Purchase Amount"
-msgstr ""
+msgstr "Aankoopbedrag"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "Als verloren markeren"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Maart"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
@@ -905,67 +941,67 @@ msgstr ""
 #: code:addons/crm/wizard/crm_lead_to_partner.py:47
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Waarschuwing"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current year"
-msgstr ""
+msgstr "Telefoongesprekken van dit jaar"
 
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dagen tot openen"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show Time as"
-msgstr ""
+msgstr "Tijd tonen als"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Create Partner"
-msgstr ""
+msgstr "Relatie maken"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #. module: crm
 #: field:crm.lead,mobile:0 field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Gsm"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr ""
+msgstr "Volgende fase"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Mijn vergaderingen"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Todays's Phonecalls"
-msgstr ""
+msgstr "Telefoongesprekken van vandaag"
 
 #. module: crm
 #: view:board.board:0
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "Statistiekdashboard"
 
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Referentie"
 
 #. module: crm
 #: field:crm.lead,optin:0
 msgid "Opt-In"
-msgstr ""
+msgstr "Inschrijven"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:814 code:addons/crm/crm_phonecall.py:296
@@ -977,23 +1013,23 @@ msgstr ""
 #: field:res.partner,meeting_ids:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "Vergaderingen"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0 field:crm.lead,title_action:0
 #: field:crm.meeting,date_action_next:0 field:crm.phonecall,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Volgende actie"
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "Herhalen tot"
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Deadline"
 
 #. module: crm
 #: help:crm.meeting,active:0
@@ -1001,186 +1037,190 @@ msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
 msgstr ""
+"Als het veld Actief is ingeschakeld, kunt u de alarminfo verbergen zonder "
+"dat u deze verwijdert."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Change Color"
-msgstr ""
+msgstr "Kleur wijzigen"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr ""
+msgstr "Relatiesegmenteringen"
 
 #. module: crm
 #: field:crm.meeting,user_id:0 view:crm.phonecall:0
 #: field:crm.phonecall,user_id:0 view:res.partner:0
 msgid "Responsible"
-msgstr ""
+msgstr "Verantwoordelijke"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr ""
+msgstr "Enkel opportuniteit tonen"
 
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "Vorige"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr ""
+msgstr "Nieuwe leads"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Statistics"
-msgstr ""
+msgstr "Statistieken"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "From"
-msgstr ""
+msgstr "Van"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert into Opportunities"
-msgstr ""
+msgstr "Omzetten naar opportuniteit"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr ""
+msgstr "Verkoopteam tonen"
 
 #. module: crm
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "Volgende"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Stage:"
-msgstr ""
+msgstr "Fase:"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5 view:crm.lead:0
 msgid "Won"
-msgstr ""
+msgstr "Gewonnen"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Deadline overschreden"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr ""
+msgstr "Verkoopafdeling"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "State of Mind"
-msgstr ""
+msgstr "Humeur"
 
 #. module: crm
 #: field:crm.lead,type:0 field:crm.lead.report,type:0
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Compute Segmentation"
-msgstr ""
+msgstr "Segmentering berekenen"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
 msgid "Change Probability Automatically"
-msgstr ""
+msgstr "Kans automatisch wijzigen"
 
 #. module: crm
 #: field:crm.lead,create_date:0 field:crm.meeting,create_date:0
 #: view:crm.phonecall:0 field:crm.phonecall,create_date:0
 #: field:crm.phonecall.report,creation_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Creatiedatum"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "Mijn opportuniteiten"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Need a Website Design"
-msgstr ""
+msgstr "Heeft een websiteontwerp nodig"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Year of call"
-msgstr ""
+msgstr "Jaar van telefoontje"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "Recurrente ID"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:res.partner:0
 msgid "Subject"
-msgstr ""
+msgstr "Onderwerp"
 
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "Din"
 
 #. module: crm
 #: view:crm.case.stage:0 view:crm.lead:0 field:crm.lead,stage_id:0
 #: view:crm.lead.report:0 field:crm.lead.report,stage_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Fase"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr ""
+msgstr "Historiekinformatie"
 
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr ""
+msgstr "Mail naar relatie"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Call Details"
-msgstr ""
+msgstr "Details gesprek"
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "Markeren als"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "Gesprek noteren"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
 msgstr ""
+"Zorg ervoor dat de gebeurtenis automatisch wordt herhaald volgens dit "
+"interval."
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition Case Fields"
-msgstr ""
+msgstr "Voorwaardevelden"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr ""
+msgstr "Telefoongesprekken in status Wachtend."
 
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,stage_ids:0
@@ -1189,14 +1229,14 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.crm_lead_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
 msgid "Stages"
-msgstr ""
+msgstr "Fasen"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
 #: field:crm.partner2opportunity,planned_revenue:0
 #: field:crm.phonecall2opportunity,planned_revenue:0
 msgid "Expected Revenue"
-msgstr ""
+msgstr "Verwachte opbrengst"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
@@ -1204,18 +1244,20 @@ msgid ""
 "Create specific phone call categories to better define the type of calls "
 "tracked in the system."
 msgstr ""
+"Maak specifieke gesprekscategorieën zodat u vlot de verschillende soorten "
+"gesprekken kunt opvolgen."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr ""
+msgstr "Max. relatie-ID verwerkt"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
@@ -1223,38 +1265,39 @@ msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
 msgstr ""
+"Als u deze fase instelt, wijzigt de kans automatisch voor de opportuniteit."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr ""
+msgstr "Analyse telefoongesprekken"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Startdatum"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+msgstr "Duur in minuten"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
-msgstr ""
+msgstr "Kanaalnaam"
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0 field:crm.phonecall2opportunity,name:0
 msgid "Opportunity Name"
-msgstr ""
+msgstr "Opportuniteitnaam"
 
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
-msgstr ""
+msgstr "Verwachte afsluitdatum"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1262,11 +1305,13 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
 msgstr ""
+"Als het veld Actief is ingeschakeld, kunt u het verkoopteam verbergen zonder "
+"dat u dit verwijdert."
 
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr ""
+msgstr "Straat 2"
 
 #. module: crm
 #: help:crm.case.stage,case_default:0
@@ -1274,31 +1319,33 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"Als u dit veld aanvinkt, wordt de fase standaard voor elk verkoopteam "
+"voorgesteld. De fase wordt niet toegewezen aan bestaande teams."
 
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Vrij"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "crm.lead"
-msgstr ""
+msgstr "Lead"
 
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Schrijfdatum"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of Recurrency"
-msgstr ""
+msgstr "Einde recurrentie"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reminder"
-msgstr ""
+msgstr "Herinnering"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1306,16 +1353,18 @@ 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 ""
+"Vink aan als u dit tabblad als onderdeel van een segmenteringsregel wilt "
+"gebruiken. Zoniet worden onderstaande criteria genegeerd."
 
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "Stel een alarm in voordat de gebeurtenis plaatsvindt."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr ""
+msgstr "Een gesprek plannen"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1323,12 +1372,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_lead2partner
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 msgid "Create a Partner"
-msgstr ""
+msgstr "Relatie maken"
 
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
-msgstr ""
+msgstr "Uitvoeringsstatus"
 
 #. module: crm
 #: help:crm.phonecall,state:0
@@ -1341,102 +1390,112 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"De status wordt op 'Uit te voeren' gezet als er een zaak wordt gemaakt.      "
+"                            \n"
+"Als de zaak lopende is, wordt de status op 'Open' gezet.                     "
+"             \n"
+"Als het gesprek is gevoerd, wordt de status op 'Uitgevoerd' gezet.           "
+"                       \n"
+"Als het gesprek nog moet worden uitgevoerd, gaat de status naar 'Niet "
+"uitgevoerd'."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Maandag"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dagen tot afsluiten"
 
 #. module: crm
 #: field:crm.case.section,complete_name:0
 msgid "unknown"
-msgstr ""
+msgstr "onbekend"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:296
 #, python-format
 msgid "The case '%s' has been closed."
-msgstr ""
+msgstr "Zaak '%s' is gesloten."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr ""
+msgstr "Relatie naar opportuniteit"
 
 #. module: crm
 #: field:crm.meeting,date:0 field:crm.opportunity2phonecall,date:0
 #: view:crm.phonecall:0 field:crm.phonecall,date:0
 #: field:crm.phonecall2phonecall,date:0 view:res.partner:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Uitgebreide filters..."
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in closed state"
-msgstr ""
+msgstr "Telefoongesprekken in status uitgevoerd."
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "Zoeken"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr ""
+msgstr "Opportuniteiten per categorie"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_marketing_department
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "Afdeling Sales & Marketing"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "Datum van gesprek"
 
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
+"E-mails worden verzonden naar het standaardmailadres van het verkoopteam."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day in the month where repeat the meeting"
 msgstr ""
+"Kies de dag van de maand waarop deze vergadering moet worden herhaald."
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
-msgstr ""
+msgstr "Segmenteringsomschrijving"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr ""
+msgstr "Een vergadering beleggen"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:431
 #, python-format
 msgid "Merged opportunities"
-msgstr ""
+msgstr "Samengevoegde opportuniteiten"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer
 msgid "Define Sales Team"
-msgstr ""
+msgstr "Verkoopteam instellen"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
@@ -1445,31 +1504,34 @@ msgid ""
 "better manage your interactions with them. The segmentation tool is able to "
 "assign categories to partners according to criteria you set."
 msgstr ""
+"Maak specifieke relatiecategorieën die u aan relaties kunt toekennen voor "
+"een betere interactie. De segmenteringstool kan automatisch categorieën "
+"toewijzen aan relaties op basis van door u ingestelde criteria."
 
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "Code"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr ""
+msgstr "Onderliggende teams"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in draft and open state"
-msgstr ""
+msgstr "Telefoongesprekken in status Uit te voeren en Open."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
 msgid "Telesales"
-msgstr ""
+msgstr "Televerkoop"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "References"
-msgstr ""
+msgstr "Referenties"
 
 #. module: crm
 #: code:addons/crm/crm.py:441 view:crm.lead:0
@@ -1479,57 +1541,59 @@ msgstr ""
 #: view:crm.phonecall2partner:0 view:res.partner:0
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr ""
+msgstr "Leads/opportuniteiten in status Wachtend."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr ""
+msgstr "Twee opportuniteiten samenvoegen"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Uitzonderingsregel"
 
 #. module: crm
 #: help:base.action.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
 msgstr ""
+"Schakel dit in als u wilt dat met deze regel een e-mail naar de relatie "
+"wordt verstuurd."
 
 #. module: crm
 #: field:crm.phonecall,opportunity_id:0
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Lead/opportuniteit"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr ""
+msgstr "Telefooncategorieën"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in open state"
-msgstr ""
+msgstr "Leads/opportuniteiten in status Open."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_categ
 msgid "Opportunities By Categories"
-msgstr ""
+msgstr "Opportuniteiten per categorie"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
@@ -1537,43 +1601,45 @@ msgid ""
 "The name of the future partner that will be created while converting the "
 "lead into opportunity"
 msgstr ""
+"De naam van de toekomstige relatie die zal worden gemaakt als van de lead "
+"een opportuniteit wordt gemaakt."
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "U kunt niet dezelfde verkoopteams maken."
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr ""
+msgstr "Gesprek noteren"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
 msgid "Do not link to a partner"
-msgstr ""
+msgstr "Geen relatie koppelen"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "Vergaderingen zoeken"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Sale Amount"
-msgstr ""
+msgstr "Verkoopbedrag"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "Kies de dag waarop deze vergadering moet worden herhaald."
 
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Niet bevestigd"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1584,17 +1650,21 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
+"Met de Opportuniteitenanalyse krijgt u info zoals verwachte opbrengst, "
+"geplande kosten, overschreden deadlines of het aantal interacties per "
+"opportuniteit. Dit rapport wordt meestal door de sales manager gebruikt om "
+"periodiek de verkooppijplijn door te nemen met de teams."
 
 #. module: crm
 #: field:crm.case.categ,name:0 field:crm.lead,name:0
 #: field:crm.segmentation,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #. module: crm
 #: field:crm.meeting,alarm_id:0 field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Herinnering"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
@@ -1603,53 +1673,56 @@ msgid ""
 "organise their sales pipeline. Stages will allow them to easily track how a "
 "specific lead or opportunity is positioned in the sales cycle."
 msgstr ""
+"Voeg specifieke fasen toe aan leads en opportuniteiten waarmee uw verkopers "
+"hun pijplijn beter kunnen organiseren. Met fasen kan vlot worden opgevolgd "
+"waar een bepaalde lead of opportuniteit zich bevindt in de verkoopcyclus."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert opportunities"
-msgstr ""
+msgstr "Opportuniteiten omzetten"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "Mijn zaken"
 
 #. module: crm
 #: field:crm.lead,birthdate:0
 msgid "Birthdate"
-msgstr ""
+msgstr "Geboortedatum"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "De"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "Creatie"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "High"
-msgstr ""
+msgstr "Hoog"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "Prospect omzetten naar relatie"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting / Partner"
-msgstr ""
+msgstr "Vergadering / relatie"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "_Convert"
-msgstr ""
+msgstr "_Omzetten"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_view_attendee_form
@@ -1658,198 +1731,202 @@ msgid ""
 "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
 "users, but also external parties, such as a customer."
 msgstr ""
+"Met uitnodigingen kunt u vergaderingen beleggen met uw collega's / relaties "
+"en de aanwezigheden opvolgen. U kunt niet alleen OpenERP-gebruikers "
+"uitnodigen, maar ook externe partijen, zoals een klant."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Zaterdag"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Vijfde"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr ""
+msgstr "Leads/opportuniteiten in status Gereed."
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Dagen tot afsluiten"
 
 #. module: crm
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr ""
+msgstr "Woe"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Potential Reseller"
-msgstr ""
+msgstr "Mogelijke reseller"
 
 #. module: crm
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the saleman with the team leader."
 msgstr ""
+"Bij escaleren naar dit team, wordt de verkoper vervangen door de teamleider."
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
 msgid "Planned Revenue"
-msgstr ""
+msgstr "Geplande opbrengst"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Groeperen op..."
 
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
-msgstr ""
+msgstr "Optionele gekoppelde relatie, doorgaans na omzetting van de lead"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation details"
-msgstr ""
+msgstr "Details uitnodiging"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "Hoofdteam"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Volgende actiedatum"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Running"
-msgstr ""
+msgstr "Lopend"
 
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "Postcode"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
 #, python-format
 msgid "The case '%s' has been opened."
-msgstr ""
+msgstr "Zaak '%s' is geopend."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
-msgstr ""
+msgstr "Inkomend"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Month of call"
-msgstr ""
+msgstr "Maand van gesprek"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr ""
+msgstr "Telefoongesprekken"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "Vrij"
 
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
 msgid "Allow Delete"
-msgstr ""
+msgstr "Verwijderen toelaten"
 
 #. module: crm
 #: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Maa"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Highest"
-msgstr ""
+msgstr "Hoogste"
 
 #. module: crm
 #: help:crm.lead.report,creation_year:0
 msgid "Creation year"
-msgstr ""
+msgstr "Creatiejaar"
 
 #. module: crm
 #: view:crm.case.section:0 view:crm.lead:0 field:crm.lead,description:0
 #: view:crm.opportunity2phonecall:0
 msgid "Notes"
-msgstr ""
+msgstr "Opmerkingen"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
 msgid "Value"
-msgstr ""
+msgstr "Waarde"
 
 #. module: crm
 #: help:crm.lead,type:0 help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "Type wordt gebruikt om leads van opportuniteiten te onderscheiden"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr ""
+msgstr "Opportuniteiten per categorie"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr ""
+msgstr "Klantennaam"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr ""
+msgstr "Telefoongesprek naar opportuniteit"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Antwoord aan"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select Stages for this Sales Team"
-msgstr ""
+msgstr "Fasen voor verkoopteam kiezen"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr ""
+msgstr "Opportuniteiten per fase"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "Recurrentieoptie"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr ""
+msgstr "Lead / klant"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "Prospect wordt omgezet naar relatie"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "Omzetten naar opportuniteit"
 
 #. module: crm
 #: view:crm.case.channel:0
@@ -1857,105 +1934,105 @@ msgstr ""
 #: model:ir.model,name:crm.model_crm_case_channel
 #: model:ir.ui.menu,name:crm.menu_crm_case_channel
 msgid "Channels"
-msgstr ""
+msgstr "Kanalen"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Held"
-msgstr ""
+msgstr "Uitgevoerd"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Terug naar Voorlopig"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Extra informatie"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge Opportunities"
-msgstr ""
+msgstr "Opportuniteiten samenvoegen"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
 msgid "Google Adwords"
-msgstr ""
+msgstr "Google Adwords"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "crm.phonecall"
-msgstr ""
+msgstr "Telefoongesprek"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Mail Campaign 2"
-msgstr ""
+msgstr "Mailcampagne 2"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Mail Campaign 1"
-msgstr ""
+msgstr "Mailcampagne 1"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create"
-msgstr ""
+msgstr "Maken"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:849
 #, python-format
 msgid "Changed Stage to: %s"
-msgstr ""
+msgstr "Fase gewijzigd in: %s"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,priority:0 view:crm.lead.report:0
 #: field:crm.lead.report,priority:0 field:crm.phonecall,priority:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Prioriteit"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
 msgid "Use The Sales Purchase Rules"
-msgstr ""
+msgstr "Gebruik de aankoop/verkoopregels"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr ""
+msgstr "Lead naar opportuniteit / relatie"
 
 #. module: crm
 #: field:crm.lead,location_id:0 field:crm.meeting,location:0
 msgid "Location"
-msgstr ""
+msgstr "Locatie"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr ""
+msgstr "Vele leads naar opportuniteit / relatie"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reply"
-msgstr ""
+msgstr "Beantwoorden"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "Plan een gewone of een telefonische vergadering"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Fout"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
@@ -1963,48 +2040,51 @@ msgid ""
 "Create different meeting categories to better organize and classify your "
 "meetings."
 msgstr ""
+"Maak verschillende vergadercategorieën om uw vergaderingen beter te "
+"organiseren."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
 msgid "Segmentation line"
-msgstr ""
+msgstr "Segmenteringslijn"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Planned Date"
-msgstr ""
+msgstr "Geplande datum"
 
 #. module: crm
 #: field:crm.meeting,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "Caldav-url"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr ""
+msgstr "Verwachte opbrengst"
 
 #. module: crm
 #: field:crm.lead,contact_name:0
 msgid "Contact Name"
-msgstr ""
+msgstr "Naam contactpersoon"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads creating during last 7 days"
-msgstr ""
+msgstr "Leads van de afgelopen 7 dagen"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
 msgstr ""
+"Bent u zeker dat u een relatie wilt maken op basis van dit telefoongesprek?"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -2015,72 +2095,77 @@ msgid ""
 "The opportunities and sales order displayed, will automatically be filtered "
 "according to his team."
 msgstr ""
+"Definieer een verkoopteam als u uw verkopers of afdelingen in afzonderlijke "
+"teams wilt onderbrengen. Elk team werkt op eigen opportuniteiten, "
+"verkooporders, enz. Elke gebruiker kan een standaardteam instellen via zijn "
+"voorkeuren. De getoonde opportuniteiten en verkooporders zijn automatisch "
+"diegene van dat team."
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "Enkel lead tonen"
 
 #. module: crm
 #: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr ""
+msgstr "x keren herhalen"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr ""
+msgstr "Verkoopteams"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "Lead naar relatie"
 
 #. module: crm
 #: view:crm.segmentation:0 field:crm.segmentation.line,segmentation_id:0
 #: model:ir.actions.act_window,name:crm.crm_segmentation-act
 msgid "Segmentation"
-msgstr ""
+msgstr "Segmentering"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Team"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr ""
+msgstr "Leads/opportuniteiten in status Nieuw."
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 view:res.partner:0
 msgid "Not Held"
-msgstr ""
+msgstr "Niet uitgevoerd"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
 msgid "Probability"
-msgstr ""
+msgstr "Kans"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Pending Opportunities"
-msgstr ""
+msgstr "Wachtende opportuniteiten"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Please select more than one opportunity from the list view."
-msgstr ""
+msgstr "Gelieve meer dan één opportuniteit te kiezen uit de lijst."
 
 #. module: crm
 #: view:crm.lead.report:0 field:crm.meeting,month_list:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Maand"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2088,7 +2173,7 @@ 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 "Leads"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2103,6 +2188,15 @@ msgid ""
 "email gateway: new emails may create leads, each of them automatically gets "
 "the history of the conversation with the prospect."
 msgstr ""
+"Met leads kunt u initiële contacten met een prospect of relatie bijhouden "
+"die interesse heeft in uw producten of diensten. Een lead is doorgaans de "
+"eerste stap in uw verkoopcyclus. Na kwalificatie kan van de lead een "
+"opportuniteit worden gemaakt. Ook de relatie kan worden gemaakt voor verdere "
+"opvolging van activiteiten. U kunt een prospectendatabase importeren, uw "
+"visitekaartjes bijhouden of het contactformulier op uw website integreren "
+"met de leads in OpenERP. Leads kunnen ook worden gekoppeld aan de "
+"mailgateway: nieuwe e-mails kunnen een nieuwe lead maken en de historiek van "
+"de communicatie met de prospect wordt bijgehouden."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -2110,60 +2204,63 @@ msgstr ""
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Create a new partner"
-msgstr ""
+msgstr "Relatie maken"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Scheduled Calls"
-msgstr ""
+msgstr "Geplande gesprekken"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Begindatum"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Scheduled Phonecalls"
-msgstr ""
+msgstr "Geplande telefoongesprekken"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Decline"
-msgstr ""
+msgstr "Afwijzen"
 
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "E-mail gebruiker"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
 msgstr ""
+"Als Inschrijven is ingeschakeld, wil deze contactpersoon e-mails ontvangen."
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "Terug naar onbevestigd"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,note:0 field:crm.phonecall2phonecall,note:0
 msgid "Note"
-msgstr ""
+msgstr "Opmerking"
 
 #. module: crm
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"De gekozen firma behoort niet tot de toegelaten bedrijven voor deze "
+"gebruiker."
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Low"
-msgstr ""
+msgstr "Laag"
 
 #. module: crm
 #: selection:crm.add.note,state:0 field:crm.lead,date_closed:0
@@ -2171,22 +2268,22 @@ msgstr ""
 #: selection:crm.lead.report,state:0 field:crm.meeting,date_closed:0
 #: field:crm.phonecall,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "Gesloten"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr ""
+msgstr "Totaal geplande opbrengst"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Open Opportunities"
-msgstr ""
+msgstr "Openstaande opportuniteiten"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
 msgid "Internal Meeting"
-msgstr ""
+msgstr "Interne vergadering"
 
 #. module: crm
 #: code:addons/crm/crm.py:454 selection:crm.add.note,state:0 view:crm.lead:0
@@ -2194,17 +2291,17 @@ msgstr ""
 #: selection:crm.lead.report,state:0 selection:crm.phonecall.report,state:0
 #, python-format
 msgid "Pending"
-msgstr ""
+msgstr "Wachtend"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet1
 msgid "Customer Meeting"
-msgstr ""
+msgstr "Vergadering met klant"
 
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "Globaal cc"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2212,72 +2309,72 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #: model:ir.ui.menu,name:crm.menu_crm_config_phonecall view:res.partner:0
 msgid "Phone Calls"
-msgstr ""
+msgstr "Telefoongesprekken"
 
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Search"
-msgstr ""
+msgstr "Fasen zoeken"
 
 #. module: crm
 #: help:crm.lead.report,delay_open:0 help:crm.phonecall.report,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "Aantal dagen tot openen van zaak"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Number of repetitions"
-msgstr ""
+msgstr "Aantal herhalingen"
 
 #. module: crm
 #: field:crm.lead,phone:0 field:crm.opportunity2phonecall,phone:0
 #: field:crm.phonecall,partner_phone:0 field:crm.phonecall2phonecall,phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Tel."
 
 #. module: crm
 #: field:crm.case.channel,active:0 field:crm.case.section,active:0
 #: field:crm.lead,active:0 field:crm.meeting,active:0
 #: field:crm.phonecall,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actief"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:856
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr ""
+msgstr "De fase van opportuniteit '%s' is gewijzigd in '%s'."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
-msgstr ""
+msgstr "Verplichte expressie"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Schedule Call"
-msgstr ""
+msgstr "Een gesprek plannen"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Uncertain"
-msgstr ""
+msgstr "Onzeker"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages."
-msgstr ""
+msgstr "Dient om fasen te rangschikken."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:276
 #, python-format
 msgid "The opportunity '%s' has been opened."
-msgstr ""
+msgstr "Opportuniteit '%s' is geopend."
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -2285,44 +2382,44 @@ msgstr ""
 #: field:crm.lead2partner,action:0 field:crm.opportunity2phonecall,action:0
 #: field:crm.phonecall2partner,action:0 field:crm.phonecall2phonecall,action:0
 msgid "Action"
-msgstr ""
+msgstr "Actie"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_decrease:0
 msgid "Decrease (0>1)"
-msgstr ""
+msgstr "Verlagen (0>1)"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
 msgid "Exp. Closing Day"
-msgstr ""
+msgstr "Verw. sluiting"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Reassign Escalated"
-msgstr ""
+msgstr "Geëscaleerd opnieuw toewijzen"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Wekelijks"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
 #: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
 msgid "Opportunities Analysis"
-msgstr ""
+msgstr "Opportuniteitenanalyse"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Misc"
-msgstr ""
+msgstr "Diversen"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_crm
 msgid "Sales"
-msgstr ""
+msgstr "Verkoop"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
@@ -2331,88 +2428,90 @@ msgid ""
 "You can not escalate, you are already at the top level regarding your sales-"
 "team category."
 msgstr ""
+"U kunt niet escaleren; u heeft het hoogste niveau in de verkoopteams al "
+"bereikt."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8 view:crm.meeting:0
 msgid "Other"
-msgstr ""
+msgstr "Andere"
 
 #. module: crm
 #: view:crm.meeting:0 selection:crm.meeting,state:0
 msgid "Done"
-msgstr ""
+msgstr "Gereed"
 
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "Herhaal elk(e) (Dag/Week/Maand/Jaar)"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
 msgid "Max Interval"
-msgstr ""
+msgstr "Max. interval"
 
 #. module: crm
 #: code:addons/crm/crm.py:396 view:crm.lead:0 view:crm.lead.report:0
 #: selection:crm.lead.report,state:0 view:res.partner:0
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "Open"
 
 #. module: crm
 #: field:crm.lead,city:0
 msgid "City"
-msgstr ""
+msgstr "Plaats"
 
 #. module: crm
 #: view:crm.lead:0 view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Historiek"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Busy"
-msgstr ""
+msgstr "Bezet"
 
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
-msgstr ""
+msgstr "Creatiedatum"
 
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Repeat every"
-msgstr ""
+msgstr "Herhalen elke"
 
 #. module: crm
 #: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "Recurrent"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in last month"
-msgstr ""
+msgstr "Telefoongesprekken van de afgelopen maand"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr ""
+msgstr "Mijn openstaande opportuniteiten"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr ""
+msgstr "Maximale communicatiehistoriek"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr ""
+msgstr "Mensen uitnodigen"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,categ_id:0
 msgid "Meeting Type"
-msgstr ""
+msgstr "Vergadertype"
 
 #. module: crm
 #: help:crm.lead,state:0
@@ -2425,16 +2524,23 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"De status wordt op 'Nieuw' gezet als er een zaak wordt gemaakt.              "
+"                    \n"
+"Als de zaak lopende is, wordt de status op 'Open' gezet.                     "
+"             \n"
+"Als de zaak klaar is, wordt de status op 'Gereed' gezet.                     "
+"             \n"
+"Als de zaak moet worden herbekeken, gaat de status naar 'Wachtend'."
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Third"
-msgstr ""
+msgstr "Derde"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
@@ -2442,47 +2548,49 @@ msgid ""
 "The computation is made on all events that occured during this interval, the "
 "past X periods."
 msgstr ""
+"De berekening wordt uitgevoerd voor alle gebeurtenissen tijdens dit "
+"interval, de afgelopen X perioden."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Opportunities"
-msgstr ""
+msgstr "Niet-toegewezen opportuniteiten"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# of Emails"
-msgstr ""
+msgstr "# e-mails"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "Leads zoeken"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "Dagen tot openen"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "Recurrentieperiode"
 
 #. module: crm
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr ""
+msgstr "Weekdag"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "Doorverwijzer"
 
 #. module: crm
 #: field:crm.lead,id:0 field:crm.meeting,id:0 field:crm.phonecall,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm
 #: help:crm.lead,type_id:0
@@ -2490,235 +2598,237 @@ msgid ""
 "From which campaign (seminar, marketing campaign, mass mailing, ...) did "
 "this contact come from?"
 msgstr ""
+"Van welke campagne (seminarie, marketingcampagne, mailing, ...) komt deze "
+"contactpersoon?"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Info over aanwezigen"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Test"
-msgstr ""
+msgstr "Segmenteringstest"
 
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "Aanmeldgegevens"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Continue Process"
-msgstr ""
+msgstr "Verder verwerken"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current year"
-msgstr ""
+msgstr "Leads/opportuniteiten van dit jaar"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "Telefoontje naar relatie"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr ""
+msgstr "Toegewezen aan"
 
 #. module: crm
 #: field:crm.add.note,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "Zet nieuwe status op"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0 field:crm.meeting,date_action_last:0
 #: field:crm.phonecall,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Laatste actie"
 
 #. module: crm
 #: field:crm.meeting,duration:0 field:crm.phonecall,duration:0
 #: field:crm.phonecall.report,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duur"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show countries"
-msgstr ""
+msgstr "Landen tonen"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Salesman"
-msgstr ""
+msgstr "Verkoper kiezen"
 
 #. module: crm
 #: view:board.board:0
 msgid "Sales Dashboard"
-msgstr ""
+msgstr "Verkoopdashboard"
 
 #. module: crm
 #: field:crm.lead.report,nbr:0 field:crm.phonecall.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# zaken"
 
 #. module: crm
 #: help:crm.meeting,section_id:0 help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "Verkoopteam aan wie de zaak toebehoort"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr ""
+msgstr "Zondag"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fourth"
-msgstr ""
+msgstr "Vierde"
 
 #. module: crm
 #: selection:crm.add.note,state:0
 msgid "Unchanged"
-msgstr ""
+msgstr "Ongewijzigd"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr ""
+msgstr "Relatiesegmentering"
 
 #. module: crm
 #: field:crm.lead,fax:0
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current month"
-msgstr ""
+msgstr "Leads/opportuniteiten van deze maand"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "Toewijzing"
 
 #. module: crm
 #: field:crm.lead,company_id:0 view:crm.lead.report:0
 #: field:crm.lead.report,company_id:0 field:crm.phonecall,company_id:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr ""
+msgstr "Vrijdag"
 
 #. module: crm
 #: field:crm.meeting,allday:0
 msgid "All Day"
-msgstr ""
+msgstr "Alle dagen"
 
 #. module: crm
 #: field:crm.segmentation.line,operator:0
 msgid "Mandatory / Optional"
-msgstr ""
+msgstr "Verplicht / optie"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr ""
+msgstr "Niet-toegewezen leads"
 
 #. module: crm
 #: field:crm.lead,subjects:0
 msgid "Subject of Email"
-msgstr ""
+msgstr "Onderwerp van mail"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
 #: model:ir.ui.menu,name:crm.menu_attendee_invitations
 msgid "Meeting Invitations"
-msgstr ""
+msgstr "Uitnodigingen"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Todo"
-msgstr ""
+msgstr "Uit te voeren"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr ""
+msgstr "Objectnaam"
 
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr ""
+msgstr "E-mailadres van de contactpersoon"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred by"
-msgstr ""
+msgstr "Doorverwijzer"
 
 #. module: crm
 #: view:crm.lead:0 model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Interne notitie toevoegen"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:853
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr ""
+msgstr "De fase van lead '%s' is gewijzigd in '%s'."
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr ""
+msgstr "Laatste"
 
 #. module: crm
 #: field:crm.lead,message_ids:0 field:crm.meeting,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Berichten"
 
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr ""
+msgstr "Communicatiekanaal (mail, direct, telefoon, ...)"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fout"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,name:0 field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "Samenvatting gesprek"
 
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 #: selection:crm.lead.report,state:0 selection:crm.meeting,state:0
 #: selection:crm.phonecall,state:0 selection:crm.phonecall.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Geannuleerd"
 
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr ""
+msgstr "Midden notitie"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Mijn geplande opbrengsten per fase"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -2735,16 +2845,26 @@ msgid ""
 "opportunities, convert them into quotations, manage related documents, track "
 "all customer related activities, and much more."
 msgstr ""
+"Via opportuniteiten kunt u uw verkooppijplijn opvolgen aan de hand van klant-"
+" of prospectgerelateerde verkoopdocumenten. Informatie zoals verwachte "
+"opbrengst, fase, verwachte sluitingsdatum, communicatiehistoriek, enz. kan "
+"worden bijgehouden. Opportuniteiten kunnen worden gekoppeld aan de "
+"mailgateway: maak van nieuwe mails een opportuniteit en bewaar de "
+"communicatiehistoriek.\n"
+"\n"
+"U en uw team kunnen vergadering en telefoongesprekken plannen voor "
+"opportuniteiten. Maak van een opportuniteit een offerte, volg de documenten "
+"en alle klantenactiviteiten op, en nog veel meer."
 
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Kleurindex"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Links"
-msgstr ""
+msgstr "Koppelingen"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_categ_action
@@ -2754,6 +2874,10 @@ msgid ""
 "instance reflect your product structure or the different types of sales you "
 "do."
 msgstr ""
+"Maak specifieke categorieën volgens uw activiteiten, zodat u leads en "
+"opportuniteiten beter kunt organiseren en analyseren. Die categorieën kunnen "
+"bijvoorbeeld uw productenstructuur weergeven of de verschillende types "
+"verkoop."
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
@@ -2761,6 +2885,8 @@ msgid ""
 "If the partner has not purchased (or bought) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
 msgstr ""
+"Als de relatie niets heeft gekocht gedurende een bepaalde periode, kunt u "
+"het humeur veranderen. Het gaat om een vermenigvuldiging."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2770,21 +2896,25 @@ msgid ""
 "several criteria and drill down the information, by adding more groups in "
 "the report."
 msgstr ""
+"Hiermee analyseert u de prestaties van uw verkoopteam volgens hun "
+"telefoongespreken. U kunt de informatie groeperen of filteren volgens "
+"diverse criteria en verder zoeken in de infrmatie door meer groepen toe te "
+"voegen."
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "# E-mails"
 
 #. module: crm
 #: field:crm.phonecall,name:0 view:res.partner:0
 msgid "Call Summary"
-msgstr ""
+msgstr "Samenvatting gesprek"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Todays' Leads"
-msgstr ""
+msgstr "Leads van de dag"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -2795,86 +2925,91 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"In Geplande gesprekken vindt u alle telefoontjes die uw verkoopteam moet "
+"uitvoeren. Een verkoper kan info over het gesprek noteren in het formulier. "
+"Deze info is ook toegankelijk via de relatiefiche, zodat elk contact kan "
+"worden bijgehouden. U kunt ook een csv-bestand importeren met een lijst van "
+"uit te voeren telefoongesprekken."
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
 msgid "Operator"
-msgstr ""
+msgstr "Operator"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "Gesprek naar gesprek"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "Een gesprek plannen/noteren"
 
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Bevestigd"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
-msgstr ""
+msgstr "Geplande opbrengst per gebruiker en fase"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
-msgstr ""
+msgstr "Bevestigen"
 
 #. module: crm
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr ""
+msgstr "Zon"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Sectie"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Optional Expression"
-msgstr ""
+msgstr "Optionele expressie"
 
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "Dag van de maand"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor_stage
 msgid "Planned Revenue By Stage"
-msgstr ""
+msgstr "Geplande opbrengst per fase"
 
 #. module: crm
 #: selection:crm.add.note,state:0 model:crm.case.stage,name:crm.stage_lead1
 #: view:crm.lead:0 selection:crm.lead,state:0 view:crm.lead.report:0
 msgid "New"
-msgstr ""
+msgstr "Nieuw"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,email_from:0 field:crm.meeting,email_from:0
 #: field:crm.phonecall,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
 #. module: crm
 #: view:crm.case.channel:0 view:crm.lead:0 field:crm.lead,channel_id:0
 #: view:crm.lead.report:0 field:crm.lead.report,channel_id:0
 msgid "Channel"
-msgstr ""
+msgstr "Kanaal"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.meeting:0
 #: view:crm.phonecall:0 view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Mijn verkoopteam(s)"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2884,119 +3019,123 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"Schakel in als de categorie beperkt is tot relaties die voldoen aan de "
+"segmenteringsregels.\n"
+"Als dit is ingeschakeld, wordt de categorie verwijderd van relaties die niet "
+"voldoen aan de segmenteringscriteria."
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Uitzonderingsdata/tijden"
 
 #. module: crm
 #: help:crm.meeting,date_deadline:0
 msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
-msgstr ""
+msgstr "Deadline wordt automatisch berekend volgens Begindatum + Duur"
 
 #. module: crm
 #: field:crm.lead,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "Staat/Provincie"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "Opportuniteiten maken van leads"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM Dashboard"
-msgstr ""
+msgstr "CRM-dashboard"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Need Information"
-msgstr ""
+msgstr "Heeft informatie nodig"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr ""
+msgstr "Opportuniteit"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr ""
+msgstr "Categorie instellen op"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr ""
+msgstr "Mail naar"
 
 #. module: crm
 #: field:crm.meeting,th:0
 msgid "Thu"
-msgstr ""
+msgstr "Don"
 
 #. module: crm
 #: view:crm.add.note:0 view:crm.merge.opportunity:0
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2opportunity:0
 #: view:crm.phonecall2phonecall:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Annuleren"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Daily"
-msgstr ""
+msgstr "Dagelijks"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_stage_form_installer
 msgid "Review Sales Stages"
-msgstr ""
+msgstr "Verkoopfasen bekijken"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 msgid "Qualification"
-msgstr ""
+msgstr "Kwalificatie"
 
 #. module: crm
 #: field:crm.lead,partner_address_email:0
 msgid "Partner Contact Email"
-msgstr ""
+msgstr "E-mail contactpersoon relatie"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:48
 #, python-format
 msgid "A partner is already defined."
-msgstr ""
+msgstr "De relatie bestaat al."
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "First"
-msgstr ""
+msgstr "Eerste"
 
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
 msgid "Exp. Closing Month"
-msgstr ""
+msgstr "Verw. sluitingsmaand"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition on Communication History"
-msgstr ""
+msgstr "Voorwaarde op communicatiehistoriek"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Date of Call"
-msgstr ""
+msgstr "Datum van gesprek"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3009,87 +3148,94 @@ msgid ""
 "bought goods to another supplier.                  \n"
 "Use this functionality for recurring businesses."
 msgstr ""
+"Een periode is het gemiddelde aantal dagen tussen twee aankoop- of "
+"verkoopcycli voor deze segmentering.                 \n"
+"Het wordt doorgaans gebruikt om na te gaan of een relatie al lange tijd niks "
+"meer heeft gekocht of verkocht,   waarbij we ervan uitgaan dat zijn humeur "
+"is gedaald omdat hij wellicht goederen bij een andere leverancier heeft "
+"gekocht.                  \n"
+"Gebruik deze functionaliteit voor terugkerende zaken."
 
 #. module: crm
 #: field:crm.meeting,vtimezone:0
 msgid "Timezone"
-msgstr ""
+msgstr "Tijdzone"
 
 #. module: crm
 #: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr ""
+msgstr "Zat"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,user_id:0 view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "Verkoper"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "Verwachte afsluitdatum"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "Opportuniteit naar telefoongesprek"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
 msgid "Allows to delete non draft cases"
-msgstr ""
+msgstr "Hiermee kunt u zaken niet in status Nieuw verwijderen"
 
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Repeat"
-msgstr ""
+msgstr "Herhalen"
 
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr ""
+msgstr "Verw. sluitingsjaar"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr ""
+msgstr "Relatienaam"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
 msgid "Outbound"
-msgstr ""
+msgstr "Uitgaand"
 
 #. module: crm
 #: field:crm.lead,date_open:0 field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr ""
+msgstr "Geopend"
 
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr ""
+msgstr "Teamleden"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:crm.phonecall:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contactpersonen"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "Interesse in computers"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr ""
+msgstr "Details uitnodiging"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
 msgid "Default (0=None)"
-msgstr ""
+msgstr "Standaard (0=Geen)"
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -3098,35 +3244,38 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Deze e-mailadressen worden toegevoegd aan het CC-veld van alle inkomende en "
+"uitgaande mails voor dit record. Verschillende adressen kunnen worden "
+"gescheiden door een komma."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Logged Calls"
-msgstr ""
+msgstr "Genoteerde gesprekken"
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
 #: field:crm.phonecall2opportunity,probability:0
 msgid "Success Probability"
-msgstr ""
+msgstr "Succesratio"
 
 #. module: crm
 #: code:addons/crm/crm.py:466 selection:crm.lead.report,state:0
 #: selection:crm.phonecall,state:0 selection:crm.phonecall.report,state:0
 #, python-format
 msgid "Draft"
-msgstr ""
+msgstr "Nieuw"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr ""
+msgstr "Zaken per verkoopteam"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "Deelnemers"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall:0
@@ -3134,306 +3283,307 @@ msgstr ""
 #: model:process.node,name:crm.process_node_meeting0
 #: model:res.request.link,name:crm.request_link_meeting
 msgid "Meeting"
-msgstr ""
+msgstr "Vergadering"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr ""
+msgstr "Zaakcategorie"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "7 Days"
-msgstr ""
+msgstr "7 dagen"
 
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr ""
+msgstr "Geplande opbrengsten per fase en gebruiker"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Communicatie & historiek"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "Normaal"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
 #, python-format
 msgid "Closed/Cancelled Leads can not be converted into Opportunity"
 msgstr ""
+"Gesloten/geannuleerd leads kunnen niet in een opportuniteit worden omgezet"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act
 msgid "Meeting Categories"
-msgstr ""
+msgstr "Vergadercategorieën"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "U dient wellicht na te gaan of de relatie nog niet bestaat."
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "Tijd tot openen"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0 field:crm.phonecall.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #. module: crm
 #: code:addons/crm/crm.py:446
 #, python-format
 msgid "The case '%s' has been cancelled."
-msgstr ""
+msgstr "Zaak '%s' is geannuleerd."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
 msgid "Opportunities By Stage"
-msgstr ""
+msgstr "Opportuniteiten per fase"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr ""
+msgstr "Contract"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
 msgid "Twitter Ads"
-msgstr ""
+msgstr "Twitter Ads"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:336
 #, python-format
 msgid "The opportunity '%s' has been been won."
-msgstr ""
+msgstr "Opportuniteit '%s' is gewonnen."
 
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "Voor alle teams"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:831 code:addons/crm/wizard/crm_add_note.py:28
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Fout"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr ""
+msgstr "Geplande opbrengsten"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "Heeft consulting nodig"
 
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "U kunt niet dezelfde profielen maken."
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
 msgid "Expected closing year"
-msgstr ""
+msgstr "Verwacht afsluitjaar"
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0 field:crm.meeting,partner_address_id:0
 #: field:crm.phonecall,partner_address_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Contactpersoon relatie"
 
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Datum recurrente ID"
 
 #. module: crm
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "U kunt geen twee gebruikers met dezelfde login maken."
 
 #. module: crm
 #: code:addons/crm/crm.py:409 view:crm.lead:0 view:res.partner:0
 #, python-format
 msgid "Close"
-msgstr ""
+msgstr "Sluiten"
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "Een gesprek plannen"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Categorization"
-msgstr ""
+msgstr "Categorisering"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "Gesprek noteren"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
 msgid "Action Rules"
-msgstr ""
+msgstr "Actieregels"
 
 #. module: crm
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "Recurrentie"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr ""
+msgstr "Telefoongesprek"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Donderdag"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "To"
-msgstr ""
+msgstr "Aan"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "Creatiedatum"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "Privé"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "Openbaar voor werknemers"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "Functie"
 
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "_Toevoegen"
 
 #. module: crm
 #: field:crm.case.section,note:0 view:crm.meeting:0
 #: field:crm.meeting,description:0 view:crm.phonecall:0
 #: field:crm.phonecall,description:0 field:crm.segmentation,description:0
 msgid "Description"
-msgstr ""
+msgstr "Omschrijving"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current month"
-msgstr ""
+msgstr "Telefoongesprekken van deze maand"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "Interesse in accessoires"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "Nieuwe opportuniteiten"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "Geen e-mail gevonden voor uw bedrijf"
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "# E-mails"
 
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "Straat"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr ""
+msgstr "Opportuniteiten per gebruiker en team"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "Terug naar Uit te voeren"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "Werkuren"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr ""
+msgstr "Telefoongesprekken"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,is_customer_add:0
 msgid "Customer"
-msgstr ""
+msgstr "Klant"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Lowest"
-msgstr ""
+msgstr "Laagste"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: crm
 #: field:base.action.rule,trg_section_id:0 field:crm.case.categ,section_id:0
@@ -3446,23 +3596,23 @@ msgstr ""
 #: view:crm.phonecall.report:0 field:crm.phonecall2phonecall,section_id:0
 #: field:res.partner,section_id:0 field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Verkoopteam"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6 view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "Verloren"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit"
-msgstr ""
+msgstr "Bewerken"
 
 #. module: crm
 #: field:crm.lead,country_id:0 view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Land"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead2opportunity.partner:0
@@ -3471,12 +3621,12 @@ msgstr ""
 #: selection:crm.lead2opportunity.partner.mass,name:0 view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "Omzetten naar opportuniteit"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Woensdag"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
@@ -3486,28 +3636,32 @@ msgid ""
 "partner. From the phone call form, you can trigger a request for another "
 "call, a meeting or an opportunity."
 msgstr ""
+"Hiermee kunt u inkomende gesprekken snel noteren. Elk gesprek komt in de "
+"relatiefiche, zodat elk contact wordt bijgehouden. Via het telefoonformulier "
+"kunt u een nieuw gesprek plannen, een vergadering beleggen of een "
+"opportuniteit maken."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr ""
+msgstr "Campagnenaam"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
-msgstr ""
+msgstr "Profilering"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "Telefoongesprekken per gebruik en sectie"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_channel_action
@@ -3516,79 +3670,81 @@ msgid ""
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
 msgstr ""
+"Via specifieke kanalen houdt u bij waar uw leads en opportuniteiten vandaan "
+"komen. Enkele voorbeelden: website, telefoon, reseller, enz."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 msgid "Merge with existing Opportunity"
-msgstr ""
+msgstr "Samenvoegen met bestaande opportuniteit"
 
 #. module: crm
 #: field:crm.meeting,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Optie"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Negotiation"
-msgstr ""
+msgstr "Onderhandeling"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
-msgstr ""
+msgstr "Verw. sluiting"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0 field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Volgorde"
 
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "E-mailcompositiewizard"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr ""
+msgstr "Accepteren"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
 msgid "Control Variable"
-msgstr ""
+msgstr "Controlevariabele"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr ""
+msgstr "Tweede"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "Proposition"
-msgstr ""
+msgstr "Voorstel"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
 #: field:crm.phonecall.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Afsluitdatum"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Jaar"
 
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "U kunt niet dezelfde leden maken."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "Nieuwsbrief"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 1d08a5c208c..adbf67bb244 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 5979958cf34..d4ebeadf527 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 331e63e9ce6..fd983b21dec 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: renato.lima@akretion.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-07-28 18:57+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -81,7 +82,7 @@ msgstr " "
 #. module: crm
 #: view:crm.lead.report:0 field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr "Espera para concluir"
+msgstr "Adiar o fechamento"
 
 #. module: crm
 #: view:crm.lead:0
@@ -92,7 +93,7 @@ msgstr "Estágio Anterior"
 #: code:addons/crm/wizard/crm_add_note.py:28
 #, python-format
 msgid "Can not add note!"
-msgstr "Não pôde adicionar anotação!"
+msgstr "Não é possível adicionar uma anotação!"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -113,7 +114,7 @@ msgstr "Dia"
 #. module: crm
 #: sql_constraint:crm.case.section:0
 msgid "The code of the sales team must be unique !"
-msgstr "O código do time de vendas precisa ser único !"
+msgstr "O código da equipe de vendas precisa ser único!"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:553
@@ -213,7 +214,7 @@ msgstr "Ligação Telefônica"
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr "Desistência"
+msgstr "Opt-Out"
 
 #. module: crm
 #: field:crm.meeting,end_type:0
@@ -288,7 +289,7 @@ msgstr "Campanhas"
 #: field:crm.phonecall,state:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "State"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -308,13 +309,13 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
-"If desistência é marcado, este contato será recusado para receber emails ou "
+"If opt-out é marcado, este contato será recusado para receber emails ou "
 "inscrições para uma campanha."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr "Parceiro Prospecto"
+msgstr "Prospectar Parceiro"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:735
@@ -333,7 +334,7 @@ msgstr "Google Adwords 2"
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Link to an existing partner"
-msgstr "Relacionar um Parceiro Existente"
+msgstr "Associar a um Parceiro Existente"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,contact_id:0 view:crm.meeting:0
@@ -356,7 +357,7 @@ msgstr "="
 #. module: crm
 #: field:base.action.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr "Expressão Regular on Histórico do Caso"
+msgstr "Expressão Regular no Histórico do Caso"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:274
@@ -397,7 +398,7 @@ msgstr "Terça"
 #. module: crm
 #: field:crm.lead,write_date:0
 msgid "Update Date"
-msgstr "Data de atualização"
+msgstr "Data de Atualização"
 
 #. module: crm
 #: field:crm.case.section,user_id:0
@@ -510,7 +511,7 @@ msgstr "Agosto"
 #: code:addons/crm/crm.py:433 view:crm.lead:0 view:res.partner:0
 #, python-format
 msgid "Escalate"
-msgstr "Escalada"
+msgstr "Escalar"
 
 #. module: crm
 #: view:crm.lead:0
@@ -569,7 +570,7 @@ msgstr "Resumo"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "State of Mind Computation"
-msgstr "Calculo do Estado Emocional"
+msgstr "Cálculo do Estado Emocional"
 
 #. module: crm
 #: view:crm.case.categ:0
@@ -648,7 +649,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,creation_month:0
 msgid "Creation Month"
-msgstr "Mês de criação"
+msgstr "Mês de Criação"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
@@ -703,12 +704,12 @@ msgstr ""
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmans"
-msgstr "Vendedores"
+msgstr "Representantes"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr "Retorno Previsto"
+msgstr "Receita Provável"
 
 #. module: crm
 #: help:crm.lead.report,creation_month:0
@@ -821,8 +822,8 @@ msgid ""
 "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
 "should better cancel it, instead of deleting it."
 msgstr ""
-"Você não pode apagar o propecto '%s'; ele deve estar no estado 'Rascunho' "
-"para ser apagado. é melhor cancelá-lo ao invés de apagar."
+"Você não pode apagar o propecto '%s'; ele deve estar no estado 'Provisório' "
+"para ser apagado. é melhor cancelá-lo em vez de apagar."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:451
@@ -854,7 +855,7 @@ msgstr "Propostas de Vendas"
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
 msgid "Used to compute open days"
-msgstr "Usado para computar dias abertos"
+msgstr "Usado para calcular dias abertos"
 
 #. module: crm
 #: view:crm.lead:0
@@ -944,7 +945,7 @@ msgstr "Março"
 #: code:addons/crm/wizard/crm_lead_to_partner.py:47
 #, python-format
 msgid "Warning !"
-msgstr "Atenção !"
+msgstr "Aviso!"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1040,8 +1041,8 @@ msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
 msgstr ""
-"Se o campo ativo estiver como verdadeiro, ele permitirá que você esconda a "
-"informação de alarme de evento sem remove-la."
+"Se o campo Ativo estiver marcado, você poderá esconder a informação de "
+"alarme do evento sem removê-la."
 
 #. module: crm
 #: view:crm.lead:0
@@ -1062,7 +1063,7 @@ msgstr "Responsável"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr "Mostrar uma oportunidade"
+msgstr "Mostrar apenas oportunidades"
 
 #. module: crm
 #: view:res.partner:0
@@ -1072,7 +1073,7 @@ msgstr "Anterior"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr "Nova Prospecção"
+msgstr "Novos Prospectos"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1087,12 +1088,12 @@ msgstr "De"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert into Opportunities"
-msgstr "Converta em Oportunidade"
+msgstr "Converter em Oportunidade"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr "Mostrar Time de Vendas"
+msgstr "Mostrar Equipe de Vendas"
 
 #. module: crm
 #: view:res.partner:0
@@ -1107,7 +1108,7 @@ msgstr "Estágio"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5 view:crm.lead:0
 msgid "Won"
-msgstr "Venceu"
+msgstr "Ganhamos"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
@@ -1186,7 +1187,7 @@ msgstr "Estágio"
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr "Informação Histórica"
+msgstr "Histórico"
 
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
@@ -1258,7 +1259,7 @@ msgstr "Setembro"
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr "ID do maior parceiro processado"
+msgstr "Maior ID do Parceiro processado"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
@@ -1321,8 +1322,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
-"Se você verificar neste campo, esta etapa será proposto por padrão em cada "
-"equipe de vendas. Não vai atribuir nesta fase, as equipes já existentes."
+"Se você marcar este campo, esta etapa será proposta por padrão em cada "
+"equipe de vendas. Não irá atribuir esta fase as equipes já existentes."
 
 #. module: crm
 #: field:crm.meeting,fr:0
@@ -1379,7 +1380,7 @@ msgstr "Criar um Parceiro"
 #. module: crm
 #: field:crm.segmentation,state:0
 msgid "Execution Status"
-msgstr "Estado da execução"
+msgstr "Situação da Execução"
 
 #. module: crm
 #: help:crm.phonecall,state:0
@@ -1405,7 +1406,7 @@ msgstr "Segunda"
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr "Dias para concluir"
+msgstr "Dias para Fechar"
 
 #. module: crm
 #: field:crm.case.section,complete_name:0
@@ -1421,7 +1422,7 @@ msgstr "O caso '%s' foi encerrado."
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr "Parceiro para a Oportunidade"
+msgstr "Parceiro para Oportunidade"
 
 #. module: crm
 #: field:crm.meeting,date:0 field:crm.opportunity2phonecall,date:0
@@ -1438,7 +1439,7 @@ msgstr "Filtros Extendidos..."
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in closed state"
-msgstr "Chamadas Telefônicas com o status de concluídas"
+msgstr "Chamadas Telefônicas com situação concluídas"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1492,7 +1493,7 @@ msgstr "Mesclar oportunidades"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer
 msgid "Define Sales Team"
-msgstr "Definir Time de Vendas"
+msgstr "Definir Equipe de Vendas"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
@@ -1519,7 +1520,7 @@ msgstr "Time Filho"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in draft and open state"
-msgstr "Chamadas Telefônicas que estão com status em aberto"
+msgstr "Chamadas Telefônicas que estão com situação em aberto"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
@@ -1549,7 +1550,7 @@ msgstr "res.users"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr "Prospecções/Oportunidades com status de pendente"
+msgstr "Prospecções/Oportunidades com situação pendente"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
@@ -1585,7 +1586,7 @@ msgstr "Categorias de Chamada Telefônica"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in open state"
-msgstr "Prospecções/Oportunidades com o status em aberto"
+msgstr "Prospecções/Oportunidades com situação em aberto"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_categ
@@ -1604,7 +1605,7 @@ msgstr ""
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr "Erro ! Você não pode criar um Time de Vends recursivo."
+msgstr "Erro! Você não pode criar uma Equipe de Vendas recursiva."
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
@@ -1626,12 +1627,12 @@ msgstr "Procurar Reuniões"
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Sale Amount"
-msgstr "Total de Vendas"
+msgstr "Valor da Venda"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day where repeat the meeting"
-msgstr "Escolha o dia onde repetir a reunião"
+msgstr "Escolha o dia para repetir a reunião"
 
 #. module: crm
 #: selection:crm.meeting,state:0
@@ -1747,12 +1748,12 @@ msgstr "Quinta"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr "Prospecções/Oportunidades com o status de concluído"
+msgstr "Prospecções/Oportunidades com o situação concluído"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr "Espera para Fechar"
+msgstr "Espera para o Fechamento"
 
 #. module: crm
 #: field:crm.meeting,we:0
@@ -1781,13 +1782,13 @@ msgstr "Receita Planejada"
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr "Agrupado Por..."
+msgstr "Agrupar Por..."
 
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
 msgstr ""
-"Parceiro Relacionado opcional, geralmente após a conversão de Prospécto"
+"Parceiro Relacionado opcional, geralmente após a conversão do Prospecto"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1797,7 +1798,7 @@ msgstr "Detalhes do Convite"
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr "Time Pai"
+msgstr "Equipe Pai"
 
 #. module: crm
 #: field:crm.lead,date_action:0
@@ -1867,7 +1868,7 @@ msgstr "Ano de criação"
 #: view:crm.case.section:0 view:crm.lead:0 field:crm.lead,description:0
 #: view:crm.opportunity2phonecall:0
 msgid "Notes"
-msgstr "Anotações"
+msgstr "Observações"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
@@ -1942,17 +1943,17 @@ msgstr "Canais"
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Held"
-msgstr "Concluída"
+msgstr "Realizada"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset to Draft"
-msgstr "Voltar para Rascunho"
+msgstr "Voltar para Provisório"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Extra Info"
-msgstr "Informações Extra"
+msgstr "Informações Adicionais"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
@@ -2027,13 +2028,13 @@ msgstr "Responder"
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr "Agendar uma reunião normal ou telefonêma"
+msgstr "Agendar uma reunião normal ou por telefone"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
 #, python-format
 msgid "Error !"
-msgstr "Erro !"
+msgstr "Erro!"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
@@ -2107,7 +2108,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr "Mostrar uma prospecção"
+msgstr "Mostrar somente o prospecto"
 
 #. module: crm
 #: help:crm.meeting,count:0
@@ -2119,7 +2120,7 @@ msgstr "Repetir x vezes"
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr "Time de Vendas"
+msgstr "Equipe de Vendas"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
@@ -2135,12 +2136,12 @@ msgstr "Segmentação"
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr "Time"
+msgstr "Equipe"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr "Prospecções/Oportunidades com o status de novo"
+msgstr "Prospecções/Oportunidades com situação Novo"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
@@ -2250,7 +2251,7 @@ msgstr "Voltar para Não Confirmado"
 #. module: crm
 #: field:crm.opportunity2phonecall,note:0 field:crm.phonecall2phonecall,note:0
 msgid "Note"
-msgstr "Nota"
+msgstr "Observação"
 
 #. module: crm
 #: constraint:res.users:0
@@ -2395,7 +2396,7 @@ msgstr "Diminuir (0>1)"
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
 msgid "Exp. Closing Day"
-msgstr "Exp. Dia de Fechamento"
+msgstr "Fechamento Esperado"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
@@ -2527,13 +2528,13 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
-"O estado é definido para 'Rascunho', quando um caso é criado.                "
-"                  \n"
-"Se o caso está em progresso o estado é definido para 'Aberto'.               "
+"O situação é definido para 'Provisório', quando um caso é criado.            "
+"                      \n"
+"Se o caso está em progresso a situação é definida como 'Aberto'.             "
+"                     \n"
+"Quando o caso termina, a situação é definida como 'Concluído'.               "
 "                   \n"
-"Quando o caso termina, o estado é definido como 'Pronto'.                    "
-"              \n"
-"Se o caso precisa ser revisto então o estado é definido como 'Pendente'."
+"Se o caso precisa ser revisto então a situação é definida como 'Pendente'."
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
@@ -2632,7 +2633,7 @@ msgstr "Prospecções/Oportunidades criadas neste ano"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr "Chamada Telefônica para Parceiro"
+msgstr "Ligação Telefônica para Parceiro"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@@ -2649,7 +2650,7 @@ msgstr "Definir Novo Estado para"
 #: field:crm.lead,date_action_last:0 field:crm.meeting,date_action_last:0
 #: field:crm.phonecall,date_action_last:0
 msgid "Last Action"
-msgstr "Última ação"
+msgstr "Última Ação"
 
 #. module: crm
 #: field:crm.meeting,duration:0 field:crm.phonecall,duration:0
@@ -2665,7 +2666,7 @@ msgstr "Mostrar Países"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Salesman"
-msgstr "Selecione o Vendedor"
+msgstr "Selecione o Representante"
 
 #. module: crm
 #: view:board.board:0
@@ -2766,7 +2767,7 @@ msgstr "Por fazer"
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr "Nome do objeto"
+msgstr "Nome do Objeto"
 
 #. module: crm
 #: help:crm.lead,email_from:0
@@ -2864,7 +2865,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr "Índice de cores"
+msgstr "Índice de Cores"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2945,7 +2946,7 @@ msgstr "Operador"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr "Chamada Telefônica para Chamada Telefônica"
+msgstr "Ligação para Ligação"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3015,7 +3016,7 @@ msgstr "Canal"
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.meeting:0
 #: view:crm.phonecall:0 view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr "Meu Time de Vendas"
+msgstr "Minha Equipe de Vendas"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -3058,7 +3059,7 @@ msgstr "Criar oportunidades de negócios a partir de prospectos"
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM Dashboard"
-msgstr "Dashboard CRM"
+msgstr "Painel do CRM"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
@@ -3068,7 +3069,7 @@ msgstr "Necessita Informação"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr "Oportunidade do Prospécto"
+msgstr "Oportunidade do Prospecto"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
@@ -3095,7 +3096,7 @@ msgstr "_Cancelar"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Daily"
-msgstr "Diário"
+msgstr "Diariamente"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_stage_form_installer
@@ -3126,7 +3127,7 @@ msgstr "Primeiro"
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
 msgid "Exp. Closing Month"
-msgstr "Exp. Mês de Fechamento"
+msgstr "Mês de Fechamento Esperado"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3188,12 +3189,12 @@ msgstr "Fechamento Esperado"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr "Oportunidade para Chamada Telefônica"
+msgstr "Oportunidade para Ligação Telefônica"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
 msgid "Allows to delete non draft cases"
-msgstr "Permite a exclusão de casos \"não-rascunho\""
+msgstr "Permite a exclusão de casos não provisórios"
 
 #. module: crm
 #: field:crm.meeting,count:0
@@ -3203,7 +3204,7 @@ msgstr "Repetir"
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr "Ex.Fechando o Ano"
+msgstr "Ex Fechamento Anual"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3223,7 +3224,7 @@ msgstr "Aberto"
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,member_ids:0
 msgid "Team Members"
-msgstr "Membros do Time"
+msgstr "Membros da Equipe"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:crm.phonecall:0
@@ -3273,17 +3274,17 @@ msgstr "Probabilidade de Sucesso"
 #: selection:crm.phonecall,state:0 selection:crm.phonecall.report,state:0
 #, python-format
 msgid "Draft"
-msgstr "Rascunho"
+msgstr "Provisório"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr "Casos por Time de Vendas"
+msgstr "Casos por Equipe de Vendas"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
 msgid "Attendees"
-msgstr "Pessoas"
+msgstr "Participantes"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall:0
@@ -3296,7 +3297,7 @@ msgstr "Reunião"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr "Categoria de Caso"
+msgstr "Categoria do Caso"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -3325,7 +3326,7 @@ msgstr "Normal"
 #, python-format
 msgid "Closed/Cancelled Leads can not be converted into Opportunity"
 msgstr ""
-"Prospecções Canceladas/Fehadas não pode ser convertidas em oportunidade"
+"Prospectos Cancelados/Fechados não pode ser convertido em Oportunidade"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
@@ -3336,7 +3337,7 @@ msgstr "Categorias de Reunião"
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr "Você deve verificar se este parceiro não existe no cadastro."
+msgstr "Verifique se este já não é um parceiro existente."
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
@@ -3542,7 +3543,7 @@ msgstr "Novas Oportunidades"
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr "Email não encontrado no endereço da empresa"
+msgstr "Email de sua Empresa não configurado!"
 
 #. module: crm
 #: field:crm.lead.report,email:0
@@ -3604,7 +3605,7 @@ msgstr "Fevereiro"
 #: view:crm.phonecall.report:0 field:crm.phonecall2phonecall,section_id:0
 #: field:res.partner,section_id:0 field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr "Time de Vendas"
+msgstr "Equipe de Vendas"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6 view:crm.lead:0
@@ -3749,7 +3750,7 @@ msgstr "Ano"
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursivamente a membros associados."
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
@@ -4540,9 +4541,6 @@ msgstr "Notícias"
 #~ msgid "Synchronization"
 #~ msgstr "Sincronização"
 
-#~ msgid "Select stages for this Sales Team"
-#~ msgstr "Selecione o estágio para este Time de Vendas"
-
 #~ msgid "Weeks"
 #~ msgstr "Semanas"
 
@@ -4601,9 +4599,6 @@ msgstr "Notícias"
 #~ msgid "Lead To Opportunity"
 #~ msgstr "Prospecção para Oportunidade"
 
-#~ msgid "Referred By"
-#~ msgstr "Referenciado por"
-
 #~ msgid "Change Probability on next and previous stages."
 #~ msgstr "Mudar a Probabilidade no estágio anterior e posterior."
 
@@ -4822,3 +4817,9 @@ msgstr "Notícias"
 
 #~ msgid "Schedule/Log a call"
 #~ msgstr "Agendar/Registrar Ligação"
+
+#~ msgid "Select stages for this Sales Team"
+#~ msgstr "Selecione o estágio para esta Equipe de Vendas"
+
+#~ msgid "Referred By"
+#~ msgstr "Indicado por"
diff --git a/addons/crm/i18n/ro.po b/addons/crm/i18n/ro.po
index eb95346c59e..409390d2997 100644
--- a/addons/crm/i18n/ro.po
+++ b/addons/crm/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 64a895fdd06..64efccf1e6d 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-06 11:58+0000\n"
+"PO-Revision-Date: 2012-09-25 09:50+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:36+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -50,7 +50,7 @@ msgstr "Видимость"
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr "Заголовок"
+msgstr "Обращение"
 
 #. module: crm
 #: field:crm.meeting,show_as:0
@@ -102,7 +102,7 @@ msgstr "Название этапа"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Analysis"
-msgstr ""
+msgstr "CRM анализ кандидатов"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
@@ -130,7 +130,7 @@ msgstr "Кандидат '%s'  был закрыт"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Exp. Closing"
-msgstr ""
+msgstr "Ожид. закрытие"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -140,7 +140,7 @@ msgstr "Ежегодно"
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr ""
+msgstr "День создания"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -167,7 +167,7 @@ msgstr "Искать предложения"
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
 msgid "Expected closing month"
-msgstr ""
+msgstr "Ожидаемый месяц закрытия"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
@@ -218,7 +218,7 @@ msgstr "Отказ"
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Recurrence termination"
-msgstr ""
+msgstr "Прекращение повторений"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:323
@@ -252,7 +252,7 @@ msgstr "Критерии"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
-msgstr "Исключенные ответы"
+msgstr "Исключенные ответы :"
 
 #. module: crm
 #: field:crm.case.stage,section_ids:0
@@ -320,7 +320,7 @@ msgstr "Перспективный партнер"
 #: code:addons/crm/crm_lead.py:735
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Без темы"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
@@ -402,7 +402,7 @@ msgstr "Дата изменения"
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr ""
+msgstr "Лидер команды"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
@@ -432,7 +432,7 @@ msgstr "Категория"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunity / Customer"
-msgstr ""
+msgstr "Предложение / Заказчик"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -454,6 +454,12 @@ msgid ""
 "Revenue\" and the \"Expected Closing Date.\" You should also have a look at "
 "the tooltip of the field \"Change Probability Automatically\"."
 msgstr ""
+"Этапы позволят продавцу легко отследить как конкретное предложение "
+"позиционировано в цикле продаж. Для того, чтобы эффективно управлять вашим "
+"потоком продаж, важно определить условия для перехода к следующему шагу. "
+"Пример: для задания предложения как 'Подходящее', вы должны задать "
+"\"Ожидаемый доход\" и \"Ожидаемую дату закрытия\". Вы должны взглянуть на "
+"поле совета \"Автоматическая смена вероятности\"."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -478,7 +484,7 @@ msgstr "Обычная встреча или звонок по предложе
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mail Gateway"
-msgstr ""
+msgstr "Шлюз почты"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
@@ -513,7 +519,7 @@ msgstr "Рассылки"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr ""
+msgstr "Сделать"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -525,7 +531,7 @@ msgstr "Июнь"
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Not Running"
-msgstr "Не выполняется"
+msgstr "Не запущено"
 
 #. module: crm
 #: field:crm.lead,email:0
@@ -535,7 +541,7 @@ msgstr "Эл. письмо"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phonecalls during last 7 days"
-msgstr ""
+msgstr "Звонки за последние 7 дней"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -581,7 +587,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,partner_address_name:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "Название контакта партнёра"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -606,7 +612,7 @@ msgstr "Опции профилирования"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr "# Телефонные звонки"
+msgstr "# Телефонных звонков"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
@@ -626,7 +632,7 @@ msgstr "Встреча '%s' была подтверждена."
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "В процессе"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -640,7 +646,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,creation_month:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Месяц создания"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
@@ -695,7 +701,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmans"
-msgstr ""
+msgstr "Продавец"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
@@ -705,7 +711,7 @@ msgstr "Вероятная выручка"
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr ""
+msgstr "Месяц создания"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -720,7 +726,7 @@ msgstr "Вероятность (%)"
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Company Currency"
-msgstr ""
+msgstr "Валюта компании"
 
 #. module: crm
 #: view:crm.lead:0
@@ -736,6 +742,12 @@ msgid ""
 "opportunities, you can assign the following stage to the team: Territory, "
 "Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost."
 msgstr ""
+"Определите отделы продаж для структурирования организации продаж и назначьте "
+"пользователей в каждый отдел. Также вы должны определить этап продаж для "
+"каждого отдела. Как пример, если вы используете технику решений продаж для "
+"отслеживания ваших предложений, вы можете назначить следующие этапы для "
+"отдела: территория, подходящий, подходящие спонсоры, предположение, "
+"переговоры, выигран/проигран."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:718 view:crm.lead:0 selection:crm.lead,type:0
@@ -748,7 +760,7 @@ msgstr "Предложение"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in last month"
-msgstr ""
+msgstr "Кандидаты/Предложения за прошлый месяц"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
@@ -763,7 +775,7 @@ msgstr "Остановить процесс"
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Месяц-1"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -778,7 +790,7 @@ msgstr "Продолжить"
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Period"
-msgstr ""
+msgstr "Дней в периоде"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -807,17 +819,19 @@ msgid ""
 "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
 "should better cancel it, instead of deleting it."
 msgstr ""
+"Вы не можете удалить кандидата '%s'; для удаления он должна быть в состоянии "
+"'Черновик'. Вам лучше отменить его, вместо удаления."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:451
 #, python-format
 msgid "From %s : %s"
-msgstr ""
+msgstr "От %s : %s"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
 msgid "Creation Year"
-msgstr ""
+msgstr "Год создания"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -838,7 +852,7 @@ msgstr "Продажи Закупки"
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
 msgid "Used to compute open days"
-msgstr ""
+msgstr "Используется для подсчёта открытых дней"
 
 #. module: crm
 #: view:crm.lead:0
@@ -872,7 +886,7 @@ msgstr "Повторяющаяся встреча"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "Нераспределенные звонки"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead2opportunity.partner,opportunity_ids:0
@@ -933,7 +947,7 @@ msgstr "Внимание!"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current year"
-msgstr ""
+msgstr "Звонки за текущий год"
 
 #. module: crm
 #: field:crm.lead,day_open:0
@@ -943,7 +957,7 @@ msgstr "Дней до открытия"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show Time as"
-msgstr ""
+msgstr "Показать время как"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -958,7 +972,7 @@ msgstr "<"
 #. module: crm
 #: field:crm.lead,mobile:0 field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
-msgstr "Моб. тел."
+msgstr "Мобильный"
 
 #. module: crm
 #: view:crm.lead:0
@@ -973,7 +987,7 @@ msgstr "Мои встречи"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Todays's Phonecalls"
-msgstr ""
+msgstr "Сегодняшние звонки"
 
 #. module: crm
 #: view:board.board:0
@@ -1016,7 +1030,7 @@ msgstr "Повторять до"
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
-msgstr "Срок"
+msgstr "Конечный срок"
 
 #. module: crm
 #: help:crm.meeting,active:0
@@ -1030,7 +1044,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Change Color"
-msgstr ""
+msgstr "Изменить цвет"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1046,7 +1060,7 @@ msgstr "Ответственный"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr ""
+msgstr "Показать только предложения"
 
 #. module: crm
 #: view:res.partner:0
@@ -1056,7 +1070,7 @@ msgstr "Предыдущий"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr ""
+msgstr "Новые кандидаты"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1071,12 +1085,12 @@ msgstr "От"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert into Opportunities"
-msgstr ""
+msgstr "Преобразовать в предложения"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr ""
+msgstr "Показать отдел продаж"
 
 #. module: crm
 #: view:res.partner:0
@@ -1134,7 +1148,7 @@ msgstr "Дата создания"
 #. module: crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "Мои предложения"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
@@ -1144,7 +1158,7 @@ msgstr "Нужен дизайн сайта"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Year of call"
-msgstr ""
+msgstr "Год звонка"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
@@ -1180,7 +1194,7 @@ msgstr "Письмо партнеру"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Call Details"
-msgstr ""
+msgstr "Детали звонка"
 
 #. module: crm
 #: field:crm.meeting,class:0
@@ -1190,7 +1204,7 @@ msgstr "Отметить как"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "Описание звонка"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
@@ -1205,7 +1219,7 @@ msgstr "Поля, зависящие от состояния"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr ""
+msgstr "Звонки в состоянии \"В ожидании\""
 
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,stage_ids:0
@@ -1248,7 +1262,7 @@ msgstr "Макс. ID обработанного партнера"
 msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
-msgstr ""
+msgstr "Задание этого этапа автоматически изменит вероятность в предложении."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
@@ -1270,7 +1284,7 @@ msgstr "Продолжительность в минутах"
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
-msgstr ""
+msgstr "Название канала"
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0 field:crm.phonecall2opportunity,name:0
@@ -1280,7 +1294,7 @@ msgstr "Название предложения"
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
-msgstr ""
+msgstr "День ожидаемого закрытия"
 
 #. module: crm
 #: help:crm.case.section,active:0
@@ -1302,6 +1316,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"Если вы отметите это поле, этот этап будет предложен по умолчанию каждому "
+"отделу продаж. Этот этап не будет назначен существующим отделам."
 
 #. module: crm
 #: field:crm.meeting,fr:0
@@ -1321,7 +1337,7 @@ msgstr "Дата записи"
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of Recurrency"
-msgstr ""
+msgstr "Конец повторения"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1345,7 +1361,7 @@ msgstr "Установить сигнал на это время, перед с
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr ""
+msgstr "Запланировать звонок"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1371,6 +1387,13 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"Состояние установлено в 'Сделать', когда вопрос создан.                      "
+"            \\n\n"
+"Если вопрос в процессе, состояние установлено в 'Открыт'.                    "
+"              \\n\n"
+"Когда звонок выполнен, задаётся состояние 'Произведён'.                      "
+"            \\n\n"
+"Если звонок нуждается в выполнении, то задаётся состояние 'Не произведён'."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1413,7 +1436,7 @@ msgstr "Расширенные фильтры..."
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in closed state"
-msgstr ""
+msgstr "Телефонные звонки , которые находятся в закрытом состоянии"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1428,18 +1451,20 @@ msgstr "Предложения по категориям"
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_marketing_department
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "Подразделение маркетинга продаж"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "Дата звонка"
 
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
 "When sending mails, the default email address is taken from the sales team."
 msgstr ""
+"При отправке почты,адрес электронной почты по умолчанию берется из отдела "
+"продаж."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1461,12 +1486,12 @@ msgstr "Запланировать встречу"
 #: code:addons/crm/crm_lead.py:431
 #, python-format
 msgid "Merged opportunities"
-msgstr ""
+msgstr "Объединенные предложения"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer
 msgid "Define Sales Team"
-msgstr ""
+msgstr "Определить отдел продаж"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
@@ -1493,7 +1518,7 @@ msgstr "Подотделы"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in draft and open state"
-msgstr ""
+msgstr "Звонки в состоянии черновик или открыто"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
@@ -1523,7 +1548,7 @@ msgstr "res.users"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr ""
+msgstr "Кандидаты/Предложения в состоянии \"В ожидании\""
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
@@ -1544,12 +1569,12 @@ msgstr ""
 #. module: crm
 #: field:crm.phonecall,opportunity_id:0
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Кандидат/Предложение"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mail"
-msgstr ""
+msgstr "Почта"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1559,12 +1584,12 @@ msgstr "Категории звонков"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in open state"
-msgstr ""
+msgstr "Открытые Кандидаты/Предложения"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_categ
 msgid "Opportunities By Categories"
-msgstr ""
+msgstr "Предложения по категориям"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
@@ -1572,6 +1597,8 @@ msgid ""
 "The name of the future partner that will be created while converting the "
 "lead into opportunity"
 msgstr ""
+"Имя будущего партнера, который будет создан в процессе преобразования "
+"кандидата в предложение"
 
 #. module: crm
 #: constraint:crm.case.section:0
@@ -1582,13 +1609,13 @@ msgstr "Ошибка ! Вы не можете создать рекурсивн
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr ""
+msgstr "Описание звонка"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
 msgid "Do not link to a partner"
-msgstr ""
+msgstr "Не связывать с партнёром"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1619,7 +1646,7 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
-"Анализ предложений дает вам мгновенный доступ к такой информации, как "
+"Анализ предложений дает вам мгновенный доступ к такой информации как: "
 "ожидаемый доход, плановая себестоимость, пропущенные сроки или количество "
 "взаимодействий в предложении. Этот отчет в основном используется менеджером "
 "по продажам, с тем чтобы сделать периодический обзор по отделам продаж в "
@@ -1644,13 +1671,13 @@ msgid ""
 "specific lead or opportunity is positioned in the sales cycle."
 msgstr ""
 "Добавление специальных этапов к кандидатам и предложениям позволяет лучше "
-"организовать процесс продаж. Этапы позволяют легче отслеживать нахождение "
+"организовать процесс продаж. Этапы позволяют легче отслеживать положение "
 "кандидатов и предложений в процессе продаж."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert opportunities"
-msgstr ""
+msgstr "Преобразовать предложения"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
@@ -1687,7 +1714,7 @@ msgstr "Преобразовать в возможного бизнес-парт
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting / Partner"
-msgstr ""
+msgstr "Встреча / Партнер"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
@@ -1719,7 +1746,7 @@ msgstr "Пятый"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr ""
+msgstr "Кандидаты/предложения в сделанном состоянии"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
@@ -1740,7 +1767,7 @@ msgstr "Возможный посредник"
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the saleman with the team leader."
-msgstr ""
+msgstr "При обострении для этого отдела, продавец заменяется на начальника."
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
@@ -1798,7 +1825,7 @@ msgstr "Входящие"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Month of call"
-msgstr ""
+msgstr "Месяц звонка"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1831,7 +1858,7 @@ msgstr "Наивысший"
 #. module: crm
 #: help:crm.lead.report,creation_year:0
 msgid "Creation year"
-msgstr ""
+msgstr "Год создания"
 
 #. module: crm
 #: view:crm.case.section:0 view:crm.lead:0 field:crm.lead,description:0
@@ -1857,7 +1884,7 @@ msgstr "Предложения по категориям"
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr "Имя заказчика"
+msgstr "Название заказчика"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
@@ -1887,7 +1914,7 @@ msgstr "Опция повторения"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr ""
+msgstr "Кандидат / Заказчик"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -1905,19 +1932,19 @@ msgstr "Преобразовать в предложение"
 #: model:ir.model,name:crm.model_crm_case_channel
 #: model:ir.ui.menu,name:crm.menu_crm_case_channel
 msgid "Channels"
-msgstr ""
+msgstr "Каналы"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Held"
-msgstr "Приостановлено"
+msgstr "Произведен"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset to Draft"
-msgstr "Установить в \"черновик\""
+msgstr "Установить в \"Черновик\""
 
 #. module: crm
 #: view:crm.lead:0
@@ -1977,7 +2004,7 @@ msgstr "Использовать правила продаж покупок"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr "Кандидат в партнера предложения"
+msgstr "Кандидат в предложение партнеру"
 
 #. module: crm
 #: field:crm.lead,location_id:0 field:crm.meeting,location:0
@@ -1987,7 +2014,7 @@ msgstr "Расположение"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr ""
+msgstr "Массовое проведение предложений партнёру"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2027,7 +2054,7 @@ msgstr "Планируемая Дата"
 #. module: crm
 #: field:crm.meeting,base_calendar_url:0
 msgid "Caldav URL"
-msgstr "Caldav URL"
+msgstr "Адрес Caldav"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2042,7 +2069,7 @@ msgstr "Имя контакта"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads creating during last 7 days"
-msgstr ""
+msgstr "Кандидаты, созданные за последние 7 дней"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -2074,7 +2101,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "Показать только кандидата"
 
 #. module: crm
 #: help:crm.meeting,count:0
@@ -2102,18 +2129,18 @@ msgstr "Классификация"
 #. module: crm
 #: view:crm.lead:0
 msgid "Team"
-msgstr "Группа"
+msgstr "Команда"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr ""
+msgstr "Кандидаты/Предложения в стадии \"Новый\""
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 view:res.partner:0
 msgid "Not Held"
-msgstr "Не проведено"
+msgstr "Не произведен"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
@@ -2123,13 +2150,13 @@ msgstr "Вероятность"
 #. module: crm
 #: view:crm.lead:0
 msgid "Pending Opportunities"
-msgstr ""
+msgstr "Предложения в состоянии \"В ожидании\""
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Please select more than one opportunity from the list view."
-msgstr ""
+msgstr "Пожалуйста, выберите более одного кандидата из списка."
 
 #. module: crm
 #: view:crm.lead.report:0 field:crm.meeting,month_list:0
@@ -2181,7 +2208,7 @@ 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 "Scheduled Calls"
-msgstr ""
+msgstr "Запланированные звонки"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
@@ -2191,7 +2218,7 @@ msgstr "Дата начала"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Scheduled Phonecalls"
-msgstr ""
+msgstr "Запланированные звонки"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2201,7 +2228,7 @@ msgstr "Отклонить"
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Email пользователя"
 
 #. module: crm
 #: help:crm.lead,optin:0
@@ -2246,7 +2273,7 @@ msgstr "Всего запланированная выручка"
 #. module: crm
 #: view:crm.lead:0
 msgid "Open Opportunities"
-msgstr ""
+msgstr "Открытые предложения"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2282,7 +2309,7 @@ msgstr "Телефонные звонки"
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Search"
-msgstr ""
+msgstr "Поиск этапа"
 
 #. module: crm
 #: help:crm.lead.report,delay_open:0 help:crm.phonecall.report,delay_open:0
@@ -2292,7 +2319,7 @@ msgstr "Количество дней на открытие вопроса"
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Number of repetitions"
-msgstr ""
+msgstr "Количество повторов"
 
 #. module: crm
 #: field:crm.lead,phone:0 field:crm.opportunity2phonecall,phone:0
@@ -2336,7 +2363,7 @@ msgstr "Неопределенный"
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages."
-msgstr ""
+msgstr "Используется для упорядочения этапов."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:276
@@ -2360,12 +2387,12 @@ msgstr "Уменьшить (0>1)"
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
 msgid "Exp. Closing Day"
-msgstr ""
+msgstr "Ожид. день закрытия"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Reassign Escalated"
-msgstr ""
+msgstr "Переназначить обостренное"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -2387,7 +2414,7 @@ msgstr "Прочее"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_crm
 msgid "Sales"
-msgstr ""
+msgstr "Продажи"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
@@ -2396,6 +2423,8 @@ msgid ""
 "You can not escalate, you are already at the top level regarding your sales-"
 "team category."
 msgstr ""
+"Вы не можете обострить, вы уже на высшем уровне относительно вашей категории "
+"отдела продаж."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8 view:crm.meeting:0
@@ -2410,7 +2439,7 @@ msgstr "Сделано"
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr "Повтор каждый (День/Неделя/Месяц/Год)"
+msgstr "Повтор каждый (День/Неделю/Месяц/Год)"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2442,7 +2471,7 @@ msgstr "Занят"
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
-msgstr ""
+msgstr "День создания"
 
 #. module: crm
 #: field:crm.meeting,interval:0
@@ -2457,7 +2486,7 @@ msgstr "Повторяющийся"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in last month"
-msgstr ""
+msgstr "Звонки, сделанные за последний месяц"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor
@@ -2472,7 +2501,7 @@ msgstr "Максимальная история общения"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr "Пригласить"
+msgstr "Пригласить людей"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,categ_id:0
@@ -2491,8 +2520,8 @@ msgid ""
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
 "Состояние  установлено в 'Черновик', при создании вопроса.       \n"
-"Если вопрос в работе состояние  установлено в 'Открыто'.            \n"
-"Когда вопрос  решен состояние  установлено в 'Сделано'.              \n"
+"Если вопрос в работе, состояние  установлено в 'Открыто'.            \n"
+"Когда вопрос  решен, состояние  установлено в 'Сделано'.              \n"
 "Если вопрос нуждается в рассмотрении, то состояние 'В ожидании'."
 
 #. module: crm
@@ -2517,7 +2546,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Opportunities"
-msgstr ""
+msgstr "Нераспределенные предложения"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2561,6 +2590,8 @@ msgid ""
 "From which campaign (seminar, marketing campaign, mass mailing, ...) did "
 "this contact come from?"
 msgstr ""
+"Из какой кампании поступил этот контакт (семинар, маркетинговая кампания, "
+"массовая рассылка, ...)?"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
@@ -2575,7 +2606,7 @@ msgstr "Проверка классификации"
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "Логин пользователя"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2585,7 +2616,7 @@ msgstr "Продолжение процесса"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current year"
-msgstr ""
+msgstr "Кандидаты/Предложения созданные в этом году"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
@@ -2613,17 +2644,17 @@ msgstr "Последнее действие"
 #: field:crm.meeting,duration:0 field:crm.phonecall,duration:0
 #: field:crm.phonecall.report,duration:0
 msgid "Duration"
-msgstr "Продолжительность"
+msgstr "Длительность"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show countries"
-msgstr ""
+msgstr "Показать страны"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Salesman"
-msgstr ""
+msgstr "Выберите продавца"
 
 #. module: crm
 #: view:board.board:0
@@ -2638,7 +2669,7 @@ msgstr "кол-во вопросов"
 #. module: crm
 #: help:crm.meeting,section_id:0 help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr "Отдел продаж, которому принадлежат вопросы."
+msgstr "Отдел продаж, которому принадлежит вопрос."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -2659,7 +2690,7 @@ msgstr "Не изменен"
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr "Сегментация партнеров"
+msgstr "Классификация партнеров"
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2669,7 +2700,7 @@ msgstr "Факс"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current month"
-msgstr ""
+msgstr "Кандидаты/Предложения созданные в этом месяце"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2681,7 +2712,7 @@ msgstr "Назначение"
 #: field:crm.lead.report,company_id:0 field:crm.phonecall,company_id:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,company_id:0
 msgid "Company"
-msgstr "Организация"
+msgstr "Компания"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -2701,12 +2732,12 @@ msgstr "Обязательно / Опционально"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr ""
+msgstr "Нераспределенные кандидаты"
 
 #. module: crm
 #: field:crm.lead,subjects:0
 msgid "Subject of Email"
-msgstr ""
+msgstr "Тема письма"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
@@ -2761,7 +2792,7 @@ msgstr "Сообщения"
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr ""
+msgstr "Канал общения (почта, телефон, напрямую, ...)"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
@@ -2822,7 +2853,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Цветовая палитра"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2839,7 +2870,7 @@ msgid ""
 msgstr ""
 "Создавать специальные категории, которые подходят к деятельности вашей "
 "компании, чтобы лучше классифицировать и анализировать ваших кандидатов и "
-"предложения. Такие категории, могут, например, отражать вашу структуру "
+"предложения. Такие категории могут, например, отражать вашу структуру "
 "продукции или различные типы продаж."
 
 #. module: crm
@@ -2872,12 +2903,12 @@ msgstr "# Писем"
 #. module: crm
 #: field:crm.phonecall,name:0 view:res.partner:0
 msgid "Call Summary"
-msgstr "Отчет о звонках"
+msgstr "Описание звонка"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Todays' Leads"
-msgstr ""
+msgstr "Сегодняшние кандидаты"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -2888,6 +2919,11 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"Запланированные звонки перечисляют все звонки, которые будут сделаны вашим "
+"отделом продаж. Продавец может записать информацию о звонке в форме ввода. "
+"Эта информация будет сохранена в форме ввода партнёра для отслеживания "
+"каждого вашего контакта с покупателем. Также вы можете импортировать .CSV-"
+"файл со списком звонков, которые будут сделаны вашим отделом продаж."
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -2913,7 +2949,7 @@ msgstr "Подтверждено"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
-msgstr ""
+msgstr "Планируемые поступления по пользователю и этапу"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2943,7 +2979,7 @@ msgstr "День месяца"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor_stage
 msgid "Planned Revenue By Stage"
-msgstr ""
+msgstr "Планируемая выручка по этапу"
 
 #. module: crm
 #: selection:crm.add.note,state:0 model:crm.case.stage,name:crm.stage_lead1
@@ -2967,7 +3003,7 @@ msgstr "Канал"
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.meeting:0
 #: view:crm.phonecall:0 view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Мои отделы продаж"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2977,8 +3013,8 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
-"Отметьте, если категория ограничена контрагентами, подпадающими под критерии "
-"сегментации.                        \n"
+"Отметьте, если категория ограничена партнерами, подпадающими под критерии "
+"классификации.                        \n"
 "Если отмечено, из категории будут удалёны контрагенты, не подпадающие под "
 "эти критерии."
 
@@ -2993,7 +3029,7 @@ msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
 msgstr ""
-"Последний срок автоматически вычисляются как \"Дата начала\" + "
+"Последний срок автоматически вычисляется как \"Дата начала\" + "
 "\"Длительность\""
 
 #. module: crm
@@ -3010,7 +3046,7 @@ msgstr "Создание предложений из кандидатов"
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM Dashboard"
-msgstr ""
+msgstr "Панель аналитики CRM"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
@@ -3030,7 +3066,7 @@ msgstr "Установить категорию в"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr ""
+msgstr "Кому:"
 
 #. module: crm
 #: field:crm.meeting,th:0
@@ -3052,7 +3088,7 @@ msgstr "Ежедневно"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_stage_form_installer
 msgid "Review Sales Stages"
-msgstr ""
+msgstr "Обзор этапов продаж"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
@@ -3062,13 +3098,13 @@ msgstr "Уточнение"
 #. module: crm
 #: field:crm.lead,partner_address_email:0
 msgid "Partner Contact Email"
-msgstr ""
+msgstr "Контактный e-mail партнёра"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:48
 #, python-format
 msgid "A partner is already defined."
-msgstr ""
+msgstr "Партнёр уже существует."
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -3078,7 +3114,7 @@ msgstr "Первый"
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
 msgid "Exp. Closing Month"
-msgstr ""
+msgstr "Ожид. месяц закрытия"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3090,12 +3126,12 @@ msgstr "Декабрь"
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition on Communication History"
-msgstr "Условие на историю общения"
+msgstr "Условие для истории общения"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Date of Call"
-msgstr ""
+msgstr "Дата звонка"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3109,7 +3145,7 @@ msgid ""
 "Use this functionality for recurring businesses."
 msgstr ""
 "Период - среднее количество дней между двумя циклами продаж или покупок для "
-"этой сегментации.                 \n"
+"этой классификации.                 \n"
 "Это, главным образом, используется для обнаружения слишком длительного "
 "периода за который партнер ничего не покупал,       \n"
 "поэтому мы предполагаем, что его мнение ухудшилось, потому что он, вероятно, "
@@ -3130,7 +3166,7 @@ msgstr "Сб"
 #: view:crm.lead:0 field:crm.lead,user_id:0 view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesman"
-msgstr "Менеджер продаж"
+msgstr "Продавец"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,date_deadline:0
@@ -3155,12 +3191,12 @@ msgstr "Повторить"
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr ""
+msgstr "Ожид. год закрытия"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr "Имя партнера"
+msgstr "Название партнера"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
@@ -3211,7 +3247,7 @@ 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 "Logged Calls"
-msgstr ""
+msgstr "Описанные звонки"
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -3275,7 +3311,7 @@ msgstr "Нормальный"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
 #, python-format
 msgid "Closed/Cancelled Leads can not be converted into Opportunity"
-msgstr ""
+msgstr "Закрытые/Отмененные кандидаты нельзя преобразовать в предложения"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
@@ -3339,12 +3375,12 @@ msgstr "Реклама в Twitter"
 #: code:addons/crm/crm_lead.py:336
 #, python-format
 msgid "The opportunity '%s' has been been won."
-msgstr ""
+msgstr "Предложение '%s' выиграно."
 
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "Общее для всех отделов"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:831 code:addons/crm/wizard/crm_add_note.py:28
@@ -3370,7 +3406,7 @@ msgstr "Ошибка ! Вы не можете создать зацикленн
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
 msgid "Expected closing year"
-msgstr ""
+msgstr "Ожидаемый год закрытия"
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0 field:crm.meeting,partner_address_id:0
@@ -3398,7 +3434,7 @@ msgstr "Закрыть"
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "Запланировать звонок"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
@@ -3408,7 +3444,7 @@ msgstr "Категоризация"
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "Описать звонок"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
@@ -3438,7 +3474,7 @@ msgstr "Кому"
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -3448,7 +3484,7 @@ msgstr "Личный"
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "Общий для работников"
 
 #. module: crm
 #: field:crm.lead,function:0
@@ -3470,7 +3506,7 @@ msgstr "Описание"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current month"
-msgstr ""
+msgstr "Звонки, сделанные в текущем месяце"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3487,13 +3523,13 @@ msgstr "Интерес к аксессуарам"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "Новые предложения"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "Не найден e-mail для адреса вашей компании!"
 
 #. module: crm
 #: field:crm.lead.report,email:0
@@ -3513,7 +3549,7 @@ msgstr "Предложения по пользователям и отделам
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "Установить в \"Сделать\""
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
@@ -3565,7 +3601,7 @@ msgstr "Проиграно"
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit"
-msgstr ""
+msgstr "Изменить"
 
 #. module: crm
 #: field:crm.lead,country_id:0 view:crm.lead.report:0
@@ -3595,6 +3631,10 @@ msgid ""
 "partner. From the phone call form, you can trigger a request for another "
 "call, a meeting or an opportunity."
 msgstr ""
+"Этот инструмент позволяет вам описывать входящие звонки на лету. Каждый "
+"получаемый вами звонок будет появляться в форме партнёра для отслеживания "
+"каждого вашего контакта с партнёром. Из формы телефонного звонка вы можете "
+"запустить запрос другого звонка, встречу или предложение."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3625,6 +3665,9 @@ msgid ""
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
 msgstr ""
+"Отлеживание источников появления кандидатов и предложений путём создания "
+"специализированных каналов, обслуживаемых при создании докумета в системе. "
+"Например, каналы могут быть такими: сайт, телефонный звонок, реселлер и т.д."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
@@ -3650,12 +3693,12 @@ msgstr "Ожид.Закр."
 #. module: crm
 #: field:crm.case.stage,sequence:0 field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr "Последовательность"
+msgstr "Нумерация"
 
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "Мастер создания электронной почты"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3692,7 +3735,7 @@ msgstr "Год"
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
@@ -4509,9 +4552,6 @@ msgstr "Рассылка"
 #~ msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
 #~ msgstr "Закрытый/отмененный звонок нельзя преобразовать в предложение"
 
-#~ msgid "Opportunity to Quotation"
-#~ msgstr "Предложение в Заказ на продажу"
-
 #~ msgid "Lead To Opportunity"
 #~ msgstr "Кандидат в Предложение"
 
@@ -4598,3 +4638,15 @@ msgstr "Рассылка"
 
 #~ msgid "Message Body"
 #~ msgstr "Тело сообщения"
+
+#~ msgid "Schedule/Log a call"
+#~ msgstr "Планировать/Описать звонок"
+
+#~ msgid "Schedule call"
+#~ msgstr "Запланировать звонок"
+
+#~ msgid "Opportunity to Quotation"
+#~ msgstr "Предложение в Запрос цен"
+
+#~ msgid "Assigned opportunities to"
+#~ msgstr "Предложения назначены"
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index 268d6e4e876..7705624b069 100644
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/sl.po b/addons/crm/i18n/sl.po
index 9cc8450091f..de540474aa4 100644
--- a/addons/crm/i18n/sl.po
+++ b/addons/crm/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/sq.po b/addons/crm/i18n/sq.po
index 2c69dabb2b0..0bfbcd576e5 100644
--- a/addons/crm/i18n/sq.po
+++ b/addons/crm/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/sr.po b/addons/crm/i18n/sr.po
index 95c6f4087d4..daa1241ab63 100644
--- a/addons/crm/i18n/sr.po
+++ b/addons/crm/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:56+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/sr@latin.po b/addons/crm/i18n/sr@latin.po
index e88876edbee..18c4e0aa376 100644
--- a/addons/crm/i18n/sr@latin.po
+++ b/addons/crm/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index ccc512d93fa..833d9f14425 100644
--- a/addons/crm/i18n/sv.po
+++ b/addons/crm/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/th.po b/addons/crm/i18n/th.po
index af880fcbc57..74027f55351 100644
--- a/addons/crm/i18n/th.po
+++ b/addons/crm/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/tlh.po b/addons/crm/i18n/tlh.po
index 2653ea054cf..82d60c44665 100644
--- a/addons/crm/i18n/tlh.po
+++ b/addons/crm/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index 188eb205e02..523923fb18c 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -455,6 +455,13 @@ msgid ""
 "Revenue\" and the \"Expected Closing Date.\" You should also have a look at "
 "the tooltip of the field \"Change Probability Automatically\"."
 msgstr ""
+"Aşamalar, satış elemanının belirli bir fırsatın nasıl satış döngüsüne "
+"yerleştirildiğini izlemesini sağlar. Satış kanalınızı daha verimli bir "
+"şekilde yönetmek için, sonraki adıma geçilebilmesi için gerekli koşulları "
+"tanımlamanız önemlidir. Örneğin: bir fırsatı 'Uygun' olarak ayarlamak için "
+"\"Umulan Gelir\" ve \"Umulan Kapanış Tarihi\" ni ayarlamanız gerekir. "
+"Ayrıca; \"Olasılığı Otomatikman Değiştir\" alanının araç ipucuna da "
+"gözatmalısınız."
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -736,6 +743,11 @@ msgid ""
 "opportunities, you can assign the following stage to the team: Territory, "
 "Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost."
 msgstr ""
+"Satış organizasyonlarınızı yapılandırmak için satış takımını tanımlayın ve "
+"her takıma kullanıcı atayın. Ayrıca; her takıma satış aşamaları da "
+"tanımlamalısınız. Örnek olarak, fırsatlarınızı izlemek için Satış Çözümleri "
+"tekniğini kullanırsanız, takıma aşağıdaki aşamayı atayabilirsiniz: Bölge, "
+"Uygun, Uygun Sponsorlar, Öneri, Görüşme, Kazanç/Kayıp"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:718 view:crm.lead:0 selection:crm.lead,type:0
@@ -748,7 +760,7 @@ msgstr "Fırsat"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in last month"
-msgstr ""
+msgstr "Geçen ayda oluşturulan Adaylar/Fırsatlar"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
@@ -807,6 +819,8 @@ msgid ""
 "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
 "should better cancel it, instead of deleting it."
 msgstr ""
+"'%s' Adayını silemezsiniz; silinebilmesi için 'Taslak' durumunda olmalıdır. "
+"Onu silmek yerine iptal etmeniz daha iyi olur."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:451
@@ -1056,7 +1070,7 @@ msgstr "Önceki"
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr ""
+msgstr "Yeni Adaylar"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1250,6 +1264,7 @@ msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
 msgstr ""
+"Bu aşamayı ayarlamak fırsattaki olasılığı otomatikman değiştirecektir."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
@@ -1303,6 +1318,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"Bu alanı işaretlerseniz, bu aşama her satış takımına varsayılan olarak "
+"önerilecektir. Varolan takımlara bu aşama atanmayacaktır."
 
 #. module: crm
 #: field:crm.meeting,fr:0
@@ -1372,6 +1389,13 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"Bir durum oluşturulduğunda durum 'Yapılacak'olarak ayarlanır.                "
+"                  \n"
+"Eğer durum yürütülmekteyse durum 'Açık' olarak ayarlanır.                    "
+"              \n"
+"Çağrı bittiğinde durum 'Beklemede' olarak ayarlanır.                         "
+"         \n"
+"Çağrıyı bitirmek gerektiğinde durum 'Bekelemede değil' olarak ayarlanır."
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
@@ -1429,7 +1453,7 @@ msgstr "Kategorilere göre fırsatlar"
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_marketing_department
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "Satış Pazarlama Bölümü"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1524,7 +1548,7 @@ msgstr "res.users"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr ""
+msgstr "Bekleyen durumundaki Adaylar/Fırsatlar"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
@@ -1544,7 +1568,7 @@ msgstr "Eğer paydaşa bir eposta göndermek isterseniz bunu işaretleyin."
 #. module: crm
 #: field:crm.phonecall,opportunity_id:0
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Aday/Fırsat"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1559,7 +1583,7 @@ msgstr "Telefon Görüşmesi Kategorileri"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in open state"
-msgstr ""
+msgstr "Açık durumundaki Adaylar/Fırsatlar"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_categ
@@ -1572,6 +1596,7 @@ msgid ""
 "The name of the future partner that will be created while converting the "
 "lead into opportunity"
 msgstr ""
+"Adayın fırsata dönüştürülmesi sırasında oluşturulacak gelecek paydaşın adı"
 
 #. module: crm
 #: constraint:crm.case.section:0
@@ -1719,7 +1744,7 @@ msgstr "Beşinci"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr ""
+msgstr "Tamamlandı durumundaki Adaylar/Fırsatlar"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
@@ -1740,7 +1765,7 @@ msgstr "Potansiyel Satıcı"
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the saleman with the team leader."
-msgstr ""
+msgstr "Bu takıma yükselirken satıcı ile takım lideri geçersiz kılınır"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
@@ -1886,7 +1911,7 @@ msgstr "Yineleme Seçeneği"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr ""
+msgstr "Aday/ Mğşteri"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -1986,7 +2011,7 @@ msgstr "Konum"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr ""
+msgstr "Adaydan Fırsat Paydaşına toplu dönüştür"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2041,7 +2066,7 @@ msgstr "İlgili Adı"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads creating during last 7 days"
-msgstr ""
+msgstr "Son 7 günde oluşturulan Adaylar"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -2075,7 +2100,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "Yalnızca adayları göster"
 
 #. module: crm
 #: help:crm.meeting,count:0
@@ -2108,7 +2133,7 @@ msgstr "Takım"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr ""
+msgstr "Yeni durumundaki Adayla/Fırsatlar"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
@@ -2130,7 +2155,7 @@ msgstr "Bekleyen Fırsatlar"
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Please select more than one opportunity from the list view."
-msgstr ""
+msgstr "Liste görünümünden lütfen birden çok fırsat seçin."
 
 #. module: crm
 #: view:crm.lead.report:0 field:crm.meeting,month_list:0
@@ -2337,7 +2362,7 @@ msgstr "Belirsiz"
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages."
-msgstr ""
+msgstr "Aşamalrı sıralamak için kullanılır."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:276
@@ -2366,7 +2391,7 @@ msgstr "Bekl. Kapanış Günü"
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Reassign Escalated"
-msgstr ""
+msgstr "Yükseltileni yeniden ata"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -2397,6 +2422,7 @@ msgid ""
 "You can not escalate, you are already at the top level regarding your sales-"
 "team category."
 msgstr ""
+"Yükseltemezsiniz, satış-takımı kategorisine göre zaten en üst düzeydesiniz."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8 view:crm.meeting:0
@@ -2521,7 +2547,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Opportunities"
-msgstr ""
+msgstr "Atanmamış Fırsatlar"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2565,6 +2591,8 @@ msgid ""
 "From which campaign (seminar, marketing campaign, mass mailing, ...) did "
 "this contact come from?"
 msgstr ""
+"Bu kişi hangi kampanyadan (seminer, pazarlama kampanyası, toplu postalama, "
+"...) geldi?"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
@@ -2589,7 +2617,7 @@ msgstr "Devam Prosesi"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current year"
-msgstr ""
+msgstr "Geçerli yılda oluşturulan Adaylar/Fırsatlar"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
@@ -2673,7 +2701,7 @@ msgstr "Faks"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current month"
-msgstr ""
+msgstr "Geçerli ayda oluşturulan Adaylar/Fırsatlar"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2705,7 +2733,7 @@ msgstr "Zorunlu / Seçmeli"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr ""
+msgstr "Atanmamış Adaylar"
 
 #. module: crm
 #: field:crm.lead,subjects:0
@@ -2881,7 +2909,7 @@ msgstr "Çağrı Özeti"
 #. module: crm
 #: view:crm.lead:0
 msgid "Todays' Leads"
-msgstr ""
+msgstr "Bugünün Adayları"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -2892,6 +2920,11 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"Planlanmış çağrılar, satış takımınızca yapılması gereken bütün çağrıları "
+"listeler. Bir satıcı, çağrı ile ilgili bilgiyi form görünümünde "
+"kaydedebilir. Bu bilgi, bir müşteriye ait her kişiyi izlemek için paydaş "
+"formuna kaydedilecektir. Ayrıca; satış takımınızca yapılması gereken "
+"çağrıların listesini bir .CSV dosyası olarak içeaktarabilirsiniz."
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -2917,7 +2950,7 @@ msgstr "Onaylandı"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
-msgstr ""
+msgstr "Kullanıcı ve Aşamaya göre Planlanan Gelir"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -2947,7 +2980,7 @@ msgstr "Ayın günü"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor_stage
 msgid "Planned Revenue By Stage"
-msgstr ""
+msgstr "Aşamaya göre Planlanan Gelir."
 
 #. module: crm
 #: selection:crm.add.note,state:0 model:crm.case.stage,name:crm.stage_lead1
@@ -3054,7 +3087,7 @@ msgstr "Günlük"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_stage_form_installer
 msgid "Review Sales Stages"
-msgstr ""
+msgstr "Satış Aşamalarını İncele"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
@@ -3277,7 +3310,7 @@ msgstr "Normal"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
 #, python-format
 msgid "Closed/Cancelled Leads can not be converted into Opportunity"
-msgstr ""
+msgstr "Fırsata dönüştürülemeyen Kapalı/İptal edilmiş Adaylar"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
@@ -3409,7 +3442,7 @@ msgstr "Sınıflandırma"
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "Çağrı Günlüğü"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
@@ -3514,7 +3547,7 @@ msgstr "Kullanıcıya ve Takıma göre Fırsatlar"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "Yapılacaklara Sıfırla"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
@@ -3596,6 +3629,10 @@ msgid ""
 "partner. From the phone call form, you can trigger a request for another "
 "call, a meeting or an opportunity."
 msgstr ""
+"Bu araç, gelen çağrılara anında bağlanmanızı sağlar. Aldığınız her çağrı, "
+"bir paydaşa ait her kişiyi izlemek için paydaş formunda belirecektir. Çağrı "
+"formundan, diğer bir çağrıyı, bir toplantıyı ya da bir fırsatı "
+"başlatabilirsiniz."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -3626,6 +3663,8 @@ msgid ""
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
 msgstr ""
+"Adaylarınızın ve fırsatlarınızın nereden geldiğini, sistem içinde bir belge "
+"oluştururken sağlanacak özel kanallar oluşturarak izleyin."
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
@@ -4497,3 +4536,6 @@ msgstr "Habermektubu"
 
 #~ msgid "Schedule call"
 #~ msgstr "Görüşme Programla"
+
+#~ msgid "Assigned opportunities to"
+#~ msgstr "Fırsatların buna ata"
diff --git a/addons/crm/i18n/uk.po b/addons/crm/i18n/uk.po
index a9743b624e7..979dc4539c3 100644
--- a/addons/crm/i18n/uk.po
+++ b/addons/crm/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/vi.po b/addons/crm/i18n/vi.po
index 18002726457..aad7249885f 100644
--- a/addons/crm/i18n/vi.po
+++ b/addons/crm/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:59+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po
index efa67733a64..8562b716dd5 100644
--- a/addons/crm/i18n/zh_CN.po
+++ b/addons/crm/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-03-22 16:17+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-10-25 16:22+0000\n"
+"Last-Translator: fenshuajiang <openerp@126.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -172,7 +172,7 @@ msgstr "预计结束月份"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assigned Opportunities to"
-msgstr ""
+msgstr "分配商机给"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_id:0 view:crm.lead.report:0
@@ -583,7 +583,7 @@ msgstr "结束日期"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "计划/记录一个电话"
 
 #. module: crm
 #: constraint:base.action.rule:0
@@ -763,7 +763,7 @@ msgstr "继续"
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Period"
-msgstr ""
+msgstr "每阶段的天数"
 
 #. module: crm
 #: field:crm.meeting,byday:0
@@ -926,7 +926,7 @@ msgstr "开启天数"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show Time as"
-msgstr ""
+msgstr "显示时间为"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -1299,7 +1299,7 @@ msgstr "写日期"
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of Recurrency"
-msgstr ""
+msgstr "结束循环"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1835,7 +1835,7 @@ msgstr "回复到"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select Stages for this Sales Team"
-msgstr ""
+msgstr "为这个销售团队选择阶段"
 
 #. module: crm
 #: view:board.board:0
@@ -2683,7 +2683,7 @@ msgstr "这联系的邮件地址"
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred by"
-msgstr ""
+msgstr "推荐人"
 
 #. module: crm
 #: view:crm.lead:0 model:ir.model,name:crm.model_crm_add_note
diff --git a/addons/crm/i18n/zh_TW.po b/addons/crm/i18n/zh_TW.po
index ad6407b4b9e..437888ca6a6 100644
--- a/addons/crm/i18n/zh_TW.po
+++ b/addons/crm/i18n/zh_TW.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: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-09-27 07:26+0000\n"
+"PO-Revision-Date: 2012-08-30 10:41+0000\n"
 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
-"Language-Team: \n"
+"Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:00+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr "潛在客戶數"
+msgstr "潛在客戶"
 
 #. module: crm
 #: view:crm.lead:0 selection:crm.lead,type:0 view:crm.lead.report:0
@@ -35,22 +35,22 @@ msgstr "需要服務"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Monthly"
-msgstr "每月"
+msgstr "月度"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr "個案階段"
+msgstr "業務階段"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Visibility"
-msgstr "可見性"
+msgstr "可視等級"
 
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr "稱謂"
+msgstr "標題"
 
 #. module: crm
 #: field:crm.meeting,show_as:0
@@ -60,17 +60,17 @@ msgstr "顯示為"
 #. module: crm
 #: field:crm.meeting,day:0 selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr "月份日期"
+msgstr "每月的指定日期"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Today"
-msgstr "今日"
+msgstr "今天"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0 view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr "選擇機會"
+msgstr "選擇商機"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall2opportunity:0
@@ -81,18 +81,18 @@ msgstr " "
 #. module: crm
 #: view:crm.lead.report:0 field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr "關閉延遲時間"
+msgstr "延遲關閉"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Previous Stage"
-msgstr "上階段"
+msgstr "前一階段"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:28
 #, python-format
 msgid "Can not add note!"
-msgstr "無法添加記事！"
+msgstr "無法添加備註!"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -102,7 +102,7 @@ msgstr "階段名稱"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
 msgid "CRM Lead Analysis"
-msgstr ""
+msgstr "CRM 潛在客戶分析"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
@@ -113,34 +113,34 @@ msgstr "日"
 #. module: crm
 #: sql_constraint:crm.case.section:0
 msgid "The code of the sales team must be unique !"
-msgstr "業務團隊代號不能重覆！"
+msgstr "銷售團隊編碼必須唯一！"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:553
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
-msgstr "潛在客戶「%s」已轉為機會。"
+msgstr "潛在客戶'%s'已轉化為商機"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:294
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr "業務機會「%s」已關閉。"
+msgstr "潛在客戶 '%s' 已關閉."
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Exp. Closing"
-msgstr ""
+msgstr "預計成交日期"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr "每年"
+msgstr "年度"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
 msgid "Creation day"
-msgstr ""
+msgstr "報告日期"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -150,29 +150,29 @@ msgstr "規則名稱"
 #. module: crm
 #: view:crm.case.section:0
 msgid "Configuration"
-msgstr ""
+msgstr "設置"
 
 #. module: crm
 #: view:crm.case.resource.type:0 view:crm.lead:0 field:crm.lead,type_id:0
 #: view:crm.lead.report:0 field:crm.lead.report,type_id:0
 #: model:ir.model,name:crm.model_crm_case_resource_type
 msgid "Campaign"
-msgstr "推廣"
+msgstr "行銷活動"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr "搜尋機會"
+msgstr "搜尋商機"
 
 #. module: crm
 #: help:crm.lead.report,deadline_month:0
 msgid "Expected closing month"
-msgstr ""
+msgstr "預計成交月份"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assigned Opportunities to"
-msgstr ""
+msgstr "分配的機會"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_id:0 view:crm.lead.report:0
@@ -190,41 +190,41 @@ msgstr ""
 #: model:ir.model,name:crm.model_res_partner
 #: model:process.node,name:crm.process_node_partner0
 msgid "Partner"
-msgstr "伙伴"
+msgstr "業務夥伴"
 
 #. module: crm
 #: field:crm.meeting,organizer:0 field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr "組織者"
+msgstr "召集人"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 msgid "Schedule Other Call"
-msgstr "安排其他致電"
+msgstr "安排其它電訪"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:216
 #: model:crm.case.categ,name:crm.categ_meet3 view:crm.phonecall:0
 #, python-format
 msgid "Phone Call"
-msgstr "致電"
+msgstr "電訪"
 
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "不參加"
 
 #. module: crm
 #: field:crm.meeting,end_type:0
 msgid "Recurrence termination"
-msgstr ""
+msgstr "反覆終止"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:323
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
-msgstr "「%s」機會已標為丟失。"
+msgstr "商機 '%s' 已失."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -234,26 +234,27 @@ msgid ""
 "sort out your leads analysis by different groups to get accurate grained "
 "analysis."
 msgstr ""
+"潛在客戶分析允許你檢查CRM的相關訊息，檢查耽擱的處理，送出及回覆的郵件數量。你能整理出對不同群體的潛在客戶分析去獲得更準確的細粒度分析。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Send New Email"
-msgstr "發送新電郵"
+msgstr "發送新的電子郵件"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
 msgid "Criteria"
-msgstr "準則"
+msgstr "條件"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Excluded Answers :"
-msgstr ""
+msgstr "已排除的答案 :"
 
 #. module: crm
 #: field:crm.case.stage,section_ids:0
 msgid "Sections"
-msgstr ""
+msgstr "分類"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
@@ -270,13 +271,13 @@ msgstr "潛在客戶分析"
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "公開"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_resource_type_act
 msgid "Campaigns"
-msgstr "推廣活動"
+msgstr "行銷活動"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,state:0 view:crm.lead.report:0
@@ -284,7 +285,7 @@ msgstr "推廣活動"
 #: field:crm.phonecall,state:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -296,30 +297,30 @@ msgstr "分類"
 #. module: crm
 #: view:crm.lead:0
 msgid "Dates"
-msgstr ""
+msgstr "日期"
 
 #. module: crm
 #: help:crm.lead,optout:0
 msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
-msgstr ""
+msgstr "如果勾選不參加，代表此聯絡人拒絕收到郵件或不參加行銷活動。"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr "展望伙伴"
+msgstr "潛在業務夥伴"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:735
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "無主題"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Google Adwords 2"
-msgstr ""
+msgstr "Google Adwords 2"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -327,7 +328,7 @@ msgstr ""
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Link to an existing partner"
-msgstr "連結至既有伙伴"
+msgstr "連結到現有的業務夥伴"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,contact_id:0 view:crm.meeting:0
@@ -335,58 +336,58 @@ msgstr "連結至既有伙伴"
 #: field:crm.phonecall,partner_contact:0
 #: field:crm.phonecall2phonecall,contact_name:0
 msgid "Contact"
-msgstr "聯絡人"
+msgstr "聯絡方式"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Delegate"
-msgstr "委託"
+msgstr "委派"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "="
-msgstr ""
+msgstr "="
 
 #. module: crm
 #: field:base.action.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "案子歷史紀錄的正規表示式"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:274
 #, python-format
 msgid "The lead '%s' has been opened."
-msgstr ""
+msgstr "這潛在客戶'%s'已經開啟"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
 msgid "Opportunity Meeting"
-msgstr "商機會談"
+msgstr "商機會議"
 
 #. module: crm
 #: help:crm.lead.report,delay_close:0 help:crm.phonecall.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "到期天數"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr "當偵測到真正專案/機會"
+msgstr "當發現一個明確的專案/商機"
 
 #. module: crm
 #: view:res.partner:0 field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr "潛在客戶及機會"
+msgstr "潛在客戶與商機"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication"
-msgstr "通訊"
+msgstr "溝通"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Tuesday"
-msgstr "星期二"
+msgstr "週二"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -396,7 +397,7 @@ msgstr "更新日期"
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr ""
+msgstr "團隊主管"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
@@ -409,7 +410,7 @@ msgstr "選擇動作"
 msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
-msgstr ""
+msgstr "此預設百分比描述業務在此階段的平均成功概率"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0 view:crm.lead:0
@@ -424,17 +425,17 @@ msgstr "分類"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunity / Customer"
-msgstr ""
+msgstr "商機/客戶"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr "#機會"
+msgstr "商機數"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Privacy"
-msgstr ""
+msgstr "隱私"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_stage_form_installer
@@ -446,50 +447,52 @@ msgid ""
 "Revenue\" and the \"Expected Closing Date.\" You should also have a look at "
 "the tooltip of the field \"Change Probability Automatically\"."
 msgstr ""
+"階段能讓業務人員簡單地追蹤某個商機在銷售循環中的位置。要高效管理您的銷售管道，定義下一步跳轉的條件很重要。例如：要設置商機為「已驗證」，需先輸入「預期收入"
+"」和「預計結束日期」。你可以看一下「自動修改成功率」欄位的幫助。"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr "機會分析"
+msgstr "商機分析"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr "事件地點"
+msgstr "地點"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "循環性規則"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr "與機會的正常或電話會談"
+msgstr "商機的正常會議或電話會議"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Mail Gateway"
-msgstr ""
+msgstr "郵件閘道"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "第一次與新的潛在客戶接觸"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner:0 view:crm.partner2opportunity:0
 #: model:ir.actions.act_window,name:crm.action_view_crm_partner2opportunity
 #: model:ir.actions.act_window,name:crm.crm_partner2opportunity
 msgid "Create Opportunity"
-msgstr "建立機會"
+msgstr "建立商機"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "August"
-msgstr "八月"
+msgstr "8月"
 
 #. module: crm
 #: code:addons/crm/crm.py:433 view:crm.lead:0 view:res.partner:0
@@ -500,24 +503,24 @@ msgstr "提升"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mailings"
-msgstr ""
+msgstr "郵件"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr ""
+msgstr "待辦事項"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Not Running"
-msgstr "未運作"
+msgstr "未執行"
 
 #. module: crm
 #: field:crm.lead,email:0
@@ -527,51 +530,51 @@ msgstr "電子郵件"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phonecalls during last 7 days"
-msgstr ""
+msgstr "過去7天的通話記錄"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "October"
-msgstr "十月"
+msgstr "10月"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Included Answers :"
-msgstr ""
+msgstr "包括的答案 :"
 
 #. module: crm
 #: help:crm.meeting,email_from:0 help:crm.phonecall,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "這些人將收到電子郵件。"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,name:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "State of Mind Computation"
-msgstr "滿意度調查"
+msgstr "滿意度計算"
 
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr "案例分類"
+msgstr "業務分類"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
 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
 #: field:crm.lead,partner_address_name:0
 msgid "Partner Contact Name"
-msgstr ""
+msgstr "聯絡人姓名"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
@@ -581,52 +584,52 @@ msgstr "結束日期"
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "附表/撥打電話"
 
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "錯誤:郵件沒有正確的格式"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
-msgstr ""
+msgstr "剖面選項"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr "致電數"
+msgstr "電訪數"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
 msgid ""
 "The partner category that will be added to partners that match the "
 "segmentation criterions after computation."
-msgstr ""
+msgstr "該業務夥伴分類將加到計算符合業務夥伴的業務夥伴細分規則中"
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:93
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr ""
+msgstr "此會議'%s'已確認"
 
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 msgid "In Progress"
-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 OpenERP about "
 "cases in this sales team"
-msgstr ""
+msgstr "'回覆到'電子郵件地址填入該業務的團隊在系統裡設定的發送所有郵件的地址"
 
 #. module: crm
 #: field:crm.lead.report,creation_month:0
 msgid "Creation Month"
-msgstr ""
+msgstr "建立月份"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
@@ -637,29 +640,29 @@ msgstr "工作時間"
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr "伙伴區間行"
+msgstr "業務夥伴細分明細"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0
 msgid "Details"
-msgstr "詳情"
+msgstr "詳細資訊"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
 msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
-msgstr ""
+msgstr "定義一個規則或時間重複模式以排除循環性規則"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Form"
-msgstr ""
+msgstr "潛在客戶表單"
 
 #. module: crm
 #: view:crm.segmentation:0 model:ir.model,name:crm.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr "伙伴區間"
+msgstr "業務夥伴細分"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_meet
@@ -670,41 +673,43 @@ msgid ""
 "using the caldav interface.\n"
 "        "
 msgstr ""
+"銷售團隊共享會議日程表，並且和其它應用程序完整整合，比如員工的節假日、商機。你也可以通過caldav介面把會議日程與你的行動裝置進行同步。\n"
+"        "
 
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmans"
-msgstr ""
+msgstr "業務人員"
 
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr "可能收益"
+msgstr "可能收入"
 
 #. module: crm
 #: help:crm.lead.report,creation_month:0
 msgid "Creation month"
-msgstr ""
+msgstr "建立月份"
 
 #. module: crm
 #: help:crm.segmentation,name:0
 msgid "The name of the segmentation."
-msgstr "區間名稱"
+msgstr "細分的名稱"
 
 #. module: crm
 #: field:crm.case.stage,probability:0 field:crm.lead,probability:0
 msgid "Probability (%)"
-msgstr "概率 (%)"
+msgstr "概率(%)"
 
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Company Currency"
-msgstr ""
+msgstr "公司貨幣"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "產生潛在客戶"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_view_form_installer
@@ -715,6 +720,8 @@ msgid ""
 "opportunities, you can assign the following stage to the team: Territory, "
 "Qualified, Qualified Sponsors, Proposition, Negociaton, Won/Lost."
 msgstr ""
+"用銷售團隊來劃分你的銷售部門，並把使用者分配到銷售團隊。你也可以給每個團隊定義銷售階段。例如，你用顧問式銷售技巧追蹤你的商機，你可以給銷售團隊分配這樣幾個"
+"階段：切入、已驗證、確定決策人、提案、談判、成交/丟單。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:718 view:crm.lead:0 selection:crm.lead,type:0
@@ -722,12 +729,12 @@ msgstr ""
 #: field:crm.meeting,opportunity_id:0
 #, python-format
 msgid "Opportunity"
-msgstr "機會"
+msgstr "商機"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in last month"
-msgstr ""
+msgstr "潛在客戶/上月商機"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
@@ -742,12 +749,12 @@ msgstr "停止處理"
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "上月"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr "搜尋致電"
+msgstr "搜尋電訪"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall2partner:0
@@ -757,17 +764,17 @@ msgstr "繼續"
 #. module: crm
 #: field:crm.segmentation,som_interval:0
 msgid "Days per Period"
-msgstr ""
+msgstr "每個週期的天數"
 
 #. module: crm
 #: field:crm.meeting,byday:0
 msgid "By day"
-msgstr "每日"
+msgstr "按天"
 
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr "將團隊設為"
+msgstr "設定團隊"
 
 #. module: crm
 #: view:calendar.attendee:0 field:calendar.attendee,categ_id:0
@@ -777,7 +784,7 @@ msgstr "事件類型"
 #. module: crm
 #: field:crm.segmentation,exclusif:0
 msgid "Exclusive"
-msgstr "选择性排除"
+msgstr "唯一的"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:832
@@ -785,18 +792,18 @@ msgstr "选择性排除"
 msgid ""
 "You cannot delete lead '%s'; it must be in state 'Draft' to be deleted. You "
 "should better cancel it, instead of deleting it."
-msgstr ""
+msgstr "你不能刪除潛在客戶 '%s'；只有草稿狀態的潛在客戶才能刪除。你最好不要刪除，而是取消它。"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:451
 #, python-format
 msgid "From %s : %s"
-msgstr ""
+msgstr "發自: %s:%s"
 
 #. module: crm
 #: field:crm.lead.report,creation_year:0
 msgid "Creation Year"
-msgstr ""
+msgstr "報告年份"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -807,49 +814,49 @@ msgstr "建立日期"
 #. module: crm
 #: field:crm.lead,ref2:0
 msgid "Reference 2"
-msgstr "參照 2"
+msgstr "參考2"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Sales Purchase"
-msgstr "業務採購"
+msgstr "銷售採購"
 
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
 msgid "Used to compute open days"
-msgstr ""
+msgstr "用於計算開放天數"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Schedule Meeting"
-msgstr "安排會議"
+msgstr "會議計劃"
 
 #. module: crm
 #: view:crm.case.stage:0 field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "必備條件"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
 msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
-msgstr ""
+msgstr "這屬性定義循環日程的日期/時間異常列表。"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
 msgid "Convert To Opportunity "
-msgstr "轉變為機會 "
+msgstr "轉換為商機 "
 
 #. module: crm
 #: help:crm.meeting,recurrency:0
 msgid "Recurrent Meeting"
-msgstr ""
+msgstr "循環性會議"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr ""
+msgstr "未分配的電訪"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead2opportunity.partner,opportunity_ids:0
@@ -859,18 +866,18 @@ 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
 #: field:crm.segmentation,categ_id:0
 msgid "Partner Category"
-msgstr "伙伴分類"
+msgstr "業務夥伴分類"
 
 #. module: crm
 #: view:crm.add.note:0
 #: model:ir.actions.act_window,name:crm.action_crm_add_note
 msgid "Add Note"
-msgstr "添加記事"
+msgstr "添加備註"
 
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
@@ -880,24 +887,24 @@ msgstr "供應商"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr "標為勝出"
+msgstr "標記為成交"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Purchase Amount"
-msgstr "採購總額"
+msgstr "採購金額"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr "標為失敗"
+msgstr "標記為已丟單"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "March"
-msgstr "三月"
+msgstr "3月"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
@@ -910,62 +917,62 @@ msgstr "警告！"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current year"
-msgstr ""
+msgstr "本年的電訪"
 
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "開啟天數"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show Time as"
-msgstr ""
+msgstr "將時間顯示為"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Create Partner"
-msgstr "建立伙伴"
+msgstr "建立業務夥伴"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #. module: crm
 #: field:crm.lead,mobile:0 field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
-msgstr "手機"
+msgstr "行動裝置"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr "下階段"
+msgstr "下一階段"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "My Meetings"
-msgstr ""
+msgstr "我的會議"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Todays's Phonecalls"
-msgstr ""
+msgstr "今日電訪記錄"
 
 #. module: crm
 #: view:board.board:0
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "統計控制台"
 
 #. module: crm
 #: field:crm.lead,ref:0
 msgid "Reference"
-msgstr "參照"
+msgstr "參考"
 
 #. module: crm
 #: field:crm.lead,optin:0
 msgid "Opt-In"
-msgstr ""
+msgstr "參加"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:814 code:addons/crm/crm_phonecall.py:296
@@ -977,61 +984,61 @@ msgstr ""
 #: field:res.partner,meeting_ids:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "會議"
 
 #. module: crm
 #: field:crm.lead,date_action_next:0 field:crm.lead,title_action:0
 #: field:crm.meeting,date_action_next:0 field:crm.phonecall,date_action_next:0
 msgid "Next Action"
-msgstr "下個動作"
+msgstr "下一動作"
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr "重覆直至"
+msgstr "重複直到"
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
 msgid "Deadline"
-msgstr "截止日期"
+msgstr "最後期限"
 
 #. module: crm
 #: help:crm.meeting,active:0
 msgid ""
 "If the active field is set to          true, it will allow you to hide the "
 "event alarm information without removing it."
-msgstr ""
+msgstr "如果啟用欄位設為真，他將允許你隱藏事件的警告訊息而不需將其刪除。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Change Color"
-msgstr ""
+msgstr "改變顏色"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr "伙伴區間"
+msgstr "業務夥伴細分"
 
 #. module: crm
 #: field:crm.meeting,user_id:0 view:crm.phonecall:0
 #: field:crm.phonecall,user_id:0 view:res.partner:0
 msgid "Responsible"
-msgstr ""
+msgstr "負責人"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only opportunity"
-msgstr ""
+msgstr "僅顯示商機"
 
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "上一個"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "New Leads"
-msgstr ""
+msgstr "建立潛在客戶"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1041,22 +1048,22 @@ msgstr "統計"
 #. module: crm
 #: view:crm.meeting:0
 msgid "From"
-msgstr "自"
+msgstr "來自"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert into Opportunities"
-msgstr ""
+msgstr "轉成商機"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Sales Team"
-msgstr ""
+msgstr "顯示銷售團隊"
 
 #. module: crm
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "下一個"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1066,17 +1073,17 @@ msgstr "階段："
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5 view:crm.lead:0
 msgid "Won"
-msgstr "勝出"
+msgstr "成交"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "超過截止日期"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr "業務部"
+msgstr "銷售部"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1092,12 +1099,12 @@ msgstr "類型"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Compute Segmentation"
-msgstr "計算區間"
+msgstr "計算細分"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
 msgid "Change Probability Automatically"
-msgstr "自動變更概率"
+msgstr "自動修改概率"
 
 #. module: crm
 #: field:crm.lead,create_date:0 field:crm.meeting,create_date:0
@@ -1109,32 +1116,32 @@ msgstr "建立日期"
 #. module: crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "我的商機"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Need a Website Design"
-msgstr ""
+msgstr "需要網站設計"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Year of call"
-msgstr ""
+msgstr "電訪年份"
 
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "循環ID"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:res.partner:0
 msgid "Subject"
-msgstr ""
+msgstr "主題"
 
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr "二"
+msgstr "週二"
 
 #. module: crm
 #: view:crm.case.stage:0 view:crm.lead:0 field:crm.lead,stage_id:0
@@ -1145,42 +1152,42 @@ msgstr "階段"
 #. module: crm
 #: view:crm.lead:0
 msgid "History Information"
-msgstr ""
+msgstr "歷史資訊"
 
 #. module: crm
 #: field:base.action.rule,act_mail_to_partner:0
 msgid "Mail to Partner"
-msgstr ""
+msgstr "向業務夥伴發送郵件"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Call Details"
-msgstr ""
+msgstr "通話詳情"
 
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Mark as"
-msgstr "標為"
+msgstr "標記為"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
 msgid "Log call"
-msgstr ""
+msgstr "記錄通話"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
-msgstr ""
+msgstr "讓事件在該時間間隔自動重複"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition Case Fields"
-msgstr "條件案例欄位"
+msgstr "業務狀態欄位"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr ""
+msgstr "在待處理狀態的電訪"
 
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,stage_ids:0
@@ -1203,119 +1210,119 @@ msgstr "預期收益"
 msgid ""
 "Create specific phone call categories to better define the type of calls "
 "tracked in the system."
-msgstr ""
+msgstr "在系統中建立指定的電訪分類以方便定義電訪追蹤類型"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
 msgid "Max Partner ID processed"
-msgstr "已處理最大伙伴ID"
+msgstr "處理的最大業務夥伴ID"
 
 #. module: crm
 #: help:crm.case.stage,on_change:0
 msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
-msgstr ""
+msgstr "設定為這個階段，會自動改變商機的成功概率"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
 #: model:ir.ui.menu,name:crm.menu_report_crm_phonecalls_tree
 msgid "Phone Calls Analysis"
-msgstr "致電分析"
+msgstr "電訪分析"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
 #: field:crm.phonecall.report,opening_date:0
 msgid "Opening Date"
-msgstr ""
+msgstr "開啟日期"
 
 #. module: crm
 #: help:crm.phonecall,duration:0
 msgid "Duration in Minutes"
-msgstr ""
+msgstr "持續時間（分鐘）"
 
 #. module: crm
 #: field:crm.case.channel,name:0
 msgid "Channel Name"
-msgstr ""
+msgstr "管道名稱"
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0 field:crm.phonecall2opportunity,name:0
 msgid "Opportunity Name"
-msgstr "機會名稱"
+msgstr "商機名稱"
 
 #. module: crm
 #: help:crm.lead.report,deadline_day:0
 msgid "Expected closing day"
-msgstr ""
+msgstr "預期結束日期"
 
 #. module: crm
 #: help:crm.case.section,active:0
 msgid ""
 "If the active field is set to true, it will allow you to hide the sales team "
 "without removing it."
-msgstr ""
+msgstr "如果啟用欄位設為真，它將允許你隱藏銷售團隊而不需要刪除它。"
 
 #. module: crm
 #: field:crm.lead,street2:0
 msgid "Street2"
-msgstr "街道2"
+msgstr "街道 2"
 
 #. module: crm
 #: help:crm.case.stage,case_default:0
 msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
-msgstr ""
+msgstr "如果你勾選了這裡，這個階段會作為每個銷售團隊的預設階段。對已有的銷售團隊無效。"
 
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr "五"
+msgstr "週五"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead
 msgid "crm.lead"
-msgstr ""
+msgstr "crm.lead"
 
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "寫入日期"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "End of Recurrency"
-msgstr ""
+msgstr "停止重覆"
 
 #. module: crm
 #: view:crm.meeting: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
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "設置此時為事件發生前的提醒時間"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_create_partner
 msgid "Schedule a Call"
-msgstr ""
+msgstr "安排電訪"
 
 #. module: crm
 #: view:crm.lead2partner:0 view:crm.phonecall:0 view:crm.phonecall2partner:0
@@ -1323,7 +1330,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_lead2partner
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 msgid "Create a Partner"
-msgstr ""
+msgstr "建立業務夥伴"
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1341,32 +1348,36 @@ msgid ""
 "       \n"
 "If the call needs to be done then the state is set to 'Not Held'."
 msgstr ""
+"新建的電訪是「待辦」狀態。\n"
+"正在撥打的電訪是「開啟」狀態。\n"
+"打完了的電話是「已撥」狀態。\n"
+"還沒打的電話是「未撥」狀態。"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "週一"
 
 #. module: crm
 #: field:crm.lead,day_close:0
 msgid "Days to Close"
-msgstr ""
+msgstr "結束日期"
 
 #. module: crm
 #: field:crm.case.section,complete_name:0
 msgid "unknown"
-msgstr ""
+msgstr "未知"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:296
 #, python-format
 msgid "The case '%s' has been closed."
-msgstr ""
+msgstr "這業務'%s'已結束"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
 msgid "Partner To Opportunity"
-msgstr ""
+msgstr "業務夥伴的商機"
 
 #. module: crm
 #: field:crm.meeting,date:0 field:crm.opportunity2phonecall,date:0
@@ -1378,65 +1389,65 @@ msgstr "日期"
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加篩選條件..."
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in closed state"
-msgstr ""
+msgstr "已關閉的通話記錄"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "搜尋"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Categories"
-msgstr "各分類機會"
+msgstr "商機分類"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_marketing_department
 msgid "Sales Marketing Department"
-msgstr ""
+msgstr "銷售市場部"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr ""
+msgstr "通話日期"
 
 #. module: crm
 #: help:crm.lead,section_id:0
 msgid ""
 "When sending mails, the default email address is taken from the sales team."
-msgstr ""
+msgstr "發送郵件的時候，預設的郵件地址來自銷售團隊。"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day in the month where repeat the meeting"
-msgstr ""
+msgstr "在本月為循環的會議選擇日期"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Description"
-msgstr "區間說明"
+msgstr "細分說明"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: model:ir.actions.act_window,name:crm.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr "安排會議"
+msgstr "安排一個會議"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:431
 #, python-format
 msgid "Merged opportunities"
-msgstr ""
+msgstr "合併商機"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_view_form_installer
 msgid "Define Sales Team"
-msgstr ""
+msgstr "定義銷售團隊"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_segmentation_tree-act
@@ -1444,32 +1455,32 @@ msgid ""
 "Create specific partner categories which you can assign to your partners to "
 "better manage your interactions with them. The segmentation tool is able to "
 "assign categories to partners according to criteria you set."
-msgstr ""
+msgstr "建立指定的業務夥伴類型，細分規則可以根據你設定的規則去指定業務夥伴的分類，以便你可以更好管理和他們的互動。"
 
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "編碼"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr "下級團隊"
+msgstr "子團隊"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in draft and open state"
-msgstr ""
+msgstr "待處理通話記錄"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead1
 msgid "Telesales"
-msgstr ""
+msgstr "電話銷售"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "References"
-msgstr "參照"
+msgstr "參考"
 
 #. module: crm
 #: code:addons/crm/crm.py:441 view:crm.lead:0
@@ -1484,91 +1495,91 @@ msgstr "取消"
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr ""
+msgstr "待處理狀態的潛在客戶/商機"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
 msgid "Merge two Opportunities"
-msgstr "合併兩個機會"
+msgstr "合併兩個商機"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "例外規則"
 
 #. module: crm
 #: help:base.action.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
-msgstr ""
+msgstr "勾選此項, 如果你想要此規則發送郵件給業務夥伴"
 
 #. module: crm
 #: field:crm.phonecall,opportunity_id:0
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "潛在客戶/商機"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Mail"
-msgstr ""
+msgstr "郵件"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
 msgid "Phonecall Categories"
-msgstr "致電分類"
+msgstr "電訪分類"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in open state"
-msgstr ""
+msgstr "開啟的潛在客戶/商機"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_categ
 msgid "Opportunities By Categories"
-msgstr ""
+msgstr "商機分類"
 
 #. module: crm
 #: help:crm.lead,partner_name:0
 msgid ""
 "The name of the future partner that will be created while converting the "
 "lead into opportunity"
-msgstr ""
+msgstr "當由潛在客戶轉成商機時，要建立的未來業務夥伴名稱。"
 
 #. module: crm
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive Sales team."
-msgstr ""
+msgstr "錯誤！你不能建立循環引用的的銷售團隊"
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr ""
+msgstr "記錄電訪"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
 msgid "Do not link to a partner"
-msgstr ""
+msgstr "不能連結到商業夥伴"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "搜尋會議"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
 msgid "Sale Amount"
-msgstr "業務總額"
+msgstr "銷售金額"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Choose day where repeat the meeting"
-msgstr ""
+msgstr "為重複的會議選擇日期"
 
 #. module: crm
 #: selection:crm.meeting,state:0
@@ -1584,6 +1595,7 @@ msgid ""
 "mainly used by the sales manager in order to do the periodic review with the "
 "teams of the sales pipeline."
 msgstr ""
+"商機分析給你隨時訪問商機的資訊如：預期收入、計劃成本、錯過的最後時限或者每個商機的互動次數。這個報表主要給銷售經理定期審查這團隊裡的業務人員。"
 
 #. module: crm
 #: field:crm.case.categ,name:0 field:crm.lead,name:0
@@ -1594,7 +1606,7 @@ msgstr "名稱"
 #. module: crm
 #: field:crm.meeting,alarm_id:0 field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "警告"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
@@ -1602,17 +1614,17 @@ msgid ""
 "Add specific stages to leads and opportunities allowing your sales to better "
 "organise their sales pipeline. Stages will allow them to easily track how a "
 "specific lead or opportunity is positioned in the sales cycle."
-msgstr ""
+msgstr "為你的銷售的潛在客戶和商機增加特定的階段以便更好組織你的銷售管道。階段使你更輕鬆追蹤指定的潛在客戶或在銷售週期中的商機。"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert opportunities"
-msgstr ""
+msgstr "商機轉換"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "我的業務"
 
 #. module: crm
 #: field:crm.lead,birthdate:0
@@ -1622,12 +1634,12 @@ msgstr "生日"
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "這"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Creation"
-msgstr ""
+msgstr "建立時間"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
@@ -1639,12 +1651,12 @@ msgstr "高"
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
 msgid "Convert to prospect to business partner"
-msgstr ""
+msgstr "把潛在客戶轉成商業夥伴"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Meeting / Partner"
-msgstr ""
+msgstr "會議/業務夥伴"
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
@@ -1657,12 +1669,12 @@ msgid ""
 "With Meeting Invitations you can create and manage the meeting invitations "
 "sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
 "users, but also external parties, such as a customer."
-msgstr "您可在此建立或管理發送至同事或伙伴之會議邀約。您不單可邀請 OpenERP 用戶，還可邀請客戶等外人。"
+msgstr "與會邀請你可以建立和管理會議邀請發送給你的同事、業務夥伴。你不僅能邀請系統的使用者還可以邀請外部人士如客戶。"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr "星期六"
+msgstr "週六"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -1672,96 +1684,96 @@ msgstr "第五"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr ""
+msgstr "已完成的潛在客戶/商機"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "延遲關閉"
 
 #. module: crm
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr "三"
+msgstr "週三"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Potential Reseller"
-msgstr ""
+msgstr "潛在經銷商"
 
 #. module: crm
 #: help:crm.case.section,change_responsible:0
 msgid ""
 "When escalating to this team override the saleman with the team leader."
-msgstr ""
+msgstr "當在團隊內上報的時候，業務人員的名字會被替換為團隊主管"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
 msgid "Planned Revenue"
-msgstr "計劃收益"
+msgstr "計劃收入"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
-msgstr ""
+msgstr "可選聯絡業務夥伴，通常在潛在客戶轉換後"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation details"
-msgstr "邀約詳情"
+msgstr "邀請詳情"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr "上級團隊"
+msgstr "母團隊"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr "下個動作日期"
+msgstr "下一動作日期"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
 msgid "Running"
-msgstr "正運作"
+msgstr "運行中"
 
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr "郵政編碼"
+msgstr "郵遞區號"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:278
 #, python-format
 msgid "The case '%s' has been opened."
-msgstr ""
+msgstr "這業務'%s'已開啟"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 msgid "Inbound"
-msgstr ""
+msgstr "來電"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Month of call"
-msgstr ""
+msgstr "通話月份"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr "致電"
+msgstr "電訪"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "自由"
 
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
@@ -1771,7 +1783,7 @@ msgstr "允許刪除"
 #. module: crm
 #: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr "一"
+msgstr "週一"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
@@ -1783,13 +1795,13 @@ msgstr "最高"
 #. module: crm
 #: help:crm.lead.report,creation_year:0
 msgid "Creation year"
-msgstr ""
+msgstr "建立年份"
 
 #. module: crm
 #: view:crm.case.section:0 view:crm.lead:0 field:crm.lead,description:0
 #: view:crm.opportunity2phonecall:0
 msgid "Notes"
-msgstr ""
+msgstr "備註"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
@@ -1799,57 +1811,57 @@ msgstr "值"
 #. module: crm
 #: help:crm.lead,type:0 help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr ""
+msgstr "類型用於區分潛在客戶和商機"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr "各分類機會"
+msgstr "商機按分類分組"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,partner_name:0
 msgid "Customer Name"
-msgstr "客戶名"
+msgstr "客戶名稱"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2opportunity
 msgid "Phonecall To Opportunity"
-msgstr ""
+msgstr "電訪轉成商機"
 
 #. module: crm
 #: field:crm.case.section,reply_to:0
 msgid "Reply-To"
-msgstr "回覆至"
+msgstr "回覆到"
 
 #. module: crm
 #: view:crm.case.section:0
 msgid "Select Stages for this Sales Team"
-msgstr ""
+msgstr "這個銷售團隊的選擇階段"
 
 #. module: crm
 #: view:board.board:0
 msgid "Opportunities by Stage"
-msgstr "各階段機會"
+msgstr "商機的階段"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency Option"
-msgstr ""
+msgstr "循環選擇"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr ""
+msgstr "潛在客戶/客戶"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
 msgid "Prospect is converting to business partner"
-msgstr ""
+msgstr "潛在客戶正轉成商業夥伴"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert To Opportunity"
-msgstr ""
+msgstr "轉換為商機"
 
 #. module: crm
 #: view:crm.case.channel:0
@@ -1857,19 +1869,19 @@ msgstr ""
 #: model:ir.model,name:crm.model_crm_case_channel
 #: model:ir.ui.menu,name:crm.menu_crm_case_channel
 msgid "Channels"
-msgstr ""
+msgstr "管道"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 selection:crm.phonecall.report,state:0
 #: view:res.partner:0
 msgid "Held"
-msgstr ""
+msgstr "已撥"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset to Draft"
-msgstr "退回至草案"
+msgstr "重置為草稿"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1881,65 +1893,65 @@ msgstr "額外資訊"
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge Opportunities"
-msgstr "合併機會"
+msgstr "合併商機"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
 msgid "Google Adwords"
-msgstr ""
+msgstr "Google Adwords"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall
 msgid "crm.phonecall"
-msgstr ""
+msgstr "crm.phonecall"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Mail Campaign 2"
-msgstr "郵件推廣 2"
+msgstr "郵件行銷 2"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Mail Campaign 1"
-msgstr ""
+msgstr "郵件行銷 1"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create"
-msgstr ""
+msgstr "建立"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:849
 #, python-format
 msgid "Changed Stage to: %s"
-msgstr ""
+msgstr "修改階段為'%s'"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,priority:0 view:crm.lead.report:0
 #: field:crm.lead.report,priority:0 field:crm.phonecall,priority:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,priority:0
 msgid "Priority"
-msgstr "優先次序"
+msgstr "優先級(0=緊急)"
 
 #. module: crm
 #: field:crm.segmentation,sales_purchase_active:0
 msgid "Use The Sales Purchase Rules"
-msgstr ""
+msgstr "使用這銷售採購規則"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr ""
+msgstr "潛在客戶轉換為業務夥伴或商機"
 
 #. module: crm
 #: field:crm.lead,location_id:0 field:crm.meeting,location:0
 msgid "Location"
-msgstr ""
+msgstr "地點"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr ""
+msgstr "批量轉換潛在客戶為商機業務夥伴"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1949,25 +1961,25 @@ 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:430
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "錯誤！"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_meeting_categ_action
 msgid ""
 "Create different meeting categories to better organize and classify your "
 "meetings."
-msgstr ""
+msgstr "建立不同的會議分類以便更好組織和把會議分類"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
 msgid "Segmentation line"
-msgstr "區間行"
+msgstr "細分明細"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
@@ -1977,34 +1989,34 @@ msgstr "計劃日期"
 #. module: crm
 #: field:crm.meeting,base_calendar_url:0
 msgid "Caldav URL"
-msgstr ""
+msgstr "Caldav 服務的URL"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Expected Revenues"
-msgstr "預期收益"
+msgstr "預期收入"
 
 #. module: crm
 #: field:crm.lead,contact_name:0
 msgid "Contact Name"
-msgstr "聯絡人名稱"
+msgstr "聯絡人姓名"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads creating during last 7 days"
-msgstr ""
+msgstr "前7天發現的潛在客戶"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
-msgstr ""
+msgstr "你確定你基於這電訪建立的業務夥伴？"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "July"
-msgstr "七月"
+msgstr "7月"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -2015,34 +2027,36 @@ msgid ""
 "The opportunities and sales order displayed, will automatically be filtered "
 "according to his team."
 msgstr ""
+"定義銷售團隊組織你不同的業務人員或者銷售部門成立一個獨立的團隊。每個團隊工作在自己的商機『銷售單，如每個使用者能設置預設的團隊的客戶偏好。商機和銷售訂單將"
+"根據他的團隊自動篩選。"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Show only lead"
-msgstr ""
+msgstr "僅顯示潛在客戶"
 
 #. module: crm
 #: help:crm.meeting,count:0
 msgid "Repeat x times"
-msgstr "重覆x次"
+msgstr "重複 x 次"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act
 #: model:ir.model,name:crm.model_crm_case_section
 #: model:ir.ui.menu,name:crm.menu_crm_case_section_act
 msgid "Sales Teams"
-msgstr "業務團隊"
+msgstr "銷售團隊"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr ""
+msgstr "潛在客戶轉成業務夥伴"
 
 #. module: crm
 #: view:crm.segmentation:0 field:crm.segmentation.line,segmentation_id:0
 #: model:ir.actions.act_window,name:crm.crm_segmentation-act
 msgid "Segmentation"
-msgstr "區間"
+msgstr "Segmentation"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2052,13 +2066,13 @@ msgstr "團隊"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr ""
+msgstr "潛在客戶/新建的商機"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
 #: view:crm.phonecall.report:0 view:res.partner:0
 msgid "Not Held"
-msgstr ""
+msgstr "未撥"
 
 #. module: crm
 #: field:crm.lead.report,probability:0
@@ -2068,19 +2082,19 @@ msgstr "概率"
 #. module: crm
 #: view:crm.lead:0
 msgid "Pending Opportunities"
-msgstr ""
+msgstr "待處理商機"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Please select more than one opportunity from the list view."
-msgstr ""
+msgstr "請在列表中選擇多個商機"
 
 #. module: crm
 #: view:crm.lead.report:0 field:crm.meeting,month_list:0
 #: view:crm.phonecall.report:0 field:crm.phonecall.report,month:0
 msgid "Month"
-msgstr "月"
+msgstr "月份"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2088,7 +2102,7 @@ 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
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -2103,6 +2117,9 @@ msgid ""
 "email gateway: new emails may create leads, each of them automatically gets "
 "the history of the conversation with the prospect."
 msgstr ""
+"潛在客戶用來追蹤你和對您產品或服務感興趣的潛在客戶或現有業務夥伴的最初接觸。潛在客戶一般來說是銷售循環的第一步。當確認了以後，潛在客戶需要轉化為商機，此時"
+"應建立業務伙伴以便進一步追蹤相關的活動。你可以匯入一個潛在客戶的資料庫，追蹤一下你的名片或把你的網站留言板與OpenERP的潛在客戶集成起來。潛在客戶可以"
+"與郵件閘道連接起來：新的郵件可以建立潛在客戶，後續郵件可以成為與潛在客戶溝通的歷史記錄。"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -2110,53 +2127,53 @@ msgstr ""
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Create a new partner"
-msgstr ""
+msgstr "建立新的業務夥伴"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_outbound
 msgid "Scheduled Calls"
-msgstr ""
+msgstr "排定的電訪"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "開啟日期"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Scheduled Phonecalls"
-msgstr ""
+msgstr "排定的電訪"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Decline"
-msgstr ""
+msgstr "拒絕"
 
 #. module: crm
 #: field:crm.lead,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "使用者電子郵件"
 
 #. module: crm
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
-msgstr ""
+msgstr "如果訂閱已選擇，此聯絡人已同意接收郵件。"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reset to Unconfirmed"
-msgstr ""
+msgstr "重置為未確認"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,note:0 field:crm.phonecall2phonecall,note:0
 msgid "Note"
-msgstr ""
+msgstr "備註"
 
 #. module: crm
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "選擇的公司不屬於此使用者允許訪問的公司。"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
@@ -2171,17 +2188,17 @@ msgstr "低"
 #: selection:crm.lead.report,state:0 field:crm.meeting,date_closed:0
 #: field:crm.phonecall,date_closed:0
 msgid "Closed"
-msgstr "關閉"
+msgstr "已關閉"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Total of Planned Revenue"
-msgstr "計劃收益總計"
+msgstr "計劃收入合計"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Open Opportunities"
-msgstr ""
+msgstr "開啟商機"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_meet2
@@ -2204,7 +2221,7 @@ msgstr "客戶會議"
 #. module: crm
 #: field:crm.lead,email_cc:0
 msgid "Global CC"
-msgstr ""
+msgstr "完整副本"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2212,22 +2229,22 @@ msgstr ""
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #: model:ir.ui.menu,name:crm.menu_crm_config_phonecall view:res.partner:0
 msgid "Phone Calls"
-msgstr "致電"
+msgstr "電訪"
 
 #. module: crm
 #: view:crm.case.stage:0
 msgid "Stage Search"
-msgstr ""
+msgstr "階段搜尋"
 
 #. module: crm
 #: help:crm.lead.report,delay_open:0 help:crm.phonecall.report,delay_open:0
 msgid "Number of Days to open the case"
-msgstr ""
+msgstr "起案的天數"
 
 #. module: crm
 #: selection:crm.meeting,end_type:0
 msgid "Number of repetitions"
-msgstr ""
+msgstr "副本數量"
 
 #. module: crm
 #: field:crm.lead,phone:0 field:crm.opportunity2phonecall,phone:0
@@ -2240,23 +2257,23 @@ msgstr "電話"
 #: field:crm.lead,active:0 field:crm.meeting,active:0
 #: field:crm.phonecall,active:0
 msgid "Active"
-msgstr "活躍"
+msgstr "啟用"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:856
 #, python-format
 msgid "The stage of opportunity '%s' has been changed to '%s'."
-msgstr "機會階段已由「%s」變為「%s」。"
+msgstr "這商機的階段』%s'已改為'%s'。"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Mandatory Expression"
-msgstr ""
+msgstr "強制的表示式"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. module: crm
 #: view:crm.opportunity2phonecall:0 view:crm.phonecall2phonecall:0
@@ -2271,13 +2288,13 @@ msgstr "不確定"
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages."
-msgstr ""
+msgstr "用於對階段排序"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:276
 #, python-format
 msgid "The opportunity '%s' has been opened."
-msgstr ""
+msgstr "這商機 \"%s\" 已開啟"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@@ -2295,34 +2312,34 @@ msgstr "減少 (0>1)"
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
 msgid "Exp. Closing Day"
-msgstr ""
+msgstr "預期結束日期"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Reassign Escalated"
-msgstr ""
+msgstr "提交給上級"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Weekly"
-msgstr "每週"
+msgstr "按周"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
 #: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
 msgid "Opportunities Analysis"
-msgstr "機會分析"
+msgstr "商機分析"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Misc"
-msgstr ""
+msgstr "雜項"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_crm
 msgid "Sales"
-msgstr ""
+msgstr "銷售"
 
 #. module: crm
 #: code:addons/crm/crm.py:430
@@ -2330,12 +2347,12 @@ msgstr ""
 msgid ""
 "You can not escalate, you are already at the top level regarding your sales-"
 "team category."
-msgstr ""
+msgstr "不能上報，你已經在您銷售團隊類別中的最高級了。"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8 view:crm.meeting:0
 msgid "Other"
-msgstr ""
+msgstr "其它"
 
 #. module: crm
 #: view:crm.meeting:0 selection:crm.meeting,state:0
@@ -2345,7 +2362,7 @@ msgstr "完成"
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every (Days/Week/Month/Year)"
-msgstr ""
+msgstr "重複間隔（日/周/年）"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_max:0
@@ -2357,7 +2374,7 @@ msgstr "最大間隔"
 #: selection:crm.lead.report,state:0 view:res.partner:0
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "開啟"
 
 #. module: crm
 #: field:crm.lead,city:0
@@ -2367,47 +2384,47 @@ msgstr "城市"
 #. module: crm
 #: view:crm.lead:0 view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "歷史記錄"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Busy"
-msgstr "忙線"
+msgstr "忙碌"
 
 #. module: crm
 #: field:crm.lead.report,creation_day:0
 msgid "Creation Day"
-msgstr ""
+msgstr "建立日期"
 
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Repeat every"
-msgstr "重覆間隔："
+msgstr "重複間隔"
 
 #. module: crm
 #: field:crm.meeting,recurrency:0
 msgid "Recurrent"
-msgstr ""
+msgstr "循環"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in last month"
-msgstr ""
+msgstr "上個月的通話"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor
 msgid "My Open Opportunities"
-msgstr "我的開放機會"
+msgstr "我開啟的商機"
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr ""
+msgstr "最大的溝通日誌"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invite People"
-msgstr "邀請"
+msgstr "邀請他人"
 
 #. module: crm
 #: view:crm.meeting:0 field:crm.meeting,categ_id:0
@@ -2425,6 +2442,10 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"當一個業務建立時狀態設為'草稿'\n"
+"如果業務正在處理狀態設為'開啟'\n"
+"當業務結束狀態設為'完成'\n"
+"如果業務需要審查狀態設為'待處理'"
 
 #. module: crm
 #: view:crm.meeting:0 view:res.partner:0
@@ -2441,70 +2462,70 @@ msgstr "第三"
 msgid ""
 "The computation is made on all events that occured during this interval, the "
 "past X periods."
-msgstr ""
+msgstr "這計算是基於在過去 X 期間發生的所有事件。"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Opportunities"
-msgstr ""
+msgstr "未分配的商機"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# of Emails"
-msgstr ""
+msgstr "郵件"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Leads"
-msgstr ""
+msgstr "搜尋潛在客戶"
 
 #. module: crm
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,delay_open:0
 msgid "Delay to open"
-msgstr ""
+msgstr "延遲開啟"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Recurrency period"
-msgstr ""
+msgstr "循環週期"
 
 #. module: crm
 #: field:crm.meeting,week_list:0
 msgid "Weekday"
-msgstr "週日"
+msgstr "工作日"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr ""
+msgstr "參考"
 
 #. module: crm
 #: field:crm.lead,id:0 field:crm.meeting,id:0 field:crm.phonecall,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm
 #: help:crm.lead,type_id:0
 msgid ""
 "From which campaign (seminar, marketing campaign, mass mailing, ...) did "
 "this contact come from?"
-msgstr ""
+msgstr "這個聯絡人從哪個活動中來（研討會、行銷活動還是群發郵件）。"
 
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr "出席者資訊"
+msgstr "參與者資訊"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Segmentation Test"
-msgstr "區間測試"
+msgstr "細分測試"
 
 #. module: crm
 #: field:crm.lead,user_login:0
 msgid "User Login"
-msgstr ""
+msgstr "使用者賬戶"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -2514,29 +2535,29 @@ msgstr "繼續處理"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current year"
-msgstr ""
+msgstr "今年建立的潛在客戶/商機"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr ""
+msgstr "電訪業務夥伴"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr "派予"
+msgstr "分配到"
 
 #. module: crm
 #: field:crm.add.note,state:0
 msgid "Set New State To"
-msgstr ""
+msgstr "設定新狀態為"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0 field:crm.meeting,date_action_last:0
 #: field:crm.phonecall,date_action_last:0
 msgid "Last Action"
-msgstr "最後動作"
+msgstr "最近動作"
 
 #. module: crm
 #: field:crm.meeting,duration:0 field:crm.phonecall,duration:0
@@ -2547,32 +2568,32 @@ msgstr "持續時間"
 #. module: crm
 #: view:crm.lead:0
 msgid "Show countries"
-msgstr ""
+msgstr "顯示國家"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Select Salesman"
-msgstr ""
+msgstr "選擇業務人員"
 
 #. module: crm
 #: view:board.board:0
 msgid "Sales Dashboard"
-msgstr "業務儀錶版"
+msgstr "銷售控制台"
 
 #. module: crm
 #: field:crm.lead.report,nbr:0 field:crm.phonecall.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "業務量"
 
 #. module: crm
 #: help:crm.meeting,section_id:0 help:crm.phonecall,section_id:0
 msgid "Sales team to which Case belongs to."
-msgstr ""
+msgstr "業務所屬銷售團隊"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Sunday"
-msgstr "星期日"
+msgstr "週日"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -2582,13 +2603,13 @@ msgstr "第四"
 #. module: crm
 #: selection:crm.add.note,state:0
 msgid "Unchanged"
-msgstr "不變"
+msgstr "未更改"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Partners Segmentation"
-msgstr "伙伴區間"
+msgstr "業務夥伴細分"
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2598,12 +2619,12 @@ msgstr "傳真"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities created in current month"
-msgstr ""
+msgstr "本月新建的潛在客戶/商機"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Assignment"
-msgstr ""
+msgstr "指派"
 
 #. module: crm
 #: field:crm.lead,company_id:0 view:crm.lead.report:0
@@ -2615,7 +2636,7 @@ msgstr "公司"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Friday"
-msgstr "星期五"
+msgstr "週五"
 
 #. module: crm
 #: field:crm.meeting,allday:0
@@ -2625,23 +2646,23 @@ msgstr "整天"
 #. module: crm
 #: field:crm.segmentation.line,operator:0
 msgid "Mandatory / Optional"
-msgstr ""
+msgstr "強制的/ 可選的"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr ""
+msgstr "未分配的潛在客戶"
 
 #. module: crm
 #: field:crm.lead,subjects:0
 msgid "Subject of Email"
-msgstr ""
+msgstr "郵件主題"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_view_attendee_form
 #: model:ir.ui.menu,name:crm.menu_attendee_invitations
 msgid "Meeting Invitations"
-msgstr "會議邀約"
+msgstr "會議邀請"
 
 #. module: crm
 #: view:crm.phonecall:0 selection:crm.phonecall,state:0
@@ -2653,72 +2674,72 @@ msgstr "待辦"
 #. module: crm
 #: field:crm.case.categ,object_id:0
 msgid "Object Name"
-msgstr "物件名稱"
+msgstr "對象名"
 
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "E-mail address of the contact"
-msgstr "聯絡人電郵地址"
+msgstr "這聯絡人的郵件地址"
 
 #. module: crm
 #: field:crm.lead,referred:0
 msgid "Referred by"
-msgstr ""
+msgstr "推薦人"
 
 #. module: crm
 #: view:crm.lead:0 model:ir.model,name:crm.model_crm_add_note
 msgid "Add Internal Note"
-msgstr "添加內部記事"
+msgstr "添加內部備註"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:853
 #, python-format
 msgid "The stage of lead '%s' has been changed to '%s'."
-msgstr ""
+msgstr "這潛在客戶的階段從 '%s' 改為 '%s'"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Last"
-msgstr ""
+msgstr "最後"
 
 #. module: crm
 #: field:crm.lead,message_ids:0 field:crm.meeting,message_ids:0
 #: field:crm.phonecall,message_ids:0
 msgid "Messages"
-msgstr "訊息"
+msgstr "消息"
 
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr ""
+msgstr "聯絡方式（電子郵件，面談，電話等）"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "Error!"
-msgstr "錯誤！"
+msgstr "錯誤!"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,name:0 field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr ""
+msgstr "電訪摘要"
 
 #. module: crm
 #: selection:crm.add.note,state:0 selection:crm.lead,state:0
 #: selection:crm.lead.report,state:0 selection:crm.meeting,state:0
 #: selection:crm.phonecall,state:0 selection:crm.phonecall.report,state:0
 msgid "Cancelled"
-msgstr "取消"
+msgstr "已取消"
 
 #. module: crm
 #: field:crm.add.note,body:0
 msgid "Note Body"
-msgstr "記事內容"
+msgstr "備註內容"
 
 #. module: crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr "各階段我的計劃收益"
+msgstr "我的階段計劃營收"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -2735,11 +2756,15 @@ msgid ""
 "opportunities, convert them into quotations, manage related documents, track "
 "all customer related activities, and much more."
 msgstr ""
+"對於商機你可以管理和與你的銷售管道建立的特定客戶或者跟進潛在銷售相關的銷售單保持聯絡，資訊如：預期收入，商機的階段，預計結束日期，大量的溝通日誌，通過郵件"
+"閘道商機能和郵件相連：新的郵件可能能建立新的商機，他們能自動獲得和客戶交流的日誌。\n"
+"\n"
+"你和你的團隊可以為會議和從電訪來的商機做計劃，把它們轉換成報價，管理相關文檔，追蹤所有相關客戶的活動等。。"
 
 #. module: crm
 #: field:crm.lead,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "顏色索引"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2753,14 +2778,14 @@ msgid ""
 "classify and analyse your leads and opportunities. Such categories could for "
 "instance reflect your product structure or the different types of sales you "
 "do."
-msgstr ""
+msgstr "建立具體合適你公司行銷活動的類型以便更好地分類和分析潛在客戶和商機。例如這類型能反映你的產品結構或對不同類型的銷售該怎麼做。"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
 msgid ""
 "If the partner has not purchased (or bought) during a period, decrease the "
 "state of mind by this factor. It's a multiplication"
-msgstr ""
+msgstr "如果業務夥伴在一段時間都沒有買賣，使用此因子來減少滿意度。這是一個乘法。"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_phonecall
@@ -2769,22 +2794,22 @@ msgid ""
 "on their phone calls. You can group or filter the information according to "
 "several criteria and drill down the information, by adding more groups in "
 "the report."
-msgstr ""
+msgstr "在這報表中，你能分析你的銷售團隊在電訪上的業績。你能在報表新增更多的群組以根據數個條件來分類或篩選資訊並深入分析資訊。"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "郵件"
 
 #. module: crm
 #: field:crm.phonecall,name:0 view:res.partner:0
 msgid "Call Summary"
-msgstr ""
+msgstr "電訪摘要"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Todays' Leads"
-msgstr ""
+msgstr "今天的潛在客戶"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_outgoing0
@@ -2795,86 +2820,88 @@ msgid ""
 "customer. You can also import a .CSV file with a list of calls to be done by "
 "your sales team."
 msgstr ""
+"排定的電訪列出所有你的團隊需要打的電話。業務人員可以在表單中記錄電訪的資訊。這些資訊會保存在業務夥伴表單用於追蹤你和客戶的聯絡過程。你可以用CSV文件匯入"
+"一個需要團隊打電話的列表。"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
 msgid "Operator"
-msgstr "操作員"
+msgstr "運算符"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr ""
+msgstr "電訪到電訪"
 
 #. module: crm
 #: view:crm.lead:0
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule/Log Call"
-msgstr ""
+msgstr "安排/記錄 電訪"
 
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Confirmed"
-msgstr "確認"
+msgstr "已確認"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_oppor_stage_user
 msgid "Planned Revenue By User and Stage"
-msgstr ""
+msgstr "按使用者和階段查看預期收入"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Confirm"
-msgstr "確認"
+msgstr "確定"
 
 #. module: crm
 #: field:crm.meeting,su:0
 msgid "Sun"
-msgstr "日"
+msgstr "週日"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "分類"
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
 msgid "Optional Expression"
-msgstr ""
+msgstr "選擇性的表示式"
 
 #. module: crm
 #: selection:crm.meeting,select1:0
 msgid "Day of month"
-msgstr ""
+msgstr "日"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.act_my_oppor_stage
 msgid "Planned Revenue By Stage"
-msgstr ""
+msgstr "按階段分組的預期收入"
 
 #. module: crm
 #: selection:crm.add.note,state:0 model:crm.case.stage,name:crm.stage_lead1
 #: view:crm.lead:0 selection:crm.lead,state:0 view:crm.lead.report:0
 msgid "New"
-msgstr ""
+msgstr "建立"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,email_from:0 field:crm.meeting,email_from:0
 #: field:crm.phonecall,email_from:0
 msgid "Email"
-msgstr "電郵"
+msgstr "電子郵件"
 
 #. module: crm
 #: view:crm.case.channel:0 view:crm.lead:0 field:crm.lead,channel_id:0
 #: view:crm.lead.report:0 field:crm.lead.report,channel_id:0
 msgid "Channel"
-msgstr "通路"
+msgstr "管道"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead.report:0 view:crm.meeting:0
 #: view:crm.phonecall:0 view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "我的銷售團隊"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2884,34 +2911,36 @@ msgid ""
 "If checked, remove the category from partners that doesn't match "
 "segmentation criterions"
 msgstr ""
+"檢查是否限制此分類的業務夥伴符合細分規則。\n"
+"如勾選此項，將從業務夥伴移除不符合細分規則的分類。"
 
 #. module: crm
 #: field:crm.meeting,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "例外的日期/ 時間"
 
 #. module: crm
 #: help:crm.meeting,date_deadline:0
 msgid ""
 "Deadline Date is automatically                         computed from Start "
 "Date + Duration"
-msgstr ""
+msgstr "從“開始”日期+時間自動計算截止日期"
 
 #. module: crm
 #: field:crm.lead,state_id:0
 msgid "Fed. State"
-msgstr ""
+msgstr "省/州"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadopportunity0
 msgid "Creating business opportunities from Leads"
-msgstr ""
+msgstr "從潛在客戶建立商機"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM Dashboard"
-msgstr ""
+msgstr "客戶關係管理控制台"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
@@ -2921,22 +2950,22 @@ msgstr "需要資訊"
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadopportunity0
 msgid "Prospect Opportunity"
-msgstr "展望機會"
+msgstr "探查商機"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
 msgid "Set Category to"
-msgstr "將分類設為"
+msgstr "設置分類為"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr ""
+msgstr "收信人"
 
 #. module: crm
 #: field:crm.meeting,th:0
 msgid "Thu"
-msgstr "四"
+msgstr "週四"
 
 #. module: crm
 #: view:crm.add.note:0 view:crm.merge.opportunity:0
@@ -2953,23 +2982,23 @@ msgstr "每天"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_stage_form_installer
 msgid "Review Sales Stages"
-msgstr ""
+msgstr "檢查銷售階段"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
 msgid "Qualification"
-msgstr ""
+msgstr "資格"
 
 #. module: crm
 #: field:crm.lead,partner_address_email:0
 msgid "Partner Contact Email"
-msgstr ""
+msgstr "業務夥伴郵箱"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:48
 #, python-format
 msgid "A partner is already defined."
-msgstr ""
+msgstr "商業夥伴已建立."
 
 #. module: crm
 #: selection:crm.meeting,byday:0
@@ -2979,24 +3008,24 @@ msgstr "第一"
 #. module: crm
 #: field:crm.lead.report,deadline_month:0
 msgid "Exp. Closing Month"
-msgstr ""
+msgstr "預期結束月數"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "December"
-msgstr "十二月"
+msgstr "12月"
 
 #. module: crm
 #: view:base.action.rule:0
 msgid "Condition on Communication History"
-msgstr ""
+msgstr "溝通日誌的條件"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Date of Call"
-msgstr ""
+msgstr "呼叫日期"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
@@ -3009,6 +3038,10 @@ msgid ""
 "bought goods to another supplier.                  \n"
 "Use this functionality for recurring businesses."
 msgstr ""
+"在一個期間兩個週期間這細分的業務夥伴銷售或採購的平均天數。\n"
+"它主要用來檢查業務夥伴有沒有業務或者多長時間有。\n"
+"所以因此我們假定他的滿意度下降因此向其它供應商採購。\n"
+"對經常的業務使用這功能。"
 
 #. module: crm
 #: field:crm.meeting,vtimezone:0
@@ -3018,53 +3051,53 @@ msgstr "時區"
 #. module: crm
 #: field:crm.meeting,sa:0
 msgid "Sat"
-msgstr "六"
+msgstr "週六"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,user_id:0 view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesman"
-msgstr "業務員"
+msgstr "業務人員"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,date_deadline:0
 msgid "Expected Closing"
-msgstr ""
+msgstr "預期結束"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_opportunity2phonecall
 msgid "Opportunity to Phonecall"
-msgstr ""
+msgstr "商機轉成電訪"
 
 #. module: crm
 #: help:crm.case.section,allow_unlink:0
 msgid "Allows to delete non draft cases"
-msgstr ""
+msgstr "允許刪除不是草稿的業務"
 
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Repeat"
-msgstr "重覆"
+msgstr "重複"
 
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr ""
+msgstr "預期結束年數"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Partner Name"
-msgstr "伙伴名稱"
+msgstr "業務夥伴名稱"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone2
 msgid "Outbound"
-msgstr ""
+msgstr "致電"
 
 #. module: crm
 #: field:crm.lead,date_open:0 field:crm.phonecall,date_open:0
 msgid "Opened"
-msgstr "開放"
+msgstr "已開啟"
 
 #. module: crm
 #: view:crm.case.section:0 field:crm.case.section,member_ids:0
@@ -3074,22 +3107,22 @@ msgstr "團隊成員"
 #. module: crm
 #: view:crm.lead:0 view:crm.meeting:0 view:crm.phonecall:0
 msgid "Contacts"
-msgstr "聯絡人"
+msgstr "聯絡人列表"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Interest in Computer"
-msgstr ""
+msgstr "對電腦有興趣"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation Detail"
-msgstr "邀約詳情"
+msgstr "邀請內容"
 
 #. module: crm
 #: field:crm.segmentation,som_interval_default:0
 msgid "Default (0=None)"
-msgstr "預設 (0=無)"
+msgstr "預設(0=無)"
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -3097,13 +3130,13 @@ msgid ""
 "These email addresses will be added to the CC field of all inbound and "
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
-msgstr ""
+msgstr "這些郵件地址將添加到之前發送記錄的發送和接收郵件的副本欄位，以逗點分隔多個郵件地址。"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Logged Calls"
-msgstr ""
+msgstr "通話日誌"
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -3116,17 +3149,17 @@ msgstr "成功概率"
 #: selection:crm.phonecall,state:0 selection:crm.phonecall.report,state:0
 #, python-format
 msgid "Draft"
-msgstr "草案"
+msgstr "草稿"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
 msgid "Cases by Sales Team"
-msgstr "各業務團隊案例"
+msgstr "該銷售團隊的業務"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
 msgid "Attendees"
-msgstr "出席者"
+msgstr "與會者"
 
 #. module: crm
 #: view:crm.meeting:0 view:crm.phonecall:0
@@ -3139,35 +3172,35 @@ msgstr "會議"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_categ
 msgid "Category of Case"
-msgstr "案例分類"
+msgstr "業務分類"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "7 Days"
-msgstr "七日"
+msgstr "7天"
 
 #. module: crm
 #: view:board.board:0
 msgid "Planned Revenue by Stage and User"
-msgstr "各階段及用戶計劃收益"
+msgstr "按銷售階段及使用者的計劃營收"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Communication & History"
-msgstr ""
+msgstr "溝通&日誌"
 
 #. module: crm
 #: selection:crm.lead,priority:0 selection:crm.lead.report,priority:0
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Normal"
-msgstr ""
+msgstr "一般"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:104
 #, python-format
 msgid "Closed/Cancelled Leads can not be converted into Opportunity"
-msgstr ""
+msgstr "關閉或取消狀態的潛在客戶不能轉為商機"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action
@@ -3178,64 +3211,64 @@ msgstr "會議分類"
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "You may have to verify that this partner does not exist already."
-msgstr ""
+msgstr "你可能要確認這個業務夥伴是否已不存在"
 
 #. module: crm
 #: field:crm.lead.report,delay_open:0
 msgid "Delay to Open"
-msgstr ""
+msgstr "延遲開啟"
 
 #. module: crm
 #: field:crm.lead.report,user_id:0 field:crm.phonecall.report,user_id:0
 msgid "User"
-msgstr "用戶"
+msgstr "使用者"
 
 #. module: crm
 #: code:addons/crm/crm.py:446
 #, python-format
 msgid "The case '%s' has been cancelled."
-msgstr ""
+msgstr "這業務'%s'已取消"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "November"
-msgstr "十一月"
+msgstr "11月"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: model:ir.actions.act_window,name:crm.act_opportunity_stage
 msgid "Opportunities By Stage"
-msgstr "各階段機會"
+msgstr "按階段的商機"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1月"
 
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
-msgstr "合約"
+msgstr "合同"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead4
 msgid "Twitter Ads"
-msgstr "Twitter 廣告"
+msgstr "Twitter地址"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:336
 #, python-format
 msgid "The opportunity '%s' has been been won."
-msgstr ""
+msgstr "商機 '%s'  成交"
 
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "適用於所有團隊"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:831 code:addons/crm/wizard/crm_add_note.py:28
@@ -3246,60 +3279,60 @@ msgstr "錯誤"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Planned Revenues"
-msgstr "計劃收益"
+msgstr "計劃收入"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Need Consulting"
-msgstr ""
+msgstr "需要諮詢"
 
 #. module: crm
 #: constraint:crm.segmentation:0
 msgid "Error ! You can not create recursive profiles."
-msgstr ""
+msgstr "錯誤! 你不能建立循環引用的剖面。"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
 msgid "Expected closing year"
-msgstr ""
+msgstr "預期結束年數"
 
 #. module: crm
 #: field:crm.lead,partner_address_id:0 field:crm.meeting,partner_address_id:0
 #: field:crm.phonecall,partner_address_id:0
 msgid "Partner Contact"
-msgstr "伙伴聯絡人"
+msgstr "業務夥伴聯絡方式"
 
 #. module: crm
 #: field:crm.meeting,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "循環日期"
 
 #. module: crm
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "兩個使用者不能使用相同的登入名稱！"
 
 #. module: crm
 #: code:addons/crm/crm.py:409 view:crm.lead:0 view:res.partner:0
 #, python-format
 msgid "Close"
-msgstr "關閉"
+msgstr "結束"
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr ""
+msgstr "安排通話"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.phonecall:0
 msgid "Categorization"
-msgstr "分類化"
+msgstr "歸類"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Log Call"
-msgstr ""
+msgstr "記錄通話日誌"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
@@ -3309,47 +3342,47 @@ msgstr "動作規則"
 #. module: crm
 #: field:crm.meeting,rrule_type:0
 msgid "Recurrency"
-msgstr ""
+msgstr "循環"
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
 msgid "Phonecall"
-msgstr "致電"
+msgstr "電訪"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Thursday"
-msgstr "星期四"
+msgstr "週四"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "To"
-msgstr ""
+msgstr "到"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Create date"
-msgstr ""
+msgstr "發現日期"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Private"
-msgstr ""
+msgstr "私有的"
 
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public for Employees"
-msgstr ""
+msgstr "全體員工可見"
 
 #. module: crm
 #: field:crm.lead,function:0
 msgid "Function"
-msgstr ""
+msgstr "職務"
 
 #. module: crm
 #: view:crm.add.note:0
 msgid "_Add"
-msgstr ""
+msgstr "添加"
 
 #. module: crm
 #: field:crm.case.section,note:0 view:crm.meeting:0
@@ -3361,60 +3394,60 @@ msgstr "說明"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls made in current month"
-msgstr ""
+msgstr "本月通話記錄"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "May"
-msgstr "五月"
+msgstr "5月"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Interest in Accessories"
-msgstr ""
+msgstr "對週邊商品感興趣"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "New Opportunities"
-msgstr ""
+msgstr "新建商機"
 
 #. module: crm
 #: code:addons/crm/crm_action_rule.py:61
 #, python-format
 msgid "No E-Mail Found for your Company address!"
-msgstr ""
+msgstr "公司未配置郵箱"
 
 #. module: crm
 #: field:crm.lead.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "電子郵件"
 
 #. module: crm
 #: field:crm.lead,street:0
 msgid "Street"
-msgstr ""
+msgstr "街道"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunities by User and Team"
-msgstr "各用戶及團隊機會"
+msgstr "使用者和團隊的商機"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr ""
+msgstr "重設為待辦"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
 msgid "Working Hours"
-msgstr ""
+msgstr "工時"
 
 #. module: crm
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr "致電"
+msgstr "電訪列表"
 
 #. module: crm
 #: view:crm.lead:0 field:crm.lead,is_customer_add:0
@@ -3433,7 +3466,7 @@ msgstr "最低"
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "February"
-msgstr "二月"
+msgstr "2月"
 
 #. module: crm
 #: field:base.action.rule,trg_section_id:0 field:crm.case.categ,section_id:0
@@ -3446,23 +3479,23 @@ msgstr "二月"
 #: view:crm.phonecall.report:0 field:crm.phonecall2phonecall,section_id:0
 #: field:res.partner,section_id:0 field:res.users,context_section_id:0
 msgid "Sales Team"
-msgstr "業務團隊"
+msgstr "銷售團隊"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6 view:crm.lead:0
 msgid "Lost"
-msgstr ""
+msgstr "丟單"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit"
-msgstr ""
+msgstr "編輯"
 
 #. module: crm
 #: field:crm.lead,country_id:0 view:crm.lead.report:0
 #: field:crm.lead.report,country_id:0
 msgid "Country"
-msgstr "國家或地區"
+msgstr "國家"
 
 #. module: crm
 #: view:crm.lead:0 view:crm.lead2opportunity.partner:0
@@ -3471,12 +3504,12 @@ msgstr "國家或地區"
 #: selection:crm.lead2opportunity.partner.mass,name:0 view:crm.phonecall:0
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr ""
+msgstr "轉換成商機"
 
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Wednesday"
-msgstr "星期三"
+msgstr "週三"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
@@ -3486,28 +3519,30 @@ msgid ""
 "partner. From the phone call form, you can trigger a request for another "
 "call, a meeting or an opportunity."
 msgstr ""
+"這個工具可以讓你迅速記錄接到的電話。每次你接到的電話都會出現在客戶的表單上用於記錄你和業務夥伴的每次通話。在電訪表單上，你可以安排另一次通話，或會面，或新"
+"建一個商機。"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
 #: selection:crm.lead.report,deadline_month:0
 #: selection:crm.meeting,month_list:0 selection:crm.phonecall.report,month:0
 msgid "April"
-msgstr "四月"
+msgstr "4月"
 
 #. module: crm
 #: field:crm.case.resource.type,name:0
 msgid "Campaign Name"
-msgstr "推廣名稱"
+msgstr "行銷活動名稱"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling"
-msgstr ""
+msgstr "剖面"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr ""
+msgstr "按使用者及分類的電訪"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_channel_action
@@ -3515,13 +3550,13 @@ msgid ""
 "Track from where is coming your leads and opportunities by creating specific "
 "channels that will be maintained at the creation of a document in the "
 "system. Some examples of channels can be: Website, Phone Call, Reseller, etc."
-msgstr ""
+msgstr "管道用於記錄你的銷售潛在客戶或商機的來源，並利用系統建立的文件來記錄。例如：網站、電話、經銷商等"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 msgid "Merge with existing Opportunity"
-msgstr "與現有機會合併"
+msgstr "合併現有的商機"
 
 #. module: crm
 #: field:crm.meeting,select1:0
@@ -3531,27 +3566,27 @@ msgstr "選項"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
 msgid "Negotiation"
-msgstr "協商"
+msgstr "談判"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Exp.Closing"
-msgstr ""
+msgstr "結束中"
 
 #. module: crm
 #: field:crm.case.stage,sequence:0 field:crm.meeting,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "序列"
 
 #. module: crm
 #: model:ir.model,name:crm.model_mail_compose_message
 msgid "E-mail composition wizard"
-msgstr ""
+msgstr "郵件合併精靈"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Accept"
-msgstr "接受"
+msgstr "同意"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_name:0
@@ -3561,12 +3596,12 @@ msgstr "控制變量"
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Second"
-msgstr ""
+msgstr "第二"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
 msgid "Proposition"
-msgstr ""
+msgstr "建議"
 
 #. module: crm
 #: field:crm.lead.report,date_closed:0
@@ -3578,17 +3613,17 @@ msgstr "結束日期"
 #: view:crm.lead.report:0 view:crm.phonecall.report:0
 #: field:crm.phonecall.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "年"
 
 #. module: crm
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "錯誤! 你不能建立循環引用的成員。"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead8
 msgid "Newsletter"
-msgstr ""
+msgstr "電子報"
 
 #~ msgid "Planned Costs"
 #~ msgstr "计划成本"
@@ -3782,3 +3817,18 @@ msgstr ""
 
 #~ msgid "Current Activity"
 #~ msgstr "當前動態"
+
+#~ msgid "Assigned opportunities to"
+#~ msgstr "已指派商機給"
+
+#~ msgid "Schedule/Log a call"
+#~ msgstr "安排/紀錄一個電話拜訪"
+
+#~ msgid "End of recurrency"
+#~ msgstr "循環結束"
+
+#~ msgid "Schedule call"
+#~ msgstr "安排電訪"
+
+#~ msgid "Referred By"
+#~ msgstr "介紹人"
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 4283dd8fb3c..a17633d0ef6 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -8,7 +8,7 @@
             <field name="name">crm.lead.report.tree</field>
             <field name="model">crm.lead.report</field>
             <field name="arch" type="xml">
-            <tree string="Leads Analysis">
+            <tree string="Leads Analysis" create="false">
                 <field name="creation_year" invisible="1"/>
                 <field name="creation_month" invisible="1"/>
                 <field name="creation_day" invisible="1"/>
@@ -105,21 +105,11 @@
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Stage" name="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
-                        <filter string="Campaign" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'type_id'}" />
-                        <filter string="Channel" icon="terp-call-start" domain="[]" context="{'group_by':'channel_id'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
-                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'creation_year'}"/>
-                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'creation_month'}"/>
-                        <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'creation_day'}"/>
-                        <filter string="Exp. Closing"  icon="terp-go-month" domain="[]" context="{'group_by':'deadline_month'}"/>
                         <filter string="Campaign" icon="terp-gtk-jump-to-rtl"
                             domain="[]" context="{'group_by':'type_id'}" />
                         <filter string="Channel" icon="terp-call-start"
                             domain="[]" context="{'group_by':'channel_id'}" />
                         <separator orientation="vertical" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize"
-                            domain="[]" context="{'group_by':'state'}" />
-                        <separator orientation="vertical" />
                         <filter string="Year" icon="terp-go-year"
                             domain="[]" context="{'group_by':'creation_year'}"/>
                         <filter string="Month" icon="terp-go-month"
@@ -140,7 +130,7 @@
             <field name="name">crm.lead.report.tree</field>
             <field name="model">crm.lead.report</field>
             <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';black:state in ('open','pending','done');gray:state == 'cancel' " string="Opportunities Analysis">
+            <tree colors="blue:state == 'draft';black:state in ('open','pending','done');gray:state == 'cancel' " create="false" string="Opportunities Analysis">
                 <field name="creation_year" invisible="1"/>
                 <field name="creation_month" invisible="1"/>
                 <field name="creation_day" invisible="1"/>
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index ec7ea5e6bdb..1f1a4f91046 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -8,7 +8,7 @@
             <field name="name">crm.phonecall.report.tree</field>
             <field name="model">crm.phonecall.report</field>
             <field name="arch" type="xml">
-                <tree string="Phone calls">
+                <tree string="Phone calls" create="false">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="section_id" invisible="1"/>
@@ -91,7 +91,7 @@
             <field name="res_model">crm.phonecall.report</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
-            <field name="context">{"search_default_year":1,"search_default_User":1,"search_default_This Month":1,'group_by_no_leaf':1,'group_by':[]}</field>
+            <field name="context">{"search_default_year":1,"search_default_Salesperson":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">From this report, you can analyse the performance of your sales team, based on their phone calls. You can group or filter the information according to several criteria and drill down the information, by adding more groups in the report.</field>
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index c6d33b4bec2..6f431b90cba 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -26,24 +26,19 @@ class crm_configuration(osv.osv_memory):
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_lead': fields.boolean("create leads from incoming mails",
+        'fetchmail_lead': fields.boolean("Create leads from incoming mails",
             fetchmail_model='crm.lead', fetchmail_name='Incoming Leads',
             help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
-        'module_crm_caldav': fields.boolean("applications with Caldav protocol",
-            help="""Use protocol caldav to synchronize meetings with other calendar applications (like Sunbird).
-                This installs the module crm_caldav."""),
-        'module_import_sugarcrm': fields.boolean("SugarCRM",
-            help="""Import SugarCRM leads, opportunities, users, accounts, contacts, employees, meetings, phonecalls, emails, project and project tasks data.
-                This installs the module import_sugarcrm."""),
-        'module_import_google': fields.boolean("Google (Contacts and Calendar)",
-            help="""Import google contact in partner address and add google calendar events details in Meeting.
-                This installs the module import_google."""),
-        'module_google_map': fields.boolean("add google maps on customer",
-            help="""Locate customers on Google Map.
-                This installs the module google_map."""),
         'group_fund_raising': fields.boolean("Manage Fund Raising",
             implied_group='crm.group_fund_raising',
             help="""Allows you to trace and manage your activities for fund raising."""),
+        'module_crm_claim':fields.boolean("Manage Customer Claims",
+            help="""Allows you to track your customers/suppliers claims and grievances.
+                    This installs the module crm_claim."""),
+        'module_crm_helpdesk':fields.boolean("Manage Helpdesk and Support",
+            help="""Allows you to communicate with Customer,  process Customer query, and provide better help and support. This installs the module crm_helpdesk."""),
+        
+        
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 3ab9ac8a32c..9534c8620ee 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -7,6 +7,22 @@
             <field name="model">sale.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
             <field name="arch" type="xml">
+	            <div name="config_sale" position="before">
+	                <separator string="After-Sale Services"/>
+                    <group>
+                        <label for="id" string="Features"/>
+                        <div>
+                            <div>
+                                <field name="module_crm_claim" class="oe_inline"/>
+                                <label for="module_crm_claim"/>
+                            </div>
+                            <div>
+                                <field name="module_crm_helpdesk" class="oe_inline"/>
+                                <label for="module_crm_helpdesk"/>
+                            </div>
+                        </div>
+                    </group>
+	            </div>
                 <group name="On Mail Client" version="7.0" position="after">
                     <group>
                         <label for="id" string="On Mail Server"/>
@@ -20,24 +36,6 @@
                         </div>
                     </group>
                 </group>
-                <div name="config_other" version="7.0" position="inside">
-                    <separator string="Importing and Synchronizing with External Systems"/>
-                    <group>
-                        <label for="id" string="Synchronize with"/>
-                        <div>
-                            <div>
-                                <field name="module_import_google"/>
-                                <label for="module_import_google"/>
-                            </div>
-                        </div>
-                    </group>
-                </div>
-                <div name="Customer Features" position="inside">
-                    <div>
-                        <field name="module_google_map" class="oe_inline"/>
-                        <label for="module_google_map"/>
-                    </div>
-                </div>
             </field>
         </record>
 
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index 55cc0c95b2c..e43534476fd 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -26,12 +26,16 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
 
     def _opportunity_meeting_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        for partner in self.browse(cr, uid, ids, context):
-            res[partner.id] = {
-                'opportunity_count': len(partner.opportunity_ids),
-                'meeting_count': len(partner.meeting_ids),
-            }
+        res = dict(map(lambda x: (x,{'opportunity_count': 0, 'meeting_count': 0}), ids))
+        # the user may not have access rights for opportunities or meetings
+        try:
+            for partner in self.browse(cr, uid, ids, context):
+                res[partner.id] = {
+                    'opportunity_count': len(partner.opportunity_ids),
+                    'meeting_count': len(partner.meeting_ids),
+                }
+        except:
+            pass
         return res
 
     _columns = {
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index a3c60d4421c..93abc967b8e 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -15,31 +15,12 @@
                 </field>
         </record>
 
-        <record id="view_partners_tree_crm2" model="ir.ui.view">
-                <field name="name">view.res.partner.tree.crm.inherited2</field>
-                <field name="model">res.partner</field>
-                <field name="inherit_id" ref="base.view_partner_tree"/>
-                <field eval="18" name="priority"/>
-                <field name="arch" type="xml">
-                    <field name="phone" position="after">
-                        <field name="section_id" completion="1" invisible="context.get('invisible_section', True)"/>
-                    </field>
-                </field>
-        </record>
-
         <record id="view_partners_form_crm3" model="ir.ui.view">
                 <field name="name">view.res.partner.search.crm.inherited3</field>
                 <field name="model">res.partner</field>
                 <field name="inherit_id" ref="base.view_res_partner_filter"/>
                 <field eval="18" name="priority"/>
                 <field name="arch" type="xml">
-                    <field name="category_id" position="after">
-                        <field name="section_id" completion="1"/>
-                        <field name="section_id" completion="1" widget="selection" context="{'invisible_section': False}"/>
-                    </field>
-                    <xpath expr="//field[@name='user_id']" position="after">
-                        <field name="country_id"/>
-                    </xpath>
                     <xpath expr="//group[@string='Group By...']" position="after">
                         <group string="Display">
                             <filter string="Show Sales Team" context="{'invisible_section': False}"/>
@@ -54,7 +35,7 @@
             <field name="src_model">res.partner</field>
             <field name="res_model">crm.meeting</field>
             <field name="view_mode">calendar,tree,form,gantt</field>
-            <field name="context">{'search_default_partner_ids': active_id}</field>
+            <field name="context">{'default_partner_ids': [active_id]}</field>
         </record>
 
         <!-- open opportunities related to given partner -->
@@ -130,11 +111,11 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button type="action"
-                        string="Schedule a Meeting"
+                        string="Meetings"
                         name="%(base_calendar.action_crm_meeting)d"
                         context="{'search_default_partner_ids': active_id, 'default_partner_ids' : [active_id]}"/>
-                    <button type="action" string="Schedule a Call" 
-                        name="%(crm.crm_case_categ_phone_create_partner)d" 
+                    <button type="action" string="Calls" 
+                        name="%(crm.crm_case_categ_phone_incoming0)d" 
                         context="{'search_default_partner_id': active_id, 'default_duration': 1.0}" />
                     <button type="action" string="Opportunities" attrs="{'invisible': [('customer', '=', False)]}"
                         name="%(crm.crm_case_category_act_oppor11)d" context="{'search_default_partner_id': active_id}"/>
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index 07bb3fc539c..9bb54441aa3 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -3,18 +3,21 @@
 <data noupdate="0">
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">User - Own Leads Only</field>
+        <field name="name">User: Own Leads Only</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
+        <field name="comment">the user will have access to his own data in the sales application.</field>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
-        <field name="name">User - All Leads</field>
+        <field name="name">User: All Leads</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
+        <field name="comment">the user will have access to all records of everyone in the sales application.</field>
     </record>
 
     <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Manager</field>
+        <field name="comment">the user will have an access to the sales configuration as well as statistic reports.</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
@@ -57,5 +60,18 @@
         <field name="domain_force">['|',('user_id','=',user.id),('show_as','=','busy')]</field>
     </record>
 
+    <record id="crm_rule_personal_phonecall" model="ir.rule">
+        <field name="name">Personal Phone Calls</field>
+        <field ref="model_crm_phonecall" name="model_id"/>
+        <field name="domain_force">['|',('user_id','=',user.id),('user_id','=',False)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman'))]"/>
+    </record>
+    <record id="crm_rule_all_phones" model="ir.rule">
+        <field name="name">All Phones</field>
+        <field ref="model_crm_phonecall" name="model_id"/>
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="groups" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
+    </record>
+
     </data>
 </openerp>
diff --git a/addons/crm/test/process/action_rule.yml b/addons/crm/test/process/action_rule.yml
index 9c869009906..f76e6c250bc 100644
--- a/addons/crm/test/process/action_rule.yml
+++ b/addons/crm/test/process/action_rule.yml
@@ -7,14 +7,14 @@
     new_id = self.create(cr, uid, {'name': 'New Rule', 'model_id': model_ids[0],  'trg_user_id': ref('base.user_root'), 'trg_partner_id': ref('base.res_partner_1'), 'act_user_id': ref('base.user_demo') })
     self._check(cr, uid)
 -
-  I create new lead to check record rule.
+  I create a new lead to check the record rule.
 -
   !record {model: crm.lead, id: crm_lead_test_rules_id}:
     name: 'Test lead rules'
     partner_id: base.res_partner_1
 -
-  I check record rule is apply and responsible is changed.
+  I check if the record rule is applied and the responsible is changed.
 -
   !python {model: crm.lead}: |
     lead_user = self.browse(cr, uid, ref('crm_lead_test_rules_id'))
-    assert lead_user.user_id.id == ref('base.user_demo'), "Responsible of lead is not changed." 
+    assert lead_user.user_id.id == ref('base.user_demo'), "Responsible of lead is not changed."
diff --git a/addons/crm/test/process/cancel_lead.yml b/addons/crm/test/process/cancel_lead.yml
index 31c159c3fdf..edaf844952a 100644
--- a/addons/crm/test/process/cancel_lead.yml
+++ b/addons/crm/test/process/cancel_lead.yml
@@ -10,7 +10,7 @@
     lead = self.browse(cr, uid, ref('crm_case_1'))
     assert lead.stage_id.id == ref('crm.stage_lead7'), "Stage should be 'Dead' and is %s." % (lead.stage_id.name)
     assert lead.state == 'cancel', "Opportunity is not in 'cancel' state."
-    assert lead.probability == 0.0, 'Opportunity probability is wrong and should be 0.0.'
+    assert lead.probability == 0.0, 'Opportunity is probably wrong and should be 0.0.'
 -
   I reset cancelled lead into unqualified lead.
 -
diff --git a/addons/crm/test/process/communication_with_customer.yml b/addons/crm/test/process/communication_with_customer.yml
index 1653be10763..2137616ae3e 100644
--- a/addons/crm/test/process/communication_with_customer.yml
+++ b/addons/crm/test/process/communication_with_customer.yml
@@ -1,7 +1,7 @@
 -
-  Customer interested in our product. so he send request by email to get more details.
+  Customer interested in our product, so he sends request by email to get more details.
 -
-  Mail script will be fetched him request from mail server. so I process that mail after read EML file 
+  Mail script will fetch his request from mail server. Then I process that mail after read EML file.
 -
   !python {model: mail.thread}: |
     import addons
@@ -15,33 +15,27 @@
     lead_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     assert lead_ids and len(lead_ids), "Lead is not created after getting request"
     lead = self.browse(cr, uid, lead_ids[0], context=context)
-    assert not lead.partner_id, "Customer should be a new"
+    assert not lead.partner_id, "Customer should be a new one"
     assert lead.name == "Fournir votre devis avec le meilleur prix.", "Subject does not match"
 -
-  I reply him request with welcome message.
+  I reply his request with welcome message. TODO revert mail.mail to mail.compose.message (conversion to customer should be automatic).
 -
-  !python {model: mail.compose.message}: |
+  !python {model: mail.mail}: |
     lead_ids = self.pool.get('crm.lead').search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     context.update({'active_model': 'crm.lead','active_id': lead_ids[0]})
-    id = self.create(cr, uid, {'body_text': "Merci à l'intérêt pour notre produit.nous vous contacterons bientôt. Merci", 'email_from': 'sales@mycompany.com'}, context=context)
+    id = self.create(cr, uid, {'body': "Merci de votre intérêt pour notre produit, nous vous contacterons bientôt. Bien à vous", 'email_from': 'sales@mycompany.com'}, context=context)
     try:
         self.send_mail(cr, uid, [id], context=context)
     except:
         pass
 -
-  Now, I convert him into customer and put into regular customer list.
+  Now, I convert him into customer and put him into regular customer list.
 -
   !python {model: crm.lead}: |
     lead_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     self.convert_partner(cr, uid, lead_ids, context=context)
 -
-  Now, I search customer in regular customer list.
--
-  !python {model: crm.lead}: |
-    partner_ids = self.message_partner_by_email(cr, uid, 'Mr. John Right <info@customer.com>')
-    assert partner_ids.get('partner_id'), "Customer is not found in regular customer list."
--
-  I convert one phonecall request as a customer and put into regular customer list. 
+  I convert one phonecall request to a customer and put him into regular customer list.
 -
   !python {model: crm.phonecall2partner}: |
     context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_phonecall_4")], 'active_id': ref("crm.crm_phonecall_4")})
@@ -54,5 +48,5 @@
     partner_id = self.search(cr, uid, [('phonecall_ids', '=', ref('crm.crm_phonecall_4'))])
     assert partner_id, "Customer is not found in regular customer list."
     data = self.browse(cr, uid, partner_id, context=context)[0]
-    assert data.user_id.id == ref("base.user_root"), "User not assign properly"
-    assert data.name == "Wanted information about pricing of Laptops", "Bad partner name"
+    assert data.user_id.id == ref("base.user_root"), "User not assigned properly"
+    assert data.name == "Wanted information about pricing of laptops", "Bad partner name"
diff --git a/addons/crm/test/process/lead2opportunity2win.yml b/addons/crm/test/process/lead2opportunity2win.yml
index 23713dfca2f..dc5aadbcf16 100644
--- a/addons/crm/test/process/lead2opportunity2win.yml
+++ b/addons/crm/test/process/lead2opportunity2win.yml
@@ -1,19 +1,21 @@
 -
-  In order to test convert customer lead into opportunity, 
+  In order to test convert customer lead into opportunity,
 -
   I open customer lead.
 -
    !python {model: crm.lead}: |
      self.case_open(cr, uid, [ref("crm_case_4")])
-- 
-  I check lead state is "Open". 
+-
+  I check lead state is "Open".
 -
   !assert {model: crm.lead, id: crm.crm_case_4, string: Lead in open state}:
      - state == "open"
 -
-  I create partner from lead. 
+  I fill in a lead2partner wizard.
 -
   !record {model: crm.lead2partner, id: crm_lead2partner_id1, context: '{"active_model": "crm.lead", "active_ids": [ref("crm_case_4")]}'}:
+-
+  I create a partner from the lead2partner wizard.
 -
    !python {model: crm.lead2partner}: |
      context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_4')], 'active_id': ref('crm_case_4')})
@@ -24,7 +26,7 @@
   !python {model: crm.lead}: |
     self.convert_opportunity(cr, uid ,[ref("crm_case_4")], ref("base.res_partner_2"))
 -
-  I check details of converted opportunity. 
+  I check details of converted opportunity.
 -
   !python {model: crm.lead}: |
     lead = self.browse(cr, uid, ref('crm_case_4'))
@@ -37,15 +39,15 @@
   !python {model: crm.opportunity2phonecall}: |
     import time
     context.update({'active_model': 'crm.lead', 'active_ids': [ref('crm_case_4')]})
-    call_id = self.create(cr, uid, {'date': time.strftime('%Y-%m-%d %H:%M:%S'), 
-                'name': "Bonjour M. Jean, Comment êtes-vous? J'ai obtenu votre demande. peut-on parler au sujet de ce pour quelques minutes?"}, context=context)
+    call_id = self.create(cr, uid, {'date': time.strftime('%Y-%m-%d %H:%M:%S'),
+                'name': "Bonjour M. Jean, Comment allez-vous? J'ai bien reçu votre demande, pourrions-nous en parler quelques minutes?"}, context=context)
     self.action_schedule(cr, uid, [call_id], context=context)
 -
   I check that phonecall is scheduled for that opportunity.
 -
   !python {model: crm.phonecall}: |
     ids = self.search(cr, uid, [('opportunity_id', '=', ref('crm_case_4'))])
-    assert len(ids), 'phonecall is not scheduled'
+    assert len(ids), 'Phonecall is not scheduled'
 -
   Now I schedule meeting with customer.
 -
@@ -55,7 +57,7 @@
   After communicated  with customer, I put some notes with contract details.
 -
   !python {model: crm.lead}: |
-    self.message_append_note(cr, uid, [ref('crm_case_4')], subject='Test note', body='ces détails envoyés par le client sur ​​le FAX pour la qualité')
+    self.message_post(cr, uid, [ref('crm_case_4')], subject='Test note', body='Détails envoyés par le client sur ​​le FAX pour la qualité')
 -
   I win this opportunity
 -
@@ -73,7 +75,7 @@
   I convert mass lead into opportunity customer.
 -
   !python {model: crm.lead2opportunity.partner.mass}: |
-    context.update({'active_model': 'crm.lead', 'active_ids': [ref("crm_case_11"), ref("crm_case_2")], 'active_id': ref("crm_case_4")}) 
+    context.update({'active_model': 'crm.lead', 'active_ids': [ref("crm_case_11"), ref("crm_case_2")], 'active_id': ref("crm_case_11")})
     id = self.create(cr, uid, {'user_ids': [ref('base.user_root')], 'section_id': ref('crm.section_sales_department')}, context=context)
     self.mass_convert(cr, uid, [id], context=context)
 -
@@ -83,7 +85,8 @@
     opp = self.browse(cr, uid, ref('crm_case_11'))
     assert opp.name == "Need estimated cost for new project", "Opportunity name not correct"
     assert opp.type == 'opportunity', 'Lead is not converted to opportunity!'
-    assert opp.partner_id.name == "Thomas Passot", 'Partner mismatch!'
+    expected_partner = "Thomas Passot"
+    assert opp.partner_id.name == expected_partner, 'Partner mismatch! %s vs %s' % (opp.partner_id.name, expected_partner)
     assert opp.stage_id.id == ref("stage_lead1"), 'Stage of probability is incorrect!'
 -
   Then check for second lead converted on opportunity.
@@ -110,7 +113,7 @@
   I confirm review needs meeting.
 -
   !python {model: crm.meeting}: |
-    context.update({'active_model': 'crm.meeting'}) 
+    context.update({'active_model': 'crm.meeting'})
     self.case_open(cr, uid, [ref('base_calendar.crm_meeting_4')])
 -
   I invite a user for meeting.
diff --git a/addons/crm/test/process/merge_opportunity.yml b/addons/crm/test/process/merge_opportunity.yml
index 6d13278eded..155cd68274f 100644
--- a/addons/crm/test/process/merge_opportunity.yml
+++ b/addons/crm/test/process/merge_opportunity.yml
@@ -1,19 +1,19 @@
 -
-  I make direct opportunity for customer.
+  I make an opportunity from customer.
 -
   !python {model: crm.partner2opportunity}: |
     context.update({'active_model': 'res.partner', 'active_ids': [ref("base.res_partner_9")]})
-    res_id = self.create(cr, uid, {'name': "enquête pour l'achat de services"}, context=context)
+    res_id = self.create(cr, uid, {'name': "Enquête pour l'achat de services"}, context=context)
     self.make_opportunity(cr, uid, [res_id], context=context)
 -
-  I make another opportunity from phonecall for same customer.
+  I make another opportunity from a phone call with the same customer.
 -
   !python {model: crm.phonecall2opportunity}: |
     context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_phonecall_6")]})
-    res_id = self.create(cr, uid, {'name': "Quoi de prix de votre autre service?", 'partner_id': ref("base.res_partner_9")}, context=context)
+    res_id = self.create(cr, uid, {'name': "À propos du prix de votre autre service", 'partner_id': ref("base.res_partner_9")}, context=context)
     self.make_opportunity(cr, uid, [res_id], context=context)
 -
-  Now I merge all opportunities of customer.
+  Now I merge these opportunities.
 -
   !python {model: crm.lead}: |
     opportunity_ids = self.search(cr, uid, [('partner_id','=', ref("base.res_partner_9"))])
@@ -24,7 +24,7 @@
   !python {model: crm.merge.opportunity}: |
     self.action_merge(cr, uid, [ref("opportunity_merge_id")], context=context)
 -
-  I check for merged opportunities for customer. 
+  I check for merged opportunities for customer.
 -
   !python {model: crm.lead}: |
     merge_id = self.search(cr, uid, [('partner_id','=', ref("base.res_partner_9"))])
@@ -32,55 +32,3 @@
     merge_data = self.browse(cr, uid, merge_id)[0]
     assert merge_data.type == 'opportunity', 'Merged opportunity type not change!'
     assert merge_data.partner_id.id == ref("base.res_partner_9"), 'Partner missmatch!'
--
-  Now I schedule another phonecall to customer after merged.
--
-  !python {model: crm.phonecall2phonecall}: |
-    context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_phonecall_6")], 'active_id': ref("crm.crm_phonecall_6")})
-    res_id = self.create(cr, uid, {'name': "vos chances sont fusionnés en un seul"}, context=context)
-    self.action_schedule(cr, uid, [res_id], context=context)
-- 
-  I schedule meeting on this phonecall.
--
-  !python {model: crm.phonecall}: |
-    self.action_make_meeting(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I set phone call to not held.
--
-  !python {model: crm.phonecall}: |
-    self.case_pending(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I check that the phone call is in 'Not Held' state. 
--
-  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call held.}:
-    - state == "pending"
--
-  I cancelled the phone call. 
--
-  !python {model: crm.phonecall}: |
-    self.case_cancel(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I check that the phone call is in 'Cancelled' state.
--
-  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not cancelled.}:
-    - state == "cancel"
--
-  I reset the phone call. 
--
-  !python {model: crm.phonecall}: |
-    self.case_reset(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I check that the phone call is reset or not.
--
-  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not reset.}:
-    - state == "open"
--
-  I set phone call to held (done).
--
-  !python {model: crm.phonecall}: |
-    self.case_close(cr, uid, [ref("crm.crm_phonecall_6")])
--
-  I check that the phone call is in 'Held' state.
--
-  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not held.}:
-    - state == "done"
diff --git a/addons/crm/test/process/phonecalls.yml b/addons/crm/test/process/phonecalls.yml
new file mode 100644
index 00000000000..51a933f3223
--- /dev/null
+++ b/addons/crm/test/process/phonecalls.yml
@@ -0,0 +1,52 @@
+-
+  I schedule a phone call with a customer.
+-
+  !python {model: crm.phonecall2phonecall}: |
+    context.update({'active_model': 'crm.phonecall', 'active_ids': [ref("crm.crm_phonecall_6")], 'active_id': ref("crm.crm_phonecall_6")})
+    res_id = self.create(cr, uid, {'name': "Proposition de réduction"}, context=context)
+    self.action_schedule(cr, uid, [res_id], context=context)
+-
+  I schedule a meeting based on this phone call.
+-
+  !python {model: crm.phonecall}: |
+    self.action_make_meeting(cr, uid, [ref("crm.crm_phonecall_6")])
+-
+  I set the phone call to not held.
+-
+  !python {model: crm.phonecall}: |
+    self.case_pending(cr, uid, [ref("crm.crm_phonecall_6")])
+-
+  I check that the phone call is in 'Not Held' state.
+-
+  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call held.}:
+    - state == "pending"
+-
+  I cancel the phone call.
+-
+  !python {model: crm.phonecall}: |
+    self.case_cancel(cr, uid, [ref("crm.crm_phonecall_6")])
+-
+  I check that the phone call is in 'Cancelled' state.
+-
+  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not cancelled.}:
+    - state == "cancel"
+-
+  I reset the phone call.
+-
+  !python {model: crm.phonecall}: |
+    self.case_reset(cr, uid, [ref("crm.crm_phonecall_6")])
+-
+  I check that the phone call is reset.
+-
+  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not reset.}:
+    - state == "open"
+-
+  I set phone call to held (done).
+-
+  !python {model: crm.phonecall}: |
+    self.case_close(cr, uid, [ref("crm.crm_phonecall_6")])
+-
+  I check that the phone call is in 'Held' state.
+-
+  !assert {model: crm.phonecall, id: crm.crm_phonecall_6, string: Phone call is not held.}:
+    - state == "done"
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 547d3ed299e..ea96e1d16f1 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -24,27 +24,27 @@ from tools.translate import _
 import tools
 import re
 
-import time
-
 class crm_lead2opportunity_partner(osv.osv_memory):
     _name = 'crm.lead2opportunity.partner'
     _description = 'Lead To Opportunity Partner'
     _inherit = 'crm.lead2partner'
 
     _columns = {
-        'action': fields.selection([('exist', 'Link to an existing partner'), \
-                                    ('create', 'Create a new partner'), \
-                                    ('nothing', 'Do not link to a partner')], \
-                                    'Action', required=True),
-        'name': fields.selection([('convert', 'Convert to Opportunity'), ('merge', 'Merge with existing Opportunity')],'Select Action', required=True),
+        'action': fields.selection([('exist', 'Link to an existing customer'), \
+                                    ('create', 'Create a new customer'), \
+                                    ('nothing', 'Do not link to a customer')], \
+                                    'Related Customer', required=True),
+        'name': fields.selection([('convert', 'Convert to opportunity'), \
+                                  ('merge', 'Merge with existing opportunities')], \
+                                  'Conversion Action', required=True),
         'opportunity_ids': fields.many2many('crm.lead', string='Opportunities', domain=[('type', '=', 'opportunity')]),
     }
 
     def default_get(self, cr, uid, fields, context=None):
         """
-            Default get for name, opportunity_ids
-            if there is an exisitng  partner link to the lead, find all existing opportunity link with this partnet to merge
-            all information together
+        Default get for name, opportunity_ids.
+        If there is an exisitng partner link to the lead, find all existing
+        opportunities links with this partner to merge all information together
         """
         lead_obj = self.pool.get('crm.lead')
 
@@ -64,14 +64,13 @@ class crm_lead2opportunity_partner(osv.osv_memory):
 
         ids = []
         if partner_id:
+            # Search for opportunities that have the same partner and that arent done or cancelled
             ids = lead_obj.search(cr, uid, [('partner_id', '=', partner_id), ('type', '=', 'opportunity'), '!', ('state', 'in', ['done', 'cancel'])])
             if ids:
                 opportunities.append(ids[0])
         if not partner_id:
-            label = False
-            opp_ids = []
             if email:
-                # Find email of existing opportunity matches the email_from of the lead
+                # Find email of existing opportunity matching the email_from of the lead
                 cr.execute("""select id from crm_lead where type='opportunity' and
                                 substring(email_from from '([^ ,<@]+@[^> ,]+)') in (%s)""" % (','.join(email)))
                 ids = map(lambda x:x[0], cr.fetchall())
@@ -87,12 +86,11 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         if 'opportunity_ids' in fields:
             res.update({'opportunity_ids': opportunities})
 
-
         return res
 
     def view_init(self, cr, uid, fields, context=None):
         """
-        This function checks for precondition before wizard executes
+        Check some preconditions before the wizard executes.
         """
         if context is None:
             context = {}
@@ -106,65 +104,93 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         if context is None:
             context = {}
         lead = self.pool.get('crm.lead')
-        partner_id = self._create_partner(cr, uid, ids, context=context)
+        res = False
+        partner_ids_map = self._create_partner(cr, uid, ids, context=context)
         lead_ids = vals.get('lead_ids', [])
-        user_ids = vals.get('user_ids', False)
         team_id = vals.get('section_id', False)
-        return lead.convert_opportunity(cr, uid, lead_ids, partner_id, user_ids, team_id, context=context)
+        for lead_id in lead_ids:
+            partner_id = partner_ids_map.get(lead_id, False)
+            # FIXME: cannot pass user_ids as the salesman allocation only works in batch
+            res = lead.convert_opportunity(cr, uid, [lead_id], partner_id, [], team_id, context=context)
+        # FIXME: must perform salesman allocation in batch separately here
+        user_ids = vals.get('user_ids', False)
+        if user_ids:
+            lead.allocate_salesman(cr, uid, lead_ids, user_ids, team_id=team_id, context=context)
+        return res
 
     def _merge_opportunity(self, cr, uid, ids, opportunity_ids, action='merge', context=None):
-        #TOFIX: is it usefully ?
         if context is None:
             context = {}
-        merge_opportunity = self.pool.get('crm.merge.opportunity')
         res = False
-        #If we convert in mass, don't merge if there is no other opportunity but no warning
-        if action == 'merge' and (len(opportunity_ids) > 1 or not context.get('mass_convert') ):
-            self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [opportunity_ids[0].id])]}, context=context)
-            context.update({'lead_ids' : record_id, "convert" : True})
-            res = merge_opportunity.merge(cr, uid, data.opportunity_ids, context=context)
+        # Expected: all newly-converted leads (active_ids) will be merged with the opportunity(ies)
+        # that have been selected in the 'opportunity_ids' m2m, with all these records
+        # merged into the first opportunity (and the rest deleted)
+        opportunity_ids = [o.id for o in opportunity_ids]
+        lead_ids = context.get('active_ids', [])
+        if action == 'merge' and lead_ids and opportunity_ids:
+            # Add the leads in the to-merge list, next to other opps
+            # (the fact that they're passed in context['lead_ids'] means that
+            # they cannot be selected to contain the result of the merge.
+            opportunity_ids.extend(lead_ids)
+            context.update({'lead_ids': lead_ids, "convert" : True})
+            res = self.pool.get('crm.lead').merge_opportunity(cr, uid, opportunity_ids, context=context)
         return res
 
     def action_apply(self, cr, uid, ids, context=None):
         """
-        This converts lead to opportunity and opens Opportunity view
+        Convert lead to opportunity or merge lead and opportunity and open
+        the freshly created opportunity view.
         """
-        if not context:
+        if context is None:
             context = {}
-
         lead = self.pool.get('crm.lead')
         lead_ids = context.get('active_ids', [])
         data = self.browse(cr, uid, ids, context=context)[0]
         self._convert_opportunity(cr, uid, ids, {'lead_ids': lead_ids}, context=context)
-        self._merge_opportunity(cr, uid, ids, data.opportunity_ids, data.action, context=context)
+        self._merge_opportunity(cr, uid, ids, data.opportunity_ids, data.name, context=context)
         return lead.redirect_opportunity_view(cr, uid, lead_ids[0], context=context)
 
-crm_lead2opportunity_partner()
 
 class crm_lead2opportunity_mass_convert(osv.osv_memory):
     _name = 'crm.lead2opportunity.partner.mass'
     _description = 'Mass Lead To Opportunity Partner'
     _inherit = 'crm.lead2opportunity.partner'
 
-
     _columns = {
-            'user_ids':  fields.many2many('res.users', string='Salesmans'),
+            'user_ids':  fields.many2many('res.users', string='Salesmen'),
             'section_id': fields.many2one('crm.case.section', 'Sales Team'),
-
     }
+
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(crm_lead2opportunity_mass_convert, self).default_get(cr, uid, fields, context)
+        if 'partner_id' in fields:
+            # avoid forcing the partner of the first lead as default
+            res['partner_id'] = False
+        if 'action' in fields:
+            res['action'] = 'create'
+        if 'name' in fields:
+            res['name'] = 'convert'
+        if 'opportunity_ids' in fields:
+            res['opportunity_ids'] = False
+        return res
+
     def _convert_opportunity(self, cr, uid, ids, vals, context=None):
+        """
+        When "massively" (more than one at a time) converting leads to
+        opportunities, check the salesteam_id and salesmen_ids and update
+        the values before calling super.
+        """
+        if context is None:
+            context = {}
         data = self.browse(cr, uid, ids, context=context)[0]
         salesteam_id = data.section_id and data.section_id.id or False
-        salesman = []
+        salesmen_ids = []
         if data.user_ids:
-            salesman = [x.id for x in data.user_ids]
-        vals.update({'user_ids': salesman, 'section_id': salesteam_id})
+            salesmen_ids = [x.id for x in data.user_ids]
+        vals.update({'user_ids': salesmen_ids, 'section_id': salesteam_id})
         return super(crm_lead2opportunity_mass_convert, self)._convert_opportunity(cr, uid, ids, vals, context=context)
 
     def mass_convert(self, cr, uid, ids, context=None):
-        value = self.default_get(cr, uid, ['partner_id', 'opportunity_ids'], context=context)
-        value['opportunity_ids'] = [(6, 0, value['opportunity_ids'])]
-        self.write(cr, uid, ids, value, context=context)
         return self.action_apply(cr, uid, ids, context=context)
-crm_lead2opportunity_mass_convert()
+
 # 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 8829749efa3..3390ad8f547 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_lead_to_opportunity_view.xml
@@ -7,22 +7,23 @@
             <field name="model">crm.lead2opportunity.partner</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <field name="action"/>
-                    <group attrs="{'invisible':[('action','!=','exist')]}">
-                        <field name="partner_id" attrs="{'required': [('action', '=', 'exist')]}"/>
+                    <group>
+                        <field name="name" class="oe_inline"/>
+                        <field name="opportunity_ids" attrs="{'invisible': [('name', '!=', 'merge')]}">
+                            <tree>
+                                <field name="name"/>
+                                <field name="partner_id"/>
+                                <field name="user_id"/>
+                                <field name="section_id"/>
+                            </tree>
+                        </field>
                     </group>
-                    <group string="Convert to Opportunity">
-                        <field name="name" colspan="4"/>
+                    <group attrs="{'invisible': [('name', '!=', 'convert')]}">
+                        <field name="action" class="oe_inline"/>
+                        <field name="partner_id"
+                            attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"
+                            class="oe_inline"/>
                     </group>
-                    <separator string="Select Opportunities" attrs="{'invisible': [('name', '=', 'convert')]}"/>
-                    <field name="opportunity_ids" attrs="{'invisible': [('name', '=', 'convert')]}">
-                        <tree>
-                            <field name="name"/>
-                            <field name="partner_id"/>
-                            <field name="user_id"/>
-                            <field name="section_id"/>
-                        </tree>
-                    </field>
                     <footer>
                         <button name="action_apply" string="Create Opportunity" type="object" class="oe_highlight"/>
                         or
@@ -37,19 +38,38 @@
             <field name="model">crm.lead2opportunity.partner.mass</field>
             <field name="arch" type="xml">
                 <form string="Convert to Opportunity" version="7.0">
-                    <field name="action"/>
-                    <field name="name" colspan="4"/>
-                    <group string="Assigned Opportunities to">
-                        <field name="section_id"/>
+                    <separator string="Conversion Options"/>
+                    <group>
+                        <field name="name" class="oe_inline"/>
                     </group>
-                    <separator string="Select Salesman"/>
-                    <field name="user_ids">
-                        <tree>
-                            <field name="name"/>
-                        </tree>
-                    </field>
+                    <group attrs="{'invisible': [('name', '!=', 'convert')]}">
+                        <field name="action" class="oe_inline"/>
+                        <field name="partner_id"
+                            attrs="{'required': [('action', '=', 'exist')], 'invisible':[('action','!=','exist')]}"
+                            class="oe_inline"/>
+                    </group>
+                    <group string="Select Opportunities" attrs="{'invisible': [('name', '!=', 'merge')]}">
+                        <field name="opportunity_ids" colspan="4" nolabel="1" attrs="{'invisible': [('name', '=', 'convert')]}">
+                            <tree>
+                                <field name="name" />
+                                <field name="partner_id" />
+                                <field name="user_id" />
+                                <field name="section_id" />
+                            </tree>
+                        </field>
+                    </group>
+
+                    <group string="Assign opportunities to" attrs="{'invisible': [('name', '=', '')]}">
+                        <field name="section_id" />
+                        <field name="user_ids" colspan="4">
+                            <tree>
+                                <field name="name" />
+                            </tree>
+                        </field>
+                    </group>
+
                     <footer>
-                        <button name="mass_convert" string="Convert into Opportunities" type="object" class="oe_highlight"/>
+                        <button name="mass_convert" string="Convert to Opportunities" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
@@ -58,7 +78,7 @@
         </record>
 
         <record id="action_crm_lead2opportunity_partner" model="ir.actions.act_window">
-            <field name="name">Create a Partner</field>
+            <field name="name">Convert to opportunity</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">crm.lead2opportunity.partner</field>
             <field name="view_type">form</field>
@@ -68,10 +88,11 @@
 
         <act_window id="action_crm_send_mass_convert"
             multi="True"
-            key2="client_action_multi" name="Convert opportunities"
+            key2="client_action_multi" name="Convert to opportunities"
             res_model="crm.lead2opportunity.partner.mass" src_model="crm.lead"
             view_mode="form" target="new" view_type="form"
             context="{'mass_convert' : True}"
             view_id="view_crm_lead2opportunity_partner_mass"/>
+
     </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 98f114b4088..c48990f5866 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -28,14 +28,14 @@ class crm_lead2partner(osv.osv_memory):
     _description = 'Lead to Partner'
 
     _columns = {
-        'action': fields.selection([('exist', 'Link to an existing partner'), \
-                                    ('create', 'Create a new partner')], \
+        'action': fields.selection([('exist', 'Link to an existing customer'), \
+                                    ('create', 'Create a new customer')], \
                                     'Action', required=True),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'partner_id': fields.many2one('res.partner', 'Customer'),
     }
     def view_init(self, cr, uid, fields, context=None):
         """
-        This function checks for precondition before wizard executes
+        Check for precondition before wizard executes.
         """
         if context is None:
             context = {}
@@ -50,39 +50,38 @@ class crm_lead2partner(osv.osv_memory):
     def _select_partner(self, cr, uid, context=None):
         if context is None:
             context = {}
-        lead = self.pool.get('crm.lead')
-        partner = self.pool.get('res.partner')
-        lead_ids = list(context and context.get('active_ids', []) or [])
-        if not len(lead_ids):
+        if not context.get('active_model') == 'crm.lead' or not context.get('active_id'):
             return False
-        this = lead.browse(cr, uid, lead_ids[0], context=context)
-        # Find partner address matches the email_from of the lead
-        res = lead.message_partner_by_email(cr, uid, this.email_from, context=context)
-        partner_id = res.get('partner_id', False)      
-        # Find partner name that matches the name of the lead
-        if not partner_id and this.partner_name:
+        partner = self.pool.get('res.partner')
+        lead = self.pool.get('crm.lead')
+        this = lead.browse(cr, uid, context.get('active_id'), context=context)
+        if this.partner_id:
+            return this.partner_id.id
+        partner_id = False
+        if this.email_from:
+            partner_ids = partner.search(cr, uid, [('email', '=', this.email_from)], context=context)
+            if partner_ids:
+                partner_id = partner_ids[0]
+        if not this.partner_id and this.partner_name:
             partner_ids = partner.search(cr, uid, [('name', '=', this.partner_name)], context=context)
-            if partner_ids and len(partner_ids):
-               partner_id = partner_ids[0]
+            if partner_ids:
+                partner_id = partner_ids[0]
         return partner_id
 
     def default_get(self, cr, uid, fields, context=None):
-        """
-        This function gets default values
-        """
-        res = super(crm_lead2partner, self).default_get(cr, uid, fields, context=context)        
+        res = super(crm_lead2partner, self).default_get(cr, uid, fields, context=context)
         partner_id = self._select_partner(cr, uid, context=context)
 
         if 'partner_id' in fields:
             res.update({'partner_id': partner_id})
         if 'action' in fields:
             res.update({'action': partner_id and 'exist' or 'create'})
-            
+
         return res
 
     def open_create_partner(self, cr, uid, ids, context=None):
         """
-        This function Opens form of create partner.
+        Open form of create partner.
         """
         view_obj = self.pool.get('ir.ui.view')
         view_id = view_obj.search(cr, uid, [('model', '=', self._name), \
@@ -99,23 +98,24 @@ class crm_lead2partner(osv.osv_memory):
 
     def _create_partner(self, cr, uid, ids, context=None):
         """
-        This function Creates partner based on action.
+        Create partner based on action.
         """
         if context is None:
             context = {}
         lead = self.pool.get('crm.lead')
-        lead_ids = context and context.get('active_ids') or []
+        lead_ids = context.get('active_ids', [])
         data = self.browse(cr, uid, ids, context=context)[0]
         partner_id = data.partner_id and data.partner_id.id or False
-        partner_ids = lead.convert_partner(cr, uid, lead_ids, data.action, partner_id, context=context)
-        return partner_ids[lead_ids[0]]
+        return lead.convert_partner(cr, uid, lead_ids, data.action, partner_id, context=context)
 
     def make_partner(self, cr, uid, ids, context=None):
         """
-        This function Makes partner based on action.
+        Make a partner based on action.
+        Only called from form view, so only meant to convert one lead at a time.
         """
-        partner_id = self._create_partner(cr, uid, ids, context=context)
-        return self.pool.get('res.partner').redirect_partner_form(cr, uid, partner_id, context=context)
+        lead_id = context and context.get('active_id') or False
+        partner_ids_map = self._create_partner(cr, uid, ids, context=context)
+        return self.pool.get('res.partner').redirect_partner_form(cr, uid, partner_ids_map.get(lead_id, False), context=context)
 
 crm_lead2partner()
 
diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 381bb9871ea..edfefb5e5bc 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -27,6 +27,8 @@ class crm_merge_opportunity(osv.osv_memory):
     _description = 'Merge two Opportunities'
 
     def action_merge(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         lead = self.pool.get('crm.lead')
         record = self.browse(cr, uid, ids[0], context=context)
         opportunities = record.opportunity_ids
@@ -38,7 +40,7 @@ class crm_merge_opportunity(osv.osv_memory):
         return lead.redirect_opportunity_view(cr, uid, merge_id, context=context)
 
     _columns = {
-        'opportunity_ids' : fields.many2many('crm.lead',  'merge_opportunity_rel', 'merge_id', 'opportunity_id', 'Opportunities', domain=[('type', '=', 'opportunity')]),
+        'opportunity_ids': fields.many2many('crm.lead', rel='merge_opportunity_rel', id1='merge_id', id2='opportunity_id', string='Leads/Opportunities'),
     }
 
     def default_get(self, cr, uid, fields, context=None):
diff --git a/addons/crm/wizard/crm_merge_opportunities_view.xml b/addons/crm/wizard/crm_merge_opportunities_view.xml
index 3a0b11c4255..4b035200737 100644
--- a/addons/crm/wizard/crm_merge_opportunities_view.xml
+++ b/addons/crm/wizard/crm_merge_opportunities_view.xml
@@ -3,13 +3,12 @@
     <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="arch" type="xml">
-                <form string="Merge Opportunities" version="7.0">
-                    <separator string="Select Opportunities"/>
+                <form string="Merge Leads/Opportunities" version="7.0">
+                    <separator string="Select Leads/Opportunities"/>
                     <field name="opportunity_ids">
                         <tree>
                             <field name="name"/>
@@ -19,7 +18,7 @@
                         </tree>
                     </field>
                     <footer>
-                        <button name="action_merge" type="object" string="_Merge" class="oe_highlight"/>
+                        <button name="action_merge" type="object" string="Merge" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
@@ -27,10 +26,9 @@
             </field>
         </record>
 
-        <!--  Merge Opportunities action -->
-
+        <!--  Merge leads/opportunities action -->
         <record model="ir.actions.act_window" id="merge_opportunity_act">
-            <field name="name">Merge Opportunities</field>
+            <field name="name">Merge leads/opportunities</field>
             <field name="res_model">crm.merge.opportunity</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
@@ -40,7 +38,7 @@
 
         <act_window id="action_merge_opportunities"
             multi="True"
-            key2="client_action_multi" name="Merge Opportunities"
+            key2="client_action_multi" name="Merge leads/opportunities"
             res_model="crm.merge.opportunity" src_model="crm.lead"
             view_mode="form" target="new" view_type="form"/>
 
diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
index a1e1f0f2914..aa8f4a2a036 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -32,7 +32,7 @@ class crm_partner2opportunity(osv.osv_memory):
         'name' : fields.char('Opportunity Name', size=64, required=True),
         'planned_revenue': fields.float('Expected Revenue', digits=(16,2)),
         'probability': fields.float('Success Probability', digits=(16,2)),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'partner_id': fields.many2one('res.partner', 'Customer'),
     }
 
     def action_cancel(self, cr, uid, ids, context=None):
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 765a22de0a6..7f0b5957071 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -23,23 +23,5 @@
           </field>
        </record>
 
-<!-- partner To Opportunity Action -->
-
-      <record model="ir.actions.act_window" id="action_view_crm_partner2opportunity">
-            <field name="name">Create Opportunity</field>
-            <field name="res_model">crm.partner2opportunity</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form,tree,kanban,calendar</field>
-            <field name="target">new</field>
-     </record>
-
-        <!-- partner To Opportunity wizard -->
-
-     <act_window id="crm_partner2opportunity"
-            key2="client_action_multi" name="Create Opportunity"
-            res_model="crm.partner2opportunity" src_model="res.partner"
-            view_id="view_crm_partner2opportunity"
-            view_mode="form" target="new" view_type="form"
-            groups="base.group_sale_salesman"/>
      </data>
 </openerp>
diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
index 8ec4846733c..4b2ec725759 100644
--- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml
@@ -9,11 +9,14 @@
             <field name="model">crm.phonecall2opportunity</field>
             <field name="arch" type="xml">
                 <form string="Convert To Opportunity " version="7.0">
-                    <group col="4">
+                    <group>
                         <field name="name"/>
                         <field name="partner_id" />
-                        <field name="planned_revenue"/>
-                        <field name="probability"/>
+                        <label for="planned_revenue"/>
+                        <div>
+                            <field name="planned_revenue" class="oe_inline"/> at 
+                            <field name="probability" class="oe_inline"/> %%
+                        </div>
                     </group>
                     <footer>
                         <button name="make_opportunity" type="object" string="_Convert" class="oe_highlight"/>
@@ -27,7 +30,7 @@
 <!-- Phonecall to Opportunity action -->
 
         <record model="ir.actions.act_window" id="phonecall2opportunity_act">
-            <field name="name">Convert To Opportunity</field>
+            <field name="name">Convert to opportunity</field>
             <field name="res_model">crm.phonecall2opportunity</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
diff --git a/addons/crm/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py
index 422af02f99d..715b7396c66 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner.py
+++ b/addons/crm/wizard/crm_phonecall_to_partner.py
@@ -57,12 +57,10 @@ class crm_phonecall2partner(osv.osv_memory):
         if context is None:
             context = {}
         phonecall = self.pool.get('crm.phonecall')
-
         data = self.browse(cr, uid, ids, context=context)[0]
         call_ids = context and context.get('active_ids') or []
         partner_id = data.partner_id and data.partner_id.id or False
-        partner_ids = phonecall.convert_partner(cr, uid, call_ids, data.action, partner_id, context=context)
-        return partner_ids[call_ids[0]]
+        return phonecall.convert_partner(cr, uid, call_ids, data.action, partner_id, context=context)
 
 crm_phonecall2partner()
 
diff --git a/addons/crm/wizard/crm_phonecall_to_phonecall.py b/addons/crm/wizard/crm_phonecall_to_phonecall.py
index d68591ab0b7..2cdfb0387e6 100644
--- a/addons/crm/wizard/crm_phonecall_to_phonecall.py
+++ b/addons/crm/wizard/crm_phonecall_to_phonecall.py
@@ -87,7 +87,7 @@ class crm_phonecall2phonecall(osv.osv_memory):
             if 'user_id' in fields:
                 res.update({'user_id': phonecall.user_id and phonecall.user_id.id or False})
             if 'date' in fields:
-                res.update({'date': phonecall.date})
+                res.update({'date': False})
             if 'section_id' in fields:
                 res.update({'section_id': phonecall.section_id and phonecall.section_id.id or False})
             if 'categ_id' in fields:
diff --git a/addons/crm_caldav/__init__.py b/addons/crm_caldav/__init__.py
deleted file mode 100644
index 3c2ccf7917c..00000000000
--- a/addons/crm_caldav/__init__.py
+++ /dev/null
@@ -1,30 +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 crm_caldav
-
-
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py
deleted file mode 100644
index 6e4c108e5dd..00000000000
--- a/addons/crm_caldav/__openerp__.py
+++ /dev/null
@@ -1,50 +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/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Meetings Synchronization',
-    'version': '1.1',
-    'category': 'Customer Relationship Management',
-    'description': """
-Caldav features in Meeting.
-===========================
-
-    * Share meeting with other calendar clients like sunbird
-""",
-    'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'depends': ['caldav', 'crm' ],
-    'init_xml': [
-                'crm_caldav_data.xml',
-                'crm_caldav_setup.xml',
-                ],
-
-    'update_xml': ['crm_caldav_view.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'auto_install': False,
-    'certificate' : '001088048737252670109',
-    'images': ['images/caldav_browse_step1.jpeg','images/caldav_browse_step2.jpeg'],
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_caldav/crm_caldav.py b/addons/crm_caldav/crm_caldav.py
deleted file mode 100644
index 8fe412860b6..00000000000
--- a/addons/crm_caldav/crm_caldav.py
+++ /dev/null
@@ -1,115 +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
-from base_calendar import base_calendar
-from openerp.addons.caldav import calendar
-from datetime import datetime
-import re
-
-class crm_meeting(osv.osv):
-    _inherit = 'crm.meeting'
-
-    def export_cal(self, cr, uid, ids, 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 CRM Meeting’s IDs
-            @param context: A standard dictionary for contextual values
-        """
-        if context is None: context = {}
-        ids = map(lambda x: base_calendar.base_calendar_id2real_id(x), ids)
-        event_data = self.read(cr, uid, ids, context=context)
-        event_obj = self.pool.get('basic.calendar.event')
-        context.update({'model': self._name})
-        ical = event_obj.export_cal(cr, uid, event_data, context=context)
-        return ical.serialize()
-
-    def import_cal(self, cr, uid, data, data_id=None, context=None):
-        """
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param data: Get Data of CRM Meetings
-            @param data_id: calendar's Id
-            @param context: A standard dictionary for contextual values
-        """
-        event_obj = self.pool.get('basic.calendar.event')
-        vals = event_obj.import_cal(cr, uid, data, context=context)
-        return self.check_import(cr, uid, vals, context=context)
-
-    def check_import(self, cr, uid, vals, 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 vals: Get Values
-            @param context: A standard dictionary for contextual values
-        """
-        if context is None:
-            context = {}
-        ids = []
-        model_obj = self.pool.get(context.get('model'))
-        recur_pool = {}
-        try:
-            for val in vals:
-                # Compute value of duration
-                if val.get('date_deadline', False) and 'duration' not in val:
-                    start = datetime.strptime(val['date'], '%Y-%m-%d %H:%M:%S')
-                    end = datetime.strptime(val['date_deadline'], '%Y-%m-%d %H:%M:%S')
-                    diff = end - start
-                    val['duration'] = (diff.seconds/float(86400) + diff.days) * 24
-                exists, r_id = calendar.uid2openobjectid(cr, val['id'], context.get('model'), \
-                                                                 val.get('recurrent_id'))
-                if val.has_key('create_date'):
-                    val.pop('create_date')
-                u_id = val.get('id', None)
-                val.pop('id')
-                if exists and r_id:
-                    val.update({'recurrent_uid': exists})
-                    model_obj.write(cr, uid, [r_id], val)
-                    ids.append(r_id)
-                elif exists:
-                    model_obj.write(cr, uid, [exists], val)
-                    ids.append(exists)
-                else:
-                    if u_id in recur_pool and val.get('recurrent_id'):
-                        val.update({'recurrent_uid': recur_pool[u_id]})
-                        revent_id = model_obj.create(cr, uid, val)
-                        ids.append(revent_id)
-                    else:
-                        __rege = re.compile(r'OpenObject-([\w|\.]+)_([0-9]+)@(\w+)$')
-                        wematch = __rege.match(u_id.encode('utf8'))
-                        if wematch:
-                            model, recur_id, dbname = wematch.groups()
-                            val.update({'recurrent_uid': recur_id})
-                        event_id = model_obj.create(cr, uid, val)
-                        recur_pool[u_id] = event_id
-                        ids.append(event_id)
-        except Exception:
-            raise
-        return ids
-    
-crm_meeting()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/crm_caldav/crm_caldav_data.xml b/addons/crm_caldav/crm_caldav_data.xml
deleted file mode 100644
index ac05344d7fe..00000000000
--- a/addons/crm_caldav/crm_caldav_data.xml
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data noupdate="1">
-
-<!--        Event Attribute mapping for Calendar-->
-
-        <record model="basic.calendar" id="caldav.basic_calendar1">
-            <field name="name">Meetings</field>
-            <field name="collection_id" ref="document.dir_calendars"></field>
-            <field name="type">vevent</field>
-        </record>
-
-        <record model="basic.calendar.lines" id="base_calendar.calendar_lines_event">
-            <field name="name">vevent</field>
-            <field name="calendar_id" ref="caldav.basic_calendar1" />
-            <field name="object_id" search="[('model','=','crm.meeting')]" />
-            <field name="domain">[('user_id','=', uid)]</field>
-        </record>
-
-        <record model="basic.calendar.lines" id="base_calendar.calendar_lines_alarm">
-            <field name="name">valarm</field>
-            <field name="calendar_id" ref="caldav.basic_calendar1" />
-            <field name="object_id" search="[('model','=','calendar.alarm')]" />
-        </record>
-
-        <record model="basic.calendar.lines" id="base_calendar.calendar_lines_attendee">
-            <field name="name">attendee</field>
-            <field name="calendar_id" ref="caldav.basic_calendar1" />
-            <field name="object_id" search="[('model','=','calendar.attendee')]" />
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_0">
-            <field name="name" ref="caldav.field_event_organizer"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','organizer'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_1">
-            <field name="name" ref="caldav.field_event_uid"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','id'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_2">
-            <field name="name" ref="caldav.field_event_recurrence-id"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','recurrent_id'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_3">
-            <field name="name" ref="caldav.field_event_vtimezone"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','vtimezone'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_4">
-            <field name="name" ref="caldav.field_event_attendee" />
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','crm.meeting')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_5">
-            <field name="name" ref="caldav.field_event_rrule"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','rrule'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_6">
-            <field name="name" ref="caldav.field_event_dtend"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','date_deadline'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_7">
-            <field name="name" ref="caldav.field_event_valarm"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','base_calendar_alarm_id'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_9">
-            <field name="name" ref="caldav.field_event_location"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','location'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_10">
-            <field name="name" ref="caldav.field_event_exrule"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','exrule'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_11">
-            <field name="name" ref="caldav.field_event_status"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','state'),('model_id.model','=','crm.meeting')]" />
-            <field name="mapping">{'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}</field>
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_12">
-            <field name="name" ref="caldav.field_event_exdate"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','exdate'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_13">
-            <field name="name" ref="caldav.field_event_dtstamp"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','write_date'),('model_id.model','=','crm.meeting')]" />
-            <field name="fn">datetime_utc</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_14">
-            <field name="name" ref="caldav.field_event_description"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_15">
-            <field name="name" ref="caldav.field_event_dtstart"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','date'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_16">
-            <field name="name" ref="caldav.field_event_class"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','class'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_18">
-            <field name="name" ref="caldav.field_event_created"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','create_date'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_19">
-            <field name="name" ref="caldav.field_event_url"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','base_calendar_url'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_event_20">
-            <field name="name" ref="caldav.field_event_summary"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_event" />
-            <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.event')]" />
-            <field name="fn">field</field>
-        </record>
-
-
-
-        <record model="basic.calendar.fields" id="map_alarm_1">
-            <field name="name" ref="caldav.field_alarm_attendee"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
-            <field name="field_id" search="[('name','=','attendee_ids'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_2">
-            <field name="name" ref="caldav.field_alarm_trigger_duration"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
-            <field name="field_id" search="[('name','=','trigger_duration'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_3">
-            <field name="name" ref="caldav.field_alarm_description"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
-            <field name="field_id" search="[('name','=','description'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_4">
-            <field name="name" ref="caldav.field_alarm_attach"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
-            <field name="field_id" search="[('name','=','attach'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_5">
-            <field name="name" ref="caldav.field_alarm_trigger_occurs"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
-            <field name="field_id" search="[('name','=','trigger_occurs'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_6">
-            <field name="name" ref="caldav.field_alarm_trigger_interval"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
-            <field name="field_id" search="[('name','=','trigger_interval'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_7">
-            <field name="name" ref="caldav.field_alarm_summary"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
-            <field name="field_id" search="[('name','=','name'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_8">
-            <field name="name" ref="caldav.field_alarm_duration"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
-            <field name="field_id" search="[('name','=','duration'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_9">
-            <field name="name" ref="caldav.field_alarm_repeat"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
-            <field name="field_id" search="[('name','=','repeat'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_10">
-            <field name="name" ref="caldav.field_alarm_action"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
-            <field name="field_id" search="[('name','=','action'),('model_id.model','=','calendar.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_alarm_11">
-            <field name="name" ref="caldav.field_alarm_trigger_related"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_alarm" />
-            <field name="field_id" search="[('name','=','trigger_related'),('model_id.model','=','res.alarm')]" />
-            <field name="fn">field</field>
-        </record>
-
-
-        <record model="basic.calendar.fields" id="map_attendee_1">
-            <field name="name" ref="caldav.field_attendee_cn"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
-            <field name="field_id" search="[('name','=','cn'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_2">
-            <field name="name" ref="caldav.field_attendee_sent-by"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
-            <field name="field_id" search="[('name','=','sent_by'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_3">
-            <field name="name" ref="caldav.field_attendee_language"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
-            <field name="field_id" search="[('name','=','language'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_4">
-            <field name="name" ref="caldav.field_attendee_delegated-from"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
-            <field name="field_id" search="[('name','=','delegated_from'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_5">
-            <field name="name" ref="caldav.field_attendee_member"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
-            <field name="field_id" search="[('name','=','member'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_6">
-            <field name="name" ref="caldav.field_attendee_cutype"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
-            <field name="field_id" search="[('name','=','cutype'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_7">
-            <field name="name" ref="caldav.field_attendee_role"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
-            <field name="field_id" search="[('name','=','role'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_8">
-            <field name="name" ref="caldav.field_attendee_partstat"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
-            <field name="field_id" search="[('name','=','state'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_9">
-            <field name="name" ref="caldav.field_attendee_delegated-to"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
-            <field name="field_id" search="[('name','=','delegated_to'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_10">
-            <field name="name" ref="caldav.field_attendee_dir"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
-            <field name="field_id" search="[('name','=','dir'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-        <record model="basic.calendar.fields" id="map_attendee_11">
-            <field name="name" ref="caldav.field_attendee_rsvp"/>
-            <field name="type_id" ref="base_calendar.calendar_lines_attendee" />
-            <field name="field_id" search="[('name','=','rsvp'),('model_id.model','=','calendar.attendee')]" />
-            <field name="fn">field</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/crm_caldav/crm_caldav_setup.xml b/addons/crm_caldav/crm_caldav_setup.xml
deleted file mode 100644
index 36f3c3fd78b..00000000000
--- a/addons/crm_caldav/crm_caldav_setup.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data noupdate="1">
-
-    <record id="basic_calendar_meetings0" model="basic.calendar">
-        <field eval="1" name="has_webcal"/>
-        <field name="description">Meetings per user</field>
-        <field name="calendar_color">#1E25FF</field>
-        <field model="document.directory" name="collection_id" ref="caldav.document_directory_c0"/>
-        <field name="type">vevent</field>
-        <field name="name">Meetings</field>
-    </record>
-
-    <record id="basic_calendar_lines_attendee0" model="basic.calendar.lines">
-        <field name="calendar_id" ref="basic_calendar_meetings0"/>
-        <field name="domain">[]</field>
-        <field name="name">attendee</field>
-        <field name="object_id" ref="base_calendar.model_calendar_attendee"/>
-    </record>
-
-    <record id="basic_calendar_lines_valarm0" model="basic.calendar.lines">
-        <field name="calendar_id" ref="basic_calendar_meetings0"/>
-        <field name="domain">[]</field>
-        <field name="name">valarm</field>
-        <field name="object_id" ref="base_calendar.model_calendar_alarm"/>
-    </record>
-
-    <record id="basic_calendar_lines_vevent0" model="basic.calendar.lines">
-        <field name="calendar_id" ref="basic_calendar_meetings0"/>
-        <field name="domain">[('user_id','=', dctx_user_id)]</field>
-        <field name="name">vevent</field>
-        <field name="object_id" ref="base_calendar.model_crm_meeting"/>
-    </record>
-
-
-    <record id="basic_calendar_fields_1" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_alarm_attendee"/>
-        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_alarm_attendee_ids"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_2" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_alarm_trigger_duration"/>
-        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_duration"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_3" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_alarm_description"/>
-        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_alarm_description"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_4" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_alarm_attach"/>
-        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_alarm_attach"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_5" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_alarm_trigger_occurs"/>
-        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_occurs"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_6" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_alarm_trigger_interval"/>
-        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_interval"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_7" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_alarm_summary"/>
-        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_alarm_name"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_8" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_alarm_duration"/>
-        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" ref="base_calendar.field_res_alarm_duration"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_9" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_alarm_repeat"/>
-        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" ref="base_calendar.field_res_alarm_repeat"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_10" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_alarm_action"/>
-        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_alarm_action"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_11" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_alarm_trigger_related"/>
-        <field name="type_id" ref="basic_calendar_lines_valarm0"/>
-        <field name="field_id" ref="base_calendar.field_res_alarm_trigger_related"/>
-        <field name="fn">field</field>
-    </record>
-
-    <record id="basic_calendar_fields_12" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_organizer"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_crm_meeting_organizer"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_13" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_uid"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_id"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_14" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_recurrence-id"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_recurrent_id"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_15" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_vtimezone"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_vtimezone"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_16" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_attendee"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_crm_meeting_attendee_ids"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_17" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_rrule"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_rrule"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_18" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_dtend"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_date_deadline"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_19" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_valarm"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_base_calendar_alarm_id"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_20" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_location"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_location"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_21" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_exrule"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_exrule"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_22" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_status"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_crm_meeting_state"/>
-        <field name="mapping">{'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'}</field>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_23" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_exdate"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_exdate"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_24" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_dtstamp"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_crm_meeting_write_date"/>
-        <field name="fn">datetime_utc</field>
-    </record>
-    <record id="basic_calendar_fields_25" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_description"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_description"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_26" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_dtstart"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_date"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_27" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_class"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_class"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_28" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_created"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_create_date"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_29" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_url"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_base_calendar_url"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_30" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_event_summary"/>
-        <field name="type_id" ref="basic_calendar_lines_vevent0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_event_name"/>
-        <field name="fn">field</field>
-    </record>
-
-    <record id="basic_calendar_fields_31" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_attendee_cn"/>
-        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_attendee_cn"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_32" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_attendee_sent-by"/>
-        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_attendee_sent_by"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_33" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_attendee_language"/>
-        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_attendee_language"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_34" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_attendee_delegated-from"/>
-        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_attendee_delegated_from"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_35" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_attendee_member"/>
-        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_attendee_member"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_36" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_attendee_cutype"/>
-        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_attendee_cutype"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_37" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_attendee_role"/>
-        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_attendee_role"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_38" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_attendee_partstat"/>
-        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_attendee_state"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_39" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_attendee_delegated-to"/>
-        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_attendee_delegated_to"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_40" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_attendee_dir"/>
-        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_attendee_dir"/>
-        <field name="fn">field</field>
-    </record>
-    <record id="basic_calendar_fields_41" model="basic.calendar.fields">
-        <field name="name" ref="caldav.field_attendee_rsvp"/>
-        <field name="type_id" ref="basic_calendar_lines_attendee0"/>
-        <field name="field_id" ref="base_calendar.field_calendar_attendee_rsvp"/>
-        <field name="fn">field</field>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml
deleted file mode 100644
index 5746a3af0aa..00000000000
--- a/addons/crm_caldav/crm_caldav_view.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record id="action_caldav_browse" model="ir.actions.act_window">
-            <field name="name">Synchronize Your Meetings</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">user.preference</field>
-            <field name="view_id" ref="caldav.host_prefernce_form"/>
-            <field name="context">{'cal_name' : 'Meetings'}</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <menuitem
-            name="Synchronize Your Meetings"
-            action="action_caldav_browse"
-            id="menu_caldav_browse"
-            icon="STOCK_EXECUTE"
-            parent="base.menu_import_crm" sequence="10"/>
-
-
-    </data>
-</openerp>
diff --git a/addons/crm_caldav/i18n/ar.po b/addons/crm_caldav/i18n/ar.po
deleted file mode 100644
index a6bb14b28d3..00000000000
--- a/addons/crm_caldav/i18n/ar.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-13 13:13+0000\n"
-"Last-Translator: walid sayed <mashyuser@hotmail.com>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "متصفح Caldav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "تحديث التزامن للأجندة"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "إجتماعات"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "تمديد الوحدة لإضافة ميزة كال داف في الاجتماع"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "تزامن هذا الجدول الزمنى"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    الميزات الجديدة في الاجتماع:\n"
-#~ "* شارك الاجتماع مع عملاء الجدول الزمني الأخرى مثل صن بيرد\n"
diff --git a/addons/crm_caldav/i18n/bg.po b/addons/crm_caldav/i18n/bg.po
deleted file mode 100644
index 49894f89d75..00000000000
--- a/addons/crm_caldav/i18n/bg.po
+++ /dev/null
@@ -1,45 +0,0 @@
-# Bulgarian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-02-27 09:36+0000\n"
-"Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
-"Language-Team: Bulgarian <bg@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Среща"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Синхронизирай този календар"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Нови функции в среща:\n"
-#~ "        * Споделяне на среща с други календари, като Sunbird\n"
diff --git a/addons/crm_caldav/i18n/ca.po b/addons/crm_caldav/i18n/ca.po
deleted file mode 100644
index c46fcb41093..00000000000
--- a/addons/crm_caldav/i18n/ca.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-03-26 19:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan <ca@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Exploració de CalDav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Reunió"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Mòdul estès per afegir característiques CalDav a les reunions"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Noves funcionalitats en Reunions:\n"
-#~ "        * Compartir reuniones amb altres clients de calendari com sunbird\n"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Sincronitza aquest calendari"
diff --git a/addons/crm_caldav/i18n/crm_caldav.pot b/addons/crm_caldav/i18n/crm_caldav.pot
deleted file mode 100644
index f6717f62869..00000000000
--- a/addons/crm_caldav/i18n/crm_caldav.pot
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* crm_caldav
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+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: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr ""
-
diff --git a/addons/crm_caldav/i18n/cs.po b/addons/crm_caldav/i18n/cs.po
deleted file mode 100644
index a5603ae9d5c..00000000000
--- a/addons/crm_caldav/i18n/cs.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Czech translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-06 07:00+0000\n"
-"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
-"Language-Team: Czech <cs@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Procházet Caldav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Synchronizovat tento kalendář"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Setkání"
diff --git a/addons/crm_caldav/i18n/da.po b/addons/crm_caldav/i18n/da.po
deleted file mode 100644
index c164c8c178d..00000000000
--- a/addons/crm_caldav/i18n/da.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Danish 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-11-08 21:45+0000\n"
-"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Møde"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Synkronisere denne kalender"
diff --git a/addons/crm_caldav/i18n/de.po b/addons/crm_caldav/i18n/de.po
deleted file mode 100644
index 966089441a8..00000000000
--- a/addons/crm_caldav/i18n/de.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# German 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-13 19:03+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Caldav durchsuchen"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Diesen Kalender synchronisieren"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Meeting"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Anwendungserweiterung CalDav für Terminsynchronisation"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Neue Funktionserweiterung für die Terminverwaltung:\n"
-#~ "    * Veröffentlichen Sie Terminkalender zwecks Zugriff durch andere "
-#~ "Kalenderanwendungen, wie z.B. Sunbird.\n"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Synchronisiere diesen Kalender"
diff --git a/addons/crm_caldav/i18n/el.po b/addons/crm_caldav/i18n/el.po
deleted file mode 100644
index 527288a5ce2..00000000000
--- a/addons/crm_caldav/i18n/el.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Greek 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-11-30 15:54+0000\n"
-"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Συνάντηση"
diff --git a/addons/crm_caldav/i18n/en_GB.po b/addons/crm_caldav/i18n/en_GB.po
deleted file mode 100644
index beb4de53e40..00000000000
--- a/addons/crm_caldav/i18n/en_GB.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-23 15:24+0000\n"
-"Last-Translator: mrx5682 <Unknown>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Caldav Browse"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Synchronize This Calendar"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Meeting"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Synchronise this calendar"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Extended Module to Add CalDav feature on Meeting"
diff --git a/addons/crm_caldav/i18n/es.po b/addons/crm_caldav/i18n/es.po
deleted file mode 100644
index 16145728eb6..00000000000
--- a/addons/crm_caldav/i18n/es.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-14 19:30+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Exploración de CalDav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Reunión"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Módulo extendido para agregar características CalDav a las reuniones"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Sincronizar este calendario"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Nuevas funcionalidades en Reuniones:\n"
-#~ "        * Compartir reuniones con otros clientes de calendario como sunbird\n"
diff --git a/addons/crm_caldav/i18n/es_CR.po b/addons/crm_caldav/i18n/es_CR.po
deleted file mode 100644
index c0063cc2d65..00000000000
--- a/addons/crm_caldav/i18n/es_CR.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-15 19:24+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"Language: es\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Exploración de CalDav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Sincronizar este calendario"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Reunión"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Módulo extendido para agregar características CalDav a las reuniones"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Sincronizar este calendario"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Nuevas funcionalidades en Reuniones:\n"
-#~ "        * Compartir reuniones con otros clientes de calendario como sunbird\n"
diff --git a/addons/crm_caldav/i18n/es_EC.po b/addons/crm_caldav/i18n/es_EC.po
deleted file mode 100644
index 7d8e39197fb..00000000000
--- a/addons/crm_caldav/i18n/es_EC.po
+++ /dev/null
@@ -1,45 +0,0 @@
-# Spanish (Ecuador) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-13 04:12+0000\n"
-"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
-"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Reunión"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Módulo extendido para agregar soporte para CAlDAv en Reuniones"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Nuevas funcionalidades en Reuniones:\n"
-#~ "        *  Compartir reuniones con otros calendarios como sunbird\n"
diff --git a/addons/crm_caldav/i18n/es_MX.po b/addons/crm_caldav/i18n/es_MX.po
deleted file mode 100644
index ba2ef1a1a44..00000000000
--- a/addons/crm_caldav/i18n/es_MX.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-14 19:30+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\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: 2011-09-05 05:55+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Exploración de CalDav"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Reunión"
-
-#. module: crm_caldav
-#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
-msgid "Extended Module to Add CalDav feature on Meeting"
-msgstr "Módulo extendido para agregar características CalDav a las reuniones"
-
-#. module: crm_caldav
-#: model:ir.module.module,description:crm_caldav.module_meta_information
-msgid ""
-"\n"
-"    New Features in Meeting:\n"
-"        *  Share meeting with other calendar clients like sunbird\n"
-msgstr ""
-"\n"
-"    Nuevas funcionalidades en Reuniones:\n"
-"        * Compartir reuniones con otros clientes de calendario como sunbird\n"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronyze this calendar"
-msgstr "Sincronizar este calendario"
diff --git a/addons/crm_caldav/i18n/es_PY.po b/addons/crm_caldav/i18n/es_PY.po
deleted file mode 100644
index 63ed40dac74..00000000000
--- a/addons/crm_caldav/i18n/es_PY.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-03-04 17:26+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Exploración de Caldav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Reunión"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Módulo extendido para agregar características CalDav a las reuniones"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Nuevas funcionalidades en Reunión:\n"
-#~ "        * Compartir reunión con otros clientes de calendario como sunbird\n"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Sincronizar este calendario"
diff --git a/addons/crm_caldav/i18n/es_VE.po b/addons/crm_caldav/i18n/es_VE.po
deleted file mode 100644
index ba2ef1a1a44..00000000000
--- a/addons/crm_caldav/i18n/es_VE.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-14 19:30+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\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: 2011-09-05 05:55+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Exploración de CalDav"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Reunión"
-
-#. module: crm_caldav
-#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
-msgid "Extended Module to Add CalDav feature on Meeting"
-msgstr "Módulo extendido para agregar características CalDav a las reuniones"
-
-#. module: crm_caldav
-#: model:ir.module.module,description:crm_caldav.module_meta_information
-msgid ""
-"\n"
-"    New Features in Meeting:\n"
-"        *  Share meeting with other calendar clients like sunbird\n"
-msgstr ""
-"\n"
-"    Nuevas funcionalidades en Reuniones:\n"
-"        * Compartir reuniones con otros clientes de calendario como sunbird\n"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronyze this calendar"
-msgstr "Sincronizar este calendario"
diff --git a/addons/crm_caldav/i18n/fi.po b/addons/crm_caldav/i18n/fi.po
deleted file mode 100644
index a845b515aea..00000000000
--- a/addons/crm_caldav/i18n/fi.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-18 12:26+0000\n"
-"Last-Translator: Pekka Pylvänäinen <Unknown>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Kokous"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Synkronoi tämä kalenteri"
diff --git a/addons/crm_caldav/i18n/fr.po b/addons/crm_caldav/i18n/fr.po
deleted file mode 100644
index 77e2e9b75f4..00000000000
--- a/addons/crm_caldav/i18n/fr.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-14 21:13+0000\n"
-"Last-Translator: Quentin THEURET <Unknown>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Naviguer dans CalDav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Synchroniser ce calendrier"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Rendez-vous"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Module étendu pour ajouter la fonctionnalité CalDav aux réunions"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Nouvelles fonctionnalités aux réunions :\n"
-#~ "        *  Partage de réunions avec d'autres clients de calendriers comme "
-#~ "sunbird\n"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Synchroniser ce calendrier"
diff --git a/addons/crm_caldav/i18n/gl.po b/addons/crm_caldav/i18n/gl.po
deleted file mode 100644
index 17555bfea0d..00000000000
--- a/addons/crm_caldav/i18n/gl.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-02-07 20:56+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Galician <gl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Ver Caldav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Reunión"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Sincronizar este calendario"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Módulo Extendido pra Engadir a función CalDav en Reunións"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Novas Funcións en Reunións:\n"
-#~ "        * Reunións compartidas con outros clientes de calendario como "
-#~ "sunbird\n"
diff --git a/addons/crm_caldav/i18n/gu.po b/addons/crm_caldav/i18n/gu.po
deleted file mode 100644
index 8252e46307a..00000000000
--- a/addons/crm_caldav/i18n/gu.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Gujarati translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-18 11:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "સભા"
diff --git a/addons/crm_caldav/i18n/hi.po b/addons/crm_caldav/i18n/hi.po
deleted file mode 100644
index 405147f28f8..00000000000
--- a/addons/crm_caldav/i18n/hi.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Hindi 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-21 11:34+0000\n"
-"Last-Translator: Sanjay Kumar <Unknown>\n"
-"Language-Team: Hindi <hi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "बैठक"
diff --git a/addons/crm_caldav/i18n/hr.po b/addons/crm_caldav/i18n/hr.po
deleted file mode 100644
index f3d6f4ecbf8..00000000000
--- a/addons/crm_caldav/i18n/hr.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-30 19:59+0000\n"
-"Last-Translator: Ivan Vađić <Unknown>\n"
-"Language-Team: Croatian <hr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Sinkroniziraj kalendar"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Sastanak"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Sinkroniziraj ovaj kalendar"
diff --git a/addons/crm_caldav/i18n/hu.po b/addons/crm_caldav/i18n/hu.po
deleted file mode 100644
index 28bbfc8eb0a..00000000000
--- a/addons/crm_caldav/i18n/hu.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Hungarian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-31 12:04+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: Hungarian <hu@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "CalDAV böngészése"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Találkozó"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Bővített Modul, CalDav funkciót biztosít a Találkozók szervezéséhez"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Szinkronizálás ezzel a naptárral"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Új lehetőségek a találkozókban:\n"
-#~ "        *  a találkozók megosztásának lehetősége más naptárkliensekkel, "
-#~ "például sunbird\n"
diff --git a/addons/crm_caldav/i18n/id.po b/addons/crm_caldav/i18n/id.po
deleted file mode 100644
index 6aa27436bf0..00000000000
--- a/addons/crm_caldav/i18n/id.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Indonesian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-02-07 18:22+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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Telusuran Caldav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Pertemuan"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Fitur Baru di Pertemuan:\n"
-#~ "        *Berbagi pertemuan dengan kalender klien yang lain seperti sunbird\n"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Module Tambahan untuk Menambah fitur CalDav pada Pertemuan"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Sinkronisasi kalender ini"
diff --git a/addons/crm_caldav/i18n/it.po b/addons/crm_caldav/i18n/it.po
deleted file mode 100644
index 6f90b9da135..00000000000
--- a/addons/crm_caldav/i18n/it.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Italian 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-17 07:00+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Sfoglia Caldav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Sincronizza questo calendario"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Riunione"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Modulo estenso per aggiungere caratteristiche CalDAV ai Meeting"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Nuove caratteristiche nei Meeting:\n"
-#~ "        * Condividi meeting con altri client di calendario, come sunbird\n"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Sincronizza questo calendario"
diff --git a/addons/crm_caldav/i18n/ja.po b/addons/crm_caldav/i18n/ja.po
deleted file mode 100644
index ea405a694cc..00000000000
--- a/addons/crm_caldav/i18n/ja.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-01 05:49+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Caldavブラウズ"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "このカレンダーを同期化する"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "ミーティング"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "ミーティングのCalDAV機能に追加する拡張モジュール"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    ミーティングの新機能：\n"
-#~ "　　　・ Sunbirdの様な他のカレンダークライアントとミーティングの共有\n"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "このカレンダーを同期"
diff --git a/addons/crm_caldav/i18n/ko.po b/addons/crm_caldav/i18n/ko.po
deleted file mode 100644
index aedc5dd4d2f..00000000000
--- a/addons/crm_caldav/i18n/ko.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-05-10 14:47+0000\n"
-"Last-Translator: Gang Sung-jin <potopro@gmail.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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "달력 창"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "모임"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "이 달력에 동기화"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    모임의 새로운 특징:\n"
-#~ "        * 다른 달력 클라이언트(sunbird와 같은)에 모임 공유\n"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "모임 특성을 확장 모듈 달력에 추가"
diff --git a/addons/crm_caldav/i18n/lo.po b/addons/crm_caldav/i18n/lo.po
deleted file mode 100644
index d4060839890..00000000000
--- a/addons/crm_caldav/i18n/lo.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Lao translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-19 15:52+0000\n"
-"Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
-"Language-Team: Lao <lo@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "ປະຊຸມ"
diff --git a/addons/crm_caldav/i18n/mn.po b/addons/crm_caldav/i18n/mn.po
deleted file mode 100644
index 0e657c0b45a..00000000000
--- a/addons/crm_caldav/i18n/mn.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Mongolian 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-03 18:57+0000\n"
-"Last-Translator: badralb <Unknown>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Caldav Тольдох"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Энэ цагалбартай ижилтгэх"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Уулзалт"
diff --git a/addons/crm_caldav/i18n/nl.po b/addons/crm_caldav/i18n/nl.po
deleted file mode 100644
index 29bd9d63c57..00000000000
--- a/addons/crm_caldav/i18n/nl.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-21 19:04+0000\n"
-"Last-Translator: Erwin <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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Caldav Browse"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Deze agenda synchroniseren"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Afspraak"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Uitgebreide module om CalDav functies toe te voegen bij agenda"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Nieuwe functies bij agenda:\n"
-#~ "        *  afspraken delen met andere agenda clients zoals sunbird\n"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Deze agenda synchroniseren"
diff --git a/addons/crm_caldav/i18n/nl_BE.po b/addons/crm_caldav/i18n/nl_BE.po
deleted file mode 100644
index 0222e3928af..00000000000
--- a/addons/crm_caldav/i18n/nl_BE.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Dutch (Belgium) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-03-01 17:20+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Bladeren Caldav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Afspraak"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Uitgebreide module om CalDav-functies toe te voegen aan afspraken"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Nieuwe functies voorafspraken:\n"
-#~ "        *  afspraken delen met andere kalendertoepassingen, zoals sunbird\n"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Deze agenda synchroniseren"
diff --git a/addons/crm_caldav/i18n/oc.po b/addons/crm_caldav/i18n/oc.po
deleted file mode 100644
index 1af2d6d2750..00000000000
--- a/addons/crm_caldav/i18n/oc.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Occitan (post 1500) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-11-20 09:20+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Occitan (post 1500) <oc@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Navigar dins CalDav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Rendètz-vos"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Modul espandit per apondre la foncionalitat CalDav a las acampadas"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Foncionalitats novèlas per las acampadas :\n"
-#~ "        *  Partiment d'acampadas amb d'autres clients de calendièrs coma "
-#~ "sunbird\n"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Sincronizar aqueste calendièr"
diff --git a/addons/crm_caldav/i18n/pl.po b/addons/crm_caldav/i18n/pl.po
deleted file mode 100644
index 6dc755ad999..00000000000
--- a/addons/crm_caldav/i18n/pl.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Polish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-03-28 14:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Synchronizuj ten kalendarz"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Zebranie"
diff --git a/addons/crm_caldav/i18n/pt.po b/addons/crm_caldav/i18n/pt.po
deleted file mode 100644
index 330fe090671..00000000000
--- a/addons/crm_caldav/i18n/pt.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-11-30 12:07+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Pesquisa Caldav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Sincronizar Este Calendário"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Reunião"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Módulo para adicionar CalDav ao módulo Reunião"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Nova funcionalidade no módulo Reunião:\n"
-#~ "        *  Partilhar as reuniões com outros programas de agenda como o "
-#~ "Sunbird\n"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Sincronizar calendário"
diff --git a/addons/crm_caldav/i18n/pt_BR.po b/addons/crm_caldav/i18n/pt_BR.po
deleted file mode 100644
index b94d3aa8d5c..00000000000
--- a/addons/crm_caldav/i18n/pt_BR.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-12 04:47+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Folhear Caldav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Sincronizar este calendário"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Reunião"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Módulo de extensão para adicionar funcionalidades nas Reuniões"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Novas Funcionalidades nas Reuniões:\n"
-#~ "        * Compartilhe reuniões com outros clientes de calendários como "
-#~ "sunbird\n"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Sincronizar este calendário"
diff --git a/addons/crm_caldav/i18n/ro.po b/addons/crm_caldav/i18n/ro.po
deleted file mode 100644
index 36ffb02ad44..00000000000
--- a/addons/crm_caldav/i18n/ro.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-18 17:45+0000\n"
-"Last-Translator: Mihai Satmarean <Unknown>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Rasfoire Caldav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Sincronizeaza Acest Calendar"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Intalnire"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Sincronizează acest calendar"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Modul extins pentru a Adauga caracteristica CalDAV în Intalnire"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Caracteristici noi în Întâlnire: * \n"
-#~ "imparte întâlnirea cu alţi clienţii calendar cum ar fi sunbird\n"
diff --git a/addons/crm_caldav/i18n/ru.po b/addons/crm_caldav/i18n/ru.po
deleted file mode 100644
index 449151570a2..00000000000
--- a/addons/crm_caldav/i18n/ru.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Russian 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-21 15:12+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Обзор Caldav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Встреча"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Расширенный модуль, добавляющий поддержку Caldav ко встречам"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Новые возможности модуля Встречи:\n"
-#~ "        *  Общий доступ с помощью других календарей (напр. Sunbird)\n"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Синхронизировать этот календарь"
diff --git a/addons/crm_caldav/i18n/sk.po b/addons/crm_caldav/i18n/sk.po
deleted file mode 100644
index 92cdd77148a..00000000000
--- a/addons/crm_caldav/i18n/sk.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Slovak translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-02-20 21:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Slovak <sk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Stretnutie"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Synchronizovať tento kalendár"
diff --git a/addons/crm_caldav/i18n/sl.po b/addons/crm_caldav/i18n/sl.po
deleted file mode 100644
index b3fac57ddff..00000000000
--- a/addons/crm_caldav/i18n/sl.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-11-26 22:54+0000\n"
-"Last-Translator: OpenERP Administrators <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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Prebrskaj Caldav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Sestanek"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Razširitveni modul za Dodajanje Caldav funkcije na Sestanki"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Sinhroniziraj ta koledar"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Nova funkcija v Sestanki\n"
-#~ "        Deli sestanke z drugimi klienti koledarjev kot je sunbird\n"
diff --git a/addons/crm_caldav/i18n/sq.po b/addons/crm_caldav/i18n/sq.po
deleted file mode 100644
index 07d8569ccdd..00000000000
--- a/addons/crm_caldav/i18n/sq.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Albanian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-03-28 15:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Albanian <sq@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr ""
diff --git a/addons/crm_caldav/i18n/sr.po b/addons/crm_caldav/i18n/sr.po
deleted file mode 100644
index affb990d727..00000000000
--- a/addons/crm_caldav/i18n/sr.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Serbian 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-11-14 08:06+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Serbian <sr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Sastanak"
diff --git a/addons/crm_caldav/i18n/sr@latin.po b/addons/crm_caldav/i18n/sr@latin.po
deleted file mode 100644
index 40d2ed220bf..00000000000
--- a/addons/crm_caldav/i18n/sr@latin.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Serbian 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-10-06 14:03+0000\n"
-"Last-Translator: Milan Milosevic <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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Pretraži CalDav"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Sastanak"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Produženi modul za dodavanje CalDav funkcije u sastancima"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Nove funkcije u sastancima\n"
-#~ "        *Podeli sastanke s drugim kalendarskim klijentima poput sunbird-a\n"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Sinhronisanje ovog kalendara"
diff --git a/addons/crm_caldav/i18n/sv.po b/addons/crm_caldav/i18n/sv.po
deleted file mode 100644
index 42b5a60bb24..00000000000
--- a/addons/crm_caldav/i18n/sv.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-11-24 09:31+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Kalenderbläddring"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Synkronisera denna kalender"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Möte"
diff --git a/addons/crm_caldav/i18n/ta.po b/addons/crm_caldav/i18n/ta.po
deleted file mode 100644
index 8f14c0d4f39..00000000000
--- a/addons/crm_caldav/i18n/ta.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Tamil translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-18 05:29+0000\n"
-"Last-Translator: சதீஷ் குமார் <Unknown>\n"
-"Language-Team: Tamil <ta@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr ""
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "சந்திப்பு"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    சந்திப்பின் புதிய வசதிகள்\n"
diff --git a/addons/crm_caldav/i18n/tr.po b/addons/crm_caldav/i18n/tr.po
deleted file mode 100644
index 9fcfdeedf4d..00000000000
--- a/addons/crm_caldav/i18n/tr.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-23 23:20+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Caldav Tarama"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Bu Takvimi Senkronize Et"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Toplantı"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "Bu takvimi eşzamanla"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "Toplantıya CalDav özelliği eklemek için Genişletilmiş Modül"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    Toplantı için Yeni Özellikler:\n"
-#~ "        *  Sunbird gibi diğer istemcilerle toplantı paylaşımı\n"
diff --git a/addons/crm_caldav/i18n/zh_CN.po b/addons/crm_caldav/i18n/zh_CN.po
deleted file mode 100644
index 197e56ba919..00000000000
--- a/addons/crm_caldav/i18n/zh_CN.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-10 06:58+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Caldav 浏览"
-
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "同步这个日程表"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "会议"
-
-#~ msgid ""
-#~ "\n"
-#~ "    New Features in Meeting:\n"
-#~ "        *  Share meeting with other calendar clients like sunbird\n"
-#~ msgstr ""
-#~ "\n"
-#~ "    会议的新功能\n"
-#~ "     *通过连接Mozilla Sunbird与使用日程表的客户共享会议\n"
-
-#~ msgid "Extended Module to Add CalDav feature on Meeting"
-#~ msgstr "扩展模块增加会议的Caldav功能"
-
-#~ msgid "Synchronyze this calendar"
-#~ msgstr "同步日程表"
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index 9e7848eb6c3..dfc549412d4 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -25,8 +25,10 @@
     'version': '1.0',
     'category': 'Customer Relationship Management',
     'description': """
-This modules allows you to track your customers/suppliers claims and grievances.
+
+Manage Customer Claims.
 ================================================================================
+This application allows you to track your customers/suppliers claims and grievances.
 
 It is fully integrated with the email gateway so that you can create
 automatically new claims based on incoming emails.
@@ -34,26 +36,20 @@ automatically new claims based on incoming emails.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['crm'],
-    'init_xml': [
-         'crm_claim_data.xml',
-    ],
-
-    'update_xml': [
+    'data': [
         'crm_claim_view.xml',
         'crm_claim_menu.xml',
         'security/ir.model.access.csv',
         'report/crm_claim_report_view.xml',
         'res_config_view.xml',
+        'crm_claim_data.xml',
     ],
-    'demo_xml': [
-        'crm_claim_demo.xml',
-    ],
+    'demo': ['crm_claim_demo.xml'],
     'test': ['test/process/claim.yml',
              'test/ui/claim_demo.yml'
-             ],
+    ],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00612027414703404749',
     'images': ['images/claim_categories.jpeg','images/claim_stages.jpeg','images/claims.jpeg'],
 }
 
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index ec6252bcdca..8308e5420d0 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -26,6 +26,7 @@ from osv import fields, osv
 import time
 import tools
 from tools.translate import _
+from tools import html2plaintext
 
 CRM_CLAIM_PENDING_STATES = (
     crm.AVAILABLE_STATES[2][0], # Cancelled
@@ -35,7 +36,7 @@ CRM_CLAIM_PENDING_STATES = (
 
 class crm_claim_stage(osv.osv):
     """ Model for claim stages. This models the main stages of a claim
-        management flow. Main CRM objects (leads, opportunities, project 
+        management flow. Main CRM objects (leads, opportunities, project
         issues, ...) will now use only stages, instead of state and stages.
         Stages are for example used to display the kanban view of records.
     """
@@ -49,7 +50,7 @@ class crm_claim_stage(osv.osv):
         'sequence': fields.integer('Sequence', help="Used to order stages. Lower is better."),
         'section_ids':fields.many2many('crm.case.section', 'section_claim_stage_rel', 'stage_id', 'section_id', string='Sections',
                         help="Link between stages and sales teams. When set, this limitate the current stage to the selected sales teams."),
-        'state': fields.selection(crm.AVAILABLE_STATES, 'State', required=True, help="The related state for the stage. The state of your document will automatically change regarding the selected stage. For example, if a stage is related to the state 'Close', when your document reaches this stage, it will be automatically have the 'closed' state."),
+        'state': fields.selection(crm.AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change regarding the selected stage. For example, if a stage is related to the status 'Close', when your document reaches this stage, it will be automatically have the 'closed' status."),
         'case_refused': fields.boolean('Refused stage',
                         help='Refused stages are specific stages for done.'),
         'case_default': fields.boolean('Common to All Teams',
@@ -72,7 +73,7 @@ class crm_claim(base_stage, osv.osv):
     _description = "Claim"
     _order = "priority,date desc"
     _inherit = ['mail.thread']
-    _mail_compose_message = True
+
     _columns = {
         'id': fields.integer('ID', readonly=True),
         'name': fields.char('Claim Subject', size=128, required=True),
@@ -95,23 +96,23 @@ class crm_claim(base_stage, osv.osv):
         'user_id': fields.many2one('res.users', 'Responsible'),
         'user_fault': fields.char('Trouble Responsible', size=64),
         '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"\
+                        select=True, help="Responsible sales team."\
+                                " Define Responsible user and Email account for"\
                                 " mail gateway."),
         'company_id': fields.many2one('res.company', 'Company'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
         '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."),
+        'email_from': fields.char('Email', size=128, help="Destination email for email gateway."),
         'partner_phone': fields.char('Phone', size=32),
         'stage_id': fields.many2one ('crm.claim.stage', 'Stage',
-                        domain="['|', ('section_ids', '=', section_id), ('case_default', '=', True)]"), 
+                        domain="['&',('fold', '=', False),'|', ('section_ids', '=', section_id), ('case_default', '=', True)]"),
         'cause': fields.text('Root Cause'),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=crm.AVAILABLE_STATES, string="State", readonly=True,
-                help='The state is set to \'Draft\', when a case is created.\
-                      If the case is in progress the state is set to \'Open\'.\
-                      When the case is over, the state is set to \'Done\'.\
-                      If the case needs to be reviewed then the state is \
+                selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
+                help='The status is set to \'Draft\', when a case is created.\
+                      If the case is in progress the status is set to \'Open\'.\
+                      When the case is over, the status is set to \'Done\'.\
+                      If the case needs to be reviewed then the status is \
                       set to \'Pending\'.'),
     }
 
@@ -123,7 +124,8 @@ class crm_claim(base_stage, osv.osv):
         'date': fields.datetime.now,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
-        'active': lambda *a: 1
+        'active': lambda *a: 1,
+        'stage_id':lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c)
     }
 
     def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
@@ -192,15 +194,15 @@ class crm_claim(base_stage, osv.osv):
             This override updates the document according to the email.
         """
         if custom_values is None: custom_values = {}
+        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
         custom_values.update({
             'name': msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': desc,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
         })
         if msg.get('priority'):
             custom_values['priority'] = msg.get('priority')
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context))
         return super(crm_claim,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
@@ -220,7 +222,7 @@ class crm_claim(base_stage, osv.osv):
             'revenue': 'planned_revenue',
             'probability':'probability'
         }
-        for line in msg['body_text'].split('\n'):
+        for line in msg['body'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
@@ -239,16 +241,16 @@ class crm_claim(base_stage, osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         msg = _('Claim has been <b>created</b>.')
-        return self.message_append_note(cr, uid, ids, body=msg, context=context)
+        return self.message_post(cr, uid, ids, body=msg, context=context)
 
     def case_refuse_send_note(self, cr, uid, ids, context=None):
         msg = _('Claim has been <b>refused</b>.')
-        return self.message_append_note(cr, uid, ids, body=msg, context=context)
+        return self.message_post(cr, uid, ids, body=msg, context=context)
 
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('crm.claim.stage').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
 
 
 class res_partner(osv.osv):
diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml
index 33bd280c364..ed0558f72e9 100644
--- a/addons/crm_claim/crm_claim_data.xml
+++ b/addons/crm_claim/crm_claim_data.xml
@@ -43,38 +43,32 @@
         -->
         
         <record model="crm.claim.stage" id="stage_claim1">
-            <field name="name">Draft claim</field>
+            <field name="name">New</field>
             <field name="state">draft</field>
             <field name="sequence">26</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim5">
-            <field name="name">Actions Defined</field>
+            <field name="name">In Progress</field>
             <field name="state">open</field>
             <field name="sequence">27</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim2">
-            <field name="name">Actions Done</field>
+            <field name="name">Settled</field>
             <field name="state">done</field>
             <field name="sequence">28</field>
             <field name="case_default" eval="True"/>
         </record>
         <record model="crm.claim.stage" id="stage_claim3">
-            <field name="name">Refused</field>
-            <field name="state">done</field>
+            <field name="name">Rejected</field>
+            <field name="state">cancel</field>
             <field name="sequence">29</field>
             <field name="case_default" eval="True"/>
             <field name="case_refused" eval="True"/>
             <field name="fold" eval="True"/>
         </record>
-        <record model="crm.claim.stage" id="stage_claim3">
-            <field name="name">Cancelled</field>
-            <field name="state">cancel</field>
-            <field name="sequence">30</field>
-            <field name="case_default" eval="True"/>
-            <field name="fold" eval="True"/>
-        </record>
+        
 
     </data>
 </openerp>
diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml
index 46f8760387a..4c0eca3d0f7 100644
--- a/addons/crm_claim/crm_claim_menu.xml
+++ b/addons/crm_claim/crm_claim_menu.xml
@@ -10,7 +10,7 @@
 
         <menuitem id="base.menu_aftersale" name="After-Sale Services"
             groups="base.group_sale_salesman"
-            parent="base.menu_main_pm" sequence="2" />
+            parent="base.menu_base_partner" sequence="2" />
 
         <!-- Claims Menu -->
         <record model="ir.actions.act_window" id="crm_case_categ_claim0">
@@ -50,9 +50,9 @@
             parent="base.menu_aftersale" action="crm_case_categ_claim0" sequence="1"/>
 
         <!-- Claim Stages -->
-        <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
-        <menuitem id="menu_claim_stage_view" name="Claim Stages" action="crm_claim_stage_act" parent="base.menu_project_config_project" sequence="20"/>
         <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
+        <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
+        <menuitem id="menu_claim_stage_view" name="Stages" action="crm_claim_stage_act" parent="menu_config_claim" sequence="20"/>
 
     </data>
 </openerp>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 820fb38e58a..85507a32c0f 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -102,37 +102,23 @@
             <field name="arch" type="xml">
                 <form string="Claim" version="7.0">
                 <header>
-                    <span groups="base.group_user">
-                        <button name="case_open" string="Open" type="object" class="oe_highlight"
-                                states="draft,pending" />
-                        <button name="case_close" string="Done" type="object" class="oe_highlight"
-                                states="open,pending"/>
-                        <button name="case_refuse" string="Refuse" type="object" class="oe_highlight"
-                                states="draft,open,pending"/>
-                        <button name="stage_previous" string="Previous Stage" type="object"
-                                states="open,pending" icon="gtk-go-back" attrs="{'invisible': [('stage_id','=', False)]}"/>
-                        <button name="stage_next" string="Next Stage" type="object"
-                                states="open,pending" icon="gtk-go-forward" attrs="{'invisible': [('stage_id','=', False)]}"/>
-                        <button name="case_reset" string="Reset to Draft" type="object" 
-                                states="cancel,done"/>
-                        <button name="case_cancel" string="Cancel" type="object" 
-                                states="draft,open,pending"/>
-                    </span>
-                    <field name="stage_id" widget="statusbar"
-                            on_change="onchange_stage_id(stage_id)"/>
+                    <button name="case_close" string="Settle" type="object" class="oe_highlight"
+                            states="draft,open,pending" groups="base.group_user"/>
+                    <button name="case_cancel" string="Reject" type="object"  groups="base.group_user"
+                            states="draft,open,pending"/>
+                    <field name="stage_id" widget="statusbar" clickable="True"/>
                 </header>
                 <sheet string="Claims">
                     <group>
                         <field name="name"/>
                         <field name="date"/>
                     </group>
-                    <group colspan="4" col="6">
+                    <group colspan="4" col="4">
                         <field name="user_id"/>
-                        <field name="section_id" widget="selection"/>
-                        <field name="state" groups="base.group_no_one"/>
-                        <newline/>
                         <field name="priority" groups="base.group_user"/>
+                        <field name="section_id"/>
                         <field name="date_deadline"/>
+                        <field name="state" groups="base.group_no_one"/>
                     </group>
                     <group colspan="4" col="4">
                         <notebook>
@@ -181,8 +167,8 @@
                     </group>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                 </div>
                 </form>
             </field>
@@ -241,7 +227,7 @@
                     <attribute name="invisible">False</attribute>
                 </xpath>
                 <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_claim" string="Claim">
+                    <group name="grp_claim" string="Claims">
                         <field name="claims_ids" colspan="4" nolabel="1">
                             <tree string="Partners Claim" editable="bottom">
                                 <field name="name"/>
diff --git a/addons/crm_claim/i18n/ar.po b/addons/crm_claim/i18n/ar.po
index 97b7f56b87f..3594ed01a4f 100644
--- a/addons/crm_claim/i18n/ar.po
+++ b/addons/crm_claim/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/bg.po b/addons/crm_claim/i18n/bg.po
index 832cc2ba63b..16c197d1207 100644
--- a/addons/crm_claim/i18n/bg.po
+++ b/addons/crm_claim/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/ca.po b/addons/crm_claim/i18n/ca.po
index b74fc3fc721..67dfa19c399 100644
--- a/addons/crm_claim/i18n/ca.po
+++ b/addons/crm_claim/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/da.po b/addons/crm_claim/i18n/da.po
index b93fa1a3ff9..609bb16579c 100644
--- a/addons/crm_claim/i18n/da.po
+++ b/addons/crm_claim/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/de.po b/addons/crm_claim/i18n/de.po
index b79e0fd8061..6d3603badd0 100644
--- a/addons/crm_claim/i18n/de.po
+++ b/addons/crm_claim/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/el.po b/addons/crm_claim/i18n/el.po
index b07f50d8e7a..e0a42c5d08c 100644
--- a/addons/crm_claim/i18n/el.po
+++ b/addons/crm_claim/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/es.po b/addons/crm_claim/i18n/es.po
index 5e306f7d161..7b23927e817 100644
--- a/addons/crm_claim/i18n/es.po
+++ b/addons/crm_claim/i18n/es.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-03-12 08:00+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/es_CR.po b/addons/crm_claim/i18n/es_CR.po
index c784f51048b..1080291e0b3 100644
--- a/addons/crm_claim/i18n/es_CR.po
+++ b/addons/crm_claim/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: crm_claim
diff --git a/addons/crm_claim/i18n/es_EC.po b/addons/crm_claim/i18n/es_EC.po
index 400a75b20a1..7d95fff571d 100644
--- a/addons/crm_claim/i18n/es_EC.po
+++ b/addons/crm_claim/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/es_PY.po b/addons/crm_claim/i18n/es_PY.po
index 7140144392f..74b93ad9ee5 100644
--- a/addons/crm_claim/i18n/es_PY.po
+++ b/addons/crm_claim/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/fi.po b/addons/crm_claim/i18n/fi.po
index e19300d1b28..cc084fba727 100644
--- a/addons/crm_claim/i18n/fi.po
+++ b/addons/crm_claim/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/fr.po b/addons/crm_claim/i18n/fr.po
index eddd44ad454..b2a51c1011f 100644
--- a/addons/crm_claim/i18n/fr.po
+++ b/addons/crm_claim/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/gl.po b/addons/crm_claim/i18n/gl.po
index 31833f5ad86..0907a914bce 100644
--- a/addons/crm_claim/i18n/gl.po
+++ b/addons/crm_claim/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/gu.po b/addons/crm_claim/i18n/gu.po
index 8dbb5056490..6953e509414 100644
--- a/addons/crm_claim/i18n/gu.po
+++ b/addons/crm_claim/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/hr.po b/addons/crm_claim/i18n/hr.po
index 988f7b26265..670af470ace 100644
--- a/addons/crm_claim/i18n/hr.po
+++ b/addons/crm_claim/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/hu.po b/addons/crm_claim/i18n/hu.po
index 3367a617a7d..2ba5d77213d 100644
--- a/addons/crm_claim/i18n/hu.po
+++ b/addons/crm_claim/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/it.po b/addons/crm_claim/i18n/it.po
index e774dce9e43..2093da86461 100644
--- a/addons/crm_claim/i18n/it.po
+++ b/addons/crm_claim/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/ja.po b/addons/crm_claim/i18n/ja.po
index a572d48d0de..9c4bcbcfbdd 100644
--- a/addons/crm_claim/i18n/ja.po
+++ b/addons/crm_claim/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/lt.po b/addons/crm_claim/i18n/lt.po
index 4439522a85b..7d2b164ad48 100644
--- a/addons/crm_claim/i18n/lt.po
+++ b/addons/crm_claim/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/mn.po b/addons/crm_claim/i18n/mn.po
index 452ce2b9610..43d5e9f8e99 100644
--- a/addons/crm_claim/i18n/mn.po
+++ b/addons/crm_claim/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/nl.po b/addons/crm_claim/i18n/nl.po
index a5bf3c37ae4..3ab619ba282 100644
--- a/addons/crm_claim/i18n/nl.po
+++ b/addons/crm_claim/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-01-22 14:40+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -327,7 +327,7 @@ msgstr "Maand-1"
 #: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
 msgid "Claims Analysis"
-msgstr "Klachten Analyse"
+msgstr "Klachten analyse"
 
 #. module: crm_claim
 #: help:crm.claim.report,delay_close:0
@@ -547,7 +547,7 @@ msgstr "Klachtcategoriën"
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 #: field:res.partner,claims_ids:0
 msgid "Claims"
-msgstr "Klachten"
+msgstr "Klachtenregistratie"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
diff --git a/addons/crm_claim/i18n/pl.po b/addons/crm_claim/i18n/pl.po
index f96169981b0..b040a301e25 100644
--- a/addons/crm_claim/i18n/pl.po
+++ b/addons/crm_claim/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -31,12 +31,12 @@ msgstr "Grupuj wg..."
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Responsibilities"
-msgstr ""
+msgstr "Odpowiedzialności"
 
 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Data następnej akcji"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -51,7 +51,7 @@ msgstr "Opóźnienie do zamknięcia"
 #. module: crm_claim
 #: field:crm.claim,resolution:0
 msgid "Resolution"
-msgstr ""
+msgstr "Rozwiązanie"
 
 #. module: crm_claim
 #: field:crm.claim,company_id:0
@@ -77,17 +77,19 @@ msgid ""
 "in the system. The stages define all the steps required for the resolution "
 "of a claim."
 msgstr ""
+"Możesz utworzyć etapy serwisów do kategoryzacji stanów wprowadzonych do "
+"systemu. Etapy definiują kroki prowadzące do wykonania serwisu."
 
 #. module: crm_claim
 #: code:addons/crm_claim/crm_claim.py:132
 #, python-format
 msgid "The claim '%s' has been opened."
-msgstr "Serwis '%s' został otwary."
+msgstr "Serwis '%s' został otwarty."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Data zamknięcia"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -98,7 +100,7 @@ msgstr "Dzień"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Dodaj wewnętrzną notatkę"
 
 #. module: crm_claim
 #: help:crm.claim,section_id:0
@@ -106,6 +108,8 @@ msgid ""
 "Sales team to which Case belongs to.Define Responsible user and Email "
 "account for mail gateway."
 msgstr ""
+"Zespół sprzedaży przypisany do Sprawy/Serwisu. Zdefiniuj użytkownika "
+"odpowiedzialnego i konto pocztowe dla poczty."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -136,7 +140,7 @@ msgstr "Działania prewencyjne"
 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
 msgid "Close Date"
-msgstr ""
+msgstr "Data zamknięcia"
 
 #. module: crm_claim
 #: field:crm.claim,ref:0
@@ -156,7 +160,7 @@ msgstr "Wszystkie serwisy w toku"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "# Mails"
-msgstr ""
+msgstr "# Wiadomości"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -188,7 +192,7 @@ msgstr "Miesiąc serwisu"
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Preventive Action"
-msgstr ""
+msgstr "Akcja prewencyjna"
 
 #. module: crm_claim
 #: field:crm.claim.report,section_id:0
@@ -198,12 +202,12 @@ msgstr "Sekcja"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Root Causes"
-msgstr ""
+msgstr "Przyczyny pierwotne"
 
 #. module: crm_claim
 #: field:crm.claim,user_fault:0
 msgid "Trouble Responsible"
-msgstr ""
+msgstr "Odpowiedzialny za problem"
 
 #. module: crm_claim
 #: field:crm.claim,priority:0
@@ -222,7 +226,7 @@ msgstr "Wyślij nową wiadomość"
 #: selection:crm.claim,state:0
 #: view:crm.claim.report:0
 msgid "New"
-msgstr ""
+msgstr "Nowy"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -249,7 +253,7 @@ msgstr "Następna akcja"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Moje zespoły sprzedaży"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
@@ -271,7 +275,7 @@ msgstr "Temat serwisu"
 msgid ""
 "Have a general overview of all claims processed in the system by sorting "
 "them with specific criteria."
-msgstr ""
+msgstr "Ogólny widok wykonanych serwisów  posortowanych wg kryteriów."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -314,7 +318,7 @@ msgstr "Kontakt"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Miesiąc-1"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
@@ -363,7 +367,7 @@ msgstr "Miesiąc"
 #: view:crm.claim.report:0
 #: field:crm.claim.report,type_action:0
 msgid "Action Type"
-msgstr ""
+msgstr "Typ akcji"
 
 #. module: crm_claim
 #: field:crm.claim,write_date:0
@@ -378,7 +382,7 @@ msgstr "Rok serwisu"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "Sprzedawca"
 
 #. module: crm_claim
 #: field:crm.claim,categ_id:0
@@ -395,7 +399,7 @@ msgstr "Reklamacje wartości"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Użytkownik odpowiedzialny"
 
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
@@ -404,6 +408,8 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Te adresy zostaną dodane do pola DW przy wysyłaniu i otrzymywaniu wiadomości "
+"dla tego rekordu. Przy wielu adresach oddzielaj je przecinkami."
 
 #. module: crm_claim
 #: selection:crm.claim.report,state:0
@@ -439,7 +445,7 @@ msgstr "Oczekujące"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Komunikacja i historia"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -455,7 +461,7 @@ msgstr "Zwykły"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Global CC"
-msgstr ""
+msgstr "Globalne DW"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -465,7 +471,7 @@ msgstr "Czerwiec"
 #. module: crm_claim
 #: view:res.partner:0
 msgid "Partners Claim"
-msgstr ""
+msgstr "Partnerzy serwisów"
 
 #. module: crm_claim
 #: field:crm.claim,partner_phone:0
@@ -480,7 +486,7 @@ msgstr "Użytkownik"
 #. module: crm_claim
 #: field:crm.claim,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktywne"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -490,12 +496,12 @@ msgstr "Listopad"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozszerzone filtry..."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Closure"
-msgstr ""
+msgstr "Zamknięcie"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -510,13 +516,13 @@ msgstr "Październik"
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Styczeń"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: field:crm.claim,date:0
 msgid "Claim Date"
-msgstr "Data reklamacji"
+msgstr "Data serwisu"
 
 #. module: crm_claim
 #: help:crm.claim,email_from:0
@@ -537,13 +543,13 @@ msgstr "Kategorie serwisu"
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 #: field:res.partner,claims_ids:0
 msgid "Claims"
-msgstr "Serwis"
+msgstr "Serwisy"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
 #: selection:crm.claim.report,type_action:0
 msgid "Corrective Action"
-msgstr ""
+msgstr "Czynności naprawcze"
 
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim3
@@ -589,7 +595,7 @@ msgstr "Wykonano"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Reporter"
-msgstr ""
+msgstr "Rzecznik serwisu"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -644,12 +650,12 @@ msgstr "Serwisy utworzone w bieżącym miesiącu"
 #. module: crm_claim
 #: field:crm.claim.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Przekroczony termin"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
 msgid "Root Cause"
-msgstr ""
+msgstr "Główna przyczyna"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -670,7 +676,7 @@ msgstr "Szukaj serwisu"
 #: field:crm.claim,section_id:0
 #: view:crm.claim.report:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Zespół sprzedaży"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -680,7 +686,7 @@ msgstr "Maj"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Resolution Actions"
-msgstr ""
+msgstr "Czynności serwisowe"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
@@ -690,16 +696,20 @@ msgid ""
 "history for a claim (emails sent, intervention type and so on). Claims may "
 "automatically be linked to an email address using the mail gateway module."
 msgstr ""
+"Rejestruje i zarządza zgłoszeniami serwisowymi (serwisami). Serwisy mogą być "
+"połączone z zamówieniami sprzedaży lub partiami. Możesz wysyłać maile z "
+"załącznikami i przeglądać historię serwisu (wysłane maile, typy czynności "
+"itp). Serwisy mogą być połączone z adresami do automatycznej poczty."
 
 #. module: crm_claim
 #: field:crm.claim.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "# wiadomości"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim2
 msgid "Actions Done"
-msgstr ""
+msgstr "Wykonane czynności"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -709,12 +719,12 @@ msgstr "Serwisy utworzone w ostatnim miesiącu"
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim5
 msgid "Actions Defined"
-msgstr ""
+msgstr "Zdefiniowane czynności"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Follow Up"
-msgstr ""
+msgstr "Postępowanie"
 
 #. module: crm_claim
 #: help:crm.claim,state:0
@@ -749,7 +759,7 @@ msgstr "Rok"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My company"
-msgstr ""
+msgstr "Moja firma"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -759,7 +769,7 @@ msgstr "Kwiecień"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "Moje sprawy"
 
 #. module: crm_claim
 #: field:crm.claim,id:0
@@ -769,12 +779,12 @@ msgstr ""
 #. module: crm_claim
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych obiektów."
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Actions"
-msgstr ""
+msgstr "Czynności"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -788,6 +798,8 @@ msgid ""
 "Create claim categories to better manage and classify your claims. Some "
 "example of claims can be: preventive action, corrective action."
 msgstr ""
+"Tworzy kategorie serwisów do ich klasyfikacji. Przykładami mogą być: "
+"czynności zapobiegające, czynności naprawcze."
 
 #. module: crm_claim
 #: field:crm.claim.report,create_date:0
diff --git a/addons/crm_claim/i18n/pt.po b/addons/crm_claim/i18n/pt.po
index 6dfc62445ed..ed557271096 100644
--- a/addons/crm_claim/i18n/pt.po
+++ b/addons/crm_claim/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/pt_BR.po b/addons/crm_claim/i18n/pt_BR.po
index 27258da73a8..b223c1aea4c 100644
--- a/addons/crm_claim/i18n/pt_BR.po
+++ b/addons/crm_claim/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -46,7 +46,7 @@ msgstr "Março"
 #. module: crm_claim
 #: field:crm.claim.report,delay_close:0
 msgid "Delay to close"
-msgstr "Espera para concluir"
+msgstr "Adiar o fechamento"
 
 #. module: crm_claim
 #: field:crm.claim,resolution:0
@@ -125,7 +125,7 @@ msgstr "Mensagens"
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim1
 msgid "Factual Claims"
-msgstr "Reclamações com Fatos"
+msgstr "Solicitações com Fatos"
 
 #. module: crm_claim
 #: selection:crm.claim,state:0
@@ -166,7 +166,7 @@ msgstr "# Emails"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reset to Draft"
-msgstr "Voltar para Rascunho"
+msgstr "Voltar para Provisório"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -259,7 +259,7 @@ msgstr "Minha Equipe de Vendas"
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
 msgid "Won't fix"
-msgstr "Não Corrigido"
+msgstr "Não corrigir"
 
 #. module: crm_claim
 #: field:crm.claim,create_date:0
@@ -269,7 +269,7 @@ msgstr "Data de Criação"
 #. module: crm_claim
 #: field:crm.claim,name:0
 msgid "Claim Subject"
-msgstr "Assunto da Reclamação"
+msgstr "Assunto da Solicitação"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
@@ -277,7 +277,7 @@ msgid ""
 "Have a general overview of all claims processed in the system by sorting "
 "them with specific criteria."
 msgstr ""
-"Tenha uma visão geral de todas as reclamações processadas no sistema "
+"Tenha uma visão geral de todas as solicitações processadas no sistema "
 "classificando-as com critérios específicos."
 
 #. module: crm_claim
@@ -288,7 +288,7 @@ msgstr "Julho"
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
 msgid "Claim Stages"
-msgstr "Estágios da Reclamação"
+msgstr "Estágios da Solicitação"
 
 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
@@ -327,7 +327,7 @@ msgstr "Mês-1"
 #: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
 msgid "Claims Analysis"
-msgstr "Análise de Reclamações"
+msgstr "Análise das Solicitações"
 
 #. module: crm_claim
 #: help:crm.claim.report,delay_close:0
@@ -337,12 +337,12 @@ msgstr "Número de Dias para concluir o caso"
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_report
 msgid "CRM Claim Report"
-msgstr "Relatório de Reclamação CRM"
+msgstr "Relatório de Solicitações no CRM"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim1
 msgid "Accepted as Claim"
-msgstr "Aceito como Reclamação"
+msgstr "Aceito como Solicitação"
 
 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim1
@@ -397,7 +397,7 @@ msgstr "Categoria"
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim2
 msgid "Value Claims"
-msgstr "Reclamações de valor"
+msgstr "Solicitações de Valor"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -526,7 +526,7 @@ msgstr "Janeiro"
 #: view:crm.claim:0
 #: field:crm.claim,date:0
 msgid "Claim Date"
-msgstr "Data da Reclamação"
+msgstr "Data da Solicitação"
 
 #. module: crm_claim
 #: help:crm.claim,email_from:0
@@ -536,7 +536,7 @@ msgstr "Essas pessoas receberão e-mail."
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
 msgid "Claim Categories"
-msgstr "Categorias de Reclamações"
+msgstr "Categorias de Solicitações"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -547,7 +547,7 @@ msgstr "Categorias de Reclamações"
 #: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
 #: field:res.partner,claims_ids:0
 msgid "Claims"
-msgstr "Reclamações"
+msgstr "Solicitações"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
@@ -558,7 +558,7 @@ msgstr "Ação Corretiva"
 #. module: crm_claim
 #: model:crm.case.categ,name:crm_claim.categ_claim3
 msgid "Policy Claims"
-msgstr "Política de Reclamações"
+msgstr "Política de Solicitações"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -569,7 +569,7 @@ msgstr "Histórico"
 #: model:ir.model,name:crm_claim.model_crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_config_claim
 msgid "Claim"
-msgstr "Reclamação"
+msgstr "Solicitação"
 
 #. module: crm_claim
 #: selection:crm.claim,priority:0
@@ -588,7 +588,7 @@ msgstr "Contato do Parceiro"
 #: view:crm.claim.report:0
 #: field:crm.claim.report,state:0
 msgid "State"
-msgstr "Estado"
+msgstr "Situação"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -599,7 +599,7 @@ msgstr "Concluído"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim Reporter"
-msgstr "Reclamante"
+msgstr "Solicitante"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -654,7 +654,7 @@ msgstr "Solicitações criadas este mês"
 #. module: crm_claim
 #: field:crm.claim.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr "Prazo Superado"
+msgstr "Prazo Ultrapassado"
 
 #. module: crm_claim
 #: field:crm.claim,cause:0
@@ -664,7 +664,7 @@ msgstr "Origem do Problema"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Claim/Action Description"
-msgstr "Descrição da Reclamação/Ação"
+msgstr "Descrição da Solicitação / Ação"
 
 #. module: crm_claim
 #: field:crm.claim,description:0
@@ -674,7 +674,7 @@ msgstr "Descrição"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Search Claims"
-msgstr "Pesquisar Reclamações"
+msgstr "Pesquisar Solicitações"
 
 #. module: crm_claim
 #: field:crm.claim,section_id:0
@@ -700,11 +700,12 @@ msgid ""
 "history for a claim (emails sent, intervention type and so on). Claims may "
 "automatically be linked to an email address using the mail gateway module."
 msgstr ""
-"Registrar e acompanhar as reclamações de seus clientes. As reclamações podem "
-"estar ligadas a um Pedido de Venda ou um lote. Você pode enviar e-mails com "
-"anexos e manter o histórico completo de um pedido (e-mails enviados, o tipo "
-"de intervenção e assim por diante). As reclamações podem ser automaticamente "
-"ligadas a um endereço de e-mail usando o módulo gateway de e-mails."
+"Registrar e acompanhar as solicitações de seus clientes. As solicitações "
+"podem estar ligadas a um Pedido de Venda ou um lote. Você pode enviar e-"
+"mails com anexos e manter o histórico completo de um pedido (e-mails "
+"enviados, o tipo de intervenção e assim por diante). As solicitações podem "
+"ser automaticamente ligadas a um endereço de e-mail usando o módulo gateway "
+"de e-mails."
 
 #. module: crm_claim
 #: field:crm.claim.report,email:0
@@ -742,13 +743,13 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
-"O estado é definido para 'Rascunho', quando um caso é criado.                "
-"                  \n"
-"Se o caso está em progresso o estado é definido para 'Aberto'.               "
+"O situação é definido para 'Provisório', quando um caso é criado.            "
+"                      \n"
+"Se o caso está em progresso a situação é definida como 'Aberto'.             "
+"                     \n"
+"Quando o caso termina, a situação é definida como 'Concluído'.               "
 "                   \n"
-"Quando o caso termina, o estado é definido como 'Concluído'.                 "
-"                 \n"
-"Se o caso precisa ser revisto então o estado é definido como 'Pendente'."
+"Se o caso precisa ser revisto então a situação é definida como 'Pendente'."
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -784,7 +785,7 @@ msgstr "ID"
 #. module: crm_claim
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursivamente a membros associados."
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -803,8 +804,8 @@ msgid ""
 "Create claim categories to better manage and classify your claims. Some "
 "example of claims can be: preventive action, corrective action."
 msgstr ""
-"Crie categorias de reclamações para melhor gerenciá-las e classificá-las. "
-"Alguns exemplos de reclamação: ações preventivas, ações corretivas"
+"Crie categorias de solicitações para melhor gerenciá-las e classificá-las. "
+"Alguns exemplos de solicitações: ações preventivas, ações corretivas"
 
 #. module: crm_claim
 #: field:crm.claim.report,create_date:0
diff --git a/addons/crm_claim/i18n/ro.po b/addons/crm_claim/i18n/ro.po
index b1d7fb2d185..a89061a6f02 100644
--- a/addons/crm_claim/i18n/ro.po
+++ b/addons/crm_claim/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/ru.po b/addons/crm_claim/i18n/ru.po
index 391cc28950c..3b0f1ed5ba7 100644
--- a/addons/crm_claim/i18n/ru.po
+++ b/addons/crm_claim/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-03-16 00:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-10-24 05:01+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -85,12 +85,12 @@ msgstr ""
 #: code:addons/crm_claim/crm_claim.py:132
 #, python-format
 msgid "The claim '%s' has been opened."
-msgstr ""
+msgstr "Претензия  '%s' была открыта"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Дата закрытия"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -151,12 +151,12 @@ msgstr "Ссылка"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Date of claim"
-msgstr ""
+msgstr "Дата претензии"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "All pending Claims"
-msgstr ""
+msgstr "Все ожидающие претензии"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -187,7 +187,7 @@ msgstr "Контрагент"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
-msgstr ""
+msgstr "Месяц претензии"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
@@ -227,7 +227,7 @@ msgstr "Отправить новое эл. письмо"
 #: selection:crm.claim,state:0
 #: view:crm.claim.report:0
 msgid "New"
-msgstr ""
+msgstr "Новый"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -254,7 +254,7 @@ msgstr "Следующее действие"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Мои отделы продаж"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim3
@@ -321,7 +321,7 @@ msgstr "Контакт"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Месяц-1"
 
 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
@@ -380,7 +380,7 @@ msgstr "Дата изменения"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Year of claim"
-msgstr ""
+msgstr "Год претензи"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -402,7 +402,7 @@ msgstr "Значение претензии"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Ответственный пользователь"
 
 #. module: crm_claim
 #: help:crm.claim,email_cc:0
@@ -474,7 +474,7 @@ msgstr "Июнь"
 #. module: crm_claim
 #: view:res.partner:0
 msgid "Partners Claim"
-msgstr ""
+msgstr "Претензии партнера"
 
 #. module: crm_claim
 #: field:crm.claim,partner_phone:0
@@ -489,7 +489,7 @@ msgstr "Пользователь"
 #. module: crm_claim
 #: field:crm.claim,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активен"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -621,13 +621,13 @@ msgstr "Открыть"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "New Claims"
-msgstr ""
+msgstr "Новые претензии"
 
 #. module: crm_claim
 #: view:crm.claim:0
 #: selection:crm.claim,state:0
 msgid "In Progress"
-msgstr "Выполняется"
+msgstr "В работе"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -638,17 +638,17 @@ msgstr "Ответственный"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Claims created in current year"
-msgstr ""
+msgstr "Претензии созданные в текущем году"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Unassigned Claims"
-msgstr ""
+msgstr "Не назначенные претензии"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Claims created in current month"
-msgstr ""
+msgstr "Претензии созданные в текущем месяце"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_expected:0
@@ -718,7 +718,7 @@ msgstr "Выполненные действия"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Claims created in last month"
-msgstr ""
+msgstr "Претензии созданные в прошлом месяце"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim5
@@ -760,7 +760,7 @@ msgstr "Год"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My company"
-msgstr ""
+msgstr "Моя компания"
 
 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@@ -780,7 +780,7 @@ msgstr "Идентификатор"
 #. module: crm_claim
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -810,7 +810,7 @@ msgstr "Дата создания"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "In Progress Claims"
-msgstr ""
+msgstr "Претензии \"В работе\""
 
 #~ msgid "Probability"
 #~ msgstr "Вероятность"
diff --git a/addons/crm_claim/i18n/sq.po b/addons/crm_claim/i18n/sq.po
index 8788b9e00c6..904ee0c7b07 100644
--- a/addons/crm_claim/i18n/sq.po
+++ b/addons/crm_claim/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/sr.po b/addons/crm_claim/i18n/sr.po
index 1a5f19eca38..fc88cb4b131 100644
--- a/addons/crm_claim/i18n/sr.po
+++ b/addons/crm_claim/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/sr@latin.po b/addons/crm_claim/i18n/sr@latin.po
index 513fd255f18..436efa0db26 100644
--- a/addons/crm_claim/i18n/sr@latin.po
+++ b/addons/crm_claim/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/sv.po b/addons/crm_claim/i18n/sv.po
index b4c009e1aaf..667a3308efb 100644
--- a/addons/crm_claim/i18n/sv.po
+++ b/addons/crm_claim/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/tr.po b/addons/crm_claim/i18n/tr.po
index 4394c08d43a..f683a378a71 100644
--- a/addons/crm_claim/i18n/tr.po
+++ b/addons/crm_claim/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@@ -85,7 +85,7 @@ msgstr ""
 #: code:addons/crm_claim/crm_claim.py:132
 #, python-format
 msgid "The claim '%s' has been opened."
-msgstr ""
+msgstr "Şikayet '%s' açılmıştır."
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -151,12 +151,12 @@ msgstr "Referans"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Date of claim"
-msgstr ""
+msgstr "Şikayet tarihi"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "All pending Claims"
-msgstr ""
+msgstr "Bütün bekleyen Şikayetler"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -187,7 +187,7 @@ msgstr "İş ortağı"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Month of claim"
-msgstr ""
+msgstr "Şikayeyin ayı"
 
 #. module: crm_claim
 #: selection:crm.claim,type_action:0
@@ -380,7 +380,7 @@ msgstr "Güncelleme Tarihi"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Year of claim"
-msgstr ""
+msgstr "Şikayetin yılı"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
@@ -474,7 +474,7 @@ msgstr "Haziran"
 #. module: crm_claim
 #: view:res.partner:0
 msgid "Partners Claim"
-msgstr ""
+msgstr "Paydaş Şikayeti"
 
 #. module: crm_claim
 #: field:crm.claim,partner_phone:0
@@ -621,7 +621,7 @@ msgstr "Aç"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "New Claims"
-msgstr ""
+msgstr "Yeni Şikayetler"
 
 #. module: crm_claim
 #: view:crm.claim:0
@@ -638,17 +638,17 @@ msgstr "Sorumlu"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Claims created in current year"
-msgstr ""
+msgstr "Geçerli yılda oluşturulan şikayetler"
 
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Unassigned Claims"
-msgstr ""
+msgstr "İşleme konmamış Şikayetler"
 
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Claims created in current month"
-msgstr ""
+msgstr "Geçerli ayda oluşturulan Şikayetler"
 
 #. module: crm_claim
 #: field:crm.claim.report,delay_expected:0
@@ -718,7 +718,7 @@ msgstr "Biten Eylemler"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Claims created in last month"
-msgstr ""
+msgstr "Geçen ayda oluşturulan Şikayetler"
 
 #. module: crm_claim
 #: model:crm.case.stage,name:crm_claim.stage_claim5
@@ -813,7 +813,7 @@ msgstr "Tarih Oluştur"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "In Progress Claims"
-msgstr ""
+msgstr "Çalışılmakta olan Şikayetler"
 
 #~ msgid "Probability"
 #~ msgstr "Olasılık"
diff --git a/addons/crm_claim/i18n/zh_CN.po b/addons/crm_claim/i18n/zh_CN.po
index cbba8625743..c63c315f419 100644
--- a/addons/crm_claim/i18n/zh_CN.po
+++ b/addons/crm_claim/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
diff --git a/addons/crm_claim/i18n/zh_TW.po b/addons/crm_claim/i18n/zh_TW.po
new file mode 100644
index 00000000000..bd391833b45
--- /dev/null
+++ b/addons/crm_claim/i18n/zh_TW.po
@@ -0,0 +1,799 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 03:01+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp. MIME-Version: 1.0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: crm_claim
+#: field:crm.claim.report,nbr:0
+msgid "# of Cases"
+msgstr "# 業務量"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Group By..."
+msgstr "分類方式..."
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsibilities"
+msgstr "責任人"
+
+#. module: crm_claim
+#: field:crm.claim,date_action_next:0
+msgid "Next Action Date"
+msgstr "下一動作日期"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_close:0
+msgid "Delay to close"
+msgstr "延遲關閉"
+
+#. module: crm_claim
+#: field:crm.claim,resolution:0
+msgid "Resolution"
+msgstr "解決方案"
+
+#. module: crm_claim
+#: field:crm.claim,company_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_claim
+#: field:crm.claim,email_cc:0
+msgid "Watchers Emails"
+msgstr "視察者的電子郵件"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "#Claim"
+msgstr "#索賠"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_stage_act
+msgid ""
+"You can create claim stages to categorize the status of every claim entered "
+"in the system. The stages define all the steps required for the resolution "
+"of a claim."
+msgstr "你能建立索賠階段的分類在系統輸入每個索賠的狀態度。階段定義索賠解決方案的所有需求的步驟。"
+
+#. module: crm_claim
+#: code:addons/crm_claim/crm_claim.py:132
+#, python-format
+msgid "The claim '%s' has been opened."
+msgstr "索賠'%s' 已被打開。"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Date Closed"
+msgstr "結束日期"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Add Internal Note"
+msgstr "加入內部備註"
+
+#. module: crm_claim
+#: help:crm.claim,section_id:0
+msgid ""
+"Sales team to which Case belongs to.Define Responsible user and Email "
+"account for mail gateway."
+msgstr "銷售團隊屬於的業務，定義負責人和郵件地址的郵件閘道。"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Description"
+msgstr "索陪說明"
+
+#. module: crm_claim
+#: field:crm.claim,message_ids:0
+msgid "Messages"
+msgstr "訊息"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim1
+msgid "Factual Claims"
+msgstr "實際索賠"
+
+#. module: crm_claim
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim2
+msgid "Preventive"
+msgstr "預防措施"
+
+#. module: crm_claim
+#: field:crm.claim.report,date_closed:0
+msgid "Close Date"
+msgstr "結束日期"
+
+#. module: crm_claim
+#: field:crm.claim,ref:0
+msgid "Reference"
+msgstr "關聯"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Date of claim"
+msgstr "索賠日期"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "All pending Claims"
+msgstr "所有未決索賠"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "# Mails"
+msgstr "#郵件"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reset to Draft"
+msgstr "重設為草稿"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date_deadline:0
+#: field:crm.claim.report,date_deadline:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,partner_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,partner_id:0
+#: model:ir.model,name:crm_claim.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Month of claim"
+msgstr "索賠月份"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Preventive Action"
+msgstr "預防措施的動作"
+
+#. module: crm_claim
+#: field:crm.claim.report,section_id:0
+msgid "Section"
+msgstr "劃分"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Root Causes"
+msgstr "根本原因"
+
+#. module: crm_claim
+#: field:crm.claim,user_fault:0
+msgid "Trouble Responsible"
+msgstr "問題責任"
+
+#. module: crm_claim
+#: field:crm.claim,priority:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,priority:0
+msgid "Priority"
+msgstr "優先級"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Send New Email"
+msgstr "發送新的電子郵件"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+msgid "New"
+msgstr "新建"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Type"
+msgstr "類型"
+
+#. module: crm_claim
+#: field:crm.claim,email_from:0
+msgid "Email"
+msgstr "電子郵件"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_claim
+#: field:crm.claim,action_next:0
+msgid "Next Action"
+msgstr "下一動作"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Sales Team(s)"
+msgstr "我的銷售團隊"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim3
+msgid "Won't fix"
+msgstr "不修正"
+
+#. module: crm_claim
+#: field:crm.claim,create_date:0
+msgid "Creation Date"
+msgstr "建立日期"
+
+#. module: crm_claim
+#: field:crm.claim,name:0
+msgid "Claim Subject"
+msgstr "索賠主題"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim
+msgid ""
+"Have a general overview of all claims processed in the system by sorting "
+"them with specific criteria."
+msgstr "為系統內所有的索賠處理指定一個排序標準"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_stage_act
+msgid "Claim Stages"
+msgstr "索賠階段"
+
+#. module: crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claim-act
+msgid "Categories"
+msgstr "分類"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,stage_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,stage_id:0
+msgid "Stage"
+msgstr "階段"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History Information"
+msgstr "日誌資訊"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Contact"
+msgstr "聯繫人"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Month-1"
+msgstr "上月"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.action_report_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_report_crm_claim_tree
+msgid "Claims Analysis"
+msgstr "索賠分析"
+
+#. module: crm_claim
+#: help:crm.claim.report,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "到期天數"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim_report
+msgid "CRM Claim Report"
+msgstr "客戶關係管理索賠報表"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim1
+msgid "Accepted as Claim"
+msgstr "作為索賠接受"
+
+#. module: crm_claim
+#: model:crm.case.resource.type,name:crm_claim.type_claim1
+msgid "Corrective"
+msgstr "糾正"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_claim
+#: field:crm.claim,type_action:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,type_action:0
+msgid "Action Type"
+msgstr "動作類型"
+
+#. module: crm_claim
+#: field:crm.claim,write_date:0
+msgid "Update Date"
+msgstr "更新日期"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Year of claim"
+msgstr "索賠年份"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Salesman"
+msgstr "業務員"
+
+#. module: crm_claim
+#: field:crm.claim,categ_id:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim2
+msgid "Value Claims"
+msgstr "索賠金額"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Responsible User"
+msgstr "負責使用者"
+
+#. module: crm_claim
+#: help:crm.claim,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "這些郵件地址將加入到之前發送記錄的發送和接收郵件的郵件副本欄位，分隔多個郵件地址有逗號。"
+
+#. module: crm_claim
+#: selection:crm.claim.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_claim
+#: field:crm.claim,date_closed:0
+#: selection:crm.claim,state:0
+#: selection:crm.claim.report,state:0
+msgid "Closed"
+msgstr "已結束"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Reply"
+msgstr "回覆"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Pending"
+msgstr "待處理"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Communication & History"
+msgstr "溝通&日誌"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Global CC"
+msgstr "完整副本"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_claim
+#: view:res.partner:0
+msgid "Partners Claim"
+msgstr "客戶抱怨"
+
+#. module: crm_claim
+#: field:crm.claim,partner_phone:0
+msgid "Phone"
+msgstr "電話"
+
+#. module: crm_claim
+#: field:crm.claim.report,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: crm_claim
+#: field:crm.claim,active:0
+msgid "Active"
+msgstr "啟用"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Extended Filters..."
+msgstr "增加篩選條件"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Closure"
+msgstr "關閉"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Search"
+msgstr "搜尋"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,date:0
+msgid "Claim Date"
+msgstr "索賠日期"
+
+#. module: crm_claim
+#: help:crm.claim,email_from:0
+msgid "These people will receive email."
+msgstr "這些人將收到電子郵件。"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
+msgid "Claim Categories"
+msgstr "索賠分類"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner
+#: model:ir.actions.act_window,name:crm_claim.act_claim_partner_address
+#: model:ir.actions.act_window,name:crm_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:crm_claim.menu_crm_case_claims
+#: field:res.partner,claims_ids:0
+msgid "Claims"
+msgstr "索賠"
+
+#. module: crm_claim
+#: selection:crm.claim,type_action:0
+#: selection:crm.claim.report,type_action:0
+msgid "Corrective Action"
+msgstr "糾正的動作"
+
+#. module: crm_claim
+#: model:crm.case.categ,name:crm_claim.categ_claim3
+msgid "Policy Claims"
+msgstr "索賠政策"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "History"
+msgstr "日誌"
+
+#. module: crm_claim
+#: model:ir.model,name:crm_claim.model_crm_claim
+#: model:ir.ui.menu,name:crm_claim.menu_config_claim
+msgid "Claim"
+msgstr "索賠"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_claim
+#: field:crm.claim,partner_address_id:0
+msgid "Partner Contact"
+msgstr "業務夥伴聯繫方式"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,state:0
+#: view:crm.claim.report:0
+#: field:crm.claim.report,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Done"
+msgstr "完成"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim Reporter"
+msgstr "索賠者"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Close"
+msgstr "結束"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: view:crm.claim.report:0
+#: selection:crm.claim.report,state:0
+msgid "Open"
+msgstr "開啟"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "New Claims"
+msgstr "新抱怨"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: selection:crm.claim,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: crm_claim
+#: view:crm.claim:0
+#: field:crm.claim,user_id:0
+msgid "Responsible"
+msgstr "負責人"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in current year"
+msgstr "本年新建的抱怨"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Unassigned Claims"
+msgstr "未分配的抱怨"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in current month"
+msgstr "本月新建的抱怨"
+
+#. module: crm_claim
+#: field:crm.claim.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超過截止日期"
+
+#. module: crm_claim
+#: field:crm.claim,cause:0
+msgid "Root Cause"
+msgstr "根本原因"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Claim/Action Description"
+msgstr "索賠/動作說明"
+
+#. module: crm_claim
+#: field:crm.claim,description:0
+msgid "Description"
+msgstr "說明"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Search Claims"
+msgstr "搜尋索賠"
+
+#. module: crm_claim
+#: field:crm.claim,section_id:0
+#: view:crm.claim.report:0
+msgid "Sales Team"
+msgstr "銷售團隊"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Resolution Actions"
+msgstr "決定採取的行動"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0
+msgid ""
+"Record and track your customers' claims. Claims may be linked to a sales "
+"order or a lot. You can send emails with attachments and keep the full "
+"history for a claim (emails sent, intervention type and so on). Claims may "
+"automatically be linked to an email address using the mail gateway module."
+msgstr ""
+"記錄和追蹤你客戶的索賠，索賠可以連結到一個或很多銷售訂單中。你可以發送帶附件的郵件和保留一個索賠的所有日誌（郵件發送，介入類型等）。索賠可以自動連結到電子"
+"郵件使用的閘道。"
+
+#. module: crm_claim
+#: field:crm.claim.report,email:0
+msgid "# Emails"
+msgstr "電子郵件"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim2
+msgid "Actions Done"
+msgstr "動作完成"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "Claims created in last month"
+msgstr "上個月新建的抱怨"
+
+#. module: crm_claim
+#: model:crm.case.stage,name:crm_claim.stage_claim5
+msgid "Actions Defined"
+msgstr "動作定義"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Follow Up"
+msgstr "跟進"
+
+#. module: crm_claim
+#: help:crm.claim,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"當一個業務建立時狀態設為'草稿'\n"
+"如果業務正在處理狀態設為'開啟'\n"
+"當業務結束狀態設為'完成'\n"
+"如果業務需要審查狀態設為'待處理'"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+#: field:crm.claim.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My company"
+msgstr "我的公司"
+
+#. module: crm_claim
+#: selection:crm.claim.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_claim
+#: view:crm.claim.report:0
+msgid "My Case(s)"
+msgstr "我的業務"
+
+#. module: crm_claim
+#: field:crm.claim,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_claim
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤，您不能建立循環引用的會員用戶"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "Actions"
+msgstr "動作"
+
+#. module: crm_claim
+#: selection:crm.claim,priority:0
+#: selection:crm.claim.report,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_claim
+#: model:ir.actions.act_window,help:crm_claim.crm_claim_categ_action
+msgid ""
+"Create claim categories to better manage and classify your claims. Some "
+"example of claims can be: preventive action, corrective action."
+msgstr "建立索賠的類型以更好管理和分類你的索賠。如：索賠可以是預防措施、糾正措施。"
+
+#. module: crm_claim
+#: field:crm.claim.report,create_date:0
+msgid "Create Date"
+msgstr "建立日期"
+
+#. module: crm_claim
+#: view:crm.claim:0
+msgid "In Progress Claims"
+msgstr "正在處理的抱怨"
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 5a3a3d92a09..a61490c6086 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -8,7 +8,7 @@
             <field name="name">crm.claim.report.tree</field>
             <field name="model">crm.claim.report</field>
             <field name="arch" type="xml">
-               <tree string="Claims">
+               <tree string="Claims" create="false">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="section_id" invisible="1"/>
diff --git a/addons/crm_claim/res_config.py b/addons/crm_claim/res_config.py
index cf260fcd163..92e474d6a46 100644
--- a/addons/crm_claim/res_config.py
+++ b/addons/crm_claim/res_config.py
@@ -26,7 +26,7 @@ class crm_claim_settings(osv.osv_memory):
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_claim': fields.boolean("create claims from incoming mails",
+        'fetchmail_claim': fields.boolean("Create claims from incoming mails",
             fetchmail_model='crm.claim', fetchmail_name='Incoming Claims',
             help="""Allows you to configure your incoming mail server, and create claims from incoming emails."""),
     }
diff --git a/addons/crm_claim/test/ui/claim_demo.yml b/addons/crm_claim/test/ui/claim_demo.yml
index ad8fdf3aa44..044e0482e93 100644
--- a/addons/crm_claim/test/ui/claim_demo.yml
+++ b/addons/crm_claim/test/ui/claim_demo.yml
@@ -9,7 +9,6 @@
 -
   !python {model: crm.claim}: |
     try:
-      self.message_update(cr, uid,[ref('crm_claim_4')], {'subject': 'Claim Update record','body_text': 'first training session completed',})
+      self.message_update(cr, uid,[ref('crm_claim_4')], {'subject': 'Claim Update record','body': 'first training session completed',})
     except:
       pass
-  
\ No newline at end of file
diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py
index 7e8b69bbc4c..2d8aff643bd 100644
--- a/addons/crm_helpdesk/__openerp__.py
+++ b/addons/crm_helpdesk/__openerp__.py
@@ -21,8 +21,8 @@
 
 
 {
-    'category': 'Customer Relationship Management', 
     'name': 'Helpdesk',
+    'category': 'Customer Relationship Management', 
     'version': '1.0',
     'description': """
 Helpdesk Management.
@@ -36,22 +36,17 @@ and categorize your interventions with a channel and a priority level.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['crm'],
-    'init_xml': [
-         'crm_helpdesk_data.xml',
-    ],
-    'update_xml': [
+    'data': [
         'crm_helpdesk_view.xml',
         'crm_helpdesk_menu.xml',
         'security/ir.model.access.csv',
         'report/crm_helpdesk_report_view.xml',
+        'crm_helpdesk_data.xml',
     ],
-    'demo_xml': [
-        'crm_helpdesk_demo.xml',
-    ],
+    'demo': ['crm_helpdesk_demo.xml'],
     'test': ['test/process/help-desk.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00830691522781519309',
     'images': ['images/helpdesk_analysis.jpeg','images/helpdesk_categories.jpeg','images/helpdesk_requests.jpeg'],
 }
 
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 4b0cb2e3ffa..276dd0b4b49 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -20,10 +20,12 @@
 ##############################################################################
 
 from base_status.base_state import base_state
+from base_status.base_stage import base_stage
 from crm import crm
 from osv import fields, osv
 import tools
 from tools.translate import _
+from tools import html2plaintext
 
 CRM_HELPDESK_STATES = (
     crm.AVAILABLE_STATES[2][0], # Cancelled
@@ -31,14 +33,14 @@ CRM_HELPDESK_STATES = (
     crm.AVAILABLE_STATES[4][0], # Pending
 )
 
-class crm_helpdesk(base_state, osv.osv):
+class crm_helpdesk(base_state, base_stage, osv.osv):
     """ Helpdesk Cases """
 
     _name = "crm.helpdesk"
     _description = "Helpdesk"
     _order = "id desc"
     _inherit = ['mail.thread']
-    _mail_compose_message = True
+
     _columns = {
             'id': fields.integer('ID', readonly=True),
             'name': fields.char('Name', size=128, required=True),
@@ -51,13 +53,12 @@ class crm_helpdesk(base_state, osv.osv):
             'date_deadline': fields.date('Deadline'),
             'user_id': fields.many2one('res.users', 'Responsible'),
             '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='Responsible sales team. Define Responsible user and Email account for mail gateway.'),
             'company_id': fields.many2one('res.company', 'Company'),
             'date_closed': fields.datetime('Closed', readonly=True),
             'partner_id': fields.many2one('res.partner', 'Partner'),
             '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."),
+            'email_from': fields.char('Email', size=128, help="Destination email for email gateway"),
             'date': fields.datetime('Date'),
             'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
             'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
@@ -68,13 +69,13 @@ class crm_helpdesk(base_state, osv.osv):
             'probability': fields.float('Probability (%)'),
             'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="['|',('section_id','=',False),('section_id','=',section_id),\
-                            ('object_id.model', '=', 'crm.helpdesk')]"), 
-            'duration': fields.float('Duration', states={'done': [('readonly', True)]}), 
-            'state': fields.selection(crm.AVAILABLE_STATES, 'Status', 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\'.'),
+                            ('object_id.model', '=', 'crm.helpdesk')]"),
+            'duration': fields.float('Duration', states={'done': [('readonly', True)]}),
+            'state': fields.selection(crm.AVAILABLE_STATES, 'Status', size=16, readonly=True,
+                                  help='The status is set to \'Draft\', when a case is created.\
+                                  \nIf the case is in progress the status is set to \'Open\'.\
+                                  \nWhen the case is over, the status is set to \'Done\'.\
+                                  \nIf the case needs to be reviewed then the status is set to \'Pending\'.'),
     }
 
     _defaults = {
@@ -103,14 +104,14 @@ class crm_helpdesk(base_state, osv.osv):
             This override updates the document according to the email.
         """
         if custom_values is None: custom_values = {}
+        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
         custom_values.update({
             'name': msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': desc,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
         })
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context))
         return super(crm_helpdesk,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
@@ -130,7 +131,7 @@ class crm_helpdesk(base_state, osv.osv):
             'revenue': 'planned_revenue',
             'probability':'probability'
         }
-        for line in msg['body_text'].split('\n'):
+        for line in msg['body'].split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower()):
@@ -139,9 +140,9 @@ class crm_helpdesk(base_state, osv.osv):
 
         return super(crm_helpdesk,self).message_update(cr, uid, ids, msg, update_vals=update_vals, context=context)
 
-    # ******************************
+    # ---------------------------------------------------
     # OpenChatter
-    # ******************************
+    # ---------------------------------------------------
 
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
         """ override of default base_state method. """
@@ -149,8 +150,7 @@ class crm_helpdesk(base_state, osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         msg = _('Case has been <b>created</b>.')
-        self.message_append_note(cr, uid, ids, body=msg, context=context)
+        self.message_post(cr, uid, ids, body=msg, context=context)
         return True
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml
index b70662e3339..58b522d0dee 100644
--- a/addons/crm_helpdesk/crm_helpdesk_menu.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml
@@ -3,11 +3,10 @@
     <data noupdate="1">
 
         <!-- Top menu item -->
-        <menuitem name="Project"
-            id="base.menu_main_pm"
-            sequence="90"/>
+        <menuitem name="Sales"
+            id="base.menu_base_partner"/>
 
-        <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_main_pm" />
+        <menuitem id="base.menu_aftersale" name="After-Sale Services" sequence="2" parent="base.menu_base_partner" />
 
         <!-- Help Desk (menu) -->
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 5399c9880ca..1640b9d0318 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -61,10 +61,6 @@
                                         on_change="onchange_partner_id(partner_id, email_from)"
                                         />
                                     <field name="email_from"/>
-                                    <button name="remind_partner"
-                                        states="open,pending"
-                                        string="Send Reminder" type="object"
-                                        icon="gtk-go-forward" />
                                 </group>
                                 <group string="Categorization">
                                     <field name="priority"/>
@@ -99,7 +95,7 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
+                    <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                     <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
                 </form>
diff --git a/addons/crm_helpdesk/i18n/ar.po b/addons/crm_helpdesk/i18n/ar.po
index cce0b0d46d4..dae97469074 100644
--- a/addons/crm_helpdesk/i18n/ar.po
+++ b/addons/crm_helpdesk/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/bg.po b/addons/crm_helpdesk/i18n/bg.po
index 544831ed558..5900b07bc8f 100644
--- a/addons/crm_helpdesk/i18n/bg.po
+++ b/addons/crm_helpdesk/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/ca.po b/addons/crm_helpdesk/i18n/ca.po
index 6c2d1c06e9e..949491579e7 100644
--- a/addons/crm_helpdesk/i18n/ca.po
+++ b/addons/crm_helpdesk/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/da.po b/addons/crm_helpdesk/i18n/da.po
index 9c870aeaac4..890175eec98 100644
--- a/addons/crm_helpdesk/i18n/da.po
+++ b/addons/crm_helpdesk/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/de.po b/addons/crm_helpdesk/i18n/de.po
index a6e0b77dd79..3a4440e64a8 100644
--- a/addons/crm_helpdesk/i18n/de.po
+++ b/addons/crm_helpdesk/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/el.po b/addons/crm_helpdesk/i18n/el.po
index 033cc19f789..89111d80b56 100644
--- a/addons/crm_helpdesk/i18n/el.po
+++ b/addons/crm_helpdesk/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/es.po b/addons/crm_helpdesk/i18n/es.po
index 2a98213087a..1d07f0c3f25 100644
--- a/addons/crm_helpdesk/i18n/es.po
+++ b/addons/crm_helpdesk/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/es_CR.po b/addons/crm_helpdesk/i18n/es_CR.po
index 384de5710a4..eb2c7f8ce06 100644
--- a/addons/crm_helpdesk/i18n/es_CR.po
+++ b/addons/crm_helpdesk/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: crm_helpdesk
diff --git a/addons/crm_helpdesk/i18n/es_PY.po b/addons/crm_helpdesk/i18n/es_PY.po
index fd0667f1745..5378feb0d03 100644
--- a/addons/crm_helpdesk/i18n/es_PY.po
+++ b/addons/crm_helpdesk/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/fi.po b/addons/crm_helpdesk/i18n/fi.po
index 3e53d2f34b8..28f664418e6 100644
--- a/addons/crm_helpdesk/i18n/fi.po
+++ b/addons/crm_helpdesk/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/fr.po b/addons/crm_helpdesk/i18n/fr.po
index 4d75db97a1a..243b4db3afb 100644
--- a/addons/crm_helpdesk/i18n/fr.po
+++ b/addons/crm_helpdesk/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -703,7 +703,7 @@ msgstr "Demandes de support d'aujourd'hui"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Request Date"
-msgstr ""
+msgstr "Date de la requête"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
diff --git a/addons/crm_helpdesk/i18n/gl.po b/addons/crm_helpdesk/i18n/gl.po
index cc556b289ac..b999068125f 100644
--- a/addons/crm_helpdesk/i18n/gl.po
+++ b/addons/crm_helpdesk/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/gu.po b/addons/crm_helpdesk/i18n/gu.po
index 3eac083c369..0f2d98583ab 100644
--- a/addons/crm_helpdesk/i18n/gu.po
+++ b/addons/crm_helpdesk/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/hr.po b/addons/crm_helpdesk/i18n/hr.po
index fd60b596455..2cac9d69969 100644
--- a/addons/crm_helpdesk/i18n/hr.po
+++ b/addons/crm_helpdesk/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/hu.po b/addons/crm_helpdesk/i18n/hu.po
index 332e9e77642..fd6604185fa 100644
--- a/addons/crm_helpdesk/i18n/hu.po
+++ b/addons/crm_helpdesk/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/it.po b/addons/crm_helpdesk/i18n/it.po
index bd32ba3fbdd..3b35524a9f3 100644
--- a/addons/crm_helpdesk/i18n/it.po
+++ b/addons/crm_helpdesk/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/ja.po b/addons/crm_helpdesk/i18n/ja.po
index 4981c426c5c..18d0a35320c 100644
--- a/addons/crm_helpdesk/i18n/ja.po
+++ b/addons/crm_helpdesk/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/lt.po b/addons/crm_helpdesk/i18n/lt.po
index 5d49ed06848..7b0f0986bc9 100644
--- a/addons/crm_helpdesk/i18n/lt.po
+++ b/addons/crm_helpdesk/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/lv.po b/addons/crm_helpdesk/i18n/lv.po
index 4f5a38c0683..4f59fb78c65 100644
--- a/addons/crm_helpdesk/i18n/lv.po
+++ b/addons/crm_helpdesk/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/mn.po b/addons/crm_helpdesk/i18n/mn.po
index 00c4d745f80..033c3163584 100644
--- a/addons/crm_helpdesk/i18n/mn.po
+++ b/addons/crm_helpdesk/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/nl.po b/addons/crm_helpdesk/i18n/nl.po
index 5bdd9dcf18d..b5b253d870b 100644
--- a/addons/crm_helpdesk/i18n/nl.po
+++ b/addons/crm_helpdesk/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-01-22 14:38+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -107,7 +107,7 @@ msgstr "Geannuleerd"
 #: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
 msgid "Helpdesk Analysis"
-msgstr "Helpdesk Analyse"
+msgstr "Helpdesk analyse"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -669,7 +669,7 @@ msgstr "Maand-1"
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
 msgid "Helpdesk and Support"
-msgstr "Helpdesk en ondersteuning"
+msgstr "Helpdesk"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
diff --git a/addons/crm_helpdesk/i18n/pl.po b/addons/crm_helpdesk/i18n/pl.po
index 5017b1591c5..fd2d55e0ad8 100644
--- a/addons/crm_helpdesk/i18n/pl.po
+++ b/addons/crm_helpdesk/i18n/pl.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Opóżnienie aby zamknąć"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,nbr:0
@@ -46,7 +46,7 @@ msgstr "Marzec"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Helpdesk requests occurred in current year"
-msgstr ""
+msgstr "Zdarzenie Helpdesk występujące w bieżącym roku"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,company_id:0
@@ -118,7 +118,7 @@ msgstr "Data zamknięcia"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,ref:0
 msgid "Reference"
-msgstr "Odniesienie"
+msgstr "Odnośnik"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_action_next:0
@@ -207,7 +207,7 @@ msgstr "# Wiadomości"
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Moje zespoły sprzedaży"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,create_date:0
@@ -225,7 +225,7 @@ msgstr "Przywróć do projektu"
 #: selection:crm.helpdesk,state:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Pending"
-msgstr "Oczekujące"
+msgstr "Oczekiwanie"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -252,7 +252,7 @@ msgstr "Kategorie"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "New Helpdesk Request"
-msgstr ""
+msgstr "Nowe zgłoszenie Helpdesku"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -267,13 +267,13 @@ msgstr "Daty"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Month of helpdesk requests"
-msgstr ""
+msgstr "Miesiąc zgłoszenia Helpesku"
 
 #. module: crm_helpdesk
 #: code:addons/crm_helpdesk/crm_helpdesk.py:101
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Bez tematu"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -283,12 +283,12 @@ msgstr ""
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "All pending Helpdesk Request"
-msgstr ""
+msgstr "Wszystkie oczekujące zgłoszenia Hekpdesku"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Year of helpdesk requests"
-msgstr ""
+msgstr "Rok zgłoszenia helpdesku"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -324,12 +324,12 @@ msgstr "Zaktualizuj datę"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Helpdesk requests occurred in current month"
-msgstr ""
+msgstr "Zgłoszenia Helpdesk z bieżącego miesiąca"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "Sprzedawca"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,ref2:0
@@ -345,7 +345,7 @@ msgstr "Kategoria"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Użytkownik odpowiedzialny"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -361,7 +361,7 @@ msgstr "Planowane koszty"
 #. module: crm_helpdesk
 #: help:crm.helpdesk,channel_id:0
 msgid "Communication channel."
-msgstr ""
+msgstr "Kanał komunikacji"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,email_cc:0
@@ -370,11 +370,13 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Te adresy zostaną dodane do pola DW przy wysyłaniu i otrzymywaniu wiadomości "
+"dla tego rekordu. Przy wielu adresach oddzielaj je przecinkami."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Search Helpdesk"
-msgstr ""
+msgstr "Szukaj zgłoszenia"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,state:0
@@ -408,7 +410,7 @@ msgstr "7 dni"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Communication & History"
-msgstr ""
+msgstr "Komunikacja i historia"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -424,7 +426,7 @@ msgstr "Zwykły"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Global CC"
-msgstr ""
+msgstr "Globalne DW"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -454,12 +456,12 @@ msgstr "Listopad"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozszerzone filtry..."
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
 msgid "Helpdesk Requests"
-msgstr ""
+msgstr "Zgłoszenia helpdesku"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -534,6 +536,8 @@ msgid ""
 "Sales team to which Case belongs to.                                 Define "
 "Responsible user and Email account for mail gateway."
 msgstr ""
+"Zespół sprzedaży, do kŧórego należy sprawa. Zdefiniuj użytkownika "
+"odpowiedzialnego i konto email do automatycznej poczty."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -553,14 +557,14 @@ msgstr "Anuluj"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Close"
-msgstr "Zamknij"
+msgstr "Zamknięte"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
 #: selection:crm.helpdesk.report,state:0
 msgid "Open"
-msgstr "Otwórz"
+msgstr "Otwarte"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -570,7 +574,7 @@ msgstr "Drzewo wsparcia helpdesku"
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "W toku"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -593,7 +597,7 @@ msgstr "Odpowiedzialny"
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Przekroczony termin"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,description:0
@@ -608,12 +612,12 @@ msgstr "Maj"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,probability:0
 msgid "Probability (%)"
-msgstr "Prawdopodobieństwo (%)"
+msgstr "Prawdop. (%)"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,email:0
 msgid "# Emails"
-msgstr ""
+msgstr "# wiadomości"
 
 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
@@ -655,12 +659,12 @@ msgstr "Nazwa"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Miesiąc-1"
 
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
 msgid "Helpdesk and Support"
-msgstr ""
+msgstr "Helpdesk i wsparcie"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -670,7 +674,7 @@ msgstr "Kwiecień"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "Moje sprawy"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -687,22 +691,22 @@ msgstr ""
 msgid ""
 "Create and manage helpdesk categories to better manage and classify your "
 "support requests."
-msgstr ""
+msgstr "Utwórz i zarządzaj kategoriami zgłoszeń do klasyfikacji zgłoszeń."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Todays's Helpdesk Requests"
-msgstr ""
+msgstr "Dzisiejsze zgłoszenia Helpdesku"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Request Date"
-msgstr ""
+msgstr "Data zgłoszenia"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Open Helpdesk Request"
-msgstr ""
+msgstr "Otwórz zgłoszenie helpdesku"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
@@ -715,7 +719,7 @@ msgstr "Wysoki"
 #: field:crm.helpdesk,section_id:0
 #: view:crm.helpdesk.report:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Zespół sprzedaży"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,date_action_last:0
diff --git a/addons/crm_helpdesk/i18n/pt.po b/addons/crm_helpdesk/i18n/pt.po
index 5f9f7dd86da..4c0ab2972b9 100644
--- a/addons/crm_helpdesk/i18n/pt.po
+++ b/addons/crm_helpdesk/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/pt_BR.po b/addons/crm_helpdesk/i18n/pt_BR.po
index 3d6c93af0e2..8cba801a55f 100644
--- a/addons/crm_helpdesk/i18n/pt_BR.po
+++ b/addons/crm_helpdesk/i18n/pt_BR.po
@@ -14,18 +14,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
 msgid "Delay to Close"
-msgstr "Espera para Fechar"
+msgstr "Adiar Fechamento"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,nbr:0
 msgid "# of Cases"
-msgstr "Nº de Casos"
+msgstr "# de Casos"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -46,7 +46,7 @@ msgstr "Março"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Helpdesk requests occurred in current year"
-msgstr "Chamados do helpdesk ocorridos no ano corrente"
+msgstr "Chamados do Helpdesk neste ano"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,company_id:0
@@ -156,7 +156,7 @@ msgstr "Seção"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Helpdesk requests occurred in last month"
-msgstr "Ocorrências de Helpdesk no último mês"
+msgstr "Chamadas no Helpdesk no último mês"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -166,7 +166,7 @@ msgstr "Enviar Novo Email"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk requests during last 7 days"
-msgstr "Requisições de Helpdesk durante os últimos 7 dias"
+msgstr "Chamadas no Helpdesk nos últimos 7 dias"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -201,13 +201,13 @@ msgstr "Mais Baixa"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "# Mails"
-msgstr "Nº de Emails"
+msgstr "# Emails"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
 msgid "My Sales Team(s)"
-msgstr "Meu Time de vVendas"
+msgstr "Minha Equipe de Vendas"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,create_date:0
@@ -218,7 +218,7 @@ msgstr "Data de Criação"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Reset to Draft"
-msgstr "Voltar para Rascunho"
+msgstr "Voltar para Provisório"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -252,7 +252,7 @@ msgstr "Categorias"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "New Helpdesk Request"
-msgstr "Nova Requisição de Helpesk"
+msgstr "Novo Chamado no Helpdesk"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -324,7 +324,7 @@ msgstr "Data de Atualização"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Helpdesk requests occurred in current month"
-msgstr "Chamados ocorridos no mês corrente"
+msgstr "Chamados ocorridos neste mês"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -334,7 +334,7 @@ msgstr "Representante"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,ref2:0
 msgid "Reference 2"
-msgstr "Referência 2"
+msgstr "2 Referência"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,categ_id:0
@@ -382,7 +382,7 @@ msgstr "Pesquisar Chamados"
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,state:0
 msgid "Draft"
-msgstr "Rascunho"
+msgstr "Provisório"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
@@ -519,7 +519,7 @@ msgstr "Diversos"
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,state:0
 msgid "State"
-msgstr "Estado"
+msgstr "Situação"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -537,13 +537,13 @@ msgid ""
 "Sales team to which Case belongs to.                                 Define "
 "Responsible user and Email account for mail gateway."
 msgstr ""
-"Equipe de Vendas ao qual o Case pertence. Definir usuário responsável e "
+"Equipe de Vendas ao qual o Caso pertence. Definir usuário responsável e "
 "conta de email para o serviço de email."
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Done"
-msgstr "Pronto"
+msgstr "Concluído"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -598,7 +598,7 @@ msgstr "Responsável"
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr "Prazo Superado"
+msgstr "Prazo Ultrapassado"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,description:0
@@ -642,13 +642,13 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
-"O estado é definido para 'Rascunho', quando um caso é criado.                "
-"                  \n"
-"Se o caso está em progresso o estado é definido para 'Aberto'.               "
+"O situação é definido para 'Provisório', quando um caso é criado.            "
+"                      \n"
+"Se o caso está em progresso a situação é definida como 'Aberto'.             "
+"                     \n"
+"Quando o caso termina, a situação é definida como 'Concluído'.               "
 "                   \n"
-"Quando o caso termina, o estado é definido como 'Concluído'.                 "
-"                 \n"
-"Se o caso precisa ser revisto então o estado é definido como 'Pendente'."
+"Se o caso precisa ser revisto então a situação é definida como 'Pendente'."
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@@ -707,7 +707,7 @@ msgstr "Chamados de hoje"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Request Date"
-msgstr "Data da Requisição"
+msgstr "Data de Solicitação:"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
diff --git a/addons/crm_helpdesk/i18n/ro.po b/addons/crm_helpdesk/i18n/ro.po
index 614f0682bcf..f5b9f2f7b74 100644
--- a/addons/crm_helpdesk/i18n/ro.po
+++ b/addons/crm_helpdesk/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/ru.po b/addons/crm_helpdesk/i18n/ru.po
index cd808932f61..0b438161a10 100644
--- a/addons/crm_helpdesk/i18n/ru.po
+++ b/addons/crm_helpdesk/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-20 08:54+0000\n"
+"PO-Revision-Date: 2012-10-24 05:08+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@@ -46,7 +46,7 @@ msgstr "Март"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Helpdesk requests occurred in current year"
-msgstr ""
+msgstr "Запросы на техподдержку в текущем году"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,company_id:0
@@ -80,7 +80,7 @@ msgstr "Добавить внутреннею заметку"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Date of helpdesk requests"
-msgstr ""
+msgstr "Дата запросов техподдержки"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -95,7 +95,7 @@ msgstr "Сообщения"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "My company"
-msgstr ""
+msgstr "Моя компания"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,state:0
@@ -156,7 +156,7 @@ msgstr "Раздел"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Helpdesk requests occurred in last month"
-msgstr ""
+msgstr "последний месяц"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -166,14 +166,14 @@ msgstr "Отправить новое эл. письмо"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Helpdesk requests during last 7 days"
-msgstr ""
+msgstr "Запросы на техподдержку за последние 7 дней"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 #: selection:crm.helpdesk,state:0
 #: view:crm.helpdesk.report:0
 msgid "New"
-msgstr ""
+msgstr "Новый"
 
 #. module: crm_helpdesk
 #: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
@@ -207,7 +207,7 @@ msgstr "# Писем"
 #: view:crm.helpdesk:0
 #: view:crm.helpdesk.report:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Мои отделы продаж"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk,create_date:0
@@ -252,7 +252,7 @@ msgstr "Категории"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "New Helpdesk Request"
-msgstr ""
+msgstr "Новый запрос техподдержки"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -267,13 +267,13 @@ msgstr "Даты"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Month of helpdesk requests"
-msgstr ""
+msgstr "Месяц запросов техподдержки"
 
 #. module: crm_helpdesk
 #: code:addons/crm_helpdesk/crm_helpdesk.py:101
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Без темы"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -283,12 +283,12 @@ msgstr "№ техподдержки"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "All pending Helpdesk Request"
-msgstr ""
+msgstr "Все ожидающие запросы техподдержки"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Year of helpdesk requests"
-msgstr ""
+msgstr "Год запросов техподдержки"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -324,7 +324,7 @@ msgstr "Дата изменения"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Helpdesk requests occurred in current month"
-msgstr ""
+msgstr "Запросы техподдержки в текущем месяце"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
@@ -345,7 +345,7 @@ msgstr "Категория"
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Ответственный пользователь"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -361,7 +361,7 @@ msgstr "Планируемые затраты"
 #. module: crm_helpdesk
 #: help:crm.helpdesk,channel_id:0
 msgid "Communication channel."
-msgstr ""
+msgstr "Канал общения"
 
 #. module: crm_helpdesk
 #: help:crm.helpdesk,email_cc:0
@@ -575,7 +575,7 @@ msgstr "Дерево поддержи"
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "В работе"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@@ -660,7 +660,7 @@ msgstr "Название"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Месяц-1"
 
 #. module: crm_helpdesk
 #: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
@@ -699,17 +699,17 @@ msgstr ""
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Todays's Helpdesk Requests"
-msgstr ""
+msgstr "Запросы техподдержки за сегодня"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Request Date"
-msgstr ""
+msgstr "Дата запроса"
 
 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
 msgid "Open Helpdesk Request"
-msgstr ""
+msgstr "Открыть запрос техподдержки"
 
 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
diff --git a/addons/crm_helpdesk/i18n/sl.po b/addons/crm_helpdesk/i18n/sl.po
index 53130554ac3..df8589939c6 100644
--- a/addons/crm_helpdesk/i18n/sl.po
+++ b/addons/crm_helpdesk/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/sq.po b/addons/crm_helpdesk/i18n/sq.po
index d8a8954fa78..7fe63d50846 100644
--- a/addons/crm_helpdesk/i18n/sq.po
+++ b/addons/crm_helpdesk/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/sr.po b/addons/crm_helpdesk/i18n/sr.po
index 1e095c24a22..15b6e252a94 100644
--- a/addons/crm_helpdesk/i18n/sr.po
+++ b/addons/crm_helpdesk/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/sr@latin.po b/addons/crm_helpdesk/i18n/sr@latin.po
index d2d7bacdc3d..5d4b3cae0dc 100644
--- a/addons/crm_helpdesk/i18n/sr@latin.po
+++ b/addons/crm_helpdesk/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/sv.po b/addons/crm_helpdesk/i18n/sv.po
index d3062161c51..3e0e825e9cc 100644
--- a/addons/crm_helpdesk/i18n/sv.po
+++ b/addons/crm_helpdesk/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/tr.po b/addons/crm_helpdesk/i18n/tr.po
index b8ffc9968e7..ff0b68e9ef0 100644
--- a/addons/crm_helpdesk/i18n/tr.po
+++ b/addons/crm_helpdesk/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/zh_CN.po b/addons/crm_helpdesk/i18n/zh_CN.po
index e0fe8565296..f1335d2bea6 100644
--- a/addons/crm_helpdesk/i18n/zh_CN.po
+++ b/addons/crm_helpdesk/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
diff --git a/addons/crm_helpdesk/i18n/zh_TW.po b/addons/crm_helpdesk/i18n/zh_TW.po
new file mode 100644
index 00000000000..c39efbb7ce4
--- /dev/null
+++ b/addons/crm_helpdesk/i18n/zh_TW.po
@@ -0,0 +1,744 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 10:12+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_close:0
+msgid "Delay to Close"
+msgstr "延遲關閉"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,nbr:0
+msgid "# of Cases"
+msgstr "# 業務量"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "Group By..."
+msgstr "分類方式..."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Today"
+msgstr "今日"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current year"
+msgstr "本年發生的服務需求"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,company_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_cc:0
+msgid "Watchers Emails"
+msgstr "視察者的電子郵件"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Add Internal Note"
+msgstr "加入內部備註"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Date of helpdesk requests"
+msgstr "客服需求日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Notes"
+msgstr "備註"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,message_ids:0
+msgid "Messages"
+msgstr "訊息"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My company"
+msgstr "我的公司"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_report_crm_helpdesks_tree
+msgid "Helpdesk Analysis"
+msgstr "客服分析"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,date_closed:0
+msgid "Close Date"
+msgstr "結束日期"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref:0
+msgid "Reference"
+msgstr "關聯"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_next:0
+msgid "Next Action"
+msgstr "下一動作"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Supports"
+msgstr "客服協助"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Extra Info"
+msgstr "額外資訊"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,partner_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,partner_id:0
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Estimates"
+msgstr "估計"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,section_id:0
+msgid "Section"
+msgstr "劃分"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in last month"
+msgstr "上個月發生的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send New Email"
+msgstr "發送新的電子郵件"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk requests during last 7 days"
+msgstr "之前7天內的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+msgid "New"
+msgstr "新建"
+
+#. module: crm_helpdesk
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk_report
+msgid "Helpdesk report after Sales Services"
+msgstr "客服售後服務報表"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,email_from:0
+msgid "Email"
+msgstr "電子郵件"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,channel_id:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,channel_id:0
+msgid "Channel"
+msgstr "管道"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "# Mails"
+msgstr "郵件"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+msgid "My Sales Team(s)"
+msgstr "我的銷售團隊"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,create_date:0
+#: field:crm.helpdesk.report,create_date:0
+msgid "Creation Date"
+msgstr "建立日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reset to Draft"
+msgstr "重設為草稿"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: selection:crm.helpdesk,state:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Pending"
+msgstr "待處理"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date_deadline:0
+#: field:crm.helpdesk.report,date_deadline:0
+msgid "Deadline"
+msgstr "截止日期"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_helpdesk_categ_action
+msgid "Helpdesk Categories"
+msgstr "客服分類"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_crm_case_helpdesk-act
+msgid "Categories"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "New Helpdesk Request"
+msgstr "新的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History Information"
+msgstr "日誌資訊"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Dates"
+msgstr "日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month of helpdesk requests"
+msgstr "客服需求月份"
+
+#. module: crm_helpdesk
+#: code:addons/crm_helpdesk/crm_helpdesk.py:101
+#, python-format
+msgid "No Subject"
+msgstr "無主題"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "#Helpdesk"
+msgstr "客服"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "All pending Helpdesk Request"
+msgstr "所有暫停的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Year of helpdesk requests"
+msgstr "服務需求的年份"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "References"
+msgstr "關聯"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication"
+msgstr "溝通"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,month:0
+msgid "Month"
+msgstr "月份"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,write_date:0
+msgid "Update Date"
+msgstr "更新日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Helpdesk requests occurred in current month"
+msgstr "當月發生的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Salesman"
+msgstr "業務員"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,ref2:0
+msgid "Reference 2"
+msgstr "關聯2"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,categ_id:0
+#: field:crm.helpdesk.report,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Responsible User"
+msgstr "負責使用者"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support"
+msgstr "客服協助"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_cost:0
+#: field:crm.helpdesk.report,planned_cost:0
+msgid "Planned Costs"
+msgstr "計劃成本"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,channel_id:0
+msgid "Communication channel."
+msgstr "通訊管道"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr "這些郵件地址將加入到之前發送記錄的發送和接收郵件的郵件副本欄位，分隔多個郵件地址有逗號。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Search Helpdesk"
+msgstr "搜索客服"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_closed:0
+#: selection:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Closed"
+msgstr "已結束"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Reply"
+msgstr "回覆"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "7 Days"
+msgstr "7天"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Communication & History"
+msgstr "溝通&日誌"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Global CC"
+msgstr "完整副本"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "計劃收入"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Extended Filters..."
+msgstr "增加篩選條件"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,name:crm_helpdesk.crm_case_helpdesk_act111
+msgid "Helpdesk Requests"
+msgstr "客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Search"
+msgstr "搜索"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,email_from:0
+msgid "These people will receive email."
+msgstr "這些人將收到電子郵件。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "History"
+msgstr "日誌"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,priority:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,priority:0
+msgid "Priority"
+msgstr "優先級"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,partner_address_id:0
+msgid "Partner Contact"
+msgstr "業務夥伴聯絡人"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Misc"
+msgstr "雜項"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,state:0
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "General"
+msgstr "一般"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Send Reminder"
+msgstr "傳送提醒"
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,section_id:0
+msgid ""
+"Sales team to which Case belongs to.                                 Define "
+"Responsible user and Email account for mail gateway."
+msgstr "屬於此種情況下，銷售團隊。定義負責用戶和電子郵件帳戶的郵件網關。"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Done"
+msgstr "完成"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Close"
+msgstr "結束"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: view:crm.helpdesk.report:0
+#: selection:crm.helpdesk.report,state:0
+msgid "Open"
+msgstr "開啟"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Helpdesk Support Tree"
+msgstr "客服協助來源"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Categorization"
+msgstr "分類"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: model:ir.model,name:crm_helpdesk.model_crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_config_helpdesk
+msgid "Helpdesk"
+msgstr "客服"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,user_id:0
+msgid "Responsible"
+msgstr "負責人"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超過截止日期"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,description:0
+msgid "Description"
+msgstr "說明"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,probability:0
+msgid "Probability (%)"
+msgstr "概率(%)"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk.report,email:0
+msgid "# Emails"
+msgstr "電子郵件"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.action_report_crm_helpdesk
+msgid ""
+"Have a general overview of all support requests by sorting them with "
+"specific criteria such as the processing time, number of requests answered, "
+"emails sent and costs."
+msgstr "為所有的支持請求排序指定具體標準如：處理時間，請求回覆的次數，發送的郵件，成本."
+
+#. module: crm_helpdesk
+#: help:crm.helpdesk,state:0
+msgid ""
+"The state is set to 'Draft', when a case is created.                         "
+"         \n"
+"If the case is in progress the state is set to 'Open'.                       "
+"           \n"
+"When the case is over, the state is set to 'Done'.                           "
+"       \n"
+"If the case needs to be reviewed then the state is set to 'Pending'."
+msgstr ""
+"當一個業務建立時狀態設為'草稿'\n"
+"如果業務正在處理狀態設為'開啟'\n"
+"當業務結束狀態設為'完成'\n"
+"如果業務需要審查狀態設為'待處理'"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "Month-1"
+msgstr "上月"
+
+#. module: crm_helpdesk
+#: model:ir.ui.menu,name:crm_helpdesk.menu_help_support_main
+msgid "Helpdesk and Support"
+msgstr "客服和協助"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+msgid "My Case(s)"
+msgstr "我的業務"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Query"
+msgstr "提問"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
+msgid ""
+"Create and manage helpdesk categories to better manage and classify your "
+"support requests."
+msgstr "建立和管理客服類型去更好管理和分類你的需求協助"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Todays's Helpdesk Requests"
+msgstr "今天的客服需求"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Request Date"
+msgstr "需求日期"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+msgid "Open Helpdesk Request"
+msgstr "打開客服需求"
+
+#. module: crm_helpdesk
+#: selection:crm.helpdesk,priority:0
+#: selection:crm.helpdesk.report,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk:0
+#: field:crm.helpdesk,section_id:0
+#: view:crm.helpdesk.report:0
+msgid "Sales Team"
+msgstr "銷售團隊"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,date_action_last:0
+msgid "Last Action"
+msgstr "最近動作"
+
+#. module: crm_helpdesk
+#: model:ir.actions.act_window,help:crm_helpdesk.crm_case_helpdesk_act111
+msgid ""
+"Helpdesk and Support allow you to track your interventions. Select a "
+"customer, add notes and categorize interventions with partners if necessary. "
+"You can also assign a priority level. Use the OpenERP Issues system to "
+"manage your support activities. Issues can be connected to the email "
+"gateway: new emails may create issues, each of them automatically gets the "
+"history of the conversation with the customer."
+msgstr ""
+"客服和協助使你可以去追蹤.如果需要選擇一個客戶增加備註和類型這業務夥伴.你可以分配一優先級用系統問題模塊來管理的的支持活動.問題能鏈接郵件閘道.新的郵件可"
+"能建立新的問題,它們能自動寫入於客戶溝通的日誌."
+
+#. module: crm_helpdesk
+#: view:crm.helpdesk.report:0
+#: field:crm.helpdesk.report,name:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_helpdesk
+#: field:crm.helpdesk,duration:0
+msgid "Duration"
+msgstr "持續時間"
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py
index 93a33d62819..6496935c2d2 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report.py
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py
@@ -97,7 +97,7 @@ class crm_helpdesk_report(osv.osv):
                     c.planned_cost,
                     count(*) as nbr,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
-                    (SELECT count(id) FROM mail_message WHERE model='crm.helpdesk' AND res_id=c.id AND email_from IS NOT NULL) AS email,
+                    (SELECT count(id) FROM mail_message WHERE model='crm.helpdesk' AND res_id=c.id AND type = 'email') AS email,
                     abs(avg(extract('epoch' from (c.date_deadline - c.date_closed)))/(3600*24)) as delay_expected
                 from
                     crm_helpdesk c
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 4750fa3344d..05f502656d2 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -8,7 +8,7 @@
             <field name="name">crm.helpdesk.report.tree</field>
             <field name="model">crm.helpdesk.report</field>
             <field name="arch" type="xml">
-                <tree string="Helpdesk">
+                <tree string="Helpdesk" create="false">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="section_id" invisible="1"/>
diff --git a/addons/crm_helpdesk/test/process/help-desk.yml b/addons/crm_helpdesk/test/process/help-desk.yml
index 320bd61c2af..4fd6a9ee9d7 100644
--- a/addons/crm_helpdesk/test/process/help-desk.yml
+++ b/addons/crm_helpdesk/test/process/help-desk.yml
@@ -23,7 +23,7 @@
   !python {model: crm.helpdesk}: |
     question_ids = self.search(cr, uid, [('email_from','=', 'Mr. John Right <info@customer.com>')])
     try:
-      self.message_update(cr, uid, question_ids, {'subject': 'Link of product', 'body_text': 'www.openerp.com'})
+      self.message_update(cr, uid, question_ids, {'subject': 'Link of product', 'body': 'www.openerp.com'})
     except:
       pass
 
diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py
index 5feb8c199d4..cb952606e76 100644
--- a/addons/crm_partner_assign/__openerp__.py
+++ b/addons/crm_partner_assign/__openerp__.py
@@ -32,15 +32,14 @@ You can geolocalize your opportunities by using this module.
 
 Use geolocalization when assigning opportunities to partners.
 Determine the GPS coordinates according to the address of the partner.
+
 The most appropriate partner can be assigned.
 You can also use the geolocalization without using the GPS coordinates.
     """,
     'author': 'OpenERP SA',
     'depends': ['crm', 'account'],
-    'demo_xml': [
-        'res_partner_demo.xml',
-    ],
-    'update_xml': [
+    'demo': ['res_partner_demo.xml'],
+    'data': [
         'security/ir.model.access.csv',
         'res_partner_view.xml',
         'wizard/crm_forward_to_partner_view.xml',
@@ -48,12 +47,9 @@ You can also use the geolocalization without using the GPS coordinates.
         'report/crm_lead_report_view.xml',
         'report/crm_partner_report_view.xml',
     ],
-    'test': [
-        'test/partner_assign.yml'
-    ],
+    'test': ['test/partner_assign.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '00503409558942442061',
     'images': ['images/partner_geo_localization.jpeg','images/partner_grade.jpeg'],
 }
 
diff --git a/addons/crm_partner_assign/crm_lead_view.xml b/addons/crm_partner_assign/crm_lead_view.xml
index d4ff93d52fd..2cffb6fb899 100644
--- a/addons/crm_partner_assign/crm_lead_view.xml
+++ b/addons/crm_partner_assign/crm_lead_view.xml
@@ -19,8 +19,7 @@
                                             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}"
-                                        />
+                                            context="{'default_composition_mode': 'forward', 'default_partner_ids': [partner_assigned_id]}"/>
                                     </div>
                                 </group>
                                 <group string="Geo Assignation">
@@ -37,8 +36,6 @@
             </field>
         </record>
 
-
-
         <record id="view_crm_opportunity_geo_assign_tree" model="ir.ui.view">
             <field name="name">crm.lead.geo_assign.tree.inherit</field>
             <field name="model">crm.lead</field>
@@ -49,6 +46,7 @@
                  </field>
             </field>
         </record>
+
         <record model="ir.ui.view" id="crm_opportunity_partner_filter">
             <field name="name">crm.opportunity.partner.filter.assigned</field>
             <field name="model">crm.lead</field>
@@ -58,10 +56,11 @@
                     <filter string="Assigned Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_assigned_id'}"/>
                 </filter>
 
-                <field name="user_id" position="after">
+                <field name="partner_id" position="after">
                     <field name="partner_assigned_id"/>
                 </field>
             </field>
          </record>
+
     </data>
 </openerp>
diff --git a/addons/crm_partner_assign/i18n/ar.po b/addons/crm_partner_assign/i18n/ar.po
index af2b96e8019..7e3505b52f5 100644
--- a/addons/crm_partner_assign/i18n/ar.po
+++ b/addons/crm_partner_assign/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "التمركز الجغرافي"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -134,7 +134,7 @@ msgid "Highest"
 msgstr "أعلى"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/bg.po b/addons/crm_partner_assign/i18n/bg.po
index dd7d8e8446d..9aa7893af53 100644
--- a/addons/crm_partner_assign/i18n/bg.po
+++ b/addons/crm_partner_assign/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Най-висок"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/ca.po b/addons/crm_partner_assign/i18n/ca.po
index f012dc16dfb..d6b2e0fbd06 100644
--- a/addons/crm_partner_assign/i18n/ca.po
+++ b/addons/crm_partner_assign/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo localitzar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "El més alt"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/crm_partner_assign.pot b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
index 3fb9fc0e915..c3ddc66fa3b 100644
--- a/addons/crm_partner_assign/i18n/crm_partner_assign.pot
+++ b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
@@ -72,7 +72,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/da.po b/addons/crm_partner_assign/i18n/da.po
index ae5ebe38ebb..dd42535033c 100644
--- a/addons/crm_partner_assign/i18n/da.po
+++ b/addons/crm_partner_assign/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/de.po b/addons/crm_partner_assign/i18n/de.po
index 351a5d1f7b5..8a45f31ee80 100644
--- a/addons/crm_partner_assign/i18n/de.po
+++ b/addons/crm_partner_assign/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geogr. Lokalisierung"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Text Version der Mitteilung"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Sehr Hoch"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Text Inhalt"
 
@@ -490,7 +490,7 @@ msgstr "Beendet"
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
-msgstr ""
+msgstr "Massenmail an Partner"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
diff --git a/addons/crm_partner_assign/i18n/el.po b/addons/crm_partner_assign/i18n/el.po
index 97bdb8238a8..16fde1d9926 100644
--- a/addons/crm_partner_assign/i18n/el.po
+++ b/addons/crm_partner_assign/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Υψηλότερο"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/es.po b/addons/crm_partner_assign/i18n/es.po
index 827161206de..4f6521a6421 100644
--- a/addons/crm_partner_assign/i18n/es.po
+++ b/addons/crm_partner_assign/i18n/es.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-16 17:13+0000\n"
-"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
+"PO-Revision-Date: 2012-11-09 12:10+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-11-10 04:59+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -25,12 +25,12 @@ msgstr "Enviar a"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Tipo de mensaje"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Eliminar permanentemente los emails depués de su envío"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -40,7 +40,7 @@ msgstr "Retraso para cerrar"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Destinatarios del mensaje"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
@@ -61,7 +61,7 @@ msgstr "Agrupar por..."
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Plantilla"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -74,14 +74,14 @@ msgid "Geo Localize"
 msgstr "Geo localizar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Versión en texto plano del mensaje"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
-msgstr ""
+msgstr "Cuerpo"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -101,7 +101,7 @@ msgstr "Demora cierre"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "#Partner"
-msgstr ""
+msgstr "Nº empresa"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -135,9 +135,9 @@ msgid "Highest"
 msgstr "Más alta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
-msgstr ""
+msgstr "Contenido del texto"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -148,7 +148,7 @@ msgstr "Día"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Identificador único del mensaje"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -167,6 +167,8 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
+"Añada aquí todos los datos adjuntos del documento que quiere incluir en el "
+"correo."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -195,17 +197,17 @@ msgstr ""
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Versión en texto enriquecido / HTML del mensaje"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Auto eliminar"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Destinatarios de la copia oculta"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_id:0
@@ -254,7 +256,7 @@ msgstr "Sección"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
-msgstr ""
+msgstr "Enviar"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -286,7 +288,7 @@ msgstr "Tipo"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -299,11 +301,13 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Tipo de mensaje, normalmente 'html' o 'plano', utilizado para seleccionar "
+"contenidos en texto plano o en texto enriquecido"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
-msgstr ""
+msgstr "Fecha de asignación"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -318,7 +322,7 @@ msgstr "Fecha creación"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID del docuemtno relacionado"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -349,7 +353,7 @@ msgstr "Etapa"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document model"
-msgstr ""
+msgstr "Modelo del documento relacionado"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
@@ -392,7 +396,7 @@ msgstr "Cerrar"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Usar plantilla"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
@@ -464,12 +468,12 @@ msgstr "nº oportunidades"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Equipo"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Referred Partner"
-msgstr ""
+msgstr "Empresa referida"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -490,7 +494,7 @@ msgstr "Cerrado"
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
-msgstr ""
+msgstr "Envío masivo a empresa"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -570,7 +574,7 @@ msgstr "Longitud Geo"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
-msgstr ""
+msgstr "Nº oportunidad"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -600,12 +604,12 @@ msgstr "Empresa a la que este caso ha sido reenviado/asignado."
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text contents"
-msgstr ""
+msgstr "Contenido en texto enriquecido"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -620,18 +624,18 @@ msgstr "res.empresa.nivel"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Id del mensaje"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Adjuntos"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Cc"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -641,7 +645,7 @@ msgstr "Septiembre"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,references:0
 msgid "References"
-msgstr ""
+msgstr "Referencias"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -668,7 +672,7 @@ msgstr "Abierto"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Destinatarios de la copia"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,headers:0
@@ -676,6 +680,8 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Cabeceras completas del mensaje, por ejemplo las cabeceras de sesión SMTP "
+"(normalmente disponibles sólo en mensajes entrantes)"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -698,11 +704,13 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Remitente del mensaje, proveniente de las preferencias del usuario. Si está "
+"vacío, esto no es correo electrónico, sino un mensaje."
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,nbr:0
 msgid "# of Partner"
-msgstr ""
+msgstr "Nº empresa"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -713,7 +721,7 @@ msgstr "Reenviar a empresa"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,name:0
 msgid "Partner name"
-msgstr ""
+msgstr "Nombre de la empresa"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -728,7 +736,7 @@ msgstr "Ingreso estimado"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Responder a"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
@@ -748,7 +756,7 @@ msgstr "Oportunidad"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Enviar correo"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
@@ -776,7 +784,7 @@ msgstr "País"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "Cabeceras del mensaje"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -786,7 +794,7 @@ msgstr "Convertir en oportunidad"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Cco"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -802,7 +810,7 @@ msgstr "Abril"
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
-msgstr ""
+msgstr "Análisis de la relación"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
@@ -817,7 +825,7 @@ msgstr "Pendiente"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
-msgstr ""
+msgstr "Análisis de la empresa asignada"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
@@ -828,11 +836,12 @@ msgstr "Informe de iniciativas CRM"
 #: help:crm.lead.forward.to.partner,references:0
 msgid "Message references, such as identifiers of previous messages"
 msgstr ""
+"Referencias del mensaje, tales como identificadores de mensajes anteriores"
 
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "¡Error! No puede crear miembros asociados recursivamente."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -847,12 +856,12 @@ msgstr "Secuencia"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
-msgstr ""
+msgstr "Informe de la empresa CRM"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Asistente de composición de e-mail"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -873,7 +882,7 @@ msgstr "Fecha de creación"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtros"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -884,7 +893,7 @@ msgstr "Año"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Dirección de correo de respuesta preferida para este mensaje"
 
 #~ msgid "Reply-to of the Sales team defined on this case"
 #~ msgstr "\"Responder a\" del equipo de ventas definido en este caso"
@@ -941,3 +950,6 @@ msgstr ""
 #~ "partners o asesores,\n"
 #~ "basándose en geo-localización.\n"
 #~ "    "
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Asistente de composición de e-mail"
diff --git a/addons/crm_partner_assign/i18n/es_CR.po b/addons/crm_partner_assign/i18n/es_CR.po
index 249f9e9b24c..2c7e458e63a 100644
--- a/addons/crm_partner_assign/i18n/es_CR.po
+++ b/addons/crm_partner_assign/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: crm_partner_assign
@@ -75,7 +75,7 @@ msgid "Geo Localize"
 msgstr "Geo localizar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Versión en texto plano del mensaje"
 
@@ -136,7 +136,7 @@ msgid "Highest"
 msgstr "Más alta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Contenido del Texto"
 
diff --git a/addons/crm_partner_assign/i18n/es_PY.po b/addons/crm_partner_assign/i18n/es_PY.po
index 8c5343be3ac..6a992760cc7 100644
--- a/addons/crm_partner_assign/i18n/es_PY.po
+++ b/addons/crm_partner_assign/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo localizar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Muy alto"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/fi.po b/addons/crm_partner_assign/i18n/fi.po
index 54cd578ce0b..95854390bc2 100644
--- a/addons/crm_partner_assign/i18n/fi.po
+++ b/addons/crm_partner_assign/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Alueellista"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Korkein"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/fr.po b/addons/crm_partner_assign/i18n/fr.po
index 7499444cdce..c164cf1596a 100644
--- a/addons/crm_partner_assign/i18n/fr.po
+++ b/addons/crm_partner_assign/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -75,7 +75,7 @@ msgid "Geo Localize"
 msgstr "Géolocalisation"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Version plein texte du message"
 
@@ -136,7 +136,7 @@ msgid "Highest"
 msgstr "La Plus haute"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Contenu du texte"
 
diff --git a/addons/crm_partner_assign/i18n/gl.po b/addons/crm_partner_assign/i18n/gl.po
index 93def92dc17..1d4af9aa8e7 100644
--- a/addons/crm_partner_assign/i18n/gl.po
+++ b/addons/crm_partner_assign/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Xeolocalizar"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "A máis alta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/hr.po b/addons/crm_partner_assign/i18n/hr.po
index d41efee23a3..c2cc1aedab5 100644
--- a/addons/crm_partner_assign/i18n/hr.po
+++ b/addons/crm_partner_assign/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Najviši"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/hu.po b/addons/crm_partner_assign/i18n/hu.po
index 96a1ea38f80..6c06269be51 100644
--- a/addons/crm_partner_assign/i18n/hu.po
+++ b/addons/crm_partner_assign/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Földrajzi fekvés meghatározása"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Legmagasabb"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/it.po b/addons/crm_partner_assign/i18n/it.po
index 9ffbeac4a0d..ba019f46cac 100644
--- a/addons/crm_partner_assign/i18n/it.po
+++ b/addons/crm_partner_assign/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo localizzazione"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Maggiore"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po
index 71118b510d3..7d288a70ebf 100644
--- a/addons/crm_partner_assign/i18n/ja.po
+++ b/addons/crm_partner_assign/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "ジオロカライゼーション"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "メッセージのテキスト版"
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "最高"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "テキストの内容"
 
diff --git a/addons/crm_partner_assign/i18n/lt.po b/addons/crm_partner_assign/i18n/lt.po
index bec6492db36..01a4084e358 100644
--- a/addons/crm_partner_assign/i18n/lt.po
+++ b/addons/crm_partner_assign/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/lv.po b/addons/crm_partner_assign/i18n/lv.po
index cf9563af198..2f355bd3aa7 100644
--- a/addons/crm_partner_assign/i18n/lv.po
+++ b/addons/crm_partner_assign/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Ģeo. lokalizācija"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "Augstākā"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/nl.po b/addons/crm_partner_assign/i18n/nl.po
index 3491555f881..5e67cac09d7 100644
--- a/addons/crm_partner_assign/i18n/nl.po
+++ b/addons/crm_partner_assign/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-06-28 12:46+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geo lokaliseren"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Platte tekst versie van het bericht"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Hoogste"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Tekst inhoud"
 
@@ -402,7 +402,7 @@ msgstr "Gebruik sjabloon"
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
-msgstr "Verkoopkans toekenning analyse"
+msgstr "Prospect toekenning analyse"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
@@ -751,7 +751,7 @@ msgstr "Adres"
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Opportunity"
-msgstr "Verkoopkans"
+msgstr "Prospect"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -789,7 +789,7 @@ msgstr "Bericht kop"
 #. module: crm_partner_assign
 #: view:res.partner:0
 msgid "Convert to Opportunity"
-msgstr "Omzetten naar verkoopkans"
+msgstr "Converteren naar prospect"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_bcc:0
diff --git a/addons/crm_partner_assign/i18n/pl.po b/addons/crm_partner_assign/i18n/pl.po
index a069dbb164d..aea2537cc02 100644
--- a/addons/crm_partner_assign/i18n/pl.po
+++ b/addons/crm_partner_assign/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Lokalizacja geograficzna"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Najwyższy"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/pt.po b/addons/crm_partner_assign/i18n/pt.po
index b6be865392d..4b5d9dfb0cd 100644
--- a/addons/crm_partner_assign/i18n/pt.po
+++ b/addons/crm_partner_assign/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Localizar Geograficamente"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Formatação do texto da versão da mensagem"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Maior"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Conteúdos do texto"
 
diff --git a/addons/crm_partner_assign/i18n/pt_BR.po b/addons/crm_partner_assign/i18n/pt_BR.po
index 2cbcff71b56..c0ff0b938d6 100644
--- a/addons/crm_partner_assign/i18n/pt_BR.po
+++ b/addons/crm_partner_assign/i18n/pt_BR.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-28 18:41+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-09-15 21:58+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -35,7 +36,7 @@ msgstr "Excluir Permanentemente o email após o envio"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
 msgid "Delay to Close"
-msgstr "Espera para Fechar"
+msgstr "Adiar Fechamento"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_to:0
@@ -74,7 +75,7 @@ msgid "Geo Localize"
 msgstr "Localização Geográfica"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Versão em texto"
 
@@ -91,12 +92,12 @@ msgstr "Março"
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
 msgid "Lead"
-msgstr "Prospécto"
+msgstr "Prospecto"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Delay to close"
-msgstr "Atraso para fechar"
+msgstr "Adiar o fechamento"
 
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
@@ -135,7 +136,7 @@ msgid "Highest"
 msgstr "Mais Alta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Conteúdo"
 
@@ -232,7 +233,7 @@ msgstr "Anterior"
 #: code:addons/crm_partner_assign/partner_geo_assign.py:36
 #, python-format
 msgid "Network error"
-msgstr "Erro de rede"
+msgstr "Erro na rede"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_from:0
@@ -273,12 +274,12 @@ msgstr "Prioridade"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "State"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr "Prazo Superado"
+msgstr "Prazo Ultrapassado"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,type:0
@@ -317,12 +318,12 @@ msgstr "Analisar Prospecções"
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,creation_date:0
 msgid "Creation Date"
-msgstr "Dt. Criação"
+msgstr "Data de Criação"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
-msgstr "Documento Relacionado"
+msgstr "ID do Documento Relacionado"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -396,7 +397,7 @@ msgstr "Fechar"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,use_template:0
 msgid "Use Template"
-msgstr "Usar modelo"
+msgstr "Usar Modelo"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
@@ -452,7 +453,7 @@ msgstr "Assunto"
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Salesman"
-msgstr "Vendedor"
+msgstr "Representante"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -579,7 +580,7 @@ msgstr "# da Oportunidade"
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Lead Assign"
-msgstr "Atribuir Prospécto"
+msgstr "Atribuir Prospecto"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -599,7 +600,7 @@ msgstr "Janeiro"
 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
-msgstr "O Parceiro desse Caso foi Enviado/Atribuído para."
+msgstr "Parceiro para que este caso foi enviado/atribuído"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
@@ -660,7 +661,7 @@ msgstr "Nome da Grade"
 #. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
-msgstr "Última data que este Caso foi Enviado/Atribuído a um parceiro"
+msgstr "Última data que este caso foi enviado/atribuído a um parceiro"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -678,7 +679,9 @@ msgstr "Cópia oculta da mensagem para os destinatários"
 msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
-msgstr "Cabeçalho completo, Ex Cabecalhos SMTP"
+msgstr ""
+"Cabeçalho completo da mensagem, Ex. SMTP session headers (geralmente "
+"disponível somente para mensagens recebidas)"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -807,7 +810,7 @@ msgstr "Abril"
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
-msgstr "Analise de Parceria"
+msgstr "Análise de Parceria"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
@@ -838,7 +841,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursivamente a membros associados."
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
diff --git a/addons/crm_partner_assign/i18n/ro.po b/addons/crm_partner_assign/i18n/ro.po
index e812b698222..c891d273c71 100644
--- a/addons/crm_partner_assign/i18n/ro.po
+++ b/addons/crm_partner_assign/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Localizare Geo"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Versiune text-simplu a mesajului"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Cel mai ridicat (cea mai ridicata)"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Cuprins text"
 
diff --git a/addons/crm_partner_assign/i18n/ru.po b/addons/crm_partner_assign/i18n/ru.po
index db52331d16c..59213f860ef 100644
--- a/addons/crm_partner_assign/i18n/ru.po
+++ b/addons/crm_partner_assign/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -25,12 +25,12 @@ msgstr "Отправить"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Тип сообщения"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Не сохранять сообщения после отправки"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -40,7 +40,7 @@ msgstr "Задержка закрытия"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Получатели сообщения"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
@@ -56,12 +56,12 @@ msgstr "кол-во вопросов"
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Group By..."
-msgstr "Объединять по..."
+msgstr "Группировать по ..."
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Шаблон"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -74,14 +74,14 @@ msgid "Geo Localize"
 msgstr "Геолоцировать"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Простая текстовая версия сообщения"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
-msgstr ""
+msgstr "Содержимое"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -101,7 +101,7 @@ msgstr "Задержка закрытия"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "#Partner"
-msgstr ""
+msgstr "# партнеров"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -135,9 +135,9 @@ msgid "Highest"
 msgstr "Высший"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
-msgstr ""
+msgstr "Текстовое содержимое"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -148,7 +148,7 @@ msgstr "День"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Уникальный идентификатор сообщения"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -167,6 +167,8 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
+"Добавьте сюда все приложения к текущему документу, которые вы хотите "
+"включить в эл. письмо."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -189,23 +191,23 @@ msgid ""
 "Gives the probability to assign a lead to this partner. (0 means no "
 "assignation.)"
 msgstr ""
-"Предоставляет возможность назначить кандидата этому партнёру. 0 обозначает "
+"Дает вероятность назначения кандидата этому партнёру. 0 обозначает "
 "отсутствие назначения."
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Форматный текст/HTML версия сообщения"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Авто удаление"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Получатели скрытой копии сообщения"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_id:0
@@ -254,7 +256,7 @@ msgstr "Раздел"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
-msgstr ""
+msgstr "Отправить"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -286,7 +288,7 @@ msgstr "Тип"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Name"
-msgstr ""
+msgstr "Названия"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -299,11 +301,13 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Тип сообщения, обычно 'html' или 'простой', используемый для выбора "
+"содержимого соответственно простого текста или форматного текста"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
-msgstr ""
+msgstr "Дата назначения"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -318,7 +322,7 @@ msgstr "Дата создания"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID связанного документа"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -349,7 +353,7 @@ msgstr "Этап"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document model"
-msgstr ""
+msgstr "Модель связанного документа"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
@@ -366,7 +370,7 @@ msgstr "Геолокация"
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Opportunities Assignment Analysis"
-msgstr "Анализ распределения предложений"
+msgstr "Анализ назначений предложений"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -392,13 +396,13 @@ msgstr "Закрыть"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Использовать шаблон"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
 msgid "Opp. Assignment Analysis"
-msgstr "Анализ распред. сделок"
+msgstr "Анализ назначений предложений"
 
 #. module: crm_partner_assign
 #: help:crm.lead.report.assign,delay_close:0
@@ -448,7 +452,7 @@ msgstr "Тема"
 #: view:crm.lead.report.assign:0
 #: view:crm.partner.report.assign:0
 msgid "Salesman"
-msgstr "Менеджер продаж"
+msgstr "Продавец"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -464,12 +468,12 @@ msgstr "# Предложений"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Команда"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Referred Partner"
-msgstr ""
+msgstr "Относящийся партнёр"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -490,7 +494,7 @@ msgstr "Закрыто"
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
-msgstr ""
+msgstr "Массовая отправка партнёру"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -570,7 +574,7 @@ msgstr "Географическая долгота"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
-msgstr ""
+msgstr "# предложений"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -595,17 +599,17 @@ msgstr "Январь"
 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
 msgid "Partner this case has been forwarded/assigned to."
-msgstr "Партнер по которому возник этот вопрос."
+msgstr "Партнер которому был назначен этот вопрос."
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text contents"
-msgstr ""
+msgstr "Форматное текстовое сообщение"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -620,18 +624,18 @@ msgstr "res.partner.grade"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "ID сообщения"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Вложения"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Копия"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -641,7 +645,7 @@ msgstr "Сентябрь"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,references:0
 msgid "References"
-msgstr ""
+msgstr "Ссылки"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -656,7 +660,7 @@ msgstr "Наименование уровня"
 #. module: crm_partner_assign
 #: help:crm.lead,date_assign:0
 msgid "Last date this case was forwarded/assigned to a partner"
-msgstr "Последняя дата, когда это дело было передано или назначено партнёру"
+msgstr "Последняя дата, когда этот вопрос был назначен партнёру"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -667,7 +671,7 @@ msgstr "Открыто"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Получатели скрытой копии сообщения"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,headers:0
@@ -675,6 +679,8 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Полные заголовки сообщения, т.е. заголовки сессии SMTP (обычно доступные "
+"только во входящих сообщениях)"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -697,11 +703,13 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Отправитель сообщения, взятый из параметров пользователя. Если пусто, то это "
+"не почта, а сообщение."
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,nbr:0
 msgid "# of Partner"
-msgstr ""
+msgstr "# партнеров"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -712,7 +720,7 @@ msgstr "Переслать партнёру"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,name:0
 msgid "Partner name"
-msgstr ""
+msgstr "Название партнера"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -727,7 +735,7 @@ msgstr "Вероятная выручка"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Адрес ответа"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
@@ -747,7 +755,7 @@ msgstr "Предложение"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
-msgstr ""
+msgstr "Отправить письмо"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
@@ -775,7 +783,7 @@ msgstr "Страна"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "Заголовки сообщения"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -785,7 +793,7 @@ msgstr "Преобразовать в предложение"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Скрытая копия"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -801,7 +809,7 @@ msgstr "Апрель"
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
-msgstr ""
+msgstr "Анализ сотрудничества"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
@@ -816,22 +824,22 @@ msgstr "В ожидании"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
-msgstr ""
+msgstr "Анализ назначений партнеру"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
 msgid "CRM Lead Report"
-msgstr "Отчет по кандидатам в CRM"
+msgstr "CRM - отчет по кандидатам"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Ссылки сообщения, такие как идентификаторы предыдущих сообщений"
 
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -841,12 +849,12 @@ msgstr "Информация о вопросе"
 #. module: crm_partner_assign
 #: field:res.partner.grade,sequence:0
 msgid "Sequence"
-msgstr "Последовательность"
+msgstr "Нумерация"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
-msgstr ""
+msgstr "CRM - отчет по партнерам"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
@@ -872,7 +880,7 @@ msgstr "Дата создания"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Фильтры"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -883,7 +891,7 @@ msgstr "Год"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Предпочтительный адрес ответа для сообщения"
 
 #~ msgid "HTML formatting?"
 #~ msgstr "Форматирование HTML ?"
@@ -939,3 +947,6 @@ msgstr ""
 
 #~ msgid "Set New State To"
 #~ msgstr "Установить новое состояние в"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Мастер создания электронной почты"
diff --git a/addons/crm_partner_assign/i18n/sq.po b/addons/crm_partner_assign/i18n/sq.po
index 90730a5ed8a..0c8db67e70f 100644
--- a/addons/crm_partner_assign/i18n/sq.po
+++ b/addons/crm_partner_assign/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/sr@latin.po b/addons/crm_partner_assign/i18n/sr@latin.po
index d01d4949341..4f2362b983a 100644
--- a/addons/crm_partner_assign/i18n/sr@latin.po
+++ b/addons/crm_partner_assign/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr ""
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr ""
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr ""
 
diff --git a/addons/crm_partner_assign/i18n/sv.po b/addons/crm_partner_assign/i18n/sv.po
index b691d189b8a..2e4631cfd07 100644
--- a/addons/crm_partner_assign/i18n/sv.po
+++ b/addons/crm_partner_assign/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "Geoplacering"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "Textversion av meddelandet"
 
@@ -135,7 +135,7 @@ msgid "Highest"
 msgstr "Högsta"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "Textinnehåll"
 
diff --git a/addons/crm_partner_assign/i18n/tr.po b/addons/crm_partner_assign/i18n/tr.po
index fae0ed2b8f5..aeee3db0b23 100644
--- a/addons/crm_partner_assign/i18n/tr.po
+++ b/addons/crm_partner_assign/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -25,12 +25,12 @@ msgstr "Gönder"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Mesaj tipi"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Gönderdikten sonra epostaları kalıcı olarak sil."
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@@ -40,7 +40,7 @@ msgstr "Kapanmada gecikme"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Mesaj Alıcıları"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
@@ -61,7 +61,7 @@ msgstr "Grupla..."
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Şablon"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -74,14 +74,14 @@ msgid "Geo Localize"
 msgstr "Coğrafi konumlama"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Mesajın düz-metin versiyonu"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Body"
-msgstr ""
+msgstr "Gövde"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -101,7 +101,7 @@ msgstr "Kapanmada gecikme"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "#Partner"
-msgstr ""
+msgstr "#Paydaş"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -135,9 +135,9 @@ msgid "Highest"
 msgstr "En yüksek"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
-msgstr ""
+msgstr "Metin içeriği"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -148,7 +148,7 @@ msgstr "Gün"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Benzersiz mesaj tanımlayıcısı"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -167,6 +167,7 @@ msgid ""
 "Add here all attachments of the current document you want to include in the "
 "Email."
 msgstr ""
+"Epostada yer almasını istediğiniz dökümana ait tüm ekleri buraya ekleyiniz."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -194,17 +195,17 @@ msgstr ""
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Mesajın Zengin-metin/HTML versiyonu"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Otomatik Sil"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Mesaj alıcıları görünmeyen mektup kopyası"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_id:0
@@ -253,7 +254,7 @@ msgstr "Bölüm"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send"
-msgstr ""
+msgstr "Gönder"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -285,7 +286,7 @@ msgstr "Tür"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Name"
-msgstr ""
+msgstr "Adı"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@@ -298,11 +299,13 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Mesaj tipi, genellikle \"HTML\" ya da \"düz metin\", düz metin ya da HTML "
+"içerikleri seçmek için kullanılır."
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
 msgid "Assign Date"
-msgstr ""
+msgstr "Tarih Ata"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -317,7 +320,7 @@ msgstr "Oluşturulma Tarihi"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "İlgili Döküman ID"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -348,7 +351,7 @@ msgstr "Aşama"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document model"
-msgstr ""
+msgstr "İlgili Döküman Modeli"
 
 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
@@ -391,7 +394,7 @@ msgstr "Kapat"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Şablon Kullan"
 
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
@@ -463,12 +466,12 @@ msgstr "#Fırsatlar"
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Team"
-msgstr ""
+msgstr "Takım"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
 msgid "Referred Partner"
-msgstr ""
+msgstr "Yönlendirilmiş Paydaş"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,state:0
@@ -489,7 +492,7 @@ msgstr "Kapandı"
 #. module: crm_partner_assign
 #: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
 msgid "Mass forward to partner"
-msgstr ""
+msgstr "Paydaşa toplu iletme"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -569,7 +572,7 @@ msgstr "Coğ Boylam"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,opp:0
 msgid "# of Opportunity"
-msgstr ""
+msgstr "# Fırsat"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -599,12 +602,12 @@ msgstr "Bu vak'anın iletildiği/ atandığı İş Ortağı"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,date:0
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body_html:0
 msgid "Rich-text contents"
-msgstr ""
+msgstr "Zengin-metin içeriği"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -619,18 +622,18 @@ msgstr "res.partner.grade"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Mesaj-Id"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 #: field:crm.lead.forward.to.partner,attachment_ids:0
 msgid "Attachments"
-msgstr ""
+msgstr "Ekler"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Cc"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -640,7 +643,7 @@ msgstr "Eylül"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,references:0
 msgid "References"
-msgstr ""
+msgstr "Kaynaklar"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -666,7 +669,7 @@ msgstr "Açık"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Mesaj alıcıları karbon kopyası"
 
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,headers:0
@@ -674,6 +677,8 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Tam mesaj başlığı, ör: SMTP oturum başlıkları (genelde sadece gelen "
+"mesajlarda bulunur)"
 
 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@@ -696,11 +701,13 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Mesaj gönderen, kullanıcı önceliklerinden alındı. Eğer boşsa bu bir e-posta "
+"değil mesajdır."
 
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,nbr:0
 msgid "# of Partner"
-msgstr ""
+msgstr "Paydaş #"
 
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@@ -711,7 +718,7 @@ msgstr "Paydaşa İlet"
 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,name:0
 msgid "Partner name"
-msgstr ""
+msgstr "Paydaş adı"
 
 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,month:0
@@ -726,7 +733,7 @@ msgstr "Olası Gelir"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Yanıtla"
 
 #. module: crm_partner_assign
 #: field:crm.lead,partner_assigned_id:0
@@ -746,7 +753,7 @@ msgstr "Fırsat"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "Send Mail"
-msgstr ""
+msgstr "İleti Gönder"
 
 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,partner_id:0
@@ -774,7 +781,7 @@ msgstr "Ülke"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "İleti Başlıkları"
 
 #. module: crm_partner_assign
 #: view:res.partner:0
@@ -784,7 +791,7 @@ msgstr "Fırsata Dönüştür"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Bcc"
 
 #. module: crm_partner_assign
 #: view:crm.lead:0
@@ -800,7 +807,7 @@ msgstr "Nisan"
 #: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
 #: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
 msgid "Partnership Analysis"
-msgstr ""
+msgstr "Paydaşlık İncelemesi"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
@@ -815,7 +822,7 @@ msgstr "Bekliyor"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Partner assigned Analysis"
-msgstr ""
+msgstr "İncelenmeye atanmış Aday"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
@@ -825,12 +832,12 @@ msgstr "MİY Aday Raporu"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Mesaj kaynakları, önceki mesajların tanımlayıcıları gibi"
 
 #. module: crm_partner_assign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Hata ! yinelenen ilişkili üyeler oluşturamazsınız."
 
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history:0
@@ -845,7 +852,7 @@ msgstr "Dizi"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
 msgid "CRM Partner Report"
-msgstr ""
+msgstr "CRM Paydaş Raporu"
 
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
@@ -871,7 +878,7 @@ msgstr "Tarih Oluştur"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Süzgeçler"
 
 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@@ -882,7 +889,7 @@ msgstr "Yıl"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Mesaj için tercih edilen yanıt adresi"
 
 #~ msgid "Reply-to of the Sales team defined on this case"
 #~ msgstr "Bu vak'ada tanımlanan Satış Ekibi'ne gönder"
@@ -939,3 +946,6 @@ msgstr ""
 #~ "müşterileri \n"
 #~ "paydaşlarına yönlendirmek için kullanılır.\n"
 #~ "    "
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "E-posta oluşturma sihirbazı"
diff --git a/addons/crm_partner_assign/i18n/zh_CN.po b/addons/crm_partner_assign/i18n/zh_CN.po
index cbba81541cd..794c2c0cf9c 100644
--- a/addons/crm_partner_assign/i18n/zh_CN.po
+++ b/addons/crm_partner_assign/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,send_to:0
@@ -74,7 +74,7 @@ msgid "Geo Localize"
 msgstr "geolocalization定位"
 
 #. module: crm_partner_assign
-#: help:crm.lead.forward.to.partner,body_text:0
+#: help:crm.lead.forward.to.partner,body:0
 msgid "Plain-text version of the message"
 msgstr "内容的纯文本版本"
 
@@ -133,7 +133,7 @@ msgid "Highest"
 msgstr "最高"
 
 #. module: crm_partner_assign
-#: field:crm.lead.forward.to.partner,body_text:0
+#: field:crm.lead.forward.to.partner,body:0
 msgid "Text contents"
 msgstr "文本内容"
 
diff --git a/addons/crm_partner_assign/i18n/zh_TW.po b/addons/crm_partner_assign/i18n/zh_TW.po
new file mode 100644
index 00000000000..ad443cf7bf4
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/zh_TW.po
@@ -0,0 +1,885 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 10:14+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.MIME-Version: 1.0\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,send_to:0
+msgid "Send to"
+msgstr "傳送給"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subtype:0
+msgid "Message type"
+msgstr "訊息類型"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "電子郵件發送後永久刪除"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr "延遲關閉"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_to:0
+msgid "Message recipients"
+msgstr "收件人"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "計劃收入"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "# 業務量"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Group By..."
+msgstr "分組..."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,template_id:0
+msgid "Template"
+msgstr "範本"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Forward"
+msgstr "轉寄"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr "Geo 定位"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,body:0
+msgid "Plain-text version of the message"
+msgstr "內容的純文字版本"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Body"
+msgstr "內文"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr "潛在客戶"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr "延遲關閉"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "#Partner"
+msgstr "#Partner"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Whole Story"
+msgstr "完整的情況"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#, python-format
+msgid ""
+"Could not contact geolocation servers, please make sure you have a working "
+"internet connection (%s)"
+msgstr "無法連接到服務器，請確保你的連線(%s) 正常。"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_assign:0
+msgid "Partner Date"
+msgstr "業務夥伴日期"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "最高"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body:0
+msgid "Text contents"
+msgstr "文本內容"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "日"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,message_id:0
+msgid "Message unique identifier"
+msgstr "訊息唯一編號"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Latest email"
+msgstr "最近的郵件"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr "Geo 緯度"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr "在這裡加入你在郵件裡要加入現有的單據附件。"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr "Geo 指派的"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "結束日期"
+
+#. module: crm_partner_assign
+#: help:res.partner,partner_weight:0
+msgid ""
+"Gives the probability to assign a lead to this partner. (0 means no "
+"assignation.)"
+msgstr "為潛在客戶指定一個業務夥伴的概率（表示沒指派）"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,body_html:0
+msgid "Rich-text/HTML version of the message"
+msgstr "內容的富文本/HTML版本"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,auto_delete:0
+msgid "Auto Delete"
+msgstr "自動刪除"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_bcc:0
+msgid "Blind carbon copy message recipients"
+msgstr "密件副本收件人"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,partner_id:0
+#: selection:crm.lead.forward.to.partner,send_to:0
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_assigned_id:0
+#: model:ir.model,name:crm_partner_assign.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr "平均概率"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "前一個"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#, python-format
+msgid "Network error"
+msgstr "網絡錯誤"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr "來自"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#: field:res.partner,grade_id:0
+#: view:res.partner.grade:0
+msgid "Partner Grade"
+msgstr "業務夥伴級別"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Section"
+msgstr "劃分"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send"
+msgstr "發送"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr "下一個"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr "優先級"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "超過截止日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr "類型"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr "最低"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr "內容類型，一般是“html”或“純文本”，用於對應地選擇純文本或富文本"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Assign Date"
+msgstr "分配日期"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr "潛在客戶分析"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr "建立日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,res_id:0
+msgid "Related Document ID"
+msgstr "相關單據編號"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "7 Days"
+msgstr "7天"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr "指定業務夥伴"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "類型用於區分線索和商機"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr "階段"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,model:0
+msgid "Related Document model"
+msgstr "相關單據模組"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:192
+#, python-format
+msgid "Fwd"
+msgstr "轉發"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr "Geo 定位"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr "商機指定分析"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history:0
+msgid "Send history"
+msgstr "發送日誌"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Contact"
+msgstr "聯絡人"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: view:res.partner:0
+msgid "Close"
+msgstr "結束"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,use_template:0
+msgid "Use Template"
+msgstr "使用者範本"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+msgid "Opp. Assignment Analysis"
+msgstr "商機指定分析"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "到期天數"
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr "重要性"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr "延遲開啟"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,grade_id:0
+msgid "Grade"
+msgstr "級別"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr "開啟日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr "主題"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Salesman"
+msgstr "業務員"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,categ_id:0
+msgid "Category"
+msgstr "分類"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr "#商機"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Team"
+msgstr "團隊"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Referred Partner"
+msgstr "推薦的業務夥伴"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr "低"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr "已結束"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+msgid "Mass forward to partner"
+msgstr "批量轉發給業務夥伴"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr "轉為商機"
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr "指定日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr "最大可能"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr "普通"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr "提升"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr "業務開啟的天數"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr "延遲開啟"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,send_to:0
+#: field:crm.lead.forward.to.partner,user_id:0
+#: field:crm.lead.report.assign,user_id:0
+#: field:crm.partner.report.assign,user_id:0
+msgid "User"
+msgstr "使用者"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr "生效"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr "增加篩選條件"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr "Geo 經度"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,opp:0
+msgid "# of Opportunity"
+msgstr "商機編號"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Lead Assign"
+msgstr "潛在客戶指定"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr "指定"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr "這業務的業務夥伴已提出/已指定"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body_html:0
+msgid "Rich-text contents"
+msgstr "Rich-text內容"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr "已計劃收入"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr "res.partner.grade"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,message_id:0
+msgid "Message-Id"
+msgstr "訊息-Id"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_cc:0
+msgid "Cc"
+msgstr "副本收件人"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,references:0
+msgid "References"
+msgstr "關聯"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Last 30 Days"
+msgstr "最近30天"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr "級別名稱"
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr "這業務指定/轉發的業務夥伴的最後期限"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+#: view:res.partner:0
+msgid "Open"
+msgstr "開啟"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_cc:0
+msgid "Carbon copy message recipients"
+msgstr "郵件副本收件人"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr "完整的郵件標題，例如僅SMTP會話頭（通常可在入站消息)"
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr "Geo 定位的日期"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr "當前的"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_to:0
+msgid "To"
+msgstr "給"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_from:0
+msgid ""
+"Message sender, taken from user preferences. If empty, this is not a mail "
+"but a message."
+msgstr "郵件發件人，​​來自使用者的個人設置。如果為空，不發郵件而是發內部消息。"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,nbr:0
+msgid "# of Partner"
+msgstr "# of Partner"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+msgid "Forward to Partner"
+msgstr "轉發給業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,name:0
+msgid "Partner name"
+msgstr "上級名稱"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr "5月"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr "預計收入"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply-To"
+msgstr "回覆給"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr "指定的業務夥伴"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,address_id:0
+msgid "Address"
+msgstr "地址"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr "商機"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send Mail"
+msgstr "發送郵件"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr "客戶"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,send_to:0
+msgid "Email Address"
+msgstr "電子郵件地址"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,country_id:0
+msgid "Country"
+msgstr "國家"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,headers:0
+msgid "Message headers"
+msgstr "郵件頭"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "轉換為商機"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_bcc:0
+msgid "Bcc"
+msgstr "密件副本"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr "指定geolocalization"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+msgid "Partnership Analysis"
+msgstr "業務夥伴分析"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "待處理"
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Partner assigned Analysis"
+msgstr "業務夥伴分配分析"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr "客戶關係管理 線索報表"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "郵件引用，例如前一個郵件的ID"
+
+#. module: crm_partner_assign
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤，您不能建立循環引用的會員用戶"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Case Information"
+msgstr "業務資訊"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr "順序"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+msgid "CRM Partner Report"
+msgstr "CRM業務夥伴報表"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "Email composition wizard"
+msgstr "電子郵件成分嚮導"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr "高"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+#: field:crm.partner.report.assign,section_id:0
+msgid "Sales Team"
+msgstr "銷售團隊"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr "建立日期"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,filter_id:0
+msgid "Filters"
+msgstr "篩選"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,reply_to:0
+msgid "Preferred response address for the message"
+msgstr "本郵件推薦的回覆地址"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "郵件協同作業"
diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py
index 9134f427c5d..69b2ba406ca 100644
--- a/addons/crm_partner_assign/partner_geo_assign.py
+++ b/addons/crm_partner_assign/partner_geo_assign.py
@@ -87,7 +87,7 @@ class res_partner(osv.osv):
             help="Gives the probability to assign a lead to this partner. (0 means no assignation.)"),
         'opportunity_assigned_ids': fields.one2many('crm.lead', 'partner_assigned_id',\
             'Assigned Opportunities'),
-        'grade_id': fields.many2one('res.partner.grade', 'Partner Grade'),
+        'grade_id': fields.many2one('res.partner.grade', 'Partner Level'),
         'activation' : fields.many2one('res.partner.activation', 'Activation', select=1),
         'date_partnership' : fields.date('Partnership Date'),
         'date_review' : fields.date('Latest Partner Review'),
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 662a7c3dce0..ee9266a0235 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -65,7 +65,7 @@
             <field name="name">crm.lead.assign.report.tree</field>
             <field name="model">crm.lead.report.assign</field>
             <field name="arch" type="xml">
-            <tree string="Opportunities Assignment Analysis">
+            <tree string="Opportunities Assignment Analysis" create="false">
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="date_assign" invisible="1"/>
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
index 107328ac4e0..eb2c86874c4 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -41,7 +41,7 @@
             <field name="name">crm.partner.assign.report.tree</field>
             <field name="model">crm.partner.report.assign</field>
             <field name="arch" type="xml">
-            <tree string="Opportunities Assignment Analysis">
+            <tree string="Opportunities Assignment Analysis" create="false">
                 <field name="partner_id" invisible="1"/>
                 <field name="country_id" invisible="1"/>
                 <field name="grade_id" invisible="1"/>
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index f5a1e9aad25..3b55c70f4c7 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -170,7 +170,7 @@
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_res_partner_filter"/>
             <field name="arch" type="xml">
-                <filter string="Salesman" position="after">
+                <filter string="Salesperson" position="after">
                     <filter string="Activation" context="{'group_by' : 'activation'}" domain="[]" icon="terp-personal" />
                 </filter>
             </field>
diff --git a/addons/crm_partner_assign/test/partner_assign.yml b/addons/crm_partner_assign/test/partner_assign.yml
index bc4cd0d6e57..a055fc6cd6d 100644
--- a/addons/crm_partner_assign/test/partner_assign.yml
+++ b/addons/crm_partner_assign/test/partner_assign.yml
@@ -29,8 +29,8 @@
   I forward this opportunity to its nearest partner.
 -
   !python {model: crm.lead.forward.to.partner}: |
-    context.update({'active_model': 'crm.lead', 'active_id': ref('crm.crm_case_19'), 'active_ids': [ref('crm.crm_case_19')]})
-    forward_id = self.create(cr, uid, {'email_from': 'test@openerp.com', 'send_to': 'partner'}, context=context)
+    context.update({'default_model': 'crm.lead', 'default_res_id': ref('crm.crm_case_19'), 'active_ids': [ref('crm.crm_case_19')]})
+    forward_id = self.create(cr, uid, {}, context=context)
     try:
       self.action_forward(cr, uid, [forward_id], context=context)
     except:
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index d479f8b1bd5..0cac38e0163 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -20,186 +20,153 @@
 #
 ##############################################################################
 
-import time
 import re
+import time
+import tools
+
 from osv import osv, fields
 from tools.translate import _
-from mail.mail_message import to_email
 
 class crm_lead_forward_to_partner(osv.osv_memory):
-    """Forwards lead history"""
+    """ Forward info history to partners. """
     _name = 'crm.lead.forward.to.partner'
     _inherit = "mail.compose.message"
 
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        # set as comment, perform overrided document-like action that calls get_record_data
+        old_mode = context.get('default_composition_mode', 'forward')
+        context['default_composition_mode'] = 'comment'
+        res = super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
+        # back to forward mode
+        context['default_composition_mode'] = old_mode
+        res['composition_mode'] = context['default_composition_mode']
+        return res
+
+    def _get_composition_mode_selection(self, cr, uid, context=None):
+        composition_mode = super(crm_lead_forward_to_partner, self)._get_composition_mode_selection(cr, uid, context=context)
+        composition_mode.append(('forward', 'Forward'))
+        return composition_mode
+
     _columns = {
-        'send_to': fields.selection([('user', 'User'), ('partner', 'Partner'), \
-                         ('email', 'Email Address')], 'Send to', required=True),
-        'user_id': fields.many2one('res.users', "User"),
-        'attachment_ids': fields.many2many('ir.attachment','lead_forward_to_partner_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
-        'partner_id' : fields.many2one('res.partner', 'Partner'),
-        'history': fields.selection([('info', 'Case Information'), ('latest', 'Latest email'), ('whole', 'Whole Story')], 'Send history', required=True),
+        'partner_ids': fields.many2many('res.partner',
+            'lead_forward_to_partner_res_partner_rel',
+            'wizard_id', 'partner_id', 'Additional contacts'),
+        'attachment_ids': fields.many2many('ir.attachment',
+            'lead_forward_to_partner_attachment_rel',
+            'wizard_id', 'attachment_id', 'Attachments'),
+        'history_mode': fields.selection([('info', 'Case Information'),
+            ('latest', 'Latest email'), ('whole', 'Whole Story')],
+            'Send history', required=True),
     }
 
     _defaults = {
-        'send_to' : 'email',
-        'history': 'latest',
-        'email_from': lambda s, cr, uid, c: s.pool.get('res.users').browse(cr, uid, uid, c).email,
+        'history_mode': 'latest',
+        'content_subtype': lambda self,cr, uid, context={}: 'html',
     }
 
-    def on_change_email(self, cr, uid, ids, user, context=None):
-        if not user:
-            return {'value': {'email_to': False}}
-        return {'value': {'email_to': self.pool.get('res.users').browse(cr, uid, uid, context=context).email}}
-
-    def on_change_history(self, cr, uid, ids, history_type, context=None):
-        """Gives message body according to type of history selected
-            * info: Forward the case information
-            * whole: Send the whole history
-            * latest: Send the latest histoy
+    def get_record_data(self, cr, uid, model, res_id, context=None):
+        """ Override of mail.compose.message, to add default values coming
+            form the related lead.
         """
-        #TODO: ids and context are not comming
-        res = {}
-        res_id = context.get('active_id')
-        model = context.get('active_model')
-        lead = self.pool.get(model).browse(cr, uid, res_id, context)
-        body_text = self._get_message_body_text(cr, uid, lead, history_type, context=context)
-        if body_text:
-            res = {'value': {'body_text' : body_text}}
+        res = super(crm_lead_forward_to_partner, self).get_record_data(cr, uid, model, res_id, context=context)
+        if model not in ('crm.lead') or not res_id:
+            return res
+        lead_obj = self.pool.get(model)
+        lead = lead_obj.browse(cr, uid, res_id, context=context)
+        subject = '%s: %s - %s' % (_('Fwd'), _('Lead forward'), lead.name)
+        body = self._get_message_body(cr, uid, lead, 'info', context=context)
+        res.update({
+            'subject': subject,
+            'body': body,
+            })
         return res
-    
-    def on_change_partner(self, cr, uid, ids, partner_id):
-        """This function fills address information based on partner/user selected
-        """
-        if not partner_id:
-            return {'value' : {'email_to' : False}}
-        partner_obj = self.pool.get('res.partner')
-        data = {}
-        partner = partner_obj.browse(cr, uid, [partner_id])
-        user_id = partner and partner[0].user_id or False
-        data.update({'email_from': partner and partner[0].email or "", 
-                     'email_cc' : user_id and user_id.user or '', 
-                     'user_id': user_id and user_id.id or False})
-        return {'value' : data}
+
+    def on_change_history_mode(self, cr, uid, ids, history_mode, model, res_id, context=None):
+        """ Update body when changing history_mode """
+        if model and model == 'crm.lead' and res_id:
+            lead = self.pool.get(model).browse(cr, uid, res_id, context=context)
+            body = self._get_message_body(cr, uid, lead, history_mode, context=context)
+            return {'value': {'body': body}}
+
+    def create(self, cr, uid, values, context=None):
+        """ TDE-HACK: remove 'type' from context, because when viewing an
+            opportunity form view, a default_type is set and propagated
+            to the wizard, that has a not matching type field. """
+        default_type = context.pop('default_type', None)
+        new_id = super(crm_lead_forward_to_partner, self).create(cr, uid, values, context=context)
+        if default_type:
+            context['default_type'] = default_type
+        return new_id
 
     def action_forward(self, cr, uid, ids, context=None):
-        """
-        Forward the lead to a partner
-        """
+        """ Forward the lead to a partner """
         if context is None:
             context = {}
         res = {'type': 'ir.actions.act_window_close'}
-        model = context.get('active_model')
-        if model not in ('crm.lead'):
+        wizard = self.browse(cr, uid, ids[0], context=context)
+        if wizard.model not in ('crm.lead'):
             return res
 
-        this = self.browse(cr, uid, ids[0], context=context)
-        lead = self.pool.get(model)
-        lead_id = context and context.get('active_id', False) or False
-        lead_ids = lead_id and [lead_id] or []
-        mode = context.get('mail.compose.message.mode')
-        if mode == 'mass_mail':
+        lead = self.pool.get(wizard.model)
+        lead_ids = wizard.res_id and [wizard.res_id] or []
+
+        if wizard.composition_mode == 'mass_mail':
             lead_ids = context and context.get('active_ids', []) or []
-            value = self.default_get(cr, uid, ['body_text', 'email_to', 'email_cc', 'subject', 'history'], context=context)
+            value = self.default_get(cr, uid, ['body', 'email_to', 'email_cc', 'subject', 'history_mode'], context=context)
             self.write(cr, uid, ids, value, context=context)
-            context['mail.compose.message.mode'] = mode
 
         self.send_mail(cr, uid, ids, context=context)
-        for case in lead.browse(cr, uid, lead_ids, context=context):
-            if (this.send_to == 'partner' and this.partner_id):
-                lead.assign_partner(cr, uid, [case.id], this.partner_id.id, context=context)
+        # for case in lead.browse(cr, uid, lead_ids, context=context):
+            # TODO: WHAT TO DO WITH THAT ?
+            # if (this.send_to == 'partner' and this.partner_id):
+            #     lead.assign_partner(cr, uid, [case.id], this.partner_id.id, context=context)
 
-            if this.send_to == 'user':
-                lead.allocate_salesman(cr, uid, [case.id], [this.user_id.id], context=context)
-
-            email_cc = to_email(case.email_cc)
-            email_cc = email_cc and email_cc[0] or ''
-            new_cc = []
-            if email_cc:
-                new_cc.append(email_cc)
-            for to in this.email_to.split(','):
-                email_to = to_email(to)
-                email_to = email_to and email_to[0] or ''
-                if email_to not in new_cc:
-                    new_cc.append(to)
-            update_vals = {'email_cc' : ', '.join(new_cc) }
-            lead.write(cr, uid, [case.id], update_vals, context=context)
+            # if this.send_to == 'user':
+            #     lead.allocate_salesman(cr, uid, [case.id], [this.user_id.id], context=context)
         return res
 
-    def _get_info_body_text(self, cr, uid, lead, context=None):
+    def _get_info_body(self, cr, uid, lead, context=None):
         field_names = []
         proxy = self.pool.get(lead._name)
         if lead.type == 'opportunity':
             field_names += ['partner_id']
         field_names += [
-           'partner_name' , 'title', 'function', 'street', 'street2',
+            'partner_name' , 'title', 'function', 'street', 'street2',
             'zip', 'city', 'country_id', 'state_id', 'email_from',
             'phone', 'fax', 'mobile', 'categ_id', 'description',
         ]
-        return proxy._mail_body_text(cr, uid, lead, field_names, context=context)
+        return proxy._mail_body(cr, uid, lead, field_names, context=context)
 
-    def _get_message_body_text(self, cr, uid, lead, mode='whole', context=None):
-        """This function gets whole communication history and returns as top posting style
+    def _get_message_body(self, cr, uid, lead, history_mode='whole', context=None):
+        """ This function gets whole communication history and returns as top
+            posting style
+            #1: form a body, based on the lead
+            #2: append to the body the communication history, based on the
+                history_mode parameter
+
+            - info: Forward the case information
+            - latest: Send the latest history
+            - whole: Send the whole history
+
+            :param lead: browse_record on crm.lead
+            :param history_mode: 'whole' or 'latest'
         """
         mail_message = self.pool.get('mail.message')
-        message_ids = []
-        body = self._get_info_body_text(cr, uid, lead, context=context)
-        if mode in ('whole', 'latest'):
-            message_ids = lead.message_ids
-            message_ids = map(lambda x: x.id, filter(lambda x: x.email_from, message_ids))
-            if mode == 'latest' and len(message_ids):
-                message_ids = [message_ids[0]]
-            for message in mail_message.browse(cr, uid, message_ids, context=context):
-                header = '-------- Original Message --------'
-                sender = 'From: %s' %(message.email_from or '')
-                to = 'To: %s' % (message.email_to or '')
-                sentdate = 'Date: %s' % (message.date or '')
-                desc = '\n%s'%(message.body_text)
-                original = [header, sender, to, sentdate, desc, '\n']
-                original = '\n'.join(original)
-                body += original
+        body = self._get_info_body(cr, uid, lead, context=context)
+        if history_mode not in ('whole', 'latest'):
+            return body or ''
+        for message in lead.message_ids:
+            header = '-------- Original Message --------'
+            sentdate = 'Date: %s' % (message.date or '')
+            desc = '\n%s'%(message.body)
+            original = [header, sentdate, desc, '\n']
+            original = '\n'.join(original)
+            body += original
+            if history_mode == 'latest':
+                break
         return body or ''
 
-    def get_value(self, cr, uid, model, res_id, context=None):
-        if context is None:
-            context = {}
-        res = super(crm_lead_forward_to_partner, self).get_value(cr, uid,  model, res_id, context=context)
-        if model not in ("crm.lead"):
-            return res
-        proxy = self.pool.get(model)
-        partner = self.pool.get('res.partner')
-        lead = proxy.browse(cr, uid, res_id, context=context)
-        mode = context.get('mail.compose.message.mode')
-        if mode == "forward":
-            body_type = context.get('mail.compose.message.body')
-            email_cc = res.get('email_cc', "")
-            email = res.get('email_to', "")
-            subject = '%s: %s - %s' % (_('Fwd'), 'Lead forward', lead.name)
-            body = self._get_message_body_text(cr, uid, lead, body_type, context=context)
-            partner_assigned_id = lead.partner_assigned_id and lead.partner_assigned_id.id or False
-            user_id = False
-            if not partner_assigned_id:
-                partner_assigned_id = proxy.search_geo_partner(cr, uid, [lead.id], context=None).get(lead.id, False)
-            if partner_assigned_id:
-                assigned_partner = partner.browse(cr, uid, partner_assigned_id, context=context)
-                user_id = assigned_partner.user_id and assigned_partner.user_id.id or False
-                email_cc = assigned_partner.user_id and assigned_partner.user_id.email or ''
-                email = assigned_partner.email
-            
-            res.update({
-                'subject' : subject,
-                'body_text' : body,
-                'email_cc' : email_cc,
-                'email_to' : email,
-                'partner_assigned_id': partner_assigned_id,
-                'user_id': user_id,
-            })
-        return res
-        
 
-    def default_get(self, cr, uid, fields, context=None):
-        if context is None:
-            context = {}
-        context['mail.compose.message.mode'] = 'forward'
-        context['mail.compose.message.body'] = 'info'
-        return super(crm_lead_forward_to_partner, self).default_get(cr, uid, fields, context=context)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
index cecf73954e5..0d8f27eec74 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner_view.xml
@@ -7,42 +7,31 @@
             <field name="model">crm.lead.forward.to.partner</field>
             <field name="arch" type="xml">
                 <form string="Send Mail" version="7.0">
+                    <field name="composition_mode" colspan="2" nolabel="1" invisible="1"/>
+                    <field name="model" colspan="2" nolabel="1" invisible="1"/>
+                    <field name="res_id" colspan="2" nolabel="1" invisible="1"/>
                     <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="send_to" colspan="2"/>
-                        <group col="2" colspan="2" attrs="{ 'invisible' : [('send_to','!=','user')]}">
-                            <field name="user_id"
-                                attrs="{ 'required' : [('send_to','=','user')]}"
-                                on_change="on_change_email(user_id)"/>
-                        </group>
-                        <group col="4" colspan="4" attrs="{'invisible' : [('send_to','!=','partner')]}">
-                            <field name="partner_id" attrs="{'required' : [('send_to','=','partner')]}" on_change="on_change_partner(partner_id)" colspan="2"/>
-                        </group>
+                    <group col="4">
+                        <field name="history_mode" colspan="4"
+                            on_change="on_change_history_mode(history_mode, model, res_id)"/>
+                        <field name="subject" colspan="4"/>
+                        <field name="partner_ids" colspan="4" widget="many2many_tags"
+                            on_change="onchange_partner_ids(partner_ids)"/>
+                        <notebook colspan="4">
+                            <page string="Body">
+                                <field name="body"/>
+                            </page>
+                            <page string="Attachments">
+                                <field name="attachment_ids"/>
+                            </page>
+                        </notebook>
                     </group>
-                    <separator string="" colspan="4"/>
-                    <group col="6" colspan="4">
-                        <field name="email_from" colspan="4" required="1"/>
-                        <field name="email_to" colspan="4" required="1"/>
-                        <field name="email_cc" colspan="4"/>
-                        <field name="email_bcc" colspan="4"/>
-                        <field name="reply_to" colspan="4"/>
-                        <field name="subject" colspan="4" widget="char" size="512"/>
-                    </group>
-                    <separator string="" colspan="4"/>
-                    <notebook colspan="4">
-                        <page string="Body">
-                            <field name="body_text" colspan="4" nolabel="1"/>
-                        </page>
-                        <page string="Attachments">
-                            <label string="Add here all attachments of the current document you want to include in the Email." colspan="4"/>
-                            <field name="attachment_ids" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
                     <footer>
-                        <button name="action_forward" string="Send" type="object" class="oe_highlight"/>
+                        <button name="action_forward" string="Send" type="object"
+                            class="oe_highlight"/>
                         or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
+                        <button string="Cancel" special="cancel"
+                            class="oe_link"/>
                     </footer>
                 </form>
             </field>
@@ -57,18 +46,14 @@
             <field name="target">new</field>
         </record>
 
-
-
         <act_window id="action_crm_send_mass_forward"
             multi="True"
             key2="client_action_multi" name="Mass forward to partner"
             res_model="crm.lead.forward.to.partner" src_model="crm.lead"
             view_mode="form" target="new" view_type="form"
-            context="{'mail.compose.message.mode' : 'mass_mail'}"
+            context="{'default_composition_mode' : 'mass_mail'}"
             view_id="crm_lead_forward_to_partner_form"
-       />
-
-
+        />
 
     </data>
 </openerp>
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 68594281b9b..4f182f4d447 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -35,21 +35,18 @@ questionnaire and directly use it on a partner.
 It also has been merged with the earlier CRM & SRM segmentation tool because they 
 were overlapping.
 
-    * Note: this module is not compatible with the module segmentation, since 
-            it's the same which has been renamed.
+    **Note:** this module is not compatible with the module segmentation, since it's the same which has been renamed.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'crm'],
-    'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv', 'wizard/open_questionnaire_view.xml', 'crm_profiling_view.xml'],
-    'demo_xml': ['crm_profiling_demo.xml'],
+    'data': ['security/ir.model.access.csv', 'wizard/open_questionnaire_view.xml', 'crm_profiling_view.xml'],
+    'demo': ['crm_profiling_demo.xml'],
     'test': [
         #'test/process/profiling.yml', #TODO:It's not debuging because problem to write data for open.questionnaire from partner section.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0033984979005',
     'images': ['images/profiling_questionnaires.jpeg','images/profiling_questions.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index 4cc54a8d3d4..7dc72f80289 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -77,7 +77,7 @@ def _get_parents(cr, uid, ids):
     return ids_to_check
 
 
-def test_prof(cr, uid, seg_id, pid, answers_ids = []):
+def test_prof(cr, uid, seg_id, pid, answers_ids=None):
 
     """ return True if the partner pid fetch the segmentation rule seg_id
         @param cr: the current row, from the database cursor,
@@ -244,6 +244,7 @@ class crm_segmentation(osv.osv):
             @param uid: the current user’s ID for security checks,
             @param ids: List of crm segmentation’s IDs """
 
+        partner_obj = self.pool.get('res.partner')
         categs = self.read(cr,uid,ids,['categ_id','exclusif','partner_id', \
                             'sales_purchase_active', 'profiling_active'])
         for categ in categs:
@@ -280,8 +281,10 @@ class crm_segmentation(osv.osv):
                 for pid in to_remove_list:
                     partners.remove(pid)
 
-            for partner_id in partners:
-                cr.execute('insert into res_partner_res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id))
+            for partner in partner_obj.browse(cr, uid, partners):
+                category_ids = [categ_id.id for categ_id in partner.category_id]
+                if categ['categ_id'][0] not in category_ids:
+                    cr.execute('insert into res_partner_res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner.id))
 
             self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
         return True
diff --git a/addons/crm_profiling/crm_profiling_view.xml b/addons/crm_profiling/crm_profiling_view.xml
index 1e894b456c0..dacbca0b3c6 100644
--- a/addons/crm_profiling/crm_profiling_view.xml
+++ b/addons/crm_profiling/crm_profiling_view.xml
@@ -124,7 +124,7 @@
         <field name="inherit_id" ref="base.view_partner_form"/>
         <field name="arch" type="xml">
             <notebook position="inside">
-                <page string="Profiling">
+                <page string="Profiling" groups="base.group_user">
                   <button string="Use a questionnaire"
                       name="%(action_open_questionnaire)d" type="action" colspan="1"
                       icon="gtk-justify-fill" />
diff --git a/addons/crm_profiling/i18n/ar.po b/addons/crm_profiling/i18n/ar.po
index 4e288764ee1..ca34353999b 100644
--- a/addons/crm_profiling/i18n/ar.po
+++ b/addons/crm_profiling/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/bg.po b/addons/crm_profiling/i18n/bg.po
index aa3d39cafe4..94ef7d7bfe2 100644
--- a/addons/crm_profiling/i18n/bg.po
+++ b/addons/crm_profiling/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/bs.po b/addons/crm_profiling/i18n/bs.po
index 9ab36cd9b2a..6df9f6761df 100644
--- a/addons/crm_profiling/i18n/bs.po
+++ b/addons/crm_profiling/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ca.po b/addons/crm_profiling/i18n/ca.po
index 015701431ff..7267e6b464c 100644
--- a/addons/crm_profiling/i18n/ca.po
+++ b/addons/crm_profiling/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/cs.po b/addons/crm_profiling/i18n/cs.po
index b8b067ea552..802b28fac2c 100644
--- a/addons/crm_profiling/i18n/cs.po
+++ b/addons/crm_profiling/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/da.po b/addons/crm_profiling/i18n/da.po
index ec200a94112..6e48ac265be 100644
--- a/addons/crm_profiling/i18n/da.po
+++ b/addons/crm_profiling/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/de.po b/addons/crm_profiling/i18n/de.po
index 903ca170874..d0859236073 100644
--- a/addons/crm_profiling/i18n/de.po
+++ b/addons/crm_profiling/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/el.po b/addons/crm_profiling/i18n/el.po
index d11b4c42847..b868d27cb3c 100644
--- a/addons/crm_profiling/i18n/el.po
+++ b/addons/crm_profiling/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/crm_profiling/i18n/en_GB.po b/addons/crm_profiling/i18n/en_GB.po
index 5c06199a817..8ddaa39989a 100644
--- a/addons/crm_profiling/i18n/en_GB.po
+++ b/addons/crm_profiling/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es.po b/addons/crm_profiling/i18n/es.po
index 8f306933852..26c819e3ae2 100644
--- a/addons/crm_profiling/i18n/es.po
+++ b/addons/crm_profiling/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es_AR.po b/addons/crm_profiling/i18n/es_AR.po
index 56bb7c5d81d..a2225ff1bf1 100644
--- a/addons/crm_profiling/i18n/es_AR.po
+++ b/addons/crm_profiling/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es_CR.po b/addons/crm_profiling/i18n/es_CR.po
index 1dab03e360a..fcf9be0f862 100644
--- a/addons/crm_profiling/i18n/es_CR.po
+++ b/addons/crm_profiling/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/es_EC.po b/addons/crm_profiling/i18n/es_EC.po
index 4683c1f1749..e4471347927 100644
--- a/addons/crm_profiling/i18n/es_EC.po
+++ b/addons/crm_profiling/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/es_PY.po b/addons/crm_profiling/i18n/es_PY.po
index c50d38652ab..a40b2e83679 100644
--- a/addons/crm_profiling/i18n/es_PY.po
+++ b/addons/crm_profiling/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/et.po b/addons/crm_profiling/i18n/et.po
index 687ff3f6ed8..d4cb4fba4e1 100644
--- a/addons/crm_profiling/i18n/et.po
+++ b/addons/crm_profiling/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/fi.po b/addons/crm_profiling/i18n/fi.po
index 402d48c3a18..2604ad452f7 100644
--- a/addons/crm_profiling/i18n/fi.po
+++ b/addons/crm_profiling/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/fr.po b/addons/crm_profiling/i18n/fr.po
index d73cb9ec4b2..970d32f1545 100644
--- a/addons/crm_profiling/i18n/fr.po
+++ b/addons/crm_profiling/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/gl.po b/addons/crm_profiling/i18n/gl.po
index d75b0528b24..4f743cb9911 100644
--- a/addons/crm_profiling/i18n/gl.po
+++ b/addons/crm_profiling/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/gu.po b/addons/crm_profiling/i18n/gu.po
index 5fea19b2ed8..52f5ac82217 100644
--- a/addons/crm_profiling/i18n/gu.po
+++ b/addons/crm_profiling/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/hr.po b/addons/crm_profiling/i18n/hr.po
index 637e8885b88..4da73604953 100644
--- a/addons/crm_profiling/i18n/hr.po
+++ b/addons/crm_profiling/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/hu.po b/addons/crm_profiling/i18n/hu.po
index 52c05d01e5a..d6334c4237d 100644
--- a/addons/crm_profiling/i18n/hu.po
+++ b/addons/crm_profiling/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/id.po b/addons/crm_profiling/i18n/id.po
index 174fda8f7ec..f82cc65755d 100644
--- a/addons/crm_profiling/i18n/id.po
+++ b/addons/crm_profiling/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/it.po b/addons/crm_profiling/i18n/it.po
index 7cb0b549ae5..37247fa86bc 100644
--- a/addons/crm_profiling/i18n/it.po
+++ b/addons/crm_profiling/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ja.po b/addons/crm_profiling/i18n/ja.po
index ef0a9c5595a..4bf900b1e6f 100644
--- a/addons/crm_profiling/i18n/ja.po
+++ b/addons/crm_profiling/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ko.po b/addons/crm_profiling/i18n/ko.po
index 388b1543f8c..546225589ce 100644
--- a/addons/crm_profiling/i18n/ko.po
+++ b/addons/crm_profiling/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/lt.po b/addons/crm_profiling/i18n/lt.po
index 29c7417e4d7..faaaca826d7 100644
--- a/addons/crm_profiling/i18n/lt.po
+++ b/addons/crm_profiling/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/lv.po b/addons/crm_profiling/i18n/lv.po
index bd61cf86778..945ff4a9a0e 100644
--- a/addons/crm_profiling/i18n/lv.po
+++ b/addons/crm_profiling/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/mn.po b/addons/crm_profiling/i18n/mn.po
index be36fa5aa50..72f36e60a03 100644
--- a/addons/crm_profiling/i18n/mn.po
+++ b/addons/crm_profiling/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/nb.po b/addons/crm_profiling/i18n/nb.po
new file mode 100644
index 00000000000..ca7ef0af148
--- /dev/null
+++ b/addons/crm_profiling/i18n/nb.po
@@ -0,0 +1,212 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-06 14:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+msgid "Questions List"
+msgstr "Spørsmål liste."
+
+#. module: crm_profiling
+#: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
+msgid ""
+"You can create specific topic-related questionnaires to guide your team(s) "
+"in the sales cycle by helping them to ask the right questions. The "
+"segmentation tool allows you to automatically assign a partner to a category "
+"according to his answers to the different questionnaires."
+msgstr ""
+"Du kan opprette spesifikke tema-relaterte spørreskjemaer for å styre lag (e) "
+"i salgsperioden ved å hjelpe dem til å stille de riktige spørsmålene. "
+"Segmentering verktøyet lar deg automatisk tildele en partner til en kategori "
+"i henhold til hans svar til de ulike spørreskjemaer."
+
+#. 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
+#: field:open.questionnaire.line,question_id:0
+msgid "Question"
+msgstr "Spørsmål"
+
+#. module: crm_profiling
+#: model:ir.actions.act_window,name:crm_profiling.action_open_questionnaire
+#: view:open.questionnaire:0
+msgid "Open Questionnaire"
+msgstr "åpen Spørreskjema"
+
+#. module: crm_profiling
+#: field:crm.segmentation,child_ids:0
+msgid "Child Profiles"
+msgstr "Barn profiler"
+
+#. module: crm_profiling
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "Partner segmenteringer"
+
+#. module: crm_profiling
+#: field:crm_profiling.answer,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_answer
+#: field:open.questionnaire.line,answer_id:0
+msgid "Answer"
+msgstr "Svar"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_open_questionnaire_line
+msgid "open.questionnaire.line"
+msgstr "Åpen.Spørreskjema.Linje"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr "Partnersegmentering"
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Profiling"
+msgstr "Profilering"
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+#: field:crm_profiling.questionnaire,description:0
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_no:0
+msgid "Excluded Answers"
+msgstr "Ekskluderte svar"
+
+#. module: crm_profiling
+#: view:crm_profiling.answer:0
+#: view:crm_profiling.question:0
+#: field:res.partner,answers_ids:0
+msgid "Answers"
+msgstr "Svar"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_open_questionnaire
+msgid "open.questionnaire"
+msgstr "Åpen.Spørresjema"
+
+#. module: crm_profiling
+#: field:open.questionnaire,questionnaire_id:0
+msgid "Questionnaire name"
+msgstr "Spørresjema navn."
+
+#. module: crm_profiling
+#: view:res.partner:0
+msgid "Use a questionnaire"
+msgstr "Bruk et spørresjema."
+
+#. module: crm_profiling
+#: view:open.questionnaire:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: crm_profiling
+#: field:open.questionnaire,question_ans_ids:0
+msgid "Question / Answers"
+msgstr "Spørsmål / Svar"
+
+#. 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
+#: view:open.questionnaire:0
+msgid "Questionnaires"
+msgstr "Spørreskjemaer"
+
+#. 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 ""
+"Kryss av her hvis du ønsker å bruke denne kategorien som en del av "
+"segmentering regelen. Hvis det ikke er merket, vil kriteriene under bli "
+"ignorert."
+
+#. module: crm_profiling
+#: constraint:crm.segmentation:0
+msgid "Error ! You can not create recursive profiles."
+msgstr "Feil ! Du kan ikke lage rekursive profiler."
+
+#. module: crm_profiling
+#: field:crm.segmentation,profiling_active:0
+msgid "Use The Profiling Rules"
+msgstr "Bruk profileringen Regler"
+
+#. module: crm_profiling
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.question,answers_ids:0
+msgid "Avalaible Answers"
+msgstr ""
+
+#. module: crm_profiling
+#: field:crm.segmentation,answer_yes:0
+msgid "Included Answers"
+msgstr "Inkluderte svar."
+
+#. module: crm_profiling
+#: view:crm_profiling.question:0
+#: field:crm_profiling.questionnaire,questions_ids:0
+#: model:ir.actions.act_window,name:crm_profiling.open_questions
+#: model:ir.ui.menu,name:crm_profiling.menu_segm_answer
+msgid "Questions"
+msgstr "Spørsmål"
+
+#. module: crm_profiling
+#: field:crm.segmentation,parent_id:0
+msgid "Parent Profile"
+msgstr "Overordnede profil"
+
+#. module: crm_profiling
+#: view:open.questionnaire:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: crm_profiling
+#: code:addons/crm_profiling/wizard/open_questionnaire.py:77
+#: field:crm_profiling.questionnaire,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
+#: view:open.questionnaire:0
+#: view:open.questionnaire.line:0
+#: field:open.questionnaire.line,wizard_id:0
+#, python-format
+msgid "Questionnaire"
+msgstr "Spørreskjemaet"
+
+#. module: crm_profiling
+#: view:open.questionnaire:0
+msgid "Save Data"
+msgstr "Lagre data"
+
+#~ msgid "Avalaible answers"
+#~ msgstr "Tilgjengelige svar."
diff --git a/addons/crm_profiling/i18n/nl.po b/addons/crm_profiling/i18n/nl.po
index e35cd232166..e9f29d7027b 100644
--- a/addons/crm_profiling/i18n/nl.po
+++ b/addons/crm_profiling/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/nl_BE.po b/addons/crm_profiling/i18n/nl_BE.po
index 56965202abb..7319d660f1c 100644
--- a/addons/crm_profiling/i18n/nl_BE.po
+++ b/addons/crm_profiling/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/pl.po b/addons/crm_profiling/i18n/pl.po
index 0a7933e888b..43af5588199 100644
--- a/addons/crm_profiling/i18n/pl.po
+++ b/addons/crm_profiling/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/pt.po b/addons/crm_profiling/i18n/pt.po
index fef3bf04c5c..1bbb0f27b5b 100644
--- a/addons/crm_profiling/i18n/pt.po
+++ b/addons/crm_profiling/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/pt_BR.po b/addons/crm_profiling/i18n/pt_BR.po
index 3deee53d950..9dc42c73164 100644
--- a/addons/crm_profiling/i18n/pt_BR.po
+++ b/addons/crm_profiling/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -69,7 +69,7 @@ msgstr "Resposta"
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_open_questionnaire_line
 msgid "open.questionnaire.line"
-msgstr "abrir.linha"
+msgstr "open.questionnaire.line"
 
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_crm_segmentation
@@ -155,7 +155,7 @@ msgstr "Use as Regras de Criação de Perfil"
 #. module: crm_profiling
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursivamente a membros associados."
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
diff --git a/addons/crm_profiling/i18n/ro.po b/addons/crm_profiling/i18n/ro.po
index d40999febce..11b6451cfe9 100644
--- a/addons/crm_profiling/i18n/ro.po
+++ b/addons/crm_profiling/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/ru.po b/addons/crm_profiling/i18n/ru.po
index 9096decb1fa..2e250154319 100644
--- a/addons/crm_profiling/i18n/ru.po
+++ b/addons/crm_profiling/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -68,12 +68,12 @@ msgstr "Ответ"
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_open_questionnaire_line
 msgid "open.questionnaire.line"
-msgstr ""
+msgstr "open.questionnaire.line"
 
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr "Классификация партнера"
+msgstr "Сегментация партнера"
 
 #. module: crm_profiling
 #: view:res.partner:0
@@ -101,7 +101,7 @@ msgstr "Ответы"
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_open_questionnaire
 msgid "open.questionnaire"
-msgstr ""
+msgstr "open.questionnaire"
 
 #. module: crm_profiling
 #: field:open.questionnaire,questionnaire_id:0
@@ -116,12 +116,12 @@ msgstr "Использовать опросник"
 #. module: crm_profiling
 #: view:open.questionnaire:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Отмена"
 
 #. module: crm_profiling
 #: field:open.questionnaire,question_ans_ids:0
 msgid "Question / Answers"
-msgstr ""
+msgstr "Вопрос / ответы"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -150,12 +150,12 @@ msgstr "Ошибка ! Вы не можете создать зацикленн
 #. module: crm_profiling
 #: field:crm.segmentation,profiling_active:0
 msgid "Use The Profiling Rules"
-msgstr "Используйте Правила Профилирования"
+msgstr "Используйте правила профилирования"
 
 #. module: crm_profiling
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -179,7 +179,7 @@ msgstr "Вопросы"
 #. module: crm_profiling
 #: field:crm.segmentation,parent_id:0
 msgid "Parent Profile"
-msgstr "Родительский Профиль"
+msgstr "Родительский профиль"
 
 #. module: crm_profiling
 #: view:open.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sk.po b/addons/crm_profiling/i18n/sk.po
index 708e6b0ad9e..02fc1dd73c0 100644
--- a/addons/crm_profiling/i18n/sk.po
+++ b/addons/crm_profiling/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sl.po b/addons/crm_profiling/i18n/sl.po
index 00915158102..44e8dcf8f60 100644
--- a/addons/crm_profiling/i18n/sl.po
+++ b/addons/crm_profiling/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sq.po b/addons/crm_profiling/i18n/sq.po
index 548b9e13c1f..9d795ea4d96 100644
--- a/addons/crm_profiling/i18n/sq.po
+++ b/addons/crm_profiling/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sr.po b/addons/crm_profiling/i18n/sr.po
index b8cfb81ab7b..98b6bbcd65f 100644
--- a/addons/crm_profiling/i18n/sr.po
+++ b/addons/crm_profiling/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sr@latin.po b/addons/crm_profiling/i18n/sr@latin.po
index 145a067d28b..8a64f9c6daa 100644
--- a/addons/crm_profiling/i18n/sr@latin.po
+++ b/addons/crm_profiling/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/sv.po b/addons/crm_profiling/i18n/sv.po
index 62d7e64ecdc..9b992f4459d 100644
--- a/addons/crm_profiling/i18n/sv.po
+++ b/addons/crm_profiling/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/tlh.po b/addons/crm_profiling/i18n/tlh.po
index d573b5d8e99..7e4617ae721 100644
--- a/addons/crm_profiling/i18n/tlh.po
+++ b/addons/crm_profiling/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po
index e1faa9a2bb7..a8387e8c98b 100644
--- a/addons/crm_profiling/i18n/tr.po
+++ b/addons/crm_profiling/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/uk.po b/addons/crm_profiling/i18n/uk.po
index 405f0c0921d..e363c7f649a 100644
--- a/addons/crm_profiling/i18n/uk.po
+++ b/addons/crm_profiling/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/vi.po b/addons/crm_profiling/i18n/vi.po
index 318a0411c11..61983cf22b7 100644
--- a/addons/crm_profiling/i18n/vi.po
+++ b/addons/crm_profiling/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/zh_CN.po b/addons/crm_profiling/i18n/zh_CN.po
index 95834983223..0c37bd006fa 100644
--- a/addons/crm_profiling/i18n/zh_CN.po
+++ b/addons/crm_profiling/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
diff --git a/addons/crm_profiling/i18n/zh_TW.po b/addons/crm_profiling/i18n/zh_TW.po
index 8b2e24dab05..bd5ca8d0ebc 100644
--- a/addons/crm_profiling/i18n/zh_TW.po
+++ b/addons/crm_profiling/i18n/zh_TW.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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:26+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
+"PO-Revision-Date: 2012-08-29 08:56+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
 msgid "Questions List"
-msgstr "問題表"
+msgstr "問題列表"
 
 #. module: crm_profiling
 #: model:ir.actions.act_window,help:crm_profiling.open_questionnaires
@@ -28,7 +28,7 @@ msgid ""
 "in the sales cycle by helping them to ask the right questions. The "
 "segmentation tool allows you to automatically assign a partner to a category "
 "according to his answers to the different questionnaires."
-msgstr ""
+msgstr "你能建立特定主題的問卷調查去指導你的團隊在銷售週期向客戶詢問合適的問題。這細分工具能根據不同問題的答案自動劃分業務夥伴到不同的類型。"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
@@ -47,12 +47,12 @@ msgstr "開啟問卷"
 #. module: crm_profiling
 #: field:crm.segmentation,child_ids:0
 msgid "Child Profiles"
-msgstr ""
+msgstr "子客戶特徵"
 
 #. module: crm_profiling
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr "伙伴分割"
+msgstr "業務夥伴分類"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
@@ -64,17 +64,17 @@ msgstr "答案"
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_open_questionnaire_line
 msgid "open.questionnaire.line"
-msgstr ""
+msgstr "open.questionnaire.line"
 
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_crm_segmentation
 msgid "Partner Segmentation"
-msgstr "伙伴區間"
+msgstr "業務夥伴分類"
 
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Profiling"
-msgstr ""
+msgstr "紀錄運行效能(Profiling)"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -97,7 +97,7 @@ msgstr "答案"
 #. module: crm_profiling
 #: model:ir.model,name:crm_profiling.model_open_questionnaire
 msgid "open.questionnaire"
-msgstr ""
+msgstr "open.questionnaire"
 
 #. module: crm_profiling
 #: field:open.questionnaire,questionnaire_id:0
@@ -112,12 +112,12 @@ msgstr "使用問卷"
 #. module: crm_profiling
 #: view:open.questionnaire:0
 msgid "_Cancel"
-msgstr ""
+msgstr "取消（_C）"
 
 #. module: crm_profiling
 #: field:open.questionnaire,question_ans_ids:0
 msgid "Question / Answers"
-msgstr ""
+msgstr "問/答"
 
 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@@ -133,22 +133,22 @@ 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 "勾選這選項，如果你想使用這標籤作為細分規則的一部分。如果勾選，這規則將被忽略"
 
 #. 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
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "錯誤! 您不能建立相關的會員用戶"
 
 #. module: crm_profiling
 #: view:crm_profiling.question:0
@@ -172,7 +172,7 @@ msgstr "問題"
 #. module: crm_profiling
 #: field:crm.segmentation,parent_id:0
 msgid "Parent Profile"
-msgstr ""
+msgstr "上級客戶簡介"
 
 #. module: crm_profiling
 #: view:open.questionnaire:0
diff --git a/addons/crm_profiling/security/ir.model.access.csv b/addons/crm_profiling/security/ir.model.access.csv
index 24fd7009c6a..71149a912ee 100644
--- a/addons/crm_profiling/security/ir.model.access.csv
+++ b/addons/crm_profiling/security/ir.model.access.csv
@@ -1,6 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_crm_profiling_answer_salesman,crm_profiling.answer.salesman,model_crm_profiling_answer,base.group_sale_salesman,1,1,1,0
 access_crm_profiling_answer_manager,crm_profiling.answer.manager,model_crm_profiling_answer,base.group_sale_manager,1,1,1,1
+access_crm_profiling_answer_user,crm_profiling.answer.user,model_crm_profiling_answer,base.group_user,1,0,0,0
 access_crm_profiling_question_salesman,crm_profiling.question.salesman,model_crm_profiling_question,base.group_sale_salesman,1,1,1,0
 access_crm_profiling_question_manager,crm_profiling.question.manager,model_crm_profiling_question,base.group_sale_manager,1,1,1,1
 access_crm_profiling_questionnarie_salesman,crm_profiling.questionnarie.salesman,model_crm_profiling_questionnaire,base.group_sale_salesman,1,1,1,0
diff --git a/addons/crm_profiling/wizard/open_questionnaire_view.xml b/addons/crm_profiling/wizard/open_questionnaire_view.xml
index 8da8533f494..d51d36425d0 100644
--- a/addons/crm_profiling/wizard/open_questionnaire_view.xml
+++ b/addons/crm_profiling/wizard/open_questionnaire_view.xml
@@ -34,7 +34,7 @@
             <field name="arch" type="xml">
                 <form string="Open Questionnaire" version="7.0">
                     <separator colspan="4" string="Questionnaire"/>
-                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree,form" width="550" height="200"/>
+                    <field name="question_ans_ids" colspan="4" nolabel="1" mode="tree" width="550" height="200"/>
                     <footer>
                         <button name="questionnaire_compute" string="Save Data" type="object" class="oe_highlight"/>
                         or
diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py
index 824dac13c21..255f7dce1c3 100644
--- a/addons/crm_todo/__openerp__.py
+++ b/addons/crm_todo/__openerp__.py
@@ -23,18 +23,15 @@
 {
     'name': 'Tasks on CRM',
     'version': '1.0',
-    "category": 'Customer Relationship Management',
+    'category': 'Customer Relationship Management',
     'description': """
 Todo list for CRM leads and opportunities.
+==========================================
     """,
     'author': 'OpenERP SA',
     'depends': ['crm','project_gtd'],
-    'update_xml': [
-        'crm_todo_view.xml',
-    ],
-    'demo': [
-        'crm_todo_demo.xml',
-    ],
+    'data': ['crm_todo_view.xml'],
+    'demo': ['crm_todo_demo.xml'],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/crm_todo/i18n/ar.po b/addons/crm_todo/i18n/ar.po
index a1228c2f027..a77e0531e4e 100644
--- a/addons/crm_todo/i18n/ar.po
+++ b/addons/crm_todo/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/de.po b/addons/crm_todo/i18n/de.po
index 6b8fbe1f16f..e50c19f7c3a 100644
--- a/addons/crm_todo/i18n/de.po
+++ b/addons/crm_todo/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/en_GB.po b/addons/crm_todo/i18n/en_GB.po
index e8f5ca46b1f..25e04f306cf 100644
--- a/addons/crm_todo/i18n/en_GB.po
+++ b/addons/crm_todo/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/es.po b/addons/crm_todo/i18n/es.po
new file mode 100644
index 00000000000..0749835649b
--- /dev/null
+++ b/addons/crm_todo/i18n/es.po
@@ -0,0 +1,96 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-11-06 15:26+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-07 04:38+0000\n"
+"X-Generator: Launchpad (build 16232)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr "Periodo de tiempo"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr "Para cancelar la tarea"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.iniciativa"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "Siguiente"
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr "Mis tareas"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "Tareas"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No se pueden crear tareas recursivas."
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr "Iniciativa / Oportunidad"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr "Para cambiar a estado 'Realizada'"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "Anterior"
diff --git a/addons/crm_todo/i18n/es_CR.po b/addons/crm_todo/i18n/es_CR.po
index a6293c64cde..9acdded80c6 100644
--- a/addons/crm_todo/i18n/es_CR.po
+++ b/addons/crm_todo/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/fi.po b/addons/crm_todo/i18n/fi.po
index 481421e8d29..8a078356721 100644
--- a/addons/crm_todo/i18n/fi.po
+++ b/addons/crm_todo/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/fr.po b/addons/crm_todo/i18n/fr.po
index 5436af50b3a..42cdac23059 100644
--- a/addons/crm_todo/i18n/fr.po
+++ b/addons/crm_todo/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/gu.po b/addons/crm_todo/i18n/gu.po
index 16a415cfde6..14a42fd2d8f 100644
--- a/addons/crm_todo/i18n/gu.po
+++ b/addons/crm_todo/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/it.po b/addons/crm_todo/i18n/it.po
index 012a769a70a..f906b76fb94 100644
--- a/addons/crm_todo/i18n/it.po
+++ b/addons/crm_todo/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/ja.po b/addons/crm_todo/i18n/ja.po
index 49855e7d195..9935aceb157 100644
--- a/addons/crm_todo/i18n/ja.po
+++ b/addons/crm_todo/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/lt.po b/addons/crm_todo/i18n/lt.po
index 92a1a6b1426..385ca8c5bcf 100644
--- a/addons/crm_todo/i18n/lt.po
+++ b/addons/crm_todo/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/mn.po b/addons/crm_todo/i18n/mn.po
index 1b3b6ed69ee..836a56ed0d2 100644
--- a/addons/crm_todo/i18n/mn.po
+++ b/addons/crm_todo/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/nb.po b/addons/crm_todo/i18n/nb.po
new file mode 100644
index 00000000000..ce93d962975
--- /dev/null
+++ b/addons/crm_todo/i18n/nb.po
@@ -0,0 +1,95 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-04 14:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "Oppgave"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr "Timeboks"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr "For å avbryte oppgaven"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Feil! Oppgave sluttdato må være større enn oppgave startdato"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "Neste"
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr "Mine oppgaver"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "Oppgaver"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "Utført"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Feil! Du kan ikke lage en rekursive oppgaver."
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Ekstra informasjon"
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr "Lede / mulighet"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr "For å bytte til ferdig tilstand"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "Tidligere"
diff --git a/addons/crm_todo/i18n/nl.po b/addons/crm_todo/i18n/nl.po
index f0f357bddeb..720ccb54594 100644
--- a/addons/crm_todo/i18n/nl.po
+++ b/addons/crm_todo/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/pl.po b/addons/crm_todo/i18n/pl.po
index 36ae9707f34..d4607667180 100644
--- a/addons/crm_todo/i18n/pl.po
+++ b/addons/crm_todo/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/pt.po b/addons/crm_todo/i18n/pt.po
index d4170a80627..40679186a73 100644
--- a/addons/crm_todo/i18n/pt.po
+++ b/addons/crm_todo/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/pt_BR.po b/addons/crm_todo/i18n/pt_BR.po
index 5c8e5657723..e29368ed0bc 100644
--- a/addons/crm_todo/i18n/pt_BR.po
+++ b/addons/crm_todo/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
@@ -25,7 +25,7 @@ msgstr "Tarefa"
 #. module: crm_todo
 #: view:crm.lead:0
 msgid "Timebox"
-msgstr "Período de tempo"
+msgstr "Período de Tempo"
 
 #. module: crm_todo
 #: view:crm.lead:0
@@ -87,7 +87,7 @@ msgstr "Prospecção / Oportunidade"
 #. module: crm_todo
 #: view:crm.lead:0
 msgid "For changing to done state"
-msgstr "Para mudar o estado para feito"
+msgstr "Para mudar a situação para Concluído"
 
 #. module: crm_todo
 #: view:crm.lead:0
diff --git a/addons/crm_todo/i18n/ro.po b/addons/crm_todo/i18n/ro.po
index c0ebdc71182..03c25739674 100644
--- a/addons/crm_todo/i18n/ro.po
+++ b/addons/crm_todo/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/ru.po b/addons/crm_todo/i18n/ru.po
new file mode 100644
index 00000000000..23b6918f74e
--- /dev/null
+++ b/addons/crm_todo/i18n/ru.po
@@ -0,0 +1,96 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-14 06:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "Задачи"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr "Резерв времени"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr "Для отмены задачи"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Ошибка! Дата завершения задачи должна быть позднее чем дата начала задачи"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "Далее"
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr "Мои задачи"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "Задачи"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "Сделано"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Ошибка! Вы не можете создавать рекурсивные задачи."
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "Отмена"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "Доп. инфо."
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr "Кандидат / предложение"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr "Для смены в состояние \"Сделано\""
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "Назад"
diff --git a/addons/crm_todo/i18n/sr@latin.po b/addons/crm_todo/i18n/sr@latin.po
index 05161713988..2fe003c1628 100644
--- a/addons/crm_todo/i18n/sr@latin.po
+++ b/addons/crm_todo/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/sv.po b/addons/crm_todo/i18n/sv.po
index 56b6c302452..a7bccc22f33 100644
--- a/addons/crm_todo/i18n/sv.po
+++ b/addons/crm_todo/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/tr.po b/addons/crm_todo/i18n/tr.po
index 26fecb4b419..7d91f4cbc18 100644
--- a/addons/crm_todo/i18n/tr.po
+++ b/addons/crm_todo/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/zh_CN.po b/addons/crm_todo/i18n/zh_CN.po
index 9c6a8bd09bd..ed6d86ffd57 100644
--- a/addons/crm_todo/i18n/zh_CN.po
+++ b/addons/crm_todo/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
diff --git a/addons/crm_todo/i18n/zh_TW.po b/addons/crm_todo/i18n/zh_TW.po
new file mode 100644
index 00000000000..7eaefb6536b
--- /dev/null
+++ b/addons/crm_todo/i18n/zh_TW.po
@@ -0,0 +1,95 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-29 09:15+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_project_task
+msgid "Task"
+msgstr "任務"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Timebox"
+msgstr "時間區間"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For cancelling the task"
+msgstr "取消任務"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "錯誤！任務結束日期必須大於任務開始日期"
+
+#. module: crm_todo
+#: model:ir.model,name:crm_todo.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Next"
+msgstr "下一步"
+
+#. module: crm_todo
+#: model:ir.actions.act_window,name:crm_todo.crm_todo_action
+#: model:ir.ui.menu,name:crm_todo.menu_crm_todo
+msgid "My Tasks"
+msgstr "我的任務"
+
+#. module: crm_todo
+#: view:crm.lead:0
+#: field:crm.lead,task_ids:0
+msgid "Tasks"
+msgstr "任務"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Done"
+msgstr "完成"
+
+#. module: crm_todo
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "錯誤！不能創建循環引用的任務"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Cancel"
+msgstr "刪除"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Extra Info"
+msgstr "額外資訊"
+
+#. module: crm_todo
+#: field:project.task,lead_id:0
+msgid "Lead / Opportunity"
+msgstr "潛在客戶/機會"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "For changing to done state"
+msgstr "要設置為完成狀態"
+
+#. module: crm_todo
+#: view:crm.lead:0
+msgid "Previous"
+msgstr "前一頁"
diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py
index 9da1f2161a1..5360adbd6f2 100644
--- a/addons/decimal_precision/__openerp__.py
+++ b/addons/decimal_precision/__openerp__.py
@@ -20,25 +20,23 @@
 ##############################################################################
 
 {
-    "name": "Decimal Precision Configuration",
-    "description": """
+    'name': 'Decimal Precision Configuration',
+    'description': """
 Configure the price accuracy you need for different kinds of usage: accounting, sales, purchases.
 =================================================================================================
 
 The decimal precision is configured per company.
 """,
-    "author": "OpenERP SA",
-    "version": "0.1",
-    "depends": ["base"],
-    "category" : "Hidden/Dependency",
-    "init_xml": [],
-    "update_xml": [
+    'author': 'OpenERP SA',
+    'version': '0.1',
+    'depends': ['base'],
+    'category' : 'Hidden/Dependency',
+    'data': [
         'decimal_precision_view.xml',
         'security/ir.model.access.csv',
     ],
-    "demo_xml": [],
-    "installable": True,
-    "certificate" : "001307317809612974621",
+    'demo': [],
+    'installable': True,
     'images': ['images/1_decimal_accuracy_form.jpeg','images/1_decimal_accuracy_list.jpeg'],
 }
 
diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py
index d9f6aa7b8db..93d69eb3093 100644
--- a/addons/decimal_precision/decimal_precision.py
+++ b/addons/decimal_precision/decimal_precision.py
@@ -22,6 +22,7 @@
 from osv import osv, fields
 import tools
 import pooler
+from openerp import SUPERUSER_ID
 
 class decimal_precision(osv.osv):
     _name = 'decimal.precision'
@@ -56,7 +57,7 @@ decimal_precision()
 
 def get_precision(application):
     def change_digit(cr):
-        res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, application)
+        res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, application)
         return (16, res)
     return change_digit
 
diff --git a/addons/decimal_precision/i18n/ar.po b/addons/decimal_precision/i18n/ar.po
index ffe43df093e..2a097bd04e6 100644
--- a/addons/decimal_precision/i18n/ar.po
+++ b/addons/decimal_precision/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/bg.po b/addons/decimal_precision/i18n/bg.po
index 904f8b23333..e7cb61bf0f3 100644
--- a/addons/decimal_precision/i18n/bg.po
+++ b/addons/decimal_precision/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/ca.po b/addons/decimal_precision/i18n/ca.po
index b14c761b381..670cb568484 100644
--- a/addons/decimal_precision/i18n/ca.po
+++ b/addons/decimal_precision/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/cs.po b/addons/decimal_precision/i18n/cs.po
index c64062971eb..7484fda8dc8 100644
--- a/addons/decimal_precision/i18n/cs.po
+++ b/addons/decimal_precision/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/da.po b/addons/decimal_precision/i18n/da.po
index 5fc3e0e6878..193cc842f58 100644
--- a/addons/decimal_precision/i18n/da.po
+++ b/addons/decimal_precision/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/de.po b/addons/decimal_precision/i18n/de.po
index 08311b1b80f..448304f16e4 100644
--- a/addons/decimal_precision/i18n/de.po
+++ b/addons/decimal_precision/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/el.po b/addons/decimal_precision/i18n/el.po
index bfb6152a204..dd54ce59736 100644
--- a/addons/decimal_precision/i18n/el.po
+++ b/addons/decimal_precision/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/en_GB.po b/addons/decimal_precision/i18n/en_GB.po
index d40d28963b2..396317d98d4 100644
--- a/addons/decimal_precision/i18n/en_GB.po
+++ b/addons/decimal_precision/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/es.po b/addons/decimal_precision/i18n/es.po
index 1dc55b8a52d..8bcc8cfa65a 100644
--- a/addons/decimal_precision/i18n/es.po
+++ b/addons/decimal_precision/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/es_CR.po b/addons/decimal_precision/i18n/es_CR.po
index 027718ff620..b680beff542 100644
--- a/addons/decimal_precision/i18n/es_CR.po
+++ b/addons/decimal_precision/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: decimal_precision
diff --git a/addons/decimal_precision/i18n/es_EC.po b/addons/decimal_precision/i18n/es_EC.po
index fced7f1ba60..92a2422c562 100644
--- a/addons/decimal_precision/i18n/es_EC.po
+++ b/addons/decimal_precision/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/es_PY.po b/addons/decimal_precision/i18n/es_PY.po
index 8bcb235c12b..6dae89bbc26 100644
--- a/addons/decimal_precision/i18n/es_PY.po
+++ b/addons/decimal_precision/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/fi.po b/addons/decimal_precision/i18n/fi.po
index f8ab99795ac..4e5d563170d 100644
--- a/addons/decimal_precision/i18n/fi.po
+++ b/addons/decimal_precision/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/fr.po b/addons/decimal_precision/i18n/fr.po
index 43f8a35e092..7d3b9265b8f 100644
--- a/addons/decimal_precision/i18n/fr.po
+++ b/addons/decimal_precision/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/gl.po b/addons/decimal_precision/i18n/gl.po
index 92cb7d78679..c3e89b478e7 100644
--- a/addons/decimal_precision/i18n/gl.po
+++ b/addons/decimal_precision/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/gu.po b/addons/decimal_precision/i18n/gu.po
index bbf99985ea3..a0458fa753b 100644
--- a/addons/decimal_precision/i18n/gu.po
+++ b/addons/decimal_precision/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/hr.po b/addons/decimal_precision/i18n/hr.po
index 6ea24610963..ae54726c57c 100644
--- a/addons/decimal_precision/i18n/hr.po
+++ b/addons/decimal_precision/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/hu.po b/addons/decimal_precision/i18n/hu.po
index acf788fe025..95a3d9bd96e 100644
--- a/addons/decimal_precision/i18n/hu.po
+++ b/addons/decimal_precision/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/id.po b/addons/decimal_precision/i18n/id.po
index 3efe692b376..8c79898f6e1 100644
--- a/addons/decimal_precision/i18n/id.po
+++ b/addons/decimal_precision/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/it.po b/addons/decimal_precision/i18n/it.po
index 698e1dab386..ff3a6d17602 100644
--- a/addons/decimal_precision/i18n/it.po
+++ b/addons/decimal_precision/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/ja.po b/addons/decimal_precision/i18n/ja.po
index c306c8658c5..9c798b0f4ac 100644
--- a/addons/decimal_precision/i18n/ja.po
+++ b/addons/decimal_precision/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/lt.po b/addons/decimal_precision/i18n/lt.po
index 5ef2ce51d5e..da9526b0475 100644
--- a/addons/decimal_precision/i18n/lt.po
+++ b/addons/decimal_precision/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/lv.po b/addons/decimal_precision/i18n/lv.po
index eb00fe3fa16..3a4e12098ee 100644
--- a/addons/decimal_precision/i18n/lv.po
+++ b/addons/decimal_precision/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/mn.po b/addons/decimal_precision/i18n/mn.po
index 28da228a2da..92ce4f526fd 100644
--- a/addons/decimal_precision/i18n/mn.po
+++ b/addons/decimal_precision/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/nb.po b/addons/decimal_precision/i18n/nb.po
index ef17a875801..9f1385fa0e7 100644
--- a/addons/decimal_precision/i18n/nb.po
+++ b/addons/decimal_precision/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/nl.po b/addons/decimal_precision/i18n/nl.po
index 5dc84b3e73a..48d064fab05 100644
--- a/addons/decimal_precision/i18n/nl.po
+++ b/addons/decimal_precision/i18n/nl.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
 msgid "Digits"
-msgstr "Cijfers"
+msgstr "Decimalen"
 
 #. module: decimal_precision
 #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
diff --git a/addons/decimal_precision/i18n/nl_BE.po b/addons/decimal_precision/i18n/nl_BE.po
index e9fc80cced0..e93fa6dbcb8 100644
--- a/addons/decimal_precision/i18n/nl_BE.po
+++ b/addons/decimal_precision/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/pl.po b/addons/decimal_precision/i18n/pl.po
new file mode 100644
index 00000000000..8bb648b90a5
--- /dev/null
+++ b/addons/decimal_precision/i18n/pl.po
@@ -0,0 +1,49 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-10-25 16:50+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: decimal_precision
+#: field:decimal.precision,digits:0
+msgid "Digits"
+msgstr "Cyfry"
+
+#. module: decimal_precision
+#: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
+#: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
+msgid "Decimal Accuracy"
+msgstr ""
+
+#. module: decimal_precision
+#: field:decimal.precision,name:0
+msgid "Usage"
+msgstr "Użycie"
+
+#. module: decimal_precision
+#: sql_constraint:decimal.precision:0
+msgid "Only one value can be defined for each given usage!"
+msgstr ""
+
+#. module: decimal_precision
+#: view:decimal.precision:0
+msgid "Decimal Precision"
+msgstr ""
+
+#. module: decimal_precision
+#: model:ir.model,name:decimal_precision.model_decimal_precision
+msgid "decimal.precision"
+msgstr ""
diff --git a/addons/decimal_precision/i18n/pt.po b/addons/decimal_precision/i18n/pt.po
index 84478c3d123..0cc9df1468d 100644
--- a/addons/decimal_precision/i18n/pt.po
+++ b/addons/decimal_precision/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/pt_BR.po b/addons/decimal_precision/i18n/pt_BR.po
index 08ea274ef4c..1cf9bced545 100644
--- a/addons/decimal_precision/i18n/pt_BR.po
+++ b/addons/decimal_precision/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/ro.po b/addons/decimal_precision/i18n/ro.po
index e2f31c4e0ff..bb7a533caca 100644
--- a/addons/decimal_precision/i18n/ro.po
+++ b/addons/decimal_precision/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/ru.po b/addons/decimal_precision/i18n/ru.po
index f5c6aa388a9..522754a610d 100644
--- a/addons/decimal_precision/i18n/ru.po
+++ b/addons/decimal_precision/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sk.po b/addons/decimal_precision/i18n/sk.po
index 89f75649ac3..c5b2a247505 100644
--- a/addons/decimal_precision/i18n/sk.po
+++ b/addons/decimal_precision/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sl.po b/addons/decimal_precision/i18n/sl.po
index 2e311bc1d56..760c497f11a 100644
--- a/addons/decimal_precision/i18n/sl.po
+++ b/addons/decimal_precision/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sr.po b/addons/decimal_precision/i18n/sr.po
index 28b590172a1..2a966cd5bc0 100644
--- a/addons/decimal_precision/i18n/sr.po
+++ b/addons/decimal_precision/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sr@latin.po b/addons/decimal_precision/i18n/sr@latin.po
index 4c787801769..989ac385e4e 100644
--- a/addons/decimal_precision/i18n/sr@latin.po
+++ b/addons/decimal_precision/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/sv.po b/addons/decimal_precision/i18n/sv.po
index 265adf51edc..8b071bde451 100644
--- a/addons/decimal_precision/i18n/sv.po
+++ b/addons/decimal_precision/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/tr.po b/addons/decimal_precision/i18n/tr.po
index 9d2f56379d3..c26cfdf7c10 100644
--- a/addons/decimal_precision/i18n/tr.po
+++ b/addons/decimal_precision/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/vi.po b/addons/decimal_precision/i18n/vi.po
index c81e7b48008..157b386edb5 100644
--- a/addons/decimal_precision/i18n/vi.po
+++ b/addons/decimal_precision/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/zh_CN.po b/addons/decimal_precision/i18n/zh_CN.po
index 5b3ecb3c4aa..70a01329db5 100644
--- a/addons/decimal_precision/i18n/zh_CN.po
+++ b/addons/decimal_precision/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
diff --git a/addons/decimal_precision/i18n/zh_TW.po b/addons/decimal_precision/i18n/zh_TW.po
index a1e73c5cbc5..a382cec1abc 100644
--- a/addons/decimal_precision/i18n/zh_TW.po
+++ b/addons/decimal_precision/i18n/zh_TW.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-09-27 08:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-29 07:43+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
@@ -46,7 +46,7 @@ msgstr "小數精確度"
 #. module: decimal_precision
 #: model:ir.model,name:decimal_precision.model_decimal_precision
 msgid "decimal.precision"
-msgstr ""
+msgstr "decimal.precision"
 
 #~ msgid "Decimal Precision Configuration"
 #~ msgstr "小數精確度設定"
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index 092258f5e91..0ea891bb6ae 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -33,20 +33,17 @@ invoices from picking, OpenERP is able to add and compute the shipping line.
 """,
     'author': 'OpenERP SA',
     'depends': ['sale', 'purchase', 'stock'],
-    'init_xml': ['delivery_data.xml'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'delivery_report.xml',
         'delivery_view.xml',
-        'partner_view.xml'
-    ],
-    'demo_xml': ['delivery_demo.xml'],
-    'test': [
-        'test/delivery_cost.yml',
+        'partner_view.xml',
+        'delivery_data.xml'
     ],
+    'demo': ['delivery_demo.xml'],
+    'test': ['test/delivery_cost.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0033981912253',
     'images': ['images/1_delivery_method.jpeg','images/2_delivery_pricelist.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/delivery/delivery_data.xml b/addons/delivery/delivery_data.xml
index c1d9d99b33a..fec56b329b3 100644
--- a/addons/delivery/delivery_data.xml
+++ b/addons/delivery/delivery_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="True">
+    <data noupdate="1">
         <record forcecreate="True" id="property_delivery_carrier" model="ir.property">
             <field name="name">property_delivery_carrier</field>
             <field name="fields_id" search="[('model','=','res.partner'),('name','=','property_delivery_carrier')]"/>
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 6a68d1a979f..9b67d6b01b9 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -90,7 +90,7 @@
         </record>
 
         <record id="action_delivery_carrier_form" model="ir.actions.act_window">
-            <field name="name">Delivery Method</field>
+            <field name="name">Delivery Methods</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">delivery.carrier</field>
             <field name="view_type">form</field>
@@ -230,6 +230,10 @@
                     <field name="carrier_tracking_ref"/>
                     <field name="number_of_packages"/>
                 </field>
+                <field name="company_id" position="before">
+                    <field name="weight"/>
+                    <field name="weight_net" groups="base.group_no_one"/>
+               </field>
             </field>
         </record>
 
@@ -259,10 +263,10 @@
 
         <record id="view_picking_withweight_internal_move_form" model="ir.ui.view">
             <field name="name">stock.picking_withweight.internal.move.form.view</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_form"/>
+            <field name="model">stock.move</field>
+            <field name="inherit_id" ref="stock.view_move_picking_tree"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
+                <xpath expr="//field[@name='product_uom']" position="after">
                     <field name="weight"/>
                     <field name="weight_net" groups="base.group_no_one"/>
                 </xpath>
@@ -306,14 +310,26 @@
 
         <record id="view_delivery_order_inherit_stock" model="ir.ui.view">
             <field name="name">stock.picking.out.form</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_out_form"/>
+            <field name="model">stock.picking.out</field>
+            <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/header//button[@string='Create Invoice/Refund']" position="after">
-                    <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
+                <xpath expr="/form/header//button[@name='action_process']" position="after">
+                    <button name="%(report_shipping)d" string="Print Delivery Order" states="confirmed,assigned" type="action"/>
+                    <button name="%(report_shipping)d" string="Print Delivery Order" states="done" type="action" class="oe_highlight"/>
                 </xpath>
             </field>
         </record>
-
+        
+        <record id="view_picking_withcarrier_in_form" model="ir.ui.view">
+            <field name="name">delivery.stock.picking_withcarrier.in.form.view</field>
+            <field name="model">stock.picking.in</field>
+            <field name="inherit_id" ref="stock.view_picking_form"/>
+            <field name="arch" type="xml">
+              <field name="company_id" position="before">
+                    <field name="weight"/>
+                    <field name="weight_net" groups="base.group_no_one"/>
+               </field>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/delivery/i18n/ar.po b/addons/delivery/i18n/ar.po
index 9ff4e29dcbb..283a5922a3c 100644
--- a/addons/delivery/i18n/ar.po
+++ b/addons/delivery/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/bg.po b/addons/delivery/i18n/bg.po
index 511b0b43353..a75184fcc3e 100644
--- a/addons/delivery/i18n/bg.po
+++ b/addons/delivery/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/bs.po b/addons/delivery/i18n/bs.po
index dea64ae7dff..90a5274fb2c 100644
--- a/addons/delivery/i18n/bs.po
+++ b/addons/delivery/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/ca.po b/addons/delivery/i18n/ca.po
index 99ecde1b1c4..613849abef5 100644
--- a/addons/delivery/i18n/ca.po
+++ b/addons/delivery/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/cs.po b/addons/delivery/i18n/cs.po
index 8109457bd2d..9956d80c302 100644
--- a/addons/delivery/i18n/cs.po
+++ b/addons/delivery/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/da.po b/addons/delivery/i18n/da.po
index ec301858065..a04e9b51ef5 100644
--- a/addons/delivery/i18n/da.po
+++ b/addons/delivery/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/de.po b/addons/delivery/i18n/de.po
index 2a068d2494f..61e223d0a6e 100644
--- a/addons/delivery/i18n/de.po
+++ b/addons/delivery/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/el.po b/addons/delivery/i18n/el.po
index 1da5e618ec3..1e6cf29840b 100644
--- a/addons/delivery/i18n/el.po
+++ b/addons/delivery/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/es.po b/addons/delivery/i18n/es.po
index f44dbfd8e83..30491543497 100644
--- a/addons/delivery/i18n/es.po
+++ b/addons/delivery/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2011-01-13 14:31+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/es_AR.po b/addons/delivery/i18n/es_AR.po
index a34cf1d70d6..80aee31358a 100644
--- a/addons/delivery/i18n/es_AR.po
+++ b/addons/delivery/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/es_CR.po b/addons/delivery/i18n/es_CR.po
index 8a6cff102da..95bd9ee248a 100644
--- a/addons/delivery/i18n/es_CR.po
+++ b/addons/delivery/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/es_EC.po b/addons/delivery/i18n/es_EC.po
index e7f21252e44..9e3bb090c46 100644
--- a/addons/delivery/i18n/es_EC.po
+++ b/addons/delivery/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/es_PY.po b/addons/delivery/i18n/es_PY.po
index 54175e93a72..32c2f0d3a2f 100644
--- a/addons/delivery/i18n/es_PY.po
+++ b/addons/delivery/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/et.po b/addons/delivery/i18n/et.po
index ea1fe8b4a96..f72bc42ae73 100644
--- a/addons/delivery/i18n/et.po
+++ b/addons/delivery/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/fi.po b/addons/delivery/i18n/fi.po
index 5e63e4716a0..fdf9c7a8b19 100644
--- a/addons/delivery/i18n/fi.po
+++ b/addons/delivery/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index 1b420912e2e..f080c5ae8bc 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue !"
diff --git a/addons/delivery/i18n/gl.po b/addons/delivery/i18n/gl.po
index 0502295e759..3130f19ad30 100644
--- a/addons/delivery/i18n/gl.po
+++ b/addons/delivery/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/hi.po b/addons/delivery/i18n/hi.po
index c4a0805c1c0..fe94bc04c8b 100644
--- a/addons/delivery/i18n/hi.po
+++ b/addons/delivery/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/hr.po b/addons/delivery/i18n/hr.po
index 6a77dce3999..2de71b2ff06 100644
--- a/addons/delivery/i18n/hr.po
+++ b/addons/delivery/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: delivery
diff --git a/addons/delivery/i18n/hu.po b/addons/delivery/i18n/hu.po
index 253036b17d8..7bcc2974794 100644
--- a/addons/delivery/i18n/hu.po
+++ b/addons/delivery/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/id.po b/addons/delivery/i18n/id.po
index f70c211f57d..5a05b652b97 100644
--- a/addons/delivery/i18n/id.po
+++ b/addons/delivery/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/it.po b/addons/delivery/i18n/it.po
index dc254d1581f..67512cacc73 100644
--- a/addons/delivery/i18n/it.po
+++ b/addons/delivery/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/ja.po b/addons/delivery/i18n/ja.po
index c00c2cdb51f..c595729b566 100644
--- a/addons/delivery/i18n/ja.po
+++ b/addons/delivery/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/ko.po b/addons/delivery/i18n/ko.po
index 115fde6a36e..2396b6d4122 100644
--- a/addons/delivery/i18n/ko.po
+++ b/addons/delivery/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/lt.po b/addons/delivery/i18n/lt.po
index fae87218ceb..3d79bea6623 100644
--- a/addons/delivery/i18n/lt.po
+++ b/addons/delivery/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/lv.po b/addons/delivery/i18n/lv.po
index 6419cca483b..0d2e904365a 100644
--- a/addons/delivery/i18n/lv.po
+++ b/addons/delivery/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/mn.po b/addons/delivery/i18n/mn.po
index 7665b33fe96..fbf154db849 100644
--- a/addons/delivery/i18n/mn.po
+++ b/addons/delivery/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/nb.po b/addons/delivery/i18n/nb.po
index 8d0dc49852e..ff462b9cdfd 100644
--- a/addons/delivery/i18n/nb.po
+++ b/addons/delivery/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -46,7 +46,7 @@ msgstr "Leveringsordre"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery Grid Line"
-msgstr ""
+msgstr "Levering Rutenettlinje"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -94,7 +94,7 @@ msgstr "Avansert prising"
 #. module: delivery
 #: help:delivery.grid,sequence:0
 msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
+msgstr "Gir sekvensen ordre når du viser en liste over levering rutenett."
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -121,6 +121,10 @@ msgid ""
 "can define several price lists for one delivery method, per country or a "
 "zone in a specific country defined by a postal code range."
 msgstr ""
+"Leveransen prisliste kan du beregne kostnadene og salgsprisen for levering i "
+"henhold til vekten av produkter og andre kriterier. Du kan definere flere "
+"prislister for en leveringsmetode, per land eller en sone i et bestemt land "
+"definert av et postnummer rekkevidde."
 
 #. module: delivery
 #: field:delivery.carrier,amount:0
@@ -201,6 +205,8 @@ msgid ""
 "Define your delivery methods and their pricing. The delivery costs can be "
 "added on the sale order form or in the invoice, based on the delivery orders."
 msgstr ""
+"Definer dine leveringsmetoder og deres priser. Levering kan legges på salg "
+"bestillingsskjemaet eller i fakturaen, basert på utkjøring."
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -215,13 +221,14 @@ msgstr "Transportør"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
 msgid "Delivery Grid"
-msgstr ""
+msgstr "Levering Rutenett"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:213
 #, python-format
 msgid "No line matched this product or order in the choosed delivery grid."
 msgstr ""
+"Ingen linje matchet dette produktet eller orden i valgt levering rutenettet."
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -259,6 +266,8 @@ msgid ""
 "Amount of the order to benefit from a free shipping, expressed in the "
 "company currency"
 msgstr ""
+"Mengden av ordrene for å dra nytte av en gratis frakt, uttrykt i selskapet "
+"valuta"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:89
@@ -277,6 +286,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "grid without removing it."
 msgstr ""
+"Hvis det aktive feltet er satt til False, vil det tillate deg å skjule "
+"levering rutenettet uten å fjerne den."
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
@@ -334,12 +345,15 @@ msgid ""
 "Check this box if you want to manage delivery prices that depends on the "
 "destination, the weight, the total of the order, etc."
 msgstr ""
+"Kryss av her hvis du ønsker å administrere levering priser som avhenger av "
+"destinasjonen, vekten, summen av ordren, etc."
 
 #. module: delivery
 #: help:delivery.carrier,normal_price:0
 msgid ""
 "Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
+"Hold tom hvis prisingen er avhengig av avansert prising per destinasjon."
 
 #. module: delivery
 #: constraint:stock.move:0
@@ -350,7 +364,7 @@ msgstr "Kan ikke flytte produkter til eller fra en lokasjon av typen view."
 #: code:addons/delivery/wizard/delivery_sale_order.py:70
 #, python-format
 msgid "No grid available !"
-msgstr ""
+msgstr "Ingen rutenett tilgjengelig !"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -367,7 +381,7 @@ msgstr "Ordren har ikke utkast-status!"
 #. module: delivery
 #: view:delivery.define.delivery.steps.wizard:0
 msgid "Choose Your Default Picking Policy"
-msgstr ""
+msgstr "Velg standard Plukke politikk"
 
 #. module: delivery
 #: constraint:stock.move:0
@@ -414,7 +428,7 @@ msgstr "Variabel"
 #. module: delivery
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from picking."
-msgstr ""
+msgstr "Denne leveringsmetoden vil bli brukt ved fakturering fra plukking."
 
 #. module: delivery
 #: sql_constraint:stock.picking:0
@@ -448,12 +462,15 @@ msgid ""
 "If the order is more expensive than a certain amount, the customer can "
 "benefit from a free shipping"
 msgstr ""
+"Hvis bestillingen er dyrere enn et bestemt beløp, kan kunden dra nytte av en "
+"gratis frakt."
 
 #. module: delivery
 #: help:sale.order,carrier_id:0
 msgid ""
 "Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
+"Fullfør dette feltet hvis du har tenkt å fakturere frakt basert på plukking."
 
 #. module: delivery
 #: view:delivery.define.delivery.steps.wizard:0
@@ -464,7 +481,7 @@ msgstr "Kanseller"
 #: code:addons/delivery/delivery.py:130
 #, python-format
 msgid "Free if more than %.2f"
-msgstr ""
+msgstr "Gratis vis det er mer enn %.2f"
 
 #. module: delivery
 #: sql_constraint:sale.order:0
@@ -478,6 +495,8 @@ msgid ""
 "reinvoice the delivery costs when you are doing invoicing based on delivery "
 "orders"
 msgstr ""
+"Definer leveringsmetoder du bruker, og sine priser i ordre til å re- "
+"fakturere levering kostnader når du gjør fakturering basert på utkjøring"
 
 #. module: delivery
 #: view:res.partner:0
@@ -497,7 +516,7 @@ msgstr "Du må velge en produksjonslot/batch for dette produktet"
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
 msgid "Free If More Than"
-msgstr ""
+msgstr "Gratis vis det er mer enn."
 
 #. module: delivery
 #: view:delivery.sale.order:0
@@ -522,6 +541,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "carrier without removing it."
 msgstr ""
+"Hvis det aktive feltet er satt til False, vil det tillate deg å skjule "
+"levering transportør uten å fjerne den."
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
@@ -609,7 +630,7 @@ msgstr ""
 #. module: delivery
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
diff --git a/addons/delivery/i18n/nl.po b/addons/delivery/i18n/nl.po
index 56eb7804dec..bcae13b5bc8 100644
--- a/addons/delivery/i18n/nl.po
+++ b/addons/delivery/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-20 15:37+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -40,7 +40,7 @@ msgstr "Netto gewicht"
 #. module: delivery
 #: view:stock.picking:0
 msgid "Delivery Order"
-msgstr "Leveringsopdracht"
+msgstr "Uitgaande levering"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
@@ -73,7 +73,7 @@ msgstr "De relatie die de afleveringsservice doet"
 #. module: delivery
 #: model:ir.actions.report.xml,name:delivery.report_shipping
 msgid "Delivery order"
-msgstr "Afleveringsopdracht"
+msgstr "Uitgaande levering"
 
 #. module: delivery
 #: view:res.partner:0
@@ -106,7 +106,7 @@ msgstr "Landen"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Delivery Order :"
-msgstr "Afleveringsopdracht :"
+msgstr "Uitgaande levering:"
 
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
@@ -408,7 +408,7 @@ msgstr "Leverdatum"
 #. module: delivery
 #: field:delivery.carrier,product_id:0
 msgid "Delivery Product"
-msgstr "Te leveren product"
+msgstr "Verzendwijze product"
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -564,7 +564,7 @@ msgstr "Aflevertarieven"
 #: selection:delivery.grid.line,type:0
 #: selection:delivery.grid.line,variable_factor:0
 msgid "Price"
-msgstr "Prijs"
+msgstr "Bedrag"
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:70
diff --git a/addons/delivery/i18n/nl_BE.po b/addons/delivery/i18n/nl_BE.po
index 5b90799e8fd..07d5085a30f 100644
--- a/addons/delivery/i18n/nl_BE.po
+++ b/addons/delivery/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/pl.po b/addons/delivery/i18n/pl.po
index 776071ea16a..ea70ae6dabd 100644
--- a/addons/delivery/i18n/pl.po
+++ b/addons/delivery/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/pt.po b/addons/delivery/i18n/pt.po
index 941565a1fd8..cd12b89efd8 100644
--- a/addons/delivery/i18n/pt.po
+++ b/addons/delivery/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/pt_BR.po b/addons/delivery/i18n/pt_BR.po
index d3bb29c0665..3d5e618ea7f 100644
--- a/addons/delivery/i18n/pt_BR.po
+++ b/addons/delivery/i18n/pt_BR.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Ref."
-msgstr "Ref. da Ordem"
+msgstr "Ref. do Pedido"
 
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
@@ -73,17 +73,17 @@ msgstr "Parceiro que está efetuando o serviço de entrega."
 #. module: delivery
 #: model:ir.actions.report.xml,name:delivery.report_shipping
 msgid "Delivery order"
-msgstr "Ordem de Expedição"
+msgstr "Ordem de Entrega"
 
 #. module: delivery
 #: view:res.partner:0
 msgid "Deliveries Properties"
-msgstr "Propriedades de entregas"
+msgstr "Propriedades de Entregas"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 msgid "Picking to be invoiced"
-msgstr "Picking à ser faturado"
+msgstr "Separação a ser faturado"
 
 #. module: delivery
 #: field:delivery.carrier,pricelist_ids:0
@@ -105,7 +105,7 @@ msgstr "Países"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Delivery Order :"
-msgstr "Ordem de Expedição:"
+msgstr "Ordem de Entrega"
 
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
@@ -266,7 +266,7 @@ msgid ""
 "Amount of the order to benefit from a free shipping, expressed in the "
 "company currency"
 msgstr ""
-"Total da order para se beneficiar de entrega grátis, expresso na moeda da "
+"Total do pedido para se beneficiar de entrega grátis, expresso na moeda da "
 "empresa."
 
 #. module: delivery
@@ -313,7 +313,7 @@ msgstr "Preço Normal"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Date"
-msgstr "Data da Ordem"
+msgstr "Data do Pedido"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -359,7 +359,8 @@ msgstr ""
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr "Você não pode mover os produtos de/para um Local do tipo Vista"
+msgstr ""
+"Você não pode mover os produtos de/para um Local do tipo Visualização"
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:70
@@ -377,7 +378,7 @@ msgstr ">="
 #: code:addons/delivery/wizard/delivery_sale_order.py:73
 #, python-format
 msgid "Order not in draft state !"
-msgstr "Ordem não está como rascunho!"
+msgstr "O Pedido não está como Provisório!"
 
 #. module: delivery
 #: view:delivery.define.delivery.steps.wizard:0
@@ -398,7 +399,7 @@ msgstr "Ativo"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Shipping Date"
-msgstr "Data de Embarque"
+msgstr "Data de Envio"
 
 #. module: delivery
 #: field:delivery.carrier,product_id:0
@@ -413,7 +414,7 @@ msgstr "Condição"
 #. module: delivery
 #: field:delivery.grid.line,standard_price:0
 msgid "Cost Price"
-msgstr "Preço de custo"
+msgstr "Preço de Custo"
 
 #. module: delivery
 #: field:delivery.define.delivery.steps.wizard,picking_policy:0
@@ -430,8 +431,7 @@ msgstr "Variável"
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
-"Este método de entrega será usado quando criar notas fiscais a partir de uma "
-"separação(picking)."
+"Este método de entrega será usado quando faturar a partir da separação."
 
 #. module: delivery
 #: sql_constraint:stock.picking:0
@@ -452,12 +452,12 @@ msgstr "Quantidade"
 #: view:delivery.define.delivery.steps.wizard:0
 #: model:ir.actions.act_window,name:delivery.action_define_delivery_steps
 msgid "Setup Your Picking Policy"
-msgstr "Defina a sua política padrao de separação"
+msgstr "Defina a Política de Separação"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form1
 msgid "Define Delivery Methods"
-msgstr "Defina o método de entrega"
+msgstr "Defina o Método de Entrega"
 
 #. module: delivery
 #: help:delivery.carrier,free_if_more_than:0
@@ -473,8 +473,7 @@ msgstr ""
 msgid ""
 "Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
-"Complete este campo se você pretende faturar o frete baseado em "
-"separações(picking)."
+"Complete este campo se você pretende faturar o frete baseado em separações."
 
 #. module: delivery
 #: view:delivery.define.delivery.steps.wizard:0
@@ -485,7 +484,7 @@ msgstr "Cancelar"
 #: code:addons/delivery/delivery.py:130
 #, python-format
 msgid "Free if more than %.2f"
-msgstr "Gratuíto se maior que %.2f"
+msgstr "Grátis se maior que %.2f"
 
 #. module: delivery
 #: sql_constraint:sale.order:0
@@ -521,7 +520,7 @@ msgstr "Você deve atribuir um lote de produção para este produto."
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
 msgid "Free If More Than"
-msgstr "Gratuíto se mais do que"
+msgstr "Grátis se mais que"
 
 #. module: delivery
 #: view:delivery.sale.order:0
@@ -533,7 +532,7 @@ msgstr "Criar Entregas"
 #: view:delivery.grid:0
 #: field:delivery.grid,state_ids:0
 msgid "States"
-msgstr "Estados"
+msgstr "Situações"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -630,12 +629,13 @@ msgstr "ID"
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
 msgstr ""
-"O Status da ordem deve estar como rascunho para adicionar linhas de entrega."
+"O situação da ordem deve estar como provisório para adicionar linhas de "
+"entrega."
 
 #. module: delivery
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursiva a membros associados."
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
diff --git a/addons/delivery/i18n/ro.po b/addons/delivery/i18n/ro.po
index 50784682726..25ad1a2e35c 100644
--- a/addons/delivery/i18n/ro.po
+++ b/addons/delivery/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index c9039f999c9..49b949da375 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -45,13 +45,13 @@ msgstr "Заказ на доставку"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery Grid Line"
-msgstr "Строки поставки"
+msgstr "Строка сетки доставки"
 
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
 msgid "Delivery grids"
-msgstr "Расценки на доставку"
+msgstr "Сетки доставки"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -63,12 +63,12 @@ msgstr "Объем"
 #. module: delivery
 #: field:delivery.grid,line_ids:0
 msgid "Grid Line"
-msgstr "Разделяемая строка"
+msgstr "Строка сетки"
 
 #. module: delivery
 #: help:delivery.carrier,partner_id:0
 msgid "The partner that is doing the delivery service."
-msgstr ""
+msgstr "Партнёр оказывающий услуги доставки."
 
 #. module: delivery
 #: model:ir.actions.report.xml,name:delivery.report_shipping
@@ -78,7 +78,7 @@ msgstr "Заказ на доставку"
 #. module: delivery
 #: view:res.partner:0
 msgid "Deliveries Properties"
-msgstr "Свойства доставки"
+msgstr "Свойства доставок"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
@@ -88,13 +88,12 @@ msgstr "Счет на комплектование"
 #. module: delivery
 #: field:delivery.carrier,pricelist_ids:0
 msgid "Advanced Pricing"
-msgstr ""
+msgstr "Расширенные расценки"
 
 #. module: delivery
 #: help:delivery.grid,sequence:0
 msgid "Gives the sequence order when displaying a list of delivery grid."
-msgstr ""
-"Возвращает порядок следования при отображении списка доставочной сетки."
+msgstr "Возвращает последовательность вывода списка доставочной сетки."
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -129,7 +128,7 @@ msgstr ""
 #. module: delivery
 #: field:delivery.carrier,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Сумма"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -151,7 +150,7 @@ msgstr "Метод доставки"
 #: code:addons/delivery/delivery.py:213
 #, python-format
 msgid "No price available!"
-msgstr ""
+msgstr "Нет прайс листа"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_move
@@ -171,13 +170,13 @@ msgstr "Вес нетто"
 #. module: delivery
 #: view:delivery.grid.line:0
 msgid "Grid Lines"
-msgstr "Разделяемые строки"
+msgstr "Линии сетки"
 
 #. module: delivery
 #: view:delivery.carrier:0
 #: view:delivery.grid:0
 msgid "Grid definition"
-msgstr "Определение разделения"
+msgstr "Определение сетки"
 
 #. module: delivery
 #: view:delivery.sale.order:0
@@ -192,12 +191,12 @@ msgstr "Оператор"
 #. module: delivery
 #: model:ir.model,name:delivery.model_res_partner
 msgid "Partner"
-msgstr "Контрагент"
+msgstr "Партнёр"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_sale_order
 msgid "Sales Order"
-msgstr "Заказ на продажу"
+msgstr "Заказ продаж"
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form1
@@ -205,6 +204,9 @@ msgid ""
 "Define your delivery methods and their pricing. The delivery costs can be "
 "added on the sale order form or in the invoice, based on the delivery orders."
 msgstr ""
+"Определите ваши способы доставки и их расценки. Стоимости доставки могут "
+"быть добавлены в форме ввода заказа продажи или в счёте, основанном на "
+"заказах доставки."
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -214,18 +216,19 @@ msgstr "Партия"
 #. module: delivery
 #: field:delivery.carrier,partner_id:0
 msgid "Transport Company"
-msgstr ""
+msgstr "Транспортная компания"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
 msgid "Delivery Grid"
-msgstr "Расценки на доставку"
+msgstr "Сетка доставки"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:213
 #, python-format
 msgid "No line matched this product or order in the choosed delivery grid."
 msgstr ""
+"Нет строки подходящей этому товару или заказу в выбранной доставочной сетке!"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -240,7 +243,7 @@ msgstr "Комплектовочный лист"
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
 msgid "Delivery Grids"
-msgstr "Разделение поставки"
+msgstr "Сетки доставки"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_sale_order
@@ -263,6 +266,8 @@ msgid ""
 "Amount of the order to benefit from a free shipping, expressed in the "
 "company currency"
 msgstr ""
+"Сумма заказа, чтобы воспользоваться бесплатной доставкой, выраженная в "
+"валюте компании"
 
 #. module: delivery
 #: code:addons/delivery/stock.py:89
@@ -273,7 +278,7 @@ msgstr "Внимание"
 #. module: delivery
 #: field:delivery.grid.line,grid_id:0
 msgid "Grid"
-msgstr "Разделение"
+msgstr "Сетка"
 
 #. module: delivery
 #: help:delivery.grid,active:0
@@ -281,7 +286,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the delivery "
 "grid without removing it."
 msgstr ""
-"Если активное поле установлено в «Ложь», будет позволено спрятать "
+"Если поле \"Активно\" установлено в «Ложь», будет позволено спрятать "
 "доставочную сетку не удаляя её."
 
 #. module: delivery
@@ -293,17 +298,17 @@ msgstr "Почтовый индекс получателя"
 #: code:addons/delivery/delivery.py:141
 #, python-format
 msgid "Default price"
-msgstr ""
+msgstr "Цена по умолчанию"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_define_delivery_steps_wizard
 msgid "delivery.define.delivery.steps.wizard"
-msgstr ""
+msgstr "delivery.define.delivery.steps.wizard"
 
 #. module: delivery
 #: field:delivery.carrier,normal_price:0
 msgid "Normal Price"
-msgstr ""
+msgstr "Нормальная цена"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -313,7 +318,7 @@ msgstr "Дата заказа"
 #. module: delivery
 #: field:delivery.grid,name:0
 msgid "Grid Name"
-msgstr "Имя разделения"
+msgstr "Название сетки"
 
 #. module: delivery
 #: view:stock.move:0
@@ -340,23 +345,27 @@ msgid ""
 "Check this box if you want to manage delivery prices that depends on the "
 "destination, the weight, the total of the order, etc."
 msgstr ""
+"Установите этот флажок, если вы хотите управлять ценами доставки, которые "
+"зависят от места назначения, веса, суммы заказа и т.д."
 
 #. module: delivery
 #: help:delivery.carrier,normal_price:0
 msgid ""
 "Keep empty if the pricing depends on the advanced pricing per destination"
 msgstr ""
+"Оставьте пустым, если расценка зависит от расширенной расценки по месту "
+"назначения"
 
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Нельзя переместить ТМЦ в/из место хранения типа вид."
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:70
 #, python-format
 msgid "No grid available !"
-msgstr "Доступных позиций нет !"
+msgstr "Доступных сеток нет !"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -373,12 +382,12 @@ msgstr "Заказ не в состоянии \"Черновик\" !"
 #. module: delivery
 #: view:delivery.define.delivery.steps.wizard:0
 msgid "Choose Your Default Picking Policy"
-msgstr ""
+msgstr "Выберите политику комплектования по умолчанию"
 
 #. module: delivery
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr "Вы пытаетесь назначит партию состоящую из другой продукции"
+msgstr "Вы пытаетесь назначить партию состоящую из другой продукции"
 
 #. module: delivery
 #: field:delivery.carrier,active:0
@@ -394,7 +403,7 @@ msgstr "Дата отгрузки"
 #. module: delivery
 #: field:delivery.carrier,product_id:0
 msgid "Delivery Product"
-msgstr "Услуга или изделие, соответствующее доставке"
+msgstr "Доставка товара"
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -409,7 +418,7 @@ msgstr "Себестоимость"
 #. module: delivery
 #: field:delivery.define.delivery.steps.wizard,picking_policy:0
 msgid "Picking Policy"
-msgstr ""
+msgstr "Политика комплектования"
 
 #. module: delivery
 #: selection:delivery.grid.line,price_type:0
@@ -421,13 +430,13 @@ msgstr "Переменная"
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
-"Этот способ доставки будет использоваться при выставление счетов из "
-"комплектований."
+"Этот способ доставки будет использоваться при выставление счета по "
+"комплектованию."
 
 #. module: delivery
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка должна быть уникальна для каждой компании!"
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -443,12 +452,12 @@ msgstr "Количество"
 #: view:delivery.define.delivery.steps.wizard:0
 #: model:ir.actions.act_window,name:delivery.action_define_delivery_steps
 msgid "Setup Your Picking Policy"
-msgstr ""
+msgstr "Настройка политики комплектования"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_carrier_form1
 msgid "Define Delivery Methods"
-msgstr ""
+msgstr "Определение способов доставки"
 
 #. module: delivery
 #: help:delivery.carrier,free_if_more_than:0
@@ -456,6 +465,8 @@ msgid ""
 "If the order is more expensive than a certain amount, the customer can "
 "benefit from a free shipping"
 msgstr ""
+"Если заказ дороже, чем определённая сумма, покупатель может получить выгоду "
+"из бесплатной перевозки"
 
 #. module: delivery
 #: help:sale.order,carrier_id:0
@@ -474,12 +485,12 @@ msgstr "Отмена"
 #: code:addons/delivery/delivery.py:130
 #, python-format
 msgid "Free if more than %.2f"
-msgstr ""
+msgstr "Бесплатно, если больше чем %.2f"
 
 #. module: delivery
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
 
 #. module: delivery
 #: model:ir.actions.act_window,help:delivery.action_delivery_carrier_form
@@ -488,6 +499,9 @@ msgid ""
 "reinvoice the delivery costs when you are doing invoicing based on delivery "
 "orders"
 msgstr ""
+"Определите способы доставки используемые вами и их расценки в порядке "
+"пересчёта затрат доставки, когда вы делаете выставление счёта основанное на "
+"заказах доставки"
 
 #. module: delivery
 #: view:res.partner:0
@@ -507,7 +521,7 @@ msgstr "Вы должны назначить партию изделий для
 #. module: delivery
 #: field:delivery.carrier,free_if_more_than:0
 msgid "Free If More Than"
-msgstr ""
+msgstr "Бесплатно , если больше чем"
 
 #. module: delivery
 #: view:delivery.sale.order:0
@@ -539,7 +553,7 @@ msgstr ""
 #: 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
 #: field:delivery.carrier,price:0
@@ -552,7 +566,7 @@ msgstr "Цена"
 #: code:addons/delivery/wizard/delivery_sale_order.py:70
 #, python-format
 msgid "No grid matching for this carrier !"
-msgstr "Нет сетки, совпадающей с этой перевозкой!"
+msgstr "Нет сетки, подходящей для этого перевозчика!"
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
@@ -574,22 +588,22 @@ msgstr "="
 #: code:addons/delivery/stock.py:90
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Перевозка %s (ID: %d) не имеет доставочной сетки!"
+msgstr "Перевозчик %s (ID: %d) не имеет доставочной сетки!"
 
 #. module: delivery
 #: view:delivery.carrier:0
 msgid "Pricing Information"
-msgstr ""
+msgstr "Информация о цене"
 
 #. module: delivery
 #: selection:delivery.define.delivery.steps.wizard,picking_policy:0
 msgid "Deliver all products at once"
-msgstr ""
+msgstr "Доставка всех товаров за раз"
 
 #. module: delivery
 #: field:delivery.carrier,use_detailed_pricelist:0
 msgid "Advanced Pricing per Destination"
-msgstr ""
+msgstr "Расширенные расценки по месту назначения"
 
 #. module: delivery
 #: view:delivery.carrier:0
@@ -598,7 +612,7 @@ msgstr ""
 #: report:sale.shipping:0
 #: field:stock.picking,carrier_id:0
 msgid "Carrier"
-msgstr "Доставка"
+msgstr "Перевозчик"
 
 #. module: delivery
 #: view:delivery.sale.order:0
@@ -621,12 +635,12 @@ msgstr ""
 #. module: delivery
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: delivery
 #: field:delivery.grid,sequence:0
 msgid "Sequence"
-msgstr "Последовательность"
+msgstr "Нумерация"
 
 #. module: delivery
 #: field:delivery.grid.line,list_price:0
@@ -642,12 +656,12 @@ msgstr "Стоимость доставки"
 #. module: delivery
 #: selection:delivery.define.delivery.steps.wizard,picking_policy:0
 msgid "Deliver each product when available"
-msgstr ""
+msgstr "Доставка каждого товара по готовности."
 
 #. module: delivery
 #: view:delivery.define.delivery.steps.wizard:0
 msgid "Apply"
-msgstr ""
+msgstr "Применить"
 
 #. module: delivery
 #: field:delivery.grid.line,price_type:0
diff --git a/addons/delivery/i18n/sl.po b/addons/delivery/i18n/sl.po
index 8b88494882e..51b012df433 100644
--- a/addons/delivery/i18n/sl.po
+++ b/addons/delivery/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/sq.po b/addons/delivery/i18n/sq.po
index b48e450e909..772c76adb7e 100644
--- a/addons/delivery/i18n/sq.po
+++ b/addons/delivery/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/sr.po b/addons/delivery/i18n/sr.po
index 36312862e3d..6505b8bd410 100644
--- a/addons/delivery/i18n/sr.po
+++ b/addons/delivery/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/sr@latin.po b/addons/delivery/i18n/sr@latin.po
index 45bd3c38a98..2f6eeab3d99 100644
--- a/addons/delivery/i18n/sr@latin.po
+++ b/addons/delivery/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/sv.po b/addons/delivery/i18n/sv.po
index c7f1a27cffd..1be7a1ceaf1 100644
--- a/addons/delivery/i18n/sv.po
+++ b/addons/delivery/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/th.po b/addons/delivery/i18n/th.po
index b13458a1498..24bd9e57093 100644
--- a/addons/delivery/i18n/th.po
+++ b/addons/delivery/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/tlh.po b/addons/delivery/i18n/tlh.po
index f954d69c1bf..e7e95deefc6 100644
--- a/addons/delivery/i18n/tlh.po
+++ b/addons/delivery/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index bf2022ac968..8940699b625 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/uk.po b/addons/delivery/i18n/uk.po
index 4b042da3074..3242a7862dc 100644
--- a/addons/delivery/i18n/uk.po
+++ b/addons/delivery/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/vi.po b/addons/delivery/i18n/vi.po
index e658f646c5e..84706a25f0b 100644
--- a/addons/delivery/i18n/vi.po
+++ b/addons/delivery/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/i18n/zh_CN.po b/addons/delivery/i18n/zh_CN.po
index 06bbdecf0b0..df557e59b5d 100644
--- a/addons/delivery/i18n/zh_CN.po
+++ b/addons/delivery/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-17 03:56+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-11-02 01:52+0000\n"
+"Last-Translator: Joshua Jan(SHINEIT) <popkar77@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: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:03+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
@@ -332,13 +332,13 @@ msgstr "重量"
 msgid ""
 "Check this box if you want to manage delivery prices that depends on the "
 "destination, the weight, the total of the order, etc."
-msgstr "如果你要根据目的地、重量、订单总价来管理运费，请勾选这里。"
+msgstr "如果要根据目的地、重量、订单总价来管理运费，请勾选这里。"
 
 #. module: delivery
 #: help:delivery.carrier,normal_price:0
 msgid ""
 "Keep empty if the pricing depends on the advanced pricing per destination"
-msgstr "如果价格基于每个目的地的固定价格，这里留空。"
+msgstr "默认的运费的价格，如果根据目的地定价，这里留空。"
 
 #. module: delivery
 #: constraint:stock.move:0
@@ -576,7 +576,7 @@ msgstr "一次性交货"
 #. module: delivery
 #: field:delivery.carrier,use_detailed_pricelist:0
 msgid "Advanced Pricing per Destination"
-msgstr "每个目的地的固定价格"
+msgstr "根据目的地定价"
 
 #. module: delivery
 #: view:delivery.carrier:0
diff --git a/addons/delivery/i18n/zh_TW.po b/addons/delivery/i18n/zh_TW.po
index e80d2e9599d..e6b9cf521c6 100644
--- a/addons/delivery/i18n/zh_TW.po
+++ b/addons/delivery/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:53+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: delivery
 #: report:sale.shipping:0
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index f4d133e967a..c3ce236dc2e 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -202,5 +202,30 @@ class stock_picking_out(osv.osv):
         'carrier_tracking_ref': fields.char('Carrier Tracking Ref', size=32),
         'number_of_packages': fields.integer('Number of Packages'),
         }
+stock_picking_out()
+
+class stock_picking_in(osv.osv):
+    _inherit = 'stock.picking.in'
+
+    def _cal_weight(self, cr, uid, ids, name, args, context=None):
+        return self.pool.get('stock.picking')._cal_weight(cr, uid, ids, name, args, context=context)
+
+    def _get_picking_line(self, cr, uid, ids, context=None):
+        return self.pool.get('stock.picking')._get_picking_line(cr, uid, ids, context=context)
+
+    _columns = {
+        'weight': fields.function(_cal_weight, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+                store={
+                '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),
+                }),
+        'weight_net': fields.function(_cal_weight, type='float', string='Net Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_weight',
+                store={
+                '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),
+                }),
+        }
+stock_picking_in()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index d9ad9a09675..e3354efff0c 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -37,6 +37,7 @@ This is a complete document management system.
         * Files Size by Month (graph)
 
 ATTENTION:
+----------
     - When you install this module in a running company that have already PDF 
       files stored into the database, you will lose them all.
     - After installing this module PDF's are no longer stored into the database,
@@ -45,8 +46,7 @@ ATTENTION:
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['process','board', 'knowledge'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/document_security.xml',
         'document_view.xml',
         'document_data.xml',
@@ -55,13 +55,11 @@ ATTENTION:
         'report/document_report_view.xml',
         'board_document_view.xml',
     ],
-    'demo_xml': [ 'document_demo.xml','board_document_demo.xml'],
-    'test': [
-        'test/document_test2.yml',
-    ],
+    'demo': [ 'document_demo.xml','board_document_demo.xml'],
+    'test': ['test/document_test2.yml'],
+    'js': ['static/src/js/document.js'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0070515416461',
     'images': ['images/1_directories.jpeg','images/2_storage_media.jpeg','images/3_directories_structure.jpeg'],
 }
 
diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml
index a802d788e05..986b054383f 100644
--- a/addons/document/board_document_view.xml
+++ b/addons/document/board_document_view.xml
@@ -8,9 +8,6 @@
                 <form string="Document board" version="7.0">
                      <board style="2-1" >
                         <column>
-                            <action string="New Files"
-                                name="%(document.action_view_all_document_tree1)d"
-                                view_mode="tree,form"/>
                              <action string="Files by Month"
                                 name="%(document.action_view_files_by_month_graph)d"
                                 view_mode="graph,tree"/>
diff --git a/addons/document/content_index.py b/addons/document/content_index.py
index 4cf3c8dfed2..399541e1f59 100644
--- a/addons/document/content_index.py
+++ b/addons/document/content_index.py
@@ -51,7 +51,7 @@ class indexer(object):
             return mts[0]
         return None
 
-    def indexContent(self, content, filename=None, realfile = None):
+    def indexContent(self, content, filename=None, realfile=None):
         """ Use either content or the real file, to index.
             Some parsers will work better with the actual
             content, others parse a file easier. Try the
@@ -95,16 +95,15 @@ class indexer(object):
 
         raise NhException('No appropriate method to index file.')
 
-    def _doIndexContent(self,content):
+    def _doIndexContent(self, content):
         raise NhException("Content cannot be handled here.")
 
-    def _doIndexFile(self,fpath):
+    def _doIndexFile(self, fpath):
         raise NhException("Content cannot be handled here.")
 
     def __repr__(self):
         return "<indexer %s.%s>" %(self.__module__, self.__class__.__name__)
 
-
 def mime_match(mime, mdict):
     if mdict.has_key(mime):
         return (mime, mdict[mime])
@@ -136,7 +135,7 @@ class contentIndex(object):
         if not f:
             raise Exception("Your indexer should at least support a mimetype or extension.")
 
-    def doIndex(self, content, filename=None, content_type=None, realfname = None, debug=False):
+    def doIndex(self, content, filename=None, content_type=None, realfname=None, debug=False):
         fobj = None
         fname = None
         mime = None
diff --git a/addons/document/document.py b/addons/document/document.py
index 3ee52f8e4fb..37a0219d143 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -36,8 +36,7 @@ DMS_ROOT_PATH = tools.config.get('document_path', os.path.join(tools.config['roo
 
 class document_file(osv.osv):
     _inherit = 'ir.attachment'
-    _rec_name = 'datas_fname'
-
+    _rec_name = 'name'
 
     def _attach_parent_id(self, cr, uid, ids=None, context=None):
         """Migrate ir.attachments to the document module.
@@ -149,29 +148,12 @@ class document_file(osv.osv):
     _sql_constraints = [
         # filename_uniq is not possible in pure SQL
     ]
-    def _check_duplication(self, cr, uid, vals, ids=[], op='create'):
-        name = vals.get('name', False)
-        parent_id = vals.get('parent_id', False)
-        res_model = vals.get('res_model', False)
-        res_id = vals.get('res_id', 0)
-        if op == 'write':
-            for file in self.browse(cr, uid, ids): # FIXME fields_only
-                if not name:
-                    name = file.name
-                if not parent_id:
-                    parent_id = file.parent_id and file.parent_id.id or False
-                if not res_model:
-                    res_model = file.res_model and file.res_model or False
-                if not res_id:
-                    res_id = file.res_id and file.res_id or 0
-                res = self.search(cr, uid, [('id', '<>', file.id), ('name', '=', name), ('parent_id', '=', parent_id), ('res_model', '=', res_model), ('res_id', '=', res_id)])
-                if len(res):
-                    return False
-        if op == 'create':
-            res = self.search(cr, uid, [('name', '=', name), ('parent_id', '=', parent_id), ('res_id', '=', res_id), ('res_model', '=', res_model)])
-            if len(res):
-                return False
-        return True
+
+    def onchange_file(self, cr, uid, ids, datas_fname=False, context=None):
+        res = {'value':{}}
+        if datas_fname:
+            res['value'].update({'name': datas_fname})
+        return res
 
     def check(self, cr, uid, ids, mode, context=None, values=None):
         """Check access wrt. res_model, relax the rule of ir.attachment parent
@@ -209,7 +191,7 @@ class document_file(osv.osv):
             default = {}
         if 'name' not in default:
             name = self.read(cr, uid, [id], ['name'])[0]['name']
-            default.update({'name': name + " " + _("(copy)")})
+            default.update(name=_("%s (copy)") % (name))
         return super(document_file, self).copy(cr, uid, id, default, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -219,8 +201,6 @@ class document_file(osv.osv):
         res = self.search(cr, uid, [('id', 'in', ids)])
         if not len(res):
             return False
-        if not self._check_duplication(cr, uid, vals, ids, 'write'):
-            raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
 
         # if nodes call this write(), they must skip the code below
         from_node = context and context.get('__from_node', False)
@@ -286,22 +266,8 @@ class document_file(osv.osv):
         else:
             if vals.get('file_size'):
                 del vals['file_size']
-        result = self._check_duplication(cr, uid, vals)
-        if not result:
-            domain = [
-                ('res_id', '=', vals['res_id']),
-                ('res_model', '=', vals['res_model']),
-                ('datas_fname', '=', vals['datas_fname']),
-            ]
-            attach_ids = self.search(cr, uid, domain, context=context)
-            super(document_file, self).write(cr, uid, attach_ids,
-                                             {'datas' : vals['datas']},
-                                             context=context)
-            result = attach_ids[0]
-        else:
-            #raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
-            result = super(document_file, self).create(cr, uid, vals, context)
-        return result
+
+        return super(document_file, self).create(cr, uid, vals, context)
 
     def __get_partner_id(self, cr, uid, res_model, res_id, context=None):
         """ A helper to retrieve the associated partner from any res_model+id
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 0f18673a007..ec51d9bcc6c 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -69,7 +69,7 @@ class document_directory(osv.osv):
     }
 
 
-    def _get_root_directory(self, cr,uid, context=None):
+    def _get_root_directory(self, cr, uid, context=None):
         objid=self.pool.get('ir.model.data')
         try:
             mid = objid._get_id(cr, uid, 'document', 'dir_root')
@@ -77,9 +77,7 @@ class document_directory(osv.osv):
                 return False
             root_id = objid.read(cr, uid, mid, ['res_id'])['res_id']
             return root_id
-        except Exception, e:
-
-            _logger.warning('Cannot set directory root:'+ str(e))
+        except Exception:
             return False
         return objid.browse(cr, uid, mid, context=context).res_id
 
@@ -223,7 +221,7 @@ class document_directory(osv.osv):
                 pass
         return res
 
-    def _locate_child(self, cr, uid, root_id, uri,nparent, ncontext):
+    def _locate_child(self, cr, uid, root_id, uri, nparent, ncontext):
         """ try to locate the node in uri,
             Return a tuple (node_dir, remaining_path)
         """
@@ -233,10 +231,10 @@ class document_directory(osv.osv):
         if not default:
             default ={}
         name = self.read(cr, uid, [id])[0]['name']
-        default.update({'name': name+ " (copy)"})
+        default.update(name=_("%s (copy)") % (name))
         return super(document_directory,self).copy(cr, uid, id, default, context=context)
 
-    def _check_duplication(self, cr, uid, vals, ids=[], op='create'):
+    def _check_duplication(self, cr, uid, vals, ids=None, op='create'):
         name=vals.get('name',False)
         parent_id=vals.get('parent_id',False)
         ressource_parent_type_id=vals.get('ressource_parent_type_id',False)
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index b631583fb27..54776c4d36e 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -228,6 +228,9 @@
         <field name="priority" eval="1"/>
         <field name="inherit_id" ref="base.view_attachment_form"/>
         <field name="arch" type="xml">
+            <xpath expr="//field[@name='datas_fname']" position="replace">
+                <field name="datas_fname" invisible="1" on_change="onchange_file(datas_fname)"/>
+            </xpath>
             <field name="url" position="after">
                 <field name="user_id"/>
             </field>
@@ -338,15 +341,6 @@
         <field name="value" eval="'ir.actions.act_window,%d'%action_document_file_directory_form"/>
     </record>
 
-    <record model="ir.ui.view" id="view_attachment_form_inherit">
-        <field name="name">ir.attachment.view.inherit</field>
-        <field name="model">ir.attachment</field>
-        <field name="inherit_id" ref="base.view_attachment_form"/>
-        <field name="arch" type="xml">
-            <field name="datas_fname" position = "replace" >
-            </field>
-        </field>
-    </record>
 
     <record model="ir.ui.view" id="view_process_node_form_inherit1">
         <field name="name">process.node.form</field>
diff --git a/addons/document/i18n/ar.po b/addons/document/i18n/ar.po
index 49a0c9ad646..2aa6a0dd765 100644
--- a/addons/document/i18n/ar.po
+++ b/addons/document/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/bg.po b/addons/document/i18n/bg.po
index 98952bd2806..4cb873b0ba4 100644
--- a/addons/document/i18n/bg.po
+++ b/addons/document/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/bs.po b/addons/document/i18n/bs.po
index 8e9cf19c19f..4bc74fb50b8 100644
--- a/addons/document/i18n/bs.po
+++ b/addons/document/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/ca.po b/addons/document/i18n/ca.po
index 075eee4906a..57dfaac3a52 100644
--- a/addons/document/i18n/ca.po
+++ b/addons/document/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/cs.po b/addons/document/i18n/cs.po
index b64f9d34d34..398f2df76e5 100644
--- a/addons/document/i18n/cs.po
+++ b/addons/document/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: document
diff --git a/addons/document/i18n/da.po b/addons/document/i18n/da.po
index 0478e923135..5da9b608ece 100644
--- a/addons/document/i18n/da.po
+++ b/addons/document/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/de.po b/addons/document/i18n/de.po
index 6a22cbc0e83..876957c9b4a 100644
--- a/addons/document/i18n/de.po
+++ b/addons/document/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/el.po b/addons/document/i18n/el.po
index ff70f1473ca..6b31ce2a3e8 100644
--- a/addons/document/i18n/el.po
+++ b/addons/document/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/es.po b/addons/document/i18n/es.po
index 7fac82bee79..06d6269b861 100644
--- a/addons/document/i18n/es.po
+++ b/addons/document/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/es_AR.po b/addons/document/i18n/es_AR.po
index 4b270f1a20e..0a37dfb3ca0 100644
--- a/addons/document/i18n/es_AR.po
+++ b/addons/document/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/es_CR.po b/addons/document/i18n/es_CR.po
index acc6bad0d78..c98d5228e1c 100644
--- a/addons/document/i18n/es_CR.po
+++ b/addons/document/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: document
diff --git a/addons/document/i18n/es_EC.po b/addons/document/i18n/es_EC.po
index 69ed68fec0b..ce8f312bf9f 100644
--- a/addons/document/i18n/es_EC.po
+++ b/addons/document/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/es_PY.po b/addons/document/i18n/es_PY.po
index af09dc6bc79..3e672626542 100644
--- a/addons/document/i18n/es_PY.po
+++ b/addons/document/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/et.po b/addons/document/i18n/et.po
index 60af115355c..b0c02e5b84e 100644
--- a/addons/document/i18n/et.po
+++ b/addons/document/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/fi.po b/addons/document/i18n/fi.po
index 432079e9431..6bee6f5afe4 100644
--- a/addons/document/i18n/fi.po
+++ b/addons/document/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/fr.po b/addons/document/i18n/fr.po
index 11ba811195a..00a550ccac1 100644
--- a/addons/document/i18n/fr.po
+++ b/addons/document/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/gl.po b/addons/document/i18n/gl.po
index 4bdcdcf1364..e4ebf9b2e5e 100644
--- a/addons/document/i18n/gl.po
+++ b/addons/document/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/gu.po b/addons/document/i18n/gu.po
index 81114cbb22c..b091e365b65 100644
--- a/addons/document/i18n/gu.po
+++ b/addons/document/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/hi.po b/addons/document/i18n/hi.po
index 5d8362dd745..9292b3f7709 100644
--- a/addons/document/i18n/hi.po
+++ b/addons/document/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/hr.po b/addons/document/i18n/hr.po
index 9d0fc7f18f4..b881c2b5159 100644
--- a/addons/document/i18n/hr.po
+++ b/addons/document/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: document
diff --git a/addons/document/i18n/hu.po b/addons/document/i18n/hu.po
index 49ac94305d0..a18e274e3e4 100644
--- a/addons/document/i18n/hu.po
+++ b/addons/document/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/id.po b/addons/document/i18n/id.po
index a12b7e28ab2..15325e8fad4 100644
--- a/addons/document/i18n/id.po
+++ b/addons/document/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/it.po b/addons/document/i18n/it.po
index 05b30fd5259..3305cd94935 100644
--- a/addons/document/i18n/it.po
+++ b/addons/document/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/ja.po b/addons/document/i18n/ja.po
index e89800eccf1..ddc5b5b75a0 100644
--- a/addons/document/i18n/ja.po
+++ b/addons/document/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/ko.po b/addons/document/i18n/ko.po
index 3cc699fa6d1..bc5a1ce4c1b 100644
--- a/addons/document/i18n/ko.po
+++ b/addons/document/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/lt.po b/addons/document/i18n/lt.po
index 7a24ef1b7ed..34cf519bf8a 100644
--- a/addons/document/i18n/lt.po
+++ b/addons/document/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/lv.po b/addons/document/i18n/lv.po
index 9c45abbf1d1..9e50ea5835a 100644
--- a/addons/document/i18n/lv.po
+++ b/addons/document/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index 9696dc1f54a..ace332271ea 100644
--- a/addons/document/i18n/mn.po
+++ b/addons/document/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/nl.po b/addons/document/i18n/nl.po
index afdb957d360..b58a8b8fd4d 100644
--- a/addons/document/i18n/nl.po
+++ b/addons/document/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/nl_BE.po b/addons/document/i18n/nl_BE.po
index cc83748032f..e4fe88bbeca 100644
--- a/addons/document/i18n/nl_BE.po
+++ b/addons/document/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/pl.po b/addons/document/i18n/pl.po
index 0ba8695d695..cafe2c9ff47 100644
--- a/addons/document/i18n/pl.po
+++ b/addons/document/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/pt.po b/addons/document/i18n/pt.po
index ce51edffd3f..a6ca28a4bc0 100644
--- a/addons/document/i18n/pt.po
+++ b/addons/document/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/pt_BR.po b/addons/document/i18n/pt_BR.po
index d846deb6f9c..ee6de30080c 100644
--- a/addons/document/i18n/pt_BR.po
+++ b/addons/document/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 18:51+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -35,7 +36,7 @@ msgstr "Nome do Campo"
 #. module: document
 #: view:board.board:0
 msgid "Document board"
-msgstr "Board de Documento"
+msgstr "Painel de Documentos"
 
 #. module: document
 #: model:ir.model,name:document.model_process_node
@@ -346,7 +347,7 @@ msgstr "Julho"
 #: model:ir.actions.act_window,name:document.open_board_document_manager
 #: model:ir.ui.menu,name:document.menu_reports_document_manager
 msgid "Document Dashboard"
-msgstr "Dashboard de Documento"
+msgstr "Painel dos Documentos"
 
 #. module: document
 #: field:document.directory.content.type,code:0
@@ -506,7 +507,7 @@ msgstr "Conteúdos"
 #: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
-msgstr "Dada de Criação"
+msgstr "Data de Criação"
 
 #. module: document
 #: help:document.directory.content,include_name:0
@@ -517,7 +518,7 @@ msgid ""
 msgstr ""
 "Marque este campo se você quer que o nome do arquivo contenha o nome do "
 "registro\n"
-"Se definido, a pasta terá que ser um único recurso."
+"Se sim, o diretório deverá ser do tipo recurso."
 
 #. module: document
 #: view:document.configuration:0
@@ -560,8 +561,8 @@ msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
 msgstr ""
-"Junto com o Modelo Parente, este ID anexa esta pasta para um registro "
-"específico ou um Modelo Parente"
+"Junto com o Modelo Superior, este ID anexa esta pasta a um registro "
+"específico de um Modelo Superior"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -652,7 +653,7 @@ msgstr "Janeiro"
 #. module: document
 #: view:ir.attachment:0
 msgid "Related to"
-msgstr "Relacionado ao"
+msgstr "Relacionado a"
 
 #. module: document
 #: view:ir.attachment:0
@@ -667,7 +668,7 @@ msgstr "Painel"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
 msgid "Files By Users"
-msgstr "Arquivos Por Usuários"
+msgstr "Arquivos por Usuários"
 
 #. module: document
 #: field:document.storage,readonly:0
@@ -861,7 +862,7 @@ msgstr "Estático"
 #. module: document
 #: view:report.files.partner:0
 msgid "Files By Partner"
-msgstr "Arquivos Por Parceiro"
+msgstr "Arquivos por Parceiro"
 
 #. module: document
 #: view:ir.attachment:0
@@ -938,7 +939,7 @@ msgstr "Campos"
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr "Ser Marcado, será somente leitura"
+msgstr "Se marcado, será somente leitura"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -979,7 +980,7 @@ msgstr ""
 #. module: document
 #: field:document.directory.content.type,mimetype:0
 msgid "Mime Type"
-msgstr "Mime Type"
+msgstr "Tipo Mime"
 
 #. module: document
 #: view:report.document.user:0
diff --git a/addons/document/i18n/ro.po b/addons/document/i18n/ro.po
index 2d377ccddc2..e499b3acf23 100644
--- a/addons/document/i18n/ro.po
+++ b/addons/document/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index 217f3c830e8..4139fcc7ff0 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -151,7 +151,7 @@ msgstr "Имя каталога должно быть уникальным!"
 #. module: document
 #: view:ir.attachment:0
 msgid "Filter on my documents"
-msgstr ""
+msgstr "Фильтр по моим документам"
 
 #. module: document
 #: field:ir.attachment,index_content:0
@@ -170,7 +170,7 @@ msgstr ""
 #. module: document
 #: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config
 msgid "Knowledge Management"
-msgstr ""
+msgstr "Управление базой знаний"
 
 #. module: document
 #: view:document.directory:0
@@ -385,6 +385,8 @@ msgid ""
 "When executing this wizard, it will configure your directories automatically "
 "according to modules installed."
 msgstr ""
+"При выполнении этого мастера , он настроит каталоги автоматически в "
+"соответствии с установленными модулями."
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -518,7 +520,7 @@ msgstr ""
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Configure Directories"
-msgstr ""
+msgstr "Настройка каталогов"
 
 #. module: document
 #: field:document.directory.content,include_name:0
@@ -672,7 +674,7 @@ msgstr "Только чтение"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 msgid "Document Directory"
-msgstr ""
+msgstr "Каталог документов"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -698,6 +700,11 @@ msgid ""
 "attached to the document, or to print and download any report. This tool "
 "will create directories automatically according to modules installed."
 msgstr ""
+"Система управления документами OpenERP поддерживает отображение виртуальных "
+"папок с документами. Виртуальные папки с документами могут быть использованы "
+"для управления файлами, прикрепленными к документу или печати и загрузки "
+"любого отчета. Этот инструмент создаст каталоги автоматически в соответствии "
+"с установленными модулями."
 
 #. module: document
 #: view:board.board:0
@@ -791,7 +798,7 @@ msgstr "Месяц"
 #. module: document
 #: view:report.document.user:0
 msgid "This Months Files"
-msgstr ""
+msgstr "Файлы этого месяца"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reporting
@@ -856,7 +863,7 @@ msgstr "Файлы по контрагенту"
 #. module: document
 #: view:ir.attachment:0
 msgid "Indexed Content - experimental"
-msgstr ""
+msgstr "Индексированное содержимое - экспериментально"
 
 #. module: document
 #: view:report.document.user:0
@@ -871,7 +878,7 @@ msgstr "Примечания"
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
-msgstr ""
+msgstr "Конфигурация каталога"
 
 #. module: document
 #: help:document.directory,type:0
@@ -974,7 +981,7 @@ msgstr "Тип Mime"
 #. module: document
 #: view:report.document.user:0
 msgid "All Months Files"
-msgstr ""
+msgstr "Файлы за месяц"
 
 #. module: document
 #: field:document.directory.content,name:0
diff --git a/addons/document/i18n/sk.po b/addons/document/i18n/sk.po
index 674774572ab..146b6bbba54 100644
--- a/addons/document/i18n/sk.po
+++ b/addons/document/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/sl.po b/addons/document/i18n/sl.po
index 4f43506b6b9..2299f5f3b17 100644
--- a/addons/document/i18n/sl.po
+++ b/addons/document/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/sq.po b/addons/document/i18n/sq.po
index f6c02e85169..2161fc0e132 100644
--- a/addons/document/i18n/sq.po
+++ b/addons/document/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/sr.po b/addons/document/i18n/sr.po
index 9e8ec311227..7f1c1cab3a2 100644
--- a/addons/document/i18n/sr.po
+++ b/addons/document/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/sr@latin.po b/addons/document/i18n/sr@latin.po
index 49d06f208a4..809e547b5a0 100644
--- a/addons/document/i18n/sr@latin.po
+++ b/addons/document/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/sv.po b/addons/document/i18n/sv.po
index 9c3ec2c2f29..0e8a387a529 100644
--- a/addons/document/i18n/sv.po
+++ b/addons/document/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/tlh.po b/addons/document/i18n/tlh.po
index 1b7ecdf8204..f69eb147759 100644
--- a/addons/document/i18n/tlh.po
+++ b/addons/document/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index b828a9c0961..8645891231f 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/uk.po b/addons/document/i18n/uk.po
index f1104ea53c7..24ac2e7e62c 100644
--- a/addons/document/i18n/uk.po
+++ b/addons/document/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/vi.po b/addons/document/i18n/vi.po
index 7709b3f5536..1ce526af452 100644
--- a/addons/document/i18n/vi.po
+++ b/addons/document/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index 0de55fdab5a..e945acecacc 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/zh_HK.po b/addons/document/i18n/zh_HK.po
index 2c4fc1ddbef..dba08dfbaa3 100644
--- a/addons/document/i18n/zh_HK.po
+++ b/addons/document/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
diff --git a/addons/document/i18n/zh_TW.po b/addons/document/i18n/zh_TW.po
index 116ad3e0868..3532c90ab66 100644
--- a/addons/document/i18n/zh_TW.po
+++ b/addons/document/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-28 03:53+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2012-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -35,7 +35,7 @@ msgstr "名稱欄位"
 #. module: document
 #: view:board.board:0
 msgid "Document board"
-msgstr ""
+msgstr "文件佈告欄"
 
 #. module: document
 #: model:ir.model,name:document.model_process_node
@@ -58,7 +58,7 @@ msgstr "用作資源目錄名稱之欄位。如留空，會用該「名稱」。
 #: view:document.directory:0
 #: view:document.storage:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
@@ -79,7 +79,7 @@ msgstr "檔案"
 #. module: document
 #: view:report.files.partner:0
 msgid "Files per Month"
-msgstr ""
+msgstr "當月文件"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -90,12 +90,12 @@ msgstr "三月"
 #. module: document
 #: view:document.configuration:0
 msgid "title"
-msgstr ""
+msgstr "抬頭"
 
 #. module: document
 #: field:document.directory.dctx,expr:0
 msgid "Expression"
-msgstr "表達式"
+msgstr "表達方式"
 
 #. module: document
 #: view:document.directory:0
@@ -111,7 +111,7 @@ msgstr "目錄內容"
 #. module: document
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "動態背景"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_management_configuration
@@ -125,11 +125,14 @@ msgid ""
 "You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
 "to the current record, in dynamic folders"
 msgstr ""
+"A python expression used to evaluate the field.\n"
+"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
+"to the current record, in dynamic folders"
 
 #. module: document
 #: view:report.document.user:0
 msgid "This Year"
-msgstr "本年"
+msgstr "今年"
 
 #. module: document
 #: field:document.storage,path:0
@@ -146,7 +149,7 @@ msgstr "目錄名不能重覆！"
 #. module: document
 #: view:ir.attachment:0
 msgid "Filter on my documents"
-msgstr ""
+msgstr "過濾我的文件"
 
 #. module: document
 #: field:ir.attachment,index_content:0
@@ -158,12 +161,12 @@ msgstr "已索引內容"
 msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
-msgstr ""
+msgstr "如果正確，所有符合資源的附件會被發現。如果錯誤，只有符合資源的附件會被歸屬。"
 
 #. module: document
 #: model:ir.actions.todo.category,name:document.category_knowledge_mgmt_config
 msgid "Knowledge Management"
-msgstr ""
+msgstr "知識管理"
 
 #. module: document
 #: view:document.directory:0
@@ -175,7 +178,7 @@ msgstr "目錄"
 #. module: document
 #: model:ir.model,name:document.model_report_document_user
 msgid "Files details by Users"
-msgstr "各用戶檔案詳情"
+msgstr "各使用者檔案詳情"
 
 #. module: document
 #: code:addons/document/document_storage.py:573
@@ -187,17 +190,17 @@ msgstr "錯誤！"
 #. module: document
 #: field:document.directory,resource_find_all:0
 msgid "Find all resources"
-msgstr ""
+msgstr "尋找所有資源"
 
 #. module: document
 #: selection:document.directory,type:0
 msgid "Folders per resource"
-msgstr ""
+msgstr "按資源歸類檔案夾"
 
 #. module: document
 #: field:document.directory.content,suffix:0
 msgid "Suffix"
-msgstr "後綴"
+msgstr "字尾"
 
 #. module: document
 #: field:report.document.user,change_date:0
@@ -207,7 +210,7 @@ msgstr "修改日期"
 #. module: document
 #: view:document.configuration:0
 msgid "Knowledge Application Configuration"
-msgstr ""
+msgstr "文管設定"
 
 #. module: document
 #: view:ir.attachment:0
@@ -219,7 +222,7 @@ msgstr "伙伴"
 #. module: document
 #: view:board.board:0
 msgid "Files by Users"
-msgstr "各用戶檔案"
+msgstr "使用者檔案"
 
 #. module: document
 #: field:process.node,directory_id:0
@@ -239,7 +242,7 @@ msgstr "檢驗錯誤"
 #. module: document
 #: model:ir.model,name:document.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_file_form
@@ -252,13 +255,13 @@ msgstr "文件"
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "錯誤! 您不可以建立循環目錄。"
 
 #. module: document
 #: view:document.directory:0
 #: field:document.directory,storage_id:0
 msgid "Storage"
-msgstr ""
+msgstr "存儲器"
 
 #. module: document
 #: field:document.directory,ressource_type_id:0
@@ -292,28 +295,28 @@ msgstr "類型"
 msgid ""
 "Select an object here and there will be one folder per record of that "
 "resource."
-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
 #: model:ir.actions.act_window,name:document.action_view_files_by_partner
 msgid "Files Per Partner"
-msgstr ""
+msgstr "夥伴文件"
 
 #. module: document
 #: field:document.directory,dctx_ids:0
 msgid "Context fields"
-msgstr "脈絡欄位"
+msgstr "內文欄位"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr ""
+msgstr "儲存名稱"
 
 #. module: document
 #: view:document.directory:0
@@ -336,7 +339,7 @@ msgstr "七月"
 #: model:ir.actions.act_window,name:document.open_board_document_manager
 #: model:ir.ui.menu,name:document.menu_reports_document_manager
 msgid "Document Dashboard"
-msgstr "文件儀錶板"
+msgstr "文件控制台"
 
 #. module: document
 #: field:document.directory.content.type,code:0
@@ -346,7 +349,7 @@ msgstr "延伸檔案"
 #. module: document
 #: view:ir.attachment:0
 msgid "Created"
-msgstr ""
+msgstr "已建立"
 
 #. module: document
 #: field:document.directory,content_ids:0
@@ -356,25 +359,25 @@ msgstr "虛擬檔案"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modified"
-msgstr ""
+msgstr "已修改"
 
 #. module: document
 #: code:addons/document/document_storage.py:639
 #, python-format
 msgid "Error at doc write!"
-msgstr ""
+msgstr "文件書寫錯誤!"
 
 #. module: document
 #: view:document.directory:0
 msgid "Generated Files"
-msgstr ""
+msgstr "已產生檔案"
 
 #. module: document
 #: view:document.configuration:0
 msgid ""
 "When executing this wizard, it will configure your directories automatically "
 "according to modules installed."
-msgstr ""
+msgstr "執行這個精靈，它會根據已安裝的模組自動組態您的目錄。"
 
 #. module: document
 #: field:document.directory.content,directory_id:0
@@ -397,7 +400,7 @@ msgstr "安全"
 #: field:document.storage,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
-msgstr "最後修改用戶"
+msgstr "最後修改使用者"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.act_res_partner_document
@@ -425,7 +428,7 @@ msgstr "各目錄檔案詳情"
 #. module: document
 #: view:report.document.user:0
 msgid "All users files"
-msgstr "所有用戶檔案"
+msgstr "所有使用者檔案"
 
 #. module: document
 #: view:board.board:0
@@ -453,18 +456,18 @@ msgstr "靜態目錄"
 #. module: document
 #: field:document.directory,child_ids:0
 msgid "Children"
-msgstr ""
+msgstr "子目錄"
 
 #. module: document
 #: view:document.directory:0
 msgid "Define words in the context, for all child directories and files"
-msgstr ""
+msgstr "在內文中定義所有的子目錄及檔案"
 
 #. module: document
 #: help:document.storage,online:0
 msgid ""
 "If not checked, media is currently offline and its contents not available"
-msgstr ""
+msgstr "如果未檢查，媒體已離線且其內容也無法使用。"
 
 #. module: document
 #: view:document.directory:0
@@ -475,7 +478,7 @@ msgstr ""
 #: field:report.document.user,user_id:0
 #: field:report.document.wall,user_id:0
 msgid "Owner"
-msgstr ""
+msgstr "擁有人"
 
 #. module: document
 #: view:document.directory:0
@@ -492,7 +495,7 @@ msgstr "內容"
 #: field:document.storage,create_date:0
 #: field:report.document.user,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "產生的日期"
 
 #. module: document
 #: help:document.directory.content,include_name:0
@@ -501,12 +504,14 @@ msgid ""
 "name.\n"
 "If set, the directory will have to be a resource one."
 msgstr ""
+"如果您要檔案名稱包含記錄名稱，請檢查這個欄位。\n"
+"如果設定, 這個目錄將會是第一個資源"
 
 #. module: document
 #: view:document.configuration:0
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Configure Directories"
-msgstr ""
+msgstr "目錄組態"
 
 #. module: document
 #: field:document.directory.content,include_name:0
@@ -521,26 +526,26 @@ msgstr "附件"
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
 msgid "Model Id"
-msgstr ""
+msgstr "模型 Id"
 
 #. module: document
 #: field:document.storage,online:0
 msgid "Online"
-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
 #: help:document.directory,ressource_id:0
 msgid ""
 "Along with Parent Model, this ID attaches this folder to a specific record "
 "of Parent Model."
-msgstr ""
+msgstr "隨著母模型，這個ID在這個檔案夾附屬在母模型的特定記錄上。"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -551,7 +556,7 @@ msgstr "八月"
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "目錄不能作自己的母目錄!"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -563,7 +568,7 @@ msgstr "六月"
 #: field:report.document.user,user:0
 #: field:report.document.wall,user:0
 msgid "User"
-msgstr "用戶"
+msgstr "使用者"
 
 #. module: document
 #: field:document.directory,group_ids:0
@@ -574,7 +579,7 @@ msgstr "群組"
 #. module: document
 #: field:document.directory.content.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "啟用"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -596,6 +601,8 @@ msgid ""
 "record, just like attachments. Don't put a parent directory if you select a "
 "parent model."
 msgstr ""
+"如果您在這裡放置一個目標，這個目錄範本將會出現下列所有目標。這種目錄是 \"附件\" "
+"於特定的模型或記錄，就像附屬文件。如果您選擇一個母模型，就不要放置母目錄。"
 
 #. module: document
 #: view:document.directory:0
@@ -611,7 +618,7 @@ msgstr "十月"
 #. module: document
 #: view:document.directory:0
 msgid "Seq."
-msgstr ""
+msgstr "Seq."
 
 #. module: document
 #: selection:document.storage,type:0
@@ -637,12 +644,12 @@ msgstr ""
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Dashboard"
-msgstr "儀錶板"
+msgstr "控制台"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
 msgid "Files By Users"
-msgstr "各用戶檔案"
+msgstr "各使用者檔案"
 
 #. module: document
 #: field:document.storage,readonly:0
@@ -652,7 +659,7 @@ msgstr "唯讀"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_form
 msgid "Document Directory"
-msgstr ""
+msgstr "文件目錄"
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -663,12 +670,12 @@ msgstr "目錄名不能重覆！"
 #: field:document.directory,create_uid:0
 #: field:document.storage,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "建置者"
 
 #. module: document
 #: field:document.directory.content,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "順序"
 
 #. module: document
 #: view:document.configuration:0
@@ -678,6 +685,8 @@ msgid ""
 "attached to the document, or to print and download any report. This tool "
 "will create directories automatically according to modules installed."
 msgstr ""
+"OpenERP's "
+"文件管理系統支援虛擬檔案夾與文件配對。文件的虛擬檔案夾可以用來管理文件的附件，或列印及下載任何報表。這個工具會根據安裝的模組自動產生目錄。"
 
 #. module: document
 #: view:board.board:0
@@ -695,7 +704,7 @@ msgstr "九月"
 #. module: document
 #: field:document.directory.content,prefix:0
 msgid "Prefix"
-msgstr "前綴"
+msgstr "字尾"
 
 #. module: document
 #: field:report.document.wall,last:0
@@ -710,7 +719,7 @@ msgstr "檔案名稱"
 #. module: document
 #: view:document.configuration:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: document
 #: field:document.directory,ressource_id:0
@@ -720,19 +729,19 @@ msgstr "資源ID"
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr ""
+msgstr "外部檔案儲存"
 
 #. module: document
 #: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_wall
 #: view:report.document.wall:0
 msgid "Wall of Shame"
-msgstr ""
+msgstr "排行榜"
 
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "關於檔案儲存，儲存的根路徑"
 
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
@@ -747,17 +756,17 @@ msgstr "欄位"
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
 msgid "Directory Dynamic Context"
-msgstr ""
+msgstr "目錄動態內文"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr ""
+msgstr "母模型"
 
 #. module: document
 #: view:report.document.user:0
 msgid "Files by users"
-msgstr "各用戶檔案"
+msgstr "各使用者檔案"
 
 #. module: document
 #: field:report.document.file,month:0
@@ -771,12 +780,12 @@ msgstr "月"
 #. module: document
 #: view:report.document.user:0
 msgid "This Months Files"
-msgstr ""
+msgstr "當月檔案"
 
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reporting
 msgid "Reporting"
-msgstr "報告"
+msgstr "報表"
 
 #. module: document
 #: field:document.directory,ressource_tree:0
@@ -792,29 +801,29 @@ msgstr "五月"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
 msgid "All Users files"
-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
 #: model:ir.actions.act_window,help:document.action_document_file_form
 msgid ""
 "The Documents repository gives you access to all attachments, such as mails, "
 "project documents, invoices etc."
-msgstr ""
+msgstr "文件儲存室讓您可以存取所有附件，如電郵、專案文件、商業發票等"
 
 #. module: document
 #: view:document.directory:0
 msgid "For each entry here, virtual files will appear in this folder."
-msgstr ""
+msgstr "對於每一輸入，虛擬檔案在檔案夾中出現"
 
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: document
 #: view:board.board:0
@@ -834,7 +843,7 @@ msgstr "各伙伴檔案"
 #. module: document
 #: view:ir.attachment:0
 msgid "Indexed Content - experimental"
-msgstr ""
+msgstr "已索引內容 - 實驗性質"
 
 #. module: document
 #: view:report.document.user:0
@@ -844,12 +853,12 @@ msgstr "本月"
 #. module: document
 #: view:ir.attachment:0
 msgid "Notes"
-msgstr "注解"
+msgstr "備註"
 
 #. module: document
 #: model:ir.model,name:document.model_document_configuration
 msgid "Directory Configuration"
-msgstr ""
+msgstr "目錄組態"
 
 #. module: document
 #: help:document.directory,type:0
@@ -860,6 +869,8 @@ msgid ""
 "resources automatically possess sub-directories for each of resource types "
 "defined in the parent directory."
 msgstr ""
+"每一個目錄可以是靜態或連接於另一個資源。一個靜態的目錄與其作業系統，是一個典型的目錄可以包含一組檔案。這個目錄連接於系統資源，在母目錄中按資源別自動持有次"
+"目錄。"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -871,14 +882,14 @@ msgstr "二月"
 #: model:ir.actions.act_window,name:document.open_board_document_manager1
 #: model:ir.ui.menu,name:document.menu_reports_document_manager1
 msgid "Statistics by User"
-msgstr "各用戶統計"
+msgstr "各使用者統計"
 
 #. module: document
 #: help:document.directory.dctx,field:0
 msgid ""
 "The name of the field. Note that the prefix \"dctx_\" will be prepended to "
 "what is typed here."
-msgstr ""
+msgstr "這個欄位名稱的字首包含\"dctx_\" 將會根據這裡的輸入預先決定。"
 
 #. module: document
 #: field:document.directory,name:0
@@ -889,7 +900,7 @@ msgstr "名稱"
 #. module: document
 #: sql_constraint:document.storage:0
 msgid "The storage path must be unique!"
-msgstr ""
+msgstr "儲存路徑不能重複!"
 
 #. module: document
 #: view:document.directory:0
@@ -899,7 +910,7 @@ msgstr "欄位"
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr ""
+msgstr "如果設定，媒體只能唯讀。"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -918,21 +929,21 @@ msgstr "檔案數"
 #: code:addons/document/document.py:209
 #, python-format
 msgid "(copy)"
-msgstr ""
+msgstr "(copy)"
 
 #. module: document
 #: view:document.directory:0
 msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
-msgstr ""
+msgstr "只有這個群組中的數字，才能存取這個目錄及其檔案。"
 
 #. module: document
 #: view:document.directory:0
 msgid ""
 "These groups, however, do NOT apply to children directories, which must "
 "define their own groups."
-msgstr ""
+msgstr "雖然這些模組沒有子目錄，但是還是要定義它們自己的群組。"
 
 #. module: document
 #: field:document.directory.content.type,mimetype:0
@@ -942,7 +953,7 @@ msgstr "Mime 類型"
 #. module: document
 #: view:report.document.user:0
 msgid "All Months Files"
-msgstr ""
+msgstr "所有月份文件"
 
 #. module: document
 #: field:document.directory.content,name:0
@@ -959,12 +970,12 @@ msgstr "檔案名不能重覆！"
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr ""
+msgstr "內部文件儲存"
 
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "目錄必須要有母目錄或儲存"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
@@ -1030,3 +1041,6 @@ msgstr "文件類型"
 
 #~ msgid "Product"
 #~ msgstr "產品"
+
+#~ msgid "Attached To"
+#~ msgstr "附屬於"
diff --git a/addons/document/nodes.py b/addons/document/nodes.py
index f1c3c71a8e6..aeb2e64fc97 100644
--- a/addons/document/nodes.py
+++ b/addons/document/nodes.py
@@ -103,7 +103,7 @@ class node_context(object):
     def get(self, name, default=None):
         return self.context.get(name, default)
 
-    def get_uri(self, cr,  uri):
+    def get_uri(self, cr, uri):
         """ Although this fn passes back to doc.dir, it is needed since
             it is a potential caching point.
         """
@@ -252,7 +252,7 @@ class node_class(object):
         print "node_class.children()"
         return [] #stub
 
-    def child(self,cr, name, domain=None):
+    def child(self, cr, name, domain=None):
         print "node_class.child()"
         return None
 
@@ -270,7 +270,7 @@ class node_class(object):
         print "node_class.path_get()"
         return False
 
-    def get_data(self,cr):
+    def get_data(self, cr):
         raise TypeError('No data for %s.'% self.type)
 
     def open_data(self, cr, mode):
@@ -287,10 +287,10 @@ class node_class(object):
         """
         raise TypeError('No data for %s.' % self.type)
 
-    def _get_storage(self,cr):
+    def _get_storage(self, cr):
         raise RuntimeError("No storage for base class.")
 
-    def get_etag(self,cr):
+    def get_etag(self, cr):
         """ Get a tag, unique per object + modification.
 
             see. http://tools.ietf.org/html/rfc2616#section-13.3.3 """
@@ -434,7 +434,9 @@ class node_database(node_class):
 
     """
     our_type = 'database'
-    def __init__(self, path=[], parent=False, context=None):
+    def __init__(self, path=None, parent=False, context=None):
+        if path is None:
+            path = []
         super(node_database,self).__init__(path, parent, context)
         self.unixperms = 040750
         self.uidperms = 5
@@ -477,11 +479,11 @@ class node_database(node_class):
 
         return res
 
-    def _file_get(self,cr, nodename=False):
+    def _file_get(self, cr, nodename=False):
         res = []
         return res
 
-    def _get_ttag(self,cr):
+    def _get_ttag(self, cr):
         return 'db-%s' % cr.dbname
 
 def mkdosname(company_name, default='noname'):
@@ -666,7 +668,6 @@ class node_dir(node_database):
 
         return dirobj.create(cr, uid, val)
 
-
     def create_child(self, cr, path, data=None):
         """ API function to create a child file object and node
             Return the node_* created
@@ -693,7 +694,7 @@ class node_dir(node_database):
             fnode.set_data(cr, data, fil)
         return fnode
 
-    def _get_ttag(self,cr):
+    def _get_ttag(self, cr):
         return 'dir-%d' % self.dir_id
 
     def move_to(self, cr, ndir_node, new_name=False, fil_obj=None, ndir_obj=None, in_write=False):
@@ -802,7 +803,7 @@ class node_res_dir(node_class):
     def children(self, cr, domain=None):
         return self._child_get(cr, domain=domain)
 
-    def child(self,cr, name, domain=None):
+    def child(self, cr, name, domain=None):
         res = self._child_get(cr, name, domain=domain)
         if res:
             return res[0]
@@ -822,6 +823,7 @@ class node_res_dir(node_class):
         uid = self.context.uid
         ctx = self.context.context.copy()
         ctx.update(self.dctx)
+        ctx.update(self.context.extra_ctx)
         where = []
         if self.domain:
             app = safe_eval(self.domain, ctx)
@@ -878,7 +880,7 @@ class node_res_dir(node_class):
             res.append(self.res_obj_class(res_name, self.dir_id, self, self.context, self.res_model, bo))
         return res
 
-    def _get_ttag(self,cr):
+    def _get_ttag(self, cr):
         return 'rdir-%d' % self.dir_id
 
 class node_res_obj(node_class):
@@ -889,7 +891,7 @@ class node_res_obj(node_class):
         node_dirs (with limited domain).
         """
     our_type = 'collection'
-    def __init__(self, path, dir_id, parent, context, res_model, res_bo, res_id = None):
+    def __init__(self, path, dir_id, parent, context, res_model, res_bo, res_id=None):
         super(node_res_obj,self).__init__(path, parent,context)
         assert parent
         #todo: more info from dirr
@@ -958,7 +960,7 @@ class node_res_obj(node_class):
             return res[0]
         return None
 
-    def _file_get(self,cr, nodename=False):
+    def _file_get(self, cr, nodename=False):
         res = []
         is_allowed = self.check_perms((nodename and 1) or 5)
         if not is_allowed:
@@ -1160,7 +1162,7 @@ class node_res_obj(node_class):
             fnode.set_data(cr, data, fil)
         return fnode
 
-    def _get_ttag(self,cr):
+    def _get_ttag(self, cr):
         return 'rodir-%d-%d' % (self.dir_id, self.res_id)
 
 node_res_dir.res_obj_class = node_res_obj
@@ -1210,7 +1212,6 @@ class node_file(node_class):
             return False
         return self.file_id == other.file_id
 
-
     def open_data(self, cr, mode):
         stor = self.storage_id
         assert stor, "No storage for file #%s." % self.file_id
@@ -1262,7 +1263,7 @@ class node_file(node_class):
         else:
             self.path = dirpath[0]
 
-    def get_data(self, cr, fil_obj = None):
+    def get_data(self, cr, fil_obj=None):
         """ Retrieve the data for some file.
             fil_obj may optionally be specified, and should be a browse object
             for the file. This is useful when the caller has already initiated
@@ -1278,14 +1279,14 @@ class node_file(node_class):
         stobj = self.context._dirobj.pool.get('document.storage')
         return stobj.get_data(cr, self.context.uid,stor, self,self.context.context, fil_obj)
 
-    def get_data_len(self, cr, fil_obj = None):
+    def get_data_len(self, cr, fil_obj=None):
         # TODO: verify with the storage object!
         bin_size = self.context.context.get('bin_size', False)
         if bin_size and not self.content_length:
             self.content_length = fil_obj.db_datas
         return self.content_length
 
-    def set_data(self, cr, data, fil_obj = None):
+    def set_data(self, cr, data, fil_obj=None):
         """ Store data at some file.
             fil_obj may optionally be specified, and should be a browse object
             for the file. This is useful when the caller has already initiated
@@ -1299,7 +1300,7 @@ class node_file(node_class):
         stobj = self.context._dirobj.pool.get('document.storage')
         return stobj.set_data(cr, self.context.uid,stor, self, data, self.context.context, fil_obj)
 
-    def _get_ttag(self,cr):
+    def _get_ttag(self, cr):
         return 'file-%d' % self.file_id
 
     def move_to(self, cr, ndir_node, new_name=False, fil_obj=None, ndir_obj=None, in_write=False):
@@ -1362,7 +1363,7 @@ class node_file(node_class):
 
 class node_content(node_class):
     our_type = 'content'
-    def __init__(self, path, parent, context, cnt, dctx = None, act_id=None):
+    def __init__(self, path, parent, context, cnt, dctx=None, act_id=None):
         super(node_content,self).__init__(path, parent,context)
         self.cnt_id = cnt.id
         self.create_date = False
@@ -1382,7 +1383,7 @@ class node_content(node_class):
            self.dctx.update(dctx)
         self.act_id = act_id
 
-    def fill_fields(self, cr, dctx = None):
+    def fill_fields(self, cr, dctx=None):
         """ Try to read the object and fill missing fields, like mimetype,
             dates etc.
             This function must be different from the constructor, because
@@ -1395,8 +1396,7 @@ class node_content(node_class):
         if res and res[0][0]:
             self.mimetype = str(res[0][0])
 
-
-    def get_data(self, cr, fil_obj = None):
+    def get_data(self, cr, fil_obj=None):
         cntobj = self.context._dirobj.pool.get('document.directory.content')
         if not self.check_perms(4):
             raise IOError(errno.EPERM, "Permission denied.")
@@ -1426,7 +1426,7 @@ class node_content(node_class):
 
         return nodefd_content(self, cr, mode, ctx)
 
-    def get_data_len(self, cr, fil_obj = None):
+    def get_data_len(self, cr, fil_obj=None):
         # FIXME : here, we actually generate the content twice!!
         # we should have cached the generated content, but it is
         # not advisable to do keep it in memory, until we have a cache
@@ -1435,7 +1435,7 @@ class node_content(node_class):
             self.get_data(cr,fil_obj)
         return self.content_length
 
-    def set_data(self, cr, data, fil_obj = None):
+    def set_data(self, cr, data, fil_obj=None):
         cntobj = self.context._dirobj.pool.get('document.directory.content')
         if not self.check_perms(2):
             raise IOError(errno.EPERM, "Permission denied.")
@@ -1444,7 +1444,7 @@ class node_content(node_class):
         ctx.update(self.dctx)
         return cntobj.process_write(cr, self.context.uid, self, data, ctx)
 
-    def _get_ttag(self,cr):
+    def _get_ttag(self, cr):
         return 'cnt-%d%s' % (self.cnt_id,(self.act_id and ('-' + str(self.act_id))) or '')
 
     def get_dav_resourcetype(self, cr):
@@ -1558,5 +1558,4 @@ class nodefd_static(StringIO, node_descriptor):
             cr.close()
         StringIO.close(self)
 
-#eof
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document/odt2txt.py b/addons/document/odt2txt.py
old mode 100755
new mode 100644
index 9ca9b6e596f..8a3dc59d9ed
--- a/addons/document/odt2txt.py
+++ b/addons/document/odt2txt.py
@@ -24,11 +24,11 @@ import sys, zipfile, xml.dom.minidom
 import StringIO
 
 class OpenDocumentTextFile :
-    def __init__ (self, filepath) :
+    def __init__ (self, filepath):
         zip = zipfile.ZipFile(filepath)
         self.content = xml.dom.minidom.parseString(zip.read("content.xml"))
 
-    def toString (self) :
+    def toString (self):
         """ Converts the document to a string. """
         buffer = u""
         for val in ["text:p", "text:h", "text:list"]:
@@ -36,7 +36,7 @@ class OpenDocumentTextFile :
                 buffer += self.textToString(paragraph) + "\n"
         return buffer
 
-    def textToString(self, element) :
+    def textToString(self, element):
         buffer = u""
         for node in element.childNodes :
             if node.nodeType == xml.dom.Node.TEXT_NODE :
diff --git a/addons/document/report/document_report_view.xml b/addons/document/report/document_report_view.xml
index 2a8b9f34ddf..2740967d53a 100644
--- a/addons/document/report/document_report_view.xml
+++ b/addons/document/report/document_report_view.xml
@@ -114,7 +114,7 @@
             <field name="model">report.document.user</field>
             <field name="arch" type="xml">
                 <graph string="Files by User" type="pie">
-                    <field name="user" />
+                    <field name="user_id" />
                     <field name="nbr" operator="+"/>
                 </graph>
             </field>
diff --git a/addons/document/static/src/js/document.js b/addons/document/static/src/js/document.js
new file mode 100644
index 00000000000..23f1375e8c8
--- /dev/null
+++ b/addons/document/static/src/js/document.js
@@ -0,0 +1,23 @@
+openerp.document = function (instance) {
+    _t = instance.web._t;
+    instance.web.Sidebar.include({
+        init : function(){
+            this._super.apply(this, arguments);
+            this.sections.splice(1, 0, { 'name' : 'files', 'label' : _t('Attachment(s)'), });
+            this.items['files'] = [];
+        },
+        on_attachments_loaded: function(attachments) {
+            //to display number in name if more then one attachment which has same name.
+            var self = this;
+            _.chain(attachments.reverse())
+                 .groupBy(function(attachment) { return attachment.name})
+                 .each(function(attachment){
+                     if(attachment.length > 1)
+                         _.map(attachment, function(attachment, i){
+                             attachment.name = _.str.sprintf(_t("%s (%s)"), attachment.name, i+1)
+                         })
+                  })
+            self._super(attachments);
+        },
+    });
+};
diff --git a/addons/document/std_index.py b/addons/document/std_index.py
index 422590e127f..b20874e72f8 100644
--- a/addons/document/std_index.py
+++ b/addons/document/std_index.py
@@ -39,7 +39,7 @@ def _to_unicode(s):
             except UnicodeError:
                 return s
 
-def textToString(element) :
+def textToString(element):
     buffer = u""
     for node in element.childNodes :
         if node.nodeType == xml.dom.Node.TEXT_NODE :
@@ -56,7 +56,7 @@ class TxtIndex(indexer):
     def _getExtensions(self):
         return ['.txt', '.py']
 
-    def _doIndexContent(self,content):
+    def _doIndexContent(self, content):
         return content
 
 cntIndex.register(TxtIndex())
@@ -68,7 +68,7 @@ class PptxIndex(indexer):
     def _getExtensions(self):
         return ['.pptx']
 
-    def _doIndexFile(self,fname):
+    def _doIndexFile(self, fname):
         def toString () :
             """ Converts the document to a string. """
             buffer = u""
@@ -96,14 +96,14 @@ class DocIndex(indexer):
     def _getExtensions(self):
         return ['.doc']
 
-    def _doIndexFile(self,fname):
+    def _doIndexFile(self, fname):
         try:
             pop = Popen(['antiword', fname], shell=False, stdout=PIPE)
             (data, _) = pop.communicate()
             return _to_unicode(data)
         except OSError:
             
-            _logger.warn("Failed attempt to execute antiword (MS Word reader). Antiword is necessary to index the file %s of MIME type %s. Detailed error available at DEBUG level.", fname, self._getMimeTypes()[0])
+            _logger.warning("Failed attempt to execute antiword (MS Word reader). Antiword is necessary to index the file %s of MIME type %s. Detailed error available at DEBUG level.", fname, self._getMimeTypes()[0])
             _logger.debug("Trace of the failed file indexing attempt.", exc_info=True)
             return False
     
@@ -116,7 +116,7 @@ class DocxIndex(indexer):
     def _getExtensions(self):
         return ['.docx']
 
-    def _doIndexFile(self,fname):
+    def _doIndexFile(self, fname):
         zip = zipfile.ZipFile(fname)
         content = xml.dom.minidom.parseString(zip.read("word/document.xml"))
         def toString () :
@@ -141,7 +141,7 @@ class XlsxIndex(indexer):
     def _getExtensions(self):
         return ['.xlsx']
 
-    def _doIndexFile(self,fname):
+    def _doIndexFile(self, fname):
         zip = zipfile.ZipFile(fname)
         content = xml.dom.minidom.parseString(zip.read("xl/sharedStrings.xml"))
         def toString () :
@@ -165,7 +165,7 @@ class PdfIndex(indexer):
     def _getExtensions(self):
         return ['.pdf']
 
-    def _doIndexFile(self,fname):
+    def _doIndexFile(self, fname):
         pop = Popen(['pdftotext', '-enc', 'UTF-8', '-nopgbrk', fname, '-'], shell=False, stdout=PIPE)
         (data, _) = pop.communicate()
         return _to_unicode(data)
@@ -181,7 +181,7 @@ class ImageNoIndex(indexer):
         return []
         #return ['.png','.jpg','.gif','.jpeg','.bmp','.tiff']
 
-    def _doIndexContent(self,content):
+    def _doIndexContent(self, content):
         return 'image'
 
 
diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py
index 17275eaebbd..23ff8f1e37d 100644
--- a/addons/document_ftp/__openerp__.py
+++ b/addons/document_ftp/__openerp__.py
@@ -35,21 +35,19 @@ FTP client.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'document'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'wizard/ftp_configuration_view.xml',
         'wizard/ftp_browse_view.xml',
         'security/ir.model.access.csv',
         'res_config_view.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'test': [
         'test/document_ftp_test2.yml',
         'test/document_ftp_test4.yml',
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '00934787762705016005',
     'images': ['images/1_configure_ftp.jpeg','images/2_document_browse.jpeg','images/3_document_ftp.jpeg'],
     'post_load': 'post_load',
 }
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index dbda715f614..326c62f7a92 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -272,7 +272,7 @@ class abstracted_fs(object):
             if path.startswith('/'):
                 path = path[1:]
 
-        p_parts = path.split('/') # hard-code the unix sep here, by spec.
+        p_parts = path.split(os.sep)
 
         assert '..' not in p_parts
 
diff --git a/addons/document_ftp/i18n/ar.po b/addons/document_ftp/i18n/ar.po
index 7afe1f3c24f..5186dda5b8d 100644
--- a/addons/document_ftp/i18n/ar.po
+++ b/addons/document_ftp/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/bg.po b/addons/document_ftp/i18n/bg.po
index 65a3e6f4f22..7bf34661110 100644
--- a/addons/document_ftp/i18n/bg.po
+++ b/addons/document_ftp/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/ca.po b/addons/document_ftp/i18n/ca.po
index 387f5aa3bb2..ace72e819a3 100644
--- a/addons/document_ftp/i18n/ca.po
+++ b/addons/document_ftp/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/cs.po b/addons/document_ftp/i18n/cs.po
index db81e19de42..507b258880a 100644
--- a/addons/document_ftp/i18n/cs.po
+++ b/addons/document_ftp/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/da.po b/addons/document_ftp/i18n/da.po
index 97fd3f343d1..ece9cdac416 100644
--- a/addons/document_ftp/i18n/da.po
+++ b/addons/document_ftp/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/de.po b/addons/document_ftp/i18n/de.po
index 873fbc31195..074941957ac 100644
--- a/addons/document_ftp/i18n/de.po
+++ b/addons/document_ftp/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/el.po b/addons/document_ftp/i18n/el.po
index 678f6d11951..5d9537a0193 100644
--- a/addons/document_ftp/i18n/el.po
+++ b/addons/document_ftp/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/en_GB.po b/addons/document_ftp/i18n/en_GB.po
index 7ac3aeb0096..9c95463eb9c 100644
--- a/addons/document_ftp/i18n/en_GB.po
+++ b/addons/document_ftp/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/es.po b/addons/document_ftp/i18n/es.po
index 57763cab2c5..ece36cc4d85 100644
--- a/addons/document_ftp/i18n/es.po
+++ b/addons/document_ftp/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/es_CR.po b/addons/document_ftp/i18n/es_CR.po
index 09b71c7c254..bb9a990946c 100644
--- a/addons/document_ftp/i18n/es_CR.po
+++ b/addons/document_ftp/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/i18n/es_EC.po b/addons/document_ftp/i18n/es_EC.po
index aacdd74eff4..c74c6d5f13c 100644
--- a/addons/document_ftp/i18n/es_EC.po
+++ b/addons/document_ftp/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/es_PY.po b/addons/document_ftp/i18n/es_PY.po
index 34021fe7be3..e0f484d71b7 100644
--- a/addons/document_ftp/i18n/es_PY.po
+++ b/addons/document_ftp/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/et.po b/addons/document_ftp/i18n/et.po
index 03d9ce901b3..fc1dc56f2e3 100644
--- a/addons/document_ftp/i18n/et.po
+++ b/addons/document_ftp/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/fi.po b/addons/document_ftp/i18n/fi.po
index 5f294b5a59e..2950f734c78 100644
--- a/addons/document_ftp/i18n/fi.po
+++ b/addons/document_ftp/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/fr.po b/addons/document_ftp/i18n/fr.po
index b7c54bdf01e..5b4ae8eb143 100644
--- a/addons/document_ftp/i18n/fr.po
+++ b/addons/document_ftp/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/gl.po b/addons/document_ftp/i18n/gl.po
index ce39b718655..6299d1997a1 100644
--- a/addons/document_ftp/i18n/gl.po
+++ b/addons/document_ftp/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/hr.po b/addons/document_ftp/i18n/hr.po
index 4e276f18569..335ce0636bb 100644
--- a/addons/document_ftp/i18n/hr.po
+++ b/addons/document_ftp/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/hu.po b/addons/document_ftp/i18n/hu.po
index 7b9931056b8..908c2064d8b 100644
--- a/addons/document_ftp/i18n/hu.po
+++ b/addons/document_ftp/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/it.po b/addons/document_ftp/i18n/it.po
index c2c72215bf8..e76eee8694a 100644
--- a/addons/document_ftp/i18n/it.po
+++ b/addons/document_ftp/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/ja.po b/addons/document_ftp/i18n/ja.po
index 35d4ca095a7..a6fd2441260 100644
--- a/addons/document_ftp/i18n/ja.po
+++ b/addons/document_ftp/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/mn.po b/addons/document_ftp/i18n/mn.po
new file mode 100644
index 00000000000..d7fbd810b60
--- /dev/null
+++ b/addons/document_ftp/i18n/mn.po
@@ -0,0 +1,119 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-22 03:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "Автомат Директорын Тохиргоо"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid ""
+"Indicate the network address on which your OpenERP server should be "
+"reachable for end-users. This depends on your network topology and "
+"configuration, and will only affect the links displayed to the users. The "
+"format is HOST:PORT and the default host (localhost) is only suitable for "
+"access from the server machine itself.."
+msgstr ""
+"Эцсийн хэрэглэгчидийн OpenERP-руу хандаж чадах сүлжээний хаягийг илэрхийлнэ. "
+"Энэ танай сүлжээний бүтэц, тохиргооноос хамаарах бөгөөд зөвхөн хэрэглэгчдэд "
+"харагдах холбоост л нөлөөтэй. Формат нь HOST:PORT гэсэн загвартай бөгөөд "
+"анхын host нь (localhost) гэж байдаг нь зөвхөн сервер машин дээрээс хандахад "
+"л тохирно."
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Файлуудыг тольдох"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Зураг"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "Хаяг"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP Сервер"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "FTP Серверийн тохиргоо"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_Тольдох"
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr "DMS хандалтаар хандах серверийн хаяг эсвэл IP болон порт."
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "Агуулахыг хуваалцах (FTP)"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "_Цуцлах"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "FTP Сервэр тохируулах"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "гарчиг"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "FTP-ээр баримт оруулах"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "Мэдлэгийн Програмын Тохиргоо"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "Баримт оруулах"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "Оруулах баримт"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/document_ftp/i18n/nb.po b/addons/document_ftp/i18n/nb.po
new file mode 100644
index 00000000000..04cf47be981
--- /dev/null
+++ b/addons/document_ftp/i18n/nb.po
@@ -0,0 +1,121 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-06 14:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "Automatisk Katalog Konfigurasjon."
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid ""
+"Indicate the network address on which your OpenERP server should be "
+"reachable for end-users. This depends on your network topology and "
+"configuration, and will only affect the links displayed to the users. The "
+"format is HOST:PORT and the default host (localhost) is only suitable for "
+"access from the server machine itself.."
+msgstr ""
+"Indikere nettverksadressen som din OpenERP server bør være tilgjengelige for "
+"sluttbrukerne. Dette avhenger av nettverkstopologi og konfigurasjon, og vil "
+"bare påvirke lenker som vises til brukerne. Formatet er HOST: PORT og "
+"standard verten (lokalhost) er bare egnet for tilgang fra serveren maskinen "
+"selv .."
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Bla i filer"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Bilde"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "Adresse"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP-tjener"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "FTP Serverkonfigurasjon"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_Bla gjennom"
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr ""
+"Server adresse eller IP og port til hvilke brukere som skal koble seg til "
+"for DMS tilgang"
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "Wikimedia Commons (FTP)"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "Konfigurer FTP serveren"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "tittel"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "Document FTP Bla i."
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "Kunnskap Programkonfigurasjon"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "Dokument Bla i."
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "Bla igjennom dokument"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_konfig_innhold"
diff --git a/addons/document_ftp/i18n/nl.po b/addons/document_ftp/i18n/nl.po
index 274c59eb134..d5d63691083 100644
--- a/addons/document_ftp/i18n/nl.po
+++ b/addons/document_ftp/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/pl.po b/addons/document_ftp/i18n/pl.po
index 408fd4f3a40..13aeae32cac 100644
--- a/addons/document_ftp/i18n/pl.po
+++ b/addons/document_ftp/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/pt.po b/addons/document_ftp/i18n/pt.po
index 5fa71c57864..354eb2f829b 100644
--- a/addons/document_ftp/i18n/pt.po
+++ b/addons/document_ftp/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/pt_BR.po b/addons/document_ftp/i18n/pt_BR.po
index 7f7554a492b..d270322825b 100644
--- a/addons/document_ftp/i18n/pt_BR.po
+++ b/addons/document_ftp/i18n/pt_BR.po
@@ -15,13 +15,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
 msgid "Auto Directory Configuration"
-msgstr "Configuração de Diretório Automático"
+msgstr "Configuração Automática de Diretório"
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
@@ -65,7 +65,7 @@ msgstr "Configuração do Servidor FTP"
 #. module: document_ftp
 #: view:document.ftp.browse:0
 msgid "_Browse"
-msgstr "_Navegar"
+msgstr "(_B) Navegar"
 
 #. module: document_ftp
 #: help:document.ftp.configuration,host:0
diff --git a/addons/document_ftp/i18n/ro.po b/addons/document_ftp/i18n/ro.po
index a91527939f8..aefa319e5a2 100644
--- a/addons/document_ftp/i18n/ro.po
+++ b/addons/document_ftp/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/ru.po b/addons/document_ftp/i18n/ru.po
index e3ff6440252..effa47235cc 100644
--- a/addons/document_ftp/i18n/ru.po
+++ b/addons/document_ftp/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/sk.po b/addons/document_ftp/i18n/sk.po
index d99fb8e83bb..10e695b1556 100644
--- a/addons/document_ftp/i18n/sk.po
+++ b/addons/document_ftp/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/sl.po b/addons/document_ftp/i18n/sl.po
index f1a9e21395f..0b65ada28e9 100644
--- a/addons/document_ftp/i18n/sl.po
+++ b/addons/document_ftp/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/sr.po b/addons/document_ftp/i18n/sr.po
index aaa2cda98b7..e6eb5e24ab8 100644
--- a/addons/document_ftp/i18n/sr.po
+++ b/addons/document_ftp/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/sr@latin.po b/addons/document_ftp/i18n/sr@latin.po
index ed919dbeb6e..d3fdff17ed6 100644
--- a/addons/document_ftp/i18n/sr@latin.po
+++ b/addons/document_ftp/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/sv.po b/addons/document_ftp/i18n/sv.po
index ccf3b16ceea..70fbd50cf93 100644
--- a/addons/document_ftp/i18n/sv.po
+++ b/addons/document_ftp/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/tr.po b/addons/document_ftp/i18n/tr.po
index dd79d1610b6..ebf90f10677 100644
--- a/addons/document_ftp/i18n/tr.po
+++ b/addons/document_ftp/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/zh_CN.po b/addons/document_ftp/i18n/zh_CN.po
index 20a52f0fd42..8815acfd89d 100644
--- a/addons/document_ftp/i18n/zh_CN.po
+++ b/addons/document_ftp/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_configuration
diff --git a/addons/document_ftp/i18n/zh_TW.po b/addons/document_ftp/i18n/zh_TW.po
new file mode 100644
index 00000000000..70819062283
--- /dev/null
+++ b/addons/document_ftp/i18n/zh_TW.po
@@ -0,0 +1,116 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-29 09:46+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "自動目錄配置"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid ""
+"Indicate the network address on which your OpenERP server should be "
+"reachable for end-users. This depends on your network topology and "
+"configuration, and will only affect the links displayed to the users. The "
+"format is HOST:PORT and the default host (localhost) is only suitable for "
+"access from the server machine itself.."
+msgstr ""
+"說明OpenERP的服務器上的網絡地址應該為最終用戶訪問。這取決於您的網絡拓撲和配置，而且只會影響顯示給用戶的鏈接。的格式為HOST：PORT和預設的主機"
+"（localhost）的訪問從服務器本身只適合.."
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "瀏覽檔案"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "圖像"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,host:0
+msgid "Address"
+msgstr "地址"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP 伺服器"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "FTP Server Configuration"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "瀏覽(_B)"
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr "服務器地址或IP地址和端口，用戶應該連接到DMS訪問"
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "供享的儲存庫"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr "設置FTP 伺服器"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "標題"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "瀏覽FTP文件"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr "知識應用配置"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "文件瀏覽"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "瀏覽文件"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
index b1120bc6511..8260424d653 100644
--- a/addons/document_ftp/wizard/ftp_browse.py
+++ b/addons/document_ftp/wizard/ftp_browse.py
@@ -39,7 +39,7 @@ class document_ftp_browse(osv.osv_memory):
             data_pool = self.pool.get('ir.model.data')
             aid = data_pool._get_id(cr, uid, 'document_ftp', 'action_document_browse')
             aid = data_pool.browse(cr, uid, aid, context=context).res_id
-            ftp_url = self.pool.get('ir.actions.url').browse(cr, uid, aid, context=context)
+            ftp_url = self.pool.get('ir.actions.act_url').browse(cr, uid, aid, context=context)
             url = ftp_url.url and ftp_url.url.split('ftp://') or []
             if url:
                 url = url[1]
diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py
index 5da2ddf11e8..d0679973c5a 100644
--- a/addons/document_ftp/wizard/ftp_configuration.py
+++ b/addons/document_ftp/wizard/ftp_configuration.py
@@ -44,7 +44,7 @@ class document_ftp_configuration(osv.osv_memory):
         # Update the action for FTP browse.
         aid = data_pool._get_id(cr, uid, 'document_ftp', 'action_document_browse')
         aid = data_pool.browse(cr, uid, aid, context=context).res_id
-        self.pool.get('ir.actions.url').write(cr, uid, [aid], 
+        self.pool.get('ir.actions.act_url').write(cr, uid, [aid], 
                 {'url': 'ftp://'+(conf.host or 'localhost:8021')+'/' + cr.dbname+'/'})
 
 document_ftp_configuration()
diff --git a/addons/document_ftp/wizard/ftp_configuration_view.xml b/addons/document_ftp/wizard/ftp_configuration_view.xml
index 36fb80c51af..9e05fba986e 100644
--- a/addons/document_ftp/wizard/ftp_configuration_view.xml
+++ b/addons/document_ftp/wizard/ftp_configuration_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-    <record model="ir.actions.url" id="action_document_browse">
+    <record model="ir.actions.act_url" id="action_document_browse">
         <field name="name">Browse Files</field>
         <field name="url">ftp://localhost:8021/</field>
     </record>
diff --git a/addons/document_page/__openerp__.py b/addons/document_page/__openerp__.py
index bff40744805..f08315bf61e 100644
--- a/addons/document_page/__openerp__.py
+++ b/addons/document_page/__openerp__.py
@@ -31,30 +31,18 @@ Web pages
     'author': ['OpenERP SA'],
     'website': 'http://www.openerp.com/',
     'depends': ['knowledge'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'wizard/document_page_create_menu_view.xml',
         'wizard/document_page_show_diff_view.xml',
         'document_page_view.xml',
         'security/document_page_security.xml',
         'security/ir.model.access.csv',
     ],
-    'demo_xml': [
-        'document_page_demo.xml'
-    ],
-    'test': [
-        'test/document_page_test00.yml'
-    ],
+    'demo': ['document_page_demo.xml'],
+    'test': ['test/document_page_test00.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0086363630317',
     'images': [],
-    'js': [
-        'static/src/lib/wiky/wiky.js', 
-        'static/src/js/document_page.js'
-    ],
-    'css' : [
-        "static/src/css/document_page.css"
-    ],
+    'css' : ['static/src/css/document_page.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_page/document_page.py b/addons/document_page/document_page.py
index 7304e2e9075..092d39f22e9 100644
--- a/addons/document_page/document_page.py
+++ b/addons/document_page/document_page.py
@@ -29,11 +29,13 @@ class document_page(osv.osv):
     _description = "Document Page"
     _order = 'name'
 
-    def _get_page_index(self, cr, uid, page):
+    def _get_page_index(self, cr, uid, page, link=True):
         index = []
         for subpage in page.child_ids:
             index += ["<li>"+ self._get_page_index(cr, uid, subpage) +"</li>"]
-        r = '<a href="#id=%s">%s</a>'%(page.id,page.name)
+        r = ''
+        if link:
+            r = '<a href="#id=%s">%s</a>'%(page.id,page.name)
         if index:
             r += "<ul>" + "".join(index) + "</ul>"
         return r
@@ -42,7 +44,7 @@ class document_page(osv.osv):
         res = {}
         for page in self.browse(cr, uid, ids, context=context):
             if page.type == "category":
-               content = self._get_page_index(cr, uid, page)
+               content = self._get_page_index(cr, uid, page, link=False)
             else:
                content = page.content
             res[page.id] =  content
@@ -120,12 +122,12 @@ class document_page_history(osv.osv):
         text2 = history_pool.read(cr, uid, [v2], ['content'])[0]['content']
         line1 = line2 = ''
         if text1:
-            line1 = tools.ustr(text1.splitlines(1))
+            line1 = text1.splitlines(1)
         if text2:
-            line2=tools.ustr(text2.splitlines(1))
+            line2 = text2.splitlines(1)
         if (not line1 and not line2) or (line1 == line2):
             raise osv.except_osv(_('Warning!'), _('There are no changes in revisions.'))
         diff = difflib.HtmlDiff()
-        return diff.make_file(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=False)
+        return diff.make_table(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=True)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_page/document_page_demo.xml b/addons/document_page/document_page_demo.xml
index 96984fe2e0b..f779ea8313f 100644
--- a/addons/document_page/document_page_demo.xml
+++ b/addons/document_page/document_page_demo.xml
@@ -6,7 +6,6 @@
         </record>
         <record id="demo_category1" model="document.page">
             <field name="name">OpenERP Features</field>
-            <field name="sequence">10</field>
             <field name="type">category</field>
             <field  name="content">
 Summary of the feature
@@ -24,24 +23,28 @@ Additional ressources
             <field name="name">OpenERP 6.1. Functional Demo</field>
             <field name="parent_id" ref="demo_category1"/>
             <field name="content">
-
-The news is out, OpenERP's latest version 6.1. is here.  It's more
-user-friendly, even more business oriented and efficient to manage your company
-
-How to discover the latest version 6.1.?
-
-Demo : [http://demo.openerp.com]
-Online: [http://openerp.com/online]
-Download: [http://openerp.com/downloads]
-
-We have also put together a functional demo that presents 6.1. Watch this video
-to learn directly from us what OpenERP 6.1. can do for you. Share it in your
-company, with your clients and implement it now for your business.
-
-==Watch on Youtube!==
-
-[[Video:http://www.youtube.com/embed/7jES2jxKMso ]]
-
+<![CDATA[
+<br>
+<br>
+The news is out, OpenERP's latest version 6.1. is here.  It's more<br>
+user-friendly, even more business oriented and efficient to manage your company<br>
+<br>
+How to discover the latest version 6.1.?<br>
+<br>
+Demo : <a target="http://demo.openerp.com" href="http://demo.openerp.com" style="background: url(&quot;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFZJREFUeF59z4EJADEIQ1F36k7u5E7ZKXeUQPACJ3wK7UNokVxVk9kHnQH7bY9hbDyDhNXgjpRLqFlo4M2GgfyJHhjq8V4agfrgPQX3JtJQGbofmCHgA/nAKks+JAjFAAAAAElFTkSuQmCC&quot;) no-repeat scroll right center transparent;padding-right: 13px;"></a><br>
+Online: <a target="http://openerp.com/online" href="http://openerp.com/online" style="background: url(&quot;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFZJREFUeF59z4EJADEIQ1F36k7u5E7ZKXeUQPACJ3wK7UNokVxVk9kHnQH7bY9hbDyDhNXgjpRLqFlo4M2GgfyJHhjq8V4agfrgPQX3JtJQGbofmCHgA/nAKks+JAjFAAAAAElFTkSuQmCC&quot;) no-repeat scroll right center transparent;padding-right: 13px;"></a><br>
+Download: <a target="http://openerp.com/downloads" href="http://openerp.com/downloads" style="background: url(&quot;data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFZJREFUeF59z4EJADEIQ1F36k7u5E7ZKXeUQPACJ3wK7UNokVxVk9kHnQH7bY9hbDyDhNXgjpRLqFlo4M2GgfyJHhjq8V4agfrgPQX3JtJQGbofmCHgA/nAKks+JAjFAAAAAElFTkSuQmCC&quot;) no-repeat scroll right center transparent;padding-right: 13px;"></a><br>
+<br>
+We have also put together a functional demo that presents 6.1. Watch this video<br>
+to learn directly from us what OpenERP 6.1. can do for you. Share it in your<br>
+company, with your clients and implement it now for your business.<br>
+<br>
+<h3>Watch on Youtube!</h3><br>
+<br>
+<iframe width="480" height="390" src="http://www.youtube.com/embed/7jES2jxKMso " frameborder="0" allowfullscreen=""></iframe><br>
+<br>
+<br>
+]]>
 </field>
         </record>
 
@@ -49,36 +52,40 @@ company, with your clients and implement it now for your business.
             <field name="name">Personalise Dashboards</field>
             <field name="parent_id" ref="demo_category1"/>
             <field name="content">
-You like OpenERP, but feel like you want to personalise it more? Now, OpenERP
-goes a step further and lets you customize your dashboard.  Thanks to a new
-feature that allows you to customize your dashboard by adding new boards of any
-search view.
-
-==How is it done?==
-
-Step 1: access one search view 
-
-Step 2: apply the filter you want to see at each connection to the application
-(eg. on sales, manufacturing, etc)
-
-Step 3: add it into the dashboard in the same space where you can save the filter
-
-Step 4: choose the application you want it visible on and the name of the array
-
-Look at this simple example below from Purchase, where I want to put on the
-application's dashboard "Purchases to Approve". After I access the search view
-and apply the filter for "Purchases to Approve", I can add it immediately to my
-Purchase dashboard.
-
-[[File:http://www.openerp.com/sites/default/files/fileattach/dashboard2_1(1).png ]]
-
-In less than a minute, the search view is visible on the dashboard
-
-[[File:http://www.openerp.com/sites/default/files/fileattach/dashboard2_2.png ]]
-
-Of course, you are free to delete what you don't need or like, but just in case
-you change your mind there is a reset button to return to the default view.
-
+<![CDATA[
+<br>
+You like OpenERP, but feel like you want to personalise it more? Now, OpenERP<br>
+goes a step further and lets you customize your dashboard.  Thanks to a new<br>
+feature that allows you to customize your dashboard by adding new boards of any<br>
+search view.<br>
+<br>
+<h3>How is it done?</h3><br>
+<br>
+Step 1: access one search view <br>
+<br>
+Step 2: apply the filter you want to see at each connection to the application<br>
+(eg. on sales, manufacturing, etc)<br>
+<br>
+Step 3: add it into the dashboard in the same space where you can save the filter<br>
+<br>
+Step 4: choose the application you want it visible on and the name of the array<br>
+<br>
+Look at this simple example below from Purchase, where I want to put on the<br>
+application's dashboard "Purchases to Approve". After I access the search view<br>
+and apply the filter for "Purchases to Approve", I can add it immediately to my<br>
+Purchase dashboard.<br>
+<br>
+<img src="http://www.openerp.com/sites/default/files/fileattach/dashboard2_1(1).png" alt=""><br>
+<br>
+In less than a minute, the search view is visible on the dashboard<br>
+<br>
+<img src="http://www.openerp.com/sites/default/files/fileattach/dashboard2_2.png" alt=""><br>
+<br>
+Of course, you are free to delete what you don't need or like, but just in case<br>
+you change your mind there is a reset button to return to the default view.<br>
+<br>
+<br>
+]]>
 </field>
         </record>
 
@@ -86,36 +93,36 @@ you change your mind there is a reset button to return to the default view.
             <field name="name">Touchscreen Point of Sale</field>
             <field name="parent_id" ref="demo_category1"/>
             <field name="content">
-The brand new OpenERP touchscreen point of sale available with 6.1 allows you
-to manage your shop sales very easily.  It's fully web based so that you don't
-have to install or deploy any software and all the sales shops can be easily
-consolidated.  It works in connected and disconnected modes so that you can
-continue to sell if you lose your internet connection.
-
-[[File:http://www.openerp.com/sites/default/files/fileattach/POS(2).png ]]
-
-==Here's a summary of its main features and benefits:==
-
-100% WEB based
-
-* available for any touchscreen device (ipod, ipad, any tablet)mobile (with portable devices)
-* no installation required
-* no synchronization needed, completely integrated
-* continue working even when your connection is down if you close your browser, data won't be lost
-* fully web based with a clean interface smart interface
-
-You have different options to select your products. You can do it through the
-barcode reader, just browse through the categories you have put in place (ie.
-drinks, snacks, meals, etc.), or text search in case neither of the other
-options work for you.  If you need to use the POS for your restaurant, for
-example, your employees can record at the same time multiple tickets without
-having to wait to do one transaction at a time. Along, to facilitate payment,
-the application allows multiple payment methods.
-
-The POS application is so simple and accessible to use that your shop or
-restaurant will never need any other tool to manage orders. Due to its smart
-and user-friendly interface you don't need any training to learn how to use it.
-Think of it as an out-of-the-box solution to boost your business' productivity.
+<![CDATA[
+<br>
+The brand new OpenERP touchscreen point of sale available with 6.1 allows you<br>
+to manage your shop sales very easily.  It's fully web based so that you don't<br>
+have to install or deploy any software and all the sales shops can be easily<br>
+consolidated.  It works in connected and disconnected modes so that you can<br>
+continue to sell if you lose your internet connection.<br>
+<br>
+<img src="http://www.openerp.com/sites/default/files/fileattach/POS(2).png" alt=""><br>
+<br>
+<h3>Here's a summary of its main features and benefits:</h3><br>
+<br>
+100% WEB based<br>
+<br>
+<ul><li>available for any touchscreen device (ipod, ipad, any tablet)mobile (with portable devices)</li><li>no installation required</li><li>no synchronization needed, completely integrated</li><li>continue working even when your connection is down if you close your browser, data won't be lost</li><li>fully web based with a clean interface smart interface</li></ul><br>
+<br>
+You have different options to select your products. You can do it through the<br>
+barcode reader, just browse through the categories you have put in place (ie.<br>
+drinks, snacks, meals, etc.), or text search in case neither of the other<br>
+options work for you.  If you need to use the POS for your restaurant, for<br>
+example, your employees can record at the same time multiple tickets without<br>
+having to wait to do one transaction at a time. Along, to facilitate payment,<br>
+the application allows multiple payment methods.<br>
+<br>
+The POS application is so simple and accessible to use that your shop or<br>
+restaurant will never need any other tool to manage orders. Due to its smart<br>
+and user-friendly interface you don't need any training to learn how to use it.<br>
+Think of it as an out-of-the-box solution to boost your business' productivity.<br>
+<br>
+]]>
 </field>
         </record>
 
diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index fc3bd86fdaf..d8daaada967 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -55,7 +55,7 @@
                     </div>
                     <field name="content" placeholder="e.g. Once upon a time..." class="oe_edit_only"/>
                     <div class="oe_document_page">
-                        <field name="display_content" widget="text_wiki" class="oe_view_only"/>
+                        <field name="display_content" widget="html" class="oe_view_only" options='{"safe": True}'/>
                     </div>
                 </form>
             </field>
@@ -78,17 +78,6 @@
             </field>
         </record>
         <!-- page action -->
-        <record id="action_category" model="ir.actions.act_window">
-            <field name="name">Category</field>
-            <field name="res_model">document.page</field>
-            <field name="domain">[('type','=','category')]</field>
-            <field name="context">{'default_type': 'category'}</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_wiki_tree"/>
-            <field name="search_view_id" ref="view_wiki_filter"/>
-        </record>
-        <menuitem id="menu_category" parent="menu_wiki" name="Categories" action="action_category" sequence="10"/>
         <record id="action_page" model="ir.actions.act_window">
             <field name="name">Pages</field>
             <field name="res_model">document.page</field>
@@ -100,7 +89,18 @@
             <field name="search_view_id" ref="view_wiki_filter"/>
             <field name="help">Create web pages</field>
         </record>
-        <menuitem id="menu_page" parent="menu_wiki" name="Pages" action="action_page" sequence="20"/>
+        <menuitem id="menu_page" parent="menu_wiki" name="Pages" action="action_page" sequence="10"/>
+        <record id="action_category" model="ir.actions.act_window">
+            <field name="name">Category</field>
+            <field name="res_model">document.page</field>
+            <field name="domain">[('type','=','category')]</field>
+            <field name="context">{'default_type': 'category'}</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_wiki_tree"/>
+            <field name="search_view_id" ref="view_wiki_filter"/>
+        </record>
+        <menuitem id="menu_category" parent="menu_wiki" name="Categories" action="action_category" sequence="20"/>
 
         <!-- History Tree view -->
         <record model="ir.ui.view" id="view_wiki_history_tree">
diff --git a/addons/document_page/i18n/ar.po b/addons/document_page/i18n/ar.po
index e6f5bc399a4..a1924c51c2e 100644
--- a/addons/document_page/i18n/ar.po
+++ b/addons/document_page/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/bg.po b/addons/document_page/i18n/bg.po
index 87848f9e862..a3e4aa541a8 100644
--- a/addons/document_page/i18n/bg.po
+++ b/addons/document_page/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/bs.po b/addons/document_page/i18n/bs.po
index 3f9add4b5ca..ed1d418a4f7 100644
--- a/addons/document_page/i18n/bs.po
+++ b/addons/document_page/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/ca.po b/addons/document_page/i18n/ca.po
index f111b81d8ff..6c1bc9e2cf1 100644
--- a/addons/document_page/i18n/ca.po
+++ b/addons/document_page/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/cs.po b/addons/document_page/i18n/cs.po
index a5cc644f19d..2cbf436a4de 100644
--- a/addons/document_page/i18n/cs.po
+++ b/addons/document_page/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: document_page
diff --git a/addons/document_page/i18n/da.po b/addons/document_page/i18n/da.po
index 7d82dca7794..8a5120f4f69 100644
--- a/addons/document_page/i18n/da.po
+++ b/addons/document_page/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/de.po b/addons/document_page/i18n/de.po
index 616d1a36f6a..7aa4a2198fc 100644
--- a/addons/document_page/i18n/de.po
+++ b/addons/document_page/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/el.po b/addons/document_page/i18n/el.po
index 7d87b199d23..5f75b793537 100644
--- a/addons/document_page/i18n/el.po
+++ b/addons/document_page/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/document_page/i18n/es.po b/addons/document_page/i18n/es.po
index af15cbc8e81..4b42bb5e556 100644
--- a/addons/document_page/i18n/es.po
+++ b/addons/document_page/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/et.po b/addons/document_page/i18n/et.po
index 5d6564fdf80..6c970db872a 100644
--- a/addons/document_page/i18n/et.po
+++ b/addons/document_page/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/fi.po b/addons/document_page/i18n/fi.po
index 1514c5937b3..09e5c2eaec9 100644
--- a/addons/document_page/i18n/fi.po
+++ b/addons/document_page/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/fr.po b/addons/document_page/i18n/fr.po
index 5bcab4d5ccd..de58a37cce0 100644
--- a/addons/document_page/i18n/fr.po
+++ b/addons/document_page/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/gl.po b/addons/document_page/i18n/gl.po
index 70d96a3954c..5047bdd8285 100644
--- a/addons/document_page/i18n/gl.po
+++ b/addons/document_page/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/hr.po b/addons/document_page/i18n/hr.po
index 3c5c2c6fd2d..4af9e96577b 100644
--- a/addons/document_page/i18n/hr.po
+++ b/addons/document_page/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/hu.po b/addons/document_page/i18n/hu.po
index b3048ad21f9..76dfeeca9a3 100644
--- a/addons/document_page/i18n/hu.po
+++ b/addons/document_page/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/id.po b/addons/document_page/i18n/id.po
index 6eeb7156829..af3507dffde 100644
--- a/addons/document_page/i18n/id.po
+++ b/addons/document_page/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/it.po b/addons/document_page/i18n/it.po
index 2d459fc5779..a02962d417d 100644
--- a/addons/document_page/i18n/it.po
+++ b/addons/document_page/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/ja.po b/addons/document_page/i18n/ja.po
index 3bd025dd942..7ae5aa117d2 100644
--- a/addons/document_page/i18n/ja.po
+++ b/addons/document_page/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/ko.po b/addons/document_page/i18n/ko.po
index 373c112b907..40ba975f3cb 100644
--- a/addons/document_page/i18n/ko.po
+++ b/addons/document_page/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/lt.po b/addons/document_page/i18n/lt.po
index 14c4abbb279..2107cdfdee0 100644
--- a/addons/document_page/i18n/lt.po
+++ b/addons/document_page/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: lt\n"
 
 #. module: document_page
diff --git a/addons/document_page/i18n/lv.po b/addons/document_page/i18n/lv.po
index c0073ae1ebf..3f02ff63fe7 100644
--- a/addons/document_page/i18n/lv.po
+++ b/addons/document_page/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/mn.po b/addons/document_page/i18n/mn.po
index 48e0599dff2..1eed1514682 100644
--- a/addons/document_page/i18n/mn.po
+++ b/addons/document_page/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/nb.po b/addons/document_page/i18n/nb.po
index 809b0cd1801..906d84a4b08 100644
--- a/addons/document_page/i18n/nb.po
+++ b/addons/document_page/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/nl.po b/addons/document_page/i18n/nl.po
index fee40c3032c..915dca813fe 100644
--- a/addons/document_page/i18n/nl.po
+++ b/addons/document_page/i18n/nl.po
@@ -7,25 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-13 12:14+0000\n"
-"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
+"PO-Revision-Date: 2012-08-26 14:00+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
 msgid "Document page Template"
-msgstr ""
+msgstr "Document pagina sjabloon"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_wiki
 msgid "Document Pages"
-msgstr ""
+msgstr "Document pagina's"
 
 #. module: document_page
 #: field:document.page.type,method:0
@@ -56,7 +56,7 @@ msgstr "Geeft aan of deze pagina's een inhoudsopgave hebben of niet"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki_history view:document.page.history:0
 msgid "Document page History"
-msgstr ""
+msgstr "Document pagina historie"
 
 #. module: document_page
 #: field:document.page,minor_edit:0
@@ -270,7 +270,7 @@ msgstr "Historie van alle pagina's"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki
 msgid "document.page"
-msgstr ""
+msgstr "document.page"
 
 #. module: document_page
 #: help:document.page.type,method:0
@@ -285,7 +285,7 @@ msgstr "Sluiten"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_wiki_history_show_diff
 msgid "wizard.document.page.history.show_diff"
-msgstr ""
+msgstr "wizard.document.page.history.show_diff"
 
 #. module: document_page
 #: field:document.page.history,wiki_id:0
@@ -357,7 +357,7 @@ msgstr "Is dit een grote wijziging?"
 #: model:ir.model,name:document_page.model_wiki_groups
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_groups view:document.page.type:0
 msgid "Document Types"
-msgstr ""
+msgstr "Documentsoorten"
 
 #. module: document_page
 #: view:document.page:0
@@ -374,12 +374,12 @@ msgstr "Gewijzigd door"
 #: field:document.page,type:0
 #, python-format
 msgid "Type"
-msgstr ""
+msgstr "Soort"
 
 #. module: document_page
 #: view:document.page.type:0 view:document.page.page.open:0
 msgid "Open Document Page"
-msgstr ""
+msgstr "Open document pagina"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki_page_open
diff --git a/addons/document_page/i18n/pl.po b/addons/document_page/i18n/pl.po
index 3fed2a579cb..abac5b1f1b6 100644
--- a/addons/document_page/i18n/pl.po
+++ b/addons/document_page/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/pt.po b/addons/document_page/i18n/pt.po
index b85aabb87b5..6663156aadc 100644
--- a/addons/document_page/i18n/pt.po
+++ b/addons/document_page/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/pt_BR.po b/addons/document_page/i18n/pt_BR.po
index 5c0f3097656..0d2dc5998a7 100644
--- a/addons/document_page/i18n/pt_BR.po
+++ b/addons/document_page/i18n/pt_BR.po
@@ -7,25 +7,25 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-13 12:14+0000\n"
-"Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
+"PO-Revision-Date: 2012-10-17 00:06+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@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: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
 msgid "Document page Template"
-msgstr ""
+msgstr "Modelo de página de Documento"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_wiki
 msgid "Document Pages"
-msgstr ""
+msgstr "Páginas do Documento"
 
 #. module: document_page
 #: field:document.page.type,method:0
@@ -56,7 +56,7 @@ msgstr "Indica se estas páginas têm uma tabela de conteúdo ou não"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki_history view:document.page.history:0
 msgid "Document page History"
-msgstr ""
+msgstr "Histórico de páginas do Documento"
 
 #. module: document_page
 #: field:document.page,minor_edit:0
@@ -269,7 +269,7 @@ msgstr "Todas as Páginas de Históricos"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki
 msgid "document.page"
-msgstr ""
+msgstr "document.page"
 
 #. module: document_page
 #: help:document.page.type,method:0
@@ -284,7 +284,7 @@ msgstr "Fechar"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_wiki_history_show_diff
 msgid "wizard.document.page.history.show_diff"
-msgstr ""
+msgstr "wizard.document.page.history.show_diff"
 
 #. module: document_page
 #: field:document.page.history,wiki_id:0
@@ -357,7 +357,7 @@ msgstr "Esta é uma edição Avançada ?"
 #: model:ir.model,name:document_page.model_wiki_groups
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_groups view:document.page.type:0
 msgid "Document Types"
-msgstr ""
+msgstr "Tipos de Documento"
 
 #. module: document_page
 #: view:document.page:0
@@ -374,12 +374,12 @@ msgstr "Modificado por"
 #: field:document.page,type:0
 #, python-format
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: document_page
 #: view:document.page.type:0 view:document.page.page.open:0
 msgid "Open Document Page"
-msgstr ""
+msgstr "Página do documento aberto"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki_page_open
diff --git a/addons/document_page/i18n/ro.po b/addons/document_page/i18n/ro.po
index f9ab8a23e12..f532cf4c143 100644
--- a/addons/document_page/i18n/ro.po
+++ b/addons/document_page/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/ru.po b/addons/document_page/i18n/ru.po
index 9e362a098de..1a9b1d7297f 100644
--- a/addons/document_page/i18n/ru.po
+++ b/addons/document_page/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-13 12:11+0000\n"
+"PO-Revision-Date: 2012-10-24 05:09+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
@@ -270,7 +270,7 @@ msgstr "История всех страниц"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki
 msgid "document.page"
-msgstr ""
+msgstr "document.page"
 
 #. module: document_page
 #: help:document.page.type,method:0
@@ -285,7 +285,7 @@ msgstr "Закрыть"
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_wiki_history_show_diff
 msgid "wizard.document.page.history.show_diff"
-msgstr ""
+msgstr "wizard.document.page.history.show_diff"
 
 #. module: document_page
 #: field:document.page.history,wiki_id:0
@@ -357,7 +357,7 @@ msgstr "Это существенные изменения ?"
 #: model:ir.model,name:document_page.model_wiki_groups
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_groups view:document.page.type:0
 msgid "Document Types"
-msgstr ""
+msgstr "Типы документов"
 
 #. module: document_page
 #: view:document.page:0
@@ -374,7 +374,7 @@ msgstr "Изменено"
 #: field:document.page,type:0
 #, python-format
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #. module: document_page
 #: view:document.page.type:0 view:document.page.page.open:0
diff --git a/addons/document_page/i18n/sk.po b/addons/document_page/i18n/sk.po
index 6df87913768..4fece2b5feb 100644
--- a/addons/document_page/i18n/sk.po
+++ b/addons/document_page/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/sl.po b/addons/document_page/i18n/sl.po
index e5c48563eeb..40aafdd59f0 100644
--- a/addons/document_page/i18n/sl.po
+++ b/addons/document_page/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/sq.po b/addons/document_page/i18n/sq.po
index f6df8ed1b9e..b1c7df65a29 100644
--- a/addons/document_page/i18n/sq.po
+++ b/addons/document_page/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/sr.po b/addons/document_page/i18n/sr.po
index 3b3f7ea8aef..a90010e1efb 100644
--- a/addons/document_page/i18n/sr.po
+++ b/addons/document_page/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/sr@latin.po b/addons/document_page/i18n/sr@latin.po
index a6dd609306d..697850bb6db 100644
--- a/addons/document_page/i18n/sr@latin.po
+++ b/addons/document_page/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/sv.po b/addons/document_page/i18n/sv.po
index 7bc94e30a56..b6f98e7047b 100644
--- a/addons/document_page/i18n/sv.po
+++ b/addons/document_page/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/tlh.po b/addons/document_page/i18n/tlh.po
index 6eeb7156829..af3507dffde 100644
--- a/addons/document_page/i18n/tlh.po
+++ b/addons/document_page/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/tr.po b/addons/document_page/i18n/tr.po
index 5c80ed29d1c..34b9a03c59a 100644
--- a/addons/document_page/i18n/tr.po
+++ b/addons/document_page/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/uk.po b/addons/document_page/i18n/uk.po
index 95a1cccd166..f3b8aefba82 100644
--- a/addons/document_page/i18n/uk.po
+++ b/addons/document_page/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/vi.po b/addons/document_page/i18n/vi.po
index 53ca8599d2e..3ac0c681a61 100644
--- a/addons/document_page/i18n/vi.po
+++ b/addons/document_page/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/zh_CN.po b/addons/document_page/i18n/zh_CN.po
index 44468e289a1..ce91415a7e6 100644
--- a/addons/document_page/i18n/zh_CN.po
+++ b/addons/document_page/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
diff --git a/addons/document_page/i18n/zh_TW.po b/addons/document_page/i18n/zh_TW.po
index abfa870b47d..ab85438a7a5 100644
--- a/addons/document_page/i18n/zh_TW.po
+++ b/addons/document_page/i18n/zh_TW.po
@@ -7,165 +7,165 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-08-13 12:08+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-30 09:36+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:46+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_page
 #: field:document.page.type,template:0
 msgid "Document page Template"
-msgstr ""
+msgstr "文檔頁面範本"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_wiki
 msgid "Document Pages"
-msgstr ""
+msgstr "文檔頁面"
 
 #. module: document_page
 #: field:document.page.type,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "展示方法"
 
 #. module: document_page
 #: view:document.page:0 field:document.page,create_uid:0
 msgid "Author"
-msgstr ""
+msgstr "作者"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_wiki_page_open
 #: view:document.page.page.open:0
 msgid "Open Page"
-msgstr ""
+msgstr "開啓葉面"
 
 #. module: document_page
 #: field:document.page,menu_id:0
 msgid "Menu"
-msgstr ""
+msgstr "選單"
 
 #. module: document_page
 #: help:document.page,type:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
+msgstr "表示，這個頁面至少有一個表的內容"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki_history view:document.page.history:0
 msgid "Document page History"
-msgstr ""
+msgstr "頁面歷史文件"
 
 #. module: document_page
 #: field:document.page,minor_edit:0
 msgid "Minor edit"
-msgstr ""
+msgstr "小編輯"
 
 #. module: document_page
 #: view:document.page:0 field:document.page,content:0
 msgid "Content"
-msgstr ""
+msgstr "內容"
 
 #. module: document_page
 #: field:document.page,child_ids:0
 msgid "Child Pages"
-msgstr ""
+msgstr "子頁面"
 
 #. module: document_page
 #: field:document.page,parent_id:0
 msgid "Parent Page"
-msgstr ""
+msgstr "上級頁面"
 
 #. module: document_page
 #: view:document.page:0 field:document.page,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "最後的貢獻者"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_parent_id:0
 msgid "Parent Menu"
-msgstr ""
+msgstr "上級選單"
 
 #. module: document_page
 #: field:document.page,name:0
 msgid "Title"
-msgstr ""
+msgstr "標題"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "嚮導創建選單"
 
 #. module: document_page
 #: field:document.page,history_id:0
 msgid "History Lines"
-msgstr ""
+msgstr "歷史記錄"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Page Content"
-msgstr ""
+msgstr "頁面內容"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "警告！"
 
 #. module: document_page
 #: code:addons/document_page/document_page.py:237
 #, python-format
 msgid "There are no changes in revisions"
-msgstr ""
+msgstr "有沒有變化修訂"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_name:0
 msgid "Menu Name"
-msgstr ""
+msgstr "選單名稱"
 
 #. module: document_page
 #: field:document.page.type,notes:0
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #. module: document_page
 #: field:document.page,review:0
 msgid "Needs Review"
-msgstr ""
+msgstr "需要回顧"
 
 #. module: document_page
 #: help:document.page,review:0
 msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
-msgstr ""
+msgstr "表示這個頁面應該檢討，提高其他出資人的注意"
 
 #. module: document_page
 #: view:document.page.create.menu:0 view:document.page.make.index:0
 msgid "Menu Information"
-msgstr ""
+msgstr "選單資訊"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.act_wiki_wiki_history
 msgid "Page History"
-msgstr ""
+msgstr "頁面歷史記錄"
 
 #. module: document_page
 #: selection:document.page.type,method:0
 msgid "Tree"
-msgstr ""
+msgstr "目錄樹"
 
 #. module: document_page
 #: view:document.page.type:0
 msgid "Page Template"
-msgstr ""
+msgstr "頁面模版"
 
 #. module: document_page
 #: field:document.page,tags:0
 msgid "Keywords"
-msgstr ""
+msgstr "關鍵字"
 
 #. module: document_page
 #: model:ir.actions.act_window,help:document_page.action_wiki
@@ -175,173 +175,175 @@ msgid ""
 "(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
 "There is a basic wiki editing for text format."
 msgstr ""
+"Wiki頁面，您可以與您的同事的想法和問題。您可以創建一個新的文件，可以連接到一個或多個應用程序（客戶關係管理（CRM），銷售等）。您可以使用關鍵字，以便"
+"於訪問到您的wiki頁面。有一個基本的的維基編輯為文本格式。"
 
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:54
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: document_page
 #: help:document.page.type,home:0
 msgid "Required to select home page if display method is Home Page"
-msgstr ""
+msgstr "在首頁,需要選擇首頁顯示的方法"
 
 #. module: document_page
 #: field:document.page.history,create_date:0
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
 #. module: document_page
 #: view:document.page.make.index:0
 msgid "Want to create a Index on Selected Pages ? "
-msgstr ""
+msgstr "要選定的頁面上創建一個索引呢？ "
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values
 #: view:wizard.document.page.history.show_diff:0
 msgid "Difference"
-msgstr ""
+msgstr "差異"
 
 #. module: document_page
 #: field:document.page.type,page_ids:0
 msgid "Pages"
-msgstr ""
+msgstr "頁面"
 
 #. module: document_page
 #: view:document.page.type:0
 msgid "Group Description"
-msgstr ""
+msgstr "群組敘述"
 
 #. module: document_page
 #: view:document.page.page.open:0
 msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "要打開一個wiki頁面？ "
 
 #. module: document_page
 #: field:document.page.history,content:0
 msgid "Text area"
-msgstr ""
+msgstr "文本區域"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Meta Information"
-msgstr ""
+msgstr "中繼資訊"
 
 #. module: document_page
 #: field:document.page,create_date:0
 msgid "Created on"
-msgstr ""
+msgstr "建立於"
 
 #. module: document_page
 #: view:document.page.type:0 view:wizard.document.page.history.show_diff:0
 msgid "Notes"
-msgstr ""
+msgstr "備註"
 
 #. module: document_page
 #: selection:document.page.type,method:0
 msgid "List"
-msgstr ""
+msgstr "列表"
 
 #. module: document_page
 #: field:document.page,summary:0 field:document.page.history,edit_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "摘要"
 
 #. module: document_page
 #: field:document.page.groups,create_date:0
 msgid "Created Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_history
 msgid "All Page Histories"
-msgstr ""
+msgstr "所有頁面的歷史記錄"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki
 msgid "document.page"
-msgstr ""
+msgstr "document.page"
 
 #. module: document_page
 #: help:document.page.type,method:0
 msgid "Define the default behaviour of the menu created on this group"
-msgstr ""
+msgstr "本組創建的選單中定義默認行為"
 
 #. module: document_page
 #: view:wizard.document.page.history.show_diff:0
 msgid "Close"
-msgstr ""
+msgstr "結束"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wizard_wiki_history_show_diff
 msgid "wizard.document.page.history.show_diff"
-msgstr ""
+msgstr "wizard.document.page.history.show_diff"
 
 #. module: document_page
 #: field:document.page.history,wiki_id:0
 msgid "Wiki Id"
-msgstr ""
+msgstr "維基標識"
 
 #. module: document_page
 #: field:document.page.type,home:0 selection:document.page.type,method:0
 msgid "Home Page"
-msgstr ""
+msgstr "首頁"
 
 #. module: document_page
 #: help:document.page,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "允許您與其他頁的鏈接，在當前主題"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Modification Information"
-msgstr ""
+msgstr "修改信息"
 
 #. module: document_page
 #: model:ir.ui.menu,name:document_page.menu_wiki_configuration view:document.page:0
 msgid "Wiki"
-msgstr ""
+msgstr "維基 (Wiki)"
 
 #. module: document_page
 #: field:document.page,write_date:0
 msgid "Modification Date"
-msgstr ""
+msgstr "修改日期"
 
 #. module: document_page
 #: view:document.page.type:0
 msgid "Configuration"
-msgstr ""
+msgstr "設置"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_make_index
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_make_index_values
 #: model:ir.model,name:document_page.model_wiki_make_index view:document.page.make.index:0
 msgid "Create Index"
-msgstr ""
+msgstr "創建索引"
 
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:54
 #, python-format
 msgid "You need to select minimum 1 or maximum 2 history revision!"
-msgstr ""
+msgstr "您需要選擇最小或最大歷史修訂！"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Group By..."
-msgstr ""
+msgstr "分類方式..."
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki_create_menu
 #: view:document.page.create.menu:0 view:document.page.type:0 view:document.page.make.index:0
 msgid "Create Menu"
-msgstr ""
+msgstr "建立選單"
 
 #. module: document_page
 #: field:document.page.history,minor_edit:0
 msgid "This is a major edit ?"
-msgstr ""
+msgstr "這是一個主要的編輯嗎？"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki_groups
@@ -349,56 +351,56 @@ msgstr ""
 #: model:ir.model,name:document_page.model_wiki_groups
 #: model:ir.ui.menu,name:document_page.menu_action_wiki_groups view:document.page.type:0
 msgid "Document Types"
-msgstr ""
+msgstr "文件類型"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Topic"
-msgstr ""
+msgstr "主題"
 
 #. module: document_page
 #: field:document.page.history,write_uid:0
 msgid "Modify By"
-msgstr ""
+msgstr "修改者"
 
 #. module: document_page
 #: code:addons/document_page/web/widgets/wikimarkup/__init__.py:1981
 #: field:document.page,type:0
 #, python-format
 msgid "Type"
-msgstr ""
+msgstr "類型"
 
 #. module: document_page
 #: view:document.page.type:0 view:document.page.page.open:0
 msgid "Open Document Page"
-msgstr ""
+msgstr "開啓文件"
 
 #. module: document_page
 #: model:ir.model,name:document_page.model_wiki_wiki_page_open
 msgid "wiz open page"
-msgstr ""
+msgstr "WIZ打開的頁面"
 
 #. module: document_page
 #: view:document.page.create.menu:0 view:document.page.make.index:0 view:document.page.page.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "刪除"
 
 #. module: document_page
 #: field:wizard.document.page.history.show_diff,file_path:0
 msgid "Diff"
-msgstr ""
+msgstr "差異"
 
 #. module: document_page
 #: view:document.page:0
 msgid "Need Review"
-msgstr ""
+msgstr "需要回顧"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr ""
+msgstr "頁面等待審查"
 
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.act_wiki_group_open
 msgid "Search Page"
-msgstr ""
+msgstr "搜尋頁面"
diff --git a/addons/document_page/static/src/css/document_page.css b/addons/document_page/static/src/css/document_page.css
index 723ff8d9b11..ddbbcffd45b 100644
--- a/addons/document_page/static/src/css/document_page.css
+++ b/addons/document_page/static/src/css/document_page.css
@@ -1,15 +1,12 @@
-.oe_form_readonly .oe_notebook {
-    display: none;
-}
-
-.oe_document_page ul, .oe_document_page li {
-    padding: 2px 8px;
-    margin: 2px 8px;
-    list-style-type: circle;
-}
-
 .oe_form_editable .oe_document_page {
     display: none;
 }
 
+table.diff {font-family:Courier; border:medium;}
+.diff_header {background-color:#e0e0e0}
+td.diff_header {text-align:right}
+.diff_next {background-color:#c0c0c0}
+.diff_add {background-color:#aaffaa}
+.diff_chg {background-color:#ffff77}
+.diff_sub {background-color:#ffaaaa}
 
diff --git a/addons/document_page/static/src/js/document_page.js b/addons/document_page/static/src/js/document_page.js
deleted file mode 100644
index 555a39d7796..00000000000
--- a/addons/document_page/static/src/js/document_page.js
+++ /dev/null
@@ -1,18 +0,0 @@
-openerp.document_page = function (openerp) {
-    openerp.web.form.widgets.add('text_wiki', 'openerp.web.form.FieldTextWiki');
-
-    openerp.web.form.FieldTextWiki = openerp.web.form.FieldText.extend({
-        render_value: function() {
-            var show_value = openerp.web.format_value(this.get('value'), this, '');
-            if (!this.get("effective_readonly")) {
-                this.$textarea.val(show_value);
-                if (show_value && this.view.options.resize_textareas) {
-                    this.do_resize(this.view.options.resize_textareas);
-                }
-            } else {
-                var wiki_value = wiky.process(show_value || '');
-                this.$element.html(wiki_value);
-            }
-        },
-    });
-};
diff --git a/addons/document_page/static/src/lib/wiky/Readme.md b/addons/document_page/static/src/lib/wiky/Readme.md
deleted file mode 100755
index 5d9bfe175a6..00000000000
--- a/addons/document_page/static/src/lib/wiky/Readme.md
+++ /dev/null
@@ -1,41 +0,0 @@
-Wiky.js - a javascript library to convert Wiki Markup language to HTML.
-=======================
-
-(It is buggy, please use with care)
-
-Wiky.js is a javascript library that converts Wiki Markup language to HTML.
-
-
-How to use it
--------------------
-Include wiki.js into your HTML file. Wiky.js has only one function, which is wiky.process(wikitext).
-
-Please see index.html for an example.
-
-*wiky.js does not depend on jQuery, which is included for testing purpose.
-
-
-
-Supported Syntax
--------------------
-* == Heading ==
-* === Subheading ===
-* [http://www.url.com Name of URLs]
-* [[File:http://www.url.com/image.png Alternative Text]]
-* -------------------- (Horizontal line)
-* : (Indentation)
-* # Ordered bullet point
-* * Unordered bullet point
-
-
-
-License
-------------------
-Creative Commons 3.0
-
-
-
-Contributors
--------------------
-Tanin Na Nakorn
-Tanun Niyomjit (Designer)
\ No newline at end of file
diff --git a/addons/document_page/static/src/lib/wiky/index.html b/addons/document_page/static/src/lib/wiky/index.html
deleted file mode 100755
index 97992354fd6..00000000000
--- a/addons/document_page/static/src/lib/wiky/index.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<script type="text/javascript" src="jquery-1.4.2.min.js"></script>
-		<script type="text/javascript" src="wiky.js"></script>
-		<title>Untitled Document</title>
-	<link href="wiky.css" rel="stylesheet" type="text/css">
-	</head>
-	<body>
-		<textarea id="textarea" onchange="$('#preview').html(wiky.process($(this).val()));" cols="60" rows="20">=== Heading ===
-Some content
-I would like to add another line
-
-== Subheading ==
-Some more content
-Some more lines1
-:A line with indent
-:: A 2-indented line
-:: more
-:back to 1-indented line
-
-This is Taeyeon.
-[[File:http://www.oknation.net/blog/home/blog_data/12/2012/images/ty4.jpg Taeyeon]]
-Taeyeon is so cute.
-
-This is a link:[http://www.google.com Google].
-This is a bold link:'''[http://www.google.com Google]'''.
-This is a bold-italic link:'''''[http://www.google.com Google]'''''.
-This is '''bold''', '''''bold-italic''''', and ''italic''
-
-[[Video:http://www.youtube.com/embed/ovVfLancwys]]
-# First
-# secon
-## Second-First
-*** First Point
-*** Second Point
-#### z
-#### y
-#### x
-*** Third Point
-## Second-Second [ftp://www.facebook.com FacebookFTP]
-## Second-Third [http://www.google.com Google Here] 
-# third
-
-</textarea>
-		<br/>
-		<span style="display:block;width:600px;border:1px solid #999999;">
-			<span style="display:block;margin:10px 10px 10px 10px;" class="wiky_preview_area" id="preview">
-			</span>
-		</span>
-	</body>
-</html>
-<script language="javascript">
-	$('#preview').html(wiky.process($('#textarea').val()));
-</script>
diff --git a/addons/document_page/static/src/lib/wiky/input_complete b/addons/document_page/static/src/lib/wiky/input_complete
deleted file mode 100755
index c7e860cccf9..00000000000
--- a/addons/document_page/static/src/lib/wiky/input_complete
+++ /dev/null
@@ -1,35 +0,0 @@
-=== Heading ===
-Some content
-I would like to add another line
-
-== Subheading ==
-Some more content
-Some more lines1
-:A line with indent
-:: A 2-indented line
-:: more
-:back to 1-indented line
-
-This is Taeyeon.
-[[File:http://www.oknation.net/blog/home/blog_data/12/2012/images/ty4.jpg Taeyeon]]
-Taeyeon is so cute.
-
-This is a link:[http://www.google.com Google].
-This is a bold link:'''[http://www.google.com Google]'''.
-This is a bold-italic link:'''''[http://www.google.com Google]'''''.
-This is '''bold''', '''''bold-italic''''', and ''italic''
-
-
-# First
-# second
-## Second-First
-*** First Point
-*** Second Point
-#### z
-#### y
-#### x
-*** Third Point
-## Second-Second [ftp://www.facebook.com FacebookFTP]
-## Second-Third [http://www.google.com Google Here] 
-# third
-
diff --git a/addons/document_page/static/src/lib/wiky/wiky.css b/addons/document_page/static/src/lib/wiky/wiky.css
deleted file mode 100755
index 0adc7896df0..00000000000
--- a/addons/document_page/static/src/lib/wiky/wiky.css
+++ /dev/null
@@ -1,79 +0,0 @@
-@charset "UTF-8";
-.wiky_preview_area {
-	font-family: "Helvetica Neue", Arial, Helvetica, 'Liberation Sans', FreeSans, sans-serif;
-	font-size: 13px;
-	line-height: 1.5em;
-	color: #666;
-	font-weight:350;
-	width:600px;
-	display:block;
-}
-.wiky_preview_area h2{
-	font-size:24px;
-	color:#333;
-	font-weight:400;
-	
-	text-shadow:0 1px 0 rgba(000, 000, 000, .4);
-}
-.wiky_preview_area h3{
-	font-size:18px;
-	color:#555;
-	font-weight:400;
-	
-	text-shadow:0 1px 0 rgba(000, 000, 000, .4);
-}
-.wiky_preview_area img{
-	background-repeat: repeat;
-	width: 400px;
-	-webkit-border-radius: 10px;
-	-moz-border-radius: 10px;
-	border-radius: 10px;
-	-webkit-box-shadow:0 1px  3px rgba(0, 0, 0, .8);
-	-moz-box-shadow:0 1px  3px rgba(0, 0, 0, .8);
-	box-shadow:0 1px  3px rgba(0, 0, 0, .8);
-}
-.wiky_preview_area a{
-	padding:5px;
-	font-weight:400;
-	
-	background: #999; /* for non-css3 browsers */
-
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cccccc', endColorstr='#000000'); /* for IE */
-	background: -webkit-gradient(linear, left top, left bottom, from(#ccc), to(#000)); /* for webkit browsers */
-	background: -moz-linear-gradient(top,  #ccc,  #000); /* for firefox 3.6+ */ 
-	
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border-radius: 4px;
-
-	-webkit-box-shadow:none;
-	-moz-box-shadow:none;
-	box-shadow:none;
-
-	text-shadow:0 1px 0 rgba(255, 255, 255, 1);
-}
-
-.wiky_preview_area a:hover{
-	color:#333;
-	padding:5px;
-	font-weight:400;
-	text-decoration:none;
-	
-	-webkit-border-radius: 4px;
-	-moz-border-radius: 4px;
-	border-radius: 4px;
-
-	-webkit-box-shadow:0 1px  3px rgba(0, 0, 0, .3);
-	-moz-box-shadow:0 1px  3px rgba(0, 0, 0, .3);
-	box-shadow:0 1px  3px rgba(0, 0, 0, .3);
-
-	text-shadow:0 1px 0 rgba(255, 255, 255, 1);
-}
-
-
-.wiky_preview_area > ol, 
-.wiky_preview_area > ul, 
-.wiky_preview_area > ul > li,
-.wiky_preview_area > ol > li {
-	list-style: disc inside none;
-}
\ No newline at end of file
diff --git a/addons/document_page/static/src/lib/wiky/wiky.js b/addons/document_page/static/src/lib/wiky/wiky.js
deleted file mode 100755
index 5bc9c6f167d..00000000000
--- a/addons/document_page/static/src/lib/wiky/wiky.js
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- * Wiky.js - Javascript library to converts Wiki MarkUp language to HTML.
- * You can do whatever with it. Please give me some credits (Apache License)
- * - Tanin Na Nakorn 
- */
-
-var wiky = {};
-
-
-wiky.process = function(wikitext) {
-	var lines = wikitext.split(/\r?\n/);
-	var start;
-	var html = "";
-	
-	for (var i=0;i<lines.length;i++)
-	{
-		var line = lines[i];
-		if (line.match(/^===/)!=null && line.match(/===$/)!=null)
-		{
-			html += "<h2>"+line.substring(3,line.length-3)+"</h2>";
-		}
-		else if (line.match(/^==/)!=null && line.match(/==$/)!=null)
-		{
-			html += "<h3>"+line.substring(2,line.length-2)+"</h3>";
-		}
-		else if (line.match(/^:+/)!=null)
-		{
-			// find start line and ending line
-			start = i;
-			while (i < lines.length && lines[i].match(/^:+/)!=null) i++;
-			i--;
-			
-			html += wiky.process_indent(lines,start,i);
-		}
-		else if (line.match(/^----+(\s*)$/)!=null)
-		{
-			html += "<hr/>";
-		}
-		else if (line.match(/^(\*+) /)!=null)
-		{
-			// find start line and ending line
-			start = i;
-			while (i < lines.length && lines[i].match(/^(\*+|##+):? /)!=null) i++;
-			i--;
-			
-			html += wiky.process_bullet_point(lines,start,i);
-		}
-		else if (line.match(/^(#+) /)!=null)
-		{
-			// find start line and ending line
-			start = i;
-			while (i < lines.length && lines[i].match(/^(#+|\*\*+):? /)!=null) i++;
-			i--;
-			
-			html += wiky.process_bullet_point(lines,start,i);
-		}
-		else 
-		{
-			html += wiky.process_normal(line);
-		}
-		
-		html += "<br/>\n";
-	}
-	
-	return html;
-};
-
-wiky.process_indent = function(lines,start,end) {
-	var html = "<dl>";
-	
-	for(var i=start;i<=end;i++) {
-		
-		html += "<dd>";
-		
-		var this_count = lines[i].match(/^(:+)/)[1].length;
-		
-		html += wiky.process_normal(lines[i].substring(this_count));
-		
-		var nested_end = i;
-		for (var j=i+1;j<=end;j++) {
-			var nested_count = lines[j].match(/^(:+)/)[1].length;
-			if (nested_count <= this_count) break;
-			else nested_end = j;
-		}
-		
-		if (nested_end > i) {
-			html += wiky.process_indent(lines,i+1,nested_end);
-			i = nested_end;
-		}
-		
-		html += "</dd>";
-	}
-	
-	html += "</dl>";
-	return html;
-};
-
-wiky.process_bullet_point = function(lines,start,end) {
-	var html = (lines[start].charAt(0)=='*')?"<ul>":"<ol>";
-	
-	for(var i=start;i<=end;i++) {
-		
-		html += "<li>";
-		
-		var this_count = lines[i].match(/^(\*+|#+) /)[1].length;
-		
-		html += wiky.process_normal(lines[i].substring(this_count+1));
-		
-		// continue previous with #:
-		{
-			var nested_end = i;
-			for (var j = i + 1; j <= end; j++) {
-				var nested_count = lines[j].match(/^(\*+|#+):? /)[1].length;
-				
-				if (nested_count < this_count) 
-					break;
-				else {
-					if (lines[j].charAt(nested_count) == ':') {
-						html += "<br/>" + wiky.process_normal(lines[j].substring(nested_count + 2));
-						nested_end = j;
-					} else {
-						break;
-					}
-				}
-					
-			}
-			
-			i = nested_end;
-		}
-		
-		// nested bullet point
-		{
-			var nested_end = i;
-			for (var j = i + 1; j <= end; j++) {
-				var nested_count = lines[j].match(/^(\*+|#+):? /)[1].length;
-				if (nested_count <= this_count) 
-					break;
-				else 
-					nested_end = j;
-			}
-			
-			if (nested_end > i) {
-				html += wiky.process_bullet_point(lines, i + 1, nested_end);
-				i = nested_end;
-			}
-		}
-		
-		// continue previous with #:
-		{
-			var nested_end = i;
-			for (var j = i + 1; j <= end; j++) {
-				var nested_count = lines[j].match(/^(\*+|#+):? /)[1].length;
-				
-				if (nested_count < this_count) 
-					break;
-				else {
-					if (lines[j].charAt(nested_count) == ':') {
-						html += wiky.process_normal(lines[j].substring(nested_count + 2));
-						nested_end = j;
-					} else {
-						break;
-					}
-				}
-					
-			}
-			
-			i = nested_end;
-		}
-		
-		html += "</li>";
-	}
-	
-	html += (lines[start].charAt(0)=='*')?"</ul>":"</ol>";
-	return html;
-};
-
-wiky.process_url = function(txt) {
-	
-	var index = txt.indexOf(" ");
-	
-	if (index == -1) 
-	{
-		return "<a target='"+txt+"' href='"+txt+"' style='background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFZJREFUeF59z4EJADEIQ1F36k7u5E7ZKXeUQPACJ3wK7UNokVxVk9kHnQH7bY9hbDyDhNXgjpRLqFlo4M2GgfyJHhjq8V4agfrgPQX3JtJQGbofmCHgA/nAKks+JAjFAAAAAElFTkSuQmCC\") no-repeat scroll right center transparent;padding-right: 13px;'></a>";
-	}
-	else
-	{
-		var url = txt.substring(0,index);
-		var label = txt.substring(index+1);
-		return "<a target='"+url+"' href='"+url+"' style='background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAFZJREFUeF59z4EJADEIQ1F36k7u5E7ZKXeUQPACJ3wK7UNokVxVk9kHnQH7bY9hbDyDhNXgjpRLqFlo4M2GgfyJHhjq8V4agfrgPQX3JtJQGbofmCHgA/nAKks+JAjFAAAAAElFTkSuQmCC\") no-repeat scroll right center transparent;padding-right: 13px;'>"+label+"</a>";
-	}
-};
-
-wiky.process_image = function(txt) {
-	var index = txt.indexOf(" ");
-	var url = txt;
-	var label = "";
-	
-	if (index > -1) 
-	{
-		url = txt.substring(0,index);
-		label = txt.substring(index+1);
-	}
-	
-	
-	return "<img src='"+url+"' alt=\""+label+"\" />";
-};
-
-wiky.process_video = function(url) {
-
-	if (url.match(/^(https?:\/\/)?(www.)?youtube.com\//) == null)
-	{
-		return "<b>"+url+" is an invalid YouTube URL</b>";
-	}
-	var result;
-	if ((result = url.match(/^(https?:\/\/)?(www.)?youtube.com\/watch\?(.*)v=([^&]+)/)) != null)
-	{
-		url = "http://www.youtube.com/embed/"+result[4];
-	}
-	
-	
-	return '<iframe width="480" height="390" src="'+url+'" frameborder="0" allowfullscreen></iframe>';
-};
-
-wiky.process_normal = function(wikitext) {
-	
-	// Image
-	{
-		var index = wikitext.indexOf("[[File:");
-		var end_index = wikitext.indexOf("]]", index + 7);
-		while (index > -1 && end_index > -1) {
-			
-			wikitext = wikitext.substring(0,index) 
-						+ wiky.process_image(wikitext.substring(index+7,end_index)) 
-						+ wikitext.substring(end_index+2);
-		
-			index = wikitext.indexOf("[[File:");
-			end_index = wikitext.indexOf("]]", index + 7);
-		}
-	}
-	
-	// Video
-	{
-		var index = wikitext.indexOf("[[Video:");
-		var end_index = wikitext.indexOf("]]", index + 8);
-		while (index > -1 && end_index > -1) {
-			
-			wikitext = wikitext.substring(0,index) 
-						+ wiky.process_video(wikitext.substring(index+8,end_index)) 
-						+ wikitext.substring(end_index+2);
-		
-			index = wikitext.indexOf("[[Video:");
-			end_index = wikitext.indexOf("]]", index + 8);
-		}
-	}
-	
-	
-	// URL
-	var protocols = ["http","ftp","news"];
-	
-	for (var i=0;i<protocols.length;i++)
-	{
-		var index = wikitext.indexOf("["+protocols[i]+"://");
-		var end_index = wikitext.indexOf("]", index + 1);
-		while (index > -1 && end_index > -1) {
-		
-			wikitext = wikitext.substring(0,index) 
-						+ wiky.process_url(wikitext.substring(index+1,end_index)) 
-						+ wikitext.substring(end_index+1);
-		
-			index = wikitext.indexOf("["+protocols[i]+"://",end_index+1);
-			end_index = wikitext.indexOf("]", index + 1);
-			
-		}
-	}
-	
-	var count_b = 0;
-	var index = wikitext.indexOf("'''");
-	while(index > -1) {
-		
-		if ((count_b%2)==0) wikitext = wikitext.replace(/'''/,"<b>");
-		else wikitext = wikitext.replace(/'''/,"</b>");
-		
-		count_b++;
-		
-		index = wikitext.indexOf("'''",index);
-	}
-	
-	var count_i = 0;
-	var index = wikitext.indexOf("''");
-	while(index > -1) {
-		
-		if ((count_i%2)==0) wikitext = wikitext.replace(/''/,"<i>");
-		else wikitext = wikitext.replace(/''/,"</i>");
-		
-		count_i++;
-		
-		index = wikitext.indexOf("''",index);
-	}
-	
-	wikitext = wikitext.replace(/<\/b><\/i>/g,"</i></b>");
-	
-	return wikitext;
-};
diff --git a/addons/document_page/wizard/document_page_create_menu.py b/addons/document_page/wizard/document_page_create_menu.py
index 68697233f84..79a43f952f0 100644
--- a/addons/document_page/wizard/document_page_create_menu.py
+++ b/addons/document_page/wizard/document_page_create_menu.py
@@ -65,7 +65,6 @@ class document_page_create_menu(osv.osv_memory):
             'view_id': False,
             'type': 'ir.actions.act_window',
             'target': 'inlineview',
-            'nodestroy': True,
         }
         value['domain'] = "[('parent_id','=',%d)]" % (page.id)
         value['res_id'] = page.id
diff --git a/addons/document_page/wizard/document_page_show_diff.py b/addons/document_page/wizard/document_page_show_diff.py
index ab5572768f4..13e8e79b3b7 100644
--- a/addons/document_page/wizard/document_page_show_diff.py
+++ b/addons/document_page/wizard/document_page_show_diff.py
@@ -43,7 +43,7 @@ class showdiff(osv.osv_memory):
 
         elif len(ids) == 1:
             old = history.browse(cr, uid, ids[0])
-            nids = history.search(cr, uid, [('document_id', '=', old.document_id.id)])
+            nids = history.search(cr, uid, [('page_id', '=', old.page_id.id)])
             nids.sort()
             diff = history.getDiff(cr, uid, ids[0], nids[-1])
         else:
diff --git a/addons/document_page/wizard/document_page_show_diff_view.xml b/addons/document_page/wizard/document_page_show_diff_view.xml
index f268db7ad2e..e2d5ef1af4b 100644
--- a/addons/document_page/wizard/document_page_show_diff_view.xml
+++ b/addons/document_page/wizard/document_page_show_diff_view.xml
@@ -8,7 +8,7 @@
             <field name="model">wizard.document.page.history.show_diff</field>
             <field name="arch" type="xml">
                 <form string="Difference" version="7.0">
-                    <field name="diff"/>
+                    <field name="diff" widget="html" options='{"safe": True}'/>
                     <footer>
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>
diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py
index 4d39a4e8015..ec112ec7c38 100644
--- a/addons/document_webdav/__openerp__.py
+++ b/addons/document_webdav/__openerp__.py
@@ -29,12 +29,12 @@
 ##############################################################################
 
 {
-        "name" : "Shared Repositories (WebDAV)",
-        "version" : "2.3",
-        "author" : "OpenERP SA",
-        "category" : "Knowledge Management",
-        "website": "http://www.openerp.com",
-        "description": """
+    'name': 'Shared Repositories (WebDAV)',
+    'version': '2.3',
+    'author': 'OpenERP SA',
+    'category': 'Knowledge Management',
+    'website': 'http://www.openerp.com',
+    'description': """
 With this module, the WebDAV server for documents is activated.
 ===============================================================
 
@@ -42,35 +42,35 @@ You can then use any compatible browser to remotely see the attachments of OpenO
 
 After installation, the WebDAV server can be controlled by a [webdav] section in 
 the server's config.
-Server Configuration Parameter:
 
-    [webdav]
-    ; enable = True ; Serve webdav over the http(s) servers
-    ; vdir = webdav ; the directory that webdav will be served at
-    ; this default val means that webdav will be
-    ; on "http://localhost:8069/webdav/
-    ; verbose = True ; Turn on the verbose messages of webdav
-    ; debug = True ; Turn on the debugging messages of webdav
-    ; since the messages are routed to the python logging, with
-    ; levels "debug" and "debug_rpc" respectively, you can leave
-    ; these options on
+Server Configuration Parameter:
+-------------------------------
+[webdav]:
++++++++++ 
+    * enable = True ; Serve webdav over the http(s) servers
+    * vdir = webdav ; the directory that webdav will be served at
+    * this default val means that webdav will be
+    * on "http://localhost:8069/webdav/
+    * verbose = True ; Turn on the verbose messages of webdav
+    * debug = True ; Turn on the debugging messages of webdav
+    * since the messages are routed to the python logging, with
+    * levels "debug" and "debug_rpc" respectively, you can leave
+    * these options on
 
 Also implements IETF RFC 5785 for services discovery on a http server,
 which needs explicit configuration in openerp-server.conf too.
 """,
-        "depends" : ["base", "document"],
-        "init_xml" : [],
-        "update_xml" : ['security/ir.model.access.csv',
-                        'webdav_view.xml',
-                        'webdav_setup.xml',
-                        ],
-        "demo_xml" : [],
-        "test": [ #'test/webdav_test1.yml',
-                ],
-        "auto_install": False,
-        "installable": True,
-        "certificate" : "001236490750845657973",
-        'images': ['images/dav_properties.jpeg','images/directories_structure_principals.jpeg'],
+    'depends': ['base', 'document'],
+    'data': ['security/ir.model.access.csv',
+            'webdav_view.xml',
+            'webdav_setup.xml',
+    ],
+    'demo': [],
+    'test': [ #'test/webdav_test1.yml',
+    ],
+    'auto_install': False,
+    'installable': True,
+    'images': ['images/dav_properties.jpeg','images/directories_structure_principals.jpeg'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py
index f53353dd43c..cb1315140a3 100644
--- a/addons/document_webdav/document_webdav.py
+++ b/addons/document_webdav/document_webdav.py
@@ -51,13 +51,14 @@ class document_davdir(osv.osv):
         # that might be not worth preparing.
         nctx.extra_ctx['webdav_path'] = '/'+config.get_misc('webdav','vdir','webdav')
         usr_obj = self.pool.get('res.users')
-        res = usr_obj.read(cr, uid, uid, ['login'])
+        res = usr_obj.read(cr, uid, uid, ['login','lang'])
         if res:
             nctx.extra_ctx['username'] = res['login']
+            nctx.extra_ctx['lang'] = res['lang']
         # TODO group
         return
 
-    def _locate_child(self, cr, uid, root_id, uri,nparent, ncontext):
+    def _locate_child(self, cr, uid, root_id, uri, nparent, ncontext):
         """ try to locate the node in uri,
             Return a tuple (node_dir, remaining_path)
         """
diff --git a/addons/document_webdav/i18n/ar.po b/addons/document_webdav/i18n/ar.po
index be15d1886f1..f6d734b70cb 100644
--- a/addons/document_webdav/i18n/ar.po
+++ b/addons/document_webdav/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/bg.po b/addons/document_webdav/i18n/bg.po
index fde05f6faab..3b7bc57d210 100644
--- a/addons/document_webdav/i18n/bg.po
+++ b/addons/document_webdav/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/ca.po b/addons/document_webdav/i18n/ca.po
index 0d1409a37c7..46c4151fe39 100644
--- a/addons/document_webdav/i18n/ca.po
+++ b/addons/document_webdav/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/cs.po b/addons/document_webdav/i18n/cs.po
index d98c27df5b2..b5e4312ba5f 100644
--- a/addons/document_webdav/i18n/cs.po
+++ b/addons/document_webdav/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/da.po b/addons/document_webdav/i18n/da.po
index 79316ecf4ed..7c02d09d538 100644
--- a/addons/document_webdav/i18n/da.po
+++ b/addons/document_webdav/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/de.po b/addons/document_webdav/i18n/de.po
index be4b5dbd216..a85befc3e0c 100644
--- a/addons/document_webdav/i18n/de.po
+++ b/addons/document_webdav/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/el.po b/addons/document_webdav/i18n/el.po
index cf4e4358a59..7186e912cca 100644
--- a/addons/document_webdav/i18n/el.po
+++ b/addons/document_webdav/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/en_GB.po b/addons/document_webdav/i18n/en_GB.po
index 130cd04e8e9..bc2fce6f2bb 100644
--- a/addons/document_webdav/i18n/en_GB.po
+++ b/addons/document_webdav/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/es.po b/addons/document_webdav/i18n/es.po
index 0fddb6b85cc..6386f2ced03 100644
--- a/addons/document_webdav/i18n/es.po
+++ b/addons/document_webdav/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/es_CR.po b/addons/document_webdav/i18n/es_CR.po
index 8405f5b3e09..b5ddd924d79 100644
--- a/addons/document_webdav/i18n/es_CR.po
+++ b/addons/document_webdav/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: document_webdav
diff --git a/addons/document_webdav/i18n/es_EC.po b/addons/document_webdav/i18n/es_EC.po
index 69731b31a33..9341f25bc60 100644
--- a/addons/document_webdav/i18n/es_EC.po
+++ b/addons/document_webdav/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/es_PY.po b/addons/document_webdav/i18n/es_PY.po
index 53990abd187..07cd1d6d092 100644
--- a/addons/document_webdav/i18n/es_PY.po
+++ b/addons/document_webdav/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/et.po b/addons/document_webdav/i18n/et.po
index 36ff37eab87..ab5cfa09bb9 100644
--- a/addons/document_webdav/i18n/et.po
+++ b/addons/document_webdav/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/eu.po b/addons/document_webdav/i18n/eu.po
index 0abc054c139..1637ed8dbb9 100644
--- a/addons/document_webdav/i18n/eu.po
+++ b/addons/document_webdav/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/fi.po b/addons/document_webdav/i18n/fi.po
index 053f8bed734..c735e67d28f 100644
--- a/addons/document_webdav/i18n/fi.po
+++ b/addons/document_webdav/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/fr.po b/addons/document_webdav/i18n/fr.po
index 7b15e2a15c6..a36f0d4d3e2 100644
--- a/addons/document_webdav/i18n/fr.po
+++ b/addons/document_webdav/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/gl.po b/addons/document_webdav/i18n/gl.po
index d048adf1b40..8d042d01959 100644
--- a/addons/document_webdav/i18n/gl.po
+++ b/addons/document_webdav/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/gu.po b/addons/document_webdav/i18n/gu.po
index b5768300597..ef12fd0b0f0 100644
--- a/addons/document_webdav/i18n/gu.po
+++ b/addons/document_webdav/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/hr.po b/addons/document_webdav/i18n/hr.po
index ac51f82627e..e67cdaa99ae 100644
--- a/addons/document_webdav/i18n/hr.po
+++ b/addons/document_webdav/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/hu.po b/addons/document_webdav/i18n/hu.po
index 21d0c9974af..75aa88ee42d 100644
--- a/addons/document_webdav/i18n/hu.po
+++ b/addons/document_webdav/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -26,7 +26,7 @@ msgstr "Létrehozás dátuma"
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_document_props
 msgid "Documents"
-msgstr ""
+msgstr "Dokumentumok"
 
 #. module: document_webdav
 #: constraint:document.directory:0
@@ -88,7 +88,7 @@ msgstr "Dokumentum"
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_folder_props
 msgid "Folders"
-msgstr ""
+msgstr "Könyvtárak"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
diff --git a/addons/document_webdav/i18n/id.po b/addons/document_webdav/i18n/id.po
index 5ef97a916fe..508405b2abf 100644
--- a/addons/document_webdav/i18n/id.po
+++ b/addons/document_webdav/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/it.po b/addons/document_webdav/i18n/it.po
index b6ca5326a8d..a7ce9382b61 100644
--- a/addons/document_webdav/i18n/it.po
+++ b/addons/document_webdav/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/ja.po b/addons/document_webdav/i18n/ja.po
index 179a2772de7..010ad37e940 100644
--- a/addons/document_webdav/i18n/ja.po
+++ b/addons/document_webdav/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/mn.po b/addons/document_webdav/i18n/mn.po
index 5734661e2ec..177d7acbc64 100644
--- a/addons/document_webdav/i18n/mn.po
+++ b/addons/document_webdav/i18n/mn.po
@@ -14,30 +14,30 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
 #: field:document.webdav.file.property,create_date:0
 msgid "Date Created"
-msgstr ""
+msgstr "Үүсгэсэн огноо"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_document_props
 msgid "Documents"
-msgstr ""
+msgstr "Баримтууд"
 
 #. module: document_webdav
 #: constraint:document.directory:0
 msgid "Error! You can not create recursive Directories."
-msgstr ""
+msgstr "Алдаа! Тойрч холбогдсон хавтас үүсгэж болохгүй."
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Search Document properties"
-msgstr ""
+msgstr "Баримтыг төлөвөөр хайх"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -45,7 +45,7 @@ msgstr ""
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,namespace:0
 msgid "Namespace"
-msgstr ""
+msgstr "Нэрийн муж"
 
 #. module: document_webdav
 #: field:document.directory,dav_prop_ids:0
@@ -61,7 +61,7 @@ msgstr ""
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Group By..."
-msgstr ""
+msgstr "Бүлэглэвэл..."
 
 #. module: document_webdav
 #: view:document.directory:0
@@ -83,12 +83,12 @@ msgstr ""
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
 msgid "Document"
-msgstr ""
+msgstr "Баримт"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_folder_props
 msgid "Folders"
-msgstr ""
+msgstr "Хавтсууд"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
@@ -98,7 +98,7 @@ msgstr ""
 #. module: document_webdav
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "Динамик контекст"
 
 #. module: document_webdav
 #: view:document.directory:0
@@ -108,7 +108,7 @@ msgstr ""
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "Хавтасны нэр давхцаж болохгүй!"
 
 #. module: document_webdav
 #: code:addons/document_webdav/webdav.py:37
@@ -129,13 +129,13 @@ msgstr ""
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Properties"
-msgstr ""
+msgstr "Үзүүлэлтүүд"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,name:0
 #: field:document.webdav.file.property,name:0
 msgid "Name"
-msgstr ""
+msgstr "Нэр"
 
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_dir_property
@@ -191,4 +191,4 @@ msgstr ""
 #: field:document.webdav.dir.property,do_subst:0
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
-msgstr ""
+msgstr "Орлуулах"
diff --git a/addons/document_webdav/i18n/nb.po b/addons/document_webdav/i18n/nb.po
new file mode 100644
index 00000000000..45acc405210
--- /dev/null
+++ b/addons/document_webdav/i18n/nb.po
@@ -0,0 +1,197 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 17:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr "Dato opprettet"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_document_props
+msgid "Documents"
+msgstr "Dokumenter"
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Feil! Du kan opprette rekursive kataloger."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr "Søk Dokumentegenskaper."
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,namespace:0
+msgid "Namespace"
+msgstr "Navnerom"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "DAV egenskaper"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_file_property
+msgid "document.webdav.file.property"
+msgstr "Dokumentet.WebDAV.fil.egenskap"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "Disse egenskapene vil bli lagt til WebDAV-forespørsler"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
+msgid "DAV Properties for Documents"
+msgstr "DAV Eiendommer for Dokumenter."
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "PyWebDAV importere Feil!"
+
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr "Dokument"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_folder_props
+msgid "Folders"
+msgstr "Mapper"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "Katalogen kan ikke være overordnede av seg selv!"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Dynamisk sammenheng"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "WebDAV egenskaper."
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "Katalogen Navnet må være unikt!"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid ""
+"Please install PyWebDAV from "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+msgstr ""
+"Vennligst installer PyWebDAV fra "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
+msgid "DAV Properties for Folders"
+msgstr "DAV egenskaper for mapper."
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Properties"
+msgstr "Egenskaper"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr "Dokumentet.WebDAV.dir.eiendom"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
+msgid "Value"
+msgstr "Verdi"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "Katalog"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr "Siste endring Bruker"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "Retn"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr "Dato endret"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr "Opprettet av"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_properties
+msgid "DAV Properties"
+msgstr "DAV Egenskaper."
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "Katalog må ha en overordnede eller en lagringsplass."
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
+msgid "Substitute"
+msgstr "Erstatte"
diff --git a/addons/document_webdav/i18n/nl.po b/addons/document_webdav/i18n/nl.po
index 1b48cc29f65..a7ae141e1ad 100644
--- a/addons/document_webdav/i18n/nl.po
+++ b/addons/document_webdav/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-12 15:16+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/pl.po b/addons/document_webdav/i18n/pl.po
index 7805c315607..3b22bbba9fb 100644
--- a/addons/document_webdav/i18n/pl.po
+++ b/addons/document_webdav/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/pt.po b/addons/document_webdav/i18n/pt.po
index fe61c9618ea..d611025a0e5 100644
--- a/addons/document_webdav/i18n/pt.po
+++ b/addons/document_webdav/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/pt_BR.po b/addons/document_webdav/i18n/pt_BR.po
index 466d4a2a85d..720143eeb6f 100644
--- a/addons/document_webdav/i18n/pt_BR.po
+++ b/addons/document_webdav/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 18:55+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -172,7 +173,7 @@ msgstr "Dir"
 #: field:document.webdav.dir.property,write_date:0
 #: field:document.webdav.file.property,write_date:0
 msgid "Date Modified"
-msgstr "Última Modificação"
+msgstr "Modificado em"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_uid:0
diff --git a/addons/document_webdav/i18n/ro.po b/addons/document_webdav/i18n/ro.po
index 9345eaa57d8..4d35f8d9e60 100644
--- a/addons/document_webdav/i18n/ro.po
+++ b/addons/document_webdav/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/ru.po b/addons/document_webdav/i18n/ru.po
index deef40433db..c336e25f6ac 100644
--- a/addons/document_webdav/i18n/ru.po
+++ b/addons/document_webdav/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -26,7 +26,7 @@ msgstr "Дата создания"
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_document_props
 msgid "Documents"
-msgstr ""
+msgstr "Документы"
 
 #. module: document_webdav
 #: constraint:document.directory:0
@@ -71,7 +71,7 @@ msgstr "Эти свойства будут добавлены к запроса
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_file_props_form
 msgid "DAV Properties for Documents"
-msgstr ""
+msgstr "Свойства DAV для документов"
 
 #. module: document_webdav
 #: code:addons/document_webdav/webdav.py:37
@@ -88,7 +88,7 @@ msgstr "Документ"
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_folder_props
 msgid "Folders"
-msgstr ""
+msgstr "Папки"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
@@ -125,7 +125,7 @@ msgstr ""
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
-msgstr ""
+msgstr "Свойства DAV для папок"
 
 #. module: document_webdav
 #: view:document.directory:0
@@ -183,7 +183,7 @@ msgstr "Создатель"
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_properties
 msgid "DAV Properties"
-msgstr ""
+msgstr "Свойства DAV"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
diff --git a/addons/document_webdav/i18n/sl.po b/addons/document_webdav/i18n/sl.po
index d43c0e4ede7..58e7873339a 100644
--- a/addons/document_webdav/i18n/sl.po
+++ b/addons/document_webdav/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/sr.po b/addons/document_webdav/i18n/sr.po
index 1667ac3f0c8..025e1934eb6 100644
--- a/addons/document_webdav/i18n/sr.po
+++ b/addons/document_webdav/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/sr@latin.po b/addons/document_webdav/i18n/sr@latin.po
index 5d4236ffd0f..6bc80c22978 100644
--- a/addons/document_webdav/i18n/sr@latin.po
+++ b/addons/document_webdav/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/sv.po b/addons/document_webdav/i18n/sv.po
index 1281ccaf622..a0ae3b20143 100644
--- a/addons/document_webdav/i18n/sv.po
+++ b/addons/document_webdav/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/tr.po b/addons/document_webdav/i18n/tr.po
index f15d2c54680..415a49f5a70 100644
--- a/addons/document_webdav/i18n/tr.po
+++ b/addons/document_webdav/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
@@ -37,7 +37,7 @@ msgstr "Hata! Yinelenen Dizinler oluşturamazsınız."
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Search Document properties"
-msgstr ""
+msgstr "Belge özelliklerini ara"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -45,17 +45,17 @@ msgstr ""
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,namespace:0
 msgid "Namespace"
-msgstr ""
+msgstr "İsimalanı"
 
 #. module: document_webdav
 #: field:document.directory,dav_prop_ids:0
 msgid "DAV properties"
-msgstr ""
+msgstr "DAV özellikleri"
 
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_file_property
 msgid "document.webdav.file.property"
-msgstr ""
+msgstr "belge.webdav.dosya.özellik"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
@@ -66,49 +66,49 @@ msgstr "Grupla..."
 #. module: document_webdav
 #: view:document.directory:0
 msgid "These properties will be added to WebDAV requests"
-msgstr ""
+msgstr "Özellikler WebDAV isteklerine aklenecektir"
 
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_file_props_form
 msgid "DAV Properties for Documents"
-msgstr ""
+msgstr "Belgeler için DAV Özellikleri"
 
 #. module: document_webdav
 #: code:addons/document_webdav/webdav.py:37
 #, python-format
 msgid "PyWebDAV Import Error!"
-msgstr ""
+msgstr "PyWebDAV İçeaktarma Hatası!"
 
 #. module: document_webdav
 #: view:document.webdav.file.property:0
 #: field:document.webdav.file.property,file_id:0
 msgid "Document"
-msgstr ""
+msgstr "Belge"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_folder_props
 msgid "Folders"
-msgstr ""
+msgstr "Klasörler"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory cannot be parent of itself!"
-msgstr ""
+msgstr "Dizin kendisinin üstü olamaz!"
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "Dynamic context"
-msgstr ""
+msgstr "Dinamik içerik"
 
 #. module: document_webdav
 #: view:document.directory:0
 msgid "WebDAV properties"
-msgstr ""
+msgstr "WebDAV özellikleri"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "The directory name must be unique !"
-msgstr ""
+msgstr "Dizin adı eşsiz olmalı"
 
 #. module: document_webdav
 #: code:addons/document_webdav/webdav.py:37
@@ -118,77 +118,80 @@ msgid ""
 "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
 "0.9.4.tar.gz&can=2&q=/"
 msgstr ""
+"Lütfen PyWebDAV2 "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/ adresinden kurun"
 
 #. module: document_webdav
 #: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
 msgid "DAV Properties for Folders"
-msgstr ""
+msgstr "Klasörler için DAV özellikleri"
 
 #. module: document_webdav
 #: view:document.directory:0
 #: view:document.webdav.dir.property:0
 #: view:document.webdav.file.property:0
 msgid "Properties"
-msgstr ""
+msgstr "Özellikler"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,name:0
 #: field:document.webdav.file.property,name:0
 msgid "Name"
-msgstr ""
+msgstr "Adı"
 
 #. module: document_webdav
 #: model:ir.model,name:document_webdav.model_document_webdav_dir_property
 msgid "document.webdav.dir.property"
-msgstr ""
+msgstr "belge.webdav.diz.özellik"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,value:0
 #: field:document.webdav.file.property,value:0
 msgid "Value"
-msgstr ""
+msgstr "Değer"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,dir_id:0
 #: model:ir.model,name:document_webdav.model_document_directory
 msgid "Directory"
-msgstr ""
+msgstr "Dizin"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,write_uid:0
 #: field:document.webdav.file.property,write_uid:0
 msgid "Last Modification User"
-msgstr ""
+msgstr "Son Değiştiren Kullanıcı"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
 msgid "Dir"
-msgstr ""
+msgstr "Dizin"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,write_date:0
 #: field:document.webdav.file.property,write_date:0
 msgid "Date Modified"
-msgstr ""
+msgstr "Değiştirilme Tarihi"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_uid:0
 #: field:document.webdav.file.property,create_uid:0
 msgid "Creator"
-msgstr ""
+msgstr "Oluşturan"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_properties
 msgid "DAV Properties"
-msgstr ""
+msgstr "DAV Özellikleri"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "Dizinin bir üst dizini ya da depolaması olmalı"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,do_subst:0
 #: field:document.webdav.file.property,do_subst:0
 msgid "Substitute"
-msgstr ""
+msgstr "Yedek"
diff --git a/addons/document_webdav/i18n/zh_CN.po b/addons/document_webdav/i18n/zh_CN.po
index edfff77e05a..68388fafde0 100644
--- a/addons/document_webdav/i18n/zh_CN.po
+++ b/addons/document_webdav/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: document_webdav
 #: field:document.webdav.dir.property,create_date:0
diff --git a/addons/document_webdav/i18n/zh_TW.po b/addons/document_webdav/i18n/zh_TW.po
new file mode 100644
index 00000000000..01a45719547
--- /dev/null
+++ b/addons/document_webdav/i18n/zh_TW.po
@@ -0,0 +1,196 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_date:0
+#: field:document.webdav.file.property,create_date:0
+msgid "Date Created"
+msgstr "建立日期"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_document_props
+msgid "Documents"
+msgstr "文件"
+
+#. module: document_webdav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "錯誤! 您不能建立循環的目錄"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Search Document properties"
+msgstr "搜尋文件目錄"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: field:document.webdav.dir.property,namespace:0
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,namespace:0
+msgid "Namespace"
+msgstr "Namespace"
+
+#. module: document_webdav
+#: field:document.directory,dav_prop_ids:0
+msgid "DAV properties"
+msgstr "DAV 內容"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_file_property
+msgid "document.webdav.file.property"
+msgstr "document.webdav.file.property"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Group By..."
+msgstr "群組...."
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "These properties will be added to WebDAV requests"
+msgstr "這些內容將被加到 WebDAV 請求"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_file_props_form
+msgid "DAV Properties for Documents"
+msgstr "文件的DAV 內容"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid "PyWebDAV Import Error!"
+msgstr "PyWebDAV 匯入錯誤!"
+
+#. module: document_webdav
+#: view:document.webdav.file.property:0
+#: field:document.webdav.file.property,file_id:0
+msgid "Document"
+msgstr "文件"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_folder_props
+msgid "Folders"
+msgstr "檔案夾"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory cannot be parent of itself!"
+msgstr "目錄不能成為自己的母目錄!"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "動態背景"
+
+#. module: document_webdav
+#: view:document.directory:0
+msgid "WebDAV properties"
+msgstr "WebDAV 內容"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "The directory name must be unique !"
+msgstr "目錄名不能重覆！"
+
+#. module: document_webdav
+#: code:addons/document_webdav/webdav.py:37
+#, python-format
+msgid ""
+"Please install PyWebDAV from "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
+msgstr ""
+"從 http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/，請安裝 PyWebDAV"
+
+#. module: document_webdav
+#: model:ir.actions.act_window,name:document_webdav.action_dir_props_form
+msgid "DAV Properties for Folders"
+msgstr "DAV 檔案夾內容"
+
+#. module: document_webdav
+#: view:document.directory:0
+#: view:document.webdav.dir.property:0
+#: view:document.webdav.file.property:0
+msgid "Properties"
+msgstr "內容"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,name:0
+#: field:document.webdav.file.property,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: document_webdav
+#: model:ir.model,name:document_webdav.model_document_webdav_dir_property
+msgid "document.webdav.dir.property"
+msgstr "document.webdav.dir.property"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,value:0
+#: field:document.webdav.file.property,value:0
+msgid "Value"
+msgstr "價值"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,dir_id:0
+#: model:ir.model,name:document_webdav.model_document_directory
+msgid "Directory"
+msgstr "目錄"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_uid:0
+#: field:document.webdav.file.property,write_uid:0
+msgid "Last Modification User"
+msgstr "最後修改使用者"
+
+#. module: document_webdav
+#: view:document.webdav.dir.property:0
+msgid "Dir"
+msgstr "路徑"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,write_date:0
+#: field:document.webdav.file.property,write_date:0
+msgid "Date Modified"
+msgstr "修改日期"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,create_uid:0
+#: field:document.webdav.file.property,create_uid:0
+msgid "Creator"
+msgstr "建立者"
+
+#. module: document_webdav
+#: model:ir.ui.menu,name:document_webdav.menu_properties
+msgid "DAV Properties"
+msgstr "DAV 內容"
+
+#. module: document_webdav
+#: sql_constraint:document.directory:0
+msgid "Directory must have a parent or a storage"
+msgstr "目錄必須要有母目錄或儲存室"
+
+#. module: document_webdav
+#: field:document.webdav.dir.property,do_subst:0
+#: field:document.webdav.file.property,do_subst:0
+msgid "Substitute"
+msgstr "替代項目"
diff --git a/addons/document_webdav/nodes.py b/addons/document_webdav/nodes.py
index d6ceca458cd..a8fedee4fe3 100644
--- a/addons/document_webdav/nodes.py
+++ b/addons/document_webdav/nodes.py
@@ -25,6 +25,8 @@ from tools.safe_eval import safe_eval as eval
 import time
 import urllib
 import uuid
+from openerp import SUPERUSER_ID
+
 try:
     from tools.dict_tools import dict_filter
 except ImportError:
@@ -233,7 +235,7 @@ class node_acl_mixin(object):
         
         if props_to_delete:
             # explicitly delete, as admin, any of the ids we have identified.
-            propobj.unlink(cr, 1, props_to_delete)
+            propobj.unlink(cr, SUPERUSER_ID, props_to_delete)
         
         if lock_data.get('unlock_mode', False):
             return lock_found and True
diff --git a/addons/document_webdav/redirect.py b/addons/document_webdav/redirect.py
index 31f462bcbbe..c3dd9248f45 100644
--- a/addons/document_webdav/redirect.py
+++ b/addons/document_webdav/redirect.py
@@ -30,7 +30,7 @@ class RedirectHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler
     _HTTP_OPTIONS = { 'Allow': ['OPTIONS', 'GET', 'HEAD', 'PROPFIND'] }
     redirect_paths = {}
 
-    def __init__(self,request, client_address, server):
+    def __init__(self, request, client_address, server):
         HTTPHandler.__init__(self,request,client_address,server)
 
     def send_head(self):
diff --git a/addons/document_webdav/test_davclient.py b/addons/document_webdav/test_davclient.py
old mode 100755
new mode 100644
index f1f2e58c835..79ee471c69e
--- a/addons/document_webdav/test_davclient.py
+++ b/addons/document_webdav/test_davclient.py
@@ -42,6 +42,7 @@ from tools import config
 from xmlrpclib import Transport, ProtocolError
 import StringIO
 import base64
+from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)
 
@@ -361,7 +362,7 @@ class DAVClient(object):
         to break if "base_crypt" is used.
         """
         ruob = obj.pool.get('res.users')
-        res = ruob.read(cr, 1, [uid,], ['login', 'password'])
+        res = ruob.read(cr, SUPERUSER_ID, [uid,], ['login', 'password'])
         assert res, "uid %s not found" % uid
         self.user = res[0]['login']
         self.passwd = res[0]['password']
@@ -682,7 +683,7 @@ class DAVClient(object):
             assert d2 == d, "Data does not match"
         return ctype, rrange, d
 
-    def gd_put(self, path, body=None, srcpath=None, mime=None, noclobber=False, ):
+    def gd_put(self, path, body=None, srcpath=None, mime=None, noclobber=False):
         """ HTTP PUT
             @param noclobber will prevent overwritting a resource (If-None-Match)
             @param mime will set the content-type
@@ -704,5 +705,4 @@ class DAVClient(object):
         etag = m.getheader('ETag')
         return etag or True
 
-#eof
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_webdav/webdav.py b/addons/document_webdav/webdav.py
index 903dd6a16ba..f714ff51518 100644
--- a/addons/document_webdav/webdav.py
+++ b/addons/document_webdav/webdav.py
@@ -236,7 +236,7 @@ def mk_prop_response(self, uri, good_props, bad_props, doc):
     return re
 
 
-def mk_propname_response(self,uri,propnames,doc):
+def mk_propname_response(self, uri, propnames, doc):
     """ make a new <prop> result element for a PROPNAME request
 
     This will simply format the propnames list.
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 28909e61167..70ad4d2657f 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -81,7 +81,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
                             'DELETE', 'TRACE', 'REPORT', ]
                     }
 
-    def get_userinfo(self,user,pw):
+    def get_userinfo(self, user, pw):
         return False
 
     def _log(self, message):
@@ -167,7 +167,7 @@ class DAVHandler(HttpOptions, FixSendError, DAVRequestHandler):
             self.close_connection = 1
         DAVRequestHandler.send_header(self, key, value)
 
-    def send_body(self, DATA, code = None, msg = None, desc = None, ctype='application/octet-stream', headers=None):
+    def send_body(self, DATA, code=None, msg=None, desc=None, ctype='application/octet-stream', headers=None):
         if headers and 'Connection' in headers:
             pass
         elif self.request_version in ('HTTP/1.0', 'HTTP/0.9'):
@@ -441,10 +441,10 @@ class dummy_dav_interface(object):
     def __init__(self, parent):
         self.parent = parent
 
-    def get_propnames(self,uri):
+    def get_propnames(self, uri):
         return self.PROPS
 
-    def get_prop(self,uri,ns,propname):
+    def get_prop(self, uri, ns, propname):
         if self.M_NS.has_key(ns):
             prefix=self.M_NS[ns]
         else:
@@ -460,10 +460,10 @@ class dummy_dav_interface(object):
     def get_data(self, uri, range=None):
         raise DAV_NotFound
 
-    def _get_dav_creationdate(self,uri):
+    def _get_dav_creationdate(self, uri):
         return time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime())
 
-    def _get_dav_getlastmodified(self,uri):
+    def _get_dav_getlastmodified(self, uri):
         return time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime())
 
     def _get_dav_displayname(self, uri):
diff --git a/addons/edi/__init__.py b/addons/edi/__init__.py
index 46fabbc2fd0..0be96869f61 100644
--- a/addons/edi/__init__.py
+++ b/addons/edi/__init__.py
@@ -29,7 +29,7 @@ _logger = logging.getLogger(__name__)
 try:
     import controllers
 except ImportError:
-    _logger.warn(
+    _logger.warning(
         """Could not load openerp-web section of EDI, EDI will not behave correctly
 
 To fix, launch openerp-web in embedded mode""")
diff --git a/addons/edi/__openerp__.py b/addons/edi/__openerp__.py
index f441b1bbb89..b06c01eb03b 100644
--- a/addons/edi/__openerp__.py
+++ b/addons/edi/__openerp__.py
@@ -36,24 +36,13 @@ documentation at http://doc.openerp.com.
     'website': 'http://www.openerp.com',
     'depends': ['base', 'email_template'],
     'icon': '/edi/static/src/img/knowledge.png',
-    'data': [
-        'security/ir.model.access.csv',
-    ],
-    'test': [
-        'test/edi_partner_test.yml',
-    ],
-    'js': [
-        'static/src/js/edi.js',
-    ],
-    "css": [
-        "static/src/css/edi.css"
-    ],
-    'qweb': [
-        "static/src/xml/*.xml",
-    ],
+    'data': ['security/ir.model.access.csv'],
+    'test': ['test/edi_partner_test.yml'],
+    'js': ['static/src/js/edi.js'],
+    'css': ['static/src/css/edi.css'],
+    'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '002046536359186',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/edi/controllers/main.py b/addons/edi/controllers/main.py
index 71560aa9e60..c62fef19cba 100644
--- a/addons/edi/controllers/main.py
+++ b/addons/edi/controllers/main.py
@@ -4,14 +4,8 @@ import textwrap
 import simplejson
 import werkzeug.wrappers
 
-try:
-    # embedded
-    import openerp.addons.web.common.http as openerpweb
-    import openerp.addons.web.controllers.main as webmain
-except ImportError:
-    # standalone
-    import web.common.http as openerpweb
-    import web.controllers.main as webmain
+import openerp.addons.web.http as openerpweb
+import openerp.addons.web.controllers.main as webmain
 
 class EDI(openerpweb.Controller):
     # http://hostname:8069/edi/view?db=XXXX&token=XXXXXXXXXXX
diff --git a/addons/edi/i18n/ar.po b/addons/edi/i18n/ar.po
index 45ce2f2c34c..ebb9289cee4 100644
--- a/addons/edi/i18n/ar.po
+++ b/addons/edi/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
@@ -101,7 +101,7 @@ msgstr "الشريك"
 #: code:addons/edi/models/edi.py:152
 #, python-format
 msgid "Missing Application"
-msgstr ""
+msgstr "تطبيق مفقود"
 
 #. module: edi
 #: field:edi.document,document:0
@@ -146,7 +146,7 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
 msgid "Import into another application"
-msgstr ""
+msgstr "جلبها لتطبيق آخر"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
@@ -321,13 +321,13 @@ msgstr ""
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
 msgid "Bank Wire Transfer"
-msgstr ""
+msgstr "حوالة مصرفية بنكية"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
 msgid "Please transfer"
-msgstr ""
+msgstr "رجاء قم بالتحويل"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
@@ -363,7 +363,7 @@ msgstr "مندوب المبيعات"
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
 msgid "Payment terms"
-msgstr ""
+msgstr "شروط الدفع"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
@@ -375,6 +375,7 @@ msgstr "الخصم (%)"
 msgid ""
 "You may directly pay this order online via Paypal's secure payment gateway:"
 msgstr ""
+"قد تدفع مباشرة عبر الإنترنت من خلال هذا النظام باي بال بوابة الدفع الآمن:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
diff --git a/addons/edi/i18n/de.po b/addons/edi/i18n/de.po
index 15bc8dd73b4..fbab109ed53 100644
--- a/addons/edi/i18n/de.po
+++ b/addons/edi/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/es.po b/addons/edi/i18n/es.po
index 56dbdbf39d5..aa0d583ee88 100644
--- a/addons/edi/i18n/es.po
+++ b/addons/edi/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/es_CR.po b/addons/edi/i18n/es_CR.po
index 9452e50c51d..ec65c6e52c9 100644
--- a/addons/edi/i18n/es_CR.po
+++ b/addons/edi/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/fi.po b/addons/edi/i18n/fi.po
index 4b1b5b8d4e6..6c635380104 100644
--- a/addons/edi/i18n/fi.po
+++ b/addons/edi/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/fr.po b/addons/edi/i18n/fr.po
index 03037acd322..a1dbdec7d84 100644
--- a/addons/edi/i18n/fr.po
+++ b/addons/edi/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
@@ -179,6 +179,14 @@ msgid ""
 "this and what the content of OpenERP EDI documents\n"
 "                            is like in the"
 msgstr ""
+"sérialisation des attributs documents.\n"
+"                            Il est souvent simple et rapide de créer un "
+"petit plugin pour vos applications\n"
+"                            préférées qui seront capables d'importer tout "
+"document EDI.\n"
+"                            Vous pouvez trouver plus de détails sur comment "
+"faire cela et sur le contenu des documents EDI\n"
+"                            sur"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
@@ -361,7 +369,7 @@ msgstr ""
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
 msgid "on the transfer:"
-msgstr ""
+msgstr "sur le transfert :"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
diff --git a/addons/edi/i18n/ja.po b/addons/edi/i18n/ja.po
index 2e0cea1af7f..a1fc59b5788 100644
--- a/addons/edi/i18n/ja.po
+++ b/addons/edi/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/mn.po b/addons/edi/i18n/mn.po
index c5d63fb984a..5a0ccdcbbe3 100644
--- a/addons/edi/i18n/mn.po
+++ b/addons/edi/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
@@ -79,12 +79,12 @@ msgstr ""
 #. module: edi
 #: help:edi.document,document:0
 msgid "EDI document content"
-msgstr ""
+msgstr "Эди баримтын агуулга"
 
 #. module: edi
 #: model:ir.model,name:edi.model_edi_document
 msgid "EDI Document"
-msgstr ""
+msgstr "EDI баримт"
 
 #. module: edi
 #: code:addons/edi/models/edi.py:48
@@ -101,7 +101,7 @@ msgstr ""
 #: code:addons/edi/models/edi.py:152
 #, python-format
 msgid "Missing Application"
-msgstr ""
+msgstr "Байхгүй Аппликешн"
 
 #. module: edi
 #: field:edi.document,document:0
@@ -111,12 +111,12 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
 msgid "View/Print"
-msgstr ""
+msgstr "Харах/Хэвлэх"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
 msgid "Import this document"
-msgstr ""
+msgstr "Баримт импортлох"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
@@ -126,7 +126,7 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
 msgid "OpenERP instance address:"
-msgstr ""
+msgstr "OpenERP жишээ хаяг:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
@@ -146,7 +146,7 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
 msgid "Import into another application"
-msgstr ""
+msgstr "Импортлох бусад аппликешн"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
@@ -177,7 +177,7 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
 msgid "OpenERP documentation"
-msgstr ""
+msgstr "OpenERP бичиг баримт"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
@@ -252,7 +252,7 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
 msgid "Discount"
-msgstr ""
+msgstr "Хөнгөлөлт"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
@@ -286,7 +286,7 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
 msgid "Base Amount"
-msgstr ""
+msgstr "Үндсэн дүн"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
@@ -303,13 +303,13 @@ msgstr ""
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
 msgid "Pay Online"
-msgstr ""
+msgstr "Онлайн төлбөр"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
 msgid "Paypal"
-msgstr ""
+msgstr "Paypal"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
@@ -321,13 +321,13 @@ msgstr ""
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
 msgid "Bank Wire Transfer"
-msgstr ""
+msgstr "Банк хоорондын шилжүүлэг"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
 msgid "Please transfer"
-msgstr ""
+msgstr "Шилжүүлэг хийнэ үү"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
@@ -363,12 +363,12 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
 msgid "Payment terms"
-msgstr ""
+msgstr "Төлбөрийн хугацаа"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
 msgid "Discount(%)"
-msgstr ""
+msgstr "Хөнгөлөлт(%)"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
diff --git a/addons/edi/i18n/nb.po b/addons/edi/i18n/nb.po
new file mode 100644
index 00000000000..3a6399762f8
--- /dev/null
+++ b/addons/edi/i18n/nb.po
@@ -0,0 +1,411 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-09-08 19:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: edi
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr "Valutakode må være unik pr. firma!"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Partner adresser"
+
+#. module: edi
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Firmanavn må være unikt !"
+
+#. module: edi
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
+
+#. module: edi
+#: field:edi.document,name:0
+msgid "EDI token"
+msgstr "EDI tegn."
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr "Unik identifikator for å hente en EDI dokument."
+
+#. module: edi
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "Firmaer"
+
+#. module: edi
+#: sql_constraint:edi.document:0
+msgid "EDI Tokens must be unique!"
+msgstr "EDI tegnet må være unikt!"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:153
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+"Dokumentet du prøver å importere krever OpenERP `% s` søknad. Du kan "
+"installere det ved å koble som administrator og åpne konfigurasjonen "
+"assistent."
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr "EDI dokumentinnhold"
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_document
+msgid "EDI Document"
+msgstr "EDI dokument."
+
+#. module: edi
+#: code:addons/edi/models/edi.py:48
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr "'% s' er en ugyldig ekstern ID."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:152
+#, python-format
+msgid "Missing Application"
+msgstr "Manglende Søknad."
+
+#. module: edi
+#: field:edi.document,document:0
+msgid "Document"
+msgstr "Dokument"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
+msgid "View/Print"
+msgstr "Vis / Skriv ut"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
+msgid "Import this document"
+msgstr "Importer dette dokumentet."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
+msgid "Import it into an existing OpenERP instance"
+msgstr "Importere den inn i en eksisterende OpenERP eksempel."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr "OpenERP eksempel adresse:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
+msgid "Import"
+msgstr "Import"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
+msgid "Import it into a new OpenERP Online instance"
+msgstr "Importere den til en ny OpenERP Online eksempel."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr "Opprett min nye OpenERP eksempel."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
+msgid "Import into another application"
+msgstr "Importere til et annet program."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
+msgid ""
+"OpenERP's Electronic Data Interchange documents are based on a generic and "
+"language\n"
+"                            independent"
+msgstr ""
+"OpenERP's elektronisk Data utveksler dokumentene er basert på en generisk og "
+"språk.\n"
+"                                                                             "
+"                                                                 uavhengig."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid "JSON"
+msgstr "JSON"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid ""
+"serialization of the document's attribute.\n"
+"                            It is usually very quick and straightforward to "
+"create a small plug-in for your preferred\n"
+"                            application that will be capable of importing "
+"any OpenERP EDI document.\n"
+"                            You can find out more details about how to do "
+"this and what the content of OpenERP EDI documents\n"
+"                            is like in the"
+msgstr ""
+"Serialisering av dokumentets attributtet.\n"
+"                             Det er vanligvis svært rask og grei å lage en "
+"liten plug-in for din foretrukne.\n"
+"                             program som vil være i stand til å importere "
+"noen OpenERP EDI dokument.\n"
+"                             Du kan finne ut mer informasjon om hvordan du "
+"gjør dette og hva innholdet i OpenERP EDI dokumenter\n"
+"                             er som i."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
+msgid "OpenERP documentation"
+msgstr "OpenERP dokumentasjon."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
+msgid "To get started immediately,"
+msgstr "Å komme i gang umiddelbart,"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
+msgid "see is all it takes to use this EDI document in Python"
+msgstr "Se er alt som trengs for å bruke denne EDI dokumentet i Python."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
+msgid "You can download the raw EDI document here:"
+msgstr "Du kan laste ned den rå EDI dokumentet her:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
+msgid "Download"
+msgstr "Nedlastning"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "Powered by"
+msgstr "Drevet av."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
+msgid "Invoice"
+msgstr "Faktura"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
+msgid "Date"
+msgstr "Dato"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
+msgid "Your Reference"
+msgstr "Din referanse."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
+msgid "Product Description"
+msgstr "Produktbeskrivelse"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
+msgid "Quantity"
+msgstr "Antall"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
+msgid "Unit Price"
+msgstr "Enhetspris"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
+msgid "Discount"
+msgstr "Rabatt"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
+msgid "Price"
+msgstr "Pris"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
+msgid "Net Total:"
+msgstr "Netto total:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
+msgid "Taxes:"
+msgstr "Avgifter:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
+msgid "Total:"
+msgstr "Totalt:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
+msgid "Tax"
+msgstr "Skatt"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
+msgid "Base Amount"
+msgstr "Grunnbeløp"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
+msgid "Amount"
+msgstr "Beløp"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
+msgid "Notes:"
+msgstr "Notater:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
+msgid "Pay Online"
+msgstr "Betal online."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
+msgid "Paypal"
+msgstr "Paypal"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
+msgid ""
+"You may directly pay this invoice online via Paypal's secure payment gateway:"
+msgstr ""
+"Du kan betale direkte denne fakturaen online via Paypal er sikker betaling "
+"gateway:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
+msgid "Bank Wire Transfer"
+msgstr "Bank Tråd overføring."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
+msgid "Please transfer"
+msgstr "Vennligst overfør."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
+msgid "to"
+msgstr "til"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
+msgid ""
+"(postal address on the invoice header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the invoice\n"
+"                     reference"
+msgstr ""
+"(postadresse på fakturaen header)\n"
+"Ved hjelp av en av følgende bankkontoer. Sørg for å nevne faktura.\n"
+"Referanse."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
+msgid "on the transfer:"
+msgstr "På overføring:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
+msgid "Order"
+msgstr "Ordre"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
+msgid "Salesman"
+msgstr "Selger"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
+msgid "Payment terms"
+msgstr "Betalingsbetingelser"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
+msgid "Discount(%)"
+msgstr "Raball(%)"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
+msgid ""
+"You may directly pay this order online via Paypal's secure payment gateway:"
+msgstr ""
+"Du kan betale direkte i denne rekkefølgen online via Paypal's sikker "
+"betaling gateway."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
+msgid ""
+"(postal address on the order header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the document\n"
+"                     reference"
+msgstr ""
+"Ostal adresse på bestillingen topp)\n"
+"Ved hjelp av en av følgende bankkontoer. Sørg for å nevne dokumentet.\n"
+"Referanse."
diff --git a/addons/edi/i18n/nl.po b/addons/edi/i18n/nl.po
index f0c17f06883..ad483271748 100644
--- a/addons/edi/i18n/nl.po
+++ b/addons/edi/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-09 11:32+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
@@ -262,7 +262,7 @@ msgstr "Hoeveelheid"
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
 msgid "Unit Price"
-msgstr "Eenheidsprijs"
+msgstr "Prijs"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
@@ -273,7 +273,7 @@ msgstr "Korting"
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
 msgid "Price"
-msgstr "Prijs"
+msgstr "Bedrag"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
diff --git a/addons/edi/i18n/nl_BE.po b/addons/edi/i18n/nl_BE.po
new file mode 100644
index 00000000000..be79e081ae9
--- /dev/null
+++ b/addons/edi/i18n/nl_BE.po
@@ -0,0 +1,407 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-10-02 08:10+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <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: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: edi
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr "De munt moet uniek zijn per firma."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Adressen"
+
+#. module: edi
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "De firmanaam moet uniek zijn"
+
+#. module: edi
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "U kunt niet dezelfde leden maken."
+
+#. module: edi
+#: field:edi.document,name:0
+msgid "EDI token"
+msgstr "EDI-token"
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr "Unieke identificatie voor het ophalen van een EDI-document."
+
+#. module: edi
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "U kunt niet dezelfde bedrijven maken."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "Bedrijven"
+
+#. module: edi
+#: sql_constraint:edi.document:0
+msgid "EDI Tokens must be unique!"
+msgstr "EDI-tokens moeten uniek zijn."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "Munt"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:153
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+"Het document dat u tracht te importeren vereist de OpenERP `%s` toepassing. "
+"U kunt deze installeren door aan te melden als administrator en vervolgens "
+"de configuratiewizard te openen."
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr "Inhoud EDI-document"
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_document
+msgid "EDI Document"
+msgstr "EDI-document"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:48
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr "'%s' is een ongeldige externe ID"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:152
+#, python-format
+msgid "Missing Application"
+msgstr "Ontbrekende applicatie"
+
+#. module: edi
+#: field:edi.document,document:0
+msgid "Document"
+msgstr "Document"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
+msgid "View/Print"
+msgstr "Bekijken/afdrukken"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
+msgid "Import this document"
+msgstr "Importeer dit document"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
+msgid "Import it into an existing OpenERP instance"
+msgstr "Importeren in een bestaande OpenERP-instantie"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr "Adres OpenERP-instantie"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
+msgid "Import"
+msgstr "Importeren"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
+msgid "Import it into a new OpenERP Online instance"
+msgstr "Importeren in een nieuwe instantie van OpenERP Online"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr "Maak mijn nieuwe OpenERP-instantie"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
+msgid "Import into another application"
+msgstr "Importeren in een andere toepassing"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
+msgid ""
+"OpenERP's Electronic Data Interchange documents are based on a generic and "
+"language\n"
+"                            independent"
+msgstr ""
+"OpenERP-documenten voor Electronic Data Interchange zijn gebaseerd op een "
+"generieke en taal-\n"
+"                            onafhankelijke"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid "JSON"
+msgstr "JSON"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid ""
+"serialization of the document's attribute.\n"
+"                            It is usually very quick and straightforward to "
+"create a small plug-in for your preferred\n"
+"                            application that will be capable of importing "
+"any OpenERP EDI document.\n"
+"                            You can find out more details about how to do "
+"this and what the content of OpenERP EDI documents\n"
+"                            is like in the"
+msgstr ""
+"serialisatie van het documentattribuut.\n"
+"                            Doorgaans gaat het snel om een kleine plug-in te "
+"schrijven voor uw toepassing\n"
+"                            waarmee u het OpenERP EDI-document kunt "
+"importeren.\n"
+"                            Voor meer details over het maken ervan en over "
+"de inhoud van OpenERP EDI-documenten\n"
+"                            verwijzen wij naar"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
+msgid "OpenERP documentation"
+msgstr "OpenERP-documentatie"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
+msgid "To get started immediately,"
+msgstr "Om snel aan de slag te gaan"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
+msgid "see is all it takes to use this EDI document in Python"
+msgstr ""
+"is dit het enige wat u nodig heeft om dit EDI-document in Python te gebruiken"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
+msgid "You can download the raw EDI document here:"
+msgstr "Hier kunt u het ruwe EDI-document downloaden:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
+msgid "Download"
+msgstr "Download"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "Powered by"
+msgstr "Mogelijk gemaakt door"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
+msgid "Invoice"
+msgstr "Factuur"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
+msgid "Description"
+msgstr "Omschrijving"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
+msgid "Date"
+msgstr "Datum"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
+msgid "Your Reference"
+msgstr "Uw referentie"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
+msgid "Product Description"
+msgstr "Productomschrijving"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
+msgid "Quantity"
+msgstr "Hoeveelheid"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
+msgid "Unit Price"
+msgstr "Eenheidsprijs"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
+msgid "Discount"
+msgstr "Korting"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
+msgid "Price"
+msgstr "Prijs"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
+msgid "Net Total:"
+msgstr "Nettototaal:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
+msgid "Taxes:"
+msgstr "Btw:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
+msgid "Total:"
+msgstr "Totaal:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
+msgid "Tax"
+msgstr "Btw"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
+msgid "Base Amount"
+msgstr "Basisbedrag"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
+msgid "Amount"
+msgstr "Bedrag"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
+msgid "Notes:"
+msgstr "Opmerkingen:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
+msgid "Pay Online"
+msgstr "Online betalen"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
+msgid "Paypal"
+msgstr "Paypal"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
+msgid ""
+"You may directly pay this invoice online via Paypal's secure payment gateway:"
+msgstr "U kunt deze factuur rechtstreeks via Paypal online betalen."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
+msgid "Bank Wire Transfer"
+msgstr "Overschrijving"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
+msgid "Please transfer"
+msgstr "Gelieve over te schrijven"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
+msgid "to"
+msgstr "naar"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
+msgid ""
+"(postal address on the invoice header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the invoice\n"
+"                     reference"
+msgstr ""
+"(adres in koptekst van de factuur)\n"
+"                     een van deze bankrekeningen. Vermeld zeker de "
+"factuurreferentie"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
+msgid "on the transfer:"
+msgstr "op de overschrijving"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
+msgid "Order"
+msgstr "Order"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
+msgid "Salesman"
+msgstr "Verkoper"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
+msgid "Payment terms"
+msgstr "Betalingsvoorwaarden"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
+msgid "Discount(%)"
+msgstr "Korting(%)"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
+msgid ""
+"You may directly pay this order online via Paypal's secure payment gateway:"
+msgstr "U kunt rechtsreeks via Paypal online betalen."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
+msgid ""
+"(postal address on the order header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the document\n"
+"                     reference"
+msgstr ""
+"(adres in koptekst van de order)\n"
+"                     een van deze bankrekeningen. Vermeld zeker de "
+"factuurreferentie"
diff --git a/addons/edi/i18n/pl.po b/addons/edi/i18n/pl.po
index b9e81e59f78..78426959c1b 100644
--- a/addons/edi/i18n/pl.po
+++ b/addons/edi/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/pt.po b/addons/edi/i18n/pt.po
index 7ba0c2f1359..515d4865cfc 100644
--- a/addons/edi/i18n/pt.po
+++ b/addons/edi/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/pt_BR.po b/addons/edi/i18n/pt_BR.po
index 359c6c7796b..8241a7af72a 100644
--- a/addons/edi/i18n/pt_BR.po
+++ b/addons/edi/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/ro.po b/addons/edi/i18n/ro.po
index b74cb3d16e1..d67fd227fdf 100644
--- a/addons/edi/i18n/ro.po
+++ b/addons/edi/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/ru.po b/addons/edi/i18n/ru.po
new file mode 100644
index 00000000000..2f9028d4f95
--- /dev/null
+++ b/addons/edi/i18n/ru.po
@@ -0,0 +1,390 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-09-10 15:12+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: edi
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr "Код валюты должен быть уникальным в компании!"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Адреса контрагентов"
+
+#. module: edi
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Название компании должно быть уникальным!"
+
+#. module: edi
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
+
+#. module: edi
+#: field:edi.document,name:0
+msgid "EDI token"
+msgstr ""
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr ""
+
+#. module: edi
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Ошибка ! Нельзя создать рекурсивные организации."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "Компании"
+
+#. module: edi
+#: sql_constraint:edi.document:0
+msgid "EDI Tokens must be unique!"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "Валюта"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:153
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr ""
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_document
+msgid "EDI Document"
+msgstr "EDI документ"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:48
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr ""
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "Контрагент"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:152
+#, python-format
+msgid "Missing Application"
+msgstr "Отсутствие приложения"
+
+#. module: edi
+#: field:edi.document,document:0
+msgid "Document"
+msgstr "Документ"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
+msgid "View/Print"
+msgstr "Просмотр/Печать"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
+msgid "Import this document"
+msgstr "Импорт этого документа"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
+msgid "Import it into an existing OpenERP instance"
+msgstr "Импорт в существующую OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr "Адрес этой OpenERP:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
+msgid "Import"
+msgstr "Импорт"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
+msgid "Import it into a new OpenERP Online instance"
+msgstr "Импорт в новый онлайн экземпляр OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr "Создать мой новый экземпляр OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
+msgid "Import into another application"
+msgstr "Импорт в другое приложение"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
+msgid ""
+"OpenERP's Electronic Data Interchange documents are based on a generic and "
+"language\n"
+"                            independent"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid "JSON"
+msgstr "JSON"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid ""
+"serialization of the document's attribute.\n"
+"                            It is usually very quick and straightforward to "
+"create a small plug-in for your preferred\n"
+"                            application that will be capable of importing "
+"any OpenERP EDI document.\n"
+"                            You can find out more details about how to do "
+"this and what the content of OpenERP EDI documents\n"
+"                            is like in the"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
+msgid "OpenERP documentation"
+msgstr "OpenERP документация"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
+msgid "To get started immediately,"
+msgstr "Чтобы приступить к работе немедленно,"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
+msgid "see is all it takes to use this EDI document in Python"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
+msgid "You can download the raw EDI document here:"
+msgstr "Вы можете скачать исходный документ EDI здесь:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
+msgid "Download"
+msgstr "Скачать"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "Powered by"
+msgstr "На базе"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "OpenERP"
+msgstr "OpenERP"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
+msgid "Invoice"
+msgstr "Счет"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
+msgid "Description"
+msgstr "Описание"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
+msgid "Date"
+msgstr "Дата"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
+msgid "Your Reference"
+msgstr "Ваша ссылка"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
+msgid "Product Description"
+msgstr "Описание товара"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
+msgid "Quantity"
+msgstr "Количество"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
+msgid "Unit Price"
+msgstr "Цена за ед."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
+msgid "Discount"
+msgstr "Скидка"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
+msgid "Price"
+msgstr "Цена"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
+msgid "Net Total:"
+msgstr "Чистый итог:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
+msgid "Taxes:"
+msgstr "Налоги:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
+msgid "Total:"
+msgstr "Итого:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
+msgid "Tax"
+msgstr "Налог"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
+msgid "Base Amount"
+msgstr "Базовая сумма"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
+msgid "Amount"
+msgstr "Сумма"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
+msgid "Notes:"
+msgstr "Примечания:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
+msgid "Pay Online"
+msgstr "Оплата онлайн"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
+msgid "Paypal"
+msgstr "Paypal"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
+msgid ""
+"You may directly pay this invoice online via Paypal's secure payment gateway:"
+msgstr ""
+"Вы можете напрямую оплатить этот счет в режиме онлайн через безопасный "
+"платежный шлюз PayPal:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
+msgid "Bank Wire Transfer"
+msgstr "Банковский перевод"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
+msgid "Please transfer"
+msgstr "Пожалуйста, переведите"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
+msgid "to"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
+msgid ""
+"(postal address on the invoice header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the invoice\n"
+"                     reference"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
+msgid "on the transfer:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
+msgid "Order"
+msgstr "Заказ"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
+msgid "Salesman"
+msgstr "Менеджер продаж"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
+msgid "Payment terms"
+msgstr "Условия платежа"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
+msgid "Discount(%)"
+msgstr "Скидка ( %)"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
+msgid ""
+"You may directly pay this order online via Paypal's secure payment gateway:"
+msgstr ""
+"Вы можете напрямую оплатить этот заказ он-лайн через безопасный платежный "
+"шлюз PayPal:"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
+msgid ""
+"(postal address on the order header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the document\n"
+"                     reference"
+msgstr ""
diff --git a/addons/edi/i18n/sv.po b/addons/edi/i18n/sv.po
index 69bdba29c85..a45ecacfb76 100644
--- a/addons/edi/i18n/sv.po
+++ b/addons/edi/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/tr.po b/addons/edi/i18n/tr.po
index 807b22a52d2..9b506f90fcd 100644
--- a/addons/edi/i18n/tr.po
+++ b/addons/edi/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/zh_CN.po b/addons/edi/i18n/zh_CN.po
index 3251e188ef6..8fe6ce86918 100644
--- a/addons/edi/i18n/zh_CN.po
+++ b/addons/edi/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: edi
 #: sql_constraint:res.currency:0
diff --git a/addons/edi/i18n/zh_TW.po b/addons/edi/i18n/zh_TW.po
new file mode 100644
index 00000000000..078e79cbf67
--- /dev/null
+++ b/addons/edi/i18n/zh_TW.po
@@ -0,0 +1,386 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-30 11:51+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: edi
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr "每個公司的貨幣代碼必須唯一"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "業務夥伴地址"
+
+#. module: edi
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "公司名稱必須唯一！"
+
+#. module: edi
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤，您不能建立循環引用的會員"
+
+#. module: edi
+#: field:edi.document,name:0
+msgid "EDI token"
+msgstr "EDI權杖"
+
+#. module: edi
+#: help:edi.document,name:0
+msgid "Unique identifier for retrieving an EDI document."
+msgstr "接收EDI文件的唯一標識符"
+
+#. module: edi
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "錯誤！您不能建立循環引用的公司."
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_company
+msgid "Companies"
+msgstr "公司"
+
+#. module: edi
+#: sql_constraint:edi.document:0
+msgid "EDI Tokens must be unique!"
+msgstr "EDI權杖必須唯一"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_currency
+msgid "Currency"
+msgstr "貨幣"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:153
+#, python-format
+msgid ""
+"The document you are trying to import requires the OpenERP `%s` application. "
+"You can install it by connecting as the administrator and opening the "
+"configuration assistant."
+msgstr "你要匯入的文件需要OpenERP的 %s 模組。你可以用管理員使用者安裝並打開配置精靈。"
+
+#. module: edi
+#: help:edi.document,document:0
+msgid "EDI document content"
+msgstr "EDI文件內容"
+
+#. module: edi
+#: model:ir.model,name:edi.model_edi_document
+msgid "EDI Document"
+msgstr "EDI文件"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:48
+#, python-format
+msgid "'%s' is an invalid external ID"
+msgstr "%s是個無效的外部ID"
+
+#. module: edi
+#: model:ir.model,name:edi.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: edi
+#: code:addons/edi/models/edi.py:152
+#, python-format
+msgid "Missing Application"
+msgstr "不存在此功能"
+
+#. module: edi
+#: field:edi.document,document:0
+msgid "Document"
+msgstr "文件"
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23
+msgid "View/Print"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28
+msgid "Import this document"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33
+msgid "Import it into an existing OpenERP instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36
+msgid "OpenERP instance address:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39
+msgid "Import"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:44
+msgid "Import it into a new OpenERP Online instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:47
+msgid "Create my new OpenERP instance"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:52
+msgid "Import into another application"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:54
+msgid ""
+"OpenERP's Electronic Data Interchange documents are based on a generic and "
+"language\n"
+"                            independent"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid "JSON"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:56
+msgid ""
+"serialization of the document's attribute.\n"
+"                            It is usually very quick and straightforward to "
+"create a small plug-in for your preferred\n"
+"                            application that will be capable of importing "
+"any OpenERP EDI document.\n"
+"                            You can find out more details about how to do "
+"this and what the content of OpenERP EDI documents\n"
+"                            is like in the"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60
+msgid "OpenERP documentation"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61
+msgid "To get started immediately,"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:62
+msgid "see is all it takes to use this EDI document in Python"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:70
+msgid "You can download the raw EDI document here:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:73
+msgid "Download"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "Powered by"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87
+msgid "OpenERP"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34
+msgid "Invoice"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:37
+msgid "Description"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:38
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:41
+msgid "Date"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:39
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:40
+msgid "Your Reference"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:50
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:57
+msgid "Product Description"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:51
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:58
+msgid "Quantity"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:52
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:59
+msgid "Unit Price"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:53
+msgid "Discount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:54
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:61
+msgid "Price"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:72
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:81
+msgid "Net Total:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:83
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:92
+msgid "Taxes:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:94
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:103
+msgid "Total:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:106
+msgid "Tax"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:107
+msgid "Base Amount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:108
+msgid "Amount"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:121
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:113
+msgid "Notes:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:129
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:121
+msgid "Pay Online"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:133
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:125
+msgid "Paypal"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:135
+msgid ""
+"You may directly pay this invoice online via Paypal's secure payment gateway:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:145
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:137
+msgid "Bank Wire Transfer"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:147
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:139
+msgid "Please transfer"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:148
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:140
+msgid "to"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:149
+msgid ""
+"(postal address on the invoice header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the invoice\n"
+"                     reference"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:151
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:143
+msgid "on the transfer:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:36
+msgid "Order"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:42
+msgid "Salesman"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:43
+msgid "Payment terms"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:60
+msgid "Discount(%)"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:127
+msgid ""
+"You may directly pay this order online via Paypal's secure payment gateway:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_sale_purchase.xml:141
+msgid ""
+"(postal address on the order header)\n"
+"                     using one of the following bank accounts. Be sure to "
+"mention the document\n"
+"                     reference"
+msgstr ""
diff --git a/addons/edi/static/src/js/edi.js b/addons/edi/static/src/js/edi.js
index 78e90852c38..a9c6981c6be 100644
--- a/addons/edi/static/src/js/edi.js
+++ b/addons/edi/static/src/js/edi.js
@@ -15,7 +15,7 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
         this._super();
         var self = this;
         var param = {"db": self.db, "token": self.token};
-        return self.rpc('/edi/get_edi_document', param, this.on_document_loaded, this.on_document_failed);
+        return self.rpc('/edi/get_edi_document', param).done(this.on_document_loaded).fail(this.on_document_failed);
     },
     on_document_loaded: function(docs){
         this.doc = docs[0];
@@ -28,14 +28,14 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
         if (openerp.web.qweb.templates[template_content]) {
             this.content = openerp.web.qweb.render(template_content, param);
         }
-        this.$element.html(openerp.web.qweb.render("EdiView", param));
-        this.$element.find('button.oe_edi_action_print').bind('click', this.do_print);
-        this.$element.find('button#oe_edi_import_existing').bind('click', this.do_import_existing);
-        this.$element.find('button#oe_edi_import_create').bind('click', this.do_import_create);
-        this.$element.find('button#oe_edi_download').bind('click', this.do_download);
-        this.$element.find('.oe_edi_import_choice, .oe_edi_import_choice_label').bind('click', this.toggle_choice('import'));
-        this.$element.find('.oe_edi_pay_choice, .oe_edi_pay_choice_label').bind('click', this.toggle_choice('pay'));
-        this.$element.find('#oe_edi_download_show_code').bind('click', this.show_code);
+        this.$el.html(openerp.web.qweb.render("EdiView", param));
+        this.$el.find('button.oe_edi_action_print').bind('click', this.do_print);
+        this.$el.find('button#oe_edi_import_existing').bind('click', this.do_import_existing);
+        this.$el.find('button#oe_edi_import_create').bind('click', this.do_import_create);
+        this.$el.find('button#oe_edi_download').bind('click', this.do_download);
+        this.$el.find('.oe_edi_import_choice, .oe_edi_import_choice_label').bind('click', this.toggle_choice('import'));
+        this.$el.find('.oe_edi_pay_choice, .oe_edi_pay_choice_label').bind('click', this.toggle_choice('pay'));
+        this.$el.find('#oe_edi_download_show_code').bind('click', this.show_code);
     },
     on_document_failed: function(response) {
         var self = this;
@@ -85,7 +85,7 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
     },
     do_import_existing: function(e) {
         var url_download = this.get_download_url();
-        var $edi_text_server_input = this.$element.find('#oe_edi_txt_server_url');
+        var $edi_text_server_input = this.$el.find('#oe_edi_txt_server_url');
         var server_url = $edi_text_server_input.val();
         $edi_text_server_input.removeClass('invalid');
         if (!server_url) {
@@ -108,7 +108,7 @@ openerp.edi.EdiView = openerp.web.Widget.extend({
 });
 
 openerp.edi.edi_view = function (db, token) {
-    openerp.session.session_bind().then(function () {
+    openerp.session.session_bind().done(function () {
         new openerp.edi.EdiView(null,db,token).appendTo($("body").addClass('openerp'));
     });
 }
@@ -138,22 +138,22 @@ openerp.edi.EdiImport = openerp.web.Widget.extend({
     show_login: function() {
         this.destroy_content();
         this.login = new openerp.web.Login(this);
-        this.login.appendTo(this.$element);
+        this.login.appendTo(this.$el);
     },
 
     destroy_content: function() {
         _.each(_.clone(this.getChildren()), function(el) {
             el.destroy();
         });
-        this.$element.children().remove();
+        this.$el.children().remove();
     },
 
     do_import: function() {
-        this.rpc('/edi/import_edi_url', {url: this.url}, this.on_imported, this.on_imported_error);
+        this.rpc('/edi/import_edi_url', {url: this.url}).done(this.on_imported).fail(this.on_imported_error);
     },
     on_imported: function(response) {
         if ('action' in response) {
-            this.rpc("/web/session/save_session_action", {the_action: response.action}, function(key) {
+            this.rpc("/web/session/save_session_action", {the_action: response.action}).done(function(key) {
                 window.location = "/#sa="+encodeURIComponent(key);
             });
         }
@@ -188,7 +188,7 @@ openerp.edi.EdiImport = openerp.web.Widget.extend({
 });
 
 openerp.edi.edi_import = function (url) {
-    openerp.session.session_bind().then(function () {
+    openerp.session.session_bind().done(function () {
         new openerp.edi.EdiImport(null,url).appendTo($("body").addClass('openerp'));
     });
 }
diff --git a/addons/edi/static/src/xml/edi.xml b/addons/edi/static/src/xml/edi.xml
index 88e09824b9b..111cb6d9d26 100644
--- a/addons/edi/static/src/xml/edi.xml
+++ b/addons/edi/static/src/xml/edi.xml
@@ -6,7 +6,7 @@
     <t t-call="WebClient"/>
 </t>
 <t t-name="EdiView">
-    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" id="oe_app" class="oe-application oe_forms">
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%" id="oe_app" class="oe-application oe_forms oe_semantic_html_override">
     <tr>
         <td colspan="2" valign="top" id="oe_header" class="header">
             <div> <a href="/" class="company_logo_link">
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index 3ecf1db1aa0..f79800a76b9 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -21,13 +21,13 @@
 ##############################################################################
 
 {
-    "name" : "Email Templates",
-    "version" : "1.1",
-    "author" : "OpenERP,OpenLabs",
-    "website" : "http://openerp.com",
-    "category" : "Marketing",
-    "depends" : ['mail'],
-    "description": """
+    'name' : 'Email Templates',
+    'version' : '1.1',
+    'author' : 'OpenERP,OpenLabs',
+    'website' : 'http://openerp.com',
+    'category' : 'Marketing',
+    'depends' : ['mail'],
+    'description': """
 Email Templating (simplified version of the original Power Email by Openlabs).
 ==============================================================================
 
@@ -53,22 +53,18 @@ These email templates are also at the heart of the marketing campaign system
 (see the ``marketing_campaign`` application), if you need to automate larger
 campaigns on any OpenERP document.
 
-Technical note: only the templating system of the original Power Email by
-Openlabs was kept.
+    **Technical note:** only the templating system of the original Power Email by Openlabs was kept.
     """,
-    "data": [
+    'data': [
         'wizard/email_template_preview_view.xml',
         'email_template_view.xml',
         'res_partner_view.xml',
         'wizard/mail_compose_message_view.xml',
         'security/ir.model.access.csv'
     ],
-    "demo": [
-        'res_partner_demo.yml',
-    ],
-    "installable": True,
-    "auto_install": False,
-    "certificate" : "00817073628967384349",
+    'demo': ['res_partner_demo.yml'],
+    'installable': True,
+    'auto_install': False,
     'images': ['images/1_email_account.jpeg','images/2_email_template.jpeg','images/3_emails.jpeg'],
 }
 
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index b43b7d19b85..a9bee623f66 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -38,10 +38,8 @@ except ImportError:
 
 class email_template(osv.osv):
     "Templates for sending email"
-    _inherit = 'mail.message'
     _name = "email.template"
     _description = 'Email Templates'
-    _rec_name = 'name' # override mail.message's behavior
 
     def render_template(self, cr, uid, template, model, res_id, context=None):
         """Render the given template text, replace mako expressions ``${expr}``
@@ -99,66 +97,47 @@ class email_template(osv.osv):
         mod_name = False
         if model_id:
             mod_name = self.pool.get('ir.model').browse(cr, uid, model_id, context).model
-        return {'value':{'model': mod_name}}
-
-    def name_get(self, cr, uid, ids, context=None):
-        """ Override name_get of mail.message: return directly the template
-            name, and not the generated name from mail.message.common."""
-        return [(record.id, record.name) for record in self.browse(cr, uid, ids, context=context)]
+        return {'value': {'model': mod_name}}
 
     _columns = {
-        'name': fields.char('Name', size=250),
-        'model_id': fields.many2one('ir.model', 'Related document model'),
-        'lang': fields.char('Language Selection', size=250,
+        'name': fields.char('Name'),
+        'model_id': fields.many2one('ir.model', 'Applies to', help="The kind of document with with this template can be used"),
+        'model': fields.related('model_id', 'model', type='char', string='Related Document Model',
+                                size=128, select=True, store=True, readonly=True),
+        'lang': fields.char('Language',
                             help="Optional translation language (ISO code) to select when sending out an email. "
                                  "If not set, the english version will be used. "
                                  "This should usually be a placeholder expression "
                                  "that provides the appropriate language code, e.g. "
-                                 "${object.partner_id.lang.code}."),
+                                 "${object.partner_id.lang.code}.",
+                            placeholder="${object.partner_id.lang.code}"),
         'user_signature': fields.boolean('Add Signature',
                                          help="If checked, the user's signature will be appended to the text version "
                                               "of the message"),
-        'report_name': fields.char('Report Filename', size=200, translate=True,
-                                   help="Name to use for the generated report file (may contain placeholders)\n"
-                                        "The extension can be omitted and will then come from the report type."),
-        'report_template':fields.many2one('ir.actions.report.xml', 'Optional report to print and attach'),
-        'ref_ir_act_window':fields.many2one('ir.actions.act_window', 'Sidebar action', readonly=True,
-                                            help="Sidebar action to make this template available on records "
-                                                 "of the related document model"),
-        'ref_ir_value':fields.many2one('ir.values', 'Sidebar Button', readonly=True,
-                                       help="Sidebar button to open the sidebar action"),
-        'track_campaign_item': fields.boolean('Resource Tracking',
-                                              help="Enable this is you wish to include a special tracking marker "
-                                                   "in outgoing emails so you can identify replies and link "
-                                                   "them back to the corresponding resource record. "
-                                                   "This is useful for CRM leads for example"),
-
-        # Overridden mail.message.common fields for technical reasons:
-        'model': fields.related('model_id','model', type='char', string='Related Document Model',
-                                size=128, select=True, store=True, readonly=True),
-        # we need a separate m2m table to avoid ID collisions with the original mail.message entries
-        'attachment_ids': fields.many2many('ir.attachment', 'email_template_attachment_rel', 'email_template_id',
-                                           'attachment_id', 'Files to attach',
-                                           help="You may attach files to this template, to be added to all "
-                                                "emails created from this template"),
-
-        # Overridden mail.message.common fields to make tooltips more appropriate:
-        'subject':fields.char('Subject', size=512, translate=True, help="Subject (placeholders may be used here)",),
-        'email_from': fields.char('From', size=128, help="Sender address (placeholders may be used here)"),
-        'email_to': fields.char('To', size=256, help="Comma-separated recipient addresses (placeholders may be used here)"),
-        'email_cc': fields.char('Cc', size=256, help="Carbon copy recipients (placeholders may be used here)"),
-        'email_bcc': fields.char('Bcc', size=256, help="Blind carbon copy recipients (placeholders may be used here)"),
-        'reply_to': fields.char('Reply-To', size=250, help="Preferred response address (placeholders may be used here)"),
+        'subject': fields.char('Subject', translate=True, help="Subject (placeholders may be used here)",),
+        'email_from': fields.char('From', help="Sender address (placeholders may be used here)"),
+        'email_to': fields.char('To (Emails)', help="Comma-separated recipient addresses (placeholders may be used here)"),
+        'email_recipients': fields.char('To (Partners)', help="Comma-separated ids of recipient partners (placeholders may be used here)"),
+        'email_cc': fields.char('Cc', help="Carbon copy recipients (placeholders may be used here)"),
+        'reply_to': fields.char('Reply-To', help="Preferred response address (placeholders may be used here)"),
         'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing Mail Server', readonly=False,
                                           help="Optional preferred server for outgoing mails. If not set, the highest "
                                                "priority one will be used."),
-        'body_text': fields.text('Text Contents', translate=True, help="Plaintext version of the message (placeholders may be used here)"),
-        'body_html': fields.text('Rich-text Contents', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"),
-        'message_id': fields.char('Message-Id', size=256, help="Message-ID SMTP header to use in outgoing messages based on this template. "
-                                                               "Please note that this overrides the 'Resource Tracking' option, "
-                                                               "so if you simply need to track replies to outgoing emails, enable "
-                                                               "that option instead.\n"
-                                                               "Placeholders must be used here, as this value always needs to be unique!"),
+        'body_html': fields.text('Body', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"),
+        'report_name': fields.char('Report Filename', translate=True,
+                                   help="Name to use for the generated report file (may contain placeholders)\n"
+                                        "The extension can be omitted and will then come from the report type."),
+        'report_template': fields.many2one('ir.actions.report.xml', 'Optional report to print and attach'),
+        'ref_ir_act_window': fields.many2one('ir.actions.act_window', 'Sidebar action', readonly=True,
+                                            help="Sidebar action to make this template available on records "
+                                                 "of the related document model"),
+        'ref_ir_value': fields.many2one('ir.values', 'Sidebar Button', readonly=True,
+                                       help="Sidebar button to open the sidebar action"),
+        'attachment_ids': fields.many2many('ir.attachment', 'email_template_attachment_rel', 'email_template_id',
+                                           'attachment_id', 'Attachments',
+                                           help="You may attach files to this template, to be added to all "
+                                                "emails created from this template"),
+        'auto_delete': fields.boolean('Auto Delete', help="Permanently delete this email after sending it, to save space"),
 
         # Fake fields used to implement the placeholder assistant
         'model_object_field': fields.many2one('ir.model.fields', string="Field",
@@ -172,12 +151,12 @@ class email_template(osv.osv):
                                                   help="When a relationship field is selected as first field, "
                                                        "this field lets you select the target field within the "
                                                        "destination document model (sub-model)."),
-        'null_value': fields.char('Null value', help="Optional value to use if the target field is empty", size=128),
-        'copyvalue': fields.char('Expression', size=256, help="Final placeholder expression, to be copy-pasted in the desired template field."),
+        'null_value': fields.char('Default Value', help="Optional value to use if the target field is empty"),
+        'copyvalue': fields.char('Placeholder Expression', help="Final placeholder expression, to be copy-pasted in the desired template field."),
     }
 
     _defaults = {
-        'track_campaign_item': True
+        'auto_delete': True,
     }
 
     def create_action(self, cr, uid, ids, context=None):
@@ -195,7 +174,7 @@ class email_template(osv.osv):
                  'res_model': 'mail.compose.message',
                  'src_model': src_obj,
                  'view_type': 'form',
-                 'context': "{'mail.compose.message.mode':'mass_mail', 'mail.compose.template_id' : %d}" % (template.id),
+                 'context': "{'default_composition_mode': 'mass_mail', 'default_template_id' : %d, 'default_use_template': True}" % (template.id),
                  'view_mode':'form,tree',
                  'view_id': res_id,
                  'target': 'new',
@@ -222,7 +201,7 @@ class email_template(osv.osv):
                 if template.ref_ir_value:
                     ir_values_obj = self.pool.get('ir.values')
                     ir_values_obj.unlink(cr, uid, template.ref_ir_value.id, context)
-            except:
+            except Exception:
                 raise osv.except_osv(_("Warning"), _("Deletion of the action record failed."))
         return True
 
@@ -235,7 +214,10 @@ class email_template(osv.osv):
         if default is None:
             default = {}
         default = default.copy()
-        default['name'] = template.name + _('(copy)')
+        default.update(
+            name=_("%s (copy)") % (template.name),
+            ref_ir_act_window=False,
+            ref_ir_value=False)
         return super(email_template, self).copy(cr, uid, id, default, context)
 
     def build_expression(self, field_name, sub_field_name, null_value):
@@ -294,65 +276,33 @@ class email_template(osv.osv):
            :param res_id: id of the record to use for rendering the template (model
                           is taken from template definition)
            :returns: a dict containing all relevant fields for creating a new
-                     mail.message entry, with the addition one additional
-                     special key ``attachments`` containing a list of
+                     mail.mail entry, with one extra key ``attachments``, in the
+                     format expected by :py:meth:`mail_thread.message_post`.
         """
         if context is None:
             context = {}
-        values = {
-                  'subject': False,
-                  'body_text': False,
-                  'body_html': False,
-                  'email_from': False,
-                  'email_to': False,
-                  'email_cc': False,
-                  'email_bcc': False,
-                  'reply_to': False,
-                  'auto_delete': False,
-                  'model': False,
-                  'res_id': False,
-                  'mail_server_id': False,
-                  'attachments': False,
-                  'attachment_ids': False,
-                  'message_id': False,
-                  'state': 'outgoing',
-                  'content_subtype': 'plain',
-                  'partner_ids': [],
-        }
-        if not template_id:
-            return values
-
         report_xml_pool = self.pool.get('ir.actions.report.xml')
         template = self.get_email_template(cr, uid, template_id, res_id, context)
-
-        for field in ['subject', 'body_text', 'body_html', 'email_from',
-                      'email_to', 'email_cc', 'email_bcc', 'reply_to',
-                      'message_id']:
+        values = {}
+        for field in ['subject', 'body_html', 'email_from',
+                      'email_to', 'email_recipients', 'email_cc', 'reply_to']:
             values[field] = self.render_template(cr, uid, getattr(template, field),
                                                  template.model, res_id, context=context) \
                                                  or False
-
-        # if email_to: find or create a partner
-        if values['email_to']:
-            partner_id = self.pool.get('mail.thread').message_partner_by_email(cr, uid, values['email_to'], context=context)['partner_id']
-            if not partner_id:
-                partner_id = self.pool.get('res.partner').name_create(cr, uid, values['email_to'], context=context)
-            values['partner_ids'] = [partner_id]
-
-        if values['body_html']:
-            values.update(content_subtype='html')
-
         if template.user_signature:
             signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
-            values['body_text'] += '\n\n' + signature
+            values['body_html'] = tools.append_content_to_html(values['body_html'], signature)
 
-        values.update(mail_server_id = template.mail_server_id.id or False,
-                      auto_delete = template.auto_delete,
+        if values['body_html']:
+            values['body'] = tools.html_sanitize(values['body_html'])
+
+        values.update(mail_server_id=template.mail_server_id.id or False,
+                      auto_delete=template.auto_delete,
                       model=template.model,
                       res_id=res_id or False)
 
-        attachments = {}
-        # Add report as a Document
+        attachments = []
+        # Add report in attachments
         if template.report_template:
             report_name = self.render_template(cr, uid, template.report_name, template.model, res_id, context=context)
             report_service = 'report.' + report_xml_pool.browse(cr, uid, template.report_template.id, context).report_name
@@ -368,12 +318,11 @@ class email_template(osv.osv):
             ext = "." + format
             if not report_name.endswith(ext):
                 report_name += ext
-            attachments[report_name] = result
+            attachments.append((report_name, result))
 
-        # Add document attachments
+        # Add template attachments
         for attach in template.attachment_ids:
-            # keep the bytes as fetched from the db, base64 encoded
-            attachments[attach.datas_fname] = attach.datas
+            attachments.append((attach.datas_fname, attach.datas))
 
         values['attachments'] = attachments
         return values
@@ -388,15 +337,16 @@ class email_template(osv.osv):
            :param bool force_send: if True, the generated mail.message is
                 immediately sent after being created, as if the scheduler
                 was executed for this message only.
-           :returns: id of the mail.message that was created 
+           :returns: id of the mail.message that was created
         """
         if context is None: context = {}
-        mail_message = self.pool.get('mail.message')
+        mail_mail = self.pool.get('mail.mail')
         ir_attachment = self.pool.get('ir.attachment')
         values = self.generate_email(cr, uid, template_id, res_id, context=context)
         assert 'email_from' in values, 'email_from is missing or empty after template rendering, send_mail() cannot proceed'
         attachments = values.pop('attachments') or {}
-        msg_id = mail_message.create(cr, uid, values, context=context)
+        del values['email_recipients'] # TODO Properly use them.
+        msg_id = mail_mail.create(cr, uid, values, context=context)
         # link attachments
         attachment_ids = []
         for fname, fcontent in attachments.iteritems():
@@ -404,15 +354,15 @@ class email_template(osv.osv):
                     'name': fname,
                     'datas_fname': fname,
                     'datas': fcontent,
-                    'res_model': mail_message._name,
+                    'res_model': mail_mail._name,
                     'res_id': msg_id,
             }
             context.pop('default_type', None)
             attachment_ids.append(ir_attachment.create(cr, uid, attachment_data, context=context))
         if attachment_ids:
-            mail_message.write(cr, uid, msg_id, {'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
+            mail_mail.write(cr, uid, msg_id, {'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
         if force_send:
-            mail_message.send(cr, uid, [msg_id], context=context)
+            mail_mail.send(cr, uid, [msg_id], context=context)
         return msg_id
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index a04790d1c1c..4cddb31c8e1 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -1,99 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-
         <record model="ir.ui.view" id="email_template_form">
             <field name="name">email.template.form</field>
             <field name="model">email.template</field>
             <field name="arch" type="xml">
                 <form string="Templates" version="7.0">
-                  <sheet>
-                    <group col="4">
-                        <field name="name" required="1"/>
-                        <field name="model_id" required="1" on_change="onchange_model_id(model_id)"/>
-                        <field name="model" invisible="1"/>
-                    </group>
-                    <notebook>
-                        <page string="Email Details">
-                            <group>
-                                <field name="email_from" required="1"/>
-                                <field name="email_to" required="1"/>
-                                <field name="email_cc"/>
-                                <field name="email_bcc"/>
-                                <field name="reply_to"/>
-                                <field name="subject" required="1"/>
-                                <notebook  colspan="4">
-                                    <page string="Body (Text)">
-                                        <field name="body_text" colspan="4" width="250" height="250" nolabel="1"/>
-                                    </page>
-                                    <page string="Body (Rich/HTML)">
-                                        <field name="body_html" colspan="4" width="250" height="250" nolabel="1"/>
-                                        <label string="Note: This is Raw HTML." colspan="4"/>
-                                    </page>
-                                </notebook>
-                                <field name="user_signature"/>
-                            <notebook colspan="4">
-                                <page string="Dynamic Values Builder">
-                                    <group>
-                                        <field name="model_object_field"
-                                            domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-                                            on_change="onchange_sub_model_object_value_field(model_object_field)"/>
-                                        <field name="sub_object" readonly="1"/>
-                                        <field name="sub_model_object_field"
-                                            domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]"
-                                            attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}"
-                                            on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
-                                        <field name="null_value" on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)"/>
-                                        <field name="copyvalue"/>
+                    <sheet>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/><h1><field name="name" required="1"/></h1>
+                            <h3><label for="model_id"/><field name="model_id" required="1" on_change="onchange_model_id(model_id)" class="oe_inline"/></h3>
+                            <field name="model" invisible="1"/>
+                        </div>
+                        <div class="oe_right oe_button_box" name="buttons">
+                            <field name="ref_ir_act_window" invisible="1"/>
+                            <button name="create_action" string="Add context action" type="object"
+                                    attrs="{'invisible':[('ref_ir_act_window','!=',False)]}"
+                                    help="Display an option on related documents to open a composition wizard with this template"/>
+                            <button name="unlink_action" string="Remove context action" type="object" 
+                                    attrs="{'invisible':[('ref_ir_act_window','=',False)]}"
+                                    help="Remove the contextual action to use this template on related documents"/>
+                            <button name="%(wizard_email_template_preview)d" string="Preview"
+                                    type="action" target="new"
+                                    context="{'template_id':active_id}"/>
+                        </div>
+                        <notebook>
+                            <page string="Email Details">
+                                <group>
+                                    <group string="Addressing">
+                                      <field name="email_from" required="1"/>
+                                      <field name="email_to"/>
+                                      <field name="email_recipients"/>
+                                      <field name="email_cc"/>
+                                      <field name="reply_to"/>
+                                      <field name="user_signature"/>
+                                    </group>
+                                    <group string="Dynamic Value Builder" class="oe_edit_only">
+                                            <field name="model_object_field" domain="[('model_id','=',model_id),('ttype','!=','one2many'),('ttype','!=','many2many')]" on_change="onchange_sub_model_object_value_field(model_object_field)"/>
+                                            <field name="sub_object" readonly="1"/>
+                                            <field name="sub_model_object_field" domain="[('model_id','=',sub_object),('ttype','!=','one2many'),('ttype','!=','many2many')]" attrs="{'readonly':[('sub_object','=',False)],'required':[('sub_object','!=',False)]}" on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field)"/>
+                                            <field name="null_value" on_change="onchange_sub_model_object_value_field(model_object_field,sub_model_object_field,null_value)"/>
+                                            <field name="copyvalue"/>
+                                    </group>
+                                    <group string="Contents" colspan="2">
+                                       <field name="subject" required="1"/>
+                                       <field name="body_html" width="250" height="450" nolabel="1" colspan="2" placeholder="Email contents (in raw HTML format)"/>
                                     </group>
-                                </page>
-                            </notebook>
-                            <button name="%(wizard_email_template_preview)d" string="Preview Template"
-                                type="action" colspan="4" target="new" icon="gtk-zoom-fit" context="{'template_id':active_id}"/>
-                            </group>
-                        </page>
-                        <page string="Advanced">
-                            <group colspan="2" col="2">
-                                <group colspan="2" col="2">
-                                    <separator string="Sidebar Button" colspan="2"/>
-                                    <button name="create_action" string="Add sidebar button" type="object" icon="gtk-execute"
-                                            colspan="2" attrs="{'invisible':[('ref_ir_act_window','!=',False)]}"
-                                            help="Display a button in the sidebar of related documents to open a composition wizard with this template"
-                                            />
-                                    <field name="ref_ir_act_window" attrs="{'invisible':[('ref_ir_act_window','=',False)]}"/>
-                                    <field name="ref_ir_value" attrs="{'invisible':[('ref_ir_act_window','=',False)]}"/>
-                                    <button name="unlink_action" string="Remove sidebar button" type="object" icon="gtk-delete"
-                                            colspan="2" attrs="{'invisible':[('ref_ir_act_window','=',False)]}"
-                                            help="Remove the sidebar button currently displayed on related documents"
-                                            />
                                 </group>
-                                <group colspan="2" col="2">
-                                    <separator string="Advanced Options" colspan="2"/>
-                                    <field name="mail_server_id"/>
-                                    <field name="track_campaign_item"/>
-                                    <field name="message_id"/>
-                                    <field name="auto_delete"/>
+                            </page>
+                            <page string="Advanced">
+                                <group>
                                     <field name="lang"/>
+                                    <field name="mail_server_id"/>
+                                    <field name="auto_delete"/>
+                                    <field name="report_template" domain="[('model','=',model)]"/>
+                                    <field name="report_name" class="oe_inline"
+                                           attrs="{'invisible':[('report_template','=',False)]}"/>
+                                    <field name="attachment_ids">
+                                       <tree><field name="name"/></tree>
+                                    </field>
                                 </group>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Attachments" colspan="2"/>
-                                <notebook colspan="2">
-                                    <page string="Attach Report">
-                                        <group>
-                                            <field name="report_template" colspan="4"
-                                                domain="[('model','=',model)]"/>
-                                            <field name="report_name" colspan="4" />
-                                        </group>
-                                    </page>
-                                    <page string="Attach existing files">
-                                        <field name="attachment_ids" colspan="4" nolabel="1" height="350"/>
-                                    </page>
-                                </notebook>
-                            </group>
-                        </page>
-                    </notebook>
-                   </sheet>
+                            </page>
+                        </notebook>
+                       </sheet>
                 </form>
             </field>
         </record>
@@ -103,12 +72,13 @@
             <field name="model">email.template</field>
             <field name="arch" type="xml">
                 <tree string="Templates">
-                    <field name="model_id"/>
                     <field name="mail_server_id" invisible="1"/>
                     <field name="name"/>
+                    <field name="model_id"/>
                     <field name="subject"/>
                     <field name="email_from"/>
                     <field name="email_to"/>
+                    <field name="email_recipients"/>
                     <field name="report_name"/>
                 </tree>
             </field>
diff --git a/addons/email_template/html2text.py b/addons/email_template/html2text.py
old mode 100755
new mode 100644
index 745381850e3..880a8bb43a8
--- a/addons/email_template/html2text.py
+++ b/addons/email_template/html2text.py
@@ -41,13 +41,13 @@ def name2cp(k):
         if k.startswith("&#") and k.endswith(";"): return int(k[2:-1]) # not in latin-1
         return ord(codecs.latin_1_decode(k)[0])
 
-unifiable = {'rsquo':"'", 'lsquo':"'", 'rdquo':'"', 'ldquo':'"', 
+unifiable = {'rsquo':"'", 'lsquo':"'", 'rdquo':'"', 'ldquo':'"',
 'copy':'(C)', 'mdash':'--', 'nbsp':' ', 'rarr':'->', 'larr':'<-', 'middot':'*',
 'ndash':'-', 'oelig':'oe', 'aelig':'ae',
-'agrave':'a', 'aacute':'a', 'acirc':'a', 'atilde':'a', 'auml':'a', 'aring':'a', 
-'egrave':'e', 'eacute':'e', 'ecirc':'e', 'euml':'e', 
+'agrave':'a', 'aacute':'a', 'acirc':'a', 'atilde':'a', 'auml':'a', 'aring':'a',
+'egrave':'e', 'eacute':'e', 'ecirc':'e', 'euml':'e',
 'igrave':'i', 'iacute':'i', 'icirc':'i', 'iuml':'i',
-'ograve':'o', 'oacute':'o', 'ocirc':'o', 'otilde':'o', 'ouml':'o', 
+'ograve':'o', 'oacute':'o', 'ocirc':'o', 'otilde':'o', 'ouml':'o',
 'ugrave':'u', 'uacute':'u', 'ucirc':'u', 'uuml':'u'}
 
 unifiable_n = {}
@@ -60,7 +60,7 @@ def charref(name):
         c = int(name[1:], 16)
     else:
         c = int(name)
-    
+
     if not UNICODE_SNOB and c in unifiable_n.keys():
         return unifiable_n[c]
     else:
@@ -76,14 +76,14 @@ def entityref(c):
 
 def replaceEntities(s):
     s = s.group(1)
-    if s[0] == "#": 
+    if s[0] == "#":
         return charref(s[1:])
     else: return entityref(s)
 
 r_unescape = re.compile(r"&(#?[xX]?(?:[0-9a-fA-F]+|\w{1,8}));")
 def unescape(s):
     return r_unescape.sub(replaceEntities, s)
-    
+
 def fixattrs(attrs):
     # Fix bug in sgmllib.py
     if not attrs: return attrs
@@ -105,7 +105,7 @@ def optwrap(text):
     """Wrap all paragraphs in the provided text."""
     if not BODY_WIDTH:
         return text
-    
+
     assert wrap, "Requires Python 2.3."
     result = ''
     newlines = 0
@@ -136,7 +136,7 @@ def hn(tag):
 class _html2text(sgmllib.SGMLParser):
     def __init__(self, out=sys.stdout.write, baseurl=''):
         sgmllib.SGMLParser.__init__(self)
-        
+
         if out is None: self.out = self.outtextf
         else: self.out = out
         self.outtext = u''
@@ -157,43 +157,43 @@ class _html2text(sgmllib.SGMLParser):
         self.abbr_data = None # last inner HTML (for abbr being defined)
         self.abbr_list = {} # stack of abbreviations to write later
         self.baseurl = baseurl
-    
-    def outtextf(self, s): 
+
+    def outtextf(self, s):
         self.outtext += s
-    
+
     def close(self):
         sgmllib.SGMLParser.close(self)
-        
+
         self.pbr()
         self.o('', 0, 'end')
-        
+
         return self.outtext
-        
+
     def handle_charref(self, c):
         self.o(charref(c))
 
     def handle_entityref(self, c):
         self.o(entityref(c))
-            
+
     def unknown_starttag(self, tag, attrs):
         self.handle_tag(tag, attrs, 1)
-    
+
     def unknown_endtag(self, tag):
         self.handle_tag(tag, None, 0)
-        
+
     def previousIndex(self, attrs):
         """ returns the index of certain set of attributes (of a link) in the
             self.a list
- 
+
             If the set of attributes is not found, returns None
         """
         if not attrs.has_key('href'): return None
-        
+
         i = -1
         for a in self.a:
             i += 1
             match = 0
-            
+
             if a.has_key('href') and a['href'] == attrs['href']:
                 if a.has_key('title') or attrs.has_key('title'):
                         if (a.has_key('title') and attrs.has_key('title') and
@@ -206,13 +206,13 @@ class _html2text(sgmllib.SGMLParser):
 
     def handle_tag(self, tag, attrs, start):
         attrs = fixattrs(attrs)
-    
+
         if hn(tag):
             self.p()
             if start: self.o(hn(tag)*"#" + ' ')
 
         if tag in ['p', 'div']: self.p()
-        
+
         if tag == "br" and start: self.o("  \n")
 
         if tag == "hr" and start:
@@ -220,21 +220,21 @@ class _html2text(sgmllib.SGMLParser):
             self.o("* * *")
             self.p()
 
-        if tag in ["head", "style", 'script']: 
+        if tag in ["head", "style", 'script']:
             if start: self.quiet += 1
             else: self.quiet -= 1
 
         if tag in ["body"]:
             self.quiet = 0 # sites like 9rules.com never close <head>
-        
+
         if tag == "blockquote":
-            if start: 
+            if start:
                 self.p(); self.o('> ', 0, 1); self.start = 1
                 self.blockquote += 1
             else:
                 self.blockquote -= 1
                 self.p()
-        
+
         if tag in ['em', 'i', 'u']: self.o("_")
         if tag in ['strong', 'b']: self.o("**")
         if tag == "code" and not self.pre: self.o('`') #TODO: `` `this` ``
@@ -243,7 +243,7 @@ class _html2text(sgmllib.SGMLParser):
                 attrsD = {}
                 for (x, y) in attrs: attrsD[x] = y
                 attrs = attrsD
-                
+
                 self.abbr_title = None
                 self.abbr_data = ''
                 if attrs.has_key('title'):
@@ -253,13 +253,13 @@ class _html2text(sgmllib.SGMLParser):
                     self.abbr_list[self.abbr_data] = self.abbr_title
                     self.abbr_title = None
                 self.abbr_data = ''
-        
+
         if tag == "a":
             if start:
                 attrsD = {}
                 for (x, y) in attrs: attrsD[x] = y
                 attrs = attrsD
-                if attrs.has_key('href') and not (SKIP_INTERNAL_LINKS and attrs['href'].startswith('#')): 
+                if attrs.has_key('href') and not (SKIP_INTERNAL_LINKS and attrs['href'].startswith('#')):
                     self.astack.append(attrs)
                     self.o("[")
                 else:
@@ -277,7 +277,7 @@ class _html2text(sgmllib.SGMLParser):
                             a['outcount'] = self.outcount
                             self.a.append(a)
                         self.o("][" + `a['count']` + "]")
-        
+
         if tag == "img" and start:
             attrsD = {}
             for (x, y) in attrs: attrsD[x] = y
@@ -296,20 +296,20 @@ class _html2text(sgmllib.SGMLParser):
                 self.o("![")
                 self.o(alt)
                 self.o("]["+`attrs['count']`+"]")
-        
+
         if tag == 'dl' and start: self.p()
         if tag == 'dt' and not start: self.pbr()
         if tag == 'dd' and start: self.o('    ')
         if tag == 'dd' and not start: self.pbr()
-        
+
         if tag in ["ol", "ul"]:
             if start:
                 self.list.append({'name':tag, 'num':0})
             else:
                 if self.list: self.list.pop()
-            
+
             self.p()
-        
+
         if tag == 'li':
             if start:
                 self.pbr()
@@ -323,10 +323,10 @@ class _html2text(sgmllib.SGMLParser):
                 self.start = 1
             else:
                 self.pbr()
-        
+
         if tag in ["table", "tr"] and start: self.p()
         if tag == 'td': self.pbr()
-        
+
         if tag == "pre":
             if start:
                 self.startpre = 1
@@ -334,34 +334,35 @@ class _html2text(sgmllib.SGMLParser):
             else:
                 self.pre = 0
             self.p()
-            
+
     def pbr(self):
         if self.p_p == 0: self.p_p = 1
 
-    def p(self): self.p_p = 2
-    
+    def p(self):
+        self.p_p = 2
+
     def o(self, data, puredata=0, force=0):
         if self.abbr_data is not None: self.abbr_data += data
-        
-        if not self.quiet: 
+
+        if not self.quiet:
             if puredata and not self.pre:
                 data = re.sub('\s+', ' ', data)
                 if data and data[0] == ' ':
                     self.space = 1
                     data = data[1:]
             if not data and not force: return
-            
+
             if self.startpre:
                 #self.out(" :") #TODO: not output when already one there
                 self.startpre = 0
-            
+
             bq = (">" * self.blockquote)
             if not (force and data and data[0] == ">") and self.blockquote: bq += " "
-            
+
             if self.pre:
                 bq += "    "
                 data = data.replace("\n", "\n"+bq)
-            
+
             if self.start:
                 self.space = 0
                 self.p_p = 0
@@ -377,7 +378,7 @@ class _html2text(sgmllib.SGMLParser):
             if self.p_p:
                 self.out(('\n'+bq)*self.p_p)
                 self.space = 0
-                
+
             if self.space:
                 if not self.lastWasNL: self.out(' ')
                 self.space = 0
@@ -388,7 +389,7 @@ class _html2text(sgmllib.SGMLParser):
                 newa = []
                 for link in self.a:
                     if self.outcount > link['outcount']:
-                        self.out("   ["+`link['count']`+"]: " + urlparse.urljoin(self.baseurl, link['href'])) 
+                        self.out("   ["+`link['count']`+"]: " + urlparse.urljoin(self.baseurl, link['href']))
                         if link.has_key('title'): self.out(" ("+link['title']+")")
                         self.out("\n")
                     else:
@@ -397,7 +398,7 @@ class _html2text(sgmllib.SGMLParser):
                 if self.a != newa: self.out("\n") # Don't need an extra line when nothing was done.
 
                 self.a = newa
-            
+
             if self.abbr_list and force == "end":
                 for abbr, definition in self.abbr_list.items():
                     self.out("  *[" + abbr + "]: " + definition + "\n")
@@ -410,8 +411,9 @@ class _html2text(sgmllib.SGMLParser):
     def handle_data(self, data):
         if r'\/script>' in data: self.quiet -= 1
         self.o(data, 1)
-    
-    def unknown_decl(self, data): pass
+
+    def unknown_decl(self, data):
+        pass
 
 def wrapwrite(text): sys.stdout.write(text.encode('utf8'))
 
diff --git a/addons/email_template/i18n/ar.po b/addons/email_template/i18n/ar.po
index 61144eb8625..8295e0102b8 100644
--- a/addons/email_template/i18n/ar.po
+++ b/addons/email_template/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -316,8 +316,8 @@ msgid "Add Signature"
 msgstr "إضافة توقيع"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "نص عادي نسخة من رسالة (ويمكن استخدام العناصر البديلة هنا)"
 
@@ -460,8 +460,8 @@ msgid "Cc"
 msgstr "نسخة"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
@@ -663,7 +663,7 @@ msgstr "زر الشريط الجانبي لفتح تأثير الشريط الج
 #. module: email_template
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متداخلين."
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:218
@@ -1435,3 +1435,6 @@ msgstr "إصدار Rich-text/HTML الرسالة (ويمكن استخدام ال
 
 #~ msgid "Rich-text contents"
 #~ msgstr "محتويات النص المنسق"
+
+#~ msgid "Opt-out"
+#~ msgstr "الانسحاب"
diff --git a/addons/email_template/i18n/bg.po b/addons/email_template/i18n/bg.po
index db2f357b079..350ec1819e2 100644
--- a/addons/email_template/i18n/bg.po
+++ b/addons/email_template/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/ca.po b/addons/email_template/i18n/ca.po
index f601ab66556..5d4e5becf4a 100644
--- a/addons/email_template/i18n/ca.po
+++ b/addons/email_template/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -307,8 +307,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -449,8 +449,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/da.po b/addons/email_template/i18n/da.po
index 60dcd387977..78607a7c5ae 100644
--- a/addons/email_template/i18n/da.po
+++ b/addons/email_template/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/de.po b/addons/email_template/i18n/de.po
index fe802944c77..5c3af846afd 100644
--- a/addons/email_template/i18n/de.po
+++ b/addons/email_template/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -317,8 +317,8 @@ msgid "Add Signature"
 msgstr "Signatur hinzufügen"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Text-Version der Nachricht (Platzhalter können verwendet werden)"
 
@@ -465,8 +465,8 @@ msgid "Cc"
 msgstr "CC"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "Text Inhalt"
 
@@ -492,7 +492,7 @@ msgstr "Anzeige Text"
 #. module: email_template
 #: view:email_template.preview:0
 msgid "Close"
-msgstr "Beenden"
+msgstr "Abschließen"
 
 #. module: email_template
 #: help:email.template,attachment_ids:0
diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot
index 0990a940397..519755ac8f0 100644
--- a/addons/email_template/i18n/email_template.pot
+++ b/addons/email_template/i18n/email_template.pot
@@ -289,8 +289,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -425,8 +425,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/es.po b/addons/email_template/i18n/es.po
index 0da83a084fb..8163d05689d 100644
--- a/addons/email_template/i18n/es.po
+++ b/addons/email_template/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -307,8 +307,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -449,8 +449,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/es_CL.po b/addons/email_template/i18n/es_CL.po
index 4922a58156b..2f1b5e807d3 100644
--- a/addons/email_template/i18n/es_CL.po
+++ b/addons/email_template/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -305,8 +305,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -447,8 +447,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/es_CR.po b/addons/email_template/i18n/es_CR.po
index 8051c49aa96..e9c777999d8 100644
--- a/addons/email_template/i18n/es_CR.po
+++ b/addons/email_template/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: email_template
@@ -325,8 +325,8 @@ msgid "Add Signature"
 msgstr "Agregar Fima"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 "Versión en formato texto del mensaje (marcadores de posición se pueden "
@@ -475,8 +475,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/es_EC.po b/addons/email_template/i18n/es_EC.po
index 0e77178a415..5ba0b0bd4b3 100644
--- a/addons/email_template/i18n/es_EC.po
+++ b/addons/email_template/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/et.po b/addons/email_template/i18n/et.po
index 5aad92ba65e..fa0feea038c 100644
--- a/addons/email_template/i18n/et.po
+++ b/addons/email_template/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/fi.po b/addons/email_template/i18n/fi.po
index 5eeaed0d2db..f8753103d11 100644
--- a/addons/email_template/i18n/fi.po
+++ b/addons/email_template/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -308,8 +308,8 @@ msgid "Add Signature"
 msgstr "Lisää allekirjoitus"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Tekstiversio viestistä (voit käyttä täytettä)"
 
@@ -450,8 +450,8 @@ msgid "Cc"
 msgstr "Kopio viestistä"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po
index b76f6555e96..4b1a986f684 100644
--- a/addons/email_template/i18n/fr.po
+++ b/addons/email_template/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -322,8 +322,8 @@ msgid "Add Signature"
 msgstr "Ajouter une signature"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Version texte du message (des variables peuvent être utilisées ici)"
 
@@ -469,8 +469,8 @@ msgid "Cc"
 msgstr "Copie à (CC)"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
@@ -1466,9 +1466,6 @@ msgstr ""
 #~ msgid "Sidebar button"
 #~ msgstr "Bouton de la barre latérale"
 
-#~ msgid "Opt-out"
-#~ msgstr "Opt-out"
-
 #~ msgid "Related Document model"
 #~ msgstr "Modèle du document associé"
 
@@ -1483,3 +1480,6 @@ msgstr ""
 
 #~ msgid "E-mail composition wizard"
 #~ msgstr "Assistant pour la rédaction de courriels"
+
+#~ msgid "Opt-out"
+#~ msgstr "Pas de prospection par courriel"
diff --git a/addons/email_template/i18n/hr.po b/addons/email_template/i18n/hr.po
index 469d56fade2..692f070672b 100644
--- a/addons/email_template/i18n/hr.po
+++ b/addons/email_template/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/hu.po b/addons/email_template/i18n/hu.po
index 741905105a8..000cbaca7d2 100644
--- a/addons/email_template/i18n/hu.po
+++ b/addons/email_template/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -303,8 +303,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -445,8 +445,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/it.po b/addons/email_template/i18n/it.po
index e490ec6a3da..daf84d5a240 100644
--- a/addons/email_template/i18n/it.po
+++ b/addons/email_template/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -307,8 +307,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -449,8 +449,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/ja.po b/addons/email_template/i18n/ja.po
index 7f6b696ea95..d78e5779e46 100644
--- a/addons/email_template/i18n/ja.po
+++ b/addons/email_template/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -310,8 +310,8 @@ msgid "Add Signature"
 msgstr "署名を追加する"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "このメッセージのテキスト"
 
@@ -452,8 +452,8 @@ msgid "Cc"
 msgstr "写し(CC)"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "テキストの内容"
 
diff --git a/addons/email_template/i18n/mn.po b/addons/email_template/i18n/mn.po
index d64d8229f42..9ab22ab3515 100644
--- a/addons/email_template/i18n/mn.po
+++ b/addons/email_template/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -316,8 +316,8 @@ msgid "Add Signature"
 msgstr "Гарын үсэг нэмэх"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Зурвасын цэвэр текст хувилбар (энд хувьсагч хэрэглэж болно)"
 
@@ -463,8 +463,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/nb.po b/addons/email_template/i18n/nb.po
index f48dbe7672c..60d628eefe6 100644
--- a/addons/email_template/i18n/nb.po
+++ b/addons/email_template/i18n/nb.po
@@ -14,59 +14,59 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
 #: field:email_template.preview,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Meldings type."
 
 #. module: email_template
 #: field:email.template,report_name:0
 #: field:email_template.preview,report_name:0
 msgid "Report Filename"
-msgstr ""
+msgstr "Rapporter Filnavn."
 
 #. module: email_template
 #: view:email.template:0
 msgid "SMTP Server"
-msgstr ""
+msgstr "SMTP-tjener"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Remove the sidebar button currently displayed on related documents"
-msgstr ""
+msgstr "Fjern sidepanel knappen som vises på relaterte dokumenter."
 
 #. module: email_template
 #: field:email.template,ref_ir_act_window:0
 #: field:email_template.preview,ref_ir_act_window:0
 msgid "Sidebar action"
-msgstr ""
+msgstr "Sidepanel handling"
 
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Save as a new template"
-msgstr ""
+msgstr "Lagre som en ny mal."
 
 #. module: email_template
 #: help:email.template,subject:0
 #: help:email_template.preview,subject:0
 msgid "Subject (placeholders may be used here)"
-msgstr ""
+msgstr "Subject (plassholdere kan brukes her)"
 
 #. module: email_template
 #: help:email.template,email_cc:0
 #: help:email_template.preview,email_cc:0
 msgid "Carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Carbon Copy mottakere (plassholdere kan brukes her)"
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Received"
-msgstr ""
+msgstr "Motatt"
 
 #. module: email_template
 #: view:email.template:0
@@ -82,22 +82,25 @@ msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
 msgstr ""
+"Navngi å bruke for den genererte rapporten filen (kan inneholde "
+"plassholdere)\n"
+"Utvidelsen kan utelates og vil da komme fra rapport type."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Attach existing files"
-msgstr ""
+msgstr "Fest eksisterende filer."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Email Content"
-msgstr ""
+msgstr "E-post innhold."
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Kansellert"
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -109,7 +112,7 @@ msgstr "Svar-til"
 #: field:email.template,auto_delete:0
 #: field:email_template.preview,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Automatisk Slett."
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:218
@@ -120,7 +123,7 @@ msgstr "Advarsel"
 #. module: email_template
 #: model:ir.model,name:email_template.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: email_template
 #: field:email.template,subject:0
@@ -143,13 +146,13 @@ msgstr "Mal"
 #: field:email.template,partner_id:0
 #: field:email_template.preview,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Relatert partner"
 
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
 #: field:email_template.preview,sub_model_object_field:0
 msgid "Sub-field"
-msgstr ""
+msgstr "Sub-feltet"
 
 #. module: email_template
 #: view:email.template:0
@@ -157,6 +160,8 @@ msgid ""
 "Display a button in the sidebar of related documents to open a composition "
 "wizard with this template"
 msgstr ""
+"Vise en knapp i sidefeltet i relaterte dokumenter for å åpne en komposisjon "
+"veiviser med denne malen."
 
 #. module: email_template
 #: field:email.template,state:0
@@ -177,6 +182,8 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Type meldinger, vanligvis 'html' eller 'vanlig', som brukes til å velge "
+"klartekst eller rik tekst innholdet tilsvarende."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
@@ -186,18 +193,18 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Dynamic Values Builder"
-msgstr ""
+msgstr "Dynamiske verdier Produsent."
 
 #. module: email_template
 #: field:email.template,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "Relaterte dokumenter ID"
 
 #. module: email_template
 #: field:email.template,lang:0
 #: field:email_template.preview,lang:0
 msgid "Language Selection"
-msgstr ""
+msgstr "Språkvalg"
 
 #. module: email_template
 #: view:email.template:0
@@ -224,6 +231,9 @@ msgid ""
 "If it is a relationship field you will be able to select a target field at "
 "the destination of the relationship."
 msgstr ""
+"Velg målet feltet fra den relaterte dokument modellen.\n"
+"Hvis det er et forhold felt du vil være i stand til å velge et mål felt på "
+"destinasjonen av forholdet."
 
 #. module: email_template
 #: view:email.template:0
@@ -234,13 +244,13 @@ msgstr "Forhåndsvis malen"
 #: field:email.template,null_value:0
 #: field:email_template.preview,null_value:0
 msgid "Null value"
-msgstr ""
+msgstr "Nullverdi"
 
 #. module: email_template
 #: field:email.template,sub_object:0
 #: field:email_template.preview,sub_object:0
 msgid "Sub-model"
-msgstr ""
+msgstr "Sub-modell."
 
 #. module: email_template
 #: help:email.template,track_campaign_item:0
@@ -250,17 +260,20 @@ msgid ""
 "emails so you can identify replies and link them back to the corresponding "
 "resource record. This is useful for CRM leads for example"
 msgstr ""
+"Aktiver dette du ønsker å inkludere en spesiell sporing markør i utgående e-"
+"post, slik at du kan identifisere svar og knytte dem tilbake til den "
+"tilsvarende ressurs posten. Dette er nyttig for CRM fører for eksempel."
 
 #. module: email_template
 #: field:mail.compose.message,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Bruk mal."
 
 #. module: email_template
 #: field:email.template,attachment_ids:0
 #: field:email_template.preview,attachment_ids:0
 msgid "Files to attach"
-msgstr ""
+msgstr "Filer til å feste."
 
 #. module: email_template
 #: view:email.template:0
@@ -271,13 +284,13 @@ msgstr "Alternativer"
 #: field:email.template,model_id:0
 #: field:email_template.preview,model_id:0
 msgid "Related document model"
-msgstr ""
+msgstr "Relatert dokument modell."
 
 #. module: email_template
 #: help:email.template,email_from:0
 #: help:email_template.preview,email_from:0
 msgid "Sender address (placeholders may be used here)"
-msgstr ""
+msgstr "Avsenderadresse (plassholdere kan brukes her)"
 
 #. module: email_template
 #: help:res.partner,opt_out:0
@@ -285,11 +298,13 @@ msgid ""
 "If checked, this partner will not receive any automated email notifications, "
 "such as the availability of invoices."
 msgstr ""
+"Hvis det er merket, vil denne partneren ikke motta noen automatiserte e-"
+"postmeldinger, for eksempel tilgjengeligheten av fakturaer."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Note: This is Raw HTML."
-msgstr ""
+msgstr "Merk: Dette er Raw HTML."
 
 #. module: email_template
 #: view:email.template:0
@@ -300,25 +315,26 @@ msgstr "Grupper etter..."
 #: field:email.template,user_signature:0
 #: field:email_template.preview,user_signature:0
 msgid "Add Signature"
-msgstr ""
+msgstr "Legg til signatur."
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
-msgstr ""
+msgstr "Klartekst versjon av meldingen (plassholdere kan anvendes her)"
 
 #. module: email_template
 #: help:email.template,original:0
 #: help:email_template.preview,original:0
 msgid "Original version of the message, as it was sent on the network"
 msgstr ""
+"Opprinnelige versjonen av meldingen, som det ble sendt på nettverket."
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:230
 #, python-format
 msgid "(copy)"
-msgstr ""
+msgstr "(kopi)"
 
 #. module: email_template
 #: selection:email.template,state:0
@@ -329,7 +345,7 @@ msgstr "Utgående"
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Use a message template"
-msgstr ""
+msgstr "Bruk en meldingsmal."
 
 #. module: email_template
 #: help:email.template,user_signature:0
@@ -338,12 +354,14 @@ msgid ""
 "If checked, the user's signature will be appended to the text version of the "
 "message"
 msgstr ""
+"Hvis det er merket, vil brukerens underskrift legges til teksten versjonen "
+"av meldingene."
 
 #. module: email_template
 #: view:email.template:0
 #: view:email_template.preview:0
 msgid "Body (Rich/HTML)"
-msgstr ""
+msgstr "Kropp  (Rich/HTML)"
 
 #. module: email_template
 #: help:email.template,sub_object:0
@@ -352,6 +370,8 @@ msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
 msgstr ""
+"Når et forhold er valgt som første felt, dette felte viser dokumentet som "
+"modellen forholdet går til."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template
@@ -362,23 +382,23 @@ msgstr "E-post maler"
 #: field:email.template,date:0
 #: field:email_template.preview,date:0
 msgid "Date"
-msgstr ""
+msgstr "Dato"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
 msgid "Template Preview"
-msgstr ""
+msgstr "Forhåndsvisning av mal"
 
 #. module: email_template
 #: field:email.template,message_id:0
 #: field:email_template.preview,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Melding - ID"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Add sidebar button"
-msgstr ""
+msgstr "Legg til sidepanelet knapp."
 
 #. module: email_template
 #: view:email.template:0
@@ -407,13 +427,13 @@ msgstr ""
 #: field:email.template,copyvalue:0
 #: field:email_template.preview,copyvalue:0
 msgid "Expression"
-msgstr ""
+msgstr "Uttrykk"
 
 #. module: email_template
 #: field:email.template,original:0
 #: field:email_template.preview,original:0
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 #. module: email_template
 #: view:email.template:0
@@ -427,6 +447,8 @@ msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
 msgstr ""
+"Avsluttende plassholder uttrykk, som skal kopier - limt i det ønskete mal "
+"feltet."
 
 #. module: email_template
 #: view:email.template:0
@@ -436,17 +458,17 @@ msgstr "Vedlegg"
 #. module: email_template
 #: view:email.template:0
 msgid "Email Details"
-msgstr ""
+msgstr "E-post detaljer."
 
 #. module: email_template
 #: field:email.template,email_cc:0
 #: field:email_template.preview,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Kopi"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
@@ -454,19 +476,19 @@ msgstr ""
 #: help:email.template,auto_delete:0
 #: help:email_template.preview,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
-msgstr ""
+msgstr "Slette denne e-posten etter å ha sendt det, for å spare plass."
 
 #. module: email_template
 #: field:email.template,references:0
 #: field:email_template.preview,references:0
 msgid "References"
-msgstr ""
+msgstr "Referanser"
 
 #. module: email_template
 #: field:email.template,display_text:0
 #: field:email_template.preview,display_text:0
 msgid "Display Text"
-msgstr ""
+msgstr "Vise tekst"
 
 #. module: email_template
 #: view:email_template.preview:0
@@ -480,6 +502,8 @@ msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
 msgstr ""
+"Du kan legge til filer til denne malen, som skal legges til all e-post som "
+"er opprettet fra denne malen."
 
 #. module: email_template
 #: help:email.template,headers:0
@@ -488,12 +512,14 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Fullstendige meldingshoder, f.eks SMTP-økt overskrifter (vanligvis "
+"tilgjengelig på innkommende meldinger bare)"
 
 #. module: email_template
 #: field:email.template,mail_server_id:0
 #: field:email_template.preview,mail_server_id:0
 msgid "Outgoing Mail Server"
-msgstr ""
+msgstr "Utgående e-post tjenere."
 
 #. module: email_template
 #: help:email.template,ref_ir_act_window:0
@@ -502,6 +528,8 @@ msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
 msgstr ""
+"Sidepanel handling for å gjøre denne malen tilgjengelig på registreringer av "
+"den relaterte dokument modellen."
 
 #. module: email_template
 #: field:email.template,model_object_field:0
@@ -513,7 +541,7 @@ msgstr "Felt"
 #: field:email.template,user_id:0
 #: field:email_template.preview,user_id:0
 msgid "Related user"
-msgstr ""
+msgstr "relatert bruker."
 
 #. module: email_template
 #: view:email.template:0
@@ -531,7 +559,7 @@ msgstr ""
 #: help:email.template,email_bcc:0
 #: help:email_template.preview,email_bcc:0
 msgid "Blind carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Blindkopi mottakere (plassholdere kan brukes her)"
 
 #. module: email_template
 #: help:email.template,lang:0
@@ -542,17 +570,21 @@ msgid ""
 "a placeholder expression that provides the appropriate language code, e.g. "
 "${object.partner_id.lang.code}."
 msgstr ""
+"Valgfri oversettelse språk (ISO-kode) for å velge når du sender ut en e-"
+"post. Hvis det ikke er angitt, vil den engelske versjonen brukes. Dette bør "
+"vanligvis være en plassholder uttrykk som gir riktig språkkode, f.eks $ "
+"{object.partner_id.lang.code}."
 
 #. module: email_template
 #: field:email_template.preview,res_id:0
 msgid "Sample Document"
-msgstr ""
+msgstr "Eksempel Dokument."
 
 #. module: email_template
 #: help:email.template,email_to:0
 #: help:email_template.preview,email_to:0
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
-msgstr ""
+msgstr "Komma - separert mottakeradressene (plassholdere kan brukes her)"
 
 #. module: email_template
 #: field:email.template,name:0
@@ -564,12 +596,12 @@ msgstr "Navn"
 #: field:email.template,track_campaign_item:0
 #: field:email_template.preview,track_campaign_item:0
 msgid "Resource Tracking"
-msgstr ""
+msgstr "Ressurs Sporing."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_preview
 msgid "Email Template Preview"
-msgstr ""
+msgstr "E-post Mal Forhåndsvisning."
 
 #. module: email_template
 #: view:email_template.preview:0
@@ -586,63 +618,68 @@ msgid ""
 "instead.\n"
 "Placeholders must be used here, as this value always needs to be unique!"
 msgstr ""
+"Melding-ID SMTP topptekst å bruke i utgående meldinger basert på denne "
+"malen. Vennligst merk at dette overstyrer 'ressurs Sporing alternativet, så "
+"hvis du bare trenger å spore svar på utgående e-post, må du aktivere dette "
+"alternativet i stedet.\n"
+"Plassholdere må brukes her, som denne verdien alltid må være unik!"
 
 #. module: email_template
 #: field:email.template,headers:0
 #: field:email_template.preview,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "Melding topptekst."
 
 #. module: email_template
 #: field:email.template,email_bcc:0
 #: field:email_template.preview,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Blind Kopi"
 
 #. module: email_template
 #: help:email.template,reply_to:0
 #: help:email_template.preview,reply_to:0
 msgid "Preferred response address (placeholders may be used here)"
-msgstr ""
+msgstr "Foretrukket respons adresse (plassholdere kan anvendes her)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Remove sidebar button"
-msgstr ""
+msgstr "Fjern sidepanel knappen."
 
 #. module: email_template
 #: help:email.template,null_value:0
 #: help:email_template.preview,null_value:0
 msgid "Optional value to use if the target field is empty"
-msgstr ""
+msgstr "Valgfri verdi som skal brukes hvis målet feltet er tomt."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Model"
-msgstr ""
+msgstr "Modell"
 
 #. module: email_template
 #: help:email.template,references:0
 #: help:email_template.preview,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Melding referanser som identifikatorer av tidligere beskjeder."
 
 #. module: email_template
 #: help:email.template,ref_ir_value:0
 #: help:email_template.preview,ref_ir_value:0
 msgid "Sidebar button to open the sidebar action"
-msgstr ""
+msgstr "sidepanelet-knappen for å åpne sidepanelets handling."
 
 #. module: email_template
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:218
 #, python-format
 msgid "Deletion of the action record failed."
-msgstr ""
+msgstr "Sletting av handlingen posten mislyktes."
 
 #. module: email_template
 #: help:email.template,mail_server_id:0
@@ -651,12 +688,14 @@ msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
 msgstr ""
+"Valgfri foretrukne server for utgående e-post. Hvis ikke angitt, vil den "
+"høyeste prioritet en benyttes."
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "Levering mislyktes."
 
 #. module: email_template
 #: help:email.template,sub_model_object_field:0
@@ -665,23 +704,25 @@ msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
 msgstr ""
+"Når et forhold felt er valgt som første felt, lar dette feltet du velger "
+"målet feltet innen måldokumentet modellen (sub-modell)."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Attach Report"
-msgstr ""
+msgstr "Fest Rapporter."
 
 #. module: email_template
 #: field:email.template,report_template:0
 #: field:email_template.preview,report_template:0
 msgid "Optional report to print and attach"
-msgstr ""
+msgstr "Valgfri rapport til å skrive ut og feste."
 
 #. module: email_template
 #: help:email.template,body_html:0
 #: help:email_template.preview,body_html:0
 msgid "Rich-text/HTML version of the message (placeholders may be used here)"
-msgstr ""
+msgstr "Rich-text/HTML versjon av meldingen (plassholdere kan brukes her)"
 
 #~ msgid "Permanently delete emails after sending"
 #~ msgstr "Slett e-poster permanent etter sending"
@@ -950,3 +991,21 @@ msgstr ""
 #, python-format
 #~ msgid "No Description"
 #~ msgstr "Ingen beskrivelse"
+
+#~ msgid "Sidebar button"
+#~ msgstr "Sidepanel knapp."
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Veiviser for opprettelse av e-post"
+
+#~ msgid "Related Document model"
+#~ msgstr "Relaterte dokumenter modell."
+
+#~ msgid "Rich-text contents"
+#~ msgstr "Rik tekst innholdet."
+
+#~ msgid "Text contents"
+#~ msgstr "Tekst innholdet."
+
+#~ msgid "Opt-out"
+#~ msgstr "Opt-ut"
diff --git a/addons/email_template/i18n/nl.po b/addons/email_template/i18n/nl.po
index 693e476b981..b8a4a33fa87 100644
--- a/addons/email_template/i18n/nl.po
+++ b/addons/email_template/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-02 15:02+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -323,8 +323,8 @@ msgid "Add Signature"
 msgstr "Handtekening toevoegen"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 "Platte tekst versie van het bericht (tijdelijke aanduidingen kan hier worden "
@@ -474,8 +474,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "Tekst inhoud"
 
diff --git a/addons/email_template/i18n/pl.po b/addons/email_template/i18n/pl.po
index baea1858c0a..f69d0bc0980 100644
--- a/addons/email_template/i18n/pl.po
+++ b/addons/email_template/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -306,8 +306,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -448,8 +448,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/pt.po b/addons/email_template/i18n/pt.po
index a2404c73b8f..3b7fee842e3 100644
--- a/addons/email_template/i18n/pt.po
+++ b/addons/email_template/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -322,8 +322,8 @@ msgid "Add Signature"
 msgstr "Adicionar Assinatura"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 "Texto Simples sem formatação da mensagem (espaços reservados podem ser "
@@ -472,8 +472,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/pt_BR.po b/addons/email_template/i18n/pt_BR.po
index 656452c7cde..f96b75f5ef1 100644
--- a/addons/email_template/i18n/pt_BR.po
+++ b/addons/email_template/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 22:06+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -112,13 +113,13 @@ msgstr "Responder-Para"
 #: field:email.template,auto_delete:0
 #: field:email_template.preview,auto_delete:0
 msgid "Auto Delete"
-msgstr "Auto Excluir"
+msgstr "Excluir Automaticamente"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:218
 #, python-format
 msgid "Warning"
-msgstr "Alerta"
+msgstr "Aviso"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_res_partner
@@ -140,7 +141,7 @@ msgstr "De"
 #. module: email_template
 #: field:mail.compose.message,template_id:0
 msgid "Template"
-msgstr "Modêlo"
+msgstr "Modelo"
 
 #. module: email_template
 #: field:email.template,partner_id:0
@@ -160,14 +161,14 @@ msgid ""
 "Display a button in the sidebar of related documents to open a composition "
 "wizard with this template"
 msgstr ""
-"Mostrar um botão na barra lateral de documentos relacionados, abrem um "
-"assistente de composição."
+"Mostrar um botão na barra lateral de documentos relacionados para abrir um "
+"assistente de composição com este modelo."
 
 #. module: email_template
 #: field:email.template,state:0
 #: field:email_template.preview,state:0
 msgid "State"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: email_template
 #: selection:email.template,state:0
@@ -204,7 +205,7 @@ msgstr "Documento Relacionado"
 #: field:email.template,lang:0
 #: field:email_template.preview,lang:0
 msgid "Language Selection"
-msgstr "Seleção de idioma"
+msgstr "Seleção de Idioma"
 
 #. module: email_template
 #: view:email.template:0
@@ -260,14 +261,14 @@ msgid ""
 "emails so you can identify replies and link them back to the corresponding "
 "resource record. This is useful for CRM leads for example"
 msgstr ""
-"Habilite isso se você deseja incluir um códio de rastreamento nos emails de "
+"Habilite isso se você deseja incluir um código de rastreamento nos emails de "
 "saída, assim você poderá identificar respostas e anexa-las no registro "
 "correspondente. Isto é útil para prospectos de CRM por exemplo"
 
 #. module: email_template
 #: field:mail.compose.message,use_template:0
 msgid "Use Template"
-msgstr "Usar modelo"
+msgstr "Usar Modelo"
 
 #. module: email_template
 #: field:email.template,attachment_ids:0
@@ -318,8 +319,8 @@ msgid "Add Signature"
 msgstr "Adicionar Assinatura"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Versão em Texto da mensagem (placeholders podem ser usados aqui)"
 
@@ -339,7 +340,7 @@ msgstr "(copiar)"
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Outgoing"
-msgstr "Saindo"
+msgstr "Enviando"
 
 #. module: email_template
 #: view:mail.compose.message:0
@@ -403,7 +404,7 @@ msgstr "Adicionar Botão da Barra Lateral"
 #: view:email.template:0
 #: view:email_template.preview:0
 msgid "Body (Text)"
-msgstr "Corpo(Texto)"
+msgstr "Corpo (Texto)"
 
 #. module: email_template
 #: view:email.template:0
@@ -466,8 +467,8 @@ msgid "Cc"
 msgstr "Cópia para"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "Conteúdo de Texto"
 
@@ -598,12 +599,12 @@ msgstr "Nome"
 #: field:email.template,track_campaign_item:0
 #: field:email_template.preview,track_campaign_item:0
 msgid "Resource Tracking"
-msgstr "Rastrear recurso"
+msgstr "Rastreamento de Recurso"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_preview
 msgid "Email Template Preview"
-msgstr "Visualizar modelo de email"
+msgstr "Visualizar Modelo de Email"
 
 #. module: email_template
 #: view:email_template.preview:0
@@ -677,7 +678,7 @@ msgstr "Botão da barra lateral para executar a ação"
 #. module: email_template
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursivamente a membros associados."
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:218
@@ -699,7 +700,7 @@ msgstr ""
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Delivery Failed"
-msgstr "Falha no envio"
+msgstr "Falha no Envio"
 
 #. module: email_template
 #: help:email.template,sub_model_object_field:0
diff --git a/addons/email_template/i18n/ro.po b/addons/email_template/i18n/ro.po
index bbe86cdee12..cb2a458d146 100644
--- a/addons/email_template/i18n/ro.po
+++ b/addons/email_template/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -320,8 +320,8 @@ msgid "Add Signature"
 msgstr "Adauga Semnatura"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Versiunea simpla a mesajului (aici pot fi folositi inlocuitori)"
 
@@ -467,8 +467,8 @@ msgid "Cc"
 msgstr "Cc (copie carbon)"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/ru.po b/addons/email_template/i18n/ru.po
index 2112f24a5fd..90260f9fbb1 100644
--- a/addons/email_template/i18n/ru.po
+++ b/addons/email_template/i18n/ru.po
@@ -14,14 +14,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
 #: field:email_template.preview,subtype:0
 msgid "Message type"
-msgstr ""
+msgstr "Тип сообщения"
 
 #. module: email_template
 #: field:email.template,report_name:0
@@ -32,41 +32,42 @@ msgstr "Файл отчета"
 #. module: email_template
 #: view:email.template:0
 msgid "SMTP Server"
-msgstr ""
+msgstr "Сервер SMTP"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Remove the sidebar button currently displayed on related documents"
 msgstr ""
+"Удалить кнопку боковой панели показываемую сейчас по связанным документам"
 
 #. module: email_template
 #: field:email.template,ref_ir_act_window:0
 #: field:email_template.preview,ref_ir_act_window:0
 msgid "Sidebar action"
-msgstr ""
+msgstr "Действие боковой панели"
 
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Save as a new template"
-msgstr ""
+msgstr "Сохранить как новый шаблон"
 
 #. module: email_template
 #: help:email.template,subject:0
 #: help:email_template.preview,subject:0
 msgid "Subject (placeholders may be used here)"
-msgstr ""
+msgstr "Тема (здесь могут быть использованы подстановки)"
 
 #. module: email_template
 #: help:email.template,email_cc:0
 #: help:email_template.preview,email_cc:0
 msgid "Carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Получатели копий (здесь могут быть использованы подстановки)"
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Received"
-msgstr ""
+msgstr "Получено"
 
 #. module: email_template
 #: view:email.template:0
@@ -82,22 +83,25 @@ msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
 msgstr ""
+"Название для использования созданного файла отчёта (может содержать "
+"подстановки)\n"
+"Расширение может быть опущено и будет взято из типа отчёта."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Attach existing files"
-msgstr ""
+msgstr "Прикрепить существующие файлы"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Email Content"
-msgstr ""
+msgstr "Содержание письма"
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отменено"
 
 #. module: email_template
 #: field:email.template,reply_to:0
@@ -120,13 +124,13 @@ msgstr "Предупреждение"
 #. module: email_template
 #: model:ir.model,name:email_template.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Партнёр"
 
 #. module: email_template
 #: field:email.template,subject:0
 #: field:email_template.preview,subject:0
 msgid "Subject"
-msgstr "Предмет"
+msgstr "Тема"
 
 #. module: email_template
 #: field:email.template,email_from:0
@@ -143,13 +147,13 @@ msgstr "Шаблон"
 #: field:email.template,partner_id:0
 #: field:email_template.preview,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Связанный партнер"
 
 #. module: email_template
 #: field:email.template,sub_model_object_field:0
 #: field:email_template.preview,sub_model_object_field:0
 msgid "Sub-field"
-msgstr ""
+msgstr "Субполе"
 
 #. module: email_template
 #: view:email.template:0
@@ -157,6 +161,8 @@ msgid ""
 "Display a button in the sidebar of related documents to open a composition "
 "wizard with this template"
 msgstr ""
+"Показать кнопку связанных документов на боковой панели для открытия мастера "
+"составления с этим шаблоном"
 
 #. module: email_template
 #: field:email.template,state:0
@@ -177,6 +183,8 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Тип сообщения, обычно 'html' или 'простой', используемый для выбора "
+"содержимого соответственно простого текста или форматного текста"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_mail_compose_message
@@ -186,23 +194,23 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Dynamic Values Builder"
-msgstr ""
+msgstr "Конструктор динамических значений"
 
 #. module: email_template
 #: field:email.template,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID связанного документа"
 
 #. module: email_template
 #: field:email.template,lang:0
 #: field:email_template.preview,lang:0
 msgid "Language Selection"
-msgstr ""
+msgstr "Выбор языка"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Advanced"
-msgstr "Продвинутый"
+msgstr "Расширенный"
 
 #. module: email_template
 #: field:email.template,email_to:0
@@ -224,6 +232,9 @@ msgid ""
 "If it is a relationship field you will be able to select a target field at "
 "the destination of the relationship."
 msgstr ""
+"Выбор целевого поля из связанной модели документа.\n"
+"Если это поле взаимоотношений, вы сможете выбрать целевое поле при месте "
+"назначения взаимоотношения."
 
 #. module: email_template
 #: view:email.template:0
@@ -234,13 +245,13 @@ msgstr "Предпросмотр шаблона"
 #: field:email.template,null_value:0
 #: field:email_template.preview,null_value:0
 msgid "Null value"
-msgstr ""
+msgstr "Нулевое значение"
 
 #. module: email_template
 #: field:email.template,sub_object:0
 #: field:email_template.preview,sub_object:0
 msgid "Sub-model"
-msgstr "Подмодель"
+msgstr "Субмодель"
 
 #. module: email_template
 #: help:email.template,track_campaign_item:0
@@ -250,17 +261,21 @@ msgid ""
 "emails so you can identify replies and link them back to the corresponding "
 "resource record. This is useful for CRM leads for example"
 msgstr ""
+"Позвольте это, если вы хотите включение специального маркера слежения в "
+"исходящие письма, так чтобы вы могли идентифицировать ответы и их обратную "
+"связь с соответствующей записью ресурса.Например, это удобно для кандидатов "
+"в CRM"
 
 #. module: email_template
 #: field:mail.compose.message,use_template:0
 msgid "Use Template"
-msgstr ""
+msgstr "Использовать шаблон"
 
 #. module: email_template
 #: field:email.template,attachment_ids:0
 #: field:email_template.preview,attachment_ids:0
 msgid "Files to attach"
-msgstr ""
+msgstr "Файлы для вложения"
 
 #. module: email_template
 #: view:email.template:0
@@ -271,13 +286,13 @@ msgstr "Настройки"
 #: field:email.template,model_id:0
 #: field:email_template.preview,model_id:0
 msgid "Related document model"
-msgstr ""
+msgstr "Модель связанного документа"
 
 #. module: email_template
 #: help:email.template,email_from:0
 #: help:email_template.preview,email_from:0
 msgid "Sender address (placeholders may be used here)"
-msgstr ""
+msgstr "Адрес отправителя (здесь могут быть использованы подстановки)"
 
 #. module: email_template
 #: help:res.partner,opt_out:0
@@ -285,11 +300,13 @@ msgid ""
 "If checked, this partner will not receive any automated email notifications, "
 "such as the availability of invoices."
 msgstr ""
+"Если отмечен, этот партнёр не будет получать автоматические почтовые "
+"уведомления, такие как возможность выставления счетов."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Note: This is Raw HTML."
-msgstr "Примечание: Этот HTML сырой"
+msgstr "Примечание: это сырой HTML"
 
 #. module: email_template
 #: view:email.template:0
@@ -300,25 +317,27 @@ msgstr "Группировать по..."
 #: field:email.template,user_signature:0
 #: field:email_template.preview,user_signature:0
 msgid "Add Signature"
-msgstr ""
+msgstr "Добавить подпись"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
+"Простая текстовая версия сообщения (здесь могут быть использованы "
+"подстановки)"
 
 #. module: email_template
 #: help:email.template,original:0
 #: help:email_template.preview,original:0
 msgid "Original version of the message, as it was sent on the network"
-msgstr ""
+msgstr "Оригинальная версия сообщения, как было отправлено в сеть"
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:230
 #, python-format
 msgid "(copy)"
-msgstr ""
+msgstr "(copy)"
 
 #. module: email_template
 #: selection:email.template,state:0
@@ -329,7 +348,7 @@ msgstr "Исходящие"
 #. module: email_template
 #: view:mail.compose.message:0
 msgid "Use a message template"
-msgstr ""
+msgstr "Использовать шаблон сообщения"
 
 #. module: email_template
 #: help:email.template,user_signature:0
@@ -338,12 +357,14 @@ msgid ""
 "If checked, the user's signature will be appended to the text version of the "
 "message"
 msgstr ""
+"Если помечен, к текстовой версии сообщения будет добавлена подпись "
+"пользователя"
 
 #. module: email_template
 #: view:email.template:0
 #: view:email_template.preview:0
 msgid "Body (Rich/HTML)"
-msgstr ""
+msgstr "Тело (форматированне/HTML)"
 
 #. module: email_template
 #: help:email.template,sub_object:0
@@ -352,6 +373,8 @@ msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
 msgstr ""
+"Когда связывающее поле выбрано как первое поле, это поле показывает "
+"связанную модель документа ."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template
@@ -362,7 +385,7 @@ msgstr "Шаблоны писем"
 #: field:email.template,date:0
 #: field:email_template.preview,date:0
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
 #. module: email_template
 #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
@@ -373,12 +396,12 @@ msgstr "Просмотр шаблона"
 #: field:email.template,message_id:0
 #: field:email_template.preview,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "ID сообщения"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Add sidebar button"
-msgstr ""
+msgstr "Добавить кнопку боковой панели"
 
 #. module: email_template
 #: view:email.template:0
@@ -395,7 +418,7 @@ msgstr "Расширенные настройки"
 #: code:addons/email_template/email_template.py:183
 #, python-format
 msgid "Send Mail (%s)"
-msgstr ""
+msgstr "Отправить почту (%s)"
 
 #. module: email_template
 #: field:email.template,body_html:0
@@ -413,7 +436,7 @@ msgstr "Выражение"
 #: field:email.template,original:0
 #: field:email_template.preview,original:0
 msgid "Original"
-msgstr ""
+msgstr "Оригинал"
 
 #. module: email_template
 #: view:email.template:0
@@ -427,26 +450,28 @@ msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
 msgstr ""
+"Окончательное выражение подстановки, для копирования-вставки в желаемое поле "
+"шаблона."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Attachments"
-msgstr "Прикрепленные файлы"
+msgstr "Вложения"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Email Details"
-msgstr ""
+msgstr "Подробности письма"
 
 #. module: email_template
 #: field:email.template,email_cc:0
 #: field:email_template.preview,email_cc:0
 msgid "Cc"
-msgstr ""
+msgstr "Копия"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
@@ -454,19 +479,19 @@ msgstr ""
 #: help:email.template,auto_delete:0
 #: help:email_template.preview,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
-msgstr ""
+msgstr "Навсегда удалить это письмо после отправки, для экономии места"
 
 #. module: email_template
 #: field:email.template,references:0
 #: field:email_template.preview,references:0
 msgid "References"
-msgstr ""
+msgstr "Ссылки"
 
 #. module: email_template
 #: field:email.template,display_text:0
 #: field:email_template.preview,display_text:0
 msgid "Display Text"
-msgstr ""
+msgstr "Вывести текст"
 
 #. module: email_template
 #: view:email_template.preview:0
@@ -480,6 +505,8 @@ msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
 msgstr ""
+"Вы можете прикрепить файлы к этому шаблону для добавления ко всем письмам "
+"созданным из этого шаблона"
 
 #. module: email_template
 #: help:email.template,headers:0
@@ -488,12 +515,14 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Полные заголовки сообщения, т.е. заголовки сессии SMTP (обычно доступные "
+"только во входящих сообщениях)"
 
 #. module: email_template
 #: field:email.template,mail_server_id:0
 #: field:email_template.preview,mail_server_id:0
 msgid "Outgoing Mail Server"
-msgstr ""
+msgstr "Сервер исходящей почты"
 
 #. module: email_template
 #: help:email.template,ref_ir_act_window:0
@@ -502,6 +531,8 @@ msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
 msgstr ""
+"Действие боковой панели для доступности этого шаблона по записям связанным с "
+"моделью документа"
 
 #. module: email_template
 #: field:email.template,model_object_field:0
@@ -513,7 +544,7 @@ msgstr "Поле"
 #: field:email.template,user_id:0
 #: field:email_template.preview,user_id:0
 msgid "Related user"
-msgstr ""
+msgstr "Связанный пользователь"
 
 #. module: email_template
 #: view:email.template:0
@@ -531,7 +562,7 @@ msgstr ""
 #: help:email.template,email_bcc:0
 #: help:email_template.preview,email_bcc:0
 msgid "Blind carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Получатели скрытой копии (здесь могут быть использованы подстановки)"
 
 #. module: email_template
 #: help:email.template,lang:0
@@ -542,17 +573,23 @@ msgid ""
 "a placeholder expression that provides the appropriate language code, e.g. "
 "${object.partner_id.lang.code}."
 msgstr ""
+"Необязательный язык перевода (ISO код) для выбора при отправке почты. Если "
+"не задан, будет использована английская версия. Это обычно будет выражение "
+"подстановки, которое предусматривает соответствующий код языка, например "
+"${object.partner_id.lang.code}."
 
 #. module: email_template
 #: field:email_template.preview,res_id:0
 msgid "Sample Document"
-msgstr ""
+msgstr "Пример документа"
 
 #. module: email_template
 #: help:email.template,email_to:0
 #: help:email_template.preview,email_to:0
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
 msgstr ""
+"Адреса получателей разделённые запятыми (здесь могут быть использованы "
+"подстановки)"
 
 #. module: email_template
 #: field:email.template,name:0
@@ -564,7 +601,7 @@ msgstr "Название"
 #: field:email.template,track_campaign_item:0
 #: field:email_template.preview,track_campaign_item:0
 msgid "Resource Tracking"
-msgstr ""
+msgstr "Отслеживание ресурса"
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template_preview
@@ -586,35 +623,42 @@ msgid ""
 "instead.\n"
 "Placeholders must be used here, as this value always needs to be unique!"
 msgstr ""
+"Заголовок ID-сообщения SMTP для использования в исходящих сообщениях "
+"основанных на шаблоне. Учтите, пожалуйста, что это переопределит параметр "
+"'Отслеживание ресурса', так что если вы просто нуждаетесь в отслеживании "
+"ответов на исходящие письма, вместо этого включите эту опцию.\n"
+"Здесь могут быть использованы подстановки, , так как это значение всегда "
+"должно быть уникальным !"
 
 #. module: email_template
 #: field:email.template,headers:0
 #: field:email_template.preview,headers:0
 msgid "Message headers"
-msgstr ""
+msgstr "Заголовки сообщения"
 
 #. module: email_template
 #: field:email.template,email_bcc:0
 #: field:email_template.preview,email_bcc:0
 msgid "Bcc"
-msgstr ""
+msgstr "Скрытая копия"
 
 #. module: email_template
 #: help:email.template,reply_to:0
 #: help:email_template.preview,reply_to:0
 msgid "Preferred response address (placeholders may be used here)"
 msgstr ""
+"Предпочтительный обратный адрес (здесь могут быть использованы подстановки)"
 
 #. module: email_template
 #: view:email.template:0
 msgid "Remove sidebar button"
-msgstr ""
+msgstr "Удалить кнопку боковой панели"
 
 #. module: email_template
 #: help:email.template,null_value:0
 #: help:email_template.preview,null_value:0
 msgid "Optional value to use if the target field is empty"
-msgstr ""
+msgstr "Необязательное значение используемое если целевое поле пусто"
 
 #. module: email_template
 #: view:email.template:0
@@ -625,24 +669,24 @@ msgstr "Модель"
 #: help:email.template,references:0
 #: help:email_template.preview,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Ссылки сообщения, такие как идентификаторы предыдущих сообщений"
 
 #. module: email_template
 #: help:email.template,ref_ir_value:0
 #: help:email_template.preview,ref_ir_value:0
 msgid "Sidebar button to open the sidebar action"
-msgstr ""
+msgstr "Кнопка боковой панели для открытия действия боковой панели"
 
 #. module: email_template
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: email_template
 #: code:addons/email_template/email_template.py:218
 #, python-format
 msgid "Deletion of the action record failed."
-msgstr ""
+msgstr "Удаление действия не удалось."
 
 #. module: email_template
 #: help:email.template,mail_server_id:0
@@ -651,12 +695,14 @@ msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
 msgstr ""
+"Необязательный предпочтительный сервер для исходящей почты. Если не задан, "
+"будет использован имеющий высший приоритет."
 
 #. module: email_template
 #: selection:email.template,state:0
 #: selection:email_template.preview,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "Доставка не удалась"
 
 #. module: email_template
 #: help:email.template,sub_model_object_field:0
@@ -665,23 +711,27 @@ msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
 msgstr ""
+"Когда поле связи выбрано как первое поле, это поле даёт вам выбор целевого "
+"поля в пределах модели целевого документа (под-модели)."
 
 #. module: email_template
 #: view:email.template:0
 msgid "Attach Report"
-msgstr ""
+msgstr "Прикрепить отчёт"
 
 #. module: email_template
 #: field:email.template,report_template:0
 #: field:email_template.preview,report_template:0
 msgid "Optional report to print and attach"
-msgstr ""
+msgstr "Необязательный отчёт для печати и прикрепления"
 
 #. module: email_template
 #: help:email.template,body_html:0
 #: help:email_template.preview,body_html:0
 msgid "Rich-text/HTML version of the message (placeholders may be used here)"
 msgstr ""
+"Версия сообщения с форматированным текстом/HTML (здесь могут быть "
+"использованы подстановки)"
 
 #~ msgid "Body"
 #~ msgstr "Тело"
@@ -1198,3 +1248,21 @@ msgstr ""
 #~ "When a relation field is used this field will show you the type of field you "
 #~ "have selected"
 #~ msgstr "При использовании связанного поля, это поле покажет вам его тип"
+
+#~ msgid "Sidebar button"
+#~ msgstr "Кнопка боковой панели"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Мастер создания электронной почты"
+
+#~ msgid "Related Document model"
+#~ msgstr "Модель связанного документа"
+
+#~ msgid "Rich-text contents"
+#~ msgstr "Содержимое форматированного текста"
+
+#~ msgid "Text contents"
+#~ msgstr "Текстовое содержимое"
+
+#~ msgid "Opt-out"
+#~ msgstr "Отказ"
diff --git a/addons/email_template/i18n/sr.po b/addons/email_template/i18n/sr.po
index 29886f01fad..0171f89af7f 100644
--- a/addons/email_template/i18n/sr.po
+++ b/addons/email_template/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -306,8 +306,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -448,8 +448,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/sr@latin.po b/addons/email_template/i18n/sr@latin.po
index b6702fcd409..64a16211f6f 100644
--- a/addons/email_template/i18n/sr@latin.po
+++ b/addons/email_template/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -306,8 +306,8 @@ msgid "Add Signature"
 msgstr ""
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr ""
 
@@ -448,8 +448,8 @@ msgid "Cc"
 msgstr ""
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/sv.po b/addons/email_template/i18n/sv.po
index 89e968a9799..3e21d6883e9 100644
--- a/addons/email_template/i18n/sv.po
+++ b/addons/email_template/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -319,8 +319,8 @@ msgid "Add Signature"
 msgstr "Lägg till signatur"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "Ren textversion av meddelandet (platshållare kan användas här)"
 
@@ -465,8 +465,8 @@ msgid "Cc"
 msgstr "Kopia"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr ""
 
diff --git a/addons/email_template/i18n/tr.po b/addons/email_template/i18n/tr.po
index 6289bb4c2b0..31c97bd64b9 100644
--- a/addons/email_template/i18n/tr.po
+++ b/addons/email_template/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -54,13 +54,13 @@ msgstr "Yeni şablon olarak kaydet"
 #: help:email.template,subject:0
 #: help:email_template.preview,subject:0
 msgid "Subject (placeholders may be used here)"
-msgstr ""
+msgstr "Konu (burada yer tutucular kullanılabilir)"
 
 #. module: email_template
 #: help:email.template,email_cc:0
 #: help:email_template.preview,email_cc:0
 msgid "Carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Alıcı karbon kopyası (burada yer tutucular kullanılabilir)"
 
 #. module: email_template
 #: selection:email.template,state:0
@@ -82,6 +82,8 @@ msgid ""
 "Name to use for the generated report file (may contain placeholders)\n"
 "The extension can be omitted and will then come from the report type."
 msgstr ""
+"Oluşturulan rapor için kullanılacak ad (yer tutucular içerebilir)\n"
+"Uzantı atlanabilir ve sonra rapor türünden gelebilir."
 
 #. module: email_template
 #: view:email.template:0
@@ -157,6 +159,8 @@ msgid ""
 "Display a button in the sidebar of related documents to open a composition "
 "wizard with this template"
 msgstr ""
+"Bu şablon ile bir yazım sihirbazı açmak için ilgili dökümanın kenar "
+"çubuğunda bir düğme göster"
 
 #. module: email_template
 #: field:email.template,state:0
@@ -226,6 +230,9 @@ msgid ""
 "If it is a relationship field you will be able to select a target field at "
 "the destination of the relationship."
 msgstr ""
+"İlgili belge modelinden hedef dosyayı seç.\n"
+"Eğer bir ilişki alanı ise ilişkinin varışında bir hedef alan "
+"seçebilmelisiniz ."
 
 #. module: email_template
 #: view:email.template:0
@@ -283,7 +290,7 @@ msgstr "İlgili döküman modeli"
 #: help:email.template,email_from:0
 #: help:email_template.preview,email_from:0
 msgid "Sender address (placeholders may be used here)"
-msgstr ""
+msgstr "Gönderici adresi (burada yer tutucular kullanılabilir)"
 
 #. module: email_template
 #: help:res.partner,opt_out:0
@@ -311,10 +318,10 @@ msgid "Add Signature"
 msgstr "İmza Ekle"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
-msgstr ""
+msgstr "Mesajın düz metin biçimi (burada yer tutucular kullanılabilir)"
 
 #. module: email_template
 #: help:email.template,original:0
@@ -360,6 +367,8 @@ msgid ""
 "When a relationship field is selected as first field, this field shows the "
 "document model the relationship goes to."
 msgstr ""
+"İlk alan olarak bir ilişki alanı seçldiğinde, bu alan ilişkinin gideceği "
+"belge modelini gösterir."
 
 #. module: email_template
 #: model:ir.model,name:email_template.model_email_template
@@ -435,6 +444,7 @@ msgid ""
 "Final placeholder expression, to be copy-pasted in the desired template "
 "field."
 msgstr ""
+"Son yer tutucu tanımı, istenen şablon alanına kopyalanıp-yapıştırılmak üzere."
 
 #. module: email_template
 #: view:email.template:0
@@ -453,8 +463,8 @@ msgid "Cc"
 msgstr "Cc"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "Metin içeriği"
 
@@ -488,6 +498,8 @@ msgid ""
 "You may attach files to this template, to be added to all emails created "
 "from this template"
 msgstr ""
+"Bu şablona dosya eleyebilirsiniz, bu şablonda oluşturulan tüm epostalara "
+"eklenmek üzere"
 
 #. module: email_template
 #: help:email.template,headers:0
@@ -512,6 +524,7 @@ msgid ""
 "Sidebar action to make this template available on records of the related "
 "document model"
 msgstr ""
+"Kenar çubuğu bu şablonun ilgili belge modellerinde kullanılmasını sağlar"
 
 #. module: email_template
 #: field:email.template,model_object_field:0
@@ -541,7 +554,7 @@ msgstr ""
 #: help:email.template,email_bcc:0
 #: help:email_template.preview,email_bcc:0
 msgid "Blind carbon copy recipients (placeholders may be used here)"
-msgstr ""
+msgstr "Alıcıların görğnmez karbon kopyası (burada yer tutucular kullanılr)"
 
 #. module: email_template
 #: help:email.template,lang:0
@@ -552,6 +565,10 @@ msgid ""
 "a placeholder expression that provides the appropriate language code, e.g. "
 "${object.partner_id.lang.code}."
 msgstr ""
+"Bir eposta gönderilirken seçilecek seçime bağlı çeviri dili (ISO kodu). Eğer "
+"ayarlanmamışsa, İngilizce sürümü kullanılacaktır. Bu genellikle uygun dil "
+"kodunu belirten bir yertutucu ifadesi olabilir, örneğin; "
+"${object.partner_id.lang.code}."
 
 #. module: email_template
 #: field:email_template.preview,res_id:0
@@ -562,7 +579,7 @@ msgstr "Örnek Döküman"
 #: help:email.template,email_to:0
 #: help:email_template.preview,email_to:0
 msgid "Comma-separated recipient addresses (placeholders may be used here)"
-msgstr ""
+msgstr "Virgülle ayrılmış alıcı adresleri (burada yertutucular kullanılır)"
 
 #. module: email_template
 #: field:email.template,name:0
@@ -596,6 +613,10 @@ msgid ""
 "instead.\n"
 "Placeholders must be used here, as this value always needs to be unique!"
 msgstr ""
+"Giden mesajlarda Mesaj-SMTP Kimliği bu şablonu temel alır. Lütfen bunun "
+"'Kaynak İzleme' seçeneğini gçersiz kılacağını not edin, bunun yerine giden "
+"epostaların yanıtlarını izlemek için o seçeneği etkinleştirin.\n"
+"Bu değer her zaman benzersiz olacağından burada yertutucular kullanılmalıdır!"
 
 #. module: email_template
 #: field:email.template,headers:0
@@ -613,7 +634,7 @@ msgstr "Bcc"
 #: help:email.template,reply_to:0
 #: help:email_template.preview,reply_to:0
 msgid "Preferred response address (placeholders may be used here)"
-msgstr ""
+msgstr "Yeğlenen yanıtlama adresi (burada yertutucular kullanılır)"
 
 #. module: email_template
 #: view:email.template:0
@@ -624,7 +645,7 @@ msgstr "Kenar Çubuğu butonunu kaldır"
 #: help:email.template,null_value:0
 #: help:email_template.preview,null_value:0
 msgid "Optional value to use if the target field is empty"
-msgstr ""
+msgstr "Hedef alanı boşsa kullanılacak seçimli değer"
 
 #. module: email_template
 #: view:email.template:0
@@ -641,7 +662,7 @@ msgstr "Mesaj referansları, tanımlayıcılar ya da önceki mesajlar"
 #: help:email.template,ref_ir_value:0
 #: help:email_template.preview,ref_ir_value:0
 msgid "Sidebar button to open the sidebar action"
-msgstr ""
+msgstr "Kenar çubuğu işlevini açacak kenar çubuğu düğmesi"
 
 #. module: email_template
 #: constraint:res.partner:0
@@ -661,6 +682,8 @@ msgid ""
 "Optional preferred server for outgoing mails. If not set, the highest "
 "priority one will be used."
 msgstr ""
+"Giden postalar için yeğlenen seçimli sunucu. Eğer ayarlanmaışsa, en yüksek "
+"öncelikli olan kullanılacaktır."
 
 #. module: email_template
 #: selection:email.template,state:0
@@ -675,6 +698,8 @@ msgid ""
 "When a relationship field is selected as first field, this field lets you "
 "select the target field within the destination document model (sub-model)."
 msgstr ""
+"İlk alan olarak ilişki alanı seçilmişse, bu alan, varış belge modeli içinden "
+"hedef alanını seçmenizi sağlar."
 
 #. module: email_template
 #: view:email.template:0
@@ -692,6 +717,7 @@ msgstr "Yazdırıp eklemek için opsiyonel rapor"
 #: help:email_template.preview,body_html:0
 msgid "Rich-text/HTML version of the message (placeholders may be used here)"
 msgstr ""
+"Mesajın Zengin-metin/HTML sürümü (burada yertutucular kullanılmalıdır)"
 
 #, python-format
 #~ msgid ""
@@ -1416,3 +1442,6 @@ msgstr ""
 #~ "eposta belgesidir. Özel müşteri alanlarına uygun olarak "
 #~ "kişiselleştirebilirsiniz, böylece; bir paydaş adı ya da paydaşla ilintili "
 #~ "bilgiler otomatik olarak eklenir."
+
+#~ msgid "Opt-out"
+#~ msgstr "Ayrılma"
diff --git a/addons/email_template/i18n/zh_CN.po b/addons/email_template/i18n/zh_CN.po
index 953c17aface..f4d8b3b3d01 100644
--- a/addons/email_template/i18n/zh_CN.po
+++ b/addons/email_template/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:30+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: email_template
 #: field:email.template,subtype:0
@@ -307,8 +307,8 @@ msgid "Add Signature"
 msgstr "添加签名"
 
 #. module: email_template
-#: help:email.template,body_text:0
-#: help:email_template.preview,body_text:0
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
 msgid "Plaintext version of the message (placeholders may be used here)"
 msgstr "内容的纯文本版本（可以在这里用占位符）"
 
@@ -449,8 +449,8 @@ msgid "Cc"
 msgstr "抄送"
 
 #. module: email_template
-#: field:email.template,body_text:0
-#: field:email_template.preview,body_text:0
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
 msgid "Text Contents"
 msgstr "文本内容"
 
diff --git a/addons/email_template/i18n/zh_TW.po b/addons/email_template/i18n/zh_TW.po
new file mode 100644
index 00000000000..ac5893d1027
--- /dev/null
+++ b/addons/email_template/i18n/zh_TW.po
@@ -0,0 +1,711 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-30 10:19+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: email_template
+#: field:email.template,subtype:0
+#: field:email_template.preview,subtype:0
+msgid "Message type"
+msgstr "訊息類型"
+
+#. module: email_template
+#: field:email.template,report_name:0
+#: field:email_template.preview,report_name:0
+msgid "Report Filename"
+msgstr "報表檔名"
+
+#. module: email_template
+#: view:email.template:0
+msgid "SMTP Server"
+msgstr "SMTP 伺服器"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove the sidebar button currently displayed on related documents"
+msgstr "移除側邊欄按鈕目前顯示在相關的文件"
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+#: field:email_template.preview,ref_ir_act_window:0
+msgid "Sidebar action"
+msgstr "側邊欄動作"
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Save as a new template"
+msgstr "另存新的範本"
+
+#. module: email_template
+#: help:email.template,subject:0
+#: help:email_template.preview,subject:0
+msgid "Subject (placeholders may be used here)"
+msgstr "主旨 (佔位符可在這裡使用)"
+
+#. module: email_template
+#: help:email.template,email_cc:0
+#: help:email_template.preview,email_cc:0
+msgid "Carbon copy recipients (placeholders may be used here)"
+msgstr "副本收件人 (佔位符可在這裡使用)"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Received"
+msgstr "收到"
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,ref_ir_value:0
+#: field:email_template.preview,ref_ir_value:0
+msgid "Sidebar Button"
+msgstr "側邊欄按鈕"
+
+#. module: email_template
+#: help:email.template,report_name:0
+#: help:email_template.preview,report_name:0
+msgid ""
+"Name to use for the generated report file (may contain placeholders)\n"
+"The extension can be omitted and will then come from the report type."
+msgstr ""
+"產生的報表文件命名(可能包含佔位符)\n"
+"可以省略分機號碼然後將會成為報表型態."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attach existing files"
+msgstr "附加現有文件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content"
+msgstr "郵件內容"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.preview,reply_to:0
+msgid "Reply-To"
+msgstr "回覆給"
+
+#. module: email_template
+#: field:email.template,auto_delete:0
+#: field:email_template.preview,auto_delete:0
+msgid "Auto Delete"
+msgstr "自動刪除"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:218
+#, python-format
+msgid "Warning"
+msgstr "警告"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_res_partner
+msgid "Partner"
+msgstr "業務夥伴"
+
+#. module: email_template
+#: field:email.template,subject:0
+#: field:email_template.preview,subject:0
+msgid "Subject"
+msgstr "主旨"
+
+#. module: email_template
+#: field:email.template,email_from:0
+#: field:email_template.preview,email_from:0
+msgid "From"
+msgstr "從"
+
+#. module: email_template
+#: field:mail.compose.message,template_id:0
+msgid "Template"
+msgstr "範本"
+
+#. module: email_template
+#: field:email.template,partner_id:0
+#: field:email_template.preview,partner_id:0
+msgid "Related partner"
+msgstr "相關的合作夥伴"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+#: field:email_template.preview,sub_model_object_field:0
+msgid "Sub-field"
+msgstr "子欄位"
+
+#. module: email_template
+#: view:email.template:0
+msgid ""
+"Display a button in the sidebar of related documents to open a composition "
+"wizard with this template"
+msgstr "相關文件螢幕上的精靈列按鈕可打開這範本之精靈"
+
+#. module: email_template
+#: field:email.template,state:0
+#: field:email_template.preview,state:0
+msgid "State"
+msgstr "狀態"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Sent"
+msgstr "傳送"
+
+#. module: email_template
+#: help:email.template,subtype:0
+#: help:email_template.preview,subtype:0
+msgid ""
+"Type of message, usually 'html' or 'plain', used to select plaintext or rich "
+"text contents accordingly"
+msgstr "訊息類型, 經常是'html'或'plain', 用於選擇 plaintext 或 rich text 做為內容"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "電子郵件成分嚮導"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Dynamic Values Builder"
+msgstr "建立動態值"
+
+#. module: email_template
+#: field:email.template,res_id:0
+msgid "Related Document ID"
+msgstr "相關文件 ID"
+
+#. module: email_template
+#: field:email.template,lang:0
+#: field:email_template.preview,lang:0
+msgid "Language Selection"
+msgstr "語言選擇"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced"
+msgstr "提出"
+
+#. module: email_template
+#: field:email.template,email_to:0
+#: field:email_template.preview,email_to:0
+msgid "To"
+msgstr "給"
+
+#. module: email_template
+#: field:email.template,model:0
+#: field:email_template.preview,model:0
+msgid "Related Document Model"
+msgstr "相關文檔模型"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+#: help:email_template.preview,model_object_field:0
+msgid ""
+"Select target field from the related document model.\n"
+"If it is a relationship field you will be able to select a target field at "
+"the destination of the relationship."
+msgstr ""
+"從相關文件類型選擇目標\n"
+"若它是關聯欄位，您就可以在這關聯關係中，取得這欄位"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr "預覽範本"
+
+#. module: email_template
+#: field:email.template,null_value:0
+#: field:email_template.preview,null_value:0
+msgid "Null value"
+msgstr "空值"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+#: field:email_template.preview,sub_object:0
+msgid "Sub-model"
+msgstr "子類型"
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+#: help:email_template.preview,track_campaign_item:0
+msgid ""
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
+msgstr "啟用，這是您希望包括一個特殊的追蹤電子郵件標記，這樣您就可以找出答覆並連接到相應的資源記錄。這是有用的，例如CRM的線索"
+
+#. module: email_template
+#: field:mail.compose.message,use_template:0
+msgid "Use Template"
+msgstr "使用範本"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+#: field:email_template.preview,attachment_ids:0
+msgid "Files to attach"
+msgstr "附加的文件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr "選項"
+
+#. module: email_template
+#: field:email.template,model_id:0
+#: field:email_template.preview,model_id:0
+msgid "Related document model"
+msgstr "相關文件類型"
+
+#. module: email_template
+#: help:email.template,email_from:0
+#: help:email_template.preview,email_from:0
+msgid "Sender address (placeholders may be used here)"
+msgstr "發信人地址(佔位符可以用在這)"
+
+#. module: email_template
+#: help:res.partner,opt_out:0
+msgid ""
+"If checked, this partner will not receive any automated email notifications, "
+"such as the availability of invoices."
+msgstr "若勾選, 這個合作夥伴將不會收到任何自動郵件回復, 例如有效發票"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr "備註: 這是Raw HTML."
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr "分類方式..."
+
+#. module: email_template
+#: field:email.template,user_signature:0
+#: field:email_template.preview,user_signature:0
+msgid "Add Signature"
+msgstr "加入簽名"
+
+#. module: email_template
+#: help:email.template,body:0
+#: help:email_template.preview,body:0
+msgid "Plaintext version of the message (placeholders may be used here)"
+msgstr "Plaintext 消息版本(佔位符可以用在這)"
+
+#. module: email_template
+#: help:email.template,original:0
+#: help:email_template.preview,original:0
+msgid "Original version of the message, as it was sent on the network"
+msgstr "消息原始版本, 因為它是在網路上發送"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:230
+#, python-format
+msgid "(copy)"
+msgstr "(副本)"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Outgoing"
+msgstr "外送"
+
+#. module: email_template
+#: view:mail.compose.message:0
+msgid "Use a message template"
+msgstr "使用訊息範本"
+
+#. module: email_template
+#: help:email.template,user_signature:0
+#: help:email_template.preview,user_signature:0
+msgid ""
+"If checked, the user's signature will be appended to the text version of the "
+"message"
+msgstr "若勾選, 使用者的簽名將附加到郵件的文字版本"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.preview:0
+msgid "Body (Rich/HTML)"
+msgstr "內文 (Rich/HTML)"
+
+#. module: email_template
+#: help:email.template,sub_object:0
+#: help:email_template.preview,sub_object:0
+msgid ""
+"When a relationship field is selected as first field, this field shows the "
+"document model the relationship goes to."
+msgstr ""
+"當這相關欄位是選為第一欄位, this field shows the document model the relationship goes to."
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates"
+msgstr "郵件範本"
+
+#. module: email_template
+#: field:email.template,date:0
+#: field:email_template.preview,date:0
+msgid "Date"
+msgstr "日期"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "預覽範本"
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.preview,message_id:0
+msgid "Message-Id"
+msgstr "訊息-Id"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Add sidebar button"
+msgstr "加入側邊欄按鈕"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.preview:0
+msgid "Body (Text)"
+msgstr "內文 (Text)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr "進階選項"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:183
+#, python-format
+msgid "Send Mail (%s)"
+msgstr "傳送郵件 (%s)"
+
+#. module: email_template
+#: field:email.template,body_html:0
+#: field:email_template.preview,body_html:0
+msgid "Rich-text Contents"
+msgstr "富文本內容"
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+#: field:email_template.preview,copyvalue:0
+msgid "Expression"
+msgstr "表達"
+
+#. module: email_template
+#: field:email.template,original:0
+#: field:email_template.preview,original:0
+msgid "Original"
+msgstr "原作"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr "地址"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+#: help:email_template.preview,copyvalue:0
+msgid ""
+"Final placeholder expression, to be copy-pasted in the desired template "
+"field."
+msgstr "最後的模板欄位，找到要複製-貼上的區塊"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attachments"
+msgstr "附件"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Details"
+msgstr "郵件詳情"
+
+#. module: email_template
+#: field:email.template,email_cc:0
+#: field:email_template.preview,email_cc:0
+msgid "Cc"
+msgstr "副本"
+
+#. module: email_template
+#: field:email.template,body:0
+#: field:email_template.preview,body:0
+msgid "Text Contents"
+msgstr "文字內容"
+
+#. module: email_template
+#: help:email.template,auto_delete:0
+#: help:email_template.preview,auto_delete:0
+msgid "Permanently delete this email after sending it, to save space"
+msgstr "永久刪除已發送的郵件以節省空間"
+
+#. module: email_template
+#: field:email.template,references:0
+#: field:email_template.preview,references:0
+msgid "References"
+msgstr "參考"
+
+#. module: email_template
+#: field:email.template,display_text:0
+#: field:email_template.preview,display_text:0
+msgid "Display Text"
+msgstr "顯示文字"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Close"
+msgstr "關閉"
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+#: help:email_template.preview,attachment_ids:0
+msgid ""
+"You may attach files to this template, to be added to all emails created "
+"from this template"
+msgstr "這個範本您可以加入附件, 從這範本新建所有郵件"
+
+#. module: email_template
+#: help:email.template,headers:0
+#: help:email_template.preview,headers:0
+msgid ""
+"Full message headers, e.g. SMTP session headers (usually available on "
+"inbound messages only)"
+msgstr "完整的郵件標題，例如僅SMTP會話頭（通常可在入站消息)"
+
+#. module: email_template
+#: field:email.template,mail_server_id:0
+#: field:email_template.preview,mail_server_id:0
+msgid "Outgoing Mail Server"
+msgstr "發送郵件伺服器"
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+#: help:email_template.preview,ref_ir_act_window:0
+msgid ""
+"Sidebar action to make this template available on records of the related "
+"document model"
+msgstr "側邊欄動作使這個範本記錄相關的文件類型"
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+#: field:email_template.preview,model_object_field:0
+msgid "Field"
+msgstr "欄位"
+
+#. module: email_template
+#: field:email.template,user_id:0
+#: field:email_template.preview,user_id:0
+msgid "Related user"
+msgstr "相關使用者"
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_templates
+msgid "Templates"
+msgstr "範本"
+
+#. module: email_template
+#: field:res.partner,opt_out:0
+msgid "Opt-Out"
+msgstr "不參加"
+
+#. module: email_template
+#: help:email.template,email_bcc:0
+#: help:email_template.preview,email_bcc:0
+msgid "Blind carbon copy recipients (placeholders may be used here)"
+msgstr "密件副本收件人（佔位符可以用在這裡）"
+
+#. module: email_template
+#: help:email.template,lang:0
+#: help:email_template.preview,lang:0
+msgid ""
+"Optional translation language (ISO code) to select when sending out an "
+"email. If not set, the english version will be used. This should usually be "
+"a placeholder expression that provides the appropriate language code, e.g. "
+"${object.partner_id.lang.code}."
+msgstr ""
+"選擇翻譯語言（ISO代碼）選擇發送電子郵件時。如果沒有設置，將使用英文版本。通常，這應該是一個佔位符，表達式，提供適當的語言代碼，例如$ "
+"{object.partner_id.lang.code}。"
+
+#. module: email_template
+#: field:email_template.preview,res_id:0
+msgid "Sample Document"
+msgstr "文件範本"
+
+#. module: email_template
+#: help:email.template,email_to:0
+#: help:email_template.preview,email_to:0
+msgid "Comma-separated recipient addresses (placeholders may be used here)"
+msgstr "逗號分隔的收件人地址（佔位符可以用在這裡）"
+
+#. module: email_template
+#: field:email.template,name:0
+#: field:email_template.preview,name:0
+msgid "Name"
+msgstr "名稱"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+#: field:email_template.preview,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr "資源追蹤"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr "預覽郵件範本"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr "預覽郵件"
+
+#. module: email_template
+#: help:email.template,message_id:0
+#: help:email_template.preview,message_id:0
+msgid ""
+"Message-ID SMTP header to use in outgoing messages based on this template. "
+"Please note that this overrides the 'Resource Tracking' option, so if you "
+"simply need to track replies to outgoing emails, enable that option "
+"instead.\n"
+"Placeholders must be used here, as this value always needs to be unique!"
+msgstr ""
+"消息ID SMTP頭使用在基於此模板的傳出消息。請注意，這將覆蓋'資源追蹤'選項，所以如果您只需要跟蹤答覆外發郵件，啟用該選項。\n"
+"佔位符必須用在這裡，這個值永遠必須是唯一的！"
+
+#. module: email_template
+#: field:email.template,headers:0
+#: field:email_template.preview,headers:0
+msgid "Message headers"
+msgstr "訊息頂端"
+
+#. module: email_template
+#: field:email.template,email_bcc:0
+#: field:email_template.preview,email_bcc:0
+msgid "Bcc"
+msgstr "密件副本收件人"
+
+#. module: email_template
+#: help:email.template,reply_to:0
+#: help:email_template.preview,reply_to:0
+msgid "Preferred response address (placeholders may be used here)"
+msgstr "首選的回覆地址（佔位符可以用在這裡）"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Remove sidebar button"
+msgstr "移動側邊欄按鈕"
+
+#. module: email_template
+#: help:email.template,null_value:0
+#: help:email_template.preview,null_value:0
+msgid "Optional value to use if the target field is empty"
+msgstr "若欄位是空的需選擇使用值"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Model"
+msgstr "型號"
+
+#. module: email_template
+#: help:email.template,references:0
+#: help:email_template.preview,references:0
+msgid "Message references, such as identifiers of previous messages"
+msgstr "消息引用，如以前的消息標識符"
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+#: help:email_template.preview,ref_ir_value:0
+msgid "Sidebar button to open the sidebar action"
+msgstr "側邊欄按鈕來打開側邊欄動作"
+
+#. module: email_template
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "錯誤 ! 您不行建立相關成員"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:218
+#, python-format
+msgid "Deletion of the action record failed."
+msgstr "刪除的動作記錄失敗"
+
+#. module: email_template
+#: help:email.template,mail_server_id:0
+#: help:email_template.preview,mail_server_id:0
+msgid ""
+"Optional preferred server for outgoing mails. If not set, the highest "
+"priority one will be used."
+msgstr "可選擇伺服器發送的郵件。如果沒有設置，優先級最高的將被使用。"
+
+#. module: email_template
+#: selection:email.template,state:0
+#: selection:email_template.preview,state:0
+msgid "Delivery Failed"
+msgstr "傳送失敗"
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+#: help:email_template.preview,sub_model_object_field:0
+msgid ""
+"When a relationship field is selected as first field, this field lets you "
+"select the target field within the destination document model (sub-model)."
+msgstr "當相關欄位已被選擇為第一欄位, 這欄位，讓您選擇目標欄位內的目標文件類型（子類型型）。"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Attach Report"
+msgstr "附加報表"
+
+#. module: email_template
+#: field:email.template,report_template:0
+#: field:email_template.preview,report_template:0
+msgid "Optional report to print and attach"
+msgstr "選擇報表列印與附加"
+
+#. module: email_template
+#: help:email.template,body_html:0
+#: help:email_template.preview,body_html:0
+msgid "Rich-text/HTML version of the message (placeholders may be used here)"
+msgstr "Rich-text/HTML版本的消息（佔位符可以用在這裡）"
+
+#~ msgid "Sidebar button"
+#~ msgstr "側邊欄按鈕"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "郵件合併精靈"
+
+#~ msgid "Related Document model"
+#~ msgstr "相關文件類型"
+
+#~ msgid "Rich-text contents"
+#~ msgstr "豐富的文字內容"
+
+#~ msgid "Text contents"
+#~ msgstr "文字內容"
+
+#~ msgid "Opt-out"
+#~ msgstr "退出選擇"
diff --git a/addons/email_template/security/ir.model.access.csv b/addons/email_template/security/ir.model.access.csv
index d2d6adf3bf3..adce0420793 100644
--- a/addons/email_template/security/ir.model.access.csv
+++ b/addons/email_template/security/ir.model.access.csv
@@ -1,5 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_email_template,email.template,model_email_template,,1,0,0,0
+access_email_template,email.template,model_email_template,,1,1,1,0
 access_email_template_system,email.template system,model_email_template,base.group_system,1,1,1,1
-access_email_template_manager,email.template,model_email_template,,1,1,1,1
-access_email_template_preview_system,email.template.preview system,model_email_template_preview,base.group_system,1,1,1,1
diff --git a/addons/base_calendar/wizard/__init__.py b/addons/email_template/tests/__init__.py
similarity index 85%
rename from addons/base_calendar/wizard/__init__.py
rename to addons/email_template/tests/__init__.py
index cd0690b1dc0..d63c5634cc3 100644
--- a/addons/base_calendar/wizard/__init__.py
+++ b/addons/email_template/tests/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -18,8 +18,10 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+from . import test_mail
 
-import base_calendar_invite_attendee
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+checks = [
+    test_mail,
+]
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
new file mode 100644
index 00000000000..7c69295ce9f
--- /dev/null
+++ b/addons/email_template/tests/test_mail.py
@@ -0,0 +1,204 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import base64
+from openerp.addons.mail.tests import test_mail_mockup
+
+
+class test_message_compose(test_mail_mockup.TestMailMockups):
+
+    def setUp(self):
+        super(test_message_compose, self).setUp()
+        self.mail_group = self.registry('mail.group')
+        self.mail_mail = self.registry('mail.mail')
+        self.mail_message = self.registry('mail.message')
+        self.res_users = self.registry('res.users')
+        self.res_partner = self.registry('res.partner')
+
+        # create a 'pigs' and 'bird' groups that will be used through the various tests
+        self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
+            {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
+        self.group_bird_id = self.mail_group.create(self.cr, self.uid,
+            {'name': 'Bird', 'description': 'I am angry !'})
+
+    def test_00_message_compose_wizard(self):
+        """ Tests designed for the mail.compose.message wizard updated by email_template. """
+        cr, uid = self.cr, self.uid
+        mail_compose = self.registry('mail.compose.message')
+        self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a.a'})
+        user_admin = self.res_users.browse(cr, uid, uid)
+        p_a_id = user_admin.partner_id.id
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        group_bird = self.mail_group.browse(cr, uid, self.group_bird_id)
+
+        # Mail data
+        _subject1 = 'Pigs'
+        _subject2 = 'Bird'
+        _body_html1 = 'Fans of Pigs, unite !\n<p>Admin</p>\n'
+        _body_html2 = 'I am angry !\n<p>Admin</p>\n'
+        _attachments = [
+            {'name': 'First', 'datas_fname': 'first.txt', 'datas': base64.b64encode('My first attachment')},
+            {'name': 'Second', 'datas_fname': 'second.txt', 'datas': base64.b64encode('My second attachment')}
+            ]
+        _attachments_test = [('first.txt', 'My first attachment'), ('second.txt', 'My second attachment')]
+
+        # Create template on mail.group, with attachments
+        group_model_id = self.registry('ir.model').search(cr, uid, [('model', '=', 'mail.group')])[0]
+        email_template = self.registry('email.template')
+        email_template_id = email_template.create(cr, uid, {
+            'model_id': group_model_id,
+            'name': 'Pigs Template',
+            'subject': '${object.name}',
+            'body_html': '${object.description}',
+            'user_signature': True,
+            'attachment_ids': [(0, 0, _attachments[0]), (0, 0, _attachments[1])],
+            'email_to': 'b@b.b c@c.c',
+            'email_cc': 'd@d.d'
+            })
+
+        # ----------------------------------------
+        # CASE1: comment and save as template
+        # ----------------------------------------
+
+        # 1. Comment on pigs
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': 'Forget me subject', 'body': '<p>Dummy body</p>'},
+            {'default_composition_mode': 'comment',
+                'default_model': 'mail.group',
+                'default_res_id': self.group_pigs_id,
+                'active_ids': [self.group_pigs_id, self.group_bird_id]})
+        compose = mail_compose.browse(cr, uid, compose_id)
+
+        # 2. Save current composition form as a template
+        mail_compose.save_as_template(cr, uid, [compose_id], context={'default_model': 'mail.group'})
+        # Test: email_template subject, body_html, model
+        last_template_id = email_template.search(cr, uid, [('model', '=', 'mail.group'), ('subject', '=', 'Forget me subject')], limit=1)[0]
+        self.assertTrue(last_template_id, 'email_template not found for model mail.group, subject Forget me subject')
+        last_template = email_template.browse(cr, uid, last_template_id)
+        self.assertEqual(last_template.body_html, '<p>Dummy body</p>', 'email_template incorrect body_html')
+
+        # ----------------------------------------
+        # CASE2: comment with template, save as template
+        # ----------------------------------------
+
+        # 1. Comment on pigs
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': 'Forget me subject', 'body': 'Dummy body'},
+            {'default_composition_mode': 'comment',
+                'default_model': 'mail.group',
+                'default_res_id': self.group_pigs_id,
+                'default_use_template': False,
+                'default_template_id': email_template_id,
+                'active_ids': [self.group_pigs_id, self.group_bird_id]})
+        compose = mail_compose.browse(cr, uid, compose_id)
+
+        # 2. Perform 'toggle_template', to set use_template and use template_id
+        mail_compose.toggle_template(cr, uid, [compose_id], {'default_composition_mode': 'comment', 'default_model': 'mail.group'})
+        compose.refresh()
+        message_pids = [partner.id for partner in compose.partner_ids]
+        partner_ids = self.res_partner.search(cr, uid, [('email', 'in', ['b@b.b', 'c@c.c', 'd@d.d'])])
+        # Test: mail.compose.message: subject, body, content_subtype, partner_ids
+        self.assertEqual(compose.subject, _subject1, 'mail.compose.message subject incorrect')
+        self.assertEqual(compose.body, _body_html1, 'mail.compose.message body incorrect')
+        self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message content_subtype incorrect')
+        self.assertEqual(set(message_pids), set(partner_ids), 'mail.compose.message partner_ids incorrect')
+        # Test: mail.compose.message: attachments
+        # Test: mail.message: attachments
+        for attach in compose.attachment_ids:
+            self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model incorrect')
+            self.assertEqual(attach.res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
+            self.assertIn((attach.name, base64.b64decode(attach.datas)), _attachments_test,
+                'mail.message attachment name / data incorrect')
+
+        # 3. Perform 'toggle_template': template is not set anymore
+        mail_compose.toggle_template(cr, uid, [compose_id], {'default_composition_mode': 'comment', 'default_model': 'mail.group'})
+        compose.refresh()
+        # Test: subject, body, partner_ids
+        self.assertEqual(compose.subject, False, 'mail.compose.message subject incorrect')
+        self.assertEqual(compose.body, '', 'mail.compose.message body incorrect')
+
+        # ----------------------------------------
+        # CASE3: mass_mail with template
+        # ----------------------------------------
+
+        # 1. Mass_mail on pigs and bird, with a default_partner_ids set to check he is correctly added
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': 'Forget me subject', 'body': 'Dummy body'},
+            {'default_composition_mode': 'mass_mail',
+                'default_model': 'mail.group',
+                'default_res_id': self.group_pigs_id,
+                'default_use_template': False,
+                'default_template_id': email_template_id,
+                'default_partner_ids': [p_a_id],
+                'active_ids': [self.group_pigs_id, self.group_bird_id]})
+        compose = mail_compose.browse(cr, uid, compose_id)
+
+        # 2. Perform 'toggle_template', to set use_template and use template_id
+        mail_compose.toggle_template(cr, uid, [compose_id], {'default_composition_mode': 'comment', 'default_model': 'mail.group'})
+        compose.refresh()
+        message_pids = [partner.id for partner in compose.partner_ids]
+        partner_ids = [p_a_id]
+        # Test: mail.compose.message: subject, body, content_subtype, partner_ids
+        self.assertEqual(compose.subject, '${object.name}', 'mail.compose.message subject incorrect')
+        self.assertEqual(compose.body, '${object.description}', 'mail.compose.message body incorrect')
+        self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message content_subtype incorrect')
+        self.assertEqual(set(message_pids), set(partner_ids), 'mail.compose.message partner_ids incorrect')
+
+        # 3. Post the comment, get created message
+        mail_compose.send_mail(cr, uid, [compose_id],  {'default_res_id': -1, 'active_ids': [self.group_pigs_id, self.group_bird_id]})
+        group_pigs.refresh()
+        group_bird.refresh()
+        message_pigs = group_pigs.message_ids[0]
+        message_bird = group_bird.message_ids[0]
+        # Test: subject, body
+        self.assertEqual(message_pigs.subject, _subject1, 'mail.message subject on Pigs incorrect')
+        self.assertEqual(message_bird.subject, _subject2, 'mail.message subject on Bird incorrect')
+        self.assertEqual(message_pigs.body, _body_html1, 'mail.message body on Pigs incorrect')
+        self.assertEqual(message_bird.body, _body_html2, 'mail.message body on Bird incorrect')
+        # Test: partner_ids: p_a_id (default) + 3 newly created partners
+        message_pigs_pids = [partner.id for partner in message_pigs.notified_partner_ids]
+        message_bird_pids = [partner.id for partner in message_bird.notified_partner_ids]
+        partner_ids = self.res_partner.search(cr, uid, [('email', 'in', ['b@b.b', 'c@c.c', 'd@d.d'])])
+        self.assertEqual(set(message_pigs_pids), set(partner_ids), 'mail.message on pigs incorrect number of notified_partner_ids')
+        self.assertEqual(set(message_bird_pids), set(partner_ids), 'mail.message on bird notified_partner_ids incorrect')
+
+        # ----------------------------------------
+        # CASE4: test newly introduced email_recipients field
+        # ----------------------------------------
+
+        # get already-created partners back
+        p_b_id = self.res_partner.search(cr, uid, [('email', '=', 'b@b.b')])[0]
+        p_c_id = self.res_partner.search(cr, uid, [('email', '=', 'c@c.c')])[0]
+        p_d_id = self.res_partner.search(cr, uid, [('email', '=', 'd@d.d')])[0]
+        # modify template: use email_recipients, use template and email address in email_to to test all features together
+        user_model_id = self.registry('ir.model').search(cr, uid, [('model', '=', 'res.users')])[0]
+        email_template.write(cr, uid, [email_template_id], {
+            'model_id': user_model_id,
+            'body_html': '${object.login}',
+            'email_to': '${object.email} c@c',
+            'email_recipients': '%i,%i' % (p_b_id, p_c_id),
+            'email_cc': 'd@d',
+            })
+        # patner by email + partner by id (no double)
+        send_to = [p_a_id, p_b_id, p_c_id, p_d_id]
+        # Generate messsage with default email and partner on template
+        mail_value = mail_compose.generate_email_for_composer(cr, uid, email_template_id, uid)
+        self.assertEqual(set(mail_value['partner_ids']), set(send_to), 'mail.message partner_ids list created by template is incorrect')
diff --git a/addons/email_template/wizard/email_template_preview.py b/addons/email_template/wizard/email_template_preview.py
index 4ef0e9fa156..862c34cc426 100644
--- a/addons/email_template/wizard/email_template_preview.py
+++ b/addons/email_template/wizard/email_template_preview.py
@@ -26,7 +26,6 @@ class email_template_preview(osv.osv_memory):
     _inherit = "email.template"
     _name = "email_template.preview"
     _description = "Email Template Preview"
-    _rec_name = "subject"
 
     def _get_records(self, cr, uid, context=None):
         """
@@ -66,30 +65,19 @@ class email_template_preview(osv.osv_memory):
         return result
 
     _columns = {
-        'res_id':fields.selection(_get_records, 'Sample Document'),
+        'res_id': fields.selection(_get_records, 'Sample Document'),
     }
 
     def on_change_res_id(self, cr, uid, ids, res_id, context=None):
-        if not res_id:
-            return {}
+        if not res_id: return {}
         vals = {}
         email_template = self.pool.get('email.template')
         template_id = context and context.get('template_id')
-        template = email_template.get_email_template(cr, uid, template_id=template_id, record_id=res_id, context=context)
-        model = template.model
-        vals['email_to'] = self.render_template(cr, uid, template.email_to, model, res_id, context)
-        vals['email_cc'] = self.render_template(cr, uid, template.email_cc, model, res_id, context)
-        vals['email_bcc'] = self.render_template(cr, uid, template.email_bcc, model, res_id, context)
-        vals['reply_to'] = self.render_template(cr, uid, template.reply_to, model, res_id, context)
-        vals['subject'] = self.render_template(cr, uid, template.subject, model, res_id, context)
-        description = self.render_template(cr, uid, template.body_text, model, res_id, context) or ''
-        if template.user_signature:
-            signature = self.pool.get('res.users').browse(cr, uid, uid, context).signature
-            description += '\n' + signature
-        vals['body_text'] = description
-        if template.body_html:
-            vals['body_html'] = self.render_template(cr, uid, template.body_html, model, res_id, context) or ''
-        vals['report_name'] = self.render_template(cr, uid, template.report_name, model, res_id, context)
+        template = email_template.browse(cr, uid, template_id, context=context)
+        vals['name'] = template.name
+        mail_values = email_template.generate_email(cr, uid, template_id, res_id, context=context)
+        for k in ('email_from','email_to','email_cc','reply_to','subject','body_html'):
+            vals[k] = mail_values[k]
         return {'value': vals}
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/wizard/email_template_preview_view.xml b/addons/email_template/wizard/email_template_preview_view.xml
index 39fb413fcde..8dd4bc92ba7 100644
--- a/addons/email_template/wizard/email_template_preview_view.xml
+++ b/addons/email_template/wizard/email_template_preview_view.xml
@@ -6,27 +6,23 @@
             <field name="name">email_template.preview.form</field>
             <field name="model">email_template.preview</field>
             <field name="arch" type="xml">
-                <form string="Email Preview">
-                    <field name="model_id" invisible="1"/>
-                    <field name="res_id" on_change="on_change_res_id(res_id, context)"/>
-                    <group col="2" colspan="4">
-                        <field name="email_to" readonly="1"/>
-                        <field name="email_cc" readonly="1" attrs="{'invisible': [('email_cc','=',False)]}"/>
-                        <field name="email_bcc" readonly="1" attrs="{'invisible': [('email_bcc','=',False)]}"/>
-                        <field name="reply_to" readonly="1" attrs="{'invisible': [('reply_to','=',False)]}"/>
-                        <field name="subject" readonly="1"/>
+                <form string="Email Preview" version="7.0">
+                    <div>
+                        <h2>Preview of <field name="name" readonly="1" class="oe_inline"/></h2>
+                        <field name="model_id" invisible="1"/>
+                        <h3>Using sample document
+                        <field name="res_id" on_change="on_change_res_id(res_id, context)" class="oe_inline"/>
+                        </h3>
+                    </div>
+                    <group>
+                      <field name="email_from" readonly="1"/>
+                      <field name="email_to" readonly="1"/>
+                      <field name="email_recipients" readonly="1"/>
+                      <field name="email_cc" readonly="1" attrs="{'invisible':[('email_cc','=',False)]}"/>
+                      <field name="reply_to" readonly="1" attrs="{'invisible':[('reply_to','=',False)]}"/>
+                      <field name="subject" readonly="1"/>
+                      <field name="body_html" widget="html" readonly="1" options='{"safe": True}'/>
                     </group>
-                    <group col="4" colspan="4">
-                        <notebook>
-                            <page string="Body (Text)">
-                                <field name="body_text" nolabel="1" colspan="4" height="350" width="350" readonly="1"/>
-                            </page>
-                            <page string="Body (Rich/HTML)" attrs="{'invisible': [('body_html','=', False)]}">
-                                <field name="body_html" nolabel="1" colspan="4" height="350" width="350" readonly="1"/>
-                            </page>
-                        </notebook>
-                    </group>
-                    <field name="report_name" colspan="4" readonly="1"/>
                 </form>
             </field>
         </record>
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index 1b007a990c0..e9141029166 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -19,138 +19,185 @@
 #
 ##############################################################################
 
-import base64
+import tools
 
 from osv import osv
 from osv import fields
-from tools.translate import _
-import tools
 
 
-class mail_compose_message(osv.osv_memory):
+def _reopen(self, res_id, model):
+    return {'type': 'ir.actions.act_window',
+            'view_mode': 'form',
+            'view_type': 'form',
+            'res_id': res_id,
+            'res_model': self._name,
+            'target': 'new',
+            # save original model in context, because selecting the list of available
+            # templates requires a model in context
+            'context': {
+                'default_model': model,
+            },
+    }
+
+
+class mail_compose_message(osv.TransientModel):
     _inherit = 'mail.compose.message'
 
     def _get_templates(self, cr, uid, context=None):
-        """
-        Return Email Template of particular  Model.
-        """
         if context is None:
             context = {}
-        record_ids = []
-        email_template= self.pool.get('email.template')
         model = False
-        if context.get('message_id'):
-            mail_message = self.pool.get('mail.message')
-            message_data = mail_message.browse(cr, uid, int(context.get('message_id')), context)
-            model = message_data.model
-        elif context.get('mail.compose.target.model') or context.get('active_model'):
-            model = context.get('mail.compose.target.model', context.get('active_model'))
-        if model:
-            record_ids = email_template.search(cr, uid, [('model', '=', model)])
-            return email_template.name_get(cr, uid, record_ids, context) + [(False,'')]
-        return []
+        email_template_obj = self.pool.get('email.template')
+        message_id = context.get('default_parent_id', context.get('message_id', context.get('active_id')))
+
+        if context.get('default_composition_mode') == 'reply' and message_id:
+            message_data = self.pool.get('mail.message').browse(cr, uid, message_id, context=context)
+            if message_data:
+                model = message_data.model
+        else:
+            model = context.get('default_model', context.get('active_model'))
+
+        record_ids = email_template_obj.search(cr, uid, [('model', '=', model)], context=context)
+        return email_template_obj.name_get(cr, uid, record_ids, context) + [(False, '')]
+
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
+        result['template_id'] = context.get('default_template_id', context.get('mail.compose.template_id', False))
+
+        # pre-render the template if any
+        if result.get('use_template') and result.get('template_id'):
+            onchange_res = self.onchange_use_template(cr, uid, [], result.get('use_template'), result.get('template_id'),
+                result.get('composition_mode'), result.get('model'), result.get('res_id'), context=context)
+            result.update(onchange_res['value'])
+        return result
 
     _columns = {
         'use_template': fields.boolean('Use Template'),
-        'template_id': fields.selection(_get_templates, 'Template',
-                                        size=-1 # means we want an int db column
-                                        ),
+        # incredible hack of the day: size=-1 means we want an int db column instead of an str one
+        'template_id': fields.selection(_get_templates, 'Template', size=-1),
     }
-    
+
     _defaults = {
-        'template_id' : lambda self, cr, uid, context={} : context.get('mail.compose.template_id', False)          
+        'use_template': True,
     }
 
-    def on_change_template(self, cr, uid, ids, use_template, template_id, email_from=None, email_to=None, context=None):
-        if context is None:
-            context = {}
-        values = {}
-        if template_id:
-            res_id = context.get('active_id', False)
-            if context.get('mail.compose.message.mode') == 'mass_mail':
-                # use the original template values - to be rendered when actually sent
-                # by super.send_mail()
-                values = self.pool.get('email.template').read(cr, uid, template_id, self.fields_get_keys(cr, uid), context)
-            else:
-                # render the mail as one-shot
-                values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
-                # get partner_ids back
-                values['dest_partner_ids'] = values['partner_ids']
-                # retrofit generated attachments in the expected field format
-                if values['attachments']:
-                    attachment = values.pop('attachments')
-                    attachment_obj = self.pool.get('ir.attachment')
-                    att_ids = []
-                    for fname, fcontent in attachment.iteritems():
-                        data_attach = {
-                            'name': fname,
-                            'datas': fcontent,
-                            'datas_fname': fname,
-                            'description': fname,
-                            'res_model' : self._name,
-                            'res_id' : ids[0] if ids else False
-                        }
-                        att_ids.append(attachment_obj.create(cr, uid, data_attach))
-                    values['attachment_ids'] = att_ids
+    def onchange_template_id(self, cr, uid, ids, use_template, template_id, composition_mode, model, res_id, context=None):
+        """ - use_template not set: return default_get
+            - use_template set in mass_mailing: we cannot render, so return the template values
+            - use_template set: return rendered values """
+        if use_template and template_id and composition_mode == 'mass_mail':
+            values = self.pool.get('email.template').read(cr, uid, template_id, ['subject', 'body_html'], context)
+            values.pop('id')
+        elif use_template and template_id:
+            values = self.generate_email_for_composer(cr, uid, template_id, res_id, context=context)
+            # transform attachments into attachment_ids
+            values['attachment_ids'] = []
+            ir_attach_obj = self.pool.get('ir.attachment')
+            for attach_fname, attach_datas in values.pop('attachments', []):
+                data_attach = {
+                    'name': attach_fname,
+                    'datas': attach_datas,
+                    'datas_fname': attach_fname,
+                    'res_model': model,
+                    'res_id': res_id,
+                    'type': 'binary', # overwrite the context default_value
+                }
+                values['attachment_ids'].append(ir_attach_obj.create(cr, uid, data_attach, context=context))
         else:
-            # restore defaults
-            values = self.default_get(cr, uid, self.fields_get_keys(cr, uid), context)
-            values.update(use_template=use_template, template_id=template_id)
+            values = self.default_get(cr, uid, ['body', 'body_html', 'subject', 'partner_ids', 'attachment_ids'], context=context)
 
+        if values.get('body_html'):
+            values['body'] = values.pop('body_html')
+        values.update(use_template=use_template, template_id=template_id)
         return {'value': values}
 
-    def template_toggle(self, cr, uid, ids, context=None):
+    def toggle_template(self, cr, uid, ids, context=None):
+        """ hit toggle template mode button: calls onchange_use_template to
+            emulate an on_change, then writes the values to update the form. """
         for record in self.browse(cr, uid, ids, context=context):
-            values = {}
-            use_template = record.use_template
-            # simulate an on_change on use_template
-            values.update(self.onchange_use_template(cr, uid, ids, not use_template, context=context)['value'])
-            record.write(values)
-            return False
+            onchange_res = self.onchange_use_template(cr, uid, ids, not record.use_template,
+                record.template_id, record.composition_mode, record.model, record.res_id, context=context).get('value', {})
+            # update partner_ids and attachment_ids
+            onchange_res['partner_ids'] = [(4, partner_id) for partner_id in onchange_res.pop('partner_ids', [])]
+            onchange_res['attachment_ids'] = [(4, attachment_id) for attachment_id in onchange_res.pop('attachment_ids', [])]
+            record.write(onchange_res)
+            return _reopen(self, record.id, record.model)
 
-    def onchange_use_template(self, cr, uid, ids, use_template, context=None):
-        values = {'use_template': use_template}
-        for record in self.browse(cr, uid, ids, context=context):
-            if not use_template:
-                # equivalent to choosing an empty template
-                onchange_template_values = self.on_change_template(cr, uid, record.id, use_template,
-                    False, email_from=record.email_from, email_to=record.email_to, context=context)
-                values.update(onchange_template_values['value'])
-        return {'value': values}
+    def onchange_use_template(self, cr, uid, ids, use_template, template_id, composition_mode, model, res_id, context=None):
+        """ onchange_use_template (values: True or False).  If use_template is
+            False, we do as an onchange with template_id False for values """
+        values = self.onchange_template_id(cr, uid, ids, use_template,
+            template_id, composition_mode, model, res_id, context=context)
+        # force html when using templates
+        if use_template:
+            values['value']['content_subtype'] = 'html'
+        return values
 
     def save_as_template(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
+        """ hit save as template button: current form value will be a new
+            template attached to the current document. """
         email_template = self.pool.get('email.template')
-        model_pool = self.pool.get('ir.model')
+        ir_model_pool = self.pool.get('ir.model')
         for record in self.browse(cr, uid, ids, context=context):
-            model = record.model or context.get('active_model')
-            model_ids = model_pool.search(cr, uid, [('model', '=', model)])
+            model_ids = ir_model_pool.search(cr, uid, [('model', '=', record.model)], context=context)
             model_id = model_ids and model_ids[0] or False
             model_name = ''
             if model_id:
-                model_name = model_pool.browse(cr, uid, model_id, context=context).name
+                model_name = ir_model_pool.browse(cr, uid, model_id, context=context).name
             template_name = "%s: %s" % (model_name, tools.ustr(record.subject))
             values = {
                 'name': template_name,
-                'email_from': record.email_from or False,
                 'subject': record.subject or False,
-                'body_text': record.body_text or False,
-                'email_to': record.email_to or False,
-                'email_cc': record.email_cc or False,
-                'email_bcc': record.email_bcc or False,
-                'reply_to': record.reply_to or False,
+                'body_html': record.body or False,
                 'model_id': model_id or False,
                 'attachment_ids': [(6, 0, [att.id for att in record.attachment_ids])]
             }
             template_id = email_template.create(cr, uid, values, context=context)
-            record.write({'template_id': template_id,
-                          'use_template': True})
+            record.write(record.onchange_template_id(True, template_id, record.composition_mode, record.model, record.res_id)['value'])
+            return _reopen(self, record.id, record.model)
 
-        # _reopen same wizard screen with new template preselected
-        return False
+    #------------------------------------------------------
+    # Wizard validation and send
+    #------------------------------------------------------
+
+    def generate_email_for_composer(self, cr, uid, template_id, res_id, context=None):
+        """ Call email_template.generate_email(), get fields relevant for
+            mail.compose.message, transform email_cc and email_to into partner_ids """
+        template_values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
+        # filter template values
+        fields = ['body', 'body_html', 'subject', 'email_to', 'email_recipients', 'email_cc', 'attachments']
+        values = dict((field, template_values[field]) for field in fields if template_values.get(field))
+        values['body'] = values.pop('body_html', '')
+        # transform email_to, email_cc into partner_ids
+        values['partner_ids'] = []
+
+        mails = tools.email_split(values.pop('email_to', '') + ' ' + values.pop('email_cc', ''))
+        for mail in mails:
+            partner_id = self.pool.get('res.partner').find_or_create(cr, uid, mail, context=context)
+            values['partner_ids'].append(partner_id)
+        email_recipients = values.pop('email_recipients', '')
+        if email_recipients:
+            for partner_id in email_recipients.split(','):
+                values['partner_ids'].append(int(partner_id))
+
+        values['partner_ids'] = list(set(values['partner_ids']))
+
+        return values
+
+    def render_message(self, cr, uid, wizard, res_id, context=None):
+        """ Generate an email from the template for given (model, res_id) pair.
+            This method is meant to be inherited by email_template that will
+            produce a more complete dictionary, with email_to, ...
+        """
+        # generate the composer email
+        values = self.generate_email_for_composer(cr, uid, wizard.template_id, res_id, context=context)
+        # get values to return
+        email_dict = super(mail_compose_message, self).render_message(cr, uid, wizard, res_id, context)
+        email_dict.update(values)
+        return email_dict
 
-    # override the basic implementation 
     def render_template(self, cr, uid, template, model, res_id, context=None):
         return self.pool.get('email.template').render_template(cr, uid, template, model, res_id, context=context)
 
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 0d4362d350e..5afaf9745e1 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -8,47 +8,26 @@
             <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//form/footer/button" position="before">
-                        <field name="use_template" invisible="1"/>
-                        <button icon="gtk-paste" type="object" name="template_toggle"
-                                string="" help="Use a message template" />
-                        <button icon="gtk-save" type="object" name="save_as_template"
-                                string="" help="Save as a new template"/>
+                    <xpath expr="//field[@name='content_subtype']" position="after">
+                        <field name="use_template" invisible="1"
+                            on_change="onchange_use_template(use_template, template_id, composition_mode, model, res_id, context)"/>
                     </xpath>
-                    <xpath expr="//form/notebook" position="after">
-                        <group attrs="{'invisible':[('use_template','=',False)]}" colspan="4" col="4">
-                            <field name="template_id" colspan="3"
-                                   on_change="on_change_template(use_template, template_id, email_from, email_to, context)"/>
+                    <xpath expr="//footer" position="inside">
+                        <group class="oe_right" col="1">
+                            <div attrs="{'invisible':[('use_template','=',False)]}">Use template
+                                <field name="template_id" attrs="{'invisible':[('use_template','=',False)]}"
+                                    nolabel="1"
+                                    on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
+                            </div>
+                            <button icon="/email_template/static/src/img/email_template_save.png"
+                                type="object" name="save_as_template" string="Save as new template" class="oe_link"
+                                help="Save as a new template"
+                                attrs="{'invisible':[('content_subtype','!=','html')]}"/>
                         </group>
                     </xpath>
                 </data>
             </field>
         </record>
 
-        <record model="ir.ui.view" id="email_compose_message_wizard_inherit_form_chatter">
-            <field name="name">mail.compose.message.form</field>
-            <field name="model">mail.compose.message</field>
-            <field name="inherit_id" ref="mail.email_compose_message_wizard_form_chatter"/>
-            <field name="arch" type="xml">
-                <data>
-                    <xpath expr="//field[@name='dest_partner_ids']" position="after">
-                        <field name="use_template" colspan="2" nolabel="1" invisible="1"
-                            on_change="onchange_use_template(use_template, context)"/>
-                        <field name="template_id" colspan="2" nolabel="1"
-                            attrs="{'invisible':[('use_template','=',False)]}"
-                            on_change="on_change_template(use_template, template_id, False, False, context)"/>
-                    </xpath>
-                    <xpath expr="//a[@class='oe_mail_compose_message_checklist']" position="before">
-                        <button icon="/email_template/static/src/img/email_template.png"
-                            type="object" name="template_toggle" string=""
-                            help="Use a message template"/>
-                        <button icon="/email_template/static/src/img/email_template_save.png"
-                            type="object" name="save_as_template" string=""
-                            help="Save as a new template"/>
-                    </xpath>
-                </data>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 46eb9759ec2..aa9f209df88 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -25,34 +25,33 @@
     'name': 'Events Organisation',
     'version': '0.1',
     'category': 'Tools',
-    'summary': 'For Trainings, Conferences & Meetings',
+    'summary': 'Trainings, Conferences, Meetings, Exhibitions, Registrations',
     'description': """
 Organization and management of Events.
 ======================================
 
-This module allows you
-    * to manage your events and their registrations
-    * to use emails to automatically confirm and send acknowledgements for any
-      registration to an event
+The event module allows you to efficiently organise events and all related tasks: planification, registration tracking,
+attendances, etc.
 
-Note that:
-    - You can define new types of events in
-        Events/Configuration/Types of Events
+Key Features
+------------
+* Manage your Events and Registrations
+* Use emails to automatically confirm and send acknowledgements for any event registration
 """,
     'author': 'OpenERP SA',
-    'depends': ['base_setup', 'board', 'email_template', 'google_map'],
-    'init_xml': [],
-    'update_xml': [
+    'depends': ['base_setup', 'board', 'email_template'],
+    'data': [
         'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_view.xml',
         'event_view.xml',
+        'event_data.xml',
         'report/report_event_registration_view.xml',
         'board_association_view.xml',
         'res_partner_view.xml',
         'email_template.xml',
     ],
-    'demo_xml': ['event_demo.xml'],
+    'demo': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index b38a78afac9..4f4fbd05109 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -50,7 +50,6 @@
                     <board style="2-1">
                         <column>
                             <action string="Next Events" name="%(act_event_view)d"/>
-                            <action string="New Registrations" name="%(act_event_view_registration)d"/>
                         </column>
                         <column>
                             <action string="Events Filling By Status" name="%(act_event_reg)d"/>
diff --git a/addons/event/email_template.xml b/addons/event/email_template.xml
index 2666ece9921..95ffbf46d8d 100644
--- a/addons/event/email_template.xml
+++ b/addons/event/email_template.xml
@@ -7,15 +7,12 @@
         <field name="email_from" >${object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com'}</field>
         <field name="email_to" >${object.email}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>
-        <field name="body_text">
-        hello ${object.name},
-
-        The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin} to ${object.event_id.date_end}. For any further information please contact our event department.
-
-        we thank you for your participation
-
-        best regards
-        </field>
+        <field name="body_html"><![CDATA[
+        <p>Hello ${object.name},</p>
+        <p>The event ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin} to ${object.event_id.date_end}.
+        For any further information please contact our event department.</p>
+        <p>Thank you for your participation!</p>
+        <p>Best regards</p>]]></field>
         </record>
 
     </data>
@@ -27,15 +24,12 @@
         <field name="email_from" >${object.user_id.email or object.company_id.email or 'noreply@' + object.company_id.name + '.com'}</field>
         <field name="email_to" >${object.email}</field>
         <field name="subject">Your registration at ${object.event_id.name}</field>
-        <field name="body_text">
-        hello ${object.name},
-
-        We confirm you that your registration to the event ${object.event_id.name} has been recorded. You will automatically receive an email providing you more practical information (such as the schedule, the plan...) as soon as the event will be confirmed to be held.
-
-        we thank you for your participation
-
-        best regards
-        </field>
+        <field name="body_html"><![CDATA[
+        <p>Hello ${object.name},</p>
+        <p>We confirm that your registration to the event ${object.event_id.name} has been recorded.
+        You will automatically receive an email providing you more practical information (such as the schedule, the agenda...) as soon as the event is confirmed.</p>
+        <p>Thank you for your participation!</p>
+        <p>Best regards</p>]]></field>
         </record>
 
         <!-- Default Values -->
diff --git a/addons/event/event.py b/addons/event/event.py
index 7f0c77661e4..b79d86ea35e 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -19,10 +19,9 @@
 #
 ##############################################################################
 
-import time
+from datetime import datetime, timedelta
 from osv import fields, osv
 from tools.translate import _
-import decimal_precision as dp
 from openerp import SUPERUSER_ID
 
 class event_type(osv.osv):
@@ -39,8 +38,8 @@ class event_type(osv.osv):
     }
     _defaults = {
         'default_registration_min': 0,
-        'default_registration_max':0,
-        }
+        'default_registration_max': 0,
+    }
 
 event_type()
 
@@ -49,11 +48,15 @@ class event_event(osv.osv):
     _name = 'event.event'
     _description = __doc__
     _order = 'date_begin'
-    _inherit = ['ir.needaction_mixin','mail.thread']
+    _inherit = ['mail.thread','ir.needaction_mixin']
 
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
-              return []
+            return []
+
+        if isinstance(ids, (long, int)):
+            ids = [ids]
+
         res = []
         for record in self.browse(cr, uid, ids, context=context):
             date = record.date_begin.split(" ")[0]
@@ -99,7 +102,6 @@ class event_event(osv.osv):
         return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     def check_registration_limits(self, cr, uid, ids, context=None):
-        register_pool = self.pool.get('event.registration')
         for self.event in self.browse(cr, uid, ids, context=context):
             total_confirmed = self.event.register_current
             if total_confirmed < self.event.register_min or total_confirmed > self.event.register_max and self.event.register_max!=0:
@@ -109,7 +111,7 @@ class event_event(osv.osv):
         for event in self.browse(cr, uid, ids, context=context):
             available_seats = event.register_avail
             if available_seats and no_of_registration > available_seats:
-                 raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
+                raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
             elif available_seats == 0:
                 raise osv.except_osv(_('Warning!'),_("No Tickets Available!"))
 
@@ -139,7 +141,6 @@ class event_event(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: Dictionary of function fields value.
         """
-        register_pool = self.pool.get('event.registration')
         res = {}
         for event in self.browse(cr, uid, ids, context=context):
             res[event.id] = {}
@@ -200,13 +201,15 @@ class event_event(osv.osv):
             ('confirm', 'Confirmed'),
             ('done', 'Done')],
             'Status', 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\'.'),
+            help='If event is created, the status is \'Draft\'.If event is confirmed for the particular dates the status is set to \'Confirmed\'. If the event is over, the status is set to \'Done\'.If event is cancelled the status is set to \'Cancelled\'.'),
         'email_registration_id' : fields.many2one('email.template','Registration Confirmation Email', help='This field contains the template of the mail that will be automatically sent each time a registration for this event is confirmed.'),
         'email_confirmation_id' : fields.many2one('email.template','Event Confirmation Email', help="If you set an email template, each participant will receive this email announcing the confirmation of the event."),
         'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."),
         'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."),
         'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}),
         'street': fields.related('address_id','street',type='char',string='Street'),
+        'street2': fields.related('address_id','street2',type='char',string='Street2'),
+        'state_id': fields.related('address_id','state_id',type='many2one', relation="res.country.state", string='State'),
         'zip': fields.related('address_id','zip',type='char',string='zip'),
         'city': fields.related('address_id','city',type='char',string='city'),
         'speaker_confirmed': fields.boolean('Speaker Confirmed', readonly=False, states={'done': [('readonly', True)]}),
@@ -221,6 +224,7 @@ class event_event(osv.osv):
         '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 subscribe_to_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
@@ -250,6 +254,7 @@ class event_event(osv.osv):
     _constraints = [
         (_check_closing_date, 'Error ! Closing Date cannot be set before Beginning Date.', ['date_end']),
     ]
+
     def onchange_event_type(self, cr, uid, ids, type_event, context=None):
         if type_event:
             type_info =  self.pool.get('event.type').browse(cr,uid,type_event,context)
@@ -262,33 +267,58 @@ class event_event(osv.osv):
             }
             return {'value': dic}
 
+    def on_change_address_id(self, cr, uid, ids, address_id, context=None):
+        values = {}
+        if not address_id:
+            return values
+        address = self.pool.get('res.partner').browse(cr, uid, address_id, context=context)
+        values.update({
+            'street' : address.street,
+            'street2' : address.street2,
+            'city' : address.city,
+            'country_id' : address.country_id and address.country_id.id or False,
+            'state_id' : address.state_id and address.state_id.id or False,
+            'zip' : address.zip,
+        })
+        return {'value' : values}
+
+    def onchange_start_date(self, cr, uid, ids, date_begin=False, date_end=False, context=None):
+        res = {'value':{}}
+        if date_end:
+            return res
+        if date_begin and isinstance(date_begin, str):
+            date_begin = datetime.strptime(date_begin, "%Y-%m-%d %H:%M:%S")
+            date_end = date_begin + timedelta(hours=1)
+            res['value'] = {'date_end': date_end.strftime("%Y-%m-%d %H:%M:%S")}
+        return res
+
     # ----------------------------------------
     # OpenChatter methods and notifications
     # ----------------------------------------
 
     def create_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been <b>created</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def button_cancel_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been <b>cancelled</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def button_draft_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been set to <b>draft</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def button_done_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been <b>done</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def button_confirm_send_note(self, cr, uid, ids, context=None):
         message = _("Event has been <b>confirmed</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
 event_event()
@@ -300,7 +330,7 @@ class event_registration(osv.osv):
     _inherit = ['ir.needaction_mixin','mail.thread']
     _columns = {
         'id': fields.integer('ID'),
-        'origin': fields.char('Source', size=124,readonly=True,help="Name of the sale order which create the registration"),
+        'origin': fields.char('Source Document', size=124,readonly=True,help="Name of the sale order which create the registration"),
         'nb_register': fields.integer('Number of Participants', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'event_id': fields.many2one('event.event', 'Event', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'partner_id': fields.many2one('res.partner', 'Partner', states={'done': [('readonly', True)]}),
@@ -308,7 +338,7 @@ class event_registration(osv.osv):
         'date_closed': fields.datetime('Attended Date', readonly=True),
         'date_open': fields.datetime('Registration Date', readonly=True),
         'reply_to': fields.related('event_id','reply_to',string='Reply-to Email', type='char', size=128, readonly=True,),
-        'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('email_from', '=', False),('model','=',_name)]),
+        'log_ids': fields.one2many('mail.message', 'res_id', 'Logs', domain=[('model','=',_name)]),
         'event_end_date': fields.related('event_id','date_end', type='datetime', string="Event End Date", readonly=True),
         'event_begin_date': fields.related('event_id', 'date_begin', type='datetime', string="Event Start Date", readonly=True),
         'user_id': fields.many2one('res.users', 'User', states={'done': [('readonly', True)]}),
@@ -322,7 +352,6 @@ class event_registration(osv.osv):
         'phone': fields.char('Phone', size=64),
         'name': fields.char('Name', size=128, select=True),
     }
-
     _defaults = {
         'nb_register': 1,
         'state': 'draft',
@@ -334,8 +363,10 @@ class event_registration(osv.osv):
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
     def confirm_registration(self, cr, uid, ids, context=None):
-        self.message_append(cr, uid, ids,_('State set to open'),body_text= _('Open'))
-        return self.write(cr, uid, ids, {'state': 'open'}, context=context)
+        for reg in self.browse(cr, uid, ids, context=context or {}):
+            self.pool.get('event.event').message_post(cr, uid, [reg.event_id.id], body=_('New registration confirmed: %s.') % (reg.name or '', ),subtype="event.mt_event_registration", context=context)
+        self.message_post(cr, uid, ids, body=_('Registration confirmed.'), context=context)
+        return self.write(cr, uid, ids, {'state': 'open'},context=context)
 
     def create(self, cr, uid, vals, context=None):
         obj_id = super(event_registration, self).create(cr, uid, vals, context)
@@ -364,13 +395,13 @@ class event_registration(osv.osv):
             if today >= registration.event_id.date_begin:
                 values = {'state': 'done', 'date_closed': today}
                 self.write(cr, uid, ids, values)
-                self.message_append(cr, uid, ids, _('State set to Done'), body_text=_('Done'))
+                self.message_post(cr, uid, ids, body=_('State set to Done'), context=context)
             else:
-                raise osv.except_osv(_('Error!'),_("You must wait for the starting day of the event to do this action.") )
+                raise osv.except_osv(_('Error!'), _("You must wait for the starting day of the event to do this action."))
         return True
 
     def button_reg_cancel(self, cr, uid, ids, context=None, *args):
-        self.message_append(cr, uid, ids,_('State set to Cancel'),body_text= _('Cancel'))
+        self.message_post(cr, uid, ids, body=_('State set to Cancel'), context=context)
         return self.write(cr, uid, ids, {'state': 'cancel'})
 
     def mail_user(self, cr, uid, ids, context=None):
@@ -407,22 +438,6 @@ class event_registration(osv.osv):
             'phone':contact_id.phone,
             }}
 
-    def onchange_event(self, cr, uid, ids, event_id, context=None):
-        """This function returns value of Product Name, Unit Price based on Event.
-        """
-        if context is None:
-            context = {}
-        if not event_id:
-            return {}
-        event_obj = self.pool.get('event.event')
-        data_event =  event_obj.browse(cr, uid, event_id, context=context)
-        return {'value':
-                    {'event_begin_date': data_event.date_begin,
-                     'event_end_date': data_event.date_end,
-                     'company_id': data_event.company_id and data_event.company_id.id or False,
-                    }
-               }
-
     def onchange_partner_id(self, cr, uid, ids, part, context=None):
         res_obj = self.pool.get('res.partner')
         data = {}
@@ -440,12 +455,12 @@ class event_registration(osv.osv):
 
     def create_send_note(self, cr, uid, ids, context=None):
         message = _("Registration has been <b>created</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def do_draft_send_note(self, cr, uid, ids, context=None):
         message = _("Registration has been set as <b>draft</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
 event_registration()
diff --git a/addons/event/event_data.xml b/addons/event/event_data.xml
index d8d75950bcc..47efca17d6d 100644
--- a/addons/event/event_data.xml
+++ b/addons/event/event_data.xml
@@ -7,18 +7,24 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('event.event_main_menu')}"/>
         </record>
-        <record id="todo_open_event_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_event_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
+        </record>
+
+        <!-- mail: event subtype -->
+        <record id="event.mt_event_registration" model="mail.message.subtype">
+            <field name="name">New Registrations</field>
+            <field name="res_model">event.event</field>
+            <field name="default" eval="False"/>
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
+        <function model="mail.group" name="message_post">
             <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
             <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Events Organisation has been installed</value>
             <value>From the top menu Events, you can organize events, manage registrations, automate communication around your event and sell events through your quotations.</value>
+            <value>Module Events has been installed</value>
         </function>
     </data>
 </openerp>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 27829129c15..696c0e2876b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -2,21 +2,20 @@
 <openerp>
     <data>
 
-        <act_window
-            id="act_event_list_register_event"
-            name="Registration"
-            res_model="event.registration"
-            src_model="event.event"
-            view_mode="calendar,tree,form,graph"
-            context="{'search_default_event_id': active_id, 'default_event_id': active_id}"
-            view_type="form"/>
+        <record id="act_event_list_register_event" model="ir.actions.act_window">
+            <field name="res_model">event.registration</field>
+            <field name="view_type">form</field>
+            <field name="name">Registrations</field>
+            <field name="view_mode">calendar,tree,form,graph</field>
+            <field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id}</field>
+        </record>
 
         <!-- Top menu item -->
         <menuitem name="Events"
             id="event_main_menu"
             groups="base.group_user"
             sequence="80"/>
-        <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu"/>
+        <menuitem name="Events Organization" id="base.menu_event_main" parent="event_main_menu"/>
 
         <!-- EVENTS  -->
 
@@ -65,7 +64,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_event"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_event_event_unread" model="ir.values">
             <field name="name">action_event_event_unread</field>
@@ -83,7 +82,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_event"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_event_event_read" model="ir.values">
             <field name="name">action_event_event_read</field>
@@ -101,62 +100,72 @@
             <field name="arch" type="xml">
                 <form string="Events" version="7.0">
                     <header>
-                        <span groups="base.user_group">
-                            <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight"/>
-                            <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight"/>
-                            <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" />
-                            <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
-                        </span>
+                        <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight" groups="base.group_user"/>
+                        <button string="Finish Event" name="button_done" states="confirm" type="object" class="oe_highlight" groups="base.group_user"/>
+                        <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" groups="base.group_user"/>
+                        <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" groups="base.group_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button name="%(event.act_event_list_register_event)d" type="action" string="Registration" icon="gtk-index" help="Register with this event"/>
+                            <button name="%(event.act_event_list_register_event)d" type="action" string="Registrations" help="Register with this event"/>
                         </div>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
                         </div>
-                        <div>
-                            <h2>From <field name="date_begin" class="oe_inline" /> to <field name="date_end" class="oe_inline"/>
-                            </h2>
+                        <group>
                             <group>
-                                <group>
-                                    <label for="address_id" string="Location Address"/>
-                                    <div>
-                                        <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_google_map'}"/>
-                                        <field name="street" placeholder="Street..."/>
-                                        <div>
-                                            <field name="zip" class="oe_inline" placeholder="Zip"/>
-                                            <field name="city" class="oe_inline" placeholder="City"/>
-                                        </div>
-                                    </div>
-                                </group>
-                                <group>
-                                    <field name="type" on_change="onchange_event_type(type,context)"/>
-                                    <field name="register_min"/>
-                                    <field name="register_max"/>
-                                    <label for="register_current" string="Current Registrations" groups="base.group_user"/>
-                                    <div groups="base.group_user">
-                                       Confirmed: <field name="register_current" class="oe_inline"/>, Unconfirmed: <field name="register_prospect" class="oe_inline"/>
-                                    </div>
-                                </group>
+                                <label for="address_id" string="Location"/>
+                                   <div>
+                                       <field name="address_id" on_change="on_change_address_id(address_id)" />
+                                       <field name="street" placeholder="Street..."/>
+                                       <field name="street2"/>
+                                       <div class="address_format">
+                                           <field name="city" placeholder="City" style="width: 40%%"/>
+                                           <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": true}'/>
+                                           <field name="zip" placeholder="ZIP" style="width: 20%%"/>
+                                       </div>    
+                                       <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
+                                   </div>
                             </group>
-                        </div>
-                        <!-- <div class="oe_right" style="height: 200px"></div> -->
+                            <group>
+                                <field name="type" on_change="onchange_event_type(type,context)" />
+                                <field name="date_begin" on_change="onchange_start_date(date_begin,date_end)"/>
+                                <field name="date_end"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
+                            </group>
+                        </group>
                         <notebook>
+                            <page string="Email Configuration" groups="base.group_no_one">
+                                <group>
+                                    <field name="reply_to"/>
+                                    <group>
+                                        <field name="email_registration_id"/>
+                                    </group>
+                                    <group>
+                                        <field name="email_confirmation_id"/>
+                                    </group>
+                                </group>
+                            </page>
                             <page string="Event Description">
                                 <field name="note" colspan="4" nolabel="1"/>
                             </page>
-                            <page string="Internal Data">
+                            <page string="Registrations">
                                 <group>
+                                    <group>
+                                        <field name="register_min"/>
+                                        <field name="register_max"/>
+                                        <label for="register_current" string="Current Registrations" groups="base.group_user"/>
+                                        <div groups="base.group_user">
+                                             <field name="register_prospect" class="oe_inline"/> (confirmed: <field name="register_current" class="oe_inline"/>)
+                                        </div>
+                                        <field name="register_attended"/>
+                                    </group>
                                     <group>
                                         <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
                                         <field name="speaker_confirmed"/>
                                     </group>
-                                    <group>
-                                        <field name="register_attended"/>
-                                    </group>
                                 </group>
                                 <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                                     <tree string="Registration" editable="top">
@@ -166,7 +175,7 @@
                                         <field name="nb_register" />
                                         <field name="state"/>
                                         <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
                                         <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
                                     </tree>
                                     <form string="Registration">
@@ -195,8 +204,8 @@
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                     </div>
                 </form>
             </field>
@@ -208,18 +217,18 @@
             <field name="name">event.event.tree</field>
             <field name="model">event.event</field>
             <field name="arch" type="xml">
-                <tree string="Events" fonts="bold:needaction_pending==True" colors="red:(register_min and register_min&gt;register_current) or (register_max and register_max&lt;register_current);grey:state=='cancel'">
+                <tree string="Events" fonts="bold:message_unread==True" colors="red:(register_min and register_min&gt;register_current) or (register_max and register_max&lt;register_current);grey:state=='cancel'">
                     <field name="name" string="Name"/>
-                    <field name="type"/>
+                    <field name="type" string="Event Category"/>
                     <field name="date_begin"/>
                     <field name="date_end"/>
                     <field name="register_current"/>
                     <field name="register_min"/>
                     <field name="register_max" invisible="1"/>
-                    <field name="main_speaker_id" groups="base.extended"/>
+                    <field name="main_speaker_id" groups="base.group_no_one"/>
                     <field name="user_id"/>
                     <field name="state"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -244,42 +253,42 @@
                     <templates>
                     <t t-name="kanban-box">
                       <div class="oe_module_vignette">
-                        <a type="edit" class="oe_module_icon">
-                           <div class="oe_event_date "><t t-esc="record.date_begin.raw_value.getDate()"/></div>
-                           <div class="oe_event_month_year">
-                             <t t-esc="record.date_begin.raw_value.toString('MMM')"/>
-                             <t t-esc="record.date_begin.raw_value.getFullYear()"/>
-                           </div>
-                           <div class="oe_event_time"><t t-esc="record.date_begin.raw_value.toString('hh:mm tt')"/></div>
+                        <a type="open" class="oe_module_icon">
+                            <div class="oe_event_date "><t t-esc="record.date_begin.raw_value.getDate()"/></div>
+                            <div class="oe_event_month_year">
+                                <t t-esc="record.date_begin.raw_value.toString('MMM')"/>
+                                <t t-esc="record.date_begin.raw_value.getFullYear()"/>
+                            </div>
+                            <div class="oe_event_time"><t t-esc="record.date_begin.raw_value.toString('hh:mm tt')"/></div>
                         </a>
                         <div class="oe_module_desc">
-                            <h4><a type="edit"><field name="name"/></a></h4>
+                            <h4><a type="open"><field name="name"/></a></h4>
                             <p>
                               <t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
                               <t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>
                               <t t-if="record.register_avail.raw_value lte 10 and record.register_avail.raw_value gt 0"><i>Only</i></t>
-                              <t t-if="record.register_avail.raw_value == 0"><i>No ticket available.</i></t>
-                              <t t-if="record.register_avail.raw_value != 0">
+                              <t t-if="record.register_avail.raw_value == 9999"><i>No ticket available.</i></t>
+                              <t t-if="record.register_avail.raw_value != 9999">
                                 <i><b><t t-if="record.register_avail.raw_value != 9999"><field name="register_avail"/></t></b></i>
                                 <i>
                                     <t t-if="record.register_avail.raw_value > 1">tickets </t>
-                                    <t t-if="record.register_avail.raw_value == 1 || !record.register_avail.raw_value > 1">ticket </t>
+                                    <t t-if="record.register_avail.raw_value lte 1">ticket </t>
                                     available.
                                 </i>
                               </t>
                             </p>
-                            <t t-if="record.register_avail.raw_value != 0">
+                            <t t-if="record.register_avail.raw_value gt 0 and record.register_avail.raw_value lt 9999">
                               <t t-if="!record.is_subscribed.raw_value">
-                                  <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
-                                  <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_mail_button_follow">
-                                  <span >Subscribe</span>
-                                  </button>
+                                <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
+                                <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_subscribe_button">
+                                    <span >Subscribe</span>
+                                </button>
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
-                              <button type="object" name="unsubscribe_to_event" class="oe_mail_button_unfollow">
+                              <button type="object" name="unsubscribe_to_event" class="oe_unsubscribe_button ">
                                 <span>Subscribed</span>
-                                <span class="unsubscribe">Unsubscribe</span>
+                                <span class="oe_unsubscribe">Unsubscribe</span>
                               </button>
                             </t>
                         </div>
@@ -304,20 +313,6 @@
             </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>
-            <field name="arch" type="xml">
-                <graph string="Event by Registration" type="bar" orientation="horizontal">
-                    <field name="name"/>
-                    <field name="register_current" operator="+"/>
-                    <field name="register_prospect" operator="+"/>
-                </graph>
-            </field>
-        </record>
-
         <!-- Event Search View -->
 
         <record model="ir.ui.view" id="view_event_search">
@@ -326,7 +321,7 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <field name="name" string="Events"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Unconfirmed" name="draft" domain="[('state','=','draft')]" help="Events in New state"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed events"/>
@@ -353,7 +348,7 @@
            <field name="type">ir.actions.act_window</field>
            <field name="res_model">event.event</field>
            <field name="view_type">form</field>
-           <field name="view_mode">kanban,calendar,tree,form,graph</field>
+           <field name="view_mode">kanban,calendar,tree,form</field>
            <field name="context">{"search_default_upcoming":1}</field>
            <field name="search_view_id" ref="view_event_search"/>
            <field name="help" type="html">
@@ -387,7 +382,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_registration"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_event_registration_unread" model="ir.values">
             <field name="name">action_event_registration_unread</field>
@@ -405,7 +400,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_event_registration"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_event_registration_read" model="ir.values">
             <field name="name">action_event_registration_read</field>
@@ -421,7 +416,7 @@
             <field name="name">event.registration.tree</field>
             <field name="model">event.registration</field>
             <field name="arch" type="xml">
-                <tree string="Registration" fonts="bold:needaction_pending==True">
+                <tree string="Registration" fonts="bold:message_unread==True">
                     <field name="create_date"/>
                     <field name="partner_id"/>
                     <field name="name"/>
@@ -431,7 +426,7 @@
                     <field name="user_id"/>
                     <field name="origin"/>
                     <field name="state"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -451,7 +446,7 @@
                     <sheet string="Registration">
                         <label for="event_id" class="oe_edit_only"/>
                         <h1>
-                            <field name="event_id" on_change="onchange_event(event_id, context)" domain="[('state','in',('draft','confirm'))]"/>
+                            <field name="event_id" domain="[('state','in',('draft','confirm'))]"/>
                         </h1>
                         <group>
                             <group>
@@ -477,8 +472,8 @@
                         </group>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread" placeholder="Share a note..."/>
                     </div>
                 </form>
             </field>
@@ -515,8 +510,8 @@
             <field name="model">event.registration</field>
             <field name="arch" type="xml">
                 <search string="Event Registration">
-                    <field name="name" string="Participant" filter_domain="['|','|','|',('name','ilike',self),('partner_id','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <field name="name" string="Participant" filter_domain="['|','|',('name','ilike',self),('email','ilike',self),('origin','ilike',self)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="New" name="draft" domain="[('state','=','draft')]" help="Registrations in unconfirmed state"/>
                     <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','open')]" help="Confirmed registrations"/>
@@ -524,6 +519,7 @@
                     <filter icon="terp-personal" string="My Registrations" help="My Registrations" domain="[('user_id','=',uid)]"/>
                     <field name="event_id"/>
                     <field name="user_id"/>
+                    <field name="partner_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Responsible"  icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
diff --git a/addons/event/i18n/ar.po b/addons/event/i18n/ar.po
index 8af34665360..a8ebfa883c7 100644
--- a/addons/event/i18n/ar.po
+++ b/addons/event/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/bg.po b/addons/event/i18n/bg.po
index 834bebd22dc..7053fbe63f7 100644
--- a/addons/event/i18n/bg.po
+++ b/addons/event/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/bs.po b/addons/event/i18n/bs.po
index fa241378b70..1dba312106a 100644
--- a/addons/event/i18n/bs.po
+++ b/addons/event/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/ca.po b/addons/event/i18n/ca.po
index a082283cc1b..506b486eb9f 100644
--- a/addons/event/i18n/ca.po
+++ b/addons/event/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/cs.po b/addons/event/i18n/cs.po
index fb8a6d11a84..884e0449046 100644
--- a/addons/event/i18n/cs.po
+++ b/addons/event/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: event
diff --git a/addons/event/i18n/da.po b/addons/event/i18n/da.po
index 14264ec0f60..0f90973d444 100644
--- a/addons/event/i18n/da.po
+++ b/addons/event/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/de.po b/addons/event/i18n/de.po
index dfa18ce67e1..b07fe08bef9 100644
--- a/addons/event/i18n/de.po
+++ b/addons/event/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/el.po b/addons/event/i18n/el.po
index c605a2d6538..a924b41348b 100644
--- a/addons/event/i18n/el.po
+++ b/addons/event/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/es.po b/addons/event/i18n/es.po
index c043bb290da..d5506aae732 100644
--- a/addons/event/i18n/es.po
+++ b/addons/event/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/es_AR.po b/addons/event/i18n/es_AR.po
index 975ae48fe07..a1e17eb50e7 100644
--- a/addons/event/i18n/es_AR.po
+++ b/addons/event/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/es_CR.po b/addons/event/i18n/es_CR.po
index 56f27a9761b..bafdf344482 100644
--- a/addons/event/i18n/es_CR.po
+++ b/addons/event/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: event
diff --git a/addons/event/i18n/es_EC.po b/addons/event/i18n/es_EC.po
index fa694ae3056..f302c1dcb6d 100644
--- a/addons/event/i18n/es_EC.po
+++ b/addons/event/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/et.po b/addons/event/i18n/et.po
index dd8bbad6cb4..428b95cdec5 100644
--- a/addons/event/i18n/et.po
+++ b/addons/event/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/fi.po b/addons/event/i18n/fi.po
index 841fff990bb..a40f701f93d 100644
--- a/addons/event/i18n/fi.po
+++ b/addons/event/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/fr.po b/addons/event/i18n/fr.po
index 2271f7712f0..e356348b04c 100644
--- a/addons/event/i18n/fr.po
+++ b/addons/event/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/gu.po b/addons/event/i18n/gu.po
index 61924d4b2a7..8ded3d38426 100644
--- a/addons/event/i18n/gu.po
+++ b/addons/event/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/hi.po b/addons/event/i18n/hi.po
index 1e533115d51..82a8b0aca19 100644
--- a/addons/event/i18n/hi.po
+++ b/addons/event/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/hr.po b/addons/event/i18n/hr.po
index 22c96eb3d25..06e17e07d9d 100644
--- a/addons/event/i18n/hr.po
+++ b/addons/event/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/hu.po b/addons/event/i18n/hu.po
index a533f8a6814..b8f84ea567f 100644
--- a/addons/event/i18n/hu.po
+++ b/addons/event/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/id.po b/addons/event/i18n/id.po
index 94cfd2e47ae..bf524a95eb8 100644
--- a/addons/event/i18n/id.po
+++ b/addons/event/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/it.po b/addons/event/i18n/it.po
index efbabde64c9..a240feebd65 100644
--- a/addons/event/i18n/it.po
+++ b/addons/event/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/ja.po b/addons/event/i18n/ja.po
index 10960bb1dcf..6cb70bb2b72 100644
--- a/addons/event/i18n/ja.po
+++ b/addons/event/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/ko.po b/addons/event/i18n/ko.po
index 80a8f0648d6..42a096adee3 100644
--- a/addons/event/i18n/ko.po
+++ b/addons/event/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/lt.po b/addons/event/i18n/lt.po
index 0f474a8ac2f..3abc4c99936 100644
--- a/addons/event/i18n/lt.po
+++ b/addons/event/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
@@ -1263,3 +1263,15 @@ msgstr ""
 
 #~ msgid "Configuration"
 #~ msgstr "Nustatymai"
+
+#~ msgid "Error ! You cannot create recursive sections."
+#~ msgstr "Klaida! Negalite kurti rekursinių sekcijų."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Netinkamas XML peržiūros strūkturai!"
+
+#~ 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ų !"
diff --git a/addons/event/i18n/mn.po b/addons/event/i18n/mn.po
index 7fa5b2d43f6..74637d73421 100644
--- a/addons/event/i18n/mn.po
+++ b/addons/event/i18n/mn.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-18 08:15+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-24 09:26+0000\n"
+"Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
@@ -25,34 +25,34 @@ msgstr "Нэхэмжлэлийн мэдээлэл"
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event Details"
-msgstr ""
+msgstr "Үйл явдалын дэлгэрэнгүй"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
 msgid "Main Speaker"
-msgstr ""
+msgstr "Үндсэн илтгэгч"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Group By..."
-msgstr ""
+msgstr "Бүлэглэх..."
 
 #. module: event
 #: field:event.event,register_min:0
 msgid "Minimum Registrations"
-msgstr ""
+msgstr "Хамгийн бага бүртгэл"
 
 #. module: event
 #: model:ir.model,name:event.model_event_confirm_registration
 msgid "Confirmation for Event Registration"
-msgstr ""
+msgstr "Үйл явдлын бүртгэлийн магадлан"
 
 #. module: event
 #: field:event.registration.badge,title:0
 msgid "Title"
-msgstr ""
+msgstr "Гарчиг"
 
 #. module: event
 #: field:event.event,mail_registr:0
@@ -62,7 +62,7 @@ msgstr "Бүртгүүлсэн е-майл"
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_confirm_registration
 msgid "Make Invoices"
-msgstr ""
+msgstr "Нэхэмжлэл үүсгэх"
 
 #. module: event
 #: view:event.event:0
@@ -73,12 +73,12 @@ msgstr "Бүртгүүлсэн огноо"
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr ""
+msgstr "_Хаах"
 
 #. module: event
 #: model:event.event,name:event.event_0
 msgid "Concert of Bon Jovi"
-msgstr ""
+msgstr "Bon Jovi-н концерт"
 
 #. module: event
 #: view:report.event.registration:0
@@ -88,7 +88,7 @@ msgstr "Зөвхөн бүртгүүлсэн үнийн нэхэмжлэл"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr ""
+msgstr "3-р сар"
 
 #. module: event
 #: field:event.event,mail_confirm:0
@@ -98,13 +98,13 @@ msgstr "Батлагдсан е-майл"
 #. module: event
 #: field:event.registration,nb_register:0
 msgid "Quantity"
-msgstr ""
+msgstr "Тоо хэмжээ"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:63
 #, python-format
 msgid "Registration doesn't have any partner to invoice."
-msgstr ""
+msgstr "Бүртгэлд нэхэмжлэх харилцагч алга байна."
 
 #. module: event
 #: field:event.event,company_id:0
@@ -112,17 +112,17 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Компани"
 
 #. module: event
 #: field:event.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Нэхэмжилсэн огноо"
 
 #. module: event
 #: help:event.event,pricelist_id:0
 msgid "Pricelist version for current event."
-msgstr ""
+msgstr "Одоогийн үйл явдлын үнийн жагсаалтын хувилбар"
 
 #. module: event
 #: code:addons/event/wizard/partner_event_registration.py:88
@@ -137,17 +137,17 @@ msgstr "Бүртгэгдсэн үйл ажиллагаа"
 #. module: event
 #: field:event.event,parent_id:0
 msgid "Parent Event"
-msgstr ""
+msgstr "Эцэг үйл явдал"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_make_invoices
 msgid "Make Invoice"
-msgstr ""
+msgstr "Нэхэмжлэл үүсгэх"
 
 #. module: event
 #: field:event.registration,price_subtotal:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Дэд дүн"
 
 #. module: event
 #: view:report.event.registration:0
@@ -157,12 +157,12 @@ msgstr "Үйл ажиллагааны бүртгэл"
 #. module: event
 #: help:event.event,reply_to:0
 msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
-msgstr ""
+msgstr "OpenERP-н илгээж байгаа имэйлийн 'Хариулах' дээр тавигдах имэйл"
 
 #. module: event
 #: view:event.registration:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Дотоод тэмдэглэл нэмэх"
 
 #. module: event
 #: view:event.event:0
@@ -185,17 +185,17 @@ msgstr "Үйл ажиллагааны анализ"
 #. module: event
 #: field:event.registration,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Зурвас"
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration_badge
 msgid "event.registration.badge"
-msgstr ""
+msgstr "event.registration.badge"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
 msgid "Mail Auto Confirm"
-msgstr ""
+msgstr "Мэйлийн Автомат Баталгаажуулалт"
 
 #. module: event
 #: model:product.template,name:event.event_product_1_product_template
@@ -214,12 +214,12 @@ msgstr "Үйл ажиллагааг батлах"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Цуцлагдсан"
 
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Хариулах"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.open_board_associations_manager
@@ -230,12 +230,12 @@ msgstr "Үйл ажиллагааг хянах самбар"
 #. module: event
 #: model:event.event,name:event.event_1
 msgid "Opera of Verdi"
-msgstr ""
+msgstr "Verdi-н дуурь"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "July"
-msgstr ""
+msgstr "7-р сар"
 
 #. module: event
 #: help:event.event,register_prospect:0
@@ -248,11 +248,13 @@ msgid ""
 "Check this box if you want to use automatic confirmation emailing or "
 "reminder."
 msgstr ""
+"Хэрвээ энийг сонгосон бол автоматаар имэйл баталгаажуулалт болон сануулгыг "
+"хэрэглэнэ."
 
 #. module: event
 #: field:event.registration,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Код"
 
 #. module: event
 #: help:event.event,date_end:0
@@ -263,24 +265,24 @@ msgstr "Хаагдсан үйл ажиллагааны огноо"
 #. module: event
 #: view:event.registration:0
 msgid "Emails"
-msgstr ""
+msgstr "Имэйлүүд"
 
 #. module: event
 #: view:event.registration:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Нэмэлт мэдээлэл"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:83
 #, python-format
 msgid "Customer Invoices"
-msgstr ""
+msgstr "Захиалагчийн нэхэмжлэл"
 
 #. module: event
 #: selection:event.event,state:0
 #: selection:report.event.registration,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Ноорог"
 
 #. module: event
 #: field:event.type,name:0
@@ -290,7 +292,7 @@ msgstr "Үйл ажиллагааны төрөл"
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr ""
+msgstr " Үйл ажиллагааны төрөл "
 
 #. module: event
 #: view:event.event:0
@@ -302,7 +304,7 @@ msgstr ""
 #: field:report.event.registration,event_id:0
 #: view:res.partner:0
 msgid "Event"
-msgstr ""
+msgstr "Үйл явдал"
 
 #. module: event
 #: view:event.registration:0
@@ -317,7 +319,7 @@ msgstr "Тэмдэг"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Батлагдсан"
 
 #. module: event
 #: view:event.confirm.registration:0
@@ -327,28 +329,28 @@ msgstr "Баталгаажсан бүртгэл"
 #. module: event
 #: view:event.event:0
 msgid "Events in New state"
-msgstr ""
+msgstr "Үйл ажиллагааын шинэ төлөв"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Confirm"
-msgstr ""
+msgstr "Батлах"
 
 #. module: event
 #: view:event.event:0
 #: field:event.event,speaker_ids:0
 msgid "Other Speakers"
-msgstr ""
+msgstr "Бусад илтгэгчид"
 
 #. module: event
 #: model:ir.model,name:event.model_event_make_invoice
 msgid "Event Make Invoice"
-msgstr ""
+msgstr "Үйл явдлын нэхэмжлэл үүсгэх"
 
 #. module: event
 #: help:event.registration,nb_register:0
 msgid "Number of Registrations or Tickets"
-msgstr ""
+msgstr "Бүртгэгсэд эсвэл Тасалбарын тоо"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:50
@@ -357,51 +359,51 @@ msgstr ""
 #: code:addons/event/wizard/event_make_invoice.py:62
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Анхааруулга !"
 
 #. module: event
 #: view:event.registration:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Шинэ имэйл илгээх"
 
 #. module: event
 #: help:event.event,register_min:0
 msgid "Provide Minimum Number of Registrations"
-msgstr ""
+msgstr "Хамгийн бага дугаарын бүртгэлүүд"
 
 #. module: event
 #: view:event.event:0
 msgid "Location"
-msgstr ""
+msgstr "Байрлал"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "New"
-msgstr ""
+msgstr "Шинэ"
 
 #. module: event
 #: field:event.event,register_current:0
 #: view:report.event.registration:0
 msgid "Confirmed Registrations"
-msgstr ""
+msgstr "Батлагдсан бүртгэлүүд"
 
 #. module: event
 #: field:event.event,mail_auto_registr:0
 msgid "Mail Auto Register"
-msgstr ""
+msgstr "Имэйлийн Автомат бүртгэл"
 
 #. module: event
 #: field:event.event,type:0
 #: field:partner.event.registration,event_type:0
 msgid "Type"
-msgstr ""
+msgstr "Төрөл"
 
 #. module: event
 #: field:event.registration,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "Имэйл"
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -410,33 +412,35 @@ msgid ""
 "subscribes to a confirmed event. This is also the email sent to remind "
 "someone about the event."
 msgstr ""
+"Үйл явдал батлагдахад эсвэл батлагдсан үйл явдалд хэн нэгэн бүртгүүлэхэд энэ "
+"имэйл илгээгдэнэ. Мөн үйл явдлыг сануулахад энэ имэйл илгээгдэнэ."
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "Нэхэмжлэх"
 
 #. module: event
 #: view:event.event:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Миний Борлуулалтын Баг"
 
 #. module: event
 #: code:addons/event/event.py:398
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Алдаа !"
 
 #. module: event
 #: field:event.event,name:0
 #: field:event.registration,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Хураангуй"
 
 #. module: event
 #: field:event.registration,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Үүсгэсэн Огноо"
 
 #. module: event
 #: view:event.event:0
@@ -449,17 +453,17 @@ msgstr "Цуцласан бүртгэл"
 #: code:addons/event/event.py:399
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "Бүртгэгдсэн харилцагчийн нэхэмжлэлийн хаяг байхгүй байна."
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in last month"
-msgstr "Сарын сүүлд нэмэгдсэн үйл ажиллагаа"
+msgstr "Сүүлийн сард үүсгэгдсэн үйл явдал"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current year"
-msgstr "Жилийн эхэнд нэмэгдсэн үйл ажиллагаа"
+msgstr "Энэ жил үүсгэгдсэг үйл явдал"
 
 #. module: event
 #: help:event.event,type:0
@@ -469,7 +473,7 @@ msgstr "Үйл ажиллагааны төрөл сонгох Семинар, Ү
 #. module: event
 #: view:event.registration:0
 msgid "Confirmed registrations"
-msgstr ""
+msgstr "Батлагдсан бүртгэлүүд"
 
 #. module: event
 #: view:event.event:0
@@ -479,29 +483,30 @@ msgstr "Үйл ажиллагааны бүтэц"
 #. module: event
 #: view:event.registration:0
 msgid "History Information"
-msgstr ""
+msgstr "Түүхийн мэдээлэл"
 
 #. module: event
 #: view:event.registration:0
 msgid "Dates"
-msgstr ""
+msgstr "Огноонууд"
 
 #. module: event
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 msgid "Confirm Anyway"
-msgstr ""
+msgstr "Ямартай ч батлах"
 
 #. module: event
 #: code:addons/event/wizard/event_confirm_registration.py:54
 #, python-format
 msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
 msgstr ""
+"Анхааруулга: '%s' үйл явдал нь хамгийн дээд хязгаартаа (%s) тулсан байна."
 
 #. module: event
 #: view:report.event.registration:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Сар-1    "
 
 #. module: event
 #: view:event.event:0
@@ -519,7 +524,7 @@ msgstr "Үйл ажиллагааны дугаар"
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who will be giving speech at the event."
-msgstr ""
+msgstr "Үйл явдал дээр илтгэл хийх илтгэгч"
 
 #. module: event
 #: help:event.event,state:0
@@ -528,17 +533,21 @@ msgid ""
 "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'."
 msgstr ""
+"Үйл явдал үүсгэгдсэн даруйдаа төлөв нь 'Ноорог' байдаг. Батлагдсан даруйдаа "
+"төлөв нь тодорхой хугацаанд 'Батлагдсан' төлөвтэй болдог. Үйл явдал "
+"өнгөрмөгц төлөв нь 'Хийгдсэн' болдог. Хэрэв үйл явдал нь цуцлагдсан бол "
+"'Цуцлагдсан' төлөвтэй болдог."
 
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
-msgstr ""
+msgstr "Үйл ажиллагаа цуцлах"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Contact"
-msgstr ""
+msgstr "Холбогч"
 
 #. module: event
 #: view:event.event:0
@@ -546,29 +555,29 @@ msgstr ""
 #: field:event.registration,partner_id:0
 #: model:ir.model,name:event.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Харилцагч"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
 msgid "Events Filling Status"
-msgstr ""
+msgstr "Үйл явдлуудын дүүргэлтийн төлөв"
 
 #. module: event
 #: field:event.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr ""
+msgstr "Нэхэмжлэлийг бүлэглэх"
 
 #. module: event
 #: view:event.event:0
 msgid "Mailing"
-msgstr "Илгээх"
+msgstr "Мэйлүүд"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events States"
-msgstr ""
+msgstr "Үйл ажиллагааны төлөв"
 
 #. module: event
 #: view:board.board:0
@@ -584,12 +593,12 @@ msgstr "Түншийн үнийн нэхэмжлэл"
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximum Number of Registrations"
-msgstr ""
+msgstr "Хамгийн их бүртгэлийг өгнө үү"
 
 #. module: event
 #: field:event.registration,log_ids:0
 msgid "Logs"
-msgstr ""
+msgstr "Логууд"
 
 #. module: event
 #: view:event.event:0
@@ -599,17 +608,17 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,state:0
 msgid "State"
-msgstr ""
+msgstr "Төлөв"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "September"
-msgstr ""
+msgstr "9-р сар"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "December"
-msgstr ""
+msgstr "12-р сар"
 
 #. module: event
 #: field:event.registration,event_product:0
@@ -625,7 +634,7 @@ msgstr " Ноорог биш бүртгэлүүд"
 #: view:report.event.registration:0
 #: field:report.event.registration,month:0
 msgid "Month"
-msgstr ""
+msgstr "Сар"
 
 #. module: event
 #: view:event.event:0
@@ -640,45 +649,45 @@ msgstr "Батлагдаагүй бүртгэлүүдийн төлөв"
 #. module: event
 #: help:event.event,register_current:0
 msgid "Total of Open and Done Registrations"
-msgstr ""
+msgstr "Нээлттэй болон Хийгдсэн бүх бүртгэлүүд"
 
 #. module: event
 #: field:event.confirm.registration,msg:0
 msgid "Message"
-msgstr ""
+msgstr "Зурвас"
 
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Алдаа ! Тойрог хамааралтай үйл явдлыг үүсгэж болохгүй."
 
 #. module: event
 #: field:event.registration,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Дугаар 2"
 
 #. module: event
 #: code:addons/event/event.py:361
 #: view:report.event.registration:0
 #, python-format
 msgid "Invoiced"
-msgstr ""
+msgstr "Нэхэмжилсэн"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 msgid "My Events"
-msgstr ""
+msgstr "Миний үйл ажииллагаанууд"
 
 #. module: event
 #: view:event.event:0
 msgid "Speakers"
-msgstr ""
+msgstr "Илтгэгч"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Нэхэмжлэлүүд үүсгэх"
 
 #. module: event
 #: help:event.registration,email_cc:0
@@ -687,11 +696,13 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Энэ бичлэгт харгалзах орох, гарах бүх э-мэйлийг илгээхийн өмнө СС талбарт "
+"эдгээр э-мэйл хаягуудыг нэмж өгнө. Э-мэйл хаягуудыг таслалаар тусгаарлана."
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Та үнэхээр нэхэмжлэл үүсгэхийг хүсч байна уу ?"
 
 #. module: event
 #: view:event.event:0
@@ -701,12 +712,12 @@ msgstr "Эхлэл огноо"
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "Хаагдсан"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in New state"
-msgstr ""
+msgstr "Шинэ төлөвтэй үйл явдлууд"
 
 #. module: event
 #: view:event.event:0
@@ -720,23 +731,23 @@ msgstr "Үйл ажиллагаанууд"
 #. module: event
 #: field:partner.event.registration,nb_register:0
 msgid "Number of Registration"
-msgstr ""
+msgstr "Бүртгэлийн дугаар"
 
 #. module: event
 #: field:event.event,child_ids:0
 msgid "Child Events"
-msgstr ""
+msgstr "Дэд үйл явдлууд"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "August"
-msgstr ""
+msgstr "8-р сар"
 
 #. module: event
 #: field:res.partner,event_ids:0
 #: field:res.partner,event_registration_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "үл мэдэгдэх"
 
 #. module: event
 #: help:event.event,product_id:0
@@ -745,11 +756,14 @@ msgid ""
 "Thus it allows you to set the default label and the accounting info you want "
 "by default on these invoices."
 msgstr ""
+"Энэ үйл явдлын нэхэмжлэлүүд энэ бараагаар үүсгэгдэнэ. Иймээс шошгын анхны "
+"утгыг тогтоох боломж олгоно мөн эдгээр нэхэмжлэл дахь санхүүгийн мэдээллийн "
+"анхны утгуудыг тохируулах боломжийг олгоно."
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "June"
-msgstr ""
+msgstr "6-р сар"
 
 #. module: event
 #: model:product.template,name:event.event_product_0_product_template
@@ -759,7 +773,7 @@ msgstr "Концертын тасалбар"
 #. module: event
 #: field:event.registration,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Бичих огноо"
 
 #. module: event
 #: view:event.registration:0
@@ -772,62 +786,64 @@ msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
 msgstr ""
+"Анхааруулга: Энэ үйл явдал нь хамгийн бага хязгаартаа хүрээгүй байна. "
+"Батлахдаа та итгэлтэй байна уу?"
 
 #. module: event
 #: field:event.registration,active:0
 msgid "Active"
-msgstr ""
+msgstr "Идэвхитэй"
 
 #. module: event
 #: field:event.registration,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Эхлэл огноо"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "November"
-msgstr ""
+msgstr "11-р сар"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Өргөтгөсөн Шүүлтүүр..."
 
 #. module: event
 #: field:partner.event.registration,start_date:0
 msgid "Start date"
-msgstr ""
+msgstr "Эхлэл огноо"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
-msgstr ""
+msgstr "10-р сар"
 
 #. module: event
 #: field:event.event,language:0
 msgid "Language"
-msgstr ""
+msgstr "Хэл"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,email_cc:0
 msgid "CC"
-msgstr ""
+msgstr "CC"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "January"
-msgstr ""
+msgstr "1-р сар"
 
 #. module: event
 #: help:event.registration,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Эдгээр хүмүүс и-мэйл хүлээж авна"
 
 #. module: event
 #: view:event.event:0
 msgid "Set To Draft"
-msgstr ""
+msgstr "Ноороглох"
 
 #. module: event
 #: code:addons/event/event.py:499
@@ -836,77 +852,77 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Confirm Registration"
-msgstr ""
+msgstr "Бүртгэлийг батлах"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 #: view:res.partner:0
 msgid "Date"
-msgstr ""
+msgstr "Огноо"
 
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-msgstr ""
+msgstr "Бүртгэлийн Имэйлийн Бие"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmation Email Body"
-msgstr ""
+msgstr "Баталгаажуулах Имэйлийн Бие"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
-msgstr ""
+msgstr "Батлагдсан эсвэл хийгдсэн төлөвтэй бүртгэлүүд"
 
 #. module: event
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Түүх"
 
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr ""
+msgstr "Байрлалын хаяг"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_type
 #: model:ir.ui.menu,name:event.menu_event_type
 msgid "Types of Events"
-msgstr ""
+msgstr "Үйл явдлын төрөлүүд"
 
 #. module: event
 #: field:event.registration,contact_id:0
 msgid "Partner Contact"
-msgstr ""
+msgstr "Харилцагчийн холбогч"
 
 #. module: event
 #: field:event.event,pricelist_id:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Үнийн жагсаалт"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:59
 #, python-format
 msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "Холбоотой үйл явдлуудад бараа алга байна."
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Confirmation Email"
-msgstr ""
+msgstr "Автомат Баталгаажуулах Имэйл"
 
 #. module: event
 #: view:event.registration:0
 msgid "Misc"
-msgstr ""
+msgstr "Бусад"
 
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Алдаа ! Хаагдах огноо нь Эхлэх огнооноос өмнө байж болохгүй."
 
 #. module: event
 #: code:addons/event/event.py:446
@@ -916,60 +932,60 @@ msgstr ""
 #: selection:report.event.registration,state:0
 #, python-format
 msgid "Done"
-msgstr ""
+msgstr "Хийгдсэн"
 
 #. module: event
 #: field:event.event,date_begin:0
 msgid "Beginning date"
-msgstr ""
+msgstr "Эхлэх огноо"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Нэхэмжлэл"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,year:0
 msgid "Year"
-msgstr ""
+msgstr "Он"
 
 #. module: event
 #: code:addons/event/event.py:465
 #, python-format
 msgid "Cancel"
-msgstr ""
+msgstr "Цуцлах"
 
 #. module: event
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 #: view:event.make.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Хаах"
 
 #. module: event
 #: view:event.event:0
 msgid "Event by Registration"
-msgstr ""
+msgstr "Үйл явдал бүртгэлээр"
 
 #. module: event
 #: code:addons/event/event.py:436
 #, python-format
 msgid "Open"
-msgstr ""
+msgstr "Нээх"
 
 #. module: event
 #: field:event.event,user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Хариуцагч хэрэглэгч"
 
 #. module: event
 #: code:addons/event/event.py:561
 #: code:addons/event/event.py:568
 #, python-format
 msgid "Auto Confirmation: [%s] %s"
-msgstr ""
+msgstr "Автомат баталгаажуулалт: [%s] %s"
 
 #. module: event
 #: view:event.event:0
@@ -978,60 +994,62 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Хариуцагч"
 
 #. module: event
 #: field:event.event,unit_price:0
 #: view:event.registration:0
 #: field:partner.event.registration,unit_price:0
 msgid "Registration Cost"
-msgstr ""
+msgstr "Бүртгэлийн өртөг"
 
 #. module: event
 #: field:event.registration,unit_price:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Нэгж үнэ"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,speaker_id:0
 #: field:res.partner,speaker:0
 msgid "Speaker"
-msgstr ""
+msgstr "Илтгэгч"
 
 #. module: event
 #: model:event.event,name:event.event_2
 msgid "Conference on ERP Buisness"
-msgstr ""
+msgstr "ERP бизнесийн хурал"
 
 #. module: event
 #: view:event.registration:0
 msgid "Reply"
-msgstr ""
+msgstr "Хариулах"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "Энэ сард үүсгэгдсэн үйл явдал"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use automatic emailing for new registration."
 msgstr ""
+"Шинэ бүртгэлд автомат имэйл ашиглахыг хүсч байгаа бол энэ сонголтыг "
+"тэмдэглэнэ."
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:partner.event.registration,end_date:0
 msgid "Closing date"
-msgstr ""
+msgstr "Хаагах Огноо"
 
 #. module: event
 #: field:event.event,product_id:0
 #: view:report.event.registration:0
 #: field:report.event.registration,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Бараа"
 
 #. module: event
 #: view:event.event:0
@@ -1039,101 +1057,101 @@ msgstr ""
 #: view:event.registration:0
 #: field:event.registration,description:0
 msgid "Description"
-msgstr ""
+msgstr "Тодорхойлолт"
 
 #. module: event
 #: field:report.event.registration,confirm_state:0
 msgid " # No of Confirmed Registrations"
-msgstr ""
+msgstr " # Баталгаажсан бүртгэлийн тоо"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_register_event_partner
 msgid "Subscribe"
-msgstr ""
+msgstr "Бүртгүүлэх"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "May"
-msgstr ""
+msgstr "5-р сар"
 
 #. module: event
 #: view:res.partner:0
 msgid "Events Registration"
-msgstr ""
+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
 msgid "Ticket for Conference"
-msgstr ""
+msgstr "Хурлын тасалбар"
 
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type_association
 msgid "Events Type"
-msgstr ""
+msgstr "Үйл явдлын төрөл"
 
 #. module: event
 #: field:event.registration.badge,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Хаяг"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_view
 msgid "Next Events"
-msgstr ""
+msgstr "Дараагийн Үйл явдал"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Subcribe"
-msgstr ""
+msgstr "_Бүртгүүлэх"
 
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr ""
+msgstr "  үйл явдлын бүртгэл "
 
 #. module: event
 #: help:event.event,date_begin:0
 #: help:partner.event.registration,start_date:0
 msgid "Beginning Date of Event"
-msgstr ""
+msgstr "Үйл явдлын эхлэх огноо"
 
 #. module: event
 #: selection:event.registration,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Батлагаажаагүй"
 
 #. module: event
 #: code:addons/event/event.py:565
 #, python-format
 msgid "Auto Registration: [%s] %s"
-msgstr ""
+msgstr "Автомат бүртгэл: [%s] %s"
 
 #. module: event
 #: field:event.registration,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Дуусах огноо"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "February"
-msgstr ""
+msgstr "2-р сар"
 
 #. module: event
 #: view:board.board:0
 msgid "Association Dashboard"
-msgstr ""
+msgstr "Холбооны Хянах Самбар"
 
 #. module: event
 #: view:event.event:0
 #: field:event.registration.badge,name:0
 msgid "Name"
-msgstr ""
+msgstr "Нэр"
 
 #. module: event
 #: field:event.event,section_id:0
@@ -1141,18 +1159,18 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr ""
+msgstr "Борлуулалтын Баг"
 
 #. module: event
 #: field:event.event,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Улс"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:55
 #, python-format
 msgid "Registration is set as Cannot be invoiced"
-msgstr ""
+msgstr "Бүртгэл нэхэмжилж болохгүй байхаар тэмдэглэгдсэн"
 
 #. module: event
 #: code:addons/event/event.py:527
@@ -1161,12 +1179,12 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Close Registration"
-msgstr ""
+msgstr "Бүртгэлийг Хаах"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "April"
-msgstr ""
+msgstr "4-р сар"
 
 #. module: event
 #: help:event.event,unit_price:0
@@ -1174,11 +1192,13 @@ msgid ""
 "This will be the default price used as registration cost when invoicing this "
 "event. Note that you can specify a specific amount for each registration."
 msgstr ""
+"Үйл явдлыг нэхэмжлэхэд энэ нь анхны үнэ байх бүртгэлийн өртөг үнэ. Бүртгэл "
+"болгонд ялгаатай тусгай үнүүдийг зааж өгөх боломжтой."
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in confirm state"
-msgstr ""
+msgstr "Батлагдсан төлөвтэй үйл явдлууд"
 
 #. module: event
 #: view:event.event:0
@@ -1186,7 +1206,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,type:0
 msgid "Event Type"
-msgstr ""
+msgstr "Үйл явдлын төрөл"
 
 #. module: event
 #: view:event.event:0
@@ -1195,63 +1215,63 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_action_registration
 #: model:ir.ui.menu,name:event.menu_action_registration_association
 msgid "Registrations"
-msgstr ""
+msgstr "Бүртгэлүүд"
 
 #. module: event
 #: field:event.registration,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
 msgid "Maximum Registrations"
-msgstr ""
+msgstr "Хамгийн их бүртгэлүүд"
 
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Алдаа ! Тойрч холбогдсон гишүүдийг үүсгэх боломжгүй."
 
 #. module: event
 #: field:report.event.registration,date:0
 msgid "Event Start Date"
-msgstr ""
+msgstr "Үйл явдлын эхлэл огноо"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event For Registration"
-msgstr ""
+msgstr "Бүртгэх Үйл явдлууд"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:51
 #, python-format
 msgid "Invoice cannot be created if the registration is in %s state."
-msgstr ""
+msgstr "%s гэсэн төлөвтэй бүртгэлийг нэхэмжилж болохгүй."
 
 #. module: event
 #: view:event.confirm:0
 #: model:ir.actions.act_window,name:event.action_event_confirm
 #: model:ir.model,name:event.model_event_confirm
 msgid "Event Confirmation"
-msgstr ""
+msgstr "Үйл явдлын баталгаажуулалт"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Registration Email"
-msgstr ""
+msgstr "Автомат Бүртгэлийн имэйл"
 
 #. module: event
 #: view:event.registration:0
 #: view:report.event.registration:0
 #: field:report.event.registration,total:0
 msgid "Total"
-msgstr ""
+msgstr "Нийт"
 
 #. module: event
 #: field:event.event,speaker_confirmed:0
 msgid "Speaker Confirmed"
-msgstr ""
+msgstr "Илтгэгч баталгаажсан"
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -1261,3 +1281,7 @@ msgid ""
 "caldav. Most of the users should work in the Calendar menu, and not in the "
 "list of events."
 msgstr ""
+"Үйл явдал гэдэг нь уулзалт болон бусад төрлийн баримтуудад хэрэглэгддэг доод "
+"түвшний обьект бөгөөд хөдөлгөөнт төхөөрөмжүүдийн цагалбартай caldav-р "
+"ижилтгэл хийгддэг. Ихэнх хэрэглэгчид нь үйл явдлын жагсаалт дээра "
+"ажиллахаасаа илүүтэйгээр цагалбар меню дээр ажилладаг."
diff --git a/addons/event/i18n/nb.po b/addons/event/i18n/nb.po
index f154034b81a..42d09295fce 100644
--- a/addons/event/i18n/nb.po
+++ b/addons/event/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
@@ -137,7 +137,7 @@ msgstr "Hendelseregistrering"
 #. module: event
 #: field:event.event,parent_id:0
 msgid "Parent Event"
-msgstr ""
+msgstr "Overordnede hendelse."
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_make_invoices
@@ -152,12 +152,13 @@ msgstr "Subtotal"
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr ""
+msgstr "Hendelse på registrering"
 
 #. module: event
 #: help:event.event,reply_to:0
 msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
 msgstr ""
+"E-postadressen som satt i \"Svar til\" av alle e-poster sendt av OpenERP."
 
 #. module: event
 #: view:event.registration:0
@@ -195,7 +196,7 @@ msgstr "event.registration.badge"
 #. module: event
 #: field:event.event,mail_auto_confirm:0
 msgid "Mail Auto Confirm"
-msgstr ""
+msgstr "Mail Automatisk Bekreft"
 
 #. module: event
 #: model:product.template,name:event.event_product_1_product_template
@@ -240,7 +241,7 @@ msgstr "Juli"
 #. module: event
 #: help:event.event,register_prospect:0
 msgid "Total of Prospect Registrations"
-msgstr ""
+msgstr "Totalt Prospekt Registreringer"
 
 #. module: event
 #: help:event.event,mail_auto_confirm:0
@@ -248,6 +249,8 @@ msgid ""
 "Check this box if you want to use automatic confirmation emailing or "
 "reminder."
 msgstr ""
+"Kryss av her hvis du ønsker å bruke automatisk bekreftelse av e-post eller "
+"påminnelse."
 
 #. module: event
 #: field:event.registration,ref:0
@@ -322,12 +325,12 @@ msgstr "Bekreftet"
 #. module: event
 #: view:event.confirm.registration:0
 msgid "Registration Confirmation"
-msgstr ""
+msgstr "Registrering Bekreftelse"
 
 #. module: event
 #: view:event.event:0
 msgid "Events in New state"
-msgstr ""
+msgstr "Hendelser i ny stat."
 
 #. module: event
 #: view:report.event.registration:0
@@ -343,7 +346,7 @@ msgstr "Andre talere"
 #. module: event
 #: model:ir.model,name:event.model_event_make_invoice
 msgid "Event Make Invoice"
-msgstr ""
+msgstr "hendelse Gjør Faktura"
 
 #. module: event
 #: help:event.registration,nb_register:0
@@ -367,7 +370,7 @@ msgstr "Send ny e-post"
 #. module: event
 #: help:event.event,register_min:0
 msgid "Provide Minimum Number of Registrations"
-msgstr ""
+msgstr "Gi Minimum antall registreringer"
 
 #. module: event
 #: view:event.event:0
@@ -390,7 +393,7 @@ msgstr "Bekreftede registreringer"
 #. module: event
 #: field:event.event,mail_auto_registr:0
 msgid "Mail Auto Register"
-msgstr ""
+msgstr "Mail Registreres Automatisk"
 
 #. module: event
 #: field:event.event,type:0
@@ -410,6 +413,9 @@ msgid ""
 "subscribes to a confirmed event. This is also the email sent to remind "
 "someone about the event."
 msgstr ""
+"Denne e-posten vil bli sendt når hendelsen blir bekreftet eller når noen "
+"abonnerer på en bekreftet hendelsen. Dette er også e-post sendt til minne "
+"noen om hendelsen."
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
@@ -449,7 +455,7 @@ msgstr "Kanseller registrering"
 #: code:addons/event/event.py:399
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "Registrert partner har ikke en adresse for å få fakturaen."
 
 #. module: event
 #: view:report.event.registration:0
@@ -497,7 +503,7 @@ msgstr "Bekreft uansett"
 #: code:addons/event/wizard/event_confirm_registration.py:54
 #, python-format
 msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
-msgstr ""
+msgstr "Advarsel: Hendelsen '% s' har nådd maksimums grensen (% s)."
 
 #. module: event
 #: view:report.event.registration:0
@@ -520,7 +526,7 @@ msgstr "Antall arrangementer"
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who will be giving speech at the event."
-msgstr ""
+msgstr "Foredragsholder som skal gi tale på arrangementet."
 
 #. module: event
 #: help:event.event,state:0
@@ -529,6 +535,10 @@ msgid ""
 "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'."
 msgstr ""
+"Hvis hendelse er opprettet, er staten \"Kladd\". Hvis hendelse er bekreftet "
+"for de spesielle datoer staten er satt til \"bekreftet\". Hvis hendelsen er "
+"over, er staten satt til \"Done\". Hvis hendelsen blir avlyst staten er satt "
+"til 'Avbrutt'."
 
 #. module: event
 #: view:event.event:0
@@ -554,7 +564,7 @@ msgstr "Partner"
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
 msgid "Events Filling Status"
-msgstr ""
+msgstr "Hendelser Påfyllings Status"
 
 #. module: event
 #: field:event.make.invoice,grouped:0
@@ -564,12 +574,12 @@ msgstr "Gruppering av fakturaer"
 #. module: event
 #: view:event.event:0
 msgid "Mailing"
-msgstr ""
+msgstr "Mailing"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events States"
-msgstr ""
+msgstr "Hendelser stater."
 
 #. module: event
 #: view:board.board:0
@@ -585,7 +595,7 @@ msgstr "Partner fakturert"
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximum Number of Registrations"
-msgstr ""
+msgstr "Gir maksimal antall registreringer."
 
 #. module: event
 #: field:event.registration,log_ids:0
@@ -600,7 +610,7 @@ msgstr "Logger"
 #: view:report.event.registration:0
 #: field:report.event.registration,state:0
 msgid "State"
-msgstr ""
+msgstr "Stat"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -636,12 +646,12 @@ msgstr "Arrangement gjennomført"
 #. module: event
 #: view:event.registration:0
 msgid "Registrations in unconfirmed state"
-msgstr ""
+msgstr "Registreringer i ubekreftet staten."
 
 #. module: event
 #: help:event.event,register_current:0
 msgid "Total of Open and Done Registrations"
-msgstr ""
+msgstr "Totalt Av Åpne og Ferdig Registreringer."
 
 #. module: event
 #: field:event.confirm.registration,msg:0
@@ -651,7 +661,7 @@ msgstr "Melding"
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive hendelse."
 
 #. module: event
 #: field:event.registration,ref2:0
@@ -688,6 +698,8 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Disse e-postadressene vil bli lagt til kopi-feltet for alle inngående og "
+"utgående e-poster før de sendes. Skill flere e-postadresser med komma."
 
 #. module: event
 #: view:event.make.invoice:0
@@ -707,7 +719,7 @@ msgstr "Lukket"
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in New state"
-msgstr ""
+msgstr "Hendelser som er i ny staten."
 
 #. module: event
 #: view:event.event:0
@@ -726,7 +738,7 @@ msgstr "Antall registreringer"
 #. module: event
 #: field:event.event,child_ids:0
 msgid "Child Events"
-msgstr ""
+msgstr "hendelser"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -746,6 +758,9 @@ msgid ""
 "Thus it allows you to set the default label and the accounting info you want "
 "by default on these invoices."
 msgstr ""
+"Fakturaer av denne hendelsen registrering vil bli opprettet med dette "
+"produktet. Dermed tillater det deg å angi standard etiketten og regnskap "
+"info du ønsker som standard på disse fakturaene."
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -773,6 +788,8 @@ msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
 msgstr ""
+"Advarsel: Denne hendelsen har ikke nådd sitt Minimum registrering Limit. Er "
+"du sikker på at du vil bekrefte det?"
 
 #. module: event
 #: field:event.registration,active:0
@@ -828,7 +845,7 @@ msgstr "Disse personene vil motta e-post."
 #. module: event
 #: view:event.event:0
 msgid "Set To Draft"
-msgstr ""
+msgstr "Satt til utkast."
 
 #. module: event
 #: code:addons/event/event.py:499
@@ -849,17 +866,17 @@ msgstr "Dato"
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-msgstr ""
+msgstr "Registrering e-mail Kropp"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmation Email Body"
-msgstr ""
+msgstr "Bekreftelsen email kropp"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
-msgstr ""
+msgstr "Registreringer i bekreftet eller gjort staten."
 
 #. module: event
 #: view:event.registration:0
@@ -892,12 +909,12 @@ msgstr "Prisliste"
 #: code:addons/event/wizard/event_make_invoice.py:59
 #, python-format
 msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "Hendelse relaterte har ikke noen definerte produktet."
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Confirmation Email"
-msgstr ""
+msgstr "Automatisk bekreftelse av Email."
 
 #. module: event
 #: view:event.registration:0
@@ -952,7 +969,7 @@ msgstr "Lukk"
 #. module: event
 #: view:event.event:0
 msgid "Event by Registration"
-msgstr ""
+msgstr "Hendelse av registrering."
 
 #. module: event
 #: code:addons/event/event.py:436
@@ -1013,13 +1030,14 @@ msgstr "Svar"
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "Hendelser opprettet i nåværende måned."
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use automatic emailing for new registration."
 msgstr ""
+"Sjekk denne boksen vis du vil bruke automatisk Emailing for ny registrering."
 
 #. module: event
 #: field:event.event,date_end:0
@@ -1065,7 +1083,7 @@ msgstr "Arrangemnetsregistrering"
 #. module: event
 #: help:event.event,mail_registr:0
 msgid "This email will be sent when someone subscribes to the event."
-msgstr ""
+msgstr "Denne Emailen vil bli sent når noen abonnerer til hendelsen."
 
 #. module: event
 #: model:product.template,name:event.event_product_2_product_template
@@ -1096,7 +1114,7 @@ msgstr "_Abonner"
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr ""
+msgstr "  Hendelse Registrering. "
 
 #. module: event
 #: help:event.event,date_begin:0
@@ -1128,7 +1146,7 @@ msgstr "Februar"
 #. module: event
 #: view:board.board:0
 msgid "Association Dashboard"
-msgstr ""
+msgstr "Tilknytning kontrollpanel."
 
 #. module: event
 #: view:event.event:0
@@ -1175,6 +1193,9 @@ msgid ""
 "This will be the default price used as registration cost when invoicing this "
 "event. Note that you can specify a specific amount for each registration."
 msgstr ""
+"Dette vil være standard som benyttes som registrering kostnader når "
+"fakturering denne hendelsen. Merk at du kan angi et bestemt beløp for hver "
+"registrering."
 
 #. module: event
 #: view:report.event.registration:0
@@ -1212,47 +1233,47 @@ msgstr "Maksimum registreringer"
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
 
 #. module: event
 #: field:report.event.registration,date:0
 msgid "Event Start Date"
-msgstr ""
+msgstr "Hendelsens startdato."
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event For Registration"
-msgstr ""
+msgstr "Hendelse for registrering."
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:51
 #, python-format
 msgid "Invoice cannot be created if the registration is in %s state."
-msgstr ""
+msgstr "Faktura kan ikke opprettes hvis registreringen er i% s tilstand."
 
 #. module: event
 #: view:event.confirm:0
 #: model:ir.actions.act_window,name:event.action_event_confirm
 #: model:ir.model,name:event.model_event_confirm
 msgid "Event Confirmation"
-msgstr ""
+msgstr "Hendelse ."
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Registration Email"
-msgstr ""
+msgstr "Automatisk registrering for Email."
 
 #. module: event
 #: view:event.registration:0
 #: view:report.event.registration:0
 #: field:report.event.registration,total:0
 msgid "Total"
-msgstr ""
+msgstr "Totalt"
 
 #. module: event
 #: field:event.event,speaker_confirmed:0
 msgid "Speaker Confirmed"
-msgstr ""
+msgstr "Foredragsholder Bekreftet."
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -1262,3 +1283,7 @@ msgid ""
 "caldav. Most of the users should work in the Calendar menu, and not in the "
 "list of events."
 msgstr ""
+"Hendelsen er det lave nivået objektet brukes av møte-og andre dokumenter som "
+"skal synkroniseres med mobile enheter eller kalender applikasjoner gjennom "
+"CalDAV. De fleste av brukerne bør arbeide i Kalender-menyen, og ikke i "
+"listen over hendelser."
diff --git a/addons/event/i18n/nl.po b/addons/event/i18n/nl.po
index 052f4596347..e68f2310506 100644
--- a/addons/event/i18n/nl.po
+++ b/addons/event/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-15 10:33+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/nl_BE.po b/addons/event/i18n/nl_BE.po
index e67c4997c4e..1a53885ef89 100644
--- a/addons/event/i18n/nl_BE.po
+++ b/addons/event/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/pl.po b/addons/event/i18n/pl.po
index 1001e485392..ce2ecb90d85 100644
--- a/addons/event/i18n/pl.po
+++ b/addons/event/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/pt.po b/addons/event/i18n/pt.po
index da39b96cff8..1d730b5cff7 100644
--- a/addons/event/i18n/pt.po
+++ b/addons/event/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/pt_BR.po b/addons/event/i18n/pt_BR.po
index aa53b2f1a41..083125d0285 100644
--- a/addons/event/i18n/pt_BR.po
+++ b/addons/event/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
@@ -36,7 +36,7 @@ msgstr "Orador Principal"
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Group By..."
-msgstr "Agrupado Por..."
+msgstr "Agrupar Por..."
 
 #. module: event
 #: field:event.event,register_min:0
@@ -61,7 +61,7 @@ msgstr "E-mail de Inscrição"
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_confirm_registration
 msgid "Make Invoices"
-msgstr "Gerar Nota Fiscal"
+msgstr "Gerar Faturas"
 
 #. module: event
 #: view:event.event:0
@@ -72,7 +72,7 @@ msgstr "Data de Inscrição"
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr "Fe_char"
+msgstr "(_C) Fechar"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -141,7 +141,7 @@ msgstr "Evento Pai"
 #. module: event
 #: model:ir.actions.act_window,name:event.action_make_invoices
 msgid "Make Invoice"
-msgstr "Gerar fatura"
+msgstr "Gerar Fatura"
 
 #. module: event
 #: field:event.registration,price_subtotal:0
@@ -201,7 +201,7 @@ msgstr "E-mail de Confirmação Automática"
 #. module: event
 #: model:product.template,name:event.event_product_1_product_template
 msgid "Ticket for Opera"
-msgstr "Tíquete para Ópera"
+msgstr "Ticket para Ópera"
 
 #. module: event
 #: code:addons/event/event.py:125
@@ -270,7 +270,7 @@ msgstr "Emails"
 #. module: event
 #: view:event.registration:0
 msgid "Extra Info"
-msgstr "Info. Extra"
+msgstr "Informações Adicionais"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:83
@@ -282,7 +282,7 @@ msgstr "Faturas de Clientes"
 #: selection:event.event,state:0
 #: selection:report.event.registration,state:0
 msgid "Draft"
-msgstr "Rascunho"
+msgstr "Provisório"
 
 #. module: event
 #: field:event.type,name:0
diff --git a/addons/event/i18n/ro.po b/addons/event/i18n/ro.po
index bb1c7ff80de..180e9cf2ce2 100644
--- a/addons/event/i18n/ro.po
+++ b/addons/event/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/ru.po b/addons/event/i18n/ru.po
index 24af7837171..d5b277a19d6 100644
--- a/addons/event/i18n/ru.po
+++ b/addons/event/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sk.po b/addons/event/i18n/sk.po
index 44631b460ef..7c9619d9c19 100644
--- a/addons/event/i18n/sk.po
+++ b/addons/event/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sl.po b/addons/event/i18n/sl.po
index 430602bc8d2..f249beb0e90 100644
--- a/addons/event/i18n/sl.po
+++ b/addons/event/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sq.po b/addons/event/i18n/sq.po
index b63a8410811..825e43855bb 100644
--- a/addons/event/i18n/sq.po
+++ b/addons/event/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sr.po b/addons/event/i18n/sr.po
index 212cfbb93b4..5da77ce7967 100644
--- a/addons/event/i18n/sr.po
+++ b/addons/event/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sr@latin.po b/addons/event/i18n/sr@latin.po
index cbc57d51508..a85d9f9cffc 100644
--- a/addons/event/i18n/sr@latin.po
+++ b/addons/event/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/sv.po b/addons/event/i18n/sv.po
index 6d23e866959..3ca5b25a9f3 100644
--- a/addons/event/i18n/sv.po
+++ b/addons/event/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/tlh.po b/addons/event/i18n/tlh.po
index 898fa1a1fc6..8765922f08a 100644
--- a/addons/event/i18n/tlh.po
+++ b/addons/event/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/tr.po b/addons/event/i18n/tr.po
index c915bfb85cf..604c47b53f4 100644
--- a/addons/event/i18n/tr.po
+++ b/addons/event/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
@@ -24,7 +24,7 @@ msgstr "Fatura Bilgileri"
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event Details"
-msgstr "Olay Ayrıntıları"
+msgstr "Etkinlik Ayrıntıları"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
@@ -46,7 +46,7 @@ msgstr "Enaz Kayıt"
 #. module: event
 #: model:ir.model,name:event.model_event_confirm_registration
 msgid "Confirmation for Event Registration"
-msgstr "Olay Kayıtı Onaylama"
+msgstr "Etkinlik Kaydı Onaylama"
 
 #. module: event
 #: field:event.registration.badge,title:0
@@ -82,7 +82,7 @@ msgstr "Bon Jovi Konseri"
 #. module: event
 #: view:report.event.registration:0
 msgid "Invoiced Registrations only"
-msgstr ""
+msgstr "Yalnızca Faturalı Kayıtlar"
 
 #. module: event
 #: selection:report.event.registration,month:0
@@ -157,6 +157,8 @@ msgstr "Kayıttaki Etkinlik"
 #: help:event.event,reply_to:0
 msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
 msgstr ""
+"OpenERP tarafından gönderilen tüm epostaların 'Bunu Yanıtla'ya konan eposta "
+"adresi"
 
 #. module: event
 #: view:event.registration:0
@@ -166,12 +168,12 @@ msgstr "İç Not Ekle"
 #. module: event
 #: view:event.event:0
 msgid "Confirmed events"
-msgstr ""
+msgstr "Onaylı etkinlikler"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event Beginning Date"
-msgstr ""
+msgstr "Etkinlik Başlama Tarihi"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_report_event_registration
@@ -179,7 +181,7 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 #: view:report.event.registration:0
 msgid "Events Analysis"
-msgstr "Etkinlik Analizi"
+msgstr "Etkinlik İncelemesi"
 
 #. module: event
 #: field:event.registration,message_ids:0
@@ -189,7 +191,7 @@ msgstr "İletiler"
 #. module: event
 #: model:ir.model,name:event.model_event_registration_badge
 msgid "event.registration.badge"
-msgstr ""
+msgstr "etkinlik.kayıt.rozet"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
@@ -206,7 +208,7 @@ msgstr "Opera İçin Bilet"
 #: view:event.event:0
 #, python-format
 msgid "Confirm Event"
-msgstr "Etkinlik Onayı"
+msgstr "Etkinlik Onayla"
 
 #. module: event
 #: selection:event.event,state:0
@@ -224,7 +226,7 @@ msgstr "Yanıtla"
 #: model:ir.actions.act_window,name:event.open_board_associations_manager
 #: model:ir.ui.menu,name:event.menu_board_associations_manager
 msgid "Event Dashboard"
-msgstr "Etkinlik Panosu"
+msgstr "Etkinlik Kontrol Paneli"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -239,7 +241,7 @@ msgstr "Temmuz"
 #. module: event
 #: help:event.event,register_prospect:0
 msgid "Total of Prospect Registrations"
-msgstr ""
+msgstr "Toplam Umutlar Kayıtları"
 
 #. module: event
 #: help:event.event,mail_auto_confirm:0
@@ -247,6 +249,7 @@ msgid ""
 "Check this box if you want to use automatic confirmation emailing or "
 "reminder."
 msgstr ""
+"Otomatik eposta ve anımsatma onaylama kullanımı için bu kutuyu işaretle."
 
 #. module: event
 #: field:event.registration,ref:0
@@ -326,12 +329,12 @@ msgstr "Kayıt Onaylama"
 #. module: event
 #: view:event.event:0
 msgid "Events in New state"
-msgstr ""
+msgstr "Yeni durumundaki Etkinlikler"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Confirm"
-msgstr ""
+msgstr "Onayla"
 
 #. module: event
 #: view:event.event:0
@@ -366,7 +369,7 @@ msgstr "Yeni Eposta gönder"
 #. module: event
 #: help:event.event,register_min:0
 msgid "Provide Minimum Number of Registrations"
-msgstr ""
+msgstr "Enaz Sayıda Kayıt Sağlayın"
 
 #. module: event
 #: view:event.event:0
@@ -378,7 +381,7 @@ msgstr "Konum"
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "New"
-msgstr ""
+msgstr "Yeni"
 
 #. module: event
 #: field:event.event,register_current:0
@@ -409,6 +412,9 @@ msgid ""
 "subscribes to a confirmed event. This is also the email sent to remind "
 "someone about the event."
 msgstr ""
+"Bu eposta etkinlik onaylandığında ya da biri onaylanmış bir etkinliğe abone "
+"olduğunda gönderilmiş olacaktır. Bu aynı zamanda etkinlik hakkında birine "
+"anımsatma için gönderilen epostadır."
 
 #. module: event
 #: field:event.registration,tobe_invoiced:0
@@ -418,7 +424,7 @@ msgstr "Faturalanacak"
 #. module: event
 #: view:event.event:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Satış Takım(lar)ım"
 
 #. module: event
 #: code:addons/event/event.py:398
@@ -430,7 +436,7 @@ msgstr "Hata !"
 #: field:event.event,name:0
 #: field:event.registration,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Özet"
 
 #. module: event
 #: field:event.registration,create_date:0
@@ -448,27 +454,27 @@ msgstr "Kaydı İptal Et"
 #: code:addons/event/event.py:399
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "Fatura oluşturmak için kayıtlı paydaşın adresi yok."
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in last month"
-msgstr ""
+msgstr "Son ayda oluşturulan Etkinlikler"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current year"
-msgstr ""
+msgstr "Geçerli ayda oluşturulan Etkinlikler"
 
 #. module: event
 #: help:event.event,type:0
 msgid "Type of Event like Seminar, Exhibition, Conference, Training."
-msgstr "Etkinlik Türü, Seminer, Sergi, Konferansi Eğitim gibi."
+msgstr "Etkinlik Türü; Seminer, Sergi, Konferans, Eğitim gibi."
 
 #. module: event
 #: view:event.registration:0
 msgid "Confirmed registrations"
-msgstr ""
+msgstr "Onaylı kayıtlar"
 
 #. module: event
 #: view:event.event:0
@@ -495,12 +501,12 @@ msgstr "Herdurumda Yazdır"
 #: code:addons/event/wizard/event_confirm_registration.py:54
 #, python-format
 msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
-msgstr ""
+msgstr "Uyarı: Etkinlik '%s' Ençok Sınırına (%s) ulaşmıştır."
 
 #. module: event
 #: view:report.event.registration:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Ay-1    "
 
 #. module: event
 #: view:event.event:0
@@ -518,7 +524,7 @@ msgstr "Etkinlik Sayısı"
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who will be giving speech at the event."
-msgstr ""
+msgstr "Bu etkinlikte konuşmayı yapacak konuşmacı."
 
 #. module: event
 #: help:event.event,state:0
@@ -527,6 +533,10 @@ msgid ""
 "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'."
 msgstr ""
+"Eğer etkinlik oluşturulmuşsa, durumu 'Taslak'tır. Etkinlik belirli tarihler "
+"için onaylanmışsa durumu 'Onaylı'ya ayarlanır. Etkinlik bitmişse, durum "
+"'Bitti'ye ayarlanır. Etkinlik iptal edildiyse durum 'İptal edildi'ye "
+"ayarlanır."
 
 #. module: event
 #: view:event.event:0
@@ -567,7 +577,7 @@ msgstr "Postalama"
 #. module: event
 #: view:report.event.registration:0
 msgid "Events States"
-msgstr ""
+msgstr "Etkinliklerin Durumları"
 
 #. module: event
 #: view:board.board:0
@@ -583,12 +593,12 @@ msgstr "Faturalanan Ortak"
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximum Number of Registrations"
-msgstr ""
+msgstr "Ençok Sayıda Kayıt Sağlayın"
 
 #. module: event
 #: field:event.registration,log_ids:0
 msgid "Logs"
-msgstr ""
+msgstr "Günlükler"
 
 #. module: event
 #: view:event.event:0
@@ -598,33 +608,33 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,state:0
 msgid "State"
-msgstr ""
+msgstr "Durum"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "September"
-msgstr ""
+msgstr "Eylül"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "December"
-msgstr ""
+msgstr "Aralık"
 
 #. module: event
 #: field:event.registration,event_product:0
 msgid "Invoice Name"
-msgstr ""
+msgstr "Fatura Adı"
 
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
-msgstr ""
+msgstr " # Taslak Kayıtlar Sayısı"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,month:0
 msgid "Month"
-msgstr ""
+msgstr "Ay"
 
 #. module: event
 #: view:event.event:0
@@ -634,50 +644,50 @@ msgstr "Etkinlik Bitti"
 #. module: event
 #: view:event.registration:0
 msgid "Registrations in unconfirmed state"
-msgstr ""
+msgstr "Kayıt onaylanmamış durumda"
 
 #. module: event
 #: help:event.event,register_current:0
 msgid "Total of Open and Done Registrations"
-msgstr ""
+msgstr "Toplam Açık ve Biten Kayıtlar"
 
 #. module: event
 #: field:event.confirm.registration,msg:0
 msgid "Message"
-msgstr ""
+msgstr "İleti"
 
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Hata ! Özyinelemeli etkinlik oluşturmazsınız."
 
 #. module: event
 #: field:event.registration,ref2:0
 msgid "Reference 2"
-msgstr ""
+msgstr "Referans 2"
 
 #. module: event
 #: code:addons/event/event.py:361
 #: view:report.event.registration:0
 #, python-format
 msgid "Invoiced"
-msgstr ""
+msgstr "Faturalandı"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 msgid "My Events"
-msgstr ""
+msgstr "Etkinliklerim"
 
 #. module: event
 #: view:event.event:0
 msgid "Speakers"
-msgstr ""
+msgstr "Konuşmacılar"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "Fatura oluştur"
 
 #. module: event
 #: help:event.registration,email_cc:0
@@ -686,26 +696,28 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Bu e-posta adresleri gönderilmeden önce bütün gelen ve giden e-postaların CC "
+"satırına eklenecektir. Birden fazla e-posta adresini virgül ile ayırınız."
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "Gerçekten fatura(lar) oluşturmak istiyor musunuz?"
 
 #. module: event
 #: view:event.event:0
 msgid "Beginning Date"
-msgstr ""
+msgstr "Başlama Tarihi"
 
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr ""
+msgstr "Kapalı"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in New state"
-msgstr ""
+msgstr "Yeni durumundaki etkinlikler"
 
 #. module: event
 #: view:event.event:0
@@ -724,18 +736,18 @@ msgstr "Kayıt Numarası"
 #. module: event
 #: field:event.event,child_ids:0
 msgid "Child Events"
-msgstr ""
+msgstr "Alt Etkinlikler"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "August"
-msgstr ""
+msgstr "Ağustos"
 
 #. module: event
 #: field:res.partner,event_ids:0
 #: field:res.partner,event_registration_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "bilinmeyen"
 
 #. module: event
 #: help:event.event,product_id:0
@@ -744,11 +756,14 @@ msgid ""
 "Thus it allows you to set the default label and the accounting info you want "
 "by default on these invoices."
 msgstr ""
+"Bu etkinlik kaydının faturaları bu ürünle birlikte oluşturulacaktır. "
+"Böylece, bu faturalarda varsayılan olarak istediğiniz öntanımlı etiket ve "
+"muhasebe bilgileri ayarlamanıza izin verir."
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "June"
-msgstr ""
+msgstr "Haziran"
 
 #. module: event
 #: model:product.template,name:event.event_product_0_product_template
@@ -758,12 +773,12 @@ msgstr "Konser için Bilet"
 #. module: event
 #: field:event.registration,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Yazım Tarihi"
 
 #. module: event
 #: view:event.registration:0
 msgid "My Registrations"
-msgstr ""
+msgstr "Kayıtlarım"
 
 #. module: event
 #: view:event.confirm:0
@@ -771,57 +786,59 @@ msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
 msgstr ""
+"Uyarı: Bu Etkinlik Enaz Kayıt Sınırına erişmemiştir. Bunu onaylamak "
+"istediğinizden emin misiniz?"
 
 #. module: event
 #: field:event.registration,active:0
 msgid "Active"
-msgstr ""
+msgstr "Etkin"
 
 #. module: event
 #: field:event.registration,date:0
 msgid "Start Date"
-msgstr ""
+msgstr "Başlama Tarihi"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "November"
-msgstr ""
+msgstr "Kasım"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Genişletilmiş Süzgeçler..."
 
 #. module: event
 #: field:partner.event.registration,start_date:0
 msgid "Start date"
-msgstr ""
+msgstr "Başlama Tarihi"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
-msgstr ""
+msgstr "Ekim"
 
 #. module: event
 #: field:event.event,language:0
 msgid "Language"
-msgstr ""
+msgstr "Dil"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,email_cc:0
 msgid "CC"
-msgstr ""
+msgstr "CC"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "January"
-msgstr ""
+msgstr "Ocak"
 
 #. module: event
 #: help:event.registration,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Bu kişilere e-posta alacaktır"
 
 #. module: event
 #: view:event.event:0
@@ -842,22 +859,22 @@ msgstr "Kaydı Onayla"
 #: view:report.event.registration:0
 #: view:res.partner:0
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-msgstr ""
+msgstr "Kayıt Epostası Gövdesi"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmation Email Body"
-msgstr ""
+msgstr "Onaylı Eposta Gövdesi"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
-msgstr ""
+msgstr "Kayıtlar onaylanmış ya da bitmiş durumdadır"
 
 #. module: event
 #: view:event.registration:0
@@ -868,7 +885,7 @@ msgstr "Geçmiş Bilgisi"
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr ""
+msgstr "Konum Adresi"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_type
@@ -890,7 +907,7 @@ msgstr "Fiyat Listesi"
 #: code:addons/event/wizard/event_make_invoice.py:59
 #, python-format
 msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "İlgili Etkinliğe tanımlı herhangi bir ürün yoktur"
 
 #. module: event
 #: view:event.event:0
@@ -905,7 +922,7 @@ msgstr "Çeşitli"
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Hata ! Kapanış Tarihi, Başlama Tarihinden önceye ayarlanamaz."
 
 #. module: event
 #: code:addons/event/event.py:446
@@ -932,7 +949,7 @@ msgstr "Fatura"
 #: view:report.event.registration:0
 #: field:report.event.registration,year:0
 msgid "Year"
-msgstr ""
+msgstr "Yıl"
 
 #. module: event
 #: code:addons/event/event.py:465
@@ -945,12 +962,12 @@ msgstr "İptal"
 #: view:event.confirm.registration:0
 #: view:event.make.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Kapat"
 
 #. module: event
 #: view:event.event:0
 msgid "Event by Registration"
-msgstr ""
+msgstr "Kayıta göre Etkinlik"
 
 #. module: event
 #: code:addons/event/event.py:436
@@ -961,14 +978,14 @@ msgstr "Açık"
 #. module: event
 #: field:event.event,user_id:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Sorumlu Kullanıcı"
 
 #. module: event
 #: code:addons/event/event.py:561
 #: code:addons/event/event.py:568
 #, python-format
 msgid "Auto Confirmation: [%s] %s"
-msgstr ""
+msgstr "Oto Onaylama:[%s] %s"
 
 #. module: event
 #: view:event.event:0
@@ -977,14 +994,14 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Sorumlu"
 
 #. module: event
 #: field:event.event,unit_price:0
 #: view:event.registration:0
 #: field:partner.event.registration,unit_price:0
 msgid "Registration Cost"
-msgstr ""
+msgstr "Kayıt Ücreti"
 
 #. module: event
 #: field:event.registration,unit_price:0
@@ -996,7 +1013,7 @@ msgstr "Birim Fiyat"
 #: field:report.event.registration,speaker_id:0
 #: field:res.partner,speaker:0
 msgid "Speaker"
-msgstr ""
+msgstr "Konuşmacı"
 
 #. module: event
 #: model:event.event,name:event.event_2
@@ -1011,19 +1028,21 @@ msgstr "Yanıtla"
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "Geçerli ayda oluşturulan Etkinlikler"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use automatic emailing for new registration."
 msgstr ""
+"Yeni kayıtlar için otomatik epostalama kullanmak istiyorsanız bu kutuyu "
+"işaretleyin."
 
 #. module: event
 #: field:event.event,date_end:0
 #: field:partner.event.registration,end_date:0
 msgid "Closing date"
-msgstr ""
+msgstr "Kapanış tarihi"
 
 #. module: event
 #: field:event.event,product_id:0
@@ -1038,32 +1057,32 @@ msgstr "Ürün"
 #: view:event.registration:0
 #: field:event.registration,description:0
 msgid "Description"
-msgstr ""
+msgstr "Açıklama"
 
 #. module: event
 #: field:report.event.registration,confirm_state:0
 msgid " # No of Confirmed Registrations"
-msgstr ""
+msgstr " Onaylanmış Kayıtların #"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_register_event_partner
 msgid "Subscribe"
-msgstr ""
+msgstr "Abone ol"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayıs"
 
 #. module: event
 #: view:res.partner:0
 msgid "Events Registration"
-msgstr ""
+msgstr "Etkinlik Kaydı"
 
 #. module: event
 #: help:event.event,mail_registr:0
 msgid "This email will be sent when someone subscribes to the event."
-msgstr "Birisi Etkinliğe abone olduğunda bu e-posta gönderilecek."
+msgstr "Birisi Etkinliğe abone olduğunda bu e-posta gönderilmiş olacaktır."
 
 #. module: event
 #: model:product.template,name:event.event_product_2_product_template
@@ -1073,60 +1092,60 @@ msgstr "Konferans için Bilet"
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type_association
 msgid "Events Type"
-msgstr ""
+msgstr "Etkinliklerin Türü"
 
 #. module: event
 #: field:event.registration.badge,address_id:0
 msgid "Address"
-msgstr ""
+msgstr "Adres"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_view
 msgid "Next Events"
-msgstr ""
+msgstr "Sonraki Etkinlikler"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Subcribe"
-msgstr ""
+msgstr "_Abone ol"
 
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr ""
+msgstr "  etkinlik Kaydı "
 
 #. module: event
 #: help:event.event,date_begin:0
 #: help:partner.event.registration,start_date:0
 msgid "Beginning Date of Event"
-msgstr ""
+msgstr "Etkinliğin Başlama Tarihi"
 
 #. module: event
 #: selection:event.registration,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Onaysız"
 
 #. module: event
 #: code:addons/event/event.py:565
 #, python-format
 msgid "Auto Registration: [%s] %s"
-msgstr ""
+msgstr "Oto Kayıt: [%s] %s"
 
 #. module: event
 #: field:event.registration,date_deadline:0
 msgid "End Date"
-msgstr ""
+msgstr "Bitiş Tarihi"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "February"
-msgstr ""
+msgstr "Şubat"
 
 #. module: event
 #: view:board.board:0
 msgid "Association Dashboard"
-msgstr ""
+msgstr "Dernek Kontrol Paneli"
 
 #. module: event
 #: view:event.event:0
@@ -1140,18 +1159,18 @@ msgstr "Adı"
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr ""
+msgstr "Satış Takımı"
 
 #. module: event
 #: field:event.event,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Ülke"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:55
 #, python-format
 msgid "Registration is set as Cannot be invoiced"
-msgstr ""
+msgstr "Kayıt Faturalandırılamaz olarak ayarlı"
 
 #. module: event
 #: code:addons/event/event.py:527
@@ -1160,12 +1179,12 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Close Registration"
-msgstr ""
+msgstr "Kaydı Kapat"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "April"
-msgstr ""
+msgstr "Nisan"
 
 #. module: event
 #: help:event.event,unit_price:0
@@ -1173,11 +1192,14 @@ msgid ""
 "This will be the default price used as registration cost when invoicing this "
 "event. Note that you can specify a specific amount for each registration."
 msgstr ""
+"Bu fiyat, etkinliğin faturalandırılması sırasında varsayılan kayıt ücreti "
+"olarak kullanılacaktır. Her kayıt için özel bir tutar belirleyebileceğinizi "
+"unutmayın."
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in confirm state"
-msgstr ""
+msgstr "Onaylama durumundaki Etkinlikler"
 
 #. module: event
 #: view:event.event:0
@@ -1185,7 +1207,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,type:0
 msgid "Event Type"
-msgstr "Etkinlik Tipi"
+msgstr "Etkinlik Türü"
 
 #. module: event
 #: view:event.event:0
@@ -1199,7 +1221,7 @@ msgstr "Kayıtlar"
 #. module: event
 #: field:event.registration,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: event
 #: field:event.event,register_max:0
@@ -1210,30 +1232,30 @@ msgstr "Maksimum Kayıtlar"
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Hata ! Özyinelemeli ilişkili üyeler oluşturamazsınız."
 
 #. module: event
 #: field:report.event.registration,date:0
 msgid "Event Start Date"
-msgstr ""
+msgstr "Etkinlik Başlama Tarihi"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event For Registration"
-msgstr ""
+msgstr "Kayıt için Etkinlik"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:51
 #, python-format
 msgid "Invoice cannot be created if the registration is in %s state."
-msgstr ""
+msgstr "Kayıt %s durumunda ise fatura oluşturulamaz."
 
 #. module: event
 #: view:event.confirm:0
 #: model:ir.actions.act_window,name:event.action_event_confirm
 #: model:ir.model,name:event.model_event_confirm
 msgid "Event Confirmation"
-msgstr ""
+msgstr "Etkinlik Onaylama"
 
 #. module: event
 #: view:event.event:0
@@ -1245,12 +1267,12 @@ msgstr "Otomatik Kayıt E-Postası"
 #: view:report.event.registration:0
 #: field:report.event.registration,total:0
 msgid "Total"
-msgstr ""
+msgstr "Toplam"
 
 #. module: event
 #: field:event.event,speaker_confirmed:0
 msgid "Speaker Confirmed"
-msgstr ""
+msgstr "Onaylı Konuşmacı"
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -1260,6 +1282,10 @@ msgid ""
 "caldav. Most of the users should work in the Calendar menu, and not in the "
 "list of events."
 msgstr ""
+"Etkinlik, mobil aygıtlarla ya da caldav yoluyla takvim uygulamaları "
+"eşitlenecek toplantılar ve diğer belgeler tarafından kullanılan düşük "
+"seviyeli nesnelerdir. Kullanıcıların çoğu Takvim menüsünden çalışmalıdır, "
+"etkinlik listesinden değil."
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/event/i18n/uk.po b/addons/event/i18n/uk.po
index 8a249deae2c..9ff3142b919 100644
--- a/addons/event/i18n/uk.po
+++ b/addons/event/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/vi.po b/addons/event/i18n/vi.po
index 4349df00c4c..bbc48cff24c 100644
--- a/addons/event/i18n/vi.po
+++ b/addons/event/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/zh_CN.po b/addons/event/i18n/zh_CN.po
index d6d1d3de186..24adcebb415 100644
--- a/addons/event/i18n/zh_CN.po
+++ b/addons/event/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/i18n/zh_TW.po b/addons/event/i18n/zh_TW.po
index 5d60b3686fd..ddf1ced267a 100644
--- a/addons/event/i18n/zh_TW.po
+++ b/addons/event/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-09-27 07:58+0000\n"
-"Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2012-08-30 10:20+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
+"Language-Team: Cenoq Corp.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event
 #: view:event.event:0
@@ -24,55 +24,55 @@ msgstr "發票資訊"
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event Details"
-msgstr "活動詳情"
+msgstr "事件細節"
 
 #. module: event
 #: field:event.event,main_speaker_id:0
 msgid "Main Speaker"
-msgstr "主講者"
+msgstr "主要關注者"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Group By..."
-msgstr "分組根據..."
+msgstr "分類方式..."
 
 #. module: event
 #: field:event.event,register_min:0
 msgid "Minimum Registrations"
-msgstr "最小登記數"
+msgstr "最少的登記記錄"
 
 #. module: event
 #: model:ir.model,name:event.model_event_confirm_registration
 msgid "Confirmation for Event Registration"
-msgstr "活動登記確認"
+msgstr "確認事件的登記記錄"
 
 #. module: event
 #: field:event.registration.badge,title:0
 msgid "Title"
-msgstr "稱謂"
+msgstr "標題"
 
 #. module: event
 #: field:event.event,mail_registr:0
 msgid "Registration Email"
-msgstr "登記電郵"
+msgstr "登記記錄的郵件"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_confirm_registration
 msgid "Make Invoices"
-msgstr "開立發票"
+msgstr "生成發票"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Registration Date"
-msgstr "登記日期"
+msgstr "登錄日期"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Close"
-msgstr "結束(_C)"
+msgstr "結束"
 
 #. module: event
 #: model:event.event,name:event.event_0
@@ -82,17 +82,17 @@ msgstr "Bon Jovi 演唱會"
 #. module: event
 #: view:report.event.registration:0
 msgid "Invoiced Registrations only"
-msgstr ""
+msgstr "僅已開發票的報名者"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr "三月"
+msgstr "3月"
 
 #. module: event
 #: field:event.event,mail_confirm:0
 msgid "Confirmation Email"
-msgstr "確認電郵"
+msgstr "確認電子郵件"
 
 #. module: event
 #: field:event.registration,nb_register:0
@@ -103,7 +103,7 @@ msgstr "數量"
 #: code:addons/event/wizard/event_make_invoice.py:63
 #, python-format
 msgid "Registration doesn't have any partner to invoice."
-msgstr ""
+msgstr "登記記錄沒有給任何業務夥伴開發票"
 
 #. module: event
 #: field:event.event,company_id:0
@@ -121,7 +121,7 @@ msgstr "發票日期"
 #. module: event
 #: help:event.event,pricelist_id:0
 msgid "Pricelist version for current event."
-msgstr "當前活動價目表版本"
+msgstr "當前事件的價目表版本"
 
 #. module: event
 #: code:addons/event/wizard/partner_event_registration.py:88
@@ -131,17 +131,17 @@ msgstr "當前活動價目表版本"
 #: view:partner.event.registration:0
 #, python-format
 msgid "Event Registration"
-msgstr "活動登記"
+msgstr "事件登錄"
 
 #. module: event
 #: field:event.event,parent_id:0
 msgid "Parent Event"
-msgstr "上級活動"
+msgstr "上級事件"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_make_invoices
 msgid "Make Invoice"
-msgstr "開立發票"
+msgstr "生成發票"
 
 #. module: event
 #: field:event.registration,price_subtotal:0
@@ -151,27 +151,27 @@ msgstr "小計"
 #. module: event
 #: view:report.event.registration:0
 msgid "Event on Registration"
-msgstr "正登記活動"
+msgstr "登錄的事件"
 
 #. module: event
 #: help:event.event,reply_to:0
 msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP"
-msgstr ""
+msgstr "所有系統的電子郵件在「回覆」填入這郵件地址。"
 
 #. module: event
 #: view:event.registration:0
 msgid "Add Internal Note"
-msgstr "添加內部記事"
+msgstr "新增內部備註"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmed events"
-msgstr ""
+msgstr "已確認的活動"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Event Beginning Date"
-msgstr ""
+msgstr "活動開始日期"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_report_event_registration
@@ -179,17 +179,17 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_report_event_registration
 #: view:report.event.registration:0
 msgid "Events Analysis"
-msgstr "活動分析"
+msgstr "事件分析"
 
 #. module: event
 #: field:event.registration,message_ids:0
 msgid "Messages"
-msgstr "郵件"
+msgstr "訊息"
 
 #. module: event
 #: model:ir.model,name:event.model_event_registration_badge
 msgid "event.registration.badge"
-msgstr ""
+msgstr "event.registration.badge"
 
 #. module: event
 #: field:event.event,mail_auto_confirm:0
@@ -206,25 +206,25 @@ msgstr "歌劇門票"
 #: view:event.event:0
 #, python-format
 msgid "Confirm Event"
-msgstr "確認活動"
+msgstr "確認事件"
 
 #. module: event
 #: selection:event.event,state:0
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Cancelled"
-msgstr "取消"
+msgstr "已取消"
 
 #. module: event
 #: field:event.event,reply_to:0
 msgid "Reply-To"
-msgstr "回覆至"
+msgstr "回覆:"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.open_board_associations_manager
 #: model:ir.ui.menu,name:event.menu_board_associations_manager
 msgid "Event Dashboard"
-msgstr "活動儀錶板"
+msgstr "事件控制台"
 
 #. module: event
 #: model:event.event,name:event.event_1
@@ -234,40 +234,40 @@ msgstr "威爾第歌劇"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "July"
-msgstr "七月"
+msgstr "7月"
 
 #. module: event
 #: help:event.event,register_prospect:0
 msgid "Total of Prospect Registrations"
-msgstr ""
+msgstr "意向報名者合計"
 
 #. module: event
 #: help:event.event,mail_auto_confirm:0
 msgid ""
 "Check this box if you want to use automatic confirmation emailing or "
 "reminder."
-msgstr ""
+msgstr "如果你想用自動確認郵件或提醒請勾選這裡。"
 
 #. module: event
 #: field:event.registration,ref:0
 msgid "Reference"
-msgstr "參照"
+msgstr "關聯"
 
 #. module: event
 #: help:event.event,date_end:0
 #: help:partner.event.registration,end_date:0
 msgid "Closing Date of Event"
-msgstr "活動結束日期"
+msgstr "事件的結束日期"
 
 #. module: event
 #: view:event.registration:0
 msgid "Emails"
-msgstr "電郵"
+msgstr "電子郵件"
 
 #. module: event
 #: view:event.registration:0
 msgid "Extra Info"
-msgstr "額外資訊"
+msgstr "附加資訊"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:83
@@ -279,17 +279,17 @@ msgstr "客戶發票"
 #: selection:event.event,state:0
 #: selection:report.event.registration,state:0
 msgid "Draft"
-msgstr "草案"
+msgstr "草稿"
 
 #. module: event
 #: field:event.type,name:0
 msgid "Event type"
-msgstr "活動類型"
+msgstr "事件類型"
 
 #. module: event
 #: model:ir.model,name:event.model_event_type
 msgid " Event Type "
-msgstr " 活動類型 "
+msgstr " 事件類型 "
 
 #. module: event
 #: view:event.event:0
@@ -301,13 +301,13 @@ msgstr " 活動類型 "
 #: field:report.event.registration,event_id:0
 #: view:res.partner:0
 msgid "Event"
-msgstr "活動"
+msgstr "事件"
 
 #. module: event
 #: view:event.registration:0
 #: field:event.registration,badge_ids:0
 msgid "Badges"
-msgstr "襟章"
+msgstr "標記"
 
 #. module: event
 #: view:event.event:0
@@ -316,38 +316,38 @@ msgstr "襟章"
 #: selection:event.registration,state:0
 #: selection:report.event.registration,state:0
 msgid "Confirmed"
-msgstr "確認"
+msgstr "已確認"
 
 #. module: event
 #: view:event.confirm.registration:0
 msgid "Registration Confirmation"
-msgstr "登記確認"
+msgstr "確認登記記錄"
 
 #. module: event
 #: view:event.event:0
 msgid "Events in New state"
-msgstr ""
+msgstr "在新建狀態的活動"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Confirm"
-msgstr ""
+msgstr "確認"
 
 #. module: event
 #: view:event.event:0
 #: field:event.event,speaker_ids:0
 msgid "Other Speakers"
-msgstr "其他講者"
+msgstr "其他關注者"
 
 #. module: event
 #: model:ir.model,name:event.model_event_make_invoice
 msgid "Event Make Invoice"
-msgstr "活動開立發票"
+msgstr "事件建立發票"
 
 #. module: event
 #: help:event.registration,nb_register:0
 msgid "Number of Registrations or Tickets"
-msgstr "登記或門票數量"
+msgstr "登錄編號或票"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:50
@@ -361,30 +361,30 @@ msgstr "警告！"
 #. module: event
 #: view:event.registration:0
 msgid "Send New Email"
-msgstr "發送新電郵"
+msgstr "發送新電子郵件"
 
 #. module: event
 #: help:event.event,register_min:0
 msgid "Provide Minimum Number of Registrations"
-msgstr ""
+msgstr "提供最小的報名人數"
 
 #. module: event
 #: view:event.event:0
 msgid "Location"
-msgstr "地點"
+msgstr "位置"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "New"
-msgstr ""
+msgstr "新建"
 
 #. module: event
 #: field:event.event,register_current:0
 #: view:report.event.registration:0
 msgid "Confirmed Registrations"
-msgstr "已確認登記"
+msgstr "確認登記記錄"
 
 #. module: event
 #: field:event.event,mail_auto_registr:0
@@ -400,7 +400,7 @@ msgstr "類型"
 #. module: event
 #: field:event.registration,email_from:0
 msgid "Email"
-msgstr "電郵"
+msgstr "電子郵件"
 
 #. module: event
 #: help:event.event,mail_confirm:0
@@ -408,17 +408,17 @@ msgid ""
 "This email will be sent when the event gets confirmed 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.registration,tobe_invoiced:0
 msgid "To be Invoiced"
-msgstr ""
+msgstr "待開票"
 
 #. module: event
 #: view:event.event:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "我的銷售團隊"
 
 #. module: event
 #: code:addons/event/event.py:398
@@ -430,55 +430,55 @@ msgstr "錯誤！"
 #: field:event.event,name:0
 #: field:event.registration,name:0
 msgid "Summary"
-msgstr "摘要"
+msgstr "概要"
 
 #. module: event
 #: field:event.registration,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "建立日期"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "Cancel Registration"
-msgstr "取消登記"
+msgstr "取消登記記錄"
 
 #. module: event
 #: code:addons/event/event.py:399
 #, python-format
 msgid "Registered partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "要開票的登記記錄裡的業務夥伴沒地址"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in last month"
-msgstr ""
+msgstr "上個月新建的活動"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current year"
-msgstr ""
+msgstr "本年新建的活動"
 
 #. module: event
 #: help:event.event,type:0
 msgid "Type of Event like Seminar, Exhibition, Conference, Training."
-msgstr "活動類型，如座談會、展覽、會議、培訓"
+msgstr "事件類型如：研討會，展覽，會議，培訓。"
 
 #. module: event
 #: view:event.registration:0
 msgid "Confirmed registrations"
-msgstr ""
+msgstr "確認報名者"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Organization"
-msgstr "活動組織"
+msgstr "事件結構"
 
 #. module: event
 #: view:event.registration:0
 msgid "History Information"
-msgstr "歷史資訊"
+msgstr "日誌資訊"
 
 #. module: event
 #: view:event.registration:0
@@ -489,18 +489,18 @@ msgstr "日期"
 #: view:event.confirm:0
 #: view:event.confirm.registration:0
 msgid "Confirm Anyway"
-msgstr "無論如何確認"
+msgstr "總是確認"
 
 #. module: event
 #: code:addons/event/wizard/event_confirm_registration.py:54
 #, python-format
 msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)."
-msgstr ""
+msgstr "警告：這事件 '%s'已達到最高極限 (%s)。"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    上月    "
 
 #. module: event
 #: view:event.event:0
@@ -508,17 +508,17 @@ msgstr ""
 #: field:event.registration.badge,registration_id:0
 #: model:ir.actions.act_window,name:event.act_event_list_register_event
 msgid "Registration"
-msgstr "登記"
+msgstr "登記記錄"
 
 #. module: event
 #: field:report.event.registration,nbevent:0
 msgid "Number Of Events"
-msgstr "活動數目"
+msgstr "事件數"
 
 #. module: event
 #: help:event.event,main_speaker_id:0
 msgid "Speaker who will be giving speech at the event."
-msgstr ""
+msgstr "要在這次活動上發言的演講者"
 
 #. module: event
 #: help:event.event,state:0
@@ -527,17 +527,18 @@ msgid ""
 "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'."
 msgstr ""
+"如果事件剛建立狀態是「草稿」。如果事件在具體的日期已確認狀態是「已確認」。如果事件結束狀態設為「完成」。如果事件已經取消狀態是「已取消」。"
 
 #. module: event
 #: view:event.event:0
 msgid "Cancel Event"
-msgstr "取消活動"
+msgstr "取消事件"
 
 #. module: event
 #: view:event.event:0
 #: view:event.registration:0
 msgid "Contact"
-msgstr "聯絡人"
+msgstr "聯繫方式"
 
 #. module: event
 #: view:event.event:0
@@ -545,45 +546,45 @@ msgstr "聯絡人"
 #: field:event.registration,partner_id:0
 #: model:ir.model,name:event.model_res_partner
 msgid "Partner"
-msgstr "伙伴"
+msgstr "業務夥伴"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_reg
 #: view:report.event.registration:0
 msgid "Events Filling Status"
-msgstr ""
+msgstr "事件填充狀態"
 
 #. module: event
 #: field:event.make.invoice,grouped:0
 msgid "Group the invoices"
-msgstr "發票分類"
+msgstr "發票組"
 
 #. module: event
 #: view:event.event:0
 msgid "Mailing"
-msgstr ""
+msgstr "郵遞"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events States"
-msgstr ""
+msgstr "活動狀態"
 
 #. module: event
 #: view:board.board:0
 #: field:event.event,register_prospect:0
 msgid "Unconfirmed Registrations"
-msgstr "未確認登記"
+msgstr "不確認登記記錄"
 
 #. module: event
 #: field:event.registration,partner_invoice_id:0
 msgid "Partner Invoiced"
-msgstr ""
+msgstr "已開票業務夥伴"
 
 #. module: event
 #: help:event.event,register_max:0
 msgid "Provide Maximum Number of Registrations"
-msgstr ""
+msgstr "提供本次報名的最大人數"
 
 #. module: event
 #: field:event.registration,log_ids:0
@@ -598,17 +599,17 @@ msgstr "日誌"
 #: view:report.event.registration:0
 #: field:report.event.registration,state:0
 msgid "State"
-msgstr ""
+msgstr "狀態"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "September"
-msgstr "九月"
+msgstr "9月"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "December"
-msgstr "十二月"
+msgstr "12月"
 
 #. module: event
 #: field:event.registration,event_product:0
@@ -618,28 +619,28 @@ msgstr "發票名稱"
 #. module: event
 #: field:report.event.registration,draft_state:0
 msgid " # No of Draft Registrations"
-msgstr ""
+msgstr " # 沒草稿狀態的登記記錄"
 
 #. module: event
 #: view:report.event.registration:0
 #: field:report.event.registration,month:0
 msgid "Month"
-msgstr "月"
+msgstr "月份"
 
 #. module: event
 #: view:event.event:0
 msgid "Event Done"
-msgstr "活動完結"
+msgstr "事件完成"
 
 #. module: event
 #: view:event.registration:0
 msgid "Registrations in unconfirmed state"
-msgstr ""
+msgstr "未確認狀態的報名者"
 
 #. module: event
 #: help:event.event,register_current:0
 msgid "Total of Open and Done Registrations"
-msgstr "開放及完成登記總數"
+msgstr "開啟和完成的登記記錄共有"
 
 #. module: event
 #: field:event.confirm.registration,msg:0
@@ -649,35 +650,35 @@ msgstr "訊息"
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "錯誤！你不能建立互相調用的事件。"
 
 #. module: event
 #: field:event.registration,ref2:0
 msgid "Reference 2"
-msgstr "參照 2"
+msgstr "關聯2"
 
 #. module: event
 #: code:addons/event/event.py:361
 #: view:report.event.registration:0
 #, python-format
 msgid "Invoiced"
-msgstr "已開發票"
+msgstr "已開票"
 
 #. module: event
 #: view:event.event:0
 #: view:report.event.registration:0
 msgid "My Events"
-msgstr "我的活動"
+msgstr "我的事件"
 
 #. module: event
 #: view:event.event:0
 msgid "Speakers"
-msgstr "講者"
+msgstr "關注者"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Create invoices"
-msgstr ""
+msgstr "開立發票"
 
 #. module: event
 #: help:event.registration,email_cc:0
@@ -685,12 +686,12 @@ msgid ""
 "These email addresses will be added to the CC field of all inbound and "
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
-msgstr ""
+msgstr "這些郵箱地址將添加到所有接收的發送郵件的副本欄位，用逗號分隔多個郵件地址。"
 
 #. module: event
 #: view:event.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "你真的要生成發票嗎 ？"
 
 #. module: event
 #: view:event.event:0
@@ -700,12 +701,12 @@ msgstr "開始日期"
 #. module: event
 #: field:event.registration,date_closed:0
 msgid "Closed"
-msgstr "結束"
+msgstr "已結束"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in New state"
-msgstr ""
+msgstr "新建狀態的活動"
 
 #. module: event
 #: view:event.event:0
@@ -714,28 +715,28 @@ msgstr ""
 #: model:ir.ui.menu,name:event.menu_event_event_assiciation
 #: view:res.partner:0
 msgid "Events"
-msgstr "活動"
+msgstr "事件"
 
 #. module: event
 #: field:partner.event.registration,nb_register:0
 msgid "Number of Registration"
-msgstr "登記數量"
+msgstr "登記記錄數"
 
 #. module: event
 #: field:event.event,child_ids:0
 msgid "Child Events"
-msgstr "子活動"
+msgstr "子事件"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "August"
-msgstr "八月"
+msgstr "8月"
 
 #. module: event
 #: field:res.partner,event_ids:0
 #: field:res.partner,event_registration_ids:0
 msgid "unknown"
-msgstr "不詳"
+msgstr "未知的"
 
 #. module: event
 #: help:event.event,product_id:0
@@ -743,39 +744,39 @@ msgid ""
 "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."
-msgstr ""
+msgstr "將建立這事件登記記錄的產品發票。因此對這些預設發票它允許你設置預設的標籤和會計資訊。"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "June"
-msgstr "六月"
+msgstr "6月"
 
 #. module: event
 #: model:product.template,name:event.event_product_0_product_template
 msgid "Ticket for Concert"
-msgstr ""
+msgstr "合作的門票"
 
 #. module: event
 #: field:event.registration,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "寫入日期"
 
 #. module: event
 #: view:event.registration:0
 msgid "My Registrations"
-msgstr "我的登記"
+msgstr "我的登記記錄"
 
 #. module: event
 #: view:event.confirm:0
 msgid ""
 "Warning: This Event has not reached its Minimum Registration Limit. Are you "
 "sure you want to confirm it?"
-msgstr "警告：本活動未達最少登記限制。是否確認？"
+msgstr "警告：這事件沒有達到最低登記記錄的規定，你肯定要確認它？"
 
 #. module: event
 #: field:event.registration,active:0
 msgid "Active"
-msgstr ""
+msgstr "生效"
 
 #. module: event
 #: field:event.registration,date:0
@@ -785,12 +786,12 @@ msgstr "開始日期"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "November"
-msgstr "十一月"
+msgstr "11月"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "增加篩選條件"
 
 #. module: event
 #: field:partner.event.registration,start_date:0
@@ -800,7 +801,7 @@ msgstr "開始日期"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
-msgstr "十月"
+msgstr "10月"
 
 #. module: event
 #: field:event.event,language:0
@@ -811,22 +812,22 @@ msgstr "語言"
 #: view:event.registration:0
 #: field:event.registration,email_cc:0
 msgid "CC"
-msgstr "副本(CC)"
+msgstr "抄送"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "January"
-msgstr "一月"
+msgstr "1月"
 
 #. module: event
 #: help:event.registration,email_from:0
 msgid "These people will receive email."
-msgstr "此等人士會收到電郵"
+msgstr "這些人將收到電子郵件。"
 
 #. module: event
 #: view:event.event:0
 msgid "Set To Draft"
-msgstr "設為草案"
+msgstr "設為草稿"
 
 #. module: event
 #: code:addons/event/event.py:499
@@ -835,7 +836,7 @@ msgstr "設為草案"
 #: view:res.partner:0
 #, python-format
 msgid "Confirm Registration"
-msgstr "確認登記"
+msgstr "確認登記記錄"
 
 #. module: event
 #: view:event.event:0
@@ -847,39 +848,39 @@ msgstr "日期"
 #. module: event
 #: view:event.event:0
 msgid "Registration Email Body"
-msgstr "登記電郵內容"
+msgstr "登記記錄的郵件內容"
 
 #. module: event
 #: view:event.event:0
 msgid "Confirmation Email Body"
-msgstr "確認電郵內容"
+msgstr "確認郵件內容"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Registrations in confirmed or done state"
-msgstr ""
+msgstr "在已確認或已完成狀態的報名者"
 
 #. module: event
 #: view:event.registration:0
 #: view:res.partner:0
 msgid "History"
-msgstr "歷史"
+msgstr "日誌"
 
 #. module: event
 #: field:event.event,address_id:0
 msgid "Location Address"
-msgstr "地點位址"
+msgstr "地址"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.action_event_type
 #: model:ir.ui.menu,name:event.menu_event_type
 msgid "Types of Events"
-msgstr "活動類型"
+msgstr "事件類型"
 
 #. module: event
 #: field:event.registration,contact_id:0
 msgid "Partner Contact"
-msgstr "伙伴聯絡人"
+msgstr "業務夥伴聯繫方式"
 
 #. module: event
 #: field:event.event,pricelist_id:0
@@ -890,12 +891,12 @@ msgstr "價目表"
 #: code:addons/event/wizard/event_make_invoice.py:59
 #, python-format
 msgid "Event related doesn't have any product defined"
-msgstr ""
+msgstr "事件沒關聯任何定義的產品"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Confirmation Email"
-msgstr "自動確認電郵"
+msgstr "自動確認郵件"
 
 #. module: event
 #: view:event.registration:0
@@ -905,7 +906,7 @@ msgstr "雜項"
 #. module: event
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr "錯誤！結束日期不能早於開始日期"
+msgstr "錯誤！結束日期不能在開始日期前。"
 
 #. module: event
 #: code:addons/event/event.py:446
@@ -932,7 +933,7 @@ msgstr "發票"
 #: view:report.event.registration:0
 #: field:report.event.registration,year:0
 msgid "Year"
-msgstr "年份"
+msgstr "年"
 
 #. module: event
 #: code:addons/event/event.py:465
@@ -945,30 +946,30 @@ msgstr "取消"
 #: view:event.confirm.registration:0
 #: view:event.make.invoice:0
 msgid "Close"
-msgstr "關閉"
+msgstr "結束"
 
 #. module: event
 #: view:event.event:0
 msgid "Event by Registration"
-msgstr "各登記活動"
+msgstr "事件登記記錄"
 
 #. module: event
 #: code:addons/event/event.py:436
 #, python-format
 msgid "Open"
-msgstr "開放"
+msgstr "開啟"
 
 #. module: event
 #: field:event.event,user_id:0
 msgid "Responsible User"
-msgstr "負責用戶"
+msgstr "責任用戶"
 
 #. module: event
 #: code:addons/event/event.py:561
 #: code:addons/event/event.py:568
 #, python-format
 msgid "Auto Confirmation: [%s] %s"
-msgstr "自動確認：[%s] %s"
+msgstr "自動確認： [%s] %s"
 
 #. module: event
 #: view:event.event:0
@@ -977,14 +978,14 @@ msgstr "自動確認：[%s] %s"
 #: view:report.event.registration:0
 #: field:report.event.registration,user_id:0
 msgid "Responsible"
-msgstr "負責"
+msgstr "負責人"
 
 #. module: event
 #: field:event.event,unit_price:0
 #: view:event.registration:0
 #: field:partner.event.registration,unit_price:0
 msgid "Registration Cost"
-msgstr "登記成本"
+msgstr "登記記錄的成本"
 
 #. module: event
 #: field:event.registration,unit_price:0
@@ -996,7 +997,7 @@ msgstr "單價"
 #: field:report.event.registration,speaker_id:0
 #: field:res.partner,speaker:0
 msgid "Speaker"
-msgstr "講者"
+msgstr "關注者"
 
 #. module: event
 #: model:event.event,name:event.event_2
@@ -1011,13 +1012,13 @@ msgstr "回覆"
 #. module: event
 #: view:report.event.registration:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "本月新建的活動"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
 msgid ""
 "Check this box if you want to use automatic emailing for new registration."
-msgstr ""
+msgstr "如果你要自動發郵件給新的報名者請勾選此項。"
 
 #. module: event
 #: field:event.event,date_end:0
@@ -1038,12 +1039,12 @@ msgstr "產品"
 #: view:event.registration:0
 #: field:event.registration,description:0
 msgid "Description"
-msgstr "說明"
+msgstr "描述"
 
 #. module: event
 #: field:report.event.registration,confirm_state:0
 msgid " # No of Confirmed Registrations"
-msgstr " # 已確認登記數"
+msgstr " # 沒確認登記記錄"
 
 #. module: event
 #: model:ir.actions.act_window,name:event.act_register_event_partner
@@ -1053,17 +1054,17 @@ msgstr "訂閱"
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "May"
-msgstr "五月"
+msgstr "5月"
 
 #. module: event
 #: view:res.partner:0
 msgid "Events Registration"
-msgstr "活動登記"
+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
@@ -1073,34 +1074,34 @@ msgstr "會議門票"
 #. module: event
 #: model:ir.ui.menu,name:event.menu_event_type_association
 msgid "Events Type"
-msgstr ""
+msgstr "活動類型"
 
 #. module: event
 #: field:event.registration.badge,address_id:0
 msgid "Address"
-msgstr "地址"
+msgstr "地址:"
 
 #. module: event
 #: view:board.board:0
 #: model:ir.actions.act_window,name:event.act_event_view
 msgid "Next Events"
-msgstr "下個活動"
+msgstr "下一個事件"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "_Subcribe"
-msgstr "訂閱(_S)"
+msgstr "訂閱"
 
 #. module: event
 #: model:ir.model,name:event.model_partner_event_registration
 msgid "  event Registration "
-msgstr "  活動登記 "
+msgstr "  事件登記記錄 "
 
 #. module: event
 #: help:event.event,date_begin:0
 #: help:partner.event.registration,start_date:0
 msgid "Beginning Date of Event"
-msgstr "活動開始日"
+msgstr "事件開始日期"
 
 #. module: event
 #: selection:event.registration,state:0
@@ -1111,22 +1112,22 @@ msgstr "未確認"
 #: code:addons/event/event.py:565
 #, python-format
 msgid "Auto Registration: [%s] %s"
-msgstr "自動登記：[%s] %s"
+msgstr "自動登記記錄： [%s] %s"
 
 #. module: event
 #: field:event.registration,date_deadline:0
 msgid "End Date"
-msgstr "結束日"
+msgstr "結束日期"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "February"
-msgstr "二月"
+msgstr "2月"
 
 #. module: event
 #: view:board.board:0
 msgid "Association Dashboard"
-msgstr ""
+msgstr "商會控制台"
 
 #. module: event
 #: view:event.event:0
@@ -1140,18 +1141,18 @@ msgstr "名稱"
 #: view:report.event.registration:0
 #: field:report.event.registration,section_id:0
 msgid "Sale Team"
-msgstr "業務團隊"
+msgstr "銷售團隊"
 
 #. module: event
 #: field:event.event,country_id:0
 msgid "Country"
-msgstr "國家或地區"
+msgstr "國家"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:55
 #, python-format
 msgid "Registration is set as Cannot be invoiced"
-msgstr ""
+msgstr "登記記錄設置為不能開發票"
 
 #. module: event
 #: code:addons/event/event.py:527
@@ -1160,24 +1161,24 @@ msgstr ""
 #: view:res.partner:0
 #, python-format
 msgid "Close Registration"
-msgstr "結束登記"
+msgstr "結束登記記錄"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "April"
-msgstr "四月"
+msgstr "4月"
 
 #. module: event
 #: help:event.event,unit_price:0
 msgid ""
 "This will be the default price used as registration cost when invoicing this "
 "event. Note that you can specify a specific amount for each registration."
-msgstr ""
+msgstr "這裡是開發票是預設的報名價格，注意你可以對每個報名者用不同的價格。"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Events which are in confirm state"
-msgstr ""
+msgstr "已確認狀態的活動"
 
 #. module: event
 #: view:event.event:0
@@ -1185,7 +1186,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,type:0
 msgid "Event Type"
-msgstr "活動類型"
+msgstr "事件類型"
 
 #. module: event
 #: view:event.event:0
@@ -1194,51 +1195,51 @@ msgstr "活動類型"
 #: model:ir.ui.menu,name:event.menu_action_registration
 #: model:ir.ui.menu,name:event.menu_action_registration_association
 msgid "Registrations"
-msgstr "登記"
+msgstr "登記記錄"
 
 #. module: event
 #: field:event.registration,id:0
 msgid "ID"
-msgstr ""
+msgstr "標識"
 
 #. module: event
 #: field:event.event,register_max:0
 #: field:report.event.registration,register_max:0
 msgid "Maximum Registrations"
-msgstr "最大登記數"
+msgstr "最多的登記記錄"
 
 #. module: event
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "錯誤，您不能建立循環引用的會員用戶"
 
 #. module: event
 #: field:report.event.registration,date:0
 msgid "Event Start Date"
-msgstr "活動開始日"
+msgstr "事件開始日期"
 
 #. module: event
 #: view:partner.event.registration:0
 msgid "Event For Registration"
-msgstr "可登記活動"
+msgstr "登記記錄引起的事件"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:51
 #, python-format
 msgid "Invoice cannot be created if the registration is in %s state."
-msgstr ""
+msgstr "如果登記記錄在 %s 狀態，不能開發票。"
 
 #. module: event
 #: view:event.confirm:0
 #: model:ir.actions.act_window,name:event.action_event_confirm
 #: model:ir.model,name:event.model_event_confirm
 msgid "Event Confirmation"
-msgstr "活動確認"
+msgstr "事件確認"
 
 #. module: event
 #: view:event.event:0
 msgid "Auto Registration Email"
-msgstr "自動登記電郵"
+msgstr "自動登記記錄郵件"
 
 #. module: event
 #: view:event.registration:0
@@ -1250,7 +1251,7 @@ msgstr "總計"
 #. module: event
 #: field:event.event,speaker_confirmed:0
 msgid "Speaker Confirmed"
-msgstr "已確認講者"
+msgstr "關注者確認"
 
 #. module: event
 #: model:ir.actions.act_window,help:event.action_event_view
@@ -1259,7 +1260,7 @@ msgid ""
 "should be synchronized with mobile devices or calendar applications through "
 "caldav. Most of the users should work in the Calendar menu, and not in the "
 "list of events."
-msgstr ""
+msgstr "事件是低層對象用於會議和其它文檔通過caldar同步移動設備或日程表應用程序。大多數用戶將使用日程表菜單而不是事件列表。"
 
 #~ msgid "Provide Maximun Number of Registrations"
 #~ msgstr "提供登記最大數"
diff --git a/addons/event/report/__init__.py b/addons/event/report/__init__.py
index 1c60e2715df..4f2516e5615 100644
--- a/addons/event/report/__init__.py
+++ b/addons/event/report/__init__.py
@@ -21,4 +21,4 @@
 
 import report_event_registration
 
-# 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/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 060b1ef7556..042676d0c32 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -23,16 +23,16 @@ from osv import fields, osv
 import tools
 
 class report_event_registration(osv.osv):
-
     _name = "report.event.registration"
     _description = "Events Analysis"
     _auto = False
     _columns = {
         'event_date': fields.char('Event Start Date', size=64, 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'),
-            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        '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),
         'event_id': fields.many2one('event.event', 'Event', required=True),
         'draft_state': fields.integer(' # No of Draft Registrations', size=20),
         'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20),
@@ -48,17 +48,18 @@ class report_event_registration(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
     }
     _order = 'event_date desc'
+
     def init(self, cr):
         """
-        initialize the sql view for the event registration
-        cr -- the cursor
+        Initialize the sql view for the event registration
         """
         tools.drop_view_if_exists(cr, 'report_event_registration')
-        cr.execute("""
-         CREATE OR REPLACE view report_event_registration AS (
-                SELECT
-                event_id,
-                r.id,
+
+        # TOFIX this request won't select events that have no registration
+        cr.execute(""" CREATE VIEW report_event_registration AS (
+            SELECT
+                e.id::char || '/' || coalesce(r.id::char,'') AS id,
+                e.id AS event_id,
                 e.user_id AS user_id,
                 r.user_id AS user_id_registration,
                 r.name AS name_registration,
@@ -72,23 +73,21 @@ class report_event_registration(osv.osv):
                 CASE WHEN r.state IN ('open','done') THEN r.nb_register ELSE 0 END AS confirm_state,
                 e.type AS event_type,
                 e.register_max AS register_max,
-                e.state AS  event_state,
-                r.state AS  registration_state
-                FROM
+                e.state AS event_state,
+                r.state AS registration_state
+            FROM
                 event_event e
+                LEFT JOIN event_registration r ON (e.id=r.event_id)
 
-                LEFT JOIN
-                    event_registration r ON (e.id=r.event_id)
-
-               GROUP BY
+            GROUP BY
                 event_id,
                 user_id_registration,
-                e.id,
                 r.id,
                 registration_state,
                 r.nb_register,
-                event_type, e.id, e.date_begin, e.main_speaker_id,
-                e.register_max,event_id, e.user_id,e.company_id,
+                event_type,
+                e.id,
+                e.date_begin,
                 e.user_id,
                 event_state,
                 e.company_id,
@@ -97,9 +96,8 @@ class report_event_registration(osv.osv):
                 month,
                 e.register_max,
                 name_registration
-
-              )
-                """)
+        )
+        """)
 
 report_event_registration()
 
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 6ce2c199332..249757efbd3 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <openerp>
-   <data>
+    <data>
 
-    <!-- report , event on registration... start -->
+        <!-- Report, event on registration -->
         <record model="ir.ui.view" id="report_event_registration_tree">
             <field name="name">report.event.registration.tree</field>
             <field name="model">report.event.registration</field>
             <field name="arch" type="xml">
-                <tree colors="blue:event_state == 'draft';black:event_state == 'confirm';gray:event_state in('done','cancel')" string="Events Analysis">
+                <tree colors="blue:event_state == 'draft';black:event_state == 'confirm';gray:event_state in('done','cancel')" create="false" string="Events Analysis">
                     <field name="event_date" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="speaker_id" invisible="1"/>
@@ -28,7 +28,6 @@
             </field>
         </record>
 
-
         <record model ="ir.ui.view" id="report_event_registration_graph">
             <field name="name">report.event.registration.graph</field>
             <field name="model">report.event.registration</field>
@@ -42,8 +41,7 @@
             </field>
         </record>
 
-              <!-- Event on Registration search view -->
-
+        <!-- Event on Registration search view -->
         <record model="ir.ui.view" id="view_report_event_registration_search">
             <field name="name">report.event.registration.search</field>
             <field name="model">report.event.registration</field>
@@ -62,8 +60,8 @@
                     <newline/>
                     <group expand="1" string="Group By...">
                         <filter string="Participant / Contact" icon="terp-personal" context="{'group_by':'name_registration'}" help="Registration contact"/>
-                        <filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.extended"/>
-                        <filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}" groups="base.extended"/>
+                        <filter string="Register" icon="terp-personal" context="{'group_by':'user_id_registration'}" help="Registration contact" groups="base.group_no_one"/>
+                        <filter string="Speaker" name="speaker" icon="terp-personal+" context="{'group_by': 'speaker_id'}" groups="base.group_no_one"/>
                         <filter string="Event Responsible" name="user_id" icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <filter string="Event" name="event" icon="terp-crm" context="{'group_by':'event_id', 'max_reg_event_visible':0}"/>
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'event_type'}"/>
@@ -82,28 +80,28 @@
             </field>
         </record>
 
-        <record  model="ir.actions.act_window" id="action_report_event_registration">
+        <record model="ir.actions.act_window" id="action_report_event_registration">
             <field name="name">Events Analysis</field>
             <field name="res_model">report.event.registration</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,graph</field>
             <field name="search_view_id" ref="view_report_event_registration_search"/>
-            <field name="context">{"search_default_year":1,"search_default_this_month":1,"search_default_365day":1, "search_default_invoiced":1, "search_default_event":1, 'group_by_no_leaf':1, 'group_by':[]}</field>
+            <field name="context">{"search_default_year":1,"search_default_this_month":1,"search_default_365day":1, "search_default_invoiced":1, "search_default_event":1, "group_by_no_leaf":1, "group_by":[]}</field>
         </record>
 
-       <record model="ir.actions.act_window.view" id="action_report_event_registration_tree">
+        <record model="ir.actions.act_window.view" id="action_report_event_registration_tree">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
             <field name="view_id" ref="report_event_registration_tree"/>
             <field name="act_window_id" ref="action_report_event_registration"/>
-       </record>
+        </record>
 
-       <record model="ir.actions.act_window.view" id="action_report_event_registration_graph">
+        <record model="ir.actions.act_window.view" id="action_report_event_registration_graph">
             <field name="sequence" eval="2"/>
             <field name="view_mode">graph</field>
             <field name="view_id" ref="report_event_registration_graph"/>
             <field name="act_window_id" ref="action_report_event_registration"/>
-       </record>
+        </record>
 
         <menuitem parent="base.menu_reporting" id="menu_reporting_events" sequence="30" groups="event.group_event_manager" name="Events"/>
         <menuitem parent="menu_reporting_events" action="action_report_event_registration" id="menu_report_event_registration" sequence="3" groups="event.group_event_manager"/>
diff --git a/addons/event/res_partner.py b/addons/event/res_partner.py
index c33bdf67540..17cf5216074 100644
--- a/addons/event/res_partner.py
+++ b/addons/event/res_partner.py
@@ -25,7 +25,7 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
 
     _columns = {
-        'speaker': fields.boolean('Speaker'),
+        'speaker': fields.boolean('Speaker', help="Check this box if this contact is a speaker."),
         'event_ids': fields.one2many('event.event','main_speaker_id', readonly=True),
         'event_registration_ids': fields.one2many('event.registration','partner_id', readonly=True),
     }
diff --git a/addons/event/res_partner_view.xml b/addons/event/res_partner_view.xml
index 8e5ff480c2c..c3e8073a7ae 100644
--- a/addons/event/res_partner_view.xml
+++ b/addons/event/res_partner_view.xml
@@ -16,7 +16,7 @@
                     <attribute name="invisible">False</attribute>
                 </xpath>
                 <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_event" string="Event">
+                    <group name="grp_event" string="Events">
                         <field name="event_ids" colspan="4" nolabel="1">
                             <tree string="Events">
                                 <field name="name" string="Event"/>
@@ -24,7 +24,7 @@
                             </tree>
                         </field>
                     </group>
-                    <group name="grp_registration" string="Registration">
+                    <group name="grp_registration" string="Registrations">
                         <field name="event_registration_ids" colspan="4" nolabel="1">
                             <tree string="Events Registration">
                                 <field name="event_begin_date" string="Date"/>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index f46bc5fff96..2cc749a1a40 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -3,7 +3,7 @@
     <data>
 
         <record model="ir.module.category" id="module_category_event_management">
-            <field name="name">Event</field>
+            <field name="name">Events</field>
             <field name="description">Helps you manage your Events.</field>
             <field name="sequence">3</field>
         </record>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 8602ea24d53..ff5bfaba19b 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -14,11 +14,13 @@
   border-bottom-left-radius:3px;
   border-bottom-right-radius:3px;
   font-size: 12px;
+  border-collapse: separate;
   text-align: center;
   font-weight: bold;
   color: #8A89BA;
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
   background-color: #FFFFFF;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);  
 }
 .oe_event_month_year{
   border-bottom-left-radius:3px;
@@ -42,4 +44,10 @@
     width:256px;
     border: 1px solid #eeeeee;
 }
+.oe_unsubscribe, .oe_unsubscribe_button:hover span {
+   display: none;
+ }
+.oe_unsubscribe_button:hover .oe_unsubscribe {
+   display: inline;
+ }
 
diff --git a/addons/event/wizard/event_confirm.py b/addons/event/wizard/event_confirm.py
index e21d523bb12..e001aac9937 100644
--- a/addons/event/wizard/event_confirm.py
+++ b/addons/event/wizard/event_confirm.py
@@ -34,4 +34,4 @@ class event_confirm(osv.osv_memory):
 
 event_confirm()
 
-# 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/event_moodle/__openerp__.py b/addons/event_moodle/__openerp__.py
index 14f6de8668d..fdfb793b494 100644
--- a/addons/event_moodle/__openerp__.py
+++ b/addons/event_moodle/__openerp__.py
@@ -34,10 +34,10 @@ to avoid wasting time.
 Now you have a simple way to create training or courses with OpenERP and moodle.
 
 STEPS TO CONFIGURE:
-------------------
+-------------------
 
 1. Activate web service in moodle.
-----------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 >site administration >plugins >web services >manage protocols activate the xmlrpc web service 
 
 
@@ -48,26 +48,27 @@ STEPS TO CONFIGURE:
 
 
 2. Create confirmation email with login and password.
------------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 We strongly suggest you to add those following lines at the bottom of your event
 confirmation email to communicate the login/password of moodle to your subscribers.
 
 
 ........your configuration text.......
 
-URL: your moodle link for exemple: http://openerp.moodle.com
-LOGIN: ${object.moodle_username}
-PASSWORD: ${object.moodle_user_password}
+**URL:** your moodle link for exemple: http://openerp.moodle.com
+
+**LOGIN:** ${object.moodle_username}
+
+**PASSWORD:** ${object.moodle_user_password}
 """,
     'author': 'OpenERP SA',
     'depends': ['event'],
-    'init_xml': [],
     'data': [
-            'wizard_moodle.xml',
-            'event_view.xml',
-            'security/ir.model.access.csv'
-            ],
-    'demo_xml': [],
+        'wizard_moodle.xml',
+        'event_view.xml',
+        'security/ir.model.access.csv'
+    ],
+    'demo': [],
     'test': [],
     'installable': True,
     'auto_install': False,
diff --git a/addons/event_moodle/event_moodle.py b/addons/event_moodle/event_moodle.py
index 19e763e91b0..0bac50ca445 100644
--- a/addons/event_moodle/event_moodle.py
+++ b/addons/event_moodle/event_moodle.py
@@ -54,7 +54,7 @@ class event_moodle(osv.osv):
         """
         moodle_config_wiz_ids = self.search(cr, uid, [], context=context)
         if not moodle_config_wiz_ids:
-            raise osv.except_osv(('Error!'),("First configure your moodle connection."))
+            raise osv.except_osv(_('Error!'),_("First configure your moodle connection."))
         return moodle_config_wiz_ids[0]
 
     def make_url(self, cr, uid, ids, context=None):
@@ -101,6 +101,8 @@ class event_moodle(osv.osv):
         """
         #connect to moodle
         url = self.browse(cr, uid, id, context=context).url
+        if not url:
+            raise osv.except_osv(_('Error!'),_("You must configure your moodle connection."))
         sock = xmlrpclib.ServerProxy(url)
         return sock.core_course_create_courses(courses)
 
@@ -125,7 +127,7 @@ class event_moodle(osv.osv):
         passwd = passwd + '+'
         return passwd
 
-    def check_email(self,email):
+    def check_email(self, email):
     
         """
         check if email is correct
diff --git a/addons/event_moodle/wizard_moodle.xml b/addons/event_moodle/wizard_moodle.xml
index d9e7266d055..7cc300521ce 100644
--- a/addons/event_moodle/wizard_moodle.xml
+++ b/addons/event_moodle/wizard_moodle.xml
@@ -8,7 +8,7 @@
                 <form string="Configure Moodle" version="7.0">
                     <header>
                         <button type="object" name="configure_moodle"
-                            string="Configure Moodle" class="oe_highlight"  />
+                            string="Apply" class="oe_highlight"  />
                             or
                             <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
@@ -16,14 +16,14 @@
                      <separator string="Server" colspan="4"/>
                      <field name="server_moodle"/>
                      <newline/>
-                     <separator string="Connexion with a Token" colspan="4"/>
+                     <separator string="Connection with a Token" colspan="4"/>
                      <label string="The easiest way to connect OpenERP with a moodle server is to create a 'token' in Moodle. It will be used to authenticate OpenERP as a trustable application." colspan="4"/>
                      <field name="moodle_token"/>
                      <newline/>
-                     <separator string="Connexion with Password and Username" colspan="4"/>
-                     <label string="Another approach is to create a user for OpenERP in Moodle. If you do so, make sure that this user has enough access rights" colspan="4"/>
+                     <separator string="Connection with username and password" colspan="4"/>
+                     <label string="Another approach is to create a user for OpenERP in Moodle. If you do so, make sure that this user has appropriate access rights." colspan="4"/>
                      <field name="moodle_username"/>
-                     <field name="moodle_password"/>
+                     <field name="moodle_password" password="True"/>
                     </group>
                 </form>
             </field>
@@ -39,10 +39,9 @@
         </record>
 
         <!-- register configuration wizard -->
-        <record id="config_wizard_config_moodle" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="configure_moodle"/>
-            <field name="type">automatic</field>
-            <field name="name">Configuration of moodle</field>
+            <field name="state">open</field>
         </record>
 
         <menuitem name="Moodle Configuration" parent="base.menu_marketing_config_root" id="wizard_moodle" action="configure_moodle"/>
diff --git a/addons/event_project/event_project.py b/addons/event_project/event_project.py
deleted file mode 100644
index 8590b84c4ad..00000000000
--- a/addons/event_project/event_project.py
+++ /dev/null
@@ -1,58 +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
-
-class one2many_mod_task(fields.one2many):
-    
-    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if not values:
-                values = {}
-        res = {}
-        for id in ids:
-            res[id] = []
-        for id in ids:
-            query = "select project_id from event_event where id = %s"
-            cr.execute(query, (id,))
-            project_ids = [ x[0] for x in cr.fetchall()]
-            ids2 = obj.pool.get(self._obj).search(cr, user, [(self._fields_id, 'in', project_ids), ('state', '<>', 'done')], 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[id].append( r['id'] )
-        return res
-
-class event(osv.osv):
-    _inherit = 'event.event'
-
-    def write(self, cr, uid, ids, vals, *args, **kwargs):
-        if 'date_begin' in vals and vals['date_begin']:
-            for eve in self.browse(cr, uid, ids):
-                if eve.project_id:
-                    self.pool.get('project.project').write(cr, uid, [eve.project_id.id], {'date_end': eve.date_begin[:10]})
-        return super(event,self).write(cr, uid, ids, vals, *args, **kwargs)
-
-    _columns = {
-        'project_id': fields.many2one('project.project', 'Project', readonly=True),
-        'task_ids': one2many_mod_task('project.task', 'project_id', "Project tasks", readonly=True, domain="[('state', '&lt;&gt;', 'done')]"),
-    }
-    
-event()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event_project/event_project_view.xml b/addons/event_project/event_project_view.xml
deleted file mode 100644
index e3b761aea30..00000000000
--- a/addons/event_project/event_project_view.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-    <!-- EVENTS  -->
-
-        <record model="ir.ui.view" id="view_event_form_inherited">
-            <field name="name">Events</field>
-            <field name="model">event.event</field>
-            <field name="inherit_id" ref="event.view_event_form"/>
-            <field name="arch" type="xml">
-                <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 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';gray:state in ('cancel','done')">
-                            <field name="sequence"/>
-                            <field name="name"/>
-                            <field name="user_id" />
-                            <field name="date_deadline" />
-                            <field name="planned_hours" widget="float_time"/>
-                            <field name="effective_hours" widget="float_time"/>
-                            <field name="state" />
-                        </tree>
-                    </field>
-                </page>
-                </notebook>
-            </field>
-        </record>
-      <act_window
-            id="act_event_task"
-            name="Tasks"
-            res_model="project.task"
-            src_model="event.event"
-            view_mode="tree,form,calendar,graph"
-            context="{'search_default_project_id': project_id, 'default_project_id': project_id}"
-            view_type="form"/>
-
-    </data>
-</openerp>
diff --git a/addons/event_project/i18n/ar.po b/addons/event_project/i18n/ar.po
index 05b7fdc7a94..d82da3ece7b 100644
--- a/addons/event_project/i18n/ar.po
+++ b/addons/event_project/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/bg.po b/addons/event_project/i18n/bg.po
index 80867fcdaff..7f30f57a519 100644
--- a/addons/event_project/i18n/bg.po
+++ b/addons/event_project/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/bs.po b/addons/event_project/i18n/bs.po
index d4953b3725b..fa6f459ec99 100644
--- a/addons/event_project/i18n/bs.po
+++ b/addons/event_project/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/ca.po b/addons/event_project/i18n/ca.po
index 93eeb9bf30b..1b67d0cfb2d 100644
--- a/addons/event_project/i18n/ca.po
+++ b/addons/event_project/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/cs.po b/addons/event_project/i18n/cs.po
index 97a74e5c25d..cef729125bb 100644
--- a/addons/event_project/i18n/cs.po
+++ b/addons/event_project/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/da.po b/addons/event_project/i18n/da.po
index 7d4a80f401d..83abf89d56b 100644
--- a/addons/event_project/i18n/da.po
+++ b/addons/event_project/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/de.po b/addons/event_project/i18n/de.po
index cdeb2576d1f..305f72b054a 100644
--- a/addons/event_project/i18n/de.po
+++ b/addons/event_project/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/el.po b/addons/event_project/i18n/el.po
index e806d4d40a5..76f2b038d1d 100644
--- a/addons/event_project/i18n/el.po
+++ b/addons/event_project/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/en_GB.po b/addons/event_project/i18n/en_GB.po
index 648a041386a..dcca1dff043 100644
--- a/addons/event_project/i18n/en_GB.po
+++ b/addons/event_project/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/es.po b/addons/event_project/i18n/es.po
index 8e45be0b4dd..34a0e80e8e8 100644
--- a/addons/event_project/i18n/es.po
+++ b/addons/event_project/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/es_AR.po b/addons/event_project/i18n/es_AR.po
index 93af33db7ba..28e4058811b 100644
--- a/addons/event_project/i18n/es_AR.po
+++ b/addons/event_project/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/es_CR.po b/addons/event_project/i18n/es_CR.po
index 992efb18362..23d06f315f3 100644
--- a/addons/event_project/i18n/es_CR.po
+++ b/addons/event_project/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: event_project
diff --git a/addons/event_project/i18n/es_EC.po b/addons/event_project/i18n/es_EC.po
index 18e381c4b83..8fafca1b77e 100644
--- a/addons/event_project/i18n/es_EC.po
+++ b/addons/event_project/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/es_MX.po b/addons/event_project/i18n/es_MX.po
deleted file mode 100644
index 0400a7baff9..00000000000
--- a/addons/event_project/i18n/es_MX.po
+++ /dev/null
@@ -1,165 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* event_project
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-23 22:46+0000\n"
-"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
-"<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: 2011-09-05 05:39+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: event_project
-#: model:ir.model,name:event_project.model_event_project
-msgid "Event Project"
-msgstr "Proyecto de evento"
-
-#. module: event_project
-#: field:event.project,date:0
-msgid "Date End"
-msgstr "Fecha final"
-
-#. module: event_project
-#: view:event.project:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: event_project
-#: model:ir.module.module,description:event_project.module_meta_information
-msgid ""
-"Organization and management of events.\n"
-"\n"
-"    This module allows you to create retro planning for managing your "
-"events.\n"
-msgstr ""
-"Organización y gestión de eventos.\n"
-"\n"
-"    Este módulo le permite crear retro planificaciones para gestionar sus "
-"eventos.\n"
-
-#. module: event_project
-#: help:event.project,project_id:0
-msgid ""
-"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."
-msgstr ""
-"Esta es la plantilla de proyecto. El proyecto de evento es un duplicado de "
-"esta plantilla. Tras hacer clic en 'Crear retro-planificación', el nuevo "
-"proyecto será duplicado a partir de esta plantilla."
-
-#. module: event_project
-#: view:event.project:0
-#: model:ir.actions.act_window,name:event_project.action_event_project
-msgid "Retro-Planning"
-msgstr "Retro-planificación"
-
-#. module: event_project
-#: constraint:event.event:0
-msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr "¡Error! La fecha final no puede ser anterior a la inicial."
-
-#. module: event_project
-#: field:event.event,project_id:0
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: event_project
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event_project.act_event_task
-msgid "Tasks"
-msgstr "Tareas"
-
-#. module: event_project
-#: view:event.event:0
-msgid "All tasks"
-msgstr "Todas las tareas"
-
-#. module: event_project
-#: model:ir.module.module,shortdesc:event_project.module_meta_information
-msgid "Event Project - Create Retro-Planning to manage your Events"
-msgstr ""
-"Proyecto de evento - Crea retro-planificación para gestionar sus eventos"
-
-#. module: event_project
-#: field:event.project,project_id:0
-msgid "Template of Project"
-msgstr "Plantilla de proyecto"
-
-#. module: event_project
-#: constraint:event.event:0
-msgid "Error ! You cannot create recursive event."
-msgstr "¡Error! No puede crear eventos recursivos."
-
-#. module: event_project
-#: field:event.event,task_ids:0
-msgid "Project tasks"
-msgstr "Tareas del proyecto"
-
-#. module: event_project
-#: view:event.project:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: event_project
-#: field:event.project,date_start:0
-msgid "Date Start"
-msgstr "Fecha inicial"
-
-#. module: event_project
-#: view:event.event:0
-msgid "Create Retro-Planning"
-msgstr "Crear retro-planificación"
-
-#. module: event_project
-#: model:ir.model,name:event_project.model_event_event
-msgid "Event"
-msgstr "Evento"
-
-#. module: event_project
-#: view:event.event:0
-msgid "Tasks Management"
-msgstr "Gestión de tareas"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Remaining Tasks"
-#~ msgstr "Tareas pendientes"
-
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
-
-#~ msgid ""
-#~ "Organization and management of events.\n"
-#~ "\n"
-#~ "    This module allow you to create retro planning for managing your "
-#~ "events.\n"
-#~ msgstr ""
-#~ "Organización y gestión de eventos.\n"
-#~ "\n"
-#~ "    Este módulo le permite crear retro planificaciones para gestionar sus "
-#~ "eventos.\n"
-
-#, python-format
-#~ msgid "Error !"
-#~ msgstr "¡ Error !"
-
-#, python-format
-#~ msgid ""
-#~ "No project defined for this event.\n"
-#~ "You can create one with the retro-planning button !"
-#~ msgstr ""
-#~ "Ningún proyecto definido para este evento.\n"
-#~ "¡Puede crear uno con el botón retro-planificación!"
-
-#~ msgid "Event - Project"
-#~ msgstr "Evento - Proyecto"
diff --git a/addons/event_project/i18n/es_PY.po b/addons/event_project/i18n/es_PY.po
index 23bf8400e1d..abc43bffc5e 100644
--- a/addons/event_project/i18n/es_PY.po
+++ b/addons/event_project/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/es_VE.po b/addons/event_project/i18n/es_VE.po
deleted file mode 100644
index 0400a7baff9..00000000000
--- a/addons/event_project/i18n/es_VE.po
+++ /dev/null
@@ -1,165 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* event_project
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-23 22:46+0000\n"
-"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
-"<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: 2011-09-05 05:39+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: event_project
-#: model:ir.model,name:event_project.model_event_project
-msgid "Event Project"
-msgstr "Proyecto de evento"
-
-#. module: event_project
-#: field:event.project,date:0
-msgid "Date End"
-msgstr "Fecha final"
-
-#. module: event_project
-#: view:event.project:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: event_project
-#: model:ir.module.module,description:event_project.module_meta_information
-msgid ""
-"Organization and management of events.\n"
-"\n"
-"    This module allows you to create retro planning for managing your "
-"events.\n"
-msgstr ""
-"Organización y gestión de eventos.\n"
-"\n"
-"    Este módulo le permite crear retro planificaciones para gestionar sus "
-"eventos.\n"
-
-#. module: event_project
-#: help:event.project,project_id:0
-msgid ""
-"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."
-msgstr ""
-"Esta es la plantilla de proyecto. El proyecto de evento es un duplicado de "
-"esta plantilla. Tras hacer clic en 'Crear retro-planificación', el nuevo "
-"proyecto será duplicado a partir de esta plantilla."
-
-#. module: event_project
-#: view:event.project:0
-#: model:ir.actions.act_window,name:event_project.action_event_project
-msgid "Retro-Planning"
-msgstr "Retro-planificación"
-
-#. module: event_project
-#: constraint:event.event:0
-msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr "¡Error! La fecha final no puede ser anterior a la inicial."
-
-#. module: event_project
-#: field:event.event,project_id:0
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: event_project
-#: view:event.event:0
-#: model:ir.actions.act_window,name:event_project.act_event_task
-msgid "Tasks"
-msgstr "Tareas"
-
-#. module: event_project
-#: view:event.event:0
-msgid "All tasks"
-msgstr "Todas las tareas"
-
-#. module: event_project
-#: model:ir.module.module,shortdesc:event_project.module_meta_information
-msgid "Event Project - Create Retro-Planning to manage your Events"
-msgstr ""
-"Proyecto de evento - Crea retro-planificación para gestionar sus eventos"
-
-#. module: event_project
-#: field:event.project,project_id:0
-msgid "Template of Project"
-msgstr "Plantilla de proyecto"
-
-#. module: event_project
-#: constraint:event.event:0
-msgid "Error ! You cannot create recursive event."
-msgstr "¡Error! No puede crear eventos recursivos."
-
-#. module: event_project
-#: field:event.event,task_ids:0
-msgid "Project tasks"
-msgstr "Tareas del proyecto"
-
-#. module: event_project
-#: view:event.project:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: event_project
-#: field:event.project,date_start:0
-msgid "Date Start"
-msgstr "Fecha inicial"
-
-#. module: event_project
-#: view:event.event:0
-msgid "Create Retro-Planning"
-msgstr "Crear retro-planificación"
-
-#. module: event_project
-#: model:ir.model,name:event_project.model_event_event
-msgid "Event"
-msgstr "Evento"
-
-#. module: event_project
-#: view:event.event:0
-msgid "Tasks Management"
-msgstr "Gestión de tareas"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Remaining Tasks"
-#~ msgstr "Tareas pendientes"
-
-#~ msgid "Cancel"
-#~ msgstr "Cancelar"
-
-#~ msgid ""
-#~ "Organization and management of events.\n"
-#~ "\n"
-#~ "    This module allow you to create retro planning for managing your "
-#~ "events.\n"
-#~ msgstr ""
-#~ "Organización y gestión de eventos.\n"
-#~ "\n"
-#~ "    Este módulo le permite crear retro planificaciones para gestionar sus "
-#~ "eventos.\n"
-
-#, python-format
-#~ msgid "Error !"
-#~ msgstr "¡ Error !"
-
-#, python-format
-#~ msgid ""
-#~ "No project defined for this event.\n"
-#~ "You can create one with the retro-planning button !"
-#~ msgstr ""
-#~ "Ningún proyecto definido para este evento.\n"
-#~ "¡Puede crear uno con el botón retro-planificación!"
-
-#~ msgid "Event - Project"
-#~ msgstr "Evento - Proyecto"
diff --git a/addons/event_project/i18n/et.po b/addons/event_project/i18n/et.po
index 0bde280420b..9e35b0196d6 100644
--- a/addons/event_project/i18n/et.po
+++ b/addons/event_project/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/fi.po b/addons/event_project/i18n/fi.po
index 4ab64581d90..55dfd92f70c 100644
--- a/addons/event_project/i18n/fi.po
+++ b/addons/event_project/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/fr.po b/addons/event_project/i18n/fr.po
index 8029084a1af..9bf8959c4fe 100644
--- a/addons/event_project/i18n/fr.po
+++ b/addons/event_project/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/gl.po b/addons/event_project/i18n/gl.po
index 14a8ab4623c..322ee6e2f7a 100644
--- a/addons/event_project/i18n/gl.po
+++ b/addons/event_project/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/hi.po b/addons/event_project/i18n/hi.po
index 8c07aa5e9f7..2d8de64e21d 100644
--- a/addons/event_project/i18n/hi.po
+++ b/addons/event_project/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/hr.po b/addons/event_project/i18n/hr.po
index ac06fba269e..f2df4836622 100644
--- a/addons/event_project/i18n/hr.po
+++ b/addons/event_project/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/hu.po b/addons/event_project/i18n/hu.po
index 51977b06b40..d8d5915eeaf 100644
--- a/addons/event_project/i18n/hu.po
+++ b/addons/event_project/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/id.po b/addons/event_project/i18n/id.po
index 87f99071f08..20ba16a267d 100644
--- a/addons/event_project/i18n/id.po
+++ b/addons/event_project/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/it.po b/addons/event_project/i18n/it.po
index 4b52600eafc..449395f3960 100644
--- a/addons/event_project/i18n/it.po
+++ b/addons/event_project/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/ja.po b/addons/event_project/i18n/ja.po
index 79f45008762..ce66911f84e 100644
--- a/addons/event_project/i18n/ja.po
+++ b/addons/event_project/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/ko.po b/addons/event_project/i18n/ko.po
index 9c838c91f80..d2af1c225fa 100644
--- a/addons/event_project/i18n/ko.po
+++ b/addons/event_project/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/lt.po b/addons/event_project/i18n/lt.po
index 51c9d772abb..0b8fe84fa4b 100644
--- a/addons/event_project/i18n/lt.po
+++ b/addons/event_project/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/lv.po b/addons/event_project/i18n/lv.po
index 78138c88d01..77f98390317 100644
--- a/addons/event_project/i18n/lv.po
+++ b/addons/event_project/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/mn.po b/addons/event_project/i18n/mn.po
new file mode 100644
index 00000000000..4233b48a9f7
--- /dev/null
+++ b/addons/event_project/i18n/mn.po
@@ -0,0 +1,113 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-24 06:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: event_project
+#: model:ir.model,name:event_project.model_event_project
+msgid "Event Project"
+msgstr "Үйл явдлын төсөл"
+
+#. module: event_project
+#: field:event.project,date:0
+msgid "Date End"
+msgstr "Дуусах огноо"
+
+#. module: event_project
+#: view:event.project:0
+msgid "Ok"
+msgstr "Тийм"
+
+#. module: event_project
+#: help:event.project,project_id:0
+msgid ""
+"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."
+msgstr ""
+"Энэ нь үлгэр төсөл. Үйл явдлын төсөл нь энэ төслийн хуулбар байна. 'Хойноос "
+"төлөвлөлтийг үүсгэх'-г дарсан дараа энэ төслийн хуулбар төсөл үүсэх болно."
+
+#. module: event_project
+#: view:event.project:0
+#: model:ir.actions.act_window,name:event_project.action_event_project
+msgid "Retro-Planning"
+msgstr "Хойноос-Төлөвлөлт"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! Closing Date cannot be set before Beginning Date."
+msgstr "Алдаа ! Хаагдах огноо нь Эхлэх огнооноос өмнө байж болохгүй."
+
+#. module: event_project
+#: field:event.event,project_id:0
+msgid "Project"
+msgstr "Төсөл"
+
+#. module: event_project
+#: field:event.project,project_id:0
+msgid "Template of Project"
+msgstr "Төслийн Үлгэр"
+
+#. module: event_project
+#: view:event.event:0
+msgid "All tasks"
+msgstr "Бүх даалгаврууд"
+
+#. module: event_project
+#: view:event.event:0
+#: model:ir.actions.act_window,name:event_project.act_event_task
+msgid "Tasks"
+msgstr "Даалгаврууд"
+
+#. module: event_project
+#: constraint:event.event:0
+msgid "Error ! You cannot create recursive event."
+msgstr "Алдаа ! Тойрог хамааралтай үйл явдлыг үүсгэж болохгүй."
+
+#. module: event_project
+#: field:event.event,task_ids:0
+msgid "Project tasks"
+msgstr "Төслийн даалгаврууд"
+
+#. module: event_project
+#: view:event.project:0
+msgid "Close"
+msgstr "Хаах"
+
+#. module: event_project
+#: field:event.project,date_start:0
+msgid "Date Start"
+msgstr "Эхлэх огноо"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Create Retro-Planning"
+msgstr "Хойноос төлөвлөлтийг үүсгэх"
+
+#. module: event_project
+#: model:ir.model,name:event_project.model_event_event
+msgid "Event"
+msgstr "Үйл явдал"
+
+#. module: event_project
+#: view:event.event:0
+msgid "Tasks Management"
+msgstr ""
+
+#~ msgid "Tasks management"
+#~ msgstr "Даалгаврын менежмент"
diff --git a/addons/event_project/i18n/event_project.pot b/addons/event_project/i18n/nb.po
similarity index 53%
rename from addons/event_project/i18n/event_project.pot
rename to addons/event_project/i18n/nb.po
index 7cd30276931..87e23c42087 100644
--- a/addons/event_project/i18n/event_project.pot
+++ b/addons/event_project/i18n/nb.po
@@ -1,104 +1,114 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* event_project
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2012-09-07 17:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
 msgid "Event Project"
-msgstr ""
+msgstr "Arrangement Prosjekt"
 
 #. module: event_project
 #: field:event.project,date:0
 msgid "Date End"
-msgstr ""
+msgstr "Sluttdato"
 
 #. module: event_project
 #: view:event.project:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: event_project
 #: help:event.project,project_id:0
-msgid "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."
+msgid ""
+"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."
 msgstr ""
+"Dette er ett mal Prosjekt. Prosjektet av arrangementet er en dublett av "
+"denne malen. Etter klikk på \"Create Retro-planlegging\", vil New Project "
+"dupliseres fra denne malen prosjektet."
 
 #. module: event_project
 #: view:event.project:0
 #: model:ir.actions.act_window,name:event_project.action_event_project
 msgid "Retro-Planning"
-msgstr ""
+msgstr "Retro-Planlegging"
 
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Feil ! Sluttdato kan ikke settes før startdato."
 
 #. module: event_project
 #: field:event.event,project_id:0
 msgid "Project"
-msgstr ""
+msgstr "Prosjekt"
 
 #. module: event_project
 #: field:event.project,project_id:0
 msgid "Template of Project"
-msgstr ""
+msgstr "Mal av prosjekt"
 
 #. module: event_project
 #: view:event.event:0
 msgid "All tasks"
-msgstr ""
+msgstr "Alle oppgaver"
 
 #. module: event_project
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event_project.act_event_task
 msgid "Tasks"
-msgstr ""
+msgstr "Oppgaver"
 
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive hendelse."
 
 #. module: event_project
 #: field:event.event,task_ids:0
 msgid "Project tasks"
-msgstr ""
+msgstr "Prosjektoppgaver"
 
 #. module: event_project
 #: view:event.project:0
 msgid "Close"
-msgstr ""
+msgstr "Lukke"
 
 #. module: event_project
 #: field:event.project,date_start:0
 msgid "Date Start"
-msgstr ""
+msgstr "Startdato"
 
 #. module: event_project
 #: view:event.event:0
 msgid "Create Retro-Planning"
-msgstr ""
+msgstr "Opprett Retro - planlegging."
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_event
 msgid "Event"
-msgstr ""
+msgstr "Arrangement"
 
 #. module: event_project
 #: view:event.event:0
 msgid "Tasks Management"
 msgstr ""
 
+#~ msgid "Tasks management"
+#~ msgstr "Oppgaver ledelse"
diff --git a/addons/event_project/i18n/nl.po b/addons/event_project/i18n/nl.po
index eedea1f8633..180a180e66a 100644
--- a/addons/event_project/i18n/nl.po
+++ b/addons/event_project/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/nl_BE.po b/addons/event_project/i18n/nl_BE.po
index 21faf8614de..22aaa6e1d33 100644
--- a/addons/event_project/i18n/nl_BE.po
+++ b/addons/event_project/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/pl.po b/addons/event_project/i18n/pl.po
index d77f668b468..2f9c8d441a0 100644
--- a/addons/event_project/i18n/pl.po
+++ b/addons/event_project/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/pt.po b/addons/event_project/i18n/pt.po
index 2af48b327b7..ea9273dd6ec 100644
--- a/addons/event_project/i18n/pt.po
+++ b/addons/event_project/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/pt_BR.po b/addons/event_project/i18n/pt_BR.po
index 8573243618d..31e7bd93e6b 100644
--- a/addons/event_project/i18n/pt_BR.po
+++ b/addons/event_project/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/ro.po b/addons/event_project/i18n/ro.po
index 7f4895a2215..53fb49cbb86 100644
--- a/addons/event_project/i18n/ro.po
+++ b/addons/event_project/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/ru.po b/addons/event_project/i18n/ru.po
index 34066e462f1..ab29625bdd7 100644
--- a/addons/event_project/i18n/ru.po
+++ b/addons/event_project/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/sl.po b/addons/event_project/i18n/sl.po
index 423cc06f458..7bd85b99ad0 100644
--- a/addons/event_project/i18n/sl.po
+++ b/addons/event_project/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/sq.po b/addons/event_project/i18n/sq.po
index fcbd7e03b4f..7656f7d7086 100644
--- a/addons/event_project/i18n/sq.po
+++ b/addons/event_project/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/sr.po b/addons/event_project/i18n/sr.po
index 1c058891280..bdccf1fe595 100644
--- a/addons/event_project/i18n/sr.po
+++ b/addons/event_project/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/sr@latin.po b/addons/event_project/i18n/sr@latin.po
index 922b9dcc091..e0d6e66d0fe 100644
--- a/addons/event_project/i18n/sr@latin.po
+++ b/addons/event_project/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/sv.po b/addons/event_project/i18n/sv.po
index 947cf08aa9e..83ab803270f 100644
--- a/addons/event_project/i18n/sv.po
+++ b/addons/event_project/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/tlh.po b/addons/event_project/i18n/tlh.po
index 1f5b6ce77a1..8b8777ce297 100644
--- a/addons/event_project/i18n/tlh.po
+++ b/addons/event_project/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/tr.po b/addons/event_project/i18n/tr.po
index df9b66c63cd..43e35e18170 100644
--- a/addons/event_project/i18n/tr.po
+++ b/addons/event_project/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/uk.po b/addons/event_project/i18n/uk.po
index 0c87b46f713..c8239fedbaf 100644
--- a/addons/event_project/i18n/uk.po
+++ b/addons/event_project/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/vi.po b/addons/event_project/i18n/vi.po
index 78c14dc4bd4..1c2a9cfab12 100644
--- a/addons/event_project/i18n/vi.po
+++ b/addons/event_project/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/zh_CN.po b/addons/event_project/i18n/zh_CN.po
index 4dec256e017..928cf60c4ee 100644
--- a/addons/event_project/i18n/zh_CN.po
+++ b/addons/event_project/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
diff --git a/addons/event_project/i18n/zh_TW.po b/addons/event_project/i18n/zh_TW.po
index ad81e8d0a91..0bd3fd6486c 100644
--- a/addons/event_project/i18n/zh_TW.po
+++ b/addons/event_project/i18n/zh_TW.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-01-23 17:18+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2012-08-30 03:32+0000\n"
+"Last-Translator: Bonnie Duan <bonnie.duan@cenoq.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
@@ -29,7 +29,7 @@ msgstr "結束日期"
 #. module: event_project
 #: view:event.project:0
 msgid "Ok"
-msgstr ""
+msgstr "確認"
 
 #. module: event_project
 #: help:event.project,project_id:0
@@ -37,13 +37,13 @@ msgid ""
 "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."
-msgstr ""
+msgstr "這是模板專案。專案的事件是重複的，這個模板。點擊打造追朔規劃“後，新專案將被複製此模板的專案。"
 
 #. module: event_project
 #: view:event.project:0
 #: model:ir.actions.act_window,name:event_project.action_event_project
 msgid "Retro-Planning"
-msgstr ""
+msgstr "追溯計畫"
 
 #. module: event_project
 #: constraint:event.event:0
@@ -63,23 +63,23 @@ msgstr "專案範本"
 #. module: event_project
 #: view:event.event:0
 msgid "All tasks"
-msgstr ""
+msgstr "所有的工作任務"
 
 #. module: event_project
 #: view:event.event:0
 #: model:ir.actions.act_window,name:event_project.act_event_task
 msgid "Tasks"
-msgstr ""
+msgstr "任務"
 
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! You cannot create recursive event."
-msgstr ""
+msgstr "錯誤！您不能創建遞歸的事件"
 
 #. module: event_project
 #: field:event.event,task_ids:0
 msgid "Project tasks"
-msgstr ""
+msgstr "專案任務"
 
 #. module: event_project
 #: view:event.project:0
@@ -94,7 +94,7 @@ msgstr "開始日期"
 #. module: event_project
 #: view:event.event:0
 msgid "Create Retro-Planning"
-msgstr ""
+msgstr "創建追溯計畫"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_event
@@ -104,7 +104,7 @@ msgstr "活動"
 #. module: event_project
 #: view:event.event:0
 msgid "Tasks Management"
-msgstr ""
+msgstr "任務管理"
 
 #~ msgid ""
 #~ "Organization and management of events.\n"
diff --git a/addons/event_project/wizard/event_project_retro.py b/addons/event_project/wizard/event_project_retro.py
deleted file mode 100644
index c7eba5e0ec1..00000000000
--- a/addons/event_project/wizard/event_project_retro.py
+++ /dev/null
@@ -1,83 +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/>.
-#
-##############################################################################
-
-#
-# Order Point Method:
-#   - Order if the virtual stock of today is bellow the min of the defined order point
-#
-
-from osv import fields, osv
-from datetime import date, datetime
-
-class event_project(osv.osv_memory):
-    """
-    Event Project
-    """
-    _name = "event.project"
-    _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."),
-        'date_start': fields.date('Date Start'),
-        'date': fields.date('Date End'),
-     }
-    
-    def _get_date_start(self, cr, uid, context=None):
-        event_obj = self.pool.get('event.event')
-        if context is None:
-            context = {}
-        event = event_obj.browse(cr, uid, context.get('active_id', False))
-        res = datetime.strptime(event.date_begin, "%Y-%m-%d %H:%M:%S").strftime("%Y-%m-%d")
-        return res
-    
-    def _get_date_end(self, cr, uid, context=None):
-        event_obj = self.pool.get('event.event')
-        if context is None:
-            context = {}
-        event = event_obj.browse(cr, uid, context.get('active_id', False), context=context)
-        res = datetime.strptime(event.date_end, "%Y-%m-%d %H:%M:%S").strftime("%Y-%m-%d")
-        return res
-        
-    _defaults = {
-        'date_start': _get_date_start,
-        'date': _get_date_end
-    }
-    
-    def create_duplicate(self, cr, uid, ids, context=None):
-        event_obj = self.pool.get('event.event')
-        project_obj = self.pool.get('project.project')
-        event = event_obj.browse(cr, uid, context.get('active_id', False), context=context)
-        for current in self.browse(cr, uid, ids, context=context):
-            duplicate_project_id = project_obj.copy(cr, uid, current.project_id.id, {
-                    'active': True,
-                    'date_start':current.date_start,
-                    'date': current.date,
-                    })
-            event_obj.write(cr, uid, [event.id], {'project_id': duplicate_project_id })
-
-        return {'type': 'ir.actions.act_window_close'}
-
-event_project()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event_project/wizard/event_project_retro_view.xml b/addons/event_project/wizard/event_project_retro_view.xml
deleted file mode 100644
index 886b33ef4ef..00000000000
--- a/addons/event_project/wizard/event_project_retro_view.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="view_event_project" model="ir.ui.view">
-            <field name="name">Retro-Planning</field>
-            <field name="model">event.project</field>
-            <field name="arch" type="xml">
-               <form string="Retro-Planning" version="7.0">
-                   <group col="4">
-                       <field name="project_id" colspan="4"/>
-                       <field name="date_start"/>
-                       <field name="date"/>
-                   </group>
-                   <footer>
-                       <button name="create_duplicate" string="Ok" type="object" class="oe_highlight"/>
-                       or
-                       <button string="Cancel" class="oe_link" special="cancel" />
-                   </footer>
-              </form>
-            </field>
-        </record>
-
-        <record id="action_event_project" model="ir.actions.act_window">
-            <field name="name">Retro-Planning</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">event.project</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_event_project"/>
-            <field name="target">new</field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index ff65d0e9172..484ec43bab3 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -38,12 +38,10 @@ when you confirm your sale order it will automatically create a registration for
 this event.
 """,
     'author': 'OpenERP SA',
-    'depends': ['event','sale','sale_crm'],
-    'update_xml': [
-        'event_sale_view.xml',
-    ],
-    'demo_xml': ['event_demo.xml'],
-    'test':['test/confirm.yml'],
+    'depends': ['event', 'sale_crm'],
+    'data': ['event_sale_view.xml'],
+    'demo': ['event_demo.xml'],
+    'test': ['test/confirm.yml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/event_sale/event_demo.xml b/addons/event_sale/event_demo.xml
index 3acd3c81f57..c3710623ef5 100644
--- a/addons/event_sale/event_demo.xml
+++ b/addons/event_sale/event_demo.xml
@@ -20,6 +20,7 @@
         <field name="supply_method">produce</field>
         <field name="uom_id" ref="product.product_uom_unit"/>
         <field name="uom_po_id" ref="product.product_uom_unit"/>
+        <field name="image">/9j/4AAQSkZJRgABAQEAZABkAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAB+AJYDAREAAhEBAxEB/8QAHAAAAQUBAQEAAAAAAAAAAAAAAAMFBgcIBAIB/8QAPxAAAQMDAgMECAMFBwUAAAAAAQIDBAAFEQYSByExE0FRcQgUIjJhgZGhUoKxFUJywdEWFyMkQ2KzJURzksL/xAAUAQEAAAAAAAAAAAAAAAAAAAAA/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8A2XQFAUBQFAUBQFAUBQFAUBQFAUBQFAUBQFAUBQFAUBQFAUBQFAUBQFAUCUuTHiMKfkyGWGk9VuLCUjzJoGyJqjTkuQI8a/2t50nAQiWgk+Qzz+VA8ZHiKAoCgKAoCgKAoG2RfLdHlLjPPlLiDhQ2mgEXy1K/71oeZxQLIuluX7s1k/moFky4qvdkMn84oFA62ejiD5KoPVAUBQRjiNq+Fo+wrnycOPL9iOznBcX/AEHfQZX1brG8ajnKlXSat3mShsEhDY8Ep7qBlVNb7NstuLLhz2gUOQ8MHvoLl4C8R5aLtH01eJSn40g7IrjhyppfcnP4T0+BxQaEHSgKAoCg4b1doFoiGVcJKGGgcZPUnwA76BtsesLBeJPqsScO3PutuJKSry8aCQA5oIBf9v8AaCYD+IfpQcmwGgiTkLXLIfZZmQJKFKJafdQA4kFRIBCUhJG3aOnjzNB5VcdVoffZbtdplSGmwSy3L2kKPTOeY8/hQKyJur4KWHf2cxM3MArYbdDaw7zJAVnBAAHd86D6nU2pWEFyRpu4JQhBUrs3gTy8OfX4UE94Z3V+7x2prgktokxUPJZfPtN7hnBHcedBNj0oMp+knqN2fr563doextzaWkp7txG5R+4oKldlfGgQ9b59aBysNycj3SM+wsh1t1KkEdxBGKDfSeaQSMUH2gKAoM/+k1eZMO+w4pWpLIi70+GSogn7CgpaHrN9q4NLTKUHEEbCFcxjpig2foa6LvekbXdXBhyTGQtf8WME/UUEQ1I+E6nmoJ7x+lAzyrukOuRoy0FbYJfdUf8ADYA6lR8fh9cUHXbJ9ucjbmbgw8MncvtQckHBoG24aZsF7kPTA8svqcBLjEg+ytIx3HHLwoO+PaIDBgNtvuboJ3ICnNylEoKcqz15ZoHRQGKB20Zyuj3/AIv50EvPSgxT6RUeRb+K96DoKQ+tLzZPekoHP6g0FYPyVZ60CIfJPU0FjcB9NP6q4hW2IEFUVhwSJSscg2g5IPnyHzoNyjpQFAUBQVdx40/pzUlpbjXG7xrbc2gVRluZOQeoIGTgkUGcNGcNU3HVTcSXerfFY7TBfUsjcM/ugjqe7OKDY0aRZNN2WNA9bYYjRmktNJKwVEJGBgDmT5UFF611Ym861kQ7E46e1WA64k4LKMYJJHQnuHWgkDcSPF0xMaaEVlAjOEqko3Ne6clwfvJ8fEZoI1AYhSw/siaPku9in1VLO5C1P4SfbSB7Kep5cxyoHJ7Tr0bcYuj7eoyGVJkdjcFtElQ3KA6dVJAzyOKBNGmUvxz61peTFeLpGYt2XnakFSVbs5ySSMfGgXsdhekz3y8xqK0BtxDiHFXPel1QOSNvPly5560FnaO5XZY8Wj+tBMKCqfSB4WnXltan2ottXmIkpb3HAeR+AnuPgaDHmptN6gsM9cO72mZDeSSMOtEA/EHvHxFA9aA4Z6v1fNbRbbRJTGJ9uW82UMoHjuPXyGTQbJ4R8PLXw/sPqcUh+a9hUqURguK8B4JHcKCbUBQFBzXSYzb7fInSFbWY7anFnwAGTQYk4iaouGotXSZq3VJU6sqIzyQjolI8hQJ2h07E5PMUFx6P4X6h1VZYdwl6w9RtElvIjw2Al5SQSCFr5Z5g8+dB1OaRtemtQybbamlIjtbcFatylHHMk95NBJoLSey2EApIwQe+gWRAgpd7UQ44czneGxn60HVQN94vVstHZ/tGUljtc7MgnOPKg52tUafdRuRdGCPHn/SgetHX+xquxWLtDCS2RlToTz5eNBNHLvbRDflInR3WmGy44W3QrakDJPI0GcNb8bNRXOS4zYli1w8kJUkBTqh4knp5D60Fc3PWGpZruJeoLs+euFTF4HkM4FA66Z4kawsb6Fxr5NdbSebUl0vII8MKzj5YoNWcONTtau0lDvTbXZKdBS63nOxaThQ8sigkdAUBQV16Qt2Nt4cyGkKwqY6lk+O33lfpj50GZnLGGND269vI/wAxd57qmyR/osjby81qV/6igbIqwh0p+NBrngS923C20HvR2qT8nV0DFq8gavmk/wC39KDzHfSlI50HQmU3nrQLJcQeeaCA8a0g2iC+kn2H1JOPiKDxZNIWmdZoclK32y40lSil5XM/pQdK9D23ACJUjPeS7z/SgTctUfSVkv01qU8sy7VIi7VqBG5ScpPTxT96CjQQRmgb1qCpisd1B0o6ig0j6J91L9hutmWcmI8l9H8LgIx9UE/Ogu2gKAoKO9LFco2iyx2I7zodddSkNoKtyyEgDl3+FBC+MkFdiiaXsLkd1LdstKEqUEHap1XNzB6HmPvQVU24V7nkjCAeqiBQay9HAPf3XRe1QUpMh0tE9Fp3dR8M5HyoLDXHYWoqWy2pR6koBNB5MSKesZg+bYoGd2DED91mertewz2afYGBtSSfuaDpsduiosUJpyM0pQjISpSkAknaOZPjQVvxztrKOFKlNMoDkSWkFQT7RGSOZ+YoGLhzLS9o2BhSApKNvM+BxQPNxuEWBEMmY+w02nAKldM92KCtOMmr7bJsrVst8huQt1YccUg+4B0Hmf5UFSGUlLfMjlQIwV9otTh/e50DpGYkPjczHedSORLbZUB9KC7vRVQ9D1BenZaVRmTDaSC8Nm5W9XTPXkDQaIZfZeBLLrbgHXYoHH0oFKAoPDjTbm3tEJXtO5O4ZwfEfGgo/wBKxzZEs4z0Q+f+OgzM+r/IoH4lqI/Sg3Pwst5tfDqwQVDapuC0VDwUpO4j6k0EloPh6ZoG19J/YM1eMKcadV9QcUDiykIZQkdAkAUEE4xxDI4c6kYSklXZpeQAM89wzQZitUzVkWImNbnrg2ynO1LbTmBk5/DQSXV1xud50pHgCx3IS2dq3Hi2ohwgYPLFBTt2dlBZBaWDnHMGg5ZcafGKGpkd5hx1AWlLiSklB6HB7jQdyP8ABjDu8aC3NHRHW9OQWG1rRlsOr28txVz5/LFA8pt7hVlS3D5qNBaXBBlTX7SBJx7HU+dBZlAUBmgoP0t1hMWznP8ApyP1boKB0va13vUthsiASZchtKsdySrKj8hQbzaU000ltOAlIAAHcBQejIb/ABUCUmW2lhZBydpxQIyX2RBUwFfuBH8qDoTLZwBuoG6+Nrmx3Y8Z5lCpDRaV2qNySnvBHxBxQUzA4ei43G4i2smMuFILZWxMUhLijnmARju7/GgQv+ltUWNltbs6Uhpa9iMqS7k+GQaBum6F19EYkXl1uIyiOhTynFttqcCQMk8+ZNBVHEJqcvUDci5zW5sh6MhztEbeQOcAhPIEeFBHpCCY5AFBdmhZ9vkaehqVLjoWGUIUlTgBBCQOlBIm3IbjoZaktOOlW0IQoKUSe7A76C0uF9ufhWyS8+ytpT7g2hacEgDr96CX0HO4p3ngUHM85IHROaCnPSH03ftUxICLcy1uZDiSFrxndt5/agi/CTh5d7BrmPe7k2y6I0cpjtoJ5KIwVE+WfrQX2zJeUPbYUD50C6VZ6tn60A4lKk+4rqKD0ppsjHZk/Og9pab7msfOgFJbSpKyjARlR591AwcNG/8AosiYpGVS5jrufhnb/I0CfFIhVstw24HrqMn50FB8b+Ldw1BcZNjsspUeyMktktnCpRHUqP4fAfWgqhLqFoClrGcnOTQekvx/d7VH1oFbcmMu6Q0IWklT6Bgd/MUE40q/Pd1PMeskd2TPRd2VMobSSdwXkfLlzPTFBssYzQfaD4Ug0Hktg0HJOgofSAoA4oEmbc2hSFBIymg7BGR4UB6unwFAdgMYxQfeyAoPvZjwoOG/rTGsc+QeWyOsg/lOKDm0TE9V0pbWiMK7BK1D4q9o/c0Eb45+xol1Y5FO9WfyKoMLXOYtcgoSojJ50DtpV2yt3JEa9tKLLiNwUXNoSru7qCwzYtLpSHRYt6e5RcVg0DpZGLA2pBhacjmSk5TtSpxWR3gAZoJYzP1La4i7pFs78COwk7n0RlNhIJAOenU4oLd4WNX5y1Lul9nOvLlY7BpSwQhA7+XeTQTOgKAoCgMUBQBNB5KhQeVLxQeC8PGgYNev7tLS2EKwt8oZT5qUBQPDD7TLDbSeSUJCQPIUEF47PpXoCXtPMIX/AMaqDEEKJ61eGGzzDjqUn5mgdtYWfsddXC17doRNLSR/t3YH2IoNtcJI8EaFh5YaWpTjm8qQDkhZT/8AIHyoGXQMBpnXcxaW0J7N2SeQxjc4cUFhX6CzdrJNtr2OzlMLaPwyCM0Ef4SSnH9HMMP8n4i1MOJ8Ck4P3zQS+gKAoCgKD4TQeCaBJSjQIuKOKDmdWRmgjWq5ILlujLVgLlpWfygn+lApIuhT0NBDeJkp656VlwWRudcQpKE56kpOKDLFlaXF1LEalsONrTIRuQpJB94UFkcQrC5L4pNXyCkPQpbzbjuDzbUnGcjw9kUF0cH7tIhaLjRriksSO2fcKFHmAt1Sh9jQPWmJDaNU3N9KgQrmkj44JoJi1OCse1QR3SaxbtYX63g7WpCkzGh/F733B+tBMkvg99AvQFAUBQfCM0HhQoE1JoEHE8qDleFAyXiM247HU4kK2r5ZHwoOGZCQQcHFBFtSQ1tsb0LT73fQRI2pl2UlxaGyvPvFOT9aDzcowadKxjkcCgerWVhhHtc8UDlZXltzXSCcnrQS2DLcOBk0CUx0s6qtUtPvPJcjr+IxuH6UEtZcVtoP/9k=</field>
     </record>
     </data>
 </openerp>
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 681116d064e..f4d7fcaa013 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -39,8 +39,8 @@ class sale_order_line(osv.osv):
     _columns = {
         'event_id': fields.many2one('event.event', 'Event', help="Choose an event and it will automatically create a registration for this event."),
         #those 2 fields are used for dynamic domains and filled by onchange
-        'event_type_id': fields.related('event_type_id', type='many2one', relation="event.type", string="Event Type"),
-        'event_ok': fields.related('event_ok', string='event_ok', type='boolean'),
+        'event_type_id': fields.related('product_id','event_type_id', type='many2one', relation="event.type", string="Event Type"),
+        'event_ok': fields.related('product_id', 'event_ok', string='event_ok', type='boolean'),
     }
 
     def product_id_change(self, cr, uid, ids,
@@ -81,12 +81,10 @@ class sale_order_line(osv.osv):
                     'nb_register': int(order_line.product_uom_qty),
                     'email': order_line.order_id.partner_id.email,
                     'phone': order_line.order_id.partner_id.phone,
-                    'street': order_line.order_id.partner_invoice_id.street,
-                    'city': order_line.order_id.partner_invoice_id.city,
                     'origin': order_line.order_id.name,
                     'event_id': order_line.event_id.id,
                 }
                 registration_id = registration_obj.create(cr, uid, dic, context=context)
                 message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
-                registration_obj.message_append_note(cr, uid, [registration_id], body=message, context=context)
+                registration_obj.message_post(cr, uid, [registration_id], body=message, context=context)
         return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 82c1c05b714..ab7568d704e 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -6,10 +6,11 @@
              <field name="model">product.product</field>
              <field name="inherit_id" ref="product.product_normal_form_view" />
              <field name="arch" type="xml">
-                <field name="purchase_ok" position="after">
+                <div name="options" position="inside">
                     <field name="event_ok" on_change="onchange_event_ok(event_ok, context)"/>
-                </field>
-                <field name='supply_method' position='after'>
+                    <label for="event_ok"/>
+                </div>
+                <field name='default_code' position='before'>
                     <field name="event_type_id" attrs="{'readonly': [('event_ok', '=', False)]}"/>
                 </field>
              </field>
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 1e8c57a9524..bba1fc22e07 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -21,12 +21,12 @@
 ##############################################################################
 
 {
-    "name" : "Email Gateway",
-    "version" : "1.0",
-    "depends" : ["base", 'mail'],
-    "author" : "OpenERP SA",
-    "category": 'Tools',
-    "description": """
+    'name' : 'Email Gateway',
+    'version' : '1.0',
+    'depends' : ['base', 'mail'],
+    'author' : 'OpenERP SA',
+    'category': 'Tools',
+    'description': """
 Retrieve incoming email on POP/IMAP servers.
 ============================================
 
@@ -35,9 +35,8 @@ these accounts will be automatically downloaded into your OpenERP system. All
 POP3/IMAP-compatible servers are supported, included those that require an
 encrypted SSL/TLS connection.
 
-This can be used to easily create email-based workflows for many email-enabled
-OpenERP documents, such as:
-
+This can be used to easily create email-based workflows for many email-enabled OpenERP documents, such as:
+----------------------------------------------------------------------------------------------------------
     * CRM Leads/Opportunities
     * CRM Claims
     * Project Issues
@@ -56,19 +55,15 @@ For more specific needs, you may also assign custom-defined actions
 (technically: Server Actions) to be triggered for each incoming mail.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
-        "fetchmail_view.xml",
-        "fetchmail_data.xml",
+    'data': [
+        'fetchmail_view.xml',
+        'fetchmail_data.xml',
         'security/ir.model.access.csv',
         'fetchmail_installer_view.xml'
     ],
-    'demo_xml': [
-
-    ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00692978332890137453',
     'images': ['images/1_email_servers.jpeg'],
 }
 
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 544a4f81b96..68f05dfeee2 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -77,7 +77,7 @@ class fetchmail_server(osv.osv):
                                                                                              "emails to the existing conversations (documents)."),
         'priority': fields.integer('Server Priority', readonly=True, states={'draft':[('readonly', False)]}, help="Defines the order of processing, "
                                                                                                                   "lower values mean higher priority"),
-        'message_ids': fields.one2many('mail.message', 'fetchmail_server_id', 'Messages', readonly=True),
+        'message_ids': fields.one2many('mail.mail', 'fetchmail_server_id', 'Messages', readonly=True),
         'configuration' : fields.text('Configuration'),
         'script' : fields.char('Script', readonly=True, size=64),
     }
@@ -195,7 +195,7 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
                                                              strip_attachments=(not server.attach),
                                                              context=context)
                         if res_id and server.action_id:
-                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
+                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id], 'active_model': context.get("thread_model", False)})
                             imap_server.store(num, '+FLAGS', '\\Seen')
                             cr.commit()
                         count += 1
@@ -220,7 +220,7 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
                                                              strip_attachments=(not server.attach),
                                                              context=context)
                         if res_id and server.action_id:
-                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id]})
+                            action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id], 'active_model': context.get("thread_model", False)})
                         pop_server.dele(num)
                         cr.commit()
                     _logger.info("fetched/processed %s email(s) on %s server %s", numMsgs, server.type, server.name)
@@ -232,8 +232,8 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS
             server.write({'date': time.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)})
         return True
 
-class mail_message(osv.osv):
-    _inherit = "mail.message"
+class mail_mail(osv.osv):
+    _inherit = "mail.mail"
     _columns = {
         'fetchmail_server_id': fields.many2one('fetchmail.server', "Inbound Mail Server",
                                                readonly=True,
@@ -243,20 +243,20 @@ class mail_message(osv.osv):
 
     def create(self, cr, uid, values, context=None):
         if context is None:
-            context={}
+            context = {}
         fetchmail_server_id = context.get('fetchmail_server_id')
         if fetchmail_server_id:
             values['fetchmail_server_id'] = fetchmail_server_id
-        res = super(mail_message,self).create(cr, uid, values, context=context)
+        res = super(mail_mail, self).create(cr, uid, values, context=context)
         return res
 
     def write(self, cr, uid, ids, values, context=None):
         if context is None:
-            context={}
+            context = {}
         fetchmail_server_id = context.get('fetchmail_server_id')
         if fetchmail_server_id:
-            values['fetchmail_server_id'] = server_id
-        res = super(mail_message,self).write(cr, uid, ids, values, context=context)
+            values['fetchmail_server_id'] = fetchmail_server_id
+        res = super(mail_mail, self).write(cr, uid, ids, values, context=context)
         return res
 
 
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index cf651b5fd3d..66c7e5a7f5c 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -24,9 +24,9 @@
             <field name="arch" type="xml">
                 <form string="Incoming Mail Server" version="7.0">
                     <header attrs="{'invisible' : [('type', '=', 'local')]}">
-                        <button string="Test &amp; Confirm" type="object" name="button_confirm_login" states="draft" icon="gtk-apply"/>
-                        <button string="Fetch Now" type="object" name="fetch_mail" states="done" icon="gtk-network"/>
-                        <button string="Reset Confirmation" type="object" name="set_draft" icon="gtk-convert" states="done"/>
+                        <button string="Test &amp; Confirm" type="object" name="button_confirm_login" states="draft"/>
+                        <button string="Fetch Now" type="object" name="fetch_mail" states="done"/>
+                        <button string="Reset Confirmation" type="object" name="set_draft" states="done"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>
@@ -104,27 +104,16 @@
         />
 
       <record model="ir.ui.view" id="email_message_tree_view">
-          <field name="name">mail.message.list.fetchmail</field>
-          <field name="model">mail.message</field>
-          <field name="inherit_id" ref="mail.view_email_message_tree"/>
+          <field name="name">mail.mail.form.fetchmail</field>
+          <field name="model">mail.mail</field>
+          <field name="inherit_id" ref="mail.view_mail_form"/>
           <field name="arch" type="xml">
-              <field name="user_id" position="after">
+              <field name="references" position="after">
                   <field name="fetchmail_server_id"/>
               </field>
           </field>
       </record>
 
-      <record model="ir.ui.view" id="email_message_search_view">
-          <field name="name">mail.message.inherit.search</field>
-          <field name="model">mail.message</field>
-          <field name="inherit_id" ref="mail.view_email_message_search"/>
-          <field name="arch" type="xml">
-            <xpath expr="/search/group/filter[@string='Thread']" position="before">
-                <filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'fetchmail_server_id'}"/>
-            </xpath>
-          </field>
-      </record>
-
       <act_window
             context="{'search_default_server_id': active_id, 'default_fetchmail_server_id': active_id}"
             id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('fetchmail_server_id', '=', active_id)]"
diff --git a/addons/fetchmail/i18n/ar.po b/addons/fetchmail/i18n/ar.po
index 02433f440f0..a5891fb3637 100644
--- a/addons/fetchmail/i18n/ar.po
+++ b/addons/fetchmail/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/bg.po b/addons/fetchmail/i18n/bg.po
index c5eb7c5a44f..914ba1480d9 100644
--- a/addons/fetchmail/i18n/bg.po
+++ b/addons/fetchmail/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/ca.po b/addons/fetchmail/i18n/ca.po
index c2a988a1901..b9f2157bc08 100644
--- a/addons/fetchmail/i18n/ca.po
+++ b/addons/fetchmail/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/da.po b/addons/fetchmail/i18n/da.po
index e100b324619..5b9d99f76ad 100644
--- a/addons/fetchmail/i18n/da.po
+++ b/addons/fetchmail/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/de.po b/addons/fetchmail/i18n/de.po
index ed78821a00a..fdff5c1fd83 100644
--- a/addons/fetchmail/i18n/de.po
+++ b/addons/fetchmail/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/el.po b/addons/fetchmail/i18n/el.po
index 3b0c95d2464..8dcb16cecc1 100644
--- a/addons/fetchmail/i18n/el.po
+++ b/addons/fetchmail/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/en_GB.po b/addons/fetchmail/i18n/en_GB.po
index 51747757b22..9d2331c1706 100644
--- a/addons/fetchmail/i18n/en_GB.po
+++ b/addons/fetchmail/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/es.po b/addons/fetchmail/i18n/es.po
index a5fdef5a3e0..53d7329019e 100644
--- a/addons/fetchmail/i18n/es.po
+++ b/addons/fetchmail/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/es_CR.po b/addons/fetchmail/i18n/es_CR.po
index 5483228cf7d..9fed2c6325c 100644
--- a/addons/fetchmail/i18n/es_CR.po
+++ b/addons/fetchmail/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: fetchmail
diff --git a/addons/fetchmail/i18n/et.po b/addons/fetchmail/i18n/et.po
index 63761cd852a..d43aade6b4d 100644
--- a/addons/fetchmail/i18n/et.po
+++ b/addons/fetchmail/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/fi.po b/addons/fetchmail/i18n/fi.po
index f9839235091..cfff3266a4c 100644
--- a/addons/fetchmail/i18n/fi.po
+++ b/addons/fetchmail/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/fr.po b/addons/fetchmail/i18n/fr.po
index 6481d741ada..321bbd9ed13 100644
--- a/addons/fetchmail/i18n/fr.po
+++ b/addons/fetchmail/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/gl.po b/addons/fetchmail/i18n/gl.po
index aabcae6dea5..ffe0853df16 100644
--- a/addons/fetchmail/i18n/gl.po
+++ b/addons/fetchmail/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/hr.po b/addons/fetchmail/i18n/hr.po
index 49701e03c33..15e07f93d8f 100644
--- a/addons/fetchmail/i18n/hr.po
+++ b/addons/fetchmail/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/hu.po b/addons/fetchmail/i18n/hu.po
index a0f8aeb1655..c97d2efd035 100644
--- a/addons/fetchmail/i18n/hu.po
+++ b/addons/fetchmail/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/it.po b/addons/fetchmail/i18n/it.po
index 7066ff9cdba..2c16a6fc2e7 100644
--- a/addons/fetchmail/i18n/it.po
+++ b/addons/fetchmail/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/ja.po b/addons/fetchmail/i18n/ja.po
index fa5535c5174..1e9c5f9750d 100644
--- a/addons/fetchmail/i18n/ja.po
+++ b/addons/fetchmail/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/lt.po b/addons/fetchmail/i18n/lt.po
index 82df0314d33..406a3dce1c8 100644
--- a/addons/fetchmail/i18n/lt.po
+++ b/addons/fetchmail/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/lv.po b/addons/fetchmail/i18n/lv.po
index a13aea17ef8..798025c1a7d 100644
--- a/addons/fetchmail/i18n/lv.po
+++ b/addons/fetchmail/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/mk.po b/addons/fetchmail/i18n/mk.po
new file mode 100644
index 00000000000..bf21fed74af
--- /dev/null
+++ b/addons/fetchmail/i18n/mk.po
@@ -0,0 +1,333 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-18 16:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Потврдено"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
+msgid ""
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,state:0
+msgid "State"
+msgstr "Состојба"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP сервери"
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr ""
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr ""
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr ""
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
+msgid "Name"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr ""
+
+#. module: fetchmail
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,active:0
+msgid "Active"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced Options"
+msgstr ""
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "IMAP Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "IMAP"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,type:0
+msgid "Server Type"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Login Information"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server Information"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr ""
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr ""
+
+#. module: fetchmail
+#: help:fetchmail.server,object_id:0
+msgid ""
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
+msgstr ""
+
+#. module: fetchmail
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr ""
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Непотврдено"
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr ""
+
+#. module: fetchmail
+#: view:mail.message:0
+msgid "Mail Server"
+msgstr ""
+
+#~ msgid "Confirm"
+#~ msgstr "Потврди"
+
+#~ msgid "Group By..."
+#~ msgstr "Групирај по..."
+
+#~ msgid "Type"
+#~ msgstr "Вид"
+
+#~ msgid ""
+#~ "Warning! Record for selected Model can not be created\n"
+#~ "Please choose valid Model"
+#~ msgstr ""
+#~ "Предупредување! Записот за избраниот Модел не може да се креира\n"
+#~ "Изберете валиден Модел"
diff --git a/addons/fetchmail/i18n/mn.po b/addons/fetchmail/i18n/mn.po
index 91bed8ff2cb..25f88e21725 100644
--- a/addons/fetchmail/i18n/mn.po
+++ b/addons/fetchmail/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/nb.po b/addons/fetchmail/i18n/nb.po
new file mode 100644
index 00000000000..720e3fdc685
--- /dev/null
+++ b/addons/fetchmail/i18n/nb.po
@@ -0,0 +1,335 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-08 18:59+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Confirmed"
+msgstr "Bekreftet"
+
+#. module: fetchmail
+#: field:fetchmail.server,server:0
+msgid "Server Name"
+msgstr "Tjener navn"
+
+#. module: fetchmail
+#: field:fetchmail.server,script:0
+msgid "Script"
+msgstr "Manus"
+
+#. module: fetchmail
+#: help:fetchmail.server,priority:0
+msgid "Defines the order of processing, lower values mean higher priority"
+msgstr ""
+"Definerer rekkefølgen av behandlingen, lavere verdier betyr høyere prioritet."
+
+#. module: fetchmail
+#: help:fetchmail.server,is_ssl:0
+msgid ""
+"Connections are encrypted with SSL/TLS through a dedicated port (default: "
+"IMAPS=993, POP3S=995)"
+msgstr ""
+"Tilkoblinger er kryptert med SSL / TLS gjennom en egen port (standard: IMAPS "
+"= 993, POP3S = 995)"
+
+#. module: fetchmail
+#: field:fetchmail.server,attach:0
+msgid "Keep Attachments"
+msgstr "Hold Vedlegg"
+
+#. module: fetchmail
+#: help:fetchmail.server,original:0
+msgid ""
+"Whether a full original copy of each email should be kept for referenceand "
+"attached to each processed message. This will usually double the size of "
+"your message database."
+msgstr ""
+"Om en full original kopi av hver e-post bør holdes for referenceand festet "
+"til hver bearbeidet melding. Dette vil vanligvis doble størrelsen på "
+"meldingen database."
+
+#. module: fetchmail
+#: field:fetchmail.server,priority:0
+msgid "Server Priority"
+msgstr "Tjener prioritet."
+
+#. module: fetchmail
+#: field:fetchmail.server,state:0
+msgid "State"
+msgstr "Stat"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP"
+msgstr "POP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Fetch Now"
+msgstr "Hente nå."
+
+#. module: fetchmail
+#: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
+#: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
+msgid "Incoming Mail Servers"
+msgstr "Innkommende Mail Tjenere."
+
+#. module: fetchmail
+#: field:fetchmail.server,port:0
+msgid "Port"
+msgstr "Port"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "POP/IMAP Servers"
+msgstr "POP/IMAP tjenere."
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "Local Server"
+msgstr "Lokal tjener."
+
+#. module: fetchmail
+#: field:fetchmail.server,user:0
+msgid "Username"
+msgstr "Brukernavn:"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_fetchmail_server
+msgid "POP/IMAP Server"
+msgstr "POP/IMAP Tjener."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Reset Confirmation"
+msgstr "Tilbakestille Bekreftelse."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "SSL"
+msgstr "SSL"
+
+#. module: fetchmail
+#: model:ir.model,name:fetchmail.model_mail_message
+msgid "Email Message"
+msgstr "E-post Melding."
+
+#. module: fetchmail
+#: field:fetchmail.server,date:0
+msgid "Last Fetch Date"
+msgstr "Siste Hente Dato."
+
+#. module: fetchmail
+#: help:fetchmail.server,action_id:0
+msgid ""
+"Optional custom server action to trigger for each incoming mail, on the "
+"record that was created or updated by this mail"
+msgstr ""
+"Ekstra tilpasset server tiltak for å utløse for hver innkommende e-post, på "
+"plata som ble opprettet eller oppdatert i denne posten."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "# of emails"
+msgstr "# Av e-post."
+
+#. module: fetchmail
+#: field:fetchmail.server,original:0
+msgid "Keep Original"
+msgstr "Hold Original"
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid ""
+"Here is what we got instead:\n"
+" %s"
+msgstr ""
+"Her er hva vi fikk i stedet:\n"
+"  % s"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+#: field:fetchmail.server,configuration:0
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Incoming Mail Server"
+msgstr "Innkommende E-post tjener."
+
+#. module: fetchmail
+#: code:addons/fetchmail/fetchmail.py:155
+#, python-format
+msgid "Connection test failed!"
+msgstr "Tilkoblingen var mislykket!"
+
+#. module: fetchmail
+#: help:fetchmail.server,server:0
+msgid "Hostname or IP of the mail server"
+msgstr "Vertsnavn eller IP for e-postserveren."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type IMAP."
+msgstr "Tjener type IMAP."
+
+#. module: fetchmail
+#: field:fetchmail.server,name:0
+msgid "Name"
+msgstr "Navn"
+
+#. module: fetchmail
+#: field:fetchmail.server,is_ssl:0
+msgid "SSL/TLS"
+msgstr "SSL/TLS"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Test & Confirm"
+msgstr "Test & Bekreft"
+
+#. module: fetchmail
+#: field:fetchmail.server,action_id:0
+msgid "Server Action"
+msgstr "Tjenerhandling"
+
+#. module: fetchmail
+#: field:mail.message,fetchmail_server_id:0
+msgid "Inbound Mail Server"
+msgstr "Inngående E-post tjener."
+
+#. module: fetchmail
+#: field:fetchmail.server,message_ids:0
+#: model:ir.actions.act_window,name:fetchmail.act_server_history
+msgid "Messages"
+msgstr "Meldinger"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Search Incoming Mail Servers"
+msgstr "Søk innkommende post tjenere."
+
+#. module: fetchmail
+#: field:fetchmail.server,active:0
+msgid "Active"
+msgstr "Aktiv"
+
+#. module: fetchmail
+#: help:fetchmail.server,attach:0
+msgid ""
+"Whether attachments should be downloaded. If not enabled, incoming emails "
+"will be stripped of any attachments before being processed"
+msgstr ""
+"Om vedlegg skal lastes ned. Hvis ikke er aktivert, vil innkommende e-post "
+"blir fratatt eventuelle vedlegg før de behandles."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced Options"
+msgstr ""
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "IMAP Server"
+msgstr "IMAP-tjener"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "IMAP"
+msgstr "IMAP"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server type POP."
+msgstr "Tjener type POP."
+
+#. module: fetchmail
+#: field:fetchmail.server,password:0
+msgid "Password"
+msgstr "Passord:"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Actions to Perform on Incoming Mails"
+msgstr "Tiltak for å utføre på innkommende post."
+
+#. module: fetchmail
+#: field:fetchmail.server,type:0
+msgid "Server Type"
+msgstr "Tjener Type."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Login Information"
+msgstr "Inn loggings informasjon."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server Information"
+msgstr "Tjenerinformasjon"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "If SSL required."
+msgstr "Hvis SSL nødvendig."
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Advanced"
+msgstr "Avansert"
+
+#. module: fetchmail
+#: view:fetchmail.server:0
+msgid "Server & Login"
+msgstr "Tjener og Logg inn."
+
+#. module: fetchmail
+#: help:fetchmail.server,object_id:0
+msgid ""
+"Process each incoming mail as part of a conversation corresponding to this "
+"document type. This will create new documents for new conversations, or "
+"attach follow-up emails to the existing conversations (documents)."
+msgstr ""
+"Behandle hver innkommende post som del av en samtale tilsvarende denne "
+"dokumenttypen. Dette vil skape nye dokumenter for nye samtaler, eller legge "
+"oppfølging e-post til de eksisterende samtaler (dokumenter)."
+
+#. module: fetchmail
+#: field:fetchmail.server,object_id:0
+msgid "Create a New Record"
+msgstr "Oppretter en ny oppføring."
+
+#. module: fetchmail
+#: selection:fetchmail.server,state:0
+msgid "Not Confirmed"
+msgstr "Ikke bekreftet."
+
+#. module: fetchmail
+#: selection:fetchmail.server,type:0
+msgid "POP Server"
+msgstr "POP tjener."
+
+#. module: fetchmail
+#: view:mail.message:0
+msgid "Mail Server"
+msgstr "E-posttjener"
+
+#~ msgid "Advanced options"
+#~ msgstr "Avanserte alternativer"
diff --git a/addons/fetchmail/i18n/nl.po b/addons/fetchmail/i18n/nl.po
index 762de66b43f..1ab9a939b85 100644
--- a/addons/fetchmail/i18n/nl.po
+++ b/addons/fetchmail/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/pl.po b/addons/fetchmail/i18n/pl.po
index e03a62c6d93..ce6063e62a3 100644
--- a/addons/fetchmail/i18n/pl.po
+++ b/addons/fetchmail/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/pt.po b/addons/fetchmail/i18n/pt.po
index 6b71ea2bb59..3e67d3597f0 100644
--- a/addons/fetchmail/i18n/pt.po
+++ b/addons/fetchmail/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po
index 4454f778eb9..d3dd298ce87 100644
--- a/addons/fetchmail/i18n/pt_BR.po
+++ b/addons/fetchmail/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 22:38+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -72,7 +73,7 @@ msgstr "Prioridade do Servidor"
 #. module: fetchmail
 #: field:fetchmail.server,state:0
 msgid "State"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
diff --git a/addons/fetchmail/i18n/ro.po b/addons/fetchmail/i18n/ro.po
index ea90ab4e12d..367455f4523 100644
--- a/addons/fetchmail/i18n/ro.po
+++ b/addons/fetchmail/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/ru.po b/addons/fetchmail/i18n/ru.po
index 13eedc91a61..42d3b8bf914 100644
--- a/addons/fetchmail/i18n/ru.po
+++ b/addons/fetchmail/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -25,17 +25,18 @@ msgstr "Подтверждено"
 #. module: fetchmail
 #: field:fetchmail.server,server:0
 msgid "Server Name"
-msgstr ""
+msgstr "Название сервера"
 
 #. module: fetchmail
 #: field:fetchmail.server,script:0
 msgid "Script"
-msgstr ""
+msgstr "Скрипт"
 
 #. module: fetchmail
 #: help:fetchmail.server,priority:0
 msgid "Defines the order of processing, lower values mean higher priority"
 msgstr ""
+"Определяет порядок обработки, меньшие значения означают больший приоритет"
 
 #. module: fetchmail
 #: help:fetchmail.server,is_ssl:0
@@ -43,11 +44,13 @@ msgid ""
 "Connections are encrypted with SSL/TLS through a dedicated port (default: "
 "IMAPS=993, POP3S=995)"
 msgstr ""
+"Соединения зашифрованы с SSL/TLS через выделенный порт (по умолчанию: "
+"IMAPS=993, POP3S=995)"
 
 #. module: fetchmail
 #: field:fetchmail.server,attach:0
 msgid "Keep Attachments"
-msgstr ""
+msgstr "Хранить вложения"
 
 #. module: fetchmail
 #: help:fetchmail.server,original:0
@@ -56,6 +59,9 @@ msgid ""
 "attached to each processed message. This will usually double the size of "
 "your message database."
 msgstr ""
+"Должна ли быть сохранена для ссылки полная копия каждого письма и "
+"прикреплена для каждого обработанного сообщения. Обычно это будет удваивать "
+"размер базы данных сообщений."
 
 #. module: fetchmail
 #: field:fetchmail.server,priority:0
@@ -75,13 +81,13 @@ msgstr "POP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Fetch Now"
-msgstr ""
+msgstr "Получить сейчас"
 
 #. module: fetchmail
 #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree
 #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree
 msgid "Incoming Mail Servers"
-msgstr ""
+msgstr "Серверы входящей почты"
 
 #. module: fetchmail
 #: field:fetchmail.server,port:0
@@ -96,12 +102,12 @@ msgstr "Сервера POP/IMAP"
 #. module: fetchmail
 #: selection:fetchmail.server,type:0
 msgid "Local Server"
-msgstr ""
+msgstr "Локальный сервер"
 
 #. module: fetchmail
 #: field:fetchmail.server,user:0
 msgid "Username"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_fetchmail_server
@@ -111,7 +117,7 @@ msgstr "Сервер POP/IMAP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Reset Confirmation"
-msgstr ""
+msgstr "Сброс подтверждения"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -121,12 +127,12 @@ msgstr "SSL"
 #. module: fetchmail
 #: model:ir.model,name:fetchmail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Сообщение эл.почты"
 
 #. module: fetchmail
 #: field:fetchmail.server,date:0
 msgid "Last Fetch Date"
-msgstr ""
+msgstr "Последняя дата получения"
 
 #. module: fetchmail
 #: help:fetchmail.server,action_id:0
@@ -134,6 +140,8 @@ msgid ""
 "Optional custom server action to trigger for each incoming mail, on the "
 "record that was created or updated by this mail"
 msgstr ""
+"Необязательное действие сервера запускаемое для каждого входящего письма, по "
+"записи, которая была создана или обновлена этим письмом"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -143,7 +151,7 @@ msgstr "Кол-во писем"
 #. module: fetchmail
 #: field:fetchmail.server,original:0
 msgid "Keep Original"
-msgstr ""
+msgstr "Сохранять оригинал"
 
 #. module: fetchmail
 #: code:addons/fetchmail/fetchmail.py:155
@@ -152,33 +160,35 @@ msgid ""
 "Here is what we got instead:\n"
 " %s"
 msgstr ""
+"Вот что вы получили вместо:\n"
+" %s"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 #: field:fetchmail.server,configuration:0
 msgid "Configuration"
-msgstr ""
+msgstr "Конфигурация"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Incoming Mail Server"
-msgstr ""
+msgstr "Сервер входящей почты"
 
 #. module: fetchmail
 #: code:addons/fetchmail/fetchmail.py:155
 #, python-format
 msgid "Connection test failed!"
-msgstr ""
+msgstr "Проверка соединения не удалась!"
 
 #. module: fetchmail
 #: help:fetchmail.server,server:0
 msgid "Hostname or IP of the mail server"
-msgstr ""
+msgstr "Имя хоста или IP сервера электронной почты"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Server type IMAP."
-msgstr ""
+msgstr "Тип сервера IMAP."
 
 #. module: fetchmail
 #: field:fetchmail.server,name:0
@@ -188,22 +198,22 @@ msgstr "Название"
 #. module: fetchmail
 #: field:fetchmail.server,is_ssl:0
 msgid "SSL/TLS"
-msgstr ""
+msgstr "SSL/TLS"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Test & Confirm"
-msgstr ""
+msgstr "Тест и подтверждение"
 
 #. module: fetchmail
 #: field:fetchmail.server,action_id:0
 msgid "Server Action"
-msgstr ""
+msgstr "Действие сервера"
 
 #. module: fetchmail
 #: field:mail.message,fetchmail_server_id:0
 msgid "Inbound Mail Server"
-msgstr ""
+msgstr "Сервер входящей почты"
 
 #. module: fetchmail
 #: field:fetchmail.server,message_ids:0
@@ -214,7 +224,7 @@ msgstr "Сообщения"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Search Incoming Mail Servers"
-msgstr ""
+msgstr "Поиск серверов входящей почты"
 
 #. module: fetchmail
 #: field:fetchmail.server,active:0
@@ -227,6 +237,8 @@ msgid ""
 "Whether attachments should be downloaded. If not enabled, incoming emails "
 "will be stripped of any attachments before being processed"
 msgstr ""
+"Должны ли быть загружены вложения. Если не позволено, перед обработкой у "
+"входящей почты будут отрезаны любые вложения"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -246,7 +258,7 @@ msgstr "IMAP"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Server type POP."
-msgstr ""
+msgstr "Сервер типа POP."
 
 #. module: fetchmail
 #: field:fetchmail.server,password:0
@@ -256,7 +268,7 @@ msgstr "Пароль"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Actions to Perform on Incoming Mails"
-msgstr ""
+msgstr "Действия над входящей почтой"
 
 #. module: fetchmail
 #: field:fetchmail.server,type:0
@@ -276,12 +288,12 @@ msgstr "Сведения о сервере"
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "If SSL required."
-msgstr ""
+msgstr "Если требуется SSL."
 
 #. module: fetchmail
 #: view:fetchmail.server:0
 msgid "Advanced"
-msgstr ""
+msgstr "Дополнительно"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -295,11 +307,14 @@ msgid ""
 "document type. This will create new documents for new conversations, or "
 "attach follow-up emails to the existing conversations (documents)."
 msgstr ""
+"Обработать каждое входящее письмо как часть переговоров относящихся к этому "
+"типу документа. Это создаст новые документы для новых переговоров или "
+"прикрепит исходящие письма к существующим переговорам (документам)."
 
 #. module: fetchmail
 #: field:fetchmail.server,object_id:0
 msgid "Create a New Record"
-msgstr ""
+msgstr "Создать новую запись"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -428,3 +443,6 @@ msgstr "Почтовый сервер"
 
 #~ msgid "Fetch Emails"
 #~ msgstr "Получить эл. почту"
+
+#~ msgid "Advanced options"
+#~ msgstr "Расширенные параметры"
diff --git a/addons/fetchmail/i18n/sl.po b/addons/fetchmail/i18n/sl.po
index f92973e54e9..08ac28609ab 100644
--- a/addons/fetchmail/i18n/sl.po
+++ b/addons/fetchmail/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/sr.po b/addons/fetchmail/i18n/sr.po
index ed2232fca1e..af53da6f118 100644
--- a/addons/fetchmail/i18n/sr.po
+++ b/addons/fetchmail/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/sr@latin.po b/addons/fetchmail/i18n/sr@latin.po
index e1f9053bae9..986f80c06bb 100644
--- a/addons/fetchmail/i18n/sr@latin.po
+++ b/addons/fetchmail/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/sv.po b/addons/fetchmail/i18n/sv.po
index dbc3651bdcb..03aaa818fb3 100644
--- a/addons/fetchmail/i18n/sv.po
+++ b/addons/fetchmail/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/tr.po b/addons/fetchmail/i18n/tr.po
index 24f71adcc74..c92f1fea6cb 100644
--- a/addons/fetchmail/i18n/tr.po
+++ b/addons/fetchmail/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
@@ -58,6 +58,9 @@ msgid ""
 "attached to each processed message. This will usually double the size of "
 "your message database."
 msgstr ""
+"Her epostanın tam bir orijinal kopyası başvuru için tutulmalı ve işlenen her "
+"iletiye eklenmelidir. Bu genellikle ileti veri tabanınızı iki katına "
+"çıkaracaktır."
 
 #. module: fetchmail
 #: field:fetchmail.server,priority:0
@@ -136,6 +139,8 @@ msgid ""
 "Optional custom server action to trigger for each incoming mail, on the "
 "record that was created or updated by this mail"
 msgstr ""
+"Her gelen postayı tetikleyecek isteğe özel sunucu, bu posta ile oluşturulan "
+"ve güncellenen kayıt üzerinde"
 
 #. module: fetchmail
 #: view:fetchmail.server:0
@@ -301,6 +306,9 @@ msgid ""
 "document type. This will create new documents for new conversations, or "
 "attach follow-up emails to the existing conversations (documents)."
 msgstr ""
+"Bu belge türüne karşılık gelen bir konuşma parçası olarak her bir gelen "
+"postayı işleyin. Bu konuşmalar için yeni belgeler oluşturacaktır ya da "
+"varolan izleme epostalarını ekleyecektir."
 
 #. module: fetchmail
 #: field:fetchmail.server,object_id:0
diff --git a/addons/fetchmail/i18n/vi.po b/addons/fetchmail/i18n/vi.po
index 9a7a7d4228e..b3d4583e85b 100644
--- a/addons/fetchmail/i18n/vi.po
+++ b/addons/fetchmail/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fetchmail/i18n/zh_CN.po b/addons/fetchmail/i18n/zh_CN.po
index fe94ff020b8..d4acf20c347 100644
--- a/addons/fetchmail/i18n/zh_CN.po
+++ b/addons/fetchmail/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: fetchmail
 #: selection:fetchmail.server,state:0
diff --git a/addons/fleet/__init__.py b/addons/fleet/__init__.py
new file mode 100644
index 00000000000..9e969f4bd54
--- /dev/null
+++ b/addons/fleet/__init__.py
@@ -0,0 +1,21 @@
+# -*- 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 fleet
\ No newline at end of file
diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
new file mode 100644
index 00000000000..3a40e7dfc0a
--- /dev/null
+++ b/addons/fleet/__openerp__.py
@@ -0,0 +1,61 @@
+# -*- 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/>.
+#
+##############################################################################
+{
+    'name' : 'Fleet Management',
+    'version' : '0.1',
+    'author' : 'OpenERP S.A.',
+    'category': 'Managing vehicles and contracts',
+    'website' : 'http://www.openerp.com',
+    'summary' : 'Vehicle, leasing, insurances, costs',
+    'description' : """
+Vehicle, leasing, insurances, cost
+==================================
+With this module, OpenERP helps you managing all your vehicles, the
+contracts associated to those vehicle as well as services, fuel log
+entries, costs and many other features necessary to the management 
+of your fleet of vehicle(s)
+
+Main Features
+-------------
+* Add vehicles to your fleet
+* Manage contracts for vehicles
+* Reminder when a contract reach its expiration date
+* Add services, fuel log entry, odometer values for all vehicles
+* Show all costs associated to a vehicle or to a type of service
+* Analysis graph for costs
+""",
+    'depends' : [
+        'base',
+        'mail',
+        'board'
+    ],
+    'data' : [
+        'fleet_view.xml',
+        'fleet_data.xml',
+        'fleet_board_view.xml',
+    ],
+    'update_xml' : ['security/ir.model.access.csv'],
+
+    'demo': ['fleet_cars.xml','fleet_demo.xml'],
+
+    'installable' : True,
+    'application' : True,
+}
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
new file mode 100644
index 00000000000..be0e8b34351
--- /dev/null
+++ b/addons/fleet/fleet.py
@@ -0,0 +1,820 @@
+# -*- 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
+import time
+import datetime
+import tools
+from osv.orm import except_orm
+from tools.translate import _
+from dateutil.relativedelta import relativedelta
+
+def str_to_datetime(strdate):
+    return datetime.datetime.strptime(strdate, tools.DEFAULT_SERVER_DATE_FORMAT)
+
+class fleet_vehicle_cost(osv.Model):
+    _name = 'fleet.vehicle.cost'
+    _description = 'Cost related to a vehicle'
+    _order = 'date desc, vehicle_id asc'
+
+    def _get_odometer(self, cr, uid, ids, odometer_id, arg, context):
+        res = dict.fromkeys(ids, False)
+        for record in self.browse(cr,uid,ids,context=context):
+            if record.odometer_id:
+                res[record.id] = record.odometer_id.value
+        return res
+
+    def _set_odometer(self, cr, uid, id, name, value, args=None, context=None):
+        if not value:
+            raise except_orm(_('Operation not allowed!'), _('Emptying the odometer value of a vehicle is not allowed.'))
+        date = self.browse(cr, uid, id, context=context).date
+        if not(date):
+            date = fields.date.context_today(self, cr, uid, context=context)
+        vehicle_id = self.browse(cr, uid, id, context=context).vehicle_id
+        data = {'value': value, 'date': date, 'vehicle_id': vehicle_id.id}
+        odometer_id = self.pool.get('fleet.vehicle.odometer').create(cr, uid, data, context=context)
+        return self.write(cr, uid, id, {'odometer_id': odometer_id}, context=context)
+
+    def _year_get_fnc(self, cr, uid, ids, name, unknow_none, context=None):
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            if (record.date):
+                res[record.id] = str(time.strptime(record.date, tools.DEFAULT_SERVER_DATE_FORMAT).tm_year)
+            else:
+                res[record.id] = _('Unknown')
+        return res
+
+    def _cost_name_get_fnc(self, cr, uid, ids, name, unknow_none, context=None):
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            name = record.vehicle_id.name
+            if record.cost_subtype.name:
+                name += ' / '+ record.cost_subtype.name
+            if record.date:
+                name += ' / '+ record.date
+            res[record.id] = name
+        return res
+
+    _columns = {
+        'name': fields.function(_cost_name_get_fnc, type="char", string='Name', store=True),
+        'vehicle_id': fields.many2one('fleet.vehicle', 'Vehicle', required=True, help='Vehicle concerned by this log'),
+        'cost_subtype': fields.many2one('fleet.service.type', 'Type', help='Cost type purchased with this cost'),
+        'amount': fields.float('Total Price'),
+        'cost_type': fields.selection([('contract', 'Contract'), ('services','Services'), ('fuel','Fuel'), ('other','Other')], 'Category of the cost', help='For internal purpose only', required=True),
+        'parent_id': fields.many2one('fleet.vehicle.cost', 'Parent', help='Parent cost to this current cost'),
+        'cost_ids': fields.one2many('fleet.vehicle.cost', 'parent_id', 'Included Services'),
+        'odometer_id': fields.many2one('fleet.vehicle.odometer', 'Odometer', help='Odometer measure of the vehicle at the moment of this log'),
+        'odometer': fields.function(_get_odometer, fnct_inv=_set_odometer, type='float', string='Odometer Value', help='Odometer measure of the vehicle at the moment of this log'),
+        'odometer_unit': fields.related('vehicle_id', 'odometer_unit', type="char", string="Unit", readonly=True),
+        'date' :fields.date('Date',help='Date when the cost has been executed'),
+        'contract_id': fields.many2one('fleet.vehicle.log.contract', 'Contract', help='Contract attached to this cost'),
+        'auto_generated': fields.boolean('Automatically Generated', readonly=True, required=True),
+        'year': fields.function(_year_get_fnc, type="char", string='Year', store=True),
+    }
+
+    _defaults ={
+        'cost_type': 'other',
+    }
+
+    def create(self, cr, uid, data, context=None):
+        #make sure that the data are consistent with values of parent and contract records given
+        if 'parent_id' in data and data['parent_id']:
+            parent = self.browse(cr, uid, data['parent_id'], context=context)
+            data['vehicle_id'] = parent.vehicle_id.id
+            data['date'] = parent.date
+            data['cost_type'] = parent.cost_type
+        if 'contract_id' in data and data['contract_id']:
+            contract = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, data['contract_id'], context=context)
+            data['vehicle_id'] = contract.vehicle_id.id
+            data['cost_subtype'] = contract.cost_subtype.id
+            data['cost_type'] = contract.cost_type
+        if 'odometer' in data and not data['odometer']:
+            #if received value for odometer is 0, then remove it from the data as it would result to the creation of a
+            #odometer log with 0, which is to be avoided
+            del(data['odometer'])
+        return super(fleet_vehicle_cost, self).create(cr, uid, data, context=context)
+
+
+class fleet_vehicle_tag(osv.Model):
+    _name = 'fleet.vehicle.tag'
+    _columns = {
+        'name': fields.char('Name', required=True, translate=True),
+    }
+
+class fleet_vehicle_state(osv.Model):
+    _name = 'fleet.vehicle.state'
+    _order = 'sequence asc'
+    _columns = {
+        'name': fields.char('Name', required=True),
+        'sequence': fields.integer('Order', help="Used to order the note stages")
+    }
+    _sql_constraints = [('fleet_state_name_unique','unique(name)', 'State name already exists')]
+
+
+class fleet_vehicle_model(osv.Model):
+
+    def _model_name_get_fnc(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            name = record.modelname
+            if record.brand.name:
+                name = record.brand.name + ' / ' + name
+            res[record.id] = name
+        return res
+
+    def on_change_brand(self, cr, uid, ids, model_id, context=None):
+        if not model_id:
+            return {'value': {'image_medium': False}}
+        brand = self.pool.get('fleet.vehicle.model.brand').browse(cr, uid, model_id, context=context)
+        return {
+            'value': {
+                'image_medium': brand.image,
+            }
+        }
+
+    _name = 'fleet.vehicle.model'
+    _description = 'Model of a vehicle'
+    _order = 'name asc'
+
+    _columns = {
+        'name': fields.function(_model_name_get_fnc, type="char", string='Name', store=True),
+        'modelname': fields.char('Model name', size=32, required=True), 
+        'brand': fields.many2one('fleet.vehicle.model.brand', 'Model Brand', required=True, help='Brand of the vehicle'),
+        'vendors': fields.many2many('res.partner', 'fleet_vehicle_model_vendors', 'model_id', 'partner_id', string='Vendors'),
+        'image': fields.related('brand', 'image', type="binary", string="Logo"),
+        'image_medium': fields.related('brand', 'image_medium', type="binary", string="Logo"),
+        'image_small': fields.related('brand', 'image_small', type="binary", string="Logo"),
+    }
+
+
+class fleet_vehicle_model_brand(osv.Model):
+    _name = 'fleet.vehicle.model.brand'
+    _description = 'Brand model of the vehicle'
+
+    _order = 'name asc'
+
+    def _get_image(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for obj in self.browse(cr, uid, ids, context=context):
+            result[obj.id] = tools.image_get_resized_images(obj.image)
+        return result
+
+    def _set_image(self, cr, uid, id, name, value, args, context=None):
+        return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
+
+    _columns = {
+        'name': fields.char('Brand Name', size=64, required=True),
+        'image': fields.binary("Logo",
+            help="This field holds the image used as logo for the brand, limited to 1024x1024px."),
+        'image_medium': fields.function(_get_image, fnct_inv=_set_image,
+            string="Medium-sized photo", type="binary", multi="_get_image",
+            store = {
+                'fleet.vehicle.model.brand': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
+            },
+            help="Medium-sized logo of the brand. It is automatically "\
+                 "resized as a 128x128px image, with aspect ratio preserved. "\
+                 "Use this field in form views or some kanban views."),
+        'image_small': fields.function(_get_image, fnct_inv=_set_image,
+            string="Smal-sized photo", type="binary", multi="_get_image",
+            store = {
+                'fleet.vehicle.model.brand': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
+            },
+            help="Small-sized photo of the brand. It is automatically "\
+                 "resized as a 64x64px image, with aspect ratio preserved. "\
+                 "Use this field anywhere a small image is required."),
+    }
+
+
+class fleet_vehicle(osv.Model):
+
+    _inherit = 'mail.thread'
+
+    def _vehicle_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            res[record.id] = record.model_id.brand.name + '/' + record.model_id.modelname + ' / ' + record.license_plate
+        return res
+
+    def return_action_to_open(self, cr, uid, ids, context=None):
+        """ This opens the xml view specified in xml_id for the current vehicle """
+        if context is None:
+            context = {}
+        if context.get('xml_id'):
+            res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet', context['xml_id'], context=context)
+            res['context'] = context
+            res['context'].update({'default_vehicle_id': ids[0]})
+            res['domain'] = [('vehicle_id','=', ids[0])]
+            return res
+        return False
+
+    def act_show_log_cost(self, cr, uid, ids, context=None):
+        """ This opens log view to view and add new log for this vehicle, groupby default to only show effective costs
+            @return: the costs log view
+        """
+        if context is None:
+            context = {}
+        res = self.pool.get('ir.actions.act_window').for_xml_id(cr, uid ,'fleet','fleet_vehicle_costs_act', context=context)
+        res['context'] = context
+        res['context'].update({
+            'default_vehicle_id': ids[0],
+            'search_default_parent_false': True
+        })
+        res['domain'] = [('vehicle_id','=', ids[0])]
+        return res
+
+    def _get_odometer(self, cr, uid, ids, odometer_id, arg, context):
+        res = dict.fromkeys(ids, 0)
+        for record in self.browse(cr,uid,ids,context=context):
+            ids = self.pool.get('fleet.vehicle.odometer').search(cr, uid, [('vehicle_id', '=', record.id)], limit=1, order='value desc')
+            if len(ids) > 0:
+                res[record.id] = self.pool.get('fleet.vehicle.odometer').browse(cr, uid, ids[0], context=context).value
+        return res
+
+    def _set_odometer(self, cr, uid, id, name, value, args=None, context=None):
+        if value:
+            date = fields.date.context_today(self, cr, uid, context=context)
+            data = {'value': value, 'date': date, 'vehicle_id': id}
+            return self.pool.get('fleet.vehicle.odometer').create(cr, uid, data, context=context)
+
+    def _search_get_overdue_contract_reminder(self, cr, uid, obj, name, args, context):
+        res = []
+        for field, operator, value in args:
+            assert operator in ('=', '!=', '<>') and value in (True, False), 'Operation not supported'
+            if (operator == '=' and value == True) or (operator in ('<>', '!=') and value == False):
+                search_operator = 'in'
+            else:
+                search_operator = 'not in'
+            today = fields.date.context_today(self, cr, uid, context=context)
+            cr.execute('select cost.vehicle_id, count(contract.id) as contract_number FROM fleet_vehicle_cost cost left join fleet_vehicle_log_contract contract on contract.cost_id = cost.id WHERE contract.expiration_date is not null AND contract.expiration_date < %s AND contract.state IN (\'open\', \'toclose\') GROUP BY cost.vehicle_id', (today,))
+            res_ids = [x[0] for x in cr.fetchall()]
+            res.append(('id', search_operator, res_ids))
+        return res
+
+    def _search_contract_renewal_due_soon(self, cr, uid, obj, name, args, context):
+        res = []
+        for field, operator, value in args:
+            assert operator in ('=', '!=', '<>') and value in (True, False), 'Operation not supported'
+            if (operator == '=' and value == True) or (operator in ('<>', '!=') and value == False):
+                search_operator = 'in'
+            else:
+                search_operator = 'not in'
+            today = fields.date.context_today(self, cr, uid, context=context)
+            datetime_today = datetime.datetime.strptime(today, tools.DEFAULT_SERVER_DATE_FORMAT)
+            limit_date = str((datetime_today + relativedelta(days=+15)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT))
+            cr.execute('select cost.vehicle_id, count(contract.id) as contract_number FROM fleet_vehicle_cost cost left join fleet_vehicle_log_contract contract on contract.cost_id = cost.id WHERE contract.expiration_date is not null AND contract.expiration_date > %s AND contract.expiration_date < %s AND contract.state IN (\'open\', \'toclose\') GROUP BY cost.vehicle_id', (today, limit_date))
+            res_ids = [x[0] for x in cr.fetchall()]
+            res.append(('id', search_operator, res_ids))
+        return res
+
+    def _get_contract_reminder_fnc(self, cr, uid, ids, field_names, unknow_none, context=None):
+        res= {}
+        for record in self.browse(cr, uid, ids, context=context):
+            overdue = False
+            due_soon = False
+            total = 0
+            name = ''
+            for element in record.log_contracts:
+                if element.state in ('open', 'toclose') and element.expiration_date:
+                    current_date_str = fields.date.context_today(self, cr, uid, context=context)
+                    due_time_str = element.expiration_date
+                    current_date = str_to_datetime(current_date_str)
+                    due_time = str_to_datetime(due_time_str)
+                    diff_time = (due_time-current_date).days
+                    if diff_time < 0:
+                        overdue = True
+                        total += 1
+                    if diff_time < 15 and diff_time >= 0:
+                            due_soon = True;
+                            total += 1
+                    if overdue or due_soon:
+                        ids = self.pool.get('fleet.vehicle.log.contract').search(cr,uid,[('vehicle_id', '=', record.id), ('state', 'in', ('open', 'toclose'))], limit=1, order='expiration_date asc')
+                        if len(ids) > 0:
+                            #we display only the name of the oldest overdue/due soon contract
+                            name=(self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, ids[0], context=context).cost_subtype.name)
+
+            res[record.id] = {
+                'contract_renewal_overdue': overdue,
+                'contract_renewal_due_soon': due_soon,
+                'contract_renewal_total': (total - 1), #we remove 1 from the real total for display purposes
+                'contract_renewal_name': name,
+            }
+        return res
+
+    def _get_default_state(self, cr, uid, context):
+        try:
+            model, model_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'fleet', 'vehicle_state_active')
+        except ValueError:
+            model_id = False
+        return model_id
+
+    _name = 'fleet.vehicle'
+    _description = 'Information on a vehicle'
+    _order= 'license_plate asc'
+    _columns = {
+        'name': fields.function(_vehicle_name_get_fnc, type="char", string='Name', store=True),
+        'company_id': fields.many2one('res.company', 'Company'),
+        'license_plate': fields.char('License Plate', size=32, required=True, help='License plate number of the vehicle (ie: plate number for a car)'),
+        'vin_sn': fields.char('Chassis Number', size=32, help='Unique number written on the vehicle motor (VIN/SN number)'),
+        'driver': fields.many2one('res.partner', 'Driver', help='Driver of the vehicle'),
+        'model_id': fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'),
+        'log_fuel': fields.one2many('fleet.vehicle.log.fuel', 'vehicle_id', 'Fuel Logs'),
+        'log_services': fields.one2many('fleet.vehicle.log.services', 'vehicle_id', 'Services Logs'),
+        'log_contracts': fields.one2many('fleet.vehicle.log.contract', 'vehicle_id', 'Contracts'),
+        'acquisition_date': fields.date('Acquisition Date', required=False, help='Date when the vehicle has been bought'),
+        'color': fields.char('Color', size=32, help='Color of the vehicle'),
+        'state': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle', ondelete="set null"),
+        'location': fields.char('Location', size=128, help='Location of the vehicle (garage, ...)'),
+        'seats': fields.integer('Seats Number', help='Number of seats of the vehicle'),
+        'doors': fields.integer('Doors Number', help='Number of doors of the vehicle'),
+        'tag_ids' :fields.many2many('fleet.vehicle.tag', 'fleet_vehicle_vehicle_tag_rel', 'vehicle_tag_id','tag_id', 'Tags'),
+        'odometer': fields.function(_get_odometer, fnct_inv=_set_odometer, type='float', string='Last Odometer', help='Odometer measure of the vehicle at the moment of this log'),
+        'odometer_unit': fields.selection([('kilometers', 'Kilometers'),('miles','Miles')], 'Odometer Unit', help='Unit of the odometer ',required=True),
+        'transmission': fields.selection([('manual', 'Manual'), ('automatic', 'Automatic')], 'Transmission', help='Transmission Used by the vehicle'),
+        'fuel_type': fields.selection([('gasoline', 'Gasoline'), ('diesel', 'Diesel'), ('electric', 'Electric'), ('hybrid', 'Hybrid')], 'Fuel Type', help='Fuel Used by the vehicle'),
+        'horsepower': fields.integer('Horsepower'),
+        'horsepower_tax': fields.float('Horsepower Taxation'),
+        'power': fields.integer('Power (kW)', help='Power in kW of the vehicle'),
+        'co2': fields.float('CO2 Emissions', help='CO2 emissions of the vehicle'),
+        'image': fields.related('model_id', 'image', type="binary", string="Logo"),
+        'image_medium': fields.related('model_id', 'image_medium', type="binary", string="Logo"),
+        'image_small': fields.related('model_id', 'image_small', type="binary", string="Logo"),
+        'contract_renewal_due_soon': fields.function(_get_contract_reminder_fnc, fnct_search=_search_contract_renewal_due_soon, type="boolean", string='Has Contracts to renew', multi='contract_info'),
+        'contract_renewal_overdue': fields.function(_get_contract_reminder_fnc, fnct_search=_search_get_overdue_contract_reminder, type="boolean", string='Has Contracts Overdued', multi='contract_info'),
+        'contract_renewal_name': fields.function(_get_contract_reminder_fnc, type="text", string='Name of contract to renew soon', multi='contract_info'),
+        'contract_renewal_total': fields.function(_get_contract_reminder_fnc, type="integer", string='Total of contracts due or overdue minus one', multi='contract_info'),
+        'car_value': fields.float('Car Value', help='Value of the bought vehicle'),
+        }
+
+    _defaults = {
+        'doors': 5,
+        'odometer_unit': 'kilometers',
+        'state': _get_default_state,
+    }
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default.update({
+            'log_fuel':[],
+            'log_contracts':[],
+            'log_services':[],
+            'tag_ids':[],
+            'vin_sn':'',
+        })
+        return super(fleet_vehicle, self).copy(cr, uid, id, default, context=context)
+
+    def on_change_model(self, cr, uid, ids, model_id, context=None):
+        if not model_id:
+            return {}
+        model = self.pool.get('fleet.vehicle.model').browse(cr, uid, model_id, context=context)
+        return {
+            'value': {
+                'image_medium': model.image,
+            }
+        }
+
+    def create(self, cr, uid, data, context=None):
+        vehicle_id = super(fleet_vehicle, self).create(cr, uid, data, context=context)
+        vehicle = self.browse(cr, uid, vehicle_id, context=context)
+        self.message_post(cr, uid, [vehicle_id], body=_('Vehicle %s has been added to the fleet!') % (vehicle.license_plate), context=context)
+        return vehicle_id
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """
+        This function write an entry in the openchatter whenever we change important information
+        on the vehicle like the model, the drive, the state of the vehicle or its license plate
+        """
+        for vehicle in self.browse(cr, uid, ids, context):
+            changes = []
+            if 'model_id' in vals and vehicle.model_id.id != vals['model_id']:
+                value = self.pool.get('fleet.vehicle.model').browse(cr,uid,vals['model_id'],context=context).name
+                oldmodel = vehicle.model_id.name or _('None')
+                changes.append(_("Model: from '%s' to '%s'") %(oldmodel, value))
+            if 'driver' in vals and vehicle.driver.id != vals['driver']:
+                value = self.pool.get('res.partner').browse(cr,uid,vals['driver'],context=context).name
+                olddriver = (vehicle.driver.name) or _('None')
+                changes.append(_("Driver: from '%s' to '%s'") %(olddriver, value))
+            if 'state' in vals and vehicle.state.id != vals['state']:
+                value = self.pool.get('fleet.vehicle.state').browse(cr,uid,vals['state'],context=context).name
+                oldstate = vehicle.state.name or _('None')
+                changes.append(_("State: from '%s' to '%s'") %(oldstate, value))
+            if 'license_plate' in vals and vehicle.license_plate != vals['license_plate']:
+                old_license_plate = vehicle.license_plate or _('None')
+                changes.append(_("License Plate: from '%s' to '%s'") %(old_license_plate, vals['license_plate']))
+
+            if len(changes) > 0:
+                self.message_post(cr, uid, [vehicle.id], body=", ".join(changes), context=context)
+
+        vehicle_id = super(fleet_vehicle,self).write(cr, uid, ids, vals, context)
+        return True
+
+
+class fleet_vehicle_odometer(osv.Model):
+    _name='fleet.vehicle.odometer'
+    _description='Odometer log for a vehicle'
+    _order='date desc'
+
+    def _vehicle_log_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            name = record.vehicle_id.name
+            if record.date:
+                name = name+ ' / '+ str(record.date)
+            res[record.id] = name
+        return res
+
+    def on_change_vehicle(self, cr, uid, ids, vehicle_id, context=None):
+        if not vehicle_id:
+            return {}
+        odometer_unit = self.pool.get('fleet.vehicle').browse(cr, uid, vehicle_id, context=context).odometer_unit
+        return {
+            'value': {
+                'unit': odometer_unit,
+            }
+        }
+
+    _columns = {
+        'name': fields.function(_vehicle_log_name_get_fnc, type="char", string='Name', store=True),
+        'date': fields.date('Date'),
+        'value': fields.float('Odometer Value', group_operator="max"),
+        'vehicle_id': fields.many2one('fleet.vehicle', 'Vehicle', required=True),
+        'unit': fields.related('vehicle_id', 'odometer_unit', type="char", string="Unit", readonly=True),
+    }
+    _defaults = {
+        'date': fields.date.context_today,
+    }
+
+
+class fleet_vehicle_log_fuel(osv.Model):
+
+    def on_change_vehicle(self, cr, uid, ids, vehicle_id, context=None):
+        if not vehicle_id:
+            return {}
+        odometer_unit = self.pool.get('fleet.vehicle').browse(cr, uid, vehicle_id, context=context).odometer_unit
+        return {
+            'value': {
+                'odometer_unit': odometer_unit,
+            }
+        }
+
+    def on_change_liter(self, cr, uid, ids, liter, price_per_liter, amount, context=None):
+        #need to cast in float because the value receveid from web client maybe an integer (Javascript and JSON do not
+        #make any difference between 3.0 and 3). This cause a problem if you encode, for example, 2 liters at 1.5 per
+        #liter => total is computed as 3.0, then trigger an onchange that recomputes price_per_liter as 3/2=1 (instead
+        #of 3.0/2=1.5)
+        liter = float(liter)
+        price_per_liter = float(price_per_liter)
+        amount = float(amount)
+        if liter > 0 and price_per_liter > 0:
+            return {'value' : {'amount' : liter * price_per_liter,}}
+        elif liter > 0 and amount > 0:
+            return {'value' : {'price_per_liter' : amount / liter,}}
+        elif price_per_liter > 0 and amount > 0:
+            return {'value' : {'liter' : amount / price_per_liter,}}
+        else :
+            return {}
+
+    def on_change_price_per_liter(self, cr, uid, ids, liter, price_per_liter, amount, context=None):
+        #need to cast in float because the value receveid from web client maybe an integer (Javascript and JSON do not
+        #make any difference between 3.0 and 3). This cause a problem if you encode, for example, 2 liters at 1.5 per
+        #liter => total is computed as 3.0, then trigger an onchange that recomputes price_per_liter as 3/2=1 (instead
+        #of 3.0/2=1.5)
+        liter = float(liter)
+        price_per_liter = float(price_per_liter)
+        amount = float(amount)
+        if price_per_liter > 0 and liter > 0:
+            return {'value' : {'amount' : liter * price_per_liter,}}
+        elif price_per_liter > 0 and amount > 0:
+            return {'value' : {'liter' : amount / price_per_liter,}}
+        elif liter > 0 and amount > 0:
+            return {'value' : {'price_per_liter' : amount / liter,}}
+        else :
+            return {}
+
+    def on_change_amount(self, cr, uid, ids, liter, price_per_liter, amount, context=None):
+        #need to cast in float because the value receveid from web client maybe an integer (Javascript and JSON do not
+        #make any difference between 3.0 and 3). This cause a problem if you encode, for example, 2 liters at 1.5 per
+        #liter => total is computed as 3.0, then trigger an onchange that recomputes price_per_liter as 3/2=1 (instead
+        #of 3.0/2=1.5)
+        liter = float(liter)
+        price_per_liter = float(price_per_liter)
+        amount = float(amount)
+        if amount > 0 and liter > 0:
+            return {'value': {'price_per_liter': amount / liter,}}
+        elif amount > 0 and price_per_liter > 0:
+            return {'value': {'liter': amount / price_per_liter,}}
+        elif liter > 0 and price_per_liter > 0:
+            return {'value': {'amount': liter * price_per_liter,}}
+        return {}
+
+    def _get_default_service_type(self, cr, uid, context):
+        try:
+            model, model_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'fleet', 'type_service_refueling')
+        except ValueError:
+            model_id = False
+        return model_id
+
+    _name = 'fleet.vehicle.log.fuel'
+    _description = 'Fuel log for vehicles'
+    _inherits = {'fleet.vehicle.cost': 'cost_id'}
+
+    _columns = {
+        'liter': fields.float('Liter'),
+        'price_per_liter': fields.float('Price Per Liter'),
+        'purchaser_id': fields.many2one('res.partner', 'Purchaser', domain="['|',('customer','=',True),('employee','=',True)]"),
+        'inv_ref': fields.char('Invoice Reference', size=64),
+        'vendor_id': fields.many2one('res.partner', 'Supplier', domain="[('supplier','=',True)]"),
+        'notes': fields.text('Notes'),
+        'cost_amount': fields.related('cost_id', 'amount', string='Amount', type='float', store=True), #we need to keep this field as a related with store=True because the graph view doesn't support (1) to address fields from inherited table and (2) fields that aren't stored in database
+    }
+    _defaults = {
+        'purchaser_id': lambda self, cr, uid, ctx: uid,
+        'date': fields.date.context_today,
+        'cost_subtype': _get_default_service_type,
+        'cost_type': 'fuel',
+    }
+
+
+class fleet_vehicle_log_services(osv.Model):
+
+    def on_change_vehicle(self, cr, uid, ids, vehicle_id, context=None):
+        if not vehicle_id:
+            return {}
+        odometer_unit = self.pool.get('fleet.vehicle').browse(cr, uid, vehicle_id, context=context).odometer_unit
+        return {
+            'value': {
+                'odometer_unit': odometer_unit,
+            }
+        }
+
+    def _get_default_service_type(self, cr, uid, context):
+        try:
+            model, model_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'fleet', 'type_service_service_8')
+        except ValueError:
+            model_id = False
+        return model_id
+
+    _inherits = {'fleet.vehicle.cost': 'cost_id'}
+    _name = 'fleet.vehicle.log.services'
+    _description = 'Services for vehicles'
+    _columns = {
+        'purchaser_id': fields.many2one('res.partner', 'Purchaser', domain="['|',('customer','=',True),('employee','=',True)]"),
+        'inv_ref': fields.char('Invoice Reference', size=64),
+        'vendor_id': fields.many2one('res.partner', 'Supplier', domain="[('supplier','=',True)]"),
+        'cost_amount': fields.related('cost_id', 'amount', string='Amount', type='float', store=True), #we need to keep this field as a related with store=True because the graph view doesn't support (1) to address fields from inherited table and (2) fields that aren't stored in database
+        'notes': fields.text('Notes'),
+    }
+    _defaults = {
+        'purchaser_id': lambda self, cr, uid, ctx: uid,
+        'date': fields.date.context_today,
+        'cost_subtype': _get_default_service_type,
+        'cost_type': 'services'
+    }
+
+
+class fleet_service_type(osv.Model):
+    _name = 'fleet.service.type'
+    _description = 'Type of services available on a vehicle'
+    _columns = {
+        'name': fields.char('Name', required=True, translate=True),
+        'category': fields.selection([('contract', 'Contract'), ('service', 'Service'), ('both', 'Both')], 'Category', required=True, help='Choose wheter the service refer to contracts, vehicle services or both'),
+    }
+
+
+class fleet_vehicle_log_contract(osv.Model):
+
+    def scheduler_manage_auto_costs(self, cr, uid, context=None):
+        #This method is called by a cron task
+        #It creates costs for contracts having the "recurring cost" field setted, depending on their frequency
+        #For example, if a contract has a reccuring cost of 200 with a weekly frequency, this method creates a cost of 200 on the first day of each week, from the date of the last recurring costs in the database to today
+        #If the contract has not yet any recurring costs in the database, the method generates the recurring costs from the start_date to today
+        #The created costs are associated to a contract thanks to the many2one field contract_id
+        #If the contract has no start_date, no cost will be created, even if the contract has recurring costs
+        vehicle_cost_obj = self.pool.get('fleet.vehicle.cost')
+        d = datetime.datetime.strptime(fields.date.context_today(self, cr, uid, context=context), tools.DEFAULT_SERVER_DATE_FORMAT).date()
+        contract_ids = self.pool.get('fleet.vehicle.log.contract').search(cr, uid, [('state','!=','closed')], offset=0, limit=None, order=None,context=None, count=False)
+        deltas = {'yearly': relativedelta(years=+1), 'monthly': relativedelta(months=+1), 'weekly': relativedelta(weeks=+1), 'daily': relativedelta(days=+1)}
+        for contract in self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, contract_ids, context=context):
+            if not contract.start_date or contract.cost_frequency == 'no':
+                continue
+            found = False
+            last_cost_date = contract.start_date
+            if contract.generated_cost_ids:
+                last_autogenerated_cost_id = vehicle_cost_obj.search(cr, uid, ['&', ('contract_id','=',contract.id), ('auto_generated','=',True)], offset=0, limit=1, order='date desc',context=context, count=False)
+                if last_autogenerated_cost_id:
+                    found = True
+                    last_cost_date = vehicle_cost_obj.browse(cr, uid, last_autogenerated_cost_id[0], context=context).date
+            startdate = datetime.datetime.strptime(last_cost_date, tools.DEFAULT_SERVER_DATE_FORMAT).date()
+            if found:
+                startdate += deltas.get(contract.cost_frequency)
+            while (startdate < d) & (startdate < datetime.datetime.strptime(contract.expiration_date, tools.DEFAULT_SERVER_DATE_FORMAT).date()):
+                data = {
+                    'amount': contract.cost_generated,
+                    'date': startdate.strftime(tools.DEFAULT_SERVER_DATE_FORMAT),
+                    'vehicle_id': contract.vehicle_id.id,
+                    'cost_subtype': contract.cost_subtype.id,
+                    'contract_id': contract.id,
+                    'auto_generated': True
+                }
+                cost_id = self.pool.get('fleet.vehicle.cost').create(cr, uid, data, context=context)
+                startdate += deltas.get(contract.cost_frequency)
+        return True
+
+    def scheduler_manage_contract_expiration(self, cr, uid, context=None):
+        #This method is called by a cron task
+        #It manages the state of a contract, possibly by posting a message on the vehicle concerned and updating its status
+        datetime_today = datetime.datetime.strptime(fields.date.context_today(self, cr, uid, context=context), tools.DEFAULT_SERVER_DATE_FORMAT)
+        limit_date = (datetime_today + relativedelta(days=+15)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        ids = self.search(cr, uid, ['&', ('state', '=', 'open'), ('expiration_date', '<', limit_date)], offset=0, limit=None, order=None, context=context, count=False)
+        res = {}
+        for contract in self.browse(cr, uid, ids, context=context):
+            if contract.vehicle_id.id in res:
+                res[contract.vehicle_id.id] += 1
+            else:
+                res[contract.vehicle_id.id] = 1
+
+        for vehicle, value in res.items():
+            self.pool.get('fleet.vehicle').message_post(cr, uid, vehicle, body=_('%s contract(s) need(s) to be renewed and/or closed!') % (str(value)), context=context)
+        return self.write(cr, uid, ids, {'state': 'toclose'}, context=context)
+
+    def run_scheduler(self, cr, uid, context=None):
+        self.scheduler_manage_auto_costs(cr, uid, context=context)
+        self.scheduler_manage_contract_expiration(cr, uid, context=context)
+        return True
+
+    def _vehicle_contract_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            name = record.vehicle_id.name
+            if record.cost_subtype.name:
+                name += ' / '+ record.cost_subtype.name
+            if record.date:
+                name += ' / '+ record.date
+            res[record.id] = name
+        return res
+
+    def on_change_vehicle(self, cr, uid, ids, vehicle_id, context=None):
+        if not vehicle_id:
+            return {}
+        odometer_unit = self.pool.get('fleet.vehicle').browse(cr, uid, vehicle_id, context=context).odometer_unit
+        return {
+            'value': {
+                'odometer_unit': odometer_unit,
+            }
+        }
+
+    def compute_next_year_date(self, strdate):
+        oneyear = datetime.timedelta(days=365)
+        curdate = str_to_datetime(strdate)
+        return datetime.datetime.strftime(curdate + oneyear, tools.DEFAULT_SERVER_DATE_FORMAT)
+
+    def on_change_start_date(self, cr, uid, ids, strdate, enddate, context=None):
+        if (strdate):
+            return {'value': {'expiration_date': self.compute_next_year_date(strdate),}}
+        return {}
+
+    def get_days_left(self, cr, uid, ids, prop, unknow_none, context=None):
+        """return a dict with as value for each contract an integer
+        if contract is in an open state and is overdue, return 0
+        if contract is in a closed state, return -1
+        otherwise return the number of days before the contract expires
+        """
+        res = {}
+        for record in self.browse(cr, uid, ids, context=context):
+            if (record.expiration_date and (record.state == 'open' or record.state == 'toclose')):
+                today = str_to_datetime(time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT))
+                renew_date = str_to_datetime(record.expiration_date)
+                diff_time = (renew_date-today).days
+                res[record.id] = diff_time > 0 and diff_time or 0
+            else:
+                res[record.id] = -1
+        return res
+
+    def act_renew_contract(self, cr, uid, ids, context=None):
+        assert len(ids) == 1, "This operation should only be done for 1 single contract at a time, as it it suppose to open a window as result"
+        for element in self.browse(cr, uid, ids, context=context):
+            #compute end date
+            startdate = str_to_datetime(element.start_date)
+            enddate = str_to_datetime(element.expiration_date)
+            diffdate = (enddate - startdate)
+            default = {
+                'date': fields.date.context_today(self, cr, uid, context=context),
+                'start_date': datetime.datetime.strftime(str_to_datetime(element.expiration_date) + datetime.timedelta(days=1), tools.DEFAULT_SERVER_DATE_FORMAT),
+                'expiration_date': datetime.datetime.strftime(enddate + diffdate, tools.DEFAULT_SERVER_DATE_FORMAT),
+            }
+            newid = super(fleet_vehicle_log_contract, self).copy(cr, uid, element.id, default, context=context)
+        mod, modid = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'fleet', 'fleet_vehicle_log_contract_form')
+        return {
+            'name':_("Renew Contract"),
+            'view_mode': 'form',
+            'view_id': modid,
+            'view_type': 'tree,form',
+            'res_model': 'fleet.vehicle.log.contract',
+            'type': 'ir.actions.act_window',
+            'nodestroy': True,
+            'domain': '[]',
+            'res_id': newid,
+            'context': {'active_id':newid}, 
+        }
+
+    def _get_default_contract_type(self, cr, uid, context=None):
+        try:
+            model, model_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'fleet', 'type_contract_leasing')
+        except ValueError:
+            model_id = False
+        return model_id
+
+    def on_change_indic_cost(self, cr, uid, ids, cost_ids, context=None):
+        totalsum = 0.0
+        for element in cost_ids:
+            if element and len(element) == 3 and element[2] is not False:
+                totalsum += element[2].get('amount', 0.0)
+        return {
+            'value': {
+                'sum_cost': totalsum,
+            }
+        }
+
+    def _get_sum_cost(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        for contract in self.browse(cr, uid, ids, context=context):
+            totalsum = 0
+            for cost in contract.cost_ids:
+                totalsum += cost.amount
+            res[contract.id] = totalsum
+        return res
+
+    _inherits = {'fleet.vehicle.cost': 'cost_id'}
+    _name = 'fleet.vehicle.log.contract'
+    _description = 'Contract information on a vehicle'
+    _order='state desc,expiration_date'
+    _columns = {
+        'name': fields.function(_vehicle_contract_name_get_fnc, type="text", string='Name', store=True),
+        'start_date': fields.date('Contract Start Date', help='Date when the coverage of the contract begins'),
+        'expiration_date': fields.date('Contract Expiration Date', help='Date when the coverage of the contract expirates (by default, one year after begin date)'),
+        'days_left': fields.function(get_days_left, type='integer', string='Warning Date'),
+        'insurer_id' :fields.many2one('res.partner', 'Supplier'),
+        'purchaser_id': fields.many2one('res.partner', 'Contractor', help='Person to which the contract is signed for'),
+        'ins_ref': fields.char('Contract Reference', size=64),
+        'state': fields.selection([('open', 'In Progress'), ('toclose','To Close'), ('closed', 'Terminated')], 'Status', readonly=True, help='Choose wheter the contract is still valid or not'),
+        'notes': fields.text('Terms and Conditions', help='Write here all supplementary informations relative to this contract'),
+        'cost_generated': fields.float('Recurring Cost Amount', help="Costs paid at regular intervals, depending on the cost frequency. If the cost frequency is set to unique, the cost will be logged at the start date"),
+        'cost_frequency': fields.selection([('no','No'), ('daily', 'Daily'), ('weekly','Weekly'), ('monthly','Monthly'), ('yearly','Yearly')], 'Recurring Cost Frequency', help='Frequency of the recuring cost', required=True),
+        'generated_cost_ids': fields.one2many('fleet.vehicle.cost', 'contract_id', 'Generated Costs', ondelete='cascade'),
+        'sum_cost': fields.function(_get_sum_cost, type='float', string='Indicative Costs Total'),
+        'cost_amount': fields.related('cost_id', 'amount', string='Amount', type='float', store=True), #we need to keep this field as a related with store=True because the graph view doesn't support (1) to address fields from inherited table and (2) fields that aren't stored in database
+    }
+    _defaults = {
+        'purchaser_id': lambda self, cr, uid, ctx: uid,
+        'date': fields.date.context_today,
+        'start_date': fields.date.context_today,
+        'state':'open',
+        'expiration_date': lambda self, cr, uid, ctx: self.compute_next_year_date(fields.date.context_today(self, cr, uid, context=ctx)),
+        'cost_frequency': 'no',
+        'cost_subtype': _get_default_contract_type,
+        'cost_type': 'contract',
+    }
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        today = fields.date.context_today(self, cr, uid, context=context)
+        default['date'] = today
+        default['start_date'] = today
+        default['expiration_date'] = self.compute_next_year_date(today)
+        default['ins_ref'] = ''
+        default['state'] = 'open'
+        default['notes'] = ''
+        return super(fleet_vehicle_log_contract, self).copy(cr, uid, id, default, context=context)
+
+    def contract_close(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'closed'}, context=context)
+
+    def contract_open(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'open'}, context=context)
+
+class fleet_contract_state(osv.Model):
+    _name = 'fleet.contract.state'
+    _description = 'Contains the different possible status of a leasing contract'
+
+    _columns = {
+        'name':fields.char('Contract Status', size=64, required=True),
+    }
diff --git a/addons/fleet/fleet_board_view.xml b/addons/fleet/fleet_board_view.xml
new file mode 100644
index 00000000000..760fc1cf583
--- /dev/null
+++ b/addons/fleet/fleet_board_view.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+  <record model="ir.actions.act_window" id="action_fleet_vehicle_log_fuel_graph">
+      <field name="name">Fuel Costs by Month</field>
+      <field name="res_model">fleet.vehicle.cost</field>
+      <field name="view_id" ref="fleet_vehicle_costs_graph"></field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree</field>
+      <field name="domain">['&amp;',('parent_id','=',False),('cost_type','=','fuel')]</field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_fleet_vehicle_log_services_graph">
+      <field name="name">Services Costs by Month</field>
+      <field name="res_model">fleet.vehicle.cost</field>
+      <field name="view_id" ref="fleet_vehicle_costs_graph" />
+      <field name="view_type">form</field>
+      <field name="view_mode">tree</field>
+      <field name="domain">['&amp;',('parent_id','=',False),('cost_type','=','services')]</field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_fleet_vehicle_log_contract_graph">
+      <field name="name">Contracts Costs by Month</field>
+      <field name="res_model">fleet.vehicle.cost</field>
+      <field name="view_id" ref="fleet_vehicle_costs_graph"></field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree</field>
+      <field name="domain">['&amp;',('parent_id','=',False),('cost_type','=','contract')]</field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_fleet_vehicle_costs_graph">
+      <field name="name">Costs by Month</field>
+      <field name="res_model">fleet.vehicle.cost</field>
+      <field name="view_id" ref="fleet_vehicle_costs_graph"></field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree</field>
+      <field name="domain">[('parent_id','=',False)]</field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_fleet_vehicle_kanban">
+      <field name="name">Vehicles with alerts</field>
+      <field name="res_model">fleet.vehicle</field>
+      <field name="view_id" ref="fleet_vehicle_kanban"></field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree</field>
+      <field name="domain">['|',('contract_renewal_due_soon','=',True),('contract_renewal_overdue','=',True)]</field>
+      <field name="help" type="html">
+        <p>
+          Here are displayed vehicles for which one or more contracts need to be renewed. If you see this message, then there is no contracts to renew.
+        </p>
+      </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_fleet_reporting_costs">
+      <field name="name">Costs Analysis</field>
+      <field name="res_model">fleet.vehicle.cost</field>
+      <field name="view_id" ref="fleet_vehicle_costs_tree"></field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree</field>
+      <field name="context">{"search_default_parent_false" : True,"search_default_groupby_year" : True,"search_default_groupby_cost_type" : True,"search_default_groupby_cost_subtype" : True, "search_default_groupby_vehicle_id" : True,}</field>
+      <field name="help" type="html">
+        <p>
+          OpenERP helps you managing the costs for your different vehicles
+          Costs are generally created from services and contract and appears here.
+        </p>
+        <p>
+          Thanks to the different filters, OpenERP can only print the effective
+          costs, sort them by type and by vehicle.
+        </p>
+      </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_fleet_reporting_costs_non_effective">
+      <field name="name">Indicative Costs Analysis</field>
+      <field name="res_model">fleet.vehicle.cost</field>
+      <field name="view_id" ref="fleet_vehicle_costs_tree"></field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree</field>
+      <field name="context">{"search_default_parent_true" : True,"search_default_groupby_cost_subtype" : True,"search_default_groupby_cost_type" : True,"search_default_groupby_parent_id" : True,}</field>
+      <field name="help" type="html">
+        <p>
+          OpenERP helps you managing the costs for your different vehicles
+          Costs are generally created from services and contract and appears here.
+        </p>
+        <p>
+          Thanks to the different filters, OpenERP can only print the effective
+          costs, sort them by type and by vehicle.
+        </p>
+      </field>
+    </record>
+
+    <record id="board_fleet_form" model="ir.ui.view">
+        <field name="name">board.fleet.form</field>
+        <field name="model">board.board</field>
+        <field name="arch" type="xml">
+            <form string="Fleet Dashboard"  version="7.0">
+                <board style="2-1">
+                    <column>
+                      <action string="Vehicles With Alerts" name="%(fleet.action_fleet_vehicle_kanban)d" view_mode="kanban"/>
+                      <action string="Costs by Month" name="%(fleet.action_fleet_vehicle_costs_graph)d" view_mode="graph,tree"/>
+                    </column>
+                    <column>
+                      <action string="Fuel Costs" name="%(fleet.action_fleet_vehicle_log_fuel_graph)d" view_mode="graph,tree"/>
+                      <action string="Services Costs" name="%(fleet.action_fleet_vehicle_log_services_graph)d" view_mode="graph,tree"/>
+                      <action string="Contracts Costs" name="%(fleet.action_fleet_vehicle_log_contract_graph)d" view_mode="graph,tree"/>
+                    </column>
+                </board>
+            </form>
+        </field>
+    </record>
+
+    <record id="open_board_fleet" model="ir.actions.act_window">
+        <field name="name">Fleet</field>
+        <field name="res_model">board.board</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">form</field>
+        <field name="usage">menu</field>
+        <field name="view_id" ref="board_fleet_form"/>
+            <field name="help" type="html">
+              <div class="oe_empty_custom_dashboard">
+                  <p>
+                    <b>Fleet dashboard is empty.</b>
+                  </p><p>
+                    To add your first report into this dashboard, go to any
+                    menu, switch to list or graph view, and click <i>'Add to
+                    Dashboard'</i> in the extended search options.
+                  </p><p>
+                    You can filter and group data before inserting into the
+                    dashboard using the search options.
+                  </p>
+              </div>
+            </field>
+    </record>
+    
+    <menuitem id="menu_fleet_dashboard" 
+              parent="base.menu_reporting_dashboard" 
+              action="open_board_fleet" 
+              sequence="50"/>
+    
+    <menuitem name="Fleet" parent="base.menu_reporting" id="menu_fleet_reporting" sequence="50" />
+
+    <menuitem id="menu_fleet_reporting_costs" 
+              parent="menu_fleet_reporting" 
+              action="action_fleet_reporting_costs" 
+              sequence="1"/>
+    <menuitem id="menu_fleet_reporting_indicative_costs" 
+              parent="menu_fleet_reporting" 
+              action="action_fleet_reporting_costs_non_effective" 
+              sequence="2"/>
+</data>
+</openerp>
diff --git a/addons/fleet/fleet_cars.xml b/addons/fleet/fleet_cars.xml
new file mode 100644
index 00000000000..e9e876ae86a
--- /dev/null
+++ b/addons/fleet/fleet_cars.xml
@@ -0,0 +1,13736 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+      <record id="brand_abarth" model="fleet.vehicle.model.brand">
+      	<field name="name">Abarth</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAABAa0lEQVR4nO29d7SlV3EnWrXDF0++
+OXVO6lZo5dBIAsmASCILY5KxwWDjsf0A28PMcg7MPAYPg+3BAwaDkUAIBAKBAkq0cg6tTupudbp9
+870nf3GHen+cVlsw0nqjVkN7vUetXr3uueuec/b+fbVr1676VW0kIvilnAxhJ3sA//+VX0J/0uSX
+0J80+SX0J01+Cf1Jk19Cf9Lkl9CfNBE/7y/QWgshnv/SGOO6rgbgBEgABEAWtAUuAIFEklNOSAjC
+AqJ1HRCMwBBwBkBgM2CyN3AFaMG6gAAIBBbBAFiwFsACCwnAABERA0AC1vs7BkSEiL3xPP/nX7Dg
+z/tI1ZubMQYAOOfHfkMAlixY6v0Seo+AgCkAAGAAaAENEABwMJBLRZq0As65ECIzCTArBXfIt2QN
+aYMAzOl9lAYoUO95HBVrDGccAAB/Cm5rLQAwdhJW/88demttb2LW2t6Ee9/IWAbAFKABgcAAoAeG
+Y0ClECftdrs5vTAzNTd/ZHZudn4+a84laZ6lhhiXjouCFcp+X191bHTj2OjQihXD/dWS4EgguPQ4
+gmOs0doQMcGFEARgAbTRLhe9kRwbTO9J/OJ1/+cO/TH52UnaBFBYZBY4ABibx+1m1G1vPzK3Z+eO
+nU88sX/3noWZ6TxJiUjlJoAUhDBWpNpaIs45FyA4KvICXw71F1eumDhl46aNm85csXpjrX+o1leE
+3hcRERFwZgAMkEPHnv1J3ud+EVpvjGGM9QxL7yUROcIBAEAwmV5cmNnx9JMP3Lt1146ntx88ErUj
+1BC4niukYFw6nDFWd6TjBuj62pIxhgGhUnkW1VSHyGR52u50MmXLlYGVa04dn1h1yWsuXLdm7YY1
+ax3PByALZBkzAO7PdbYvRX4R0MNzKvZTK91Cp5Xv27394Qe23r31zu27dnXTzPGCUdZNmKcro6o2
+1nJrkVfhpZrww6w0pgFBSOQMtOI6FzqDPC/PT2ZpV0dLLK37acON69heoLizVB48bf0pl1108aUX
+XLRhw4biQB8hmJ/2K54/nl+8/OIMjtaaiKSUxph6vf7oE7sfuPvOe+64aXrqIDgelvqVW815UCi7
+VBmyY6tb1Ymm16eCPnDLZADCYSACjmAUqMwF4+ZZ3q57fhmsAd1h3QW3sd9f3Bc2Dsmk3urUO0sN
+T9GGiZXnnHnWWWefvfn8c1atW5vnueseVf1j2w8A/H/Q1h/7/N7ckiS5++67b7755rvvfyhpL6CK
+gtDFUn9aHLEDa7z+FU9NvJkFvvVcQ8oRsLzo96OBduvBhbb0XYtWZ1HZd05fPjpRDHS7eV/XtlLb
+zQAAATHQXbe9SN2ls/d/vT49ly80RaJMkrmue8a5Z19w8ZZ3/Oq7giDooX8SPUs4Hug1UGbQYcAI
+kEHPMQcAbsEoEAzAEllrgDMBwMBYLWUHQAA8ddett3/n+1vvf2opR80nS0a51Yn5FRftGz1Tj6wV
+wbBg1dTv9nWdJduoUfyG8eAPLlu/AuG7zfYfXL8YhRJku7Igmo79wWXr3rRMx9ad9OdbenDv/uSb
+O+7/UXcQ1HCFpU3sglPhiwdWzz9e3fMTNvUs67ayLGflkU0bJi688PK3vONXB0aqgDGQBlsGQiOA
+WwuWAUEmwQDYVBVcDegfc9K01owxxtjPHFaOT17y+3WmhS8AARDTPJOO20P+69+/0WS6GhRXj68Y
+HR0NawVkYAAYs3mSbX94xx133Hb7vT9qtGbRQtErZrhxevkpnVMviQtrK+6ITVTMbMrroDDlBtDW
+TWfjuqFNRXA79p0V967l4XUHZnSliKELUA9XcF2g6UgfmFXjffCrp8lVg5vmH/cfeQbdAr/It48t
+dIw3sX/ZuD/2KjG9M3j2J9Uj9wXNfQ8+Pvnk7j13PfLYeZdceullr9i0eqXDCJKcWzeByDqZBlIt
+Wjg4R0m08ewzcsodx1FKCSGEENbaE4L78UAvApZkufScWBvPcQ2oKIv+/h//4dvf/IZNTIhhX1At
+FAp+LQwHQq/sR2k77aRLh+e7U/O6G1drfd3+/oVCuXH677eHizq0g9T94Ho6dXBoyoHrd+14bF+Y
+Zg1eGgWdrO7zmYY9iV476P7a6f49h6PJKOwIFno28KGtO3tnpn71G/btG7v/8x2rzx7sO0O0dpvZ
+315f+9Tp1Vs7pZt2zH99V7MTTMC60XTlJq95af3pO5ZNP5HVm7seuH3vow/c9O3lwxMrByu1gXLZ
+gdpcPrmUH4maC8lMPH+4URsZf+O73/GRD7wPAJRSUkoAyPPc87yXj/vxQA9opOe0Myq43AG7d+eO
+r3z9azfc+MNSmBtfGMoXTGOh1bDNzOztGB33q7JCC2gF97E0VK9taJ12gT7lzHq0/C0r4NUD8WWn
+nj4RUJAtGLe8BYbf32CHZ6ZZ04Yi2NhXne3AFw+2XlscuGSV+4qN/d/ciTpNzxz2xxjUdHDa8pUf
+e2t4thNLEHsiPRsnZLLMq7TLwZvK9pUDxbecVr5zOr/x4R27Ivns0GU49irvse+LIzvK09uC1lR+
+aO/+I4d3gzAWXCyptA7Y9YXjF/q0oaf2bNvzP591rH7f+94XBEGn03Fdt4f7sSfxC4WeQCsQoYtp
+K3tm2yP/5a/+bOe+w25YdTquW+vPC5WWhizLHJWENpKULlX6eW5Aut2RsejUM5srNqbeAMR4yen+
+5y8rTaTdwwI++1B6ar9442pnU9gH6giEvoppouAu47AYRXuf2XO60y1urr5148TTk43tc821vlfM
+LaDbEe6nTrNFzRe78PdPL93Xzros/IcHZ695Fq++sHjxcv+1I+zy0cLvrN70jUn+Fw92shgOnfkb
+OLKzMvNU38IONr1LZg2GeZy025hWC5USH27kcMQRfk2O5NJvzn3mM59BxA984APFYvHfUDspBgcA
+lFJRx9523be+8U//vdXsUGHIVifuW/uqwTVrxNhIm6jb7bIoKqd5wdoGA0TkQSXximnQDwZAEwj9
+yPanO5dvgQBve6L9tdu3v+uSdWethCiaXx6kByIFvHvGikJA7ZXD/h9dctaWfh9yes0IPjGc755f
+HPYFQBqr4NNbH3vf6uLlQyvuO5Be/eRUJ8mr/aNRu3O4kzSpX4M72UjqsdowXl0eg9c6MNFfTPTO
+Zr9XH3ttiq8Ti4dF/YDD40zFxHW7q6UoRYVaXir1McW3PdLYersj5z772c/W6/WPfvSjQRBkWea6
+7gnxi1469GQD6S+05774pS8sTh0aWL0mqy6L+tfRljfPSQ5WAxmoDpgqq2vbAmYCxHRubdU5pTIo
+E2fbjiOTOtfVwPLl33mk+clzKu9em130oYuCPuhjMDFa/OvXD/7pnTN37th3Yf9Gm+q2L90h+UgC
+qPC0Cly8zP/SJBvqLxdcmUi4fSorRnDZW5zTV8O5h8fuPFSPRTE30YWjAxeOFBHUPz165AeTtHl5
+eaYFnPMPnb/qzevSL21r/d3Di11VwtrqQmWoiUwLH4SBNEHkJFwAjHVW3zgQljauffAzi4uLX/3q
+VwuFwq//+q+7rktE1tpjUb/jlpccx0AQHKC/v3/T6Zu8WrEp2JQQtS0XM6ZFHvNu242jsNuRrQZ0
+GkZFMF2/UsjrTl9xw/nlvz3PP3W0m7iZEoVMLv14anGBQVBoD9eWfrDj4N/fv+sQmC2evnLZyJBO
+z/er0qldN5u85+v3nvetB76w7fC+eLJvALyq47uOjjppE9pp+cfzo0sAo4F+1WixZFnWSV0T/cbq
+ar+ApuI/XhS709q1hzv3zMyOVd3XTcAGpPVSjqINPHVBJVuvF4pL05BomEt513jtltdYgNYiZJ2o
+L5g/Z43ruuVyOY5jInIc5wQegF8y9G3MUEGZ88ve8tZmpCpLaiLGuSMHgVxCz4A03E2QKcaY64Gy
+QHakMrRpQgLP1nrwkVOHK4UAFIEMmt12c95CPHDzk8Enbpr73j6dLnFAseQZp1Y4ULDbuvG2Z5am
+9ZjM1n7rSHD5j4pvv2VRzakvP1R//zO1D+yBIgdQ4gfboJOJU4s05AG0l9ZMFMOxEkD3RwtmstER
+NuJQsm55XQ1PdyFF/6bDalpNjCtz7ZbK5990+gWnnVLs7Hd4SzCVCF+5FmUTZAFocHRmjgGqLB8a
+GHzb296mtUbGLBCeiNDbSzY4HHjvfePj48tWTajpjomborMI1iAQMLQ/pRCWCc+3sUjL+7ouK8Fl
+G0Y+1an+53sf1cH4PovfWZxdNThw8Rnq08HY6r6xjQN4IIJ9s/GkqX72iZZozO9LCl1bFDrRM425
+TovrlFu7dGRy++5nnXI/94LZqvrbfQdummI5VRdNrczqr5H5u0MFpvDkMwttw6zHbKQqKjrv3JV1
+B0zaOKU68+CUOr0Yjoai34UBq4yuWl8zS4DACMCSEQBGY7vV7XaVUps3bw7DsBd8JiIC4vhy0T8u
+6BEAYfnKiU2bTnn40F0sWizWZ1ieoSMArQXGCJlF4AAIlmdxkeUe3LQn2rm3/t/OHf/IWd62jn/N
+E6AKI1NzXC9rTzhLH900vgB4z7bW5ye7P5liwEefOrCU7NgFza4fHyypvcX6IifjuUw4Msqho5xc
+VlAWuys2T7nh4sCKZKikmRdUBVXNElNZKh/cu6iMgUIG6PRT9qpBPwRwZfC756w+bSQZk0Uhswa4
+O+YPxMUxgQ0DBIBIjBlmgMss5XOTSZIQ0UUXXeT7PgAQEJyggM9Lht4FBxAIoVorr12/5qFbbnN0
+x21NM5UwGSiGgAyBAQFZAgZgreYUAwiIsvriXNNZ1T/0yc1jt+TtpaeO7NnbN3PGKbMxv3YuunGR
+9symxSXq7t0nph+jpfs2yPlTi9nagcmVE3P9fSOlsu96mCmVaBZrb6aRT81Hs7tvOdjwdmej3cHz
+YM2Z+cSyGxZqux4QZbHnSSj4UiZRGwQ/e0PfWX2Gp3LXArPl4oUriysAgJI790/vaDRhcLVpMwYa
+ABgxSwKAB2nM5w4xxnzfP/fcc3vTJyL2svX9OKFHYoCgLUgmVixfI31PkxKtRZZGLHCAAVgEZAyM
+JgJm+xUrxSzQyftWD75+eDCoQh1gs9N37ebyfzrUuC9W795p4wZOzchk735oHIwe/+L5g+m5YwdP
+OXfhgvNGxiqsUgV30M1V6rgZCAsmA2TWepkSmYJWe6Yx5R14uvXktj33PnX9ffcsO7j8zQdPeT1s
+isFbV8oSN/Oaym4e8BnVF6H0Hx/rzEat953Z/7F1vubhw0faeR6ITl0jAACCtcAAmSD0srbTmmaM
+VavV1atXn/Bk1kt3Lu3RvVkCjA6PO6Va2m7buI15wqgIXAIAWI5k0GoSqLQR0mHCFhnMNODbOxda
+wv/L8cJgKMsDm6Ajtx3swmMPFJ+6//SlO87uf+bMD5VfcSpft2ohHGpbmWSJcL0wt9zRBJogy8Ea
+4JZB4gP3Xe6OdZYvk5vPxLcs0fSR5K6Hd/3okYM/ueHvZ59+d3hW4A6MdlihLMz6tX25Z3ccXrh9
+EuLF+M3rGRA/aODuBbReAXQDWMgRLYAhi0xaIMq7nlpSSg0ODhaKRTj6bBAALNmTYOsBwRIIAWih
+XBpgXilttQNgXOUMDKAEQji6OAjQtoQ0FWEBHpjTf3HPodtn94ry8NzqNTfGh5pzPHxmr//UV1ck
+d1x6hn3jJ2unnkVMdovVGLELCHkCgoc6ERj7uYcMhUafkDlMksmNTrkmPxsEwWKoq0o0Nl5471nu
+W99Au5+o/69rv7L19qsPDVzsnfPu0uiyf7138bHQY2yc8oVlA4VXjBeR8UdmYWc9gaK0jEMHGGdo
+yCAw4VggsrHEbitJ+vv7nw8AwYmxOccHvRHAQYPLAyNkSsgdiSZHsIAWEMAyRkf/GHgY6MRJxd6l
+8A7VbyrItfvPT04O7rxxcMfsxvSJ179652s/GPjLYNjznXYHBAftpl0u9KCnHCjqbjZbCH2wLUqB
+yJNuxRrbbrclN+5In6W6ybmrnQAkpKrVmStO9J+9vPLF1/CHbp361h33Xv29penl506esuz2Vefq
+OEv9ZPlwPuovAQ7sPEjUScoErZwBIyQkIkCyHAFJ2Ywzk+f5sRCCMYZxjnBibM5xGJxEoK+15Y5Z
+iKdt2vZJq8SkrK+Qlcq81GJkhEl8AJMBqJKB7zYnrnnYHj58WDZhoLlk9t2RTt59gXvLFe8ceu1r
+5aqVBkQGmaRmG7AK+SI1Sk5tKZeLRAxiW6Bh0M/k0O+4nkxToDorVutzgz+6WT/5lPf6K8dWrp1d
+uSL2yfgOKw8EVO/YNITa1PlvqZ7/uuAtdzx19Xdvu+/WsZZz6cCqy548d/CppTPe/hMzMbFwZI4z
+p9IyGXghpnuTYh9YB1IXjNfvUNV1ptkaXmg24y4hWKU5Y0CgzUkKGgMjsCA4I7DNpWbcUaEXuq5x
+527BZJCCIdfth3BQiACgxBCNajx7//1UnyouLYTTe/ua91+08sBr3+Kd/c6RwVrV5cJ2HdIZ9xBF
+muRNn7s4NmvytbdcJ/tHsvPOb0FJwaLnFEUepY7vgUrTpUOr1571Rl6YnLznY+/cfMoZlRVrgtPP
+KK9aW59YMXf65iKrdXjiAM6Dd+SSN4tL3jj21I7Sd3704I/v+uHa6S1d57z9Y30HNg102DA4IZfd
+ULSFcJsLLmrw3MMqmVYdYPUjrmpxJhYWFrDnUDIGz7GJXr4cR4IwAesBYpwlV1999X/9q88XQxwZ
+s31emhi5mLsNE2qnYlhgQXDAMC6j2V/gz6wa6Zx3RuGCC4trT4/DWgOgAtkc6QRFCMZJUwsOeYHI
+mXNgr/svf1c7+Ozhv/3C4KrVzWwhdrmAkogW49DzwbU2XWRhCM7qTtv9H/8Yf+MLTqPtF0emAOxQ
+tW/Zis6atXj+Zr1uQ6VSXiqV6k6YWm2Ied2uvuVL5W3PDDzyLMzosMtWhqVxpRNGLkGmskXP0S7T
+dnHfoOz012rTbdtqO6VS6cYbbywUCowxay1DBkTAXq7ZOY6Fw4AZrYTKzeGDhwS4HNTaDf7n/9Pi
+Qj09PGemFnC+IRtNkUTMGr68xEbH9KaNfHxFCJ4BuUgy6+h2sdEBVkBeMio2ounVAgPhfN3+4Hb4
+8TW1+3/o/d5fuatWH+i2MZRVcFKjorBahZQgTph0dSeybFuxOvKxP1ry5dg3v8ZStsoNw7m6WJhP
+H3/0yDevptVr3PHlhU2nu2edxSbGuv19Walg3/VJeGOaT27TM3uaRw4cbHXdqYblzkDsw6qwUfMy
+1scmNqSb1oY7d/G/+7LNdonm4tLTTz990ZYt1EuVuB6cpMglApKxEMfpU9sesxoY5mvWMxixAyOs
+tlGehYIAiTQ/SqjMMrUASCAKYCTFiAkVtQueD2mByOVFYm62GDkP3BHe9SN+16Nh/VBwxpb8qg8W
+CBZtXMFaDhnmJnJQcCwDBqBR+B6AUgsz1fLKj36szpFd/eVq0lyoDUVMlbOuNL6dnOP7D43febst
+F9LRUXvKBtyyZeRVr3y0PNBdf15h7XlFDQ4HyGMVBPkMLA3ni8gReGV73Hfjd9mhH8qh7cUFN4+V
+eeC++y/assUCvHxlP37oCTiAEkIePnho397tgg3215w163NQGpTlBIAcMwsaACUgA8hcWbSO6eR5
+rrJQlDxRBqMhc0k2sGwyDJ56aviWG5y7b6kd2l2WI7pYSX7lymy4v5G3wlJ5SHX3IQ36JQMZAhE4
+DiiyKTDpylIZOjosqd/+qGZ65htfFXrJuGGjGp6a2AMZpaUyt5aZjB3YU9nzlPfEfUOXLh+GgrG6
+nRh0PRCOEboBnZkRMQD+hgOLeOct2dQNMPy0fJWAShh/3Lq+4z7++OOdOAqCUDgOWAIC4L9wg0OW
+E2bGwL333a1VZ7hv7fBIumz1EtgVSkdImlFudYqMuFBABHw8yepoo2IoQRIkFhIN5GXuIbc00orK
+N97Avnutv3dniQscXh9nBq185pJLRzzpmsyC05Jen8kMdTIMipRFSaoCv8Rk0eaJ7mYOZNBa4dZm
+PvwHGeeD37wmIuvVO7NusSskkgaOnnAEKzsqwHo+/y8Peu891R8s2rApoK1BFsGtGGeOq/Cm2+B7
+11b8B/tfHSdbqvWaG7RbZbfYcoU8dODA9p07zjnnPA4nyrd86dAzBoS8Hak777xdm0ybrNGabnYn
+gQdC5EgAyBkXwCQgSzMt8Ck/8MGUoO2ANUYqE2bo5S4Gu3bSd7/dvfUWubDke0UlvY7inebBza95
+67Nnnjul6rn0NkLyDDHBfQ2JQ3EXHRmUnTyPKUcpHC4k5BL8AyohL9Qf/MQShn3/8gVXFiiGclhw
+VdIFihAZc1ynEM7XW/f9qPK6y5zBU46g0wKuQfRrUV7Iki9fzafu1Gu3N64KOiuKppOWjHJL3oIn
+C50saTQau3btOvOcs4mAA4cTwV166acyBLKSqHPKKaekaSXh0f6Z0mf/7Mo9+zZAYFLtQV4A7EAu
+Tdf1HARRA1kga3MdKRYxDxw/1Jj/479c8fFPud/8NkvzoVJJSNlCa0kVRDB5xduHE8PQlaDmANeQ
+LQDvApcoArAScnCAuYjMKG4MVHKFDgZ+K+ULM4XREXfj+kUeTVdihvWIaYucWQYGcqsb1SC9v77w
+/TsmYWoz2NGoyLs+/9bd1U9/9Az/v6V/uHP0I2y4IioHAUOjOCt/2hEH81bq86VW8+CefY4BFzkB
+WbQvH/qX7Fzm+VFeytzc3Fe+8pXvfOc7aZpKKd/8K93f/VQ+0pdjGgBFlHJ0XBBxZtto+iSUMVAg
+64Ajjz9cveZfn31oexB30XP6ALgxuesGeSrbTXX5aew/fy7p698m0nHkjtZHhFtUSkievuB47rln
+7VNP756ZZbOzhYU6S5TodD3GxrU7x5ljcjA5CeZwZAwM57g03T90yt5rPh0Ob961dae+9RsT6mb1
+WpRr+XDFOmGq6iKSBc4ycVMUX1+iSSvr9fqVV175iU98YnR0VCkFAC+fjgDHw8MRAgAYY+Pj4x/+
+8IeNMddffz3n/Jbvhadtrl713kUuOXT6kTcAFZB22TJwoyTd64uBqUOrvn9D/KMfTi4tjhtpGUky
+AYAV3M1T2+0kjLlvuvKx4ZE+IEXOEUsEEkAWlGpKeGH2y5pzFu++r3Dvjwfm675Tkm41TMkyZjNq
+edbn2pHGcSzoPFNkuR/WRpbq+1tfuqlQum302VvZ2dMDb3C1LanBpm24qUbLGXO1+wyjb4fRJPmL
+8/Pvf//7P/7xj5fL5Z7awQkigxwP57JHv+r9f/jw4T/5kz959NFHZXfZxtPm/vK/N9Ysj1RDyqIy
+iWVSY1yD4hEIbbPV9/m/rd78o2LHkF8RnGKrXaQykoeMonhJONna9cu+8Nnt5YrDfUHWdLr1wHXI
+pNKNIfVfcDAdRijCZ/dUvvsNvnUrzTVzw0SltiKL9oVOyQOXTEaQEkdNQlm3Y5qlAjXc5HWLI/9B
+rhgU20vaNrKNhHtU0aVEDzrlekf9K29/NVB2Rl306kv/+q//enBwsMdFAABjzAk50L5krbfW9hRf
+CEFEExMTH/zgB7dv3y787pNP8gfvE2NjqVdsAThkiijR0Cw3PgDGyeCByUQxWahIRRZychwEylWe
+S+56ASkTN9tH/vNfdwqFEipQabxho37bO2Ggj2xrBXPnXnA8RU7WRGds6mz8NFz1TN8Privc+sOs
+Mbe76I9S7mSCJ5BnmEjJOYpuV8HgGnnwsOva8VCtMjuTbhaJUZsdag9AVesOaKbZYYA7PbuU6tOq
+w3/8x388ODgYx3EP92OK//LlJW+zvaqoPM+JSCmFiOecc87FF1/c0Hs1FO6/m1odgYFRWS6kCyB4
+WAWsaWXcUJT6fZDdTjTLIOA0oHJK1azGQ8JfKpQ4Z259Qd+8dfiGG0792lfcvftM30BQ60dwkYkX
+X5opsSyHyJGZt2nD/Kf+dPJz/2g+9J5SpW+2kx2YiRdtsebVxkCB00rWoDfRODhKouhtvKMrHgMZ
+somkk9HIPFMUtvIa95pKPeHY3S7mmr3u197RS5IcYyb3cO+B8DLlpedmOYfn9pneOIjoggsuuPHu
+7/kl3L3DLMxVhoc0WgdEDgBg3DyPnGLisGx2toN6vL8adDtdyUqWIs9zCDCJczIMwQt8r+IF0Yw6
+/xXZJ/9j8ZJLOOTT3bmG76b8xepBMAaqgHUpb+VJ5HqlzedGm8+ZecVja7fen//w9s7kpO6zfCLV
+Z0rv/KFyp+H+OT94uFge0eLmTn2grPvKZd1aXcAmuhRyd3tAD6WdbCkZrw5e+rpXK6WstT36TU+y
+LOvlaV+mHIdfzwDAGCOEMMZkWVYsFlevXj04sKk93Wg0sLlYNGkq3JJV04x7ANNOWFPGxgkrhUMC
+vW5z3nNHlWlaypFCo4TNHd/3LXS78VynNXbKpiN/9CfJK87tqiUjw0ohMGCHABovOB6CKnoClEIM
+Xa9gVVelkevWzjxn58o1q8EEP7ymtZL63zS64ty4OTJ/8FaPV4eKWTRdl+kd5aHzWua1kNa1IIR6
+SZTaycyAP5nkQy0464x1y0YGj22niEf3xROCOxx3yXLP3PeqRACgXC4P+OjwKM28w/NeLFRsOkBl
+gCRnFbBGmtAzLQCTinlRKGqrfOM6fF7HgcqK6CQakiQxSWPFuRvv+8s/dV5xrqI04+DrTgZYMjYx
+UM5sqjEzyMFhVuQZReAbagWaS8gCyKZz1piNa241BOfQTx555dc+l2Y/mv0Ur/2dF17Zbo/YLC/Q
+a7PyStvyyazI+2ay7H7Bl1KvU4miMhdd7Vmv29WHS3yv7lwwvi53juJzrPKNMZbn+QmB/nhC/kcL
+X4mOZQyCIHDd0BjDsZAlLVcgE5JhCoo/7xtYr4aQLJK1SR4Jz7dAwu2g6LbmEwHRptPxT//8tA2n
+ZpQlkJYZH2DYAOygzEzmumEBcpeUDxqAOg7PTZTy5dMsljkwWQLHSUeHazu25zvuLDx904Hhee/S
+ZGytLHUw3abtFPe6Jphhnf0QInrSuE4cPcY7DzP7+nRgWrQZIKC1RkkiL3A7Kv0Zle89gBMVrz/+
+bMsx3mGPg0hWWAOS+QzmOWQMfRAR5AVEC2Cf+zMiC0SotR1fNtPpjCxO92HhiJDWNSOXXjb3m78/
+uXFcgJpO49Rz2iATSDXYApo+GewHzwXoEjUQBZMM/DLPg51zxb7FqaFN7lRcmnvKeXZ/ft0NTfWs
+v1yVI+3vcwpLXM+ItB1qJMvztAsOz6sWeS6ta9h23vkBU69MSi4AR7KMJEGgyQ3cqU4dn1f3i4i9
+kryTBv0xlYfnliEizszMLNbbROhwPTTIGCRGFYRMAPsRkx6zCI5WsCIRqtz+6juWVSa692098uMf
+duNW/XVvxl//yMK69Ql0S6BqHnfAStuNDUuky1Go2Ip0lmpDReZ1LZh2G7oL2eED9r/+U372IL7+
+XdWvfmvxyPbxxaW4lY27Yq6NLV2AxGFxRpAbgY7xbeTnwwshEB70YwqSlcasE86wkkxbyQEASEBF
+4LCBOY7PzE62FpulIfcYB4RzfmziL58V8pKhP7bB9qpbetA/88wzS4sNRswvLq5c6ZIxAhAUAjOA
+RNb0htmr4wTixpgia73uNY1zz2tvOd9P28UtF4bDqyOoZwQNSz73GPGWDVIpXSCtjLn+62fcc2s0
+vmwkqDUazbzRZItzdu6IX095vRhQXnv2lvKiHEr5dK0w2Pa4M0/ayZSzgF4WSKekyqxVzBU/HC6s
+MOySHMY4P4v8lbbUT5g7KSPUQEzQMHdX6Xy36R6YObx3x66VY2PwvE4PvbV+kkjeAPAc8623EtM0
+3bFjR5rFHuDKte2R4QIzEhgHHQB1AZ63PIkhMERuje50ZkG5/ZW511+ZI3BIkryxJIXBUg3JJZQR
+mGbdP7zX3b9T2dztSrX1vnb4eB8GaRQz7nAQGmyx6GRzip58ZO7c4eX7RGtP1m6mxsrS/hHjGS4y
+kOhGjtfiBKzhMnWeYy9Og1eqcFhjwSoXGTAzJZKC9QxYAjtk2akQPADpoXbrsbsffOUrLznmQ/ea
+PZw0g9N7+M9/7AcOHNi5cycTiJpfcKnnh03IBRCArVoxBVAhIgRA5ESEyBE4EUbWQckJfFJjBCy1
+pqUKeWfkybsbRw45k0fE5KTXrBdaM77O2mdsrl78zoVKpSpoCF10nIJmMckFq22eZJUag7YdcKfi
+ZvSsU+5WsZjEQaKkg9q4icYw5svRXuCLMwf8DfM0TJK4XeL5gjUeQGj5WOYuSjQMjFFlJdZ5wYib
+Hc5bT9z/0PT09IoVKzjnJ1DfjxN6eG719Z6/MebAgQOTk5NCCG7g9HNqjM2RlqgNYJVJbW2vx8e/
+VQYjMiKcXRp45HE5v7+7NCn27KkfOVKabw0sLPjIKctLJB2DSbFQy7VGXGTFJte24le63cyoBe7o
+XMdCaKswKLjdxXY3HgLbPT3ovyfCqF8N1GmBlWqYr3TTcyS/FPrX5izsNlkSxQw05gvcAokR8jsO
+TYHuz1iOhAxNrmQmBv1yzfPdLDq8b//k5OTY2JiUsrfETwgN5PihF0JYyjlHADJG33vPgyqHNB19
+5RvuXD8+JLplcNEKjdAAWxLKByiBmMkscEyEdXM6GAzX7rq5+t1vp7EqGy61LTsMioF0A+gEpZpu
+FlmrntsEPeURgL+UD6xT9bjvwAFcs8YZY/UZGQxaGHFhugujg0YslpZuDdkVXX6xrW+td4Na+bcS
+db72tyRlAKOchUVfxz7zMkHEcwDfAgC0MAcFNQDLjOCGa1fawlyYjyatD5p8u0i3+3T33Xdv2bJF
+a93TM875SSvetBYYAyLqKfLMzNyhQ4estcjqq1fWfA+Aek1smLXAGQfsGutykKRCbh1p+gSVrRnI
+YA/3IQgFCME552BAJ3me2FxOAy/pWhCJwHGW3HqI7WWJeyAsBE5SiFRmM+YZA4lKcsmBJwvMYa60
+Js8Md15VHXszsVMaoh9NKtWinximPYvVzDcaMgPgvGiWAwkMECJygQE6fcIPHPXkk0+2Wq1qtQrP
+uZUn07kEQCDWa2Bz6NChgwcPIvIwnDv19EEvXLBxziwCSrQEyIAZBgDAsqhrdZTnS4BI0NCYc0cy
+Zq1N0FjOSIBCx3pIrspAZt0+qrrBWGwbqfNYwpJHDrFmsBykYXHiWJFHPJduSUhHn2oKYyoQeT5B
+eEYuxglAJ03RdMApIs+I5ZoSpR3wfBkk0HzBeSEBEikkZICABcaWieAZm+zcuXNubq5arT7fqz7m
+7L8ceekkb0D4t22WTU9PN5stxvjwUGv1qgHkETJLBASCMwYGiCQgAwPVavLaK+mM83MWasa4ISul
+RCQEcgQIJMnJdUQla6YiAEcIGbtlNVX37/lxsPcRfsa0WdGtgTeoWDcjAO4z6fraOTMy+0Iz6djD
+MrvZtraZ6CqqrPHcShzGaKfAgLFVK4uGa065o0G9+NQIcuitCVtCZzW5D/J8sdvcs2fPhg0begXj
+x1qcHBfaPyXHlRYnQOQAFMfx1NSM1hqRVq+iSiUhHSH3rLGEBjiC0ihDIDJZVizB2945ANzRvMM4
+ZzYlE3M0/Kjd1KSVIWtEgFB30I2jvocf4VP3t9ftwHdScTBffxvRPuq6eeqAhcAiR9HO71LtH7jZ
+ghSVLrStWRQWoLsR87Mcz5FOYG3J2ADBsrSDnRg7hRfJdnHgjCDlBhC0sQHIlSBDhDpjTz755JVX
+Xtk7zbITx/07vhgOIAIRtVqdnqG3Blat8FyegM2BfODCku7FD4CnABK1o2Mt3QaBBZNxcplxwChA
+gDSmPCcumBdwZBEqgtJDz9Jt1y0l36u8dmrdJQXfqbW/GxZva08+Iuo1IQIVRbYhWVjh7mI1j5VY
+lvhFcvqZ359lT7L4mnB+ZYZn4eAFtrBOs0EH0QNLxicDLwI9AiCB5shJK2uL1i5HN3TQ87x9+/YB
+gJSyp+wnLUsFAOxoOzeWJMn01CwAk1KODHmCKxSuTYF70loDRgNasgoJGK9AnloTKZ1KXmAoyeZI
+FgSAtmmOfrkCbrWbJHKKvvTDpcdu8i48svwNVgyPTmcy7FLtXt2OBFWE5/OQrADTYSC09NIAKjHP
+UM0UTJmLixvli5I+ovE7ksl9bn6/nFpu6SoxdDmGVUWx7r5wcv25Sh3qhdDIMKIh4D4DKeXS0lIv
+OdXjXPbqN0+Cre95OMd6tnU6HcZYGIalMBc8AcfRmhwmwAIZhZyhI7OOdYUDFpkTu4KD8KiToytV
+biQgSE86HPzyVKP9wKOHb/zihacfGfy/Ft3N3MUgW3DhERY/2Jm6C4Ii88ZSJwOmhdcnQBie5bCx
+gV1pmGVjDduQ8c2+mpTupWnhI87a3S48oOcz3YqtrQsTGsiAiRdBjIgYgUXA5/LVJRIuE0RZFEXN
+ZrNWq/V8yhNCR4DjsfX86EARcWmpkSSJ1pmQVC7lKNu6K6VTgCyXVACnZY2rVerKIuQpI52RYxwU
+JnMcDu4c8KHcBo7MBeAtP1780Vd9f9sbP24WJrhhBcIomBWla6PGV2RL8pFLpW872WNhpkBVYtGV
+QqHNQ9WGWDOugTdyWzPitKTUxvyvxJEJO7M+L77eloeKQ4OAfqI7ZGpUTJl+wXk5WmqehYaTcTsF
+4eSxQ954xp5xnVyrI9NTg4ODR2vYjnaFPAlM438TY4zWGgA4564rkGlCRGYBej19GFnkpmK9jAUx
+5OgmDsQlcK0WqWj2SyeGCnvsgPnmP7nJvZt/RcHFxUdyNUpexc/Mt/sP/xcPZ7uV93aLl1eba5tr
+fm/g4GQWT2QhBsJ6vC7y6lLi26FFR/UptEI3wrwS5x/OS3/YP7S1/extCv4sVyNM/y6qDWlWddNm
+6ENaeMG5WABkz1WpETFDElECs1alafqz6ZGTFT471jJMKdUbkxDCcYFAExAwBUYDCGAcUTBr0raC
+wHECQUJxHYPhoktQDdrxhhv+ubX1q1ObO6NXFmU1aWu2LnCaHiUPqPgvnGalU/1bWXuFx2+T8OeF
+R1vCWxt5CZkjPKvmckAhCGF5AqDnHV5U6DftLX58fzlf1mXvN5XzeamO2a04v1eKLhsrGJa3U+G8
+cI7JsKMEVrQkLQgLDIEzZIyladrTsBMrxwn9sSTJ80saLeWWCJgGq4Fx4JwZCdrxPLJemiVtG7Gw
+OACloCXqd9xf/vr/vXPdzhX/afi8cXeBd5vWC2fZXCkueompeew3YOyKdjmpdP6mXL8mid7ply+L
+BvY65lFTFylZ1DIz3QKbKiaVhI1HLBUiqRYviJ1qix4qdH6P5Svl4tuNeLfpG7Gyw9NJnkwA5fDC
+VA6LR50cZgENMUvAgNFRzktvUyUiIELGyFrkv/gKwueyZYjoOI7jOL1QqsoRSDDWY0lYIAJrARg4
+86m2mJIPCiouYPjw4843bjP280O2v71yWXN5VhTZwBx0KJ/qK0AceM04X+ex0y39Y2H+07mWDvvn
+LHxjtvoHtHBTYTZjMK6CuSJnktVy1u70hxk4KcyFUV0kFznhu7LCe/LKg3b6W57zN4FcnpmPmeQq
+bQORJ47LX0R9DYPeAb1nSgjAMErR9vKgP5UKP0GN+o4H+l4gCQCCICgUCouLi1mWRR1C8hkzYBAA
+rDWoFJBFLjzbBSnA6392iT2xNT74HRveOXR+n3utXN1AarNFR8Q5GwvtOFNzqd+Zh3RNWp6L8Pr+
+5gUd/yPR6CZuPwGPTxt9XruyUAqe9KKihrJTMEm8ItOLQu+uWq6UX49vDTq7S3xj0/ym6V/vVh4W
+5iZncptlb02Hy4ofQRWw5AUnhYhAcDT9yjDnYMG0QClFvu/3igiPre+Tkyp5fiijUCiUSiVETNO0
+saSt9jloMr0hEpFlDICtgsICZPGDjzs33uAv3eG8ul35xLLiR91of+fwK5u1mhxvBo2OGxdb5LRq
+DkUjjLtWOKz0H3N/wOnuNUuvx9j1k/eny96ql19H0TMiLcXoWzsjbZEv1gMYyGUNBITVU1MZpuqu
+SvPqzDlNt66K4C9FdZkQWqfzrFOU3JoX5vMgIhjqtUAwHHMOGdg2KWtZqVSqVCovD+cXkJcFved5
+vZWY53mrkamcCSHIai4Zco7IwOGp+9i2w+tv/f74weuicyb57wzWKkNmb3P6AVHohv2x8rJ0XrJ0
+JKsUE9EtRgPx+KLf2ONP9lWmXjPb/2vl/GYneV9W+Z32cOK6ny7uf7i9VHOK3ZKbR1kf85Tyl8Us
+tWpGtdZb5zK/ukXI32k5d4SdH3DzPyyVkD5i3feDz7DQJOlC9oLzQjo6OwNkETSDjGxMBpGHYfj8
+7lvWGMbYy3dyXnr4DAnASsmNMb7vbty04YEH7+Oc372r9FYThvhwZthiZYWfT5Z4uPdw8s0fvnHx
+rv3rnpr/KBvy+k0BVNrp+5zQbbfuaS+JtfQqrlo0FEUcM3Tqlekg12O6mjP2WCF6ez17jxwcr4z/
+OMd/ZjtLpv3uoNKWuLW1NG/CZHAIs8NoAmk9xRUPcIVWlXYSFcxVtvga0IegPZW0hRDbCzhCXjHK
+8hc5D/Xnuq6gU3EHU/KbsRP2b6tHC4Nu1OicecZmfM68ExATJylo/HwzV6lUVq5cKaVExMmpeO8h
+59zTfDdWQ6AWYfg7N7l3fdHZMPfwuZ3qJm+UBeDZDDP6vjP1sIzHkzC2LAJb59oRuun4YS6C2FYM
+j9FEJgsUP1WUywPe7Rhfq3bc63bfFodvNYOvsH6GIAr0ZdnF+QNekLgEwEnaZCBHz0hAra3S4AvG
+xpxijXuc85C7QlMKhsELA9cEqx1ZSHSbK48RKtoXUCRlnufr168/lhbt5UxOWlr8GBWCMbZ+/fqB
+gYF6vT6/f/Pk07vPPdNNS+X7fly95dZEPare19wwlvMJZxC8cAbmZU5NgTcGrQ54xTpLPdb0RC54
+KbZAeUfY1KHRxIiA5yhtalxtXKYiiPYlU//DLttYqYTSNuO4or03QkHnfNLBYio8VlzyuOL5JZYN
+M1CByqW1uXU0FC1UrUREq21KRnF8sU7eTYZF1ynEad0HJKeu9WOumk9srVQ666yzjnV0PYF9iI/T
+uYTn6AgTExOnnnrqT37yEz51aMe+in66/Ohd+8V3Fi7rrFpm9DKn7opCU6gu1EVuAII7ebYjw1pc
+9CRPHTstIRLOaNsZJF6XwD3R1Bkic7kgX86TzUhfhMV1/vo3dXgzS1pR1yGehKFDfEjpuRBLHY8Z
+xpUeZu4pmvuo6xxyywSSMZpp6tXeaANGIBcMXiTSLpkrNCnQFStIs50OPIM6b+mzzzt72bJlPzPr
+EyLHH0hARKVUrVa78MIL7777bmdddv19+cZHglcsrbg4YacxAqQZVytFOccWmOVu5Smk60wjS0PX
+qXWcecpVGttWSQL3BFk3NSWl26GDuWbKaMEVR9/aM7QX2HC+3NK5qlGxSKVGi25n9e+60VRmK5V+
+GyVo1atFEJCTG9LkFLWnKCVE7XEtOBGBNmBJvHiGo2g5y7ptT49m3lJG9xb0QluVMn7FFVf0yCA9
+/tOJyg7CcZ9m4TnuJ+d4zjnnrFq1aueeSRJiYslcpXm/zxrMYVSSSYzUHsy4tJBw9TBvTSftUSvm
+qs1ITI0n1U2JX3UFWM9C1jWpZNbPA41Mc2C5KVqQwDVGDeroVKkwdG15PsEvs4UbeDdBv+YWW0rn
+Rq3QsIl7NWQ5IyZcR3lEieKgBBluAIABSU3ckHkRtXW1zq2iwCHt7TL6Id3uNtO1gyu3bNnSu/rg
+2EHy5cD9fHlZFKieCqxateqKK66AHZ9/Kq5tlbTFy95Akcz9ruMBuh4wzWwNnK5gG/zCR3w3UzTD
+2y1wh4N+zegZqQYlK5LvuJg4abiUa18YVzpMhBkh2tyHtsswh5Az1cmeVNk9feqI4SMd8JWtZHkm
+YIt2LyVWYd053kYKk9SQBwjAc2PBAoAAhoga6cWQU5BlPgUkn+bmpiA/1EnDsHDlW18/OjoKz7M2
+JyQr25PjSpUwBs+VcillPM951atedeet/6s4FxzM+I+9eEPqTmguvZZ0Z7UdPCiyZRmDND9fy4t9
+f1F0+lMLeuwZp/AXdv8tttnC0rtgpC+lTtq1/kACRplcc64locq1MlKK4UxTu/sdL7uzIi7IBs5I
+4F4nOuSpFZTbihjV3ljOwSZapEXmoU0TQoncJQw1ICJJnoHNyUh8YYuhHJs7LOykD/DO7a5JUli7
+etlVH/i13uKG51WQnbSCHgDW+9fLGEjJAWDjxg1XvvcPJ5Juzc7divE/AXb6h0qxFbH0UzuqvJaD
+nZBHzMRR7EesDXImaI8m0UjuHYjLV8vC1YEhWezLyhHEA1k2HueAaTdQXIpa6vc33I639r8H7p85
+dL3lDxpTQfl2lG9OWwDxW7ruFZlDKmtYoWy5qyS4nkBBhDliKnkiWEpEhJLJgLgmiiyCdQE8hS6Q
+rCgHGJbZ4PeJf9PnuxTV+gd++6oPDI4MH9Pxnn95onCHE3gl2AeuuPKBu+9vP/Y0pPlj2dL1Kb3d
+9fszsyQUV6akBBNSC4iYBkDG0DHgO3Al1J7ylu6WXcWMY/hVjlf0pEBSVnOrggwC5qoCzqL6Vn7g
+IUgryl2Whi2mvlRsT6A5Py1cLvAU5pa0RaslIx84ItcvXkz/rJ9PJLKPWFOYFG0xBw60JG2Jynfq
+zs2sVU/5UFO/9tXnXfH2NyUMXji6fyLkxF0Q5Hgf/N3fqlQqaqmb9VW+pRbvccg6QxX0HItgtSZt
+GCkGBtECB2JLXvcCCa/WbqmLz7byG3V0q0z3tc3OjPajuwBhV/stcI4w2G3i64vmCHd4zonAMuRZ
+3o6TvTJ7ExZPJ+ZRriBDAg+4A8y8+F5YMKzDdIflPhgfTIunsdAVJp9M9K0Qby+KxdnGK9ds/sAH
+f12UXQ4noFztxeSEab3m6vz1p/3mhz/0mb/5L92FSI/3X7tYH7TBxdwnKduQ5aRRaRcEByQLmmPX
+doYAfyXlj+rwGYTcMfsc+nIhsbninEsEBlkNZSiZ5ma649Tc0HUxTtNUpv0eXqJKb4yL60gZbhPI
+NGYSuDAIDMyL+yHjMV/0dIfpMMsclNZ3NWOdzH7P0w90um0w60ZWvfNDHxg/b1Mj6Qzw8EXC+ydA
+Thj0ieRFbd/+1iunp+a+8LnPdabaC9Xil1uLwJ0J4Y5al2VxTLmWiIDMoLDMIzSis8Kprnbd/dKO
+2yLX8Q7Pmsx6iqMjUk5Frc+MnE22VAAWpLwFnW453ij5O6LgisQZkU6m2zmnRJDizLXgW8utFcBe
+TF0jq/qskyJ20Pgo+qGy08R32vl7Sn3zdT1c6vvwb//OBW96jQKo+SHk9kQahp+WE8ibZV0BBQUf
+ec/75hsL1/zj/2ol6sGxYjNZeqPtf7stV4kXsLvErbbkAfngGCtnWVoRdLl1YqYcyu5XC7LrMwUS
+JUcv8Xgni03GhyFYTsm2UrMI8W+1vXfYYtG3xk+TJM4EGM4ZRw5IhjQAWP1igRoA0I5oGuUhjrg1
+IHd7ln3fdO5E9eT+g2cuW/Or73zHG9/7jtCRttvlfpBy4/3cbsg8YZ8rQRJpQHBK3gd/6zchjq//
+xje0NU+AYCYyzF7kigliniELpBzICbuWK3CMzS6ObJ/D7pNq0eKIk3Q9HiuTmTSREHnJLicd9pyk
+Pfu6iL/BFl5t/TLpusljweLAR7LMQGBAM1CMNLcIhhsN+MKWwmfOko4scmB8O+bf1I37KIuptKJa
+etc73v6e9/1a6EgBGtwAgAz/OV7edsLupVIAMgcQEDMKAGfri1/8ly9d85l/KI6vbUC930le7/jv
+yosbumiQFgPQCnluBlx3kXVKce54tacLXl+z0NUzzUK4aDBJoSPxIDWFitfJ0JFmHPhqJgpGRSol
+4fng846NS+CkJJQ1HBMPtEPSZJ6m7EWgB4019BJhbxOtG3j6tGHNPFS5+6e//xvv/7V3C1cAGeDM
+Ko2OqwHlieo89L/JibwS7FhVW+/l3Nzc1q1b/9sf/6lyJauUHKJlUfbmQuX1slhZaE5V2qitA8Ih
+By0YQ8CEdDwZpegIwyknBQACkVtDuY5KHlnLDGGvGJF6jUCxkhjNUQuuGSqyYJFbxhnrcGBaB4Ae
+oiaTQJo5YB2+Yr7/UJl9zTbuMqku981Pz/ZVSn/w8d+/6qqrThQO/4dywqB/fnzjWM+STqczuWfv
+n3/2szfdf8/wyOC44wzML57JxOZq9XIl0BLpHpWHrIPG4VYwkaXIGCFThggYcE5E2pA0WjDOGKMe
+yxfRWquMFsxhrHfAJjhaKGqJCElosikZIvSBl0k4hoOi6/rsg62lXYGctmJptnnxWed98g8/fvYr
+zv3FXzh9grW+x5v4qX49pI/MLfzD1//1q9dekyad5dVSlVQI+vcaxf6gMOR6RbJCK2IqpTQymfKM
+R8JTzNUcSFghMs5TtOXccikMkNIaAATnjMBq0xXMB+4aw7Um1MaFmOkYchf8qnX8XIKW4MiDHmyD
+aL/uXM/iFkFkZd42773ibZ/8D79XmxhIXev/wu/kPJHQW2ufH1Y9ep2K1iCk1fi9m2/62je+vnvf
+ThDGWh175jReutgUz4/56oxqSMwDLW2tnRnBMgd7q0JoErlh2irPsQiGgT3KGUBuAS0BGStYziEH
+K5GFIFxFGOdxOdDE6tpMGr1H0hM8fwriKa77Ui81VKsN/v6HPvbOt7wdJBhpIzAlODFMyv9zOWHQ
+/+/U56MmyFogBhaAYHFq7l+vveaHt93UjiNqUspy7ZiCA6OAGxTbqOU4OINu4BEUEEO0LmmA3FBu
+wBjNLRBw1oulaK3BWI5Me0agQCus4RpEirJrbWT0k9hZ4rQf9SSHOYJGrEDxWlgdkHzzeed84Lc+
+vGHDWmQACB0bZZz6f44hgxeWE3/zZq+LSa/aUUqZI2qVBcJFAsgtcLb76Z3Xfvu6HQ/tnmssLMYN
+xbUIOUoCMMho3ARVQysM30B8DYgxhBpnIcMWU6ANWuIWeuFf4AwEr2UsIawbOw24F/RuNM9Cvoh2
+ysmUMkmcg+VFWSw6xeXDy9auXvcr7/iVCy++iBgAAALlaVTwPADAn/8N9z8jJxL6Y9nL5+cTIkOS
+IwOw1jCwgsneZZ1373r6mZ27Hn3woV3bn16cm1dZzggQ0TIRcaU9U3bFahBnZ+55mbvaumEpClB4
+GjBVAAC+k0mMSZsFfw9LH/Hyx/x8H+hGpnguQnKVzaTnep43MDBwypp1p63fdN7pZ5525hmRAwgg
+ABA0aCWFCwRgCU5c+un/UE4k9Mccmx76R7MKGoAAJGjouR8kgINFYClYSlvd2ZmFQ4eP7D14cPe+
+Z49MzTQnFzppt5l2I0oM01xiEDqB53/ucGOs1NcnfJFqALCBs6ST6U79j5b1tTrtZifRBhClx/3B
+cl9/bWDDsmXr1qzasG7t6jUrR5aNkoQEFYKU4EkgiFPoeQFKgecepa7/YuUXd8vyi8mxvE8URY1G
+Y3JycnFxcdeuXbt27dq/f//U1BQRDQ0NtSk+V4t3k/8q7RDRXSz7Ns8e90DkbH5+3nGcdevWnXLK
+KZs2bVq3bl1fX9/KlSs558e2n5N7l/ULykmDPs/zHoHn+Qaq9xjyPE+SJMuyffv2bd269Y477tix
+Y8fQ+KpEZkMqvQgLjLGHKZpmUkRscfHI5Zdf/rrXve60004bGxsrl8s9uI9dy9v75JN7ofILysnX
+evjpq9/hOWepB5ZSauvWrddcc83tt91TDgOvFOaSjDFejpgZbeH9v/WeK664YuPGjc//NMbYv0Os
+f0ZOJvQ/E3j4mZcAkCRJj9PZbDa/++1v/M/rrjlyYGZdcQQt7U8WTjtjwx/95kdPP+/CWq0GAFmW
+9RjnJ6qQ/uct/x6hN8Y8v7sXERljGOXbpg997jN//9ANtxf84LL3vPkPPv6xkUIVmASAXj3xv3M1
+/xn5d2dwjh3NjDE9N+loczsCIIjS/Js/+I6U8gNveycYIAU5y3pFFr23GGOe377mpE7r/0X+H8AC
+aPUuqtaeAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_acura" model="fleet.vehicle.model.brand">
+      	<field name="name">Acura</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAxIklEQVR4nO19d7hdZZX+u76y9z7n
+3J7eQyolIQFCEQQhmtAERCAiRQeQcVQcy4xjLzjoWHEYC84IohQpIooICtITAiSQhJ7eb5Lby2l7
+76+s3x/73EssiaLeBJ+f6zlPsk+yzy7v/vb6VnnX+oiZ8Q/ZHyL29wX8/yv/gH6/yT+g32/yD+j3
+m/wD+v0m/4B+v8k/oN9vovbv6b33AIQQ2bYQInEIJACAHREDDt5DANDeudrOROw9ABJit9Hjs59l
+xwWFnr1zTigSBA8wGIDk2i0T0b67zz8mtL9cqiRJwjDEAOIAnHNEREIQw1qQYCkI5GENpATvYZQQ
+mMEMYhABHhAAwRirAwUCAB7AnUFyn93hn5L9Bv2gOOeEEETEzMwsBkcxAYCznoiErI1Q78AMIUDZ
+XgwWIIZzIIIQ8I7hvNAy+7lJUw9SSklBAKyF0vv8Dvcg+xl65xwAKXcbi2xANKBGRHZ5RGR8VQpJ
++H0t4QACOXaSICAIPjWplFII7b0nIkEDSokFgD84wH6T/QY9M2fjPdM2zFxDSiQAjHXWQehAiYAB
+5wEBY7larZbL5Wq16pyTUkopjfVhGBID5Oty+Xw+F4ZaEhge8AQwWNYA9947IfL75X7/UPa/wgHg
+vWfmbOwnPlYiYAgPdPZUNm7aumbdpu3bd2xc39PR0dHR0VGpVJxzzrk0Ta21kDIIglAppVQ+Fw4f
+Pnz06JEtjU1TDxpxyEEzZ86Y2lAfKoKAF/AMT/yqxtm/M+3+HPUAiCgb7BkKSZJQGK5e07Zs+YoV
+q15+7vlXNmzZ3tdfThMvULBxDEDnckqpNE1dmoIorK9PymUQkRRcjcFWhJFSihHXNxQmjB81d/aM
+44874uijD5s0cVQuADmHAdAHz7tfZL9BP4h4pjoA9PT0rFmz5oc3LV62/NlX1qw3rIKgzpF2TrH3
+QClqaBg2bFgYhsViMY7jESNGTJ48efOW7e3tbaEOWlpa4qTS191TqZRspSLkGJDVysKXne0fN7rp
+5IUnLlww/8xTj6Lflf1y+9gH0DPgPYQAMdiBJMBgZ0kqEEBwgGH85uFnr/vRnU889VxvGyFQgWLB
+KXFcF8lZB02bO2fWwQeOnjA+P3bM8ELzzCs+8u1f//KBj33snV+76vLvXnfPv370M7MOnXfz9ddQ
+sqO3a+f6Lb2rN/WsXPHiug2bNm/fQSqMCk2Jg0sshDr2hGnvv+zCty08qiABl8ISAs0ACQsok7LW
+BMA6q5QDLFAYImSG3KWy1isl0tSGWpGCSVIdKhICbEHCQWzc1v3FL1/zi3seLpVMEDVEdey5Up9T
+c+Yc9NZT3nLi8UcdMHl0XR7EkOQBs3pTZVvrdkgCEYOVDMFBR2ffrrauBccfAsw4jnR/FcZh186u
+pctW3HPfQ0uWPFPpq6hCcz5fv/ThZ59Z8szPFrzxcx//wJxDJlKINEmCMPTsBAkdiMwnk1Ix2Hsp
+h8zfH3LoMwMmDBQAa1OhGfBxUo0CzYh+evfjn7vqO1tae0yaa24Z09fdraPtZ59xxjsWvf2oIw4d
+0VKQmXuUJlLXMbP19PjipS++/AoESSmJSciQZLRzR+dvH3li/gnThE1J6VwOdTC5yfkZ0xe8+8IF
+jy9df+ONdz74yNJdrZuDutFg8/P7nlz81IorP/vhixad0pATPu0RQX7AH4Mx0BqArtmjQyNDDr0k
+gAECw0B6QTK1JgxzNpU/+NFPP/Pl73eXVRC1yCDtaW899rh5n//0lbNnzx7R3EDwJi0zXBjIMCAG
+CJJJPrl8FUiIQg6A90gSK3TknF769KruvotGNGjnYykicDWU5G0VFJ507LQ3HfuJBx9a+YPrbrjn
+/peEjsLC8J44/cC/XdXe2XH5RW8dN6oeEMYarQRI1PQ/Q4ohdH6HPHzmLUDw3qY2lSQ9pBdh6tV/
+feMn7//Ald1dtr5xVJqUbWnXhz500S0/+vqCE44b3dwgAZfaKMiFOg8ELoVzzMC6jTseWbIMUd57
+48BCaOMthFS5xpUvrF353GqQADsBL5FXFAVKh9I7E2v4k98850fXX/X5T19O6E7Knbn6RgQtV378
+a1//5o2lYghogrbWAzWPd6jtjyGHXiiA4dkGKoitYwgicc01N33uy/9XGD192Ljxpf72fFj9zjWf
+/9S/XTp5TGBTJgYxAh2ABVjBKKkKSjKAZctWbdm6Uxfq4Iz3HgxI49jJMKz0VRc/+QxDSRkQO7Bi
+r8EKEBIeSCWSxrz+j4+c/6PrvjJ6bENp+9amphG5sTOu+e7Nn/jid/p7jZJKKWWMATyoZiAMITJD
+eOxMGNYmSiqAGCox+MUvnv7m1T9EoVE11nft3Ei+/aufv+LS808Z2RQiSXXAzNakaRanBAEqCx+4
+SiV9ZPGTkDkmAfYA4AEy3lYtA0H+8cXLuzpLYIIna10WFgULpfJwATgAQk47F53xpmu/9aXhY1t6
+t20ipVTz8O9ed+OtP/lFuQhw5nB4z6kQfij1zT6A3mdmO5cr5UCp1a/suOqqq7s6Kmhp7utpF43i
+yi985J8vOTsXAokBBYAhwTokoRjkGWydBcG6tK2zY8WKVTqXs3EMSVEUgRBGApode4TR8y++tGnr
+NkCBlApIaoEBrU0Q7CSciKLIxcmpb57zxc9+Ij+soVLpyzc1IAr/68vfWLXqFXAWUGIiDzjP6dAB
+M+TQp0oSAXGpLldIGB/+0jdebNuF8cPCUpkqpUveevKn3nuxNGXnqy6nqwEYAiBjLSCcc0SchRlI
+5h5esnbNttQYEQQSXqVVY8GVBORzgfNEpreMXz74sgNA7dg9AioACVKABFxdEGjtKpdfMO9j71uA
+4rak30T5qa3x8H/93Fe7y4mUHiyBKIGuUDB0yAw59FxLYBBY3X7Hb9e8shFVT15Y23vIIQdcdunF
+JCG1lEoZayRAIEYtnsPMgNBaE5HxWP7MSms9hdpaI6QUQihJUigAQhAEgfmZ5SuqVYD2GhpmFloD
+uOCC8+cvfHNS6TdpxUm9ftO2H/74J44lIIjhLQ9pcH/IoZcCICDI9xXNDTfd1dHaA10QVsF2vefS
+c4+YdwAJD0nsfSB15s4wsyA1eHmZv926o/OxxU8CpALtrRECmQkohGDnPEEIIcLck8uefWn1FiDa
+2zUJYs9KyCkTRl52ycWFvIQpqVyhv7d6/c13bd3ene2lOI1ghw6ZIYeesrydCB5a8szyVauhC/m6
+4baSHnrI+AvOP905BziArXW1HBPEgCMjlFLMnBl8K1at2bB5O3TEAARbtt7X0otgZmYPhPlcX3ff
+I489xcjt9Y6Fc46ZwZj/pmNOXfBGn3aylqpp5Op1O+57YEmSAoBWRDBDh8w+gJ6do6rBT352b5Iw
+wgI565PyZe8+tzmvtPSerfNeB4F3rCUACCG8r6VtmSnzhx98ZKnlQAShtQZaova/zM5DCCJmtgyB
+XN1vH1pS3fPsyATPXunQWSsJwxtx6UVvr4u8rZaCfD1QuOWn97b1VECAd/BDaNvvA0aCEFKu29z6
+2FPLUaiHFHHcO23SqLeferqJUwnJTFJo7yElsav9JJtaAQgBJUV7W/fipSt11ABScFZqAXgpSQpi
+JiGllBLexyYJo8JzL65Zt7F9T1fjARKCHZQKyUMy5s098KjDpyMt2iTVuablz7y8Zt1WB0DqIfX2
+h96lAgF4ZPHSzt4+aA1O2VVOXnDMqGHDIx14R0JEDJkkCRjWJDWNIISU0vsawWDp0qUbNrcKGXkP
+SOHYw9vBmCszWzZQAsyeqbuv8sDDj+/perJZP04TAM6kRGiqD8447SSEMGmsVcFa+cDDiw2DoSD+
+nqH3DtZjyRNPwQPWwKck0ze8Ya5wIMBZBmCdz+VySVIJQm2tHeQoWGsBWItly5alsbXZk5AS1sDV
+PCYiycYYY0hKEYTGMUEtXvLUnq6HgGpqcrmcS1MZBKX+olY48rA5uVCRs8QURvUPP/pYb9F4wA7h
+LLsPRr2sbtpSfO6FLhGOhBWI/QFjxh52xHREgEQQCgK0VIAIozxIeJUKEjCAQxDEnirtJfzmsfZI
+1WkqgbqQWBINUAFpdgTFMoy4EDGnAIfQ0gfRU89uevHlrQwABiaGQzZfMhIF5AMNQIYBCHUN9Wma
+Hjr7kHlTJ3kXxwElWm/a1rn25XUSUPLv2cIBaPPmzR1d3d5kVANMmTx57LjRe9pbYsCYZoDZQa54
+duWGzZtj61lIGRagdaZqnHPs4Dxb65gZAj5NwExEXd29S554ygPOOigF1Og6g9bq7gkiKWUQBDNn
+Tgc75yyAYrG4Zcs2ADyUKax9AL1cvWZDX18RJKQQMGbatMl10d5cHs8D10UBQz++dHl/uRI2DTdC
+u8TAewHSQRjpQEpAhc64aiUBEdgJSblC3oMfffxp58FCgwToj9zo4APIoJ976EHwBsZCBrZqVr+y
+1jqmocRn6L1ZyI2btrH1UuuM3zdt6pSasb+XS6IsaKvb2ktPPPlMkK9PIb0nKA2tfTU21TiJnQdI
+5XR9ExOkAAS8sxYMpVauWrthcy9lATACkL1yzMy7Z2UHh/+UKeOUArxVQkGoTZu3VWLDf9fQxwab
+t7YCgkg653L5aPrUSbQ3L5FERlhiZohVz69ZseoVT0pIDWbYFEkCQBca23rKS55e/8yql4QMlA69
+d8iomwSE0fqt7Q8/vtQBiUnBsJYB/N4o3j0nPnpU07CWOgCAEDq3q62rVKkOZcx4H4TPjO/q6YVU
+zOyTuL4uN27sSPg9+jwCAvAQnhRZj6eefiEuJl5okIUCpICUOl/noW//+f1nLHr3Pfc+kCRWBZqt
+EwQowYKE1t4Fixcvtwylo93u8o/cbzbwR41sGj16OOCdYyLd2dnT11t0f9ejvhLb/r4ypGYieF/f
+UGhqrAO5vVwSwwEegtraS4898TQKTUIqF5fgDJGDM9axzNVT1Fihut7uXgpyghTICwFY65LEmzQs
+NK98/pW167ZnCkVpcq7G/PmjZ21qzDc11sFbIgJTb3+pt1gaAjx2u88hPTqAUqnUVyyDSSkFKevz
+hVwuJ/bMfvGchWbYGLN1y/Znn3kuDPPWcxRowYacEUICZCxiJ5yIgoYmoVWcsaO0hmAIgVwkZLh+
+w5ZnVz5nnKnEVQzwOzPhARlU+koj0BLOaRUSySQxcZLuZYD89TL0o76/LzZAnUp9CkPDCr4hX2Xf
+sMcfkBDeg73S+ua774/D+hReS8u2Sr7OuxFC1AkUpduGjjWqpzPXtUV0d4UIwFRFBTIRktDP1YB8
+0Pyr+1Z6o/ORApWCAPC1+/1D/hNBj2waCw/neq3yZZdPqio3lOGzIWckGGOcy8oTCERKKSnln6B8
+CQHn+sqVTZu2wBgOcwAMe6UVWFoTw1TmzpryrvPOjWTgTfVXDzzxm4efDkaOTNOKCAq+4sKokPgU
+cbxp06YdbX1TJoRSEJiNg97DYCOCUgqZ6hfCOZskyd8cjd1lH1CgrPd+oPygBv3e9mcXCgFGuVTZ
+uqUVOiRS1hsOkTpDrGFMKLDobad84PLT2YAJI8aPeeiJp12SwrAKcimqiU1UIK2U27fv6Gjvmjph
+IuBANdvpjwpl+irLFkhp07harfJQOlX7tJZq8DX/UzwLAum+YmVXW5eUUU0tSAE4goWpTps05ryz
+FgTwoTZa2YVvOfLIw2e6Yr8M69OyI6lB1oMpH5aKlZ6efhIqO+Pe09yDqTEhhPfeGPOHdP6/oQx9
+vD4DjnlwakPNu9nr/p63b9vV09PvPXv2pAS8h1KaGHH/qfOPnTquxcR98FXnKnUh3nHOaVr7vJQw
+jgk6p7xJpJRJara3tgGwjhl7c+SQFXYxD5KQxV7ekb+FDDn0mQKt8YmY3UDE8U+IkDt2tkMEJMNa
+bYkV0rGp9I8YVjjvbacQrI4iCB3IkF161lvfPG3yiGLnjjCfA7xJShkpEx5bNm/3gFYhg91eUx9J
+ksD7jHeutc7nh7YIYsihz+fzQRBAiGzyjON479MXw2fu+7ZtO7WKlAogBHtPCFyckonPOGX+4XOm
+eWcB5W0ADuFp3Ki6s89cAFdW0sE7OANJRCSj3NZtrQBqZW57vl3nUa1Wa9Bbq7Wuq6v7W4PxOzLk
+0BcKhSAIoBSI4H2SJHEcu70azFm135bN29JqkqYpEYGdRgDrClFw5hmnKAkhpbUspISDVto5/87z
+zh49ZnhcKcKlorEuC+grpbq6ekwKQHj4vehuZhhjagrHe6VUFO01t/5Xy5BDr4OoucGIahFVIJdr
+7at09LFUe7SXQzgBmQps6+0ReQ1XYQZUvU8jVHqOPXrCW089HB7sNKkgIWMVyqYUyOqB01tOmT+P
+K0XYiMv5CDnnOJFibceuUsoudRpBBrwdyIB477NMpPeeY7+9rRVNjYYCkG/MV1oaBDCE9YZDDn1L
+c35Yc4u3NogiAP19pY6Ojr1pXGYGOrvN9tad3nsRBFIKsBeU5pvq37LgzUIADBKwroZgEASAINDZ
+bzuzqaku1AR21qYQAlKWy5XOzu5apB7A4PQzMJdmf3Z19/b1l+AcQHC+sb4hygVDWvexD6ZZjB87
+EibVWoOoEic7d3XyXvwJ7wF0dfd3dffLIADgnUOa2GrPwTMnn3XmKQBcjXDpJcgzBBRAAjjh+HmH
+zz0k6e8klzpvSUoI1ddX3La1NTNX6HfO4we9WWbevquzp7eEzIi18bgxIxob693eNeNfJ0MOvUv8
+1GmTQWxMIlTgmDZvbeW92MtSAujo6q6klmTojSf2EOzT3recdMzE8c2ea5AJUgQIgsgK8+HzIRad
+cxpsRdNgUF7G5bS1dZeQlFlWg9pmMF6fKZyNW3aVqyl0SMywduL4cU0NeaH+nu16pdzMGVOCnE4r
+FaWUs/7l1WvsXsxLhgdad7QXq6k1HkKEUkh2E8fWn3XafAEQsVDkHLQSWUEsgwQEGPDu9FPeNOfw
+Q2y1qJTI4mPwYtfOzgEKcU0Gh7y1NlM4L6/bnHophLZpDMkHTJ4gZcb0HirZB2lxTJ44YcTIYUhT
+SAHPL69e39u/Z46SB4DtO9rhAKGCILJp4oq9py84bt5hBxhb4d+vOfDEIEgwB5pHDpPnnn2aqxSZ
+M36ZAMmdOzoAEDHgM0U/wK+qkTvTNF31wlrnCQCSaktj3czpBwy0Vxgq2Qf8ej9x/JiDZ84EMXuI
+INq6pfWll9fscX8iANtaWwEhw4iZTVxtbml6x7mnS0ApAth7SFnrOgFk41fCOcB5704/ef6UqZNM
+WgUgpQKr1tYd1QoLIX7Pnx10Wbds2fLS6rVgyQx4njRxwqxDDmIe0pjxPoCe/IgRdTNmzIBSxphA
+R+2dHStXPLfn/SlNsb21Fc4zhE1SKemwuYcee8wR1Wq/ggd8bCwA7wDADQIkpY1LWvDBB4086YQT
+sjyiEALed3X1JLEB4DHA09wtSBDH8aZNm3a2dYEEEUGJcWNGTZo0nAZIoEMkQz/NIpcwFiycU8iX
+tI9NonUw+af3rfBJEd7Y1GT+q3MMWHBsXZWN69neDdXsrWThOGn74EULdSjyuQZCQSIshAoEoQBS
+AYXOOQhAaBE0ExTH8XsvPra+Xkfe2rJFUL+lWN7a3wsWuuoSKjE8ewF4Y4qA12F0112rYp+GdYUg
+NToun3XafBAcAwiHDpmhJ3kDIeGow+dOOWCCMXGUC6H0cy++8tTyF60VKtCVauydlZLYg1kppXfs
+bOvp64dzsDHYHH7YnHlHHr6n42f2SbadbURRNH369OOPOzru7VQaIHR19vT1FQFA64Dy1nmpAHit
+Aw9av6Fn8ZPLoOpt6ryNx45ufsMbDiOC2EvY4W8hQ69wTEzODKtTbz35zeSrjmNoGfdVb7nt1yxl
+ajiXD5RiwHoHIgWIHe2d/cUyiEkBSf/ZZ546fnzTng5PRIMJgKzsH0BTU9N555wpAhY+DQLV39Pf
+0d7tPUAMKCUV4AGXOudBd9z16w2b2wQVAhm4tHjiSUfOnD4iiYsM93dexiZJeqcYi84+ZdyY+rjU
+ab1DoemXDzz9zPM7hM70qffOSqWYwZCd3f3l2EhJObKjWnJnn3Hy3s+QxRoBSCkH0X/z8Ucfd/Tc
+pNQeaAKLtl09TAA5eBDg2Vp2QuY3bu/9yZ2/RJgXVtlKqVCHRecuJNTM1aErFcc+sXAYUsHxrBlj
+337mfKESdrHOFbZ3VK7+7g0GKFVTHvCS2COxvKu9p79UVYSkv/3s00+aMaXF7jlFOmgmuoHOaEII
+59yY4XLR2xYi7XNJVclg2/Y2JkCwJMRxKkjEKXvg/667Y/X6rQiinJKm0nPawuPe9KZ5AiYXRFkF
+xNABsw9Klj2g4LwELr9k0UHTRyMtkXPIN9/z64dvue3hfC7vHRHJ1FhSEEpv39VhU0fghgiXnP92
+yRByb/Z1pnOyFl6DXxWwcP6x06ZPiqtF9nLL5h3WoVa2Qg5ALiw89MiLP77l55ChyAdptWvEyMLl
+7zk/ktlTlM68GmkYChl6lyrMI0uMwh80dey7LjhzRHMhLfXJfF2S+m9d8/0Xnt/inQITkQPAwJbW
+nVCBtempC086bPYMuGQvRt6gmSiE2J1xD58eMHHUeeedoQQ551u3t1UqDmDvTRBqQKxd2/bNb13f
+2VFFmDfCaFV598VnHTVvloCXCJwRUqohnWmHHHrj4RhSCMAzpx9832VHHjE7VAJKIcyvWbvx05/5
+QlK27Fhr7TmtpnbXznYEgU3TRW8/S5OFhOe9ka1rmffdHoP3HsRa4a2nnlIo5CRkb0+pWK4wnCAP
+cLFY/s73fvDQg0vqW0aR1q6v+9DZUz/5iSsihTSNSdT63Pm/a4WjBWRWswoFF+UY13zxivmHSbez
+W1KBGybd9+T6iz7+lY3tJXhIk6TFtG9bv+qtzn/TrKMXzE4CkUIoreFR+1jAAlmvGgOkUFCCBRyQ
+AqmHhSQJSHBy1Kyxp544xxU7esulvu4yOQHWxT75ha/e9r0fPiCbJqbOcm/PAWPG3XjtpyNfURBa
+5bOKEghA/D0rnDRNmXl3nTlt2uQvfelL02Y2utIO5ZzKjbr7ll//x2e+sWZjK1TQUy1t27klzGHB
+/OPqQqGAgLRN2VOVRQphoAyUhbRQ3kuLwEN5L1JIi8AgcFAGIoFTnEIpdcnFF9SPbtqyee2u7k7I
+oLvX/ftnvnT1f39H5HMNDWHS1zF6ZOHqr3xuzJgxWTJ2MHc/WM81VMJDLN7bzPxgZmNcpRKzZ/b8
+yNPPH3TkGQiPqJt8Yd3kC9HwhtnHL7p/6cqHnluP+rkHzn7H1taS55g5dcazZ8Np9kkHPoZN9kk5
+TTgZ+JfabuyZHbPjzg5zzILLUZhz071Pr1i/4YTTP6CGH4Phb4omnY6WN46evuCOu5dY/+oFW2uH
+GpNM9kHvs2yGfPX1SlMrpZSSnlm1/mOf+vqjDy0Pho9PbQokI0cPP2D6qJVL13z4PZd9+crzve1T
+pEjmvDck/7hPn3X3GhTnaoFNUrDVcqRDluqGO55870c/OWv2gaW+tvUbSnWNDUlSNX2dBx08+dpv
+XTVv1qRCQXquzdJZ3mro4BiUoTcuax7hqy9vECgigsO82dNuvuHr//LhtyuxU2sjZH2pL//00+tS
+G/VX0rUbu5QukMqBBEmQAzmQZ7KOrCGXEltiK8lmG2QNWacEtIAWiOF1rgCpNmzu3dHeQSK36pl1
+rdtMmKsr9XSZuO/Ms99y683XHnX49EJBump/LbEiZYZ71s/xz+Kt/KWyD0a9dd5Job33xriM+Oc9
+BMMzSHkDf9NPf/m1r9+wYX2/swXRREiDhpzMhd1nnX78CceddMThc0eNKTQoSUKAsqmWkRHBQVxj
+Jgspg6wVhTM+SZLW2K9/afWDv3704cXLV63dXtc0ptTd3xzV98e7pk2beOm7F11+2dvrQyggLvVF
+hfzubRUy9TiYwh0i2RfQe84cmVfbHgCIqzbKKcDGSVWH9d096XevvflXv3rwua1bbJFEvs5zvxbE
+iZ4yecLsgyccefghzS2NY8eOGT16ZFNzXS4fKSWEEBmdNk1tpVzt6uzbunX7hg0bd+1sf/jp59pa
+24vdRVnX5Ew1GNaSdnZOHTXmvPMXXHzhopkzRwqAYKtxNRfVp4kPQrF7Y+u9E0P/JjLk0HtOBxwT
+MWB9K+89C+Ock9BS6LRiVKiFxLbWtjsfW3bP3UuWr1pdSiroNZAjA3iTdjCJMBcUCrl8PgojFQQq
+jKRSylprjKlWTKUSx1WTJMYY5yyrMBAsmXRqKtGo+oNmjnvnyW8+e/5J02bUA4BPQAZSApqhjIfC
+qx1mB5/BYLvxoZDXRWPd3xFGYnjtuq2Llzy9eOmzr6zd1NbeWyqVExNaa9laMEHKWjd078GGlBJC
+OG/gHMBC6yAImnI0cmTLzOlTjpp36PHHHjF71sx8geD2e8f+V+V1B713RkiZ9TSuGnR2lTdt3r59
+W+ua9a39/f0dHR1dXT2lUilJjDHGey8lCyG01rlcrrGpYfTo0WPHjm5ubj545uQJ48aOH9ccBRAM
+9o5gyTPpoeWU/fnyuoMeSMBkjIEQSoUeggELCMAzKhUXx7FzzMxgYmZGZqpKKUkppQMZBFIMtKwU
+AMOSd0qIf3Ty/lOS2XPka73/rfHwGbC7mcJZ0Te8ZyGBV8mUr66ZkQVfsiQ6EclXA2GvF43zOoQe
+cGAGqd3YYlRzC5iZSP6hy1PzD4kHc9mJ8YGudS4jHiSZ/4nqhn0prz/ouVb882rk6g9dy4FLZv+7
+i48wvGfvrfc+CEMMtPaoUfwBa7OOua8Led1Bb+EoS88BYDjnRUaWoVrTytp+jFojQFX7WvuLKNvT
+G/Hq8j27scheN+tlvB6hL6MGoZCQWVNkQDAGCWsEgAYaiDjHQgwWInsGc+bBcQiA2ZPI+mVmbjBo
+L23R9q28ZuittVn3Wa31oOvhvXckFAHMRNkBhQOMQ0QWTJ4FqVqJuPNQAn5gIO5ebsBg7T0EGeOU
+0pSplGyuFIkgZWOrghw8oGDByPrhO4CdkMzsSEgHxYBKAQUm9gOV6S61WqnB6dazz3y9Af4sW2u1
+yqYH4X0t7UVM1kBphk+hBECpZan0Xz9lvObpXkqZLe+CgfrrjBCgFJI0iYIQ8NY4hpBKhxJwBFHL
+7GeXKwUIkP6PvvqUGB+GWivBtBvjkQRIAqSC2szpPTijE3Pt2QDEDIIQgB1o6+IskVYMJmRUemEN
+iEAEZjhASgjAWZBMhcj4lzYIghopnIgdVACAIaV3lqTU6m8zU79m6H+vtC7bVkp5pFKSZytIKS3A
+AszWeKUkezhnlFLZC+GNISnhOONzD8yqtXYgKiQHb61VSkhikh4Q1jKJgDNCJjMEhCCCcNnPiSEJ
+JKxh4YXSyBZeAAml4QDHThBJ6UFCSoWBEsY0zeJukBIMKQRhtywjZ8U9nAKK2ZMQQgbW2iQp53I5
++qvbov3lun5Q22RXCWJADMbmM048SLCAd0zshSCQ94kVWkNIIK1ZfLuH25kTYss+pFDCWBQBzwgF
+8oB2FqGESdNsmTUPMs6FEBAeBO8UCWR97tO0FCg4EhDaZe1iQQQmOIZksPNODWCXvRMSOk3TIAh2
+uz8vhIBLIQNjmIRkgqp167F/vX/wmqH/vageMxtjgiBIHZ59brWQgVByWHPTpLGNZFmwi4UKJYg9
+4GEYSoPQX/E7u3vK5bK1NgiCLAqW6TEjmKxUTqRx94EzxxTqC2s27axWhTc0ckTjpDENzhiGEUKQ
+UCQUJSkCwSRWvbCZXcFbN23KsKYWlCvi+ZfWBPkGW9N4rBW8Sy1XlVJElPXrTZKkubl57KgRISNN
+vWcbRVkdT82z89ZKldu4tauaUm9ffxTQjKnjc6FQ8q+1lf6SUZ9Vf2Xh7MGR8pkrb7j+xzfqXL5c
+LR1++KzvfPM/Z05sAfuyRT4Q5B0bSzr0wL0PPnPXPb9+YtmmcrmcJImUUgiRFXsopayr1AdNvpzW
+Rfbqaz532FFzr/jQ53770Aqtei48/+1Xfvbf6vMEWICdg5CaPHu459et/8AHv7D6pV35IPyvL/3r
+RRcs/O/vPvCt//me5YihpQqsSQgm1GRsJQiCJEnSNM1abx166KELFy5870UnhSGshVTIFrchYuus
+lFFbZ/XCSz/44uptWgVsq5dfct5nPvnev94n/kuOMFBsz977DPdnnnnmtjse3bUzzQ2rr5bco0+s
+/MW9v73i0kUF5cJAA7BpqoIQhJ/ds+Q/v3ntC088i8JYkjKzIgbaJpIQwvlKUZLrj8n1JEna0Ejd
+/eWe3gSmu1I1uXymUdga41lIqQFyQkLnNu/s6i5yPyVQBQcKGppa23spaLBOC2nZG7hqoNg4Ioqd
+tToIgyAodxW3bV3y8JIXm3XXxe86VykwgwTVWoCx7yub2+781ZKnX0qrYWF4fXnnzptuvWfBwpOP
+O2LyvoY+My4znZMpn2q1etttt23Y0N4wakp/tZwbNqHasenWO35x+oJjZ00f55yXgqSUING6o+fG
+W3/6whPPFg6aK3s7hw1raWho8N5ba7OMqHPOhh6xbpCRre5oaAIAL/opMmHQoFXOMbwzgYLSMqus
+dAwGhYU6Bx0W8j41JALLXHWdznfWNzYmloTgQpTznryr5tA4WDVorTXk0iRJ2Hz7298+/vjjJx8w
+ylqWigEvBIQQXb3la3/wI+PD3Ijx5WK5ftyUjRvWXn/Drccd8cl9Db2SKnVIjKmPELgSfNODT238
+9s9fQV2D5bZZsxq3t/dWC8Ofe6XvO/93y/e+9l5FeXIhoD37F7fseuSpLaibSD1dn7ri1AsvvLC5
+udmzTdOUiIMgMMZI9qy1Y5YwDVHexkAasdcxvCUOucYWzrqrEFuGlMxRSnkVdLDzwnlOQ/JKKdDo
+cl80aYz8yf9dOWF4Y6lSVgXlirlcQVlUE2usiO6+f+lXvnFDuSqWr9erNpXGTBklRFUInSRWhrmY
+3Fe/c8fa9b25/Ig66WbOGbNm/ctoqP/RXY+dddYJpyw4jlCRXiINpCYIgJI/n5L/2tPiBCmRj7R3
+HlGh2J98/9rr01IShjysoXDtt755ygnHw3qB6O67H3ty2TYhJNjBxEL4HTtayx3tUT4fRfkzzzxz
+/PjRuVxYKBSam5ubm5vr6uqampoaGhoa6hvq6+vz+TxprTWy9lH4g5XTnM9W7awt6bZ7CpvZ29Sp
+MCLhPcVjxg8bN2XMjFkzxh0wecbsMWMm1k2cNOLAmQccNH3cey4+b/yI5kIgQu1at66TA4zMMMwB
+WLnipZ/d+VuS+bTaf+qCY7/+pU+PHd4sKWCnv/u9G/uKFgikkDL4S1qIvGborYs9LADnBRDec//i
+3z78hA4KSd/Wd11w5lFzJr73okXjmuuR2q5euurq2/pN1bJHpD27/r4ehGFqfV1DY2NjIwBrs/ca
+2eThnMuMfUFiIFcH5lrg8ff4AYNPgkC1lR2IBt0OYgHPnlPSXuZlR19fChgIQ7EVLJR2XiQpnnxi
+VbVcjMu9whdHDo/AMbzNtFiS4Oqr/7e7vVqfr2ss+Evf+ZYTjhp35iknujjNhQ0PP7Ly3l8vYSgG
+rKsyLLMFXoO39Rd4swSwZy+0Xruh85prbzI+QDU57LAx/3TxacrbE98w7ayF866/6Tdhfthvfrvs
+nt889M4z3ga2zqZBoMJIJ4n3TGmaOocgEMxIUxOGA2EJ51hRzfTiAdLjQDtX4FU/QJAAe+9BgplZ
+CEGEgQ2hCNbEQtUrHa5eu+XHP7ilo5urXknZoYRWJL2RhOD5l9bvaOuO6uomDQvnHjJVkYPWccmE
++eA3Dyy///6nEE0rlts+cMmpb3rjNOeKH3rfhfc/tOzlNV1KNF3939cfM+/QGVNalM668MvXNJT/
+Eh6OhyciBm7/5UPLVrwS5BtUqP/l8nMnTxjBSAH/oSsuHD1CVeIu5IJvX/vjHW1lsFIylMRJsajD
+oJLERJS5B4OdrzIrc7BXTrYt5YDC2QNFwDlHoCxNBQA26/DNIE+SvPFS5HPBiNUv7br/508ufmT1
+o0t3Pfj41l8/sObBJet+c/+yVDUirBeFls9+6mNTJk8AwM5FhcL2nf6a7/7IikIYYcq0UR/413cB
+Ve/K48cO/+AHLgY68w0tL76w4dY77q3EniGcSwG8ptXbXjP0hgEnBNPK51tvuv0e5FuM5zlzD37H
+ue+wLGIb9fXFM2aM/chHL7NpLwIse2rd7Xc8AA+ioFKqQkpj4iAfZGycLJ4uZa16OIM8O9HvqE/n
+hPydDInngWXaf9e/w0C7iWpaiaKIpGZLE8ZOOPSgQ6JcEJAhG0mvYZkYCHTnrjZEhbCuaerU6RDw
+QJzAAbf/7FdLl79AUZNzxXPPfdvkyROqidLB6N7eZNE5p7xl/tz+nrb65hE33vjTF17cCGhjPbLf
+/9ny2hUOhVKiUuIbb7x93drNsmm0K/d4V/nkx76+afuucZMnlno6Jo1qeddllxw2576Va7eBRvzo
+x/fMP/qow+eNK+Tr84VCpZJ675xzmXZxLquBMrtTtEnI3+k7xuydM8bsnhvJnk32oyRJjDFEAlJm
+bqoOA+sdEcWVYqTM5ZecedS8mRwoKVqUZBbGse3qK333ulu2b+vpqSZf+eq3rr32v0YND4N84YVX
+dl53861ORV5EEcXrN7Ze8p4vxKWy9KEO5ILTjr3iff/00BNftOS2bGi94/b7Dprx3uaGerDgvXUg
++Kuh9x7wWLFi1e2336nrWoxnRHrlM0+ufMDqwjBjVoBS7XtmHHzox/7t3y/45w9RbvhLL2+66857
+58z553HjJlSKvVHL2F1tO1566aWJE8dpXRvcQvx+9ohAIAiJzMpBUknT1FpomQW2Xt2TwXEcG2OI
+oowJQiSkUqa/Pze8SUnT37/zmKOnHPPGaQxHts7FZZmXELIUY/Tw5g/9x1fiFI8vfnLHrq5hwycm
+if35L+5Zs34T8sOZYRP7s5vuAmQuN6zaWwWqjz7+0N33/vCsc0+756e/ihpbfnjDzWecduybT5rH
+Hq+pEuI1Q6/FrgSjP3/NLR2uJaivQ0/HhDGj8i3Di5NMoKWJq4GETZpuvOOO73/vO+ecOPtn920I
+R7R86cc3nnjO/HmHHTxppOqMU/DET33hfx9esr6pqckYQ4KNMVpLay3yQnqRlEv5kM855/Tp06ad
+Pv+4e++8Nxg19v5Hnv6nf//yG4+bGyqvAEUqjWOTo47O6p13L2krS1/tPfigCTOmT2UOTTWPnKz6
+bq8aVdQCHbq0KoMIBJkvWAMKvIpw+HGzc41hsR19ccuajTsOnDXm+fVbvnndvSjM0LIouXX0uGk0
+fqQQwhsrJjfZ1Bhjbrp12cfff/Ijd9+VJqOKSfif/3PD3DfOLZCMXouN+doDCX70D66957nl6xCn
+aXnzOe889cuf/7irVgSxFlIqsmkqiYv9vQdOyH/48kUPLf5qJSkirl5/3Y+//bUrr3jf+z/2qa+j
+QT23zqzd9Ui1vx/OUT5k5wAPa2E0CdlYp3vbXpxz+NHTZk47YeEx806Y+fTLqLaVfnLH4lvvWsI2
+hrMAwjAv4sQLbUEETyhddP7CGVMbPPojrxUCLSIX+zQ24HohFAMQZaJQBQokMt8sJ3VAhgIfiMBW
+1P9843ucxMoL09f2rW9fdcbCw2utY6UCoIXs6elpaWkZPq75kosWff9/fyOhn3jshbtuv//Si05/
+TS0VXjP06zZ233LzbUlfL+LSoYdN+eg/nz+mWdWNaSG2GY/Du0DoEDwMbN944jGnnzjrZ/feJxXd
+defPTj/pmA+9/8L2tu4f3/HLbh1W0yICJ7UGWScyJmyoXANZ7u3vaRo1qVyNGZg4ccRXv/nZD338
+B5s2belv7+aURK5O6MhWS4mNgyQfRqQRjxtXf/ppJ192wVkyy86kZdvbZculoGl8pDQYpELrWYrE
+MUvKsxNKIIBoDtXW/p2eutkljz34xGMPPF7pTiD1WafPv/S8Bbl8FahRd2ySqDAcP74AoBqXPvr+
+d9195293tsVx2d1w/e1nn3Hi8EaBPzsB+ZqhL5stx8+fcfi8mVGQmz1ryrGHzQRQC19LAQiSQdWk
+WgcOYOATH71g3MS6foNSb7dNi8Tmqi9ecfJpxz76yPOlUkkIISRZa6WUgE/TNI16hM8hpqb6/KEH
+jvc2Vio6Zs6cB2788qOPPPHK6q3lMqc2m4I9KS+lSOLSARNHHTn34BNOOBKANwDpI+aMueKKd1iZ
+Gz2yJdRI46oKIlICEOwlhMjymMMbcxcsOu3IeW0oFKdOGbVlzYZFZ59hlWxoqjt1/rG5EBWfUwJp
+YqNQUZgb9JpygR43Sn7kw+ds2NIFCrWyTY0Fw72a/lzoX3PQOEanQJNkBcCkLgq9NwkgRI30Ihgi
+3g36CEnsdZZVCWHJVqEiBy2RDPb2GNxwzjpJhEj5wMZORwSfAhpCQmx3VSNVA1QDIAH2cIArc04L
+aPg0Lueigou9zFYtl0VDOQPlGQUCeQ8I62FcKRfUZadN0koYBYlVpGAADZ/2J3X1OUtIHArSJ/2d
+rm7kq9Bny9RkwFl4n3AgYnhCaK0rKCmzwwwR9IB1UJUqdA6eoSjRSAgeXDegcJzQ4WDaz5EoptAB
+nPf1wrLzLKOyRyRgPbxnrQiA87WcrbfQAtIhrSDIAYihIpcgiVJFQe0p7cbS8YBjOItIw1mOFJuk
+EoQS8BVEDtIYNGsgSYg0tGACeZgEKkDqyjII+2MfRkG2fruCLZWNKuRSRgBEZLFbR+lM4dS+uBxL
+FFOrAuUQB5BkvaaQ/uxQwv8DcT3ehboSekIAAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_alfa" model="fleet.vehicle.model.brand">
+      	<field name="name">Alfa</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAABCoklEQVR4nO29d7Rd53EfOvOVXU6/
+vaODJEAQJECwF4kUqUJS3WqWZMuWLZfkJbZf/NK8YsdO4ucULSeWbMdy0VMsyZJs0ZRIir2TYgNI
+ggTRcYEL3F5O3+UrM++PC8qUnaxHgKRMv5VZZ527zlr3nL33b8+eb2a+md8gM8P/lr8PUX/fJ/Ba
+5W+pCCL+fZ3JGyX4/xut/8GF/EO5K+I1/t9b/A6tnh4i/kPBHV6j1v+DU6gfvZwFRK9V6//WAd7i
+8iM+z1cfjplf49Ff6zLLzG8dlf9bl7p6Yj84vX8o+vEPxsMhInhFp1bBXX0XQvzAxP+te/AWl9cK
+/dmvYExMAFIQAIFFQATBIJQHkATsABV4AQiMgGgdawGA6JjJGe+9ZUqc79p8iT1KnSqhA+mMq2vZ
+AxTlYMhL7gIGMfSJ2I8FAKnui5Ul0iiJgQVJAADIAIP/iY1dfUjOzPS+AXIGy+zZapNjlswoVr+N
+AASA4BEEADAjMjMjSgZgYJcn3c6SNw0lc805codpxeTLITSMg4waDCRQCuk9SU9KQyZ1oaAqCNWu
+NJj3lnQxl2VLPTKsGaiUqkM6AGYQCAiWgCUECADsAR0AAYQM4vU8KX8Xw9eC1ZtucBygRBQI5F5R
+LPSAjKwAyaH1nkIZA0FzeTrPl0Q+bexyXEgDyNrtxW6zbvKuzVNrC4kJVpqm1bB5SwmQ1jQ8cFhI
+CwPVkaEgAl8bKlRLvZnPC0WtdC1NvOn0d5ubRNBTLK+XcZ8INSE5MJJBgADWxMAIjKR+5Gr/pmu9
+A5AACATk4fQvEIEXHHnvpVZEMD9zNG0fLeiZQqFVUa3ZhflWkmSZWFrmJC0T9eSpml2IEw5aViQ2
+R1cwKWWm23Wkm26hm1f62rGYHqgEUQRFtbx1c++WTWGlgj19NV0YWGwrgrXOj5RLvbW+88Sr9I0R
+AIjYSQzO4upejc+r5bVg9eYbHAZiEugAEeAVLQNQ7NjwwqmppHOoVJrt6293k4WFhYWVed1qMqiR
+UvlcFY2reMRQXK93G8vJQjNZbGVI+doRRj9P4BOTt9tw4Fi5kYWCl0RO1lqTzUPanuhtjw/SupHF
+XZfUBkb7Cn2jLPq6SezdSK3n3GJ1LSlwaDU6BAVOv57n/60KPQEIAiAC6S0qCYDgPLRbL3Ubx6vB
+fKUvS1dOHTveOTYVzC3FUbS1XBkYHlnf0z8kA+3Qdrrd5fpKY6U+vdBoLGcDAd18fWP9xFF2IWi/
+lOML+8p/cVuUUDEUQStJSci0njZkN86s7hwf72muGYMLLxIXbFPrRnpkdXy5WXZ+c6XvwmJlCBiA
+CECAPJuLezU+r5a3hK0HJgAgkEyoFQA4yKez1nHhT06MmG4y/dwzx/futXMLY4nbgMFw72CsxECG
+UUKppjYDOWc0I/hIqYil8zLicteUavd9L66nlU+8feqq7e0HH3CH5iIdZRqMYSFLHpMCh4rCwf0d
++9wLjccPz217cubi8+Z2Xp5PrB3vrclWayltrO8fvBDCAlEuIHzTofhhefOhFwIYEAEFgMu7rQPC
+vVguroB3R/dOP/T9mSNT1Y7ZynIYAy4Xm3memTxKsyhKYi21EChYIMrIywJLzCxQUQhQcfG5F/n4
+vP7gJVuh9wHS5ZT7tXchh7n1lbL69DWFczYsDvS1mi18dI+/80H97OFt++fg6L4DF+w8eunVc2Nr
+q57nmq26KFwUl0Z/5L7lGwg9ASAAArNHlHD6MSRkCYIABBLYue8F+LweHO/MzD126577D2481brG
+Y01WsiBYKYmqoaLJVLdpsohdKU0sFaIBkEsAhMoaaEk1khXnNIFsZh//kKwqLNYOTB93J47mQSiU
+X0lkPwTpz93Uf+VV+8O8niyJwXFxweblnZsHf+vPksT1P7Zw8d13nbzi6MwtFx+55OqdpTHXbj1L
+7XfBwGWAwBI8ZxIDAIFMAALetPjsjYMeAdB58oghAHjyAlgI5TEXoDFPk5mv6t6Ojjc8e8+d374/
+ObB4vVIj27eVN65v7Dvkpo8Ol2rEvp5VyhjJenex0B4sljObL0hX1iyddUoWvZsNRCGnaaD2unFU
+yeT8vPxXX+w5RT19UMigkpl81xZ55TumOMPP/zl/9147PlH+8fcPXr8TP3tz+w+/paBS7U3XPvZ8
+/+TU4vsOT739umRix6jiBxrLR8q9N0muSBUxgXDWBVIC4ZvmdL5xv4vkyQkhmYGYpGAhhHcgWbvk
+VHPx34VDdZPD7X/25a98K5xcuklV11y80/3iJ/gTH178uc91tu1YXE5X2kHBebu0kHsyeW6SdiwV
+i7CT+UREmRAFUCH6fo0h2ODZZ0rLaV8lCofGy4WoSr7tfIC+edUl67Uu3v69zp/dyhxecGy29o17
+Jyan5Dt3mYmhdkxZR7lyr1xs9X7p4bE/+Gb9kW8/mS8vFvThbOEbxHV0IBBcoBWThzcxHfQG3lIS
+IgJQLCwgASN7kJJ8c293+k+Lw+sXV7K/+uLd33lg11LxhsHeEZ+1AsshzkOnNVp2/8fnCjdc7agt
+8qzosdhxeSs1aUZZB8BFKrASOOO215klJ1mxdnc8Wnrg+Ja4kP/Sxxb77SRzpn2nKiIZ5ELhSlt2
+GgGalrP1I3PQzKIwaIWimZm8onsViTCCvBDdeTD+vdvcX919uH1yBvxL7VNfp2QGkCSQZ6XAvHH4
+/G15w6D35AGAmABAgEIvUaTtxmPZ4rera86feX72K7/15DdeuKA1tKtHQhNaQotTc2krd2lWOHBA
+Je2pj3+o9bEbT2plko5sd6HrkzQ3xnibJ8A+FBwQhg5i2Uk79YWV2W7u7rud9h3uCTHfceFKu55a
+mzZc54kDhzLHV18TXn21mF2YrTeijUPxQEEmnTh3SQZFly1BSKCLNW9L2PPizJbf/+uRb/zlieU5
+V1UHmie/As0jYA0IeFPdkDfQryfPJBCYhGABFrL0yVb3vsG+2rEXjv2PPzv29PyV5fH1Ic46UYtF
+MN9sr626X/lZ6B/ufOEP2xOj1Y/9WF1YeOqZ4Lm9Q3VTKfX091XHRkYj1IlzheVWvdPh1srScpPL
+VKfULPrYt0xGy43Z5mx7TqmxcjHOIQrF0m/+cuniqxtTh8xDD1CjFd18U2l9dfr2O9uf/6aG4hBq
+5X3b2rAg9PnDmSB/z565skw+dgO9/5bKxgmR2nVq4CO6uMmp4LVg//ccUjF7IpJSk2Mhs7T+vE2f
+r/Qle5+a+e+//9QB+97+0U2RXXSi17qkWMy7Njbt5V/9edq1o33fvdVqefTCrZOQ6XJ16fBk5dt3
+lp04Z3QsHBzQpXIoQij5ec1RIV62URoBow1bcjlM03lbyOrl5WV7bPrYkeN6KRcrdQyo+Zmb3ftv
+iirVFADzLH3w/u7nv9ScdRsrhQFNXeeoWIlvvqZ4465DrebR2++Sf3Dbmt7a/Ceuy3/yk2vWjKq0
+O1pY85MynngtibW/f+gRpXcgBXQ7T7Xr9w8PhEf2nPhP//HUMXtZcWQsrHSz1BR9oFh5iZhy1y18
+/P3iY++veH+qa4tPP2xOHI92nrew7MtPPj9crm3cMNHeugH6KomSLAoeWXEuUQ/bbj3snXthRoq8
+oKpxobtUKAhR0JRkyzPi8HT3kYfa+467ajB94ZZg7brqgf2Ljz9hOnJUDUau2dW+sH5CfPbj4RVr
+V5Ym9+S6566H8DdujWvhcCin3nv1yi9+YuOa8WLmx0rDn4Ti8GvE54dgfTOiWYaUWQoIVj+AAAbw
+AIolAEjp2t2ZpP6t4aHxmZemf+eLR19KLrvl6qGpbudkW1SzIFbQkgiihXpNKzu2uFwCxpUF/YVv
+4lMvDkInfnGqr7amcuUVwcXbTtRS1wrLaT4eiGFwI1IyFELi0BRXqPEdk2/q6PNFGuSuKxuCFueK
+ql0pty/aMf22KwtHjmSPPlJ94KlTX79XzrbEhrXbIiGoNaN0+eoren72x7Mt0bHDu+tQ6llsZHc9
+J7TVstI61al99dE0Fku/+ElVXXu4sXR7OfwZUF3kogAAcsQK1Wqu+/U6/GexjIT4gzADAYBO/7UA
+YZ4b4vl7+mr92cLyF/70yBMntn74Axf9059auP/Z5u/9aU8SkwPP4MFUCefAV3JLXi2/eMR8/4mq
+C81V1+Q3XF3eNMwDejoLspX8BgovLGqMS84ToPDEynkJILTCQKtIaxCduFiyYPJs1KCaNe1T3S3c
+bm2eOPGhz5x830dHv/9Q8uyetS+8XE9NNLqx8vEbS598Tx2S+a99b7nR7nn7zuS5A+bRlwvbtq7Z
+OZ5ZM3ffs9HX70xGi8d+8mNrdf/3uysTlb4bCQAkgVQCyDmnlILXHWudBfQCGBgBmUEwAACzQIQA
+GHR37s5KOKOi6l9+5YUH9w9deunOz31sSbmDzz4T9w/0SabEc8ETuMRKJTxOL+r7nsQHn2oMjoW3
+vLfv2ou8XD71wp8+IPN8+y++KxzbZAQGBgxLJYHBe2JmQGSJXqDV0pc4Zics2ZJQJH3XeQgLnvXL
+rUqMmyp44vqbj157VevOO8tfvzPPSvG7L1xcmW58+c4TX7p18Hd/ba00T3VN9LkPjt/w9mafWChS
+UlLBVx8uf+nu+Z6BqQ99cMSYO1muEb3npg4D5SQopQS/EaHWGUOPvOqREiABCCBkAIHCIaXL+8P8
+Sbmm5/F7DvzxX7uJjZf+2s/G42v333drsvu56Jc+Vxrs2f87/z3I8gmnumgaPb3Bi8+b/S+6iy8f
++5f/Z21jYf7wfS8fv2fRz+HoeeWSDnyugfJA2jRAa2NkZmBAkgKlQIVEyKQcc0uJghDKOopExaGn
+vNKjIaH2ot++MDmxbmDy5o/NTWxYeODuU7/++2mS5997aOCd7ztn+zkL2ZHm+68pR/Gka+UAy1r3
+lXRbRWpfY+x/3L+wdhyuuMp0298uFn5Rxz0WFLIRHLCwrz+/cBa2HhAIwAPg6k0QiMDgbUILt5bH
+46nJxa98daFeuvzcklyYe250LW7e2P+v/6+NuzYtvLzPtbMeoiUdEUlYWVC9Jbr5vf0fvrnSenH3
+Q988xHPhWBDJvgGMjPWtomIlJWaRyBVJ/kFoicgAROSYvSWvJEoIrSEhuFx2XdsMtE1yUSBhZSMt
+jRzrlpbSjZsvfHLLWvMn352//VvlnvHS5z4Ql82huuzbe/DU0Un5tm1D4+P6rsfT274PIpQ9orR7
+T+vrw9MbNq2v9J9qLd5RmfgUoxcQgAcU+nUjfxZajwDgAQhAMr1i8NjQ7BPlSj3Lq9/982P759aN
+buxfqC/87v/T/MhK9mNvH1+Lx1Pj/uir2XSD1wxb7IQNtmNDyc/99Jq3XaWO37N731cOl5O+Uo8H
+Z9p2JZYgQ5d6awVKIckTABN5BmACBs/MRISIBVkWDBKsJoiCFtEB15ytVXvzYl1mIwqXrY4S7qSd
+wTCiFvb9wsebW3vpj74ZtNLGbbeav/x+vH9u6GO3TIxvmt2/v/kX9/qpbKRQohAyU6ne8ezy1ntm
+fuKjW8PguWzlgqjvQmAAQQTidaT3zxZ64FX4Ba8aOwTANM8WJT8letY+dvfhB5/piYY3xi51Ydhs
+bv3il2fac9OfuIVjXbvlumjxNm41IqvdsC586sd516U5Z1w/RsVE94RZ28SeWg5Q+dA6VBwKkN4x
+KMNesicUmgEQJKIEEEKoDBNEFkw6rKZedztuZdbndV5pyNogzLUTLStpZiqFdK5VT7pr+2ob37Hr
+tlp88j//V9Fa2TTfym64YdsnP3SycWrl1gfVS8cHor4gZLZIsmQW6oO3PjCzY2vrsl2lZvfOqHQB
+KAsYEjj5ugPds4GeQQIQoHhlqzVJk4VSdeHUrLjtu+1TsGGoKFjEka+rCnX1wDcepqlTjX/y6e7N
+b7ODQz3/7avmRMv+4mfKl13W017aHFQA4sestRmJbtiJfBFyQyYgrwMXIAAb29WdwBeZGZiRERCI
+iDwwccFFIkitL2RAHqg8ck7v2Do0gxWoO0jWZD1SaAYlsZaY/tmT/YeFyLOfvOjKr9641PzCV/CD
+N23/5Z8x4dLz9+zFe58Ow14Vl1yWcChbmOhaGO89AnfdefCiNWNhr8rS3VHhEghSBHz9OYYz/77I
+0YcA0kmrQAPm3awrOn8lKhN33X3ghUN6eGQoEsL4LrGQ5KsFlemBhw8VTvze4X/1Ud9tPjvXGP/H
+HxvadVkhox0FvR7pWZ9KlkmXNbTQhG02SlvnhUUFOeUcgTYFQgXoADyDZ84AnAcjBbGAlIHQBjk5
+HdPx21zzoGyXI5llUoXckQweIx2Yeiuu8zXh4OhBLjRm3/mTb79nZbF7dHa+j9PjU+qPvhcZMVzS
+kTUNVNL53lZySoUxU/nOZ/N3vNS+8jrj6vdC4YIEbMFXXs+G4llCTyAEAgEp0MQgkFS+TwbB1MHk
+nnvbWXw+VTCFjpfAzIHT3rSCwvAgleqL5X/2n1/mTN/8gaGPfGC4VT8HonEVKRUknjt5mggREZPN
+HVp2TjEzEXvvQSAwM3hEWC04W315x2Q9q1ylAci8KTPu2PEZQ0faUoRGCpN3Cr7rpWpSWrWNgu6x
+a/NuPaByvtyq3Z9c9jMfuee//Nnk2/9Z/1gxMCv9w/122ScevFsOjOi87aq1P/UuuO2updsfir5x
+X2vbphk96MAciINtIFOA+EcNvQANCB75dDmZXTStR4MofuCR+stHS8Pb+gU3ZFoEGRl2ljCAajdv
+FkUqK/Ein3PjFe6zny4vz5ZLlYusChm6DrpExBR4ZmJjiSF33nv4oQAdVz8yEbAAgQDCe0ZHpZDX
+9j9nIp6cHprDiWPr1kyMLbUtBBgVZS9S2wMOqHLR5QuLtmtbkrtuJbGs9pkh0drxT39y9y/8K//i
+1HlD/VknQ2tTcP7aK/vee2O8fWxuTCwFV5m7H3YPvNT/6UPJBf3L7YWn+sKLQKi/B60HAo9OADAB
+CrCNfUgnu+1Ndz19EvW4Qkw6oqzKRCsoU2KRc0Ek1mudi+66PvnJj2Egq7b8DhVrg+CsQRJAMfuC
+B+kodyzBCeccADH7094sAIMHZu89MCIDMDIDgthWeOSFh7691HCXv+fSOLv0+clt+7ujKRsQrcwV
+HDumBFhEAXpAw30ln6liun24S63O7vlz1mPjP372xIf/7fJyEoSqfPUF+sfetfbckcNB51Ay0z0c
+Rls3xh94W/JHD+A3H+Ot2xJR2Ev2hAjH4XVjf+bQI3gUAZAXIIWj9KVStf/+B5cOTvO7bxztG23t
+3ttYXJBANojjepLfeE3PxRsbf3nPic7chs9+RK0fyVfalwS9ceaaTpVDRImSCPI8J/AkVmtGrLXB
+qvvIsGp36LTZYcEECAwA3jsg59SymM+b/72x/4n7L/rlpLvx4gePjigpKCu0rd/a63esIRV2QgMl
+4g5O6u4CCNfpTCV588fWX/ri4ubNm1uffM/h7zx1zj//nNi+bkp3TumFRhCZrz+Cjx4Vv/G55Ruu
+Lv35A8sPHx89OeM2n9tuzd9dWv/Trz+Rf+Yh1apPS0wi991Jnx/LwjXf+d7jWWfsluvit109O3nC
+PPNs89mnk5cmpeDhqy7SN113+MWjslNffvs71cLSprhvfUzthEJ2EhCQDXPX+hZASSASgfenffbT
+/jszE5AnIYh51fIQAzmfsc+fPDZ20bsvK4bHDv/+7L7P7xn+7XiClMEezpOhKm4dXd7ac5ST6fuP
+LO6bT6xEpmRqrvfBefAy+eyWxz522TkmwZveOfzciclSVhuDqTuf7x5e2HjzVXTupvQrj8UvT21s
+NpuDcfvwyfzePX7LlqpsnDBg1Y/ew/ESFAGgUEBJ+mIU47Hj/NTzFJQLL+2breHU2gn70Zvxw9cX
+v/9iZ/9MdsGag9MnWnse4J/46SGWMqjeggKtIS0jD4jegjTIFgmJ0YNgZu+YmYUQROTJEwCycM5J
+watFPQye2HmfI+fN8NKn5qNtH+b+Z482DuI4zr974hlFzvRTB5jzZOFENl3Hrx/mB5ZULa4a02tF
+q9BTXqznv/rM7NRM8zc/sL66SZ0/4b53X3L5eZvqnenf/54JesuXTixXK/K3/7BlsqRarhU4ePJQ
+99PLWSFYSZefKfRd+6OGngDAE2kJwN3Oy5VIvbDnxIkZNbq98AffWvjqt9ylF4hdW2Yuuyi4bBte
+dbFC1f3dL6aROPc912Vp6wY1bMFlmS5rk7HSgBYR2QfehASa2DFZ74CImNl7b51lRAGSiBCYvGcm
+RsPoGQgFr+/b7wtBny/tZaeDeP5w+u/v2kvVikC0No9JsON6GK2E5ZH+yORJDNZJ31pOMcrAVn/v
+sO95sP4b76pdf3nwxT8Pnj4S3nhV+Y7d7qv34Hfc0FKHsyrEvTWbpTGLQ8fc1PHkvPPLvHwQfvTQ
+Bw6cVoqA0zZ2p121/56Hp2QYVa1yQ2ONbnrb9+neZ5vrHmhffZ56x85j5RH5149Gv/QTZc7QqLUD
+UnVS9EEuUDAS+AKxMOwM+wA6aLwVHowyjOStB0tSKQsWDAbSJYLCjnA1tNp5uGCNLdO9h3fvL2H0
+IjUWlwZ6lpfzxK+UCgeTQlguKpWEhbhlQYogQotZggSZ0UsUFJCTdgnSFSD/J7un3repcOP6+LbR
+7p/c2rlym297PrHoiizjHhmzLWVEKkjId9qlR/YvXHheud05CnbR6QEJFh2CUg6cZkXsVmuQ3hTo
+QRKBIEiyZG+xoutLhRf2dculNSKwWdaqFAd7Njqm0lSz8LUnlh98udGnQOqeLTtE5tbFfRPLHauF
+pESq0JIg9gYwZ7DeO8eCnPMK0QI5RGIWTOQsMQkSuUEs2lwImwjqxtWoWJt+5A+OHf7dF4Mytcul
+YIkd5cEj01/81IYTC2CyJHRx1zQLJbnSDb92sLMnCzD3yB3P0OxwN0PpLeVusWvufGlxxzt7d5wr
+/u099UeecVGxMFjiWAT1TsdjGcmCyyrlWrulD01WF5s5xktJYyEYGABAEKt9Anym+ydnkblkzYAC
+hTsk4uDAnnxmMRjeHGZsA9WjbVAKmEQY9sdOxo4q++ftTe8s9g00qblVBWAgZ/aRL7hUOcnSoVdI
+HrwHQZI9gmh5J51XnjLwiWMtPAKyzzMQMSpQmrzpJHmzJhJopjWumXY7TkA3kiwa8pPR5iiIsryJ
+ueKil1GF3eEks910wRmFnlOX5w5zEj5w3RQSS6n8/mRzxYxesrG5YVjtPRVVypzm+WIKvUM1AcUs
+y9rG5VkOYffgdLuRlMeqptOa6R847zQmDBKQGVHga2/kOgvnEoEACDvLR+N+veeFmVQEIsqFK0dR
+CdCC1C61cdC0wIQQ96jLtylu9sXReZR3NVkmGQifETAQo0FwxM45JzlA1t5G7AX6gLxmll4AeOHA
+KUlkKSfjqahBuLy13Cxsee+EMllpYB2tHXzm371oV9rrP3LBv7ztwHdng0B55hZKZKR6xvNG5Chz
+5wBDcELbNmQGMgsZY9dMz7QOn+hdNxzv2uIOzyw3mkro2vtuHr1ySzuimVz33PO0e+xxD4VKq2WO
+HWmsGymDXRTgHCiFq5lzQGKSjK959+osPCQCFgApmXoQbDhw+CCpKFCFCKM0a3Ect8gZb4udvp6e
+HhC+YOfXDmVK7MCi0eicA9aFNjUVE5O3rqU5YTDeWwceiBwBWCYCYkuUekDybF2eQlhABpAGMeSS
+9tFjz/XkQX98dVh3fde9rXP4doaXQx6i7zzSnO6fqHIUgsnytgMFgRwNMGBMmvl0Z4U5Zkuu2RZM
+bJFym+VucanTUxwbHfBKd1oef+VjG2/atTARTXun+kfgsk35N8PBP74jX4F4Zq7DHtgtAueAAQAw
+0CtZ3DOQM8/XA5MA3z0OomNzf2w67etdR2mwGNbJhcIFlVrr0vOHzxlOtl5w/MF7GqeKfX191uKI
+hW4RQtJsGFMIqj7yPofcQFxGLjBJz5ac9zIHFpYCIgcAwFKQRlJOtoHBGfZoTZ7pomhx72R3jO3O
+DeVTJdjto9TWzPBo9h9u2RTkKYa2aKQTNccuTLnBtuW76yuFLzyafOdgMzFSeEbT5UyQiKK4JkX4
+0knuKTnJybXXbH/X+ccrmH/5VrXnSH7xpuDjH9EfvWnlhenw6WP6yBxY0yFaMElDFiuApwvZYXUT
+482DHhgRIU+mo3LgUzm3jICZS7q1wujObQNrhrtjI9Obqit9hSlZNnfNDJ23c6haCA1VpSjneWK8
+NHYZVNjtrhgJ2jkiBJZEwMCAjFi23pEPEQJm7XJiYzx4qYXLhRShlFIa12Vp0QdBde345C21Q89+
+bf+Jb+H6a6t1N9w8pMzQRkyXfKJMHOVpUzVNSmDd8vp1w++dePyOvUtgCoqAnfNeoUjXl0MdF/cu
+FC5YVx0qTm7ssROlxm1Pdf/w4YlMyIePJNWNgzfvOLhja/G+/ZWZlb5Op0OlZpo0S8UfwMKA8Nqt
+zVlBT0gSJJMDbTqQmbjURze/e9uu8aXx2ksVtRhAO29hsxU9+Lh4ZFr+/A1CeqiUm6wkBl3japIX
+PTsuO6eCwPlCOQ9iw2CdQyCR+ZTJqkj3DbkwyhNIlLMkLQBj2sG4hSRD7jTmFtxstRIm7xjd9/gX
+d9//OwfPv2Ddh359e6C7wY4+J05S3rZWmjwPY6IaGwDm7mDh0O4nJvPUCFX2aRcAAUUssivGo5m5
+6HB3aPuIHRmLiroNxIfnfYZZL4iFMHlp0r9tLFlXk4qDqTllvNCQW5MBADGcrnA/w+3as7D1XoBk
+2wBZmF2aS5ty6+bowxuetM1JyfF9M8WTC+J9l/Pk8dYdj16QysFCeSFUpRN7vr5CTQUSnE45IcyQ
+QuIukC/b/rn9YtlTj5fC5CDJxHJyoX3gjllT/A3K4zw1KS4GrNMUUVmZ+N64tvaiwOH5HZCmniQ1
+++HPbhq7Zf2XH9/37LRoFdllXWIk75GYPXlLq+Kc2zurvUNBJ53TAkKAxrmjlasn5F8cEEmp1I7E
+cE8QGa+KWPa9nMd5yG3nmWMfh10rpZEmzWzaMzjhG+kpyZcAAKH0HiQysoDXXJx8FlslAYJjv6RC
+Wqx3O8kCRNpVfbubLHeyh3dHSbrpusvQR4dym8iotKmKe7/x3MN/elxKDFH7HDK0jEI2fQ42I+cd
+s4USR0KCI63ZA0P3SPb1X32s67NIFMCDsRn4QMdRym1KsFDCz/37nZWRaqstHjp6/kc/Lh96/MQ/
+uuOpvcFaF5V9txUb6ygC5wUxOvKZI2PJeXISfFdC5jrFEH3uRS2KP/O2TYfr1ae6I2MaRSPSYXR0
+gTJTvOnK7tNHT70wtWHLIH/kbUU0fmqxkCLlAuu5H8fTBRKryi6EeNOXWUZAJpMsh5FuNALA0tSM
+/dO/XLxhYzw+Qj97XZ14X7+EE0vlmHtm02VX0mlbcqtULEphWbCIgtxnmCgk48ATOBdJ0CAyY4QI
+cgGkIZA13zW9sseCEQwxFLwACY5ZhMFwN11i6Yzu1JPW2nJx95HJX77/wP541IYWuqcUF7OcUBhv
+PBgnLQl3+uWcJ58xFxSLnGSv7vynm9ZVRPD7L/WHY32pT1LvBbYfed58bcPYe3fIX/0Yn1pZ2rQu
+GggfP3Kyds/ThEGFEtdZYuecA8d8uiEVEc+0Fv+MobcMAQgFgDJsdLqSw/py+Xsn8end+cXb1KXr
+FjcPpq6lt26gFjf/6hnnSDmfJ6bJIQEXgSNvUmEwY2HZE4OQaIkdEhRERil68qx9mobCe+YcBWvN
+JkMsCrIOPZpMCGZrXJorVJcMzPy3207uy8cplKKxHOQlzCDVAqCFnsB6n1ufW3AeGZCh6MtpmoVi
++frz+j66fRg5+pPda4t95+dmmnWl5doDUdhu+y/dY7Nm31Xb7faxditbevpUz9fvcEcXsFLLhGOh
+IM9zy/YH0Ssz4+mCgTcNekQAFgK9Et5y1/GSDIuEfXPQ/fMnxZ3PZVeck19yHl2zozMxfsw/UpK0
+XrE0qbOQEygC8pgFTpN1gEjALBQzewAPZIQLACyQY0sSGCEBZiUAmDkB70mQpraUGXlw1hZCovZz
+dxzpymKPb2bsdCTS6zcwlIsy0+y8t04yCEAkttY657QQlah2Se+mMZc/vhB/d3nN2MhWmx93vjfg
+QqxC9iIUQXMJ/uxbze/u4U394yca86emmWxlcAA7tplB1HTxq8lXeDWXfRqcNw16AQAoPIHJTCEs
+AQCI1CuqClMcDMmNP7XPPbV7+annurV+vVAvdgzlzq90tSTF7EF6pyx6yYKJBQuB5CINAjnJrQhC
+471DKwPdzBiESn1CuVVCCuwwBV6gQHDestSgJKp8vjFbD2umMw9c0KbzU5eP/qd31U5Nr2iprLXO
+AAIppQAgM2wtC4sl1f6rg4O/eXyTCXGor4q+LjnMc4QKJ6ad6kSHgQKM+wrHluXknMWgLwzjSC1L
+q3wei1IUiljKv8PFxsx8Bvb+jKGXbD1qISsmaVbKRQEBGCUAVnwlRq85D3s6DopPHivxEWNVqA36
+MEmCpoxiCcSODROhD0ByQIYNIhsPSEJKnXsXWVYgSTosUW67paggWBIRU1HFscWcuhQFMXgRuDjr
+ctS7NnTPgCDILRs4/GLri40pVOxdJKVEAHKn/RsppdJSahjurwz1i0tk5VCjIHyeKxuBjrljoFOu
+RA5E4lyorJPdfo1CZYwImCnljAGFkYBWqZgy116t9WdR/HoWzqUl1kQRQV7pUUJ1yFcDjLQCzDuA
+JcehkLpYEISw3HaTByavvLDy9p/e1I2QbBKSAumZCSmCIAdpq9HYwWdXnnt0MgQA8BYBWJWG6T2f
+2ZbhijYVScLpJoBiJBFClNdCEZTOTVvtxvxKiQvxzgF96ogtkk5ldseJpdsnCawCsQQM4DywFyjY
+E5MFZolhb4E/fvmJD2xz9yebn0wqgc/RQWazgsJ+imilxpRo7Z2roPDMIIVNPQqsBjIH20IuFCqR
+McZpBz9k6/nNtfUp6pggJSnytG94SGuNpkClFTAlIUJLiXDCWedBMWlKmjOnmqPXn3/5T12bdKzV
+EsibvF2AKFfQci5UYufmk+qP53Y/bjsmkKGONfgkqRTDK6+OD/Nnup2OUKlSCrxG4ZkDgbEOsE/c
+Gy5I2xJ3huWfv2jk8X3HlvUSdKSuFm3eBFCCisQOPOHqThc55FAwMKf1pv6975ik++KnrqDnD2w3
+rR7H07njCVF0XF9MF4l7mYWC1EPkKSOkKsUpd0ApxiCoyNDYzmI5Wjt2usydBTMjCo+p4ujNgl6D
+BgSS6DpRf38cx9KzV1694uIS86oGELAXAg+uFJdsb9den4do0UsBKghMLtCnhRAhX5o/0VyaJckR
+SmbfSiAA9qnRjVYxUWvJxxLYWA0CGQ2zZPaCOk0Rtb1JZOvo4vi6weTnL53/1vMrh3RkGytAFRAr
+RBF4AueZPTAAMRN5cqBiCHwc4W27W1ect3IlH73djFZ0DKHvKdHK8tLCUi4lMnhC8N5qIZ0n4ywq
+tt5746sFoaVpp3a0WAYAIpJCrXYY4JmUYp4x9IqBwUeV/sMvd0YHTX+fnlq0EUWMntgxewAkAmaP
+QFLxS4e6S0tHg0onV8jOkglMiMCpkwxSI5lmq27yRKBzxKiIED1gzradJ6lMUDIp8JSxNABAVGCr
+hRUJUmaNpwxyvO/k2hvXLP3zyuytx5uNVpGkItvvVqkZiMh59g6Z2ZP3dnLRtl2eEnpbevLl45cO
+lUD2WwqdCmpBo7G4PDuPgFaAImZgD4TkPSGQZGSlhOivULEoVuphXK4BAPJqoT0BiDMquj+rcleB
+sjCxtNwYSdpjI/rgCVONNaBlZiaHQgADe0ABWuHMserRF+d3XD5vuyMKSVhIXEtiN2ENLsDcBCZj
+QhCYO6eUZi8IBaC0QF6AzY1giyLQec4CmYR0EhGAERIvDWWShJffOrHlbWO9/+0jrYCTFFOzEhBm
+SilkcNY655D8KnHaP7lt+vFJ7wkwJdYDPqbEqDAkHUBNt5IOtLOSXGUHI0IW6FmiRAnOGRBRILCv
+3C3GFZEOBnGFyAmhPAEgSSne7PQZkABDI8Wect7ubjuncvcDdewNmRysLjVMyCwABTghRSvMntp/
+ctsVk8ZusGgihbnzUmi0KHRITjfqabuT5oAGZUYc+pyJiCBPPEcanGRCkAFSzJgRIYJDJmuMzx3l
+zNpYjcS1Nf2mTy0fPDGzsthJMyYWSkmJwjnHdDqpi8TdNOFcFlSWgCgXPaEWqkTOVuJuRN0DJ9Ou
+CYJQeLICUQAzg1bCMgGhZy5pd956jTL0ukdFpdUdQWYWYpUJ7wzW2bPYmwUACOLR3tG1S9PHrrlk
+8xf+eMZSSTCdjjJWj84EzIgkZXHPQfxg8+VK39X1FiSOiJmckrzEjrzrOtc1PrPsLApiluQEgPNZ
+p1v35Q5iAJh7j1YUPXQNWsGxAJdSlnhrmQpezeX+l3bO9TQe//m/OPjUXJuawhTLnvMf4AIAAnG1
+xKGd5wH2Jd3u8ABcsTm6+xkRSCM7fs1gl5P8xQMd6ypFHZm8HYvAICKQQPKOQh2mxpVKbus5fct1
+R0FN6AIjgicpxWpdFrI43eT0ZkDPCASk40Kxtnbq+T1rt4YjQ9zoujj0fLqz6vTu8GoZk3Rq6lTP
+vmefu+Q9hzM5aMnGMnNGWRs5UGQigUUUkXdtZC9JkEQGyD1kOTgfCh+gQ2K0QhBKx4wgmSnP2Xrn
+hZt3wWX9tiff98+/+fRjR4tQKIE10Pao/OpWNcAr8T0REAEoYbpatD51xeal+eLexqjqzVVAmytm
+cWb51KwKCgjEApit90KiAPS5gAgdAPveGg718exM2rtrPaMGICCGV4hQzqir8Ix7sTyAAHCcFcvj
+TDJrzk6MRknXrmZIgBiIgRCI2RN7EkG3kQ09/f1Gt9XWYYUDhYjOhSgRJBCAJ7beMTkNQjjyII1H
+SwiIqMB6YygV0qHrgO8I8sIDOuEMu9yDc94trBto3PbQC49NFqDsFTuQHQwSyYHkQIhIiEhALCBG
+LAhVVpEYGhn81fdsWhfntz4zIEt93gH2Y5naRw6fqLdkEEKaZkIAOQOAKIS1uZToMhspOTJSrZSR
+sDA+vsGfhlAwAwGdaTfnmUezQOgFy8jJCwfXVNtz9bddUnr4qSVHsRIB+5Q4RkkytHmX4zBEZ2U5
+evzl0qUv/uXlV0/YZjFRDJpsrqXSyCbNhCHvdWB8JlmD8yLgLG/bRHLmiXOkyFmHQucQCC+tggJm
+3VQApzkZMD1uZc/RNkLAgFgr5798wxWDw8Btb9hrHWqy3rcZhcHQIg/ktNyQs0vmK9OjbnAADRco
+2FJcaCVHHn9K6mI156QQSDKYS0MgwQgRxCIxnaAWytmbLivRcrsVbdC1c9B7lBLkalufJqA3txgE
+QIB0CKK3b2ylZ3j+2MzmtXq0P7CEznS1lFIYBmEzEYYKMJAyZdtpi54H7p3accHzceGjncaklsaq
+jFCBFAiKCIQQCpXLvVCCmQnQWWLyjgnJKyJgT0DIq9WAbL1b7eQsCDO3kgFqYAUikTYuNJqBX+5Q
+ocLoObEqdi4oidZwiTuJ/MM9faZccOpcWY5yj2XZpcitpdmHH1zqpiFGFji3npGECgLDwALBJV1Z
+1NyuRbXtm0sn5pcHNm0RQghx2macHevw2dVsCgAHKsLCeYnd31cubBzxT+3Pa7XAeQ5kjqy9CaSk
+zHghXIC6S+GevfLZp++76p3XdtSAd4sgcgLHCB6kd+ByR8IHQWjZMYJntt6RIw+ERAyOPTj07NGD
+d95Z63NrPXHi1Uw6snHkWHBQmRY2Ivi1J2erXmZRw6YdBuWgK9lVJO0Yjd978Zrtl5/34KEqaIrZ
+lQBJm61VyqaPPLsHCCsq8ACOfSAYGICRiBwyYEGYltk+EQ5WeGmltnHTNVK+3iLvM7b1zMAgADwh
+VQbeXhuOtLXvvm7MmDZCwMzEhj2FUjB7jzk6dBiEYBIauf3eyfkTf95bUeRiLWpKRx4pdzkIqWS0
+6nkjIiMAoHXkGTyRA/JM3nvvvXPOOG+ct845R86Tp+RYt1o18L7NulJ0DK6bZzO8stLidk6OJHXa
+PmvNJvrOg+7LT82eVzkxVkhKWaYwS52oSrEJjtz/RD2lHowiBiMAJCAI9mQBQEu2HJk80apw02V2
+cWEF4v7e0QteJ+5wdvl6IpACUKhi7znF/o3Hpx+/+JwN52/sn5rK4hoyIRJJlXhiIUlClLtuASgR
+wYuHqvfffc8HP7wjrp7fqsdYCIVWno3NMwFFpbRfbQdlweidI+HZIaD3RE6Q9ATOk2Gn2BOBI/bE
+Crothr3y4nOGZ2omPiAx52UDFZ0GgdWEQGGVvDq+3FrqpEeW/cKho972mnAchaCQrx6a2f/00eeO
+VoKSYszJOgQFBEqz8RZROyaB6LNgbDi77prhI0frQxddKoLghzH5Gy/2zYSeQQoiRkQI42BwzbtO
+Tj4rTPPtV458af/zUamXA0kenE9RKiDvAAOf5SJiTpOs974H2+Mj39zx3n9UyYcTZgQhpXbekFOo
+ARCZCQiQhffMnnmV/c17BHZMTOBZEYAlJg+EImI94vwUjB4L6Opx+W65NCJrIcqucDFoCygDDbr4
+1wf4jheTCPOq723kRYgxN+bq9Stm6tk7HrNWlTV2yAuFgjwSEzIwoyRvCCPInIs++I6Yw9DL8sbt
+78NVFuzXJ2fXNwsImggQqG/0sr41W+svHN9x/sS5G4rHFrNY6dVGERQ5UmB8u4BB7nIhBGNycr74
+3bsPBsP37LzgPYIHvCkwBYHSQeC6lFkK9Stbnd4RrsZozAjgTods4IEssXbkT3NUZ/NxMcqsdltf
+pHoPzBV62yuTT7+8FBjbTrkUstG69dgJorb+wEU9i1mQS1F1+Zae+bXdqW98r9HJhwoVwdYLRpSC
+gVCCdSxAo3cyiEwn2zDa/cgt5x4+Ntu/7gYVj0m0fxuVMyfNP5uGHnAMSki0QDoo91QHz8+iExMj
++PZrtxz46vO6BERCkyLbdRwr6TMXILasK4Sy7UT69L5y9S9v76+VRjbcXIorpzJ0zqFAYB/oCH0O
+AuQqAxALRIRXAjRmZkIWTESeV4kqZEaykGNR2QbZlJKL+oPG4r7feaZtpe5X7GXXOR9aF5R73nFu
+fE65852VEVMoYLG7M5y9+7tT++Zq5UqJTUNSicESO5JeSm1zDIQGMM5Za4MP3FiLiiZv+407PigF
+MCG+apU8u2EFZ95VwiClRA8gpRMWWG/ecMvJg89FK3NXX3PeA4/1n5xciWqchR6oHObGecXcAWbJ
+HY8SZQHY3fn9UIVf/vGf6l0zca3WoecICUNwBtrCBxhYx5gGcY2EM0b7UqIQQAhS5DwICwjeKvBa
+SutJk/RtCCw3qyL1ramHn593vvjpnaV3riueTCQCyHazmXlRCO9YHDymLzmnuHBV7+Ijdx155GUf
+9Aw60VDO2mgZ8mIoDBrJjsIgJyJAlXTteevlhz940Ynnnlm76dpy/8ZMQPRGEAGeObOIOJ2KAkIE
+KQXGpZG1G69stmcHStm7b+rzKug6hBwgz6wD7y2RW6UbZfbee0+W2N39APzVt/96+uTdZZ3ZPLBe
+KiEjFwkRRARVMDJvMhJHZaOEJUTBiCgkIOJqh9uqaEaRpGGaF520WbiUFrE4oME2EvX8ycbsfGNh
+fsXZ9qms968Xdk2Gl1zd37qyNvfkw7sffI4Kld4QVtg4LSObB1pb7yQqkCHlhhjJ2Min+S98ZjN1
+Om0SI5veDzLX4IDeADq6s6k+AxbAAIACkBBkUF1/7o0LBx5qzD1/w+Xbn3im8cRzjSrmIWoncya/
+aisA6ZVpF15KbKSFu+491lm57aLzfe8ALWhNNhYijQN0Wai4KKmolUj9is2cLFZc6kiSWE2dMznn
+AAARsyBBJu20BG0gbjscG9ZXicahqeBkxViGpWXe2cfVQS73hdvL3U3umWfuazy2B40ox4HLnUMV
+e+NDVfS+qVTovSfXZREy6U6r9b4bxt596ZrDLzw8eu6Hes+92IOTIAD5TAue3hDo6QeHRSAiIQQU
+ezduuOAT37/vNwd7Vz71oYm9+yeNEyis87TaBnW6bBiAgRBRCFEMaaHO33tsfrHOb982tmUXHHpp
+IUtL2hEhmNh0wZUMhFjQ0nUyi+QYiAi8RGa25BkBBGJWVEAZ5JntgBTW1Yb0eUP9/RO99UElsrz1
+iHAmjoZDO1w8ottz9z259PRhFmGlFopuF4XUAWZGqECAzdGItgpqWdbVGtKmnRjjf/azF00fPURh
+6YLLPm2QJChwFuQbQMpyFlRG4vQbegAS6BwToxzcfP3GLe+dO3Xg0g38s584N+mkqXNAaF3mfM5A
+gAzoiZxzxtqUscNoExs+8UJ++xNTMKR33nhuz7hiA8joCSwJDqlrM0ceUQqhQEhERJCMwjkCFghS
+S0UIToDhLkvXpvhYd+Ck2TTHWw7ZTYlac21P4R2Dqk/UF/cfuPXW6acPVQLdG6Pq5kTaSrbgJAfs
+baK1JgDr8igqYc5IC5/7qUtG487k7JFtV/1j3TPMXkiwLOgNIX09i/SZfOVRI4DVBdcChEGttnnn
+h5Zmnp09/vynbr553/7G3Q9NChmzXG25h9MNsOxWSxUN5XFUTPOO83bPUTs1f/jq7X3bdpVoXB8/
+tJym1jQDkt5olhhYYwNGIgJAAiTPzpFjJEIHK9akUhU0SplnyJAIaUCcdGtkJM7vHbkoaTcWp588
+EEyeogSK5Zh1jqnRWExj1TZYZF+IfOIQSJDkkvUJEKdp45PvO+8dV4w+v+feDdveP3rezQ45AAZw
+iPEZ9I68gdADCwAgtHh6W1KsOrkMtjayZduVn/3+PZ9fmT7ySz+948TxUwePdwN8pex/FfRXFIah
+ZPJ2QbnMKsCepZa566mjR2bCbecOrbmiTzSzSOX9sfa21qpnqiLZILAHFggCUXpCYnAE0paE88To
+QTmbIIgYgxD4ooHmUDhN3cYz+1r7p4pLSU2xU9LJPLHgdAWld5CWQEdeZMqDE8IYQx6DIEg79V3n
+V3/mU5c2p/bp3q0XX/lzXitkQOGBYgBgNAhnP2DjbKGHVUvvCZRYZYESEgiUZFDR4MZ3bN15at+T
+X960aevnPnvhv/6/d+fdXIjVQtxVB33VP3GrK7W1rBgkJRYp576XjsH+xdm1fcs7R3o2VPJ04YH+
+4pqh0Y3TlBBEjlCA8EIgr8abSARdgkjIjgMfVHorclC3++RcH9Y7cwf2TxVePi7BRiKjggSOotAm
+7QjIgzaIIraSQm8jkC1Umq1WJdJJq5GND9T+xb/4oOlOJkuLl3/038SDfR6AkYEUeACVIBReJ+7w
+RhLrEgBC7oHS2T33/tbcvsfPOf/yO58++Wuf3+NsIxAxSpnbBNADu1gWM59JKVcZQIQQiAIRvWeC
+EJkC5fsqamI03ryhes7mvvHx3kxuKRbL7CmOAk/igcd3Z7KqK0OEhKYh8vmq7EZoOvVscc7W625/
+vcc5x6sUgURAvFpf77gTqdBbyj2JKAAgzm0kVE6IiprN5mCFP//r7z53OH/mxZevuvlntl/5i68R
+nx+C9UfL7gqMhgElaV5eevT+Xzl57MCuXdd9+8kTv/0fvtPOtRIxUTeUOWGUuy6efuBYKUXEnryS
+ChFBIBCSYwQWwFpQHKlCHKwblKVyoRAHpYIslfT88hIWKzIqEVmJZW+K3pXbOSx1qG0wtULblrWW
+nKfVfUHi1cSncN56J6KA0JEzUoBC5b1nxEbTTAzr//Lr160tuoOHn9921Y9feO2nRdT/GvH5IVh/
+pNADOUqVCEyqwxCSlZN7HvmN47uf2HbF9Y++sPhr//6eVspaGvaZEOioH0V3lfwbgRlYoJBSWmcF
+kBCKAQUGjMIRAgspJVEkgrBYLGolqqWgUiwWKhUdl4JiHOsS+MDmJk9bnW7dutR4Y4yy1nrriIi9
+/4HWg2uDKifGB8prsHnqMIgxksnK0rqJ0m/8ynVbB7t79z60Zttnrn3fL2HU81p8wLOD/g0jUUcA
+JYqeRBgZL0DUxrfv+qcbtu/a+9j3btg19oXf/kStaCw4jpSlggZHRFJIJZWUWgoNAEReIK4+DQzO
+ceKgCyIBlZEyhcjEAalAB1EZRE3KPkE9IfSHUFNYQIkQMhaVLBVJV52rrU7u+8GEwh98NFInri5F
+Bx26XIaRAMGNJd68pvgffvXqi0ZbL+x5dP2Oj1/5oV+AqIffRPr6N3B0gBcMXgADoAQnFVXWbN90
+2c+v33HxQ3c9cv6w+9oXPjsxWPImYnBSdRGJyDn/N4RPnrxUyKCIBbBAFoqV5EBzHHIsmKUSHjxE
+kkPIlTPauCC3kHtFoBHlKt88h+xD8PDK3MRV9P/mgmWIEAghMuzYAJpd8mn9HZeW/+u/e+e5A7xn
+9+6Nuz646+Z/ScGwBY9vQOT0v5Q3DnqRCZYCFTgB4BVLC53edVdtufrf7Hj7lbu//0TRzH/t93/m
+2kvXxQWdeENspAIlT5PeSCkR0FpLp0k0AQCAWHpGZ9HawOmQtHYCMi+IBZEA9t4KK5XTAYUB6kAq
+IQADxADEK/LqwZXMLLwLRWScABGlOZUK8BMfPufzv76jLA49s/vlzZf89BXv/y2IigIgEO4NhOfv
+yhs2lYDRowMQAJqAQ0SruOSResYu2Kp+NYwrzz96V3/b/Nd/8+4v/cVDdz104tjJReeMEApBEDtk
+KaVcdUdW+ZKZmZFIWCE8CHJCAToVSalQKYlSEKD1RAo8OwQh0AdSOBUaRAYUwgkhGOlvGRz0xYwW
+wZuAyxvH9Gc+ccH7b1h34uXnD88mV7zrxy+85h/nDBpAQhd8EaR78wY3vGHLrANQDODBSSC0AWsg
+BpkxR4Rss9bcvu+89NAf+27Sv/mSg8vmL24/tGf33uWllsBACMnMRH41PYkgmYFIAEoEIYSQUkdh
+mYQu1waEknGkoyAslipBoRAVoziINQRMzto8yZJumnZT6/Nk1cNxzpFzqxXQ3vtubrIOD9bku6/v
+/fSHNlaD/MDLJ5SqbH/PP9l0/hUehSQFDCwA0YF/TfRyb9VBeJAThwzAlM5NPfLi499YObx3orcH
+Nm3d88LMt2977vGnjxEokCgFsXcoYhaOvAUNYCX4QGMcylDGsY4iHRSULhYKpTAM4zguFSKICnFU
+CoKIiKzNvU3SrJVmbZvaJDHeASJblwFQp513O65agMt3Dn/gHSNXnB/Nn9x/dLozvvWWXdd/oja4
+6ayu7m/webW8NaBnYPCEJEAiUzZ/5PC+7x586e6gsTK6eUsWDzzwzPR37tn33N6TZD2ARZCh0ERW
+ADggJWIS0jKGhUoUFYMw1nEpjuMgCkOtCsWoVBjQWoZaAjB7znObdkyaZq2kCZKyLPMGTWK7zeVK
+0e28aP27r+rZtX3YdI8dPnxQFtbtuvbT517wLgxLr8esv1Wh9wACPBhEzYQSAfzS1OTepWf/4sjR
+/XFRja9b3zTquf31x5+bffiJ/Uv1DngEUAo8gEEEwDCKq0rUwqAowzAI4yCOdBiEoYrjuFoIgzAO
+w1AIZa1N8iTPc+dcO8kazbzVsuTzwaq/9uKBay/uXT8aQjY1dWqqlcL5u9635ZKP1Ia3kAABDl+H
+TX+rQk+nq0BXJ7tathJDAMjShbmjT00+/9329PPFCKv9o5nqnV/JH9m78OyeI/sPzrVaKSAASvCR
+lrU4EEFYiOJyUCgHUazDIAyDKA7KxUGtpdICJTiCPKNGs9tupZjXozhfOyYuvmBg2+aewTK1FqcW
+Z6fq3XDztqvPv/SmsY1XAATAANoSZALKZ3N1r8Ln1fKWgJ4hR9BMAghQAiB4AhBggTSIvD7fmH1x
+5ugDJ44+AbYz0DMAqlZvQcLxqZXu4enZQ8dW9r/cWJg3QkqpAqEKUhdUEIdhXIhLcRyrOO7tGShH
+JW8z4HZfH4+NRrXeYKzWrWpVpiyElXpjanqxriubz9t23fi5Fw+PnxcU+oCB2SECsGI8syLh/yk+
+r5a3CPRETHJ1A58ZEMl7FGJ1LCQBCkaT5Gnj+NyJx09MPpGe2uNZV8uDQgcQBhiVmhnW2+7UPFnv
+rRXGIZMSQmmttdbVnrJWIlZUCXmgoioFoLzZba34NFlYmlxpzZSrI0Njl6477/qhdTtLvQMUBwEE
+4AGQWXgPQKzQgX4d0dNbFHpg8MRi1VcDByCAQ2AAykFqJoECGAEYrOkg22T65emTLy0tvLA4/5JJ
+V6KgEIe95EILyjMwaamDIIgCqYQQCJRkc0pKhUDe5Gk76bZMnrK3xZ4tA2Pn9E9sH1h7YbFnIi7U
+QDAweRTgWbIECW6VoRdIArwe//0tCj17QHm67p9eiZ4ZjOCAcXX2tfeQKtAAmr1CSSZPBXB7eb45
+f7y7csR0J1v1482VmTTJs8wQQiCVlIjgyVv0gSUrIlXuGyrXJgrldZWec3p6JoKx8VKphhAoqVbH
+2py+YM8g0CEAgAIHzGAZVPDW9XB+UMf8+ucxvXZ5VdGH8+12brpZ1jCu6W1GziJiIAMKS0EQR4VK
+GJZVUBQyFEIxgPwRzu5907X+Nf7i6xRmeDXFwytHpNPMbsDwSv01nOaE8Kuc6q984XQG4nUNCz+b
+0/675/z/Ia8J+reAEAMBwCtcBAJeaSbAv9nuBQbA1cFNQD+K2d2vT95y5/e/agZDkqfV6XQNEAEQ
+r94LhNXGxtWOYWb80drFs5Qf/TTz/y2n5S2n9f8rbWXh4YcMjjhd7Pt3DA6+2ga9heX/BcWs1Z2F
+cAU2AAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_audi" model="fleet.vehicle.model.brand">
+      	<field name="name">Audi</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAvNUlEQVR4nO19eXhcxZXvqaq79d6S
+urVYu61I8iJvMsYLxoCxjSEBhpAXlkwg2yR5+SaZl5eBhEzmfeR7IXmZGd4wM5kJCRn22CGGeGww
+GNtg42UM3he8SbIsWZK1tFqtXm7frareH2Xd127J8oJ5/uP5/CG3ru6tOvWrs5+6bcQ5h+t0LQhf
+awb+/6Xr0F8zug79NaPr0F8zug79NaPr0F8zug79NaPLhn50HiCu5P50PzDGLvRg7p+ubN4L/TV3
+as75hf50oZHHfMS9crlsj0PoylIqwR/G2P0VISQ4QwghhHKvuLdBzhrEPbmDjDPX6Pvdi+74uQsR
+U49PjuMQQtxhASCPTzGI+MAYEx8uyu2l02VDTynFGOetLXf9uRy7N7hI5V5xf827eUy66D3jDJi7
+33miIFZECBG3CdHJFSm4tI28ArpCqReUy9klwvd/Jx71lFg5IWQ0SxfC8cp4c8XcvZirpqNHGK1t
+l6KsF6UrgV5o32jZz+M47xFhiNx7hAC6F/NuGJPy0BQ85E2XO06urcjd0dybBYLCgueZMneW3AFH
+L+2K6RNJfR43o826EGRJksSVXIuZa5pcIXJ1f/T47p8cxwEAd8y8EcZkTJA7grsZMJaphAtocO4s
+tm3LsnylmJ2jy4Z+TGtOKdV1PZVKJRKJoaEhXdcdxxEYeTyegoKCsrKySCSiKIq4P9cbCyMDAJlM
+Jh6Pi8dTqVQ2m2WMybLs8/k8Hk9FRUVRUZGmaZCDl+sqxcVMJiN4GB4ezmQypmlSSjnnPp8vHA5H
+o9Gqqqo85nPlmjGWzWaTyeTQ0FAikdB1nVJqmiZjzB2hpKTE4/F8QtCvEHoXOwDAGDuOE4vF+vr6
+2trabNt2HEfXdQHB4OBgNps1DCOTyciyPHny5JtvvnnWrFmhUCjX4DDG4vF4R0dHb2+vruuGYYhH
+0ul0MpkcHh7OZrOUUsbYlClTFi1aNHPmzIKCApcBzjmldHh4+MyZM11dXel02rZt27YTiUQ6nRaD
+CDYkSaqoqLj99ttnzZoViUTyLHg8Hu/q6jpz5kw6naaUZrNZsf3Dw8OCB8MwMMaTJk266aab5syZ
+E4lEPi3ohWRdSB8BACEUj8dbW1styxLqzzlPJpPxeNxFXPwcGhrq6+s7e/asZVkTJ078yle+cuut
+t/p8PsZYMpk8fvy4aZpCnC3LcsES6DuOk0ql4vH44OBgV1eXYRi1tbVf/vKX77jjDq/XCwDxePzU
+qVOZTMbj8TiOI0lSLBZLpVKmaQ4PDxuG4TiO2MJYLNbR0WHbdm1t7ec///kVK1YUFBRYlmWaZltb
+WzqdRgipqmpZViKRSCaTlmUlk0kh+0NDQ6lUanh4uLW1NZvNTpw48aGHHlqyZEkkEsk1PpcSa1wc
++jwSg+befPToUcMwSktLfT5fOp3u6enZsWPHwYMHBwcHk8mkYEiSJFVVg8FgTU0NpfTEiRNHjhxB
+CC1duvQHP/iBoih9fX2lpaXBYDCdTnd2du7evfvIkSM9PT3JZFKSJGGUg8FgMBicMGECQujQoUPt
+7e0AcMstt3z7298uKioaGBgoLCwsLi5OJBJnz57dvn37gQMHYrFYIpGQJMm2bYxxIBAoLCyMRCLB
+YHD//v1Hjx6llC5fvvy73/2u3++Px+OBQCAajeq63tnZuW/fvv3793d3d4uNl2WZUhoIBMLhcHFx
+saZpx48fP3TokCRJCxcu/M53vtPc3Aznm76rAL2AO9f1CbEyDOPjjz/2eDz19fWSJO3cufNPf/rT
+rl27enp6JEmqrq4uLi72eDyc83Q6LcyR4zjieiAQEBtwyy23PPHEE1OnTsUY79ixY/PmzVu2bGlr
+a/P5fJWVldFoVFVVzrllWYODgx0dHZxzMYLP52ttbT148OBNN9305JNPihF27969du3a3bt3t7a2
+KopSWloq5gKAbDbb39/f1dWFMS4rK6usrNQ07fTp0wcOHGhqanryySdnzJjh9XoPHjy4Zs2aDz74
+oK2tTdO00tLSaDRaVFRk27YwXB0dHaZpVlZWlpaWRiKRkydPHjx4sLa29gc/+MG999472jZclKRx
+/jY6A5IkKZlMHj16tLS0tLq62jCM3/72ty+//HIikaipqfna1762bNmyhoYGgZp4xDTN/fv3v/32
+2wcOHNixY0dNTc3UqVN9Pt/AwEBZWZlt26tWrXr++efPnj1bX1//9a9//c4776ytrQ0EAq4fHh4e
+bm9v37Bhw7Zt2z766KOioqK5c+eGQqG+vr7KykrbtleuXPnCCy/09vZWV1c/8sgjy5cvnzJlinCG
+juMghHRdP3r06ObNm3ft2rVly5aysrLm5mZN03p7eyORiCzLv//971988cWWlpbGxsZHH3309ttv
+b2xsDAQCGGOMsQgijh07tnXr1i1btuzduzcQCCxevLisrGz37t3f//73Y7HY1772NREUXCLuML7U
+5waLQvaFvJeWlpaXl3d1df3jP/7j1q1bq6urH3zwwdtvv13wOmZmCwC9vb2vv/76c8895zhOfX39
+vHnz7rzzzjVr1qxfv76ysvKuu+763Oc+V1BQkDtdHg+Dg4OrVq1atWpVX1/f3Llzp0yZct999732
+2mtbtmwpLi5eunTp3XffHY1G4QKZB2NsaGhozZo1v/nNbxKJxOTJk2fOnHnbbbft2bNn3bp1BQUF
+995774oVK4QHduP9vGxjaGho7dq1L7zwwunTpxcsWFBSUvL2229blvXTn/704YcfHh0cXyH0LnZi
+/aZptra2+ny+mpqajo6On/3sZ4cPH/7sZz/74IMPVlZW5m746JjaddqbNm06e/ZsSUmJ1+vdtm3b
+unXrbNv+m7/5mz/7sz8TfIs7R4ewnHNheTdu3Njd3V1SUlJUVLR169bf//73CKEnnnji/vvvHzMj
+zUvZKKXvv/9+e3t7dXW1z+fbv3//yy+/nE6nf/SjH33pS18SFjV3+3MZoJQKD3Tq1Klnnnlm7dq1
+s2bNqq+vX7t2bSAQeOqpp5YuXXqJuI8HvTslpVQkQZ2dnfF4fObMmX19fU899dSHH3748MMPf/3r
+XxeqPWZeI8JqSZJE/N7T02MYxqRJkwDg8ccf7+3tJYRs37590aJFf/d3f1dUVOR68jGzG855b2/v
+0NDQlClTGGN/+7d/29PTwznfvHnzbbfd9swzz4RCIRe73EzV5YoxNjAwEI/HJ0+e7DjOk08+KUbY
+tm3bzJkzn3766crKSsaYgHhMNtwPpmn+/d///cqVK5ubmwsKCv74xz82Nzf/6le/qqysvEToL1iI
+cIWFEIIxTiaT/f39kyZN0nX95Zdf3rNnzwMPPCBwFyF2XlVP7AQhROCOEHIcJx6Pl5WVcc5//etf
+b9++vbe3d8KECdXV1e+8887q1avdSJ+PKvUITizL6unpqampsW372Wef3bRpU1dXV21t7ezZszdv
+3vzCCy+42ZmrOnm1F9u2u7q6ysvLLct69dVX33///dOnT0ej0WnTpn3wwQfvvPOOkDOhwXm4i9Fg
+JJ1WVfXxxx//4he/ePLkyWAwOG/evF27dj3//POXiPt40POROqpANhaLFRQUBAKBbdu2rV27dvbs
+2Y8++qiqqnB+rTUXsjwx6e7uDoVCfr9/165d69atmz59emNjY2dn56JFi3w+37p16wYGBsRQo4vA
+4mJ3d7fP53MtVWNjYzQabW1tbWxs1DRt5cqVIu50azt5uwgAQ0ND4XDY5/MdOXLkD3/4Q0NDQ2Vl
+ZX9//w033FBWVvbSSy+1tbW5EgDnW040Qq5FkiTpG9/4xrRp044ePdrQ0FBaWvrmm28ePXrUlRX3
+55imZTypZ4wJ8RHZXWVlpWmab775pt/vf+CBB8Lh8JgYjR6Hc57JZBKJRFFRUX9//+rVq7PZ7Le/
+/e377rvPNE1Jkpqbm0V0OKa8CzJN07bt8vJy27bXrFmTTqcfffTRb33rW6ZpKooya9as7u7ut956
+yzXowsTlekvLsgYGBoqKijjngodHHnnkm9/8pige1NXVtbW1rV271nEcIXDjR4pCC0tLS7/yla+I
+9GXBggWdnZ1vvPGGbdv/F1+MR6/lItCLx1yBNU2TELJ169Z9+/bNnTt34cKFYm1CQ8cZRGx7JpPh
+nAcCgSNHjuzYsWP27NkzZ86cN29ec3NzLBarq6sLh8PvvPNOLtOC3M0QaWcgEDh06NCBAwduvPHG
+xYsXL1y4cOrUqdlsdvr06V6v9+23347FYjBi/fIYi8fjqVQqGAzu3Llzx44dTU1NN9544/z58+fM
+mZPNZm+44YZAILBz585kMgkXUOU8cBRFcRxn9uzZc+bMGRoaKioqKigo2LJli+DBlUvXUl0q9JRS
+GNmu/v5+r9c7ODi4ceNGzvny5cthpGdyURaFGKZSKb/fn0qltm7dKknS3Xff7TiOx+NZtGiRLMtl
+ZWX19fUnT55saWnJQ9yls2fPUkpTqdSbb75pWdaSJUvEyIsWLRJ1iPLy8tbW1ra2NtfQiwdd2c9k
+MoFAQNf1LVu2JJPJJUuWCNOxYMECUWKrqalpbW09cuSI673GWZew+AghTdOWLVtGCCkoKKiqqurp
+6Tl58qT4q1uYuzypF3GV0Dvhvnp7e9va2urr65ubm3ODMHHDONDbtn327FkAOHny5O7du6urq6dN
+myaitIqKCp/PJ0lSJBIxDOPEiRN50LveXqSjp0+f3r9//4QJE6ZMmSJua2xsrKiowBhPmDBB1/XW
+1lbXNOeywTk3DENV1b6+vo6OjoqKigULFogtqaysLCgooJRWVFTEYrEDBw64ezYO9GL5IhquqqqK
+RCKRSGTatGmZTOb48eNulDXOUOPJrNguwzAAIJ1O9/X1DQwMNDQ0yLLsBhLClI8v++l0enBw0DCM
+06dP9/f3V1dXh0IhABCZfUlJiSRJ0WjUtu19+/aNKXGO44h46cyZM/F4fNasWSKGwxgXFxdXVlb6
+/f7GxkZVVQX0uYMIDRBluGQy2draKrLWaDQqTEFBQUF5ebksy+JnR0eH0PjxFyWeFaofCoUqKioy
+mUxpaamqqp2dnTASHMKIebgM6F3nbppmJpMRPiqTyVRUVAj77u7khWyZS4wxx3FM0+zv7zdNU2Dt
+olNYWKgoSjgcVhQlFotZlgXnB3Ywkh9ks9nBwUFd1ysqKoQyAQAhxOPxeL1ekSINDAy4cOfKWjab
+HRoaymQy3d3dg4ODpaWlbpPZ5/NNnDiREBIIBFRVFVNctKqYa0k45yUlJaqqqqoq6hO6rrtLuJDh
+umANx42xKKXJZFJV1YGBAVHDc02N2MyLps4iqBdVXMdxQqGQy7TwFgihaDQqNMyyLEVRRotJJpMB
+gGQyiTH2+XyUUlmWBYeFhYWcc13XRStGGEMxhTD0CKFMJjM4OCjL8vDwMELI6/UKWyFui0Qig4OD
+lFLhOS+xCpZbVxf1UbENokvj9XrdJvvoXjyMI/Uu06L7k0gkRCfEbXKOecRjzHFcfbdtm3PuFtdg
+xGQVFhYSQlRVJYQIAc/dNjF+NpsVXSdd1/1+fy6smqZpmubz+cTjubPnip4o3ItGirvxwmASQvx+
+v6IoeZWD8WU/N+rXNC0UCmmalusjXYguz+C4sREhhBCi67qqqkJ4hSrAiIMdX0bE2izLSqVSjDHR
+P3KTHRERi6aHsA+yLI8hIBhzzoeHh23bliRJJF+5He1gMCiES1EU15rlQk8IcRzHMAxXFETWAiP6
+7fV6hbaJAv2lCL6rN+Kz1+v1er2yLIstdG8TM14G9C73kiSJ5pGmaRjjvr4+4UDc2s74LCKExM4l
+k0lFUTjnbuBMKbVt2+fzlZSUWJbFGBMWf/SAhBDTNEW3VvSMIOcomW3boVDItm3GmKZpeW5fLESI
+5NDQkAAlFou5m5dOp+PxeGFhodgbIf5orOMhFyLHcSilhYWFlmVZllVYWCj0ko97amo8qXcFSpbl
+eDxu23YgEDh58mRuhia6puNzpmmaJEmJREJIxOnTp4UfE4CGQqFIJJJIJDjn5eXluUcNIKeeIcty
+f3+/z+dTVfXUqVOiEM85N01T9KxPnTqVTqcnTJiQN7sQakVRCgoKUqlUOBwuKioS4b/gPJvNWpZV
+VFQkjGo0GhXdyvEp19qIllxxcXEqlRJBqlt9y6sGnofwOKO7Eu33+/v6+izLCgQCx48fF31LdwMu
+mlV5PJ7q6upEIqFpWn19/ZEjR2KxmBg5FosVFhZKktTe3u7z+ebNm3ehAk5xcbFQuFAotHPnzpaW
+FqHsfX19fr9fkqSWlhZVVevr63Mfd8Nf8aBQuIaGho8//vjw4cNuqlVTUxMMBs+cOeP1euvq6tzM
+IM9z5JKbcADA8PBwUVGRLMvt7e2KolRXV7t+YpwRLpLNitHLysrS6XQ2m/3MZz7T0tLy7rvvKoqS
+60lE8jYOTZw4Udf1bDY7ZcqUjo6O7du3iylEGaSvr6+rq6ukpKSiomLMFQJAXV2dpmm6rs+fPz+R
+SOzcuRNjbBjG0NCQaMx2dHREo9GamhoRtORunrAtkUgknU6fPXs2EAj09vZu3bpVrE7XdbHA48eP
+FxcXT5s2TRhxuITQXtiGnp6esrKyRCKxf/9+v98/ceJEl+1ch3Sp0IvpRfBbX19fWlra3d1dW1sb
+CoVE9coND+D8A0mjiVIaiUSKiora29s9Hk8kElm5cqU4dQMAqqpu3bq1o6OjsbGxvLw8D3H31/Ly
+8mg02tLSUlBQEA6H33rrrVgsZppmMBgU1dC+vr6pU6cKg+N6tlyTPWHChMrKytOnT0+YMGHixIkb
+Nmzo6+sTzj8YDH7wwQe9vb0zZ84U7YQx2RgNPUJIxKwej2fv3r19fX2TJ0+ura2FEaUZZ/MuYnDE
+BgQCgVmzZomDAtOnT9+xY8fatWtzizzjBGHCphcWFk6fPl1kBosWLTp8+PCrr746MDBQUlISi8U2
+bdoUiURWrFgx5tEzQYqiTJ48OZFI9Pb2zpgx46OPPnrppZc6Ozuj0eiZM2fWrVvn8XiWLVsmuiVC
+zHNzWtu2g8Hg3Llzk8mkaZqzZ88+fPjw6tWrW1paKisrBwYG3n77bULI3Llz/X6/GOGiWRXGWLQQ
+qqqqhoeHN2zYgDGeP39+UVGRMAN45Kja5QWXMKImgvVZs2YVFhYeP368qqqquLj4n//5n91S12is
+8x4XH26++eaSkpLDhw9Ho9HS0tJXX32Vcx4Oh1euXNnW1tbc3Dx//vy81eZF1k1NTSUlJS0tLdXV
+1XV1datXr9Y0LRwOv/fee+3t7VOmTJk7dy7kpHiur3Ib1tOnT6+srPzwww8LCgrq6up+97vfaZrm
+9/s3bdp0/PjxuXPnig5fnr9xP+QZbsdxurq6VFUNhUJvvfXW3r17p0yZ8tnPflY0uVxtu1DKOV4h
+wW30AEBZWdnSpUtjsdiZM2duueWWeDz+05/+9NSpUzDiytwHc82cG59wzoPB4E033RSLxQ4dOjR3
+7tyqqqpJkyYdOHBg06ZNwWBw6dKlHo8HjTSDRODk5nRiHNE9z2Qyx44dmzx5cmlpaWlp6ccff/zm
+m29GIpH777+/pKQklxkXMoyxyFELCgqWL1/OOT9+/Pj06dOLi4u9Xu+ZM2f+8Ic/aJp27733ijpa
+bgjHRw7KwUhJ0d2Dzs7OZDJZX19/7Nix9evXuyO4R8bzALkM6N0NENwvXbp0/vz5+/btGxgYuPPO
+O3fu3PnYY4+1tLTk1nNynTPkiLwY4d577128ePHRo0dPnTp10003tbW1Pffcc0NDQ1/+8peXLVvm
+brNIBXJ3DkY8+YoVK26++eaDBw92dnbedtttp0+f/rd/+7f+/v777rtv2bJlkBPyupAJlkRpgTF2
+xx13LFiw4ODBgydPnlyyZMnAwMDTTz+dSqXuvvvuW2+9FUaE1A1ec+uDufsqIr2mpqZYLPa73/3u
+xIkTK1asENXjXNzGoQu6x9xeHQCITOGrX/1qS0vLzp07m5ubly5dum3btm9961tPPPHEwoULRTlT
+WFi3ROOOIJat6/ry5csnTZpECJkwYcKaNWv27t0rFplOp0U50122W/YTp7okSRLd3SVLllRWVmKM
+o9Hoxo0bxQiqqgq4xVOujruxr9tdGBwcXL58uTi1Go1Gd+3adeDAgXQ6HQgETNOUZVkY+ty2OB/p
+LYuLfX19w8PDlmU1NTUNDw8/88wzO3funD9//kMPPeT3+y+l1n+Ot4s6E3b+uZpt27Y99thjbj/z
+vffesyxr8eLFX/3qVxsbG4PBYN6zosSYTCa7u7sxxnV1dbIsx2Kxn/zkJwMDA9XV1fv37+/t7V2y
+ZMkjjzwyc+ZMt3aWO69pmrqunzlzhjFWXV1dWFjY1dX1y1/+srOzs6qqat++ffF4fOHChQ8//PC8
+efMkSXJNbW6dI5FIdHd327Y9ceLEYDA4MDDwi1/8orW1ta6ubs+ePf39/QsXLnzooYfmz58vzoO6
+JtdlI5PJnDp1KpvN1tTUlJSUtLe3P/vssx988EFVVdWPf/zjpqamvHM44+RTF4Genf9ilPvrtm3b
+fvjDH3Z0dDQ1NU2dOvXkyZPt7e3hcHjatGnTp0+fOnVqdXW1qqqCe5F5VlVV+f3+SCRCKX333Xdf
+e+21lpYWceJs+vTp3d3dBw4cKCwsnDFjxtSpU5uamqqqqkQpSvQJdF0vKiqqqKgQDeHVq1evXbv2
+1KlTvb29EydOnDlzZldX1549e4qKimbNmjV9+vS6ujpxCE5RlEwm09nZKY6HFhQUlJSUAMCGDRv+
+4z/+Y+/evYODg1VVVTfccENPT8+ePXvEKmbNmjV58uT6+npRfbQsq6OjwzCMcDhcVlZWVlYmVrFq
+1aqWlpa6urrvfe97s2fPzjMyubiPWZO41CNQri6LzPDjjz/++c9/vnnz5vLy8hkzZoTD4WQyKWqT
+kUikrKwsHA4HAgGfzydiidLSUsbYvn37Xn/99UOHDgHAkiVL+vv7hYdsamoKBALieKUo4RYWFobD
+4VAo5PV6I5FIVVVVbW2tYRj79+9/6623du/eDQALFizo7e3dtGlTNBqdMmVKaWmpZVnd3d2SJAmM
+vF5vKBQKBoMFBQW1tbWiyr9nz561a9fu37/fNM3Fixcnk8n169d7PJ7Zs2eLGlxXVxchJBwOl5aW
++v3+goICv99fWFhYW1srkoZDhw6tX7/+ww8/NE1z/vz5Qt1zUyc86l2Xy4ZeUN6hMFcNOzs7V65c
++cYbb5w5c6a6urqhoUHUSXw+nyzLfr9foC/Lsq7r7e3tJ0+e/PDDDwkhn/nMZ+66667777/ftu1/
+//d/f+ONN8RZMNFmCofDqqr6/X6v1ysGEdW37u7ugwcPHjx40DCMmTNn3n777ffccw8AvPbaay+/
+/HJnZ2d5eXlDQ4PP5wsGg16vV1XVQCAgEi5FUWzbPn369JEjR/bt22dZVkNDw5133vmFL3wBAF58
+8cXXX3/9xIkTEydOFMc9Ra1N1IH9fr/P5/P5fCKlOHbs2N69ezOZTENDwx133HHPPfdMmDBhnGBm
+HJtz5a82CI96+PDhP/7xjxs3bhwcHOScC7wURRHFP1E8EG9oqKra0NBw991333XXXTU1Na4gHDt2
+7LXXXtuwYUNvby/n3DdCwl6bpum+oSA613feeef9999fXV3tOoNjx46tXr16w4YNwp34fD5N08T+
+ifq+aZpDQ0PpdFpRlMbGxuXLl99zzz11dXWuPHV0dLzyyisbNmw4c+aMW8cWx9MZY+5Z+0wmoyjK
+pEmTbrnllgcffLCmpkZUcC9avh2TrgT6vJ00TTMej2/ZsuWjjz46fPhwKpWyLMswDBGWeDyeUCjU
+1NR06623zpkzp6SkBJ1/cBwAKKUDAwM7dux47733Tp06JWByVVhYrYaGhltvvXXhwoXiQCucr8W2
+bcdisf3792/YsOHw4cOZTCaTyYiytujABIPB2bNnL1y4cP78+ZFIJLen70YvHR0dBw4c2Lp1qxhB
+13XLssQqVFX1+XzTpk1bvHhxc3NzbW3tmCdbL73OfCXQ526y+1lMaRhGPB4XrxWIfpZom5WXlxcV
+FY2Oc0czallWX1/f4OBgIpEQ8bgsy6LMW1ZW5vr8PA8mSv8CCMuyYrFYLBYT77QwxoQRi0ajBQUF
+ouonMiwRv+aaUBgpvAwODvb09CQSCbe3FwwGi4uLo9GoLMv8/DZWbvh3WUhehbfF3fgnN+9wmctt
+zLvnGMQg7mbklgnHbGPynFN8uSu8kDcT8u5ulZscjB6BjToVmwuia1dzo4zcslXeHny6Uu9yMz5Y
+eezyC59Yz9XcXNbzfFfeO9159gpGsvxx0si8EBnO3yq3p+pWL8Zc1Ogljx+8j0NXaOtH77zLnNuh
+h1Env12O3aXmqo4rm+PMmzvaOCKWt9mjH7l0W+Hat7ybXdzGnOhS6ArfFs/jQxj9XFzy/P7o5eWu
+Ife23JXA+a2G0XrjqmCuILun40cj5Xr4XKG50KsgeVBetHlyWa+UwBUbHLiAcczTg9HmJU/c3Jvz
+FjamYuVm1zCq85k3Vx5XY2aVY95zoQWOvoGPvOaHRipFlyX4l6Eg5x4YdbYkdzF5QCOEEFgOMLCZ
+BQ4HsBliGIMDYAND3EI2B7AoYMQxUArAATgAABKfGHCGkAPAGXDAgBBwioABQueOmwrJ4YABI4aA
+AnBgHBBH4IDjMAsY4jYwmwIgjmwAsAEc0LkFiDrgAHcATEAIGAAHLDjgFCEOwAxgFDHggDhwAAeA
+nb9wEcjlYfKpQH+5ZIEqmUBlULhELapwcAA4grQMxALMJQBQOABCDiaEAWIccUAAHDgghhEAMA4O
+AiAcEGWAEEcIKJMcQBwcjBwACzGKgRNghHMEHIGFGUggYYwBO0AAZAoO4zYGAOykJNMLHCgmXGKO
+BFwGAAsoRcAIAgQcEYpIFkDjWGIYOABCjDPCucQALtKKviT6pF9PMT5xzpO2RV9Z4zl5mioyliVL
+sW3bVuWQ+pW71Wj5OSHHjsFsmXiIDVx2GAAHjgFjQAAAjAMg0WRDwBFnCCEOmAFQAMVmQDAABYw4
+AGUUIY4RBpAMMAGQBpJp2Zn398obdsgFxADZB1Ka6mok6PvS51P+wgAHJnMMiAFHgBAfQRaDmB8Y
+A4QAI46AAgAwAC7BZZj1MWm8dvZVoRCHXtAz//SCYllZaigI65j5qQK6SZ/8jkJlCQEg6hCiMQAC
+yOYEOBAJMAAXSskBIQnAAY4AJI6AgxBEBcCRMQIAIBw4B8BY5A6ccdCIzIBCNos8HrlQSW79QNu3
+2wAVgcKAxwhiPXH1qb8GirPAfMKOIOCMgXRu0zkHhACJhEtMAwwBAB/ZlU9An7rB4Yoa/upD0jfv
+B0QQyBoPq6SQAST/7TW26SMqAQfmACiAwWaAgcoylRUHY5OjLOIOAgcjigBRJnMucSTcAOEgMQaU
+SRwwBeKAxBACBIABMADBAIhjYnKk+WSOlebphb/+61RDHSGmrvCUR2KYxX69ylz1pwwxfQ6hiAtz
+j0aUDTHAFJBJgbn+jCEAoFz8+wnpU4c+a4Ocsv1ZTB3brwRsyYdsWZI1MhCzf/Y8OdsDhDEgioNA
+RhwAA3CHSQxUQB6OJA6YMQKgE0aBAQBgBAQDAEfcIuAg4IiJdSAAG8BinAEAEfIrcQTYBBkr+Iab
+yv/5l3ZFDbOwaioetRANJfS//a2262NLAso5R0Axo4g5QClQhilIzFKRhZkNlDIbAQDHDsEmuQq4
+ferQgwLG6vWpZ1eaCssozCFmxmtT7Dgq2Fu2Dj/zErIoAwmAAEYAYANwAoAZcAbMBrA5MwFMLweK
+cAY5AAAcDO4whBTGACyMKFAHLINwJgFgjBAGHSgjmBIA5pgaHaY6srL27bOKf/6YUVWWlhzVRpIa
+MFpOxh5/mvb1KYjYAAbiDoDMmWQ7mDMOtgIUMxsBJ5gAQ8CBUPRJzTwA/D9ws/FTHbDiL3nbYUOV
+kS1zx1EJ5gBJzSnMsEw4Etj4G3XOTI0DAsYBUcQkymEgGd/3ceZMdyFRFAaOZUkTa+XbZ+uK7OUA
+HAwM6lByeP0unhrySopt07RKwjMatGl1oEqUM8KlDKZ4IE7+8xA9dkJv6yADuqR4ksWldN929aMj
+2CGOjB2SdiwS/cojnv/9Q8cnAUZKKpvdeZi29WACtoxVnTklYf/CJigtsjAQwEQA9olNztVzswyA
+OoYMEiUSQjq2vTYgLEv/8zm95QTzMNVhloOUpsmOoUNLZ8jw2qrEE4P4h//gefVf9OKQ1wEq2wQw
+wxK1M/Qnv9AOHDKZGgcHEUe7447IimfVc5NxjTtGbDDzVz/BsUEbqI6sIAf9Rz/QmqY4jpOSJJQY
+8L6yMb7ubb59n5kdVgAjhBinBGFOPGmiyQR7TKriooykp59/DhoLpR/8peoABDz6L//V2LLRBk+A
+kQwYSs1Esu63ntKIzEXsZSP4pN++BVfR4HDEqSxpFEuEAwMOkiGj5L/+gb3wJ5D9BvMqFKTCIP7N
+T/x/9xgjMkhG1tFBIvH3/zP5qxcoAoaxMDoIAZIlUJQMZxkZIdVHKOKcM87ZuXwLieQNY8yAOR7Z
+hz0mJtij2hxAogUfntC/8N3h7z/FNm7xZW3NX+AARhxzAOAEHCozm1Ej60NJ25C44qDQ2f/1YnrD
+DlMC6jjg9TBMEJEcNDITQnDuDOzVAuzqST1DHHPEMMYWcyRKgBgtrdavXmKQZGqJlpVsZqpfukOe
+NwcSad/nbu1b88ewFsUOs1lq4HevVNw4iy+/GXMJGEUcbMo4kQgiHGFOsAwgSRLG+NwpH84BgfgW
+AAeIwbmMiW0jj6LYKvD2luEf/ZP0/laTYOLVUhTZaYeEyuQptWRWlaoF4exAZs8hqaWLODpWfcPU
+kSStLDaQeWmtcvMMpPk5YMQxAyTJkm2bVwuiPLpq0CPggABzABlzAGKb9Bev0BPHuE+zzQGVEqid
+LH/rAQIAfpU88Y3ozj20PwaylxPN29OV/peXgjfO0COBAEbAAANijCkMY4fYDAhWLjQvR1hBxMRI
+AcyAY2Cpl9/S33+faCFDYn4LHIv5br3J/6XP8aU3SOWlDiZeR2dtLXTDR73/uipwop14JYezNGbp
+N97V7l4Y/C93IwoKBVORED93iAiNHPuGq+cZr5rBwYwgbgO3E4gjBOlX/sN+ZR3CoOoaYdgKBJQf
+fZ3VfUYG0DhR5kzH//XBJGCGZSwFZaylN29J/8O/I3AyiHIECmAJkA2MEAkB2PzcOxTcNTgjBWrO
+GUYSY1wGIvk8uKvPePkdH4KAIWOmgoUDzXPU5x9Tvnq3t7xc4UQFAKpJDZPD3/1Gzd//GFVWaroj
+286wF4UN3V7/n8BBlTUGHBE5A84VFOIvFbGrNhIC5tiAUQBQ5uCRzFO/o1YaJNUEBXF/aPFC+Ys3
++yWMTRPAMhGXv3aH/+bZ1Exzji3V77dN/i+ryJbdEiADgeM4MuCshDIKOBhszsQ7VlgwzDkHzhAg
+hDAgmzqqzSmAgxmc7pdae7PYcbDh1XWsBsgPHwhUTyIWA8zSxDQBQKZ+KjkAeMVtgaU3G0AQVr22
+4sjUaesA0zbAdggiHFvKGF81e7Xo6kU4yOGyFwBIMkn/4UXS2s69GnUQkhG3OR2KDz/+j7qFqG1n
+vShsoqEA07JZVZIMK0M8WgrLKNNvPPXbCVW1dOKErMTAsQlnJrU1JGNCkJvF5Cg9E+knBy+Rhqih
+2AalVPP4szbTFYa5hgi2KopsAIVIQBkn4HWAYZsTpHCcJkDCXhujjIyKDc8gHQwqmGOwMUOIKwa1
+tav2vd2j6apBT4ESJg1hoK+/Das3IqBZUBSEbZRVNDO7a6d/x55hYEHEHG7YoAVAAiDJIGYOVS3F
+L/lTOKNs3NG3alPJX/8596nYYQGKGSGYI51a2WzWQx2HEAlEJ+vcazo2QSGKTerYmBZ6vDga0glS
+s8QiGnc4MXTy7kFjXrMCEmM4wFVAgLnmADMocDuVPHy4kGUzJspIAY2rSshnIy4rxHJMLxBKzytR
+cs7RJ4/nR+jKDU6eJhJTtTFILS3mT1/gWd30YsmxZY4kwwADYaamgUuADC4jCJhAsuAQwGqSajrK
+yoYBjpf5GWjSP/0i859HPLgwXqYyMAwCFuJcJnxfBxw8qANQCmCBxbmxex+JOR7qG0amTLIe5lWC
+heaUYm3RDAQpwIzKlgPp1K//AM+vtc0Uw8AlyBAAghGAJ9Zl/vifzO3HLfAxBQHqQ8wDcxczBSEr
+iQEN+DMYOOYWcQgCBzgAQ4xSBjK/Gspw2VLvNmvQ+a83ZhTmmDH9h09LZzoZ4bLFvKoW17OemrJz
+HVfG+cg3ZXDOQWJZi3uwZjp2qHuAS8xwdOJRed8g/vlz2Zf/R7DxBli/m5s6V4J+K5Ds7VD/+zPS
+X/0Xe/rkdCKl79hn/+9VHmfYIT6QKTMcKRjIlEaCEEDfefDs9l2QMhlBOBiAs6fN7z3F/rRZvvN2
+3DhZK/DpgwPpj/aRd3aw7Qd91KIeLzIpZZnQnGmhP18BtqSbkkNCXt2jMpLFWa6oBBEJiSo252Aj
+jD65wbhqBsfH8fDKTfyN9xXAuifAOXUyTF5xm+fn35MkiRAioIeR5o4jGX5HzgL3J1I9f/W0vPtI
+QEWmbVu+gqF3/hR5cZr5l5+3123xthxJcktXiQ9pwx985Nv1sVVd5uiGembAhDT3B3SeBYNanKAv
+LgvMnZ4B0JfMVJ78S/bELyWDc4NZmo9Yhr1ug71+q1oS9UhaNqM7yRSzTe6RseKxU0kPkExxZfB/
+fJlXFAAFy6sSatuEelRJNZnDHIyog4AAIM4AOIKrYHg+EfS5PdjUod36PzxHyRCiHpTNInAsX0H4
+h1/wTJlMyBhJIGeAKDAFEDjF37+/8xtHcHqQypxkfBLKZp56Rrl5hvKrx+hf/Ew7fdIDhAKXCTbM
+Idw6zKiDsESIZKbTfmBZ4gt88R7rf32PerVgxg6qheZ/+wvb4sa//ol1tniBqkBsLCOZ0562JFAZ
+JA2rWVlChhnKGhQrbGH9pP/2XfLZm4Y5EELJUMIBm+H0sBUPgE2dtGKb5BzbyuU0Acejy4Z+zG41
+pZT/cUcgRjOTGg3uYYiqzCTLFnlvnA+SxRESrQVXVDhwm8gKgN8CkCTp88uKdhyS1m23JYqwJjtZ
+lrWdZ99Vnv2RZ/Uvh59/1frgmNob9wwkTOCIOgAcMayAYlZHoLI0+rkl6je/qIRCEuXgI8BBdgA9
+/g19URNZ+4G29aDTOcCHkyiTQigoK4rumAiYJxSGaIFVVSnffmPwgSV0Qg0DCAEwB9iEMjpxUljS
+TGzalOGKSokTsBkARhgAwIarUMS58tNnedBbrV2SmUWqbBLZwylLDbPKKlYS8XJxv9g293kwsUNA
+kmxIy6AD96SS/lMDzKG2N4OYByFkMIlU1dpBpoEptQ9ZPb1W3yDui3MVJIQJJUZJGJdHlQmlWmHI
+UGTNQqZCHAANAIMDju1IigPY6RsgPT3OQJ8TS2i6Y1hcCfqIqqiFYaO8iFaVSN4QBqwyMDDTdDBV
+7Jxt83WnTZ9XwsziFuUYpn0GgeJjnCPGgALiBNSxofm0oYfzT1gwxghBHBjiDEwKSAIVgHJwJKpi
+GCuQopACjiSkmYBVzizEMEgMMAMHg6QwyFLHI0lAwZBAswE4OAowABmAU+AEGAdZ9MsRYFPHiuwg
+WeIADlDJIqA4CCQOgBwDbBUAOQrHBLCNGGEMMQmJOEUSpxAAgNlckoEBww5hUhrAbwNIAA4wlSNG
+ERX9HAoAn7x4eeX/dUDeZ4eDxMAiQACIAxkJJAAFcuqr505t8HPC7wBIotQMVGaEAjCuK8TrAIBp
+SEgGiZg2VVVCwSCOBpQz4BhjIMBB9KYBUQoaABAGgJkDjsQxWMhQicaBcQdjACYBB0oAAAgHE4Fq
+ARBmEoa4o4DCGSCMHQQITA6yxDFHZtbhqqQRDgaAxsFCNkGIMGJhpIi++Se2OJ9uq+Q6jUOffoPw
+Ol2ArkN/zeg69NeMrkN/zeg69NeMrkN/zeg69NeMrkN/zeg69NeMrkN/zeg69NeMrkN/zeg69NeM
+rkN/zeg69NeMrkN/zeg69NeMrkN/zeg69NeMrkN/zeg69NeM/g9crnIbRlizugAAAABJRU5ErkJg
+gg==
+
+      	</field>
+      </record>
+      <record id="brand_austin" model="fleet.vehicle.model.brand">
+      	<field name="name">Austin</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAj9UlEQVR4nO18+XNc13Xmuct7rzd0
+N3aQWEiQIAkSJEWCqyiIpEQtpERrsS2akhzbSlKTjDWZZCqVSk1qUjUz/0Bm5tdUpRLP/GLZVmQr
+jjbKoriAJEiAJBYCYKOBRndj6Ubv29vuMj88AKIlUQk9hFCa4CsU6nX369f3fvfec8899zsXSSlh
+DasBvNoF+LeLNepXDWvUrxrWqF81rFG/alijftWwRv2qYY36VcMa9auGNepXDWvUrxrWqF81rFG/
+alijftWwRv2qYY36VcMa9auGNepXDWvUrxrWqF81rFG/alijftWwRv2qYcWp58JkzAIQUnIhBABw
+LhkTzqeOCsi2TecGALbS5QEhQYJRZiBBCuBSSGAMDG4DLCmSLGbb3JIgGPCVK8iKU0+wQikFAIQI
+xhgACEGUYiEAAJw2wJgyxhBCX8coxBIAXB5qWRIhwAgD0OmpaDabBgAQIIRQqUIJ1Q2dAFrBgqzc
+ox0wxpb/wxLXAIAxAAAhxPnvXHC+gr3MgZA24xYgoBTl88ZUOPaLn73zs5++o+tlAAAEjDHLsgCw
+2+Ve0ZLQFX06LJKLKVWdlwghkCAlIARCAMJg21xRCEIEADBecRUiQkAo5lyaBvv000/D4XDvpYuP
+H+1Z39QAggHBCIQEjAAYE5iSlev2K97rHU5hqb8TjMRivwfLYgiAEOJ8JIRYvnnlIIAIoBJQIrHQ
+398/MjRcHQicfeUM0QgQGRq989Zbbw0P3QYASileSYOz4r0eAEzTVlWFEAwSGIPp6aiUkjGm6/qm
+Te2BgBdTDACcS7zypp5LyiwBgIeG72TTGST5rke2K1TcvnH96tWrofDkrp27N23aBBKYzam6gl3h
+66BeURSEACQYBrt9ezAcDmuaxhjLZDKxWOyFF06BBECLdn+lIRGoGjZ1qFQMSmmxmOu7dnlk8NpC
+ZqGzc8fLL77w2PEnQBJm24QoTsFWCF8H9RgD55JglMlkxsbG8vn8unXrGhsbU6nU5OSkZQlKMcJL
+t62gdQUAuDMy43W5R4YHbw7cikQiPi/2eV3r19X+4I0fdHd3u7xB4BwAUUVZ0WLA10K9YExQQkHC
++Oh4IZPx+922kdeLrk1tbefOnZsIje/o2s44k1Iq96+wbdvLnwohHD9VSokk4lwQggEBIMEYwxQh
+QGipakIIIQSlNJ1Of/rpp9l05tbAQG4hq1BNmuXDJ5458/or1bXVBDTLYgDUsJjLRUvlks/nYdyi
+hICUgKgEbNhCUbAAEBIQAglgWMytUpsD50AIIATuJedtqcyEc+74Gp+r0YpTb1mWqroEh2w6Hw6H
+hRB9fX1+v2975yM+nw8AisUiZ4IqdJFK9CW9frlVnGoghJw7pZQgEaEYAGxmK4pCKBVSIIQZYxhj
+jLGUklKaTCZ/8pOfzM3NSS42tXcUavKhsXGfz3fixIm62gYJAgAYY7Mz85qmffjR+zt37uju3kOw
+slQoHIlEWze0RWMJBMRT5a8OqASBXijNZHKc81y2MDMz09TUdGDvDp/PIwRgDEvrmC83pCtOvaqq
+jDFKqK7ruq6HQiHO+auvvjoZjkejUcZYMBgkBC935HuxnPGy3CS2bTtUOm2AMZYcAEAK4SzchATb
+5ppKKf2tpw0MDIRCob1795569rnQ2Pi1q1dLpcKxJ5/Y1rmVc26D0BC9dLE3FArlC9nbt28/9tij
+jrslGMeEXOm9ns3mRobv2jaPzcz19PRAU/WNGzdKpVIyuRCLxYQA0zTdbve6en9n51bnRzHGzhJZ
+SvnFHvV12HoH/f395XI5nU6/9PLpR7q7OSOXLl2ilLa1tQECvaJ7vd7PfWV5BCCEDNPWNEVzuQBA
+AmBCuACMAWGwbItSihGSABhhRdVsISlIjLFlWaqqcs4bGhp+//d//9ChQyDhvfc+iMejWMFPPPk4
+lwJTVQGwDLhy5appGv0D106fPt3R0SElgARMyCcfXxwcHPT7g6Zt1dU2+D3em9dvyF0dN65eSSQW
+vF5vIBCQElJ6JTIRGh4e7uzc6vQihBDnjBAihPhi319x6qWUhBDLElNTUwsLC1LKgwcPCtsWQui6
+3tzc7FgSt9sN9zc4AKBpy4YehBCEYIxBSgDgqqoCgJAghEQEAYBtCaoiAHA+IoR0d3c7Xx8ZmYjH
+44VSsbVtfVtbK0ISAAyLz0WTxWLZNCuBQNWZM991HqKquO/qQG9vbywW8/l8bW0buWn4PZplWf/7
+J3+vKMrvff+1Rx9/LHQn9M4779RWVxdyuYmJCcdZcMaxM3C/1OZ8DUsqJKUcHh5mjM3Pzzc0NDQ1
+NWFFSSaThJD6+noneOCU8os2ZxkCoGI6ER8QCEsEAkAgQAhJEFwKhAARNDJy98NzFyYmp0zTXI5h
+LIcxTNO8dXtIN8xSqXDw4H5/sAoTIgAIIb2Xr1GihibGd+/e3dhYX6lUVBVPhGY+/s25oeHB508/
+9+//6N/VBqpKxVyVW7t1oy+dTb35Jz9+9OhjAHJL55Zt27cqGi1Vyst0O7HCr/CYvw6DI4S4devW
+xMRELpd79Xtn3D6fXiokk0mEUFNT07LfYpqmy+Va/pZTASmlc8ERcay5bthSyryuJ5PJzZs3E0UI
+CZxLoDifr/zm/Kd3Rsb27z+4ua3JGUmUUsaYbdsIIdu2x8dD6XQ6WFtz7ImjVFO4YCaT+YIeDk8V
+i2WPx/PsyacBpMfjSadK7733YSQyuWtX17dOPwdIFguZcx+8X8ovJJOxN//0zYZ1TZxbhFLDMMKR
+cK5YwArevXu3M804pN9vEMPXQD1jLJ3OJpPJXC5XU1PjDPxSqZRMJjnn9fX1mCDbYopGXS7XvQbH
+IV0I4VwQjSCAufmFa9eueb3eTCaTTCY3btwoqMSIYootLkKh0OTk5Px8MhwOFwoFn8+n67rb7Xba
+DACuXLmiVwzbtrdta29sqgcQBKuaqlzv7xUCpqend+7e2t2917ItVVEuX74cj82WKsVvf/slwAKE
+DIdGBbfujN85fqxn775uTdUAcLlcnpiYjMZjGGNE8O7du53fupd0x837HDMP0eAwACakxbkNIACE
+bdsAAFTtHxgyyyUjl+5oWdfYWC8RDIfjiUTC4/G0t7cDgKJQp3wIIcmFE187f2Egma78068//Id/
++AcEthPSHLh2/dy77517+92//Z//69AjXT4NEU4QYItBaqH4i7d+oTFrQxWqthZ+c3msqIPb5Qaw
+AUwAUbHlhxf7FLNUXEh+56WXqea3JOGgWAYfvDbA9ZgiCq+/8goBl0q9/TcGx8bH70bGjh49umXr
+DsvCQ8PTg2Mz49Fk46aOs3/4I02ljAFIXMzCufd7mxtax0ZuPfXk/vXrm77AMP4i7w+XegAAhJDT
+2lIix3CXS/bYndF4PI4p2X/wAOccBMzGZ2zbVlW1qblRcAkITNN03FCEMWPQ29v//j//05VLl3/x
+i5/7fD5KFQRQLOlTU1O11dWRWLSnp2ffvn2AMBAiBdgG+81vztmWEY/Hf/wf/mRbZ+fI7ZuDt4Yc
+eyslBcAfffgBBZkvZrq6tnV27WCCEUQxwKVPrzCLxWZnHu15vGPrFpBgW2JsbCwUCjXU1rz00kuU
+Qi6Xf+edtzHGul557bXXVEUDwJRSKWFw8HahUJidnamtqTt+/Pi/nquHRr0ECQAICMZYSuQ4NgCQ
+nJtPpVLlcrm6rvbQkUdVtwYAuXTGtu2Ojg4AGBkZOf/Jp58NTwSUwvDQ7caGupl4BIQ8fPgwJgQD
+TE2EpyMRm5nFUv7ZZ59W3V4hgDOBEAwN3x4Zuj0zE9/U0b69a0d9S4s0i2Mjty0mOGCByEIqM3L7
+FrataGzyiaePIwQUK0LiSsW+ceOmaXDdtJ49ddKleQDDwM2b4+PjyYX5b3/npcbGxlQq9957vy5X
+itdvXDlz5kxnZ6dTUCllqWTc6O/TXEo4HD569GjH1u2rQD1IvPS0z9ZHts2vXb3Kbcak2NC+0R8M
+AIJ4dC4xP28YRmtr6/Rk9Kc//WlfXx+l1DRNSqkEiETiobvjXdu2jNy+ffTxx9rb2yVg0+AXzn8q
+JU8k5lpamh7Zu4dxhjAmFGezpWtXrqYXFoqF3KuvvioJ7di2vcbvCd0dnY7N2BIsAVf7+pnFEzPx
+mvrg3n17MCE24xThf/rle4LxmWhs2/au3Xu6kYJNk58/fz4ej23ZvLnnyBHLFFeuXJmejiwszHd2
+bnvu+ZMAIARIiaREQ0NDxWK+WMzW1ARPnXoe5ANEAB9er1/Eb03oqVRq5NagruuWZXUfPEA0FQAG
+BgbKuUJzc3MgELh+/frY2NiePXsQQouhAgkXLlzwez2JmWgmOXfs8ccAwBYyOZcKhydrgv5yJX/0
+WI+nykMpFQBcwPvvvx+LTs/Pzezbt3f7zu1IU6qbmhrra41yZXoqTBHMzyZHh0dL+UJqPtVz/Fhd
+QxMAkUKZmpwdHR2VnBFgJ58/bQspEQwMDMzNzdnMfOHF016fNjERDoVC2VxaN4r/8U9/rKrUNE2M
+qbPWvXz5kqYpd0ZHnn/++ea2NuAPsNXz0Kh3dlYdZ9ZpANuSobthyUW5WNTcrj3dezEhEiAaiQT9
+gbq6ulQq9cknn+zevbunpwehxbkhmcqOjY3t2rlj4PrVnkcPbuvcBgAYk8sXe4P+6kqprCj06aef
+lJJLACbg2rVbQ0Mjs7NxJO3vvPwtQgiXQF0e6nIrLmUiNGYb7OqlC7lsOrGQadu09YkTzyCsScCG
+xT/66GOf15tJJVpb6je0byIKmp1Pf/TxuVQ6efLkyaOP98zPzp07d25mZmZ8fPR7Z7/T1rYeYGld
+KiF0N5zL5VLpRFWV9+ixHgAMRFsV6snyHOuULJvNDg8Pq5Tm8/nOzs7q2loBMDc3bxiG1+1eWFg4
+f/68aZrPP/+8pmmwtAa5dKlX07RCNpNNp559+ilAEgDmE6n+6/1+ry8ejx48uH/9hhaqKBaH2flM
+79W+fD5fzOWfOH50184uQBIQLlssNpcolfV4ZCo1Mz05OsRNU0jS2dXd0bGdM7AtuHjhSi5XyGYX
+vB6suvjI6JjFYHBwcHwitGXr1rNnzwDA2//48/HxUCaTOXTowKlTJwGkkIxSauhMSrh48aKq0bm5
+mePHj9bX1zu1/tfjofv1GJZc2mKxOD09DTrjnB84eFDTXCaz0pmMpmlW0eCch0KhN954Y9/+bpCL
+cWDDMC5fuXZwd9fwjavbO7du2/sIgOScXx/o93v9jDHO+XdeftGsVDRPwDCM/v7+2dm5mZmZYDB4
+9pUzVFUBgIN4/9yH2WIJAHndLq+LBH2eXLaiaS6OSKViuz1K/63xO3dGGWOWoW9oqSvl09f7b05G
+IuOjI01NTX/91/8FI/jlO2+P3xkNBtbX1gbffPOPVYUKyTCiQgiXi1oWhMOTlq0DwNZtHYg+MJMP
+j3rJBAiBKQNsAfcievN6vw+5IpVUw4bNuw4dMi2ei87FBu8K0w7Pxgq56Tf/5A9OPPOsaVQkJoqq
+cYDzl6/XIc3Mlaai03/5V39hA6dYKenm+Y8/6e5sP/fRb7Zs3bFuw05CIRRORaZnchlranpU82nf
+PftadctmjgEkxKZy03fmVVkeG7n18gv/uWb9xobm9uhcOuCjd4cvv3eu7vDBg0aluDAfi05PHt6/
+r5AvZrPG3MTF6urqY8eOPffccxjZZqVy5PCBniOHqtwuVVVBVUECBgycYSwAIDwxJQXPZcvtm7bv
+6DogEQjJAAMCiWBx7AvOkZDICeSjz1P9EHs9ZrYQWFIKLkJzufJMfI4JXu1yHTx6xKuo7//6l5ND
+o6xiFHSrWC68/nvfP/HMSQCkuVwAuKLbEuEbfdcaGmrGxkfq6+u7urooVUzLvvDJJU31pnOlfLly
+7MkTlEI6VXn75z/NZfNT0Rhw0d62sbG+vpQv2bZNiLKQjNpWobf30tNPP71v314AsWXr5uno1HQk
+pmla36cfTI3emJ6KJBJzRx/r+aM//kNm2cPDw9jrqampWb9+vRMc1TxV9Z4q27IEcVkIECzSubxv
+zzm3LItZ5q5du2prfIwBpVSCjUARUliWpRBKqbZo0aX84kbjw6ReVVSJgEvgHMZH7yaTKZ/Hh3Q9
+Fhr728nh0TvDde6q5qZmKpkn4Ovu3g8SAGHLYqqqapoyNHSnUCj4gzAVDX//B68rmguBQgkMDt4J
++qsnpyc3bNq6/9ChXK48FZkwyjlul13IlFiJR6Jv/+xntbW1lGJd1+PxaCKRePLpE6++9mpNfQ0g
+sWf/XkRR7+WrkUiknJqZjdwJBoMvPP/MyZMnFa9H8cKBxx7lWHNidxLAsiSlCGOgqksH4ACcA0Lg
+bIUJAM4hn89WVwei07GZmZlodL4q4A0EqizbBkxUBavaYnDbsoWqYiG/RGrx0KhnDCgFJKFSMCuV
+SjadqaqqQhLq/L5QeCxRyGzatLGjbWMpX67k9WDQH6iu4wIApKqqhmG5NPXD99/3+7yzyXh9Y93h
+w0dAUpBw6cKVfCa7YUN7yl312JEjIHEsFpmaDFPEYuFxn8/jDgbT6dT4nREubM5tVSM7d+4488of
+HjzyWJWvannae2TPno4tW+7evTsbHqOqsr1rV3PLBqK5DMtmAtwuDQBsDlICpeAEnMs66LquC8E5
+t23bNM1yuZzJZFKpVKFQ4NmZcjHPBbtyuXdhYaG+vlZI2x+samjc0Nzc3NjYWF9fTxSqKIQDSAwr
+SD3CICXkMuW5+Mz8/HxyflbVcDQahVRi867OU4+cPnT4QCld+OXbv7Isq2vXIy6Pb3kIapr66YWL
+pVLJ5/Wm0ulvv3KmcX0LSJiNJ6/2XmlpXqdXCqqq5vP5Dz74oFzK3x7oSy8kq/zus2deIa7g9PRU
+OrOgaUpra/OmzRtaW5v91dUACuOMEhUAdF1XFM3rrdqzp3vnzt2AESbU5mAD2EQjKpQEYENallUq
+lQzDkFJalpXJZHK5XCwyWqlUisWiYRiU0kAgUFtbW1tVta5tF8a4WNAzueLoyJ2wS5OSEYqYRXw+
+X31jQ+vGDa2trdt37Ojs3CwxKF/wJR+ewSEwE0uMj9yZjcdz6QxHPJ/PLWTm/+js97ofP+yrCwKA
+WTCLhTJw0tLcyiRIJhUFIQnx+MzV3iu2ZZQ5Y6D4q+pAQLFo37495HZr2UwiGo1sbN/af63XtkzG
+LGYZnTu2n37+1O7uvVIQ2z6kahSQYwxACm6ZNtVczi4TALjcXs7BsqWiIKQohbKNsbSY7XKpxZLp
+rPgSkVA2m11YWCiVSpVKpVAoWJaladqWDQ2NLU1NTXsaGxtra2sDgYDiXhQENjY0pFP5SkV3Npld
+Lm/FqDQEqyWCYi4/NHBrbORONBq17RN793Z+kbCHRn00Nnv+o4/D42NuQrw+tz9YFZ/NNrc1Hv3W
+KaDYkLawbKKqPl/QU+bSwlIAUVClYjPLevdXv85kMonZuba2tmCg/sMPzxcKlsflCYXChVx2aPD6
+rt079nRtH8VCSkkU2tW1/fBjR6prasrlssfrJhg5W59CYgRYSKJoms2BEMol6Dp3wkpCSAEomUwZ
+5Uq5XF5Izudy2WwmMzc3Uy6XLbuiKEogEGhpadm5Y3N1dXVzc3NzSwsIvjjDSgmLe8UIAEDY23ft
+OrFQOPfx+Vh0Llcs6LqpqRpmzFvlc3nchVKpbBp374z4vZ6uHZ30C4uth0b9u7/+1fjQSNDjqW2s
+wyBLpWIqnTj90otAqSEtQIqqKRUoMVuAxPls3rSFh2CiKB9/fM7Q9Vhkes+ePeuaGobvxmfnku/8
+47uWaUqwQOjd+x75T3/2ptvd+NTxxxVVRZQQtwaATdtyeatMXlGIIkDYTGJMCQYByDSks4FeKJQM
+w8jnioVCoVQqTU9Hc4loLpcr5LMUuM/jbqirbq4OtO/c0rZr5/r1631+PzhqgkW6mcSLatHPuSgI
+MQD5+BPHdMP+WP8UCC4UchhTF6VYcGYaKsVeX/VsMtF/o2/P3t2PHt73/0q90/aOM2AYFZfLxYXd
+29s7MnT5wP5Hz77ygwuf9N68cZMz5sL+Azv2ccAacoGUCJDi0rAbY6RPDF8793Hdnt1dmWyyWMz3
+Xr1YHQi+8cYbtbX17771f27cSM0n5/1eT3NryxNPnTh4+DBgJBF31foBYFGmDaAqKgAoxAMAnIMU
+YBhQKumZdC6fz4OdTCaTU1NTsVgsmUxmMhmEUCAQaFy3rqGp4dGeQ1u3bm1tbQ0Gg8RZDS0ze++E
+iO4vPkMux2V88uljVUHPBx98MDlZVBQkKGYEVBUb5ZKmKAiMVCJNhPElD/gdjhiVEjgXlGIpJUJS
+ShmNRnWr3LmlMxZL/N3f/v36pqbhoVvbOtp//KdvGoBVRzcqQS8U333nl+HQRLFQKBPvxva2fDbZ
+f+NqbU3wjR/88Njxp0BIwLKwsJDN5RSXVlNX6/J5AYBzjhDinEspMaZOoJwxbtu2BFwqlXO5XC5b
+SKVS8/PJubm5fD6fTkRyuVw2m3W73e3t7Vu2bOno6GhpadnU0aEoiqZpeGnXVArBGFM09Ssr/QUS
+uAAAhDEAMNsOhUKXLl26deuW1+W1LKuqqqpcKU5PT5um/tRTT/3Zn/85oIchgUIIpOQAGCHkDILW
+1g0YY9O0f/XOu263O5GYLZVyO3ZvByo00IQUgJAUwu2v2rFrZ6FQmJ2fK1ilS9N3CRYtzY3ffvGl
+Y08eBymAYMGYr6amqrYWUQoIOOcSASEKAsB4SVDGoVAoZbPZUqkUm47Nz8/PJ+Z0XReCVSqVTCZV
+LBYxwMaNG5977rmurq6tW7dWV1fje6Vty4YbIYSxoj4Y78ukSyE451RRtu/YEQwG29vb+/v6k8nk
+zMyMZRs1NTVHj/acPn36S5/wwNQ7wZbljXYhgBAMAMyED/7542KhFPRX3Z2b9gerjvQ8CpIBAtu0
+iMslhCAY79jZJYRw+7w3bw3WBt2dnR0vvPitpuZmYFxyjhQNq4rN2fLznb6pW6aHaswGR8kzMxuP
+x+OJRKJUKhGBEAIpbFsvZTIpxs3Gupo9u7Y++fTppqamuro6x54IzjljhNJFC3L/3ep/JbjghBBE
+MMFIgkQIrWte37iu6eDBw5OTk+Fw2ONxbdy4cdPmjZrLxRkj9POt+zsYHOEEh6VEGC/WoFg0+q/e
+Ghq6KYElkjPh8PjZ11996eUXGbMp9TlySc45wQQApBCVSsUyDJdLVRRCXSoAGKWKyxsQXEr6GSnc
+dpwTaRjGxEg4kZybnp5OJhO2bWua4nKriqJYOp+bn0mlkh6Pa1vnlu7uR3bu2lHT0CC5hr5MWiKk
+uDfCurzzTh8w/uXEWZfVK47ehFLqBC9ti2EMhFJAQnCOv0xz+btR73gB2PmZTKZ8586doRu3TavM
+hTUZCTFp/83f/A9Vc1NKQWLBOabEqeFnuhQhAUlAwjJNolCMNQBgNtiSayoBAMnB1M27d+/2Xbs2
+PT1tV0zOOSHYH/D5/T6EZLGULxTysXhiy5Ythw4d2Lt377qW9U6dgHOLY1VVHWadH3Wu8X2EMQ86
+CuRiJQRC6N7J2DJtSikhyMkOcy6klIryee/ygQ0OFzbBypICEpLJVHhiamRkVHKzVMgyaaXSide+
+/30JmBKVccCSM8awEIhgQogEsJmNMaZAuABMsKK5BWCTg2FJjxsRRgq5ciQSGbo9OHR7MDI5iQE1
+NDSohHi9Lq/XjTHkMgndKDvSh7/8q79Yt25dQ+M6ALBNxrlUVRUTxUlKQAgtN7Zz/bAyhiRIBAgj
+LKQA9JkrpGmKadoA1BlGnNsA8KUK6gemftFoSGnbPLWQvXs3NBmOZjIZVkz5/O7Q1FRdXc3x48e9
+3iopQQrAlKiOThoj6ZSYEIQwSMAYWZwTQgUAA0AUxeaK8dDwJ598MjI0zCxbIcTn8VZ5vMJiwiUR
+kqapZ7ILpXJh48aWZ09+62BPj2UjVVEBhJSEKI7D+RnuNQtCCIQWA7pySYW6yKOUFD9YYsW9PX1Z
+48cYI4g6GsWlXk8AwDRNTft8UtxXUM84X7QPTvaTY2R0TBFARRexydhcND49NTEzPel1q9StGDab
+DMf+63//b35vNUiQnCuU3DutIQAECC+qRQABaJgKDplUJp1Oh0KhCxcuxCaijlIsUOUnhNi2rZu2
+z+cjqp7OJ9PpdEtr2x+8/vq+g4dUVQXA6lJwBKEvmTvvVRLee71I3D0yiAfFZ8sAhJfrSO5p+Xsn
+jy/yDl9J/aJVdKbTxbcwVEqmXjamJqai4UgsEinnc4EqH0jm8rj6+vpOnDixZ88etDjW+P0MKyzV
+OhKJj4+Px2KxUCgUiURSqVS1169q1O12W5aZL1R8Ph9VcEUvFRbmA4HAqVOnnnn25LqWFkBYcC6+
+zHP4puC+1DsCds65s+mayxXy+TyldCw0OTeXmJ2eKxVKHlUN+n2CW0G//054DACeO/28p6oKAKQz
+ud2/N3EO8fjMxYsX4/G4qqper7e5ubmpqSmTTJimqZtlznlVwOtyaYVSTkrZ1tb28ssvHz7y2KKy
+e7FrfIMPGrgv9RhjACylAJCcy5s3b4buhhFCs/FZAIwlrnK7NaoQLDDSmGXEZuKvvfbart27HV9K
+IsCEfGnCggNCob6h9tRzz/p8PpdLZUxYlpXL5YrZlLMkiUaj2Wx2YmKiWCz29PS8/vqr7R0dAGDb
+TFFVAGzbtvLFUOw3B19lcGDJKxACZuJzkUiEEIK4CPqDUhC36q5USm4XdbnUCxd7Dxw48N1XXgGM
+mWmqlGCEAUCAvB83zkRSU1ODMVgWwxh7PC5VbVi/rmHbjh0AYBtGOp0eHBwsFotPPfVUoCbITFMg
+rGqaUzZFUSybq8rXkXe4EvgXPRwMALbFi8WioqiqqrowkVJqmlIsF2traykWAzevE5WcOXsWMBac
+qy4NABwnUqH3TUsjBBGiOBJuVV0shpQcELEtS1FVxe1qamlual5vGIbL7eaMUZcbADiXtm04O6jK
+N5Z3+ApbuaRalSBhdnZ2dnbOMIxKpVLWKzZnqkvzVvlUlzI9Gy9Uyj/4gzc2d3Qw2zZN0/mWhK/K
+UwAAy7JgaZkDS16goiggMcEaSAwSM0sCEJfLaxl8OR4ghHBk+LpuPkwmvnb8C7YSY8w5FItFRwmM
+MVbdqr86kMpmqutqFzLpwZGh408/cfTJJwCAKorb65FSAkJSSoIJv78myEm1WV7fLicyAABeSp2l
+CpECAEDVFJCSM4aJoiiKzQQAuN2aLe7z9G8CFqV692IxiwNMW+gIs5JeuHjxoqIo3AYkqSqrcwm9
+taktnUxcv3bpyRM9P/rR65zrjtMOjs4bgCCMAOi/5DAvLzU/y8FAcO8fIsvXZNmPVCh23lO/wbMs
+UMewOAlNTq4bY4xSijFBmNpMZNO5dDpjm0wIQEDKlUxz87qZ2akbAzeOHjvywx/+EAAR8k11rlcR
+iytsWOp3TkAYISQlRUBMg//i5+9YFisUCpqmcWH7/CixEBkeHTj8aPfZ18/6qqoAsP2NHvmrBOd8
+JvS5Bbdzak25aF/v689m89l0hhBSyGbq6+sT6enpSKyn5+jrv/fDYHWNEMK2uaNXXcMDAd0bQnIC
+TIvNIKCvb+SDD96Lx6ZzucyG1pZKpcKYZbKFZ5555lsvvuTzVQuJMKLOZunKHirx/yOWHerf4l0I
+MXBjfOj2YDIxl8tlgn5vciFumXog4H/hpZdffvm7ALiiGx63V4B0DkxS6Dd5ylsNUCdf8t64drFY
+jMViQ7eHxu+ORiKTgSpPvpCmRHRs2fijH/1g09ZdzLYpxQSrABgBLpaKVb6q1a3GNxGf36XSdX1s
+bKy/v38yNNvXd7W6xl8p5bZuaz90cM/3zn4XYQBUKwUAlgihpSUrsQTT8JqT82D4/FEouq6/9dZb
+sVgstzDf1BDs6Nh44ODB/fv3NzavBwDOGKGO0Hkx/q5SBQDWeP8dQJeDi5xz51yBzs7OTZs2bWpd
+39TU1Nra6q+pAQApBEKIPHjuxBruB2RZ1vLOodP9C4WC3+8HYQMsC/oX7xZSYLTWwR8O0NLRtjal
+1NHWLn4ixZLI73M7b2uezMPBZ87lcuYqOPu8Tg4LRs7LxRNTvuKgizU8ID5zLp3XjunnnGOqCM5t
+25YICCGYErm0tb2GhwK0KJH4AphlLx446Kidl5Qna9Q/LPyWX++k2juSkiW5BAghBCyODAkrf/Lt
+vxn8LiLvNTwUrLkrq4Y16lcNa9SvGtaoXzWsUb9qWKN+1bBG/aphjfpVwxr1q4Y16lcNa9SvGtao
+XzWsUb9q+L+WOq85E3uOFQAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_bentley" model="fleet.vehicle.model.brand">
+      	<field name="name">Bentley</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAxH0lEQVR4nO19eXxU1dn/c9fZJ5ns
+k30jGxASwo6sorIJglDcW7HUrfhSrbaVH2prtW8FxVpcKCIVi9SlWpRdUREIJOwQkpCQhEDIPpPJ
+bHfmbuf3x5O5DAlQ7Gvf+Pn9eP7IZ+bOveee8z3Pdp7zPCcUIQSuU38Q3d8d+P+XrkPfb3Qd+n6j
+69D3G12Hvt/oOvT9Rteh7ze6Dn2/0XXo+42uQ99vdB36fqPr0PcbXYe+3+g69P1G16HvN7oOfb/R
+dej7ja5D3290Hfp+o+vQ9xtdh77f6Dr0/UbXoe83YlVVpemLE0AIoSgKAECWQbuuqgCAX1WaUED1
+XCYqANDUJfNHgGBuD16n1D7vJAQAVIr0ei8SzXCiKDMMQ1EU/i7LKsvSiqpQFNXrXQAgqQpDM3iV
+IgAAigIMDTLd00sCQAhQWqdDFzXC64oKjDZcAoiBogDLXAY1lQBNXbxTe5GiAA+qqqoMywKALEks
+x13ymvD3IkyqqgIARfV8pSgKJyAMc8CvfcYOhICqEoahMJmKCnuHGhoPIaHx9+nBlUhRiKqqHNcz
+dAJqaNgq8gdFURRQBLmFAADQQPd0UgWFIdrkaf28bB9UFQghDHP5nmmcRIU9RgjRmIAQUBQVAFiW
+BgBQVFmWOY5TVZWiKIqmiarKsszp+F4tU4QQRVEURWFZNpwN5SsgwqqXTCBRARBuKsRLlw5B7jMi
+ZEM+9DgiAqE5o5keLiWqSlEUUJQsSYQQlqOpvrARIisKy7Khr3QPugSA7itu+Eb1Mu1c5j6iqioh
+hKYv914AVVGoXnPb80PYzdpAaPoyXK+qqqIoFEUxTA9/oQrSRFIlKnaCoiiaphm4hJF6FBRFqYpC
+M5cKJyFAUSpFqL6vBQClR84uGRUhQBFQFKDpXgPoMUshvdRr2KqiAKXSNAMAQABkmYSe7nlFL4y0
+dMfwtwBcbkrCplATHACgmIsXwwUCaIq6qAkuM/AQUb1yLhVFIYQwDEOBdCXWQJFn6MtoQQIEBa23
+UlbVnrGFMCVAAOAys6KyAICTjX95ng9X1TiqECtQkqjyPA0UEEWlaBpAAaAALqcZoTdM2kQCAB02
+2aqiAEAPJ4Vu6MErxCuyJGlqGTQVTVGXms6rEYVIad3o6QQAzrYiyxRFaeysKorCUHSI8QkQlag0
+RVNAKURBOBjq4pRIisQRiqZpjUOJqqJ+Y/T6njZBxT7gg0SmWRYUBQBAk6JAQOb1rKKA3y93d3e7
+3W5BEBRFAYCIyEh7QgJNA8+zep6SJIXnGFWVKZoNn6pwo03TvdFR1YtSgZx9jfD1tYU0DYoCqko4
+jgK0+QwEArJBz/Z6lpIkCTuiqir6FYSQYDBYd8GNEsDzvNFo1Ol0eI9ez6kqiKLk9Xr9fr+iKBzH
+8TxP0zTHcRzHURQlSVIwGBRFUVVVn8+n1+tNJpPZbNbpeJpGLEBWFUKIJEl+v18QBFEUAYBhmJTE
+OIZhVFXV6/WEEJfL5Xa7XS7XocMnZFkOBAJ+vz8YDKqqiq+TJMlkMvE8a0+ITUiIS0tJyshIlxVR
+x+tVFSRJ8nq9Ho/H5/PJskwISUtLQw5FJa5NQjAYxFGg0NM07fP5XC6XKMrIUjqdzmg0GgwGlmUp
+ihLFAIRsr8ayFEV1Oxxut5sQEhUVpdfrLRaLTseQkEd0CfSaNGleptfrdTqdZ5w8CZNHTbJa6xrb
+2trOnTvncrnQCqmqKsuyoigMwyCaLMva7faCgoKMjAzaYghxU489V1VVVVUDxXIcx7IsXieEsCzL
+cRwQh6IosizTNH3mzJmysjKn08kwzIgR4yMjI+Pj46Ojo41GI1omQogvIMhBsb29tb6h5tjRQwxD
+jRo53GQy+n3BiIiImJiYiIgInU4X8lZptG2SJOFM0DTNMAzDMIFAgOd5iqKwh4IgNDY21tfXNzU1
+y7KMM63X6/EeQogkBXNzcwcPHhwVFYUMwbKsyWTiiMJxnMlkkmW5oaGBEDJo0KCoKGtf3X2Jrg8G
+gzqdrrOzc9WqVREpeWNumGQ0xAUCFMVBUFEpVqIZRfZSgiB4vV5kPdTIiqIwlKIoiiAIXV1dbW1t
+ra2tTqdTEIToaNvw4cNTU1PT09MRLJQMBUyEKAY9B6qo17FAJJ2OA1VWZIqmaUWWdTqOyMqqVa85
+nc4l//VfSSnxikIkSUKuxGlWFIXwHMeAohC9nnI5vUeOHPly5/aCgoLiIUNTUlIMBgMARNlYjxdk
+WaFpmqWpQEA0GnlVBUUhDEN1d3sEQbhw4UJNTU17e7vD4cBBRUdHx8XFAQBOuc1mMxgMKOIcx0lK
+t8ViMZlMFAWqSmia6vH0AYJBoIGcqamuPFWxffv2ZU//Jicnuy/0LEoT/uV5HgDOnz9/6tSpHWv+
+NnLk+JtvmVtUNEqlOYOJ93s9vIHmiN5o1JvNRu0pGgl6BJNlWYZhUNJ9Pl9l1anS0tJ/fPKx0+mM
+jIw0mUw4u2ZjtCQHzWazLIs2W4SqyEaj/oZxY0YOH2WxWFSgGIXo9PwDP3twwYIFDeebbPZ4WSY0
+zTMMyAREBWiaYnhalRRJoRmWEnyKwWAYkJW1U4W5c+fqeUOPq0bI8hWrT5w4ge+VgmJsbKwoihzH
+AYDH40GZ0Ol0hJC8vLy8vDxUsBzHiaJoNBoVRXE4HO3t7SiOKDGSCCg9oijKsiyKos/n8/v9Ku1j
+GMbv9dSermpvax2Yl+vz+S7rrrCSJCHimtOWmJg4derUIGtsa3es/+uaY0UnOjpdRqtJVARCZEpm
+WJZFfddjVxmGZdmA4EVlh/oHAPA2m82WnJhUVDiksrIyPj4eJaYgL7+ztSU2Ntbl9tqioyJtUR6/
+j1Dwj8+2btjw0YIFC2ZMnyqrxOP0BcWgwRIZHZPA68AvEFEUCCFut9vn8+Hb46LNBoMhIsLKMAzP
+g06nO3jw4JYt2+6753avl7pw4cKKFStYlp00aZIoisnJyTRQjY2NdXV1BoOBoqj29nar1ZqYmDh2
+7NiysjIAcDgcdXV1uNBBTNE2ID7a2pNhZfQOkNVomjaYaLPVqDPEsDR1/vx5h8MRExNz2223DcjO
+FEURQb6iwkGTyzCMLMvVZ8/X1Td9/fX+u+65n+FNHp8XaCA0UYOqZli03qD5RZ2IM4HGVhRFMRh0
+Op16vX7nzp2yLA8ZMoTjuEAgcGjv1ympaTqj6ejJymkzb5234Ja6s16T2Xy64uTatWtnzJgxZdJE
+h8NxsLwsOzs7Kipqz1fbWlpaPB4PFaIe26jXqYrscDhGjRqVNyB7zJgxpfv2rF27dvq0mQ8+eNfr
+r6+PjY2dP3+aLEMwCGYzuLrE0tLSurq6uro6SZJyc3MjIyM5jjtx4kR9fX1OTk5KSorVajWbzRaL
+BR0Eo9GIuoXnL643WA5IKARGACRFpiiKoxlZAZaBv723cfVbb/72t78dN2Y0y1DopPTmepRK/Mtx
+nMaw+dkZ3c6u0r27TAb9zdNnxcUl0hyrEgqIQgiRZRk5IhAIBAKSLEkXOi+IoigIQiAQEATB7XZ3
+dXV5vd6O1o6urq6kpKTk5GRDZITL0VlVVWW322PjbMePHZ56660Wk27zZ58PHFxkMltVmYwaNfjL
+L9P27NkzdtTI/fv3pyQnHTt2bN++fRbKa7fbC7JSaZpuaWlxu916vT4mxmqKSmBZttXSemBf6T8+
+/GjY0OL58+c/s+y5JUuWeL3eEydOZGRkBIPTgkHVYqFPnTp34vjR5uZm9Liqq6u9Xm9CQkJKSkpK
+SgqKaUVFhc/nCwaDfr8/EAhIkoT8ZLFYoqOjUePTNG0x29D9M5vNBoNBM+MXWmoOHjzY2FA3IDt7
+6JBCk1EPoAYEn95g6s31wWAQAw4AgG6DqqqiKKqg1NeffepXy8oOn0hPz0nPyNYZImSVeL0uOuQY
+axPGsixnYDiOQw/MYrHYbLbo6Giz2RxtjULBPH78+KeffjplypTo6OiKiopEu6380JH4eHvhkKFb
+tu0IiupDDz+SmpEpBYRXXnll4oQJgYBQXVlF0cTn84lCoPNcVWdnZ1NTk6fbBUDRLKsqChAVeCvQ
+VHp6elpaWn5ersvl8nq6zWbznLlzS0tLTSbTJ598sn79ervdfuTIkfr6+rMNdRaLJRAIdHR06PX6
+goKCyMjIpqam8vJyq9WanZ0dHx+fkpKC/bdYLISQQCDg8/m8YRQIBNyeLlEU0YcO95eqK4/t27cv
+yhb54osvzp09i2PpYMBvMBr7BokvKhwMJ1xcbBDJ4/Xv+OLLLVu/FFXGZrOPvWESyxv1JgbdLCSd
+TqfT6TiO5vSgqqCqIMvE5/O1tbWdP3++o6PD0dpx7Nixzs7OkpKS7u7u+vp6m81WUFBwy8xpTqfz
+rbdWpySnTZ48edfOXc3NrT/96U/PXWhqa2tzuVyHy8smTJggiYEtW7a0trYqPp8pOtput6enp2dk
+ZBgMBlmWKYpqOFPX2tp65MghjmUZhs5IS581a5bD2dHR6ZwxY0ZXV1d1dTUApKenu91uv9+flZm6
+d+9ei8UyadKk7u7uHTt2SJJUVFSUmprq8/kcDsfZs2ebm5s7OzsTExPj4uIyMjKioqKSk5MTExNj
+YmKsVqvBYOB52mgM4QSEAMFlJgFy64zbCCFz59y2aOH9khjQ8SzNMEBUoPosqXC6tAhUmBcvAQAA
+0+no3rrjm/V/+2jhwkeysvNiEqwQinEGAgGXy9Xe3u5yuS60nvd4PA6Hw+l0iqJoMBiioqKsVmtK
+fMqQIUNMJhPP8w0NDVu3bo2NjU1PT9/27VdTJt/odDq/2LlzYN7AGdOmV56saGtr++rbPT/96U93
+bN8eFxdTebLi0KHyYDCYlZk5bcH9xcXFubm5Op2uvb29sbGRoqjMzMzs+AhBEE6fPr3pn5989tln
+YiCgqurYsWOzcwZ4vd6IiIjp06evXbs2JyfH5/PZ7faa06fMZnNOTk51dbXD4RgzZkwwGDx27Bgh
+JDo6OiEhIS0tbcCAAQaDQVXV2trapqam7u7u9vZ2p9MZCARQNzAMEx8fzzAMuvAmkwkAOjs729vb
+D+zftXTp0rvumOfz+KwWE4CqBAMMz18G+qvUzaLjzDBMaWnp008/XVVVlZKSoo/MjY62CYLP7fMC
+RRQiJyXZo6OjkxPiExISEhOTk5KSdDqdLTJar+cMBmhv9+/Zs2f79u01NTUTJkzIzc3duXNnQkLC
+z3/+8/b29sam88XFJUt+8QtJkidOnEhz7IF9+37y4x+frqz66IOPKisrTRGRC+6+676FP4lOSHS5
+hAiT4Z01b36w4d2uzlaWAaNed+cDj/74Jz+lWQNNU1/u3Ln8v59vPn9az1G5OSNuu+223bu/vvnm
+m+2JCZs3b05MTBAEYcK4iV1dXWvWrL7v3nuLi4vff299UVHRtGnTjBZjXV3dvn37Dh061NzcTNP0
+oEGDRowYMWHM0Pj4BJ2Bl2UQJXC5PV1d3R6Pp8Pt9fk9wYDX1dkueFxff/XFgdK9NJCHHnrkscce
+S01NRQcs3JReK/R4N0LvdDo3bty4Z8+epqamKPvA7JwBkyZNAlBNVktsbKzBZLRYDFY9SBKIIiGE
+am5urq87W1FRceHCBa/fFxERkZGRMW7cuPT0NJ/Pv3379k2bNg0ZMmTQoEETJ078fOu24uLiPXv3
+7t27LyEhobn5wuhRo7Zv2Vq6t9RgMNw8fcZvX/g9y3NeiWEpuuzAvueW/ab9QqNBx8hSQJUlS3zW
+W6vXDMgdRFMMz8K769a8+vLvTXqmq00oLCkZPrzE7XZH2iJSUlLOn28sKSnZs3tvYWHhsGFDX125
+Mj4+fvr0qZs3feb3+7Nzs8eNGzd27DBFgaqq2tOnT1dXVzc2NnpcHWarxWyyJiYmZ2RlJyWlxMTF
+xsbE6y0sx4HXLdoi+a92fvXUk4+nJNnnzZ0zcuTowYMHazDiKvWyCF+N6yFs00qSpI6OjrNnz679
+28cqUE899VRsTJyiUgDg7PawDNfe2lBddbq8vLyurs7vD+Tm5g4tHpaVlZWVkxkfb/P5pNra2nXr
+1tXV1c2fP3/SpEmvvfZaVVXVpIk3LrjrTllWjx0/PnDgwK+++joQ9JXtP7BzyzZVVAwWc/7gwWv+
++o7eYHD7qbhY/ccffvarxY9QPGM2cKAqNAXdPvqlV/88ecp0n88fH2ssKy1f8thPfd2dFkusy+Wa
+OXNmSUnJ2caG2NjYzMzMd999d/HixR988EGXo7OgoOD4sWMPPfSz2bOnHT9yavsX27/88stgMDht
+2rT58+fn5KRTFHActHZ4XS5Xbc2Z2tra2tq6sw3nHA6HXq+PTYiy2Wwd7S2yGDzfWE9T5NVXVtw8
+5UY0p7Isow6/uOvXh3oroF6gox+J5jcxMTE6OvpIRcXyl16uOHnYYrZF2WLNFhvDcIIQoFnRYDAk
+xNvHjx9fUFCQnZ3Kc+D1QVNT07q1n1dUVAiCkJSUtOSxxQX5qcdP1I0cPkIMBI8cPXTmzJmCwYPu
+vvvehoYGjmMjrDEHy/arihJnj/P7/UfKy/bu3j173hxCICgAqAR0OgpUluEVSup2OgzRmTqdAQCA
+0MEACEIACEXTrNfn4Xj28JFDA3KyY6JjTxw/yXO6aVOnb9y4cejQodu2bRk7duzIkSPXrPnL5s2b
+Fy1a9OyzT9x///1lZWU7dux46qmn4uLiMjMzCwoK8goLo23Rt0xLnjFjIgB0OuT6M3WBQKCm5sTq
+1asbG+poGtJSU+6/795Ro0YpikLTVF/cJUnitJ3Cfwk9UrgfCQAsy06bOqWutubgwaPNTWeDfiEj
+g7/9zrtHjx5NM4RlKb0OAMDpFEv3HiwrO1hTU+MP+AYPHjxv3rwhQ4ZER+nKD1Y+/sQzbrd7xowZ
+f/7zy998U/rFri9PnTj5uuvPjY3nFy9evObt1x2OjoiICEHwKYrK8qwkBzkGGErlGLpkaNG4sWMP
+lO7rcjhZnjNYrMXFxQUFBSwLJpPe6w0cPHjQ5XJFmPUer99kMrW1tRw8eDApMXn27Dn//Oc/S0pK
+IqOjho0cERlpfWnF8kceevjd99Z/sWPnc889Z7WaZ8+efccd8+fPn3bunLO6uvr48ePffPPNex98
+xDBUXExMVlZWQlx8dmaW1WrNykw9dmh30Oeed/ttN06clJmZXjAwz2Qy0RQQlSDK4XuuF/fRwuiK
+Cic8ttPLSgSDwarqmurqmgPlBzdv3pqenjl12rSIKFtsbCzP62tra8vLDtbW1ubn50+ZcvO0mbfo
+9TTLwPkmx0cffbRt27bJkyc/9thjJj1VWXn2dG3NsGEjDCbj5s+3fv755zfefNPqN187f+4cR3OC
+z8frjbKqvPynV2feNkcSgKZpkwn2lx7dvn1rxamTiqIUDiy448cPJiYlur2q3y+sW/uX999bx9IB
+IvkZjlcURVWgqGhoSnKq0+kaOXL0uHHj/vb3dw0Gw8qVv/36y7KHH354xvSpK1e+KEnw0n8v//bb
+b61W67333jt58uSoKB4A/H7wivL+ffvK9pdWV1ZVnDjOMpQqyWazua2tceLEiS+++GJWVgYAEIDQ
+1kUPehAK917Wxl4Nei0IjHFUjC6wLCuLCssxBICioL6hcc2aNX//+9/dPi/DmPR6fXx8/KhRY+bO
+nZuenhEZGWmxUCrAocOnNm3adO7cucGDB48fP37o0MEeT6Dy1OmGhoaxY8fG22NrahqqTlePGD7q
+wIEDS5f90ufxy6LEMyzH8R1Ox5/fWn3XPfO83dDd7TaZTPHxzNmz7sbGRo/XnZGRkZCS2O2WXG4h
+IIivvrJi62cfxUQbvd2dDKujKEpVISU5Y+yYG6ZOnfmPjz/Ny8ubdfu0ZcuWBYPCm2++KXh9f3pt
+5emq6oceeuhH826pr2/fsWNHWVlZW1tbZmbm9OnTs7OzCQV6g45nuf17vl25YnlLcxNDUzG2qNy8
+rDvuuuvWWbMAACiQZZlmGQDATVgNbtzPuSzj/wszGx736fmsgKwQmqZoFlRV7ep2/u1v68vLy881
+uRVFEUUxLS3jrrvuysrK8vsFv9/fcK5+48aN+fn5DzzwQE5OFkWBzxcsKytzu73Tpk4HgObWln37
+9s+cdSsFzK5du37xxCOCz8+oNADQNOMLBlb8aeU9997Z3SGZzZzbHaytr1u+/I+HDh1C53ruHT+a
+/6O7VOD0et7r9ryy/MUP333TEmlWVFpRVI7TRdnixoweO2zYqMLBRXfffe/yP70wpLDw8ceXxMXF
+/emVV1SivPXGmxs3brx9zm0LFy5MS4v2eEhpaenHH39cUVHhcrkkWVRVOcJkJIrEACxaeH/h4IGU
+SgYU5MTExPAGgygGeZ2OkJ6NQ43rKeoySv87QH/t1NLS4vV6P/roow0bNjgcDowuxMTEiKxlxYoV
+48YO9fpJS0vLmTNn/H5/fHx8ybBiloH6+paTxyqGFA7KyrLXVNcdOXro039u3fzJJ/a0NNxXUlV1
+xYoVP/7xnW6vpNdzhw8fW7RoUePZs7aoKI/HQ9M0B/Jvnnv+vp8tOtcq2GyGmoqaRxfe7Wq7QPOc
+QiAoUyUjxwwcVHjk8MH317+7a+cXb/x19dt/WW1PjH/s0Uc8bvefV74+ICv++LEL6/76Vm1t7Zix
+o2666SaTyRAbG7tl6+bnn3/eRAcNBgMhJDs7++677546darVav1eEPsXZvbaKSEhgaKoRYsWDRgw
+YPfu3U1NTX6/3+fzCaK47p23P/7Icu7cuZaWluTk5DvvvHPM6OLDR09UVFQadeY5c2b6PFJbW/f+
+8rKsjLQRI0YcOHAAAyzoXzEM4/fLyCJlZWVNTU0sxwWDQZPJJEmSz+UqLy+fc8dPLCaDKoE9Pi4j
+I+NIW4skSZJK8UZzTk5OampqbU3NKyv/9MrLS1ucncuWPbvqtVfWvfPOm6tWLfjR3LlzfjT71tv+
+8OLvPvzww7++u27dO2vi4mI4juvs7Bw8sGDh3bfb7Xar1RoREZGUlKTX69F+Xuvm95Xpe4MeBSo2
+Nnb+/PkTJkzAfdSmpqY169bv2b2rpaXFZrNZLJY6r+u1l/+4cf0751pbOFZnMlirK08Hg0GjUb//
+QOktt9zEcVxqaqrb7cbYstlsTkxM5HlW9Ad5HrxeryKKBrNZC51Hxsa5XC6OoYNBSaXoyIiIYDCo
+AKEZlme5gQMH0wx3uvbMop899OLvfrt8+doxo8Z89eXOJY/918TxY4cWD/5m186331713l9Xlwwp
+dDqd/q6uuEgTLQf9vu7igbmLFy8ePWqYTqfT1IUoioSQK62SvhN9b9BDyKyrqhoTE4NMkZqaOmDA
+gB07dtTU1ERGRkZHR9fW1u7YsWP/nlPW6Lj8/IKszNyqqlNTp06/9dYZw0cM8/k8mRkDHA5HQ0ND
+V1dXVFTU1KlTi4uLGQZMJp2iQGpqqiUyMhAIREVFeb1elmVdHR0DsnP1PEOzjF4HFcdqW5pbVRUY
+mpdVUjJ8tDUy+suvvzEa9jz5q9/s/nrX0SOrb5k8ZfPWT3/322Umo85s1NvjIhVFOXzwwIABWU/8
+4uejR492u12yLCcl21PT0rQlEvrZfXc8/m363qDHFTMJpeRp64CE+Nh777kLAHDfx+l03jRlckdH
+h95kpll9fV2jzRbz7bffLlgwb8LE8RwP7q7grbfe6vF4Nm/efOHs2YaGhhMnThQXF7O8Tqejxo8f
+f8stt2zfvr2zs1Px+3VWa3bBwLlz53Is0Co0n+/48IONgUDAYDTLALfOnJU9IHfcpBsn3XhLe3v7
+6OFDcnJyv/j8k/PnGhrrz4weXmJPiLl5yuS8vDy/16eKSlRUVG5urjnC0pOJBSAJfpo39CQmhdlJ
+zX7+T+h7M7MA0JNl2KuLDHsxMS2UgURUlWJUSSJ/fGkly5krKisnTp4y70e3KQRoFQKBYFVV1aef
+fvqPf/yjpbHRnpaWn5//k4UP5OfnDx6U5uySS0tLL1y4wPO8TqcbN35icpL5fJNn69bt27dv3/3N
+t4LXm5KefuvcuSlpWeMmTPYFVXtCFAFwtnetXfMXVur8YsfWGTNvev53y6xmoyxKZrMZSFjGoxxk
+WVZRJExZVRRKy37APZPvC67vWeGgnpEkCTctWZYlACpF9+TDAiVJMs+zwNCyFOA4ffGQIW/85Z0B
+Oflr172TmZM5ePBgn8fHcdzQoUVGozEmJuaTTz6prKxsaWras680KSnphhtumDBhgt1uz8/P1+l0
+giCUHz70+utlp2uqvv1mt8/hsiUm5eTk3DBhYl7ewBsm3igDrbdyzW3uqAhrS1sH0IzP256UFD13
+zszYqAhFkfUmExBa9Ad5k06SFI5jWE4HoFI0C0BLcpBje5JZNNy/rzn4Prm+F2GqiKICxzGYzRtK
+jgNRlHWsAhTb0ND8xptvewMibzTVn21YvvyP6ckxLpfI87zP5/P5fCdPniwvLz906NCpquqOjg5Q
+FIplcYtGFEWapkWVEgU/BPzxySnFxcUpqen5BYOzc/NSMrI53tDl9utMJkkiFy5cOHn0SEtT05YP
+/vDzxY/88hdLWIamKQYIrQRVhmOVUFpmUAzqeB0BQgGRZIlndRDahdZWSd8L7/8Hob86KURUVWAZ
+/pNNn23+fFtUTCwQ9syZMy//+U/R0TZJUliGUWVJUZTzZxs7OztLyw+dO3eurq6hublZEhV0frxe
+f2yczWQyZWRm5w8aTDNsVm5ebm5+RGSES5SJQkSfEhOlP1N5vr62wtnZ/OfXXh5emPrqq6/m5eWF
+rxavtNb/j1K/QU9ABqCDokSz/Mb3P3xvw/uZGdmRkVEHjx999NFHb5oyyesVWJohhFgsunfWrB9U
+VHT6dK3ZbKYoKiDgdqhqsVjcbldiclJ5+aGBgwvf2/D+7Dm3z7x1aleXH3jeYGA7W7q3fPa52aij
+1eCHf3+X5ahlT/18+vTpLMtiNLFfQEfqv4IeQomSqON1LEXNmn3rvLlzqqpPtbVfmDVz1oqXVvz6
+yaWCVzAaeINeV3P6/OGjJyIjo7Zv356UlLR3T6nJZDp69HhMTExHR4esQH3d+fTMAd/s3nf3Xfeu
+W/euq8uv0xl0AHt3fbvs178kQY/gbv/dM7+kVN/v/s8vZ8yYgc4Jx3FaWmO/UL9BT1EUQ7FYshFp
+Mc69fc7tc26rPV29a8eO2TNmeN3uJUuWvPHG2tbWrpUr/1SQX3i6tsbj8xKgT1VV6gzGDken0Wyq
+q28oLB62v/xgTm5+U1PzqFFjku2JG9a/d/LokVf/8N9b//Hx8ML88/WVq19fMaKk4De/WjxmVDHD
+MMFgEHNecB+ivybg+/RwvhMFBVFn0PfERBUSGxXx8CM/S0yKf2/d+xvfXz9gQO6YUSMrKk4cPnw0
+0mZ78OH7Hl38y9tmz62vr9frjWazmWU4luEcDofeYPL5A0ajOT09dfPmz5YtW3rvPffU19UmWM16
+hmz6eEN7R9OCH8155OFFubk5Or0eADBfrFca7/8+9RvX6/R6IMDQjCRJPfVWijR/7pznnnt6yqQb
+ztScem/9O/GxMUYj/6MF81raXL6AMGvObQcOHho2ckR7p8Nqi0xMSRZEyRodYbQYT1YeHzZ86Jat
+m4wGbsa0KZ3tF7Zu/mT7tk8jrLrnnn366aVPFQ4ZotObBJ8EoXQj3H2D0CL8f5/6jesBICAEMWtX
+URSaoXQ8J0qBkpJB+XnL5syZ/c76906cPFTX2JSYmuR0diUmJnIc19ra+pOf/OTI4aOpqakGgwkA
+WJa2RUdu3vLZksWL3d3ON15faTTqT1UcGZBsX7jwzkmTx44aPYJlWI9HsJgtBqMRF6Lhjnl/sX+/
+Qa8EZb1BBwBEURmGUlUVaMJzLICkN3Djxo0uLhn6xuq1vi3bXlr+30MKi50uwecTampqdn35FUVR
+ZWUHS0qGd3d3v7dhfVx89OYtm977mzU2zrZ+/TqaogoK8v6wbGnJsCEms15WJQJgtlhUFYgKWgAA
+HRtMOe4XtdNvzuWVSEu5BQC3233ixIk9e/acPHmyuqqhq6uL53m3252cnOx0OuPj481mc/Xp4xER
+EZhpbbfbMzMzi4qKRowYccMNN/T3UP4F/eCgRwp3txVFCQQCp6vrm5ub29raqqurA4FAfX09hhIt
+Vn12dnZGRkZqampaWprFYjEYDGazuX/7fy30A4U+vJBI0wZYxCwIAk3Tbrcbo3UGg85oNGIZlPZs
+P/ot104/OOivtLxUlJ5yuz6w9uSqaFPVX6vT70o/OOgh7LyE8CqG8NLh8IwiWVbD662R+jE8cO30
+Q4Qe+igNVVUJUSDkkodnxnHcxb06dNW/x5D6f5R+uNBDmG5BLsYjQvAKFv9BnxAu1ocCwPe4k/cf
+ov5cUl2Feil0mqaBgKoAMD07XYpMGJpS1YtyQEJFsD0HSvzg6aJXoBGWpZErEN7fU/Sjqljgixex
+mBFbw4oJLEQCAAxXAYAkSdo9+FVrU7sZ20fCYmgAAAp4HS3JEkUDUKCoQaCAgAIAWk/ws9ZCeAfQ
+8YdQOhh+xjwfrQOEECxewF+xKW1QEEqjxC7hPfgTDlZLNLsKhUPfo3DCr159Ya2d4BIu5oFAQKfT
+SZKETKcoCjrdJJQ3qM0oeoHBYBAAaJpmWRZbI4SIoohJFtomhqbxtV3f8NvQ2Pr9fr1eT9O0VmWJ
+cQItSxc/azuXeAoAVi8BAM/zCBzmnuj1etzdxDyfnlxHWYYwfxerSrDZ8PR57WSPy+LWA3cYqt9Z
+4eDAcFSYn4R1Ldrn8Beg3RNFUa/XI75IHMdhrQXmLmBTmk+CuCNAGOHBQCOOE6O+OGBCiNFohNDG
+qTZsrdQfD/nRzoHAvsmyrNfrISQBODFaVEeWZawI1G7GZ/FvMBhENsLJxtuCwSAWfGvCfS3073B9
+eB4EAoc9wGnHruNJCdgICgryo5Y8i+KM50vwPI+DEQQBN9MDgYCqqlijhKPV6/Ua4jij6MKjiCDn
+IpPii7S+sSyLGKEx0B7RBFG7HwBEUURBDAQCLMtinT9i4vP5cJGMTyEXanF/bdquneu/M/SInSzL
+vTKwNOWAACG+giBQFKVlb4UrVgDAen6O47CAVAMFQjpHVdVgMIjFgvhGbeLDq6s14LA11BiKouh0
+Oq00FWVOsyX4Li1xKPzx8EFhlhUOIRgMohjhxLM9qSIKPoUXcUb/U9ATQr744outW7cKgiDLsiAI
+FovF4/FkZmaOHj16ypQper0eBdnj8axataq5uRknwGQy4faQwWAIBAL33HPPuHHjCCEOh+Pll1+m
+afqmm26aMmUKmj6e5wVBePXVV1taWn71q1/Fx8ezLLt58+bPPvvM7/fjGQZGo9HhcBgMBpfLRdP0
+ggULbrzxRo7j3n///d27d8+cOXPmzJkaMyJS+EEUxcOHD2/YsCEQCGDkkmVZnueDwaCiKDab7Zln
+nrFYLF1dXV999dVXX31lt9sXLlyYlJQEAIIgYPbrhg0btm7dWlJScscdd9jtdlRHHo/n6uGjS1AN
+92qQwo9O6UuEkOXLl+OzGRkZsbGx8fHxFosFACwWy/Lly9FpIYS4XK6ioiIAQL0BoQUR8vXq1au9
+Xi8h5MyZM3j9lltuaWxs1Jyr7u7uoqIihmGOHj2KV5YtW4bPasPDczqwzZdffhlf/dhjjwHAU089
+5ff78UEUU21Qsix/+OGH2EJkZKTWN2wqNTUVD1MhhJw+fbq4uJhhmIULF549e1bz3LZs2WKxWIxG
+4/r169EI4ZkNvZC8LHoXvZ3vCr2iKKtWrTIYDPPmzWtubu7u7sYK4xdeeAEAxo8f39XVhV6aKIpD
+hw5lWfbvf/97Q0NDVVVVfX39qVOnKisrq6qqmpubCSGSJLW2tsbFxeGwFy1ahD4M0oQJE/R6fW1t
+LQ6vq6vr2LFjtbW1tbW18+bNMxqNzzzzTFVV1dmzZw8cOHDhwgVE+cknnwSAZ599VmuKhE4W0Gbi
+k08+AYAZM2YcPny4pqamvr6+srKyrq7u5MmTp06dUlUVp01V1erqapvNBgDvvvuuNh/5+fkAsGTJ
+EjRvgUAA/14Ft77Qs70EgfyrsB/qUEEQdDqd3W6XJMlqtSqKMnv27KVLl+I4IWSCcNe/sLAQD8MJ
+18sIBM4lwzB2uz0iImLNmjURERG///3v0VXFJCfsKJ5SUFhYiL01m82CIKSlpeXl5RFCUlJSaJoO
+9wU1FwgnVZIkzXPFanf8dejQodrQNF2PBgZd5Nzc3FWrVj366KMPPvhgZGRkSUnJPffcU11d/dhj
+jz3xxBPoSet0OjRFqnr5YwYvS9/ZueRC1NnZ+emnn2IZuCiKa9euBYCJEyfabDaEAJnOYDAcPHgw
+EAjg0VVdXV0DBw40Go3oxuDRGz6fb/To0XPmzFm4cOHKlSvz8vLuv/9+1L9+vx+nVpsD5IxeyZ3h
+hNfRg0K7h3YS5xuttyAIAKAoyp49e6KiovAUKIPBkJubiydxYVOo2RcsWHD27Nlnnnnm4YcfHjBg
+wMGDB4cOHfr000/Hx8ejMGHfAED7cE1ELqWrywsy6V/+8hd8jdls1nqJrtjq1atROWB+/ejRowEg
+IiJCc6vtdvuBAwewHdQDTU1NNE3PmTNHkqSXXnoJAJKTk9966y1RFMeMGRMbG1tZWanJB0o0IeSB
+Bx6gafrtt9/WftIU8RNPPEFR1HPPPaepF/wVPwuCQAj5+uuvcZI0OwQAd999t8fjwQZRYZLQqYOi
+KC5cuBA5b+DAgbt378afNHPScz6RJH1nhXPtRIdo+PDhs2bNslqt6F8fOnTon//85wsvvJCZmTll
+yhQSWljzPD9r1iw0xV6vV6fT5efn49hMJhN2wmq1dnR0sCz7xBNPSJK0dOnSJ5980mazxcXFlZWV
+WSwWVAXhXN+Lb8J72CvkiR+wBZqmtcUUwzA5OTnTp0/HjGWXyzV06FA04JqaUkMnjHEc9/zzzx8+
+fPjkyZPPPvvs+PHjcZrR8deWZhT1HcKR/074DHuTmZn561//Gpej6KIMHDjwiSee+PTTTydPnkzT
+tMFgwHqopUuXZmdn4wz5/X48fslkMqHC4XkeD2wjhNA0/eSTT5aXl2/atOmFF17w+/02m83hcCQn
+J/eFNRz0vgNWw1x47avm+Pt8PkVR8vLy/vjHP5JQeR9qD4wihC+SaZoOBAKJiYkRERGqqhYWFoYb
+LQyKaKbl2mH8ztDjgOnQSYVq6JhMRVHS09PRH0ebpilW7TQ0mqaNRqMgCMh6Wk6Ax+PBtABkpbff
+fjsQCHzxxReqqtrtdpPJFB4ZJqFS3l7j1GYCP6AmwTu1riLuAIBHVWFIB6/gcgEbNxqN6Kei0WZZ
+Vq/Xo3nQ6/Uej4dlWVxhUaHzx+DaYjj/I+gRIFVVKyoqVq1ahWMTBKG+vn7btm2iKBYVFSEL4FIQ
+AF588cX09HSMHWKkJRgMjh07dubMmRpqXq8XV7CBQCAmJmb58uUPPvjg/v37cTmmhsJh1KVnkPVF
+H0IMvmnTJpfLhb3FmhBJkkaNGjVnzhxUd4qi1NfXv/DCC7iSQtSQPx5//PGYmBhsEyMKgUCA4zij
+0YhnMgIA8kr4joIWvr5WKL+rmZVl+Y033tDETVtS4+rm8ccf7+rqQmsjCMKgQYPCY08aJwLAL37x
+C1VVJUk6f/48wzBjxozBxgkhuDLYtWtXdHQ0ANTU1JCwMzLx73333QcAaNW1FROe/7hkyRLsW3jI
+DF+6ePFiHOYHH3wAoSVeOIIYNjh+/Djehv1BWyrL8ogRIxiGOX78uCRJSojQxmKg6Tv59VcMJFyJ
+aJrGZZHX69WEi6ZpnU6XlZU1cOBAdMk5juvq6iovL8dVPmpMCMU70VQUFRXxPN/c3HzgwAGe52+6
+6SYtqIJMsHfv3paWFiwjwcAWKjFBELCmGw/5ROC0pXx1dXV1dbXJZMLRYvAS2TY6OnrixImyLOPi
+zuv1YjYDhIJ0oiiaTKYxY8bgCZdqKLbKMIzb7d67d6/P5xsxYkRycvLVXdtruX7RIl8j+hiDxbgr
+NqfFETHGC2GHwGAcv9dbNWuh3akFXdGnRiayWCxajAh9Z017IJSKoqAYIUtqRoUQgk56+Iu0cJu2
+bgo3leGOk8/nQ5uPBgatLnYPg2UY07+STr/KgrTXT5eH/iqEa0UcBvZPC5miaUJThiFGLbgfLlsa
+k6JPhkDgIhPHhqiFb5LgwhhCQXxNyyEEVNhx2FQoGaSXG6qEzu5F8wgAOIUkVBjVa0rU0OYMTkD4
+16s7kVe6rq0ELwP9NaIfHnLQRhsOq6Zh1T7/iiO8hXCnRQ0rPdSeCgaDGjoIjTadiD5aTlyvkrBC
+J/xM+kREUNX2CgtrZyni8rvXGLWjJ1Gha7bhKqvWq2AYjv5FXX8tT/ZqohepoQO7tOpe6LOwvmzj
+6IkiayPLa2EDxLcviBAGCoS2Yq6UtRouapqY9to611wmTXzx85XCFZpLfe1EwkIgcFnow7t7WQrn
+COyBZkJJn+SZy3IfMilceswAKh8cubZhgphqAo78riiK9iuqAqL9W4tQrxA1DSBtZRQuXugU4RJX
+uTSjJHwXTHsRmhDcW1b+3SLCKyqca6HL8iCEbB1q4XANcFmpQh2i6V9U8VrepLZbcvUOaNvZ2k/q
+pQdHaLqrF+NDH8HVFH14WaGm9HFv+bL3Xzv1xe3fSYFC71VTxH1HojFFr4L2XhD0EnkqdHa8Nir0
+RMOxCDfpaOrVPiXqfbtBLi0y1iRJvTSfudd2Y99qfLUnE+t7qNKHH2z22f8P9EPPCf1/mK5D3290
+Hfp+o+vQ9xtdh77f6P8CXEO5h0DWZcMAAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_bmw" model="fleet.vehicle.model.brand">
+      	<field name="name">Bmw</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAtrklEQVR4nO29e5hdxXUnuqpq733e
+/X63hN4tYQR6I4QBP8DENzZjJwST72PI2HzOdWLfPD2JZ+LJ/eww40xs57tjg/Ej9lzb4wwmMWBe
+BoxlO6AgCSRAsqSWhF4ttdTqt/q89t5Vtda6f1SfzZGEZNRqwL5hff31d/r0PvtU/WrVqt96VG3B
+zPCWXLg43IQQM76DnL3G/JuTi8Ed3oJ+xnKRuMNb0L+J8hb0b5p4F/Ph+iX639pyfbbBuVATdFHQ
+w789xBOp7/jM7P7MoeeaXMzXv3a50Pu/kTrBzDPo/kXZelEnF/zFUrqRc58lImaWUgIQM7prkguk
+lEIIRBSCmd1vFkIwCwGCqb4hgojcR5LvYmYhWEpgRveTvH/Gi4uB4kLvI2b8re6DF/PxM8aMmYnI
+QZYAx8yIbIyJogjRWGsBSGtrjJHSQ8vMIKXwA4VopJRBEOTzDUEQBIEPAO72blynO1wbG6WU+5f7
+OvdixuIafEHq/yZDD3WdTxrtlF1rG8exA71arTJzFEVhGMZxGEWR1lbH1hk8KSWizWRTuVxOSump
+IJVK5fKZxsbGpqamVCqllErmgBtdZkZEAEgG4GL9owuH/mKX2RmLUspBrJQSzoIwA0AYxtZaY0y1
+Wi2VSuVyuVSslMvl4eHhkydPTp4aHx4eNsYQQhhGAIDInicBOJ/Pp1Kpjo6OlpbWQqHQ0FBoaGhw
+6Le1t7S0tKTTaaWUlJIImMkNtpsQrjFvMAJvptZD3WphjAnDMAxDIVSpVBofmzx+/PiRI0dGR0er
+1arWOgzDOI4ZMJfLRVFECFKqcrnslNfz1OTkZLVaBRCpVEprKyW0tbUtXLhw8eJFHR0duVyura2t
+p6enq7sjCDwAQGQASjRgZr1I5NfJ4BCR53kAoLWOokhrHcex1vrwkcHBwcHjx48Xi0VE9P0AAOI4
+nn/JJWvWrHFm5IEHHnji8R93dHRaa4vF4nvec8O6deuKxWIcx/fdd9+RIwP5fEOpXI6iKIwqqVRq
+/vz5l19++aJFi5qbm1tamufPn9/T0+V5koGd1gshJPybMTie58VxXK1WichaOzo6eujQocHBwclS
+lYh8L2hpa7fWOuMDxixbtmzD1eusJc+TV1xxxQ9/+EMA9jyvUMivXbt2/oJLtNb5fP6JJ54YHx9v
+b+8EIYIgyOVy1tr9+w7s3r27vb197ty573znOwYHB3t6eubNm9vb2xsEHgMTWQD1RiPwBn9fIuVy
+WWuttS4WiwMDA4cOHSqVSr7vFxoarbXg5hOhF/gglTIWyQAAM1pLy5e/LZVKRVHEzIuXLFy0eEGl
+UtFaCyGCIAAAIdi9sNYqpZqbm40xxany1hNbt2/f9o53vOOqq64qlaYmJiYWLprf3NSspOKLIjgz
+kdmEvp6iJG8yC6UEIksJiOh5HlmcKk5aFJVKZeDo0cNHj5XKFSG8bGOrBGWtVkICAEuo4WhSKT+d
+TgOAlKCUbG1tXbVq1c9++nRf37ING9bl81lEVEo1NORbWhsQUYAPoJPFk4iYRS6ncrlCaar448d/
++sLzO9euW/2e91x/amKqp7dr6dIlSglm4VporfU8D5GlFPy6jcmshc8cS6ln0DA9GAQA1mohhOvV
+yNiokN7IyMhLO3bs3L2rGobZbDYIAglCKeV5nud5jookvz3Pc8OgtX3++ec9z7vhhhvCsNrc3Lhu
+3TpE7O/vV0rlcrlsNuvYar2TpZRSSjhO2dCY7+hsGx8ff/ihR7/2tW/s2rX78KGBZ5/dUi5XXQu1
+1jBNN/n1wx1mN3KZUIXTGTpaa1OpFACcOlWcnJwKgvSuX+zd/PxzoxPj+UJjPp8XAjyp0kGgmBL0
+feWpmvi+r5QAgDiOH3vs8bGxsQ0bNsyZM6e1tbWnp2f//v0/+9nP8vl8EATZbNY1QNbEvfY8Tynh
+9EMp1d7e3traunPHrrvu+spTT/1kbHTy+edeHBubAAClfDcAUsrE7309ZDahTzqceNXM7HmeY+1T
+U1OI6KngmU3P9u/bFwRpz08BgLUWmH2lPDmt406klEq8Apzv+25c9+/fv3//gXQ6/Z4br587dw4A
+9PfvOzowWCgUhBCFQkEIEJJBkFQgzxQQgqHmwc2ZMyesxvfee983vvHN48dPbN/24uFDx5QSiJhO
+p42JncP1Osms2fp6fU/UX0pprZFShmGIiNUweu65bZOTk9lslgQ7cimEAGbUBgg8zzM87W1O3xeB
+JUsp0+k0MyvlW0sHDx5cv3797/zO7xCRtfTSSy853AGgUCi4kUO2QgjlMZFMAkGe56ElAIi1yefz
+5XK5sbFxqji5cePGiYmxP/iDjwVBQGwXLVrgnF5EFOL1Qn+WGU4SzkzsrOcFpVKJiCYnpzZv2VKp
+hLmGgkUUIHzPQyJHQvx0ii0CsQLhJnnClCWRmxDuHaPx0MEj1tpLLpkDAOPj408//fT/8d73KSUB
+IJ0OXEDGjZ8QQiogEklADa0UgtPptNba931tojlzeq677pr7/un7pVLxYx/7WKxDrfXSpUuU8qEW
+53g9ZPazVIn6M7O1tlKqAsipqdLmLVumpqYy+YxSwphYkWBLskYHozjWaFGCEELW3QdqdswpNSL6
+vh9F0eTkJAAQ2c2bN4+OjOdyOcdlmpqalCeIrItPAICUUnnTeuAMmhDCWuv7PrGdnBy/9dYPffs7
+3/rYx35/7749X/z7zx87dmxycnJw8AQAWPs6LrOzTC4TO+NivFprIhgdG3/22WeL5eKqVasWLF6U
+TqdLpakXn9uhtbZkEYiInCm3xnhughNxnQBAU1MTAEydKrmoQ39/fz6ftVY/+uiP2tvbAWBiYqKt
+ramzs1NK6fs+SOFiDLUVaDp+6anAmkgpxYBxHP7Wb33w//zYRwHor//601u2bNmxY8ff/d3f/eVf
+/iWTkMKbM6eLXjeSM2uBBBdtJyKllDHG9/1qpWSt1Vo8+eSTU1NTfUsXX3/9u4WY9rZf2Lb9hZde
+zGRyzEwsWE7HcrVEsCAsCwQppSUTmdBPebmmjpGh48cGDsYWlyxYoqwNw3i8WN7Xv6u3t7epqUkI
+0dvbW61W77vvvvnz5wMIIkJEYOm8YkRERCBhjIl1pVqtLFq84Otf/2pra6tS6qGHHrrjjjsqlQoi
+9vX13XnnnfPmzVuyZElzcwsAMINjO/UpgXo03sxAglLK+TXudbVaFdILo+qmZ7YUi8W5c+du2LBB
+CLjvvn9uaMi/973vzWQyw8PD73rX9dVq9djgCbeaMbMXgxAiRpJSarJSisamFmPMoRd2DBw9UKpU
+SqXKrq0vRnFMRJVSxc8ER48etdam02nP81pbW+fPn18oFMIwMsYQETMq5SVBSiZ2zCebzf7VX/1V
+T09PHMfbtm37sz/7M9fOBQsWPP3003fdddenP/3pY8eO5XKFVMonYtfB+gzMRcqsaX0tiyQAQCk1
+MTGhlNq6deve/gNdXV3X3/Cu1tbmr33tGw8++OC11157xx0fbm5unpqa6uzsskjHjx9/+ulNlgkA
+pPUiHaq0JzyllNRhvHfX7j27dpeHx22AHd09PV29nb29XmvLxPip+Q15FjQxMTE2NnbkyJFjx46F
+YUhE7e3tPT1zfN8XQrrAHGEtEQYqjCrj46P/6T//xe/93r/XWh8+fPjmm2/es2fPHXfccfvtty9b
+tuyTn/zkfffdd9NNN/3Jn/zJnDmXzJs3z/Omldot4L9aWu+IipTSWhvHse/7RwaOHTo8kMtnVq1e
+0dzc/C//8szTTz998803NzQ0pFKZTCYTx7G1xvP97u5u31dTY1PZbK5Cxk+pbCY9NHR8985fHDx4
+WEq1csXqS//9qu6+uc2dPXk/k87n901NPbPxZ+tWXPb2NSsBII7N5OTk0NDQ/v37t27dumXLlh07
+XszlCh0dHQ0NjalUyhoyxiCiNlGlUnr/+9932223VSqVMAy/8Y1vLFq06Atf+MINN9xQLBbDMPzj
+P/7jPXv2PPLII8uXL3/f+27K5XJdXR2O6ri15zT6O1OZNeg9z3OtQcRKNSqXy5s3b9ZaX71h/eLF
+iw4cOPgP//AP69atC4Jg7dq1LS3NP/3pz++5554P/vYHbr311iDw0un04ODgZZct94RAo3/yxOMv
+vbB96dsuu+MTf3DZmrX5xpYRjcbTwyGemKp4UXwC1VCFfS9lLSklUym/q6ujs7NjxYoVt956y+HD
+A89s2vTggw9u27atoaFp7txLUqmU1gwApdLU5Zcv//R/+c9EVms9Ojp68803X3bZZUqpwcHBOI6F
+EC4pZq397ne/e/nlK3K5XD6fz+UyLtA9W3Rzlnk9EUVRJIR44YUXymG0cuXKSy+9tFqtfP7z/72z
+s72lpWXBggWLFy88cODQl75899q1q33fNyb2lHfgwAEizmbyB/fueuKJH6dy2f/46f979TuujXz/
+ZKXcP3xcBc3aFK3KeV5KEsScJUx52niedAzdmQIphbV2wYJ58xfMu/E3bvjxkz/55jf/50svvThv
+3vy21o4oijo62v/8z/+8oaEwPj7GzPl8vqura2Bg4Kmnnpo3b9611147NTV11113vfTSS0qpgYGB
+e++990//9E8bGhqy2R6llMP94hOKMJsGx8R+kDbGGEsnT548eGRg3rx5GzZs8H2IY/7ABz4wMjIy
+b97c9evXj4yM3XnnnVdeeeXcub2LFy/OpDNDJ4/v2LHjnde9+/Ef/Wjnzhdv+8iH33XTB00qOFiq
+lLASMatMU2hBgYcotIDAYyQBLH2JtViFkFI6ZuWCdMqTnR2dt99+25o1a+6//8Ef/OD+7du3L126
+tG9J34KF80qlIiJWq+WRkZEHH3zoO9/5ztvf/vbbbruNme+5554HHnhACLF8+fIwDB9++OFVq1Zl
+MplCIdfc3DwroDuZNeh93weAUqmESE5lqtXqyMjIvN6OTCb1vve9b3BwsLGx0ff9L3zhC5lMpre3
+t7e394orriCmv/3bv21qanr88cfL5ep/vev/6V3SN1SNhyZOgZ+xLD1WssrGR08IAGElkyAtmBQb
+0A4IB3p9vpcYiaxS/tvetqyr6xNdXd3f+ub/u2vXrnLp1Oc+97k/+qNPDA0d/8d//MdHHnnk4MHD
+a9eu/fznP5/P57/3ve99/etfX7Zs2e///u/fdNNNDz300F/8xae+//3vr127tqmpIZvNplIpR+Qu
+3uzMBPpkHT9jqalUKgxy157+8cliOpOvlKNHH3nsyjUrV61awYxz5vSAEA8/8vCJoeH3vOfG1pbG
+9VdeKYT4q//y1wPHhrS2jU3N/+2/fmaqteflyXIljkAqQiuEiAUatkx+hbMswsAqkj5TpJgYvGTd
+c/qYhDEIQAjFzBZtS0vDh279re6etrvvvnv7th0/fOjRw0eH9u3Zt3v3bt+DFZev/u63vtPd3fnM
+M/+6efPmz33uv//2b/92tRKNjkwuW7r8qquu3LJly+bN/9rZ2T41NdXR0XF2x9846OslCdcAiziO
+i8XqgQMHLGHAzIy+7z+7eevY+Pg73nltJp2KdXzllVdmM/mhoeG1V63P5TLf/fZ3fvHiS1J6C+Yv
++oO//E9TEk9OnbKGhOeRVAZRE4L0XLxRALAABgksCQBAnlHJA7X4nRDCE9JaK6SUIAixqaHx3e98
+l6+8r9zztaef3oSWmUVvb7fR0Wc+85m+vr6BE0e6u7vvvPPObDY/ODgYhbpcLm/ZsmV0dNTzvB/8
+4AdXX311Y2NjW1vbbFH7mUCfdA/qIjaVcllrOzQ0NDExkW8oCMGGECyks7m9Lx8oh9Xrrrm6vb29
+uzPT0tQ8Pj7Z0day7YXtD/7w/gwoP9PwH/7kz4aVPFEOLUs7naRmzUBCCgnMDMwAEkESCyJpkYgl
+sTqjYWfMSDcbjDFa61wut27dultuGS8Wy9u3vzB/3sKJifL/9YlPvPe97z158qTnBfm8EkIMDw+d
+OHFiy5Ytjz7yoxdfehHAAkB/f/+zzz7b0dFRqVQKhcKbo/Vnew2JtbXWvvzyy04pXH4VmQg5lc6M
+jIzd/+BDv/kb753T2+15Xndnx8GXD372s5+VBJ5K/cfP3jnkq6FKxJySvmRrDREhcC1qZgkZmJkR
+hSRBKCwKtNM+XWJk6nM1RNbzFJFl5lTKj+MY0bS0NF3/7ndOTU2VSqUdO3bOu2TB+vXrfV9J3yMy
+vu/v2bPngQceePLJp44ePVrznqaDB4899tiGDRs6OjoKhcKbw3ASnUp03wUCCcTw8PDg4GA6m7PW
+OuKBaEmIlPCV58dR+MQTP16x4vI1q1dqxP/x5S81ZxvLUfyhP/zDiabsYLHCMiNZxrERQoDwhUs3
+On+bhJHAJBFAoEdCaiKE06zN6Qnh6ZFARIegEEJrrZTq6em65u0bjh49OjY2fmxw4Et3fWnV6iuC
+wNuzc/eDDz54//33Dw8PSymJEEAmuUYi2rt37/79++fMmdPe3p5Kpd6cZfaMHgJAHMdRFO3b+3Ko
+Yz+TUcJDRCJ0Md5qtZrJZAr5hmq1+uKLO6y1W7Y+axgqpbBvzbrCZZftK1ekCHxWMSMwM0gBTABM
+0rILXXmWGRmQFZBklJaAAViKJFxan6VJIjYOdGutUxFjDLG99NKlV1111cjI2P333/+jH/3os5/9
+bBRV//mf//nUqVMArowQAUBKd7fpQQ3DcOfOnevXr5+ammptbX2TeX3SyWq1Oj4+fuTogFMuZkZg
+AAaAKKzkcgW0WCpVfN8Xgnfu3uMF6aZcY78e+MjNvzWq0aBMCU+TBiUkKCSwiMiChbQMSIIZjJCE
+wgopUTCwJfcVtr4x9b+T+KKr80kyJ2iM9Lxrrr16z569S5cufWH79i9/+csua5h4446kOr12XoJb
+M3bs2FGpVIwxsxJImMliXR8odhLH8cmTJycnJ4EFM4c6TqrJpIRyuQgARGTQIoOQqrml7Rdbt914
+24eKDdlyKW6gjDHWKAAyMVpDxgJbwYbBEGgCDYCWDbJFMMiW2BI5O3621CKUJIVgImD2lBIA1phE
+UXOZ7A03vPvKK69saCwkfXFhVxcHJCKXiHeLlps0/f39Bw4cKBaLFwm6k5lAXz/HpZRRVI3j8NjR
+E2hQArCxrK1ENsYaY0sRAUKoSxFVFXKkLae9fbtebOzsWHzVhkmjhMqGoEUKFbKgjCFfo6dJGfQ0
+epZ9y55GLyYPCSSnGGKWiJRj8CRLZ9LrCueJGYksS4HANjF8iJ6QgAQi0DER0fx5cxctvGTlihUA
+wDydAoM6xUKc5kjuX8wchmF//744NqVSpT5UOTO7P0OKmqyxzKy1jSJ96tQpRHRJCTfHiYiIgDgO
+oyiKojgOo0gC6Wq4a+fuRatWYiplQaAAlsqCsCAip7BCMglmRiJDSJQsKtO7IQhEfcHPGcU/029a
+hNMyXYzAlimOY/dnNpvt6+tbuHBhW1vbeXqalPwDADP39/eXy+UwDM9Go/7Fa5GLgt61JgzDUqk0
+MjLiEHexWWstIzESGzs9BETVuIrGTgyNjo9Pzl+7pkKgCQkYAZAkChEDIAMSEIAlQGS0hExMggQQ
+sGG2AAbZOKNS19Oz7Y6zNo5vurmARG6cjDFCiIULF15yySU9PT2vscvO5oyNjbmaQ7i4PeMXFUhw
+cy0M41OnimMT40EQGGMAIAgCql0mpxNYQFIQEOn42OEjvZfMT3XNPWkMcUAsiAUhCJAopCBGZiKw
+KCwxgWAWAAIJmAGZmSQTIxOfxSy5VuYnhEiGhV2KAwQyuH0QLnGotW5qamptbW1pafE8z1r9qp1N
+sp4uETQ5OTk8POymzkWSnIvaxiaEIAKt9cTERLlcbmpqcvFuUdtHA44hMGi2AnyhBDAdP3Zi5XVv
+t6mCNaGnPEYiALCSGFACsCIiQ8wMLCSAZAIEMsSChCXpyJ5BPoPI1/Q7MdaiZp1e+c3MTOzGxuUU
+u7u729vbfd8/F/TJcLrXWuuxsbE4jh1vhtNH/YIG42JjOESkYzs6Mu6MuxuP+l0yzGQIPM9Di4bY
+MIdx1LZwQUgeiABIWCKUHgAzAYOwzESMxACSQSIIcu8wAnuaWAIwA9YqBZxh4VoFgxACHEc83fwg
+T1/gFgCXTfM8r7u7u7u7O5vNhmHlVTvINe/M/WmtPXXqlFvSfN+/GMWfAfTkKmXct6JlY8z4+Dgi
+OsLrKhKY2ZNKKWXIKpCe9Ekb9qhYrqTzhWx3R4hgWRIhA1kmQVKQMJIRiVmwEEwCAZjYEjILYsEE
+SMxCMDvrwQBuLT99PWUGAMt1U4HO/K9rYRzH+Xy+s7Ozs7NzfHz0XB2ud+CJqFQqOfXPZDJnX/ba
+5YKX2dOnOTi7WalUXErWRXK01ibWWuuE56A2OoyEEOVyMZvL+Y0NsQULoAlRiZgxssYgajcUwMCS
+xPRmM7dEJ/OaQFBdNv/M1ZXZUUmDaBDrBwaIgdhRAGOM53lusW1qaurq6jpXfx3cjuQ4cMvlMjO7
+YElyzQzUfwYxHFX3Goit1rpUKjvQE4YrpWTBqDEwOe1VUITMmXQE1alxlW+LcwvQB0mKZZZYeASc
+AmIOCERKMgl09kdJoVgAA3PaBKEgCgIFbABsmrXkXCpQXpBWPgtHvZGZFZFSKk0KESEZMEezAAIk
+llqzjLUXZFINHOYC0ZLtPHd/p4vXa29QtVp25dP1s2EGq+4sxOsR0em7MziiJsxKCGFsOZ0HbSwA
+VsIQibKBN9S/+1DQ5YwzANB0KbUgIq6Rd8uARLZmK6yskhSGlYxtLkhPTlWaYt53eGpy+OeWEGoO
+EdSYuMZXtNJ5pw5HZcCIGJklelGkp8Kpkclx1XROHOpnubuJu1uyrtZfcEEyCwlCZ/h0bHVspapx
+SikRlZRSKIgjYsteGpBFOY4yulqIp5acGqk3Gq8Ev6R7kVDDaZOo2BJrGWQwJh+BAxD58sjh3Xt0
+yVoLLAFAKDkdq1EyxQC1Ocp14XslUughU9wYZIRXoHRHV29j+eTgeXpXr86JgtdTGp7e535hMkNe
+X98I11tn2QW+8qYry5EZgWHsy1QYRgiyEusWX97+G9f35oEI3fwgmo6TgCByqPMr8SnJEgA8TAHH
+FhQqpTwcmxq794ePqc75mYXrI6OZBAEDSJICiQBkKBBrNyMBhIxMRBShopSHNmSjY8zaKs3Tw8PR
+pvP0N4nEcS0U6srTZ6zvTmaepUpeOzbp+Na0nZHsQq9SSqujtFAiHcQ6FNJHgonx0YKyKtUoCABA
+yMTiEAB4NT0i54vWPKMwpXxW1kURlcylghOjkx0L1r5Y9qMICRhZWiRm0IjEBCSIgICYhPONrSVL
+WGLUxpo4ruqoSiTKlX+XL7aE9sxO1km9qrnKXFfCPwP7Xi8XZXBErcwvCAIdx+h2/k2fDoHTuu97
+BFwNQ8MQKPZkqhLF46MjTU2NSMjMYtqanxa64umMIACAG5bIhiSUpwRjTCiVxrz0dCX20rHEGBhA
+SGAgFh4wAZWZWACARAmWCAGMJGJREZoMSxTgBaACoac8v2KiY+fpI9c5TcycyWSmi5kvTmaQIIT6
+kXaNKBQKcRw7V9bZGbfQKqWsRlaeTZEQrMuWUEyWK6OT44vEEhZETAIEAzIwADCwEtOm5ozJnBcp
+Yi8qV6yiINdQCYvWcM5TGjzLHoFAEIbAMCApZvaZYTpmAGSFCwMjopIyAAlAoUVhbK4aF1Ly6LGx
+c/f3TKvS0NDgdnudscZe6CSYAbl8pUFOr1OpVD6fd+QyMYhSunAu+6Q0QiQ1EKUo8KUaGhs9cOTw
+hvVrgQ0wCSGFAGbBzMAg3AkGUFM0WQtPsjaQFikSCou6hJICH0mfEhJBkAAJAJYNERADufpwAm3J
+JVVYKiQyZJAiRIrJxJ7gCL3qpJeKh44O/bJev0If8/m8gz6Be2ZmZwYuFcArextZShCSOzs7kGSs
+ySLHWhtrIx1qayIdlYwN0UCVsGLKQBFrEZmXnt9ZjQywp6Sf0D5rrQSFUBePFAJYMgkmodmPKGIb
+cEQpEhELPzaxnyeUFoUm0IaYFKMEVNICWmVQGhaahWZZtRiijZnYpCooSfk2lOnYy8iUV9x/sjh8
+ni7Xsxrf911uNgiCemIGb9gBXEopgOkzNZRSLS0tKT+oliuplB8EQaRjqYA9EEIwROxKNgSFEUkp
+PE/t3r1rdHR0Tk+vtdp5hkr6QRBYjdOlHzWp81LF9JEG8IqXxC5hS4RC2OnwJBELRtaMSGQYNDEy
+WIsWLSLHbHwGXTaBJ6NKaUk+soMjYXS+ZRbqYE2lUnPnznXWZmbQJXLBWu+2hUDNv1BKuaNQ2tpa
+qtVyFEVhGMexQSui0IZV52kZbSJEjOPIWpvL5Xbv3v2Lnbund6bx9O6f+hgL1Gx94oji6VEB94qI
+DLMmMsSGWJPLKVJMVrs/kSyhttYSIjIiarYQGw+VrmrQldWF0skD/cacr8v1DWtqauru7q63MzOm
+mBeVmwUAIUQ2my0UCl3dHS53E0WRtdYYG0WxjjEOdRxqE1sTWxOjiTEdpIunips2bZqcnHIFF1J4
+AGCMkbUgBZ8enDkjRuaKdNxlhqQmoRFiJE0cI8ZIMZIbCU2sLRlEY6fThKjZsjVowXhzeWqunNz5
+0kt43tmfBHCEEMuWLXPHG/1SZH6pzLyGLcnK5/N53/e7ujpK5SmLGtG4g4Tc9qU4NmEYxxGGVRNH
+WK1oo0UqKPzrv27evXu3o+lJPEQI4TJKCcTMTMAELBhEbTwIXgmqIAOS1MTasrFsLBliixwjaYuR
+NrEx2qAxxmi0hqT2NKHGEEL9ng5v77YtR8cmQJwPh3rKu2bNmnw+n8vlZozbKwDO4DP1bjQzp9Pp
+dDq9YMF8IXhiYszY2NhQ6xBRR3HFqVoS14yiKIqiXC7X39//8589PTk5mUql3CDVzI7LwQr3gwxE
+Nf4DAEjJJHCrsbEcW2u0NZa0RYNkDb3ymtgiW2vJMlkki0Kz1drDsCceXyqLjz3+FHgenHebYLLG
+plKp5cuXB0Fwrl3kr3uqpPYF08ud73sNDQ1Lly1Zumzx7t39ACyl9DwfKbbWBkHa0XxmltYDAGu1
+UqpaDR9//PHll7/thhve/coWOOdKJVpfb3WI3P+ISCSmH1jH1mi0gi0yAVsCZkJCUwtok2UmIIuM
+SIhkrSLOlErv7sAXNv3k+MgEKCmAzmUp6unNihUr+vr6HPTJVJjxejtzg1P33VAoFHq7e1atWCmA
+4qgaVstGh9VKkVBXKkX3E4blMCrFuhLF5Up1Kp1OP/fccxs3bhwcHPR9X9bO3OPzSv0y635rtIiM
+lhHR7VVzOStrrTVkDSXTzhpCQ8SxiEyrkKsbyv/yLxtBCiA6jwImnEJKuXr16s7OziRsNWPonMwc
+eiGmt2MTUWNTLpvPbHj7Vbl81qBGtqVKEdlGOjQ2jnUY6zCKq2FUroalSrVYqRbRGCJ69LHHNv70
+58MjE9PGgcESWkKXzyOLaKxLcQCAMTEAkRGMQBwhIkM2Aqyg1kgWpbZsUYbGVq0VtoxxxCQN2jiq
+KoMQx0poYK934tgnFvLj935rbGJCchrYN+c9B8F10/f91atXW2tdpfGrKvsbtMyewXN83+/r61uz
+Zk3SJldabepE10kUV4XkgSNH/umf/mnjxo1MAlg65XXBOJdCErUy5oRcJvru3nG00TJra2Ojq1Gk
+rTHWRrol8v0qRzbClMjFjChQaC89vP83L+vatXXjU5ufsxIEhz5YEOczvMzsed6KFStWrVqVz+fT
+6fTFk3qYleOkXTsaGxsbGhquueaaZ5555oz0DbyaOiAa55c9u3lTPp8vFAobNrw9k8kwGVfl4knF
+zEndHRODgAT6xA+IjdGWhLSayJl7ZGDg2Cc/tsoggojDUgasZKpMTvze/FR2eM///F/fAA/AlxCS
+B8Kc16Nynvb73/9+l0AHAGPMxZ/XclG52fp3XEnFypUrFy5c6OhKze9gxxjP+nHncUk0duPGjQ88
+8MMnn3zSbeGAWvWLq5ytH8IE+iQ1SgTGYmzRoKVaEIKIvHicw5KMwgCjIJMKI8PHDt4yL7MoPva9
+r/4PEhIYICYESTJQ8EuCxldcccVNN92klMpkMm4SXChuZ8vMb1HvyzGzlLKzs7NcLl9//fUHDx50
+15yvGFGAqB29YY15+OEfViqVarV65frV8+bNi+OYLAZB4HZCR1GkhCRBQNPou1orZkZiRCQAJHCR
+Z0RkssL4wCgCChFh/FQ+LH54xZy+yt6//fv/Nl6sIviA5HmSWcakfQ/wHOC7FfW2225rb293J4PN
+isrDjLc21AvXaqN7enomJiauu+66F1544fnnn0/OB3n1GzEImZSD2Uq5vHHjU6dOTZw4MdjX13ft
+tdfmstlisRgEgbUGQFprEdAjD2CaNUopSYg4jg25qlciy0AoiADRWE+pVFgpQam0wJY/um7e5K4n
+7/zWF0eLFEhAMgC+ReGxVgCGxVlR6mkhotWrV994441SyoaGBgBwe3QvFLez5aKqz9yLhOcAQEtL
+S1dX14033rhr164zakLhjGHj6TPdkrK6aqX0zNM/r1QqY2NjQ0NDq1auXLJkyfTGIEQgNGRIEwIS
+CHe0ohDCHS3tgSQCRgJrhUFBNoiqWk/lo+Jvdrd+oG/+w9//+/seeQR8T6rAYAQCAAhYIkil+Ny0
+HlKp1G233dbZ2dnQ0OD7vqsiuZhseCIzhP5sh8Jt1O/s7BwcHFy9evXKlSs3b958rk8BgIuw+75y
+7MUdyCgEbN+2bWRkZPny5UMnTsybN++SSy7p6upqamqSwBo0xmjIKItRFFFt47Y1xKSZhSAGjRzH
+FEdZXX5HW+G6RZ44teNLf/+/t734smDBsVXARgBIUIgskCBjCQPWr172B3D99dd/6EMfchTO/Z6t
+80FmCP3Z1EWAcPq7ePHiarV6yy23HjhwaGx8nMkmw+MudrrDQABgTC0Ug+5uIIQ4dvToyaGhgwcO
+XH755YcOHWpsbOzs7Gzr6s42ZppSeWDlZ211/JRJt+RNzOVAaEZhgAxE5WxloltQX3f7LT3R5OTQ
+k488uXHjRlcfadAAgAEEBkBAcDYmBIAEd9e2ZBlbsGDBZz7zGSJym63h9P0qrwrLa8dw1naLo7XS
+U4jY0tLS29s7OTl16623fuWee5wxcdc46+/mrLMkZ4tLPlur9+/fe/jwwSVLlvT19Q0MHE5nco1t
+TS2F1kw6LwOeOHEUtZcCk5kczLHJe6LFx7agurBFzEmxDF/+7ncf27ZtW7lcdudL1QN6ri64rf5Q
+w1cp9dGPfrS7u7uxsdGFKhMTPyu7xWfvPBwGkK9o99atzx84cODb3/nOTzc+dYZlDIJAn3N+A9RO
+NYIaxZRStra2ZjKZrjm9nZ29ba2duXyQEdjQ0pnuWTh2YsyXSgFXi5OHXt4zcOTl8dGho8cGufZU
+CKjFe5M/zyWuYcm3f+QjH/mbv/kbl/50blRCcPmswps3qA7nXJLwGaXUkiVLSqXSzTffPHhsYP/+
+/e4C16vz4w51yuWgJ6Lx8XFJNHjiOFkpPK+xkG1qSGcyuYqBZtJTU1PjE5MagACMAFAACgCpHnGu
+28H8ql8qpXQNc1ded911n/zkJ1OpVKFQcAfjJQctzTgZeyZcs6j1BNPFT1rrIAhOnDj53PPPHx04
+/MUvfvHYsXNWW5zZoNoBrFw7cmmaSgMgSJAKhADUACAAfAnahdpdBRQAICgACcqKM2vzzoP7GQ1Y
+vHjx9773vb6+Pqgdd+f85wT0sxnODLR+9k7yqmU83GJLBD09XQsXLuzt7f3oRz/a1NSUnH54flfQ
+2dlkq7HznqSUnqodME/aA1BewAIEgWQAInBFuAwgFIEHoGq+tBC1Ey6pblfUq4orY+np6fnqV7+6
+ZMkSt+0kCR/VyizOqH6duczeOZfMjh64JjIzEVx++WWXXnrpZZdd9vGPf7ytrS1xvn7phE2WRFl7
+rIVGAJAgkgpWcDEvj5VgKQwLUkAAjEJYkjoxNc5kSSl/6QFOziv85je/uXbtWiLq6Ohw2x/k6c9R
+gQtkMueSWbP1RARSBEFQ654QAojgbW97myuNCoLg7rvvnpiYOH//k7S7lNOHXbrXAJJJAKGnQFmw
+IEAoATYWRikAC8BSgLLALIFO2+A23bxfqqqLFy/+yle+cvXVV1er1ZaWFqhLgr4e8ro/MMMZjZ07
+dx48eHDPnj333nvv3r173aecG5VcWHtB9Zb0YvzGxLi/qrlPDLd7Z+3atXfffffy5cur1Wpzc3P9
+YvMavwsusADtjYDeHdG0b9++nTt3jo+Pf/vb3966dWuC++mrn3RBzTPQT84teO0i6gqDnf/p8u+y
+jnQ6xhUEwU033fS5z32ura3N87xcLpfEyF7jygy/mtBba50VIqITJ05s3bq1Uqk8+uijjz32uNba
+WQKoQ6peK92fM27h2TPm7Hfa29tvv/32T33qU65+OJvNJkcXuja/xiDlryL07hrXAfcEpK1btw4P
+D+/Zvf+BB3+wb98+mLY8tZ0lZz11Y2ZaDzWfM3F/6t0FNwOuvvrqT33qU+vXr3dPhcjn8y4rwszJ
+EYK/xlrvDI6oHaotpQzDcNeuXUcOD46Ojv70Zz954oknKpVSbU/wdBgH6rjEzFqYOKX1kQyo2bfm
+5uaPf/zjH/7whx1tb2hocLkBqHHfhB39Gtv6ZGuvCzklLTt85Oi+ffuGh4cPHjy4adOmbdufq1ar
+aO05wuYzkbOXWQBobm7+4Ac/eMsttyxfvtz3/UwmUygU6mdVwtwTy/Mavwt+1aCvRdV1sg1jeruT
+lEj48ssv79v7stZ6//79mzZtev755ycnxhI2Uh+EmUE7kySl++zcuXNvuOGG3/3d3+3r60ulUrlc
+LpPJuDAZ1R6HR7VCUldCUseVf4n8ikJPdU8hdRxDCEHAUkgAKBbLx48fP3p0sFwuHz58eM/uHf39
+/Xv27CmVSnARBiexWs3NzatWrbr66qvXr1+/bNmyTCaTSqWy2ax7lk/ieTnFPwP9147jryL05/l4
+fTQqiqLjx4+fOHGiWCyXSqUTJ07s2bNn+/bthw8fdg8aTMbAXV9vSc4eHt/38/ns0qVLr7nmmg0b
+NixatMg9HDKbzTrjPusygxjOmw99vRVCxOHh0cnJSfdAwUql4h6QNzAwMDAw4J7FGYahK+9J0Pd9
+P1HkhoaGBQsWLF68+PLLL+vs7GxqavJ9P51OFwoFF/idlRjA2fLrBH097m5ZS0JdiGytrVarp06d
+KpfLycMhnSQPJnSBLbfBw/d9B3E6nc7lcrlcLpXyGxoastls8rQleF2f+fLrBT2d/pDf5M/6pdUV
+HxhjKpWKO1fQlSUnk8YxKHeTTCbjHgzmCmaSG0LtCLNZPAL9DPl1gj65Sb3rdIZBT6gO1NF8qNtq
+ArXHJNdfxnVH+5/RvNfO0y9Ufp2g57qAMNRVlKi6Z+/W3zwJvkMN3zP+hFr/qXYsT/3Hk3+9ZetP
+O3GjPpuR3Dx581xflIyW8z/duSQuvE6vPEtN1JIHVP+pWZdfJ+jPVtuENdabDndxfdw8oaTJp5KA
+gag797Deea6/+f8foH9LLlJelzXnLXkt8hb0b5q8Bf2bJm9B/6bJW9C/afL/AQ58BLWoeWRdAAAA
+AElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_bugatti" model="fleet.vehicle.model.brand">
+      	<field name="name">Bugatti</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAA1DUlEQVR4nO2cd5zdVZn/n1O+/faZ
+uVMzk0lm0nsBggmJEgMEQWBBcEHFsruyCnZdyw9XV/nZC6AoKihlKVYEEakhECAJ6ZVJMpPp/fZv
+Pe33x8QQSlxY2Vf4/X75/HFf3zkz997zfc/zfc45z3meg5RScFInQvhEd+D/X51Ef8J0Ev0J00n0
+J0wn0Z8wnUR/wnQS/QnTSfQnTCfRnzCdRH/CdBL9CdNJ9CdMJ9GfMJ1Ef8J0Ev0JEz3RHfh7dXS/
+ASF0bLuUcqLlZe1vHqE321aJEAIAEEJ/J7hj7+vYa4zfLA/6mw79f6mJDh/t9itRTvzqTWvsR/V/
+H/r/Z/Sm9vWv6jSOmvPEhZTy2Lcc/e3xTOqkwzkxUkq9eRzRmxf9sT5dKTVhrUd/PHpxdDQ+qom3
+TzwNx7a82fSmczhCCCmlUkoIMXE98aPv+wCglDraclQIIYwxIYRSSgghhCCEJl6PbX/zuJoJvWHo
+jzw8CBAwKRkgqpDOAQwJgKCCogiiNACSSGHDBSxBxiHkEHkKYeEEkVIy1PKFUsmujPZ1yJHhcknv
+KOqmWTLDWgo5vTVOSoiWU5maUh4bZiziY3GtiHlmFJWYwatoyhsJKkqVhCeiEgv1SQIKDk+2Ns+0
+W7huVLdmm71Q45l8HdiSG6AXDaIJsBkUTU6BA+g2kwhjj0ilmBNpQCiQF++RRRHGmFAKSgH+ex+m
+N87hMJAIFOEKSQSKKAqSgASJAQOAkkAwCACuQCHAAAwODnaboeflK7tHRijRDYgKWqUyFgL2k4LV
+1zbEp0ytthL+wUMQlmKr31mrRfDL+/i46338Mps46tbf8WKvedm/oBo9fHhDsbO/6t3nkFTcf+QZ
+3S8Nzp+LTZnbvWegf7jLxJpmNCAaUs9LNY55I3NT1U12VqSrm1ONFlNgMsCUm9gDwMBjkoBQgHCF
+8piinDEhhGEYgBAAKCk555qh/53A3jiHQwAjCQgEIACsACMBEAE2gCMJFANA0eWFkXEeeJEK83vH
+d0aHM73DmVTCXzVzcW1z7dN7lRHT3veOeFD2Pn1jONqR/tZsGC92XfV96Nivnsn41WT0i98oD4w4
+Z7XEqxsOf+v6nV2b5y05rXUs1n/1dQOHXpgxJ1U9tWnoy9cFG7fUb30yNTWbfnB34+GRU66/KtXU
+oH6/rsdBZrymJ2309xw68Pw2XznTaqdMrq2WLXEr0mO6XjOpAYBCJMHEZQQcMIsiTdeppoFSgnNC
+KcJY0/9e7vAGoueYUQBQQAAJhCOEiA5UA45gb2nQYKq4d2Df3oMC80S1HmtNZRY2nDv1rfb19yXL
+EZ89M9Y/dvhz3+P5kZq/3AoMjf55S+/o6IIvXxmbXI/nTI4lrXRdG0yyqt9/eaa/FLbOQlYy8+5L
+6vCK9MIZ4NCay9YkeubHZs9QMdNYOJ9rOAEGFPyRP28a7+hOf+b8lA+HPvWjocrAwlt/vHTVgqan
+D3plW7/07aGG8wcObj24IxwyExGb1JRtmNJak2609KROIB5xMPQjgzlCBFOlFGNMfyPQv2EOpwSh
+IaXBEFBdEFwGUXCL+fHcyPMd/Tg3yTANT1ozptbZln/fn1Oj/dmPXAMqfGbBZWisMHfdL2LTZnif
+/N6Qyk+58XpI0JH1G0bzebl8npVO5nfscnmJ8BbIaKhnUBT8QtImEqPxPK+mdlnzmi1ZyFcxHbL1
+xLDF2AiKw5TGNmgw6APPEoTHLlw5BYj3T9+rdB00f3xdNcGHTr2Sj+ebnvqhM2uyvO1PveOHvTUX
+4QzpKvYWwkhVqOapBVNa2qbW8UTVxIgthFBKUUrfqBnqG4Z+DPwEaDqngGF/b2f/6KAKKjJfQoHd
+0p5p6uiv9I5Wve/80PN2XPax9LNPZf78YHZxW/mOB8DlwZVnoWRi9LnnO8yi6WVEVIRS3iix/l3d
+KudS7oesCCOj1A+ZRRBgc6BMEBUWIV6geVrFjCoZHLNTooCi6nSQ1RM6inA8mmQ1xO2a2obBqkR9
+IhvLFSBrVJ2yxlKB9e3fOJVQfuES6Bvd846P53peWPr8hliNFTz6RDHk40vm7HbzMiwa9aSmUpXJ
+ZNrb2yk54iGkkkIInWp/J7E3DH0E4BVKXsXvHOrf/sKOGI+WJWtaQsTfuTZGyruu+FT/755e/vMf
+xC48y73/Idmxd/gDV5AUqnR25jp7D3f3uZ0D+tBQJRzPdEZ2UDHHxquNhCswVSQluc5cFZchZ8oy
+qamTgBugmZiSQDArjqRXgrKtNDqufFMro0q67I5ptb4eGlgRMMao6SZj5TrTbY8LVBPNSLe3NbdO
+bjOnTK3PoYE7HqjKWKnLLstveHLH5Z+uTTXOe+SW/OTavvVPiITX0ctzuVxbW9vs2bOrqqo0qilQ
+CN4As3/DfD0uhhufeKa3kMvOnLxizZnTJeYPrN98423m3pGlnz5v8juWJVJVZPGMEUfvnDLpBTYi
+b7gdurvM0jgZL2YGSjWlchURDYpHxLYymmYSE7MRiqhpWBoUsNoZ1u5AZdf1BPNGY8gMw6rAqCRN
+bXSkkBYVrXyKSq9N10wxkgUoiip/EqGeGyYVAsAxTKNK5OwP3K2HEUuOmd7I5NiepqaA2YkZMyut
+iYbZTQu0kCxvm/vBc+t4CjKZ4N714rqfzV82dfpNXxkeHs7lcg8//LCU8q1vfWtLcwsXXCN/L7rj
+vl8IQQiBly6+lVJIIRAKAMY0hAM/I62Qykf+8jAe7h1ubVjSMjP15w1Ve7vMK84Z0Fh1T69fl4Yo
+yc+/eFPDU6Prf09v7HJ2HK4aKDdURiYWPkeWPDUOIUQgBEJ4UikrhRQghIRCAcM2tndQ72viwCyj
+rl3Zw7xMETxEgkREdcdMk6jkko2EPUrKX1PaKSHrsHzO40BTRQAA0EHqRAJALJYwEE4xs3XYD/v3
++lh6+573bcI0/KeFp9FpLWTVkvbTF8+v0e0G7bBZmjvoKqPUtHuXvqmjasnMQ/Fw4/o/7Demzlz+
+jqZ6FihmI1MB4oB0BeADmK9j8+m/djhH0U+sJMsEG4AsBYPCryPmaMfh7z/864VTZ6xctMiqa0R/
+Xvf8BR9K1mYWPXRrZdZUb+/+FwoD7sGezgfW4d2HJ4c4XY4coRKmGenR0c8/9uswxkdapJoIAxBA
+CKFHeLQDCgvArkEwXXeGgH6WDYyj5E2B0YKlR9Fdlny4MHCpnrwcJwQwjl/dqhhSVAKRAEoJBAFR
+PlEMKaMfoL7qoCH6q4zGFafMX3W6QHL2ihVKT+xeeYX71NMt3/4i+vT7S+Aeenh9597uRbPmLlu5
+EpgAizCiNEAK5KgKssh+jeiPa/VH1+gvG83jgEgI4EF9zLz7zjuGRgc/cfll3q0Pj977wzkfvRIa
+69uveleqtZE1Vj/31IZ9t/2mbvMWWgxmVFir7sQJDkjEbMxMn3AdXhF8Pxqcgb/GIJVSUimE0NsE
+Xk7qOCGP4wFJqA2aGaoaIatNuwZEmSKLRBwpV3EPCYngeINggCTFyMZEB2wo0JQ0uWRIOXVYD0pN
+Y1E4SA4c+NOGdZu7ZmSby6PvWHvltA+8a6CtLjZ3VvzA+MiPbplmouWXve3xPYM/uP76yz90ZSaW
+IFJwrABk9vUMAce1+onw00Tc4+i1lHIMUFag8V2Hbtv0YG1b06rVq1IFt3LlDwr33Q1f+WTTtdcE
+0n30F3cdfGprbWf3zBc6q0DHGtV1ClgFLERYaRoRginlHEV87IbU0SAw+mu/kFQAoExX0GyFpT4e
+7evQvUVaZnuUM5Q2icUz1K+Ebhc1qqX+RSN7hmRdtpfwzFe9Lx9JooBKoBIIIACQCCRGY1CO6bou
+pEGNUoUFmjPOEaPWvnlVU09fNO+frshkmtJ/eOrAez7h1Wdm3va94qLWAwM9f/zjHy5ZdMbixcuE
+JUeDUh0kwHytY8Bx/+7YYJMQglI60WgBPP78puc3P3v6vHnLPbP4h4322tPkmgWVGi/7rjXP79/+
+3Lduyj66bwXTbVqxE4Ils6LihiE3ONiaLUEFPOJIM//6+RN+DP5q+8cLcmkhi2RYZO5wVB5Gfglb
+UnINaA+UAulxHlaQigFWSlGOqCeOd1+WQEiqiS/joAQCQAgQxIRjG1bZL5V4hWrQaDqtIQnGCvOe
+C3cf6Lvp8UeXfeTD71ywMPeRMxO1TXpbu7Fta/to6QNzljy28Rko+YvXrrbMTBTBa19r/S1fP+Fw
+JiKFE+h933/u2Q1b9+856+LzJvWWu1d/DlOofujazOJZuWLhV/9xg/u7hy+UdJbQKiFybcqxW1Ga
+joiJKRISIRRi4SuOTD0WCnhpEPhlG3tHrR4rQAjVRzSvk2HE7xKHmjSzFlfd4I6QKPlPtVq7G1Bi
+3W3h3+R6LtWqPoyqacX1E68OQWcKMFIYKQCBgSkpQQlQJjcJKBV5McdgKhr3ykInZiJmjTksGKAN
+iSciOThv1gVfunrWovk93X3sXdcObnth6c3XDl254kc33XJa87wzV5+TonBsuO1v67hWL6WcmOQo
+pSamOoVC4YUXXti8e+NnL/sQVCXGip5aOT1TU2O0Nd9x553dv/zNlO5oeRCv1yp9tOjZVQlOE2OS
+Z6RUMqIQ8ABzFdNNPZC44oU2PXYUwcc8BMfG4hFCGCGE0IYY3kvcRdK+ImqZjPReTDWj0EfUVG62
+KUSxU0/AVBgwQrpGwQFgr3pfHCkAUBgBRkIpQAikIhLiEhhCRUQqXFLdsBKajoTyov6GquocsXPj
+a5PNW5868NQlHxu44h0LP3R56q3LJDFQ3GmC2P++8l9/f899d/zq5o9e9D6oNl4j+v/a6ieuoyja
+vXv3+vXrL129ovKd3xtxp+Z//aOVqXaHhn76i1tiP3xkNR6J46yhm2OoUKYS0xSWgpJyDKxKuWzb
+NsI45FxhxEAqhHRBj/2iY/8HR0Z4dWQYoAhjjG9n+Rvo0KWidXEU76elgiYflsU8Nv9BprPY81m0
+EeNcuXKVkTmTagOmn+HWq94UU1IppRBIBAQQUkABIQUu4QYyTGVqAnPGOIqwqZiKNB8ndTLOokA3
+axXISul3kdd7wflv+8YHVmenASP7vvazdFcBX77iHtG7QK9ecfba14j+uLPQEEBAqMAPQSoJvXtL
+6x7bfvFVH80Mdo3e98DwA4+HgbdhdN8tH7xmxjfuXZ7Rw3htPk5GaKQ0y1aWIyOLQhQQ7oXEjpeU
+JrhuFFVNpMU4ZVJRzcoBYCMuGS1bRs6kTNMVNmwwOaUl4SIShcStJFik+RnfwxpOcPkHOvQVo+dr
++thD2E9wWXBy90QHv2+O36PGXDZ8bjY1LeYUKG4rW5ibEXXK8dgoQdK0BOO6hiThjowIkFhgOMoa
+15jCPM70kMTS0pJFT8cyFBVFGUKKCAoe1misAytfR3UaGhHlSlXsMqd2xUN/2XvW1T/f/Ke8no+t
+f2rs178wh/Zdff67123t3fLE4xAxYCEPSwFwFwAUQPgqhI9r9WWhYkQhYCETw2OVu2+746Jzz2xu
+SOplLu7fSBZPe7R0YNt1P1u2O9do6MoBE+meX9F1HaSKogAJSTAyDCOSmtCop7ihUcQiKXmgy8ii
+1YN+aFFCDBJwhBDBoGMUMiYRrRCONVpvOrzohpKHCOm67nnQn9TGlQi4QlTTCm69ZuQg0J1UKCO7
+FLAYraPa1ADlqRdIhjQLCwQRNzBVSEoVYckJKExAYotwQ0qOktgv5mM4Lqy4B6Wje4pH98Isy4oV
+lXBoxAPC+YgtdN2cNgxFHQby3sb2lPORS942YzF7oadm+VzV3FCWcMv1P7/soounTGsDDAEAAKFc
+UYVfOds9Lno1MdApCSx88KE/Jzz31Eh6j21wrvqUXDblyS2Pdnz6W3PXdUyvy/pxHBWK3HC8KLTj
+sSDyEZcOpQYHA/A4MS2DCh5IKTHR3ErFMqmOEMdRXDcrQahJanvIMLQCCQVlLtFS2FShcAPOuLLt
+WAnJHJFtubDedJgmIh10XS9WyikjZpeEsDUvYrgU5TKGFLw+kv0x5scRAqJVOC4zTIycCEhCx5w5
+CJchBKELMByEmmy9tzTqGwaNDEUiTdNc1zVNU0o5Mcg5jhO4FVOicY3HSwxXOQJBtiQrFjSG+r6h
+8b8sbJj31c+fvvY8tfWA+4s7U9Pjf5m/sPtg53sv+0fHtLjiBtXQEZovJ3zcYRZNLDY1vO1g5+Z9
+u778nvdu+viXxW8eyb7j0t4Gd/1/3LBi3Z4l02d2y2LoucmpLaCl04ZOHUNVKgYlMUn4eKn3UGc8
+DZZkIKJxwRIzp0nLsSkdPtgVi/LYlX7CLk9vrQRajOgH92yZg508jWiF8wAXqtN0/rTqyVMNJmKM
+l3sOhfsPa8PjcU0bCnNBxhxixXSMlsM8WdiulBbZDg24GC/3DnU3V3RUqhAnkZkzwzNtQEpRQIIB
+Dy0NCNddRIgbDO09oDfU0ynNKs8pAU3T4gAYY865UkrX9cOHD8cNMxS0sGKKWUSOJ8YPHUCaDExU
+wFF9S83snX3d/3YjjdVNKcnyTx/stPrfVuy5o3fg+d27zjj1VFNpIKRQHCgmr0D9N+f/CriA57bv
+WvWO86Cxoflf3ucuWuJN0XZ94TtnPHV4XkPTAVwyikwPNP0tp06++l+QRjmRQghD04LBsZHOnv6n
+Nkz7w+O8nHcoUtXJ2ivOo6vOCDVtw913oetuXsLs+nPPsD//AUVTlb7hjVddXd/tVaXpuB84C+dN
+vXRtevVbaO0kkAAYwv0dY0883fnjWydHYagCLLDyWd6yjeps8+c/TNunWloSPDGyfWfnjTfFNg9I
+x1BL2uo+dZVqaUyZSVYumwbhRDDFHYiN+MGOJ5744xeev/icNSuv+RAYCR9YGIa2bTPGJqLzmqbd
++9OfTvrGXasWvKXq3z9TY2fyew49et23a3d2zVPJgm3nUbCkrqa6e+APX/ly6ttfrf32VTNMTn3x
+wfPO/+qPbli6cIlGCQAWggGlrwN9XocYQK57jPaPrVy1pvv2P7W8/W2w+sz7bvtu+smtrUh307pe
+LNer2D7pt8ZrUHOLAkAIRMRA18xMY/P02drkqS/s2Du6ZWAmtpQAUl3HJzW7AF26ts/00iWYS2x7
+0lQXrKKTuR8qSex/wM3kWlKJ95yT/sd3CpqggH0QLiBj4dzqyQ2bt23lz25rh6xZiBijFYyzqcb4
+jCXlbHUIlAIM63xbczLceGjNqGLI0qa0sYZGBqCnaxAFDlKpEMBKIAj2djwzMrI2pJCcxBOmBhgE
+A0I0APzX2cdAqDZFA6dRs3ryNABjhMMD4LaXRldk61MlMSzLbhLXETrlqc3bH/zt27/0BVrR+a/v
+105fPKU6s79j75zW6bah61Tzgb+S8N+yegqwb+/2xpQ29qvb9/zwtvgn8uOXvvXQjXetQDFwUMXz
+m1GMYRiBisV4IIESGMvl7rnrbg2TNW8/s21qW/28mbsvOKe7s6slxCY3aahTBmkKNWX+azMIzbiI
+GHDiRGBF2mHh7YB8RVTXrFyWPX+1RxPI508++mRXfqBmesuixSvq0lXxK875045n3x+ZjqSewSUL
+/Ob6pBMnQKkPRIemula9vXF34rm1TEnP7Vu/YX8mnRN49RmrYpQIJcZz+b9seMJykk9t3VSysds7
+XHp0w59SYatWtWDBAt3RAGDH1u25XE4pVegf3ZUJAhESBRCBQ80ykSMGY4bEYZkmnSAKHI1cnGm+
+9Sf37LtoLe22d/7bV423n/YPX7rm/n17ZrXNAASAqAavMqAeF33aB5Cw5dCOt69ZWvn9Y61pPUb8
+Bw9vbRoI0hWjPuF0Y9WPg6xhxkOVF2N6pWTGY+7A4I3XXVcs5tM3XD+1uQHpmr36rO6bbusez9mG
+DRR7BEIEnsXSpbDWsFyTu5Q7gZ5WWp0yagM1Xmc2zZ2lp6o4l7ue237df1y3YfPTF5y95oyfzTez
+6flnnfP1r3zunL5K1jDHbE6DKL92tu7oPgvtkTBFtHSTUVeT2epw6arKYPdD373hvtGRYcOcdvd/
+Lpg3Uwe49/f3ff3fv1mVrPYNHkuao3v23vON7362sG3FrCXXXXfdrFmzEKCf337zunXrKKWu6062
+NC3wXSwSBALfI1FgUSX90kiqMmo5UyqGQlhiv37c23//o/Pbz11kxoa9IFFTdfjPnaGMYkjjQYDs
+V4nmHRe9a8GYUh7VW6ctj390ceXSDx4KCuEPb28dLMZaWw7jinIDx7R4oDKhUYnb9STOMaJCr5TH
+3hc6a7f0ld8bJpSdCu3HDC+h8hc7zSG4NuM2oX268LVU6JWTHrUjW8ZUPhpEEjBKNmh6qSktwbIp
+PNH9zJ796z6XsFY/v+vJ239UmdxaDmAwsh4i+fmo3gkNP1k/dd4pOpDO3NDDD9x/7jvPJ1AzY+qi
+x/TsFqO0KifXhP2Tooob2emowIjQJPRHUOzv/ryvmgGCdDYNHAb77+6LWJzbEEWgmQK6xos1Bwc+
+rFcxvTwbNURIIjcC244TKowUF5ZOaMzT9EhVbKaLKO0YM1g6f+8T2gP/jB/4/cx0IsiYCZroPNBh
+zl/oKB04fSXp46J3IhCDIzNratRof/Gx7caMRtVkje7adZodg4grXVJKpVIKAcYYC0UNCBiYsdjc
+BUtqtVTyzGURiSmA3R3bR8sjQoQQ+IZheETaAGliHhutRPDiVgyPwhimNgCEQBRtSiUW2G2zImfT
+j++9PyrsiWlQGm7ONhVKFY1p9amkPqUOhBzvG3x6y6alK5e3NmXra+uimlhxuMAoidNYc8JxQztm
+WggQSFUr9KmmMyfd0ChEjqqY0DWqKzvrpbJZI2YAgARHM9Lp6unxJmT6eHT8aObaxHx/YrFtaDrD
+WCkBGBUD11JY88RwuVBb7Yw98ixZNCVVa0f5cUdK0Omrkf8bvh5zN8jrabPy1Fb3vV+3z1uS+/hq
+zfVSloMiQSlQSgUCgQADIkL5rGRayar6+m9+/8bJqTjU1WIgm7ftufGm7xVHhqakmmgQCCwU1UEC
+CY5EyiYCxuqv3AEAyciSQBUAAo1poig4JkWGl5UZl/rceDottbMrMY25JSfmL5qipxxDylzPwKZn
+nxsdGZkDc9qnttUunDGwv7sMkFA4iQjFGgq5AqkwRn5kCEiAlgTwI6ZFXANFFOgS2wwQEyAIUdKS
+2GGSSB5SOpGRAMeE+ZRSivHIoAhAMwwW8awRszxeEqHz3XvKP34o/clLEiua8lFlIj2Gvxro42+V
+UBDZdK5bWbEUqsuylK00GndSXFY0TDTAoEBgkBhJKYkCoguEJDLwrPkLOIUScAewW/GH+zrbEFlg
+VWke83ikA4AAXxwT1EUAx2yMmIRwEWEpCCbSF4rRhpVvaT9ztVfvXUBriohu+/L3jf2dGmBXSbm0
+1VAREpAbHg27hryD/XBaqNnatNapvRSNSGYLiRmnEcURA8CAqGeoCpEVzHwlQwIAKJISiIhzCSCB
+AmCQFEvJhR+C9LCFX7ZfdMRgFJESlFCcCAUSK1zJ5YBqum7Smiq7KisihBxdCEUUmNrrWVIpjuJG
+ldtVTv/zhfyxbGmyUw0QRlqOefVmklIchaHCWCEQQmiAsVRh5HNwfnXrL0Psn3Xu22c1tC1atOhT
+/3r1wO23xbpcZZsMQ4xxCCl39GM3pF7yvSA5EooQQwFwxZRSc1vh8pUhIba0Kr77i2jgTMit1tOh
+QM1L5qdAH/Xym7duUWFR9o6BbmCA06bMvMnWRlw+mVJTSEWwoekUKGdKGJRrKALJFJcEFEJCIaGp
+CPEQK4IQIeAhpmGFdaxhPVQMjgnwHQmmYgyYaAgEUiJiJjUKkkcJqy5THfv6x/AVF8Smteduv3tO
+OgsCg1Sgq1eGy44bPsOYGDo1PKQUyKpYacPOugPFSUuXjFFeIRIwQlIhqRRGUkqMMeFYEXroUMf3
+vv21X33mS8985ydBuZBw8CUXXV4/tb23XATDohgjAQCgNHQ0Yfhl8y5l6QKUAMEQSKySjlWs5Ds6
+95gVHXyoMZ19kddlIm7aRmtzYt5s4FD0KkXfneQ0lkolr1jgks2f3O7VZoY4CwmWoJQSmBIJABIw
+FxpXplQmU5rPccAokzrgAATDgoPkAFxJLgVTUmH0ShOZoO9JaXBsEkMnukX1LhzQuS0k70V/eIYE
+KiBacbRcU9dYMDG3IQ8vqb/4L9CHsuiGvmFpT97/wMgP7uo/77Pit+szF57qpc08RExJHRGiACtA
+BCulkDAxMTSdmJpcroz003vCciEKmTBjnVlnA3YjqukhApOCBbrgE8lcL6sJAYAKURpHcUUQgLQx
+eO6BO+77/buv2XBo25AJLoHAkC4LXS+sWbxQajEuwub6SV//9jd/s/GJd3/2o3YmZWFaVV9rNjeN
+COZKFirhCxZJIRVoGGGEdIwMRAxEdAQ6gAaYYowppZhQAENBjOgmxhSQ4uKVj+ZEtz0kDA5IAVVI
+usFulqt+29LcCz1jF306/PrPw4MdeoI0VlVTAA/Qq26fHNfhUCqqkNY+rXn7wPbTsg5oNFljaava
+VMouD5UdQWxCQDKFFMZYgAJpeBGjREV+YQGtWihNEIGhE2VqnRnjsCqfLSQOeRmkRiAuyTGzhZcY
+lKtkkisIQTcAdFxtWbMKwh4KlxYjW4UgtFqEUpRIJutnzQQfQssQLKypzao6rAAmslNxKmZVZTwp
+BCEEEyQIIhO7vpgh5SnuCxYpwTEgAIE555EDCpggUgCjNIgMAboEjOXLsgJeTPCnSFPI44JQhLkK
+MuYp7zrX7FKVdipILm/kE+1VJtJMD0AH4AhesVX8N7JGKBAxa8FM4tnu+z9UldumPnzJqcigX/xf
+Q8pqGCoT4oGBWgJHizDXiaKQwloQijqo60fJ5CUXJ2PZEgrJkJffMxzYmSEV6iN9cSiVmfinCz92
+yWVnFc5e3fD5T3TrAhQEvWPgFQpJpLhyewZABj6CtWdfctal7zuQwqd+7GJ79gKfGod7ikOCSBJj
+lsUWtYIOBvhR/3DHlt2bOzo2Hu4aKXggMZZq9ukrD2QSqkRpCK7pa2bApDuiA0NCDyOJosiWGlJc
+skhBPCR6BLrAgFBgwKiNAwAscIi1QHqaKFg0yCOwpW4Spiu/L4HbIohQFBqhxioPjg9P+cS1Vsu8
+xFtb0hsfa7rnV/f/9tnF2RmQBLAhkhGYr2L3x/f1YIMyqObEa7PPbn7GGi8Ubrh34B+/sqA+433m
+gnviSGeJYeVusQZ5inpcIUN6yq+e3vjvv/7JNY/fVvXBcyHh0DC8b9PDW/dsTinUWBSdv3u0sv+g
+rRGUhKt+eP1FP/sONNbVAwkC9YM7b+nsHKy3k5ArFZ/cyno6GcDM+qp//d5X37/3L+ZX/gUsqgE8
+9vjDhYEBNDSWaW2icyZ7GLpG8u/9/CdWnLPyXaed9p6FS2754bcjGUpMz26egyyjBzGKLK0M3OUx
+alWXAOuGQASIgQQRodCxjhACi3px4smQKGJKiAXIFIRQXRJI4rTU4jLSHADpA+MoFpA5ReNZ2xtq
+UA6iT5fU0CcvXzCrLfqHz/Vc/d1UKrV//35CyMyZMznnQojjpSUfF70AqiKwLf3Upac899wz4Lpj
+T2/tv/dh3N3b8u5zi2tX7S/zek9vE1gfy1ULDYJIacSB2MKly2HerKg6xV205bm9X735a/bA0HKn
+qtl21MGevtt+z/bvRRoQpiAZA4yNnLzz7jt/9/tfL0nHF+npBg+8Z7btv+M3QdderERo6kqvApoF
+S+841HvLvbewsDSpobZm6awBjREEWMa6O7qnMXxtdvo1vrNssKyXKoqFS06dC3Obt5qhF8kEiRFJ
+IwRYB5AYU4MD5gxpHMd1E1MUaSANxFigsPIBuEZdJYo8YGHEfcgT6gmkC9AllRLymJcMcJi5uKgd
+Pjz4wtIFaz73+SwX5QcfIbc+MT4+/uSTT55xxhkTWXXHloC9wqscRxIAkKKA6qvSb1u56vYH719z
+6dl6a0Nqwcy3107LXP3+R8r5uc91NJRJuq4u39vZ+9y20RhSkTQ0a1wHVeE71j17w723BWN7rk5N
+Xg7pQV4sC16+7U99e3tiH7pgyoz5vWa+OFJc95dHvn/L9dah/vc1LWovKmFriAe5W3+bP3i494Pv
+TMycnQnsPEN/6nzuxzf/dN9Tj53fOKkmUELKzq07D8n0ri379OHCGTR+IY5jFQ/3DYzd/8jhGU1D
+SbuUxN0Gy5WjrJ3o27rvEI4U2D1bdiapSbGGMVClZMADEkUyiA2PF/d2jGhWn0Ajfo5qMqSyxor5
+gmthOLbh+X1VmY7+7kIiwlkrB+VGln7hcO+uVW3LvvnhNozo5Orxf3vnspa5v33iCV3X58+fzxij
+lE7En181w+X42+IqBIQDIaVCOtV/dNOP5s6dvXz5crq3d/wbt4kFtQPnz37+J7+DXz66NO7UqvCb
+5fFtsuCGkUGNER7FsGEIMpqkF+jGpaShFdEh3cUI2XnVE0X7M/SJ+vhBWQmKXmFwJAXqI6n2C1mC
+S3/QdGusuDMaHHJLf87IA7VJT48NCzV8YEcxci806z8Qb25nqlsX/3to/3Yu7Fi2oTB+2aTGsxKZ
+qpw3LOB3yL1bjI8AtwVbCYmP2u2WQJti/ObRfQf9yuxES7o0/rGG6Q2AUAgq4uU06CJSJfJgLLi/
+u3PMskqGvNCp/YBRq4VFzdLD4fBJR/x49IXOKlJloI/z2veEqfUe6V01c9m1H5yy51B+496mf3qv
+sXjezpHOJ+/5y8UXX1xXV4cQ8n3fsizO+UQqzWtG77tg4QpgBUQxLtzo1v+8a/maM0/pirauea/V
+lJi55/ZneWXbLffpN917abffU4deYAXXIAKDBJwEA/xIJq2FtIa4gQ8hp8oWSDcsqYgYKT1hiCEZ
++p4Xs8zJNdXLIjvph/sdT9O0al8yFmqOIxnZybxng5IbqWkYV1L0lERde0WwcpkgWjbMnazsWvYk
+jJI0Qqxco2gWJXok2k4Dzw8zWDMRzEOJSHCqyG5ZLlEY4bI6TpcqTeNCkwbyWCWFKAuqIN1lyc7h
+UV+hMKk1gj4d9JBECodJF+UJeUG6oU5jnDoK+Vj2rlo67YsfXzVtZuf8NWTP4boffzs4Y8Wv/vzr
+lWcsW7x48dFkYQB4/eiDCDTMCUQgdNAowM6N2zc89fTyxXOyTx+gFq26ZGXZJKVy5bHb71WPbZva
+c7AaaDaZ8QOPhoJoWNM0w+dFBmXEKw5JIT3hyj4aMgLzQoeFPIqZimAAKHolGQQ0aYw6KpYnacsY
+RX6kosaAmtQqcF5jpkphUc8khgPXjYKEE7OLkemGuCouMRJK+ipiSCAmtAhszVKEGpYOftQn3aQg
+oxBOUU5FU5JxFksERmAXSxUlTJJ0uFE0Ij3yZUBkTEtiSoTyTeyXXV3gCkVcBwoizVEVtco5r1vI
+/bMaRk5tf+d7Lkg5tXpjFt+33n12l7z0rXdu371i9vKlb5s3wXrC5P876D0AnQEFAMVABwZKA7Tj
+mY2/3vXge1b8Q9Os+XTPgd4rviQcffp9P/ztUO/I976ZWndgUk40OrGs5RyK8iKhp8d9bmHCZGQb
+NBLpssgn6bjOsyVJRBgkDKaAVELLsgID80oli0wPx/LCrcLENOhhnoubhlOWQsNlKquGQh53ItvC
+5SjmWGOs4KdQ1bgfmbpkNIFsX8oxGsUN6pQjJgKLGHkbZbnRRfw6QSuaSjAVL9Oc6dsaylGihJ1k
+xhh4GQScWhVWjmMJLFCWLiPs4LiPiKtRnfDE8DjDcrPFi6csbLz44gVnngOf/frBZza2f/NziQvP
+6R8Y+u1Dv1zUvvBty85C9CWWPrHUn3h9zVZ/HD29Y9P2Lc9PXjp3NUuWPnzj3tHuVQ99F6bXHzrY
+cWhzz6Zf3DNp25azOdQoe6TK6UjyJLOMcoQo4YQQoYhCAUhi6sTLT3SOcaEUQpQgIFLKuCQTmXhS
+KYFBIZAYIYRM8epJvBy92P9j7yXm65wqQTEnSiLASmIlCSDhl6ljlWUkdIowlqEwMaWACB0zSk5F
+z5RNkggrDvc5loQYGkuP+10HRamjaUrT+66cdc6Zc2bMhAGv54oPbx8fOPfzV1faG+7a+PSURYtO
+f8tKCq9cOR1Xrxu9B9Dz3OZNB3frClaa2foZrdDa2PODO/WNT8Su+udDbc3bH3+odP8j1tautrJc
+GLP7DZmKxctuRbIorTQlpBfDeczjypRcEAUWNQ1CgYOKuBAib/OjJfdYvZgHqL0igfVIz/GLYcWX
+ZBISg6uJIJGgClEhKJNYqHEH6ZomQ0YRBaU4k0SjEkGJsMkiycqRn5Bcq0jFNBobHa50CZNPywZr
+T5lzyfmnK6v3699jNdWN//YJI18Z6uvenxs6WClMX7hw2eK30IlUp9fM/nVXpXgsmDFv6eT2afc+
+//gdub5F6aYzpYx2D44+sK7mHee2rX17fTJWmDJnz869z//2ofyenjPGVZB0zZQu41aB+RAwh6NJ
+GgmEpoAKUAGXlciXAIQSaus0YhgAAxA4UoALgECqUH/RSo4kZYICAIpefJCPjS+WcCD/2kiUpAg0
+DASQDjqOABg2MMEKQEoSUcYYy8S73ULW1NN+SD0YKrKn+Wjh1Plk+dx/PHNNNGuy25CFZ7bn7nqU
+NjcYX/pkd9Z6cEc3Na1lq85tq2ulABAwwK+jtu11W30EoHMIEYz5xYHDhzfs2jrJSZ4RpGqwy09b
+GHUNdF37/VRjbfU3PrUfc7Fxz/Z7but4ZtOiMbwMJUxHh4Tm+qUACabbGGOQSimlEUQIkVxEUZTQ
+zJclHk9kvPpIvoT7X7utA35Z48QrDXyq68TQJACXikkxkUJqgx4pEWElqaYIwkCwUFEYZrHCthmM
+VvbmR7dmjcz8JfPXXqhWndI6yXa+8tPC5p30o++rW30WPH+AifKd+rDXXZo+ffrcObOr00k4UrYv
+QQh4zZWFr9vqKQdGIADVaCUbW+Y3otiWoa4/jPfUtiaXZJ2Gfgf2Hu4bGKhlXlONU8z1z//M1YnK
+qHx2/8bHt+Y7Ou3h3Fzl1CXSJAwAI0mAAwRRxEBgncYSWuBxABCgJFISgQKYSE1NIO0IVnQkneuI
+Xhp9e/E1ZXOhIsmlnHgXwVTDGLvCowinsEGEkr5gwJiSOibrSwOb8qXlq89lM89PrZq9JNNau62/
+EVgxrvd3dZaf2bbo3ZeravuPZnFkoM9PxtecumLGzDYAgBBAB6lkqBii2v+grwcOvuKaRikDCBVo
+KDJgeHBk/SN3uWZiXnLSlFJU3daKp9Yduunm6N+/E1744QW/vFZqvG/77s78wO7HntK3dRUHhxZ1
+DIFUScfOptImRlGlggS3TaMi1V/3Io7EyrmSSimJX/0otGOz8o8tUCnREJjAHAzQLGpSRKVUEZcI
+S00hyfh4uTgK0ZCjxuIUahJ44bJJF62ap9U01bYE05vzt/569NPfrJlbXb3ufqNnaHBX9yDgw5Vu
+Ue5/y9JVNY2LVDWlABoACACQQDADGagogV4r/Ndt9SJw9ZhFAEAwHtN8AML5pKrs5ee974WR0Wf3
+7f7TwAsL650LrJlTW+cdnDrFXDkdKpXOr908+peNp37tw2/5yhfG/GJ/VBaP7+jcvmfTs1uizr5s
+RUwSeo2i8VCqaoRAESk0hXSFqARTEQIoL46Uvb3EtNFEtc+LaflH7ag6xATpGFOpUBCpIg/KggdS
+FCS4Oh4xZWlmpua0eY0rFrbNmd4yc3qiksgd7Khcc8MI0urvuTbfkObtLZPOXYFdfY/v/7prh0Fj
+F7516dSGZZqdEIRWIMJAOSiNIABgLASEHfrajf6/U7LMK8AtoEShUcUQNuMABoeIgi4AGB8e7ti5
+vePA/tFUOr54aXPDwtY4aAcv/3rP3Y+ddtu19upTer5xO93cWf7PL6ViDmU8398/3ttXHh4e7ukZ
+7u8zn1mPIoEibkbK4SiOtBjRTUzT2HjVU4ckfjEx+KiUUqMqEAiXlchJXrAINNakpk9JNtfb9TOM
+plprakOmoa49niXbe3rufCTa3d3284/kDu/pffcXqp1M+vEf2S2zYf3BO3O7B3rG21us+a3NrW2n
+gqW5GAzglGMgDBSGiV02hYASQDji7LVXkb9h1eLHloIAwPj4+I4dO3bt2kVbGuZm6ht1SxA2fc40
+ONS37RPfQo9tM+//SdvpLT3v+UJ1oAU3f6Zm6lS0dV+3fVilz4zGBkf7u7r7egfHi6zkWsWiXcyb
+o4JFBddmnIGVU54XiCTWDeGMpSSr5OsIScTqx6kwzFKTbukq77TYCVLTUmW21tOGujnNU829XTXU
+4HOn43B04J2fcAIdfvet4HBhePVHq5CrHry5ecaM4f7e/tFhSfGBnsO5UiGWSFzwjvMMwzBN8+ht
+vlHHSr3BB3BNPPdHV26u6xYKpR1Pb+zYtwvS5ulrV82oawif2VPVX2LvvkAf6Nqx5kPDnQPt626Z
+PHnq1ouv0cqDDb+5vaYuUXxo3fjAaP2V51nV1eG2nSiheqbMbSa0MNJX9sJsulG37NLYYLJUzjVP
+RhYPRwZJCKnmVsyg3NfryWJ2yjxbheq794T5ivzCu4x8tOOiT6r+vuRd17c0OZsu/Gg04Lbc+90p
+Z6xQjz29M+xonXtWyNhTG57u7u+bNGXyjDmzp0xrs0yLRdGxsd+Jk0vfkAOl3sBToNSxfmBCjuM4
+xGy86IK1+PwDfV3P7tv25HObTa7qnWTr4UO1cbLglv8QeY+cfhoMepFmVSfqMmlDdHV2f+FHhf7R
+6uVzrHy5+1PX9+ze1vjMf+rJZPCR7+T7R+07rq3P1gVf/AkfGNB+dE21E6t8/qaD+w46N/1bwor1
+fuL7Q1u3hOvvmqppfbf+sX/fgUlnzWqe2m7bVs7EaaFrkybP//an9UjnM6d3dXbvG+/ZIYeqH/xj
+Q0PD1Hmzzv6Hd9rxOAAAgjAMDeMltVGvLCT+b+uNRC+EmKi9P/YaDCRExLmaXDepvWkqIBgvlDZu
+37bpiQ1RkmtVero2k9nyXCtO1177gXTK6K7WbD1V/56za90omNHkDRcNOzk52ZByIzAivOOgPjBm
+uS6UXX/jLtbf45SK1UFU7OwpdPVJyXEilnYsbtoJMKkZz7znLK9vbsrOQH1D3fc/Fs8Puhrp3Lmz
+JxYFQeA9/jAt8KqE+cG3vytT1yYEBwCdUCFEGIa2ZRv6/xR3+J9wOMdWHmOMA+AIMAFMJUAAwAEs
+EBikAA0g7430B+UDeztfOHxYYp5wvVR1iz050WRZmVhKpKppPkiOFbUkyVc1TbL0nuc2A+CqmbMS
+qaqDT6zDudG6C95VkqXKrj3SY/aC2THq4O4+D3mlRCatqTFVZkxEHfnu0eEONiJZKY1r66tTk+e3
+NTS1VEcWcfQCURoIDJgARqAQgBJCIxQUhEGgm4Y65lzBN5DVG4aecw4AR3PkjqIPQQIgDKABmshG
+4QgmQmGGLyHwwdEB0bKGIgAnX+jrL3rueAHK3OfGOISAhyx/NBxHOc6lazg4EU8N9+QS8ZSToIDD
+VH8iByVlSw0ZfpFJrowqk9ZojhuPTC4TqiqVjTPHJlamMZOpSZZAZSVSgiNKJ1ZDJQy8UorFYviv
+R8kpKZACQgioI+GKY6G/bDz7b+t/5JzLY4v8mQINAQCEgnOCEBAMkkrlY276AlumAkx9BqYWIdBC
+MWaQGiVBhEoRJPTIhADAZiEm2kgwbI0XEYc9lCuBavzQNyIIkralkIowoUZNnWEndIg04KafAkMC
+MBAQagYCoBwU5SFQW4IvONaooSAMAsMwwQdpySiKAODoZCbijFKKX5qxd2yY6O+k9AZPLuGlfRJC
+ACGET0TCIEACg9IjARyHNhgKAcIMpDaxO88VMKJ0QDIATURAAQyuwATAjAHSAAEoUBJAO1KlQTEg
+DmUKFkiqMENAQ0AAzIgCwBZ4FAAUAWUqTJTkWDFAxsQphBUeOZoGSPkRs5ExcVIeAAjOFQJCKQAI
+KSh+zeXfr1Nv3tNd/5/Xm+vA0/+vdBL9CdNJ9CdMJ9GfMJ1Ef8J0Ev0J00n0J0wn0Z8wnUR/wnQS
+/QnTSfQnTCfRnzCdRH/CdBL9CdNJ9CdMJ9GfMJ1Ef8J0Ev0J00n0J0wn0Z8wnUR/wvR/AGxU6JSh
+qCoCAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_buick" model="fleet.vehicle.model.brand">
+      	<field name="name">Buick</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAy50lEQVR4nO19d5hcxZXvqXBDd0/3
+dE8epVEY5YgkkAgiCBEEGINNMgbWsIAz9uLsh/0Z8wzG9vfWi+3lGQws63XA5BwkJAQyighlaWak
+kTRJM5rY+d5b4bw/aqZpC8xK9swDv8f55pvv9u26dat+dc6pE6qqCSLCR/RBEP2gG/D/L30E/QdG
+H0H/gdFH0H9g9BH0Hxh9BP0HRh9B/4HRBw+91tpcoJYAg9dKCQBtvtIKAAEBlAYEQABAQD34Pwfg
+Dd7UIBVoAD1YZvBPAw49iUp/MJ18LyLH6FIVihFChuvdWmtK6VF3QFHKzZu00oJRBgBKK0KAEgoA
+GjUlrOgZAAIaNAIA4RSoFMriDP6ymVIrSimB4Wv9303/PfQj5O4SQrTWBn1CCCIODoMGIIBaSy24
+RRGAANMADCkgKiEUIiFESq0BXddllGjUlFIEkEpSCoQgABJkMCQAZswUIJh6RpKOnTX/KvQjHWBQ
+SnHOzQVjDIxu0ICY58xCAA0UgbZ1dnce7kmmso3th/r6+vL5vNI6UBIoMwMWpnR0zajampqKeHzs
+6Jqxoyo5EQBaKzpYLaLhdY2aEEL+QaFHxOFSOAWuZ4wBIVoDIUAIaNAKIJVK7dzduHXbzqZ9B5nl
+WpaTDtJlZWXj6upKyxKWZTGLp3PZ/v7+7oNtPb39ijEFxM9l68eOPmPRSdMmjh9dW2FeJIUghHDK
+gCJoRPKPCf0wEiHE8LvWWiq0LKYBhMTGxoOb397S3LwPKCmvSIyfMGnq1Kncdss5CYfdUDgMZJCR
+NWpKIC1xIJPxJPb3Zxv2H2xuPtDT3aeEmDau7IT5c+fPnhtyGAUgepD3EUa8X8da8gODHjQCJYRI
+hYwRX+LmzZu3bt3a3nZkwoS6OfNmz5o103W4MUmEkK0tLc3Nza2trd3dXb7vU0pt204kSqtG144b
+PW7G5KklJeFAg6bQ1u/tadq3fcumQwcPRkOhc846/dTFiyI2A6UYZf8A0BsauQEgBIVQlmUpDR0d
+HWvW/nnnzp2VlZXnnL1k1qxZBEgmm+nu6mtq3P/mmxv27mnctHVvd3c3IYQQEnh5KaVSinFCdL68
+PD59xuQFC+eecsrJc+edUF1dbYfCfcA3vb339VWvdre3zZoy6dyzz5oxeRIFgJGX5mMtOdLQE0KC
+ILBtGwCUUgVrEgkQwEAEr61+8803NlZXVZ15+qIZc6cA6o7WzrXrtz378pqt2xuOdPVls1nXsVwn
+iogAGojSWioZSBlorYiSnp/zckkAQSnW1lafeebp55xz3imnLaqbNC0DsGH7/heefzHb37v01JM+
+ft45URsRGQKlBEBLoCiBasqsYRqSDxH0xmrUWiMiY8xUSAhBgL7e/tWr1qxfv/6spWece+4yy7LS
+6eyrr/75Nw/919oNbyMNhSKJSKSEE6ql1EIhaIIaQWktpfKVCLTWREmlAz/ISpXX0vO9rKl/yaIT
+v3DLV8772MfdklAO4Y9PPLty1erZs2ffdNkltRWJQYsKEShBAKUVG6bp90MEvTEBCSFSSkoppdTw
+fltb258eeUJLfc65S+fNn4lAn35+xeNPvLR67c68rxLlNSWxMiG01hqlUFJYUmmUiApRoVZSBlIF
+WkvUigFKlfP8tBSexiAIPOl7FkDItZeeffo1n7nuok9eIQhb89aeJ154uYTCNZddtHBqvZYBUBsp
+cABQHlLn7+xpob/HWvL/DtcLISzLMqATQg4cOPCHP/xhVE3tJz7xiVg8mvP8X9774D3/+78yGR2v
+mlwSi9lW2AskA0oJCD+rtaRCai21lgSV1lIrqZRARK01aqlRCJkNvKyQWaWkkoFSHhBNpKgoi9z8
+uS985V++HasoazrY88Bjj/a2H7rh6stPO3EBASAIBJCAQmD/fWeOgT5E0Bt+BwDOuZSSc97U1PTM
+M8/U1dVV15S3tByqqRn/2989s2L1ZmLH4+VVbkks8CUiIYRQIKClkgEFUMJXSmktARUoqVGh0ogK
+gAWBD0QCSs/LeH5aS09pgRBIGWgREJSAeOmlH//+/7ht7vyFzRnvPx/+bXtb202fuWb+tMlECQJA
+mTVcBsWHCPqC12pw7+rqeuKJJwgh/f39+5qb6iZMWvX6ll27j5RV1UejFQowUFnOOacW0SiEQC1B
+G/2ulVKgJKICRFAStULEIBCEAGMEUPlBLhAZJTwhfCZ9IYRAoUCoIA+g58+f8dMf33XqORdnJPz+
+0aca9u668dNXzJsyCYAGAi3+d3Z0kD5E0BvXSSll23Y+n1+5cuU999zT1NRUUVFxySev2ril4c+b
+G8aMnUloWCpwLFtChjEmAwVKW8xWSgRBAABAtFISlSaoCGrQWmsJGpX2CmoHUYEWfpD1/TxTvhC+
+1IHGQIOUKgDQo0fXPvSbB04/Z3la6Hvuvb+zo+O2r99aGQ27DkMcNi/9GEuOeNDYuKzGuNy0adP9
+99+/atUq13WvvPLKjRt3rt/YNGr0dLDDmhLGiBBKIVGSUMIJc6QCjZxbYcpcAowAJ4QS4IRYSCwC
+FiEWggKiCQAiCiE8zxNCAEAGtQdKQRAEORABKCDabmvpu/WWW9568/VSi15x2WV2pPTBPzxmORZI
+MdI4vJuGn+vNsJtQOyFEK8K4UFp0daR/ePuP7n/gFzWjKn94+11rNux78eUNNaOmc6cEmEQQSmib
+hqSVB+loAYxKQhAVRVQIgY9aKQUaiVKoJQOiRABaOyLwtMrKDHfJqOoYSMEgpLTIQ1Z7vX4+nwv6
+/QznWif7sz7NWZpPmT7lkccfnTR1Wuvhjp///BdnLzv3gvPOdjUiAUQ1xLaUGNfjOL3fY+f6YdJw
+Q0ZkwWw3BACMgVQqCORTTz3x9LNPUg4XfewTe/YceumV18orJzhu2JOSMaqkDLlh5SNKlEI4PASo
+hAg4CxEkWkuugWuihA+IRAPKgBNNAVJEKek7VF931ZULF9dl0h0OK+E0S1SVTVOeDz3ZAd8DG7wt
+m5r/85FHvCC9d+/e73zr27//0yPjRo1etuzsla++OnHixHmTJygpOacFbkMCSihmjZRiGKl6De6I
+qBEosd/avO2pZ57u7GqbO2/ezFkLH3n0lViiJlISN6YMpRQJC4RQoDlSm3AtAwBtWQ5qpjQl1CYI
+zATiCVKmNQk0+n6QAlumUz018ar5c0e3t6U3bBr12oayddsnrttavmFnzdb9E1r75mXovLKJU5dc
+sHjizIkmbfX888/f9+/32oScfvKp8dLoU88+EwjFOAcY9P4QkRCgfHgszvekYeP6Yn43Hw1RCn19
+qeefe3njxvUV1fErrr72lVUbgMUT5aO8vGI2AUaCIHBcR3g+IUwJbXEWyMBUqzXY3FIoBHChpAKu
+pKelIIQAEgFU5kUoEpaogUmtq1a/VLnnUA2LumAxCwWlYIWgIpJdcurGxScxh4eAUdAKtX7wvvuX
+n3f+lJkzLrhg+aNPPrl1x/YT558gtaKEUQomazmiOa1h4/oC9MXXxoF6e8u2p554KplMXvmpq22n
+9M31OypGTcz7mtohROQEKID0JSLRWlLKlVLGLtIKGCO+n06nu6SfFfkUB8kpog6k8L1c1stl/LTf
+3XlYR/olUYsWse/eXltZ7QXCC1hflmLal32dqm1faeaIW8K0FVDQ0nJszvjehr3/84c/TCfTJ50w
+b9a0aRs3veUJySijlBpYlFIjGmkbTl1fzO+Fj9lcauXKlfv2N1VVVUyun/ngfzweKx9LnTDTChGl
+9BzHYYxoqS1mIyIDIqSilOaFDFmOlgGj3umnzZ4+scbzPI1SKYVKGU8NESGXFdSas2BaTWwy9/KX
+fbJkyy782f+KgPbDYKMl8p5ApZmjrLAgjgAAVBoRGSXPvvDspStevvSyy+bNmvnUcy+0tnVMmjCO
+AWipCKNAyYiG94cNekPFuBtzu7m5ef369Yjq1FNP3bN3f3ePV14zPi8DxhhoFQpbSkgptEUtiuD7
+gaaUUqYAKeFaa9/LzppWff1nLmnc+XplZTWlHJBYlqOUklJ7nqfSyf6sWL7s3GRvX8vBJIP8l75a
+s3Fjx+tvM8/PW8QGyaROS/Rykvk0xIASBMKJEBhkco8++ui55547a8q01+Jv/nn9uuqqitJImLLB
+rLrQyhqxrNZwQn8UvyulhBBbtmxxXMu2+bx581a+tsW2Y5YToQxRa8JA+D5o7Vhu4EvOuWVZACC0
+FkKWRCJB3iOoqqtLGWSZlZg5+5SSkpgIFCLN5ALUJJPJ9KQHdq9/beeBhtqKmF0CBCOjYvD1L6e3
+3RLLZpPKLwEPLLs3agWuIi5KQK01QdTc5iKQGzeu37L5rTPPOmvmrFlr16zJZrOxcIgA0VoTSodx
++cW7aRiHVBfrHK01Z/zggf1au/MXzDz/wmWEJbq60QqHOQl4ILgkQtrA3TQS1ccUOBk/rfP5pJ/J
+aw0E/X4P/agnRXlVVOXJ6NEVo6vKbGXF3TjjJcQlPiFWqC6cqCuNOtQTLlBFUkCoBfqCMybdeDnI
+VIn0+qm9UbBtyNKQr0LIK+AInBALNKOEt7S0rX3zz0Bg4tjabDbbdOCQJgQBKSBB46uNFA3zNFs8
+wQKBjvZO27YTibLzz1/e3tGV84OSaGkgJFBGLKWAKD8bC2VKRgelMVlZHrISZGyCRHiyws259gDy
+vrCtpteN96UKuaWOE8rm0qlU4HlBLqcCqQPtCe1JQQlIyiLbd6rmdpSgmcMv/3R08swDQHZouYvR
+PkYVddISFCWUUmpywiY1v2rVqubm5okTJtbW1jY0NAgFhBDQWknJ2AhCP4zT7KAJXEA/l/P2NR+I
+l5aVlJQAsbbt2GOFItyxA6GF1pDP2iqSqAp9/rKlLB5JEUfl/RB3nUCmGGCQBsfqy2vM5U9fPHf7
+rrdIaAylYFkkk816xJXKCaREEniB1ppQCIGd2bqddvXkvvrtaKUFM6bL8y6kB/fuU7KfQymnVUgs
+X9gaJadU63dM4XXr1m3btm3shPHz58/fsWOn53mWazHOmCZCaj5i6A8b1xdSIiaEgAgDyWT/QGrq
+tMmT66du2763vaM3FI7lhVRIACil1PNyM+ZMdSLQ27oz0rS5vHsHP/im1d4c625JJDvLB9qmqXSm
+u60rm6EsYlkMAGIJN9C5VCardCTn82zOTyURtaBInRhmlHXfr/ueeyqQIDICl11SN+fESoBQyCHR
+Eip8LjUFAJM1Y4whKkqp53k7d+6kANMmT8lms8lkEigBAKDkqMVxw0vD51IBaK0ZI5QMrtXpT6Xd
+cMQNO04o3Hm4D5jLeRgo931hEc7ckmSmOwqkrbv/5NqJkbsfsg8f8EKMQBoshzJil4QTY6ceKHWP
++KdkeW50SRhBhsOOGwaRDoQQvs9zfi7ZHwghhEqF+Ph4WWtPp3f/z/vOPC0hymi0Tp556aSG7UnK
+GXHSOY9QkgfQAJoQJGRQQzLGmpqa/LxXXl7OGOvu6x03qhpRIWpG6chl0Yd/VAkhAFojDPQnS2Kl
+5eUJrSCXl5xFEBnRxOGOTZnySIhZmuhEvCI+fy49cZJobbIa90BjK919iG4/6L+5rffxV2hrP1UR
+R0XSmUwgNABUVcejpbx/oC+dyqX7vYGBzsBXnNtayrAVREvT69e9/Zt79xzqCHoymQlzKuacPF2S
+0lTKkyIJAo2zRimVUhqFoxS2tx9ub293LFpVVdXf36/fmbqGHZ53aDihp5QCIiEIiIiQzmYIs8LR
+EomQyuQ5c20rpCVSjUEu4IqGweFASglNVI+a8J1bBqZMIcAcGpaIFnEpAe4qqbMu0RYEbR29Pb15
+qSHk8EScB36y70jnQE9veuCwECIcimmZcTHv0IOIO37xb6+//HhXd5tOpjLjZyRoKOjszgmNUjBE
+1FoCaBwKHwFAX19faiAJAK7rJpNJ050he22kaNigVwBAiFIKgAAhlILWGijhnFqWpSRRErQGQhhB
+cLnlIyZBhTnvhiRmPKemPnrd5W0M8pADmwnMKwoeCGpbQhI/5Pp5yKSEl9e+zLshEgpBNjOQy6YI
+KsoQmQBFXCtj8cPcDqXT/U8+uPfA3s49u/Z09r6trH1dPa2elxMyBwBmLaaZlkyoI5fL9ff3EwTX
+db3AF1qa+3ok14QP3zSLkmjFmK2QI1ACMlDSZxFCSNQJMSUVKqTICBLUAUhXUZeF0iITyWPANACt
+/Nytlcs/HtGA4CNoW1FHRwRSZmPCpY7FJGXb23t2eXpbkPFqLRLNg9fNCaVEKGUBc9wSG4DKwCfg
+tuzJbXhhoOdQ+sDuF/tbn6pM8KxgmYGs6TXiYHxJSgmgPS+Xz6YJAWbxZCotNCKAlJL+Q3A9JRwI
+AXwn2qeUUgoJ4QhEA6WWhUBREw2EMJq1s1zkIgLSYYdSDhRC5fHqL1/TGyknAvIcNHWztkYCgJYd
+cRFRK5rPiAMNranefDblE2ojYxQEo1Yy1ffLX/xm4+aVZeUlhEQRIhLE7reDZC9PpXsYk6PHVuQy
+ZCDZC+/KZiCiUsoYZowxEQTSD8w1/ENAr1EDotaqcAc1UUohMCBMKtQKlEJCzGp6jU5AgxyxbJQk
+ONDiE+EC0GVLrWuvAOBEkT4tD3OVs5liVtwKeyLwvCA94B8+0NO8u2X/ngO7d+9Je1nOpZf1duzY
+1t7aN2FyIhwNEEsAKhhxk71ub1td2KkpTTgT6yYnU71DNiUWEjtG1xv3GwAoDJnIqEdW0w+7hTNo
+GJgdNUi8fOBrYI5r2YwQgpowZlFKkaIOgALLog5z3vjw77PrXweBNom5N1+TGV+fReiEoMPL2+GS
+aCRMNPO8THd310DvQLYv19rYsnf77t27tm/fveVIx0EhfQROKB9XVzt6PKXEBZIAsJXPDu1JuHJJ
+bU2ZZbGe7g6l/QLWxVFuzrnWWmvQWjuW7doOPeb9Nn8zDaPCoTAYoB+8wRhLp/PZvHKckB2ykQSA
+ApVEVJyCAzFCbYYaYpbYsSP/41+J/BGuwJ43T13/mYNuPA1g2XFKeIwDj5dl830trc19fT2MgA20
+8+CB3q72xsbtr77yQjrV39+XeXXVS/3dA/Pmx2pHhUETpAyQCS/Gc6fMn7MQMdna0knIO64fKbJg
+bNv2RICIKFU0HLHZ4L6J4QLnvREbrooQAQYFGcxutHC4JJ/zgoCGoyUhh3q5fgIeaoFaEoKgqNBC
+Cl8pFaqM5J9+aeDJ5/s5pDzIXfYJteQsDUQS3q1FVVmiu62jp7fLC3LpfCoIvPLSkkljR8t8pqer
+be+enfF4PJXNNDc3drYMCP+g5bZSRrSygFMN3HH5aUsWu3Z4b8Oud7pNByM5Bt9wOCyl1FoHQRCL
+xZQazOmPKPbDCv1QCMFQNBoVQvT2DsTjscqqmBBJIdJa5kEpEfjCH0CdyYpcGMKZWCQAr/NXD/ft
+2NDZ0b8zHQwsWCRLq4lLrHjJ2s1vf/tfvtrR3hmNRqVSyUwStJw/d87M+vognRs1qmbC+PqBZDci
+dBzqjpXo6tojhPgAESARDnLc9KZx4yoOHehJ9XcT4FCkbWBo5UQsFmOM5fP5TCZTUVZuJHeIjUaK
+hk/hUABCgL7TWMd2pdT79x2wbaiqTGj0ctmBbGYgn8tk0xklB4507s8HmWRGSBIeYNC6af2u7/+8
+tam1ZXfLvspEvm5c2OZhgc+tei1WWZJKpSUCEohGo57n5VO5RScurq2siYSckkj8UEsDIDQ3NZfH
+I7PmJhwLKdggKsdM4JNP6Oru6Xzkkd8BlrAhTWL2EpkxYIxFo1HHdT3Py2QypaWlJmBZNEAjQsMW
+w5GQ58whmjIEAFSIo2oqZapr8/7DS9Iwa8os4v0+h4fADTF0EMIa0znsy7a3B16mNzGqy4pEVYa9
+9FxmfH3XqMmdjZ1+zdgBT7V7ZOK0yTEeNDQ0He7qoFZEKs8GsKgdK0ucfNbSlsa3CM8cPtQDBJoO
+NO9r7qqbGEuUbD+cvyZhR089ffvYcbj5zweam/Zalga0tAbO+TsrPhBDoVAikQh8yGbzlOjSeIkE
+oEAoAiMjuAdl2LieAwckiAAEtFKUQFl5tKqiYvuW3ftau09btmRS/Zj+rs70QHc215VKtSdTvTIz
+0NffwyiEquPcDVEArUTpK6+Spu2trftfO3Dwwe4m27VocuCtVW+URaM7tm2lCJzZzAkzy1FKzZ49
++4KLlmvFOzrbLQsC6T326DNayepxPQTaausOhCvWMkJeWfm0bVPQLqqwYflCyh4Axo4dK4QIRcL7
+9u1zHKesrGxw8iVkRIM4w2jXIyJBbeIIBAAsBlMmj8v0phsPdoarK89cuoiojJfuT2e7hOoXMgNa
+HuntCnIZp6bMKkvYAAxl1cGdsw40lHi9B5Opg1JSwJ1bN+9taIo4rp9Le/kst0LMjiDjQguLkhMW
+zt/ffCibTSkFtsX3N+7fv7dx+mwvHH9q5om7Fp006mBDd8PeXQokEEqoNRQh0MaTQsR58+YlEonD
+hw83NDQkEgnOOSqkQDTqEV0NMozGpU0pmHwJoVRKIZWePWsqw1xjU3d3yp53woKYS7XIofKz2e7A
+T4IWR7o7sskBz7XcsWMRwJcqlU/P2LV7luwj2VTIStTUjm1qa07m80EuO6qqvKP9oG27wB0JujRe
+ks+lLcte9+YG4EAoBaJQB+teXzd9etmFn8jOW5AOkpHfPfxH1JQxsGwQKiWlNIaNmWBra2snTZrU
+29vb1dMttJowrs4qbDlC/MfgetRaKTSbYwAoZ7bN6JxZU0+aN3HPrqZ9Danps0+dOXe6BqklOhZD
+CCghAwMDvp8/3NurRtVIxh2AgAA/3HzSwJEppVZZNE7D0f6OniCXb2hoqq1MtB3aJ72szXgoZPX0
+dtRWle1rat66dSso4MylFJwQ7N/X8vgfXrz4gtNrq2J3/c8f9PYdIgSItqTUtoOMMbOKxFxMmTKl
+q6tr69atnueVl5ePGTOGEKCDSxaZHsnthsNo4VBCkFKzqhsJIYCKMzxryQn9Hc17tjUrqDnj/IsV
+aNBE+FLrgBAihEqlMl2t3a0E+xUwRhlxuwHq2o8sHl07fva0fCaf7R5AQnbubjzc0RKxYeumdWGH
+Og4KL1ldXvrME48P9HbZDkUkQghCwLHcrVv3f/Or3/3Bd37S2rafkQhjDIBrLSkDk5U1iSpCyOTJ
+k/fv39/b25tMpSZMmJBIJMigkh9cXTFc+LwHYsNV0eD2PtBGXs1yda3UwrnTa8v9Pds27m1MLr3w
+qvknzdXKo0AQgTHGGW9p6xiTqO0Lh2UkKhQQpMIGS5KYE567YG5uYCCdz2imBlKZQy0H6ifU/nnN
+K4db9nd3HiorC7e1Na97cxWgJsARFWeu7wFQnxHs6GhraTsYdl2tLMq01gEjVPhCSmlZFiFECDFn
+zhzHcfbs2ZPL5WpqambMmME5lXJwGYLWepjW3L83DSP0ilIqVQAAlDKtgQCjjFRUxM88rX7v7vWb
+3mpk4cpv/o9vUQoEFeFEKa2V3rVr17QJU0lZPFJZqQEsxEgAqrIyVxoeM2ZMS3tLMkhTrQDo+vXr
+bAoTx41++IFfH+lqO2HujFdXvJJJZx3bAU2k8pAQSiyFgloeJaFwRAaBrWg/oQFqi9EwY7QQp4xE
+Iueff/6RI0c6Ozvr6+sXLFiQiEcRgfPBIE/B1x0hGsa0OEMkjDqIBAApBQREZADi0kuuDEeya974
+41tbesZOvWDZxcuJ1hrQIgQpbdixI+UnIzVVO8ZFLeAey0eAHipLxBeeVFdZs79xD/joaIdSP5XM
+b96049qrPnHukjmXLju9cefu1Wteo4RK5SmlKDAl85QCoIVocQu9PALkGNhKckIVUl9pSignhCgp
+l5x2SjQaXbFyFXUiS5ZdcNqihURrSkBrDQTMTsfh2tH5njTiu0oQeGVl4vprLj58YPuKl1fs2JW6
+6bPfK6sOgccRfI0SOH3mmT+NHzutR8f2l5BKCaK8qndMRXn9uF07tjc27AOb+7ZmjFFK16xZs2HD
+hltvvbWhoeG73/1uKpUqRMGKV9rC0B4uo9mNWldKWZbFGAuCoLKqavHixffee+9Af//JixdddcVl
+8Xj8PYOaI0cjDn1ACKVw3eUXX3zOgvVrn3vt1beoPemWb97OiVSKUsfWqF587tVUfy6fKFlf4uSt
+0uT0acG0yVbI3bx2rRcEAERrAQCMMaXUww8/fP311//oRz86cuSICQwU3lWMvoHb933Lssx2Iiml
+7/u+l6OUXnTRRbt27z18+HDtqFEf//jHp0+fbnA3i5wLYct/DIXz10gjKEUst+Q73/jCmOrcC8/e
+/+rKzacs/ex3fvBdBEAhLW6nkukXnnvy5AvP2uzLHVPG7KopHzVrXuu2PW+sXKEBIFARSgFAa23b
+tlJq/fr1HR0dBtD35E3jrBb2zkkphRCO4wCAbds333xzPB5/+umntYaLL774k5d8vCwRMzsUC4ny
+/xegdwgSBoGASfX1X/ns1eg1P/XUH59+4a2zL7z5imuvQq21LylkX3vthcqK8cuvuObZIDnm9CXx
+cNmaZ18RygdOHMumUheIc27btpGAd+NerH/MjOo4jlE+QRBorZcsWTJx4sQ/Pfp4EMglp59+6aWX
+TphQx8lgGJkOjTEMmssjqXPwfUn/3YQ60BhIRNQo8+rff/lQvHphvO6Cz37rj6s2NH32SzdHHLAB
+nJB7xrLzn37qpV/de8/Lq9ZcftU/AXDHcYBR23UsArZtO45jguxGiQOAbdvWEHHOzaiYm4yxwn1T
+mHP+qU996pvf/GZFRQUAXXzaGf/5+0fSmZxSyjhZpr9mq6n5aGyh4+vvMdOIQ6+1ViiF8rTWqFAK
+vOVfvgt8VLzugpu+8ccNe1Lf+s63QxYHAkDodVfduHPn7us+dS0AZdxljHAHwAbbiRgoOeeu61JK
+Xdc1+BbgNtA7jmOuTWHzHwAsy7rppptuv/322tpaADqpfsq/3/dAXyqrtInkqGIqHoaRg36Ytza8
+h1QBIZpxopBkkYQJJd/6+hdzPenfPPXKHx5/zg9Kb7ziq/GYc98DDx5q7n30sf96c9uGtoZdNkWt
+0dKgbZAaqGbUsow3ZAwVc+iCecW71QIOaWqjlKqrqz/zmc+4rvuLX/yip6dn2vSZ1/zTZy688MJY
+NEwAAAjqwXMG/4IrASh9Z0PhCEAzwlxfqMpwECJKKfv7+2/72o+pW8UqT7768/+5Y69+Y+2bZ599
+MhAAZgOBkMs5IxazbdslFocwsYvIcmzbdWzXsRzbdV3btl3XdRzHtjnnlHPqOBa3HCAABObMmfPi
+iy827N09e9YMArDo1NP/64+Ptnf1SIW6kDPR8n078bf097+lEYe+IMLm2lQrhEim+37wg5+Eo+Pt
+2IlX3vAfr2+Te1sP//BH3502fhwDAKCWY/OQxW1mW2GbxVzOCn8hi4dty+YWp4xxsGzCmBkblzGL
+MxeAE4C6cWO+8Y2v7d69W2n893t/zZzweRde/OSzL3T29EtEjYPQK6W0En9/Tw19iKDXQxoThxSq
+qVmiSqcGHvvjI/MWngnurIXn3/Hsmr60wm2b37zzh7fPnj0XgAMBQoBT5rIQp475Y8SmYDFiW8x1
+rDClYNt2KBSilHLOASgAra+f8o1/uWXTurVaCa1x89YdF3/yyutu+uIbG7em84HBXSo0rSr8HxY6
+duj/bxxPoYdstcHRNiYgAlBEoG9uXHvb7Xeuff3wrLlnX33dpf909amlJbC/seHJx/74xpq1W7Zs
+6e7tM6pjMIJLgZoMvPmInBCklColEonSGTOnnXnmGVdfffWUybM5p1Lhhg2bHn/qSY1w8803T5k8
+gSIYhiNkcD16wY36O3ta6O+xlhxp6ItrKPbUKc0BlgQAFtH9R3pffGnVPff9obPfOunU0z524ZLz
+zjkhESYDfb37m5p27dyzt2F3w96mnp6eI0eOZDIZpQUFYtzUqqqK8vLy8ePHL1y4cNasWRMmTKis
+rASAbEBXr169efPGwPMXnDDvjDOWVJQnYOggU2YOktW62An4O3tq6MMF/VF+irmv0afEkQI4AyAa
+wOvpzT33/Ib/eOSlru6+SZPrP/mJjy1durAyARYBIoESyGRyqWR/Pp8PgoCgMlNuKG6XlZVRsDRS
+SiggNDS0rFjxanN7q5TBSQvnn3ry4roxtYwhmKNcCDfNKBxJNSzdLNCHCPpCa3TRimlKaaDAZhKQ
+A4Inko7jgnYIwL5DHa+u3vT6G1s7ewZqRlfPnDF+2rTx48bU1FaGwuFwOBzmhCAgwcHFnYGw8nk/
+l8u1tLTt379/X1Nze3u767rzF8xZuHD+9KlTOAfUQCkEft52HK2hwAqFhIk5Junv7yl8qKDHobWl
+UKTuKaUIWilCGWitCWUagRCByCxCAbQQatvOpi3bm/Yc6GjtOpzychEMlZWVVZQnwuFwyLE5ZUL4
++Xw+35fu7u7Ke+lIiVtZVTqurnbWrOmzZs9IhCOmAUIqy2KBUJbFtAaCgjKm9WBEvgD6h0vhvPur
+wm4YHDpCsRDwe7fwanNesVmoPnTWXyE/Zwye4iUxhgELlVBKFWpKaE9vT0NDw5s7ugf6U+l0hjKL
+Uo5ICGVa6zhJV1TG6yfXTZsyYcL4MYNn1pPBw6NNG/TQUY8GaN/3HccxzSg0CYa0kImgFbLnAO9I
+SWE3BBbtiIcipVo4GntEoMehbYKmM4X3FVpWHD0vlmXTmYJFURD24kEqFhFCiFCSMw4AGjUDhUgI
+pUpoqU3ul9o2VQBaArdAo6YwFGfXBOjRjTEnnRbrFtOkgiY08BV6gUO5WZNNNM6zebxQQGttuKcw
+KseI+98CfTHo76ZiVio0VCkFQ9toDMcVviqgXLCIC7gM6mJAIYRt2QRBK6RmSZ4GwgaNSymBWyCE
+b1kMAJXWjBp9QgqcURwKLp54ipU+FPGQiVVAESuYp8wAmI/FkYxCf48L/eOGPp/Pp9Np27aFEAXm
+NZgajuacm/uIGIlESkpKTJsQMZVKmXp833ddVwhBKS0rKyuwjOd5uVxOCBEKhTzPM2qqrKxMSqk5
+l1JmMinDcYyxfD7rOA6XhHESiYZNGJkxrjQyah3u6Ni6dWtvb6+J10cikUgkUllZWV5eXlZWVlVV
+ZQ5/9H3f87xCB42qcRxHSum6rlLK933Oued5JiqntfY8LxKJRKPRnp6eVCoVjUYrKyuLFdExQn/c
+0/rTTz/961//2vO8qqoqM/iGTSorK+PxuJQym81qrVOplFk6WlJScuqpp954442U0jvuuGPdunWh
+UKi0tFQplUqlLrnkkptuuikcDpt2t7W1feUrX0kmk+FwOBqN5vN513V/+tOfTpo0CUBvf3vT97//
+/VQqVVaWGJwMtOjrydbV1d11113jJ07gzELE55597oknnnhr88ba2trp06ePHTtWa93d3d3R0fHW
+W29lMpmJEye6rrt8+fKbbrppxYoVd9xxh2VZ0WjUCKhSqru7e86cOXfdddfLL7/8y1/+MhaLlZaW
+ptNppVQ2m+Wcf+5zn/v0pz+9bdu2jo4OxthZZ51VU1NzvEgeN/SLFy+OxWKrVq36/e9/L4Twfb+y
+svLzn//8smXLXNclhORyOa11T0/PqlWrHnrooWw2u3Llykgkct111336059esGDBE088sWLFCsdx
+enp6FixYYKTE8EtFRcWXv/zljRs3PvbYY2vXrg2Hw5FQWAmJShNCZ81cePNNtzzzzDPPPf0MY0QI
+UVlZedW1nzrjjLNqR48RQnme9/Of//z++x5oa2u77PJLbrvtttGjRzPGIpFINpsNgqCxsfHuu+9+
+5ZVXLMsKhUI33HDDokWLbr311tWrVz/++OO+7wNARUXFNddcc8YZZyQSiaVLl1qWdeedd65cubK+
+vn7RokVz5syZNGnSwoULe3t7c7lcKBTq6+tLJpPV1dWFyfZY6X2CDO8ToOjp6bn++usNp1955ZVH
+jhwpfFXIPLS0tJx//vmlpaWhUOhLX/qS7/uIGATB7t2758+fX11dHYlE7rzzzsJTxVG2Bx54YMyY
+MVUVlZMn1R9sPoBKS1Q5kVcoe/p6r7jqylgslkgkvvnNb/oiKMSFfvaTn0YjJfFY6dVXXNnR0VHo
+BQ4tr1RK7d27d8qUKQCwfPnyIAhMU1tbWy+66KJwOFxdXX3XXXeZB81Xjz322OLFi7/2ta81Njbm
+83k9FPDJZrOvvvrqo48++vjjj7e3t+NfRqiOhf4WPwIRY7FYSUmJOUTesizXdQtfFeYuo3yDIBBC
+JBIJMyVwzsPhcCgUMgXMTFCYcgu6cuzYsWa6NqF5IASUDnEXAKKhaDQUtYkFGuKRBOeUACiUTQ2N
+jz/xKEEVcuyLL76gtra2eK4qTCeTJ082vDx69GhTv1IqFouZLBgiGgVFCEmn0w8//PCDDz54yy23
+/PM//3PxFE0pDYVCixcv7u/vD4fD8Xi84KAdO4zvB/27IxsGHQOKSXW6tiMDEXg+RKOFR3K5XDKZ
+/N3vftfY2FhRUTF79uzLL7/cDA8hxDxIlLYIdW0HABjnCrWWyrIsqRWnLJ/PO5adMbkORoFAYeef
+LzwNSqJkjCkQ5mdfGPDmxv09XT2RSNQJhcbWTSogVTg03zQbAO6+++5cLmc4pmDpg0YtleWGLMYJ
+wvZt2+644w4hxJ/+9KepU6cWmy5IQANSQkKhUDgchiGzFY/TKTturjfHcht+sSyLUdbY2PjjH/94
+2ozpjuPk8/mOjo62trb169fv27fvxBNPvOGGGy666KKysjIY2iOptQ6CgDFm7DOttbHBDYNzyypw
+kMn/FaRBCGHyriYKbew5oaTNLUDo6+vr6elxQiEjkQUOLTxLCDG1RaPRWCwGQ3a9lNIsbjAvzWaz
+zz///K233nrgwIELLrjAWJBm2BDRGDmc8YKhiYgFS3RkoTcYGVUopbScwWVGXV1dRpXn8/lYLLZo
+0aLp06d7nrdp06aurq5TTjll8eLFjLEhE5CRop18AIQzPljzkNYyvTIHGhvXzFi0xosp2HAFZpRa
+h0IhDcA5ZxYvCKj51qBTcJjN6BbS5UYQETEcDj/22GPpdLq7u7u8vHzDhg03fOb62267bemyswur
+qSw26A/jkK+rtTbJy5GF3pCZMw3LTJs27fbbby+JRYuHh1La1dX1r//6rz/72c8AYOrUqXffffdF
+F10EAEEQGEDN4+YRpVVhv16x426GuXAcuGVZZvIo+M+MMiklZzwWixlFm81mDY8X1oMU4DaeR19f
+38GDB0tLS2tra6PRKAxtKCSEGKP561//ek9Pz5133tna2rpt27YvfvGL3/ve9z597TXG6geAo7zC
+QhCl8NMgx0LHvQ7HDHUoFDKrkYw9U1hMYVSKwa66uvpjH/tYXV1dZWXlvn37Vq9ebTSVsUENIxf7
++kabKz14yKVt21prczZ0wXk2irsg6QAgpOCcA4ExY8YkEgkpZX9yIJ1Om8JGGxgVZwDinP/qV7+6
+8cYbb7nlFvO7M2ZuLJhAy5cvP2vp0k9+8pP33HPP1KlTEbG3t/d73/vez37y01QqZQbJtNysWDba
+z9RzXIx/3NAbgIIgKNhShemLDJFhDUTs7u42ZRzHicViZvmGMbSFEJzzPXv25PN5AKCEFrgYAHbu
+3JnJZAzKRjhMbwvRCDM2UkqLW+YoiRkzZixbtiybzSLi6tWrfd8vxIUopYYZzVHfb7zxxo4dO2zb
+HjNmjJEJM6mYZhuXmzK2ZMmSe++99+yzz+acZzKZf/u3f7vpn2986623jMYzc15x4PO4U13vb3u+
+27Q3DL5y5cr58+dXVVWVxRMLTpj/5zfWSimNojfeeRAEW7ZsOe+880pKSsrLyxcsWLB161ajUtPp
+9Oc+97kSN1ReGp8/74S1a9f6IpBaGa+9t7/v/vvvnzZtWmk0NnH8hFE1tQ8//HBBqtLp9IoVKxYu
+XFgWT5TFExdf9LEDhw4GUiAiKr1h3frFJy1yHKe2tvaRRx7J5/M4ZJ4bAZJS3nfffbFYbMqUKWvW
+rDH3c7ncc889N2Pa9KqKyrJ44uMfu3h/0z4ZCD/vocbOjsP/dO11idJ4dWVVaTQ2bcrUH/7whx0d
+HUEQGBZERCGEad5x2fXHHa9/8cUXH3rooX379vX09Ni2TYFIKauqquqnTLZtu6A9ent7W1tbU6lU
+ZWXlCSec8IUvfGHGjBkFpjh06ND/+slPX3vttSM9PWPrxp20eFFJSUk+m0smkwdbDo2uHTVu3LiV
+r6zo7Oy0bdsJuVOnTr3hhhumTJnyk5/8ZMOGDQMDA67tmA5U1laffPLJX7/1a2NGjwHEvY0Njzzy
+yJNPPhkEwfLly2fMmDFmzBhj+bW3t69bt27Tpk2zZs269tprly5dKoT47W9/+/TTT7e2tvZ29xhe
+DoKgtrZ2ypQpX/nKVxYsWACEdB858v3vf/+ll14CgCAINOCECROuuOKKz3/+82ZVYeF8l+PKtxz3
+r7Ht3bv34MGDWutIJFIQGsNQhanPtCMUClVVVY0aNSoSiRijvjgiHwRBS0tLQ0NDS0tLb2+vEMLE
+baZOnXriiSci4q5du7LZrGVZvu8LIerr6+Px+K5du4IgiEQixiABgEwmE4vFZs+ebexX85aenp6d
+O3du27atu7s7n88LIVzXjcfjo0ePPumkk+rr68086ft+Y2PjgQMHHMcxms3IQT6ftyyrvr5+4sSJ
+xh7r7e1tbGzMZrOmTDqdrq2tnTdvnpmQyNAvh+LxhM+OG/ri4X33mwoRWtOHgikJQyZ2IXhb8P2O
+insU96RwpxCIPsqEMDdx6MeXYMhWMd8W4rqFsKIe2jFbCH0bLXpUpBqK0jvFgBQHkE1JY2sV+7HD
+EzR+TzquREyB8K9sFhjUekOiUHCmjkp+4VAuoiBSBbCwyGstjHFxhgSLbFNDxcJX6BQU2VHFzSNF
+qRsoCvSblsMQ1n8DLH/jIoijWlPMp8XMBe8lGYb0e2UVCiPxTvuG4Cu+aT4Welv49qgBNrUdtR6i
+uHChQHHleuinPo4Cvfi6OCEKI5EqORZ6/5cd9e1RnFJ8H/5SJoqxLrB8IadYLCLF+P412TrqXUcV
+eH8FXcDn3WWOEq/jpeOG/t2gwHsJ5lGP/Lf3C9fF4B6lcAoPHsV079mqdwsKFM0xBaYuFlz4SzmG
+vxQg8pfZ16O0Fg75ksMwzb4/vRuLgqYrsDb89Tnn/WXlPTVvcVePUhr0XeuZisXi3Q0unh6KwTpq
+zI6ah4orLNZ1xRbBcVk4f2MgoQCucSKK8/oAf7E5plDyPYcEh1IZhWeNXVSMe0FHmV6ZU1lhyJoq
+VFgsdsVqrTD3vPv6r+2CKzZXyNDKg2IQ3vnV8qG3FBz4Y0dyxE/4+oj+Go34NraP6K/RR9B/YPQR
+9B8YfQT9B0YfQf+B0f8BS7IrfCzlsH0AAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_byd" model="fleet.vehicle.model.brand">
+      	<field name="name">Byd</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAu1klEQVR4nO28abhl11UdOuZca+29
+zzm3qU6lptTYFsgd7iS5wdjYgIkNsQ0YQggxCQHTty/gkC9AIHnmEZrkvUffhIeDY8A0j8TBhMYv
+7rCNO4xlI9nqu1KppOpuc87Ze60158iPfask2XX9SSCn9D5qfPu7dU+dc/Zde+y551przjGnkMR5
+nAvouR7A312cp/6c4Tz15wznqT9nOE/9OcN56s8ZzlN/znCe+nOG89SfM5yn/pzhPPXnDOepP2c4
+T/05w3nqzxnOU3/OEB/d05EUkYf8D+AAAQICCBDgcCOcqgYQEhEUQqKaJxWION1VAZAIp39CQIfR
+Y1QA7pUCIgcJgJq7SFCJANwRtJpbUCXo7hAFVEQygsIDYCwiooggVNQABQViMKMHCQEq46A/M5BH
+K1Xi7qpne4bcHrgEU5BQMQXGJ85AmsIRABGAYLLqpMFzIMVync/FTE6e3NrY8MUw0xizbR69z5bD
+2nQWDlzsQbK7dF23f710Ddq22bvWx0mMEUp3b5oIwCrM2ERCOTgbRHHADOpMSgYdbQRAhAngCPL/
+B+rP4Izhj2cWCAxAgQIKAm5wiCMmQAUQOGtd9Lq9CIvid9928s679MhRueNu3HZnf/Ot27fcFiwj
+BpLiJC2IKkgSYAmmBB0C0Zh6r2iaPQf22ec8Z3bxhXroAj90oP2sxzeHLvX11bS+F1zBTLNA4YEE
+CY0D0AF1PA2QADHCAZFH2y88gEeZencHoDu+giJSCBUoIABJChx0oEBjvwj33c+j9w633rL8q4/m
+D17PWw/z1G3Lze1kCJSEwKgZaKYTWcIFIuIwF2gIFJiZpshcoyOJusHBGsTosOMJgSYVipW9PHgw
+Hrp47xVXDF/6/NVDV4RLLpeDF/vKFIpEoGakWKxqaBQuJOAmqGCLBmdzpH97PHoOBxQIHjREmosI
+tMIDqCaoigYux0/w8NH5x/8if+Sm4e0frn99o28cLxg8FCiEq13TqhDmCglRKehzjm1bawUQQhDA
+zAAEUffGzZIGhRidQT3IIg8ryeFUuFQ3s2ye4TGmruYhrjaf8+SVFzyve/6zy5Ou5KELpwcvTB4h
+AoE5IKP1O8GIdIaiR5f9R436M2eR0fadIiKqpTBGEYUNi/62W/39Hyp/8ufz9/6l3n49SIdAk3dt
+CCmaxsqiA6P2pGugqBgaSeoklyEEANUMgIRxpvUaPYoqREiau1dVTSmV0tCtEQGNpMZQ6MVcm9YW
+m13tA8qAUC57vF57zYHnPRcvesHqVVdi71pGTIBUDO5stH0QP49R6o2+81Q6ScYQAbhZjsKj9/JD
+H6l/+q7+z96RP/5x+sJhHvfEGFXV4eZuoCpUdVJRaxYRDTCzWjLhDWLBoFCCBETE6YQECb1Uc3Mw
+SkhBIoVeQWpYqUI0sShAaUITXYMrS65tqAmoJfZDKFlggnDyiqde8OLnhpc8L1779NUrr0KcAUAF
+42OeegI87XMACMRqPXXqVPPbb9p61/vrO98bjx6uGErbhHYWvXVWKgFX92CmbsVqtgwJgUih6a2i
+mUwvO8QDa3F9rXR72ukEUSsY2iZ2Ewqokjb6UgcRkerD9lboq/TD/ORGuuWWkjM8CyhwBw2eNKXU
+MqTehGkqQVn6hCqWrZyMntAe0Gc8K77yi1df/oXd054MDeQDdJ9j6gegdTBTWgHgYoQEKBbABGQV
+KBT1rju23/QHwx/8UfirDy0WfRFpZqtBolVAhZTAudTKWghbsGK2tnboktokfdpzZo871Fxxie/Z
+G9fW4r4D2LNWZ513qyFFBKVAQkhtAxGCsj2QBE2cVnPNw7Dsay6zu4/m+aadPCH33be48Wa/5Ta9
+51h/71HbOtxqCNJAGsTkKiCj6NCoLDPgZZivxGnzxCcOL3/pBV/7D/j0z0nFSrKMNAEVFUZoR2JQ
+TwCIKtoSsMxYBLPPFPUo85q6yGBLwzQQFdWDRAtmWWoTY93aeuObtv/jb/qHrp8sh4rEaWqSynLh
+cA1eloPDBDKkDldcuv7ca7unP9OvuGJy+ZVxfW/e14b1FUxahzZUgVBQgKY6VMeZhKd9vdGDKDBu
+2BwE4ADgHEICEGDRK0+eqidPYWN72NjQD/11f+ON2+/7YLnhBq0bisZTZ7EJKBInCa177a2PuaTZ
+rB46cPAV/5Tf8zXp0KEmO5LWDE07OxIEgxBQEyUQHfCM2HymqK8oQgmIEGzW7TZ2DYNk2Wr7CaT+
+0Ts2//2v9u99Z7S5MTDMcgyxFm/EynK6dBfdumBt/+d8dv9lr7rkiZ+drrgMB/bZyoq2UxEBgQpE
+ZAHG9TVB0ESiE+N2AQ9Z5xlG5gkg4EF+2RTjxx/0Ybpb2C5bCz0xl8P35w9/dPvt76zvfR8O36Gg
+SyvNFEGD0L32VgTB2bTXPm3yrV+7/+u+tkqrhArQD+xagwtrYAQ0ExKQHsnu95FbfUUfQQwTAzQM
+1ZvUAMDmfff94L8ffuO3mroYHE1NUdSSRPfNus26CM1K++Lnrn35K5vnfR6e8ASNCNMpETIgIgoE
+OFmVkcIqPlIpTigdomjHueSTL+2Thv/A2wOgBJ2gBAOAQKAlIHCgGMRz2y+Wd91y7NZb1n//T+9/
+89uaE/eKAlHadtaXkGSynTZW5/Nl2+lLXnb56/5VftpVdHeNsSaJdFgad+eCIjBB97CJfOTUj+EY
+LSzCEusUDZfzt71z+LZ/s3nnrWmYt810k2qzidZFs3WsDz699LNXvvyVq6/+Gn3yU8p0QkGiQRyA
+eBzZolUqNQgYITsBn50AEACB6QOhPnnwYEaz1096Y5zxT4/2gWGDAAgBoDDCBVGACrA/cd/t6e3v
+7X/hTZvv/2AMhHibEpdMXavzeUU5deFFF/3gv1z/9m9AVgTs7M8FpQ6NJggo+vAn4r8R9eJWPCDm
+hAb12M/8/NEf/AkZ7ptMDzQlRnPR7Mv5UpvVZz3Dvu0bL/ySz8clF7mpaGN9jRB00X2Hr0qIQMUB
+d1hiOzJ4Ju7mgBONnN7X8OwrjU+9DOFD3xAAyLLdsAUTKqBAAFBh2W2qCabudbF8119s/Mzr7c/+
+RzM/atOZe8PULmW5VjwvtfuWr9v/sz+kae8CmDAmYEBpRMRZVSPCwyTyEVPvzJQmOAaFbhzZeO1P
+5l99I7oaQyoVFmLsB4H7i67Rb/lHF3/1V1HWpCIrXSUCETB4rv2EHVSgAtJBuCgEAoYKUMYl3Zkp
+lKd/fyjnJF0IQM8S/a4EufMFBeBwABkqsOBMGghWrwomjY6oFM+mGmpCRumu/+jJ//D6jTe/uR47
+PplMFA1t0eZtC115/tWX/cLP5ade2SOtWbQAwiORRR/uJPs3oD4DqYd1kKN33vXaH/I3/P5aN9kK
+Er0JdWFwXvOM2Xe9Zs/XfHXVri1AMN8hVUiqKggHTi+XHawq6lCOG3lAuEOkszoYVASAhx0/T1Jw
+JkIn8tDxc7xbhJB00egEiSA75s9x3hU4K3Vn1lSHGIZEQW6g8IQMRNSI8u4/P/HjvyJ/9tZNOZGm
+q7NlO3gtdQtPeuFnveHH6tXPiCUywR0hE608gkgnd0O1TC+kV5KsNdcybFvP0hfmxV03H3vxl9+L
+dPfK3jvaC29aXT8c2lsvfeJ9P/Jj+fhh+sBSljSSpJ39MFY30pw2ZyVJs8xsrIWFXujcYGU1J61y
+52TVmMtAZpJO0uiZTjpZSSfdWHb+wsCFjcMvdclcSPe663h8HIvTdwgwM3dnYU+eeOPvHXnq82+f
+7LmtWT8ZLr579bKbEQ9feGV9+9sLi1lhJYcFrbj7JzO5C3a1eveqEqsgOiAowghx+iCe7jpy77f9
+S3vLf6l7VhoL7VAG8/DiLzj4L14jX/z5LtNQfPSlXQHiLokwkioApNrOsnCccTNqAzWoICsSWcQa
+06LqgjguhKDjFDqIt9QiFEiAE6YAgQy0ngCHqStUYIrggOPTueLTS0PiQQspwh2qhntvPvq6n1+8
+4S11ONWmoW8m4eRWd/DK9bf/dnziEzuNGZqwFEz+tlaf6XTWWunkaEnF3b2eOnXXa77jHkwPr1xw
+e3PhTXFyz/Tgfd/xL/KxuwpzT1qhk4Vmtd95cbbDR+O0ykr2A2kDh56F5nV81JyjHS6ZjcMZu6TT
+3WutLFZJd+bTFjvQetJpSw40jqeqXsh+x65L3W08pLntPC+lDOPzUWtmHnKhO1mMPj/2H3/97iue
+dbs0d66sHekuuxeTez7n+cN9h7NbJbd3ns2Hhd0dzulLou88ynTj1tbmD/27W9Kem5vuhrWDR2Xt
+zvWDJ376J5iXTusXy/GrZaiVpI9u4+zHnKwkjZUcaLUsWQq9OHuzQvPC4lZ2vAc5sLi72ZmXY7xu
+/GHsB1YfTYQDOYwOh9skWdj3HKwne8+7jad+ylHIgWbcLvSSOTg3yIHcessf3/nCV9wBObz3cbdP
+LrqzXT31la/hseNL9o+E+U9DvXFBpxmL5WILVnKx/J0337v/4pswu3vvJTcITjzhyq1fe/1Azpnd
+uSRzHZiXZHbaYKwkvZ71GFhYKsnea7Gc6QPpmSxWCwvpZUH2Zizkkpl+gsuNSiNppY7UD6RXcxot
+L1lqv5x7IY0+jB/sl1sD2ZOFZC2VebfxuBW3Ums2K6SZlfGX3pY9uSzVveZaCsnKet31h7/4K25C
+uG31kk+sHrxb95z433+KNXs1fxA+PfW7r3CILN5UhwlimIfC2z564tU/gve+JcwuGbaPp1m3/z/9
+7PQrXr2hmFm/lG41by1+9jfyX//1fF9KVVo0i4Sm7DLlp6FdoKYOQYftfv/f/8L4ipfWkBSskP7j
+n1j84q9N6+DSVWGneatac9WTV//xP9ADF0SC4lK1RCSgEEHMThyd/9xv5SN3rKRYah1C21Xfdtv7
+v31j88Qn929/V/ntNyOoxd0yfqqqZ7Js1UxVZ7NZ90PfC51Zg1CWaJArG5kyYnH9x8o3fO/J972j
+SQdyGfTg/sv+6xvK865pGEdKReTTRzp3zzwKGsCFGiMDpovN4//5zf6e90i7PscihsnBn3pd+MpX
+l4IZLEq7Ksib997zh/+1fed7lm1pM7KmanW5SzjJvF/RaXU3zwW28Z63X9WifskXuEkMnd9189Yv
+/XqfTzZhbSnYwLbWRr/oZc3LX9ofuCAInAj0RAWpEJPgp05u//5/277uL/oY6dGi93mYIx74ui8N
+T7pqeeN1w6/8sktXQj375TpFdgyRKmamqoumUa2Hfuj7q84GiVG8SdrXokizpzzp5K/85OyV31AP
+3zVZ67bvu+vYT/7igTf+X+j2fBq6H3Krd32HgFNCcMEWTG68a/7rf9hiHmKn29sHvuMb4j/5ugAw
+Ahrg2QRNmM3QAdKgmaTZYtKldj3ugrbdfyo2nEwxTSsr7Z7rP/6J1/50uOX2KaeN6aSZNRps2jXo
+OsyatG5xAV2iizLub0XGTTzUgsAB6bpGmSJqFElNjNpOmhbS6N5aW8YuQq1tdhtP06YQNaaQmtim
+2LZNjKGULD/zS8ff+CYHJiE1OTq0kxQKSs2zp1994Fd+fp5syEdWm+n22z84vOXP5TQewuXZXMuu
+1GcZKIGVpnWtlP53/6C97ZahXe3n985e+tXpe767zCbCKgIMYPCA6rZqmDMsRFf6kPZa7INZ2+WY
+Gkkto8VoIUSmFCdsTu2VMI+EB8VsPon68Q/e9c++D7ffaAE9q4bYelq2lc0AbbROUliZswighEI8
+UCoyI8xaQgd30SIz1T0tIjipOhXMswgiusoKIAVq8DhtJEBMQysa+2RRYkUrOtuKXWzXsjcWVkJa
+9SbqVtn80R+d/Op/kLAcQhAPsDwkJK2KWj7/eXt/8t96P7UQ9eRtyzf9Zxw/MgiliouA7iABl0dC
+fUKAQ+GJcXHzzXe99R0LDMmKHrj04Nd/2eTxl3ZAsUJDTBCJOJ225+nM+KjMabaWWPbL5TIPA4fC
+XC0Py+153Ai+rKuW2tQOQ5nGZr+D7/3g/Xfd7aUoxKsBUFWSZjYDvfaatHGIeWBWOKKLAAgDuNUR
+XVktmwFbG7PFg6/lwRYYRbN4jeIhuoXWmkmYeZh0zAjDWjCbn2gnnHk/2PasTWky6e8+esNv/dHy
+r25sx41DjJ0DOtES2xAOfOWXhmuuXiw3mtSefPf7tj7w0QBDgAKQM3Ek/1SGd/X1RFAAgRjq8KEP
+lL/6SBsmZsP6F780vPzFvWjnjDGJAYICJsgZ6lUEkFqLtk0721f3T6oQhSqsEEoQcIjQHmHz/pir
+pelCxEP16hxKislDpDt1J9wQQoAoNWTRCUCjhCYPzlaTV4g6dGrJeimQ4NPVudSw21bRW4mtZdR5
+H7P125aRCMV0KWwpCq3mgKxZuz0oUFcQF3fcP9noQRgZ1dUlIzQGNMgXXXrw+19z99d92AO6I0fy
+uz6w+pLnI6QxPhicDBIYPjXAsCv1RlGA4jIf8jv+fCWfCmH/Yq3b96qX28peI6pKAGEwgjGO4d0z
+Pk5kZ6ZafcMvrD7t8tKmaVYAg7iIEGCK6cg9x37kx/v/9tbQtsnVkqhKHJU65iISQrAd8Q42iNUQ
+JhINkKaKVKoJOFdMq1ImWcpmHGJS6UJe1jFRIthxu2cGpl7FwjJLfPYLLv/u72wuu2yTQ6wtON8z
+pZb5yf/jDZt/9o6VaQ1TX537MqSQQtNGiwxEI1JBV3EIO4hRpNMXv3Dt+Z+7eOefJwXedx2OHMWl
+K2MoOpym45FYvcAcDK7bW+UDf9WhKbT1F7wgfd5zlXEqAJTuEqBnUkUP1QkRVBHsOdRe9kSoagUE
+kzFQLIAjTvbEdmqsfWOkJ2KZy6oI3OEuIu5OoaoS0Chp49TK0a3hAjRoay5Naotj1UBCgbCBWBs3
+7ft+Ik05SxQZACxI48EkNgcviF90bb34soDcoImuc1hUv/jyJ6eXfcep2z+gXr2bqmE55MGGPtg0
+QQihJ4UBA5ZdadiFsOfC9qu/Mr/zvUMMet3HNj7xibVLHq9jqFWVflbmd6f+9CSg/ZHDixtuREi9
+LeMzr24vvMgESkh2aWMGGmLUVJ5ZnOF0eJFkbtmqAzARgajA3V20qYD1poRAhJql64OiHYcrIRCo
+7hrGVbbP6Cc+9J7tN/3uxU/94eGWG9OpkwO7nPsa0LSKezZPvem/24c/1mjsu4R8ehg7+sAH1hgM
+qXd31lRZGRvT6AFBSJ+xzsWGJ1yBn/+uyd97TVHrrW04NJLUJMboguAMCMiIyaIYu1DpqZvxmmf5
+3oM4eU+5/6586x3yRWOA1iFQUfhZEoe7Uh9oEgIQ53ce1rzUdv9kD+JTrwZgcMCDRpwOdqWz3VVV
+ddKO38Pbp01qBY3TQFGr0rAG6LFj7iwMqffYSm/bS8SmFNCNDhWVICLipBHTldnWfe11H2uP3n3X
+D//r5e/9jlSsx8mcqj6odAAmTa+TaS29w8jpWeO3WmuR5AGmWKo3BFIYwAaaESa9IMbyWYdKq8JT
+E00VIUAbU+uzEkEEoghjgiz1cZig6YnpRZcMV12l77+DJO4/BnG4BurOGB6R1YsLFKjA8VMimgdb
+uXy9O/Q4KAOMQkTUglmKEEd1RJxZ3ozeWVWNzK/9l8f2rOXCoM3SfaZBzObRgkQUyB23z0Ln0mWr
+2WW9W+lmUwQtbsWtCXB3Upqm3YIlYBLazZWVbu0QbTaZrBRTV7cUI5uYtbazXFTZOfoHp60e7Hoa
+Iohnyzr0O2oG8xAcFhEoXWPAnmO6qNC2KxQIBq/TGD2ICuBYiknQjmGIYeI9gImgtoGraxUetPqp
+rTwMTZxE0eolij4y6hEMNK8WjZGU2A/dpetTMfgAnyLBYZEGSe4aQaizT0jZg8ugql2a9LXnx67b
+gM9Ei0DdF0AWnVEcYakSY9Tpeu9D1BOTyTpe929mVz93W3KzNp1ljdw6tTYJvl4sMIGYmPp61uO0
+1Hh1tYYrtThn82pN18hQZwyFxVPoW8TtY9auNr7dA65Nju0sSxVaCAlJQlS3GhHpASKiyatojc4h
+ghOUfhq7RpgjZAnbC1UAiomP+ZiqjFW7iFoRNYQYBiWqrKwcWcTNU7ygBTxoqkC0swSrd13XOxRO
+S9GsaIgwSBRtU2DsPNAdiiASAOG4rXzI8oaku4tIL7BGTSS7L4GgOmlChVVYxzSpMXgItVvOp/2e
+g3ufcGlYTStoJldeZd/7NcfiZH2bi/4YcGxlcUqwFCxCzLFhVVSoejgVvMKnLmWxlYfNmk+Inyz1
+2J6TxynT2Xd/M570jFRgrE3tN9KWpLikLUBPSZAK4GikJgpFdxitqVq/OYs51pO7miaUgkA6PVag
+0Jrggio1t2AaSzFUnMDZkwS7Wr0jqBg1VnWzAgTLy9ovg0MlAjSBwMUxit3HzcOZyNG4DwptaD7n
+ObhwPS5t4hJS1MWwSGUxlXWkrfkgt9wqG6dmMpl2Xbn7tuPf/dqViy5cu+aasveCg//2tWl1bfF/
+/1ZX5kmGYdIOjulkFds5zrO5MAjgTde22xYz+72rbNu6WCZ6tVL3TKff888u/q7vrKt7o0HFDWWP
+dNvOxBgAHfpJLjuJXwIiA2LIhqap0jJ2yxCD7549pVIgtDFt49VJ2iitW2u16xwafEf9YPDwKVb+
+aYX7IskRDuwhpEtT39quR++TgMZHC6fAIAoBXQj/JKs3M9Xmwh/84XrtZ4s2WqUECcUmkSstunm/
+vpif+rF/f/z3/0DS1KazkLPdfmt35Cgsi7eycsm+H36tPfV5hl4bQ25sONFe9gRcfAiIIkGE7r1V
+9KxyYP/Kt31t9+yrfbCpxd5tbT31L3sRdU81MFgDF+1KDaI6kQRoDeZtEalFCjW2A7TVqAGGyUKK
+txtmszjpd1mkAnBiZ58qyFJwahtEZ9Ksr0hKZ3xMAApqwCeHEXdf4Yz8GtKlF2VJjftw5P6tD39k
+5eUvqaJTqJow7CgueDrxNq4pT4/Mo0i96pLllQcbTDpGFRWgAdJgcihwsVXaVJvMWcgL76xdRG5N
+sVcZBRjQtyvdV33JUtnRs4SWg9bYCzy7OBEQIlYHUde5xH1f+EV48YsAjRUN0aesaFitCwLaySTF
+tTaxNV/WLDAVydQANIwwBT2BVYsJcsw9F4y62damtLvYJYIAbg6tAbZ9vN55d9JWnM2+fdA0CiXG
+R0pxlpl2V19PAIxwC5dcIpddDnhbPH3shunWRhQYx0cpGACnfsodFJFRjKebZRWdQuA1WQ0GVEgI
+KJAhp9yvOVk2TRfThh2syVAKDNZ6Z0uTPDERl9bHqAhboJUSHCzilGVqh0aHYagpVWgGoUBEQtMQ
+RTMqYY2gWQFoQ1NzVguaptapTAqiSSoIbBMYiyZKmu1Zc/e9NU3zrplcQ02AIwSEDo7rPmb33CPU
+3O3FoUvG/auDlJH6syxxdqVetAKwULh3/+pznpltIQjLD30YH7iuQcnjqgw7OhkTPFgF8eBt7Wa7
+R3Lb5FDdihRoHTRTvG+sYDCNrE23nE2b1aGYV5UYS1QEzEEEDaKgDZKpMAEil6hDrKaqkkQDiglt
+RSUWbx0NHDpQPBBgaRU1BYtI2/0EDKKisQnR3eeoeeqyeTLcdFO6//b54bvtzlvDPbd1d96xuOHG
+MotLhGy7ympMTAhFEgS5597+//1jqXOnhqc/JT31qiIhjdt9AITLWW7hrg4nozaINWqztu/gtc86
+/Hv/JbTd/LY7Tr3jffs+7+ratg/I80CjqODBW1lVHXeze/dv3f3jr+Ob37XeYFszBSWEaZEqTUyQ
+j304tLJQgbu4IzVpqKnCiKiBHsSxiIgI4hAkcCyiQqRQZfAaYjPY0EYdcp4RAQF0oVZFpBlcHCGj
+36PH0O/n+hYXwkZhuhJWhu2Tv/zb9/3yG+t6WDFsSdkK2F8mh0O5uGwsJ0nLbvQAcFQAsADcdMfJ
+P3rbLHIwXX3mk5srLx+A5ACo4oTWs61xdqW+RdfrMjFIFHvhF8vqr5blPZ1H/ZVf2viqV0yfug4s
+o09QYt/WgG3xNXEuEgQe6uqsyH04vMo9uT2gH7l5uO6DxwLFkwCu1hsshCVzaEJKe1IGpW42CJZp
+EwhqtKkFC4Bi6m46Fr4WWBuDBY8DoGG7YTOIJJmAPbpQBBEVTKaosChdqAUKdr6+JYZ2O8wn1iaT
+pYT1xWyhB+zkCbn7I+H+9SUpIp3IHNgr0mOvVod4l6dzMLoPEW0GNCNSgIDIBLEat07e9R9/fm2+
+Cext91R8wUvEGknVNAaPIDygrRWfkpjcPUs1lkNWFyI85Yrp135JXyvX2lP33nf/z/x0OnVqHibU
+WpN1Q0x1JWtFysCyU4vSu+TUaC9Zg2lyiSapptan0ScRMfo09bNIre7uRYvJ0CiC2ZYQtDDq1cZw
+KEUpS4GLIqJCjGoMVhCW0iLRY2VKQ0xEAaAIQEfCiBioGEwZWkOKJTak12Uv27ndDs3cMHewiymE
+EELQB2FMNm21fQm+wpTQbDWYxwCEBShmNFDj/A//1H/zj0rTbacsz3z2vqufijYaGLCj1SV4VjHS
+7tQLEpJodKPvWeer/76sH7J+npqV9Ou/c+K//k7XOwD6wAYeVEsMPgk6M3aLoFueBUFEYTF5M/Nu
+iolLWlJ6iSXNcp312CvNAUinGkPB0Mvkiid3V1xsQc+MWwCoCGTiGil0RFpj1onEBE019Vtdzm2I
+IYoFFBgJwLNoVgxgJpO6BN/WgclOwtHNZroahuDZVSaC6VwS0JBpPNzjmUN82VjtWaQMq46mSg8H
+qN6qYLj5liM/9NPCsmyYQrfvy16Fz76il8hRSI5RUG5nJXhX6qtAPTBEUYsF02uffeBrviJlVtXg
+4dT3va6++7/TkWTqXqpUT4BnFAvMa3lYsX6S503eoiwKhiHP8/bcyxJ1CMtB5n2w7UU9hsWxZnHC
+hw3XtPelL7/wD9+4+uQrKSp+RpIJkHCCcKftBBnrUBa5zLPPc1eK16X4Rt0egAQdq0uaog0lgkE8
+0EPp1fN6Xzpd1OWG1wEujXsL71BS3oTPx4O2PR7jS/EUETzqgL6qIUoHnc7LZhLee9up13xTc/vd
+uZuuZovPurZ71ZdkiRVMpz25jUXbZ9ua7Z4qAaKBAlNPJbbd/sk3fNXWO97Z3HTDMF1PJ4/f9U3/
+/NCb/lN89vMEIeZBYyyG+MyrUZlnMwDsF3FlT4xr3bOuWWwvBxbX0LirRGcsurygJg8iuRcfJv/0
+FXu//utpq1A7reYe1fBjNUMYrV9IFAlPe0pz4iUIMVXbburasu32rXdrBxOQSBAVNYRI1QoGCEoY
+9l8cX/ISsg1tRQ3qMTzrWegDLvus+oUvY2TDHSs8syHfsU1d4WKLFx9opisO0ghGdJHH7zj+za/l
+u96lq3vWt/PW/n2Xf+c32eWPi44oUXbMlw5JYzHupxj5rjqcDDQFUCxCaZFQwbDY/PnXD9//fQtr
+V7qW83m99tq9v/hTzdOfmVMKgAPN1olodeim1BT6mtD2azFuzKP07CYwihtUemikiDbzIXdtSGps
+tKAxaKKr6JjdM7iKio/9JYLqQE/bQXVxInlmnCUJWXM3tJjPcfDAIID3rXSQAUgA6EXQVgWLpe0T
+mOxB7iGaNYee2L+Pi5ylnzLlcJb0qYiwGoN77ZvZPlrKAQ2o995/8ge+f/s3ftdnK9Oci7D7xm89
+8As/hpIggAIORBhg8AYKP5t/2U0b5V5HwV+hDaQbe5LHjx/7lm+9Ke29P+y5Zbr3E2jvvPLq/g/f
+4sOCno2DcSBH2R77nROxMvfsl/TsJAuZ3SutH3WBo5KZxry9oBvttJjPbPw6yUKfk5U9naMY8LQO
+lKPsknZaq+eFzsyBRqM7e9JK4TAqiPOOrHiDxbkgM0ve5i5aQB8Hz1HmVkj2pBf+5fuP/IOvvxnd
+bc3aTeuH7sXq4Re/1O641avNx1OZu1en+ahOfEC8/BB8Gs2l0diPRORMkpnurB+/8/gLv/RmDbet
+Hbh/dvAIwu0HHnfi536tbmZW9uTg4xW6MbMs3WsdlXeZrMxkYaXRnD19oFUyDzvi160dmSrdd+4I
+S3X3QrJwqHO6cRjvRU+zLVayN2fPvGSuLPSdYXBHsD2nz8fbv+TWODQns5NWB5bx/tDzWfXf7rWW
+JYv3Q1mSpC3/5K13vOwVt0PvnO07Mj10V2xvvvKpx9/+/9EKK6sPlZZZnGasO2Je8+ERUf9JkkF3
+NzMzqyTf/d5jT3v29WhuWzl0dHrpzdLeGiYnv/UHeP3H8mgnhT3rwPHzubLUUXPsO0JU+gNSd2Ot
+tB2i666W8OihnBYs0+jG7BzI3sdX4x13kpy7VTKzsBSnla1Tx3/mF2/7rGfcjdW7m/03rU3uwuTO
+A0+e/+7vVBb2tJqH04/6w8HuVv9QjPpNMxtV0Mff/a7jT3r+YdE7V1ZuSxfc0e29MbVHPvcLN9/w
+m9ZvOy2zLFlp44PKpRWy2LAgi7MMLKfrCHbYL/a/gnXuuCh7QFs8lllkOrnkzg1Z7HhLG7wfyCVz
+/663HX3lq25u9t2DtWPpwjvWLrwH67euXnn813+V3B76xeiXan0EV/FwC3p4Ornsjq2oKwD/4gP3
+feM32/UfWW/3b4ZkdbOtWtf3+stfdOA7v37lOZ+LnIBIBQLIqjsNDhQSbSyk5M5KZvw5NmuJn7ne
+PwCAvPOvj02ezDyI6tgAqnIUtoFEAUKAALfdfd+vvH74gzfhpr9OqRnWDy63ty7ot06uPPHSX/uR
++tV/v8NMHFTEOlY/Plw8glqq8ZNZpDXUgGjoP3HD8e/5V8Nb/3vXzoKs9THLME/FhksumnzFK/b9
+038Ur726F5lAUegCiUKHGl1QFaoiDjeLGkQB8Qo+/Aq8vyEKIICSWs8U4tKZRRIDBdlNAoDaHT5y
+5Df/lK//zXzTx5sy9+kETTPMt3qv+57wuAt+6v+Ul38ewyqAAEhPdmKPpKPZI6ZeSmHTSF/BYpNJ
+PXli60d/7N6f+cWuCZNmlTWIlYC8XWp53OPWXvB566/+qpXPf84wmQVoGCAJfc5d2wynm3IJ0Yy/
+ihvwqdmcRxdWIQqKjxWubhZCADluAExAADd+fPuX39C/+Y8377s9DVvSzLRMKkRt6EruvuTvzX7i
+B+Rp10a6gcCO8oAwgUE+Y4X6qKixRoISrV9aN9F+I/3Sb937fT8y+HyyNhnMg6UJY18Wy9SH6UXN
+M5668uov06/+0mH1oim0cwyVbWMFMoABYTK6G1To2DHqMwkWQN2gGmzsnzQWctWKWDbe876Nn/vN
+9t0fXhy9iz7MUtqaiGzVNOlka7N6mH7bN6396Pfg4CWTQa11wmIVhLglWLVag0Xsklr5FDxi6gmA
+S5PWoC0qlnNOVvNg4Ybr7vqef813vjVMo6Y171Wltpz3Ksli8m5Y23/BP/6y5StfuPL8a8N0FYuM
+rqGmAuxsOgQmZ8lhPrqoPrimCjWggbcsWMw3br1l/idvz7/3P9qP3TAMxxFFNalOy4Kdkq3a/Hhz
+1ZPW/90PdC9/FZgQudN/UL2O0Q2JRehA+7C9/d+gPcUy2qQGsAxJ2xxcrGpoCtDVfuOXX3/PT/5s
+e8+dTVSNk0XVVhK0ihb2y1RQJIUnfxauukK++9v3X/n45uKLikZ1DaoIKLD0mfb1BsBrKXF7Pnz4
+us0/equ98y/y9R+f9dsnkadrq+yLNHFgFVJCmG4tNlbX1r/rG/b882/3/Ze0lhHigEjklokQCgJK
+BoGmGfCwjf5RbDvHui2VCKuH77n/P/w/W6//ndnm/blduKx7rQrRKGYWINZnAInb23v2rD732ubq
+a9KTnrZ+zTX5gv11daVrtJohJmgAEOABRtaxKHJMOo4axnHjHwwYM/Sys2JSQIECBEcQWIVr9VpC
+ycuNjfCXH9/66IflLz+0eM+705F7IzSjYTtrA0op3gRVTcWXqEv1PaEbXvYPH/f9/6Q+5+lAGwsY
+UBXpdP3o3waPGvWlLpNOSkZpkYT1A+9b/tqbFr/3J3rqsAUVCUGTgRbE8zDTlIPmshArwUoBmj0X
+xosunhw61L/4BfuuuKK59BD37+W+Pd51piG1DX0IIUB1rO037gibaxTSAMAZCK1Vs8G8ig3HToWN
+hR69v9x4y+b7P4jrPy5H7qtbt1XX4gk6Sd2MKhp1GJZrQ1iuBebtsByYutjsm73ohbNvflXzss+v
+sS3QWGIMISsiPJgj/G27MD5q1A8AKloARAUsoWWZf+wT9Q1vvO8d77PrbpiWhbO07UQlVRMPwoBi
+OUUJbtb3pQ4SFFZTDKWqh9nK5Y9rL798uX+NKxPdsy/GGJo0JjHGWn0RQTGSoKEW73Pd2s6b87Ls
+999+/YkjR5abGw08iDo9SWq12dbUxqQSdWwoUYYQAq0ugsdBECfp4kvaz39e+vovS1/0vCTdHCnV
+0phKG8pOixIarHn4nmUXPHoOJ4MNCmoCBOjNRJsgElEXt9w8/+O3ylveUd7/l+XUqWI5hmaKJG1Y
+MJtCQ6KrOxSpy/0YYjfWUnu3IbBGwM+0mhgD+AJybLMyWp+rIkAEVHcAuV0ZtW7QBIytiapb0bRS
+SkmqbhbcUUv10mpz6oLZyqHHN1/wouk/fGX3zKcztQDAkkoSASJ6caU1VSDCKH/7ldij1/EPQ2BA
+pcVAEbG6UxAkERUaAubbJ972rvq2P68f/tCpW29evfM2IAo6R5CQYqOuBVIrZmamGNv0+mjaHFuT
+ftLQx5oFbwE4fEwGuex8EYOqQoML3cwEkdoSkVwi5wQ3K8sgfmDf5PFXXHTVE4eXfNHqF1yDSy8l
+GkHCAAC5BYHkELqrQzRAvVLio9CA7lHt7uogUdWjQAgKtmBrRmgzdiA1RUTh7bfXG29ZvO1DWzd9
+otxwPe64Lc43BQ4EIlmapLbxnVwT4ILiQlUUERlLq86MWVV79qoaQhCR0wEpB9BgNlg1etskKYPn
+3nyhQmcbp5O8Nlt52lPi1c+yZzyze/Zzuic83hSN090lQChQrUAcpQQcVUfqQh9bKOFTtGSPHI8a
+9XUUwgkULqzqUVRNUMdRmiMge40SVTQ7orrff7y/8Wa/5VbecuvWR6/HHUfsvhPh8Eedp9t+iwpS
+kEagy9g8uCSS5PhARM8AxIU7odax5YpUnFRVo6uELCnsu0AvubS78KL01KdMn/C4euUTVp75NFx8
+QQYCEFicaVyzjM9XAECDEB7HFVQFIneIp1dJj5lpFjUjKhBRAQEDHB5o8AgVN9MQTkt3HM7KEBV0
+QKrAl0eONKe2h6PH5BN3bB0+HI7eF++5Z+MTn8j3Hp1URy2QYmZOJxh2coUEUHZq9HT0L6Jxp8PN
+BRfvffzlevnFduEBXnzJ7ElX6aFDeX2lufhg044+SmgeQrBSQ4wU1FJSiACqAhAFldILOsAqaoQA
+yauIV+HD37Xuhke/k/fDxK5/V4hSbb7wjW0/tcmtuc8XHEo6eXde9HmxRLEIgcrYCiKqFHMLIU6n
+aW21XVkNk05T3L7gkjSbpH2rcWUFTdxpe8adXlCfirN3gP9M4jFHfR3lmoDQAFeRMYnpkuDGasFP
+t4ASuCCWsY4tIAaEyLGJGpCGDBVEgSgB8PRZz1Y9jAflwf+X4ZxRvyvsgQj+mcZAI3ZI84e8awI8
+KOc8dqQXgUgFYDu9/XQMLe588bGBxxz19uDGiXyAeFc70+SSDyw2Tyv6x488iNgMHV/qOPeP6y9y
+p37qMYDHHPU87YtH5cqZwUXfeRs4bfLyoP/BA+2zRpJ91LSfVtdAdjRgn+Hg3CPAY4562KjuVahA
+xg59D9DF09Eznn65Q+2DXJMDBOODOnDTnQKoPORc5xqPOerP6BMf8B5OiJhUfHK70IdSTEL0gcLs
+UTr4t44vfubwmKOeO00qd1qKjqLLB+xczlSd7Xw6h4f4kE9y5Ha6wW7A6S8+Vlz9Y4/6vzt4zNjA
+3z2cp/6c4Tz15wznqT9nOE/9OcN56s8ZzlN/znCe+nOG89SfM5yn/pzhPPXnDOepP2c4T/05w/8E
+KqtlPAd50XwAAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_cadillac" model="fleet.vehicle.model.brand">
+      	<field name="name">Cadillac</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAA8/UlEQVR4nO29abBl13Uettba+wx3
+vu++ee7X/RroET0BjZkAQZAgARAkQZAUB4mU7Fh2bJVc+ZFUQlfKlUolLlfiqKyq2CVbSuRYMkXZ
+lDhAJEBQxDyPPc/9+s3jnadzzt5r5ce573WjAVDoRrdIV2nh/jj9cO8+53x77bXXvFFE4FeJ4udB
+xI8+zkcf5LqS/mU/wOX0K47XNST6ZT/A30wicnVL87JfXfU414nwV+pp4D14XfUi2BgnHuFaybFr
+SL9yAucyugzBK/3hrxTWl9GvHPQbYMXYXTX0iBcX9Iao+ZWaiV8a9Ndb0F06hZdK+Q+679/+rPzK
+cT0zwzoQuE4ffdhfQV3z+kMvAJ1XZgAQ6UCJgABgrEHSIhAaBqQogkYYlcvlerWUTvqbxkcSrsMS
+EtKVPyrXWsHiYlk5SSJKJz3fEa1C5WuNZK04SosIiEUUQATWQCACAtCZIxFEuX5K4PWHHmOO2xDZ
+Yi0rpVgMkRagZiu0FsOIS5Xa2trazMza0SOHTp48Njrc/5WvfOHm/TsIXRsZ5VzZbY2h11899tqb
+R5RO9PYNbJ4Y7c6nEr5OpnK+R9phQhBgTRoEOAJyuMMWIjFbWGZEpOumfl976N+j1VkRQSRmFhGl
+HKWABUKWKGgHoTTq4cpa5cLUzKlTp5eWFtstCdtNT7vZTEYjRQG7HinnigFotSwAicDS8upasTwz
+e0ErGejrGx0bHB4ezmVSNpFwPSUMItZ1FAADCoBCBGuZiJRSYq8xOJfStdfrL1UnEFHExsoGohKA
+SqVmrSQSyVoQrq6Wy6Xa2mpldnZuenq6Vi+n08mtE5tGR0dGRocG+gqFQgaBjQ2VIgT3Cp8Dwsgs
+rpTnF1amZ+dm5+cWF+aVwmw2PTa2KZPO53K50eGB3r48c6PVrueyPb52wyBwXRcRbcRKKUCE67ZB
+XGPoL9UI13dINiwISgQOHTkxN7ewecuWoaGRw8fOrq0V2+12FITlcqnRLA329+zdd9NgXyadTvu+
+T0gQPxsyAl7xAuU2IAESgC6WKsVKeXZ2+tSpU5UaZbNppSkMm+lMcv/+/bl84cKFC4pk+w035lI+
+20gRAQBbQKWu3958faEHAMuIClZW6m+8+c7JE6fHJjbv2nnT7Pzc3OxypVIqV9YQzMhQ7+SW8Ynx
+kd6+bq8jWwiAmIEIQMAY0Fco60EMWMsM5DgABAjtdntmZubUmcWFhcViqeb6SS+R6O0b6B8a9H33
+8KHXewpdd9yyr7sraY3RmgCAAem6sf11ETiX/tMizs9X3nrz0IWZxXSmq69voFKtHj58uLi2ZE2Q
+LyQO3nzTHQdv7u/rcbUDiIAsFkSElLIsSqEwiACpK3wO7mhWbC0iMggRIWK5XDx3du7Fl4/MzZWY
+3Gyha2RidMvkpvmZ2bMnj02MD3z8zlv6+3Mi1gojKXXdNJzrAv2GJSkiy8XgzbcPNxuh46bWitX5
++YULM3Nzc3P9Pc7dd99++217x0YHUp4GABANFgAiIBIQJAKxgsDMigjgytjeApjQuK5GYBZDqBkE
+gAgMgFparhw5fu65F946fvZCrtC/Z8++zZvGF+em5qZP7d42cfddN6fSDhGQ0uq6KYFXA/37GuUs
+AAKEACJAaBkEoVJrnzw912hXa7XGwkJz5tza4ux8qXz2pj2jv/alR8bGxjKZDDNv2E2/4GGuzofz
+PuMAsjARA8j84vLPnnr++WffMBHeeOudWzdvq5TKczPnbrn5hr27J1MJV5OjvEiBh4DWgtLMYggU
+gProcugquX7DOLx8GgSEWZAEoNowpWptYbG2uLh86uS5tbXi4vxCq1V68IGPfebT9/b3dSmlAMBa
+G19culze50GvEfQAKMKIImABVRTiyy+98Rff+9FsuXnLgTu2b9tTKq9wVN2xY9PIYE/S85Mpz3FI
+gBWSMUbreIFawCuVgJfT1a+mDZESg2LCSLsqMpHjeFEk9ZYR1Naqs2dmzpyeabeC6akLiWT7n/zj
+L+/bszufyXUEMXOM+8ZQ18rc/wXjIBIAI7jWWtelO++6ZXRs8M++9/hLz/+sWq3vuelAG6VYbA/0
+6hA5iIJUktJpx3AAoGLj3EqkPjL0V8/1GxcbSiQAMEMQmlKlmcnnV9faf/X4EydPXUglu06dON5V
+UP/0d78xuaXfd1LADsO75MzfooOFAcAY7vDv+l+Kpdpf/vCpx3/87MTk7n0H9pt2/YatwzduGa/V
+A4Qok9O5TAJBhUHgeQ6LIbxCO+M99FH3kA3sRICI2kHQaAd9/flzU8X/+CffnZleGB4an7pwfPNE
+1ze/+cWd2zZFUQsAAYTez0Jn5vf9+7UlEYlxjyKrNSGyABe6kl/9ykNuwv/hj36Wzjr9Pd1vvbUo
+trlz9+5mLSgW676X0irULgIAiPvLlPWd3yN2zFekM2emlOcODA0dOnTiu3/2X9iqvXtufvOtV1JJ
++kf/6JvjwwPGGK1cELDWoCKRjsJ36ZjXn/05iqzjONCZ6ZhxLCIwgBH1zLOv/Ol/+osDB24ZHh58
+/oWf7927/6EHH65Wm41acXy8N+kTABF8VGkDH90tF+NurT0/tfLci69HFs9fmP3+D38wODj46Oc/
+d/7sSeTW7/y3f290qIdtqDWxtVZEOTp2kmwsmkv1nOtKIriOuyECEBJGEG3FJdQu8cfvuvmxRz79
+5qsv+Y77hc9/+dCRw3/2599Np5OtZnj0yBkQx1qJZdRHpKuH/lJxz8yvvvZmpdYUpJdeemX79u0P
+PPDJZ599+sLU+d/+B98cGuwlJEIEtqRRKbTC1nZcU9xxEBKsO+uvMyF0cCcAsMYgERIhADNZG2qN
+Dz3wiXvvuvuP/uj/1cr/4mNfmp658OJLzwUmmJpaXF5paaUZwo/+HFcOvYAIIAqSRRTLYFAdPz37
+5juH+gdGGlXJZye6Mpv/05/84J23X/vd3/31HdsnERFAC7qCLgAJAAArFe/MHGO+cS1w+YcFWAAM
+gHT+AgJgY1OCL//2+lCXpyMAMAiDIAAIxP5qASJHC7Igi0REhpQSMJEOvvatRz92z+3/8l/8i9WF
+8P77vrhWjMhJ1oPG3MJMvRaR9SV27bMAAxuB+K3gClydV8f1AgAISoAYsVxqnp26EIQ2mcovLBbP
+nTv/o8e/f/zYm//NP/jNffv2oCBw7AfDmOMQgECJoAjGvppLrxH4sg8hEzLEQhlsZ7ETAKIAGASD
+YDc+QAYoErpMdiEAARKggMR8f9ldFDkiGsRhURocBPiNX//qjp1bvvvnf9puRwN9E2FbFbp6puem
+641Ksx0hCiAzM8Al0Ygr2QOuHPr1N+oIB4FSqTI7s5DrGVxda7z2+tH5ucWl5elPPnDXp+6/G9cB
+R7hMI/gFkT++7CNgBSwgCLJ00LcAFhAY6D0jAwIQri+Wjc/6aIjvkdSCIAgCNgQEJVbHX8+mnb/3
+ra8ghc8+/YxWqWIp9PxcsViutmqlylo7DAAASQRsHE+5UoXlKmU9M4ugCLTavLJWbjQj18+sFBtB
+yKXy2pYtw488cj+AAQDhDs/DJRghXoxWX2ZJiShmElEiCkADaBAtrISBmUA0M0VRFIW2HXCjCRAZ
+iAwai8aijYiNEqviSel8pCPkxAqbi4wu1PmAAlFWrPbAWNaa2AgCWxNObBr62tcePXvu2IXpM67j
+twMVhs5asUmes7KyFkQGYw0NGfCKdbMr1uvX55aQyDDUas2l5VJkgBEj067XSs1G+dG///XRwQEE
+YCNIRuKVeNECEBEkFUtdwVgIxDMqjKxF0HL8Td6wmYOgxYJEBGjFRAKq3grWKu20Y7XWruc4juM4
+SilFhIgiZBRCHOEjBQRIpBDjO3Ze5dLXAogAGBEASClERK11ZIJP3HvbkSNHnnn2+5//3G8kkoV8
+btPKSmNomFdXSq6f7O3uIow1BUFUIvDh8b8ak6qjEQKEIdebYb3WBnHEMgGUinMHD+665eZ9IpGI
+IoUCav0tCQAAARFAIGJh5jhqGFP8TxtoZrbWxv9r43aeS5YJSDSBQoWo6/Xm9PSqch2llNbkOI7S
+pFSssmLCMYiiFLpau67yXNdxlFKI2iJKPD8KhIgICVBi1yYqiqxxlAYAseKohGH72Bc+/cYbb5w6
+9faemz7mOgkThUHbRpGqlJtd2S7XoYsSDOU98u/aQY8YaxIYRdxsBdZIZKAdGsflamXZ0e0HH/iY
+o5DAiYyQBkBlLRhjmU1krTFsjGHmyMAG4u+SknzRWENEpRQhEhGDYQQCErCkAYlCa1bWKuAm4qdC
+FCJSmpRCpZRPpFCI0NHkOMp1lOMopQg1K6UcRdpRriLtkKsdpVA7Ca1QxPquFgBhIEUgoIHGhkfu
+v+/e118/ObHpBqUcx8Vata3IX1mtdHV19RRSiGp9C7kCmXM1XC8iDGCMabfD+KJarWezVC4t7dqx
+Zef2SRAroBr1xtLSUjKbMyZGm62RyBprmZmF1YY6H19orZVSjisdxInwIgHGcpviHA1QigQhNJED
+CjBeO8xi4ngwETUwSwSKQCl0tVJKFAEiAnpEoBQqAiLUSrRDDinP85DY9UCR5LPJ1eVlz3fGxsY0
+ITB89qFHjp/417Pzp7XWXV35QdttLKwsl3q7u/PZlKMxFqVxYP3aQ99Z/kJAbRGuNdhyQlP7wvnj
+Wmx/X3p+pnHvvXcgmFinqTXq3/vBD6tYePTTn9QBhWFoHYtON7PWqmIhjYDCVsQiikJy0fUcx9Wo
+OlIDAADjHVFAA/gSGmy2E06GUsLQTHheKsOUilwKDWsrCpCRUQExkOMoawLUTlgOwIQ2kZJA0Efb
+1FqLGALjuApBESZANFM1kUiYMJjcMvr0M6888cT3vvprj4yO9QN6bKSnkLhh6/DZqTMHD9765huH
+B3q6hwdvWMalC4szfUPZnE4ix3kjV2ASXpWsBxWFHITGcRLHj59ZW1u76877T505esMNk7t27QCI
+RR4MDPTn89nXfvLTC1s2791758LcnKYobFwASoekbLTaEbMoSilQaGxbsddqQ8zy9pJtUESWtJND
+0OSETaVsaB1uN5pSrqEj5GoSqwxpEIMS7yUBLTmWQ7+73W4mUSkXA1MB0RYEQSnlMrNuMlIQRRWl
+lHLcdrMxPNzfqFeeePJHpKC/v18rFwSVxsjwHXfc/ubbh3LZ3pHh0Zdfef4LnxvL57tWS/PlaiOX
+TApYBGJhhR9Wabxy6NEyY6UaKnLL5dILLz970949ff0DP3v68S89+hnX0QARCAiI1vjwg585f+jo
+62+/Mr5rv0onls++ZpuvJhLCMKi4HAsHRDGISBAQtbUuIxPRhiCSdaWt6VEdwEfXIrWExUvULzRa
+Pz+ZiIrgu4pAWSIGQguEwFYJRaDTdzwshQFq2MCGTECApLS1AoJKuYYZBR2NAiYK2rme/Oho71/9
+1feWFmf+4W9/a+eO7R1fOLHWPLFp08jg+MkT5w4ePPifvvMfXn/7lZv27F9ZW52fXRvp7dEKBCzi
+FeB5FdBzFGG7JUJ44tRxa+2dd9759F+/oiDcv283iBEUy6yVE4ZmZGTg81/96v/ye/9q8J1nPnHb
+p1uLqVbjdB5nMeoyaj0mJYAkHDEAUESAiKrjWYuFfnyRDhxhJO1ZpQhFY767acIzRxIrJyTpMinN
+qBgiYkQkthCGdeX33f1JtW2yvdJqowMJdlkbaz1XARqtyRh2Xdf33Vq92qq2JreOl4pLT//1j28+
+uPuOO25FhCiymhQCI9iE6+3fe+BHP3rq7rvvvu22gy+++OrI6KZEIl8utarVRqHLex/D8dpCzwBW
+tGW9srJcKlXuvOveWr199PjR7du29HbnCcVaq8gFANfVzGb/zfv237Tnjeeeu2vXfQODB5Ybt0aN
+tf5MvYiZS3Na48GVUoIUCxwAICJYXwHaBuD6npc12mMJIKG133C55KHD6DIqjYQEggIkCsEnwwpK
+1dbi1BrVAtQqVO2EUYDsehiGTQBwHM93XGNb2uHx4S3ZjPf9v/ghSPTQZz6ZSnsdnzaBNUZpZOHd
+u3d+//tPHHrnyL4De86enz5z9uzY6A3MUaVc68q5SHh99Xphp1EPm41WtV4rdPelk72HDx0FNAdv
+3u84CsEopRFUFFnHUYjoa/OtL37tf/7n//sTj3/3sUe/4fZ+qtSc9+SNKOQNxNcvSCkhEiEmAkS0
+yEQgBIgYuikFFIbGhiIi5LkG0qFKorcCnjUkmokEIxIgBBZFfsJPvfPWyR8+OZMw4nlOg5tJnYlM
+g8Uq0ggeALZbVT8VPvzIvR+/686jRw+9+upL99579/bt2x2lEZGAAWL/ErCJ+noyA/09p0+f2bl7
+945te6ZnFi1GUdiq1RrCfbEa9uHpiqGvNcLjJ844XhpBIXgnTk4vLpcy+VR/b++6K4AEwNGKGYgQ
+iG6YHLn3Y7c98dzPb7/3zkLvBPDd8/Nndg638GJ4k5gZhJUS5SgiQd1ZDUQQh60CVfCVdZWwdlzr
+Wzfd1G1G47Bi1iBIFgkxzp0klggiT0lQrJZmauUoRJIgNNrJCBlmg4gIXrMRAbRvuW3rbQfvarXq
+f/X4D/K5zCfu/bjv+yIgHBE5zKC1xzZwHBUE0Y6dky+/dmR1uZFKdw+Naq1htbq6ukrWbEHEK4rX
+XjH0c7NLr7/+5s0Hbzcczcwthm3HGklnUkOD/TGIIuv+SRZAYdGi7Ocf+9wbJ48/8cSPf+PX/n6u
+sLPduKdSnYu3UwSF2OEspVTYNhtKPQCg6lyw44QOAzA7SZ+TrpvkwBCkkDxFPiOiAIJCBCQEMTUM
+WdPwtolP7t/muIHLUQJdG2n0PO3YMKwlE+l2y5KSbTuGh8dSzz/91OkzJ7/61a9s27ZVWJAASVkT
+ErlshbTDNnRdZ8vk2AsvHa5Wgkze6+7urjdKQdBaWlppt8OM5zEbog8L6d/wvTgGFQteESaiWs0c
+O3ZkZNO4l+xuW0d7qtkqD2YS2XxKRC4GawFQgYAiArBRz0D6i1/6wl/+f4/PnT83sXPi/Dtbv/Pv
+/jQwVhQZDkVEa89ETCgatYjEAscIIyoExcwabZigNnOe04IcZcytSecuKDVryzp0IXZmooqdccyc
+Cy3OXxj8Qjq1+zYPbBYDgGYikWoZdjNemo1yHdSq1ig6eW+tunjkyNG9e2+6/ba9IEYpAiFmqzQB
+gIAFVkS+FcgVUqm8u1Yp9fdvI2wS25kLszA8gD4AMon68GHOv3mKENf97IgAFFouV+vnz58fn0iF
+YegmU816bXDPpo2vvR8RAExu3dzdkysWi1toa6Vce+2d4/VGizdWKBIwIxEaEOF4MIkNFCKxkAK2
+CkC0z2hBQg/HbjuYnLwbPd9xHBACwk6gGElETGCS5EB2PIKE1tqmlM1EPvrdonRCXLTtBJogSgRK
+YWZxZTWVSu3cdcPI8AjGZlE8hWIxjuBzp+TB87xE0gujtrXW8VQURaurqyND/UrFs07v9sp9BOgR
+ccO/EksyR3ue509NXegfnNRaWxsBcCGf+aARYrelsZHvkXKpFbYSCUUACci02VpmAVz3X8Ye3jgO
+Fked4qwXAKCGwyAOIFg2AmBARaM3FL7yW+dXvqC17rjhgDZivK4fsQmX52abT/33advSaKALbeAt
+emmDbWVaoUYTQd/IromHv+ASW2tyuQysZ0WICBIi0KXuJURIJLxsOtNut+O7GGNarZbrumEYalCO
+vgJh/6G4/mKek2HXdXt6+hrNpjHsOa4xYSLp+IkPHMda0ag8QkXsJ7QVqJQjhURpx41DTeRYGyEx
+gEJwSUw8Zev3JYF41Rtmj5QFDnyt2FGpTLpaGLNuHpTa8HQyQ7xPhF6qUfCDQ/9X4aU/6+pKYAgm
+oWom4bSbmLR+BHmGastEByF48HNt5ca/ikzkagVCzIZIxQUwEGcKAQqCq51UKrW20gaAeMqVUq7r
+VqvVRHf+w+P+i6C/VEUVEQBChCiKkulUb29vtLDEDMZ0nI6JhPeBM6cQLKAQWEOEjWaz1Qq2TIx/
++3e/ZLimlCL0mZlUhIrEekZZRNlwmwlhLO49iCJJukmPJXCB0AImdh45stqoz2qtL43RxyBmG63i
++Gh/pHJekiFJoAyzOF46VCEJkCWwLraQUky97TCMokhr7WgHgEFEaQ0Y2xmAsbBFQAAi8l3HRHVm
+dhwvCIJ0Op1IJMrlcm9XVjiOm3006DfeJI4exJMRhdbznOHRoemZOYZ4QxNNKnZwv/8IYMBqAPB9
+3/W9djuy1joabhqbVm7T0xrYFxFy2oIoNuWp2LuAnWwRRYiKUDkpbLF1fGNYaaEuz3/9rQv/5g+e
+L7dCz/OIgOTiAhVgbLYrPSOPDpV7UjkKbZYIpZmxQaiyHrNhNDpEv+05bbLlsFUkBX7Ci+PpnVqq
+9WRQgEvYEFlrzWwAIIqiZrM5NjaWz+eLxWKjr9svJOVDy/oP9PW8Z4uOBY6p1SujoyOJlB8Ege8l
+FahUKqN+UZFZBAjAoFATkWEAALZhCAwKLbEFYYQIwkgCi7ZFpq2kRaZFpq1sW0mbJNBSNxy5FAAj
+eS3DdWw0lUTuEElGQdaBLEEGJU2cJkmCSTRSXS4nHABwkB0IXN2gZAncNrZDjlAUshKxxqHAQcYw
+dlkbazoFhQD0npR+EasANSGwEFEYhkqpTZs2GWOWl5fD8MoyRP7mbTZW0RFBGJi5VCoWCoWJiYlW
+q5VK5TbCTB88RieBQCkHkawVa63vkhERsMwAzEgg1kjslDdxnoggCLEQCIIoEBQPRZtaK+GlECNr
+1/I9/n0P3F2rLsTizhoDwIiokZi5rU022TsyM0tHVo3rhlHkixe5mlTDOA4r5RgN4oUqGdmEU3WY
+OUYfQCTWtRCstaTeNQEbBkf8ytlsNuknFudnrK1pra+NwFnfWuMCYon3fRbTboZat268Ycuxo3No
+10gq1qBBcxFlAADaUG8VpGLoNUg2mVxsVAJtGtZxlUoHYDJeG9iVgLWnmNBpeGEWPG5QoA1mTYI9
+rNp2itwQORMi+cbadioMm1q7g9tvu+f2KFpwXRcAWIzWpBQBGqUQKe3mcyt/eLzeEo9bxktD20QY
+JCIAiKxt2lYzsIEHkmE8Q6zQuqjijD5ULGIRUJFiCUWIiEQsIEZWMbPrm2Z72fEy6VRXu1WfnZ1N
++GSZUF1BmsEHQr8xtxtOLoj9WaKnzk8nU35XV/fM7Nlmo5jP9TWbrctMiY0LBoj5RiG5pCFgHUFS
+nLqMVsM163jGuJEEwKhYCxu0aVtuttxMunugKSnDEfkIoMRRLeWyx1q6ODSR18Z2klfeqYWB4zix
+B8FxHKXjXFpAXK3XMpEPcMMNkWOUzmPbKG0ixjZyxF5GQrQlU8iHyGIanbe7hPPinBJCLdDZQhjE
+WouInuctLy/6vptOp2Znzq2uLo+NDgKyiP3wzoS/Wbm8VJgQkVbewsIKsxkd3V4qFQcGcoV8T6Xc
+gIvJ8rSRMNyJmSEBMilIeB5Glgw7lmo/q9jqKqST1nquhKzJA5fR1FTL1Cu0aVPu0/dh72QYhKSx
+zcpxE6hBqImcclNK+7Y6d76++CcpWtNaA5AwKqWQ4txVRJuO3FSut+R+qt8kElalIGQici04wEZR
+1m2YerrdPdh2EuW6RYQ4/VhE3m0WESIwx3u4MSZExEJ3fml5IZ1JjI4OL68slMprmzYN0JV5zz6c
+D2fDsEJEIq2Vt7i6WijU6o1yf/9WYKdeq67P9ruSgRARwMapvKS06/tGmAVDEyWOnNCL53QmA5BU
+HLImHz1AKwp4paTrrnuzbqa7w9BqTaDdhuWsn3C0VZYsmhC1hbMJ/UqvUyIiYWKE2BSKYwCiKYrY
+9T0n5weo2KLjoxZlHNKkQraIKwrDTKKS4paqVyyR46qNl+24YmSjgAAAgBnC0Fhr+3oHZmbnl5YW
+unsyjUbN2pAINvbnawM9rudwX1IJq7R2iWhtbUUkymbTrYZTLrettRsL9lJhpQDAsmhgAPScADkg
+CRUkuwBrNpERACSGUHGSFAhXXUmzE/j2xdPHTkyVyRgfIq3dZCrK6AIiKmCBINRd3bQ6mOgCcAQV
+KEJGQKIOB7BxWl4YsiVjEsCBMg3fI8U2CKwPKRSfBMi4DvhouR3UNdFGscNlHpjYxBERpVQYRFFk
+stmc73rlUml5aTGMmqTA1fqSWolrAf1lT6CUchxlbRRFQRC2HJf6B7qX5uxcPazXm7lcJn7Kdz86
+ATIhGgDXd6wYw5HrO1WdRPIdSrJ4TBgRE7koiAbzCa9k0sdfm/350nyKIYkRkXJTrk9ZSjg65TaC
+0Ji5g1vDyV3UbtUgztfkOOGnE1nUETkA1hAjWoJIUQPBYNuiRtMWQSCyqFhDBFJh1a/pEtMMYw8I
+CuC6xhDr2/V6MwoFRHueV60VFxcXG42GiCSTSc9LAOOHz+f7ULJ+fY8Fx3GUBtd1rI2MCZIpN5NN
+ryw0Wk2zuroa+0Dg3VwjQEjIwAiQSacdIGm300oHKGitZ42RiMkwspYAJbJKR6YV2Iqf0oVc1rOc
+dA2Tdn03RwVKkkkQttuO0t29iFmvJ9UTQy+CwhcNHwFgZDK+AifUPqBDTECtllYJy4BuQK0wMIm0
+E2FAzZrX67muhk6iUccXBAgCBlGLACJGBlZXi4iKmWIHzvLyYr1eJ8Curi7P865jgDDO0tAOGRuu
+FVeGRro8zyGiViuoVCrwbkMsFlYc5weJEGI2kfKJsB0kEdfEFSZr0VhAB1mUAQQW1lhtVsGxd9y+
+74bcLs1t3wtAO/X0WiEYQ6HIbzk60Ow3VhdfevO1VmAQFZGm9ZB0rHqzCpsYpiGtjYSuUuLrFjqu
+CpWbtGzAbYrjaDM2mUl7fhRo19WO42CcznAJMRtFJAKIOgzDcqmqyAVBZjGGW/Va2Gr7ns7lckqp
+K6p4+BuhXw9ZIItYrSGdZN/JJty+2cVDmycKWrpDLkUuHT41tW//XoQIGAAdY0FpQAyV0cDKulqB
+6XdcR+uysgO+pxu61OYUlDRQ6Lk2NAFTIkyobAnLq1ixW3ePD2+b1E0gWwEnLcgIhtkg+dp3Uj68
+/OTpf/V//0UpTMG7lNr19G60Gxzwri+A1hEQQdO2En76t75254Ofazh+y/d7lXbXZYsAMCAwiJKk
+cIgEVowVWlypDg1vjsQAJCJjKtWVZqvS27Opv28YAIDMh+fmK45SeQk3k0k4rmq3276fDELTbLay
+ua7ZueXVYq23y+9004hVAuHYGuS4DxFiOp1cK67YwRH/4I7MprSrXeCkESeVBIdZGww0omnR+O7l
+aoUPHaZIgRtGkeeBUWxYJCD00HDCLc8VZzgHpfOwvs5/gUn9rs0HwQAIQcskiu0LLalordPptNZx
+bUnHeScgzIyCSApAENX5qfNEKp1Oe57vuBgGrUajYa1NJpPriumHiZFcLfSJhMsS9Q30njnnGcut
+VqtYqvT0Di2cXZqeWeotTLJtAwKAinc7gLjaVAQoU8i7nlpbXkncuGP1M7+WIDGiLScBHIshQARA
+3VaJh6HIhZ9+N3H8kGvZSVsVQTWdSIqiRJpdF411vBQWG2jZIAFRp4BY5KLHVd6DgQgAkGiLVjhC
+oSjQ4OQiViZoJ5PJziRJ7KdEgXgOiMUgUmhgenoum82nkhlEzKS9dtDgKELE/v7+7u5uWA9pXC/o
+M2n/6LE3q7X28PDw6kp5ZW2VmRN+xk/kT56a3r97EpEEWREJW2FBYkJyAAHAyySJuFFtMDjd2Qlx
+KBRrwijt+dZESFY7DuimZPva5Yquzuen30YRlZYkOW61y9cK0lnrpvxGqLSbT+Vv3nfD8lSCUMfp
+Ohup+ojqF7CfKI2mpaN6tmtw+w0767VAW5tIJOIfrGvGiCDrxc0IQGvF8vJqubd7RDuUy2UyaW2j
+1traWnche8Pk5lQqAQLWwgf7cD8y9MmkMzrS+2/+4I83bx7P53JnTp/MZPqN4a6eoZnZ+fNTi5s3
+D4gEsT+HUAshs0EkAUQHCt25maWVwMKR1986dPJsoqsQGeMgsY0QgbSwaQT+oJ/yd4aYTKcNJMBz
+QKuUpJUGgw6Bq5UKtO0b0V/YsTlfT8bu5XVcO0my0HErXUQzpsBxTFulPTTN1Qh7J7Zkp2bntYNd
+hVxngDhC33GVI4gFoIhhbnYJQeW68lpJKumwtCulIlu7b9+BAwcOuI4ChCuq+b1i6BXw5x75zOGj
+xx9//Mc7tu8aH69mC8O1ZjuTz1VLi4ePnhofGxAihdBhPREkYDEiLiCMDPS+8MIb1VqgnNRPf/Ja
+O0p6bpJAKdQsIerItVAxM6OT3TfmGQWYSIVsQ/BTDVIOi9FgiXSTo6SqHhjQKbuM6+Ym88U0a+lE
+uy63jxB84EC7US1UKrsPVG5xYTaZ9fr7+wFAbEdHiYOWAgKMoLDdDM+enzLMmWwinfGsqR85fOj0
+mVP33PWxhz/z4EB/X7wvXIFWf1XprpzP+t/6ja8feuvQ0cPv9Pb2dfcNJ1Pd7bCeTCaXlosLi8Xh
+kUIn5hD/h8LGkgJBGB8d6u3Kv/nmofseuPXTn7/n1ZdOICrH9xydZLbCTc2clVTfUEYFUQRR5DIA
+oZK603LJEVJAYF3VjlxrXDBRFBEigsQuhIsoI75/4IxM4Pu8WrTt5M7+7vvOnJfV5ZVP7tvRlcvD
+epDr4iACiMgCSyurx0+e0iqhtcrmEmdOHX77jdc3j296+OGHN2+eZI4UkciVNam7cujZWiuFrtw/
++5++/e1vf/vN11/Zsedgb7a/XKl5vmfD+pkz5wYGu0gJkYLY62RC7bggEEZ2YtPYPXfe9Ud//OOR
+zfof/r0v3n3gBGNL+YrF83QSTNs6Hvi9jbCe/8ExL1BWgcJ2Qqmm4yMkxELIkWJUkBCBtm07HS9H
+J3lhHfeL0fxLY4cA0HQytVZa5fYP3fDluUb6xSP/JenWDu7dFacUxD+GTs1RZ7RarXnu7NT0hdmB
+wZFsNu269MqrL6yuLf/2P/gn+/fdXC6XtU6lkv57QysfFfr1BbvevwOVI2FS62zv0O/+j9/+P/7X
+/+HVZ3/0yKO/rZnXyis37dx1/Ozi0NjK5Oa8SIiSQIugU2HYdlwEjAQSt966e372/I++91RpqXXf
+ffcSUTNoiljH1cakstxqDShbggVymi3p0uVKIlFxulxjAJvsaISEq9sSUst2txJrbrNFmABOCBMC
+KzQkFsV6yGzBsAVHApKGTQmNMfVD/rZ0etRPDh4/Nff0M/+xu8f99W99rXdoRIBFgJRiBhFUCgGM
+sDXoLSwVF+dX1xaW9u3a3ltIHD589IXn3n7sS1+/7c7bf/70k/sP7PW9fgAllpGuwJ69qvYURI6n
+lhcXNo9v/vY/++e/969+78WXnr1xx7ZicdVx1ODg4BuvHx4bvtf3SNig0gDgum5kQ61dAEinvW98
+40tOMv3UU0+dPXd8z037hsfGU6lUGIBhW6qJUoB1qafz9e58ECwngnY+LEdJcbTrKN+yg2HkWDdt
+3CBI9gQ+o1iqsooMGkFicSLjFI11Ez0ChYDTIWQhOZpKbyc9FKricrV8/MVXp6ZObZsc/9Kjn71x
+641ggImJiLnT6ctaqxQhwfJyea1YXl5Ziyznu7pbreiVV145cODAgw8++IMf/CCbSg4ODiqlrLVX
+2iXtiqE3BhwtmWyipzv/1htv794x8dWvfePto6frlXK9Wgqj1vDQxPPPnn/11RN33L5dO1bYGGO1
+1lr5Ap3SKaXUY1/8zO5dk888/dxf/+zJZCo/PLppy+S2gYGBdKHAQMpNjX3iAbN909r5I+2l1bBm
+0lGl3Y4wDB0BlMhILYRVKxUmEwkY0YEkQvEjyTMXgsCD3KZQdVvuFieLri8o85VGsXRmfu5wrVIe
+H+n/+9989NaDBxJ+0rY5zjIDAEQLF1t2UKMRLK6UA4NT03OoVF9f38ryYjKR2Lljx/f+838+derk
+7/zOP04lU50AuoAwf/hA1RVD78S2C5jt20YOHzrx1E+fGRjpHRsdUsSEdmlxdue2PX09o8eOzYyO
+920aywKRQ44IWsNKxZzBAJFWuHPHlh3bt75z6Ngbbx6dmV146cVngHCgv3uod3BibHPfphtTB/YV
+WkFjrRisFluL56DekOqKrjdk7UKrUgRKKu45TxnDCQtdxuTbnNZOr5Pow1Q6skCiA9uqlOfKpdmg
+XnJJecq7aevYprG7Dt5ySyabjLUg8SUEcCR2eYqAjax1dCKMYHp6OQhZQC2vrHV1FcbGR6anp1aX
+Fo+8c+jNt1756le/smvXjshEnUoShGsTIPwFxAAC1lP6rttv/g/nT/34Jz8FkM2bNqeTqXJljSUc
+Ghk+fbr1ymtH07ndPbkuBiTsFPeCYGRDx3GAmdko7e7Zs2PXnh3VauP4iZNTU1Nvvn1s/ty5I2++
+ne7uG7lh69DoSH9vd8+2Pti30xpo1NeCWkvXSt5aaWG+PL16pKSyxnpadbl+1vO8kGzUCtrt5aBW
+LJeL5eoSc6OvkNk2uXnfjXvGhyd6JvoQESxwKERaUARDgBAxYUyoNTGIUo4RWFwurqyVs72Da6uz
+zWbzrjtvW1pa/PM//7PZ6anSWvmmvTvuu+8+AFBISuFVdDa5ivx6QKUEUCEP9mVuve3mYqV69J3j
+a4uvTG6dKHTnjG3lCslMNr+yMvPmO+c+dvsB30GRWNsUVOA6fpxWpwiiKEJE0tiV9e44eNNtt+z6
++H13nTs3NTO9ePLsuZef+zEEUV9P7+bJLYPDI/0jE7nBrNPd7egRNrD4+vnTz84kqUtYhYBhUK3b
+equ5WiktN+pVsNA/OHTHvtu3bNkyvmm4fyCfSmqFtinoAoCyCADkoKADDki0Xu5NBMRIq6vVufkl
+Ul4ukz5UXOvrLQz0Ff70T/74tVdezGdzw8ODH7/33olNYyCiFK7n+V7n0gYksHG6EdlEAsY3D49u
+mrANffTYS6dOnSEH1oqLha7RVDblJSenzk1l/aN79+5OOAAoqMAagxCXjqAxxnE8ZkNAABy0257v
+D/Vk+nr233JQr6wWF2dnLpw7f25q5tiJE0eOvO17md7e9PDAxODwUN9oD7bLXKmXWzPWQqsZBGFL
+K+7KpMYG+gd6t2/ZsXmwv290bDiZSAoQA1jgSKwjjhFDaJXSDHGDAwLRQHFLR2KGcrW1slyKLOZy
+hXTKM+3G5k0jR4++9ebrrwwN9znKnZjYdM89d3ueFxvqzCxI6zbwdYM+Dp0wAwArRyY2D2/ftnPl
+fGV4ePjcuXNHjx49dvzQ7Xf2O45WlCh0jx47fkwptf+mHdoBiYxytNg4hxKU1gBApNlYRPK8NFgG
+SBCAIhjJFUa68nt33lCstUulYG5u/tCRExfmTp+fXjVWeoe7gro7f3bRmnnPT6ez+cmt23btvnFi
+83Bfb3cul9OupwEVEFhAS0qDAhQStOAoAtSRkACSBgYgYDE2TuRqt6OVlbVmI8hluzK5bMJVPd35
+2ZmpV199OZ/Pak0J3/v85z8/PDzcSZBhVkrJlXebuHKBA6gBhAyLIKgEwG03ja9MHV+r9ed6WkvL
+08/8/NVNo7uzmd611Xo+3Rvy2KlzJUWze3eOKAfANgF9BI1iAePokpCOHcsWVdzDHABANACgIr+3
+y+/tghu3DBzYs7VYqszNzU9Nzy4sLjdtaXJb/8TozvHx8bGxsd7e7kKhQLQRVlvHQm3YJIjgsAoQ
+CcHRcVEuA4ABFEU+2MginJuaLlWjQlev60k2J4kE1xqLzz/3hAlbfUND1Urp3o8d3H9gVyfDUGJv
+5dV0r7qKQv0YGIqz4BEhn8/sP7B7eqFarSw30pkTx089+eRPHn7oC319PaVisyvTv7I0d+b8FJva
+9u2j6bQvcadiwNjHi+vpWihK5AM9UCI2nU7mcpnx8ZH9+/fVW81GvYmIPV3ZZDJ5CeIgYja2O3mP
+B53Qk07hiwAgUccMjiyL6LPnZl977fCNN27PJFUu6+TSzpnzUz/+8Y8rlUp//2ClUtm+bdsjjzyS
+SqUuzbd7710+DF3xMonTOWO3CQIJsOvBtu0Tu26ayOaSnuOjqOeff/7pZ35KFObyvhiqVBphZBeL
+1dfeOlWtMqCOs3kBEUiY2dpOcOgXBTtEMO4UhewnqLeQGR3pGx8dSKWSl86WxN3aPyARMc4TiROk
+RWy89Vsr1kqIdG5m5Q//nz87f242nfIGejP5rLs0N/37v//7b799KNZebr55/2/91m+Nj49fKWjv
+S1fRD4dFbJwNBUDAljlIJtQ9Hzt428F9vuNGUbS6svTXP3/yzbdeSSZ1oZAXiWbmprP57mZbvfjK
+kQvTawIEKALWcoRklRKxvL4a3p8QdadbmbViGQE0SRxuivM+NwKBl0qby92WiCDgaIUoxobMjKgs
+O5WKnZ1beuKJnx05cnRy6/jE5iHXl1K5+q9//999//s/9DxvYmLic5/77G/+5m/u2bPbdd33tmj7
+hVmn709XIXBiHbYTDCOiuCNZPpd89NGHu7t6nnzqZ2enTp86deLf/+G/FYG77/zUzt2TP/jhO+fO
+nbv9tnuOHzn61lsngmDzyFg+5XtEaKzRClAhW4uiP0hsCndiQIpoozMsANAl6aWXZgt90PMLhAJA
+QK7jG4vF1WY7lCiUU0dP/uRHP5zcMnHHHXsTKSjVKv/bv/y9v/yLn23btuMTn/jEvpt27927t9Cd
+j+c4zrW6Uuguo6trMRrzFMflmSgKhF1Fvd3Jez5+MJtLnp+aPn7q9KuvvfaHf/gHS8urDz70QH9/
+/3PPPrv3pn07d+48ceLYW4dOlyo9myZGerqzqBSAhXVLEj/gkTqtBxDivDzEToKYtRFAJ1SykbD1
+C+rIkFBEDAtbXFopr6xUEn7WGH76Z39NYL/w+U9Pbh49cebEv/m3//7wsfNf/tqvP/TAHZ7vIttk
+yiekKArj7Fr84PbLH5KuogtU560ojp0JCjOAAwgsUaHLm9w62mxF+a7hmw/ceurssfnluVdfffXm
+vfuLi4svv/DXv/b1r5SqPdMz0YWZaqkyNTLSMzbam0k5bA0K/IIErljvwfV9fiMj7tKs68v4/d35
+h51/MigQKpVry8vFcqWezff4qcTzL75w6vyZx77y6N333r20tPbqy4dHhyc/9cDntmydPPb220HQ
+OrDvJsdxwqjtuRf76V467FXQ1Qgc2OgTSXHouOPBIAKBaGCwe2am8vobx10Ptm27oVCsTZ2fySdy
+d9x2+9PPPvH6a6M333rHWqWOUarZqpw+Pbe6ujo8VBgbGvB911r5IHHPEMUX6/k2Eud9SOcoF97I
+Ct3I04P1+bjUZV9rhKVSZXmpaCy4iXShu7tcKT7z7E/333rgs48+slYs/fgnP4tavGPbTSDtP/x3
+/ydx+stffmxycpLFONoVkbiI9VJArk7DuXZHB3DcvZ6DyAjjO4dP/PAHP7kwNccJp7xWtGFUyGXH
+Rkdd33nos5/tHeg9dWIllUpXStUwDEFMLu8NDHYN9vfk04gkACIWiRwQsFGoXOLOiSXruePCIkhE
+JEqkI446jXIBANiyUaQAMIgMoas1NdtSLJZPnF1Ip5LMnEz6I8ODzOanP/1prV6985Y9zz33/E9+
+/KQxZmxsrNVuzM5M3Xzz/q9//es7d+6MK9ZiA+padV2+dkcSIBpjtCbX0QB00027TARPPvnTV985
+Wq/WFucXzli7ulrMd6W7uwsPfvbT/QPdpWIlm01HUVSplOfmF1tBo1wuu5gcHunp602REmNCpZTy
+SNiSuBfjR4gqNpMEmSNSiq2Nmz9tdBdU5IqFyACAXw+iUrl89PjJN95465Zbbkn1FhIJz/O172Kr
+3e4uJAga3/nOd37wgx+2W+Hk5OSx40dE+M47bvvmN3/9xhtvVErFSpQxJo4gXh2bX0bXEHrQWsen
+UEXW+K572+27C93ZrkLfiy+/mkqkyuXq1PScu4Rra6ueS/d/+jFN2G4brtuu7kK1UZpfWM7k8ij6
+nSOntWNHhvp7+7o9jxyNjvbURjJZXMrH3GkDrWKJH2/EFO8JYWjYcrXeKJeb7ZDnF5Z//uwz07Mz
+93/q/p3bJ7XWijifT7suzFyYfuv153/61JPTUyuFQvfo6Ciz9Tzvk5/4xDd+/WtDQwOxRgdx15Jr
+erjINRM4sYS11iqFAhAZ62hHBBbmS08+9fPnX3pjZbW0urrabFRb9XI+m7r/wYcffujzwyPj9Xqz
+HUSlUunw8cOtVuNTn7yjUChMTc0szq0qSiST/tBwdz6f7M34SilSnS4tcZscALBMxpi40WG7FYah
+aTRaxWJxYXktkUglE5m5uYXvfOc79VbtS1/+wic/+QmPonw+rxTU6/VD77z1B3/wb1966SWtsLd/
+PJVKWWsTicSXvvjYZx95KJ/PAoAxJu7lsKG5XhOWh2sp6wGYO+2x1xPnAIBQYGWt/MLLb7z0ytvn
+zl4oFotBo1lcWVEpGh+f+Njd9939sY8XCj3JdOLChQvPPfdcrTl33333791zYGGufP7cfBRFbEOt
+wVGB53nJZCKRSCQSXjLlu64LwO1AFYvFVitoNYMgCEXQWkuoc305V7nvvPX2Xz3+Q7Hhb/3mNx74
+1D1JXzNAo9E8cuTId7/z588///zq8moul0ulUslsChG3bJl4+KGHPv7xe5LJZNzweqNkOYqiOB/2
+kqLOj0TXkOsvnl7CzEqhtVZEEKzSngC99saxZ599+ejRk9VKrdlslusrtVrNWtk6uf3+++/ftmP7
+0NAQEf3lXzw+PXP2wYfu/9jH7lxdqZWK9SCIoihiQctRGIbtdjuKgpj7oihgJgDwvaTneTE0rut2
+d3cbil58/rnvfudP+nu6/rt/+jt33b633QrmZqYX1kp/+V++98QTTy4sLPR296VT2VQq1dXVle9O
+79q140uPPTY+PmpMGBcJxfUa8db6C/xCV0fXkutjXZsZOudpdZSBiwdurhVrh46cuHBhYXZhsVot
+VqvVcrlaKZaIqKura/+BvTfeeOPWzbe8/sYLr7/57L79uz9x3ydNhOVqk1kMx8nvF2e32WxWKhWt
+3XiP0Q4Rke+7+XwWEX/21BM/evwv77j94Ld+42sDA72lYvnE8ZPPPffC8ROnisViPpcbHh7syubS
+mWRvb29PT8+NW7eOjA6J2DiFkBmEWSl3/fjKzn2ttVdaPfJBdG0Fzkb1GkBcbmstKNVp7kwCQBZg
+pdSYnl2Ym15gZkchIhZX19bWVufmZ0wQptL9myaG20FtcXFxy+atd9xxdy7bFURhYDstXwE6DdEa
+9Va5XEZ0tCYRm0ontFaF7mwy6R86dOj1518YHx/df3DP/OLcO++8c/L0OWtULte7ZfPmgd4e19Ot
+Vt1ErWwuNTY2Mjo8mPKzpCAMQ9clFqZ40+ZO37uYq67tYR5/G8e6x8wC0DFWjTFBEBw+snTy1Kmp
+C+frrbrhqNlurKwsLy4ultfqRDQyNDo0PGCM6e/pvvOu27Zs2ZLMFOKexbFqYy03m81Go6HIS6eT
+6ZTvuOIntEB07PihF154LoXZcrn42muvHjlypFqtEqn+/sGhwZFUPg0AKDaRSOzcueO+j9+zc+dO
+z3NieDfqCS4xEf7rOY3tMtqwJy87nUGIlleKZ89dOHL4xDuHjy2vlNgiANTq5SiKms0WAWqtRbgr
+lxkaGujt6+7v7+/p6Umn0729vf19g47jhGHYbIbNZr1er5bKa7OzM+fPn506f3ZpaaFVb62srLSD
+ZjKZyGQyrut1Whp5enh4+M7bb7/vvo9v335jOpWKWzLELqkNV0T82MZ0coeuB1136DekUGyVXHS5
+QABALGqtWJ+6sHBhav7c1MzszGKtWarVavVqZ3eNogiAk8mkp01/f//Y2NjQ0JDnO9VqdWVlpV6v
+b5rYkk6mjLEzMzMXLlwoFoutVitqR41mOQxDY0JATqdTWut8vmvXrl179ty0a9eubdu2pVLeekdQ
+Xk/0IwAI2jYIAstRJpO6VmL9felvievhfdxMHU9A/Nd2KIuLy7Ozs0eOnzl//kKj0XK0l8vlR0ZG
+8vk8IvR253zfb7Vap06fOHTonXPnzs3Pz6+trfh+8sCBA3feeee2bdu7urrEcq3WaDQarXZ1dnZ2
+dXW50aghwdDQ0O7du7dt2zY80K/1etdegPWTiDEWNSaCtbW11dXVKIoGh/p7egrXRI98X/rbkPVw
+iScdNrRPUnHP7tj/FbezD6OwXAtrtUarGZTL1XK5EoZhFEUiUqmG9XpteXl5cXExCFuOoxYWFg4f
+PmzFJJPJQld+aGhoaGigUCh0deXy+Xw+kcrlchObxwuFQrPZSCS8gYG++H4dW8xaWD+WDFFEFAAG
+bbO6urq2tmatHRoe6O7uio/zuR50/c8WB4B3FzEjolJKuOMPIUIRBAFEdLXX0+X2FjII2A6lUqks
+Ly/Pz8+Xy+Vmq16uFCMTFLrzzNkgaKVSqb6+vnQmEdu3YdisVNdSadd1sqmkHhnpn5y8oVAouK5C
+LMQMxmIUdopjlVIAyMxWOD5ASERIged56XTaxEc5Xc8Tg/6WuH6DLpE/dn0mLuuSx52yDkRjgdnG
+KjyDE9tTjUajWq02m81Go1Wr1TJZP51Od3V1ZTIp13U1kp9wk8mkQvA8D4CMYd1JqYz7ya1rLOsK
++3qRMsfpEUEQhWFobZTJZLSm/4o1nPdSB2jAuKncJS1EGADYYKcFTScksnERxrq2MSaGw1phZqWt
+Vm7HmyjrLSIEgCK2TMrZwNraUOlOUXnshduA3rLVnUAjres2Jub6D9+38krplwD9h6R3L4WP+rVf
+QbruZy3+HX0Q/R30vzT6O+h/afR30P/S6O+g/6XR/w8E01YEicL84QAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_chevrolet" model="fleet.vehicle.model.brand">
+      	<field name="name">Chevrolet</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAuoklEQVR4nO29aZRd13Um9u29z7n3
+vqmqMA8kSIAjOEmkKIkaKWpoSqLktuO4bXVaia3IjttrWZ2ku73SibPcsTO4k7Zb7WG5s+LEcau9
+PESyrLYtiW7NAyWZojjPAEgQA0mggAKq6tV7795zzt75cd57VQABcJIE9RL3wqr18N4dzv3OPns+
++5KZ4RU6H8TnewA/vPQK9OeNXoH+vNEr0J83egX680avQH/e6BXozxu583ZngxqYYWZEBlOYAUjs
+sYYj6MynPj9NT0wKZgBIAAFigBmIANjkSkRnvM/3lui8uVQGmBlBYQQ2gzBgAOlzjlQAoDNwiZ1l
+bgAg1hABPWdZG4+hX3OmmX3/0T9/0GsCCQgG6ATElFDIKdCbEQAz47OKxjP/sAbN0+aSn3vMDxn0
+BhDMDESqWfLgtMfXNceKpen3LwSmCKaJaJJ8kQmv50cmorUffoigNyBpEmICgRSmSAkiU8GSZfLq
+QCfI0GlXOQtiahOs6ZSz8iVNlZkx4XdLSvL9tjjOG/QJYIAAjYndGBlNgcWvHmSrsiJNpoQMAAin
+L5HTyeKa/9D06GTgrAAy6GZjqf99V7TnzcJhKAEAK2g4iE8fPdqemfVlkeqBkAFgApuaGSwBSOzH
+8gEgIgFN6Mysw2RmZmAzU2IQxxiHdSAdbt261bMoTL7/eK+h8wY9IZkacUGO9+w5/Ecf/2R7bm77
+hRd1qrYTLr1rlb4sXOmcEyIipgggI85EIuKIiUjPgt4oUYyxbuKwaUZ1WF4Zzh9fODp/7G3X7/Te
+b964kdcaP8/VM997evECxxJI8BzjmjBe4GZEEJiZETGMFGst6LHOA0XAaUBaqvuHDw7nDx/68ud+
+Z4ZC17GvfKfTBlOr2+nNzBI754qWb4kz51wST0WbqDRVVjVLDEsakJIhaQxNGMXYDIfDlcUTEc2w
+qeul5frEoOHZq2969+5XvfaZfnnNZRfM+ALGcBHJqVge/1qTM4+ZkAXgVPRNPmQj1Qw8Yd/JqTYV
+ZUQAdKJXXjb00yHk+/L4ji+WbxRmSALur9SPPvTEDPaUzTdu/+RXhqN+jLHbbbvSJVMiEfZlux38
+nBBcIcRFYBEuPaEUUi6YAailCKimkFIw6ExzEhSasJgQRv1lIX71a66RHj3c/8ntV7zpiku2zhCB
+nVJCEpUJRzyHMjzPfbRoYALWaHq1LCRXjaUp6DFG504XMC9F4OQrEowo2+WAGWwy+InJOGGQRKeL
+VAbAxkYGC2XhGi+P7vnbS9cf+fv/1a/c/8i3Dx56ajAYAKZNY4YIBHUuuKhRG1Vq1ETjcHH+6cVj
+R7msiqIovDDDOxZhceScW64cJHU6G/vLi9svetUb3/SupeW9d935J8WOH0lpaDaCFCAGAgspIllx
+xocdq5Ln8KcnRVIQwVJ2lyXbyOQApJREZMrsz8UdLwF6A9SIgal+M1ViXrtQyWCw8dzbGotlrQNJ
+QeG5SXUSrjZXre6RZ/Zs29W85T03L51cJDYRsaTMzIYYY5Iha2JCUiMDUrPvwXseunel2xZfiHMO
+UGEwQ4REYNQkkpKVt8yUHTpx7Jn7v31nD0OgrLSorIWGwMyuQoJzRaK1FtH0UYxzxGH1CSYcDa+c
+TTNJyZyQ8aqcmYJuZqoqcoZF9VK4ftX7MFW1sTlI0VSJKPuoZAybxkmm8nF1wsgSJU8i1Ax0tDTX
+2hgXq2PPPlR2b3BcMLOFpAkgVjJnPhorqZGpJZBVzjkpKl922uycE0dE5HhCgoRh2e40w9hpQYvj
+Tzx196FDB27Y3RtwCDas07AsOyAYaVJjQNSdxhxnCBVNvyGAlQkKKJRlrBaSKZmbQpTlzNlctpcC
+/Vi2ZmZnMmDYpLLg/AOBGGSAJWOmZLTqu5NmS90sESoFSsPJ4fGq0/SfrcAXqIUkCeOVZOI5akyx
+AcElSSkQEZmphqgDiiu9ioiN2IiYmdk5ESECEfXcxlRbp+hRWi6FdGXkMOeKnmsV7V53EJtO1aqN
+UwrtohxqqCaCZS1GZmZjL5rz91OTVpRAlKJ6cWCoIsZYFEWWt2tV6xl17EuEPg+NiAAGod/grrvv
+P3T0aLfbrQpfMHnHpApLzMyYYWbn2DnnnGSmJLbaKTHrQGbXzWxaX/T3OeOWxKddeh0AVSMFJYOq
+gJ1jSilbFCQMAiwmBHGpqjpujDg555g5w6PMrmKDC1QVlQ9Nv9/Ivn68hItt67f1B8f3HtoP1yEX
+C7jGmijFBGvDJNgAIOoYbmbOEzz+b0xmFmJi5sGoPrnUr6qqNzNXNkcvu+yyDLeITGMV3wXo88Bo
+4k1Gw9Fjx79yxzfvfHDfJTsvvujCbetmW7O9duUhhMKLd4sCUTgFKwkT5xjC3MBGttTUc/OLg96s
+Xbhz8/6HN4Q4IE6mZJbjZqpiZhpSXcKTEzVE06TmmZOQefHeZ8SZOWs2gohIIJFCg7L4ri+8ULM8
+HLS3bb/0Al06fs/S0pHKnKFrsRmMFEUqNOkaWhPEMAOpWTRL0VQ1pWRmy6Ec1qPhcDRq4sn+ivhi
+dmZuqb984sD8Rz7ykQ0bNmRNu3YWXy70TIrItUShWlCcPLa4MGp+4TaaPfT43m99YbBpU3tj+2ga
+dDuFL5uqGhXtnve+KJxzzIJJmBIn61HTNJYoJjqE4qJLrrnmyt3zJ5dUnY2PUZCSKREILiIhRSYi
+TYWppsazFd45R84Ji2N2ECZmEjYix87IOiWnBLYZPzfadeWut73qA8ef/ubxhU8x11Q5gElJU60W
+QjOwFGIMmuqoIaYQVRWGFY2R68B1LXWUoM4gCq5ag5bfOLt+9qJNmzbdcP229W/+1J/9ya/9q3/3
+r/+3X1+3bh0AZj53ZPRFQ59Qs2uVEKAbmzC/xL3RMysLn3vn+28YYf7xxx54ZsE79kggtrLiLtcZ
++qLwZVn6QorCiYi6xsxEpN3qjuLKnr0Pl73e7muuq2PmODUkgoGM1GDJLE3HrhZJjYi890VRsPPC
+DuKYmWQsE4wLJkup9r6MYXjl7ouuvX7DUwfuGTy7J4ZFllAvhhRARBZDiMOEVgyagpoRoSSeIS6Y
+XeysFynbRXe2mq1ac0XVLcqWc0Vsb5qrOmLa2rphzxMnPv57/9cn/vKTb775tve85z3MnBVsFl9n
+i4m+eK6HC9AiMoCllXrQYMPiV4fHH7nkdT/+wS2bjh451tQmEJASRBVWuCwoRUREnHPOsYiYunZV
+WYokbEwhouh2BzxHumDImk3JjKBqapYMCQY2Ik1qCiRmLopCvBNxYGEWYiciOdqgxiysgHclg6L2
+NVrlB71NMyxtcRpDnYIyOyRNKQRfqsIiCAWhALUMBZGYLANMILW+2TCu0HBZ1SwMByfDcENv25/9
+8fznvvBA1Tq2/bIbP/gP/stNmzZN4Z6C/t3heoKHBYBN+0eWhhUdiye/wP6yhePNhk1bNm/ZQuSZ
+EdBnZkYLkk4538bqXiM54hhqZjhXGFDHNFg5VElhZoYcflBAczbFNBFgBEMCFNAMPTkBs7CAHDkh
+8WAjIoaYWll1APLMAgpxuHFjG6ltCEQgaLbaTcHMygk5NgcBKCnMJKoJRQBmZGamahNibnmBNjhx
++74dW1Y2Xba7u+0nbnnd1dm2EZGzxQ9eOvQwFEmSQ3+pXlwZzA6+VDfz3Qv//oa5lmq/rhPMsxO1
+oSpYWGIzOTPbZ5zVTnIcJ3nZ0XAEkLii5VqGBjBMApY2+cswWFJNpgqomQnIOe9cQSwiHlwwSRY4
+ChNmJgclBZuyiLRaraZuqCpU2cyY2RGSqhGJOFMyJMrsSQpHYHEAbAsAggJgWzUuo1vnufn2/YeL
+yl125cZj1ZU3vO5VmzfOnJaSHHv+3xULB1aDyxFwZJ5i/8n+0dvLYodbt5WkJk1OJMZoIYkvTJNp
+E3x96vnjcYTUFEVhSqrZCKOQhqZUOclGZLapeZzBNbNkGmFJVYmRJ0ZExJXMTFISC5EQOyISgMiY
+nQKFbxlTU0dvvmq16rTouRwbHZYIyuQtqeacjZEBRA7siIRIODkyBY3HA2OoGVCEfjI9+OThVnmS
+21s3b3/LNa/eoWBkv/JUc35q7bw86ImN9MSJlSNHnnEn7tDl49XOWyoXjZEaNiVxYmYWlWHiGg2n
+xkZoPLISTodRVT07EaSUCrWiKAYax7awGUxtYpyZRtNopmoRCZYaAM45dgWzE3YgDxYCQxiAFw5N
+lMKbQ4paVJ5IkqmwF3FIAtI8w8JOlUgis7DlbDAZsUHMKBKDp064AJyDr2Xl7r3n0RMLh9DbkNqv
+ueGa6ze215sprRHxU8TPKHlegkvla9jC0ZMLS3u3Lny729ncXbe5Z81QR3CVGszUzMQKJoqxT5ax
+HscSTJMBRBS4Z2TkOVisUxQnDFuONZEA4IkpPBE4phqR9W1SRYJqNpCcy3LGEbyBsp0DgECdTito
+UFNXOQAGJSInvRQpKYuQEasGdgVUKBGUYAYkAEQuD1qcThxaJRLAQEokJ4735+dXOrYcyutnt7/t
++ss2+cjs+qAuJnIm437GsOXzQJ8nLZkysVrkHDoibk4u379/cfvwARf329yPl0U3kLlY5YQrEszM
+UBtAxEZx1aPQ6Uc27SMH/3PaOkIBhpomAMkSjUOiphnlRJFHySISFWZhtEwSrShzOtfEEQmTo7Gg
+IBM0ALjF2es2YiJYVqrg8VJsMVXIroODmSpA5IkoB6AEMA2uqJpQMkLJA0oStbAinByOlheejb4T
+1l25Y/fO9b3ZxANDOzP8WjY/I+7ngj7zlJkxscGEOE8GU/jmnkOtwbP1wh2jcstcp134AFut2lhl
+cDPYKgOTrfp1ZhEsmIQ/13xvkyCtWa6SylfJRs9YwbJazCYQs2MqjIkhRDzGHWI0XvR5DWUoT9d1
+NHXxeeLuT34BT+NoLIWZOQcmpOChgG9Gdbl0crnpP2u9a7dtvfyKC7bBgdEGwgsv6Ht+gTMJmjIA
+YX7ywN6HDi5c19zNzUHZdvPMTJcQ6th4LlcRX/NsNuF0O30CcmETrT3LzHR6uiZbQ5TMKJhFTVC1
+lIICLAXYyUTBMjsjATFDJtBP7GuaiuApNKssMuHy04gBOPKNNuBkROw6akGKNDjJzxw80NTDaucN
+V15x/fb1nYDGWUF4Een1s0NPlEyFGFDKwzUks7seO9xNfSx9xcm61rpNRUkpAlDV1eqBMbiZgXXK
+15pz2JRRRv6bT+DpWWrZjjaemDmq0cySQdGYJUtk2qTYmJFwyVIREbMDuzHo4sax6zVJBVrVHjyZ
+DJ3m2fOg6VQ+yIeZkqMq0gjwJk41InVOLDw7f2hvqi7btPXanRfuBCIbq0LkRSTqnpfrJ4ASjPDY
+I/ueOLT0qs499eBwtfXGDbMzZiNVIXJpVY6vOQsgChlHjJHWScVfliVrlydP6w+AtMZ9sbHERw0A
+yVSbmGozYalIPJEQS4ab2YEkxxbXXHmaG16bbMjpHcV4PGsTs6vhRkUS6Tk0ai5aA+Jhv9y//76l
+leVq5827Lrp0rg0FiQkEZvLCs6Rnl/Vj+T5NatOg0W/dfV9HYnfla33ZUmzZtK7VapphogDLcfs1
+Z08/pQBASWmN4Mmo2yQ+OYXJxl6j5Q9jxyofq0k1AiBVjaOUalCXXUXsQZTNeZCAhIiJyOh0O3oc
+yTqtDjDXoBGQtcy0ygcTYciiKYIZcGArXXXk2OKhJx+rZeu2HTfu3LGF1BILG0DB1D/nti8eetgq
+ExhBgYf37j1y4sQNW58dHTlRzF7TmytjGqZg7AegDvQ012lqTYbJRbJDqPnRVCfYk5glgphl3RrH
+bG45ajZx3DWqBjOjqJpGGhtzxuTBnE2azOzGmX2nSnXiSRpPoA+r0zAWgxloXmsjYFVSeWhD6g3J
+u249jI8//vU0CNUFt1x6+fZOr0JUYYpIDnjhuJ8LeqZsnAIAgSLw0COPVd1ur/nWkVF3w1a/bqY1
+in2HOU1DJcoif8rvq+uaFOO6xsRQHYtUm6gGNktEYkh5MshiXhLZpgSQmd1SiKkhM0tqsYkxghUs
+Y7XJRCBjIRrXENu4pGwi9LNEMrKcJ+Ms5ckm6nUCtUzQp2xfpaCFC6y9kIbQ8vj8wmOP37Gu3I6L
+33rJRZ0ICDMpwAoF0XdFzSYwR0NBMZALew/0559deO3mE/sfnl/qDy+8INnRE/207IpjKRI7FW+5
+kLEQFoalNEZc2SwlVYMClAvqVTUyzCw5pjrMaNEXGzHNEgezNDk3pQTLBmVShUvJVEcxOTCaKJKI
+G3Av5wYBKAjGICJh0lLRmGuRielIrXDkq2K4wrMOxlGFgZQSJXNIlNRaRAZVMhNmpJhSYrJRTKK9
+kRbW6jcJX7/9yzYft97yc9t3rVtfbpruBRBz4BehY88JPQFkSYMTgeLuu+9SnLz30S+5ra+/5c3v
+uWj77mbYSBymsIxmRWOzUocQ6tDUMQxHo34zWomhNksUjmUrJaVkSDl9B1g7EYQH0Jb3aJplkatu
+fE3NtdXPpqQYc10ySzlYpkGhUVVTUtMQQkCRAM4BG4BsaryTwMjM4JgMTRPLyhfin9j75J5Hv7Nt
+447RSu1FUlDvBdDE2u60yPfEFeS8koNUJIXzLSnKoru+bup2yxW9m/be983F+Qd2vfrt5UWXbt68
+ea2vdLag/EuBPhuGxALj/U898/CDe/rLB3787Te95c3/QNiOzT915Ok9T+57+NCB/WGgiydGcTBI
+GlJqRGLpUbV8p11UlZuZKdZmZYUsS2Kj0DSAdPt1w5DrXvO24WJ6/KnHrry6pTBVVTMkVY1Zscao
+mpKZadSkqakjV6bgXP5Hk5JAA7LoJ2adWPPsZGX5RP/E0W6nc89n/o2TEuZGTSrLlmr0BatGQyJ2
+BmlU6kjRnMFFA0xa0ls/V172+rdvmBkV3o7blS2uNm/ePC01sJdUI35W6Ik1gpKqAP/+L2//6he/
+dvXuXXfeeezzn/5f5heO9ocnlcIojJpgTCWobDvvuCiruXbL97oVdaqiU0qrOEaemcmykTmWJABS
+sqoqNHjv5aorL5TWlju/+MmCn7py91VIammcKbVs1KdgRpYi1GKCphCjquYSfVYi5JQv8aR+mUBk
+YFby3rPwgScfe+qxBy7efWVxya0HDj7jyy53W0eHI186TcE4EJmqOuKi9L7rS7hQ14Pl5Sf3HlpZ
+nF/uL+AzX7npzdd8e1/CwlP/+3+6rSiKteb/mF9fzByc2673BQsMXNQPPfjNb9/xJY8RFV1fFq3e
+DFzZ6q6vZmZIuNXtdMqW977VKked1qhqLYr3SWQoBcYpfDfNXGdTsqgKgbC+5sbrtl258dN//AdP
+Htx3xSUa6lGMmlIOz8axS6UaDRQaVQtKpilG1QSCQFy+AUiyPWPEBhgY0LxfS8qqGSw9s/9xFbnx
+p35ry+Ej997/0PIgxpCC43o4qAq3mMxiKkXWzfTmNs5tXr++cBLrZuv88tFDjy8MVvbdd+8ffuKb
++xeOf+Qfb7jmgi2T2MPz11a+aOjNGISUYGn0oQ//5PXXX7pwZGUwiv3FtNw/1qQ+kUVlgxcuAURX
+0ziTIETELOMUgRqtITYziykliGpoOq0yNqO//c7jhw8/O9duNf0VS1FDNNVJYihzfVQ1DSFDr6lp
+mkYVIuPK78z/gClhEjE3I2Z2jSGoOYotCc1wsLR8Ytu2dY88HE2GUvgQRt0ZSSl2u0WMppo4LS2d
+rDX0vXdmNtPxO669bNCSH/27t6WTw4UTR95+0xsAD5ye8n6xMufsAseMiEQQGhRV961vvHmw2D/S
+H6ycWKxHKyuDZU3kqQMTtUhIyUbA2iDaeP4b5kn0kXhNgZHVQRjQ0VOPPfHwnsNbfNmKAzegFJoU
+U0o6jVlCVVWDKkIwRUyIMYYmAuxcEWnVildSgoBMkfeTiCNWLmJKg5VFTnVZlof2PzMarly8eVuv
+VWlKSVXER1OfhiIC4VySn7IbB8x4me12O+vnOhvmWjPdDrcZvAz0JlbkS2P5c0EPSgAssZcqGIbL
+db2CFEVch8Rm17WaqAA7x01cZhel3oRTyrUmMRkKeVWqZskxpliV9WggiNIp0O4MhyvUHHfUGY1G
+IQSdliUAub4wmZGqKVSRUsoGqHPOlWXOXeSCsGyxE5EZJzgbRRb2rZJhiI0THkUaLQ+3zc5SGPTK
+MoHV1BWVWcu5if/F2dcj55l4g84sd1KvW3dGKwktJqe9lDBZcGuZ/bsk68kJAIGxOYDaEqmaGVr0
+mOmtahgzM5uZfFiNAJ/xby4eylVEfVuWxRlf1xyGTaospbn11Ztv/enDBx88evRoVRVeXKiHqjpc
+6ZtZE4aqaJrGFDGivxzWPf3UiZN38ExHJNc+sSERWTalqoJGYWN0G545vq+0ra+/+gPHjj1BiyvB
+1ITLbq+gVqddhRDKqs3OyyTSeRoxO+e2+LK0gjquNEQzIfGngT7Oz7wYmfM84bOJr09E5JwriqIo
+3BTNNe746t8prb1C/pyjm9lU9EN/sooh9L1voMd9NXjbTdeN+g/teeDBuq7L0pOZWSqcDyFA04rN
+mFmMOQMlJNXCSf32d/Z6PTYtLBQh5rEWVzcwLRC9uKWjh5ri6Gt3X71zYb69RFZVVbvVann0um1m
+JnYKWgv9WhC9L5lz1aI7W4L7pdELTRDm22Pi1mc6ba3h1AmY/jSNJ+cvU0ohBGtQVE2q22l0YqbT
+fvvbfvqR+z/zjW99e1aSc1WIFEJgEhHSSIADD4nIUqrrkAtLy7K0NLCip0RJRLzjoshhW1WNTasS
+Gq0M1bRTdr7xrUfu2mPv/7FfuHj9hfuf3FdVxfrZbmiaVqtD7EjYUuRTaTINPF0BLxPr0+h5dpWs
+NV1tTVzltLPOcREimp6VKYRQ13U9HB0ZLK7MHz15ZGlQdBf69Zc+89kLL7q4mPPeeyJyQrlCWkS8
+92VTM3NZliKSa6RUta5rtbHMZUHOhaaUYgwrqeovzy8vpmMnn6mj9Qe87+CjK0P/m//dz1xx6aXr
+Z3q9bjvXwRVF1cTgOBtma0EfP9raz3hJjusZ6Xm4fq3dSuNq29NvfBruL+QAVaUIkZPdXo9GzdKJ
+o4/uefKS666Zm+sWmgAQW54AVc0rvTU3a2bM7L147wGkFNpmKyHoJLQ/vpcquaIVjGe67U5rZlOv
+rmtNsnNH75lDR++/+64brr6q021576uqFUIA0Gm1n6shnwv0d5fxv1f7Zs8xHzHG0WgUFusF7a/0
+67DYr60/CNFB0vBEovZUQOUPuYQxWXTOZeuIiMySmYmIRI8zUfRQawqpNNXMLOydp9nZuVbVm52d
+bbfbZVnm+jW8JCX58uklFHm/IPvpHL71WG20YidW3rVrbsfYbdcrDkRlu/YyiRXr1FhWVYbQZGt9
+Xnw5yJwkrdX22Z/Iy6XyVWqGQsZUGJIUVJSdTrvyjgHkpaOq3vuzWeUvLTjzAulFc/1po3nhg1vr
+eTdNE9OwicMYoY0haUCsldRKr4OU0kTQCYAsc5I1eREQTfcLCACkZjKAU7FzSWPLEJxzsRFxShzE
+t7qOXVm1qg6YRHxeQGfc63TGwb9QmF4AnbeN+sPhMAvobOZP5fVaC+rl0HMlXlahRVFlS3Et3N9n
+UTO+6fmCPrujdioBeE4PlTGdDR06S1LOLJ162JhyZGdqL3wv2PkF0vlrynJWOjP0Z6ezRU5OKU5Z
+A+4PSs+xHzjozzae88KY31P6gYP++0PnUc5M6T8a6F/CaniZkcXvNZ2/LlA/AHx3fuk/Gq7/rtAP
+1Hyf1ZtNyYRJc5URAgAYw8RYAU4ahGWSVpjWCysmG/FBlJKKK3L/REVSsEHIIM/pFDKZfiIaN+Ya
+lxMZQFAD8aQHIyGlRlwuvyWAakoCTwBpZM4pWVZAkLdh5tKzXJmkBIU6MJLVzKxmMu7rpapgdpN6
+aB23xVRZ3WVxGpkCTiPYAaSwBHMAgU9xHk9LIq6lc3B9rSpmIkJqDREDThOYIhEBYqokABpTIio1
+Fy4CzJpSEvHjUk3TXB8AAhABg0YQRyrPyHuMMC74zLdgBqkh6WpLIAWYYAQxA5Om2IgISJC3ojEA
+S/DjwEKuoqSxsck63mimBiKYgSlDM1ITgicitQZEBH8OiUAU1RjGxlALQgQ4O5WXXyr006LoaT0u
+AEDyTm5GDHAeIDUjVRKJCiKM21SaJmECEqnPc2IAFCSAGUDgs3qtY8THoydaneYpQ0lKJkRrW3Ws
++ZjLQSJsWrtKNp4qG9cBQvPCBViNjSDPed7cWkjO7mdYYmKM+//k7T52SuHfueXbWaE3jFQhXEy2
+AilgaspUphRImCC5n6EhEUQQDAB8k9RJRi7kdaCIZiRUTS9NpKvl3XZq/ygFCGAka5iYwDCGAayw
+hLw7Z0xsZpaQj1LAEAlgOGBVQI1Fjk16NVEgSC58RQpwosrETIiau9zBJHcUMGNi2Flk8qQ8H2bE
+Y7+cSE4reT2HTXUO6NVgDIFBU44H5n8BREBSTUztyWUi1OUDdNJDGAZLaGxQ+irjlcdhQEo27Xg1
+kfxj5pLEY+hTIsk7a9RgMJ+vrJNbZInhoABijGDJkMWoOTZp44YMY0lD4/KoAPPj39ZMDARqmtVX
+CiqTjmZJzsz1+SlzeJsZNOEfmiCO59PnZ4U+JbBAkzGPL5DUxgmirAcVYIdoYIDMWE1hqjLubhJB
+eR+qy7vb4ACqDQGozBzrc1x6g5mShJjMSTV5wmRQIIoWqw9nBrKkUZh0WtpvHpHBgKjZkKwzhjWf
+lHlcCIQQzIknBhBiHDppw5xNYBvXhOuEKc6Cno11RgRYo7EIoLCANRubzhE5x7mKvKGEFG3gqOo3
+WFxuBqMAogLdJi57rhy1h/WxnZe0VpaGSwutKPXGdd25bgFrYozi24eeXYjmJMTZuWpmpjDYsRP1
+8kBD7Pt2JfVwsp0qh4LHg9uwcabyRYyNMJsKiRxfwoml0JZjZdkajKKTEiTjSCebSktj06vc+h45
+nww8qOXIfPA8H5KSlAoTAlvjKW7bsjEayJX7Di6BjV29bdOsYLKVimJCAxSDwMcWVqJZUi3szFxP
+KMiioXau0EAiMhosrd8w2+tyzgQ8L529BIoYSQs3O39Sf/v3PvH1O54chPbKMKqirOpmJBRnyuro
+b/zWhx5/7ODH/s9vAysf/pn3fvCD15eSnKflIT76rz57x7eeXDdT/sOP/OjNb7/iL/7ia//fn97V
+X54bpuEwHiOemwYXRcgX4r0XkV/9x29821uuLZ2D1iRuOMC/+8Mv/eknbr/hrTcDsm/fodCgCTYY
+1CQ+xuhd061mOpx+5H1Xfejnbtl/4Jnf/Z0vPvqQngjH66DERYzqxAqJG2aqV197xS//s9ccOrT8
+a7/2xwcOLe3Yse5//bVfuPwSFopQRjKWzqFnwx987PYvfOnBgN7SylDpzDgS0O640rOZDfuhaZp6
+tPKOd77lo7/yhnFbnufLLJ6jDicqwKZf+duHfuP3vlUfl8tv3PDum3Y0VCR44oYDF3H71tnuZx97
+9pt37ONU3Pz2g46vbdBqMOIy3XnPwXu/ttLMrXzwZ4bP7Dv2S7/6hROPn+xedOy291w9N3cxQhLU
+mrzS0JUzX/vqgXvv2YdR62MXzL3x5otL9BI7Qb3/6cP/+t/edfBBvP/HyzvvPvq1v9rbUO/VN295
+/U3bVcuONqPB4M+/dHJh3/H7nhq8/9Yr/t+P3ff7v/1IbMUb3njB37np8mGIHPuRys9+bv+9dzz5
+hS8//eY3bbti19zn7nx66Qnbt6taWZkX3QRzMERHgP6HO+/6jY/e3382btq99N53X9Txs4QypCXi
+AC0N0TnV6IHBp7709PEnF6PRj9x64QU7dwxXBq+9ssy9WF4W18McMRDTyZN1DJ2i037/+17/L/77
+dxTQYCBKBB9HoCoolGdmwdRev07MSY2idErSWr/O1jWz66zXKo8tLK0MGteWN92w8bf/+fu3bHFA
+qSmyVAmoEf7ir+/95X925NBh+fo39h3Y27/08l4RPWT0te8sHtr77O7rL/upn3zTo099JrbQ6fDP
+fuA1v/jTN9RwhKiqh37+Dz/77NJgJIfnR3sPzseycVurX/jPX/ehD7xBGZ7CivnRP/n4x5852jAd
+PXLyiku2zW3YOFg4ObexlBaBkjEoscFgPFhMIQ6LmcE733HV7/7mB3qiMUWSABSKwjBKSIKuGhb+
+2z//+OOf33bpBb/4j95881t3R3MllNXWtvvDqb7VC4M+q1MnIamIC4NarO/RR9PyjkAR2kjRCVBo
+W8n5drrrwX2f/HSvqZW91snml0PyI4tOYeZ98KUV7YMnWp/4m33rOzJSJ0JhVFfM777t4lvfcfn/
+c8nmp545evDp+LkvH7j08m1MOLk4+JvPH7RBeufbL7h4uwOpmiSuHYZPP3n06SUqWsWx/sLR40Dc
+VFZUlmXlZwiCEawOjiOMYNph1ZCa2EavF+EghYFiGDRpBJIEMrAjeDAUFlNtSarW3sOjP/i3d5Vd
+lxqDchrSxtnOu961Y/NGjwSQOS2g62JsUQglhiX1SPm0XqWnFVS9MOgdoqknVqtJhs5JyRVpxzwl
+wKzlWWHKgLCBTgTacPs39//tN/YpNta2IjQ8OWyjagcOVLDzSmTmu4891fwPv/6XhStjMGYaLS1e
+tL490/7R2/7uq9/97hu/cuft2uBP/+q+9992wWUXbN97oP/1rz4gWzrvetuWkvxgMcFKOF1MrX/x
+W1/7o089PrN+nfn5oVYbN8Zb37zzgm29FBoiEu2OilYgESMOoh6OmDgYn1DioMkI5HsWnCgJHAyJ
+wTBKKBwX7U4Ty+88uPzUI59eIrT8LEdaOXbs1VdtvHjXT23euAEUEEhTRIE6JNYuWW/8Ro7n4H52
+gM9GFGJM3lXCFUwAjprAlCYukBpbAIoSqY3QLkP4z979+n/4914XmybJKGn7n/7qJ++/67Ctcykl
+rVOZ0mjl6Guu2/4//tJ/ceH2mWYUAqKzjtewe1dPsPLOv3Phzo91D+wf3HnXgc9/fu+un97+2c/t
+PXrg2E/97BvecfN1pM6zgEyJ2dFlV+9c/rMHTuw53tpQfOjD1374x2689qoNTLY0WNZKozQshYEC
+ULqxucbmkjolGMUYg0NRsGcE2ArQDpQYWhQIoKaJiOFtt1z4K794a6/X1KNCkUDBi3v1NdtUE5uD
+18hD8tG4USSYKYg5Au4FBunOUQyihSugQCpiXRSuCsQjxAoWNIJZiaXwASHRCgvVTXPRzrnXv24z
+rAE1Dboz66BiJUrSElaaOkKzrhPe+vqt63sB3GoQBR2CMpxi5aorNr/zrbv/7ye+YZFu/8rC228Z
+ferf39/Zuv5DP/HaXreHkAKWQInC7Azs5z9807Cpf/N3Pj1/ZOavP3n/jRdtedVVMyzULgXR+RS5
+XvQIDTXgVIPIBRFLkRlNKUJqYbRUlhuUHLgVQVV0Ki4pojMQSbJts/5NN24suQAEEsCxieydEQyG
+EAjasuDYvEpKHI1dFgOn4X62mTgr9KrCzFCsm2WS5eFi/ZU79vzLj0aslHBF4CY2oUWtd71vl4jX
+QWRuNYs1DDCvSKawgeqiG9hQY11VhW+lUUz37ln+5V//mx3btywNVjyLWpOa+tqrLn7v+66YbdHf
+e/fuP//UVxaOtb745Qf+aTh6971P3Hrb9Tdes5EAeF1ZWYJJfWK5Xl4GrfyTX7x5x9buL/1Pnzmw
+R3/+v/mrr3/rgf/6H9168bYZLJ4Er/vrv36s6aOGkQ6H0e75zmKzOESPNs74uFIjKdLigaPzv/v7
+X7h4y4barFoeBl+un+scWjrcLpYH881d963/5//HV9slJ6OgQydlGtJrX3PB+95zVeGj+QQbYrSC
+ms3q5bB0fH5w0aateQf18+J+LuiZXIjwHF7/hoveestF999bP/zQ8mN33hmLEK2INuz69vD4wuz2
+H5ubK+ZmRYvEraGaMpio1cQV322662ue7TXh6LVX7vyJ973xs5+8u2nKP/ijbyk6PkXHhTaD4cro
+fT9yxa3vvcohvPNNG95z63V//pn5yi/e/sXHNu7c8Z/cduWGTR3YoCE/19vQpYFfB+6RsiTgJ3/i
+6vVzzS/9z5995An/p596qtH/cMu7Xv26d131+L6Fz33n6S9949HEM5JqYyXf23ZRdcWrNt104+7B
+wqhw1ewFW2LR/dif3CNNZ8iRXRNXygvWFR/8uet+9LZXffVzDxx4evGjv3+HapEwdKIU2s3J5Z/9
+8Otufe/VzgKoZNO5Vrmht75dbn76ULjvO/u2vHOHX3e67/qiYzgwAAkkMeHQ08f27j203I/Ot8hI
+VVlINTJj1yUXE9nevXtVccXlF1x1xXZgRKAmuLvueezZI8tl6a+4ctfFF687uRgefvCJkydG3ntA
+ibox1sxNiv3t2+euvfrSVsVAfPJweOzhx2IgVayb6153zWWz68RgIaUH7nvi8METvpDLr9ix69LN
+gBIkAo88/PT+J+aJKOnKVVdfBnP79h4A2hg3u1BmCrFut6tdu3ZdurM6dnzw0INPLC7FsugmVRaN
+MTBc0qasbPdVlwN49JE99YiECxJLSYXLFKOh2bVz82WXb6tKGPDAffue2n+k221d+6pdrQ4vnlze
+tGlby7/QiodzQk9QVWJWIEawnP6GEDVlykEkhTkCHCHXOIL8KEeVk4EaGSdY3DgoqMhRMgJUIblP
+splZUnZJkXMhNI6TBIIaJEaXv0fuCZ/USQH0gbYmZkYTm8IzwKps433umATmNFkUEsKIUKh5pvFz
+iRs/LxHSOPKOZCbkbRIEzg8dG3UeTAEIQBWjkzwyByAmTcJnTkK8OOgn4SHYOPZLABuMoGuzTGpJ
+VZ24BGKw6fglLGpKDIWKOSAYIhEDkmOwpgqpDZQ7GxooN7UUoYDIYBq34Mlhy3HzDqZy3C0fiSgH
+Hp3ZMlFrEjdVIGkCs59yzyTxlB9KCRHCsPzimHEbWYUxijxJmiIw7vYHcH78yZ7QPPMKAyiZFeOm
+AJPxqPIL31H1/NDn1NKkQTqN+9GveZ4xGFzLKrJ512pqUuOtnfMJZyabgHDa11NxqQDBFCTZboOZ
+MitgZi4G8oXmgL4msExupACvplxsbfcCG0/J2Ebm1YSKJmOh6aON/5tHoUrGxMgtvIgBrgEfI5iZ
+WQ0JxmcrhXuR0COHsVe7+QCAMSivLBlnKsyY3TgQb6A1aRo7RTqpWiTKgVgCgODGjh+NEz1ElFIQ
+9vndhDBoSrkP8viw8Qed5CUcDEo1k2R7wRAmK5Jz9ziDjfsorXbZyhfUSRx/+hqsQMgPBYxHnpv7
+TsNnEcgx6DydDef4cJ5IVSKePtzLg97SKXNoY05PFImIxik30rxXFkQ2TvyZTV7QEeDcOCuEvIEY
+Kcf7adLKwRQ5eZJLITMo49xXRtBYUyKSSXB/jfGQ78gRQE4wCUtus0NEMJ9Tr2Y4VQaoTXryEI25
+2nLibCzwswyxCf+vnmxrXv6R35top77NcFJF8PKgn2gnzmXszKvZpPzsMWLansFstampTkYz3Zhg
+0y5nhIksACjYeGFkPuJJDitzLqeUcjPsvIVhCoFNdN+YMZVp7Uv0Ji/0nPSYXNvgjMxMTaYzQbZ6
+ohHMkJJmVR6jiuROL6uI2CSlZQYhxMnBmGQ5X1SJ1bmgT8nGXbEBQNUUxGI8kaFpnNJffZMK6aTU
+w2CMNOHMYqIeI7EBYok1VynQJOmUFSopcvn85BHWbH7WvM7WMGYAAlsbGOdbUlAZs0MCBIaUNFeO
+TBPrAAC2pMgGAcWcpYWW4ElKERgrVSVwM9axOUlrprBcdWIwQu5tzUwutx6nF7xb5IerBOoHin5Q
+Kp5/COkV6M8bvQL9eaNXoD9v9Ar0541egf680SvQnzd6BfrzRq9Af97oFejPG70C/XmjV6A/b/QK
+9OeN/n+iWgaHnp1RaQAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_chrysler" model="fleet.vehicle.model.brand">
+      	<field name="name">Chrysler</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAZaklEQVR4nO1de3Ab1dW/u9pdrR6W
+bNnyI5bj2EnjB6lDEigmNHaMS1JD2kJppi0kA5O2gJMSMJS0ZSjtTAgtnaaZTtuhkD6Y6VA6uC1D
+E0IJSYmdJ8F2/Egcv7EtyU/Jlqznal/fH+fTnWvJTufrN3jtwecPj0a72r33d8/9ncc995pSVRUt
+ixZCa92AT68sQ6+ZLEOvmSxDr5ksQ6+ZLEOvmSxDr5ksJeghBIG/iqLgv0tUlhL0FEWhONwURamq
+StNLqf0JsmSarigKBh3+LmmVRwhRSy6RoKoqoJ/wecnJktF6VVVVVZVlGahmyWlMsiwZ6BFCFEUl
+kPvSVXm0hKDHFA8kQ1GUKIpaN+r/JUsGepTkXA4ODvb392vdqP9eGK0bkCiKoiS7jLIs63Q67FCG
+QqGrV6+2t7fLsiwIwtq1axmGgXvg/iVhfhejh4OBA3OKRwJGZWRkpLm52efzybIMcBcWFt58880W
+i0WWZZqmYYQURYGRwF9q2aW5ZNFBD/iCM8MwDIrHUDAAPT09zc3NkiSlpKRMTk7GYjG73R6JRKxW
+64YNG/Lz88lHgTtEzqFFNRsWHfTzoRMKha5cueJ0OhVF4Xmeoii32x0Oh/Pz82FsYrFYSUnJrbfe
+CiOHtR46uHgQx7LozCwZpkqSBB/cbvfZs2dHRkYAR1EUFUWRZdnn8+l0OqAUg8HQ3d39wQcfTE5O
+UhSl0+kURYGBxHHAotKzRWdmgdwBMoZhBEHo6+vr7e0NBoM0TYM5VRQFuGhycpJhGJZlVVWNxWIc
+x42Ojnq93o0bNxYWFmKqwR8WFeEsOuhJ/93n812/fn1wcFCSJJZlQZExkwiCMDExIUkSTdOKouj1
+eoqi9Hq9qqofffTR5ORkWVmZyWSCIUEISZIEA7ZIZBE1BQswtcvlam9vn56eBtBhKsBfSZKAlLxe
+ryAICCF8FYaHYZj+/v6pqamysrK8vDyEEHy5qLReY67HtE6ysCAIHR0dly9fnpmZYRgG9BrGQxRF
+VVUZhoFpEQwGY7GYwWAATwbInaZp0PTp6enz5893dHSAMVAUBfusyS9deNEMelmWEWFUsSX0er0X
+L17s7OyEG1RV1ev1NE1jT1Gn08HNOp0uFAqFQiGEEE3TQOiyLKuqyrIsAK0oykcffXTmzJlAIIAZ
+H74nR0KT/LNm0ANfA5pYK/v6+s6fPz82NoYQAqPKsixCSBAEkihUVRVFkaIoQRCi0Sj2YSB0kuOi
+1+tFUWRZ1u12nz59enh4GFwjeDj8Cs2VlVsY0ZJwFEUB91Gn083MzFy5cqWpqSkUCgGfSJIEOMZi
+MZ7nYYSwvkuSBNMiFAphOsLLWHBJkiSTyaTT6TiOm5mZaWhoaGtrQ3GfFXJwSLtVRs3MLCgpqNvY
+2FhnZ+fo6Cj446DR4DICfQPbIITAVDIME4vFADKfz4eJHsXdR0j4xGIxSZKw7jMM09raOj4+Xl5e
+brPZMNtgX3aBEdBM66Groih2dXVdunTJ6XQCpoAyAAfeC8dxwA/g6oDug6dIUVQwGMQgAuhgDBRF
+4TgOcsscx8FESUlJ8Xq97777bl9fH25GLBbTxO3RUusDgUB/f39PT48gCEajEbgF9Becd4PBAKQE
+aGIWUhQlEomA+Q0EApiIMN3DvIGxlCRJFEWYXhRF8TwvimJjY+P4+Pj69evNZjN4/QsvmkE/MjLS
+0dHh8Xg4jtPr9YIggDMDqIGmg1vJsiw48hDHGgwGhBBAr6qq3++H8UAIwSAxDAOzByEEITH8HE8p
+nueNRmNvb6/b7b711lsLCwvnzFR/0rIQ0OOOgeYqiuL3+0+fPg2KD56M3W4HrMFaYqeFBIVhGHDt
+aZqORCIWi0Wn0wWDQWyrUdzG0jSt1+sjkQjEt/BSnU6n1+uDweDExASMnNfrZVk2Ly8P/KgFFg20
+nqZpnud9Pp/RaDSbzSMjI/39/cFg0Gq15uXl5ebmGo1GwALifhgPjuNgQsAI6XQ6cHsAX5gQkNHE
+Y5aamiqKYiQSgZxEV1fX4OBgLBYrLCz8zGc+k5mZKctyfn6+VsU8nzj0czoPPM+vXLlyYGBgxYoV
+q1atcjgcoVBoYGDg3Llzo6Ojer0+NTU1Pz9/zZo1drud53ngH5wJUBRlZmYmJSVFp9P5/f5wOJya
+mgpzBcYgEol4vd6BgYGhoaHJycnJyUmdTnfLLbfs2LEjJycHTK4gCDRN5+Xl4bWtBZZPHHoSd3JR
+u7S0tKenB3yVcDhsNpsrKio+//nP+/3+q1evXrhw4e233xYEwWq1ZmZm2my2nJyclStX2u32/Px8
+yKalpqbqdLrp6enp6Wme591u98DAgNvtHh0dHRsbCwaDfr/fbrdXV1fX1taWlJTQNO33+2dmZgKB
+AFjsjIwMu92O4guQnzQUCbLQhIPRz83NtVgskHFECAmC4HK5GIbJyMioqam5++67+/r6Ll68eO3a
+NafT2dHRgRAymUypqamZmZlbt24tLy83GAwwFY4fP+7z+VwuVyAQiMViLMtmZWXdcsstd9999113
+3ZWZmTk1NfXxxx97PB6IJGRZNhgMsizbbDYIaDVR/AVapUooGUMIURT11ltvjY+Pp6amSpIECXdZ
+loHHLRZLSkoKwzDRaHRwcPD69ettbW1gEiRJ4nn+yJEjW7durampEQTB7/cHAgGDwWCz2YqKirZv
+315dXb1u3bpgMDg4ODg4OBiJRHDmBxG1m5WVlQ6HQxP3Bi0M16N4bzHbwCWHw9HV1ZWRkYEQisVi
+4BSyLCsIwszMjCAILMsaDIaioqKSkpLq6uqpqSmXy/Xhhx92dHT84he/MJvNer3e4/Hk5ORUVFRs
+3ry5qqrqpptuMplM4+Pjly5dmp6ehuQa5JwhRIBATBRFm81ms9kQsZCywLKga7PYcUQIqaoaCoV+
+9atfORwOcOdxQSsihgrcRI7jrFar1WrleT4rK2tsbOxPf/qTIAjd3d0FBQV79uxZv349z/OKovT2
+9g4ODno8HkVRjEYj+Jrg0WPcITlRXFy8adMmvAq/8AHtgnI9qV8URRmNxuLi4rGxMYPBwHFcNBoF
+7gYrinO50WgUfMRYLGaz2U6ePDk0NCRJ0p49ez744IM333zzzJkzNpstPT29ra1teHiYpmmO4+Dn
+eEkLf0AIMQwTiUQyMzMBd60IR+OlkjVr1kSjURTPI4JK4iAIIcSyLHiWLMtOT0/X19c/9dRTx44d
+KygoWLVq1ZNPPllQUPDss88++OCDjY2NEOsCceFXgOKDXoOCq6pqtVpTU1MBca0IR0voKYrKz8+H
+xCRZXwZXDQYD6D7cIEmSJElnz5612+1btmzZsmWLx+NhGObHP/7xxo0bm5ub3377bcgTQF4TvwLN
+NvI0TYuimJGRkZKSgluiyXKVxtCbzebs7GyISFmWhb+Qi6cJ0el0ZrP5/Pnzbre7rKysoqLC6/WO
+jIzIslxaWvrSSy9lZmbW19c3NTXBQzDQJOIwk4D3MzMzEbE0poloBj30mWGYtWvXBoNBnD7EGgoZ
+Y5gHOp2uv7+/oaFh5cqV27ZtY1l2cnJyZGSkra1NUZQ777yztrZWEIT3338fp/UT6p9wEkmWZZZl
+AfrkEVpI0b4EyuFwCIIgiiLkxbADCilfURQh7XXmzJlwOFxZWZment7b2wtQdnV1dXV1qar6zDPP
+3HvvvefOnTt37pzJZIJf4WQOqdrRaJRkGw0VX8ulEuhzWlpaWlra1NQUQgi4JeE2lmX7+vqam5uL
+i4vLy8udTqfBYIAMcywWa2pq6u/v53n+iSeecDgc77zzjs/ngwiZ3HuF/SVVVVetWoXfQmm3J0tj
+rldV1WAw5OXlQd0Hdroh3BdFkWGYUCj0xhtvsCy7e/fuiYkJhJDVagVbqtfrWZa9dOnSwMDAli1b
+HnnkEafTeerUKb1eD3k0FHdgsHbr9fq8vDy891OrNXG0GAgHIQQBkSAI4OqQa9w8z1+/fv3q1au7
+du3ieT4UCtlsNjLyAkybm5udTufOnTu3bdt24sQJp9NJxStHcCQFN6ekpIC3qsbLxzUherQY6nAQ
+Qunp6RaLBSo+yIQ7VCq88cYbX/7ylzdt2uR2u7OyskiDCfbAaDSqqnrlyhWaph966CGLxfLee+/B
+eiyUTIHnqqpqNBp1OBy4DkVD9wZpXocDKLMs63A4/H4/wMpxHKz5URR18uRJiqIeeOABr9ebnp7O
+cRymbIibAFnYatLV1ZWdnb1z586urq7Ozk54DhiGWCym0+lYloUafHV24fGnzq9HRDFMcXFxNBqF
+JFogEDCZTFC61NLSsn///nA4DMtSMDMg0wD1B+ARQaLG6/W63e7KysqSkpITJ04A3HitnKKonJwc
+q9WKZltgrURL6EnVW7FiRVZWFiQV9Ho9FDY1Njbefvvta9asQQhZLJZwOExRFKAvCAIuwUQIcRwn
+yzKUNYTD4a1bt0Yikc7OTrPZDM9kWTYYDObk5OAFAzRXrLuQorGHg+KkT9N0SUlJOBwGk2gwGJxO
+Zzgcrq6uhiWOcDgMK4VQr4B3SEGODDtFUB6Sm5tbWVl59uzZaDSK85eqquJICsyshn1HGkKPIx28
+YaqgoCAWi8FuWEVRGhsb77zzTo7joPqDZVkoioL1E8g3AI0wDBMOhyH9AKkCRVHWr19vNBpbW1sh
+GxqLxbKzs9PT03EDtA1lkYbQY0cFxZdGMzIyjEajIAgcx/X09GzYsGH16tWQTkAIQQkfzjWSGU2o
+84ZLUBiiqqrJZLrnnntaW1snJiagviE9PR2oP7kxMPMWWLTnehT3dliWLSoqCoVC4XA4EokUFxdD
+Wg0UGfYs4B/immFYUIQ4AHtNUHBgs9nKy8t7e3sVRQmFQjk5OWgeHddkbVZL6MntrEDWDocDVmhX
+r15tMpk4jsOJMEhhAk2TwnEcy7JQzYpLz/DnsrIym802MTFhNBphe8niEe039KjxTX4UReXl5QmC
+MDo6arfbXS4XLn2d0wEnvRTyKv4LKU+w2Nu3b9cqYTCfLBboAUGTybR58+arV68ihCiKSklJgUUP
+km2SZU6DiYfTYrFkZWWtW7dOWy8+WbQMpkl9J79U4zXvADfkA+bb/JfgpJMC2Rt8A5ToLJ4B0B76
+OT/AZgQ0z2kV5BPgw5y0g50oKLH/BHvyX4lm0M8XQ94gtkwG+saBKLlRVtvigzllsWzeBMEJGUQA
+TaaIyXVXRGQCSMFXcX4NP3zx4I4QYhIUAfMviq/g0DQ9NTUVCAQgYmQYxmq1pqSkmEwmcCGg9hoE
+axbcCSEr3AMbKuEbqNtW45ukGIbheR7F4yzYJ6XX6+EJ8GVCrZIoinh7G0VRU1NTPp8vEolA5SzH
+cWazGUqmlNmns8DaLJ4QyY9lWTYajfI8D9EyVDCQqX8yhwGlEtAXeBFEc+QMm+9UGEqN70tKxt3l
+ctXX1588efLy5cs+nw+eBbCazeZHHnnk8OHDFy9e/MEPfqCqqiAIP/nJT2pqakjiHhoa2rNnD0D5
+8MMPf+c733nqqafef/99RVGgug80EYbzs5/9LNSoZmRkPP744y6XS1EUq9X67LPPbt26FcMky/KR
+I0f+/Oc/33HHHT//+c9PnTr16quvtra2jo2NqapqNpshEON53mazbd68+Y9//KNerx8aGvrud787
+PT2tquo3v/nN/fv3o6St+xBU19XVtbS04GJxSDuLoijLMtT4i6J48ODB+++//9vf/vbly5dFUZQk
+Cc7nAa+MYZjbbrttw4YNNTU1paWl8802BhGpc9Lf+P3vf3/w4MHh4WGEUFpa2o4dO4qLi9PT00Hd
+nE4ntNXn8509exZGC9ZXASBQClEUGxoagAc2bdpEUVRHR0dnZyesFj366KO5ubmhUEhV1aampn/8
+4x/19fUvvvjiE0888fzzz+/evbu9vZ2iqMuXL//ud7/7+te/DhsZnnzyyaNHj27cuHHv3r2vv/76
+Y489Bg3+yle+8vDDDxuNRsDL7XZ3d3fD+jhCKBwOnz59GmrqN2zYoBIFxngdEdS/qanp3LlzCKGU
+lJRnnnkGfCQUpzsYrcLCQlVVW1paOjo6IHR4+umnYdN6KBRqb2//61//+pe//OXQoUN79+49dOjQ
+3DYG8q540QdWRF9//XVgAITQl770pYGBAbgHTy5Qc1VV33vvPbiNpuk//OEPmEbgnp6eHpZlIeY8
+cOCAoig1NTXguqxZswaehh94zz33QNoyMzMzEonMzMw89NBDOJQ9ePDgxMTEN77xDYTQ7t27Jycn
+VVV99NFH8SJfZWXl4cOH//nPf3Z1dXk8Htxg+NDd3Q0bgBBCTz/9NHkVGoBx+OIXvwi33XzzzZge
+4Ta8eRH+3nHHHfD2srIy/CL4CUxThFB2djboVrIw2PNV4xuXaJo+evQojmWguA5GG6sJoIkHE/Tu
+Zz/72SuvvALzC/y5YDAI9+NVC5izMC2cTifssIlEIk1NTRcuXIDtBnV1dRzH8Tz/2muvZWdnv/TS
+Swih559/vr6+vr29fe/evYcPHwZn8Xvf+57T6Tx//nwgEGhoaGhoaIAOWyyWwsLCz33uc9u2bauq
+qkpLS5MkCTYuQ6eAW8iz0vDpabjqtru7+/bbb8eb36CnsNnx5ZdfLi0tjcVieEJ4PJ6WlhaWZcPh
+8IcffnjhwgWGYWw22/79+6E8Ym7CASFpB3Lc4GzAXiTMiZiRMPOiuEFesWIFJH7ByDAMMzMz093d
+TRO7uSGzCPXWNpvtxIkT+/btg7cXFBT85je/+cIXvpCeno6n56FDhwoLCx977DGEUHt7+549e377
+299illi9evU777wzPDx88eLF1tZWl8vV09MzNDTk8XhaW1vb2tqOHj16//3319fXcxyHqwEBYkz0
+2DKBcmCGSUtLq6qqgtlPpqMZhjGbzSpRLyTLMs/zLS0tzz33HLxi48aNBw4cqKioyM7OVudz38lp
+grmisbExNzcXbli3bt3x48fBvcGTJRQKwS6Df/3rX1S84Ou1117DT4MHOp1OTFzf//73VVXdvn07
+jHFBQYHf7xdF8dVXXwUKMplMjz/++NTUVAJXXLly5X/VhGF++tOfkt6Rx+MZHR0laVBRlHA4fOLE
+CZyadzgcPp+vp6cH6lspiqqrq4MWSpIEZczRaBQOD5Qk6a677gLeW7duXUJLSC6VJGnz5s3Q8tLS
+UrDDv/zlL+G3aWlpdXV1Pp8vAd5ZhKPOPhwP1GHLli1/+9vffvSjH506deratWv33XefzWZbvXo1
+bNELBoMej6ekpOTYsWPYI8JHApGOVCAQgPU5mKrQW5gogUAAbOC3vvUtu91eW1s7Njb261//+u9/
+//sLL7zwwAMP4HkKLAGeVSgUIknvueeee+WVV2666ab8/Hy73W42mxFC0Wi0o6PD6/XSNG21Wn/4
+wx9aLJaJiQmfzwcPfPnll0+ePAno44hXUZS8vLxjx45BXS1FUdeuXauoqGAYho4f9wLDL8vyfffd
+t2/fvmAwCAs7wWAQiKiurs7hcOzbt8/r9R45cqS+vv6FF1548MEH58yCMDjNjTkH7isvLz9+/Pi7
+777773//e3h42OVyTU1NgQ+elpZWUlKyY8cO0Kna2loYgLVr18JzsLNss9nq6urA26uqqpJleefO
+nWvXrlVVNSsrC5fH3HvvvSaT6a233tLpdJFIpKOjo7+/H9wySGfW1tZC/2+77Tb8fEmSqqurFUWZ
+mJgYHx//+OOPo9Goqqrg0e/atauoqOhrX/taUVER+JoHDhzw+/3YHyejOVBDqLjfuXNnaWkprnKA
+S1R85y3YMJhAu3btGhwcxDtAAYSvfvWrdrv9zTffpGk6GAy2tbVVVVWtXLkyGfp5EwkJ/hBMOmgQ
+PocAETE9jqHICIh8IHkDnmrJv8K5MJzGIX+OLQ0urcFsSzYb30luDUx4INl+DC5YrxuvnODwEI8H
+nHykEnEZbCFCN0xg3CiHgy07SUooKfJCSZsf1dnpMHyVhA+b8WQDrhKZmYRX4/CYtPbJSWPcNjxC
+aHbNU3JsmYwOQKwS4Q7uCP6QMJykQiT0Ohne/0P6TI0fJkyirMS3RylEgSN+KwYIn/2W0CWyxWTn
+1dnZx/nQIb9RiI1aCUAgIn1PvjdBEuYlngdkj0glS8hGkEAlmM85X/efCUcmTqvFjU5IaZF4kffQ
+s3eIYZ1FcXrF/hlWYYRQwgzFA4Pix8thEJNnMVwlG0aCeAPc4S0YKYU4nmtOClVnO9kJM5W8hGbP
+4/8M/XwvS1AHlERnCnG+BBU/sIOk6QSSRXGVTCAW8tXJ0yKhSSiJQxJ0fE4U5kQELHCCVaCIEuiE
+dyVAf2O4SblREpUkR9IAojixkJqITQKeIvi3CclbfKSTMrv6DsgBV0Thsg64BM4rInhPjv8HhwSe
+IacFqbnJI5QADYAOpZlKvLITEUVasNuL9Cxw97HNw1SBv1HmWdqcF3qFOEqMHAaMKVYBfBwNVnY1
+vl2PjNRw6Es65ojgLjwA8CtywJT4ca6kBiQU1ZBUQ/YieYznFJhYeIQwoNgRgMbj1irxbVn47bhr
+2MbAQNLzVLotuuOkPz2yiFZtPm2yDL1msgy9ZrIMvWayDL1msgy9ZrIMvWayDL1msgy9ZrIMvWay
+DL1msgy9ZrIMvWayDL1msgy9ZrIMvWayDL1msgy9ZrIMvWayDL1msgy9ZvI/6g/E2SrbC1QAAAAA
+SUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_citroen" model="fleet.vehicle.model.brand">
+      	<field name="name">Citroen</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAtFklEQVR4nO19d3hd1ZXvb5dTbpGu
+mq3i3nsvYDC2KXYCQwmmhZAC6ZmS5MvMS0ibTJI38yWZl3m8SSa8DDWVNiRAGENMiQEbuXfLBRvJ
+siVZssotuuWcXdb748iKU5gEnhg5M16fPn9Hx9K5e//2OmuvvdZvLTEiwnkZDuHDPYD/vnIe+mGT
+89APm5yHftjkPPTDJuehHzY5D/2wybkI/eBRg4istb9187+MnIvQM8YioBljnHMARMQYw28uhlKK
+iH53Sf5UFomdawMdRPnsO5EIIaI71tpoSSIxxkT/ZYzhnEcr91sPOQflnIN+UAYHdjaIg6BHF4Pf
+EpExRkqJ37d456aco9APGpyzr40xAA4dOtTU1FQsFjnnZWVlEydOHD9+fFlZ2eDvDr4E57i8IfTD
+tiBngX7WPSIyra2tjY2NsVhs6dKldXV1pVKppaXl8OHDhUJhypQp8+bNcxwHAOfcGMOFMyzD/+Nf
+tzcNPb3Ni8LPDN5aG9n3MAx7enp2794ZBMG8efMmTJgQmZS+vr7u7m4AmUymra3Ndd2ZM2eOGjWK
+MSaEsG8ChLdl/H9Q5Ns6jrcmEbKREQ/D8MiRIzt37rz00pUNDQ1CiEH7Hml3V1dXb29veXk553zT
+pk21tbWLFy9OpVLDPYk/LMNm6wmwZAFwxqMhMIbIb+QcDNaSLvTnGxsbuzq6brrpFjfu/ZYR7+vr
+6+rq7u7py2RynZ2dHGzc+DHp3p4gzF922aUjRtYbrYWUAKwF45xAZJl4m93pQTT/oPIPm19vrOGM
+c8YBMIbItnMOwcEArXVXV9eTv3iKiN32vg+4vq+UsRZaW4BHX1K60cYrBIvH/Vx/ZuvWrcqEqVRq
+w4YNx1taolck8jjJWgbGz6VjzHBqPQBttBRy8IJAHBSUSidOHN+9d8+kiVPmz58fBEoIB4AQgoiE
+YEQggta6ra2treNkX19fLpsvFAq5bDqd7h01alR5KulKr2HUqBkzZqRSlQCstdZaLsUfb4v/f+aF
+P0Lrh8/WEzHGHCEjM+IIGYah67q6VNi+ZcuJ9raVK1fW1jUopQxZa0JHuIMOe/SWuK4cObImDMN8
+rgDqN1pbi1SqurW1vbqmZtLEsYcPH85m+xcvXlxZWck5j84B4OeKyz98Wk8YdCAj0AHb3d29Y8vm
+TCZz4cXL6+vrgzBkjBGD7/uSOSACJxCVSqUgCIhMWVkZZ36hUDh16tT2nTva20719/c7nhcEQTwm
+J0+enM1m6+vrL7jgglQqpXUopXy7bewfr/XDfKSKVJ6IGKNMJrNp06ZcNr1ixapEIgHGtNbJZNJ1
+JUAwpqWlpaWlpbn5WFdXVybTFwRBRUXFpPEzRo9pGDV6dCJRdqKt4/WW48dbTmhtiCvPcceNGxeG
+YTKZXLnykng87rrueehhTORBRuizU6dO7d6z0xizYP6iRKJMKSWlrKgoB+xrrx08cGDfrm1bm5qa
+Dh061NXVqZTiAkQkpWSKVVRVTpo06cKLL5ozd34skfL9RG9fpqX1eLFY9F1v7NixuVymrKxsyeLF
+48aNA3t7D7p/AtBHEmn98ePNmzZtKk8lFyxYIKQPoKqiWkredGDfhg0vrH/26cNHDqa7u4yxnucm
+k3EwC0AIoVQoIfLFQhBoC5RXVEyaPG3RkmWrVl5WVTPqeGvziRMnGGH06AbOWDqdvuKKK8aOm/C2
+zugcgj7y3zkb2N2MISEYAEuwZARnzS3HXnnllfLyqkULL5DS8SSvrq483dn2wx/eu/7Zf9+7e1dQ
+Mp4H4TqO4zDGPNdlkRAAGM2MMdbqYlACkM0q6WL27OlXXn3lypXv8NyKA02vpzO5hlEjIcJ8Ib3i
+oksnTppE1jLOAW5BDAxvJgDwB+cbyfBDb8hyxi1ZDqaUcl03uh/Z987Ozg0bNiQSiblz5zPGqqpq
+XNhnnn36hz+6d+Oml/r71ZjR9SNqRpUlK2rrqnzfz6a7d+/ZlU73GhtwQDrc8xPTps6aMGl6GNju
+7p50Nt3T09ly/HVj7LRpU2+59X2XXbq6p6fv6LHmmpoaa20um7744otnzJyptZbSJSIwRqChcjrP
+IegHn05nAgBKKcdxANvS0rJx46tVVVXjx49PpcqSZfGtW7f+/KEfv/zyBgg+ZdrU0WMnVqSqa0aM
+GlFTV+jvPHr0yM6dO7duaayqqhg1qoFguru7O053jxk99rLL1ixedEF5qjKb7e/u7u7s7OxoP37k
+tabu7q658+a88x1XLlq4rKO9t1gIlekPlZo5c+bixUuj8ZRKJc/3/wtqffR0Y43kIsoxRS5N6/Fj
+zz67vnZk/dSp02trRwRh/r777v35E4+lyuKLF10weeqseKzC8zzHk4ybjRtfefHFdZlMZtHCxVdc
+8c45s+dVVtZwJnt6epoOHdy4acOOHVuDMH/55atXX3FVeVlNqWi0yWsdHj12cNfO7YcOHVqwYNFt
+77ndFe7xtlZrbRjqefPmLVy4MArxD/l8cY5AH9l6rZSUkjEG2Obm5qee/Pno0WOnTZ1RW1u/Z8+u
+H/34gdOnuxYtnjdp+tykX66UiXm+64jm15ueePLR4y2vrVp95dVXX7to4ZKamlrBHSndaJZWo7ev
+5+Ch3T/7+cPrnvl330usvf7miy9eYYx0HMdxnFw23dLy+sZNGwrF3M03rB03cdbJkyfz+bxSauXK
+lVOmTBGCWWs5H5o1OLeg19pKOXiItL29vQ899FBFRcX8+fM5ly+99NKOHTtqaqoWLJwXj8cLQRyk
+4z7LZLp+8dTjWze/unjhor/687+Ys3hVRUV5ZKyIDBizZDkDIxkdzzK93c3Nx374owee+sXPZsyY
++v73f7KhYWx/rphIJIiMpaCl9fC2bY2jx85YMG9+X19fJpMJw3D16ssnT548hEetcwh6YxEFrRgA
+2Gw2+4unn9Raz5o5LwiKx44d6+rqqqurGzGitlQqWQvBfcfhe/dvfezRn1RUlH/gvXesWX1lbcNY
+rSHlwMQsLGcgmCjsZi0GwjNALte7e+e2e+69+9DBo5dduvodV17jur5SxvUdIahYyh88dBTAqPqG
+TCaTy2WstWtWr546bdp/QejPtvXpdO8DDzyQLIvPmDFDa9Hd00VkYjFPCBGG1hqeTJYVMifuvef+
+to72z372zsuuWF2eqvZ932gIqa0hLgQRY4zZM3FmAxKIvFXLCJHb2d3dvWPLC9/+3//Unyv+5Sc/
+M236rEIhZFxK6UjJSkGhv7/fKJ3Npk93dQG44oorZs6aM4TzxX8y9FF4i34zw2ctOIe1ulQq3X33
+3Z4XmzVrjrUW3ISh5sw1xlqtGadkMr51y6b7H7h77tz5X/riV6dMnen7vtJWSk4EBmKMWWsHfPpf
+574twM8iJQycG6CoP5/+x//9jaeeeuK29733isvfmesPPDfBwTlnQjLGqKv7dGtrSzabdRznmquv
+HDNmLINjz7ymAKzVb3YPGDatP5swg7Py2koFDz74YF9f38KFi4NAJRPlymjGmApCLiAl5xzr/v2p
+F1544UMfvuO297yvorIG4BGOlkCwgv2akJPP50+fPs0YS6VS5eVJxhhjwhgThRYQxeYAMAsyj/3b
+w1/92teWLVv+wTs+HIslgkB5ngeAcy6k7OzqaGlpOXmytSwZv/XWW+tqR0dxvTNLaN+sIRoG6CO9
++31sAFsqlZ599tk9e/YsWrSEcxmPJY0x1jLAKl3yPdHd3fXoYw9Za7/0pS/Nn7eECwHwCILoXwvi
+IKVUa2trS0tLNpvVWkc52FQqVV9f39DQECUFrcUgRccYwzkYY8dbm//2S1/OZDK33377lGlTg5Ly
+vITRJIRwPNnWfqKt7cTrx16L+Yl3v/s9Y8aMifwCrbWU/E8A+rOtDRENkmSULj766KO7du5Zvny5
+lG4qValCwzknQ0qXyspjjY0bH33s4ZtuuukTH/+LWCzOuPtrowForTkH57y9vX3Dhg3xeHzFihUV
+FRWR8YncxPb29p6enlmzZs2ePXtwPIYsZ9IYkoJFEbrn1j/z1a995fq1a6+99l35/lAK33EcrXWi
+3G9tbXnt8JGWlpZYLPH+97+/rq5OSvlblvOPxeHMxTBss4Mjjhbj1caXH3zwwRWXrEomy2tr68Mw
+FEKUSiUpyHHE888/t33H1k/+1adXr14DOGTBOIjAOM6YdQrDcOfOnfv27Vu5cuXUqVMHP6ivr+/U
+qVM9PT2MMd/3m5ubE4nE8uXLE4kE55wAS+CMw4IAzq014f4Du++88wvTps740Ic/5rrxQqGQSCSk
+5Iyxrq6uXbt2HTp0aMmSRTfddJOUkr2lGOfw5Ga11hHcg/thX1/fQz99ZNbMORUVVVVVNVGWzhjl
+ujJU+Ycf+cnhIwf/4e+/sXrNO4wd8EC1jZg44JxbqwuFwvr167s6Oz/ykY9NmRK5gNwY0toK4XAu
+iVhvb/q11441NDQYY5566qm2traIl8kZN4YAcA4ixoWcOWveIw8/RoS//59fO326o6qqnDEqFosA
+b2gYvXjx4gkTJhw+fPjo0aPR0e9tdf+GEnohxODrGQ26sbFRCGfcuAmpVGX0CkfeTk9v51NPPu1I
+79vf/s6cuYsASUTEYJkVAkwgDEtBmO/s6nj8Z49VpFLXXnddZNy11tF2IqWMVloIJ8qPb9u2w1rU
+1tb/6le/2rdvXxgoEEnBGIc2ZMgSpBCxsrLqu+7651WrVj5w/z1HXjsoJMVisTAMw0CPHz9x2bJl
+mUzm0OEmpVT0iUOIz2/J0Nv6yNBHN7/+9a9Pnjx50qQpWllrrSXNOY69fnjz5sY1V6y5fu2NAAdB
+GSsltxRyxogcMDJGPf/cLwuF/NLFS8eMGadCAy6kFBEU0d6bzxdPnjzZ29vb19eXy+VyuVxX16lE
+IjFmzBilgurKmvnz59eMHKHPUEKUJc6ZJJC1TJjNm195+NFHpkyeceU7r5XCt9YSTGVlasvWTU1N
+TWuvv3HcuHFnb9p/LA6DyP6hnxwyrY/sBIFxPsCrKRT6k8n4pElTGGOWQsaNFLRn9/Y9u3Z97CMf
+vX7tjQOrzsAZkYVgLlmHM5vPZZ9/7pda6z+76toxY8dnc3kmOCyRIVjCmaSu53mJREJbpa2yRNba
+ZLI8m802HdjnOs7p7vZXNr7Y3nFcSjBYY43DmQAsMxAgiAsuvORTn/yb1pbWn//sEaUyQjIhRC6X
+mztnYWXFCIAT8TeL+5uSIXt0xKjBAGcSABhjUXJD61AIEQTFbdu2dXR03H77HfMXLAQ4Y6JUKmHA
+UlHkC3b3dK5/7hml1OWXrTaGSiXtxxJKW3DGBCwIzEbcDil5w6iG8ePH19fXu66rtFXa+rGEhdy9
+b790fG3w/HO/OnmyHYDkggFGawZhCQwwmiaMn/TZOz/nut66dc8opaTkjuPk87lEIkZEkWv79smQ
+hUwjLiYbPGKeKUAIgnwsFuvv7z906BAY+/SnP1NVVTW45L7va62llIyREOz48eYt215OJsqXL19J
+xIhYsViMxeO+74IMY9SX7j59uisIAq01Yzw6VY2qr6tMVdTX9zQ3N7ecOAnBPS9x6PCxSRMnel5i
+69btQaAmThxvjZFSGho4nUnpKqWqq0Z89GOfePKJJ559dt2yZctGj27wfEeb8Ew4823U+iGDnoFF
+6EeGmDHmeR5jzI+5vb29e/funTFjxlVXXW2M4UIYQwwgkBCMcx7RNA4fObhjx47JU6fMmD4zDK1l
+RghRWZkyNujr6zx2+NC+fXu2bdvW3HKsUMgXiyUAruuWJ8vGjh0/c9a8hYuXXLBkwZTJE4++fqy5
+uZmInTjZXlVRWVmVeuWVV053nbpw2QWAYeSADXgBjuNYax3Hu/mWWzds2LB586sLFs4bNWoUETFO
+Z1L2b1cafei2WQBAdITBGVr23XffXVFZnslkZs+ae8kll0SecnRW/M3ftgea9m3ZsmX+/Pnjx002
+hoioqqpKSrSdPL5v/46fP/Gz7ZsaOzraSiXlOvA8J3I/GPFQa2sgpTOytuGCZRevWfPOcRPGE9HB
+I8c7Ozs5k5VVqRHVNd09pyZMGHfppavAXK312c6YtdHmQU1N+3fs3FZZWZlOpy+//PL6ulFvwbUf
+jkAC2QECZfStMUKwdevWNTc3X3TRRXPnzhXCGVR5zhlnA5UhRLR9+9adO3fOmz9n0qRJOpSJZKy8
+LHnq1ImNm156dt1Tv/rVix0dPXEJKXllVYqRBSNOkFIqpcCFtiYomf7+QqiQSMSWLFly/Y03zJ63
+OJfLt53s6OnpSyaTDaPr29tPzp4zc+miZVwK/LpqhTEGeyY8d/Jk60sv/6qqqmr5xSvKylJvoUBl
+GKAfTO2DQBQF/2w6nc7ni/X19REhmwnOzgR4OYgxFoZhU1PTrl27pk6dOmnSJK11TdWI/nx6S+PG
+Rx/76QvPPdfbm68oi9fX17sx3+HMWN1zuktIBjsw7BC2oqLKdfwgCLW2vb29PT3pRMJfvfryFSsv
+Hz9uErjb1nGKiKpqKvv6embPmDlv3jzP94EoSiMpUnwMBCw7Ozt830+lKonIWgyGNP5IGY4YTrTT
+EsMA7lAqcByHiLMzCh4tD4EYGIMG0Ni45ciRI9OmTRs1aozruolEYsurL9133/df2bjBmmD06LFT
+JkwdOWJ0Zaq6vKZCSH7gwL51//5kOp1xJQdAmnjCX7Zs2eWXr04my7s6uvL5/OnTnYcPHz56eC+4
+nDRx+m0f+NDiJcuaW1p6M+ny8mQ+3VNRUXXNNdcIKRkTNvIOwNhvWsK3vMeeU6kSDWIAP8u2as5B
+0I2NW3bt3D9//sK6kbXVNan+/sx993//iYcfKpaCaTPmzJu/aET96FT1SNfzhXCOH2rcvHnzgQMH
+pHQnTJgwZux4Iurq6j5ycHu+FEybOnPVpatnzJobi1dkc/lcrr/ndOuhpgM7tm/WQWnFpZfdeOt7
+4cReb21Lckqn05WVle9619qzc+JvVJX45uc7IOcE9Ax8MAgMALCA3bSpcdu2HbNmzZkyZUqqLLlt
+e+O9932/tbVlxowZ8+cvrB052nMTAMDpZFvL00//4siBvRMmTlyz5p2rVq0aPXpsPB7nTBSLxc5T
+bTt27Xz66XW7d+8eO37ClX921by5C5LJZH+h6Aiey6a3b21sbGzk0r3muuuWLF16srVNa93X1zdh
+woSrrroav1n7GV0MnszfQiDhnILe0ln5/igIvmnjxq1b986ePWva9CldXae2bGnc8KsXamqq5y+Y
+O7JhglJKMOYImc30bHjxhb17doweXX/d2luXLl06efIUzrkQTrSMxhjBHRXqU6faGzdveuKJx3fv
+2TllyqSrrrpq+owlxhgVlnzfzaR79+7edfhg09y5c6fNmSuF29PTk06nZ82atWrVKs75GQIoP1Mr
+IfBWbc45BL0hLZgEMOjSbd26dfu2LdOmzauvr2vvOLl580Zr7bhx41JlFY7j5EpIlfmhyv7yl0++
++MLzM6ZOf997bl+6dNnoCROtHUi9AjDGEHi0BzICGIxR3ac7Dx0+8MzTv1i3bt2iJctvvuXWioqK
+QjFIxH0VloJC/kTr8bau7tra2vr6+q6uriAIRowYsXbtWsYGTOKg4kc78FuY7zkEPWGgQEdKbozZ
+t+/A+vXrZ8+cVTWyprOzo6OtPZlMVlePIGJakda6siLV0XHixz954HR32x133HH92pvrasdE/vVA
+3uosbr61GDj+MA4yUaS3q7Nzy6uNd337W7l88UMf+8T8BYvyhZLv+9ZaR8piMXfixAnXdaWUp0+f
+zufzo0ePvvnmmxkTQRBEucNB3P80nMv/YChsYGvle/fufeyxx+bPX1hfW6co6O3tdV2fQwA8CALP
+jcViscaN6378o5/OnjP/i3/7lVmz5xqyjnQsLLOccwwSEQYr3wBryVpro7ITAAzMGjrd/tq/3P39
+Rx557IZbbrnhxndHMTbORMxlUXa3UCik072R7i9YsOCSS1ZGZbdneIl/+gbHEqzRUvL9B/Y+/vjj
+kydNHTGi1pVeIexPJMpy2byUrjXK85xCMfvTn/6ktfnw7R/48A1r3101onbgCYyIjGAyKkg7Q37i
+AIw11mpHOgAnUEQGQcTMoRIH2/jyS//4zW+VV6RuvPnWyVNnZvMFbk0ymYwi29ls+sSJE93d3blc
+buXKlQsXLvQ8b/CgF3EU3+x8zyHoI60/ebL1X+/5v1OmTKmpHsm59N2YskYpE40wmfCbDu6+597v
+rl5z2Z9/7LO1tbWu65I5U/EXmXI76H6YiOB9hjsetUwAG/hZYmCWrGGcgyTpUn/2e9/954ceefzq
+d6295d3vKRaU1tp1XS7gOE4Yll577bWOjo729vbVq1evWLFCCPEnZnBsRB04ExfEGRo3gO7Tp7/z
+z/9S11BfV9dQVl7uOJ7WmghaB46E64mnf/Hk+vXrP/bhj93+gTv85NBUGw9WKDqCKx3s2Lbts5/7
+m0suuviDH/qLYrFoDDHBHceRjlMsFo8cOdLSfKynp2fNmisuvfRSDMSg2J+GwRkk+FGUFx0YtC0W
+Ct/61rcc158+fXpZWYpz7riu1jYsBYmkp3TxRz/6Yeep9i998W8vuni5NTRUvQ0GxwMiwDLYTCbz
+iU98XCl75513piqq8vl8ZNOTZanu7u4jhw8eO3asvz970003LViwIPJ53sLnDmfJ8mBaHIC19tFH
+/q1YCseMGVNeXp5IxFzXtcZYqytSiXRfz/333ldeXv7Agz9cdvHFAB/CnhKcw5KNCtIZEyCZStXc
+e88Ppk2b8sUvf+H15iPl5UmtteM4xUKhqqoq4pIEQbBjx47+/v6hGsZ/IEMZw7FkiUjyXx8Im5r2
+f/e731u6dOmoUaNisVhEEAPgOM62rZsbGzddeeWV73nvba7jEnjE3RiqPPTZ4byoBUBU7gwEG156
++f777585c9YtN99qDFlrpXR9381kMgcPHnj11VevvfbaSy655O02OEOp9YM5wogJYox56aWX6uoa
+xowZV1VVBUAp5XkOYJ9/fv2WLY2f+cxnbr/jDtfxB8rvaYhfwSh1YweoJRCcWQNLWLVy1V133dXV
+1fXQQw8RGcdxrNVhGKZSqRUrVtTW1u7fvz+dTkd+ztAO6WwZ4tkO9mSKvu3u7r7gwgsrKyuLxUAp
+VVmZyuVy27Zvyfdn7/o/31my9EKAWwspXW300CbjGBgDC8KAcxCgtDUEJsCY0MZUVVZ/+UtfKRQK
+d999d7GYj8c8IiqVSpzz5cuXE1E6ncabp569KRnK6Vqy0Ts+2BeivLy8srK6UCwKIXzfP3ny5M5d
+21UQ/t3ffaVmZC3jshQqxrkx5AhJ1tKZjO6QCIE811NaAZCSE4wlSxAEaS2vrKz88pe/vGDBgh/+
+4IG2thNSSs/zcrncuHHjqqurf0uH3g4ZykqigWOOMUIIznkYhpxzpZTjeMao9ra2vXt3z5s7+4Yb
+bwBgwC3guR7RmXSEJS6HTsui7AFjjnS00UIwMbCPMCmk1pZz7nne+977nu3bp7744otz5y2aO3eu
+53mlUmnwVPW2av2QQR/R0gkD/CdjjOM4UkoyRT9e9vrrJ147cuiqq6668MILAU5Eg8mfwdlFebuh
+EsYgzrzTjvjtuHzUFSfqkDF/wZJkWeUTP39MhYULL7xQcC445xAM7M1zvN+EDB0PhwNnumZFjbM8
+z4uS183Nzc3Nzdddd92FF14IQCk1jB35Is04u2umlHLy5Mm3f/CO4ydat27fViyVCNDWWLJvaz+F
+IXv2IEd10CGz1sbj8dbW1o6OjmuvvXbmrFkAtLaO4wxjd4CzP3owViOlrKutu+2227Sy27Zt41xG
+cZ63dSRDTAYBBl7jyFDu37+3q7Nz5syZdfX1RMSYeMtx8KGS3+WGDrLJrbVBEOzevTuRKJs+fbrr
+um8heDk8gQTGiYHZX/dZYdZGZOAI8YESfXNWy4T/fDmb/n82M5fIAIiOUXRWw9I3/fwzF/+p4TNj
+tRSSndV6lbGB2jPO5UCRya8bbQ2buT87BxvdOXsNzk6Iv62RyyGz9Ywh6mIWaROAqL0wwImirlnM
+kJVCEoENH+4AopqvwSqMKCsbBZ0i3LXW0fWfBr9eGxKCRfWx+A0DikEfeZCrY+0AP/A/X35X5Qdq
+YDgfqDMdbGXC+Ft4O4dA6wNYA6tBICggAKyOgmTQQBh9hgEUoEEKVhRYCGkENHKwnAwYwXIOItgi
+I0ATStxqgoZggIYKoS3IUlTPb0BAACilQJZgNaCiIIyFgQoR6mhyIcECgLUa0AY6Gp0a+EkQYEgT
+QCaingAaAApQgglLgCVmrWWkbQBSimsQBNcMRasNMxCGW7IKrARoAwMYsiXAAFAIoUogaEBBIyL9
+IyQFWKahBjQMsCADEAx+zyn9DbU+tHANICyYhbaQ3ACCWKjJcaUBCbIMpJnWIIKRSJQMeYK7ChA2
+5IogBIQklmMoI1hjuBAKcABYhGfi4RYQIIaItmBDCRcwsIbIZcKAK5AHYoqTgxJIgjkACJaRgSUI
+AQgCDCCtguZgUf24AmOAhDAAAGEJnDQYwCzAlHK4JMEMwNLF9CNP9fzbE/FkInHLjf6ousyTzxSb
+Dssx4+q/+FE5tpZABoIIDnFiYLCacQkUQQDz6Uw3Iw1IaFgL61jLSGrBQ7Jxy/E758U33MQdDgC9
+TMWZ40syjEeHQ9ctEjQsA/cIkFpKRuDMAmVR4wJpOZiF64NpQ5qZMghoGEdwC+LQgBHwokIUIpdx
+EJFW5DArmWsFrOVMQiAEXG0EZyGHywHAB9PQChRxQiy4p6GVgSfAYMgqZuKQUGQd7hgGkIESQhTA
+LadkyMklAqS15DjGQhBkAJzoz33vX/m+XRniYbrEk2Xp53+RKvUpVJr3rpX1tUw6EigZwyRCIG65
+IA3DYpJ0xBpUBOkYYbXVLpeSAMBybSBdxqHxu9C/odZrWBlaOFJbSAbNYBiYAhwICwGEHAUgDrgW
+mkMSAFNkJgYeQiogYQGF0NNuaLXrMDChAAbimnFDJBkYGI9GxQzAUWCI62hcEZFh4I2AsVZwaAgA
+jBQnh3EEAIdxNAADLgMiTxjAVYAzYHPZgGEiIFobCICMVo50SwaeCBg8iyw033+gtHkX19y/aJlb
+W92/Y7PqaHdq6+OXr3HjDjTIwniQ0DBWCycE8wAOhDACTEZFYQQHMBwK8MnCWOI25K77+0z/f7DN
+KhgRCu5awIJy6VzTIaZDXeAJbYoUuHFXckePrPZnTmaQMIBAiWsfQF9OkyZrCzVlHHEO8rOZktU2
+JCklHCaDQMLRBBLSWCvBHM7IKAB9I5IpcjjjgQmcfN5SqAkx7RQcxjmXgeFS9FvjWBGrrMgKJLUJ
+pXXACFIDvga0yYe9+vXeWElZbQwZCRG6XI0orxwzilkbeO7A+660MCoweWNCRinPCO54VheVC0hB
+gZKGG1Hg1iKetG7cC7Tqa0OZj6LrkChCSSmhlcOFdRzlCXgxAlwFJqEYHKsZhyLu/L4G328IvYXR
+ZDmDbjra9Q8P4uUdpVyPTOdcxLIoedIpcss8rxwJmju17NM3lN94TR6IA/Zwa8u7Pyt7TrNiGPvI
+O+v+5xf1/qbjl39USR2DK42rXbckrBsoJhwXnFQYWhW6mqCkVg1f/pz3V9epvkzHX3zbbtqpbOCG
+rlOU2svngqCCx0gbnowByFd6dTdckvr8Z01CaG18KUCm+Pzm7u8+Wtixz8v39BXyMSYdZYkzK5mO
+8fIJ9c6V70p9aq1fUQsIWFX8v4/v+8pd9RUJDWOKgoxhrOio0NM+ufF+rkKueL6UeP/Vtd/7fPrh
+53P/4y4wxw/KA9ttyJKxUkqrFePkjqupWjkv+amPY9woCxChJCChPCOAN2PrOQmXMdq2Z++tn4md
+6HJDW+7G6dO30tJF4ytSBab8fUfUwy/kd+6V2zp7PvBSesf+CV/4VD4ZZ5l8eXNnmG0nUkHrqZCD
+FwrF7i7P91lYylnDoeOwWd9UaCfQYYF7yhMiZ5LgpbA/HQa1RpsXdwf/9mJS50tcUXxEOHWKy3IV
+ruNpzoDu06d488myTmr5l6bxJ035v3zGjcdRDDu+c0/f1/9VhCoekpo6s+bWS+PTxrpWFMJicdNu
++fONhZ0n/b33nHzqxfrvfV4sX+wHJpPtreov2EynFq4dUeeMrtdWGZiQO4Vi4EqvGqyUTbt+zLOu
+353NtB21bjxPVaqWjxg3RisIIYq5rGk/Vdy9p2v//ubnt43/pzvL1qyCQZxIwYILS7/PlaQ3kBKR
+Pd3XMnPtUUw9zCcfGb86u213aEkTUUhUIE1Eff29X/3ejvJ5RzG+CaPbvvhNKunirkNNYy87xCcf
+wYyWD36BDFGg7OmeTE+3OZXJd3R0fuM7B+W0A3LyMUx7bdq1+cd/SUFJtffQyXR/V7YYlIwxPf/n
+4UNly9swuUlOK/zD94pUotCEypQCFZBR6d5TX/ynPZjeikmHKudmf/pEiaj36z84wGacEGP383Ht
+f/13xb5uCrRSRhOFoS5SSHv2HJ3xriO84SimHpnyruLmvZrCnr/7zl4+tRWjXqu8VD30TKiVDoj6
+KbClHAWkTCkMyAZ5VSwS9X33Jwe8sUdR3+wv6L7nZ9RfyOnAKKvJhKdOtv+Pb+5j819jDQcmrgqf
+fDkgCowmUiFFqP22vKHWe9CZ9S+km/aXMUaxihEfends0TxJgApDV5LDXQuqSCQ//+GxN14WzwYo
+Kd/34VFWGtey0Fa5yIBKxC1zJausKGeMOPNNuXvjtebhV/p3b+eAkVbX18Dx5EgBxn1wwVBgZKT0
+TX8OSdiwMHlsdehBWsuVC6HBRDIla0YmwSxC2Z/wjDXF030bnnd5NsM1q5tZ/8GPFiuqSmAeGWat
+IKvB7dxZFZ/6YNfH98SB/KnDmSfX1y6ao13HQTZAmW9Uob/PzfaqXCiVFYLLICw6gjsOjWnwJDRA
+oiRDJVCtOTzHtTEnwaWyxoHgtaMqPn6L2tzUs+nFstcPZ19YX33NsgK3DgnnDU5Xbwg9kTT7W8uh
+DWkkKpOLJ0hSijOHuQSwMGRCBlZ7jqyZNiUQjIEFAAdSGrlcT1xyT4ehsQaQFhDcwAJMcAQJEVR5
+hJyC5AikDslaLRid6T4TJ8aszgWFOOIlW+pf90s60aG4Z3zu5IsuZ6q9K/jx+pzUnmXe0tnhJXPj
+J4tuH4XGEUZXL5sTlvEYGBQBXDtMuNyzlnOklkzPsViGUypXMt1pcLAgCBkvhx/mu7o+8nV85BsM
+wiBwYRlnRaswZ/6UF+8SNfUi4AWKgXwGZmCyTMc45wbOACMc3shKObG+fJPHwfr2t5Yz4UIqZpm2
+VsL7HZPzhtAzQDOCYMJYTyHNTBm3PnjgwLHgjqsMXOFCAaFxjbFu4Fo38F2CQNwLsrkiSinphWSl
+5pDQnEBGQCAM3UAZxg1ZUnCZxxiXsMxoWDd04DKd0bnSCD84Ddew/h8/l3Ne9kt5ACWQgTGkYszj
+JLxVy+r+8U42ZlzpyCmAE0ShrMxr66qMSVgDIcAGXGrLYRCWSr2GTAKelmDMwoLi0iXXwmTdeOWC
+OaK+gVloKMUVt9YPtD99LFIxrUpSxItSBUJ7YKGrE5oBHIYYp6hww3hCSmmtBmOxnHU0Qwj4HBwG
+6ncDB28IvWZIXndJ6VsPhiCRDYPvPzfislXWES5KhgtmBJfcQNk9e7ofe9q0t/N+hRUXV/7lB7UV
+gvsO5XPS0Vp7TIIDZAHtMQ8AcSaEKPGYTw543HCfAxZcCMZgHXAACT+RyynXuEyW1f7N+9zLL5ag
+IlGYzvU/+3Lx0WdFf7YyVY0bL5OLZjngGFGWn1YX7AzLAyfYtDfcuIPedVnkuvkE9Gtbxt1C6eT9
+z4QuE2HJr66OXTBHI7SlMLTGg/LLamq+eju7YpkXgjFJjmDgsEAA7cACsHAKgTDWhy1BsIi6Ipgl
+A0tSCGVYsaTjsL0sRBwQMHEIwBKEZb+7z74h9AKILZ0b++jNfd9/xJh++uULbf9r/IgPXy+TIylU
+BDJU5EeOtnzuW7RhA2fGiOqGqy6PM25C22dMP7O+cDiXHLACmsEFh7VEPBTIOcyYgo8yMprrkBEE
+YCECgThgiMNypoyB0bpIC6fzKy5QtmS5XwlUXn1R9+Uz0x/5ez/TnvvUt9xOXfaV94nqePz9a9L7
+97F9BxgPT33trupUeWr6RHgJOA4cQtup/p+9TPc9E0NJy7LSRXPHvvuagHFfeBLslFcqK6hw91F3
+TH3g+IHVJjAxEhCeNE6pkBO1SXd0gxQ+cxOlUNjQFgX5sABpDskFNLhhiPkaJVdwh4zR2jhSEMiA
+xO8Jgb6xwbFk4fhf/aBoO1m2YTvL5Hq/8E353CZnwdIw5Wge0MHj+V82uj29SIwq1SVGfP6T5R+4
+zkpKVxiDkHEuAuVAAOAMLgEMyhiH8wrllfoZl6ykC6HoTznFMmGJSDDhIeIV85LhypcW1g9VoLJx
+pV3HFwT0g8qSldddk3/+oPrBOscU9A+eUlfM9lcsY+9cWV00xW88aI4czO/ad+K6P8+944LE+FE5
+ARGEbPPB9O4DUqp4dR1bvWzcN/86jCccQmnG+LKK+iDTHQaFzjvvM5+9n3ESZByivCP7tQ79wC2o
+2C2rx//42ypOPAwsc7mnKxR3iReEiQGMYDiEFYmQZVhCIfAN4HAGskTC8oG/CvJHQg/GENpYTd3s
+f/pc7q5H2x5dJ6wubD8a7j6oufVASinHcUWsXMycUvupmxJrrws5dw1znRgfUeuRscVe7lfYwdiW
+gHUchAiKJpjYwPbUlhLcHzXW0Q4CMJeFsCAuGIwyicqK7IhRpR5j4wXJXDggDcaIypiFhSdjl83r
+feQZkYiFkOpEXwAhwauuX9M/sjr9/Udjz23RhUL6mc3cetphOa5jgZHxeGz0SPuB60fe9me6toEA
+zWx82bz0je8In3qFUHTI8UKADOPgzFiy0jLXdV0LmfJJIvQ9UVUL6yMZFmLSIxJMMBOCLEmujCqM
+SHjxMXmb1okK0c9EnGke9UE9Q0I/G+A3DCQEFh4vwDLwmEZJQkA7MLAuGIMycIRmJMDIQnO40CG4
+MEwwBlbMs1iC+sGSliJrYxUMwXFLyPooRz8hqRE6WhSkiGtAWgMrtAQFoeO4ygKFnFNeBmstuOUQ
+MEwLaIIMIb0QcKNRujwK2GgbSukaaGGlBRiP9lgDeMaC8yyjcsNABM5gYCW4tVpAGoApEA+E8MBh
+YAQ4LNO8JOFGpyGymnHN4CFgxgPXhsFAShCREiQUhOKIh/nAdT0UrXFJ+MIScVKWuez3JIfO0b9B
++N9BzqU/1PTfTM5DP2xyHvphk/PQD5uch37Y5Dz0wybnoR82OQ/9sMl56IdNzkM/bHIe+mGT89AP
+m5yHftjk/wEOazXpWrUYmwAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_corre la licorne" model="fleet.vehicle.model.brand">
+      	<field name="name">Corre La Licorne</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAABBtUlEQVR4nO29d5SdV3X3v095yn1u
+v9N71Wg06qMuW5ZkyVU2lhuumI4hgBMSElogBBIIIYFQDMah29hg4ypb7kW2rN7rNM1I0/vt92nn
+nP37Ywwv7/vmt34r9hixfuG71pQ75bn3fu65++yzz977EESEP+t8iJ7vB/A/V39Gf970Z/TnTX9G
+f970Z/TnTX9Gf970Z/TnTecPvQJAEBIRAAEkCgABoBBACgAFIAAQABUgKPXm36MSCkGCQnCVdEEC
+oAMKQQIgAAghbUQABQgzfw9q5lcIUngACqWaualmPgt8877+6CLnb0mlpETGCIBEAIKaL4Bz8MHV
+CCXgFbIT2fTw6Gjv8MjZgp3NTo0ppVxHKKCEK8ZYLBjWdcUM07LMSDRgGiRg6IQwojRUPBpbZIaL
+wvFqpEGBlBJKwBe+p2sGKlC+YLoOQKVCZEBAMND+yM///KBHRAI2EAJgSEkRgDMfAMDTQJ88dfJg
+d9fB/nOnx0cHfQ8pWgEjUlxWHysKM2qYRjgUDnCma5quVNYIVjAidV34XtazU5nMcKEwLkTOT+WI
+RsxoWUXt8qbmi6PxZkWBUCAgACQDDRQF5QMXCJpArpE/NoTzgB5RAgABBOCSgAKkQBiq5OiJ40ef
+fn3ngeHhUSCspLSuvLxxbtuympqmoqIiK1wiSV4i6FrIYFRKBEKAgpDg2D5RzNAoZ+B4Gc9NTkwO
+T/cfHTjXPTLUlU0PGAGtuXXVwqVb6hvXKCtGAZQPGgdABBAokTD9j296/6joZ6DPyFOMENSpBOVn
+kv3PP//r557Z5uRUdV3bokVLFi9eVVreFA6XaSabmJ4YHTs3PXS2um5R87wWAoAeEAZne3sPHjtg
+BXJBK6HrEV3XhfCscGTe3HZKaAYlcZzUcPe57jfOdLzW03NAgWxsall20XuXLNpKaBANAPABgAAD
+6QIL/NE4zOiPhx5npj8AIAoAPNB0ACKmX3v+5w8++JPh0cKqC65ZdeHlbQvai4qjGmcKgREOKDs7
+Dj722H3VpcMXrf9s7ZwVEvIMjSO7dzz30i/rmsrmt14SDBQzHnL8XM/ZkwU3t2rVuprKZgUMQRGg
+0qX5dGZ08OS+Aw8fPLhNpFJLlq+/+NL3Ni/YBCzkKQRQjDL2x6HwB+J/tHsiM68yUTM3DeX0du/8
+2Y+/ufOVfRddtPWOD94yd+HSSFEJASXR9xEJaCiAU9ZQX11WGpozJ2gGUIBSEEhNFU737A5FJ2+8
+4SNEXyR8SkDnmlbV0JBMjYWjUQmSSwTCgHKhgVUam1N6QeWcecsvfF/Hzoe2v/iDIyef23DRB9dd
++KGK5kVImQD4/zN6ACCEzLzFEPGxH33s3p88XlS58O++9NMLN24OhkMECCASjzLNAOojCGTcl6AH
+ysOJVpHsIl6GYJaRaMwKNdZb1hh1J9EoC+scgAglnVAgGDJaQBGQANQH0EDBYFffmTNdNdXlrfNa
+5s9b0NQwZ+Hqq7c/9r0nHrr7jZd/u/myj1557ce1UPyP72fPosGxhSSMGr/nq1BRQuFNK+MyJAA6
+EDHU8/q3vvJXr+7t/eQnvnTFte+JVxef6RumXn7u3FJPFTGqlLI51QjoCICAFMSvf31fIP3D+Stu
+LWm4IhxrJQCp9PjwwKv5iQOKt0WLWiOldaZpDvf1xSLBmup6UAZQcACfe+axE0fvXr14vhkqK/gV
+4Uj9qoWrSdBKZdJdh1958N6/Hxo8ueKidTfc/s3KuasMBeABGCAJUABUglIf4J2aA2YNPaIkhAEA
+IiglCQMAIEAEUq6AEAACAFOvPnf/P/7DVwOBpm/+2z0tS+Zm0vZ9P/n3oaHjH/v4PzbOaQdQvgSN
+0tOHTxWXhBNlRUyzhPAP7N+RqAw3N8xHNAE5m3kxOaBTmJgYSE9N2q42Njx2tmP/ihUrVmy4UnLg
+YGen/X/95w/f8b6lcxo/lKea52s9Ha+MDXUtab+8um6uQuKk8g/+8p+eeOS7FaVV7/3g5y+4/AZJ
+YhQAwPelrTFLOEwz3ymvc/YMDjJEQABKgbE3Hy4iagCoPCC6EMn77vvSf3ztB5su/cBn//lr8UQZ
+UMjnsqUxvTjqOfn94LUDoaCpBx/8/vhA7223fITpVUCAIaxu3zydPNpx+OWcO+WLvOtnIgYNcS0Q
+jWjl8XqTB3jEb6tUG+6wYmUCbAYUZMgMiYYFTSQQIFpZSLeRs5Xt7zoZeHHnzofW8xtLKhayePT2
+u77a0DD/vns+9eNvfTTrJi+66k6dR4jydWZ4ntL1d9Agz57BQUAAQmaW/FQpoJQCALgF0K1Muvun
+d//9L3687a8/890b3nubGeAOoI6UAZ0Y6t21++6AMb16xSc81rzn1SciRRVLVq5gXE2MnBkZ7uju
+3e+TdIQFYoRqZjTBin1E0P1iRZRl6QZqVkwrZno4x6RtF2TKiZrW4nCsXuf6xOCZU6cfXX/B3yor
+aOiUIHEcuP+Xf91YU3bxpg8Io0wCNcA/e3Lnt7/+waGRqVvef9c1t9zFWAlRAKgEk/wdW+XOGnqp
+gBJJiBJScmbOxE8IQSBiarLzm1+/64Und3z5Hx66+rbrPZA6ZQokSB8ocR3j6NHHh4cfiIWXoHfp
+gmXNOi30dL9y+OiTvkxHtMSSmhVxWsSmhDU0qsaTji2J4xuFTCGbs03Lsn2HedSIkkhIVlKstmTc
+yJHJflqIFs9Zsuh6N1/o6uoqrZ5XXVPr5QqDfQOvvP7lha1zLr7482CW5X3HMEwGMNZ36off+nBX
+x66b3vPpK677nGElgIICh4I5K3z+b82erQcA8AkoXyiNBVCCQsE0TE6fu/tbn9r+6Otf+PLPt7x7
+q5SSUaYAqACfAHJgAB0njoxOHVrZvkz3IruOP3308PMBBvObNjRZi4PDGXL0oOg8WRh37HmR3P6j
+gfEUD3D0hB8MuAUMA3MDqHkeczyMhVAaoUg1r60ab/KnKuwumkrUbpozb14qrTl5M5MfHjy1s6qx
+cNEFt5cUXwGWjyCkCKSS6eLi6MTggZ987xOnju694wNfvPiazxPDJFAAYs0Kn/9bs4ZeIRAiCCAi
+JcCkUExz87nRu7/9+W2P7Pzbz/7r1TffIgGIchnhSjGKgBzy0gkxXeYooDp47Ge73/iV8s3N7Tc1
+QI3e2ZPZ87Ld3a0KjuP6ajqtfeoaS2eF+5+3T/WJoOmBqpO6w7WU5xnKpk3V2oXr1eCYPHwwb4gE
+rYXKqNtIe4xcsioUX3lR7ZyNIdMK6tlErJabNUAM13d0TR8+1/PUI7+87tZrikuXjJw7fu9/3DE5
+0H3ze7554dV/ITl558JqsznqEZCgIoShAMJAiLEHfn3PQ9/9/m0f+/K7P/BxBQjSp4wTkBRAAGdI
+CAAQu+v4vtdevDeZ6lq84L2by1ekD+2y97zuHDuDU54v7FxhPBAEmvKsxubwP95uMzf93ce142My
+nTYMhb6gRUU2iXQ0xCI3rak9PR64/w1JHdvwOY8DhIPVxlhR4kjRmLekbM6qGxat2FoULAcfUPMU
+0KlR+siDX6up27O4/VpurkuUtAz3vfTAt95nj6c/8He/KF15bWhW6PxXms1pVhJA8KkiFDiS7Buv
+/eJbX/7Kxuu+8MlP/KVEh1Hzd1FiQMgQPyw05dvTu7b/4uWdD9XOWXjjklvivV7+qftGuru80TFa
+KKDvUUqVUkiYxwt6ilglpfoXbtHWluYffij5ekrmE9wklPv7AqGB7ATNTiesiuU5r3ygx6ZhadgG
+0xghFjG8sprhEO5uHMMVKy7beOfC+ZcB+Gf6zj7+yI/j4WPv+9j7pHfhkd3HoiXVdW0Le47+9uF/
++1SsSL/xk49VNS0qgG0hA6khJ76wdWYgoW/f5Zw15wkBiSIIQCgHVCPnjv/nPd9rat30ntvuAKIo
+mgpdwlD4JmNAaERokJ0auP/nXxgd7dmy8UNry1amnt9++uWnYSRpTyZ132EoYeY9RBghJODG9VDW
+nRzy7n4kFNta9NEr/cX9fTsGTp/Mlc5VJeFCyXTQZqH9g7aplxXbueDgdJb64FBKTM/0xcjZCs26
+ZpwePrvn0ZGesasnNq+6fcfrjwXx6M1bru05DiUJ1dC25MDBhzU2PX/BdfZNg7/++WdeevTrt975
+Qz0SUwQpugp1jQdQqlkJO8waekUIRZeBAQDCnX7kN98SbuTjn/nnWCIqfWAaSPQZhDgHoWwuA8mJ
+zu987y80ju+/9vONqfjkT36S2vkCm0p6tgpIz+BcoRCUICGEAEUoaMApAYviwFTy3p3nRhbWLEo0
+X+if6nkxEm9au7JhrG8s2li3IVzy0A9fe9Yv2YjSnJ5gjOR85UtBqAz6GB2hK3LAxwdeGf68sOlV
+Gy9PZyr14MrccO/Y2N3R2ht7e45ZTk/DnOXLLrmtv+/Q0dd/vX/u5pVbPuABMTVGlQJCCaMKkMDb
+HfezFrigAIRSqQSR0HHymVdeevXdN3ymoq4GQAJSAAHAFQoE5DSQTHd97+u36Rh4/5VfbhwPD/3i
+ntRLT/hDI8T3DeUbBCgIoaQiAJQQQghAHGXW00xX1wM8M5H62bf2PPqDFw0hb9zS2lQbLwR52eJG
+20kF3YGNF1dU33mhcfEy7hKBQid+SGoh1yBZJ09sfxpW9MCmPbkd9376WM/e6tpbMNESL6nQ9Awn
+Qw0N9eVV5V7ekUbJxdd8rLi04pkn/22g+xCnAEAIpVKCBAVqFqz0rKEnCAI454jOxIMPfKe6dvNl
+77qBEwBEpoGUhBEdMUcAc1PjX/+X96lg8NO3faX45GTfPf/m7NnpTucVI/lCWoDwQbhSCIKKEkSk
+SlKJynNDWJAlFQPFVYcNM9HIV1y8ZDwPQxOuVkLjpdWjXckze06fOzEs0kMban0e09LFCTdgGaCI
+EijB58y1wDN8N2LXn8muO5je/qO/f37vTzWAWFEZiLqqiLlp/fsa5t+qmzEFEK1dtmHrpybTHbte
++Q16nlIUAAhVADATm3qbmr1wHQFUDiDbf+j+I4fG3v/hL2ghIKhQcV/mGEPPdTlElTv53e9+pDDm
+fuL2u+XxExPb7sUTh1m6QD0fPcGNsNKY4hwZp0wjhCmlEJESzBtSRaPH2+rO1BSK2oIfuaamsaZE
+AA2ES6dOFV79zhtjw65lWdz24vVVmONOa2Rw6/J0eYWDKNCWqoBckQxwkstLQ4Vo+0j0wmO5bT+7
+a8e+J+KxIh6sGz3XqQfjGKhHhhqAB3rr6luXr177yrMP9hx9hVJAREYUoJoVYLOGvuCjRkHlBh57
+/NdLl92waMVCQEXBAKAaN4T0DSMAQB781bePHHj1Ux/8l/LuyaHfPuofO4V5x1MFghCgISCCKAKK
+EEUIUpBKKUUIAkXLB3/NRXRN5RV3tG5Ybwjq9HaNlQRCU8n+wy+dnkix8jUrqxbUsgTy1lavch7V
+TJOz8EROEzTALM4VMMGozmXIktSz9YzKXJCtXNcZuf+nn0lODc1bdGXWhomR3ZQAIRwFUvC0YOnG
+S//KYvLFJ++dmBgAggjICP/TMjhUI+CzQ/vuO3XU/sTffRooMAKggDAlBApPBwUH9//24Yd/ftNV
+n01EEqOP/Kd2sh+Gc0pgXgZ83ZQkG0DFFDAEisCBMEUpEKBEoBCUBpdbSzZFROvm4ztHCmmMNjDb
+9woDmdr5FZv/6oqioIlnBrI+lCeWQOeJbU+97O84WjSd9CytoDSFlPmuApnUdU2mQgFum9Tx3HW5
+eNvh4W/84LNoBhYt+Lg9HeVSCXQpI5oEQNXQcs3mDZv2v7H95Il9ClApBWpmU/dtE/vv/gO++SFQ
+eaAAJQDYSvomAvhjDz7+zJpNN5SXVgiwC+ACgZOnurY9df/ZsQ7Pgx/f+9Xy+vmbl1zHH9uWPnVS
+TQ4KWlCaCBLPQOEAVQqUVlBcMQWKSUW9AIJEBqgzDLu/fgN+1nHmyQP9rl9UVZuX5rmHTqyy60v0
+kr3P7RVaJJ1IMF6PWg2pK7rhi9eXzi8pEN8oFBT4gJyjQYHoys7r4RRI08OcynPHeZdfN/XqC48/
++y09SmvnLkLMIxhAAIguKPW4vmLrJ4uLiw88+qvsZEpSJoQEPgs257/tXBKAGReLUA5vPgBOmQbg
+7j/0yNlzY5/93EfHzo7YEiemhzoOvzoxcqqhpawlfvXLL3574tzgp9//aa3/wNTON9jZNKYks4JK
+eiFP5MERGrcLkmiEUaRcE8JnilHGPSUsxqU2Dqcwf3wisWGi+fM3RRraC3tHSgbeyGVHt+/VR2Pj
+c6MTFKBow2VTvqOnp01BxxsaUq1u+Ey3IfPSMAvAgoIavkACBqG6ROEJn7mGH1ovi3Y/dt8lS64p
+q2gBaWgEUORTyYkdu5+vq29aumDRRZfc/Nvf3HOm49iSCzcxDRD887KkEoRwAAagkCBSUMgIAsX8
+089sW7zk2pLS0q9/5f26ppLZ7Ny54auu2tzSvtEdn/7J/d9YOHfT8pqF/UdfyhWD01KuoJzlXXds
+0C7VHCIsLRKiMVqYdKYydtb2LUo15vuOxhlxpUsNnRhRFrJz4Ftz3dH+qsGTNjhPh+JuSHtXe83Q
+oW47WFy1pZiVV4nROUNdewsd45plapEgTqYEhYCthEG4Cw5BQwESQJSO7xq2t84Jn+rrfebpu6//
+4D9xN3ji5O7ujoPpqWFu2hVlLtAVqzfc/NiT39v1yvbG+Usi0SIK/G279W8BPSpCAAAUIIKgwJUi
+lMFY966Oru4v/+P3u7oPDQwduumGLdHYknh5qK72AoToo0/+bTLp3njTHamOI4O5yYm2oJeYaJ3b
+xtLe4NF8JmKGExGH6oJquXMq7MQjPUkYSBLXJcJFxTwaMB1ND2kDddEeglP/+gBL9ReFo23ty7jX
+8a5KLx5NdhfonGXNNKKiWmzCJ8XtF0defXbqhcMOFZaV0DJZokvqC8WpAKkhehyQUYUq7eaqC6G1
+oZo3Xnv+7KXvqk8s3b3r+Xg8tnHjlmS2IxFmEkh5c/uK1ZfvePHRa2/9QDAWZLMRSX6L0ywiECBA
+EIEwSgj4e994PhpumTNvbsbOzl90WaK4LRRqs71WZNG+nhO7X3pi7cJLqylRe3dXTp9pK463zmsg
+6elClMVWLbMnyOjRiZHJzMTEiNZS5WxdPLShTiysZ3U1UFwUL66MmWW8unggWtpTxkJLiprC02Wl
+CVbH822pmooQybkdEyMlzVVlbS2yJD7WddQe3puY04YtDaZu6DlH2C5yqoIBiiAJUEoJgqTAgOgC
+HccpOPkFfmli0t+5/RdWUN307vfc+O73VtUsG59IKt9A1CQlq9ZcP508291xGqVEmIVp9i0YHAbw
+5jqaAkiBnKMQI3v2v3bZZX8nPLpgwfLi4tInHv9OU7298fIPFyBz+uST09PT77pqixoexWOnIduj
+xUMxVyucGQ3UVJG2po5+DJJAbQpKesbpTfXWjcvOllf1y2Pq3GikuNwLB+0kVf0DMhEI1+aqKwJ+
+HtLTNvULZ/ZN+XogFiyKaWbVisuKF1wz3nXGLfQZoaLkyOCxXDZRWlpvpwqQk6YlC8LRNFOCQUFT
+KIkiCLqPDsW8Y5cqaFXF+w8cPLv5VFPzRQD09KlTtpMtr1rAiSkBWtrW1tbHdrz0wqqNVxHLhbc9
+8N8KeoUwk2lAgDKggO7Z3j1Je7p1/mLGkTO9uralqWm+k++xuJjMju/b83KibH5jrNo/8qKYmhQj
+rtc5ogAMLeCc6jb6BtdZQUvXIZNSuax8cN+44be8b0v9+xtfvfdXKjdup1L5EUlDsGYZ7cuFH3iw
+N4L+qvZ46aJmmh+I14YClbV+OpVoX6es4Mj+l5uWtuzdMbH/P/+phdSGHZmmPtG4KYmv6coTSAgQ
+IkExJAKkoFSXoBw376TnxKqOTRw/cvi1puaLfA+Tmb5ENBQpah4aOM3NQFlp2cLFa3bt3m3nC5YV
+fpvc4a0YHIQ3bT0qAEIIgPR6ug4GQ0uKS2s4kwASFFu55F2F5Ejv6QPpnv6xM52L526IFcb8jn0y
+n3KJx2OGb+l5SxNhbkIhnh8Tk715SIugRnPpwO7T/c+9Gm4smrt+fqyIzm0rW7F+QbGWJkFYtKHt
++q3Vy9ZV1LTEWUU4FMNoe23jtbeUffSbNN402vl89erm1HTg8OPP8BPZefsHrIlhBqgpKwWK+V5C
+ckWJz8ChSBj1OHEMSgDA9VNuIU5CxSx+umuf5yfzmemR0ROJYPj4if7HHvnpnn1PAWNt8y9KZc8O
+9veAnIX9k/82ekWAEJcoIEglgFQAXJ44fHLO/MXhGJFKAOicCqs8UFx/5eDw8d7RXXk/tqysOXCm
+z5kYKEhFKRWKmTzh+xI5B0ZzwkBexl1NAPfBVn4knDMKrxyyz3RVtK4qWdpetHlO5ZzagYODVkZU
+NsajkB3on8i8eiq0rL1y0+dU9RbLqJSDfZahFy1alMvleFXDlSwYTZ7LUptATEdNZx5Q13GTNvd1
+L6MzQ1Aa9UhCcsmygkg943LNrdNLZU/H0GCHg4yoCd9NDvXvblna1r50I6DRsHAdIXbv0QP+eQka
+UwKoCCFACSqglINypifGJ5etXabzMCMAEhShJosvW7ouOXzq2e3PloeLi02zMDqeH8twx9MoKmRC
+jGpa3LIL00GLurLaGVPlMcgaLtDRosrT5+S5lx4KyPzcpYXisUDATzd94m9e+/w3fv3tnS2LKqQb
+9XPnjMai6gtvNOMNfa89NT64b+mlN+TT6ukfPchH9FWRYrdjd46QOIazzNZ9l3FLCvSL9KgrWMHx
+sCCDmOeaDyhZ0BSa4xacgh2vKJJ50d15YO3GJStWXlEVKTKtShpMgOTgY3V5UzwRGx3rkD5ob3vc
+vyUPB2deMKUUAFFjk2c8TxUnqmfCSsoHSkGhKiutikWLRnv76uO1Qdd1R4YMlxjAOFGccKoHJSjO
+uUqlYlzly2ofZ9HHQ6xrSVEq4dGJc8H8WcPLuX3ncp2DOS8V0Y3iDRuP9PZFqqLldSyuh4Jtiyyr
+Pu0nef5YWcjNd506uv2lwV/uiT6xt2rvybBtOyYK6unMs01PpRxvbiv7yG2eVZSFmGElQsTgQgY4
+DSsMO75SIp9OWTRsyMBg35GAoerr11iJxTQYl4RL8EAXRtCaP39eX//RqYnetwv+rUyzCgmlCACg
+KDDpTg8OnopGEtFolHGQ0meGNp0c2Xd4/+UXXzky3GOnsg01tUY+n5kepx7xXFvQAtc1AF8Q3/aD
+1bo+3tL8QNoew9Hrbl2z8qZrPYU5z9SCAZicTL7xbN/eY4d3jNPyHw0cL4Rp6OTu7NyVft01S0qW
+XOhX1pIjz9L0uepV644d7k298vyKwUxkLJ3XHY+FlZJUKswqnXOsivq3L50Mw6GSqcWXrx8em2Cd
+HfW2IbI5m3o5HUAydHMBYhQZJdMjZzPpsVi0GQBc0AT4BtcVINODdQ1LHr7vcT83CxVA/230iIQQ
+UKAIEErA8ZLjY+dC4VI9YAEoCS4D5rrZ3r5uzyskk8N+3k7oEZGaLEyOMV9Qg1OuSYkcAshB5dOq
+ofF105x0Bj727iULbr508Nix47sONs5rrljcHptfW778M5V9Q/3f+N6j/7r9mtsvLfvAakPatfPn
+TE8lJ44daame54nkqV3HD+3pja+8ZFllrbQPedykAZ17IqhAeJ5bXoRpKLrx6pI7r+ve/tS8zZVz
+b9kyVXBHH90+/sJxLZXhvkZJIOc6AeFYiCEjMjI9lE1PWwFx5uxB4pb7YE8MjuUKE5su2VJeUQU0
+nytMnQf0M9mTCARABwVS5nP5NGdBSkwEojELJLUC0fLiCukqqfwwD0Q1U01NoOMCUcABCEdUksTN
+7FgwFnreKupMT12/OLrylqv7WOWPvntPyaBXOxTr3f+sG56INsyvWbnsPV+8a3d9wptObvrmd57+
+yO0PfO7FihJrRc1IfcNyrapMq6hP7R5KnXk+cao75EY0AtP5fJlW0mtJd1l50drayXFvJD89/IV/
+X7GmculVl0Si5acee0h7+URkMOcDAcvI5GxHKCqVQKFrlu94vl0o5LM733iWJQ+UVJRrzK6ubg6F
+buCkOBA0PO/tk39LziWCD2+uqMBz857jW4GoaQQQUaECACXBskKU0omxAc0D7nhQyGsShHAd35GC
+BDTquxMVReFkU/tvRzK+NzZ3w/J0pNZ/qeuOjLV1sr/mpZfNHZ3qlCsGOqe63yjkB9f95WeLF5Qf
+/vpXe7oL58a4NyWMoO96QBgIVJFx2ban0xyamCKWpF4pN7us0Kv1xc1/9xeO8Is2z2VVjPd3Dfft
+d6MtetXCikBQjvSn89MFyxjwcp4lPQBXEAlENw0hRCaV1ECPmIk5cytXrmm99IoV9U0RoH6iJGEG
+/bGRrreP/q1tiwt4MzEIfbcgfBmPFfnCUUgY5QDANRoMBnLZlOunDaJpQmHBFq5HCRq6JnwmHDvE
+SJ9pbQtr5dWZm1sC0boqp3fceWB7+MQBGQ4UPJP0nSuvXWHWraheeVnODDCJJWuu+O6m9/aoxUHd
+zfN8Hg0xPaHZ4VCAQpnj90oAbsJkLuCHpyy4QrvpI7fGzqXtX/QlvPq6f/uoda57cNezJaG6Z3a8
+Mi76LnrXsqHHe6aSHgnFsiJHCGZtP2S7NE4pp9lcyuDBxa1rSquvGhoaikTqenv3U10ELM3iYZGb
+hfTj/z565is0OAJQ5RJPEV0HGkwE+8f6XvnhT+rb5nOzWqeuwywtWm7khARJQKEECcgpMqkY6C4w
+k5mp4kTQP/eeDc0VC2px0eqis44z0j0NehBozvLNgmElC9PjI8f3P9u0YpVrXqlX+9HagHfijFUS
+mRgKdHfKORMnDX1BeW1xuuqUXwbGhOQ8QKd8rC1uu+KKfFyeffIQZ2Lwvgcj1BpbPrcsHxg8PWA8
+8Up8IJ/esEY0uvLYaSncIKF5YnAlhJbjeh2TPkIyTXOewVGE8p6f9b28E5JCRK1Sommj+cHzgB4B
+KaGAAIiccqWU7/uUgXBlrtB9rm+P7Qviik1XfyrAbQIaSOU7rhCCUUoI8X1JqeKcM5SF8WTzyqq6
+5fPMigp48VjPz58RPaNBMyhRaQUJMXPs9Onq5ugp6qp5c5HuCVa3vecfvzB129fPjOvldbryCyf2
+Hqm4cGts8RUjnRky50RAxJy+AZ3TMbvAsyqYp6qch6pC9qHRkZ/fL56tGeyaygeekQUnoBmp6bQ3
+NAWoI+Xjvst1hQxcQoFSkICeIp5nZ1IqnnCcjM55JjfhehkCAKisgH4e0M+UKADOfKWEMEqp49iO
+46274OblK+ZnMoVssp+HKzXKQCrhuwSBESqFUkIQRAAQSuYS4WQpK15UFW9uVJ0T4sG98Oph1A1C
+JdF0knd9ww4pL7N9T2lw5cjRw63riyaytPLKO+763uTXP/WtmsiCktKEMzY62flG/dYvLbjeeEN+
+VTAW1lpgpC+Vnyz63m/51z8aX9U+pvJaxHQOTfg9Q4JnrQJ1LDPn59MnT3GqKQZKKo/znOdEKJMs
+4BHiur5y0eKc+m6+MJ1MTkxPpez8NBCXAFAKvu+eB/QEGP6Ov0LgXAtYZio9ufmKtaHACmA0VKYR
+hEw+rxTRQiKbTfvCZYxRShnXCQhEonwhqLb04oVFl17AsmLgty+4ezoDlqmbRDoOKAa6qQtbC1vu
+dL7oyNhQEM9FGqqv2pjTEvFrttw5tLPzGbu/Y2LehoriqoZUx87pPa+3zy8Zq5l2V1XCi9HI/sMD
+ZwZSf/PLki/dFprTkmW0dlGjODnVd+Cwn4E0o5Jq6AtJUWnUcQqccAHgE+IzExhHSgjoiDKZnZYj
+XmtrWyAQBqI0Dq4PAGxWUsfexiUIAaSMapqm5VIZx0uGQqYDLicxSqQVDhRyOS1cyTTm+T4SIIwD
+5dLzEaRhGGI0FXrxuDgxOtE5bvb2BXQ9p3MrL2xTI5IownXJHIoQjNido5wVJr1HErowl27yeaR+
+/eap4WeYHiltDhYKk93Pbttz347GeY3t1zVk5qZYLloILC3b1z860Dn54S+lqqrja1oya/iiFfMC
+S6qO/vh5O52iEYszzfM8F5RLacBHRZlPGA9EbI0gA8oMIxgqqa7WFZnbsohhcPmyNSUlFQPjE8Kn
+SsxC+OytLKlgJmMVgBIghDHGpPKEcDwRMXkQXABKqaYsK0SsBDO5LRymcaBUSvl7z0BnKnd4UEGv
+ANDNsBbSqZ0mLIJKMkBPCZ9xoqCgpOBUPzkpMnzk1f88vHL75huXuZreePVSuyXVcfjk6PD9kAy1
+rVicccRj3zjRsr6svb04UxlGo8J6YTolkvGhpP/4UCYZmrozUX1Ha/HgxNiTr3jSY4pwI1AQvjKD
+Kuu74BkaZ+GwDRlFBdeDlGkLFi3XgUrUgJCm5kUAuu1lhU/isdLzgB7+901JXTcty5SyECAxjWkA
+DjATEAAppSoQ0fK+O5lOYjAUCFrOdIYxVJIJ4SiDaNSyqCWpcBWDvB/SrBQIU4BiHiFIdYvk3Iil
+Z0FEPZ0O5Q2bvtRzLD/WXV25rHhZbSJhRDhvbFvf0ZsrjvQ3xXlhuPTlhycMAc2bS/DSssG8SZ86
+mKRJA7u1NyKqqSI/f8Gi6941efjc2TN9QlI/BJ5C3/cUkdTQSDQMljFVmNICvChaAgoY0YAAAQrE
+BzAVQs6ZmpxKFpXMAvr/9pKK/AF5KcEwjHA47HlOPttLiCuBKAZSA4cIpWhpUYtmaqlc1pNCMw0J
+6PtSKcU5D3lUSDurlK0oJx4h1BM6J76JgFwqrpTjaUjRtbkvXI0ZOKEazFWXzQvGSsPJvtzhXcmT
+Z82AVbqwbMkH1vdP8LHT08tWYHVd8I2XJ8cOTsOistimSq21GlR4ElSe25nBtHtgtCscSIXjadA8
+TU8RH7gCLy+Z41AwYmEWCmYKWc4hHo0TBQw4APUlILiIQAhkcmOZXDYcOx9bJYhIQCmQCFRjADxS
+XrvSzw0ns1lAg6KBCAyEKYFSES6dY9YWDycHfR4AK8ApEgTFBPiaAGZQU0fQJKBigghFHQ10J+Ci
+7StquEw5hvA5CQGl6ILicsu85e9dGWJFh9J+cUwzWT57bvihu19VA2NtCytzBa4XqUUXRMxSObJr
+wFCryi5a2Li2NNzUEistFYn5r/VMJbPddCJ1ZPycR4hPqOuJPKUeMX3PIFosWFGdj+ZcZ7TYmkOj
+DZICEF8IyrlPwCAABPLDPQMWT2hW5Dygn8nEoZQqBQDA9WA4lADiOm52Zq+YUgDkQDkARiKJ8pr6
+8exwzskxKywCBjJOlSSMKoaKIVBEhkAJUAIACkCzCeOmAgxJbknuMj5JVIbTVCQSuLS6fvHGvo7J
+gV5HllewUCjeUHPo4LGffP/X8bKqstrVKhysbTECLjcryksb1kfn3KjKnNJl1aOx2IAYi5TL6nnL
+Rk50h5CBBEf4ilJXqQIq1DUZ1gKlZVSFkumhRFV9MBZBCkoCpUBBAWgKFSA53XmkaW57RWnZeUBP
+CCAoAEoQECSgEQ6XBSPayFCn8Nw300RmOjaBjEaKGxcsn4Lp4eQENyLSMFBjgNKRrgCUBCSBmWpP
+BTBT3qOIqWEwlDc46tMMUWC0oBNlqknPHCZaZWnZktaInYvUWOHmmur26O23tunZ1MjQZKTOCFTG
+bWEhqtKV823q0XBlbEFJOtRduYgt29r6gX/9cB9LnHhxt+lT07A8RvOoXEocwCyCUVURqK7NTqdt
+J1XbusKwTAEAhBH6+6wv6qWnT3cdb12wOh6NnQf0CKCUmNmhJYCIwI14RU11b+9RKRxEAFBAAAgQ
+QM54TfMiWhnsGO8jSrf0kKKUcgqEAFEIEohiBCkoOvNQlEpbNE0zBZxwC+MkmylkczmZyRUmU0Zh
+/JdHQpnMnMUlbc1WOZ+TOYn0VKG6rAGtyHNPHde0rFL60JFMXeVESUsxU5A+9ppZ3rr6tjWXXjfv
+mo/eMTQ10f3UIZbz3Zwz5eQcxjzCbF9lhcCAGW9ossorh4cPxWPlVfXtAAAg3kzmlmRmhhvsPzU2
+nmqav3SmLv5t6q349eQPplqlgNFAVe28zhM73HzSCEalkgw4KiAMlIKqugWVixafeuRALt4WCSXs
+yTEBwDVGhfyDS1HAN8XSWeabLFGZN/O2P22Drwfiflql3LR/ZKixMx+sDy587419z00c2fZaCAXU
+SUkUmJ6UJRMdyfSZ7poLS1XF8kDxnJM///HLO3ddcdOS3lcOlo/0nnjxZRx3bdvNuF4GkBBUSqFA
+AdyqKCtvavOJNzCyZ878K4qLmgmgBhSkIhyUYMQAgnD44KsEYnNaWuDt5569Jb8eKNEAZ7Kg6Eyk
+sqJ0Mcon+86eWFxaS4kOAKgkAU4plBbVty6+6LEnXz+aHlgbipsBw/YKgIIDUYBvjnVARIIInpTE
+1KcjZkpXZn1V6ZWXoJNRh0eDngmpcRYMnu06Hp4bNrTa7Z/5azvnTYOnT9mL5lXWXNWAFeXO/l2J
+uGjccmf50msnT7/S+dprp3ecGR/K6yOpsiPPlgHf0dFh2zYQTVmWJwVIIAhgWfHGhobWeR1nd03m
+x65s2xCLxggoChRAgVRU5wokkeK1119saVldXBafDfJvYdSTN3lRAvimvaKlpUvKyqJHj762aNkm
+wgMAQDlRiIBAqblsyaU723/z8tEzdeaSyliEOdLxCkiIQgWoFFCJKBGFkr7wS9Yt1a9tSQ2dxnNO
+9cZVkfa2kUcf84dPN9ZdzoVre0l10Du5+1Q6l9NDxdLLZDCPHf21ucaalvLgpctOPDXVv7+7bG7P
+gd9+/1xP7yWrVp9KZorKQ8nJvqHxXMoBTeO2L4UPEtAk1EcMlZdULV9Mg7Tz1Csl9csa5i/nGkiQ
+VFHCKAgQDAji4JkDpzu63v+BvwiYXABqbxv/W4jhEERCEIAAIgCRBEg0Wt/cXL9nX7dt24FgQCqP
+czo+Nl0oFBrqG+e2rFy6+cKHj/ysx0nXaVqAGjbmBYBCVEAESKlQAvpKOVL6Z4ZbwhsuuGmNeKV3
+8oF9/snpXOdQ7mhXodIgbWCHSqZf7u54cT+JBER+yrMMFNaYL/c/dMhqqWv80HUl49HOh+6pv+KS
+VVtu6D1YGNpzIpfP5Wl2UtG8sONo5H2pCEHGhO/6EjRdr5zTVLt4/uBo38joqc2b/qGkrlahkERQ
+qiEAIdQFxyLmgX0vOB60L1ttaJoDUnvbYZy3kuQNb3ZYmRnzbOa7msbN+w587dCBl1dddANX+pOP
+/mrHS8+tba8qvezjZnV865bP7dt75qnn9i0tWYuRrMeQ5JijE/AEKOJw4ipJEcHUMoOTxz/9y9KG
+Go+QwYHh/C8fB4mI6MqXNMtUnOdtFxkFl7p6yPcEIQU3RLsGJsY///CWs7k5G+r8Va2Te55vveOz
+6+8Y2LZ950GB9eCmNDMK8QymCroKiJhwQdKcTTWrYX7tmpUlsdKXtv1HUWNb+5JrDIOPjw08v+05
+IzS1fMWV9U2tQeAFZ+rZ5x9fvfzq4oYahbpBZiG/ftaqShoaLq4oad372iMahb1H9r7xxhMLlhoj
+qfHOoU6mjFi8+N1XvTtVwp9PHykNVChVYgNKVzoABQpEgCQ0SZVNADmdmJ46evTokSNHJiYmfCEd
+4Wc9xyNqMpebSCdt6UvGHKVs6fsAKQwZboRoke6p5Eu/3t17OBmrrY3AWO+rT1aAu/RDm1bXVGU0
+ZBxGWQr1EGM8rTybex5YImhWtlUsbV95umv3meEjmzd+fO7cuU4h+coLj6ezrwcCIyPDr42NDQDQ
+rkMvnzzZv2XrDUHDkFQQ/BMoY/udY4JGqHxB2yX59KFTh3eEo1FXJRnJzVu8dn77qonRse3PPllW
+UjH/0gtfp8lDKTcUitg68xUKYBlQKekzxTSqFxh1pCI6R8Jmytg9lA5R0tB9xqTGBecugQKgTdAG
+VSCI4I5zDxmNsfDBvpEHfvbaG785cfzweDRRNj7VG4oMbb11RXNt9ZhtS1/ZUkt76Ooy5xdUgNWv
+Xdx+yZUBK/zss99fuPwy1yl/dvvzlh5Yt2pTS0OL8gglBUPn4Oefe+RnTS3LGhcsMk1OAED+f3H5
+I6CfESIi+M3zN5RXhl978ce1VWVr111eXLRC18r7zvRk8jmDaOdGR5cuvcBcOv9+7EiDa3AjSyEv
+fUK4w1leIvOo72FeSQ9BUgDCFCU+IR4lNiM5oTwAlzAHwFHSA/Ao94HYxAfi5UXB5YIw1Xvm3MGT
+GXtsQebgqURzoqapqmzTRXEvwvSQTtkoTTpa0FHC0FmsOjJv/ZWL1qzb/uw9ph4oKVs/OHnC9VLj
+4+Oex51cS0PdZW0LNhbFi04ffWn3G3su3bQ1VlSBBBjQWakWn8WSZTdePrdtwdbh/je6jr5+/daP
+XXnVX1aUNJ06vTtixSJ6VUdPX11Fy8Vbr5teqj+T6qeEgaY7QqIE4FoKZBoUIVxqmo0q54uCQhfB
+o9TjWl5JpKwglO17Aigy3UfqSSUIcdFkLneAJFEo4vmYP5Yc2PV6x4EfPjTZMRRetG46bdkRPqFy
+SQBDD+W8go8qXlWx9vLr11y46dihhzo6XmxbdAuhBjVGliyvo9w7dPL1RGVF29JN0dhC5blPPPSD
+UKJxzdr1VsD0QBJB4U/H1hNClNQUgUXtH6ypq31u249yycKJUx3pqbHVqy9++slfMMY2rt+SzDvL
+2y/detPHTtaqAzLJKA1QI4leRglPqRTIKaZySjmU+pouNZ5HyPuyIJQtlEsoaprSTY+QgpQ2Khcw
+L5UU+pT0HOUB8JwRIAFNAQ4VBiegaPTIsFFcHHTc8oV1xDAoWql8lmsiXlc5f+PW9Vfe4WYPvvDE
+95oaLy1tWQ7cXr/uap2FXnjh9fqW6vHckW1PP+65xtF9r+47sP+y6z7QMLcNUBEgMCuFDW9/o+v3
+K1tCDASw4hXLLrj5kQe+s/2Ju1m4Gp1CRojKmtJQGamvaxufTjTUzG9ItIyODu771W/zZ5JVittE
+CYWWrvmIBQ25IhKpqyQSqoBIQoBQIFrG95iu+YS4whdCAuWCgI8oqK1x7hMsSOn4nEDAZr7npUf1
+2vKCO36uo6i8LUFiygsKkbIjWF5au2bzlZddf33B63n8N9+xQvNWb7pzzWVLvGz75JgYG5mc0zh/
+bLQ7lRxdPm+Jnx7d/ui9dXMuuPiKawRSThQgIJuVFdXsGRyBwMAnmj2n7YqWOTWnjj5RVR6fTI0d
+PvhqbdOanoGuwbEzpdHmscEJPRr7yAe/NufWS083BgY0Pygpcfys9FzX1V3pKeIT4ijlKOkTIoH4
+CpUCYmg5KTJOwQNErrkobSk9UA5FR2gFXxeMSPB9X0pgvpsv2GJ82nU7OxkM5fzBXpwmwWhb5bwN
+V9265boPOurso4//DRXl6y//4uKL291Memx8enJq5HTHMTNAMtPJubULF8xpPLz7V53Hd1569Qcr
+q6pAAwDFJJUUcDam2VnrDMLpTA95M2zVrb7gb071fHLH899fteIum6i+zh3LF7UOjU3u2/nDkoSx
+IXpFJFL/l7d/9UfC7HzuxexRtybNCLEzFsm5AYvmXSEU54JQR0iiMUBacG3KmS8lUCqQuUIC4aAx
+JQQhgYJ0bE1xXzGAjO6PUllF4+EotbMFoazUeM/y1YtXvXAy0Lbgkis3bthw5cToS6+8/FNw6lZe
+cte6y9YzZ+InP/w20KnqsvnLV28OBEO6Fly8/Mpcfvrph/8j3PLe1RdsAEQGAIRLIqkihP0JOJe/
+FxJAyQl4oEFz68p1G64fGet1nK5F7c3L116qmw19nd2i0CvVYG//aVAQLVrwgQ99ZePtN3lrtLNN
+jltSGTLKo4bn+BRVyHcM36MEuOvJnOfwICl4zCWmC6ZLdI+ZDtFzkhaQT2MqrzuOJvNUFigISn0B
+uhUa7ABwjbLyhAKorG++8rprr7rxutUXX3K64+fP7bg359ZdsPFT6y9bVFJCJsdTaftoSRiSztDZ
+oZ76xqrrbnw/96Yf/uVnhrOB22+/PR6Pw+9M60xqhVLno2T5/00IkjOGqAB8ZsWXr7zh6LE9r776
+06rmxfOXLtqz8/VUsqutLaBZkXCsHCgAEeFE4+U3/2O8qm3XY/dMnOk1x8KhfKv0JrLZvHSllLzg
++j4w5FquIJQmCQEflaeUokQgCBREo4IBAndQQ0UJUCKU8CEWtRqLU/Vzyhye6BmD8mjRZdfcng31
+79/1xe6OATO0bP3lN69Zv6GsNMYAGuqqt265q/vUs2Y41txW76kg9cWe1/7zxRe2bd76ldWrV//+
+OSqlZjpIvtlH8u1pNtvOUSJAISKTjHCQ3Sef+8F3/0LTKj/+qXsqqpt37/wlUVNNzRdUNaxF0NB3
+lMYUGExAx+mXd+388ejxDrubsClduBk7l/byruu6jnRtgZ7kEnwEIoEIQhUjnpI+SgBFCCJlNjCK
+3EegQoyB96ELNr7vI4sSiQTGWq3iVePj/YfPPHS0c6ea0EOV69ZeeGPb8oWJIo2Ahh5wDr4N05lD
+QTMcjDdk0njm0IPf+fbf1c191+f+4e5ASJNSMsZ+DwoR/7TQIwAoQYApQEEVR05l4ZVnvvfzn362
+sXHjX/zVD2Jl9flCKhYNo6QeM3VFCLOlbzOaAISzw6d3vn7/iUPPhpLoTGsqTYjn2Uk3nRaOn/Mh
+XchL1/M8BZJQH5QEVASkQgphRdDnnqTS1yGuh1Qk9MFN122+YX5LTXvadlNez4s7ftV1bpToS1rr
+L1+2eU1LU62pA6KkTBOSUgqEuBIMjiDyeKbjoW/+811KW/alf/15fX0pzhQU/MGQ//1P3qZmsZ20
+UpJSBgACgaMESgHt9KO/+eRvf/OrJcuvvvOvfhJNFHmuZwSor7iiYAgEIgW4jNHpoYFt2x5uWdyU
+GTvdffpAenhaKxT5aZXPpVyb5tOGVBM5u2A7wpVSSFSUUc4UAZ8pwjTDDJqhqFlWXBcvZYnwmuZ5
+69dXTadPHel67cjJQTtXFytqX37huqUr2gKxYJBqDAAkBQWgCwF5AhwgmMvJyd5nvvO1jw5NW1/5
+1ra2BXMlOpy8Uy1GZ8/WSyBsZhuZo0DKJCoKZvTyd/3T5BR55qn7EO58753/VFHTKoTQGHgAoCRQ
+rjh3xMieXdvDgdDy9ncDuHPndx89+OS5vheDwi8SFU46aBd84VdIgb4EhQwJkUiAMMYYBAOMQCwS
+ihZZVpVVFzVl1Aup5IGTzx0+OZIqVCC7fOGF7ctXtDQ1lksXg4wiogJG6ZsdIgmaSAwnPdV35vDd
+//5XE6Psq995vHl+M4DPfrcRODPSZ2ZXSumsDPxZQ08IRcgghFBSShHAV2BKCmZR7U13fBFd8ey2
+B1wv955PfLO2dgGgqykAzUAAkDA1kuzsP3fddbdSgxII1DTOSWZWnB0Ym871V1dpxU2Yz7vCtTg3
+EDijumYGgTDGuGlZViRomVhTZoWjbFKknP7h/qn0ma7Boel4JHzt/Ma2RSvm1DUVGYx0njgyMtrZ
+WtlUO2+dr0kkwkQDJKGg0gXoPr3je/9813Ta+sY9z7bOnwcISjFGfIT/jfJscYfZ7ORNgUCEw0wA
+nyKalAJRihAaK2q+7c5voqY9/tAvnFThfXd+de7S9QR8IC5BA7zMgb3PV1aWCd87172zonSpoKmT
+nYeuvvbj0sM3dj6GKlJTUeSzwsjIcSoLujHh5gY8x6iqDercZ6JOus7efflMISioOZlUDOrLy9Zt
+XtHWNLciGLGsgEkAp8bOpKdHioKl+3tOR2vnxWKlAAjM9wskk5vcueexn37/h7pZ/92f3tvQPA8A
+POHo3ADQZiDPsJ6x9bPCHd7pUxtmKt58LISLS9774W9EIzW/fuib//wvt912+6fWrL8rFDQIhZGx
+ztGh4SULV3tZt3+wMzU9nnOmAnq4qrLOMAKVNdbhAzuEq6JFixtbN2VT7vDQsTcOPmWaZeWtGwen
+nEhEH+w5+uILJ9dftHXZmtXL49HKynLPTZaYoFsa00wlgTC0okErEj7b19c2b2kwGASgrmt6jkhN
+ntv25D0P/Oo/2pdd95Wv/FustEYIIAx0TQdUsxY0+C/hvHPHxMxcWXk+NagHkoPBUDz72A9/+5t/
+L9j9G67468s23VFZWf7IEz8OWrEN6y85efJYoeBoer5/sH9Z+3XNze3cgMnpc5qRHe3PDY0NREPR
+qsp6oVIPPbxt1aqrV61dmcr68TB58aUHujo7b7v544lEKQBOJ4f7zx5OJ7sjwZalK6+ZQUmpmE5N
+pFOT9TULCfPdgnLz6mTHSw8//PUDu47duOXTd33pi0CpEMA0sG03ENBAKQIMZqGP63+td7I1PiGI
+yHSuJGWMIfgA2uVXf3JO05L7H/iHbY/8+0D3rksuu9kvwKJVFwfCVdHydIyzoa6jul7eNKeNctXT
+e2xkvCto6FVlC2tK6/v6To4OnMzkhotDobVLFienuo2ALp3y7LRdFKg0ZAQ9Tjimx5LSFvm8kclm
+59m2YRkChEI9FquIxip8qURGDfYd3LXrvqe3PW4aLZ//3C+uuHbrTMeNmUyzQMBQ0mf0nT2f7Z03
+OKgoU1QRIJqQinHatGjd39Rue/GJrx/v2LVrzwurVl1b19gCSOc2Lx9Pdx4YTy9YsEbTmVTe0EhX
+JCb7Os5lJ/GiS66cl7gwmRw5dHDYJ/m8HN5z8Pl4vCoaKkmmhsOBCiNkgQ4SZGVzw/CBAZ9UrVy7
+TrMMATYHHRFQQCHvZzNnDx569NWXHuk5lVy35o6bbn9fbetcV1IOQCgyJhFQIWFME57k2jt4cM87
+fkIPEkbAByGABzinPrgAPBAPbr31n1aMHj9w4PmRqc6DB+6b13yxFSvuPvSSZQaXLF45k2A9r2XN
+0SMv67R8efsFNqBBzEi4SimToKV8Vsj4OqUW5sEraGYqOXXCigcVZaFA6cK2VWAYQSMKCogMur5P
+sDA1dbazc9/+3dv27N1XWj7v05/72kWbNkt0AZRBKRKFIACQApWKAAOmvYOGHv4I6KUETjXQAMCR
+yAkxGCjAPOrByuqFm4vKT5587kzv0cmRsaJE4vWXt9XULJwcOhaO1GhmpLSkavmKK0GZwWgYQACC
+9FNObioSiEYCRRUlpdXVdfFAxcG9r8eiISFyY8OjTDOSMBIyDVkoUpodCca8gj0x2Xtu4MDru57u
+6DxuQPWNN/zt5VfdHC2JS1CUGMIHzn0C2syJQqiAUTaT2Yjgk3esf/07jp6wmSCDhoS92eNeAmAQ
+mAdEDwYSK5dd39qwvqt7f2f3zr6h0fR098jI4br6C+tbW8uqG4uKW7jObAXcJ5yAUrpALoCDYVY2
+NFAWEGEWqqrU4rWhxHJS8DzpFLLjmcK4zJyhzJfCOXX62OmOI4ODg/Fw05aLPr184xVNjY1AAJUA
+IgB0rgGAAgmUcpSKUIoSgM5UEsxOI9f/msz5O/T0Tc2sUBBxcnJydHS06/T27tMHslP9jNilRaXV
+tfOLSueWljcHE1V6IKZLPHLiSRkIblp1XXrwx5mJKRLY8NSO5xrnrb1w/VblTyoxlJoazKST/Wf2
+njzeMzlpA41FYtVzWhauuXBjTX0j4v8abbPlob81nTf0fxiWIm926wYpJVX+5NjwyFDP2GBn39nT
+o1P9rrIpJ0UsG6ycUxwtjSpuBMWqtUvF5EmSPDriWE+8PFzasmne4mov3S/T3tjE5MDYlGY2GIFI
+WVl9XV1rY3NbIJx4M13uDzZW/4ei/0PN9IwmhFBKETwCVEkEqVLJyeGRvlRudGpqLDNcyGMXSL3U
+KG6qUNSQP7v31aKguuVdo/2FYF9qUXnjMuFBUK80o4ZPtYaK1uLSMsuKSgmMgURABMb+t5645xf9
+H/UMwv9DiDgTiZ0JjPzupzoSQAJUh3hZVaykihJwHcf1U1llZ/N5++z2Eux47XDqu48MlCUiNXWN
+KdoTipcuXHxrqCRCMcSptHSm3pwngTDA3xWtIEjyu6d8frnD+UVPCGF/cNjoDAvyu6ogBImIlDAA
+YuimZpZHJEDIzeo3sMFftoSe+/x75w1bzcocykxaW656d3VlpaBpQODIZlpRKURGOCEzKXJy5ggI
+ON/Ef6/zdqy7lPIPdzhnuCMiUF8pl4CiwBjhZGboUqA+AAWfGeFIxdAI9g9OrFo22Bx9+blXnprK
+aBP5nO2kOVhMABBQRJv5d6UUypmuSRxQAzyfQ+3/0Hm29TP0fz/NwswxkvimZwcIQCQSSQAVcAq2
+8EM2mejr2Jk70ZdJH3v1eNfcZXdecuXFkWhR0DQpEuX5zCCgNKEU5/R31wRCQApgbFbqQWZHfxLT
+LPwu1kYImTka+X+5IQQQQAIy8AVyzafAZZZOElEyde6EcCI1LTW6pkBooEDpUgEhijIigPA3L0vw
+98evAgA5f2/0/0N/Kuj/B+pPZQj8D9Sf0Z83/Rn9edOf0Z83/Rn9edP/A21OEzei4gmOAAAAAElF
+TkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_daewoo" model="fleet.vehicle.model.brand">
+      	<field name="name">Daewoo</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAqJ0lEQVR4nO19d5RdV3nvb5dzzu1t
+5k7TjKZoRlM0HkmWbbnIuMcEgwk1LhBTQvIcvyx4DoSahBDyssiChCTPj7LyAiQUB5uACeC4AcZG
+lmXJ6tKoa+qdcmfunbnttL33+2Nrrq9lSxg89nit6PtD69xzz93lt7/+fWdElFI4TytBdKUX8N+X
+zkO/YnQe+hWj89CvGJ2HfsXoPPQrRuehXzE6D/2K0XnoV4zOQ79idB76FaPz0K8YnYd+xeg89CtG
+56FfMVpJ6GtLBVLK6kchRO1F9b6UsvpR/yul1Der39Y+r5SqPlb7wNnW8CrTSkJPCFFKaUQopYQQ
+jTVjTN9njEkpCSGn10qpUkp/rB4ApdT3fX2h7xBC9JHoJ33fr45Q/dVroUBEVmoRtSBWgXvht0KI
+6qkwxsrlcjabnZubK5VKACzLquKeSqUaGhoikQiltPYY9IBSyjOmqI6srxljr8q+n6OVhF5DU0Wn
+el+zbS1SSqlSqbRt27bx8XHOuZTSNE1CiGEYAIQQQgjP81zXTaVS/f39vb29WJIqfTDVAWtHrj2b
+V59WDPozqBaFM9B3HGf//v1PPvlkIBCIx+PJZDIYDDLGfN9njAkhDMOQUgohyuXy7OzswsJCQ0PD
+1VdfnU6nqzpKj1arjjjnejo9zqt/BiuvcGoF3/M8LfuanfW3995773e/+91oNHrHHXe0t7fncjnL
+spRS+of6ecaY4ziWZZmm+cgjjzz00EP19fV33XXXxRdfXFVrWjXph/XIhJAztNCrSXylJq4iIoSo
+VCr5fH5sbGxycnJyctI0zQ0bNqxfv940TcZYOp1mjNm2ffz48fb29lQq5fu+ECIcDvu+r7HTxxCJ
+RLLZ7MjICGOsvr4+EonoA56amnrqqad2794tpezu7u7u7u7s7IzH46FQSC/mv5eu9zyvVCpls9lM
+JjMzM1MsFqvGdmxsbN++fb29vR//+McDgYDruvfdd9/Pf/7zZDJ5++23a+irelwfIV2iAwcOfP/7
+3w+FQnfccccFF1xACNmxY8c999xTLBb7+voikYht2/qcGhoaenp6Ojo6GhsbY7HYq4/AMnO9Zp+q
+mq5CU/UgAeTzec/ztF62bds0zc7OzkgkEo/HDcOwLMt13d27d99zzz2f+9zn7r777kgkcuONN46N
+jS0uLk5OTra3t5fLZaWUVvEAGGOu6waDQcdxTpw4EY1GN2/ePDQ0BODQoUNf/vKX29rabrnllra2
+NkKI53kLCwuZTGZ6enpubi6Xy6VSqdbW1rq6ulAoFA6Hq4uvFQW9EX1nuYzzsnF9FVzP8wzD0Os7
+w3HMZrPT09OU0mQyqY2b1s7VnXiep9VxJBI5derU3XffPTg4+LGPfSwSiTz22GNbt27t6Oi48cYb
+Q6GQ1tSu62rvxTRNwzCGh4efeOIJz/NuueWWVatWnTx58lOf+tTll1/+3ve+Vy9Mw0op1Qhqycvl
+cpVKRSkVCoVisVhDQ4O2NNog611UvSMsMdDLp2UzMlXvu4q7Xrf2KzKZzPbt2/ft26eUqq+vj8Vi
+6XQ6kUho3PXD+rf6Trlc7urq+tjHPrZ3797/+I//8H1/8+bNq1ev1n59IBDQ/BgKhUzTjEQiWtRm
+Z2d939+0adOqVasKhcJ3vvOdrq6uW265xTTNKnx6kfoj5zwWi7W3t69bt66np6e5udn3/T179gwP
+DxcKBc/z9KZqzYneju/7Lx+xZVM4VU8DS9vTnDUxMbFt27ZSqdTV1dXf39/U1ARAc6tpmlJKvQ3t
+6ukIFoBmyUsvvfQjH/nIF7/4xe7u7ssvv3xoaOjgwYPZbLanpycYDOpnAoGA7/uhUGhubq5SqbS2
+tl500UWe533lK1+Zn5//6Ec/WldX5/u+fsb3fR0WVFeoT1r7mprxQ6HQ0aNH9+3bt2rVqqGhoWg0
+CkCLcnWbVcf05dCyQX+GemGMZTKZn/70pyMjIwMDA6973etaWlosy9I+tWmaWIpuLMtCjaun96Y/
+SimvvPLK0dHRL3/5yx0dHevWrRsbG9M4BoNBLFlXLTeu61YqldWrV0cikYceemhsbOwP/uAP6uvr
+NWrRaFR7n9VcRfWwfd83DEMrLsMwGhoaUqnUiRMntm/fvnv37r6+vksuuSQajepje2Fc9hvTskFf
+FWe91ccff/xrX/taa2vrLbfc0t/fX7VXMzMzw8PDhw8fLhQKwWCwra2tt7e3ra1N+3laqGs1lVLq
+7W9/+/Dw8AMPPHDnnXeuWrVqYWGhWCwGAgEhBOdcH5XjOOVyORQK9fT0zMzMPPHEE+94xzsGBgYI
+IZqdlVL6jKuiOTc3d/LkyaNHj2YyGSFEc3Pz0NBQe3t7PB5njK1du7atre2Xv/zlD37wg6effvrd
+7353W1sblgzAsqj7ZTOztUHjqVOn7rzzzk2bNn34wx9OJBKO41BKR0ZGfvKTnzz44IP5fD4UCkWj
+0Wg0GgwGY7FYd3f3BRdc0NHRoZ0cfXi2bWveZIydOnXq85///Hve857+/v6dO3e2tbWtWbPGdV3P
+8zQnOo5z8OBBSunQ0ND9998/MzPzoQ99SEpZLpcDgYDjOFXES6XS7Ozs0aNH9+7dOzk56ThOqVQq
+FosLCwuu6/b39998881XXXVVIpHwPM+yrIMHD37605/u6+v7xCc+EQgEsHzph2VWOJodhoeHAdx2
+223xeHx6ejoUCu3du/ezn/1sJpO56aabrrjiip6enlgsRiktlUrT09NjY2O7du06duzYmjVrWltb
+w+Gwzo6ZprmwsBAKhVavXr1p06Yf/vCH69evD4fDtm3PzMxoU1GpVDjnjuN4nrd27drp6en9+/e/
+//3vr1QqxWKRc14ulzXjE0Ky2eypU6cmJiaUUhs3bnzzm9+cSqW0lsvn8zt37nz44Yc/+clPXnfd
+dR/84AebmpqKxeLatWuvvfbaxx9/fG5urqWlRSu3ZUF/Of366mo0LzuOMzU15Xne3NzcP/7jP5ZK
+pS984QtXXXWVTphoaUun0x0dHRdffHEul8tkMnNzc+Pj4+3t7YZhFItFvU/btovF4rXXXvu1r33t
+mWeeGRgYOHjwoGVZnPNqPJXL5Tjn8Xj8scce27hxYyQSmZqa0hNpGQoGg/l8fmpqKh6Pd3d3Nzc3
+RyKR2sWvWrWqv7//jW984ze+8Y0vfelLnZ2dt956q23b2gmORCLV6ZYr9H1FEgmNjY1KqWPHjsXj
+cdu2R0dHjx8/fvPNN1933XX6gdqMsVbrdXV1qVRKCDE+Pp7NZlevXl1XVzc2NqatIiEkGAxu2rRp
+//79vb29nudls9loNFrN/+RyuXQ6PTo6Oj4+fv3112ezWUqp67pCiGQy2dDQkM1mFxcXh4aG4vF4
+1T+pTeNoVZlKpd70pjc9+OCDBw4cmJubo5RWKpWRkZG6ujrt6uiwY1lQWjboa9FMp9PhcPjgwYOd
+nZ06kInH49on0TusykfVL9LXjLG2tra6urpcLhcOh9Pp9MjIiOu6SqlisZhOp/fv33/s2LFgMDgz
+M1PNoCmltDZ45plnUqmUdnVc12WMaXelUCgYhnHBBRdoy4GllHVtsKpLLpTSeDwei8U454VCQUcY
+Y2Njl112mV7/MiY4l5Prq+hHIpGOjo7x8fHp6Wmd3e3u7p6entZOSNXlB0CWqDqIlu5AIDA7Oyul
+1EHp3NyczjHU1dXt3r37kksumZub45xr/i2VSoyxXC43Pz+/evXq2dlZvZjW1tZUKqV1fVNTU+0s
+Z0xarRxodwBAZ2dnsVgUQszPzwsh1q5dW314uTycZYtmq5shhJimOTg4WCwWM5lMsVgsl8vJZHJh
+YWFubg5ANeyqFgjVC4q0hmE0NjbqY6uvr+ecz8/PZ7PZSCRSKpU8zwOQzWbz+fzc3Nz8/Lxpmhri
+YrFYLBbz+bxWEaVSKRwO6zhOj6xqKrfVqavxBIDJyUnDMEKh0Pz8fD6fn5iYSCQSXV1dWO5C7jLr
++qo+6e3tNQxjYmJCO3bRaLRQKIyOjmrvuKqjX1ilqmpexlhTU9PMzEypVGpsbJycnJyeno5EIlqz
+RyKR0dHRcDisswKMsUKhUCgUdMWqtbU1Ho8LIZqamnRWsjpRFb4XSptSqlKpaJdM87tSampqqq2t
+TQuNPp7aEvHLoeXU9bXXra2tWvYDgYBt21LKYDCYy+X0A7WWqhYLLB1elQ0bGxullLZta1OZzWZt
+2z516lQymVxcXHQcR4sIgGPHjmnfPBqNptNpIcSaNWtCoZAesKolqs5V7aRV8n3ftu1YLKadfT31
+2rVrtUe/vHWV5VQ4WFqcEEILaaVS0SVs27aDwaDv+8VisfqTWgNbVT4aJs3I2r1pbGysr6+vr6+P
+x+Pz8/O2bU9PTzuOoxkzl8sJIebm5ubm5srlcqlUamtrCwQCnZ2dtYaxFjVSQ7WLIYQsLi7qw8vn
+8zrOMk2zo6Oj+kBtkeBl0rJBX81oY6lrY3BwUKcMdYoqHA4XCgXbtvH8lpgqG1b9vKoLVLXGbW1t
+OutQX19vmqYQolAoAAgEArqWoo2hYRitra2RSKShoSEej1dtz9kWXPtRh+IzMzOWZVmWpfOahJB4
+PN7e3v7C4szLp2WDvlq1wBJbNTc319XVUUqDwWAkEjEMg3M+PT2NmoRPLTov2qJUfayjo8M0zcbG
+xkgkYlmWdmP0teM4AEKhkEY8Ho+vXr36bOvU8GmPvnblADzPm5+fj0QinuclEgl9BolEQsdT1RBk
+uYztcubr9UW19yidTmvodbpGV0UWFxfL5XItytXrF91V9WzS6XRbW1s0Go3H442NjQDK5bLuujEM
+gxCSSqWSyWQ0Gu3q6jpH1KMPsipPteFINpv1fd+yLL1gnero6+ur5ln1CK856M8QQ6VUIBDQ7rBO
+loVCoSrDapRrtVNV57zoyPr+mjVrdPo3mUw2NjY6jqO7QjjnkUgklUoRQnTseu5SRq3e0INrc1ou
+l+PxuC6ixeNxy7ICgcCGDRuwFMRWPdFlQWyZFQ6ez7ybN29OJpOU0paWlmg0qmsRjuNks1ktvGc4
+9bV0xn0pZSgUSqfTACzLam5u1pkZbUhaWlq0XdGq5tyljNo2TbXUlJnJZAghnHPTNJPJpC5hDg0N
+NTU1qaXuxOX165eZ62s9RV0L3LRpk44829raDMPQbv6xY8emp6d1+H42fn+hv6+RrVQqoVCopaWl
+rq5Om5CWlhYtBPF4vKWlpdot+6KkIwaylGclhFQqldHRUW2oPc9LJpN6EMbYpZdeihr7v4xZBLxC
+0NeazYsvvjgSiWQymUQioeMpAIZhHDp06OTJk7pSSGoyOeemdDqtOw9aWlp6e3vr6uoaGxuHhoYM
+w9BupXZOzoF+dZ16usXFxePHj4+MjITDYW2WGhsbg8FgpVLp6+traGjQuyDPTxQvC/svZ4ygnl+5
+16XqWCx2ww03SCmz2WwqlWpqajJNU7fk7dmzZ8eOHdrTfylOGyFE83smk4nH4wMDA6lUSqf4dcOl
+Nr/aip5jkKqun56e3rp165EjR1KpVCwWC4VCqVQqkUjkcrlgMHjFFVecWy5fJr0i+fqqIdIX3d3d
+APbt28cY6+np0Wze3t5umubBgwcPHDiwadOmgYEBXcAjS60MtcFt7RRtbW27d++enp5Op9OO40Sj
+UUrp+Pi4YRiJRAJL+fQzmLQWOELI7Ozsjh07RkdHGxoauru7NSvYth0KhU6ePCmlvPrqq/V68BKU
+4W9Gr1Lj35o1a4QQY2NjExMTqVRKly9WrVrFOd+7d+8DDzywdevWzZs3DwwMhEKhWqz1tU7n6utY
+LCaEyGQysVjMMAydtNEp0nA4jKVA7IUKUFvL2dnZXbt2HThwQAjR09PT398fiUR0bBwOhxcXFwkh
+fX19iURiuTKUZ6NXHHot3ZTSnp6eRCKhO4Hr6uoWFxd1aWLLli0dHR179uy59957KaW9vb0bN24c
+HBzU7Qt687VdwcFgkFKayWTWrFmjm9cKhUImk+nu7tb9aFWga+O1+fn5Z599dvfu3ZlMhjHW29s7
+NDSUTCYZY7rHVqclgsHg4OCg7jRZXn/mhfSKQ1/Nz1BKGxsbLctaWFiwbVsLOADDMNra2hobG0+d
+OnXw4MFt27Y98sgjwWCwr6+vt7c3nU7X19enUikdEnPOA4GAziFXKhVdhykUCo7jJBIJPZfu9i6V
+SnNzc1NTU+Pj48PDwydPnqz2WW7YsKG1tdV1Xdd1fd8vl8s6b6PrKhp3LNmqV47xX/F21xeV/UKh
+MDExsbi4WKlUCCGmaQaDQcMwdOJwamrq0KFDhw4dmpyc1IfEGEulUvF4PJFIJBKJo0eP9vb23nTT
+TXrMQqFw7733MsZ0OlO/dlIsFrWO0lX1oaGh3t7e+vp6LRmFQqG4RHV1dX19fToyqF12tR/rFaJX
+Cfpqt2JV/wAoFAojIyOZTEarWh0ABwKBcDgcDAY18+ZyucnJyZmZmcnJyfn5+enpaW0ntmzZcsMN
+NwSDQSllLpf77ne/e+zYMe0d6lhX5zubm5v1qxBSyoWFhXw+r6NW3WRZV1c3ODjY09OjPf3q6w+v
+NOiaVqbJW2evqpnhmZkZ3QmbyWSy2az+NhgMhsPhSCQSDod1k6XWJ5VKRbfoRKNR3ctGKdV1VG1m
+hRA6p+Y4TqVS0Q2tuVzOtm1CSFNTU1dXV1dXV3NzcywWq0Ksm8teTRBeDa7HkssIoLZqcQYJIYrF
+4uzs7MzMzMTExMLCgm48rubWq71ppmnqIol24bVzopNCutXJ8zwdglbNTDQabWpqSqfTq1evPkOx
+vDBrj+UrwJ6DXivvUr2QhBCu6zqOo3s6dEuMDp08z9Odl7pNVb8ApJPS1QvTNPW/uv972QOil0+v
+OehfyIb64oU5IjzfdJ/x8zO+qqaIX2lefun0moO+Si+K3bmZt3YvL8y3vNYY/7UOfS2dwd3Vw3hR
+TF+ziFfptQv9GbQsRdFlrKy+fFqxlzfPTWcwxIsagDO0P15MydTS2eRjpeg1yvUvVBdnFGHOrWTw
+GtYzVXrNQf9r6YSXnkl/Dar+c9YwlauIySRAIOFQIp8d58yZ931p8gp3TMW4Z7qJUKohQq0wpzAh
+AQFwgEgFAJR4qmy4B07MmqCu68Iy0wnaEWsSDBQgAoqC+BXF6NMjRSpEUElBuBAeV4xZXtH3A4gl
+Qostq9qdXP5wzgYRhhCKGn2tsQAPQ6JCCsNjFeEKi8oiAvEoHahLAgD1x2by2aIj4VY4D8C8qKlR
+WD4jnkLQBRZse9uOgyNjC+XKYqyusW9t84a+tigh3BegHAQeAQG4p2AoQELSOVttPz5++PCIW7CD
+IdHb3XZh/7pEiDDYShEKC+S5ZqlzR2dnhV4IwSjRdTahQCkrFct/9pf/8MgzR4KxlJBlJoIg1EU5
+xAMXr+t885Xr3/nmG6KmMA2lFBESjDICgJEHHtr/Rx//IqXctKx8Pv+Ht9/wt3/yPkZcQg1QIYnB
+DOPw8czv3fm5XDZvBwKKBqgU1COSeoKRct6/7e1b/vnP3zeSKbzjzs9kix4XKhYx/v3Lf35pfxgM
+O/dnbvmjzy+WpMVQ9v3LL1z1wD/9tRGCLfnHPv/t+374RDwZX3CK117R/+2/+VQqoASCE7PuN+9/
+6HsPPnT01KxtU0KIAhJxevGG3t976xvf+vqNXAkhPc6UpwgMpRCcr9BHH9v2pW/+cN/xqXKx7Atu
+WoRTb0Pfmre+4crb3359XZj7nsMN64wSzdnk7KzQM8pAlC8ko5QAAsQIRAol5ZdlQbmKAL5POFeQ
+HnUe+dnTD/142zN7jv71J97dFOeSUEYsKEB4Llc/ePiZvB2AwSkMKcI/336kiHKKWlASxBcgCoSE
+kmPznufFicgqIqRwLBXyfNsMMGRnV4WDnHvt3W1mOF6cL4NY+dnpkZm5SwdbXcjR+cWJuRJ4XVFC
+CXvXkRMnsrODq5MjMzNHT856MporhkTFH+hqT8aYJ9TJyeJdH//bR7cdhJlgVlr4czBChLGcQ3/y
+2NGfPvG5/Ufe9Kd33RZlJmTBpAFATS+4f/H33/rnbz8gjTRoBJ4NMN/hNFT/i10TW/d8dfeBo5/5
+yAfa0s9Lup0b+rOGdrpHhjMKCEUgFCquUjxEWYCbFuEWp54qTqOcl1LQQAKpjq/d99Bnv/DVBUcB
+egUKjI1mF365fTcNEEpd6RZJxByZnN13bASKC59CcQYulVRUGSFDEE+ZDcJIKGbY0hWcVzyPRIKh
+cIBBhExsWNsCd5HBgfT3HToi4DGoAwcPQ1RManNVAZOlirfn6Al4JDc9PTebZWEIv9gYD73hsvXE
+9xdd/vHP3PPoL3cjkgBjBitccVXXTdd3NzX7vu/QRNrmwS989f4Hf7rbFRQkLpVVcs2vfOOHX/3G
+j2SgDsEgVcWLhpre9jtDA/0JqRYRjfhG6Ovfffifv/UjD8aLBhwvalDPzvUMUnhgFoRPOWOEGQYD
+YUIyEKkqC+955xsuXb/25OTUV//9R7N5wFAkXPfN7z3x7t+9deNAswGHEqYUe3bv7PyCK6kyqUkM
+5gg/X3B+9sSxLesGmEHhS8rBYFCvYMAnKMFWnKgPf/DtF3Q2SscrO7aprM2DHVQFpEJvRwv4LmYy
+UcTxEzm7TIOmcepYHoIzChDuVWzpWadOLuJKlnMCUwVHKA8GbW5N9/V3K86/df9jP35yJyJ1zDRE
+Yf4Dt7/+7v/xlrpA5Kljh//4w18/Mp6HRSoL7Kv/+r3rrthQFyCSYteR8Xu+fh+MCAlHVC7z+qs3
+/N2n72yrDx8Zy37kM19/9Kn9vC7he7j3P392440XXt7f9Sv5/VdArwhO/5QxAL70hQCI5MpRTiVE
+7DdvWfvGqzcqavR2Nt710X8oOJ4RDC/OlX658+hF61oopC8kGH9y2/6KbyMccn2PcQpGQOQTT+1f
+eO9VMSvKqZI+GIXyFPGVSQO+ZEHuv/W6DRd1JAi4gOFLblJAglK58cI+WD92hYtQZPfhEyXHNhRO
+jmdhWRX4AEEoIEtudn4eBkYm58tlgWgIvt3X1ZhORsZzsz945CnH9pAMisLiRX3tH/n9d7VFGZS6
+cnDNzddc9nf/+oCkFKHY07uHtz6767e3XGh7+Ob3fjRX9li0XpRL6YT1iTtv725KMs/b0Nn0rpt/
+6+lnTxSKZRjBI6emHt++/7K+zjP4/WxncFaF4wqfUAIAviKAQTmBEr4tWVjxYNmnZUFAID1/y6Ub
+L+hfC7sMqRC0Dhw/IQQgCWfW1ILzix3PwhCQfm9nQ19HGp6DiLnjwPCB4REBCqUYB4g0LBPc8iQV
+okiIWiy7rgr4XtD1OaMAXCmFgrNxsH11YwpuwQqZx0bHx2em5iv5I2OTCJjEIKACxPc9d3R2CsTL
+TE5DePB8uKXBrjpDqqPHR5/de4LFE1AESlxzxVA6YYBQUBYEH1y7iikFj1uRcLnCdu06KeDlC/ld
+h0alz4TvQqjNA92Xrm+HBGAA3vrBNVHLAiE0GABCTz99WL92ipfQq3NWrueMC2lTaoAawpPUoBC+
+wQkRUgjACLuKA2Cchg3VFA8ZvvCcCqianM0wBriASZ/Y+szwiSxUgBTldeuHYrHEgT2jiFiLFW/b
+1qOb1w8pmACUsl1le5CScDPMi77xqb//t9XJOlUO+CJ/y+9c844bL1IMUKzBCl/eOzB18hei4Pk0
+sO/IeK6xki8pYkVMr2CYgWLFNoLJifnSou+MTM5BAYQEgtbAurWE0H1HsgsLHgsaUH4wwFtaY5TD
+BxQ8LklHV9oMGJ4MOZUiVHBy0lXA4oKdmaogkKSMy1JxbWcrg+9RDgoFJ5Y0k6nI5ERe+i6oOZ0p
+FovF2qaKM2r0Lwl6ChDCFQAmKaNEgTHDUUywioGYsGcDVkUIg1EwXrHCEY+ZYCYcUazYwlXcFAL4
+2fa9jlOAGVSmuOyiTiEELB++AvWePDn5QYAIAcoIDSm6EPTYIiq+G1TU2bZ1dJs9ASLgly/csM5H
+0UAEymQBecnFzff+WBpxA/PO0ZGFUoXBKxDH6exNJ63gU0fGfUEXZku7h2cyk3MQFvX9uqbElo1t
+Qqpsrmj4FekHYQhOZFMsaSpAwaE+EUYkZHJKIHIhGi7Ds1WBg1ZK5VlfQFIJD9QzUzEIGHBthoAy
+W4Jm3lCWiDmGC1XJsoWK5ytKBUAJEUoyQpVSkArsJUN/VmLSE54ZilVsySigQKhypAvf5ZT4gGs7
+jBGp6FxB7B4eoZJymzamUxu7Vy0UC/VGsGDDV/6J4xOnMrm1DUkFRUCoID4UIEEJBYEqUuVJT0np
+U+FyBKTyKeEmpb09a8LhYMnzCGfHRsZy+YIgiirasXpVWyq+8+SMa1dKZffpPcOZ7DwsLoW7abA7
+Go9zSnzhedSAZYJ4UpmEBqAUFOEADE6I4VEFxgQ8ojzPtwmIK4RnOyCUU+FLYRgGGBXgFADxJJRh
+wvHKJBTgCDEvQClVQC3MhBDQF9H1vz70hFDLckslxnSZTTq2Z/uCSg+UQSGRSHAKn5i7hkeOTyxI
+brhCxlIxGQ5J3wslI9nMArhx/OjUkzv3rX3D6wQcjgCVXBBQCGkoSHnzmy5f2xSvFFxB+EWb17ng
+nEolfYB1rmpuScePTy/SoLVz+HjUjIBxWUFHa93FvWvve/hZF4XFkv1fjz87ms1ZBnMErrt00OAG
+FIhyIDzKpPQdV5CyrUAJJAi4AiqO5wjfJIYHYTIZjhgUlJkGU+Amk6JkcsN2fQV4gKkAaVQ8RxLJ
+LEhI3/frIhFdfdTqhuKs2uY3gt5TyhKgoFQBHoQgxCgUPHBDgAG0sS4JCTD2y2275rMFsBAsNZaf
+f9+ffNH3/TmnAgMggcqC/fNt+9/7269TVAHghAkOpQQKpUTE+F/vesvrLmimynAEiBKmLzwORqmS
+Xioa7mxJHT0+RVPB0dm8IW0YBqRqTAbX97eHTJbnquyq7ftPFkvCUn4qEb5iqAeA9JFOxq0AdQp5
+RAzfEYtF15YyQKmCQT0vn59nIC4oCHVEeVVTEpBB04xHgrPTBQQ5pMzMzvuQAVAoQGF+oZzL5oQS
+IArUbqi3IqFANaw6t3P5G1TLLOW5hEpmUkUVeGB0PDc2NifBlQI4ujuaAczmSzt3H4CQBmeU8cX5
+8o69s3uHF8pFAc4NSsGtHXuPjWTyBBQSAAQUQGFxx3NCYUOhIlSZcAlDgksC/aoQjYWs9es6IHzA
+dz1VcgRADI6mVKS7LZ2MBAhRvhTFkg9u+sIZ6Glb295MAUXQ3dFsGZwyg0imfHnk6AlKqYLHlAuK
+w8eOuyUH4BAGjfChvi4CREK8uS4MRsEjgHH4xLiUHKICUgDDqclJJShYEL4CUev62vS7c1DqV2bp
+fm3oKeUMioJkC950hY5kvX/7/mOnxqcC8RRcO6DsKy7sB8Gzh05t3z1MmKGYK10Xrg1mS1VUTgVS
+SmJTi54cmdl54CTAoOBBUCUV4cxFADw3Y7vloFPhxRJxKkZ5wT/tqhFlcqwfXBOJhITvQBncMOD4
+8YixqiEVD/FVzXElJABYAYNawrUvHFwdsSwiFeW4YE1Hd2+ndBklFrNCjz7+1LMHjgIGCHU948k9
+w4QaxDRQWuzpat60bq0UojER3zS4GsUCBLMikYNHR3746E6fmC4hNsGTu/aUFx0GAx6tSyYu3zjI
+KSGQgPyVudJfW+FIKRgjjEW++H/v+979D09mFo6MjLBoM6QDaV91Ud/6nlZI8fizB7I524w3uF6l
+fXXj264eUpBSSkLZdx7ZOT2dJ4ZrF8TWXcNvuH6IKwgiCQBiiAApUP8v7/l2Q4iCyaJH4Is1TbG/
+/OAdDfVRyhQlsruruaUhfSQzQiL1HML3VXNLfHVLIxR6ezoe3bZfwYciyvbAyfqBNinBoCRIR3PD
+7W+/Zu+uf5EeYWbwaCb3v//PfR/4vduCJnn45zse3X5YEZMXF6Aqb7vusuZ0iEojFJTvuOnKh3/0
+zESpzCKsVPD+6p/ul5zWtaQP7d71ze//QjrSNIUoz19z9bVbhjrxnHI/w9y+bOjBISEoCR85mT9y
+eIqEEyqYhHRFYa6ju+vP//Su+qg5M5N7/Ok9sGKCcF5it9645W/+5xvgUzAq4ZaK/te/s9WL+IQa
+h0+MOmUvGGCgihMKUFDmE/nUjqPMEwI2eBSFyomu5Efebzc1JqT0CcOartW93WuOTJ4iUgnpgLLG
+hmRzYxOAjs4Wi1sV5QOUKWrFY2s6mqAASAHJQN/zlsuf3Xr8W9//sYzW8VjTf/7i0I+f+LTBiSMV
+DAOWSWam12/q+cN3vpnBgTKh5NWbL/jj99/2yc//SyVnk3TrvlOF2/74LzivZ55hE5cFE25xpiEd
++sP3vSUWrEAFqnhXkzkvamnPqnAIpCJcJ42JVwJQoVwuTCBbQF55c3NYqFDByGIBc0VerKzvb/1/
+n/nA5f1xgO8dd/dsP4Gcw2bKVJSuvmLAkR4IhYQk2Di4yi/NYcZRhcLWbTt3Hs/YBjzHF7Mnkatg
+fh6zi3BsIT0oDqcE4pSl5aMCAkoZUSpusE1D9Vicl4t5L88wPbFmVTARDbgEPU2NamEeOQ85z8kc
+Xd8c7WpcTRnAoD2PuGn+2YffdvtbrjKckj8/Dz8gBXdsD8LCYpnmx37rug33/NWftDVwIsKgEoIG
+JT7wrhs+cdfNTfEgnZ+FU5J+k+t6FeUrm7D53Ia2ln/6sw9dfWGLIkEQBsIACtBqCuHX9HCkWjLj
+lBimElJ59Lev2dLdnllqlpNS+kqp5ubmtb3dl10yuHZVFHAIfIsWbr5+HaEhUyGZSGwaWMOpgAQU
+COgVF657/+9eV/GlgPLdgnLLkLIhGbv1d66Zs4Mmee6FMbL0h47r6uriiaQvFD/tDuGqiwZ//903
+58qSMSPMB6573QYGKIjOttgdt141XwITJqf2ZZt60ynNhrrdE0SJ7rb6v/3rP3rbO294+Kfbduwa
+Li4K3w8HIv5Q/8Wvv/qyyy7q72iMAZIwAUhw6jhOPB7807tvve76Lf/1syef2r4nmy8UbBIPW23N
+qWu2XHT9lRcPdDUyQAmTvORezbMXCKWnqCFOn4+ELwQ3FmxQnG7G45wBcD2bMRY0LQrFISAFKCs5
+suT5oVDIccpBGgpaIJBQVCkQKj0hXY+7UnKLVioiFmQBAhBkF0s0EiZeRXdXVxNP+l1Wg3CT6nEk
+QKWkhYqQhAkOKv2YyTgTABR43nF90BC463ixiMEofN8FwLmpAOJDSRATPvyy8Iolb7HgCZ8mY5Zp
+kFgoYFBFIKSShFAFRUGULrkRrgBHoFgoFwqFRc+IR81omCZCBoNkoMIjjPGX7ricozbrKcV9QihA
+lSJKAlSdNt+AUlL6lFLoHIWURFIwrhRAQIgEpFSSEg5IJUEo1/PokhkgAQglQaiSiisDBKC+Jx2u
+goRS1DwN/e4kY4Ros3V6AdqICUV1UK0kCIUUgnImlGREQEpQJqRg1HhOtSpx2voJAWaAwHElNynx
+ha6qQXhgBkAVAAIpQSmUBCGKgCilIQEIFUIQoiilvudxbgFQEsvB9coHoa6kuljCmIKSgAKM50y3
+fh9Mp4okfKFgEgIw+PAFiAFCfSoYmJJSP+W6vmGarnQtGKBCQSgFCgsCIBJMQr2YDlQAlUoRXyjG
+qD4RAgklAAOAkIoxAkAIxXTUTjwACkSCEygKAqmglM9cBk60t+CDGQCBgiSq5rxVzem8KJRKgQiA
+QtLnzhQAOadP8xKh9zzHMAyp6Gk3CYrAB4GCUcuR1ZVQpRQlAlLANTWLwISEx0B11Uq4oBSEC0AB
+XEJKQblSUFAcIEqAMkji6i3o3I5c2hwBgSIgTAGehM6LKCimCCEQyqcEWs6UBKXUU5ISKqRilCih
+OCPaz/EJVVBQii/JkILypc9pUCpJCKE4/XdvcDqSkML3GefQFogQBUJAlC8oYyBS9z9X4SAvWeOc
+FXp98EpInf1RACDJ0p+rWUK85v8bISBQCkJKSaghFbh2q0AJoJQgpGqcAUIJge8JgzMQKCVACECV
+AGGnZfy0pCtUeVzKpXcTFXSwKKTgz2WmpC98zkylFCFMABSQEow+vweW+IB2tSgBk0JRwggAKhWo
+Pu+l6V7svzd5TgqolKBUApJASaUIGHnp6uYc0Aut4omCglSUUAgoCknV80dfEgFBQJUiUoFSH4AO
+/FWFqCCID0IFqJAwqYSSUFxS93TzCAAqfeVSwiiM6ome+d+V6OVWr5SC9MGJduOeewI1cYxUIATS
+B6VQRBGAkNNNFgSaU07bHqlAKJaMiS9Oqy9SnU3i9FqWZvGwlI6U0Mbm9LfLYWbP0ytLr5Vm8/+G
+dB76FaPz0K8YnYd+xeg89CtG56FfMToP/YrReehXjM5Dv2J0HvoVo/PQrxidh37F6Dz0K0b/H3kG
+3WRpMddXAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_dodge" model="fleet.vehicle.model.brand">
+      	<field name="name">Dodge</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAsrElEQVR4nO19eZxfVZHvt+qce39b
+L+lO0umsdJbOHgKBBBAcFQirLEGGVcVB2RyQRUFxBEafksGn44YI6OAOKhgQZIbNYYewRwiQAIGQ
+QNZOevv1b7n3nqr3x/n9fumE8MaEbqLvWZ98OrfvPfcs31unTp06VdWkqvg77QriXd2B/3/p79Dv
+Mvo79LuM/g79LqO/Q7/L6O/Q7zL6O/S7jAYdegUA8Vda/X2bArX72u+m9Cuq25aGqm6pULa3NdEt
+hQGo70Pthm5pUbd+S9+vnQ4NdkMKQJWIFIATMqwQAhRM/jH5glVolKh6C6g9he8nEdV+9cWUtpRS
+dbUCAGutAn1Hbds8IvHlCQBEVQkGqti6LwNLgwi9qtaAcAB7xJUrMEGJyHMuUT8sKjzMqAGlAPX7
+Rlu1Ua1n65uARxMKRr9uVJ70H3G1ZlWlygOulhQANGiCYVCg121Gq46UhQikWuUlAzjnSEEuIYVA
+VZVFISqVqeIgSqqq6pyDKDkBoM55fiYiqFMCKVQVTEoGTMJMRMYEIIJhJRApETGIiECBY4CViJSJ
+YMiwEDFAAmWQAiIwlQ8waEwPO2g1A1UpoTDCgnxJo6Ir9Eo+oWKhUOiLu3ptT6/p7UOhL+7pjfN5
+KsVUyFMppmJJipErlzWONI40cTaKOY7ViYsTrk0M0YrAUZBhsBHLCAzZQMOQrEEqZWxoUinNpiWb
+1lSguTpkwiCb47p6acyiocE2NVJDzqTqkE3ZbEbSKTRkGGAvdv7mBE6N8ROo9CXRsheTux9yS15w
+b62SDd2mu4/L+dglqsLi4IQSAaAEgoUqA0ysTMIEJiJKWBlkmSvSHRBiVbXEriJIBABcdc0QIVWj
+ENFYRUSIyKgqHIgMWWZOmEDGWkuBdUMatKlOR40yM6alPrx/uNescPhwRzCDgQ6AAYe+hri/UNXi
+2nWl634e//hXWPs2A8QphBYBKaeYmQyrsc4QpwJhgmFmVmM1NGSsMQGbQA0jCJwhYv8xjBryIthB
+TU0+i5JL2Cm7hBJhFedckkRIlBLROGIRkcQkIg6aODjhOIZLSJ2IoCyiCUdlIaFcMx1xaOaLZ2b2
+nM1/W1xfwd1JX19f8sWvR9ddx2FGm1tkdFO6qcXV5ziXRl3W5OqlPid1dZzJ2lyOsylOh0m6DqHl
+dIjQmjBFgUVo1VgYI4EhY4VJA0MAe0WQCf7aCRK/JCSaODjHcYwocUmiUZIUCjaKqVzSchGFclIs
+S7FEvb3S26eFPurpk74C+nq5s9et7cCmNejt1YPmZ65dWDdp0oDj42nAoZfKXkFdpFy+6/7e407L
+WFOePil1yvHpeXMweiQ3Npi6HFsDQEAGgCqoKkeqGsVWS9yOr3c1pXabu0qVuaIEBTGQeAB6e7Wn
+13V0Ji8tj2+5Xf70IKLYXHJh46XnUTok+CW4NrqBWH91AEmqF05EtdyX77ro8nXcuHHSfr2/XOQL
+iMiWsqKiKiL+xcojUXXiH6nbUuOO92bLK1L9V+tk/+vKZbWEUym/uqJj/olrUbfpgKOLy1Y4FVXn
+O7Tj3XhXGkClVbYwghcCpbJ77s+WAzNhXLBgvt9QEpH0248S4JVDB4AquyMhgtf4uaJp644r1/1f
+oeq/yi+o6qNU6UiFiQWAkIInTQiOOojCtLz+Rvzq635IO4zH/0QDWCNrRZsUB5DCFcvR2o1q0zq8
+0eRyICGCakV1JpDf4iqBiIyCIIAohEkAVIt5abTDvSFN+psIagYDBRKob75mwCAAJM6IQImUAG4Z
+jnSOenu5YyOjtmNmYMAsDQOm11cYhxTV70mJC/IJ2IohA1IVIoBIoKxbNugEQFSZBFxjBPXS32+/
++rHsDhBZbNmj1rbQIIWtgO7NG1WVDOwXAAAMgSiTFRcjKW8j2WlnOGE7NKDzyMPudQ4SUEJGlJUV
+5DefogphJSVv0FLP6WCCggSkfhcLAgEMGIBJITs+WM+ZShXJ4zlVBAkpRLfUR/0sSV72AQCDVTQh
+qYqk7dj93isNHPRa2ViiapARQsSJEjiutsVEFY4XJRAIyh5wIhCLwom37BAAOEKsUCbeca4ngsAJ
+pCriSeCYwBDH5FleoKRARaAJFEqCqsxnBYNIGUSo1eOXtIEQOQMmcAhUNcwyQSDEYlNCqspJpYxW
+VlCulFEGgSoySKLNHcXH/8wvLuO3N0WU2HTKjWkNpk1J5u2eqRuy48ql9D33vFvyEt5cy53drEnc
+3GDbxutee4Wzxhu23vAGwBFYK0KJlEFiwEpQMkpCusWQV1l7AKIB0C4HzoZTXYWgALEXPGrTqiqV
+HefWVkBlEBTiQMmaNaWrfxov+qNb32ESdSymHJFELpWWoUOT9t3iQz6S+tQpQUsLU6KwAAhSUYD6
+ISAKRzBwfbfcGd14m3vxRVq/iXr7nBFJp0mtcy7OZNw+s6MvfDZ94D8E8KZUL70V4NooJIkliZiD
+pNIIQ72F1f8+ANJiEM1nREREosrbnZ3eRK5cuvHm3oXfZ7bhwQfxHlPSI4eqsbKpK172Cj/8XOmZ
+51JrnkyWLCv/4b7Uxeemjp0fkGMxykxI/FrqSdUJGff6Gz2Xf9P96TH0dGo5xoTx5h/3t3N3t2Na
+A6a4ozt89c340SfKp56VLDi67luXh9kctmcZ9tJTSYwx9F75e/s0CNBvWZkgJESk6iRxfvtaIwdm
+1e5/+0581yPpL30ud8iHuS7HqYBgBKokSBAXo9TjTxavuUHufjB47s/Fcy6O117UeOYnyAJOwNbP
+G79+ODKlx58ufPZi+8rrpI7bdgv++XQ+/oh04xCyho2BagArruyiM3Xpit7v/njDx89u/dG/04jh
+Bkl/KBQgUQDKhBrwA/0BBhL6/n0jImMMWyN+7VQHeJNBRZljSPe3r1EKcrdcm24ebowC7IE0Xrex
+sI0mOezDwQFzi4v+GF91dfDqyuQr/9bd3Zc5/zPpTJoIgBBYgURRfOCR+LTPma7uuCGbPn5B5tLz
+bEsLWePlhaoSOwAGKZsLkn1mNv38B4U7/6v336/NXX4J51KE2raK4aEXJSLYwbKfDebZLBOsUVUS
+UXUAoKjZNbsefEzbJzR89hOp4S2GqdITShhaOW3150vqbF2u4ZMnhf/x78ns6Vzsc1f+b/nVzS5W
+UUBZVYng3lxZOPdftHuz1KfDC8/Jfv9KHtVK1tT0LiJKYEm8lBZWY0KtW3C4PXZ+73/d/U7N0SQJ
+e5V/a3Hjv9CAbKoGEXqBJgaqUBEV6f8kjmO0ttbPP9g0NCAul4pF19lZ6uxKConGIiogFYWCDFUs
+9A37zGv4/jcwfYqWisX/9Z3SU09Utv+kGknfRV82q1a4TAP98zm5Sz4XEIwS+S+tgKgDkCRRXIy7
+e6LObtfTFZcUoul959GktvKmrv6AEADnIAoyZLZjsd/WKrdTNIjLrBLBeiVCqZ/TgKoyc2ZKG5Wl
++MyLyW13FJ561qzrVEkwqsXM3iN17Hyzx6x0JoOqAuIVf7vv3PCCM5PLvoU3X4mvvCa+bqyOGcXQ
+3mt/rH96jFL16eOOzH35XAuBkDAZUZAqkYuTaPWa5K7/jh++P1q5kfI9Ya6BJ0+mow8JD/tQ0+xZ
+URQBqEkbBSAJAGFT22IP+GHhoEIPYhZVTVySJKG/qUpExjBKUd/VN0Tf/7Fbs8Zm0mqsYZbXV7r/
+Xlz4xU32jE/SuZ9KtQzzOx9iBWCI0ycf1/vUkuSmTr77ruJ/HtR4+iejVavia25ksEwdm/7GxRai
+YDAMRJlJKSr1Rbfc0XfVD+nlV02YSqUNwca0Bs8vsb+5pXTysfjOVzNDh/n3qiQiIlAmQ2awBMNA
+1rut/GNDQZpFIBVTgBLIkSpJ4oo/+ln5a1eht5dbWzCkCXVZzeWoaYhpGcZRlHzz6t5T/rlv2XIV
+iqs2FlIX2CB33lk8YyYp5Ec/LW3eWLj6P2T9GrGhOfdsbmqqmmvE20ejzq7eK79XPPdL5s03bWsL
+DWt2uTpXlwmyDRg2VIc3yK//UDjn0ri7R4hUK2YETZTLkXFK1rogNYAQbQXPINWrABGpZQCiCZcj
+EkeAWsRExaefja//uaSs5HLG2zrVAVAnIiLZtG3O0aOLi5+5pO/llwOqiCwhkCCc1JY+/WQZNgSr
+16OnL3hjg0YFOuhD9SctsKjUQ8oEE3V1d1/1XffNH7Bl0ziUlVWdFaYECQhC0JBHNunt9/VefX1C
+AJESvP1VXFyxqQ/aCeEA2nC2FYVkmAKrqpyIRKJsADgolaPSr29NVq8nm62tAURELiFWVAwMATUN
+wTNL4i9+o7Rhg5BJlFiMsCNC+LHDedrU1J6zzNhR7sOzKcymv/BZ1oqpRYGEkJST0s9u5Kt/nspl
+OdMocGpigB2JGMdOGUaZYgXqrfvl793aDdDK+QCpI5eoqrEEHiyZPHDQ07a/MQwHIcSpxk4iQLzR
+TF542Sx+mpnJAKwCMESFhA0rMzNUSVnJmIY6PPRo6XvXSzlhhkC8U5jJNQSnnRgfe7hlE8zbOzzj
+tGDubIKDWm/ptKKlxYvj71xHLC7XIKJQQ2IMsRID7AwJi5IYYoQZ2rAhWnQbkaCi0RNFSkSJIQ4r
+0OtA2y4HbZn17BNYVesix7EjZTBEET2/FOs2UAiF+DUgMSBYSuIk3xsoUD/EsQiUQquRjX57K+03
+N/fRQ6w33CgZQt0JR0uUkEG4x2xuHx96gwWBQULOreuIv32NvrUxHjOMksQYiIMrFbQc22wWQRok
+JJIwG2UnokGYPPKUfvYMUoAVLonLESkCE1JQgYjf1QVuJ2mQZH1Fi6dUCMQqkcQRAFFYAr+xKsn3
+waZ86wywWHYJRWr23N3tOcuVSwrHbJ2IyWVp3Ub9+S3SsUnBTAALqeNcfdDUxGyDdDozrAVeZAEJ
+4GIU73sgvusBM3SISYhhxMEUCzJ6tO6/n8vVqSQCxGSMIkKiTAzRVWuSQkEZCjiJ1cWkiTD75Wow
+aNC2VAQwaWgBNo5s2YHABIc42tAhPV0CZxRKLGBWSKEoxxwa/uibmauvChbMp84iuYhhHAyl0m7x
+s6X7H3aoOLOBDAGqTlEx41bPQ5wBog0b5ec3G2JJWaWEkZiuvEyfml14ef2Prsp86Xyua3DOEXn/
+AgKrFiOzfhN3bSYIgcVByzHBScoQ/01Ar1v9rwDZgAEkceIi73VhNOBjDudD5lMQslMiItIEkbVh
+9sLT6mZMy86ekbrkIh3Xwr0lLsUElXTKbd5I9zwi+T4CQOy86R+mdtJNfp6R0cTRU8/Hjz4ljUMg
+RE6kM4+hTcHnTksfeXB2Ylv6M6fqzElGxbgYYIVBlMjkdj39xKi1xR8uEMRESUxqjCW7HZn812ZI
+kMo5gj9wAAxD0ymFozhBEkMtuaS86HbTm09fdJYZOUKSEjsVYlt20twUjhtHCgKCEa08vJk+uFcy
+ZRx359kaMhw98Yx7/kU/ZgOhim29hoI3AIgWyuU7btckNqGhuKSZnH5onswYHw4fZeESwFk2Y8cq
+icKqOhbROApOOCaYf3DpW/8R9XSyIkjUxcVAISYUY7c4oNcGOBCGhIGeTbRFDyAiCkIlJZfYKPL9
+Tu68N7ruBho1XCe1uUTFECFxpBxYFoAAUVm7Ut7eEJz8sfR5Z8RRH0UwQSZ+eVn5seec17u3OOP7
+3a6rDSfZuAZ/fMhCwCbOF83cPXNfuZhMIMteScgYLwjDAEKKmIiEoIFJ77+PPvQAvv9ju7mHCU4S
+jlSgZJiZB0ksD7AzSIU8P4IptKpOHaTsCKLWai4Tv/qqiZxpn0ipFLlEiYWNlkpIIvGRDR2buKeP
+mptTHz3UHnMkNm1A2tgTjw6P+IgBkYK0vxAQVgNAEQNiho/QC89wbePQ1cnjR6fOPMW0T9C+UrJ+
+vYEjdSHg8t0A+1njNLGtI+KpE/XJJZpKkjCAAokk5QIhoZAp/OvX66u01VRMhUQGTuJyrEoEUOMQ
+bOiRjs00tR024EQCMUzWFQvlTZ3sjyjKUJdE+bypr08df4Rzjkfvljn/HJo+RUWkv4ZHtEXr00CV
+TH195syP2+OOiPOb7Zw90h/al4tFky9LqUwwSqYEmI1drHCGyFhTLPPee4d16dJLy6WhidMpAZxq
+WE4UmoQpbwHcztDeMw1uLJWmU6oBkliLBQKpqhtSp1HBLXspmDnNtgwVhxhRyDYp9MqrqwXOEMyI
+FonK/OD9CvCsWWb0aOns0CgJEDO8xlHZBFc3w1LRuIlASKugYzMpB3Nmk0mXX1oWrVppx45JvCNB
+R0fU0SGGiAyS2JCajx0Wr1lLK1eZuibUZwjORpEUiwwb2JQGwVZD+uvU67fplTIhlQIAIS2XlYRI
+U80tzFbuuR9to/XD+ynKRjkymi469+QzAgOAJozkUz9WuvaWwqXfQHePzJ3lVq3lV1+3CLxFRUCV
+Ba8ag0O1BVCAfCF5bqkZNTYZO6r79v/sPetiM2m8PfgjVh0T9Pnlbv0GCJGyRoVkxsTUIR92t/83
+F6KkeQgHaZARV47jGIDWBbUt1YDTQNZbkQQ1gcBE6TSxOBenylHFU3doEw8bVnrqxfTqt1OnHqd3
+3S8bu4IUx5mUPr64TkWJKVdf97/+pS9TV772p/ENN2p9mgJK3nw9hgagWBF4V52qi6Z61xLvRsVU
+7Nykb68BmeSSr+mGjmDfOZlvfDE1tQ0wouh75jnK58kQQ1w+SR99FFsb33O/hkE4oomJVSGxoFhS
+WBNkzRboZWA5dWCNxlq98JZLQ0HIMCxO+3qJ4AAa0iTDmnnjGvfQE3bvOTjyYFDkVDgdmmWrouVv
+KJRBqZZhjd/517pH77T/dCKbNLGNb76n78of9q1eTf3O59SHP3lbo3IpX+q+5bbipVeaknDAvNfc
+9M3X1/3xl+E+81gNQRzBPvc8R0qWXLlPJkwIP3NKvPwVPPVCkMlK20gATEKRmlIxAWs2zWa73Cnb
+u7ljNLCfseZvU/HVcvUZJVDCplgAYJQxaqhpaVbV+MEn0dWZvfBsN2k8xbFwID2bo2efpYoAd0wm
+NX1KbuHlqeuv0pYWrFzhvn5Vz34f7fzmD11vPqkdYZP4g8C+Pz2Y3//w+FOfo0ee1qzlk07M3XxN
+5rCDUuksiVMCwLRila5eq5LACRU0dfkFpnmou+l2dHdJLpMaNwHeRTkpU7FMEJfJRJl01VeWtxrr
+AMA1aERENp0Bs0Oc5It+02+GD7fjdgs5Gz/6cPzyq2bUyNxlF8eNDcaVNGGs7XCASuyD+wgaEOrG
+jLLjRwqIWlpp3Sq9+VZdv9Go886dqqQEVdK7H+EXnjJNTVzfwDYdzJnGgBCTqCUTx86pJJs3U1e3
+CLSrz575ieyJR7nOnuTWO1EfJPUZnT6RvMNuKUaxZGxImZD9bnYQjPaDAH0lwAYCcDYDy5BEC2Xv
+4apDGjB1imsawqs3RDfeyp29qcPnZ//9X5Mp7TqsMZjWJpDSK69rxWGEALgRw3jiOCQOnznZXnAe
+kjjq6nbECalWrWaOSNavweHHpq76qjTVxXU2PbU9AFKiYAUhXvlG1NtN40Zh/FitrzMXnhle+UUQ
+J3fflby+kk1oR7Vmp01TVYVDOXblEpEJMlkOrQ4C7hg8ozEBIEI2YzjUGFGh4M9SLMHsMS0a0YRC
+n7vp9vxHD6o75MC6o44IPrCvrl2fnjENcVR67uV46LCwpck7B9psPU+fJlEpzDVkv3JR8Rs/4K68
+KgUEQByYgSTfl4xqrf/xt5LOjXTWervvnjK1zWol4Mr19ckTz9LsWeGsafjBlUEsPGl8SuF6esvX
+/ZpNCsqYs6dmMkwCkPYWXLlkrTENWabBCqAdWK7fujYmZLNJwA4qhaI4B4IDgr1m2EnjNchqT2fy
+rWviN94EITW0KTNrGhjCga5ZVX75ZQVDHRRg4vaJZuhQd9vt+syz5vSTdOYUxN6IyeSdTVTtP31c
+N3XG193o4nJqSluYqdPKzDGl11bFz7+UcgJIuNtuuUm7ZSCRc31X/4d7eglygbNsD/0IAQpWsBb7
+UIrVGMpksJPu/TsK1gATIZvx1oKgN4/ePoANEA5v5fkfoTRRU1Ny/xOlf7s6XrXKG6QEkhQK+uQS
+89obqt4DXARqx401M6bjoSfynzg/uvqapLsTQcVFm1UdsTqhBx/pPeGs5H//hIcO0T1mC/yhExKA
+NnXIkueL696mSogQR4VyfPMf9fvXa30uKRXt7OmZA/bxfv+UONfVjShGXTZpqBusk9nBdQYBKJvh
+IY3S1a35ouvt5aYGEoApc9zh8X/+SR59MjW0Mf7l73p6C+mTjgknt8dRKbnvgeSexeEhBzGgMAAz
+hEa3Ysok98SzvHpdtPBK09VnvvFlHjIEJCAmqDzxVHzWhUhnUJelpiYzZzorgUVVQYatwcq3C9f/
+GnXZYMTIqDsf/9d97vpfQZBSLgfp4PxzKBV6jcnFkXRtJnVJJpMZ0jh4+Aw89DWxSASbTevQJryy
+Qrp6XE+3QSuYGRSMGp391KmFF15yPUVqbtJbby8+srjQPg5lRy8spSCdTBithIrOTrCNjbzHDL6J
+kc3Y8lCs3kCFsg6peAgbEF5dZVJh0jwMUYHHjQ6mTdOKI7+zkHhosxnSGN12e/GVN0qjR7p1a/SN
+NyiVJlMv3ZvMeZ9JH/Yh0oTIAqByWdZvZnGcy4b1gwj9YJnPFFA42NA2DxUqId/jOrscKuGxpAgW
+HErnni65jOnoRUOT6em1jz4dPLUkKJTc7tPt3rOdAnD+AwjBfHAfnTnF5ftcKoWOja5c8xeDQmn1
+amELckpkjjrYZFL9LAwcTBiHj3zQBln78qt8/6O84k3ONJjIUedaPfbIzL+ca0FGjRBUocXIbVov
+JJRrQENuwPGp0WD618NwGNDYUYEYKpT17TW1bA8KZ2yQO/+M0pjR7me/kaUvOI05SGvamGmT6i+9
+INvQJAJlZlEwkUo4fbL72FHxq9+3haJu7Ijzeavig4CYKFq1MglNqlhM5swJT1zgKpY0H3vjbCYb
+nv1J6ux1f/wv6S4AkkRxatQ4c/SB6XP/KdPQDHXKREpCSPryWLXaKLi5XhsbBg+fwRI4FStOOuT2
+8SUTBr2d8etv5ABSJKSWiIBUmLWnHu/m7Rk/+2d5a62WHEYNTe+1O+8+C+qYScFggZKAmTX8+PHR
+fQ/Tfz8ad2ykjk4lITBTEscqqzcYpiRMpc4/g5ubgIT80JRBInCZ8eOCr3+hfNgHseJNKifp4UNT
+U6Zh31k2lVKoEleCGkXcps14c51Q2rQ0a3PTgONTowGFvr/2qwCBQmtmTjb19VIs8YuvRF3dQWOj
+AUFJCUSwgGmfGLZPJECdwHAlooyoslklBtQSkRK3jHDHHFlashQdm6JVb6WjeQiharFpg2zstkJu
+/oHZw/6BIYCthH+CyRvXQGFLS3DcUYBoomxJt0R0qj/RVKhTcS8sT97eZNM5jNktqK8fSHy2pkG2
+15PhiRN4arsUHZYuT5a8yFUXdX+W60OcyRvcDVM1ctWH1oJEoeQjKglMCI+eb/aeyUlR3l4jSVHV
+EcFt3mg2b4yHD81ddBab0BsDfOSxEiDV5boyHZmtqey1AChIiLxXIhLtLkR/egCuIE31wZTJPGhx
+DRjEU6pqn8NhQ/kf5ikSt/rt+J4HYiBWqRr+hIhIuRrDLFJJUsGuGtLMqLFnohCMbOX2doQ5njxZ
+0llvsTCjR2F4ixk1NNx9xpZoNCHAb06hJAmcD1VTqVj2WcnHkIJJwUaUNIhfWiYPPQa2mDDG7DNr
+UFlzQKvudyZeYSiA6nPBUYeallbkS8kddxcfe7ISi6rsAz4coRIrrMTeWxUw3vcSXMm8QImqjcFM
+SmNG2wnj7ax2S8Z5w33jENp7lo5oJVaiqq+O/17sTdlsYUCiBGIBSSXUyx+xqBJiYZSiUulHPwnW
+dZhMs/3gB9ITxg8kOO+gQfiquvU1UXr32fbUf3TOYeXK6KofuLfWwEtYUkAMarKAoGwqHjVQTqia
+8kJhiSRUGCWePT1hlM77Ste3r3aLn8r/9vfdn70semgxzZjlaoauSs45QdW+BlTFjvrjXFICKwkc
+KUSDWFH47nV8+72SDmR6W/DJ48XKVmMZeKAGnZwT7Xt5+cYPHNERjNgwZHzHx8+M1m50mqiTLXlX
+JKkkYqnkPnGVlC1bMqc4VRV1pTdWd+1/xPohEzeMmLpm8l4drbtvbJm5uX637pt/r9XqRF0t+0ul
+tkorlZ/VFCuiTmNN+lQ2fu/6dUOnbBgybv2o3btvuNE5JwOaguWdNPgpRpWZJDNlcvbLF8iYsSZK
+cMe9ved+ofTmemF4OS5QJVML4Ieyl9cV63l/Jydl2zZG2idlSmKSJNjcKy6mQqnY3JieO8/HCorX
+WEghPg0pa3WZrYlEBqkqQ5XhxCRXXSf/+q1AFSYVfPKE9MdPEKbBBmfQoSeCCisQHnZwcMWFUUOj
+EevuerDnnIvKy1+Bg0DZqfc7q5yyoiK1tBJ8Sz5Zi6/QAJmLzy4cc5A0N5umJttQr5PHZK/4YjBu
+tI9O4IrqQso+D0NFoSJU/UhIBKqgBBz19uU//y/Fq75lTCiO7VGH1l92oQkMqTJt8bUaFGR08NPI
+qmdeuAim9KvfRl9ZaHuLSRzLqJbUl/45PPGYINvA8E6+1ZgxrcV5bmFVH6mjSgDFFJnekrhEnFJ9
+zgbp2kl55S1UVVh/cLmlboiCCIkifuH5vi9+nR96ytalEmE+6rDwh/+aTjUYrtUwwEfh/el9gF4U
+TKIJk9ffC3c/ULzsSrNyJUWQOKLDDgy/9Lns7JkmDEG15LislZwEUtFUIKrkM7uA1Xm1EkgURGBJ
+iK0ARuFzSmxJdKPVJCQ1jTdGoXNz8Yaf0Q9+Fue7TbqOwxSfcWrDZZ8nQgyEGoMCB5iB9kLoT+9D
+TmOp5gphP4pIkbyyoviVb+CBxUJM3V08tJ7O/FT2rE8GLcNgLESZeQtStVnv91neAcTnERKfulV8
+Rg8o+wQVlWUD7LPLKTQRGDZQifI95QcfSxb+0D37ks1ZMGHMWPryeZnjj81saY5rvR+UUxIA7wfX
+K6qZTARggSM1Qoj6SsXvXEu/+b1s2EjlRPJ5s8d0vvDs8NCDguFDrVTD9r24IAHYITGwcICppjFg
+rX4PIfjIcc/e4rwDRBU4B6C3p7h0WfHaX2DRPeRKlE0hyMphH6q//Aup8eMUSkp+A1xVRvtdDwK9
+H7Le85GXO1UTvM+c7fLPvYTv/7T48CPc00PdvWJZDv1w9oJPp2fvHdbnwE7VbCXB+4vvWvrtSmYd
+AAlgBY5gCD7ylQmq5bj02uulG3+f/Ox3ds16NDQgy659UnDGp+s+viAAlHwa40TUEhyRgUL9xaDR
++wP9u5IoIpJk0T3l39+mjz+pm3tMd2c0blzq1ONSRx7Cs6aZhgZTBVa3Th0L9J9SVclWZVWFODAS
+SV5/Pb7z3uIvfsNLl8GGpi4jUybbow4LT1kQjB1tUZ1b7zvtMugdEqNWof4MVcWVb/pD4de30HNL
+qLMnigvh6Db7j8eY449M7THdZrLVglwVxQJVJR9Y4vXR/oFmIsqlFW+U7/lT/Ivf8VPPs4rUNeqk
+3cxRB2f/6YRU2wRSKBzAVM0A9j7TruP6SsYmoB+W5XUdpd/dmvx2kXn+5aRcMmJ00gSccGRqwRG5
+WTOdMSC1qHB2v4yrFSNB4hM0Kcqr3ird+4D79e/lyadRKHMmjd1G4tCDcqd8LJi3lwXgtqRJR02R
+fX9plwocL6eFqpZzARArx88sKfzit3rPA3hzDUVlSad5+gxz/OHpIw8Jp0/2OQtUATgfz+bXQ6gj
+onjd5vz997ub/yAPPs6bezUIdPgw/uA+qU8cnzv8QPIWN6iFVpefXTb6XSzrPfmDXIapYRHHcXzf
+o4Xf3yb3PsRvr7PqkrqMzpyaPvn48KOH2rbRCrJKQgoIi0kYlO/L3/NA8pvbkocfsZs6ISxD6szc
+vfiEY9JHHZwaNqxyQAat7N7IfzCtbnnfb9pl0CvgNcItrNcvkVwCZ5Sj7nz88OLC726mux9CR2cA
+joY3BXvtiQVHhUcflGkZ7g9gY7jS/Y+Vb1pEdz+sHesljiSVpXl7hP94VG7+wTxxnKlkdK+tFpqw
+WgBbtM9B3Dq9G+1KWV8Jea3Iiq3VuKoqKqBkzZryQ0+4391WvP+BVD5STtGwBt1vlj3uuPRhB9Or
+rxcX3R7ffZ+8sTqVL5ZDy7NnhR870h5+SGZmO4EIlKjY/sZjoOaeDwc11RS+7y/tSq6v7rS0EhxC
+1QX0HXuZCJK8tab80BPxT2/EI4s5EQQBRo7ArGm8dqN77Q3K50WEp7aHpxzHRx2SntpurfW2GhJ1
+TKa6D6i07ftQDbjdJTL/r0LWv5O2aO7VX0GUQHXlW6U77yn8/LfBkqUOzmYbonI5KJWT0S3pkz+W
+Ou0kah/PYRB4b8u/bnq/od8G0x14sbqxj0tlrF5bvO+B4i13mEeekrEj0guO1AWHZadPCxsbK2bO
+nW3l/aSBgX6nAf3LqWpHRAwySkkcuU2boof/bGeMS48ZK431XDU07gq5vTP0VypwtkNa2fuoN7gD
+RCqSGBNAoSI+CJngT0EG0fYyUPQ3A301cK1mzd/yx5fMLrAC9OvYzs74v/a1qEZV91WjYEBIxbO/
+9Qb5aiIvv10AknetaEfoL+HLnZa0fzNcD1QVUqm4lvXTFYX6a6sVk/Ig9+U9L28DAL1zFc+L7Tfg
+kxtvL6FPzS1CRGq+G8zMzP1f0eofXBBJ/IBFxCvi5DOngRkKy5ZM/2OZ/g3Vmni3UYRhWBuOc+5/
+RNb38L2gv5Purv17dueddz788MP5fN68IwctMzc3N8+cOXPOnDmjR49OpVL9a8jn8ytWrHj00UeX
+LVu2fv363t5eY0xDQ0NbW9vcuXPnzp3b0tIShqFvaNmyF3/5y192dXXZd+QGIqLGxsaZM2fut99+
+I0eODIKA+h2v9/X1vfbaa0888cRrr71WKBS2AYuInHOtra2XX345gDiO77333kWLFqXTaf/X5LY7
+/CiKTjjhhIMPPnjn0NsCwXshETn//PNbW1vDMAyCwFprrQ2CwF/XOHf48OELFy7s7Oysvbh8+fKT
+Tjqp9rVSqVR9fX0ulwuq6SDGjBnzve99r7u723PrrbfeOnz48CAIwjC0W5NHk4hGjBixcOHCnp6e
+WisvvfTSaaedVkOZmcMqBUGQSqX8z9bWVl++UChccsklNXCstb5M7a1UKuXf/frXv/4eoXtPTt6q
+SkSnn376AQccUCqVmLlYLDKzekcY1a6urieffPLee+/duHHjpZde2tnZ+bWvfS2VSvX09Jx33nn3
+3nuvqra3tx977LGzZs0aPnx4kiRvv/32I4888oc//OGtt946//zzN2zYcMUVVwRBMG/evGuvvbav
+r4+I4jjWmuQB8vn80qVLb7311vXr11966aWlUumyyy4zxrz55psXXHDBPffcQ0SzZs2aP39+e3t7
+Lpfzf9PAj99fNDU11T5PJpPxN+fMmXPWWWc1NTXFcezb8kMjonK5PHfu3G1w0B2U/u8Jet9SXV1d
+a2truVweNmzY7rvvjncs+t/+9rcvvvhiVb3jjjtOPPHEOXPmLFq0aPHixao6cuTI3/zmN3PmzOnf
+77POOuuKK6742te+BuDGG2885ZRTpk+fHoZha2trX1/f2LFjp06diq2Fnqruvffe55xzjqr+5Cc/
+Ofvss1tbWx955JF77rkHwLRp02644Ya99toLwJIlS9566y0/Hf2cE5H6fn70/pMACMOwpaVl2LBh
+PkuIf8TMzrlcLjdjxoxaH3YC9y0t7Rx5UfD5z3/eS4mxY8cWCoX+j/zPF1980QvocePGeU5fuHCh
+f+Xkk08uFovvrHnZsmW+e2PGjLnrrrv8Z8tkMgDmzp27YsWKbfqgqq+++qp/ZfTo0Y899piqfve7
+3/VwnHrqqd3d3b7YHnvssQ1zEFFN4BSLxSuuuOJ/BI2Za8Kzn3PnjtEOc732+7z+Ip1ONzY2dnR0
+NDc3p9Pp2iOtTsOnn346SRIAmUymoaEBQHNzcyqViuN46dKlr7/++vTp07ep/IEHHvDvWmuHDRsG
+wFrb2NhYLBabmpr6M2mtoWeffdbfMca0tLQAGDJkiKoCWLFixerVqz2fnnvuucuWLfN61Jo1a37x
+i1+oamNjY60DtWonTJhw+OGHZ7NZjxQzSzUL/zZ9qL04uALnnbX7YQCIomjx4sXpdFqr0zCfzz/z
+zDPXXHONB2ju3LlTpkwBcOCBB06aNGnJkiUvvPDCl770pU9/+tOTJk2qr693znV3dz/++OMLFy70
+ley7777Tpk0DYK318qGvr++ZZ55pbW1F9VOVy+Xly5d/85vf9N3bf//9J06cCGDPPfecMWPGiy++
++MQTT3z1q1/9xCc+MWrUqPnz5x955JG+wmeeeeZXv/qViPiaPb41jpkwYcI555wzfPjwmlZa84dw
+zq1fv37UqFG1m9u6SvwltBMzZZspdtFFF2WzWV/b+PHjJ02aNHHixIkTJ06aNMkD5Ht2zDHHLFmy
+pPbWTTfd5EU2gDAMZ86cuf/++3/gAx+YPHly7eaJJ564dOlSX/7222/3jEZEbW1t/VsZPXq0f8UY
+s2DBguXLl/tOJkmyaNEiv/z4p21tbZMnT548eXJ7e/uUKVPGjBnjH40aNcq30l/DsdZOnDhx6tSp
+7e3t7e3ttRf9z0svvXQnoOtPO7PMbvNhd9ttt3nz5nV1dQEol8vS729jDB06dMqUKePGjdtnn30+
++tGP7rbbbrVHJ5100tixY+++++7nnntu5cqVmzZtWrVqlTEml8vts88+U6ZMOeCAA4444ogarE1N
+TXPnzt20aROAKIqcc36qqWpjY2NbW1tbW5t/Zdy4cahu5RYsWDB69Og77rjj+eeff/vtt/v6+lQV
+gH+3vr5+zz339ND7Vpi5ra1txowZqVTKOecbqs0JX6AC3PZSj+4YjPqed7Pr16/v6OjwWNQ0sErt
+RLlcbujQoV7Eb5fWrFmzadOmQqEQRRERpVKphoaGUaNGbSNM8/n86tWroyjy9fu2akyQyWSGDRs2
+ZMiQd9avqkS0bt26rq6umq6yTYFMJtPe3g5ARDZu3PjWW2/5rdy7gaOqI0aMGDFixF8E0LvQe4Je
+30W06dZq32Cb8t9Lc9t9933oM94L9APYv+1WtdP1vz/AvXf6mzEa/79HOw/9/10Ubvf6/1LVX3jz
+L2luRwXOO6/f+/r3l9D/AYyQXh9QbiuhAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_ferrari" model="fleet.vehicle.model.brand">
+      	<field name="name">Ferrari</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAMAAAA6eNVMAAADAFBMVEW5uCNtay/8Dhr5GSMuj1Lk
+5OR6ehpjZGT40dOHhxj75eZXVxn//gVUVC8DAwb9/v7zJzBWV1b1c3irqxjz9BW4uBnzjJC3t7fk
+5CV2dnfM5dnW1ienEhqWliZnZxra2tqEh2j+/hrIxyP//w4BdCgYGBhISBrx8/GJiYuWlprwTFRE
+REXc3By528k7Ojqt1L7//xHj4xI3OBX//wfs7ROioCInJyjr+PLz8hvT0h3q6uopKBXq6gh8fk7D
+w8Ryc1jzpanj4xzr6xtInWnm9O5VV2R5upX0/frZ7uSlpaX0ub1UpXTZHCSdzLMAaRn//xWsrKz/
+/wjOEBf//wvLysr5+RF3EBj5+vmGhyLz8g0VFAmbnBPExB25t2r//gH5+RZCQlZ1tI75+Q02NkKb
+nJyayK3MyyHz+fadmx8/Pif4PUWgnSjDwxMlJA31WmDv7hqNw6K2tgwyBQ2zszbT0RRjrIBQCxP4
+///GxS9cXhWUkyDw8BzR6d0Hdy+Mi5h1cw7o5xo0MSKTlBVqsIXb2RPNzReVlDHQz9FsbG19fYFK
+SgoXgj5QUhmrqiRgYCEgh0bIxxu/3c3E4NFraQ//+vrn5xP98vMVAQiBfx0eHiD//Qewrx0wMBc3
+NwsJCQr+/QUfHxD7/Ptgq30PfTf7+heNjR3+/wUAbyBydxrR0CEtNA/39hD39/YuLTL8/AoQEBLf
+4Bbf3x39/Qh8fxK+vR5OTRdRUQ///wL//wX//gL//gP+/wL+/wP+/gL+/gP//QP9/gL8/BH6+h/+
+/gj+/Qqrpy1xcB5dXVmmpwZhY3Gzsxz39xy+viWen5+Gvp2xsCtMTE1RUFT39xTX1Dzg7+fv5OXP
+zjH8/AX8/AbDw7D/9fn6+gaPj4/7/wHV1hn7/QfY1x79/wHQzgr//QAVGgnW1QyKizwuLhE6ll3l
+5DmhoBrt6ydBQBetqjHw8DD0rbH29w29vb31nKCYmBv4+gqalx7w7w9fJiv7+wz5v8H9/gylpST/
+/wH//wAAAAD////ZDpztAAAN1ElEQVR4nO2aC1gU19mAScBF2HVAgSBR1+K6qxayTnZ0o9LQAl5C
+jF3XES8bCypKvKGJMSaINCStESpiYkNglYwYhUCUrlbhzO6qDdkU6i0Fm/RqrG1p9Y/0/zX5/9Rf
+Z77tN3sBTCx7AdOnz5PzyOPuzNl5z/ed73K+cybE+W9tIV/jv8Z/jQ+0jXvqK8dHRbnJuyc+/YOr
+V3/w9MQHx7mv7/9K8M79H+6esyxj14Gxb0tt7NgDuzJmztk9fWEwdD/wHnGxLZz+4MQP3rpaJIGL
+doTNXrby6WUZYTukr2MPXH3ug4kPBjwIP6V/autrc2bO3lX0XWwHwjLe+mDiY8+77zy/FYeUEXbg
+bbwzNmz2zDmvbQ3AInzjH5HAV3cUjcXH78rAyd46fRZefmPwdx4YNuyB/xn8e/wya/pWNIWMXVKf
+oh1X35q5cvcj/cXvf+pDJGfsKHLNcFjGspUPPvJ8FIIjH/902Pro0PulFhq6Zv0Dn/5/pDSI52dt
+nbNsdpj0A5wc7P/ah09F9cxdYPjpz4UVoUbH4iTPXPnQdOlS5ODHHxi2fk0okkOf8LZQzyCGffr4
+4EiXunbP+eC5q9JEvT027LnpQUr/WNHbbl1Lqn59sCTxmujQefNGjlywefPGyo2VlZUU/uGnzZsX
+jBw5b979odGSJh6PfF3SxGOvrVw2+2pR0YdB4sc9tPWRWVEosgcc+gRyN1ZSAEB1vtNUUF+/KOLY
+sfr61gLNO50cjmQjjgLHIA1iGE6HNIZZj+3u2w7/NT7qjUjJutZES8qV0JUAXKeuQPZkXPKURDox
+b/ioBhVrNN66RRsKL595ub75iomr3LhgpGs67o/+pmSXkW/sjwoOP219tNu4op9woSmd8uW4IwbW
+oSBiHbl5rbWLS4n7xTqD+O7HfxJFgefZlksxEc01QOEQvIYZvf6NIKWPjJZMKtTN7ix4eV06zbJE
+dDWFamd1CkVRXHvSi4k0SwTBdZkwt+gjZ+p1lGcEkol+FKT0ka7p3kwBVVMek37LyBOeOWFDEv5T
+GJ9FNlBc24okeUHVJSJdFAX7KYWjjjHmNMjeQWNYMBJdJDoyaPy8BZUUla/cW0gzkmwooeBq+35G
+FsssagsF+tKSRjBNTtsn2Ny3RJcieDZxiaxa0sG8NcHiP/oHB1zTZ2k0yysUQq8m8qqp5XoYH44+
+YOmgoHOtgShI7x4KXmDo9Bg5B5X/+Kgveh/4QWqQXzrEE5G3C70eflJQXapKWaqHdiRDSaoejVJ5
+oY7vjSeuxt9skIN6UPD4T9huhXc/WbhQlaQHSq2lEMxptWqApr/nGXnhy0007uwX/kmj9Yt4gY2h
+Gim0R9CHc2164PAj1XrUcVc8P7l/eOaLcJRojGY1h7OOkieEW6CkDfGa4UbF3fCkn3j+S3hhD3tt
+NZUyalFKvro9yQIJbWh/ltZY672Q/i54G18R8Ukhyxp+KUV/GKoF0Jwrv738yz3vCV7SKRGzRZWc
+S0Cza28H9Utx9KHffkXSY7Na8clHTO2pKL8era/8lQqe3KXfvcETmw3zSwTES3FHK/n9orPeqPdV
+SI8jYNNMjaPRAajz4ZgKTVOZ7HuNF6VgJn3HzKagW0ECgzo1CeC+X7YWK7y9xHuDRyiPEViUPv3F
+eBySMiXv10tBl6u69rntHuMFnv3Wt2iCZk+ySeI73Hit5HdJ8ZiXVr+S3BN27g1eVFyofXSI8igj
+1r2rOlqAIoPk9wlzcf5fGnVhzwmXSSiIquI6ozg58Hgm5vT31VDzmYGhV3Xmno9PTUA8N74R8dza
+s8TuxhuqJquYPfzAK5/UUpyUaspGbKE6VpS0lUjKt+ildW+NMou4pOfp2uqctHMsGXi8sRbKhpw2
+A5jMlBk8zRV3ueq/H3JnPD7ZVGuQKWn7QONF0SCH49va4tVUQgfc2VJemZxlcwnMy6iQ4dxnXjsc
+MDxR8EuoVoPq2PiO8BVcN5hTA8dByvCc3xIJL/6kGWQ6XSwz0MonfHpKdcO6vBE6daq5R+7G7eaI
+EDlXpXJ3Exd34fq3gf7jQEsvsLWwttxiqTFZcnup3TJt6YsthjjNJQ9ukg5Ad65q+QD5/cve1Y6o
+arY8e9pCqb8w7RPG52/g2al5nl6fd6Eb1GhU3l8xq8AcLH6aGY45vA9q+dGVZzG+zUjQ34E337BE
+qOq6TW15s+QLrd14tgr004LEL2wEpdGrRrbgygu5NVuac0tL1G53czetlhvDKrxhxijDCeFaVdne
+X8lBOy5IvDMJmm92yyGr/vX3hxgOPlnToYXefEx6Iaw3NvB5JmqovqBb+pYrMLTvzaY+8AmgS/c+
+6OFH285kfuNzwl5uMlmoXnjkc1tyiKdfYpflovpNgyfviJNMUNonvS98JpgavCa8SRPy18yLP2RO
+EdWmMRroZYPSUOTFDsGOdRahf5w7FzpjPVlX3ETB3KDx8wFu8+4n2RZXOCYNaZS1SAW2Y2qnZXt7
+b/nhyl6avI/9HC/OiAdThegOlGQnWLYHjR9nBuVvvGGHkOuPmrk4QbTaRDYv//QgrYetdQVBTvae
+FOvYY21zvXg0mHpo7Nvw+9zXC4crscIpj1mRj1/IpWqPLP8TEayq5DdnbE9y4ZOcWrcCNMWs4yT7
+445MyL/g1phAd0G7j53evvDxQOWd8GQv4YTjlhKDSpqk1WzjwWPaCUnStF+cz1HuGdAUEvHgm6Xj
+ocDteIQvzvdleX3iMe7JWC/eZs1u4Ga0HXEZuV1QrbuvXYr+44d2m0CM0VBrSW2EOKMr5djYOI6L
+7wf+cAfo6J76wc5+lvvtz72uSHLKS3HaG80WL782dotlQgIUHHSHIV4l8xXxfezprgAur6fIJfvY
+TTGHvF/4SasPz0W9N2Z68V1dEF4KumLGs9WRpUHL6A9+tBqUbA9esJMeXYgVptzRJRh2Uz26Ry3g
+MqhsOCN6el02wYp+4aPaIL9C6NXEnmW8FNLM8WZIuuFJvqUvSf/dVnlkF5laTMj9wjtvUNQnd60e
+8fEGTO7aDi5zggd//j5c+YBMxbhVJbbooD2qf/ioRmg6yNyNb7WpajH2t8eP9qx+Gn+3WiOnOJnK
+PdwTJ/IoyPRF93WcsAKokC/vsLhMTyiuwagz7qIn/JZ8r+B2WVn5FuM+130FXeDb7n3icc3RZLgD
+L2IEsEr1psAuAmifO7fDHXUscUdDTHFLXvXoihw1QbhPus/DlIvALbFZe6lfQYi70hTIJA2EZ7oq
+TSw/qlpomTzx1k/dQxRVEUD5ijl+4AeZQW7o5W+C7frDf940SYVOoGCKU3LjS6SYS1GjaDKlazhx
+r02tdnHDFdAe7j/eWQpcHNtDJ3xyV4e+s/XXaS3v42dNiSvoIV0UfihP9KQ6BaNa5TPV+4dHy9Yc
+JL3w7IghqOul1JC/Pfur/ypzwakqmthI1qjrbjwWurHVoPdDeD8O0i4CtZft2bvhHWyavKmgqSvF
+nLtU2tZtTELnFE4RK3/oD54+J423wS/h/cCP04MuViTd+4YYU7MO0TcXP7xtp7KaAtO3z4NSle0q
+srp1dLbar5n36xQTc0oELfbatrQxuPjheZ55/0KDcu0oC2XJuyM0iqpaP4X3B495t3PEHaHPtZlg
+tws4JCN7uQaSumJ7bvMO5ihe6nt9HwDeOd8CTTl33WLDFPQxVt5LXyrsuXaCNyiBS/WL7t8RcgJQ
+k9lu5yfSvqbV6oo8dnSx0+r8JUbMxe5jHlFhDOH8CXj+46c1Qkpa94kBkc5KCLFh4K07oTqTMEOX
+zAg8g7aAf2gZ6HQW39E+ALzzBgflidle+Y2qbce30TYi2uvomKEzfpTO8LHb4p555pl169YtFukq
+8CPVBYTH2Af/x4pWtwHEjto5onwvs2+fgj2utpRP4f83ZEvVi8qy5rKm2kPGcxx0RA0wfloSmKby
+bu+u21KbmNf6KlP3MzomIbf5IO8IGdNy88KikKys638kaSlg9lHaBI53zuega4rowjO18vde3cCc
+sqtucyVlhTxhJ4dUkCNdyUIda08s99flA8Jj7AUl7fa2DV31KiFbIH/WlkIEK/DsVOUS9nirwVpH
+6EUUlPhP9x8fFQ6wVlr2ioRJ040yigL/TGNp9RkMwbFMbHFe65DhDp5Fn/OxoRAk3jlND5Zzxmxm
+8baGa5fzk0WRP1LwSSIjZskLDpKs/y7fm2NkLueD2v+JDwjv3K6GmuS6ivJVlyto3VSUnjEYxVPM
+Uc0ZlUM8IjPwRjQ7LoCJDwzvxKJGV7ykOp2nzyyStl14RrQyjkM/P8oa0+vHMGyhBmBCQPTA3lq6
+iHXstVVrXwgJyZFCoPuoljy8aO1a2RKaOYtrj4TA6AG+NJUAIH8vp3A5b93TnWKymZZLyQYjMwVd
+riTQF7cCwy9E85efJfY6ouhJcQrCM3ahEGVv82uJETzeubANoDyW/8K5FXEY0+XgaxNtAPDOw8hv
+Sr/zgM0u0iOw4AsP4qW1APFRLn5XsnGfrbvYPfkuey4/iHkPAo/tMBb1KWNU3StLkU/cYgFqfFQQ
+9KBelizF9e1OWirzCJZTjnQ0eYvfGb7/eOd5lLZ1g9FG6vYwiXursc6fHxw9yFdFpbPLrnM0zxuS
+W7HSCPe5izGweOegDunsdEN6Ldb46syoYOnBvyg7wYwWiHBLib/LygHFO0e3SdXl0Bv9gPfrNeH9
+NzpKUoN7P3Yg8FIQ6m/7T35H+2t8/9o/AYS9VqLRL1gsAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_fiat" model="fleet.vehicle.model.brand">
+      	<field name="name">Fiat</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAA5U0lEQVR4nO29eZBd53UfeM633PWt
+3a839IaNxEqCqyCR2iPJomUqcazETlJRbMeempo/HNfUeFKV+cdVU5OUJ56ZP8ZxPBPF4xlPpcaO
+LDuSbcmWJVqKREokIYIESQANoNF7o7vf637LfXf5tjN/3EYLlmLHFEHQUnwK1fUA9Lvv3d937vnO
+8jvnQyKCv5a3Q9jb/QX+y5XvA+iJ6Afy0cQfyLv6vpDvA63/QZW/hv5tE/F2f4G/SP4yxpCIELF8
+ffDi+0L+6kJ/sLv+JXcjRLxzGf7qyz2C/rtBIYLyH5wDImIMEcFaAkbOuYN3WWvL9xLZO6/AGOPI
+EBEcEhBjjICcc4jIGLv9FmKMOeeAIQI6MgwZAoPby3lwwbdlzd5yD6eE486b3P9gxIP/cs6VEANA
++cJaa4yx1jrntNZKqTzPi6IoisIY45wDt4+djMM4juM4DsOwGse+75efxZGVS8gYKy+LSMAQiTnn
+OOfllzl4fe/lnjqXB8pVfqgxpnxRQl9ibYzLsixJkiRJ+v3+9vb2+vr6zs5Ov9sr16BcjwNYDQPP
+83whoygaHRmZnJy8//77T5w40Wg0arVKeU3f9+G7VNtaewD6D6bWw22rXd5b+dPdFiJSSmmtjTGD
+waDX63U6e51OZ3Nzc2dnp91u93o9YwznvFqthmFYqVTCKPI8TwghhGCM5VmW5/lwOMzTLB+mg8GA
+M1ar1eaOH52amjp79uyJE/dFUUREnHFyDtj+2pdPA7xNuMO9D6lKnS11vJR+v7+3t9fpdNbW1ra3
+t9vbnX6/PxwOPc+r1+vVarUEPWo0KpVKtVr1fV96XhiGQRAIIeIoQERrrcryJEl63e6tW7fa7fbq
+2lqn0wGA1ujo8eNHH3vssePHj1crVQI6wL1c1PLt997s3AvoD7ZNrXUJvTFGKdNut0sF39zcbLfb
+u7u7SilfelEUVSoVKSUAlNsm59xy9DxPSomceZ7nR6Hv+5xzP4o9z4uiKAgC3/fj2+aesnx3d3d1
+dfXGwrX19fUsTSYnJx977LFHH3202WyWG0y5AD/IWm+tLX9qrZ1zeZ4PBoPtrd319fXNzc3t7e3B
+YFDefxAEUoAxJs9zpRTnPI7jSqXi+34YVxhjUkrP933fF75XGhzGpUMQQgRBwAR3QFLKKIqqvl8+
+MdkwXV5evnn9xvUbCxsbG41a/Yd/+IcfffRRzrm1tkT/wPjcS7kXHo611lpb3JadnZ2NjY1rC0uD
+waC0OYwxIURRFNZaazLGWKm/Uso8z7vdbpIkRqk8z/M8L7Q2xhhnGWNcCh983/dl4IdRVKlV4zhu
+tkbHx8eb4yONRqMWVyqVSr1ak1LutrevXLmyeP3G5ubm3Nzchz/84fn5ebi9Fd179O8y9Hc+xeXP
+wjqriywZgHU7O53V9c21jZ2l1TUnHUdkzkoETqCUQuBMelgMB0my2+sOhsmwyC054IwzWQ0jKaUI
+fC/wOedIgERknTOU5llRFEWRZcNUZ7nOUl0or1JptVrzh4+efuDs4aNHxloTE1OTcRynaXL58uXL
+r7+6trZy7ty5D3zgA83maGkSS0/3nnk+dw367/6WpUteqqrWenN9Y2ll9fKVhcEgGWmNC487a3zO
+8nQ4HAza7faNm8vdbj+uVWdmZubn52vNRhhEYRhKKRHRKU0IloiIHBA4KrXUMU5EDh0AkLHGaK2U
+Umqws9Xr9dbW1tbX141zDzzwwA/90A89cO7BmZm5Vmtkc3Pz2rWrFy9eBIBPfOLvHjp0qERca13u
+MffA5b9r0Jf6fhBGlj5MURRFng76w82t7RvLK1evXtVaT09PV6uxzW1R5Fcuv3bjxo1erwcMT546
+c/bs2ZnDh4MgQMQ8LVSWk4XyOuAJQ84YY8kREQNkjHFAEoDg0DgkQgIkICJAQrSccyIaDAZr6yvX
+ry4kSdJqtU4/+PBHPvKRhx56UAi2s7Pz1a9+tdvtP/7444899lip9XcGH2/p9vuWGBxrbRl85nne
+3+2sbdy6cm1xaW2Ne/LMmdPNenVjbfXZrzx35coV59xDjzz8jne989jx++I4Vtb0VZrnRTZMi6Kw
+ylptrDbOOZNn5Z5xEEwJxhARPWSAjIAhlkpqEaSUAEznhZQSyCKiJ3in01leXl5cXGm3tx8//9jT
+Tz/90EMPViq1V1999YUXLszPzz711FNw26cqb+ctdTrvJvTlQ1ramTIi7Xa7GyurL718aXVjc/zQ
+ocfOv2NsZORzn/3MZz7929VK833v+8DHPv70kaPHcmUKrcodNR9kvV5vZ3u73W4P+4PhcFguQyC4
+M/vQMwBWJn0AhLMA4BC4FNLzQHLue2EceUEcRcHY6KjneVAGccZIKVVRdLu7zz//jevXrz9+/h0/
++7M/+/DDD2tt/+APPoeIP/qjP+r7/sFG9ZbuvXcN+lJBSuOQ53mWZWWUdOnSa8tLqxNTk4++4/Ej
+R4788i//z1/8o88/+eS7fv6//e9Pnz5NwJM0R+T9fn91afm1115bXVjf3NxMk34lij2GqsjjwG+1
+Woq0M9aViR1jjTFaa+OssgoACACRW2uzLDNKI2I0Ws3zvDk6eujQobhaaTZHozg2xoAunDNMik5n
+5w8+/4e+7//cz/38hz/84TD0f+/3fi8Igg9+8INhGBpjSqP/1sndtPVlViDLsjJAXVlZWVxcvHJt
+ZXZ66uzZM/NzM7/0L/7561cuf/KTn/zkJz8ZVyu+FypDN24sf+uFb71y8eXN9Q2j8tpIqxpX6nEc
+cmRGuTxXSVLkqVdYZ6zTxihttC6KIi8KpVTbswbIcHCMA6Lg3OOehzzNEuQcOZNh5MeVIIqq9Xql
+Vh1rNqWUzhmHjnP+0ssXFxeXPvYjP/KPf/onoyh65plnqtXq+fPnhRCc8wOH7a2Qu6n1WZalaZrn
+ebvdXl5evnr16o0bN1rTx86dOX14dvJf/ot/nufpL/7iLz5+/l3A0Fp7/friH/7BH734wsU8yVr1
+5uHZuTgIeb/b3W2311aT7W0z6FGaQp47rWqGkXXMERKU0T9hmVWmIZld0DuQJ2DA87nvAQALqyh4
+bgwxDr7vR/HoxOTIyAgABEEwPt5qtprOuagSb2zc+trXv/7e9zz5z/7ZP6tWq6+88kqapu985zuJ
+6K+uh3PgA1hrjVFJkvb7yTDJVlfXLl269PLLF2dmZo4dP3Lk2OFf/dVf2Vhd+bVf+7WHHnmHA+j1
+0t/83z711a9/bXRqYmpucrReZUl/4Rvf2FteydbXndLcAQeUDiRnnpTOuQgCHyWxoqIj8EzV1JiP
+wnqCGSliTcmQ+C3VXyy2txnrwpBZ8AFDxhgTQ4dtMj3hjM/qU9Nn5044wULO7z9x1KtEI1GzMPT5
+P/z0j/zNv/Xf/cIvGEeXLl2q1+tHDx8BR4RwZ9YB7p7ncxdKJWW8Wro0SZJ02nurq6s3b96cnJys
+1Wq+9J555pmlxZs//0/+ycOPPGYBFq8v/cavferG1trpR09OhrXNhYWL127srS5nnbawJg59RCYZ
++sAYgM+YBxyQxSQ8Eg5MDIIQQhQcUTJpPPSYF1BYF2ErrB4y0W4Bu1lnhacpFDlodFQhWSNZKJsb
+vX71+ivLG4eOnfJnxtMr10/OzeKUjLzwQx/60MWLFy9dunTmgQdPnz7d6/WccwwZwH5h4K57O28Y
++u+u7+z774Xudrs7OzvLS6uvv/66tabZbCqlrl29/Kdf/co73/nOD7//gwDs9z//+U//v791rD7+
+0OxUe+nmn774cn/1lmedM0XsMc6lJERiHuMBcA9RIvdREFDVCR+lA6qygJiKmSc4k0xqz/dZwCxJ
+8gVjE7500ku9+mrR36ZkQ3d7RqFDiRwYWWJjMti1bO+1q9nm1sTx+Q0hu8lgdn7OqWJycvJzn/1s
+o9GYnZ0fb41prZEBIRzEVqXu3y1n/w1Df+cHl95kGbIOBoMkSZeXlxcXl7a3t06dOmWMWVld2ly+
+ubm5rvLil37pX0a16sVLr37wkcfZzuDCb31ua3WdtIq4zyWT0uNAHJlviSEGhAFwj9AH7jmGBBUQ
+HgiHEDPfcVZBn3sonGcJPPTBc4x8IpJATEQ+x1FR77v0VlFby3o7lA5BOwSP8ZrBGMQE84qeufbS
+K64YHp+av9S7Mj8zIX1/d3f38uuvz87OWktSyDzLgijUWnPO73p24c0aHOdc6dUMBoNOp7O2urGw
+sDAzMyOl3N1rb21tDbN0e7u9vLRy+eKrDzxw5if+zieqyv3uf/i9bHtDchFW68Yo7VyEguUm4ixC
+4AQ+8gDQJ+4R84ghog9MAnPIfSaIM4/5TJJ0nKEAZMQ5oiCGjshYtI4F0q864TOvzqq3sv6tordn
+koIXgkQVEJECa8ai6h+9fHF2ek5z/9bm9n33Hzt79nTo+f3dTm1kVBdqYeF6Y6Q+NzdnjMHbIdvd
+gv5795y+I3rq95OlpaXV1VVr7dTUFADcvHmTiLY67SxNGYrG6Mjf/ujHjlebv/tv/02vsyajyAt8
+qwoPWEWIELEivABFyETEZIgiIBYCD4F7IAISHDAA6TNPck8KIbkQQjCBnuSCcQlMAvOJBcAj9KrC
+Z0wgF74IJ/zG/f7ECW9iijdijH0Mfe75HuPCzWX2vfH4teVrJ07cF8SVRn1kMBg89+zXXn75ZSCQ
+nrfX6372s58dDodCiAOHosyXvG3Qf4ep2dvb29zcXFpaarfbp0+fRsQ8zzc2NrQuVjbXy+DzXU88
+8cQjj/7ev/43tt2OK4IRcAc+w5gj10YaGwnmI4TAQmQBMQ+YB0wCk4QCWQBcMu4j95n0uOcJwbGs
+fRuJEAgZIPeB+cB8RwGxCrgISAJ5JGoyngwbc8HIPK9FBBXhe5YhYUV4J1k029cPzk1FUXTjxo2r
+l68Mh8NXL126duV1cm5+fn55efmLX/xiiXhZx3/zoJfyPRqcMkFWQj8cDgeDwebm5trqRr1en5qa
+EkJcuHAhjuO9vb0izSWysbGxc4883N3e3rmxFHNMueMI4CySI0KfY8x5UOiY+QxREApAAcgAEYAD
+IoHk3GPcMfSQayQOjCFDBI8JhpyRdtYCIJOMODNA0hkJwAkVOGI8FN60iUes5YFLlMoc93klB6og
+P9MzX/n0b9VOPXRzZdmTeGhyfGHhKhfi+P2ngyC4//77P/e5z506derEiRN3t6r1hrW+LDk556wl
+rW2SpFmqt251dja2+/3B9Pz8Vn+PJN9qb3gSB7s7AABM1EX00KkTg5cvSZflPgtVGGsTEecikAYk
+57FBT4YEXkODJEKECeVL51kpHSdmCYWtZDwyFeWphpKCZ5Y531YYQVigsg2NvieZJS1ZIR3zKNQy
+zLgELhxHiTJQQVNMTEKtjp70uY9krc1BeBC8dnMRnFvf3P7SV5979sKFVy5+65UL3+xsr+qsPzd/
+jHH/mT/96oHO3S3Ff2PQlwFe+dxprcvYdXd3d21tbWV9LarEUspaXNnb20vTNA7CdJBwxFqtNj8/
+PzU6tnztGnLwPI+0FaGIyI1a1nIiMEYw46EOTc45WqM8IguGPBcrXbE0gkwQGh9dBNaDnFtGUDEU
+EgTotDRcmlEEkSvBuLbOeQFJDXo4alxNaeZy55mggoyyJgun/eaciZxzNRkEg1znmZcWW1tbUaVq
+nNvabvcGw9cuX3ntldf6/URKefLkyWvXri0vr1pLBzjca+hLOdhdh8NhkiSdTqfT6Wxub83Oz3Mp
+7r///uWlpWpcccYKxu8/fHR8cmL28PyhRnNnaa3MofuEYHQspC94xbJDxhsveJAZjyEvXEVWIvA8
+cKRyzhA4M84YYw2ZqrIVQ+QLy7k2rkcqI9PjeWLSbjHYY4VjrEY+5JRz3fX1Lez3bL9Qw2Gv08v6
+Pcpy42RqhTUKeV2LKogW92uZTtK8Vq9Xag1tgIBvbmx95StfXV1eM8YcP35cKfX8889zfjfJnW/Y
+1pel1LKmqrUuWUqdTgc4q1QqZZKk3W5LLowxzWaz2RjrKj0y1rKD1PUHKLjTJuLBiLPOus6IVEEk
+rA0QEw4iikIUOgyk1g91rONmfaLpgNeRqdgfTWSlPSgCuHVkxEbSOYNBw0JGyAPheYCiIuH1tbNr
+FAG+erTmHj2iMuU5xNCzlnJGRcDRD+rETEiT6YB96st6eaPh5GRU7XIBnheE8SBRyDihuH5t8eiR
+k7Ku5ufnp6enX3vttaefftr35dvs15dp4eFw2O/3u93u1tbW+MR4odXExMTqykp/r+sLYa0ZaY0y
+kqEvjh071t9us8JwQR4TnMCQs9XK6Z/+8Xf/0FOawOdCipA7jNB5rdbq9SsrP/M/5j7d/4v/5NjZ
+c74x1ZHKyv/1h9u//OtJ1Z/4+0/d96H3Bx44LUBwZpzHmOczW+Wv/T+f3frfv1DZ7Jv7Hnzy5/6r
+kUYzlv4QKSAGHB2AAGKatDTp6sZXf+viItwqlJqU8YBBXKmePfvga6+/rNKECdnrDbTWw2739OnT
+hw4devnixcuXLz/88Lk7GV1vRt6AwTlIIZQx1HA47PV6vV5vd3e30+mMjY0Fnl+J4p2dnU6nU6lU
+jLNeGNTqzXq1euzYsTwZCueQIEBBhE3wZGI85k8dOnrf/Jnp6ZMj43PxxGzYHA2qoyfOPjyuZa1v
+M82GiikRuuZoWG3EBUGh95Rd7/Y73azoF52iGFi3bfT2MHNefPSH38/OzkowOtEbg8HqXvfWXn9v
+mKqCipyy1AzJgWAShMl1WqgaD5TkkUHhYGp09Kd/8qcefOgRGfgOYKu9UzJ/2u32xMSElPL111+/
+W7jD92ZwSuJj6Vnu7u7eunXL87xaXBlpNJBoe/OWMcYBAWeB5/tBDFler1SLdNlaK3zunOXC00pL
+4eXa7Ozs+H5IoafJck92ZBZREkuTjLHNznAsG2Zp4SxGiXJkADVIDsaaXm4qkCm9s9P2MkOtWiWu
+0ebu5KGZiSfP9Z55uUK4du360I9SGdfnD6WBxdALw7A32GtvdiiW3RtL1aASu6Drij1dcGUqQfjE
+O995ffHa65e+Rabo9XrW2tbE+Orq6tGjhyuVyurq6u7ubrPZfPO4fy/QA4C1VimVJEme5yVJ7/jx
+41LKsbGxNE17vV4Z7wkpG6MjwyFVwkoYhokutNG+5FlhiaGWTGrrF44TYcAA8u1vvLT69ZeIaSlq
+UcybybAqoTpI5SBjXEhtmLUalCEmhilPcqr5qXBbv/G725cX4/c8+tDf/Khlcjhpqg8cW20FY9+6
+eSXpdPeGVAtP/dd/Rz5yhgVMSrr1rz7/yr/+90kIMefjG31AXifZ0c6pgpNTeXbmzJkojvOBJmc3
+t7cOnz61ubmZpmmtVlteXl5dXR0ZGbkrWcy/FPQHj1hJCCiKQiml8mIwGAz6w34yePf99/cGvZmZ
+qWvXry7dvGpVVq82OHqeqA6oF/gSYimHKgCvr43PRFUZnxHTSW6GBiVqG43W89dvyl//dzkwCZEA
+qQDEZDVxuqAMVZC5vPACp4OwEInWmRQR85sV/9Ra+74b2cLwpfXHT9fiWn+rP336xODk2OGvrT76
+9ZQ5sdIYDnTuEqrEHvec1HtHFveGxnoY5yxVnFXMaFUtUm9vwCF36dFjs/XmZLE30Jjv7LVrVb83
+SHd7ea3VKK69euGFFx88e47djeTxG/brS1awUqrMzg8GAyEElBQBITY2NjY3Nznnvu8LIYwx9Xq9
+JPo6YxmiZPzPlPyVNsYgETgSoR9gIIQQjANngITkDijdJSPcOWesdsYcsO+JC85kqKh7fXljbzvp
+91GK6dP3W+cYAQckhuVjaq3lwCw5cmCBCAGBM8YE5wH3GQE6kozXa5VmrV4mw9M051wyxrIsi+Nq
+HMdra2v9fv9eR7PlDlMSbJRSSqkyhRBFkTEmCALP83bbnWQwKEnYnHMHdPjw4dHRUcF5WbwtqSLl
+js0A3W1krTbM2+e37q8KEDgiray15JwxBggBAKyz2jhryWhAVziy1tZzMNc2UjK2sCm5yrE5jYTG
+udvE5kIpMiSAOUIH5G4XQARyD2UoA5srtIYRxEFYr1fLdS20YoyFYdzr9RqNRhiGu7u7WZa9edzf
+GPRw28kplahU/DzPq9VqmqZxHGdZ1u12nXNSSiJyRNL3pmam4zgmIsk4A0ACwRjnnAEKxkiZQiur
+jc4LklyTJYcMwIB14NAap0qKpdHWICIjIOuMUU4rYwwSGCmcg0rm4PpGrnKXFYMs8+enbSxIa6t0
+qS65VlYbANLOOgQH4IAAHTjiDgVwbtFDLoA8ycfHxoIgQCaMpevXr/u+n6a5lFJwzznY2encpk6/
+9dAfsLFKDdJal8TVktQXx3GSJM1ms9/vd3f30FElijzPI4RKrVar1RDRKO0JWXY17DfcACKBUzrP
+c10oawwLPQaMITLgwJDQMWd1obTWujBa6/3ld84prZXSKieyjsBqExRObuwOt3eHg2SQpOHsIRgp
+W0o0OtKFKrQyhSJDxhgiB+CIHJEDcuBIEDICzhgjEIzPzc20Wq0oinw/+OIXv7S3t4eIQCyKIgBY
+X1+/KzSFN2xwtNaluS+hV0pVKhWtdaPRKB+FkqsdBAFjrFarcSkQ0RjjSSmAOWORwFlLRKUKa63J
+WnSEvtzvPHEEjBwC3jY4zjllDCIiASKSdVbvL4a1VBQKjK4OjN3eNcaoYQH1mh2rZkZZa8GRybRW
+1jkAznSeEVhAsqAtWABH4L6tYRwsmVarNTY2VqnUorDywgsvvPD8BaU0Y0xKH4BlWXZXWBxvwLks
+oS9TCGVxqtzrwjAcDDtBEBTpsLxVZ2wURSMjI9V6TUrph0GZdxOMl30KaBCJAEAAKmvIOgAgzhwQ
+OcTyCQOLzpIyzjmwzt3uW+OARGSMdtoAEgPujM1cIbhTK9v2jHW5MUKwyVrmFANOzhml9xuIgLTK
+0VlkAOAAnAPAktnqSS6ElFIp1Wg0jh49OjQJANvd3e32X56ani69SUTM0lxr43lvtsD3xt5/YHPK
+zfZg5yyKQnpef2+3bF6w1jabzaBWq9bqlUqlVqtJKXlJoqb96wAAkXPGlr1U4Ag9UbK3AcACOXJk
+3e3etv313gfQGWOMNkW5KpascsgNZLc6RVGYYaGtDVqNIYKzDqwjbUqLr5Qi6xgiYwTOEVgiZsE4
+55AxRHRA2qrW+OjZs2d7edc5B8TKXU1KWQa33W733nk4B9Fz2TW575OQ01oTgud5zphQetYYa60l
+Z4AcYbMxTk6Oj4979VrEAjzU8qwDH4yzEgTXokArTGFtkTmWWxEWcgeKrjXrAQnLAmKcyKapZ2wf
+DSosmFWUMQsFYsGU05oXMMR8J8wzqbvcsUxDkmgaFmTk0bkUNaK2ViujbZ44nRecQ2EVWXDOCeUI
+uRMZ75kArB9Ia7gfWM0acTg5N33s6IkiHejCBh5TekiWAr9ijFE601qXmLwZ6P9SWl9Snw+cy4M2
+1zJxX+aBS5PieV7ZYlmS4oWQcbXq+77WWoY+k4K5ApALZHlEccKLwmRkNChhjTc7Vfm5Hw+jal1E
+w9/5knl9gVsS2pF1ZRMsIlkgYzU5R9YppXqDPv3Mj9X/3kd94VXTDDjy0IfC4LCQ1QoF0iXkEJxz
+ZKmMLYza366ds3C7fdlay6Wo1GtlOtYTstFo1OsNrXV57+XTvN8vp9Rdydf/Z6D/jlTRwQKUpqaU
+smhZkuK5QIf7q5VlWRTX/DAQ0u92u7P1Gvc9pofIgYi0GdaQCcsi4Ebnwyxp1kbO/90fd0FYi6NX
+v/5q79IVA1qbPKXCs4G1GgVHQAAowx+lVHt31x+bCw572hUsTavDnBVWg1NF5jVqGAc6GTpw+jY7
+3BmtC+UDWnLOWUQCkJbIAIHktUa9tG9SylqtVq3Xge2z85RSBwS08t7fcui/YxnKlbiT/3TwKDAG
+jIHneeVDgJyrTFVr3CAxKdrt3ZMnjrMg8IbgEKzVgccsuSwruHZkC62LfgbOM4O9/sjYqLHowAnh
+E6Imy7Ki9EoJHABjgECktR5mOeq9IkHHrTEGB8rzQi2FKqysxVT37XaP0FmnyZADAuOc0gAO0Fky
+HKRzzjGGvi+jOKjE1jkhmC99FDIMQ0AupSzv6IDdzxi7K87lm9qmywewdPKyLAuiMAjDsmNNShk4
+Kf2wUCqMKis3VryRhqjEMkEN6DgyRwbICCRfGGO4dQNTLKxdj4TstLdqHBC4UsplBUP0gBFZS8aV
+W7R1ZB0JRCl6Ny7vbqxBzS9y7Q3p+MOPiGrLKmtiH+PAOUOgS164IwRnyFgCsugcOIZkwJFgGMig
+UvGiGAX3pagEAchAeL52FIahhf2W9jJbXnZL31PoD/T9QPfLOm0JtHY2iqLSA8tVQURBFAkh+mlW
+qVSyrNBShM0mrRF4znLmFbzvtMoztMQ9YRj2bq0t/upvUrsravGDXeJgOfOIC2fp29saQ+eMNQas
+Y0zG1crON18YfOFrMgxy47pRpXFocnSywTRQ7IlKSKDLfguwYMiRddYYB2SADFoAy8AaBoozkjKq
+V/0w8DmXUqLHAMA6YIxleSalZIyVefIwDO9Fvv47PqPMfJU/hRCe5xGRUsrzvCTpT4yN1Wq1IAhK
+in21EWite73eTHVMCJGjG5055F6yjphhBJYTZ1IbYaw1wgkxVa+e30n15p7aSkImDefK6rxM4QSo
+VWGMYgxd6acbSw68MGjVopGMxQaN5tetUq7QVLg8x9EqjwIGBGQBAAEckLW6rCVYsA7BlqMaAFOj
+wlqlNTYeBIEgi4hEkOa5drak/MVxbK1NksQY02g07qlzCbe1vsyLHfwsbY6Ucmtrq1qNJyYmgiDo
+9/slU7dM60vf94LQIBubmmSMAWcWoZACEV1eJE4bxtA4qomsopUsONddPSCPe8B9C9w4R5RlWVEU
+DsgYo1RutTbGAEBg0QfIrQJwkshYJawDo7kUnufhHewBIgLnrLUOLCFYcA4IGFqgVBdjExOt8TEU
+nHOOXGjt0jQvtCpb16vVap7n5U2VqZG3EPo/841vq39pYXzfR4LA8wPPj8Oo0+mEYbi1seV78cjo
+xNz8fL/X6bQ3ucczq4tEF1pFE83hINMn52uOhNO+sZJIcsxVxhCp0EYRGY9BHOlK4Tj4FW0xgbSa
+5gnjSCwgnkqGSIQpA6uEZJYbV0gMhgxIBACi6qwqhhzCoSO0fneCCbAFFAoCBCMRLGhjrQWFRqck
+LedD1+FSdar1aHw8DsMKB3IGGKR5obKcAdZH61xgNQyKLB1mKTFqtkZLaN7kArzhnbpsjy/Twr7v
+e57X6/XGxsba7XYQBJVKZWZmRmvd7Xa1LoiIAWpVjLfG+smgNTlB3GMOLFE5oQNKPxUYEQAiMSz5
+7AcBiyFXbq1cSil8RETgnO87HpxL4ABAAI4AiCxogxyAEQAA43Z/Z+KA3AGz1pLRBlw5BomsY8gV
+oov82dlpzrm1xMT+BpamqZSynMSAiGmaZlkmpazX6weskLcE+oMlvfNFCXpp6IUQZZKg3W7X6/Uk
+SZRSQRzNzMwJIZaWlqLAkwiATidJIPjW1tbU8SP+aBOVQ85MCbHZT0hYa4EzI9ABEDp3+9aMMYRA
+CNL3vMAnhhYIOJPCQ86AMZDcgiWyhmlwxhb57ekvHAS3wCwhMI5MAHKwgMoUYDUSB2SWiPEBBz4+
+MjN7SEpBRAyFI9zebm9ubnKO/X4/CIJqtVJyL5rN5sjIiNb2LYT+P7kYZfJLSimEkFIGQdBoNIqi
+QEQpxOrq+tjY2PjkRBBE62srtiiqlZAR5MOEkU7TNBxriYkWNyiE0ODKRNtB+Qk514xZoAPcy5Qn
+IlpCQM6kIGD7VQ7BiRAALAfjNDhrwDpjdJJaIAJgTHA/sIilOwaSMynAITNOg9NgkAEA5GT7gagf
+mW80alwAABhHzsHi4uKtzXWyOukPWiMjlSjebXcG/e783FytWuX3OGkMtydoeLdFCFEOkdjc3Gw2
+mxsbG0EQCe6Nj4/3er3dzo7HMPJ9YwtjdJ7n1g8qR+d97hldGCBEAkfWWmIIDlGKgjMF2iGU8CGi
+VZYB54gWqBwC4gCtI0DuAIBxJ5gFR2QNJyRrBol1zjEODJkvDYAtDRpDJjhzBMYqBvvPHMIAnKpH
+0/fdV6tVAcASWENZoVZX14uiKLLUOTs9PV1mzTzPO3HiBOf8rTU43y2l1pfWpkzj+b5fq9WiKCp5
+xaurq1EUJUkyMzOj82Lx+jWfY0VK7nH0QKXDxOixB09ZQ+jIcWCMMUfWWoaCiLjwrMdzcAqtw/1g
+3RjDARkwYIicESAhOCDOefllyONlut0iMECTFBaQSQ8RUQqFVlsD6IAzJrgzVmutkYgcABSMhgLD
+Q5PTc0ejOCizBcBFt9tvt9seF4NeV0p55MgRAGh3tkdHR48ePcrYtyf83DvoEbG0NmUxJIqier0+
+Nja2tLQ0GAw2NjbCKJ6ampqYmGAMvvXii1rle1s7l69fGao0DqOVW5vzjz/khYEnpEPgiGD3M3FE
+xD1JUhZgLZImZ8kBkdWGITJAYALKhD6Rc8CkEEJyzolzAOacM0gAZIaZdcSZYAxQonLWkWGMMSmQ
+c7BGKaWhNGJUkFWBGJmfbbXGAaAsnZODtbWNdrudF+kw6U9PT09MTOzu7u7s7MzPz4+Pt8pVv6fQ
+l+iX6cno9gCyMAynpqY8z9ve3kbEpaWlx86/Y3p6OgyC1dXlhYWF6wtX//1nfuelS69EQbi6vn76
+8UenDk2ronD7Xa/2YOIEMCyrJQbIHeSHjGUEAlnpZjjnbJllZ4wJzti+9ScoL0FGWeccMM45B84s
+WEuEHLlkjINzrjCFdY4hEtiCrPNFfWysGsTGKADQloqiWF9f393d7ff7zrm5uTnG2MbGhrX21KlT
+tVrtzaeL3wD0B04OOxDBwzgKwjgIglqlNjUxef3GzVqtdvnSyxNjo6PjE5Ozh3u9weL1BS/w95Y6
+f/JHX97eXCqSZAC+eewBoVWOLkHfavILx0RoPInMxChSsEScIbSF0syz+SD1MyMC5BEK5QIMgAud
+++RsEAOLGdcDDkNOnjIGJBsqTxdCCMmKRGBfmiESggKMG+j1vUwz5YRwlhfohqBcs+rmxgCAOVK5
+tsrmuVpZWRoOe0plyGF6eloptbm5Wa/X77vvPsbEwWSwewH9n3kDY6VHHwRBFAdxHDca9UOHDu3t
+7RVFcfPmzZ3tTjnukBBff/11rxIh4tJrV//o97/w2muvGQZzD5xkIAs0Bp3wpLIGBbeADj3lxw7J
+gi2MJkLtwGrwtfCAC+dY4PWdGQLrMuePVDwOjFvhRdaS4iwLhGG8o4Z9riGWAqPQhqEJfO37LBJh
+DCh95+tcF9YWkrS1Cik41BqZHK+NNiyIvNDOUa/XW1lZ6Q96g8GgUauPjY0tLi72+/0zZ85MTk6W
+uZO3p6vkIHsThmEURWEY1mq1Q4emGrX61atXm83mF7/4xSOHj01NTTUajevXr69srs4dmYPc3rh+
+/eLFb11bW5555IF6o2WMUqYYFhmY4tBosxmHnpDW95H20/FEkIGzyKqBPzU1PjpWAclUIC3jkrDK
+2UjFE4HO88KTYWZNYS0HjAjzW7eK9bXOzlY/zfoBT7hTSXe4e2vx2uvXFi5Lxx3HgQ8aiaKgev/h
+6kQriPxukg4Lzf3g+uKN5eWbZUnk9OnTnPOFhQUhxMMPP1ytVksjf6/z9d+Bvu/7URT5gQwjf2Rk
+ZGb20OXLl8+fP7+0tKSUOnTo0PHjx7/x7Nduba1PT09f+I9fRxm21zeXby49+OS7/Kkpb+GW454L
+WHvxxmL8bE/nrMLWdldsKKWA0FofOXHI0+6FP/3Ca9XnJxRkaZtlmXAuf3nhK//rv8qdLgLTWu1X
+iAwDz+MmU3xj+8L/8n++zkMlbGCLY0zxonj91//vi//q33Jhta8fyGNNkKMV6LBZrR2bi2p1xthg
+oAlIW1pYWBgMBkU6jMLw8ccf39ra2tnZOXnq/mPHjgkhvqNica+hL5NoZdqgWq0mSVJvVKenp2/c
+uHH9+vUjR4688sqrp0+fXbh6efHm9Ze++c2nPvrx+kQrzfpmt/v8V7723nc8fui955dfezV1xiGt
+fO6Lvc/8KQnQTB3NmUUvl06TK8BUhFfr99S/+3ymzDLznDTjjnHJ66vb6Y11kBibQgmfMy9D09UF
+clZnor7a8UBYtJm02oJn7GSnJwoCcKlUAwLGsCBbcIrHW/XpWc8Li0IPhmkUBTdv3rx+fSEvhlrr
+J971rqmp6eeefcH3/XPnzo2Pj5cshLfT4JRbje/LKAoqlSiOwzgOp6cmjx49+uLzL3Aurly5UqvV
+ZmZn5+dnN5YX8yy974GzFsHq4uUXLly7vnjsQx/g0kcukLOIQUB5yDQHrTx3S1JH2MRzqdMJWSal
+dCoKqcqoajEFPZQ2MnaEsypSixgnSqhwDJ2xWlCqM44uxRwArMM9LvZ8sQe251FfogJvQFZxyK0e
+VD3v+GxrbIY5ubnVvrW57Uvv0ssvLS5cSZP+fcePfuxjH1tf21xbWzt95uSjjz4ahiF8mw12bxMJ
+B4IIB4mESqVSqVTiOB4ZGZmdnpFSfulLX2o2R166ePHcuXMTExNMsMWr1x5+9JEPf/jDR+47fuXK
+la9/5dmxRx9onr1PE+hUaXAJd4kuGIqOscy5/Vocsj5QBlwZ6hPteZB5OACXGLNn813htlBvS5b4
+2HcmsUYBs44ViMOAd33oc1cg9ohSB5Yg5zQkyB3rC9cnXVjlpkbC+44yFux2kquLK6rIVJ5dvvRy
+e2crDoP3vOc9nh++cOFCrV558sknZ2dnhRBl92TJEXh7oIfbDr6UspwzXA5jnZ2dPXHixMrKymAw
+2N3dHRsbe9eTT0zPz11+9bX29s7f/ls/+iv/x7/+kY8/fePKQh/c/LseVFqHXA7J7XKXCz7UlHiB
+4U6h1Y6Iy8IxZQWHAJxPBrRyHAQwngjoczLEHLEsL4DxHlIvELtGK8YLbVjh9niacDMgrZ2WRjOt
+jM6cc6mAHKzwZDDdgtF6p9NbXlq7trxcjcP1tZXr164ypMPzsydP3n/x4sXNja2TJ0+Wm60QrLT1
+dJcGc32PWl+GtWVsVa1Wm81mtdGs1GtHjx85fHj2mWe+XK83v/zMs2fOPH7+ne8xHlx4/rm9Xv++
+06d+5dd+9RP/4O+svXr16I9+rNoccVQYOxRA1jEOnjOUMQUAwLm1mjul2DDxjRaOwBqknCgx2gBh
+ocDoPhUI0LcFs9Y5YwWR1SmZHB1pAK0kczm3XQmJlFYKi6aiQYPrteq12eNxZealy8vXFm4Oh/3x
+0fjF57++vnGrMTL+oY/8yPrG9nPPfX1svPG+971nZKQRx2FZmUFExsRdOWjke7/EgZ9Tpo6bzWYY
+huPj44888oi19rnnnms06levXn33u9997NiRjY2NF198cWPzVhCKp5766O7u7tTU/Mf+m3/sDKs7
+3wivRybhxpFBhVwzMAyxjNedMUoXeYGuQKc5GMGtFEagEagYJT4mPiYeDBgNyaVAioHmSGEwcDQk
+J5n0FGCqCrI9j1Cp3JnZ0yeOnD671W7v9fr9fv+h02c3Nja+8pWvnDv3wN/4G39jbGzsG9/4hrX2
+/Pnzs7OzURTd2RNwt+RNXa7U/X2LX41GRkYajUY5Qf75559PkqR0BB5//PFqNX7xxecXFhYAgAuY
+np7aWNx87O/97dGT9wHKNC8Cz8+KlJCUgxwh55hw6KMZMFt4YCOhCQygJjBAmlz5VwMImphFNEDG
+WmuNA+WosK7vjOXIGNPkhmgzCShFyCXn3Gu1KocPd1Rxa6eNgpr18NBI7bd/+7dbrZGPf/zjDz/8
+8OXLl9fX10+dOnXu3LnR0dGy1n8wFgTukl//ZqEviydhGDZq9dGRRuD7oyMjp07ef+bU6V//1L/t
+7u5tbm6eOXPmAx/4wObm5h/+4e9vbGwQ0UMPPfjy9uqgHvzM//ALHokxK/xMV6SXYaY5KXDKaSKS
+THoghGY8dfBtxicdtJoQkWZkOFhkRMhR+MA8Qo8wJQUSrdXaFL4vfcFRKS9XPRHc9573yqlD/aFC
+rUPmGlX5hd//dDocfPIf/sNDU1M3Fxdf+ta3Hnv00ac++pGpyfH/JO/jbR7KcsBLKGOrsl95cnK8
+Wq1OTEycO3duZmbmM5/5DALf2Lj15JPvefLJJ3/nd37n05/+dK/Xq9fr73/0Hf/hM7878tT5n/3V
+/6k1Nj5Ccoq8gEsuiHFXUt3BABrGSHLwLcL+H+Ysg/KP40hleRDIElkELVBJzD2ccKIBvML4qPBH
+naxaVosrjflDD/6tj9dPnNrLbW9vbzTyA8gufutrV69dfPrppxuNxvPPP3/hwoXJycl3v/uJo0eP
+ViqVkgBwFweCfBvA7+HZ+Y6YouzbL4qi2+3u7u7u7HSSJNna2lpb3Xj++edzVfzkJ/9Ru7M9MzPz
+qU996tq1a//0n/7Tn/pHPxlXoqWXL33uP37hQ+9/33Ct/Sf/3++ufOaLraEbsMISOCLiwjJQQJoc
+IQehDiJJRDzwrNFAWf0TgBwZIC8ZS77REfMj4tZSH52da42cP1M7eSQZ+hhHjfFxkxeTI41vPPe1
+5y/8x3/wj/7+6dOPXbp06eLFi7Va7YMffP+5c+dardaBL3+nY3O3Qqo3O/GvfHHQzqmU2traKg+9
+GPSHN2/e/JMvf/nYkaNPP/0jaZoqpf7ojz/f7/d/5qf/8Q9/4hMjnv/CC89+9atfPTQ21YzrOy9f
+6V+6qq8t9fe6/b2u0wUyBIkGyAAJ5g6Yh/sfjQQATgoPuXQgLeMO6DYD1zgGgWStundk1js27U2N
+O8b7nb0BZ62R1szc/IOPnHvmS3/y737zNz7xiU+ce/ihxcWlhYUF59wjjzx0/vz5mZmZIAjgDuLX
+nXRHuBs2501p/Z3rX1Lge73ecDjs9QbtdntjY0Mru7i09MyXvux53k/8xE8QuZGRkevXr3/xj//4
+qQ//8Ad+/OlTR4/0Nztf//wzr7z8qmtFE83mmC9cMqTtrt7cStc2k1ubeb/njPIGB6fD0EHGHBGF
+Qy4EE5w8AbGPcSDrtbBRlXNzfmuEqtEAqNNNdvf6mgC5qLWCmgwq9cazr3zr0tXXPvl3/8HJYyfW
+1m9du/aa53nnz58/c+bUxMRErVaz1pZDee+88bsCeil3c7rrASuxnGbcbre73W53b7iysvLNb35z
+OEx+7Md+jHMeRr5S6vNf+GPP8z70oQ+dP/9OAMgzdeHCheXl5SLPBeMj9cZIrR55QSA4WqcL5XX3
+VF5kw4EtlGBMMOQCnXMGpfQ99APLOfmeX62h5Emed3r9nZ2dftIrQ+MyBGGMUaB7g/61hRujo2Mf
++aGnWq3xK1eutNudasV/97vffeLEidHR0UqlUhIA7goyf57czfn1dHvwYjmFriz0dNq9Xq/Xbref
+e+657e3tn/qpnypnizRG6s8+++zCwsI73vGOycnJMAzDMM6yLOknSX+wuryc9gZREEaeFwaBEIJX
+I4+LMAgatWo1jsvCtDEm7w6Ns8M0be91u8lAO9dLBu2d3cxmUkrO98tqyFmpHIPBnlLqzJkHnnji
+iSxXN2/ezLIiDMMn3vX46dOnS/Zc2QGJb/Hxbnd/iHrJPU7TtN/vJ0nS6eyVI4573cE3vvGNK1eu
+vPe97zt79mx/uFs+1K+//upgMPB9f3x8fGxsDAxTSpGxg35/OBySsUWWA8AgNyVzhGPZS2UIkTGm
+OQyHw/KosCxNi6IoR9uj0CVNyjlTVrHLSvLs7PyhQ4fiOE7TdGdnxzg7Pz9/7ty5w3Pz4+PjQRCU
+pde7lS34C+QuQ3/AuFdKlXStXm+v2+2naXrr1naWFouLiy+88GKz2Xzv+55kjGXZsF6vC8E2NjZu
+3rzZ6+8J9JvNZqvVGh8fL/sjkChJkrygchxJyRkulMlVURRF4VTZpcbAIQFn6HEBAFzQcDgsT2Go
+VCpTUxOHDx8eG23tJYXSeb/fT9O0Uokeeuih02dPNRqNZn2k7M44GCL61ul7KXcf+vLFQVtzmia7
+u7t5rtrt3TzPu3v9vb29F1+8sLKycu7cuSeeeNerr746SHpHjhwZGxtrt7e1yjc2NlZWVtqdvWq1
+Ojk5WW82pqenG42a53kATCk1GGZ5oZkUTHBPlxNm9aDfv3VrY3t7u9vdzbJMG5ifmzt9+vT8/HwU
+Rcao3Z32rVu3MmvTNPUkv++++06dOnHkyPzIyEgcx54XlGp+pwfx/WRwDuSg0VCpPEnSUmG73X55
++NRup7uwcOPy5csjI41HH31Ua72ysuKcm5yciGNRqdbLK+x1++vr60mWWktcD6WUZWIHkZuSJGyt
+0ftpVGLknJOSt8bHJiYm5uZPeL7I83x3p72zs9Pe3kmSBAA4wuTk+MmTJ0/cf3+zWW80GmHoCyE4
+l3DHiQRvKeilvIWHI5UWtlT/NE3LGXXdbrdk3yeDvNfrXb16dXV1dWRkdHx8nDG2trZmbMaYaLVa
+o63W6OhYrVZXxiiluIdl2+1+QxMhkwIY+kyWNFBrjaH9T9Rar29uDofDTqeTJsOyybZSqUxMTByb
+n5udnZ2ZmWk0a56QZWs13p7ceqe81ei/5edSWUslbzLLhmmaaq37/RL9JM/zNM13d3dXlte2traK
+QrVaLWTOGLO13e71er4fVKvVaqVerVbJ86SUkR/EldDzPEuEnCGi1aYoCl2eaaVNlmU6L4go02nZ
+/xf5QRQF42NjR44cmZ461BxrViqVkkeEBFL6+4v5XXvq9z305a57MIW3dD2LokiSfprmw+EwTfOi
+KIZJtrm5ubKysre3Nz4+Xq1Wk2S4vb3d7/eLotBaE2dlljQMw/1Oudt9o+W0kQPGctkEggyq1Wqr
+1Zoca42Pj0+Mt1qtVrUSeX540Hxc6vtbbVj+PLlHxz8eLEDZVWuMKYosz1Wp+MPhUBWmHBQ7HA73
+9vba7XaWZQDonNs/7Efl5b590DleQm+BSsZ5ef5dGIbVarVer09PT9dqtdHR0bGRZrVajULf930p
+mJD+QVfMPgQ/2NAfyEGz/QGOWussK/I8V4VRSuVFmmeq1PQyOMiyzDnK86z85QP/tVRYJtDzvCAI
+4jiuVqslSaJWq/lR7Pt+JQyCIPD3z0j9dhPS2wX3nXIvDA58V+7pwPcvyfVa23IOQXk0Z2mXtNbW
+7E/DsNZap+l2q7S7fTQVYywIPCnlAfO5hNjzPM8Py0dBCMEZ8Nvylt7sG5J7rfVwx2Ic4LgPriVr
+bZ6nsD9qpShZ1/u/ZizcETeU1oYxhkglpgdAl4JCcs6lYAcG/UDgbifCvje5F1r/3Xd4550f6HIZ
+B5TtqaVhAQDn4HZNyhy8684QX3JxJ/G/THuVhFy44zTTvwoW5jvkHhkc+HPy3SXoB2gS0e2UC0PE
+cjEAoBzDcGBq4Hbs890U6NuFFLrzsgefew8yM395eRsMTil3Pg238+/7B0je8S/s4LUld5DYcnec
+UVrOzzm41AH0+//xF1ZA316z87ZB/0blP/s9/wqalL9Yvm+g/8GTvyqG779A+Wvo3zb5a+jfNvlr
+6N82+f8B+8PiNB0lBisAAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_ford" model="fleet.vehicle.model.brand">
+      	<field name="name">Ford</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAArsUlEQVR4nO2cd5xd1XXv1y6n3jb3
+Tu9NMyqoS0hCEkhUFUwxBozBFBOHEGM7JE6c+CXuxLjiQuw4GBsTG2yqbTBdAiGKhHqfUZneNHN7
+PW2X98cdCSEJDI7t4b3M76PPma1zz9nn3O9ee+229kVSSpjURAhP9Av879Uk+gnTJPoJ0yT6CdMk
++gnTJPoJ0yT6CdMk+gnTJPoJ0yT6CdMk+gnTJPoJ0yT6CdMk+gnTJPoJ0yT6CdMk+gnTJPoJ0yT6
+CdMk+gnTJPoJ0yT6CdMk+gkT/XM/4NQ4H4TQqZ+ecFIAgJSoePb4KSzHTxy7RRRvkRKfkB8AgAQh
+QUog6Ngt6IScT7Q2KeXx5xazPfXd0Em5/+mE3v8hUHL8KI8xFCd8KI5ZjxBvvQsDBjgO/c/O8Y/Q
+Xwj9iU857feXUp5UAxBCb6Es3uobjxXIOF10ykfkxLLAfxD9H3zDP7kmzOrfjoV8C0Yxfnzr2bfe
+II75peIRj+ciOSAAwIDQcSfzDtm83Uv+/+NwTufcT39Z8Up8zGG7bz0PAAAYIYQRAIAEKaUEgY4J
+qOTFi4Q8XodO/9yJ8kV/iWb2xG910jc8jvL4kTEmhBBCSImKf8avkfxYEh2/UUophEAIYYwxjCMm
+SCKEBKHj5xHCGFOKCSEY4+L7YIyPtdLyxJd8l5bxJ9Ff1OqP8wKAIl/OOef8eFoIgQFJBAgRQEhi
+AhJxKaREFBWEEEJAsTjgWC+IS0QAISxBcCmlFKzo7G1hYAwYkASBBEcAAAKEVHWNEELfKkJIsQjH
+q8xfRH8J9EXb5Jwzxo6zLhogFO2UEIRQsVQ81/ZcbrtevmBn84VMLp/JFSzHTjmm53mO47iuyzx+
+/LUFUIQQwpIiUFSqKVTTFZUqEb8wNN1naIamGpqqqVQhGGGJiQLHCl5KiTEuotc0jVKqqqqqqpTS
+45VgYnz9aZ2gBEASJEiEZPG/TAJCmB7LRiLgwAlIwRhhKOsxBEQIyRiTwsNEqDomFGGpey7PF7xE
+2orFM9FkKp5IxlPJqEuymUIslU1mnIzl5WyZc5nNJOPAGJNYEkIAoaLlMuCq5EIIzqXHuRAAGGFE
+JEZl1NFVzdTUoE+PBIxIQA0HjIDfKA2IYMAsDQdKgr6AoZqKpiAqOBAJQEmB20CJETQ1RdUVVVUU
+Q+qAAQhI8AAYAAZQALAUAmNcLMVi4k+GXggBAKdmKoQ4fk5KhBCSAFKCQOABBwCFY2m7whU2ki4B
+HTjBQJBASEqB8xYfPpocHB7d0x8fjcaGY4lopjCWs1OOYFgnmt8PEA4FSkMBv6kETC0Y1H0+TaVY
+MaVKsE83TFWhEqkYEYRBCE9RpUBCCMaY67qW63ge45wn8ppnO4VCIZ3Np3KFtOWk8lYmm8cuAc5M
+jZaXGOEAKQ3RxppIXW1pfUQtC4X8hqJjIhl3GANEJCJGiU4V3dBDOqVIMEKpROAJUND/tEK8K4fz
+1nrnSZAgCSBybCAI0hMZO2nqBndl3hWCGghJFdkmZZzzVNY+mrA7e6NbOwY7+2PDyUIyb2Wl1Ait
+Dpe01lfXVYbDQS0YVE2fUu8DwzBUqjDXsfKFQqFgWXnLsbljMsYc13Vd5nImpJQScc4lwQghhRBC
+iKIoqkpVVSWEGIZUFRIwNL+pK5rBAKctL10oJPI8l3MTSetoNDM8mjgaS+QLtkBQ59fKg74p1ZFZ
+LbVtjWVlEU0ziQCvYAvEmUq1gBlQDV3VFVUDQgAjA445LkppMf2emoo/gP40w2vhIEwkFB8GknnM
+tQv5LAcVYUXXdUXhBLlMikyO9w3EX9p1aMuerj3dsUQBY6rUVvrntNe1NVdMrQiHgmbIZwBzEonE
+2GgqGkuns9ZgxsnnrUSmkEhbqbyXKfACkx6XkjsIESaEFBgwAURAAnBANC+lxCAAAEmBEMIECCBJ
+sGloPoWWmGpp0PD79FDAF4mUVAac0tLSisqyUDioKrrnyUQ8m4inXu3LdvUM9g2OAhcRgzaWaktm
+NS6Z095YEzEVIZmVLXgu8imqHlB4SOUoWFFsGACAc17sNb1L6H8Y/Yncx7t1CCFAgEAIEFJahVw2
+mwbJFYL9gXKCXYXyTCbbeTi6cWfvliNjnUOxeJrVlIfmTm9ub6porCgpDxvSdlKJZM/oaDSR7xtI
+9g6nR1JWyuJZz5WMAwPABBNCVBWIJhVFEioxEgoGVcGEjPeREAKMACFgxdkeiSRI4CAkCA5SEtsG
+wJwJ4AIEBy8HXgEhKaWPUBk0ZWWp0VARaq4pa6iqKA+XNNaboGhpy+sdTXX2je07ODgczSBszKvS
+Z7dXrZzX3F4bMQjJ2V7KshghQZX6fD7TNAOBQNHq36velcM50e9zDiAhk8nmcykumWmagVBQIFAZ
+G01kNu3u+t3GffsH0sm81VgTmT+jac7UKaU+3Yd5f8+Rg4f7e5PuwZHckeFkwVaY4EAQ6DoQBQQH
+RHXDsA2FKApGpOhTgFIQAJxhQQBAYglYAikeQSLAwi/hzQ4PgfHpB4oJE5JLDJwD44giIhlzLY3Z
+zGXSE4gz6bjSzVMsdYpqQuWtjWVNtb6mGv/UqY1GMNw/mhgeTW3aOtg3MgTgzmmsuGjhtKXzpuhB
+nOEWjzvFBiYQCASDwbKyMkrpe7L7d0J/vAtY7IQBAGMsW/Cy6RR3rdJwSPeZEikWR4l0bt3GN556
++cCuvqxiBs9dOuOceQ01Qcrz2V2dh3Z39O3rSvTE3axDgCigIGTqSDEV1RBI81yPAKuMqDNaKqY0
+VJxRxhSqYaJyjmyX5woslkgl0+kDWT2ZyqTSuYLDXBc4ooAocAnUPTaNQ+CYq5UAIBFgBJwh4RGE
+JcKSUKobLncAISSwFAILjoXHmSU9i6aYkEwwR8VuQ6k5tTY8r612/oy2koqSEUtu74u/+OrO4cM9
+M6qCl66cddE5cyIhkzGWzWaz2WwikYhEIvX19ZWVlYT8KXz98da1WAau68ZisXg2W1YSKg34VIV6
+TKYsvvGNXff/6pFXR4KtldrNH1yxZGZzPue9uuXAxm0dXUNHD8UxIAT+IGgG0jWi6cU+ElNV4B5Y
+uQo/WXtm+1XLz5hfo/tFNupQz/ME9ygmhqlphqooCsK44PKRWGoglu+PW12jhb5o/mjKTebsqMUZ
+E4wx12NCCH5s0gyb1K8IU7p1ZSU1dfVDifze7hGXYyAIQACSgCTI4vQOBUmA5sH1wBPE5Tif97Ip
+LNzSkH92pbZ4Xs2Ks2aUVtUd6Hcf+v3r23bsqSwLfPaDU5cvX67rei6Xy+fz/f39iURi2rRpixYt
+/J+il5If68N4ACxnOSODUUUokZrygN/nWJ6GrZ0d++96ZP9jG3ua20Kfu2RJa2tzPJl46dWtL287
+cGAga0MJMstk2ABNLfYJECVSShACEFI9h3ustbb6K1dM//CZZSnbeW5b9/oeJzaSjXkuF7qCXD1g
++nWjpQKaqyMNJSXTastaqwyBsCfdXCoey+uFHI/ZLJsrpHKFnO05Lrc9VwqECSiq7tOUAJUhRVSW
+lW/YN3DXE1tisgw0D6QEKaHoHYpphDDCgjsaIQrnNgimIMgUcNYSOQt7qfZKdfnclhVLF7ZPn93R
+O/z4U+tefLn/rEWlf3P12StmtmFmxZPZvsHR3Z17qmqq16w+LxzwI5AAquQYkfdq9ZJLwFJKhGE0
+Hk0k05piNlTXAliOC24h/9gLr3z9lxttx7jto2vOPbup61B6w2vb1m/e1ZuwwFeKI6VINzklFFEA
+EABCCgAJGIMEEAKcwOL6/BdvXH7RgikvvLb77mcObe7LpixPCAUYBZIHQigTRMXMRibzZs4rfegT
+K0oNbd2+QX8kMru1qoxYQFQQDmACgIRAHBEOlEvwuEznJUuPqtxykbH7qHP/Sx1P7eznWgkgG+T4
+lFxxCF1Er3iqp7qgE7ABpAGUAMuryHI5INuRySTOJKp9sGBG7ZrzF5y1aM6BQwNfu+exwdHY3994
+8TUXLPQr4ArWMzy8/bUtlOLLL7ukqanpBJri1AXBt0cvpAQOGI8lsslkxjC0muoKxtxCOpFL5v/j
+0Q13P7lr4axZ3/3MVbIQ/9lDLzy1+dBIyuKBShKp45oOVALyQEHYkUIIRHDR3jEmACBctzFgfv/6
+WZetnPbwGz1fevCVjn4HfLWmky5IWzWoixFIHVgOkI4sunZu4I6PTCVa5NuP7Hp+z6Dh06fWBubV
+4Iqgb2YlLQ2XlJb4FYoIIEVRMFW5lCyb9zxvNONs6cs/tn3w1SMxmyNFwUy8ZQrzhPZZlVRybiNE
+iWIyuwAEqcBdiTHVpOeCXcDZuEj015gwp73xxusvP6O19fsPr/vJr5+9ZG7LFz61tqw64KW9TCq7
+ft0Gl3nXXPvhlpYGKTxCCEgJpxj/W9C/pRcvAYAl08mRaC7oD9dVlkhwo+lEPmp/8SfP/GLd1muv
+veTrH798/e+f/NYvnz84LHkkjEyfEoq4igYIAyBwbSIFL9brYgMoJJJSciE9dtO5LT+4YbGK4eLv
+bVi/b9gwfZal4nzq9rXthxO53++JSar4ANmWe9WKmh9/fFkh7177460bXtlDdFVqpkIRpVhRSBl1
+GirCU6qD1X4SUbyQjjWKMYgMGP1JZ3tfquOoM5xxHSaIRoXgUo6/z0kgMJLgScRAAEcmEtLDWFcY
+IFA8YBxxUJEKwNJ5EUuD5Vap0Y9dteavrrroyVf2/tM3Hzp7ZtXXP3lRW1N9wc739I088eTTwVDo
+po9dV1tbiQBA4lMXCt5Ef9LoSQjgzO44eCBSXl9dVk6YFY2Oxj336z9++RfP7/jnz1xzw+ppP777
+N7/8/YE40Uh1Fdf9RFOFZFIKDEgyjgEThNzibK6QgBAGBIwDF5SQr1835+8vmzV8NHbBHes7Bjk4
+OcDipovn/PAj02+8b99jrw8olLkF68NLG//z0yuio4WP/GDTYCz5bx85y6/wu5/as7M3RVS/lCAw
+AiR1zFUiNYIRoQITCZg4qYJUcx4CAZQwKTkHAqoPmHXaSo4Yko6tmZrjeQCS6iYTHECAIIAREAyc
+A+cIY0UKN5+HaA+y2NWL6j//mat3xMknP3vPWS2Rr3z63JqqMONw6FD3r37967b21ltuuSVSEsbo
+NOjf4oBOHLV6EgYHB0OBYHVVOUiRzyRtQR/83Wv3r9/7udsu+/jqBd+481d3P7YrbvpRXSXXS0DV
+ucDSxQQ0wYmUSGjUpQAA42uqUpLiBDrGlNJS3QLBfbpxyZzGWTVk4ZTQd25eeu91bR3R0Zf3HZSU
+uI6zYH7487cuzqXgo9966UB/6uMXnNFeodZElLVLp6uawYWgWIIiAVybuXnO0h6LW4VYNhvPZ8c8
+I+dhwBSkZBwjagAhwF3AMP6v2MkppkFIIGdNq7lpWd3tl846q61SZRwkBYoAOIAgAjBghClgxBQM
+IRPXteFIyUOvdd96x71nVLnfv+PmdXv7vvPQprQlGaCmltolS+bt3b3nhWdf5FwKdBqv/uYw7MS1
+eSmlZXuZZGL69OkSIJVNMsfd3ZO693c7Lj576ocvPed7P3r0kWe6aCTkRogMhjSLMsmFACBEFHts
+qiYRgPSQxBghiXBx6rg4g2xZVl9W2kwJmfgzl8366IVTddNoKQ/F+nv/8cGDhWEXTNlYHvrm5ct9
+Qrvuzke37k5V16LysL6/b6REpwYX2MmBHmZgY4kkBokwB8Q5AsCACGCiSpcxRkCRmsYAM8Gx4Ao4
+LlaOf83iKEAIAZw3l4rrlrWc0xxIAekeHLMcC1QfBYkpllJybgMAppQLkAwDVbBBWTBCVfPV7b2f
++/cHv/mV226/ecV3/nvT4rY9l1y8HIHX2trS3zP6+qtblp9zdlVdBIP6tuiPq8hodPSoFCKXybuW
+cD3Hctnjz22Oi7Lbrr1w+9aORx57wdVCXkjDZonIWI6GsedJkIhiWVws5QhsqVHFEYxzDgiBEFxK
+QijGmLnukxsOr2wKL5/XVFHhqxA+QPjlrXv/7v7Xdx8q6IbbalpfuXzRebMq1u08WlpXen1L2ZyG
+8hXzmiK48NiLe361/ojtAhBbyjEp/IApQri47lpsZIRgLiKAQbgOQAEhJIEIjBzASHrFjg0ab4AQ
+cA6MfXRZ29Lp1Yrk697oWL+7T2oVIFzuFBhgoCogAlyCW5wqZ8iVXEqgPomFWlK2YWP3ww+/fPVV
+Fz+7btcTT72+YMGc+iq9oqyitanl4KG+w4cPl9fNV05FXyz8446+OHDN5XLcSgIpHcolPS9XTZQD
+g6kntgysXTyjJkR+dO8zR5EJgTIqTZbIgYpA5iQjp8YGuAAAFhU+wTBgJhXOOUNEAca27s//3Y9f
+vXrl0Rl1ZbbLN+0efnpTR8vc6lsvWdpSodbrXktDQ8KFcp/z+QubCkgZjWV7Dvdkqitf3z20f99h
+taLMS1kaRjbNA3IlV8AjknCOKUgBqg1CghsgGuV8CIAiEQSEJM1JVgK0IJkBhEiSRp6GkvnLV7V/
+fPmMcJXvqTf6Hnxufz7JAI0pCvUgC1IBKLxpl8eOCHSQKY417uOQ9j3z/Pa1H5x/ydplP/j58/t7
+ehtKG/2Gv7GtyWI8m7JY3gPfKQ7neOTFiV0dzjkAoSrxnIKh6YoK/cOD2WyyrblyeLhw+PAwCAZe
+ShQ8AiAcTyKQSDm1AgEAwYKxPFAMniC2xgtMxRiYg3TYvbvn0MHegM/IxGIRHb76zx+e3d7QcWA0
+YPPp86Ykct7379/023VbPIwTDraiYwZ4C89sS+Q1ENQdiwP22TozbeI4jpBOaWmAOXbBcSXSvZSG
+kW1yx/Fc7qNgUChEEQKpKGDFKCQREx4xsOnjucLs6tDfrF7U0FR9sD/68OPPd3d2gRkCjJkDAN6p
+ncLxMmA5TAvC1ZEiMJW9vUc79g2cMa0ZGDp8uOuieQ2Y4GA4OGPWDAVRz/NOzeFkX18sAyGE60kg
+TKNUAxDIjWdzrmP5qRtNWNm0wBKBLIhkQVUNwfKEaPxtpi64YEAVUBTIFohwVs5ru2TNynh89IeP
+bbXHLMdV8vEkMKivLj/QO/jTe5/Y3Tv0829/xkHGY+s2f/9Hj6WzCigCeKG8NrJq2cL25spnXtxb
+IrNnn9U+NJLfsX+oYKuNdcot1124+oLFVFN/fN/vfvbA8/U1bTddcc6s9qptO7vv+e3W1PCoYYZ4
+3qY+0dZqnrv4HJ8K2zv7nt2wH6R+5eUXnr+0JZcrPPDoS+s37hEMCJac20BVLFXBT0MNAEBITBzE
+Qhw73LMKtjw6lGpqNT3by6cLXACmyB8wdd3PHI9xfnr0J67HH18azuVyz734pI/iWdNnzpnbbpgh
+KLhOJgOVQb/pE2NHQQAgxc1bCAkhBZDT5A4ABEvucHDt0hC5+UPL/ulTVxt+368efRblEpgJzBMg
+VFD0g9393/pmJwjyL5+66ooLzuw40n//AxvSsRjxV2gqu/ri+R+/fvXSmdPTWXa0N91aqX/tq9c9
+/vjmXZsPNNQE7vrS9R88fxG3C0RHH7vi3L7Orls+cc3FS6ZT6ly2aknf0PBDv9ll296UOvWWG9bc
+eNX55cEAAAynC/96532xRPrqtQspuC+8svvnj7yYyQusY57NAAZJbekqQN5myEmodCxgBAgDRwBi
+uoqcTAYcW1NVKVFPX9/OfTsySWve7PnNbTXvZPUnOhxKaW9v9/Ydb9RHqnLJfN7KMDdgKupwf+rs
+c9p9BseECKEAYoC5RAgYgDi92XNeUDAWPPfJj171xduvSqZjX77jwZ/86pV0gYOiMkQBU0wEsoBw
++rFrVv7j7Rc7bvJXj7/42vYu4jNL1NxtH7v8S7dfKYg4sO/IL36z/uHfb1q0aEppsKytoXb5wvbP
+3nrRuecueeCxjQpRV6yYWltpfu+OTzS2VOYzKcBI9aOpzZWQS5993rw7vnj10jkzC/nM8+t3xhLx
+JcvnfeNf/jqRHJ1SEzzS3ffTB54fGElDKCxYHnFCCGHMAiROjnp7k5cLxETACELcg4oqZdrUmkP7
+jxKe92lkz549ew/sHYuNDPT0U0kuWH32qRmcPvZTVdVgyDQMo66uoby6Op7OBYic3lz2xra9qqJf
+eNFCgzrEA0AIKAGBQDm5+X7TOIjPy+VXLZtz80fWCoa/c9dv7/qPp9OWBqEg6FI4io4RtZM8nly7
+cuYX/uVjEV15+rkDP/nFS4BMLmHFyvbPfeZKjt3fPbX/hr/9wTf+8/djsdTQ4GhXx+Di2dPv/Y9b
+ly+dfue3H/3ox7/2wOMvEU+vKTWmtFTc+b1H7rr3ubGks2Pb8LqX9p1z3tSffPu25XNmHx4Y+bfv
+PXz133375n/9z9++sCkSUqY1luby9i8e3/jSli6smeAUEFYQVRgDYAjeZuYLAEBRuAtMCCQZ8Pzy
+RdNra2ufe35LVQktD+uZTCoUCtdW1wX9oarKytOuGp5+eUVRlPYpU8pLq2KxeKSmurIq0lhVG7Xm
+f/lrv1j33M5LLl/x0sY3tu6Mqobh2i5gAwnv7aaeuQ0GVRfObaupDOzc2b1u4xGBAqDZwAQGgrHq
+uQ7PZFeev+COO26pKdd39/Z852ePj+Y8IGp1eeCfbr1JAfzcSwf/7as/7jgyCuEQMBE2DA3zcKlm
+Cv83f7zuW99/mKroAxfOC+gEJM247Ln1u3ZsGdiyeW8snmpobb/zK9e1V/kGBke//18P/vRnL3u2
+EaqNBH1+ijgIunVzx8O/3VywuGo6rsMlKBJ7gDghGpfyWKfmFHkWUUqIpG6sr6mp6ooPXLRnV+/6
+13Zdtnru3FlT7GySKGYiGqOStLdO8WnGqRlgeEt46fh4ihDS3Ny8YO78TDo3low5zPFrztpVZy5b
+ufxn9z6ZSIzdfvtNDXUVbjaNgGrEBNd+W+vgosRvNNRHOKTzkC5wAaCqmALShBtgXppbmZXnLf/i
+F6+b1lIWPzr6ywde3ra/W1WDkM1cduH8JTObMqPZn/zyNx0Hj5CqAGgAQmmob4nUBXPA73/89f+4
+Z4OTHLvlpgsu/cCZoNOugbTn0EtWzi+v0Dv70stWL/n2t29qqyrPpsVzL23/xf1bPElIRA+W0YqG
+sMRe7/Dojx59pnMsBQr1a2Rac7NBdUAuwq7kHPjbLmYQIqXjuDknXFlx680faq6ru+vb91U1Tf2r
+mz5cUV7CmJuMxYeHR9rbpy4+c7GQ4tQc3nQ4xwugmFB136rV55XVhUd6e2NHE/1xryYQ/vfbLoBw
+679+9nvNYd+d/3LdjJYGaRVcNyEpUsAlUoAgaHxFywXpAkGgeB7OU6pQCEytr7tw5RRMMm6BQsED
+L18TMj513fL7vnzDyunTbQf97Omn7318I+NhJwez5zTceOV5EkRn/Oiru8bACJpIgZRdFoZVH5gb
+8QVefXbLXT98bqy7b+6iaTdes7oyHNx3qPfOHz20a3/XbTef+9y9//Dk/Z/+0t9+qFmaImMfGIve
+/dDT+ZwKoQDY3sq2KfPrKiyPP/L0thdf2AnxfJmq3nH79Xd/6ZrGcgaeKkmJAAmgQjH4BXEQrBjO
+BkwiCZxTkfeafcYXPnnVylVn/vO37umPZv7981efPb8pOjKWy9nd3Z2aSlZ9YJVRohN0Gof8touJ
+EmR9Xf2VV15pmuaBAwf6+vp6enpmzZr1X1+97OhY7qbbvxso1+/6xs3nnjWP2DotgCcxRxiwlEgK
+JICqFGmKhQDprotHh1PYE2FdueHqVZ+69eJ5cwOLplV+aE37HV++9h//4brG1iqb5Z9a//p9v3w9
+lcpKr1BbYX/uH65aOLstncohT6EyD4CzY2nDpDdeueKKlQt3dHbf9eCzB7eN+SoCN9xw6Znzpo4m
+cz/676cf+M2m/7zvide2HxKRUMdI9s4f/nz99i0oYB7pje7ZdQhrAjy+8uyZf3vb5eW1ZZv2D/z8
+16+khwpBf+gTf7vsIzdetPtI91A8BQiDnVMVAbigYb/IS/AoaJqQTIALhEvXglx+3hmlX/7q5fMX
+t/7r//nJts1HvvGVW29YO7Onpycaje7YscO27YsvvnjRojPh2OL2SXrbpfRiE7PozEWe5z3y8GNb
+tmwuTntdcM6U+//r85/+P/d89MZvfuULf/W9b3zs0cdeeuixPYd6hkCXoAMQBBIRBlIirmDqaozh
+DZv3r169OBwgAb/+yWsvv3bNCoSUktIgolK46HB3cs+hQz+8/3cd/QlQfNVh/QufvWrZojO2bt1X
+WuI3VOXqS5f+5rev+isqr1yz7G+uXtY31P+Dn/5u/Uv7gaoXrJ573tlz4onko89seeKV/barP7Fu
+5+GOTqMkMJwQ6fhoc23z1FhW2voZbTNGB48uPW/6P33ihulTKgePJh//7eYDuw6W14Vvv/WS669f
+df+vnvrSdx/MWT5F0RCTnHEgyOFJJejnggrPBcDgWIShkBm4/OpZ1374gmzKueWvvxtNZO/+7j9c
+e8mi7r17OjsP7dy5M5FIXHLJJatXry62r6eNE3kH9MAYo5QuO2upYPKJJ57Yvm2LbeUFkecunXb/
+3Z/+2l2PfO5z37/mqtXXfuTCeQunP/rEjtde3NHXE8V+UwRcjhlgFZjONI/Zzv7DPc+s27TmvCWI
+CyHcUFgHBwlHRkdjrrD2H+z63TNbN27uB38FWJnGxvJ582f87P7nd+/q+ZuPX1BTFf7gmuUzZ031
+GfqcKXWjyfg9j6x75rkDiIuGef4PrJkTCpqvvnH4oSe2xEYT4Pdxj+zrF9A3JoVPU4xEwh4eGKyN
++P75k9dYudjipdP91OzuHLY8FjaVy65YuOr8JavOm/fUU7u/e/cTuayBSvyelTMUlXEMlABRmPCk
+kwNHgisCOr3gvDmXX76yvbniyWff+K+fPT2jfco9P/zIotk13QeObN3e+cbOTZ7nXXrppWvXrlVV
++g5hge8U+HfiPdu3b3/++XUDAwP1zU0LFiw4a8nsQqHwo/s2/PC+DaWlvmuumLds+cLRaO61TfvX
+Pbe5rzsqqA4Bn9AUgAJBVFip+mr9+isvXjR3bsAknptCmFk2HR5N7e08suGVbUcG8lwp4VxiYHVB
+Y+682o2vH0ln+bVXzbnxQxcGVL+lCC1bONw38MTmfRtf7Y0NZcwI3HjDqr/60DnZBLvvweceeHoT
+J5RgjoAy6aMyJ7CGvfRFy1uvWHNWbVV1IBAI+Y2OzpHXXt3W1jbljJm1VGWK4WPC98K61++9/+mh
+WAH8AcAFwAKYqoAqhM0FgowFTNZXly5dMn3N2mWVtcGuns6H7tnaPza65rJFf3/71U2hQOee7S+/
+9sqejq6KSOm55567cuVKSnHRdk+F+QfQF3ViXFU0Gl2/fv0b23Zj4HNmnrF48Vm1rU2v7znw8188
+v/HlzrJadc15Z5+zeC4GsnPvkWdf3LZ9a2cumQefhvWgpCBlJhjQpzU3ntFS61OlDd5oLD44kO3u
+y+RtybADVAKhiCsqUxwrCpoCus9HMivmT2+pa2DcSiVSnd1H9/emPakBEQbhq1Ysb60mvUPRjTsO
+RWOWagYYKwAlQkhAGChBwg1QvuCM5paGOkMzs7n8tl1dPf09M2bUrzr/zNKgnsuJlzcfeXXbIaeQ
+pmYpECpYHggRDoDrYidLEZ43u+388+ctP3u6pqM3th58/oXOPXuiF65ou+lj561cOj0+mtry+vYt
+215OZZOzZi5auXzZjBnTjuNmjBXjqN+D1Z80o8k5L05qbt26f9umV7q6usPVtYsWzj1zwQykBZ95
+bdfDv3xl975Dms9cs3bx2cunREp8fT3xndt7X9/dsW9Pl1OQGANzXGIGMZW6KaQbkmB7wFyGsKlj
+KpltI6JL7ICtKpriUQtsQQQoOE+o34cgxhzgBAmd6wipQrUYAlWR2ZwQEitU05ktABOiY85yIA3A
+KgCAlcMEBTQDIZKzCoxxIJyqssTvVxHJZ/NZiwkgqkZdhkFIsLKAPKJr7Q21S8+Ytmh5a/uM5mwu
+t2nT3g0b9vT3Rs9cOPOKK1dd/oE2YeX2bTu8edPOnsHOcHnF0sUrly9ZGAgaUkrOedHepZTHNju+
+a6s/XWi5EEJgLI+Opjo6Du3a8sboaLSuqWnW7BlnTGvMY3PLjs4nn936+tYu24NZ05vOXtw2rbW8
+oswcHrV37u/ftb9rf2ff0GBGOAzcLKgEFBMIEJNyAaD4EAgCDlMR8qT0KGBJpY9w7kAUcAQ4xwQL
+zAEDlYJxFylUOh6AAkgDRaHSYUIA1YHbgBwKquBEAKImMMvCDAHGgrggy0G6FCSzXJASpAfcIZJx
+REHXw2H/rKaqRQvbmtpr2poaIJ3b3TuydduRHXt6qW7Mn9v8gYvmrFzc5tf54e3D+zp2Hzi00+cv
+OWPG3DMXza2rr8JSlWjcZE+YFpOcc0JOntl9z1sbivVICJFMJjs6OrZv355MJkOh0Kzp01rapqg+
+f99wbNOOzpc27j14JMq51jTFP31q08JZbW0ttcz1hscSfUOJzsN92/YeHR2NppJpwQA8F5BECpHS
+BezDiiKxlFIAIZgQARxAAhCEkETjtvNmPIHECCFAxXBXkJIXE0K6RFGEENJjCDAwLhlHgJBnCYEB
+MFAFqdTQlbq6stbm+iWzS2urKprqq3VFHRqJ7jnQs31f15G+owUPzZ7aeNHyeecsnNFcE2FeofPQ
+wb379g0N9peWlk6bNm327Nk1NTXFML33FPH6x+wqKVao4iprKpU6fPhwd3f3kUM9mKKGpvq26TPK
+q2sl1ru6hrbv3PfK5qHD3d3D8XhldUVba820xrKFsxrbG6uorqcyuXQmPzKWPtI9dqRnbGAwPhbL
+JDIZ5rjMLZokAOMgJaZUYAYIFaP7QErACDBGGEsuQUqQfHzAL3jxFYGpxd1tQAmiVCLQVS0QCFSU
+mrXVodbG0ilN5c0N5WWlEVXRMKa9/aP7DvXvOTTc3R8bGh5TMV80f8bysxYsWNTUUl+jEx4d6D9y
+uONgR2fBYdXVNQvmz6qurq6oqFBV9aSp3z8X+hMb62IBSCkLhUJv31BXV9fw8GC+kNV1taWpubm5
+uby83OZ2T39s667ubbsH93UODQxHBaBguGTu1JKG+uopLbW11WUVZcHSUIh5XjKeGEl7+ZyVTGeS
+6VwmY6ezVjqdzeUKWQtZlmVZFmOMCc4YY54oDlUURVFVlRJECFFV1W/ouq6HQjIQCIRC/lDAKAn5
+QwEjHPKF/P7K6hKVqo7tHR2JD4zEegbGOrsGegaGB3stTceVFf7p02rOWjht8YIZrXXVfl0ZHenq
+7+8/1HkwkUj4fIHKqprWKe1tbVM1FWuadtwWi8Q554S8w5Tb/ww9AHied+JuvOKzBUKe42Wz2eHB
+kZHh4ZHBoWQyHgoGS2oqayoqa6qqNdV0Oe4bTb2x/1DXwPDBw8nBwaHR0aiU0jTNQMCsrimvqa2s
+KxH+gFlRVl5eFo6UBEuCAVWjknHPdY5veGOMMcYwoZRSz/OklEgCJohSqlKFEIQxRlSVEqXzhVgi
+lUim4vFkNBrPpHM9Q1Ysnoom8gXLA4IryoJTp9Q3NtTOnlk6pbFuWkNNSKe5bHJ4ZKRnYHhodEwm
+0oqu1dU3NjQ3lZZHSsJhn6lz7hGinBgI/Efsuvrjt7G9GXE/3qpIIQBjzBlwLm3bHhkZTqVS3b09
+yWScC8c0tLKy0qqKqvJIaSRSlmaFVMYeHkmPxHPxtDMUTRzq7hkcGkrmg7lsxnVthSCFYF1T/aau
+qjSkSkqpYRiGYVCqAgAqbqdiQggGQnDOPce2bduyLNd1Uw62HS9vWx6TErCiaD6fPxAItFSqtQ1V
+zU3VVRX+6rJAQ3VJedBUkMxm82Nj0eGhsVgskU1nhBCV5aXV1ZWVFfWhcCRYElL18RhuBAKAS0lP
+jOE4nnj37v49oz/Vr40nJAgpMMZcCoSQBC5BcME1R09kUjm3MJaM9/b2jgwNOwVHIbQiEA6HS0or
+wyWRUCAQIIomJOFcJBxZKBRyBTdfcFKZQiyWiceTuVyhr+AUCoVcLuc4DmOMeZwxxqRACFFKNaoo
+iqIq1DTNQMBnmmZzSA2FghUVZZFwIBjQfKYaMAxDU1UNIcmFa1m5fDqRHj0aH42msjkrb436/MFI
+ZXltbW1NVXU4EAxohqqoNrUVogJgOd7OgGAc0/HO4omGD39uX3/S847veihu9ACAYmwrl4JzrlBF
+ABUSKAKQwBh3HZZMZePxZDoTj8bj0dhRy7IwxpruM42grptmwPP5fD7D1HXdUDVd0ygmGGNKg8VH
+s/HNtny8b3PsCxMMxW2Yxf3jzC0IAJd5uUI+Vyg4jpPP5/P5fDqb4o5byFngyUAgEC4rLYmETb9R
+WVoeCIQCgRBVMGDgIDi4AJICBRAIMAYkJSpuUT+VyR+xp+d/tG/29IVc3FGIEAgAAVKxERAAAhKP
+/0YBYhIElwIjAoJYeTudTuez6Vw2mcmkCznIZrPJdMoTjFAKGCEkqaZSkBjTYrcKE1JsbMYjx8a3
+PHtCCM49wbgQwpO8OAwEgQjCfsMMB4IBnz8QDBtBvxHwmyG/L2AqBCPJKSYMJAGEQEghECIgCRSX
+ScixxZJjX1QiEPBO61fvUu/TH2URQhQ3KNu2bdu253mu6x7fUX7isThoLO57Lm6mLZaKruuqquq6
+bhiGoih/dGP459P7Dv070znp0xPbm+MnTzxz0sUnnZlYve/QH9f7jdSfXO9f9CfpxNDEUz89+dcE
+Tuj4/oXe773rfYf+VJdyPP0uOf6/Ul3ed+jfpU7y8m8H+o8oub+Y3r/oi06jmD5O7d0b/qlXvt9q
+w/sO/am43/myd3Px+1PvO/T/ezT5664Tpkn0E6ZJ9BOmSfQTpkn0E6ZJ9BOmSfQTpkn0E6ZJ9BOm
+SfQTpkn0E6ZJ9BOmSfQTpkn0E6ZJ9BOmSfQTpkn0E6ZJ9BOmSfQTpkn0E6ZJ9BOm/wv+vXGtlHPR
+NgAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_holden" model="fleet.vehicle.model.brand">
+      	<field name="name">Holden</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAA5GklEQVR4nO29Z5heV3k2eq+261um
+F41GXVa1JFvuRe4N4YI7HQROSAgQgkO+hA+ScE4gGH8hJAEnYMCmuFAcY+Pe5F5lWbKKZfU+mtG8
+89bdVjs/tix8ADvfOYxQ8oXnmmuuuUajtde6973u51nleV5ircXv7XAYPdwd+O9rv4f+sNnvoT9s
+9nvoD5v9HvrDZr+H/rDZ76E/bMYP36PHFLwUPgdcCQBKmDEk3bAwHEqAUsugCTRAAA3AginNVEaN
+gtUgyhJLZRs4AzWKWeYwDWgYCUWsE2oLYwENlcF3QTgMSSgBABgDSUE8cCgKBXi/6/GTw7ak0gqE
+gBJYCgskCpxCUEQWAUkIDOBqzbJERY0obpRe34xaI6pU0mrNJIlW0qhMa01d3/XDoNTO28qmrR09
+HWygl3W0NUQBoASgBgEBrNE2NsxQWQTAOEAAGKUMpZTSwzD7Dxv0Y0Bo4aQprLI+N2BMc1QV2ji0
+hmyitT/eP6Rf266fWaNWbyM7t1ljqAUjjDsCnClYRaw2GaS2hipKU98z3e2lWVPKUwbZglls8qRk
+woDySw7gGBipqUugKABYwAIMoFDEZEDwO9few8d6hYxDAgTwoHUcW48rQtx4aOz1jY3nV7rPrg/W
+7mD1DF0ddKBnxylzg2Kh1NEZdLSzYih9V7lCcerVIjQjZ7TOhkbs9t2tLdsau3dnjUZXRuXEHnbc
+QnLC0WrWEeHANMpANTJjmEMBcAMYANZwk8F4EL9jAA4j9C1YF+CRgAJCSLZ7a7pxY/JvdzY378j2
+jXoTe/0zjhGnH0fmz2VdXa4JAAYABCCwFJLCANkb7XHIAApSYXg/9leqjz+dPvyCt/J1N/SaJ86V
+S5cUTllS6JsIyBgkBvHAQgNkFlyCE/z3gV6hBXDANZlyRsewen1yz8NjTzxHUHJPmsPPO5YcPcsd
+mGhpqICmRI+IsyjKxhpoxDTTTFtmAIBbicBDoZAWAlbqYIwSC5NC+dDNsfjFZ4L7HhePrKiOjMlT
+F3a/53w2dxEm9KRuEIP7mrkWgIHNIH7XfvbwsT61FTczSLs2bcWN9w39fHlU9ryT55Y/+L6wrx9t
+RQhoq1krxa79Zue+5JXHZSOSlZqpN3mckiwzWaoyGRBGCr5p78p6u82kQTpzqjdtstPTlYRtDgOB
+Appk29bonsfNjx8trtpWv3JJ59Kzce4S5ZcySwNDQSBVJJzgdwzAYYPeapBahuX37bnlh9W164qL
+FnR99N3OWUsSlBiAuKW37bHrXjPr1yXrXm3s2u4NNYixVEtmFSWGUhBuLCGRCFiqRAaqWeZy2VP2
+pk/0B/vZ4tOdSVPozNlpm2MBT6lsxXMbHnmw75t3RYvnmMvOLZ9zZql/srWwVoMS5/9ANxu1kiBE
+Bs8g9dIWlI8wA8q71zZvvDX53p20b8C99k/8pe8kHmkZFEwrfep5+sjTeHmF2bsrqlcTpYNSG6jv
+UarTlARCuiyW2iWCxjpuSwr7Wu6kns1JrbsKp2HqFJyKIqN2Si87eUFy0iJyzELSNgVwqUHrhefF
+df/U/vQTjXOOST7/V86sY5kEE6kGK0iAWUmtkByUNgkKCnAOFTCHHPoK0DGWInSrjhQSIRGIW6jW
+K3/xt9HTa4tnHFP+y2V26lTLBNWZ3LS59oM7kxVrxbYdRkcIiO+6TBFGRJ0lLPSMQ9JmxBLjcVcT
+SlzHRlEppfUoaVnTVShToy0H0XpbaPz9STkVtL+fn3OiuPB0Mm8OKXU4o03Dajv/9Xv41587Ewfo
+//hA+zuXOtrXRjHCU24ioGxAJQWDBMQhW3QecuhHgO4MsFHsugDzU2DVizu+cp379A7/2mXm6gvF
+wASXSLJnY+W2O82Dz6V7dnZWVVgo7CvTES6LRpRSSi2IK+NGU4AjMwKUaZLWWgXXb1rW3jvY8pyx
+6T3ekRPLo5XoyedNUid+G5PaiVVaTaTjydnT3bOPbz/vlKG587rhJFFG/v2u4MvfGOMR+ZtPtZ33
+LiVccKre6LaXWDAyJkz7IROiQy84BsZoSpAylgL+My/tve5rlTXPH/E3X9TvPEe1dbcnSF58LPrp
+j+1Dz6KRkX4etohynD0OQOmgdJ1YNanyRiLlClkuZqVQtZdIZ9FtL5U6Svt72sJiV2HitMrcCbIr
+7HnsuU2f+EIv154KR0MkJe5LhJVM1pKkvdS+aK79+AecI442Zd9qQx65K/uf/7R/uNH29b9oO+/i
+lidYknnKsQVk1rogDWKKhwz6Q7+HQyVtWRs6CeCvX5X9/TfVxu2Tv3xtdMVFXbaA/U15/wP6tlsa
+W1ZZ359cnFBXYxmHpazb8LaUoxI3ZKPV7e88Y+GUY47yp01yunt06HrtJV4Mdu7cNqjJLqkaRARN
+p9DVRgan8/6JzvD+uCAgE3csBQWKriNcXavIZ16QG3c1PnZl58WXsmIxOveSyC9EX/om/vTv2r5c
+Di4/oen5XqSJZSDEWh3AHrodxkPPeptCOS1B+MYN0We+zF/dVPz8R+vLLvcQOFFz9Lu3jH3zu/3N
+saw/qGnWlRWlpySxLhO0IY00WWeJHTm949gF6WWnuBUd743o5MFkYq8D4q/fueaGWwbWrpeXniaO
+XNjeORnT++C09t1wU/Prt04gkrgMIY9USynpcxcaAG01mm7Qrq5YWvrwB0n/hDpF27oV/I++tHd/
+6n35I+yicwg8oYgDSqFB8u2eQ2KHnvXKHUGtO27Vv/6t1guvTvzcH+r3X0xQcEb27vr297Kf/Lxd
+yGRab2lEtUd6d1/GCE2MpKmhqYymT6RXnUePWlhVjvruA1vX7eROx+SrLnYnDkgAwu0udoxko4Od
+gb9kXgMFCWj47ZcsLY/R9Ge3jkRVynngch9MQCTEREYXJ/XRTUP627cnoOKa93T1DKB3Zvr3n8k+
+9ufN7/90QnvRO/XkFExrSwUD0YcOmEMezKYK7cJr3PT9xi/u7bz6DPWRS1qivdhA/bpvOnc/1J40
+hGBkxDb9cmVKScuqq1VRm3Ir5aMNWy71nX92eeGJzTG//f6Xfam6lx4jTpnDVFpMEkzp6PzTpd0D
+3dlDL+KVTRzSB9pBMTBJfPLd5b9+LzluhqdpV8wY+CjVLUJKXqm2v0UmdLe3haPfv3XfP3zd7t6o
+OwvyxJMmf/YyteLV7Ia72K6Kz7l1eUKJIeTQITN+0FvUYaAlIpMa1AELpJCOB3r/I/Wv/UgsOQ7/
+87M1r6eUpa2b/xf5xW2I67KjrwVH+YkT1MKoNSFpl7WaV2MjpGv00iuDP/tM3DcV0BOPm1D70d9P
++ss/K591rmYuMV7LC/Zzn3VP1h+5ePfO7aPX/5u/Y4sBeAVOk46UPBxxlLvgKFEs81QKqplVhYyy
+TJQcVqNpxUmnOV54xxPD//RD1tifQNYu+HTHX3+k8exP9W03k2qjBqRQNGLjhs+v2fgJjoHHAAY4
+xiXUNQCBIRpbdu664admwuDA+69EW9m3qPzoJyN3PtDneAzEKmOscbUhtWx/qmvULZT72MnHdFxw
+trdgEYJ2tCg8kpaKTDPSFoCxSKsi5zAyookE79o3Qtfv8FbutGe9kL6vz3SUC4ALjN37bHbni6we
+bzC1zhbv6+rZrhuca25JaBmUrOuUcae+4tXh79/Z86HLso7O8imn7ThnxfBNDxUXHF0694zIskOq
+x+PHegPHIgGqzEADCiDKkU3cd6d5dVPb2efhnDNjbrHixeTmH5f2DCnHcYhgWoNYYQlPie7oM6ed
+2Pt3n2v/7B+Zc05r9nZqAnAGSlsQgoVasMToIuOgktC0uzLmfP0H8ivfT2ujzUX9yeQ2RwgA1sJX
+ovSOJb2z5/qkEJS7G5aMjIx0BK5WrcxYmhiXMOXTQtF1N28f+eFPcf/j0jYxdV541XtNU9pb73aH
+dnPCk0O2lMV4sp4ASmsBQSgMUgYXKVuxdt/3f1g6/eS2yy9twSfR/uHbf9yzcauc4NQp90AZsZYT
+pcFcr+OYRZM+8YGxKdMc4RsYBqMLwgKpQsDhSQJBU44Uyh0bje9dHv38Yfb0GjKx0/vEWfyqs+iC
+RQzCkRaAEIzNnR9+YwZWvOq++GLl+RfJk68UDa2URUHzTGfG5xSWU7R5LN2zp3XrT5I5feHsk8pL
+zvM/9XrwL7fW7n7YueaDCu644fNrNn7QU1jKBIyjOCwazLiyWb3lnnSkWn7POWr2YNqI3UefsU8+
+m5VNSgwAa60B04wkgklLvQldmDEYaN/VwMiwTuqKgg9M5sxNFWAZtHGYrm55feg7d/PbHrU+6LIz
+gqWXFObNJMUOZgAF5UDBeoCUYthjwcnHhUfNGrhq6cgNP9p26z19NY+HvOKZFlV+ZhLEuk0UQhKt
+W+c++gz6j4vbufP+C9TdD8a33F9asiSZNfPAIcEhsHGDXlNYwLGAhmZg0Nkrr40+9lTX0gu9Y4+u
+A2bDuujfbitU60MTva6aIExLSrUFM8wS1TJpa9fWcPXaZOGJzop1u77+Hezankxq73/3JYUzz6LC
+iwANFDfvZNfdlj7/8sQLT2bvPqt1/BEBemKAaPgtIEAGEBhI1hQYSCgojYJOFZRKf/nh7kVHVD93
+gxM1SaevtCaWKksakMLnToLm7fd6Mxezc88gXRPqy96BP7+RPPasP2sQCMcLol+xcdN6BUsAaAqO
+Fkep3qjf93TBZbjkCpR6wrQaPvGMWL8eRaEz5qiAGq0ZIeAiIYHmnjF67WvVb93qtir69XXpk48N
+rntt8PmXt9zwnT0/v1tIMwpdhMTPl6fLn512xRJ2/TX14xdr9JBEOoBkyEoAhwvlg8CiDQaABDhA
+1mzd97370UrGjuodIzHLZElRRh3LhMgoTy11Pbt9e/LQA/7OXRaBc+aZYv7kkYcfNZs2jxc+v27j
+Br0FoBSUSRkSgG3Z13p2de/cqTjymIw4ZNvO5K4HncDUiqS/yigCa7RllFLupCTQrJ2ytn01b/nL
+zS/eyOvV+kxndCDzTNT/0uvkoRexYUcBDM9tHH3s2daSKfEfnZZwt1RnJYnUG0sRBYCjAJlRaAUo
+C2Ia1ovhSArj93aVn980+jc38p1DpuzyJAszKAtpbLvx2pRjOC+1F6OnnrRr1jaAQjixeOHxje1b
+1YYt44XPr9u4Qe/pSBOn7nHXoidDfM8PyfbVI1cvK3d6jo2bv7jLHduXEUKVV3dNI6wxGjClrWko
+X9aYboDawIl87d3z8Njdd8+qWUvo7nbr9Adb17+ALatCYzE2NrZ7ePqiU0VhhqfbQZw9InEQCAQa
+MBaAQwxLNclcgJQ1hNDEKlS6O4p//XHv7BPsjuFS1BH7YcNGAkp6TmzALGnyJHYKwf4ofugXZTsU
+hcK56MOe6CO3/RBb97RgKwAkoDOF1Bg1Lnsv47iapWBwAEmAfUOtzXvDgQmlKRNB0dqwubZha5rG
+xmGMUGEJ1Fsu0CtsrFVvjHCvOCL6Rwi3bGoSYMxS2opXvCKKLuYPpE5gGYVAAQ6xBRZpXk9otYKx
+XZo2CbNBDUjBwDWjTJk2BTptwLvqXG/BwjRqucT6vmNN5kkNVzSI8RXlhGpGGht3tNZs9DlHT1sw
+f9rwlr0YGuYwFPlx/HgubscPekoNIAADXdu8Mdm4uzzvSGdqH4DGi6v1uu0AMpdZbR0NYt6SN12h
+w6uxdD157MJa38DQ1mrQO3H4hMl8y8rq/Q/Tclid3mfgEA1FULLUxGA+S5z0tSfu3fLlfyQ3/Tyo
+VtKytQ6IhAalHqexaoGzM08pXHVpi0lba3KrpElJloLTOoyvHVhrPU437YqeeJmkiQ1o6bTF0VCz
+seE1V6UcgAUII6B0nF7A+EFPqAKYAYMyu7bwasqPXBD5DrIGeW1LabTl+J6i1KRSWPI29y6COqM6
+68+0f94xzhc+3v3ZT5a/cA2ZHNa//n21Z0//cUcGfQNFcGhwDihQjqZR2vNmXnB65+Dgjn+4ddun
+/8Y01scUYECmEsAWuY4zhZCff3Z49GwbSdrKdMANtNCGEKIpMUrDpe2tlL6wLt27pwFLj5tTKHbX
+1q5Ds/lGIEgPXEQZDxtPN0sBWHCZ2O1bRBhi1rwUwPBetm1PSUkqqDGGWYBRY8xbtVOH0J6lu7eO
+PrdSHjXP/sU1KmBm2Zf2/OgBtngWv+hMhxeYPtD3jFmwmDAVQCTBhMKffWzKH76n+PTK6ns+VV/z
+qqWSCOoCKeARxmPojq6eS85jpQ4Ta1EMMo+wVBXAE0oI5QZSONTZvNPsHgKgJ/YGM2bKzZsxOsqg
+c9gBOl6yM27Qa1DfQDGgUs22brCTejBpigCRW7bJvXuUlZnVQlmXOlLQzMq3aqfe5RXBVcDqK9fg
+6VVYuar2V9/yb3+ifOTCwocvtQvmpJopa+BAE0SUZDZOQTio06IVuOmZi9mUrp7n19f+9XutXa8T
+okkjYVrBY+DwU+C4Y5I5M2qaoKUtaKozlzDAMMGNVomrxOgYHRoNAe2Hev4MZ98IhoeIzkByelFY
+kPHws+MGvQEjBimAkTG5ZxeZM4iuHh9QW7bJekU6UNSGklGQmBr11o8lar/KLG2fVAjbzE9+pj7z
+heTZ5+yHl/Z/7jOl885rwAWhggM2laMjRasS3hZAwEIQdGdwp041V5+7pb3Qee+j0fd/ziujcLnO
+UgtlBUCRdQ+yc5cknZ1sT+Rp1nShqBFSS2scYH8gddzMtu9mqRHgOHpW0IzU/lEoCYLsjeBgXI6X
+xnW/XiMFUGvSVkNM7YUDrozdXzE6swVBOHMsgTEp0cR5y+d2J/VK6Mqq57dI8/nHyY4XCx87pfyV
+P7Vnn6BYyCRcAJlS23cNr1rLdoxloN6QRiKjwDRNmnhOx0XnhwuO6Wqlyc2/2P/kirpD4bsudMvG
+1rEIwo5zljhTJxfqpkBFFPKYGjfRqZKecOqhNSpp7NqNSoNY5hwxxddKNutWGwBGj+eJ3rhB71ik
+btoBYPtoiAn1Cf3KApIm+ze7WroxMwmNfRY5MrSkWNGepY4hxFhjjNYa2nBlHY06NwGhBdPw7Ghc
+7sz+7Ev0r/4JmE6MZ7OECIUkU44Dv9R1z5P46t8Wd42gj+z3DYEuWO5pjq6p+OBH6z3dnYl2b/hR
+af06CTsCNzQ+UdbJQPsHez7y7v1zJsY7dg9CNf2o2skKTDVTt7vZ63ER7N4CNQYrVLF3pDf0N+wX
+SjaI8QXRRoLkC/ff1saT9QQEgM4ya63jOIQArVY4BkhaoyZzQWUatDKRKO6IZrMZx7FSyhhjjMmy
+LI7jZrMp6kFB2dQ0W+C9V13ed9kFRYc2OqEpBGEuAM8hAOvtdE5d+NrqTeznd2BktATX1cL6tsFi
+BUw4/fTSO8/Zo8ai0de3PPgT3qx3axAJKzQ4RoXNzlnsXX3RWHt3a3Ojqyb87MAZNSEEgNZaZhks
+XNd1HEemKYzJR5f/wbg42vE8C6CgAOI4Nsb4vk8pkrGxdLgFQwijoXC9akNpMlIgrKcjHJjqBr5X
+CIXraK3TOElbkUyz1q5a577NDTeKJs9tP+P8Vm9vGMUm0LouWbHADFEEWWRkQMvnHRfefm/ju98O
+Jve4F7xLG1SZETBEKR066RUXsDXPdqx9Nbn1rmTSUd4ll2QeiIocFToeYt5ZeOcFdncS/+JhWhkt
+lbyaq6y1jDJCSJZlSZIIC9/3M8+Loqio9S+hHyfVGTforQEYjDFJklhjXNclBI1Go5lVCtSEiqpa
+OhZJNnNGePrivlNPzOYcKTyXhgEIOMDTTMSJzqR9Zj392peS4T3iqPnFucfVQJHV2L1PjlHae+lZ
+xjiMMiegMVDzy4MXvWPPZ35eu/PuKdPnYs4sDdIBH5pkHHb+3J4Pv6/2pev7XtlT++aPGlMnkUXz
+ipyD6KIWitFs8nTvzz4gZ/S0fvFgvH6D4/yS9UqpLMsAwBWu61bjONAHPCwBgTFg46AW43wCZq01
+xsDaPEVGax26SsW1aua0JvYGCxd0XHA+Pe049E9wDQVgKQxgDIgQnIUOAc7piR+9g/34lYC68KkB
+kETZnY9nSKPT5vqdk5HBOBAwGhSnHc9OPim+/2mUb2Kf/cNS7xRrQRgctBwW4tLL6nFqf3CvfmXt
+6P/6Wuc178Xxp2QuHANuUSfIutr73ns2SmT/bTG2bieEEELyIRxceVBKtX5TZEPGKb4ZR+gPyh+l
+1BKiteaA67phbCrM5YvnF85d0r/kNEyfFTGeRiYI8gwzGByQKsZAAE6oOe1EeseD8VOveEO77EAv
+sjiKa2L1Grr6NXL6AKjQUvkCFkxO6Cy8+93spa82b/opLTLn/R+U02darlwZpyyM4fa/50NJ94SO
+x5/c+crq/T9+mO5SbOmpKDK0ouLuXaLVwNZN1Uefyob2e4QcHAOllHMOAhgopRhj/69kq3FaUo3n
+AaGFpYQ6jpMRIqV0gUKhkEWMT53ZtexDOPtExYtGEoch8Ci0zPNDfjkSC2ijQic84aT03DPrT78g
+H304fP+74QdssI08sDu541Fv2mwMTPGJzkAdy1KD8Owz3Q9u2f/tm5If3FFKVNu7LqRHHAHfg4Ab
+SeIJ/8wzsOTkGRu3NjZsF0S4yoU21ZUvVW++o2fzjrQ6Mjyyd3pvf4MegN5ayxhzHAcENs2yLHMc
+h7E3nVVROi6SM56CY2EJIZxzSYiUEoAIgqjc22ovd82aXedl1LN9azdMmDmBdxagXShkShoYzjnn
+B4ayB2bShIkd11yOrRvsA4+zy94BIbon9KmyO/zA01vmTJ/+rkvK7W2Kc4cQ13JVKjbffw4d3t59
+x8OtW3+2feOm8PwL08XH9BU7RZ9f2V/lqVCiTRx5ZHbkzCKyFJ5GJqhkW14fe+alwpTOYm+hQSUh
+BORAnHOA9YCUUinlCoFDkGI4ftBnrdgNHYV4skN01j5UrxBd6O5ypw8GdzwUfe97pS/+CTZs2f3V
+67LjjrCzZxT2JmqoYkZazHLd3h5P7qPzp3gzBtu6JiWMpied4n75y8k379E/fKTtw+fFJ57Ibv6O
+M7St80v/qFa8bD96RXDisSk8waSCaJs+W370A8NOMbnrocIDzwcvrQy6XNE1Xxe8uOBF0wZ7lpxc
+DBajWEyNA9oIiIPjTsXflbf9+13DTzw5aWioXdZrvf2R3/RMI3Lqolx2WVdG0YqH3bHa7qnhdOGF
+CgAhhABKU8N+64v34we9oHlbIgg0dWSlxmEZQX1qwTim8cRzja+Xwq0V9vTa5todInyl4tWYgZBG
+JZlRygrqlAuqEHqnnO8unOEdPxdHz+KfCStZ4jZkcfqM+hln2h3D7Q00Xtq97fXvdJ36Kl80004f
+VO2DGOgQixb1u15rxpRsxerhbVuqtVFvx97SjKnu4OTCgnmFI6ZnpaAG2mKYYoswAEO44Oh5YVnO
+n1t98YWNr63r3DhWEKQk/FSptLM7Kzgq04V9Y63MthXb8klwcBVEMQ5yP47H4tTRAEHQ09f0g3TH
+bg8S4HpiR1sh5Ku2b9h6S1xun3zcUe7xC1DoGZnf77rCsRrVqtg9rDdua67asH/d1sL6f046esyc
+uZ3vu1Sce2KBe17moCi8d142OrKvs6fP3Tk89tJr2VjUWLdZyJjP7muUpe302bwjw4GJxTNO79w/
+ilYUdRWCzg60lRGGEB7TrFujWwMCUiNj4CF3FswSMyd3nriY7domf/FMunaj/+qG1kjmOUVSDB0H
+8d6dmbRdXb2EO1CwHBaWWjA7DuCPG/QpiK8AAd7TR3o6W1t3FuoVWxzomXDEJs76+/umn3yse/wC
+HDclmz8tpr3dkluOlAAAg2L1RmnDVrVpG7/nZv3STvKzJ9SWkdaGdYULziRHHJMxOCee6jSHo4E+
+D+i7pIpaDKtQ9rXXKwOqAQJKyh0Iy5g7AwQBqAXVuQcCYfl2IwEALqAoYiAGhO+JmbPaZ05XJxwb
+P7ta3fe4fu11LJonfS8wabx2XcY83tWbR8EGMDDUUnJg5f5b2fgFl2CEAQQolNXk/uyZl7BlB1k0
+gM4p2eXnJTMm8VNOsv19KXQLnINDg1i4DIpZBUpKRX7sgp5jFuDkqXjwFXv7I9Ezz6mNq/WeIf2J
+Dj15mi273cUJJlMeGIodaGeaoWZkmSgKIixh+RqBkpiYGOiIKAEIB3GIAhSB4QAQ2AyECvAcOmrB
+LAi48Tu8M5c4x8wmu3YkEwdTIBhr8RdWRd0d6OoCpXk0r2EFYVDjsAUzbtB7YOAGoCBCzZnC7luO
+Va9h0fGmq2/6xz5M24tVK7hiZU46JYVENZAMRIBygIEqaY2lQpDGpIXBB45IJk8w30Hhvkea9zxc
+mTOve9m0Cok7qAslAAoOrWEYPCsYSZnRgAUTeXToW+YTJMGBTHwGCAVqDAgFoIWkoMxKbggIh6Uw
+FBY8lmlZqFJnMDc0CCmAvUO1HVudE89AR1kTMAoK2Hwb4T/VHg5R0NzAGkaEs+gISpC9skFd2Qza
+S5RSbmlP7IABVGsTMSdo0wIWuccDARVMAREgkqzihcVzzgvbS0lvsfGz+92fP4yzTg+nTLcA8Swo
+MiBWSWhEAAZNAGoIBSghhIDmzXrUADhwmMcARvOzDgPBcrnI1xOWABacsFAQQCiLyAQBBUW2YbOu
+1UsL5qBcyACf/RLw8ZD6cYxwUihumQUID6ZNFJ4bbd/dajQCEVoqKTwwaIqEKtdVyCI4wgIKBjAU
+hsEyna/RuQRsBiw8kbLYXb1RrH49eugh/4PTc3izLKOcFDijUIlsENHGAZaXmwAkgSawBD6kNSCE
+wEBbQ7ljgMRIn7gggDbWGMK54kgBDZQMlLYO5wgDzWBTNNdtm1GDmjqgOc8A3+Z+Q1uIcWE97HiZ
+zppWWm0bxpostl+8ccPgsfHD37KpNdZGOkptJG2UZi2rrTFv3Y5KjU6szZTKtFR7H3ts5TvfpWYc
+pW7+rrWNPdaORtZm1hpprbTGWm0PfM9sYm3FWqtSmyWp1anV0mplpT3wlVmbWZVaI62R1ihrrFXW
+ZtamVjZsahOrGlraYWvtxleGT186esWyZrOZZdkve6eUebve/3+wcUxtsL6hMDAEkXBwzFR/1iT1
+0FprtTTap8IBV9o6REDDvA1rCCeUWRBtQTjrmzdv2vHH7rV6590PtR56sh+mwwNgNUEMo4jNKCIC
+TaEFXKXbtckYh7JCUaEoU5RpDs0PlDeSAnBgOcAtYYogZTYWSByQEI4BmEs1ipD1x592hqPSO8/4
+lQ0cMn5XccbxMoillgJgFjEgT5oVnHxUctfq5oqXKEkBIBMeC0AFLCTe8kYCLLXgBpRykQJoby8t
+WZJMHcwee7Z++91YvxHaKKIleAqWu06pUwYFxPFTz+Ph5xOdQniEIv96Y6cIYLDUpAwpRX4qzwFh
+rAe4MCAmowJGWA6+Z0vlzkd4bw89/SQhxK9AP17oj99lEErzKyqehQ/dLLeJk4/KGtbefj9PmnVk
+0AYaSgPMMKi3acoABgRArKA4x6wZ4YnHDWhNn1kpH38CcY1wDoCDORZcmyIopGXIkudfVo88xzIJ
+ioSqhKomzZo0bdKsTpIaicdYTAyYAtcgClCghhCtiQWTrRooYhBq5BPPiVe3Zucfp3r7GWNvxvo/
+I+sNmKVIKZhFWNcc3D96vnv68e6DL6iX1wAWDoVGBptSzd/GTxEASJOEAYIhsUB7m7NwXtjX5lYq
+9TXrZH0EALXwAUgAmlIGYwGrq/vJ3j2+TppWeYZ7hhe0KGinYJ2SdcrW7bC+Y8Hz2cBgOTQnGSMt
+okAJBSCAfSO1f3+ED/bL809whD9e+Py6jRv0FNCwGgABLC+C8c7u8ANLUx1tvf2eUrUGpqzUjiAt
+o8l/dK4cuIwY+LlQcOFMn7q/LyQWrBVlOgNAMzALKKWYSQmVjAO8ltR2blmDTRtClsZABkhGFCXG
+wubxu6EJkxGVTSprJG7ZlEA7hobKAWWdGuAwP7mrumq9eN/SjnkLx+ss8K0QGx8joNwSF9AUCDgU
+MRA4ZaG8/LjsufXyx49ZGWnfcIOQugdWlr/JtAaFosTCKCbBAUNJ0NebzBhIjHYMoUxYgOV6LUwG
+lWlFOEUmbJyZfUP03ifJ9q2WxoRmHCknKZU13RiRY3tVZZc3MhzsHykkzTIQEkrzkjkGkAwG0cuv
+DP/sFx3zprsXnc1YCC3tIUvpHscMQgtFOEcFMhTCTUEJjf1C+WPvEA9u2H/bQ+SMI9tmzuaxcl0O
+/ZZ5MoxDGimgIAUo54AxhgdBcdaMiny5KDUhxACcISUQQjsAtxwS2NMoNFWHJvXb7l25dtWcqbMd
+xl1CkClZbyT1ZhZFRipS46a/o3DCkZ3nnkpmT2kSGjmGgHZnTtWq6r3L+ZZtE//w083e/hTwiLaW
+4U0Sb60dL7kfx1wqku9gd+RFxFxGgHZg/6TFXcveKb52y8h3buOf/wxIJ5oWJQIDUGNhNKCtZZZy
+wmCgGCLiBxbCAgJ1yJAKCjchaiApxF0DslRsB1JiC8Yi47EnXAIHKWo7GvWxDi/gaWvixvXklZVS
+w0oQQxgTnkMYsxnRDLy4TY68/DizUdv0P2GElgUSKO3sKHznoer37uo+7xK84x2E+kJBC+9XGDKO
+bvaQJ+q3ZS6WXVkf3U1++KgpdsWfeR8r9VSyrI8IGEpgOQMHB4W1AAOv63JgFbXWsyklFMqFQbMp
+dlaqPtqmTXCDkFgwQgACklkplIBjlN6yVY1WY64pE52u11Ku6ziEMJMpYzRjxGEQ1kIAJnENrQwP
+FU3Tc0ukapw2Th56ed2Ndw+csMD9k8vgeyGo5dDyEFajO+SJ+pwK7ZXar/2IO29y/I83sQfur2JM
+OA44AQPAkBEYwEIT21RpVGIp55wKoh1PEUdqCyiSlbfUouldzuJZLnVlqpHrs+uWjPSRQqbR+k1e
+K1aCJsyyxJS9TpWxemoSz5WlMBKsZZBR3mjVWTHMDJkQdjDBIgKIjLy+c9/f/pAolN9zgVo4K3IC
+gGqlOHm7IPi3RebQNZ2b5Whl2vUndlz3mehT/3frCzeGXiE897yUhNYYl1NCKQyUNoRTlwuhQDRA
+AQojjRE8A6vUm6Xto+aEOZgxQMAYYQRQFpYQ9dKKOK2HY2MjL77sKeW5LLY01rotigvQqWuMttJq
+JaUglBPBjeD7TbzkOHb5UqROEoymrV3e5/4Fw9HEv/2wPmsxt25GMAa0MYK3voz+29shh57ImnXK
+IkYyY6G9/jPqmr+j/+NfUc/cK95lCKThlDJQADSP/uo8Cffuy8Yaw8PDhbG42N7mdpfdVa/XuBec
+sti0txFNuQNjwQAm0z2/uLfx+pZOo9W27Y5AYAgIq7pUykR4lEGlSeRS6orAKCSVZilme847pv0T
+y5qz5jgwnWt37fnyV6ovPT3ti9epy09viXJJImCIKSQhjlZgh0pxfgcV/+ppKuD6kEiF4c8+Wf/k
+dU4W6S9/ovvYE9DWmREquRAAk0o2as5LD+799n3RSNVQVq7IjDNM7gkkwsVz/T+4GP2DRgnKoAw4
+k3h9x/Bf/GW6bmunELFrhMudlswsqQZMOAZJ7CgZgBhJ4ozALbhBmZ1wdPTZ9wYTjggS1NavCr/8
+vfqjy/F/Xcz+6C+K4AYeAWUR4KFFEVqJt0uB+a3skENvYUgjrhd5CJcpxDzzn3h+4xf/cSjef9wV
+V7iXX4q+7ogxRqibGVmpjL7vg/ufWTvw/qXtf/guhB1ZvTVKTH/moq8X0yZCCwuAwhjNTDO+6Z76
+t/6JNeMCJdYTMbOJstxyCtZwFM9kmTHfcUdSNez45aMWTz3xZPWed3DLEI9h+dPVL91YadSKn/pA
+93uv2heEvRogPNPaUYDLWsSE43MA/pvt0AtOSlXRLegxzTyGgh87ZsnxE77919Ov/MyrP/xJudma
+8qH3075ewwBKmSJy9qyJwYS2K67A0YughcP8EigiZIHMwAop4MMQUGbSen3Xsy8WmrWgsyyzTGRS
+wcYF3zeiq0YEcbnRJokrmTJTJw2cfmrp/LPtnNlc0frIaPrYfeaGG01l94QvXWsu+xAypzdCFsAx
+cDSzPmIgtNSmIIes6OthKzE6kuwif3Ozvfk+sngiufYyfcqJZTbgxiTDcC2OnCAs+yUoBkuN1cYR
+XCEFOIOV4A7Q2l/5xk3q1vtCmYJRQ40hmsIQKCgFqSVlaOsmc+bRJaewU49zpk7iIKSRYfXdle/c
+W310fd/i44I/uRpnHJOAe8l/p/r1Y2jypEpvfZD9w89krRG/9zT+oaXts+ZEKHsazAAEKYeGcY1k
+GVIvrz9BFXRRV+M776/9y829r+2s9xFqKLHUWpppoijjhUJQKiUL5nefexZOPKnhh8LCsyk2rd79
+8tPB/7xjqMt3Ljhh8ocv19Om1UFsim43OITlnt7CDhv0TZgQmqTV+LkX5I8etM+uiaa2Nc+ZO3jG
+NV5fFzqCjKKZpA4XDqWMgikFRSzNEgdkx7bq936SPfxEr2BZe0FpYhyXtnXqjk7V31OYOa0weVI6
+b06GA8cCauf25JEHyb0POavXZXNP773yLHbpKTXHZ2AFCFiekN896Q9jOekEsLrh6wSyTVbsvy+P
+f/xgunKDndDrnDQ/eNcZduEc4ncx+NwAGkpAG2QUDHArLbZlJ6hCaFO/OzMGXHjFEglcRaEoQBBa
+xGlstr4ePvSsvv3R/Zt3JEdN4+cv9pe9p1zsYADJLJoZggI4TZl2ySGstfUb7bBBn1PSNSCRVAWS
+Ig3Xb8I9L2575rZktOXzMBicGh6zwFs4l/b0oa0NbeWG66XgbQBvAQzagwS8GKCwDiSBgCFpJPft
+SypjfM0a5/n15Ok1UbM6NncQ55zad9qZYvoc5QNKcWkgHFBYazSxjLL/RoJTB0oKMMgcJIBnQQki
+mFK8tf7Yy9l9z5MXNpBqTbeJbGKbN6U7nDhPzx9sthfanZJT7oHvGOHQ2MS6SqxUcUMPj5ht2/D6
+Nry+Xe8dEfX9iQgxZ573zvPYGSep7j4fws0IUgOPaoEEmlu4B3dQf+fYHz7BiQFmW47RYBxwAAM0
+tOokHBSQCV7bjBdXYdW6yubNUVwv7YzQUUgCTou+WyhmFFpZTkVooiRJWs1m1EqMUr7rdXZ2Bm1t
+2bFTydxZ5KgFpm0CA2cWhtgYWWhZRiBhPTCmKKQBJ1r8zuXmMEKfAMIqpi2MASQcDnBoahJKOcAR
+a2sd48LY0dF0zzBGt5DNe8loJUoacXWsHFvOWI0oQ6nDvLDU7fcO2p6+Vn+vnDLgTOjGG58D48Aw
+q41UFAzCiYh0AWYJDAWhliIDNPC7/uCAw8n6/7/2K7dZDly//jUbx431Q2SH8SPBfit7I3/1Pzu+
+b2P/9aA/CPd/adzxX1Fw/o+x33/842Gz30N/2Oz30B82+6/nZnM76KL+6zrbt3SzB+/6aK0ZY7Va
+rVAoaK211r7vt1qtMAwBJEniOA6lVEqZ/8wY45wbYw5cyn2jea2UMWZsbGzv3r2O4wRBUCgUOjs7
+jTE0z8W21lprYCmlhJBms+n7vpSSMSbEW57SGaWjKHIcRwiRZ3anaSqEIIzmQ2OMGWMO1mxglGml
+GOetZpMQEgRBmqacc6kVIUQI0Wg0SqVSo9EIw5AxBguZZZRSpVSapoVCwVrLOFdacc6llEKIOI49
+z2s2m2EYaq3z3ua4HejkGx14s70l6w/iTiltNpvf/e5316xZA2BgYODaa68tlUoAsizzPA/A3r17
+f/CDH6xZs8Zau3jx4quvvrqvr09rrZRyHTdL0+eee27VqlXr169ft25dq9XKG+/u7l64cOHs2bNP
+PfXUqdOm5ReoGYG1dtWqVTfeeOP+/ftLpdJFF120dOnSt+rnTTfdtGLFCkKI1rrZbOYdjuO43N7W
+09MzODg4e/bsE044IQzDnC5WG8b5iy+8cPPNN2dZlo+OUiq1ylmVpmmSJJ2dnX/wB3+wePFiRuj1
+11+/a9cupVQYhnv37r3wwguvuuoqyigAIUSapi+++OK3vvUt3/cHBgb+/M//PIf+P5yObyc4+XIx
+58K6devuv//+YrG4aNGiPAlfKeU4BzKm0zRduXLl448/nqe4X3bZZdZaxhhj7LV162+88caXX355
+586dUsoTTjhhwoQJnPNqtbp169abb765o6PjrrvuWrJkyR//8R8TQihnOeWfeuqpkZGRUqk0f/78
+NzPoV2z79u1PPvlklmVCiBkzZuS9TdN07dq1zz//fKvV6uvrmzlz5iWXXHLZZZdJKRmhBBgeHn7s
+sceUUkEQ9PT0FItFqZW1VkpJCKnX6zlJOedRs/Xqq6+uXLnSWlsul6vV6rZt27q7u88579xms1ko
+FCilGzdufOSRR0ql0ty5c7MsC4KAEPIfJkS8HfQHr/FTShljnucVi0UppeM4B+uU5JPaWuv7vuu6
+vu/ncz9/Z5VK5bvf/e4jjzyyd+/eefPmLVu27MILL0zTtLunp1atViqVr33taw888MDq1avHxsam
+TJly0cUX5yl6juMQQjo6OjzPO/iCf6PlPKCUDgwMfP7znx8YGOCcE0Kq9dry5ct/+tOf7tmzZ8WK
+FRs2bBgdHb3mmmvyhNdyuez7/ujoaF9f38c//vEzzzwzyVLHcay1nudZa/ft2zcwMJD3RGsdBIHr
+us1ms1gsViqVb37zm0cuXNDX15ckST7vOzs7AQRBoLV+873M/OffCP1bRjh5QZica3kyEedcKWWt
+LRaLjLGcI/kb8jyPc84Y01ofxCJJknvvvfe+++4zxgwMDCxbtuzKK68slcvdPT0Aym1tU6dN++xn
+P3v++efnL+mWW26p12qEECllnq8kpcwf/TYfQC2EcBwnL4E0ODjY29fX2dXV0dExbdq0D33oQ9/4
+xjeOOuqovNLX7bffvmLFCgBRq5UkSV5Jg1IahmGhWOzq6ioUCo7jKKU8z5s8eXLusYwxpVJJKdVs
+Nk899dSenp5SqbRp06avfOUrWutc7j3Py3OscjTe3Nu3qej5lkOilB70wDkH8xY9z3v++edfe+21
+HTt27NmzZ9OmTRs2bNiyZcvY2FiOfg4EgCiKnnvuOc55o9GYOXPmySefzDnXSuVkAJCl6cTBwXPO
+OSf3hCMjIxs2bMAbZVE8z8v58stKQG/RT6UUpdQYE8dx/stcKuM4njp16kc+8pHe3l5rbavVevHF
+FwEEYcg5z7Isjxr27t27f2Rk8+bNW7ZsaTQaIyMjr7766u7du/Omcl7njuTMM89ctmxZ7jPvueee
+H/zgB/kMO0jBN7Mk78Pb9Pw/EJyDP+Tvn1L6yiuvXHvttbVaLY9w0jTN9d11XSGE1vqgHFlrkyTJ
+W+js7HQch1DKKG3U68Vi0WjtuK6Ssru7u6enp1qtVqvVoaEhAJxzrXX+/vLp/DYuKx8w59xxHCml
+NYZQmt+bz3t49NFHz5gx46WXXrLW7ty5E4DROooiIURnZ2er1br++uuvv/56L/CTJGGMSSnTND3/
+/PM//elPT5kyxXXdffv25QMcGhr66Ec/um7dujvuuKNUKv3sZz875phj5s+fnyOe/99fQY+8UWPn
+14fwltArpTjn+azPHWZO/KlTp86cObO9vZ0Q0mg0isWitbZer7/yyit5L/OwIX+eUuqgeoRhaLS2
+1hZLJQCUMa0UYywMw0qlkitbPscPBoL5SN48nl+3nFla69zBEkpllok3uQfXdfOA7+AOM6U0CALG
+WKVS6evrmzVr1qxZsxqtZj7D8hBg3rx5PT091tpccBzHaTQaWZZxzj/96U+vWbNmzbq1O3bs+OpX
+v3rDDTe0tbU1m82enh7XdQ/GJvnT30Yq3xL6vJeEEMdx4jjOW9Ra9/b2fuUrXzn4MvKRDw0Nfe5z
+n3v66afL5XLO1jxQK5fLhFHX9/aNDNca9XJ7WxzHgoBzbpRmnAPYuHFj3tcgCHp7e38ZgDOWLxdy
+N5sXwjqoP7mzyfU6n/UHlEEp4ThGa8pZzp7Vq1dv27ZNCKGU6urqAkEmZZKl2hpQYgkuv/KK888/
+H29IRK5g+cwjhDDBMyXjNHF9T1vDBC+WS5/41Cf/9JOf4pyvWvnKt//tW1OnTnW4SOPEKC2EOMj0
+/Ptbof92Gwl5+cmcOEqpJEmEEDt27DhYJClXobw6YU6uOI4P9JgxIcTChQvzmOH1119/4YUXlFK+
+73POW60WZUxm2cjw8PLly3N3OnPmzJkzZyqlAOTBRj4DDh6JEEKUUnnjeMOD5bUdc193ILf4jTUa
+53znzp3//M//PDIykqZpf3//O97xjrzxXOuzLCsUCvlbxJs8ZD663APlr8FxnCzLcmcO4NRTT/3E
+Jz5RrVallPfff/8tt9zS398vhDhQLhXAG/Hh20jlW7I+XxnmPjNNU8/zXNdNkmT69OnW2vxfcyys
+ta7r5hB4nhcEQT4Sx3EuvvjiVatWLV++fN++fTfeeGOWZUuWLBFC9Pb21saqtVrt61//+q233trT
+01Mul5cuXVoslZRW+QhzT5v7t1qtlv8mf9NJkriu29vbq5QqFAr53wdBsHv37oPBRjNqrVy58sEH
+H3zqqac4511dXcuWLZs+fXoeuQMolUq1Wq3RaOzatUtKWa1Wc9LkPa9Wqz09PXmgqd+wfMhxHPu+
+/8EPfnDVqlX33nvv7t27K5WKlDIMw4Pq+r9zqPCW0OdhlrU2X5vldGaMNZvNKIra2trwhggYY6Io
+AiCl1FpHUZS/eaVUe3v7tdde6zjO8uXLN2/e/LnPfW7WrFmLFi0aGxtTmVy7du3o6Gh/f/+MGTPe
+9a53XXb55TnXcvY1Go18if/www8vX748F7fclTWbzfPPP/+Tn/xkuVzOA0fO+dDQ0Be+8AXXdfNC
+sdV6LYoia21XV9dZZ5116aWXHnnkkblA5cOJoiinzo9+9KOf/OQnB+mSpmnuoj7+8Y9fccUV+fyL
+oiiHNUc/35C4+uqrN23atGbNmpxtlUqlu7v7fz+n+e0inPxJACilEyZMmD17NoB58+alaZpLQb7Z
+AiAMw76+viOOOEIIkU+9gyAODg5ed911jzzyyF133bV3794dO3bccccdxWKRWBSLxdNPP33OnDnn
+nXfevPnzAWRp6nhuTsk5c+ZIKXNxq1areEOLc1zUG9bR0TF37txcoOv1ej4hgiCYMm1qGIaLFi06
+5ZRT5syZk4eAUsoc+ra2tlmzZrVaLc/zWq1WHMe5iOXtvNniOJ44ceLcuXOllJ2dnfmqihCipDz+
+hBPe97733X777TkpCSEzZ848uOrOuf8bd29y+4+3z9I0dV13586d+YbX0NDQ5MmTD67sD6phq9Wq
+Vqvt7e1Kqba2tiiKguDAKX+uTlrrVqvVbDb37NnjeZ5RuqOjY+LgYJokruelSSKEoIyBIN+T2rRp
+0+TJk0dHR3MPnD8l1/c0TR3HyWdeEsUjIyNtbW1JknR0dNRqtSzLurq6CKN5D+v1eqlUyiE4uKmn
+td66dWtPT0+uY7mjOig4ruuOjY319vbm72nbtm1hGObe4qB7h4U1Jm8/H2aapowx1/cKhUKOzMFI
+/zcGl/8P0yqItEdUA8EAAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_honda" model="fleet.vehicle.model.brand">
+      	<field name="name">Honda</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAobElEQVR4nO19aXBc13Xmufe9fr1v
+2IEGARAEFxAURVFcRZF2JDGaeGwNR55Iii3HzlaVyshlWynXxDWpsWMrUuJUUhV7rIrscZyKvERS
+xirJY8l2YomSSJmhJJraCEIEQYIECQIg0Ptb7jo/TvfTA0hKRJMyNROeH6xGs/u9e7937jnfWe5t
+orWGq3IlhF7pAfz7lavQXzG5Cv0Vk6vQXzG5Cv0Vk6vQXzG5Cv0VE/NK3TgYTxBCFvvFc79y3gBl
+wce01ou613sq5P0WUimlCCFBgLTWWmtK/39boFcMev++F1LDC2n3Ajn3Uf2/Iu87rT+vTfDffGcz
+9Q5PC5cOAJy7ei7yGV92eb9Af+4wLhKLC2n9hcz6+8fcv1+gf1d559Ww4E0IPLmG/fl7Le8j6HEk
+PpoX7wN8Y3IxRv9C8/3VP5UrSS5RVF3wT0KI4zjlcrlcLruuK6WklFJKPc9TSkkplVIAQCk1DINS
+KqVENA3DsCwrEolYlmUYRigUMk0zFApZlmWapmma5HxyBYlTI1rvm9egAirQBAgBkFIahoEgaq21
+ljg9KaXjOJxzz+OMMZd5RIPruloqznk4GpFSCiVBSdM0KaW+VzQMgxACQP33kWvi+/hs8BFyzvFN
+wzCEEIQQpZQQAh+Pv5gQcc45MSghxDTNSCRiGCQWi5mmGY8nKaEatNaaEkoCs8aJcM5DodCVgR4l
+iLvWGgjRoImGOuIap+d5ztmzZ6WUlUrF87xYLGYYoWg0Go1GCSERKxyLxaSU4UhEw7s4QMSXUhpk
+O4ivlBL1+jwDm2/3iQagpFQqIY6lUgnXE2NusVhUSllWJB6Pt7a2RqNRy7JCoZAQwjRNAGCMWZYF
+l8lXLxr6IM+70O0dx6lWq5VS2bZtJrzm5mbLsuLxeCKRQOyUUoVCiQKhlFbLZdd1z87Nua5ru065
+WHJd13EcxpjjOIVCIZ/PV6vVcrmM0EspOedCCLQ8hBAEKBwOK6UMw4hEIolEorm5OR6Px+NxNDix
+WCyVSsXj8UjUStaFc04ozWaziCwAeJ4nhJqdnS0UCrZtZ7PZVCrV1NSEiBNCUOX9FXApsmjoz70r
+PgNUDdd1p6am8vl8JpXOZrOJRMIImVJKwyCe5w0PD+/evXtqagoAerp7s9ns7meeGR8fL5fLSinH
+81CFEWKttWEYsVgsnU4nk8m2trZ4PB6JRHDAoVAoFAoRQlzXLZfLc3Nz+Lyr1WqxWMQnF7SKhmGg
+bwDFDMNIN2VTqdStt97a0dHx5ptvFgqFZDK9efPmTZs2ZdJNIcvCqZWKxXK1ks/nw+FwLpeLxWJw
++ejppTKc4IoulUonT55MJpNtLa2RSAQApqenDxz85aFDh0ZHRw8ceDkSiXR1da1evXrXrl2DK1cb
+pvmZe+7Zu3fvzTffvGHDhlQmk06nQ6FQLBaLxWKorajOaFtN38JqDehgpER8pZQAwBhDi6+1dl2X
+MeZ5HmMMF0q1WrVt27VLJ0+e/MGjj8Tj8W9961tL+/unzpx59dVXn376p2+++ebZs2e7cz2Dg4PX
+XHPN4ODg9ddfD5QAwKlTp1zXBYD+/n5cW5cCGkojDMeH23/+SqnJyclyudzb25uIJ0DrqampRx99
+9OGHH54+O2MYRm9v7+bNm+PxeKFQuHbdNUNrBkEbABBLJAqFwvbt2z982201bwGkBi4A1JVLSUkN
+4+036+/X3iTEME0AiBoGEAJaK6UymQxZYBPQVZikkM9//5FHOZfd3T1KQXtH15ZYolKxkS8NHxp5
+7LHHHnrooWg0+uEPf/ju3/7Ejh07crkcY2xycvLw4cPLli3z/c2lSCMGa8FCEUIUCoVqtdrd3Z2I
+JzzX/dGPfvSRj3zky1/+cj6f37Zt+3e+852nnnrqb//26xs2bJg8c0oIkc/nAQAIrF+/XhNy8LXX
+gBCpJCFEaaVBAyVACRDQoDVoYlAgEHxTKqm0qr1JQIMGAgo0vkNNo/aV+hX895XQrxw4WCpXl/T0
+maEwIYYQynXZ9MzM6cnJ+x944KmfPP3sc7v/6J7/2j+w7AeP/NPtt99+zz33TE9PW5bV29ubSqWG
+h4fRzVwB6BdELo7jzM7O9vb2JhKJSrn8pS996c477zx06NAf//Efv/DCC9/73sPbt29HG40jdhyH
+EAKEKKW2brshlUqNjo4qrQzDUKBRofyH6xNw/3a41NBw+1FYMD+zQDMWfJeaxvDwcD6f7+3txQVk
+mKbtOmij8GM9PT3333//888//81vfjMWiz344IO33nrrvn37ACCXy7W3t588ebIB3BbIoqFHUo84
+opEdGxvr7OwMh0Nayy/+2f/4i6/+ZTqb+eEPf/gnX/hCR2enP2dCtGmaRFMtlWCcgJKSt7Y0LVmy
+5MiRI5OTk8G7vMNqDkLpU/Wg51+QQgh6RUIIKD1+7LhhhNauXVdbUqAEdzzXTsTjFAyMDNDJf+xj
+d+1+5rnf/Ogdrx48+MlP/Pbhw4eFEB0dHVXHRvT9p45atSjHuWjocZI4W6XUxMREU1MTcvOHH374
+61//emdn58MPP7xz506cPQRWiWmaWmt0egAQCoXCkUhvb++xY8deeO55AKgZ+sshvooseBLMdUdG
+Rtra2q5bv54AAVCOW+WcM8b8ADt4nf7+/r/7u7/bsX3HkdEjX/rSlwzDUEotyXVXKhXOuT+1d05+
+nFcatPU4PqSSLS0tlFIhxN///d9zLj/+8Y/fcsstNRM8fySWZWmtOeee5yH6gvMVKweklAcOHNBa
+w+VLKAVDqiCahw4dGhkZ6erq6O3tVVoRIIxz5EJ+sgHmgaiamrN/8zd/s7S///HHH3/kkUcohVQq
+YRhGzWMFAFmULBr6IKupVCqWZUWjUQD4px/8YN8vfrFp4/Wf+9znztU4lHA4DABCCMaYAo0s7cYb
+b2xpbRodHZVSXsYcVhBBP/iSUu7du7dYLHZ3dxOqpZRCCs45l5xzHo/HkcUijDUiRynzvPUbrv/I
+Rz6ilPrOd76NV7Msa3R0lDEGAYu3KPe7aOiDUyqXy11dXXjLJ598UgjxgQ98oKuzC23RucnFcDiM
+BkdKKYQQSgIhAwMDuVxu7NjooTfeXOxgLnK0vicwDOPg6wcJIddee62flfM8D7UhmUwiYQ9CL6Sw
+ImGt9R/+4R+uXLl83759u599FgB6e3sxWYJpIj+pd/FjazwaRq3PZrMAMDk5+ctf/rKzsxNNPOec
+UqpAK5i3DNHgCCGEEJ7wlFKu65qm2dfXd/bs2Rf2PAdwGUibPzx8gYsP/7Rt+9ixY5lMZuvWrQY1
+PM6FVgCASYtkMhm8gu+fMAG3atWKdevWVcqVn/3sZxjKxWIxx3EoreX1Fss4G4Ee74FRInrOF198
+cXryzOCKldu2bZNCnJvYw2lg9kMIgUkYxlzDMKKxWE9PjxBieHj4stt6X1CF9+7dOzEx0bu0Z2DF
+ciGFkAwzFq7ruq4bi8XgHPqklDJN0zQpAKwZGgqHrZGREWoYSqloNHr48GEMpBes8ouRRqD3k8C+
+X9q/f79SanBwMBaPG6ZZo55AyPxEBSaTa9ZGCMMwlBYA0NfXFwtHxsbGHMdpYDznFT+B6jNFANi9
+e3ehUMBsjFAqEokIwVzPQVXA5AfMp7aknqYGgBUrVqTT6RMnTlQrFUppKBQaGxvzjYyfL7pIWTz0
+9YtjGKK1BFD5mWkAlct1Kik1aCAECCUABKCOgCZgGMQEAM92tKzl0LE+smxgIBKPTU1NnT45AQCo
+R7W7XcI6wFS2wly00iDk8dGjSqlly5bhBxzHIcQQXHKPMceNx6MaJAAAqS8/TQmSYzAAoLOzs7Wp
+uZSfqxQLSqmmpqZIJILrxufcFz+8RrQeifn4+HjtTyGmp6czmUxzczOtlTXmK06A12OZSQgBAIwx
+QgwpZX9/fzKZLJVKw8PDEFBYmE9RFiu1kWCsQMjU1NTY2Fg0Gu3v7ydAkFChz3dd118Z7yCJRCKb
+zQoh5ubmKKXxeDwWi+FccJDvsdbXE7CnTp1Cg6OUyufzqVSqpaUFP3ChAYTDYbQ2GMIAUFTw9vb2
+jRs3Oo7zzDPPBJPS/kwaI501ag8a7zI6Ojo3N2dZ1ooVK/zr170OU0oFXdTCG2oNAE1NTe3t7Zzz
+6elpALAsK5FIYHYaLq4yHJTF8/o6iyqVSuhjPc8rlUrJZDKbzUIt1X7+72I1A9HXmgSN45YtWwRX
++/e/jNl8CMREDefHtdZSSQIE1Xn//v2VSiWXy/X29mJFLOjzlVKRSOSdb5RMJpuamqSUpVIJR47K
+FBzwxcvieX09dkCeTgixbRsLOplMBh89au3C1ac1Fqxxnlprxphf114+sDISiRQKhcOHDweVveEg
+q5ZlozUbUq1U9u7dq5TasmVLc3NzzdPUqRqyNd/NnnspfBEKheLxOPgZQADfRp0bNr+rNMjrCSGh
+UAjjWEz4pdPpc4c+byiEGIZhmiZqmed5WNsihCgF/f39uVzOtu2RkZEFcC+WOSwQpRUAHD169K23
+3jJNc/369f7AsBOCc845V0phsP3OEovFQqFQtVqFeq24YeVogOFoP0hBg4MqkEwmscJZf/41nQ2i
+htEHYwwVH7kmjqG1tfX66693HGd4eFgHyr9BZ7sowRHqOiF77bXXisViOBweGBjA5w0APs3Fyrhf
+8j73UvjCMIxMJhOPxyuVCr6DTsL/zHvMcOqA+j0RaOxisRiuvjpq5/82GhzkOZVKhVLKGMNnsGnT
+pkgkMjIy4jhOcD6XIgQIJZRzvn//fiFEW1tbX18fqohvc6SUtm2/C8Opm5d0Oh2Px3Gh46r1G4Hg
+PTc4BABACGEQimzddZimxIyGJcVBEqwy1cf8Nnxo6zFtKQQDgzKhzEhYaQBKVq9eHYlYx48d/bdf
+7KP17DEhRDUa46KjIACnTp168cUXuZQfvOmmbHOrlBqUpKAUSCEY81zlMiFEKpVRan66nyhQGpQG
+UotXLcuyQiFd55HISoPh28UPr/EcjhDCT9ct6Dn1q6cLtIBSalkWUmkcK7pZhKmzszOdTlcqlb17
+9wIhStSZAxApFw0+JtNxeEePHj179mw4HF63bh0Og9SrPcgsMQFpWVYQ99rr+mTQgknQkWg0eHE/
+5vhVJBJwZLWgv/60L+bGlNJoNCoCgtk0/N+Ojo6Ojg6T0AMHDmilaC2JqAmAYSza8qAxRP04ePAg
+Yywejw8NDQWn4JNLbGK4ILmsq7yQUkoZjUax2ACX5o0aL5UELXK9N+/diwbRaBSZHFEau+sAQGtQ
+ShFKl61YzhgbP3bszTffTiArpRow+TgSNN8HDx5ED4kp7uBnMDJHrT8/w5kfVGutTdP0Nf1SWhMa
+KJXUqAvn3LcVAICJ03f9ejQadV0XKR0qXW3olACB7du3W5ZVqVR+8pOfAACoxpuNfMoxNjaGsUJ/
+f3+2qQngbeqFuGPKHtNh55lvzerUcnDICIIFgIZ7cho0ODgCxhjUld00TdT9IFg+ufT/jUQiruty
+zgXnWmviV66BAMCNN97Y1dWltT7w8suqHiVSShum9VrrH//4x6dPn/Y8b/Xq1TqQxPd7CLFNCjuT
+4Rz/5E8HuyUAQCmF2VnEwW+DWGzw0SD02IjheR5coDRz3mEQSiORCGqZrveuaq0Vdsto3dLa2t/f
+77ru+Pj41NQUEAL6gld7Z5H1xrSXX34ZSeGOHTu01sj0/XwGr0skElnQ1hCEUtfri2hm/dbaALP4
+ldh6FKWUDz3W6S8mv4hFHyQVzK21zBuUkBoVhNWrV2utZ2dn33rrLajHnA20luKQpqamMBuay+U2
+b95MDcNvevC1HmviQXoTlLezGkCEEFXbFlrV64iXVNhpHPp4PI7Q11RAafT7dY8PuAIJGLV6NwEg
+0Nrayjm3K7bLXAVSaEao1orXJ0pXDa0KhQho/uQP/7eWHIgilKLpWTDVYOvLuUEN6ukvXzlQmMsL
+17vmmmtCobDfbaJAAyjpeMplwmGMCzMcsSwLK5T4GcxwoPpjfKCUMg3DcTzDCoPSRINJDV2X9z59
+Vr8+pRSDunA47MeocL5oNriQM5kMIcSrix+I+7Ju3bpwOBqPJX/+85+PjIyAplzw4AeCKPspFB2Q
+2jgBCCFPP/205DwUCm3evJkaJHirIKkP7lYIVggW2FLTNC3LqrW7EgKEeJ6HDc8NJJoarM1iXOc4
+DmgdTAX7n0EihK+C6tDZ2UkpdRyHuZ7rOZJxpURw0D09feuuX+8yXipV9r7wopLSIOffbokuzi8S
+kfnNB0KwU6dO7tmzJxQKdXd379y5EwjgfyrQCLrrOo5jM8YE5/F4nMzvG1wAJd4F03/Y7S2FmJub
+M+sud7HSILkEgEQigQYHFQHlbaU73+LTWre3t5um6TgONmGjxnmCY5FWgzZD4Q//x9tc121vb3/0
+0UdnZmYNwyC1FuOaZwtq94WYtWma/+dHP7Kdimmag0NDHZ2dNQMFICX3PAdL4X4XeCqV8gcJF+AO
+fq47lUpppbDZNEjzFyWNGBycaiqV8jwPCAmHw6j4wYdf03jQMN/+ZDIZy7Jw2sz1GGM4fyEEdo5o
+DTfeuCOZSEej0enp6f37XoS65/BvQc9Rz6C1xfenp6aefPLJbDYrBNu6davCLVcAGmrtb67nIO6C
+M845JsDnz7R2Nf/R+mnOaDRKKPU8z7Ztn+3AIh1vg25WSplMJjFtbVlWLBbDWPxCn6+nQ0gkEkFq
+z1zPdV3GPck4ppFrsyXQ3ZO7/aO7pJSJROKxxx6bmDhBQJF6h5cfuAeJXdDa4ovvfve7s7OzrU3N
+ra2t23ds0wR83F1e2/LAGENjLxmPRqP6fPY9eBekQ8hEAaBSqWC1p4GMMTRmcPA2TU1NnudppXDj
+h23b79y5h1/EvU6o6fgv55xzz2Ee557fMrVr165IxMrlOkdH3/qfX/96sZT3fbhPaVB8W+ffyHGc
+ffv2Pf3000u6coZhfOhDHxoYGMAskJTSdl3XdR3m4QBc1xVCaK2am5uDgz9viOQ4Dsa92CxVKpX8
+VEoD5r5BhkMpbcKgnFLclYrpgcDQz+WCNZUMhUKcc8ZdtPgY1/goYKP92uuuXbVqFSHk2muv+cUv
+9v7pn/7pzMxMkEH5mk7rAgAY5e3Zs+eLX/xiLpe75pprQqHQXXfdhR1LUsmq43Dh+VweHzxGdk1N
+TUCInw32V1XwGeDnDcNA6PExLBZAXxa9oUeBpkDQ4CilgAAxaCbd5FZtbjPQGnBpE01ryValFBBa
++8sKRRKJ1NTUFLO5Ypy5nu2UQxHLNA2HUWIaSSOB2vz5//6FP/vyF5tbW++67tqxsbH77rtvzZo1
+O3fuXLJkiVLKioQJEKmkphLTcLbtHjzwy+eee252Nn/HHXd0dbb/67/+64d3/afeZf0AoAk4dlVy
+dOw1jfc8RwjhOE4kEm1t6wCgPslZYOgxrMMUCAEjEU8BgblCPtvcpOr7SRdL7RcNPQYluB0btSwc
+DicSibcmTlQqFa11zazD256HEApQI3ZACPau+AbHT6EYhsk5r4hKOBy2LKu7u/uzn7n3nx75/ooV
+K3/rtz42OXXm9OnTY8femp45bZomdmb7GzZN0+SeEELcfvvtXV3d6WTqu9/7x7Vr1955552UUo8z
+5L6IO2OMex5jjDOGRMs0zebmZgg4ktpkCVEKfM3GJlGtNdIhx3EGBgbO9cbvFfS++L2r4XC4paVl
+78xMsVjEwG+BEEKkVrROz5PJpOd5uOC5V+OXaHZMk4essFCSV6uWZQ0NDf3Op37vwIED//bS/oGB
+pUNDqyzLsm3bdV2han1L4VDUsizTsBKJhGmaruOMHT0yOTm5fGDllhu2MsY4l0Ioz2OcCyYUGjfP
+85jreS52+otIPIZ9u0EE6+oMUMtZSc65bdu4BxgAOOd9fX0N6Hvj0PsRDWpuOBxOp9O2bZdKJSkl
+NUJKK4rlw/MNCGubiDhjjHtMMMY5p9QIUVYV5Zrfdp0YRPv7+/v6+g4dOvTccy+4rmvbdqVSQSYq
+pQyFQsJTWPlKJBLJRMKyrGXLlm3bti2TbcYUjVLK8VxCiNS6fkeXuR7zHIn9T5xnMrVNyTRgcPyM
+CAoyHNd1s9ks5nCEEBhb+bC8twYHAm3DWmvXdZubm7GfK5/PO44TsubVegJxEBACWqlUKsU5Rx/r
+xzXhcNgAyohpWRTD3VAo5HguE4RSumrVqsHBQc55uVw+c+ZMPp9ngmPqwjJMMxSKx+NtbW1NTU24
+lVlKiXZMa+1xZllWoVBQAJzzun/1PNtBt8kYw7Slmr8bewFbJwSklPl8HneXM8bm5uawutJYUeGS
+TgbBsmdnZ2d/f79lWTMzM8ViMZXOoqGf9wCAKF3LS+VyOcMwgsEkikFNIQQYTGhhWRZwpbXpedI0
+TW4YBrEIoU1Nba2t7VBvutUaCNQYLcY7CjSXrFqthgyrltugpFwuEpN4tu2niEXN4jPJpRAqEo8t
+OGIB6pQRqY5SihBgjE1MTKwZWksoLcwW5ubmksmkr+yLtTyLZzhaGXVjgg3mO3bs6O/vT6VShUKh
+WCx2a70gjaBrla3afAYGBvyoyo9mPc+jxCDEEFpEo1HOPVfKcDhsGabnOZZlIeXnvMbnqFnb6ocZ
+U6kFNp17wsOzQjzmKKW4EADAOfMEV0oxFognvLrFUzKZypyr7+esXZ3P56empn59ZxcAnD59OriB
+tAFZNPQ0kMyKRqOHDh1SSiUSCXSebzdH1Pd9I8PRAaPZ1dVlWRYLSBB6Q1OlJDIoxhiTLj6ncAhC
+oZBpGpiId5mLEZxhhAAgFotyJbXWVHEmOOeCcIlJJTxUhyvpp0sdp8pdD4NYLHPitt4g4kGqUz9m
+RhWLRdu2u7u7AWBmZiabzfpe4VdBLrVS2O1PCOno6Hj++ecppUbIbG9vLRbzZn0/FwEKaBaIAQCk
+rvtASTieiKfSjHlcCua6gknPcZkVNgg1KNEQMghRQhCttSGBUglKaXV0+I3x8fHx8fFisTg3Nzc9
+PY17/rgQ2Wy2vb09mUx2dHT09fUtW7astbXVdpmQ0vM8CUpJwTxPcaE95tmuYNJ1kfkIKaXwWDKe
+WIDa24Yeq6FKAKjJ0xPxeHxwaLUiemZmJpfLBXroat0iFx9kLV7rKUUtwD0C09PTjuNEo9HW1tbD
+hw9jaR/8QJ+8vUr8yWDTaH6m4h8fgS+wxEwMiqzJdd1QKJRIJP5t74vf+MaDTqmCh4Ng7JqOJSCW
+IISAQQFgbubs3MzZI4dHfjjzz+Vy+eabb/7k73wKAFzPU1oiHwelq9Uq59xzXM55MHfkpy3PFQ1a
+SWUY9NTERKFQSCQSg4ODBIht20NDQ0h1fF60qOB28Vpf77CglLa0tMTj8bm5uc7Ozp6enhdeeKFY
+KftA11Zu/Vv+QrYsK51OT506WSP1SLHDNegFaMs0AcAgNJVIPfXkj//qr/5qSVfu7o99or29HUHM
+ZDJNTU1a62q1ijks7B5MJpOVSuXQoUP//Og/T09P/7cv/Ilpmo5b63DCLBP3GHPdmqF3Pck40dDR
+1nah+VIgYBgAqlqtTkxMtLa2trW1gdalUimXy0HglBq1yBNDFh/N1s0fpTQWiw0MDDz77LN33333
+xi2b//F7352amrKr1Vg8DvN5bpApI0ao6QiBYIx7rIY9aJNSx3Fikeibr7/xvx76ZiaR7GzvKpZL
+K1atxN1MqVSKYlFJKQDCHEcpdebMmfHx8dnZ2WKxeMstt/zk5z/t7Oz8L3f8pm3bSiklpOM4oDR3
+PcG4ZJx7DElRKBTq6el5l2lrLaWcnJzM5XKEEMyjJZNJNACweJVvBHoUX6lzuRy2K23cuDEWix0e
+GSlXKgg92j4g1E/x+08iHo/73lU4Ho8y7nnEoNQ0LNC2UpYZItH4P/zDP5w4MdHdlWtvb7/ns59J
+JpML/ZhBAYBYZsSy+lIDfSsGPnDLTU2PP/7ggw92tXd8/+Hvrl69eumypeVyGUsCTtVmjsfrSRys
+EcZisQWtUQtFaaCkMDuXPzu7Y8cHQenTp0/D/H0NsHhyuejEG97MP/6tp6dnfHxcSpnOZFraWkdG
+RmzbhgBD8JPMwYukUimhpBBCeIwxJry3qQ7mWJRSb7zxxr59+xKJRO/Svvv/4i+TqQwQQygtlJYa
+FBANVGqQGkwrwqVSQBQQTYzb/vPtd37s40rKSqXyxBNPYIIMI1v8F4UxxqVwmBdPJuLzd8wGBdmB
+57onT560bXvLli0A8Morr2AcG9w+eO4031kWDb1vzrBxbHBwcHp6Gk8LGBoaOnny5JkzZ965Uqi1
+bmpq8qvSdYvPkOZXSmXJBWPsiSeeqNquFYt++f4H4qmUFIIAmNQwqWHUE6EGoUQDAQgZJgWihCQA
+FMjv/+7vrV+/PhaNvvna6+PHjmPUjecNupw5nutyxgTnnHuMJdKpUNi60HxR1c5OTb/++uvpdHrL
+xk0A8Morr/T29gY/0IA0WBbXWmMJP5fLbdiw4ciRIxpg5apV09PTx48fx9pNPRScl7jH12glhRCC
+cR99FEIInl82PDwspbzpppvWrL1GEzCpgUcQYbWp1nutgRKqpcLXpmFqqQgQUPrGrTeYpjk3N3f8
++HF0zkII27ZZPVuplOJKKqUSyaQRuqDhxZa0QqHwxhtv5HK5THOz1vr48ePLly8HgAW1s0VJ41uW
+fSi3bdv20ksvaTA2bNjicXb02Gi+OKdBASFYTyL1ffJQdxItre2WaTHGmRBcCtt1PM8TjDnlqnS4
+IfXE2Hh5rhC2rO3bdmipCNSaMv2znfwToWpvBl8TAEqu335jNJUmpvH6wdd41VEuE67DPYd7LveY
+47gu554rPI+3NLWCWqgcQdEgxydOjh4bW3vdeiDw1ugRQozly5cHSzfn/eK7wLho4AOC/n3lypX7
+9u1zbeeaoTVbNm1+7dVXS8UiEknf2CxIj2BxXGuNeTQ/a4/HYQohRo8e9Tyvubl53bp1hmE0UPFf
+tmzZzTffLKUeHh6emppCi++r/NtHZAiRSCTO2/Lnj9ZxnKNHj+IJgVqpPXv2XH/99X5zdfCLixrh
+ZThWdmBgoFKp7Nmzx7KsP/iDP1iyZMnY2Bg2//stSgtUo6WlhRBS6/5z36Yc3POUUsVi6dChQwB0
+y5YtmBNtoAxHgNx6663Y1jAxccrzPMaElNLvQEGvK6XMZDILvzt/zBMTE5VK5dd+7dfWrl3rOM6L
+L76I0J83zXnx0gjDUfXjbjCm1Vpv3br1W9/6FmNs8+bNra2tR48ePXnypB9rBHOB+CKbzYYjEc/z
+uJKMMSEkYwxbYzyPjY+PHz9+3DTN3/iN3zCtUKN+jG7YsKGnp0drPT4+jnBjNOtH0TgkrE+hBBtM
+8EWpVDpw4ADnHB/ks88+e/jw4Y0bNzY0pPnjW+wX/KeNHZaEEMMwPvnJT544ceLxxx/PZrPbtm2L
+RqPHjx9HlgnzjSCin06nu7q68CliN0s9fel5njdxarJadVo72rdu2YYPuLHcYHt750033WRZkdOn
+T2Nty3E8rK8izcc4COtTCwTHzBgbHR3F/rW1a9fm8/mvfe1ru3btSibjDY1onjR+KItVPwJVa93e
+3n7HHXc89NBDxWLxhhtuaG1t7ezsREsK5+vksixr6dJlrE60Xdflrud5jHvccdmZM2copTfccMO7
+B5kXFiGF1nrnzp3hcLhQKBSLJc/zsITimxpsKcAE5AIn6atXW1tbc3Pz9u3b05nMN77xDdd177nn
+HqUaaahfIA0etogv/EqCYRif/vSnAeBzn/uc53mbNm3CI9DL5TKWivzP+6/7lvXjuVe6fhoaFk+m
+pqZOnJiIRGK/vvM/4Enbjc3PNEyl1PLly1tbWyuVyuTkpO9j8Rkg44xGo0GD4wsux3K5bNt2U1PT
+8uXLf/bTnz722GOf+cxnotHogup5Y9I49H5aBsdhmaE//8p9z/z857//u78XDlkrV6yYmjzjOW61
+WmWBdmJ/uLlcTmstRe3wc4SeMZbPFyuVSlNLy3XXXedbeX/n8cWLBm0YRmtL+4oVK1zXPXnypJ8l
+RZuDMV08Hs9ms8GuG6UUYwzP0J+bmwuFQmvWrPn2t7/9iU984o477rj9ox9VSlFKLhF3uJQC4QIa
+ILXauu2GP7//L+69994777r7gQceGBwcnJmZqbiV6bMyn88zxrLZ7NKlSxOxuNa6KZ0iRNtuNZ6M
+OZyFdER6XjgcLszliYZcZ2d3V5eBYZRWfjEoOOHaO/7hNfOxoEBAa2oYmzZt+Zd/+ZdK2bbLrscc
+zqTSlAvFuLS5l8xmovEYAAjBpqenJyYmsHKSSCRc183lcpSQB+6//6//+q937dp17733AoDWEgtl
+DUNXA/ASDVZQsEv9qaeeuu+++06cOHHXXXfddtttHR1tAHD69OlTp05VKpVIJBIJh6PR6Oz01JEj
+R15//fVTp05lMxnc12lZ1muvvzk7O/tHn77nK1/5CtTTzirQS4IrwO/zIedAML+BSb/+2muf+tSn
+zpyauPbaa6PRqGPbjuNUbTuRSA2sXLFy5crVQ0O1HIPrcs47Ojq6u7tjsVihUDh48OD3Hv7+yMjI
+Zz/72XvvvdeyLM55KGwtqiRyIbls0OOEMcianJz86le/+uijjyqlbti68YMf/ODQ0JBpmpGQlU6n
+y+Xy6dOnpZTxeDwWjb711lvDw8PT09OlUokxVnG91atXb9iwoaW1NRQKaVJr+MG8RbA5Kbjz2A+C
+fEEKH7bMs2fPjo6O7n1hT6lUymQy8XCkubm5p6dn3XXXxWKxYrEstEqn06l0mnNeqVTa2trGxsae
+e+653bt3Hz9+fMP6jZ///Oc/9KEPKdzKS85zjHxjcvl/JgZLppTSffv2fe1rXzuw/xezs7OZTGZw
+cLC7u7t/6dJly5alUinbtQuFQnO2qaOjA7swx8bGjh07tqSnt6+vb3p6ulAuAZ4IYBhKKdz6r+e3
+ehNCBOPBP4Mjwa6QRCKRTaW11i+//HI2m13Wv7S9vQNRHj9xIhwOt7W1ua574vTk2NjY+Pj4q6++
+eubMmUgksnLlyrvuuuu37/5kNBqlmK8j4CfoL10uJ/TnDktKOTt1ev/+/U888cRLL71ULBbtalVr
+nUwm44lEc3MzlgAT8Tj+OEImk4mFI/hbGvFUEovjWDsk9c5W3yVCPSOk6j8xE9xhgYVMSmm1Wq0l
+6x2nUizNFvLlcrlQLNq27XlesVhEx24zLxaLtbS0bNmy5aabbrruuusGBgZM08RTzwBqexwvi77X
+Bn95DQ4A+L/sUdugpCXuTJienp4YPzE+Pj46OjoyMnL0+DHbtsvlcrVUxt0p2P5HRO1HL7B+hJ3s
+4XDYsEJ+U3EQfYNoH+5aK45SWmtPcK01Ulsk8qZhcc5p2KCUJmNJSmkqlbIsq6enZ82aNSuH1nR2
+di5duhTbaf3MKygNhChdC+D90w4vXfcvs9Yv6LnFOQQHqnF3stZM8EKhUCgUXNspl8v5fL7WA2tX
+yuWyEAKdHv6WRrVadRwneFgWqQteHDeYhUIhfG0YRixWe2bhcJSYRjQaDVvRTCYTT8bS6XQqmYxF
+a79nEo1GlVJ+3hhVxy/90/m9xwAglDTo4g9tOEcuv9Yv+NO/OnbmSCXx12Gg/mCCrFFLBUbtPBd9
+TnOLrh+Z5RMY5DAkcIh64GpKKaCUKtC+0YD6xszgILUEQuvEKaAx9QEAIYD9xvivBlAKS5OXJO+j
+X2P79yaXzWlclcXKVeivmFyF/orJVeivmFyF/orJVeivmFyF/orJVeivmFyF/orJVeivmFyF/orJ
+VeivmFyF/orJ/wVUkDQRfLrGcwAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_hyundai" model="fleet.vehicle.model.brand">
+      	<field name="name">Hyundai</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAxr0lEQVR4nO29eZiW5Xk3/LuWe3nW
+eWZnNhgYYQCRVUBEBZdojURNTRqjlqo1icnXo1mltmnf9GjSHKltrVlMPqk10caoaUzyiRqNK1GC
+YZdFQGAYttmYmWee9d6u5fvjgqcTFt9AMLw9Xs4/PGaG+7mf6/5d5/o7z+uWaK1xTs6G0LO9gP97
+5Rz0Z03OQX/W5Bz0Z03OQX/W5Bz0Z03OQX/W5Bz0Z03OQX/W5Bz0Z03OQX/W5Bz0Z03OQX/W5Bz0
+Z03OQX/WhJ/Z22mtpZSEEMYYACklAEopIaTSGCCEABBCcH7k25VSlFLzcfOvURRZliWlNJ+VUjLG
+hBBCCHMHc2fLssyvFancf7RU7q+UMuuRUiqlLMuq/JNZduUmZjFaa/Ov74eQM9UqiaKIc378Yx8j
+Zm8AGNyFEFEUxWIxAGEY2rbteZ7jOOVyOZvNFovF4eHhbDarlBoYGACglPJ9v1wuCyEMTGZ7bNuO
+x+OpVCqVSiUSCdu2q6urU6lUJpMxv5qFVbbW3CoMQ6VUPB4vl8tmDeaC/+1TnBE5Y9Bj1INprZVS
+5s6jValiBJTSUqmUSCTMB8vlcm9vbxAE3d3d2Wx23759xWLRoB8EgblJa2ur7/ucc855FEXm/kEQ
+pFKpKIqCIDA4VoQxFovFMplMQ0NDQ0NDU1PTmDFjqqurGxoaLMuq6HJlzRULA2BuXvn1fZIzCT1G
+mXZFDNzmWyoeJggCQkh/f/+OHTt6enoOHjx44MABz/M8zzPKyxjzPI8Q0tnZOXfu3IaGhhUrVgwO
+DmqtLcsy+xGPxyvoEEJs27ZtmzFmNj6KolKpVCwWgyAQQiilOOeO47S2tra3t0+YMKGlpaW2ttas
+zbggQsgxcI+2kjMu74vWV36t+MqKBeTz+Z07d+7cuXP37t29vb1CCM/zjM+tr69funRpS0sLpXTF
+ihVdXV2zZ8/u6OhIJpOMsXvvvbe1tXX+/PmTJ0/mnJsbep4XhqHR+iAIPM8rlUqFQsHzPN/3gyDQ
+WsdisXg8bpwhpfTw4cMjIyNCiKqqqnHjxk2fPr2joyOdTtu2bZYtpTQP8j9G6yv6blSMMWYirQmn
+nud1d3dv2bJl+/btvb295XKZEOJ5Xi6Xk1Lu3bs3Fot9+tOf/uAHP/jWW2+9/PLLb7/99pIlS265
+5RYp5eHDhxljdXV1tbW1dXV1Wmvf941rNtH4mJVIKaWUQRDk8/nh4eF8Pp/L5QYHB/v7+/P5fCwW
+a2pqisfjQRD09vb29fU5jjN//vz29vb6+voxY8ZUghBGmen7IWcM+tFO04AOIAxDz/PWr1+/Zs2a
+vr4+o5i+72uti8VifX29bdsdHR0jIyOxWGzmzJkvvfTSj3/844GBgdtvv/0rX/mKZVnbtm2jlI4b
+N66lpcUopvHprusC8DzPtm1jXjgaV8wPZg2Vv0RRVCwWS6WSWcmePXsATJkypbOzs7u7u7u7m1La
+1tY2ZcqU8ePHZzKZCuj/MxwOjgYo43APHDjQ3d39yiuvDA0NeZ5HKfV9Xyl13nnnzZo1a+7cuYlE
+IpPJGHMpl8vf/va3/+Vf/iWbzV544YUPPPDAxIkT169f77puW1tba2urCZ7m5gCiKKKUxmIx3/dH
+R/KKBgghGGOEEKUUIcT4KCGE67q+7/f39//nf/7n6tWr77333ksvvfSFF17o7u7O5XJRFI0ZM2ba
+tGmdnZ1VVVXva7ZzytCbZwuCwHEcg4VZHKXU5Jda61wu9/bbb69cubK/v58QYoy3rq5uxowZc+bM
+GTt2rPESUspyuRyPx33fTyQSN99887PPPhuPx5cvXz5r1qze3t5isei67uzZs23bNuH6ZOupRJRK
+dmiMz+SyFW0QQphywbIsy7Kee+65oaGhtra2ffv2VVVVUUqHhob6+/s5501NTTNmzGhvb0+lUjia
++OKo/xxdlJy2nPLnjZI6jgMgiiLzg3lsA+iaNWtWrVplsvJSqWRZ1syZMxcuXDhp0qRKNhlFURRF
+AGKxWBRFiUTiJz/5yZo1a0ql0ic+8YkpU6YEQWBy7draWuO7T3Wdrusa12TbtlELQkgikTBJpNkY
+xthjjz1mLkgmk7W1tbNmzWpoaGhsbAyC4I033ti/f397e/vUqVONWzN7bNTuVNdzvJwy9MbewzAE
+YFbgeZ4Jevv371+3bt2WLVsGBweHh4fj8fj8+fOvu+66+vr6eDwOwDgco3FGAbXWtm339fV961vf
+OnDgwNy5c2+66aaqqqru7u4oiuLx+JgxY8xnjen87pLL5UwxZZIok2sJIUqlUn19fRRFBw8ejMVi
+hw8fHhgYMEozYcKEVCo1d+7cRYsW9fX1dXV1FQqFzZs3h2HY2dlpciTLshzHGR3PTltOGXrzrWYR
+AIzHALBv376f/vSnfX19URRls9n58+d/7GMfa2xsNFZijJ1Sauw0CALjpk0Ct3z58tWrV0+cOPGW
+W24577zz8vl8qVSKx+NRFJlC1Pf9U33UdDrt+77v+wYsk+wDqK+v7+rqyuVyEyZMcBzHhP22traP
+fOQjTU1N/f39Bw8eHBoaMiVeVVWV7/vr168fGhqaNWuWqQNOmFadhpyO1lccn1HMMAzffPPNV199
+NZFI9Pf3W5b1qU996uKLLzZRxDxwxVqNzzXhwTzbyy+//OCDD2Yymfnz58+fP9/sXBRFyWTSfORU
+9d2I7/uu6xriQUoZj8e11qVS6d133x0YGJg0aZJS6sknnxwZGVmyZMldd901Z86chx9+eHBwMJVK
+HTp0aPLkyZTSnp4ekyAMDw+vW7du5syZjY2NZyoxOZ1YYdA0Ls/3/VdeeWXdunXJZPLNN9+cOXPm
+X/zFXzQ2NhqFLRQKiUTCxD2jdxWWSkpZVVXV29v71a9+NZfLXXHFFSaDLJfLjDHjjhsbG81XvEeY
+PemDcW4IIpMIAeju7n7nnXfCMFy4cGF/f/8//uM/btiw4etf//pNN91UXV29cuVKz/NGRkYmTpx4
+4YUXGh5p+vTpu3btSiQSPT09hw4dklLOnz+/trb2jCj+KUNf8eyO45RKpdWrV2/fvj2KoldfffWO
+O+5YsmRJXV1dGIZGNZLJpBDC/GyoG5NymBwDwCOPPLJ69ep58+a1tLRMnz7dEDIm5wEQi8XMbhka
+4JTWabaq4gw3b96cy+XS6XRnZ+dTTz316quvNjQ0fOtb35o/fz6Acrk8MDBQLBY55wZ3IUQ8Hi8W
+i+PHjzfot7e3Dw8Pb9q0aebMmcbz/J5yytAb3A2/uGPHjo0bNyYSibVr1y5duvSjH/1oIpEw1iCE
+MGGAc15JySucrdHrDRs2/Pu///uECRMmTZoUBMHChQsNH1CJAZX9K5VKp7pOU3P19fVt2LDh4MGD
+nHNK6aFDh/7jP/4jnU4vXbp04cKFDQ0Nw8PD6XR669atxWKxUChcfPHFM2bMMLUC59y2bc55R0eH
+67pDQ0OmQhwYGEgkEub+v4+cMvSVOr6rq+utt95qaWl59dVXp0+ffscddwAYTYIbV1spgkyQ0Fo7
+jhMEgZTyvvvu01pfd911u3btWrx4cTKZLBaLJo0TQoyMjBSLRcZYoVAwz2k2r1KvHlPsGBrZXCml
+7O3tXb169bZt26qqqhoaGg4ePPj2228PDQ3dcMMNc+fObWlpUUoNDQ0xxoIgMCpfXV29ePFik3Qp
+pUxRZmqF8ePHSylzuZzjOKYIaG5uxlG+01zDGDuePTyT0AshYrFYPp/fuHEjY6y3tzebzS5btuxk
+1zPGTApvFNm27Xw+n06nH3744bVr1954441SyjAM586d67puPp+nlFqWVV9fn0gkDGnsOI4p4oy5
+4GjpZIzJ/GrbtjHHfD6/e/fuXbt2rVmzJpFIxOPx3t7eN954I4qiefPmLV68OBaLpVIp49BMvvj2
+229LKfft2zdv3rza2lpzT0NFGHba7HFtbW0+n+/v77dte2RkpKamxnVdY5rv0aU5k9Cbu/f29g4N
+DVVVVb322ms33HCDSRhO9hGTU1c0IpFI7Nq164c//OHs2bOnTZu2atUqxpjJtW3bdhzHbEA2m92w
+YUMmkzE3dxzH3MQED865UckKr7Bv375Nmza98847AwMDJiCtW7dueHi4ubn5wgsvnDNnTl1dXblc
+NpyzceVCCENz9vf3a63nzZvnOI6JzBVeyFCBURRVV1cXi8Xu7m7HcQqFQj6fN9BLKU+vsj3lzxi+
+pbu7u7a29tChQwBuu+2298i3zMoqlb3JDR566CHP82666SZTOhmFZYwlk8lsNtvQ0NDf379ly5ZS
+qdTV1QWgpaWFMWZZlmmVmDuXy+VSqdTb27tz586uri7TXSkUCtlsNp/Pj4yMnHfeeZdffnlra6tt
+20EQDA0NmQ/GYjGT6edyub6+PsuyNmzYsHjx4vb29kpSYMK7WTljzNQHhtUplUqxWKxQKNTV1ZlN
+qjzs+6v1hnTs6+tramrasGHDddddZ77yPdCvmKQpxF5//fWVK1ded911rutGUdTa2trX11coFCzL
+8jyvtrZ2cHDwxRdf3Lhx47JlyxoaGt59991du3aZW0kphRCGEO7r6zt8+PDw8LBxC6VSqaenp1Ao
+ZDKZxsbGP/qjP0okEpTSXC4HwLbtTCZTU1OjtTaluImrhJBdu3bZtn3ZZZcBCILAhChTT5gc16xf
+a51IJNLpdFdXV2Njo+d5x3j2U+2rnI7DqdhasVicO3euKU1Pdr2JY6aONQB997vfbWtrmzdvXrFY
+bGxsbGxs5Jxv27btwgsvNCF65cqVb731lulkpdPpyZMnl0qlgwcPep5XPCrZbHZwcDCfzxcKhZ6e
+HkM7G9Kxrq7OsizDgpmsNJVKGbIPQDqdNqltGIZhGFqWtX79+g9/+MPNzc3GtxjCx5hFpZPMGDNG
+UF9f/+abb06dOnW0WfyBoAdQLpdra2s9z3NdN51Ox2KxMAzfw9+ZdRNCyuXyM888MzAwcPPNN7uu
+a7I3Q+YMDg5u3rx5xowZ2Wx29+7de/bsoZQ+9thjixYtam5uLhaLSqlyuTw4ONjX13fgwIEDBw4M
+Dg6alKmmpuaCCy4wNUS5XN67d28YhibNNQtLpVLpdLq6utp4j6qqKqP7Wutt27ZVV1cvWLDAQGn2
+fnTJfYw1V1VVZbNZ3/fNFh7ThjslOZ0Mx2QaxqVWwuPJwqzhV82/lkqlp556asaMGRdccEEikTBc
+caFQMMnPK6+8Ul1dPXbs2BtvvDGbza5evfqRRx5ZsWKFlLKhocHAGoahKc1isZixmJaWFsuyKoyu
+Uiqbzfb19e3bt68StwuFQrlcNhckk8lkMjk0NGQcyPr162+77bZkMmlM02TDJjZUmI/RzqdiLpWL
+K530SrbzfkFveEfGWDwetyyrXC6bdkel4KyQ5sZaTbZratfvfve7lNIrrrgimUxKKTOZjHHEsVhM
+COH7/osvvtjW1jZp0qTPfvaz11xzzbZt23p7ez3P45zn83lzZW1tbWNjY1NTU1NTU01NjckgjWFV
+V1crpQwf0NXVtXHjxp///OfDw8O1tbVBEGSzWSllbW2tYUwbGhpWrlzZ0tJy0UUXma/A0XKh0mYx
+THixWEwmkyZFHhwcNPmuGWuo+PrRKdz7Bb1ZkFEfExhTqVSFkh3NGVQM1qC/devWd999d+rUqaY8
+qa+v3717t/GefX19AGpqaoaGhnbv3r158+ZkMllTU5PJZMwdOOe1tbWZTKa+vr7SuzAuSAgxPDxs
+vPnw8DAhpKqqKhaL1dXVXXLJJbNmzXrsscd27txp2lX19fUmnjc0NORyuf7+/s997nOMMWO1oxW2
+8nO5XE4mk+Vy2bjHzZs3x+PxeDxuWP7jr38foTd2atZUVVW1devWD3zgA8YecVRrKs6nUmtQSp95
+5hlCyDXXXOO6rtY6n883NDSYzri5oFAoaK3L5bLWemRkpLu7u1wuNzc3d3Z2VldXU0r7+vq2bt2a
+zWYZY+l02gyDmHSzubnZwFFXV2e6CCZ9uvTSS+vq6u6///6dO3dmMplCoWAUpbGx8dFHH50zZ05H
+R4ep6U5GhxlrMLNvlmUZ6FOplOFI8HsMjJwO9Ol02rKsnp6ehoaG1atXf+ADH6goeGUDRg/Ucc63
+bNmyYcOGq6++esKECUNDQ5W0z1SVxkSiKDIDBJ7nRVE0duzYyy+/nDG2du3ajRs3joyMtLW1TZ06
+deHChePHj29sbIzH46ZcCMPQ9/2BgYFsNnvgwAHTcG9oaDDTOFOmTLnuuuv27t1r3AhjbNy4cevX
+rxdC3HTTTZVO1snSc+P3AcTj8Xfeeefdd9+95ppr4vF4LBY7poVwqhtwOiWV67pVVVWm5bZt27aN
+GzfOmjXLZAgARlMZxop933/88cdbWlrmzp2bzWYtyyqVSuZ5DP2ZzWYHBgZMku66bmdnZ3t7u0mH
+3nzzzaampiVLlixevLipqam+vt7scYWcME4ZQFNTUzabXb9+/dq1a8877zzHcerr600K39nZOWbM
+GCmlYSKllK+99tqyZcsMUWrCaYWUPsbtmKLBZM8vvPBCGIazZs1yHMek139Q6AFYlmVmuLq6unp6
+eh599NEZM2aYwUcTBipwGDe9evXqAwcOfPSjHzVPaNu24SZNPMzlcgMDAz09PfF4fOHChY2NjWvX
+rv3mN7956NCh6dOn//M///OiRYtMHVuZkjQ5orGtClHKGKutrR07duz27ds3b95siIeamhoAJixF
+UdTW1jZ27Njly5dfdNFFM2bMMMOHUkozVHJCX1+h5J577rnnn3/+yiuvbG1tdRzn+GT6fYfeeJWa
+mpqpU6fu2LFj69atzz777Pz582+88cZYLFapWnG0gZ7P51966aWZM2d2dHSYtp/xJ8axDA0NdXV1
+CSHmzJlTVVW1Y8eO+++/n3N+xRVXPPjgg5MmTcLRlqRh7fVvj0KaHq/JqXzfj8fjkydP3rlz5xtv
+vNHQ0DB+/HhD2gghjBe66qqrTPP9tttuM3Cb3LeiKycAiPMwDPfs2fP444/X19d/8IMfdBzH+Dr9
++83GnuZEglJqzJgxl1122datW1etWnXfffddcMEFEyZMMH04U2uYzGzz5s27d+++9dZbpZSxWMw4
+ejOZ09PTk81mL7jggo6Ojtdff/073/lOoVC4++67r7nmmvPOO88kMMauDYVicDfxMIqiyqC2EMLk
+9aYpaBL5nTt3Tpw4MZPJ2La9f/9+pdSll15aLpeffvrpf/qnf6qurjZ8b6lUchznPby2UiqXyz3w
+wAP79u3727/926amJtd1Taagj85d/YGgN1ttasLOzs4lS5b09fW9+uqrn/nMZ773ve+df/75hg4z
+KPi+/9Of/nT69Onjxo0bHBw01O7Q0FBPT48Qoq2t7aqrrtqxY8c999wzNDR011133XrrrdXV1Tja
+gzRPCMCM91QGC/Hb82XGTVcyK6318PCw1npgYGDy5MkAdu7cOWvWrClTpnzta1+7/vrrp0yZgqOT
+LMaVmW5zJX4Y9TLusb+//4tf/OLWrVu/9KUvLViwwFjJaVDEZwB6g4KRdDq9YMGCwcHBKIp+/etf
+L1u2bNmyZYsWLcLRMZgnnnjC87wZM2aYtt/g4ODIyEgYhk1NTR0dHUNDQw888MDrr79+7bXXfvaz
+n50wYYKJiqckJkiaAGAoDcOPlstlk/UfOHBgaGjo6quv/vGPf0wpXbp0qRlEME6m4uJNgWoGpEzV
+6nnepk2bli1b5nneX/3VX334wx8WQtTU1FBKK4MBv4+c5giVIUsppe3t7R/60IeMqj7//PO7d+++
+++67Fy1a5DjOxo0bV6xYcdlll7W3tx88eDCfzwdBYLqjrus+//zz3//+99Pp9A9+8AMzvmBI9pMR
+EidTsUoVXbGMffv2GbdmUqm9e/dOnz69WCy+9dZb3/jGN8wIRSwWMzUEAMdxKmRZZcBrcHDwqaee
+Wr58eU1NzV//9V9feeWVhnQyrfazMwKFo92DCgXf2tp69dVXJ5PJxsbGFStWfOELX+jo6DDVzac+
+9akJEyZ0d3ebrHH69OmZTIYx9sMf/nD58uX33HPPJz7xCQClUokx5rpuEASn2umvOCLTRSGErFq1
+Kp/Ph2GYSqX27t1rxspuv/32O+64Y968eTiaMhorASCEMFps/kspff31100VNnPmzHvuuWfOnDk4
+6uhMg/M0QDteTlProyiqjGwQQurr66+88sra2tq2trann366u7tbSjlz5swrr7yyXC7v27dv7Nix
+7e3tTU1Nhw8ffvHFF3/5y19++9vfXrx4MYBCoWBImDAMK9TuKYlZgxllXbNmzdatWwkhY8eOZYwl
+EonW1tYvf/nLEyZMuPvuu83KAYRhaLIUY2qcc5MFbNmy5aGHHjIzRXfeeefSpUvHjBmTzWZrampM
+emqi/e/p5Y2c5vSZyfYqzVIAyWRywYIFra2tU6dOfeaZZ37xi18MDAxs3rx57NixkydP7ujoMPWL
+OVxw4403Xn311WEYSikNJwPA5Pun6kMNCiZBBPCjH/3o8OHDY8aM6ejo0Fp3dnY++OCDv/71r1es
+WFEJwoaNqewWgGKxuGPHjieffPJnP/sZY+yGG264+eabp02bZmKvYeVMANCjpvt/Tzmd5LIyYTCa
+qzN/b2tr+/jHPz579uy5c+du2rRpw4YNvb29ZqDF2KkZw1uwYAEhxJRCphqqpDQn0/r3IMQra/jF
+L37x4osvKqXGjx8/YcKEcePGbdiw4f777/+7v/s7U8RWOFRjr5TSgYGBVatWvfbaa88//zwhZN68
+eTfffPPFF19sHKOpE3G0e2WWYYL5WQizhrC2LKtSrxJCTEfCoJ9IJC644IJJkyZt377dnBo4cOBA
+MpkcGBgolUqDg4MG/dbW1qqqqsoDVKajTs+WzfGd73//+4ZZmj17dnV1tdb6k5/8ZH9/fyaTqRiH
+qbd7e3vXrl27efPmNWvWbNmyxYyBXH/99Zdcckkikah0gM3YehiGrutWDluZgvw0FnmMnOGjDaP9
+oIFjy5YtuVxu//79L7zwwssvv2yO8tTU1CxZsuSqq6666KKLDA9ssvKK+zIZXuVUkMn8cDSVBFCZ
+BJFSGlzuu+++b3zjG6VS6cYbb7zzzjvnzJnz6KOPmtnVwcHB2bNnn3/++Z7n7d+/f9++fdu3bz90
+6BDn/Pzzz7/yyisvvPDCGTNmGPb4GDb4/ZMzCf0xhb5JOczgzcjIyI4dOzZt2rRt27Z169bt2bMn
+CIJMJtPa2trZ2Tlt2rSOjo7x48e3t7cbNvw9ZruEEJWTt+a7isXiM8888/d///e7du265JJLbrnl
+lmuvvba9vX3NmjW/+tWv/uu//mvNmjWGijE+J5PJTJw4ccGCBYsWLZoxY0ZdXZ1J2EyZNrrToP9H
+HFnGbx/qGP1Ho87mDMnw8PDOnTv37t27ffv2nTt3bt++fXh42ORtyWSyurp66tSpNTU1LS0tzc3N
+9fX1NTU1tbW16XSacx6Px022Xilrfd/fvXv3448//txzz7mue/nll48fPz6dTs+aNWvdunVPPfXU
+ypUrTV1tei+Gc540adLUqVMN4mbGxCBeWfBvAfR/zoGe05bR/UIppTnQ1Nvb29PT09XVtXfv3v37
+9/f39/f19ZXLZc/zAHDOY7FYOp1OpVJjx46Nx+PJZNL8lzGWz+eHhoZ+85vf9Pb2+r7f1NR00003
+TZs2LZ/PCyG2bNmye/du13UnT548ZcqUiRMnNjU11dXVmYM7Jjcz7CZOdNz3DyDvC/TmnpUObWWY
+q9K8r3SZTfenVCqZSVLTah8YGDh48GB/f//Q0NDQ0FCxWBRCmEa2Yc0MF2Q+aCr7dDrd2to6adKk
+lpaWZDJpzsEmk0lD8EZRlEqlTHHLGBs9R2VWUplkev90/Hg5k+dmj3c1OG7qr3Jxpc1v5l5MXA3D
+0MRbE0KNSzEks6k/oyiqnCWq8AeO4yQSCeM9zA++72cymSiKzFeYhKQSxkc38dWoI4/HLN7I739w
+52RyJs/NHrnjiRSnMsNlCpNj4tjxGmcU3Ax3mMtMRjv69QYmHppNqpRIJrCb7TR8spTSlBSVEfNj
+VnXCCaLRenNG8Dle3ndfbyAY3aqtPExlAyr6OHozzEdGd12OufPolY++Q6WJoY47Z2u0G0cVv8IX
+mbKucrc/jNs5KfQBPIBwcAYAWqqIUgsAiSwQaI4IEJAWGAeIgqRKaWhNADBKFAQFVxpE4chDaUkA
+gEEDGjBPp8XRtyFRaAoAGqAAUaEIOLcJmJagBKAKgIZSQCQjh1lKasYY1Im1UgOgEPAIzAcpR4yY
+rz6R+LRMQBk4wKAUI5RogGhoemTBFCCAUqCAlD5XFJRCKUgCxmGZKwX1KZiC4mDk6ENpBXKc3zop
+9BGgpLIZJQDw34enEClwKqE0oQClGhSAhIDi/AgKUSQ5Z0Z1Knc/ArU8eqqNGyUFAEKgNcwsF5Uh
+4xwMUitKKECVGVEOQkopszgAKTVjRAlJGZM48SE3Bq40pBaUcRzFDRqKnPhMllBglBENQkA0QKCl
+klIy2wKUOrIYJZVkR+zPqjyUwce8UiuKpGUdeTQhJKX0CITHGdLJHY6C0tDQlIKAAFBSU0aAMgiL
+pObMJqBQ+gh+oKCAliBMR4pwCkCJgNiOlBpaM0aN89AQBFqAS6k5O5ppSMUZBRQDjmiK2TUiI+kz
+RphOVJamFQiBlIpxKk/iG5Q5aaagFYSAZQMUWmt1EmfCFAB45ch2rKOLglLwROg6R2gDpdWR86Qg
+LDz69jIKKRWzzAZoSOu3gCbQGqDHI/8eHI4CpQCVAIIQFuMaEYhWoATMYhSg0ApagEhA6cgmNkAi
+gBEwSAImqK0ApZWklJOjFiC1YIRwCK0lAzVPQIiikFJFijoEmoBAEUKhAcKIhGREaKWIpqCcEA0t
+CZUgjOkTP4KkAcBAKCGwmIFAahIReeI6WUU+dXgsQUAEQLWmICAUCcdMcyoCajFqWc6Rx4gCOA4I
+oAAlAA5oQAERlAIloNxALiT4iZziybVeACyS8DSJARYBKKIoGlGkzuGE6KP7A2Wgh46B+EGYd+wk
+dFxLSO1xSwJxpUAp1YBSAIWEogDxy8xxjmiFUlopYnEAglhQkoMZPYlUCAYFwsAIFIOEEkeVggmt
+nRPoEwAIohlQzJdSyQwAEKmIVCBcn8RMSGTUNhQhIdxiyTAiShLXDaD1EVetCUChFCiFLoI60NYR
+5ScIIp9bhCE46t4YwAEupGbsBLZ2cuj9MlwtQXOB7TpMhqBA3C4qJLUEFMLAiydjGsiX4CYgI4CB
+U1Hyo4Qbg4YXIOYqLgghmjD4YaAJsyxbAUrBFqAM5bKIJzkAE8qURGDDBhAJ46L9UFLHCgGtYRPY
+AIEPEKktQWiokTiJ7856LBWDBUV0KKOI2oliBMpp7CTXB2CBH8ZdShFJLRgsBpcAmgR+6HNuc2op
+M1BKKAAfCqAihGMjKCMWNyqgvDB0bVcpqbW2GZVK0iPzj8fG2ZM7HNsCVD4g99z7b117PB3Jiy9q
++8r/ul1L6XBCmOKWI4GXX9v5bw8+Hio3TuX8izuX3v6RJ594tjBiuXaVpvkP3XjpzHE1UknGtNKB
+ZVcp4DdvHdq0aWeknEJxkDvhrbfddODAgYMHBoMyGzxcuPLqtvMntlNEEArccW2rfwQrfvGGm2jV
+Its5ITN35oQokk8/88qe/UVm1ypdOOHyxzSMmzKpcd7Mek6IJAgi+p+Pv3Sgp+TGT9LjlYmqKmvm
+9HEXz2vnBIGXT8RsKLLtEF2z5p3e3j6tCMAtbguhwjCkCUtFmgjKGZFe8dprLz5/alO5VFjx4t7A
+KwZBbsG8C+bMHEsIKASIAOK/M/SaGT/zm9/s2bYlT5RmxFdgLg8IBAA/UNxJ7d2fe/GX28DrUe6J
+19TBpr98beubK7dBOaEcHiqVHvjyLQQEkI5jaei+/vCJJ37+vQd/RGvaVThy/Z984NYkXf6jZ3/4
+8BOW2xSF/PFxfz5tUju3uPZLhDvQWLNm+1/d+/WRfJVFc5/+8w/Nnv6ZSLCnf/Lq08+8FUuN9XGS
+Xq6X7ZxY9bX/9efXXDU9EU9kh/HoY89tfLtXWKkTXs6kLcLDnZ2Zb3z9s9deNc1144B8Z8vmj3/x
+l1u3boNQ3IkLPwIsMIsxJvVhEM4JlX4hbodjxzXPmN4USX3fv/zs3Xc3Q+a/+vefnT5trMspIIDw
+eOhPXqppCgXLkTQeR6paJxFLVseI8KQjkYhk5DoUABwfdmjXJ91M28jggTFJfOXLH69tjEs3bde0
+P/zo//fzX3UpziBzDL4EffqVzQ/9/DdoOp/RqunnN3/3H/601YEuhm56ckRTiBOH1HFAIVRuRisO
+RK5DC3xsrCoV2GNIooFoyZnI6xSqJwa2TWpqtS5rmdMxph2tMQSa1y5j1Zm9g/xvvvb84aIkmrp2
+5CQaopit0406LjXPauVr19EJaJ2zmLIwlKxv2zkQff1fXyx5ZUb0SGR9/p83bN20x4rVkViN8BVx
+k07cpSpgyrc8ZjuuiKdR3R7QWFWaMw0eOVbSZ4l6bTdpTl0OooSWcYHM8QCfXOupBoiQSilFLKYV
+8YIwCGTc4VoFjHFIqYS2hc10zA55CUFVpsb3cdGsyfd8/s4v3PPNRHJsPkv/7Zs/WDDrHxozcaWw
+vy986P99UhX9eG1C6/wXPv+XY8bURhKW5fi+H6uq9kZyJ10PgP8+Dlf5g65zxZxFM4vFwXyklBYZ
+K9nQ0Ly7p7R9d48U0pyylDVHDl+AEOqPTBqfaapuyI8EnqaWa9skWW3XDOfVxl29UEFfX9+B/YfS
+E1oOHTq8Y8cOOCIKBqZNbW+sby4XsxaBZWW0VA5JHSrkN+857NpJTWwlqSYAP4UXObxHg1ABDIpQ
+QgjRGtq2k8xxoMta+MSmYNwGcSxOpY+opBFyy6USNtRdty9+9Y23nn1mYyzZtmr1nkcee+aev7xe
+UTzy2IodW/uqGppz2e47l173sY/MoxAi4pYdRyQ5ZSAntcLfntn/bxLi8jkd3/76Z6qrIGwQAGVQ
+iu89vuqL//AfWmnzDkCtj8yUAXDC4u1//PEvfPqPOIevIAioQoLg7nt/vv7dg7DtctnL5fLcGg/A
+932ApxP6rj+99pN/dql1FJdIgissf/LNz/3Nd4IoaQuLMZsAQvu/O/QnfVQNAYBTblGmfA+EcDce
+KUSISyujkZRIBgwB1TSmieOBRiU/SMYgg3ySeV++989a2mp1yBhv+PZDT2za2f/G+t4Hl/+UufWB
+X54yufmLn7+ZAmFYdl2ISIJzKSWhJx3C0VpXtP4In6M1tB4Y6E4nYVmCKs9B4DqebQOyKI++/pVS
+yjkqnfcwCiymLAaiQ6ZLMVZMWBEUqjIxLSNiWUoiDBRAHceJxR1Cqkp5IYplR4OjyGWOyyBB4Vgg
+akjlBuOWazE3CqWA0iz63aE/qdZroogGo1BCQkYkae87OPCv3/kZQ4YyFYQlZluKOOve3hnAiaSC
+w4UQRIPZ3AsGZ05u+9Jf3v7XX1pOM/X9g8E3/vXR4VxYDi3CKZH5v/ncPR3NKciiY1shUA48ZjMZ
+Sv07r7zidAShAeASDQgFyqiSBMq2oBSzWaX9VHmLl+SxiHFJQGTILaKgJASzLKlCwrXWGoQSwqCP
+0i9SKBmBGKpIgWgKU41oQgg4JQRSRkKGFDSRODaWng70IBIakFBCgBLXdbfu2L3jqy+JYIJmGiqE
+RaE0TaV5rNlyY743YFGTupKYk4gg/+xj89a8uvqJX27MVNc/+4s1gWCpmubCYO8nb7/mTz40Bzqy
+GTNmZ7uWDD1iO4z8rq/bqJQj2nUCAQUKYmtQKYWnERGKUe8ulvLo+7sIATRsW1MwGtdQAYoMAIFU
+PucskoJalusktDrioxjP2bbSFisDiCxOKONOJMAZkSRF4lW+DGwuYzEbUPnhE2e6pwg9NACtwAgn
+jAittLYUS7q2EEpphylClfCZViosM0ZIpCjRmkAEwnIdrVUmwZZ9fsnKd/fkBouUVNsxXhjpnTG7
++f/51B/bAGBBEy1ERGA7gPQtZkUnoSFxHJtf+ZkRySmoZhahFBqQNgNlCpRWWi6ojDJoDRL4QQkC
+EJo4PE5iEkRGWikRCQ+ECSK0JkodYbOl8OCytW/ve/jxNUp4nMCiVqlUSieb173d41TVR2URyKLS
+IQVNJWrOAPQKylCsjmVrraMgaGufeOlFl6dJThJOuCPBgkgf7OlZveotm/rliEIpoWG5CaEkwLWO
+Zs5u/bPbP/Kd+38gQ5fZPJGJffFLd02aUAU/ArVkOWJxx6IIQh8UiXhq8PDh91rs8a8DIEQEJYsC
+SlGpQIFIWjFA+mTUGy4Zg3mzDbQGCWMWOAMEhQQgOOdgxHVtQoh2HAquJKDNHDlxnSoh5E9+9taP
+f/wGtKQEVClOCVE6cJniLncSxn8JISPvFKYWTwo9j6oASIKR0IOKM+lOaVE//LdbAwIOxURAwAHr
+0ad+9eZrL5V4QrGydBECluZcUSglLRYS8rnbFjz71NNb90AX/MumtfzJZVO5BKglKVjSgtAEoCrh
+xGq9Uok6REslNThxgKImlqcdOC2OKJc45QEQFCQ8P0KapuEJpAvUrhEAiIbFlYpAoQBFiY58x0oy
+LVSuBgpBqQztIawn0qW6ZiSIMm4I7RCdiLTStKRLgzaRgaoTjggIEfagm0iJMPJZACHsWCLSUgcS
+ri2UENAWyjHawEjKL+QIV6F2KWeAL2mc6pEY0VRqCTDClQLXJyCN36OajcC0xexY3AIXMixSllIa
+mgDQhFPDUVMeY1YVWJpSSrXFGaAkiAbnlCCErKqyampTes8gODhnlANaSqkoLECDUU0AFgaqECoB
+Jpw4FRKEaAaY0wthVIQuWRgnZIFQG4Dl8FCGTjIWaF9F4BQgTGkhRGjbtgYiXwBEUeLLsrIiMOGm
+bGppOFLnciCR41qAUJFUhINTDZsnW0LlQEsZFpmWNuzscNHiKUuFbtxavHDOmPr04b6DURRpUG67
+CqXBIbJ1e58Vd5XkoQikRswloZISSupI6UhI0yYKQSIgcQzAJ3c4VllpALaUEVSIoEwtrSmsSkJK
+EUXwI4TCQRhH4JOIH+mrEAkFQjmHJQHCFUo52I5UkSYACVmMhiKwmaFcaaRCaN9JpmvSdVaadfcf
+lmGJyJAw15PO/r6uxrHpvV2OkvnGxvoQkhKbMi2FhrYYcaMQsAGqLccyHFzcqYIV57FY5OXgQEAp
+pkthEcq3q9Dds3v1pnRdytEB04iHKvRV8deberS2CVEJRyEqE1BG49BOlA3jaX3tFbPv/NO5DDBO
+WCt4HI89teFz93xLwmWEUTsOQAnfisUVJVpEhCnKQBAxLoHgFKAnhAutpYQWhFlcwoUiQsJhpomj
+AGgGxZjWlDOHKERhqBSC0HdcbuxLREIyTjSF6zi2oyIFQJqshjMV+ZS7QkBrCthacb+k7rr7+wQK
+kbQ4J7AEsUqhGjpEmFs+r6Ph4kunSy0jIQkhoiycmiabcIcDONLPgVJaABEQMh0jmnHNeDlSni+V
+UjRmh8VJjzy27cknfqNCTwec0ITmRBORj5Curc0f2ts2tvn8zg6AUcUtxpOphlxud26kR2kwnWOE
+gqRAQKB0mBfFgltTGwWejLhFIJkTRcbNOLYdV0AYSssCOVGp+B5h1rEopxoOYTI/jCgIvEbHqCmo
+0hoESiEKS0SVIXJc+wkbjIC7DqRQUlKb2xYXgAhClEaC0LFULVPQ1AmiIGYRrQlALQoqGQIqlCqp
+8rBbQDkA4WA2lIbUsDmrj8v+XZdecv3MGY0OvBA2RAAvH2Rp5GlKAKhARlqrGLNtC1SHUJGX9zn1
+okC6lgsJl1hqYB+ptzx/2PN8cEoAonwimdKCEJLvfddxxYevuzSdigvhObbtF/r8UIMKxTQlIIQo
+aAoBwhmkinyEJe2VbBBLW0ShXNQ69HS5BN+TviAStmXS5ROUiu+RXHIl4BUxtjk1nM9QSjraalUE
+EDCLUGIB4Bx1KTJtUiYIBRPxMWOcIJSWQ8AsSkxHVAmPjm+r6+nMMo2WhnhYRiwBWI4CuB2DhvDR
+XJOafN4YS7sIhZ+qFkISMEgwZjFGgtAjRH906Z8s/dPrHEQEiMpRc0Ny5qzGwZzX0lKdz5Wcas7t
+GKCgI9+P0gna0WqB2ZmqNJMBFYgKwcRxjf2HyzyR0NqlDEpCRWDMopQGgZfgeSljN9/0oS/85Udi
+LiRCQssd4xI06cesMamkE0rFmANAgkcSFmWZBO+cMCYUSCXjCe5TgNuxjjE85lVbMpVJMOFLJ8YA
+KLPPx/iVk7VKhNRUK8rYYE6wBBcSNAhrU9zQLEFQtm1OqK01+g4HybQjBECQToAgVAKc2wCUDihx
+BgqC2twmUOUwk7ZBIAkEQAWIKHE3kfXghUjaoD5UCoRDKfi+chzqMpQ9JaOQUp5JQskiFS7j7khe
+wyHMRqGE5jRARAiulHBpBG2VNCcagUSxpJurCVOAxkheszSJooBQRikXClrDZtBA6Ae2cpJpUA2t
+EYSh7UZArJCnLIVSHokYkjZgZhc5B+CrMkQcEjZDPo90BoxDa4x4CiGFQHUNQCPAkhKanUDH32MO
+R0GH0FJTO4AlIBKQJMprVk+oqbeUDH1m2yBUS0SMmiYiBbSyKIFUEWNCRp62Uh6UDepAIAzBXU2d
+AHAAEpVgUQmuAAsCCJSfpA4HlNaCUAKtICQo08yJRM7mDCqJCLBRjAZt21ZI8yhgDBF1NODAE76v
+3Gqqi4q4ALUgiAyhARYPNHVIHpqCuAA1VgJIEALtQJak5sxKhFpTWiJgTMciElqg0BzCdKuPpBmC
+lLS0LGIj0HBDwBMSjMeUKjBSBwUls4RHhFZJOBI4fiD/Dzfuek6OkXP/N7azJuegP2tyDvqzJueg
+P2tyDvqzJuegP2tyDvqzJuegP2tyDvqzJuegP2tyDvqzJuegP2tyDvqzJv8/rNs6cjfNQq0AAAAA
+SUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_infiniti" model="fleet.vehicle.model.brand">
+      	<field name="name">Infiniti</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAfx0lEQVR4nO1cWXMbx7XuGQwGy2Ah
+CYAkuAAkRYKrKEriItJaIlFly7It2WU5cZykrFSe8pTfkF+Rqry5UhXd68RxrM2SIlkLZS0mxUUk
+RJEiAAICAZDYFwIYYAZzH47RGQEkJcK2kFvheUABg57p7q9Pn/P16dNDCIKAdqQcQpa7Af+9sgN9
+2WQH+rLJDvRlkx3oyyY70JdNdqAvm+xAXzbZgb5ssgN92WQH+rLJDvRlkx3oyyY70JdNdqAvm5QT
+eiEv4p8F/xaXF//EnwihXC6Xy+XgO8/zBTe+tCUl9uEHCPFT1yoIAkEQP0oZ8U9x+VwuR5Lf6xDP
+8wRBwE+4paCkIAgkSeKLxWVem7wO6NFGfdsMbjGOoOYEQRAEIS6Pv4sv8jyPMc1ms1KpdIvq4Mm4
+orLITw59sbyKooHpEEPz0pmBOwLFeJ6XSCQbPrm8iGMpA/SbSQF24ov4Si6Xg0mAC2BlF5csmA14
+DF7Fsr02ocpV8YYogBFgWTaRSMTj8Xg8nk6nEUISicTj8WSz2Ww2K4iEJElBECQSCfhYhmH0er1C
+oQA3q9VqNRoNwzAKhUIikUCNBSOBECqwZq9NymDrxXaW5/lsNru+vh6JRILBYDwe9/v9mUyG4ziK
+oiiKgjIcxzEMA04SPsXNBhtCkiTP85lMJpfLSSQSwBd+0jStVqurqqp0Op1er1epVCqViqKoYrP2
+OuV1MxxQT0EQgsFgIBDwer3hcJjjOGwoaJomSVImkykUCrlcLpPJ5HI5TdMSiYSmaalUSuYF3wJj
+A5+ZTIZl2Ww2m0wmU6lUPB7PZDI8z6dSqWw2C7pPUZRSqTQYDI2NjbW1tQqFAur9SXEolhKhL7DL
+4ukPV0ATxT9BJb1er91uZ1nW5XIxDAPWQKFQMAyj0Wi0Wq1Wq6VpWgxEgaEAcw8mHqwNx3ESiaTY
+uONGplKp9fX1aDTq9/vDwVA6nc5kMolEIpVK0TTd0NCgVCp7+/aoVCqSJAuoEXbLxW7mB8q2od/M
+RhMEUQA3GA3op9frdTgc6+vrwWCwsrJSKpWq1erKysrq6urKykqZTIYQAl3O5XLZbJbjOFBnsEip
+VAocQCqVwhdhAsnlcoIgpFIpRVEwV5RKJcMwBEHAXAHBtktCStKpFLRkdXXV7/d//2Q2bTQa9Xr9
+rl27dDodzLDiXv+IA1C6wdmMkIDX4nmeZVmbzeZ2u71eL0VRer2epmmGYcxms1arVSqVeOEDcEej
+0Ugk4vP54vF4OByOxWKhUCgWi4EzAKoOTpjjOBhjkiSxysMVQRBgGCorK8HHVlRU6PX6yspKg8FQ
+VVWllCukUqmE+p5fsOl0IpEIhUJLdlsmk0kmk6FQiKKo5ubm+vr65uZmpVIJ1YFaIITAqWzIXLcl
+P6atx1ofCoWePHnicDhyuZxCoVCr1QaDwWg06nQ6hUKBi6VSqVgs5vf7nz9/7nQ6XS7X6upqNBqV
+SCQkSWq1WoZhVCpVdXU1TdMymay2tlYmk0H/CYIA240QoigKQAddjsfjyWTS7XZzHAffs9ksQRA1
+NTUNDQ0tLS3wRa/Xg3HDLV9bWwuFQh6Px+/3JxKJSCSi1+v7+/t37doll8ux5SlY3KFSF8Pbhl68
+aMQCrclkMtFo1GazORyObDarVqsrKiqqq6vNZrNKpcL2J5VKra2tPX/+3Gaz2Wy2aDTK8zyQEKVS
+CfNdp9OZTCaDwYCVC3oOD9mwVdi+Y7IYCARWVlYikUg4HPZ4PODSk8kkQkihUNTV1bW2tra0tBiN
+xqqqKrlcjueN3+93Op0+ny8Wi4XDYYPB0N7e3tHRIZPJiulQyej/UIOD3WwsFltZWZmZmYnFYjqd
+rra2tqmpyWg0ghukKCqZTHo8ntnZ2UePHs3Pz6fTaY1GYzabOzo6Ojs7m5ubdTqdmH3jhRKOJWCI
+C4INxRZvszYnk0mYYQsLCw6Hw+v1kiTZ2NhosVj2799vMpm0Wi12V8lk0ufz2e12h8MRj8ebm5t3
+797d0tKCivhoacuCbUMPfkYMRzwej0QiExMTbrdbrVY3Nze3trbW19fjZkWjUa/Xe+vWrbGxsUgk
+QtP0/v37BwYGdu3a1dTUJJVKN1yIYv2Fv8Rww/d0Oi2XywsgQPl1mdgci1kKfkgsFltcXLRarfPz
+8+FwWKlUmkym/v5+i8Wi0WgUCgUU4zjO6XQuLS05nc5sNgvo19fXixEoTX4Qw8nlcn6/f3Z29unT
+p2q1uq6urru7u66uDhdOpVLT09M3btyYmppKJBL79u0bGBjo7u5uamqiaXpDrFER6OhFMwJPDofD
+9+7dk8lkx48fx84DFS1NN3z49z3PlwRbNDk5Cdavra2tr6+vp6enuroadySTyaysrCwsLLjd7kwm
+MzQ0tGfPHvC924Y8L5tCX+xViqe53W6fmJhYW1szGo2Wjvbuzi7QOAIRCKHFhYVr167duPlNKpXq
+6Oh4//339+/fr1KpXqopuCKwVBh3vAZOJBLnz5//+uuvSZL8zW9+Mzo6+qOwvfn5+bm5ucnJyVQq
+1dXVtWfPnp6eHoZhUN7QsSz75MkTu90eCATq6uqOHDmCu1NCNOIlWo9REIdhgWPMzs6Oj49TFNXY
+2NjT01NTU4N94KrX9/Dhw6+//trj8fT27Tl8+PDAwIBWq331lhWbF/yXIAhffvnl3bt31Wp1JpPJ
+ZrO/+MUv+vv7wSjBIqvkmAzHcXa7fWZmZmlpKZfL1dbWjoyMWCwWeCZCiCAIr9drtVpdLhdN04cO
+HTKbzXDvdhnnVlqPEMI+By+awMCNj4+PjY0xDHPo0KHW1laapnFvHQ7H559//uDe/Y6Ojg8++KCz
+u0utViPR7Nm6iQC02DojkVvLZrPj4+OXL182GAy//OUvI5HIX/7yF4lE8umnnzY3N2P4NmRBWwu0
+Cnd2eXl5ZmbGarWSJDk8PDwwMCBW/3Q6DVMkmUweO3aspaUFerQt9DeFHg9ywQoeITQ5Ofno0SOF
+QjEyMtLS0gLhKrhrenr6/PnzLpdreHj45Im3q6urJVJKvHP00tXghi4Xf5+amrpw4QJJkmfPnm1o
+aEAITU1N/f3vf6+rqztz5kxNTQ3LsrA2Lk3EMwxmwNWrV6PRaGdn5/Hjx9VqNVaLXC739OnTx48f
+x2KxEydONDY2bneebWVwxD3HqnT37t35+XmlUnn06NG6ujoYGI7jSEQ8fvz43P/+Ty6X++ijj3p7
+e2UyWYG3xKNYvItU3P9i3O12+9/+9rdIJPLrX/+6u7ubZVmpVJrL5e7du/fFF190dXV99NFHVVVV
+qNT9ENw8sbaFw+Hr16+7XK6qqqo333yzsbER8yiCIJaXlycnJ5PJ5NDQkMVi2Va9m5bD/BpaALjb
+7Xar1SqVSkdGRoDJgBWiKGp5efnmzZtKueLjjz8eHBzEBAZ0HJoLlBzW+lu1SbSzyvM8TJRoNHrn
+zp1wOHzy5Mmuri6e55eXl30+H0VRAwMDw8PDs7OzFy5cwLi8Yv/FIm6nIAgQP6isrHz33Xf37t3r
+9/vv3r0bjUahPbDsMJvNfX19BEHcuXMnFApta7w3LQrAwbPg+9LS0oMHDyQSycGDB5uamqCV0ILV
+1dWbN28SBPHxxx/v37cf5Z0EEnFtcfktGoSTCaBqCCqEw+HLly8/fvz4xIkTAwMDBEGwLGu1WpeW
+lhBCCoXi7bffHhkZmZiYOH/+PNz16hCACPntcjxNQdsIgmAYZnh4uK+vLxQKTUxMwHYNys8tk8nU
+19en0WiuXr1akAmxtWw1SmCjoXpg6G63e8+ePS0tLWJdzuVyU1NTyWTywIED7e3tGD6CIHghh4cQ
+l99a8EzHn4IgTExMjI2NdXd379u3Ty6XZzKZQCDgdrs9Hk8ymczlclqtdnR0tLOzc2xsbHJysgSt
+L/AuuAEEQcBGzeHDhxsaGubn561WK85s4DhOKpV2dnY2NDQkk8n79++/eo0vmSB41lutVrfbbTab
+d+/ejTUaCjx//tztdjeYGvf170ckISDh30qX2zSDY+saYTlKkmQ2m71///7t27c7OztPnToFZIkk
+yYmJCY7jWJa1PVsiCZLPcjU1NW+//bZWq7106dKTJ0/ETwMcX0UlcQthzsEnqL9UKh0YGJBKpU6n
+MxgMQkn4SyKR9PT01NfXz87OrqysIJHSbGEAN4UeXA0ECNfX1589eyaXy4eHh/HaHRSEZVmv18vz
+/J49eyAKiLUbKPZLe7tZ5+HehYWFy5cvMwxz5swZvV6P8q7v2bNnLMtmMhm73Z6IxyUUJQhCU1PT
++++/n8lkLly4ABBAY35ImFfIb0lKpVK9Xm82myEqB7DipCuNRtPa2sowzLfffosRx1xuQ53bFHqs
+2hRFzc/PJxKJzs5OcK3YECGEotHoyspKRUVFU1MTenF4cbO2JeIMMqfTefXq1XQ6/dZbbxmNRkxS
+bTab3+/fvXs3RVHBYBCCkVB1V1fXm2++6fP5rly54vP5UD7tSSKR8DxfmvvFtJim6Z6eHpIkQ6FQ
+KpXCyHIchxBqaGiora31er2RSASHUcXDU/jYzerD4CaTyYWFBZqme3t7YX6J/Xg4HA6FQrW1tXgn
+QfyEErqKn7OysnLhwoVIJHLmzJne3l5BEKD2dDq9sLBQUVExOjra19e3vr7+9OlTIc/qJBLJgQMH
+jh07Njc3d+nSJZZl8d7hSz38FoL7YjQaNRoNBKKRyDwihORyeVtbW1VVFZg73HexfX6hp5tVhlXb
+7/czDKPT6VQqlbgdIJlMRhAEg8EgvJhQV3JXgdKFw+GxsbGFhYU33nhjcHBQTPAhkt7Z2alQKCwW
+i0qlCgQCiUQCK7VEIjl8+HBfX9/s7Oy1a9dQXvFLwx3YM8obQKCbsOuJXuSBCCHYDnK5XLi6LSrd
+FHqoieO4YDCYSqWqq6uBjGMHggcANkXhLryFhO3ddgW2U7755pupqamhoaHh4WEcloEHPnv2jOd5
+uK5QKEwmUywWW15eBhoKQFRUVLz77rutra03b968evWqOBxUQpOQKDOXIAiVSoXbUxANlclkGo0G
+6xx279uz9WCkAIhoNAouDmdtYLIIHgxmHxJNzNKsDcidO3empqba2trefPNNvHcBNbrd7sXFxaqq
+KqPRCHZ/cHAwk8k4HA6WZQEOYDI6ne7kyZNarfb+/ftTU1PEixH/VxdcNebT8XgcSCceSLFfraio
+ANOP8iq/meJvZevhHrfbLZfLKyoqEEIURYmrlEgkSqWS5/lAIICrEbdju/1ECE1MTDx8+FCpVJ48
+ebK6ulp4cUfCarWur6/39fVhpggZNcFg0GazQUmski0tLe+//z7HcVevXl1ZWSlNG3AIBH6yLLu6
+ugr7+3hxDmMDFq+qqgoUEYdDir0gyEsCCRzH0TTN8zzetUEv0pjKysra2trV1VWgGeJdiwJKi1la
+QUV4VgqCMD09fefOHZZlP/zww8bGRhywg7vi8bjT6ZRKpcBt4LpESnV0dWZ5zmaz4XUm1tDe3t5T
+p06Fw+Fz5855vV4kWqkUN1LcvIJ2YmK6uLgYCoXUajVeYYjdKUEQSqUykUgI+a2FAmfwStDjJUM6
+nQZlxzCJE4wYhjEajSzLOhwOWATBJ24WVlgc98DDgIcKPj0ez7179wKBwDvvvNPW1obycwjnPDkc
+Dp/PNzIywjAMpOLA02DPKxAIuFwuMTeFAejt7R0aGnI4HNevXwdGiEOtUAZyfgqml1jwOPE8/+TJ
+E0iwgPVNwYYSz/NSqTSZTOJubuHztrJ92KNC1hESMT8QQRBkMpnZbGYY5uHDh+vr60J+GQXMR8yF
+xC2AYchkMniQotHotWvX7HZ7X19ff38/rghKgj4uLi4ihDo7O2H4QfE5jgOqk06nvV4vjnzhgIRc
+Lj9+/PjevXtnZmZu3brFsizWR6ySYg0ttpbYsS0vL4fDYblcXhAixo6UJMlUKiW29Vswq62ghz6r
+1WqWZePxeIH/xE03GAwWiyUej9+4cQOywxBCELnEqocL4wGABBDALhaL3bhxY2lpqbe39+TJk7BR
+Lh5mgiCWl5dtNtvg4GBVVRWOEeGQant7u1Qqdblc4XCYyEe+QCUzmYxGozl9+nRTU9P169dv376N
+8z7F0YJigMSsBiEUj8cfPnxIkuTu3bt1Op14hMT3rq6uAt8Tq9r2bD1WusrKSoIgwJFiRcbFeJ6n
+KKq9vX3Xrl1ut/v27dupVAo3He+rYSFEgVl8ZXp62mq1Go3G9957T6VSYSUSb8vNzs6GQqHdu3dD
+Ip94E43neZ1OZ7FYIOCBXgzX0DTNcZzBYHjrrbfkcvk333xjt9uxYyyGRmwhsZmNRqNjY2PBYNBi
+sXR1dRWvYFCe/i0tLYn3yEqx9fhOtVotk8mwjwLDB5MaWySNRnPo0KGGhobl5eXz5887nU6IsyPR
+LMZODDcaev748eOJiQme5997772KiopcPpMb1iwweVdWVpaXl41GI6ZuYoBgFCFDxu12J5NJGBuC
+IFiWRXn/abFYTp06RdP0xYsXXS4X7qPw4ske3Ef4GY/H5+fnb9++PT4+3tzcPDIyIpFIIOMTWgJz
+iGVZyBqfnJzEtRdw0FeFHrdGr9fL5XKPxxOPxxFCsJBLp9PZbBY+IRdVq9UeP368tbXV5/OdO3fu
+1q1bkUhEDHfByIOvc7vdk5OTa2trH3zwgdlshmzkbDYLriKdToMPtNvt4XB4aGgI8uIxLRHzE4PB
+0NDQAOlvgiBAvh+kd+dyOTDBQ0NDb7zxht1u/9e//uXz+WDMxC4RjyVBEKlUamVl5datW19++eXc
+3NyJEydOnDghlUrX19c5joO+Q045XtzOzs7Ozc2ZTCasFpvBi17lVEltbS1N05C1ajabwU0JgkBR
+VCaTgS06QRDW19cZhhkZGTEYDBMTE999993i4mJPT09bW5tKpYLU34KhXV1dvXTpktPpHB0d7enp
+SSQSoDug9VCLTCaLRCILCwtKpRIcLO6VIFqsQ8nm5ubFxcXl5eWmpiaJRJJIJMScimVZuVx+6NAh
+t9s9NzenVqtPnz4NKbRiQ8pxHBy1WFpaslqt4XC4vr5+ZGSktbWVZVnYlcShIdxUhBDLstevXw+H
+wxBiE/P67UEPd8Imam9vbyAQePDgAdh9mG7QJTGVTiaTNE23tLTo9fpnz55Bls79+/dNJlNNTY3F
+YtHpdHK5HPoZjUavXLlis9n27ds3MjISi8WSySRFUaDmKL9NQdP0/Py8x+M5dOiQUqmEVolHUUwK
+a2trq6urIcOypqYmlUqBEYCwJdAPpVL5zjvv5HK5sbExtVr91ltvofzufzKZDAaDS0tLLpfL7XbD
+4ZOjR49CpCgYDOZyOalUiskb9hYURanV6unp6cuXL7e1tcF+UUHO0jagB4YOcRuz2WwwGJaWlqan
+p/fu3QurJ6x9wFXA36ZSqUQiQdN0V1dXXV2d1+u12Wxer9fj8UxMTHR0dFRVVUFq4/j4+OzsbEdH
+x8GDB8PhcDqdBoDERI0kyUAgsLS0xPP8rl278HkH3HNxr3K5nEajsVgs9+/fd7vdWq0WDplgsgTm
+JRwOV1ZWHj9+fGVl5auvvjKbzSaTyel0RiIRp9PpcDgUCkUymWxsbGxqampqaoLlut/vBzYFRgyv
+bDBKUqn0q6++Wl9fP3PmDKRDi5c1G6K/KfR4DhIEoVAo9u/f7/P5Hj58qFarq6urM5kMWBvQQYhQ
+Y/UHwk6SZENDg06nC4fDEMV+8uSJUqmcmZnR6/U+n89kMg0PD/M8v76+nsvlZDIZHPMAqkAQhEwm
+W1lZsdvt3d3dkIZXsONBiCIzcEtLS8vc3FwwGAwGgzKZDNwsepGtx+NxrVZ77Nixy5cv375922Aw
+QJghkUhoNJqamhpIjVar1clkEnwPOAAIE4HfgggrQkgikSgUiosXL3777bcffvjhkSNHimHcEOGX
+hDXEiUEPHjz4+uuvIc1Ro9GA1xVE2V7iQcbb9jg7CqJscGCB4zilUmmxWGDZTVEUEHCcKQ8zQKlU
+Pnr0aGZm5re//W13dzd+JtYpIR8uF/IZWoIgTE1NPXnypK6uzmAwAGri5oGwLKvT6Z4/f764uMjz
+POS3VldXV1VVYYuP8uwF1AiYD6haNpuVyWSAvkwmczgcf/rTn0wm0x//+Mfq6urcixmSm5n7raAv
+CPUlk8mxsbELFy6oVKqDBw9CtBaqJ/JRTAw6gAj6KwgCeGNQQ5qm4UimVCoFcwx0DXNtnArA8/y3
+337LMMwnn3yi1+vx0OZezFDDV0BRQqHQl19+qVarGxsbgePilRfKc0dYHEALwY5BIyFqkslkoJEQ
+iIYniEkaQRCwIa5QKNbW1j7//PNMJvOHP/xhYGAAt+qlSXCb/odDMViUSuXBgwd9Pt+1a9cuXbp0
+7Nix2tpa8E7iOAa0FUw2OCWZTJZIJKRSaTQapSgKT9t4PE7TNLAFcBjAcOAslUqlcrlckUjk4MGD
+ELLG2BWsP3Fv4ZNhGK1WC8eDpFIpoI9b+H23KSqVSjEMA8xHyJ/XpWkaUAafD3+JD01A1/DhUKfT
+effuXZlMdvbs2f7+fiTyruIV9fZsPdZlbE95nmcY5vTp04Ig/PWvf11dXX333XdNJhOQaOz38AAI
+gpBKpSA3DZZIMFXxzADriT1VLBZTKBR4YHK53PLyckVFBayVMNa4D7guPBWIfMivra3twYMH0WgU
+ji+LO4+3akmSjEQi2WwWSBcWCMxBAewh8F0wV8DgAElNJpOffvrp4cOH8biKR1ooighheXniH7bU
++DhHLBa7cOHCZ599lkgkRkdH9+7dC8gWAwGwwnzH0wgzIvFqC4cnUT40FgwGrVbr6OjoqVOnCuZf
+cX8KuITf74fNKZlMBkMuNowIIbAzufwhIfH6AOWDHMAjxAMMAwAW0uv1LiwsMAxz8uTJn/3sZ2J8
+BNEJC1QCuSzQMrwziRBSq9U///nP6+rq/vznP//jH/+wWq2HDx82Go25XC6RSGAogaRLpBTHcSSX
+xf5TEIR0hpUQLyTzIFHMBNZHcA6to6Oj2EcV9wRfIfIRPbPZ/Pz5czjbD1a7gOdls1kkWsoS+ZAv
+NilwBQcD4C+wQna73eVydXV1nTp1qr29vcAGFszOEhnOZgLjb7PZPvvss6tXr0ql0r6+vtbW1urq
+aogrFLBasQcmRHHgAsThFnB0Vqu1u7v7V7/6FWSwble8Xu+VK1eA/kI0EVskEPEcFYMgbi0eAIQQ
+zJJwOOz3++Px+Ojo6BtvvNHY2Ii2ZJBbSCnQizGNx+M3b948d+7c7OysSqUaGBhoa2sD55ZOp8Gw
+YKAxS8Nn5r9vhEhNYEcsGAx6PJ6zZ88eOHBgu83D8sUXX8AWQjweB4IvPvWAB16MAFYO8UU4FR2J
+RAKBQDgcNplMp0+fbmlp0Wq16EWzvK3mlXJ4U5zfA8RgdXX1n//858WLF51OZ01NTXd3d1tbG44K
+AIeDrS6wvPjoGn6OuOkQKDUYDGfPntXpdKhUtZqenn706BFwmFgsJt5YLkD/33AQBJE/vwgTRRCE
+1dXVWCyWSCR0Ot2RI0cGBweNRiPKL1/EEextNa9ErcctxuQHjjqOj49fu3YNDmM0NTW1t7fDsWC8
+n0fmM7kwBAWMBaIuHo/nnXfeOXr0aAldwhKPxy9evJhOp+PxeCqVIvPvVMDE498oiNQcjugnk8nV
+1dW1tTWPx8MwzODg4JEjR1paWqqqqvCx6QIvul39KF3riwX0KxwOP378+Pr16zMzM5FIxGw219XV
+1dfXw7IWcx6AoKAPgiDQNA1I/e53v2tubt6CnL2KfPfdd3NzczKZDN6FgDfT0YujjhCCbKJUKuX1
+en0+n8/nSyQSkBhx8OBBi8XCMAy+ncjn+5H5PBH0svMaxfJDbT2R3xAQRMtljuMgXXB8fHx8fDwY
+DEokkoqKCp1Op9FoIM6HN7XFnBohJJfLQ6HQrl27PvjgAzi+VJq1ARUJBoPXrl0D6CORCD6PSJIk
+Xm/D63fcbncgEAgGg5FIRKPRdHd3Dw8Pj4yM1NfXw/EYeGxOdCAJN4x/8az6K7awFOjF7LXYw4hX
+0gghPsvNzMxMTU3Blgi83IZhGG1lBbyOBcdtABGSJIPB4OnTp/ft21dyejAItPDOnTt2u52m6WAw
+CHrK5982EgqFQMFjsRhUNDQ0dOzYsb1795rNZrxC3hDNgmVqQdDlVeR1vPsMkI3FYktLS0+fPl1c
+XHS5XOl0WhAEtVotl8spisIvxkmn03q9/pNPPoFEF5ASOobyOmiz2a5cuULTtN/vD4fDgUAgHo+H
+QiGWZdfX1wmCsFgsbW1tg4ODPT09JpOpmKH/RPI63gKVEx0xBM6QzWaDwaDX633+/LnD4VhbW0un
+06FQCDIMf//73/f392NWWrLiY5U8d+7cpUuX3G43RVHw4oumpiZwQrC7Ar4dU4CX7nL8KPJa3/iX
+2+jkJn7HELBmgiAOHDiAD1DA7nPJb8cC12e328HZGgwGvV4P74bB0QuxzSzg9f/vtb6gA8VOosCe
+YNojPqhfcr0bLnmK/0WbpOL8dOiX4WV3WPFxLEEc0QU7Ix4JQpQws61acK4K2ijvHEfhcXn4Usz6
+fyJ53VqPO1YcuimgSXhhWbKtF5OQ4uPIuOoNLTu/0RuXflx5rbZ+Q+Mj7vwWGwsli9iagQUDfS+O
+ZQr5zI6fFHEsr4lcbmbuN7vCF73tqQQpmDHFnmPD7+Iv6Kf0tP9B7zT+b5P/iHda/3fKDvRlkx3o
+yyY70JdNdqAvm+xAXzbZgb5ssgN92WQH+rLJDvRlkx3oyyY70JdNdqAvm+xAXzbZgb5ssgN92WQH
++rLJDvRlkx3oyyY70JdNdqAvm/wfENOWAla1NDcAAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_isuzu" model="fleet.vehicle.model.brand">
+      	<field name="name">Isuzu</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAci0lEQVR4nO2ce7RlVXXmvznXWnuf
+c+6tKiiKN2hEMIDRoBgfhBY1UYgQiYkPokmTztAYjdpIhjbpoelOhrYOHOl01KQFQ14k2ipGgsYH
+ERGCJkYRQhIigjyFAgqKqrr3nrP3XnPOr/84RR5QZVeN4RjXLu431h/3sc858/z23Guv+VhbSGJN
+qyFdbQMeu1pDv2paQ79qWkO/alpDv2paQ79qWkO/alpDv2paQ79qWkO/alpDv2paQ79qWkO/alpD
+v2paQ79qesyhdwABOJxhMIchCAOIcAzEAIDAEHBg/rMBQSJAoBIBA9DD5v8nQMDBnW+0p5LHWqmE
+qEKABQSVnVCgGRAOKnNHpOyECUFJczwCBxQQBBAOEHkKroMFxJAzUIFR7IUzP+bQw3tPqCgtVAIA
+IAE3sGEBEKAakQEhkGplyQKhIQJJDGLuI20DUAIwBJBzEGpYKVjYY0Mee+gDVecejRxICsIcDpRs
+AggSEODKA/31/zj66j8Pt14rd95fwupYBvMFa7F+v9mh++uzniGnn9JMDge0T95wCMkpMlT20JDH
+HHo6RAAJCgKaCAQggPS9FKDKDX/vl3xcL/u03niLWJiwCQgEgAiDNKDJmOXR+JhnxBtfO7z25UXG
+qTpLiAly3kNLHnPo4YAaaKDCGyRQ4YJKlC//df7A7/Fjl4gYjn1SHHOsH/+kcsghWFhXtfHlPt29
+2a+7jtdd227Z7IjSavQLwzmvl3e+tZ1sigFDG6M9n+z5GFP1YcouOLCSzhlptmPlpq/Z2WdNJ4fY
+QU/keefxy18etm6b0snKmHUcKhnkEmeVD/FrV+547ZuYNnSACwJt//pz2U/d6LEXljzm0JPsGEGy
+coUcfJl/eFE98oc4OaD+xtv6zTetRO3IIMPIIAcaOYTTSPNaq5F0Lv3++33xCGa4Ymmy3v/PH5OD
+7Y0Z+yz6GckhaAyyiyHoQc4YrDQOzghymM52vOWtpqk77cXddV/tdr7KWfuBU3KghUdPGzrSSPKh
+ZbKSNAsO04s/Uctkfs+w558UdbkOe2HhPot+IBmkx8Do6QzSSdLIjh2NdcsD9rKXUsb9W9/CbfcF
+K62rOw/zIGfByp3nann+t1iySnLKyiDZLfNXXlu1GSBc2NR/8XLujdvvs9FssQqECwlJUFRHdVik
+CkQ7Gx7Mb3hj+vNPzt77q3L+e+Oyv+0vuRTQXuAkQq1iBCSHRCKiAHXYwd/+gPz99YQMOTDEtF3o
+z37FbL9NCmC2nK79qqXYCxO/9/72faKo4dVpRkYEjQwG2ZFc8tkv/wKz2m/810pWcvamN3Gy0S75
+JOnBaXhnZBjntwQjw3z5zW9dalt+6aqOrBzodGfE1E/7yYAG0vSc1yyx7rmB+6zXQyCqiqQOcWGC
+CXp48W74098ZXfBnfuZZ6e3vyh0yp7rpAPRb5XX/2b9wuUFdmRyeILAhI3mt57194YPvW6R4u9gi
+YAx2phAb+wnHiWqFs6uLvqeLeuzD6bMAAwQhABIqwtiNEPqVr/Pc8/DEo+MDvzNVYNRDSurzDoE8
+eCd/7k31yiuzj+ZBVAdkkO9+Z/Nb77Ghr4sjLw2MOauqzJNqPOxgIFIu7eSAvfLkfRa9IAEKAjJf
+fccoEh7Y0b3r3WkI/NrbukM2qU9nyPSUGllnSdox7rtlctYbePWV1EjDdATvz/+f+PX/URvmJJx1
+NTrLCVVgWsKiQUrjIcLE7IgjbE+TCMA+jV4FQgCCOv+eg933xa+Uz38mfuQ53U+dsc5jlJpxJEnT
+mLlI1H6WM/z+2/i6NwxXXe051d+6qH37fwEt9xrOZjxZsCHDQhJScVUCEZIatEE79shS9yI1sM+i
+BzAAwqB0LdBEHuq9B7/z7QJMz/rZduMiVDGoKyoXpe0DzABcBJCbv5UvvMBvuaf8r/eIuShEEgEf
++r6Mp8jMAGpiDhjuvAuO4fAjJsc9nXkv3H4vbgv/n4koQAjwcC6x+/xX6s23LKwb7/dDxwMJALIC
+kUURlIf9VQARQVJNCSmJwh2KSCJIGZAEJAJSBmHqu/y1G2sCn/0sOfLw+fy2h9p3vZ5ViUFVoPNy
+0+Qz17TddLZxE45+Ajy7AwpHCPFIDiIQiSTICsx5CgAM1YdBA3B0tNZE7rqLN1xdTO1VrxpS2XPu
+j/rIfUoChQACmAPbH8pfuz5n5MMev7xxAyia4YidaP8NBwIkfWfhj3QkACIkmYCkVEBjpERg9qlL
+uW0rXvDicupPNgBkL0KqfRe9oIINgGBO8K0P4Z47I1DGkyGn+SGOEIAEd++tIhARpweAnLzAAApB
+Gbbcqb//B9qMhre+maOCIHwNPQCBgRIAKQC3b4thmyXE8tKYgIAOhSZAFKT/m9dBRNK8oPJvZhBV
+kDQzQYiwl6F532+XG2/hL51TXvjChFpF9ureue+iZy5QV0BCCK5MrZ+pqT704HjHMhJUASiCEBj/
+vbeSINUJi3mGMWkSEZiPQxsA0yqXfHT63guGH30eznvz/Pyo6F7h3HfRA5noAShVUHLKYEapDz6w
+cvfdFbYz0A0lQIl/mXPmcz08wh2+s3eEZDjZ9zkEM3voltv5urdNNh248J7fjEMPHKRPKAkAfHfG
+7MK87/X3/f7RDBhnhGFMIm9qdHLksOOutNXKFz5XTjyWGhIGbQKz9gk/3J/09KZZxxqRJK00/YnP
+mBywzU5+Hm6/z8co3UwF2w48Yv0TD9fbbtz/jJ/u+xYfPr+efJIiKbLEDFG6nEd7buD3OmH4/aIg
+adzOYZ6p77fd0Z9wEhuJhNlTnjPc9e2OnNefgtwRxiVb2brCHSvd0oPctswdnJHc3nNp2/JsK5cf
+4Gz7jtr5lV9aOvI4W7/AT36Ys3t7zlObbuzo3u+Nhfss+o6kc4lOc1r0HOp/+40B6DIGCH/pDdGv
+rMzLUmEMZ5BGRu25I9hVxjJpHMg6sAuSQX//7/YbR8NTf3Dlqi9Xek/Oy7fGWjnQYq9KJfss+iDr
+PENvdPZG8h+u3/KUpzjAhBnEzj132HYPzZfpNJuRUwbJfl4LrPRq9KEjO9ryVVfMXnI6teErfra7
+5WbazmNYSfcgY+eZ2wsL91n05NSicqDX6NntLOldeomtXzQZ9cjUzOe/YPqRi7t772VUmv8reCPN
+jdN6zx3Dxz4VZ57Bxf15+PHTiy6onM6hV87nmTq/IIIcGJV7UZzdh/twluGT+RKyl6H1pksYcbA/
++Hj+tXdw623hmKU8csNJT+OTfjQ/4VA76sBY3NCXRrY8UG6+WW6/O199Mzd/jUcd35/904tnn+VH
+HBNh1CLMRfqAEKrM8+RoIEZwoOyhffsseoelmr0g0frQVtU8LGuDoX7jG3j3B9rPfzaWtypHM+nG
+BXB0gZEgIqOo+jCsX0wvei5/4rT84p+zA/fPBBXSB1rFAKhBdV4SqImENPNGtrSnFu6z6G0el7JX
+BmRMgcDgGWpd5Jwi/vaq+Ksrmhtu1Xvvj20PuGoJtwP2iwMO5+MObZ/5Q3jGs1eOOa4ADYdetI1s
+6jlSCEKqowBoAxBUGQoEXkjIHi/Xd4uejkiRTJlNeqDJiAHaIBxKMIPskhQiVSAD4cjiULgnAik5
+QgWyu6KZ7CDXzwSTnshiWMm60AmagAKufbIWElAdgEYqUYSBCGp26XO0cCADRK81AbkvUFiqVJR5
+iWpXqugKEiyQC6Bwggh13WFDbnKZ1WailBJTy014blJvaCswdiBVwLdjtMGHUCgak509nI1xKcsY
+fUZLYABaM+RtK9i0AMCmyJM9RW9A/vif4uY7bFyyKWjM2p1xxvjo4wetYkkyEqLfsjm+cU3+1uY8
+1DA3VSlFq5eBKNo3kndXuDnz9HT08aZI6OOOzfjjD6XlqI2XGkbhcY8vr3gdFgAWAsSgaCgAQmZW
+P/j+dO82VeuyNUutH7y+vObnhgMPq8DC9q34yCf9/vvTaNdX/iCTxgnxabLQGKFIabgwricckZ98
+IttJwzEs+uLKUu75Di78QMzUMhtprV/G8cf7L/xiO688OqDVUASREOiIiy+Ob/4TWxE0GvCNip8/
+tx62EcAuQq3d3oBnMz7veRVYQXG0FbBmYfsHf5/OoU5JMqZx6SUrJ73Qcgm0FWBSV1BBhQNMyaEB
+7Hpc9GHO5p1K0/5zl7GMhnnInjBT7HjW0/nAlikHq6Qx6POmDCOHBzfPjjp2Jo0B21swYVby8JlP
+kJ1zZn/1lyzrbHcfClgDA5jmQ6haAS9lWTfWk07vP/2JGQfjEBzM2X3uM9RcoQEwpwrwlFO5tMwa
+5vPV5BAk3Rn9cM9tS8f8MKV4hgM9MGsbXn4NbWf31SO025mpH41a65JiIhUKBXxYSYpeI+nYHf4P
+1/a/eM7i0maGQyXJCMFgJZhyi+jNXTQpd+19XrfVkTmyoOhoAeFFdl6FbWC0tY+UA0XnGXcSyRMT
+gNS0pe8hQxDrLQ3uIxVwA6y1BGibfOYtpN/1SkOHurN47RAQoAJS60Jaia98nq+6bvRnCzz9Rb3Y
+iGFkTSiSgJjBG2CwZV8UgYwIV6QYnJqZqA3X5UUsB60nxgkN4DFg7H0yILePtmR36EsEMBKKO6LC
+AEVaMCp6B7zW5l0fWrf9O1FdCGHj3jn73DY92FunogkaIOm7HKmkUdQJMalp1GcgQ7KxmWqpzQRN
+27sVBMQgkEgUA8AAexvGJVIiQM9NgUteFukyVCA1OpTUZ0Hd5aiiRbI6BKhFZoA0raEJ7wkrK/fw
+f19kUUdR+hQqGRTTgoAaUtZGxqNBRg54GADJqjpvbpua1lFRlNYFUVxKyhMM3sJb1kcT3q3XqwZS
+AYunSKSbE0Lpc5RiwPTB4R/+LhFDOxnX8Ki5ySuH7b/wzBPbMu531MHYkKVaX3Z9duXJx2YqFUk5
+FDY5OBgSJ56qTVGsESpC4C45EQFVwBOyuGvk6knB6BGA2GLqDTW74bAD5KdeZPft0GbXScQGBY5p
+I7K+ndy/tf3q9fBZUiCQ8si8y5vvKNuXfMMBglwcSLX2RiBDEGVITZECBRCAwpNkGQQqWF9bjQYy
+CABEpWppJRTQkF34+HddCsVgGEokERFCgVlusmQIt/vKhuWYEpM+DF0qqQ4UPQg/8hPyspekH/iB
+SkgMmlwx3uV7F5pLHlAz+z55U4Q9GC6IBACWJJOys8ysUBQEIoFZiysw7y9DOLwspkHJ0rPIU56a
+PnphShOJXe9q6kJYkFDLzTfioo/OvnGbTGdtAxrcei2lO/AQX4c2gcD2xjYACZz3lkTUqq7JQ3Iz
+72CQDIRCkgiCqGECSyjVxb2PbpQTkeZ+s6foHTkl8QKtAVIUoDibKmgF6zccvHTUEevuu8Wsyxnm
+XhLybf+E897Svfc9k1NPbc44A6ec0h+8abSb/YweOQFjTUARKxgSgSKjiJqyLDGNMQZSFgYG0aIU
+EAnRqYzYuE7cZxmCJiITvsMFI0FYknyQB9JuQhtN1l91dfnIJfGpy9LmuxsiNaMYoKkjiFrw8y9f
+yIsVs9bHbd9Ub4soOfPEDJboc1RImrcwVIUCmUYpXbI0lhJtwiAqiVHNIcJAxi6m9t1POABiaE1M
+mSkMElU5tBFd1jZGi2/5Fbv2JrG7EdCAC5KCEeMtm+PiP+KffriecGzz489aOfPshR95ep/HrQM5
+XBxIQS0CU6hXy4AodvrFIBCYNtLksE6QPRXJoZwKJglp0HEU50OJUwLWMA86sm0YrUvAkNB478hJ
+M4leMCIoMCAjuOU+XPEN/dD70rXXy/YtWRhEShJDJ0A4+vGh7Tt+dXTWWZ3kUfiQkB+6P1ntszSm
+OQANLzqkxYaA1OSWlKgpchhQuI7OwCBBgAFkzZ5FhbvsVNjrUsmgGFVfKbm89FS78F2jd/1u/eev
+lQTzYjBPlEDDTKZ83U287qbR+y/2Zz9HXvRinHEGfvAoK6kQBYAzu6CUitmoGugBiMLghd5yBXVp
+hBYpIoqGtopOgg3YW5MXa25LjVLNEamddIwRK6JYSnkAE0RXGhREluR22zfx0UvzJZ/2a6/V5HBV
+TEDWZBRP8CzFT38JfukV8uJTwTyaBUZzWiGIbJBUlr22QHEMs+VmPEKUWYICraJKagAZuq5oEYU4
+KEqS361QvtfoGwaKFqKpC+nVZ+tzTtbPX44/+3S+7kucSSJFLGCA5QxEQTX70pXN1Vfit8/f8ezn
+tC9/pT73BXzcIV4895nQFjklQCMlWESRScTUclppdQMSEaFoAqkiJQEFUjCNqCBMEtXTzH3M0ktt
+Idmkz7kVAMlq79f8bXvxJ8af+0vc9+0KlAQGEoKyAqAEZL+D/fRTl3/2tMWTn4f1m6YoCdCsBVYo
+YhEKUQ2zkY6y2hBoJi36QFvHKAGPhIKBkLromM7mIep80zOCwHw/+S5ao/Ya/Uxs7E1DQJAMPOqJ
+O17/2vL6146/em38xWfTpZfh5hthvUqCiaESKFqAwi1bxp+9TD91WTz5qfbmV5ez/1PfHqiBooow
+Q2QiE0NMG0Xq0dYxQ0ULerEGWStQmLC0sn39uPEmxEiDwFvLAFrISsqNRauGbtvs01c0H/pY88Ur
+ENuHQEIpoiupTubZWrY4+lj5ydP7V5/JE08YIxORa8p0lDSTvgREMlOjxDJiAUjhgJYB0sUwapuK
+ADQzXDRPBqBfma5rx/P2Zs6be1SpKiK77Erba/RjjqDopGZEBoS6XpJA7VknyrNO9Le8Lq6+On3i
+Mlx1De7b7ECbxrNh1qACUEoS2D/doOfcsLKsi+ee45rhrLCSUu1RBKkgKromjTYucP6FWwSCCRgw
+a7Bw4CZ6LdWMSFhAXsG4DP0UKBOHqOL2m7e+7e0bP3mZ2WCQJEnEU6pu0MAsRuNnPq076wy+7KWj
+I49rDQi4hjD3BQ0hgZJEVBBwMDFNjJLDzSJo67WMkjlETZIqppomWIFMsLjf/jPoCAKhPCJD8z2Z
+60E4ACkZ0UObHtIias0pQxAbD80//Ur8zCvrbTfHpz+VL78SX7xyXAvIIaFhAxrEdBbl/Av7H/ux
+5ilPQ9IQhUmeX6AVKm2WRh98iAftD5YB88gQKSMD6Y67l7vlRSUFiMGJldny+vXrMWjfALf+c/vK
+tyx+/QoiZSlkHbLnKmEl1m8cv+DpePUv4LlPTwc9rkWBzXfbS6pqBYmQUAAZGUAXPsqokJKyW59K
+kmp2/+Z0x7eaxx8vyMnRk8y5ncAF5f77yrYZABHM3d7D4a7kLpaW2H0OJ0g+9ySKVAVF5gmQlQsu
+jCAH0jnEw6meqMHKyo5cmb/SvNIqSSO/dVucf3788DFsEIoZ4KUZIAFd/thHbGDQp5dfTm2ZUgiY
+EYoO6F5zTr3hS5zuWOm5RE65Mgzb4urPrvzEy5mbAagjVMCBYdTyc1ez9xn7lV8/z7DgAJNUYBAw
+JR52CN/2RvubK51GDpWsQZ9XUqOndcZKrpBT444Z64yVZEfu+MifeCqBZIABtZEQxEtfzr/5Andw
+qbKSA2Pw5fo3l+946Ssd6tAQxPxxIpOJXfPlCNtl3XCvvd5lBWWSKf3tt6SL/9yxbWjahWaTZSq9
+CBG0AEtKomG+tLhx/eMPi6Ofhr+/K0nfgmJVoJKc/VJKCMh4Yd2QUxkqBOYK1bZYd9Hv6V/+EQ46
+Lh97XBPLUcNuvV1u++ZoaaVvmLSRbkjSug7Yfz974mE5a7t0n3/8MmBFBR7MBVYBH9XHHSubDrFr
+/g6f/+t2lqi9lNDqqNKPm5rRTPsEqZoxmoxOO82eeTw6a1Pmk38ABeKSMsKyDiYZ3af+orni68MP
+jsaPf7LmLEsx3Xzn5K5bF7c8SAloRkQAklVGbRqPKLtpK9yd1xvJ55681ICKAGYKL+g/+L6eTp/R
+3C/4EAWeUDGiZhfscjDDgCrqkHliskuwJMOidl+6MoIRHJYe9FOe7wk1pUckGh0IKJEpcIACCgKg
+CFUDMEF9xc9vY78SzgfvsqNOYIEDobJXo2J/VxA53vabJFfIyt6Wt/dnnlkxdiASQtCLOlpH/ldj
+BD63c+fPY2/EE6qOhlNfxW5rJecV3Edot+mzFEDFJNQCJhhJQQXYeChkBNU+JUBUkJMHTZl3OdyQ
+kDMKISJCR3IkFP2xn+EpJ8oQAGNxI99xrh/+OPFWkIE0P1hEBAhwgM0f+IOEqqgZpugipEzw5JPw
+38/ZUMuE6hsP0BefUiusBUL3aiR5CAIkk1EFagYychqtz+e9GU84QTFCAoEsMTS9ZtPUgDmoYFIp
+KgXIRtUy84ERmg96Unr3G61dnwmkXYX0u/N6DjP/DycbhAmRywDZXtrpH1w4P3+11m0XXrDcNDOA
+OrKHz/mjBzOY4EDX7LwCuLgfT3623XoLwwabNxGR1fl3X1h6zRuGQw+ebVjX5VTn06WACcygagfM
+GriAyFbWPXTcsfyV/7jt2zfSvRrZMYx2+z92p53uWNidPbu1U5IBDh3e/g7Wbu6lAzmjD9d9dTjn
+HDvkGDYHVVlwNA41PHwVqlZFB8xUhpJnCwt83DH2y79sN3yFXis5zDd7Pkq7rVJ1wOjSS/yGb2oC
+JaMS+4/1jJfhCYdBwpHTN67FH/5JdJ3KesRK5F2/j2cWUwd6ZQ6VZtGe/dTxS54/TA5VlXnRbVaw
+DjDUjMBNt+LeLfHt2/X2O/HgAxiWAWNy6AZxommxYQOedFR90tHD4UcsHHlkj2ipwVBRF6ShDrO7
+m49cEdd//f912/p3EhuLzFAW7NQf19NfqClBYgAcMg6D9g/dc8fkpnvzrd/hd+7K9z8AGxBECBiW
+1BfH5aD9dOP+OPq4h447bP9DntBraU09kaIBNI/+xN2h3x7YoD0M0HkvNIDeMU6OIFeyNEA7XRom
+40AWoMWuI2aHJgMEkagwuHhoLToKUEBCFYgaQmEz6MOFZoSLCCQBmUCgGsrO4kdA5g+6UhBTjZYB
+yagRRQk0QMVQ9rKTd4AaukkoddQDIwIYIARbF6QAHJxvG4kBYiZl3pefoAKlQ0QgAsANiUDBTGwc
+cEry9Gj2u+9IoEGIKJgHwwqTQedJLqYhpFGXoKWcCHHsbq00AEpkmccDVSFAAjI9kALhQoWAnclo
+3AU173wCmSAUQXBeWHcJAB7WaBaIVc+l9fm2pgAEpgCGbACaHRnr9go8II5evUWCAU4UiVQDki3X
+DDfXnBTQoWopCFgKBXW+chBAMZ8hx+ZdTmUeMNBcMQPWuSI90hV2jz7ggAqqQIEcqEAoMnpFEgCo
+gFY0hYbokRZ386VmCKUWzGO6AEKRABgkA7YdMWFTBLX2WtoU/3LcvwSBCgC9o0k+z97Hzv+Q8/gl
+gqqCPtXWAS3wflclue8qDlXSfKcaEDZP9gCN7TTDpGYSqjORcU1IgGC+7gLmv823XVUYPUElSygC
+fY7W4tFPh/oufTgWkUVoMstwsRbSIAGEE0kA0lXA+f7Uit2sXqfgZL7cE4RC55GeAJhWTEpAAFPk
+QOig1uyMr4M733BuHQGxeV0RQAGECAwiFLaQaY9RhqbasYwcyIxdxu7fjTxMomGAmYQTkiMhYLkK
+UwrtE5qABPoMPtxhMN9vpXiYoceQcuMBjZlg/PBUQLjIIwsI+2wL1Pe/9uVdJd/nWkO/alpDv2pa
+Q79qWkO/alpDv2paQ79qWkO/alpDv2paQ79qWkO/alpDv2paQ79qWkO/alpDv2paQ79qWkO/alpD
+v2paQ79qWkO/alpDv2paQ79qWkO/alpDv2paQ79qWkO/alpDv2paQ79qWkO/avq/qesVE71hHfYA
+AAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_jaguar" model="fleet.vehicle.model.brand">
+      	<field name="name">Jaguar</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAedElEQVR4nO1dSWwb1/l/s5Az3MWd
+FklJlLXYskxFVlQvcWMjadMmdZsiBYJeiqDX9tBeChQ5FCjQ3ppjL+mhQJqiQFE0QAPXtd3A+xY7
+kiVr3xdToihSpLjOkJyZ/+ELvzyRkixvVf+1voNBjjhvvvd73/6+N2Y0TSN7tBvE7jYDLy7tQb9r
+tAf9rtEe9LtGe9DvGu1Bv2u0B/2u0R70u0Z70O8a7UG/a7QH/a7RHvS7RnvQ7xrtQb9rtAf9rtGW
+0KuqCh8URYEPUNnH+n5Vob9cLuN1uBdHwA9I9CCbfn4RiNn5bDVNYxiGEFIulxmG4TgOwGIYBq7j
+D6o+4xVFUViWZVmW/oGqqpqmsSxb9fv/edoSekVRGIYBmMhmUFaRqqosy8JoDPPVsPiZvl1VVVyw
+2kGedC7/z+jRUr+VaCuKwnEcqViPKmRZlt0Ux02XEC8+coGfnmq5fcobq67X/myrG6uhpy0vy7Ll
+cpnjOFqK8a8wliRJmUymUCgkk0lFUQRBKBQKDMMYjUa73W61Wk0mE6lZPzAyhBCwM+AeNtWD/37a
++VpW/WYDplX4MgyDkotrQAhRFKVYLK6urk5OTi4uLqZSqXw+73a78/n8wsLC1NRUY2Oj0Wh0OBxG
+o9Hn8zU2NjY2NlqtVp1Oh4oCiINZA7cB6O+Q7x0iss04j+vSUS83/VrL4aZLQn99BPTgGFVVBcjS
+6fT8/HwkEolEIolEIhqNxmIxnuedTmcul3v48OHly5fNZvNbb73ldDp5ngdA9Xq9wWCw2+1+v7+x
+sbGhocHhcIC9KpfLiqLwPA9+Ap61PWRVtFtB0fbQb3Wd/sxvNTQIJog83BCNRm/dusUwzPr6ej6f
+J4QA3OFw+L333uM47pNPPvniiy8OHjxICEmlUgaDwWKx6PV6RVFyuVyhUFhcXLxz5059fX0oFOrq
+6nK73YIgwAopiqKqKs/zz8rm7GSpdv6sx7prK+NczeFWcTrKIMhjqVQaGhpaWlpaXV1NJpOEkGQy
+GYlEZmdn5+bmTp069fbbb6uqeuXKlcXFRUKIxWLR6XRGo5HneZ1OVy6XYRydTkcI4Xl+3759hw4d
+ampqMpvNNptNp9OBhpVKJdAwUDW4C/5Ez6T2Oo3LI1WB/tlObtnKu+7kKVtd2RJ6UvGNLMtmMplb
+t27lcrlsNlssFltbW1VV/fTTTycnJzVNSyQSk5OT2Wz2pZdeevvtt91u98WLF5PJpM1mEwSBZVmO
+41CceZ4nhDgcjmAwaLfbAXFBEJxOZ319vcvlMhgMiKaqqgAu3IU5F+20q0KAHWK0c+g3FdgdWrnt
+od/O4AAEqqrevHlzbGxMp9Nls1mdThcOh+12ezAY/OCDD+7fv59KpcrlsiAI0Wj0z3/+czgc/vrX
+v37//v25uTkQfEII2BOO40RRFATBYDDwPF8ul3O5nCzLhJBYLLa4uGgwGHw+n91ut9vtJpNJFEWO
+41RVBVWgbSDESDCT2gCsdrY71IOd0PYhzc59z5bQg6kBZ8hxnCzLkiTJsnzo0CGr1UoI2b9//09+
+8pOf/exnIyMj4XA4FApdu3aN47ihoSFFUb75zW82NDTcvHkzFovpdDqGYcrlsqqqVqu1vr6e53lF
+UcAH5HI5cLO5XI5l2bm5OZ7n9Xq9w+EAn1xXVwfKgVIPKTGGSTuBb9PA5rnGso8cfEvoQSrB7HZ0
+dIyPj9fX16+trQWDQZC7mZmZsbGxjo4Ot9v93nvvLS8v37hxw2g0Op1OhmHm5ua6u7tdLte5c+ei
+0SghpFAolEolQRA4jjMajaqqptPpdDpdLpcBxHK5XCwWwYZwHLe2thaJREZGRkKhUCgU8ng8GIPS
+8k62NimPZUO2oloZ3/72nQ++pa3HgLJUKoGpEUXx9u3biqKcOnUqGo1+/PHHqqoePXq0paVl3759
+6XQa7LuiKNFoVJIk0JULFy784x//yOVymUxGUZS2trbm5ub29nae50HMeZ6XJCmfz6NEg9RD8MMw
+DERKDoejoaGhoaHBZrOBNyaEQHT0WNPeNN7YZp2eOPvdlHZk60G0AXdCiNlsLpVKJ0+eTKfTFy5c
+mJ2dTSQS3/rWt06dOgWTqaurs9lswKvb7S6VSrIsy7I8MzNjNBrT6TSMtra25nK5JEkCo+FwOARB
+WF9fz2azyWRSp9NhXCTLMuQExWIxlUpls9nV1dWpqSm/3x8KhZxOJ0gGjdpzqkM8J7u0JfSQyvI8
+D0mmqqo6nQ7imcuXL+fz+e985zunT59GgwtuGXyDoiiwYCzLgk5EIhGIUGOxmNPpXFhYsFqtYEC8
+Xm8oFDKbzQ8ePCgUCmDWIc+CnA74gUfIspxMJhcXF10ul9/vr6+vx0IFqSzDs02+Hlm0eWJ6REqF
+z8CqpMViOXbsWHNzc2dnJ0TrMGEsBRNCICwBEe7s7Hz99devXbuWz+dVVV1dXTWZTBDX+3w+WZYj
+kUgmkzGbzYFAYHx8HJ8F1h8WoFQqQXwJq6KqajabTSQSCwsLTU1NwWBQr9eTyp4BaAPIAV2gBibh
+s6qqIFikssHwGDb6WRmfbeL6rR5cLBZhqkAgmJqmQZGnVCrBhGEBoAb3u9/97v333xdFUafTGQwG
+q9UaCAR8Pp/L5RJFEfxKoVCYnp7mOM7v95vNZohKWZaFAAnSK4ZhIEdjWVYQBEjHfD4fZAkYAgFL
+Op0OU0KNqgZWFfIIJVjPm3Zk67eiUqmk1+s1TcOCGkDMcRzIJpgaQlWVeZ7/5S9/GY/H//SnP505
+c+bgwYNjY2P9/f2JRMJsNvv9frvdzvP84uLi559/bjQac7mcx+NxuVxms1mv15dKJUi7sHhHCIGV
+kCRJFMVEImGxWMCCgXSD1QKlBGZoMUfQgW1Qgv980fRJpB5CbLQAAD1MDAQKt1lkWS4UCmBqZmZm
+Pvjgg6NHjx4+fNhkMsmyvLi4ODExsby8LEkSwzCRSKSvr8/r9ZrNZrPZbLFY7Ha7w+EwmUwGg4Fh
+GCh8gh5AhqzT6XieNxqNBoNBFEWHw+H1ek0mk9frBW5hAXieByaBN+CcUDsz/7Ea3E4LCZuSRm1r
+kI3GHcyroih6vT6bzV68eHF+fj6XyxWLRUmS4MPy8jIhxGg0WiwWr9fr8/l4np+Zmbl7924kEgHF
+z2QyYGT0er3NZoPI0mKxGI1GURQxmwWjXyqVoPwJIRPDMC6X69ixY2fOnCmXy2AYIRIlFV0BlQXb
+RSpbZs8O3u3oqaDHIVDxcZcD5IsQMjU19Ze//CWZTOZyuVgsVigUisViqVQqlUqqqhaLRYvFIoqi
+xWIRBAGqBdFodHl5WdO0tbW1ZDIJ9U703hDai6JoMBjA0NNhFdh9vV4PC1YoFIxG46uvvvruu++6
+XC7cMkM/RFeEUIz+M+g/FfQYb9CRHCwDIDI3N/fHP/4xkUhEIpGHDx9+//vfb2lpWVpampycnJ6e
+np+fj8fjhBCwzlCoKZfLiUSC5/mGhgaTyZTL5bC8k8/noWwny3KpVAJDJ4oiLAP8KwiC0WgUBAF8
+ZrFY1Ol0er2+p6fnRz/6kcfjyeVyoijCINls1mw2e71eQRAgtqG3OZ83PZWbxQAf431Syb9gVf7+
+97/Pzc1lMpmlpaWOjo5f/OIXUAUihESj0UuXLt2+fXt8fHxpaSmXy6VSKRhE07RQKNTc3PyrX/1K
+EARJkuLx+Nra2sLCwsOHD2dnZxcXF5eXl5eWljKZDGTOOp0OQDcYDEaj0WazQdVTkqRisVgul+/e
+vUsIeeONN8xmsyRJBoMhm82mUqnV1VWPx9PV1eVyudB8/T9ws9uNxTCSJP32t7/917/+Jcvy/Pz8
+8ePHP/zww/r6etxc1DStWCzGYrG1tbV4PA4Crmna3NwcwzDvvPNOU1NT1bDlcjmfz8fj8dXV1dnZ
+2fn5+VgslkwmQYrBynMcl8/nY7EYFDzAKwiCYDKZwuHwyy+/DMoBQlAqlQYHB2OxWGtra29vb319
+vdlsJoTAUBjwMJX9UQglMJOiey92TnRE+yVczwp6tMuXL1/+wx/+8NlnnwUCgZ///Oc//OEPISXG
+vIZ2D3BvsVjM5XJoNOgqI+4M0wYa4hYohXIcp9PpisVioVAYGhr68MMP//3vf4ui6Ha7IeoXRfHQ
+oUMHDhwA+8ZxnNlsFgTh7t27V69eNRgMPT09x48fD4VCgiDgI4ABzMswC8O04MlQ2g76TYurjzt6
+PB6fmZmx2+0tLS2E2uOlP0B1CAUKZgVmmlRKAiBf6E7oNimaWyw0EUJGRkZ+//vfnz17Np/PO51O
+l8tlMplcLlcwGGxtbfV4POBjDAZDQ0PDyMjIxx9/DPbn+PHjhw4damlpgQUglZ4tkBtSMarI1ZMh
+s+Hrs5J6ptJhgFEzoTY0aA1F1CAoIoTA9DAzIFTWo1HbI2Sz5kBQI9yKSSQSt27dunTp0meffRaN
+Rm02m9frNRqNkLu1tra2tLTY7XaPx+N2u61Waz6f/+c//3n+/PlsNuvz+Xp7e0+cOBEMBsE5EUIw
+pqDz3icW/E2knv639kc7Ia1S8gUWGaqRBCtrAJNGdYKAtGJeRjYuDP0VgiimQoSKDjFKYRgml8sN
+Dg6Ojo5OTU3dvHlzfHxcEASv1wuSXldXt3///v3797e3t7e3t4uiCJn59PT0xYsXx8bG4vF4Y2Pj
+yZMne3p6PB4PWjxMErGDiDaYiBuz7X4ZqajOE0K/1dAAK6lEC+hVAGLM12mhpmNTcJV0hywN8Vbz
+rPKEuIQ3b95cWVmJxWKXLl0aGRnJ5/OQ6xoMBoPB4HA47HZ7e3t7Z2dna2ury+UCzpPJ5PT09NjY
+2MLCgqqqnZ2dX/va1zweD+1mgDG6xXGH0GvUZvKXX58V9IQQqE/RKWKV5FbF0bTpx6ZXUtEYWmno
+qIOhmjiZSvstLC0+XZbl+/fvQ7pw9erVq1evJhKJcrnsdDpNJhPmX6Ioer3eQCAQDAb9fr/H43E6
+nYIgwI2Li4vxeNzn8x04cMDj8RCqzxeU4LGk/hHQPw3V6iahuogRUEKFDeVyGYqLaK8xBEJjwjDV
+3qhKCTDqwEfACOVyeX5+HkLJW7duXb9+/d69e8vLyzqdDvI4URR5ngfvAptikGCDZlitVsj1Jicn
+Dx482Nvb293dXVdXBwUMYBvZ21QDaolmmzzbuP6/ihiGkSQpm81arVaWZaempq5cuXLhwoWBgYHl
+5WVVVRF6qGPr9XpRFM1ms8lkAgfAcZzBYIDag9frbW9vf+2119ra2tCikgqaVWEPbWCrpOeFgB60
+AfI1qJrl8/m5ublr164NDAxMTEysrq5ijwn8vlgsyrLM87zP53M4HHq93mQymUymTCaj1+utVqvL
+5erq6uru7g4Gg+jPsDaOdg80gxACQQSdqbwQ0NMGEFsKAaZkMgm5cSaTAfj0ej3szkcikStXrly/
+fj2fzweDwVAoBL4hlUopigJdcqIohsPhkydPBgIBqIyCzWFZtlAoLC0tra+vBwIBj8eD1g/RfyGg
+Zyp1SvTqKtX1zzAMlLIBHfC6gKOqqqOjox999NHly5c1TWtpaXE4HAzDrK2tpVIps9nMsixowyuv
+vNLe3h4IBEwmkyRJMzMzn3/+eX9//yuvvPLOO+9AIwFk2mDByIsDPWJNNm4BorvG4jND1QmYSqbd
+19f3m9/8Zm5urrW11el01tXVRaPR6elpSZL0ej3EQmCFLBZLKpV68OBBLpf78Y9//IMf/MBqtcLT
+YagXS+pRutEaVGWhVYEvXMSaBNyeTCbff//9GzdugJuFzbKlpaWVlZX19XW9Xg/rqiiK0Wjs6up6
+9913T5w4QahdTFIpSGDShxz+z0JPKiaYTvRq4aZnjQk5AqcoiizLf/vb3z766KPV1dVwOOx2u6EG
+V19fbzQay+Wyy+Wqq6vz+XxwhU67CBVqv0AGh2ws29F7VSj7ILNYrsFQB8IeSDvgx/39/b/+9a/H
+xsb8fj8czTCZTE6n8+jRo8eOHVOpszfYD0pHn9sZHEzH2crpDuRs07QWY1V6GihfdP9F7YoyVHkA
+50wnStg/w1AluW0kA+9FhhFrxKLq0F0tS8g2VgDpBJDjuPX19XPnzv31r3+dmprS6XStra0//elP
+jxw5Ag2KhKps1xbamM16szYgiH+uytAQXFyVrbgnVIWItnGb4gXM0epJmwW6ZLjp8tNDIQ+4eMg5
+QxXyyGYWBn+J3KLBQVhIRQ5SqdT9+/fv3bvncrnefPNNn89HowfTwZoP/RTUua8kD8974J9hnZlK
+oQ4BpSULp4qfQT0JdTYcF7IKOK3SpYSI000GGAXDB8wMt5J6leqloRcAY2qtclgO/lq7BrQW4l2o
+cKh/hBLBTCaTTCZ9Ph/s0dPZLAby6OfpmiDuKxBa6vFcGRo4erVRHzdNi7VKbxdARjaeYK7FndRE
+exrVVEIonQAcaexqCW0mToxW0FqlqXKw+JWlzvrCFhjEMLRRRVNOG0N6s4HZWNWp8q60beBRrEBN
+6MfXbl9UfaBnjmEZJDJMZRukyokhQZKJygT4VtWksMqPPNCDbCrI2sZoHUuMVYZo0/XD45JoNHAu
+OCDeDkYJGcPfY8cn/XTann+1DLTUw5Kig6Lr1Ki8WwkdPXSVC636QE++yjIwDAPNBFB1wVyU3piu
+dULAKiwb7evokIE235vyg3KNa4mmn76IWw508YcundKwYOiB8csGW0/rIzxjaGhoZWWF5/nDhw87
+HA5tY4PuVm5WluUbN26Iovjyyy9DyRtO7WzjlkFGYLFTqdTU1FQsFoNzJtDMVFdXFwqFfD4fdu7X
+Qj87Ozs9PU0IaWpqam5uRkNPmxFFUcbGxhKJxJEjR6ApvEpoyMamrvX19cHBQZZle3t72UrLFO6y
+0euKUE5MTMzOzup0OizJaZpmMBigGxfK/WRj7x6Pq41Ob2VlZXh4mGXZpqYm6N5Cc09Xgqpw/OKL
+L0ZHRyGv6+7u5nkeahdVdTuUNSxpLSwsDAwMRCIRg8EQCoXa2trgaFU+n08kEtevX9fr9d/73vdo
+9Ok5QAZfLpetVmtLSws6LdrZcBwHx9h7e3ur2KY/oJ0cGxu7c+cOtPd0d3cj1mipcUcMTUIikZiY
+mNA0raenB6ps+Xx+eXl5eHiYYZjGxsajR4/W1dXRT+QJ5dPgKrRX4AluZmPQyVB7oWiastns+Pg4
+CMjw8PDBgwehGk5qTDw9VYZhRkZGbt++vb6+vn///ldffbWurg7lALg6cODA1NQU9J2RGmMFeEHx
+C9UL7QzNPPSsoa2v4oqelyzLAwMD0No2ODjY0dGB3lvbGCbSJgueLopiY2NjIBAAZMLh8NDQ0J07
+dyYmJiRJevPNNwVB+KpTuhaX7QlUDAIAptIEODQ0VCwW9+/fr2laLpebmZmBH1c50qqpLiws3Lx5
+E04lvvXWW3V1dQAxqqCiKG63u7e31+VyPS6fj0vob0ZHRwVBaG5uliSpUCgsLCxUlQTo8JyGBaeM
+JwxYlu3q6vL7/YIgxGKx9fV1WN0vlfIJWKTR5Hm+UCiMjo52dXX19PQAZ5OTk3gWcKuIolAo9PX1
+pdNpm8128uRJCBXAxGPLFPxy+1T2sWgrZkhFoguFwoMHD1paWk6ePGmxWDRNA2sGURaeLqoKImhH
+zTAMlCpLpRJoht/vh3Nh6XSaNjhPAj2hanIMwwwMDHAc19HR4XQ6g8GgqqrLy8tjY2MY7VQZaLg4
+PT29tLQkiqLf7zcajdCHDZaaVGwOmFSYw5PxuXMCy/ngwYNisXj48GHoQVcUJRaLwVmXnQyraRqE
+1Cp1DE2WZbgdU78v1fpxp4RoggKura0NDAwcOHDAZrOpqtrV1QXaNDo6CkZpq3h0bm4OxnE6nZAT
+gB0DvQERgygTXrHwuHw+AUmS9ODBg+bmZqvVqihKR0cH6HdfX58sy8ViEbBjtk6tcXYQQbCVfStC
+CMdx4MkgaCZP8MY/fDCs5OjoaKlUamtrgz+53W6/369pWjwen5ubYyutenQ8C8uWTCZZltXpdPAi
+CzieAAsADwKnDb+nO9oel9tN/eqmNDk5WSgU2tvbYcn9fr/f71cUJR6PT09Pw06TSvVXb/o4OHiE
+If/du3ej0aimaaBJtAF47ClpVAVtfX19Zmamra3NZrPBdb1e393dvbKyIknSxMRES0tLrXeFzxj4
+Y1qIx+EIIWBk8vn8wMBAoVBobW2t7UB+tiRJ0sjISFtbW0NDA1xRFAXmwjDM6OhoW1sbW/NWMXpd
+4d/BwcHZ2VmIF5LJZDQaNZvNXV1dHR0ddDHqSQwOEFiS+fn59fX19vZ2lmVBJUulEvQy8jz/8OFD
+DHVoXoFMJhMcMslms6Syna9VOizhqFQmkxkYGBgaGoLTEM+VhoaG1tbWDh06VC6XJUmSJIkQAk1R
+qqpCpz8oIp1aI9H5CkQ4Dx8+XFpaYhgmHA6Hw2GojBFKEfmqZVRrthTwTQlV6XUmk+nv7xcEYXBw
+sK+vj2EYsBiwswM/7uvra2xshNNVCnX4mOd5j8cTj8dBneEKPohQhSpoiic1QQUSpCBwypBQnpzu
+0YAwDFrsMd6lW5chLzMYDHfv3uUq7yLBI7sASH9/P2ge5pXaxoobMNnZ2dnQ0KCqajgcPnv2bDab
+HRgYqK+vd7vdVYk9j6VOzFAIpUFoZ9F4YcIyMDCQyWS+/e1vezweOtqFmOT8+fPpdHp1dXV0dLSz
+sxNDdWS0ubl5bGyMZdloNJrL5eAcM/YQYFwMOQ6t0cgt/AsukeO4tbU1Usl3NKqFjed5OOTf0NCA
+JyxobjmOGx4ezmQyp0+fbm5uxnYaSCwKhcKlS5cSiQS86w08AVbogB/MkqB2C4PbbLYjR46cP3+e
+EHL//v1vfOMbDFViKpfLLHbwqpVXskqSBD3mcJiYUDUjfEw+nx8dHfX7/U1NTdDEa7Va4ZyxzWZz
+uVzwuiJN02ZnZ2nU2MoBvoaGhoMHD6qqGovFbt26lc1mIa5nqdefgUOG4gReoaUeAiSXywWp/Orq
+KqHqXLjYU1NTkiTV19fDgDgIBC2yLE9PTwcCgdbWVrPZbLVaLRaLyWSC1nCPx9PQ0AAOdnJyklDb
+T0DwFFhIduOGR0tLS3t7OxzFvnfvHh0vQLFgw9YBwzBwyIZlWavVymx8SwEYO4ZhBgcHZVl+6aWX
+UNGQFUAcHDohZGlpaXZ2FgQZqpJY4z5x4sSBAweMRuPw8PCnn366sLAAiRiYGkVR8vk8yEQmkyFb
+kMFgOHr0qE6ni8fj58+fh6Y+DOAKhcLg4OClS5f27dsHfhIdI8RXhJD+/v5UKtXT0yOKYrFYJJWi
+I0oAlBEZholEIvPz8zC4RtW0ASV4pxLeBQJ+4sQJv99fKpXu3bu3srJCSw/PUK8i0DQtn8/Lssww
+jMfjwQPaaIXgMel0enp6urGx0e/3g9uB6/ReoE6nCwQCk5OTiqJMTk76fD548xNLbduyLHv69Gm3
+2724uBiJRM6dO2e1Wt1uN2SDqVRqfX1d07RQKOT1equsDY1+Y2Pja6+9Bt74k08+CQaDgiBAETEW
+ixWLxXA4fOLECfA3gD669GQyOTs7GwqFAoEAU3kdAF0aI4SYzeZgMAjMjI+P79u3DwZhqZ07iO6Y
+SioOs1NV1WazdXd3w1v37t27d+bMGWR7QymRZdmZmZmzZ8/yPP/GG280NzfTtgjNaKlUSiQSdrvd
+aDTSzgp+hgspy3IqlYJjOnB8G8MDLGNh9gQwJZPJdDoNhQ54P6PH49Hr9di9RVsbhkrfgbFMJhON
+RuFlpzAyHPivq6vTqOo5tiWxLJvNZuPxuNfrFUURlxa5wmo7hgMcx3k8nqpEHcZJp9M8z8Mb3wAE
+3D4CeVdV1ev1fmUPMUeAsS5fvjw8PBwIBL773e/Se0NaZcsR7AZiAZMH14Rzo/cu6GCDUAESLja9
+SQs3ounTqM56xKUKerTp9EtQCeVIMWbDfyF6wefSfo7e5ENWi8UiOD+cPqwc2VhQQatQxTkaWHbj
+DuBXB24YhpmYmBgbG2tpaXn99dfpFx5ApIFfAXd8EnZPcJUDafQz6GBDoQ6tadR7XGABEHcaC0Lt
+/5Ga+hdT2T2nIzyV6mHRKlvwbKUqjpvPGEdhwwitu1iE0TQNpBgfAa2ZDLULjb6BrVT8GeoNKTAp
+liplfwk4ytH09PTs7GwwGGxvbyc14fMePSWhQuAVht73Qg9WlWc95SMf6/fMYxYptxp/q3GelUg9
+2fgboNcquRKhItZnhfsebUPMpjvXz1Dq92gr+jJ5wQIIRhe7zdj/PlV3NNYGFXv0nGhDzZJQ76zd
+PZZeFPoqoQDLQwfFe/Rc6dH/TcwePSfas+m7RnvQ7xrtQb9rtAf9rtEe9LtGe9DvGu1Bv2u0B/2u
+0R70u0Z70O8a7UG/a7QH/a7RHvS7Rv8HLtXjr/8zIpIAAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_jeep" model="fleet.vehicle.model.brand">
+      	<field name="name">Jeep</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAetElEQVR4nO2cebAdd3Xnv+ec36+7
+771v1dO+W5Ysy3hDNgm2sQ2YYOENsIFgZ8EhJJmJk9QkTKYqxWSrCTOpSiYLmYQCHDMBs9gTbFZj
+AzYGvAi8S1612lqt7T1J727d/fudM3/0fcLBkqtSpaobivv9471br25vn9/p02frR2aGgfoh7vcJ
+/OxqgL5vGqDvmwbo+6YB+r5pgL5vGqDvmwbo+6YB+r5pgL5vGqDvmwbo+6YB+r5pgL5vGqDvmwbo
++6YB+r5pgL5vGqDvmwbo+6YB+r5pgL5vGqDvm9zJ2lEE2IxAQDBSgsEICrADFGAogxFiIY4Bpp/5
+VaeTNQJVxq6XBBFqRI4AkAEKBVgAwMxUgwgZDCA6eav+U6qTdv1OHIzVjB1FhNKCo0SEFchj7oSY
+SBEZWSwhMnB1J8/qredt0A1Hb/nix+9/8J5a5hz7XJtpUtNYdlrteROL/+vv/PmSBafDGHRSDvtT
+rJNm9USkJdgh9dLqHnh5clNjyCNCzQvXopZFt8mUGjkYI57EI/+06iQCUHYMQyQJwdSYKCMhUIAR
+M8GVkabZFaASToH05B36p1InzeOqldUHgiOIkLNIWrKWbMFDG9DUrKZa0+ihP/M2fxKtngkwwMCw
+qIWhIHYwEj4KkBErOmo5kTEDA09/Eq3ekIICCIB37AAYxEjMRs2EiAheWC1moAAw0AVKABqhsVo1
+KMwANURTRTSoQYOWgAKIOvO1mchANSDObFYt/UzUoLBq82hFtKL6rLCZ78LMzAwGi4DBEAA1M7MI
+BEMwaASA8thBDQDUDFDAYNqztkoxltUeju382MnEGF9NrH83vmVmAFVRvwKqpkSsUUQIYEA1RhZx
+5KGmCMIMcDRlYgBmxuyqdA1mgBEQ1VTVO89GMAJBKAEAhSmYoQjErMrMBMCiUnUCJiAiQFVIAING
+iMDINJbMfsZI2UwJFC0XdgBiNCJhZhEPgAhAtSeYWYxRRETk1QD6hr4yCCIAGrVkZiYHQJhiqSIE
+YmaGVl8nMgZgWi2AhqDMjgjgEGIQ9gBpMBERFlOAAgljZnsQiBkAw6F3cxAAsAGmpkxQU4IQM4wI
+YFKACYkwQArAIoiYiYHIJACbGTMR+Jjtq2nFHQARiUhF/9UE+oaeOFSnTiTCP452jJR95VEYRsSE
+3iKxBmNxFtUQnfMKUyMiMDORwEAEjUZkxDxzab37ozomZvySCFXOgYhUidkB0BicEwAawQxihpkq
+scC0JGYSAaCqYBC8Vs82BnqrAhCYe7eHqgIgIubqMn/y8dY/q4cZDBCz3k06Ob1vx45tuw5sz/M8
+hJD4dHx8Ynx8Ys743HkT8wQNcqQRzExgVQUTVYZJzgwaIA5EZIjBursnd+7du3ffvr3dbhdAkiQT
+E3PmzJmzcNb84ca4IQF6aR0zYiwpeuddz5tx5atgaiRBYcwCODMDaScemZ6eOjw1HYrSez9r1uyx
+4TEnKeBUwYQKNDMfo3/cvLV/Vm8eBBAU2HPwpW9/96vff+Dufft3dtGJMZqZiCSSMLl5cxeuXr3m
+7Zf+4mmnnl6TGlMKAxkTVBFVuSrFiYNaMCpf2L7xa9/88o+e/laz2ex0WkRUXbz3aZZl80YXv/XN
+V55/ziXLFr3OO4klEq8skdgbdX+w/u49B3emSQ1wiEEYwdoWG2vPunTF0pXNvPXk0w/e/d07Nm15
+tt2eJCLhdGRo1jmvW3vpxevWnHZOLRmpkFZOprL3ExHon9UrSFBq64FHvvP52295dssTSY2zmvdG
+maSmIcYoTk2LbTuf2/zis9+5/563XXrF+9/1geXzT9cg4jgEFSfCTEC3W2SZC9b83G23fOmuWw9N
+72vUhkSkXh8ClIiIRBV5Xm7b+/RzN2+YP/u2d199w9WXXzdanxUCnGQwm5ze8+Vv/MtDj383rTc0
+koCItSxzj9l/8afLR8azj3/yr76//p6utlzisxqpKqO7a//+7buev/+h71xy0dve+57rl806m5l/
+wsm82tugr74eQP7lu2695TN/e6R7YHzOrNIQjMUclIUdLGo0R264nhCkhT13fOPTL27d9oc3/dnK
+5WdbhHM9DxCjZZlrtqY+9Zl/+NJdn6V6Z3jCSymoHuNVsKGRiL0XVxvO6uFQc9s/fPIjL7644T//
+2n+bPXqKBRBTlkyQZEnWqA0Pa+TUpUXZzijhmG549qF7v3fbPfffXhuV4fpEDI2gSlCIpQ1pjEjr
+6IEv33Xrs1se/aPf+KdVq1Yd8/jVAhzX158wrg+aAxpCABA1VxSGMqAEgkFfGV+/dgHO1DNyIZRw
+xJlgCuqMEAlfv+/2Wz7/Vx1rzpqzuChZ4BwRUycUrXa72S063bKpnBOXTFZHbdashY9tefh/3fzh
+3ZObiQEDKBAiQXKLn/3qP93+rY8PzXZZOuzCEJXOs6jled7qdrtFUWgoxBRBQiHDIxNDY6N33feV
+T/7Lx/I4TQIIQkzNYi1jC+YYGqIXJ1YXX3zjvs/e9/DXRybm1bKF2oVYW9B1MApMWrOYpLXG8KzG
+s1ue/B+f/tBLB3ZAAcuBAGID6Hgp5AnRO041shMHAyNlS6DemQccgavY8FgM+xr0WWBGqkpEIQSR
+XjCzbdfGz3zhU61Ou14b1ggRIVhZFGXu5s9dcfaai85cdf7csYXdVrtbdkrqMCeAjo+Obdq06Y47
+v6AWABDE1Fjw/QfuuePLtw8PD8eo3nuzKFmn2WxSGF6x5Oxzz7jwdaedn/nhZrMZyk6auCIPtVpj
+eCT79v1feeCH34699EeJSKuYv3dRCnbRrNvtjoyMCHFrugnVsptDzVCAc+K8DB3vPYNnjc/esmXL
+577wyWa7CbwioPx3PmYDC1drQ4YYVByD1CITHd95vYZUlUEEMa0Ky+0v3Pl/du3dNGf+7DJIURRJ
+CkQVS655x39651XXzZ21QC1s3rrxtjs/vf6J75mRIjBFSVzzaPjuA3e9/c1XrT51rZkRu6mj+776
+zS92i6mRoWFiH0s1aDtvjw6t+rUbPvzmiy+tpb7V6W587vFbP/+JrTseVSmcOFX4TLrdQ7ff8c/n
+nPmmiZEJ9KKdmLzCXRhMDcPDo3m70+3EzDeGs+EyFEenp026tXrl2L0qmF3UInX+B+u/fvUvXH3O
+GRfAYi+vY3t17eSE6A0GBIAIAmY2gBQWSJJe+mARVc2GCCdeCbPIRAY2ROdcjDBgz74dT2x8aGjW
+ULtbeNeo1dOiO110cNW69/zWr/52DGUCANlZK89bfNOCj/7t1Pon7h0bWsDSDUU5NjJ6YOql7z70
+zZUrzhZyivj9h7+98dmHR8ZqZQgxaJo4MyUOv/rLH7jirVc7KBDHaqNvWnvp3InRP/no7x88vCPJ
+UlAWAsYnxp7ftuHZrY9fsvZtP86/Znw0ACV1wnm36DTjm974tssuXbdg3qKiKDZt3/L1u76w6+UX
+soYQUVmWgKaZF+emDrx87w/uOm3l62tpRlCgdyf9BJkTOhxST5YAXkFqgHBZGsgZ8kLboGAWQdTL
+mHFCh6OIZhARMyU2GBPjsQ0Pvrz/kPMJO1GUIXSJKPUjF194hbMkdSlUYbCcx2uLr7/2N8fqszt5
+rqpSpbgSNjz7w2Z3CkC37Dz+1EOlTisps1QhnZa6YHzlpRdc7gwoDUVAZFK3asnaq698v0ZWimAi
+qhWluFQeWH9P1MC9wp6Y9jykQYlDURTNI913X33DH9z0x2954ztPW/5zZ6++5Np1N/75R/7+zNMv
+OHq4FPHeS5K4PM9jGdMMDz123979u2ZW8d8b4RjA+tjGByMHMxJOYtl1YipatOOala+bGF0AY1gV
+q5zQ6pnZSiMihsayEO/KWDz86H1p0ojRRIiIQqFFXixdMG/RokXRIARFIEvIIQQsX3LW0oVnPbV5
+fZJlbBw01hrDew/u2H9w5/CCOS/t3vzC1qeTzBMnoUCaJkXe6nbzZQvPH6rNVgN7AjwUMYIdr1q1
+KsvqJGWMQSRV80z23KanDh+erA2P49ija6aPphqgtGzRqqsvf++socVkLAAMAl44cep17/q1zdu2
+djpH04w1wpEYSVqvH20d3L7nhRVLVmgwFhj9uwoJjE558O/+8Y8n2/uCwVQyn5Sh08ljzY/c9Ou/
+v+4t13py1flFLYX9iXZEBEQQmWogsj37d2578RlxxKQhKBN7X8vzvFMeuf3Om7OkVhQd5wHyhCSE
+AMqnpnf5mjCloSwhzJIcbk5t2f70qkVrN29/es++HfWxhkYR4TJ0fOJIh18+uOVTn/ufAIWyK+zL
+UrMsUw2Hpg6ktaRdlkQhmFmMzNycntr78u5VY7P+jcWYgSBEzVb39Ze+YcWi1RqYARIoRTZJXLr2
+7AtOWX7689t+VJYd7+qCeohdk5QSbN+5ET9/OZODHd/uT+zrIzJf75bdgNyc06idWBCr1OL09GRE
+cMxmsAh2cEwn8jiqmrqkLEtmiCND3L17Zys/LOKJlIUsUlRuNBpHpw985Ru3llqy82WMLAghr6U+
+FHGoMZokPgZLXBpZu0EVccvW5/Am7Nq9DVACq4mIhNhVVe+zl3Zt3rxjQxFy8ZlGOOaoXTJNZchn
+NeE0UkEUBGbKzWbz0KFDq3/sjpkIGpUdabRaWl++ZLkZRI5FtF2YB3nv0lUrTn9s473jExmBYglx
+Xk1CbO3esy1YcHRCwidG70q1IZ+Ao2Maymna0RjkMAUhR/W0riYCkAsKMjgAHB0BQC4OoYxEZMiI
+WhZERLUMFjOmrNk5GiIaSQqKsBBMU5FuEcVLlmQjVoZoRszO52VMnQ9p4VhyFKBSOQmleqexQLPd
+Ve4ene4Eisqiqo66DgrUImmSmqehIRpWKjQyIUuTWUU5bfBmCpgjH2OpIDgEDd1ikhDUIhGBgsGI
+BUaqgdnNGltCqKmWLBFICEOgohouatQTR0xIAVbJ1eA8AzR5YFoog0ER7XgLcMLHLINAVTHaAHXE
+zL06nMK63W5VNAeMoGQgFCRVcZA67VCvDwGmlptZGUtAwSQipZbdbjvGoJHLsiSixKHoNrNEWA0h
+hsAKUVBelqpBLQghhEJLds5BC1AQcWWhR462uqWFUACqFkQkhF6IYogKUeU8j0yJiDOj6WYXJkJM
+Bg0xlgFKDLGoGuLhqWmCJD4NQWkmJGehGC3JUhECwCIAQckMIBcDHLuqMlwWIcbonGPmGEtmrrJR
+AMzHp/waXaoqaRI2mEUzBUVVjRaYQY7UFIBGrfoajBJQGFQt8Vmr3VULLFEJzjMEMAoaRSxqLiLG
+nPgUgGrwDhQDBZOYmhHAGiLFkHmOeSd0uw7kkaAo8vwIa6EhEnkCDEUMOXHVNGIYiSSqSmRQZWMB
+xbwo2m2KIXOCiJAXiCogNpBFi6WGAFXv6nkZzKiq3FW+OcZI4OovIISgMAITAFgvXFRVM6vC+6qh
+pjEQiYjrtbROEAG+VlxPQC0bOtrZB6dEFGNOxCJUWP78C09f8WbTCOa0apWR1CwyAEOxc8+LSepE
+pMgDhJVUQwCccCpVL0MEsDKGGKNj54SnjzTfeslV6y67Ti01M2JTVTaYWeqzoigM3vuSNCh8AJnZ
+aH3c67Bzjg1eKBTBSQqzGANR+f6rf++M09emzudF03kuC3LiA0pnUtVyzXr9oxhjCGH5wpVMiUZm
+lhijQZ14tcDsVFUpAGBmEKrGQG+YEaEou6oqImDSUAIiQjHo2OjsmUTh+PZ9QvQEYmD2xIJd+zd5
+pyISozKJUazVsx8++oPnLtuwZuV5qlBVx4yqbUfhwfX3bt/xvPdcFjH1tRJBQwBZDFi6aEU9rY+N
+jFkU5ZKJnHOpb5TdvMgxlE2sPfNiQaYKOtaCmGlmGalZzsRAWmgUDgKF6cTY3BCUiMwikWg0AN1u
+e8GspT9/1sXQqoKmFpl6VXg1xKqoYjAC2Uxx/nCzCCGIMLHBoKpRI3GiGlvtoz30QAhwvuoDQ6k4
+NHWAmc0ohiDCUGLmoh0XLlhGsMp1EY6Tzb6GwyEzLFl8alGUGiJRteIOkYns4NSez9z2iZ0HNht3
+yJXGGhm5dZ/Z8vgtn/undnHYpc45HwszM8dwJGUXp686u1EbXbbo1KF0IobCOYkRRR6U0Gg0Nm/d
+enh6mlAKB2bAYKUSK7gA5cGYqQZLNUBYAA9LULpFC1YmkpV5wQzVACBN02D6zAsPGJq9kC6UxGoW
+CKWBY/QGZ3Bm3uAAb3BRY5qm4ijGWPkQM/MuIaK8aB+a3KdQs2hmzvWGRonQ7k7v2LlFqidhBdRQ
+liXML1l8qlWeRvm4nF+jhsNmWHPaGf6eNMbI6gFoZJG6olUbdo88cf//+Mt9F1544dLFyzJXP9Jq
+v/DChsceX7/nwPak4UNQD3EsIZTGCEU5Pjx7zWlnkfm5EwvPOfMN9z74r0nimBw70VgEa27e/tTT
+m3/05rXvMOvFqiYMlOuf/N79D9xbG3EUTZDAnHK31T76+tU/v+6y95++8txTlp++bfcztXpa5YEw
+Tnz22IYfvfTyzuXz11gJ5hQAMReh8+Xv3Lxv377qCc/MIhJCUZbluoved+rq1xEZKDDDjCySkplZ
+jOXmzc+3u9PDWaOCqBaEHBAeefTBvS/vksQZQdjH2GW4oijmjC85ZekKMyNU3Th7dfHyNbJZZsby
+ZSsbjeF23rSoIqLGMTAY4pXT8OLeZ7Z8/onhxlCMlGsbqmZWH26YIy0DEZnGJElQFN1OcfbZa1at
+PB2GWtq46I2X3r/+K2YkImVZkoSRifTIwSNf/Nd/Xjx+yinLVxJ7AhnyR5793sdu/ottO59J6jWL
+0cObWUAnb+cO6eWX3bBi+erTVp2xeccGs8jiLFhZFGla233whTu+fuuvvvcPZo9OABotGPTu+77+
+yc/99eHDh9M0TZIkhGCIVVPsDWvesto5oqq8rmbmnIuai2Of+SeefGzj009dcP4FBGg12aCh1Z3+
+1re+2W4362NZCIEgzMxwqjp37vwF85fwTMf4uEXjE6KvRjOWLVh11WXv+8z/+7vaiFeMgOuCLshr
+8IlXAN770kCkCbNLUgNHNRQkJEaaS2SyvCxq2az3X/OBicZciyD256+5aMWSU7a+uGls9qwQck+N
+dlNHxkaf3/rYR/7yd9/+C1ecunw1KT2x8dH7f3B3Kz8wNjYiOmppEblUmLVp0bylV73jWjJwwLo3
+X/vgw99qhxZcw9gcEwdu1Me+ec+XXty+/aIL3rpw4eLp5sFHnvjB+ke+L2rzJ+aXxsbk0jxhzqfz
+pYtPWXvmG7vdbiSNcKSpUG4omdk0dW7kSP7y39z84V9p/vZ5Z17iaTSRbNfUM5+//eYnN92fjSQE
+x0ZEBKM27dNQ/4VLrhurzzIDUVUD41ezPyF6Zo7REtd455W/9MgT65/b+mhjVCHT1bBD1dsnMLOY
+kZImMtLJcxY452OMMCZIIq7TbpYtuuH6X77wvEuPFfDGZ835xXff9LGPf7R1dH99pKExsKTdvFtv
+pIeObv7iHR8LZUlE3qVGIM/O1yzmZSgzn3a603knXnPtjactXwtS8nzuGRdcve7Gz37pH5Ok9K4W
+g5Wai4PLwvPb1z+76WEA7MQQwZxlHNVEfBHb9RqOTk55nfjgL/3h8PBw24rKyx+bojEzkrZpPjyc
+TB7d97GPf3Rs+BPz582NZWfvgYPN5uG07sFcxkKc1xAJ1p3WlUtWnXfu+TGaY4IZjlfAwWs9ZtVE
+CIqJkSW/+6E/XrHo3NbhlpZN4ZTZgZwah0hR2eCApBtySeASystWtNw7xFC0ptuh6d5zzY3XXvkr
+hJqpgkJZ5kzu8kved83l1+ct60w3mUK0tjhTmM/GwbWsMZbWRznJfDJCGMnzWoF2VvOtZrM9Wa67
+5H3vesevMCUxxqhtwL/nqg+97cJrj+xr5t1WkjK8qCaS1pIsczWfNFJJPLmsVh+LZkaaF9ONupua
+nKSYfuCGmy44bx05Z2ZVwfIYAyLSwJ4bFpN6bTSpZVOtAxs3P/r09sfbxcGhWUMKiUrMHLXrUoSY
+pzrx7iuvXzxniZNeI0lVj9tJOmGDySLMIrNUQwObtm+4+da/3vDcA4WSc+y9FyGDxhgNxMxKUS0I
+qZl58Xkrdjs2d86C69bd+M4r3tPIJkJhzhPMwGRACCDp3vK5v7/zG5/tFFONsaGyjD5JQ+g1iQCN
+MRJBHOVlyezKvEN5cvVlv/QbN/7+UG2kGl8CgkYSkUNTBz/xf//y2w/eFthGxuaFvFtlOmZU3cRV
+/AMK1T4P7j80Z2zx9df91nuvvtFTRoYjnaN/8tcffPLZH9XTMUIX7AFwrBliu90itqxe92ky3W7V
+aqmV3SKHT2ogM7TFWd4JRTu+Z91v/tYHf8dRXdibKgnMjt9aOnFvr+qNIJoSkTNCMz/wrfu+8s37
+/nVy6uDhwweDFc6Dq8snjVYzRAZpqY6ysdF5551z0ZVXvvOs5W/sHVcZQIhwHmoFUwIgWPvue++8
+/Y5P7z7wEomWGmu1WjX4WJ2wxtAL9bS+eN6Sa6+44Zq3X++QGAowA14Vwr3BxyOtfbd/9VNf+/ad
++ycnG0NqZmnqFRZC8OIAhKCmSQgh4eyM1ef+8vt/4/VrLhBkZIDZke70n/3Nh5545oepGxYujJyZ
+kUWm5Jyzzi3L8sGHH/CZ1IfqRQypeUlSjSjKpk+4dbSdyvilF6/7Lx/8o0Z9xCJXE1RgO5FrOSH6
+GCBOgTIGFa6pwQjMmtuRTVteeGrDY9tf3HRwan+7M12WuZESUuf8+OjYwgVLz1xzzplnnDd7fIFQ
+IsahLF1CMFdNO6mBuTT1oEikgB6envraPXc++KPvTB7ZO93anxedJJMYAyCZG6klo0uXrrjwjW95
+68XXjKRzmKAxZ/FmFrV0klXDYqolC+Uh331g69fuvu2pDU9MHTnQ6hwyisSmJcOSRjY6PjG2dNFp
+b3/bu19/1s9lksYYE6lXK3e0O/2n//vXH9v4cC0ZTXyMxqpqKDRPP/x7H3n9WW/47K2ffvCH35ls
+7jEpvWUhBCM45wR+0fxV16y74Z3v+EUBlyF4lwLcG/kzmCrJTy7AiR1O9dMKJoYKmGBQAApmgBAt
+tNvNZqcVQiAicea9bzSGE04BZnIElIX5pOr4GJH0HrN6zBZmBhmFDaFVHN6198XJg0cOH51SDaXG
+RtaYNTp31sicRYuWJZ5gngAQzKIqixAQgN6KGkqChyFqyZJPHm7t2bdj/6E9nbKtqqSop6PzJuaP
+zR5dMGcpw2ukavwP1oNypHO0Qt/Ixr2rcmRSK4tmctOH/vu71r2vLDo7d29+bsuTO3Ztf2nXS3ne
+HR5pzJk9/7QVZ77hnAvmjC9oNdutfLpeH2J2tXTIqqjCAAqvjmhOHFwCDBCS3kJUIw29npQCENhQ
+ozHcGDHwsaaOGSo6qiBWn8BQErsYWQTMaggAkzrlgpFU7wABSkAjmb1q2WxZpgZ+RZNUhSKgiIlB
+IRpjrwgUQnDOwUAU1CJTWpm/sEfhJ0aHxkfmnbkaETCDIxBUYzR4MZgFqaaUwYCBSiABqo4nAVDV
+GCEi0bosDpozNPONVcvOWXXKuRrRCnmIbVAcqY0xXCgshnznjs0v7d/DJBMT81afeka9NjRjwsfp
+450QfS8gqjaYiUpnHhYMANT7K71izuTY06Q31TuzeK63O0czWzMSADOtrepN2uqgxz5Ue5zJwgUE
+7hVuq305N3OGrppS5mObJT8+a3fsKsA8c9cTHdu2+pXAIBRYxVRJXDRJfYFIEXWltndE6kAKVsBF
+xnDqzcaISCNI4BPbsnV7obZ335ax0dkLswWHjxyo1+o9Uw3EryL9M/8K5YxMUflDEQoWIsoi5gpj
+cqZiVFkXx6DVPXRMlbVV2W+e53NmLxgeHoNRkmQAyrLEK+3lFRq809QTMYgshMJQgnLnOMSo0DJE
+JSi4KnKKq16YCdU0cVVUAEBE4+PjnU5rZOJ13U6O6Jg8gb2v4rrCueQnjjhA35MZmBqwGlndNNFI
+pgrUQUdBpSGogmacmCmoGsR4hfmPjowx88HJQ6OzZzfqI0ONEaB3J/V847/VAH1PxMHQJgtkQSw4
+sDA0RFIVEKDMIGjUspfPV1sRqgSYCAAPD40MDY2pqVCVRoTeTG71nsq/1QB9T4Yixrh4wfJma5Ik
+JYriWEMStZs4GqmNxWhOUL2BVfmZY9UeIgIoxlJECAztdUgqYzer3oz4SZ20F/V/2hUDhBEMxFWm
+rUAEPJAXcTqVMZhTC6CSqVZtMvM+UK8meOxDhbTqGlpvLvg/0nz9fzSJC0UuSUpVj6jHygBNU06h
+sAj2Doi9iUfwK4Eee1dNQ+TqH6OQVW1x5lfs8BUaWH3fNIjr+6YB+r5pgL5vGqDvmwbo+6YB+r5p
+gL5vGqDvmwbo+6YB+r5pgL5vGqDvmwbo+6YB+r5pgL5vGqDvmwbo+6YB+r5pgL5vGqDvmwbo+6YB
++r5pgL5vGqDvmwbo+6YB+r5pgL5vGqDvmwbo+6b/D8jvcblAWXOoAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_kia" model="fleet.vehicle.model.brand">
+      	<field name="name">Kia</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAsY0lEQVR4nO19eZhdR3Xn79Ryl7f0
+61WtblmyJdkW3i3LxvuOA4xhzM6whSWEZUKAISQzkAwJJAQIW9icgSFhMwbCsGODgcELeN9lWbYk
+y9bW3Vp6f9u9t6rOmT9etyyM2oMgpr980e973/3ecrvuvb86derUqXNOk4jgMBYDarFv4D8uDlO/
+aDhM/aLhMPWLhsPULxoOU79oOEz9ouEw9YuGw9QvGg5Tv2g4TP2i4TD1i4bD1C8aDlO/aDhM/aLB
+LPYNQAAGBCIAgYxnCAGAIgAgQBAEGgUIc98Qzb0HIJ33nV0H3n8MSAEQArFQ59fOKdp2/o6ZARAR
+0f62fq+gxdoqERERUUrt50wgBHLw80x0uIeCwjypcsAxAAzE8x+Bue4QCSRQSgGY7yIWiCCISETx
+E+6EmZnZmN+3FC4a9fsxR70wAEUqwAFEgAYgAgFAEEAOoIbwuNTTfCvyqz2jsX+UhPmvGbAi3nsR
+McYopTqy3+mn3zMWT+qBDq8KvzLeCwAHTEHEICUEIviDNAEUNHc+zcs4CQBQ0B1lBREIzZ2BTpc+
+jhACEf3Hot5DdIcpHKAymOEVOt922OgcCUxzSv1XzgdkTqbVnMqe/ymHM6RVR2t1BL5zYvREukVk
+UdT9olE/RxgAERKAaE5j7J9LceAbzqAE8C6w88KsBJqUUipVBCiQgkKgzsQKAEG1FQyBAMVApw8I
+MICIeO8BGGM6pC8K+4tm4QSwnmNeiAUCBBYfdslMY3p639jovpGRqbHRqT17ZsfHW41ma7ZeFEXR
+zvJ2xoUDi1FKk3JFW0dRUqmmtVra05vWalGlYqLo+MGhnv6+ZSuOXLJ8eaW3T8VJgBIgz/M4jq21
+nUsv1uNjURUOAGnMzu7asfPRzVseeWjTlk2bx8bG4o0bfKuFVhYXvgaqkk4hWmQImQZZaAttlNKM
+jiKfsd4JCqAFbglaQgXEQbbrqiMplOJSmg4ODq4+avmxx/QNDZ16+roVK1YsX77cWrvfvtx//H3i
+0KlnAc1Z3AKwMAOKFAsLzRmCSjryPK9WAG+RzVmQ2DO2dfPD6+++5q7dmzePb3yQRsaqWb2G0A3U
+0uhpbW8gMVECSUgSQUTQhIhBBCUgAgmUzM+aBC/wnQWANiyUs3eQpjEe1BSZZt4jPArsAxrAxoRs
+V7V7+Ypj15257vyLjztx7Yojj+muWQqAQU5owWtIGaSLAFJiLR3w1AIBET9xtv79UN9ZnTAzRCmF
+eWFpo4igDBMKgTFCaBJEAfAaioti+/0b7vnxzx6+/oa969dPT4ytiUuJ8zWWflA/oSohIbYEMBFg
+gQgUK2UA4sBgCw2ASNMcVMc0KiwQOITAzB0LtYMWWAAGBSgHk2vTUijAhaNZkp3itsJvB6a7bPXo
+VUcce8xZz3/J6SefuvZpJ80JCMELoGE8oCAukNbQyLOMFeI4foJh9vugXgLPPzWYuTNOmVk0+6JI
+bAxWYMCoQJhqNu75+bfuvumWe392U3vzziWZW012KRCHQilX0igBiUMMpJ0JEIiiJIQQICCtrNHW
+EGkA4+USM4rgnfcBJABpQ0TIG1brWOuYoIRNYCWsQTovFIiIGFJwaInPODgg8coJt4CW0g2jx72f
+Zg6Rvq4I/cuXHb321NMvecZlz3/h0IrlAjSbqCjoGAC8F233Py4r9btOk7+bru9YzUTCTFCikYGD
+5BVSYw8+/KMvffX2n1wf1t9lBd3G9kYmdYVxoQJUEgxnACBkXGSKWLvYFkrlEuqRMMgJWt7P5sVM
+5lo5MkHjABPRAQ4InQWtgQEMIxakCmWFkkWsUSKUNHWRrQlVcy4zKkqnZGa0hCLABSHjQS0OTWGv
+0BQ9pXiLL7YCOGLpMWee/QfPe9ELX/RSk+j9lpcCgiusVooU6HddChy61AOuKIwxav+1BfA+WOMY
+VmPnlge/8KG/v+3r3xhoh+VJOtjKFdgCJSDtLFIVYEEDSwqWTKgZeDZ30+2s7QODVOEYyoPaIK+s
+LlfK3X1ptWpW9KflUld3rdLdnVTKZCMhBEjFpe1mvT4xWR/f29i7tzE+Pju+N2s0EnEUmBA6ly4D
+CamISCehRLrbRFXWlDl2hUAUVAPMQEFqUulRYzaFfIeWZHjoD//8L1/16j9MS5VG3qzEZQNoFoB+
+d8fjb0M95tc1oSi0Np3+bwbe+eDGn1511c3fuNqP7Bw2qBHIQ0eoKKoGKXtUTKSUdkSs9C4UmQ91
+FzIWT1G52r1s+MihJUPj61Z39/T2DQ/3DA5V+3rLfQNdPb2lSpeSFrSGsSDMLYEJ7CUYDYal+UHR
+zrPZ6Wa9UW9Mzk5O7Ns5OjMy0ty1e/axnRPbdjR2j1eaIyIwQJkQR0hia4xi8WkjFA450AACqVac
+7M5aLeDm2Jxy5umv/ZM/efYLXxCUyXNXSsoI/wbz7CFTnwffMaiD84qFjIXzOx599PtXfvKX1/y4
+vW370aVqJRSUN7VGCNAp9URpWUE7LlyY9DJLStJKT61nYOWRy045aeDEp3Ufs6p25PKupUOqVEYe
+oDWUBikQWBAIRAjwBAiIwQAIumNN2c60L/POto5MBNYECIMCjAYAZl9v5o3W+Ob7x7bv2L5hw877
+H5h46GG1b7rqvBHu1RZG63Iyk2eNVkZCCmKATXEyE3ibL06++MI3/dVfnnLOeaISE/0bmKKHTH2Y
+d5h0Fp+u0fz6V6/+xCc+sW7LpoJ9BFSMJe9KpPvLlUqapI08uLzp206r+Kjl3aetXXHBuctPP73n
++BOTSpWVdtAAqQ6JHmTnfDXS8dwAABjQmLdeRM35fjruSJMDmFvQgjrrJkAZdlA0Nx+AFCSCgiCQ
+QoBWQGA/OrLnoYe23XPfjoc3NW68aXJ0T+x8QgZG+ZgmuDXtikGHFvSoNo+wG7P25Gc8401/9t8v
+vOT8330tuiD1oaPWQ4g0aTBnXkURguRWx4EhRcsk991+33fe9f5d139nAGEqqg0X7RkUYRBPQ7Q0
+082Gi4ISFMNnnV19+gVHXHJh/1knYrCmEcUuYlLTKpQUxY1ZStOGYktp3Ag+0WwgQASmRgs2gabM
+kIYjqCK4RMcKGgJfQCm0LUpNDmXVBqoOyDyqxgMmh48xCzCQABGLVuTB0QJKuj45suuu+3d8/yeN
+G2/b+/B6YzPVlhXAbWlpd95qa6QeiWAbsGegtvZ1r3zv//xwX5JA+xYKDRV7Dbaw9JvbnAtSL0BR
++CgyrsiUUsZERVHYKKLmVBFXxtv8g//9zz/88PvN7tG+xIYgu2N/DplVuuLq7XKwbVD15JNXXnLu
+Ca98tj12LZJaIAQDgY+gyCmAoRmBIQoEUarluRwZMFCAExQEC2gPaMwQahmggo+0Cy5Vdm6xRgga
+Ohcf0zjCEq8VkBl4SMX7YGwunIoiDzgAgnjh6dExJIdV2Du25a7bH7v9lsmf3dy8/b5ehHYp2anM
+pkbDRiVtotHWdJLGxZrT3v8vnzp27Ykdd0gGMjCmFVD6TSeBBanPi2YcxSgYxoqiQoSIXJCybm3Z
+OvKpP3vf1u9982j4tuE2oWZwRrd2e8MSKrVs1xHPvOykF19Re/aFUz3VALFIGAgFuiMY8YDKMo7T
+nKAE2sEIVAw44YxUBGjvjVEFfASDJkAKCcDIiQsNRlGGNiARXQBMjVSiJtkpYLAgKwQNsIdtgwzE
+shMOMKktgBZcDXYhLqY4GKVLgBHA59izZ+K2e+7/yqcf/dkdlZYnxFvQHIX3kATYZrtHrHvv5658
+zktfIUbvC+0unSb+ELxiCyscaWhYsAYZRygIBIlAD9xxz4fe8Dp3//1rgEKZdsxLAl8wUClGGrNL
+lqx9/ouGLn+2XHp6pVT1W0dCAqWTohHiqOJ8K0IGHXDEsgldrcHF0E1gCn4AkdqyzYbCm7xdjhRR
+nLNx4LSkli3LYHMX2lZX4GZ2PlJVnFo926hHNiHRlRBQ6LB86Wypu+LEsgZ7aIWoxUVQthyYlCZC
+KPaMqSzLVTjo8+a60jW8LLCKc4BRWEgEdkVKXPzy1p2f//JD3/hG7ttFV3mjczvahUDpqPpAMfvG
+f/zYy9721jKU+OANLaTQDoF6oImcQSmMmfU+ikwC3vvIo+++9CU8utX4WVOCb+H4cnrGwNKJbY+F
+cy674N1v7XvGxYijCWT+l3f+9AVv6tm3N5SUFGTTymxoClzU07vsJS8464PvA5ehAIMgjjc89K03
+vb3Y+KCyvrulsljZQlWQbB+oPvPLHxu84HwTLDjg5vu++OJXdU1O6JTbKlSiCrX9Hi2m3Lv01S+8
++H3v1rYkhBl4DS4BRix1PE3ej37vB19/2ztXNT2LO+jTzp57xmv+96fkiKECFgADBCQCeAQLlY0+
+cvVX1v/DlbxpJ0rlUcWPNVoGaoTsnZK/93OffcVr3wCFXHH8G1O/4PBgaBXFaAks4sgYcLFj1z/+
+6dtlx70AnDU2888Zri1zyRbPq//+b894/Z+GgVqDJQF1A36gu3zc0vq+bVHL9WiEfDIR2IDxkdmf
+fPtfj/lvr+8bPq5zHT058fOPfWz2tptWIljAAarQqUrqbvqB7dtX1ccsipKC10irFCrkxydtkysK
+pj1TeKxAsqc+PfXwZivS4TmG0fAKJniQQoNDVyQuRXesirEdpQWomb7hBjz2MI7obkEzVAJECOAC
+SATUToaPft2fH3PB8x750pcf+cpVJ2zf0VVNNreyJOSX1Hr/1xvfMjU2+pb3vCfKA+LflPoFz/NQ
+3gkSmwcIkM9Mfe5977v7x9dwAq1x2uDSK1avToLGuhOf9S+fOf5d7+b+mhYYhhFoENYce+lV/7jn
+snOCQStgukDmUVZYQbGbbCud5Bp15dCefOQrX37oa9+oIphyNAvUU4QQJlxzg3ZH/5fnnnj8uiVS
+rYQ4II5PO+UlV/59zzPOalkUDOdBqWFdMHi8PcFWBKCAMiMpIAgUvCYYq6dgj7z84iv+9i/McWu8
+4oO+JGvcdf31JChBqjmXAAEXmmdtZjiUMpBTraPXHP2+v7rss58oP/uyviW11cu7+4HSzOQycf/6
+qU9996qrSS84kRwC9QHaWMsMMmDgq1/4wrf++Z+Pj0ouw2lHDJ5aCll9rOflzz/1m18oXfaMcrNd
+UA5yxggIyCGN0NV/wmq3InDiYGOdxCUz7aEkUpRyVI4LXyVfPPDgLR/41AnOrUS8p1mEGCHHMqQV
+lKdWD53z53/St/JpUiAz6HMAbPXSCyeqJUc0CJOA6plH4IrRBAlKcsBreAUYtNDUMVCgzCgDcHGt
+1Ld3dNYwDvoaROnWH92AehZBR1pRgUgoEuoSKxBJkFsEoEmJPPM5677z7ZMuPXNpZM9Z0ddfQi2m
+8vj0R9/5V/dvevjfgPrIF2BuS8iBHXfdc91ffXiVMhOhdekqHJvqRvXI1e/5+BkfvFIqyxXiVjk2
+0GBrWLVRQJsorSGRhEckzgjOBBN7UwKAZmFD20R5ZLDl0Tv+6zv6x3dxKd2KvAZtC+pmjCC/sUuf
+8q7/cdRpf0BtRQwFhvVgIOoarpuSkzp8DlUiZBrec4wIiAAYDy0ISnVllTopBBcUYgGAX37gI8Pt
+MQEMUEYpIGYkCeKOdi7bhr/nvvHbHgAAiIuKJhHaJZAhZQiIgSpQBhmYKK6suPK7K9/6NyTVs5cN
+VyNZpXnZnp0f+m9/lGUFABHJXRbAAoCB/FCo18YCSkWKQvHF93+QsrpR4Wl91dVdy2Vo+Olvf90J
+r3kZbGQ8jCDCgkviuEAECBx7J0ATLMSplrg5fc2fvmvvvRt0JZloNXqgYmtaIlEUrwf3P+uCV77i
+NV2dBayF/S3cqyQWjMgwEAh+w6bxXSNFAQ8UoDpaQB6QZXAFqQwQRlQU991wI4ELzg1MDP0klqLS
+dMLLXnreW98yru1FTzu2mxCD99x637e/ejUYkBDZaI7ezv7Dr7ewUNMeGiQEXPfVq9d/97tpaJcr
+ctbyZcb3rnnhi/pedkWWJsEzHJB7szAzJUEMDXgJobNtVU1Mqdm4+b3vbVx3QwI37TIDVEw04/Oq
+xSMFxtaseM773wOb6gJI0CZHC3ftgoh14iGWBAjgHdfdUOwZTwDSOjOSAYmCBYLhpvYCaEY3sP6a
+H6Fot8l1NtCfhPoAh55a/+teffRznt/lcdHxy4e7455G+/987vNuYhyBO0FdT3LjT6LryQUfiubX
+Pv7xo0BdwKrl/f2Kk1OevvxVr5nStT2thtYKFtACXqgZeEGAAkgpRYAxppLlIz/+2fYrP1vWuSiq
+5Bg00aTPZgSVKL7bll730Y/3H31CgHLeZwTSGn7hCyyAAgw2OaAA5Ru7f/aLSFxZwbJSAqVgNBmA
+DIlHAh0RemHaD23eec9d1kadbYF8YWuFwa0MeW//uje/EdWu4XJpWS3th951/72b77qbCAx+PM7h
+YN6FJ7OEPGTXww9PbNhYA/fGOGb5spnQWPXaV6LarWGXxj1gBIVgNRbu3KagSYG1UkoxoBl2fOLu
+Kz+3pNluhSIwJ8C4L7RSfUl6dzN/2jv++LRn/edulHKGqxjfGayH7ijsSFwzFBreb3l08r77EnjP
+MOJLbCKt9zmpA8Q6AVIQgAQ84PIHfvDDFAwRhF+Pujqw/VDSxgF+1ep1f/jy8UZruLs7LlNfEW7+
+0bUg8kEU7XeyH0R0nox6a81dP/nZEh1Nwh+5bNAWKB9/dNcFpzedq0LFgDA8SS4sakHHhSg4koKd
+994DRNQPnd15dw7EhCrZKaBhYcRMZjR+xknP+8t3oGDtICId3rUA+pCpj8BQ0NoSZPoXd+RTuy2p
+NiCQkugimNFE5yuGimBSEBAKRgbfr2jHT2+grIDWUE+m5jgECOKABnT5iucOnHl2pVId6IuXEO66
+4QbkmdZ2/58fVC0sSH2R5wH86O33loK0gaWDw9LiI55xoVhbtgkxnIKPEBOlZApakPoyrAHx/DyZ
+g7tiOwBuArFQWxgaQ7WuESkeHep71gc+0F/tQ2Ky2ZmSJm40YwYE+aHregoEjQSELN/5/f8LyTtB
+mw4gYAa6dN7Zq1/8gpZNFKgNcUBbIWYXHn5s7NZ7QICGXvi6qU5g2BJKUOhbMvzsywOZ1aWoymHf
+9u17R3bOnScAAh+snQWpL8XxTHsG9ab4tu1PjE2qSS0++ijtAry0s0aLUABoBwrIFlb2MSNiskDJ
+mCiK6iFkRdsgVLQOoIbVkbLF+GxeSla/8eWnXHp5SeDF2b4qnO+OyvDIsjzQISxV5sDSDqyA5uTE
+tptucwg5B1jyMXJwQ6sVl15w6oufV6SJAzINInAMIMT19qY77na+s0mw8GgLelYXoBAVIaPSVF+/
+LZWPsqkBoyhGd+0A4OfjbPmQpF4zFFcf3TWrgCXIumWqBeOHTxebwOo4tjW4MhzrAuBavqB05Aje
+UBOYCT7XYAVPICAo1lC5K2KiGIhM/JJXvjIHEEzugwOTBbI2PCdJ2vyNCX8cRJFVEbdnv/4dqu+K
+NWZTJE6EbQOupUPPc65QZ144uHzIKEQBJakkQbWAmm1vu/prNs9ZI3pSjWMQCWkobSDLh/vZcl5S
+BDaQbCbTAFEBeLCyxRMjy/FkFk7waTkq95Y9IAJrrSU2zYZ3AVBKxRAFkIpiaASzoNRraKN0qmAE
+0i66oGoUA7rpROCHVdwqihmgOpvd9nef6EM+Y1wpKsUMBqEadyzi5FA4n2OGJIDRLjbcdIuFlgCd
+wSAGswGiU9asOfKYCHrw0nPazJGyDM4LrliIk33bd4zffpsWcU82xYgBIGgzPMgEkAusdKLgnEvi
+EgCtNCBQdGh2PZRoAKllrdptAKpo1KM9ewhaAE8Q0nOebXCx8PZAC64ocgNjQQaowRZBJoGeCE0g
+cJ4SuKTKcLu+9u3Rr36FYIWZAjmojBSMQl5UD92s9wqMgJ27Hrvpls5MVPUoFBSHJlC9+OzeSg+x
+Wvrcy3JAQxwcAVaQADwzeesPvk/8pCatFpsLGC5CAYdmph2aLhSMdgjlrioAAgUOQuIPybhUGgyu
+DPb4NPYBLQ5ZXm9teVBbFIyMEQAIyIt+UjspVsp0dnONBpCz34miuWKVFIhSNIBYUGqzB8fF7AN/
+9yG1a5dSXFgNgQEKAtvfxq5nMgZ+7y23l6amXHAWqJJuch5Bjdl45UUXQZBn0r321O7TTnfsBVzS
+pvCowAxqu+Haa7F7lOfC/Q9KkCLSvkAOVMEzGx5WLky3ixZQ6uruHxzsBLExMyMc1Ej9/3g4Tzn3
+zEnvg8KeRrtcK++88w7KWpFipeZ23BA0BXUQTTYPY2FAnjkjdoQ8Vs3enpPf/qbpNDKF7oqjaUBJ
+J5jJFw8/cutffxhT4zlyzjLjwIA3GuHg+xtPAgKZEB665tohoxggAxHSQCFq6mkrT113XlDQKVW6
+h1e96sXZXBC4EoDhlxhV3/zwg9f+OFnAuQ+g8B4CG0FxRnlr800/D5B9s0WmsGbtqd2DQzwXrCOK
+1EH11oLUExsF9fSLLmqbeLKNDSNjuruyZ/NDe2++kXwjhsvyrPOIKMJc4tnB0Mw5IAjIQ6DgxRfd
+tRNe8ZI1b3/L7hBCHtoJckVlqOCQRLTjy1/56Yc+WMmn08ggKyzghHHoiU4EYMvOXbfcFpOLACjV
+gC8pMw6unX/uQO+wC2ACwS551mXoW8Ka26FIdJIDiXfLgfU/vIbcgqMtmKjzpg/F3q9/pbF9cw7e
+ta++j3HcmWci7rjsYI0l8EFZfpKVMhGwdNXqi597RRN4bLK1fWKfdv7hr38ND27U3I71fDBcZP3C
+UXBKI4JJEFtSJsAUMjPdypPy2re/Y+iyy5vK1mxcWAJFZcBDDfmZTZ/83NjXvwcpXMUooAzlzSEv
+qTSw60fXY8++zOUJ0ImzjJgmdemM514BwJDTYB+QrD562dlne2YCvCIBKPhVZEfuuKfY8shC7VPH
+6PdtbHrg3i99PmlP75gYm8x8srT7rGdc7AzxXOIGgaEONmoXpl4ggLHx69/8p+Wufm/Uxse21qrl
+kZ/fOH7rLWi1UqNzhih4jexJ7F/VSQ1kFBwDvdBxAdcWLFn27Cv/oXzsUWk9dzlPqFCmSihCAj6q
+3b7xA5/Ztv7eGUK93oZH/dAVjgYe/Pkvq0QtICLkAVKyHo4H+p5+7oWFh1HMruk1lC0ffc7ZnpHE
+pRnXVpEOQCK+vntkwy23L9S+AxABkbr6kx+vzE4VsxObduwWmOPXnbbmwvNEkQA+eAQGd0ydXydm
+AYh1NrgYWHHemee/8227VGlsjzz8aHZyb+v6j3905Ms/pMwaDVK54bzivWmYQkEUkhBBY1Yj+FYV
+lWooedg62kWPndYgxEt1qYHpehAcfcyZn/zI2LJVFaA/+IY0UpjdKRIY2fTgA+//VO/0HlONvUUP
+aeRmRiNDznFUEzOlAMMlLjmjM1JJZNT0TAJAI7Bor/DIfXtvu7XGKIDJMvoZR7T0dlDrta+I4zSy
+gDfWVBOBFuVf9fKBSlc7bw3A+IIzG+9DfFS195EvfxlwCIwcYIgHPMQVbWSAQ777zne+pfeGW4OU
+rh/P97LNKXnJBz/R8hQD5U5CXRTDmENznxFIa91otEB4zRtef9Txx80K3/vY1jvKA/2l0voPvOv+
+v35LsefRJuJcxWxMqKAJH1xOuaCNGlhr31CNFrcEWRlkc6cC2sgarm1TG2nKQd2XnH/OO964NyrB
+pBpoat/dBsN3g/b+5PpffODjJZeHdgEPBNRYEudotq3gUwuGNNFCCNqgIFGVtAW0CF4TtH/oRz/m
+mQlBYRUkhwCzkHGFdevWKWs7AdIAIAKgt7c3nHNCOzZek4dwyLvhq/V6a8Om0Qe3geBjl6m8aYq2
+EUKUtpJqNnnv33589PvXu0B3jY5s2p07mOe97c2rVq0qlUoAQghadzJQpZO+8htLPSTPskq55INU
+B/v/+C/eMRXZMUO33fNoo6c80K3G/ukzj334Q6a9twm4jHSrUYIYozthRg4MJdNuhiyEYCDSEq3g
+YJrK68TEDA2T63jlq/7L4KWXTvmiCusCKgpNAMb3NPZt+/o3m7fdHKfUCk6sz5XAmqir3ASCAAKr
+depREaHMkUkYcJ4VAA67b7wpCW0PEQIYAWrUyt7hrrPPPhsAez9HPTOAKE2PvPiiQkUcnNFoEDgK
+OsK+5uT2237hVT6BoJ2qtKK0IK9Dkbq9/+Pv7v2XLybV0qPT9ZHdeQ0mOnLFRe/+rx3eO6m5+5OE
+Dpoc+iRSr7WyAEhTIXLu86943pvfsANI6vkvN217KOpeeuTqHVd96Wd/9Ip04/2xAEkcwA32mYZE
+MGIQTG+5XzmIoAzVBfQoa6CtR7XukYvJYRBjYPjcN/wxdS/LwX1WeyAAOmAAVBsdv/EjV2LPuEnt
+jA05WERaHh4oA+WAUgglwHjiukPGUY5STlFgjOxxdzzYw5wAKaMcECGdDbRy3bolQ0MAhOYCOoVI
+mAGsPvn0mKoJsCRJDSMvJCl8F2PHL39kpib6kdhgAUiE8OjdN/7RS++78nNDA5V7Rh/bsW92EtjR
+1fXyv/ubroEjOvIO4P+bfv4kUg9j7dwZpD3pt/zNe5/xilc9CNTH3MaH9v6CWY5aietuv/Glr972
+vz6GPIuARJt2J+7XAVO6MYUsti2VZKY/Q2k8mDGITbrsrENC0m5rRgbTe/mzzv6Lt+9Majtc2Bcl
+ShtJStshheetP7nlmg9/RsN3Q3WJoplAcVcD5UmKpoAZlEYjPUomK5Vg4sjCJiRZds8994zt3DMD
+NHRXw5ZmkOyGmdDxCedc3Hk6Pc8LKUVKcQj23HMrT1+3C+XHWj5EBlAGydJQ3fTFn2DP7AwwZYCs
+uPOTn/jei19du/ra5tG9D+7cPrO3OYX4vih+5Zc+fdELX1Jqe++9UqrDe0fViEg4mJmwYM8EKARv
+lCaiQhwRmWrPX/7Dx99jkvWf/5fl7db0Tr+jVjtv5Ylm55a7//ufjV5zzxmveZ694pK0Wm7o2Gqk
+Pd2nveDFPxzihuNZLklRFCWmgHTpEbvKeog4qaWZEx8RW3vkW193EjfG7rx7R2Oqi8ykLwpLEaKa
+7drSnFw1O3ZceQlguau7fMn5XmYmMIXZnEuVqiAOSe3pp8+qIlZRBHA5qa5aTi997tTMzKRIix2x
+Sas9tb6uVa96KQt3hv+BKfpCQFdl6RtfMT7Ys3dke6WnPFlkqu2SOF6ZrG7VSpEfmfzK97Z+5KrJ
+jRvjnnjLYP8d03uLetgraK4c+uzXrjrptDNSqDyx8bz/fH8RCACdNN0nYOGYSyAGZsfHu/p7CygB
+iBEJGrPNf/rQX1/3yU8vaYcYsa3SBSuXHttujm+p59W096zjlrzyhcdd8hwMHFGPTXWigT7bhI69
+MUpy1dZFm0M8nXZ1S84UeyAC6s2sWk4i5JicRrUXWppFu5wkyAtAtZTkNq4GryidVihnwUqjSCkC
+tZGUmVEPiPVsEpcA5QMbMhLqnKu8SIzVUSSgwDJar0e1/qXzD8jMSqmORhYRQigICgatzJRMC4UB
+Rz5Di0auvfbuf/xkdPcDqXfFkoGHrLp/aqrecrOxiU457j2f++xpx61VwUrIpitJzwHpuPupP2hK
+9ILUZ0AMEHORtVWp3EmjoAI6ahdirvr053/64Y/27nwsBk8plFYNnz9UVrv32S3TdWD1qRf1PPdy
+vP4/HbViZalIiwiWQUBLuZIXFJELbC1PhWZcrpUygNBS0rA+ha3mmI7gCYmgAjiChUejQGwhthmh
+zACQKZdkcImdAfodYDAleY9YMEABpDOtYoAcoBE8tAEEzsEmv0K6c85aKyLU8M2qzYA+BwQUgtbE
+6IYf/Hjq0x+d2bjFwsfHDK/PJ7dPtaWOLlJbJV5zxbPe+ZmPLR1aAU8w5Nkb0tDUaR9ACKHD/kEr
+jxx6GpsvoLUn/eD6DZ//wAce/Na3lrv8CGBjDccPDKztHazWm1PbRtrO62rt9AsubL3mRSetWxcv
+HYaJgbgoWJPS+8t24MAUIQBzdUFovujEfnSsM3XAh04ZiqDnK+oweL5iSCdspjPmieYlThgihfLz
+ib1EUApKAyRoE5S4WHzYunnrtdeNXvfzydvuxtR4Uatk1WQqto/snZiqF7HtagXKBRd97G9e+9rX
+1mq1jhHpvT/Usi6/BfVtmHjW+cRGUQjf/MiHv/ahD2JqZiWiJooWMDRoT1tz3KBKH711fZKjiTRe
+MRyvXbPmxZef8tzL0dUToAFqQBRIg0wntU2gDqyRIILO3jQRiEEkJCT7+0ID833mHLQCUSdOf454
+ARxgOvEICOgsDFiAslcggINooQNtvqK14evfeujb107feX8+uovRjnrTvqOG9ozPjE/OTjZyC+2o
+fK/M9q895c8+87FTT3p6pVIB0CH990J9VkecejIZi4HovHXTNd/70j99xvz8LgWupimQtdv+2BV9
+fd09XWm1tnXvxOzstqIeklrfcWuWnHTiiRecu/q0tTj6SBgDY2B0AGVEHlaAbvi5dc6vlh+i/QeA
+5spAdYoN+blgF+7I+NwsF5ShzsgIouZ6lAB4Aw1QAILH1OTs1q1b128Y2b5t9rvf3/PYDslnu5H2
+DfZRdzJazOzLZooxnoR31cpYXjSi5NKXvfR5b3vzihNO6oIB0NFX+NWZ4ymjXnKfe4rK+zfsNXhi
+Yu9Pv3jVNV+6avqBB9ekFdNuWI0QsamUhpYmPaZc9ZZmXH2yvrfRqIO9tgPr1i454ogVJx2//MST
+eo5dnQwNolZDZMGyv9JQJ927o08i3p9apeaKdQEA8sdlXTo+wrkvRLF4AKKUgBlwcHmR63u3797+
+2I771o+uv3/2ka3F7t35zHhAWGmoe3Ag7e+daLfGJidbzbZrhwC0Udumi8e61Okv/s9ve9dfHnPU
+mjzLS0m5o8c7kr5fuR8SDpn6rF1P0jJEwc+Nex9gLGbgZif23PDNb//8C1dP3HnPSjG9cP2we1Q7
+sqjW0kqpXEkr1bQkTvJWe8PusSJws/AFaZSrtSVLlxyxvLu3Pz7jhEq11je4ZGB4uG/JYLnWZdOU
+tCJloRWUmdMnNKdYGhK0UhakAZIQ8sznhS/cbGNvc2pmdmRsesfY7LZdU4/t2rdt1+z4+MzUCLki
+KvIySXca9XQl1WopTuysdzP7phoTmRXllZlxYRaQKLo9jS950fNe9PrXnrLudKMtyAqhJVyed9bu
+r67Tsd9/c7Xz22SLu7zQRGp/QPOcLHIQBqBDuP///vy6f/7S+h/9uOrDCayzoplAxQQg2MRGqTax
+HewdFCBjrhduqtWabmWzWe5CyL32gAMHaGXTqFKxlZKNkuTIIa21tpGNI2UiFRlFRhShXQh7Kbxr
+t7L6THtmJms0i6ztZ8YUCwXWQAKUoNMojo3pHbCp1lUTx0LB5fVWfSZrtQpIhkQZ1sksqc1FfRuk
+d93Ja8498yVvfduRK49KVBoDaDGMgcUMuwrUE8pHOef2F9h5aqgXgCCBnc+j2ALgIEREuYNNO8KY
+Ze2kZB7evP473/7myJd+0ti+s78IQ4EraKdwBmJiVcpZaYrKaVSuUClGZMRqUXoa7CEZc9O56Syf
+arfq7axV+HEFZnhBYBSMIPACFpQFhhABiUaqUdaINWnC8EAt1qZiTBmmBJWySqAtwe/di8KjFXzw
+DlJAOUSs1YhJR/PGRmR2aNnJz/1P6y5/9onnnd/T21/2gY3OESx0JEC7QKTF/EpM1m9XuO7Qs8U9
+GFAGDO9RMKBhA4KGFuim59iY+Xz83IBzpHfefNOGm2/YcsMN43fc3jfZWiboB3oslEAFWEFKiIAY
+pEkqsRWtxEYSx4hTpDGiSGkbSDNzHrzz7MBBSAhC0GQUJAZiwApHzJ1MhXajHkIIISD4EIJ3Ls+9
+AxAjiA5MTahJqBH2O9lPAduPXnLuJZec/8xnrzvvoqElKzr7/XNZ4RrcqT8YAIg3UoevemWM6cyr
++52U7XY7TdOnivpDRS7BkFaAMO98bNtdt97+ixtv2rhx4/I77xdXH0S8qpz0urwvFH0E630ADMFq
+aIAYWmA1jIIt5irhdCwYAygoRTq3IiJO2EGcwMlcURUFeEEh8ARHcEp7EAt2huqUoo08/QiYjlqx
+5NSTjjvzrBPWrr3o3AujKIqi6Cll40A85dQ7iPCc4aFIgQWFC87/663XbLzttkdvuT176JF4155h
+wQroCjBAUSRUgtSga6AqJAYbcFsHQ0oRza0AAgOiAA+noDS0gvGElvgcwYMDKjlUndQ+w6Pkdvps
+lGUG2GSxdNXK1etOO+OyS8/7g2cOD6/qWKlcFFrrjvBi3hnwlJaGesqpn3PZCYNFk9pfXq7QcM5x
+keet+ui2R7dufmjbI5vHRnbO3rsln57JJ6ZNvVUN3APTpZQVqvEMAAUyUHq+D0QExnoOLQ4t+CaQ
+ATkQCLviNGgdSonp7+1ZuWLouDXDa47pGRw84elnVWs9UZpEiC2QADoHqJOTAvxqQbR/39QfpKhi
+CCJC2szpBYAB57y1RggzkHbRmpmanJ2cmBrfM757bHxsbHp6OkzPOOdclruiCCEQiwQWEaMikFax
+teW00tvb1d/b1dublEsDRwx3dXUv6R/s7+lPtJ0T7QByYhKar/QEFeb8PJ0AsScI+1NaCfApp17m
+jtLJK9pfQ1jAPngDQ0rBA50NfNlf/AJQnd10nltSSWf3Ccyi1OMugOKApQzJ44H4j1sb8mvR/4QA
+DsTy+A2iE2L4BK7/fVO/HwcEm4uI6BBAAIkoVQAFlAcE6M0FnZJqcuB+JrPtDJ0nEuGDV0rpufo4
+CtwJp5JQmruogAQS5q6vErhOIyx+v4wrUkD86/r93zf1nR0JkU6NFdpftyrjXCutoBjC8J3it6rj
+7ppfq6oDjgjzPXEAMxDJteDx0xQOqNQrEAQmFkLnugQAmsGdYuFq3g1HcA6l6PcwtR6I35PUi8zV
+KMQB4k9zNaPnCzh1RFMTRCDcMVs6vzA6WzWguY9AR3cDpcLNu5g7oj8/MDpdRfOvTmV1YSGt511v
+zAiETo315MBb7dzeU9wHi1/J+z8sDv/XhkXDYeoXDYepXzQcpn7RcJj6RcNh6hcNh6lfNBymftFw
+mPpFw2HqFw2HqV80HKZ+0XCY+kXDYeoXDYepXzQcpn7RcJj6RcNh6hcNh6lfNBymftFwmPpFw/8D
+b2q5fcfFSQoAAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_koenigsegg" model="fleet.vehicle.model.brand">
+      	<field name="name">Koenigsegg</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAsc0lEQVR4nO19e5idVXnvu67fbd/3
+zJ5LZnKfSQhJCElICBAQCIhUEFQIRWtRaQ+K90KhVU61pZWeI6e2x6PHx1qrFQtY5EHFihiREg0c
+7iYhgdxvc8nM7Nm377pu54+P7E6jtIY2M2n19zzZ2fvL96213t961/u+613rW0HGGPg1ZgJ4phvw
+q4tfUz9j+DX1M4ZfUz9j+DX1M4ZfUz9j+DX1MwY60w34ORgJgAFhDcYAAtAAggD4YFEACkA0gEyA
+twC41jZWFLARKmTcNQqQAZASaAgkq5FRIAAAAUIAGAgYhBCaaQlfBTrlplRGAxipECXYIFACjNaM
+Y6kA0wjDOEAGogJoAA6AwJfgWoAgBmNEgrHFJUgFkaszWgGmYBBoADASIYQAoVNmoJ9y1CulCCFg
+AAwYDf+so0aCTBSJgREJ5HAtfP6Ffdt3HOofnLdoXnnRrGzZYghYLK2WAmpBXqVPgQFABAwCBSpO
+Qo9nZky2f4lTjnoDgABAGzDqmIKiOBIW8oHnJaY7j4Tff+zl72/a8fzWV1rBGIpzp53WeenFCy+/
++LRVy2Z5SAsRccZBISAWaAKAQQNQUAAGNP211r8WFIBRhugYYWlASgBELA0YgGzfqX60ee/jT/7o
+8NDLJgk6cuHgAB8/mD88EYz6yC6ULn7D2rdsOHPVwmI+gyVKEIBRiIINmAEgjbAGdOo4t1OOevmq
+6xcAEgAnwALAB8cnHnz02U3fbzy9ZT9lWy86N3zD6cn8/N5Fs+vb9/e+MtK1bWTZphet0ZG4s+Jd
+vWHJ29+0bulqJ4dtCxSF1GEzABYkyuVkpkV8Facc9cpIpBVGGBATAAcn4Ac/2faPP97y6OYDkSDE
+FQ5v9tJ8nzYr+p+56oojm14cfPzZ5pFo6Yjoa0oDwRCz/DmV3NuvvOzclaetO6O3xADpGBAC4AbB
+qRLfnILUA8RKSYKdJMI/eHzr3z300ydeODRaV5ksbSmiswJwCGEPnnAHKjve/vaJR59a+9zP9kiW
+AU64h4nQJiA4saWuLlnQee2bzvzNN6+d25cDEEIoxuxTh/uZo16DURFiCIylFSAEQLSCCaosSXI/
+fUV+8ZtPfO9HTzeb9QyRRPkx7tIUhwBgMFDWFe7eMGv7TVe6f7dz8JFNB6vh3NCqGBcrHIEmSFlG
+KaqiLI5XDXT/1lvfcO2VZ9pcRP4Y8jIUHAwMGQAJYACIBhGD7UwzATNGvQLAACiNILEGBAaw1hAa
++NLXH/nC3/9w13AMVgcQCiAJRyBCY1EtYA4Vb13VuGj5jmLuUL7cNbIjPhiW9srT7/+p2nXA4U5H
+loRxY3+rYw4kBmINSVzJ8YtXL3rv2y65YG0F4wQDajVbmUweAEdhbDvWjBiiGaO+pZsOzhINRkmN
+fUx4LXRefqXxif/79a0v7T56tGGVepx8RyuMZBwBIx06aPpYgHZzqrdUqGDURV+e33tgx+SSQyMi
+RpVRX8VaK0mwztqo2KAvKeSA1QngQLUK2j972fyLzl72id89mxMgWOvYB4wwc0ODEQJ72hmYMeoN
+hAgoAAIwAvBETO598JnP/OU9R3wOGdflBKSQIkLIIIIRQmE4aDlDLqv5QS5p5AAnufzQ7FJtv+lv
+jQCYAujQLoax8U3iAerKq0ORNIo42M0CRolfh7gBIDauW/zx294/OIdy0AhiIRWibmywN+1qP4O2
+XoJuJUgaUnpxX3DX/37gwX/cAm6WO2VjjDQKABBCiGCtjdGqgt2jCQKNbc9f0/fKZaftXbc46Mya
+w0eKOw6aZ/YXfvJK4aiZH0AGWAIsZKoMKjbSRyrAWBPGtUGxUsz3u4rs9g+/8x1vXWEDMBNihIwx
+CP3K2HoINLg6BnzP95/6xJ/dNzyCsvMWNEWjFIWBNhG2gbmgMQgJBDucx2LPaZ3isiVHrl61Z0XX
+pAt2oNVYNOIO2wkqx/bArnrxyf38e08H+6o9ks6tIQEUYaYdkJAkJtEY2QTzEGsZTerW8Hvf+Ru3
+vv+auSWwQIKJAXnTTMBMutmROnzp3u9/4Rs/ONrExC0rkYBOClQK6kTEUcowEZZUrR/5FSIuXFZb
+v2Lvsr7dXPNxvxxShzEV1BqRnm1a0jXC5U2W53snMk/v7HvqBednvGMiEBOKJlbBEAeEoUrbmETE
+WJblNychmrzikrW3/O7Va5fkuU4Q5tPMwIxRv3fcv/Mz99778LaIF5FLtW5xRB3iRCKKNQHQFo4X
+0No6p3ZR0T8jr+cluxpBZ7VuU4eA3Yy9hrvYYv24sR0mR5tJzeiWcTFjRuSzVCt/s16/bVJvaTm7
+SFeN5wEQ6NCCGAmUSMLsvDEqGd59xtLOO2/5rcvWL57+BMNJp94AIBkDIRJRUBEFGZPMD3e2/uR/
+fv25nx0R2mRzGhKcxPmYGMj60GQZUMus8QsKuy4oHFhkR3bcIeLuWLYMNYkdsy6EuyKrN6adUWCq
+raNzIAQxqaKjQowqaBBbuhzxvPQbnOylznNx51P1zm1haYxxsEk2SYQQiHqaFqXkamz37EF628fe
+dvWKs8slICYhCIOmAKCMwUShk7akMS3UGwkAAlEGGozaunvi9+6+5yePN2Kb4SzTouUI7FqFSS2E
+aryxcHC1E13s+oM0wVI3pREQEayCcpgtyUx3K9MTGzeRhCmca7RUo9VPIeGQUCl0TfsjpHEEBZOo
+yLijlWOUJPwQKj6ZdD7erGz3vVHLwZbhcT2KNM/3GnDFxHhXxr7v7itXrRr0mEQAICkgUHByqT/p
+40xKzYgBQFoDIAwGN+vJjpf2xsBy2MY6MwGZFsJBWF+Ha28os8ugnueTRXuSxCr0mbQM7fVpb6Mw
+ULYcSWwlLJMkJhEGG6QMbeH9FGGOuGU5lmvZJYRmCydMJodGG+PEGmf5xJpjJ2XLX6Enh7X3t2ju
+7po9npTBsz0QEB+ZROYo7Th06NCZZw682mgD2gCmyIA5eTHnSaeeUARGAxCCQUkgChw7X+noP2xe
+NGoF8jttPFrqOXRe59G3kuGLUZVqr27QBLgmYwqzRPcsxec50O20dAsAIomRchW4QCkmHFRETYDA
+UoZFSsXGEFsRT7lEZnpzjaNO85AzPE7sJHJhfK51cGFe9ODhLWH396pzdvqVydHYshC3fWAvE7LY
+shAAGK0RBowAEOh0jfLk4KRT/+oU3RhAgDEAgOu6juOA9mp1bpHmm5a+9I6znztnVr1glIyjBi7T
+A/nO/TkTE4n9SR3oYaqHeMmSmGnGNXGRIqAxNgTHIS40FlOsME6MkSqRIkIythNBscrysNkh6ooo
+43KTzyQ9WVEyZ8ixpWTkvNpL3z0w8M3tp08E86g4OlcdLRQKaEqjU2B0EtdVTjr1WgM5Jkq6OJ3N
+McoVNAfm9h25ZNXW6y/cfVZPA47arclOSSy596is1WUS6xaHBsKHMCaSoCCQGBiPEZIOSpyIFGW2
+OwYSiQO+H8q4GYtQE0GxJlhJpFWCXK4CW41b0gAvCGNLh2mshzuLeXbojMpY70JaLsiHnpvY9gqV
+pdMd59UpFcIYNBgNBuBkMn/yqccYwLwqQSIizojtsnzB5q2Jmy+dePcFe714cnhnb224SA9JdiTI
++5XYlb6jsUdyoeXFCKFQ0jAJPYWZINRgTNzYcqNsCYyttUighmPhqQZRLcylYjhhWGhTNYhE0Eso
+QQqjsRiN1TCKhns6WvnejoqsdMkblh5Z1mt9+ru5fVDIZrP/HG8YQBi0OYmGHqZnM4gRQhsDFkXY
+AJK2w0plN5c7XHFH+V4RP91Pj3R7+BCFlh1WqrkiS6JSPTRIRha0MkwqG4RFPWXlI6/bz81RpJII
+V4TYTNTqSXEuK7DSLK5rKBmV4YgIJyGMiGVJo7MS3AhJwE1AMdUZZLorwxPkCJcv87FKQBYjJ5s4
+UM+bOJfLpURrpbChgADj/+RuVoEmzCEaQCTAQIKlEMwpFppyQfT9F8dZOVB5JqVD5ojMZKRdJRsY
+U8QySAKKE8oFzWjsIH5OxC3DLCOpUogaYaEY52W+FXHgRvDQVBTpxLkFRNRl0EjUtrwQkVRNAsYC
+yo0NQuukZjGOjOVDODnU33v4ldjaN1y/orKoNbuLISEMIZi8ygkCAEP/U7vZY3+9+k1jwBnPjlkp
+6SnacxqJPBo241bCJG+QKFcItU6IFEQ5mJVMpk/afQkvyToPEdEKKWEE0ggM05hoigNfIYUBwIBC
+QLjLuGc5vTYryKQG4SiJqqBiHFCQHmgKhB6ipKgzCmPuGsZ1wR83XczGGCM0rRukpsHg6Fe3FyIC
+RiMECKBSzkMpbMxqWusOFllV6yxVRYMQBMKtE39CtUaNCizbIR7XXAsS+rRFuWURSg0GwMhgrIxK
+jLDBIxJjSQhgo0BqoUApLCNOEafUJjmPQA5oCVCvQkVtdAnRvODNSGo7oqhZaD2H+rpmEfILlstP
+ak+cfDcLx7wXwsYgQIYA9HaUILZHGtmIuBZESHbrVtYEkWjJ8VEs6iQZ59C0Q8MaexLNkECk6OUF
+w4gj7SjsGZIz2NaICNawRVOKuqYRBoGiCCIRaVBjKmCC2zGnEhOuSCJBSdwwuXwBu5ZhDYRCyUwD
+0SiI55dzGE/3/pzpMDjpDjBAyABgAALQ25nv5lZzooxqkk94EyOVYChmTaYTyaOcDYQBxpgaCjEh
+PrgaKOztFliGtBXbIZRitxecTkRcHSVB2EriozGqMxoxIihHHqHUIhhjSihTBEtl1DhW40YCrnkJ
+ygDrVixrUMatTRJI0LzidKctYboMzlSTrwlAVzE/v9caHpJHdia9wyKaAGjpjHANsIAlhIBNMTJa
+gCYJsgghyGoVRngGewWTK2PaQVmHgaw0VHGX8A5H93i6asSETqpJGMZYoaxfNASAGYwNRwCIIEGQ
+REZ6fo0HNU3dyO5yD01K7JVOm5s/+Twcj2mhXhvAyCAAQAgMgM5lrFyhb+eL+d37x60aVgYMiyV1
+mgpaNlAglqBYAtIKGCKcOA43K0btDHHyhHtIMSWM8OPEb8StCFmWw3ssViHMx6yJknoiAtk8YHSs
+dCRxrCnWmCtwpMKJpQtx4kEcaaEnMd811Mh2dg4OdJ98Ho7HNKWpTfoH4XQTCGMsN5ubslUYyM2V
+LR/CenwEokgI6PJLxhAjjSaJyQa0M+C9MS+KJMMQVrEWvhAospDKUFHKKK601kJFKlBY0gx38o7T
+6YlQyzkNPQFmiKFJBwTRlgntMGbYoo0czha9bqZzMdjJKM12dnZ25dIM7n+xCMdBx2IHBATStAKC
+dbPRt6sL4sr/m+yfULRSbhGUq0Pdy7XqtSNx66DRvu2AwxhDuBGKGIkGIVQbTrmnDNYaUCYMWmMi
+LiGEKGaUMAAIVShBSiZzUIztJLJF4gTIRXbJyvdZVrGUsMmWU9uTMQNH99Rwz4+e2PDmswoSfD7t
+C4Qztvuzs68ztuN9Y2Lt7Bi3ElyzJg87uO4MHQAiMm7EcUxNwySjQjlU8xyy68zmxCU0x8FRhkvs
+GhYxWne0NDpRJkImBBUhFSEjyFizjgVlEXdlllKKW1pNmtBWuAfjAinn7LIQL7UwJHL5PM4hAfiV
+of6spQvn9pf3vNwnijHZr6LQmRwuFkJfOsRAjHSMlEKamATjwMKIuVG/RIkP1ZrTSrw66zC5Hhs4
+DobDxFeinugG8NB2pJcBjwEbzwwjTTFgwEpqpQMtY2WwtIdQ2EVzhJgifyUoUZU7e3ERxRZY083A
+jFE/mCer583a9sTCg9ovHWzgrJOTs7v1rqOYGlCgNQAGBJggoxMwuCHrxAWeI27JhTzhZeNVbImk
+BEeGKnGFsJWqgWopP2wagY1nDBKGTonWkQYDtF6QIFtHg91d0U+jEqOlRXMrCNzpZ2DmtpsLvXRh
+8cvfLh+MSt0dE5PEUNMcbR604+UY24AdaSAxocAtxZuGBLBkPFOwvDL3ikwxk4AMSavRagW5As0T
+p5tnpK0CHUxGraofNUPvcBEhRIBgjI0xxhhppDFGOLWE+8VCZjxf2DGS7ZuTq3TnjZ4BAmaMekPw
+aSvyE53klTJcdlY9nvRwFIi6a/zDcYijgGrgPE+cLuVUEppNVEER2oqwSIiORaI0ptgLaBxYDQSE
+Ikotgj2GC8brY5bEhc58EoiwEYXNUCmFOFCHUJu42UTxcH6h96DsHPkZvmopN+BLlCfTvutyxqjX
+GJYPlKyezmdrGM0Pu5u9OW0ZdZoOGo3xoDYSyjhy847by1gHNh5RURaDkCoASIzGBhjDGY3tGBOd
+KCWVUcAAW9h2MCMW4YOcNJAZ1cg1AMCyzKlYPMcQEg4lJENe3Ibj0Lv0zD4N3DVNQLlpZmDGqCcC
+FpXLc7qWD+3Z3pjEZDRujT3fSBTsm0tjRgPuCABsmrZJPCw4J32J5WiWwW4h63CNKEPSSoKYhRgZ
+TA1DCdahiRtist4SgawHNR5bPHR5wjHGoStqIzXpCN2VKZZkqOovHil1509/87pzmQKAcPoZmNFX
+i0J411r68Sc6Nj225KJ9TQiWUeuAtrhEWjgCZwAbgg3VLU4Ecg8pQCRBRmUpFGPSLex+hWjojuWT
+SS3HJDRtHaAkQRohREwF8gZpgw2yASFEYqNahEg7u2cJTXYc7LCfeqW87OxspkPWQBfUdG+4hBmk
+PuRCAz1v7bzyrJ6fvFR+k6MCYXXmB5qxjzEmKGuMkVpJIwlowKblUMBK0gh7CXICxiUgkxj/KHYU
+VYJKgloEMEXYQhgDKHCMplgBBpRmJTXWmsl6tCebndgVLGtF3kUXL9BGZZAFRE//i/MzRj2Cegj5
+1YvKS5b1bn6kEp0/HJADTYM9CqAokQ4oZogBK9F2qHmschbPYKeg3Q5OXYosRRn4Ac/hLOnEpB9D
+y+hmIuoiaviRHwulsEAoIURi0ADMaC4UVtid1F3WEy90KMhfelG/1IpLkFZEpz2+nDHqbe0hMKDI
+G9Z2/8kPii/PNRecH+wfx/YYj+tJWIuRduwMtSuAygAedBQSw6ViEbIh1gaEzXQ+SbCJJpDFIUuV
+B6YTE2NZCSORdqpSNqWcVLIZG2Owg2ge8QztyjpDZsGzm8tLli6YX3ClRFxBbIBO+/76GbT1jhX7
+xuK/cc7CvyoV7z0AbzzHLTHLsXDgKKBaRgBZZJUp70E0xzDxFdYRTgRRSisDigDTSEc0kEQgTDRC
+hlJODLYZc0mRFWIuQhWEMjbGWHnqdjhWgWU73R9snT+K7fe/dZUFFqIYdIPoHEz7O50zRn0LQ4ZD
+DcNgT2nV4r4H/qny0a56oRFM+DUQVEZUSx1V4/pYQvZK5Eg3Z3HPZnnLKxHPFsC0wVLJpuFlAEYV
+JSECX8tGEjbqkR8FtTLEoAJtIgMAelLLMUVsvGceu3+LLnVYV21YyDVWGID6tpnuyBJmkHoOGoxD
+ADiIt1y68OF/Wv3tp3a9P7vXlwWKiU05wlhqKeuJqkljVGBDzDCyISiAySFSTFhJxwZE1SR+gicF
+aVDaRDoyWjBusIw0IcTCNuHYGGOUgYbWDXhihD2xm//We09bWKYmAeCgsEME/AppPQ9CSLxcwQcQ
+Gy7rLX9p3qaR/TfnJl0yW5okETGAwRgz7FiSIY1R1FItCIVujSCVk7zXcYEoy+2tOuFYFI1oU2MQ
+MaMNcIwtxO3QIJ1ArLXURlMgjHCG2eihPun0X33JOlACwEJGRsjzBACbbgZmjPrE9aQLJmYeh6Lq
++6MbVn38A1+/c8GVf+J/94Dp9pyMUcmEcXI4wMlo1e6x7cApq1yhYXclrIikY2nmmsgI4bCyS+ca
+6SvREKqWJK1YJSaIC1iMdDsZ1Mq5lhuK/ZLrGhS/NrHwrZd2LxuoAKEgBVHMI2DcGE176nLGqGcK
+GAFkIQDqeHjtqiULTlvy4gSoiyDrV5vjSaIdYgUsN5brUaEV5bKcc65QFjhKqFZGGBQrGvgWwhgT
+j9ASI5pYia0FV0p5DS9u8rg2kTjoaBT0VgTu6v/urs5sRm+46OxS0dPgY+YcWzmegeNCZjCuD8Eo
+QCjSDGNYOhefe/H6z9+7aYvjrcrK2I+EKXV2Mq9U5wOm7LYa4AvMRJSARgQIAuCUWYRMxBEARghh
+A+nUKeWxM2eroNyiRlsuqgW5rtJ2Z9ZXRvPrV/dfumE5A621xEiDxkBgBiz9TAaXmAIIIQwwDwAc
+EG998/ovPvr8/3q4708WVnsn/YbvR1Wnblv+3jjnJXigk2fAsRB1JGCdJKACFPkER4QgygknQLAi
+SSTiIBKxPLxjXwbkZIOZRHTIxjjMvXeEVYcy1962risPBmKKCej29vlfJa2PEbMAJFIGwDIKdLD+
+zK73XHPRl+/OXKGf++1ZYAu/VY2N1Y9HcAGOTuxQSRHjHEUVQ8uGZxlxXcs23LdVJJWvZVPHNZnU
+TNxAIkAeMC4pZ/2uCuaw+NujlR/tK7ztjedceM4SCiBEBMzWBjAFANBa/xfcAvVaUAASGKdMKEBY
+A6YU4ANXr/67e/c/MBQu68crumM1PEmcDg/b0KS5JGMC1DjCx/fHqhiTzsibFSNHTOzncTOOJxNV
+NzyyXJ3JmAJHVpCpRnVpcc2I2KXsBw/iVjH/vutP68xRAoIyDwAjTADBTL04PHPBpQFAQAwQGRjM
+BfOUkEu70X+7fu7Xv9b91eHR/JwgY9c0G5VEjVkxcGm5GUKol6HGo5BTLCcUCXnJxp7FM1SVgIYE
+QuWHjaYwCYskY51yT8jwvc0FP0VdV12+8qzV3VQLQBwBU9pgggwAgMJ4Bo5qmTHqqUqAcNAasDGI
++AAuoxBWP3rtivse3/XoSy9e4cAFnUxaQZM3SW+H7BjycgG3DHdAE5MoCYZGMY0I4xoRjYimSBId
+6tCPkzCyJjqkl++afP4w8jaF86LS0t/5jfUez4HRIA1QSLfOJyKxGP3nPbnTycA01zelZg4AQDAQ
+DwMU04vO3Iqz/+M3Xf57t6KvDh9Zfzay+/xG73iR+LGbCZM4ibmbOI4IGAknsdVklaCpLFsAgsgo
+YBKyTUKIB3mrRVsjjdrE3L/fVtqqez50/epzzvQMMECvzp7SbfQWS3db/iq52deCJYuXrMpfssF9
++sHKX23W1y0cr2QXV3tFtjBm55EuqNCuh4lkilFNrGhS5gqhqHJsbF7GyjKhSXzVqsdmQhTHDjyt
+zrv/0OzL1vXecsVSYTjVCUz7C/mvhVOOetD5gRx84t1r3ru7/oWdryx1nQ1yRAyRBstAJ8V9whR9
+y3U8t4yYgXjUD6y820FAxaN2NEKhAaqlVAvjpDqO539pZ67ZsfSj16zvL+mWIQyfQqeNnXLUSwY0
+qK9ZOP/dv7309z/T/NIR6Jq3d6BqGqoHhqnc0UAFEReDuKtGKzygShygMYHGhK+GcSHMuaHEUWAT
+S3Z2ffboiud14ba3rbjk/MUaxW66zfmUOfvsVDlv85+BNHgIKLzzTWe+9/Ilj1bZFxr9YzlHZI/o
+zATCkuMcwU4kWkqLDOsol7BWMQIr4+VsJiQdE/lqWKp9N+675wi/6to3feS65QYnAbIwyEidQvKe
+clpPVTMipg5BB8v/2W9dfHBYffP7pcXnvPjeC+r5fBAmsbEKKFMJ9QgzgkROmNuPLdm7cJYb8HDk
+CHd0jXU8vz/5s4fxeWfPuf095+Y6sC/qnGUSsOipJO4ppAWvAueRyZbBJgmUuzN/8K6zFvUXP7+j
+8yf1xdX+rFl0RJSGlCdwDlAmVjyWSGGbJzQO3FE+Pzandb5AZv/Ny/2VRcv++01vWzaLG8AeYxq0
+BKCnkKk/9agfA7AEoQ0LcG2SwPmrsl++a1HDPudPv1J46pUMAZKLjTNOSB1JLUKeZNU8V/fLhoOE
+xazcroP6H3/qPfnyBZ/98PUrz5wPBlBUA9AxOAAAMphh8abglDti1BijtUYIYYzT1EoQBM8999z6
+j267MPvCrVfuWb3maFPWOQ49nYRj1kjUo6jMJkEHplvl3A99095zZOArd9yy8a0z8KLICeGUox4A
+tNYAgDF+9UB1gCAIvvXEwY988v+4fuvTl0cb+n5oeUQWljWRP9lElbFxnTQfD1b85ePzh3342M1v
+fN+7r5iBrcMniFOR+ja01kopxhgASNB3f/Onn/3cC96B/b+/duubF+0MsmGjv6wPh+jQxGH/3E9u
+WbAT9f/pLZf/zsbFzIlsmIGV7hPCqeTyAQDAHAMhJE3kKqUQQsTA71+zdnaXdcsd/h1PLqMLO65d
+82whPhgGvVuSN9719z1Hdf//+KP1N1y3yAEURjXbPtWpP0W1XilljKFTg0ElALMQat/a9LP//rkX
+D0+8/MENez604sj3dvZ+5jvddbb4Tz966bsuW4R4gIDxpACnSr7gNXGKUg8ASikAIISkpl9izCWA
+AOPoR/cfuv1Tm3c/uf3iM6qbRrI5pv/0tus3bjhTQSISWqAUYoAZ2MB6YjjlqJdSGmNS+55GOFpr
+Y0yVkE4lIaTGgYTIvbuDL33lpb/4xrfmrF52z10bzp1XAHASrEFibgCIADztuztOEKcc9QAgpUxN
+jTFmyousMgHAEFLhQEQh2zoqwse/Pzmwgg12zXMpgE4AOJBYoVhAbvqPhz5RvB7qU2Wc+qAxBmOc
+JAnnPI5jy7KklBjjqQFi6jynLoEetyLaZrx9XQhBKW2z374hhRAiHRxp4e3PV7d0TylcCAEAjLH2
+I+3mwbH/Eyjt5jAM2ydx/ULBU/8/tSX/Uj9OAK+H+jabU5FKlbZpKinH8Zt2AAAghNKe+PmmH8da
+Guq0L6ZVtIVPkoQxhl49EhpNLSFVhePa+fMdDMf6LH3cGBNFkeM4vu+7rpteFEJorS3LgilcT60x
+jmOMcVvqXwb/rkSClDL9TJIkFaMtVXpDFEWp4gshUreJjgEApvLe1gAppZQyvRkAGGMY49QBpLel
+VbRZ45y3S0iSJOUo/de2UidJAseipnbjjTFSylSR0yalgwMhlDJoWRZCKJWFMZbyDse6IS1BCJGS
+YFkWY6wt+C+D12/r03B76uhOhbcsK1W3dPC+1tkDxyl726NOPYppahUpfN/3PC+1ae2LUkpCyHFV
+TB2aaV0/b/F+/v7jxmh7+LYFTGtpW552+a81gv8VnLDWp7qjtU7tQBiGSqk004IQsiwrjmPOeb1e
+bw/2dnOTJEl1BKZY5yRJkiRptzj9kqp5e1bVFs/zPABIaxFCpI+nvKflw5Q8hDEmjuO0zLSKdmlK
+qfbAmtqedIS19ZoxlpbQtnXpzzbv7YHSHtO/PJMnTH0qZ9rQo0eP3nbbbb/5m795ww03PP/8877v
+f/GLX3zb2952ySWXfPnLX05Voy0nxphzTinVWsdxnLYSIUQISY11+jMMw9SqtM1I2yYYYzZt2rR8
++fJzzz33j//4j9PTytodnA6R9HvawQghSmnahvS21JqlUrRnDHDMn6c8ttsTRdHUB9OURtvctwlJ
+dTHtiRMyOCecSNBapyoPAK1W65577qlWq4VC4aqrrnrqqafuvPPOw4cPY4xvu+02xlij0Ug1DgBS
+0qWUnue5rgsAY2NjUw13EATFYtFxnDAMoygihFBKoyjSWruumyRJoVBQSp122mmu6+bzeUJIrVZz
+HKdWq7muyxgzxqSjsFgsBkHg+37q+VMjppTq7OwEgGazmTqhqRERQqhYLEopG40GpTQIgnK5nH4f
+GxubM2cOAFSr1dQl5HK5KIqklGEYViqV49z7yaK+rUqp+6pWqwAwZ84c3/c/97nPHT58OJvNfvaz
+n92wYYPv+3ffffcPf/jDVNFSZzt79uyNGzdee+21X/va1x5++OGhoaE2Nblc7sILL7zlllv+4i/+
+4qGHHurv71+8ePHBgwd37NihlFq9evWnP/3pkZERx3HiOF68ePHIyMjtt9/+/PPPU0qXLl2ayWR2
+7dpVr9cvu+yyP/zDP/zkJz+5adOm1HSkDejr67vpppve+MY3fuUrX3nggQcmJiZS9imljuNcf/31
+N9544/3333/PPffs27fPtu2NGze++OKLw8PDjuP8+Z//eRAEn/rUp3bv3p3L5dauXWvb9pYtW5RS
+H/vYx97xjnekXfsLz657TZgTRGqFU3zve99L1XbRokVveMMbMMaU0o9+9KPj4+PGmPvuu8+yrFQL
+li9f3tXVldb49re/ffPmzbNnz0492ODg4Pz58wEAY1wul59++umVK1em/zRnzpxU3VKRnn322auv
+vhoAOOd33HHHXXfdlRbY19d33nnnpQEJAHzkIx/5zne+kxboOM6KFSsGBwfTO9/97nc/9NBDtm0z
+xiila9as6enpSY3PypUrH3vssRUrVnR0dADAWWeddd5557VV+PHHH3/HO95h2zYALFmy5JxzzmmH
+/9/4xjdSr3OiOGFb3zZncRwHQZCO2b17927evJkQsnz58ltvvbVcLmutDxw4EMex1nrdunVPPPHE
+zTffDAC2bReLxeHhYcuyhBDd3d0PPvjgzTff7DgOQqhSqaT+UwjR1dX11a9+9W//9m9PP/10pRTn
+PIqirVu3WpbleV5PT8++ffsAACH08Y9//LHHHlu3bh0AUEoHBga2bNliWZbW+uKLL37yySc/8pGP
+XHvtte9///s3bty4e/futOp8Pv/II4/ceeed6Qj2PC8MQyHE+Ph4b2/vt771rVtvvdV1XUppLpcb
+GBjYu3dvFEWdnZ2f+tSnHn744Tlz5qQd09PT0557nxCTJ2xw2rM4pdShQ4eUUqmDSt1guVxGCKXB
+3969ezOZjFKqr68vNY6p7+rp6Wk2m9VqFWM8Pj7+B3/wBwcPHgzDEADSicyuXbsAoKura8mSJdu2
+bavVaqnrI4RMTk6mgUo2m923b19aaX9/P6V0dHQ09cmlUmn79u1pGx555JHrrrvOdV3Xdbu7uy+9
+9NLNmze3Wi3btsMwvO6663bv3p0q06xZs7TWY2NjhJCBgYFSqUQISX1+NpsFgB07diCESqXSwMDA
+/v3705iKc16pVOA1ppn/wdS3XYrjOIcOHcIYu667YsWKarW6bdu2LVu23HfffR/+8IcBoF6vt1ot
+ALjgggsAYOvWrY7jBEHQ09NTq9UmJiYQQgsXLgyCoLOzc+PGjUqp008/PYqi1Md2dXVlMpnDhw+3
+Wi2t9dy5c4UQQRBEUdTR0UEpHR8fp5Rms9menp6RkZE0vNNaL1y4cPHixdVqtdVq+b6/devWgwcP
+CiEsyzr33HMnJiZS7z04OJgOkQ0bNsRxnDqnRqOhlKpUKo7jPPvss4yxKIoWLFgQhmGr1bIsy3Xd
++fPnP/HEE0NDQwBQKpUymUyaloATTCq8ntlsGiwihF5++eX0ypVXXnnNNdcwxlqt1te//vX9+/dL
+KXfv3o0QymQyuVyu1WoNDQ0FQZDq78jISOoYLr744vvvv/9d73rXmjVrVq1atW7dun379qWxHSHE
+cZzJycl0QPT29o6OjqZDJ5fLGWMOHz4speScG2O2bdtWr9fTyA9jvHv37pUrV65evfrOO+984IEH
+Vq5cmY5FKeXIyEgaRF500UUPPvjglVdemar5woULx8bGoihijOVyuVqtllqYlO40bEvDLd/3Dx06
+lM5jent7bds+bt73S+L1rFKlEfHk5OQLL7yQTmQGBgZ6e3v/+q//emRk5Jlnnrn33ntvv/32yclJ
+Y0yr1brrrru++c1v7tixAwAqlUqlUvnRj36UBqmPPfbYjTfe+OSTTw4NDXV0dHziE58YHx9XSmmt
+Z8+eHQTB9u3b0yzNrFmzxsbGjDHpNMfzvCiKjDETExMbN27s7OwcHR0FgI6Ojnw+f80116QB6I9/
+/GNK6bPPPmuMGRwc7OjoGBoa0lrbtv3www+/8sorO3bsGB4e7u7uHhwcTKffcRz/zd/8zYEDB555
+5hkAiON42bJlrVYrSRJK6fbt26+88srUWgJAqVRKtQRO/P2I1xPXpzk/hNCiRYsWLVpUqVTmzZu3
+bNmyD33oQ//wD/8Qx3Gz2RRCvO997/vOd75TrVaFENu3b583b15PT8+GDRuuuOIKxtjExEStVqOU
+/uQnP5k3b97ChQvPOOOMm2666Wtf+9rKlStt277wwgsty1qyZMkll1zSbDbf8pa3WJa1fv16zvmS
+JUsuv/zyG264YefOnb7vr127tlar7d692/f9XC7X0dFxxx13PPbYY0EQpNH92WefncvlNm7cuGLF
+ig984AP5fL5arXqeNzY21tfXNzg4eP7551999dXPPPPMO9/5zn379jmOc8EFFxw+fLher2OMC4XC
++vXrP/zhD2/btg0htGbNmp07d+7bt88Y09XVNTW1d0I4YerbNcVxfMYZZ+Tz+TAMf/zjH2/evDmO
+47Vr1zqOMzEx8cUvfjFJkiVLlhBCoihyXVcI4XkeIeTuu+8WQixdujSd1p5//vnj4+OWZc2dO/fz
+n//8+Ph4SvrOnTs/97nPjY+Pr1mzJgiCrVu3cs5Xr15NKR0cHKxWqz09PbZtJ0myaNGib3/729Vq
+VWu9atUqYwzG+PTTT09byxgLwzCbze7Zs+czn/mM7/tpq8bHx88666xGo2HbdqFQ2LNnD0LIcZwl
+S5akBif1scaYUql05MgRAFi1alU6JTxw4EDbOTuOk87VT7gPXkdAmkZjaeycplnSz/8QoNdAKlIa
+53zwgx+877770pE+Nc+DELr//vu/8IUvpDH+L8RU2dOfhJAFCxY8+uijN954IxzLraZlEkIymcze
+vXvf8573AEAa108t5MEHH2wTcqIcnrDWp05cStnV1fXBD37Qtu3UF51Q+uJfQTt5ObU700guzQpY
+lnXWWWflcrn3ve99lmWlOo4Qsm17+fLlV1111UMPPfSxj33sX4800rWRdFpOKe3q6lqwYMGb3/zm
+Uqlk23aaTMYYe553xRVXzJs376KLLsrn85zzNImdutZzzjln3bp1aZoW/csFg18GJ5w0nrpAk9Z6
+3OLRScXUdPHUBZn0euqfGWP/epQ9lSNzLAsLxzL4aZlmSq47TbqlKp9GB8fJa45ly6c26d/E68nX
+pxWknyfa1f8etFed2vL/wqWxf9PgHqcrxy0SpD/h2Dpau2PS6+nPVOp2Ra9jPgWn4HbXXx2cMPXt
+IckYS9cf2qsfJxvpmjsApNOxtppTSuM4Tu2MEAJjfNwyyHGYqqGpx2uvDaSPt3+mLkdKmSaZ08GR
+plphyiJlGu/BsZWTXxL/H9nwvueiT4cTAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_lagonda" model="fleet.vehicle.model.brand">
+      	<field name="name">Lagonda</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAZ0klEQVR4nO17aXQc1Zn2rVtbV3f1
+plZ3a5cl2ZJtecELtjCxLeFgh0zGJjh8DM4McyAb+TGHwBAIgUzClzmZQAaSnHAwOd8hMxAmjMNm
+7ASGzw62MRgkbzJYlmW8aLG1tFrdre6uvere78drVxrJhkkmcfs76eeHTnV1Vdet5773XZ73iqGU
+ohKKAVzsAfzlokR90VCivmgoUV80lKgvGkrUFw0l6ouGEvVFQ4n6oqFEfdFQor5oKFFfNJSoLxpK
+1BcNJeqLhhL1RUOJ+qKhRH3RUKK+aChRXzSUqC8aStQXDSXqi4YS9UVDifqioUR90VCivmgoUV80
+lKgvGkrUFw0l6ouGT6CeFuDyDIhSSgiZclw4APdb95rC8/AR/rpXOo5zOYb+B4K5FKeUUoZh/jsn
+/xwghDiOw/M8usCj+1zXFAghcJJlWYZhbNvmOA7OsywLQ4Vr4LIpv1N0XInUO47Dsqz7RJdKQghQ
+iTHG+Pfr1TAMURQppY7juF+51MNHmJg/98j/IFySeheX31jcCYYDx3EsywLiHMdRFCWRSIyNjWWz
+WVVVWZYtKyurqqqKxWLhcJhhGMMwOI5zJ++iv3wl4OOoLyT9sk2ASzc8yzAM15ANw5iYmBgdHR0a
+Gjp79mwqlcrlcoqiqKpqmmZ9ff3q1atXrFgRDocVRUEIeTwejuPcNeSugCsEn2z1RYSiKAzDeDwe
+wzDy+bwoihA5CSGGYViWZRjG5OTk+Pj4yZMnDx8+PDAwMH/+/I0bN15zzTW2beu67vV6BUFACMFc
+/n9GPbztZR40pTSbzbIsK8tyKpXq7++PxWKxWAx4RAiBW4eVATG5v79/69atL7/8ciQSeeCBB5Yt
+W6brummasiyLoujedVFHVBR8QpillJqmiRASBAE+XgafY9t2Pp83DCMej+fz+b1795qm2dHREQgE
+0LQg7I4Hzu/evfvJJ590HOehhx6aP39+MpnUNK2mpgaSpSsKHCpwr/BKrlvP5XLJZLK3tzeZTLIs
+29ra2tTU5Pf70bQwUDgfkPnBPIF7tSwL4/Orh+UYRCillDAc+mjwgAsYiiCfCYVCCKGTJ08mk8mO
+jtV+2YsQoQ46P0iECCWIQSxhEIMItVmWIkRWt1/bUD/j4Ye/v2vXnpkzm2U5YFmOZTkIYRiSa2oc
+h23bxhgTYrtWRSkD4cENEnC9u+jdbLUwg3LfN5lMHjt2jFJ6/Pjx5ubm5cuX+3y+Sy21qVYP1+m6
+3tvb+9JLLx0+fDifz/M8f+ONN7a2tsZiMUmSLMsKhUI+n0/TNOA6lUpZluX1en0+H6wP9gIwRpBu
+sywP+R/kKu5wHcehlLoZIcacaZosy9i2PTk5uWvXro6OjlgsxmCHQSwh2HbQe+92Hes7kZrIOI5T
+FvDXz6hd1b7S5/NgjExDEwVpZHh467btbW1tLS0tH374YW1tbVlZyLIcnmcvMHjeSliWKfRdrhk5
+juM4DiEE1n0+n9d1ned5WZZhVhBCbuyxbVtRlHQ6nUgkhoeHe3p6nnzyyUAgsHr16i9/+cvt7e0X
+tfrzRYdLBMxkb2/vT3/60y1btlxzzTVLly5tamqKRqNVVVVer9fr9cKYdF1XVRUhJAgCpTQYDHo8
+Ho/Hw/PnKbZtmxBiWQalVFE0SqllOY7jWKZjWRZFlm3b8NqUUriYZVnHcTRNkyQpGo1mMplIJLJw
+4UIw81xO2f3Wu7/Z/kbnewfzim6aNiHIsbVAQG6ePWvdZ67feNNfx6OhieSo5BH6z5zt7u4eHh4+
+ePDgokWL6uvrDcNgGMahBFw/xpjjBEmSOI7jeZ7jMMRkQRBEUeR53uv1IoQgT4UJAKJ1XVcURdM0
+nucxxoFAwOPx6LrOMIwoiqIoPvroo7/4xS8URclms6tWrfrBD36wYMEC8BaXpB5OWZbV3d39u9/9
+7ty5c7Zte71eURQDgQDGOJ1Oi6JYX19fXV0djUaDwSBYBMZYURTTNDVN0zTNMAzTNC3rPLkwREKI
+ZVmCIBBEJUkSec51XKIoer1emDNARUUF/Hhz82yYklMDiYce+u7be99T8rrPH3YchjiU53lCLU3T
+dF1HjD1v7qzvfOebq65dPJ4YRgifOXNmz549uVwuHA5ns1nHcdLptOWYtkVyuVwmk1FVHayEEMIw
+LMdxPM8yDCMIAsdxsiwLggDM+v3+QCDg9/uDwSCsePgWpmRkZGRgYMC27VAoNDY2dujQIU3TFEUx
+DGPJkiVXX331LbfcEgwGL+JwpiS8lNJMJvPOO++kUql0On3mzBlN0+DxXq83m80KggDPFkURini3
+oAcbgQOe51mWlSSfx+Px+32CIFCG8DzLC5zP5xNYDzwOYwy3uM4UY2wYhiAIhJz37AMDA3f+w8N7
+9uz1y0GMOUIQwzAsx2maRikVRY+qqhgz2ez4rMbqf/rOP664Zmk+n4Uheb1eiGTJZNKyLMs2VFXN
+ZrOZdFZRFMuyTNNUFIUQrOs6pdQwDMsyTNM0TRN8LxgQuhDGWJaFoA3plmmaUMQFg0Gfz5dIJOCu
+urq6+fPn+/3+1tbWRYsWTU8Rf0/9lKLJNM2tW7eOj49HIpGenh5YazzPC4Jg2zY8HpaYJEksy0L9
+AhdwHCcIgsfjEQRBEDwYY5/P5/EIXtnHcZzg8SCEcEFsphRRihgGwRnHoSzLuE55YiJzzz33/Prl
+fV6vF2YCY4wYYpsGYgghoPMgx3E4FmVTIy1zGh//10fqZ1TkcjmIIhBOEEKaprlr0TAM2zFt2wbL
+dUxECLFsA6gH+izLAnXINE24C0prOHYjMLBBKdU0DRZNXV1dU1PTxMREe3v7okWLLu7rodYAu4Bo
+4wZDiHKBQCCfz4+OjnIcB2EHWIYKpSCcYpg5MHzsgqGWTURROnjoSGIsRRAWBAljrOsq+FaYeJ7n
+CSGappmm4ff7HYc4jqPrpiAIXZ0Htr36KuJ9sj+IEBI4Xtd12zYpcizDkDw+h1KPx6toqmPZLMs4
+lta2fPmcuQ26rns8HuBL13WI9hzGCCHHsUzTxBiZls4wDMexjmXDeBubZpSVlQWDfowxQsQ0bTcF
+cAVR8IGWZcExPMIV9aLR6Ny5cxOJRENDw/Llyy+VkU91ONMzRcdxXnvttS1btrS2tlZVVcXjcfA2
+4E84jrNtW1VVWLm6rhuGAdPJ8zzP87al5hVdELw//OFPOjsPM4yEqCDL/qrastHRUUVRYNHoui6K
+YjgcjpSXHe/tYxjGNG1CiG05zS0tdXV1GSXV13dCU3REseM44XC4oaGBZdnhoTMjowkHUb8cDIcj
+iURCzysMxh4PYlk2n8sJohiJRDDGtm2Pj48jhzIMcqiFGRQIyJquGobKMBgztkMc2Sd/6cu3z58/
+33EswzBYluE4AdY05G+SJEmSJAiCq8pBpIEMJ5fLnTp1Kh6P33777T6fD1KSSxVxHPpopVqozZ6/
+guMWL168Y8eOHTt2rFy5EiwdAiPGWBAEnuc5jrMsCyxLFEXbtiFl5nneIwY1nWJGjJZXMAgz2CaO
+fnXb0nvuvfvRRx7f+1YXcQTiIEHwIsZ88Dv3Lmub+7+/9/hLL/yXKEhNM+O337EpHA6PjCRqqisY
+xP7wXx47dar/U9euuHXTzZPZpGkpsbIb3377reef/4/Guppvfeuet3bvfeaZ53Td/Jtb/54Q8p9b
+fnXHHZuqqioGBwd9Ponn+de3v9bT08MgtHjxkjvuuKO7+9Czzz5rGIZDCYtZv98vSVI2mw2Hg4Zh
+oPOJEAeZj9frhRUvSRJQBImDqqqKokxMTBw8ePD06dP3339/OBwGJ/Ex8tEldVS3RmcYpqam5nvf
++96PfvSjN998M5lMzpkzp7KyUtO0YDAI3hA8DMdxHo8HqHf9GM+hYNCfndSqqispshmGQQz1ej1V
+leWImtRRGeQxTVPJq+tu6Kivq/zgyNFbb7nl7d0HxsaGv/bVB+bMnXnXXXefPjUQKQ/9/W23l0VC
+uVzkgW9/c9++vT974seOY7WvvO7OO+88depDy7LKysq+8IUvpFKZX7/wQnVlfHJyUpa8S65aODAw
+8Oy//yIYDH7pS1/66le/+vDDD2cyqRtuWKeq+SVLluzfv/9w92EWsw5xysvL/X4/x3EVFRWSJCFE
+RFECO4NIBtkzRAhw+slkcmhoaGxsrLOzkxDyyCOPLF68GJybS/dFZZhLUj/F80QikQcffPDnP//5
+jh074LyqqhDTwfDBw8BUMwwDySIhhBeYbE7L5bK1NRWCwNm2hahjGLqp5zjWxtjO58dYzCJkf/7G
+G7a/+uLWrduefWbLNW2Ld+/OtMya8d6+vSd6e2bNbL162eKhgTNKLjV3TpNP4v7rtW1qPmuZ5s6d
+//fmmzeuuLZt375948mxrvf2r169sq+vN5+b9Ii8ZaqU2PncpGNZibHRrvfee+CBb9fX11511fy5
+c+fcddddt9122xe/uOnYsR7DNBBC1TWVoVAoEglHo1HIp8GrACFg3VB8QOzN5/PpdHpsbOzdd98t
+Kyv7yle+0tbW5tZcbjF8UV//CdSDDADh2+/333vvvfPmzXviiSd6e3tbW1vj8Xg0Gq2rq5NlORQK
+QXCXJIiiOqRuhulIkphXsuXlZYGAN5kcRwh5RCT7fI5lIWohhCghHe0rV7S1TSTH5rTMEXnuc3+1
+dteu32YnU/FYOUKIOHZZWdmnP33dihVt/7nlV4ap1NRWHTjQiRgmEon4A75MJsOyrCAI27ZtzbZn
+7/nHb1BqHzhwgOPYYDDAsth2TIZhqqorOI5FiK5fv74sEqqqrgiG/NevXfPqtlf27t3LMExLS4sk
+SeFw2LZtMCAIRRBOgW5VVVVVnZiYGBkZSSaTg4ODiqJcddVVX//61+vr610znxIyp7P/CQ4HCiK4
+Exo9n/nMZwghjz322HPPPbdgwYLm5uZEIlFVVVVeXh6NRiVJSqfTsB6Bi4A/5HgdRclVVlZXVkST
+yVFeEHRd88vBm2/+X7NnzxEET39//6ZNfzM2loiWx++77743d+1cu/bT119/3Ysv/fob3/jGg99+
+oPO9g+fODcGM9vT0dHd3/93f/a0g8Kqq3nDDZ7PZ7BtvvNE8a3ZlZSWl9Nln/33evLlf2Hhjz9H3
+MUNln7R82dIb12+ora1dv3791ldfrqiMrbi2rbOz8/HHH+/v7zcM7YtfvHXfvn2hUOjqq5eATAIv
+MjExAcYrSRLP86qqZjKZdDqdSqXOnj17+vTpQ4cOqap655133n333YFAwO1ZAgrbk3+A1aMLeo5b
+64P/Yhhm3bp1zc3Njz766LZt286cOdPY2Lhw4cLq6urx8XFRFBmGCYVC0WjU7/fzPI8Qw7JYlmVR
+5K9fu6bn2AeWqR/pPvSznz0Ri8WamppEUWQY2tfX9/TTTx85cqS2tranpyeVGvd6vb/85S811Vi7
+dt1NG9cjhn3ttde2bftNJp375+//8Lbb/raj4zrHsScnJ5/42ZPnzg5Hy+O/27kLIUwp/fGPH7cd
+o+/DE9l87pVXty5evLhjzXWU0u2//c1TTz3V3t7+yiuvbN68edmyZV1dXatWfaq1tdVxrE99akV1
+dfWxY8fcIlZVVU3TRkdHIeRCCtff39/X19fT05NIJGbMmPHd73735ptvliRpeix1q6WLG/fH6/XT
+C11I/OGrnTt3PvPMM2fOnIGq2uv1xmKxurq6eDweDAYDgYDP51NVXZblEyeOa5q2cOHCF198sbe3
+V1GUTFrJZDKWZabTadAYHIdQRBGiDMb0/GYCBiHEcizHYUMnguCxLYoxZzsmQlT0MILA53MapYTn
+PbZti6JIiW2YGoMQRQ4q0FYxxoQgBjEUUYEXCCG8wGKMIa76fL6GhvqbbrpJkqSzZ8+2trYahuHz
++RBCYOaZTObs2bMjIyOapuVyOUigOzo6Nm3aNHPmzI8x8I/x9Z/cFncP3Ja/q75ijLPZ7ObNmzdv
+3jw0NBQIBKqqqqqrq+vq6lpaWioqKiilXilQURkjhLz99luzZs1qbm5mKDIMw0Gsruuqmle1vKqq
+tkUsy4HC0rZty7JM02IxL4pi7/Gj//GrZywTOTZisUQIpsjBDCFUR8hCiMeYB2mBUoKQLQr8hg3r
+W+fPtSwLFivGHCEEsmGf5OU4DmMsiqLH45H9XvAnPp+oadrOnW+2tLTMnDlzYGDAMAzoHHz44YeD
+g4Ojo6PDw8PwmmvWrLn//vuXLFkyRTQuVMPcg0s1Jv/IBmHhIw3DOHr06AsvvPD666/39vY2NTUt
+WrRIkiRKaSQSqa2tDYVC8Xg8m8329/cTQqAc8/v9lmWBN5NlGfRnKJIhwECMKS8vb2xs/MlPfvKv
+j/0YUQZjgRAGY5YQi+WQY1sYiRRBI5dgzNiOuWbNmqeeekrTlHPnzlmWBZkCQgjSEndPDhQfPp8P
+ykBFURRFiUajDQ0NuVwukUiMj4+PjY3BXUeOHOnu7vb5fG1tbRs3bvzc5z5XWVn5R/D2P6J+iryM
+EMIYm6YpCMLhw4f37Nnz/vvvd3Z2njx5Mh6Pz5gxo6qqasGCBfF4HNQedKGfB5IsdFBBjYJ2K9QH
+cEAIyeVyjY2Nzc3N37z/vu3bXicOwVgkxGEYRKnFctixGcxgSh2KCEJo2bKl3//+wx6Pp7u7OxgM
+sixrmiYsVnengrtrAZQ1XdfhRbxeL4jhyWRyYGCgr68vkUicO3eurKyssbGxrq5u5cqV69ati0aj
+l9IG/rzUF9o7KmjXuWd6enq2bt36xhtvHD16VNf16667rqamxjCMUChUW1vr9/tjsRjHcT6fTxRF
+aJtIkuT1eoECWZYZhrEsC0qksbGxXbt2zZs3r6au9udP/Z+nn/637GSWwRghxHGMZZoIsQhRhBDL
+Mp///Oe/9a37vF7vb3+7fenSZfX19YQQVVVlWUYXmuxQ8aXTaYSQx+PJ5/Og7uq6Pjw8PDExkclk
+CCHj4+N79+5NpVKRSKSjo+PWW29dvXo1dCjRn2hzwx/pcFxfjz4aSUDUpJQODAx0dXV98MEH+/fv
+7+rq8vv9jY2NDQ0Ns2fPhlrc7/dD3Qj9AEEQLMuCVgNQL1zAkSNH+vr62ttXRSLRd95598UXXt6/
+f386M6HrOlSbsizPnj17w4a/vummmwxD27FjRywWW7hwkSzL0F0CdVfTNFVVQbAzDEPTNNu2s9ms
+W4KcPXt2cHDw+PHj6XS6qamppaWloaGhra2tra1NlmVXBGUuoAjUF+Y5U7rShdfAwfbt25977rmu
+ri6e5+fOnRuJRDRNA/OvqKiAlhuYP2jLIMlRSmVZBpVCEIShoaEDB7paW1vnzGkVBGFw8OyJEyd6
+e3sQQjNmNLa0zJoxYwbDMKdOnTp06EB1dXVbW5umGeDlQVaEIYHhQzMnn89DOTo6OppMJjHGuVxu
+3759uq7X1tZu2LDha1/7Wjwen/5qfyr8Mb7eVYWQ28tmGDBVd5dkoQynKMqJEydGR0ffeuutV155
+xbKseDy+aNGiSCQC1W8gEJBlWZIkyDoQQhhjEAhN04Q1MTY2Mjg4mE5Pwq6QSCTi9/uhoTE5OZlM
+JhOJBKV05syZ1dWVlmXpugneDJJxmABooum6ns/nQbtPp9Pvv//+8PBwKpVas2YNuMeGhoZZs2ZN
+EXQL9x/+SWbif5ThoGk5qPvXtm3QcOAymJXJycndu3fv3r379OnTXq83lUp5PJ54PF5XVxcMBkEg
+hBJBEAS/3w8N27KyMugfAImDg4Pnzp1zHEeSfBzH5fNZnuclSWpubg6Hw5IkKYoiCEI2m4VRgY07
+jqOqaj6fh8A+MDAwOjqazWZlWQaJpr29/bOf/WxLS8t5Xi4sa3j0lEyxOL6+cIuEa9qFBcX0wDvl
+AELogQMHnn/++dOnT2OMY7GYLMsejycajcqy7PP5QASFNYEQAudDCIlEItBg0jTNtn/fOPN4PCzL
+KopiWQZU/KCkQ6EAHycnJ7PZbCaTMQxjYGAABIMNGzasWrUqFou5fcTpm3zcrbJTUozLTf2fEKZp
+9vf3j4yMdHZ27ty507ZtyOJFUYT9DcFgEGPsdsxBmIM2AMw0xD0QtkDhgWwd2niwZwKM3TCMwcHB
+4eFhVVXb2tqWLFnS0NDQ1NQUi8VQkbbBFo36wjWrqmpPT8+JEycmJiaSyeTx48cty6qsrKypqYHW
+FWQ+biZumibP87ANxrZtwzA8Hg/4ffAtuq7ncjnI0IeGhhRFaWhoqK2tlSRpwYIFM2fOrKysLIxG
+l593VFyrpx/d9QbIZrO7du06ePAgJILpdBpjHAqFysrKGIYBb44QgpYFVHMgGExOTpqmSSlNJBKp
+VErX9VgsBm3LBQsWrF27trq6Gl3Qc9AnyYqXAUWjvrAyuGjsMgwjlUrB/mFCCM/zw8PD6XQaJgBj
+DBo9bPeYmJiwbTsYDM6aNUtRFEJIRUXF4sWLq6qqQK5BBS7bbXD/hVKPPsp+IabnD9AAGB4eHhkZ
+MQzD6/VOTk6ePn3acZyampqKiopcLuf1esPhcGNjI0LI3SEx/ZfRZd81fSlcEb4eFSROhS4YMCXl
+mKJhuCsGTHi6XliYjBXmWu7EM5drB/UUFJn6S8nZhRMzvZicMm3TU9vCCYCv3H9tuHL+se0K+q8S
+dzJcL1SYUANf0w+ma+Xuaih05bSgx4mKl9UU4gqi/i8NV0TA+ctEifqioUR90VCivmgoUV80lKgv
+GkrUFw0l6ouGEvVFQ4n6oqFEfdFQor5oKFFfNJSoLxpK1BcNJeqLhhL1RUOJ+qKhRH3RUKK+aChR
+XzSUqC8aStQXDSXqi4YS9UVDifqioUR90VCivmgoUV80/D8Mg+BKvzCqAgAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_lamborghini" model="fleet.vehicle.model.brand">
+      	<field name="name">Lamborghini</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAA2TUlEQVR4nO29eZRdV3Un/NvnnDu9
+qd6ruVSDqjSWJGu0ZFu25dnGNoPN1BAMCUkTDIRAOhOBJnSm9ZHF6vTX3aRZSUiHQBhCBiCAwRgD
+HpFlW7YkW/Nco2quN9/hnLO/P16pkAHTjV1G/lb8+6Pq3req3r3nd/fZZ+999t6XmBmv4GJAXOwb
++PeLV6i/aHiF+ouGV6i/aHiF+ouGV6i/aHiF+osGtVRfpAECJAMGIECAyWoYBQcAQbM1zEIIBwRj
+EikYJABhQdpCCmLAMlwAzCBigrWQQidh1VFkdSohk0BLMMWJp5wQiZFE7JskyqaCJKpJKYXyLEsh
+JVlAREACdkEuAxYAYADZuE8AlAAwcCwDlBCUAgFgq0mAwQas2AUAWLAAAwQWMIgV3BfJGC2ZS7XI
+OCwBsAQQLFjBmkRKCRYALIMpBhnBATMEAZSYqByF81FY1Tqulsd1Uovrs6RrYX3OJqE2CYwNqMyC
+dGJJsEvSWsQ6IcfVpiqkFdKBTVs4xgrPzQhkdZBLBc2pVF75Kcdr8r1CkCo4jsO+tvBgPSIAINIE
+tsyCXTBADFBjQAyAAAJBW6OJFJECgwkgSy9aYSwd9VwDSUBaSFgSABqSJgGyIDCEZkjAcmJNWKmd
+nZ8cmZ86rUvDSXnMhBOeMr4nElf4SgZSOsSuEplMyoAZEL6QkoQQcawl+Ur5xhjABhyCnERzqE1i
+WAiRJIkxScxzcd2t1YRmzRC1OtikMrkmm1mVSre3dg82t62UbpZZKHIAyRbUEGuhgQQA2AVLLYwE
+EwwgAAkIZhAtAWFLRj0DYCamhtAwjCEDsGKPwRZJvVauzI/XZk+Xpo7WyiOifjAJq76DfMbLN2WC
+lBekMtJ1oH22XKuFQjqxtvPVcmITA1Y1jjkiJdlKEyOsRY4jDcfWQinXxJxOZ13f8XzhZxzXFZRS
+gZ+VygMStmFUL5dKpWq1Wp7lUi2O2BOpNi/dk80uLxQGcpmuoLNfKmIw4FhWgiBhgUgjIEDAWpsQ
+kSAFCGOMlPJFMrak1ANsYYwRQghJFjCwYak0PrpvemJPWDwkaiMphM2Bas6lg7aCktJ1Mxxjrhie
+HZ6ZnC7Pl+rjM9HMfLVYSWaKulI12qgktkmSxOzWEhNqllI6MEkUCiUN20T4EqHvkLBCCZvOkpNS
+Tbn2bs/NZNDVmV/W3prP+YUmdHZk2lrzQgKIYGvlWml2rjRX0ZWQokSwt6y1bUN3zxVtXRugApbQ
+FgAEAwQhGmM0AgwIMINeNtTDxBAu04KOMfWpyZFDk2Onpia/GZZHM7KyvCPdt6xbZprjEOV6PDYS
+jU7MnByeO3Z6bmQqGZ6K52uyWksAUZyvJVoZLQCRDtxUIIwOE/hJQspNaWtcT6RT3vzMtK+8xNgw
+jIXgTFoRTHGuZJOYoTXS6ZzviIRgC9lsU9pta/f7elvW9Nqu1lxfZ667NdfRUsg0pSwn1bA0MTo0
+PVctVqmp9ZLWZTs7l2/zC8uUlwILaxbYt8TgRJAAxIs3DpeOeg0IWB3Nz5wYPb17duRxGQ5lvLCj
+VeULuSCXL5f5yKnKvqOlpw9Pnx2dHRuNp2ZL1dCERjleJo40rI2jyG9xfSEynuxpb5Gkjpw4VapZ
+4fqFTPTWO67tyLuPPX30a/cfTmWbbr5y3aa+DCs7WbY/eOzkyZGaNTIf8E1XbvK4fu8TT8f1lDHM
+tmQMS5sDccLzDuVyWdmcE20Fd6C7adWq5sG1heXLC4PLsplMKk5qc6Xi0PhsOU776VWdPRtXbroJ
+KgMOLAvRMBSYmalx8mKwlAonCafOHL//2P6vo3JidUemtznnAbNR5sy56t6jcw8+Pfn0wZlz01G9
+HhmOPJVPGMr3Yh0ZU085ZtvGVesHV375S4/euGv1+999w0C3EJ7zjfsOfPTjX5uvOh/94K3/+Teu
+pdrB4Rn3XR/66u4nJ//mz9/+up1+dXIy6Ml9/0D4/t/9/ly5/Lu/tf49b7vULTufeWTo43/y7SBI
+v/r1O46dPLXnh+PpTL7QFk9PebWoYk3YGL5gs6zNX9HfcekatWPr2k1r21YNNHuBqBaLh44dmy1V
+Tetbt227rrN3PVsfgoiYmQiEF73S/vx2vYUWABLFDhgsEs3SIWvCaN+3vxRN/N3aQmfL2r5Svf7w
+M/UDR8cf3D/9zGg0Mjznaj9EKISX9UU18hJd3zSY/ZPf+dXPfvYb//ToQS/b9N//y+0dHt//1ScG
+17VdNlD+1N8/6xfy77tr8NEf9O05mPzGG3b89afvu3/Pqf/5p3e965ZNT+970DHTj+3F737iketv
+WPbx995861WFZ8+6737tjs//w8Nzleqfvv/myUOb/v7bM//pTSu+eU/1hz88t3pD9i/fe92ff/r7
+P3im8o47dz68e//+YSOJRifFyPT0nr2R8+1zA8sLt65tv/Ly7g2bu3dccWs1Pn3y2W899o17d9z8
+ka41VzO7kg1BxWTdF61wXohLRQADbEEEBisSzNEze/9lZvT7G5ZnNZt7Hj398N75xw+dPnoclpEA
+SqqQTXOh6SPvv5ni+I//4vslG/av7b/5upaJkZZ/fhTL+1t7u2ju9HSFpgyi0br++Gcfakq13nbT
+er8jt47cKuY//W/3HT2GRw6cXLV1WaZFVlVgqkOHpmrJ7vlPvM805VOv6lqmJ+c++Q8nZso55T51
+dHjKV1FU0dpGTHHAortlzk/b1pR/1+2XhFPzs9XJ37v7siceefYfvzvKaIrnZ56Zqx59auSL3923
+eevK117Zd/Otay/Zej280UNPP+rnu1va1sJawL5o6+YFUs8AEUACYBhAAfMzY7VzZ67eeuXM/EOf
++acnvvZw9cycWy1DqGajtcd1ZguBwRXL3vOG/onx8U9+WpbmbKgTRwxvG0S7H2xc3dGeN2PVOSsD
+a8KMx7/961dvXLEunJt95NGjt9x8Y202mS0pAXny6NyOVQOB8cpFvurywb/4cEtPW7oYzp44W/ql
+W9bXK1S0KjG1P/+bEfBMc09L0dT9nNvdnnE5X6v6tSSSiLxwxNE1l5JdG5JVTepbD9ueta2vv2Ht
+5766/9RZMTYbjX535tFHh779wPgff/j2LTuv3vvAs2ePPFxoWSGkAAvB5sUrnBcya8SiwydAkGxx
+bvg4ylPZpqYHD8zf81gcdF7ppzp+6TW7/uDuq6QrGEnCBo7q7nA8M9/aZPqXO5BOEou4GHZ2tt12
++eCmvsLcTN1YnXH9UlF2ZNrfeefKO25oavY91FMZV3hScKQttE3qnuDAkYLnUynx5iuzr7ki+a+f
+fvKR/bXW3tTpcklS9Ft3X//P/+Mtd1416MTpqFy/84bln/9vN3z4fb2STwkRRMpqLbXlhEx5ZnxN
+f7RhRTYVmJu3t/alnc0rOj/xB7esHnCLNXvPg6f/9xce4GKlK2/GTuyx4bxdcHLtiyX+hVBPBMAa
+AwZgCVIA1dJE1jt94vRXHtx3si5yk5NnZb383v+wbcd6NvG8BVgACV16SeehQ7XZarB5Yztp68t0
+LczNxepdb9u8aWX26Ik6eemkWs23Z84VK7/+O1+56Ze/YDLyDW/on54SkZMUshlN2eaOXLEWFRm5
+XPqB3Uff80ePT9byVZMq1+emi+XmpjZdwUw1fO226TfcnJOoWnaOHxl//KGjc9NzzJ4Io0rC7KWM
+JBYy0k46aL9yc0pGCVcndT0KZP3Wy/S6zpLwdM+qvkPH5vbseTzl1XQ4XipN2wXOl8CdfQHUA4AU
+DgCGtY1fcVHaaZjZ2Zniyu6VWWV0bTqsFcth0ZXQEGC0Bdn1K1u+fu+Bx54av37Hag+JFLpSt3sO
+jm6/rKBUtP/gNKuU8rQr6kiCA6eTBw5MVio27Yr9Jw61d3RtXlVo9itXXLZ8Yio8N1XL+k0k1Pef
+njsz4t5106q0Z7730OH+7uLKzvSXPr97/1OJhtBUSbemHzw4+7G/PvrX/zQErysr45SbjZKS5Ugx
+WWvPnk1tX9+8ebliW9dpPxYoF8c8Vhz7vd3LiZqmZqayTcLzTLVckkICAF8M6hvGKC1EMRgALMB1
+gbTSzWQUa7elvZcCl+FY47AB4ABOV0F1t8nBzX39/b1bVhb6u1Msa6nAOfBsebqqjp6dn5gKM00t
+0i2wjQpZ8a67Lvuff/aWjubOJ/aXDx8dGTo184cfueOLf3V3a4f3j195gG1Ijp/OZjipPPLo4W1b
+2gZ78g89NlXnto9/5M4P/fLmzjXZiYmiY2LPlFIppR0VGuUZsIInheey42lfOEqJ3XtnrEq9/qYu
+ARVZFVst3XQtIZCplWcVuUw2sRET+45LgNZ48a7sC6KewDCw1KCdAAhIweT4ymFSae3VSxxWraOc
+UsooQ0qQgDUb1jV3tsmefo7j4e4CbdvS76ZlNgjOHDdPPhsfOR1bSOU6lqOZYlCGfcddg1esS/33
+T33tW7vHw5r9/Y994dCZk3E1+i//z9e/cv+4lvja/ce+871i5OFz3x773L2l1nzrmYnJD/3FD7oK
+yfvfOvCDA8Of/ZexCMu9VJsUeQPtNrsIVOSmpEMSLrvW91KZXPNYWT96YHLThjDnuZK1RxEZKxQx
+x8W5ktbadV1DNjEGEEZrpZZE3/z8Fo6A0ZAQVlhJ7CjSEGDZWhc2r0SGgqlYKlX3OYwoZ+R8Vuk4
+E7hG3XbT9qFz9IGPPpQJmr/++XVbNwSnj4mjZRPF5c9/8XCNp1zVXfnXZ4wUjzx+6vXvm6zVwvGx
+ydnZIgAl1QOHSg+959sMsCVYV5L8x3/7oWULgeNDw+/7ozHpSSHlt+4/sW/fZHtL6tD4uXop0+QV
+/+KLB4dHJ7xE0Ey0eyiJw9AgLSWkykWinpEm7UzsPbxs4lwo7FBOekkqW3XCRDoQiGphXaRcCRlG
+UguwaigcXgryX4BxKQi06MxZsGBYa8mQ6zokDCci8FodM8r1ekAVP9Xf2WVWd3ub1rWfPXtyeLKa
+6+r85HcOn5tXe49Nfuzj95wY06E+LLy5+fmx+x6v5tKFoZGJMDxrLQQp1w+YKUkSBUfoxMIawZkW
+0d/T1dGcS7leOMcjk2dPj0zUI4AcQ+b0bOn0dB0SUiSzUfilf3lMKARZ/6kTpz/2iXEbuWGQfOGr
+z+w/WHP9/FgppXI9h0+cefjAyus2tHnB2Ww6l7ZxStQA1MLYmgSANWAmSNFwan4Uof3FUv8cJUWQ
+DSFg9kiRkAkAV6QVSFHY0SM/+p6BVRvXnBufeebw0FMHh1OZtnrF+5u/POA4YaWoTp2LXd/RHAvt
++TklozzDuJ6jnLS11hhjNCdxrC2TrGgjVrS333HbjutvGLzsigG/Pj575ImSiZ451PTMUYwX/ZNj
+0bEzk6XQxpTAwkIDLEgwRKQVnPTQROI5CmS+fN8562RVZvYvP1cL2YuFeuhZsb6vk5xR4ppnvJQb
+g5XWlqzxXZeZGEopB8RgpqWQ+5+femYQFjbMzl+dpGMM+Y6bzbl2PootKEhExmnr6x2cnzj2zNF7
+Hzw7PJPU2bCrfFvVEYWxn8v5YawTXU95QRwLNqFDrLUEhCDBlFhrLRupiISKbWqgHx97zy1ZKpeG
+Hj6p9sp4an5oaHK+I8i1tncIHVS81pY65L6DkxAB2TqQKAFroYT0hS9ICh8yEKxQRHPWc6yuPHEk
+FsrP5zufODLhROH4pLe8N6iLlnSuDjtXC6smTjlSxZFJ9IIfxTAvfovqhVEvFtxZAI1tKJJSOlFS
+F9JzXURhpakzZzznK985aOLiI3un6yXXiIx1lIETuJ5VsXFtygRxXBEi9ByHTeIpNwwNqMbkW2sZ
+hsFCMQTiOImTJMXhh95x57K24K13f76o073N8ablqn9ZD/ttAytXHB4du+/7+0tRzTrMZMCRJE9z
+ogEALiShxtpKN2V1SBBOVrEhQY7MuElijAEoeOjZupSpoQn92W9OnB6H7zhhUiEb+a5KkshCkXQa
+5h1gX3zQ+Oenns4blotOLUM6bhiHjuM0pVPWGCXdybn4q986o0RT5LQGvi+lUSIUwoGmJBGQoo66
+ZnaVa3UQmTpRBbJJKCGTmGCtZWON1cbYBGyEgDVi39nJNZt7PvI71xw+de7UxNRsVZZOx8I//dSR
+I1Gs29pEwQKAac5EsR2brbCRhn1QHCEi9qR0EmJlSdiArREitEbbOHE8DxRRlDdeoER9qohvPFwP
+IBkxwXqu8T0VR1XH8V0/sBCSBJbCm30huv6CzUnLYAg4yo0gLWTKcymKU9LxfGe2WOnoaGtVtYhD
+tiSlQzbWNvSlI2FrJIVybIIossptLNU2jmMlqPF8hRBCCGbXcGJNHEL+7T8f/MEjQzft6GwvuC3d
+Ay55cr5EdU0MKaMgqHuucmQu4+dzTZkJv/Pvv/Dwo/uGyJUMNlqSkMzaMa5R7GqyKmFBjnFgbWxN
+SpqEdVivkJsR1BxV61FipEA2rTxX1OfrJPLScXlhJ1S8+O3ZF0K9tSzlooVFYEjXq1QZcJtyWdLj
+JixlPFMJQ1Ll2LBWFSGDqO6S8tiRYWIVa2VgOYTxMp4XxhWpHGNqnmtNooiFNcYatprAkKQcKRKE
+XC+eOVP8X6dHwCorlO85oQLYKGGUJFe6kizThOe5+XzhDdtH/+zDb/7kZ7/1tW8dZDgsQnISxb60
+fs2cC2Qh1h6UmyaEUQWqy9I5JCqjMiWuQJehA7gZG89lMoHrOlWtpZSO49nGmC+KXc9klRSAauxZ
+SjYWkUp3i0TWUO9pS1sTGdniOd5sHcbWmIhsYAwzhYIFJVpay0DCxOxCcKRrJHxrWAhrEmUMCSWY
+IxAnsVHwyBiYOgQUOdYSISapKwblOkPEChljQwCghKWBdYgJI2N7j4z+VpT76Ltfd3Dv6JHpea0I
+MZSkuqi4JhcCUmphbRUAKZjZRDgkZI21MC6II1lDMscQbbnmVKp4MqpqZ5kjLBthpJUXZ5l9LoiI
+IFzXhVDGmI7O5sATOg5dxxckwjBOBz7OBx7oAmm5cHeMmRunzMxktGajCZCB78RxXNeVxp9FrAhJ
+IBCDtOSME73miu2vu82r1d1vPXD0of2z0/M+hGLEsAqJe+DAWOrd3ur1HUd+ULfGqJStR8LzTONy
+1lpmFkIQERFZa9kaIjATESWJIRAkMikBrbW2biqAWAI9s4gXQf0FNxEEaUinXK10dvak0rZerzmO
+Y4E4jtOBvxj2uZDixv8/h/TGARJjyHVScRhHpmZsBAUWIO0x1UmixgCoIPmDb938oQ8Mui0dSbF0
+503Nh4+OP/DImQMHZw6djcbmMlFc2b51a5RUJ6YmAUcS1+ta+MqxCS4QhQb7QghYshZCMDOspShK
+mFkCbTlJRse1JGjJNgbLWJot1RfizTZ+NZ4/MxOR6/jCydZqU72tKp3GfFwTyrFsdWKZiRnMLESD
++saAFwbAYFBD2GGZGWyZrSWjtTYJ2FhYJkBDcCThxFpIqVa1O7/51oF3vL6bwvF4mo4cP+T77tU3
+bL5656rR4XPDo7PHjg+fnUjfdJ27+8GHjx+vAErImDR0Ujb40fxryPviKBo/jbEEqRMrBZREc8YK
+Y6o1tKeazoesxMUKJPyI8fMHwnFc5TXVo3Hf0fmcmJqJlPQB6CTRWkspFyc4MzdOcV7n8HMhyBcO
+x3FoOYJgUyewgggsk4XJge/c0f6ety/r79eHDz0Z1ms9zellq1bURP9je0bXDbZ3b9qybKByxbb2
+6mw8Mzf0+R+eCiOCkImBAmBCTc7ibTTk3VpLRLAEwcxGGxJAQ+RTvsqlDVtrjJfNd0BI2B9Z179o
+6vm5E45IAuw4nnJb6zUjKGrJe8+M1D0vQ4QkiZIkaSRq/bhiOY/GcePBWGttIjRHjBiK47qVwoMF
+23pKiS2Dbe94fe/rb+7w7fyTT+ypVLTV0FNJZ3Z27abLj+45de+RB1/zpjencwMjZ4cOP/RIypXr
+l/es7J56dpRJeMSRJGitf0wIGmkdxAIwTNZYSowFs2VkMm42K+phLNxCoaWnMeMb85NedNz451+p
++TlPnYgAoaRbaOmr1TSRaW/P1etV6XhCCmYOw3CR1sX1zRhz4emPeLdWkSBoJmNBxghiEhx2Nus/
+/Z2NX/rba3/lnetaVw7qTHtHR2t7zs94Oc31uDgkotK1u26fn8JT33sUlWp394amgY37D1c5nt+8
+QfmuZiuEFNaqxoWS50JrbYwxNtEmsVbHcWStBiOfC5ryqVKl5gbN6UKHwULsZEmk/uem/nyC7oK2
+Wfy4s2s5s4RSLS1NWmsiIsFElCRJg1NjzE9yvSj7ix9GYVVKio2OQg3yrdUpD+/61Vs/+PZLu3vX
+k7s1qbXkvf7B9VdtuGxLW6+KVbo8Hdm69lu61m/ddeTYkZniiaSleeCKLR2rmrSuFNLVXCoSZLQV
+DL+h0621WusG6Y0DEydJFCdJpNna89uATblMJutXajXlpDw/fcFsX4KV9uen/sLjRfEXUM29dZ1H
+Gau7lYiKUTLr+T7AWuswbOQbQWv9HN3SiE0+F4kXJ0mCWJB2JZcN0tfuWvWffqlF59YY3eWobrjt
+OjVAhZ3p5i3ZlhZHxeOTev++b0IfXrflOqta9j/4sDN5uE2ga1lr7OgrLxl401WtruMYSnlUv9Co
+bTyAOI7jOA61TcIk1jauh5yApWGB7nzcKUw5TMt8q+OohVC9FYbMC6f8PJasqiSTyUmZLtXLLa2Z
+wJO1cs33fWYYYxrCdaGAXyjmF8JaS1rFcWyMlcKwEALFXZe1NzXlpZmUFMIKx2sBZWE8OPm23EBP
+T8Ea9cQPpw899Uhrh9PS1nrg4Ll9+5+K5g4X52Zzzc2333r561+1YkNPBFHS/CPKfuzS2iSWYWNY
+w4BmC7LobMsIlythlG5qcZRv7YIPzxdnW/x5kM7mnaC1WKl2dmTbCl4SRp4XAIqZG9QvivmisNvz
+aJwuKNzQMEMyYBNLtrnZWb9c8sTxibNPcTQFE0OkyEtDCiRJeb6so6Ln+eV57N/zdHXmQF//qprB
+/n2H9v1w//ho1fMzvlPpzRW3D2QzUtmfMCsuWO0tALBoZE+AVeDIno4UHBvGlG/uA4QgQBgQBC7G
+3uzzwXH9INs9W45zOXegO6MWMtAJQEOfLi6wi1jkXV+AhLW2IEgDQMInPyvj0ycenxk5RXre2nlj
+6ywpEUm1PjlTGpqei1JZ2dYpZifis8d+2Nra5ubU1IQ+fiwuFW0YTQ+fPlCfm2zL56RRkvznHQBZ
+AAQFIgsIks15f1mrio1ORCZb6Glk24HYWr0k1C9ZLZUQImjqnTibbJRqVX/m/t2TMl1opAYuMv5j
+liXOm5WLj6Fh6jFDg0h6bJ2C53a3eZWR2nzVhqVzSrUYlXXdAlSeMh39a7Z191xSCWc9/+T0SJls
+lMt4rhdElWg+JiNsVKtNjE1V55Iau+QxqtWfPQpupM/DEKOrTfS1B5PFilH9qaZ2ZlCjmkcsySbV
+0lHPQKGt/8QBmdR5cGVOcc2KNukKE6GhcwCIhp8OAGhYEfYCLHzOFpAsNBtSiG67Zk1zIRk+JE6d
+Lrb0HF3d1C1M3UR5MgXlDar2dqCcD4etUan0IU96TWms6NvwzORjRYKO0NfcGodNZ0eHx4txaPhn
+xQAIArDcqLWDtcmyLqeroM6OxU6q0882CwG21kginC8ieHFYMoVjYZs7urUpzExW16/t6OrMGs2p
+9EKZnTEmjuOG0l80pRcN6kXeAYCFw4YYBHHtRvmOO3riKKwbqtZx6uQQ65ojI0Wh9F2kOuGsTtRy
+uCtbWnpVQCPDY0On9q3qH/BTjoWoVai7e3VP3yo46dliEoYO6PlFjSSzBCxg2cqUJ1avygaOLlVk
+c9tKx0ufz+tuUH4xjMvnh20qtDley/RUua8n39/XmURJEHiNOAkzL+r0H7kw5x0rnA+nEJEjXQmA
+vZZs7u7/uOGSdZLj1LLe1t7e3rn5aqVUhinreELrCYs4ER473eCOVCrV3rUilXZHzhxtysjuZQMm
+slKSl9NNnUk6lyRJCJCBft7bJzBYSggpLUSuKbtiZTOZRBuvtb2XIRkJSACwoCUJ2C8Z9Qwp3HRH
+3xUjpTmWavO6gMOSVClcEPBZlO5FXf+jfz+PxIahA4H863dkb9x5mc2sT7X3rbzq19ZfvmZ+tv7s
+I3vsxKhKpkU8S+EoV591S2Nwi+Mh5ibKaSkKaWfo1HdT/rxUwgswcvDY9KlnmwpxR4tPCCEcEARB
+gBpKu5HHR8KFMQYuGVJWgJJV7by+zZ2M46R55aoVlzkMQIOhEjjQsbhIG4TPC8LqdRt3DxMbu3Fd
+r+BnKmHGdd0oihaJ/jHGfwqEjwSF9Myr71jf3LOMTVum2YfbuWr11lvv8ObnJ6ej8XYldW2UjC3O
+TLIeLdZUnVOR26+8uCtI5ucm56vDLa3emdP14XO6XE/cJtPR7jZ7yUycUKNSmkmRMmyMgZCONQaN
+mBlIMwPo61L5rFsqVpvbeoNsngkMJmpMjqUR2CWjXoKMRXv3cnLaK8Xq2oGm5d3enjNR4LpRFOG5
+8fqfBesQwiu353dePgjKGxtFs6eUM6WCptWX367rsXLDqHxq+Mz+ga4V1em5s2ceb25bv3rTVZy1
+Z48/fW6m2lboyFRKa5c7XfnqxLl4djpKhcapmgAMZYXOGRsRDNgAkATDESQgQNYyBIPSnrt2gLMu
+jZS5ZfUauOlGNaRLgAAxiF4Gu1QXQgiwCvKt685N7Fvd375pXcvjp+YhF0hf/LMfO/3xL0HMSC65
+pLm9OQdTqs6erM8c9DxTnU7lW1ZkmjrDuenRU0+Up0dmFQptrfufzeaWtQata04+8/dPPfpoea69
+sz87dKKYS6vWltylO7qI02dPnS7VUItieMKICBwpF0kEAYAdsCABJi0AAWHIdjb565ZL6ERzvqV9
+bSO5VUAtlhW8vKS+kaYgPb+jZ8vogccuWSc3DeZbvj9ZDO3P5vrHQBw5TipwuVR6RswgKRZb/KaT
+Jw9MT09mm/flCpmkFpUm67NzyYGnn9j1qhvbVm8/PTO6FWESYuwsqpXyubnJahmxjiRVd16buf01
+W5YPNrcfGT0wiX99uAomCCeJk0ZbAasTJTxjDSwIbIlAyeq+3MqeXLnGMlje2rX6vGXTSO9GI2r/
+4pXO0kk9cSOe3NW3ad8jbnGmunNb/0Dn4adOcWM74v+SfYLSiZ+W6uSh/dMj5YHuttAPDj4zZRSl
+w2q2VDMJleadUyPcvnJrrueGZYPVh+//9tkju9ds3HV95I0dP12qTIXaCYveXHlu/1Nnwmqyps9Z
+s1z+yfv6+tOn/u7ecmwlOdlKUresIUAiEhaGwdCGVcrDltVOPp09eU46rWsymVYsWJQSWMi2XAp9
+s5QuFQkLSNvU3p8qrDp68tC2LQNXb27fd2aKiBqu7P+Nulci5XnJyq68Ls2dOl2q17kU1colm/jk
+hZwqq8TauXLdaWm74dW3tLQWKC63BoWv/+u/Xn/LLRs3rdk82BqVK9Mz88f3HR2aSs5NqfETQzyn
+ShPZSy5p/YN3rd6y3Y7Ppo6MqO88fHB0dg7EiWZFLmxCMAB6utS2DWkTO5Nl/5Id2wU1asMZlpiW
+KA+kMdKl+iIGgwjWSKn6Vm0+t/cJ5dqd2/r/6p65Bu+4QMv/DBUUcmnHlr71K1pM8ZR18czJSCOT
+9crJHAtHlEo60lSNnNuuvrorrzC9F3amXDo3dy56+N57D+/zsoU2R0TJfKVmStaDlOnOLpTrxWcf
+T07Olwa6axt6SoX0smNHq3OzUwAgCcyaQ8AxMFBy+bLCqv50VBehTfeu2MQMEgwGDEiBAcNWNvZo
+XxyWzsJhC5LGKhbYuOW1J5+8f2KWr9jVu3XlkUf3z5PjIwmJLCRgPJej6Hxc4cdWYDBfv6ZtWUtt
+tJhznPJ8FCqnZMssDNWjDGRSnK93tvmFoFQf3Ts19SwJferUdO8lGUX+1Lny1OjpQkEppT2W1chP
+gvnWTr96tv2Bp91/eCDsXFZik5mZH54phSEcANAgJAAUJQmlcyL/qvVJR4oePxevvfTNhZaOhZ1w
+QuPPCZBLom6W0pslAqOxz+mmUgOrNw8PzXW1dd141UoPMVtIpawBLIhiC7mQ+vITst/S0rS8szg7
+c/TMxIgytfZcU6kcVK202qsmpWpcTwWeUO6JkwePHN0zNzczcraiQ71u9cBl29c6BF8p3yMIzNdN
+veK1F/JZt96SigbXy9l6bf/x6rGTE5MzlUhrIRrJ8mYhEiZcMC9fVlq3NlNPjFTLB1ZuxxKx/FOx
+lDEcEAhkYeH4KzZcffJsBVbevKtjVa8iA2NBcCVcBicXXLeRhNQ4Zua87yjSTz1xbmYi6u1IF0vO
+vsNa2xT5oZtBJgBZriY8X4mLc3NxHE9NGpsgKlcdWc2mAsUyjpNKSCOV5r0Ho+nZTD6bdm25kC0p
+hwSlNEETGGRYN0x7MANIrPZEuGOj6etOFWvKz67vWLael9blfC6WMJBA4EYZuTFA87J1wl125OCZ
+yza33Xxtv0uGLdmFHkqAWJD3Bu8Xyn4gZbnuz8xSwQ8g2x84EB6bgJKRl6UgkIF0Pc9EqJ+b42o1
+q6NMTRvX9U4cGT116qQbiNhEoUmNzbZ/40lx79PVb++OJyvLXS9VL1kyIVlKWFlWzAQYkBUCghRB
+QtreZuzaUnBEenjK61y5VXhyCcIFz48lo142InsEhwiA8JsGt9387PFp6fuvuXVjb5sSJBr17UoQ
+sLBR1wjWN44b4bMoZPKSNWtNroBvPVF5ciiRQaBZh/VUvWLCMFZ+UIuTI2fmSmFzZ/fWzhVdmUK2
+OKeL5bCehLHE+Hxw/2PhnmdLVeSePFv/zm4TqsL0vBMaCdQX1AsthMCstZYtgyVw6fqmjatz5ZpT
+1MsG1m0lqV/Sds9LRj01igsJBCFhGVi/9Xrt9Z45OXX5jjU7d7QSRxaGYa1ZmMWLemYxusnMlpL2
+fNLdwadm1FceqUfG6GpUKS4L2AkI1gvOjKXjSi4TuGdn9VhVr1g7WGhKOZKVDGpJIgPv6Bn75PEa
+EEtHRbr0zMmidb1SEhrytGNBDReEGwnqABgWRC0O7dra0pwVozPhyk23Zdr6loqZ58PSLSOm0fYJ
+AAiGAZltW7X1xoMn54PAf81tg60FsBUQzI0GdBdQv7iF4jjO9dcuW9fTVix5ew7K4UkFxPV63Jlv
+ufaypt7u1jNzavezlZYgWNmT23tw/p/uP+M5LR1tmb6eQMCEIeJYnR3VFSTKgUnKJLCir9DXluvr
+dCH0gj3DhmAJkD8K39tt61Kb1qaiqhs7yy7ZeTug2IjF2flSYOmoZ8JC8bgANIDIiBUbL5+tiIlz
+s9ftGty+bTnIsawlmJ+rRBvBZKVUPp+/603rVy3vmCyKMyN1BxZAvi1/1VVoSY+S5iNDFZXPXXNl
+R0uqfuQo7dmfnRyt+g5aCiiXq3HdsvGJsnCQGAEpFXmdBWvmxto8E4hqwAoMQRAkCNKyBYRSKp1N
+XXNla3e7LM4G3ct3pJu7LYN4CcoEfwaWjnoFCeGioUsDQfAkmvOru1a/+sHdB9tb3F9749a+fCQZ
+VhA7RArWgqAAsCCoDGu9oTttTz87fvipsanU/mkRIpHG3bk21ZGbPjbu3nPANdT+m28Lcupwad7L
+d8p9Q2dPHTt5enTKJF7W+J0dciYMRuaKlEBZCxUkCWbnktG6rFvXNX6ddKNFGLNPUrBjIaSjcd1G
+8epBhGH+mXKh//I7LCJigOT/T6h/Hmy7/NbEFkZPz910w8CVO5sllLUSCUHDS5GA9kBgC45YIJ2y
+sZg7UQx/8FgwPlxToM2rOn7/w1d0tm/61H3OY3umfuXGnqtXxDPn3L0ngiOjlajqfuprJx8+2fz9
+Yy2PnuzYO9z+/f2Vk1Mxi4AIiIt9Tc72laYnN9nXMVnIMciRLECwFFuTOBKwXnOGXrWrudCeP3Ou
+umrwmpbm5RIeiUaHy5dwoX0J7dYGmtv711zymv2Hvnb7q/13vPnS3Y8/enaKIGKyblSPJRwHKrJ1
+SJ9ssqKD+tv9f3xYfPWpGUfk3nhN09ve2Lu6o/0rX9nz7SeLO1et3LxKlWZHJsOuY3M8XTO+qt63
+L3lq9ExUNg75TJViHVY0AXULBejutpae3vZC2mnvLKUzIeZLjXkGqQVTEvqScNlW97I1XLWyLru3
+X/Y6180RA1af3/h+qaTzJac+sdG67a85cfSB4ROla7etu/2GU3//lbP1RtOuRAGiijpIkEmuWOO9
+9prC1MjI174/XTWpd7+x5c1Xh6L+xFe/PPq5b4YwwfD49Oe/Ea/o7tt7vLb3cEXAszoCnOmZCNYD
+GnJKEqG1MTgA6ZPT5S8/6LX47ngpO1MKQQAMkIUosRWEzODy6qtvyve2tDx2NF6+9daWnkGzkA7e
+6L77Eiqcl5x6h1zO+iu33Pb4E1+64+bOd75l09OHxx47wNpGnhQRayiA5bYe+cG3LV/eOvP0oWR+
+Vm7uS79uV9LVNjN6LnVmLDl2MvZMPDmXfP57STYdTJdmDDKKXEIskViGkNqYBAS2DI58gTprkJgs
+lj93TyXj+rF25+sJSWhisnVoWCuavfiWnd6ODfnRST9Sa9dsuUkDjLoiD1ItSYXmz8BL38mbJYlk
+/eZbqrzs6YOnL7ts7V1vvGRZRrHxYCUAWM9J+M5rlq1oLQ4fHyvCkMyzieemU9Pz2bk4+9h+MxHP
+W2GM0jWuTVRnjFIQscasJiZAMIwxINtw5piC0DqgRCkSZGqRnq5U5upFIrARICmQOJASybb14Wuu
+6QictsPjmUuu/OVca5/RsSNFI7vPGrEkVeHPh5ecestwQJlUYdct7zg+LudmotfduPW2XU0uWc0M
+60nj3LKja+dmr1SZCLnl4AmvTtUjY/Zvv1q897HU139QOTwWsWMT4TH7jZ5rxBaWBCkDaChIh0iC
+G+UJsKy54akmRlgA1rAVKhHSAI4AKc9LrOlrxx3X5Ve0NQ2Num2DN6y59DpAeCwEHAuGeCl1DYBf
+APUsI7CE1gODO3vX3Pzg7oPdbS3v/49btmzNW9KCxIblwbvvWpPLjuY701Nx6b5HbSViN5PaN2T/
+7pvRPY/LmSSBAUwk2IH1kEAY68GSlYACwRgjCRIQ1iqyoAQUgwUxGB4kQGkroHXsKuRSnrbpIBPc
+ckPHjVf0hiU9W/QvveZ2qwJrYkkKLCwEoJewWPCn4iWnXsDTnMBRAC697I7JUsfeQ2e2XLbtw2/Z
+0OEIiyTV0nnkmWR6xDOcPn4yNxmS52Zcso5PRrLrqpTrCQgwDFcYEQMsREzaIAJrsAastsYAGjAN
+g9ACkAaOpVgZklyFhlDIeqLueJSUbl4h3n1jIe2bJydVz/Y725o3+YCQPhSIoKAA9VJzs3SNdZ8H
+hm1jbyGOQ9eVo0cfe+S+v7zh6o6s4374v37zU1884fmpZSlz6SWyrtXxsfDcXBqAlHKx0ClJkpmZ
+GWPMhYEHnM+sujBp8CfGIhr5w2ClBAUZJbxUsVhb16r/8O6BXVs6j41wUtj5qjd9zCpH0It9FcDP
+i5fcwpEEoyEVHJcZ6F61a2Do+H2PfPmu1239wG/cdHqkcs/3po+Wk5Nz0iKVyuZTcmEXtxHYaTwA
+pZS1Vim1UHJ2vugS54MQixnLF7KvJGsGpBBW5QIVZLOjs1GzE77zTT1XbsvPlXkqHLj52vcnKk0U
+/eLfHPILuKKRohHcgQYxsO3KO5ymjQ8+enqgp+P333/NloG0AunYDQJKk2rUVC7WtQohlFKe5zmO
+4ziO67qu6zrnoZS68FgpJaU8/1SchWJHjVTWc1JuuVyXHL/tpvZXX9NmIj501rnk6rfkO3oBMHsv
+PQ8/jpd+mYVppDkyXEBaCeHlb7n9/edmskePnLzyqvUfvHtz3jVSVGvFeURzDa4vYBBKqSAIFstc
+F0vrG1g8lVIuPhilFIiMhSdE1su0NbdpKoSl+Zu38bte19uWyR8ZtV3r3zy47SaDkgOIlzBA+bz4
+BUi9NNYAECwbytgK5Fv6r7zhTbv3Dk8Mjb3trpt/77evy3lgBHNRnCTJIvuL6qUh9Q2W5XOx+Dyk
+lIuCL4QQ0ghJTbmWrs72ark+OzG3c2Pbb7yls7s5ffR0nQpX77jpl5hcRwac1JekR/HPi5ecegMh
+pWRrzzeetkoQ67B3w9Wbrvjl+x46VauYD9x97a++5UqX6rHWlUplsQ5i8aUUruv6vt+gtUHxItEN
+NCR98RlIKT1XtBTa07lsxGZmZnT1stlfe2PPro0rhorueDSw7foPuKksCQvrwFmo5vkF4yWnnhqh
+EMFEGmwa7UzIiSJktl71pv5Vtz255wnfmt+9+6o33j7oKlur1eI4XlxpG2pHCOE4TkML/aTO+bF5
+oJRyXbe50F7I5CB4eGq6oyv77l9deeMVqeIIhmvqylt+p7V7BRuSBEuwFPBLHDP4qXjJqV8oZSMJ
+OERSLCQPNXkIyaavuvnuJFj53fvv7+rxP/GxN/3Sa3oBzM/qesUIm0gBwCoPRiSOdAWkJCUgYYlY
+KOE40hUCSrkg18AzpCA48FVHc1MhcEk5Y6PVTo8/+st977hmWa2U/uFotPLaP+5cs1aSFsSAoIU7
+fMktvZ/ExXsbm/WNjNjF9a/6zQpWPPbDAz3d+d9/72133tDtojRTnClpA2EDl3RoXC44jnQcKQSE
+gFLCcSQRA9aVOU5CT9ZdUfccbmrKZjIZ30tpxSOT55rz9fe+vf111/XVqqnj02btzrsG165X0l0c
++EV80fFL7lI9LxhMiYaWNojmhr/79T9pz45ccfnmU6em/uz/3fOFe47FSJZ1NbdmO+IIkJCKwzCM
+oshau6iImFloByq0pFNBk+tkjI0Ma8s0OTVeyHi/++sr/8OulupU9dA5M3D5+9ZvvwvCAMJaK4TC
+gl/GvBTtJn5eXDSpZ9LWKIUgYfjNvTe+7veGxtUTjz65Ys3aD/3W5W++fXmgvZmJ+enitPRcuFUA
+C1bjBSAiRZGF9LMtbuCbKPQ5cGV6bHKiSeH9d3W+44a1oqYOjdUKa982uPXtAFkrrMWFvOO57al+
+YbhoUm9hBFuwYxkxG1/I6vjBh7/3yYI3u+OKlUNDs//tkw9//quHS9br6u8OssrTBCCKokaNymIS
+g2WppB9kXEaY8QqVeTM6erxvufcH7xx87dVrKjPjT52cX3XV3YM73mkZJMyidFtriS7s6vPvRuoJ
+jbcSJkJYR0hLSC/bcNWtHz5bUrv3DPWvyH/093bc9cYVeQ8jp4aTKguhHMfzvEApl0gSSSGUECpU
+sR+ogFylg7liPHru7Jpe/Z/fs+2u21rKs5Wnh8rNG980uP2dVteFrFqyzLC20ZUK54vr8IvnHRdT
+1wOwYKoTKWsbhX0JrFOaOfvI9/+kCcM7Nm6eqZY/8+XH/+Yz+87NckdvdyaTcV23ofHP15WzdUyg
+grTfPD9Xnho7dtWOwu/dfdXOjYWJodF9IxP9m35781W/wjBEFkgM/PPN+s5XSFu8+DdMvTBcPOot
+ILSB0EyKuNEnCoiYUqY0dv+/fcQxR264ZlfI8V999sG/+l/Hjs/Wuzq72tvbAdRqtYbbxcw5mXGa
+U2enJsvTI3des+wPf/OqDStzpw6deerM5MZdH1y7/S3MAdFCKtOibDMvxkEFgCRmx/1Fq/uLKvU/
+DRbTAq1xtfT07k/NDX9t17a1gdN573f2/NlnDj317LTXlOvuzQfwK7MxedZI67rNY+NnHK7f/abL
+PvD2DYV08dCJ8amK373r46tXrZXCYYAgG9Jt7RKVoC0FXnbUs9UkjLGQEM/+8EuH9//djq0d/StW
+P/HE6T//Hw/d88BIZDHQtyoTpMphhUUwdHZkRWf9I++96p2v3x5Vz+098uy8XXHVdX+U610lhbSN
+fGZS/Ny+YS8HvPyo1yBlDUSioQinj9574sBnutvKG9dvPTc89Xd/ve+vv3hsOKoFXdmsdSrnJrZc
+2vHHv33zTduaK5NDjx87I9uv2Xrtb6WaBhQWWo1I6eC57RQv9hAX8LKjvpHvZRAbYgvPAeZG9j75
+6Kf95KnrLrvZavng0yc+8end331wpC2j3/tr29/+xkv6WvNjQ0ePDdU6171l/RW/wk7KIlLsMS+o
+l0Y7xVeo/z/gfOpRHRChlUIoF1qX53c/+PHqzH1XXtKXa15zeiL6xr2HVvWu2rWzPWPHDxwZPjWt
+tt/wG71rXh0a4Ynzr6kmYMF25PMFFPai2JE/FS9H6gUbMucrVSliwBpXMJ15+mvjR/93Ophds/n2
+oHkL4omR4/cdOz6c6dy+ZtuvNXVujjj0yCez8Lq0xTKhxeYYF8uO/Kl42VEPTkAOM9hCEIOMYc2N
+Knnrzs8cfXrP38TzB3taB0qJGC0ND6697pJL7zY6Y1TikLSGpKTFCEHDdmwUTbyseMfLkXoDloiR
+nE+yURCNl4MkCTuCIJJKZWK8PH8SyuZbN6Zae2MNqUDQzKEk31olhGXWgtT50S2E25bkneBLhZcf
+9f9u8PKag/+u8Ar1Fw2vUH/R8Ar1Fw2vUH/R8P8B06qyvPBwcB0AAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_lancia" model="fleet.vehicle.model.brand">
+      	<field name="name">Lancia</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAABBGklEQVR4nO29d7xdV3UnvnY57fb7
+bn1N7z2999Se6pNkyeqWLHdZbrGxAZsOYUImDEPqZEISCDOTmQwJISFAIBAgMcYVF9myLVnFtnrv
+0uu93X7qLr8/jnQj25iJZIMhP9ZHn/c51z5ln+9ee621VztISgm/pveC8Hs9gP//0q+hf8/o19C/
+Z/Rr6N8z+jX07xn9Gvr3jH4N/XtG9EovqO4DEEJXdNXl50spGWOEEIzfPPecc4yxf7L/rOqFP/XR
+nHP/5+V/fwYJIarHCKEreot3l64Y+qumN6FPCLn8pxDCR5YQ8qar/AuFEAihN02VEOJN58MlcKtT
+6D+Fcy6EEELouv7WgcEVctK7QuhKd7NXcf6b2PZy9pRScs79nz5SPnBv4sc3TZtP1dlCl+itT3nT
+gBFCjuP4D6qurbe7/8+mdz5VVww9XCH6Prf6A70cVnmJqrwspRRCUEr9A7g0H5ffzWdeAMAY+9gx
+dvEnACAEUl5cKJRi/z7+aP3z3/QKb5qVKwLhvYEeLhv0//NyIYSP0eVYV2eiKkaquFx+QyGE67q2
+bbuuSwjhnDPGPM+rTgAAIEQIIYqiqKqqqqqiKJdUiCCEUEovv5s/tdVjuGzFXCkOb9VSV0rvSNZf
+zjtvxwVveqvqaZfDLYSoymLLsjzPs23bsizbtn3cGWO+XIJL0t8/X0oJkvrY+Yj7fxFCyVSMUqrr
+umEYuq6rqkopxRhXB3NpobxnavYdcb2Pgv9f3o4LLj/ncrvFV4MYY865bdvlcrlSqTiOY5omY8x1
+Xf8EwzCCwaCPoI9sFVz/Pp4rGWOO4/iz5bqu53lCiEJxEgAIIaqqBgKBUCgUCoU0TYtGo5RSVVWr
++tmf+MvXx78LuPdW4FRhlVK+1dKoks+ely9tf7E7jlMsFvP5fLFYtCzLFz7BYDAUCiUSiVgspmma
+fwd+ifxZ8dcBY0wI4dj8cple1Z+YCNd1TdP056MqXkKhUCAQiMfj8Xg8GAxWVcvPGP9PB+49hP5N
+7Iwx9jwPACilCCFfPhBCJJSFwIIrWCqEAAgoF8v5wtRYYcS2bcY5QoSqejweT6TShmFgVcUAGIB7
+rvAsLARzHc9xTE5c1zXNMhcexkhK7jFHCOE6TEopOQiPM5cLjwkmpRB5CZggTBHVqKorVNGEAJcJ
+4hUoUTHGhNBQKJRKZ2tqanRd15Divwvnvub3XxOk/Dcz4XL9X33xt7OsfnHQM8ZUVa2Oz5c/nHMm
+SroaAlA8W46Pj4+PjhSKk7ZdVrVENBquq88kklGq+ByHGRMuL3ueZ1mWbTrMZYwxq2xVKhVB/bWl
+cM4ty6FEDQRCGGNBdYpBUYimKgqRUrjc8yRw02Tj4+OTU+O2bdm247quphrhcDQYNAzD0PWAEMI0
+bZA4Hq9JJpPZ2lQwGFQUyrmoqiHTtFX1oobw926+XPL3g78s0PtS21+5/sA9z/M8LxBQhYCpqXx/
+78DAQJ/HrGQqnsmk2hoXEQpAAZDrWSZjjDncrLhlZ9yy3ULJKpbsYoXZjrBd4bl8Kp/L5XKcAQB1
+bKZQgxC1WChHsjUAMmiQRCqUTsVSyVAiGYlEQkk9oFIFIWSb5Ymx8aGBvv7e3onx8aInOOfhQLih
+YVoqlaZIcRyPc66EcX19fVNTUzgc5Fz6NpWq0urWzEdfSumrnLfuP94z6B3H0XXdFzWu6yKENE1D
+CI2PTpw/f7a7uxsRaJneNH16U7wmTAjGMsKYw9yKaRUrJbNSdifHKxOjk1O2kyuUh8dyYxPlsbxV
+KHlli3kc7BIqFotCAELEthwpJaUqYwxhlzMXYWEESCisRWOBZDKWiEezMWV6c8vMGW3NDXW16Wg8
+ogtumuXCsbPnus93nzlzplQoB3UjncrW1dbWxBMmdl3XpZRms9np06enUgkAEAIQkp7nIYQURfH5
+CQAURfklgt51XVVVfe7wuT6Xy3V3d58+djYQDmYyiYam2nQ2rVLqCMe2bbNcME2zXK5M5cuT4+Xx
+cWtoYGp4KHd2iBUKxalixXSEy4nNgHMJAoGtAHcBJFAJwgXPASxA16HiAUJAMMZYCAGcA8ZEVTmM
+UYwi4VBjXXJ6U2runIbFS2bNntVSW1ODEJqcGDty6PDB/XtHR4YMVYtFIo0zO0KhkKIonudpmtbY
+2Dh9+vRoNAwAvmlb3SX4RnDVNn3vob/cuLQsa2BgoLu7e3x8vGPGvGQyka5NqjoRICbz+ZHR8Ylc
+nvHK5FRheKzUP1jq6h7rG8yPjhWnciWbNQBCikIURfE8x7MsAI41LarzQFAPBLRwRAuGVIlcz7Mw
+gaBZYzpusVDJFyrlkmPZwmVScoCIB1wAIBAeyAo1vEw6kMmEb169ct68jiWL5tdm465ZOnf25Guv
+7jx6+CBWIrW1tU1NTdFo1LZtIUQ2m21qaspm05FIxH8vx3H8zcEvl6yvbhQHBgaOHj06OjpaX18/
+e/bs+mQD1pDnuUMjg33Dg/lCxbKF44ljp7p7+se7enL9I+ZYzgGBIWSAroSgwSwXhFNEyI7okEmH
+Oma2zmhrntGsp1KpmkSUEISJCIUNXVdd1y6PCyGgYnm5fGV0NHehe/DY8VMXLnRfGBsH0DAOUGIQ
+ggRYjj0FdpEoNJWKz2xvvnb5/Bs2rFgwrw1Ld2R04MXnXjp37tzk5GRDQ0NHR0csFisWi7lcbt68
+jqampsbGRkKIv5GmlBJCqkC/99BjjPP5/KlTp86ePRsMBhctWjR9+nSEEHAYHR47fe7k6PiIwMQT
+Slf30OlTF/YdGZ+Yci0WQnpa6CFPwaAKIB6M2eCZsZiyeG7z6mtmLl3QOm/2tLoMrUyN2badz+eH
+hoYcx0mn0xjjnp6eSCKCiUKoEgjFEsmsZoRyheLIyNgLu869/uqRvXtPmXkOahBhTDXQAko5l6cU
+OCtJVmpuit9y0+q7Nt+0aMHcqE67urpefPHFnTt3CiHmz5/f3t6uqurZs6ez2WxHR8fs2bMNw/D3
+Fr7c/0VD73mer+IBwHEcANA0TQgxMlLetWv7+OTAksXzFy1apCpBz4VK2Tt15JXR3JApHa5p57vz
+u3d3nzlezE1IZtQzjCCgCU2VAoAJMG0w7ZRy4b77br7lps5FCxvTMTo5NjzYNTA6NJqz5ejUSLns
+cakuWjwjlSIvPb+tMI6WXDOzAsG8ySnBQbCihqxJ1tRkM9m6WcWceeLI+eef3f3CtoNdA5Ng1ARr
+kp4pXOkAZiAq4JnguU3Z2utWrn7owVUrVi5QVNj96s7XXtt9/PhJztCaNddF6tNjw6NTE7k5M2au
+Xr6iNhMHBMA875Ky9U27q3BLXDH0jDFKqb/7DwQCCCHbts+fP79n3+vJZHrhwoVNjdMAoFKpDPT1
+Hz12WEiHS3Vw0t57uPv1A92TU5LSBEaGZ+iYBsoVBlTTqHQGTug15N47b3hw8/zFi2cRCscO7z19
+6kRuvFDMm5MThYoXLJUnK6bbUN/yiU/e17mg7off+15xXN50+7qvfvOHF4ZyNTU1TeloMqpiSmPp
+tE6dVE2msa5FoaHDx7sff+aVLS+/PnyhV0tM86QQmABjmqEIp+KNj9Kgnoiw2zfd+MD771y5cr5t
+mi9u3frKK6+Mjoy3zGrp7OxUqXbq+AmQcsN165csXQwgXI9RSm3bNgwDLomByx3R7z70VdeVv4Ea
+GRk5fPjw2NhYbVO8c8GSmljGcyCfzx88sO/8hZOJZKxg4v2Hel47MNw1IGwWwnpUCeiESGZ4btGj
+OCIcR+R7l19T95lP3bR29exo0Nu7/8CBgycHB3O5Ih8fr4yNl4Uk/f0eF2ZuMlebzv7e5x/60AfX
+PPmjf4mpmWg2def7P5nLuUo00VyfmlafjCaSTe0zFjSCrpFwOFhTk0xn6m1BX3r5tYcffWrv/jOe
+g2OZNsa1smmFgtTzCo45BUUTqdDWVvfg+++4755NbS2J3q6Bxx5/9MDBXbW1tUuWLInF4hcuXCgU
+SgsWLlyzZk04HAUAx3F8t5JvAv18uR4ALMvy3U9DQ0Pd3d2FQqGxsbF9TqtGlIpVOnDgUF/voODY
+Mpllec+8cu7g0e5cnmjJWUa8oeK4nl2mQY25BUyIKEylQnDfbct/8yM3tE5Tu88f2Lr71VOnegZH
+nLEpOVnEhQpM5EzBBSa1egCsYlnDcM/mzj/9o/ft3/lCOly3+1Dvf/vTv9KybVIqwjGZZwIiJBZf
+NU1tnzFt6ZJZ9Y0J3cCReCwYinge/6u//f6zz+ycGJXYqBNEA/AASjiMQzJRLk6K3KASJmtWLPzY
+h+67Y9MGXYftLzzzo0f+tWyaN996U0NT8+kz5yYmp6ZNa95w3fXRaNQwDF/m+MLgimC8GoHje2i7
+u7sPHz7c2NjY1NSUSqU8D7p7z3X3n+4f6vUYZW5k356eV3cd7c1HsaqFkkmuabYAx+XgChwMi1IF
+7PGmOvT5T93+0fvXTY0Mbn/p+bNnzx46l5/I2fkS7R0oVUqC1GRpMCgxci2OCEceR465cHb463/z
+6ZGuw/nR0qNbep7YsjtaN7vicHAd7llY1TgQOjoUCJHGpujc+fWdnW2LFrRlUlHmuZbQtm87+KNH
+th89OqRF0jSgV+xJ0CQUA3pAN1TITfRDZbxhWvrOzRvf/8C9yxa3nD9z+sePPXz4+KGOjtkrV60x
+LffIkRMtTc3t7e1Lly6Vl+KXvr/h56tmff2+bdu2Q4cObd68efr06ZVKpa9r8sTpQ6O5QakoU2XY
+vuPszp1dFKeM+BxiSKm6U+VRIBAIJ8yiA7aAUn7hguzv/tYt99664MypfY8+8kxXb3lwyDwzDKNj
+eSY0NZhU9BAjyHIdyVykI8kcJBFYTm2N+d1v/I7Oc/t27f/GI2dP907RUC3j2MCIO2XQDNdlMTA8
+z66YIyAKbTPTN69fet3qxa3NdUpAs025Y8eBH/zLs/sOnIZANJTKlM0yeDoIpioqEi5FbqU4AdJa
+tLDjsx9/4H333yQJ/PP3v7Vn76vNzc1LlywPh+LbXn6xra3tnnvu8R2ucOVB9isOlVT3047jVKPM
+lmX19x63KmYk1HTwZP+jT786MGSjcGMoOc11UcWygAuQGkZUmhyKNiLq0vnRL3/hY6uWZPa/+twz
+zz57qqs0lIscO1suuSEt0hhQdMCkYtvc4YgKkJ5kDGNEhIIUlTN7crJSnwhM5u2RqQnQNSYcEMT2
+HMwdzAQipMBySKPUSHEvev7U0FdPPn7mxOAH37d5/pJp4aB+TecMXRHBIN6++5iVo4ACgMtEUYVk
+CKggqhLEXiV/6GjvH/zZV090DX7wg3c88MGPhWPRJx97PBKs+cD7P3To4H7HcarRN9+rc0We56uJ
+Ukkp/QCQ7+y2bZsxdvb0Hk9Ez3T3PPn88dGCUtPUaWNSkhwjh2Fm0BAIjTvM5Uyjgdampv/5Zxs6
+52b27tj68vPPDA3nznXlTw8XXJpRajICZMksI0oVFYPHCUWuxxEChWIn74ADnoKnclYqGnMcXDQr
+oGugEJAYTE9VwHFLEjCKCiEU4SpID+vZNnus/+Vth3vOD/7Of9m86bYbEglj5ozaezavK5WcQydH
+EQnSIAfJPE9gpHumh4gWzjSVcuND45Wv/O13zvWc+9Mv/HZTc1ssVmNZzsT4eDQa9W3rat6DL4r/
+/YHDq4SeMVYqlXyWNwxjeHi4Z2T8+ddO9uQyFdoWbApxzJEACkEsEdemTDYCPJhIzJg8sXdmB/vK
+l25ed03wpRee3Lfv3Mke/dWDbn8xCOE0jiZZpQwAQBBIz3UlksBdDgQDY5ToLnKp6nKbFyeF3hYa
+HT8lQKcMY8EFx0yGLOQgDQDZmIU55yA5sAIDhGsizNXPTjp/+uVHh0fpZ3/nfsXgRfv8nXfPKJYm
+z58fV2g9UBVR6YIJmi1BlE0P0wTWA47tPPbkgVDoXz7y4A3pZMqzyqpAiqKUSiUAqIbyf2pa0c+g
+q4ztXr6V9R/vb7IlwkAwIQRd4gWObM/h4KrhWGryzIHMNONP/vC3li9etGPXvhNn+w4e73n98Lkp
+CyI1tWogKNnFAKwvMpEEQAIAsAQMqFIqYQwYY8fzclOFsmnlC0WQVfEqAF0Uu4CIEOJieoIQF2NY
+hABVxnPFb333h3/5V/8QCmYXzl8xvWn65k0bGutDpjVm23kJHGMKngCBKMUIc4kAEQIApmkCgI/y
+VYTR30pXCX01mcD3EjPGBMdSAkaUELUaBWTM5cQiJKCpaa9QBjz1iYfW3X7jzJ6Tx86cHdt3uHf/
+qeHBInbVpEsCrgPSdqWUICWAkFICElJKLAFAEkJACABwuSeEGBoftx3peARENdeBA1QduQSEBCFB
+SuBCcA5CYoSJqqrh2PDg5Le/99iPn9hhBBoWdy5fNL913arWYMgVvMCZQ0EBTkEgSglgBgBEoQBQ
+KBQQQpqhSykl/rcwp09XqmPfBeirx1RVASkYU4wxB8kYc7nncuZ6RYSIKgy7v/eOWxd9/MHVk8P9
+h18/cPLc5P5jQ/1TCEebRCDtcBUBVglGIHzcEVzEXUrh7+MUwwAQkjGs0qHh8bLNypYAwFIgn+UB
+BEISIQISSx8XnzUvrVGMsaS6mqwfnWJ/9sVvPPPs3pam9oa6xIZ1HYsW1oWCTNgFBBKoDohIKYV0
+L/rAEcqXikShhmHwSx6stwYLf+7Q+2Zsdc79t6JEB8BcgkSYM8ml/38l0TEFWZkcy9QGP/rBGw2l
+cObMMdtF2187MzjJhJrwaIhzIjElGAPzpJQg3oA7AkAA3HUBSQ4c61QAjExM2B7kCy7IqlHBAfFL
+xwRJwIAwxggQSAApkZQghOM4LheBWHqkd/Lv//6RQ4f6Zs/uaGxMrl0zr7E+AqzkOhWKAAAxxqS8
+lA1HiWmaiqJohiF8WfYW6C/PNPk5Qg9vzBvFGGOicCEZE5xJAX72JEIEVKpwVhbm4N2bVqxePmNk
+qLdQcg8dHzjdnfdInBpRKQAIAHNYqYQE9+X75bhLyaXkWFE8xwHJqUpc5pk2E0IlWgQAI0QACf+f
+BC4lAonfNFq4KPOFpikAwvV4sK59797TX/v6w4oSbWxqWryofV5HUziuSVYW3MFScg4IFECICU4I
+sR2HKFTTtKqsr0J/dXL/HanZqrIlhFCqAmAhkZ95JxBIBFJKq8y84vjMjszdd68EWXE80d2f37rj
+qIPCNiOMS4SlQjmAA9jTdEUCfxPu4KtZjIFzQJJzDwi2He/k2Qsup4BINcvEl/VSSunrXiFBSCEE
+8t3agJAEJF2FSmaXsaoBCW154fWnt+zI1LbX16WWXbOgY04zUTzBSoAEAoJABYKFEIgSxhjGGFMC
+CPkMXs1AuTq6+uy1Ku6+X4FSBSMKAIAuJlByzqXnKYoO3Lrl5lXLlqa6us+aFntt/8nBsYoWjgNW
+EUIgPc/ME+BEoeVyyQf6kpAG/6eUkjkOEEQo5YwZhlGumNtf2TnQPwhAADCAgItKgoPEIBG6ZN3A
+G1NiPavCmaOFAqZpKqH42ETp29/90UTODAeMObPaZ81sC+gEmAMgECIgKcYYhEBvysMlF98R3kFC
+ztVAXw0NVyPgAGCrOlIkZqYqhesRBgaXVFOJNyYzUePudc2sMCoF2nVoYtu+caa32EQBVQUkEHMU
+Cdy0FMWQoINkSlCAyqTjaIYqxSSHPFBFlUIFLpwSJp5VLHIROHqkgGAuYa6CGPMcjFVgGthI1Si4
+BVEqKgxF9AhBQvI8kQXhWCrTuBJTaRJ5GvcqXqAESbzvWPePfnBgWmZxLKiuWpZqaZBIYumEEQ4I
+1RQ2p0rAdUQgEPLzuBRFwxi7ruvvZv2dlOd5V+TAuUroMcZvCpJhjFVKwJfLSMBFoSGAC8Bjmzat
+bGpJV8pmKJJ6+cXXJkdzkWicMI2CLpkiTEGpaoRCnHsSPBBBp2AJi2mhGu4iREKIaMLjQBVXADXC
+whI4VONKRQ0FynaORjWpGwIZriv1cICGdafsUD2px5IM04rLENVA1aUW0MLxCkMqocJzOXMD4ZCm
+6GCxctnZvmP3+Qs94XA0k8nObG+LhA0kuJAMBAOEqpj6fnJKMUXYlz9VTK6C968eej9G4y9DSqlO
+CZayuvARliCF5zpGYGrd2tmhIEZE67owcfrcoBFOWnaZehYrFBQJiq4yxqxKyXMqgaCikRCSVMEA
+LnNLtmQSuMDCdbkJwuXCQ8EajAOsVHZkxUirQpe2aYFQMaF2cZgVB4FXpM0EEhJLLj0mXQDBGHcR
+AUXHSHqu6RUnmGMiiUENYxrYs+/o668fVrVQLBabM3tGIhoEcDFwEAIwFkIQJBFCuq4LxnVNwxhs
+2/bdWVXf2S8C+kvCnXqe56czqqqqYqQQSTECkCA5wRJJLirl5rrIjOlZz3Mi0eTTz74yNmFiRWoh
+EaEjmA8YNGdoLhemHlRUQzFLBaeUb8iGm7OGU+gLxQNGKEgpCwWdECmn4yAme4hbknYlnAhqqMTt
+Hi+fAyYDGInc8Mym0OprWwgbkeYgcyY0VIooNlRGVSgbKsesgjG3C/m6TGxaU9qt5OxiCWNdgpab
+LO5+7Vix5CIhp9VlEjFDQRwBAxAIgxRMSqmplGJkO2YwGPRjc35KqA/6lVqWcNU+HD8lyM/G5pxr
+mqZTbKgKJoKBC5gipEjugm1e27mwIZvh9vjwyNSre44LSTMN6Yc+/Bszk2a2fnrfWOX7P3pu60uv
+2Zam6SGEqCSlh95/Xzzofe6zX7KskBpUbrtt3W9//EG9ki/b5a989Rsvvrx/9qxrPvOZT85fWHvk
+yEvf+MfXD+09GiLwP//HH9x114qKNdbVNXRw/5nhXN6z+Y3Xb2hpzhbM/Pad+x59cveJkyMA9qab
+17Y0pL/5T9/vHXeoGrQcSWtSR4539/WP1cRZOhGpy8ROnZ20hAsICCAmpRQsGo1KKe2KWRONCM4d
+x6mpqbkckCuF/mq43t/H+tFw322paVosHArpup8fBwRLyUFwoqoL53RQBIl47Oz57qkpk3m0u2dg
+16u7l8xOLJ9fNzF0+viRvVJwzQhQpAIQKI8u7MguXVCnao6hU8us7N+759XtLyxfVLt8QePtN3aC
+M9x/7vCh13ZWJsd+9P1vH3ptL3Imf+sTt2++6Zo/+8PfX79y/flzZz78iffNmp4+sHvL4IXDs1uS
+0hrb/vyTp47u53YFnOKcWQ1r18wLqJ5XnHIcF2wPqNLbP3ni5HnOeSRstDbXGToW3AUMEri/u67L
+ZARnlUopFo64ru26biAQgEsbzKuA8eqh9xPe/cwsRVGyyUTA0AT3AEmgiHuO5CwVjzXVJrhb8Hj5
+wMGDhbJnRBsRiu/ecWzgTLdTss8dPzcxkqM04JieaVrAEWi0LhOrS4VrkzWVggOuNjZUGOobAwAB
+5oaNy1evWzo5PrJj1+ulknfmXJ9nV9Zev/gjn9r84ye+/73vPzU8pv75X3732R37XcGPnT7e1XtO
+DUC5XD507KjncSUaC8YDmUywsT4SDgIIlwCCcAhRUjH5kaOnKiUTA29pro/HAhgYYH+PgCjGDQ0N
+QgjXcULhoGvZl1fE/UK3VACgaZofH/D9pfFoWFMo5wyQwARJ5iHJY9GwpvFImBRL47193aWi7dpU
+2IZh1GoyHNF0ZivMoSA1qhjhUFQy1jxtel0qk4rXtDVNlzZSAhmCIojpp85dON/XE8/WrNm4ATSN
+aJFAvLZoYRINbrh1jdSsVw/ts0UomJg3mtdf2H3CQzhZW0+NkONB2WGgB9VExpsqZzPxZE04m4nV
+ZuKgYM9zKKUecwSQnp6+fD5vW5VkIhYJBQnFCCEQF6u9fPHCOdd13Tclq8HYXxz0/pMikUgwGOzu
+7vZLDGgmnm0KxLUAylNRtjHVeaE8fRpqzCpYqFMToRMXLK5pJOQAmiKeaQViDnV1rahRLpDHIMzd
+ILCpuoax7r7+QLim85oM5PerJY86Bujlo0eGtm05E1Wit92wqK4u6Di9mE6qNJqKBR7YfKs7USkM
+ehIFi6JoRPVzx3oO7unWlRpdw0RxVNVQ3SwvGEBEQ3JmyaxwUlq1el4YvDgHWskbSkUgZbwgS2bQ
+81A8iY1gxbWLmEck0wAJrNnZxuhkbsJ1IB1L5ycnLMuqr6/3M2GrwSnG2M8Xev9Juq5rmmbbtu+p
+j0WjsVgkaCiYSACJMQZdTyQSvlfZNE3HccA3kC9z9V3Kn0YgmGWbINz58xY/+8xW5sLSJcsgoEtg
+hCLDMPL5/P79Bz3BstnMxutXKQq3KiXOZTIVCUcM39oDzlXVsG33/Pme51/c2Tc4AVRHWKOYKJQC
+d0F48WRi774DF7oHWttmJZJJ23O5BC4pIMQY860GRVEMw8CECCEQkhQhq1xKxKMUo5qaWCAccjyX
+UhoKhS63LH2b+xcBfTAYDAaD5XLZH24sGE7WRAMGBukAcH8HHwhc1AelUsk0Tbhsv4cxxoggRAAw
+lgAghFsORfT2tvlPPf5SIS8WLlgcDAWYW+aezTkTHtu1+/WzXb3xaGTTpg01ca1SLoAk9Q3pgAGM
+265rAyBKVMlwcbKUy3uYRnQ9BgCMCcE8AiydSdQ1ZA8fOT40OjV3YWe0JmZZRUkolwpg7LpupVJh
+jPm1V4qiSD+5HktVIQ31WbNcTKfTwXCkWLICgUAikaCUVp3nV0pXDL0vbXwlE4vF/Ao0KWVA1ZKx
+cDhMELIACZASGOPA/Ussy3IcBy4fIsEAICRIARI4RgDSbW5KGUpoZHB8eGgqEUtkaxOuW0SECSbC
+4fBA/9Czz293AS1cMGfe7GmS24jQbG0KACyrghACqkhJAKlGqAZoWGLdY0gCKJhgyYDZjXUJgdn5
+7p7x8UqmNhONRwAcRSEIdEDI8zzTNDnnhmGEQiFKKQhBCPYce1bb9PpMsq+3K5msAYxHJ6disVgs
+FoNLHlz5lkLcnyP0Vc2Tz+c55xqmqXg4GddVhWNgiqIApYCE7+S56GurVigBcCE4IL9UAQSSwgVm
+tTbXdnd3W6Zz7PAxTVc6F3aAndcVqmmGoVMA8tSzO0bHS7Wp5E0bVhs6dR3mmxl+vQfy9zV+zrMk
+UhDBQUhASCLEGbdi8XChNNLX13f2VJeCYcGCmVoIO26FM4BLpYT+rtWvywApMcbCLC9dMl9BfGSw
+u642YznuyMRUTU3NW/MPfr7QXy7dEomEYRgTExOO40iPxePBdCpIqSscU0oJCDHm5vP5asj4IjSX
+ije55FJKihUQUnoueOXWluyRw/tcp3L48H5VgVVrFoMwGXORQLZTARQ6cnzw4MEuXcFrV66IhQKm
+bZWKfshUvYg+4sCsciUHro2ERwlgBAJzSUEA00JqfnLAnpw4cuBwaYpdu3xhNEpFJY8lBin9Lbqi
+KNUSBkAISQ7cXdq5YGp8GHGvvr5ufGIiVypnMhl4S3OMn29Y3N9B+L6zmpqaUCg0MTFhmib3WCoe
+a2pMR8M6cE94DDgvl0uTk5NCiDe8j69gKZHIF/5ISgmSIRXPmdVa1xC/fuPacEiX4Myd144iumlV
+XIczzwSimRXlqSd3FiYhEAwHgroQrLdnCAAUavi6WgIHwo0ADQYUJBzGKgj8PGYGREaSsZZpqaXL
+r0lGE1a53D69PhICEK6GKUhJKdU0TVEU3x/JOQeMHcdSwsGO2bOGB/oy6WQiHu3vH/Qk1NfX+0v5
+YjXLldNVOhL8v4FAQNf1qakp27ZJLJZIRKc11aeS/f2FSX+12rZdLBar1ckA/xbZUVUVgx9wACkF
+wcQIGtNbp9U2paBEwZ5i3Emn4tl0Mj/hUqJTBQMQQkMvvvjq6G8W4pEQxURRydDgRKUCABfzzoXw
+sKbU1qbmNrScOblfQVIKz/Ecx3NBVxqnN99/46133HiLoRp1tTHGzZBBsUIk4z7X+0XlUG3GgBB3
+3VS6pr42c+LQ4VQqgSgdHhvFhKbT6WoMwK9UvdLEvyvmeh9H13WllIqitLW1VSqV4eFhUw2H1LqZ
+yVhrxCFeWUgHkFksSjdHpsZzwbiiRZGknEsAiYC7GA27Entq2BEQUWv4ePf6tVnu9X3qU5/efPdn
+f/OzXx8veNGYPa3Bc71xjsFy48BdHau5SeuRZ5+SGlGQju2Byuj4yWPnlLAKoTKmZcVRRI7Mnb3k
+ts2z4hl3KN/DMRFYLReK187r6MjGP/87X7xl8ycf+OSfvnZqKN2SXLSsVYBpUx2UikZ5XSyqYVVi
+pW9yDGFdBx1kfuk1rYwUjl840Th9pmPJ/gvn2hqiqVTKt22uIgPnKqH3LXHfX48xjkQifgpUsZQX
+WGSz6dlzZiaiQe6WASA3Va5Y5Vxuqi6dqc9kEQBBoOiq4FZpwjEQuGUbeZ5ZyFFF37BigwqhUkFR
+lcTYqHn21FA60rxh9Y3CZKpU9QACwplwPI8//fQLwyNlPRRNpbNTeeeb//gvihppaWkVTsHQPCPE
+ZrbWVAqo58KYhmIIqIaCwiXJWNozvbJJmK1MTbm958eIUGc0zdWUsCxUQLJUTVzX1VAoZNqu50ru
+McE8AG/lquWAhOd59fUNXV1dxXJpxowZP1Wj/nxDJehSVyD/ZyqVSqVSw8PDpfIEgExl0nNmt6US
+BjhFUNRC0S07Vj6fDxnazKZGTXBenPIqOUpESNUVCXUJI6yWWKXrrk3XPvT+mw7uOVB2VIEVrNDe
+ngHbdZd2dsTC4FljhcoYaMxhtmIEunqGjxzvEkgfmcoxRzlw5MK5CyPrr9sYqYlOjJ9Zvrhpdnt0
+/+v7hvv6kvEEAbCtSlBH7a21QuSHJiZAMxzPPXPuAkWweH5HfSqkKDZwp74hTRWiBYKDAyP5XBkE
+c+1SvCa8Yf2arvPnazOZaCR67twF12Xz589/E9ZX4Uu4mi2VLwdd1wWARCLR0NBQqVTGJgYdzzYC
+genNddPrYwqxKRalsmtz8LiwKqXOjlnZaAA8M2iQhfNmZ7LxXG4qHhOdndk///OP/PXf/D7G8PJL
+LzDPIobXMjNts4qQ3vz502+6eWlzU7ClpWnVuhVagHjFYrHCfvL0dtPB6dpmI9N0/GjXX33lO52d
+K774xS88cN+mT37iXuBTzz73+JyOmYsXz8sX8qEg2rDxmlkd2XSGKCEMmhtO6Jh6xUKlpTl93eq5
+ujpGDdLa2kgVoera+Qv9k5N5hVDwCmtWLqlLx/bt2b38mmWey/r6BlKpVCabhbfw+C/IXw+XCvJV
+Vc1ms4qidHV1tda1BLLJaY11CzsaDp04MzhYylukZ7jQuUh1LHPh3NaQ4oGZb5ozc+WqNdt2H8/l
+X8vUtTzwgRmWZT3z/HMDff3n+woomK6Uy9esvIXL8Je//A+RQHTFmnUI4zNnexunTT8/aI9YUgr3
+J1t2BhNZV2hWySSRzDM/esa1nT//k/+2YeMNP/jhd776t/9bsOSSZdedODNw+MThaCS5YvUNTJLx
+QiFd39TVl5u7cEkyM+17P3g8EdGXLl/+0u7jHsHNTbWRSFAzgr19Y6WijSGAsPeB++8YGxsoFfNz
+O+aeO9Pd29d/3Ya1AgRc6rcBl5ltP3foq2Vs/sPi8XgqlRodGZ+YLNWmIRYNzptTP6MlMjo87Hne
+lKXmKmxgaLC1tX3J4jln+147efT4H508DaUe8ARQHYDRqM7yeeCKmmqkoZRHig8//Nx3Ri8A9sBx
+QAuCwwFyOFEnbAGRFHCUKzhf/9a/lB1LSaSYUwzUz9i6ZdfWp9aArgK3A4mUIxKPPLnne997EkQB
+QCNamttTIIchNlMJ1u3cemjnky8DzwNUsBIRSmjN2tmpZCgWD5XNSnfPoFlhiJdntDWtWrVk+7af
+LJzfAQCnT581Tbuzc4kAgeHKOom8O9D7uFe7ZkWj0dbW1tH9k6OjhcZaLxTEs1prF81vOnUmNzyB
+9x7puXH9YiMSUChfvapzy46TubKOsSEjEeYhjQRsp8SQiWtrA8FUucTB9YiKTacEwUw0EnU9m6gB
+syINb0JoqqUyrBFuSYGoNZ7HibjHiiA8T1AareOeiykSCHtYUaNxa2wKIvWJZPvkcI47Oo5FjVDa
+YZrnIhRKUCOieTUUuRXhCUQXdy6IRoKRaPB810BXd7/kCKS87zc222au68LpDz5wd29Pz6lTZ9ra
+2pKZBAcHvVG8XGk6ArzD7DMhBGMsGAw2NTWBpJMT+Xy+KCVvqE91zGqpSYQQkhPdo2WTcyHypYlr
+li2MRsOOKzAN2lgyTBxCOVGUcEgotOxUQFOI6kpcBNVJZONlx7KY60gpqKKQuGNhJRAUnCuqapUt
+tSYtQAHCsa4IQALpWIkQJYGVpGfpFitqdUlk4MmJISNZY9SmBYDFPUwcUF2iMc8tCwJSIx4W2da6
+RQs64tFgMGgMjQxPTk6pqhEKBu697+6zZ07kJscbG+pHhoYGBgYWLVwMAOQds/zVQH95xpkveRhj
+dXV1LbOTI5N9w0OjzKEqhDpmzFm+eHZYK4DNf/LU1glbBS2WjRp3r1sEdr/FhhRJgFUwn0SyyCum
+Kim4jkJscG3ENSxDuWJFEsCKwrwKQvmyaksqvLJFJJVSkgBSoIKKI2A7mAmCKCDCgXiccWGDxgGw
+YxclF6DGLKtiOaOgCSEikiPEGaEICOLhsMUEFHKbOmY2pnO6YYERe/ypPXZJdfPjn/zwnZm0fOXl
+569fv5ExZf+h4xKxa5bPowDCFZcb8j4OP3eu93WLz+++28Tv+tZY3yiEGB0btqyKopBp0+qWX7Og
+rS1Lw+qevYePnRgkSpQxd/36a+bNbpBumXkcADMuNSOAqeJ6LlDsuRa80VSoHl8qSSVSSte2CSEz
+WlsDhgLg5+FfvpX3s47fbvwEI8UZL4BAgnG3VJgzp/X6G1ZSorXPmPviCztPnT43NtLf2tb28U88
+dODQq4ZhdHR0nD59+vTp0+vXrw8EAvJS/413SFcZpaoiUtXys2bODQaDAwN9QyODpmNFIvqCeS3z
+5tRHazRpsxe2HhwZtfVgYNbs9P13b0DWpDRNTdMAsONxJgEI1gwVuPN2JhrnHgAgAAIIJI9FgmvX
+Lm+sS1XTPwHgjRPw08lzAUsNFCMQS3iWTTS8YtWihmk1Tc0z81POvr3Hh4cmAcRv/fZHdZ1ve/mp
+jo6OhoaGrVu3UkrXrVsHVyXWfypdjSNBXmrH468y39ca1SNNDY3lSuH8hTO5/CQG1lhfs/raOZls
+ALTAnn1nt+08TjVDVdmtN117y4bFYBYQdxWFSMGBM+QvWPq2lrLv28IYI0RAgk5RW3OdrjCQ/I24
+/z/Ql4JIDuFgmJkVyI0uXjjz+uuvNYIiHq/fu+/kc1t2VIrmNSuWbb79+v37t0lZWbNmzeDg4LFj
+xzZu3BiPx/0+Be8ky7VKV+lIqDJ7Nd8YA+pctCCbTfcNDoyNTnJPhA1t4ZzmDavn6YasTOWfeW7H
+0eM9gWA0HlE+/fF7W9pr7fygY+b0gA6ESMY928Hip4ga/9hjrhCMu9xzXBBMU0lAA8nLIGW1nuTi
+XyQuz5Z9EynUUAgRXtmd7E02xG69edXMGdNSmUh398SPHn723KluopKPfvQBzouv7t6+asXKRCLx
+8MMP19bWrl271i+avHzRvxO6SlkvpfRlvbjUa1UIlkolZnfMdD2vv2+0MGVJhyUjkZvWLV6+ZAaA
++fq+g4889pLHQsFIePacuk89dFsyjiA3IL2KP5vSZdJm8EaBVj0WzHWZB1KCQJTQunQioCND43Ap
+EOYXUiEs/cvebvxCCC6sSnFQjXh33b5y/XVLQ0ElFos99dSLjz7+LCC8es01N92yetsrz4KQK5et
+P3HixN69e2+88cZgMCilVFXVD4VfDdhvpKvPr/cP/JnAGLuOBcCmtzY3NDQOj0z2dA27FV4Tjjdl
+jE03LW1sTwmz/OyWPU8/s0fXY6rO77xlxQfuubG2Je2YBWCOKhAVmIq3XcuaYVBMdCNEKUVSNjZk
+g4aiq/Ii16PLr5I/Q+xw4blWPhDiN9+05IYbljRNS2i6un/f4R/+6+Oe7dROa/jwRx4Ym+g+cvj1
+O+64k0Jk69at7e3tnZ2dfrj8XQHdp6uR9dVGilVnqRDCMHSzUk6lErNnd1TKTs+FgeJUyaB6Iqwt
+mDt948YVeqrm7Jn+v/v6Dy509RlBLayzhz5418brVqpYCtf1XBcYN+gb2mxfPg2u63qWKaWUjHPP
+zSRT4ZARDGhvYPC3N2yqRAhCFObPb/vQh+6ZM7sRwCoX8v/7L//vyWNnFD181113rduw6idP/7ip
+qX7OzLknjpw9fvz4DTfcEAgE/JCD67qKorw3AqeqXeWlEplL4zAkKACwYOGsjnnNXQMnT/WeHqsU
+ZCQRTYQ3rl24YnE7Mchr+87+yV/868RUrdB5c3Pyd3/rgx+587oAy0kvjwxaxAILDUtVMoQEQVKC
+6yHOVAKgYaBY1TDzzEBQMcIUdB5MGyAFuCC5DkiXAACCioAqUgQh4Bw8D0lJEMIAwAE8EeLlNZ0N
+f/nfPz6jPhjWwgqq/7O/+N4zLx0HNb546ZLPfPr+4/tezg/03XXbHWWr/P1H/2n9+vVz586VUvpB
+Zj/r6z0zLn8q+XLQXxALFy6sq6u7cOHCxMSEpgZj4UgiErjp+mtnz2rEmnx6y/N/8b/+Vg2khsen
+6upTn/3PDz34/lvCqucUxhWEMPUkWAAOIFdRsBpQsQKua1FsANKYB5QqKlUSyRopeSBgAHEx5UA8
+ISwgTGCP8bIEB4ikukI1jSBMECYgwbPAKW66beVffOmPdF2PRjOBQPJv/uYbL2/bDQ6vb6j54z/+
+HEbeSy89v27dmtra2scff1xItHr16ng87rO8z2pX2gf27ehdg94vmvYXQWNj44IFCyzLOn78+MR4
+Lh6OtDfXtTdFN924dFpjwssXfvDo83/8xb+3mUoVGY/wP/yvH/jif/9U67SoN94tRBmBR4gQzHLN
+kutaCIimBz0bg4ts0wEAQlF9NoNAZJIpLUAkEQhJEPxiMZt0BXK54MyyOOcUE7eY90a6G1P6Rx66
+/YPvvy4SEq0tbdFo4ze+9fBf/fU3x4YmtUTd5z730c7F7U89+bCq4Ntuu23Hjl07d+y+9977Ghsb
+4VJTjmpm69UFY99E79pXG3z5gxByXVfTtDlz5oyOjh48eLC2tiUcaFYRT8eUjesXdXX3D4xOehX5
+9W8+r9L4Jz90Q3OtBmLqzk3XNE1v/IdvPfLSrtOOXcFUo4pKsIaJajsesz2gKlENLJlknACORkJm
+aSQWidbVNfT05BAoAAg4wgrCGlKp5nBCNORWTNvKB4Iwd8W8zZtW33LLdUHdytbWcm586Utf+8a3
+/sWpeIFU+t73/cadd1637eWnTp44+OlPfqi/v/+JJ564/oYb16xd5TdP9t+xmtXyrgicdw16vxMS
+AGCM/bZUS5cuHRwcPHL0UDIZSsYDzU3Z7r7R2zetLVrouS17wI3+/d/9aHK497/+9j3trSkDwarl
+M7OZj8x+7MRre/adPHEmP5ljWFdDNVhSiShCENBV4NzhXiaTSdTEhgcHatPZ+sx49/FBGUnqWsxh
+JngWc13m2ETTmWBU2s3t2RuvX3rDhs721mQw6E6b1jY6Zv6P//mVb3/n8VLZBUVZs3rJ733+U6dP
+bt/+0pZ1a1e1t7d/7at/ZwRD97/v/ZwDIUjTNH8jKS+lsfjr+x0i9q5BX/Xt+IU+nPNUKrVq1ap/
+ffiR/fsPrl+/JlGTpnSivTX74ftvExV7+2v9jiV+8N2fDA+NfO6/fGTpkjkIuzPb6j/76XnXLmnb
+v//463sOHzt5oVAucEciqguPlxhGwpZ2obVlcSig2RXb0EKLF83atX0Pq+SFJqRXkshGGCFCDFSe
+M69t5YqFixa0tU1PN9RFEzXBgKHsfPXoX/2f7/zk6b2qEZOssmxt5x98/pNmfujxR37U1tqydtWa
+nzz57MjI+Ps+8EEjqBMFgF98NV/mKIrCGJM/s3P5v5PeTYFT7f1bzUScMWPGddddu3XrTj0YWbFy
+WevMmRfOnG2vj//ub95fNL998NCIw6Mvbzt36Nhf/M5nHvz4RzYTcDQ6fM3C9LLFt21cv+jVPUdP
+nek7dvLC6MjElCtZOSeFo6jimqULE4k451JTjGWLY5GgVxwdEqysRvRYVM+ma+oz9WuWtWezNc0t
+tfV1NfW12YAR6u8dfWLH9i/8r787d2ZC1TOWaU+f0/7nf/q56U2R//GlLxBEb9x4y4VzPdte3rFx
+48Zrr13leAwulUvCZblfV1FA8lPpXYPecRzfx1KpVPzPV/gm8Lq1K3oHxl/deygYrVlx7byG+mz3
+ia4Z09o/81t3/fVXnT0HBlWtNlew/uS/f23b1hc++bE7b7u1pSJKIPRYzFm7Zs5161d09Qx3dfWe
+GzN7L5wvTo1T5K5ZuyIeBatiWtK79oZlC+Y3TBXUuvrWtpnNiYSRScXbm6dH1Uku7HQG12a1cnli
+1449P3546xOPPZ/jCjVSrqenajNf/NLn589v/7uvfGF08Oyn/9OfYEl++IMfdcyad9dd99qWpQUM
+izFD03yu8vN2/WyMq057upzetRajb3cmxrhSsR5++OGenp5bbrll7ty5IyMjvb29TamGQ8d7/8/f
+/mDPoe5wLGPZJnMKkZixbsWcD9x/97yZ08ArCmm53DU9p2zZAKHh4eGp3KRlWYsWLchms9u3bz93
+7sytN906mc9xzuPxaCgSlpIjSgzDCHGsG2E1EDrfO/zo41ufeX7XwHAeYS1spIsjZ2unJ772t19Y
+v27xV/73l48cPvzRD3+svmHaX//1Xzc0NHzoQx9qbm72PSV+Wf7bYnfJkXV19HOHXkpECOrrG3ji
+iSdGR0c3b97c2dl5+vTpgZ4LDU2zjhzv/5uvfX/v/rNGKIExrRQKWGWNdYmFc1tuvG7pnDnTgDBV
+J4FIWJOq3/pnZGSoUqlomjY6NpzP59untwbCoXAoquu6oqkYU9f/1ImNz1/o2bFr38GDJ4dG86W8
+DUiNJNPFoYEZ89r/+I8/s3btgu9++2sH9rx6+6ZNSxYt+dcfP2Lb9q233rpmzZpqVpPf2/ttsfsl
+h97PGSUEnThx6vHHHw8EAjfeeOPMmTO7+84cP3aipXl2b9/kn/35Vw8e7o/UtBASzpUrCHtUVtIJ
+mk3r2Wxk0ZJ5CxbMi2Gk6Uo6neacF4sFTdN0XUUIOa6lawEhYCpfyOfLU7liX+9AX1/fgZ7RrgsD
++SkHhI4kDYVCGEN+ZKhzacvv/u5vL1/W8cxPHn72mSduuWHj6pVrnnjiqYGxofvuu2/lypVV+93z
+PF3Xf4Zg+WWHXkpk23YgYCAE3d29jz76aKVSueeee+pbGgd6Lpw/eyoUjIQjjV//5hP/9I9PgJJF
+iWkBlZjlSWnn9ACihGkKikQD9Wk9HA5HIpFIJBII6JT6CXCkmJ9yXVaqmKWiUyyZuanS6OjE5FSe
+h+PgEahIEkhGw+Gp8QGKnfkLZv/llz82e/aMb37jqy+9+NxHH3pwZvuMbS++0tvTv/n+O2+66SYA
+KJVK4XDY//RMMBj8FYbe3324LqOUYgxHjhx78sknLcu6594Pz5ndPNB/6vTJo/GaWkWvffTJ3X/z
+9993vDANhQhRnGIJhFANHQE4lTKoRUyIEFxVVUKRXyePEBKCcS5BYiGpZAAMgGpENbhnkmAspEWk
+zYvDfSBL996/6fd/73c0pffrX/96f3/vnXfcPnvGzOee2TIyMvbQgx9eumqpr0ir6lRRlF9tgYMx
+9jxOKXEc/1MOyunTZ3/84x+XC3DnnTcvWjyrr//c3r37w9F0Ott++MiZL3z5H0b6R8CIhWK1rkeA
+YxDItW0cEcI0AQOoKrg2YIw1Tbg2IipCWAKWTIAkABiIApgEKa+UykQKXpiM1Bj/+T899IEHbuOs
+/H/+7x8ODY7cd999M9rbH/3x47bt3nvvvatXr0YE/EiIYRh+dZiu629qhPBm7H75oS+XTcMwCEG2
+7eq6CgDnzl149AePVezStauWrVm/pre399ChIwEtnEqkhsbsr339n3bu3A96jRarZQxzhwVDIReE
+Z9tAkJ/ajzH4uSjgf1lHSgAMhGCFCiHA4wFue67lWZPz5rb81//y8VtvXnFg345//t63TM978MEP
+IUSe37IVIXTnnXeuXr0akOAe87H2zUfbtqWUft/ct8Xulxx6xoSqUsfxKKWEINdlAKCqtDQ68p1/
+/v75vr7V112/4fqNTqXy+o5d+YnxJZ1rciZ79Lnt//C9R5yCo6ZrXddFEpAwNE0RQjiWpRqqlNKr
+lI1o1LEvhskQAc/zgHlAsarr7sBAIGj8xr0bP/+5jyVT+Af//A87XnkuHgvd/+Bv53KFp55+Nput
++/CHPzxjRrtf1EXgoi++6g9Hl9rlvi12v+TQvx35q+Hpp5/euXPnokWLNm3aJKU8ceLE3n0H5y9c
+2NgyY//+49/4xx/uef0EkGggEDM9TYvojlsEcABxcBmoOsGa4BVVCXNH4y4JaLqi8HJpmBVGZsxp
++s+f/eQ9d288c/rAd7/9d73dfdcuW3X9dRv3HHztyJEjnZ2dDzzwQDwel1Lquv6zZfrb0a8q9FIi
+3yO4e/fuRx55JBKJ3HHHHTNmzOgZGNzy3PN6ILh23Q2WLZ95+pVnnt1+/NAJFG+llEokAEshhJAI
+EU26HtUJq9iAlUggWJwcAnOkZU7LBx78jQ89uNk0p5577tHntzzRVFd30w23cpe8tnOvoO511123
+du3ampoaP8p61QWYv6rQX76QL1zofuyxx/r6+ubMmXP9zbdI4K9s237wwJHly1etWbXx5IkLjz/2
+kx88uss2HWLE1ECUSSqBMEAghapSt1IAsMCZMoLi/ntu+uCDdzbVZ3bt2br1xS3jo/0br9+wcN6C
+IwdPHj9yNhJO3Hv/HUuXLqWUVioVXdcJIf73Dqsf3fv3068w9EIIx3H8Vvi5XG7Lli27du2KJJO3
+3XJzx9zZ+/fsfWHLVkMLrVq+uq1t1v5j/Y/8+OkXtr5emDIhlNHCcYdxrGCRn8QBYuj20s6W3/zY
+vcsWzzl9/PAr218+ef78smWLOxfNZ669f//+/t7BzkXL77z97tqGFAD4TQ4uj35cBf2qQu/XZBFC
+TNO0bdsvwT1y5MiTzzw7NNC3cOHc2zfdlpucev7ZLSND4zU1yRtuvY1xevxk/yOPbd1z8EyuUAHH
+hVCQgNve3viJj9135+a1gz1nn/vJk6NDw/FI9JbbH5CSnz13Yu++1yLh4D333LV8+QrGGCHIsqxA
+IODzu19df/m7/PvpVxV6z3P8WG71q36e5xmGYdts69bnn33uKU1Tb735llmzZp88cXbXrle7e08u
+W7Z6Uee1XBr7Dp54/Cdbzp3vrmts+PD7f2PD+tWmOfXs048O9Xc31jcsWrBk4bwFh45c2L9/r5Bs
+xYplCxZ2JBI1qk4AQArhZ5D5D/WrSj3Puwr/+68q9EIwednXrdGlj/wpoLmu0z/cu/XFF/fu39fU
+0r56zXWJmsyR/a/s279/ampq5eo1HXM7R8emOMOt7bOlnd/96s7u7vNNzfXLl1/T0DBtYGDg0KEj
++anJlpaWRYsWN7e0qqqKCBCCGGeSv+FDatXebVchdn5Vocf439I35aWPdRJCpI2QigCBaZmnzp1/
+cfuOvoGxTCa7YsG8WCx85OiBV3a8BBJ3LlpeX9c8NDSaH+nPZjOLly1ubmkZGOk7cPBgqVKMxKPL
+FrXW1tbVJOoBFM6xAIQRxRjgUrOsajWvlLL6dbUrovcS+uoI4Grb8fyUASFUlUJSSsuyTpw4sXv3
+7vPnu2bNmtXZ2akoypEjR1577TVCyMqVK5csWRKJRPL5/OHDhwcGBjKZzPz585uampLJmiou4tK3
+ht+VEMflQ/0PBb1/52rSi6qqQojJycnz57sOHDjQ09OTTqfnzZsXjUYRQul0Op/Pd3d3j4yMxGKx
+2bNnt7a2xmIRuNQlrDow+c46sf5U+o8GPVxWpVX1qABAsVj26xS3bds2MTGRSCRCoZBhGOPj4/F4
+vLW1dcaMGfF43GdwRSGX90q5fNjvSh6HT/8BoZeXPvZd5X1fKHseBwDOeU9Pz+7duwcGBurr61es
+WJFOp2tqahACIS7Kcdd1dV2tDrKqUX8N/f/75m+FXkr/GxzAmEAIWZZVLBYNwwgEApqmAIDjeEII
+XdcQAikBIXgT9PKSU+zdGud/QOh/qsDxEQcAIYSiEABwXaaqFAD81aBc/ED5G36+VeC8W4OEdwz9
+/wcW5nN5ZtVTUAAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_lander rover" model="fleet.vehicle.model.brand">
+      	<field name="name">Lander Rover</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAzd0lEQVR4nO28d5ydV3Xvvdbe+2mn
+zJkzvc+ojTWS1S3Zkixj4SJXTLHpENp7kxe4KW9uwiUhuVwSwk0uJCEkcCkBDMGm2eDesS1sWZIt
+WV2jOirT25lTnrrLev84I+EAIibxfYf3ffX76DOfo5kzc/bzffaz9tprr7WQiOCi5kJsrgfw/19d
+RD9nuoh+znQR/ZzpIvo500X0c6aL6OdMF9HPmS6inzNdRD9nuoh+znQR/ZzpIvo500X0c6aL6OdM
+F9HPmS6inzNdRD9nuoh+znQR/ZzpIvo5k5jrAbxaXShzAhH/Hx7Ja6X/16O/0PcZ+01/oF879Abg
+/PyjV7wGIARz7ucIQEYLxn/2Uzr3XgJSoFiopFFKGQOIHAC0ImMMyUQDEZEBAgBtZmUzj0gzAEQU
+gjPGAAwAMCRgiJZgtsU5tyzLZhwMSWYYcF4dJABVB1sdoVYWZwAApAlRgwFAARwAjAFEREQieq2e
+M3ytUqCI4PyQqn/z3BAVGATgYAgMgEBAAKKYKQDDADmBjJMwDBOVAEBhImGCCyEQqfqniAwigoQq
++urFG6Dqp0j0gRgiEqEx5tybICbGAZkhIxNGkM54mZoay7GyKVvYNreEAUIkwTiQAa3BWGAxQlAE
+DIEDgCRgaNAwxl5D4uf1mqEHAGMMETHGzo/SGGMYIiAjjQCAaLSWShGh74dGQ3Xmaq2BMaVUGMeC
+kUGjycQmimUcyDBWsTJ6QpWr76z+ChFVvwrUQIyjsIBbYFvctrhlMe6JlMVtz7KZRpVIAwBMICIJ
+YIxZjNkWT6VS+Vw2nU5zzi1hERAYZAhkAACQgdbA+L+C/ps56/X5MRFh9R7A7GMNSitiJKUszvgy
+MUQcJDEkC4BARxQHKhr3C2PT48fMQJSEpcAvR5WKDCKjElKaCDA5j/uVVtyQrZTWidZag+GICMQQ
+WV4ry3JqvFyNV5PFdIOX76htaczVN8QZ4kwZHSkpwSATzBKWcBb1tae9lMOFZXEAUEYD4waM/Qqb
+/EpW//Eb8BrOenPOzsza8SqpgFTihypQqCgJE2WMm/IMQqAmxyrTZ/2J4WRiuDI+URr3g4JKYtv1
+XNuucVN1TrbWTdc6qYyVcoWVQZcxJoTgnM/e1HPSxiRaJUr6cRREgR+FsUxGdLFYLk8Ui1PlcrkS
+KgMWsxCxo35xR21Dd7quPVXfmqm3mFsJZRQrDyR37XQu29zRks/nXFu4tgOkAa1X2tLXUK8legA4
+v1FQyoRhGIbhdKHoOR4Yzi1mXBrxh/uHD56dGjw+fTLUMiLtum5bbX1vQ9uCfHNzKtNIWYacGEpl
+ykE4XShOTU2VK8FwYVIpFcdxkiSJkkRkEBAx7dgcmW2LlGvXZrJ1tbl8Pp9JpVvcBmExJjA2SSXx
+J8PimcnhobHRJ48eLYSVmSAwwBpS+Xm1HZc2L1zQ2FnntmkttdaB70sZz++Zt2Tx4pTrWmkLYNZr
+MMYAwM8Z1X+3XjP0xpjqZIxj6ft+FCZSSq112rEjVGdmzh4eO3amPDQejPuq7Ka93rq2trrmznR9
+DbkeOUmkR8cmx6amjxdPVIKgEJRLURBqGZCSZBLSmhtEBIbAGSFQ9alCCFSExJgh1IZJYyGzGRco
+hOVlbbfedvOW05LKzWtubW9prklnUpaY9GfGwtLA9NieE8cGhkf9SCtDvY3LOhqaF7XN68g3W1qU
+CkUGvKW5bcHCLs/zcrka/q+cQfMf342+drYeIJFJpRxUKhWtiXMBAFrrreMvvHj0xbFwiGdUY7b2
+io7VqxsubYR8aOKZUungkYM7D+45MTE4Q4lJCZFNsRpm27bjWJYrOGcAxoAGmPVcNBmptQKj4dy4
+ZUQImpCAaeKaSFfdHJ1EYRwrbRKQUQIRWYbbaM137IUNzdcsWb6mZ1FNyouRHRg8vfXll+89sjv0
+I6FEZ75j4/INK+Zd6iY8LkeFwmRzc/OiRYta25rT6TTnaIxhDOYAfQIgDDAEjWAILAJAiOLAD1Sc
++FEUcceNlD5TOLl3es/e8T0R+PMautY0Xro43Z3W3vj01PGhM2cGT7/sn1JBUGEJZe2mfC6Xy6Jn
+C0UhKZZQDKQMMKkVUmI0U8oAxQw1gjGAiUIyCTcJaqWNhYzISIqlUo7l6ohAOJoSRFRKAWniQhFo
+aZim6SiICyUnUo1edl5j86XtXVf2Lu/M1rHQH/HLzx7Z93x//+BkoYbnVs9fsbJnycL6pYWwFMRB
+Yy67sK21u6PTq89pBgwUAjOGIbJZ22MI0ADyf4Pgv4n+vAGpqvo2ImLADBhi1Z0GAw2VKJqoFK1S
+hMJDl+8b3fuT008fKw/UgHt5x7Ibe9YiE2GS7D6w74kXtx6bGRJNqdrWfFNtnccsO+tJ1CySsVYl
+mViMAwApDci0ATLGMIxAMyRlVKIUAAIwrbUxigEpUloIHStmDDA0nBKpDXBtmACtlCFJrrATqcMk
+tBxLqySxhQWMGQqCoByUZRB5yD1mXX/JipvXbVre0IkGXzh88DtPPLp/aDBhcGnz8hs2bJ7X0F0s
+FEt+0NjSuGb5pV2NTZYtzk98bTQiMqj6z692Dbgg+gs6sJQA2UCgyEQmKlbKsihd45RSE/vPHN8+
+tH8gHG7KZa7uXNqbaldlNTQytevYgf3DR6e4n23Ndna1ZByBWpY1gTIKjIUcQkVcxByJCKQ0iGAw
+IUhIgyHFjTGGMSKttTJAlDCIQQmpFJKtODGMtZIctCZjDFo2C2UsIkbMSCDipLRRkgsyYETMkAAJ
+DAONTCPEYcQJRgvTnqJFtY03rrji8oWL8+ncyNTE9t0vPfjSS2Vfze/su37DDYsae/ypEoBp6Wxd
+PG9BR0fzzzk/hgzHV2uIfm2DQ2CMJs54JYhHxkeEjczGscLEncfuOTF8oqm25sbeDZua1gQT/qM7
+nt45sGfALjfU55pa69L5NKChUCV+rDTZEjHj+jL0bMdSlBhSDKWUTPDAGIx0RBoEA2XIRtDGKM0E
+D5IYIhmSiijxuBU6rCEWPlMzkZ9w5ijh2U4IMhXKgkqIKDE6MYpzzqVJlEzVZB1DWilKjGC8uiah
+ITCkbcv3y0G5UirONKTSmxYtu3npZVcvWVWplO56/NG7nnl2OjRXrtz05o23dKQbxgeGMOutWLFs
+6ZIFgJAkiW3bRPRrefu/Cv0rbc55g4OMhaALE+M4o2rTtWfN1IP9j289+ky2rvaGpRvXZLuiM9N7
+BvqfPrP3lJqq62yc19XsGoqTIAZDCbW6zfXZ5pignXsHZ4aHg2k0GtAQAyKyGJ9W0gKxJN9qWQ4R
+jU6MHiiOpNOeSkhzjJJkQaq2OV+PnEWlygsTA1Ec2w5b2Nhal8l5oTg4cOJgMtlRU9Nb0+sgaAgT
+TDgybsRQobj39CmeTmzbVgQcuJYKABkKIuJ+yFEgYqxVYtTUxKSr8Yrlq962ZMXSrgVhuXL/tm33
+7NwuIfWmDW+4afnrSoEflCs93R1rVq9MZ1IAQMYgY/Cq2b+q8Nn5mAwiRjquTPpYMGnX2RscvXPv
+A2dGj6/tmH/H6ptSCX/qJ1sfPfzCTC5q6K5f07Kcgx2VfCCQQvioLQm9XQs2LVprMy+bFrvu+mJk
+kqznxiZCxkgZKWUUxpe0dbx93bUZJ5WUK4+/+Pzzpw7X1GSUgCiO0sK+7pJVG5es9Cx78MjA6NmR
+B2aG1rV3/NaqK5e3zp84O/0X+/uLcWl5Z9dHN13d6DqICdqURBHXfDAMv/X0Y08fO4RkAMEY43CB
+igBIGQ0W09qQNJ62MujW1qdLMnpq796n92zf2LXoQ5u3fPiO2zeuWvl33/ruN77/lQODRz+w+Y58
+a/3x0wNJHK9bc1lNLouckTHIX63B+VXoXxEYmI0KSCnHx0ZFxNP16W1Du//p+TspC7917a1X1S55
+/Jmnnzm+a5Cma3trlzTP48IKCpUUJbFjcU0CBcWBIN6Qqa1NZx07fezknjNjp3lzjcNBG0i05kJE
+UZQD57KOhfPzrYAA5AppiknYbkwliU0c1Wcylza1tjseMObl6mqJh2XZlW5Ylq1vdN39k0NnipOJ
+bXqcuu6srk0LFSntCieVgsS012e9mzcf/peps5NjoiYNZIBQa4WkkUiSdjVDiUywipGJlGlu9+Ya
+p8hsPXXm0Pe/edWiJW+78rq//a8fv/uBh77xo3v+uv/kO25/17LeS8+eHYu379ywfl2+Lktc46t2
+Ol8V+ir3KIoKhYIoZ60mde+pR77y/Pe7a5v/+PXvqAn4t7//7YcnDudqMz3t3czmvl+2QCBiBbVQ
+CrXRhJEM6rKNjfm8SCTn5rsPfDexk3zWjkolx3Ol0VLrSiI3dixa37cSiMaicqPlxoww6yWJIlSO
+gNZcrq22NpFhQCqVtuys3WRlL1vY15TLl3TlsRO7z1pxQ0vzFW29wnaChB57ce+2w4dX9l6yeVFf
+xmMLWztXdS0aPjPIXU0cZZKQlAK51hq1jgEBQMeJ4LZnsyTxFcdsmPbyndP+9CN79+3tP/a+m97w
+zjtu685n/uquh/7p61/84Dv/05qlq0bOjOzet++ydcsyKe9VcodftS+QUAYJYECDBEpADc8UkqKw
+6uwf7Hvk8898c2Vz5+dv+6PiSfmxr37pwaC/bUFLbUteGgr8WGoWEcSAGrCMrILoK2Mn9pK6vm6n
+HTK5ifEzBwvTLFcvKjTjcB8hJphUujPb8oa16xu5Nzk+6UoKufE8h6YDgS5TkGi+KN9ak7aC8ngq
+DIVntWZrl+ea17fPB5uPjxWOjBYCtNbUtlw2rzmTtQqTxQd3HvziS9s++9Q9R8KhSBiIYF2uoaiL
+aIMIoqRQmS6WT5crE+WwVKKpoioEqliJGAdSEgxHcgJeZipotL0sz0wl5gv3/eivvvP1S163/uE/
+/4NUOvmLr31m+66nF3S3HDs2sH3bXjIABFoqAAAwRJpIV8MPv86s55AFTgCEYAEOTk1LP6zN1/1k
+4Cf/9MT3Nq9c9ek3fujpZ7b9w0M/tNq9npZmRbMhDmMMIlZDjIjIFGowsUwE95Z3LUg7riC9e9/e
+KG/nkE8x6SkWG20iBTLZcvnK+fnWk6dOPvn8T2+45romR6QALYQKV5HSHV62r73HKGLCTgiSOGqv
+a1ypIJ9JQyhf2PVy//iw59prWnvqanKg2MHhk8fKg5mWuiBKQNuWBFtpJ8mg8kqh9hTbsu6qnqbm
+SCYi0RqBG5VEIXNTj23beXqmks6mExkJI1RiLBCOSCGYwC/u3HuwUvjn3779rf/4Z5/8b5/72y98
+6yu2lVk9f+mpk8cOtzf3LVoorNmdPOccABDZLw3AXRC9YcQ0M0wh6cCnYCbJ2Pbu0T1//5Mvr1vW
+97Et73v4x49/7YWH7Pk5r84lZrTiWs8GLxlDIAIgRLQ1SITEYGtjQ3e6VnCARL58ql/apiQDz81G
+kWYaKkrefMmaDQuXiJi++uA9Z4qTW+zrXA4CKDbJpPRzjr2ma9HK9vlxsTRdCRljtRm+pLunram5
+wXGmxws/PbBv2ETL69oub5vnWRwifujs6QknmSyWr7pkdVOu2bZswfD42BA4QifRgtqG39l8zdKa
+fMUvWYyN6NjTBpQ+Nl2+555HiDuxJgeIEVPaKG0MQ+BMWCk/CPccG/jvd37nr979rr/52B/+9qf+
+x1fu/vqff+S/tLe1bNu6I5/NtLa2co6c86qLeKEd0gUNDgPSHEAbhjg2NQUxzIQzX9vxfafG+Ys3
+feDkvsOffPhbcl4235ABpJkwSgwlhmJtJIEkiLWJlK5+DRLpS9nb2J4TFjhs/8DhfaURYVvGs+RM
+ILWZlHFTTd0bV66vzXiPvbD1+7u3Vups7jLQUghErdIouII1XfM8tEcnp3cfHxirlITNO/L1S9qb
+UowfGxnZPzMVCZhfVz8vV+fa1sDw2O7+E+NBZGJ51eJLG9Oeb2LN4NDIAANKR+qyzgXz8nVBcWai
+Mn28MOjFcZOXbqytHxocG5+cSmdSqA1qkGSQM2AA2ug4QWKel0HHGzg5+N+/9r+kMH/+kd9mLPrm
+fd9TyID00WMnwiiqHqZV18iqDfg10ANBAsQ5l2Ec+34m5z16aNu2Uy//4eb3FwfG/+Tuf8it7Mjl
+MjOJLPgxGUtqJbXSZJTR1dfVf7FNoZEMrUU1LV42Czq554Un+ysTxThOwsQIIaUux/57rrimOVVT
+HBs/XRjffOWVm1as5KQTHaYtC8oR+HFHJr+8sxuS4MCZM0/u3e3rhAMJIx1hTJTsOHPiNAVNNTUb
+L1ncXF9LKnlq/56Xx4f9CX9z95I1PR0snMln0i+fOPX8wcNOpl6h98jL+9/9l3/10c9/6YkXjwZ+
+StvpJw/0/+W3v/fPjz0GGZehtgySBAlKo1GkADU3hsUJJAmTOp/O7hkY/Juv/vPS3vm//6Hf2nd4
+//3PPNHUnD9x4kQYxgRICFWzcyHAF7b1CBYgID89NupyNlgZum/f069bturyhiW//Td/PFqvF9el
+TdkvI1jcShCMivGcqh9JRJzzxKi4Em/oW93X1AGMzg4NHR88LYBzY7HQ+BgUk3BL3+rL2+ZjnFjI
+btt49VtTDrcx8WcSm3tpF2y7yPTy+vY61ylPTe04e3zv6PC7PNcGU9JxVngTlcpLo2eLpDblmzfM
+X2jZMDo5sfP4/rGotL578Yevuq7ZsxtydSbCL//wftnoJCpsE87CpvbmhsZLmjvS6Bzad+Kr9+05
+dObM2WIJUumGtrawXGKGMS6Y1lprozU3wA1DbRghIgvjSnO2aef+43c99PCNV169euGCJ7Y+cfUV
+lyEXL+/bu2nDete1tTZVGr80PeJXOJeMaRlog0YoFt/93L1+OP1H1330oa1PHNITjV3tQaVCSjMu
+hCUKQSklfnZ6UD25JyIDWqmIc3tDz9K6dG0SBJzzt13/hsR20vV1ew/v//5zj/Qt6f2dDdeZoKKA
+UT7dxG0qBUZrIkPKaAaBkS3Mu7JnCWp5enp478jpgoOSDERhgokrci+c7e8vjDuWWN3U2s6FjCqJ
+0a+7/Io16y9f2T5/RXMLQayQf+br33zq8AnTYaW0vn3lpkubu7bu2/1U/0/OxsWxqWmKubbAaajV
+mmSQoLaQgSTNFZu1FsYYrVGTUooD54JzhUje9x54atnCpbdeu+kz//DFZ3e/8MaNtx4+1N/X19fR
+2oScMSAiQgJgP2/uL4yegDEehSFPzAiWtw7sXjVv/lKr6dMvP8lbsiRNpAwTwEjNlKdzbirW5rxR
+e+UBHsRxQ0tLX0uX46UoMvVNjbe0diHYAOL487u4bf32629pq6mlJHnoiccePfJyOp2mOOnpbn3v
+9TdkLa++pjYnUpuaFq1btJhw8vTE8LHxIWxti6IIbTufa4CK2X74wJnpiebmxk1LltVls6TD2sb6
+N7XNT2kNJpZ+eWq6eNcTW+/avcs0NWfiQIJ5fv+Bh7duO10uaETFwBWuyaSFiLWqpJhHoUGF2qIE
+ZTp2E0OccaWJKeTAEMAYoERFAA73pifKT+148W03XLW6b+GzO3bctuENjuNIKbXRnHGtFefWLwV8
+QfQxGkcDRGQccWZwcHqmsOX62/cfP70rGqnLNhg/AsaURMaYQF6JNNOEgmtks7FeQEQEQwHwDemG
+ZHJsaHImIa1sLgDTzIrL5YdPPrdl0bLOEp4d6z8xM/yJR+4cyrPGmboJw651+eaBk/VuKhw0vVFd
+b8arTJ4aHh0/MDA+ocqtrj41OjVm14ms2P7SqYf29fvc2pJpa6zQyeMnZWJ8YgwmgNTU9PTLx45v
+7T9ycHpU5J0sK8nAJUr2lIdjrbwaxyYjNFdog9EsQcu4ZIwmJRlqCYylDJOoDWrDpeYoKFEMhFGK
+a9sw7qUoqPgv7T/0ppuu3bRh1Z47fzQwONDR2jY5Od7T2Q40e1JNQPgLwZ0LokdgwCCKImAwMTPp
+Ct7a0LR9214NpI1BBsoYIlJKsXNGRidq1pdnDBAJgLRJOfa+o4eH9h8xQSwZRWBsxlMoKmFUwOTA
+0WN/sO8QaFNRIWWbeurzgklK1FB55r/d9b2KTlyRGRXlh557+pkXd2g/mkzCpoY2k5h7dm7d+tzT
+EZNBKZziqqGufqA0/Sf3/EtFhylMMWUhBGEiJ8MwBEJEXp9NBEaJ8UwCFmfkZITLbA5BxGIlLCB0
+pVbCSsVRxJmwtGFGok6kBGMMZwwRjVRaKY6AhrjgoZRagmN7w8Ojo6OjXV1dtuDj4+O9CxYWCgVE
+QADEWSfn15j13AAgEBrgZnxm0rNsj1svHNprGEqjjSHGkIjAEANggAaIAXLGEEArJYmAIXKWCvWw
+TvqTAARkbFfGiQaQSHGN8mynf/J4WUYus7PclUw405NoQWM6U4hK04msWCSo6NW5p8ozo+Nna4UH
+Wgk7pVUlZPZpgiiKIhWrxOgoUoZzISKHOUHEk6iiJitlaVKZJIma02knDkdHSszYlomVEKgANUYq
+ybnp+kxmcnoikkwZbTRjjIEhI8NcKuW5jsUYEOlEM0BSBokxAE0kk9CyU1olnDsyjIsz5a7mWsex
+isWi53mlYuE8yVca4VeHHquxeRPLpBRWbM5kGBXjAFNojNFktAYA4sgIQBujLQbGgNK86uUwZoiM
+1gWtXGHnszlJ2ljcuNwitLXxErtJZDcuX6G1VoCJIe7YslgZL4xMjU5SfcrLOQ4a49rT4+VMrukD
+S9bOb2ityXhnC8MHTx09dvZsgJaXb1hcU9fAPUAjg+RMcXIsqXguS6yk222fv2pBMh00NjYOT4zO
+jI2t7bvEMJ4YXyVkWRYng2CfLfgT01PLL1mR4ZZBNMZIKUGpMAxPnxkKSzFzbI7MSIkogIAjIyIE
+4IJJLbk2HJgxQJpc17UsS0pJRJb1sxSSC2V//sqgMYJSijEmOAdtEAmRSGlSGnA2zYYLMIbQUMC0
+QIYMtDYMkFfdAiLu2ZU4Nghlv5IkSdZN1aWylsbTweSapvqPX3NDnlmBxTSAFSecVEHid3c9f+eu
+nzjpdIo7x4dGr+ta/tGbb+/NpzLoCGMSjIqv23zPU09++ZHHA5G6bd2a2y67nNv8wKmTn/3u3adK
+AQrmS/8Da19/y+uvbWVpnq354F/+2fIFfR++9Y3cRQ2JHYNiSRRVWuu7P3f3/d9+6Oh73veBa5Yt
+CqM4ikOmdRQHJT85Mjh+970PHz57OpVKMeBgiBEDIDKGAwIRI0BErZXWWgibiLTW1UyhagjhV+uC
+6DUBRyANtuPUuDUzlTK3eU9T04vDA0bY3BIaCLQ2gGgMIGZDBEaGo0Y0OJuUA4il6ek4jjPcvrK7
+d+3CvhOnTz138mAx75V9s7J7WVeqwdMGshluO2jUjJxpksnvXXtT6Ps/OrQLo+Ddl7/+96+56ZJU
+Ci1MXFsAegHYgO++bsvkhH/njh3KlBtTzLHYEFIl8KXh4XS4esG8m1atWtrUKMC586EHdx0+sOV3
+PtqWz3DwU/VNFtkgDEBQmkkOH3rZFcmKRc0dtawSi1y+uzg9MT0ZpGzM1s4bm1x97O5BFSWO45HS
+jCEjIFPNu5LcthFIS2lxdF23XKxEkcxms47jRKGPOJuHqpQS4pdwviB6hZKTJZBHgWzON1aieLw4
+de26dQ/8aBfF2miDjCEZIG2IGGNCGkWGBEObG2OiKDKJBEPz2tquvWLNrcuuyMTw7EvbXzh2igGR
+VClMLu1ulljK5nP9J/ufemH72pXLFvb2aKRWi1/Xtei7z/10w6IlH7v+lmZSMcpgsPJXD32vNpf7
+nRtvyee9lAcbFy1+aPtLM0mcgHE4AyWN0sVCaU1t0wc33bh4Xosw5u7HH/rTL/7jkkuXXnFJL7FY
+cHr4mR27jpyIYr+tPj007b947MQdN13fVmf7OpkIo7ue+DHnuKJvgbB4GPgtbbn6mrqJiQnXqh7R
+MwDgyLTRrpUOpLa50UZmszX5fO7M0cNaYXt7uzHG834WPf61DQ4igFau61amk67WLrD4/sMH3rZh
+S9r1tDEqlmgLADCkldGcc2VzQ0gMIEksRfPT9WvXXLq8ty8f0ZGTxz/zxc/3Tw37Kc5rUinLNYMT
+6xb09aYbPBCxlF/4/ne/s2/HqqN7/u7/+N2VjT0gSgV/NGvh2696fZsDSRwPj1X+7Ft3fnfk4JL6
+9tVdi27atA4s1lLfmMukRcnBiIPWJlKOQZYkN2y64qpVfbZDRw/03/3IY6N+8HvL1zUDk0lQSSp/
++/d37hybyFpeSkclx8547bes2VyP3Jf2Cy8e+Pin/qm5te1D73rzDVetg8Kwp4wQIkkSwTknAACj
+NOccCZTSjDEiLWW8cOH81tbWx++/D4D19PQkSdJQX0cEQIB4wfPaC8ZwbCOACV7jKBMtruta07D8
+By9uzzalb+9aMzUzEqeUYoxLJxVwDyyjKOUjJVDxQ+Env3PlDff83ic+fdtbb+jpaYLs/I75H37v
+B77yXz99w+J1TkFLP5qh6D1rb8zWcS9lPbd/z7ee2VfTMH9596qefHPJHDYx7Dwy8ba11123YF4U
+BQXFfvCT5797ZMeiXHviyxMzkzKKAZTDoA4FRqVY+ZonFW7GgmBl28I7LlvfmFbBYOnvHnno0cP9
+i5u7VyzsDHlIjnfsyGTUmF+/dvHmjcs6Fy+O4mB5d6p3Xq6ssJxE9z/0SBiYGi+7YsnC6ZmzIZNn
+KkGpPOm43BgDgKRJCCuOY0IwImBKRYEW3Ltu/cax06ceefKZzde8cXXfslNHj+ezNQyrDvYF0V94
+mWUI2nBkmkwcy3ff/JZPfulTX37soRuv3vjAy8+P+YJsAxBEjqO1sklGipjFVaXS1tK2dsmirKWD
+qcFUSixd0bSCtdqp7LFTgwNnTvoWBCV/QW3nopYGz/bCJGpK57/wux/p7G3qa2twacxA5rEXX9p5
+YO/vvu+3hANJKEE6P92/ry1bZwqBJxyX2UIwraLIJH4cJYaINDIPIt5uZ9/yhuvmteTGi9P/fO/z
+P3rmRZnAJQvmN2Q9Flf8oLiou/l7n/7PTLgnBqY//ul/MiEtX3pptsZNjB9Uws2bVq3dsLa7p5Vb
+sVQqCrH/4KnCVKWhvtFIJaUUghupLZsrrZlyDaMwjNdftmrd5Uv/15e+bDDz5ps3Dw4O1tfXO44D
+5wIqFyqIuOCs12SAsdpM2sukp6dmNvSuWblgxRd+fK+Xsd+z4YboTAHQYoJpGaogiDnjAmUYMKWb
+8o1o2eNlfyKOThdL/dNnzgyfmhw+u3Pfy+OlGW1bYSBXtS7sqquVgSRgffMWvu/mTZtaW7LKL0f6
+wMnJL97749Gw1FOfZ5SgxYKif2KqQMaSiUlzN1+TVRQFsT9RKY9PlZEz5KJcikyg3rH5dVcv7kIV
+PLj1xW89/pwvmWdZl/UtqrE5Gm2AFyNlJianT599+pEn9+852N7Y1LdwoVRxcXoqUtHmTatfv35J
+Q40TBHE5sJ7btn/rUzvSTo2RwBjzPJdz1KSkUowxDk4YRk31mQ9/6G3ThdHnXtyzZt3GVZcsqlQq
+ixcvrq2trWL8FQkfF5z1DEHqxOJ2T3tnHESlkcK7rr/jpwdf/tx99/z9h/6v8dLEF7c+kZvXYmmd
+c1MTmltJKIDlM/UDI5Of+PxXVLlip73QKLTICWUqlRqrBIERLAEHYFXvIhfBdTKRnImiwJNhEpqn
+dx14aufJ3acPHBoZnb9kQa1jCyWlzSpBUAmiim2niNoa8/M6G7hQkR/uPXys5BOgjiNZjsOuzoae
+zozHzBPPvfiVe56aqpSNCdev6LtyeS9qhamaR55+4fipcQ+51LRzz2Gedpf2dvW05mUUK2kFhiYm
+xhmwyWJ4/+Pbzo4Vjxw+4jDbdVPKSCRIkgSRLMuRUnFw4sSHWL3nQ7e2ddT+6Z99hYH3/ve8W0YW
+56y5pZHzfzXHf73dLAIgFwDGtUU2Xzt48tS6vhW/f+v7P/H9/7F03oL/8r7fGhoeve/4/sae9mIi
+HQJDArkgw8amK8ORklqTjCOTWCBsonByqqauPpPORDOT7TU1fZ3ttlBepuHJZ59nPLtpVTfnGMTq
+Xx54RC2obezoKhYqYZQwZStKsnXZrnTmQKFUV5PdvHTxopY6FYVnhsZ37DtWCNEVqJVSOrQ95Qp+
+Zrz8jfue3Xu60NxYq6aLly9ekGYSkcfEvnfvgy8dPI5OjWc7lm3nGnKXL79kXkt9YWr68ImhI2en
+rlizTKCM4tKzz28bGpnp6J5vM1LaBwACxjlqDaRQoBNUYgXh+9/9xrfccu1nv/CPjz+5/TOf+utr
+rrzmiYd/2reky3Xdc1Nes2oq4691QAjADEkADggNDfXjwyMD/cffefUt/cOH//SrX2MaPvenH0t9
+/h++8/wLorWh0aWQkBlijBiQW+MyC5WJ652MkiwlRBQ5zLL9JAj80lUbb1jS3pHOYiEq/+Nd9zY0
+d2+87MNuMv66VQvfefvGL+/ciwr8crD/7NmV8y435QkvZX/4rW94fteRqy5fsWVlX5ZbZ8emf/jg
+1q0vH7RqOmScGCUTXTGkyr74xv1PPn/wVF1j53RxuiVX393c6AiuGQ2PDN6weeMN17/eZ0AR3P/I
+U65lL58/z5+ZSpD2nzx153d+0tzcPL872zGv7iMfeeff/uO3lQos22XMaAJjQGuyLNtIE5ZLnmu/
+7c1v+cD73njXt+/++tfve9s73nPHG95yYHd/bX2+p6enWpdyruDggrogeknGAgZgCEzKsxcvXnxw
+18sjYxMf2fL+E8NTn/zaN2rS3h/9pw+6tnfPzu0TpSRTV0fKMM4BQUqJWoOKTYQAvMLR5VYSBJFM
+WmvzWy67vDWTNSI4cvT48bNTJ4rB1v1Hb1nc0C4abr967cM7DsliRVjuN598qnde+/KmOh1Vbr1q
+zZs2XIWOslVy+MzID554/ntP7PQZr7e1hS7yxOZkYe6Bx3d8/8ltWlgNoAtRvLBv4SVd3bbn+GHo
+pd23v+VWYwzaMHRq+kf3PtDS2dnd1YlQVMh2Hzw8PDz+3AsvLl/x5jgorF25ZMOqS596ervb1FHN
+bRaWjZypRE5PjHW3Nrz3Pe+87aYtX/vnL3/u776x5dpb/vQPPj4zNTM1NXXZhpWZTAoAjFHnVlcA
++OVFKRdET8iQDBiDnCNAbU1qycrlz7z006ZUx1/c/tHPPe7+5//5Pz/+jrd9+L1vXnlp32fvf/j0
+xImaTE7YrkGWGMOFxZkNBgRgCaUkdLkly5X2jrasNqOnB7Ax8+TjT6V4aoaSL3zv7p7/8y2ZiDe4
+DTctWXXfrpd4bX778WOf/eY3PnbjjV09zdKfEiI8MzzSf/j4Pdv2PLvnjBS5mgxAUi4Vo9NnTzAv
+Od0f3vfAtopmrQ01NDVeY8H8xobEL54ojUnOAd3hkQlH8JSd+unWXWU/6O5dODkzpf3Rk5PF4TNj
+LS0NO3a8eP01a3NpT8bJhlVrD+874ceh46YYR2VYGMRxWN6wfvXb33Lr/HkdX/jsX37lOw/fcMub
+//pTn/JM6uDp/sUr5rU1181aDHbBgOV5/aqcy/Mu0Wy9pDHFYnHb8zvb6xp9bv7uvjt//Ox9W9Yt
+/+vf/UgN6E9849uPPLsVszknm+OcBCPGjTHKVRnFSQmMtHSA13LHiY2lKGSmHFXA5gqIlMl7NSwk
+F62yCn3SsS0SMEngN7nemnnzl3R2j0Yzh48O9J84W4mNk07ZjgCUZJIa41qWpbUJwjhJFHKLc2E0
+eDY6wkJEozURVXMhiUgIKJVKiNzz0gAAxLTWQRAaRqRNvrbGYpjEoeu6vh+WymXh1SeyEocR03zL
+NVd/5MPvmRw79ZlPf2rb9rEPvu/9f/InfyKlPLBv/6rlK3p6ugjo1Sdd/qok7/P37fw9UEpNT5Re
+3PWSAEzXZH64/dFvPf2DtlzqD95y+5aVS/acHfnCD+/bfvSk5aZtWwgLLEskSCoJXEcIC0iRTEwY
+ayXJMZwEONmUQQjDkBuUfiyIeymhAFBYwJmOIxWEQoYWgdaagAN3uZNiTJCSQFIwlJWICLXWiNwS
+DrctAFRKodZEZKRSSmH1Eg0BgEFuWRYXqJSqHiBXq+Nc4SZJQjoBgFjF3HbQsgywxJ/kxl27fMVb
+33r9JYs67/3RY9/+zr1oid/74B/ecccdfrly8ODBZUuW9vUt/oUTwH8v+p+7DefTLrWBoBI9+/RW
+ncjGBR0vntz3pbu+evx4/7tv2fLHH3xva8r6wUOPfOup5w5PlEmwjGDM1ow7BngiCZGEBYCSoeGR
+R2gMIw2klOKco0GLi5hJMKQloTKccwZGKUmguULGGHAOxNAgM4SamCHiolpMi4gcsBpPNYYEZ9XX
+jIBzPnu0wFgSE+ec0BBoRNBaGzSWZTGlkAupCJhtCEmbKIoYQE9r3RvfsPnmmzePDA19+Uvfvv/B
+nyxZcfnHP/HJG67YeOTIkdMnB9avX9/d1XEe1GtQ2nAh+gmADVAohS8d2D96ZrCzrmlG+g/ufu6H
+T95rh8H7brr27Tdvqqv3nti5/Z7Hd+47Ni4tx+LC4ZwjYxyAkaTqPKwaMXW+Go+IwBgtjcUtbhga
+BIBq+bJBA4oxxpCRMYY0MI1MAxiSSIjIqkdj2hijEYAxVg13/+wC9Ox5hUWktWaMEaueJJtq7bkx
+hrgdJqQ1CQSbVG936203XXfF+rXTM1M/uPeBe+99lNB633vf/d53fSDtNB7dv8u27csuu6y+Pl+9
+rwDwayV5/xtVJT9ndgBAo0Ko5gTB4YPHDh3qz+dqXcs+NNR/16P3P3dgZz6LH3nrrXdcv1kp8/SO
+HU/uPnpmcLBQLBnGlQbDuO2kGWNSVQTnpA0jYIigTXUbwiQqqvYt4NW5zKCa38AIqVqATkQAjCFn
+wGcT/0EzAqJzIV0iRKxO9tk/QlC9EDIJAGOMkal6IAwAkiQhsEkr12EN9Zn2lvzGKy5buaJPMHzk
+0afvuuvB6elk7bp1b3/7O6/ffGNleurY0f35fOPGjRtt23plJTngLx7B/nvRwy8+REYaBgiAmoOG
+chS/tGdPcaJQk64xrj42OvDo8z997oWdFsgtGy99w/VX9Pa0FPzwpUPHtu3rHxgcL8xUoiBSoRQp
+lwFybjHgHFBrzRBJaWaxxGgQDJiYNReAoA0DZkhXc7qAMyLS2hhC+9xoq4iRAZrZovJZOwNQfbBm
+65sF11obaRARCVSsjDGO47TUZ5csmtc7r/2yFYtt1zl4dOAnL7z0xLPPicTdcu11t91y89qV61SE
+x44c91J86bL5bS1ds104qsTP75r+4+h/7jbAeVep+nY0AMYkmglHGzg6dPbkwcM6VnW5BttzXz66
+7+FnH9+2a7uUcvOq7ptveP0Va1Yg6BOnT+/vP9l/anS84I9Mj5cqfqwoSjTjFmPM4kIbaREyVp3g
+1TtNAMABebVgkmC2SwIA48gYA6mrJ5LVhhU/ywWi2ZETEVVtujGIKAlJK47o2nYm7dXnalpbm1ub
+mtev76uvzQeV8MjBYz++/5GX9h5paVu4fPW6d7zpthXLlrmWd/TwiXJpore3fUnfMsFsQkJEKaVl
+WdXM1qrxfPVFnf+Gcwn/2jklIoloGUAERdIwHiuZFQ4oCCAZOHpqbGg0LAU1+WwC+uz42I6Xdz3x
+0k9HB0+0ZOyrrli5cuklCxZ0N7Y2V6Jwcig4NTg8MDJ29NTp0cmpSuBLKWWcaLAcywIljVK2bSOi
+wtmFkSMD4mAMGsarmT6gGWOzDSuAIaKmc/8z5yqQcHbt5Zy7rpt2nMb6ugXzOttbG1ob6zvaGyzO
+piYnjg6c3r23f+/hgZmyWty79OZrr1+1pPfS3t44wrNDo34SNLU3LViwqD6bEQRA0gD/uTMQAgPV
+TI7/OPp/hyqVYHBwcGhwREpVreyamJrYd+jQrkMHT545PTUzlsvwtWsuWb1iaV+b1dLWbjmp4Yni
+yPhMoRROFkrTM+XpqZLv+0XfDyIZJDKRJoxlLBOL9OwEPheMnb0Aw6vNXRhjiMQ4iKosz7WtlOek
+PTeTdupz2fq62nTaq6+D+rrGfH1DGCSj4zMjw+P79h8+dOjQdMl0tnctuWTx+rXr16+7vKmuoVIq
+++XKyPjZtra2np6e+vr617a90WuG/nw6ORFUKn655I+Pj4+OjvphBYQlCQvFmaHRoZGhUydP9p8+
+dVw7dn1trr2tubutsaWxtjFf097c2NzUkAAkSRJGSRiGYRiFYVypVCrlYMqHOI7DMIyiREo5u3gy
+RswIITzHcV3b87x0Op3JZFzXrXPJ8zzHsYQQjuMQ0eTk5MjIyJnxmcmJqaGhkbHxab8SMSZ6uhes
+Xr26b8nK1tbW1uYWSsz42Bgp3VjfkMvl2juaHcd5Ncfcv65ey/YUVQt8fmpIqUul0rGB42EY+34Y
++LEB4swqVsoTExPHR4cnxkfHR89WihNJWHZsqK/LNOTzrW3ZbDbbWF+Xz+Wy6Uwuk/U8jzNAZiul
+lFLV4tjz66dmsx6LxUXV+EiplVIjU1MV358qlKZnilOF8sTk1Nj49HRxBpWXzeba29s72jrb2zoX
+Luzt7OzK1eRJxmEYVqvLXctua2trb2sTglXv8SysVxSX/Qa1p6g2ZUHEV64zxhhiLPTDwPcrJX9s
+dHx8olCJEgPEmY6iIIjCcuAXSsVCqTg5PTU5OTk1dUaphLRGMoKj49iuLRAxlbar/mJViIjAETHR
+SkoppdSatNZKGhnHUspY60RKRMtyUnYqnatt6Orsae/sXNDcXldXl8vW2Lad8TJa60KhEIdRW0tj
+NpvN5XLptJdOp4WoNvMh/GXFsL+J6KuviF6R7Q3Aqt3NCEir6ZnSZKFYLPuhXw6CIIiSOI6jWGog
+pYzv+36iojhIklipJIyDil8KAj9JkiguKaWq3UaUMrOuJKJgXAhh264QwrXcdDqdSWc9z6vxrHQ6
+m8lkbMu1LCuTydbU1KZSKSAFAERkc+E4DkOyLKuhoaGutt5xBeB5X5E0Kc74+WXz/HbhN64LFFxg
+LhgChtX2bhpgNteZAJLEhGEYBFGlUgkqQRzLIAiKxeLY8KQhxTgXNpdGKyNRcCE4IzhncMx5Q885
+t5i2LddxHMYYQ+ScC24LIQyziSgOwij0Lcuqz9fW1dZalmWlOOc8m82mXM92hOu6yBgQAXAgMFUv
+5bxhQfjFWf+Ljt+/T6+xh3Ne58dHYAiwGj8BgOqSYEgJfr69w2yfrijSpVKpMjUZBEGcJFrram8n
+o4GIKgqNMVoZfU7Vj7A4CCEsyxJCCIsJIRhjSGA7HgAwRMvimUwmn8vW1NQ4js1BM84BQOnZzCSl
+kuoLIsJX3dfjP67XGP3P9f1DRAMSgQOw8817qg2VNDBDwAgYAwRjSDFAQNQgzLkNOWmQCSmljDEy
+mZn12A2e584Y0wTVllzV9n3CYpZlMcaEYExwfq6r4/mLRBBKGSHYbDTzZ9+vjhPIGER+bif/v6X1
+1uwn/m+a9Rf1b+o3vQXq/4d1Ef2c6SL6OdNF9HOmi+jnTBfRz5kuop8zXUQ/Z7qIfs50Ef2c6SL6
+OdNF9HOmi+jnTBfRz5kuop8zXUQ/Z7qIfs50Ef2c6SL6OdNF9HOmi+jnTP83GCKx3Sbhy3cAAAAA
+SUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_lexus" model="fleet.vehicle.model.brand">
+      	<field name="name">Lexus</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAgdElEQVR4nO19V2xc19XuPnXOFE5h
+G9ahSLGITSwyJVrdllVsSrJc4j9IYsNK4PgpyJOThyBAECAPN/cCSYB7neAqiBIjDiTZkeNYlk01
+KxJlibIkNrGIbdjLFHLqOTOn/g9Ls3NMipRsi5z7358LAjHlzC7fXnvtVbcITdPQGiWDyGQP4L8v
+rUGfNFqDPmm0Bn3SaA36pNEa9EmjNeiTRmvQJ43WoE8arUGfNFqDPmm0Bn3SaA36pNEa9EmjNeiT
+RsmEXtO0BdECVVURQrIsw1fwFj8MX8FbWZbhW1VV4StN0xRFWdAUfIJ/C21KkoTbgU+SErSgV79L
+IFVVSZJEickTBAGfS5KEEIK3iqIoihKLxURRtFgs0WhUURSe5xVFMRqNoijGYjGTyYQQMhqNJEky
+DMNxnKZpFEVRFIUSoOPGNU0jSRL6xbTg7aoRkawoFYb+gV9pmhaJRADlYDAYjUbj8TjP86FQiOd5
+WC2GYbKyshBCDMOgBKwsy6ampqampprNZqPRiJeQoihN0wiCgP1EEAS8hlVPCvpJgx4IQIHXgEg0
+Gg0EAsFgcHZ21ufzzc3NTU1NAfosywYCAVmWRVEMh8Pp6elZWVk7du7Oz8/neZ4gCFVVeZ43Go2R
+SMQzO71x40aXy5WamqqqKsdxC7rTjwEWcpXnnkzosTSnKEpRFL/f7/P5pqamxsfHR0ZGJiYmwuEw
+MKnRaDSZTBzH2e12mqYRQgRBeL3esbGxfNe6V199FcSOLMuRSMRoNHZ3d3d2tPl8PpIkDx48uGXL
+lpSUFJIkzWazvl+SJLEsWn1KmqwHBqQoSpblQCDg9Xq7u7t7e3uHhobm5uaAxwsLC0tLS7OzszMy
+Mmpra2VZNpvN8XjcYrHcvXv3N7/5TTgcDvMCwxk5syUSicgaImgmzAujE5Pj4+OhUEgQhI6ODoIg
+jEajw+EoLS21Wq0kSVIUpaqqoiiLRf+qUdKgx6B7PJ7h4eHu7u7h4eFAIBCPx3NyckpKStavX19Z
+WVlQUABsDkJZVVWDwYAQGhoaoihq9+7dJeVVVqtV0zSGYRwOh8/nu3379u3btylNrqurGx4evnLl
+Sn9/f21tbU5OjtvtrqioyMzMdDqdADqc5EkR98k8Zru6ugYGBjweT19fX09PD8MwxcXF27dvr6mp
+2bBhA0ocxfoDGfbKxx9/fOLEiY0bN9bX1+cWFLEsC18RBNHW1vaPf/xjamrqxcNNzz33XCAQaGlp
+uXTp0sTERElJyY4dO0ZGRmpqahobG9etW0fT9AIVaDVpNaDXKxjwSTQaPXv2rNfrnZ+fb2trm5+f
+X79+fW1t7b59+9avX6+qKhyGGHRFUShNRRSDEOrr7f0f//N/GY3Grdt2bNy4McVmJ0lSlmWGIsfH
+x4/93z8MDAy8/PLLr7/+mt1uJwhCluWhoaETJ05cunSJIIimpiZJktxu9+uvv75t27bF5zwe9jI6
+2GOhFYceLB0QGkBut/v06dOBQIDn+b6+PlEUt27devDgwZqaGuBfIBAFcB5omqbKCkXTfp/vf7/9
+fzo6ujaUlx858mJBQUFUiGmaZjabJ8ZGT58+3XbnVkNDwxtvvJGd7dR3GgwGz58/f+rUqcHBwRdf
+fDESiYyNjX37298+fPiwKIokSeIdgHSbYEXRX3EBp2kaTdPxeBwhJIqix+P54x//2NXVpWna6Oio
+oij79u37zne+U1dXx7Ks3nylKIplWWBJgiAomkaa1tzcfO3adYIgtm3bkZaWBmvDcVwkGm5pablx
+4/Pc3Nz9+/fn5+eSJImtXFEUbTbbyy+//JOf/KSqqur999+3Wq1paWlvv/32Z599xrIsPk5gAHgN
+VpQvV+NsAa6XZVlRlD/84Q+jo6N5eXn9/f1zc3NPP/30q6++WlZWRtN0LBYDvBa4BFACgs/+dfnv
+H/xDUZTNW55saGhgDFwoElU1RZLF1tbWixfPZ2Rk/Md/fGvTpjrgVr0ch7V/4oknfvrTn9bU1Jw9
+e9blchUVFf3qV79qaWnB6iaYWijhgVjRM2DFoQdNDoTGyZMnL1y4kJ+fPzExMTY2tmfPnu9+97tZ
+WVkwbYPBANJWz32iKEI7Q8Puv/71b5OTkxvKK/fv3x+XZFBLGIbp6+u7ePG8IAj79j+zY8cOjuNI
+8r5xC+izLGswGERRVBSlsrLy5z//udlsvn79ekNDA8dxb7/99szMDIwT+oIxoBX2Maw49NhR1d7e
+/pe//GXTpk2qqg4MDJSXl7/00ku5ubkg07HuiBCiKAokgCzL8CIajZ48efLW7ds5uflNTU2ZWdk8
+z4uyZE6xer2z5883u93ubduffOaZZziOjcV4lHCfAdvCaxBfqqoWFha+9dZbPp/v5s2bL7zwQjAY
+PHPmTDQa1Q97sdH72GnFoadpWlXVeDx+/PjxjIwMl8vV19dnt9u/9a1vrVu3DiQDwzDAnnq+g7ck
+ScZisUuXLn105qzDkbZz586aunpBEIxmE0nSoVDowoULPT09paWlhw8fduW7oEfcFDSL2R8vbX19
+/e7du4eGhlRVra2t/fDDD9vb2+PxOGj6aFXUzdWQ9SRJXrx4cWRkpLa2Nh6P+/3+HTt2bN++naZp
+mCrWJhVF0WME1N/ff+LECVVV6+rqnn32WVEUJUkSRZkkya6urlu3bjkcjoMHn6uvq0dIhXNF1WQs
+6HFTkiThNUhNTX3llVcMBsPw8HBxcbHdbr9169b8/DxKgL4KOvcqCZxPP/20sLDQ6XS2trYWFhbu
+3bvXarUCe8ICwMPgzEEIgVtRUZRoNHr8+PHu7u4sZ+5LL75iMdvEWIzQtBSjYbi/79zZM9FgYNe2
+rU/t2EkgJMYlimIQIgnEYLaFxgmCSDjIVEWREFIrKiqeffZZn2/OZnPk5uYPDw/39fX9G5fEIq0c
+rYbAuX37tsfjKS4ulmU5Go2WlpaWlJQs8zzIfQDrr3/96/Xr161W6+HDh10ul6rJCCGz2TwxMXHx
+4sWJiYmGhoatW7eaTCZZlsHHoN8xiwm78kmSrK+vLy0tlWXZ4XCIouj3+yORCH5ypWXOauj13d3d
+LMvm5+ePjY2RJNnY2Gi1Wpd5Hp/M/f39H3zwQTQa3bFjx5NPPsmwFM/zLMsipHV2dt6+/UVWVuaB
+Aweqq6vB33B/Ssv6I4GXISBTVlYGxnNqaqqmaTMzM16v9/8fgROLxXw+X05OjtFoHBoaSk1NLS0t
+XaC26wlLBq/X++67746NjZWVlT399NNWmyUWi1EUZTCw3d3dly9fQgg99dRTdXV18EOwhPGyLUO4
+d47jUlNTOY6zWCwGg8Hv9/v9fr1ev/wG+oa04tCHw+G5uTm73a6qajQazcnJsVqtD1XdZFm+dOlS
+c3Ozw+HYvn17UVERRAcNBtbr9Z49e2ZwcPCJhvrdT+1kWTYWi8GvJEl6aMuALKwuwzBpaWlms9lg
+MLAsGwqFAoEA0rH8f22TKhgMqqpqNBoFQSAIwuVygUReisCqcrvd77zzTjAYbGxs3Lp1q6ZpkUhY
+liW/33/jxudtbW2ugrz9+/e78l2yLAPcsiyDqFlmS0H7+Hmapq1WK0EQIH94no9Go2BO48P5cWLx
+ZVpx6EVRZBiGJEl4kZ6ebjQalxELBEFEIpGPP/64t7e3pKRk69atVqsV4k08z/f03G1paWEN9IED
+ByorKxFC4KmHH2KHzzLjWeCfAdNBkiRFUWRZhjV4aCOPhVYcegiJwPFoNpspisIYPZA0TWtvb//b
+3/7mcDjq6+uLi4tDoRBElHw+X09Pz9DQUGFh4a5du+w2O0L3Y6rxeBzaBLNomfHgA5lhGDApTCbT
+Uqrko5wcX5tWw6SiKCoYDBoMBjBrEUKSJOGpAqPBW0VRonzsT8f/4vPPl1dU1dU/EQxFIlEhFpcE
+IdrX19PW1uZwOA4fOlLgKgAvCzSChRjLsosTeCDFAboQZYUgaQ2RKtJIipqYGg+GA6Ic53me4zhw
+skIAACUM4xWiFYceji+bzSYIAkIIzFeWZfGOBrYFNxlFUc3NzR0dHZmZmbW1tQ6HAyEkSZKqqoFA
+oLOzc25ubsuWLU888QS6nzPypb4eeDyClw1nfzD0/cwDSZIUVZmcnOzv7xcEAXw4ZrMZNCW9H2KF
+aDUETnp6Os/zkUgkJydndnY2FArBV5g3sSPB4/F8/PHHHo9nw4YNJSUloigGg0FBEERRvHfv3uTk
+ZG5u7lNPPZWVlalpiKZJgkA4T02fRAaHLcgTPXwEQUiypKiKJEs0TQeDwe7u7kgkMj8/LwgCy7J2
+u11/wP7Xht5isZSWlrrd7lgsVlBQMDAwEIvF9IiA3waCRO3t7W1tbVlZWUVFRQzDzM/PRyIRyK4J
+BAIEQWzcuBHCtrKsIIRiMVFDhKoRGiI1RCKC1BCBCEJDiKQokqIIkoS3+B9N0xRJkSRJEmRPT09n
+Z2dmZmYoFNI0zWaz4X22CibVimckpKWlZWZmCoIwPj5eUlKiKMrAwEB2djZaJB94nne73Tk5OZWV
+lWlpadFoFHhZURRBEGw2myzLsixPT0/Pz8+DPwAn/uFG9Dl+KBH60JOGFIZhIO3yzp07gUAgFouN
+j48zDJORkZGSkoISMgqtsJ6zGskgeXl5xcXFt2/fzszMXLdu3ZkzZ3bs2IGnh6Uq5Fa+9tpr6enp
+g4ODfr/fYDCABQu2fnl5+bp162ArwElI07Qg3s/RXAA6CDGGYcA9h4USiWRVVa1WK7S5c+fO2dnZ
++fl5V15+Xl6exWJButN1QaD88dKKQ68oSm5ubmNj482bN7u6umpra2/evHn16tXt27frtUAsgliW
+9Xq9o6OjBoMhJSUlHo9rmsZxnNVq3bJlS1VVlcFgCIfDCCFRFFmWjQgxfJDidgBlfLRinV1RFLOR
+0TRNEARFUeAQunDhgqZpBQUFJSUlRqNxpQHBtOLQA+uVl5dXV1c3Nze7XC6n03nq1Kna2lpwomHT
+hqKoeDz+pz/9CY7fsrIyUIRisZimaTzPp6Sk3Lhxg6ZpCKDH43GGYTQQ3Dro4XTFnL5A1/SqIsdx
+4XBYluV4PD46Ojo9PV1dXe1yufLy8kABoyjqUXwS35BWHHoQCy6X6/nnn+/u7m5tbW1qavrss8/O
+nDnz8ssvsywrSRJN0wRBmM3m+vp60HBsNtvQIDEzPZmZmWm32xVZJAgiGJibn1Oxkn5/zRhanzaM
+EpJajN8P3kJYWJZlgiBYlo3HeIqiQMsKBAKTk5OuvPyMtPTGxkZYPLC5cPbyyiGz4tDj7NSKiooj
+R46cOnXq6tWr27ZtO378eFFRUU1NDexxUPZramqOHDly7ty58fFxgiB4nvf7/ZC6rU/T0Kvqoizh
+Y0OfwM0yHBzLMAY4MFRVZRnK5/OpqirLclpaWlZWltVqrayszM7OhhMbw62P7q4ErWri3/Dw8O9/
+//vr16/X1tampaV1dHS89dZb27Zt43keYh00TfM8f/ny5WvXrg0NDQUCAUVRRFEE38MCuxQgVpGG
+z1i8GwiCQBoJP4TALzTOcZwkxnJycpxOZ0ZGRjQaHR8fr6+v/8EPfgC6DVoiEXwlaDWgx3oCz/P9
+/f0nT548f/78888/H41GJycnX3/99T179oAqjbPPgsHg8PCwz+eDWG4oFBJFEeQ4lPJgiIGvsWGF
+FyYuylDaAC5lo9EI3VWUl+3duxch1Nvb63a77XZ7U1NTZWUlPudXLfN7NaDHOR2iKNI03dHR8c47
+71y7du3AgQNGo3FiYmLfvn3PP/88+nJ2Jhx04FakaVoUxQdyPVrkpQEiKSYajcIRghDyeDzt7e3t
+7e1VleWCIHg8ns7OzsLCwqNHjxYWFkIX2FeMdClQK5eKs+LQg7KB0dc0LR6Pj4yMnDhx4l//+tf6
+9eudTidCqKGhob6+3uVyIYSwCx4HjJbjRO0+zxMEgXTPaLrH+/r6wVFDUdTFC+f6+/ttNtvevXuf
+eeaZ0tJStCi3EnBfabGz4tBLkgTuWeAgnNXV399/7ty5zz//XBCEsrKyrKyslJQUyL1mWRYENM6T
+Ba7UN/tvDYd8AECqoiCKisfFYDA4NTU1MzMTjUaHh4fb2toC8/6ysrItW7YcOnQoJSUFDw/OYViA
+lc4xBlpVgaM/wVRVnZubu337dnNz8927d1NTU2tqarKzs4uLizmOczqdRqORpumUlBRs7j6Y8dXE
++GGLyLIoirIs+wNBOCoikUhPT09vb+/8/Lwoik9sqtu+ffvu3bsJgojH4waDAUs5QBz0VOgrFotB
+EdZKUDJrqRRFicfjU1NTN27cuHLlyuTkJEmSmzZtys/Ph5Cp3W6Hg9dgMEB4C1Ka8HnAsiwiiVgs
+Bl5fUGkEQfD5fIokz87Out1ut9s9OTlJ03RlZWVtbe2BAwdMJhP491fUT/BQSnIFIUgVcJy1trZ2
+dnYODQ2ZzWaTyQT+S7vdTlEUVEKBcQsEecs0TZM0Bf5hKO0UBCESiQQCgcnxCa/XGwwGTSbTunXr
+qqurIeZFEASOq+jrdVd/DZIGPQhZ/SdQp9nR0TEyMnLv3r1wOAwyh2EYu90OJSIkSUL2AAzbYDBI
+iiyKoiAIwWDQ7/djf6cqK3a7ff369eBnzs7OBteYnrCfZ/WmraP/J7heX8anKMr09PTg4OD09LTH
+4xkbG5ubmwMVE2ImOO2AJEmO4yRFhjMcfDtWqzUzMzMtLa0g35WdnV1YWJieng4tgwK6OubSo1CS
+ZT3SOY21RHI9fCJJUiAQmJqa8vv9siyD9IBsHFEUIaDIMAzF0BRFmUymtLS09PR0h8MBfx02O2Zn
+cODoO0LJq8/HlDToITdEH4dbsPE1XUEzQigej4Onl0jUPtxX9kkCNg3HcSzDqpqqqipN0diroDeL
+QNfSyxm922eVEUi+wEG6QGg8Hgdl7oG6B5haCz5XkUYgQkMagRKhEqRh40rT3YuAF0Df+CpUjyxF
+ydx0IHyxn50gCHyTgZ4hFnsO8AM4T4ZAhKIqGtI09G93An6xDFOvqKtgeXpIr3iS+vngT/CH8NiC
+5FBAFhdDIZ1nUb/NF0hekPXwFpDVCwfoCHj//gsNEQhpqkqTFIkIpGoUQWpf9veC9ol04gXSgdCD
+rs1RVRXnoGHf3ANhwY1oiSSiryRCHiJwMLvBiCEmt8DOXuot/u3idKKHOmaxAYx0Jfq4jhkllkrV
+1zR/uSoaWlgsuJbvGsu0eDwOXn6kWxJc+qJvYfF8l5mXnpbkemAxPcehRCK1nrslSQIewaGMBdsc
+slBxWRrEWgEmTPp+wceLpRAwF9ZPsC8Ii2+cjQ0rBIUomqYtThwDtzP4alDiHinYlIIgwNggXqYo
+isFggIAlngieNdwmBWFIKBLC831E0O8/vxTXa4lresA07+joYBgG8nKDweCGDRvAQsFstYDvFtz5
+wPP84OCgIAjp6ekMwwSDQb1vRD9oKCAOh8PwAvI1IZyEvrzDtIR/LRKJDA4OKoqSmZmZkpISCoUM
+BoMgCIFAICMjw+l04opkzJ6wj0OhUFdXV3l5Ob5Zyul0QtQXbpkKhUK9vb0cx9lstng8rqqqwWCQ
+ZRm+hXRSmqYhfQpyhx795FgyQIgZTVXVcDh86dIlRVGqqqqi0WgwGMzIyADo8Z5YsIsh4IcQisfj
+fX19ExMTwWAwGAwSBAGZxguGiNGXJGl0dHRwcDA3N7eyshKgtFqtpaWlNTU1wO/xeJxlWdApJyYm
+3nvvPb/fX1tbOzAw0N3dHQgE9uzZE4vFJicnGxsbIecHJWQUFheKonR1df36178+fPhwSkrKvXv3
+mpqaMjIySJI0Go0jIyMdHR0URUUiEQgoQuCeYRiov4W3sKH9fr/T6QRT7hFxXw56TKAyz83NwUYT
+BAFyMVCiJg9qz7BvEl4A7tFotKOjw+fzCYIwNTV17do1j8djt9uNRiM8oOd3eG2xWDZv3qwoykcf
+fdTS0vLaa6+tX78+FArdvHlTEITc3Fyn08lxnKqqk5OTbrf77NmzDocjJydnZGQkEon4/f7p6WnI
+WvX5fGD0AgPBkYNZBPJzenp6tm/fbjQaoVZdkiQoK7x69Srs+Pb29uHh4dnZWYZhjEajHnGIrFEU
+xfN8bW3t5s2bHw/0wJgwbngBoSIYNLhfcIU1TdMgYeC3ODzS1dV19+7drKysoaGh5uZmo9H4wgsv
+1NTUWK1WHAtdICJFUayqqvL5fC6X6/Tp0ydPnty4cePOnTttNtvY2NjU1FRdXV1OTk5nZ+fnn39+
+7969zZs3h0KhiYkJjuMOHjyIEDp27FgsFoNB4sMJF62jhCwFGxifNwaDIRgMsiw7Pz9/8eLFYDCY
+mZnZ2tra19fX0NDQ1NSUm5trs9k0TTObzRzHwUICMuBuKigoeHTcl4Me35QBzA4eK57noTgExDrM
+BNQesC3xpkYIzc7O3rhxIy0tbXJy8uLFizRN//KXv9y8eTMIejDucXf4NbgVnU7nm2++6XK5/vzn
+P7e0tHg8nkOHDkHS8s2bNwOBAESannzyyeHhYb/f39jYuHv37pycnIGBAUAWJzbjv/ru4LDVR2/g
+SjWCIO7cudPV1bVp06ZIJHLr1q0f//jHL730EsuyEG6EbS2KItwxqCUKKzC/Pnpe+JLP4bMI9hfD
+MJFIBM6WeDyOeVyWZdy3loipQvfvv//+3NwccKskSRUVFdPT0x9++CE8AMIKCMe7FUUpLS1taGiA
+hWlqaqqoqHj33Xffe+89r9dbV1e3adMmj8czMzOTk5OjKEp7e7vL5Tpy5Eh1dTUwCjjRIpEIhHax
+ho4SCTagFOFqaUmSIpEIKEVms9nv9587d87hcMBXu3fvNhgMZ86cWbA1CYKw2+3gQwXhZrFYKioq
+vlI+/nLHLA6bwf6FjYnrN+7/PhHAw1FAWImxsTHIUdU0LRwOV1dXFxUV3bt3z+v16u0vbFWpCYKU
+NNxsYWHhz372M5fL9e677966dSs9PR0iWbIsu93uoqKiN998Uz9hg8FgMBggPxk7DxZo4ljTxYk6
+oPKKoghXgTkcDtA1KYq6fPkyBgTptg6IfrvdznHc4OAgSZKHDh3atWvXY4AeJYwIgiDMZnNKSorb
+7YbYm9Fo1BL3pmBZj3RGB0CwZ88egiBaW1tzc3Pz8/NHRkYuXbpE07TdbsdlN4v1esgxNplMsPag
+Uaxbt66oqAg6nZmZgeyl8vJylmXb2tpKSkrsdjtuDS5eBHTwwEDjwsYRSBtQ3oE4jovFYuCaDoVC
+09PTgiBYLBZsjWMTB/6aTCao0Dt06FB1dfWdO3c++eSTurq6ZUqCvwL0OIfAaDRaLBav1yuKIsdx
+kC+GVTR8iAGXAbs5nc60tLQLFy7AyvX09Fy5csVisRw9erS2thbpbs/FE4O/mZmZ+EpEjuOGh4c/
++OCDmZmZ3NzceDx+7dq18fHx/Px82EYcx925cycUCm3cuNHhcMCAPR5PUVGRyWQyGo1qomxqAWdg
+N5wkSSDEBUGIxWJ79+793e9+p+qu01nKRqUoamBg4Be/+MUnn3xy9OhRl8vV0tLyxRdf7Nmz55tC
+j6NIMA6Hw0EQxPj4eFFRESS5w3pg3gfhCM4GUG9GR0dPnTpVWFgI6Uc1NTXPPffcnj17OI7Tq0OL
+NRzY7CRJnj59+sqVK6mpqQaD4c6dO16v9+DBgzab7Z///Ofly5fHx8fLysoyMjI6Ozshiay6utpi
+sTgcjhs3buzatYthGJ/PNzo6Cvf7AePjYAvcN2iz2cDDQ5Kkz+eLxWIVFRVaIoAjSRL2pC74S9N0
+bm7u5s2bp6eneZ6HNCHs1flG0OMUCRD3ZWVlxcXFnZ2dqqo6HA6SJHt7e2GI+rJVgDIlJYXn+fn5
+eZAYRqMxKyvLZDLxPP/ee+/FYjFwBBEJWjArqEL2+/3Dw8NWq5Xn+c7OTrvd/qMf/eiVV15BCFVX
+Vx87dqy7uzscDldVVeXm5gYCgZ6eHpIki4uLm5qafvvb33Z1dWVmZqqqCmo+CBn91iRJMhKJVFRU
+gKVqs9m8Xu9HH30EeSigBYC4A0C0L7sRIfE/JyenqqpqZmamtbU1Kyurvr7+0aFfzn2m32uSJF24
+cOHTTz+9ceOGzWZLSUkxGAwwB/0JBiVnoObTNG2xWABiQRBgncBmwY6UxT2CdT4zM0NRVGlp6fz8
+/N27d5uamn74wx8WFhaCmCIIYmRk5OrVq8eOHdM0rbi42Gw2S5KUl5e3detWp9N5586dY8eOWSyW
+1NRUMJ6x94ZlWVClCIIwmUyKooCmyzAM3Jasv0cclurfYOk2KMdx4NiRJOnevXskSX7/+99/4403
+Ht2TsyT0wM7wF9TVaDTqdrubm5unpqaGhoZA7QGrGtgEMz4odsDdsJ3hiIOfgFBaEK7DE8NuYbPZ
+HAwGKyoqjh49+uyzz5IkCQYESqjP4XD46tWrf//732/dugU6ZWpqqizL1dXV3/ve92ZnZ7/44ouB
+gQHwfIAEg8IVSF2GAZtMpmg0ircFtA8dwezwVgbCb+GqWUmSzGZzaWnp1q1b9+/fb7PZHgP0SxHP
+8xD753keOwvxbfKLaamq36WeByMFikCsVmtBQYHT6Vymtr+zsxN8LFjpMplMeXl5RUVFPM/Pzc0F
+AoFoNApGv7YoqPDQ8SzlDgNmomnaZrOlp6fbbDaQVCsIPZA+ZPE1fr4MwfEOWjYBSU4Py1XCuwF7
+BbAMxL7lxztIIBxl08d5Hr2vrwz94gDpUurX1yNl0XWr4PnS3z664HlCV9pAJKI6oG7p00yw+H5g
+O0vh8CjzwmuAtYZHoccWFl+qnaU+X547vtLOBXqU9ODHNVmU+J8KvkkLXwd67ctVS9+k+4fS4k29
+1JD0SurioN1jF4zoy/F6LOse3Y3zNbl+AVc+xiKYBQrPI/4ExwnwrTj6Fh5FJH4NgQNYf+11/cpl
+bLg//YePMZtO7/RHj5Yho5+83nGtX4MHDvubEGZzpLO2vhLXf2Xo9fP8hsv+QMK1nHrQl/GDL/gK
+C5zF3LD8IL/qFBbjQH7FIqwkZ5/9d6a1/40tabQGfdJoDfqk0Rr0SaM16JNGa9AnjdagTxqtQZ80
+WoM+abQGfdJoDfqk0Rr0SaM16JNG/wk1s5tRTFrNsgAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_lincoln" model="fleet.vehicle.model.brand">
+      	<field name="name">Lincoln</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAYpElEQVR4nO1da2xcV7Ve+7zPmZc9
+tuO3E9ct4ATi5EeDqEhpe8stcWgLpEJCIKAgJH5QCo2oSlWkRkIRjQQuQlUKf1IhaCVUWl5KWwmU
+qkDLJUkftDeN04Q4dhLnZc+MZ+acOc99f3w+m5NJ7LZXInN6r78f1njmzJm9v7322muvtfY6jHNO
+K2gFpFY34P8vVqhvGVaobxlWqG8ZVqhvGVaobxlWqG8ZUko9jxFFURiGYRjiTXzqui4RNb1JREEQ
+EJHv+y1o8bsHS+2WKoqiKIoYY7Is451kUxlj9Xrd87xCoSBJUhRF4u+lt8IoMsYYY1eo9e8AqZN6
+wa8kSYqigNAoioIgAH245vz587/73e8effTRqakp8RVMEVxMFw9VFEVpE7LUUS/IFf9KMaBhINph
+GDqOE4bhkSNHMDmISFEUWZYxZlBTuA+mTqpEnoiUVjfgMhCKXryOokjTNMYYCJUkybZtwzAGBwcX
+FhagkTzP0zQNd4iiSJZlUA/G08Y7pZD6IAgg403ve55HRKqqyrIcRVG5XCYiwzDK5bLrurqug3eo
+GkVRiEiWZaHlcZPk65YjddSDNegQ0BRFked5vu9LktRoNDzPq9Vqp06dIiLTNOfn56enp4vFomma
+4N0wDCJyHEfXdUmSMGkuu/y2Fmm0cKDToUbOnj37xhtvHDt2jIh0XQ/DkDGmqmqlUhkaGhoYGJid
+nS0UCkEQ5PN56CVN0zzP6+joKBaLGIbk+rwi9csBpIcRSRIt2O7B196oVqt5y2xrk2VZZkwqFNr7
++wcVRQlDftXINWEYtrW1aZpm27aqqkS0sLDw8ssvj4+PE5Hv+6qqptC4TCP1QBiGkiSHYVgsFjs7
+O/OWKUmSYRimacKSgSr3fb+rq6u9vd3zvGw2G0WRbdsDAwPHjh6p1Wr5fL7V/VgSqaM+aQ4GQVSp
+VIjINE1d1+fn5x3HaTQavu9bltXb25vNZsuVypEjRyzLCoKAMTY4ODg8PBwEgaqq8/Pz+Xwe6h5S
+v6JwlgO0uSzLkkSu65fLZc/zDMMolUqlUgm8u67b2dlpWVaxWJyenj5w4AARKYpSr9dHRkaGhoYM
+w8hms6VSafXq1ZgcuDmMzpb2719IHfWKokRRhNdg2TTNTCZzobrwkY98ZHR0NJ/P+n548uTJubm5
+arW6adOmLVu2aJoWRdH09PS+fftOnDhx9dVX5/P5ubk5IeNNO7U0IHUmFxHBEIwi8jzPcRzIKWOs
+u7s7n88SkarKROQ4jiRJ5XLZsixNUwxDGx4eJqJKpWIYRi6Xq9VqQn3hzunRNpRCqafYBOScu65b
+rVY557IsK4oCS9H3Q1DPOTcMgxizbRsmvKrKuVwOPgbDMGzbFhqmaQzSgNRJvVgJsZPyPE+SJFmW
+LcvCflWojiAIYM8QkarKwmVWKpWISJIkz/PgUMOd07axSlFTFsEYJ+JEUCaarASuJ3Fqa8vnchmK
+qfe9kJHMSOZREPguI1IViUdRX2/3QqVUKc97XmCamdOnz0DqoyiQZUYUtbh3CaSP+hhRFLmu22g0
+OOeqqhqGkVwqIfLw5+B9SZIYY5Zlua5r2zaEHbZpOpE66iMeceJEFEVRo9GwbZtzrmkaLHSKpd51
+XVDvuq7Q44yxYrHoeV61WkWs6vz58xR7JtKG1FGPBZaIwjB0XRcuYlVVc7lcLN2L1MPH6TiO7/uC
+3M7OTiKybbvRaBDRhQsXKHb6t6pHSyF1DWK0aIT4vu/7PpxliqJYlrV4ASMi8jwPcSuMAcWe/Ww2
+q6pqtVqFpqrVahTrotb0Z2mkjnqC4BN3Xdd1XcaYrutJXQ/4vo+Yn1D6oF5VVU3TQH0URckJkTak
+knpaVCn1ej0MQ03TRCSEiLAhFYQmpR7q3rIsoYWwYFAq1X3qqI94RESMmO/7jUYjCAJZlhGcwgVh
+GEURCWeD67oIYFG8ApumiTgijB8syCvUvz0kttgkcKqqKpZZRK+IiDEmMg8URXFdV1VVsWv1fT+X
+y3HOvYjXXc+LeMP1mSTpusk5S1V/U9SUJkCVQ4ck7ROYQJB65IkIqSci+PSFsMOhT4nw+pXvyFJI
+L/VYP2GcJD29jJEgEYtto9EQK7AkSdlslohg7yOJActD2oyc9FIPWiHvQtsQEWMEVc4Yg0QL6qHc
+M5kMxRkM8XaXLp09LUeKmiLAiXPiMNtBVpNhDkWPRCi4yRa/yDkR6bpOseXDOU/hAgukkXoiYgRF
+wRHeo4tjHfgItrwkSSK/Fe9gZca2wPd9DMylubEtRxqph10vGMeLpK7A+im0UDK1GEOiqmoYhkEQ
+YMGgRMbrlezI8kgj9UCSeiGtIhuQYi0ElZI0XeDfbxqzFPoSWhylEllm9Xq9XC4zxs6dnyMiTdM8
+L1AUzXGcRsOdnT2jqIQ9KnGpVCqpuhbyyPW9MGBhwN54/bAsy5lMRtO0hYUFTbWCoKSqahAEhw8f
+LpVK7W15LUZ/fz8RhWHY2hB5KrLPKpXKSy+9dPDgwUqlki+0e56Xz+cVRcN2yTBMVVUVlWeBTF7T
+NFXVM5kM55xxsm07CIJSqYScwCAIKpVKKJHruvPz84aqeJ4nSwS939/ff8stt4yOjiY1WEuGoWVS
+n0xrLRQKa9asCYKg0Whoulmv1yVJqtVsz/Nc1w2CUFVV3ZB835+bmyMu6bre1lYcGBiQJMmp2+Vy
+OYoifMtxHFj6XJE4593d3VetHmKMKTIjIs/zTNPs6enB6g3Gm/YNVwwtk3oR+05GrhljTsNrNBqu
+677++n+/8sorvu/39PSOjIz0D6yq1WqNRiPwo/n5+TNnzvX09LS3t7956A1d19esWSPLMsIp8/Pz
+L7zwgmparusODw9v+c+PF4tFiTWnXYpNQzK19kqi9RkJYsuKzuu6pqqqruvYDUmSlMvlBgYGRkaG
+wigkIlmSz5w596c/7UPucS6X6+np+fCHPwxXjyTR2bPn//KXv6iqurg2xC5+8VvIU4tjtlEQBMIt
+eiXRSupBBBJU6V9jQLLMdF1XFAWeMuGbhFdAlmQkPMFyt+1aEHimqdOi0ckY44wtTiYQzflibAtT
+XFill5qtVxItMy4h5rDQIXrwhfl+yDlJ0qKNKHSxH/hwakbRIndBEMDZIKjE/jYMQ8uyhLHfdKKK
+LmehtmTH28plVsi12B9xzhVFgn5gjEG6KbFpUhSFEUE/IFwuSRI8B+JADyK6uq6DXKRv4j6YYUiG
+TXrcWmLyt4z6pKiKNwUFEY8KhZzvu0EQKYocBD6LkHhDRIxHAWPcdR3XdcA4DjXgtufPn1cUhRNT
+JTljmKqiMCKGMAAnYiRUXNOPXmGkcTeLZBAk+8EAFVtTIE5FXlyccZm4QBzzhLpPej1ThTRSDyDA
+Ley/RWY5h8sMIUO8CXnHUkFECIhjMBBSxxdb15XLI43Uw30G6okIiQXiU1CPgyWIFEKuhd5wHIdi
+PWYYBqhfdPKkaQBSOhmJSNM0BF0RH+dxqIk4JZWM8AGInQGSv3GNZVmynBCvNHnQ0ij1QFLqPc9L
+2n+QehhIeE0JqbdtW1EU2D+maf5L0NMk8pR+6qE3FqPbidP7WD/hmsfkwEec80ajIag3DANj1rRQ
+pwGpox7mDV1s4VAcJReXiQ1XMk+E4oVBhKvE8aC0OesphdRLxIhzxok4VxUlY1o8jJy6PV+qSrJK
+JBFJQRBlMxlZkgxdh8gzxsKQE1GlXJclXZZ0xolxMnVDURTOiSRGksjnTAVSusxCqJHvB8m1bTuK
+EP9jkrSoZ0TwljEmy8Q5oUiO53mKosCyTKG8A6mjXvhyZVk2TRPWITKK42oHchQt7rkYYzjBjO8G
+Qeg4jmmacObgDBCYT5uipxRSL4RUlmXDMAzDQGmEubk5zjkOsMG1KYKuSV2PQiEQdtM0BfUYrVTN
+gNTp+uRBS5j2mUwmm81euHABOcOet1h2BdoGR/fxFVWVYd5kMpkoiuB5blVH3hapo16AMYLwWpaV
+y+VQkYWINE0hIsuy4KVBiSJ8hXOqVquwI6GvFEWO77ZyZPkdIE4DWUxp0jQtm80ahjE7Owszhoiw
+pYqiKJfLiS/6foATs/DeZDIZWSZhkaZK21AKdT0lQoZivYVH/tChQ57nIQyCIIllWeVyaXJyknPO
+mFyr1Y4fPz4wMGCaJkpD0eJAprEGVxqppzh43d5eYFLo+XaHWeju6Xv99ddnnn8BI2FZ1vDwsKoZ
+VcebfPG/RC5CW2dRy5jn5+fzlt7T20mMiCIiuSkUngakjnqoabzO5XKZTMbzPJzKHBsbE/4czjk+
+6ujosCwLCSBIfYVRLygWbufLllRrIVLUFECsh/AHmKZZrVYrlUoYhrlcTlEUHKat1+uojQP7R1EU
+4czxPA9HCZPnbFN1qAFIndQDQtG3t7fPzs4eOXKEmBwEAUxMwzCCILAso6enZ2Zmpl6v1+t1HBJH
+oke1Wh1bd1syEJgqeQfSSH0yJXhwcND3fdu2w2jREY9N7D/+8Y/JyUlN044dO9bX19fV1QVzCL6H
+Wq3W398vfM5pUzVAeqnHGTbDMNauXUu06M8Mo1CW5Fq9dnr25NTUVKnc172q8z9uuiGXy8HGl+LK
+xkiQam1HlkcaGydie8lUSD/wOXFZkokom8l2dXXBNZ/NZjs6OuCaT3INzw+lUtUAqWuWOBooAn6w
+Z1RFhc/XdmwiamtrkySpWq3quo6a6hSXdhVHfJJLazJJPyVIHfXCKSbegXJnRIwoDAJFkhnRmqHV
+hqafPnmqUCgs1sWM4+MU5yhcfO6wBQmtyyONun4ZwH9ARIVC4YMf/GCj0ejr60vGZlNYaGsppC5i
+uQyasrFxflOcZ0ue31yh/t8F1MpNvtPy0zn/C6RO1y8FsZZSwnqBG7mprN97Be89qW8S+aZy6yJU
+27oGvlO8Z6S+Kf1PQNhCwiuZ2uPhTXjPUI9tKsU58sL8J1qsVpHMgmpdM98FllQ4juMcPXr0Ax/4
+AJIXsa1fZiL7vn/ixImBgQGkX4uKWGJnj5WwVCpVq9Wenh5N06AZ6vW6ruuVSsVxnJ6eHiJKulzE
+KW9xq3K5fPr06Wq1Gobh2rVri8UiEYnAiHhYA8UOCZwZP3bs2Pz8PAruXnXVVfh1pFXpup48UQUH
+3MzMTLFYFO7PSyHSPc+ePev7fl9fH56OIsuy4ziMMZT17erqoou9Uhfd4rKYmJi4/vrrn332WRzS
+gCd2GTzxxBPXX3/9I488gs0nMq3xke/7eHHixImvfOUrY2Njd955Z6lUwmWc87m5uc9+9rO33nrr
+W2+9Jb4lZBmHwcMwXFhYePTRR6+77jpU2DVNc2xsbPfu3adOnQrDsNFo4KcFkD/y3HPPbd26tVgs
+YikeHh7+5je/efjwYXEZxibZzn379t10003bt29H85ZCo9F46aWXbr755g0bNkxMTIivc8737t27
+efPm++67D4/6uCx7S1K/fft2Inr88cfRJvQ/yUsTJiYmiGj79u3JbjdxMTU1tWnTJiLKZDI7d+7E
+p0EQnDx5cnR0tLu7+7XXXuMJxpNfj6Loe9/7HmTnox/96Oc///kbbrgBUwSNxK3wFUQQOee/+c1v
+UGN6bGzsy1/+8vj4OI6K33777a+++ipaiK5xzgVBv/71ryVJ2rx5c1P7k8Bo/eEPf+jt7SWiwcHB
+P//5z5xzx3E4508++SQRbd26lSdGtAlL7mZRVQZ5FvCe+76/TG4FUiTz+TzGSTwkhCdyVHVdRxS7
+Xq//6Ec/2rhx4yc+8QnUkcjlcqgKDZabpifnfN++fT/84Q9N09yxY8fnPve5/v7+2dnZX/7yl4cP
+Hx4dHaV4hyU2WYyx6enp+++///jx4/fff/8dd9wxNjbm+/7Bgwd37Njx29/+tq+vb9euXUgYQSOF
+zarreqFQMAwDpfOX6i/nHMW+VFWdmZm55557nn766f7+fuixzs5OwzCgAC97hyWXWVEoD9Eiutgl
+cimS6aj4MVSMExUkICnVarVYLH7605++cOHCrl27XnvtNU3TRIk4QToGO3laYc+ePbZtb9++/a67
+7kL3ent777rrrt27d2/YsIEuPn+LW+3du/fQoUN33HHHgw8+uHHjRjTsuuuue+ihh4aGhn7+85+/
+/PLLqCGSXBvgr240GrIsL3OeFvWPKpVKEATr1q3btGnT/v37H3roIRzPQ9UAVVVd15Xih5m9U+qR
+vc7js31o3zJhNtM0MW3FaixmFpZNHq+T7e3t3/72t7/4xS/u27fvxz/+seM4HR0dQvQocaSPx+WL
+bds+ePBgsVjcsmWLyDPA0gqm8LsUH6QiItd1n3vuuUwmc8sttyBwCJXSaDTWr18/Pj5er9dfeeWV
+ZBfEHIXELJ8+hUgZzvyvW7duYmKiu7v7Jz/5yZ49e4iou7sbAQNRGfVdUE+x0SZUGy3rlhLWHvQs
+EYlIqWATgjk3N5fJZB544IGBgYE9e/b84he/gMJFkYOmBuBFGIbVarWtrW1oaAjvCOWALHtxvZhn
+kiTNzMzIsjwwMEDxjhdufSIqFosoPI0YOsXzTNQ/wlxcWFhYhh9IN0rQrlu37sEHH9Q0bWJi4sUX
+X0TOoW3bYOyyCmNJ6kGfMAEha8uEHdA3HDoQpjd6C10EOw8FoIMgGB4e/u53v0tEExMT+/fvz2Qy
+HR0dGCdIblIGIT5nzpyZm5sTKzBSnSgWUp4o6Id/h4aGbNvGw8PAr+M4oOPUqVO2bVuW1USKmHAw
+E9ra2pbpL8WPH6tWq4ZhfO1rX7vtttvefPPNxx9/fGZmBnkSiqKIifhOqQd9mqbBXBW/lyQlCfHM
+P1yMWSJYQEN1XQ+CwLIsyNqdd9759a9//ejRo3fffTesYxAElSWmPGOsq6vr5ptvtm37Zz/7GTYN
+uHkQBNPT0/hFSB+PqyvKsvypT30qCIKnnnqqUqmgwaZpmqb5t7/97dlnn21vb//Qhz4ky3KyVqNo
+PA49Jzsi0NR9SAYs+u9///vr169/5JFH9uzZU61WV61aBfPmstpiOak3DGNqaurQoUNTU1OTk5NI
+/lrqepAr/OnieaVwueBRmBgDETU1TfM73/nOxo0bJycn33zzTSHFl8WXvvSltra2n/70pzt37nzr
+rbckSZqcnNy5c+cnP/nJJ598EhsisajgPPjHPvaxzZs3792791vf+hZMyVOnTv3+97+/9957z549
++9WvfhWWLqiERcviJ3gWCoVarXbgwIF//vOfx44de/XVV8+ePUuxy4jH9fAw0qhtTUQjIyM7duzo
+6Oj461//2mg0FhYWLnWyNo/hpbj33nuJqKura2RkZM2aNYODg+Pj4wcOHIhiNF3/gx/8gIjuu+++
+KC7sKRYJ0bHjx4+///3vVxTl+eefFxc89dRTMI2HhoYOHTq0VHs45w8//HBHRwcRXXvttdu2bbv2
+2muh6Hfv3o2HJmG9jeK6C5zzp59+GlH1a665ZsuWLbfeeiso27Zt29GjRznn1Wo1istSix/61a9+
+BU2ydu3a1atXDw0NjY6OPvbYY6jYI/rl+/4f//jHfD6/detWPFMFbz7wwAOg+zOf+cxSRj1fxq5f
+s2YN5jgsJN/329raUL3zshgZGdmyZcvVV1/t+z7WKEqsgTCQMpnMjTfe+L73va+trU1RlFqtls1m
+x8fHd+3a9dhjjw0ODi5jv9br9bvvvnt0dPThhx/++9//vn///nw+v3nz5m984xs33ngjcvBxZdKX
+efvttxeLxSeeeOKZZ5555plnGGMbNmzYtm3bF77whdWrV+PRYmyxDCnncSbEqlWrtm7devLkScMw
+Vq1a5TgOCugnH3GF18Vi8YYbbli3bp0wyRRFueeee2A+rV+/npbONlzSh1OpVMrlMs7EgM16vQ5r
+YfGbl+iv48eP9/T0iGx3irVQ8ofn5ubq9frQ0BCUI6xgfNeyrO7u7qWop3iCnjt3rlwuQ0g7Ozt7
+e3uj+BnM4hwzvzh0Zdv2uXPn8PAM+HAo4Xx2XVeoR1EU4PTp0zhLhE+xHSkUCqIlgoGTJ0+aponp
+yGNdd+7cOewTk4nQ75T6ZIdd1xW706WoF2PbaDRgbje1Es/aAdGYTKjxn8vlcArnbWN7yDsT/wqX
+WTJEJejGxWKLi6C5cORRHCjnnOOjy/4uvzjS2xQPEHJDRNhAQThEESX0FG2+VPCXo17cWlQzFNb0
+MtQD6LMUP+5VqB2eqE8J8w7Sh59YckVK3F8wjuZBlaExyPxGidGmLiSXO8GdGDNcJpgVvcP7sAtE
+1SghH0JHCSqS9aVEO2kJz+XbS71oX7Jll1JPsekpShcIKZAuftY9j325sHnF3+WMgfhbTbzzRDSc
+xynK/JInPV56mRgwuEmS2ciiy/g3io/dYksIU53HhaovStKK2y8c7GhtcnK8O+pX8G/CeyZK9X8P
+K9S3DCvUtwwr1LcMK9S3DP8DLCP+vKuzzMsAAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_lotus" model="fleet.vehicle.model.brand">
+      	<field name="name">Lotus</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAABMM0lEQVR4nNX9d5xfdZU/jp/zKre8
+6/RMMklm0hOSAIGEjoJ0ERSEFVCxrOvq6rrr2taKImJh1WWVFXsXUUQB6SJdeiCB9F4mM5lMfbd7
+76uc8/vjnYTod9clCvL7nMc88njPzHveufd5z+v5Oq9TkZnh5RPnSClBBIgMQIjsQAlgAQxMwAwE
+BAolEmYCBIAkBkZEQAAgJoHgyCCCRMkAnhhBCgGKJAggBmZABEQA9ogIIIhICNG8AGNMEAQvy73j
+ywW9tV5K2USAmRGRyCEiIBEQECBIIRQANK8PHQACIAAwsPfsUJAQEijc+4nUfB8AAjhLmphBihAY
+gAEIAAHIg5ZEhIhEJKVs/mmWZWEYwt9WXjbo9wl57733WmsikFKCNwASUDIAIxB6AE9gA8h77wFE
+8+E4xwCgFAqVeWKEUEr0e/F3xFYjIUjywIRSBwjogZlZAQIAInrv90P/ssjLBj0zM3sU3KQOAMGM
+zEgEqAAAUlNL6hWTpJgRENSI6/V6vV51zpH3Tc1VSjF7FehisZDPxyBQoI5ybXFUiqUKAkAJAMDo
+PLADZuCIA2YWQhDRvstgpdTfHoGXUesJALz3UiKAMMZIqQGENdQ/0L+9f2uSNUqltrZydyQKZIXF
+sealKikFKmThnPeeUVlrvHMEAFJ5RGg0GuPjE0y+WIz7ZkztmdyNiI5QyRAA4ACK23sdB1D/31Je
+NuiJXJPKiShN07GxMWNS67I9QyNxVC4W2uK4wGSTxnClNpClE6WwXwpG4YjqwImQXgAzeOlLnnLW
+5xomSCkQYVsu3610mViOVyvVajUXRh3trfkgKhXzkzpbLVitdVPZAaD5AJrr4G+MwMvJ9UTgHW/Z
+snVwcIDYtLUXu7u7jG8xjZFkYls6sSqrPy34uWK+P19MWuKqDpSSHsgCe0QQDMygUDgSFsOG0yO1
+aHSizWQzyE9heWS+pTvMT0HdliR+ZHSIbK1YCBYsWNjZ2UlETZJ5uVQeXkboa7Xajh39znKt1pg0
+qbO9ozQwuH18YmiSfKjR2Oz8qmJ+R1trJZ8zCgkA2ASAhOCReO/uQAI8gCBADYiAFiQDgMt0vc6V
+RtvIeFHGR1N41Fi1KypMj6Pi4OAuR76npyeO46lTp+bz+SbzvCxb7osMfXMhN/WoeVeWgdFpEAgA
+lAEJ8OHa9eu2DozMnDU9DrVEVR/esWvrjeXiHT09q0qYIgQqJAwNE5ABKRCJLQMAKIkIwnsP+7hC
+ePZCOAwVS8kZCGsFOFGMoUHGew8EwZ5Kx8bt01N/8qSeV2eqm7JGY6xiqDbvsBl9ffPAgZQNiznm
+VLESoACBAByAhVoeCy8iPgfKiwb9gdS5fxVnWaaFZZ0R5TTE1ppNW54bn/Bxoauts2wmRmu7HwyC
+O6PosUj3txaloER7xhjAg82kVAysmAIpMwAHHpglgQIUoAUjOTCR9QSCQRCSAI8AwgN7cBArAexT
+ABahTl1htFZqZIWx4cVj2TG5KcenPhMNgamdMbd7+txZAhwxInoGEpQDdOQyIQvwkrHRi6n13nsh
+RBP955ewB4CMiesZrVz9rHU4d9YiZLNnx6Ojw9/taLlr/jSSmXYZqjwAjwJE3jJqIyQ6EyCS0MY7
+QBcjslAA6IGd9ywAUCqnpIIMHIANQDFJRifQeKu9lgF4CdYAetACQDvHBnn77t5NO18ZFy5q6Zw9
+Ud85Xh3snDz9qPlzgrgVFBA2mEBiBAxkSEQvld35Ymp9kzT3m8nWWiEEkvQGtm7dsntiZ6Gte1LL
+jInB+xu1n3cEd3d1jkfxBKcAJFASEyDkQDAzk3MCHSoAKbwVQgDGzjnwHpQCKQEcsAMUYJwIQAEa
+JnBUAJVo6cEJZmIGgRoQnTXMIKUUQjFk7ERmSlsGp+6aeFUWnFRqnzVW3dPi5JSZk2fNnccIAInA
+0GQoQ3zpdoAXDfr9JLPfbgMAIUSS1FesXjExLg9ddDSY7VvXfSsWN0/vWdsWWO9AypwH9jIRGtgB
+EggtvfMaAUSZ0gw1OTQ6lkO7QahWojbjioB5BiBOAb3Q3pvBCEdaCxCGCF5Y6y3amJUHlkoBkiUr
+ARDRGQ44dj4RUoiYJgysXnNoYt+hioczlnZPrJkzb+4hsw8PpQPhPIUs5Ut31nqRCadJMs0XRDQ6
+Orr8qUdnzl9SKPT0b7rTjH1t9uRHWgujQgIEAlmABWcBAwXCO2+1FIQkAZHZ28CDDstq15AcGphe
+9+d3TZqZK063rsgcISKDA7ZMDSmq9ZGh8d1P5OK7e3u3tZYJnCPvmUEKDaycY0mAUoAnEA50vmEm
+NIJ00iMPT0wf3HVUv7ika/L8jds2T+4qnnDEkVohhGg9avlSOddeZK0nIuec1pqIBgYGtm3bNmXK
+lFwgB7fd5tJrFs55LgqAaxGEQdWmik0uUACRyVISLgwFgHDkdCDBR6xU1ZiBkb7d/WdP6XpjV88s
+HcYW2ZFHqZHZGSuQQWgQ2sqJSnV4bGAn1385pfSLaeU9oMBbYAFKSgAJ3rPzxEAyci4NQ8kmJ5W2
+2agORFoLH1r3Co+v6Jx+1o7BYcHwqlccn2/TjjP1/4SFg4jOuSbRr1mzZnR0tLe3t2Fbh7b967TS
+L3vb6sDeMOs4sM4EAoHz3qZCOQzB24A9SGFQtNTr4/lWqGf5tauWtXd+rGPmyVBwdVPZOTiwesvG
+HXt2jdTHJ+rjANRSLpTjrtmtfUumz50+uZ2hMDKQTIzcbOkbSzrXonIgDYH1DIyAEplAG4HSkwdy
+oBQAKu8UIyhNa7f3rt3+upbJb0tsmvptS486sr1ram7vIeLFl4OGvgmucw4RpZRNZkfEFDlmAZnz
+INZtXTM0OLJo3rEj1R3Zuvd0z3i2vbMfM2QXoUwQAbjFyoZgqRhBNMihCGKLDU8YIXsfjqfhpsGz
+ch0f7J16mA7EPc/dd92aOx9b8eTmge3EGSIGgoE9AVlrynHn1I6+84867bTuZcvmHTPkxlfueLov
+uWrmzCdzIiMTs5zwnnUYpy6JaP+dCwAA2nsHqYIc8fCe9uVbz8Pi20CK0fGtrzjtpK6OVskheRbK
+e1LMLAUhAPzVG/BfovX7jcj9TihmZrCAkj1tXLdzpLpl/vxjdq1bNTLy8cWzn4pzNcUGTChRCpUy
+EnIhg1rg20CMYcDEwhErDAQTBcJx9tRzb+3s/cz0yZ0sxad//uVr7/tOlb0HFIVYamW9B2IAgkAr
+0K6aoGPOGr0tUz92zj+985SLh3aPDU48m279xFGLH/NIHmSgPFWlyGl26d7bINwHAQAAcNQwQkTU
+MOX7HjqqPPXfbOh3bx88/YyTJ09uI89CaGIWQgE3owd/7Qb8F0Lf1Pcmre/9ifcc4Kp1O0cnNk7r
+XmQqA3v633PkjB1hSz8ZyQYQSAUMCMzAKIUA8Aog8yBQKUseDQchDSa5HTsuzLV9sHfWIpPVrr39
+x5+9/SrfqUUmQUqP4IiECKTUzjkUishKyWwzCIFcOtmVL3/1v/7dsgutjXZu/R3SVQtm3aMJKI2E
+tOwYNe/VFULYdwxEQGpoKCrj6pGGiUbLw+tO1vn3+DQ3Xus/9bRXdbQXPaUCQ+ZACPCcShH9raHf
+b0Q654QQQoi9ho2H/v7d63eunr/osKENG5Ohzy055DbtmEXMzACpkh4kAAODYMFsmaVQUcG7CvpA
+hEXCSj21Kze+YXbflyd1TIZC433f/NI3//ATF4UgC6gS0NIjABMAgyMkVkJ6QtSOgDmhQEtjqi2u
+5atv+uRbFp7dn/odA8+o5JNLZz2IJI2JglxChrG5YAmZGZgRERGBmBm9J6ULTtRGTeHBh1/R0vpx
+LBZGx7ef+ZrT8lGI4AAEORYK4a8+5h703zcZxjknpWzi3nwSI8Pp+k3PzZx+SGXH4PCOTx/Sd3cY
+RiS8QKdkoqQHEGRD9jmEQAgltRKBTG1FCoWerB2Z8PmV688uFt8/aVJLJR396u3Xf/+5X5syqFzA
+MXm0Pq1DbQJrNVFvKJMJm9nqRNxgX6mwz7TUOg1D1TJuxj72g89++9HrozbZO2VJAv/y9PYTGCgI
+0jqoZkCGUaJgFIxyb1jYASOTxNCQAFfuCmuvOu5pblzPWeq5ce99D09UgUFZNyqE8/ZFcC8ctNY3
++f1P7JmxsbHljzzdu2AKN+KRbZ9ZcshvQq4kxseFHPsEkFEAUACMIBxIIEKhhENLwJBFQdE3LKzb
+cu6krq9M6Z7MEXzoh1d/+Y6rsauEIiaYgJoVkOtp6Zrf2TOnu29K26RcrpAaNzw6snX7jtVjG3Zm
+Q7XUgBMlnTvmiCMefna5rVWuvvhTFy090/n8lo33yuoVSw5ZYbgunUAGRETk5ja196YAACLjCMCj
+94jgUVeqPXctP2HOnLdt7M9650xatnSJBoOCyMZC/82h3084TRM+CIJqtbp+/XqBPKWzZ8eGr0xq
+/fa09glg4YGQYkBHYJUGEBLYN001ckAaBMXeZ7qtvHFrMj5x9uTJl7VPWlzzez5zw9Xffuo3mVTK
+WO+SyXH3G4997dEzDp3fO7O3Y0pBxwAA0Mxb4JTTXaNDW3ZvGUpHNu3c3hW0vv7VF3z1Z9/63G//
+s7tY/NBrPvzmEy9sjNT3DD8F2dVL5zxNdoSZkQGA8HkjgVFAlpRkUFfsAQC0TBoQ54INA50b157X
+MvmNm4c3LVi04IhDDzO2rlUe/2qb86C36f3kjohBEBhjtm/fvnv37iOWnbl79a87CjdNm1ZJKhBL
+khg4zJRS7JEABIBzCkAoSUI7FrEAFJpqlWql8oae6Z9pm9QTKnPVr3/+/QevM3kBFjDAY3sP/e93
+XHVYeZbTnFL2zMY1y7es2dUYtezKuVxrXJha7lkyZfEpC09yLlFHMIjAgbrswn9e3b/+prW//cxN
+XygHhTccczaEx/dvG3ty5a6li8aZiIiQ9yo7MxMBuTgM60AIDjyAMxBE6FKe2bVzYuiBgV2LJne9
+cuWzD86e3VWMJzPuDyn/5XLwdj2AIgYwToQSXDrunn7uqXL3NDWwupZ+cuHc5yJlXeJVnLMpKZ3a
+AIAg8AVAT5wIHVtMUIJjiKSsTIi1O8/vnHb5tEkzqjDx5Zu/d82911fiRNrUsv7gsks/ee4/RS0l
+dsm37/nlz9fd8/D6x6TUhLmg4ZEraXsWVMK2fNu0rr7DpsxbMHXOcX2HHtO9AOLo4Q1PX/Qf/7hT
+DJR825fO/cQbl55ns9qqrU+26yv7pqyMYcSLvBU+zFJErAccG0AEZCACZgDam72ThSAT/eiTJ1bV
+v0ApVvn0pFecGlAM4vkcnr8s0nLQWo/snDdK5SQ4y37Npg1BkAuoNt64Zvbs0UBllLGKFbFjhaCB
+DEQBgg+sHdWt4IzRGLHxMtKNRmPH7vO7p3xxem9vAytXXve9//jN52V7t0iNxuBfTrzkMxd9KORg
+B438+3c+fcNzv+UwDgoFQw4Ck+Vc7AvFJFftUqNpfWjnU09sfxSsmJrruWDxmW87/eIFcxZO7ZzW
+PzFWw8qVv/kPjPA1S0/vm3nY6tUX+53JnBkNsPXIRk4rQy5PwPuUeC+T4N4XMlEg8dClK5evuD9J
+z+3fM/x0+MxRS49GEE3cmblpasM+G+QFI3nQdj0BJFkjCnL07Lo1O7aNLp55yMCOH01u/dT0HvL1
+DD2KmI0HrXLAKUIASrmkBgpQB1K7tEpRkB9tyPVbX9fR909Tuo6qu+TjN1z5o+W3urguSNrMv++V
+l3z+df+WE6UsM6/66t8/seYBXxQYCu8NCClzBWr4CNCBURA4Y0gJoZSoZxkAthVao/yrOo59enDt
+pspmUJly2FIvfvT897/t5ItHdm8eH9wRwlcX9j0gFFWTRCNEXoNwe6EggL07EjODEGFKWRjD2jW9
+6/o/Itv7snrtrHPOjWLV9FntD1EcbJj34I9khKl1UU4Cy+Hh4d6++cO7NtrkuukLgNKMSUqtHGVC
+AgKyR+tS9hDk0DsGS8BRVLCpkTt3v3byzE92985irH/jpuu/c//PREvsG5Jj3wktF5x4fg5LluiO
+jX844tCF7z7vHJvmW3WeATJF9epYjoXKR3X05ZqmEEbN+M7G0MpNqx5a9cSwqY8ljRt23xrkYkAZ
+qLLDbFjVr77lmy3t+fNnnRZ0T9614S0rN+2cMfvZHMTaUSazcD93C9hr+zTz3pwJNWDWOm/2toHx
+33h4rw3C1avXLDvqcABoOmibMdGDUvm/CHrAKCwzmPXr1gcyXwqLg+b2RfO2k7EIoQpDcikiSNRg
+DSJplYNCw1lWAUAqnG9kUfTs+mO7Jn+wd+qUmml84vqvfeexX4iciplNGc0Yf/Dsty2bcqg3sDPd
+8akbv/r3p7zuokPOIlEc69+VQJaLS12z2lnDk/1rPabtnaWWzvayCLUlfJX+w/ZnPvnTq36/Y7nO
+ofENrQLIvAryJkz6aexff/BJ91p1wdEnTp1xTP/QB3bv/O+5k58CYAUhgWEAZNgPICMwAMgA2dus
+ISNYPH/5g4+tyU07bvWaFd2T23t6eoQQTcIBgAM9Ky9E/oKjATNBktot2zd0lTsru54sFm9syY05
+71B6z3UWLFmxIxAEyCQwTSCzACQhNg2E9ZuWdU25rG/G4iTVP374hu889KM6N1QY2FCadHRe55y3
+veL1ukoigNuevGvlzudKPlRQvHXFHYd/9cIFXzznqtuucRFYCdfe9OMLrn3/kV+5+OTPvOnyX31r
+pGGhoY+dvuxD57+rGJXICaGVU95A6pwDkCIIa75+5f2fu+Hph7GgejrO6N/61k1bF7FgCRnuFYD9
+WZ6IAJD5DCyqKLNGtufHivHNleHtuXzLunXr9vMMADjnYF+A+gXKwWu98OzV5s1bi+Ue6e1g/zXH
+LNvkGz6IBJHzDnSI7Nl7r0LpvSCsR2HJ1CzHUBe0Yt3RXW1fnj5jAUl3+Y3XfOGOz8v2DuU5C+qg
+JkG9smTRks6ozJEAMI9vXD2pY/qlr3rdLtv48A1X5cPilW/++KvnHNsgl6F5yxnnvc6dUgz0WGPs
+HV+7fPvozm++83Kd+rmtfR3FGTuqmz1YsBnqAJ0XUlNmCnHLttGRD13/EXveZRcvO2Xe0ks3rG8z
+Oz8/d/pzwjMANI+L+9EXAgNgz0QeQh0AwbLDV9392B0+uiTLsnq9XigUmozfBP2guP6gtd6DBwQi
+11aas33rukndTxRCK2UEWYiktAZkj4JEAB6RZVGFytcrQQgpJWs3Ht7ZddWsBUvJxD+467qr7/k6
+TO4SMoS8BlHGhpMcLuicXYkEst2Tjq0bH7vs/HcjyFt/f3tfedrN77tqQXvv7c88WUIVePjve3/5
+xd9+57cbVpXaJp1w0qkjo+PWWRkFFoxH45KqBqllIfKxN4yB8pFsCMgHXRWof/mOL9+3ZiUFSW7u
+kdsaF+/eNn2/zu9njOZPOA1ZKmYAMN6Ylnh89sxnWNDo6OiaNWuaDhUA0Fo3U1ReBOibj9EYs38R
+NZ8tcji2a9PugWFyE52lHy3uHfKNkKUBmSIyQpxadsgiQCQn/QSRgwC8tOs2HREGn+qZfBRq+MrN
+1773+itcMRQePFhHCERCmlDoBb29JdCWeMP27a+ZdtSlR//dTc88eu0DP7j6zZ9LlTnvivOuW/FD
+wIYScuXouuWb7vnq7Ve+4XNv2rZ2xfte9/aSLaKTm+vDQ/UhyMWeiYisdBAxoAGyXpALLMTRlmz4
+36777KP962bkpsyb9Or1tSuGBmdh2CoEg2cH0rO2GQGqLGeUtwGBQe8wBKf6OncUKr8p56Yvf2K1
+MYYgRWQgAD447P8PwtFa70/O2uc/gPVbt+fiImQDodrmPUqtrU+UAFQ+y9IgjEUALkuQhdDkJQZc
+eGbDHF/60MKZpytuXPfgnV++83usBSGA2G/dIhK1FEvzJs1kAJaKGu6kZcfnECpb+t998kXzu3oe
+fmzTucdcctj8w7JEyTh457IL9yw6wUXBtLD9mAVHL+2YbTJ784b7r7n9W6kdklELELOjZsa99x6Y
+BYosNUEUQSAGJ3Ze+cPL6+e/85T5R/fYw1Zsf9Ms99OpU0dUDNpJa40u5dxoQ+YBmEGGWnlnEYCk
+qMfxprFsuFiMn1313JLDj9RKABspg4Oy0/9Xu/7APLIDT2vDo3vu/f2DSw49esdz31009786it5Q
+PVSWpbCWtApReuucRBSqAFyDHD/93CKnL597yBnlOPeDO3/93p+8J2mLAsgbCawEeAIAkAISs3Dq
+jN//4/XlUgSKIWUbCQGEIEIWiBIsJxoRICKwAhywZwdAEYaSwCd+Uzrwbz+64o5n7wgmB8blhBDO
+OERk74EBmKWQ6CkUQb1W0Vr5WjJNdF797i8d1bO0Uq0PbP/xzKlXT28dgLRseFwJEAAkJGYeOaAQ
+XeYDdF7Cpl2zHt/4jjA/V+fDc15ztmQATJwLhaBmDu8Lkf/1fc26i6a11MS9mdK+Z2igs2dGZWwo
+Hz5ezo0glgksgARAjSH7FJG1AAYFwhDClg0zKP7XebPPKnJ08xP3f+L2z9RbNIqYhCDwsPf0AhLQ
+eyoVihGrQIKzTsl48/iO3zx+a4jxu058sw0qv15534b+rfO7Z1x85JkmsTete2hd/7ogCnMynt/d
+d8L8JbPyk7759k//9LEjLr/t6yQsaA1SMACwAE8CBTOjNPVaGoYlDhCU3Dk+cc1vv0fnwBEtc4vd
+52zaNp6z3+9oGwygDH6CJAivAL11nh0AeiCQGnq6Rtv2bHV0SJpxtZYUo5iRmsGLF4j7n4MeAJrn
+4+YhrflCKUXOl0sd1V2PzunZGCggzoQE8ETEUofoGDwCFjBMSctdu9p3Vz4wd945ORk9tGHFu7/2
+gV16QLf2WqscVgEY9q053OfGJUmevVASGL5x93X/fe/355ZnvPHoC4qR+uWjN9667oELjjr7oiNP
+DePcT5787Z1P/VrnSpkScQqvW3LyFy7++HTu+sDp71w9uOUny29hT7jviC8AhRCOPLMMCnGWOkgZ
+nNNRcP+6R4aqgz9411WTy5PCyls3DgyWOq7XOFFtyFLoyQkhQRADkgwBEuAUc0Gjq2Xt0Mirkobe
+uH7l0sOPNh6lJmB44V61/3WbbZqr+7f7Zk6Z975RTdiaYn5rIb8FvALOkIGEFEKwYZBFbzWrhgns
+tl0d48Nvmz77rYViy4o92z/xqw/vgS3F/Cxr6oCNJt6wz6jwwCRwrFpJZGqALMLGsV13r3vUtbgJ
+WRsY3xVwcPri47AYGyBJMgUIY61blCgilMOkgNc9fuvHbvzacGTI8jtecV5rrtC0F4F5L6c1nzEU
+jSEZCeAsiEIVKiqpNRPbr7zhi5t37+joKESFt9674pSBalhqLXoPzAyIqAgYANCjcE4g+IJcbWqb
+A6G2bd0KDFoHmU/3x3v/Kuh5fwzhAJNreHi4MpyGwnn7ZBxZcgDIAUqWApUEwWzJCYN5ObCnd/vO
+s7unfmRyV37F+NYLrnztA5ufDnM9Ge8B1dDoBAMIgfui0sSMSu4ZH92wc3MgogDCIAjKpRgUjrrK
+reselqROnHt8j+6FJEahvEkQRRYWEkAc4tM7lx07/8jf3Hfz09ufCRQeMml2V0ubIEba6w4QDMwM
+Ask5ACE8CxTWpqlLHZCX8pfL77rylq8P4lBnz/x8+WObdry+OiFARlLBXv++F94ACBRaAHNXocp+
+daREbdSMDO0G8MRuby3SXwl9k98PhN5739/fX4hbahPDILaxYxFoIRRwQOAdedSGVD1swf4BPbzj
+9HmzPp7vbt+2Zf2H/+vjW7NhUZpWF3liFKkFiMh7JOZ92wkIFKFuJIkMpSTEOkwtdswst8vUJML9
+9Im7h8b2HN698MeXfO68haeRNeUAfJrJqphfnPSJV176m/d+7dBJ85PQjZtRdi4MSi25QhN6KYQA
+3K9MMnRSMhsAViw1I6ggkCSgveuuTfd+8ZZvba/t6m3tzQdvX7F+KbsUhCUCRJAiYCcZCTQ779sK
+Mo6GTFYPZev46JDx9UCFPnvhyP85wnn+JbNveip27RrkzpydWFuCfqWAIAEKQSVKeuXJkJdxPDE2
+efWGs9SkD+Qn92SV/n/8+Ycf3PSozncQJRLGlIVi0EVZSjIAEIoYhfPCgHeFKn3w7LccN20JAGZ5
+MBmdMvtE3ygLDFbXH/m3332j34ycNGvJW447w0ndYPmOJef/8KLP3/q2X1x+3j/fsv7e76/8rRZh
+LmxBoXQma6myAQDUI++JgQKJxMCBtwFh6AQTgmSQjJ6dCUyUBkEp/Pl9P/zVH36NuSzfunAi957V
+O87yLpB5cA4cEORIMcjMuUD5wPa0PZVlWzB2iZGIbdKHMrYvHPr/dYE0j8RCCGaPiERcrycClYQk
+c1tayhMYCkrQUh0MyEA6CnScTCTpqo1H9c64fEr3jFo28Omf/efvnlsp8jnBDhAAAxJywmQy1sIx
+a3C2AYCh1zxqXnPEq//5jHeMm4pOAs6JgpLnLjzt1EMefHDgMQfl65765a7qtpP7lp0577hlUxcF
+pI9dcJSPgtXbl3/jwfuve+RGNzb2jhPfcMK0Q0DSg5seHBzaRJIhKtQrRqvIGUPOaCGsALY+koqc
+MGkKUishBYONa96E0D31m4/+2mvx1uMumjv5kP6tZz68edexs9Zq5RIyoddsEfMGGl6G0N4m5K4x
+IDYmkYIQBINHeKFB2z/HTU1z3nuvlELEarWay+XYJUJsLOZSSMAR6QDR5VGmXjFCuGrNiar88e6O
+BRN26NM//9qPH7wuKnXY0GemEQQhERoEEYc+q5UgTB0YCgSLPBROOvK4D1z0L51c/vbvrhM6evOp
+Z1Uhy7e0fvC0Sx/41mO+oIMWee/2Pzz6zINjR/Uf8uZ5gQhvffqua+798abK7lFtugrFq8786D8d
+fXHExd1cufKB74ymI6EPbcIUht7ZEASHkQWTF4HxPrOWGWUhB176ehYK7TkQNqI4qfmx/7zlexHI
+f3jVJd2zz9ixNV674+pFM7ZomwjhvETpciE0wLqOVipEQ3Xj640qUSZFTMAvPFj156A/4LQlEME7
+juO4Vh0sBDtjnSObyTgFkOQkaEc6fGL54vZJl3f1LMVc5Su/+vp3HvlRPtcirG3PF8dSaiRW50Lh
+jHLSSV1RFizOyE378LnvOPvwk9vCck6HLs2OP/yEf//uFcfMnDV/1qEJ2zNmL/voqX//uZuuMiV/
+/LQTPn7Je06ZfYwUIMi85dizDp8xX9qaLre2hK2TgjYAeHTLhv/8/bX3brgvdC0fO+udOl/49I1X
+m5B8SpYZYkyShBhVFAAjOUcmwwDrZMCBFnXyJlIRFPkbv/tZUeded/RpXbnjd464ZON/HrVwPdXB
+g5DgkSUYH+RrHeWJ6hBPTEzUxistbTHCQYQJ/w+7HoD2Rb+QmYnY2ZqOdoMQGCAAIHmRrxvIb1hz
+VB0vndOxUKrxL932/a/eeo0MggxCR7vffvIFU9qmffHn3x5Nx3MK00ZKpTxq4IbpKLe0tbbsGupf
+W19XhxRjHefKjbK9+pFf/teMmQWKHcO/verNNDHyxd9fU+phqe09z92bFqRGiA1KHZO0ari63u3Z
+Xtm5fmzbrY/ct2njinmd7ecc/8YPn/NPD65/SjMatJaxUGyrmYTiQIKAhnE21UFAYFgpcF6Cn9bR
+tXlst7EulOGESb539y9ntPa9cu7RVT536/aJlpZv93Vulg7BWgpJ1JFtWsyPCCHGK420nnErwIsS
+INwXbGQAIAJEsW3rzu3bd5Bb013+8Pwp49Z5Z2Wc8yzVup1LK43L5vQdHsXFbz300/f/7BNBvmAm
+Am7JAe6ZTT3XfOA/DNDHvnX5c2MbOB/quBQ06pkEVBKMs0kWlYuIMktSjAR5jAP8l+MvvOy8DwuK
+tCIH4lsrb/jqLd/cOLQqVCH7nLEoAxEo9oG2E6lW6NIxqtd11PWG48//lxMvWDJr2Zr+DR/+3ufv
+3PmIaFWubgFCYAQlIDGCCKUQgbTjEzKxUd2dtOisL3z4E+/60vsf3vF4FPSkxgY80Ut9l73pn45Z
+ePKeId+/8/uHTr92TtdOXw8hb2VDEth1uxc91/+ZkXrl7FNP6Z45TQor/nquPzDS2PSnZplhZm3H
+y7kMpGcnEQKwZtuuWVt3v3rughMSP3Hj47df/ouvAiLbkiyR9xkY6Ozq6G2dPG/KrGkf/fonvv/5
+O9c8bM0YF3IkkZyTCnRLmIoMmIN8YPIybIB32Zfu+slEzX/kte/obukKsvDdi1//iqnLbnzsrm1D
+m7aM7thqx0ezRFRM3U10trbmUcyes2BOy/TTlpx9/NxjO1Tu/k2PffS7n18+shYj6SxDFASeJQlw
+PiGbK5ZrI9Wgga+cc8K5R588f8qM+b1Le3KlL735k2+9+j1bqhWtA4PZtnTHx6+74sq3xYdNX9Se
+vHbT5qH2wvVtxfGsgRIRUQkxTiJ1DGk9QwEIB+FA+z/D4uQ9I6IQYuWKNWNjEyXzyKzZnyoFtdTl
+A4mUhut2Xgg9V/SV9D39T1565VsThCAo1dipcs5Vd5RM6YZPf/PUQ07OvFAKk/rQl2/91hX3/tgL
+iTrkjKIwNuxJpKhBZqkTJSWdK4RgSVRrS1rmfPGSjx0//3AFgXLAQqae2KZjWB9I9vgkNRS1Qm5G
+Wydo1EFO14HydMVvr/nG3dcP8QBLUlh0iICk0tR5Vp5dFIHhlkbwhUs/eOEJZz/59Ir7lj+5xa09
+tnfpP5z+ru889PMP/PDfSAlPHNliRuOHRod8+e//ta90SP/uTRL+Y+msB0Iy7CSoYNNw8ZFNn59o
+yBMWH7H4+MUSEoD4BUL/Z7S+WUgvEJ0QCABJ0kCQXmSRJAbQUGelV1dmO76wLzbPjm78zNevNBDa
+yJigBix43EnR8dE3fOS0BaeA96FymypDP7nt+jkLF5647cj71j0WRWGibQocyiBLWQjtdBQal4kA
+qj6KlZGwurHl/Gv+6TXHn33xka+e1d7dm+/IBTnWEULYFXcqAGyAyQGBh6yxe3Db2mzgWzf84pbH
+77TouFyGJIt0XGvUIApcEAapNTkUqSUTv+mEv7vkVed/5Yavf/WX10xwAwB/fs9NNy6//dQTT23F
+rkqaBOitSGJfWFF79tO3fOvjr//w/Na+h1adMrlj08zSFoSAgQLKyE3kYXLGdQFEpF94nOrPeS7h
+ACOHiKy1RIhiwtlUgxLajdf02MDSvr55VU8f+MannhndKHM6tAGEUdqoRak///iT3n/BpWQcBno0
+Gfv4ly/7xZN3TOrpNlIUVCGt1CESEFCWjAf5yEAGSJnigL1ildUNBdponQr/s0dv/sXDv51a6lwy
+de6hU+YeMnXu9PaeEAIgbOjxrWu2b9q+Yc2W9U/v3LTVjmYilYGPMDZjFdRBzVVACpFkEsAIhAkj
+G/aEmQu/+M73P/n08i9/++u1oKE7S7aWRC2F+598/MHHn5L52LFhk2BOJxiIqPToqifv7Pv93Fdc
+OmvOMavX3zJtSb8WDLgvCI7MTS/swdQ7/B/QH/gMrLUIATIHgfApyhD6d7XF6rWlrsm/W3HXM3vW
+UQmJPLPgzMUYX3TiKVf84/s1O+EhBbjy59+48bl7gt7iUDrGolggr6JYKs7GG4oAxxvKsw8kt7GO
+I5sYTyCCnPce2OhYEvit2c6t67fdvObuWIT5OEYdWKa0UqlzBqp5AgxAgwxKkKQNi1FcTn0GEgIt
+nanZ1KD1fS3zO2a0zmrtA8Cps+dc+fHPb96wWpfyk4KuKM63Bfm2Qsko3FUZenb7hu/c9PM0sOw9
+Bf6Wx287Zfbx3V0zg/yFo+PPTmpLmBmQ9ju7DgTtr4L+Tz5u/79kYyklobCO641F7d2HNeTEnU/e
+ndYNaACFTmnI3MKuBZ/4h4+UC5PYg4nld++9/ht3/cy1SkVOKWnR1DSDtaqilrQvOOqIZTPaJyOL
+Fbu23b/i9qHKhI0ExAE5AsBIRTJL6zonIkHeA0Ddmloyrr2yzgqMIIhBS/QckCAiSpEwJ4qZrU2A
+9yrISQM9hZlHLTz0lEVHHzH/8LufeWDz2vUSohlx9O5XvFGcRB6EYqizjYRmY1EjIzcoa0nFFTdd
+K3IhRrlNu1bdsfyBi0+fnS8c0/AzAFcxewYBLJibOf98EMD/n9ALIZrReUTUWnsHjLqRZvmgmFiK
+c0eovOzfvePpLSuBuD0qL5g5Z92a9aGIL//Hf+8tTbUMEugnj93ymZ9eleiGBA2onLARuzCT89vm
+vusNb33NESd1lFtTsI9vWdk9ZdLfv/rcwd39Nz5w2y3PPmRKCBpT6wVoldXRoBCSBDIKCCKHEmVA
+KCQxJI7BGvCSha+m+bgQRu0nzJ01e87Mmx67nxJ6++kXnDLj6GOnL/zsnT/+r59fqwJ5wiO3Xrr0
+bGnBhwIdsGMdaQJAgQIVMuQ9/vMb3333qvse37ZWowaZPbtz3et9DZyf8D3AK4FFUzkdsVQHnf16
+EE7OKIqqlRQlEUWA3jOB6lShGOyv7xofpICq9fo7zntL30WdgqOli48A6xTiQH3P1354zWh9CGKB
+UvuqU6UgnRiZFs/8+WeunRx1S5RVO/7er33sJ8/cCehPnHriDz/8+QuXnHrZL//7q/f8NFU2DGJH
+Am3mjFFKMXkRaqWEqVdCoYzSPsmE1hiIUlhe0Drt0MXzls5dcuSsY6e3ln/x4K+xxtuHd172w69c
+1zr1d/913Y7R7RN+zCbZx7716RzwCQuPzIW5kldpEI40KtXKeFKpVRrJglkLWuNSOV8+adkxj61d
+oXM5FuG4qRgzEQR2ZCiiaQAomDSCJoJmP6qDqm37v6Hfb+DHcTw+Vs8oJCgCDQPnPKFSAXjObAZa
+Oy8/+plPffCN733XG96J3qPWAxMj7/vPf187sDHMq4ZWLk1yMudTzgflz77t431xD6UuibKrfvOt
+Hz15C0wtCs/3Dz76kWs+9/33/8dlF75/T230u7+/PiqFh81ccOack+NSDgRnLnMmS+o1qTBfzGkG
+RTie1O977sm4XDrv2DNfv+TMFhslgXtkzaMf+u8r6mUqtZYqxm6vjD27Zt2xvfO/b1PRonaJ6hu/
+9u9Hzlswvae7M5M1NOsHduwZGdo1uFtCcFzfoV/718tnT+rbvHOH0mHDJsSBcVaD8FJKDsijUAF5
+FEIzcxAEL1XiHyI2e+I1Gi1JKsoRo4tVoJMkyeVQRxoaUsbRoG185PtfXL551Rf+4cPdHVN/8fB9
+v/rDLWJyhyDGmg2ikJCyicY5J5553vGvtgBayInGyPfuuwnbyrLKIHPUMvT7rY+vHhk4snv2e869
+9I5VD+0a7D9pwWHvP+vi3bXxJ1c+0z1p0hHzFkegG2Q39G/ftHvg2OlzJne1ufRrX7/7ZyueW9n1
+rvichSdFJGd0Tenp61kPgzWqClB1a+5Z+eD5R5zRUuwczcZQspH0yMrHH1vtqdYAYFnOeed0LrJJ
+44E1ywdtTQwPPvzMk1roVHoI2yQKZ5wut5NzzIAggRWCZkKl1MFm3P8ZK1Q0lV0I5X2zvZ4S0pPS
+E+OTbADKO+msdY35bb1zemaLNJPGyTh0RfHTP9xw7icvfWjjY6cvPHzm/ENFI/EErOPM2zSzOoVT
+jzicAIQDE/hrf/uz0cqoZHLoHRgw0ishUXiRLW6fc/ER54HgSVj63fbHTvvEJW/85js/f8c3QhCO
+QQt99R3XXnTtpcd/5pzH+lfHuXzFDe2sbrv98YdYAAjVU5xywtJXwkBFocp5rTL7yIbHuzunHtI7
+RyUIAgHrUaH1Bx/+7jff8+XW8gxfY/BEqek0uf/4x4/P6J35oasv35VscT5GX4RaZVa5Oy7oaMz4
+gkERg6qO+SlsRS6W+bDIrAheDH/9gckgzX+llFLKqglqGWoUTjYafmMRcxiZV8xa+vC6x61mUAhO
+YKG8dmjX2z/6vs9/5NO/v+wn7/jSB+9f/WA+DsOg9PbXv0WONcpBV5SBJ5sqenTdykQ4BUqDcoSa
+RD5X6MyXpJceYem8BeHvdL+pPnLXzdsmdhskB4yAiMBAyODI7qyMXHffzV6DimMIaXdttJqlpSiU
+Ougudsg4bwiNQFkqPbtt23hSWTR13qPrVxDYMCyaPbUnHrrvin/50LELjrrzsXvW7tnWPannvOPP
+mlJs/8gVn/j1iruhlBdZ3UkjqHDUooV5mDyWPd3ZYgUQIJJrNY7CgmppLRB7AQ7wr/bhNPNm4YAY
+odLCWptvy9eSPBnFaOrpY9nQcNTbecq8E//r3h8lJiVvIYhYqoRpVzb2riv++ZOX/Ns3P/blDZtX
+DwzuWnr4iXtc9bIvfnTRvENsABr08J5t/bu2qUh77wKhEKRP6bB58ye1dIBnQRwqbQPxs4du9964
+vBIiElo1FyszAjEGCGHuxid/J0MGpV3SWLt7y0SSlMKyB1wwZZb3CCwBBYVyfHxi5+DAqw898dv3
+XA8SrfUq1t+747rWSa2fvOjDC3rnbhnY9syO9T+49YbfP37/6k0r4+5C6liFkJmxw2ed8IpFxxqT
+RTld1usEOk/RxHibZyiU4nxLAZHFwVDOnzv2/knyZi6Xq9UrSudHKlNrE6VcjFNaB9LxxxpWzpo6
+/fwjz+ShelFpAR6sCbSymmvKfeA7n7z6+u8snbXszadcMpFV//4T//jgmqce2bEuQ0hM6pBBCmcS
+JM/eEjvv4MKlZ0gAjwgAq3dudIq3N4YH6qOYl0Tee98MdUtElEIyOCV2muFt1X5EBClrlAxVR4E8
+CpxR7CrpPNYTBcRJNSS/bXjw6HlHtLa0Q2akE6oQ19vEf9553cZtGx/ZuerUD77h7y57yzdu/K/N
+u1eXetsSMOwjw17b8PyjT22LWxumNjLyVFc8AOwmGuGePWUdheWOVimVRHEQqSD/ZzLIgQnj+Xze
+OSfdFILDxyfK4OWU0mgkbujvX5N6/NDr33vmEadk1QTIAFoyRkjtdRi2tlx76w/O+Pc3f/JX//mm
+z75la7o9mtzxs7t+M7BlcxRGpETiPchQBSE5j2l22LRDzj/qNG+8FFDhxo0P3wbGMxKR88ZCkmkv
+BCAReGAiEpaFECBIKuUSg4Tbd25bselZVqgA5nRPm9c9TaTGuwSFd1llrF6VUVAoFAAEW5fW66Cx
+Uq9c8Nm3/ft/f2qgOhC0hNQepDlu1FNdEQqFHaudc9hZrzr0rD2VNK0MxfzTQkGAgt2jpbrpFFLm
+ixGAABLkD8K4/F+hRxRwQC8zAFBKlEqlejXV+WkTWcTG5fN+ft8aZZ5GLhR87r2X/nNXrgtSj96x
+cCQEowYdYc48Nfrs52/81kCtwiqXKt5T2fDFn1+TgZnR0rWsazZWvEm9NxxMmPMXvkJRKNETm589
+eMuKbc+1y5z2EAcxOgCWgVTN1CkGJnJsQCIjARsQQuWiPJBfvnVlFeo2zbpaOo+bezgmpL3k1AvW
+M6PWzKeu2kAWUktyLmQdBGJ1beMf1j8BhZJpSMVF4BBEKFTsJkZPmHvUu879ewUxUc6PX3/i4l0p
+G9Dx4FgPht1p1pASCQSRx4Oppv0z0B8YINybntDXN72WbFe6JXFTLQhgU8qPlPE3A9vuyZzvbZv2
++Xd/ZhpOUnUUgGSNAMWCM2QkHzi0qggqr8GLvP7uE79+/zc+vWd8+Duf/sp7T39jlyvNy0393Fs+
++JGL3gWxMhrvWff4VTd+FwpitFZBYu+ZjReonCVuZmcAB0KgjGxai0ErH2bOJ0kmotzNj92+pToY
+BBpYvvWUC5dOPywcw+mi598v+eBpJ5/6kas/OzAwwCQtGIgC8MKyY5SQL1svo1yLcx6Uco0sq6RL
+O+e+/5L3FYKWJNmTDt1/6Jz7IqgLwdU0GB6birqFPZVLeQEg0B+UZf/n7Pp9TYUcIjZVf/r06avX
+rNCql/1C1A8ZqCuRze17cvmaOxvpwiIUju9d8oX3XPapH3xhw9g2WSyiMdaRlB0iMqxs6F1C1gak
+fIcqJ9fefd0z69e/77y3XHLC2ReceEZXa/usjh5O3BPbtzz61F1fu+0n22FM5By3RWjYeQAQUgWe
+gRikBAImbx0DBNLXiEFDrCnzWgX99aGrvvX1n/zzVSCDw3vmf/uKr69cs35uz8wulfvMd7/+oydu
+F/lABaFLJ1AqdILRKhsrDLMs9SrFMGPrsIFnLXzFu858S3upy2K4Z+eaqeq2aV1DzkJActdoNlFt
+w1yYC0XXpA4AAEGOvBIvlHP+HPTNrh/7U2eFgCiKpnTMGGikkttqDSiHoaFcLq4umX3dg8+Wojl/
+n/jo2DlHfvvd1175oy/dtf53qlsrHVtT8SIP4JgbAYEz0oUMAFFb9PjAU5dc9XBf19RD5y3obu1C
+hnWVres3b9o1vBviMCzkjA0gtVYDoQRp7XjF1oalIm9EGvhG3VKtEkatNs9k6uCEQnC+gXHppodv
+f4Pwl55x4YIps2TCU9pbb3rkN7+84zfralsh1qykcwmoGDylnGoZ2Ryxc0oLREl1wEr2xuPO/qfX
+/IMQky27xo6JSfCNIw95QpADlGDNSGVJLnfEjsbIkYf2lHSbBQcYas8vvFjkoAt6dFCisa312uxd
+u+aXZy5XaGwi4zwtnv3rzRsr7VP/tarV1KkdX3jPZT2/Kt+9+pGdjR1R2Mm10LDyoXWYCiXAGJA+
+BcBIiiC3Ldmz9fFd4AmVEsSgpAxjLzBLDQiBUrOH2FNX0HXqsWcum3MEg+dAxKBfe8Tpiayv3LRu
+x/iIigLy4L1HKYmpVqZfPHzLnU89MLV1kjd2cGx3xddJeRkEzADWS6EQBbNwADbzAhXr1CqP9WRG
+vuvCV77v9a98A7qK89n4zjUh/GrO7FWKyFstI7DO15PpnnMt5XDe3EUAIEA4BpAvZfFma0d+9dra
+1PaFW3ceMrlrRVsJM2OZg6ntQ+XyLx553JY7PhFOlbFIP/2Oy87b9txnv3/lc7tWusIohHmmQIHy
+nhGFgNgbxwpZS1AOC5FQ0meZ9hqlcMC+2asABHtmTw070Tq577DFRxfLbT9+6Dc1ziKMUcmTjn/l
+cKWya2TEowcQyCgDTeSBvSyFNd9YNbIJiEESBqh1bL0UDODJG8s+RVRhELJSgtN0ohEb/5plZ73p
+lLf1tHQxjTdSlY2vKsffWzzv7gIRunbwVRa+6ko7dk/jsBiGclJnLyAwWcSQwb/wfJCDLllupPV7
+b7uPMJZ24+GzvzgltwNim7owYuMiUbGFDetOSP2biz1HCQxaAjlGe2574g+/ePyWlTsflwFLLJEI
+IGRh0TOBEKDQN/3SQgASEDMTiH3V2syIQgnJYepqGLjQZymwkbFwVihVIGqQEhhqFsjOSxQA4IyR
+e3skOUBUUhERGY9CsJNCkhToXCqREdE2MmAMkuS43pNff/T5RyyYj4GwRkBjuDr8eEf7DQumbcrj
+uPAhcgZe2IieWD332S3/aIPJPTMmv/aMkwR6xwZEDGzVCzZyDr4zCPCW1SseeXpdZ2vX5OiKQ/se
+BeGMJ6XBO9axT9Jo1bZZI8n5ne2XFMIcMwclPUG1G+69+TcP3bx+ZL1FA7kYOQziyJH3zgmlmnmv
+cRglZJXWIIVzDogQUAASEUOigtiDEsRKg80MIYKKJKNnAiYQQjCSscAchNpkVjQbgzXz61EBIBFI
+4Z1zOlTOZmAZEqednNc3+83Hv/L4ha8tq86R8QEZRo2RQbPnB4fNu2/qtH5oSDAtRlY5NaGUu62/
+99ELE33B4MTghX/3utnTp4NPQaKhUAuHL9wjefD9cHyjUn34seeMrcPY7UsP/2l3S91mGTMFgYQ0
+9spBSKMTHf1jS/fUTp4y+fWO6lqKUrlrw/b1j268b2N1y20P3zfYGAWBspCTgTYuQyECqUyWsYgQ
+kYmACKRs9pr3xkodkTEcIBuCSKNlCBUbJ4iklITgnQEEoRQyeGNkKMg6AaikJEvkm2cU4YIEPIBB
+qLp5nbNOmLd00ZS5i2cvmFrqGa1XAGU2UbFjT3S33dzV+XBHyWEGgtEqtiBz0AZubJgX3PHI2yds
+a/uk3IUXnCdBMGcIilETZBJe6MyTv6BHgvWkVzy7dueOdViHgD938jHrAk5ARN5UAUKpQ/ZVVJyK
+/NaRyatWvXJa37nF8pHgTaxcoOOKsOsG1t63+pH7H3l4w8BmG0AmLISoc4HNMiEjAGg2fSHgZqde
+RFS5IiWZyGmRuUyidghKUupQOKC9aeLE7MFDU9MlAfC+tjlCMKD1PjMSVMRyfvfsU5a88qRDj+st
+T8GEhYMaVDgLhnes0PiLuTPvnzbJsAlBiSytR1oDpvWMtJQouu957NiNldOFEOece+q0ab3WOy3B
+WyG1sD7V8oX2RDt46Mk7Qf27dj5w91MdbX00evMRC/57cveIzQCCIquqIkBShp0QqCWP1Ft3j00b
+rr4y45PbOw+PAqmcLwQtTtZ2jO5eO7B509iOtUObnt26esfILkfWC8JmzhszCEQpUQpGZLCIkpUM
+HBt0OQtGhmzBa6+kJuuIrFSKiJhISRFUM5bKsPBEwKJFx7MmT509ve+Q3Ky+SVP7uvq6ih02tXXn
+KMDxejUZXjep8HhHdMuMaYMyZmso9CAMpFGOG41Ya5NZHee27Jh910On0eRDpnR0ve51r8kSDnII
+AGxBKCA8iOyzgyccDyAdkbrv/t9OjImclOX4K8sW3iU9Wh8GkiHJQIVOe0sugsgpBGUtRJs3twwO
+LCu1nh+VF9e9yMc6VCqWMYCykFb96LqdG59bv+nxoecGhwYq9Ypln/pGaowF570HJTw7oGYxJgoQ
+iLJZS8TOM6MAFEJJFFoHgVRS5CIZtoTlGe09S/oOOXza3Blt3a1BLiUwmDlB1bpjw9qPpuNP2XTd
+YXOvaynFobbe1iQASGAWngBNJKJG1ogjRVaq6353chpfXB0ZO+mUYw477DClVDOK1+xFdlDNQQ5e
+6xksGSVVtdK48+7b2nKTqgO3H37odX1t2wlDx1kQa1e3UgtUJUqrIJT3rAIJka9kvpJMnhhfMLJn
+stPna92ZL3apWBAkmsNcUA5EZH1lrDJWSWs135iwExOmNpaMDo+PTIynSZZWk1pmU7vXDGJgESkT
+6rAQ5sv5Uku+3JortZRaC3Gh4HO5MCrl8vkwr1TgiRNLmTGxLNdrFZvsyerP5KPl3Z3rWkrr20o1
+ZVpRELnEu0wgSEAmJEIGL3Xgqqzb7NPrFj698U0ZzunsMme9+tx8Pu+9b6bmHdgS7gUCedB2fXM5
+I9hSoVAulwcGxzoLZ6xavanvxCG2PojCRpJFAYJl4ApCgMoJBJcYRaIsKRft7Jk+nE5WA9sfGq/M
+SevHiNxijLusyFuTBBpDWSgXyu0tncDonFNSKAXOG4TQuMx459l5BMa9bVk1g1JKK6VQAu39MRB7
+9o6JpfQM1WpqrQcAJh4ducG5tcXCqqnTN0zpqhTz1idAFhDqLsuYQUohEMEjgpDIoKkybkpFPTJS
+WLnlUBfOQ5MtXbq0OWwD9lZ/cHPA2EFB/5dovYMGe9QiHqvU77j7gbzUUBs4pO/y2bPGqDbuJMkI
+RcaoGCDMOAuDAIiB9gXPBDrHKlaNxDVS5bnLcGe10T0+Or0y1h2WjtI6KJQ6clHZMzjnQIIQgMI1
+80sRJBN57wUDIhrOAwAREVGzk1wzUS6UcmJiIkvGrR0AWlvMr29r3RFHwzllAz1RLBiFDFaTRQeZ
+jjwmZD1IDUIG5IgNIYMgdk6pHHrlHnj0uG21i4aT/JRJwUVveD2g3t+O5S/If/pLoCdvUQKyJpuh
+CrcN7bn33pu6o/lJ5WdHHnJrb/sO4FxGdaVBegXSWQnegSAFhEoTSvaeVBClRFHggAgMMCAJzkBn
+To+OTh8ddfV6Pohm5fJzhJ7iKG+dsNAGLJAlEpIXQCylklIa0QC2QBlCQ2GqRUbUIJfVGluQB8vF
+/s7WPaXcWBy5IAi8Q8aMCAQDeJAkgSR4QhCgHREJIQGlMxY8782soQhy6aqdvU+tfBOLwxJOzrvo
+lEkdZYAC753fR8+3c3lJoQfIjFVKSAGO0Vshf3fPXeMDY/l4Eta+ccpx9+ZV3WZSxokzWiuLssiu
+jgrYE2IAqI0xWkuEFKQC8gSMQrKIvHQgMw0IoJgCY3WWsfVCCKW0zlyrNd4Ybyx6Bk9ASABQQK0C
+DjUpnUqZCEwBGgw+LklvvSSQjOwYGBDQOQ6UYhTETGyZQBJIL8FFoBt+X/ZYcz0BEBCzhB2j7Xc/
+cR7pk6hRO/eC17RNnRyIOmIR9rXsaFJNs/LpJYTeuRqqggBAYhDOA05MmLtu/0W+sACSrcXoG0sP
+WVWQKfgUJAAIlxkVACgEz0TN6jgkYkIQUhAIFg4R2EkgrySQBakAZLPnmwBEQAIEEAQeyAMiAEpG
+8oIBQO+jMQJgAgJs7ntQ9SgES9Xc/QQ3f723ApmRmjODmsWRDCC8hOZNNePSHhx5RIFh7w2/WzCQ
+/l1qG3P7Ol77+lcLmW+69w/U9L+Acw66H46SMYFzPgVm8BpBFnPhyce9etfOVaLQs3Po7FUbQ4hq
+bAC8AjJSFgFyZASBZFSOJCgFEhAUskAnMAulUxq9AkAqi0CAalbUAnhgy2wkWG0z6awEitBFaIRI
+USegDTiUltA6RC8laW2USpSoCw4ZIxDCIqWCM482E9RQQIEjaZk8OkLryTKyEKgZAQUDUnPYqvcE
+LFWQe/ThjkpyAeTTGTPaTznzNSw1MgiB++N3zT22yTnNXlAvUF600QHPPPnEI8+t7CjOgYnfLZ79
+w/mztkNdQNbic6PIIaNicIBOyWYPSTigpp0PLG9/XnH4jxoDERA0y+mav9x32UwHJEX/0b3w/hvE
+vQX7CADICJ4IQQhsFt8zCCLQJAE1mwSDHPi6ZUA98+kVxQe2vjuOAwZzzrlnTZnSLaVElHxAi7S/
+WF60qUuHLT10yeyjXHW03H7mY8+8evOOHojJ64pELSQR1IEzJQg8WgckD7zwP7qJP1EF3ifNObL7
+v937W3r+T/CAZOv9n/wnuAOA900VFUTAHphQACqBHqW1DdRgkoY3SudbnlyHz+56Xblcqtfrxxxz
+zPTp05uHJgBw7uAaPv2P8qINoHFAy46cXxsf7h8eKk1+8xPPMYlfzOge81VgDTJARMneeeeliNgI
+4AaI57c1OGAZMDfzpZ9vGgIHYLo3QYgRDlScA3B//p17++Ye8LEAKISQGoiZGIGAoZk4LtEb0IKC
+QNQh5x5b07d8/YUc9lX27D7t9FMOP3wx7CskttY243d/pbxoWq9BQyRPOGNZRxeN1LbnO9/0wB/O
+2TIwS7YKBW2mGhjjQOVlkANIZWKhOX66eQICBADBzS8UjAJg/xcyH8gkTLD/Df+jIAMyAME+h3Hz
+xV63EDF5Z5x3zCykFCia/69rQKw1OEsRPLq6b/m6i1XLMUkydOTSw5YuXdyckfQn3VL+SnnRuN5Z
+cNIJIcBlt/72pj2DQVu+zZl75k//6dwZtZwa54ZwOhA6lWzBQNNs3mvDAexbAQfTUKYp/MePYD8X
+MR3w3f6cCgTBRAAEQqAAxWTZAyKgl8Aecvi7Fcds3nkRYPdEdeDYVy0+/uhXEfO++mHfHAX9ooyL
+fNGg9wASHIOqmrGQcw/c9djQ2G6Zm97Y/csFc+9Z3Lu2EDNnmfGgQ03Oyr1GHsC+6lxo7qwsAADF
+n7sq5udnMze//5/eQ80f417d30duEsmTEAgM5JgJEFVzbIOB8PePH7Vx+PUqP70+tPWoo+eeeMap
+AH/kIDsoV8GflxdvLhUnZCPQY4ix5LhRGXli+bPL12ye3tltq5vLxV8eOu+JnrL0KYFMMw+xeL71
+SBPAfXe0X4sPeAMi4P7t9E/eBnAgv8PeCSSMALR/BQDs68uCHj2xUoBCeEtSxiAjm/qhauujq5YM
+Vk/10GF9/8mnHHPE4ceBt6D3Nh87sKnZ/39pPRjPgQcIyBKIBGUArFc8seIPDz43pa9vYmJjhLcc
+u+ix3vad7IGFhL2DSwGgyTb7L2N/+dwfmzp7S/Wex/HA7Xd/ly34UyMH4ADzhpklBd5ZqZgAnAWl
+C+T16Ej1xkffCGIZRe0Odx933AlHHrHEc0NBAdB58lJo7/c2Lt4/q+KvlJd81O/alSufXP40QIsG
+8Ob+3mm/Xzx3e4RjgnLkjBReSrYGtI4tZUoTuhDQMXoAYEBEyYzMXgog5gPXRJOUGCU2cxcImlFF
+ECAEsEEVAgA7qwQLQA+ekLUVRqBGB1Ja1jBUa1u+6vDB4VNMOKnRaEzp6T7mmGOmTevZ24vtxaOX
+/6+85NATpIND9bvvftBmtj1XrgytioN7Fhy6dVZxVa7Q5oxVAThX85YDpZiREBAI0OO+xlkAAAh8
+oB2MtJ+OyO5t+c8MQmqQEth7tpnSymvtPEIGAjyBVYAaA68gY9QiM2Jd/8wnnl2WwLEQt9Rr2xct
+WnT88ce3tJRgX51ws5DmJZKXHHoP1jqFAlc++/QjDz3dGncVI1+rb2iD+2bP39jbtzEkbydAhyEo
+7xwBk5B7GyEByybiKAT75PmLPrDpc5NySTm372QrAJBE4E0NAlRCIVgLIgApjEuFAwjKz65te3bD
+skyfnAXFxFXzcXzOmadOmTJFCGQGIWB/n8P/h7WePaG0mcnCoDSwa8/dd91mLZdzkzLTSCoPTe95
+Zm7vurbCQCnCZrUIY0RE4AlZMDOCB7QCwe4zIvdW8LJARGD0mBEBEmgRohDA7Mkxs/QhQ4qCmQQz
+CwUAwmQ4bHqfXtnbP3aqKC5uuHHikandk848/ZxCKcfctNz3TnzfPw/jJZK/AfRA5KRSTYZwNtux
+Y8uDf3i4kblAlJBFJIdzwWMdLY/O6xss52uaIiDX7M6HiMx+Xw383lPSvs+ViBIYnUJkhYRMzlOK
+wEIAgiAkHQgwxCRIt/Tvya/d2Dk60lujsxqWZZyvN0b7ZnS88vhjJ03t8URSPM8t+2sLXtJZ738D
+wgEGAA9KElEqhAQIswRWPPvonj3JwO495Bs5FWTVoVy4dvKUHa3q6XLZd3SYfD5BylwCwkkhIlAJ
+MO+dpdD8AgksDDkltQC2zqIAFQAIzVb5MBob55HxcKzatWd0xp7x+SnNFEHbRDLSUSqWC9H8hXMW
+HXYoANiEAiVIEiIaY7TW+0PbaZpG0V878O5/k5cc+oyMEuycCVQMoADIkwdWDgyyGd49+MiDy/fs
+rkVBWehQyNBzv0k3Cl45qW37jMnj0zqyUlhHSA3ECAToEAm56aQXzKyAwYMnQIUow8zmRkfkxJjY
+XukeGppuzDJdnG2UqGe1NK05nx2xeN5xxxxVLLehDBuehTQxAJAAofdbjU2zvdkg/f9hrgcgb4VU
+4CiVslloioAWSBtbD0Llrd68cWDd+jVJWqlURhMbh0oHUoGpuXSnwC3l1tG2NtMuB4RwQjoURiIB
+uqZXMoM2Y4Eg50WhUgsHh+NKpZt9NweTolzUqGfWcktrLo5h8uTJhy88qq1LN6PGACSEB+9Zqgwg
+ZNns5fknQ0VfOvkbQP8/y/572x9nyLIsSZLnnt2wcePGJEkEKq1DRFGvJUoFxImQIKRH9AyeCZkl
+sBAYA4D33hjTDNFpraWUxjYAqLW1Ze682bNnz2xtbQWAF8XP/mLJywZ9Uw6Mq+0LbwpmHhgYGBoa
+9p6dpbGx8fHx8cqYcM44nxEbRAQWzOi9Z2wopYIgiOO4XC6Xy+UoioQQcRxOmTKls6sV8fkBuS/j
+nf5/5eWHfj/u+6BxDLx31h5gs4m7c25sbMIYkyRJkiTWZs1yaillFOWEEFrrOI4LhUIut3dXZAJs
+jlEmAtjrgbHWa/0SGi0HJS8z9PvlwJSK/bEI55xszglhIKgLocS+1hv7m88w/w/q3PR2NW1EsfcB
+wF+WsvHSycsG/f+Wnug9S4mwb4g5AFAzeQCp+VtoGvx7lwojPr9u/nhvFH/sgBNE5L0/2ADTweLz
+UmafvdjyJ3QP6BDQOquVBgDrrBSaiFAwQnNeyvMetD/x5f7xx/rnQ+p/hcq/dND//wDKz4tNHfLh
+TQAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_maserati" model="fleet.vehicle.model.brand">
+      	<field name="name">Maserati</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAtRklEQVR4nO29aZBd13Ue+u3pTHfu
+e3tGN7oBNEYCBAgQnClOICWKpEgNliLbkiU/P0lO7ErlRxKnEldeUq/qVb1XL+VnWa54kOLYlmVK
+ETWYliyTEkmJpEiCJEhintFAz913vmfa0/txgSZEkZRdYTcoR1/dut19qu85+3x3nbXXWnuttYm1
+Fr/AlQC90gP4Xxe/oP6K4RfUXzH8gvorhl9Qf8XwC+qvGH5B/RUDv1IX1lqTS7j8eGwMp7R7yBpN
+LBhjADSMhbWwAAgIwcVPsZhCAASANlYRBgMDgKYu4RQERmvKiQUsLGAoxKre51uDvKtcKmutIcTC
+GqUIIYLx7kGrDWWm1Wo1m800TSmlhBCtdZqmLncLhUK2kBdCgBAAFpBKOsy9eE5Yay2hAKC0Esy5
+cvf3E7jC1Hevviz4xhgLySgD0FWGRuvFxcXFhSqn6P4n55xzDkAppZSaa9YIIQTME16pWKyU+3IZ
+HwQGsNZSevHcWktQQgkl7xode8Wo11rTZWIuO8iYgbXWIk3V4uLi/MISpbRQKJUqw5wzxwGl3f9E
+mkIpFUNKKVuN5uLsTLPeyLju4MBAX19fsVzonlspIzgFYIyhFO+e6e2KUW+MoZS+4XdrLSFKSbW0
+VFtcqlHKK739uUKRUsw2MTMzc+rUqQsXLjSbTaVU97OVSmVgYGBs7ZpKMadk2KgutBv1VMa9A2vG
+x8crPQUKGAMCQymFBchbDmmVccWot9Z2Rd4YA2CZ+rDTmp6ZabaiSv/A8PCANHjt0MlDBw8/98rh
+YrHY39/f29vr+75SqtVqdTqdTiM6e+704vxcb1/P7l3bN21cHwSeNnJhbp4QsmF8fGL9GAWMtowS
+WAv6buH+Cku9tdYY07Vh4jhuNpunz5zLl3pG144xwZ57/rXHn3xKabJx46Zbb7wmk8n4vmMt2u2w
+0WhEUaS1bjRbUspao3X27OTJU2fSVI6t27Bly5Z1o7latZrGyfDAwJaJjfmcDwsoC/G/PPVdLMu+
+UmpmZmZqamp8YnO5XDx1dvrr3/j2QrX1njv3XXf91Y6DHmK6H9FKdTqdrsinaVpXaacdJalV1mk0
+1dmzs6fPXFhYqt24u3TbbbfJODl76tSWiY27du7wPRf23aPqV4v65assz6shUg7OLSXSEErPnj81
+szS7ZcdWxks/+MHLzz37o7VrBh+8/97ecmAUGAWI7BKnwVJp0kjWq7UwDhMlm612mqaJ1J0olso0
+O52ZmZnH9p9fOzjw/jtuWdtXOHv64EB/7rqbrnE85pkAhIBQozVlwlgopYVgq/8srLbUL1uTKQyx
+EITC4NChw+0o3Lxzu7LmT//0kfrS4k037t135/UMkIn2XAYLQMFaUAZQaZFoE7Y6Yb0Z67TRaMRJ
+GiWy1QmlMrGUtVotFZXnnn02atQ/cO++bRvHLpw/0dMT3PqeGzIiZ40hlAJUKQXCGCNaW77q5K84
+9csqZflPLMu+hVbq9OmzjXZn09ar62H05Ye/mrSb991331VbxghAAQoomQjBtAW6/GhYjgQAEM03
+GmnYbDajOIkS2Wx34kRqrTtx3AgTo8mBA69euDB9//vu3rltYnbq9FB/zy033cw5V0oJIQAopRjn
+uBKGzxUIJFzkXVoAjUZremZu++49icWffOnLoM6nf/mXhof6CKCNNVYzBiGYNiqlglswC1gQa3TU
+zAR5FgSK6jT1rLWMMa01gDiBy7mLmhHutXuvIcJ59HuPK6X2bN88ee70iy8d2LFjh++7qdSOYIwx
+maaOcwVc3FWddH7iCbNI4vjlA69u2X61G7if/8IfEcJ+49O/OjrUF3ciWCMo4fR1LxeAIICFZYBK
+44OHcWFWeCyTyWQ8VwjBOfc8z3VdwSljrFjIp0mn2azuve6a/qHBb3/newePnRkcnnj18NFjp84Y
+QAgmlSGEUEoBs5o8dLHi1BNC7CXgsmkWzBw+fqx/eG2mmP3rh/82CaNPfeKjvUUYqbKBz0DTKCaE
+ADRNleCehYECgIQCjVr4+DPypdfAdeC7QRD4jmCUOJx6jnBd13V4mtih/iGXk7mpc7t2bBkZGf7W
+dx47N98YGFpz7MSps5PTBuCcWms5p0brlebhp7F6Ur8cpOyGvc5NnZmrLW3cMvb9Jw88v/+VT3/q
+k8O9vkpDxjiUhYbrebBUa8K5B1AghQaAEEB9Kfr7p+MXX1FIAQS+m8lkPM9zHMe9hEy+P+zIvp6S
+Lwx0uHnzRh5kvvPE04ZwZexrh47UGh287tBdAWN/Nah/Q2S4S/2hIwdvu+P2Z54//ORTz9x//wdG
+R4rEqoxjYIFujMsCFowSSgALwMIAFikMwnZy+KQ6M6Whtdac8yAIgiDwPE8IIRjlnDPmO1426oTD
+/b1QURS3d+zceX5u/vHHHy+Wyq1W6+DBg+h60VfIs1lx6jWUhTFKwwAGaZw4Dj145MDwxJ7ppc6j
+j31vdMPQvlu3uhEooVU4NYYOM4oqkBRIANVVxNQEcAALBujHn8lFs/Hxw2GtxQiLlRUZ3y9kGIfL
+KKXUzQRZp1qiOuMVmpYbwXpdk3E6g7v6nz50/vnDk7m+tacnZ2YXqgQE5p8o9QA11lDGujLruO65
+8xc6UTqaH/7+cy+0HfOhB97raICBSNtjnZJBxlKdaGWJpcwSqrUCDCiVqYIwHT137tjRoNnJnDqT
+fu97bZp6Llxtsopk3Yybz+SLBVebjLAqAxW4rpMLsmUlglzE7rGDI6NrXnjhhaVaNZvLv3Lg1ShO
+/slKPUCtvvgTxCptTp05X64MVJfk88+9fO+ddw3lPZCk48Q1I6GAGFBwHRdUaHADME4t0Z5EO1DQ
+9cGvfN/7wWtJzqtF89nf//PswhRTYapC5fFipewoyqIky5kmUrvcc4Ncm4oWSXy3nqF1Eq0dGqrX
+lo4cPupnctPzS+cmL4CJKxJeWPFL0mWrhhAQcvLUGQvWPzT+1R89tWVo/P4dO4iONU8IrO86EQxc
+pLBpd30j1kwDgAEMQQkxvvdE9d99QR4/2xnoqZX9haf3z/3b/4KTF+CyOuexQZ+TqbiBl3O9ykDO
++H2pHzhBXBJq0NX9tJMJHWY3Tax/5ZVXZheXSpW+oydPx0l6RQR/5Y1LC0aZtQowYRROz84Nr91w
++syFpw/vv3/f3QgtiE2Onmbf+ZE3teQTmTIZC9WxCoDLGDSFpRoIucSjTx77/S8urslWPnZ/HqWB
+se3Ob31y9on9s1991M7O54AMg5/N2sAJhSEm7xmfeMQZdQdKds3pc+OvnNxcC6HlmqHBME6ee/5F
+7mVanejU6dMrTcKbYpW8WUKoMXJ2dtbx/CCT/8rX/uaeW3aPr8+GqaHK2INTR//959dtWis+cK17
+5w3OyBpNfak0BwMAaahDZG0uPj2f7L5q3a88kEls8+79pb1bxP/7H4eu+f5rZ8+wF0703rYGPotc
+GwYEoSApccbKS0uT3pFDex57yf7oyNmB3vN37Spm/Xacjo+PHz15Zsfk1NqB8unTZ7dOrCMXVyVX
+DytP/aWFoSiKFpYWc4XK8ZNnG63kMzft0qFkGZEik9u9a2zb+kPf+Cpe/tuJ/R8sf+B97Ja9Nsgr
+gBsAnMNktOvce9+29cUQVL7wTBR3Gi53eKn4K/dtnVliRAAaqea+M1Dq862IelTanE2e+EH5ke9W
+nj0eOgVxy+65DeuCMGm02kNDQ1Oziy+9+trIwO1hGE1NTa0ZG19xKn4SqyL1BqBI0ySOw3zZO/Dy
+C+PrNvQHoIJYhZAjGS8XfueXC6efFgdfXfzDv1o4enrI6sx794VgxNgsI7DUVCqgugHmK4jIVlyn
+3gmLls4z4o6sSRH7QBZcKCsSw4h3jszJr/7d2O/95ZrG5FQJL9y3Uz6w1zbySTzpum6oTanSe/bs
+5NzCYo/Ljh8/vvrUr7iulxRgxibtycmpxObaxjs7dX7vNZsoryiHpxwlBQ6qd44NfOYTbWfIu7rA
+8r1z//lR9t1nDBayIIgBaw0Aj/Uk8CmSsl9L4nwUGRL1wcspXdQ8A8eAgBH4LJZt/OEX6999Oto1
+tjBUbI5soLd9rKorFatckWVcUdHuH86kxr748rFCZWixWa9Wq7jk3C4v/K5oWHfFpZ4ARus0SVrN
+TqE0tH///nw+P7pmCNSYS188BQPPlLbvbF5/bc/ckdynPoTswHQ01zMXyX6EBgVtFSXoxpEt0lor
+kbFUSaHrbTG27CxrpXSStlqt0tYdhbtvDr79XXXoULh7W7xp3G24SrVtrB3Ha0epYCxfyDZb9Wa7
+xYS/uLhYLBa7xtjyev2KYjWuoZRqtsMwTrwge+jQoYl16ypFDqbRVeUW1lAJHzt3le+/9+zZs+bE
+Ydy50d+73Qv6COA6AFEMAIcVAIVeqFnINI5IswVrtVJSSQAEhHHuBEF/f3/vbXfoHSNTL7y0mMjo
+rptFrj/XjhukSin1HJeBcUp7e0r1enVqZo45mZmZGSllN9j3T4d6yli90XT8bK3RZIzs2rGVAZZa
+wHTDVkbCQMDPO++5OR3qPfhHXwmPn5B9/ch4PIGnkXBDcMk5s4bMLFqto2YVF2ZBCGPsDfk8IpNJ
+1vQk33ia//A13LRbb9+Zn5Tl2Pg9gnNKCHG4Q7UtFrJKpWfPTUHkarVaHMdYYSXzE7Ss9AUIoLVd
+rDYL5crho8dHR0fH1w4x0zV8NCGABaUgQEwp27JxzZ23Fk/ORg//nQeZUEAAScjAOJBqCQAqNSfP
+Gx3G9SrOTAHAxZg7AOiumlaqVq3m/tvf98PBQ3f5uaGemMmy4xgiXKG1CYRvtfE48QPn/MxcJybG
+mFar1eV9OcS9ol/Dakh9o9FoRzET3qnTZ9auXZtxARhqCTFGw2hhqIAD6FQrj+av2mmtto/9OH9h
+iQMxNZEDLgW3sN2JKUnMqWmPEp6muDAP8xOrHN28EnBOXnxRPffSwkixumltkLhxD6Z6NOsQLigD
+EcxhFgSmVCrU6s0LszXO+fz8fJqmXZ2zCrSsBvVLtaoQ7uJSVVuMjIwQAFbDME6FAiQxFoYoZBjj
+gNi+LR7Ky4NH8Ooxm0oCbbgDCWrBKSdANL+Qnp7OuS5Pk+To6W4iICV0OQ8ZAKRkj35Hp0vyuk2Z
+gTEjVZN3PGP6skOEWMfxqKUOFxaqUMyl2pw+c0EIMT093el0urrr8vcVwsoHjY0NO3GQy87OL2Zy
+hb6+PgDQEpbCwkCnsNKmMBLG6DjpDPYVNq2lS9ULr71KhHWtuehlWgBI4s7CzGx7ek4QpJ329JHj
+7UbDGmNhX8/8VqrTbssfPUORFjaM9WQrhtNA2LEmkogCcBzHaOsKQYz1PBeETc8uUkqr1WpX3a8O
+Vor6blqZMQZJY77VkkHvyfPTGwby4wVQDcMCcIBQHyIP4RAPjoCgjucWesarvlfPSpw8YMNWh7he
+zNMgiSgS0MCVA3/9SCrmFIP1veDA4ewPX9OgIUiCJEUEEBDqHjrMTx2tDgxX12wJvJwgYcelsRcU
+rGbCB9NwE+sQ4eVUysdH1rQaU9WOV+wf6aQtIKLEQsMC5udR6pfLFprNdpqmnU4nDEPf9wEQgrcz
+3nIOGx201jZfOcqrLQ5YAQsGggZs+9CRky+9VIi9eNsGd6DHLE2fe/5JbuOshWeEgRNKA2PCyfMk
+TF3Xyw1UFCeMsYxwXdeVnHBCCWGEEEYIrO1mjROja/Wmtmg0Ggam+/wQC2tWcM12BRVOV1HW63Wt
+bLPZ6nQ6PT09wM9KeeFerrcvsFwcOY/jZx0DYuGm3G9iUIb8G4+zl08UaE/hYx/O7N6RqEbn8e/G
+R16FhZFEgPkOhbVTB15EqoXn59cMSUGhYeJUWyVdxhgHwCmjlBqjGKdCMEIxv1QllC/VammiLhvN
+CmYqvPPUv8E8iMLYcbwwDAH09/f/7FQjwulgv85lfcbqZ481aRx2DZsscOZ44+++k4ni2S3rcx/9
+mHfXXTJf6T94OH30+zCy7RKuQQxs2iCT0wSM+L5bLhnXCYQbEM45R8bhnHNCGRPdJ49SuA5nzC7U
+6sxx2mGcSAVDQAACvpLhzJWdZo0x1rIgyKapymRyF+dYYt7uC7AoFCuISaGh0gPHC9AEFtAKrfir
+j8RP/zhDqLp1D4ojpY3X5tZui1rV1lf/Hi8c7KqGOsFc2qhMN5sAyWVY4BtjKSEOF9baMAkZ4ZQy
+TiinjBFQYrkgniuqtSahnDCujAEl3UX5nw+pXxb2y6VeKaWk4UwksSyVSvl8t77p7e4notpUCk1X
+NCDlYgOJplAdx3Qee+rcn39DW2OuGuv/2N2SAzu3ql+7bzrHl14+dv6LX3MXJ8ESQxMkkZ6uTjPN
+yyXhZTJUQGruCN93C0GWgDFCu5lPnFPAUNgg41YbnTDVwvGkVAC69W8runr1zofPLi+MUkpFUSSF
+aLfbhWKeUxijKMXFOPKbwUAl/bnsA+9hM3W7ZwJJ26HaChodOUfHRzNbR+R7rh3YulZBg8vsJ+7Y
+fPTD8bFYdDrBmdPI+j3SQU2Fe7aObXIGN01AIk9oxBxtQiklV0oBhDACMEI4ZRQKxASeO7vQabba
+ToE0mu2BMnBxfD8P1L8hrRWX7MsoShIdh2HY11/B68/EW1Kf+e7+xmv7R7K9Yrw81ZYX/uSbRcmj
+KMo2otzuvVFcrwov/L2vm1TQetWMiOL4RJSNqRRnnngi/fGzw3HPUtIh24b6W7QWd5b2v1Tctdfl
+wnWCuNUhUltLlt0lxruZcdpxubY2DEOVcRqNRpqmjnBAKcgKKpx3jHpK6XKhSNcXZ4y12+1mlPjZ
+niSN+is9DGCUwBJL3jqlumPLR1rzw97pfrZhDsGhM2m/YLJZ9bJZN2d0oXwm0upckkTEJeQ8rdle
+7vlpD0Qc+gtVGS9kHTctBGF+sD3bzrx4vLJ5Z62cCacXUsBkBFEpUZYyplICKzgzaaIFZYSQVqOZ
+HRltLlYd7lgJ4hANsnLz7MrG6621nPOLyariUq3w2/opzYd25Pf0O1//9s65jjGEjPUZ3ebMD7J5
+KY12qHEYscItBITYOIpshvqWxq2GQ2S2WLDSdKLQt4iThN2zs/fuu1RQqc4sBKWCUdpbjOfI67g0
+HEIIMcZ0ixq7UaBLWeg/DwrnTWGtdV030br7yz9oQFSg4BdyvmsZ/CApZU275jNjU2at5UJoRpQF
+MdYxNMtEokJJLBc5ODyGNonMmt4ABLNtuDlQB4BPRRyFzEJd5uu9AdZapRRjjC1HLiws+bml3hjj
+um4otbXW8zwAsBYE1r6l6Ntv/3j6bx/zcnomS705Zg/blGpLoQj1PSc2spaG1ncIc22YZpnX32pK
+l2vGheE21drK2GUauu2S6Lvz8sDkul/6YKa3Z2l+yefOXIajlS6L/BvEX0r5einvxbcVDCSsIPXL
+1YE2lQAuLx+wb12/6kyMZHZtKuiWZxJUgqAwYLROF2tztpEJgpLgOZtEjlWC29TSGJERQbbEqprG
+jinnOwVIm2TbYUHJHPGSgTWmJ6MEFUIwECPVG/TM8nfQLTW5VFt+UTR+Lqnvas/L0+ovRtJ/VkDK
+bB4rrMkc/9zvlk7MtR66dfzXb6HGCSfP57/xxNxTrznT00MFn1HZShPPzTBFOm56NLW2b3TDbXfl
+b792zXAeB46e+t3fK1Wb5MFbyp+8EW6+NlUlhDTCjm9oBP3TPTEAMMaklACstVpr5qz4qvWK6/o3
+Kci39m34dyOGmDVePcNPLeH9SJzAJX5xbBP9iK9N8spTT8zPL5TybmgSR3hIjG422F23r7nvzvxd
+7w1d5sBy4jHrnnn5oL99pCQ1XDDBuevoqANPQOplgbgclNI3JCK8zaP5juCdpP4N99O9Q601IeIN
+x8lbO9ENnxRSsul3PhUwyt9/T0LcTmKzhHXWlSuf/WfXTp8//ZWHBbM9wiGEtMKoMr6h8s8/Fj34
+nhA8kIAluHqs//O/VXz6mtzwKFzRgF3KENPRgeOeC+tvNeBuqxH8VDXAyuGddKm6KoVSKqUUQjDG
+GGOcMWaYTFJOoQ041YTgbUKxecAWSrmPfRSABRwYx4UFMmkWAfz37NVf/jpdXLCBFzJiOm0ztAvX
+7/PjPBgaAgWVgLj+0DbnI5tBCRjLGvTEpA4SapWjQcOG1sJawFJKOCHaWqKUMcZ0laSgVGvNwCl9
+u3H+z+Mdo/5NJeWiqiEX76qb5GKsAhH0LbzZt5K3kCOgvti+ufxrD9qZKUm0D55vo/bxWxYHPAEU
+2qbQrUVmus1E/vLzE2utBjGEWEpJ9wVijFXWasaI5znWWiFEd5zdpi8/ZwrnDUualFKtpTbcWhuG
+obUlXKyVp/8gF/0yBdZg0EshPbE4NLrR2bJFOiRhnBExcmGu88zz/MZb4FCAKGaIsh4Xy0E6bbTW
+0hhtrbHQ2iQginHSbdCgdCJVnKZSa931PJRSVFw07bXVjKzUdPhOnrfrmPx05RQXnu/7UkpGAVCj
+zD/0di4TusG0EX/t6yf+7y9458/lMk5sbawJiPAU1D23Dn5hvTuwBkY1gR7GWQo4MNYQXDK0oI0x
+xmhjlNZaqdRCUwrGCGOMMqW19jxPKUVWq5rwHf5Ku6R3lX5XezabDZbngGk22gBgeXc+Y1S+zVne
+5KCT8XbtLD54t168YLOiwJ3elDmS1+MFdvN1aSWbsQSaEaotoaHRGVBKaLc4kFJKCQeIMVYIN02V
+1lqmWmtt7cUQQlfqkyQJ6KWQJQFbwRDOShqXhBAhRDYXWM/rhtK6xxllILD/SD3aMLy49aqRfZ3k
+yR/oTt26wji02YhLN1zPP3hfi5dlWwtXBKAGlHqX4i8W1lJruDXcaGo0l2lqNCUQnButQVNrDdUK
+hJBum51MIdONq/486fplLKudbi1rbA2ArummlZHKCo+pt1A69pKGv2iH4NI7k8h2EJ6f+fY3smcu
+aI9JRm1TJg/96tBDTs5QuDQRMLEGY44Aug4pAWfEc7OZDDEQjHoalDGHEG4QytTCKkZd1yGU1nzf
+t9aWSqXuSIwxb2ME/8/jHY7XL+fLdTVPt3pYGtaNXyYJThw6dG7yvDTcDUpvfiL6enV5N52ke852
+J0hEaA4tzM6pUV5uMBka7Ur0vfBS42++leP9LDazojUinESbhlQZS7QxlHJjESZpFKdRmkRhkuhE
+KRXHaSeOlNTcEZlMJgiyjDHHcQgx2Wz29Tt6p9h5M7zDxuUbLBzHcVxW6NAzfQOFk6eacPHtpw78
+1z99IjMwUMoIqbgTBLFsCyGsphya2DgJUtkgiAT3MrW0GanIAe8s1Ku0QSQXilhnLUjbpInuGFgf
+J0Pnt78kVcfzgqhtc/liqzkvfGsNscaD5YRqpVt+wKNWAho4nitlw0rie31x0sn0JA99/H5lWcGj
+A5XeNJz381nLY2Ipp5xYtnI6Z8WzzxhjhFDGWJJEGujpKQYZVwhhtYXttJtzPhMZ4XaaM0o2KJjs
+2GI2Y3WnVZ8ThOYy+cX5C9rUkca+Q9NWTbYaMqzrdhUq4Q4XLpMqsqoTdeqU2zBsC0/IKFRpyLgx
+NrVWASpqVbknAJuGTStTyliSJIQQUOq67lKtHgReksRKKa01AQEhhK0sOSsfJBJI25pT2mpX52fj
+oaEhP6BSqny+smEiX6/XTx2vqVZ720R/pVK5cD4hUTZtL1y3e30rNAdOTCWtZMuG0YEy44X+/c+8
+lC0Xr7ru6lZt2mW00zIv739t565tpXIgVdhsdA6+ekrrOJvLXXf7vsnJs0cPHdu6bW+ltyhVM4xa
+5Z6BUyemLaGbN49OT84dOjTJBC0UCvlCYX6xPTjUa7T0HNdhvFtyitfrwFYEKy71uVxGSRIEgdbR
+7MzChvXrCgUnTWMOdufte3/j0x/pzeeoVJ/4+P33v/89vnAaCx0j40/86gfv2XdDc2FOhdGD79+3
+bdPQaF/5nttuKfn84x958MMfeF/gYse2DZ4j7rjrps989tfGxgd+67c/e9/99wApoH/n3/3rT/36
+x7nLtmxdf9X2TR/7Zx/57Of+t/Hxtes3rN19zY5/+6//1VXbtzBCjDH5YiGRabXZGOrvEcT0lkuB
+l0F3SQEra+GsOPV9lbLHs+VSIV/wqgvV0dHSmpEKjF1aWqg3FteNDq0fG8z6dGSolxBTrS55gpcL
++YWZyWLe7evLFwt+f1/lhuv2futrD3/vb7557NCradScPH3i5ZeeP3TwQJw2Th4/JJPWI//j4VZj
+YduWicAPesul5599Zv34GlfQJ3/w2MN/9eWw3WzVG3/55//9xedfeOXl/Zzh+LFDyoZGxUPDg4aA
+cNbbk4NVhVyeMQ5QY4l9Q/74O40Vp97POIFf4Jz29xbnZhccholNayilXoafOnn+5MlT++644bo9
+286eubAwX3d9Hsa1O++8fW5uaXh4+Lrrrzl15vBXvvJwb3ndf/5P/zGXzVBiiTVbtm76zd/83PDw
+EAEI1cNrhn7rtz+Xy+UeffTRJEnuv//+KIoGBvruu//excW5xcVpIYSUMo6iTiciUMToRqMmmOsF
+mZ5KpVavG9hMwLWMPEdoqWEppRy41IJnZbDy+fVG5/OlVMa9fT1zcwu1erpty/qM70Jobdynnnx+
+7Xjf+Pq+Ay8foSynmQzyttzb8/TTLx45euL6G3f19GZf2H/gc//775SLpU/+6icopZ1OZ2Fx8bHv
+P75Uq1pICjJ1fnKwf6C/ry9sR4VckRH+1BM/evmll+647faLDi2YlibjF5VOfZcrHXuOkDrJZDJB
+ECwtLfWUy57DGLX5bG6ZEwOsqMZZeeoJKeZLRulSqRBFcbPZHF83msvl/Ky7adOOo0dOLS5Ntzu1
+6amFjZu2OR67Y9+NjUbj2NHTZ85e2LZ98w037P3cZ/+FI8o//OEPHc91XXd8/QZr7ezs7OZtWzP5
+SqVSGR4e/vrXv1Gv1++7774HHnjQcdwnn/zhkSNH9u3bt3Z03Hfzw8PDvb39QriCZCs9pcH+gYmJ
+9Qyk0tebK+Q7cTQ4OMgp8R23WChw3u27aQwMWcmMhJWnnqr+ChOK9JWHIjRPX5jfODKyc710HD49
+Vzfumi89/NyPX5sxnv/Uj57tr4yYkE0t1Euj68/Ptf/mmz8SND+ztLD7rj1HZsL/54/+rH9i4pt/
+99jpycbua/Y1FhNB6EJNfu2RHzbbmf/z//qvZ6amqU9PTp4t9g6ePSf/vz/4i3y538/3PPHDA68d
+Pu/lCsSzJjf2hS/+N+gsCBnaLBIWQebWD2V0ko6tHbFEda0bzinVhK9ooGXF64ZMLBX2v3pUcf+V
+g8ellJ/+xAf//M8e/tIjz5Ryg81GYk1KecodS6mjtWDUWGvnFxccL2CCzy0sWWuF69TqzbC2iCjM
+eo5qtdMozgS5VqsD6FK5XFtaglVeJt+9ZtxpEy48z+umeHDOKaVpmiopIXL5ILShMML9wK/dGhrL
+VObDH7zZj+t79uwZHh5eHvhP59O9s1gFhcMYYz2lYtLpbN24/sypE/Pznd3XXpfNBtV6LZcvcjdw
+MgUnKLRCyYQXSdOOZb7UrwmvNkLCnVTbeiuOY+llS9QN2kvNuBUZpVut2A9yjPv1Wls4GeEWtCJx
+pOJOnM1XXCcbtaM40ox6cScNWyGs4DyA0s1m0kraA0P9uVx5cbE6NFAhinqeVywW8frCrO0um6wc
+MatQxkYopeViweq0lMt6jnjx5ZcmNq4dHqxYkxoCQ3iibWqQzZWUsYZyTZih3BBGhOfnitzNSUu5
+EySpYdyDG8AN3KBMiBN1pOMGFsxYqjSMpa6XAXHa7ShONHNyhDqptFQEIJ5KjQUHY77XQyCG1g4m
+EoyKtWsHmaGVSiWTyeBSrf4qFBGugtRTEFLIZ3OBm3RaV23d/NKLBzTw3jtuzvpcpTF3PWOZ0oQx
+Bk0Edz0/k6YKlrqur5U13ZQpyqy2lAvueACVxoIyJtyoHVLKrSXWQEutlHG8AJbAEp0qzh3H8Yy2
+hAnhBVpb6DTqRE7gbtyyrtUOSz2F3h7fJWRwcBA/1R3h51zhgFprhWADlVLYaWzaOBHH8fET03fc
+vKec96J2HVpRSolFu9XyONNSUhCVJt1AexLHVmmHsVQrMEitlNEgMDK2KmIOByVUcEPAXAeCayXB
+KHUdx/dBqYzjRErCuSVESglrecABMbFpXa7Hn1tc6B/ocRxJrSyXy7i0eQ0uW3FbQV5W7tRd2K4E
+WQxUyg6D73obN27cv39/JUev373dYVbJWDAqGHEpdRgoLNHK4ZRTQokVlDiUuA6nnIKRbss/6nK4
+HJylMuaeAxhoaa3mnIKRNI2NlmnU5p6AoDCScQKrYFWulFedmuP7E1s2zC5MgtqNG8Y8V4+PDHcX
+ZrsT8kpz0sVqXMZaAhgv4wdBEMfh1q1bj5841a5Vb7v5hkIuUGkMo7RMC/ls0mm7ghslBWcURqtU
+cGqNUmnMGAG0pZYxYtIYRjNXQCVaS6VSUBiZdMvSoFJCAUaUTEAsYFTUAQV1eKu6CI5yuTw2tqYd
+10fHRoeG+uO4sW5sLYDlTQxWWt67WKXeZzIFwCc2bGpXFyYG89vX5L76g7MTOyt7d5R5x+oUmruN
+kBrBlm1BcqnzQTefRxEN4VhLteGE56C5jiSnwloCUBAGJoyB1hbcsZYwCjDKfB9MgAnGBEkSxyqk
+8pY7t9WjFpR73fZ1NAqHK+vdInBZL5Y3pMGuEFZe4RgAEA5XCrmcn8vl5ufnr7322r9/7GtRy3vg
+wYcqAyCGWsW9jEmTi6p22cDoJrxTSlmXEEopZ4RSUEoo/ZnLSLrdBmM0CIxRhFMwMrHzqkKluLg4
+31vuWTM8GLdbG9etX9G01rfCyks9hdEWgLEKwPDwULvdHh4evvWmzQ//5fc2bxrc975r4rDhwqkv
+zhaLxctVLaW0Sz3r0k8pYZRwRhwOTu3bNiK2hCBNIRxYmLADGEsUYdh78/WG2kSF1+zaoaPO+PCa
+/nLvlWjkvSq6XmuJ7uNMMDjYWyjkZ2dnHnr/PSeOHTp4uPpLH31waFDIsJkLylFc79K9/MjTZYAw
+EDBqGTWcgjPQn1l4QDzXg0xBYa3UMr5q9/aeob7JmXNbt24aGiynUfvqbVthCcwV6OO/Cna9EUIY
+rTmnXd9wzZo1nU5HtuU979v7zW98i4L8+qfujZozAS8ptC+n+/IvQKDLPzGMWEbByNvnixtjmOvK
+KASs53BoWV7Tf/PtN50/f05w7NyxuV2b375pfT7wgRUtFHxLrDj1aZKAWgsNgFIoZXp6CiMjw7OT
+MzfcuFV45K/+4tH33n7dRz94x/TkWVi+vE3Vcmp4NzdfMMYIBaPg3RcDezudQwiBNlopR7C4Xc0U
+M3fcfVuoo9npCzdff70DU8p4WzdtANTFlmqrjtXYOgAA4/yy2AiGh4c9zjrNzod/6X3nL5w68OKp
+z33mw3v2rm3WIKW8fFPOLu+MMYeLi0Y3YxAMnFHOLpZLvBksoVpKhwuTShB+3XV7x9atPTN56qqN
+GzevG7MquebqbZwTcGqJtavdXhRYBeqFw7tNsZIkAiDExUTwq7ZtPHn8/PBI+d733/7fv/hIvV7/
+l//q48ODW5RSXcG/XNtwzjllgjHKGWEUl16UvzVnWrPuRjAmvummm26+5cbp2Wkn479v393tZnN0
+aGh4aMioFAAIieQ/xZ7GAGfcAajnBUC36wMYhZcPNoz1H31u/y17tu+9ed1/+YPP9/YW/9P/cW9v
+MKY7CWQj4xtobRShnFnEcC11KaeMWAbC4HDjk9TTgKDEZRCQFkpTZiEAlgYmYTZMTXViz8StD90y
+27hw4fypD919d3Pq1bG+YMfWTYCwNKMUIUBwJbZou2J7k2ml1q1bRyk9ceLUQw89tGHDhj/4/S+s
+Hen7N797+/BoYNOcbJeIcYt51xqppcO169ogy4oZVhQ2w2yGsQJze4hPjI21TV3f8X0fiiA1gGcc
+JzVq084dv/4bn16qLhx87eUH3n93qZgZHR0dGxvL5/O4VL2GVezydzmuGPWM8zRNr7vu2lp1qbq4
+8ImPf8wR7A8//4UtW3r/w7//zU0TA+3mbCETyEQ68DyecxkVhFJiOYEnHIc71DKrrGWW5jxwJGEj
+6jQY4YK5iGRs0vfce89n/vlnjp86ceLYax/60P2bJ0abtdmNGzd210Mu3/pzdSp43oAruAehiePU
+9bxYmueef2Fk7XhPpfeP//iPaw38yic/nCsFf/wnf/X1rz9LaSVfKrfCprSNWOlYmVRqpYxMYpmE
+Ko2ZobrdhlI+YzqK07hJmeiplO755Q/uunrHoYMvHTt64IH79m2bWNusL1xz9Y4No2PLkk4u7R60
+aiGzy3ElqQdoGIZ+ECxUG8ePH9+4aXMQBH/9lScvzBy/9uarb7n5hqefvfClP3vkxKmTyqap8FND
+YmXCREVhLFUKowkM6jExKdJEt6tIGrmewm2333TrrTc3HXHmxIlGdfaeO24dG+6vLUztvHrbls0T
+DN32IOCcL/O+OvGyN+BK7rwZx7HneXEcu56XJPLAgQP9/f0DI6X9z5/51jef27Bx2wMfvlEzPPWj
+Z//HI986ejqNE9VOVGqotkRKGYdtRKFDU5WEJg57i5nrr9t50417cqVgqbb441de7cnl3r/vzpzn
+NJZmb7z+2rVrR8KonfGzy6qmG6oDkF6JDdmuJPVRFHUb0WmtGWNhGB4/fjzVi+vH9yqV/4svf3t2
+6dwd7711bP1YLp8/8NyJc+dnDh4/cfzMhaVqPUkSrbU1qrcsStn8xvXrt2ya8F1v8sK542dOLCwt
+3njDVXu2bzdxmrbb1+7aNbx2SNtu4+rXcfl2w6uvc64Y9d0CTwAyjRlj9JJzdPb00mL1XO9wYWhw
+3f6Xzzz6nactY7uuuWrPRNH1AsO9ZiznFuu1Wk0mESGEZ4TVNmnHk+dmjh091QyTjVu3XrP72t5s
+bfrs5FCl78Y9e0W3MwaDBARBN22/K+9Sym4jh9Vn4Apv9ftmUPVaY+rCjFQYHR0vFDNHDp97+uln
+zzQ6mSCXz+f9TMC5Y4xph1EURYv1RtRpRa1GxmdbJsa3bFjnObTVqFsVjY+Pj4+PdzVJ9zaXF0Pe
+DXjXUW+NIpTCkKmZ2bnZBcJYf99gX19PNcbkuQvnzp1rtFtpqpI0VUpTSv1sJpMJRgYHesuFqN1c
+mJvijPZXyuvXjfm+351Cu80CrogZ8zZ411G/HES0sEmS1JuNRqORJElf74BShnPuZQICGsdxqjSl
+NAzbWuso7LTbTc5ppaenXC55nhd4mddPeUmnXxFL5q3w7qPeXMoxJQYwGjpN0zSNk0ZbSp0kiTKa
+UQ5GlTJxHDNiHMfxM5lu7qpwHUa766scl/lKq5Dc8Y/Fu4/616VeE2IvlWBqaglArZSJTGEJGAWo
+1jrjO2/aqvcX1P/jsTwc8vpfFtYaYi26WxkCSFNLOWEUSoMzkItZJ4YTChhtNKevtyN5dyqc/x99
+KDh9NWAQ2gAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_maybach" model="fleet.vehicle.model.brand">
+      	<field name="name">Maybach</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAA4EElEQVR4nO19d3hVVdb32nufekvu
+TW4akNC7dEEpItKLgIAFHbGXKZYZ9VVn1Bmn6JRXZ9QZdZyxgwVRiuiA0pv0XgNJSEhIT25uP22X
+748D14iC4wyKfq/ryZPn3HbOPr+99lprr3aQEAK+p3NB+FwP4P8ufQ/9OaPvoT9n9D3054y+h/6c
+0ffQnzP6HvpzRt8l6DnnjDH3WAjBOXePGWOU0u/cBgV9V0YshBBCIIQQQu5L9+DzX+OcI4Qw/rZz
+1XcJ+i/EmjHmfoQxdqcHY/yF3/y2kXSuB/CVyWVqF1zGGCEk/dF3AvE0fdtXZZpcWF35noaYEOJK
+mLTcd4lS+s2P8KvSdwZ6aCHu4aTKbSnWKaVpJfztF/TwHYLeBZoQ4kJvWZbjOBhj27YBAGMsSRJC
+yGX/7wT03xk1CwCcc9u2o9FoWVlZSUlJIpFQFKVnz575+fn5+fmaprnf+U7gDudczX4eKcG4y7z4
+pP4UnCOMBcRrjtdu3LB53ap1O/fsLyopDsebVY/epU2f7l3bTbz04tGjhxW0LSCyl4FKGaifal+g
+lGKMMcbfqok5Z1xvmqaiKK5F+BnLRJzAGgCo40iSBAhFI5ENWzd/+OGSpYuXVFRUEGABj67q2DDi
+CJFEkumKd+TocdNnXDFk+AWFHVrJioS4DACMMVmWAcBVxZL0LbLozr3AoZS6iJywGgE5tu0yqTsB
+27ZunTt37sdL/1V05CgTJDs7Lzc3t3OntgWtQoaZ2LNjczRu1dXEDIe1yi+8ZPSwGZdfOvzioYGM
+bFmW3V2ui/63jc4x9K6h4kJzgv25sG1bUVUAqKyoWL58+TvvvLNu3TrVsUCSOvfoN3zUuKEXj+g7
+oG8oMxCPR48eKl+9dsXy1R+VlRfX19QBx7169Lt82pXTr5zQt18/ALBMU1EUdxaNVEr3es7h/bak
+cwa9C3Ra+AohHMeRZZk5VJJlRumaNWsWLFiwZMmSYxXHvB5vQdsuUy+bfNnUib17dvEHdKAGWElQ
+CUiFyVRy94E9q9avXrNizY7NuxOReIaeOfSSAbNmzRo7dmwoOxtayC741uy6zr3AcelTBSiguqpq
++fLlr7/++qZNmyzbysvNu+iii2be+dCw/t1aBR0IH4am4lT5vlhdhV9TaNfhgbzOkN0DIGvr1n1v
+vvnm8mWLq46XJQ3WvVv3mTNnXnHFFT3OOw8QAsYAY8DfFuzPJde7dnra8QIAlmUVHTz08ssvv//+
++5XHKxVZGT58+JVXXnnVVVcFs2RIVbOj6+JHVon6AxCvR9z2aN4w1tTMTlqbIXqHi6FNP8CeJR8t
+nTfvnU0btpYeLdU1ferUqddee+3YsWNlTROUIvnbomm/FVzvsnw4HD5w4MATf/rfTz75JJlM5ubm
+jh49+u677+4/YACjlJS911S00ajY5DVKvCKqaApIXssG1UpSoUd87axWA7TOI0KdRzGlTV2T9fLf
+//TBBx+UlJQkk8levXrdddddl156aU5+/v8hgfOFHkchBALEGUsb7w319W+88cZzzz0XL6uKgdV+
+YNfb77r/6mmzWnkJ1G2LFa0ie1+Ak96btPsMIYQdwMA5M7mgVAnytkM9/a8m7S82IWPZio0vvfja
+mqUfEqOpVW7myPGX3v3zR7p17ZAekqtdWh58k/TNQZ/2OHLOhRAEE+o4kixTx6mqqnrttdeeffZZ
+wzAYJ2MvnXj9rbdOnThWYZZ9aEmy6D2nfpPPcaCF4+zTA1AQAgIWoQnLMA05BK0HqgV99cE3gpK9
+e/+xJ594Zv3yj+LhOtXrGzl+4n333XP++ecDgGEYuq4LISzLcnfC3zB9Q9C7HpiWnCUYRxgLznfu
+3Pm3v/1t4cKFCCFd139w0zXXXnnrgD7nQeJo84HXI4cXBZK1QSHbmJzmCtgRgCXklSjYKWraBs5g
+Siie06/w4ssh//ymiPzO3IX/eP65ymNlkqL1G9D/lltumTlzJrTQ7f9/cj2c1KhuBEMI4e6hECDq
+OCtWrHjsscd2795NCCkoKLj99ttvnHVdIEigZHX9zhdRbJPOExINIdoa1LB7qlNOrvJkCqkprBBC
+NHAI5zaTLKF6zAozb6Bv0I1K1wlczlm8eMmf/vDH4uLDlmF37dr1zjvvnDFjRiAYdMd3TozOb1rN
+Oo6DEJIkCbh45ZVXnn766dLSUkVR+vXrd++9906ZOlUIQJG9x1f+GooXFegC5ExwvBbygGTBF0Gv
+sIQte5NYc6ilMssrgUQ0KhSFFlc0aE0Fk86b+oDSqg+AWlxcev+DDyxf+rHX6/V4PHfcccdtt93m
+9/uJJAnOEfmmfTvfBPQuywshGGOuz8C27bfffOvhhx+ura1t1apV//7977333p49exYVFbUf3rst
+wXBkk7lzLj++EhtVmuoHOWRK/DRnp5RoDIPMTA9OAjCwhGVwwMjKHeQfdC3qNBq8bY6WVhw+cqRn
+r96PP/qbRYsWOY6TmZl5+eWXP/TQQ5nZ2QDw/yfXU0oJIYwxhBAhpKKi4uOPP37koYcVRaGUDh8+
+/JFHHunTt+/rr732q1/96ke/uG388MsHdO8JiRqz6C3z2FItctxpjBC/DF+oZhGxuRDC0bEtc4sz
+nEQBU8r09prq6TYcAt0bDW3Z8tXP/OWJzh3bv/bGnOaG8CuvvPL8888nEomsrKzJkyc/8sgjWVlZ
+WPmmZf03sb9wDRuX303TXLp06QMPPODzeJuamu6666577rknPz8/mUgkk8m6urqn7nh97aiNl99x
+2WUzZmUNuS9YcCkvfsWU38Zx0fKE6QOJWgghJEvAUdiGBMnxdRmRc97F0G6SgzPWbi9+9rmnNi7/
+V6KxsmO7NhJBua1a3X333aqqPvPMM+FweNGiRQ0NDY8//nj7zp2+ASha0tmH/vNxIgE4YduaolTX
+Hn/2b397+ZXXsNcTiNE7H3lg1o8eyM9mVrwW4VZCEx6Ph0iJrds2HvnZwa0fbPzBtdeMGDEcF/7G
+qv5hcNOvwzWHCK3L0FOObQBokpJjOSoRMcIsKxHhniy13RBPjynqedPCODteevSll/64cuXKkpIS
+QohHUxTVi5BSh8w8ZNx1//+owdALf/jzvvKj1sYP7/w5/+sf/9C6dWtN18GNECAECH2tOuCsQZ/2
+/X4GdCFsRygK9hEpFm36x9NPzX75ZYmDEOK6Xzx888035wWkyL6XAPuDnW6WURbHKVXNyAj4otHm
+d955d8+ePTOvvmrq1MkdOnSAyb9U96yMHPiARff6uSlhh5oxgXRGaywtL5Y1SO04KrPPBAh0Cdek
+1q5f+MKLz+3fvz+VSum6HgqFmpqaHMcBzuV4hTj4jtTjlmtn3uTzO399+s+HthzZwbb89Kc/ffLJ
+J7t17w4ACGNGKfmanftn7eyfj0K4zhmiYEZtaiSf/cuT8+fOozbVFfX+++6betuP8wIW3f5a854X
+8nqMhY4AFKlId6hFKMrMzPT5fIcOHXrsd4+vX7/+iiuuGHHlTYUXFHq79EtsfS9RuUVKVSE7hiDV
+nNGTtOoX6n2Z3GFMhPnWr9y4dN6bG5a9XxVJqKqan58vhEilUpZlybLMKM3iMXvnHNzQELj0d1dd
+fY2dst6IP7f2YOmGZPSPf/zj/fff3717d8aYrCjUcTD+Gp1tZw1614yxbVuWZXfL6uYKcADOnP/9
+4+/nzV1YWR/3+rJ/cvcdt91+ux7EsZ3/iG+ak0GPe7ACKE5Rgjg+JDsYgxvszswMYYw3bdy8aePm
+Eas33nrzLWMvHuIb2w0qtlXvWEhrthYEuN33N5mde4OaW1ba8NxLTyxY8G5DQ4Um89at24fD4Ugk
+EgqFAMA0zRNJOxaQeLy5+Hm8yco6//Hrf3BXUNbrn3y+/PChuXPnCiF++ctfdurcmVEqfc2brLO8
+plzchRCmaWqahhBymDV3zuyFC94vq2mUA62nXXP1j++6Q/eBs/E5u2R+pnNc8So2aDL2I1nF3BYC
+ZFm2LMu27VgslpWVHQiE4vH4mnmvhksObZswbfqMK3v2HNU6p5NZsxtniGDu1Jqq6rXL5r/37jvb
+t29nmOeFQo7gpaWlHTt2TPO7pmmulxRJGgRbeZxa4+B7yVRb7+iHL71mVkLJ+v3DD1ZUVCxatKh1
+69Y/+9nPcvPyXD/H2cWnJZ016F0Rn04KU1UVY+w4zttz3/rzk0/WVFQhnHHdjTc88fsHtVSFcWhz
+fNtfPdz24EASIgILAsCoj6jNNvfH49E+ffpNnjx548bNCxe8zxhr1aoVUUXZkUMVxcXbV398zXXX
+TZgxXe18RbOg+9bOf2323KVLV6eSLDMjpCEcqwmbqWTPPj1/9KMf7d69e8mSJZZlSZJ0Qgn5SIw4
+HrtDKGlFip+t9kitB95248ypPN7817/+de++vS+99JLjOPfcc0/rNm2+G2r2RIyJMYyxmy1jGMbK
+lSufevqvsWjcNK3rbr7yV/f9SHNqoPT95jUv58gGFirQAOdMRwoRwKhhIqopimEYwWBw1qzrJ4yf
+3KVzj/Xr12/cuMkb9AZ0n3CMjZ+sLysr33OwtHO/gTXh6LK3nthbdMQBJTMnP5G0Eo3NXQrbjrro
+ostvvKZv375Hjx7FGCuKEo/HDcNAhDhGxE4mVKqBrgfFYbPoNdMytAuunDVrVjwe//Of/1xdXT1n
+zhxVVX/9618LIWSinC2ITqGzBr3rfkqnmjqOs379+t///vfVdfXxuoabZ13764cfzMlSmne+T/a+
+09raY+ndHKhXiEdYARFHgKiqxSzmxY6FMTYMw7KsDp073nfffdOmTX/hhRfefX9BRUMkKyvbV9iq
+prlx3htvZC2YFw83Nkj5Hl8XTeX19ccE2OMmjb7mmlnjxk4KZYUAwLbtdO6xpmnUtrGwc+QAJ40R
+xoIiJz9WnTz4zzCSgyN+fttttxmG4dr777//figUuufee88WPp+nsyfrTyZxOJYtK0ppccnjv3vs
+WFm5XFszZfK0m376UH7bLNjxJtk2RzUqqJqXFKZPqBLDHpzgsgVYspEPCeFIus5NB0gT9mZj00v3
+9Tm/1T3PPjFhxIzX57+wePV7mCqt8juyFG6Kx2QJ8gLJmur6FFL797lg6vRpV86cVti2VV24BhrL
+IaenTRTBuIZ5BMkOSIQgZLeOk0YBNogcSpqY8MlxGw69kqK2b+T11113Uzipvvj0HyqPHHjxn38N
+FubedOUsYIxzjl3PPj2xuFum2f5ndBahFwghEEJWlNKSkt/97nfRaLSmtqbXBeff+YtHL+zbM7Ft
+jrX71ZA4QhWREH6sKdR0FAGOJCNJAQFYcI8iC0kVKUNwmqEgiFcfWzsvmJvVsc+YDrNG9bmk24gF
+F7/492eLDhzKDvpzsvMtqlaUVOV3yBk1fcJV194+csBAyTbYrjegdKEY/BA66bJO736FEAgTJWlR
+WQJZMWyQNVn1yinOkxVz7K3RNhfde+Nt0xvqSue//vLRIxVznn+9U3abi0eOREIAgGWaqq7Ztq0o
+Z0EKnT3o0YmoE3WchQsXrlq1qr6+vqBNweNP/+/AQf1AgBltsM1qBzXKegZPMSQoBZsBZQQRgoEA
+d6idSBDkV4mMBMbMAYjINdus4w0esyR2Xk37Nhfe/aM7e7cfMG/RnJWrPzxYUqzK+tjJk6deMW3c
+1LFtMnXUtD2xYwE9vDjPKDX73atTmg7UuJsMAIC4nzvYKyUcmogKzolHc5J6siHOINl4PMuOdmzf
+++77HpQc/s7sV4t27HruueeCwWCf/v0F56qmwRftYP4zOpvGJSbEse033njjzTffNAwjKyvrscce
+y2epeG2Nv02r7GFX8XxcuelVqbksJyAsO6phi0heYEnbimsUJIRlLAuHEkUSQGyHggr5Pm7XHI3u
+b2J1JZGcIcGeV4+cNHTAqKGz3xqyde2yoQP7jbr8hm5tg2CV2VteShSvwM2HZSuOJD2dDp6G3n3J
+ggGWmWUzioSZLRuW2ZCIY+Ztl91lhn7RDOG0r21MJCOJyVMm7ty+5ujR0jVr1mRmZj755JO+QMA9
+z9lKIDx7Fo5ty4qyevXq559//sCBAx6P5+67777mmmte+s1v/7T778OnXfGDWdfl9Plxu6zzoXb1
+ka0LcqwKBlQmjkdFjsxBMACQVQ8QYMxhWBaqFwQxOaiyrCuSdvxworG+MXZM7jwh0GfaXbdcXzlp
+fHbIpxNFlH4YO/i6VL0zywIQelJBDTjmwxgwTif5nIAeY4KOmDie4ERlPJBMcNVDOo1XBl2tFE4A
+B32wbPXrr7+mEPuf//yrrP/hp/f/T21Z9apVq15//fUf/vjHACAp8tkKaZ09C0dRio8cefnll/ft
+2wcAY8aMufHGG2VFiUHOtt0HVm7/ZPXyZfff8fCwocMhr3PrUE/Y/ma09pAZTWEwvZKEJOwIcDgi
+MhWUIUUSkgI2NxlRFB/IfqJJARF2mtc2bt7jHNuWPeT6wlZdbCfFV/+uqWqniBVpxKIMWZQ5kgCk
+EULgiyp7ODc9VrXMRbPdviZnZM6wW5VOoxwpVN6c+PUjD29Y/XH9sZJRIy5i3BozfuJtZdV/+fWj
+x44de+WVVwratr1s2jQ4exnkZw36WDT69ttvL1u2DGM8cODAu+66q7CwEADistAyfIrtbFi6qGr/
+kZnXXj995pSOXS5F3ta8eJ1zeHcstoMaIiiAyBLHhAtKMOfC5swGDLoskSS2k6aMZca47ogQrY8c
+WRSNlUg53cO2knHsLYUpCvEgpAnZ0DSuCWIaIIRwc1zTogYAQAiDZzsspGiZno4z5X6XOYUDmxvj
+69a8+4cnnqg8Vq6pBEkEiJYwaDCkXjZm/IFNG5cuXVpSUvLyyy9369atU5fOsnx2GP+sQT9//vzZ
+s2cnEonWrVvfeOONw4cPd1Wcqkej0ZqA7mud3zqSqH3iL79aunz+tdfdMPPWWzJy2kNBL89+lFQz
+uEBMIIs6Xq9KjbhtmhJiQACsFBhxvz/XRmFJCZq2hoGGvAmU2CZiu3Jt2VEziRwlvAYsgnkWwaqD
+o4g0cc6hBe5pie8VuLlgot37Wl+n8SD4lg8W/eP5v/9rz/72gNvIwYjBNNUTt3QmNG6Z3ToX3Hnn
+nQ0NDdu3b9+yZctrr73228d+Byc3Mf8lfeW1ky6a4ZSBAPfv4N59C957taYqnuMJ3jb5+qunTk9K
+MYtgcAzTbs4IaMy2qcF8xJ+p5xwvq3rkoYd+dsOPD+2PQbtJ6vgXvX1u5zSWhWwCKEUlwUCVCRcI
+qK0TB0nUxIjzoGkJG5lMQQ7JsHkm5SqWsJpKyI4CUo6h6Kbfpt4U47ZKAwQlwUnpREohnMREBoIs
+B8k85c3wTX3B0210ZWX5Lx9+9Pa7Hl698WC+lFGrqVSSCAaZNfpxo4F1W9PA3tb/gsG33f0zLRik
+EJ0//2/zZi8ECjbUuTi4RVucc/cgDc7XAn16K+FmLwlKqyoq/v73v6/duJXRxPSrJt94xy2+kBPd
+/3aqYisQGRyPmQSMVI6RxW2LGRayFY/6ryUfTJ9+2S8eeKCpqUn3ZUiSxBhjjCkCZCwzCgwR0DJM
+rJsMmZSqBHQFaRLGnArHopRywFiSkAIOo7ZNmSAciMWExYFKsqxooKiOQwFxmeATGAnk0X2JROq5
+Z5+fMm3Ks/98xhHxYJ7GiEG4ACFUzUOBpEwLC8rNuHFoh2QWTxk1+vqbbo+ZTjKhvfn6K3t278WQ
+5eIgSZK7sNyDr7TP+g81BmPMsW0AMAxjxYoV8+fPTyRpv359p187veC81qJ0mbHtH/7EoRSRVBwE
+KmNZsTjlEsh+hSNAqqwocjIVf/HFF2+44aaF7y2IxxKcg9/vJ5Sqso4lDTgCh8UpZpKc4ZW4lQTH
+wMzCzMbCIRgEYIuCg5iQAEtIQhgxBFwAEoiIlE0BJISQpqicMYTA4/M2NzevW7X63p/e+5tfP15d
+XZ2dm8UkO2qGU2DkhgKJRCxlU4YVh3EFM8lqbji8PbXzOQknr5t18/jLfhBPKIf275j9ylOJ5hOG
+E3xRuPjrgt5lHzfMDQBHjhyZPXt2fUN9+7x206+5deBFF0PzkcYtb2fEjsgaYgCxpqZAICNpJJqa
+G2dcfdX9P3+4fedu4aYkwk4olJmdnbV61Zobb7jlvvvu37ZtG8YYM2FbFCjTgAFBsqIRECJajTHG
+giNmY24T4DJBGGNHIFAkrBAJBLENhRpe4ngwxdwA2QMMLJtyTgmIDJ+nqqrqscd/P+XSyR/9azkR
+it+bjYnSHE36g62um/WTa666PDMjYNgOQxJlAjFHkWlItsI75jj73uvWLufOHz8UCmUbRvPiBe/P
+fXOBq8AdxwEA19KHr1vgpOdW0/W62tp33nlny5YtgYzAxQMvnDR1ZkAhiR3vSxXbM2QvyNmaAG8G
+RCI1REFIlny+jFtvufXpPz01dcJkRSVV1RWxWKxz5+5+f2Dhwvfnz5/v8WoZGT6BsIKRyhKQSlhc
+EkhXZQmrXqJ6iKRghBBnbsmVoigmY7ZlYWZ5JVAkAEotkxk2MhkCoqiqyqnNmS0Tqbi4+B8vvZyb
+F9I0PSuzFcG6maDjRk566k9/f/Tnj/bt3UsIYdkUYYkBoo4DGLwq8SbCTvVSiJUP69XzumsnSyok
+k9Jbb722d+9ejLHrz4HPFfR+LdATQtIW25IlS+bMmcMYa9eu3XU3/KB3F59ZttIpWpbhJB2SCVSV
+AQwzkpMXIoTEYgnHoojRAf27z3n1b089/acRI4YzxkzDVmRPdig/lJWTSqVsJ2U4NkICOzb4Mr1t
+B8a8XZuc3LCJojY4gJCkYIwZo252CXIwohwDAoRMC+oMT8LX3df9Uj0YAiwpugcJAE4VmciynJOT
+gwhXNLU5HM0OZj76yP/MeenZieOG6wIaw+GmpqYTkTXOGQdgwrRZUJJT1Rvsovl+FPvhLTOHjx2X
+tKH06MGFCxcahgEA6erRr7rF/U9kvesZLi0p+fDDD2vravPz80eOHNl/zMUQ3mlse8FvlBCv10aq
+4A4H26EQjiQdR9bUgN+r2/EGMI8DPTZhwtiXXvrnPffck5WVxbkwTTMej+u6LqnYE/DHk4ld+/YB
+yvKNvCVj+B2x9pcJX46BPHEbKBcIY4yE4JRTFtQ8HkVlTDRbIqLkQodLtAtvQRfd58nM3bN339Gj
+R4mEJIwYc5LJJGXCoDaWpJlXzXj1pb/dfPuVmq8Z4ocBmlXNq3k9Pq8uOLUsiwIG4nFkP8IZONbU
+vP9NqFpaUNh+5nW3qSE5EoksXrz4448/Nk0z7S0/pWL97EPvXsBxnEWLFm3YsMHn9fXu3fvuu+8W
+GR7j2BpcuUwi0ZRAlDvIgzlCBHuQ0ECogmJJIEUXTnPp5o9eraquDGZm3HfffbNnv3HlFTM1TYcT
+vSYcSSGbt2+7694H7/nl/x4oZ1K3yR2mP5Dbo68/p7UDsuEwgbAkSYQQTBBNmsKmXCDsz87vNyJv
+/E2+fldWKv1ef/XVBx/8xdKlS12x4CYCKYoy4pJL/vq3Z5569g/d+naKVu/dtf7dsuLVoDciIgmB
+hBCCOYQQLCkgaVzxMqRmBfNpeFdj8b+AkiEjxl42cwIA3r9//+LFi2tqaiRJcjH5qm7k026pXJd0
+OjM7XXrqYKyKRNG27W++MS/aFOmYq1018zJPp46h4r81bptvo04ZSspj1diiwGQyAkI5liGFFJVD
+HMtKArfWnL3nlbyYrH+X95wud7q0W48ev/nzg10uufCtf75WuWkDCgUlzltnZlSVl7307LOVxcXT
+p08fP3589tAnPB32weGPjNIVrPlIBqGapDLDsdUa6u9k5Y5VO82AziMdKq1ZvWLVR4vfmPteOBxu
+3bo1s5gt6Uk72bp16Prrrx9z6097+I9B42F2dJGv6NmexdXqiF/ESReCiyUJO0aEKJwAMRMOCA3A
+AGjgToeg5MfVH8Ghf+YPuOWWm+7eu+xgUfmeDWtWbx09qm1BIZEk07Q1TWFMEPLvivvTQu/OoSu8
+WrYiQADM4vMXvl9WWuLNyOx70dALLxyUIZJQuk+kmlUCgBEgIJIiYezWq34+txBj7Es2Vu1cJspq
+8noM9wyYfP30aUZD9A+frJaSSa/XCwD5+fmJROKjjz5av3795MmTb/rx/wzs1dN7cRtvYbdY0fKG
+sm04Xp2poVj2lVntz/f3mgRa16KimtlvvbXo3TeLj+wLhbIzMjIAwM02NAyjU6dOd/3sZwDAD33Y
+tGtXc8PekNMUUHJA1XCLHS+06HOEEALwmjzKkc6SkCpZG2h1Ye/Og6+5+drf/mb/8ePHFy1a1Kff
+gK5du2qaAgD/Pu5ngh5OMv6JdJqTq4kAbN9X9MFHK1LJ5u79h0646vou3duJ8pXhkh0ajRCvlzJB
+AIOkYYwBqNuvxr2NtBbCGOuUIafcqGtoTlZ4TMgYfFNOKJcpxKMojuMYhuHmEOTl5YXD4XfffXfX
+3srrbrxuyrSxHTpcmtGmj9i33Di2RfJDsPdv5dyCZIoufHfpq3Pe2Lp5A6Jmmzb5CMkIIcdx3M2O
+EELTNOAcGmtiu+fJ5btDkpTh9ROpgDJGRdhd02ku4Zy7s8FAdcCU1Rxs0kTVVrNktW/o4ClXTXl/
+0dz1Gz5Zs2bNJevWtWvXziNLqZSpadq/r2jPBH168l3cXYsimYi98977x2sbvKp2wdAhI8ZPBONo
+as8CKVXtlywHq5bNJU4YxxgQgGgJfdqRQggBEfT6mddqSplINupEMhmJRCh3bNv0eDwdOrTLzc3d
+u3dvMhnPygoSQqr3b3jmsaLlHy+++qbrp04dF7jgFm/X8eABKrquWrvu7XlvrV7zcbS50evVVaJZ
+pk0ta/DgwbFYrLa21s2MUxQlmUh4zSYRKc2UEuANORIxBAPheJGeht6NbbkmI8bYEVxgnWNJU1kg
+GWflG6D9psJ2A6dOnXrgwIHm5uZly5ZNmDChQPfo+lcrTTnTHLkJFGmZ40YJ9u/etXjRB4mk2b5z
+pymTxhYGSKpojVW6RiMMCBecCUAISxwQIAKA3R+66LtT6LrVojibIZ0zocggBz3I50FcYADGmGma
+hYWF999//89//vMOHTo0NzebpplVkGnazZvWLXniVw/95sFHt2wrj5AuB6uC/3j+2T889st3Zv8z
+0VSVHfAIhyZjjlfPueGGGx599NGhQ4e6SRK2bcfjcW9GBgT8NpZB+KilxayUI0UFtgjohBB3iUMa
+epfrUVKBoGWnHB71KgHUeLj58DyFx6ZPnz548GBJkjZu3Lh27VrDMBCCr5S1fVqud/2i6QCbayEw
+xj7+6KPykiNEUvsNGjpy6ABilphHPyFGjfBmAziMc0mSZFnGWAIkpac23SMLIbeGDSxZl7ktSxmW
+kHk0ksFMjEETRFKkaDTiONbgwRcMu/iiQYPOX7hw4dtvv304Es/MCOYqSmPF0Teee7p0765OPftU
+VNVvWrkEsGiTlSswCtfGVCVj4tjJ06ddMWrswGAotGDBAkqpx+NRVdUNHTNBLKyDlEVxgGBTJkkB
+lu1AC4GD0tBjjIWgHiJT7jgYqySgxGrj5Wsyq0e373TZxIkTd+zYUVNf9+67714weEj37l3dn/+3
+0LvzTylNT4AQYufOnauWr9CAdurWa8K0y/0+wncvwQ17NJ2YWAfhOAIpGEAwxBkQAnBCQ5woXSME
+IeCcIyE0FMXMQkxBqo8qBFSECYAFVKG6rruZMz6fr//Agd27d2/btu3L8xcdPXQkHEnl5BbYRmrz
+5o1btm3GEvZpXqzKSctOmGa7Dl1mXDbtmiuv6HpeTyCYWlYqlVIUxbIszrmbDCLZRCKMSzZGkswk
+2XKYECBDen3DZ9UsAgV4vZdIKSnb4kJRkRytcfYvEFnjRowY8eGHHzasXL1x48Z169YVFBT4fF+h
+C8BpBY4bdHcnwB1Hc3Pz2rVri4+UBjzaBRdcMGb8eBFrjB/dQeLHJVVxiMqJCogwxhzTopQCEMY/
+Eydypb0rfxSnVuMGcgQHCesKA5YyTRVrhBCMcSqVchM3y0tLMca3/vCHb//5tw/+8MbCVq3La6LN
+TNPz22m5uXLQZyGzIdqEdOWymTOeeeEvjz52b9feoYZj6xLRqKQouq6713X9LZKigINlblDWBNzQ
+uCzbqqCCnlRFaYGThp5gD9h1mDHb8UdoAumKX0ipqo3RaLRn794jRowIhULNkeZly5Y1Njb++7if
+CXp3EIqiMIdiQCDgWOnRd9+ea5tJ7BdjJ1+RpQCUveI5/r4f9ITcXuNJXQgJKxwIqIB0BIQ4HHjK
+NmWEgHsRBgUjAR4mOLdlHkhKzNK8hIV9ho2cENIVgyQtGiCcEkJM7lciZcq6+8iKm+HonJw+Q+78
+5W+eeuYv100fk4uTvOG4bBixuogadcYMGfHY43/+/R//fsmQUVBTbq98Slp9r9q8BVDC4FgwUDij
+HDuEMDAsnx1IIoxUUxGcCFPGCqNe4EIVAhMMXsI1cBgXDgCxmIq5beE8G8saNHhBMqgGuqImjJzD
+D4ATnnTtXf369MkDKNq0cvuuDUkb0o3YWrbh/MLSnS+xcBBCRJIYpUDpihUrKisrFc174fCL+/bu
+CVZdoqZUWLasyuCkEELQ4vwnSgPEZwrP0lG6M11UwQ4TjoSQAkA4thuay6qdWMpXedzbc/iIkf06
+9vz7h6u3vPLiC0U71nZpX3jFHfdcPGTEsD49kHU8uePd5JGlcuNhzUie4RKfv034rF2ffvMM1Fxa
+HOywr1PhyEtGT9qzbv2xuvDHH60ZMmiytyDD/UK61c/pmj+eFvr06nOP6xsaPv744+bm5py8NiMn
+zOjaMQeKP7CPH1SIAj6fh9q2+PQeTihnhDj/dPLTavbEjZ1GG9nCwsIxBLWAgUwzVIPEq5JNSG3a
+E69Yr/S6vLDP5df/YHyHzu32blnXu2vboeMn+CEmKpYn9s1nVcuDVqWCBBDinP6+vvD9U9Tsl3oi
+UdPxWOnKQNuhl4yeNHfuK/V7Dyxbsm7G5HX5rSa29Cicwad2Jq53/QcSkQBg//79ZWVliqJ07913
++MjRCMLJQ0vkWLWseBjj1IiD+hkNgzE+BXo44Xf7EoZSmUMIkYhGhQQUE45VAkRiEk9YDXuSO5Jm
+zf5Az7ETBgyYMPAagb2obm2qZHXkyAdKpDiAQCIBGyPTQ/UzXOMkuTZv2vB1IUsX98IZoQ8iO1y7
+EZoPdep03sBLLi6raqg8XrN5/fILhw3NyspKZwamtzKfP9WXhMXdYUWj0RUrVrht3i4aPqJHu0Ko
+XhI/9kku5kj2pGxDFligzxQjYowBY8a+APoze/hk01RkIXMZcw24bnOPRHULaSlheD0SN0tTReWx
+qm0ZvUZDhwusCNO2vcwiRz1OpU+XCPIlUtjkAuueL4W+5Whd6+tUu/5L/O8cR0r4sU3Z/c4bPX7c
+qqUbko1l23dsqaury8rKOiV05fZAOeX3X+I+c5PcDh8+vGrVKsMw8vPzhwy9UOYx4+g6YVVhVQeE
+AUxJD1CwP02uOynrOeOnCpx0QtJpbkoGjBjltiOYAKIQ4uGSj2G/h5iESJaRkhFmifL49ve8JRts
+gxPziEQ1IgooQ1xKqaqlUILtMxl5p8j0tKfk89BjjE+7QjGCRCRxbH1GzzEjBw/pe17PSEXF/v0l
+hw4d6tq1qwt0GvEvlDmntXDSIts0jM2bN5eVlRFCBg0a1L9/X4gco7W7ZNmiQuWWjVnKYPIpDHJS
+1vNTuP4MiLhEMnxcVQRxEKYAlkCmAIthKhzZsRDRgkpGpuzRmN2Uqj3gSZUawhaaLHk9BKucAnCG
+ORU0/qUXgpOM7/4/xa7/0lCfreiKUKy6fU7FJ3mZwakTxrRu46+sj61evbqpqanl+eE0q+e0WLi+
+f855LBY7ePCg4zg+n2/YsGGZAS/UHjXrSzHhJpcwwrqmUPTpJgDSog2hlusAWgi+M9xS2LISzKaE
+EdkGyQAeRyIhYUPIQcMmBMuWkbCMWEYgIGdkWpKHqFlcJCkt56yBCE1Avil5kqp1ZuDS1BKdlpbF
+KSHvz5OJFI/uJ05Tw/HdwPjQQYPy8oMClC1bttTX1/8b8uqMPhx3dxOJRMrLyxPJRLt27QYPHuwA
+pMJ7PGYky/b7sA6OalHJUI9RziRMvcjxCYcgiSIdGAhuGcgmjlcVmKKUpPslARJtYhhAYBCfFXeI
+A+KKZHlZtk4l5MggZEdWkciXuc1Fs6JQ6lgEVFXy2yYVjk3AIZRKQiEogwkQxMRyTNCkitQT+H2W
+74QQEqOWjLDAioOojBGmqm1wnCRCVmWNMcYEtajFMQYkAfE5smJj4hDMJEEJt4E6mFKZm3I0BUnF
+0PxhA+xSuUNesNMFWV61/GjZnl27CTqZ6wkgAJj4AvV2Wugdx3EcRwjR1NRUU1MjS3KHDh369Omj
+NR+FSLnJY0mVxSQRAywJbyb1O8Rvg2Y4JEblFJMpEECICN7i5r+tnbZbWDhp3uecuzOnMapYtmSY
+muX4AfuJrIOsMOxJqR4isKiPRkrATLQJ5nYpbKshq7Gpsbi4OBqNwsl0cAECo68i62VZlmXZNM3d
+u3dXVVVlZ2fn5uZKqgp2kjFmgmOjGEgRLDEQqkhpQlYYVrnkZYoXVI+k6IAxdcxTzZ5/Y7fytdLn
+14H73404pr9DKXWh51zBSFWJJmFFOIIaglrAHclH/GA5ljBABWCgCMjx+9u1yQKAoqKi5ubm9BVP
+1+/lTMYlpbS5ubmuro5SSimNRqMgBOScp3cbbSUOQnivymOyjDBWBKaS0UzsBFIxEZC2afjJhNMT
+G+OTev+/hO9sEUJIpEurCTlVzSKEMU5IOsGgIEQ4Aw4II0mSMJaclGmB3/F38rcZAcGOAsABJ2oZ
+Pq+vsrIyEom4k8oEJ5gIEJ+fgDNBL0mS635yHMcAOHTo0Msvvjj9ttuzekzL1pTotnmR6iKwoj6p
+xiun/CgbYwOQKgkw7LhgNghEOWnJZWnoT/E6fPP0efsy3fQYPgs9Jg4CShCXMCcSZhw7DlhMxD2Z
+erB3bo/p0GOi4BkrNm3csHVjg8ETycSJIPbJANnpxvAl/vrMzMzu3bsXFBTUVlcXFRU9/fTTTQlz
+yvQrenS4KpBzQaBsa9PR9anadTix3wAI2JRgJiGmuEnCRDIFasn13waBcwql7Xq35jT9ZtpE8UGT
+hDECxGwac5CNfcSXI3mCod5j9LZjIGNIIia9tWjuvPdnf/LJJwjpsiQPGzasoKDAXUYI3ID2V/Hh
+yLLs+h+mTJlSWVk59623ioqKjh8//uxvf77vYNmMK66dOLi71mNSqP355vEhtHx9+HiRHanQGEgs
+iRmTMQZCGOCWXP+tgv4Uxj9F1jPGXPWLHS4ItkA2UKYVaIXzevk7nq/md4LsfoCDW3YVzX7jjSUL
+3w431HIHvIGsG37yk6uvvjorFGqJ9lcTOC4jGIbh9fnuuOOOnt27v/rqq2vXrjWj8Xlvvb1l46ad
+4wZOmDim4+CxgR6zlHaXdW6YB0e32bXHzIbDjtGEmZCZsOln0hH+Hbv+m6eWu9m0/9K1cDjnhqML
+ockZrYJt+6NOw6DgQtPTtQHkkjVlSz55572PZleW7LHqaJaCBw24aOKMmTNnTikoLHT7qTmOw0Eo
+ssIYw+RUqM/kuWSMubJe1bXxl07q3L3b2rVr57z62sGDB8sPb3u+umjRslX9+s0bN27cuHHj8tre
+Avk3KJEyaN5xuHidnl3QmYtMi/hNBk5E+PzJeIZAebYJuhc3i5TjLSApU6NNlpbLZI+Eo5JpacKO
+0zZMRBSiEBEHZhGmM4giyQtMAQCBMEKICSQACyEEAoJMAEwAESwJjoTNJVCFI5DMgTsqEwxhQhTC
+U5IgjBCJe6Ia8clGs+0IlpUtCVNp8lE1zCGBiVA4RgJjnCHqgcVrMkck2x9u3WOgt+tFwtPegIxE
+0tzx8ZoVSxevXr+xvLw8HA7LstyxS9epU6deffXVffr0OVH1gBC0qICQP4f7maCHFp0pXQ3ZrVu3
+7OzsYRcOXrp06dKlS3fs2HGo6FBNTc3+/fvnzZt3wYihw88fNqxfb6XzyN4FHQFjkPQmozHpOI4A
+nkpoMsrycIXGnFiDjpFtR3SJAgibOtxiSChUzonjPFkxmZ1I2gkHE1B9HPs5eDnTVTsBAAiIQCAh
+wt3lK5BNHABgrrECAMAF4gJEMmUGEAGMHWZLgLAAxhgHICyTxDVweL5sMSEIjZuOBcJQNY+mEILB
+cRyb2amUCZK3sG1nXHA3aFnAtF27S1av27Jjy9bi/XsqS4vrkklVVQcMGDBmzJjRo0cPHDgwKyvL
+MIx/v+DkTNCnRXPalxQKhUKZWR07dpw0adLixYsXLFhw6NChffv3FRUVrdu9cUGbpX17DLp42MCh
+w3p0Oa8Dwb6c1jzpWBbjsboY4YB5AvRcm0I0LrwBExMOwDXBADOZIFlWOdY5q9d0JikSSDJQSJmO
+wgAcgZUAAJxI1YBP4y0CFBd2BFwAE4hxxAUISdYAJCxJkiRhAooiK7IsGAOIYW4AdUBJEctOJqlh
+S6rpMJYyrUQsFlFkEgoGiOwBULCqRMLShlWbV6xcs2fv/rLSo+G6aseOExADBgy45JJLpk6d2rdv
+X5/P52LlComzBn06+dbtk0gQ1n2+nr17d+jU6fIrrzxw4MCSJUuWL19eXn1sd/2estL6LTu35r3n
+b1eY06/P+X17Dbr/oQf2Hy3dsnX9/p27wvEogILzzpM7T4jVH0kZKcVwJB1lCBusJpyqQUYt8uiY
+c0opozaoPKiDblEQiRgOuXyAwXU5nBDKsqUAAEICEOeIAgiMmRACy15weMq0KHcw55ZtMMY4FyAX
+JdQkT4FjI6zk+zP6ZXYYIgcL1Hh9MOAZ0L/31KnTzuveIyeU+9bst7dv2b6zpD7cWN/UWBtpqrWM
+eCgzc+plE0ePHt29T6+OHTvm5eXByQ7wcDKg/d9CL05mIaTtwhONUC3bVUeapnXu3Lljx44XXnjh
+jTfeuGTxv5YtX7Vr7+6iSEl5ORzcpW9e+UleVtteA7u06XHe1dfeBFdeO3jECBOD3n2int8azDg0
+1yTK91iJsOlrrUtY1bnX49g8h9tMQbpOJHAMI9GkJJuIT1coAAACjhAigAg+4ZoASQdgwDkIKjhl
+jFHBQAjDFhpRiSTJMlEwcquFdNkDlpDaXSJ3DmjZXYO5vUFvBR7MOGQGAz/50Y/Ly49ZKWvjxs17
+du+rqqoxTTOcsuKRRgSsc4e2o8fNGDN+Qr+Bg1oVFHrQifQkx3FUVXVBT3ch+6+gT6ffuDvStNCX
+1U8nllKKCW7VpnVeq/wh/Qf/4AdXHzy0a+uOjevWriwpKquL1UYbzbLag2TtJ4Ud22f79N17ijLa
+dBrQu/uoAX1EIKi24b4ejb5ENSiBlJRb3ZyqDls+v2MbSWZRRgEkT0rJTrBMEJkhu1EIAYyC4Igz
+BBwjAQAUKYAwRwAYCcACI4Fcz4kMWBaYxFNJW9gpKxGPRI1U0pc5qu0F+RBoK2TZBtWoS5Uf3HKo
+4oPiXVtqamoOHy6uqamJx5OMingqaZp2YUHWpaMnjBo1asDA89t27OTPDAFRBUAqlfJ4PBhjVVXT
+nfa+Ug3/l3/1DE52t6znRFTTy7v37d6pe8dx4ycdv/5H27fvXL585fp1nySi0ab6eFVldUGmWn5w
+fwIy3tJ9BSFfm14DevbqNbRvl/5d8lU9WwDpfd6gay6fsWNvKW22FEWJmqJ1my4Fk+6CcFkj8quN
+JZxzzhzBbMQocAaCYRA2ACJYknUia5LmlRUdySpgCXJbAyDKmKSQoCfjvC59p0yZ4vX4wQIDF1Ye
+DH+y75NDh8tL9lYer9tWHY7nyHJDQ0MsEXczNRVNGzz4gtGjR08ef3FOXqtAZhaWNUlREbixfiAe
+j8t87p7gP/AMnqnFqG3bCCE3BUqc7O7vUrpm1w1m2bZtK5YCOgEJ3HJXCpFEuCFcdXTnoa0Hj25a
+v+bYnvXRcEroHtWT6ZOIqXKs+gJeUpDpk/RAu+6D22SHvKkGkhtS7GRWYbdhV12hA/jselBIDELa
+CVefwJwhYAgxAAECAHEABKAIIIAIgxMeJMWpB5L70apPyir2slQUDMnmpKKuoro2Fm86FKmNN0XK
+MPYbsSwDNxtIhkhY1/WOndoPHDSo3/n9evXu2aFjx2BmhoIIkjQAYAIIAhAnLiDIqQ79z6P0n0N/
+Vsh9ZloikTh8+PCGDRvWr19/8ODBxsZGbjsAQAhRFEVRFNfdwRjTNE3X9UAgEAgEgsFgKBTKycnJ
+yMjIzs7Wdd3n83k8nhPOWCGEELIs27ZtGEYqlUokEtFoNBKJJJPJ48ePh8PhxsbGVCrlOI5lWZZl
+McYAY9u2XfeGWzQQCoXy8/PHjh93/vnn9+/fPxgMuqOC0z/u86zQN9FY130Ur7tTNwyjrq6usbFx
+z46dlZWV+/fvP3z4cENDA6XUVVZpL27Lg/SGU5ZlV8m3fL9l+NcFNL0ZTOedubl/GGMsSZmZme3a
+tevSpUuPHj169OjRpUuXvLw8Jni6iz2lNG3X/fcth05H5+CBGS5YBBMA4I4TDofLysr27du3b9++
+ysrKysrKVCoVj8ddW9bFjjHmzkq6UMLNK0rPgft+2haAFikemqYFAoGCgoJOnTq1adOmT79+HTp0
+aN++vfu4pBONXAEEOpEm9p8J7v+AvolHB7T8n3ainXAau1dPl3NwbhhGQ0NDRUVFdXV1OByOxWKJ
+RMIwjEQiYdu2aZq2bbt87cKtqqq7GhRFUVXV4/G42bJZWVmZmZmFhYWFhYU5OTler9d9OBJln9p/
+X8kWPOv0DT06IN3Gu8W7Z/oJozTtQz+hvlxf/0lfLsLYnTbXxEpf6MRH6Yuc7E7svuSMCQQtF0f6
+h3BSOp2ygL7Dsr5l5pv77DV3Dk53Sy6Un/+0pUBPf3qKGkxvANOZLJ8//yl3SxnFGGOE+Rd1kjsr
+7eVOR9+EwEnvONJYtKzSaim7IR3DajnEM/LdicLlz/0kPeWnmN4CwKGO+/Q9cvL5J1xwgrA7VHfu
+XUH03Yb+36f0qj/l2CUX4paVZl/M1J/7tCX7M8YQwemoBeMMANwJEJ/NSz2lddrXQd8i6P+v0bfl
+ubf/B+l76M8ZfQ/9OaPvoT9n9D3054z+H54AycC5meUkAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_mazda" model="fleet.vehicle.model.brand">
+      	<field name="name">Mazda</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAA5aElEQVR4nO29eZhdR3UvulZV7eHs
+M/U8Sy21pLbmyZItybIG2/I8gDFgHMAGQwghvHB5iYFwM/GSwA15cG9CyPARErDNYIyNB1nG1mRr
+suaxu6WW1Op5ns68p6p1/9jdRy3ZTtwtybz7PdbX3+l9us/ZVfWrVWutWmvV2khE8Fv6TRD7TXfg
+/7/0W+h/Y/Rb6H9j9Fvof2P0W+h/Y/Rb6H9j9Fvof2MkrtaNiAgRL7smIkQiQgAEBCIIPoIAwW7C
+J2AIAMAAcGyD4QMy6ftKKQQuCaSUiGhLRURKKaVUcEciGXyBMRa8aprGGCMixhhHL7gQQgAAIiLg
+xSGTBFQICMCIEINeXuwzXjaia0F41bdUwQ3znXYVaQwBxsYNiggkMgakgAgYJyJPKs+V6VTKcZyk
+zz3Py2azjuMAAOciQDbEGQBwzoUQnEHQBGOMc55vNEBZKQUAoHzXdRljpmnquo6IQghd103TYAwE
+D8CVRITIJ0I/kZRSQevXgq4m9EQUDGDiGHwABOAApHwEhDzzSeV6ciSZGhxNZB1nYHB4cHA4FAqH
+iko5Ml3XhRAMQAjGOZeeHxZK+VIphUgAIKUEAI5IiJqmaZpmGIZhGJxzxhgiakzLT4zruslkMpVK
+eZ4XL7BM0wwZlhBCaMwwNESaCDEppQiDL15TusrQwwR+D94qRCV9gYDIAAGApW1vYGSkt390YGAw
+mUkjE4ZhhKNxy7IAIDvSl0qlcrlMNp0ZHuxPJpN2NpfNZVw3azvZXC7nOI50Pd/3pZREkgiFEJqm
+maYZiURisVg0GrUsKxYrKC0traioKCoqKikpKSkpCYfDDJnrOMlkOp3KIue6rjNGZkiPRkOMGCKO
+CURgbx/OVaerBv074o6IQB4gAjAANprOdfcNtnR2t3d3AxqFhYWF8Zipi1QiOTjU39HRfubMmcG2
+08PDw7lMVinfsW07k3Ycxw2kz9jCkojIOeeMAQABSCmllEoRETAGQghEtCwrHA6Hw2HTNIuLi+fM
+mbN06dK6urrZdddVVdUYuiYVpFJ2Kp1w3RzTWGE0ZpqmpmkBv4+tqmvJ+1df1sNlCopcQJFIZs+3
+dZ1r6xwcTYLQrEi4NBaRrne2uen0qZNtred7OjvSmVFEtG3Xtm2lVMgwLcuKRcPxeDwcDkdiJZFI
+JBqNhkOWFTYtyzIMgzFGAJ7nua5r23YikRgeHh4cHEwkEoND/cPDw5lMJpA/nPNwOByNRqsqyufN
+W7B8+YolS6+fPateM3km43iel0iN6rpuGrplWZGQjv+nq1kpJXB++nzriVPN3YOjTGjRaNjQhe/Y
+TUf2H9x/oOXcWdfJ6YIjo5yTJaJ4QcmsWbOuu+66GbV106ZNKy8vLywsjEQihmaaphkKhYQQiMA4
+4MUWxy5cV9q2nU6nM5nM8OhQW1vbuXPnmpubm5qaurq6HMchIkMXRCSEmDZ9xs03b1i/cdPsWdcZ
+pmXETMfOeo4tGETCVmEsyllgCF0rxr+aAucym0xKadv2trcOnWvtyLkYjhUCQC6dONd0/OC+3e3n
+z3q2U1lZyZGlMmkzbNXVz1m77uZVixfMnTu3qqqKc41NWO8I6tIG1bityt7OnkREyAKFPjI6cuHC
+haampgMHDhw6dKijrT1Q3Zmcncl5M2rnbNp0z6pVa2MVsXA4XFxQwEH6TjYeCZeVFGia9n8A9D4A
+SVdjAhSAkqBpZ7t6duza3d03aobCtuNJKXs7Wk8dfuvsyYN+Jh0trQiHw+l0mog2btz4sY99bMWK
+FcXFxYGBeLVo4hJMJBJ9fX2vvL7l1S2vnTpxwjQs0zSHBoaz2eySJUvWf+CRefOWOY5fXlZYWmxo
+4ISFPr2q1rDGIUKE/BwTwBWLoqvH9QAIipRC4MDweGPzjj37RlJpHwzPtZ1Msqu15ejBtzo72nXO
+ysrKGFIqlVq6dOnjjz++adOmeDwOV9WcmLgKg70VBCY/o97e/ieffPIXz/xyeHg4Hi9MJpPd3d2F
+JfEHP/zYytW3OkoQqdkzK0zhFUWs6VVV4YjhSyKQGhdSSs75/7egB1BKSsY1V9GZ8xde3PxqKuvk
+HOkQUC595uTB08cOJoeHjHCsrLo2kbELTfzUpz718MMPT58+Ha7B5uXtFld+JoLX5ubm//X339u6
+dasesoQQPedOOsRXbbj3/o98yrQKe3q6Zs+qjIZFTWG8bsb0SMSgsY23klJyrl15D68e9EoBA0Xs
+4IlTW7buSGfsRConCaSTbm443njkoPQyBdFYtLAk50PtrPo/f+IP16xZY5qm7/uMsWu0abzMvQGB
+uwIRAHzp52z3mV8++73vfc913RBoLe3NiXRy8Yo1j3/uj6OFVefb2sLRcH2JaZr62ptuNHWuCSal
+F5hMV+7+unrQkwJknb0Dr27bse/gEWQcuMhlndYTuxsbTiulOOfFxcWapi1fvvzrX//63OvmIGKe
+2YOLq2jPveutCAL9TDD2+vwLL33/+9/v6EqCSg31XxgZzixesuITj/+3SGlN19BgtvvMrLqZa9fc
+sHBuHQJAoMqU5My4wh5eNV6TivoHhpqamhYvXFRRUpwYHrA467xw+vTJoyQdFNyIxZkZWb325v/x
+rb+Zd11dgHuwc4FrsHXMs1T+InC9AQAgSt8HACUlAj74wP1/+vWvVc2syXleJFxYWhA7dezIU//x
+TwM9zZmRLs0y5y9aOJpMnj17IfDcESFjV0HgXDXofcZe3botmUgtXTjvwXvvjuji8FtvHtz/pq7r
+umEopaJW+L577vrGN75RXV0NAFLKwNcYfP2q7xvziykP/ZhYQ1CkuJZ3ZwIQbVi3/i+++uX6ujrP
+ZT5p0YLY8aNv/fCfvtvWeGz+4kWlFeVCiBc3vzw0NEKEiPyq4HbVoD949NiJhoaioiKOcP2SBZ/6
++CNV5YUFEWMwkUmmM/FI9K47Nz3x5S9VlZcopQAF5zzgwcACCW5yFfd3Aeh5LRI4nAFAASFjQUOM
+MZIKkYDkhjWr/uyrfzJ/wSIPKWEnooWh6VUV62+4qbS0VNf1wsLC3bt3/+QnPwn2z770r7yHkzai
+HZICOSMABcgAAAhhNDF88EjjyGha0wVDAqTVq1dW137n9a3bN29+5c03dq5eteqPv/jFspJC5UsU
+3AcAIM4YASAi0Zj/Hq/cZBunPOIBZ+dFGZMSGAMEUgqQjW2YEAFg/ca1fYOf6v1Gd6xwxQMf+vDM
+OXOtcExoZnE85jN3qLfjP370o/s++GBtTbXGL/evTUFXTRp6gZwBXNTwCI7vHT15qrOrJxyJKQJf
+SY4ghF5XO/1Tjz1205o1u3fvXrpocXVtrSJgApRSnDEAVKQCewMRgUBJYvxq+kwuW0Nj0oWJMXCC
+KQ+AI8XRB2B33nmnA4g8VDmtdiSVBV0UxcIcwSNyHKex4dTPfvazL33xDyzTAAyY5qI0g0nqqkkL
+HB5sJgiCFwIYGhk9dqpBMdQsM5HJAhPBbT1PMgb1s+puueWWmbNmKwSFoAgYA1AuEnBgDBkoIqkA
+APlV2Kfk6e16e3xTCr4kFYCeXwrIAKRUHhhGxbQZHuNd/UOM83g8Frf0sIGJ0WHPzrmu+/yzv2hu
+bs73cyL6E/XKe6HJy3oCUAREgdfKBzjf1p7I5ErLK3QzlEynAgnrOS4QCQQhRCwW6+nrP3KiOZl2
+5NhIA1FFAICMISNAhUhSepPuz7vQZRGbPCgIIPi4f2csdAmkVNqGhnOdL7yy9dSZC6YVKy4uLi0q
+LC2IlscjHCCdTmdshzM43dTw0ksveb6Cd5rda8v1QQtjrwipVPZ8y4VorKCwuLioqGh4eLilpQUA
+dMMQQjg537GzRfGC2tpa13V//fq2rdveHBxNEAhFChgqUoAAyK+1fzw/E6T8wDZX49OcTCabm5uf
+fXnH9t1HUjmaNn1WRVlFRXHBjMrimuJIxNKz2fTBQ0cGBgcty3Jy9ssvvdTR0QWXGggwLnPeO03V
+VzUe5+vp789knKqq6cKIFFnmL3/21NYXf/WpR3/n1ltvjUbiZkhIiTnbQYKF8+cS0WuvvXbsxIkV
+K5cvnj+3pLiIMaYIEIJAd6AVp9ijd6PLVB+y/IVIpjId3T1Np8+0trZitHr69Lri4uJI2IwaoqQw
+Who3pOsdOXLkX/71h4ePn4gXlCRHB7nwWlrO7d63t27mR9m4pZSnSblDJg/9eHgbAGzb7+joKCut
+qJo2XQK2t5zruNDy1q4d+/bs+NAHPvjY45+5cdUqznkkHHJc5fpy4fy50XjBK6+99s8/fKqsILRi
+xYr1a2+eUVvDAcfyBibdm3elAPGJ0AT2JefCk37/4PDpM+dONJ4ZHBotKimbMW95cWl5NBwSnMqL
+Y6WFlgA4f675mZ//9Ac/+OGFzp577n2gtLR8146tpiaGBgd3btt+3123FxYW5uPpU/BBTRp6RUCg
+OIKUMp3LDg4Ozq5fWFpeZbvOgc6uCy3nY7GIZzs/+Ld/37v/rQ8++NB99z2wbNkyQ2e6YClHVlVX
+3/PAB0qrZ+x/Y/PPnnlm+/YdN65YsXLF8sXzF4St0MV0kSumy2xKAFBK+b5/orGpta3jVOOZodFU
+cXnl3KUryiuqQ+FokSFj0XBZSZQDtLac/fWrrzz11FMHDx6SPixctmLuwkWDvT3RaNTJJHVN379/
+f29vbzQazbu48xuF997DSUPPABQxQmCc9fcPVhQW1U8rC1t610imveVMYnBYaMywIpbQm043n/2b
+b/7qFz+/6667PvLRhxctXRYxtBhjURGr2bBiwezZDU2Ne/bte/JXW36x+ddrrl+y/sYbbl69KloY
+AwCgYMfPSClkQil16aDGswfGp0qRYshoonFNoEjh+NdGRkfe2negsaHhTG+f0K3Sipqla1eUl5QW
+hEMVxfHiaDgW4sDozOnGX/7yly9v3nzgwAEpKRYr0JhRP38xGRGjoDReVNmTTBkadnadO3To0Lx5
+88Z8yJMX9FOBHgAQCQAdR+ZyuZKSkng8zhm4rnvubLOU0jQ0X7qMsXg8bqczZ5rPNjQ2v7z5lTvu
+vmfdunWrVt9UVlam6/GVhfG6aaWL581qudB28ODBg4cO7du7/4WXt9x79x1r164tiEeVUowhMjE2
+sPGEJ5gQC0NEApBKcsbzaVU4YTIAVF9/z979h9/Ys7+9sz8UjdfPXVRZVVVRUVFcFC8vKagojoYF
+2dnUnj0nd76xfcuWLQcPHnQ9GY/HdV13HK9mxvSy8kpkzIpGiktLelqbhdAT6dTJkycdxzEM42JP
+JumGmhr0SABBOkZ1dSVjQAQDfX2tra1je3dEheQ4djgWdV0XEZvPtzR+938+/fTTixcvXr9+/S23
+3LJw4fzygnhJdM782XU3XL/8XMvtbx06eOjQob/5u/+5+LXtD3/koYULFxYVRBiACjjr4pAusjwi
+AknBEED5vi+EAFDja5+Pjo5u3771+Rde7BoYLq2um7N4xbRZc8tikZrqymmVpcUFGvrq/OmTO7b+
+eveuHYePnmm50AIA8YJYoWEg8kwmY5pW/cJF8ZIil9AwreLSUmACQIGChoaGZDJZWlp6GTLvHcap
+QB8s8yC4HItFAIAILly4MDQ0IDgSkZQKGNq27dh2OFqoiMKRmJRydHR027Zte/fu/fG//3DJ0oX3
+3nv/LRs3VU+fYVUVT68uXrx00eqb1ry1a89rr732V//jOw9/9MPr1tw4q246jm3232FFT7RegoWv
+FDDGAeDo8WP/8eOn9uzdX1RWuej6NdW1dRWVNVU10xfWlYZMPTU0+Movd2156cX9+w50dHZncjnG
+IRKOmJahaZrruqOjI4h83rwF1bPqiHMkLoQoKik1rFA2PWoZZldXV29vb0lJyRT4farQowJCIrDt
+LCIahhFkv/R2d2aSKV3XGQPbdUvKSm/deEvDqRPN51o550Emga5FpJS+Y3d2dp5ta9u2c8+s2n9a
+s2bNunUbVq5eU15dtf6GJUvmzVu+fPmPf/zjf/nXH4yOjm7auK6muqq4IDrW+MTNESIQAIxt7oIZ
+QgbDoyPbd+780Y+ebu/pm1m/cMn1N8TiBbNn1i6orwXpHt69beeObW9u337hfEsymVZKCNOKxEt1
+3WeMua6dSCRc16+vr79p7bqqqirXCCETphbSOYsUxEORaHJ0MKQbAwMDPT098+fP55y/PRZ2baAn
+QmQAkMvlOEfOx5xHvb292WwqaloKSUpZWVn5ne98p7O949vf+e7+/ft7enoERyGE4KiZISllCIXr
+0YlTjSdPnvz5z386f/7C9bdsvOvuu+ctWr5pw6qZ06v/4R+//+STTzq57H333JXL5SpKS4TIu9to
+HHcAChIwx0IgA8PDL738yo9+9CNXwaq1G2pqZxUVly1cMLcgxLc899MtLz53+EhjNp2Unss4hKyQ
+FrJ8QNvNehnpuramaTNnzrzxxtWf/szjN6xc9eKLL+9uPFMaLWJcF5yFw1EzFOJCB0XpdHpgYCDw
+v17mqrtm0I/f3ff9vLc9kUh0trcBQSgUAoCs6xiGUVFRUVNV/czPf7pnz56XX355x44d7e3to6Oj
+OdvVdZ3AZ5xrhuBMpHPZPXt27du376kf/fimm1Z/4KGPrlm38b//ydf+/nv/+MJLLxcVFa1atQqR
+otFoLGzRZUubiHDM5Xm+rWPnzp3PPv+8B7T4hrXTaqZNr6kwON+5+bktLz1/4vhhIF9oERCabugA
+4PluJplgjMVisfJptYsWLVi+fPn69esXLFoYMkNKgWmagmnRcIwzHVDaYcuwQojIEF3f7+3tndiL
+yQI5FVkvpce4RkSaphEBIGUymdHR0aAHruu6rltdXe26rmaFBbK1a9euX7++tbV17969+/fvP3ny
+ZEPj6XRi1PVcqTyhcyFEOBaXPnX1DPz0yZ9seWXzDTet/+Tjn/v85z8ficaf+9ULFVXVnl1QVlZm
+CM0wLo0QMSQFgNDZ079z5xvbdu7s6ulevWZtVW2dZRnHD7715q9fPt1wnAB0K+IRSHKI0PNBCL28
+omZGbe3ChQtXLL9+7vx58+fPDYfDSilkTJEKIjmRSCQSsgzDIpJOLmGETNf3LDPkOU5XV5frurqu
+BwO/5k5jAsYDdz0qH0khCEA3nbVTDmPCVwo51wQzhR4KhYKciWA91tbW1tbWPvLIIx0dHUePHj1y
+5EhTU9OZM2f6+vrS6XQmawOApmlQYCXs3KtbNm/f9vrvf+EPP/yxRzw3+6uXX/ropx+zu5N2is2d
+V6VIMVRAjBhD8hmKwZTcvHvf4VMnG06crKqeVllbBwOtW/btfuutt7LZrGVZuqYxQE4yEiktKSmZ
+M2fO/PnzFy9evHz58mnTpk3EayxbHxABohGTKbesLI5M5BxPT1uaGSXUFBAiDg0Nua4bLP33ya4H
+AATwfd8l8oA4oOvJbDab37sTUZAQqRQgjnk28sObNm1aTU3N/fffPzAw0NnZee7cuVOnTp06ders
+2bMjIyNZ18s6aaEJz/W//bffOnz48Mce+bibSe19fdudd9/TmRyI9oWryuOASirJgQFg1va27dje
+dr7lTEOjUnLBggWNJ07u37als6td07SamppAyVdVVM6aNXP16ptqa2vnzp1bWlqax0spdZmnMz8N
+SLIwFuOamcqkRxO6xpEDgSIAsG3bdd1wOHwRlvfBuERE31e25/iSFEfbl57nTWw7WIbB0Djngf8k
+/9/goqioqLS0dNmyZQ899FBXV9exY8eam5uPn2hqbj7T39eTzaZHhoZ3bnu9u7X10UcfHRoabGg4
+Xrdg4fHmpqLCG4SGnDNSPjJxtPHkicaGxNDQyODAoqVLzjQ3bf31VvJys2fPrqysNAyjvLx8/tx5
+y5YtW7p0cVlZxUT/6MVI4fjhgPy/xjgGZEVpkWZYAyN8cMBggAQy0De2bXued5mn6BpCTxMQTKWz
+uZytR6ycN5adkrdwL/MrXXZsI/jjuCWuELGmpqaiouKWW27p7OhtaDy58403OjrbOjo6Otraz7e1
+/+P3//lDD9zfdq45FI8XRguPN5xesWw+KoWMtfcMvL5rp+3m2s+dKwhHOzo69u7de930uoWL5+uG
+yOVyS5cu3XTrbXV1dRUVFQAq2B9IKYN9yURumIhg/q0AKiqI6lrY87yQoZHyQRGqsfU9luIwJZo0
+9MiCw09AhAMDg/3DI4A84/h5kRKwT57H88pnImddPMIx4RSKEEIIUV8/Y8aMyiXLFm55/bWWtvZk
+ItvY2LR3195nnnnmtvvuLSoqLlm+oqd/oP1c96xZValU6sVXX8s5Xio5OtDX6+Ry3UP9H7jv/trS
+stMt58rCJZ/4xCfWrb25qKiIMSalZAyk9IUQecafmBY4sUsB+p7noXQtXWMCwyFTCBHMGWOMfF/T
+tIlOumtvXI71DwCgp6enuKyXoXB8GUCfZ5bgLELg3coz/kR5OlEBjLtzAzikbmgzZ9T+ziOP7Ni1
+9639B9dv2jRn/qKtv3pu1/adnivDkdj8hUtbO7vLy8uPnGps6e7RELra2jKpZElJybKV16eSo7v3
+7b5p3frf/dxnFsybn0/14ZwTyYmgX9aly5ydiJjNZj3XRlCIYBgGIgZ+EYZCSicWi+XNm8luZacC
+PYFE4qBACDHQP9TT12uEI7bvBxZ93sZKJBKB4ZXHlIiCHL9A9E/chiDixdNoqPnS17goCMfvue22
+GdOmv/jKlqKCyONf/OIrzz93+NCB4tLS6qrawtLynUcPnzx6BPXQSG93enh02rRqKxo7duiwncv8
+X3/4e49+8rOWZeY9i0ophoHcmzCWCT79y6KJwd9TqVRwflEwEEJ4npfNOYqQGDLGioqKglFPjaaY
+h4MMBNcyuexIIpVMpnKuE4lEYEKYZnR0NGD8/FpGxPxxmfyA8zG2/PglAOMCCMCXOteWzp33yY88
+FDXFQCr1wY99pG72zBOHDjc0NEA0nFIkFfoE2WTK5BoKPHjokJ3N/clXv/K7v/f5UMiEccfOxZm+
+VNXn2fzdeDaXy4Gi/P8d27NtWykgZJzzeDxumubUAIQpQI/AFRIhxAsipsaH+/sGh0ZsCSIS13QT
+lI/kIfCh0cTQ8Ci8UwIeTFiheZmTH7wAYERB9JqAkLOaqurPP/7ZyjDv7u9fdcf9pTV1B3ZsT7ac
+rS4p0iOFfn9nJj0sGTSfPl1aEP3Lb3z9E5/8JCM+EUwcP60buKDfkejiLwUkARQiDg4PcZ2YQEng
++342k8ilRzRGTErGWGVlZTCoqSnbSUNPQMFJwFDIsCwrkUgkkiOO4xQWFgaCL9Cig4ODg4ODcKno
+vMTz9Z80cemC0DSttLT0sccei5hmf2/PyjU3aCH94KH94Pu2nU0mRmzb7u3t1XX9iSeeeOhDHwpC
+vZMe14Rv4LhF0N/fH5jtjIFt252dnalUimvCR9J1PTgTABPW1qRanDT0DDCwYAxNs0y9t7szOTrq
+5DLhcNgMWxKICDVDz2az3d3deRU3YYT0X3ZxYjpR8GHOeVVF1e986KFISPO5v3Ld6pGRkZ62NkOA
+lDKXTruu/fGPf/yBBx5gnAfZnJMeV37CKDiXS6lMur2ts7SoApETQDqd7unqdhxH6Jor/Xg8XlNT
+MwXterHFyX6BpEJAxkAwHovFenu7c5mUY2diBYVhK+I6vkLgnKdSqVMNJzjHiVi/l47SOMGElFUA
+ICUXzZt7zx2b+gb6QgWx+vr69taWdHLIs+2RkZGbVq3+zKcfN03ddd1AjU92XHAxRyrwfbC+3oHR
+VLK8vIIznnNhaGhooK/Hc1zGmO35lZWVAfSTGt1Emjz0lBcgVF83E5UaHOiz0ynGeVFJMRNj5oTj
+OAcOHBgcHJxoccKE3da73T+v9PKKN5gAzjTy3NUrV9TNmt7X11dUUjwyNNjResFxnGjEevSxT5SV
+lSmlAqE3BVJq3CIgJqVExk40nEqnsyXFFQoglcl29XR3tncwRbquS6K6urrCwkKYIGeuOfQoEBCk
+7zPGZs2cEdLEmZMnpWMD50UlZciEVIprgjHW2NjY3Nyc79Zle8X/opXxGbq4aAhQExzh1pvXS9sd
+HhmJlxT5bi6ZGLn55ptXrlxJNCZnAtN7suMaE1FEBBTI7sOHjyqCwpLyjENDiWRra+tAX5+la5yQ
+iBYuXBiYN5dZpZNocbJdVAAEwIUAUEWFhTNrp50/c6bt7FmlVHAYXinQNA046+7uPnbs2ERx/156
+JqXMGwwTjR8EIELGYN6MWbXV0wZHE/GiQpNrnPM7b7/N1I28ctZ1XcopJovnm+4dGDx56tS0adOE
+bgyMjHT1dDefO5tOpkzdyGUyJUVFK1asEEJMdExNlqYCvQokslLRWGTd2pvtTHrH9m1t7Z1VNdNm
+zZrl+77jOKZpOo7z5ptvOo4ToP8euxjE294+SSTHojRCwe0bb806bntXZ87OLFu2bN68efko3bha
+niocnCOi7/uBQ7u8qnIkMdrR1dXe2dXa2urajsa473r19fVz5szJjyi/NCc1DZOGXguSjZEj04n4
+4sWLZ9XN6Gpr2bPzxYH+7gWLV1rRIte1NS6llMeOnz5y7CgyPpYjO17zJl/K5h3p7Zt7AEChEJQC
+LgUvLSuqn1Yx0NNDRuiuTbeVFBUTUXDYI4jQTsHQlmOJ0wSghGC7du3Kem5N7Yy2hOofSnedP9d1
+tokJL0euz+DOO+6ura2FCcbYVETcZL8AAESUZ+SKiopVq1Yxxvo7OvbtfKMwGtl0yx3SF6lULmzp
+7e1N217fKpUP4znVihSMh7CnQAiopG8ZxuIFCxODwxVl5fPmzZvojIMJe9dJUVDqIkDwQlv7/oMH
+KsqrTCsyMjTQ39t97ty5np4ey7Js266srNy4cePU+n95i1Og/CQXFRVt3LixoKDAQH7uTGNjw4l7
+H7j/4Y89ZoWLbcexHX/Lli0XzrcEudRKSo6Xp4hOrl0AzjkDmF07c8Pam+7cuLGqqgouNTOmdn8E
+UEoCKClpz779pxrP1MyYqQBHhwYGB/qaTzf5vo+IuZxz0003LVy4cMpDyNMUjMuLXt9gkNdff/1N
+N92Uy7qxiLV3/xttHS1f+qMn/uAPv7ryxk2RWNGBg4dffPklKaVSfl4ETxV7ppRigEBUGIt++tHH
+bt2wEWCsQheMy5mpoq+CMgztnR0vvrQZmaiZXpvK2NnUSHvLubYL58Ph8PDwcElJ0UMPPRSNRqY4
+gomDmewXJnp9AYCIpk+f/olPfKK4uNz2PdvL/ezZJ4dGBz7+yU996ct//tjjfzxjdv1/PPnTM83n
+AuCCFGWaCvhjBc5g/MiVGTI4g8AzOlHUTk3yKikZ564vf/36tjf37KmZXhsyrUQiMdTXc/LoITuX
+RVCu6z744IMbNmxgVyMld+onCCdujm655ZaNm26zHVfTtKaGkz/9yb/rOtTNnnPb7R/4gz/6ary4
+/Omf/yKTtRljY1HQKbH9JTsDxpSUcOkx8/ypxKmNh4AdO3HqmV88x4VeN7ve933l+S1nGlovtBiC
+DwwMzKyb/enHPxuPx+XUY1MX6Yqgz78WFxc//ruPzpk9x0v7BolXnntm/57Xq6pi0SjOmrv43g9+
+eMeuvS+9skUpIKUCp+DUGh3zFJIikMgB8PLjn1OX9Uycbbnw82eebT7XsnDxkvLycgQYGR5sOnXS
+yWYcO2sYxsMPP7xs2TLI77+ujK7oHgELB9bOzetWPfbJR3U0IzyaHhn+7t9+Y3T4wqzZpSiMWdfN
+X7Bk6TO/ePb48eNcCPivjMt3pMB3FDTH2JjBNG6qXsyEmJq0AYDBkdHNr7y6+dVXS8vLZs+ezQik
+9I8dO9rX223owrbtlStX/v7v/76maVdiJkykK4J+zLvCOQDo3PrCF//gwY99MCUz3AwfO9749T/+
+GmVSS2bOKisouu3Ou0tnzv7BL5470dyiFEPioBQQKKV8IJlXvArgUhd/3l5EHviqg+YYjv8QSUQK
+XhFpfM+nAPzxi0vIu1TPEICroHtg5Pnnf/nCyy9Z8ZIlN66Nl1ZKoKajB9qbjnDO0+n0vHnzvvWt
+b1VUVIxFGq4G+lfttDgRxePxr33ta9dff73neZZlbd68+dvf/nYkgnUzKmfUVN9/zwPZjPf0T37R
+2tkFDIAxAgKGPKjxM1a9YOxWl/mkLvfnTCBEHvwEle2CHyIEEER4ieQnAAINgyODPpAM7tbR0fni
+iy++uXc/04ylSxfXz6pjIM80nDh+4qjrutlstqCg4E//9E9Xr149MbB15YhdNeiD3tTX1//1X//1
+8uXLM5mMaZpPP/30d//fP4+YNKOmqnbajDs23T0wOPLLF1441Xw67boKMaj5isFhWlAEYzu1t48N
+x+m9dwYnpD4AjK0s38sB+MgYIGZzztGTja9vf+PIiQabxNIVK+fOn6eU3Xj80LFDBzKppJSeZVlf
+/epXP/jBD8J4rH+y52PftZNXS3IBQD4GvWvXrq9+9av79+/XdZ3AfvSxx//qm9+NxCNdPYnd+/bs
+27Orvn72qtUra6dNL4nFDM4gCE4oxTjie4jU04QMgHdziJIExCAD+TLvigIA2/W6+4Yaz5w5fbZl
+YGgklc4UlJSWlxXbmcSb27cePXggMdTveV40HPnLv/x/vvCFL0xth/yf01WDPo97QLt27frKV75y
+9OhRzoAL8eBDH/rCH35p/qLFyaS9fceuI8ePV9eULJq/oH7GzHjYMnTdMDREVCCR2NtZe2LqwFi/
+34X9J0iqS8YVvJFKZh3KZLLnWtvaO7sSqexoIuUpGY3EQ5bW2X5h/+43jh7c7+XS6WS6rm7ml7/8
+5c997vOcc8/zgtzKq1g46SpXd0XEfP5iQ0PDN7/5zeee+5WUHoG3ZNmSxz/7ux966GFNj5041XTg
+6L5YODK9uqa2ZpoVMg2hRaNhIYSuvwPXKwV8Kj7WsaPtAOD6fjqdTafT/SOZ0UTKcRzH9zNZGxEZ
+UjKZPH54/69ffWWov195uVwmu379zU888cTdd98NwIKjQkGyxVUsFHaViy0G3JEXCIODg3//D//4
+7z/8YVdnOwBUVZXdcuumRz/z6WXLVwwn7DNnzgwNDZWXl5eXlulCmLphGSYXKqhLzDk3DEPTeL6B
+9xJMz18oIM+Vtud6nrQdN53OjibT2WzWCFkEqJTyPI9IJUeGjx4+uH/f3hNH30om077vm1boox9+
++IknnrjuujmgSAEFmWsT1/T4ua0romtS3RUmJORIgO1bt//zP/7z66/+Omungam62dNv2bT+9jt+
+57p580wr1D84YNtuSDPChqkxrukqH1wNiqIHao2zsVpCAU2YBkbjxdXzJdaJyAd0bNd1famACD0J
+iJwLAcxTSmWz2ba2thNHDh458NbphhMDfT1IoBt87YZbfu/zX9x0+52hkKYkcYZjR9knZEpdNg1T
+pmsFfZ4CBunt7X3++eefeuqpY8eO5XI5IqqpLFm7bv36jRuumzu/qKQCmfBJ6bqhcz0QWUEWWzBI
+z/OC6FWg7vIGDCJyxfLOgwB0zjnnPMOAiECqvIYMCr8mBzvPnTt37kzz4SMHTzc2ZTIZhhAOW0uX
+Xf/II4/cd999QZEqmlIu36TomkMPAHkd1dLSsnPnzpdeemn37t1Dg4MAEC+IzZw5a+asutn1c2fP
+ri8uKSkuLA6KGAdqI7iDUipvB+f5OnhLCO9o7fjkB2WmM8lUb29vX19fZ2dna2trW+v5CxcujA4N
+K+UxZDNn1m7csGHDhg03r9tQUVGh63pw86kdj5oUvR/QBxTgyBjr6ek5dOjQ66+9umfvW01NTQFH
+CyGKi4sLC4vLystnzZpVV1dXUFBgmqZpmrFYLB6Pa2ZICMEm1M4Krv3x0E1AQVHpZDKZGRlIJBKD
+/QPt7e0XLlzo6+tLpVLZbBaAabpeVla2cMG8m2++ed26tYsWLiwoLLyYkfB+0fsB/WUVFWEs9g29
+vb2nTp04cujw8ePHT58+3dXdkclkHNdHRM65aZpBCfSgHHokGtd13TRNwzDyWdpEpBCCaHBwhiud
+To+MjCSTSSeT9D0vl8spBZrGQ6FQRUXFzJkzZ82Zd/3111+/fGltbW0kEmGMIRIQAY6dvwgE2rud
+M7mKdM2hz6/Zy9xbUlIQOfFdz/f9/oHe5qbTHR0d7d1dLS0t+TNWQYF0z/MkAb3dITzuf544CsMw
+dF03DKO4uLimpua6666rr6+vrq6uq6urnz3HCJmapgUZapch+z7I90v6/r5Bn6cJiwCIJGccICgC
+F1STYOl0OpFIDA0NDQwMBNIjmUwODw9ns9l0Oh08uMHzvLE7K9I0bWxlRCIFBQVB2YaS8op4PF5Z
+WVlcXMzGjtYCESh1Me07zweX8fjVsmH+c3qfoB8zEC8dT35WJgqiicz49g/QpQQAGh+3r/MOxeAr
+SETEkOGE21JwxhYAaPzRQJf2J2jrsuMP1wAVgPdH1l/mchm/zkuPsedejH86OIhysSqcUsDYOxdY
+IiJJKlg3AEAwhiwBIb0tIBOccSGWf6vG3TvviO+15v1JQ+8AMB80BEAFOP5QAx9AXILLZfxyGfpE
+NAajQh8xqASoIXDyFAoGOJbkjuMcCuAjQ+AEIBUIBkjAglO5oADZWF0c8gFQIvcA3v3IgQeAEsRY
+mAUAFAgGKniMkOejJjwChsDBA99zhaWDD74LjBMzPAAGioOHcKU1jScNvaukzjiQAiAJpJAzQD6V
+JAM7iHiAIggeFwYcGPOD53SNfyhfFgrJGc/sRyIgIsY5EMnAvaPkWNQOGSgJiITvvNFH8Mce9AAw
+1usgq5tpnCAoTO8jSADwweDgIWjgj3USBFFQjkEC/w04EjwAkD4xoUsAGSSjKeAwoU7iBG69eJ1f
+BEQA4DINAQQAEgBJYEjAPACd8jVrx5UjjIWpQIGiwC4ad40BSGAwLreDaRAAAArUO8cgiWkwpnIp
+H5+XACJo15NACnSdkBMBA/ARmALygXMgDpIAERgo/E0UUfcAEIBJYAHPcCAEoEl2BQlAqaDEC3Au
+AQiUIldHE8Zhzc+XIuABviQBg/xBlEoCcg5KkQjkFyMK+BUQ6N38/hTM5njsEBkRKkJikgMPUnGk
+8oBxAiEVaOiwsSqBOF5L+urQ5KFXRIiAoBQwUsgAQIFSwCaZ2I4OAJcgFAASEAAjYAxQecA4AAvq
+mDI2pjcVuAEERCglcSGCnOeAW33fA9RQjHE8Q3q38sgSAYJHHl7UOkGFZmAXDR8PpAdcBxAEwW6C
+ERADYEFPr0Z1vMlDTzAmJpViyIBAKRmcaJjkfWxCMyfB4MDJB/KAQAFjnAezoMYBAvIAyEfhSalx
+MVaKS/pBBTyPaRp6oHxAplB3JRockHx4F1kPMgcAwDTAsVYIgAiEUsCYApAKdA6gJAAHguCRCBP0
+j5IE9J+ch3vPNGnopQ9MgCKfI4BCRdzjMGyDJbMTTy2/o0Wc/yMicqGbDIByQJBzPId0HjIVSeHm
+iNAj4EwTHMmzNUa6aYBSwIQH2mjGCYUMz5M6A6ZklumKgDPw00lLyEg06kiW8VFTzjv2nxAIOTCG
+wAWHEAMkD3wHuEonPbSKfQVIrsYUKSTUpcqCMIlxVDIikKECF0AIuGLBM+nJ4xwIfAIfgBOiYtCV
+lD/f/OvdAwWBtzYPPbxLQlIwPQsqxb1Lam6sjY/Y+G9vtG8/PcJ1M6QcX2OATAZJv0qCdEsLwnXT
+p39ukW4Who61209ufmPI1x1moNA9JUtVOq0VjmZVISU+dfuiBXXi2R2n3mgeZsY7HyZ2uUAlNVCF
+OsyrjKy5rnJJTWFUw1f72M9f3jns6qSHSHkaJ8cjRIOUQAZCZqfF6dYl09fNq4kZioP/XmLI/zlN
+pborgmDIgUghE6DITj1zQT92qhsjRQgSmFRMoPRMsqXiLjcYY8p2haH7TIKXBdMEx37epeeOdH/7
+Y/W3Xle5rTn52qGhkKlsYUthgmcAR0BbSOkjAxjWvNbGm0q+/fE1jpP455MIlAY1Cnpcyw17RiGk
+2ist+Myds/Qi/U+fPfDsviE7pyiUAYm6n/V0IBVhjCvmGDnmaMjRY37W4xFgfbXRs5+/f+UfrS3G
+0dEnT3ZBokTqCTSFNZLKxAVQDCiLnk5ggBp69nDv/32v96W1NahfBWU7lUzjy2/BmBCChRlEAKJM
+gQvEiOs5BLcgxCK+0hTGIn6gzPQQeKBZFSJe1dhmf39rx/FhESssVMp3SZcQQ2dU+BkmFfeQeSj0
+KIvEyTCf2dv1+rHzyKXBEXLhmB+DrOsZEXD6V8wo+ofP3nDXivK//2XD03tGcwQsZgLzIGyyaBys
+MBhCoQcy62rIwJFoeKEisOKgWW0j7pOvHjzYNhI2YtIpkGgC+JQGpRUwRXomC0ogSiOERiTWm+I/
+3tH01oUR/2ok0Uy+MsjbJHgQR1XkAUgiWRaRxXqOk8qhuACcO6QQkMkyyyvSfADozagRpUxMKcM4
+3I4t7aNLy2T/Qo1bkNQwDNOYqymlNE6+D01Ddm/OVlYUoHDnqaGPrqJFVV7vqB0VUKJoGNmdFWW/
+/+FlgwPJL37v4OEBzmI687I6wJq68LEBOZohAgGoqqIqrBH3XQPsnLCG0pmhnI2hGFnFDX1Dzx4e
+/MgKcev8uPRkSGeOMlFpHqJJEVe4w1n7ZNcQ8DhYpQ1DfU1DQ8shLq54NzvlKlA4tgDGJ4JpYeUJ
+Jt2Hb53z4IqaEKrOBHzzhdOHEh6gpvv2IxtrH1xdl3OdXWeGv/VKs01g6NZokiKZka9tmPGZlTMU
+Or4mXBfC3JTKNiwxlOV//1rDD9487zohpWggE1oyrep/PVKQhRB5frGGnovFxfhi48A3n2seTIV4
+VEo7W6TDE7dXr5xd9RcvNu0bSgMXTPgfWlH3wA2Vus8lOBJFa8/Qv+y8cLDLBk2AHtt6euS/rbJ+
+9PkbyWeuk0PDEL6rSZJCC4E8PJD7i2eOnGzLpXzBSR8e8fQrxn3q0E+kQKkqH5EjI5pXHl1fGwbl
+zi0P/ySiDtk+i1rkJBeWWzdVm0BGga79dE/ruYTm5tKGyaFIdOrui0e7zranPWZ5CCEUnps0NU/o
+4eODKTekkyTIplylFWhsTU0UeEgpxdAbznh//nzDv+7udY0otxzpsepC/pU7Zn9x3dzW/lHXySgJ
+YBncS9cX8VtqLVSMmIXkQt20oRw1vticUQxAjSYzKdSTQ7k3j3V0DErPjIDyLfQzyikC1c9YiwMZ
+IZHZOgNJroAcwNRrgkwR+olW4yWyhwGh65OXs20CDVFLu86ISjLNU+Q5CmzpATEkKGZMcxV4CYP5
+BdGiE13e5uOnf7K9PelEABKoD5JnANMQXI1AhSMqFDV8l0zu+qRYCJjngW0zfVdL4u9ebNpx3AOL
+gZGTObqxSv+ze2bcvbRGEQz4bJC4EgpReeR7ykHwfRACuFScM3duVdwSKuMCcmag+4MT2a0Hzx1v
+6dFEyIcISQ80B6RCv5BjQsbCnDGf/IyLwCrADcEUj0ZfAfRjEwB0uchHxjlK0D1iHgBDcACVbqFy
+AAg0TogegI7geZ5DCILbLJSS+nOHe88OyqSyoFBnNKyUCVoYUADTQfk+KlCOJ0Bl3JAV8x0ATfcA
+nj/Y9g/PHjs0UKZZPiD3ks4DS4v+9sML6gtLQAGyFOMGaiZQFnwPUFPcAtAUE64ExhkoxYXJuAZK
+gmBDLjyzs6tjyEezhiCnO67GwUaNmCEtZGD4YPoMgLngucwEuApPBJuqmg1k/SX/8JALriTXUXHw
+FSidlLCFVDoAB+VpKqOjB8B94UuTiQz5xKSU57oTSVXMQrouM7OrCx5fVhELFWZ8G4VPPLK1efDV
+k51+TgMiz0+bEfKl/P5LJ/9hT297lkF0xPMxpulf2Vj93++bbQjDRkAEA0zTHQ1JW5eSkW5jSIAB
+HugMiANIBQy6h1NJVyJXpMQQjw6nbIx56HrE1V1rKjbNKFJKEQjB07lc5N/e6Dkz6ANXDEA6aYkO
+f//VrATg5CtgjBRD5gPzgcW9Aa5KfOLEHMmJAXFiKF3FJXKBylOgS7BAcUBmE1PCFr7rR4QimVZR
+5I4C8mz/lpm1n715pqZ5nqhgjm8KCTK7+ZCrUAOKGDo2jgz/69YL398xBIYFAkRusK4s/id3zFi/
+MNbp+N6IQg4++pWRiK0LBmGXpQHTDLEtkW3MuYadzoER1ZzDHcl/29OW4yaorAY+sLDQUbqSuUbU
+ZA8unv2RRWHXdS0Z9ky3P+u/0NTe2E9cC3mUMcgM/LXvN/SBQcsRgDyQSqFu6+EhvUaaF5goQkc3
+3LDykGukhJCgEx8gjIAURCFgDAhMsqx0mLQw+NIjhxmclARNl5I/d6J9OJ3VdZYjzSAZZs7RPod4
+RAcizLQMF33xPy7sO9PBhYXplI+4tj76Vx9e2TeYe+xfTzWlqUzntqulsumHbqx4dH1FWCR0HxiL
+2Sz7k31tm08OeZ5valrasdO2M5rJgh4CLaSc5Ib5Jb39VkNnDxiaLfy/23bi9YMibOks4yg0JGaa
++5Jg6lJxIEOB1MGH95/rleczTdgAHEI6Ax2V4bumPwpuTOkStIytJYFVAQnFfZslwY+ApoOZy+op
+F5IamgpdycHBEfCMsqLiaTFsae0ctn0IsU5PPnVgEIQAXwL6CD6BAboJYHsh/XRvL3OlrxcCSEtL
+PLxy2hdur93TnPn+ltMtCQDN60cXbRnycy3Dds4NCx520QMEEG5fLtuXtQUYvt8HWpQB6sJwlAYJ
+d3YJ+9LqimcPdDecHsUICAaNZzPns2aWIdM1KW1TODazwCRw0gZ3ffTID7+bd+4aQs8FA+lqXBdM
+ga9AMCmlk7ONIVQe94RUDgFxkABJ0tMsOpL2cp7NHJbzdOAA5Lq2nUvxpJKopXDg9vV1I1VV//56
+m0yHGYu4xjDaKBB99BRwQGJ21sMseIZyPEJNV2TIxGfuqr9/9eKnX9n/vTd7kElAHRkjcIhiWVtJ
+ZB6SzPqQTAOaGtM1n+eYYr5Ew6Ccp3zfIWKmqorZv7tx5j1zNS5n7W5sPz8gPY+BY3JukkpJ8EAI
+W7rgcQROKeFKO01uToB1pchPxcJhgMABxkoKA8SFu2ZOkTBZNKplMok5pTrnoBTEY2LFnBLFw+GI
+n8kOzy4SQGGXoDCmrVpidgw6UdPUvMy9C4yyNYuj0VhTZ3/KQU2UM59zBpK5nuIEJgefIGww3+em
+J0nYyXtWL7rj+qodhxr3D7Db5pVECyDroI8GMo+DjhlxY5VWg2rljKimMy+KmmKG0mzuGcQ8UgCM
+K1ZoavWFYvWs2B0r6oDkbQvcP/vkgl1HuzsHMoBR7rs+jwJYwssiGp4Ry6qscPUoj1xXGjIkwRU/
+s2/STmMiQPBdFIEfm3s+17xGNxRRWd1ViiLlLA0h4QvToNGeUcvRfVMq4JEy7vucKw1NmetLG4xn
+kEzPyZVGpNAshxvpnK2ULyVoXLgSBPM05Tqko9AF5TywyOe+cpmuKiOMPNk9Spqy42G9RzJhRQwv
+R75DwrI9MsJmJQ60ObrO4lxl0U2HoSCpCQcyER9BC2VdP2QIy+A6Aw88ArB83xcaKBxM57ihMS/t
+IQkvqnRHuNJjhZIyuq5SHo8bVCR0uOJnXP9v1i4/ozro/n4AAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_mercedes" model="fleet.vehicle.model.brand">
+      	<field name="name">Mercedes</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAtOElEQVR4nO1953McSXbne5lZVe0b
+aAc0Gt4RAEHQgKDnkON2OLO7M+ullTZW0t3Fxf0T9+3uy32TIjZWipC51Y5WWqs1Y3dmOIZD7z1B
+eMK3QXtTJjPvQzV6QM6slgDBpU6aFwxGswlUZf3q1cv3fs8USinhc3kSQp70Av7zyufQPzH5HPon
+Jp9D/8Tkc+ifmLAnvYAH5XF7XIj4WI//8PK51j8x+cNpva3OttJJKQE5AEigEpAAoAQhgBBARAkg
+pCAIACCBc851o5LOVIQQnHNpcVVVCSEEJeecIzNNkwISAqqieDwuj8uNhIAEEKuqJQEoSDARAECR
+EhABJACAkBYh9vIo/GGfCXxiIZUEkAAEJIBhWEwBigBSCJCIRDescslcyeRz+TIipZQiIiIKIVSV
+gZTFYpExRil1qFipVAQCSLTsW2NZJpcNIXcwVK9piltzAKAUhBAiOBAKACAlBwBEClC95Ws14w8j
+fyDoHzgLIlahBw4AQBAATAn5YqmQ4+VyuVTMU4pel1vVmGWZ5WJJ6CVd1xOJBKU0n89PTk5qjDY3
+NwcigUrZYKrm8Hg1h4upGlJGiVI29FwuA8j9Xmeg3h8JhpwONwJwzim18RUAREqUwn5I/iNCL6WU
+UtpqW/tSl1xFROAgATgspfLxbFlSBxXg9bodChazqfjSTHJ5Pptazuez+XweEYvFIiFECCGlJISo
+qkqRARBVVR1Ot6KpTqdLcWhOh9sditbXB71efyFfKpbyQlhOl9rcFIkEwwAgUAphAAAlCgKxTKDs
+PyL0NbHvQfUzAS6kEJBOZ5fjKYVp/voQIuZXJpYXl2ZmZpLLcdMwgAtd1yuVik6JZQlKqWVZlmXF
+YrFK2chms04q6rw+KQUIiUR6XG6Px+X3esuiglR1OHyRxvZwOObx+SuGMT097Xc5m5qjjU1BiQBg
+IUgCaKs//AeD3tZ3ALBVFREJIQAgLBlP55dSWVAdkXC9NApTty5PjV7n5Wy5YuimLOlmtlgpVkzK
+HG6fP1wX8Pp9TU1NPp/f4/FoqvODEx8tLy8Pj+xuamzIZdLZzEo2vVIq5IqFnF4qOTWsC9RpTocA
+QKK4PPXtHVs6u3pTy6l0NmNYeqy1qTnWREBUKkWnpklQ4A8L/R/Cw6ntYDbolmVVKpWZuQQhrDEU
+MC392qkPp8duSKOgEZHJi3giXSgVnR5PtKW5rbOrMdYUjkSi3nqvzweUWIbFNI3r1vF3i/mVeEND
+ePuOrVXjbYlsNptKxpPJZHw+cW92MpFOqxp6vC5C4eb1k3duntu2fU9nV6vOYXxicnZusW9Ld6jO
+D9L8A+DwgPzhtllboQzDiMfjiUQi1DXAuH736rk7l885EFTVObeYWkykKpqzpbl5aGiwt6s7Eg57
+XG6KBCgACgESAQEIB5nN5n/yk58kEomn9uw6+vTTQBBW3RUkBACKFdM0rPnZ2YnRsdmZ6XIpE6jz
++rzOojAV1bVtx96e3v75ueXpqYmmSGigv1fi/+e23oZYSo6InHNKKQBISRBACL1s8Bujc+GGSNDv
+vHf91KnTZ4BQzeldXFqeX0wommOgf3DX8FB7e3swGKwdUwhR8ywJIbZXfm96ZmZi/O7YHXcg9Eff
++iMhBUEiV3+y9ov2npxIJCYmJsbHx5eXl8Ne4nS4SmUeikQPPPW04nbfnhjLFguHt+3SXKqFQEFQ
+4CARgHEEuono3C+bCX0Na85NSql9G7hFkHECMhnPLyQzddEIGoWzb785PTNeF6hPZ/MzM7PM4do2
+tGNkZG9nV5fTodoHWQVa2s5M7SxCAAF549q1Sqn4wfF3/dGm73znO6qqEiRrNXbtHmP/+srKyvz8
+/KULl+NLc+FIQEpeLpcPHDrSN7Bjfml5/NatXSO760MBEJwhgCWAKaLq9z4W2UxbX4PMDlWklEII
+yQgFOTExk9Sxs7MzOXnttZ/+yOCW6vDdvD1ucd43OHTkyJHeLf2KpqIdZq6BG7GqHLbuV78XMDk5
+3tHemslkmM9vmqZDc+AauB8QG/1AIOD1ehtbuiYn7l48+7FRLjg19f2337w3NvHSi1+KHNxz7vzF
+puZY35Y+kACMAoIQJkFlEyFaK5sGfe2ypZSUUs45pQwAuDTujs9zxdPV03Dpg9c/+sWPmOpaQbU8
+u9LS1vbss8/uHN7lcrkESCEEJdSG6RO+YQ36tQfUMIz52bmuttZ0KuUKhPRyxefxfuK2rsYQQggA
+qDpUQhBCFEWpr1N2D+/o7eq8dP7C6M0bpaJ+9crF5aXZl7/17YMH9pw5e76QK+7aOUwISCno49P5
+TaTPbICEELapsS9bCDE3vaBrjmA0/M4///3rP/hrHcRCoVjO64effua7f/4XBw8fcrlcUkoEpIQa
+plGzLTVn1BayKsLi2XSqWMpz00zEl1ZWVrLZLNyv8vZtqIFuPytCCMuyGFhE8jqv59nnnnn+xWPN
+7V1UdU/PLb366quT42NHDx8oFfK3bt3hEpAQCWKz8Pm0bCZzWXMfOeeKoliWWFhY4kzrjEV/84Pv
+f/jaTzSHM12h7kDTd//sT77xjW+0t7cKAaZpAgBICVJqigprgLNtvRDCvpE1vV5eXi4XCqVywTAq
+xXyhmC+AfHAlNZW3l2TfGMYYCIaASIWAcs+Wjq9+82u79h5yuCLxePIn//LjixfOHDl6KJPLnDx9
+3jQ5eZzM7qYd2rIsGxrOuW3rZ2ZmstlsJNrw4+//1dWP3lM9nhXOOru2/sV3/sveQ0dcLodlWYSA
+oiiIiIAgJMgH2Z5aFCal5JwDAGG4tDhfqVT0coURUiwWS6USABD8BGK4X+Uf4DCkIEIKRCZAen2+
+o08/9dKXXmwIRrmp/+pnP7t49tSePbtXMukbt0bFY1T6zYOeMQarhp5SjMeTt27d0jTtF3/71+fP
+vu+q8wHx7dyx79t/+q1t2wcQKICgFKXkAMLWWVzdV2u2C1YRtL9njNk/mUqlCKCUvFKp5HK5YrEI
+n/LT1tqc+75HQAqIKgeFS1WCdDjI8O7+r3716+1tnUzBf/zh31++cvGFF74wPT09Ojq2Wfh8WjYN
+epuGBUQhIZ3O/upn/+xj+p0zb184+b7TVZepYOeOnV/85jdaO7qkxRUQAASRIlIAAgif/AH7MLgW
+dADgUgBYFkK5IgpLsw6oCAGc80qpkM1mK5YhEUDYMRfINcHRAx/sfyEAA2AgURIpqZSsozf2/Je/
+467vsPKp3/zge0tTYyOH9p+9cefeQhoAQAiwTA5gSLAAwP7r0WQzt1lLcABAIX7zix/fvnpp/t7s
+yTMXFLc3WyxuHdr+9a9+NRZtEpYglILgGzg+AEiAUqmUTCYBoFzWCSFGRc/lcrqu26zvp9X/YYWz
+ltbAK1/7enPHjtHR2//yj99TOd+5c+fHJz/K54uAIAmiBGo/sHzd6/+0bKatJ5RJCRfOnvzgjV93
+NjfOzs6WLVIW2N478IUXXmyJNVMAhREhLWDrDhKre4CEQj6bSsZVRk3TFByEaWUyGcMwAB4t/hGA
+YLZ3tX3pG3/evWXo9tVTb/zsB52t7bFY46nTpy3LRMIQ7R8DgpvglG8a9JQqBCCZSL72y18M9HQw
+IlKZtAFM8fpf/urXenq2CA4ogHNOCOFy3fsXAQISECGViJdKBafTqTmcppCWaeYyGcMwENZspA+n
++vfFXwwtg0gp+rZ1ffkb363zR0599NaFE8cP7N9rmJXR8QnD5ABACYCQsBlUz+Y5T4iGrr/9+i+l
+WYnFYtMzs4YpDS6ef+HYlv6taNtzArhh2gIBACjAwuI9bumUUo/HwwUaFT2bzhSLRQ5SrPqYDw9M
+LW4wERhSBQCBDx848MxL3zR0+drPfpBcmh8ZGbl6/WY8tVLbRjbF3d9Mv3X05rWbl853trbenZgu
+C7Vswe7du48cfoohQQCJAgAIo1Ii3cADa1+tlEsL8wpFJBIJs7hEIcuFYj6bq2o9QdjQ3UUAUAQI
+iVwoGh459kpP/975ufFf/vTHkWCgpaXt5s2bliWkECAlfMpx2oBsGvTZbP79d9+OhXy5bDpVMErg
+DDa2PPfss25FYQSl5IQAoIA18c66REoAKXW9HF9aZIwxxnRdlxIRoFwuZzIZWaWUAWAj9oAIIaTF
+AShRCMj6QN1LX/sWcwSOv/XG1UuXR3bvmZtfmJyaQgpcmHIz+IVNg/769evJpSW/27mwsJAtG8zp
+3XPgUFdHOyEIwkJEsWqBOed2+LO+hRIAgHK5vLKyAiAYY4ZhMMYsyyqVSrlcTgjxKE4OQRNRNVGC
+NNFkADA4PHDg6MuZleS//vwXpmn29vZevnzZNAzKmLUZbO+6IeB2GYewAECu+rd6sXDto3di0ehM
+srSU091uraMlcGDvDkEJEAKUARACFIGATXCuX2sEACfK/PSSYmSl5AK0UilJpCAMTVPPZDKcSwTb
+2myICUcNpFSBAFEkAwSggnz55WOtbSOnzp/68OTb27cPFXLFhZm0FIRg8b488+qHdT3N64Ze2qEP
+IdWwXgIIefXKpXQmaZr64vKS6nQ6Pd59+w4Eg8FNZ0Di8SW9XGFMtYQol3UAACELhUIul9NL5eoP
+4UaSTWJNmsWGlVIajUa/+OVj5XLlvbd+K7jZ1dNz+fo1kwMA+8y7u67zrhuc2rFXiVywjMrlCxe8
+bq1YLBTLJcXpirV09A8MUiTAN40EQQQEuby0YFmWqqoSoVzWiRSMsVKplM/nK5WKvTa5IeZlLeVg
+U0YAwBg78MyhrVu2z4xNXLlwdnD78HI6vRhf4BapUdm2bKCCav02d/VUjDEpAUEsLswtzs24XI54
+PK5oTqa6duwaqa8PgF3St0kiQQqLZ5JLBAEIA0osUwAKlTJuGaVivlQurC5NbsTgAMAai1EjTSNN
+kcOHj3DdeP/4u06nFoqGr16/olKlxjXB2mrG9cgGDI6U1aJFkBIIkssXzylE5ot6tlh0OF1NTc2D
+g4PUDlc3I+CuST5fzKQTRALnkikKUxyScwCwLKtQKNjmHgBqmZYNCK2uew1jCnL//gPBQHj+3uyN
+69c72pvn7s1m00W4H/G1d+IhZQMGB20f26Z89VLh9vXr9X732ORsoaSbQm7btjUY9NnL3xT/1xYJ
+mEokC9kkJYQLqTkdTqebgAApCGApXyjmC9WzPXJqqab7QggpZHdf57Zdu3RdP3fy/Vx8sZTLTkyO
+P3pOeyO2/pMHDWBsbLSQywC3RqfumRaJhBu3DvRRACmEAL65SeVUPFEu5hkjiJQxRqkihGXreD6f
+z+VyNTUUsO6nzc4H1Jjq2nNDgUqEHbuHCVEX742d/fD4zNjE7NyEaZqfTgU/Xltfy4cwxqSUt2/f
+RoREIr64uEKYsrW/vyESksIiBAgh1voZyt8lQopMJqPrZYYEES0pOOdcmIwxlDKbzWazWdM0q/Ug
+6/deEZFSunaztdOKCGBxo29wW30wzI3y4vTkxJ3x8fFRG/q1mKxX1m8QBAIAMGoAIOfzt645Gb0x
+OceRNDa3tHV1qpoTCbG1h5GNpPMfcJmrFQmcLE5eVBhyxUWRMAGZQlJIVaJghIJhVXKlSkm3i4Y3
+zhStEVyl9hVJInV1vf0DKwXBFK1SzMyMzy8txcma3M7qLz1Ov952WiggSogvL9heXXIlHQgEIpFI
+Y2OjvaBPp4ceUh7I59U+GwbPZDJ2ob1lWbDqiQsES1iGaeaLuVKlLBEkglg/M/q7FwRAkDLW0dHB
+VJUpREqeSCSSySTn/IFSiXXJ+gGS1UidIMzNzRZLed0wUslsMBhsbGwMhULwicu/kQWtrR2rnlBK
+KWU2nVqOLyKiBLCrgk3TFEKg4JqmCWktxeO6YQgAU5pyE7d3BAkSEDq6uzRNA0KYpiaSydnZWdM0
+VzNfnwRiD3/k9S+RAEhiu+xLC3O6Xi6VKoWSHggEwuGww+GANfvwBqR22x5Q/MzKilGuMMYQKVWY
+kKhXTCEEoxQkN3WjXCzmcxkESZEKbmzs7J8hWF1SQ0OD1+fmwnS5HPlcZmFhoVwu23Db6v9A8v33
+yoa0A1FyIYEnEotS8nQuS5mjrq4uGo0qStW4rxaLrfvYa91kWC1hA4D5uXucWwBgWRYg5Zyb3KKI
+kgvgABbPr2QKmSyRSKRUyGaWSiIigHC7ndFoVJiW1+3U9fLy8nImk7HXaZtBWOeDvgEPx14N5aaV
+zaSZgiuptOb0eTyehoaGB06/Aehrm4StTZxz+6rmZ2fQDjKRICKlCgBwbpqWUB2OUsXIl8rlkg4A
+CBTk5tfPMMSWpihB8Ht9CsW5ubmZmRld1zf8fK87ZWH33hEC5bKRTqcQZTqbcbqidXV1Pp8PqiV2
+sLrZbmxVtXOhHV6aplmpVChFxpjkVAjh8rg1TbMsy5RAEXfu3dvY3LKYSBqGYAohuGlaX/VypASA
+SDhMKfW4nJqimqaZyWRsvuHT1Q8PIxtK70oAgFK5kMtnGCGcS7+/PhAIOByOqi+MEuCTIu/1Hfv+
+0mIpZbFYjMfjPp/P6/W6XC7D0qSULS0txQqPRCItA32vfOXru/ft9/oCH3x04uK1K3t375LryRH+
+vvXYgEqC4PF4GBIOQgoej8cXFhYMw3A6nbWlAsiHB3/d0HMQFIgQoAJ6BTWII8+tIOVen5OxGp/3
++/3LWu01QDVXjigBgK9m/hEEIiZSmWSm4Klr+OI3vnW2seHS6Q+bm4Iul6u9vb2xrad1y+DAtkGX
+piG3VAWPHj5w5er1D0+cHdo1HPQwWLNzAKyms9d5TwQYFFQ7CRMMNgElUpQdLqWUS+eyacsyCHFX
+KVzb1j20bNQiEOBS2Kk+r9vDGPN4PHZ8+2kq9bMPsEoNAoC9TUmJUiKrWnkJyOYXE/GVTDQWU1Um
+KHnu2LFv/vGfRppi23cOB6OxULhh377dXJB8scI0pWJJRWV7RnbW+5wXT32QTCYty1pbcrzBC0Vi
+900DgNPppJQyxkKhUK2Us3aN6+Xs1q31AgRFgghCCC4lIaSpqSkWa3U4HLimGvv3rqPmja29PYgI
+EhCRUDo6eU8ijba0Fsslt9utaQQAevoHejo6pLB++8abi8n0M194MdgY4RzKBjhV5ABUwo7B/rlZ
+18XLl7Zv3x4JhT8BhWzQBgICY0SA1DRNURTTEIQwxphNbdqhRvUUch11IuuGngEBUWUTbCmXy/ls
+Du4PRH8v+mu3JvuHJQAXQEHqhnV3atblq68P1+vlitfnpohgoybF3OzML3/x8xMnT0nKzp75+Lkv
+fGnfwUPhSFC3gCIIwRVCm9vbFY/v4sWLnZ2dfb1b7A5/u7t8vddrcaEQAADLMrgwDaNiGEatiWNt
+3IeI68rHb2ibRSAEqKJIBERMp9NuZ8FeRE2RH+bpq+Xk5KoBJgQyK7mF5Xgw0qS53MVixefSnAwJ
+CAoik1h667XfnDt1Uq+Ut27pVp0OIfHU8TduXDpz9PkXR/YfYowIQg0hVGThcPjo0aNnzpzJ5XIj
+w7sZY2t3l4cXRqs1tgpTylaxXC6DJF6PX03nVzvFpNwAXbeRbdayGKp2N59lWbYX51DUtff/IQ/1
+ABC6JXO5XDwej8ZiQJjgZsDrcFBAruvlwsnj77z//vsLs3OhYHBoaKi+vt7iXAjRGAouJ1K/+smr
+165efPYLL/Zs6QNKyqZwMOLQnIcOPnXu3LmPTpzct3evpinrsQdVERKQA1IJKHW9TCmVQDOJTM3a
+rHIJ1Yt/nAaHMRAgJVBK3V6PZRmqqtqV1rYltXUZqiv5N9S/OrfDLueqmCKVSmUymcaWNi6ExphC
+wUElAevahbO/+fW/Tk2M1tcHDxw44HZ7GGNAiaZpQghJzVCEBMOhxcX5v/3eX+3et+/p514IRxqw
+OneCHDy4/+bN2ydPnRrati0UCqz3egkSpACIEmQqlapUKtws3b07FoxGbTdhTc5ufeU564ZeSokS
+kAKlVNM009Q1RSmXy7lczk5Yr8X63zA7UojVgmssl/WF5bgQor29PW0It6Y5NGQAU6O33vjVz0dv
+Xg/43Qf3H/D667gkIAlQZlimxpjm0piTOHTdMssOTSlXKjcvn79z6+bhp58+ePAZh0OVEqWEgYF+
+RVFu3LjR0dHR1tay3ksGCUIKILJQKBiGoSmMMebz+TweT404qV3wwx91/dGspJLaH9ATCCdXckF/
+/cxsfCWZNiqmywUmtxSmcCkofhLpcS7tWTcAtTYPAcICSkvFyszCsscfcvjq0iaEPUIjMrkw+/5v
+Xz935qTKlKHtA6FQiFgqIEFhChAAFkUhLJ1ozKGonKClMK553G7hcQcSieTx37x558rl54692Ld1
+yJREAnT3drs9zps3b1bKRu+WLsTPmMUiV3vBYE3YYYGkaBIkEpSFmQk3hWKZFw0JTPHXBShVHvQX
+Htrsr3+bReBcUopOp9vnDyCZdjgcFq/Yil8X8CtMsRuI7dXYoFOKQgjTNFVVBZBCcARAqs4vr8RT
+mYZoE6WUWEajV5Wl4pvv/PbEe+8Qwfu6toRCAaKwYqnCmCktkARNgyeXk6mVDCHU4/c1RUJut9vh
+cFAhTNP0KC6nKxZpCN6bnf/BP/xg29COo889H2mIEoqxppjPGzh37pxuGlv7+7E6geiTJkWbt7Bd
+dVztuUWCBIllCcZgaWmBMSWfyBmGEYlEbLpw7c17zEQC2vOZkBClPtCgm9Lr91AG8Xg8k8k0i5Za
+AcjqxUgpq43eqqquro8BwsS9BV1iONbqcqoaATAKt86de+0XvygXC+2xpqbGKACYnBu6pTk9FbOU
+zmYTiVQ8mbFMGWmMRmOtTo93fmmcL3GPyx2OBP0eL6LkHFWHe8C7NZPJ3L11c/Lu6OEjT4/sP+Ry
+O71e54FDhy9cuHDy9Ondu3erCmWMcM4lF0A+qexYfVI5rj4dhECpmM+spBXNmSuVFEWpr6+PRqO1
+RNW6YdyIrQdOVinZcLTZFOD1ej0ubWlpKZPJWJalqKym8jVaQ0rBuaSUSlmlM2+MT7tcrob6ek1l
+1DIWpyfe/NVP702ONzc3D/R2IlKTW0iZLiFXKCWSc/PxJcuyvB5f3+DQ1oFtvX39wUBYCJFaWRwb
+H71z6/b4xIyqslAgGKjzqaoqBYSCdaH67QsLC+++/dqVq5eOPvvC0M4dmkYOHtxz/cbtkydP7t+/
+V5Oqony2s29bHgLCEpIRllpeKubSiuZIprJer9fv9wcCgbUc/XqroDbYHcE5R6Cxlg7mcBJGw6Hg
+SiYzOzu7R+y1K35rdb+1ON6+EkQolyvz8/Nud100HKCikluafef1X9+8ca2xsXH37j2aUy2Xy0ho
+UTcWl+eWE6lcqeTxeLq3DHV0dGzdurW5udnhdCKxORN0ezuiTa27hw8szs/dun1jemJ8aTnpcjrD
+4YDX7aQgW1qbmmKNE9Mzv/rlT85fOPvSl74SjTZsH+yf9rhPnDixa+fOhoYw5xLgk1bpmqGXUiJw
+ShQJsDA3UykWVF9dIp3pHGiLRqN1dXUPAP14DY7NEFECgFAfCtaFwtnkUktLa2kmNTU1lc1mI44w
+F5yS2hQ3KSXaI4QQMZfLLS8vNzRE3X5/IZ248PH7pz/4bb3ft3PboGQaUjWRyRYr+sT4VL5Q9tbV
+BxqihwYG+rcORCNtdXU+SkECcMlJdTfjQjCVUdXv8/kGurp6stns3bt3Rm/fvjs+7nE5Q4E6r9fr
+dGr9/f2ZTGZqZvb73/vL/fv3HzlypL2tRVPZ5StXOjs7e3q6EKiU0rIsxlgNdyEEEVwoCgiYGhvz
+ed0rmawgrL6+PhaLrXVvHjKKfCToJRAEASgBBFVpV3fviZnJzqaGvY3dADA9PR1pCNs/aesO50gp
+EUIwxhYWFvL5fHd3N+fmxY9+e/zdd4iwerZsdTqdJcPIZQrTM7OJXFZRtGhjbHhfz8DAQGdnu9fr
+VRQKQKSUFueUUkao7VBTyujq1kIQVIcSdoRCkUPDI3sW5mdGR0fv3LkzszjtdmiRQCAY8A0PbU1l
+8udPn7h14+rTzz63Y+fIU/XB85cuZ/OlnUP9Ni1jg2hZFqWUUmpPJsxm8zNTE6Fg/YWrt91eX0ND
+QzQa/Qxw1nMDNmJwpBCIAhAoYZ093e++bnLOn3322dHR0bm5uZ3DOxSmyNXeDkJsvw2npqYURent
+7b5x48abb76J6dn21g6qOfMl/dat8UQyKYQIBgKHDj/d1dXT29MXDocZW61s5pYgJiIyRuyvqpGw
+BKgV7iPaMRoiOBxqZ2dPa3vP7j2Hp6amxu7eXpieXF6Y93kckabo/pFd84vx13/9mxs3bj3z3LF9
+e/edO3f+3Llzu3btcjgca6ughBAEkXO4d+9eOrUSbGlYXF52eULNzc3hcPgh2apNhR4IIpNcUAI7
++voam2ITC4mjUjz17POvvfXO0nK6NRpElEIgJyARdN1avDcXCQTMUvbV7//l0vx0OFhnxHqnl5NL
+i2NlveL11w/t2L1121BbW1tTU6OiKLVHvlqxTRn5zKUiVNtuP+u/KJHhkD8c2rFtcEsymRwdHR0b
+G7s+eY8CdjW37ujbOr8w9y9/9zd92weff/HYjcmFE+cvjQxtr/O5gXMkhEtLEBCgqCBunf6oMRSa
+TSSoS2nrbIu2dvv9fjt6X+tWPvYsVTUrRggAOByO/v7+ycnJWzeuj+zZV1/vn5iabo1FQArCQAjg
+hplamHM78Pjx106fPFFXFyDMf2dqJZWf8vv9XT3dPX1btvT2NzXHXC4X1Fw6G71HaNSzLbXtgTid
+zpaWlmg0unv37rm5e6N3bs1MTJoV3efz+evr79wevXVn9AvHvtIcjly9enXLlp6GhjACUMkoCAtg
+aXH+3uyk16nkFsuxprZgMNjZ2fooRbW2bGCbBVgt/AMhqaoODw+/8cYbVy6e/fIrX9m+bdupM2d2
+bB+sdzsBZamYnbp1a35+/sz50+OTkw6XO1OykKhN0ZY9R57q6Ojo6enxeusAgXNuJ5EeqPX99OeH
+XedqXhdWs2CMsbq6ujqff+vAwPLy8u3btycnJ1cSyUrFQJQ//+Gr/dsGuwf6Lt+4tlVubQo3MECQ
+hDK4euWSxctAtbJuuT310Wi0vS26Ed7/ftmgc7kWiI6urq6enjvXLp0+9dHzL37l8tXrU9Ozddu2
+3Lx+7Vc//1m5kMyk86mVnL8+Emtrj7U0D2zd2r2l2+92KYpSZdCkJNXxUZLRz1D5jelX7YbdP0RK
+EMYaorGGaGxkX3F5cWl8bPTu7TuEZy5eOHP52uXWzval2fm9e/YM9PeBhEK2dP3qpbo6XzKVEqgA
+agMDg5Fw/YZgu082CH11vhZBIYTH633qqaeuXzx74oP3n//CS9u29l+9fjOzkvqXH/5DPpMMNwR9
+wYZdew8PDO6wh5opGpHAQTK76cnmu22DvTp3ddPk048LoVRK0DmnjDhcrvbOjraW1j3De2bm743e
+uXP39p3xG7dXVjIfH//gT777Z08/e+TquTPlfN4ddMdX0oZQGmNNAwMDdDOq2za0zVZny1X/BgIj
+e/fEWltv3rjx4Xu/ffHlr1y/fv3KtesHDz9FhB5t7e3u7mqMhhwqlYJLyUESlExWWUt8AJoHYsL1
+hogPyNrdzz6UZXBFYxqjq+layRSlPhTyhQO9vb3Zg4fu3hwdHR09c+HiP/3oh0WjNHbhdChQl0gl
+yxWuWzA4NNjYGAEpH73k4VHHztXU6qf//KO//v73tg8O/s//9b9Xcvo77x3fPzLc3dHq8HokByQ2
+3UgAiLDsCtJqXwriqmLaC8HPmOe0YYPzmb8rAYQUtn9CoFp7IgARkFsWo6xSLo+Pj09NTd2+fdtM
+z4bDDVdvjOYqen1j03/77/9jW38fbkaz0gZ/vzaWCVcbYp994VhfX9+N61c/fO/d9tZYZ2dnNl9w
+ez0InFIgSAiqQjIhCTACzAIARCAEUKLkAsR9yfG1af5HUfm1v1vNbABY3CKAKlMoSFx12IgABEDG
+DBTM5Rgc2rZjcFs+kQgH/el02jKlqrl37tzZ1d2GKKW1CZXMG4R+LWNn1/76AnUvf/s73vq6t1//
+1cLc4sG9I/HZiem5RcIpcoEShBSIgqBFgBO5plSIAFICBB+Yh/PIl/agVFN6AApl1ToUpIDUJlgl
+mBwABKjcZJJblnjttV+rpEIU90IibQAJNzaP7N7rUl2cS2T/niaDoCBH9wzv27evWC786P/+pVPD
+5p7Bi5fvlCp5ezYrSvvxYCAZgLpZ512vyDWD1dZ+iYQRAIJSAAGJ77/z1p2bV1pjTZMz0wBAGN09
+squ9vR1sF+Pf1XgKCqA5nC9/5asuv3f8xtl3X/v5zuFtFRNu3h3TubAEr5ascAAAaxOGKD2q1KqX
+Vu0SsReHVLl7d/wn//QPHdFQPp83LZ4vlHp6ekZGRtxup900sSlNqZvZ2ApIegaGjr3wJRD4y5/9
+060r11449vTo5Nzk1Cwh1ScUUVoW0Mc1tvP3y1pv576dYHXrWoiv/OOrPwz6XD6PI7GSKuuW2+d7
+5rkvxGIxBLvUZ3NaVjax+8IwCOWALz33paFdT6WWkr/8p++bxfjw8N6Ll28sLq1UF0wkUwTfvPa2
+jSz1/lItmwTlHJCwTDb/8ccf+1zazm2DExMT6XyxUNEPP/3M0NAQpWT1NRub0qq1ibaeSEOCEKB6
+fa9868+3Dg0vTo//6P9+LxaJDPZtuXj+fCFfsU9ncYOSxznF8KGlVtWMiJRCSRd3x6caAnVD/T23
+R+/oQNIFfcfwniNHn3E4NbvWUYKN/iacfRNbAKgTQSUACM3tbV/+oz/1R1rm7078/Md/39/b1tvb
+c/L06WQqa1rAqIq1OPZTsnnr+T1il+3VxmEWi/qtu1PhaHNrNHT90rlMrpDM6119gy9+8UvhSIO9
+LkopAgqxOTvVJg5bpFSWESwLgTA5NLzv6LFvBLyBe5M3X331b3u62zu7u0+cPJPNFqQkkj+x92HV
+4rUav2ZZVjabHRsba25rs4T8u7/5/sK9qXQmF4m1Pf/Slzu7uxHtUru14xM2YSWbNkR9bRBka5Nh
+GG+99dbklRO5kt4zMPS1b393JVu8ePFSd2fPlp5WBB0EEYIRinauHCkIaRBQ1lZtbqBU79MLu58B
+5ZwjJdSuepMAc0sr9+aT7QO9cnnqx9//Pwvzs7pWV1G8//XP/2LPjq3U4X40YH6nPJa3NkgpbVa5
+VCq988Yvz54969S0rs6eL77yiub2fXDybH0wvGvrllopQG1U/SddCGsT0xtlEdZup0IIlICE2DM1
+LOAUqFkxp2fmSpbVubVn9PzZn//j3xdSyyYQLdT0witfP3LwgEdTNnO6yf2ymdDbl1qrYbfhy5XK
+7731+uXTH7sYCYSCL7zy9ebuvo/PX+RFuXVwi8/vVChnhEqJCBQkCPiMemA7W73O5YgaI13jiKQQ
+QAiCACkT2eL47EI4HI74HR+//evjr/1MSiWZq3gjsVe+9cf7Dh50KoSJTd0N75fNNDhydVY5rBIj
+UkoLCRX8w7ffPPn+cUJBcbv3HX16/+Ej9+ayE2O3GxpCfVu6GAGUpDoPGj5RcyGsNTzMejEQgnOC
+zB6RYQ+5JgS4FKZuzcwsFrhobG+t5OMfv/bTayfeo5TGM3pDe//L3/z2yJ5dhIA9JmzzCY1V2Xyt
+h0+1ogFApVS+dOHCB8ffM62K06W0t7cefuFrbpd3/O54MrnS1dHW2tysqAiS2z2xQgi71EIIy65m
+eEjo12w59lxEO3SiSEBKMAyeiK/MJlO+UKClIXzzzAcfv/NGNpfMV0rpdLmzb+jlr3xrx44hSiwA
+LjiR9HeUR22GbKbW2zUUtZHeVbZECiBMIlgS7t6+887brxuFTDhYVyG0v39wx9A+3eBTUzO6UQyH
+A71bOumaiRZC2vXiAgHxIaBfey1V+nP1ASpVeCqVSiQSmi8cDgcL6eUzx1/LLkyAkHfnl5NFcfDw
+kWPHXmqNNVGQgAagAMm4VOi/f4Njm/i1WZTqf0gABMMyKVMIiEQ8fuL9D8bvjjU21UuBLrevs7uv
+pb1LN63F5Xg2m22LRYPBYDDoh9UXMwKArL4z7ffIfdeCKAQIhEKhtLQcLxbLXr8/EAjlCyvXz55Z
+uHvH6SAFvXTxxk2HO/TSi6/sObgnEgygBEAQwpLAKVEe7rQblM00OGutfO0GiGqNjACwpJQElXy2
+Mnpn/NxHrzOVuut8pgRF83R2bW2MdVLmWJ69o+u6pmmBQH0oFPB4PIDigbfv/C5Zey3JTN6ef6kb
+Zl1doD4YTqVSN2/fyt4+wzRmgbx5d3o+ntu+feTFY8/3belSHRQkSkGBggGAAEwIggI2Y3L0Z8oT
+e+npcjz58YkTd27d9Hvd9XU+aVlOhxqJhEKd2xhjhUJJ13VuSc651+uvr69vDDntcjBCiOQCCQHg
+tj0RnBOq6IYwLJ7O5tLZvGFY1OtlCKF6HxPmwsz49NjoSnxRcEOC+87Y3XhmpbW9bf/BwyPDww3h
+CGxij/NDyxOD3rIEITA/O3f23OnpiXFNVf1+n0pZRS/VBUL1gaDHF9BcXqo4TAsK5VKlUlBVlSJ6
+PB5NU+zCdsMwFEWz35lhR6dut9vubiWmkU6nlhbm5mfvlYt5RkixUEgm4/OLyZbO9l17RnbtHm6K
+tRK7mE4CPj6j/jvkyb3qt5Zl5OLevXuXLl+YmpoyDCMWcCuqA5FKIIrDoWpup9sbCoWY26dpCudc
+VVXTNE3dsPdzyhyUoeSW2+nIZdOFQi6TTqVSCT2VyGQyJpeMqbl8Pp5MSqSRSGR4eHj7zh3N7W2W
+kAJAIRQBQMjH+O6v3yFPUOvvi5IMk9uzNsbHbi8tLlKQXo/bwajKKAEhuahQTdM0p8Ph9XqlFOVy
+GREZYw7NXS6Xs+lUpVKu6CVhmaapl8pFSlhZNwqliiWky+NtaW0fHNre2zcQCwaRMVid9y2kkFww
+yv4TGZzVlxxLKSXY7ecAQkIul0sux2emJ+9NTmQzKa5X9HKJUNAcHs45Y9VX9ZimKSyuKAoIIYAo
+ipLN54BgpVIRAIioS2hsbIw1tbS0tXZ0dEWjUYfTBQBUSCAohOBSMMoAAB+BrngUeWLQr3k5pBQg
+V19tBAQsAAlIK5VKMrmSzmaWFuNzc3PJxblKpSKElc1mhRAKY9VpRxbnIB1OdyafC4YiXl9dU0tz
+Q2NTLNwQDof9dV5NUT+hYTivvatjLcnznwt6uD/oFULYfR3ALaDEfoeRBOAAhsEtzjOJ+MrKSjqd
+TqUSVb5XSM45YZRzrmpOVVWjzS1+vz8YDDqdKpMAAFJU6S9pWUgIECLsG7ymp/4Rq6w2LE8M+tV6
+JwAA+yWpAAAgLGAIwIVUVo0QgA2hKleHUyMFQ9ftTgRLAiJKLqo8qMWBUgAhQBAkEohd6S+A2G1G
+pKbfEnB1rtkTAP7Jav1/cnli2aLP5XPon5h8Dv0Tk8+hf2LyOfRPTP4fYP5PXFGekGAAAAAASUVO
+RK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_mg" model="fleet.vehicle.model.brand">
+      	<field name="name">Mg</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAA90UlEQVR4nO29ebRlZ3UfuL/pjHd8
+Y72aSzVpKM0SGhBIgABhC4wBx2nHjc1ylhOnO06yMvVy0nHGTsd2d9qOcYy9PDHYDAGDZQQIgZAA
+CQ1IaCgNNU+v6o13PNM37d1/nFdPBbG7XSWVlKyw/3h131t17z3n9+2zvz389v4YEcEP5fUQ/npf
+wP+48kPoXzf5IfSvm/wQ+tdNfgj96yY/hP51kx9C/7qJfH2/HhEZY4yx9b/UUQae/enP/hYAY8D+
+608g+MG4ZO2/ETHGCICArPfEQHBBwIL/vwt4zYS9jiHVubftnOOcc87BIwAAAyACVr8mYAy8+sH3
+EwCdfW7Xb2IdQw6A6J3jnDMpz3kTrQNd3/vrgju8vtDDX6z1bu1fAFzTfgAAJMXYX6z4f6Fw69YQ
+JwCPYB1wDlK+3s/5y/K6Qe+ck1ICgPfee6+UYoxZa6V6WbsJiNEa+sjcX/g55y4P+z6jFCIhIxKM
+M2BAAERAAPIvWDxE5Py13vZeN+gR1yA7V+udc9JLYOcYkLMvdDFCROeccw4RidbshhCCMSaEEEJI
+KZVSIARwrgMOAATIoQaV6lURZ+3MurX5H9HgeO+JSErpnOv3+2VZMsZ6XqLzxpiqyMpxXmSjsiyt
+Nh45ItaPSI0755wx5r0HgHqfqBegfj01FcVx3Oq0kyTxQN77MI7SNN3UmTrX1hPRa6/vtbxu0Hvv
+hRAAoLU+dOjQ4cOH8zwPw9C1U855IKRiwBkj78h5QgxlSGdl7dLPCpxVYThHiydYaLxDIlDCoC+t
+9kRCyd3bdjSbzW63K+XrbPVfZ1tvjFlaWlpeXl5ZWTlz5szi4mKSZ4HgoQqiIAgEFwiMEBFd2a9x
+92elNjs1guwcqZ+GHKasd5WzGnyJTsTh7KaNc5s2jkajTZs2XXLJJbOzs/V7123XaywXf+URtMEg
+4gBofRUIBQhgvWTUW13tEZdRxMdF9q2H1KmXrm+FgXNREodhCAXztaVnAhEFVojoCT14YoCcPCCC
+Z06uLwNjDBGttc65yFtrbVYUlWXK0GpmD2B4pjMx+b6/BkurPW92M7x8w2bQjAnMAt+ANY//ZTf3
+IstF13pbeBWLsqhUKKXko9Go1WoB8NXewAIiuvnnnjv20EMT1WhTOyqzVaUCInLeO+cYByYEEXm0
+wqVEhEAeyCMieET0QCETRIRnpd6HvfeuKrlAa422BSDznkxhtbaPjf2bfu6DU3v2tVhn7+5Lp3dM
+csDAWeSKiGobuL6KF3UBLr7BQSDrmRTAAAlIgAOYX1oKG5PjMyePfufB0f6nN3gzEXDHLARy0aha
+54TiKhAgyHtvneY24ZwDZww4cUaMrzkqJgOAddzXb4cblZWjSg+dG9s88+MMxiVWphepE0vVJbe8
+68r3/ZTtdKenWzddvjMATRQgYg392oX/9w89gkMQEhBAgOcwv9qvvGk4euIr95T7n96ViMlQVByK
+ZsOkqWlvjqIobYRhHApBxBDJIqL3Y85ljQUheEIiAuCx0ABwrt9Zuzq8SAd5v/Slc1Xe72fzK8sH
+TiweOdUUeXVGHxtQ+8533Pyhn2m3uqlS19x4defsruu9rzcMuMjovwbQawCFGnjITYHzS/NxIxiP
++0994qNi2Nui+EwajrHKOp1w76Xxlm3NZiyE4JJxAciIyHMOTEIUazgbDxFgbWSIPNiy3l299845
+a21t9/UgAykqhlleci8DExx/7ugTDz2+ev83N+3YsXhm5eTJ1W3vfPu+D/7Pk1v2tG1y7TVb2+12
+fcnr3tf6i4shF3+b5RwReSSdg8FwtSWgPHPqiQe+2jpzdMfGjaHgq6aEuQ3NPTual+zsbNySmJPe
+a4dUmxeovRfOi6Em8ho8A8/BIVr0GskB8Tqkqp1K7py31jkXx5kIlATPmRYQpipuRFsmZ4NHQHz3
+gW9MAt86nTx171f7ef6OD/0dMb310CGzbdu2qamp+hsvKui1XHTotTNCxrn1C/NnJqMA+/3vffVL
+5vihq/ZsXVoelmmL7bjEbpiY2rl9bsNk3jvpQ4OInEmGDC3XzqNHzplSm9Fbj5XgRgjDhfVUetTI
+2s65qrJwNrLlhJxcWUWgHeOupWJGRo+XCc3mreHVP/YWdHr/Nx8lwXbNTZ558OEvLgzf/y//0ZE8
+ra3WzMwM59xaW3/axUPmohscDy637tTiSitJRyeOP/nFz6fD5V3TXW4GFYVsZq5z1VXNy7aoABMz
+DtAOWMiYAJKVxtGwGIxKRAhUaE0KZKWwcUytpkgSkNIRuaxqjcfjwWBQVRVjTErJGCMiD23JbQBZ
+M9FTHcEhL7JV501Me+f7w2/f++3vfvw+OD22IVtgWTAZv/eXf31mZmbz5s27d+9utVqvgda/etB7
+QAAugAC1LZSQggsCMEa9dOTU9u0T8888/s2P/v4OpfZsmM3ywULabW/eMHnZ1nTrNI8FGKO0DTxq
+pcm1o4mdx46fPPqlL7cOH4sCGLTDidI61RDc0g3vUDumL9viMsQUqkxNPvqVY8XDj86xxTF4SYzG
+w4zFy9q0WGRzymW6+843bb15S698xutDk6ZrRBEEM4/fM/+Vj9xvVhdUapbyEibaH/hf/9GeN7+r
+V5ibr9m3cUPTOKKQhQDGmDpF8eom91+17RsBOAci0JUJZcx5YAgG4/LoqaVtW6dfeuzbT3zpz7c1
+Wxunp3P0VRDN7Ny2cff2uc2b2s1WJIM4jNJmI241kkYnnuhmo8H45OnUU6vbiVqNhgqDIFjf+qqq
+Kooiy7LRaOS8RfREngOr02dRFEVRNJcooLGPCm2Wv/bJT7z0lYev2Xrd7Ny1pMpWsqHKzTXv3HLn
+L755PNEcjNWOJKXV4ad/67ce/9q9k1PqG9/92omVE0HIZEUAsP7V51YXXjlirxr0TAAwcM5HYcRA
+GAPOif64mJtLlw49c+zb32j3Vy9pNwVQHspw9+50x0w822GxRGdAW47EGPOMG1JOiIVTJ4YvHIjG
+JQs4Sh4YV7s0AFDjG4ZhHMdJkgRSRUEopeQcOOecgBESUcNUjPJxfiqE3mQxePJTX/jqH3ypyXey
+mU2Lo1EcYlYd33nT1E/8g/djJzqZ5V2AqDd86JN/8uAXPtOdCR763rdOzh8TnJVluR40rN/sq2KL
+XkWnFa21Sglr68/lxw4d6TSa5fzBJ+75XLKytG96UthyzL3fON26ft/c5ZekcxMiFAJAAGME2vpc
+V0RxVpbjhfmk3285RCDPISIehqFSKgiCMAyDIKhf1xLHsao9HCRf+/dG68IlXHWUgsHSTOiwv/zn
+f/SZRz7zzdbmN09u34oinw5bs6F64+0zP/cvPqD27DIATRHkh498/fc+/twD3+7E6TcfeaIaYxzH
+dVKo/glnyzuvHK9XT+vBE3mPIAPo94tRr7el2zn57Pce/vjHmv3+Jd2uYKRj2bl8x9wNV0Y75ipm
+RuVoPB4ZY8A7tA4RZRBy0Vw9sVCdmm86HTJvnSPgnMA5Z4w519rWWDirgbxzFp0jQiLiNSxJa2l+
+GOogFdEgW220ZaiLez/yB5/91c915HYfblipXFn0hssv7bpq8j2/cFf7ip09XcyxTmMp/+Kv/d6h
+bz7TSTvfeOKpfr//Ayb+vzlbD0hBEDgAA5CXY5sN7NL8s1/6Yry6unNq0iMO40js3h7v3jZ9ySbw
+VQAQcBYGMgyVlJKIOJdxmJBV48OLdHoxBI3CM06CADkGQSClrLc7InLOaa1ra8A5J4/eW/LorfHe
+ozNjXRqmFlbKTAvLRaGLRBCurDz0q7/95Q8/2E6ub12yk8+22pNbXVm84y2b3/Gz777kDZeVVDZB
+NHrl537twyeeeS4v+s8+++zCwkJtc6y1AFCnd145YK8e9HrN0Lxw5GiYKCyHn/+9394A+tKNc4iu
+L0Hu3aku26tbKSuLeKWHo4zK0uvKGKOd9cA4AXgcDzRfGk1ZCkLmIoiCMBQKQmWttdbWGa71mpQQ
+QgimlACG5NGjtdYaY7TW/YUje669Yu7G68+Q6g2QFQQam93OBk6f/rXf+fyvfz4s53LdfGF+qT9c
+febbX7vkyqnbfvzmeGenAp2CiwarH/0P/6Y6/dLq6urCwsJ4POacr6f4/xuDXobo6OCxY41ua5wN
+H/zql5vcb2smRTlyHGYvu7x16d7kku3t2VlW6CZXzbTRTtM4jIRgKgziOJZSWm1On1jwK1nDg2eY
+kUbnvTbGu3MDHO99jW9ZlpzOchLOCiOPiIEb8YTd+hPv3Xf723TJVCHIsKEzY/AzDfvnv/Wf7/kP
+X5mW+7bs3NKYDefm9gyGh664edfdP/djNCUQignh46L3iQ//ymg0Onz48NGjR+u4ofbFX5Uyy/lD
+TwiARB7rZDoCWAALgPL06aWJRtSuhvs/98ng6IEbt87ofGmQbK527cbLNzWng5nh8lSvF7XEQksb
+nxWV9Y6TAZ0P8ipf1vK0mWwd/SaXq6sxR9HsYlNaZEjKywIogDzzmEgbccvCZlNxlU6HPPBhoIm4
+dpRVAFBqG2qU1q0OxLxuzb3l9r0//vYlzovcxkVVSscF2yzV1z/+sT/7jXumwzeHMzceZNl05k8d
+/LPpPeaun/+g37Kjj6rBourgiS/8q38sVvsvHF/99ounCwAG3uY5fL/Sn1s7u5jQMwAAxhhfewUg
+gQjP9IYyiUK09/3xx/LjR6/atfPU6SWedhq7JnddtmPb5GQspI2CQpB2fjZqc7lm4sMwVCoMgqib
+pnY8zHoDjhRI6b33hExwUAKkWMtH1plLovUcPQBwYPWv3ntrrTfWGLNaamY9Hw/6y8f33nbFm376
+7jxWowq7PCzLsQ69Cth9n/z0x/79bwaj+Oor7lxNVoS4vFhcvfU29VN/6wPR3Pax023V7J1a+e1f
++ZVg1M+XTz/1vecsSJWkXttzEa834fNF/0IMDhEBcSAwxnhAx6CQfshJCfrWFz7rDx/Y3YrMuN/Y
+MIszG6NLpxozaSQYs95wKgPhHWMZegIiMsY45yqDpjJ6NDr13HOmP45BRDJAREfoJUfOPKP/DweD
+c1773f6soa+qqnAcnN/YjnftmWSzfttb99318x8cB41ieeQISu6SmEW2+OYnv3DPR76gxtOb9r1T
+NPlkp3XqxEvRxoV3fvAO1dyel9gQrezY8c/8p1+l1TOnTsw/c/AEMRDC1DjURfmXYbmo0BNwxgQh
+AkAQSGDQy/tH5483AvbIl744ev75KyZa06Gs0LipbvPqfRNbJjFmGAgZRQJULOI4Tp2zzpNHVJwD
+53HSbCRtGOewuhx6iJlUjBORZ+AZae8svcxFqEtItaPNOQcizjk676y11hqtrbVOG14JXZiRHUxt
+TWa2pyasJi7bdvvP/PVKpQZD5YXJsuk0aTBx/6f+/KP/7nd9dkVjolXwosJgVJ7ceTn85Id+tBQx
+WJiJwkOPP/aVj/9BwuSRoycOHT8O6sKV/cKhr1WOGABDAiiqrMpGkWCnH/326Ucf3t1sdsNwaTyQ
+m6fCnXPJpZs6ceqUXLWmn2k7MHYlHw9GPVNog845IVmpNeMRGFg5fFyurjaCQAJ5b4kTlwwACTwD
+XCfP/IBhJSLJee31O2ONMfUahCXrjYdDqZfL5U4qtm/sBl1x3fvefOff/BDEHVNQCOHAjFRLJOCe
++Nw9n/lPn5hrvC3ZsNM3bTvYENjBrqvdrT92hwY3KvPt7eCRe7/8wOf+S0rw/HP7VxYX1ysq6xdz
+vmtw3js1GWSKM84deGOrfDg0vQEae+qhL13aTiKgnAnYOBfv2rbxuktL5RRLsqw6eWwx4fHuuS0y
+9BUvZCPx2kdISgprSKioWF3tn5xv6kpx4Zzz6IEz4IwhU8AFcM8JzqF+eO/Be1dzMhlD62ylNXnj
+LVhrDVptEIlkiIBFb3FLY1N05cwTJ+Yv/5Ebsmr4vS88mPdWLbPgimYjcv3ygU98ohM13viBGzg/
+PRgfBz4xLBZueFuHZzc88c2HBkPTlfJrH/vo1ETnspuv/95LR26Mp9rt9rlaf76h1vlrPedA4AEc
+QKlLm+crR4595557N8C4wUseBaY72b5i3+xleznD1I9zwxaPrZ584sjSi6eHmR6Tz6rSDPqlMZWt
+qjxHxKLUZ+aXytVe6oxF69CiIODknCF0AQPhHP0lwggE43WEVVt5U1ZVVS37Eec8PzNsYNJI2wsr
+p3y1sLlZFfHiLT/x5uvfdxdNTFkXSK+sNpWgjXH0ud/7zYc+9Z3LNt09tWXnqsepqa2T8cpVb9m3
+56arcwaB53OcvvDb/2nh2PHT/WIwGKxndS7M5pz/NotADhEgs+WBw4dOHTvuhmM3yDZ0lNMjH8l0
+6xY1t9GqwBbjcDx66cTCwacPjA8s2F7Vz8tMsaTT6oRxq9lpNBpKqTRNEfhgMALrIyBPiAxkoOp6
+BTrPkEjbc7k3ULtYnNe5hLqoZK2tDU4dfI0UFkW1IezKghlk6XRLsGLvZHL51VNDuXrFO2+986/9
+RCuZpMohMmzFgo83RcmXP/aHX/7MA3HzzpGiF49/afWlrJLVze94y56rr3FkW+CjMv/93/nIqMLx
+eFwHt+fKea3B+YcGATDnAuJt1ThwZOnSDTOHn73vmgZjwzAX3fbuPd3rZ4JGFcjU2bmhxdOPP9R+
+9uD1Sp5eOXjyIF42c5txkmQcZMetDsbUgCAaHzmRvnR8EnCQeIusy0PdK0ioWDXReS28jlmgkRPr
+Fxo4L60tDcMy847LIAyi1GpTjkuvpNaWG18akRaRHGcDnuS9o41i5YxhHcwOQpTYQbfZPJi9OHnH
+7E3q7q/93qep6E2KpCALPJbefP1jn2oTfeAnf+6Jw/cs5I8m5Sku45vftfeeanj0xaMbo0CurLSW
+Bp5xEtJDTbJliI5zDkDwV+ZCnzf0iMgZAHHGQAhRFYUuK5LhSGvfSsNGxBnpstKQY4nFyigdjlgq
+c8CGV3p5tDJ/Znb7JoUcglCyKPCBdd5kuSnLBBhZH6p4VJRR2uBcWGs5J0YejEcLRB4Yk1I24qjV
+inhM6IU7m0A3xhhCa7z0hEg1MSQIgkazOdEii2qStWIWx3J6dbW4aVfnxNFBeu0O8cH33vtHny41
+knSC2yTkK6PlP/nEHydT3b037dv/6FNnFg/HQXPLtjfccMN1Dxw+o7UWqQD0VVVprYNA8QvNpp23
+wUFEYBIArCMhxHg8tLoSDFCpsNtqzXTTNAlkGAaJ9DA+cTLp91QiCoUJQXxmuHLgWJ5ViKGD0IpQ
+BoqyvFxcxLJkSMJBSLJXVOGGDfH0lCEPzBE6Zn2dMrOV1roqy6LM8mw0rlMrjDHnXFVVVWmMcdag
+d2sRVr0kRVEMBoPl5eWFhYVjp5eK1T6szsfYY8l46007b/qxd/VF4AkIrAA9kwblcPQnH//8S8/3
+L9v79g3TG5QSjOHU9KT33hIZY7QpyrKsqoporYml3m/Py+CcN/TibPqirPJA8CobE5pIstw5LQED
+AHSMOBdKeSqOnIqqcQQOODnwUaXF8YXyxGIFTLuwcMCZ0EvL5ZkznBwiSpBgsBKqtWdPsmEDgrdo
+0FrlyKNFZxBRMB5FUZqmzVbabjU4XyMQaG2t9daQtd45qJ1MRFRKJUnSarXa7Xa3222o5obZaR7Y
+TZvjiSloTfDb3/eO63/8nSMNFpVzjqxpRcGhIwefeGx/u73DWluW+alTh7NxX0kZcVXk47Ia17vL
+D4BzXk7O+RscAME4OKvLKo7CkTGSMwYOmJRJGKYqFAAQWhlIjlGhSbigYiRkITAIVXeUlweO5ds3
+tuLQEsaMyjOLMOzHgdC2klLa0gczG5q7dg1fPIjOOleA8yHF3hmrtfZWm9JoUVYEZeZJJt1u7Vw7
+4xxH75FZcO5lK1R7PoUG6fIcfJK7ZcrGdujHlbCRHY0WBitXvONavlJ87+FHBXOSOY6mrVLnTWXK
+ublN7VYzq6TOvDXeAxIjJbDOgpwL9fnSZi8oc0kEAN77MAy9MwFnaIwzRJKDIHLWaLs6zsuyDI0D
+xcABB1Uy5AE2uHcLZ8oTp9EGgkdlf2TOLCbGCUGaewvkiDrbL4Hu5DCvSFu0lfHGWGuMtrpyznEC
+KWWogjBUSRjWV+Q9Wmu9A/TcWfKO1fXC9a6H9caHWEkHxJPQAKItmtIGYiSj/s13v1tMT4+d5UJY
+460txqNVbYreSn807oUKWo04CgLFVBIGeTFUSsHZLRXpQnLI52/r197HnXNAvqoKJTh6m4pIKcUF
+SiGCICoQLFFDCcmkVsIIKYF5qowyZDL9wqF8tRIsmj8xny8tJ0DWVRiIwjoRhNM7tg8QTpw8TWUJ
+3mi046qoyrIsy0oX3tfR1fepmPe+tjDOoV/bZqHeaYUQYRgmSZIkSaPRsDE12o1O3Nk4vSXtdic3
+dW6+dtuc6IlN6Q3vuDWcaBTWS8FiGXMQzrmpqalISca9sQUROUIiysaDmqDwcvfc+W+2521w6j0F
+GKvdZ1NVKQfOwVtXFWU2HHViiWGrMCYsS2aMCvk4CKSSSS7I5UXCgWI6sTDek7dm24unTof9YRCo
+kTUQJaUrWo0onZwclOXimaXN2nKBHkHrintnrXWCOWeYN9ZKqjQShklSQ+8c1gEHJ0bIkGCdCqi1
+zividjxkrqJMlh5ya73LwS0Me2KQhYXJ5/LWxtbisN/x0OC88tYaLDPdP3myLFbCBhYFi6KIrNHa
+al3WETWdhzP5iqGXCCXHCDi3rDsxfWBcdUgVTBdpEKVNFca5WgmBZs0kr/yCyGdcO7JVGelxJCPf
+ihxwS5qK9PCjaXnJ9GJeNtIVUZCp1NA0NI1uuX42aoUry3Z8GpUdj8eGhAfpq74pndBhIeMgEQ1f
+lQlwDASUjkUVF56kNEoyx8g6WYJUFjkDEOTjEKIoDStjVXOjljnkTnljzHSs8kK5ydiYYotp5+3u
+7jveVow1EU+zcvaSywO/NWl0GZbgWafd9gFZ8M0ocSulEEqpEGrrSxwY1FvOX137X2m15dxcbp1P
+Xy/e155W6UoZsUBIQOQI3gMwlEIsn5lXjpXZCK0B6Rky64FYNDU3rZIAhlTbEKed9bYsKQCsVdgY
+g1WV5y6DDJzuTk/VUa4jZISOgCF6ttZ2Zawty3I8zqzXqlhd5VVWZFprwbnW2i7bMsu4AGNMFR/Y
+edXkz2y5m1CA51mWRVEA1K9OVIgoFRdcSSk9cEQ0xpzrShLRBZDJLhz6H/juupRR10vPLWg4pjmP
+AiJrHQOOiCA5MuOKamWJvLYCDSPvLRaV7Ext6My2KQCNxnqnSwPaAZIv3aAa2crX3bNRFKVNJqXg
+PjJI3qP35DwBJ8+ACBwwYgCCh2HYaDQ6HUksibUMZFOMskoXgoGzBo317a4AmedlkT/Vct2JAIvc
+kqOZCK21KyvLnHMRBCoIOQuklBqgjjDOZrDXotkLAPBCoD+3b3g9Z80Fr3FfT6WupVwCjmgQGTn0
+jLy3KgzR6FQy0rniQngXIA5Lb0Q6vftylTJHJYL3DsuiktZaRFc6JHAOrbNVVVGWDbgZ4QBc2J3d
+hB48kiNghJYRA+aAIaL2Nq/K/mgYyFFlhMyWezxV2nlfpzhLjp4hQ0e2cizAlRMn0Usg4WqmuLMW
+XaPRBWuBBQwU53y92by+OwBgDC4sY/+KtB7OkmFql3a9cl3re60XwMlZB1wxEaIURaEbhGhNEMjK
+WUaOecMIKmNgKp3Ys9dARSCF4ERUlppXhUEqS1fawhQWeMQYC8MwTQUwx3wExJFxT8wjAIElYAAG
+AGsuopJhFKWpD+Mwko6pJmaZYKmpCmsUeovWGV1GUeA0Z9zFUcxJZVnmqsKhBwGCCfIcCdZ4KED1
+7Z1V/O9XyosaUsFZrV/PIMI5xqeukRKj9aKS8egRAGTQaSfd9uCEqYyWyJ0mh54IAmtKZwtdNbrt
+vBFQuUiRAPJaW1FYZpxGp51HD84hMess1nWRknLuMQ46hMwTOiIksEjA0RIygLXGK++1Nbp0Ls/G
+nAJflpbyzAgREabe21xzAIy0FiRt4U1ZWmtDJQHscDDiQYNMRaDCpgiCAADW23fPplEv0MV5pVoP
+35++QEQP3oNffx69I2BBZlw3bW664oq+KfLjx9oODKBBJPLMmyIbQRBN7djYJzPhK/CWrCmyHCrN
+vSucsY58UehCM57UbBzGSAouhEBiWHcNAXCPhiOg1+A5gEWPiMQAADjngnHJONFIG5EkG1vNS4Zj
+jyDDBiB3GlXEBEMWeSKPBDb0mo+G/Zfus8YAAyHWoF8vwV9wafCVQg/fHzqv1y6QENl6ww0BcMZE
+XumWDNJduzunTw0OH/HGWS4q5wisIK9NGXU7G3duW4xYEkgI1ACY1lpozVCPdGEdhc5b67l4uUuf
+McYZXwOCmAfw6D0hMXBIAQDjnImXc/pn32JC1Wg2pp1tf+eR506e7vNAiQCY8ZxLRjyKEqcrj3r7
+ji07tu/J1AOec49UlwfqGTD1ZvY6QO/BAgiPznsPgM4bFB6Y4JyPi0Ekhha887xeDkHg9HBrWJSD
+pWfO2GrLro17jq088mK3mR0j2OiCQq8MStw6cY2b2TadnxyxRTEyfWzqvKn7fVA+zloV5GNqWnem
+lJLlEsrhoifsWweL09PobKNyUQbAhbUQSFKMIBNMMkg0M1m27BbtGKpy1fumo6Knz8zMhWHJ/uT/
+/g3fW+iGPNcWALgQCMQ8hUKOvN129aV/4+/97f4wHywtEQuSZGw9MuCOEMSaC1cDsjaE4TxzOBeu
+9ettdvX6W2s550mStMK2Yo2yTEpeOudIKgQqszzZLG1ZLvVWdrYnxiosVxebabMaDbwpBqW4atcl
+q4unp1q6055gYTseR0wIbZ1zDvMyZ7qsKvQOma6/pdsNVErEnfe0Fk/UpoDQoXMEDgmIlJBpmnY6
+k6IVedcE6Ai9bejGnk+YPGnItIIQddWUkkBYDggkOIRcJpJFSRxG0datWxtBZT1vt9tBEDBgnnx9
+s6+Q9/oqQL9mAQC9t6aqMjsShLoMGRIDyCrtnVHGNNEz4YNIBdFsc8++Uw+fnjTa+yJfHXd2Xtu6
+8tLMLocNHAwKHvJB3/Z742p1hAE1SlVK5DJABIdUluVwaFdWGCssUtmZmKnbwxFAMCa4kFwxqVxl
+AcBaOx6PnVuBXJS65/2gUcIYCgh0YGIJPhJcAEkFjEJCRwAM0VjrOVlPTMherzccDoGHeZ6XZYmA
+DEAptR6+nAvIRYd+3a+vN9h6O3XOMYIoitIg5RhlWWAEGFMxGSJRKsNi1O8ImpztlL0s3rkdnt+4
+9PSTYdssL49v+clbym6wgRoyXFUs5XEzTkMhI8+EJ7QkDVryljwQgFQqTZN2W6iQgMfI1kaB1Frv
+0TPyDhieDbCjMGwkqQrilpeeWnExYqYUaUg5KyCrfBYpKNEFpvIMAqXiICrLknOSUsoobDabWDWB
+h0EQcM4FE4IxpZSU8hUq/it1LusUFSIyhh6dM5X2JfNrA1fQOus8IOWVEaO866q0CxwVOLnlmhue
+/96TZ+aXneyEc7PzK8cnu3xp+UxIiXIiz11WFqWxADxEckIIycCDIyiNHma+v+ooN0jl7MYd9cWc
+6+UxxjgAQ/LGZlnmbJ9XmTYDZ8fSjHNecB+Ug6hUYsSVERKEajGPiIXOgScAUE9gMMYNBoPxaMRl
+zGg4Ho8NWUdARDX09dcRwQUswSuNZtfHQRgy6LwQIgwDhioqgwypKHPgHFiQ94YzU1vJFoB2y9bO
+KO/JjRM0N7P/a89ffvsbdCQaIovTJogOOK8CLiVwDsQIOSEHg557IARCAiak4mEYMmQAtGZtEKlW
+cy4EIQnBLNS5jUDIMAxDmUQOnWsEph0GZc4TaHY/8NM/g+NS68ogb/Ny6fSZx7/5MGlUXIQS4jgW
+QrRaLTBNLuNABkIIBRI5rTP9X4m1v3BbXz99RFTzL5Cj1no8Glje4xQXZctabYyJQqEdKytfameN
+BjMULGok2s+0Nt9+S/DU4cl91wfddC4dI89i0bSsLwQxjh6MJyBAS+jIKhExAqZkEARRpOIEBOME
+wNef/bpdnxyQswQEQB5rTiwj4sA454Lz0MHY5mM9GI+K7dumA4ic16Oi2nnJLQdfePHxJ79b5MOE
+eOW8N1aX1alTp8ar82HcisNulmUIKISsG9vO1foLyOScP/SIdX2Fc85pLVdjrTVQIrogCBpRQ0CC
+FGmAqih1UY21glIvraxusrohKB+emZ3eULho6w3Xbt37dGPLtuZks8NWR7rkecQjj2QtMu8tIjAA
+xgAY80iAQNZqrYvCZhmyXAOW6URzXev5utZLid7U0NQVc3TcuMwaVFlJcrXbiny1yqvS2lEQks1W
+dXA9S0JNXkouQbGa2Oax0WhglcogErxuSGc1tfaVz044b+i15AqBAViAYX8AgVyx2VyJy9iczsc8
+ayyenk+nt44xhwCHq5lwbgTVqL8AXF4ZdUcGtkyJsrAzE/PPHOnd9Ut/v9VquWKp2tIORemDUZyF
+LopC7yiOCsabTo2Yk7IqvVQAUnABrqHCiXZEEoFhlAghvEYDABUD6/1EHJSm0sBAEZM6ikW3NaF0
+Ssisk0ux2xBtcf1BokinSvsuVkuzqteZme2fWIgdMlvJiGlrooT1lk6uLi71eiMe8Kk2uGwswVvB
+ZbfrjQ2lYgjAQNQEnJoNJ/6qS3JBVSoAOJtOCqJQezLWltWorAopeafTEaHKSkbAhnlFpRkTjlaH
+UVwyJoy2w+HYGdWaSPbuaZ08smxNb+vOsMyySo+iqIG58WnovTynaY8RMc45ICBiVVVF4fNc+nEG
+TMtgis5OE63jVURkABIEY8xaS0XBcABZ4eyysSIK/XNHVtOkBYhuMHTO9Udl0twaEzt95Gg5HKfA
+gAsCCIMkjhpSyonuFMmUc66UgrLyRGEYr7P7z4Hm/LqZL8TWcwbgSUpJyMI4XTGuRAdeV0WOiJKR
+rgrCDg/i1cxWvWEBmPWo0y5DGYsgFiwP08ZovNrqzCJfEVK2u1uIMRW0k2hSibxMwjDkXID1zgEg
+oZAMPQqAuodNKZWmCQFjPHTOMcYk4wQggCHj5D0AEFAgpRAijuNGasOgQcQ8Bq43n+7ce2qUK7KJ
+8IOFbPu267Zc/qbHvvzA5z/68QBZGrRGRRZFabM96ZDr0oSRdCCKojLOKwBPlDabtDb67kJ8mwuE
+fv1xUmFUGR2EcaFN5vRgmDfHYyZUEiWWKRU0Rz07P8j9uOJJTAys44IF47yaH50h6pGq0oTipAoj
+2esfM6YUPFkyeYq5NV3rJpVSUjDBlfd1Dg6IABHH43GW0Xjs7XCEVE5Othh+X+MDInLBOQBjLB9n
+OuhlvQU/lqZadE4GVmu1spSNAXDl9ML2uX1Xb7tu/5PzH/+ND2ergwmInMMk6izZ3DpsNpuNRlMw
+40RSGI4eCBgBC5LkbOL2LBy1tTmfDeD8Sd418UGwIAiyogyiqHIuq3Q11oPVYZaVvuwR58nG7TJW
+lZLGMmaQEcAwM2WVdKLpdFIFDWKGczk3O8k5apMRJYI1qpK1VTJMAl3GUgrryXpLLBCco8eaaui9
+l1LGcSyNRYI1q+LPMiWAMQLJuAWsR1VEUdSMO0GcOi8BolKDrwYzk83Mwvbtt3Tae79233c/83t/
+XC33t3UndO6IeOENC8TeS3dUxbDKi7IaxZ2IgGvnAcgzwaRaT83+ADp/9afg/KEHX7d3h2FYlabV
+aHnk/Wyc9bxYyQHCJEkdVt6PR5pkKx0vjzixlpJBEKHzVTnqV0tZeRoAvPdJGiIZxiiKEm+lko3c
+jvNW6m2qlFCCKa6MZ4hrQRMiFkVRVakxkdHaY5VEPh9nxhixxg96eZIBeczHYxyObL7Ky7zSi96r
+lZFpSrt44mRzetemvRvv//JT93/qT2FluR2rxX6vFbdXy1EQp3/jgz/xhpuv/Pq3vxYFsTXlRLtr
+zIRUgfCeCSWC8Gz+6uzud56G/kKgl4wDIRAPw8Cib3W6jMv+YDTuQ+/I/On5ZZzs6Wq16PlqPHXp
+tZc/Ot8fZEMGHnSJZBpptGlipjTEKUF0SNq6UkrJmDDaJUkgXQuiwIhQCOE8efKETEiphOIeAKAs
+S611HUw4b6qqqseTKgBkbG22LpIAVvdYMcaCIAgo5ixGDFqtyBgZxjvanZ2Pf3P/Vz55DxsVTRVy
+zmPFLCNk4p3vefutd9z48MNfPX5sf1AZ5ysi0tqWVSmAqTBstbtJUu9I54vfK4CenR17qxQwxtKk
+CYKP81IbNV4dV9oHKiKUY9TNdnrbHW8aHR+89NJLor/k0RbZuIz6eTTMK0LthAQCzQUhOmMKAADm
+pMUSQk5U52U454zOzoJiQEQ17uvPu9Y6y5jTJgDGGBPAOL48OtcYY4zRXJOWZVl677A47pPdm3a9
+5elHj33tT78s+71mlBgvTDGOm62F0egtb3vbu97zoydOv/DU099RkSctglBwJquq0uAaoFQQtCe6
+aZpGUVRjQgTs7BP3V0fy/LtKHAeQBXMeoBtRS6rpLdc9N5jgLC6PLnz7kw9kRbOxcct0mk2wF3ft
+LHf/9Bt23PgGG830K987djxAgChKA540MYi8CtaG49YpMGv90A6axnqjq2bgCYQnrkiQCb1jCKQa
+xgudZWcOHzx1fP7I/Gre7w9WlqMwcEBCiMpZTei4IG6QbR6PeZQB9FbyfMm5SOK4bF1K6Y4Hv/7U
+n3/sz2ixmpVNqAwwN8ujldHoijddd8tPvOexFx/53rP3XrK5MZXMJVNbrr3t7vnT2b0f/9Q0gAaQ
+kxNJN0piFQacrY2pA2Lg0J9XrfD8nUsGQBRwqdHu3Llz8eip3VfvY1/8YjZeFh6+9vmv8si9+2+8
+lScxwyKWet8Vs7vVhqca6v6vf+P5Q0fMVHdiJg60qwjXGwHX6+mMMSFjpRSzbL0IhAACwFiDAAog
+CII0TbtdRikzkjHHalaMXMtjMw6cMYYIHvoWl2UUh7LLmGGiFfo5ns4+fv/Tzz10YHx8nigbC8El
+T4gf9/nea26660fe6/3Jo4e/lYAqKj8sj11x5V2Lx85868vfQAs5sGhq8u/+43/Czg7XBIDa6LPX
+wNZ7dEJJAcAcXr730geOn2xt2XDn//S+hz76YZ67JsmH/8ujinXf9zffyRsLRXaoMxGEO+f0zdvm
+q33p9LQKk1AowXys1obaElHd87c2GhRzE2LBC0SUHKSQjDGHqALpnHHO5Xm+uqpPR9ZkpuS4eWLj
+0lI2ysZNAOYdkeCCA0AAKeLodO+Fyd5UEuaVyDmE5WJwaOHAc/c9lc+fbgCHVNoQ3diBNTPXXHH9
+2+5Anp869N1u7IWP8opuuuV2nSWf//gf48gWBI2Zmb/5v/+z9pYtR0/MX3/Vda9wKs75eziC1bt6
+EoQAsPOyvc+/+OKNd731+MH9z33l/l1hmmvzjc99a27n9lvesUXJ7mBwxJRVd0t47ZuuRBWsrAwW
+TgOM+mEnXWf/KilDFdRaw2VLUKRL5b03CIasV0pwVhkNAFKwOAo6rebcDMMOc5JxJzyNpJSRVJZz
+4Ix4XZ13XAomsLMhnew2M02Lp/jBwwuPfOVJGPYbAA3FDdjxyLMg3rBx6213v6/THj/39L2YFWnE
+mRomE1t64+79/+WLg9WyAVEzad79oZ/d9cZb7/vq1378R97TarXW5++vr8F51QjPf5vlwjobSAUE
+2ujNW7ZmVr948MA7//rfLleLo098a2vQLKvRJ3/no2H4gTfdeZWAgqkk3tSNp6ee2V+W2YBDVwaB
+1doxpr9/IDdjDKkMRKOAKahtiBQeiJDCKHCuBABrbVVkowG60hsBSib9fr8oishZS96hQsac9xJc
+pVVv6EblwDs6cSw8/MLwhcefaAyd4YQRr5gvco8AW3ZdctWb35RGedY7NDch4+lNC8vDHXv2iGjL
+H/zBV3sHToQQjgDf8Z733PYjP/LF+++//Y1vuvqKvetm/dxo7ryQvJBEgpIKADz6MAwJYMfWbboo
+z5B+109/8Es2P/n0U50gzBdXvvSp+9KoO72NGTsUjeWoOTnZiayWinumJPMVq0dYMialkFLWSXCp
+UvBBZUIAcADWWq8k56CtBQQJKASLoqjVFCwAp7h2LEziKElUJRwDYmxtXhYAogyDqUY6l62sHnsh
+O/Ls6dHC0iZIS6gKREbAAbZs2nHFtfvSDcHS/CPSC5PrJb8AwfRqr/vC/peWjrwYMlUJfs2bb7v7
+Qz/14KOP3Hjt9XfcegtYcNytn1qwDv1F7iAkrP03BOIAVVkmUXzd5Vd+ZfVbG6/a+9af+9v3fPjD
+1cEXNsTRsWeP/PHvf+bn//5PbtwyPfLPx2K8d/t0mXGdrziHNU96nUe13okZRTyQTaM2CSGUZAIk
+AXgCKYQHV1dmqqLMRx5LsJJ5GWqtnXMavUUgJj0hcUYePDOjQr/0fHns2RMHnl0olvuJhxwMMagq
+oEDO7ti26epLJ7ZGWh9JI57I5qrTMxMbVLL5qYePPnb/AxPMDQn2vem2n/2lf/DE4Zcuv3LfnTff
+GpyNYX9gBjKcp+Kft3PJgREQAeNCVrqKoxgQwNGbb9/Xt0V31+Xv+eAvTExsHJfVZMgPvXjo93/n
+iytLOhuNX9j/3YUT+8GNiXScRpMTE5MTExPdbrfTabdazUYjTZI0SYQQ6uzJC+feiUOLCB6oHgkU
+hmGchEmS1Myk9R6PdRaiB6YiAsD5Y+7Q89lgecXroSKZCxmoJAQ5u2HbjhuvD7ZODPRpXp3IM/nc
+ge8ujxajxq6HHjr04ANf3RC6BsGuS3b90r/9V08dO2BDceutNzeiBBCAQ/2MwllG1AUMJzp/v54x
+DkwACIA4jIABCICAx7b99qtvYG7YuX7nG/63Xxxv29rXeLmEM08c+sivfKLIL7t837tV2LfVQVOJ
+wkxXBXnHjHbD4aDXW11YWDhx/PSJ4wunDi7Nzx9cGR4trfMYG0feWQXcUwM5WMy5sKNRtrwwXDix
+dPLokfGKQ0THLTKeA/jQGvJEsRVCeNrW7p546YmV40/HetiUPgPnJTttssbOLVfcfMPOLWpjcmKC
+j2U+AeVwcubSXVfe9cjXnzr2jce3YDw2XF66/Z997k/ueeQ7NPYfvOsDs61JgwYUkKDvA+SC5t2/
+irPP7PTM1K233KLzYu/ey/76B3/WBsGSg4kIju1/5rN/+MlDL/SE2r04kCsLZ5aOPNYbnBmNe9Zp
+pYJmszU7M7d588a5udm5ublutxsFIazP1uPMnuX0rt/nune0TnVGQgYAuBbHWu/y3nj/E08d2f98
+I4xCGeQO4nY60sWuS667/tpbk+bq6TOPLS8Nen19cP6pTEYbZ7cdfWz/Sw89noqgT6Wa2/BPf+3/
+evTRR8MwvPvuu2dnZ7XWNfdPa/3KAXv1oA94WZUbpybuuOXNEtSuK679qb/7D4Zxu6qy6Ugce+z5
+P/vDB04dD9sTVzXixmSUeZvpclTleT4aD1YHg14vH4+LbOCMrYccVFXlyAFnUkomatZJPSy9nqdY
+90ytMT7W4y8iYgSANBG3548fWzp0JPbEnTMePcheiXuvvnLnFbsmpmWzaSa7YNw4t3rr7r0Tm/ee
+Prb6rS9+e0ZEpa8aG7f+k//nPx6r9MLCwhvf+MZdu3YBgDp7cNN6CuGVyKsGPREGgfQGt23oXrrn
+sqDZuf7t73rrBz+0AuCAzcro+YefuuePvjRe5kljgyMuOBE69J6DIA/eOvJOCi4YV0LGYdSIE8kk
+EWlrc0N1hQaAM8aA1gJIzjkgBUKKuoJ7NtXDGCvLPAYIjIsI0iguyBnOt+65dN9VNyTdfmmf42iT
+sNNo8Gan0e5cc/CZk3/+yXunVLzsKzU987/8219W0zPPPn/0zjvvvP766wGgZpzVZNtXBbFXbZK3
+I1JCADBraNfuTZzz555/9ra77+7G8Wd/8z9OmGpXmM4/+fRnf7d644/su3zf7pSPjLHeeyJPzhWm
+HDkHQMIGMta0YatzzhEiAy6lIECLa5wDh8Z4YwCMMWgVc2tdRMAkACOQHIAYETVUkgRqJR/28jGP
+gj179+6+YneUjEmM09i7qspznJjYZnTrkQdfPPDk09zJZTCNTds+9C9/Kd688Stf/fpf+9Efv+nW
+a6uqiqJIKeWcU0rVa/DKB7y+atBLERljgiAg7xHFjl1zJZYvHTr4hh97vzHmwT/43dV8NBEGB57c
+b2yWRu+dnOScB54KxqsoCuOohUgMBBgAmWEc1zQY47V2FNZaDsBZ3QHLhEAmApKsKkvynBFI4JzX
+RwwCA5Y242pcCGAEAiK556o9+6673NkyDpalSEzlHQ4bjdmiN/visyf3P/dEpKEEiDfM/Z1//2+i
+jRvu/8aD73rr22+67tr67uqQtQ5flfqvTkO8MMRelU8BAAYQBAEiyqAe3cQv3XOJrvL9B46846d/
+yqH/s9/9rSlvpiK++ML8Zz9yzx3vvXLHzg1xygu96HwuZeAd5ywQhkocUDRcaxUDYoJzwcBzIFjP
+4cRY2mFZsrI7ucv7tXKdAOYJAYCIxkUWKjm0FY/S6++4aXpLi/FRKzbKuaooxpWWcaPUyf4nDh98
+5nnOSick7zR+8d/8cjo7d/99D7z99jvufOvtREZXGEWRMaa2b0VRJEnyqiD2Kno4AGsEPCTw1uYC
+3HVXXXHdVTuPLy/d8N73f+Dv/cNMiLzCSRnnJ3tfv+/R+eOrgJy8N7qoirwqSlM5JSQgofPrD7Vz
+bm0VABhjUiilVKCiMAyjKNJar+fuiQiRAAGQRATauU57+tKrrp3auCGzWV6ueNvz46TMVzZsmGgn
+lz313aVDB5+Oo1IQsHb4r3/jV9MNU/d95WvvvuOuu+58uynHhvsoiqy1NeHSOVfj/qpM8n4tjgR7
+5vmXXjp8uBnHj3zp3nt/5yOdopjitMiTuNm88fbrr751EyRn+sNTVUaoG1qZUHWSeJN33fEILTIk
+qkw5GmpnK85su83mNgTdrgvCkafR8uINx4+dOnbkTJ7ZMIySNFSKMY6UthnZdkM1Y7D5islWBDOB
+BNPZpki0ePLkt7575IWTnElgqtXt/q0P/0an03nooYduv/32t771rePxuNls/vd9TAwRIWP7Xzhw
+/PCRmSQ58J2HP/2fP7x86tS2pLVcjIOp9i13vWHHldNcZZGEIsucHzNIpJwQvEMQR0kSJQEwFNB1
+zpmqdDozpuf90PshUeloozXonZAi5lx6bz0aRGfIjkYD70wcSiW4EoDeal265jZZwhP3fbN3chBH
+8Uplp3fv/D9/49dfWF45fvz4HXfcceutt9ZXfu5RPRdDLv6RYFZLFQLAsSMnD77wYitUpw4d+D/+
+5b/atHiaCTnmPgO68Y5bbnzjFY6dSRsu5lVVorECSVrjrTeeKmtL6wLFFQBHh74yhF5ICgQf+4wx
+wVkIJL1H7z2AF0JwzIMgCsLEozIWgSkhAocwytL7P3tvl6LAixMmv+qmN/7df/+vX1g5c+TZl+6+
+++43vOEN9SklnPOyLOM4vnjIXHytByRccz5eeOHQ0ePHwjh+8sknH/i3v1IVS+hMt9nKK7Zx95Y3
+3X1twZfKwYLRDoCHYRgEUgQYhEwqYsIQAnlOKBgJThyIAzBDBhHQE5FAD+udi0U58o4VhS4yz0WS
+xB0kVZb6uQf3B0zlWWkAbnrL2z/0T//hM4unjg9Wf+y2O6677jo4eziitVYpdb49OuclrwH0QIjo
+PJeKcThyaunRp57qTs/09h/+o1//16OXnp1y4BGCaHL68k1XvvnKrds3ISKhQ/TW5UU5dL5SAkRY
+n/nlGBJjgpB7T84hQQRrNQrBgANwa701HqMkDuJQRaGMAxGNVkfPPv3c/udeiFbLAlzO5FVvedMv
+/ot//r0DB5f7g/e9//2X7txel4jXE3AXFRZ4LQyOISEZ52BMBVxwqZYH+VPfey5jUBx/8cu//etL
+Tzw1JdNeWUDQ6Gyem929rZU2ms20kYZhFDBywDCUojJI4IF5ojqe5ESMEAgkFwBrM0g5ZwGQIBQm
+SsFjnmXDld6431taWFw4Nd/L+lOQVJLf+v53f+AXfu6x5/bHcfq+u94zNztdmjXzUpZlnR262Atw
+8T2cet43Oc6JgAg5Z7K3MnrsxPOQW3166euf/tTD9/5p7FwjSLBiy1SFoWIEgE4wKYAxJgIZeATO
+gQuP3BMRgWCgGMiyGqmACQmIjogRSu+4s1BRPXbYCyGUks6bNUvSmvjZX/j52+56+4OPP7Zp29Yf
+fdfdjTBeK70D1HYGzsZQWuvw7LSjV10uPvQePAGX6LCUDBhIyhwLUx8MvvHNZ8tMBQzv+/TvfPtP
+P9HIXOxgFSCUAAgOIQTgECAwDlJAheCpXkoOhOBBEfCQIzDy6BzVCWxGEFjAEGw93x0BHIAGCAOY
+mpl41z//5euuu+6rX/nqvsuv+PH3fYA8MM4JwFqz3gwOZ0dU/3d+/ONfJuiA8wNHjj/xvadjFcwf
+PPTgn90jrE1dZo0xZWWr0pXaVVVVls46hO+vB9UzkYAR2Pq1B0IABqCUVEqVMklbTQJQaRo101FR
+bty65UfffXe6bevhw4dvvPHGW265Ze1CXtXTpv7q8vpBTy7Pi6TROr248vSTT5HWMQdbFlG765yz
+2jir0TpntdPGOdcfLNXtHDVtpO4kQcRANHgd4ColwyCKoiiOgyCY6jYseiEDFUdMiMJoZBDH6cLi
+8mWXXXbNNdcAQFmWdZj62uMOryP0zpZShQDcOuj3+7oqiKxUvPQRkqshtnaNWImIzfT7klbrPAZ0
+a3ML/BrPem1YifIlCN5oNKQMKq2lDMIwtNZunJqpGcj/dWX1NZbXT+vBAdS+OQCARkThGUBUEpF3
+hNY74431znuHQKh/EKYaesGsh7NzSRist5dEaYNzLrgKpBRcsXp+DADSy7SZdQpNvQO/hvcO8Foc
+evqXSD1YBh0KwYGBFNwDECAEigEqBopBwupac92hu6b16z7fWnEEXM1FJCLgjAE7SxesF5XztfFk
+NQUZOPu+nZPOnmX9Wt33y/J6az1wJEAEKaAeH2T+Em3g8JclC8+ejrzmx65xkxRYD8SBA3DjLedS
+MEFAzPkfYI1dbE/mL5P/F2PAMaY4wppzAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_mini" model="fleet.vehicle.model.brand">
+      	<field name="name">Mini</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAcI0lEQVR4nO18WXBcxbl/d58+6+zS
+jDTaLMmyjWUbZIMRKeDPkgQIwRShQpzERbnIfaB4AJLwkMpLHvKSIlTlmUpRReXe/0MqSbHk5ibE
+VHxNHEzMBW/IEpKNJWvXaDT7nP2c7vvwzRwPsuQASe7gyvweVKOjmZ7Tv/76W35fH2HOOWqhGSDN
+voF/XbSobxpa1DcNLeqbhhb1TUOL+qahRX3T0KK+aWhR3zS0qG8aWtQ3DS3qm4YW9U1Di/qmoUV9
+00CbfQOfFJv1FYLrGOPgYuPrzy3wddoq2ZDxxj99/tm/bqze931UJ7Tx5/WL69XqA2x2/5//hblu
+rL4RnHNgnHMuCELj9ebd1KfGdWP1jDF4sc6cr19ff91QvxkgBiCEcB3NvZ9PjuvG4TDGOOe+73t1
+MMYYY4qiEEIIIUId1wv7zaTe8zxgyvd9jDEhhDFGCHFdVxAEQghCiDHmuq5hGLlcoVwuZ7PZQqFg
+WRZQ7/t+KBSilCqKEo1G29vbU6lUIpFQVZUQhBDyfR+Cge/7hJDP1ao0zeEAy1df55wHBFWr1Ww2
+Ozc3Nzc3l88XVVWNxWKxWCwSiciyTClFCNm27TiOaZr5fH55edl13cHBwZ07d7a3J7q7uyFCBF/k
+eR586vOAplEP9thINNAESYvrupcvX56amiqXy6qqapq2des2WZZVVZUkCWMMHwxG4Jw7jqPr+urq
+6vT09OLiYiwWSafTt956azKZhPFd1xVFsSmT3RBNo55zDoYPDgchFKSJly/PTU5OFgoFRVG6urq2
+bNmSSqVM03Rd17Zt0zQNw7Btm3NOKYX1EEVREIRIJBIOa4Zhra2tTUycv3Tpkm3bDz744A033OD7
+viiKjuNIktSU+V6Nz0WGY9u2LMsIIcdxLl2auXTpUrlcHhwc3LVrlyzLuVyuVCqtrKw4juN5HngP
+SO0FQVAURRRFWZZh5WRZTiaT7e3tCLH5+fnTp09PTEyMjo5+8Ytf9DxPVdUmT7UBzac+8Dnlcnl8
+fHx+bjmdTg8ODoKlg/fwPE9WxHK5XC6XXdf1fd9xHNgroVBIluV4PJ5Op1OplCRJpmlWq9WtWwfi
+8ThCaGJi4k9/+lMkEnn00Uc7OjqaO9lGNJl613UppRjjUqk0OTm5sLDQ2zPQ39+vadri4uLly5dz
+uZzruoSQmcuX8vn82tqaruumaZqmCUkLIUSSJFVVk8nkzp07R0ZGBgYGNE3L59fC4XB3d7emaSsr
+K6+//noul3v22WcjkUgT59uIJlMPwdZ13TNnziwvL/f29nal+4D3sbGxarUqiuLS0tKFCxcWFucc
+x+GcS5JECPE8LwjIjuO4rut5Hsa4q6vrjjvuGB0dHR3dD9ulv78/FovNz88fP358fn7+hz/8YRPn
+24hrUO81NFJqLxhDhLBN3v/pui4M+QgRjDBC6Ny5senp6W3bdqTT6UgofPLkydnZWUEQ1tbWzpw5
+s7S0JIqiFlZR3cU3ajgYId/3If2vVquGYciyHIvF7r///q9//euWZem6vnXr1vb2xMrK6uuvv44Q
+e/LJJwkhpmmqqhqUFJvJD+v4aXyD7/OgVOAcMcYFAQdxqzF5a3x9ZajNqHccC1IxjIXGtCx4/7oP
+ct4o56Lg52a37voeFSjj7NKlS1OTF2Ox2K5dewghZ0+fWVtbq1arCwsL4+PjhmGoqmpZlqxKAfVQ
+2cLIUN0ihARB8H0/SH4wxnv27Hn66acjkcja2trw8LCiKIZhvPTSz4eGhh555BFK6dXz+uQ1F0wL
+fkLZwHltyq7rWpYViUQYY57nbZZTbUo9Y7VcwnE813UxFnzf55wTsrGABdQ3TqP+V75utWq/Eowx
+rlQqU5MXGWM33jhCKZ2amhofO885n52dnZycNE1T0zRKKWMMEY7qckJAPecccQ66Ahiv7/umadq2
+Xa1WKaUjIyOHDx+OxWKe5912222EoLNnzx4/fvyOO+4YHh42DCMSiTiOs5n4s85aP3b/iEiS5Pt+
+Y8HMGGPMi0QilFLLshRFgeu+71+9ANdwOAwhouv62NhYW1vSdV0qSK7rMuQH04ZSvm6AV3K+Rvie
+0/grsIYQIhSbpkkwxRgPDW0fHBy8cOHiuXPnfNednp4eGxszTbOjo4MQAiRyzBqpD9gHYjzPs20b
+CgWQehhjIDnceeed3/jGNxKJhCRJe/fuFQT82muvnTlzBkI0aBKyLFuWtRG/yLbtxovBi3K5Cv4K
+vhQcF+fcts2BgYEXXnghWLnNiolNq2rf54KAZFkuFErpdLdlOpJIMMYCAS/0MVvgnAfF+jobl0Th
+6ilxzhHGtm1TShVFi0ajs7Nzk5OTuq5XSqXz58/rut7R0QHBU5Iky7KoJKzzNgDbtiVJAuGs8TpM
+OBQKHTt2LJFIHDx4MJPJrKysdHV1Pvzww7t27fI8LxQKWZYFZV1QLqybBVj01dRjLFBKYceAqAeb
+oFIpPf/889VqNRwOY4xBuoC48smp9wVBoJRGo1Hf447j+D5zXZcRDDcaKFy1WyS8rtoSmEwNHoN1
+aryIEOKYRSIRQRAVRdF1Y2lpyXEckcqnTp3SdT0UCmGMXdeFZRYEIZAZ1gFEt9oOgC/0PNjgMAIh
+5J133unr6/vCF75w4cKFVKpdkqQbbrhhncX8Taxblbq6hxoHMAzrv/7rP9va2sLhcOM7NyzlNqU+
+2CP9WwaLxaKqaqZpCoLAEXCHfZ/XvRvjnIuigBu4D14L9fDVeB0hxDESBO77NqW1Wslz2eTk5Pz8
+fDKZFEURcpWAPo/5jfMPtp0kSeDrG4V7MItisSjLciKRWFxcPH78eE9PTzKZXF5ebm9vFwTBcRxK
+KewPjPHV8s61Qy5jtTcoigIVhmVZ77///osvvvjEE08ghBzHEUWRUgpxqLGb9jeor4+OenvT2WyW
+EGFyctIwjP6hbYQQSimlFGYYqLsb3rG4yQSwQIAyRVHL5XKlrBuGMT4+LgiCZVmSJEmSZNs2jG/b
+tiBesa7gKzDGrK7/YIwh9jDGMMamaSYSiVKpBJLy9PT01NSUpmlnz5595JFHqtXq4uJiJBJpzCwb
+B18n6m2UdNZ2GOe8WCwahjE9Pf2rX/1q9+7dBw8eBMkIPrWZVrop9ZxzQjBjDBOy58adMzMzkoxX
+s4XJD99Lp7vj8bhjI4jyVJAQQhz5YHeUUnACQIG1yfiSoOZyuUQiYep6IZfDyF+Yv1wq5lRNVjVZ
+kqlt26JEQb7nyCdYKJVK0WiUce77PqVU13VFUUDcZ4zZtg0LIMtyPp/HnDmcKZJoGIaAUbVc+p+T
+f9218wY1FF5cXE4kEoRQw7DgI47j4M09z7rAVmvaeB5IGvPz8xjj2dnZN954IxKJ/OAHP+D1jnEg
+jG+okG9KPXwfrLkoit3d3aVSyff9Cx9dLBYvUEpFKhNCCKF1M7mSvYD1YYwppZACXT2+ZdiRSOTL
+X/6y4zjValXX9ZmZGdd1iY1UVc3n84qiQK5CCJFluVgsYozL5TLstlKpZFkWGFQ2myWEJJPJSqUC
+Vuy6roARQggSTVgYwzBmZ2dvHNlbrVbT6bSu6xBXao2tzd1Lo5cL9oRpGAghz/M0TctkMgsLC57n
+Pfnkk8lkUtM01BCTUUPD4BNRv+4z4XB4aGiIc54vlCYnL2QyGUmSZFnhnLuOb5qmJNPAv4PJC4Ig
+iiLUO40TqP3q+9u3b4/H47lcDiien5+3bfuhAw8ODQ1lMpkTJ07UTJ5zQRDuvvvu3t7e9957b3x8
+fPfu3TfffPPc3Nzbb7+dTCa/9a1vnTt37i9/+YuiKJFIZHl5+cCBA4okHjlyxDTNw4cPx+Pxl19+
+OZPJQJOLUrpjx3aM8cTExMLCgiAIsizbjnNtBtZBIIRzDv0Dxtjs7OxDDz30wAP3NS7YtWP4tRxO
+kHLBfonFYn19fcWSgTHt6uoWiGjbNmMIqh7XtWvJDSHBrgxGaHSgNQ8ooO7ubqgwZVl2HMeyLMbY
+Lbfccs8995im+e6775qmKYqibduJROLQoUPJZDKbzZ48ebKvr+/w4cPHjh174403enp6nnji8PT0
+5Ww2e+7cOUixR0dHt/T2vPnmm77vf/vb3x4YGHjllVfOnTuXyWQMw9B13XW9wcHBu+66K5fLwe7k
+3N+QB8f11ycIkDggZBiGpmmzs7PHjh07cODAk08+GVAXpFuNZH5S6nG9E4TqTVRBENrb2/v7+yOR
+iCAImhr2PM/3OSQhsiwGuRRsYViAuhrxsbQHY+w6pqZptm1bliUIQiaTCe7V9/1Uqn3v3r1Hjhxp
+a2tjjN10003xeNyyLNM0YT9RSiqVCkJI0zRdN7duHfje9773ox/96OLFi1u2bIGFh2XwPM91Xdd1
+Mca5XM4wDMdxlpeX+/r6vvKVrwQcYbxxaSnQKwLGOtuklF64cOHMmTN79+59/PHHY7EIqhd9QR8Y
+At6GydK1HE6Q+YpijVZJknp60qJIS6WS7RgYE0kWOcO27fmsFoJgiwQph+c7jZllcE+UEISQruug
++uZyuaBXNT097XneV7/61bfeesuyrM7OztHR0RMnTgwMDED4sm3b85hlWbDqnue99dbxnp6ep59+
++ic/+cn8/LwgCIGSY1mWYRgIoXA4DCpb/RADkiTJcRxYS9/b2OF49eIdrCqA67q5XO73v/+9ZVk/
+/vGPu7vTluUoitToZIJl2HDka1EP3K3bO6GQmupIuJ556aOZ5eVlQRDT6XQymTTNKuQ2vu86zgbn
+IxtjFEJIFCRIUSBVhUgYaPd//OMfn3322eHh4Q8++ODWW2/lnL/99ttbt25VVRX64JQSWZZd183n
+87FY5Pjx44ZhPPfcc4cOHXr++echAtu2DUke1CggZum6DttF182FhQUQWERR5Gxj6n1eS6CD5BUS
+mw8nJk6fPl0sFp955pnu7jRCSFEk23Zl+Up9EPjbT0c9VLPguAM/IAgCQl44pPX399m2WSoXstms
+69qGUe0f6IvFYtFoFOoUqISDKvRqrGUKa2trYHeQLNq2DdsrFotNTEyUSqX9+/ePjY3t2bNnbGys
+WCyCOk8pFUWxUtEty5Jlub29vVyuIoRee+21W2+99eDBg5OTk6VSCRZSFMVyuZzP54Ff13VVVa1W
+q8FJhZ6eHrAJ39s4DXb9mn83TbNQKKysrKyurpbL5WP//d9ra2s/+9nP9u0bQQh5HqOUSJIY5JH8
+4x3/T5FcwtZutPeamsEIxliR1KHBbZSIExMTc3Nzy0sLH3xwXpIkWZYlSaaUCkSETUCE2m4NTB5+
+tV1v165dVJURwYqsUpFoIcUwq2BZtm0fPXr0wIEDhUKBEPLqq6/u3LkTEiGEEDgT+OnaDmJcoqKp
+G///3/9DlZVnn36mVCrl83nDsBAikqQgRCiVbNuVJMV1fMSJJCqW6TAfHf3TsXK5zDnnGEHlCWoM
+lEuMMc/xPM+rVCq+73HOFVXyPG98fFxV5RdeeH5k5EYgB4jFGGFco7jRv3+W5HJDwKCapvX29oJz
+v3z5cqFYhaZdXcjmzEeMMZ+56+IMr2cA4XA43dUJ5wm6urqg92RZFhwd+Otf//q1r33t4Ycf/t3v
+flcul4NBAu8MtTv8ihBKJBLj4+Mvv/zyc889Nzo6euTIkXA4XCwWIT1ljIVCIehwUUpDoZDv+wsL
+C2fPns1msxhjnzPwe4wx8Hs1AQALUGEw5sfj8UwmMzMzI4rid7/7zP79+4NJBaLphhF1Q3xq6oOh
+McbRaHT79u1Qu09OHWWMgbJBiADOkTMcKOmNmRbnnBNumibGGKTX9vZ2zjlsFM65pmnz8/MTExPD
+w8MnT54EX2cYBvDCGDMMI1DQoJfCGEsmk6dOnfrFL37R29sLinkgwMEZKYi0GGPf9y3LKpfLuq4b
+hoExBmEDdiTYO9yP5VqGYYgiRQiVyoWZmZlUKvXcc98bGRkJ3gkrijbSG/4p1AMdsixv2bJFkqS2
+9lQ97cWNmRjBUpDvByNgjBn2QqEQ+A3P89rb2xVFqVQqJ06cmJqagjbbq6++mk6nV1ZWYrHY6urq
+sWPHZmZmNE1bWlp65ZVXxsfH4SMvvvjihQsXRFEkhMTj8ffff/+nP/1pIpHwPC8ajf7mN7+BbLiz
+sxM8ezweB2Fr//79O3bsgPgRaDWBp4bUznEcVVVd1y0Uc7/+9a/7+/u+//3v79mzJzAjiOGfXAG9
+wuSGVf7fROB2QSV3XXf8wwlCCBVAOhc554xxxhjzrypGYCVE5HmeQEk+u2bbtkDQiy++ePbsWUmS
+otEoxjgWixUKBc/zwuEwpbRSqUCchEYgdMMjkQjz/Gq1qqoq51zX9Xg8DoYMuwd6sNVqVZKkHTt2
+3HvvvaFw9J577hkeHi6XyyDSwS0FgkdgW8BmKKToumVa+s9//vNSqfDUU0/19PTIsojxx5TIqw/T
+/U18xgOIUAEGr2VZ7u7uLhaLmUymVKxwzjUtHI1GVVXVdWPDEpdjTCkVKAGHE49F9u3bNzk5ads2
+lK+6roP/QQhBp9A0TSDLsizf96EPZ9oO/Ak8OPRmFUVxHEfTNMMwotEoyM5QPBNC2traHMcplUqN
+bQChvlSoLjuDU7JdK5PJHD16lDHvm9/85tDQIEwBslKIHPzjT1j8s6jfbGE7OzrD4bBhGMvLy9nV
+nCRJXV09qVQqmWwTRRG8AWrQJxgS8vl8vpCLR6IwgX379v35z3+em5sTRdGyLNu2Q6GQqqq6rsPG
+QghBsiGKoqIoGON8Ph/WQkAftLlN04QDAaCeWpYFvAwMDPT395um2bdlAO5TkiQopyHkCvXS17Is
+CBLFYnFlZeUvJ47PzMzccsstTzxxeOvWrQgxzrnneaIo44/LJNcg5x9DfYCgcK3pPNwLaaHdu3eH
+QqHzYxNzc3OTk5MzMzPRmKIoCshMQUFLCMFEsywLE9TX3VMoFAqFwo4dO+66666XXnoJbLa9vd00
+TeBO0zSQQuGknyAI0LCNRCKu7XDOQeoBzwuaASHEMAxFUWCrdXV1aZpGCNm9e7eiKHNzc5BEZrNZ
+SZKq1apIKXhRWHXXdVdXV2dnZxeXFx944IF/+7cnwuGw41iSJHHORXG9jYO/+lTHmD97mG2MnAgh
+7iNMkSxK24e2xSLRjlT7+Pj43Nzc5ctefSNjzjnBNTUfi8wwjLa2NkHAyWSyVCoxgu//6oMfnD3z
+3nvvxeNxo1qBRJNgbFQrsGye7/m+71g+5px5rsd8jGuuLLg3kG4IRwLCBOF8sbx79+5t23b4DG/p
+H+gf3DK/OFc1KrOzs3DYJBQKua7rOQx0Kt/3BEFwXKtQKGCMv/vdZ0ZGRsLhsOu6kqSg2iEXgj4e
+Wv8vHM6mA1EKFGCM0+k0nELVNO2DsQ+z2SxCSBQlXdcRQrKkOo7DiK+q6ocfToVCkccee8wwrEuX
+Zvbu3fvYY4+trq6Oj48PDAxATxnXJbxGRRBKM9/3Pa+WtkOeh+pNYM91IfCmUqmRkRGBUoTQ7bff
+XqnohUJpYWFpZmZ2eTnjOI5hWJxz5jEoLCgVBEHIrmX6+vq+853vDA/fAJ3VxtTuM+QzGzD29w8R
+ANdPwkCSNzIy0tnZqWrhSCSCscA5VxQVTm3IkkpEAnmIKIqlYjkcihAsnD515u6774YW+ezsbG9v
+L5yv9zxPFEUoINCVljTzfR8MEMI+XKk9YYsQQkgJaXfeeWc4EvF9/7777g9Fwo7jRKOxbdu29/b2
+3X77HXADvu9TImCMo9HIyZMnj7119Etf+tKhQ4fi8ei6fhP6TAa+MV2fLbm8GsHNgXkGXeaFxeWJ
+iQnf99PpbkII56jmhWUNTpZBJ4sQUs86/L6+vj/84Q+vv/76+fPne3p64K8CrkUX1CBvMMbgmaog
+OYFQCQE2Go3ed999HZ1dlUpldHT05v37LcsimMLy4Hr3HIaVROJ53m9/+9vJqYnHH3/8vvu+BGfT
+1onAwZPTf7/h/yOphxdBJlOzUEEwTOPDialMJhOPtymKwhgPhUKGbsE5FhDaYHqU0unpyVAo1NHR
+cfTo0TfffPPUqVPRaFQQBEquqJ6sDs65IIjBl8KJOzCCvr6+m266qbMrrVfN7du333nX/1NVTdd1
+1/EDRTawX0LI8tL8L3/5y61DA4cPH+7sTIGMY9umLF85x7HuEYy/E//Ik8aNdxaUJzA64+zSRzMX
+L17EWIB0GzEOsj5CaG1tTdO0dDotSZKiqbOzswihjo6OU6dOnT59+p133rEsC9e1oEaTB+cfrATI
+k8lkMpVKDQ8Px9sSuVxu5KZ9N++/RZIky3HffffdpYX5oFyANBFMZPby9KOPPvrAAw/Isui6LuQw
+jDGMheDr0GeqWjfDP+WQ98c8MqqdD5RECSF08eKlXK6QSqUcWwfXBOlgLpfLZrNDQ0MCVRhj5XK5
+WCx2dnZWq9WJiYnjx48vzs0YhlGtVqE+gqMWnHNCKKT80Jjt6OgYGBjo7e31OQM/c+NNe2VZXlxZ
+fv+9U/l8/sBD90EiWA8VtbbETXtGNE0TRaHuORmIGRDXG2e32RnKT4t/GPW8/jhZY1/GcRwqCRht
+sEMxqrXLfeYLREAIHXnzSC6X6+3dHo/H4cj8wsICpTSdTi8tLWVXFhcXFz/66KOVlRXTNHn9lCul
+kiRJqVSqv78/lUoFDTU1pN12221D27ZlMtlKpXLu/NhqJvvUU091psI+8zHGBF+xX5/5lMiu64Ox
+27ZZrwEZ5+sfxP1UddM10MxHG4I5BJ28qampDy9+FA6Hk8lkOBw1TXMtm9N1HWOMCfM8zzCMcrlc
+KpVAoMYY+x5SVRV0HujcJpPJ7u7urf29sDnm5ubOnj0bj8fvvffeoaHBZk32ajSf+sb9a1nWufGJ
+XC5nWVY83pZKpQRCy+VypVKp6hWQzAJFF3JNz609V6UoSltbW0dHR0dHRywWY66VzWYnJibm5+e3
+bdt24MCBaDRsmraqys2a7zo0/zE2VA+YtVPqCM3NL0xPTxeLRUJoJBJpS7RHo1E4KVUsFnVdD3oA
+hBDPdymlmqYlEolEIiGKYqVSKRaL8zPTS0tLCKHR0dHbbrtNkij08Jo91yto5nOzjR4TzgpIkgR1
+um7oS4srMzMzq6troNV0dnRDAxIqBjjfyhiT5NqBZygLVldXoXdKsH/zzTfv2rWrvb09SD1bjywj
+VC/BGr0NSN6OZ1MqwTNWlYq+sLCwuLhcKpWKhYokSYqiKIoiSRL03DHGPnPgVBM8VogQisVibW1t
+N++7EVRr+LrNjvs2EU2jPvh3BcEDMXWw+l9r2Ztp2oZhLC9l8vl8JpMpFArQMIH03LINcPTg5ZPJ
+ZDqdjkRCMA4Ut/BmhJDjOCCBfR7QfOoD1Kuw4H4IVExwXRAw/IuQQEeDY2WqGoIzbpqmybKEcfCA
+mddY/jSUe58Xd99MXw90kIbjjAihxodGG8sZjlx4gVFwBc4+XnHfoGXU/x2Lu075qkeXf3nqW/i8
+mMC/IFrUNw0t6puGFvVNQ4v6pqFFfdPQor5paFHfNLSobxpa1DcNLeqbhhb1TUOL+qahRX3T0KK+
+aWhR3zS0qG8aWtQ3DS3qm4YW9U1Di/qmoUV909CivmloUd80tKhvGlrUNw0t6puGFvVNQ4v6puF/
+AQ3OKTzMr+QEAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_mitsubishi" model="fleet.vehicle.model.brand">
+      	<field name="name">Mitsubishi</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAgYklEQVR4nO19e7hcVZHvr2qt/ejT
+5/TJ4+QJRAjJOBpRYgaGR2IyiUkkINwLiBGCSGDk5UwQQRF1RCejM8PwMBDkERARxMuAIwjIa0Z5
+SAhCJoAYgRgwvPPOOX26e++1VtX9Yydn0CFOOpzcdL6b+vbXXz92r671W7WqatWqVU2qit20M4h3
+NgP//9Ju6Hca7YZ+p9Fu6Hca7YZ+p9Fu6Hca7YZ+p9GuA70AHoAHXB0OCgUckANoIAM8PIJHAEJx
+d6vTLgN9gzVYIFAASiHKCeQhq1/jtetg4QEbAMMgBEJjZ3O7LbTLQJ9CvSrYCCAMdgDyp8+78Pf/
+8B1vGmVBzZBCVMGMRGln8/s/0y4DPVxIlAIhggFgDVbfez9uusN977bup54BYGAIIANqgMJu6PuP
+xBAUAYBndgK41f9y4wi2Uff67KrblH2SewAqHhZqdza720C7DvRslQMAGOSxvPqj20qPPZMLBVB+
++wM9//FoHnMdpCRqJd/Z3G4L7TLQ24BAwgg5wa16+c1/uMK6airtJW7jjWtf+8YV8cZuFkPEDWkk
+u4CDs+tAD8ACViRA37ziXyvLX2KmgFSCYQg9+p9rr78nAYL6EhvsAqq+BaFXiAgABYIKFFDAC1gA
+A4qw5Em95sZ25Qa3A64E7kXbAPXVSy6Rlb8LlCoiSNAtrUFUw+YGPVpoc6L1oCcws4ioiCHWAizD
+OQVtsM/qy/9hQdTd8EhUA+BrcGziTE14c82qS64lCBoEQwrdvAtERMwi4rxrqenQctB77wEwMxMD
+EBEh9aQOHgnW3vcL/um/G5WAKCKyCExGSQBrg6v+8Mf1R5doRFAmkBIUClUATGzZtBDwLQg9GQYA
+BVQ1CBujIIASxLVNazde/L2hiHO2BCVFhGCU1TcikJo47dm46fIfILgijkAgIpItSoaJW0nftB70
+TKyqIKgqGSYAKoAamN9fuyh65PGMIiUQXAg+BxPiEmlM8IE1imr/9rMNt98TCFBVEQDMrNj8HK20
+Ed1y0CMIEQGAYQCqqi5YpTXL/tNdcUs7NFekgYmFgcxEdQipNrSewrKmqatvuHiRX/sagRgkPgAg
+IjABALWQymk56AmAQqACCJRA1kSo52sXLOpYtZriOCEmMCkzILDMIcA6UMTW5lFi2vKnlmy69ofI
+HEDMXFjbQu9rK2kcarlkEAEIuQZmIxJiMnDymyW/MjOOizNrNTjLGuJYcyE1Whb0OkoMeUfKIeqA
+9Np6o1LpeOzOPffZG5ERlULkCcVjq1DLST04gyIODgArB/i6dLfPvyzNmCECYzxZDQIDjQJyRWRV
+SCgObOHqCBxs24ZaMv8yFwdPYFIosRDg6/A7u3v/Ra0HvU/AHpEVzSyTJ7v29nvWP/QrANBt41YZ
+wOv3/qL7vkcABDKBFOoBtIUWiqu1HPRqkMNBYWCCF7y5fvU/XTMoq78N9z/B85aPlEtr19QW3iTd
+GygggoIdqW0lVd960NcJESxAJlgTYdU/X15+9rcR9Unr/8jw5hvaOdl0970bbryNDZDlnqwEhdlx
+jDdNLQc9A+QjTwaKdY881n31jR2mraEB4G3mlgEmJKyN6sXX5ytfdIkJiEDkqYVCmi0HfRocFFaR
+u57V3766Uu/OCAna3ulefdv1x+QE7dzmXl75xkXXNCDswQzebWb/FBGcBYKsv+eB0s+fsqbEHjkU
+oD+83umbb7s81IY0LVf8zT+LFz9tDACQtFB/W4iVgupMEcma3k3rF9zsGxvLvmQIWdQ0n5Yo57Lt
+9XFP96Zv3VjXLEMg7PZwtk4lMXVk+O718sgS5lJ3FDmOEl/9Q/Xyjp7KH96gIY96ayYhKm28607/
+ozuVTKOVuttKvBSUkax86a1Lbo6MZbLGZXEIVuNmm4mRJlmeijj1mqDnn69vvPZS6nYEx9tJLQd9
+XsKKBTena1aXQjBKgMYw2ryi8JAYkdEQ2zjKg3v6P9ff/aDaFnLsWw56AJ37j0USITEsDaKohzVQ
+03x6hNzGjol8L8c2lDrKo0ZoC4VwWg/6OGDkZ471syY2sgYBERsR9iY0245Yr14dsQX7DPTXnxw2
+fQa3kG/ZetCDvUc04puflxF7eoRMss7tCq+aoBaGg8uh8b7jur54hjdNG4wdSi0HvSgnSDr/bL/o
+3JOqxjrdFJDFGjXbjtHYG0ngN1ru+PuzOofvUYe0VHdbiRcAgDAbBSiqHH2YHz92ELRhGl6a1tEZ
+0ih4j3r5I/unsz4CRoQGTLYjeN4+ajnorSAg10gqe4+pnHLiBlSiYCKuC8WuCPAAMZgh9ZQdaYK0
+16rnrB0AxFPkCIFFo54Erm67ur5+nq+0IfhUY49kZ/fvv6jloAeDyQrYAHt/8mPhE9MTxJkVq1kJ
+moIUkhEMTJRLSVngEg+C6YUQopQoVU00iPga0HXOnLaD9iuRgbFOmp87O5JaD3qAAjFAkNrAgcMv
++Oy6ri4TxMMBwkAEE1QUiEQI4uATkCHrQUTs1DvkHqEtBP/B/SrzPt2IywYSvLcmNi3k1rcg9Aoo
+kUKhcTAd+3+4dPansqAh0kYcqsiZGSAFDIxCxABQEorBilAjr5Zzq0pJ53knhZGjSp4D1FhLHpDd
+QeOtk9DmpasFWSWrGHH6J2sHfcC4ECk5qIikIAc4hoMWSU5OhcGsakhLYo0DHT5xwLEzY4AFdvOW
+OPLdWyV/ghyoFwgECDcIUESDhww+77M5xZFDSlYhhiiQeAkWlr0wOJABhCDlQEZEBgzuvOB0k7ZZ
+hY8A4XpwauFbqb8txEpBFkggCoGCDTLkpDz8iCPw8UM3go0yGKp5pGrJWk4IRGAy7KEBgaC9Jo1P
+OTI++BDk6jUIAYLUGA/fQv5NC0JvPGwWLJAzYg+wQiS1yfBzj68O78xJlUSRxyAGauIEFKCACILj
+oKD6PsMGX/BpALCWWOLMw4CCRsqmlY6btBz0sEASARwTYJEggbFgdB4yq+P0Y2u2F0GFB9YQmLwB
+eeODkXYfE2K2ssbIHvO/mAwYnQBgMoiQWBBgDIjRSqGE1oN+K+SBP/+buY0DP5RCgQbYGrEMSRQU
+OId4atg8jDjxf1eOnFSkybY47TLQq/H5oGFd8+bWCLlUDZkMJAiQQJQGcrHxecfg9JRjukttfvdp
+8X6kSJQ8RsyamR9+CEBM4hA8c4AVhGBc8JqeMXvAoQcmwZld4fTmLgM9JIoM4rTSdeFZ1aHD2YcS
+sVELTlPNIu/y/fcbcPZcqEmZuZVWrVujXQd6RkM9gMqEv4xOOaYbnjgk6qyogfccl796ejpipPM5
+CLoL6JtdB3plscwwiMTufc4p+SEfrkEVLqBRK5tw9F8NPuYIk0PjVMC0C+ibXQd6QIooAAu4q2vY
+uScK23qijp12de5x0TmpWIkQARwM0EqpB1uhHQ+9h0MOOGTFKVZfRw1oesuCgs3hc9QBJN4OPero
+7KiJSdYjvIbPPD3dexxYGI4UnhxC07taHpKjBvHIgBwIWQMZ/A40Gjv8VImI5CzWBR8lCZB5tZas
+ND3oGuAMAnJWSjRyXqsvPPnKQbMrY/cadfcPedhINRCICQRDubqYmkO/QMHlDY5TAjwg0HRHHr7a
+4UqREVJE9ciErJteWRsNHhCc9nqvTS7qSwTJgo2jBjvjmeKY9upKjz8CY8ZUB2i09s168BT5itqq
+hJAgzpsbW/XMaZR4F2pZts9eMSICkQh4RymGHS71OXzsrdjw0pe+nf30wcjEqPskNa7JXHcHXwrk
+mI0x9byX2mPZ6AZ9clb3um48+mgMDtQWpJEE1GxkyFttrv0ykg2StUXUm9Xaz5g9at5pASzojVBu
+qp1tpx1/jE3hNaz/2X+8efw5Xd1rc1DM1mmmWmqqmcxwBaEO2GA9uYA6V0aOeOLWNct/0/u/Th8K
+12s7c9+IEQmnRjJpMtuJIASCEYSsvsfoPe67tv2971crhKbNxjbSjjezqpbzjdfc0tm9KTFlZ0oZ
+xR4lYdPUFYnJQzCwAShTCWo7P/cpO/a9g6ZPNEdMdiAPT1FJ4xgSgKTZ9nNLamwvawml+LW3ui//
+V7CK31G44/+Bru9h8nc/WP35QyljY4ChSNSXkfomlz0ekkSD6sHBuN7Q6B7zZ6NOOS4iRMmQAaef
+su7h31a6NwVbUldvg/Ww3OSqisR4IAlpDaIJ99z60+45H4smHtLc3GyGdrjU04baxgu/N6inx1un
+LJGqGBV4BzR1MWXBqQiJ1gP7MZ/9VPyePQmeGOnhU/ljkxLEvSpkoio3MtZm288Re+J2RD6KKOtN
+N7216WuX2976jkOm36B3urm+pAbJiyWNR4aw8fqL6888G6Ei0pEIe/iYogYRQ5u7tK2aNNqwiSXw
+QQfZucdksNAA1RTR0K99bu3Q8oBQF0VMBsJNt48G1DUoJC4IyiVpqz7yq+qNVzYQin55AKIKQPqn
+mGO/Qc8EDYqgMFs2JFSzXz+35tp7ynlmYdUHBhMbCcFo0+mrFqaU+RobF3eWz5tT7hxkmUERQAIM
+et+YwV/867VwZBoUTNz8apYBJcoj8syelDhOg1t19Z14aaXxCAzr1LNSgBPpFwvQb9AbURgCq6pv
+AFEOb/JV/3L1wOff7EAp581HQVRVVePm3YYMYkwEMW2zP95x1PRgjRVIYAgMoIaSOUfToR9mV/cm
+Bjc9tMX5UO89K1iRs1aQtj296tUF1wOZyaCGCII8D5ZNf4Tn+k/XkwIA6+a6How1y56W2/89prjH
+oKY+YguAVQnqqGmPNuO8zl4HdQ3+/Ilt1O6DB4QJCIgVTkw6bMSeX5ib2SSLsoY0nc3t1cdKJSGr
+SMA132gwtcFWv39n7/LnwQgM0oDEAIA0PbT/nfoReraiCuQgllDzPbUFP6pUe2oIDfEJGUucwUdk
+CJQ3r3DaGMF5nj2t9KFx5BGLBwclFPPHKiVAecYUP+XQuNGbcNps+zlCxCYikyNY4hQm01CDDNiw
+ac0/Xg/KvHgio0wJ0C9L3H6DPggCKwkFBVg2/fTe7P/cq+Ay2TalNiEnQUCFuMe2+aRtX49G7z3o
+c8dDbbBAZBCCI4DhSJnh4ag8cMDnT7WlDiPN5+ObuAHx0IyQQWJwDI6NjUzc88O71t96B7OSWvIB
+EO2P0E7/6XqChyJoG6y88lrvZTfYxjrLbRARSA4foCUbK8RBt2MXqW5LpTNnl973gUK5Bxj1m0tE
+MTSQBxApumZM9ccduQG9zbbPigxBVRK2QnAQp46CSOCBcGv/6ap41RveKTgKW5Tru6T+UzgKA0Fs
+AuH1W+6rPvZ4exxBbA2SWeOs9aTkPUGQRC407YFEHxzbccbRDoyiBJEwxUkcQIARBDSsGABkueP8
+03RY04EXkhAZmwBJUFLAWGHjCYTIWB+e+fWqa/4txAQCox8UPbYP+ncO+1CwoF5o+M1vw0XfHUyd
+9bxMaFhQ4sFeSsIOyMFxFnjrvytMhF4itkiBAMoNUEtC9ze/3M5D2xWOJDCEVQmOxTNCQCztgblK
+niBdo/bpPf/L3baasmUoAQYJrGE0sHXPKoCskwyUQ40ihGAFRqGQTaHUAcNXXhOeWFKXwGocBwQt
+imjK2wqqFQU1t5Gahl5kS22yLZ6iqoqIJ8Bbhl918TW6dp2DNda65rOqWZTjdqc54OtxBPUejYFH
+HjburybCsqgwsQFYQIqIGAAzAzBADHbikdBffvLjduJfZNKrcHUGIev1NY3ao+ZrJAhCWblOca27
+5/UFN8SGpFcZAiaogolBKhJCQF+5wm3sabOsvB334iURMTOJASN7Yml++93tYFDkvZfm56aQ5LlY
+sADkOU/gE5v+9WyUbKAgm6tf6uY9DFEAZAAogsTgiG1GEkYM6jx1Th1eIhjmAGmLU+dkO2qfRQiA
+J1u2Qd2/3rvhvl9wyRDUkzoNuqWI5uYia82EgbcTehFRVXqboTeERrX61kVXpz0bPUVFokDc/Clv
+igygDGYEK43cUem4w5O/OqARnBo2IBWRvsqJTCxQVRCBCKIGrMwZMPiomTrtIHWOfSZsjBMDH5r3
+TAyoDrGCFEln7lf//ZXo3iQwALGxoC1FBYvwezPtb6euLyQdm6tJiqrmhI3/dnftJ/dpFOWqFiFB
+EGk6oV3zzEaJg42hKVy8974DvnY22ziykQWRghRsjZB6RlElZ3MhVyaIQDSFTcC2fcCwCz+XdbS3
+WSIRVY6goXnPpAFEHEtoBAhMe/LLJ19eeBUpiQQuapAUSoZATY7rdno4xc9snm7MRNTz+svdl32v
+zecU4naUAgXC9oSZLCASguUMuUMon3UCjR0TqS+K5EKVmLcUhiZRgYiK+OCBIqeVIDAuQGXgxI/g
+lKMynxsQ4sQhbEd514xNScgb70EuUBt875U/7HliWUxGfSgsn9IWE7hDzezbqU/neO+zm27XZU+X
+knb2FkCmKrBx8zUJYluSkBt2PcjdQQeUTv546kBkN58LIYJqgAIwQKQUSMlwxBZBNtcvJsAaEEtm
+Bp99ytr3jCCjtbwBpNS8mSVEChdxZMgqgjdR5xvrNlx9IxqOyRQKL0CVAG1O8N+Vc9mH+/r166sL
+bzGsnIERVykDsVAM3/TSJgsSwUZ5b9pWqpzz6Y6Bw5hFhAWF2G+uO8ogCgKhYIz3Hrq5grEnOIIn
+iArHNOg9fz7k88drqJZgAlJqPqyWiMkgsTOqEOtCUIM2+cm9K575NXIHwIsAtGV9uyOh9wAgqnXA
+k1KvirO++vcL01WbYukQWCCLFbFC1RmUaLMF3NbLaVyCdYh0+kc6PzHTgeFZ2ZlipAnMbAALgmFY
+xIC1FgwYAhABEWCBiAQCEXSd/pnqhL9g9Jao1pD2ZvkBMkYUoASx3jAiB402hPTcf8ywLoNGMARY
+DV4z3wyczVdXAohZKIJYCEDS+I+HqjfcquTf+UJo6uKotxvdaGuvnHVcjDQFQrI99TwcxBsYQltS
+6fzCCQ1Qj6knSb1ZfhRBIQr5o371PPZI9013enKkCI3giS0b63aorlfvQ27EAKhbJD0b18y/akD1
+LdXwzhdcU1fqexngk45omz5ZEFEOE9Q0f+jSiloPrqmqjY/+KI6Zyd7ZbGOz/PzXAPxhvwaKe+nr
+C5PfrnReTGocgAA0U8Gk+W1xQsQxAoEQAat+/O+9S1/G8OG0taPYW6lvuDUsextxPOrPRv7NSW0o
+ZwBzYKKck2YXCMKJIUEbCyFOBnXOO6ln6Yp13a9sLWi6NRn8byUtNjOeU3upbpd/55b9FnwNjpKI
+YDgDbftJuabzcIKKUc4RikNhPc8827FuvbGi6Nwq8+/47lZGyoae6qCuIR/YDwGwmzOogOaFxKMI
+s4WgMBED1SVPwW0CKu94+9aCqfLHVZA2d4dQpRBtMOicOL6sVsioUhR42/lsGvociAGoQFD3jRKn
+iABhUP8k9waYBnHZFYVCQ07eIhY0nbadAYlCyXlo5GMn0BgxBE3v0hTQ/zcByiwsBeuN97AGapSY
+ArY9qa55qYcEIA4M0pw1DlDDNTRdcmNrlrOIx6Aopk6gUPzhRRPSVJADohwwooYpIDNIADgJW6nb
+uDUU3olPAcBgzYImxkAyUKKkBAeJt9l8bkfinwswCq4DHQIUqUbKTXshW/lZJaeqLNYxe0KicBQS
+1WblPsAzbAakgqDBGPLwVnWrQrI1/uWdeCXpJk3Bcc4ao0iK9SGPDP2JuPQft9GPOZciwsz1et05
+V6lUAIQQjDEAenp64jg2xjBzcY+11hjjvSciY0ye58YYVS3uAbBhw4ZVq1ZVKpW99toriqIiLuic
+M8YUdzJzCCHLsiQptkvZe1+8b4whomKxXXCVZVnxPm/ZVn3ppZc2btw4fPjwESNGFPc454rAXNFg
+8XXvfaPRaG9vV9UQQgghSZK+fr0r0n6lhx566GMf+9jUqVO/+c1vFu+EEK666qrJkydPmjTp4Ycf
+FpEvfelLkydPvu222+68884pU6ZMmTJlxowZM2fOnDZt2qRJk77xjW+EEG644YZDDz10jz32GD16
+9EknnbR8+XIRefzxx2fMmHH66aevW7euCNvdc889U6ZM+bu/+zvn3G233TZ58uQZM2ZMmjRp4sSJ
+xx9//FVXXbV27VoReeONN04++eRJkyYtXrxYVV999dV58+Z94AMfGDZs2Pjx4+fPn19EABctWjR1
+6tSFCxe+vUff+c53pk+ffumll6rqddddN2XKlAsuuKBfsOo36EMIInLnnXcW4jBq1KjnnntORN58
+880xY8YUw/yjH/2oWq1OnTrVGPPVr371lltuaW9vHzBgQPFpW1tbpVI555xzLrvsMiKy1o4YMSJN
+UwAf/ehHq9XqvffeC2DcuHGrV68ufvHaa68lopkzZ1ar1csuu6yQ/cGDBw8ZMgSAMeaggw5au3bt
+qlWrurq6ANx7773VanXWrFnFVBs1alRx2yWXXOK9//rXvw7gjDPO6OuRqp588skA5s6dq6rz5s0D
+MGPGjGKo3iX1X/YZc4FXMVtfeeWVBx54gIh+8YtfrFixooj2JEkSRVFbW1sxTrNnz16zZs2zzz47
+evToOI4XLVq0bt26L37xi5deeikRnX/++atWrXrsscdGjhz54IMP3nXXXQMHDmTmKIriONYtigVA
+qVQqnhDR9OnTn3322TfffPMnP/lJuVxesmTJzTffzMzlctkYkyTJr371q3vuuWf48OGLFy9++eWX
+Fy5cCODCCy986623CjVljCnUTsFzoSHL5TKAQmemadpsfPidEXv3TRSkqgC899ba4uXdd99dq9Wu
+u+66QjsDKBAv7iz0dZqmhR4PIURRZK0VkTVr1jDz6NGjrbX777//V77ylSlTppTL5Xq9rlsUbt+O
+DYA+ta6qxphBgwYR0bRp00aPHg3g9ddfL7bSCjW9fv16AEOGDNljjz1EZM6cOSeffPKHP/zhYpsJ
+QEdHR2FFCjvR3t4uInmeAyjex9Z2p5ukfkvyLhi11uZ5vvfeextjFi9efP311z/yyCNDhgxJkuTV
+V1/t29ft60OfverbYBs6dOhhhx324x//+KKLLiqXy8ccc8yZZ545d+7cNE3vuuuuYmL17Rb02dti
+zhljrLVr1qzZtGnTgw8++Lvf/c5aO3ny5EIaCvN+wAEH7Lnnns8888xXvvKVL3zhC+PGjbv66qu9
+91EUFRrm97///cMPP5ymafFy5cqV1trCOItIYaj1D3foto/6TeoLcS7cjDFjxpx88snVavWCCy7I
+smz27Nn7779/4UUUI1SwXmx1FcPQJ8jGmCuvvHLatGnPP//8iSeeOGvWrPvvvz9N02JcRaTov3Pu
+7Z0vxD+E0NHR8fjjj8+aNevcc88FsGjRopkzZzYajeIvJRuNxogRI6655pqRI0fecMMNkydP/tu/
+/dvVq1cXGqxo5Pbbbz/66KOnT58+derUo4466sEHH/Tex3GM4q/5QvDec0tlnxWat9FoxHEcQjju
+uOP22Wefnp6e4cOHf/rTny60SjEwfZ5iMQnyPO8T5OKxq6vrrrvuWrBgweDBg++///4jjzzyoosu
+6gO68ET7GilGTkSiKMLbTA4RVavVhx56KIRQjFnBobX2sMMOe+ihh+bOnVuv16+44oqpU6cuW7as
++CKAcrlcqVS6urr23HPPAQMGJElSuJiqWvxEMdX6AbF338TbyXufZVm9Xh87duz06dMBTJkyZfz4
+8bVaDUAhuX18F7LTB3rxfqFYoyg666yzli1bdv7551tr58+f/+ijj5bL5UJ4+4SueFl83XtvjFm/
+fv20adN+/etf33TTTaNHj77++usXLlwYQuj7ive+Xq/vu+++11133f3333/44YcvX778zDPP3Lhx
+Y6GXTjjhhJUrVz7//PPLly9/8cUXP/GJT/Sp/rc/vnus+tnMFj0s/rj02GOPrVQqZ599drVardVq
+fdqmTwALdV+IZJ/S//nPf37qqad++ctfDiEMHTr029/+9mmnndbd3X3fffcVS57CaBcKp0/SC/3b
+12Capscdd9xpp50G4L777iswLQZp0aJFn/nMZ+644w4RmThx4ve///399ttvyZIlzz33XF9rxUQp
+pKTAuviomGdJkhQdfJfUz1JfoFOs9w4++ODzzz9//PjxzJwkiYgU2qaYvMXyFVtsFxE55wDUarWb
+b7754osv/tnPfqaq3vsC0J6ennK5HMfx8uXL77///iiKimUUgEK9FMNZuElElGXZ0qVLrbXDhg3r
+E4tKpfLCCy/ceuut8+fPr1arxc8VhqRer/etk/sYK2SlcDcLxVj0sXjyLqmfPZxCb3R3dzNze3v7
+ueeeW2CUZVlxT6GXC2+kkHRVrdVqhQir6tSpUw844IClS5eeeuqpRx99dG9v7w9+8ANjzPjx4ydM
+mPC+973v6aefnjdv3h133PHaa689/PDDAA488MBCEkMIv/nNb+bPn1/4V8XC4thjjy0+KvA94YQT
+rrjiiqVLl06fPn3y5MmLFy9+6qmnRo8ePW7cuEceeaSwokWP+ryawtUpLC22zOl3T/15grAweoMG
+DRo4cGABazFPC8ejo6MjiqI8zzs7OwupKaQpjuPOzs7e3t5C6tva2hYtWnTeeectXrz4u9/9bhRF
+nZ2dn/3sZ+fMmWOtvfTSS88+++zly5ffcsstIjJy5Mijjjpqzpw5BQPlcvmNN95YsGBBYXX33HPP
+T33qU0ccccTrr7/OzJ2dnd778ePHX3311d/61reefPLJJ554goj23Xffyy+/fNiwYUmSpGlaLpcL
+H6xgzxhTqVQKp6BgvvAj3n0Mp5/DZ+vXr1+2bNmAAQMmTJjQ532HEIoV5oQJE4YMGfLkk0++9dZb
+733ve8eOHRtCcM4tXbq0p6fnwAMPrFQqRZecc4U8hhAOOeSQQw45pGincKIeeOCBVatWdXZ2fvCD
+H/zQhz5UaOSVK1euWLGiMLYA4jjed999R40a5ZxT1SVLlqxfv/7ggw8eOnQogDfeeOOXv/zlyy+/
+XKlUDjvssL322gvACy+8sGzZsvHjx48dOxZblofLly9fsWLF+9///n322efFF19csWLF8OHDJ0yY
+8O7h+r/1/dOsIDDTPwAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_morgan" model="fleet.vehicle.model.brand">
+      	<field name="name">Morgan</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAbkElEQVR4nO182W8l2Xnfd5ba6668
+l7zcmmQ31WK3ZnpmPIs0moElWY5hOJBgIAmUhySAoQSGgTwEyB+R9+QlCAzECBI4MOBsliPJiCxH
+mn3rWXqm9252N9cm71p71Vny8JHVd1rT1mhmnEtA9/dA1L0sVp3zO99+vkOitYYpJgE66QH8+mJK
+/cQwpX5imFI/MUypnxim1E8MU+onhin1E8OU+olhSv3EMKV+YphSPzFMqZ8YptRPDFPqJ4Yp9RPD
+lPqJYUr9xDClfmKYUj8xTKmfGKbUTwxT6icGPukBPBJKKUIIIQQApJSUMQBQCgCAECAEAEBroETg
+/Ro0ABAgxw84uVNDnLjxZVnGOWeMUXqkkVprXAAAoB/XUkJASn18TQghQIhSSmvN2MfuLDu9ykdN
+HOSEd59prZF6JSTjDwRFSUkpBTIm5eWvlFJKMcbg40Tjoyg9KTb2JFKvtVZKUUo/LqFKKyWl5JxD
++b3WmjD8Ha4QJfTBr47V5eRI+jhOKPUPSSt8nD6lVJZlUkpKqZCaMWYYBucMb5FSa60NflKk+1E4
+idSXkFKyY5stAeIkD4JgMBj0er0gCADAtm0hhGVZvu97nucjPBsAxk19abVOlPifOOqFEJxzvGCM
+EUKUUlEU3d7r7+zs7O3tKaUcx7EsC12xTUFrLaVUShmG0Wg05ubmGo2GxTXnHC07WjBCyMkx9HAC
+qS+tDV5IKTc3N2/evHl7f2RZ1szMzNzcXKVSKf0BEylqRpqmURTleU4p5ZxvfGnVsizbth967MkB
+yfPcMAwASJKk3+8LIWq1Wq1WUxqOTSdoDfyXRaFEiwcfcDkJAQBFGK7uAwcIoEFrIEqDlFoIIYQo
+DboqBs1GC6TWYGYKXr747sWrV03ff7a50FmaSYrItN08p1op2yo0iRlxQREtqcnMURi1Zlt7vcNR
+PPJMt1KpLCwsWCaTChiFIExwLRljGL8eh6NAycdyy/EU4WPzGr/nkevIhVCEEMYIACgFUkpCCGh5
+8+bNVqvVarWO7jMMAyXCcZzd3d1Lly5lWdZut1vtebShvu+bpikEZQwekhtk+EhtjmwpOWJWawKE
+HEfZWmsJEkVVCKGUSnMlhCiKIjtGnudSynqF727vt9qLs3Ptl19649a9O6cX5i3PnWnO5TIL06Tp
+1yzmKAWKZIzyRFBGKdUkkzqI4rpSjXrdr7jdg97BwQEhZHFxcXd3dzQapWkahqHjOJxz27atMXDO
+KQi0SJTS8awCCH/Iz+N0CiHwzvHwVoNWUgNAnudJkuR5nmXZaDQaDofbW3er1WqlUsGVSNOUAwCy
+wzlfWloSQly5cuXKlSviw6vIO2OMMYZOzLIs0+Q4DkqpaZqo1IZhxFmO4yaE4ODwNi2zoymgEigl
+hJBSJpkUQmRZVoxBCEEyfWPz3pNPO1dv7ly+emNxqXN2ebFSddLcGgz7hdJxVuzt9EZhVhQJ5UUC
+hsrzimUttmeiOMmyzHJt03TrZxr7+/v9fp9SurW1tbu7W61WGWN5nqOepWlqHINz7rvmuB8up8AM
+p/TScOw2tNacUCklkosjl1JqreM4TJKkKAp0Uf1+vygK0zTXz6wtLS3Nzc2heXRdl5fZh5TSNM2z
+Z892Op2tra1bt+91u9179+5prZFcfDHyy49hmqZhGIwxw6uUX6LU4DLUHIMQgvEfY4wSzhmlRGmi
+cNDlQuLcRsO4UW9luXrvw8vLp1bWV5c8k6S97r6s3NvedSwKzL1xeytOSCryKB1Jx40HvflGtdVq
+JYXo9oc1per1ulKq3W6j8LZareFwGARBpVIpHS/OwrZtnJ0WhQYg5IhcKSVSGWQRfkRyxTHyIEKt
+LYoCnTzer3QWRZEQAplxXXd9ff3UqVNrq6eQQyklADDGeKlZZRhXrVbPnz8/v3Dq7t273W6Xc55l
+2c7OznA4ZIwpAuNS72rXN7hpGphDEkI456UoUUpt48iTSylROvDnYX+Ag8aFKZWPMPPx849/cPV6
+e252ZW1VgRASdvf7r9+91Tu4e35j7czpBqXbUinCPWLqQnLFHOAWcKM/HKgiz/PcNF3LpjMzDdu2
+gyCwbXthYWF3dxcnq5TK8zzP8yAISvMyP9suxaUUBa21Q00cM8ZROIuiKIRWaZGHYZgkiRACAPBP
+LAPW1tbq9TpKVafTWVlZ8X0XtUkIgbcVRXFkcJRSGNLhCwgh9bofRTNRFEkpO53O6dOni6JIkuSg
+18WLOI6zLMOggnNuWja6L2T8AY6jutKAoozMzLZxvS3LMk0TR5PnOVVGbzjY3dv66gvPayqAm9fv
+bh0cBIZVYYYjpeaUUQpCCMEpMUydKsswtZZC5EopTUmcFDs7h4tL9STJHMcKQ5LnebvdbjQaURS1
+222Ua3QzKAda6+3t3XFrg5xorYsxJUBrieKfxolSCgCqVd/zvEql4rquYRitZk0pFcdxHMeO47Ra
+Ldd14TjE4sfhCscrpAhJR/oAQGlYXJzzff/y5cuXLl0ihLRarXq93plfMAzDNE1KKSogjqDIs4cC
+ZxQf17JL6nFV0HTmUuB80OxiaJim6WMXvvrTV16a6zTrNbs3CoeJeOPDG0EiXnjxW7Mznkp6/e4B
+iMIwaSaKVKZcUS0LkaUWh5mZRrM+k8T5QT+wHckY81yr2WwcHnbDMCSE3L59ezQaGYaBbtY0Tc/z
+0JnRhcUyCijNi9ZakQd2H/UAV8WybdRXlGL0q2maXr9+fTAYKKVOnTp16tSpZrMOAEKoMrvGkFJK
+ycfTjVLw0d9ICdWq99xzzywtLV26dOnGjRtpmnq1mmma5dDRVlqWVXGscVlnxygKia8slR3fmOc5
+yh1elP7q9p27o9HomafPhWFXSHjn/WsxMGk5L/381eefPddqeRXPp0QXeZYLBQw4UUoLLYTJGOc0
+z/MgjPMCut3E9/0gTFzXYYylaep5nlIqCALTNEvrXBQFRpm+45aGt6QCAJQS6hhHNgc0aHXYvZ9l
+WRzHSZKMB2k2M9bX18+fPz87O1vKIedH6l4uFcFlhE8BKeXe3t729vaNzTvdblcI4bq+YRie6/u+
+TwhhBndd17ZtfHSpGQbRpZvlnGut0VYSzkajMIoi1/Ecx0vTVErdqNYGaRHHcaNRcz0nCPrDUV+I
+ol6v5nkrHG2tr83HYfqjH78ZpGZMdKzzAEwrVxUY/OPvPtOssiRmKSFmhRUDu9GQlkVAMKVAQp7n
+PAwNDgOwKwVwItLB7uZ8q+ZUZyR3ucrH5bq0MIVURVGkaYruEaOaPM+jJBJCJEkSBkGSJK5lz8/P
+dzqdx77yZXR140Vv+KQS3iOpR1Uo485SWfYOu1LKbre7t3d/OBymScY5933f8VzDMFAVMFjG11cc
+qxzBuCIf9nvdbn9pcdl13SwrCGGiUACgOBNCME4ZY1IWAICWPcm9epVGwUESph9c2trt5dKyMl0A
+zfbvHJ5Zan/tuVXLMhTUwlwzD6qSHw63KhXPYI08z7khhsPRfGtdFYdhQQg321Vn+9r7MhmcOXte
+GW6rXi0d0jj7cZrhGuR5HkVRHMdpmuZ5ronu9XqGYZxeW2u1WgZl9Xq902kVeY7q/kul+VNJ/XgW
+Poqj9977QEq5vr7ueZU0Tfu9wd7enpAFuiA4dh5HgXyRlw4WvQK64vpMKwzDSrW2t3ff9+qUsrtb
+O0IIZsP5c49tbm7ev3+wsbHR6SwIIaIoeu+jm7tbN5947EvnN74ShHpzd/jSO+8S10r23v/Gb353
+cWW1G+y99Orbl691Dce7P9j6znMX3Lr981ffiRMvy/Izp+tfe/rx//TH/8Uy9TNf/0aSZgsz3tNn
+5mkRVBvN7jANR8PSWpapidYaGMVYBUXetm10D9VabX5+njO2tbU16PaazebS0lLFs+HhrPORBYxH
+1gcwzkHKMPwAAMMwKq73G09eeOedd370l//bdd3Z2c7c3NyTFx6nBkeXW6ZOOHROoDRw+Cj8GGd5
+GERpXhRSL6+sMm4nOezs7l148nyrNXv91q16s9WYmbt2/U4QRCsrK3OL83v7252l1fc/vHxn6/63
+fvf3b3UPX3v74ne/+axZ8f7jf/3zUKWmO9NNyGB7d3Gp/uWNM6fW1/7m9Y9ee+cqIYSZi//yj579
+73/2P37yypvnn//tfhwOu5tPf3l1aa6xuLiYawpAy/ARxRwFhRocHSPnHAULA5gsS969+Pa9e/cY
+kI2NjTOnV02Ta/3wzs3fUjh6JPWMsfEsDn0RAAAo13FffOHFtbW1t9+6uL+/G8fxjRs3HMdBifA8
+rywrEkI0I0VRlAKFiyqlzITsdfuM21kqbty8kyvodBZqrU4YDgkMkrhot+fSpHjvvQ9FoWaac5mC
+/YPB3e3D/iDeOzy8vnnjxubm1Rt309+58Bf/84f/68f/1666eS5J7oS9g/Nrv/3yT//m5Vd/Pluv
+R8MBpTQaeNc/+ugffOfvf7C5u717kGXZnG/1hyOzGHmeF2XCdrxP5AF9KfqnNE0xxo/j+P79Pc75
+Ymd+Y2NjeWnhiOhHsfkrUQ/HPmf8+jjRVmmaLi0sLn138datzcuXLxvcYIwAqDSNsyyhlKLRZ4w5
+jlOmjpjOoV1KklwpoFoXUsVF8dFHN4JYrayt/fCHP/32t7/d7QWH3dH6GXL/4KDfH66eXhO2ffH9
+q4+d+41z559a/tLZQVL8n7/+maB+BvYo05SZf/gvvj/Xnv3P/+FP78rgt154+md/9eOt/Tv//I/+
+1bsXb7/66uues/Luu5fuXN/+w+//Qa7ZK6+8ImyHEE0NQ4IuhDKPd+G11uNpalqk+E0ZiWGt6cza
+yvLy8sLCgm1aSikKBFNhdczYeJz9iWbnkdQXRTGe35f1DczHsBirtT59evX06dU4Tg+7XSnlaDTC
+qgXWZ7CGXi7euA3VhIdhDNzq94arZ84Tfufl11578513DcqlsrKcKC29amXx1DK3uF9zL9/rOl5T
+U++HP/rpMO6/+Pe+3ZpduHW39+Zrb37nd353797u1q0rZxbaWqSPP7ZRb9afeP73anc/cCq1b3zz
+xdffeI1ZNrGbf/Jnf/Jvnjj3zLPPX3r3nSwaZUnaF7EUd+JCu7ZVzhGtDZodZh5VpAkhjUajXq/7
+vl+tVk1Oy8IZpVSJo71i+qmDxkdSX1L2EBgnWGGVsmAMpVi5rr3sLgLAcBhUq1WtteM4hBAsJOH6
+HdUJCEE3W6s1N+9uOZX67Ts7/eHAdry5ufk4zT3DiqPCcfwkCYMgeu65ZxgnvV5vZ3vftmtZroej
+9NW332ivrDx24cLtrZffeunl1c769//J9wajnZ/86Adbd28994/+4Z//4C9ef/MwirffeO/S73/n
+e/PLS/f7QS8m1Ov88b//d/+63kij4dxsbWmh06rYrdm5UVLILCn9ExxH95RSwgkAxHHMGOt0Oo5t
+SaUZJQAaALRSQkoK5GjLXilgD7z0375D8AVvlZThf5qm9Xp9ZmbG9muWZWG+BwCmaSql0jQVWTEa
+jW7dunX/sGcYBgCNkwQALNfTWsdxjG6t0+ngLoII05HijgqNSv3f/uX7klcsyPupsTc6kHn+1Hr7
+n37r3OW3X7LqbcO2VNwPZDNJoziMFhYWLIPFcex5Tr/b88HM86TVrrealfmF1vnzZ2ZnZ0yLE+1z
+zsuCPmZhYRj2D/ZGo5FlWaurq+12e7zo8jnxhfXh5HmOxn1xcdH3/f39/YODg52dnZm5BcuyMNvC
+BBrv931ve3v7+vXrN2/fJkddBcRxnLs7e/Va1bbNIs2SvOgNA8Jtr1qNRveZU3/y9PzXnnl68d2d
+j25vFTof5obvOsMiE0K023PxqbU794d7+3uzFZOI3ozjrDTbcTwUiaBCDEd78+3ZKBSVqqNlsbm5
+mRfxuY2zrluJosDgR1WNLMuSJEmSBAsbNietVmt+fr5Wq8Fx3PyFMPaFUW+aJhz7k1qtVqlUWq1W
+EAQ797txHPd6PUxu0frbti2yPAhGrVbLsKyikEVR+NXK8tLKS6+9EYz6Z0+vCSHCtHjn0rWdfihC
+EcV7v/fdb8w3rTAcUZC2yWSegk3yNAYtRV6IQjpOZWG+bhgDXoSdFl1eXq5W/dFwOBz2B71+tTrz
+wgsvvHnp+mjQ45yvrC4067XhILx9/R5jTOhhWVXFQrrnebOzs616pV6v48illGiHcW/yczL2RXaf
+4eDQmlNKm81ms9lcXDoVBEEcxyhTWOks0oQQdmSRXM+2ba2J63uNuus3Gn/9Vz9cWOi02+0wV9XO
+qZ+9/eH2Qf+f/cH3kljlIqDgDHtRmkvbcqMgZ4UEojmnlBCD8q9sPCbBOLh7/exabXl5Mc8yzvmN
+a1e1VN/8zRcff/zx2VPLAMCokcZpGIZEEa0gTgupYsdxao066q5lWZVKxbIMtNZolkv/d7Kox66Y
+UigwH8EECjfGKCVSquFwuLe31+/319fXOeeEMAlaFDKKoiAadbvm+uriR7Ptre17XsWXYHQ6ndMr
+I9v1d3YGb735wddX504vblDqyyINRaG1QyGBoijynHMeBIHc3q7Umu1Wq9qaIVYligqZJFsHA2J7
+zfmVW9sHhYpc16dEm5bRcWddx0+idGtrq9luN5vNRqP2i/OCj9uZ8crK58EXRv141WJ8oEopSgih
+BAAop62ZBiXatoy33nqrWq1Wq1XTcRljUqg0S/N81K67Tz914cc/+em93fvN2Y7ruE+eW1tbaP7g
+Z28bWs/OzoJhSMqBmVkcGJajVGLYDoCmWkuZj4YHXtX78sa64VuEUNPxrt3bTgr11FPPGI5//fbd
+ms9AEdvWVNN7O7uH9w9d16/Vau1Ws1KpEAAs8KHijjcCYWEHU8svpL/h77Dd9bjtlJUfcT2azWat
+VpvtzO3vHdy5c+egd40Q5rouN0wp5b4pZtutxeWV3YMudyoLjrM+V1ENw7JfeP29KwaLkqK3398e
+RHHVpqMshmFIfS9N0yQNPM9Y+tLa6tqZpU4jiLIwDMNhf9TdX+q0V+bbO3dvR8NeNNJSyjgIHcfp
+zM6dO3+20+kYhkGILqsmZQNPGfDgFMoLIcSjgu9Pjy+e+lIiypIZXpSbogDAGKv4FX/dX1lZidJk
+NAqDIIiTpChEPDqcmVv86vNf/9P/9oOtnT3fYjXuNh363IXTiyvz0f1NYmRLp+fkXl/Gg6rp2pVT
+Qum6r9vtmSpPn3r2iZlWY7S/TQXk4eBg65bD4dkL52Zq3sHO3dX5GcndarXqWFa1WrFMrpSwLAtA
+Yb/aQ51S5cYOHOfzOLvPzzucwBYoUAVQlufiw4+uvPrm23Gab3zlwtmzZy0qLcu6cuXKhx9+CACY
+r5mmmRXSdV2tdRIFTzzxxIsvfF1KGUXR/v7+xYsXKaVfe/aZ1dVVSimBBw37JwEnrr8ee31M09zY
+2ABuvn3xvc3bN7XWZ8+s2q4vNbm3vdvr9TzPw9KKbdtJkoASjUbDtm3Oab/f393dvXHjxuzs7Jkz
+Z1aWlzinBOCkHaE5cVKvlSCUAlANIDRcv3H78tXro9GoWm+srKw0m03Oued5lsWkBKW0ZRCTAQAU
+AkSRDwaDm9euhmFoud76+vrq8gKMFRS1EoSeFGk7cdQfb6iABkopKID+MLp27drW3kGWZZZlzc7O
+VqtVLI5Wq9U0HKJF7ve6g8EgT2JK6dzc3Pr6uuc5AKCPnY1WghAC5JfvH/3/wQmk/ihFIIQUQuGG
+stZwMIx3d3d3d3eDICiKAosTlFJGdFEUWklCSLNWbbfbzUat0WgczUprLFlrJaSU3DBOjtk5cdTj
+aEoTUXZvSwAhATdIwzDE5oswDH3ft23bdV3XMl3XdWyzXDbTKAVcAQCIAhgDMjU4j4CQGnt0jw2F
+kkIQQigzHmqGOepXBAAALTUAMPqxptSjLkl0HloBYFHXnMS0PgEnjnoNIIRijFIC6qgjAXfG1NH5
+QXQFeK11DgalQPXRiTY0VqDlsTtFv6FByaM/OTFS/ysbvnKpcI8YgWah/IjdvOVGPhy7zrKPvuzh
+KptbyrIPaG1wSgkIISgzpAIgXGkKzFSaAuGFIsBMIBwI14QbRHMASkAKcdy8RdSD7ncKQIEwTQ2l
+qVQPuqDHh4ebf+XsfvEGOG5mwYuy5678Vdkm9emZ/CxSjzPEkzfl+RtEURTjmR7WEmAsBT+Sykdv
+1WPijvPknI/n8eURHzhunyuvMft/6JlKfXIONV6BGX9+OX7ce4BPOu9Z9gmXryiT9l81X/vs2oe9
+6mEY1mq1LMtM00zTFDNMpVStVhNCBEGARyeq1Wq/3zdNE5vNPc/L8zxNU8dxGGOj0cj3fdQJy7K0
+1tgH6DgO/iSEDAYDrKhgi9X+/r7jONjLh23AWCIdDodIn+u6SB96Ziy1W5aFDUxYFvZ9PwxDxpjv
++1EUmaYZRRHOq16vM8bCMMTXDQYDSqnnebjhDAC2beOS27ZNxk4g/d1SX26U53ne7/eVUmEYtlqt
+o0OtAEmSoOzjEUukPkkSxhj2OAJAmqb9fh8bBUejkTo+KOs4jpQySZIgCHBrtxRM13XjOEY9I4Rg
+g9ve3l6lUuGch2GItUbcgKSUIvV4usPzPDxumKapbduMsSzL8CcKkFKq1WqlaYoLiYdPDg4OGo2G
+YRhlgwIeKRgOh2EYcs5d1y3Z+FXtx+cKcsvuOOyVAACUEaQGh5JlGXoFLAciL2ma4vdxHOPBM+x2
+L21l2bdQvgKOm/qxfRM7bXHDC+NL1Ak0xCi8cNzzYxgGUon7B9ioUhoTbPDCzQb8BiV6MBgURYFn
+IvC9o9EojmPcRUmSo54XOPYNmNl9evY+u8FBEcBtENzZUUolScI5R8PHGHNdt+zYQsONA82yjBBS
+rVazLAOAer2ONS+08ti9g3KNQgoAg8EALZLjOGhe0SILIXq9Hn6Dco1nRcrXWZaVJEm32zVNE3uM
+gyBA7WSMmabpOI5pmnEc4x4I6ge2Pc/NzR11/VPqui5KhtbaNE3f9yuVSrnAv/h/AX4pPntwiaYD
+E0t0ntiWxRiTUlar1dLt4Mgw7NFa48keTJSiKEIRBoAgCFB/UXywJo7uFLtN8Rv8c/QuWL9E04G2
+GNuH4PjIDjKCpzAwAcZubLzfcZzSXeNFHMeed9SGliSJ4zi4xjhs1CrUmDzPUeThM/nYz0X9eGzz
+IPUvCmRqfIunVO3xU8hl+Z4QgryMP6d8Pj5QH5+hxSVER1I+B+/Ee8rgpBwY+YWTynj/+CDH54K7
+VKhP5QBgbOcHX1TugH7mKvSJS6l+fXBSakm/hphSPzFMqZ8YptRPDFPqJ4Yp9RPDlPqJYUr9xDCl
+fmKYUj8xTKmfGKbUTwxT6ieGKfUTw5T6iWFK/cQwpX5imFI/MUypnxim1E8MU+onhin1E8OU+olh
+Sv3EMKV+YphSPzFMqZ8YptRPDFPqJ4b/B2GHunGQLQYWAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_nissan" model="fleet.vehicle.model.brand">
+      	<field name="name">Nissan</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAA3BklEQVR4nO29Z5Bdx3k22H3yzWly
+DpgZpEHGDDgIRGAAg9YSKYkK37poya4tl6pc2nLVliRu6Y9dtS7bZZftb6USpU+kPsvUlhKDCJIg
+QRAUwIQ0CBMwmBncyTN3bg4n9+neH+/cg4sBQQokSHG97pofd869p0/302+/+e2DGWPov9ofo3F/
+7AH8/7f9F/R/tPZf0P/RmvDHHsAn1VwZhjH+447kVu0/P9V/ZvWIzxzVf2aRuuPtPz/Vf2bbJw69
+4zjwYRU5u/8yxtzPlFKEEMbYcRyM8QqbxpghDBcppYwxQgghBG6kiFHEHEYZXmHrjDGMMXVsjCjG
+zOX10PnNA1h1/VNr+NPc4IwxSinHcQCH4zju55ub4ziEEJtQSinP87lcrlgsmqbJ87wLseM4HI/g
+B4FAIBQKKZKMMeY4ThAEWAO3w8qFcceD/nhy+NOAnhCCMeZ53r0CawBXHMfhed69QinVdV1V1Vwu
+ZxOKENI0jVK6kFjOZrOapgGylFJCiGVZeqlomialNBgM1tbWxmKxcCjk8/m8XiUYDEYiEY/Hw3Er
+mxuedasxfNI4rGqfHtUDf3BRQAjBDkBlSjRNM5VK5fN5y7LyhZKqqj6fz+fzFYvFQqFgEaaqqq7r
+hBDbtg3DMAzDNE3KHMMwdF1HDuV5XpIkRVEURbEso66urqW5ub6+vqGhrrq62ufzuSNxKX3Vzvs0
+98EnDr1L1C7uwFuBcjmOs207k8lks9lMJqOqqk1odXW1LMuWZem6XtINQojjOA6h0AkQu13RHMcx
+TVPXdV3XbdOEK4xRRVE4DomiWF1V1dTU1NnZ3t7eHolEFEVxhQqgDCP5lE2BT4nqXWpycYfrU1NT
+IyMjlFK/308plSTJ6wvwPG8YhoMwYLrCChiGu0AGAMOxbVs3dUKIbVmmacKSGIahadrKkmi6bduI
+OQihcDjY1NRUV1e3YcOG9vZ22ASUUowxkAUsLeD+KaD/iUMPc4PpEUIEQYDPi4uLQ0NDyWRSkqRw
+OBwOh0VR5HmeOMymjDEmiiL8GGPMEEaMwsrB4jHGbNsmhJiWZdu2ZVm2tdJ0Xdc0zdBNVVU1XUUO
+pZSYhmGaOnMo4nB1dXVXV1d/f39XV5eiKKiC6l0S+c8APbpxO2OM0+n06Ojo3NycaZr19fVVVVUI
+IZ7neZ7nOI6XvYIgKIriOA5jjOd5yyYIIaEsLUDMgnrjOI7pEEDcMAxd03Rdh3/VkrbChdSSrqsc
+xo7jaKUiwwj2R01NzebNm2EBXOL4/yT0Lr43KNeUchwHSjp8Ozw8fPr0adu2O9pbq6urZUVhjImi
+LIqiJEmCICBBxtQRBIFSKvBYEASEENyuKMqq/lF5PSxiG4aRLxYLhUK+WMhms8W8Bs3UdFM3GKWU
+UsuyTFuDNYPNEYlEDh48ePjwYa/XC6MlhLj66yfa7iTVuxoLNBd9hBDHcZqmvfnmm0NDQy0tLe3t
+7eFwkFIkSZLX6+V5XhAEWZYdx2GIEwRBFDjgNpRS6NK2rGKxmM/n8/m8pmkgexFCPm8gHI14vV5R
+ljwej+L1Oo5TKBQymVxiYXFhYSGXy+maBuaYYxOKAHlHVVXGWC6X03W9t7f3a1/7WktLC8/zsNsE
+QXAcxvOf4ALcMehd1dhdAJfLE0Lm5uaOHj1aKpW2b99eU1OjKArmOZ/PB+Qsy7K7ZpIgAqUjRAv5
+/NTU1NjY2LVr1xKJRCaTAZVf13WEECEEIQQWA8/zoXA4FovVNdT39vauW7eupalVUZRsNjsxMTE3
+N5dKpcAmsG3b1axAFOdyuWw2Gwz6H3roofvuOyxJErrJAlgBq0IH/fjb4o5BD6O5eQEQQmfOnHn5
+5ZfD4fD+/fuDwSCl1Ov1SrJHEARR4gEFkRdkWUYIIUTzudyVK1eGh4evDA8tLS3pug6DZIwpigL9
+w7MQQqphEkI0TVtZFcOQZdnn823q7d25c+fA7t3Nzc2EkKmZ6cnJyXQ6bWgmz/OWZcHtjuPYtq3r
+ejw+6TjO/fff/+Uvf9nvD67ikytg3VEudCcZjm3boigihCzLEgQBBn3q1Kl33nmnvr5+3759iqLY
+tu31egVBEESZIQchJAmiKIoIUV3X5+bmLp47Oz4+Pj09bVmWx+OJxWIcx8leXzgcDgQCsizDFgHg
+GGNgyqqqmk6nk8lkPp/P5XLLy8vLy8uWZdXV1e26664DBw5s3LgR89zS0tLM1GwqlYL1M02TEAL6
+q6aVlpaWEonE5s2bv/GNbzQ3NyOEHIeBUYI+AXXzjkEPiqNlWaIowihLpdLRo0eHh4fvuuuu3t5e
+juMsywqFQl6vV9M0SZJkWWaMYcws0xwbG333rbeHh4cppR6Pp7q6OhCOBIPBuro6SqmiKGvWrPH5
+fGD6A/SwtIIgAHc2DGNxcXFpaSmbzabT6YnJyWQyGY/Hl5aWMMbd3d2f+9znDh8+LAhCPB6fmZlR
+VRW0GtM0bdsmjkUISSaT41cnm5qa/vIv/3LdunWCICDEfdahR2X0gfZ1XX/99dcvXLiwf//+7u5u
+2A1+v9+yLMaY3+8nxOI4jjrOzMzUqTd/f+HiIKIsGAy2trUHAoFgJBoIBMLhcEtrO+gbkiQBUpUQ
+uOqma5SC+NU0bTI+MTcze+XKlbm5ubnZ2YmJCYRQV0fnn37jzw4cOJDP58+fP6+qKnAeSZJ0Q4Wx
+LS8vX7t2rbmp9fHHH9+wYUOlc/ezy3BcZaZQKLz22mtzc3N33313V1fXiouR40AewjJwmKXT6bfe
+OvnuW28butbU1NTYWO9VlMb2rlAoFA6Ho9GoQ5EgCLCiDCHbdkSRRwgxhjBG4OsFgUIZ5fF1dxBj
+DGGsG7qqqrPTM5cuXJy4enViYmJ8fJwgZ9euXX/6p3/a3d09OTkZj8eBZYkSD74gSmkqlRq6PFJX
+V/etb31r48ZNlVR/B9G/behXidMKDwHhOM6xqeOwY8eOjY+P7947sHbtWkYtQZAQ5nlexIjHPOJ5
+bNnW1eHBZ599/tq1a+2dnV1d3f5AKBaLtba3NdQ1rnL1oLKydLtzcx2TmqbNzMycP3/+0qVLI8OX
+h4eH6+vrv/a1r33xi18slUqjo6PpdBpjinkOnBCU0uXl5cHBC51r1vz1//5/tLa2Vrr57oh6gz4m
+1bvqI/xn2w5CaHDw4uXLlzdu3LhuXQ9CiOOpKMiEUFn2YIx5Hudymddee+3Y0ZckSVrbs66ja43P
+F6itq2tublW8HkRXe9nQR4IeMIIboZNkMjk1NXXm9LtXr149e/ZsoVC47777vvnNb0qSFI/Hl5bm
+EYfBgQq2WDKZunT58o5tO//iL/63trY2iNK4BPfx0b/t2Kz7VNf5V/6G43l0+vTZkZGRnp6eTZs2
+YcwcxxEkCSHk9fks05RlMZ1KPv30T0+ceGNtV8/mzZtb2juqq6sbGpuDwSBjjDnXVdJVUY7bneqq
+leM4rrq6uqqqqrur88yZM8FgcGho6MiRI+Pj40888cT27dsHB9ns/BzcIopiMBgUBLGkqsePH49E
+In/2Z38Wi8UYu0776GPr+x8Fetf9W0mSjLHZ2fnRK1fq6hvXb+i1bJvnkCAImBcd26aMyLI4Mx1/
+5pn/OHv63a2be7dt3x2NRltbWpubmzmBdxzG81zlfD5mq/RqAIcEv3wwED508N7amvramnqfNzAy
+MvK97/6f3/nOd7Zu24I4bmpqSpZly7IZcyRJbGltzmYyr7zySl1d3Ze//GVJUu7I2FZG+BGmVLmw
+Lu2XStrghUvBYHjdxg2I5wghvCjYtk0sS5EVDnMLi3NPP/3Umffe27Nn3969e2tqajZt2tTS1sow
+hxACk53S6xRUSekfYXe7fNllFGDKwrcbN2588MEHDx8+vHfv3kKh8Ld/+7cXLlzavn17U1NToVCQ
+JAnCCaIo9vb2ihL/H8/8+1tvvWVZBiqHt9yn3O7AriP5Ee6p3G6wAwghoyNjhUKhsblF8XhNy+JE
+wbIshBBmCCOaWFp68sknh4eH773//g3rN9bWNGzeui0YjoBmCN3e2ei0S++uhEQIiaLIMMI8hzjc
+3tlx+MEH+u/atbO/r1Aq/v3f//3g+Ytbt2yPRqMwcp7nFUWRJHH9+vXJZPKZZ55ZXl4u9/z+yv5t
+kchtQ1/pWXUpa3Z2dmzsaiAQDIfDJrFNQkzTdgiTZdmjeDLp9P/4yZNzM7N79+5ra2uvrqtv7+zx
++TwIUY5DHIfACw+f72ADN5k7VAiwADlDi0ajDz300N13393f37+4kPjHf/zHmZmZ/v5+r9drmqYk
+SaZpMsZqaqp7e3uvjI2cOHEin89jjCvH+ZHl7W3PdUVrrmCmhmFMTk6aphkKhQh1SqUSz/PYZbWO
+8x//898vX768bdu2jo6Oqurates2BEJBihjDCJU5A8dxlBKE7hjlg2bpusDcHAXwzAD/wRj7fL77
+77//0KFDO3bsmJi49s///M+M4oGBAUEQVFWVZRkiB62trV6v97e//e21a9copY5zB7w6t0/1iGLM
+ACZKKcJ4bik5MT2PRUmUPbpu8ghT01bzOZ5Dosi/cvR3J0+d2LF1W2trazgcXb9+oyzLDCEOYTCC
+XJ7OcQKMx91Y7z+AD/z2+sRu3EGUUtcdBg5koCHIItm9e/euXbt6ute8/dZbT/30p5FQuKer27GJ
+Y9q2aYm8oEhSZ2dnPB4/duzVVCrF87jSJe7y3ttC8iPs8OtZNDzPF4vq+Ph4Op2WPZKqaxCzzuWz
+giCEQ+FzZ88+9dRTXV1d7e3tHo+nu7u77A+43h2raKui1e71ysevUjTZLdqqQeOKBpGA6/PhuFgs
+ds899+zY3heNRp966qlnnnmmq6u7trbWsizYN7ZtR6PRhsa6l1566fLli4QQWNpVJu5tof/RmSs8
+e3p6enh4mBBiOcSwLBXSAmw7Eg4XsumfPvkjTdPW9qwLx6LNza2xqirwxVOHguJxMzTvixq6EeJV
+375vQzftj1XagUu2jDFJklpbW++5557+/v5SqfT000+nUqktW7byvKBpGvxYEsSOjo6FhYUzZ85Y
+luEOxvWhok9azMJdGGOMeU3TXNcgeL0NUysWi0GfP+D3HTlyZOjipZ39u6LVVbW1tR0dHe6cBYFb
+BXQlTJWmys0qxO2y18qeb9ZcXfR5nt+yZcuhQ4f27t07PDz6s5/9e01NzZo1ayCQKwiCYRihQLCj
+s+3td05NTEy4Aq/Sx3B7IN7Wr92GMY8QSiaTs7Ozhm6apuk4TqGYMwyDUqempmp2duq5Z39TV1fb
+2NgYi1U3t7RxPI8x76YU4BvD0OhG+q2kVlb2B1Tu6w9t6MZ1WoU1qqBTN7ajKMrWLdsH7trT0NDw
+0ksvDQ5e7OlZFw6HgfDhZx1t7bOzsydPvQnxxVWI31b65keBHvzjhJC5uYV4fNpxHFEUDVWjNtGK
+pVAwyHHciy++uLC00NrR6vUFGpuagsEg3Osm2q1CpLKxG6UWLuvmbrsVk7nV4t3cOS6Lq+t98hzm
+uYamxoE9u3s3bVlcWv75f/yCOKyjtZ3jeNM0JUlEiAUC/trq6rdPnVpaWkLlvM+PQPLoI1M9YyyT
+yUxOTi4sLDiOw3GCZZjMoYiympqaicmrzz7/W04QqmpibW1tdXUNCHEuyYNix8p+9krauTkp7GYE
+V3Hwm7n/KpFQubqVu6eS6aPyYvA8v3XrVlDtT548eeXKlba2ttqqaggDgE3Q2Ng4PT19+fJlsBIq
+5S13O4bJbftwHIcJPM8YW1pamp+ftyzLy1g+n68Kh0qFQkNDQ3V19anfH3/vvfeaGusQz3V2dZu2
+FY/HC4UCQiidTns8HlVVbduGUB/sZfgMkW5UpibI5HZ5AnAeWA8XWTdbZJVoFUWxkhED7rC0YFu5
+IQToBPZlKBRqamrq7++PRGLj4+PvvPNe37bNtbW1qXQSIiqqqno8HlmW33nnnT179lRVVb1vLu3H
+gr5yE1XShcBjyyK8IMwvLI2MjhUKRZ/PTwzdMn3+gLSmo9XSiu++/VYoEG5t7g4HG69eGUMIFYtF
+x3EEQQCXLOBCKXXzy8C7IssygILKTBm+BasSlfcBYwxQA2IURRE6d1ktrCJjDPqHb12JWkmhjDHL
+sorFoq6bmqbxPH/16oRpmvv370+lUu+9917mv32ptaNt9OoVyLTyer2O4/h8vmvXJubmZqqrY5Um
+AsRwKgFcJaX+IOgxxqC9ljtlpVIJBE4ul5uanj179iwhhOOwYRiqqqqqumZNZzqdvnRx8Ny5c5Fw
+rKWlRdO0wcFBj8ejKIooijAOMNAhlIgxFkWxEiNwz8G4FUWBcUuSBLBCxo7rN3Xhs23bDdiiMoG7
+uwTG73budgU9+Hw+juMsi8iynMlkMpkMxnj9+vUPPvjgxYsXn//d77Zv386LYj6dliTJcRziOHUN
+Dalk5vXXX8/lCu3t7YqiKIrX6/XKsrgqqbTSa70a4VuJo8qWy+WuXLkyMTExOztLKZVlOZcrWLbt
+8fgsy4IlFUVJlqVAwFcs5FRVbWporKqqCoVCskcRRdHj8QDEkITt7k1ZlgEXQAFXeLvczzBuIO3K
+60ATlcn7lmUBrbhTdQtRYCdB4kllzy6LM01bEARN0yBMaFkWISQej2taIRKJ2LYNKbSwtzDGjOF0
+Os1xnCx7NE2rq6vr7Ozs6elpb2+FJ1bKgPcn7g+A3p3DD3/4w1deeaWzs7OzszMYDEajUZ4XZVmW
+ZBljrCheoFDLMrwej8fjiURCsiw7NhEEgRcFV99433FUylg38/t9f3Dz71EFfVX+y8p+PXaLjH50
+I2umFVmLAJxlWUAiuq5nMhlYeEjaUVUVIUQINU0TOAGkxU1MTBBCvv3tv1qzZo0bm7x5DG67pUSG
+teV5fmFh4ejRo6Zptre3e71eURRN03Qcm1JimSallBCLEMshllTODdZ1M5vNE+owjCDkzyp83DAH
+txgKlR0sKwMqZ/zCRRcO919WdsGjMk93eUslpYPwgAWAx8G/kHHmriLcDmODfmzbZoyJoggo27YN
+Ehi61XUdOBtkkwuC4Pf7ZVmuqqqqq6ubnZ09duwYQqgye+dWas8teb17QyKRyOfztbW1hmFA/Rg4
+siFzSBRFzHOBQIDYJoggyyS25fAC5jhkGAbU00C2DCFEkqTKhDrXCgfOW0l97gf4GSy5y5dQmczd
+1FTXMnKFHogrhBA8Hb4CkQOtUgzCJgAXG6VU0zR3bLAAwDBhDUqlkm07jDFdVyHxzbZtjJkkcdPT
+066u9cHK/ofooYyxfD6vKArHcblcjjGmlVTHJqZpqqpqGAZjTBJEn8fr93u9Xm8kEgkGgyu5pc51
+DosxhoRWVM6VBB4NX0HWlEu2uMIEdTVFVyYDQUGHrkym5bi5K0sBdxDgqBzScakKlhlWBQQGrBzH
+cZDwHAqFFEUxDAN2j8fjAWXB5/PBPuY4ZJq6aZqmqVuWUSzmHce2bKM89+vGWuXnyvZBej3MUNd1
+N/k2n8/7PF6O45Bl+nw+j8ejqsWLFwfj8XgwGESI8/kCmzdt3bJli8BL+Xy+sbFeVdVjx45duHCh
+vb39T/7kT3ief+GFF959912Px/PQQw9t27bN7/cXi8XTp0+Pjo66FA1IAXySJEUikUceeQSE5MjI
+yNDQkKZp7vK4m9q27VAoNDAw0NDQAOshSVKxWDx58mQ8Hvf7/Qghy7I2b968efNmoGJI8nEc56WX
+XpqamhIEAdh6f39/R0eH1+stqgWPT0kkEpcvXx4bG6urq+vu7uYF3tQt2zYZcyBzzbR0hxJKaaFQ
+MAzD6/Wisgi5Fe1/EPRAUGqxhBnCDKn5gsfjMTkTIaQoCtRvYIyPHz9x/Phx4PIcx61bt+67T3zv
+wIEDJuEkRZ6dnf2nf/qnkydPrl27tr+/v7a29qmnnjp27Bjs8b6+PlVVf/CDHzz55JOJRALkm1t5
+AvTIcdz69esffvhhWZZfffXV73//+9PT08D6KnkFbA5BEJ566qmmpibgTgihM2fOPPHEE/F4HHqT
+JGn79u1/93d/t2XLFlDkeZ5PJBL/+q//+vvf/z4QCBSLRVmW9+/f/zd/8zfr1q1TVT0UCA9dGv7B
+f//h6dOnd+zY8dd//de1tdVFy2CU6lqJ2Zal6syhumrommlZlmmaXq+X3Zg8cHvQg9hxk9mB32Hb
+BnOG4RU+CxvKFVaXL1/+9a9/vWnTJp/PB+VOrs8HpB/wEEVRCCGKopw4ceLpp5+Ox+OonEtsGEbl
+MECsCYKQSCT+7d/+bXBwEHqAxLQVQ08QgDPEYjFI5gbzJ5fLvf3228PDw7ZtQ2UoY+zkyZNHjx7t
+6elRFAWoh+d5oFZd1yFr8ciRIxs2bPirv/oryEQXBKFQKEBeOLABWi7mWqmycxyYPtS0fACqfxD0
+AGg+n1+pWjJNQRBQ2YxECJm86Uoqj8dTW1u7sLBgGMbxY6/v3Lnzq1/9KsANXYG3AGwiABRY/8TE
+xPz8PGOspaXlO9/5zvbt20GndrWUfD7v8/lAzxsaGoIbv/3tbz/22GNQxAy/93g8y8vLHo9n8+bN
+pVIJsFhaWjp+/DghpK6u7itf+QrP808//XQ6nT558uRjjz3W1tZGCIEsWhihKIqBQGB5edm2bSCg
+w4cfhEcD8QqCAFm9QIuOtQI9tVdKLQArV8a6msLNbOfDGU6xWIQnWZYlSRJf1nAxxsSyOWFFi4rF
+Ynv27Dl79uzY2Fg6nf6fT/9s48aNBw8eRGWWB/QCyrK7GIwxICJRFPP5/JtvvmnbdktLSywWa2xs
+LNsQPMdxpVKpVCq5bqx4PH7lypVoNFpfXx+LxcBk83q9wIhUVRVF0TCMt95667333mOMNTU1/fmf
+/7kgCMePH89ms5cvXz579mxzc7NpmgghXddhD/X09Nx9993nzp07f/782NjYL37xi56edZs2bYS5
+I4RIuTnlGlLi2MSxYQewCt3pDlA95EBDlZ5lWYIkwWOAclcqYhnjMdfVuUZRlMnJScdxrly58v88
+84u+HTu5iso8oFBYCeiWUtrU1OTz+ZLJpKZpv/nNb44cOSLLMhT62Lbt9/sfeOCBb37zmx0dHR6P
+JxqNJpPJUqn03HPPvfzyy8BSPR4PxrimpubAgQOf//znu7u7QWNJp9Mvvviipmk+n2/37t0dHR2E
+kIGBgaGhoZmZmSNHjuzevdvj8QB/A8IXRfH+++/fuHHj2bNneZ4/ceLESy+91NPTBQsJwkzXdUpD
+pmkahmbbNnFIuYDXBHr/UNChfZBy6RqEgDUIEFIullxZc0IwQxihUqkkiuI9Bw9t2LABIeQ4ziuv
+vPL6668jhCCPHkQoqGuUUr/XpxZLarG0b8/eLz7yaNAfQJRR4pRKpUwmk0gkJicnZ2dnR0ZGfvSj
+H339619PJpZrqqr/16//t7qaWg5hUzeK+cLiwsLi4mI8Hp+cnHznnXf+4R/+4Utf+tLZs2f9fr9h
+GKdOnTp+/DhCqKen57777vN4PF6vd//+/fX19UD+p0+fVhQFuBYQBPgGHnzwwYGBAaj1eeaZZ44f
+Pw5yApVdWyAYDMOwLMsyTMswAYqbHasukrdN9UAIrkiB7BQQrbD3wdeIEXYcp1AoRCKRg/sPzMzM
+pNPp5eXln//8548//rhbBwJJLK44YoxNT0/X19d/73vf27Nnz+DgoGVZhVIR8lKz2awgCHNzc5qm
+TUxMvPHGG4cOHfrGN77R19d3/PjxXC5nGEY2m51fXJidnRUEIZlMmqY5MzPz29/+ds+ePalU6tVX
+Xy2VSuD4fP3118+dO6dpWj6fh5jazMzMCy+80NvbGw6HAUSQLul0OhaLPfLIIxcuXCiVSkNDQ88+
+++yePXtAN3Xz94vFolYsmZZhm5amaRaxbcOs5PIf2v4g6FHZ1ieEwPYUgN85DpiaDDEgmUQisWHD
+hq1bt7799tuqqoK6lkwmQcvO5/OuRwFcoZZlgTbd19e3e/duhBDmOU3TcrmcLMuDg4NPPPHE0tKS
+ZVnXrl0bGBgoFottbW3f+ta3QGcvlUpFtcQYm5ub+/73vw/hi3Q6XSqVLly4cPz4cQBieHh4dHQU
+lT0qsAsRQseOHdu/f/+9995bLBZBcQA2lc1mt2/ffs8997zwwguOw06ePGmaJliUIPxs2yyVClqp
+ZFqGZZi6rhPq2BaxLKPS3r4VvX8I9K41DwakTUzbFjFmlDimbnh8Xo7jdEEghCAOM4QIIhQ56UxS
+FMW+ndun4pPjE9cKpfyvfvUrNyylqqokSWANMUwdRgi1R0dHT58+W+nYAv7b0NAwPz/vWqeirKQy
+2eeff94wDF4QwBxVFEXgMdifhUJBEARi2YiyxOLS70+dXEosIYRi0Vh1dTUoBRhjzHOO4yQSCUi6
+f+2117bv3KHqGo85XJZt07MzDqOHH3xgdOLKlaHRqxPj84sLAgdZIaauq8Qx1ELRtkxNVQ1DsyzC
+CbxJbOIwxhyex4w5GF8/GeL2NBwAS5blhoYGy7IkWxAEQdd1rHCMMU43eFHAjsMYs82V3MpioVAs
+FkWOj4bCfX19mUwmnckRx6bEYYwiytLJlGWYlDgYIYcQh5BioXD2zJmf/PhJQqj7YBiu643BGIdC
+oXU9a0eGhn/w3//vfLHgOpAZY5CwBr/kEBZFsaenZ3R09Nnf/JrnsCzLn/vcQ1//2tfy+XypVBI5
+3usPGobx7LPPPvfcc5TjBgcHB8+dB46PEWYOVUuF5aVF27YDPm//th1T43HbtkuFIkIII8RzXKmY
+l2UZyhZLpRJjjuNQVdcY5sBSAV3IJflbRa9uCT1Y2JRSkE6gXHLlCnlN0wRJlGXZ4XlJkjyyIvC8
+LIjFXL6Qy4fD4a6OzuyOne+dPUNMC1hT0O9Vi3nMnKpouDoa8Qb8iqIkk0mEUCgUMgyD50TLsmRF
+dMN4sOc6OjoOHDhALK2QS8UiAcvWOA47HJYkGWNsE6LIMtTFtbS0bNq0qXNN+2tHX85ls4osd3Z2
+9m3brojSsqaHvH7btm1Tj4SCm3s3XBw8NzMzMz117fy5M52dnT6/RxA5n9/DiF3MZorFoiAIm9av
+m+rbMTQ0pOu6yPGGYYgc5hF2LLtYLDrERgiZpuk4zLIsThBhf8uyXOknv5U1++GhkldfOfr9739f
+N9Taqmqe55mDwPvB8zwn8GDslEolRZHCwRClVOIFURS9Ab9t29l8ztB0kBZer7e+vl4URaiYESQ+
+EAgoilIsqnNzc+CARWXvDYyKEBKJRDo6OiRJMnQVpKim6+AKBY1CkBWwMyRJ6lnTVVtbWywWh4eH
+c7mcx+NpbGysra4plUq6rsuCiBDCwoqLdHZ2NpVKSYrc0dHh8/mmp+OpVCoWi1VXVQkCT0wLISRJ
+EmFsbm6uVCqBlPL7/T6fj5iWZpm2ZTqOUyjkBEGyHWJY9uzcwt69e3/wgx+IoogQ59L7+xL+h7jP
+gCTBgBRF0bIsr+JzbXdCiFZSQ6FQdXu1Y1u5XI4RBylKqVhUVdUb8Lc2t3CIgt8YdDJddaLRaCgU
+IowWi8WZ6eloNNq7cT3Pia65CNY8z/PgrTQMY2ZhmkNUVOT169d7PB6nXG0siGLZrlg5reLatQlN
+Vdd0tgeCQYSQpqrzC7OMOB6PJ5tL+3w+S7UIIV6vd+26bknaCBZvLpvuaG/v6e42TSOfyZbyOqKM
+5/l0MuULB9vb2yR+pZquVFJB7IuSaFsmePYZQ0DsPM/7fD4YuSjKrpP19hgOKjPQUCgE3EaW5UAg
+ALVOZQNEZoyVSoVCIec4jldWUJlTMcaKuXw2mxV5DEsFzjxULiqjmEmSJMtKJpNZXFxEZaOXEAIO
+BojGgTKqKIqAOT2rQ+AU1GdYe97NSEAIshwgvEPn54ltA8oix4NjRy2WEId5ns9ms6lUCgs8+BtE
+USxkc5RSxyGMMShtgImYujpfyHF4pTqX53lJEBRJ0ojt8/ls2/b5PKZpO4xShIE/g5LDKg7ocINW
+fyj0cFskEolGo2fPna6KRIPBoCxKsiyDGJB4AeZPCEECYoyZms4J2ONRKKWCLHEcJ5ej2GAQADd0
+z4STJMk0LRwIwqkftm1zogBb241pAL9CZT8aLsthHiqkBd4N2oCnRcAcIcTBWBAEhxCwQhzL9ng8
+pmkyRiVJ8ngUw7bcsLCmabwgMcY4AYK9Kyq1IEuWobnReYGXEEKgKfHUQYwahoEQFUXHtK3FxDJC
+qKWlxY26QDAAlcM4fyj0Ls+NxWKPPvro+MTY/Px8JpORBBGcZV5ZgTFxHOf3+0VejEajVZHolStX
+EomEz+fjbAtjXKIUKBG8wZBboCgKUDQhRBQFWVbA/+X1ehm3ctwELp87seIoLXsrV9QejjNNUxRF
+2zIhPYZSGg4EwfgghFAeE0J4gbMMU5JEm1JVLcGMMvkcqwhAmqaJec7RLPAWCJKIELKpI8uSYRjE
+Mbq7u/0e//LycjKZ1DUTPE6aZdmWSSm1bZMxbBE7lclu3rx53759LuespODbgB5w4XlekMRHvvho
+Y3PT6Ojo0tLS3Nzc3NxcUdXS+YIkSVXRaCgUknw+XyDU3Na5fftW0Rf8l3/5l6JaikajhBDecXie
+lxURIaQoCmMUjFsXUzcpw/1Q2Sq+XcnYQTfaKbZtsXK0FtAEHuKGcyuduq6J70ZoaTkpwWGUEEKd
+lYCXJCmGYSSTyf7dAxs298mSQEaGLeoQlC+lc/NLi/ly4YOieLu7u2uq62LVVTt29K1fvxHwc0d4
+2xqOu1YuzwKPIBz+sDi/8Mtf/nJ+fn7Htm21tbWyLPsCIZ7n169fGwgEvvvd777w4u9qampqamoi
+Ab/f7weBKQgcIQQsctgHYL7DEwEgVpG7AEjRihzSm61EvnymHarIxUQVwUXYPe78IcoI/IRVJB9a
+DnH3lm07+Xx+bGzM5/P9X3/3dzt2botPXisU8rap5/PFXCY7PDyMRbG/v3/t2rVVVTWxWCwUjHj9
+Pv52zrL48LA4cC4IWoqiGIlE2tvbbduem5v7zW9+I0lSKBQCDlEqFaanp/fu3XvvvfceP/FGNpt+
+7LEvPfzg5yBDmrLrQSXoGSqDIbBAKbXKjjl3DK7e4sZhUEW42Z0eq8i3dpmVa47B+VLuoRlwtojP
+5wN5A8vgOI5pWZATFwqFZmdnf/azf1e1i488+qWDBw8ml5dSqaRhGAKHBEEQZYnj+PaOji984QsN
+jc0IIcQ4hq7nmn0o6B8CPSrrKi7Pco0smE9vb+/zzz8/NTPT2NgI0QP36J++vr6779575MjLMzMz
+a9asaW1tBfcnCIaVRCJ0/XxcXM4wAKDRjRmv7+sLdJtTPoIXmhtYh1uA5F1xV3kFVcROCSEg1SHU
+vrS0PD8/H4vF9u/fjxGdmpqCgTk2VVV1OZEsFIstLW319Y2IMcdxeEFi9LrP4A5A79o4oBu50SW4
+sn7jhh07dpw9exZONxFlGfxZyWSyd9OGBx54YGxs7NSpU6+8evTxxx/3er2YX5GWoiy9r0/jVlv1
+dq//IW0VW4PyLuIQnhfGJ8Z/+etfXbk69thjj23dvm1xcdH1Kju2bZpmNpsNh8O9vb0IIYcwXpTc
+bXdbVH9Lf73LdlcNl6IV1KLR6J49eyzLSiSTYEcAoaUzyVwut2vXrn379jU0NLz44gvDw5ddduHy
+gUq551Jo5bjd67ca4apJuoJh1Y3splZ5l8vKHEJEXshls6d+/+bI0OW13V1f/uKj1bHo1OQ1YpmY
+MR4z23EsQlLZzJqete1tnYhxvCiginSPW0nU9223/KmbQoTLZwgzN1UarZDM2rVr6+rqJiYmdNOE
+Kx6vnMvl4vF4VVXVwYMHt23bZpnm22+9lUomeB4jyhybEMtGbCXbtBLuVdDgGxtC9OY/jG+oAXLX
+r1JKr+qt8l9U4WPhOEQpGRw8d+7cuZbWpj//i29s3tI7eW08m8sACKZpGoaRSqVlWd61a1c4GsE8
+5xp3HMc5jJr2HxQQ/xDoV1GHO0Se43F5Ig1NjTt37szn88lkEtJD/H5/MBicnp6enJzcuHFjS0tL
+e3vr6dPvnjz5pqaqiGMcx4mSRGwbUYYYgj+MsPvHKGGUIOas4Muclc+Mrf5bGaiDmIMxw5hxmOGK
+VcGYYUTh7/pqIew+mjkUHkqJw2E8Pzc3duWKKHB9O3YO7LrLse3J8XFQPS3LgCju4uJiS0vb2rVr
+eV6gFLk5WIwxDnOSKN0B6HHZUYNWFSWVVVZKqSzLDz78UENT48XLl5jjeBWFmCTkD8mCPHjmvMSJ
+/Tt3BSNeXsQvHnn53PkLCHEUYYc6gsQjDjPEbGJDjw514APHi5gTEOYR4qC6duUzfKj8W/WDVZ8r
+r2AeIY4xzBhmiMGjEUaIw5RRhBHm+XQmc/rMmeVksqm5ta9vVyQSGRoaLhSKHIcYc0zTRpxQKBRK
+pdKmLb2BkB8hBnuucmPi2ym0+ygFPbR8yAzHca2trXfffXepVJqamvL5fKDDBYNB27bPnTu3c/v2
+ndv7IpGYbqjPPffbS5cu8TwkU2LXeYIQcvPu6O2UgX205qqArJwhSwixbeudd96ZmJhoampat3Zt
+V1fX3Nzc/Pw8UB54yw3DGB0d7enp2bZtWyAQ+Pgj+ejHUwCb8/l89913X1tb29TUFKRUCILg8/m8
+Xu/09PTIyMiu/r09XT3hYGh2ZurlV363uDiPMaZ0xRQChbJyhh9/Sh/cXH9Wpf56/vz52dnZ6urq
++rq67u41tm3G43E3WmtZxHGcVCpFKbv7wP7Ozk6M7sBh97c9VVd/clPPoNg3lUpNTk4CiIIg1NTU
+SJL06quvLs0v7d9/sL29PRIJDw1dfvpnP11cXOR5TMtn97lw31Yh0kduriIIoRhN086dOzMxcdWj
+SLFouLGxnuO4c+fOFQoFnuc5xGzb4Xk+VygsLSX6+vr6+/s5LNyR3flRzsNBZXXKXYPdu3f3rFt3
+eXg4XywGAgEg5KqqKubQl468ImDh/nvuramp4RA+e/bsM8/8PJlMQj8gxEBMgbfv40/pgxs40xlj
+giBYljEyMnTx4kXTND0eT3NzczgcHhoaSqdTksBjRkG3sW17fn7B6/Xuu/tAXW0Duk0l8lbto3cB
+BirwjYaGhq985SuSJJ05c8a27UAgwBjzKp6GhoZUMvmrX/2qurr2wQcfqq9v8Hq9p8+8+z+e+sn4
++LhTri7DZRf8p0P4IGDgvMWhoSHMMZ/f093dXVdXNz5+dWJi3OfxILduwmEzc/PFYnHPnn2bNm1i
+jPG8yO7E63Vuuws3YlDpX0MIbd68+eGHH06lUhcuXJAkKRQI8jwfDodbW5snxyd++MMfVUdrH330
+Sw0NDapaOvXWGz/5yU9Onz4NViKqqFD4pBsopalU6p133hocHNQNNRqN9vT01NRUDw6eHx0dlSQJ
+Eh0JsTBmqWymUChs3rz50KFDwWCQUsQwYugOnBJ229C7GNGKSgTGGCfw99577/r1669cuTI9Pe3x
+eAKBgCiK0Wi4vr7+wuCln/z4p1Wxmq889rW1a7tLpcLx48effPLJY8eOFYvFSsvz40/pg5ttk6mp
+qRMnTly7dg1jDLhXV1dD+rwgCF5FoZTyPIbj75eXl4PB4OHDDza3tKCyoxSjO0Ald/jVARNXx3/8
+4x/n8/n777/f7/drmpbPZvPZ3PS1+PjY1ebWlse/+bg/Gv7Vb3795onjiUSipaVl/90H77vvMJy8
+i26sKHPrDiotl0pj1d0orsayYt2Uw3s3ur5ZMpm8enXi6tWrkLTT1tq8YcMG0zTj8fj46IiiKJQx
+jgfFl1iWNT8/X1DJV7/61YGBAUmSXM/P+/qgbrfd4TONEUOXLl786U9/alnWww8/LIpisVjMpFL5
+VGZ87OrY2FhTe/OXHvvyXXv3HD169Je//GU8HhdFcd26dV/4wqP9/f2NjY0u63chYxW1ODfb2E7F
+2eHuL90VcpetWMxPTU1NTEwsLCzouh4KhTZu2NDR0ZHL5S5dujQzMxX0+nTD8Po8jDHILk0kEvli
+8eHPPTIwMBCNRl2aQB/v8Kfrg79T0DM3CozwiRMnnnnmmXA4fOjQIZ7nF+fni/lCJpGcm5sbn7wq
+eZTPf/7zhx54YHl5+eWXX37jjddTqVR1dfXAwMCWbVt3bNvZ0NCw6kVGrs11s8sM3/TqmcrVsiwr
+lUotLy/Nzs5eu3YNso7b2lt6urpDodDU1NTQ0FA+n8cYhQI+x2GgyCOGZ+bnSqXSnj37Hnjw4Wg0
+iirOKb8jJI/uLMNxvYA85t54443nnnvO6/XetXvA5/EuLy0tzc7nMtm5+ZnFxcVCsbhh246vfOXL
+3d3dgxcvvPLKS+++93axWPQHAgO79nZ3d/f19bW1tUHC3s2anDt5VpF9hioOGMIYZ7P5bDY7Pz87
+MTEBh+AritLY2Lipd0NTU1OxWLhw4cLU1JRj25BT7jg2mNm6aS4vJ1VV37G97wtf+EIoEkarz7G9
+Zbj1ttqdhB72/oqZ7tATJ048//zzitezc+fOoNe3OL+QXk7mc5lEIjE7O5vMFSPR0MDAwAMPPRSN
+hQcvnj9x4sTly5dTyZwgCB0dHa2trdu2bevt7a2qqhIEwePxQKX5TQoohURJwzCA5+Tz+XQ6PTY2
+BrFM0zSDwWBrW3N3d3d9fT0lZHx8fHR0tJDLybIsSQJjTJIkwijHcYZuzc8vqKp+974D/8vnv+Dz
++eBAQlRR0Mu9X131R2h3WMy66HMcp6va5cuXn//dC4yxndt3BHy+mZkZtVhILiWWl5eTyXShUMjk
+c62tzbv37ukfuKu2tnZpaem1Y8fOnTsXj8d1XY/FYq2trW1tbU1NTRCJbGhoqKqqgrwSV6gWCoVE
+IlEoFIBNwwvGioUCFJN2dXV2d3fHYjHTNKempsZGRxKJBGSrcRynKIok8JRSizJCyPj4OKXs4c/9
+yaFD9wYCIY5bqQZ1NWB0h0ge3UHoKWIYYXZTMH1kZOTll19OJpMbN26sra5JLS/Nzc0VcvlcKp1I
+JEzTTKXTJrG7u9fuGrhrx44d9c0NhUJhfHz84sWLQ0NDiUQCimmCwSAUZVdVVUHR+goQjOi6XigU
+XHng8XjC4XBjfVNra3Nzc7PP54MQQjwen5qKU9uBU1UkWeR5HtEVn35B0+LxeE1NzT333j8wMBAK
+RSp1LVTB5T5z0EMvq6QPjHJycvLUqVMwsbbW5lKpNH0trqYzuVyuUCjkiyVNN4ua6jhOOBLb2rdl
+69atNTU14XDYNM10Or24uJhOpyHtvVQq0XKpMSSVKB4JjuWIRCJ1dXXwdrGqqiqB4w3DSCQSU1NT
+8Xh8eXkZkp+8sgey2wRBwGhFGi8uLibS2XXr1t1/+PDWrVtlWa48drYydZK7dR3s7bZP45VgUIE3
+ODh46tQpxlhbW5uiKKmFhWQymU6nNU3TS2pJLUC5u0WZbduRSGRNTzec0tjQ2BgOhyELHNQ+Sldi
+Z5BThTEGMcBhrKrq4uLiwsJCfGIcjhiAsk1JkiRJ8vl8CDPIx4d3e2Ry+ZmZGUVRDj/wuYMHDzY2
+Nl5X1e4QT79V+8Shd/epbdvj4+Nvv/12MpmsqqqKBPyapqWWk+l0Wi0Ui8ViSS1Q4hR1A2Osm4Zh
+GDzP+/3+mvq6xsbGWCwWDAZjsRi8L4bneUoJpdSwTF3Xi/lCJpNJpVLZVDqTyRSLRYcSQBzSPSBd
+FyEElW9weOtyIllQS11dXQ8//PDmLTtAeYeA36rBfxLtE4d+lUWazWYvXrw4Njamlgrwgqp8JptM
+LBeyuVKxqGklzdA5jjNN07AtxhioLhhjSfZIkiRJAuiCrnVjU2JZlm2aK6mf5XfqQTSD53nITkQI
+QbYhIYTYTi6Xy5eKzc3N+/btu+uuu1pb23lBQhVlrsBkPlG30qfBcNwtTMvpwZlMZmhkeHzsqqoW
+Y9GoyPHZdCa9nMxls4TakHzBKg5foZQSRiti3yvdMsYIXXFfCxzvxs5A/4HkJ1Q+0BjK8FK5nGma
+NTU1995778GD9zQ1NSkeD0IIqlRcVv4p+PI+jTdvVmrEcNFxHIfRhYWFmanp2ZmpXDojSRKPuXw+
+n8+mAXrIM4QCXUop41Y8Jxx3PV/KTZhw1wmX0/zgVeOSJAHicGwQz/PdazcMDAzs3Lmzo6PDvxLn
+41xLFX2Kb1z+lKje9cXT8lGqKykBNlFVdWF+dmxsbGFhwbZtU1NVVS2VSrqmQYgOzgiQJKmi7J+5
+3TrlE2wopYi7/q4AhyE4NgZOQYjFYlu2bNm3b9+ePfuqq6t5YeXoaleQrsoxRZ/8Gnwab1lGN54T
+tMrrAp9LpcLC0mI6nR66dDmXy+VzOVAoHct2fTiOY6Oy1xogJoRQKKWDgwooNQyjpGuEEMpwOBz2
+eDytra27du3aunVrd3d3dXU1aI204gQihHmOW1GLnU/45XeV7dN7t/jqxhBiDHEYrdgElCJkO7Ze
+UhOJhK5qiUTi3Llz1yYnC4VCLpcr5QtQZo4xZmwljug4DrEch60cWil5FJ/PF4lEwuFwX/9dvb29
+0Wi0tra2vr7ejWtyN7xJHDFUPh7xxsMl2a2LLu9U++NBf+vmigdQEw3DWF5eHhkZmZubKxaLHMeV
+z2FaOQgSYywIQm1tbU9PT2trazgcVhQFPD+VWvkd9PfekfaZg95V71AFTLRczumG44G9rCTE8bxr
+YblxDHYjFaPPEujQbvtg3U+t0YrzCjmOA4cXujEgdSs0K63Qzxptue0zR/Xo/QpaXIFc6TRHFUlB
+Fe776xla7gqhzx7Jo4+TDPJf7WO2zxzVu5y6kuGsisF+MMO5VTj3s0b4/y/t+/TLgJBY2QAAAABJ
+RU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_oldsmobile" model="fleet.vehicle.model.brand">
+      	<field name="name">Oldsmobile</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAlsklEQVR4nO18aXhUx5nuV1XnnN4X
+Sd3aJbQiISQBWkAgwGAMGOMFh9xknMnEmdwkdm58yYwzvuN47jxzJyQ3c/3Ejh08duzkmbmPQxKP
+jZexEdjs2MYGJCSBEBJoR/vW6lbvZ6m6P6q7abE4RsYjZ67eH9DdOqdOnbe++urbqhBjDOYxF8Bz
+3YH/fzFP/Zxhnvo5wzz1c4Z56ucM89TPGeapnzPMUz9nmKd+zjBP/Zxhnvo5wzz1c4Z56ucM89TP
+GeapnzMIc/t4xhhjDCGEEIr+RmN/AoDY7+wmpQRd8wt/0I26AQgBQPR/gBtffKuA5ipVQinF+Dps
+XjUYVw1A/GXxH67b1Cfcfp0HAQAAihuhG/XwVmHOqI9HfB8Ql1cWldvYB6TOuAUYminZLMJerIXr
+TWjGGJoxEvEDwD9QSvnX/8zUX18kub751HOdd/+GuoEx/iAUJZGP0PXmAY27CX3e2gbmUNdfy3vk
+FxwRBUopRDUJl8f4W2ISg/D19RKlELs9Nj9iyiRe73PBx4gBQsAYIMIY/Q/QOXMm9Ve9PESJo9do
+Eoiol+v3MyLFMXKvqB0y83EAAOjapq+AAgClgDHWKGDMP3/66XfT+ELo+hgopQxjykDTGKVUluVg
+MBgOh1VVdU2EwuFwKBQKhUKBQCAQCITDYU3TBEFgjFFKCSE6nc5sNptMJr1erzdSs9lsNBoNBoPR
+aBQEgRAiiTg2IFfmzUzdQhlQyihCExOTJpPJZtJ/Ti8799THlInP5/N6vS5PyO12u1wuv98fCARC
+oRAASJIkGTBfACVJ0ul0oihyNmMKRNM0VVVlWZZlWdM0RAnGmH+VJEmv15vNZpvNlpacYDQaLRaL
+0WgkhFzVB8qQy+Xy+PwTk67GxkaTyfTg177yOb34LaOeMhkjgVKMuX0RNZApxNnkqgoiAGIaqJga
+AINKoa9/eHB4fGJqyj3tm5qawlqQIKTTiQa9TiJYJwlAWSDo02QFY8wp1jQNISQIAsYYgLIoAAAh
+hDHmI4QQwlgQ9TpR0MmyHAiFGWNTwRDBoslkcyY6bDZrSoozI9NJMGgAvf0TwyMexpgcmrrc1TJ6
+uXPr5juWLF8XU/eaphFCPsFgvSncQqmnmsa4HGkaQ4jbFJQ7zIyqAIAwBsCywkQR9fWPnT17dnh4
+WJZlSqmmKSaTyWQyiQQUWVaUsBwKB4I+zMBo1BsMBoPZYjAYTCaTwWDQ6XSSJEWph5htrmmaoiiK
+oqiq6vV6ucgHg8GAPwQARqNRFEWERIwhJAcDoaCsUlUDkyUpIz0zpIYRZUk2a3/vxabGj01mw+23
+37miZlXUwWIx6/MW0XXrqOcSAfEOIVDKVIwExhggRgEzQKqCzrd0HHjvyPBkf0FuntlkmJocMxn1
+ToddDgYmxscDgYBer3c4HBkZGWlpaTabTa/XC4JAiSCKImc89lDGGELkuv2hVFVVVVEUWZY1VVUU
+xePxjI+PByZdg8NDKqOJyU7JYPYGNG9AUTVUW1GGgB4+fKD9UvP999+7vLra4UgHiilQjHHM1OGv
+eUssn1up62PLHQBomoIIIEAIMAPQAAcV7ULbpWNHPhgbHk20JyQkGiWBBINBOew3SiIwTRCII9Ge
+X1jkdDqTkpIkgxEQAoYYcKscX/UsuGbWX2UpAQBigBADAEYpYwwTwkI+l3t6fMKzd/8hheFNmzfr
+TUZEwD3qPnXqlM/vRpiuXV2ztLzMarUCA0CYC3tMtmIfPiNuodQzQpCqqoKAWZy3iQCm3IHTZ86d
+bmjyer2ORJvRKIQC0yDLgiBIkmQ0GlNTUwuLCzMzMwVBIICAEECYUYqwwDvHZ9LV/mr0T3CNSxU3
+82ZYh5RSDeHpad+Rw8cbG5srKioqq6oudVxobm6aCOmSE+1VZYuSLIaJ0RHX1GRGdkbx4mKr0SQI
+Al9d+GITPwyfBbeM+ng9o0UCIjgQlM+cOdN45uzEuNtqtWGMggEXQNBs0Vl1VofDUVC4sKSkhOj0
+lFIKiGASCx9wqAwYA4Lhj75oLCQQebE41Ryz071e/9GPmk6fPqmT0Ib1a21W64kTJ1zjk0vKl4Uk
+09jYWNAfcCY68xfk6SU02H9RVrylJWV5eXmSJAGApmmUUlEUbwljt07hMFA1VRAElWoIIUC4q+vy
+oUNHBkcnBARIU8Mhv15HTAad1WbKz89fWLw4KzsbADRNY4wJgsTnCgbEeKQFEABQRhHga12hmG65
+ob1BI7qGUUAE3NPB06cbGhrPMEpWr16VkZ7c2XWxubHBmZR85+a70tNTMYbegZHG9s6+QZd3Orwg
+PWVRTkrIN9Z7uSc1NXXJkiUpKSlc2FVVjV9vZo1bRz1lgCMhQMbg4OHj+/cfTExwIMl4qe1cTmZS
+isPi97iKi0tW1a53pmZQDAiBqlJBwDErFIAyRiLaOZ5TxgDIDD1yxT2l13SFXwDAEL++vqnlD6/s
+0TR2z7b7SgvTurt76083ud2eNWvWrF5dK0oIIQYaBgwqgv6RyfrGts6O/gSrLS3VkZMmtbe3h8Ph
+rVu3OhyO6MNvgalz89QzAHRVcINqjAJlhIgAEAxp79S9d+p0Q0ZWdk9fb2Csc+HChRaLBYiwbNmy
+yqrlkiQxuGkHnV0VM7ii4lUADBQDRGK+gFUAFZiBMejoGdq7/8DExERVxZLS0oWIKWebmru6uhIT
+E9etW1dYWAjRQA2lgBFQqmBCNIobznY0nL0YlFFKlikrwdTf1oIVvGXb1oRkOwAgEOPZ5y3c7Hjc
+PPWUUWAY4/h5x4AiwAAw5fb/4d9e6+vrT0pK+vjjEzabbWVFcTAYLCoqqqldnZCYCIB5XmIW1EN0
+wGYYG5jEBF9RNFEUGUA4TDu6uo4de/9y/+CypUtXrKjWwsGurgvd3Z1eX6i2traiosJoNDLGuABR
+SjHCiqqJIveNkYbQwOj0iZP1g0OTKQn2DIf1UnsTZcFvfPNBi9nOGIGZRifc/FSYpdTDzKierCoC
+FoeGx155dY/b4xUE4eTHHywrX1xclD895Vq/fn1JWTkmhNIr7s/sENNClKoQDUxqmoYJUTWKiaBp
+0N7We/T48YHRgSVlpevXrFZC/rbW8309HaFgICXFuW7j1tTU1GutlIi+ZMCYyhhDhGiAg2r4g2MX
+L17qS3JY9Xpf98Umu9n2wJ89aLNbI3PvM+RVZkl9TOQZY1wHDA2N//MLLwIikkF//Ojhdatr8rJS
+/T7PHXfenZeXhwnX1ATg+ib5p3mupqqEkGj4kQcaKWCKQFApxhhazvccPnx4cKivbGnZhg0bqCz3
+dLR3Xbzg807r9frKquryZUt1evMM8z8amqagIYaBRiP7iDLQABCjwsnGy/XnW60WYkTBDw/ur6io
++MZffpMIUqRfcY7uTQn+bFZqxpggCDxIwBjDCCkqvLrnLUohLz/nX/71N5UVS8pKiy/3dN5/z10L
+IvoUMCbwGSLgjFLCBxsYo5G8EsZYYYARXL48uvedffX19dm5Gf99x8PJyYkXW1pPfnxCwGh4cGDB
+gtxtX/6y2ZaI8IwITEzhaJqGCUOIAcHAQFMBY8zHAGGloip71Dt2uW9cZ7EuqVx+6tT7K1ctL168
+lM8b3tS1aYA/itlIPQOGEIuSiIHB23vfPXT0RFlpyZ49r2RlpN65eYPH7br9tnW5eblAdPBpbME/
+Dso0YAgwxjE/CwC6uieOHDnUcr4xMyttw/o1paWlHR0XOy5emhobGRsbEwRcu2ZtzapaIuhVAMpA
+iiqKyNtcSc+qADgShmIADKgGGAMQnwZkeEr+8ESHZ8KVnIia6g8nWMyP/PXfXmXg36yun43UI4QA
+WEx4W1svHT/2QW7+wnff3ScHfRvWrqTh4OqVq3ILF/JpMWM1+yyhD8wwItx4ZQhaL3Tv27evs6sn
+PS3lz/7sK9WVS4cG++reflMOhjxut9vjKS0rr6ldneRwIEQopQLGbKZpFUvJxvpICGJM0zQmCALG
+ABSA6UFT0xJsGSlmn9cz4Q5mZxc3nz7c1dVVXFzM25mdrXnz1F/pPQXAsqweOHDAYDCNjo/19vbe
+t/X2gH+6Yml5UckiAMyi7wdxvM/OC2egIUQYgKpC28VLb7z5Tk9P38KFRd/69lcXFZWoYe3f36xz
+T4xLIrgmhhPs5pLyymA47AurSUREEFkdEKMAWNM0HliGOE2NEZcSDWEgAmOgMMYwFkATCBKAQVlJ
+7uik63K3O8lkwRiampoKCgpiCgdm+s+fBjdPfcSqjqREGxsbL3R0L6mueffVX5fkp1FFttoSi8ur
+AInRBTh6X7RPPOSNGIoFxK6kTAEQQLQmgOsEGmEexCmffOJk03sHDvX0tK1aXvE//ubhxcUlrnDw
+2OEDlzu7E3WWwPiASwsXV1Zjk8M1dMlutydY9QSopmmEiCqNmAbxAx+vqREghIS4P/HuUgoIM2TX
+6ZKMJm9qasA7lJCQ0NF2HtR7EdFTihDG3ED6nBUO4w46Y5QG/P6PP/7YZDJ5vV6Px5OcnBwIBPIK
+CwxGY8TL4CsYxlfZlBGiNcoYQwRfSdJSijDEMuGMIYwxZeD3hxrOXzh04L3Ws43JjqTHvv+9tetq
+g8HwqcbGlnMnxwcmstMy2jvbbI7U5dV3Tbsnulo/WrSodNWqVVaLlauSWXv/lFKEBcpUjElCQkLP
+uAcDMRkThsfHfT6fXW/ACLNPKIm4MWYh9VEBwXh4eLitra2geElHdzchRNM0iiAtLQMAKFUxllg0
+hhxDnGGuRGc947Evnl2hTAUAhCQ+X4bHPO8f/+j06dPdA4OFBVk/fPSRVSuWEyy1nL1w7nzT8OiA
+iWGLXujq66yuXW91pF7qaJ+eGCrKy12xYoXVYqUUMEYAGCENZqWUMRZ45JhSJugEKodFIiCin5qa
+CgaD9pum7wo+UxhoaGgoGAzabLbR0TNhVRl3TRaXlnGXVRAExjQcrdSIrbSxN8fRIYmql4h3iolE
+KSAEF9q79u9/79TpBoTI0orKB75y36LFxUajfmho7PDhI+MjQwaJ4bBvYlJ2LkjbuOaO8SnPiaMH
+jSa6ICtj1Zo7EuwJsUWFZxFmF61iDBCiAIhizDAL+aZNEvL5w4qiXGsyfM66nveFUU2Rp6amZFlG
+COl0Ok3T3O5pTWOARI0CxpgxNaZJr6234YsGt80pBT5nMSET4/5TDfWHDh3o7e11piRvu//e5TU1
+ZrM5LUHn9cm/3/1qa2ur02Ez6GFsZMyo06+4Y1Nqem5D0+mRobb8BSlGyVK+bLk9yRxN2uDZBVhm
+vi4oGmUEpj3eoNftSHW4p70Gg8FgMEC0XpNSIDdpu81G4cTSBYqiAAAhJCkpqUNWNYrHJ1yyRiUM
+wKcqVVGcaMQZ0ZEYOrdYBAEowNlzbR999NG7+49OTbnWrFnzyCOPFBTkOZxJlKomo+F045l//fW/
+ZDhTapYUX+po7egdWVpVW1G9NqDhD04cG+puqa1ZNjIxkZtfllOQD8AACzDTmpqdacvvEIjkkaGn
+d8BsEGw2w/DYYFF+tk6nA27YRL36z92up5RiQhBCer1ep9N5vd7CwsLTRwRZVkfHXZc6upcuLWHR
+puOjHLGeaZoGhGgMZBlGR0ebms/V19d3dfV4vd7q6uoNG9YXLsyXBIIwIKpNjI69/v7RMw1NRYUF
+Dqvp1MkTkl63Zct9mQXFk27vqY8/Hh++eNuqqvHR6ZLFVZXV1RQYoiIP+8en9GYfO6KMYmjvGBwZ
+myzKSBsbuTw97SopuZNTzxEpxLgZzIZ6Qrhfw6xWK8a4t7f3rm3bS0pK6xubOju7X9/zpsViyc7M
+EHQYISFmXcb8l0Ag4PP5ui6PdHV1tbdd6u/vDwbDqalp993/pcrKykSHSVVViQhmk3FybPyNvXVn
+zzUlO5xrKit6+7qa+y6VL6lYtLgyITGpo6vj3UN77UJg07q7+4bGMvNylq+sxljPABQMUlQGYwMw
++yA7Qj5fuL6+MRxWEmzWY4caExy2goICuDKfAOPP35vlKVcE1GAw6HXGrMwFp8403X77HV/7zg/p
+7t+0nm04eGDfYN/ltes25hbm2ZPsBoOIMZZldXraN+Vyj4yM9fX1jY1O+Pxuo9GYkZGx5e57ShcV
+O5OTJEH0+70QQmnJNs/0ZN3b73xw/ITFaFmzotrrcdWf+TAlfcG2r3xT0JmNFkvzuaaD771TmJt1
++6atTY0tNqtj3dr1GOm5JxHv4Me7PAAAWlyCPS7vglBYpRiwSAE0YISpEiJAsYxpgOJ/P3BypH94
+89oVJ0+819fTVbNmReGiUo0iQjAAYMSzajc3rjcdw+EJJGAawnigv//Nt/buq3svN6/gz7+3QwnL
+zY0NZ+pPDw8N+v1+g8FgNJjMNnNE+ihIkmQ2Wx0Oh9PpzM/PTU9PT7Db9HopHPQDZZSqCQkJRIDD
+h48e3PceRlBduYRg2nK2kVJ17fo7M7PzAmElyen8+ORHB/e/fdvqFevXrf7wow8ZxV/72jd0Bhvv
+HkJAgd24WlJlwBhFsULayFBQbmQpVNMwkQCwShWMtTEXPnL8w5aW1k3rVw/3tb/xyst5C3M2bd6y
+/o6tV02mmw1PzSpyCQghxKiamZ5WXJA7XrWsrm7/wqoVa9dsWFm7cVFppd83OTo8oCma3xtihPFC
+O5PJZLNYLRaLyWSw2+3AqCzLajjkV4KSIIo6IcGWNDw8/NyvnjnXeGHzhjtrV1QfO1rX2dVeXFJ6
+7z3bR1yB0XH3kvLFe15/9a03/+17/+27S8tL3n//aF/vyEMPfU9ntKiyJkiRrDqGmcGaOGiMYoQR
+BhbR4ZE1gBIFUQFAxEwEDRhmFJMxz/SeVz683N+5/Utbwv6Rund+V1qen5KWXVG1Ima2wkyX+NNj
+VlIPgIACUKBsaGDg4HuHPvjgg/Zh119+66GSsiqZaoxpCBgBRFWqEwUeiqKU6nWiKBJFUQAxkyQp
+iqI3SDpRMBsN4XC4bu/bdXV12dnZd23a6Pe5Dx3YD6Bu3HJ3dm5Jb+9IgtORkZ78wnO/aG449d3v
+fKuicmnbxQsfnDjxtQf+6+KSMm5HaZSRCPn0E7aJxdK6jF0pUAZMgWFNVTGhgJGsiRcujuzdezTB
+pq+tWeaZuvz7l19ItJtSU9Nr126srlkDM/2VWWCWaXHGGEKMURUxaDh9ur6+/vDx04OjI3dt+9Lq
+9ZuBGIFhWQkZDKKgaoIgEIIIBkIQRoAxiKJIGDUa9Vaz2eudPnTwvbq6d/SSbvv27Ta98d39b/dd
+7qhesXzL3dsHRt0j4+7qVau80+P/63/+yGKUdjz8UPHCgsbmc/v2H3jg63+xdGklo6AxSghGV3I4
+N6aeAlMBCKBoISWnATSBEdAAAqo2NDT1/tGTY2NjK1esyM91fnj80LGD+3Ky05zOlKUVVStq10Tz
+BTOK1COEfn7xesaAsZiBTAEAVOXI4cNdnX0nPv6wvbuzpKxq45YvFxSVE4kEwtMGIIAoQVivlxAw
+0FST2aDXSyadXpbDR48efX3Pq0C1O7dsWlpWfvz40Q+PHs7Ly7l3+/2JiZknT59Py1pQvary4OF9
+/7Rz5/Kqir/56x8kJdg6L3X8/vf/ds+9X1pz23osIO71aBpDiHHv6ZOEkVEAAAQskq5kDECjGka6
+cVeotb23tb17fHy8qmJhVUVhT+fZPXvekn2+ZWWlwYCytKqm9rZ1GMNV+ixe3X++qRLg+RKENKoJ
+mGiapirhowcO9fX3EiK2tl282NmzqHTZqjVrCxcWGU0GURSVsIwxSAI26nVGo9HrcZ+pb3j9jdf6
++vq23XvP5js39vf2/Pa3v52cmPjzP//a6nW3N59r7+kb2rjpzqRE665nf/6HP/zfrXfd93c/ekJv
+EFyuyRdfeKFk0eIH/uIb8atprBoSbryrDQCoFsZEZIBV7qZSGB3zjk9OXGi5ODHm0uv1xYvyV9Us
+nhwf/N3u3R3t3aXlhc4E+/TkZFVNbfWqdRoA05iAWawg8GYZ/wzUUw0QoSiiJ3G0bikYmD6w/5Db
+NZWdkX65v+ff9+11eUIVFatq1q8tXlhkt1tFQlQ57A/4Oi9e2rt37wfvHysqKnrsh49mZWXtefWV
+N998PWdB9o4dO9IWFL32+lsM6771nW+MjQ089b9//PZrr2+76/4nn/ml0aj3h/yvvvZKa2vLU08/
+TTUNY8KQAACMqlzeATBCiBva1wUDUCj4/GHPtDwyNnWxa6CvfygU1hJsaP3q5UtLc6Ynxw6/e+DA
+gUN6o2HLls3T09OjQ33rb1u9pKZGZgJGIgFAmgpEmLVtM1vqbwgaDofPt7S0trbqRclqtfb19DY3
+N/cODIui6HQ6dTpdIBAYGBiYnJxMSUn58n/ZtvXOzaODg7968fmunr67t22778tf7eobaD53blXN
+ysry8hPHP3j22WfPX2jZfNeWx5/42wxHWigY1sKBL31pW1n54p/80/+RDEbARAAafYUrwWeqQVDz
+AhBZYaGgFgozOYw804Hpad+QKzjldnncE1QNWo1ielpyXn52elqq3QTdnV1Hjhxqu3A+LSV5SVm5
+XhKGhoYcGbkVFRVZWVlX3vMWbbC6dVsbqMpXnqHBweYzjaOjozabLdGeMDg61tbWduHChaGhIVVV
+ExMTV69evXXr1rz87IZTp3/1wgupKel/+6MnRL354NHjGoUtd90RDAT2vPKHt1573e1xLS4r2/XP
+v0xyOnyhMDBNJ+hefOGlAwePpGcVJDozTGabaDYKgiAIEiGEMaRpGtWAUso0UygU4GWqYSUUDocl
+SbJYLElmNS0lJSc7PTHJZtaLwNSe3o5zZ5taL1yQZbmwoKCkpFgNy5f7+2wWa2VlZXZ+ES+4jDH+
+R3Xap8StlHqIaj2qaT2dXS0tLZOTk0lJSQkJCQDg8XgQQsnJyXa7XVXVhjOn6s80rrvtjnXrN547
+19p8tmXJkmULi4uPH9/7u9/uHh0c0okCACxaXPLMrmdMFrMMFAAIEgQQG8+c7+od9gUUbyAclP2U
+Uk3TVJUyxggR+V4fvagajXqzxWS2SImJNqfDbrGaBIGIqjEYDIyNDnd3d7a3tfT39QoYpaYlFy9e
+mpycPDk5OTw8bLPZSktLi4qKJJ0OYEaZMb0mAzFr3Mr6ekVReJKeaRRhzCgdGBg4f66xu7tbEIT0
+9HQACIVCHo+nv78/Kzvzjk1bzJaEX+56/tTJ+traWovZWFe3t7OrXSdKJoNBEARBwKqqLq2suGPj
+xoqKqvTUNEBUxEQ06IEihiOh2mtXOV5MQDXQZDkYDE5OjPX19XR1dY2PjHaPDo+MjGialrsgu6x8
+cWF+gdFo8Pv9A5cvBwOh3Nzc0iXlGRlZgJCq0hsltuao5vIGuEoDRhIggIApvd3dFy5c6Ovr8/v9
+mqbZbLaioqLbbt+AsfjLXc/19vVbreacBRmBoHdkeHByMjg6Oup2TSmK4vFMqVTz+XyyquQvKMzO
+zs7KSBEEnJBgE/WS0WiU9Doi6GKBOVWlsiyHQiFFUVxudzAYDPlDPp9vyuUK+ENmk8nhcGRmp2Rl
+ZeXm5CQlJSmKMjAwMDk2jjHOysqoqKhIcDqAIcoYYyiSzIntcKM0lkz/wu0qoZTGwoRwZd1nPDo1
+7fF4vV6dTmcymQxGI2M4EAg+++wvrBZTVVWFMznRbNYbjHo5KMmy7Av4R0dHJyYmpqenJyYmguHQ
+4MCwy+Xyer08T6CqqqqqGGOBIBwF3yuh1+tFUUxKSTfq9BaLyW63JzkS7Ha7XhIRQkQN+f3+UCik
+qUySpPT09JycHHtiIkiiIquixGvKMERDDmwmy5/Rg43Hrd9LRSnVGBVIpFKM18tfZYQxxhggqtHB
+vu7GM/XDw0OhUIAC0xkNJsmYlJQk6XVWqzXR4QQAnvUVdSIhQjikUErDYUUQJFVVqaphFo5JIqUa
+APBhCIVCkU1talhVVQqaIAiCQCzGJLvdbrPZrFarwWLlXQdCVI0KghRj9iqVEr+0fuEsHA4WO90E
+GKWUYMIoYBzZ7gOxrTm8NJkxBBoEQ8FgMCTLrmn/5JRH9o56PB5ZVUKK7PV6IfrCBBBCRBRFwBgx
+RggiCCPEVCxxhUPigDGWBKLXG81ms9FkNpksOqNBJxkEQRD1vBoOaLRQhb9/bOlEce/y2crl/gjm
+fsvydUG5DEdBKVWVMOOFYYzFxwsFUcfND76DmfPOwZu6KjP8xcEXjvrrShmP1s38Grvgk07C4Zin
+/jOBMQ2uT+Kf6hliX3TqP8GC/vy08H8MvujUzwJ/KkPyxaX+qo59lhjhFxNfXOpvFtcdqi8y/mSo
+v1Evv+gE3xixg2oi5+nxWj6OkZGR5ubmhoaG4eFhiHp0MFO+NE2bmJjw+/2xCzQtUtMbu5437vf7
+XS5X7Hb+V/4vix4OBwAs2gL/N/I7A2CM71CIOGaMRT5cI++x1uIfFP8LY0xRlImJCZ/PF3/BVb3i
+H8ZGRsdHx4BFXA3egizLExMT/JikWJvX8vPJHROi++QF/p2HHr1e769//eszZ87wo5K8Xu+CBQse
+fvjh9PR0QRAQQjHHOhAIPPfcc2VlZdu3b+dzPHZmSSzqxON/hw4dOnbs2JNPPsm/xm865ZFYXseJ
+COZVwVdVW/C/xpfqx26P1YCiKPgtPLYR71vx/iCERkZGdu7c+eCDD65cuRJFq0jD4TCv5eN9QwjJ
+svzcc89lZWU9+OCDkj5S5ifLssfj+dnPfnbPPfesX78+xuxV22jjqY+vFolpQiG+jodfOjQ09A//
+8A/9/f3f+c53ysvLCSEtLS2vv/76jh07nnnmmZycnPh3FkWxsbExKSkpvlHelKIojY2NHR0dOp1u
+5cqVk5OTnZ2doijGOsQbaWxs7OzsVFXV4XCsWbNGZ9DHs4kxbmtrE4kwMDTodrurq6szMzN7enoa
+GhpsNtvy5cutVmvslWKUUUo/+uijvr4+VVUXLly4cuXKWJv84nA43NraOjIycv78+ZaWFoxxcXHx
+smXLeMdCoZBer6eU6vX6rKwsu93OsyW855Ikeb3e1tbW2tpaiOwVoBhjLsT19fUXL14UBKGgoGD5
+8uVwY8yIRyOEVFX91a9+NTAw8MwzzxQXF3MxycvLW7NmzY4dO3bt2rVz5874Mk+EED9HLCaGXNaa
+m5t37dpFKS0pKZFl+f333+/t7bXZbDHZ5OGBn//85x0dHTU1NRjj/fv319XVPfE//y7FmRxrx+Px
+/PjHP9YUdXFZqaqq+/bty8nJGR0dTUpK6uvre/nllx9//PHS0lJeA8KPORscHHz66ad9Pl9xcTEf
+gz179jz22GOpqakAkWoRQojNZtu9e3dOTk5mZmYwGKyrqyspKXn44YcTExP1ej2XjHA43NjYmJaW
+BnFSxWc2P48q9taMsba2tt/85jfhcLikpERRlKNHj77xxhvf//73s7KyYqW+8Yv/DOq5cmhqaqqt
+rY1tj+NnYSQmJt5///0vvPDC+Ph4dnZ27JGyLHP9oKoqDzESQlwu11NPPZWVlfXoo49arVZCSEdH
+xy9+8Yvx8XGuMfj7Dw8Pv/vuu+vXr9+0aZMoitXV1YODg7EJGws+u1yu0pLFTzzxRDgcfvnll59/
+/vldu3atXr16fHz8m9/85quvvlpUVMQnE5fN559/3u/3//SnPzWZTIIguN3uxx9//He/+93DDz/M
+fwmHw5RSVVWrqqoeffRRi8VCKR0aGvrhD3+4e/fuHTt2QJw283q9RqOR8XDsNZmT6PkK1O12P/30
+0y6X6+///u+dTqeqqpWVlU8//fTzzz+/c+dOfmN8rXWEen4/zzExxqxW69jYWEyxxpT1wMCAXq83
+GAwo7tBZvkiwyCbmSIDX4/GMjY396Ec/ih2lUVxcvGnTpj179vCVil+cmZn5s5/97O2333722We5
+Trfb7emZGc4kR+x0W4yxwWDIysrip285nU6n05mbmysIQkJCQlZWltvtvoqp1tbWBx98kD+aUup0
+OtetW1dXV/fII49wqdfpdIQQQRDuvvtuu93O15UFCxasXbu2sbGRRbYWRaadpmmiKCKMBYRjk4b3
+TVEUroL4mtfZ2ZmVlXXo0CG32y0IgtlszsvLS0lJCQQCVqv1qh0WjLHIise1Nu/rAw888Nhjj730
+0kvf/e53Y8vUW2+9tXv37h/84AfJycmxiRO/ssV7/AkJCWlpaS+99NJPf/pTo9GoadrIyMhrr70W
+XypDKe3q6rp06dI//uM/CoLAv27fvl2QxMWLSkRRjBXFK4oS09FcAYbDYYwxn446nY4LDf/XYrHk
+5OTs27dv06ZNJpMJY+z1eo8cObJw4UIuWFwvYYz9fv/evXuXL1/OW56cnDx27NjatWtjKzYhJBQK
+8fZjL8tPhOKMccXFhclisWRmZqqq+tBDD9lsNoTQ8PDw3r17lyxZYrVaufbPz8+Pj0JHzjmIUUkI
+2bJly/T09Ntvvz08PMyPLenu7u7s7PzqV7+6ffv2+FlGCOGHSsZPJUKI3W5/6KGHnnvuuZ07d5aX
+l6uq2tLS4vF4HA4HV8cxE+jIkSPt7e0rVqwQRfHy5cvLly/fsGGDKIpcuHiUmO//4/3U6XThcDjW
+WwAIh8N8DsVEZ8eOHU8++eRPfvKTpUuX8kfrdLpvf/vbEF3/JUlSFMVgMJw7d27nzp2FhYWKojQ0
+NOTm5n7961+PO74t8miEEMRl3wghXN55r/gUsdlsf/VXf/Xiiy8+9dRT5eXlgUDg7NmzHo+npqZG
+luXu7m5ZlnNycmbss/1Tcan+8+FPNeL6nwDz1M8Z5qmfM8xTP2eYp37OME/9nGGe+jnDPPVzhnnq
+5wzz1M8Z5qmfM8xTP2eYp37OME/9nGGe+jnDPPVzhnnq5wzz1M8Z5qmfM8xTP2eYp37O8P8A8cqi
+S5bRgU8AAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_opel" model="fleet.vehicle.model.brand">
+      	<field name="name">Opel</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAjuUlEQVR4nO1deXAT1/3fQ8fqPi3L
+ty3fBmMbmzjxOEmhMSSlkIMmJNOk0zRJc3Qm5JgMk2NaSJhpMpnOkGvSSUtJOkkTSqBhgDThCJgE
+29gmYCzwhU/ZFvKhW1pppd39/fH96c1aMpRDtumU7x8eeSXtvvd53/e9v084z/PYDVoIIhZ6AP+7
+dAP6BaMb0C8Y3YB+wegG9AtGN6BfMLoB/YLR9Qs9z/Oz+hzCi5d2Snie5zjuMj88/4Qv1IDguYAv
+juMEQaCLOI7HfZLnefjAJW4F3+I4DsfxxDvEXbkeaMGg5zjuEmgmUuI4Ac3E1UJX0FfQuyzLkiR5
+DaNOJi0Y9IiEA4hDELgVx3FYpzjmRfsGlhBkC3odt66z7qeFpYWEPlGSCOFGVziOC4fDNE2Hw+Fw
+OByNRlmWZVkWRk6SpFgslsRIJpNJpVJ0z8QbXj+08FyPxfAlCALJkGg0GgwGPTHyer0+ny8SiQD0
+QCzLAqeDfJdKpTKZTKVSGY1GvV6v0+n0er1Go8EEG+vSOmOeaSHVLAIasSTHcVNTU06nc2pqyuVy
++Xw+lmUBLLlcLhaLKYqSSCQgr4H3I5FIKBSiaZqmaZ/P5/V6Q6EQx3EymUyr1WZmZubl5eXk5Gi1
+WuyGrBcSwj0UCo2OjtpsNp/PR9M0juNKpVKpVGo0Gq1WS1EUSZIkSYLEB2YHYRKJREAihUIh2Baw
+UcbHx10ul8fjIQjCaDQWFBRUVFQUFhYu4GTjaP6gB5SF8j0ajYpEIpZlu7u7+/v7QeZQFGUwGLRa
+rcFgoCgKwzD4iwnkBsuy4XCYZVm4yDAMx3GwDEAMw8BKTE5O2mw2m83mcrl0Ol1BQUF9fX1paSmy
+QdELGF6cbTqnVuk8QQ9TElojMMOurq6+vj4cx+VyuVarBQENUhuLrQ2GYRcuXJienvZ6vS6XKxgM
+RqNRZLHgOK5SqRQKBahZiqLEYjFBEMFgkOd5WKFIJGKz2bq7ux0Oh0gkKisrW716dV5eHtxfaIzG
+WVBzqpznA/o4Uw8m7HQ6T5w4wTBMSkqKVCo1GAwpKSkikUgqlcLHPB5PX19fd3f36Oio2+32eDwc
+x4GoAeEjEolAM4vFYpFIJJPJ1Gq1SqVSq9UajUaj0RAEQZJkKBQKhUIURYXD4bGxMavVOjQ0pFKp
+6uvrH3jgAYlEAgwR5wSgVZ87mnPohRIGabmWlpbR0dGMjAyVSiWTyQwGg0wmAzQjkciPP/7Y3Nzc
+29vrdDpZlqUoSqvVFhQU6PV6s9ms1+tlMhngwnFcNBoNhUJut9vpdLrdbq/XG4lESJLU6/Uqlcpg
+MGg0Gp7nfT4fwzBisRjH8aGhoTNnzgwMDOTm5j766KNLly6FRQXpx/M8uvmcmkPzqmZZlvV4PE1N
+TWKxOD09HRDUaDQURVEU5XQ6v/322+PHj9tsNpZl09PTCwsLKysry8vLzWaz0PpElCgTGIYZGxsb
+Hh7u7+/3+/0kSWq1WrA1MQzzeDzBYFCv1wcCgbNnz7a3t/t8vvvuu+/+++/XarWIM+Yn8DDn0MPO
+BfZ0OBwtLS0ZGRk6nU4mk4GgUKlUNE3v27dvz549brdboVAsWbLkpz/9aU1NjVqtTryh0GsFAqTA
+zBeLxVhse7ndbqvV2t3dHY1G1Wq1TqfTarWRSMTpdHIcp9PpRkZG2trazp49W1NT8+yzz2ZlZaGb
+R6NRgiD+67keXKSenp6enp6CggKFQgHGIsuyUqm0ubn5s88+GxoaslgstbW1a9euzcvLA2Pj/4eI
+44Cs0OdCb2EzQ2ZChkXyuqurq6OjIxgMqtVqo9EoFovdbrfb7dbpdAzDtLe3NzU1mUyml156qbq6
+OhqNkiSZeLek03zI+kgkcurUKYfDUVBQoFKpYD4SicThcHzyySdHjhwxmUyrVq26++67LRYLfAvt
+/TiBm4hFos0q/Ao4ASRJchzX09Nz5swZmqaNRmNKSorf73c4HGBc9fb2Hj58GMfx5557btWqVfD0
+uQ77JA16NFyhlQYOZ3t7u9vtLi4ulkgkkUiEoiiRSPTDDz989NFH4+Pjy5cvf/DBB2+++WZg7bn2
+Npubm4eHhwmCyMrKYlnWZrOFQiG1Wj02NnbgwAGPx/Pqq6+uWrUKw7DEsF1yh5dMroeRwXAR6x0/
+fjwUCuXn55Mk6fP5UlJSIpHIP/7xj7/+9a9ms/nhhx9+4IEH1Gr1rHH2OSK73X7q1KmpqSmLxSKV
+Svv7+wOBgFKpdDqde/fudblcmzZtWrlypXAwcaAnRRAlX+AA6JFIRCwWt7e3T05OlpaWgs+ZkpLi
+cDi2b9++Y8eOqqqqZ599dvny5Yi5sHmMsYCI7+vry8vLUyqV/f39Y2NjWq02EAh89dVXkUhk8+bN
+t99+u/ArSZf7SYNeODJAsLOzc2RkpKKiAiJcWq12cnLynXfe+frrr9esWfPiiy8WFBSAsgVJNT9h
+RRSPw3H83Llzp0+fNhqNGRkZPT09w8PDOp3Obrfv3r3bZDJt2bKlqqoKwhWIIZK4AEmbKgyIYRgM
+w0iStNls/f39JSUlHMf5/X6NRuN0Ordu3bpz587169dv3ry5uLgYxCjSEEKXcu4IgciybFlZWX19
+vd/vHx4eLigoMJlMExMTRqPxnnvuOX/+/J/+9KexsTEQocJpJmuQyeQyjuPALw8EAqdPny4sLJTJ
+ZGCq+3y+t99+e9euXU8++eTLL7+cmprKMAyKW8HX58eRQUoFMM3Ozq6rqwsGg263u6KiIjU1dXp6
+2mAwrF69+vjx4++88040GgVfQTjOpIwkadCDuIhGoziOnzhxIjMzU6VSOZ1OiLG89957e/fu/eUv
+f/nSSy+lpqYSBCGRSLAY3ID4/OjYxBSj2Wy+/fbbR0dHo9FoeXm5Vqv1+/1FRUU1NTV79uzZtWtX
+OBwWfvF6FDgQBjlz5gxBEDqdDuK3KpXq888//+KLL2699dZXXnnFZDLBhIW7GJvHSg3kBGAx4cPz
+vMFguO2226xWq1Qqraqq4jguFArV19crFIr33ntveHgYgtIo3ZiUkVwx9CgnhwkS01iM671e7/j4
+eHZ2NsdxXq9XoVCcOnXq3XffLSsre+211zIzMzEMi0ajWCwSkHRWuhyKi8jD+DMzM6uqqrq6uoxG
+Y0VFRTgcJghi7dq1g4ODf/nLXyB7g3CP45uroyuGXghZor/3448/ZmRkSCQSr9dLkmQwGHzrrbcI
+gti4cWNNTQ2GYUh0Xj+Exl9cXGw2m8+fP19UVJSWlhYKhQwGQ21t7Y4dOw4dOhSJRFCOLCmW2FXe
+Ii6WAuxgs9k4jtPr9X6/PxKJqNXqv//976dPn3788cdXrlyJYRjDMHMdBL9SEqoZkiRvueUWmqY9
+Hk91dTVEcm655RaO47Zv3+50OrGZO+Ya6WqgR4gLS8YYhhkYGDCZTNFo1O/363S6jo6OTz/99Lbb
+bnvmmWfEYjHLssDvIDeTMvqkEKAJBgJJkrW1tX19fTKZrKKiwuVyqVSqhoaGo0ePHjt2DETldaFm
+hZLa4XBwHKdUKgOBALgt27ZtC4VCL7zwgtFoxDAMmEgYgLyuCDKF0Wg0LS3NbDbbbLbs7OzU1NRg
+MFhaWqrT6T7++OOJiQlsYY1LoZEA/0YiEbvdrtPpRCKR3+9PT08/evTogQMH1qxZc+edd8InwS28
+DkFHBFyPYdjSpUsnJiZwHF+0aBEYaXV1dY2NjW1tbVhsItdOV8/1QhBdLlcgEFCpVD6fD0o2Pvnk
+E5lM9uyzzyKrAGYFtv+1jzvpJBQmMpmsoKBgbGwsLS0NQnulpaVSqfTLL7/0er3JinZc8V2Eti3i
+fZfLBWUEwWDQYDA0NjaePHny1ltvra2tjdsiKPN5vRGk0rCYyVBQUODxeHAcz8/PDwQCJpOppKTk
+u+++GxkZmXPoZ5VocaFdeB0MBl0ul1qtDgaDBEGIxeJ///vfoVDoqaeeQusUZxElkYT3FK4xNtP5
+SHyBbPO4UQGvKBSKrKys0dHRnJwcKJKoqKiYnp7+7rvv5lzWg3eK3CUQcMiwFT4+GAyGw2GFQsHz
+vFwuHxgY+O677yorK1esWIEJFIPQCbjE6OPeikMz7i1gBY7jIDErXGNh0go+ACMRVgTBdSzBQQHL
+PSUlBeZlNptpmrZYLAaD4dtvv/X7/ZcF7X+iS3E9mCIwVmEYHZkoMGGPxwPlRx6PR6fTtbS0jI+P
+r1+/XiKRIKsZEdwhLv4XJ5ES2TDukwgpeAvy13hCQT38C+9CdBqP9VCANQnX0XjiXGuj0SiRSHw+
+X2ZmZiQSMRgM+fn5LS0tYOdcO12K6+NCFkJFxMdynlDfQVEUhC1pmj569KhMJlu+fDlo1ESIEyMh
+wlWJMz3jdkncEibeAe1IuIKsEZ7nYbSoRJCm6YmJiQsXLgi1ESqx4jhOKpWaTKbp6WmTyaRQKCKR
+SFlZmdfrbWtrS4ql8B80HuJuqE9CtRJoqoFAIBgMwpZUKpUOh6O9vb2ioqKiogIT+FxCp1FIiaEI
+IMAIBAKqKIaKEiipRLX2UFvJMAzDMKjgMhqN0jSNCmDhrVAohOM4FGhiGBaJRKRS6a9+9Suz2Yym
+g8/MxxoMBofDIRaLdTrdxMQEJBQPHz68fv36OYSejxW3oN2KUvuorQDDMJ/Px/M8FDBlZGQcOnTI
+6/VWVFTY7XaPxwN1dwgOQBCwCIVC0WgU4QUEyMLHoIgeXYeHIrEO/yLFI9RAQt0O4wcOIElSoVCI
+RKJwOAxpnE2bNuXl5aHlF+5FEERSqVQkEjEMYzQaL1y4ALUkHR0dAMVcQY9EJ47jdru9qanpwoUL
+YrE4HA7DzKH4naIoi8VSXFwsl8vD4XBvb++aNWtSUlLefPNNkiQZhgFtBowWJ6ziHicUtbDe0CUC
+mwycYbgOnSQikQj2olgsRv9Chwn8i+O4RCJRq9UMw5hMJpvN9vbbb588eZJl2aeeeuqNN97AMIxh
+GEjvxE0cBiORSBQKRTgcNhgMMIacnJzu7u6RkZG8vLy5gh5JvWAweOLEibNnz0qlUpqmxWJxNBoF
+vQrSHMooMjMzlUplZWVlSUmJx+MxGAyAL8ILIYggQ8DBX4lEIhKJoHMBwYdghXfhW5djWSP4ANy2
+traNGze2tbWVl5e//fbbK1euBCkaV0IRZ4ZRFKVQKDwej1KphHVNT0///vvv5xZ6GAfP81arta2t
+LTc3t7q6GgwDDMNomobSVJZlIV7mcDgmJyflcrlUKqUoKhqNchxHURRBEHK5HNYJ4QsVxQA9WgPh
+i2g0KpVKAT5I3sJ4QHqAbIHrsMDCwmBe0C6L47jX6922bdurr77Ksuxjjz22ZcuWlJQULKaHkFZH
+yxln58hkMqfTKRKJKIpiGMZsNvM8f/78+bh6BezKO+X+g6yfnp5ua2tTKBRGo5GiKKlUCnW8MpkM
+aT+o4GUYBjoOQB+iWYnFYrAohHoMaQ4kKFDTCJBSqfT5fIA+ZBPD4bBEImFZFh4H6gfJ8bgmQiTN
+fvzxxzfffHPnzp2ZmZmvvPLKE088gcUMGMipxSGFJ1TZw4PEYjHkmZVKJUEQIyMjSITGLdXl03+Q
+9UePHu3s7HQ4HPv372dZFqqCSZJUq9VUjGBw8BWtVgtwgEKTSqWAPjT2AcuDDIEvIgECcokgCIAD
+KsJQTRVUZ0I1JIhmYQQU5S7QTgXW+eKLL/74xz+eO3fuJz/5yfPPP7927VpMwJvCXcIL6lDiEETL
+r1AonE6nXC4XiUQOh2NWocdfSfrwUsYljuODg4NOp3N4eNjpdIIdCSYHEo4QWrrrrrtomj579uzo
+6CiYNCBkKIpSq9USiUQulysUCoVCIZfLVSqVXC5XKpUURSljBO9SFCWTySQSCTAX7BjUtCaRSJB/
+hwwwVJoKLhLsKo/H89Zbb33wwQc0TT/99NMbNmwoLCwUCqU4hT8rXrBIsC8jkQh8F7rppqamsJne
+xmXCfVnQA7L33nvvnXfeCZYcWIRgQQcCAY/H43a7t23bJhKJVq9enZ+f/8knn2zdulWj0WRmZkI3
+msvl6u/vB8sSS3BiSZKUxgikmVgshpWApVKr1eAu5ObmlpeX19XVqdVq5PuAjEIQIFitVuuGDRsa
+GxsLCgpefvnl9evXKxQK9IFZjchExIU+Gqy0WCyGkjqKooLBYOJ0LhbwuGLoYUPl5+ej7cwLApZw
+0el0NjY2DgwMAHYGg4Fl2UceeeTxxx+HPDLsEmjvo2na6/W63W5YFfjr9XpRW6zf7w8EAjabze/3
+SySSUCgkkUjq6upKS0v1er3FYoEq5UgkIuzfxGLiGKTNu++++/rrr7tcrurq6k2bNjU0NMAwwEZK
+9KLj4MZmsjDP8yDoQO2jFiKAPu7DSZP1WCxqFrdJsRgjwGskjsPhMM/zgUBAo9FAjwCq0kYLifx4
+IORAwVqiLmSO41wu1759+7RabWVlpVwuLywsBH4HlYsiZUjCkCQ5ODi4devWEydO3H333ZmZmSRJ
+dnV1dXV1wRSAQJrBTYB/wSSD/hbQSUK1BJ8Egr2LljkOqCRDj3RRHLOgB6PgH2wCmCTLslC4CxeF
+o0S2B4wVlHDc/XmeDwaDXV1dVVVVBoNBrVYXFRWBrgNpnlgbCxfdbndNTc2KFSvC4TB0GUI4AZYf
+Wv1dLhc/M3iJxYokuFjDEKh9pP9ZljUYDA0NDfAUDMPAT+zp6QGdD4RWKzlqVrgGs17neV6lUkFE
+BcdxaEXzeDxoJuiTSB/GxXP4hMaE3t7ekydPqtVqk8mUmpqal5cHOwP4gBd0+yExCP9WVFRUVlYC
+sijaAwsAAR8YZygUQlGduLAP3ApFjeB1OBz2er0TExMQHwyFQuvWrVu8ePGnn34K7A+jArNboVDA
+prHb7U8//bTRaIwzn64YeiEhwwbDMKlUqtVqYZI8zyuVSggdgzgWGiHIaRTiLtQiEO1pbW0dGRlJ
+S0vTaDQWi0Wv14MVH5f0iJPRaAFQMAfEGthI4McpFArw/jAMQ6csIJcwrtEZgkuwMMBPJ0+eVCgU
+2dnZEokkLy/P4/Ho9XqYFNpeOp0uHA5PT09/9tlna9asAd2OxUzeRPa9plydSCSCwlWv14thmEaj
+USgUdrsdOVAYhqECbqGqAEktjBFOTU0dO3YsHA5bLBa1Wl1SUiISiWialkqlyMaIw11IvCCOhkwg
+RIiR0bkW8BpxPVoGJkawUVDZk9DM1Wq12dnZ0BsD5S1yuVwmk3Ec9/7772/atKmkpOQPf/gDdF0n
++mhXD71Q2pIkmZ6eznEcdKuq1WqDwTA+Po7C2Qhc5G3isWQFOJMYhkWj0f7+/uPHj+v1+tLSUqSl
+GYYBnxk9OpHZhW+hDQRwQ+UPSCr0rbjECCEgoapE8T7wt6GREfWVQ1wLpI1SqQSDh2GYrq6uP//5
+zzKZ7P3331epVBiGoU7dWZG8Gq5H0ItEoqysLLFY7PP5oHkhLS3t3LlzPp8P9iOsk1CsC0UNz/NO
+p7Ozs3N8fHzx4sUpKSkmk0mpVAofRM7WyCp8jfgaSWrgXyFfoyg/yH3Ik4DQR9xN0zQIHHgLvihM
+KyIFwPO8z+fjYmdiwFkAPM+HQiG73f7aa6/V19fzsVY9GOSs3TJXAz1wK9zObDar1WqHw8EwjFqt
+zs7OPnbs2ODgoMViEVo4QrEOm4Bl2ampqc7OznA4DN2aJEmOjo7ClEAcgXCA6BDKkCANKYSMpulg
+MIg8PpZlwciBLn3AFKVW4J6gV4WAYgLlDzMFLQr5qYyMDKVS2dbWNjo6mpqaCicxgFcIFoRGo1m1
+atWGDRuERaWweLMG969S1iNeNhqN2dnZ4+PjoVBIo9GUlpYSBNHa2rpixQrEL0JJjcVKcXp7e0+f
+Pu3z+aanp5ubm2HxkBUITAR8B4UOF8vJxYFFxs5OgGALSAw4RQeapMEzAjENjjSoYmTgwxUUpj50
+6FBTU9PDDz9cWVkZDofPnz8vFou3bdumUCjAuAToQbCYTCapVApMCcFqUMXJVLN8LGar1Wpzc3Nt
+NhuIv8LCQo1Gc/r0aZqm5XI5FjMBkfMJ1mdjY2NLS8vk5OTAwMDAwEAoFAJ/GJrHoYoN4mtisVih
+UOA4LoQGcEGoCa8DpsJMANwEHdIFeMHyoL9IMiRi1NHRkZqaqtPpotHo4ODguXPn7r333uXLl2MX
+96QAbrgnK2jBTQL0XCwhTpKkXC6vqak5e/bs9PS02WzOyMgoLS1tbW11u91yuZydeeoA8m9zcnJM
+JlMwGOQ4DhxIYeYEeTRCguuwx68uXHU584oLmXR1dbW3t4MvjeP40NAQx3FQe0xcsnIUGfJIsSd+
+5uq5Hu4ulUpzc3NVKtXk5KTP5zMajUuWLDlz5syxY8cefPBBNB/hs+GsAiSOCEEdxyVMsUQWuzr3
+/RIkVEsgJaxWq8fjAeg5jrNarRzH3X777Ul56FWWu2KxpAeGYbm5uWlpaWNjY6FQiOf5uro6iUSy
+b98+2ByJ4Q4uVreExzKuWCxSOOvGRA+Nm3ByeZ8TVP3BzWmabmxsTE1Nzc3NJUnS5XINDg6WlJRY
+LJZLjPPy6WoaeuJQSEtLW7x48dTUFMMwHo+npKRk6dKlra2tnZ2dnOCQMmFah5/ZCYRuhe6MTA6g
+OK9V+PkrHf/FiIiVRuE4Di5hb29vR0dHWVlZWlqaRCI5e/bswMDAmjVr5HL5rIGBK37i1Q2RF/S1
+yGSy8vJygiCmp6fBibjrrrsCgcCXX34pdFWEr1HQMY59hC7rrLDGrU1SuC9xAGBQHjx4kCCIsrIy
+uVweCoVOnjxJkuTKlSuRTr5GuqaGHiy2BkVFRWazeXR0lCRJv99fW1tbVFT09ddfj4yMIB8KS5DU
+3MwKEV4QSuNmlnUmLgMeo6sbfyIhExC29cDAQFNTU1FRUVFRkVgs7u/vP3XqVF1dHZR2LZjA+f9v
+xnYoQRBg2AQCgUAgwHGcQqH42c9+5vP5Pv74Y2iU4WMFszBouChUvwhH4Z5AD006dycSIShN8Hq9
+Bw4cwDCssrJSrVZHIpHW1laPx7Nu3TooclkYNRuXekbXFy1apFKpJiYmwHK/4447SkpK9u3bB4cw
+JSbzkMQQMvjFxMgcWZNxhEKeNpvthx9+KCkpKS0txXHcZrM1NjZaLJb77rsPWUHX/rirtHAQh6Ir
+hYWFubm5Pp8PwzCGYSiKWrduHcMwH3zwAYSUWUGZOCaQGIm8Pz9AYwmbCWBlGGbnzp0Gg2HJkiVa
+rZZhmCNHjoyOjj7zzDNmsxkTGNbXSEnrFheLxYsXL4bCY6VS6Xa7ly5dWltb29bWtmvXLvB+k9uB
+d9UktLvgCqrjJAjiwIEDIyMjxcXFpaWl0WjUZrPt27cvLy/v5z//OQodL4ysvxjxPG+xWEwmk9fr
+hf5YjuPuuecenU735Zdf9vT0QPrwemikEua5IIgGwpAkyZ6enmPHjhUXF1dXVxMEQdP07t273W73
+c889hw4HS5biSRr04EDddNNNcAArx3GhUCg9Pf3+++8fHx//6KOPXC4XFot6LvgCILEG2VRIt164
+cGHv3r1qtXrx4sV6vT4UClmt1v3799fX1z/00EPCLy6YNzv7jQgCw7D09PTc3Fw4zwFyftXV1Xfc
+cUdzc/O2bdsgJCmsclgQilOSUL3r9XoPHjzIsmxxcXFBQQEE7t955x2KoqD1FylYKCe99mEk+Sgi
+nudra2tlMtnQ0FAgEIBk8d1337106dKDBw/u2LHjEpG8+SGULYB/oSQtFAodPnzY6/Xm5eWVl5eD
+wPzwww/7+vqeeOKJNWvWIDOMiFVNX/tIknzgFc/zMplsxYoV09PTIHnkcjlJkvfee29ubu6uXbu+
++uqrufBCr5RQGQh0Lnz//ffT09NpaWklJSU8z6vV6r179+7atevmm2/euHEjCuoh24xNRtdyko+d
+Q4Pr7Ow8dOhQRkZGVlYWND9OTk7+61//mpiY+MUvfvHQQw8toJ3DCQ7GCwaD33//vcPhMBqNkCzT
+arXffPPNc889R1HUnj17amtr0YHfyR1zMqGHKcFAI5FIU1NTc3NzXl5edna2TCbjed7hcHzzzTfj
+4+MNDQ2PPvqosEAqrm4HmxkTnjW3eTFCuwrdMBE1uAKnift8PpPJlJ6eDkkrq9W6fv16mqa3b99+
+//33J0W2zEpJPvEPWAmxyc6dO/v6+goLC3NycgiCUKvVo6OjUKZZWVn529/+VqVSoRNyhLUh6LZc
+rIvhcgaAJTgN7EWO4+U4bmpqqrm5WSwWm81mjUYD5dBdXV2PPPKI3W5//fXXX3rppTndmsk/5xKY
+DnmGn3/++dDQUFpaWm1tLTTtBYPBlpaW7u5uiqIee+yxRYsWQe4YjxV0YIJoGj6zNm3WxyVyNDYz
+RcPHkgRwE5qmBwcHOzs7s7KyjEajWq0mCIKiKKvV+utf/3pkZGTjxo2bN29m5/gQk7k605jjOAA6
+EAjs3Lnz/PnzqamplZWVKpUKIGhtbR0cHJyenm5oaFixYgX8jAvKoqBU4mXu90sIYk5QbxuJRHw+
+n9VqdbvdJSUlkNHFcZyiqNbW1kcffdRut//ud7/bunXr5e+2q6bkq1nEaOCqSCSSYDC4Y8eOU6dO
+paWlLVu2zGg04jguk8l6e3shLW4wGO68807ohE+8IXaFsQdh/BkTFDlPTk5OTU0NDg6mp6dnZ2dj
+GMZxnFarpWn666+/3rBhg9/vf/HFF7ds2cLN/AGTZIETR0mW9QgpoR0GlRF79+49evQoRVE33XST
+xWKBSgKv1zswMGC328fGxvLz85ctW5aTkwNHF6EmkEvz/n/cGQzDOJ3OiYkJt9vNMMzixYuhXgP6
+Ou12+4cffvjGG2/o9frf//73GzZsgIn8N/1gxqwMEg6HUQ8Uy7KHDx/ev39/MBiEdnKTyQSTnJqa
+cjgcQ0ND4XDYbDYXFxfDL0lBHcDlsF7c5gDG9/v98BNXXq8XykPT0tKgFBdqIFpaWt58881vvvkm
+Kytry5Yt69evR9IJcdJ/Adcj4mbWv/MzG5StVuvu3bs7OjpycnKWLVtWXl4ul8uh8ikYDI6Pj9vt
+dpqmKYpKT083mUx6vT4lJUWtVl+MB4V2C4ZhcGic3+/3er1QCimXyw0Gg06ng+JnWM7p6ent27d/
+8MEHQ0NDa9eu3bx5c0VFBVLpIG3mmvHn6bdKhOxz4cKFo0eP7t69m+O4JUuW1NbW5ubmQrM51LPD
+Tyq4XC5QFTKZTKfTSaVShUKhVCpRqRNKfkHhH9RWwgvIzGi1WvhRMegkQb9v9fnnn2/fvv3gwYNG
+o/HVV1995JFHtFrtnGrUWWk+frUBFxyTDi9omu7r69uxY0dbW5tOp6upqbnpppuys7MVCoXf78dx
+HOopI5EIdFqhKDSGYaisDI9lfeFfItbbL5fLoU8R1AmO4+A3QKb7b3/7G5xp89BDDz3//PNVVVX4
+RWoi55rm7yfBhHXe4HzRNN3U1LR7926r1arVapctW1ZVVbVkyRKj0Qh1qWj7w4chZIhih6iij+d5
+QBxKAeEvz/OQHhCJRF6vd//+/f/85z+PHDni8XgaGhqefPLJhoYG6M/C5+XXIhJpzqFPrKYTUiQS
+cblcLS0tX3zxRVdXF3RuVFdX19TU5Ofn6/V6YHY45paInU2BhDIWE/FwkZt56gXLsidOnNizZ8+B
+AwfOnTvHsuyyZcteeOGF2267LTU1FRzvOZ37pWn+fo1NGLAkBB3PgJ3f729vb9+/f39zc7Pb7ZZK
+pVlZWSUlJUuWLCkrK4PaQtRTFwexUDf6/f7u7m6r1frDDz80NTWNjY15vV6DwbBy5crf/OY3dXV1
+MplMqELRAOY/nDdP0GOz/ZIU2gfIZec4bnJy8siRI8eOHevs7BwbG+M4Ti6XazSa9PT01NTUjIwM
+g8EAneawcj6fz+fzTU1NjY6ODg4ODg8PT0xMBAIBgiCysrLKy8vXrVu3evVq8BWEWgcTSL85NSIv
+RvMncLhYaxlMEu33uK4HlH5zuVwdHR1tbW1nzpyx2Wx2uz0YDAYCAYZh+BhxgtZRaPs3mUyLFi0q
+LS2tr6+vqamBuAV6ltDjE3rdc4rAxWieLBzhVDFByxI2swcT8kfAzkKRwjCMw+FwOBzj4+NutzsY
+DEL6F0rjFQqFTqeD8ADU5sf5VkSs5THO7738GNFc0HXxA9f/m7Rga36DbkC/YHQD+gWjG9AvGN2A
+fsHo/wBapZW6qllpLQAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_peugeot" model="fleet.vehicle.model.brand">
+      	<field name="name">Peugeot</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAspElEQVR4nO29aZhe11Um+q619z7n
+fEMNKs2TNUbybHmK7diJQwbHgRASMkDgckOYAuE2uU0YAk1feNJ9L83DhQaapjs03YGE29ymAwkh
+QAiZcGwSO55kW7IlWYMla1apqr7xnLP3Wuv++KoUxbG4uDtSwRO/P/R8Vaqqc867917zWofMDC9i
+McCLfQPfvHiR+kXDi9QvGl6kftHwIvWLhhepXzS8SP2iwV/8SySBZ4CQYN4IQEVwL3zVL/Tz+o35
++cTiwQAZkoknB0XNyOgF3uY/GBefenUOUAU5hoEAUXb8DbzuN2gJWQGYCBE7JhigmrmLKBUuOvXC
+JcMzJwBqgcmzCwIQ/nF50ckYgGcGEAEmgJIDEcJFuiJd7ECCARAlBwOnpIENcDDAXdTLvmAkwEHJ
+AHBt5pgcIKl0vrhIV7zo1EMANThKDAUyjYCBvV1QRr9QvFAd8PxIqAPC/C8RQRWUQS+iXLjo1FcW
+PemuI52/efiYb401U+kMyWci8aJe94VCyWfqTKrN6ydeed0atkrJO7iLpmUvvqxXChG47/FT7//t
+zyQ/7jR6cxWBcfEe6n8IlDhy0u7b7tp+43VvnCRVGC4mQRed+oZGMGXGSjmaTZEeOQZHlewF/qUL
+nE66gGCxCwmiCyw55awFonEWWgDFMgPDPF7obf6DcfF3PTPDpeDhC1CHOUtgKBE/PzVm5jITjZAM
+0WchqFQGCBtDc7JkGoXJ5WZGRI76zjerqCAFJPOwSEgUAxEPObaAceEOfA3LYT6PqpyURSmByQSk
+jikoaXJlqNlRFgCEJUC8qFbYJXCpnh/zOubrNQ2RDBIcOc+cWdKBSswaDdYyahhGD3bIk/GAjbif
+Ers0TLAcuQf6NRm8h898MpGhceW4LzaklByYUqoCQARjWIFoMDNjOH6havl/HotG/TyIvso+EQBm
+Vp974lSX5owDq+NaaiDzysQuOkYqULKmpM4ta2tRhG5vMBioUZaSAj1qINkSuMxIVRM0GOWOC9Ea
+ZFBACSBiR04MSWRIdLGMyAth0agnIoz2Pn2N8NUUIRmHLHiJqLVMCAVgwVIMDEfoDiAyOca3bpl6
+zbVbrrtube7dgUPP7n9mevczvZ2HZo8OaFgq514tQCOInGtIXVc8cE32UYjIMZlZUlWDMYEXwctY
+PIGjCuA5vANAMIZLdTQn8B4u9+S17sV8DP2IYWfpMrzhldvf8Yqr7rhibcOJIAb4W1YWetvms1X9
+1Fn9zKOd3/1//nam3/VZcFkW617mc2GprRYlQkZQIwPBjMiCaQY4cHmJGVg8gfP1pI8g0XlSqMJA
+gamQXncsGxbktmxfsmVy/Htfc9NN166/94G//auje2+88roN66aM0Bce9Gd8Ljdvmty+Ys0V/op/
+/sePn+0myXJjGiq8awFtmDdOBlNEmIAAU2jNzJc+rLFo1HtiW8C5bxKR+pBizWTwAhOt6oksveON
+t77/7deOectZQtac6Q3aoblm44rlaydYIpzzDVYbq0H1dGpm/be8evs9p7r/9ZNPDqoc41Po1anf
+bQYrQjasB8a+VIeQUQgmESjZk2h+qRm4xNc7hxHpqgpdMC2IjAjGREROgQgKxGpxZuOaYkNbVRxz
+w0RXtItX3HFtRg4RKTgztPLmcK6rKTmClKzN4gdfdc0TXzr2yElUs2UrxFfddtldt65dNVHMpeLR
+XYc/d/++Pcd7qpMcGkpIqpfewbtE1D9ndwMQUsAjzrhmczmCt3Q0ZjasUDoblwSPqsG5KqyPdR/9
+9MH33LFurJg6O3Pm/l1PPnu0f/n6NTdcv6FoFs4yIjJYyIuhDo1ZVXtVfcWK4vtfve3+j++G2s9+
+6+Z3f9dLxzOf1dEi247Jh2+f/JHf/OKuZ5LAeXHSrCwFMJnpuRsmAuyCHtj/PBbPwhFuc/muN91w
+2zUbVmRNDzlS87OHj37u8ae+8MDZWExyoaKMPAn1ntg7eM9v3/uGm7dmPPj0Yye+sq931Xp6/6bt
+VxSZEQAQERGZGQGjD5Kyu1+x9hUP7WVuv+utL21hcHTv4HjVWTG+bNXS/CXrNvzUd2e/8MEvPNv1
+biJPZRd8sYLDF8LiCZzBcOWq5ve95obrN00yYFKay+iWZT989+W/+okDv/EnD1R9dUElr5F7idnH
+7j91y1WXvfVlW2++4ZpOVK/dVWNDYTjMy2hmxoKnZma9YW/F2NiPvm7rWHvZMk8H9z395YePfaXj
+v/tVzaXJZ4y7to19/sbJ//aFsl/1yTUufRXe4lk4IiuXLlk/1XZa1lwE5xXiiKbaYx/4X65bNVb9
+6488ciYVqIfeUcwo2Ng9X36qd/DoRGN5ng1ecfOa8eWba3g3LxyIFkwmIlJVNP3ZPt9yxbK8tWxu
+tj45l/5815Ejac2PL2sKimEvFnL2pZvbn3po0K/MWC99mnrxqGdW2LBfo+28lOScWRBCTWhIfO8b
+r99y2Yqf/+CXnjhImgFhMER9w+3Xv+P2Tb3ekIOtXj6pQhl/lbFz23b+QzTNaCq0O9LwvpotZffZ
+8SuvXbusaVY7l2W9ro4RGuPIT7lKE+hSU794FQnNxiOHTvzShz7zb//oy/c/cRhiTuEUBaGCA8Ib
+dqz963/zne9+/XZXVxAz7T382IH+HLZOLN02taxFOXvCgqAHoPrVIAwRNUwNdVnXkhA4TbXarby5
+csIXzkmq1flT3TppPow1q8Atgje7aNT7QCWKjzxw8pf++NHP7zpaG5kDaEiK3A0TYZjC6gn8+o9c
+9b7v2BKkho79+Remf+gXP/r5x4+xLwwhgWVBPquqqo4kz8J3UsHN7qAuB9NkjVVLJ69eHmdnurVO
+eAwF9WAwPDwznO2RBoJeah2LRaTe0hAs6sYGKZOyc+ro/n2HjuzZt+/Q03shLUK0oJXljWb+L97z
+yl9592saTS0rmVPbdMUas8oQHfRcDmneRVj4TESR20p8fHZ44ugxzopWq/XSTVNPHTm592hncixU
+1cAG5b7jp8XGK6tw8aLyF8aiyXqhsaKuPfWrDL/zhRM7n6munMq5nu0YvWzH6be85vYigbIoKNta
+/PO7r2qvzD/0W3/6zje/dsOkB4xH+5SHQA6wiMRYgWgUw1c1phiqYXnm7JPT06s3bFrZXnXVhkb2
+8On/86P3ffBHv21JW4+3+dh0s5Ye8kkM64tWeHBBLJ6aDVQHX9YVsuxE6f9k59yfaRlyNywbf/SV
+h93qrXddszITY20gsDG+56Vb7/q1n1o1xTl6MA8NxhBlR0aElJKZMbuR70ZEaDS6pzo9kz97rOtb
+J9/zrcs3rV1/6+azv/fZo7/Q+Pwvf/9tt27edOWaM184RGlYhpbF+lITsHhqtu6bqMs8knLk3Nrk
+lgxtHHk4PSh+6/c+dfj0IDjvHFKsBGhpd8Nyzp1aTCCnADEc56NHqOtaFY4ZUOecc64J7c4cO3Zi
++svP0Od2nu30y6WTjVdfvvSyNUs+/OmDP/fBTz9yRO6+bs3mZQ6FxuElJ34RqW9mQgkiAWVFMVa9
+2dibQb+D4azU1RcfOvuLv/7XR+aSknhXeMB4rEopMUuYNARyANQkEpGIxBjnFawZM2KspHMWrj42
+LYN+euCpow883W1MhLXLJl+9PQ/NyQ9//uT7PvzgE0dn2uOEVDXdpc6TYBEFziApXAvD6SsuK27a
+tm6qlXFQQaOVGshq59zyFvfLgU20R5VqQqDMKwAFMZhGLDsDyroSMWae17Rmnbm5Lz91+OmZwZee
+qWF69Ez3T75y5GVXbx2fnLpp3dG/WDX77NHJew/WT5w4OQxFHpakcg7+myaQgDCJnl21PPvtf3b3
+HdvWeKoTRU9jUAGrkhA8wYsOjCtBy2sEJyCA/Lwxac4xAairJKqOWUScc0TU7XY//sSZzzzemTbl
+0ITSXz709I/ctWnjqmVbVkzdvnnwR0fParZkWlZaOec8iVsEHhZP1pfJlb1vuWHL7Veu9QSxAjyW
+BKXTRMG0UHFqABcG50zmf8sAiaols2cmgaoipVFBpxGRcy7Gam5u5sQwnOo1hMfUZ3B25HTni7tP
+Zd4tm2xdPxWWLPGw5MzaPhcqkV3qYD0WkXrnVdHbdsVyQc/YzAOI3lUBwUtyBkcGVKTMUpC4xKGS
+YOThA7MDIAIm1HUtIjgveNnr9aZPnxnMzTpXhTqBk6fSKvfAnkPVsF65Yu3a5a0NE6EZY+JByT7X
+Iax36RlYxPAZwwV0UgGOJATnxYGcEcz5Y0ePDzu9RuE1VWopBLdmwzYlIkSBc3DQCAoAm1SwSACM
+DJxAStmx0zO7T7esMZToEa0OGWL2wJ7e4enuVVOttRPh6lWNx57tQjMF1E1Qmgbl5zvDdKH85TcO
+i+dSsWXN/GP3PX7nLZdds86fOH60O9PZunGdL7KzM50vPrjz/t37B1ooNetoMabbrjr5w297eWkh
+pxqESFmAlsKmZEbzyRgIgdtjre3bty+573CnrIpmUYoRKYX6+Fw5M11Wq5c3x1YsnxwUYaaXckDU
+Ks5a50TaJcNiulSxTPcerH781/77+992c2em89jTJ195K21ZWj99fPiZx079zSO9k1WyzACVVH7m
+K4eWrln39ju3EryBnUHAuYud+cgNqxkAUimK7Iort918Ve+Zr1TVENSQYKVKqy95R6VvlmfFWEat
+XIfiYRFEGgPxpS6/XTzq6wG5PLrJe/edev/vfHrVug33PfHM3zxdve76yUMn6y/tHR7uTSCbBHug
+REZntPiXv/eFdSvGb7t8RSAQYUhoACqAMREDiZnVkiZMTY5/z11bHjl8ev/JAHN1WXIVt6wpVq0s
+ClZvA09KCBKjC8TOq1zq0jMsopoNLih5wCEs2T03/pldM8PGmkefld/4xJGP3X/mcJd5vMVNhXah
+VeBgY2MHjla/8O8/2e/3EQc1UGAIC/P1g+elCUeK99Xblvz0t21a3eqh32/6cPP29s9/99Xbl7S1
+e3pu9uRMN/VKBgmC08iB06VnYNF2vUaCc+jPFHkuzaUaB4HEJFX5lKQITSyVAzunRhCtIT5r0Ote
+u8MHBTU5QX1gq41MYaSKhZglgJRSA/6NN25yjVV7jx6/bPnkzdddcflq+B6OnTl8ZLZ+5JnZXu25
+6STV5BqWuvCNS8zAolHP3ovEfCy3soq9AcYKS6XjUEkPzOy9JY5VTZ7ZkZm5zql3ve2m933HDTki
+zHlBrd5xj8iIDLBRXpCZPQcTOyO0ZGzs7XesZbe6wSiJpjtnuyfjvuPdew/GR44r4IJpJTU1mlYu
+Qrx+8SycmJBxVdcEuFYhUiW4xDmxmCWlGt7gjMhBnQ3tmiuW/+R37iiSAKFyXe8bWfSCNnMXwMiZ
+quuaiJgIxlkWZtNckSJJPtPvdfSZU1Wv/+TcPUfPfPKB2RlZjgxW9ULmY9V1nAOX2sRZPIHjGQoQ
+m4OIYhQvp9qoIhtHrZxHSbUSuBqubNX/9w98y4bl42ZCqHNqiRiCOktNana4LxybZMFIlZSZwI14
+lpEjp5nZE7sePtCR8GSnuuep6YdOFDGOI4tgVyNwEoYTcrAEpvMTvBfbsl/sIu+vA6mawGWQYfKt
+IilQ1e/8rltuv36LB8gUIBDDQUwd+Zp7UGtyUfd6zWazUjNLTmSYTSY1ltScWH7ETn3wrx97NjW7
+faVgWe7qOgHmQkYkAoUOv5nS4heCMjKTpM67NKgwiDdvX/rub78hN3MaYQJ2ahAFiFXRLMZ9RkPp
+Fc1mKhnqa0maWZnMnGfj8UDr1i4ZEne7zoUxg9R1nbEPRBpTUjMo3CJYOP/oqGcukGYBR06ZsiU+
+/6kffPnmSaaRLHaZGZkhMNiMGRCRqOybokG9ihs2J8aGVXMMpdMSCqd2/ab2a69Z2tBewR6+Qb6l
+xtAIS3AEdqSL0D/9j456Yc9gTzFBtRe/5cpV33r9WkgCsZE3sIGYjKAEgcqeXU88/sjezvSQQx2K
+yOTLTtkO7MicRgP3xY+Pt1910+Vrx7k/fRrlwOCSkbByEEBBntI3k4VzQVjKXDtKFylf2sL3v+nq
+hg3BmQjBkSo8g2BaV8x+74GDBw/u//zu8vQDx978+u13bFs+bo2aOHJvkDJmY2jSmoRvu3bbe99u
+jx2afvJ4576nTls2zlmeqg5ChigBofrmsXAuDC7rCB/Q19e/Ztu33LyWJIGcYxIF83wTpxk9dejZ
+h3cd2Hls7v99qHOiHH/06IM//oYtd11/ZbtoOW4SUZXguQxWWemaefbd37L5nW77Xz96aGZ2etfp
+KImhTM5ZMvAiNPH+oxM4wRwKhbUzclvXektDsDcmWHQEBxCgsdq1Z++XH3r8wSf2/eZ95bPcTs3W
+rmP5L/7+7n/54S8+eOCAl5mG9Ji95Y1kytzqVm6oKdazLxmbvuUlKxhikYq8bYMhHMkl3/JYzCJv
+5GZnXWhIychAZDYQSNR4FmEF8rHa5u57aM+7vv3WsTGlpEBQVyf4SHTowN4nd+373G58ZNcUSSJX
+s+8nq05Y9kdf7Dy2/8lvv3PFm7YEBVauvSxvLhmKZFS75GpqxTS+go4aGA5RwN6pkizGmJLFK/KW
+suHHql7p8jHjhnZOXrOueMWOyyPKx/f3vvL4/sL1X3bD7WNtl8DOjdKyjGpw/PCRJx7d/+c75z6x
+d0DWMO+gwSmz81FTahY7Twz2fuyJz28fH8uz1fnTP/cD3zGVIwpFsSKYqkZNZgozgTIBjhks30R9
+swWqkkKeVSFh7sz1lzV+9+feeO1lDePG8U799NEzUg1vvXrTBAmkgvOGkKI/duDAVx7Z88nH8bFd
+w6H35AgkhKyOpQvELtdUZy2k6O97jJA6L3vJeNnPQFWtZB6kJTkmIjDIO1NRGEy+uXY9RF1AJQbA
+uc733X3njZsmCANI3DCB1RMrBGjAxYpCHipEr9XhQ0fueWDPxx/vfuJpr37SUycBzsxMjEVCgwa2
+sRG/91uvvWrL2k6nc3aut2PrmjVLjKQmhOAyWDCzpIJR444pYDCD2aWflrFo1DelWaU5ZGMY6u2X
+r3rbK68l9RWN5xwJng0eSpR8UEMGhN7Zzp49ez61d/DxAw6BPWqHMZUaMMdQLjBMHAfv/t6Xv/fN
+11C/k+CcXyViw2Enijr2FqO4wAxHDIPpggdLhPm+qUuKRaO+SiSZAxNS/+U37Fg75SAxWIAFOARK
+MKCK5D2szon2P3PoM0/NfOrJOWAprGOmVXKUFao91cTcUofJorvjJeN193Tdw9AVeXAx1qohhEBm
+o6JMqDHzqGuXmMlEAVK74CCRi4bFCxr7Ei6H1q5Bn7x355Sv7rpx09Vb14v5qHDOE0G9Dwwl1BKZ
+4pcP9mdjg/2AwEIOXBEFcw2nQ6kqRLdp89J1qybramjZhPnuTJmaRcPFIRDFApEjrZ1zeQjMtSYh
+DyZSNVoMibN4Lcu+lkHufRDvdx7zP/P7uz/62Uf+t7fc/pY7Nk9Pd7udMqXUbIUQwtKpFc32RHP5
+kvGigFYITdRDZAFeaTCDsByY8Z5jTVPjE6k78G0V6kz0rdlcHtVyQCXVedu0zqy3ZtWq5UtPtxrW
+G5ZQMTacVwNySRm42BdgEAzKybwAAfDehmxcIyBTQQ2FcxGN4iuni3f+xyd2Prpny8a13dnTw7I2
+l7fybOV4dtmKdjOEq9c379l7pp8KZC1KfYaJz8DdxJOoxIX+ngNz/+VT4epVbtuq4iXrtzasMzdz
++lR3OBxEVYQijE80i7x9zap457KTnzzYsiJHqkEsTryCkKnNEbwCjgh2cQM7F38UkSoTBwNijdwp
+sXKA+dH8GcV5bcEEAB/cWU8dPDE7c6aqkyE0i8bSFi0fz16xsXWwQ6HRREpOEkEUxi6H1iqK4ECt
+Z/rd/3bv0b9y9Zqlk6+/dm7buqUYdk7M9E+U3KksR728oKXLJlqZTi5ZWhytSxl6Z6qsEhMKGMNl
+aRSo0NqM+GI20158gcMOCiZzMFU1reEAivMezIJZcU7JzXWK7tBUxijkJjwc0tne8MDJ3pefPFmM
+Le3XHuwAMypUFPCZWoSaiQRC0TplfKrnnu7X9x3dc93GtW22E3PDg90UKyFHyws/Qb11y/KjvayM
+ObgkGCVHjpxHUh3FihwULISQ/knPPlOQGgyBKQc8GxEkpsTnDbo8X9D6Rq1WExs7jQrvPHwkWCpW
+9FWcB1MV64TgEYjZ6jqwI6KksQSDmLnppRaWiSf2dVNScl58Rj4jcqdmq1Oe9s1Ng5vIl4DVpDbn
+zKkXScbejFUhEaxGHP9JU09IcD4qR3GQDBRYKjKSC126TmAP70QZxELOhIAAzhErEBEHIoM5xJoR
+NUBBgAc3CWRVRHCOyUIek6BBIEaqLJUIGQoOvojVwDOTllFrMTYqQChlAJ/Fqq+UgfPRfNeL2tx2
+CSwccfBIXU9lkuQsr6s+swc9f6FdEKdMFkWlduaccwITAlmXyNRIROA8xCAVeaZYmhgSEefeuaSi
+WpvWEIMHOELUUYAYVQPjOum4CznXoqmPADKC1pY5mECHKHsqVRQEHzSJc/+0x1PksHTTlqn3vuUm
+hJhbVlp0WRMXGDFqZsYuwZzBE0hNiGuYR8/5Qok0qnNkpmZG3vky0KgQx0xIvWeFEFESdmwMSym5
+kKkqmTIkaqGZ5xSDJctIYvIRmhHIGXzqz11/5ebgNYHZOeAiSvuLPt21BIpYIWCIPIM6g5Am+Oft
+JTCADELzA23JElThfAJ7g4y6ug1QgRm8F4IDFEIL4RiHkBKCAyhKJOc9MPJWDeTE4DWJ86TKjApk
+oMIgBGe1UQYgApnMVW6CgAwXcXbCBak3TUReBeQhMAciBRIkg8EAEMhgo155g3kxEKvaKMnMdG56
+oYCcKeChozQTADMojUbEEwxgMgAOULWaORMhNxoFpwkUwVD48zhYKKUHZagJDDCUQGSEaADBn5/S
+ghENgAwS4HpAUasLTGSKVCEEA5OxWQJjFD0mMIEYBLCqErOoOHYGMbhzD/5c0gBvcm62mBnhwqX6
+F6YeSuB5449gSAYlGGkO1YWQ01cROTJG6g+AKkbTxIJHBaOFKpeFMCFzjWA2P0YIBiMkwCgB3hsY
+8/a+EAwwIJwLLxJMv1o1owvPQTBoIvIwhgBBgQhjSAADHEXFcQHFKKdugC1kBg3w9rUBNDrvg46y
+5wQAIqPlgHks9CwC549ym2dGdX5OzIVwQeoTABVPgBKYQYioFSlH8+sGJAKjU8LegDrBj15/AIWl
+ijICGDCDO+8OCSlGCS6HAgQQjKFQNkaqadSCT0EMzDA9L3u68EElMgNxxCyEYVA18cRkLERAdAgq
+MAIYAhhQKMyUnGL+rzoyIKLM4EcLMFoKmBIpQQWZW9gHWJj+fh7bz2H+XMntqAD0f4R6UYDBSKZg
+eCjgRsdsPtZ6TuwsUA8ishHnBoKBE1AnaXkHICEJXD7/DALnI4wAb6rkRjfqzUCmoFF5kzIDJrBR
+oHF0kFkAgEfdnAwlI5DTBQkgYkzGxAI11J4ICKNlgU8CMeQeSbVmDgpWYU8EUQ1mIAHr6BDMVyIq
+LIJYBewcjEHzzDzvKJERmedLmHP0fr3YubCaVTO2CBA42PxofWhUF86t9vl/TQACGJFAGDWlATQK
+iECABGZYSKLOsyIZjBbmxTNDIIBLAKuBaT7cMz8SMZNRG4lg9KINU2ViQCFiHmbKBKjBRsNCfRL1
+joUQrczJkQGJ4Bmkap5oJPjIMFKjCiRn2WizQkdr7AFIBEItlI30f0ZqqSKfC5ihz9188186M8Dm
+t/zC3n8edX1h6q0ChQrsAGdGiEqaQEHd80+CFgYnaJ2UmBujH1FLTN4sgRXgWtg7ZkTFkNAiOFMw
+J8WQwaLeUQ5SA9v8Rh1RxEkJ5IhAEFhiYhhUmJ0rbVSZA1hiMgKlpN5nSLX5rDLAUsGAehgS4N0Q
+8GaeDCaRAleqxlmO0oSY83MSX6HEKvCjXUWGQLqQ3iIwfZ2UHy3AiHGMXnNiZkSjp3juObmw0ZoU
+gT3AgEppPt91onOsg6UYjvqyz++3Y+Y1yybHx6jhVJ0A+b4jZ88OImeBaq9ck2dR0uiagaveyU0b
+l69qp1LdYwfOJBeizm5aMXHZRAu1wNdkBCp27j/ZRSOZbFziN65oiCWCqapyPgR2HZj50mNPHzk+
+O1MKA5554+qlO7atv3HzilVjQNUH6qcOTs+kJmUEGWaWKbx6Fh1GgFK6dvOqycwQh7lvDRV9FPfu
+fPorT57Zd7xf1tWqSX/DS6Zu27Fly5JW7gSSun17+Nk59W2CNkjr83bxOTacc1tXN8bajdGh4K9R
+AM8l+MLU+4YKmEBUOq9zyn/wscc//Oc7dXISQIzxXLcqMzvnVjTcK3es+JHv3LFj/fIy4bf+8It/
+ev/hXmOZl1RZqWQqFCzPJHE9/Z4f/K5/9dbw2OHqvb/+l48fLxtF+pE33/Rz73hpOyRww4C9J+R9
+//HTXzrYY0o/8e3XfuBddzoDklmg3c90/9NHP/uJL+1/dtCGtpCOAzmogOxr0V+95223/eKPvrqV
+y87u5E//7h9+eU8/TIynqgO1JJBAWSzKejBRlL/6k2/9ntsvy3wy0GNPHvnZD+/auXvf7KCiok0+
+aNknSpsuO/C+169+xxte3gj44/uf+ql//4lZvzqwNWRAeXZOnaaUVNU5F0J48Jdf22qtO0c6EQH2
+vHLi73PV5mcsW5bATSt7iumaMBjAN19z+fJlU+POBp0y7Dp4+sDJ071utu9j/Z1Pzn7o/3rt1sn+
+CW2c7LdMxI3TjmWTQuIcx5Srb4ROb9OEwFo5Tjxb+cFA+9FErK0GDjCANHedU2UY9A2OOpGdAQpz
+9LGHDvz0v/urQyeaaI7B/M2b7YarbtqwcbIuw/HTnX17D229fNIAyPjEsHssjncHc7DYbhabVvIw
+TLlqmFGYs6wpNt4OCsBaX3zyyDv/zacOPevzicYPfOvGt738qnae/fWDh373nqMHjnR+/Pf6Ow8P
+fvu9r1k7Ea+4bHM/1IW1htHtOSF1rBFSsxVuWTd+dtAWH1vjMct4ZFgSzWtDVTA9z0sqXrCXTExt
+N/z1H3rVNeuXQHMJvOf4zL/7wwc++OV9nI898NTMBz+y81feeyf4MUt9T3bLypUf+flXb1jqraYE
+qTLKcKfG7NymYGbhC+SJzvMeKi7/4tEjP/mBLxyRiCKscvr+d1/7plfftHoMrJXnHEB/+LLQ6GWI
+IGLfILW8kVVx7lVXrf8vP/NttZo39VEpZMnikkyc9XYfiz/xG395aNZnefyF//Xqf/bm25pEAbjt
+unXLNz7607/zcD2Qj37uiVu2rfve119zzTVXTTRTbtmhE8ff+IF79u7vjiV++6uu/PUfvDnLfYyV
+pyTq+WtL9ZkZz6dPX7CXbEG7KqU2zDVS4EpwxeolP/aOm3M/pr5EwYdODU/PpZC1Q9ZMUqWUVi1r
+ElRD5vJGoKxAo+kdFhr+iAgL/57H+cJ3FqYo9oDf/sTuI7Pms8ksr//FD93y3m+/akO7ymzopUIc
+Ig1aDWVDjGrsNdXeUWVAaHvvlxa2umnLW2HJRGuihaXtpnAh1P69v3hm58FeiLxjY/ZDr75yAsRQ
+kehE33Xn9ps2Zu2iONsJf/BX+89009oGt42CGrsWskoJw5pS1FZuGfpNWE6tPMsNBtPzn8eej/sX
+TD3H5LIipSRWKqockVKayNx43qIooCFrp3CksVYzkKsa9eGznYGopH6s5wbDUlQE1XMpfs4Cf52B
+vP9wd9fTg3x5kG7v+nVj3/Wa9QAnyUsLFsYHoZF8cyii1AwhT0Dw5llQlYhlriSlQyqka9MJsxDT
+lPnqZL/884f2ol1AunfcuGHF2KSNnBl2IB7z+Z07NvT6M5gqHj51as/xwyCFBQEGFGxIwWV5ERJI
+EGrkEorkRulQPXfnf0+I7AULHGUizpjZawEAjEEafvjz+8/0z0LaGExv37BsvEHQofIAYeKJQ+Vb
+f/bPhsjNh1TVGfV+4713v/7a1QsFw2Zm+LqJx1/9rwUceKZ3Zvo4+fEs+JdftWEKTTiVUZRNEBy8
+wTsIFDE6hrNUJ4PL0Zr6s93dG3/mv3fRbDOV5WBqPPzOj71qx7qxo0emz3b7LjWAwdI1y4ghiF7h
+CJGrgLB+/eos7Ktd3esPZqdnERWOnCuzFDnLosyZKSg5wAuDoVqRyx1/9ZVK8+N+n0+cvmDqW9H6
+Wn/24YN7Dp8cJPRKfPH+xz7xyDRcE/XwqsuXvfnbbshcMvIw9s43G3rF9hVCklvB4mqaabfq5yqd
+c+8t+foJzgvsz3aFKU8UhAfr1rScBdWUEUA11O08cuqRndMpd8LlO265YulEVms050HJydxk4deu
+bEle+MF0sAY3eLwgDThT9c8mQwOiRTP3FEfziAIIzhKiWzExHqioS3Vok7TgfMlaINTqhSs4SxyU
+gxnIGAamrwZkzwUSvmHUx+AQGh/4z5+rfWYcoS2nGsZoa7DbX7rhHW+8dcf6yVh3amFCkbrdqzcu
+/w/vvXtpUFQK58XDpQqRv+bKX+9kL+CcPcxOxDLwgENztt8Hg8lDa3POPH36iaP/x6/dI0Xhxoc3
+btly60QWskxi5QlpOHfHtq3/+f3fwUADKQ69NlCUFs0aZm0rap2t61APegAgoWYYELQBgg56Q1/D
+zBXwDVICIcLEhzovzQlnzmdQshrOQK7SlFluZsz8/1tg8oKprzUrtPylH37VhrWrEM15dVq2mys2
+LMem9S6gSRXEnG8EhTlyqL1LgDfJ2TBMaDj3PLH6BYlvCx4iPefWL7tsvGjHMiYbtI8cGQKoacAu
+jCI4hWeHQhtLvJcm1ST9WJUZQyjAt6I02qOgAXxWpFoJeSnU2rx62WSzPjrtHdupbll7ZEgZiUHV
+Qblx9EyH6lkHXrFibP2apazwyJEATcJNoXKosWYSyjwgOipnm7/vc6LmQmtwQeqNVCFsgYQ9ocs5
+aRfkSIWce/2tW69dN16CCynhCjOQoraS4EEYcMOXQ0JDXH/grIaAaqDhY8NzXbosB0h1asnKxpKQ
+jhdO5k4MZxOBEpOrDPlcbFazPQtt4OTKqbGacMX65beuC5/fa/D0wGN7d03fun15kzHNthSsElOe
+o7YObCz5IWgqo6hhlAd26rMBJe/KTNtinlmhrUIGy1ZO3Lx9zbNfOiZk9+88Nfv6uRVTYzA/Kg2K
+qfrczsPG0AHddc36LSuWQMEewxwTCjNxYHGp0I4XAKg8miYgPneIR6RfiPoLWjg0coNJYQAriJRz
+IFjGw9ir4gCoGBhFl4UAhSNnpAi1hmghGg0RuKnx4MnuruOdPSc6h86effJ0f8/xTmeuC8PScdy2
+edLVM4GKxx/cf+T4KUdDTsk0fuGh/QdnZ0CDCbY7d2zMBGvH/d2330JSIvR3n4r/9kOfG6aK4zgM
+ABdjS4bK4ExA5APUkhBF54UDlWkwODmd5jrZiTPD6f7ZQ7NyYHbaUtlE74ffuH3K9V3D/m73sx++
+52AFBkVFv0b44wdP3vPEYS0nt6xsf89d1zVcCacEBKAnA/WlcgTTMNVwgEsM4IUMKr2wwFHQyAdz
+BtIITlWJYQ9hCVyKwxzWCATAzR9lxihF58kno1Qaeurc+N/t6772fX/IeR4HdaZ1mRVWdz/w/Xf9
+zHduL6Df+dJtX7rn8J7T2YP7597/4Xt/+E0vb49lDzx95Fc++qWqbDLXb7/75h2bJpCSd/aut16x
++0j3D/5ylzTCh75wZLr/t9//putvXltElWeeOUKp5y35YUxVDaY6uF5ZVSmhWfzFziMP/8RHzg5q
+n0sm+UxqjLnh7/7k677rtvWvumbDj3/3jl/9/c+WtPpff+jeVuzdfeeVrWbx0K6Dv/LhB+fOpFZe
+fd9rr3nl5csdhkZGEAdnLktlZr0+isCpEIBGgcznT169UOoJYgqDhwfYi62f8NtWGwpqFS22aAo4
+gAKNsgcMHnVxA6jSuvFs6yqXN6GN9txcpNDyk2PeYpeYo3pnKg1zwzfcvL7zY3f85p8+uPtZ/uO/
+PfCxzxyI+TjK0uXVttWTr7tx7f/+zpsyhmUgi8us+cs/9rItq+Vj9xzdd+Lsx+/d+fH79uQrx/M0
+1+kP8/GpVcuzreuWjy9ZUTEcGpevnEyz076VReRZJGqzy4d+iKJoNjhkngkuN/zYW26jmv7rZ/ft
+P5u954N/1/r4HmIrT551zVU3XrH2Ha/b9M67r3emZg1lOCSJyH3xkiXBrXAWsLbtTeC8d89jn/19
+uHCWKtXO+/msqYh6Pni6f7LLIQyHqb55w0TBTpB7FbAD1ITBQnBIEYGeOj47M4TLGUM/ltOgHroM
+sCSWkWHjRFgyOVHpsEBMrnm8pAcfO/Tw/tnZo+UMuZXj2UtWysuv2n7V5nFQ35ALvDdAE1w0K46c
+7Tz09PGde4anunOnUj7BvbXL2levWbN94+SmNRPjvo9IivjoKSVJpFHFFTALIWkXTCktdTy7ZcX4
+WJEDUVw7CQ6eOP3QU6ceO3TmwEwny7JtS8evuGzqjmvXrJgoHJJZw4CRCa/io9juk6eT+siyohW2
+LhmHmbGjF5JGvyD1ikij7P4ouUwKRgJ7VALnEKMQXBEwypZFUIAJzI10g5oSI6IE2pkBovBQJAar
+MrMCQ0HDGUQdOyPEoeUFEAkeA5YM5CXBeahVLLlRScHZSJiaAE5JBcwGjSlkngwxliEr5is4JCYX
+CHC6cIgJPErpKBwrgAQeNU5ApPIut2gURgEvNXiXKvg8IWpJWUEA0CdkpIGoNHIAakSP4CLgAlhh
+AvqHivu/pxhEDTyfOJ5PIRsgkDCfSiXQQtIcSAavIvNlBLZw8giRYrAAARwUIAXxSCSqgCGRXRCN
+niEIbIZEFBLgK0nOeQLYhqQNGMwjGhLqjLwDA8nUMxLIRwGReTdK5pMBhJjgDBp0lL2AmDkjWABF
+aBAbNcYBiGRBCE7n0+06SoeZ1sqZAh4GECVFpWg4MGkJFAvPvsCXRnbuG7DrTbCQ204GcnA00iNE
+ZqIwRwxRsDeYkALOmYFEwAbzC4UEhL5ZiwCl2iCMHMrEqA0BIJTQMMrgKIGoT2gBAOKoxlrQY2rL
+fLushKCjcwEokIEUksCZEACwCanAZWpgikCAzb9vTXxhgFcYJ4XVguACWc+RGsZLoKEApwjl0TFA
+nYGhvmQNBicMUjiUqoG9UygLGQguKcjBIWKUGf0Hq9mL/27xF3EB/KPrFv/mwYvULxpepH7R8CL1
+i4YXqV80/H98HWwSRrUCjgAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_pontiac" model="fleet.vehicle.model.brand">
+      	<field name="name">Pontiac</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAZWUlEQVR4nO1daWxeR7l+Zz/bty9x
+4jh2YqfN0kR0SW6qUiBI0AiokGgrKFIq1FRwVbG0kLa/EAo/SKClCFSVUhYJkFgqlkpUUMhFUJW0
+ojTchjR11iapY6eJ4+Xzt55lZu6PsU9PHIdb/lyfj5tHsnV0vlneeead953tzCCtNVzBYgAvtgD/
+f3GF+kXDFeoXDVeoXzRcoX7RcIX6RcMV6hcNdLEy1lojhOIHrbVSihACAEopDRhjAAAEoDUgBAAq
+jggAJi4ASMAaNAAQQCbkbJTZ0GCetFIIFGAMKC3ahhZ9SHVpHSCElKF7lnTQUmkECKGYcQBQSgEA
+wjiZFszVioYAAdagZaQxptgwrjVgBOnA4lMPCdKjKGq2OlrrQj6rlEIIgdIIY0OZaRkY42QFmOha
+a4Te4l0ppXCEASNAACjwJedilva0ML94BgcS+m6glAqC4PSZ0ddff11QcvVVQ/19KwhFABjQrIoY
+iwRzZgcAkAYExorESSlAKgRBAE1PTjTrdSGEinRPT49UiPG0cL+Y1C8ICSRfKA6/dmj0zBuFXH5w
+aOVA/6pcLocIjjUaYM4VAACAVgokAEbGPEVS+aGcqMupiQt+s14qZo8cPpbxvGXLl6L06HwKDc5/
+H3mjPjPNkKpPTegonJiYAIz6+vrf8Y6NnudxzgFASqm1vsjyIKQAIgn1RnNieqperzc7Igr8FUvL
+Yaf24gvPv/e971m5cmUQhZyyxSxqAouv9Umzwxhzsvnper2nUmnUZzzXLVeX1Gq1M6Nn33jjVF9f
+3+rVq3t6ekwFAIBSCmEsAYJAztQbE1O1erMVRkoCKAi9DEc4Onv2TF/vsmqlJGWKeIdF1PrLdS6P
+T0bDB18pZZ1K3hs5dZJR6mVyjVa7Njleq9Xa7XahUFi9evXAwIDneUqpVuDXm42ZRqvVDiKJNMYa
+qFIK4WBl37I3ThzL2LxVn7nuuuswFlLJ2FssOlJhcJKY7oT7Dh+XivVSe2kGn7lwkmQcAIqbQb3V
+npqpz9TqrUaDELxly+ZKX49fn2j5ONKW0lgI1g5alGGsVW8+PzZ2pt1uCiGklBs3bgQArdG83tEi
+YvENzjzkMVtCrbFaWxVdxdjMxFTn2MnebLlTyWRLuUwxX5uaCert5uR0c2LmqhWDTQ/lXAaIt1XU
+8mc6FyYmR0anxs6NrOwrFvOZTCYM/Xw+DwBKKYxTVN4UiTILAoV87vTUTF2GOYlxW06++Aqd9MO1
+A9WhlWJpxck5mZxnZ5xMqcgdjgkPO3JqavLNkVPnXzlQ+8fwseHDYzPT//Hp/8xmPUppp9MqlUoA
+kCreIY3U69DOCGA4kjrSqLp8eV1wefi1cPj1qYFeubxCNqzklZJVLPCqd649XT85Nnrs+MiRo2df
+e7X9j2FyvnbGb4prry6Xy0LYURQRQmzbXuxSLYD0UY+QoARrpX3f96nMO+GyAi447Pio32z4h4/K
+Y8esYsnv75k5O1qfrl/Yf6BxYjS6MBnWplG7rTBpO3zZhnWe51FKwzA0vGutU2PkZ5E+6glQSjhD
+MopAY2w7rKeKl5bhwgUiwQ11Y+S8OzYTHR1945VDU2Pj7caEbvkOYUKFgltNjJDtFJb1aYUwxkpF
+juMhhBAiUqaoewMpnDRuAziE5V07UKGU0kF2sVAJM55EVCIQtkUIoVJDva0brejcpPAj2xLEsYiw
+gNCWUnYuVyqVzHCXc+66LkIEEpOdKUHqqLeAMgllZimiW2GbaJwvVXWp4Lk5jgSSBFEWMqKW5Mrv
+uo7esBoo4YSREKimIafTAtFqNp/PE0KklLZte54Xz7stduEuQrqkAQCkAQQUSnlLobbGU60gU61M
+5EG7utmZqEk/7AQz7fEOU2zD+vqKFU2IGqHfgE7DnxbID6BVXL2CZLKUYUppNptPGplUDWLSZ+sB
+AIAxajHqh5HWmmBWLFcCks2uuwb6+njGtcpWsXfVEcspLF2Ft32A+JFqNW2/M3V2zG9OVpcNEuwQ
+QiillM4W0FibVNmc9FGPAAAsIVzHbkw1tdaa0CXLVhy96uTQ6r7iOzZmq2VvSdbmheP7DkaOJ27c
+WBROEWGn1tj3u9/L8yqbL3PMCSGc83i2J1WkG6SPegCtpaAk5zrnLtSklJGihSU9g0AnfvNf47/f
+h2y7nUE9668l69acmzrlvnDkfLstwtBWMHruzZ6rVrk2wyTCWDDGGGOJZHWqKiB11GsArTXG4Dk2
+pzSKok7EhZeLej1+QrOxs0AZlu32eBuW5NiFs7lXDyukLIQiQBypJUurzBJEUIQQYyxNVM9H6qhX
+ABgUgMo4wrFEEMp2GFKL0UqFZTPsXF14jh0gFpE3jr/BT44hpIVDqUKBwpHNaLFCLC/UiBASq3yq
+lD1G6no4YFa6lXSE5TmWlDKSWmM2JTV2M6ErmioMLdrpdEb/8jcxPlngOQcsLjHW2MkVctUey3MJ
+Y5xzIUScZtqsDaSTegAApBkFIYTUSoJWgLPViuaIuoKBAiwpg3w7slTUsGmd48i1Qo55IePmPaRC
+gUNKadLQm2XFVCF11BMADVojUCAreU/ISAZhiCBXLLWrSzHzciAcbCuusrRjMY2tCHOFOPYJIhmP
+uC6jFkc255RzKmVkkjXjqSv9+v8NGiOkAJAtLMviQRTJMOI9VZ3PSE/oVgMprTUoTIibiaJIKMo0
+UaAlIVNTUxDCOD7P7dUAYPr1sbVJlc1JJfUAAAgBCEFcz/FrDaUA2w4U8y1P8HHNMMramVorDBot
+GUVQ79TbnTOWdsPByekp2Q4xIWthdToZj5FG6hFCGpRWihDs2nxyKlJh5NiuyGc7eZcUs6wZNM9P
+T58+32rUahBmGtFM0PZXVZdUl9iWK7jwsm6xWEQIxVM3ZptUqqZxUiSKgdYaACMgGGMM4DkWQijo
+hBZiPb39XrkS+Xrm5PjE8JnW2LScbpNAC2DEdvP9y4s9PRa3EEKFUr5YLMLFxj1VvEM6tR4AQGNA
+CkA5rnAdOwyhHQY05wK3amNT8shZAtyhQspIIKyRbjDNq0WEKUGIEFIulymlsZondT89xiddigDx
+ZlVlbERkC+45rozUuQvnRqcm24QwK8u0zZEVKh0RRaRsKr/OwVlSAgDP8mzHKRaLcxsxUaroTiKl
+Wo8QAEKgNcEIY2i32+NvngkzKJ/P0nyuhQhCWGOEKYEoUFhBxs1Uigghi3Hm8Fy2YEiPd4RfsfVv
+Ewqw0lprRZHGhaw9PfF6iFCxRVQ21+gt4ZLLwkBxhDoKY3xBRtmB/iiCZcWeKIpyhVzOsQHA7AyM
+Ozmp4h3SSj0GmN1NjxBYlpXL5bTWmmDqWKKcQ54VyFBHklMqQYMrrFKBZTKEYSp4NptFLKWtOYk0
+Um+sRGyjLcuqVMqMcM2Ydm2rt0p6SgohEiqEdCcMUMZhlYLIeYhRx7FKpYJc7CK8HaSO+rnO4Fvj
+foahkM8zQiPQAcGolIPeIlgChdKPwkgrlMtYxRK3HIpxzrML+fziif8vIHXUQ7yYZx60BoCs6wkh
+MKYIYch54dKCztqgtUY6IsSplp183uM2RSjj2I7gkLq5sgWQRurnQMyXCBiBbQsmOEGYa4xsW1Zz
+KusCAFDS4MDKBcv2HCwYRnbWAQwkzcWaQxplnLU5WgNShn3BuRACS8QCYIKzJSVUykitOtL3XcbK
+eSZsQQW1hci7afpy5J8hjdQbzM4BaA0AGGPH9TgmArBjudmeSqZSRIxKrXDeFYUs45bFuGXbIuMG
+oKJFlv1tIXXUx9/4IYIBsPnWEmPoddm0G3DGlMasuqS+frnKWGHo86F1Oa+cd0WIg1KmUOJ5ponq
+BmOfOuovB8uyipmcVEpK6dkO2Jy5tuSkUC07Wc9ybGYJZs2uCCJI0ZLI5dA11DvZDI6UpBhjLDhn
+5cIM1i1O7GKO2RaiiBDCLQYaECDcDfa+a6jHFGWoAKJBaddyyqv6mw5D1YKdy1kZF1OCCNi2bTjH
+3VCuLhDRgBBSyGQ1AOUsCkJnaZmtXIaWlLCwGOegNMVECAYINOgu0PnUzlwuCMvilBBEGEHULhRw
+f7XYZsK2GBMEkGsLxhgg6BLmu0frAZSXywpM682GRiARluVcdmlPqVRybccRVjlf5JxrgFROzi+A
+LqIeCKOeZQvb8n3fdp0bb3lvrqcihIUACNK2bZsTKub+0o5uop4DCMeSzUYEEvtRuVhptXxOGaGU
+CMvxXDCjgLdOw0k1uol6ABBCMMbMklMURTB3VgjnPFXfSb0ddBn1nu0wxqIo0lpHkWJUEEIwxq7r
+mipZbAH/BXQZ9ZxTxmkkw0grAHAcjxBMKHJdN177Tuci+KXoHuo1gNKEIMviSmtzPhoXNibAObdt
+AQBad8Xy1Cy6h/o5eJ7HOJFSKqUwJoQQ2xaWZQGobtF3gy6iflZUx7EYY1JKM8VJCLJtmzGS2v02
+l0MXUQ+AkAbNGCOEzO6XRwRjbD5hSO6g7wp32zXUKx0BAqQBK5S3s0hpKaVUIaU0m81qjQhhWsee
+dnGFfVvoGurNBiaEEMZgWRbGOIoihJBt213XozfoGurBnPqqNQA4rsU5Rwg8z/M8jxDSXVbeoItm
+Lt/auMf57HdSrut4nhf/0F0V0E1ab2DcqWVxAMUYsywLEvvou2hA2zXUG07jboxt2wghQpD5FP/S
+o3b/7yX8V9E1BifeMGweGCeYgOM4XepjoYuoN1+GmHGTlJJSalkW5/yiE3a7QdljdA31GOP4uxxC
+SBRF5WIpPvjDoLtm0LqG+nkghHiel/wUv+uQutNd3w6M2YmiKD5pqBvRrdTD3BdSXWFbFkTXaM1b
+dwVcfG1G96LLtH7eHTFdja4ZUhmguZszuktjFkTXUG/OqoTE2CqFR9z8S3iLelMSKSUkdMq8nKdi
+8yZMzP4AEzcZfl6wmCkzAWkyMi+VUvFDMtn4P8weiIallAihMAwBwIyw4qznFSyZe1KeZOIGySKb
+Cr60ScXCx8HiMEEQzPtpHpmXAzJ3EMU21Bz8+/LLL8/MzCS/9w3DEGNMKTXhMcaNRqOnp2f9+vWc
+c9/3CSFm8lZK2Wg0Tp48efr06ZGREUqp7/ucc6UUY2zNmjXr1q0rl8tGyjAMGWN///vfp6amzLaO
+KIpc1928eTPGuNPpmNkxg1OnTh09ejSTyWzatGl0dPTw4cOWZZkcEUKEkCAIKKVRFAkhoiiKoohz
+bsrved4111wzOjp66tQprbXjOBs3bmSMCSFMAzJsEkK01q+//vrx48cty4qiqFKprF+/3gzizHRp
+GIZGVPPMGDMlbTQaIyMjZhXB3Dbkuu7AwECpVLr22msX8E9GAU3GYRhqrTudzpYtW/L5fKFQsG3b
+HNRpeIe5LUcY42w2W6lUPvjBD77wwgtx3JGRkV27dl1//fWG3Hh9A+Z6JplMZt26dZ/97Gf3799v
+Mg2CYOvWrZlMxrIsz/Nc161Wq08++aSRKggCI6FS6pFHHvE8b8OGDSdPnvz6178OAGax0EjFGDMy
+FwoFI6phyjxv2rTpzJkzX/7yl/P5vOM469at+9vf/mYEUEpFUaSUklKGYbhv376rrrrK87x8Pp/L
+5fr6+p577jmz4yquIYOJiYnvf//7H/nIR9asWRPvRjH/Y5YA4F3vepdeCDR5vrWJJoRoNBrT09NG
+la655hqzKhS3JoxxGIamZfzud787ceLE008/ffXVVx88eHD79u0HDhwwa6cDAwM33XTT+vXrK5XK
++Pj4uXPnhoeH9+7dOzw8PDw8/Mtf/nL37t3bt28PgsD3/Xq9nslkms0mADSbzZ07d2KMd+zYYTY2
+xSpmBMMY9/b2bt682bQkrTVjbHx8/PDhw6YgfX19fX19GOMgCMwMxNq1azOZjO/7plzj4+OmsGZc
+ZmwXAIyOjt5///1Hjx6FuamLVqu1Y8eOX/3qVxs2bIjDSylbrdb27dv/8Ic/GDXPZrM33HDDpk2b
+4gkPozeHDh2qVCoLW5y42uPddEopkw0ArF279sCBA1LKIAgajUYYhr7vR1E0MzNzzz33xIk8+uij
+YRhu377dVLhlWZ/5zGeGh4fVHEzijUbjxz/+cW9vr6GyWq0+88wzWusbb7wRIfTJT37yK1/5ijnH
+xqz87d69e2ZmRkppWsDXvvY1SunAwMCxY8eklPV6vdlsNpvNVqvl+/5vf/tbY38QQo8++mgQBPV6
+vdPpNJvNTqdTq9WUUg899JARuLe399VXX022eK318ePHb775ZgC46aabvve97y1fvtyYVkLILbfc
+UqvVoigyjbvdbt97772m8mzbfuCBB5577rlGo7Fgyzhx4sSCWg/zQhtR1q9fb8o/ODg4MjIipTR1
+Y35VSjUajU984hOmOSOEHn/88dOnTxeLRTOftW3bNt/3TcjYqQZBYJ537doV25+PfvSjvu+/+93v
+xhg/+OCDWuunnnrKqImpnrvuumt6etrI9vDDDwPA0NDQ0aNHk6yZh+eff974GwD49re/Hb+Phdda
+f+5znzPK0d/f/9JLL8XaprU+derUe97zHozxypUrX3zxRa31L37xC3PJifFh999/v55zwn/5y1+M
+RaWU3nHHHealqRWDeRWwIKihwHBkmp6U0pypobXGGGOMn3nmmZ/+9Kcw16ngnI+Njf3xj380EylX
+X331Bz7wgQsXLrRaLdPAV6xYwTk3vYj4SCCTURRFGzZsiBOfnJyMvbfv+wBw++23N5vNu+++W2sN
+AD/60Y8QQt/4xjdyuZyh1fhVSCwYmjbu+z5jrNPpEELa7XbcJzElAgBzpjrM9cRin8kYm5mZ+fzn
+P//888/btv2tb31ry5YtSqnbbrutVqvdd999zWZTa/3444+vXLny05/+NAAEQdDpdABAKbV58+b4
+pC/TB0Fzt8aZN0lRk6BxBMOR1tpYalNys9no0KFDP/vZzy6KRikALFmyZPPmzTt37uzv76/X667r
++r6vlBobGzOdE6NQsXM35Tx27JjhXSm1dOlS49/iq9UQQh/72Mf279//2GOPGQF++MMfCiG+853v
+xBY/LomeO2zIqEhMcdwD0XM3F5pLr2IrbApoKkBKuWfPnqefflpr/cgjj9xwww3f/e53Oecm2YGB
+gYMHDzLGfN/ftWvXihUrPvzhDwshhBDNZlMpdeTIkaQGxL1EmOsQG1Yv7eHQuE4WPFzfGIrbb7/d
+eC0TPwgCc8jVwMBAb2+v53kAsGLFio0bN5rOwL59+37zm9/ccccdpoaMKFJKxtihQ4d+8pOfmOwQ
+Qtu2bYurHOYcj2VZu3fvllI+8cQTURRhjJ988smbb77ZCBDTChfPKOjEJE9sYeZpok7cIRD7w2ef
+ffab3/ymUmrnzp233nrrnXfe+ec//xkSI2dTBErpxMTEfffdNzg4eN11161Zs+aFF15ACP3617/e
+tm3bbbfdllxOiCWJlWMBrY81LvbyxvzFHQCE0OrVq4eGhlDiAL1Ly5PNZj/+8Y//9a9/bbfb09PT
+n/rUp15++eWtW7dWKpVKpdJoNBqNxv79+5966qkDBw4Yae6+++5bb70VIWQcg0mQEBKGoed5Dz/8
+sNb6iSeeMFI9+OCDg4ODJmtjoGKlMXHN+3i0FYuX7OAmry3UWlNKz58//9WvfrXVam3btu1LX/rS
+Sy+9VCgU7rzzTkNIbIT37dt37NgxzvmpU6fuueeeZ599ds+ePe973/s6nc7k5OSOHTv+9Kc/bdu2
+rVqtYoyr1aqU8s0338QY12q1gwcPfuELX7iU+tmBmSm88UtRFG3ZssWyLMdxNm/e/NprryXd0eUc
+iOmA/+AHP7jllluGhoby+Xw+ny+VSqtWrdqyZcu6dev6+/vz+bxlWYODg+985zv37NkzMzOjlOp0
+Ou9///sLhcJDDz00b4RRq9UeeOCBSqWSzWYtyzLRr7/++sOHD5tgnU4nVvC9e/dWq1XXdfP5/GOP
+PRZF0Tw/HATBF7/4xWw2K4RYu3btK6+8MjU1de+99+Zyua1btx4/ftwkmOzz6Lmewt69e/v7+3O5
+nOu6xWLxrrvuqtVqP//5zz/0oQ8NDQ1Vq1Xbtsvl8uDg4ODg4I033rhhw4ahoaHBwUHP8/r6+hZk
+DIVhmDQL89YfgiAwnZbYaSSH70nFjxtX3DKMZY/NXNKgJ+2beZj3q4FJIakl8QqJGcGaFIyJj82r
+Thz0F2v9pesqsbSwkMk1z/MEMIkkV4n13DTGgos2//xOIGSUwqSVPI1zQVpjxi/XeuaJbvK+1O8n
+6yO+TzzJkbnKK87IED2PIyN2stgmtZhTrXVcHygx5RnrUCxYkqO4IElRk3UQFyrpGmNVSPpY9E+X
+0pCem0iJs9QJd5x8XtAPL1gHC1ZPMrq++KrqOJdLdS1udklekmoBc91Nk1rMC8w5UrhEqfXctoak
+WsR9gZg40ylKMjAvjEkwKWEy93natjD1kHCbsbol48dWLz6dWc/NKCTTMj45Vp9k+ecpyLxmmAwQ
+25OkZiXN3aWJxOyYuHHNxfTFLSB+cykRcHFLjdO89CGmK9nKk9odh4wlWdDyvHVX+qXammwy81Tm
+cnJfTo55bmBeeeZZs2Tg+OW8aohzmWcfkrHi4szLPSlw/NM8A2t+jQuSDDYvWbjEEc4LeTnGumyB
+8N8JXbNK9e+HK9QvGq5Qv2i4Qv2i4Qr1i4b/AcIV9sx7GTMuAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_porsche" model="fleet.vehicle.model.brand">
+      	<field name="name">Porsche</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAMAAAA6eNVMAAADAFBMVEXGlleWd1Tas3psWkfHh0c1
+MCi3k2bWqWnZpFjEhjx4VTqpglaYckuWbUS5ucGPUUKNjZWqSTnV1du0tb6VaDyLYjh0Y02HKzTl
+rFLt16enimS2eTtlSziDWjkxJx1GNCirgkmlfFTUrnTLkEachGr//v4CAwV6KDH79ei0fUSXl5+o
+qrXYxq/mtGjGxcu7kVniuXj16cnCmmPYuISYSDu3mnTqw4jKo2z57tO7jVN1TDVTOibr6e3QdEKK
+dVmRKjNZSTdtUzmMfGWjKjRhRi2XJC67XjjUmkiygkpbQyu1KzW6iU7ivYSrKjPk2cvQm1SZVj7x
+wnoYGBfUhEexgVJuam9XTUiskmv//PPCnGqjYkAEFRj89N2cKjSISDl/alMlGxX08fa7gT2zi1vu
+6/AUICSlVz2cgFvGo3HMoWVIMB9LRDinOjOickO9g0Ore0u1eVj8+/zKnGH2zYqtfULMqnr///3+
+/vnItabx7vOFYULOqnOifU2JJjDhx5bMpnL61JaNbUyxg0OgdUoEHCONakC+pIZCLSGvjGOVa0/7
+04iSLDe2iVPdwZnNzdP6+fuCYku6jVuMZEGZPTTi4ebasG7FoGz59vq5hU3KroTVvZKZLDilJzDD
+jFGhJTFCOjG8oHacn6m2NzB9Xzt4VjCjekOvsbqpdECqMi2OcE6ccT+rknTp5uvFpHhvSC6aJjP9
++fuQJTCNZkrPp2z++/78/PyjLTeipK/9//6HPzWzaUTAnnP79++GbE2tJjJycoCvhle/iEXOtIz1
+7uLl4+ivc0vFrJbc2t/7+Py4hFTKtJLj3+JnTzEECgwbFA/Nn2/grV69vsW/lF+JgYP6tFSwloHx
+6NuzJjGBUzBjXGIPCguqLTe2iUYcIB6BZ0b6/P7HoGbz37mhiXadNTC6hFroz6GvNi/+/f1gU0F9
+gY6yh0wnIh/v484EEBEREBL28/fGrH/ToF66qqVSPzPAj0iORDKINi7wv3XAQTLLgmbuuGpPPy2g
+cFKVKDa8mGn////9Uzg5AAATEElEQVR4nO2aCVRT17rHM5BAJhVNAkISSIAoTsEoIkQJkVAIg9AY
+ReRGUi2NBAGLDJWhFGIaKNQGLIgyxDYgiooF2ojjhbZeawt5SF+LDYaHra3UlFSeeNsnQu4+Qa13
+tQ8kuXe99dbqP+cchgXnt79vf/vb3z5nw8z/p4L9if8T/yf+T/z/qiyvLK9nfsreevHiYkgXL2Zn
+PfP7rI6Ofwvectfsi5/8tHHZss/fPBkrlcLhcDwcXgL39Dz51d9eW7Zx49cXp/7Uy2u6G80Kn5X1
++G7Zi39a9vFRF7yiooKqyWmrwJdoEgovXVKVlBS2tamoWGwAVgX/9s1lX1y88+Rfbcd33IHYd9Zu
+/NzXJa+woo0AV5GHg5JR9yeLUQahUGgSKuBGGio5CJkAV6lyAihz2+AnX9v4CdQE0A0zdcT0eEtH
+bv1p2QW8goAvHEQmJ9MzhYlCCYoWj5eOuG2hUCiCR8k9RqPOpDcOC1Vo9E6pKieHii35atkXH1hc
+Z5v1W78+4klQFObFkdUoo9EwEnTBSIHn/UegSQE3oSiUoPvIpGQ9Fg+/hKUiR5A7y+zJptsqMv0R
+NaDN87WNH81w9+nwILi/XuYL17QlIFGDsUIURVMSKxz3NQ7DB5FGI77SzSCRGA36vCB9jt/Q0JA9
+XH9fhY8LYha7MSUoZMkj6o2SFTbgO7KXKU6cICejEmmJariQV55rH2kY9zUYjTS10ShnyJFIrCqZ
+WThuUuHQ5emV8B6hSWcwmVxoRixHYpLw+zpfswFvNn+M90UlopI1ccPqPCHW3ufhEYPbpJGCp7Ph
+Jk2xxCiRSPRCeTdTKKHR3BSqkfs5QRyD3oXW44atwHKU1Wn//V/vTD8Gp8UfyTu5Pxk36Qs3jOPi
+sRdckOr48UlaSx+6fTKIiqPwKDwehRKx874bimYUKikmCqy8KllfbNTr9Holpc1evuTqu/s+sAEf
+m5icoDYa1IXoeIPBJDSqqe1tzX3pjHRWHcwf5s9O7xsdTWKX38bR29raglTsskq1Hi0xqoD3mTT7
+PV9eP/Dpz9PZPyM+0YiiqOBDiCDaOK+QXhzHYPjFoTvd8xoJBAJ7fHw8qJunyVHI3ctZdeVs2LUk
+LAetZOpo9zUB/Dr6lwuuX913Z5r8Mz0eF5uoPoGePH2agUjq80OcLpbipSfgUqm02AVd3Dd0wcR8
+rB69TqLk8BsqHoluX3uUw1dKdBL+KP3LY9evvvyO1fg8l/jkydzMTAQjNxMNbyuE4zrjKid3xe0q
+iNsVN8Q4Kuzp6QFs5lPpdTQBtYR+W/SIp1TelgPr51uPfzvvpFoVtwaRWyw9USjfmdve3l4pJbH6
++nZV+bGrCiovGB6T9U+cYLnqlIK5j0S4EuD8Y3Pmv3zIajyhIC4yEo0/Ad8Z5+eDHmR7MAQ6ZGHK
+KCJuV66fH+P0lPXPkJ96QcJRldwu+XLBnPnrDk1DmC7tmN9Gr1nlUiidRBQAulSIbIs+wSQT0hzy
+unnlfmw/xC5g/T/Zr3+2BTQ+FbLeWrzZ/P096SAuk7E3djyhLNOghsPWGFGF6S9qJDJeXliBn0+m
+kDmt+PMg579jLf4WvJixaldkpgQJXx47sqH4RZeeLVLcYM8l0V22f1ISg0Hm8bqnxBdA4gC5yWQy
+pUwJRAuwWD/dvDMdvuOWdNcqRtVblwwJfW+dNJGHabpEFMoNhTJy7qazh5IYiNtX9ninXblyPuX8
+NqCYmIqYuTFzgbZvPxdwruXcXMj6da9abb1LASK3/Q0y6qRvICrRgOIlqC4FgkCEB3HK2O0FPoiD
+rdx8oFYul9vKXWSR06Kn0s61hJ6V+A6AP+2DYLyxwRBkMCSTE+AldHccehK9cxINLysryGUwHPuj
+JvJrQibqJ2q4pflOQADv9LgFTgM2Wd/RccuF8fG49EhyPIqcMIjHoauGGOzM9qqq01Xs5ryC9krE
+7suXxa3i+lZxaym31IlbCgSaAC5/B60ohfDXrcZnea0sZhxJTKQNJ1zCdbb7IdIZDAY7zq8KvQtd
+5Yf2S0cggPXiCa2Ye6ZVewbgudzSGqgRNTWlpQAfNXeeDc7PMq+czBzeH4/6Ch+HqFxzOrLdB+7S
+DkMg4uL80Ll+VUkIxO7+qNaJUi53AsLnc0sngPkTUy4ATgi3FX/0sDo5GRWbtKbSh4zEVQWNJ9D9
+ChN29VWxQNJN9wHWB3MnuPkTrU6l4hou6H8u14k7FQJOTtofAN4G55tX+k7GBnoGSmNj26XGBJwn
+KkEeOSxBXsqZZLFZcUmg7/vPiENaW/ND8ktbJ/LBKHDKz38MBw0Kn7tkasqxGt8Zx8pNylQPDgUN
+4/YOk10iA42fuxQXFCAQDAQCseZ/9uzZc/78K9vA55VXHGNWz10NHatjLMdqRwt+nbX4rLWxuFyE
+z15yMn0NihxIFqKSk03Ik4EbgAIDwQEHx6VBDSQeFuvmBhIeuCjBxw0kPRRHtcSWvgd4F0Zk5FtB
+SN8EYbwBtQVJJge+Ofz5kcP3jn686rDv0Vg2i1U3dlOe1oynKt1+l/J1tuHNa2PRq2LXvLFFaDAm
+I6GhL6fDGeTXAz1jEzxXefKKeXka/zFqET8AK6iQcX6Hl+RA+FPvWI33RRw1bAiKV5MTLhFEZUmV
+PpXLX0S+fvLbe76Bh6XSSrkCTlC4lfApeCxB+U/4nmestx5/1O/NxHhUQmACnW1fae8Tm3C0aw0y
+0pd88ig8wSWvPaWRp2kA9XZA8w3CH1lvk/PN5rX3fNWJ8cNwF0ZlZOCGnUdpgdTovcg1qzLX+ESy
+l/c6R4d2wcbGiqozvL2Jbr/H61Tv2YT/S+YFMnnLlthiFwQSpUpKJlfY3wtERr6x98VfHj50Xj6m
+AXwPjEdq147UP8JLVO/ZNOH+5TQa7YLDeRqQaBRStEpdfCFSnUyOfAvQe52LNDTduLLRA4PZsWOH
+HVGWQ2lpaQkA6oYuNxrA2fYeGPenrC03AH7nqvbKvTxUgh9qQ7pUCNbYPcNkxN5fHi53voliorBM
+010PTGrqDleA37b9sc6B88H2gO3bV5fYiD/aCbLbXiSqD4FSqw2oICQZ+S3P55fly501UN/CJUzl
+TWB8VxPo+xhxCDd/ESg+Fk04QcVHTf37FuutLrYg/CqfyL2xxkDAHiarBgtPyBmUyoe9vc45fDXT
+hDcy1WFdqV0BAV1E5SvBUVynRflgqp2AZv9F4tpfLdZbn3YAfq9LUKbUZBzmqU7I+1hsWGUk377X
+2dnBGaZk6sk6iaKrq4mPanMlKmPEUdB8V8rNB3BuTWlw//tTzrc+9C50vuEZbzQMB2LhfUlJ7X1D
+Q5U+Agdn59DQUCWUW3isjC5MmsRESSXKYuoBnssV17TW5EN47eVfS87a5PzFu1h7N+wfUUs1fZV+
+VWz20FCVPYSHKRs1lqHVGWpnh8Hk6GlyCF/LdcrnioH1raDi4NqKz+pYvKvgsAmFGrnUN5Q71B4X
+N+QXV+kzHu3ckCeYWmAIiooyMsLqZLQ2omzumdoabr5YXArZznUq1db+igf4qzbgL0xGkgPhqhx8
+bm4Vg10VBzmf49Cs+c8c/dTiCnqOYVRw9NQUWcyZEG5NqxMoPrhc4P5Sbf+vj87OsQFvXlxQudw/
+DRYhagcZ374SAa6/+HBg3WOhY+NPJxYgHpUExv1BxwerVz84+ODc6nOrD4JvHV+A22K9Oesimk8B
+CygKWEJNLaLAMkohcFdEUzluehrqSQv0zXYYopJoSXktlrOFAs6AFPpSW/DmrS7x++PjR4B6Hj9H
+6GEG8W+GhgZoPMLGxho44xJLBKS62pE4VFVamOjaI7poTwmdjs8pKZGnSyH8y1b3/dbThv37R0ZA
+A3qgFjChU8BvDPWgkkCqx3h4RPOh5JeGccXcEFCv2BMERGK5IgAv76SL0tJgo55LF6ywvu+zsj9G
+7d8fP2W7xfqRHqayuwHgGzCQdmCa9WqJPgXjaseh3rAr0StvVPCZMupceqcozDs92vMYZL21aSc7
++3X1/v0W9/c8EdOk4Xh4uHKaITgGk2KihtFoqRhXGfFGnU5H3ZbDdLsRkCKSh1VHjMLACnMF9GTL
+OvydrIXdU/gp8tSDlIZx4Pkii/VdRE73ji4aJxVD6t5WTWDSqASJKYdYzZFwiN5lvf7zIPxLVuKz
+QLU1+Jv1eijKQQskCuUOzJTvA7DeHh4cpR1kPKlbB8aAHoRCt1IPwr+pzsEd1For3rUBv/iu8LHx
+vxWQTD5WZmfp+JSGMQyGxPHGpHK6OXqdrJvXENAAPc+UyLFNdtEOUlBr2fBUM8u89V4zXgFkWUqQ
+SAqiQkEkEscCZN4eUw7ANMkyNmVwWpooxAoq9QaWSqBWkKg0SUpK3Wj0hqVz5hw4Nd2TpZleJ3zv
+um1qBQUpJgZaO21/8OBKjozYZWmAByg2SLIGbxJAV4j2dHaK6CI8kcAhpYw5RHy5FFrifWYDfmUY
+t7a+tjYkPwRSfUhIK7e1NeT4eSJHQGoCIbCjiSTgk6gt1BRRujuL7t+5M6x6Z14zsamprjdv3jGQ
+8vdNN+5mwmcfduwPD++PqtVGXY4aqD1eG1VbGxV1uf7gthQNnyOTcfgk4o0WoqgrvVxAosobmtPS
+6jLuitKaiMD3Z0HknZq262d8l7PwfHh4eFRUfVQ4+ARDdPBTVHg99+8xTc1hTUQiNoDaF5ZBCFMK
+wKynpLZk1Hm7p10Lqwa+PwYib9rl9Uz4Dq/FrOMQrzaqH7RBXBtcXxs1EBweXh8sbl20aD21m88j
+NbGVoOd1RCJJQgrw7m7ZIfKuDoM5wMGwA77/0Aa82cv8tmP4QHh/+OWoy8DrtfXBwWKxNqp/oDa4
+lBuyniSnUql2DZKKJgGtqVo5fiVVoGu4Qazu6hqFbVgK+f6QDS9TwNDPWptaG3W5v7+/trb2cn1w
+LYi+M8HgOxCEreL1JJe+PnYvhybvkunB0DfRaEwCiXQtogjmkDcPDLv50wfezHjzRwjH3e8DHT/+
+w/vfgct3x3fvPr77+HdAB9eTyt2box/y9ByahObmJuC4uUloKRkR1dWhrA0g51z/9KUZ3ubOFHpZ
+5p9gY3ZAmx5fMOBLKji7uqq7PEjpNL17o6RHBla6DdQ2zWCOYpyTEhZRFyqdt3TBggP73pnh9jO/
+wc5exUdNSUmDZKRZ3qAB6UjEaB5Tp+fgNQFUvFzk7k7H4YnNpLTqaBgwfsH1d3+eLt8/F97LvFKa
+aJl4nky8zKfvEDTNLBqYA3CchrS+u2nld1n+YZ1ywg0w2zT+eGzOAmjUzfAufUZ8R0f269C0a2kA
+xH9aeEH4uzolTUcgRfjDRP6dYRHVdzNEOPnd0bHNZ+dAxnvZ+goZ0sVc1FPzLXWfZfYDVw2R0Nxc
+0UAl1flHjMGulV2LcE8TVfvDHC7NAyln/ow9/5y7F1a6P3H/M4UPZD0xTy4nNJ+HEaiuXXxNs3eZ
+v3d1UUQv/sezIO7WzTDmnxuftVDzm/unGjBiwRPk/tWjoaONSmKXUkBsaijydo+IcLi5ecmxBaDO
+mD7hPTfeq2MrQvAMfuRJ4UUi5Pn7s0iuAr4dyXjXbtyN2CK6GR1NngcV2NO/vJ0F3txhXsl2EyYa
+DInQfglw6qBDJ1QQcWGjDXxYg5Iq0Qv4OkVASli0w+CPIN0e2HfoOYx/LnxHtlf2QlhRY0ZGUUbR
+M7oZSgqDjRLH3ZU6iaCbL6ORUq7VOTf+9T3g+lOHPnye7SvPu3Gm45aDq+NBx8da7fjgIFjPbVIk
+pcCSdBKspqGiEA+nKhrreps3A/qBTw/NuG9iNnivjuzvQ1e31oi1wVpxfXD9mRrwCVlPiFaixmV4
+HvWRSFROF2V4OzR+89xhNws8SH5eC6MdxdoarVYbNTAAmhGsDV6vgLn3MAupFTvLQMaL8B91bv5m
+noX+wXNuHJrFrqWtC0Mda7UDwH4w2wO6uBY4n2PgSRrTyiL8O8tY0RB96Sxsnw0+G/L/C9rggXBt
+VPDAgHZCHLyewCIVElKoJFiEf1ifgzPJQv/0pecZcrPFQ0vOW72uu4PDBwYGgrVasTh4k4LeSMLJ
+Cf5lEWGjDqGkb5YshdYVH8w0z1mFh8b/2hdDHS9HaQG+JhjgifJyFpvtX9YJi3bewQcjbsXVl2fY
+q2ILvsN88XuH9T8ED2i1A6UT4k1EXFkxy98/grW8l7Tlx7PHDnyx7zOvO7PgzwoPSj9z9q3K0Bd2
+i2vE3BrtJgLdn9V3N310OWsYdPuc+aegkP+3WW+GEoB57evLPV75buIMwCsaYX2w0YfRFVv++t4C
+4PjPPpyN6Vbgs7OzzF4/ren1OL9bXL9JAVJ8b7piCxjtK66uAzE3O7gVezW9oE1wH6w94hC66YVN
+GdG9LOyWzRD85Z9fnZ3frcNbBCqwr99uH3WIzuNt2bxkwQGL5dbcaPb4qeIRuOCTZX/7dvOPZ6/P
+/3QfZLlVshoPYtD80c/71q3bd+jVO7P3utX436FmszH2X4D/gxY8/u3sffD/Zpfyn/h/uf4B5mqD
+I6sViG0AAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_rambler" model="fleet.vehicle.model.brand">
+      	<field name="name">Rambler</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAwGElEQVR4nO29d5glV3Utvs45Fe69
+3T3dk5XTCAlJSCKJnIUAIaIQPIFJMsiWbJ4TAgswUfxs40DwewYMJoPA8ACRbJMMCAkFSwhloTAa
+xQmdbqh00l6/P+q2LBsa00OPx99n9ld/TM9Xt8KqXfvss89eqxRJ/Nr2hum9fQH/c+3X0O81+zX0
+e81+Df1es19Dv9fs19DvNfs19HvNkr12ZkHQiAg5PJyHJEgzmsTBZ1AqakQNAhowCBoBSABDKBJK
+gZEKVNDeQAEANAgEgAoCdFQDahIKBjAgxlu61+74P5jaa1OqACQICBpBQwGmhBmBm52mgRgEQCAa
+AkRQctVVAISQCAUYRIDACIkBFGJGyQGIghAUpAYKFpFIAKUAg/Z3/11e9L0Gfay9zowygETAQOlG
+oQbWSntdQHthSkEJCFg9/v/7thZDAdj+SWgCIhBhKFQvB7oEIgCBlohg4Xt6aq/c78/a3oMeogFF
+DS8QBa2gAQVIAyG1QpKLUgQUAWAwDhxj5wXQXnc3BGgNpaHApQcRgXwAZIAGEkCDCoAAovZijP33
+ttegF3gJVNQmSQCIgAJNFNl9EEsCAYEoUApxgKJGf8DFYRgVcEEJlSY7SNaswfqNmJpG3kPaiUkn
+AAOgA+SA8TCRSitoUKCyvXK7P8f2XqyPEcpAowEsEOE7QA4xPocBVECziNtuxSVX4pKrsO0e3HsP
+aydFLcNCB09EBaWhCc9O109O2TXT2LSpc9DB+ZbDsHkzzjwZSQqTQSdQHcAA2ltJ8//xsR7ew6TQ
+qEEi9hBhLcqa2270121VP/xJesW1uPX2WOwgLDq6MWIIE5BGKIIcjwUEtIIyiFRRVKTSJlUmwdT6
+7KhD8dgH45EPxvFH46AtSLpA8t8nxdlr0HtKqjSkDc8BO2fx7R/c/p3vH/rlTwZbN4TOtVEaLiQR
+Rim533UqAApKISoYJiABgeLSaAEQ1FAK4nXAhN10mHruUzsvfmby6OPQ2bBX7vdnbY9D7xzqDBqY
+ooOPyPII7T18SgPVhVd33F5/8vP2E/8wc8dWsAIRBFEhSWAU6CEEAP3vkkIVFQIUFbqSQ8HpGOm0
+SAIYDRjUIetqBeVdEBjUOZB1pg8+HOe+Dic8BIcdDmiIBwk9RYVGwQAa0KCGikADRGDNHkNmj0Nf
+Ab2KUNJ0TQpI5WyulUl6gPrxjXj3B/GlC+B3zE84R9WtuEagCaiEYgIYVC9uWpttXLfw3Kd1Jnoz
+a9di7TpM9pCkoEAEvkJdY3GA7bPYeo/ctM3/9C5XzE3ldWV9DpgUiIgCQZomU9t0XH/Qod1XnIoz
+Xqr2O9QIaKBQgJO1a/I81SRqhyxjohdp16nuHkJmzwecpkLaQaOhcG8PKbCxqXHvLnzgPfzaJeVP
+r8rgswQhwBioBLATFeAmpiaOPSZ94qPxhBNw9GHYOI3egQDaDDJiPJ8C0FmKWaDAOcwP5N6d9fzC
+xP/7h3D5T9zNtytf+0xgMFF4Ba3QUSo6A3vUMZOv+0P1/NNclvUzbKoCsgRGbGhMmoLWVI1Ku8gm
+9hAw/wWx3mNIn2VNBznAarv+6jfT910gl35lqODXmo2+60cFgHRiAkHs816UP+xonPRIPPjIAToO
+WRfJJLIWaRKREECWygcZIUBQ4yfRzlqDs53MYNccrvwJvncxLr6kufqKphxMr1GqJCPUmjVhONQm
+lTNOr1595prjH1920A3UopCg1IgIa+DRRHQm9xQw3MNWkn3SeTJ43n1LcebZfazxOhsasKOYwgEB
+Sdh8jDv7XF51leVIWFBK2prOM5JCT9JVDA3FUzwZlzZSGCKdj9aFEAIlMEZGP0tWpLNCFrR38Juf
+kVOf57ON7MICi0oNlI6d1AL1hv35528gHSUykJa2oidrcoH1nkNmj0M/IMnIOOL3vxUe+pQGGbMs
+KgTAAhYT7pCH8I3n8eYbKJ6ebEhPejJQIimU8ZHuBzdJUkghGR3FkU7YeDY164J1wYoV6WiFdbub
+cxwsNFf9a/+007fPbC412FECeKBUYIb6D97CSy6lFAOyJmnZ1HsS+P8C6DksWc7yvX+1MLN/BTBB
+AKKGA+yG/XnO23jDLbPkAklG2qohAymBtJFOGClkHSOjMNwP/0h60jE0Na2lD/SRLtIG2kAXLYeM
+NT2FnCXnSAq5YFmTF36XL34hk6wCqqkOs6QBFoHBox/Lr5zPOF/SeZKeLPcgMHse+v49xe++rjKb
+PcAcdQ9NDiJrTn8Jv/gxyl01B6Snp61DSXpaoSM9JTIIIxnIQKGPDEubLL0KbEhLOtJFOtKSDVmT
+nlWga5ytyZIsyUDHOAgcCR2LfvOlL4we/YQGoAE7hh00wPzhR/Pd7+FgZ0k3CjWrsOeAWTXo51lF
+IWuOSHIknGeo4kJZPulYprkDSqBJjENWZvsuvP8tyx7IsvX00EYfaWgtraN41q5FtCC9JyMb+n/3
+HtxvC+3b00al9j8DGVixcfSFxMDIrbe5V501pzoeYApqOMABg7f/Lll4oQv0HMfAAUPBiqxcY5vV
+QGzVoPeBjByQrEh6svC3Xy1nnEP0FgB2ITksUB37MF7ydc7dueyBImNkpARGT+/pA2NgLNujNjXp
+6Bt6b31Tk5GFsPwPW2RBG+kivaeESOfpG/qajnWMkQNyQDaMnN3Gd543v36LA2wKdtT8xt4IHb73
+PUPO07H1gppsSLqasfJkqFYBsdVLLkdYmMK6YGEMkLi7bwuvOkd9+xtdkwGhH+2MSeOzTgx/8waz
+33GJmRnnhj9jDWBAHcUoTaoIUisAqR/Jh748d9OVvSPXT+Yz6KwrH3Isjj2+E6AU1P2ONi7vJB6A
+Rlv+Z5vLgdQ6DaITGFjUDKbHLIxwyY/L3zwvu/VimogIrTsJdHz92eZP39Go1FgjiU4MTGNhItIO
+rEb+KyO2Co+PJOlJqYUuVr7w7PvTz/bImWMwpb0yxEz1gtPYv8myELI/WvY4A3rPcZJHxzbs05E3
+fLfYfIQFigRUGGEDP/BpFvU4svzMJiEyCsdeS09a0pKerg1Xw/b9rMoYB30OeMmPmqMeS2QBoEEE
+ZgF+5L3SDkX12PdDbOgi/SogtmrQz9JzxIr0LOo3v7FBEgFmcIBNp0a/fRbDnCVZkPEXJW0VS4pv
+QRdyFINn9HVhzz2zgeYkgoYD5k54JO/+6V1kYPQMjt6Ks+IcvWcIjG2oGAPfkCU5IBfHQb+xMmwD
++ZAcOkZHFrz2av+ok5lpZohAnFoTOh1+/lOBc5ZkyZL0jKzdIldh+F016GMzrBnpm/j5TwvWeMAa
+OAWqKb78FeSOEUlLS7Jh+QvcRhp6z4aBnCNn6WsWsd7OA48sdaev0ABh7Sb+5Xlc2Ma7d/Heu3jP
+nbzzdt6xlXds5Z238547ee9drHaxnqdbZBhSmvveIE8WbeYuDOSALEg6MrgFsrjzutEjT2iMjuhw
+YqoCikMeNLjsgnlWdOQotLOMHauB2OrF+oAqzPZ+eoOc+Eo9ujc6VxpMdCfc417U/dJ56M6g6diO
+AdBApoMgWW6hziKmiCpmykM6scDsIq68hs96Ibq59a4TE1KrLYch7WB7I/kcSRFpb0QppbVWSoVk
+hr2c05PYvFY2rePmtVi3Bt3OxIYD6nVZdtAGs89mTE0sJBPA5ITkuQIi5hKfXX/55HPPvfO2Kw4x
+HkmsLbq/+Qq87Y/DgUclDaAQczTAKlR2VuP5keQsyVtvmX/kw4cKohChiITHHhGamt4tchRZ0jUx
+1G1WuJyNaD2XJlO75viDi/m298we9eR2AswkGQFlnowApmg6aFtC2gYQwb/9SQPq9koQoQUp0SEm
+AgzTLjtTsn4fHv0InvZb/Nhn46672GfNKK5mQV5yVf/QI8cpf4oGHf9H77iXo4LjCUJcjexyxdAH
+siYtyVGkq/v0dHFEluT8ea+lBg1KwMFw48Pi9dc7WkpsM+t2vkMhHV3jOc65xUcXxEbaEGtef5n/
+9Ifd7/+OPfGJPOLwAMUsqYB5owW6BmzbbJOACUSjmVR1F3UGm4L5OD33AJWhUjQQtbR/RxUGgynU
+KUKOSiMiJ2aqdE2x5QB+6JPkIn1kn7Tkez68fWrCa+yahChUMLzg0zU9LVmFgnO/OvQrXp5v1xME
+QEfDdPLgoXQGZF//bvzUv0QNA/QmejbbjPf+vn7gwQ10AqUioKA1LBhUNCkFqQDKltnsrL5lK664
+Fj+6ij/dintuTIZFRFQwAZKYHoLPgK5WECTM3KOOUxs2h+3DsKbXs8xHi4gOLiBExEDnQ1M75xJH
+GwsdJU2MkeACTOCEgR8Zg6gTGIWQ2Cwi88HcUQ1e+9bmuss2v+H1bp+DAGRnnNoZXJe8/W82FPSA
+yVh98PzeY56ImQOQGa5CarnyojElKKUR0SQ6BVBF01OY6+O0V/gffN+g0B00DZJz32z+7PUWRqOb
+EnBRJYYGCh7RoaywcyuuvMH944Xxh1ek27YRhQFUhuhQzqzRExv1ho31vhNrR6Nw8ZUZYgAi0Dn5
+OXj3OTjyaAwRpicTaniDKAgRjAgRzqGx4r3efisXFt2uObVz3myfNdvncft2f9f2ZmFhCqOIUhuE
+FCogiSBQEL2JteH1Z6VvOddhTQQmZm/G815rf/R1TMMM0OQT3bf8iXn9a5mkA3DZickKoFyhSfRR
+LF2sOa6sCit+4PzKgLpHpYY5isO28JZbS9KGsk2qmxDrtvp7z13ylW/aP/1AXLc5dtcyX8/1B/Oo
+B/MZT3Vnvbh521n9T38g/OtFvHEr+wv0d/Hdb67XdG0OJnDpFD/+IUpBRwayGid89VIlx7OtsIkL
+3raX6yMbT/GUhs3A3vbT+i/+ms88lbpjARo4A+apz8EJRGDxoMN5+cVCNg0pDb9wQZFPuxwO8Ani
+vkfzuh+Pw+avbLszzDo61pGONrJPunuuqx98ktWIUNTZyOjw1b9jEViT9C30Sw/J885t8YJ/Du/6
+kL/wK/HH3+Hd19DuJAtGN65+1TUtJXCWZL2jf8rTK4ApokL9gudXg9t2kUXpyra0LEulY3JcqWkL
++uJ3cTDkgHRkrOgXWdWshQU5x//z7rkN+5YAkQSkRCciWexhmIFYz7/4ICXQk7WL7Lv//VsVNCdg
+NSKS8tVnB1a0ewN6IRtxdJ4NndDThU9+wCGjQQAiuv2nnEjuGFjPoq2TyL/B0j44P2K5MK76Bgpp
+yQE5T+4k2U7MIj0jv/Cpfm+DwDDNa+T86Edo3XigDtUCm5E4v1Tev29behgVvWtTglLa6q9nOeBX
+LrCnvnioJzw08ymLrkceYCIwWJuPMMk/+asRy4JkDH2OeOsVXHdcmSdRIwK2dyCvv4z1KkxnV57h
+BEr07bTOkrz1lvj0p3nAA0wSbjyouuBzlDgk2XAXY0EnMi4DO+GIsWjLWO283gl9YPCMDWPFUDYc
+OvpdJAd3xuc/vwKYZB7Z3NNP4d03saFrfW40T9uworBY2kbCkXDQbiGOF1uKdtLkI6++ie//9OLm
+wyxSCzBB0+uM8m5pdJ0hAoJ0V28jv/W1Pt0oMJA+VJZOXv/O7brLDIMMgi7/8I2Uxb0AvQjpWLAa
+tSHvy/9cIGMXw3QqAruefyKbgQhZsmZDYRhX3sfJpeU4uZynDMmGdMIQpJ1bepIVGbid5L9ext6+
+1BjOICCzX/wIw8iSrHgXOceSwzgg/+P6SbsJKZ4hkNHTyfBufvX8+OznjTAx7KiowAmIQQMwyagR
+gPm1aQnwiSe58voFOo7oLdlwSLrbb+Cm46lRTqAPcMNDdi78eG9AH2npGekb0u/yDz6aCWi6EVjo
+7V9u/cnIR9Yckiy9rLzOtMjASLKae9krWt+k7s0/7AnjVSq3NKSG8QyDzjNEIRnbwE6KoxSxPfPi
+HD95Ph9zcsS0BVyKuU46UmjrS0wRoQJSqukK2HHYFn7xk+RogeNxikVN4bzMDd77FxUyGhQZIrp8
+1xvJ8YOhNHT1KLb1tRUsKa58mI1s6MZLppd9r7/fPhYgMqY5n/EcVts9ScuGpA1+5WUmIV3w3LV1
+fsvxAfAGVBuqv323kI6sGEuyZLSMPja2KSJL2oqRnrSBoYwhyIhCjuQfzq+fcOIQGAHsgFlWAMQk
+zQSVGa+K5FjMMAIGJz6bf/f3HC0GxhHvc5lIR8+GV/9Q9nlAAzCHIB086hFcmBff1oIa8VUg6Vmt
+ZEVx5dAHNgw+OrJx73jnYtZtAKo0osv3/hk5COR4hYGxuS/7+OWtLa59/KMWKTsYAnzkM31xZyPS
+5o7CGMSHOK6IlWRBFjHUdW3phQWvuZbv/CCPfVLT2+wA9sAuFoA+wO6ktD08WtOkDop6hk89ke9+
+I2++g9YHctH6EMnI2oeCbWU5knPhjFc4bdp6skeXF/6wZvBCih+yZCQtrexRr/e0ZBNrhnn3pGc3
+SAWgTqqpw3jltxpWwvHgWTPuRg4mjpQBH3MyFdjFSHf5xc/WjKzGcWacwbTBpyYtY+QCucBBfeU/
+8XfO4kFHLsAw01HBATWUV4ZpTqMcYBO0yRjNJj7+1HD+Z1xxb8OmJofkrLiGZCSLJkhsi5q2DpZF
++NxHiCkP+ARUqvz/3tmwiI6MMtsWWgOF7pe/05VD72JDeql546Vh0xaqnMZYID7zZYw7CrqlsOuG
+3J2q9gLJr36dmGEXJdCc+IyGc6zbRdglxN140C5IsgkLd/ErF/A5ZzDbtwaqBMMeKiACweRET9Aj
+OtRJ1VV1Nhk3Hxpe/JLh9/7fIueGJD1Z0dk60nnWZEVp6CyFtQ+MDJEM0d98GbNDqBObIwDzz3ga
+41yL+EKbOEdyJWPbyikWSgitKbjw0ji33UAk0htkpzyFegJIBDAIbXOqCSsmymUo8L7PBPRRwyGd
+OPslFdbkDYYdEMEY9ozKQHhki6N0WPQ/dJ7+5hW9q25NdECGDJCAPECbrpNGlDUpgkcJnRx9/OST
+H4ennIKHH14dsE+GLC8F6bjxO42ED5pWNHSSI0kg0hHGBARQ6eTQI/D4E+JFC3TD2iC7/npsvRtb
+1oPoQXuFFICoFVC1VuyW0ZUk/ZC/8RuVQYT20H5jx/3kaoqvhJakt5SmoOxGD5Fc9m0mB7sUJeBP
+PKUa3RlIVm2Dh2tYBc5xeCu/+ln7kpffvd8R7YBZAE07t8g77E4TE7MTXYu0hnbr9/evfCm/+hnu
+uJlhVHDs5m06S2GkHXLEqmZkcK3bxhga8RWja9g4F1iRoeHH/i7q9QFwGSRV/MTHPcfLXsPW4cMK
+3vOVe71WBBDJm7epDkJFQ2PWTbujDoFPsgwewBJnEnHFh1ffvIxh0Wiw20tOe1Y9uakbgU6slOlV
+Pr/8On7nXwbf+qZc/eOpYrh/AnCNQtWDqFQYILYBbAmuXzujnv4EPO3peOyT8YAHMUsCoYmEAyY9
+ZVIEUBByJMimglrspimQ6iQKFHRicgUfQh21zk0KAzSy69EP2CQaaa69FdJcfZMTGAXVMPQUASiz
+gltdsVc2oSZ546Xcd99KKw8I0p3veNNy+1vGdrG0XeiuyYIckDGwaF2moQjZkEVdcDh61L7saotk
+9jkv5GBuEK0wVsUOfvxDzXNPHU3sE5G1WUqdYXFCRwWnUU8iZqiBvl7bPOFkvv280Whk7WqUWgLp
+ImNk09TlvXPHn+SgmKE2mg8/sebcqO0JDVGcv19b4n9uK/Z6lRgF4La7/GikhBpQST598AHL7Z9R
+AyIIJLOWyteSYbWeYAQ9TKcvKHMckDP/4neTf91eRNSb9994zkvLNaq77Tb14Qu6//gdXneFCXUC
+zw4aAg4dh44n0oQu2KqjH/DAztNP6jznaXj4gxan10y4xJh/80EuLR+u9H6hAKOhBKlJs97agw5Q
+V2dQ1kTBqMyjhSGUgl7ilv7SthvDLED662+OVZkAWoHG5Icfsuz+QaCoEiVKOYiBGCOIUUw3Iiio
+pJG1lc/WGezYmbzncxY6m5pS+27GN6/2b/rkxLW3Nf1rcxUJGI0oYIMsgVIGTMEMhxxnTn3K5Okn
+4cjDoSfBCWQqAbIlpiB/xcVnBQAElQJUoo/Zwq8tjaTz89y2I9myCWyTipUR5HYH+kypsHVHKtQA
+tBqlyeS+G5c9bSoUYVSaWimtDCIEBqZMZSKt4NekwBrTQ4krLhr99PJeFDUaZTfcHK//qy4lhFLn
+nOshr7FGYJxWehIHHVY+9Aj/+IfMPPp4/9ATYTIBDJC0QwtlEhaqi59xdpIrdXwPJAo+hCxJCY0j
+DvRgGqGB0B/qm+8yW45t92wpu788oLvB340KTGf7NO06oY7dnqxdvxz0JWKq00x0y7wHgMTAYG4C
+ANZDQflgLG68Fud/Rc/drlp+flIMKlk3hTBC5pPpRTHYLEcfUj/62OwZT0hPfOLEzFpBKipNnQqE
+T1ACMMiAHD4dnwnYvSBzP5MxFT0hdASTAzYGmEzBGPjQqNt3Kgii0CiucN1qxdCTUSmFhWFQrViE
+6q5ZZ6Zmlts/a7UkNJCN6R8BjAgbfFrrRbX9Xnz7kuYbF03+02VFdVOnp3QwlQt5VOsShQLsTuOY
+E7JjHjJ61VOmjjhyYsNmmBzUMSAKdA6NIknSBDpnmrr2lHlf5TO/eqgBACQaisi0GZPpNkwqZEAJ
+A8SgdswRopREEmpltNCVD7NaCYMeFFZjQoEind4k9bLLxKlPqHVj4BUyoMsSgzkMF93nvpn+4HL8
+6Er2d3WhodQEtGpERDymh+sP3u/ZJ8kTj5bHHTs44ECo9RpxhAzQymOSMAomgwNmMzMN6QSAHomB
+0nCY8cDP4+HsxhswHqkJBaTKxKlOqvNWZEQU0S8iJDFaKREwWYnj745ggHOu0zRMoIjoaZJUHM1y
+4FNDQwFdhPTOu/G9C/mVfxxdcvnEju0mcSGIm0SvgQ9INKCgzz517dOftfYRT8HmA3VEHpF7wABO
+waigxaQaEaAHqgxxY7UOCj4VplHDElB5onJjoFug7/P93Yw8BHyAVtBGK+OSJFGJBMQENIALEUgg
+SimOZTJ+WVsx9AFpBxomTHnUKYynyaJx6XLtEfdk2L/xnW98C5/8MK74PkaD4QjTagOUYsiLBx0z
+84AjBrhj+p8vjjXMU17Z/N8PG200FEGjVfsSxxhNNwEwdisDIAWmAaAHAGnLeP15TPBfMdYDLmRZ
+ADoUeB2M0XmRNBgqrAkajQK0iyE1naztcP6l05wVQy8EtEaiITARqQIQkS17wvUiTQd5auZv2pnf
+W2XA9JopHLEfnnWaPeVx2SFbsCGffsTpscZw7T5r33p6qseXZKAIKigA98/Q/+tNBEaPpV/SQCKS
+6LaSJalWgFEJ0KbdKzjsirUaVAt9JweQeKgUTVPDyHL7d4BOY9Qznrjhc++beuSJGp1Q1phUeMYj
+9AMe1mw4SH54A66+sQQGpz999Pjj9Jiyfd9tL3vk/xqjagM9wQiFtG6b5pArRBC9PIVuPYOErATO
+FUOfKEBDJrstSRiCZthH9Mv+wAlVHGXd4UOOx+ffY046OUSD71/ff9rzsrPesu6nN+svfcmbnWu6
+mw556cum/EaKUGRJa0hBK8He1f4l2kAnpAb6zX2DRwRl7YQC26BGyoquc+VeD0AY1k606j4kMCxQ
+l8v+IFF1nsayWcN8eNCh+NK74pkvAaZmbDP83PvK552OL38h1sBzn8yjHjrIEq20Riui1Z5OKai4
+ojd5VU1ab4NAq6iA2QEZtQICAB0OWCcrLxG2tnJxGMIyYt+NQq2hRSGvLeYWl9t9mJiscjN5B42s
+8Xk1eWDnz183/4YzvcUEMHHLdWFhVwGEhz9I9dbq9l5bwJecSwD1q3fZ7b6JUkAQEBHAPfMklYII
+UkzwsH1hDEUA0Yorusrd0eWRxGQH72eNVtBKoVt73LV9uZ0nCPQy1AVSCSkmbcdMPED96ZvTc/80
+HnTEMPrEcQMy/a5P4m//eqrYHstqLM13v0Ave8/rCUABwY2h3z4fo299QU+vSbfsL1Bx7BlKreQ6
+dwd6hRT7rA/GtDJOpIQds8vtbBWSAPS0TWIACg2YZF0xGf/0DemZL3JTqARN5tzsLfiTc+Oznzs7
+OztG/35JYdztt/pXtggqQkIERAD0BzEKiGgUJrp689pWkRAACMYVJAUrh16sguBJJ+Ubj+4rqyMA
+JFdcXADwaAA4QcAIrYCHqPY3JotApykmXRMSlpMwFraJGxxqD6PzXAE22Et+ss/hx5g3/RHmrqlU
+DavUCMahr1GiJELbEuwEbZfh8iPMqlnuekEFNTkVkE82u+oL/n66q0SSRNM+ZAvMOgsYoy00og6m
++eWPvHLoAwM0Jqf1gZundQrAwzaXXTFZR2k1JLWmQYo2EVbtCRSgYYAUWRahNIB7bnDv+6yz2frP
+v3fHOWc3UweMBD0fR5vi9g9+1D3qlb2PfUHn/dmpMMiwT5lMIFGgKsJkiUxhe4JZEybcnk89FQSw
+wQcjuPZmOypjTQUVPbBlfwAaooCMY43TFdiKV20i50j6pj7jNYK07UuZm5jm9bcU7VKsZ59BOG49
+bUg2NtA3Lf87siQp5HmvYb6eLzpd4iyt5xe+fMfxx0YkviWN5N0RJmZPeXZ9zfcoI8vIsmCIjFI5
+H2NkiHSN94MVX/9KzbFhrOkDG777fUVnsgaoUqpu/MLHyMZ7G0haUlhzBVzmlUMvnCMZGD/89wEd
+JmAOB/ADH7FcbDtkZknGSB8oLMUz+hCbwJYnzzp6bt/JLevvBHj1RZ7kLgZGXvG98mmnUHXLXmYB
+9gx15jcfYT/8Ps7dvMBxd1/TtldVgVXbBbWHLbBk2+s4z2e+KCa9ANCk3O9o3nudZWSMQs+aUdis
+pPN+xdBHYZ+kkDddV28+rOU0RcA+5zTGeykx1hyQjLFdnvcko5dohXRN2/Rb+U98SqDj804j5weM
+bFiTDDVHu3jem8PGIy10S4AqDRwm/GOeKBf/OAwW67bjxY77cEq3ksXQ3TNhIRQ6/uQHxcyBAYZa
+OwU58TRyUJAMXtjQMkS6lbjCimM9Id22krPlYPfwoxjgA7TWcumluOZGKAmCHgAt0G2KDrTyuITz
+SAFUw9GXvxTTffQrz9iOjgGQeUNU6OyY3Ig/Pkc+dJ4+7vEmXQ/ReUTac+5HPyif9mrz7r/vLNw9
+VGWRRR+YRWTpnhetVKIUFAWXXKX6uwwURAfCPfYEsBfQzrmFKTWRYk92JJCOnjFSWJXvfqsg9YDL
+UoGWd73N00ffUpNdpBNSImkdxVIYHEnP73+13Lxp58nP57AesO3i6wf6kqxK59uuztuu4svPatLN
+c1nmEzCBB2jWusc/dfSZvwvuHmHDJrJYeU/nSk2cFdKWfOHpIU8kSQUpJ0y88KIlGRQf2dK1uaKO
+hN2AvmBJEZZseNEXmEzTmNmOpsGu015QsJHYUpycowu8T7nJeRsYGcrFXW/9fQfw2u9QyBFZUjhi
+VQjJyoVICZGsGLc3H3vP8PAH1oAYzKZgjgAE7BtP+21e8iPLan5VxAr+E/ONJ++5u7/PlmGCEohI
+eMhGFgscsGQr1DPoj8UXVnDc3Wh3bUp6LtohueD6o8edHpBXHZQ5qPfh5RdJtLQc2Xqejv2ipGdN
+y7lKyJq8+cb+pkm+7OXLHV7YRIZWTojNgN/+hjzv+YtQZdZ1rbjLWtQA1+zLN76T99w2IEsyxkgX
+6WJDqcmxuoUfC+O4MXcoxuVJUC4O2w79JrBhJCvvSiErOkbWZ/0Oe7pl09VIyw9+fMW4/YztBpcq
+try0plUL+uhng5phAhpVwthTX9qyEwpywEA2JcnG0fuWAzV8+5vLqQP51U8uf4aGMTIs8ZvdiJf9
+iB/+CJOeV6YBHOCVmUc2190wf+jRfMP7eM8tsyxCS7pw7Du7MFa/sRWdZwgSra2Dt5RfEBFcqL20
+XKwYGGrGKKSl47bb+lseOgSaFBHg+qNl67Urxe1nbcXQ1wy0wTLWZUV6zt3ef9ijWyKVB0I6E7//
+pbbxvPFs6GuyZaY51hUXyoOOkGefzWLr8mfwDHFMP2OriEKWFf/5I/b4xw7RZbKO+bQfz2cxr1Ke
+9Gx+4wKyqJa0thhdTW/ppaWhSMPoKTH65XsiQ/BBxhFyVLRig1WkcLF57TklpoZrFDNYgL/zloqL
+K8XtZ23F0JdsaR+ewsrXJRf5kf9LvZkqjwA1qpNPoh/60ZI0jWfDgjWF1v7oH5gf4C+8lLFY7vhF
+qxRnSUsfxn2u1lPom23XuXNf7zfsZ4GWODc/ASbYCTT5Pvxfr+EVl5UsKJ7VkjBXIEOkbRgs25nB
+ctaMGaZkpAsMsW1T5LYruWZzQMY1PQeU6/aXG29aFebsiqG3bfwMLR81zrLh3M3VIY8hJh0gHQQY
+fuWrtWMQsg60rNpXN0Y+/+l80av6LH/BlY8TY/Gk86zHLLhWSiVE4S7+4DN89KMEKY0JQJkjAkx0
+BdXP9+Mfv43b76RzIbK2HNVc4qIweMuw/Dho2ZCLbAKjMI4YG0Z6F/7wNR5gmtbt8z7zt++hZ7UK
+84ndgb5hoGuaWBcS+4zCEd/y3hIz92kPhYc/UWZvIzkkaW2MDCx4zTVMZobXXNxn84vm27Ftv/Y1
+mxHLgmXDUljTehdsjJF05d3X7TrnD8K6A5l2PTIq0wAjhXoqc5geHvMk//nzObvQJrpDcpZSkZRW
+DmfZG2soJX1g7IdmQE8/4Le+VeczoxQRsEhk3RHh8u8NSA72Bm92QFIiY2OlDrHljUQuLu486cRo
+pmlQ5hgCfMdbOXvvgGRdWpJuUX7v93jiaSVHFd0vel+dYwxyP8ksy2gZhyxqxlZ/T8gBR/7Sb8hJ
+L1hMZxZhiom8mk6dQgHMKVBP3v3iU/mJD3PXvfRNTY7GtNPlY30dLaOlp5OFpvZseO0V9pnPd0A/
+1xZw6/cfve7t1vdJJ6uhwbhb0NtYNvPt3IqRXLSz9LzoMzJzCE33zhmwlxDr/bf+MXqh+D7JW27l
+AQfzR5fSF+Np1DIWl0IaLVktkRoC6cb/HPNrY2R0DDU/+Cb3oAcHTAq6rewBMzBHBZSbN4zOfBUv
+vJAhNuPwvHygEFpG7y0dA+kGO/jXf9lHhymoujFN60c+nMMhySosrIrq66pJERVkPPdN8zPwADsd
+B3X3A4/iVd/tk4yDcM5b+L9ew2ZuluQuLq86t2IbkLz+VvvqsxZ6XSZgryUIZqPemK7WTPX4urN4
+7w2Bfo5j8rjleASoSe8jKwq98D7uY8EP/u12NSGA16DGUO/PL//TLrJ05GjvyVP8fKsjt9/CBz3K
+AhZgOrGICX/iiWHhDrrRwns+JZdc0XBEX5B+FeuNsQVssIN///65o4610EzggD5UCc2844EhOrPH
+P7752w+xGdBbz9hQ3MixGcszDMiF6NpZWBjN8aKLbtl4WERGDfZQo8Pf/yNWA+fHOg/8BUnqL22r
+KKzbMJJf/zb3OXSYgp0e0WmA+oxXcW6rE3LIEV3DEfsLq+I1rdVsGsbSOrrIu7eHc1+/bbpHDeYb
+Gyi3pJzooUNvHx75CJ5/Ae/dJhxZumjdfXoWIgzkAud442X14SdEdKjhE1TI4otfwtuvaFixEkZW
+jHSr4DyrBn2g861HfOwjhUqdBg3qDBU69W++mrHfKi0WJMWzXDWd5poFq4YlLXknSQ741c/vPPoh
+TKaHwM4cgwmMl18MfCfZgYOHv3+Ou+PKkos1q9jKacbGkwMWvOvHtz7yBEEegaqLAMwe9Dhe9aOS
+g2ErcCyMtbWrUTtaPejHMpwMdPYPX1snsBpMjQBl2uEZr+L87QOyP8uC5KqwnFqrS9pIy9JJG8o5
+qnnD3f3fe/niscc59Dxymunq0C3lc57mz3o53/V+fu87sdzRzgoZyejp64IVb76xecSTA1KfoM7B
+bi7r1vETX6MrCrqWL22LhjEO/ltB70gGN6AtSXLEl76gAjzyotOqQIC/e2b/3psHpG34C2spK7Ml
+tR1HaRhdKxQSHAfc4b5xQXj563j2W+wXv9jfeQM5YFUMWAwolmRNjijSikU7XvathWMey3wjNban
+oMkt1oW/eQclsmzi+CeeLoyFRn9lW1UR9eD6dX9A0rK8/erR409mvn+/ixIoAJdl8ZRTeMe19G4V
+6+x9sm8rNiVDRWlEgkirp+LpPF1TsVlgnG1lEj2LVlmjJPssAmfJ0MzxiosWH3isQ68BYg6Xap9s
+tr/9R5RdA1IsKYy2YlULY7EyPv6ytnrQx6ELfsBIadqCfjXYGk95OpUazXSZJFVb4Tn6GH7tm7tW
+7axjrR0//kSDJevI2tPRR0oMwcXY1o4DA+kkxhGjb0nG2+nE3sU/+3OawwJMlWO0Bg4Q5PybPxfO
+UhgsF9p3q3aka1pJsb2ic/lLmiwZH/ZYJtMRKDIIYKHt5i3ln73et+ID1rNu6Buh83SFjOhIG53E
+hrFmcLQUx+Da8rvEJfZtMy7Dl6xdqwQmLoYmhrFiSO3abwj4glXB0rJsFRA8acV5+kDPO++ufvMP
+CnSjRgOwm1dAkW/mW9/JwfaSXEmDwYptz0M/f5M783els3kslmowh6TJN7sXv9x++dOFny24JH5W
+j1fOHQuyoXiG2JZ0aseKbJZkiCxjw/bZ/MdPB4zloyNLenrPQcPKB8Y+xwzpkq4m6ZvwiY/yMY8s
+gLpVCUlggeaQ40fvfx+rOXonZbO4GjF9Odvj0NdkVQ/4F3/JNQd4YDSJqEGd1AD3O4xvfovfdv1O
++gHHVZuazrf6cSFI2UgTxoJavhmvf8SG0qqmOWnlvqOIjWKXagyt6LorSBcYPRnDuCrXRNJFXvwD
+nv7yiCQAzOGBBiiAhYc+jJ/9LMXPk8PIQLcqdfnlbM9+q0REWgFvhqG98Iv1Ex9fANRgB9SwgAN4
+4GH843PkjmuH5Ij/JnHTagyVjJ7eumJJXNF7hlY1PYgPwZWsarqaztKH+9zec9E2EtvpRhuZGy7c
+wx9fWv3Gq3x33waIGSqtFrSuuopdLPzOb/H6H1oWzpGOJdmPBf2y6wq/uq0a9CI/P2lpJX4qYaCT
+W3/Cl/0m9dQ9QNGKYiUQDea533jY8Ow/4O3XWjaBLtC3ixwhUu4rOobxh6h4X2GzXvrCgF/6Zo8d
+17XbrHFIDunod/C7X+YLXmQx6YCYqcqkNjGhhwqo1x7Ic99EVsImtJWcpaXdPdrvsGoi6vcd52do
+YyWstmk3R/sVqG286EK893z1w+/54AhkGkFQAZ1uJ0u6/tST0wcdjsc9TB56bJlt0pjo1DABmAxQ
+OrStUUAiSJe+1C6E05BkzOBLIBSXaGN2zeOqG/HDy/Hd79mrLtO2n/aAkEI8ABuQI8MLX1C85ozJ
+x524qPXaCFhrsyZJOsbpaJWfSjqrgs7Psz0PfWnRSyEaAU0OhZC7GosLzYc+OPz0P87cfFuWotIl
+NHqEb9qWKe2n13ePPw5PeixOOM496DB9yAGJNUgSGO2gHDShUpgExkErRA1J4AwsZufi3fc0cwu9
+r//AXXoNLr+OGGbAqBscmQmm3dpCLVqi+9Djkt/7veylL7MmU5DM6ahhEgFi05S6M0kkdWlnJlZB
+Ofrn2p6H3mJHLgE8AAEVQ69TA1MBCDVuuHL08b+LX/j89KwDEQXS3ZDZAqQwamhClwjpmol8/32L
+p70wXz+d7r8vNq5FrwttoAyoYUeoCszN4c478dOtuOlW3HZ3qBc1aq3H3b8CGAEkE2joRh90OF75
+W/jtl4V9NijABEKnULAKHui0SlaQqCUA+R77Fvne+8pyaHxCA+qt98bPf330sc9O3PyTNIOHixFK
+YBQSgLJEBNZKEWT7mV8N6Fb3x+oagBKYpftQbZ+hSeoQdAp6ZFAeqUsmph764G1v/+NDHnws9lnv
+oFJkStDSRf7r6aF7DfpAJBEI8MqlecT8Tnzpn3d94Z82fecHpCdEa4oJlKgFSsELgPYzylpBBY2g
+ERUmEceaHGrMFqDARnSQQTskQAAOOkSe/FT3rGd2Tn4GXECvg1QFqAQGAQIyWZF80+rYXoPeLv3D
+RBiIMgiIAdL5yb/IjbfHH15lLrsON98WizkF6gxeAQIVoaV9CSAa1LCiINCiDFSCRCPRSACDdcSR
+R+DRj8XDT8BDHobDDxoluoDs61NocZpGGUMgMiDGxOQr6lRdDdt7AUd8qwZlAEXVJijUcBRlRCMm
+tsLWbbj0GlxyLW/bHucvZ9NgVGEwNHWAQLUhx/fQyd2aSbt2ym2ayQ86YPKwg7DvZvfqs10KC51A
+dakyp6AyAEjQanKngIoREBg0YAfZf3bFq2z/7aCHAhQCoRU0hIjtV1+wSFQVFgeysMjBEE2tQ1CQ
+cm0yMbMWmzZhZgZ5B1kS0yxCZwOgA2YQ1Y6x4yMD/+OhXy7gEDoNTKgh/yY8IAZNMv5MCigaIkoU
+lEAy8YCC0lAJoLgkBZXgToe8xkSDpIs8hwK8Qz3lJ/+bBJz/H8plTiusWjW+AAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_renault" model="fleet.vehicle.model.brand">
+      	<field name="name">Renault</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAg9klEQVR4nO1d63Mb5dV/9q5d3S3J
+l/gWHMckzsVO7Ng4CSEpZAgUmJAMDC1D6TCdduin/jX90Ol0oGWYgQzhklAgJQkkBJy0cYxvieN7
+LFuybEu2LK9WWu3u++H36pmNnZi3g2yZeTkfPGtptZfznD3P7/zOec4ylmWRn6UYwhb7Av7/ys+q
+L5r8rPqiyc+qL5r8rPqiyc+qL5r8rPqiyaZTva7r9n8Nw7D/a1mWmZe1IxLTNOmhVhxkkwizyUOq
+XC7HcRzDMA/bwbIsfGuaJsv+ryVls1lRFPFzhmE4jjNNM5fL4cNNIpvO6gkh2WxW0zSYKs/zsPSH
+7UxHherdsixBELLZLCGEPhwsy9IdNonwxb6AlZLL5QRBoAqF3nmeh/1C8Dl0ynGcYRgsy+LzTCbD
+cRzP8zzPE0Lo/oQQnuftT0bRZTM6HF3XFxcXl5aWeJ4XBCGXyxFCeJ63ux0rLyzLwudgI5fL4d9Q
+KCSKomVZhmHQR4fjuOLd1krZdFafzWZjsditW7ei0SjHcVBZJpORJGnFnjAa6tZ1XYe9q6oaj8er
+q6uPHTtWV1eHAWMYBjts/B09TDad6kVRlGU5m81mMplsNru0tOR0OgVBiMVi2IGqEpLJZOCgDMPA
+V5qmpVKpc+fOZTKZV155xe/3G4aBUcFGMW/PJptO9YSQSCQyNDTE83x1dbVhGE6nM5fLwUdDuaxN
+ADR5nhdFMZvNLi8vsyzrdDrPnDlz8+bN3bt3P/7443g+4HaKfG82KZrqMeNR6AITTqfTsiz/9a9/
+nZiYeP755z0ej67rHo9HkiTgFkEQeJ6H0rHN87yiKLque73epaWlr7/+ury8vLW1NZlM/v3vf790
+6VJ9fX0wGMTp7KpfA7BujBTT6oH8OI7TNE2SJNM0ZVk+f/782NjYoUOHGhsbE4mEz+eTZVkURZZl
+Ydo8z8N70G1ZlgkhuVwuEon4fL7m5mZBEBobG1taWvr7+69cuXLq1Ck8NDQI2AxSNKQFH8IwjGVZ
+oijqus6ybCwWe/fddx955JH29nZBECRJcrlcuq5DZVSgejwEwDYsy4bD4cnJydLSUlmWc7ncI488
+cuTIEULIxYsXh4eHSR53Fut+V0vRVC8IApyArusYAELImTNn4vH4oUOHJElaWlry+XwMwyiKAsMX
+RVEQBPF+gTkbhjE1NeXz+err64EmJUnauXPn4cOHo9HohQsX4vH45kH0kKJdDTw7IUQURTicwcHB
+c+fOPf3001VVVdls1uv1yrKs67rf73c4HBgAh8Mh5QXeBshyYmLCNM2GhgZZljVNwykCgcDRo0dr
+amquXbvW1dWFwS7W/a6Woqnesiyn04lwX5KkbDb7t7/9zeVyHThwQFEURVEA6hVFMU0ToJAKddwA
+lKqqTkxMhEIhTKeSJOm6bhiGIAj19fVPPPGEpmkXLlyIRqObyvCLdilQOiIdhmG+/PLLnp6eEydO
+wPlwHJfNZlmW9fl8gDHwNtThCIKAMTBNc2ZmRpbl2tpaQgiAJlWxoihtbW379u0bHR29dOnS0tJS
+se53tRRN9ZIkIRriOC4ej3/00Uc1NTUtLS0ej8cwDMuyfD4fx3G6rjudTvyEuV8IIZZlaZo2MzNT
+Xl7udDp1Xed5HlGrIAipVMo0zVAo1NHR4Xa7r169Oj09Xaz7XS1FUD24gWw2C27ANM3z58/39vae
+Pn1aFEU6SRJCRFHkOC6TyTidTmgTQwUaOZPJsCw7OjpaUlISCoVI/hkC7YM4AOFVR0fH/v37p6am
+Ll26tLi4aJomot+Nv3e7FM3qwSMSQsbGxj744IOnnnrK7/cDYlK8iA3YOHA9dTKEEIfDsbCwwLKs
+1+t1OByEEOxGCAGIxF/TNF0uV2tr67Zt227cuDE6OprJZHANNMIqSpRbNNVDp5lM5oMPPkgkEs88
+84wsy+l0GrAddo0BgLqB5fE5TT/FYjFJkvx+P1wTzYpQvoEQYlkWz/NNTU0HDhyIxWKXLl2an58n
++YeviNRCMUMqhmG6urq++OKL06dP+/3+TCYD5dqRDLV0bBBCgHYMw4jH45qmeb1e4MuHAUfsrChK
+U1PTvn37vv32297e3lwuBxaaYRg6VBssxXQ4c3NzZ8+eLSsrO378+OLiIuAmDBzqtm/TQBRWnM1m
+5+fnvV6vz+cDg0Z3oH6cuiZkB2tqan7xi19YlnX58uWhoSFiI0GLooFi4twrV6589913J0+ehDad
+TicIA+iaunh7bhZ7EkLgmkpLSzGpIoULHwJ4Ck9COUuO49xu97Zt29rb2+/evXvt2jUaeRVryi2a
+6u/du/f555/X19fv2rUrmUxinqRZQLvq7Uk+jE0ymZybm0OUS/KzK4WbhBAMA7FZNP71+XxHjhwp
+Ly+/efPm999/j/wX+f82zX733Xf9/f2nT59G2Klp2tLSEjClXdfkfocAHc3Ozsbjca/Xm81m4bXB
+xVPt059gA3l2Qojb7d66dWtTU1M0Gr116xZUjyhs4+48L+uuetAAhBDDMBBMWpaVSCTeeeedJ554
+oqSkRNf1XC6nKAq1UwAPcJPw9aIowmsj2jp37tyf//xnTdMo1oRmKSS1k5RgRmVZxhFCoVBra2tj
+Y+Ply5f7+/uRUsd14lJxPfjtujqidVc9nDUAu9vtTqfTLMu+/fbbmqa1tLQ4HA6EoOl02u12A3Gv
+sHqIZVnpdFqSpOHh4XPnzr3//vvvvfcey7IAPA6HA6PCMEwul1udyKXCMEx1dfW2bdsEQbh69Wok
+EqHeBpeKDAz9ZH20QsjGOBxoBLYsy/Lg4ODZs2cff/zx+vp66NrhcFC/QS13hSCXYhjGJ598MjY2
+Rgh5//33Y7EY6kToicgPmSrP86Wlpc3NzbW1td98801fXx8uDFa/+rLXSykbo/psNovYFYp+++23
+FUU5duxYOp0GMoG7N00T/PtqX4+Rczqdvb297733Xm1t7fHjx7/++uuzZ88iwspkMvQngiCsPW0y
+DFNXV9fa2qrr+vXr1+fm5igcAuWJ3dZ77t0IXw+9wy3cuHHj4sWLTz75pGEYyWQSuk6n0whwQAKv
+httw37lc7tNPP41EIkePHm1razMM48yZM2NjY7Isw8/A78MLPex6UKvj8Xh27969b9++3t7ef//7
+3zAOGrLRPddVM+uuevhiVVWRkHrrrbf8fv/+/fuz2SwyeRgSwEqaCCSr7lyW5e7u7vPnzzc3Nx85
+cqSmpqajo6Orq+uTTz5BMSXcDg6yho/OZrNIK4ZCoSNHjjAM8/XXX09OTuJbe+Hb6msorKy76mFK
+giAYhvHFF1/09/cfP35clmWXy4UPGYahVairS8zodjqd/vDDDxOJxIkTJwKBgMfjaW9vz2Qy7777
+bldXFyEEB6ElaWtcD4ZHUZSdO3d2dHSMj49/9913iUQCO9h/+9P29SzLLi8vS5KUTqfff/99t9vd
+1taG8qZ0Ou10Ok3TxA4M84AqRFrgd+vWrS+//LKhoeHgwYOAQzt27Ni9e/eNGzeuXr2aTqcR1v4g
+IUOnZVEUEWFZlnXz5s1YLIaEJbEVya6rFFj19ium24B6Fy9e7Ovre+GFF6BKnucdDgcs1OFwMPnk
+lK7rKFAgeWIZyrpw4YJlWa+99prL5WIYRlEUv9//xBNPKIryl7/8ZXBwkOQfGjpnrlAfdWU01lUU
+ZcuWLb/85S9BLeCkmC3WZhcKMjCFVD2Q9erPTdOcnZ197733tm/fXllZqaqqLMuWTcj9NwOkL4pi
+Op1G0NTV1XX9+vX29vaDBw+WlpYizvL5fA0NDdu3bw+Hwx9++CHWMtCStIddJB4LlmXxiAQCgbq6
+uurq6hs3bvT398MU8PP1LsYvmOpxS3bOBNpE2ujy5ct9fX0HDx4MBAKGYSCLtFr7uHOkn/BbVIV8
++eWXqqqeOHGisrKSnsLhcFRUVLS1taXT6TNnzvT392PyIGtCexozI6suSdL27dvb29sjkcj333+/
+tLTEcdwPRrMFmQMKpnoaChGb3jEeiUTizJkzu3fv3rFjRzqddjgcNE8EsY8BlIIgAHnBnp6erq6u
+lpaW/fv3Y39K9UiStHfv3vr6+pGRkTNnztgvZo3rhEIFQcCpg8FgW1tbbW3twMDA7du36c/h8Vc7
+rkJJ4adZy7aKAymO8+fPDw8PP/7445IkLS4uIline664Mcuy8K2u6z6fL5FIXLp0KZlMHj58OBQK
+mabp8Xi8Xi88ksPhKCsr6+joYBjmk08+6e7uBgewhurtlDLOIopidXV1W1vb9PT0lStX5ubmMMdg
+QnrgRRZECulwHhiOR6PRd955p6GhoaqqCrUCqqpCuQ/MVNBqDiixp6enu7u7tra2paWFQk9JkpAx
+R8Hlnj17KioqxsbG3n333RWr4B4oSCLi1DgLz/Otra0VFRV37969ffs2ODXA4p+G1dOrZPLryjRN
+O3v27MzMzOHDh1H9ASpmjWkQBwGpMDU1deXKlUwmc+zYMZTZ0K8kSQLtI8tyVVXV/v37WZY9f/58
+Z2cnWdMXW7ZlbzQJw/N8TU3N0aNHc7lcZ2cnrRmxT0IFH4DC+3p629lsVlXVzz77rK6urra2FgAf
+5cQrfmunySzLolmniYmJnp4ej8fz2GOPEUIogHG73UDxKA70er379u0TRXF8fBxDtcZ1wtHT7Apw
+jsPhYFm2qamJ5/nu7u7x8XEcZO1D/UgpsNXT4lNCiCAIH3zwwdDQ0PHjxx0Oh6qqyKOCELdPrZQr
+h8DhcBz32WefpVKpY8eO1dTUgGLDwHAch2CY4vRt27bt27eP4zga3NJJG/oFUUHuT9jSjK5pmoIg
+BIPBU6dOaZqG2YUQgtVYFIzS2yyIugoMLkneoHK5XDwe/+yzz5qbm0tKSoDkAPxhbg/DDzzPa5oG
+xmZ4eLi0tBQWTWMlnAXlUFhu6Pf7/X7/zp07PR5POBw+d+6cpmlUU4CqgiCgWuRh1w8qqbq6urGx
+MRKJ/Oc//8Fv6U9oIFao/EmBEQ41Xthsf39/a2ury+XKZrM0lUH1bo/XV4BLQsi1a9ei0eiePXua
+mpoIIVgTQj21JEmKoqBwUxAERVH27t1bWVmZTqc///zzgYEBWv9NKUmSd/QPFJyisrLywIEDqqp2
+dnZiCSO9HlxAAWuVC+nr7dUAiUTirbfeamhoqKioMAwDGTt4akIINUmI3edkMhlRFEdGRvr6+oLB
+4MGDB5G5JbZoiBAiiiL4H/gTQkhZWdmOHTuCweDk5OTHH39M8qXI0Dsiux+8BUVRduzYUVVVde/e
+vd7eXqp6emoKigqgsYIchQo8siAIH3/88cTExLFjx1DADchotyD7vEqdD93tq6++ikQiTU1Ne/bs
+IbaYnlo9x3GKotAiZGCe5ubmLVu2aJr26aef9vb2Ui9P8q0XfpBZ4zguGAzu27fPNM1//etfiUSC
+yVe0ERsLVBDbL6Tq6Qw2MzPzj3/8o7m5uaqqij4NhBDACZJnbqlB2c3K4/Fg3awkSU1NTR6PB+lc
+skpxkiQh2S0IAiBKQ0NDbW2tKIqjo6NffPEFkrS0hJ+sOUPSsZEkadeuXdXV1Xfu3Ll9+zbcPZwk
+9iyU2ykwwkFd2Llz52KxWFtbWzabpSm3XC6Hbcqy2UMwJl/Qms1mv/3221QqBU6Y2MA1a+uCQAih
+VVMoTRAEweVy7dmzZ8uWLbqunz9/vqenh+SfmBWWu1rw5GFC3rJlS0tLiyzLnZ2dc3NzxBYer6h0
++zFSSNVrmsay7Pz8/Mcff7x169aSkpJMJqNpGjSey+WgdGzjHuyzK6LT6enpq1eviqK4c+fOrVu3
+EkIURSGrDBbUriRJgK2EEGCYhoaGysrKbDZ77dq1r776CiQofI61ZpobCQOGYURRVBTl0UcfLSsr
+6+npicfjeCDoBVCq6kdKIUt/8Pj39vZ+8803zz///NjYmGEYsiyDJQZCAEzEjIf6dzgfVKSWlpam
+0+mSkhKfz3f48GGGYeg6fNgdm++IQAgxDMPr9aIoQdd1sHJwF6qqZjKZb7/99sknnwwEAmBA6XJy
+CHXcEARW6XTasiyn0zk5Odne3n758mXYE8mn20jhUlcFUz3MkGVZv9+/ZcuWr7766sCBA6jo03Ud
+FU6YhImNXCN5V4NIyu12v/TSS/X19Uy+khuVCpZlrX7G8XOHw7G8vIxF+Djmrl27HnvsMa/X+/nn
+n1+4cAEVVNjBsixaorMCWcqyvLy87HK5wJguLCw8+uijhw4dCgQClMyhO6/9AP0fpfDM5fbt20+e
+PDk7O5tIJMD8ITq1WxncJS1rhYclhKiqGo1G6+rqWJYdHx9XVZX6JbKKW4aPcjqdOKyu6+l0em5u
+Tpbl/fv3a5pmWVYqlbLydVGoQeNsa27pClCsR2RZNpvN+v3+sbGxUCjkcDhaWlrKysrIqjCqIFFV
+IXE9XKrP5zt16lR9fX04HAbZQk2YlrQjHYF5j86Z0H53d3dJSQnP8+Pj48B2tLnNCsGhXC4XtWhQ
+FLIsz87OXr58WVGURx55BEdD2AVQpCiK0+l0uVz463a73W63oiiBQMDn83k8HrfbjXAE+xCbmdtj
+ix+rsR9/CLvAQvfu3fvcc89Fo9GFhQVJkqBoOA2K66F3SioQQmCGU1NTsVisvLw8lUrduXPHMAw6
+G5MH3TNWeuq6ns1mU6kUTPvWrVuGYZSUlORyuUQiAY6TlmaS+70N5hsEH4qijI6O1tbWWpbl8Xhc
+LhexoXh6GZsL4dB1GqDjT506VVNTg5XE1NgZW86aTptw9HZCEYbvdDpv376dTCYBkCjAsFsfIcQ0
+TbfbbZqmqqoLCwuWZS0uLt6+fbu2thaL/LHiB3QpluPyeaHLV0A+l5aWwro9Ho+iKB6Px+l0YuyZ
+dVgEUXirx+Pf2Nj43HPPzc/PLywsEEIcDgeQDAA4hsGepMU2lmpGo9GlpaXy8nJVVcfHx1F/anfx
+5P4cJNz90tIS0EgkEkEKBZAGlbDweE6nkzp62meELkyUZXlubq6srIxhGLfbjdw9k6eXqb0XisYp
+mOrhjpFoZlnW6XSePn3a5/NFIhGw3oZh4KHGNnXftLiXycfohmEMDQ2hQgTrnjBC9tPR+RZkDojS
+VCqVTqcnJyexqh+2DKpZlmV0OFoBbCCwdMxVsiwHg0GWZeGvaB5itdv5kVJIq0f+iOQBQGNj48sv
+vzwyMoJvFxcX8ZhDj7TSD40/oHEUB0qSNDQ0pKrqtm3bRkZGhoeHaQUy/SGmDTwuqqpqmhaJRERR
+nJycNE1zy5YtIBjgxxFMsCyLZeZYl+vIC3YLhUIjIyOhUMjn8xmGAWBDz0Js/p1bs/nj/10Kpno8
+3VANVO90Op999tnq6urBwUFRFL1eL6AOjZIgK26DFuZNTk5allVaWjo2NobRgs/F44LZAoORSqVG
+RkY0TdM0zTTNUChEOSIaJFPHgg0m39mFEOJwOPx+fzQaRdcLQRAAzMhPqL6eAga6CKStre2ll16K
+RCKzs7NYCU5sjbBWKJ2xNdfiOG5yclJV1crKytHR0ampKbvDpZaIjVgsNjIyout6Mpk0TRO5MDa/
++nAFikebHXg5IHqXy6UoSjQadTqdaD6CZjAFpOYfKAVTPX0eKcUB63711Vfr6uqGhoaohxFF0Z79
+sQud03iez2Qys7OzgNU9PT0UZtgLwQkhy8vLg4ODc3Nzpmmm02lFUWDaVO8QOq/SMArbADPAUYqi
+OBwOiuXXWwrs6wHFSH5xDCGkoaHhxRdfTCQS8XicdkVc/SDbRwIWLYpiOBxOJpPV1dWjo6ORSISs
+WmjJMMzMzEx3d/fy8jKyMRUVFSzLIs5aIfYnAL2NHA6Hx+OxLGt6ehoZdkVRgOVJvmKngPpZIYVP
+i9PyLsxRHMe9+OKLVVVV4+PjINCBgvCT1WADgtx3IpEIh8N4/AcGBsBQIhwD7DMMY2xsbHR0FNgR
+K5hx0tWqx9MAk4djwQgtLi6qqlpSUgK9owgXz9a6+pxCpsXp1E9VCY3s2rXr17/+taZps7Oz8ANr
++Hqk9HDbkiSFw+HZ2dmysrLR0VG0uuTynXQJIeFw+ObNm2hS4fF4ysvLAQepEVBLp1wN3UAVSSaT
+mZmZ8fl8SPZ6vV4u325h9RUWVgrJ4ZC8rqlP4HleVVWe53/729+WlpbGYjG4BU3THnZXoNsQl3k8
+nkQiMT4+HggEFhcXFxcX6YRBCDFN8969e11dXaqqchzn9/uDwSBWGSJKoPyo3d3TBwK8PGJgxLEY
+GFw/DbYLpZ8HaKywh6NE/P8enWUVRUmn05WVlW+++WYkEkGoqSgKk1++g0CGzRcYo9CVlhG4XK6p
+qal4PL59+/br168nk0kr3yFweXm5s7NzfHyc47iampqSkhLU0iK8AIaRZdnpdCLK43keEynCK9RJ
+RCKRYDDI87zL5fL7/SS/zpbSpQ9ziT9e1n1VCW05dOrUqdbW1unpadM0gf2ZfDsEK5+ZIzaKhma0
+M5kMSNBcLjc4OMjkm+kODAx0dnaqqhoIBPx+P3wUIliEUXbqAqETeAWHw+F2uxmGicfjc3NzgUAA
+C9soL08j2J/MNPtAQQGXZVmhUOjVV1/VNA2uGd9S8oDc78RpfIsgYHp6WtM0BJxY75DJZL755pvu
+7m5Jkurq6kpLS6mLAElJ+6NxHAfPDlQjy7Lb7cZ49PX1uVwu1LKhyRqdwHF5P23V02S0rusnT558
+8skn79y5Q3tA21kEkp+rMVSwWRisruvff/+91+tNJBI9PT08zw8PD1+9enV+fr6qqqqyshLrN0EJ
+UB7YDm8oU49UJcMw4XB4YWGhoqICATCtO1/B7ayfZjZC9dAmAvTXX389l8vNzMzAIVB7p8Qkm68y
+w4eGYQCQhMPhpaUlr9d7/fp1VVX7+voGBgb8fn99fb2iKHTVOXKBGAne1nwXQwi/DyIPteM8z3u9
+XmTeaRcdevE/bdXzPA/CHS6+ubn5mWeeGRsbQ8ttLt/hifIt+JWVr24E2ckwjNPpDIfDoVBoenr6
+o48++uc//zk7O9vY2FhXVwdPxdk6dOGwq2NXigKGhoYsy0JbF8yuyJpRd7eurgayEQv1U6kUBkAQ
+BK/X+/rrr/t8vomJCax0sN8kzJzNVzdSoga2H41GE4lEKBT66KOPLl686HK5du7c6fV6rXyTb5qa
+p59A75haaU4mmUyOj4/X1NQgE+tyuVYz0vZJaJ1kI1QPswItI4piR0fHs88+Gw6HweTYS6OQMKFg
+DoZMw2Nd1+/du9fS0qKqqqqqjY2NW7duRYME2DsqHsA+CvkepPgEZTbgMEZHRwFwOVsfEPb+ZkaQ
+n7zq8SwDaRBCstnsn/70J7/fHw6HNU3j8wlxylzaMTXNh4CSROKlvb3d7/fv3bsXa0vg2eHc6YtN
+YPIulwtYEx7P4XDMzs7euXMnFAotLy8Hg0EkFymNTGwdG0k+/7NOshGqpwwB8AySpb/73e/C4XA2
+m3U6nZlMBg2jVxTdUwO0LMvhcMDbDA4OGobx6KOPlpeXgxyliRT4FhpPAdeCroEL0nW9v78/FAo5
+nU632w3aYL3J4YfJRqie1ttApwhxX3nllerq6qGhIVgZFiNYDxfaTWFqampiYqKtrQ2Nz6ijYPPv
+FqBsAXX3Vr6CCuUOfr9fkqRgMEiPUKjVCv+VbFzvMza/KBBSWlr6xz/+MRaLTU9Pu1yudDqNUg67
+uoktB4vSMMMw5ubmkskkbQVLKwaop2bzTTF5ngfzns1mUZAyNDQUCoVwGSUlJZhd1pWoWUshG3oy
+loUrxz2/8sorhw4dGhgYyGQyYHXsWlgxBoQQjuOSyeT8/HxNTc3y8jLQEaZl3rZ0BJMK2DE0a8Gy
+xbGxsWQyGQwGEdOCc94Amuyh2tiY09CELSHEjrvffPNNKAX4T1XVBwJqzBC6ro+Ojnq93rKyMrhv
+ejSad+XzS5lBkFn5jO78/Pzo6CjYfKy9IvnuNyvKYDdMNm60VxAjLMum0+mjR4+ePHlyenp6fn6e
+eXiPWzwQ8Xh8aWkJC2iBbVhbA9IVvh61JAgIDMOYnJw0DCMQCIiiSCui6A83IIBaLRvE4fD5dv6W
+bUkG2MQ33niDYZjp6WnDMFYnRe1OHNGsw+HgeR61tMTWaIKmwpl8IyisJyGERKPRWCzm8/kEQSgp
+KcFgQN2ILYoCcjaiFZH9XyZfzYFqJFVV9+zZ8/vf/54Wt9JoFrEuAi7kYBmGKSsr4/LvE8AR7Hko
+WusBfEnyA4+mIW63G/U2dsKArjlZP17+oZrZsDOtEAwAprsTJ050dHT09PRAy9QMwQ+LoqhpGoh1
+7E8IwSIeYqtAsQuGBOsdhoeHNU3zeDww+WLd72opZv96mu3bs2fPyy+/bBhGNBqFvaPoF8lxlmUX
+FhZ0XUfzaJqwRh3n6tw35XPQze7OnTsIa51OJ2bXTSLF7OQNb5tKpQghTz311NNPP3337l0MRiaT
+QfxJAWV5eTkGA6+PAXyk8yoF8vgEL87jOG5wcDCdToOOdzqd693Y6b+SYr4cCdQNMGUwGHzttddk
+WQ6Hw+CQFxcXAWOi0SjDMBUVFWhJyuR7ecD84WGIrSkChTrJZHJ0dDQYDDqdTpThFwXJPEyK+Uow
+kl/EDc9+6NChX/3qV3fu3FlcXPT5fHDZCwsLqqpWV1cLgkBdv5Vv7UXBz4rgCzIwMGBZFmZmwJti
+3OhDpWiqt6/mQeaIEPKb3/ymsbERha5erzeVSsXj8ZKSkoqKCrQGRbkkplZaGg4zp1EVpodwOByN
+RkHU+P1++o6xYt3vainmu0oIIYDY8OmqqlZVVf3hD3+Ix+OxWIzjuIWFBU3TysrKgNyRwrby5Qvw
+3fbCVUwAOBpqF1D6GgwGcdKfVU+IrRkrTcZi2e0LL7zw1FNP3b17d2ZmZmZmJhAIeL3eeDwOyhcd
+RgghKNfJZDKYAAghyJkQQpLJZH9///z8PDqlV1VVmflGJBSPFuuu7VLktyyvSAwh4HrjjTeGh4e7
+urpQAHLt2rVAIDAxMUGDVS7/vlkKJZH/I4RIkoQXYjc2NmLBCQJpqB79c1acvViyvlU+/5VQOsww
+jL6+vs7OTtThOBwOvEvDHm3S4JO+t5bk5w+PxxMMBqF6FAEiGqAVTqTYSodsItVD8I5rpJ/WbmJD
+Ey/417S1T8eUgG5SUDoqf0iR+OEHyma5Dir2d10AvK/oW7RC6Mosy/ZuHjPfPdd+KBoBbBLZRFZP
+01Iw3lQq5fV68RVa+xObo1jhMSxbzwor/+4q+1doEcLc30CtuPI/3eUBpLzO0YYAAAAASUVORK5C
+YII=
+
+      	</field>
+      </record>
+      <record id="brand_rolls-royce" model="fleet.vehicle.model.brand">
+      	<field name="name">Rolls-Royce</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAi70lEQVR4nO1de3AUVfa+PdMz3fPM
+TCaPISEhJBvDYw2mAMGsq1ICLi9RRBd13RWWtahI4sqKriARtbRgWVe03BVfCOpaCwJCyWMNIAiK
+SgiGEGB5JUA272QmM9Pz6J6e7t8fX82tNuBW7WM6JT/vH6lJz/RM97mnz/nOd849l1FVlfwwBmIY
+BvoC/v+OH0Q/YOMH0Q/Y+EH0AzZ+EP2AjR9EP2DjB9EP2GBT/QOqqqqqajAYCCGKohgMhkQiwTCM
+LMuEkHg8nkgkeJ6XZTkWi9lsNlEU8XlFUeLxuMlkYllWkiSWZXEKy7KiKBoMBovFEgwGOY7DcXwt
+TjQajfgXP6GqqslkUlVVURRVVePxOC5DluWMjAyr1cqyrMFgwM/hmhmGwdWmTjKMDiEV7oS+liQp
+Go329fU5HA5ZliELo9HI83wkEjEYDLIsMwxDbx5CwZFYLKYoCuYDJ8qyzHGcoiiEEFmWE4mE0WjE
+ZOAgflRRFPwWrkSSpHg8znGc3++PRCKlpaVDhw5lWZYQIooix3Hk20qTipFyrSeEQA3xAvfs9/uj
+0eiFCxckSXI4HJIkMQxjMpnoE2A0Gk0mk8FgYBhGVVVoKM/zHMdhSiBlVVVZlsVnrFarqqrRaJTj
+OIgYuozPq6pqNBrxtLEsi3OtVqvZbO7u7j548GAgEBg5cqTFYqGyTiQSmIwUDT20HppICIlEIsFg
+UBTFM2fO7N69u6GhwefzQbIWi0UQBLvdLkkSzsKFQXwQnCiKmB5RFI1GI8uyRqMRuokHBcI1Go3a
+x4UQAkMEieO3YLIkSRo7duyCBQssFkt9ff2YMWPy8/MxbXgQU2pw9NB6egOKogiC0N3d/cUXX7z+
++usTJ04sKSmBhbFYLJIkUcVnGEaSJDwukCzHcaIo4uHAF0JGiUTCYDDwPC9JEh6CaDRKjXUikbDb
+7fRgPB43m81mszkSiTgcjt7e3j179pw4cWLdunWFhYXwCjgXRj+l5l4ngwO9g9TC4fCxY8dKS0uX
+LFni8XioBzabzRCQ2WyGj2VZ1mw2wzorimKxWKLRKPWiZrMZ1iYcDptMJjhSPGEZGRmhUAjzZ7FY
+ZFkWBCEtLc1iscRiMZxuNBo5jlu/fv2iRYs6Ojry8/N7e3sha+oSZFk2m80pEoseoseAATEajUaj
+MRAIeL1eh8MRj8cFQcCURKNRGBxRFCFZi8USj8chbkmSnE4ny7LwxizLWiyW5uZmp9PpcDhisRiM
+EiHEYDCcP3/eZDK5XC5ZloPBIOAQwzBtbW2BQMDpdGZlZcXjcUmSBg8ezLJsIBAIhUJ9fX34BqAj
+4KLUCUQP0eN+VFUVRRE2FHAFOrVly5ZPP/2UYRiXyzV79uyf/OQniqJA33t6ej777LOamprz58/L
+slxUVDR16tSpU6eyLMuybEtLy+rVq8vKyu69916n0ykIAh6IEydOrFixYsmSJTzPA2tarVZRFHfu
+3Pn666/39PRkZmbedtttc+fOdTgcUH/4Z1EUccFwzvAfqROLfiEVgBruCobYZrOpqnr06FGDwfDr
+X/+6sLDwiSee2L59u8ViYVlWUZTVq1evXLkyNzf3t7/97dKlSwsLC1evXv3EE08Eg0GHw8Hz/Ndf
+f93U1ET9BMMweCYOHz4cDAbtdjsQC8Mwly5dqqqqGjdu3MqVK8eMGXP48OH29naTySTLMgBVJBIJ
+h8O4VEg8pfCG6GlwqAZR0YuiaLfb7XZ7Tk7OrFmzpk+fXl9fv2/fvjlz5pjN5tWrV2/cuHHNmjXT
+pk1DBDR79uwxY8ZAghUVFYCPEJDJZAL2B27BC0JINBqF7jc0NLAsW1FR4fV6J0+efPHixaysLEEQ
+EE/pJgTt0JVIAH4AaOM4juO4eDwei8VEUYzFYmfOnLl06VJmZqbFYgmFQp9//vn48eOnTJkiy3Jf
+X19nZ6coinPmzLnttts++uij7u5up9MJ30stmMVisdvtJpOJ53lYEnhUk8lUVlY2ePDghx56qK6u
+jhCSl5cXj8ftdju8aCKR0FMOGPqJnmo98LgkSZgDu92+a9eu+++//5577rnlllt+//vfA+d0dHSU
+lZUBpBNCcnJyIpGIoigzZsw4ffp0IBDANwDjG41Gs9kMX40Q1+l0wlEDOJWWlj766KOCINxxxx2L
+Fi2SZdlutycSCXwnfoKGOPokTXV91qD12jDVaDS6XK7i4uKRI0cKgpCVlWW1WgETTSaT3+8HY2O3
+26PRqNVqtVgsPT09sBI8zwOSsiwbCoVYlgXEdDgcBoNBEIREIgEfEI/Hw+Hw3XffXVpa+uqrr374
+4YcMwzz11FNut5tlWXBH/cQNfKmlQP7nQyet194YtB5KyjBMe3v7mDFjXnjhherq6rfffnvNmjUZ
+GRnhcLikpOT48eN+v9/lcgHjcxzX1tb21ltvlZeXZ2Zm2mw2CJdhGIfDYbVaEUOBZkhLS4PjVVU1
+PT0dJqWkpOSVV16prKx8++23z549C0RktVoDgcAVLzWlQ2/SmNr6WCzGsqzL5VJVNRQKqao6YcKE
+3/zmNxs2bPjyyy+Li4vnz5/f0tLy3HPPdXZ22u329PT0f/7zny+99FJra+ucOXMyMjJ8Ph/Lslar
+FUQY3AZIHoZhBEEQRdHpdJpMJlEU9+7du2nTJgR3Xq8XMbDBYAgGg5Ik2Ww2neVA9Dc4JIlwEEzC
+1OJgIpF49NFHz58///DDD7/33nsTJ05ct27dkiVLJkyYMHz4cFEUOzo6wuHw2rVrb7nlFkIIXOib
+b775zTffdHV1WSyW22+/vbKyUlVVQRCqq6vT0tICgUBeXt5LL70kiuKTTz65Zs0ap9NZW1v74IMP
+FhcXy7LscDjAa+opBwy9cZWiKOB4zWaz0WgMh8O33347mANZll0u16JFi7Zv397V1TV8+PAbb7zx
+nXfe+fDDD8+dO2cwGMaMGfPzn/+8tLQ0HA4jOqusrGxsbDQYDDk5OYSQIUOGGAyGQYMGVVRURKNR
+QkgoFAJNdPfdd3Mct2PHDr/fX1FRUVFRkZaWhvhOlmVQmDDrKQ2jtEMnvp4QwjBMMBjs6OjgOO7R
+Rx9lWfatt95CNARnCPaG47hAIGC320VRVBQF1ALmhhACrk0URZiISCRitVqRSAErCcaYECKKosVi
+IYTEYjGe53EZ4IGBO6PRqMViOXDgwMyZMzds2JCRkdHa2jpjxox+V566mdBb6yl/a7fbBUEAlQjV
+A28cCATcbjfkyDBMKBSCNxZF0Ww2Yz7AguGIIAiwG2A9e3p6DAaD2+0mhCDxkkgkQE3DsQuCwHEc
+plOSJATGNBWjpyj0SBBq/4WVNxqNu3fvDoVCwWAQmgXCBOkhGBNgRzwQlK1E+gnMDChiQBpgGyBO
+5Bp5no9Go+CTacJEFEXgq1gsRggBe9PT0+N2u69C0ZPLrCekP3z48FtvvRVgHMclSTIYDHgCAFRi
+sRhwCIgtmgzRihs5E0osA7pgSmiGiyRNB74cKAtvtbW1IUCz2Wza68TnUzoZKRe9NitLExEGgyE/
+P3/BggV4i5pjZO9wkAb3IJBpqotyjdovpzkNmhynX0VPRDYcH6Mn7t+/f+3atYgArkKtpwOiJ0mL
+jzjearVCr5uammCLCCGgB+CEkdLr6+uDC4XxQVAGE2+32xVFiUajxuQAvMHPwWrhQUFkCwuWSCQc
+DkckEgmFQhC9nqIgA4Lr6V84TCC8SCSyYsWKI0eOgFmj/C1gqCAISAHC4MAQuVwuq9U6atSoadOm
+3XDDDQhZI5EI5GgymZA/gRungS6sEHwGIYTneZvNFovFrlqt1yZLOY6jXCMtm+E47oEHHvjiiy9g
+TABOIpEIjXd6enoIIcjQYg5Qx1FXV/fhhx96vd45c+ZUVVU5HA6/3+92uxHiQqbRaNRmsyHZi6dN
+659hiPSRg3YMDFVNCIEmYqiqarFYsrKyBg0a1NPTw3Ecy7LXXnut1+tFKoPOHCYPB/v6+rq7u48f
+Px6NRi9evLhy5cr9+/evXr165MiRgUAAgQItQhEEgRCCDAxJRtTa66HGULcxMKIHjqTUIMQBCozj
+OOQ37rnnnhkzZlzuXanIYF4OHDjw1FNPNTQ02Gy22traOXPmvP/++6NGjUKCFw8NwgKXywV/cDni
+wpXoLISUP2j9oAhJ+liSrFRAHRkNQQFCEomE1WolhITDYVmWW1tb+/r6+vr6/H5/X19fW1ub3+8P
+BoPxeHzSpEkvvvji2LFjYUBOnz79/PPPd3Z2IiULcs1sNlutVqPRiLIc7egHwFItDe0YGPoMxUnQ
+SmpnYfc5jgPXCHDpdDqbmpqWLVt27tw5zBMiI5IkFWKx2JQpU+bOnbt48WJ8844dO0aNGuV2u0+e
+PHnfffeVlZVBvoFAwGw29xOxNj2iPY5Trga+ng4aqiAUojdMQ55AIIAJAJJRVbWgoKCoqKipqeni
+xYvNzc3Hjx9vaWlpbGysr69vbGz8xz/+8ec//7murq68vDwYDHo8HkmStm7d6na733///enTp991
+1107d+7EM0TDNxpkaF9f/VpPCIH+ms1mCJdJlkUSQlCCiYAIVcQmk2nQoEFg1pDVuueee5DqAqsT
+j8dLS0t3797N83w4HHa73efPn2dZdtiwYYcPH961a1ddXV1PT8/8+fPxc1opq98eekpjwNwsoB7M
+PXV9TLLwCIyCqqrgcGw2GwJaSZJyc3MrKioyMzNJ0vciSmpvb4/FYk6nE7zQhg0b7r///nPnziEl
+sGDBgtbW1iVLllBEf/kc6CyElBscajQB9YDrIXFalAqjTz+Js7SEGth8UOqRSIQQAupYlmWUWhJC
+XC6X2WwOh8PI3J49e3bOnDnz5s1DZMvz/KpVq44ePQoWGvBU+3P0e8i3n87USUbvYpB+L/6bL8Gg
+wB8IFQ8HIaS3tzeRSNx3330333xzMBjEwT/96U9dXV0OhwNJSlDT+MLL6xJSPXQS/f8Ew13xRPhq
+5GFwhJoUn8933XXXTZkyRU3Wi3/00Ue7d++mFWeEEBS3yrJMg7v/7Nr+gzEAJVD/8bnkMiyoaqjd
+pqYmKDI8h9PpxPGSkhKe56HmsizX1NTAUoHEp7WIkLueznYARP+/vTeEvrIsNzQ0IEQAzzN48ODB
+gwerqur1ekFnYl1Kc3MzCH0toYZ/dfa0elef/ffSv/x0g8Fw9uzZM2fOMMl1a4lEYtKkSchBoqaK
+JH11Z2enIAi0qA3WRlv4p6V3UjoZ3yetv+KJIJO3bdvW2dkJ8y0IQkFBwbRp02BYQF4iPkB9jt/v
+J4TQGm6q+3T8F7f4b4zv/bpZlmVbW1t37NgRjUYREMiyPGrUqCFDhqiq6na7Q6FQLBYDk8MwDPIq
+dCUbIQSLF2lgof3y77fWA/bRpxuJEZJ8rillCF+XSCRQHAALoNVBGgrQ+mEaEzz22GNfffVVVlZW
+KBSKx+N5eXkLFy5EMSWoN+RksPbBZDINHjw4EonQdC7LskgMXEE6qeTxdQqptOO7zI52DlDZAfli
+wjAZqO6LxWImkwla/OKLL+7cuRP2mmXZcDj89NNP33LLLYCPiqK0trYKghAMBuGNvV4vZpd6WiBL
+/aNZnSoSKDT81zeJiBfWma6qQZKWrnS12Ww42NnZuWnTpj/84Q9GozE7OxvVkwsWLJg5c2YkEkG4
+GwgENmzYYDKZnE4n+M7y8nJCCIruKaCEuddemJpKzhJD15CK3ir5bt2nC72xYhYSR8l8LBa7dOkS
+8OKZM2eqqqoqKyshxN7eXlmWq6qqHn/8cYfDAaFnZWWtXbv22LFjVqs1EonE4/Hc3NzJkydjzT/o
+BNg0bb5MH4GQgdL67zI4+AComHA4DCMDu2Gz2YqKiqZPn15cXPz222+/8cYbJ0+eRJUZCgUffPDB
+ZcuWud3utrY2k8k0ZMiQ06dPr1u3jhYNyrJ81113lZSUUERPNIsF6RHdhk7MJdX6fopPNBNDj0iS
+xPO80+lECKooSn5+/kMPPZSXl3fs2LFXX301FAopiuLxeFAWmJ6evmzZsvnz56uq6vP5kOHq7e19
++umnOzs7zWazLMtYWPLAAw+oqgqDBpiPSkKIXmdzPwB1OP0oAe27hBCsw+c4bt++fSdOnDh9+nRb
+W1tLS4vf729paSGEpKWlodI4KysLcanP58vKyjKbzX19fZFIJC8vz+fzPf744x9//LGarD5LS0tb
+uHBhYWFhKBQCxkdKAHLX39oQ/fn6K5oabfQIuUiS9N577wUCAXD0sM6oz+nr68vLy7vppptuvPFG
+hmEqKytZlv3jH/9YXl5utVpzc3Nra2tXrVq1efNmlEnJsmyz2Z588skZM2YAU1LKDFkB6lGuTtGr
+yXq/WCxmNpuRnqbNJQgh0F/EnxT2qapqsVjS0tI8Hk96enp6errJZCouLp4+ffqPfvQjiPWdd975
+/PPPjxw5smnTpoULF65fv/7ll18+efIkylqRZ1+8eHFFRUVHRweqz+C3UZ+DcAFAFq/p1aYa5AyM
+wemnYlrMQwhBcdmsWbNGjx6dm5vr8Xja2trq6+t7e3sbGhouXLgwb948kJGqqv7yl788dOiQ3W5/
+6623CgoKVq1aderUKSxmEwThuuuuq6ysnDBhApadhEIhWq/Z70quWq3H0N7tFW2roigIQS0Wy223
+3TZ58mScdeTIkSeeeAJscG5ubiQS6erq8vl8bW1txcXFpaWlDQ0Nzc3NR48eLSoqOnXqFOroWZad
+O3fu3XffjVoEv9/PcZwWwtMXV7mbpRLvhyi08CaR7JqFGhtaDxsOh7EClhASj8d/8YtfRKPRnp6e
+jo6OadOmjR07Fqv9//a3v913331ouLJ3795IJLJz587Ro0d7vV5ar6lFWdp/YXN0kwbRrQSKvr5c
+9Np3AW+wQsGgGTzPw0YjsPr6668bGhra29sZhvn73/8+YsSIoqIihmFaWlpMJtP69ev/+te/Tpky
+RVGUHTt2vPPOO1g8jg5EtHpQG0apyURVqqWhHfrheq3cteiefLv2GB4Y+g4QAjGhHQJy3HfeeafN
+ZuM4zuFw5OTkTJo0qba29oMPPlAUZevWrQ888IAgCPPmzaupqVEUZcuWLbNmzSotLQ0EAvQacAGA
+OhjUEOlGGuttcKjE6X1qJwAHoYBY+g1lj0QigEYmkyk/P3/FihVer5cQglpilmWvv/76bdu2hcPh
+c+fO1dXV3XTTTWVlZeXl5bt27QqFQps3b87LyzMke0epyRy6Fs5TelW3oavBIf+y1EtNlqYCyxNC
+YrEY6uWxGj+RSAAOYs5isZjP50OHp1GjRhFCULz25ZdfQsp33XUXygg3btwIslNLY/TDNv0eRB1G
+ykWvrWxF+wjER+CtaCkAymC0C9VoyIOSMUIICEskvtEOU1XVcDisqmpOTs61114bj8etVuuuXbs6
+Ojqi0ejNN99cVFSkKEo0Gl21apUsy3DdoDDxGuVToIkAaqnNuUqYSzqoWn1X4N5PGelxSiMTjbtW
+FAXTk56ePmzYMDQjbW5urqmpQZH+6NGjIeva2lqULMDHUsvez9/oOQbG4BCN5SGX4U46+gFB8m0a
+DiMej4MeKCwsBHyMRCLffPMNPjZhwgTMwblz544dOwYWsx/IueJM6zD04+vhUbVg5oqmVivufq/7
+TQmOgJaIx+MZGRm0R+b58+fD4bAkST/+8Y9HjBiB6sGDBw8CIJFvw1ztd+ojDYwBq0jQ3vYVk0TU
+MtDFIf0kpf0qRVHcbjfStgaD4eLFi11dXYQQp9M5ZsyYSCTCcdzBgwdbWlq0NSn9EI728nQYA1n4
+d7kKa0/RSv+KGorX6HKMpWhwmOAMTp8+jfz7iBEjVFXlOC4YDDY3N/czOKrG91xtWt9Pl7U2hyRv
++IrhDBU9/mqLZLRvMQwDChNZLSClcDj81VdfwRBlZ2fjA4SQ+vr6eHIgk97P7ulp7gemDue75oNo
+CkD6PRDa49q3qNYj96QmVwg1NjYiH4teo1gNWldXJycHzQhqa1L0HLoWgzAME4/HwaFrUYogCCBY
+1GQrZyx8QCddnKgkoy0gSLTkgo6DfD906BDMjqIoqItCrtxms6WlpRFCOI47depUfX09VlQRQtD9
+DnOJZCEoI30szwDgegzESljykZ2dHY/HDx8+3NXVhWyJyWRqbGzs7u5OT09HK0ak9KhRCofDgiCg
+8ZnRaNyzZ88nn3yiKArq61Fb2dLSwnEcz/PwAVh/cvLkScyNMdnwGy6B6A7tdc1SEU0kRb0iVPjM
+mTN79+41Go1utxt2uaampri4eMKECVh6iVUlIAMIIegGwjCMKIrbtm3buHGjIAgejyeRSLhcLkKI
+KIoHDhzAIqx4PK4oCsJjdJuDzTEk924AU6SPKOjQO1VCbTegC9pJK4qSmZk5d+7chx9+mFb3tbW1
+FRYWEkJEUURfOpiFSCQCYhk1hIqiFBcXL168GLgePeR8Ph/P836/H72dwFnCiPX19eEyaHNGQ7Lz
+49Wm9f1AC81IAGOoqsrzPP4OHz7cYrGAK7bb7bm5ufF43OfzZWdnq8lW9bD1QDU+nw9WqKioiBAS
+iUR4nscik7S0NFEUHQ4HIaS2thYYH8WE3d3dfr8fDb6o46HM2uXXnLqhd0iljULVJFUJTphhGDhG
+WZZ7e3tRIYzWISdPnlRVFf1t/H5/Y2MjIQRvoW+Iz+cD+ZVIJLq6uhDKms3mxsbGzz77jBCCvi8M
+w3R0dKADNTrwYNBNAy6HXqmTxsDYejWZFaEHGYahRDGW1EJSsiwfPny4oaEhIyMDmdVYLPbVV18V
+FBSga1YgEGCSmywEg0GbzeZ0OgEcGxsbt23bduzYMXRxxTWIotjQ0DB06FCbzQYPTAjRPzFLBrAE
+ipYf0QlACz6GYUKhEKSMUzIzM5cvX26z2bAFTDQaRd4cPXPotgPoe4MV/nAY2dnZs2bNmj17Nrrb
+22w2QRDMZnMoFAJwUhQlGo0ibUuuPoQDep0WqqvJ3LeiKHa7PRKJINkdDAbT09OBNR0OBzwtWPuM
+jIycnBwAeXgIg8GAHZZgvhmG4TiOpnBhdrC03OPxqKoaiUTS09NRQYVTlORKT0w2XbirrcNJtcUf
+mOozVVV9Pt/WrVsBURCCoi0uaurhAFB8iU6kxuQOPYQQfIYQAikjBMNmVcirWCwWRVGgzkj2Ys0/
+xTaoaJMk6cKFC3a7XX9rQ3RGOERDF3/xxRc+n6+3t1dVVZPJhM6idFMqxEroZxmLxex2O+aGZq/Q
+qxJyt1gsWDWYSCTgPKPRKJNcP6UoCij7UChECEEPR+SzcDoAT29vb6pF0W8MgJvFmDp1KvrIA+rQ
+JkHYtAUvkMmDiUC1cFpaGsuyaOkEmM/zfCwWQ96Rth7F9mBMchMH6Dh1BiS50JkQcvbs2ZUrV9JV
+znoOvbWeMo6xWOyaa66BowOeAaUVCASGDh2KD8CFAsvjafD5fJIk5eXlqaqKnvWyLDscDrvdbjQa
+e3p67Ha72+1GMl1JbtqWSDa/lCQJHRRgzRAcMMmlWzoPnUSv1XqIHps3Kopy6NChnp4eGPGysrL0
+9HTs2MbzvCAIJ06caGpqIoS4XK4hQ4aMHDlSFMXdu3cbjcYbbriBuse9e/cyDDN27FiGYRoaGpqa
+mtrb29PS0jIyMrxeb2FhoSAIR48eBcEJgqy8vBzXMCCdFslAuVnYHFibmpqa7du3e71eQRCys7Or
+q6u9Xu+QIUO+/PLLl1566fTp09nZ2Uajsaury2QyPfLIIxMmTDhw4MCpU6ew3YPZbN63b98bb7wx
+Y8aMyZMnv//++++++67JZMrJyWlvbxcEoaioaOnSpaIorlmzBshHlmWPx1NYWIiqfJRb6SwHMiCi
+p5DGYDCEQqFwODxx4sTnnnuurq5u+fLlGzdurK6uPnbs2DPPPJOWlrZ69eri4uJoNNrV1bV169bX
+XnvN7XZXV1c//vjja9euxcYC69atw1YDmzdvfvfdd++///7rr7/e6XSqqtrV1XXq1CmPx9PU1GQ2
+m6uqqkaMGIEKFJfLRSv309PTtRs36DN0ylKp387DQfRoYgzCy+FwXHfddS6Xq7u7O5FIbNmyhWGY
+pUuXQlJGo7GgoOCRRx4ZOnToX/7yF7/fX11dHQgEnn322RdeeKGgoGDZsmVNTU2vvfba1KlT77jj
+jtzcXADz/Pz8n/3sZ/AWEHd2dnZ6ejoSuYqi0CIcuHFcpD6ZE11zs9TaqKoKkM4wjMvlam9v//jj
+j9evX9/V1XXrrbf6/f4LFy6MHz9+0KBBaLSO/J/D4Rg3btylS5e6u7t5nq+qqqqtrQ0EAgsXLuQ4
+7uzZs+Fw+IYbboA3BkZC6IsnTFXVo0ePfvLJJ3v27EEfcavVih7s0Wj0Kl/GBtEnko3+sBOjKIqf
+f/75iRMn/H7/7373u0mTJqmq2tvbW1ZWhoQGIQRhUSAQyMzMBFjEdgzDhg0bNmyYx+PBdj4ZGRng
+IXiex/YCCBGALMPhMB4mQsigQYMKCgoyMzNRGYgtIinO0SbxU+eB9RY90bSDQPApSdLUqVNnz569
+devWbdu2DR06dOTIkZmZmRcvXgQa6ezsLCwsxB5g58+fdzgcaCTd0dEB4gyGAp1hQ6FQRkZGR0eH
+2+3GigaQ8pIk5eTkzJ49e/To0QgCMIuIxbSpWt2GfrlZNblUU0l2/ccTAPmWlpZWVVWxLPvmm28m
+Eolp06bt3r1706ZNTqfT6/V2d3dnZGQ0NjZu3rx54sSJeXl5wCrYcAo7bxYWFg4ZMuS9997r7u72
+er3oY5ydnZ1IJOx2OyEkEAiUlJRkZWVdc801+fn5hJBwOAwNoPUmqZaGduiNcChHaDAYenp60CuO
+ENLR0WGxWObPn//MM8989NFHt99++7hx4z744ANBEMrLy2Ox2MGDB/ft2zd48OB7770XES86qAMs
+GgwGh8OxaNGi5cuXv/zyy+PHj0dc9umnn9bX1997771Imxw+fDgajWJn8/Hjxw8ePLi5uZnmZnUe
+eoheTdbRa3PQ8Xgc4uB53uPxOByOcDg8atSoX/3qV/v37y8pKXn22We3bNmyZ8+eTz/9FImnvLy8
+Bx980OPxtLe3w1w4nU66spkQMmLEiBUrVqxbt27r1q3IvdhstpEjR+bm5kqS5PF49u3bt2/fPmCq
+7OzsQYMGkWRTgCtSlSkNtXQVvbZaGEUfgUBg8eLFsVgsGAyCw5k5c+bkyZPRL2vq1Kl33nkniC2W
+ZdPS0hRF6erqyszMhK2orq5mkvuAK4oSiUSKioqef/75aDQKCpPnefQs5Tju5ZdfBmeADyO9hQJY
+rdypYUy1WPTbWxy6aTQasQlUMBjEC9CQwDCQAvqfE0Jgi7Kzs0kSHTEM4/F4GIZxOp00nY1fofMK
+4l4rO7RvwW4kwPg0pkMfRlVT2k80wOZ7j3BQAkYIsdvtPM9fvHjxpz/96fLly5966qmsrCxsrwCk
+QTcq0UY0WnSkfrtI7bveIsn57neQSW5WEA6HOY6zWCy7du0qLi4eNmxYQ0NDcXFxIrnVCUl2rvge
+iz6RSJhMJqzBdLvd7e3tzc3NkydPnjdv3pEjR44fPw4NBbGF1qvkSqK/fPSTe7/4EzEUuUz60Hp0
+pAsGg+PGjausrGxqajp06NBjjz1GF7CjsiolEqHXn+qIGXkJ7PDCMMz+/ftXrlyZnZ09c+ZMgG4m
+WQ1ot9tp589/Ifp+//YTkFa7Ly8yoCMajTocDuR4Gxsbt2/fXlxcvHTpUpRPYfph7lI3dCrzVJLb
+2BFCampqXnnlld7e3qysLLfbDRoHLDEYRK22UlHSfy9Pe33rfpIf0Gq99quwfQPWkmdmZjIMc+nS
+pfz8/Orq6qysLDydJLnbUkptvR6iD4VCyHSDJSaEnD179uTJk62trchi0xWaFCZ+l60nGq2nCQDy
+7xgckEgulws72WZkZFxzzTUjRozAXoZU07WvUzT+Dyoh4of7sfAvAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_saab" model="fleet.vehicle.model.brand">
+      	<field name="name">Saab</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAA7s0lEQVR4nO29d5Rdx3EnXNXdN7w0
+8yZiMIMZ5ExkEmDOoiiSokTJVLZkSZYtWavv+3bX67W1K6+9tnXW9q6z1kG2oi1LDKIkiqSYSZAI
+DACRcxgAg8nphfvuvR2q9o83GIJB/pYgSBzvss497/S754XuX/9udXV1dTUyM7wjF0LEha7A/73y
+DvQXTN6B/oLJO9BfMHkH+gsm70B/weQd6C+YqLfnb147e3BICJIYBIIAIAIUjMDoEAQCAeDUVf+q
+QSCyzIwMQBbYSUQULIUPrBAFIAAAIDAQgxXkT90BAwgACCCYEZEBgBkBABGnqzddftsEL9iUioGt
+RiWYHTMI6QEhINozCDBDkmgymojIGWsAAAElMxIRMzM7ay0wI7Ly0PdQSilQhWE2zAQMr4/m2Sgz
+MxEhohAX4Ol/y6H/uYRiAgC2FpWa1nvWGCMhrlWdM4JBIApUQKi1jaMha8gxEEhiBJQskJlTkwAI
+ZPClr4QktsjgeTLX0JjJZDKZnJR1ggMiIRCAqjf57af5q+RtZf3ZbbYMcqrtBADGujhKBCpOKJMP
+Uh2VqhPVWnTq1HBf/wg5Edt8tRpVotha0sYREUihlPJ8bm9tyuWVJ0whH7a2NGX8gIgEkpSykM0V
+GnINDQ3ZMFP/37Mp/zIKF6IbLpjCseAABAKmsdFaSwGITkgeGOo/fOzUqf7KyJgeGXeGsw4ypXLE
+mazVzjmHDNZap1PrNJH1yCRRaozLZcLGBq/QaNtn+B2dDT3FGdmcn80osjWlVEtTe2vzjIZCIyqu
+PwfMgC8rt/9rdD0zA2tjTGqMkiExVmtpX9/gi9u2HRi3iDltc8blHASRriW6CtLghJWoJKJzhq0D
+sGR1msS1KltriQgAnDOODCJ7nuxpVa1tDUuWdnd3N+VzKNB6nldsaJg1c3Y2m1XelBa6gPJ2Q888
+hZSLlArIiHjv0YM79/eOjOFEJbQmk+Q8cKgTx9oqRfkMNDcFLS25OY2ep3zf96X0gBiQiMgYrbWo
+VGojo5WTp4aPHusfHJyMaqkx7MB5AnM5WSioefPali/vntnRmMtJT1NbW9uMGTOaW4qeJwGAiISA
+t9/Ofrt1vbXWGGOtzWfUsZMjG7fuOdRXdkErBcWaFQlzkHLo287WzOLZzfM6G1rz0idjk7h3rFKu
+RrVakmqKk9SQU74XhmGLTPONYeuMYr7Y6NAbGdN795zeuevwll3Hh/rHbAoKfSadDd3Spd2XXbF6
+5exAa42Ibe0tc+bMKRYbhBAA9K8Y+rq6JCIhRL3snJNSMoB2gBIEGKfTKOFMWLATpYef3b7nyIDJ
+zkxy7RUNSKlno67WpiuX5hZ2dHhBuW8gOnl6Yl//6d4Rohit8Gu1RDvrTCRI2BpIJ512KVdymCWj
+g5ztmJldPrd73ao5PbMDAP+lHX0/+unzm547VNWWAYgol8utu6TnuisWz52hquPj2VzboqXLOjqK
+SgEDE7NAVR/2gRFBAr+FPfKWsN5aq5SafgNSAImoUksV5T3YuXPPQ88fSES383MJK526jPQWdbdt
+WFacXTTHBge27S/t7xtGarGpTgPfSS9jfZeUAYNUOwRjTMklAVGJnStz4CWTkKQ1x9U45ijOSMw0
+4tqV8y+7fNnKi7pPnjj9wP3Pb3x6/+mBCijBYFpbijfesOrS9d1sxiX58+ctmr9gjlJCKcUADMyO
+pJRaa0/6KM87PFNynll/NujMzMxCONCyXC5nciGl5odPbnnhVMkL26p+u63VCqFa2F28dFGxK897
+Dvdt3T/aG6cCO5XKIlgdl0ORBzkZ69izMac5II8cRLWSF6g40kDapFrZlBOKNKeKyGhT0Za8KB5F
+ihYvar75plVr1i6IqsnDDz3/wE82DY81uKBU08mGNSs/+N5LmgvGGd3c1rzmotVNTQ3WsuehI0ZE
+IeAtVUTnDfq6qnnt/VRzxZSKQfb44WMPP7ent9LChQVakhePzZvVcNVF7X46vOPgiQOjakKHgfQy
+ft5R1eeQoRKbhihB4aJQhhWpra5aM+mZvIl8YwcAioainDWTUYpghTRjcWKrtsDoh1yKSjrB4dFS
+6KnmJn/N6p7rr14tMX7sye0PPLyvHDshRGO2cPt71q1Z16LTUoBy/fr1c2b3MAEKIAZERnRvna/l
+fCqcafSnuV+r1YzF0Pe37nj2oS1HdHZdNtOk9Sh4ufevzS+b2/XMc88/s2/UZDqFymYCL7HOA121
+bmFj7qYlu1zNPn16xksnmnIKhU21ULGuZmrmF27MzenEF/b0//TxGrlsSppMuZoiGm9D1+iK+Qcn
+5Im7Hrg6SmIGUSpbsFLHk7lc+p53X3r7LStP9o5/5zuP7dxzygohJF1/9cXvuWmd1aetrl137ZVz
+euYK4QEAMaEg/FcBfV3nTL/GcQwAGQ6f3vL4z3aO4Yx1tVotFNDT5r3vmo5keOLuTcf60+ZcY7Pi
+VACSYcWeQ0p8RwZuW9a7qniyH4K7Ns+Ioplh4iqBNxYNXdE96xM3HmhwMK707/9F3DuRbwxkUq6W
+08LSrup7e76pqrseP3r5A71XI5CglFzVUmQc1VJIU7mqJ3vHB1fOn9P1/bueffjpHdWqL9hfsbzn
+4x/fYPWkEMmVl25YtGAZADAAIOFbpnDO2+/W/VDTb2u1Wt0t9ejTD/1kl3ZNK0EnAbhVC4ofvnnZ
+S9v3fO2RsRo0tTSAUtqBZw37gpSfWqaiE1bzwaEuFO0ttsGjsIL5ag4NQnPOz2QTzqqqz30j5aZG
+zIT5SR0mkpUsZWWkfD0Yq72jK8OsETJ1ZMH5rPOsw0AFmQwe6J34i7/YdP/Dm97/wbUf++CtWU8Q
+lrftPfTXf/sjy8VKxT351LO9x08wASJg3dp5a+Q8Wzh1ysdxTESe5+3YsePeF0+I7Jyym8Gm+q4V
+weVL2+57+PkTE0o0tYMTgfTZkUUnPGXBAFhp8oomx7Iiq4ufXbFd6vJB26EyTRv3FmBs6JPv6ZjZ
+yASnVFArDWLO9548WPrHH6mujmD9oiEvOprXW/edpHv3fNznCRAy0cYYAyxcWiObCjIRNmg9xml6
+5cWL33vL8n2HDn7rrs0VmxORXba05Zc/fUtptFch3HLLbXPmdjNqBP884nO2vGHWT3dVfe7+8h0H
+wOTYGkslU2YV7Nq578dbjqSZi2paZblyx6WNly/I/uD+F4/ErV7jLAmekhLACY98hYpd4KRHgVUR
+5Rr9KONE+cVTs9pbvUtnRjcuOva+uQcK7cWZ3bVcYcx6RInKNJq8gFWtaVCIP3EzX9KzY3bbSSkG
+D51YLwMkDw0YIZ0UjGANOVLCBsKjasZTfpB7bNO+f7jrie4FXZ/5yJULQgM5s2dv5a7v7/cbWibt
+5EOPPTXYP4rWP9NSAiCiKY/FeaHrOSqc17r9WFrnhAJvsjrSGrbu27n9+08fE8Fs0qkfZj98bfvi
+Rvyru18a8toC4YECRBQChRCIKADr2kkIkXNKJXGTRLZ8oJw7oVs8L5qczPQPD4xP8N4TlSOHBvXY
+SODSyXHaPXbyvsfGU40Tk1VVCWSc7hicd9TMCAQhKiRkQiIC5CD0EdFoYtTMVkhbLDbs3T30D3/3
+ZGOx60Ofuq69oP0w3rLthe/90/NNxTmjIyfuveen5WiMmeu2g3OuXsPzgDoAnAP0U0C/xtVHkICC
+pJK2ZIsne488sfloEvREONMT9kOXtndkou8+sE0XlyYsg3zGAUohsL7MhEIIkCiEBAkovLxm36If
+iCCl3FC5caI6+dPnKk+cWn5K5P/+ofwzu9p0MCPJNo6a2j/e37BxeFFqO//px7TpSHFMF04evdQL
+WpxHCpXnhUp5SilrNZEFAM8LpHJCCCJKXS2bbe49br/7vYdUTnzizusaciQC3LbnxM8e2t8ze+nx
+kwc2bd7qXJ1kQsqpyRURnRe/2zn2YZ2t9XL9CRAgdWItsKkkdz/y9Iia72MQ6eoNq1vnt9hv/XDX
+UGGFFZAT7CCRJBBBYr3/CBERud4TxlX9jCLPhgRS1wYHVUOua8W8nutWtt+2wH74UvjwNV67P1Id
+mVxaaPrc7Q3XrsZrVk9cvK591iw1ViqP21YhK75JgRgZTGoBUflyiqwWmSQ5SQRhRhiIVCiGRs23
+v/t0Y77lumuW+yrOZLwnNu5/ZuupnoWztmzeduDAAQCw1gKI+qrW+SL+mzVap+lPzjdmMghafvLI
+A0O6q5IJ/Wppyfzg4tnh3/x422hmcRgKYSoCPTQaJSECAgpglCABCIGJCTnnE3B10jrFeel5hya9
+i0ZHF+d657cOCS3BL8vJhmpagcaxZCxfzKpPrK+VS+NR5bQoHd/anxnzAo8KPjuCsboOc+yY2ZER
+QrEASx4AZzLBZHVMSvSyIelM36n4nvte/MAvXHzo4JFd+8ezja13/WTjrFnvFTjx6COPd3V1NTU1
+1icrzAQARPDm8T+XYXZa0b+MO1GaOF/mDx/bu+V4ZGQ76lp7d+59l81/aOuxEduOgfFtKQAZ+gFa
+j5WRdaYLViiEEAqFkCAAExvUrIKwRftZjbYv8XeU21zQRE6Rh6nfWmtuSbJzUrjIZudWZPOEbqhi
+s1Otg7WO4xPLU1ImmShhlTmqxRWllJQKAAiI2TnnpPCkojipZv1Cxiva1BDrMAx3HDj99BP7b7vp
+0rmzglo0Sej98EfPe2HbyZOnHnv0CWaoK5w65etr629S3hTrp/W+1tpaTnT6+HPbIuiRgDlbvfnK
+FWOD/Vt7oa0pa0WCMoeO06TsRE4yMTsBiAIRzyxZMAASMQvJnjWOJmVS6cx3NDd2xMNyxGpPeMZP
+BItM0MBWxhGGhWY/JU+YGtmFK9QNeblqojanncusDh6YePbZHakBra0lUEqhRRCQupjBSuEpGVYq
+FakEEaGksDG3acuxxQvabr/18m9896nY4rHjfXuPzl00q3HTpk3zF8xds2bV2R7ZCwD9awMonHNa
+ayWyew9vPTIghPTTyL7r+mXdCv7u8ecKTasTNkhFq+NsRqWowtDJ2GNfMwASTC/RIjEzr19U6O7M
+ZF1DWcTHT1YoMp2Th/Z8+yHlMWoGYossGHQag3G1dDK2Njyd+i1Nc/+fX9ywYeXoc9vTI5VLbr82
+qvTWamXGBik8kEzWGaMRFApLVgkUcRKFITgyTJIdWmQ/FPfcs/WLv3bT1ZfP/tmj/Z5XeHLrzrW/
+tL6///Tjjz++cOH8QqFAROcFdzjHYZaByQI6zcYBGIvsoFI59cTWMSdnGedmtKa3ryj888Ob+grL
+QYFAKTD2PHTOeSjZICsHlFHSAQdkQ+ZYEWLsrZo3c3munDz4kH3onxtefOrKGemNl81slIU565e2
+Xr628z1XNKxekGtqJGd8qchaSYE3ydn5C5f9998ca1bPfv4/7Pzor0fPbR/sH/zR07sFFwNBKNgR
+GnKSc0IICUoJYDBKCUdI5DMAoQ5IOuJRYx945MCGFSvnzjMkIRqNHtw4NH/ekgM797/w0nYNBCyA
+gcFcAOiZ2ZFDIZjAQw8IklrN9/3Nu3eVS74ATNLyB29Yt3n/sf5hzvk4PTbwK4VkBBaZbcITpMSg
+Ng0zaOWMsWPf/2bDiUPcd2TohacPfO/r5th2ntPU+dlPdX/i/WZeV+NH3hVetUIKT7NjwYqoefbM
+Of/1E3v37Dj5+T8WG3c1XL588W/+8pNHTvQdP+7ncoCecwYFCQaU5Lj28xtmfN+T0t+97+iJwfKV
+V6yXPBz4ud379o2XhJ/NPPP009ZaOH/LuefA+nrAkGCWCGB0wmBGx8e27u/TLl8t1VYu7pjXJh/a
+esx5rdKcYQcxMxNPdQAhgCMQZJRBVTBxUYBdu7yttmdvoQQVkak6vzkOsyUBI1odHe697/6j9zw5
+ueNY+flDBx/cGFNKofQBNbjYlycee3rof/6TqNXURcvmfPnfjFeilUvmrZjfPVktaQIEdjaRqEgw
+iNdnKyIKyak1HgaJgYc37eno6Fy/spVsUortCztPtc/q2bVr16F9+4UwTEBwHnTOG59SwdQALwWC
+A2tiKeUL23cOlxs0gFLi1isWbN78/GClAH4ADtgR0MsWETOcsY5tYn3HPlknrC0idPiqoVBs//hN
+895/++xP3Jm74RLJ0Ld5f0NTMbOgqWVOR9PizqFnnu+MiTLSWB0ID6RUR073ffOnOVLNt123/I9+
+Y/zFY0++///T3/7hZ993fbE1cAiehxKYLVpHzrmf57Nyzkip2EGYDQ+dmNy5o/eKSy7KZlLlhS/t
+6S1VsbGp6aVt28kRSuDz4XZ8w8MsMwACMUkWzlgknqzGO/adTJMuBW7enOyMjP3OtgE/u8Q67cm6
+Cfxy7BGfcYAk2leB8E1MzlQx7Gn1vbzf39BSGS+MoHKGr77sxnltHS/94Edjf3OsoWcWOV0bHspW
+09BDq41JqRLrOLWyJei54obGG67N9rTtv+u++M/ubZmIRr7209U333Dxutk/+9muUIIUwpGHkhTn
+jLPTCvDsdgkhmBSxNRz7YeOzzx5au/TqOfNyY4dsNY237zx5zRVzDh3cf/r0eFdPizwfPrU3buEw
+ELi6PchEDvjQ8dOjFem0BIpXLG3fsWv/eNrhZxLBPtcZTiSEApjy49f9T8w5TySzW3Mjg5WR2A6W
+4Zv3bq4kMKiCIkeWSvsPnvz01asu+nxr+eBe99zxE2P9jVU7nrVVR1xOck3NbUtnzlq1ANvaXRAO
+btu3/0+/nu7Y40u2hWxUscObNl587fWPPLwdnDLGKRGkppZxqj5Cnj01qb9KGSQ1oyQjggIYn6Q9
+B8ZWrZiz6+BemfH2HRq47uqFcTJy7NiJzu4WcT40/rnZ9Q4AAUWqdS1J9x48EbsCsC14sGhW0/d/
+uJ/kXEGpdeR5HjhiJBL1+fcU+gDgqahcEWkxf/mGGZ3DY/2no0ymc+4s/6Ym2dPYIcTco6Ol+57b
+1Tmzdf78dQs2XCm2vXjqnkdDg2xSUOHE2CQXmxo7m5N8+4n/+Cfx7l0+0lgh4w3pMDKIrrbvaOf7
+3lvM5+KSYRSAlmUCLjwb7rPpb6zzPWlZC/YEJZT1Nu/o/fSHVrc1HhytwmS1drx3YvHszqPHjl12
+xaVSJCDDNwn9G9dZDAjI4JghSWvlanSqf7SaCJ2UF89r8zSciqSnyKROSEMa4ExA75nw4Cm6CROj
+5x8aOJ0kw7evafyVW3t+8bY5t28orplvy1Hf4aHjyqusXLJw64n4a0/3fe/ZfrH+ImprwzJp6Vec
+8UtJadOeo7/7jabSxKwPXSXzeWn9Ns7PXLu8adHssKtF943lJGaCQGunpB+nkVQWSL+utgEARIls
+AQBsqMCBtOMVSGK3fHFPHMeZfOb5rbvDTGF4fKjv5BhI+6ZQB4BzYb2yCMg2tI4cy/6xIa3b07SC
+4F13ceuR06NROZcpjksOnAl9TEEGdchBSpZCCESJiFgVgYSYHTz0/PC2Q0lHW1GQmSyNl8fVsbgk
+MJclhOy4M/KixsLaZY1937nbDfRJT0GlJvMyc9063nIkPnng6F98Y/FvfOHo0vnu6V3lpNq0bGb3
+X36pcjIGU8llsqhj62GqTeAXPGscuDoPpl/rVSNiBGsFkgP2bGylImP10JH+1Zeu6d7ywt6EcCzC
+4XKltdGc7js+b97FZ1uZ5xayeQ4KRzCzEhDVUpQwMR4NDoygKjTmvRkdzU9u249CWQNCgNYaFUvy
+EFEiEk5VDxEQUbAHggUKANU/FvcNlSQKpcTtV87qnvD3HS+nJtFQXrNuzuVNmaN3/z3sOlZwoNlz
+RlfLyfyLV5rLL+396t9GRwbHkqrX01yhpKjDgf95v1o6t7xy4b6nji/BFlZZsiN5P5NUIwdOyBy4
+6Oc1zDlbX7aTgEJ6aVI7fOjou664rLWt8dQQVeMYOZvL0cjIWKrTIAimv3huobLnAj0iAUC1VnFE
+w8NRLTLWS1csbvZDdezwqJJtzir2JLEmUmhdvWayrl4l1/d2SCnYsUUQ6KMfoALLbAFyqvahizpH
+OooR+EXphnbtOPLtx5rHBy1L7QGVa7KWtsZJ6fBAcOdNDZ+8Nf2HBwKUpZOnmhNOGLMQnvofd625
+74/+6fTk/c/fbXVGCQRTE+hQ+rHmuoZ9rdoRQpAxQkhwxAxCeVKFvScHolqyeFHnidMnrNP9g7Vl
+i2boJC2XJ9vaZpwD3K/A8dy+5iwR2WpcO3FqwvMCk+hFc1tODwyWSghsSAtraMoLbB0RsSMiAiKy
+jqxjR8bWAA2z0aZqbIzSAtrYRNsH0rRaGfjZ90///f/Y+ge/03vvj4vaiylfAYjHK7Yxp1sLsTZu
+tBwd6cs2NS769B3lSgX2nEiBjOYYJJ8YMVv2XP+uGyYnNbFgBGsJyFlrEfns8eZs9BkAEaf5S8Se
+n4lqae+p4SVLZwt2Xujt33/SD/NEND458VpM3ugq9xt3JAAAgDFGCBHFtaGhqnMu8MTCOc1Hjval
+RgFxPaCVjCbLzjm2jq07A7oDIuecs5Qm2moDxOiMS2qQ1kKyew/VXpwQc6+7ffHVN3Xdes28T92i
+Z7XEBl1Evsy2fORmb+WiyWpVteajo73pC3vMtcuP/fAp0V8qkwm008AV1NGOg7NbZVMYuDRxjOiF
+oIRABJe8yp8xDZlzrt6+egcY44jAEp8eLM1sK+ZClMI7PTgB7BHbOE7ffDjBua7NWpemZrxccS5b
+q1UD33a25/oGosQyOAA25JzTKWty1jpryTky1lrrjLXWkrXgArLSagSDYAA1sXbCkBvRdz924Bt7
+9EbV2XjVVb3HDw++sLVxckyOx03rVzYsXyza2z0I1cp5lUPH+rZvO/7gU/jDF5VWKsWKIOVhgYgG
+y205GzIIImJbixPnHLMDcq+LO3Od9IKIEFgKRGTHLD3v2NGRxoZCW3POOEqsGxuLCg1hJYrPdNUb
+Jvu5Q18PQ3COraHRsXFi37o0nxdBwKdOVxnRaoesySboiLSz2jhjjTHOWqeNtXbqThohOYVgrU0T
+ow07EobBBNpR9sV9/cPjSbr1YPX7TzSO1E6bMcPpeN/p4//8WMOcOW0fe0+ZzNhjL8HB0+Wvft+b
+SE3KuWzDqs9/EBa1mlBVrXZITEqgBGcD3xMCtXFCyZ/HegKBiExTkQdCoJAsPdE/UAo9v6uryVmq
+JVH/6ZGmpkI1SqahP2c5B9YTk2VHQRBWKlGpXHOsm5rz1qan+ydlIE3iHMVWp2jJauNeKWynCkix
+05U0rVgXOzTa6cSliTWxTbWpiLC2dEHx8DOPehqC2bObLl4bF0Xl8Rf0nhPhzLb8+68c/PZT2Dtm
+RspmYiKxxpGolaNoceuG+/7r7A/f0Lpo4UglqVlhLSEZdFqnse8HNe3OBh3O4mw9yqOubZwzgGTJ
+aWesU3GctDY3MHMal5NE5zKeUv6/4A7635Q3bOFIECS82FW1TVLtl9MojVVrTtmaqBhNUMlIz+kA
+hbVpDgMrDLBjJiZBIAVLgSQYkadW2s4EedV3sgJYEScm35yFLj8dyLU3/8cvumVdlQdfsg/vEQIj
+NWEnhnq/8WD8oycD36ekgeISOynlhJPB5KYtne++avZv/JuAy1ufH4lsn+Aics5CKpSM45qPgXXm
+LNypPuFjZgFMxAxgHaPwHZMADqRIyExMQkNRCATnZQZHI4PSU1SpVLLZ7Gu78C2EHgAQUGuttRZC
+GGO01oVCoT60giAHDp1DJiSL0kl55hlXEoCRCKXAKTMfX8ciVog1mNmWzXlYvPaqgUA2H+rb9/ff
+bTHsUstHh178rb+JD/a1Bpm4EnEs2q06AWmb88cd0/HJ4cGhZ184/IWPfGDP7k1MAoUkcsSWgZXy
+nD3bh/r609rpD9QLcRzXarXW1lallInjJEmstUGQefMK51ygZ5jal0NEWmvnXCaTSVNttQVFTjow
+KUoWoBgZlM9CkJSCCAQKIfhM5BOehf50U2UEaLSfDQYr+jtPbbvm8jUjX/9+41iMSBZQnxoPx1wB
+glpSEVrXio19k1GGHIOfA0jHo3w+/+iz+6uT9+3f1ytFhpkBiJkcOQR0Ds4sGfxcqVem/jEAsNZW
+KpWGYkhEoFS9sSD8OvTTLqm3YzZbr1Z9706d6fW/t5aMdgiWiAlZsHOgSAAQCyGEkiwESEGIQgiH
+OOVPeA306AJjRkvlxrseGcrmZzYfO3l84zYfW2vxcO6qi7OpKz+2O7YsURhy86+82L92yYHf/QaV
+yEDsuLGxtVFkmu95ZIsvlRSh1lbIevgGMVkiCXgWvq9H/Kn7r0TS930ppWCOoiibzWoLdV3/+g/u
+/56cu8u/Hlo87RdDRGJrrZ025J0zzuq6cemMdcaytmQsGcvGWm2mL5Pq6XJkq6BM3+HygUPRrPZW
+d2R/MBqZCStnti//tU/B/G7tLDMbohqCJTf/U+9e/Qefj8GCTGe0NmprolqiZBbYJwIiWw+UrPND
+CDib3WfD/doGns2MMzEgWA/j9TzvnHGblnMJ/KsHRDjnlFLMnKaptdbzJAA7ZxxZ55y1lgw5Q04b
+Y4w9c5GxThsylp0j+/Lr9BU4Eye2VFOImUIo0vFJtl7VVJd87iNq4SJrBFGiJIaogA2TPXF6IH/z
+TT1f+oClpLiw5/ipsXhsXFg9ZSNKsNY6R8AS4OXl7FdpmH+5vVJK51ydZNlsVgihlHrzMWjnOMxK
+Kaf1tXOuXC4HgQ9Azho7lYfDIToHBIIFCXDEQrCYUjiEyFLVB9tX/ThrJ32RUmxrcS0mChpqLmm5
+apVet3zvwdOBnyfJNReHILIo/NAb6J24/6Xjn/9/P9m/+/kZd9zwwOYjUSkqNOZTYwEIoO6hRCIm
+cgyOWbyuisdpJ8Mr3QxSyqamJuvKzMzGeJ6nlHKGzw59hHNyXp5L1zFwXffVg28RcWJiQnliSv/Y
+Ou+dM5Yt15+A+lNizxKT6te9JiBjozigiUAnh0+X25YsZkyXvPfawyNj2/cc4uYGlhAgJIIcEDrX
+0NL18I+f333kxG3f/eNjrfkHH9ik8rnYOWbrnLXWEJEU3plR8fW1zSsG2Ffai0EQ5PP5iYkJYwwo
+lc/nC4WCtbbO+lf101sMPYFgRCkdijCsNYcZifGpUaOEbG6QUS1NyTpdYYSIYzaxMdoYrXWaponW
+um6Maq2dSc++rE7qhUw0VpW6EkuChn3b9lTnzAm/8rlgceeuZwcjB3mOrHYW/QL5KQfYqKq1IZTw
+7W/ueHh79Cd//mhSQ8UGrCbi+gUAxsaITMTOCmACJp66eNo+cWgI0TjBqFg64FQAgQMpVUdzfnJc
+E0tIanNmZfL5vNGUzWbhlRbOdPktg54BAMIwjOO4oaHY0JC3hgYGhoylGe0NZB0ZS0RpYgHqzhs3
+TXxrTd0oqtum091wdpcQWUrBpDrhci1JHnlm9/V3fhY72nbv6YegsaSEr5SkxEGqQBTndI+PxtrZ
+A4cP/eF/+5OTp/qFBEuG/39NyNcOsywAQEpkcAAgRV2bo+9TU1Oxf3AUPen7QXNLo5LKmXQ6Bu1V
+Ftr/vrxxXS8AwCklEbEhX/CUBYDyZLlUjjs6C6R7yfctsrXsYep4KiXQtAgh6oGWZ5ZNXqPrHVMi
+VCiq6Zgn/WdeON42c8+ipdlRzQWDOeMxCYOAAApYzWw+cmRUG5PP5w0FKAJENNY6CpHN2auSLyPO
+r5hVTQsxAYBU0lonmIgIWGltZs1qUQGeODUsBQeev2Bej3OMSG/eyDmnZXFkKSAT+lHiBQH7ykti
+faJvpLOzSYJxzhl2QqA2KQgfwZyBXdb9U9N9MPVjr0TfsPUoNEkKyKytZf97D2xccrBItXJjnnGo
+hmQ8EcRklr33+vCKlS985S4/zFhyQmTjGgnfGXLIyGeBfnYHILy+fYkoiYhYS3QASAQCwVq7aEF7
+JU5GxqpEmMt48+bNrlQiJfHl7fCv+JE3MNK+cc8lEwAoJQLlCYbOWUUAiKJo597eBXO7GjJotGZm
+YOeMPntcdc4497I3zfw8QbYuSdMUyaPEKsmMwd6do0ZYnY1AT0hIowZe8LkPrf6vv/6tR58/2TuC
+yI5MHGvf95kJEa21/5Jueb0yAAoBbOv+NVTKF0Ig0pLFPaf7hyo1h8w9XcWOme21tCaEePNBr2+Y
+9fU8Gp5UmTAUIDtnFsilQsKOXcdvvW1dz6zmHfvGwiAEqiGjZYvCTlMeERHt2VOVqUafpS4dK5sk
+KvB17AIHxlYsiAwWal45Jwlyfs+Hbln66Y8cyzV+8Vv/9NLmI76fsdYqDzzPMyY1VgOAEuTcmXif
+1/TB2W9fvu9IecISAiAzSqFSEzU0+BevWfnDu59INDiEdWvmNxYaTg8cbMwWXkXwt8WRAFMrOQ35
+glKjxWLY1Fwcm5w4cnRoaHBs2eLuHftGtNMesmCP0Al2ACAEAbzCbzNd11dZx9qwB87piJwCh+hJ
+JBun5QLAxUsu6lq1VmvxnY2b7rn/e5WyZltQ0kkltU6JnHPkqyBJaiD16460ZwMPZ7G+XqhPehE8
+InbOpUm0bt3alqbGLVt2spSS/bXr5hNBuTI5t2vuG8XttfLGdX194xRANptVKAoN4axZnf1Dgzqm
+o4eO9vTMUEppaz2fSCsMcNrfUJ/J45kEZK8yy6bbjyRBgbUpojMY2IRQkZO1mYWOY0ePf2vb7h2b
+e0eHa7KplU05UNJQSmSdNUKQFJimqZQeccpTC+Cv1uw/761SnrEJAEiBTIJIA9Al69cOnO4/3Tca
+ZJvRyJ7utmq54vt+PpN5BSTnFAzyxo1LB4CWMfXCoNDoB5LmLQgEZBOlt2zu65zRmA+qCjJxNStk
+TaYxmIwAIDbOsSMwLnGQWnLWMBliZ1yiXcw2QWcVsVJsYkoiIwHRaaOxlDrLLne6OvHbv/+Txx7o
+nYggaGq2qRYqa2yERjuqOfCYVBJ7LrAGjHQuNqSJE6PrKzRshUsNmVQ7AeCDCyQWDLNREasaAqGO
+BSpQHjAJr5yQzWe6Vy9sfGrjzgnrEVFr48T8+WuHJocyGf9VzrVz86C9cR+OqNNTIGJjoeh73rye
+ruamUAn10q6jmtzSZbOqY7VMjlKD2hGJcW0iJcBRIsgpCikRtclJnUyEIfieaGothHlmrJq0XBob
+cUmFU5sJqVaaYFPKOE/qWNmJtDoehomUqefbxFTDLLDWZGqCGJyTXAVNGc+mFRSQJ5fL+kKQC6SU
+wimVSlXzfAj8bD6jkUYQxlI9zkSCgjQBgR4KhSisTjXHxqnQzzUXZdesGU89vU1KmUal66+5fEZb
+y8ToxIy2tvOS3+CNKxysp2tDAdDW0nrqVNA1Qy1d0HZ6S2mCky0v7L32mqXPbRmuVMrSE0rkmDST
+rxNEIJZpUin3zG659NLL1y1vn9U9u6G5KV/MOErLE+W+3tFd2w88+LN9g5MKwPqs/uD3fqW7e7YQ
+ZclV8mZMTIx95St/fWqg4kQQU5lM/Nu/9ZkN6y6KbNm61LONw2Mn/8Nv//XoZKm5ofFrf/gpZiFQ
+ATpHsTGOIWtSoVlG8fjzz23/2aPbypEgJwOZZUYDJFgqpZxHrHO1ickPfOr2A4eO7Dk0HGQKnizf
+evM1teoEWdfc1EZM4k3Dfy7DLAIyoEAIM0FDoVAqja9ft2DL9r7EVjduOnT11bdsWN/xxJY+kkZQ
+ymR9z0/jJJP1otL4+nXLvvCFO9vbVGhrtUTtfelwlERrLlm8cF7Pkjlz33P9FdfctPPX/s03BkbG
+3n/zZbfcslYgSGgBiAECB+2rV8491nvAz8skMutXd3/6kzcLByRtahLP+F6254GHtv7T3U9TQSzo
+7AKpklhLT1mrpS+11lFcq9RcazEz+wPX+X7Dt777mAwbhHDkUqGks9YJSh0Ly/N6Gj/4gat+/w/+
+xrgs6uiqy5dffvnqU71HOju6JCq6IDsIEYBBEGC902e2zzxxsn/uvNbFi2Zs21keGKoeODhw+ZVz
+tmwbSq0jjIVgElXhiyRxzLxmzaLOjlxUGRANLZuf2//l//Q1luGyi7r/+x//x8YCZDKyZ17X0hUL
++h45+f4PXq7QOtD79lQLee7uaRXIN9+y4e57XiAHSO5Dv3ArWGAHvaeGqhUzv6tBQeEjv/C+H92/
+AzkbCbIuzjQ0PPrYi488vLWx2FJLxt91y5ULZjRaiq2L58/tDkOfkBksoHEAKJgIQ79QicY++mt3
+Gld57sUTYbZg4uE7brs+9GWURCs6ZpJlVOchyvvcFggRARmBDBWbW8MwTMvVKy+bvX9fXyUqP/7k
+vs985ur1a7qeeGa/ahDOBsYlnhekmj0pM1lZjcaEsKmuzFvQ8ZlPv29wuJYk9i//+z+PjYyXJkqJ
+qZVrhdWrll522WIEB4B/880fdHblfvPf/hIyXH3lJRddNO+l3bvmdHfccMM6KQCU/fY/3l0p0Z/+
+8RcrI2OrV81atWrmoSODxqKUvkB/dKT84vMHlMx6mfTSS9eHs8NKJIRQx44fStOUFAjpwkAlmgBR
+en48WV6+oO3OD7/nT//iaxMVJlFau6Ln5huu7O/vb25r9bMBADg4Dzt6zslfz8BIBCAUImBnV/fI
+xM4FC5uWLep67qXqzn39+/YN3nj90gP7jw+WU9+TAnLGghfKaql07MTgbbdeUZ485ens7Hb5+U/f
+KDzO5XI6tQLD/v6Br3/ryXvu3XjrLR9vCEO2cf9I7dEnXmprb/jSr0a5XCYMvPfcfPHmTdtuueXy
+tpac01Gk7SOPHhwanvjSFz/Z0Rz4Ge+O91371a9+J2AlwU6OHLvjvWvfd8sGAIrTcYJqtRQnqXtp
+x9577n6QIOf7vhAcVSthmI0dsTMBp7/y6VuHh0d/cPdWkWnmdPDDd3ygmM2cOnVqwdJ5xqaeChyx
+fNPbG84pvr6+XZYNIDsHPT2zC40N7GrXX7cmn22r1NKHHnrOV7Ubrl0uIGt50qFOjbZkgjD30/u3
+fO0vf3h4/2jfwPDw6MTYeNmkUicyk20SgVyycsEf/ennfuVX33fjdWtdJFCKp57cXK3poyfGNm3a
+ySAEwh13rr9o2eI7Pngts5Uq+/iTT5/u19VEPrFxOypRKpWuunrl0sXzo8TEmrKF4kRpsn+wr+/0
+0NioK00WHLggU+iZvWDhomVK+dq4VDvfyznnQHpJLbr13Ve/77ZrvvrVP9G2JU2ql6xbducHbh0c
+OO0Ym1pblOcxwZvHHc5LKiJjzNDQ0KbHnuR8648f3/3AI5t96121fv4vfPCSjU9sufuxoXzGc86h
+CC1EnTM9T9uinKmzlbFJk6Qy2+CvXTf7333p420F6TH7fkiM1lrP8xihWklSLRDCfC4tFouOLQEc
+OHBg4byFEpUzbnJ8zDhiBPBEviFI01TK4KEHH1m2cHmQE5lCw7e//ZM/+9O7Qr+Ymolf+qXbb//o
+0mQoFClVde0//8F3hks+elZACVxRm2hx96x77/7tv/2Hf/jTP38ukw9zqvTtv//Pixcu2rt376WX
+rW9paTozezoPmQDPcaM+n5XmzPO8tra2WXNn7zp4dN3qOVue3V8pRdt3Hlq4aP6KdUtf2FvuG5hU
+oWdMlPH83/q3n50zS3HcKLPq2Wf3/fmffa9/UCfDA7/28Q9hxgMwOoUgUNKHRNeyudyMjiZABQAI
+EoFcysi4fNFFjkytWsrmwhmzm4UIktRK6VWrZdZpouNLVlysPGa0ulpauWTuv/3iRz2VJYgWLerC
+csGz2kHZD6TwkQU5a3NBc2JqPge/9/ufOHS07+tf3xwUwqg0/qtffM/y5csPHTjY1dVVKBTgzNoI
+wqtDFt4m6KcflGn0gyCYt3juycF+P4F3X7Punp9srKXZ+3666QtfuP7WmxZ96x+3JDoQ0pna5J4X
+9iyff6mVFWvplnetXDC7uVKJume1zWz3nLFhmK+lVUD0ApXLN9z/06e2bNnJKIQQTMGKi+Z94mO3
+OlNOdFXKoNjc+Njjz9z/yAtSekp4ztaWL5l787uucrqSz4gktQQOwa1YPnftqqVaa2t0LZ6MSilT
+msnlD+4/PTaWMObCIExjjqvJFz5zw+IFXXd+7MulJAxCb253/rb3rK9Wq0mSzF8w1/dVPTsCIrLD
+N5969JyG2VeuhNWjFds7OpYuXvTic3suWTvj0NF5z7/UbyfHf3DPpl+6c9V73r3mJw/udkb6nv+D
+e5+p1sS1Ny7rnFGsRJWLVvUAa0ZbiSalbH52686WlnD5RQuNhsq4+ZM/u3fXrlPS85TCOBGzujIr
+V6+ZPSsAFDqy1Vj8xdd++OAjB3K5BiAbRSPr1s1fve6ywFPOJCAhTeve6XEhKU1TJKzVEiLS5B0+
+PPKdHzwe61D40mmdVvUVG5Z+6Usf/r3f+dv9R4bzzTOT8bFP/eKts+d079y576LlywuF3KsQeJO4
+w5vR9a/yGVmwlPDDP/3ZicHjVnX/1d/9dGRsTFH4gVuWXLxhwaZNux96+KAKm2OTkE3aWjLdXY2z
+ZnaEQaAUpjqu1NKTp4ZPnBromTnbUeSFmGox0F9jDmQgtIlQgiDT2dboSzCpVl7owO/rHwH0jWbP
+zxibCJXOnNko0DqTAubIQegF1qXkUqWUs5JJkRxxFI6MDUfGhUEnENXKfSuXLvrOd3/32Sf3//vf
+/Krzc2lU+dgdG77yW786MDyiEK668vJpT1994UUK+eYVzhuGfhrxV0HPAGRocnz47nt/HDlds/lv
+feOZ8YnJnK+uv3bh6jWzDhwa/NFDe1LKKo/JlKULkiSphzUwM0oR5rIoBKSSOAZpHaPnhYDSulhI
+R+AhoXSeTozn+cZoJ6wfKIQYwXcslBdU44oAS0RSesQaWCALJYQxqed5jiWTcAzSCw1FuVwYl8jE
+Yze9a+Ef/9GXN2/a+jtf+X4pYWPL77pm4e//9ufjKkemduklawq5/KsbDvjmoT+XEKjpeOhpNzcz
+I4H0RPOM1quuvjYpTzZn3Sc+dGPgJRVtHnp05779Y8sv6r7zfSua/BTSVCqQKszmc37oq4wqNDdm
+C3lmZiLhWaEEgZLSk1KmSeRJH8nzbEZY5YBVRhpIVU54oWRkEJ5xTihRjUqZQCpP+J7nK89TOc8L
+PM/zVJAJGxh9oST45IUCgBVm4rIhXf7A+zd88xt/snXTtv/w5b8bKo2bNFm/ovt3vvLLAsOh4dEV
+S+bnc3lr7dntRUR402bhuUD/qm6Asx3uQAbE4mXzbrj6psETp4tN5Y9+9A5W6Lzg7vuef37zkZWL
+m9//7qU5CHWcRU4QHIPz/dBoAgeSwGOy1gjhBTKLTrlEZ/2AjRVOIZQFRgIjoQxhAuiICIitAaUC
+nZrA84FZWvTIk6mQKMAahc5ZLRDAOaZEigS5IiFFp01t8r23rPuzP/93P7r3/i//u3+smSL6rUsW
+t/3eb382p3IHj5zqntvZ0dFGbJUS0+hD3cq4sLr+NfKyqZsk+onHn9q4cePMmTOf3jH46KMv+LID
+dPld13dfccX80wO1nz744qEhymeUh4QOnRWAEjy0nPhoiAWzFOhZqicFYEQnYCq4t55xoX5GlahH
+siFP2x7OsUDJzE6a+gPqiIQQyIIIPQysqFVrTjn3+U/f9Fv//uP33vPIr//ut9OgPWdKzU3ur//q
+v/TMbDzR29vS1HrZFesB7L+CdNJ8xuCqp2SrlOMnnnhi48aNM7u7t2wZefTplzggY9KrL19963Vr
+IY1+8sTuXXuPlWo2UyhIBWANapfxwtgIqZCRiBwAEAIAClQM9V0cZxIt0BkaYn0N1kkpHZO1tt4H
+whKRL0XAAi2lDi2DMJqcKc3v6PpPv/6ROz5wxd98/f7/8gff8sOGWpq0Fswf/rcvr101+9jh3S2N
+bVdccbVQQODE+ci/8rryFh6YUS7Vtm7d+ujDj2fzmZFS+OPHdo+Uq57gRTPyN121YPHS7uMnqxu3
+Hn9hz2EnKJ8JSRtJPmMoJBJrIls/zMVaTUQog7Oq+vLmG3AopbTs6muQQkkA0lp7nAPlCFNtQckM
+W3ZpVCh4v/yZ2z7z8ZvHh8b/8H9877Et+xMjOJ247sqeL3zhc50zi30nD8zu7lmz8hKpFDFMn/H2
+Vsh5TqLOzFJK55iIPE8yw30/fOCJJx8uNBS9bM9dP9zS29fneyDBu+mKWVddvT6TDzZv3vP0M4f6
+RyxkfPJd6JjB1YMjESWT9IQPLAjilyt9Js2gc84XihkZAUEwsyUnBEopNRuQwjKw9Si1Qk/cfP2y
+3/z1X1q8bMbX//7pP/7L+0bLWilP2NInP3rFZz/97tBvPHHycE/3rDWr1zojpBLGkVLw1mXyPs+n
+NryyAABgrXn44WcefOgnwLpz5uLHnj7w3K6THDZybWJud+NtN629ePX8qJY8+9z+p7YcHBiLlchZ
+lwShkoKIrNbWUxlEIfGsMKazYxowZUZyzCwZJQAwOwBA4bET0WS52ICrV8/83C/feeO1V+3YtuP3
+vvrNrbuOgt8sWIQ49p9/88PXXbeBbOOp3t2zOmeu37ChvhgECAxgXeK96QwgP0/OP/TT+U+n7hCx
+cM9u3nHv3XePj/d196zefyR96rld5VgqFB7VLru457prFi1a0GlStXXzrgeePTA6UtIpIwRBJiRO
+pLKpSxQE09MI5qlqCyESIAAx5Y4hcmTYGhRgqkljTt7+7ks+/pF3rVq7+MTg5N9++2ffv/upqJYJ
+vJqujiydV/yNf/+x9Rsu7usvD44NrJw/f+Wq5QDADNY5pQQiA9C/gmEWzmy4rodlvTz9I43CZzAn
+Tgz+43fv3bVvW9esboGdj2/Zf/jwYSGEMZzxgktWz798w5wN6+dZFR7Yd2L7tqN7dp8aG08mSxUh
+ABWCqvelVEohYn3XPzM76SVJIlggEDvtKeiY0dwzu/PGq1fedvONM9pb9+87eu99j/34wWf6JyLw
+fUhNU4O+87Z1n/zoRxoKLcdO7kTPrl5xfU9Xcz1FiKif1UZWiHo2h7dK278lZ5WcwZ2JyArlgUGS
+ZF3q6Pt3/+TF5zd7KprRsejw8fGdewYPHB41JKUiJdM5czpuvmRB95yZc+Z3CQ8nKtHuXcdPnpyo
+VXmkmlYqlVKppHXdtpkKZ8tnuaWpsbnYlMuoOT0z165ZPG9eZ0M+GBwe2bbj4OMbdzyzZV+1Cr7v
+Ox21tTZet2H2bbdfvXrdyrHR8uTEaEtTZvWK1dlMAYRlEAD1M6oIAYiEeCvH2bfvSDA6E+h6+PDh
+Z5555uDBw2EmVyi2DQyXnn5mx8EjQ9aFjnwHpcZ8LhsEixfMWrKwe82q+QvmdhgTCREGQeD5EqaS
+O7Pv+77ve0RCeok1LIPhsfLO3Ue27di/a8+BE6O1ODLCej4ItpWmIt1009qPfey2eV1zarXayZMn
+lSdWrVrV2dnhnJMS/xUfCfYvyGuDs9I0PbB/77YXX+ofGi42t2XyLacHJrc+t3P7S3tHyh4iBl5I
+RM6k2WwQhtjc3DS3wysWi83Nzblczg9UfctukiSlmEdHx0+dHhgbnZwsxVFVA/pK+oDW6Nj37fw5
+bTfdePkt776ms7PZ6trpk4PGmHnz5i1eslApUX9YiawQb9Opx9PyNrG+7vapJ46vF4CgUpo8cOjQ
+/oMHKtVarlAMw3yq7TPbjm5/afepvqGJycRZkSkUtXEg0CNb3y7KzoHA+g46Zy2AD4jSDyQysCGd
+OKPDjDdrRnb16iU33njpxRcvaSrmk6g2MjRemYy6urvmz59faMg4N3UE58tVenvlLYf+dZMvM9cP
+sgZAGBke7e3tHRwcTFIjpSy0hAjB2Hjl6PGhPQeO7d17uH9oWBsXxXmnNTgHSoFEcA6IAFFIG3i+
+FCDBzWgtLFkyZ/WKRYsWz12+bEFjsQHRlSfHR0dH46jW3t6xePHShob82dWAC3fm79t9/GP9AUdE
+YHAOUEwlgq/VkoH+oYGBgTSdBBBSBMWm1sDPaeviWtLbe3J0vFytVsvlchzHWmsi9n0/k8kEOdtU
+bGlrae/q6uqZ1ZnLZQC0MelkKTLGTExMAkB3d2dnV3sm4yMwQgCvBL0+V/g/kPUA4JzDV57f7ZwT
+khkYAQFEfX95/dzIyVJNa12enJycnEREKSAMw1wu11jIBEEQhlmoP0P1rTnMFtA5V5qs1Gq1ai2q
+VssMDoQoFpqz2Wyx2FAo5LEe0APAAOqsB/FCqZq6vOXQn210TpeJCISr444A09ZF3R9rjPM8aZ01
+aRLVKpVKJUkSQq/eN3UvBQDUE+AJq6aO9/VFmA3y+Xw+n89lcwBETAAkUABjPVc7OUD56jH//2TW
+wyuNnKkyA5zZU4biTGKvaUxw6mNnzY2d1tpaOhMMMbVU4EkBSH7gARMzIPrgAABYAk79CAMQk8Mp
+cKfcq3CG7+cWHf/m5YKdLf6OXBg1947AO9BfQHkH+gsm70B/weQd6C+Y/C92356QQ88IkwAAAABJ
+RU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_scion" model="fleet.vehicle.model.brand">
+      	<field name="name">Scion</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAvwUlEQVR4nO296Y9k13UneM69922x
+ZmbknrWvrCqyShTFfREpU7RajYEh2MLA47Y1bRvQeP4Kf5xGf7dh9Jc20B5jBu5po9XjbsgtWyYl
+kqZEiqy9WHvumZGRsb39Lmc+3IhXUUsWq+iSWerhQaAYEYz33rm/e+7Z700kIviSvghiXzQD//+l
+L6H/wuhL6L8w+hL6L4y+hP4Loy+h/8LoS+i/MHrsoL8jziCiB4w8ip89+CVfLOGvBJdw15SMEiL+
+c3LyqEh80Qw8KO2E7+iUWHm3v3z85+NXQOpHORwF1H7/+EO8Ez120BdiW3yEIb53s4qIxpjifXHh
+HTd5POmxg76gwloyxuC+uh7uWg1EZK96nOkxhf5uDc4Yu1uQR6W7mKpR8X+c6TE1s6PYaa2VUnme
+I+KoLBtjiIhzjohEVHx0HMdxnMcf/UcJ/d12j4gQafiGAwAMpZnQGDIMcPA9AAAYY3IAC3QYhlpL
+z/OyLOv3+yqXnHPGmOcFAJDnymGcc65IMcaUUsYYrTXn3PO8UqlEwNM0DYIgCALO0HEc1+UIwHa2
+JUMmCAAAEdCQMcjEHWvrzt9/XvqlKxytJWPM4ktDQkRgiDAYQJokWZbluZJSJjLPssxKOmPC8zwr
+6TqXrutaAbfizzk3xgjPlVJKKTnn9n8ZY4QQ/X7f3pyIPMFd12WMeZ5XLvmO47iuy/mtKVdK2XsO
+7Lk2RMSEZW9gaQpT/6jW06OH/m7nmojs2IQYLDJjABmEUdjr9ZI4k1IWs+K7gQFyXZdzYQAYEwCA
+nLnILavaSAAoVEqa55xzIQQiWqnP85yICIwQwhgj08ROWJZlVi8BgOu6JUtl3+FiyDkQGcswg6HB
+YI8Y8YJ+6VJ/22oFMAbSNE2SJAzDVObGGM455w4ADBC0eAuhDEkpM6mzLFPKpFGYpikRKZ3nea6U
+ynXOOQfkjDEhBGOMiMrlslU4Y5WynWwry3Y1KKWM0UZrpZTW2hglkFUqlWq1Wi6XEZGzAc8DdH6Z
+BuORQX+3XIy4HMwQSCmjKArDMFMSEV3XH3DAGOcckWmtjTG5VkmShP243e2EYRxFUbffS5NcySzL
+MmOMlBkiBuWSleUkSax2sgrEmtlyuRx4Jdd1x8bGpqam6vV6uVyuVCq+72uVEpHOJRE5jtBKZVlC
+RKBNrVar1+ue5zH8DOgfySJ49NBbT2PUF8xz1el2e72eBgqCsud5AJBnUrgOACilFJk0TVtb7VZ7
+u9vtdrvdfr+f57kQwipl13XrtYrneY7ncs4rlUqpXG02m9evX6/VKpOTk/Y+aZqmadrv98MwTKJc
+a52mKWPMD8qlUmlycnJ6enp2Zmp8vB4EAZBmBESGjGEMVDZYTEEQNBqNarUMAEbrwiRYTfUIPddH
+DH2h6IsF3mq1e70eMjY5Oe2VgiRJ0ixzHEdro5Tq9/vNVrvVam1ttzqdTpZlAFAqlRoTY41GY2Zy
+cmxsLPBd3/fr1TITApEBgNLQ6/UvXb56+vTpl1949tixY4IPtBkR5Hne7XbDKE6SZGNjY6PZ2t7e
+brVaSZYTUblaaTQau3btWpibbUyMVYISkcnzvFIOtNZ5nqss11oLIcYn6vVa3WhtxWh0aI8EsV+W
+rs+yrNPp9Ho9zwuqtZrv+1kmpdGMc2NMmqbdbm9lZe3G4mKv11NGM8ZqY/Wpqan56dnZ6cmpqSnX
+EQKBMwBDwAhIAzBABGDNzfbV69eXlpZW1zd/49tv7du/lwygVdP2DQENtDYogna702w219Y3lpaW
+Fje32+02aTlWq85Oz+zbv2ff7t31eh3BwFBfkdJhGOYydV13dnpGCGFlf6ds0uejzwN94dsOlYwh
+Y5RhQjBjABE2N5vdbtdxnLGxMVGtaJWDlJyACNNMray2rt24cXP1ehKHQoi56Zm5udmpyYnp6enJ
+yUmPAwAYY6xPaYyxC4gxYYzhjG+1ti99eiU35vyVKxvN1vf/l9+an5+3zMCIT3WHhBYe1NLa5vLK
+yuXLV65evxnGCTJnamrq6NFjh/bOzc/OCEZKZp7nceEmUvWTLO62K5VKo9Eo+w7YqUVCAiJCxuCf
+gP9DQ38fD5eI+v3+1tZWkubj4+O1Wg0RpRm44VmWra2tXfr08o3ltTzPBafp6enDBw7s3bt3anJC
+cMYAtNEM0PoqdzKKCABxHF+9er3Z7iRSfvTJaYPwv/+r356amoIdEm13hEJEpJEhQpzky8srFy5d
+vnT5ysZG0xgzv7Cwf9+eJ08c3TM/z8gQkRBCSqk1tVqtPM8bjfGpyUnG7pHg+3wpo8+vcIoLCy2/
+trYWRZEQYnJy0vNLNswRzMmVWlnb+PjsmWs3rodxVC4Hu/fsevLQ0dnZ2cnJcQ5gyDBkOHK3e77R
+Wt+4sXjj5pLw3O1e7733P5idn/vD3/5urVaD26+9H8NoRZYAmTKwubl15vy505+cvbG+gYjzszPP
+PH3q2JHD0xNjHgeVJgYDQBOGYbvd5hxnZ2crlYpdizaMuGPBPTj9kxIJSinHcQAxTfPVlaU0Ta2w
+u14Qx7EQwvPcZrN9+vyFMxcubrXaXsk7cGDfkcMHjh87WvMCzjgA4ECFmyF2A4+iGIn1/QFgbX1z
+bX2TkLmenyZbWutGo+G6LjyYtzeYSJAMOAERkMNgfnZyZvq1p5868bPTZz45e255abnVan/66ZXn
+nvnKyaNHAq8cJ9Jx+cTEhOd5W1ubq6urE5ONxsQ4ACJnlrfPp/cfGvpRT0Y4DgG0292NjQ3X4ZOT
+k2NjY1muwjAMKlUh2KUr1979+c+uXb2RSbVv375Tp5564vDBiUrAEQCYjS0Rb63WO8Tc+qkDVZMm
+m5ubYZxU62PInV7YJ6JatWzzBw8xAEMwCFVt3EEOE1ON8bdef+nogT3vfvDR2XOXLl2+utXcXl/b
+evnF52fGK2GYJkk/CIKFXXuaWxtW/8zMzDBkwEEZzfEeWdXPpIeGvsCdMUYAW1vbm61tAmw0Gly4
+YZQAF5VaPYzis2fPvvPT91rdVqVSe/bkya898/SuuVmXARKAVlLnQgjOmVV6hVW8LfodydevrqxH
+aeb6XlCupnkWxzEyGs3DFHT/FYBMwNB6AwBpY1ByxgTi0f37Jyem9s7v+vCTs0vLq+//7MPltY1v
+vvbi3r17g8Dr9XplP5ianGlvb/e6vVypRqNRCUqccfhcSvvhFQ5pRI6IUplms7nd7ZVKpZmZmTyJ
+FQFzXMf11pvbH3zwwS8+OZ2m6dzc7AvPPX/qxIla2Qci0ASMAXJHcLgl48xidQdqhYvS6XRarRYA
+VCo1L/D7USyl9n2fsUGm6G7B31n/MmOgWGdCcGMMIgC5QNCo115/+cV9e/f86MfvnD574ebNm//x
+B1uvvvzKUydPuJ4fp5nniFp1rBRUVjaXjTF6YqJeqQKinUsEfHCf56GhN8YgY4jY7XZbrVZQqY6P
+j4dhiIhgpOcHW1tbP/r7fzh34aIh3LNn71tff/no4UMOB1ASOAJDQjAjmeKRaIWN6HdgDOyUKGU2
+N7cYYw7jru9z7iRpqsmUSiXBeJGnu8Ps3/1+QATFF/YpgyoYAhhAIgZwYPdC7V/+i/F6/b2f/bzZ
+2vrh3/33KIlfeO55z/OyJPEcRwgxPz+/srKysbHhu67nejiUHXhgzXMfl8gUZU8AUEoBgDaA3NEI
+rW5vaXXFr1TH6uN5Jo0mI3PHdTfbrf/03/7rL86c0VoeO7DnN976xpPHDjkCAAGEAygAOQLcoSaG
+Cdvbnk4A9tVsb7e6HeEGpXLZ8cD1IAp7DLDkB4zDKJN2/NY3xSHdOSy8Bc6oQ0jGIANlNCEAwmSj
+/s3XX/r1154vVca2O+E/vPOTd99/rxuHTuAnUsZpqjXOzCwYaa5fuynzHJGUyokpa58KX9ayN8rk
+g0APha0DAJvvJSJFkCTZ4uJiuVytVipS5fZhTlDaard/8F/+5vLly0rlRw4d/uY3v3lw/+773P+e
+NKooECGKkl6v5/u+67qu63qehzTweYps5ei1n8/PKy6x7opN5NXr9ddee+31l16aGh/Lsuyn773/
+0S8+6ccRE1zRIPdZn2gAwOLyUp4rx3GA2OiU47Csdk+v/7OhL8ZmjOEcpdTXrt1wHK9er+d5TgAG
+jOM5m9ud//Sff3D58mWdy1Mnn/yf/uW39u+d/xzBHg71pv3Y7XajKCmVKp7n+Z5X8nwrSnYmYATl
+f2J2xSJuKwfWazLG+L7/a6++8MarL9Uq1TiOf/re+5+cPmuM5hyTOLWpnqBSDvvx2sa69dmKG44q
+wHs+8bNjMMaYMcZG9sbA6sqakroxMamVsdlag5DK/O1337v46RVjzLEnjvzaG28szE0bMgD3WGif
+SYXwKmXiOBVCeJ5nK66u6xpjwFDg+a7rWgY+xyPuSTZFWmgtu5oFwktfe/bF55+r1+thnP7jzz64
+ePkyE5w7QmmTpGm5XK3Ua91Of32jaauJhXopshf3fNxnQD+SQmEA0Gw2W+3OeGNyMGZCAEDOPvjo
+5x/+4iPO+cLCwrfeeuvgnl0MgH3OUPnWbIVhLKWslKsMuSsEY8wiAgCu6zqOkySJrT1pre0ln1vw
+R/Wy1tqWWRARtPY8/o3XXnnqxPFy4LXb7Z++9+7V64uO7ymlpFRRHLuuz11veW01SjOrA+2taFjL
+vOcTd4SehhcXCYooitbX14NKwBjkeW75K1Wr167fePsnP9Va16vl115+6fC+PWgMDFyLh85s0DDX
+L6Xu9/uILAgCxoTV7MV4hBCO48g0S9PUDu8+8vUgVOgrW/W1D9Jag+BKSlfAay+9cPTQflc4m832
+L06f6/V6buADZ0mS5lJ5vk+Ei4vLVl8V9ywGdfcTd4Rm1GmzJf9ms0lEpVIgpUTEPM8dx9tudd55
+56fb7b7L8GvPPP3MqVMcgCEjbexdHhaCgsssy/I8t7g7jmNFvpAjzrnvuETU7XYL4O4wTg/73FGk
+bIsDYwwQhOsYLacmKm+8+vLU5ITRcPnK4vmLF2yKjbuOMYYxXq3Vu73+9vZ2gVvh8j4c9DAUActQ
+GIbb29v1ep2IpMy11uUg0Fp/9NHHq+ubjIm5ubnnn32uErigNGjDOAeAe/lUn0EFfHmeA0C5XLYj
+vMUxDQTTFrC2t7dtgWXUpXvopw6vKlIXhfukAAwQoGFAu+anX3j2Od8Pkiy/cP7SxuaWvSpT0uoA
+z/PW1tYs56PMPLSHY1kxhIZgfatN3CXuSIWMcZUn3BXNbvv8latJKiul8uvPPr1/bhqINAIIRkAA
+gCPBwT0VwuiXQ9MKAEiEvV7ouq4QwneFkYoxhgZIIQP0HECmclLouJvtXqsbElgNNzBLBuywi6fc
+9qZQxKPPLbzAUZeJMSYAGCBnDhG6jvvUk8f275p1KV9srl+48qlUhhsocccobYwJKuUoNxutDgyW
+oEEwAIbMPXyB+0DPrI1lDNrtThRFjuNIKUFJo5VXKqdZfv7ipbW1NQQ6fHD/iRMnLLu2PcYOz2oJ
+64SMZsQKQ1Rkg2Ho3jkOR4Q4SYxRrusSGa0145Dng/YFYEgExhAACuEoostXrkSpRAZK2VyuZHbi
+R5LqQzRBKWVRHoV4ZxAGc2O0tliOj9WPH3+iVCoxghs3bjSbTSY4IQohCjXV6XSyTA6eYuUd75Fr
++gypt2xtd3tSSuG4xhgEbeHb3G5fv7mc5Xm1HDxx+ECj0SjkqOgPGMW3EK5CLxfhT2GXGGO5kjSc
+DM65BpJGZSp3HMFdQWAYY9Vq1XEclWmZa6VpZW3zytVrWoMQrHDJAG57EWn7pih+3eEF3hPxgsNC
+RBjA0cNH5menGWPNZnN5edneSkppf+l5nm28sLe4z+zeD3qbm0ySLI5jx3EGdzE6cB1Atrq+0dza
+BoC5memTx58Yhbj4sfUFC4ehGMBonrLwCy1qjnAAIJU5cwRzGABYZ4YYKZUjY6VSSZGJwoQxBgaF
+6xnAM+cuXPz0ijYDB+kO3ToabRVhyqhZvic09geD2UEOw36sqamxI0cOBb5vBb/X6wnXMUCMMVLa
+931E7PV6AEADeO8N8o7ps8KX7/V6aZqWSiVrScAYIorC8ObNm71eh4ga4xOB54RRUsDHOVdK2TnQ
+WludYydASmmrzLaGVTyocIeZI7rdbrvdrlbrwvHiOLY6VxlNwGwA6fu+lDIMY6UUCKaUSvr9d376
+kzDqnzxxPE4TpdSoZbY0EG0a6HSiTGvt+75t77HM3D0Hln+tNUNExhSBEMIqHKXU5ubmxlazVCqN
+KlLGRa/XS5IkCIL75NN2hH6gEBDTNJVS2oK/MQaYyLXRSlZ8f9/ePVprz/POnr/ImCiCN7vkOeeW
+7yI4sP9yzqMoYoxJKT3P8zzProNB0yTjaZpqrac1KK2zLEPBAcBIxTnnXORahWFojBGCBUE5znOZ
+pb7vZ0l04fzFfr9viBzHESM9BIWSsVBa1yhNUxudWA12hw9efNTGgHXVtVFkEBh3xOrG+szUdMkP
+bHStyHDXUVkOAHbW4zgKoyQIguKed0/q/QJO29ly8fKVTqdTqdbsLTShKxgZvd1ug3CF63mO8DjK
+YeeTba+0A5ZSoiEAEELYRcMYy/OcMRaGoeM4NkNQJE8YY1qT7ZV0HEeDtm/sPYnI8zw7MXZ2iUg4
+nlFaaz3VaABAL+oZYxzPJQUwsgqHBgCQkb3cftntdhHRNtjCHQ25I+45B140kTMhpMnHxxq2C9qQ
+qldriEhKa60NMI4U9nt7Fub37F64D/Q7Sn0h8kmSWOCIiJArA64A0GqsUuZesNHafvuDD9bXVoBY
+lmXWvXEcxwJUqVQAIMsyi7it8TPGnnnmmW+99RYinjlz5p133tnY2LAYeZ4X9mPXE3K4zK1DYv+v
+7/v9fr9Wq/3BH/7rIAj+/M///OrVq8ePH/+d3/mdmcmpy5evvv/BB9evX8+VVIY4YQG9ddKHUi9t
+hqDRaLz00ktPPfVUt9v9sz/7swsXLsCIA1YIvnAdRIzDCA16nqeBCE21Wt2za/d3vvOdXXt2Z3mC
+nMVhFLgeIhptiDQRpWlqdSntoHTuUyoxCFxKHUcZdwTTBGAcgcSM1hwYD4LKRnPzL/783/+Xv/lv
+ru81xieskvE8DxGllEMxF1a/p2nq+761/pVK7X/+7nff/en7/+b/+LeffPLJ5OTk3NwcoPE8R+Mt
+z8+mU+ysO8gMQK/Xq9Sq7e0uEPvxj3589uNPOu3wu7/125tbnT/9s3/3wx/+MAiCPXv2BEFAw80O
+g9U9jIHDONJaN5vNZrP5wc8//OM//uNGo/HJmbNnzpzxPO/gwYO75heMUUXJ1/W9NE1rtVqe59xx
+Pc/b3t4+ffbch+/9o0qT7//R/1YqBaCNQLSRFBgJzElyihJFmgEZRALgdydx76frASCVeSZzbjQR
+MQZaa4PEBNgE+tLNxbffftsY87/+3ve++5u/KaW0Im81hpUyqbVFsEg05nneaDS6/f7fv/33H378
+i4WFhT/6oz968cXnkZExhjOnYIBGiNukrtbGmH379l359NMgCCYmJ8fr1Xq1fOHChXd/8rZg8Jvf
++Y3f//3f19rmMe6hQGz08KMf/ehP/uRPzp05ff3qlYW52V3zc59evLRrfuFff+/3vv3tb6dpamMR
+YwwnQESrwRljjuO0Wu0//dM//cH/+58//MVHGxsbR44cjqJIKaW1ybJMm5wJL0pi3xXaGC4YABDQ
+3ZXD+xUIjTFZloVhaIC5rus4HBkxxrTjep5PRFEUJUnCAIgoDEMpZbFHAIb2SoO2M5Fmsc2AS5U5
+Ls9UutHcTPPEL3lHnjh85NjhOI6TJHbxTpYGWtIQMDTGEEPfFXmeIhmZJYiESL1ep9/vep43OTmx
+Z88uW8gteiULlqwQTE5Orq8uT06MLS8vp3FIWmZJpLXsdtuMsSAI8jTmSIhoAIzSruvZOqJShnO+
+sDDn+67WutcL4zi2w+xFUbfbZSiUzgyxfhQjGalzF3yAewF/f13PGJdSttvtXBnX9zzPE4JxBlSr
++UkiGI+iREsTRdH/+R/+w1/91V/BMPU6Gsoiu1UqU0pZc/r973//e9/7HpAGQ0kUZ0m6ub4Rhn3X
+deNcj2Y/RsMZ4ToDxykIsixLkqTf63W222mcMEDBeGe7nSVpr9ON+mGap6PefbGGSqVyp9NpNpvd
+bjfLMilllmVRFCVR33dFGoftVrPdbgOANIoxhpxR0mdsUDzpZaFgPMwia8CklKmU3TBsNptJmmtN
+UiVJmkdJ5jnCIBBoO/V3I7yzwgEAACV1s9WO0ywolVxPCCFcweMkE9yN47Q2Vv/9P/wDz/MyKYkP
+Mrd2ew0Nc79suE+jXC6fP3/+r//6r02arq+v97c7WRiDVCrN0jDSaU5S5UoD4R3ZnsJfGuzR4Uwp
+FYahzZplMu/2e51eN8lSTSaTeS/sx2kCQEV+YtRy9vt9RIzjOI7jLMusH0FEaZLk5XIcx/1+P0oT
+xlieZ4wxBUYp5QiX2fBCKWOMlDLsdnulUqffS9M0SuKNza0wjJXRSuVJJrMsW5idHMrNvR37nRXO
+0CiHYdjcbpdrVcYYcuDIxut13y/JLCXEfQcOWJumbo/R7RpnjDEaOPiu68ZxXKlU+kRKqZWVFaUM
+Mtbv9z/88EMb4idpjENdfwf0toRiEIho7969cRxHSQycZ1nWbrf7/b6U0nXdlZWVxcVFxlgq88Kp
+L6DnnHvCSdN0fX292+0aY9I0bbfbeZ4DcmOg3486vbDb6xgYphkMcc4lpcYYKbXvep7nZWEKnMdp
+GoZhPwo77d7axmYUJkGlnCWR1BSnidZaawngIOI9/fedoScigHK57HhukqTEOTIwAFpmrus2W1tg
+6MaNa3/7t39rl2fR/3ZnoGBo6LDrOI577d7cwsJYfaIbxeV6za9U253uX/xf//cP/uvfWNVk6Fam
+qbCNAGCURMRcyfHx8d/93d81ShsDYEhq2mi2mHDHJiY3V1f/+9/9eHNrm3OeZOloqqDIHHiOS0TX
+r1/P43TfkSNMuEsra1GSgTKEvB9F7W6n1+tLrQaJBKUdx9FScc6NUtKT/TAOwxiUcl03z1SvG7ba
+21EUGWRhGFnujdKlUsnhw02TdI9swv3MLCLU6/WxsTHgS0REwIzRwESn16/X63EYBkH58OHDly5/
+6vu+o2/pZWvNrPjnhowx5XLZ5hJOnvzK3r17p6dnl9dXT5w6BUK0Wi1rrIxRnKNliW5PPKFtxwHS
+WhOCjYP2Hzy4a9eu8anp9c1muVx+61v/Ynl5OUmSZmvbdV3rk4wm5uwsGJMrpWbm5vfuP7B///5S
+pZpk+fyu3cEbZc/zhOs1m600TxCRGGqtiTOQKSnNOScNHpGWMhivHXnyyeeff368MbG2tpamqdSa
+c6aNYYiGCBFrtVrgBwBFwe4ueHeMZskAMAPwF3/1//zwR38XlKsG0AC4DBljc3Nz7XYbiVwmXC6y
+NI2dgVgNOna0Hoxf35ahLMRQam3dUBtnDhPUbKfyChOeEII73EaeRmnUplaphklMRAhGCIYcpNGM
+O8YYphXnnKHN5Zo8zznniFwBFXGWtUw28HEcbmMIuKOKgIYBNwYEcmM0MUSmlZFlEQRBoAmq1Wqa
+58urazYsN8B1lpRc/ge/96+eOfXkHWmJB5N6HIS/UxMNhwulFHLBOJcyt/eq1+trKyvLre35qZl6
+rZYmHfu9x5gQQhrDtHYZYzjwDQAAhrEiEQkAyjKV5zhcLESkdm6X1FL180xqcn3PKE1EJS9obbcJ
+yfOd+bnZcrksVYaMce4YBE4GERlgs9kM+7FhqGQOAI7LNWkgQCWBSJABBIYMFYExODLxdviEgIYA
+GRqNiJo0Y1hyA5mbjY0N1w/Gx8ezft/Gj67rIrBerH23VKtVdgL9s6AfPnthYb5WqXbC0HFcBkwj
+Wh9xbm6OtC4HpReee/arX/kKallELkKIInMpjb5tQodpeoFs1CAXsg/83inWOEnf++Afz567wBB4
+qUREjuMyxhRp3/ePHj26b+9um6XQWgNywZGUdhyn0+mUyyXf95VSXKCDd9bLBquNxB0pBBpktskY
+QAJjSAghtQTO0jR+5/2fb2xseEGpVCrdXFqxy1cphcBIy12752dmZmCH7M1nQU+MMSCA2ZmpXbvn
+22cv2uYOx/GIMEkSY0y1WuUIpVJpYWHWLxCjgTc12Na006zTSOFulNi9LyCA8bH6RL3+0cdniDPH
+C5IkLVVqhiRpmaapwzh30CgNBhhDwZwctMplKfAPHtjnO8KQYffpRi02X92BFAKYkS8RCODm4k2l
+VBCU6+NjvV4vjmMv8BExz6TRWalUevLY8WopsBUbvCtIHAx0J04sjwgwXqs/cegQ56iHe+k452ma
+h2Ho+j53xOLy0up6k4AMGbtRgYAAARgR0G3VItK3XmiAUfGi4uPt1aVbZSZjFmYmf/3XvvHaKy9W
+g4C0DAKfCSyXy77v93q9KIpULgdbxUlnSYwESRozMq5gQBqMRjBEtkXlthcREmgCTWhg5EWgjVHA
+yH5UOjdAisz1pcU0zYUQQoheN7RLzWgSQiDpuZnpI0cOAwAbbh24p0G9X5XK6mjB8fDhgzNT06AN
+547LB4WOMAyDIKjVamEYLi3fNEDImIHBih3URhGB6JZ0228Q7Q8MkH0Vlxi79e9eL8Ygy7JKOXj1
+xZeePP6EL0StUqqUfcagWq0Ku0GF3SoOK6UYx8G+F0NExBkzWtsHEYAhMDRw/O5grHhZZUTDXD8T
+nAA3t1rXb64Q0bBiExYNqUQEhvbt3T0zPUl39eE+KPRDA68BYGF27tRTJ4Ig4Mg4F/aEjjiO7QZf
+ZHTtxvXNzU2AQXu53S4zfCwH5HcLGgJjwJEYEkMYvoiBjf7uetmajDGmFDjPPv30oQP7SCvfFSXf
+DzzfuivamOG9kQlmTV+1WuWcMyYAOIIzCC6JEAiBgGj4DVoegHD0vf13kOsHrg1dv3az1+sDAOe8
+1+vZxFTgl6yH02iMHzt2zHXEIJDauRyyM/Q0tDZGVcrBsWPHKpXKwEIKx1aaOt1t4KxSrUZRdO3K
+1TzL0LatGbI7XHEoXKMiNhAoAiBAQCQs9ArCbUI3+hp46IYAYGamcejggVLgIVK5XHYczgWi4Iio
+gTIl7VkAWZ5zjtVqlQC0Jhj0BxggjWBs3g3R7sg1aLU4gf26YM/+K7gLAGRMv9NdurmEBuv1OmOs
+0+6Nhu5CiAMHDhw5eAgtevftddgZegRDwDhHowHMkQP7Th0/DDo1SAAkXMd1/fZ2X6ZZrVwBY86v
+LC5uNbVdXIYAQJMxMCrSt4QYiG59GF0MuJPQw6A5hTNjDBDs3bV7amzCIe5w5nme4whEkEZLKZUm
+Q2iA9/uh75ccwRCAc9JGA4Jtq7ltISIHYAP7hGDAGDCAMDBdoAGNIUPAEqk+OXe+H4V+2S8F1a1W
+O05C4TNDudE5GV2tlF955uR4xWdo4xN2zzaQz4AeDDAEIALhAJHvuydPnpxqTGRZ5jiO0UQIcRw3
+my0CVqlUZZqdO3cuTobhuyGODB/pbvSRRhIIgmBsbGxwyo0rXNcbGGzGEYzWut9tK6Xszj8AsPVV
+s0O8BsMuIBppaBgkPhFJD/dzra4vLy/nWpXL5SSN+70eZ47RzBGeEIK0PLRv7+7du3HYLQn3bYXb
+EfrRdgrL8eFD+198/tlBe4FggjuArB8l7W7PL1eCoNxqbp89e15ru40ajTE7rbf7BBoPSJ7njI+P
+Ow53uHAcJ3A9AFBKGanSNE2ieHt72/fcifqtLbUP8twiETICGUPODMHiyur5Cxf6cVyt1IXjtZrr
+WkvmCGScCUdm2Uyj8dJzz9Tr9QKx+z/xfh6OMcauF2TCaM0Qnvnq06eeOpHGYZ5m9qZZLpdW1sI4
+r5QqQjjXb9y4eOmyVZsFPULBL1L5jEG1VnFd1/MdlwvHcbTUWZIlSZJGcRT3szSZmpryPEdrXTSO
+3wcIGnYI3zFJSikC6HZ7ly5dbrW2JyYmgnJpbWO91WohIiJz/CBNMs75Sy88e+zI/kFNjfPbshEP
+12k8fLyUg/o9Axirlr/x9VcW5ma1zICM4zhEFEbx0tKS0VAqV5XSly5fWV7ZAIBBYPnoaBheDpJ0
+pVKpVApsO4nttY+iKMsym3OvVqtz01MwBBQ/qwu8iGALXTE4ZkeIfpxcuX5jY7Ppl0uuF2x3uhsb
+TeE6TAzOsnCQPXXs2PPPfFWwW+zdXXK4g+7j4Qx6lG0rmdUeCLR3Yfbbb705O9NIoj5DEA63OeQb
+i0uIPKjWJJiPz55ZXF0nAHavfa2PihgD13UZQzfwhRBhnERJGsdxN+xnWXpg755qtUxEAMaM1Ezu
+f88i7i9SbFGaffrplWvXrzNHVGtj7W5veXVVE3LPByZ0nif97oG9u7/x2quVcmD0PbImOxmYz+iv
+v6MrEZEEmFNPHX/5uefH67U0Do3SgjOO7PrNpRuLN4Fx4Xj9OP7k9On15pZ16eAR6ZzhTQzY6NYY
+xsHxXN/3NVAURXEcb3c7SZJMz87s3r0b73ou7nyIhLn9BCVrbKMounDx08WlJYPoB+Ve2F/f3EyS
+DDnrJ1ma5VrrA7vnX3z2q3t3z2qt8fY+MHtndq/TNuD+Ul9cZiuiZJTRGsCgUV9/7eUXX3iuiBsd
+x/F9/9qNxRuLi0zwcrWSyvxnH/782s0bDw3wZ5EVZIYDP7pUKjmeI3MdxnGcpmE/5g4/duxYEHg2
+pCJTNPvfr9t/tL3b/rLb7Z47d251dRUAxsfHkyS5fPlqu932Ap8xhsIjhhPj9Te/8capE8eRgDGu
+9C2V+JnS9tm7SnBYzkcmGHfsJZzozVdf+dY3Xudksiw3xBiB67o3l5ZPn7+kiE9MNFDB9ctXLl78
+1FqL4chv9ZvT7a0yNDxicmfEAcBuLhy0kXIUnsGyG/R6YS9KwzQlhCcOHt47O4MANupG2yIPjDFm
+Q7xbkdqIGSya7gmAgG1sbp+7dGWtuS3Kvlspb2xuX718I+6nvhMoYwwjzNPxwH/rjVefOn6Ycw1o
+EIGPpF1HW8kfMl+/IwRoG249z3nl5ZeSPHvn3X/Mk8grBUYpINzY2NBSnTh6aKYxkcfx4tJSLuXs
+7OzU5CQMNyDAyLluBVs4wH9nb4wxm9gABGNg0LIZlKTUrfZ2t9dWuTywf/eRwwdvZVHv8iltZcB+
+SQBFO6ItniNiLvXiyuri4mKSZpVqLSa13dr+9MqVLMmDUklKqaXUZBamZ77+6isnTxxFRAC0QvRQ
+tu3hz0hAtOwiYiVw33z99Vq58uN33m71EkDm+74i3txqfZimh/fvO7h/Hwfd6nR7UZwkyczMjOPY
+wxG40XLI6DDXMZiFz3C9iWiY6UIhhBOUOp1Ot9vtd3szU5MnT5yYHB8D0neHkTSC+HAog1zb8J7Y
+7/dv3FxaXlvnwilVanGaXLuxbHWOXykrrQFN4IjGxNg333j9+NHDDEGrnAuBjLGH3LP3ec7DYZwD
+EYIx2tRK3huvvTg7OfEf/+ZHm62tLMt83yfOu93epavX2p3eUycO12q1PEkvX7/Ri+L5+fmxaoUx
+ZLxwnEyR7iBjdrKEA8kd1rNsSchys7nVWl9fF4KdfPL4E4cOklEM76zuFm/IKGSs2DNjyRiTZcnm
+5lZzazvO8nKlahjf2GheuXq93w+5IwyR1CqJQmb0M6dOfv3ll3ctzAxw57YPA5CB1iT4g0aLDw29
+1sT5EAVEO+dPnjgGfvknP3n39JlzUdivVKqe52VZurS6EoWd48ePz8/PO+C1O91ur9+YGJ+amhqr
+BFYX203WSMZmaO/zaCubNi9lCGzaljtiaWmp09l+8YXnnjxxnHMkPahsjOqZ22fiVp6AAOIkC8Nw
+dXU1ShNEHpTKnV54Y/H62vpmmMSe8JVRUuZay7Fa6emTJ1997rnJxrg1V5zzYr+fIeAPjDvcv8n7
+3uMHIGPTDGZQ0yGmjQbOm63Ox2fO/OznH6+ubQBnjuMI18mS2HXdXfPzhw7sn56c4pyTlsaY2Znp
+crlcr5RdV+Cd0Nzn8RoQAViayZX1Dc55L8n+8i//cnys9lvf+c7+3fM48ptR0ItwrFA7hiAMo+1u
+r9PpRFHkuB5zRBzHS8uri4uL7W4PiHmep5TWWjkuTk1OPPu1p7926mmPs+EhhASIWt9vX/Ijht7m
++AC0xV0qLRxuC0AEePnqzb9/5yeXr17LtOKcO56fpqmWecn3F+bmjxw6ODMz4zmObZGslEuVSmWs
+WgmCgLNbJwTdm1fE4XzzOMmWVtc45z//+ONz5879+ptvPv/c1wQCjvQTFM51kckiImQsTfM0Tbe7
+vVarlUvl+74QohMmm5ubi4uLrfa2bdoFAK11nmaNxvixw4defOHZmcnGoBvLmGEuyx5sNKgoF1tx
+finQD2hYriQgQDQGOOYACOAQQpSo0+cv/OT9d28sLWoQJd8HAJmlHLFSKs/NTO/atWtubs4VzLa9
+M4RK4FcqlSAIqpXSTriTPZKdiIBJZW4ur0RR9Hdv/8O+3Xt+/a03S55LBGSIc7y7wmq79aSU7U4v
+DMNUKiJCxhGx3e2vra0tbTQ7nY7KctcTiJjnOQNyXffAgQNfOfXUiaOHHQSjJWOMBsdtDsg+a/D5
+XuZ9J3qUSV09PIbWitvm5ubZs2ffO391bW2NtBFCMEIksDuYGhPVvft2z83NVatVgYyIBONS5a7n
+VyqVcrmEAOVyiTPAIY6DJD8CEWS5XN1Yv3jxYtjtvfnmm+PjdcuDUkYIZs0dAcRxKqXMlE5ie+pu
+DpgB48CZVGa73VtcXt1obkZRkqVGCMEYECiVZ8zoQ/v2fvXprzz5xGF7kPtoeuc+fQYPTo8S+iLt
+U7AopWx24tNnz547d25lbT1XkjNHw+AISc/zquVgcqIxOz01Oz05Vq85jkP2NHkAAKhUShwQEYMg
+qNbKMrPHpXFbDjx34fwvPvnk9Vde3b17tz2dBhHtIQJRFLXa24wxJW3fIQcAhtwYk2nTbrc3mpvN
+ZqvbC1OZE4ExxuWuIqWULPnu/r17jh45dHDv3unG2OixxgXijx30o3RrdyQBAWxsti5cvnzu04uL
+Syu9OGGMEboA4HImOHMZlnyvMV5vNBrT09Ou65TLZd/zXNfNsgzAlEql7nabMRb4vhCiWq1uNpsf
+nzltjHn9tVfslhW7Ics2vRJRrsBxHM65NiZNszAMe72w1+stb7TCMLTdxUVhxBjDwfi+v2fPrpOn
+njx84EDgCdr5KL/HC/q7RX5QxScFXACAJujFyeLy6qUrV65du9buJnEcw/AkDjRkjPE8z3WwXC7X
+6/VqtTo2NlYOSr7v+74vGDiOIxi32fC1jfXN1tbBgwcrQcm2W9ngyG4qN8aEqUySpN/v9/t92yoS
+p0maphoc0oZxcBgnMkbrIPAa4xNPHN63Z8+e3bsXAtfRRotBO5ABEA/qfT0k/bL+asOITlQ2Xmfc
+QeAAoJRpdbrXrl9fXl5eWl1tbnWyXBkmlAHHcRymAcDuj+Gcl8vlIAgcx3E5d123Vq3a04IMEXAW
+BIHKcrtvi4jsqelJkkgpo0zaXS7GKDsZA/8SiDEmGFTLpZnpyamJiYWFhX17d0/UazTckQGkqfgr
+K8PQ5xGqmsENH6HUFwfNwgiLEnKEQeChlGGAg/wBqjxX3X64sr61tLK+urG1sbUVJ5nMEwAgAtuV
+T8M8jzHGEQIAGIEGYoxxIVKZCxj0DRbNqtbLNsMtEsYoa5yFEEEQjFW9manpmZnpXfOzu+YXSp6r
+jeQ4iOwYMsBBZ9Cgm4gQ7wrNHgn6j1jq7zZEZB1QMzzClQAAlJTCAeuHETBjIEqzbrfb7nRX1ze7
+3e7mVtM2uOVKGmO0Ig3kMJ7nOWeMcS6l1EBMcG5uC5dsWsYKQSnwfN93HD42NjbZGB8bGxsfH1uY
+ma1UKi63/hIVGR0adhwOTvJhCIjmrsMJHyE9MuiLaOJOuaBb/x3sRwNtMwEMGQzXNZABsDumPG2g
+3w/jJGk2t6IoSmWulMol9Xq9OIys6rDHrhggpFt/E4kx5vu+7ZApuc74+Hi9VnVdUa1Wy4FHpDnj
+YNhgYxONdFiStl4QECEBMCQAW3DiIycKwSNVO4/FX2PbiYfR4dlK6VB932oWh2FFSQzJKr1HaxJ/
+GfQrA/2DXHvPfNnnuOc/Dz0WfwjvQcppd0N8RwkUdob78aTHQupH6ZfkRD+G9NhBf3/6H2lifsWg
+H6VH6GJ/IfQrA/2DAD3aYfA5ahf/zPQrA/096Vda//xqQ/8rTY/7qvwfmL6E/gujL6H/wuhL6L8w
++hL6L4z+P2aAzb4WQcLjAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_skoda" model="fleet.vehicle.model.brand">
+      	<field name="name">Skoda</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAA5s0lEQVR4nO19d3xVRd73b069Lb0X
+ICFASEIJRaqgICBNF8GCDdj1UVTAV9QVxbIoiq4oi/qwrh1kAVHAsqBiQaVIS0gglISSAgkpNzfJ
+beeeNjPvH5N7vKLyLAjyvJ9358OHz8m995wz853f/ObXB1FK4T/tUjTuUnfg/9/2H+gvWfsP9Jes
+/Qf6S9b+A/0la/+B/pK1/0B/ydolg54QcsaFdR35lWmaTPOg4Rb5EOtPjHHkczDG1i0/f3Xkh4SQ
+S6XZoEurUlFKEUIQhpvjOAhDgxCyvv35XdZXlFJ2F4QnQBCEyLsIIQgh68cIIfYznuetGy9Ju2TQ
+E0LYyCOhgZ/izgACAFVVbTYbIQRj/HPIKKWmaQLAGaAbhoEQEgSBvYXNCoRnznqI9caLP+iftEsG
+vWmaDAj4Ke1HTgP7ihASCoWOHDni9XrdbrfH4wkEAoZhsIXC87zdbo+KioqKioqPj09NTc3IyEhI
+SPgfoWRPZk+4WIM8a7vEDMcwjDNIFQAIIYqitLS0HD16dP/+/QcPHqypqXE4HLGxsUlJSXFxcXa7
+XRRFURQFQVAUxTAMv9/f3Nzc0tKiaZogCDabrW/fvvn5+fn5+fHx8Xa7neGLMUYIXVo+Y7VLBn0o
+FLLb7RCx/DHGoVCouLj44MGDBw8ebGlpcblcubm5hYWFHTp0EEVRURS/3x8IBFRVNQzDMAzGZ5xO
+Z3x8fExMjCzLpmkGg0H2nJqamoaGhtjY2D59+gwcODA3NzcqKgpjzHHcGSQfyX9+t3YpqT6Smzc3
+N3/99dfffvvtyZMnc3Jyhg0b1rdvX7vdXltbu3///oqKit27d3s8noaGBp/PZyFFCJEkiT1HEISE
+hIS8vLx+/fp17dq1oKAgPj5ekqTDhw9v2rSpoqIiLy9v5MiRI0eOjIqKshC3OvD7t0sv4Rw6dOjj
+jz/eu3dvhw4drrjiisLCwrq6utLS0u+//37Pnj2NjY1M/pPCDQAMw9A0zTCMs3ReFMXU1NRevXqN
+HDly+PDhUVFRxcXFW7dudbvdgwcPHj16dH5+viiKv+NYz2y/B/SKojgcDgAwDIONlgkqJ0+e3LBh
+wxdffJGTk3P77bfHxsYePHjwrbffLSkpaWpsBITi4+Ojo6NjYmKcTidBXCgUampqysjI4Hm+sLCw
+ra2N47j6+vqTJ09WV1cjgrFpyrKoaRoTkHie53le1/WYmJjRo0dPmzbN5XLtK967ZcuW+vr6qVOn
+/vGPf0xKTmadxJiyH7O7WFctMexitIsOPZNe2NJmTJZSquv68uXLN23a1K1btxkzZqiq+uGHH27a
+tOnIkSNR0bFxcXGZmZnx8fEY42Aw6PP5vF5vUNU4jhswYMCAAQPy8vIURWloaLDZbE6nkxBy+PDh
+rd9uKdq7F4BwHGepV5GyvyRJSUlJY68enZubGwwGt2/fHggEbr311mnTptntdl6QmHzFdh02DWyR
+XaT2e1A9k8qtP/fs2bN06VKE0OzZs5OTk99+++1//vOfp06dSkpKKigoiE9IQgipqtrQ0ODxeDDG
+lNJQKORXQoWFhXPnzk1OTvb7/S+99NLevXsNw7jnnnsmT55sGMaOrd8vW7bM09wkSZKu6xaIAMBU
+AcMw7Ha7roVycnJGjRo1ePDgI0eOfPzxx717937ssccKevRi/dQ0TRRFRuwXFf2LDj0jdjYGn8+3
+bNmykpKSa6+9dvCQy9esWfPOO+9UVVZ2ysrq1q1bampqc3Oz1+sNBoN+v19VVcbldV1XVVXTtLlz
+586ePdvv969Zs+aVV14JBgIAEJ+c8o9//KOgoCAU8M+ZM2f3rh8skpdlWdd1xnksXcwwDADgeb5n
+z54TJkxITU0tLS3du3fvddddt2DBAkvb0HWd4zhL87gY7SI+mjVGepIk1dbWLliwgOf5hQsXnjhx
+4tZbb929a1daevqNN93kdDqdTmenTp1279596NAhJjgy3ZXJkYxjDBo0KDo6muO4kpKSYCDA8TzB
+uMXtbm1tjY6OzkxLLSws3PnDdgiDrmma1QEAuPXWW+Pj47/++uuDBw9ijEtLS0tLS6+//vrx48d3
+69bto48+Ki0t/dvf/paVlQUAjNh/zZJxYZC5SM+1WiAQ4Hn+hx9+uPPOO9PT0+fPn79+/frp06fv
+LioeO/GayTfcqJmYcvyQYcPze/aqPlXr8Xg0TTNNU1EURVGYGC6KIjb1tNTk6Chnxw4Z8XExsiwK
+PAIgwHGapiUkJDidzvz8fABACGmaxlazKIoMxLS0tNGjR48cOfLOu+6eefe9ud3zeUHieHHdug2L
+nvurienMmTN9Pt9dd921b98+XdfZgruo1oWLTvUul+vdd99dt27d7Nmz+/TpM3PmzI0bN+bn50+/
+467m5uaysjJN0zp16mS32wVBYDoRx3GmabIljxAydB0AZFlmvAIAUlJSGEUjhCghLpdLEjkuzJqZ
+vRMARFFk2wbP87feemtubm4gEOjSpUtycnLv3r137Njx+eeft3g8VVVVL7744g3XT549e/aXX355
+6623PvPMM5MnT8YY/7/NcN59991//etf9957b2Zm5qRJk4qLiydMmNC7d28Q5NjYWI/Hc/Lkycsu
+uywzM1PTtJaWFtM0McZmmCMzxo04TtO0hoYGJiz16dNHEATGvk2CsrKyMAEA2LVrl2maTL2ilFpT
+lZubO3PmTKfTWV1dff/cBxMTEydOnHjDDTckJyevX7/+ZE1Na2vrG2+84Xa7p0yZYrPZFi9ebBjG
+zTffzF5xsaChF7Sxbc1qy5Ytu27SxKMVhz7+eEN6ZoZod8y6/6EnF/114Ysvr1q7btXadddcd73k
+iJp9/4MNza0Hy48lp3cAAGacYd0TBKH9GsH4a6/xeNsIpW63++abb3baHQ6bfeHChexd+/bti42N
+ZeyFaQ+yLLPrl19+mf1m3rx5nMADgtT0tLfeefuTf3367HOLRFkSJJHd0qdPn3Xr1j3xxBO5ubl/
+//vf2V1Myvr59W9sF5jXW/ohIeS9997bvn37vHnzjh2vfOSRRziOe+SRR+LiYrdu3drUWC8IQocO
+HWbMmCFJUkJCQlRUVHp6+pw5czp16gQAjGPwPG+aJmNBALD1u++WvvhSaUlJYkLiG/94vays7MSx
+Y48++qhpml999dXjjz/e1tam67rT6WT0zphSly5dpk+fTgipqal54403CMa8IDTU1x87diwtLS07
+O7tz586mYTALc3l5+XPPPZeRkTF16tSVK1d+8MEH1nM0TWM8kK3LCwDWhZpD5k5SFIVSijH+7LPP
+GHvZvPlzh8PWNbfbG2++/eC8R8ZeM6ln38s65xYse/2tkrLDjZ62hc+9MGfuQ4qOTUpVkzY2Nj7x
+xBOpqamsewx0juMEjkcAPOKyO2XNmDZ9yQuLN3zw4ZeffT5//vxRo0a5XC72M8tAb927atUq1sMH
+H3wQABDPyXYb4rk3337r0JHDu/bs7tGrJ+I5tqOyW/r37//qq68uWLCgb9++H374IaU0FAqxhzCq
+vyC0f4EZDqXU7/fv379/woQJX3zxxc6dOztmderdp3Dxi0teXvb3y68cUdj/sk45XaLi4ocMHVZU
+XNLm9QcV9b7/M/eO/7pr67YdJPyQ48ePP/XUU507d2YgCoLAA0gcL/MCD8ADCBwvixKTPxhqkiRZ
+fFkURWYWnTBhAqWUEHL06FFmkOBFARDcced/hTS19nTd7r17Mjt2APTjVDGWNXDgwLfffvuOO+4Y
+NWrUvn37mMBDLyjDuWDQMzGcUurxeK655ppPP/30wIEDqampHTvnfLDho6cXPTfo8mGDhw3v1btP
+UkpyfGICAPfQn+eZmBJKi/eVRsfERcfE/Z/7H6iurmYL6JNPPunVq5fFxGTEM9AdNnv7gkUAYdmP
+ocbo3bK6cBy3aNEihtquXbsyMjLYXVmdsw8cLCOUmgS/+fZbgECUJQt0AGC695AhQzZs2DBt2rQx
+Y8Y0NDQwtyINr+/f3i6YNss8cIZhPPHEE0lJSVOmTLn77rvLy8vnPb7A42netWtXW6unzdPS5G5A
+lHi9XkmyybL8+uuv33DDDQihRYsWPfbYY6IoFhQUjB49+uDBg59//rkoijabze/3S5JEMYmLi0tK
+Se6UnRUVE5OQlGh3OQVB0L0BRVGqq6ubmpoqKyv9fj/Tn5kJjOO4iRMn3nbbbX/4wx9qamo++eST
+Vm/b1KlT8/LyeI4v3ld84403VldX8zyPKBiG4XA4FEVhK4nn+euuu27MmDHvv/9+3759n3rqKbvd
+Hulo/K3tgkwgpZRRxIoVK26++eaTJ0/edNNNdrt96dKli1/9++Rbbh94+RVd8/ITkhKdTjvHgcPe
+vhvn5uY2NTVRSn0+3/Tp0yFMszzPWzRYUFAwZ86ctWvX7i0uamh2twR8XlMNURqktI3qqqpSSv1+
+v8/nKykp2b59+0MPPZSTkwMA0dHR7CGCIIwYMWLHjh2UUkJpSFMJpVU11ZcPHwYcYiyIUTrbLSBi
+6dx3332vvvrqgAEDPv30U0opU9YuSLuQNpza2toHHnjg4YcfLi4unjt37o033jh06NDPvt3ubmqo
+O3lKDQVCQb8S8As8UlUTcRwLDnjggQcWLVpEKZ05c+Z7770HADabTVVVl8s1adKkyZMnFxQUJCUl
+yXabquv+YKC2sV43DI2YmmGIspSXmCHLcmpqqt/vt9vtwWAwLi6usbGxuLh49erVmzZtUhSFWdNk
+WR4zZszQYZd37ty5tLT0k08+OXjwIFjDp2CZPJnNBwAQQvHx8c8///zhw4crKirefPPN9PR0eoG0
+3POEPtKpHe453H3P3YWFhX37D5gyZcrYseOzO3cOBAJHDpQcPnyYEFJbWyuKYjAYbB8hpRIv6Nh0
+OJ0Pznv4k08+2V9SIgmiTnRHWsq11157723TLi/ogwgJGKEAT7Z5alYXfVOs1LsNLzVCuhKkMgCH
+o43Y3s6Uu/qNmdpzuBACTVNxlKNRDXaITzFMWlpSsmbNquXLl6tKAAAMXRd4gXXe0niZWMkEWZ7n
+MaayzaZpOhsXR3H37t3/8pe/rFy5Mikp6Z133yUYczzPdkkreoVNxjlZOs9ZrmdTJQiCqqrsz1Ao
+BACbPtvU0NBw1VVXPfDAA9HR0SNGjGhtbe3evXv37t0Nw2hsbMQYBwIBhJAoipRSp82uY1O22YLB
+4KKnF1YfPc4TSnR9wtCrPlr6xj8Xv9qjf5+jgnJY8PsEkiK5Tn3+w+Ede1v8raoa0lTNHu1CiAcN
+QkrbkdZTf/1i1Yub329BquBwBAKKIzqmtc3v8XhycnIWLFjw9ttvDxw40NB1QRQZ4qZpMg5jGAZz
+MYZxx6IkaaoKAB2yshxRURRoTU3NunXrxowZc+DAgR927OB4nv5SAAtEbNT/TjtnqrfoPdIKHwgE
+7pl175QpU9xu9z2z5lx99dXdunXv0bMnxviNZa/s27ePcY/CwsKioqI1a9ZwHIcIQYJgYpPneMCY
+B0iMSZg1a9bdN0+L755zPOR+fdu/ihqr7KLQL6HjiJye3RLT123/evE3a08n8XKHeK2+XrbZqWlI
+HAS8rWCPTvLyMwuvfvCaGRzmFURFggzDIBjrumqz2Vo97n/+85+Lnn1WEiUatjFERUWxPZxxpI4d
+O+bm5uYX9OzYsWN0XLzdbv/oo482vL+aAo2Oin7llVe++eYbjPE/V62ihCD+R6pl+9y5mhzOeadm
+U82oxlpomzZtQggNGDDg2muv/eMf/9i3b9/m5pa4uLgXX3zx4MGDaWlp77777hVXXIExdjgcQ4YM
+uf/++wEAOAQYeJ7nMeR26Xrv/ff9ceadKiLvHPxu+aFt+/11QU1FwVBRU/W/miv+dPnVt0yc1Dsl
+85EvV+ypc4PTaWoGJlRHQUiOAR27Be2/t2xAJpp3/Z1yc1CVOUqp3W4PBHyKojjs9mnTpmVkZDz5
++BMej8flcrHIht69e3fv3r1nz54DBgzIycnp3LmzppumaVadPFVXV3fFFVccKimuqKjw+X0fffTR
+9ddf/9JLL21Yv37ylCkQwWcYC/15ENH/gOR58HoaDtfSNE2W5erq6scff/yuu2eWl5ffe++9jz+5
+IBQK5eR01Q1j4cKFPDHefvvtUaNGMfGcdfGyyy4rKy0VHXZVDSECnVMz31m5omDYwFrV+3bZ91uO
+7T/ka4AYGTgODMZzib0+MKPbkD+PmBRQ/I9+8MYXLRUoM95UAkB8nGQngZBgizGbQxk+YcG46f81
++oYmNWQYhq5phJgul6vhdK0gCJIk7di2feHChZWVlTzPd+3adcOGDbm5uQw7juM0TatvaPruu++2
+79xVV1d32223HS7dt3TpUha4sHDhwsbGxl27dn322Wd2p4MJKpZQdK7tfGw4LJDIsql+9913giAk
+JiYuWbIkKysLIcRWcU5OzsyZM59++ulx48aJorhhw4aPPvqICcXZ2dkEQA2FOEHM7thp5cqVhVcM
+qRHUF7784NX9Xx0PtbgEWQphMEzgAUwTgrpTll4r/Wzq6hejRMfbN8wZn5xvnvaAIxo5nKQ1GC24
+iKaKSa7maPzGN2t/OPoDIcTlcgmCoOu63+9nls76+vrc3NxnnnkmOzsbY1xeXn7fffcxZ2RNTQ0A
+1NTUXH311X/605+WL1+en5+fkZHRrVs3WZYxxkpI2bhxY48ePYLB4LZt25gD0rKt/k7QW0EsPM/7
+/f4DBw6MHTt2y5YtFeXlgwYNYjtqXFxcQkLCDTfccPPNNwPAyy+/PGXKlDlz5gSDQYzx4cOHBVEE
+gIS4uLdee713n8LTgdZXPvvgK89xkDhqEykA0U0wCBgEMDg5WTMMKTdrT/DUlKWPufXQoltmdVWj
+Yn2EBonsivFrKiHYUP0ap9Q4gw98/CoAKIqiqioLe2ImVYfDYRhGbGzsvffem5ycDABff/310KFD
+R40aNXTo0J07d3bs2LF///6UkFdeeeXhhx92Op3ffPONqqomNgFgz549R48eHTx48Pr165lwAeHw
+UIiIJLxY0DMGp+s6I/kTJ040NTUNHjx41apVKampaWlp1dXVJ06c4DhOluXMzEyn0/n111+/9tpr
+AJCamirLclFR0alTpwzDkOz2efPmjbjiSkGWdpeVbira7kYhB2fTEQlGcWa0xFOQQ4THNEj1YDSv
+17lt8fH7XMF71/53TIgumzqHP9UiIVkzCLVL4LQBULALHpe5W6v66quvJEmKiooKBAKaptlsNmbK
+J4Q4HI7u3bvffvvtACDLcmlp6aFDh+rr65988klK6dy5c99buXL69Ol2u/3LL79cu3atqqkIkCRK
+QSVYW1vbpUuXioqK+vp6hr7F38+J0Z8P9AghFvPFhMsNGzaMGDHi5MmTu3YV9ek3sLnFpymhmsqq
+vz779Ia1qzd9vP6BBx64/vrrKyoqbDbbE088YbPZli5dqigK8Nxjcx+ePu2PtYLWRNVRnQvmd7li
+cBVR6hugLSBjBKqGDZWTBZ5QpBqEqmDHqtISG+fc6zsx6+vXYy7LmtKlh0E0QJgzCQoZiHIAAjU4
+JEUv2LXi8OmDDiUgUwoib4QM3jAphxFCiqL4fL4hQ4bcdNNNzCAMAKIobtmy5YUXXujfr8/Um25w
+ysKu7d//9dmnddPgeB44pJsGBfh6yzc2hz02Pu7vf/87s9BZBuRzVbXOxxbBwmlsNtupU6eqqqpG
+jRr18ccfO6OiUlNTVVX1er2qqv7www+7d++2xP/ExMRFixb94Q9/WLly5eeff44Q6tS31/hJE6Oj
+nG3B1jZvi71Vve/qyTMnTP5w53cf7N++reWUnmjn7bIaUqmm8U4bQoQgjpim11ClWMfu+hOLN7xX
+0VJDHb8sJnhw8KvdWztd/gddNwEhnucJxwNCzMzH9oDc3NxevXodOHAAAAzDYJEgbW1tsbGxtbW1
+jz32mN/vt8BlWlh9ff3hw4fz8/PLysoCgYDL5WLsnm22P9c0zwbjeUAPYSGnqKgIYxwdHb1+/fpO
+nTo5nc7m5ua2tjZBEERRZPEEzFUUExMzZMiQvXv3Lly40Ov1yrL8yMxZvXr1Kmuqfv6rNbO+eGfm
+9vce2vnhqlP7Jg298v17Hl83ftbEYJxU2cwJCGIdWA1RRSMhDQAoMXC8s4kG1x3aWek0I/sTea04
+uE0l20+H2hDPg4kBE900Fa09TpbneUVRsrKyrrzyypiYGACw2Wx//vOfn3zyydjYWJ/PN23atKKi
+Itb5SFo2TXP37t2dOnVqamqqqKhgEscZr/4323la4FiERWlpaf/+/SsqKmpqakaP6+l2u91ut9fr
+DYVCuq4z9DVNkyTpxIkTEyZMME2zrq5OluVx48bN/MONtcHWteW7VtUVqzYTHPyOerfLW/ZdRenV
+HQpu7zV8ROe8xRtXv37ku5NxAEku0U+wYQh2m4lNExtgF8EwgzKAGjHsiJEbLq7c3bD/9ImxeYMN
+1TApMYHoumnoOsYYY8z02E6dOuXm5u7Zs4dFIbAtYfHixd9++y3P84wdRTrLmOlf07SMjIzt27f3
+7t0bwmyAKerngOH5QQ8AwWCwpqZmyJAh33//vSRJ0dHR9fX1jL2wdWd5pdm+X1NT4/P5AMAwjDvu
+uAMc0uZjxWvLf1DtCGxOpCM7LwUaGlYf/eGxQxuvWvvMmqM7H7l+2qrJs4dAAnh8wFGghOgaGCYE
+FCBUlGwQUhnqP3bLuia6akffHyoyBcohahKMRElAHNM8NU1j4pkgCP369WO2jdWrV9fX17/88ssv
+vPBCu1EhrItYAxFFsa2traGhoVevXnv27InMzjhXAM8TeoxxU1MTISQ2Nra4uDg6Oprnea/X6/V6
+LYs5APA8z1gkC3dlrHPMmDEDBgyoVN0bynefRAEQQPQp0Sbwmu5wOPhoWy1p/VY9fs/OVXM+fyup
+R5eFM+69zGvXTQN4jgRDiCIbEkWDyhgkguCXxkwpBUOTYm37jh9qbPVgjDVd17EJRnsAKCN5Rhyd
+O3dm8ftVVVWPPvros88+q+s6ALBQNSZWWE9mMtLp06c7duxYX1/f2toKAJb3+Jwm4Dyh5zju8OHD
+GRkZfr+/srIyISHB5/MpihIKhZivypohtkcpiiKKIlMIRowYkZSUtM1Ttb/lJNgE0LGhKUEbCmgt
+ikywaYJGAHGKhFfUFT/43aoPD+ygFIOIeIkHAUk8x/FgECNkqgb8Kq/nCHAcag56K09WY0o0YoZU
+nWqYiZhsb2T94Xm+b9++uq7b7fYVK1YwkZFB/POBs+GcOHHC6XQCwK5duyK/vbjQW8aKioqKDh06
+sEyauLi4QCAQCoXaA5gMQ9d1WZbZ6rb8dhjjlJSUUaNGKYryr6N7/ByGtkACFWJEhxkMgOiQvZrd
+ILxJQNEFExFF+2bfD28e+b4oTSe6jnUdOM5EVNFVEDgs8VSKsFj9dNg2QnVVwxzUuxuB4wiHKKUc
+IBZSKIqiqqqsS36/v0ePHsnJyYxbsv8ty2CkXczaUaurqyVJstlsu3fvtrR6i/YvFvQcBxwHmhaq
+qqrKy8vbv78MId7hcLW6G3TFb6pBSkyOA6Z2tfceE8RCKhD0GnxZWn6Xcs/pvY3HKBgcoh4c8PIq
+IABialQPCTpGBvBgghqSDcMlIKJzqomAQ4hD7aluHEIcGJgzKQAAoe3+cUIRpghTMAkPPJGEgJ3b
+fvwgL3JiW9BuGIoR5HmeGboxxizGTZIkh8PRtWtXC2WO4xjtWxlY1jSwi7q6utrqqu5dcupPnaSY
+AGXfnpsl5zwZTigU8ng8dru9qqqKSWAszcPyHVu9RAi1dw1AkOXBgwdH26Lr6+sbmhoDwSAFggCB
+aYJpiiYVMUaUEzCIBAmU5yiHDdM0TQLUEmAsrZ2jAAAoTOuIUCDt7+UAMPPUIwipakhTgUMmIZgS
+XddZEhbrqtUSExPhp/nTZ3D5M5rb7XY6nT6fjzkAAEAQzs1ofJ7Qt7a2MoXi4MGDzDCiKIqmaRb0
+kT+2/hR5fuBlAyiQ6soqU0RURJRDFDAgAB6oAAaiPKZEN6lm8JiKFImIEzhektrjPiiliLbjbjk5
+I1/BvgUAE1EAgnjOFwr6QwoVOINiDZuRuEd6StPS0hwOR2TPmcj4awicPHkyPj6+tbWVrQ+MKUJw
+Tpa08+H1lNLm5maWQVlVVWWz2YLBIMP9532lQAEAAUIAkiBmd+ykBP02QeQDGhfQBMUQDAImAcMw
+sQGImIAJoiYHBqImoiYlpq7rgWA7yoRSSlEYtHb+Hn5puxUXgFKKKQFKqMCFNFXRVOA43TR102A0
+/nPiiIuLYzunhfjZrQINDQ3R0dGqqjKJOWzGOQckz1OlcrvdiYmJoVCotbU1NjZWVVUWnfLLMhYC
+CiDyYkpKSlJCIsakT89eA4+ktAW8il9XQfcaSggRMdouuxw+ZIDAA1Bi6kAIACcKIoeQhtvXNSI/
+ctYfiZ1QIBRRQBErA4AyHDHGmOL2sH18ZmMTxrZNAGChfRCRivSLCDCdnInUlBCO50yTCMI5kPI5
+Q8/AZdwmGAwy1xozjMBPKaW93zwPGDODampyisNmC2pqVsdOH879a2tbm1cJtCm+Ew21JccPl54o
+rz5a68yONiROlzgQKfAICMWYcBQxps4wtUDn2F5BfqR6COPOAyIUOEw5QIhQw9BMXceGycIrGdth
+FxCOAbHb7ZFYn90CHAqFEEKSJAWDQUIIz7NohosJvdUtKyeN0Q6TlyNpJDwNYRmf4OjoaESBA8RR
+iMeOaLskuFJESSJ5A7zDxtc01VfVnVr+zfvH2xorsV+LlyDOBZiQkIoNDBJn8fF2hkAotbZZQoFQ
+DgDCO4FAkUnB1A2BIoSJFlCxbnCEsq6yxkieGXs5jrMskWwCzi6kh0Ih5vZhMbAQjn3799s5Q8/6
+ypw+zAHPxmCVRYmUbVjqAbAMG01z2u0Cx9tlWVHVNsrbZRtHqdcbxIZuj40qyMjpmJg+ul+vFVs2
+vvXDFweCTVQIAs8BITzPYwuLMO5n7yfPdj0TIwCKia5qhJjW5Fk95DiO5UwxEm5fTBwHETLlLzZN
+00i4hAziOEKA44DSc2D35yHhcJQijGk4eYMYhmYY2s872l7KhgBQ0DSNAqimgSmRRUnieBEBIaZG
+MThkcDmCuuH1KVQHHLDPHDHjnenP9G1Ljm0WJcKDQAxeoYRAeF9l2ywQSjGhaoDjEFUMuxe7Agip
+mOMQBTNINBAFm0ayouJIICTZ5BDFCtGs1clQZpK7VezCAt3in7/WTALACapuEqCAwMA6EyfOAcdz
+Bd5anow/MkOH5S37hRdEKHg+n4+VnrBsIxansp5MeKoaemJ07FMPzHOGiNEcAA0THMadUkbv7fRL
+KS847B69Q1DuH59dGJWZHBCENp1wAgBChIKJYxwuZi9j74oUSc/YRS1CttpZeA5z2PI8zzZnZmij
+8D+sxch2nrzeZrMxPZAlZlpGyp83i5oIIS0tLexDSZIQJ1gCBoQ3OoSQTjE1jVhH9JWpfWdNmPra
+t2trg34aw4NJgYbrEzHcCQVKea+Rj5IevvmO7KyumqGXnzjy1w3vVrQ2g4PjMEWamRibSAjxK4pJ
+TUMzISzRR/pUWa+YCcH6/CziDQA4HA62MlwuF8aYC/ur/32Ocz4qFaWUpUE5nU673c4qFpz9Frau
+3W53MBhkmfAsUyfygqFPOQQIIZMo9Z45195ydd5Ap84BEdhGSjFhF0AoohQozaKx8//wp5HpPZ0K
+OIMwIKHLvVfflOZIBUyQatgwlxIThw2ihDSThEWCCP0jcju1oGd/nl2ut0oPOJ1Oa2VfXN8sU0mS
+kpJaW1slSUpOTsY/rTv2i41Jyn6///Tp01aYo8W4LG0AYywDRxBopiES3qmhm4aNzYlJh4DBaDyM
+OwFCKCFAaI/YzKG5fQy/6vMqQUUPeHx9O+UNyuwOGgEVJ9hcUZLDMAyNmBhjhNu5nCWMWYtS0zQG
+vdXOjmN0dDQznDgcDoQQoeccEnKehoTExESe51VV7d69+9mFMCtyhP1fXl7OclkZ20XhwkBM8CeE
+iDpBhJoCIhwfavEP7tp7cPc+gsYDJoAJogz38BxgQik9HWzzC4QgoBwyZb5NCcjAgYl5HWfEJosU
+6ZpJKMIYcxQso02kFYHjOGYSQBEF184+rrS0NJ/PZ7fbWS5R+3Z1LvvseVguOZ7no6KikpOT3W43
+85CdpVkDYBvyd999B+FNyYoisliQJEkyBlmWTUn0Yk2yOWQqXN5jQJocC+EMGMuWAIQCQLG7pthf
+14Q0ZBqcrutOsR6FSisrOEwFwmUmJINmmLpOOWTg9idY0FtGeY7jGhsbg8GgNRPwP6lUHTt2bGpq
+io+Pd7lc5LyK6pwn1cuynJyc3NLSwtLaz0IgJFxug7k6v//++6amplAoxD6x2D1bCrIsi7zkdDo0
+jjoT40K6EfAGcjI6Jjliw4/7qVBP6WlO+ev7bx5tPGkDJJukwdv8zqYPawLNiCKBovjoGGwQ0zQp
+AMaYkh9jgyO5PEKotbXVwvrfYdkpKSnMiMIEDcRkrost4TDZJjc39+jRo1dccQVzY/5avy2WyhTg
+Y8eOlZWVXXXVVTVNdRu+21ijudVoaA56o+Uou85zClGIkZmWObhb4fDMHg6Ob2lti0mU01wJ0HKY
+7Qo0nMHC3mUKaoVSvWDL610yO3EUjtZUVTfUATGdHke+EN9Pyqj1NKw/uDMYI8Tztv4p2QlyCuKo
+AJQa2G6TgmYI8RDUlf3791shxz83rgEAezvbtHJyclLSUis/qpo+fTrGWJZlBIDNc8suPx/omRKb
+n59fXFxst9tTUlJOnz5tgf5zdRHCbIp5/Tdu3HjVVVc1Br1L3viHRwrRFLtKNdBMmz1WwAhJyO8N
+ZjiTbh8ybsYV4zPT04H4zIAPTJNwHGHzatnuERJF2fArtdUn2041AKUBXQUgYJMoonGd0gIuOHr0
+1LGao6pTrNHx8ZKSzNjMy/r0TY5JJMRAhIm53ImKimAwyERkthosps/4j7VDsHFlZGSwUN+BAwda
+dYvO1ZBwPhIO+z8nJ6e1tZUlnp0l2tZirJa6++mnn546dapTWsaSRS8UdM7VWkOi5LKlpqo4GLCD
+AiE+Sa6jnpc+XzHztb8sXPfa+j1fnNbcQABhymHKMT8UpmASMAkOqQIAj0DTVU1TOUKAEAgqiu4/
+bbRurijaUXUgoCs8xVSgbsNfUl3y6Y7PS6r2EzuHOUIpFShfXnaEZcayHlqGnUidg33FeHrXrl0b
+GxttNltubi5E7Apn35nPaOcTX8/Yt8PhSEpKqqqqGjx48FdffWV9+2uaCINekqTKysp169bNnTN3
+Sr8r8ztkPfbqc98dLtJcOuJFqqkyDhkEY5toUPJD8/Ftmw9L0XY15AXJRi1THJNzAIBSYgIgDhFK
+271UAISAaXBUOlpbVVpRBorKy5wWDFABgROBJDU0VW1VAlow1CM7L9GR4K5vqjpaaXXe4maRJkzL
+6kAplWU5Jyenuro6OzubFWNg/6OI6Ot/p52PIcFKyu7du/fmzZuHDx9+xv4euQIsb2fkBLz77ru+
+46e4IO4gxv33vEV9UrrIXkMyTCAmNgxDCYFhgiByskiwqfoDnM0p6NyP/wyeNwXO4JHBI5MnIWIE
+DD2g60HDUExQKZgCr5khfwCCAZBEh8NBTQyaDjyPeN6WlORvbd2zZw/bfkpLSwNqAMLc/OejoOEc
+JraCMzMzk5OTjx07NmzYMEaFP/ebXxToWT9M05QkqU+fPuXl5dnZ2f369Yv8FiLI36IgZiBk9s6y
+srInXn4hRGhLa1AAae7M+xCmiONA9WucCEiAVg2q3Pi4O6aZRp/WxIMNUOuHWj895YNaP6oLWP/4
+hhDXpPIthuinoo/wHh0aQ3A6iNpUW5DwpgStwYDHL3IiUAF8Bm0MaE3B1LjUy3r2T09Kra6sOlBW
+hqHd5hopLFgKNpsPazX36dMnFAo1Nzf37dvXoqdIY9y/2c6Z4ZimyUrhAUBOTk6XLl1OnDhxyy23
+7N+/37KAQ8T8s18yS5N1DQCvf7jmivHjR48YGVQVB2/LTu1Y0lwOsZKoSUZDW7wQMyx/UJ+ueTEu
+F/BgEiOg6CSckM6oj9ndgqGQyTxPhkkxAUzAxBQTlRrIJCY1D1ceq2yuQ6IsmJTqZhSXICJuSP6g
+QX36Bbz+HTt2eHwtoihi48zAm0iisWyZSUlJAwYMOHToUF5eXnp6uvWzc6L384SeaUOs4k9UVNTl
+l1++devWW2655fHHH4ef2ritFcDivNhXLCdWEATN612yZEnXDp0dNolTzJqD5Vy0TtQ2o1Hs27XH
+zSOvGT9kVJTN4VEDCq8HsBbvAxYoyRxMuq7rum6apk4oARrSNEVRKMYicBwFrBshJ1BFs9tsIuXr
+W1oUvwKYJjtj8pLz8nO7de2cE/T5i3btPXLkCCAw8E/MfyhcojDyQ8ad0tPTc3JyPv3005kzZzKb
+pRVdjDE+p+Se86F6FJFlOnHixA8++ECSpOuvv3758uUQNlJaQc8AYAXkQNhExT7fte3bvzz96NNP
+P90xKfX+a+6orKxECCX1SRoxYkRWVlZbW1tTWwtTWLBhNIYtzJG+PTYZTHwysYkxVqzyEX4qiqJi
+kAR7fK4tVdf1/Pz8rl27Mh8sRaT8RMX2XTsJUJtsO8N68xP5GIBgo93fRsjQIYPKjxyKjYm67bbb
+2hEM76vnqtD+pmxxSqmu6wsXLmTFhydPnmxFiTIZ2br4tcZx3F133TVr1iyEkMfjYTYp0zRDoRAz
+sTG4IWxMt0I5LNcYy9RhLMhiRxD287WnQSmKKIqyLLMidvHx8SUlJZ999llbWxvrxln6KYm8YTC3
+CWRkpM+fP3/Lli39+vWb98j888atfeznd5vVUVmWR48evXPnzsLCwkmTJrFd1CpoeBYfGyvFTQhZ
+vnz5yy+/3NTUFBMT09jY6PP5WltbWXa93+/3+/2hUIhlRYVCIVVVWeHFM1zb7DpS63E4HKZpBgIB
+JhGwHR5jnJSUdOzYsZ07dzLc2RZqhTH9vDHSlGWR49DIkSM1Tauqqpo0adL54RbZflPyJgnXsHzs
+scfy8vKys7NHjx5t8RkrGf5X342QJEks3vr2228fP348i2xhxM4olP2STSFjL5bJl/3PylOcYZNh
+P2aeAFVVg8GgKIrMsH7kyJEtW7acPn06MlDyLJYyBCAInGmS7t27Pfroox988EG3bt1eWrLktxdL
+/E3Jm1YNyxtvvPGTTz5paWkZNWqUaZqyLLPafWd/jiWQYYxXr1792muvnT59mlJqGIbX62VcAiHE
+iqIbhsHcYWc0Sw6hEVZJy0HPboyLi0tPTzcMo7S0dN26dczsYVmtyVkLFyPUvjKuueaalpaW1tbW
+WbNm/WJk+bm287HhsE2cyYtswJdddlm3bt3+9re/3XDDDSUlJU1NTQDArFFneQgNpxiwkIpvv/22
+paVl9OjRrNB8IBBoaWnRdZ25I1jwhcVVLKq3YlIiCZ9SyhLtKKV2u51SWl5eXlxcXFZWpqoqE9LY
+AmIi71monlLQdXPIkEF5eXnLly+/7rrrOufknAdov4DA+W2zkcIsM2QeOnRoxowZEyZMqK2tff/9
+94PBIJMjf+0JFqGxYdvtdsa4OY4bPXr0sGHDEhISAIB9aG2hlt5gQW8pbpG4I4RYRhHbWo8cObJn
+z57a2lr4GUFY0tqvAgSQnJz40EMPud3ukpKS5cuXJyYmSrL82xnOOVM9s9IxxYpds8EUFBT86U9/
+WrFixezZsysqKvbu3auq6lkI3yI0JoZaQdUY482bN+/bt69v3769evVKSUlhhGlF6EFEhioJR72d
+wegppTExMYFAoKysbP/+/TU1NRYRsCmJvNGqCfKL/UQIrrvuutTU1HXr1t1zzz3pGRkAYBqGIMrn
+Ct2ZT/4twmVkY2O48cYbo6OjhwwZsmTJkqNHjzLUIl/BEiQj1W5m78YYR0VFsfwYVgWLHTmSlZXV
+s2fPHj16MLjZ3uj3+zHGzD0UDAZdLpeVhEYpDQQCPp/v+PHje/fubWtrE0XR8toziC2TgFVv2qJ9
+a8tlF4IgDB48eM6cOevXr09ISFi2bJkRLsH/29uFrAJlGEZRUdHMmTPHjh2bnJz8zDPPsLwqAHA6
+ncFgEMIsnumBjBJ5no+JiXnqqaeGDh36zDPPbN68mQkkjDAZdUdFRXXr1i0lJSUxMdHhcLhcrtjY
+WADwer12uz0QCLAd1ePxeDyeurq6qqoqTdNY+Q8AsNvtoVCoR48e1157bWFhoa7r77///saNG1l/
+RFFkS5OlDzKdkVko09LSHnzwwWPHjpWWlr7xxhu5ubkkHPF4HpaDMxu9QM1iCIsXLx4yZMiyZcvm
+z29XOizjZaRBlUmWANCvX7/NmzcTQnbu3Nnc3Lxu3brMzExrJ7CKl0HY32Kz2RISEpKSkpKSkjp2
+7MiOQoqNjWW/YZs2RNRQY8958skny8rKtmzZworvnjp1asqUKQAgyzLHcVbBehSu24gQSk1Nff75
+51955ZW8vLwNGzZYVc8uVPmzCwa9FVCnqurDDz/cr1+/d99995ZbbmHFEtiQeJ5HPy3qNm7cuG3b
+trnd7gcffHDEiBFtbW1FRUVRUVEQ3gDhrJq6lYcWOU8QUfOSKW5Tp05tbW196KGHOI5LTU198803
+W1paPvzwQ1ZHk2XFWA9hb3c4HHPnzl2+fPmIESMWLVrEhCUreO2C1Fu8YNDTCE9/fX39pEmTBg8e
+vG7duhkzZrAhsZghhqMgCCkpKXPnzt24ceO+ffsWL14sy/Ldd9+tKMratWutiWFwDBw4kLGXSLM4
+S4CKXEPWDKWmprIjwayZ2LhxYyAQ6NChA/szOzv7q6++2rJly9ChQx0Oh2WmtwqT8jz/4IMPrlmz
+pn///nfddRfG+IKTPL2ANY1p2KmmqmpqauqiRYtiYmJWrVo1fPjwiRMnslOlIKw9mqbJslX37Nmz
+YsWKzMzMu+66a+DAgR6P55tvvmG2F5ZsnpiY+NJLL23dunXw4MEAYLPZxo0bx3Itmc4FAImJiWPG
+jLnxxhvnzZu3fv36L7/88oUXXqCUsixGSZLsdrumacOGDWMWhaqqqi+++MLv99tsNkVRLGs2Cx4V
+RXH27Nk9e/Zcv359dnb2/PnzOY5jcfQQ3n4vGGQXpJmmySjCimY5dOhQYWHh1KlT161bN3XqVACw
+OA/zP/To0WPQoEEAkJWVNX/+/J07d+7YsWP48OHsN4yK8/Pz2Rk8zAt60003qar6xRdfJCUlsf6L
+ovjQQw95PB52XlV1dfWzzz47duzYSOfR/PnzvV7vmjVr2F0cx/35z39esGBB9+7dIwvFCYLgdDrv
+v//+Dz/8cNy4cRMnTnS73WxollZBLlyB1wtWv56FMVnnIDEj7euvv37fffe9//77Y8eOjY2NXbFi
+RWTUwsGDB1kec3V1dUlJSVZWFiGkvLychh1hgiCkp6c7nc4DBw5UV1cLgpCVlSXLck1NjdvtZjYi
+wzBYxcrk5ORXXnnF4/G8+OKLTEhlorrT6Vy/fv24ceNSUlLYoQyZmZkxMTFfffVVeXk5hIUunued
+TueMGTOGDRu2cuVKSulzzz2XmJgYKU3icOr+BSlqf4GLqFv8l1HTgAEDVqxY0dDQ8N57740cOXL+
+/PmJiYmUUsYHIGwOYpEUPp+vtLTU7XZDWOYzTTMvL6+5ufnYsWPsFI2BAwdqmrZv3z4Iew5YbM/m
+zZt37tx5+vRpp9PZsWPHH4fHccFg8Pjx4/fdd9+nn36alpY2eOAgYuJ//P21rd9/314UmVJJEDMz
+M5966qn+/fs///zzHMe9/vrrPXr0gIiy8Gdc//Z20U9tyM3NXbZs2aOPPrpkyZLbbrtt/vz5q1ev
+3rNnD0QUygOAbdu21dTUsDIRTBBipVOcTqfX6y0rK2NHsdlstmPHju3fvx8A2NxYljKPx1NdXW0d
+u8lFnIyEMS4pKTl+/HhsbCyPuJqTNQDAIY4p5BzH9evX7447/0vTtKVLl/bo0eOFF15ISkoKBoMs
+p/AitYt+TIxhGL169VqzZs3AgQP/9re/NTY23n///XfeeScrzQzhxdvW1lZeXl5aWgoAlntEkiSv
+11tRUXHq1Cld19PS0nieP3DgwKlTpyKjTtiu0NbWdvjwYbfbHR8fT8NhPyxigImPfr+/traW4Q4A
+oihquuZwOObMmfPAAw8cOnRo0aJFkyZNeuutt5KSkhBC7LCxi4fMRad6RsjR0dFLly7Nzs7+xz/+
+UVlZOXz48Mz0jE2bNu0t2ksw5hHHcRzFhIQ9LQzTUCj07bffMnPClClTsrOzm5ubv/zyS7b7sUPr
+LNsL4zx2u50lpIVCIeYeYQoq+40kScTEJjYRIMMwBg8aPG3aNABYuXKl29P83HPP3XrrrSzgm51K
+c1EPKfydjn+0DCM7d+589dVXKysrR181KiMjo7a29qOPPjpSfgQAREE0TZOi9k3YqmeelJTUoUOH
+Ll262O32pqamoqIith8AABNAIXwEZ48ePZir68iRI2xZRKaUssciAFEQCwoKxo8fn5+fv2PHjuLi
+4oKCggceerCgoMDycbMzWc9uyv+N7aJDj8PnuzJxnpUoWrRo0br313bs2PHKK69MT08vLi7euHFj
+ZVUlAoTD0DP9nlm+mDBjub0YjyLhcrYMXy5csz7y7exDKxrX5XJ1zsoeMWJE3759/X7/6tWrW1pa
+Hn300WnTpgGHmPWbyY6M3s84wu/Ctt+D6n8xXOJkZdWSJUu2bt2amZk5aNCgzMzM8vLyHTt27C3Z
+Z1V8pmE1zdo2IwPz4KcKjjUxTAM6w1WQnJzcv3//bt269cgv8Hg8e/fuLS8vnzx58qxZsxISEnhB
+YEkJVlcVRWH618WD5aJDz0jJCB9kzSQKjuOIbvCSVFpcvGTJkpKSkuzs7MLCwu7du7cF/Fu3bt2/
+f39dXZ3f7+fCZe7ZpmrhK8uydSoYCpfwsBJU2GoghLhcLhYc17dvX5vN1tDQsO37rZWVlcOGDXv8
+8cc75+TomibJMjZNioDtDZZhkvX24rH7S3bULw6ftkUpPXz48Nq1a7dt29bW1tazR35eXl5mZqbP
+56uqqmJnydbW1rLTwlhmMELoZxUm2jOGRVFITExMSUnp1q1bZmZmZmZmdHS0x+Nh513bbLbxE64Z
+O3Ysk9npRT7q7uztUp6ybHFStsybm5s/++yzD9au8Xq9lFJWTzgzM5OVJq6rq2tsbKyrq/N6vZGF
+VZht0uFwxMfHp6ampqSkOJ1Onud9Pp/H4zly5MiJEyd0Xe/atevkyZOvu+46SW4/4j2yzP8lmYNL
+f8A1hFX58ODJiePHi4qK2JHi9fX1lFKXy8XqaCYkJMTFxbGwQ7Z1szBCZjtqbm5uampqbm5mzpOU
+lJSCgoKBAwf26dMnNTUVtcsq7W50K2EKh89D/Z3HfsmgpxGBGEwDYlHUHPox65dg3NTUVFpaWlZW
+VlFRwc6CYRXWrBQty9bGvMTsvODu3btffvnlzC3ebm9h8iUhiBPO6MMlGDwA/G+EPkx8hq6Losgg
+01RVttkMXVdVlQWRsVAOtp0yHSoqKgpxHDZNnucBochSEZSQdpKnFBB/Rh9+54Fb7X8dwyHYYLIk
++4ESDIqiKErST6puUMokJZ4Jf5S2i63hu5jcAgDYNK3PsWkSQkTJ9r+E4fxfJs+dxDHsXF0AAAAA
+SUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_smart" model="fleet.vehicle.model.brand">
+      	<field name="name">Smart</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAaC0lEQVR4nO1dWY9jx3U+td2F5OXS
+ZHdPq6d7ltZAs0jyEsmWrchAbEBOjADJS4AgeQiQv5AfkB+Th7wlSIwgD4kBx36KE8OBLFnyaJbe
+pjc2mzvvVksejli5w25SQw57UTzfw4DDLta999SpU6e+c+pcYoyBV7gM0Mu+gd9dvBL9peGV6C8N
+r0R/aXgl+kvDK9FfGl6J/tLAL/sGAAC01gBACCGE2M8AMLLnwC+zf8J/KaXZfvC/xhhsmcWZX14W
+yGVtqZRSAEApzcpCa22MGflSKaWUchwH/ztOfPggegjXdW2H+BOLc32uF8eliR4AjDFKKZQ1DKWG
+IjvdcuRfC0opjg0hhHNuZ8DVx2WKHoZyzGoiKmnWBOFftdZnqi3OHmyclbt9rquj5iO4NNGnacoY
+s8KyZsEaB9tSSimlBACllJQSdRz/hO0dx3Fdl3OetS2ccxjOJLskjAzP5eIybb1dMPEeGGP2m8Fg
+EIZhGIb4IY7jKIrSNA3DMIoiKSWKmFLquq7neblcznVdIUQulwuCIJfL5fN5xhhjLHtRrfUr0QMM
+10CUINp9KWW73e71eo1G4+TkpNvtWln7vm+GQL2mlOIPsSscD8657/uu696+fdt13UKhEASB7/tC
+iKsjdMQlix4ACCFKqXa7fXh42Gg0jo6OkiSJ41gpRSnlnKPmDgYDzrkQgnOOP7Grq+0wuw5rrR3H
+yefzlUqlWq1Wq9Vyuez7/tUx/ecueusLZp1uKSXaYillq9V69uzZ7u5uq9WSUs5LN62VZ4w5jhME
+wdLSUrVaXVtbQz9VSmlN/6WMx0VoPXos1oNELY6iqF6vP3v27PDwsNPpJEmCa+O8pGCXEBiOuuM4
+nuddv359cXFxZWXF933bWCk1sipcAM5d9Ch0Y0yapuh3o6bv7Ow0Go3j4+PBYAAAjDG0LWmazuW6
+aK9wpTXGSCnRPZVSVqvV1157bW1tbXFxkTGGU+3iV4JzJxKSJPE8z07tNE13d3efPn26vb2No+K6
+LmMMjQOq51yAWpztEOcTY6zZbDabzTiOy+UyDnZ2BlwYzl30nuehiDnnzWbz6dOnu7u7/X7frrHG
+mCRJUEmFEPO6Lk41rTVOI0tOFIvFTqfDGEPvEzIU0AXjgjwcpdTR0dHjx4+3t7ejKBJCCCGQRUDp
+20V4XveT3Qaj5cELhWFIKb179+5bb72Vy+XQCimlcNm/SJz79ZRSaZru7e09fPjw8PDQGINCt+wN
+etxojucrArtiK6WsQRsMBhsbG7du3crlcnCKEbpInLvotdbb29uffvrp4eEhYwwfGD0Kq/I4EmiU
+5mXu0eXH/u3GDQAWFhbu3btXrVbRwaWURlF0KbZ+zmZOSpmmKaoS7vs/+uijjz/+uNFoeJ7neZ6U
+Ei07DLUSZY18DhoHy8tbx8NynPglNrZKbWk1bI/iFkLghXAacc4552EYfuutt0vXQbGk3/sx9PeJ
+IrHw29CCFCAFiED1QcZgABLQIcTzlU8Wc9N6FI3dKKH+Pn78eHNzs9froc+O2xxKKa694/oBAIyZ
+ZDkDS++M/NBxHJw0dt3G2aOUyuVyURRprT3P63Q6Wuv19fXXVu8Q1jG63T35lSNi/9qHObGgoQw8
+AUKAEwZEG2KAUKDmPK3C3LpmjFlCkVKaJMnW1tavf/3rMAwBQAiB0hzZ+o9DVr6naXrLQRJC0jS1
+ZL0lgnDlEELYaaSUCoLgwYMHfuDE4FDZIclncbzjR64jfpiqXMoiApQQBgBAgACh4DI4x33WPEeV
+UpqmKUp5c3Pzo48+arVaQRCg8lp6y0YBzwQapTRNUWrW88taGNR97NB13Synhh9wGNCVopT2+/0g
+CO7du7eysqKMBtACRJ70ebwVtRcYWRH+eyk4CQAYSonhIA0Qqg0x5PyEP0/Ro8eita7X648ePWo0
+GlbuaGosizth99Tr9bAZ+vjWOQnDkA9hjQ+6TzgGMPRNUeU550mScM5xIG/evLmxsUEppazHAUB6
+TDo0bYetjwhZKft5Dg8AaCJBMQAKAjQlBlL4Cojexvmazeann356cHAghHBdt9vt4jywE38yaS6E
+wOFJ0zSOYxsJWV9fF0L4vu/7vuM4VvpJknS73ePjYySCcKTR7DDGkiSRUi4tLd28ebNYLBpjCGgC
+DBQFKFDqKHks2/+thGFLa8KUKYdEAwAD0AAGztPznLMT3e/3Hz16tLu7i1HWJEkmx7jPRJIkODzl
+cnlxcXF5eblSqRQKBcvz2Kljo4lxHPf7/V6v12w29/f3j46OcHKEYRgEwZ07d1ZWVr7YZMlCQlKP
+ExCOSoCxWKrd5tGg5HxN5N9g/AZnkIIE0EAMnCehOU8PhzG2u7v76NGjNE1zuRxKWQiBFoAQghpN
+KXUcJ0mSM/tBW7GwsLCysnL9+vVqtXp6nLJxV0IIWiff9xcXF9fX19fW1ur1+sOHD8MwJIRUKpXV
+1VXP85IkcRwHEi6pAWYUlWEy4Iy6Ik3CevP4F1VKWbHEIEh1qqlhcL5pSrOI3vLgkGHhGWObm5tb
+W1toJax2o9uDja3jiB43roc4Bq7rotVGRndtba1SqdiNrrVmiDN9JEvILC8vLy8vX7t2bWtrq9/v
+r62tFQoFGK4ExCGCp0alygCnAWijUnCohujvw/p+gVep+400DgwH4WhQEsR5+Zez9Hvmk4dheHh4
+eHJyguEh9OKtu3kauVwuDENsrLVOkgQN+t27d4MgyOfzWW5nBtRqtXw+H0VRLpfD3cZkp5bBcj/8
+TJ78U7m2UPJuJEpJPeBuMNvVXwQzDqndoNvPBwcH+/v7uKhaVZ0QgojjGI0PMov5fH51dfXBgwfF
+YjEbLn8ZWtHzPHQ9LXc/qbVhUh7GrZ84Xj5X+3PHrIUqr0XswBl5QXPBLA+W5UZwFY3jeG9vr9vt
+otmVUqLZmaBoGDlBPiufz9+/f//+/fulUinL6qDWT54942DzdiDDYk7oJzZ1B0pOGoUnP5aNf4Qk
+cRiNz5NImF2nLCGFaQTHx8dSSnT7MG1mci4Ybp2klMVi8c6dO/fu3SuXy/hD7Bw9GZusMO3t2Uvb
+bB+bkHMmUhUK6uVJoLr11sHPzeC/GACDc6TVZjE45vkspcFgsL+/3+v1rE9NCMmOwZlAj7BWq21s
+bNy+fRulY/OW7DIOAKfTaV4ENkKCFCmuGZxzGHdHOq+hLQh31ELYO2l3/qGYNzn3O+fnX84uemtP
+2u327u4uOio2Ao5yn7B7SpIkn8+//vrrd+7ccRwna9lxSwzDrALIZEdN8WCZCLtVFGMMGSNLyrkh
+faUFZxWXJL3eL9SxV10KwPnaVNd9ccxocCylhca60WjYpcyyWmjux/Xged7y8vLq6io6oGi+kGsb
+ISxnkDsA4MAj1WPpoAn+EhMh544xhoim63Vl3Ok2P1Pxf0x73RfH1FqPj4GCJoQcHBw8fvzY5nah
+hUFJYc4wCpQx5rouxqGQ4/R9/8033wyCALkd3Enh7ik7UWbO0bBh3tHeUPjaEGWYASBEAUhiWOop
+AKCgDEAKRQGgt9tP/q5yfZXwd6W7nrjakC4H3zUOpBqcl91uTS36LH1ICBkMBlEUTV4GcfePtCVy
+ip7nvfHGG+hHWlMALyHo88Phyb9XKqmbLzEohcY3pAXEA158+Z5fauiSJGm324PBYPLGBy0G8sDI
+NRYKhddff911XXQBX+YezhuD/k/7/X810S+JAp84BuIY+mYeBMOMfaC2hmHYbrfHsTEIm4BnN1lC
+iNXVVQyH2jGz/t9s93N+8EVn0PukdfwTiP+H6FCoBZUGkx74hTH7bhYAkCyEF0hlQe4M/aLFxcXb
+t2/bpRUyhPMVhEsqYaRD/UvPYT78iPP3gEIKBl7a65xd9Frrbrfb7/dtisvZF+AcQxnInjPGFhYW
+kM8iw/Ru64NewQGIo5xDhTHHneZPVSoKlVWeX5sLjT/1o1opG2O63W4URejwjGtv91lIHXuet7i4
+OBKhnTx4lwsJijDFQZm42+/9Kgr/xaiHYh4xlFm0zAwT2KMowgzhCaK3/jUAcM4rlcprr72Gfg5+
+b8dg8ppxWRC+VKajpXGgQHW9Hf5bL/wF6DmIfmqDY+1ymqYYR4WME31me9xYIsu2tLQ0QmlZnHl2
+8NLBYwDgzDEEIhU79DDKRf8J6WFc+RvKjDaaAWMECLSUYkwGL050zmJw8INNfXmR9jhR8FjIFfcm
+R8CYoJQZTYyRhCbA+oP4QJ98DvEnwvQcwqSGBOIUfELyME227uxEgj3YNxlZ0QshPM+7gmvpBBBw
+CAhjjDaSspTyXiR3j9ufpO1/hnCTKCDUpKBS7RqgQKcgmWePfmE870tVOLt+4rmOLPV29aEVBUIA
+iDGKMMm5kjKM4zQ5+amGMq2UHO+6gZymJpWSkXHs3BmYXQFR67NKPQEobgyIwxU+RnwaxihKGWMC
+gBpjgCgujOMqCJ+F3Z/F3Z/ppMEBOEigsTGTMi1GMDtpbBMo7TcTGltN/2pZGwCgDCglAJwSoRXV
+xFAKnPkUTJR8pju5HL2WW3ifES6BTaVQswtCD0tJTG5mJW6DRFfTfx8LkmottQYCLiW+UTmVeir1
+gHKt+nH8SRT+XIVPiRJM+1NxOy+rg19qcGzoHDJ1Ol7yohcJpRKpEiklGEaJT8DTylXSUcRoYKDb
+Sn1K5B4kQDUoM3jxnmcXPR5Hwjic9dxP44vsF0KQS5gcP7mCICTUustYyFgq1UCaiDjKiNCVAx2B
+579bWfoL7b8bEkg4EDKFdzm7h2Nj1l/qrtjgH+bb2MGY+dIXi0AISoHp1BClKGMMCGHOgEkn96CQ
++0Cwtw0vfCHIsfHHMzBjMggM90fIB0xQZJvcgaGowWAwmXi4ajCkREiRSMcoKahymDQ6AQVxfiVX
+/X03+CMgt4EwSvqUhERPocqzaz0mAMOXVbWyVh5PenS7XfhqOZdAtAatIkES19OpgTQShnhO+UO3
+9AGw69oAGCBEgpkuZjgLh4OCy+6PJrQfWWC73e4XaadfEUjogwZOYsIibVSYMkmqfmHDDf6MOqsG
+QGlgJDXAQXtT9Tz7MovJvcj3TtBiO1T4od1un5yczHzRi4chEaGScwYA3UhGKuDBW8G1HzjinjZF
+DTHnAwqaGg8Mmcp/eCkPB2svTRa9jUZh5kG32z04OPgKOTnUGAaC0ZzWBamqInc/qH2fBX/IOAAB
+RjgBAUAJMZQZOTbB6qyeZ7shy0SOnFw4jeyBfEwMabVa86pBcQEghoERRnlaFRhfCipvesVvGL0I
+pENJCoaBEjoBAAUk0mSK55qRNEbbjSV+BoOBGQ/GWBRFMKxc5vv+0dFRo9GwOa1Z8hnjKtltF36+
+gHA5o1TJRKuYkFSrmABw6oByQHlMhLF40ucdx/8g5/01kI2Y7QMUgQigAAyoIwBcAr5Lp8jRnFr0
+2fqUuVyuWCxyzidoMVYCym564zje2trCOC0uFchG4PFiG0jBn4/89/yglGJMOI7HmUspN8YonSgd
+eZwlaZTKhZz3fqH8LnguUA2m/PJXnFr0dg9ljHFdt1arYZGHCe3tmXz8Rin19OnTer1uA40j3M6I
+oC/GE9UKKOGMekZzozETSwKNie5pRZh4s1j5U17+LnBHqpiZOWQgTy16G8JGTS+Xy8VicQKJZhMf
+bTom57zf729ubrZaLQAwxsRxDMPchTMFfQHSNwQMIanUSaqUMUAIYYRyE8sj4a0Wy99jpXfBKSbA
+NBgxj9uZMfHPaijWdWu32+MU36q2PXvlOI7jOLu7u7lczvd93BxkG18KKGUAoHSqjWKMEgJKgVI0
+FV4QfNOpfBu8QgzKGOFQCtADKLzsFaf9gbUPGAp3HKdWq02orIHKnq1hqbUWQgwGAyxLBMO0emx8
+pvQvYEgMYZoYQzUVhgrQhKbSUaogyt/jxW+Duy5BStLnlFJgRkcvf8UZPRxruwkheK51XHvL12er
+j+EkaLfbT548efbsWfYwCZwS9GxyH+dxTfyRBhITFgFJtTKcBqXCjVzlryD3tqG+ApeDwyAFAKKq
+M9zSCGYRPRkWOcD6K6VSqVwuj2tvK7HaHDT0MlHTDw4OPv/880ajgY0xUwoy4p45ujK96CmANpBq
+E0sVKaVcp5CrXHf9PzBiVQFjhDHjKT0ApUHPwdjPeG4WADBxFQCklHfv3t3b28OsY3vAAYbJ+Kjs
+2NgMT+rgN+ho4mBcu3YNU6Ms2fmCAUX9fJVYtGnWrcr2xhgDqYFqoGCYUUQDAAHNACLepql2TcCN
+G9GO9FlafQcqf4lm9YsrEQBSAphP4YQZz82OVAKilK6trfX7fc45xk/QSbcqD8/7juggOY6DBYOe
+PXuWpikWkcg68jbwG8fxacbNthw5zUwyhUPt+OHNaK3HjSRJXA7CmCQ2DcMqxfx387n3gc3BsIzD
+7KLP/pcxdvPmzXq93uv18Hj86dI3JhMpROlbjzOKov39ffywsrISBAFOHWT5CSGe58HzZsf2HIah
+4zhYrhGGo2XP62a/HKrLmLRc43HGJQwSkK5/p1j8E/DeB3qOTu1LJXlDZhUtFos3b948OTk5Pj7O
+5/OcczyUjBM/a7tRMbEBEsie52FJwHa7Xa/XV1dXsfqqPd6PxTLh1BpAhnUXIMPTwdCXNcagldMv
+UE5QEKlJT7GUu3f8wg/AexcISQw4V+oEoYV9Enyq1dVVrIyCxgRrUEw4o5MtyYUTJQxD3GrV6/Va
+rba0tBQEAWMMy3iPUKRmSOHZb8jwXHIYhh9//DFj7MaNG6VS6Tn2dFwEj0YRNKizVih96Bc+BOFK
+ApqEcG5HZ2cX/ci+H3mFmzdvtlqt3/72t1rrYrFoNwE2omIb42Jg67qiYUEz1Ww2u93u/v5+rVZb
+WVmpVqu4b6BDkOFZdVwzbMGRKIpOTk52d3cPDg4ajQaeCX3w4IEdHqUUo2c/ckIMsCXuv+sXvg/u
+siYgTUuQK1aAyxqQrA6i514oFNDstFotVHlr8UcU1nodMCSfs0XRpZSdTqfb7e7s7OTzeTzJj/Vw
+7GlF9GQIIc1m8/j4+Pj4uNVqhWGIi7zjOFLKer1+cnKytLT05U/FFnL538sFPyLOhqKgQQnisqny
+V6fEjFpvRZ81+kgS3LhxI0kSLHxmDbRtaYcte3jK1jNA5tJWSQOANE1brVa/39/Z2RFCoB3DP2FX
+SASRYTYc/tB1XUJIGIbb29tYZySfz+PtgTyb8GDuYqnwAeQ+0FRE0OHgCuODvmIFuL5wkE996TgO
+Fp24detWv9//zW9+k6ZpPp/H3BuUFzJlWIjldM9WkcnzL6jC7S4eu8Ue4NRre+xd2cGr1WqDweDx
+48dLS0u3bt3CEg4KEgAXiDOIVEApZ7TVIwuFa2Htb3tOwacRIyJvitqAJkDGrgxzwNwyINFrRrVF
+3b99+7bjOJ1OBwCw7iGeGyETayeMA76vwZ69wgDLBLIazQ5jLAzDJ0+edDodNEEGEg2KSPA4cDdS
+QrLcdZ7/VlBY8NwCpVjGB7SB8+aN5iZ6WxMXRVOtVu/du7exsWErTmAbay6mhRkeALJ7VzT9Z7Y0
+w/KyMKzsu7m5CQCEEM6FAA1UCRamqpMajxW/5lT/2OFlzgpghDHGgAaiCFUwTax1Wswz79cMq6fg
+v5VK5cGDB/iCisFgYPPObG3EqWCrLtr9ql0/RpxOBNo0PDgnpdzc3Dw6OmKMgfIpKGAnhERGF0Hc
+c8vfgeDrRrlGCTCUUso5MGoIaPNVET0ZwhZID4Lg7bffvnXrVqlUQhcI/cgZ6tSzIewmAMsjnxlF
+QcVH/wrf2dNoNJ4+fSqlTAcgTWTUiSTC9b5ZLH7oFb8eEdCKak2NIQD6i0qLMJfTamMxz4p/mF9m
+HW30FBcXF9F/397e7na7ZhgvnLZ//XxVp3HNbM9xHON2DFd+pdTe3l6tVttY3ZCER1LEajVw33Ry
+70m6NADt8eHL+IwkAEAoAAVDr1Y9nDNhfZ6sLcZvCoXC2toapXRvbw/9fT3mXYMToDMvwstyZBNY
+ZaSmrX/V6/UePXq0urhMPUHp667/Hcd/A/iqAqAgARwgQIeVQ4whYKY7qjAt5nlQ+Eya1zKXaZru
+7Ox8/vnnx8fHE6pSjLsfSwgjRqz8CLcDQz/K933kRNEGcs6//c0btY0Heb7gJA+B14AuxAQIlY7m
+AAaoAlAA1IAAA8bA+Z2CuYj3UiFwSDqdztbW1s7OzvHxMQ4V7k7tGZVskoj1Z2D8GX6TeXEnybx6
+EGsJ6mEhZTOsgB8EwTvvvLO+vp4lNS8Fl3A8fjAYdLtdVH+si4kJhLhyQqZ2wuk982ngUFlWkg1f
+hYQ7Cbs7w7dNCiGazeZ77713//59G0+2ZZUu5On/DxfxwgzIbFMZY7lcDnMRDg4O0OezZaLy+TzW
+4ILns6DI+JR8TGjATZbJxLbsZ1tfFGfY2tpaEAQjgr54ucNFar2tiGCXX2MMvnpwb2+vXq9jSaNs
+ubgzYyMjGCGTSeaVAmZ40hGdnNXV1fX19cXFxUKhgJFIG065FLNzQS/Cg1Oyyz5wt9s9Ojra29tr
+NpuY0pN1k9Duj9N6G5AhwxisvRyasnK5XKlUKpXK8vJytVoduQEzrP168dK/iBfh4U7KlrbFK1rL
+YCfBYDDA5Jw4jnu9Xr/fj+PYJsCOE43runaji81c18V3zzqOUy6XV1ZWFhcXMbRr4wT25+qsV5xf
+DC7u9Y9ZuaNKnpYm/jWKok6n02q1Wq1Wu93udrtxHI/LqEVSDHsTQmA2XKlUqtVqpVIJ38WENQUw
+OJ51f8+cjheGCxL9BEutMy9Eyo4HhmR7vR4WPJqQWGiGrxZDpr5QKBQKhayblN3uwak0ZgBAx39+
+T/xCuKK1l34X8BWrWPD/Ca9Ef2l4JfpLwyvRXxpeif7S8L+lTPJq5s7bYgAAAABJRU5ErkJggg==
+
+      	</field>
+      </record>
+      <record id="brand_steyr" model="fleet.vehicle.model.brand">
+      	<field name="name">Steyr</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAABFAElEQVR4nO29d5RWRbb//a2qE57Q
+uZtuaLqhyTlKBgElCIgSRNBRB3NOmLNjGq5hxOyIWcGACogBJBoQJefcdKDpnPuJ55yq2u8fjc7c
+3/tOgLn34n1/s1evXmd193r67M9Tz65ddfb+FiMi/NtOhfFTfQP/99q/0Z8y+zf6U2b/Rn/K7N/o
+T5n9G/0ps3+jP2VmnKp/TBqMAew//5CgGBjAQPwvv5OaFCcbADQAQIAQYpSooRUDZ5w3vxIBpMAI
+ROAMxKEZOAOgSTOuAAn4FRSgAM5gCACQgAf4T9AD/cvFSQ5fdgqXVEp5XIDBBEFrME6MuZAMnIPx
+v7hEBGjFSWppcB9BCRDgeK5pWQzaBIPWHjgxZmhwrcEYBEix5reDBMCJQQMaaH5hJjVpziw0e08n
+AfA3gV6fxB0QPAZGIK3AhQBAYAwM0EorzsGOj3qDCMTgIibgbx7dJMEZuIgBmihIpDnngNYgBtb8
+OgwgxBkYwXaVFkIyEGAL1ez3X+5EMcmZYrBPyusTdvxX+9fR63/8J/9fRkQEyZhisAiGVuACiqIA
+DOYDcQBg2iUXTBCY7UVgVMloTVNjnVINMm6BODc8ClLAH0xKakHwMyQBaaAgaZNxABJKgpvERfNw
+h5aMKxCDYmAmGMC1gqMhTQRPlsCpQX+S3AEoyYUBgkukODMAAXAQwDwigzFGaIiGDlUd3XHs4O5d
+m7b/XFxXU1MdjjSEI7KpHvEYfAEhlfIZyGhhtMxsYZnK59OdOmT16tOhY4fcNF/HzNxRLNAeRgCK
+IA0y4IkYAA4hIEBcay2ECQAEsJP25RSgP3nuAEjz4wMTBPol4moPInSs4MefNyz9cd2mzT9X79zX
+EAMUh6FtDq4Q0wDBL4yYkkFuRLX65f4JYOAA49AamZkY0ie5f/fUYSOG9h48OTPndFArOAbZzfMK
+iGkOxQCQCQ2I/zXo/yXuAAhaKUdwzuCHBISsr967YuXCrz9bue6HXRV1pI5HgFhGimkyJVzVqRe1
+adsqmMA7dUtjIjr37iP9h/mvuawfE6yuqanwaOWe/VVFRWios2trVTQmlYDWSOXokuMbNSJ31IQz
+Ro2fGUgeABEAN6UmCCmgGQgQgDhZV/63oVcIcyQxBQjn0MFlb77x/LJPfiwpRgRccO0z4TNxWp+k
+rMzknJy8M0aPz+rS0TQSgmbblMS0pISUkupFowfcPHAkXnhtu2UI6URNODYLRUNHDx3YuGHD6lB5
+ZMPmyp35XpVjEGxGOtmIDeiB6eeNGjNhdud+54Bn0PHJ1mPA/yL0+GfpkySYmjGiuMEMeAYEFJeA
+IXSkZP8PT/7xic8Wr2+MszgYCZ2dhtzchL69Op05dnqHzoN79O7n83Gp4wbnoAQNi1iDQFpjycpO
+/c6+8Gz7uXcPKJmhiUkeJQjOOWfEYTh1pUf2ryo7vH/1yqV7D1Ru38erHUkGoNC7DWad1XfW7Bs7
+DLqQjACDhuIuh8k8BkCaYADToLjmAf6P54DfKnoFLbQBDRiOJBLwMeYAkcjRkqf+/MiL85fUN4Ar
+YQMZWapf/x7jRw6dcv61KRltE5JswAEMKEkGMa9GOgVV9dUVlaG44xzeuefSGz86b7p15/WzWmZ1
+zmyd5UsIMqMlkARKhE6FCBLinpYs3nBwy9oN3y1Zs27tti0qP+IIzQXs09rJy68eOvbC+7LbngUN
+C1KxKGPE4VOeKU0FmIaOC279Ixd/q+glGPOYMCSgCUJp1xB82ZIX77nz0aOFUUcrkyGzhdnvtK6X
+XXb38NFnpbXgBMUBQiQSKik5un/7Tz/u3LLtx9319RWlbpSH6nXUsQyIBtO2vAYI+APIaIVgED5u
+9OyccuaItl3a5Wa2Gpvbtg9S23rgGlkGeGPp6u++enPxZz+tWH+sIUoK8AOThyfcdc81p4290/Vl
+WRQHfMTA4CjYcRkJGgZg/iMXT3Yzhk7e1D/1pcnTEUlE5JJSsaZdV14+1OYWYNrwpRvs3NGdv/jk
+FRmvJWpQXj1RPNzw3Y+r59xxdZchvQOWABNgHDAscICBMQYgLQDwJL+JBGYmGrYtwOED0gEbJsDR
+tiXGD8O8B/ruWHub27hSeTWSKEpudcmWRS/OPmdAAofgPOADOqfivbu7eiVrJFGMiFzyPFIUIQqT
+0v+Ejydp/wOxPg5mEhhTxtYdr95y/X1bNjUowAe0acdvuOW+S664TQS4n2uG6srD6z98+5OPlm7Y
+cbjJI5sUTHhpyTozW7C4attWdOrdLa99bk5eVhIvm3HRyiln2jffcwGTOh6qLSoo3rmzoLg8drQU
+u3bBU3AFtEaKD+OGJEybOGDcpMszOp0OqxVB79277vv3/uOFd344WG/ZnmsB154bvPvhp9N7XRE1
+yYJtaBecS5Dxj6ff3+qo1xQmFSflLVl6d1YLSwA2kOEXF04fuHvTdqKQ55YR1e7f/cFtt4zPSAZg
+A7YA0hPQtwuuv7TPw7dPXLn0T0cObq04uququqQpVkxE1UVfZLQwL5ueWh2rbJKh2vDR2oa94frt
+VcUf/LT6+rdfPOPeK1v0zUV6gAE+sICfY2AbzL9nSPHm14hqiRrDuuynZY9dNzqNwQBSGMNl/UTx
+imtJNUZVhDwipWL6n3HzJO2/P+AoTbLhlZcvSfY3L1hZu7a+5//jkbhUrqogryF07MdHbx3dJgEC
+HD7bb7EObTDlrMw3Xrr1+3VLm5qqSEfIaySq8uKVRPValpNX2li8MD0Vd9+YQt4ukkelPOpRpUPR
+mIwTuSTpWNEPJVsXfPDEkGsnBXJTAet47t63HV67b2jlkeVEHhHVH/72nTvGdM4yGHwmx8hsvuaV
+80g1ei6R0wz2fzH60Ny5VwkGE0aCwLAB2d+t+kSpkFYVREc+/fiOnl1sAxDgQY52mcZlM7st+2Re
+U91RUlGiKFG90gVx2l5W8tb6b+599cnfPXr30Dtu6nLRxFbMQt9uifc/2v7Rh874j/vHf/bOtCO7
+b4s0vKDUF0rvIu1oIk81lB/5/puF1185JalrS7+AwZnfAib3s1a/ez05RxxSyju2+e0LxneGCYAH
+26Tik2fOJ6cwTkTa+9+AXhFp6VFcUpQ80pI80iSrn350FjgAu4WFaWfk7tj2nSaXqLK09Lvrrhzp
+AxgSGHzpqbhgSt9vPnu3tqlGkUO6ibzSaOWa1UvvuOe2Iaf1t1JSwSEYDMHBYAAGY2D8l3UoBzgS
+E1lWMs4a7n/krtzP5p9defBZcrZrcl3ymmp2ffnODVdMEEk+MNgCdrsEPH59r5rCdVpL0rGyFTdc
+PcSGAQg7Q+DDR6YS1cUp4hCR0kSupubPifKItKTfEHrlEWnS5BApV3rkESn3uRcuFYABpAaDF0/p
+U1JwgKhGUtW2je/365bJwAEkCQzsnPzhG0/VVhYQRTXVkszfvenFO27o272TKQADpo+Bc56ciCSB
+Di0x7nScPz05kfu69cA9V6RccR7GDxLdcxNzWpg2hw9BAdMCerRJvOmCrHUfniPrVxFFibzqgm1v
+PXT24Dz4wMBhAVdM8hVueJyoPk5uzdaXbhoWhMENoLUlFjx+PukIeaTJJYoed1o7WpL+bY16ItJE
+2tM67BCR9pYuutkOQMBICZq/P793eWmFdMoU1S7+9P68lkEDnAEpPvOai0cX7/2J3DBRWLt7flz9
+yPlTO9sWAAjGbYbOrXHmgNRLzk189g9jvln08PoVzx3ctvjggQfaJGP2BWn5ez8p2PdhedGfSwse
+/3b5BU89mnXdRXxoB6QAFsDAkwQmDRIfPj+uvugrokrS7q7Vr14yNphkcHD4wCf08O9b8QDpKuXV
+y4KPrjk9aACM27k2Pn/5VvJCRK7nElHUJY8oTlJ5vzH0nuuFiFwiT5HctnN+djpM2BkBdt65HQ8X
+7CWq0uR98NZNCSYMcFsgJ9144/n7w02lmmpINR45sOya2cNtcTyEtEgQvTuYc64Z9Mzc2fv2/hCu
+qwtHizWFFTnScyrKPuuUknjN+VlKVhBR1IvVxY5FZI10KmpLv/5h1fXzn+57zjC0SQU4YAUNYPr4
+hNUfXylDuyLkFR3b/Mdr+3f2m+DgYAMyzKIld3hUGaKmui3zZvYDmICdPjQXG758lDzSWpMmTSFS
+Lnkx9z+5f+rRh0mR6xHJWLRpa6eOls/m6T5+3qS2BQW7tD4mKfrOm9cKGH7ABjq38a9c8jFRyKMq
+KYveePn3rRKZCVgw00wM6hK455YJW35eUlNdTqQ01RPVEhWRyq+p/qqm+pOli+5JMTD74qwD+548
+VvyWdlcSbSJvL+lyojBpqo5UlRUtXfzCyCvHmZlBQHAAuRbuv7xt/u43PCLt1Xz8/MQuqWDcBuND
+svmOJb+XXlRS497lN49uwyFgMJwzKqXyyFekKOa5pIkUSWqk/5R0nmr0msiLkyYiHbvu0oE2BxjO
+Gpm+b88q0tVETYs/nuPzC5ODwRzaJ2PrT99oaiTtVhaun3ZWBwuGYAhwdG+D++ZM//mHpURRTXFN
+tcrZU1606KsPLrv7qlEThrca2NtonQWDN29y8fQ0dGrPJpzpu3CK785rs1csGV90+Ha3YZlWxSSJ
+orHa/M8/f33C2QMRhGDwgWFsLn5eeBXpSqnqf1z8QP+WYAwwrBFpOPr9vU64kVT4+48uaR8UAILA
+/bd3b6w+TKTIJSXJoyjJ31LAkZKIXCL3489uDcC2ge7dsXTRS4qaSFXu3fRmRpppcQjg9CGtt2z+
+RukGovDOzR8P75nlg2EKyycCk85ss+KbD+NeFVEj0bF43aovFl1zwYyOKYn4Sz5jABYAgxsQ4DaC
+BgAGMAPCYggmMEwZH3zvkbyCbbdEI/vjRJqcgh3v3ntjm9aJXAAcKX2SjbceGeXKclLhfV/9YWCu
+aQOAeX4flGz8M3n1Uafu1ftGZ3AY4Lnp+HzxZeRq5UmXpCQi7f6W0JMXj1Nt/dJePcGANpnsuccu
+lV4sJitCNd/27ZbMGGyBUb3T9mxcHieXdM3KL59rlQUwWBytU3DfnOlVJQc1OSQr43WbXpx7SZ9O
+AQMwYDLw9BR/XjYf3pdffUHrp+4ZNv/J8959ccaCN877+pOLvvzkzI/e6vXgbZnjT0e3jhbngAAD
+2mbg1kuStq24UYY2EUW8xtJFr07v15PbAJCQ6scfbx/uRY+SVgdW3jE+RxgWYww3jEVJ0XIiN1y9
+5cpJyRzJFnDu6OTC3e9LojjFpeecmoCjSGpySRNpIoprLUmTJs/x4iSbHrl3GLgIpmD2zLZlRcfi
+VEu0e+aMXgJggg/p4V+/dpmiKqL6NateSvPBhg2OTm34G889Sl6EqEmrgg8W3dSnn5/BNgWSDbTL
+EGePTbnr5j4bVr1eeGhNWemGutrtbvRwY802GS6Mxiob6zdGwp9XVq/3yj779pvZzz6Rc85gpNiw
+YYGhc6I196KU4r1Pe1RHKrZ95f2TBpgGAAtp8L9y83BPVmmKb/v43KHZJqwgYDx7VQfVUOiQV7jp
+zeHtARYMCjb/j70iTZURipDyTg16TUREUrpaN196mtzmXxw6/KfkIATsoUOwbu3biiqJKt9+6yoD
+4Ah2zcYHC14mXa8pun3TOy2CTHBbAD2z+aKPXtMUJaqtK1179eweAiYQtJno1hYzJ+YsW/hSffke
+0nv273nztZdvmT2717Ivn+jYEZ3z0vJy0bOrGDsycOGMtKJjy47snkPOZooXFO1Z8Oa89uf1RyBo
+wgKY3a87Vr443gntlqTKtr0wbZAfAgxmK9v8+NGB5JQRHVvz7OiWAcBG2yAW/Wmaq8KkQx+8NCPR
+tsEwogd2/fyU65JU9eqULKmk1ETNS6fmN9+TsokkkVf0+9m5MNA+Szz10OSo06BU6GjJu62zwBmy
+E81H777QiYdcXVtZtqZ/r1YW/AK8Y4b5+WfvETVKqtq98YM+vdME4xbMTBOTh+d++NY8x61qqF/+
++jNnDR/SIsWPAEOSwRd//KLNf32cyi0OG0bRsc2rvpw8ZbL/+7VXxCuXEnlNexa/cneXrnlBAQgR
+NEzMu7F1pHwTKSrZu2BqP25zCxz9W2Hjm9NJhih06IXLW/qEHxxnd8e+Pa85XjTeuGb6hADjtg08
+dntrGS52tdJ0KtDr46HGI3KVar52SXv7dj/jt8CAi6YnHt2zmahMu3UXX9SeAQlcXDIlr7auIq7z
+tSr83eQ+AMDQMQ3LFi/0dExS4/rPn0xPABMcAnkZeOS280oOHamp+frhO0bkpUIIGAYE0Ltryw45
+/kULnjGBxx994udNG3/6+Z3Hn+qaKFBQfKihdIXJkZKAP/3Htdu2PrP/uyckFW1fdvMVo4JgSIAR
+4Lh8SrDm4DeK3PJtf57c1y9gGyxtVDsc2/R8nCh24N1ZPQAEmJVwx4ysWLyKqGr79w+1bwmAD+4i
+tn93lyblnaLkUmndnOA6RFHSREpLt/iGK3sBCb07s7dfvpQoTk75ls1PB33MMuxBXdnq5e8T1Wiq
+ef3ZWX4kmBZLD+L5eY8SNWkKfbt0XmoyF4AF9G1nzH/zhbiKkhe989qOPg4AAv4BQzt8+smHrntg
+yaePLVrwlAF8umS+1A6pGKktc+7otHPfjoqi1YAxftJppL2du/44eVhg3WcXEdU2Fn/78FVJGQlg
+gCXw+xHJjUfWe0QHVt43rAvAbAO4b0ZmXeUPWtPud89swQT8ab1SxdpPHtHKofjRx27JZLB9Psx7
+OC/edMz5T49Q/sfQa5eItCZFjqawFyfyvKLCLzITAc5+P8sq3r815BSSrpg8MZOBZyTgnjvOImp0
+nXBZwdIOWTZgBGzcee1sTXFXVR348c2MNJNxg3MM7pq+6ruvyIt++f7vKV49+8pzIXDTDRcP6MWm
+zhinVMiNHSNJ36570QAWvP+WpHCTcyAcLW5qzK+MHCncv5QzTBg3mlR5hEK3TktJB7vzho5EISmP
+PnNrbrrPAjOSDPOWyYGqY5u0blq78PLcRAj4cwx8/ewErTwV33HXeakWwLh9/cQ2oZoyUurIT3Pa
+t/bDxIRBVsmejxXFTsmoj5MmTeSSo8mTriKqf/WVSwXQoQ2ef3YWuWGisjVrbwuIgGVgwujk/Pw9
+TriY9NGrZvUV3PZxfsaInNKiI1JV15Z82619sgCEYKd1ydq99TtSbt3Rj6aPxIFtb15x3elzbr2T
+vOqJZ/BzJk8iCoejO7U+tGbNawbw4YLXierCTYed8D6nqcijqoN7F4KLkWNGKGogt+CWizuC4b6n
+5jcUr1j74RzSW+fdPyDFMhh4CsPcG3qGlaTG/Jdvz0liYDCuHIySPR/HiQrX3ZGXzhmMjin+dZ89
+oaRL3v4517UEQ3Zy4jvPDiMKnRr0uvn5B3lKk1ae4+zv3w+APWtywtbdHyrdQJFdv7u0I8BbpuOF
+ebeSqiOq2rRurmFCAO3zsPbrT4hC5O2fef5gMNhA99bGT999QZK2rJo7rKuRDHv2zNyvlz1GMZco
+f9xwnDN5iPaicWc/Uc3y5c/bHAvff4qorjF6tClyKO7urXcr8w98IgQbM2Yw6UqPDt98SUsbWLNm
+Y23j1619ePmOfrrp23lXtoXlg2m0Ffj65RtJU23RlxcN8htAAObrd/WnWLWnyu+7OIcJmAJzZqaH
+oqURcrf/cFmSzQB+96VpFZWb/nX0J/xcUYIzgAOCtGYRBrFv64I9B3iroNOvf+t27c9SEjXV65Z8
+kG/AGHZawtkTL3cRhqz70wvzpWJBzqedee7wiROhnE8W/nnR0o2cIdNn3vaHR4cMnbxp7T3jpz3x
+8yF50Q0z0lsOaJ0zRPsagBBkGtO2NCLaMwDyc+kAmgVAQjAXTMC1/FyCMaWYyZhizJA+6WlHIByv
+TjEDcZY655ntTz79zK1/euv60QEuZbEyXvrzq0X5X6S1OWvOzee3NBGFWvj5tpLdSwgtL7jy4pZB
+KCXWb45U7PhaaNWhxzXTzxIAX7IhXrNnCWlN4IBuLl2UCCsA6gRInjB6BkFwQSB4EgCPf/31t25M
+t2zFRp55kWXCNN0PF61wXWSkuoMGTWjbrqXJU/ft+vKr5YXQRrt2+qIrbhakGkoOPvjYayCkA+fN
+nnbJ7JvrDn5+4eVPNoXDTz758MsvvfLMM8+0a58Xc2JaS34ST54NBzCgIYTNmLADcXA8/tiX899f
+cvcfn+iWDcM0t+xnH739ELzoaVMemj4uE1zsPYoVn3wARLr2nHX2yDzN6GBhfPX3ywzyElPbjB4z
+zII8VhbdsW+t69RICfVLYT6deJPICfvkKY/x5vYBbmgrFNn/9Ve7LI5RZ7RPzx4SMEnHij794meA
+t26JMyZcLCzGEH33nUXReDA56I0fN7LXsMGC5Fuvv3ywMG5q9Oycdttdj1hm/T33zSkuw803XXfH
+HbeFInVxz7V8ppQu5z5N7oneJ1whuA/ElVJMK0mxLj2tYSNTbrnjLWkkP3D3NEOpaimXf7Zj15b3
+ZELuVVdNyUjX1TH/yhXfFx/4zkztO/3c4ZahHWauWL0uVFXiKf/4SefkpCEaw3c/b1SqzBRgTIBL
+Ujhens9PoB7yhNHbQpA2mCCCMGBW1W3dvj2UlID0TLNVXj9GMv/gph8315vQY07v0aHbQIA1Vm77
+/PODGrGsVMyefa+Caqg88OrrH4FZLQLswmuuyW3TddfPHyxcWdg+L/ehh+/zKCoEZ4zF42HbNgF1
+MvUWFoMZZYZm5EFQNMKSEtr+x7P3ynj0jjvnzph12+hhHDB3HsI3n73vItJz3MWTe/tgBXYU6+Kt
+K4lj8PipHVsIB96BQ5Gj+Vsg7Fat+w7ob8FEZWXy4cPrATAw0opxCDDoE6sUP3GfiGmANdfvMG/3
+rk0KvjY51mkDhnLTDy137diuXGTnGHltuiWkpQC08fsVhWUu43rcmf1b5nW3YS39/P2iam0a6N6z
+7ZSLrgOv+2b5D1HPvuHma5LTUyPReq211ggEfZ7nSa35yZSiymjEI2VxZoOUIYLRcEb/PtfccFHX
+r1ft3nMkfN99F9vwYuBrVh+sPrQTwb5XTT1DuLXFUf7F4o80Naa0Hjp+ZCcuRG29tWHDpwY0jLZj
+x/eBi+3b3cLDW0jFNMA4QMf7t4ATKGo68VhPAlyCOGOArliz4mcXbtDv9ul3llJxILTki7UgpKXI
+EaOmc3hA7PsfNyjirdPRtWu/9JbZKlr68cdfEOwAd6f97rLMFhmghh176pl2Ro0fDVLCABNcKyil
+GGOCm4ydeJ0WMVMkcDAGIV3Ojagjy8ESZ8+cpoEPPlo4fOi1o05PYPDvKYts+erNuLIHjZreP5dJ
+rvcW1hYe2MhFqxGjT+NSNYbUkYIdpEJgmR279jA5Kmtj4fpKKZsANDfVARACJ1SAfTKVU1J7WoMI
+YDUVZRFiul+/RIlWzJVA3a79lQzIzBA57fs6uglO6Yrv9yrl5OUYZ50zQ0p95PDan34s1XDysoNT
+p8xydYOWKh5tsgC/6WqlAC2l5NzQWjMmiJhSJ5I6NBtzTNvVcIC4IQyAEVMQsW4Dp3VsgwUffMWT
+e5939jATkdIaeejAVsTqjQ6njxyUBY0DRfzQlo1aUY8Bw9tnQYIdLW6sKDkAI9iuc9+2rQIKOLB/
+fzhUKXWc8EuBGkGeSCnfSQQcGNzPhMeZFWmqLCooYhy9+rQWZkaiPyX/0JbqWlcQRo8awXxBm/Oa
+8m0H8rVPyLQUf+v2HQ1D//TzWsdDMIh+PQdkZ6eGPM1tIzfDBEvctn45N0ytJee8GT0xcGbwk0hx
+dKqSFsjkHBC1UmpBLaEt0co3uFO7uiavsq7x3LEzUlIguG/Zl/trjh1QgVaDB+SSQkNjoKrwiBax
+dl0Gts1hBP+hA6HKksMuUdtO3VtkOJrh4N4Sxw0LbgAAeWBSKQh2ApHxxF3iEBIaptYoKTiw+zAl
+q+Tk9OwWLbOUkvvyy+tqDQNo3X6gPy3N1Im79+RH4nEfQ78Rp8NsD7dx9bd7JLgdwZiZ05Rh+t1i
+6FajzhtqU+jZuc/W5H+WbPfg0uVo8kxuKA/wEynGoAFwIihwgzMf0wyIBe0Er/4nJSzuJTJRawnt
+kWCIEY8nxBS4F+MSXkuDkyXCCspAt4R0gyhcX38wq/f4M/ukK61iUVQd2yMo2L7HmSlAmEePHFkX
+b4ghIb1jx/5gTQeryI00GkzFedvObVqCzLIGTpFCBkNDgwwFwzA86H9YlvyvoGcS3AOawL36xjIn
+4ktOj0rXsniSEOHGmgKt4l07CL9PWVBgtUcOFRpKxCVO6zrczxtcp+DIzkMMPCHIu3TtCtSZItuJ
+x8adcfWkqckHD6kzzr5627p7g4GUmGjlc6BFClTMZQIQHIZSxEBaxrUii6dDZe3b+fHldz6NSBJE
+XRxZTIEzA0iSkJ6lwS3GEsENELQmDsZ0aSwuCYJIQWT17psnbFHjYufW9dDo2bVDaiZs7a7fUeHG
+qywd7Nw1xWZ+g+Fo8RFyon74O3ZONuC5rm5qaqATmVf/VfSkm0vOEzgQcwsByu2gMlMGOCqs4ChV
+rTjS03VCcp4GAzPzC8q11mmpAW5zJlBeU1EXVh7Qs3/LlORWjtLEhWQNwWDW888tGjKidckhd9p5
+z3z6wc1+xrUpGDngnERUa0lQpmlqQHAybMdO2JF/9OnfzZ5TWtAkkmOMEpT2JOwAj2vEAKZNDaZd
+twkiqgme1IwLr+Hgz1uLDdOfmJgIZvYb2E+58UoHxwqOKAaktE1ONSRQ3shNAnhGl245jtaeEuWV
+ZUo4BH9ehzSPwYmjuqaS4AEcrLkziP0Ddv8ienAPTDPiRJx0k2kiIVn7fSm2sAiUf6AIlJKSTKnJ
+rQUYEZO6WsPKydRpqS2g02SDV1EvAN0qs3VumwxNLmmuCDGUp6f1Xb7mi9vu6F3TaN5w1ce7fnrR
+5+vgRaVmji1twyQCSQ/QmjGhHFxx0VN9Oty1Z5fO9LWQzO9BtkkP9uipS8p2G7rWVNnSC0BrvwAo
+DsUTktIg1Tvvvp9fqjPTM3Ja5rqsIbVF5wCH0oIiruBNdnLnbtltFbNEHPGqMiLeJqsHN03OfLVV
+hzmzmE5v0zIbMFwHNbWVBPkLF00gdiI4T3zUwwDFGNMMItQUk9JJz0juMzgNcduAplAyo6bcbDFg
+YCaoiVFTY129z9CtWxldu6RDV8Qi+ZGwZ0JbZqLPDCgd93RMGIbnmcqoYazVQ3O/uvfOTg0On3PT
+cw3luwOphga48itpMAjDBGeGVqYw+KBhHW68fYQBO6qifu1qHk5O6jBjeov9e9T36x6BiOgEG6Qt
+JMAxkk3RKr3yh7V33PfwAofjtptvIEke4i1at8tIYiZZZIdRtxnxoz5fBMxNCDqhhh9laLNhRiwV
+1jJiBWKGsw9qEwlmMqkkItF6rf9qmX2CG2InvPPANCPph8FBxyf0jd833n/3vCh712Px75ZsJ4E1
+63H5ddfGpc+Q9avXhRXz1u/wLrvuJr+VVVJ6TAtoMtJS/aAAo0TTjseVB51KIhRzYqbZ8oHHPty3
+e8xnK2qWr37v/AsetI1qz3As3sTheRoagglIya+/4Q9nT56YlnnaokWOUiY85hqBu++//5vFN04b
+v+SjT8M6XGxqwCHYOiK8tVtK1533aiRsdh/Y9tLZF2ryJAluq4DFOcQrnxR8v2Eij6nN5cS0tbUQ
+U3//OMy5DY2uQWZYJr72YdGq1RNkQB3Jl572k44p5Sntmr8AZ+zEAs4Jo9dMCtMA09pVynMZWWWl
+7uKPd0vhCzlxN2LCCuw/Eiou3xd2zGR49RrgqGuwV35zTLvHAGhmgWvPkdAu04YTU7D8TMRJBTUa
+IjLfDKbffP3spStefv2d5Rdf9DA0h/LBTRHwxVUdYy4xAW7Xh6LEvBuvXtC969YobzCgpVYmu/D1
+9/afO+2Vc6ev8ADF/LAkhGESIvXKUGr6xNPnzn81Kc1XF6pOTMlwheVKJeE6Do6FEIxrIUBMK2IV
+dSpOykeQnIPXuS5Ky6PaLzylYCuQwbjW9JeAc6IwT1yUhREktHC4YQMgyNFjM664eqCutzr0Snjq
+0dVLVlROOTf5rBFjGj3Zu13Tc+9sWbEyPHaAM+qsMyxKioZ2PfJioalgmwA4BwsmtXbhmdxkCGuP
+XJ0kG0X/Cef26vjapm/3l1ZXtMoyfRS3fOSRw7kBMOIueFzDZZz77A6Tz80OOxTzwe8JL1bbrd8f
+Vq7p/MLcNz5evK+8UUrPdJWpgyIWU0yLaef0aNuya9w5YvgMpRu064PBpHAvH5s6+ab57dMb/vjA
+DW+ucvvn8PsfvD6l3SRV/tY5s78Ompg5Om325U/7kqNlJW+Nn3mIyBWCaS3/Ea//OvScTAgJ+MEd
+X6JJTCck1QzoPiu7x2wDR7t0+lmvqPUnOGdfeENW6zPBKpd+MViaqs5zp027vUu/sw9tefWZF29s
+5Lo2FgbKPJ/15etPNMQOhHTaoUJ5w02z27dvGTGjCaJNp06JWwsjRw7sbp3ZzxGG0NpgTGsiGCAO
+qQzSBCvOKnVUA9ynGbgjLR2O1bfOmzLvjQu47DfvvVJlOSbniKhWCUZDvZxzz7vd+4/sMeAs5lVb
+LNgYrqqsM5hSrt32zAnjlXbd+B9A1Y0Oeo+c1b7ryMo9VdK3BEqIYNJpZ13okT/UuMNg20FwJAk3
+UVkQgCDusZCpEv/5zucT38NhaFaaITJ8dpIADzUZ1TXHJEIgnZiapiGrquJVVRVSR0Cx1JQWkLGi
+QlVVewwU5mYwJZUDqK2urauKW9o/cfoNB3YenXP7O5MnT8pr2yUSaRIGGA+279BaKSItwEzPc/7W
+/RBRc5D96+9EBEjXAWcQ3JYe48xq0y7llrsH1zWF59xyG284EPPZTKeEa4pj0rMM7QsKgsUjxQV1
+MQ5XWDwx0a90vKj4sBdntm0nJadGYx5DvKquShGCCZZpB6SU4hdBJaNZXuOfthPPcIia01gGAcMH
+0uUlVihcZMAliFZtcjjj1TWsqqYYPAaGtPREIRALMSdWDbgpmVnJSRrAwQOF9VW1FiDSc7JbZjtk
+JKclGiJomNCIQRuZLYNgYEwATBj/YAb7dYprvlBKgSTjCgxSRTknJZllpt94/cN9u5o/bix98JE7
+UqQFhPYfKiRCUgDprbI0fF74aGl9TAHpifAYE1yWlJeBafLczJadOGcGi5aV1QPctHRyUmut/1oV
+h59QZn8S22cMjDdvE1lWkgCOHnUlyjgM0pYdNIhQUUFKVhjMJNg9erY2AEU4uPcnT4u0rOyOuakA
+jpU7lWX7hYBLjQ5FYCpHEsAA7XkxsIBhKQCcmZCeEH/vY8wYY8d3sY+j11oTwJjWGowMIYSnnKYm
+q3WriU/Om5NhmS+8tf72K847WrJj48ZSbsCU6D1whIDOzz9YXRMj09e/WzsruSUQPXSoFABplZMz
+wLIVUfXBg40EzSCTU1ozxrTUzcQZ+AnhPIkHhACgNaCRm9ctJxcxlynVFGoMM+Fv1aZlwOLVtaip
+OSRd5XpW976dTRPgtH3Lj66nYKQPH9QVmnsK69YsZWAWJ23aUATmA4syxjjn0Lp5t1IIAcak/Huz
+2V8Fmb/+ofA8DeKWkaKVCQbG4+Du6AkPPHB7TxnBi+/96NbV7966UQF+brTr1Afk7dp5MOqASadz
+954pwSwVbTh4uBxAQoASU1ozKIZQYUEdgGAiBE9ljHFGBE1As8rXP28ns2mstGICIJXdulfHDoYH
+WVxUoeJ1DLx7j9OSUqRU2L1jpxdvZPClt+zaOQ8O8ZKKUE35PqKk0wb1MaBjChs37ZLxkIobWgc4
+QSgCVwA3DB8Q89spAJR2m0f137+l/xd3BjiCmxyadIQhzpngJkFUyHjNVfctPHNI9oBRp4VravYV
+eNDGoAFt0jPbgYW3bTmguZ3to6S2PQyoeKz+4OEyRshrk5KUmkIQym0oKasFeG7bJE8FOGdCCN2s
+z3ZC4E8q1jc3aADQ0Gnt8jKkop9/KBZmmRf3EgO5bduBgPw91bX1+w1TG8m9zhraRjF9qIRtW78Y
+QKeeI3p3sKTGoYLo96s+EFYS0zFNpo8injKduIK2IVQswg3BlfJIS0P8PY2Ivw41v15LaGFyAJ5q
+YkISkZYmkGJItyHQ9o57Ljpr+NDlK9dWu8rPVa++3bKyO0Yrd6z9cT/TbqfWCV0HDIHrHi3ce+hg
+vQDr0qVV+45dAZ1/YE/JsTgYa98+2zCSfD4foAnNsoInVJBwMhsJIGipJLhwnEDHDnlgOHbEi7uF
+wmDCzDp9VFutUV8u8wt+Jrgesk7v04EFUXSM79+62vMasjsOHT+yEziOlEbXrHwbTFpGPWCsW/GR
+IVL8/gQGAxTdueOAlDoh0ccM4Xl/z6lfcf81fQ5TSskgDJYBsohp4lAyqUlZCbyqTcdBA4e2W7ho
+LTE3tyWNPGOW1mL31uU78hsTGaVnJPfu1wfC3Lr5e0dyn58lJZppLXIY3MOH94RCMP0sPT0lGEix
+bBtEx/cv9YktZ08cPddM+21mRDkPWJ3GTcgVhCO16Ye3LuLM8FTahHGDGGNbC+2q3aspTn5g4NkT
+2gZNcLn2u30NR36C3WrK+eMSDSh4XywtPLj583FjLkoynCdeXLxu4V0WiwdY6Rt/fuj9z4707NW1
+Q5/TgKitGZEGDM4MgiQoxhhIABIIaB6SFOY8QSpi3CJtMO5yUh7nmimbu55WxEzhCSFquJ+8cF37
+bpP37Sg8XBqyyOzdtUO3sSM4O/zB+18Dfskx8bzpNiVrVr3sk41RIMlvDhoyXrMQk/6tW3Y6DH06
+kzR7p6QzkAkShhbEPBIntolzEtOsAgMRDEBpSm/RMycbR4/W5hdURyPFhsjq0q1/uxyKRNT3O7aH
+qgtDKpLRfsI5Y1oyzXYWqM8XPw9pdx84a8wgSwC76+ndVx7tNnD6jVe1c8Ny4iUvDR0y9LT+U2+8
+/r0EX8afnn7ab3IFjxl/M8NhLAbpt5Gq41EupV+IpISgljG4juaaCNCMuCIowTWY4cZVQkLngn2f
+PDlvvguVk6bOn3FFaiC3dO/Wz9ccZYh1y/P3GTGFQZWX7PpxSz7AfcLpN2CchA3K//zzrdxAatDO
+zemYlJhOWgNgx6UhTwzmCaPnEGCOYp4Jz/FUasbg6VPbM9jfrT8aC+2KezIj8/SxozlBrvrRLSn5
+3BBJGl2nT+2VKnRNFMtX7Sg6sDYxY8h1l18eTBCI0ntfHvhu0ZMPvrD8mSevz87rUFgSrazH2VPG
+r/vhqzPGDog7MSiL/vYakYgMpm34gj4z6C/9act/fPTh80GjH2yDlA+A53lC2FxoKSWgA2aAnNp7
+73+opsEVGl26Zp174U3MDc9/dUFxXSzDwpDBvXqeNhhMrlq8pDysDMgJ4/vmtOvFydiycUlhMTGg
+XU5mUnK27U9i/Hgur+mEFclO4tks15DgJtMqkOCPe9m9+6YBzurvmspLVgkZ5mbHmedNMID8IvOb
+VQsMTznaGTH2utGDAMLaTd6a5Y8wOCPPu3H6sEzDREWtO/fP893Cuqtvezl//8aismMHi/Z9tPT1
+nv1zSTcKJoUw1N/xi5IEyyyqXPbmx8Onnjvt8XvXZWUMVKIOEkK7BJhBMKmlaySm+51wk8+233/3
+6a9XHWMwchJx+bX36YBVX7j+zQXLoXXbTDb999dbJiOndNEHa0ggIwV9+o5OTEk1WGj16g2NMWQk
+omfvfn47wzITcXwpqwEw8BMSuDlxOVkJDqt5XpMetE47Z8rkrCyUV9vfrvvC0GVRKQcNmdmzcwJp
+Z9U3Zcd2LhTCNpL7X3rpKB8Q8twP3t16aOubZqDHnQ/e0r6FqQTWbKQnHx7r1n1HtuG6ZQqNMSce
+izEpCYgragLz/ub9iKaoV9kue2qqdfnKFU3DRow5Y9zEcLxCw7aYZgKhuGLSCfrF+k179u3bdGj/
+5gfufjkck0Kzs6eeM+PCqwJG450P3lkRQTpY/yGdB448h0FtWP3Zhp3l0JSZirPPv8pg1Fi++aNP
+txIwsHcGjKycnI6W7QfQvKDlzABOTIzvxAOOwPH0kmAY8AdT6ptSzz27ndJ87Xd1JSUfB0VKYsbg
+qRcmWxJbtnprVs5jFFNgZ519z1kTLSj8tNd97bmnVeOWtiOuuf/W4YkCHOyVxeHnn7pEho4m+dKY
+S0RKgZiwSTLBBNjfLPwjLeyAkMzNap3O4KuPFBNqhCk556bJScNgJrOZ6zmvvfpKbm7u2ef8rqoB
+Nqy+PVNuuP9xMHPlwsfeW3qAYHfLpguuvitgJWpU/Xnegkapg8DZ55ybmdsOFPnxhxV79jf5/UhN
+4y3bDcrOzmnm/kuNEG+G89+Inkg3/wviHISg7Tft4eefN9AWsS9X6a2bV7JYg0uZF195XutMhFy8
+v6Rg/9Y3OUuwsobOuXFKli08eB98WrRwwZ8CKuX8q9964OIsj7sNjvnoqyVvPjMTjWWJflNwplmU
+yDN4ovJMU/j+1v1Y3NYOmVayJO1BJSYGmU7zqU7Qtdv3lwvypyXxl195472F7009p+/pI8/LL2rQ
+sPKy2YuvvNqpc++KY9/cPme+J3kKk2Onjh45bhZHZPWyjxavOcwY2rdKnDbzUuIaqvytt5YpbbZM
+R7dew1Izc2y/RQA4NVcKEUEpdWLD/sTrwqP6eHu4IpeIvKpaWVN064jT0mDi95MD9UfejusweVse
+ureFyQADf7qjfU20IEoNVLfjnpuzbHAg2Cudb/ziUXKprnzrdecymAzw55p48u4O4ervFVWGY2X1
+kZ1xt5SocPzQ5HPOHqmo3gkXSCpfu/oZxtjCd1/RVBtqOBINHSU69MXamSZw3vmZHn2l9abnnxnm
+gzlxwgDZVLFj+xcHjrx/WqcAAHA7JQmL331OKfLiB88d3YkBFvNN6pN2eM8mJSvc8K7pg9rBQhDG
+nIvPJgrFqf7H1fcncADG1Ilpf3ry1mPVJZqU1J4iqYlUsziH1sebKf85O9kOQq2JlCaHKC51KL9g
+98I3OkEgxUz8alHvSKzQpaqiQw8M7AAB3r0Vvl1yDTn1MQqXH3hzVDeA+5nA2N44uHk+udRwYNlV
+E3gCbPBgkPFrzveX7P4jUX0sXlVcumzvjj+P621MnDJGUaghspVU3eqVcxPgW7v8dXKk61UTHXj0
+/oHLV4zJToMPGDUIZw1I4AyBBP+e3QfJa1r56dzcNFgcQGKrVLz21GPkeVKX3XrNCBsA7PYtjGWL
+PtRUTar2/eevYDAMoFd2cMuedVrWkyqYNa6tECyjJZtzfcfFiz70iE5RByGRUs0D3yVyieI1taX7
+98zu3TOdwRw5BFVFc8mLe5Q///muMMGA84clFu55w6VqUo3rP726U2Zz66V/2um+/N1vELnx4nX3
+XNYiPQjAD/hG98XKd6dQw7aq4h0vP3XJwM6pU8al1ZR9qeNVRI1ffPOk32KzL+38+OMj33x64u9m
+ZjGGY1Ub5v359IAAZzZsa9TE0SUFh6M1q665pKcBcGFbAt1yxacLX/eUlFQ1985zOLMZ0D4BD825
+1HFqPVVfu+vDtASYfmTYeOauG1yKEDV+vfiWJIMLGOPOMB575MYjBUXSOzW9VKS1Pj7qtWyWY5Eq
+XnDouzdebQEEDQtvPJNOTbtDqqmm9N0JZ1owEbAw94b24cYNUaeMnIb3nj4raAMwLODCEbx42wKP
+ZKTiwJN39u7eCoIBHAGGa2fZh7deTvFtKnro3Zce+fLTV+PRSkkVS9bdAyQymMcbXMAZR/6hH4j2
+/rD6vfffml9ZvdsN/fjhWxe2aQUYFpiRIjB+UNsN3y0m6UiqeejOSWCmAFoIcdWMsaG6w5IqVXjj
+tLHtLCSBY/qQto3VhVG32o1sHdwvGeA5ybj56sHz335PekR0ijQSfukT/+u3gcqqKndtmj1tUiZg
+9Mwxd268WEXriOKbvjivfVuAIdk2FjzTn3Q4LktIlj1zyxgfbLCAj1sXD0P+90+EdYQovu7TOReM
+5pk2YAAMmcnmJRemrP7s4qizTEbzSdeRpzb+9OqMKZPPmTTtnHPHT552/qxZU269bnaorkpRJVFF
+fdnCNx8f2z/PZ4Az+NItdMvAPTdccGj/LiLlxIoeumYk4zYETLCZYwaEo5UuhYlqHppzOjgDjL4t
+8e3yDzRVknKee/QSMHCOqWOS777jhvySatJxzzvFyiDHrTn6uy5t3/rlssVdMzkD+AXnGw1FCxzt
+klf0yhOtgxwMPC87Yd3Ci8hpCFMVxfY8dfPIoACE4TPE6G747qOrmqhcUX1V4br5Dw08u7eVFUw0
+ABuGYMZpnXDdRW0WvTt247eX1Za+oeLfSi/fo006voe89fVlq/IPPvXcvBHjx7VISQeYYQFpfnTP
+xoVjOy1b9HJMRojCZUe+nHFWawHDBPwQMyf1LW+qkV4l6fJXXrg8EWBAZkLgzcdv1dTgeA3bfnqz
+hQAMu0MbXHfZsHcXLtAqTrJZkuvUof917B+/cKmknjZvuumhGy0wmMJ6Zm5qLLIlLlU8tPrmaa1s
+gDF0bcvXf3IRuaUNXjVR0esPDeuUaoHblkhoHeDzHu5Sd3QlKSJN+TveeOmxbjPHoVMbzgUA0xA+
+BhhAi8RA3y7W8N583FCMHWZ36gDBbTAIcAuw4UtLxeB+uOr8dp8veLym6ZhDRLpixeL722XbBgCB
+JIGrpo6qqKtSVKJ0w4qF9wdN+GFn27h+1uCa+DHyGmLxA4O6ZQYRTE8wzp3Q8uFH72+K1JCKuJJO
+VfPmcdy/BPpfFf+iUaIdu7Zv+Pbcfh0ggLat8dVnk8gNO1R3eO/cC4ZDIA0MfXLttR/NJqoNxcqU
+rvnitUuH5oBZAEcGcPEo8e2KmSG5M04Uj9dU1axc+N60l+8ePO70hE55aJuDRF8Sjpe0m+AATI5A
+RhIG9uOD+mLUMH73Xa3mzZ25cdW79VXHiIh0+Oi+D667uL8PNkQCmJXpx923XByPVpFXralp6YLb
+EgELSLUw+8yO+fm7lI6Srrr5ytHN6jv9u9g3XjPjx80biSIkyftPQ/5/NMP5S3JJpJR2jouDKE3a
+jRJ9/uXbn77VLsMHMGtYe+z6/gpJcdJN+767bWRPHzPgY+iRhcUvXUQ6HKVCknX7vn3t8hktEv3N
+qsVGbhBzpthbvvy9VDsd7ZKkcKiwouDHXT+99tHb0598sNsT93d+YV7XrCC6tDfmP9Ptz0/3euvl
+3h++deGmDU8WF3xRUXiIpKuJiCpKCxY9ePuQti1gMDCGgMDoHtlffPAiyUrPaySqmj/v8oAPgJEg
+fFP6ZhQd2eNQFcmat5+9wgcAZrtcXDit15tvvaY8SZocpUkdFzb8rUgRkXaVpChRJETrv7jpoTnp
+BgDDmjYYRVvmkiZyw1u/umFoJ86RBIYOtnj+wQledJumalfXVldtfue56ZN6mUyAQ9iw2yXhyvPM
+ZQvOqCx6k9QRomiz45pIK0/rTeNH+Qd2RfGxr5Ru0BSKx4mItKokFdLu1h3r77vlsmF5rSxwAAmW
+zbq1xqPXTN93YKuW9SRrKFb8hzsutjgsLoJg4/u2Orxjk9ZhhyqWL3umhQUBf2YSO+PMvg8+dGtD
+fTWpXxRpyDtVjfp/A710PHIlKSeqSg7VfvTBlAtmwALAcP7ZVvH2+zWFw9S47as7x3dkAIcFBjx4
+RdfyPYtI1xBVObH4gR0fP3t3jzG9rGQOgIObTKBne8z5fc5br56+e+u9DVWfkv6OqJBo+6iR1vDB
+gbBaq3UZqT1EP9VWvrd27bVPzp08+DTLD8Y4BJDBMSgPl04d9NXST2NUHXWriWqq8z+fdW4vGIDg
+ScDEIZ237fmZKEpe/aH1L7dpCcBMNzBmUObsS6cfOrSDyNNSua5s/rgrHf8toSeKU32zPFKcaOOP
+uz9ccNrU000IAPyCyfzY4T9ICmu3bufKx8cPTjIAPwTgnzjU3PH1DTpeoKnO9aplU8O+jR88/9iQ
+aWN4TjIMNJ+YZnCOpCBv1x79B5izZmXddHNeikCrRDz9YKeHbu0zdXx6n+4J2S39v4igwfYhNxFj
++iRcd8ngb758JxYp0lQVk1GiY8s+eKBr+wzA9HHuA6adM6CiaGuMHKKGg+vndc1lNoygwIje9tRz
+h367bhWR57nxX92W8hTF+r+F3lVEOk6SXIq4FJFEP6zYMP/ZvHEDYAkAwenDcHTT45rCkipK9395
+w7SMFjZsGICdlobHbu1Zu+89UiVNVOpQ3JX1h3d9vm7J7fde0/riKcFuuQhyBGH5AAvcgJ8xMCQB
+po1kA0azLFGKz2wVMPu3MX9/tv+y6a1ee/XWnzetUSqiqDLmHSVdWluw/PpL+jEmAH8CrBy/uPPa
+WdXlBXGqIlm5b8PLea0gYAZMfkYXPmnyqMVfLm2OM82rd6W8v8L9r6L/L9OvJ3jMs2HGCIzB0GSA
+hTas/Xz3hns//azu5x3xKE8Y0b3pyQdnD535AkMgUn94/h/v//D91dsqQwqwgb592C2Xjp444+aU
+zN5atOaCk2xiCiX52wqP/VBfFd2x95t9+/ZEomZcef4ksfJrZQcwfgwCVqJtq4RE1a5dtzY5fRMT
+27Vu1bdlt8EpvjTlNDFbc/CG8p1vvfbiS68sLa8OShYxCJ1yAnc/9MeLrrqeqIYx3zfvP33NnLnH
+aoMJlh7aTcVadL/5ugenTJ/ONZobFpqP7SPdXCbEwH/ldsr167XS1EieR5J+yfhjMU3rvvlk3t2J
+Z45oFuw0O+SxRfMmU+Me8qSiqjWrnr5yTHaeH0xwCzBhTh+Ad/80qO7oK+QecamxSZc5VKWp3qPy
+mrqipvD2ytKfy46sjjfNH3MaH9nd3L//+eqKNeGG3eHGorrqo9FoHVHcVVUkKyUd01RYvO/jeQ9P
+7pbHfnmihLwk46oLR+3YtUZTlSvLtFfzp4d/Z/sgwJNMTOptTRpz+iefLSKKk0dEpLWWUv6aTCvp
+/rYkRklLeVwUym1WR2uWzdGSli1f+cTdGZOGQyDIORKScPfvMooOLJLxCOl4Xc3+pW9cf95AluDz
+w/BB2CbjfXJw35Wtflh2aWP510oWeXTEk1FHHYvGaz1dTbqe1P4zhmb07cAqju5Suq7Jy6+OFTdR
+qUNVUkWIDpYeW/z1J9ddN6tLy0QwAXD4TSsrVUwa3emzz172nBqp6onqSw6tuuScHiYHgz8lDTNO
+D44Z0XPJ4q9JE+mY1mEi79c4o5sv/o8FzSlH75BSLmmKe0RKkaIaojg5WlM8pmnd2h/m3trxsklI
+8AMwgcDEblix8PpoaAdRo1KRysINH704feoI5LUQBgBwLmwbGNYb117o++jliUf23NRQ9q4X+pHU
+Dq2KiTaNOdM/YhhzaQVRGXn7VWSb27ji6JGn33xx5pUXZffI4zYHmAEOm6NDFpsxutPSV+Y6jQVS
+N3jUSFSy5I0HeucGDYCBD8jhM0ZmjR7T/6tvVpBWRMrRbvx4HukeR6xJuh6RUvK/IMP5HzirBJpF
+GIIHdx9etOi+vbuX7NlCx0oRQkJWYviSmR2uufGeDr3Oh0jUqra+pvTnr19eve67dT8U1IWsstqY
+Yia4B2bYTKYkomsXf7s2okPbnLjiz7+4z0gSf7y/JUO7wtLiTZvDu3Y7TfGojNkwtXC9BAstkoyk
+JOOsSWP7Dzt93OQZwcRMrjXn3qFdyx974E+ffLHDgZkANaijDqd3y2mde9edDwweMtzzlGmagNZQ
+/L/trJL/gcORiFxucgagoS7+4Ud//Pb75ysLmrbvQBNxMKNfnnvd7J4XXHxXYt5URySaCDXWlMXq
+t6z4/PX8w4cLjkTX/9ygTDPmeU0RgxAQIgLl54hJMILZ3EnDELG5IUhnttC2ABQ/fXiandxywMjJ
+/QeN79ypl235SEaYgeqjB557/pHX31tX3QBDomtyMLuTU6YSz514ye23352Wluk52rSt5oeujP0z
+B9H+VtF7xE1AuXFh+sA9Ivf7ld99/PET5UUbCg4ivwxRZjCG/t3kJRcMmDb10jbdpoMngjGt7cbG
+yvLijTpSc3DP+p27d1TX1zg6HAqF4lFGXKxbJw2ff+rYWGqL1MRUxgzEHV+7tt27dOqbntzZzhzc
+tVM77UW46VOeFKY+uvv7j999af6CH4/WCld6mabu3AmOQHLmqFtvv+vsieNAIGKMG0Qg0pyDoNj/
+3lEPhAm2q22De6SjBpIBlJVXLV3w6upVL8SbGgqLjMPVroJpwxvalY84q8u0GdM7dBqVnNEFIk1B
+RHSjyZOEFzJMVl52SEbd+or8vA561nn3NEQbn3vlmfTkHsHEYEpGUPA06ACDMA2mLM1Bglw0Htn8
+09cfL/767U931zUFuY7aQPtcSgzacdVy0vmXXH/zTdmZLUCKMaM5Bfqle0NrkserPP6e/WbR65hC
+kLjWiJhI1C645WmYSiF/f/E78+85umcJi4u9B1VBoxsBQSEzBf27+KdP69ajZ9c+A6cFMzt7SDe8
+ADMtD0KhyQcfUDh++IiaitjXP63LSBnGzTAxzbSpEeHEuWisLT2wd9fmn3/e9OHHaw8WejHXYnBy
+WvLERN0iCY2hnF4jJl5/27VDevQHOdA2cWKMKUVCNFOXnHOQwj9WnPitoteacwawGGBGdcTghkFB
+DlcyCxRmzN68cfen779YXbgi4tSWNejSEl1ZRQQQzKDt5bXlXToljxzZvlen7FY5vVIyO/v8GQnB
+bIWKcePOj3nO9xvfMVn3aKSivi7suY3V9dvXrz7y7dot+Yca849Kj1tE5De87DR0bp/V1FAjAmnt
+Oo+/6oZrhg8fKkGAFPAzCRiQUhqGAYBIseYurX9KkeQ3ix6Sg0GZmkniimAzHRfMp7QHYSqtLK4V
+xNbte9ctXbR/wyfKOljViDiMfQdkQ4hpRaQMASZAAio9k3JbWi1aBIk736yKkoXZMxNdz19RW3Xg
+AI6VcsU0WPOxv0aSKTvlIj0RMBHyfA61GDv+/CnTLx9yWg9OAAGGlFoK4VPa4RDN0i9aa378cHKA
++D+hqfVbRQ9SpEwpYDDJwKEAzonFGfmgJQQIhtYQXDvwahqjPyz/YfNPn5cXb4o27UlJRKgJdY3w
+pHU05FVVwXEESDJtAh7gIygIDyoIwECkTWuW14b5Dc11YkIwHHXEsQqZ1bpXWovOU6ZfOGTY0NY5
+2UBMAhwmiAvNwUBwNG9u1yD2l2AvSIGxv94w+Fv2v+1Y97/9copgHj1WdejQoe1bvtu1bbUTKwyY
+TrSpEgDj5POZwiAiafuEbdsJPts0DQg0hsKhsHZiAaaT43HRRG1HjBg5fPjwjh07t23bhjForU9G
+tPEf2/9f0EPz5pN2CdAETjwadg4cOFRcWuw48YaGuobGulCo0XFijINISSdq+xLSUlulpmUF/EnE
+Wfv2eb379kryNx8UhuaZU2vNOf+vv1vgt4D+v2hEkQvGQCBwxgQBGlpDm39pbNdE9KsQndZG81iW
+0m2eJBVpxhhHc7oifvmzX9H/V438f9Xx3xx6t1m19/gmowZ+ETthGgDRXxqmfm0r/AXr/3F9nLLW
++DXOECl2IvJkf9f+Vcf/W4Lfv+2fsd/cqP+/J+D8P6fFVTdDMCWWAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_subaru" model="fleet.vehicle.model.brand">
+      	<field name="name">Subaru</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAv+UlEQVR4nO29aXRd13UmuM90p3ff
+COBhJkGQIsVRFCXRtCRbsmJJUUwPiR0ndqd6le1SVRI78bKrHbd+5EfWSnemcpyV1bXSXl0udzkt
+yTFV5Ui2FNNqxTajgZo5iwM4AiCAB7yHN9z5TP3jkM8QRSq2RAtxh/sHePF437nnfGefvb+z9z4X
+SGsN12Q5BC93B/71yjXol02uQb9scg36ZZNr0C+bXIN+2eQa9Msm16BfNrkG/bLJNeiXTa5Bv2xy
+Dfplk2vQL5tcg37Z5Br0yybXoF82+cWG/hc6z0OXuwNvRbqIa60RQsvbmbcs6BdacX6h5Rfb4PxC
+yzXol01+8Wy9sZBaa3NBCFnuHr1F+YWEXmutlDIX16D/GUQphTGWCjAGANAgOU9tZgFopRUGW0hF
+KAYAwXlrsXnqxKmw1U5RliRJpx0utppBEHEhEEIYU5rvyeVypWLB8xyKkedY1WpfX7Wn1NtLQFsa
+kNagARAABgUSAwMApYRUHGNMTCdAAdime2ZGEUIIoZ8rg/q5MxwhBKXU6KnRUCGElJJZSikghCJg
+AAAapISgk3VaJ8/PzJyfq83VFlqtdhAEnVZgWVaeYYwoxhgRjDHRGCEgCKEkSRDWBJCUIk0iITLL
+op7rWkPjxZzfX+kdrA729fUVyiU75xr0CRB8YS4AAWgJnHNmU6UUQgjjd8j/LR+51AoUCM5bnXBy
+cnpqamqh3gjDUMlZ2/bcXLFYruaLPY6fl1ozm9HMklJmgnMukizLzJWSLAs450IIIbkQmRBCKQEA
+nSiVXAieglSWTfPlUqW/J18orN24rlAoFfyihSjWgAHAAPB6wIUQCKGfqzV7J6DPskxK6bqu+VUI
+gTFu1qJTpyYmTk8stuuE6L7+3v6hAT/vVarjju13grgdZHMLrXacTdXm5+oLC4s45VkURXGUJjwz
+SCulfKKUUhI0IYQQjDFWoLXWq2jbsahjE5tqjDKCBcYKE+AKVyq9o6MrVoyOjYyM9VT6KAUAkEoa
+oLtG5ue9X3uHDA4scY9TU1PHjh07dGR/Pl8cGlmxYmxVpbffyflZJhZbrQMneWOhfvjw4VqtcfLc
+eQ5UW34skaaO0hoAECJAMGikESilOJfStAzIgM6lVEr1JDM2Q46l847OO6ji05687bvWgGMDAFcc
+MCpWitetXbtx48aBwX500e1lWUYpfQfMzjuh9WmaGpd16tSpQ4cOxXFcLBZXbhn0c2XX7+t00PET
+80eOnDt5cm56phaAl8Vtm8obNm+Yqy/OLqaalhJlMWia1hTCACAVGJKTIgsBkVplQmWCS60zIbhU
+Yaa0FlqnSIUMsjxVRQfnGF1nZ+VysVLJ2ZYmWNiWLuRtz7Fv2nbr6OhoPp/vdtvQgZ8fLO8E9FEU
+dUFfu3btunXrPM+bWJRHj5/cv//EsYnpuflE47znVQh1CVVZVBvspXf/0ruOHT1x+Ni0pAMCfAst
+AoDUYOyLAmMNcDvJABGpFVdaaSQR4kIJIWYVU6C5VkJxLTIQCkuJlc7Dokt1ycVDJbaq6g1VnDwV
+oBLK3PHx8dWrV4+MjBQKBfj/AfSTk5P79+9fWFgYHx/funVrPp8/efLkwYMHH/x+1mx3hFJuwbdc
+FygBRgDAU1qnc2ND+Jd/advLL7984OA0cVdxVeSQIEQ0RkopLpSUUinQCLRUF1SeCwFIYpxmIkkS
+YDJRKlA6lMAlBklBYqSxdgGAM9HOpfV+HF5XdTeN9g71FLCLsyzDGF933XU333xzX1+f1vrnCv3V
+4/UaskwRG3MOjF3gbc88vac+OecWvDvvuqO6YtXxyfbuR59/4ZXp2Vrsu1mux7MpYxTblGBACGmL
+MaGVBrJ2dICkiYcJI9QrlCLuW8CVUkJJLjUjGmullBIKrNgSgBBgQgjXOJOAEKOWleDUQQq0JEjG
+CFIiJVEaMJXTQq3ksip9azLpHJ/y9qVu9fz0nStotXfMs0sTpxvnz39v6+a1N9/4bgBQVBmOD3DB
+xMFV2kJfPegRMBtLCTaDIEilSP9pzz/mHHvlptVjqzfWF8XX/9s/PvPCa/VAYjvX0+P7tsUYw0hT
+hD2XUUwwxjajAgCS3IoVw7kcFPM5yWPb0hJpB8oGa6GkVJBJwUFILbUtQGlFNChQShKllFCYKiQQ
+xphSRBEioInQUirQQiQVoAocLw19LG3msblWGDSs+mT7+jVTG0Ybq6sVKtnBF0+FLblh63V91SGt
+teGacBH0q0J+rhr0Mc8cZkmVIUDNxswLL7xQqVSuG1/tjY29tO/0d7/34oH9M4SW8pU8cQSxpIuZ
+7zuubTFKGUZKCy0VY4AJOAV/YKCCRKtcLlgMLJJZLhHNTGpAWiGtMQAARoAVgpQIQICRBqkASUBC
+g9BSEuwhraWWBGGKJccYadAaLL83Uy2EIpVKDVgSoSTE1mhLpK1zC+drZ5M10Q3jqxhGx0+fmKqf
+ve/enZVKxZA0pZQZ7L8s6C1mAYDN8Pnz5/bte3V4ZGR89fpSsfxfn3zlH//fvacnWn2V68r5XqVj
+2xa5PPUwsyyLYkQAPMti1KGUuo41Wzuxamyo4Fs8Jjnf9n0rbM0MrqzEEnEleSaVkEJorZVWSoEU
+iiqJFGANEjAQhAjCCCtQiCvAAKAk0oARMIqVJlk8D0zoNO4tWlKj+YyDlU9lBp7bjPrShs1fC9r8
+9PZNQ/2FfNRKf/jDH+7YsWN4eBgAEELG914Vvn81YzidoENAvPDCC8MjK1eMb9S08H/83489+OMJ
+i7D+kbG843Leci1azPk2ZXmb2YwxhnOek/cdrHUSd3ia9pWsDdev8h2Lk1whnxuolvYdOlsqlZQ9
+oqRWSmtAgBCmgKUCBU6COJZICqmkUEQLISVICRghirRAiBEiQGKFkFJaS0QjgsuYt2/aVBRKP3WI
+g9snknmIM2ClzCodjefmjk63xeRdm8Y2jQwfO3fypZdeStN0fHwcIZRlmW3bVwX6q+fBJSCNn3ji
+iZHRlUMr1rJ84f95dO+Dj79EZKXkDxFASbKQ90VPGROUqixmkHmOLriE4TQO5hfrZ9vNqTSe33HT
+xjVjVYLBZnal3Lth7TqLqNr06SSMZJIpoZHGFFGsKZYEBGaY20gypC0CLqY2sRziuiQHUiAASggj
+mGJCkNZKKi5y1BcLYYHrm8d6t/TnnSAW9RC4ymlGVFuiJvj5RbT6nw7BUy+eq/N07dq1CwsLhw4d
+SpIEAAznuSq08KppPdJw6MDhgYHBoeEV1Cs9+uThR3a/IHKrepwc05pp4ruejXQU1FyGK9UKiEiJ
+MNYaVGYxqFRyI0Mrh4cHVw5VAMCiLI4FQdbo8MhNWzfPzi1k6VlKLIc5hNhCkkTJgCcq5alKuVRC
+EqGAKyIV0RKk1Bq0VFJq0FKCUhgQxQQxJMKM6ua7NlZX5enU4uLqUnwiPC+0YzGdygSAgl0itt9s
+5/adj4eOZ//m9p7BwcFWq3X06NFNmzYxxuBfmq0/P9UIWp2R0b6eSv9Tzx/5m69/63xQ8npGZDrP
+hVUoV3K241BZ7vPKFUpIWi33+57jeXax6FTKhXyOOTYlgEBDGmeu58Vx2umEAHDzjdump2fCaMr1
+coVCxS9UKPVSrsIoi+N0LpJpyjsR73REK+TNThJEPMtUI0y1FELIVCquARFm2zZgVCn4a1b23P+B
+zWzqtdmktvPuVYcWvfNzTi04r9pWlLp8MZBW066ghdTf9ePGTZXFHTt2JEly4MCBarU6NDTEOTcT
+8DblrUMvpSSEGLfDOX/t5InxYadv0J/W9C/+x6uhsn/jzv4NY9izKlmWSLFAATzX9j3LsSyLUsky
+ywKbIpyocEFC6KFCwfN8QGAxqx3E7SQSVMZxGKdBsUyR3ScyXl9cbDQaGBBBGGmtta46ys3ZkOO4
+B2uFU84SzRZawWKg0wzCVEsJNlE5O/Jt4VraR2V/qDx9YF9wnmOyaojKHVscGopXmna0MM/TxaYq
+P3tOH1ok4PUmafa1H4fVdejmTetffPqFw4cmykNDFgOQHMjbRf+tQ29WnPkZBAEH5fh5YrsvvnL6
+3HS94PUALXLIAfMED8KknUQhVhmj3LUzignJdRzLzufzhYJfzOepRcK4nYnYxp5C0AmCLM5AIaS1
+UiqOQ0axkqAylaacc865zFLOOY+hhYTiKbepqyRuJ0JgkkqFOAOpBE8xoEiksyK1c7aTc5HbGJLz
+OYoSWyGEfIKPTjemmlprv+z3F3rzKLVLjVquvgiZYAydm08PnTh706pNxZ7eVitotpp9RQ+Wi+Es
+JVjmZ6PRcHOe4xeEcv5p796ZRqiL7jMvntj3cpzLFRFCDCOLAEFAtAAttda2vcgYcT2nVMhX+ysj
+g4ODQ/2lUgFnoeN4SRyLNIujqNVqK5CU0pSjKFILjaDZDsMojRKRZpxzmQhbSZLGgAmRwGJOBSYS
+QSvuIADFpWU5kUDNGEtmZwAW7qyzOr/23s00n5ZKpf7ywDefeO6Z8xmkDYqwEHMJuBHyFC0RJKKo
+o1P88tEzv3n3TZXq4NSxiXq9PlDMvX3c3yL0RrokFwAWFxfdfBFRp9FJT5yedYv9TqkvixYsUgjB
+sgjDNgOLMYoZxZQgAhrEPIDOhDg/H88uzJ4+1+ofWOitlFYP5ov5UhynMhOZEAio5+Yk6MMvnwrC
+tNlKgkRm0hKQkwpxqcHqI5gBVWEiJWaColhkcZqsvm54vhmdnotiyIeYKsbBppAmoMWL0zX6TzPv
+2khyrr/7hcaPjjotmndRkkiisQusCJQBUVIFkGWQy5+cacw3g75iBSHUajYBVsCyMJw38iqtdRRF
++XKvbXvBQmem1kpEpRFEFWTnHUcSyQkCjQSXiRKWxI7FGCMuGWGMMgpSZTwNgyRJpuTMXJMqPjLA
+tMzSKCbMctx8mPKz0zNnzmspLK5sRSlmFtVMCKW1zKCjtUoxSi0NVGUyy2QHbPmJW4afeuXUzFzc
+gaKiORABEyFDQYwoXbnlmVM/3jCUtBh/9HnZdlf6VusjG4ZeOjo5HYgMW2nSBpkQFzGfJdLvxLX5
++uLIytGc63U6HQVAFIK3HcV5K9B343kmCm8+REpahGpNlAKFkSJaYt1JOKOJZTNEGKEUMFZYJzLN
+JMo4IUQyizJqI2JpxBPBIy6Onq4xN99fcrhKk5iDQBOT9UNHzoE9rghIhBUQpUkmdMalkEQTO4qy
+VGKFMcgsChaUDAcHezavKj/7cjtqzcaEgW+B5jwJKIp0jGNMcGl1q3NWCdFOqLbSbcP+ztuuOz91
+8tT0Ai4R1/WltjOpJAfIEkm45AlD2rFJmsYakMb07Rv7t6j13Zy9SSUzxrTM0jhBCimlkrST96mQ
+IkPaQkRx4FqCkJIgC2uCEcYYqEwV14kkgAghFCOEMIB1arJF6CS5fsAiOkrD+Vr7+KlmmHmCSqVA
+ykwKrZRGGgMAIpjHKo2FkCBBaxmhpDlQobesGYilLBWdjaOFo/XOfDtSxAaVCcqGe0vTM0e1b51a
+KLjAczirOo2PvOt9YftcyYeBXm8hacXNjiYMrDy4BYgjl+KiZysRac5p3lFAMYZlgH7pHBitxxgz
+xkAKkKqnXOmtlCHuJCJAaerlengKEiutMCIYEyIJIKQ1UqFqEIwppRKIVFkqAGtACDlWYXJmvlKE
+0UFfIzW7sDg928wXx1sqRRo00hpLKYUWJqqglV70PJtZtkLataC/1HvjhpFffv/tcy//6N5tK++7
+bdvzB07/+OUTtUQtZFoSO0nOjazPaZ4kkrmM3rWFvffm624YtPY99exdN6y+4/btR8+1Jk5ONjrx
+fNIOQdVtz7NIwXNUlogsKlpFDaDQVQgD/MzQE0KklFprSqmp79Ba+74vFtOsJGhBrhyyX5lsdZoE
+PKchZ4poCCnIIUYQypIYE2RZVCFFgBAAlEmEhQnWYwCEUCPGLnXq89HKHM4COH5aCjwmY7vthXaq
+LK7BdppIsxxT9bkVtnvrpkK5UimVSgDgWGhksMcCOf3cU1FcdSs85rWNq/yR3Eqw07mkk5B8ekZF
+ceY4hVyu6Ni4t+zQcP6VH++Vdj+JssFKe+Vm693rBgT2zk2lL7505vmJ+eu3jaO+3jOzk1GKNxfH
+SSapFQIU3mno4WIcoysIoVKpdPTssVyY6+vpufXGDY/tOeEXKwJUPSAZDmxME54R0BaBnGNrqTnn
+DtYCIQIIYW2gBwCMUEadOGzUmrydqplWMBc2tWsrzFHbEipL0zDrBMguNuaSvvLI8cWZ1sFFy2kh
+hJRIXRuv7O/ZtG7VujU35M/HJyYPHq/NzM2hTpMgAimDycVpS6p2kGRpi7FZ36WDvf7m9cNrN93b
+nJyQ0tq952StHSpCwwykLC42WNnRN224ruw79XbLsmixXKKMaMDLY+uXhi8Mv6xUKhklQRI6izPv
+u2X91rE9z52cFfk+TXuwThSlihGqlEQguGRSE8DAL2R/MGiEEEEIQCGEOBAQJOw0deZryTOdcZ3G
+SZqDgQxhlLdoksmwRVK9EOLA8aeavtY6jUMlMRWJfvH02oPJHbcVPjQat9L0uWNT+49phIYlj62c
+pXAemMK4LKgiGjWj7Oyx+rlGPNMmN495h/ZPv3SsHqkcsh2uwSYszvD2tb23bV2bNevT586M9q/u
+6fUBgQD09iMJb8tkddXftu2R1SumZ87zOGZJ67Of+EBeL+ogAOWkWjWTaD4MFjPeFLKRpM0oS5HV
+0tBW0FbQ0rijoaWho3FboaidiRQ69TQJQSSOFvksczn3all9MonOJbIto/6e+OMf3pzKWgvrunbr
+ygloQRWGcWVFyEpHpha//9yBhc7JZhJNL+LE6oECGr2+ODKcyyGENXUt16UWw8i3LJ+xsN4+duAY
+wfLM2VNSUStXsf28n7fS7Hx/X/axe961ssc5N3FUpsn46jFsgdKAwHrbyP/s0HfLgwzVwRib3M3Q
+UD+x2OS5KRG2bhjv+ey/+ZUcjSBsYkBKCBHHQRy00iQQqs3FfLOzIPi85DWRLYi0JviC4DWRzsss
+tEhd6ibJidzQTGyfD8hi4oYq36bQoT21qDA50xocZLdsLXmk1VloWOg8hWmbzFtozqKNgSpUKjps
+nZmqL5w5GwaNYsXrY9nUvbeWfu09KwZ1p4CFpxIPYh8leSZ78m7RZiKITr42iTLbZ3kPkKsT0Txb
+oQs77xy/c8fmhZnJ+mxt/fqN42tWAQKuFFwFgvNWAwlLS0FNYVPOghu33PiPP/iRY+Usnn387hsX
+WvG3frCv2aTIZsR1BAbJeYKJAhxGoVYWQsiUS3bNDgDUqMiaDb/oJ72jU8cX5jKBSduSmUBpIikS
+pEDcLWtW184c6yW8GDV94oLGmNo6zmSS+LbtEDcO+HwjJzKbpXWP8aGe3HvG+9uzoR3M03wPKMwI
+UEa1yoQQBDmEoP0HFoQsWMqlgBfnZ33U/vA9d3z03juCoHHw4EHXzW3ZdjNQknFJGdGwTPH67q7K
+oI8x1lpbSPaWezduuuXUxOGVo6Vo7ugn79mcthqPv7DYjENNtOW5GUgttWI2tpiSCkABQhoQYA2A
+AGkAIJpi5gWhnDgzVVuY9x2pdM3OFixckKpTLXm3rOnbMFo98dorO67rG+zlEyc6aSZB2gisRAim
+JaMEa/LS/kns2SW33eOVfvnmG/PKPrtwtjroEJFJpGOepRFXQEBiAow6uYA4SmGhAuCq4vHtN914
+3123M632Hz6kAK9df6NfKEkAQhEGpUHB297OvpU6HBMuhiVFfQAAsiVVUVM48Orx6VN7h4Z6FyNq
+Fccf2pP86LnnTjfmUCmfKgFCMWoRhZmQAICRoZUIIW32VDizbQslteNrB5hEavD6G4o+67dCgiuV
+HtRTUn0eyRY7tdm56li1UM0dmwinZuebnUwCyzIVRymSiiBMwasMq/E1VZu7Y6Xh2elTwga30j/s
+9hHHagTBXL0eRtn0VG3i2NnFeqtZIVRZKkpzhN9z55aPfeQerGHfKwfqjdoNW2+6efuNGkAqoFhp
+xSkmbz/VcdVKoLrTkKbpsWPHjhw54jhOPp+ntjjfpg9+/8juF6ZoacwrFOJ40bYElQlSGoTEGlxE
+GSZYaZCqzqhvYyICSwRr+vPb1q/oyztZ2Moc7hB3/fjaTms2CGYSHlPqh6HWSjHGQOMkScMwjqM0
+SbIs45mdzzm2bZHxlUOFvJvF7Z5yqVTw65y3Wp0oTBEiPIPpqbmJiZOzMzXLzgdBe8VI9dc/+qH3
+3rZ9dvbM/n0vxWH7Q7/68XK57DgOXO0C2KtcfWa4ZhiGp06dqtfrc3NzFkZWsVrn1nOHJ59+5fjk
+TNNifj5f4FJjjCkGorWWAiuJQBFAmhZBZSAzqjILcwtJEIngKaCFsaFVY6MrNl6/slwm8wvT9UZ0
+4ODx+YYihCqlslQIoRAiGBGttWahEBkBPdjfO7ZicNuNm4cHq4cO7t/945fqC4txnOZyvmN7WSak
+1IwxLqPbb7v17vffObZi+NzpY/tefalUzN1x+23VoVGTB196ROCqyFWGPk1T27YBQAgxMzMzMTER
+zXeoy0IedgRvxejYxPyR1+abrSyxShokmGwIKIqAEIKwtjJiDJplWUKLNE0BwLZtlC1YyGrV6mvX
+DG67abxvoHj8xNm9z+/PSO9FxwOgMSEEIQIAVM2C0pSB4kk+53zgvrt7e3u++d++0WxahBDLZkqp
+IGhzzsvlcn9//69+7H1r167RUh7Y92pjYX7F6PCNN2wZHhnpchl9oc75qtV/X7XcrNH3bsqQUjo6
+Our7/unjZyZOHJYiKrqMgSquqa4dHDx28vyRyXoUxkJpQikQC2EsQWVcEr1oWxYgxIXmSmJGCCFA
+tE3LSCC/Qs6er3ll3Dey/ez0jETEtiVCFxiX1lopLaWUUmLQjBJGaTsIg2DhxKlzYZx2Ik6xQzCK
+g04QtgsF77Zbb7nzzveuX7++2Tn32pFXTp88Vcznb7v9XRuuX88YU0JjipaCDlfviPrVt/VwkW6a
+tZkBtOoL+198eerkOdvxEq0aQYBsO87I1PT56Zl6q5NEsQbiMcvTQEA2LcsiCLhItdaUEq11liUS
+bAvZJT8ftM+PjObvuHPHd/7+8ShGOhNaa4QvRFK7uTOZSsowIUiITPCsUinZDpucnOQBt23W21fZ
+sGHd7e/Zse76NXHcmZw6e+LYESX16Ojou99922D/EACkKbdtZsbSzcqZssurYnauGvTddrpdNHYg
+BkGBIg6zkwtHjhyZWTgfyySWkYjTxVbIBRKCNttpu51FiQzC2HYKWiqlBEaSII1AghSgNfewTKSI
+EobTvqo3vmblgYNHhbSdjFyMYGulhZRSKYEQ4sCVUlmWCS0AlNLS87xyubhh9er1G9Zt2bK5WMrV
+6/Nnzp6cm5uJ43DT+m3r1q1buXIlQkgIRSk141lqVpRSQghCyL8s6GFJIe7S0rhMaYYRaNBSY4Lm
+avMHDh6cna+12vVWs6M1YtSJYp6mXEoVxmltJknSOE1TKaXWEgAwBoxxSmIHezLVng1StDGGINSU
+lghkSikApbXiIk3TWClFCALIHNfN5XKlcmFoZGR89arVa9asXLkSSdFoNCYnJyenzkZRUK32bty0
+YfXq1f2VYQOzNj8QAlBSSYovRGuM+l8yurcjVw36pQcBuqF8rTVWGLQEmgISAABgg7KTGA4d3X/6
+9On5+bk0i6MoQKAIwVmWebSQCt5qB/XFxVYYZUJxqTIuALBKEZNUy1RkHWpbSjkI5TOYMQaHUswY
+cVw7n8/5vn/dyMqh0ZHx8fFCKW8qcM5OTp44caI2PY8Qsm17cHBw85aN69evpxQDAEgACQoBpgAI
+TO0+gDIHfS4x91dFlvP1FEmSLCwszM3Nzc3N1Wq1+fn5IAgYdc3MmXWNEBJCCCGkVt2zrEopo4AI
+IceyGWOO43ie5/t+LpdzHIdSajskTdNWqzU/P99oNLIssyzLdd01a9ZUq9XR0dGenp6rWLH9FmTZ
+oL9kwGEYNpvNIAiOHzvV6XTq9Xqr1UqSpAsxphdSNCYfyRgzBwYteqESTyklpTTzpJRKs9D3/XK5
+XKlUenp6qtVqtVotFouMsaWn1Lp12+/YcdmuLKfWG7y6p4QvcAlEtAYhlNHZWq02NzfXarXOnDub
+JEkYhkIIADCBI621zSzzq+u6lUplYGCgWq0WCoWR0QGzGi57HPCCMXzH4V4qy/w+nCtBYA5kYvy6
+/9Ea4jjJskwvEbOHsCzLsqzuzVqDEBxj/EaXeFkusCyybNAb5TUq37XgJuVrbjD90vrC9Fxwhhc/
+vxJo3dGgn2IX2rVm/7psfVe6WRcjVwJCS4UuWQJmA6GveMSy23K3TXMqyjiJ7mTjSxbXOyXLBr2x
+8pegvJSVLkUNIaSl6t7wum/hC5jC67f4V0Lzsqdhl4XkLCfDWXrxz696DXDxJB+hS0JPV7Q8r1tJ
+3ek0UaZ/CeYeXwJ9lzIDgIkawkWbKKUEMBCAyLiWCjSA0pIL0GB+xmEEGrIk7X7S/aJpJMuyrpXv
+1q/BxeJZrTVoUEKap0guzLVReVCKMmYO1mQ8AwRSyUxJDcCl0ACc824PEaA0jBAgpM2Z3sxE90xP
+jM3pPt18y3RYS3Wh5xpExs1/Lh3C0osLmCz5BAwsGkADT7OffP5G6C/53WiBadG27SRJzNxEUYQx
+TpJESRkGAWVMKdVutcDooNZGE13PE5xbtp2lqflESmkWuOmEZVmU0k6nYyag2Wwa8hdFkXm6FAIT
+oqTM0tQ8WnAupTmko0HKnO8rKbunKRkmSZpQQkFrxlgUhHEUAUAcBE4uZ4akpLRtO47jC2PG2GiY
+lJJzrpRK07TbYX1xLFIIyhhcfJUJ5zzLMqVUp9N5o8n6CW4Yg1I8SaQQzLK6TuWN0NNLVtxSTZyd
+nd27d+/TTz9dr9fDMNRap2lKMYmiqFqtmn2mZVnr16//8Ic/vO766+MoevHFF7/2ta9prRljn//8
+57du3UroTyJNxqQKIb773e8+8sgjrut6nvflL3/Z9/0//dM/rdVqjDEMiFJqJsyMkHPuum6WJISQ
+vr6+X/vYx7Zs2UIpE0IwxjSAYztm2P/wD//w33c9Ytt2GIbV3t7f//3fHx4eZo5jnm7eCpNl2Xe+
+853HH3+8q/uWZWmtMaA0TbMsy+fzWusoivr6+rZt2/ahj3y4UCgIIf76r//6pZdewhiPjY194Qtf
+6O3tvQRKrXWWZQ986Q/a7bbWesvWrb/927/t5rwr2lKtLwS4zT6waxOnJ6d+9cMfGewfwIBKheJA
+tb/g53srPZVSuadc6SlXLMr6enorpXIxX1h33dpXX35FK/0/HvnvxXzBZlZPubL7H76vlb4QBpCy
++7ayKIq+8IUv2MzyHLe/r3rk0OHpyanVq8ZtZvX3VQf7B3wv51h2b6WnmC+UCsWCny8Vin3lSjHn
+l/z8u9+1Y8+Pfmz0QGvN5YU+Hz169LZ338oILecLvuMWvNyf/+9/opXWSishOecGGq30H/wvX0IA
+fT29/X3VSqnse7lysVQqFCulcqVUrvb2Ffx8T7lSKZVLheKXv/QHC7V5rfTOX/kAQRgBbN1yQ2Oh
+bh66FDEpZbPZXDO2Kmc7FiYf/MDOKAjNf3XH/rodSVfZl/qcNE2/8Y1vfPe73xVCjI2NFQoFKaXj
+OCZUYtu267r9/f2+79u2XalUZmdnH3roIWNPzPa9WCxaltVt2TRu7Jjruowxs/O0bds0a9t2tVrN
+5/NSyr6+vkKh4DiO67r5fN51XYyx53mFQqFcLu99fu+uXbu01pZlKaUoJkZv/u7hbx08eHDtmjW2
+bY+Pj7uuu2vXrmNHjsCSl4AZW+95XiFfKJVKSinzIIyx6QkhxJgX83mhUPj617/+zDPPGPM7MjIy
+OjJqWdaV6JMQore3d2BgoK+vr1gsup5nluNltZ7CEnbRNVidTufZp5/u7+vDGI+PjX3uc58bHx+3
+LCsIAtt10zQ1e8h9+/b9+Z//+ZkzZyil58+fV1IaLTA8xLS2tJfoYvUOxpinac51bcYoxkhri1IM
+EAXBPffc8xu/8RsIIc65uTNNU0rp5NmzDz74YLPZHBocOnjwoDk6bCwpweSlF1/ctWuX73mc855y
+pdlY9DzvxIkTf/VXf/WVr37Vy+V+QluFcCwLA4gsGxka+r3f+73+/v40TbmUCKE0TRljSZK8+uqr
+3/72t43JO3PqFCiFtM6SBGNMMc6SpDsiWEJ5lVJBcOGFYMZRvYmbpbCE1XYvpJTtdtuoQC6Xu+WW
+W6rVqlLKct00SeyL1nPz5s1mAqSUo6OjcRybKTHmxVgxwijn3BQkdzMMSinHcaIochxHCJGmKefc
+QLxmzZr77ruPUKqVQhibQ/nG3f3whz+cmJiwHMcsoAsMXWlA8NBDD02dO1cul9M4+ewXv/jEE08c
+PHyoWCw+8cQTH//N33zfXXclSeK6rhDCYhZCKMuyJEny+fx99903MDysOFcAdMmRzJtuumnv3r1H
+jx4lCM3OzgJCruua5WVc1BtxM2LbNqU0juOu5umLea7LQL+UM1FKCSGMsd7e3tdee62np+fll1/+
+zGc+k8/nBwcHC4WCm8t5njc0NKSUqlar4+Pjd999d29fn2mBEBJFkbFltm0TSo3LNdOpL8bLTDTY
+TIBhOMaqaK1feeWVxx57rNFo2LZt5t6UlZ84duzQoUOFQiFO07GxMdd1zQQQTF595ZXvf//7lmWl
+abpl0+bf/+IXy+XyH/yvX6aUNhqNv/3bv92xY4eb8y7kLKU0ftv3/SAITp8+HQSB1ppaVpIkhjhl
+WXbw4MF6ve44DhjUEEIIWZZl/FaaprnXa30X/e7mDmNsNO91FPYS6A0QsCQcWC6Xd+7cuWfPnk6n
+k8vlnn32Wd/3DTU2TbuumySJ4ziWZXmed+uttz7wwAMrVq3KkqSYzydJQhCSnGshBGjGWLdnXWat
+lDLUwpCZOI611oVC4dCBA//+3/0727ZNosq2bcZYHMcUE9/3EUK+5/3Of/gPSAMAEExA64cffHDq
+3LlqtZqm6Sf+p08Cgp0f+uD/9fX/curUqWKx+MOnnnrumWfuuvtuzQWxLMW5ebrWut1u33///aVS
+yWwIsixDCBmv0G630zj2HMdynF/ZuVNwHqep1FoohSnVS1LkbwzPCSE455Reyh4vAz1cjOctdbaf
+/vSn2+32D37wg5MnTxprCADG/gJAFEVGwbMs45w/9NBDlNKvfOUruVzOuKkoitI0RZQydEE70MXT
+P2ZVmtwFABhvafIYYRias9jmDYEGkQseVcjFxcVKbw/n/PHHH79lxw6eZZTSJ3fvfvjhhwcHB8Mw
+3L59+//8qU8BQLFY/MxnPvPAAw9QSlut1je+8Y3t27f7xaLMMmJdCDJTSpMkiaKoVquZRek4TpZl
+cDEE7bpuHMf//t/+21tuuYW+/ni4WcddZJemas0ZG8dxkiQRQliUwBWiGrSrj92NmZl/i9Av/Mf/
++OlPf3pqakopNTEx4TjO3Nzc4uJiEATT09PNZrPRaMzMzMRxXC6X9+zZE8cxIcS8Mc+yLFOQAxd3
+VcbCOo5j/LDZWxl7AgDGLyGE3vOe99x7773mK2Z1G1fRWKg/+eSTs7U5IcQjjzzysY9/fNPmzVKI
+v/zLv0QIRVHEGLv11lvPnT4dx3E+n9+yZcvw8PD8/LzjOHv27Nm9e/dHP/pRwpiJRiil4jhO07RS
+qbTb7S5kCCHf99M0jeOYc+44zsMPP/y+973vXTt2GHU2uoxe/+LX7rWx6V0kLduGJXWSl4d+6dRx
+zsMw/N/+01dqtRohZNu2bZ++//7NW7cCgOIcMwaq+1Jc/Tf/+T//8R//sWVZYRjWajUpped5ZuUa
+DQKlCSYAABpsZoGGNE4woCRJPM/TWpsRGkojpezv7//M/fcDQt3Y5IXHaYjj+G++9n8Wi0XO+eTk
+5KbNm7/5zW8eOnSIMWbbdhRFDz/88K5du8IwlFLm8/l2u50kSU9Pz9TU1De/+c2bbrppbPVquBit
+RAgNDQ199rOfHR4eJoSknBtq4Pv+/Pz83r17H3vssZTzxrlzTz/99NatW03tnxAiSRJCCAIEGrRS
+BmizLBihYRianRqlFLSWr6/KvozBeaM8//zzTz/9dJqma9eurVQq4+Pjplu2bXPOkyQxxmdqaspU
+nBUKBZNNVRfl7//+7xcWFso9PZ7nOY6jlEqSpNVqTUxM7N69u1wux3Hs+74x9wghxphRxvNTU92s
+KWPM2M2Z6fPtdtvzPDOp+Xy+Ua/v2rXLrFfDWA4dOlQul03Hpqene3t7jdsslUp79ux59NFHP//F
+L8LFtS+lpJTefvvta9evN2q0NAmwffv2/fv3HzlyxLbto0ePaq3Nca1KpTI3N/dHf/RHd911l+H+
+lmVxztvtdq1WO336dJIklmWZxtM0tV3HaPMb32jxE1dgxm/WXS6X27Bhw759+4aGhjqdzgMPPHCh
+ktuyurzQvLNVKVUsFtM0zeVyK1asMLzY/Lpr165HH320C67W2lgYrXUQBGYM69evz+fznPM4jo19
+371798TERBRF+XzepANNpzutdpqmhUIhDMNCobBhw4Ynnnji+eefz7mu67qWZW3dulUIYZxQl9IJ
+IQ4ePFipVNI0/bu/+7tPfvKTfQMDJpgBACZwdGE1WxegCcMwl8sNDA0CRlwKmYhms+m4bqVSqdfr
+vu8TQh588MFvf+tbxld12ZoQotVq9fb2Li4uxnG8cuXKLgun9DIqTrsB1aWfWpb1oQ996LHHHpuc
+nKxUKvPz80II3/cNrzK0z2ifWVmNRuNLX/oSte1qtbp9+/YnnnjCmHvHcUywyXTO7DWUUr7v12q1
+gYGBe++9t1gsNhoNADAL2XGc1157LcuyXC5nTJCB3rHsNE3jNLEs65577omi6JFHHgmCQAlBCPmL
+v/iLnTt3Gg9BKM3SlFKKGVuYm/ud3/mdp556Kp/PHz58+Fvf+tbv/u7vGg0wOwkpJWiNL4bJKKW5
+XM5MQBzHSimjSQDw/ve//9lnn3355Zcv7F04z7Isy7Ju5YTxro1GI03TTZs23XXXXWZ2FxYWVqxY
+cRnozT9LS2iMYbrzl37pT/7kT77zne+cPHnSQKC1DsPQaJDjOIYSMMZ6enruu++++++/H5TqqVb/
+7M/+DCH0/PPPJ0nS3fcCgLk2rDFN0xUrVnziE5/4/Oc/jxBqNpu+7xvF11r7vm8Ipeu6hBATflFC
+9vX1EUa3b9/+uc997nvf+96TTz45ODiohHjve9+7c+dOzBhmTAsBGFuuC1JqIXr7+z/1qU8dPnxY
+ax3H8be//e1f//Vft23b87xcLpfL5WzbVkJgjIFeUF4T1zQ7m1wuhwEVi0UAeO8dd/zhH/7hV7/6
+1ddee01KyQgxu99ujM9Q51KptGnTpt/6rd+6/T3vCTqd51984fDhwxs2bHj/+99/CfRvlipRSkVR
+1G63zcLvBsIIIWYfRCk1oRXf941nN/O/uLg4OTnZaDQu616MjI6OjoyMGBbUbDbPnTtnSj/enAtX
+q9UVK1ZkWTYxMVGv10359cjIyPDw8JW8WRAEs7Oz7XbbeNE1a9YEQdBqtTjn+XzeBFuWHpLpfqtW
+qzUaDXM+sr+/33VdpVSj0VhYWOh0OleKEFQqlVKp1NfXBwDtdnvPnj2HDh3auHHjBz/4wZ8BeiNG
+E7sWbSlFvRCBe33Rmbk2lPxN3pZkdmTdXznnxi5dCfpLPjf3mzXRfUqXxRq/1Q1dGBJighndSIm5
+ufuq667hXTrAboPdAf6zmXR5MZdg7j958uTp06dHR0evv/76S0d0JeivpLCX9GZpCZH+2avjur79
+n72zW8lsHLXh10sJNbzebJoJeGMK8HWHkJZId8F1Pd/bTB92dSIIAt/333jDFaE3oHSffVmluOz9
+SymTlNLQgMvev1QNDXb6Z6+f1pero0IXD9ctHZ0hWob/wBIVNjHtNyq46Vu3Y91Fqd/0eInZJBo3
+YAJiV1Lit5IW10syXl2sL6t9P32DS8d82XvQxeRtNwp02QeZMIbB/afU2TeHcmmvljb4Jv3sXhsl
+MF16Y/s/FfRLbdzSAOkb71waC+oqzpW62PUcXV4BP0sRhwlImI3YG5eLXhLR7fZ/qcnqqv9SMV6h
+2ytDdS7B3bjrN3Fjl61zuQwCb85wuv14ExC7huiSR775pGqtTUjnkg/frK8IwUXgLnnf5NLuma1D
+19CZObvEWi6lUl3H+0aVWtq+ev0fkXlzrV8KxZVU6s2gXzrbXc16kynVS3IC6qd492/XEZko5pub
+iJ/egCwVo7nd8oUrzcElLV+ydn+m5y79AyFdV3HZpbz8hX//auXa3yBcNrkG/bLJNeiXTa5Bv2xy
+Dfplk/8PBzsp+mRgD/QAAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_tesla motors" model="fleet.vehicle.model.brand">
+      	<field name="name">Tesla Motors</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAt+ElEQVR4nO19eZgdV3XnuUttr97a
+b+l9b7Vamy1b3g3YyMZgWwTMYjYnmQQmQ+bLfEkGYpKByQBDSCAkhCFhIIkdSCAzSYCYADYW3jdJ
+tmzJ8tLaF6u316+Xt9Z2lzN/VHdb3pjJfNNqm/Hv609fv1a9qlu/OnXuOeeecy5BRHgdawG61gP4
+/xevU79meJ36NcPr1K8ZXqd+zfA69WuG16lfM/A1u7JGIGT5Vw0AQAkBolEzsiwQZ7gcigAsSwoB
+DajiX4VUjDFKKQAgIiISQgghEdL464QAAyAEyAtPGV+UEgoACEgQEDE+z9kBWTOXauWyBBBRAxJC
+AGCJIkREBI2EEEIpACgCCEABCRBApZRCRM4IoebLnj5+MsuPaumpACrCDFz6hJTS+HLx8175IwBo
+rbXWAMD5aknnmlGvhCSEUEqBEjjjQUjUfFnqV14KAJCUSKlAacoAAOJhU0qVxPg8lC6JbHxDWiMh
+hJL4iWoAANQAoIDCsrDHQEAChAAopbTWK+/QamNNpZ4s0RRzrJb5AgBEVEppIZVS8UFeFIZhKISI
+BywVaq0JIVEUOY6TSCRM06SUcs4tyzINuiKrqKXWmqImlAKlSJ6XYqmklNIwDEaZkjIW8Pi0hCwx
+Q5a14v9zrJ2uX74jBFgWSyCECCWjKPI8L/B8IQSl1DZM0zRt25BSBkEQRlII6YVBGEmttRQh55wx
+BgCIyDlPJBKO4+QSjmVZrus6tsk4B9BLSowAAsYH+74/Pz9fr9ejKOrp6i6VSivnidmPH8MqEbBm
+1CsJhC3NfhogjJTn+1EUlecqiKi15oTatu26qWw2a5mMAnDT5tz0g9CLhGIGUCG0SiRTSikppVIK
+AaXQQa1J6q2pKHAcJ51OZ9Ip13UTiYRrG/HzjvU7IYQxppSam5urVCoJ20kmk6lUCgBWFM6qap41
+UzjxVbUGPxKe5zWaTc/zoihCvqS2TW5YlpVKuK7rWiaTUdjyw5YXBEL4gWwGYRgJrTVqBQAr6h4A
+4sdAEbTWSkYAYBk8k8kUCoVsOplxrZUxaNRhGDabTc/zErZTKBQopbHII6IQgjEWvwergbVTOAC+
+L2q12mK95nkeApimmUgkNHteGrTWsURzzmJyGWNUKaCEEKoJ1QRQi5WJUUoZE2cYhlTADeCWpbVW
+Us5XG7VGkzE23FNIp9OpVIoAoYQ6tuPYjtKKU7ZyUcZYbOqsHu9wFqiPVTmgAJCgELgZAa/7or64
+4Pt+o9EwDMNJpWLrQhNiaqmQSKCEUUTQSnCMmNJALKpDFNKivCk8k4IEGUjJOeecCyGEEIZhUEpj
+u9BmTGtNKVWESEIsywJGPc976sjxXC7X2d5RyuctgxIEAKDAQAJQAAIEAUATCoxSBElWjaJVVzga
+AVCDDCnRYJgIbGaxMTu/qKIQAGKyYomOZdxErQlVhBDKLZOnEom2VMIwiO8rSulitd7w/ZYfRlI1
+vRYzLCllFEWWZXHOpZScc6VUFEVEacaYYRiREGEYcsu0bRsRGVFShFrrbDrT1d5eyOc4AaWQAYkN
+TgQkhCBojZoSSlbN4V91qdcaOaNgWgA6DMXsQmVqdp4almVYiGiYVhRFSknGmNbaNE0lfMaYQhIE
+AaLl2joUESJjjIeRlLjk5vhCKCQoJQDEmkFr7fs+Y4wQ4jiOCiMAkEoBALdMSmkURZEUCZMRykHJ
+er0e+UGz0Whra2vLJFEvOdcrPt1qM3OWplmllNTq5HMTtXrTTiWz2azBLc/zYpVqWVYURdVqlRBi
+MWIlEpRZUqtkMpl2LQ5oUBJ4ot5scNMCyppBWG+0FGAYCa2kUqrVasUWPaW0Vqtxzg3K4hcCGE0k
+EpZlcdPgnIe+ZxgGp1SJqLZYZQTT6fTI0LBlPO+3nmFO6tULc50N6iOhGp7vB+HhY0czuWwqlTp9
++nQYqBWyqtUqIvb29mYymbnK9GK1HoSKW2YqldKRz0EPDfZnU1mF0PRaR46d8IKw1vKA0DAMKYFC
+oaC1TiaTjUYDER3HUUoxIIwxBYiIURTNLy4EQeC6LqXU932TGz1dHSY3UMkoivp7e9vaMo5jMQIU
+QGtgMeEaY2d7NXA2LBxKaSTkgYOHj504ceWb3hSG4dMHDvzzv9zuuq7v+67rRlHU3d190003pTJp
+blhP7H9y7xP7IyETiYSK/MG+7g+9732dpaIGuOe+vX91y99k2vKEM88PvDC4Zvv2QqGQSCQQcefO
+nYj4zne+k3OuIoHLrFXrtb179z578CAhhDEupezr6b7qzdsH+/opJwuzFdO0FSjXdTPJpGksfw0B
+EQm8ZqlHpQmhzSC86577Z8rlN77xCouZ69evv+46qNfr3//+98fGxt761rcmk8lSqaSUMiybGVbC
+TbrcyKaS9VrVMG0nkVAIADA5OfnswfELLry4mM9bdugqDQDpdFoppZQ6efIkISSVSlWrVWpwKSUA
+JJJuPp/P5fPFYtF1XalAirC9s6u9ozOVzczPVsbHx48cOXLp5RclHEeV2ottOZMCIhBYnnlXB6tO
+PaGIGpTCY8dPNrwWUCKU2LBhw9bzLy2Xy7t3PXrOlq0f+ZUPnZ5ciKJISYyiiFKqNbTqdUKIVkpK
+6Xk+AACBdDZbLBYdx2l5Xr3lCSEefPDB4eHhRCKRSqVc11VKlUolwzBinyiIQqVUuVweHx8fHx/P
+5/MIrFqtVirzg339uWw2mUwi0Pn5xYWFhaZpJmyn2JYDAK2RrmL8BuBsLJVoppUErXp6O6MomJqc
+dhOZRj2oVRe8VqPZqFUX5/0Aw8CTImQUBFgIjFKaz+aKuSylDIEjd2SgGMClF1707hveZdu2aZqZ
+XLrpe3fdfU8kZCabQyBBGB05euyuu+/Z8+hjD+3a+9N7Hjw9MesksvVGuGf3E5s2br3hnTe+7507
+rrz0wsNP7z954ng2m6m1Wq0wtFOpQPBGPQSlOSrQkhJF2OrSczZ0fextOo4DAI1GIzbhCcEw9Lu7
+O9vbi0HgAWjDYISgQXW9tnj6uZOglG3brWbd2bQJUNk2iwTMz8+Xy+VTp06FSgGj8wvV0dFRpZTv
++4SQtra2vXv3fu1rX4uiSAi1bt269mIelXAda8umDW+8/NIrr7zSoKpYLJbL5WQyWavVliKXjCml
+LMaW/IylaN7qYvWpR2SccM7jyFS5XI4jJJEIiqX8+z9wY6FQaHmNSASmaXp+4NqZN112yYZ1w4ho
+mwYAtBfz6wb7IgmhENm23KWXXjq0bjTSmnAWhiKXThWLxTAMHce56qqrNm7cqJSyLEtHkWma3e1F
+Ffqdxfxbr3rzUF9PY3Feqiifz1933XW5fFEpVa/Xfd9PpVJCCNdKmKZJCFlavnnNB40RAQhjLJ1O
+c85nZmZin9MPGq7rnnPOFgDwfY8QIAQ4Z16j2tvdtW54iIK2bTuXTVECGoEAcGK0d3a+MV8II+mF
+YSSElBpA+74fS31XV9fIyEgYhlrrtGPFjkKzUXNse+OG9aZpzs/NOm7CcZyRkRGgHAB835dS2rYd
+hiHPpk1zec2LEMDVVfZnKXxmGEYymbQsq1KpNJtN17asRK7VasX/yxhLpzNx2MvK27FlYpucc641
+UAZaA6FQbzXrtabU6AdRq+W1Ah+QChXFGiM+VaxATNPUUZBKpSzLajQaSinDMOK3IV5doZQqqbXW
+9XpdKWWaZhwCMgwDAACfXzdePZwl6i3LchwnlUrV6/VKpZIdGixXZnK5XFtbW7zwhIhzc3OtVqsy
+V52fm52ZmWk0GvOV2bm5ORH6QRC0At8L/MCPDMNSCpVGpZRhWAKl67phGFqWlUwmKaWpVKqnpyeb
+TGaz2e7u7kwmk06nM5kkIaTgOH7QklISQiKpwzCsVquxOUQIsW3bMAytNVleKF5VrD71hACAZZm2
+bafT6fnZSrlcXjc0mM0WAMjJkxPHjh07fPjwoUOHDh06VKlUZubmCCFhGHJCOOduws7lcoSQVNpJ
+JpOZtGHbiTAUBKiUknOzEbbiuFutVqvX681ms9FomKbp+2E8ZyYSiVwuNzw8PDAwsH79+o3rhzjn
+yWSSc16tVqMoam9vp5Sapum6rmWZhCCclSWMs0S9aYBhGIlEYlapOGygJPzDP/zPf/zHf5yamhJC
++J6XyWb7+vpGt5zX3dne29s7MjLS2VFKJpOFXI4xZjvUdV2lMPDC6elyGERhGFLK04Ws53mc81ar
+FQcS6vV6tVo9dXq6Xq8fO3asXC5PT0+fOHWfaLXsdLotZW7fvv29731v/+Cw53n1er29vT3WOZZl
+cQZnh3c4K9QDACDAwEBPOptmtnlyYqYRAE84HQMDtcjPFHM3vPMdmzas37RhLJPJZLPZWq0GADIS
+SgsV+fX5oFKphIosLi76vj84OLh58+aJiYlcW3pqauqhH+9lpqG1thOW4ziJpGMlkz3FwqYNmy3L
+Mk3T87yFhYWFhYUDBw7s2rXr5IlDyWQyn88LIebm5gqFQqxbMoYqpO145RAIB1h1bX+WLBwC4Lpu
+Lps2udFsNicmntu4afSibefe+pdfL5VKlmWdPn368PFTx44dO/DswTAM5+bmFucqpmnOz80JESWT
+ySgSACCE6Orquvnmm6+99toDBw58+at/8ciefalUihASyRAAALSbSlqWZREWBye6u7t7e3v7+vqu
+vf66G979rolTR0ulUiaTmS5XPM9LJBLJZDK2Tc9MuVltyxLOitRrAEYBskm3u6MzlUr5fuvU6eeG
++vIZx0z39zz0yK6//Otbxw8est1krd4khuU3GoBAGHVdN51KFzOZiYkJg3FKKVLy7MGj3/3nH0pk
+u3btuu/BXclkWinleU0A6Orp9DyvXq3VqvOm6WitY3+CMeb7fm9v72WXXfbrH/7lMAw9z6tWq5Zl
+pTPZ2OZJp8+wLH9OqKdxThk4ptXd3lFsy1cq83MLCyYFrQKkvNCWb2trq9UbdU+k0mkl/LH1w1u2
+bDnvnC1DQ0PnbNmSSDhf+tKXvvn33yNaZ3N5Tdh9Dz588MixSqXiprOcE6UkIm674LyPfOQjjmO1
+6o1KpfLUwWefeeaZ8fHxlt/knNcXF7p7u8Y2ro/daSlls9l0HMd13WazGZsAsWW5YliutpFzFoxL
+DQAUqMWgPZ8vFQu1ZqPerJ0+daKrp08LsXnzxk9/+tPnbrvwRz++46nHHj9n8+BnP3XzhRdeYBgG
+askYy6UTl2wZ+bZlNhoNI/BNx/Y8r7IwH0qRyWRARoioUHZ0dKwfGWaUhmE4PDT45muuPnz48K23
+3nrPzp2dvb3vete7rrjiim3bti1MTTqO02q1fN/P5XKxvZ9Op5PJ5JmL4HEezqrysvoLhIAUALVm
+lOZzuVK+MF2phCI6fmpyZP2meqs1NzfX3dv3b3/lly+58ILdu3d3pfmF529RQas2V89mMtwyKEn0
+93SWSsVGox6GgWmalmWapmkYPAh8TrXWyrKs3t5uRml9cVFKaVvWYqWybnDwfe9+d19X1+Dg4Pbt
+213XnTh50iAQaxtKaVtbm9JLSR+u6zIW50adBXcK4KxQDxQ0QUoQsslEsdBWKBRqzUbdiybLlUwm
+w1hUKc9wzjeNDp23eaxRr4aS+IGQYDQCAYaNwAeGR/O5zOHQt1IuZ0QpHXhNSikgCqWEEJlUev3I
+ujiLxuBcCWlw1qrWR/oHz924OZFINJvN8sSUwbnrOp7nxXGbRCIxN7/AGMtms47jkNVdlXoxVj1o
+TABwedYyGOQy2UIhn2nLeZF4bqoMlCWTaRkJJaOw1WguzoOZnKk2I2qBnSJ2SjLbRyh2dY+NrjMM
+zghEgQ9aGYwu/dgWYyyTTXV0dIRhoKS0DJOi1koBIgHwWq3ZcrnZaBicW6YZ5/shYjab5Zz7vm+a
+ZqFQMIwXSGE84DjZeJWw6tQzMLTUlBMgGgn09/e2uak2J51Op+fnK6EQSEARtOxEhFoxqoXnOgbF
+kOmQqcgCRSNlAoyNDLtOUiqC3JbEQGYiAa0iEpGgGQz19nd2FOv1quPakZDILCCEcQ6EREIggGGa
+jHMEkFFYLpcdN9Xd0yulkqFXzDjtKcOkwAAMAnHed5xTtaqJf2cjm1nj8+9wwjbb2tpi00JrPT09
+TSmNgzBx/OSVTtLT3Z1MJVYOWMqXpzTOBOnq6oqTeXAZAKC1jiNlcXKOUgoAWo1mrGE45/V6TQiR
+SrjxWsJZxqpTrxFWLAcCYFtGe6kQR2YSicT09LTv+7ZtxxytsLZ0/PJ8hwhj69aV8m1aCbKsDVbK
+EAzDGB0djT++6OHFCWiEEKVUnEBZmSsnE05nZyejtFqtckry+baEY682Dy/F6ut6AvF8CAAA2qDQ
+ls0kbdN13c7OTq317OwsIhqGEad0n/HFpXzgmOj+vq7ezk7Ukmi9VPgBFAgTQiSTycHBQSEEnFHT
+E5+Ec04IEUIQQkzT9H2/1Wp1dna2F/PNZiMIgra2tkKhsCYVZasv9SvxKNSoNQFIu3Zb2lVKFQqF
+bDZbLpc9z4vXiV6kW8+0rDMJY3ioz2RUo6QkLgQhABAEQUdHR1tbWxRFcZXPyhcRMU5cjaNjUsrJ
+yclCLjc02G+a5uz0DEHV1dmeSibOUqzyhVh16uN7UhoAgKAG0LZBi4W81hoRM5mM53lzc3OxeMIL
+S9GePwkCAdi0cSyVdFHppVeBMoUEEUdHRy3LinlfqWeLlcxSqj7ncaJVvV4fHR3N59K1xYXZykwi
+kSgWiwZnqORq8/BSnI1XTeKyqUAAUBOAQi6byWTi6DEhZHJyslqtmqb5M1LhKOKmsbFcJqW1jAUZ
+AKRGwzA2bdoEy6rppaWEsTYLgqBer3d3dw8ODGgFExMTURS1FwuZTIausiXzind0Fq5BlpUDEAJa
+A+iEYxUKhbiShnNeLpfn5ubOjF69FFrLnu7OZDIZT7NaYSzRpmn29vbGumWpLg4gfqXieTWuHvE8
+T0q5ceNGN2FVq9VKpWIYRqFQcK04Pny2/KgzsOrU8xWPmXAgBjATgBJC+rJmf7FQnl1sgd2ExJOH
+T/hB5FqGgYQpRaQGpTTVikrBIkGlBiy2l9avX4eoQEvHtqhWMvB7StmOtjQKoSJlUEMroJxSDrZt
+t4LAk0ATmflao7ZQGSilxnqzLQHHn5uqV2uD3Z1dxXxsEGn8OZX6l4Vt2+lMqi2X0UKIKFpcXDx2
+7BgzDaUUAGWMcc6JRqKRAeNAEZEC9Pb2cs5XilqVUj09PY7jrOiZeLEwtuiX8gwoqVarnPNLLr08
+DMXs7Fy5XDZNs1Qqua5rLCnCn8dp9hVBSClf6O7oIFppIWrV6lPPjJdn5+1EgnIutBJaAQBibFzS
+OE1hbGzMcRytNUUghBCE0dHRuGYBzjBs4uI/RMznMvOVsoiCzZs3G5axWK1PTEwszs9lMpmOjg6D
+LwW0fz4VzisCIZVyutoLbdmkwTCKoomp6Ucff5IwbtoWAg3DiACjQLRUBCD+d2RoOJfOxFXkoNE0
+zcHBQULIShXVSskVADAArUR58nR3R8f69YOnTk+XF+pzs2XTNHu6OlLJBAIgwloV8q0d9VoTgGza
+HenvzWdSUkZ+GD198PAz488KpeOlpdhioUgpACEkErK9vb27uxsAUOswDLPpTEdHR6xh4AXeLzLT
+pJQeOzReyOc2ja2rN0XdC6crC61Wq6Ojo7u7m1FAqSkBAhrOSqbfi7B21FMA0Bajw/09/b3dru1w
+w2oF4v6HHzlx6hTlhptIARCKlDNGNJiGIcMonUxtGBtjhCqlgiDo6enJ5XJKqZUAjl6GYRhzc3Oc
+kgu2bsmmkydPnqzMLUyU5x3L6OnqyKYTAGfYXWtFwJoBgRLMpBMjQ4MDg/2JZIqb9vz8/N4n9h05
+cmQl7EWBxSohiiLDIGNjY5xzRESlY9UfUx+b8LHaiR0o32ues3ljLpuZmpyYmZk5duq0BNbb21so
+FOI7Z3E8ApbaJ5xlrKXCAdCEIEHd3dUxMjKSSCQYN9LZ7Pj4+L4nnwxFZBmmlgoRCUJcFwgAXV1d
+nHMKhFLa399PKY2ph+UJNi7nfO655/L5fGdn5/xs+cSJE5VKxff9fKHY19eXTLqxdkdErdSa8A5r
+qnAoABFCUUJTjtlXKg6UCikQUlEnmTswfmznvQ/XI5FqS1PiA/NFpJKuq/xwpKdzqLu9WZ3PZtu6
+unoRFGUgVQREa5SMEyD64KFne7PORRdsm/Wip2Zq4+Xa0YnJgc7Cxo5Ud6nNZsBhKShPmQGEAzlL
+CZAvIODsX3IJWgMhS+mlAD09PSPDg5ZlMcbS6Wwmk9v7xP7HHt+HzAglAuGpdLrVatVqtWKxODY2
+ppTqKBW6ujpXymUNw3BdFxGnpqaUUhdedMn09HRlpjwzNbEwN9tRLMWz65rd70uwZtTjmR1pENKu
+sWH96LqhfimlkNJNJg3buX3nXT+8/U5mpxCMlueblsNNiy9HDoaGhkyTe54XF8LF9ZsnT56cnJy8
+5pprmkFUazSnZ6YmJ56zLWNkeKBYLGYy7lrd70uxZtQTSpVaNqiVJgDtxbaLL9yWSSdNgwVB0FYs
+cjNxx933337XvbVQ265DuVFrNKXUA4ODjJOOjlI2nVwp0U+n03v27FlYWHjPe97j+/5zU+XK3MLk
+5KTJ+chAX19PV2d7ca1u9mWxhhbO0ppUrHNRocVg/fDgtW+5ymIQhT5K2dnZ6SbTP/npPbf96A5P
+6ETK5qbpBX6pVBoaGuzp7tRKxEomlUo9/PDDYRjecMMNUsqZmRlN+MEjR5r1xmBfV393Rymfs036
+qurfvGadQTQCoVxrRSlllMRpsZyRS87fWJmeePzAs83AA8RsNlsnuGv3Hq++eM01b8vnC6GIMtnU
+Rdsu6OnpVkpqKQHgzjvvzOVyO3bsEEKcOHGCUvrskWO1enOgv6u7vdjVUcynk0ook69ip49/LdaM
++lgACWUrbf8AALWmSv3CtW/RWu9+/ElKlBQq6djg2I/v2x8KuWXLlpGRkWKxeNnll5QKbSan5fna
+3r17h4aG3v72t9fr9ZMnT2qtT5w4cfJUeXCgb+PG0Y5CqqOQo6CDKDD5q0jXr2UrIqWQMUIAUEtY
+cSoJak2m52q333XvwSPHHceRUroJx3Xd+fl5Suno6Mi5W7YYhuF53vj4+P79+9/ylrdcfvlF09Nz
+x48fj8u1nnzyyd51W3u7SusGOtcNdBkgRSRNcw3Wvn8G1q7t3CtCIxIg5NRk+c677zty4pSTzLqp
+tGNAe3u77/vPPDPe0983ODh45MgR3/ff8+btYxsHTpyeP3LyuJ1MHj5+4tDhw30Dg5vak0NDQ319
+fWy5MQ4s+1xrfYNLePVRjwoIQwAFcGKi8sAju09PTGVy+Y5SWxAE2Wy2s6P90KFD+/btO2fzxmuu
+uSaXcicny7VGs9FsHjxy5LnTp/Ol4ujo2Dm9+Xw+n06nYTklZK1v7MV49VEPGoBKhYQRBXDk+OT9
+D++ampo659xzc7kcatWWTSdt2zZZZ0cHIXh0dr5Vb5TLlaNHj1bKs6VSaWxsrJQvnDPSvdK+D9Yo
+Iv+z8eqlXiJwTjTAqYnKnj17nj505JKLL9qwfp0MvbTr9nQUCeiJ06dORVCemj747Hh1cbGnvXNk
+oH+gr7+npydtPR/Vic8b27KvHvFfy7ZzLw/ESESmaTIABcAABnuK+cxVhNEDTzwug9bbrr7KsdjC
+4oLfavpBdPT4xLHDh6IgHOrvG+4fGOjt6enosA3y0gg+rFHmwSvhVSf1K3KKiELG7bYYISAAfrLz
+7r17927duvWyyy5zXXd6evrBBx989sTpTMod6Osf7O/t6Wzv62ynACKKznJ1zv8FXnXUr0yJcXhg
+5e9CScr4nseeeGTPHiuRKpQ6avXWs4cOjvX1dXd39vR0dXWU8m1ZghKVNE1zxVF/6bLtWtzWy+BV
+Rz0831X4xQMTSlPGj52eeeCRRw8dPxVIvXHTlnXpRLGY7+vryeYcWCoVlQCAyGKWzzRvohe+DWuL
+VyP1L4t4CVtrZIw0Gq2TJ08uLCxYljXQ35tMJpPJ5AsTBV9F0v1KeM1QrzScOUfW680gCAzDsC0j
+jvLHS7LP91J/1eM1Q72QmvOX4XRFtuPEm5Xcv1c/XjPUx0BEKeVKps1Kr/m1Htf/DV5j1L+U6xX7
+/XVdv3rQy4HmF3G6lFq8Yj7Cq8x1eiW8Boa4AjyjORNqDXEqxwsPWNVyy/+3ePUFEv5PgEiWiyvP
+rGKIBf81IfLwM6Reg9AgIM5HRACNgAASADUgaKm0VLECUDLulC6XDgYNAFEU4RldfRqNRvxLXA0S
+RVEQBEsXWpbT2ETRkQ8oAVV8Hqkw/kGgoUAECkCBECUlSAGAhEhKFSEqEp4GRShIUIEUgFJHIYDW
+Sqxcd6mjO2gAHckQVwaMGrUE0FHoL/3v8i8IOooCAI2olIwANEgBUoBAUBqWblID6FB4CBJUBChF
+FMQ7Z8UkvaxOf0VdrzACoBQIIQSQaqVovK/BmZp2uc0QAGgZxWWSQNiKZhBCcbZk7Sml4gPiCAEu
+70sR75LwgocOAABhKCzLwpf0gFveSkevfAZKtNaUcgRAXNrHiiiJBAilUSBM21oZp4oENwyNOt6B
+LM5hpoyt3FetVstkMiuXE0pyxjF2iRGkEHGp7vKeCCCFUCjjoUoVGcwUUWSYJgBVSlHGtAattfES
+y/gVpZ4STgkVSgNQIEA5i6vz4i0sEFAqjQBhpLUGoYFxTiiNk34JIYigNRgGixPzYurjtPf440uD
+KstCQMNQKIWWZcWJeVrjStrIGbnwFJEEQQSExFmxgECAodK+FxAAYEsp+aZtxXKnNQiN3DSAAKWU
+AhFRBACUL/HebDYBIOY9/q7neZRxBCSUxq8G5YwyJoXQCGEkEAAosyxHaoxExJkJQONXM4oirXW8
+3dXLeySvJPV+GNjW0mKmjntMIFACsXwKqZVShmUsswacaCl13Egp9jyFBq3RZISQF0uulJozAmdE
+E1fq/6RCw2Dx8QQgCALbtqWUcVVUXHmsl4dMCBCtQWtgHKUEys/YQ08BUKEkIQQJY5REQpsGRQAp
+lYqEm7ABAAEipRVqkzDGiOcFiYS9NEJOASCUinNGADw/SDo2AOhYDhhRGhhdarqu9dLxUSRNk2sN
+lAIBCMOQUnpmHPB/T308rMnJstDKdhxKGTW453kkCru6uggjGqFWa3h+wDkPwzBlc9d1HceJhAIA
+ZrBqrXno0CEGODo6ms2mV8ZXqcwXi3m9rH9gWcvHHyVAECpGickoISt9OrSSknFTax3nThFGag2f
+c562DREEhm0rqbUGbtBqtZHLpSQqRtmKufP0s4dmZmZGR0fbezpNAAYAChYWqoGIIq3a2ov1uQXH
+cZrNZldXZ6vlpVMJIXF2dva506cNw1i/fn3KtQHAD4RrG61WKBmdmZlJOomO9jwB0BI4B9SgKVTm
+qocOjicsc3h4ON+WBQCtBGUvZv+VLRyEp585+IMf/bAyN2+7iYnJ6XyxEEVRMe3u2LFj27bz5xeq
+t9xy67GTJ2zb9lpB1mHv/8CHLrroQsNgGuC737vtvvsfqFQqjJLt27ffeOON6VQCCD1y/NRXv/rV
+3/qt3xrq635BJcKyut+z98C3vvWtd7z9+rdds11JTTmNdxwkhAAsqTLCCAL86PafPProo7//iY+V
+SgWpgBkUAP7uO//42GOP/adPfbJUyCoAAvDw7t23//gnh48dNQxTKXXh5Zfe8PZfWNfTNT01e8cd
+dxw+frQuAl9EbU4yCAIhxHvf+943vemNQsEtt/7N/v37G14LEdvb23/h+h1XXnG5Yxsa4Kd33/Pt
+7/7T8PDwfGWut6frHTvefs7mMSHQ5GTnvQ//6Ec/mjx9igBefsnFv/SLHyoW8/Tldvr5WcZle3vH
+1nPPm1tYPD09tf/AzquvueaNV1xuoezs6gGA6dnZO+/6aamj/Yort9u2zUSwfv16rVFonJ2d/cZf
+/tXmzZs/8IEPaCU7OzuTyQQAaA2nT5++7bbbfu3Xfm2F9zN3PKvVav/0/R/81S23IuIb3vCGlGMC
+ABDC2BnBd0IQQCLc98CD3/rbb2/euP4jH/43sXVVa3hfv/XWAwcOvOeDH8wXzqMAT4+Pf/krX5VS
+Xnv99Zs3b3766ae//s1vnjh64jO/96mu7tLmzeek8vnpxbn/futfnzsyduONN3qe19XTRxl88Y+/
+snPnzu3bt1948UW+7992222f/uznPvnJT75l+xvKs9Wnnx3f89jjH/jQLx4/evS273/v9MnTX/6T
+L7mO+cwzh7/4J382NNj//g/elLDNQjadzWZRa1CSGC9JRcFXgBSoESWiQHz0qYOXXrPj6//ju01E
+gSgQA4V7nx6/esc7/uLWvwsQPUSlUUgdf+U7//DdVFvp7gceEctnkIgS0Rf6sX0HRjdueWr88MqF
+4pkZEVut1qFDhz7w4d+4+M3XvfemX31oz+MaMYoiKULUArVQMtJaS4URoq/xw//h5s7hzduv23F8
+aiZAbGr8zm0/yvUMrD//ou/tvE8gziwsfOqznz3v0st37z8QIPqIPuLXv/u9jZdc/tWv3YISlY8S
+ccYLL3jbtV/66jcCxJbEEPGBPfv61m36oy//RYgYIAaIkwuN625439vf88HpuXqo8TOf/9Ibd9ww
+48sW4ue//Oejm86794FdGvGH//KT9sGNX//bfwoQBWIk4ltTqMVLGX5FC0dyIAhMAkdAoolJOaAN
+ACJkAIyCkGAnsvv2P73nsQMPPbD72cPHhEZAZKDfcMmFGzeMfer3P/3jnff7CgBAaUQpbU5arYZp
+2WBYoACUBiGpkAQJIFAzcdtPHlaR+MPP/QEQ88c/uVcBGNxghIFCBZQwQxMiNAKAkPrJ/Xt/73dv
+rs41dt55LwFo1qK///Y/fPB9v7Tt/EsOPnMIAKZmKrffec87b3jPeeduQaksHdkg3rf9mou3XPjg
+7r01X2jtMa11w+fSCTQwAEOHBsAPfvzjnuHRm37pFw1UFoAF0JlLfuLjv73v8ccOPP10K0QjkRKK
+mgZbqIUzM7OplDsyNAhKrx8d3DjS91df+8odd9wtAaJ4VyxF4OV2f3hllwpBawACSoHWmoLWWiv1
+fIcV13WllE888cQ3vvGNL37xi3fffXe9XieEiCgqlUqf+cxnRkZGPvaxj3343350zxNPUUqAcwXA
+DStUOoiEVgIoBdRgcCCABGYqtX1P7j///K0XXrx105bNx04cP/HcbDMUSiMQZAQiEaFCgxMCMDk5
+qZQaGxu95tprvv333wklPPDQ/dVa7cb330g4m5ie0ghxQ5Curi4NYHBGKBdBkM4m27vam16rMj/H
+TUNGYSgiwzK11rV6yzAMIcXRo0eHhoYsw1yqTQQAgLg38okTJxI28b2m41gPPfTov/93H73nnrs+
+85nPtLe3I6EDAwOf+9znOjs7f/M3f/NXfvXXd+3aC8ve3L+CekYgdqEYAxr3NQHNAAilBEBpUEoJ
+IbZt2/ab/+E3/vRP/3THjh35fBYADNO0bfvqq678xCc+8YUvfGFyuvzJ//z7e/c/BQBCgQJQCEKh
+ogwIgMmBgtJKATz1zIGp8lQkw2/93d8/vPuR+x68f/zIIds2iMHiqieTG4wtzQqtVsvkRltb2698
++Fer9cV//sEPbv/JHYMjgxdcsMmwjHKlzAgszs3JSMSvdiQREQ3bUQTqXtOwLak1cMZtg5msFQYA
+YJkmgOac27bte146ZUVRxDj3vEADGIZRq9WSyWQYIqck8rxSseAkLNC4bt06xgARDdO86KJt3/zm
+N//oj/6oWq1+9rOf3bV7r2nywPf/FdRTABkp5YdKAucMEQ3D0AigFSJyCoQQJaMNY6Nbz90wNjrQ
+39eFuPSEwzAUEteN9O247qqv/LevPvnUM4cOH9UAXhhKhUhYe0cnchporYBqQGBssdHaedednd2d
+mzZvOHbsSGdneyrl3nv//c1IaiAq3iyHxKpGaQ0zk1NB6IHG7t6Oq6/efvPNHz945OAv/5tfRIBc
+LrO4OE8BNm/a0D/Qe9ttt0kEg5NIKq3hyInjj+/b1zfQ19PfHW+5ForIcuzQ8x3biIX0sksu3r17
+157HnjBN7kfKTthKw3e/9/1UKvXmK95oGYQRTNjmUF/37978O92d7f/tz75CCDBGYiWRTCbe/a4d
+H/3oR+fm5u67775Wy7dfrsvUz4o0cYMxx2IcoiBsNRqotMEAlhesvWYjiqLZ2dmZ8uLkZPnUc1PV
+al1KKYWwLCv2DDXAnt27C23ZtmyOACQdyzatwGs+/dRTc7VGtd6cnp2dry5q1IcOj4+PP7PtvK3X
+v/Utv/Hr/+4Lf/gHN9544/333v3oo48CABCuZIRaE9AWZ5TCsWNHOedd3R0c4KYPfXB+rnLeOVve
+cNE2P1KpZOL0cyenJk93tZfec8MNp06d+tKX/qyyWOeGOTk9818+9Z8p6KuuusqgIKWghGitaosL
+btKp1uqh12IE3v/+9w8PD3/h859/7NFHTZMhwLf+9tvf+c53brrpJse2OIVmoz5XnnIT1pax4R07
+duz86Z233PItBPADqZSKfe+ZmZkwDIvFYiLx8t29XtG49H0vZScAABCkirq6uizLjCJtkIiYNgVw
+XbdUKv34h/+y5+EHAHUYiQ998AO/9MH3WcnEgQMH/usfftGPlNQ4v7iw47prL7rgPArx5oqSU/LH
+X/i841jNRq2QTf+XT/6nwnmFxx7ZTRGvf9vVGPr9XR0IcPWVVzy174mjh49cuu18xzK4sSSShJFW
+y5dCjA4Po1QMYGxk+Pd+5+NXvPkqAkCU7G4v9XV1KhmJKNixY0fLj275m1sfeehhk5PZ8vRQ/8Dv
+fOzjb7nyUgYQlzoYQDsKRRkJxzIsmyuF2ZT95T/54z//0z/++G//R7fUH4YhANx4443/8bd/i3Pq
+t/xCLtteKMgwQkrfvuP6pw48eeedd15//fW+79/8e7/bbHlBJCOpduzY8Y53vANguaHPC/HK4TMA
+hgCBANuoRsG+A0+uG1zXk28DEECYkBAqPHr85NTUFCNoGjyMxKaNG3o7SwC6Upm/54GH56uNpudv
+PXfTBVu35tIuaCmlDKXa+8SBQMow0umkS7Q4b8vGTCZ1+PDRymL94osv4CgBuBcIahoHDjzDKdl6
+zkZKAEAs7eGJBAg7eORord68YNtWqjUhpN5oua6LlFAC8wu1I0ePbR7pTmXzEhhQ8tSzR5588smJ
+06e2bd16zvp1Xf19AsFAYCAwDEPq7Dt4vFjIDHUXMWgx225Kxjnx6q1n9+3af3SGUnreueecv3Uz
+IJgMtIbnTp2oe62RkVHbMhHg1KmJxcXFocFhSun9D9w3OTUdCjUwNHzxxReXcgm/6aWS9ksVzM+g
+XjMFgBSIloxKAA7AFBAqAAgSHnsxUoLFIYrU0hSoFGMEgAqEpi/tBDcAGACqkC65RUQoIIxHCCDB
+MYAgRH7LdFyNAASojIBxIFQhIAFUYDBQUlMSEsKAUSk142YcWpEKuBLxCxFGwrKMIFSWxQCAgAAg
+AjkSQAA/1I5FtQSHgUKQCBYFiHzgFKjlAyCAQ4AoH5gRAQ81JCgwFdTRBgTbACnQMghdDp2GIjIN
+UyrJGY+jVQYnSgFjsFhruSmXUpAaDAIGgSjwrFiF/J9Q/zpWG6+NBZ2fS7xO/ZrhderXDK9Tv2Z4
+nfo1w/8CNT8nW8+hJGgAAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_toyota" model="fleet.vehicle.model.brand">
+      	<field name="name">Toyota</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAA6xElEQVR4nO29eXhd1Xk++q61x7PP
+qKOjWbKswSOeZxuDoQUTYlybJMRJS5JmaPNrOuRpkvYm7ZOSDqH5cZtQbhKSkADNQMJYBockGBw8
+YON5kC3LlqzBko7mc6Qz7nmt+8eKz08BzMVgoM9z+f7wc460tYf3+9Y3vN+3tgnnHO/JuyH03b6B
+///Ke9C/a/Ie9O+avAf9uybvQf+uyXvQv2vyHvTvmrxr0HPOp5cUr/j6ip9M/8A5Z4wxxl79J0IY
+Y77vi8++7zPGSn9b+vn/BCHvbknFGCOEEEIEQJRS27YppZIkUUqnHzb96xsR3/fFo5FpcmVv/i3K
+uwm953mccwH0ax4gTFt8Lh0z/YfTf/46ItbH5Srv7ZZ3DXqx9gkh0xEp2emrjxfL4vWNd/oxruu+
+Qqmvc/J3ReR368KU0hIKJa9dQrZk2iXdcM5fgbs45tVWL45RFEUcU3Jl03/7P0HeNasXUOKiU5Yk
+6Y2A4vu+67qlCEEpdV23FBjET4QySseU/lao4VIO6p1Xybtm9aVcZTrurusqiuK6rmmahUIhm82m
+0+lUKpXL5QqFgm3bhUKhUChYluV5njgPY0xRFF3XA4GAruuGYQSDQV3Xq6qqwuFwPB6PRCKBQEBR
+FEoppfR/DlP7Lmc40/1vPp/P5XInTpyYmpoaHR2dnJy0bVu4C865wE4YeMkFlW6eMea6ruM4vu8L
+2/d9X1VVTdNUVQ2Hw/X19a2trbW1tYlE4jXv5J23+isJveM4kiT9f6Yc4opi7TPGUqnU4ODguXPn
+uru78/m8wM4wDLEUIpFIMBjknOu67nmeoijhcJgxpqqq4ziaprmuK8tyOp2mlFqWBSCXywkdFIvF
+fD5PCJFl2XEcznkwGJw1a1YikZg3b15jY6PQkCzLuOgAPc8TX99EOnu5ciWhL7nv6ZGtWCxqmiZQ
+ZoyJB3McR5bl06dPHzly5MKFC5Zl6bquaZrAWtO0WCxWWVkZiUQIIYqilJWVCZW4rut53sTEhOd5
+tm27rhuLxYrFYjweD4fDlNJcLpdIJNLptGmarutOTEyMjo5ms9l8Pm+aJoBMJqMoSjQaLS8vb25u
+XrduXSKRME0zEAiUbuwVIeRtkisGvTATzrnI1sWqL+UnoqpUFIVznkwmu7u7Dx8+PD4+LstyVVWV
+eMiKioqKiopEIhGLxSRJyuVy6XR6ZGSkq6urp6cnmUxOTU319vYWi8VEIrF8+fLW1tZQKHThwoXO
+zs7e3t58Pl9dXV1RUVFXV1dbWzt//vyKigqhP0rpxMREX1/f6OiobduZTCaVSgEIBoOBQKClpWX5
+8uWNjY3BYBAXw74wkdIieDvkikHv+74w7VdbigiJkiSlUqmDBw8ePXo0nU5Ho9FoNFpWVhYOh+vq
+6lpbWxVFGR0d7enpOXr06KFDh7q7u3t7e03TlGWZc15eXj42NrZgwYJt27Zt3rx57ty5juMIF5TJ
+ZF544YVnn312+/btkUhkbGxMlmVx0UQiMXv27EWLFi1atGjhwoVNTU35fL6/v39wcHB0dHRkZMRx
+nGAwqKqqOGzevHm6roskSlXVtzUAvF1hVlQ0gk7RdT2fzx8+fPjkyZNDQ0OGYdTX1xuG0dDQ0NTU
+FI1GR0ZGXnzxxeeff76rq+v06dOMMcMwZs+e3dTU1NjYuGTJkoaGhoaGhm9961szZ8685ZZbEomE
+7/vZbDYUCk1OTorI2d/f//3vf3/p0qVXX331+fPne3p6BgcHOzo6zp49OzQ0RAipra2tra294YYb
+rrvuutmzZ09OTnZ3d3d3d4+NjXHOXdctLy9ftGjRsmXL6uvrhfIIIW+kWn5zcoWhF7YvolwgEBCe
+5+zZs3v37u3u7lYUpaampqamJhqNrlixIpvNvvzyy08++eTevXuHh4cDgUBNTc26des2bNiwcOHC
+1tbWWCwmTus4zqFDh5555plNmzatWbNGuAvh3FRVFbSP4zjPPvtsKpW64447RFRQFMXzvOHh4dOn
+Tx8+fPill15qa2tLp9OBQGDWrFlbt27dunVrOBw+efLk6dOnbdseHx8nhDQ1Na1Zs2bZsmWhUAjT
+mLtXAveWF8SVdDiUUuEBSm4nk8kcOHDgyJEjpmk2NDREIpHy8vLW1tbKysrHHnts+/btO3fu9H1/
+zpw5K1as2Lhx44YNG+LxuDiPLMu+79u2bRiG4zhf+tKXWlpabrvttmAwODk5GQgEKKWZTEbTNKEA
+Sunw8PB99923bt26j3/846UbKz1gOp0eHBzcuXPnr371qzNnzuTz+VAotG3btttvvz0aje7ZsyeZ
+TE5MTGSz2bKyspUrVy5fvrylpeVSkfZ/EPSe5wlfX0pm0un0rl27Ojo6CCEzZsyoqqqqqKiYO3du
+R0fHXXfdtW/fvmKxOG/evG3btr3//e9vbW0VDkr8KwpR27Y1TQPwzDPPPPnkk5/97GeXLVs2Ojqq
+67pwBaFQKJ1OF4tFWZaFkh577LETJ0584xvfSCQSQn/TPUaJQH722Wd/+tOftrW1jY6ONjY2fuAD
+H/j4xz9+/PjxwcHBVCo1OjoKYO7cuevXr1+2bNlrA/eWob/C4ZtzXigUDMMoFouPPPJIKpWKx+PV
+1dWVlZWVlZW1tbXPPvvsXXfdNTExEY/HP/e5z33sYx9rbGwsrRIBesnqVVUFkM1mn3jiidmzZ8+Z
+M0cUWSJ97O3t1XVdluWZM2eOjIwIw7/66qt379793HPP3X777aIKE8tRICX0yjm/5ZZbNm/e/NRT
+Tz3wwANHjx598MEH+/r6vvzlLwuHaRhGd3d3Z2fnxMRELpe75pprJEkqFAoiSybkytjrFctbxT15
+nhcMBs+fP//DH/5wcnKyrKyssbGxtbW1rq6upqams7PzF7/4RTgcnjdv3t133/3Zz362sbGxROcK
+uAVGwlTFEx45cmR8fHzt2rXRaNS27fLy8t7e3ueff/78+fNTU1PHjh07ceJERUWFJEme51VVVdXU
+1IglJchRSZJKHRJBXQhNuK67ZcuWe++995Of/GRjY+OZM2eefPLJRYsWVVRUxGKxq666StO0ZDK5
+e/fuPXv2iOcSCxGXDgCXJVfM6kUpr+t6f3//zp07x8bGmpub6+vrq6qqotGoYRixWGxoaGjLli3J
+ZPLGG29csmSJcCaiKMVFeksUB9NJghdeeEFRlPnz59u27fu+pmm7du06cuRIS0uLaZrJZLKtra2y
+sjIcDhcKhUQisW7duh/96Efd3d1XXXVVKeUVpyol7JZliQquvr7+q1/96j333BONRh3HCQQC5eXl
+lmVFIpFcLqeqak9Pj+u6mqatWrWqVPdekVLrilk951xV1Vwu9+yzz/b398+ZM6empqa6ulpk7rIs
+T01N1dXVLViwYPHixQJ3kXqqqiqgEe4FF20TAKV0fHz88OHDy5Ytq6ys9DyvoqKio6PjueeemzFj
+xq233nrbbbctXrw4mUzu2LFDOJxcLrd48WLXdXft2iXW0KuJZZHvuq4rtKtp2qZNm2prazds2EAI
+qaysBCBJUk1NTXl5eSwWSyaTzz///Msvvyzimeu6VwSxK1koE0J27NjR398/Y8aMeDxeVVVVXl4e
+DAYlSZJlWVEUx3FGRkZSqZQwc8/zXt0gLPHywrKOHTs2ODh49dVXc84dx6GU7t69mzG2ZcuW5uZm
+wzCuv/76JUuW7Ny5c3R0NBQK5XK56urq2tra559/Hhedewl68dVxHFz0aQLHYDA4ODjoOI6I2LFY
+jFKq63o8Hq+rqzMM48KFCwcOHOjp6QFwperbKwa9LMt79uw5fPhweXl5VVVVfX19RUWFeBLP8zzP
+C4VC+Xzetu3JyclkMum6rqqqwoiEbQo3KpRR8vW7d+9WFGX27NmSJAUCgWQyuW/fvuXLl8+bN09c
+1zCMm266KZvNHjp0SNf1YDAYDAaXLFnS0dFx4cKF13hgSgOBgG3bIjiJjsqhQ4dCoVBfXx+AkZER
+QSiJRLmysrK6ulqSpK6urv379wueTijvLcoVg354ePjgwYOhUEiYSX19/bFjx7Zv364oinjIbDZ7
+1VVXCWV897vf7evrKxQKglbEtP5Uycv7vl8oFI4fPz5nzpyKiorJyUlN03p6eorF4oYNG4SFiiPn
+z58/f/78Y8eOCarOcZyFCxf6vn/48GHhbcRh02OjQBZAoVD4+c9/3t7ens/nw+GwruvZbNayLMMw
+8vn8b3/7W0KI4IJs225razt58qTnef+zfP2LL77o+35lZWU0Gq2trXVd9+GHH37qqacikUg+nxf1
+UVlZ2YYNGyilmqbdfffdDz/8cE9Pj0CEUqqqqqCuREJi23axWBwbG5s7d24gEDAMgxDS0dGhKMqa
+NWsE2SCaVgDmzp2bTCYnJydFidva2hoOh8+cOSN+W+qr4KJqhaN/7rnn7rrrroMHD2qa1tDQ0Nzc
+fPr0aUVRRB0+Ojq6Y8eOdDodDAZFBZ5Op0+ePJlMJq+Iz3kzpyj1kkSlLstyV1dXb2+vKJ1kWS4r
+K3vuuecEobh3795169al02lRlEaj0U984hO7du06cODAvn379uzZ09raunz58oULF1ZVVVFKhQcA
+YBjGsWPHRkZGFixYAMA0TU3TDhw4sGrVKs/zdF0X6YrA+pprrnnqqacGBwfr6uqmpqbKy8sTicTZ
+s2fF2QRjKiJKLpcbGhrat2/f8ePHRQnS0tKydOnS8vLys2fPhkIh3/dN0wyFQi+88ALnfOfOnZ/6
+1Kempqbi8ThjrL+//+DBg/X19SJxEiu1RJVf1mp4M9ALRyz+FWWksK+mpibGWFVVFYCnnnrKNE3H
+cf7u7/5u+/btZWVlmUwmEAh4nqdp2oYNG+bOnXvy5Mn29vbR0dGHH3740UcfFRzZzJkzY7HYzJkz
+g8FgX1+fsEdBGFy4cMF13aqqqpJ6xMOLwCgiAQBVVRVFaWlp6e/vHx4ejsViY2Njg4ODFy5cGBgY
+GBwcLBaLAKLR6MyZM0XrSpblVColejLpdLq5ufmJJ57Yv39/a2vr+Pj42bNnRSIbDoez2ezQ0NDI
+yEhdXV0pKXgTGL5J6EWcKZnS6OhoZ2encJShUMgwjEOHDp09e7a6uvqWW275z//8z6985Stf//rX
+q6urx8fHDcPIZDKhUKixsbGuru76668XRPHg4GAulxsfHxedE1VVQ6FQe3t7MBhsbm7WNE3X9ZGR
+EVG19fb2iigtRqZkWc5kMsFgMJlMigAoy3J1dfXu3bvvv/9+3/fz+bymaaK/OH/+fEVRBKshemq+
+709MTAQCAeEY586d+8wzz3zjG99Yt27d8uXLd+zYcfTo0eXLl4+NjVmWlc/nR0ZGzp49W1tbK7KD
+EvSv+Pq2QC8uIyogRVH6+/sdxxFPEgqFJEnavn27pmnXXXfdV77yFUVRvvnNb/b19d1///0zZ87M
+5XKaplmWJR5b07QZM2bMmjVLNPmGhoY8z8vn81NTU7ZtR6PR6upqwSvYtj01NaUoyqlTp7q7uwW9
+I7y2SFQ45/l8PpPJqKoaDAZbWlo2bdo0f/58kVyVlZUBMAxDURTf90XrxnVdUfTqul4oFGKxGOf8
+0Ucf/frXv7506dIf/OAHsiyLnFKYSyqVCofDlmV1dXWtWrUqHA5PD92XSzC8GeiFkxVdTdu2+/r6
+VFXlnMdiMUVRLMvq7OwEcOONNxqGceeddzLGvvnNb1599dX//u//vm3bNk3TCoWC4zil2jWfz4vG
+95w5c0SM9X1fxMZkMimaR47j1NfXb968WST4pcRfxBvP86677jqRjHPOc7nc+vXrly9fnkgkcrmc
+cFCiAVJqUoqviqIIqicej3d1dd1zzz179uy55ppr7rzzzgULFti2PX/+/H379p09e3blypWDg4Oi
+FpucnBwZGXkF9LhMTu3NW72QXC43OjoqGtmU0mg0+tJLL1mWVVVVtXDhQoHRf/zHfyxfvvxzn/vc
+Zz7zmaeffvrDH/7wtm3bRA/IcRzRDpVlmTEmVoP4iSh0W1tbfd8XvaSmpibhfMSlRYUligDBAKdS
+KVVVxSxJPB4XXFsgEBD9A2EonHPTNIXVy7IciUQsy7pw4cJ//dd//fKXvxwaGvroRz/6rW99S7Rf
+ZFletWrV4cOHOzo63ve+94XD4ampKXHRgYGBWbNmvTn03jz0053a2NiY4zjCNYuW/4EDB3zfX7Fi
+RVlZWWn4a9u2bcuWLfvOd77zne985/nnn7/33nv/5m/+ZsmSJc3NzbquF4tF0zTFOYXvFpMzuVwO
+gMDINE2R2Aj4AFiWJXyRCI+FQkGsAEmShG2K1SBWJIDSH6qqqqqqiBCHDh16/vnnd+/ePTAwMHfu
+3B/84Ac33HCD0C4ASumyZcvi8XgymRQOMJPJiDJlaGgI04ba3gnoS5S6+DwxMaEoiizLrutGo1HX
+daempkSvRyhJlmUxcNDa2vrtb3/7E5/4xL333vv0009/6EMfmjt37rXXXnvzzTevX7++NB4jyloR
+GIUrENCLjqPQjed5hmGUWHsAsiwXCgVh4KJSFccL3QhHlM/no9GomKASwxCHDx8+fvy47/uzZs36
+4he/+KlPfUpMU4nESYQTQYokk8nx8XFd10VQ8Twvk8ng9z2MoOreRuiFnktZ7djYmLgDQdSUAl1t
+bW1p0E74X/F5xYoV3/3ud7/2ta/dd999+/fvf+ihhx544IEZM2YsXrx43bp1CxYsEMllKf0QzylC
+ovBLQuW2bYuAKaKLLMvhcFisP7F6RIop4rBlWaOjo6Ojo+fOnTt79mxHR0d7e3uhUKivrxdtwvXr
+18fj8Vc8oyCaYrGYUPPo6Ojs2bPb29vFihHlnuDaRIlzqamAKwZ9SQR3KvypgF4scN/3RUYhQmiJ
+thU8paBiKisr/+3f/m1kZKStre3w4cMHDx48ceLEzp07BXFYX18/c+bMysrKhoaGG2+8saqqStDR
+tm2nUinDMAQVatu2ZVmc83A4DCCXy01NTcViMXEPou4/fvx4LpcbGBjo6enJZrPZbJZSOmPGjI9+
+9KPXXnvtihUrGhoaSozpa4phGNFodGBgQPDMIiYJGrlEYZYYp7c9zE6/hghZ4quYwBFFk+gp4yLP
+J+y3lA/ouu77fnV1dXV19caNGwuFwoULF9rb2/v6+o4dOzY2NnbgwIFcLjd37txly5Y1NTWJh3zy
+ySd/8YtfhEKh8vJyMagUDAZt2xYqMU2zqanpL/7iL2pqakS62dbW9tOf/lTMetTU1GzcuLGxsXH1
+6tU1NTWici490etbq+AwRKQRPRbhA4WpiTvB5fP4bxV6kQWWJp+EUYicBL/PWImivzQTOV0ZwWBQ
+UGDCvaZSqeHh4ba2ts7Ozkgk4rqu6LvGYjGx0kWAYYzl83nRHxe+xff9RCKh6/rExISqqo2NjR/7
+2Me2bNlSWVkZj8fFfBku+hOR3SuK8oqB5FeIwBeAcGWlDFWMQZT+8E30rd68wxFXFdyAWOOiCyoC
+2tTUFKaRG7g4UD99c4jQgVi/gmIU/ZPy8vLy8nLBU2YyGc55KBQSk3irV6/+9Kc/reu6YMqE2xW5
++f79+8+fPy9GLTnnExMTruu2tLQsXrz4NSfIp4+Hvg70jLFCoUApjUQihUKhVHYoiiJatXizu1be
+JJFQut1EItHZ2Sk8vvi3srLSNE3R1H/FLpzpCcD0RVr6/Ht3JsuWZYmqR/Bc4XCYEBIKhWKxmMiI
+RAQuBWTBMwMIBALCszc0NJQKKKGq6XP3wooppa/DRJqmKZi7srIyoW/RbCkrKzMM4xUHX5a7f6uk
+cWVlpbgVx3EE/97Y2ChJ0vnz50s7Q8SzCe6hRJ2XWlTiPGLdYJoCRL6fzWYFUoqiBINBgRQA27ZF
+5SVKM8HDiH6e8HiiQ1AaqBcJGC6qXNTSIhESnvBSD3j+/Pl8Ph+JRMrKytLptOd5xWLRcZx4PK7r
+On5/D8Vlhdk3CX1JvdFoVNhOKaEWzGVfX18+nxcF6u+uRGnJOYp8v9QBB1AqaEsrIxwOixEMMZ9t
+mmY0GvV9X4ysisH50kY4QkiJIxNXnJqasixLjBHgVRuDBPUmnOTrQ9bR0VEoFCKRSDgczufzwsJ8
+349Go6LkLvXcL1cuG3qx4krd1BkzZohevmmaItUV3Pfk5OShQ4dEUg9ANP9wsRdams54RYibvutD
+5HypVEqkE7qui76diLHCvZSWked5yWSyoaFBOD2R7JumWRodFFecvs7w++4eFzsq4g7FDReLxaNH
+j8qy3NLSAmBsbEwUybqui6Gg6dHicnVw2dCXvGSpzpw1a1Y2mxXV3djYWG1trcjndu3aBaBQKDDG
+Sg05RVFM03wjVZ+IbOPj4yKjsCwrGo0mEone3t5Ss7tk+Ol0WqhHdK/S6XQ2mxX17fTbfh0RJZtg
+I0rzKe3t7efPn4/H46tXr+7r6xMsgmVZiUSitrZWGEfJhV7ufui35OsFYbJ06VJKaTKZVBRlbGxs
+cnJy69atruu2tbW1tbUFg8GSksQTluB4TeHT9pxUVlZeuHDBtm1BloVCoRkzZvT29mLaCJ/w9efP
+nw+Hw+Xl5WL/gmh9WJYluOJXz4O8WhRFKRaLwWBQ0HbiEo899hiltKqqqrq6+vTp07Isj42NGYZR
+V1dXVVUlLP01c4Q3Im8S+ulRpbGxcfbs2ZZldXd3y7I8ODg4Z86cxsZGTdMeeuihUuIlkn3B376R
+GyWE1NTUDA0NTU1NCa8FoL6+3rKs0gR96Tw9PT2JRMIwDM/zcrmcJEmjo6OapolE6NVt8VeLWC7i
+s0iTXnzxxe7ubl3X165dOzQ0lM1mbdsWba+VK1fi99M2kUpclgLevNWLQk5ce/369ZIkCQsdGRkZ
+Hx/fsmWLJEk9PT2PPPJIqdYVjO4bObn4k+rqatM0BwYGBI8m5vpisdiZM2dEoBZx0jTNVCpVU1Mj
+9kHYtp1Op/v7+xOJhFhhpSXyOm5HoCZStWAw2NPT89RTT0mSNGvWrDlz5hw8eFBkzJWVlTNnzhR9
+hRLu/Pc3/b5BeTPQlwqlUmxZuHDhrFmz8vl8d3e3ZVkTExNNTU0rV64khPzyl788cuQIANFUKvmT
+1z+54KWrqqoikciZM2eEuxf9phkzZvT09IgwKKris2fPUkobGxtFN1hsBhoYGBDsKZu2sf91oCmR
+nYFAwPf9xx9/PJlMlpWV3XLLLW1tbUNDQ6lUqlAoVFdXX3fddWLtCtxLW3kvF8Y3A30pHcTFeS5V
+VW+55ZZwOCx47f7+/vPnz2/atKmpqUmSpJ/97Gf9/f2MsWKxqKrq64fZkjo55xUVFbW1te3t7ZlM
+ptTMmzVrluM4p06dEnE7n8+fPXu2sbExFAqJzA/A8PBwNpudP38+ea3Bv9cUQQyIh7rvvvtOnz4d
+j8evvfZa13VffvllcUA4HJ4zZ87ixYtfocI3uN/6FfJmkktMY+3JxZns+fPn33DDDZZltbW1ZTIZ
+YSZbt24NBALpdPrb3/726OhoMBgUcwmvnwywiy9cMQwjkUgMDg5mMhlRy5imWVdXFwqFTp06NTY2
+xhjbt2/fxMTEvHnzBBEvbPDMmTOc86amJkFdlCLh6/hiMQrHGHvooYf279+v6/qCBQvWrFnzm9/8
+BsDAwIDneTNmzNi2bZuIW/yiiAz1HUouS6V/ibUQxnLTTTetXbt2dHR0fHx8fHy8vb09HA5v27Yt
+Ho+nUqnvfve7Z86cEYPa081weoY+3WkKD7Bp06aurq5Tp06JhD2Xy5mmuWLFinA4vGPHjoceeiib
+za5du1YMOojdTyK5mjdvXk1NDabVEKW7dV1XhBx+cbu6yNYBPPjgg3v27AEwd+7czZs3P/TQQ8lk
+Mp/PFwqFeDx+2223VVZWCjZJ1OevKEreXugvJZzzWCy2efPmBQsWtLe39/b2Wpa1e/fuysrKm2++
+ORwOZzKZ+++///Tp0yLYTq8kSwuWTBuuF82QmpqaRCKxf/9+0YBNp9Ni7mPlypWrVq265pprVq9e
+XVZWNj4+LtjjQqHQ1dXV39+/YsWK6R4ZF4OTOG1pkkWsXUVRbNu+5557Tpw4wRi79tprb7jhhvvv
+v390dNTzvMHBwZqami1btixatIhcHNN863LFoBeRcPbs2bfeeuvMmTP7+/t7e3szmczevXvLyso+
+/elPRyKRaDR63333/fd//7fYZzPd9qdbUIl1AdDY2Lh+/fqXXnppeHhYJPu5XE6MOoXDYTH8UywW
+U6mUIIVUVRWjImvXrgUgRvJL3CoAQY6K9SEuJ4b077777rGxsXg8vnHjxpUrV/7yl78cHx8XUzfR
+aPSGG2646aabRNb/ppmDV8gV29ogRgEppatXr+ac/+QnP+no6BCBcd++fYsXL/70pz+9Y8eO8vLy
+9vb2rq6uD3zgA9XV1ZFIREBWajgAECO+kiQVi8VAILBhwwax72nhwoVi6iaTyRBC4vG47/tDQ0OF
+QkF4DDHNcOjQoYaGhtmzZ+NiCjT9Pkt7V0T5ms/n9+7du2PHDlGEL1y4MBaLPfbYY6Ojo8lkslgs
+xmKxrVu3btq0KRgMloi5y80jX1OuGPSiPynubM2aNQAeffTR9vb2iYmJ2bNnHzx4MJvN3nLLLWfO
+nAkGg7lc7uc///myZcuWLVtWU1MjqkfRvxZqKJFchJDly5fX1dUdPny4paUlm80KX9HX1zc+Pi7C
+ndCZ2Apy7ty59vb2r371q2IoQdybgLu0c1psyyeEiKl0zvnixYuDweCcOXPGxsYefPDBQqGQTCZV
+VS0vL9+yZcumTZsSiYRlWYqilOYb3rpcsR2EJS5T9KYBHDly5Ne//vXRo0c9z2toaIjFYpFI5IYb
+bmhtbT1w4EChUEin0/l8vqGhYfXq1Q0NDSJJEG1PMfsn2GBK6Te+8Y0HHnjgjjvuqK2tFeN5ohUu
+aIPSIGIoFHr88cePHj26a9eu6W3u0qxAqe7fs2fPwYMHy8rKROerpqYmEAjs2LHj2LFjqqoODw+L
+8u2DH/zgxo0bRe9X2BYuf6z1UnIl980KLldMMYpHTaVS999//9GjR0UnL5FIVFdXh8PhD3/4wxMT
+E5Zl9fb2is1KNTU1K1asWLFiRUlz059weHj4uuuuW7ly5Uc+8hGRvOu6LknS9JmccDh87ty5J554
+YsuWLXfccUfp/RKlAtCyLNu2d+3adfz4cU3T6uvrxQsSxK7lF154wTRN4dxjsVhra+utt956/fXX
+4yKXWZoYnO4b34q8LRv1RcZWosiffvrp5557rru7W1XVsrKysrIyVVVXrVo1e/ZsWZbFuxAmJiaK
+xSKldOXKlXV1dcuWLStxACJ3vvPOO3/wgx984QtfaG1tnZycFBGvRKOKKbMf//jHbW1tBw4cEAPZ
+pa7I2NhYW1tbe3v74OBgOByORCLxeHzOnDm1tbWnT5/+7W9/Oz4+Lkhm27bLysrWrl37oQ99qLGx
+UURmkUwLDkrcVWkFvBV5h15F1NPTs3379t/+9rdTU1PRaFS8QKW6uvqqq66aN29eKBQaHh5ub2/v
+7+8fGxsThEFzc/PcuXObm5vr6urErr6tW7eOjY19/vOfF0PLYisELtLue/bsefzxx7/3ve9t2bIl
+m82mUqmBgYH29vbOzs6RkRHGWCKRqKysnDVrVktLSygU6ujoOHjwYF9fnxiqEHNaV1111fve9761
+a9eKQc8r5VteU9526EXiITKK48ePP/fccydPnszlcqItFQgE4vF4c3PzrFmzqqqqdF0/derU0NBQ
+V1fXwMCAcOuRSCQUCs2aNWvPnj19fX2LFi3auHGj6IqIrqmmaS+99NKvfvWrTCbz8Y9/vFAo9Pf3
+Z7NZkYwmEomWlpY5c+bMmDEjEolks9m2trbTp09PTk5allUsFgkhhmHU1NSsX79+48aNohArOZm3
+D5l3yOpLSbegRHbv3n3q1CnRbxOvyRIbVhOJxMqVK0OhkKZpIt3u6urq6uoaGRkRjd9CoeB5Xl1d
+3fz58xsaGgzDELuWjx8/HggERNOuWCzOmjVLUIyzZ88WrxEZHh4W6hweHhbXFQmimN8Xb6uoqqoS
+yZXgmt5W3PEOQF8Km6X8XeQtx48fP3LkyMGDB4eHh4WJqaoq6J1IJFJZWVlVVVVVVSVGaEQ+msvl
+2MUdOZxz8SYuYfixWCwYDMqyLDZBiFflCOq4v79/YmJCkJqihywWnAB9zZo1a9eura2txatehCki
+86vHDq6UvBNWL3oapcxsOpU4MjJy9OjRY8eO9fX1jYyMTE5OCgISgGh8S5IkRlCrqqoMw1BV1TCM
+SCQi5gxx0aGZppnNZgGkUinxyrNcLieULWrX0sttKioqampqFi1atHLlytmzZ4smjFgEmFaClUa1
+3j5Y3jmrFxCIz9NfcgXANM3x8fFz5851dXWdOXNmfHxcjF3gYqdQ13XTNEvnkaa9SU2cU5i/YRiC
+jBPJksBaaC6RSLS2tjY2Nq5cuTIej5eXlws+WWwMmn7DJUDYxc3sbxMy75Cvf81UYfpqKPURbdse
+Ghrq7u7u7+8XG8bEO+QIIePj4wDE3Cu5OD6uqqoYRBUJj5iRCgaDYnyjtra2ubl55syZ1dXV0WhU
+7KotOUBc5FxL78Yr3ckVoQpeX94J6F89evaK3+Ii41pKh0q/KhaLk5OTmUymWCzmcrlsNlssFovF
+YsmZiLkEMVkmdu2KtDUSiYjh7OnX8qa9Ru4Vnv0V91kyhSsPx0W5JPSC5CbwCXwCDsAFd8B1vPY8
+gcQA8RQeByHwfscPeTIjvi/5EggFAO77EoNEJA6fEZ9KjIBxKAQKA3w4FJIEzwfnriZLF5VAbEoU
+DsqYL8EEGKgByBY8HRJAfID/7o4ZgUuhMXgUPkAYVItBoZBhEqgABxg8Ak8GCCfwAI+5AYlajiRp
+IITLcEAZ/AAk+BQSbGYRKrnck0hAAcDhEkcBAfM551xSOGSXQybQ3jr0YADgE8YIkwWqHGAUlzIE
+ZgMUBL7rSprOQHxOCAGDS0EIKEA5OOcchDPAZbZOFRm/WwoumAvOAcm09EAAgMd8TgmD5IMwIMR8
++ADjkAhkyQOXmQQXkBmXqAt48CmIDgoPcDyoMuceU2QJDAwgzCcowAtD5z4IB5EAwCPwABcIADIH
+fIDDVcAACZAZmA8qA8wB5QADk8EkOLCC/4dwlzgkTmFxSJeB/aWh9xgo/Z3ZMy5xSIyAAcprjxRM
+UUeBTME5QCFRSIRDIRSuCwpQ4hPqgwKgAGNQKWOODc6oxAAGWfZBHe4TAhmSBEpA4VMQCR6HRCzJ
+1kHhE7gMmuwS7sMHiMwAQCKUEA4OeD4IASHwJUgAZeAcjsM5hy75hMiuBJ8CEjhAAR+eAkmB5XoB
+RQYD4/AoCIHCAQeQAQYQFzI4PB9wwThk3VaJRkwGmUIRy84DOKC/JjyvIZckjX2ZSQB8KhGAEh/g
+EmQOm7w29AwGAaGOJ8uyzRxFhsQYPBeqxgCXeQCjHpNtEC6DAjqlXPMlj8vcdoqK40mSHih6ZlA2
+HV9i3FA1uAABs12qq0UJns9DUOBzOMSjnqOAAWU+QAko90FtMEJllUgSgee7BJRz4jmeDCqrGnzI
+rpcJmJIC2ZcJVI8QLnOdg/gUCivAopRyUB/M970AVQjxKdU9j0mSQjlzGFzCbRCVaoYEMFCXySol
+HKDwNDhgxhvuPl3S6nPwdJ8plgyFcgU5AofbMkHMvVSyRSDeVKLAI2AKFHgwbaIEweFRDomUeuEe
+A2UgMizLkRWqSxLxmUQoXB+QIcPjYDIcD4oMH5DANZf4DogO2+GqQojPqULAMSkVgtBUUJiMUdnV
+kAOyQBUYAH7RtaiAzAAbTsAl4L7PbYl6UBQgyCCZLnQC1wGVIctwfBAKSYLjWYYsARSgPgi5GFE4
+8n4OsiZLqs5/Z++m6mfhVb1hj3NJ6LPwwpCJDXBYElzZDRKXcuYh9JrHj3KnjCoGI7bn2Sqx4Ueg
+aD7LuCSiU8JtuEXYeZ9QaAaXFc/xNS0IyKbNVO13lsLAFNdhil4EGGC6iCnQOcA8FGVTg6fChRWE
+JFmOTHWeN9NxHcxRGQnLivDUEH1wJw0qQ1F91chDKbiexuWoCseG4XPIBIpXIHBBNEgBH6BwPVdS
+ZHighIDAoygAQceVVMUFLB+SBM6hEjiOFVIdE5TDkDlVXYADCitSx3jDHueSDkdjHiEyZPgSAITB
+0DuIrl6rIvyaxwelrCEZcOikaVevW52F7HMOX2K6nUkl2YmT9sFjk0dOFJJj4VCsqqbOuHYFWboc
+V10VMEJTvq97bsCyxk62VSqmpOo2URJLVoUUmXsMHoNjZyJyEJ6eGna7OlUi5zLZ4Lx5vL66vChD
+lSG7dm40feLE1M6XcLg9NDI1EKW1za3VS5boq5ZHF80P6UEHsGzONJJLJuXe7gAzAwG4lNgkoEoh
+i7oeuCrLbt4yZLXA2Qg365fMY6yMclCCsMSIlRvrOBWkTPUcFKVAogzz5uSJQqiscIDBoJexefPS
+YdZlAPWAnAIJiEyN9n//x8e+88CC3MRrHu5LtsS1cZ9ONTfd/KN7sWSRLyvMhXLoUPuDD5x/9LGG
+3GQzFA/OFMAhWVDNRQurv/C/ym//YE5SqznB8c7H/uLzq07sT+qByflzN/3fd2HNqgKFR4kMWgCr
+nEqPffP7F77/E6PgDlWEZ9/xV42f+sgY4pUecOJs8of39z/1pDZ2IU48yhGGVoB0gUpTV7U2ffKj
+8//kIyivBpPgZQa/+8Pe7/0w0n+hLKybmp53Jc40jXs+54okcdOLBcPjZiGfCFzz13+W++Lfy+Cq
+VZQchueef+5fvx7r6a10nQvxGeVbblj4z39frKr1QAOAb1maLhG8YdKNX0qYwx3OLZ7zWYb7fGok
+/ZV/2Y3KTtA0IgcJ6QM6Kc7KyAB7A6Eu6P164AhwlIR552mTFV2ey+7efqyhYoxoSeAkcJaop0OR
+A4ZxHkYPcEbGKHDqH/+MZ/JjnA9wPvnI0+eQOBGR+4H+D97IeJ6bfMBn3M2Oupwf3neiItIHnEK4
+/5bPjvLiFHeYx80De84snpeC0g6cBs4CL0erDqvhQegngf0yzgADH7mV54fHOHf5WPbf725D/KRM
+2lTlFAKHJH0Q6CQ4L+M00IXIAck4JtMTiPD7HuD21BDn+TznXrF34/sOB3FSRQ7Yp8hnypr5if3c
+tkzOLc49znnevySer5JLOhyLMF1iIDQA4oJAVpU1Sxo+9zGPZwtc0QM229dmHjtCfT6pJqKfvkUm
+VaP+REDmrh8cl6QKonh7Dr785a+XT0yluZc34qHN19Vdty40fw5cPrHjUOcjD9Umh5Ow+r7zs0Zp
+tvbPXwhatrH1Rv7HH+j7+X060Pmb3YmdL7l/eFN9gVhBtdL1zv7rPTRjTikIR2vqvv5ZypUCof5E
+su2vvqyd7JgAjaPc3bzC+uD1a+asxVT67IH9xf/eUXnmvEzM3K/39n3h32Z+738PU4kvuUr7xB87
+egZAlEWM/ETq8Sd85nFKAn94tdK6RIGtUYeayujMxipJLwNIEN6uw5Nnz8kFSEAX5Kjr5fKp5OO/
+rvvaIh8qQDQbCFxO9XspneS57XKPu5w7nHHOuM9ZkRfGXXfSt6c4nyz807+cluPtCHQ2LXWTx3jW
+K/oF7hYd2zQ554Vi/4c/eQxSj6rtVcPJf/xHnjxv8UKau+Nenlsef+qZ3oVrDyikG2gLN6YOvMgt
+N8M5P33yUOOcUaBPlg/e/P5RNs5z7ggv8Id/2oHYCUqP69HcPf9p8iIvmkUrN/Znf3ocGCPyTiV8
+/i//lp8/6fFcgXsWd6Z41nr6yQurNrwMpCB3hmoKj9+f4l6Rc561uJvhbo6bRb7vxbaK+jZZPR1O
+WD++j9tFbpncy/BcljHOC7br+jZ3Un/zfx2H2g9yTo88v2LpAHAA9FjrUj7Rk+JOjnOecRm/DKu/
+JPQud1zuM865z7nPTZdNcHuEW6Ocj3Ce5nzqq3f1oCKJ2Mn6hflsN/f5JOfc5aOcc59nduw6oFQM
+AWdAzt3+EZ4aSHGedrnL+UTRsjjnNs/+5KcvR8smgQFIPZ/8BM+lhxgvcnfi8Z8cAIaBvWVl/Y/+
+kPuZYma8b05rr2zsBXredyvnmSm3YDmm2XG2X1W7A+gE2m754NBUMsV9bvKCzZOubXLOmZV55pH9
+9Q3j0E5C7tr8hzyXm+I8z7nJecHnGc69U0dP64lO4Cy07C9+luY8y7nJfZvzySLnLs87RXv43Lk5
+y48B48QYv+mPBn52/wDQLtEORMaf/NkELzKf86zrcueNQ3/JBSLZjPvMAXwKAConuq8qUCNAuYcy
+QHFsj1qOVGBu0U9nQDxq5WFy4gMZd2rvyzHXtIHxgD7707cX45UyEDO5nHfLJcmdSo1QhP/k1rKr
+14wAsuxnf/MCxkbjBA5k9f1/qH9wM6BVTU4N/eM3kR0b/n9+LJ07n9I8EqmtuPNLYCGJBjRFSu16
+eYI6IRMpYOHtf1wTqTXzdo65hoRKWdUz7gSR9c0bK//gD8ZBuCzljp5B/4AOJgG6A8MH5/Dhyo6l
+EsRAAwwSEHYguy7gxTRwCkWhw9t/bV3ookCaSpGP/lH91lud1kaJ0zDM0UeeUVEkLqAQxi9jT88l
+oSeKpkiyLBJlBkoRBOI+0W1P9gGfQWHjLDfBXClII+GYSQqqzmHwoASodvrQEQOMRKAtno05raqv
+RBwQgzA1D7kYihmyDJtqFR/cxHQp68FMDaGzn3KoBYQClfPu+PtxPVqLQLzrfPdnv5D+wY9dCXbB
+r/zqX9Glq9ioG6TEZ4XJF/cRB1HQcEUt5s/zi0joAWoQH5zBRkThzOfQEiuWelArmFpIj2U6Tqmw
+AAbmgUEhcKltwclwuGCUuAZ8ADK3PTPnEZg+Uz07/fhvAo5NdXm8qUq9fp0VLJNuvqnIZcDNv7Cb
+nzoN5pkKCLmMkbJLQp/j3GeQGGQOSWac+iAMHNAoFPgSuCbrOsIaqC95RZdB0nnAIrDgwmBkYtxG
+MWtDDYegqZAIKwISc1TFprKFQBmgWb4ZizNHMRSo4NmOTpcgEEBx0lQWLq/64p/3wQmptPjo9tBg
+5xgnles21H3mT3RX5hUaAyTHoamJWiZNguVjKmLKSBCSjGDeh0Q4XBCUMVWDEprTkoOns7xB/NSF
+YeJzCkCnUMABziSH+QCKkmwyxuG73IFKDVXxCVQF2HGA7T2uModbPHzrH6ChgQLxP/5jVlVHAWVi
+NPXQM2B5RgnBZeT1l4TelohPAR/wGOC7hPnUh+x5QJ6jAOoTKlkIWCAFXyKhoBdCUaaUylAc4kck
+JSpHHA9SzoImpwESARiVXK7ByAJSzoMksZynI+i7CDswwgEPKPiuUhbOOqj8h8+Er1mddJwyIAQ7
+LJU1f+XPDaOGOnBlDMBGkTjccUGygFmm8qgKgBQZuMQBzVcw6cscGd8vKrA1TsADDqK+Bl/lnNtA
+3vUIoPhySIrqkD2mEMgEcoH6HACXHQccXt8TzwXNfDm0qGK0fuj98IjKEF6zxpjZEoQcBIaf3pnl
+JgF8diU29CQAFYACKBRQVCgSFECWTRriUxGYWWWESEhLlKuWTW2P8WwQagGRIlQezS9dlPIsxUc6
+n0VPMg7RSIXiUR9miOWgy75i85deKISyGUCPN3u1tT5AFVtFJgQPgTrjK18MGdEsQIhR8bd/69+8
+ZUpWYIAAjdCgBQLXruwFb0SwcLLTTJ6rgycRagcZxziktFXmFxVECxJ54Yihy2O6Tn09smIOTFcl
+UhEIybLhwWVsQmYB8KyS8WUme0xT2CQMj2lheYqe757csauAwpjC8g3lxuHOwuMPd/36J+d/84ua
+pkQK8qgihbpGCk/8hhBPu5y+1mWPu/oUOTkgQeNMjfrwQSWiexLVJSIDCAA+HEIb167s+a9gve8E
+Tl/IP7+bLlyYoXJChkKDBReOAolCGhr0XjzBs25IlY2mGmndHAMADM+1ix50VTZmNLCqivxwpuC4
+rTUxJkk6AB+c+44saUG9esNah8jtpLCUBsm9T6XuWZ4NxJssFXIFuG8SqSDDcCaGf7WjOpMrAJXz
+F+cWzohEdQ8AGCxAoQZolIFA1sB9V4YtBxxZleESSFTufPhBluquA1ziZHv6Or74r9SmHqxMKDiV
+zzQDKFOdsdHizx+p2Xoj9Po3ztdfdgNMYghBMwCDhzToFKriU7ngAFA85lAUFbjgkWuXu0vnZzxU
+wTnzox/TF/fWwHUpPBkRH4lhaN5Iz9//u983WAWa9lD4wNVKLD5VyAFUlgMSDfgMKlOkght1aJQx
+y4CNogzA9SUQB5iEHF21tOK6dR4DMQvnHn+qfOfRJotzDXkZKEiyjPoiG/qnuwY6jyRqKoYAZ8t1
+bqKuCCoDBmRoFDK4zLjnOrA55xNBJRMEJNgUroJcbpI//esKKycBgxq82viU7doSi4PU5S1PMbIk
+MDlmSjqcAy8X+7qLlzO5c/lD3j5EdyIPb1y1cg6qNac2qnICxYcLD5ApGJoaqj/x4cET5+LWhNLR
+cfqL/9D8+T/TtvzhVKw8LMuanT352c+HHnqBSmwMLHTzDRWf+wR8IxRUmeVDkYIabB8S8Zlra4RT
+cOoxg0H2PHCfyxpjcChgRMlf3E4PdWQLI8Wxoe4//cuWv/48+fPNTlR1orFcX2fqmw94P3qg0XWP
+FscrV1xT+2d/a0MnJmRACjDIMMFsZnHCFI646xoiPfQhSTA40i++nD/aoXGaAiNbtyy47XbND0yV
+K2VFi6tSNZHZi8dT//JPisG9dLbnoWcXfG0D3vDYzmVDz0PIIi9B94kbIJTLJM8KaWRCFCqo4vuU
+OxJXC4pW97EP+b2j7d++s9Kj9vHj45/7cvB788Iz6k2P731p38LxUR900Gfy6jXNd/wdYi2TkzwY
+A5U8+K7rUSYTT/VN1TVVrjCScGWZqSASk1wXkDyEJcDlids+Vjg9nL37O425dGqoq/Ofv4Inf2gt
+namloB86WxjqDnueAaQXLwx//19HmxqrHIjunw/GfY9IalAOlKvRPEzDQsTzATBqcVnC6ET/j39R
+yWUPNF9e2fqxP9Vu/CPCqEVhgRXhRKFK9S1lP/y5OXJKA8Yffwaf+0vMbHy7oCc+C0hQIFd5mm9T
+E5R7YYMHXED1PFBGHAeKCtBCsLLxrz6jBOze7z00Y2yk1iEDBw/2HTwY0NRK5iigyUDQ27By1d9+
+ia+8ehhKrU6LPqgC6joKNRTIsGjMUk0TIegZn4S4DEa4RhlYgFNZtAMzUvPXvtQVlgb+4754JhWw
+cqFDJwuHTuZkKer5EjAUUNHcuuo//jeWb4APUEAHCFz4ASornOazTtoqhkEVyCzvcCCvewY8HDil
+P7W/AnIadsXcWTVr15ogMBEKQAfRoTuWidbqxE1r+v7rVAUldb1Jc8czgT//67cLejhM1RVYcOLV
+gw0zc57U1NzqZBRaDlBAYsxQqI+AhzyR7Yamun/4t/I5a3NPbz+8Z5czQcq4krFzgfJ4++KFi6++
+PviZD6N6lu/LsgQwMFZ0QRWigsoAiq6stc6fHFULTK9umZHhLMIBxmXqyZLKOIgOySEekRq+8L8a
+Vq8evv/Rk79+NubbiYKTtUxe32STwII//Sj71B+NN85QMrloNCzKTcpBuQdXYpSP6LK3ZPFU33B5
+oszXy8MeICuYnCwc7eSqdipRGeRS6IZrYWiyxyklAdeHYlvUyBpUg2tuXp89csQ3ncgk73nxwFVv
+GPrLnsOxAB3I2tD5KE+fdyPloT7LXrDEBwwOk2VcSeeuFOUyJIxLKGPwGJflCTaSJHvOyR1D2Wo1
+v76+rnYRIpVcCk4BMRfE9bNGIcJcxsqpjzzBhAoDqDx9DAnuQ3XVmlw8Ue4DrOjIRPcCBbhQHA9O
+lBtwFa5S1y2o2Uxx7wHSPUAjOps1M7BydYGqCBiKDxWMORmqRziRCAeICVPJabJJ7cojh6xZ9frU
+VCbeogciDBaTiTeYjAamXK1eGcq5LfGcFNaZrFFIjlNQC8F8GQKAbSHgoXPYDNIApBRy5fUL3y7o
+35MrJW/v/2b7nryOvAf9uybvQf+uyXvQv2vyHvTvmvy/oSACyc65d9IAAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_trabant" model="fleet.vehicle.model.brand">
+      	<field name="name">Trabant</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAw2ElEQVR4nO19eZBc1XX+fVu/tV/v
+6+wzkkaIRUhCVoQsGCEgYAIyuLAJAYNZTEEoYeIiToyTSoVA2TiUHYJDDDHEgFliYxFiGSxUICSQ
+sEBIAiFGaJ2RZqZnNNPd0/tb7++PT/1ojRAwg0AkP26punpa3a/vO/fcs3z3O6cZSin5YhyPwR7v
+Cfz/O74Q/XEbX4j+uI0vRH/cxheiP27jC9Eft/GF6I/b4I/3BCYOl5osA4VgKaWUMizLEkIcx2EY
+hmEYQghyEbzuujallKmPhiuxhBDbtnmexxsIIa7rsizrpTKHv/+zHsdN9J44JgyGYRzXcV2XIRzH
+cSzLOo7jOI4gCJRS13VJXWS2bVNKOY7xPuhd2XEcy3JEUcTyGIbB8zwhBMvwkXP4bAZzvLLZo30v
+JRallFLKMjwhhNJDonFdl2EYlmU9xcdwHIvneZZlXdd1HIcQwnEcx3HQesdxOI6DsuMKjd97xEb5
+TMfnwuActgzMIbE6rkMIYRiO4zgICI/YBAzDcBzH8zylDgTquq6nxY7j2LbBsizLsoQwhLiO41BK
+OY4j5NDKectwvKR//LV+whOWO6S8POcjhNj2oT9hOqCnjbrPMJQQAsnCqhBCDMPw+Xx4ERJvsC3v
+RxYf5CE+u3HctL5Bdoctv6eJruvatu041OfzcRxnmmYmk9m7d++BAwfGx8dN07Qsy7ZtQeA0TdN1
+XdO0SCTS1NSUTCYlSarWyj6fj2c5l7qUuq7rCLzAEMZ1j5u2TRjH2eBMkDshhFLKsizLsLWauXv3
+7g0b/rhx48b+/v7du3fbtg3XCq2HRlerZUVRBEEwTZMQEggEotGopmmnzjll9uzZCxcujMfjPsGH
+i1u2xbHi8Q1svHH8VQATgBwJIbZTW7169YoVKza9sTmbzZqmbVmW4ziu68KdWpZVq9Vc1xUEQRRF
+17XhSG3b5jhOFEVCiGmaHM8IghAKhdLp9NKlS5csWXLqqadKouS6hxkc8n/P1lPqHPoChimVSqIo
+CoIA94hgg2V5SmmhUAgEAoSQbDa7c+fOJ5544tlnny2VSq7rchxn2zYhRBAEhmFs27Ysy3VdSZLK
+5XIsFqtUKrBLhmEIguDz+UzTLJfLLMuGQiHDMDiOK5VKsVhsfHzc7/e3trZ+4xvfuOSSS+LxuCAI
+g4OD8Xgc7gFLy3EcqTsAxEue8yCfwgp9KqKnlBLi4rlt24IgEEIgC0TW1WqVZXlBEDiOK5fLv/3t
+b3/xi1/s3r17fHy8WCz6/X5FUbxMyjRN27ZlWYbb9Pl8+XxekiSsqCzLtm1Xq1WGYVRVlSTJdd1K
+pSIIAtapVCp5ExNFURTFnp6e73znO6eeeirP88ViEREUwzCiKCJSgsQRjL4vqf91orcsi+f5Wq0m
+iiK8Zf1dbC6X++///u/HHnts9+7dlUrFNE1d11VVzefzpVJJlmWfz1culwkh0FyWZaHghJBQKFSp
+VPCKoijwAeVyuVarhUIhWZZHR0cFQeB53u/39/X1dXd3Dw8P27bt9/sLhUI8Hv+TP/mT5cuXz549
+GzaqWq1KksQwDHYAUgHkcYck9fkXff2CLp7btg0L4/P5bNtGPJ7P5//nf1Y++eSTO3fuzOVy0GI4
+T9M0A4GAKIqmadZqNdu2IYiWlpZwOGxZFsuysVhs9uzZqqoie7JtO5PJ1Gq1gwcP9vf327ZdKpUM
+w8hkMsFgkGGYarWqKIplWXiOKwwPD6dSqUsuueS6665ra2uDI8HGwupC+u9L6vMsei9AJw22Hvu3
+UqnYtq0oCs/zb7/99jPPPPPznz84ODjIsqwkSZFIxHGc0dHRlpYWhmEGBgYcxwkEAizL6ro+a9as
+rq6uv/iLv5g+fbqiKJ7ZIfVkldQDeYQ9w8PDW7dufeedd9544429e/fu27cPVgV4jiRJhmGwLGua
+ZigUGhoamjVr1pVXXnnttdeGQiGGYWq1GsuyPp+PUmqaJr6IfJ5Ff3ho/r7BIYRAbX0+X61We/75
+5x988MH169dblsOybCAQKBQKpmmGw+FqtZrP51mWjUajp5xyyowZM9ra2hYuXDh//nxRFEulkqZp
+CIRM02QYxtNTnudN00SKwLIsz/OeP9+/f//GjRsff/zx/fv39/b2mqYZDAbHx8dlWa5UKn6/v1ar
+YastX7582bJlixYtIoTYto3LIhc7JKn/daKHweF5vr+//7nnnvuP//iPN9540+9XdT1Yq9XgA1iW
+LRQKfr//hBNOWLhw4YwZM84555y2tjZCiGmaMEQcxzmO42k3gkuYI1LHbeoOnBVFsVKp+Hw+mA5C
+yNtvv71u3brf/OY3mzZtwnyKxWJTU1OpVKpUKhzHjY+PL1u27Oqrr160aFEsFiNHpHvHPgalx2i4
+7qF/zqFh4Z/r2oZR3bbtrWuv/ZYsi4QQVZW7ujpisVg4HNZ1HVHKV7/61d/97ndbt271LmgYRq1W
+857D+8Gdwg3Ar3rv92ADOBg8FgoFWod3LMvq7++/8847zzzzzGQyybJsMBj0+/3xeDyZTOq6rijK
+7Nmzf/zjHx84cAAXNE3TrY9jJShvfFLRezNzHAf3aVlWtVqllFarVcMwKKWbN2++8MIL0+k0wzCh
+UCgQCODR7/cLgrBkyZKHH3549+7dEy44YdRX1JkgiCP/xNsOIceW4bo2pY5lGZZlUOrYttnbu/1f
+/uUnnZ3tPh8vigLmomlaIpFgGKajo+Pv//7vx8bGcC+UUmRwlFIvnW6c2JRFd8xEj+gbQqeUVioV
+qOHvfve7888/nxCSSCSampp0XW9ubkbkcNJJJy1fvvz111/HdQzDMAzjQ0T/ce624c02pY7r2rZt
+Oo5FqYM/XdfGXnzjjY3XXXdNIhHjOCadTkajUUBAhJBkMnnLLbf09/dTSj01opRiq1Wr1c+X6G3b
+rlQqlFIAW5RS27b37t27ePFihmFisVgkEonFYqFQSNM0VVWvuOKK559/vlAouK4LqIAebjQ+8Is+
+/pQga8exbNu0bRNCN81apVKi1MFjJjN4990/jMUiuq4lEglRFIPBYDAYDAQCsiwvX758cHCQUlos
+FimltVoNmxi76fMlekqpaZqmaUJHdu3adfnll/v9fkmS2traBEEIh8M+ny8QCNx999379u3DFbBX
+EKJ8iOgnO6tarVKrVaD7jmMZRhXGB8uAx1Wrnr/wwgsEgUulEpFIpK2tze/3t7W1NTc3A/+59dZb
+S6VSqVSih6v/MfEBx0z0rutCOzCbkZGRW2+9NZVKJRKJQCCgqmo8HmdZtru7+7777sPONU0TH6GU
+2raN+/mE8/FmBfMC3bdts9HgVCqlhx/+xZe+dNq0aZ2BgF9V5ebmtCAIuq7LshyLxVRVDQQC0JXv
+fe97iIJw5Wq1OsHcT3mSx0z01WrVsqyRkRFKqWEY3//+94PBoKIokiSlUqlQKKTrekdHx6OPPkop
+tSwLm5dSappmpVKp1WqTVfmj3TleL5UKplmD3Gu1CkR/8ODwP//z3YsXL2pvb43FItFoWJJ8zc1p
+nmc7OztVVY1EIpFIJJlMIvKRZVlRlP/8z/9sVHnM/JOL/pjh9ZIkWZYVjUaz2eyqVateeumlQqHQ
+0dGxf/9+TDcej995552XXXZZrVYDjgZUQBAEQCUI0pGdHjkaw2racLA1IdymdQhaVVXYMVVVWZZ9
+5513Hn/88SeffFKSpIGBgUqlommaIAiSJNm2rapqrVYjhACEwEcAZpim+dBDD7W2tn75y1/G3ARB
+ADD1SUU25UVrVDHXdSuVCp6sW7duwYIFhJD29naO47q6ugghJ5988i9/+UtKqeeKPX2p1WredqZH
+Dy4nvOFDYk28XqtVDKPqONa7777zgx98/6STZkWj4UQipihSJBLSda29vTUQ8Mfj0VAoIAhcKpVS
+VTWRSJx66qnBYDAcDkciEU3TotFoIBA47bTTstksPULlP1OtdxwLiw/8hGGIZVnQXEJILpd78MEH
+C4WCruuu6/p8vmw2GwqFrrrqqssuu4wQAkiE1nVzwivkQ5NG3DPHcZVKxQNzGIZyHGfbFraRIAgM
+Q0qlEqXMSy+99Mwzz7z44ou5XI7jOIBoquoHpp/PFwzDcl0iyzLPmzzPz549+4orrgiHw7/4xS9W
+r16dSqU8KW/duvVv/uZv7r33XlEUJ5wVT1aAh93PpEaj7zKMqmFUTbNm24dOSu++++7u7m5N0zRN
+CwQCUJy77rprdHSUUoq060jF+fhKVKlUELlSSutxkVMo5KvVMmZVLhe3b9/21FNPLFiwIJlMAhCG
+4Q6FQk1NTZhbMBjEYzwenz59+rJly1577bVcLocrr127dv78+SzLptNpVVXT6TQhRNf1VatW0Xoc
+0ZhnTE33p2BwDosckK3Ytum67rZt2+bPny/LsizL0WgUTxYsWLBjxw5a91GY8RSCSEjcSxqA79u2
+XS4XMZlcbmznzh0//OFdc+bMlmVRlmVBEFKpVCqVikQiiHEjkUhnZ6ckSbquh8PhOXPm3H777WvX
+rqUNKSus3/33368oiq7rOGLEsp1zzjnAGMrlMjJbz+hNXoxTcrM4T6gzjQh2n23bTz/99J49ewgh
+AN9FUdR1/cYbb+zs7PT2JnhkU9ingHk9CJdSKghCqVTSNGXnzp179uxZt27dCy+8sHHjG7quMQzj
+9+uN8bh3rpvJZAKBwPz587/0pS8tXLjwjDPOAKTKMAxOKzG3iy66aOvWrQ899FAgEMjn86qqlsvl
+LVu2PProo7fddhsOZzxpTEGGh+5hkuOwSLlaLeP5hg0bcOKTTCZjsRgiy5tvvrlUKtVBFeplvFMY
+ruuWy2XLspB8QeV7e3vvv/9n11xzdSgUIISk08lAwJ9IxASBa2lpURQlkUjouh4MBsEW0TTt4osv
+/vWvfz04OIjdA5AOmarjOEg4DMOwLGv79u2tra3RaFQURWSCgUBgyZIlABgsy4KN/ey0vlHfXddl
+WRZo7e9///sDBw44jqMoSi6Xc103FApdffXVqqri/FoQBJZlccTquq4H537MwTCMoiieuuzYsWPl
+ypWrV69+8803crk8pSSRiAGWCIfDw8MHEbZyHIcz4VQqdd5555177rknnngigi5cx7IsVVVxikII
+MU3TY2fOmDHjsssu++lPf6rrumma0Wg0k8ns2rVr9erVV1555TFgM0x2raDjMPee7m/fvq2npyca
+jSIrEQQhFot997vfpXX8FgPoh6cpkxq4QrVafemll/7yL/9y7ty5fr8/GAwSQpAcNTWlAgF/LBZJ
+JuOdne3xeJwQIknSzJkz77jjjldeeeXgwYO4jgd1eLi0YRi2bcP/g2yC9+zbt2/69OnxeLy5uZnj
+uHg87vP5li5dOjo6enzcrGnWarWK41iIK4rF8Qcf/LmiKLA2iqIoitLV1fXWW2+5dcQRVoLWvSX9
+GODwhFGpVH71q199+9vfXrBgAdL9QCAQi8Ug63g8Go2GeZ5Np5MMQ6CLPT09jzzyyIYNGzwr56G+
+SKG95cR/QS0wQw+CvfPOOxVFCYVCra2tDMO0trbquv7cc89NWeLemLTokZ0jYcHzAwf6r7nmahx6
+dHZ2plIphmG++93vQncmfLxRuSilwA/gDymlAI29GAZPCoXCo48++rWvfe2UU07RNA0smkAggNS/
+qalJkiRVVVOplK7rhJB0On3VVVc9/fTTO3fu9L4XYj3ydiasum3btm1almE7Ncc1HNfYvXt3d3e3
+ruuSJHV3d7Ms29nZefnll9N6evWZRjiwcT6fz7IsQsiePXvWr18P+5jJZHiej0aj5557Loy7hwbD
++HpMVWRAOO2TJIlSCjtrmib4HbIs9/f333///VDbPXv2jI2NhUKhQqEgiiK4G+VyWZZlURQZhhka
+GuJ5/vrrr7/ppptisRhWCNsF4VZjWQQ5gnpG38ckGM8SQ81PPPHEYrFYLpeHhoba2toGBweHhoZ2
+7drV0dGB1fJiNjoZwv4URe/xkwghW7Zs6e19L5VKkfqB8plnnrlw4cJarSbLMhyyNyccqxJCTNPE
+eriuW6lUdF2nlIKNJIriW2+99cQTT2zcuHHPnj3ZbLZQKCSTyUgkkkgk+vv7VVWNxWLbt2+fMWNG
+pVLJ5XItLS1/93d/d9FFF4VCIVVVfT4fZgjGA8/zCIhxXE7qXM8jGU7e6zAHruvyvO/2228/77zz
+KKXBYHB4eJhhmN7e3g0bNkybNs2TBq1Xtnx8GU5a9Pgaj5U3Pj7++uuvcxzj8/kKhQLLstlstqen
+Bxxr3DB47hPwL5z3g1gA7hGSg1WrVv3mN7957rnnwCAzTdPv9ycSiX379oHIVy6XE4nE/v37JUna
+u3dvOp1+4oknlixZwnGc3+9HfJLNZkE04zgOoZTH2nTrBQ5HSt9bA9pAA61Wq3Pnzp0+ffqbb74J
+PkuxWCSEvPzyy3/+53+OuyCEuEcH/o6x6GFJRFHcsWPHa6+9Bi6Ybds+n6+5ufncc89FBo9KGo9P
+4A2e55HjgLwnimIul3vkkUcee+yxXbt2gUwQiUQAydVqtXK53NLS0t/fj4Usl8sMw5x88sk33XTT
+VVddBTYHsq1yuSxJUjAYxH4yDIMQgjU4nJX/cdUTBMKzzz67t7d3dHS0qakJ+7W3tzeTyTQ1NXnM
+xklLcrIf8JQCd7Jz586dO3eDpiFJ0vj4+AknnIDME1beI3B5nwIfr1qtEkI0TRseHv7xj3/8la98
+5fvf/35fXx8Cc47jcrlctVqF1Hieh4IPDAyceOKJoii6rtvd3f3Nb37TQyawQh55Bk4Vq87Ua9ho
+QxkJbYDwGkejM/DYPmeccYbrus3NzXv37o3FYrlczrbtgYEBj2sOlYfz+5hj0lqP+4Hmlkqld955
+hxBi27Ztu/A255xzTjQaRdoFTiQorrSBMoZ4Y9OmTatXr37ggQf27NmTTCYR6iDbchwHyReO14PB
+YEtLi+u60Wh0eHh4eHi4u7t74cKFLMvWajWQ2lzXVVWV1MvYkOvBMCJScus08Qn3Qg+nEB3iETGH
+FAXx6Jw5czRNE0URSqMoyvj4+Pbt2xcsWDBlNvKkRe820K/Hxsb279+vKJIgCOFwYHh42LKsZDIZ
+CASq1aosy4QQ3C2OQcBsGRsbKxaL995776pVq3K5XC6X8/v9gUAgk8mk02nEOd6hlSzLyG5yuVw6
+nR4dHZ07d+7o6KjP58tkMq7ryrIMIh8sA0SM53VRkkaDQBuOWcjhOg79qMc278uR53lBEBYtWvTU
+U0+lUqlCoeDz+Xbt2rV161a3jmJCzyZ1fvIRb23UCEyFZXnHcXneZ1mWIIivv76JYTjXJQjhwSDz
+Poh1wgclSapWqytXrnzkkUdeffVVSilOqZLJZLVaLZfLwWCwWq3CtSK5FwQBYRLDMCDspVKpN998
+s6mpadeuXQMDA6VSCfkEMiB8F868vMJBiANuA2nU8PAw9pOu6+AcpFIpTdMAMJTLNVVVLcuC4eJ5
+znVdsGV1Xa9Wqzj/kiQJSDjDUEHgXGoTwtJ6SMoQpm7Mj2rSJ631TL1cD0AgypoAlTAM097ejjAR
+iuaFkq7rVqvVp5566t///d//+Mc/+v1+WC1wHxmGwSPQMXwQUvP5fHDUxWJRFMXx8fGurq6BgYFw
+OPz6668//vjj559/fltbmyzLlmWNjY0VCgWcsGezWVyqVCpZljU6Ojo6OprNZsfGxoaHh/v6+kzT
+zOfzhJBardba2rps2bLzzjuvu7u7ubkZQKaHldq2LYritGnTXnjhBW+vsCw7Ojo6PDwcj0cRerjE
+/XQNDgawX8zeczIsy7a3t0MKSI4gdByBrlu37p577nn33XdBoq9Wq4CldF0fHR2NRCLFYtHn8yFT
+o3VoEGkXz/OKooCgWiwWNU3LZrMHDx688847N2/ePH36dL/fPz4+nslkMpkM0uC+vj6c1A8ODiL/
+wIp6eUYkEgGj2DCMsbGxe+65Z82aNYsWLbrttttAhIICeft+/vz5P//5z72AGMc+uVwuHo96F3fd
+SUh/KqJHZEkI8fiqcIzQDlqv6eY4DoJjWXZsbOyxxx7btm2boijNzc2Dg4MI0lVVzWazgUAgl8th
+zXBviMcbAySQUj01jMfj2Ww2m80+8MAD3qywF1FbUiwWeZ4HXIw0DfES0DFZlvHtyIeRP2/ZsmXX
+rl3d3d3XX389/JMXC9m23dnZCe8N1+K6Lhw4LBuMzKSi+0kHl54BdV23VCqZpgmfBg3F5JBPcRzn
+ZZW7du169tlnQ6EQipig1zi51XW9VqtpmgZDD+TH4xg1KpEkSeFwuFgsgpksSZIgCOl02u/3g8EB
+jhsY4YqiwEx5bsAwjGKxiC2I7QVTBm0FRmaa5saNG7Hk2H8olrMsC1USoDcj5DUMo1AoNMZIR4aq
+x1L0pB6TgTeBqAC2xefzybKMIyrkMrAbhBCWZTOZDGp0cPM8z9u2HQgEyuVyJBIpl8ugz6OQyqu9
+b6TME0JwqzBoONyAr8apd6FQ8Ch52DfQd69DhSAIgO8LhYIsy9gHjuNomobtwnHc7t278/k87ghB
+mhf8QLLQG5Zli8XiyMgIIeRQJuHYjZHrR46pZLNeuw2IFYqJfQeiACHEg3/hTgOBAMrPcGBbrVax
+32u1miAIHmOAYZhsNguvBV3D1wmCoChKuVzWdT2Xy7W1tQ0PD6MqCjYN6BjyKcMwYE/gb7BBUQ2B
+j0BAyKgNw8D3AkY2DEPTNFwK5SUQN8A+xPiWZSEoQB7XqJGTwhKmYushekSypB65w+BQSlF4BkgS
+SQ3Y3k1NTY7j5HK5QqHQ3NwMiEaSJITJsLaGYQSDQUpprVaDyCBTWZbHxsbgGNra2vr6+oLBYLFY
+DAQCxWLRsizwy3Vdt23bq2SDO8HZFtxSpVIBsQlrHAqF8vl8MBgEEOIVPVcqlWg0iiDNI32oqgo8
+FbePS0mSRAixLIvliFdI/THF+BEbhGkYeMWyLMye5/lEIgEpozDVtu18Pt/YqABxnizLiURi8eLF
+/f39ruuGQqFsNouwcv/+/bIs53K5eDyez+dRzgEiJssSjmNqRqlmlIZHBiSZL1fGVU0cHDwQi0Xg
+S0D4EQQhGAyqqmoYhrdUmUwml8upqorzbu9wHOF8KpViWRbheSKR2L179+joiKrKlUppzpzZ6XSS
+ENc0ayjrhOoMDg6Wy2Uw0bEz6kA0y3ECoTxDBMdmGCIQylOK1iQfJt5Ja71X1wsXDxGDC4eyGC+B
+9Hbf2NhYPB6/4447yuXy008/TSlVFAXBJYw4z/OiKKqqOj4+ThryTLh0SZIURRkZGQ2FApVKpVo1
+HGdM14MIcAuFAkwWgitcllIaCoUIIeVyWVVVEFdBnKKUjo6OwjDWarV4PP7uu+8mk0nLMjKZzNy5
+c2fPng3tkWUZaa2iKKZpDg8PAztKJBKwYAh1gJPD3E/KzU7F1rv19idQN4gegshkMqDKNFq9cDhc
+KBRaW1vvuOMOWZZXr15tWVZzc/PAwMD06dM3b948e/bsd955p7m5GbywcDgci8WSybjf7w9Hgkg1
+m5ubEcmcfNLsgYGBF19c86tf/WrLli3RaLRYLOKREOL3+/v7+zVNI/VgDOYYMT74Mzg5yeVy3d3d
+O3bsiMfjlUrFNGuGYeq6vmjRIkop1gl7HZnEpk2bkLHn83nbtkHRaWlpgb31xPIpip7UO6DAa7W1
+tfX29iJqJoSMjY1hDZwG/j/P8zi6a21tffTRR23bfuyxx3K5HJL7v/3bvwVXiWXZ6dOnw7MpiiII
+nGVZlDhoLmE7Ns/xlFDTsFOpFGotv/Wtb42MjASDwVqthkL9UqkUjUaRecA/QyVx/I00VRCEAwcO
+tLe379y5M5VKAQ9oakrNnj37rrvuwrKpqoocAkFXrVYbGRlJJpODg4Pt7e1DQ0Meso0kBqOx4vDY
+ix7fhC0JdH7r1q2apsEr5vP5oaGhmTNnehEe7AAKASVJQthw9dVXYwknHKGQBmIlIS7P8457qCcR
+z/GVagXxoqZphLA9PT3f+MY3Hn74YUEQgCYi0nccp1wuh8NhlmUHBgbS6XQmk0kkEmNjY5IkaZo2
+Ojrqvbh///7p06erqnrhhRdcfvnlYGtls9lwOFzPDVmY9T179gBYzeVyDMMYhhGJRECJwI3A/X78
+bHbScT1CKGSqLMs2NzeThlMny7J27NjhFWwiePfAAO+4jhzCmW1EdXAbgLcwdY8z4jn5mlGTZVng
+BfCT4D/OO+888MU8uBg+H3jcwYMHI5HIyMhIIpHIZDK6rjuOs2/fvkgkMjg4GAwGx8bGLrnkkptv
+vvmll176x3/8x46ODkEQxsbGwuEwIQSmnBACk9XX1zc+Pt7c3FwqlZDHnXDCCaFQCNaGTL6d1xSJ
+fxCWpmkzZsxAjuNlub29vZZlSZLkHUghvSL1Ize8DpzA4wHi4wgEgSW4rk2OyA+h+KgAcRxncHBw
+fHy8o6NjZGTE7/dXq9XBwcF0Ou04ztDQUCQSyWazHR0d+/btC4fDCHgg966urubm5ptvvnnZsmWO
+40iSVK0eQhQikQhMDUJVx6GSJD3//POATLLZrCRJ6CyAIwRYee8k8lM0OEz9fJkQAkYGsBewuovF
+4ttvv4297AXUCH6delG9l/J5MLoHfXirxbIsura49XMlBLWu6yqqZBiGzyfl8/k333wTETreo2ma
+oij5fL5arcJAcxw3ODioadr4+Dh6MzQ1NV100UWnnXba1VdfjRnCeniwASHE5/NVKhXsY9d1LMta
+u3ataZqapiGBME2zpaUF5ageZjUpHzsV0RNCYNFg3To6OpqamoaGhvL5LMMwgYB/y5Y3BwcPNDen
+S6WCpmmwJMj1J1zHy4o9fgOOcPGnbbscx3HsoZxW9MmuQzj2EITS2/vuU0899fzzv8eWB/W1VqvF
+YjFUiSAdg/+H6Uin00uWLDn//POXLl2KLAQrjeyP5VyWYxlCUOfuE3k4eZ732bYNkj76S2GnBoPB
+JUuW4C6gE5NCEaYies+hw1LHYrGTTjpp586d0WiY47iRkYO67n/mmWdOPfVUTdOQfUz4OD2cN+Fd
+ELoP94DEB6F3PVfy4ayxUChs27btZz/72XPPPUcI4XkfIQRsTr/fDx0MhUK1Wm10dBSgwumnn372
+2WcvXLhw3rx5MGtAQQDvkDrW5MnOO3JiGIbnhDVr1tA6WwukhIMHD1544YVIqSYr8amLHnYZHpXj
+uEQi8eUvf3nFihXgLyaTiWKxuG3btnw+DySE1PEmHMw2ThT/680ea4CzVnQU8ngMoihS6nAc9+qr
+rz799NO///3vYdNHRkY84LdUKgEOE0Vx//79juPMnDmzp6fn9NNPnzt37rRp0xrbvJbLZa7etgue
+nxLKkEP0G4YwLn0/ZHzxxRd37tyJzd3W1pbNZpubm5cuXQpD6sF8k1X8qWSzMPS0ft4/b968dDpd
+qZQQWfM8v2bNms2bN5911lkQd6OpcevtWT2t955AYRVFQRMQQohHjdq7d+8rr6x96qmn+vr6MpnM
+6GhW05TR0VFCCIwvGuD4/f7h4WGe5+fNm3fxxRfPmzdv/vz5aPBF6xwFfBdAY0KIFyA4NuV5jlDK
+MozjOJblICHPZDKvvvqqYRho2VIul8fHxxcuXLhw4UJSz9rcw/v1flqipw3kIWQQnZ2dS5cuXbHi
+aXhI4Lo//elP/+zP/qxSqXCcAGNK6n2JMUsYei/8x+zhw736BUVRBgYGHnvssVdeeWX//r5cLtff
+fyAWi7S3twIXo5QWCiU42PHx8UqlMm/evOuuu+7000/v6Ojw+/2kTn6CYiKa8sIEQgjYV41nMoQQ
+wNGiKNq2vWLFim3btjU3N/f393d0dPT19SWTyblz57a2tgKdPTI1mYQoJzU84BRkT8MwKpXKk08+
+Kcuiokh+v9rS0hQI+MPh4H/915OUOsC+aUN9O67TSDn2Cha8r6CUDg0N/dM//dOiRYtmzpwpiiIS
+g1QqEY9H/X41HA4SQnRdw9mIrusXX3zxmjVrwBLErMAu8TjDTp39iYMq5AceiaHxHr3inj179vT0
+9AChBEKnKIp3SIsjHdpQXTUpSU6hjM1166RcMJ8opTt37jzrrB6OY4JBXVXlSCQkisI55ywtFse9
+VolAMQ3D8Oqh3HpRlV3v5oeaiDVr1tx2221nnXUWqs7S6XRbW1s4HIxGw5qm+P2qokhNTanOzvZU
+KuH3+6+77rpXXnmlWq2CAXekKOnhK914L55CYJ7efCil+Xz+vvvumzlzZnt7O8MwJ510EiGko6Pj
+kksuASN6Qrn+py56b2DSHqJ044038DxLCOnsbGcYMn16VygUuOeeH7uuC6AcJTiQO+65XC4XCgXc
+sGEYuVxu06ZN3/72t2fOnNnS0gKWB0pqeJ4Ph4OxWCQY1MPhYDCo8zyr69q1135r79693jU9oAay
+s+odMT319Dhxbr2pQ+OqYCC+chxn7dq1p512Gk6ek8kkwzDxeDwcDt9///2N3+JJ/wNJ5MdS9ND3
+xuIQvPKHP/xh1qxZsiw3NTXJspxOp3Vd7+npWb/+FdSfVKvlYnEcNfOmWbOdmmlVXGpadrVaK/5h
+1cplX72ga1obkAkEzl1dXRzHhcPhWbNmtbe3o3sRy7Jz58694447+vr6KKXeNvLidOcQTf6wCr+j
+6SYWBi+isRFOPfft23fppZfiRlKplKIoKERdtGgRmhFMuPKR++wjx9T59Y2ughBy7rnnLl68+L33
+3svlcqFQKJPJxGKxd9999/HHH29paWlubqaUggNrWRbDMBzLEkL6+/v37NnzwAMPPPvss7quj4+P
+GzVn5syZLMv29va6rhuNRl3Xfffddwkhra2tZ511Vk9PzwUXXBCJROAPaQMB1CMQeK8c6dg8d+o5
+dsTvCGqRjhFCVq5cuX79epx5ATLBOVpPT08sFvNKrj7JmCKG490JbYioLrjgApCzHceJx+OAsV5+
++eXzzjsvGo2i2ye4roVCoVga37Bhw3333bd582ZZlpF/yrIcCesgcLe2tubzecBk8+bNa2lp+drX
+vnbRRRcpigIQGHGRx7VqDFjp0eM8ehSaMcADrMTq1asBa4fDYdu2kcQ4jtPV1XXNNddMFpc/6piC
+wfF2Lmy9t9kppbfeeqvf7/f7/aIoNjc3a5qmqvLSpUuefPJxFLxls6Nvv731X//1X047bW4sFkEl
+lK5rPM9yHBMOByORCLB7nudRVXzttdeuXLnSs6RePZBnyj9ws7tHGd51vNjGq2oDLXD79u1oWwWs
+DfYd3XJQ3OxFSp+1wfGUawJGigj3lltuGR4efuGFFwCq8DzPMNy6desCgUBra2sul1u9evXGjRs3
+bdoEGBnHUiAcIDmklAHEOH/+/AULFnz961+fNWsWIn1g0ZRS+EzAAF6ETg4n+h4t1mYOr1zwOEWw
+k/39/f/2b//2yiuvcByHvMF1XezjK664YvHixaOjo4FAwCv2/ERjsmvlLa97RLUfSIDr168/7bTT
+AoGApmlNTU2xWCQQ8Ou6dtJJs9rbW/HTIolEDB1/0uk0qv+6urpwJs6y7AUXXHDvvfd6RWjwe17/
+HLuh7tnLBj5c+yb8L554FApaV+RcLve9730P55HhcDgej+u6nkgkOI5bsmTJvn374NK9jgOfUOun
+GFxO+DLXddGMDdHCk08+KctyS0uLqqqqKre0NKmqLEk+TVPC4WD9UUM5IB6h11ddddWjjz6K0IXW
+m45RSoEWeC0EKaUfWJ744bP1RmOegTeUy+XR0dEf/OAHLS0tkiRFo9FkMhmNRhHgTp8+fdWqVV4j
+GY9n97kQPSbkOA70sVAo3HjjjYSQVCqVTMYh7ng8qutaPB7Fk0QiAYVSFKWlpeXss89+6KGH9u3b
+B5DZqndspHWVxJ9uQwluY5joxZTOER1yaIPokUB4CR1SjUqlMjg4+Nd//dcoyAd7sK2tTVXVYDCY
+SqXQyQeEH6veJeO4if7IASWC76WU9vf3X3/99YQQWJ5YLBYMhjVNj8fSsWjKr4VEUQyHw9Fo9NJL
+L3322Wd37dpFG4ppcWKOK+Oanln7SKviveJlp94MHef9flyWZVQqJdOsbdr0+rJlFyqKEovFRFFM
+p9OKoqD9aSQS+eUvf+l1aqMN0PEnl9gxEz2l1DRNdJCABHt7e6+88kq/36/relNTUyyW0DQ9HIoH
+A1FF1v1+/1VXXbVhw4a+vj673gLda/1H6+X0jebY+aBWl15wNWFMeI9VrwSH3IeGBih1DKP6xBO/
+OvPMxT4fj2AGP3uCjgPRaPSuu+5C86dqter1+vPgk084jpnovdJpx3Fg9ymlu3btQjWhqqp+f0AQ
+xIAekSV/JJzgef7rX/86rHk2m/UQK1wKhBl6qG1ibUJXzwlineB1vD89l9g40OOVUqe3d/sPf3hX
+a2szw5BYLCKKItwPMANd13/yk594cwAo7U6pk8/RxrHUeiggtidIA5TS/fv3n3766ZIkJRKpaDQe
+j6XDoXhba5eiKNFo9Ktf/eqvf/1rfLxYLOJXG7wLNjpS9+jDe4/T0P6i8YO1Ws2z70A1Vq78n7PO
+6pk5cwbPs7NmzWQY0t7eDvaVqqrt7e233377wMAAfb/XFG1U9o/v4T9kHEvRw8e6De1G8cqOHTtO
+P/10QthUqkn0qQwRFFmPRqPoozpjxoybbrrp5ZdfpvUOHciVvA6MzuFtnT2HOcEEeSle3abbYA7T
+BoNjmuarr6679NKvxeNRhiGCwIVCgXA4mE4ngdKEQqFIJPKjH/0IgbIHhdJ6kxw8/3zZ+sbZeM1O
+YEaKxeKBAwduvnm5IIihYKy1pTOdahVFMZVKoUQ2Go12dHQsX768t7cXBgTgCfY4rjkhh/AAMrgW
+YJMeD9tDoRuTgM2bN99+++0nn3wizhVmzZrZ2trM82xLS5MoCq2trbIsz5gxA/EMvhGidxuw5WMl
+LnoMRY9peTYaBz1OveuHaZpDQ8PLl39HErV4LC1L/qamJlVVVVUNh8OpVAr9hLEDnn/++Wq16oWq
+uOwHStxznp7csWNQuoai54MHDz700ENnn312a2trW1tbJBIihCiKxLKku3u6rmsMQ0KhQEdHxze/
++c333nuP1tFQpA5Wvd8yrfe8nuBdpjyO2U8HQDSNP0iCWh9UgNi2bVmOosgrfvvsP/zDP+Tz+fHC
+mK7r+JmGcDiczWa9Loo8z8+cOfMrX/nKGWec0dTUhAY7gBnIEYWvXrksU/85TvCwC4XC+vXrV61a
+tWHDhv7+flCU0CsNFGJFUTKZDLiCiqJcf/0NN9xwA2izgChAGad11KEROfAYO59kfOo/CebWT0V0
+XQdg+9577915552rV68eHh4OBoNepqNpmuu6qKhCQYhlWdOmTTvhhBPmzJlz4oknoDMIuEqoJHEc
+x7IN7ANF1gqFwp49+9auXdvb2/vWW2+xLDsyMgJ6FjRDkiTHsXw+38jIQUkSIej58+ffcsstf/qn
+53+wgA4HrKZ4DPuBV/60RQ8FAfSKSgye58fHx3/7298+88wzr732WqVSiUQitm0Xi0XHcRKJBBiT
+WCdUQFBKK5USz/N+vz8UCkWjUWAP5XK5Ui1VKpVsNmuZTj6ft20XBTqUUjCQnXqpFLa5adaKxZKm
+qZIkybJ87bXX/tVf/ZWmaY5zVDl8IFz4ycenLnogmihrJoS4rusRDkZGRlatWrVixYrXXnttbGyM
+ENLe3r5jx45QKOTz+VA85SEt6CqLYw233sLMMKxgSGMYxrZtnyDVajWe91FKQWn2IHicfiDiMk2z
+u3t6KBRavHjxDTfc0NXVhaMblv0wJPKYqzz5DETv4au2bRNCEHXgeEgURRTKvPjiiytXrly1ahVT
+LyEHUxOHQSDGqqqM3Aof97rcsNyhbxF40TAMUZR5ntc0bWhoCD/pxjAMeAmEEE3TFi1aeP7556Mw
+nBzWoeKj2Uv/y0TvopyXYZzDfxKW1JncKJDcu3fvypUr+/v7V6xYUavVUNOMInEkk7quQdm9Vo+4
+IMNScGk4Vsjn8yAV+v1+VHV5VaWpVGrhwoWzZ8++8MILOjo6SJ1xRd7v8PPBWk8n0zxnUuOz+OVN
+r7QVf9J69g/LA+l4Hcu3bNly4MCBl19++Y9//OO2bdtAL/T5fPg1ZabeoAYxnyAIDHuoE4XAi6VS
+yXEoPuI4TltbWzKZ7OzsnDNnzty5c0855ZRYLEaIC3QBNGNsStu2wd38LMdn/aOnMPpYBtgTCBTZ
+gBexFQqFoaGh9957b3BwEO2X9u/vGxoa6u/vr9VMjgO1mnAc4xN5NOSWRF8oFOrsnJZIJKLR6KxZ
+s0455RT8CEA4HMavX1FKDaMK7j+pa3R9I06RtTrl8amLHmUCnq0g9VZBnqBRgEnqzqCxHgxyQbe9
+fD7rIaOGYRw8eBCNtzmewW8rRCNxn88XCIRkWUYbXTAMLMtCII8oy3EsQggCzcNn+n9O9BOG93Vu
+nUhM67/9jVeONh+2oZFXI5jDsu836mEYhmE4WGbaQBVuHE69+/ynEapPahz/H7gmhwfORxO9Xe+c
+3fhZjuNAeSOEUHqIhIMLHE2eTMMgx0/u5Lj/rHsj1buuvB+88Y+e0RzS7rroD72HZT9Mpsc8P5rC
++LyIfrLDg1YY5pBXqF/wo7/3uAsd47P2LV8Mbxw3rffSyKnlLA2bxjM42AeewTnq99LJN8H9NMb/
+AywAH0k8Z0O5AAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_volkswagen" model="fleet.vehicle.model.brand">
+      	<field name="name">Volkswagen</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAAysUlEQVR4nO29d9xeV3Xn+1tr73PO
+U96q3iyruMhdlnvFBRcwxdRAKJNCEpIZAjNJuEmYuZl7E8hAJswlJAyTwISBOIRum2LcMNi44ypZ
+siRLsrpe6X31lqeds/dea90/HuGUiz+fMbwgk+vfP3r0x3ue/XzPPuusvVfZZGZ4SUdDfLQH8P9f
+vYT+qOkl9EdNL6E/anoJ/VHTS+iPmvxsXWi2nFQimpXr/LSd5p98nD8m+v/9HyYi3vv+BwYRM8wA
+GJEB1P/XGEBQkAMLjACCIwCRAKiHETiFECulaAAzmVmSwrFyyvO8YA9jmIEIgBmEyaTMnINlZjAC
+EJgSUBMxhiMGzMwMTAYi/KzXN/TjzY7//b8iIlU1M+oLRyZLBDICDGKAiXMBxpAMXmAE4m7S3ZOt
+bQdmnt4zs/NAe/t4a6bVO9zpTreqXpUA74mLrLagwJzhfPFovnRudtzSoTXHLly1dP7IQDNHD5oD
+zpAiiaMCCgdU0s2z3GAwY2JVqLJ3bC8Q/U8+638W6EWEmYnIzFSVmVXVuSBaJwMzQLEyFOQQ05SG
+DZvHfrBxcv2z0xv3z+xptVuiHU3DyKJBiaMhqqgqVEGUld0YFOrgHGsccL2ViwfWrFz8shPXXHL+
+MasXZ3XnYF5U2DkzMGAEgwHJzBz1HxcY/atDb2bMjCMP95G5b2aCysNDfCJ4lxT2+M7ObU8c/O4T
+O/ePTR1uJ5/Vs4LZxJmySsdYzYQkmiaVKCGkpJaSZUawlJAEIJQJZXTKEqcXNhuXnL70NZcd97Lz
+1iydO8qi5Cqk+hHfggDAANVIUOL8BRH4OUAPNXIsIkTEzGZmBDNj4iBasAL22JYDn7rj6Xu2HOxG
+8pnkvu5RwAwaBRGAgaORqqakSUxAokhqSa0jkY0pCpLBKKqIKZzPNKZqxtptUls+1//ya896z1uu
+nlMwmGAJZqACgBHACkTYv0r0zGran/tREjMzMQxE2LLn8Jfu3XbbE/snO+LyzNi55IgtWVAKzGrC
+qSQV14kVg2Dav2oSDWplqFpJ4QiIkABScp6SaghABapDGaroJkxPnb9mzq+89bLXX3nCcKPmkVSN
+0QAQLbEzthfmcfwcoO+/Vw1GRGJKRAYSldCTz9yx6abHxvZPh5ytUc/ZiIA6QplcsKwCNHVzjvMH
+a3OHmsePZoPN+lCzNtys54UXS70YumXvcDfsHW/vGa92TVTPjk0dnGxBgYxBVUYcS2XN2GmqZtCr
+UOFla4r3/uZbr7nouAzBiTEXaiqs3twLIvBzgB5qRKQwZhZTJq5S3L59+x/dcnDfjt2eanlzKJC6
+3LlELtIkVc5swWB+wpKhU5YPnLZiZNXC4abnlNcc4KA/JMQCiCEnwACL3W7Ydbi3YU/nu0/svPeJ
+Zzbvo153Kq87cxZDAohDF6njJxfU3N5ffcu63/uNVy8erkuVXF4z0r77+b+vFxN6olBVeZ4TmamC
+fTKA4BEhGREgQKYz5eH/dcvWL/+g1UsyUsBTUl+LyMAUQ+mcu3hV/eyTVpx9/IKlQw4aAIA8iAWs
+Sb1jMkAMpGZCnivzBQDrJecFmYeazlQVP7p53433bf/a93fsONByRU4kqqqxl6mLvRK9eNrxzY+8
+77XXnr8WDtOEYYUCEcGxZxAbqRixgH700/AiQv+cJ9P34pnZQAACaU2jSkGZHuqW/88XnvrWhh0D
+zdEmJ8oGjclRiipese6YxqvOXX7WmiUeYNIYSudzIZ8EziNDVIFzrr/+AinMzITAEA9EeArBs4Nz
+RglVRpmm9TsmPnbzYzc9tOPw2OEiK1TzGA+TONJpbdN8px//4Gvf/IoLCM5iANfgIBoJypQTCPS8
+z/eLCz36S1aXuSM7QwpJSpzYZ0i7x8Of/P2D68eRZQWTNFxm1iHHqaLTljXfeNGys4+bn7GHliCk
+IL5Wj6LeeUJ/lRpN1QwxIaXUX4VmWVa4KNwkCKcOqC7w5EBVIGu3pHDO5c7u33zg41/f8PXvbY7t
+KI0MsYuqgTiD0B7y6b/+/mt+7bUXIwe0DoMisoOoOi4kgd2LHj2RiRg7B0AV0OAcAwZy0fDo7rG/
++tKGrWOJG34oqw+6appqlGxJPV5/wdJrz1mZKyHzRgHiE9TIZUwwOzw+sWfv2DPbnn1sx57x8cP7
+xg7NtLtJzNgVRVGv1+fNacxfvHzNiqWnHTtv9ZJ5c+bPE85AnCIKi1VnJsFqmSblL35/20e/9OCG
+rROWFQRvVWDqSWumqFp/9O9e/b53v66escVE3pslIzUwk8fPwazXJIosy0RBUCIiKFTM6Q+2tz/w
+199r+bxerzf8CKV2jVMXxUUnNN/xsuOPGalDk+W5AlolnzsRc97DbHqm/Vv//g/vfnzbjNSsPupr
+9bxoFs1BlzdUNUZRVcTSTFJZ1ax35vLG3370A/PnDXcUlCpDgZBc7IqW7SRZkc9MHv7kt7b85Q33
+dHydyFCBJGh7ArH3/nde9h//4JcGM0HKwDBWg6hkjn9a6Gdt55JcxhAzI0vsMlU1cubc7rGpj3zp
+B9N+3nAWcp+Xqapnroz66jPyt121bjBTpRR8zQLqOVxBSeG8VxHTNDI8OGfhsr2TmwdXHLdsyZIF
+Cxc3h0cjXBSVpGZmgpCqblWW4jtTh+afODw8dxix18i85GKpGyRw3mz3mJ1IrzPg3XuuXzuYy4f+
+5z0hG0gMk4IH6lrSRz/9jaUrF//bd7wCKbnci5Bz9HzcZ0Wztl8vAMgRlAmAqlEijLfSn39lw/7D
+FddS7gfrVaxlpXd4wwVL3v3KM+qFdcFA7gUux3QVzTyx61QJznnvYfqON79++aJ5i0abK49Zsmje
+aKPmcqeFt1pONWfeKnKBm97V/KLR2pteeXFOCWSCHsQkSr05GFSKwgYKSpZ1eC7F+MbLjvvgb108
+IhEpunzKcR3epXz0jz/yd7d95wlX82A1pqoygs4Wn/+vZg29AcyAKWBQIUedCl+66ZsPbeu4gbnz
+spq3ccmLYRp598tP+KUrjlHOnIYGR9WSHB55+NH3/87vff/hJ5xWAwWrJBgsVueuPf7KS86jsuUH
+56asUVIefV3yZuSsIi++YMqJa1qWZy+d+4q1x6AbwQ3RIa/NWjG4YfPO973/9x7d8GRJWqtznbpd
+5ob6151z8h+/75LliyBVrhYcOTSHx2f8H37gz5/dtVPQYUKRZ/hp7iTPGnpOgQwKgnkgmOHTt234
+1Ho/MFgbKhJLID/Po3r3dUuuOaNp1jB1ph7QBPvvf3fT29770S/fs+dLd28EFRGVZ6/mkNXJ7Ffe
+dFbqHi4nD+V5zsw1Tk0NNXY5c8EJVK8Bw9z7zTeeRKmbGoUAHrAsKOEfvnDnp//Xhne991Nf+NZ3
+jMoGNFPfc9KJ9PIzl37wXecdO5A0maAJ69Cc2uN76T2/+6nQrTmDEPDPtzP7O4CYpXjOrKF3Pi9j
+L5mHq4Dmg9sO33LvlpEiz7IowVOt4S299txjzzp5cbcaIEukYK8x6cc+8fd//Gef1Hpxyjlnt1P9
+4GTPw5MZMVI0EK094+wL151yYO/2FIMjz0pGpprApMSObKZTXbp2yelrjkOWSyWwSAQCtVvh9rvv
+cYsWPjNJf/ix22/45saqaAx7ZUPwrV41dMbK5b/91pOblSEnVwxZaa6I377nsQ999AYQvMLwzxAf
+iTjMUghs1tCrwmd1hsGyiQr/85anDqdGnRgWika9Ox3POLZ4w2Wr6tCiAMSx0wMHJv7DH3z4Y3/9
+1YEFK08+54J1l1wxvHj1EzsOKhzIVM0xQKjltV9987Wdqf2dqUOZy53LnHOcGTnnuEZEzZyvv3Bl
+ptZNKLLMsTGpwm75zgNPbjsgI8ONU8+ZrK/50Gfv/4uvPNBTP1A0nYhYxyq59uwT3/HaFWi1JLHz
+hTlOtTl/8emvP/DABkDpn7shz032Fxf6fpDNu6Dmb35g48PPHB4ZGWHjwtc73faZK4Z/5dWn17jS
+KjlLRjzRmvpPH/rvn7/pocElq8+/4uWnrL1gcGShy/0TO8emuxEmasbezKwKctl5p6w9YdHB3Vtd
+SgwnEuFIVUFZleK6Yxrnn7ICFHPvAWgUtZjg/+7Lt4RiXnPRsqowzBkZry368Fcf++DnH+66NOoH
+ELviUy9kb7jmzEtOrqE7oxKpNhd1N1Px//Whz4YQof/S4MxW6Bizib7/jlW3d3Ly83dsrg0WeehR
+lpXiljfd269etniQU3LOGaJvx/ID/+UTN37nB0vWnLXu4quWrTx+sNEM3fZALRvv2o4900beeVKJ
+ZtbIHSy+7XVXtcZ2dqYP1jyZGZNjZjPxFK4/b2lBGZB8QhDjrM7Ejzy46c57H6otXpYG5goDvpcK
+q2pz/+o7T37qxqd8Y6CW+Yi8NBqp1X7/ly4+aalzCgkOSFzLb7t3899/5buA/QsL82K09dDkwMb+
+lod375oO9SzPuRTnJMrlJw+etrQRVJg9qDCPG7705S9846HR5StPO//cFcef1CgGNc0MNzkj+PrA
+ph0HI8hAAiIoGVTilResWzScT+zb4UlzXzg4ZlYJK+bylWeuNIGZgyXKKBrM/Le/dV8PlIbqoRgE
+DyBURD34iKLxyZu3fPPxnflAI7csz/1MZ2rRaOMXXnkaV23nIsCcZ+r8X/3NNzvd2P9x/cjarLEC
+MJvoHQDsmLab7t83MFhnsegpWnn8/OKK81fCQJyrMYD7H/3Bn3/ihubwspXHnbR89fJajSFVPc8I
+6r2r1Wr7J9Oug9MAyDkitcooqw0X/OqrL52Z2DU1ecCBVBxUCeUrzllcqzVI1KwwJLOojP37J//u
+69+tz1veGJ5nREhGlKNSUgE3Jtn+2z/ct/dgNeRLFXG1wW60S9atPOvEYS4nQbWkier+sfXP3HjH
+w88Rn0VT09esoU9KoPTt+7c/M9kuuM5cxWwY2rv63GNGhodAySUWBlxv4ZwFPLhoaGjopDVrsyxT
+tPI8IXnvGpFKggYutm7fDUAMICNYACPFN13/KrJycmIMP9yqqDeyK85aEQ2AMBA9PMGAT3zyb7eP
+z9RGj8lpMIvRIxbOEWrQhrceaHDauFaroYT3nDKJUvfQN79qnQ8BSnDGjkDxL//mK89ZmBcL+n9q
+AY+Mid3+8dYN393iM4Jxhox7dtyc+pWnLCgMIjVizWFq9WNWLn/zJcdXYaqUaNQgqhFR4YAYa1TL
+CLUmP7RP25MzBSyiKDMurITj5XOzN1yybtu2nd3Udqi027t+7eCygXmWrMqzkjSXGicdG5/5zDce
+9XMWYXR0OjPJMgNXmuAN0kliQOt1Zy1dMpBm8jyYa1QCSm3kJ61cePXpc4rOJDQXn2kx9NBDG2/4
+0r1KXRNFBIHEklEkHA1b38f9L9ILAHjodzfum5yZyjnzsERSxfa5Jx472Cj6AVXTFGMkgiNcdNFF
+ErpT4wcdQURE1Zi8z4mIjBMcSXp42xhUTZEzYBQoI+j111yWh8mJiUNCfuEAXXXxOQBnGSmsYAYE
+Pvv6t+48cHiiPjynVm8650jNNPVjuuQ8udyTXHja6pBMQCyVcOEdQTTLstNOX6PSAjGEwaSgG2/8
+diVE7ggqIjcr3H8c9M/dgOc8rSMfBLdtOFSJZMRIMRKNNOXS05bDjIicI+ecY5gqFOeddeayhaN7
+nt0ae13nHJFLYknlSPhDiZke3DXdKoOzyAQoJwCmZ5yy4nWXnbZr2+ZWe/L8kxceM1xAQVALgQxA
+7Ab7wtdul7xZjCxMnKWUYDFz5JwzYlBmilOXjp65elEvqHMuY6nImwRKqorTz1i1dEGNQgJl5B2Y
+vnfP4zt3HgbEKMGMwQAlSUcB/XMm7znu/Vl/aKL9xM6ZrDZIIqIhCl104oJj5/sjT4mqqjrvzQwm
+oyNDV1yw7tDeHeNj+wCoUTIos6hKQopqLjtYuk37ZxybKAAyOxIHePfbX8Pdgzq97xXnn0BSGsEg
+Ne8sJTj+3r2PPLR+1/CS5cXQ3KisKWX03FwhM0MsX3vRmuGcxGBSqSpBKcsyphDC0HB2zrpV1p50
+BhAhyyYm4x13PhQkgmI/PZDAzh+9JdU/5d7//MCWfYcOdcg3zUQ9WOyaM47xrMxIKRk4JhUxZnaO
+YPLqqy6uIe7esa3s9aokSUmNeiEmg1rqWm6U3b/lUAiiANgyVDAH4tUrFl955uoT5vHKBXV2DgxV
+ZThijorPfOHmgGZj/jJ1RQKccyCLMQLMzARdMOiuOW1Zu9sxE08qnPvUKyM5IgAhds4+/fjCVRJK
+AGBPWf3WOx5kVxAxDCmZ6lFazf7TN34/BttPbPrBzmlNChUiF4jmFXTyslGBiZhzjpjzojCwiABQ
+1TNPWnXCiiW7n32m1Wqx80G0W4UkUiVJiiBcsH96X3fXRNXPS83JFM4MovHXfuE1b3n52UyqSgKB
+eVWF443b9t5692PNpSupMRrtH2OWMCbHSFG7rSvWLlu5oEh9ey1q5HIS4yLGqEwp6fJFc05eNR+h
+3cdrzp58csfUdAkwCD4jgJlmwTP8cQzOc0bmOYUQNu6ZyvKctWOGTtBTlw3nNcdqZkbMDz/6xMRU
+ixwZuD/3PacrL7toempi7969IiaKmJIxJY2VElJ0hmDFfVsnNJTaH6ZBRcnlF6076aoL1grYVB0L
+kyN20fSLN90+XVJjzvzIBTOIoZbMDI5VVUPZzOmatctUSmYYoUriYZ78wMAQey+WAGpk/qzTjoW1
+yDwZfJ0nJrtPbdyu6gAQKQDVo4G+r3/q5KpqCGH7rkPqiK1ricvKTjp2bgKxsfNexG644Yb7H3hQ
+Dc7xkTsn5dVXvKyW+V27dh2emjGDgHplJZBSCbGKVSh88fDWsdRrEbHBAXBsBrOYCNoTOIIh9lO7
+x6cnb/zm7fWRhb6osWtokn5uBIiJvcWYZ27V8mUXnbIsiaZYgb3PCqdh287d69c/NTQ0pKRqzgTL
+Fo8wYn96JQvdTrlh/RZmhsE0MaOfe/GzRi8A4cjyOjKbgUkeO6D7KyoICVmH49wcKxdCQRCGod2e
+uH39gRu+/WiGThfwxBXYXGPV4sHXX3Ly2NbNk+NTIiGFbrI8BkuqLeJKkymNd/zNGytCTMjEI5mR
+wLyPhqYGqKo1GQrFTV/7/sbth+tLVnCjaTbTIxZVIkpco1BSloUYf/ea5SNDlGJwVqToKrOsMXD3
+g9v+5jP3WVZkkljRS7J44ZzFw0MWQEguZUBav/FgRMfIiHIzUchRQP8j/lhtYmomJk0qltREC+8W
+zBllKBimOLD/4OR059H1m/eOd+sEQMggYoC+8fXXNWu2d8/OTlmJekskirIMENWYUkoC99SWnTM9
+B0kZomMlMiLAsbrcnGdUcHJocuovP/1ZP2dJNjA/aF2k4UkYXip4DUawCivnDp596upOuxS1ICUo
+skp7pvfgD9Zv2rFnfLJNLlOYQYrCDQ7UIdGBwASiQwcnpP+sW/+JP1oGh0hM8VyatNGBQ5PdkESh
+wog2lPkFI0OAgo3Jdu850EsYa4XvPrbLQaHiHDnvYfGsU487++QVe3ZuabU7ai5WGpNZEgsqolUV
+iP3Tuyce3DKeOSAlksiEGEXEwDDyrA6W3XzbvU9tHxtYcCzXm1xQ0o6kyoLmWdNDhTxCetW61YuH
+nCZKIOVEVtXzbOvWvRufORCzkf2HOj5rqKpYKmpu3mgTsQSYyMBuz559KSrwfKkhPxP0DMDI9Ife
+PQg+O9TqhmgCM3IaZKiZ1zNnUIWAbO/YoelWWYws/P6mAyboW8pkgIEovfk1V/YO7z14YKzTDSrW
+qwTgqoopahmDkOtq7ZYHnulUsKwOXzM48s55MkBEQb4X8NkvftPPW+6G5muWpRQNFRwrxIiqqgLc
+YGGvveiEWLYkIqnBkWjpyX/37ke6saa1kUNTpc/qqilZItY5ww2kQAYjBfPYwYkYEwAimL3QMohZ
+Qt+/7f3XLMNAasBUpxKDwkQpJh0ZqJNVvn9xTZPTPYj5+uCOQ9WmnYfgvJmRGkBQufz8M1ctGtm3
+c0un0ylDVVYphhSq1Isak1ZVhWJgw87pDZu2HHFrU5UhZaY+9jKOwrj1ngcefGpzbXSRrw2oOInG
+mkcjKizGlsEhpfPWzD1paS2KpShiJiJQ2zc29b0HN9LQYjE/2QoAmfantg01ciD8sBTJdTuhKsXM
+QFBLs7KV9sLzcAwgNgbBYAYyAbdKIaKIxMqUJG9kjkBgA8A0Pd3LGg0AreBvf3z3yavmk4FIkjKZ
+Djdrr77igv/62VuPWX260qiyS2UgMTETRlV1PTnNBz77vR23bZgIrQkNpaoSkWlyJOD8O/c9lppL
+Rucvc0Wt1OA8yjIG8y4HNPp8SCcPXH/hurqvJjowKBur2GBz9O7v/2Db/ulsybHRu1YviAipgZxK
+qhUZERIUbCCXlKp+1QpA9ly53M8W/T9+pVk/c14IpZqZJo2gzDMUkTzDuF+41CsjaSSo4/yhHTMz
+3V6zqMGiubrBO9NXXX7Rp75wy95dW5etOZ1Ro6RmJEYKNQmVMnPx/f3S3rj7wM6tKiHE5Jwzs9Tr
+NqXnmiOjx55J9bnRYGQhVYmVDZIY5FPVO2lBcdkJiyXEUkAWRdQjL3t6xz2PIBuILmeNImIiMFHN
+hMwxzCL60wtkRikaEWBHarJ+cv1Y6K0/JOu/7wEYOaiaQWHKrkoBgCR1jpOhaDQ1xcKRmW0e62ze
+vPmcM9fBKBHMkEU99cRVF5195s2PPNNcvGxwYJ7nLCU15hSCY1GJ3TIeNxhXrTmRzj42cyTEQk5M
+nXMzPPTEU5t3HTgMX0vRkmkZPXwN0jbJM/gYWpefd8bKodr4dCcS5aQEQLB96467738Yc08tGs00
+MwUmJgP6u6UwM6iCre/SmJGqAhAR52cnyPHjGJxE7A0GDZznooVDk7MsdNtYMFe7Myn3bRMUmoEs
+GOWDjRLqO8lT0qTdf3iKzlpbEdWKiJRpzHwW8c5XnHbzXfeN7W0VqxteRiuV3PVibJd+AcKhXszf
+f82ic845i+jI24bIVISdg9IX7pj5rQ9/Jy08VYtB1SSp63xu6sHG3Wqup7dctHQ8THVdM68OIzYr
+mygy9+nP3d6Nc1BvJK6ZVCMZiTM1s1Byk7ulOM1NSQ2EkIMGajUD2Dm1wOrxwopQfoRe+A3sP2z/
+mBDHABoZKXkNVZmEvE6FZBpZweRNdHhgMImISJRoRus3bd+0e4Y0KgMqpAaHdWedd+qq+eN7t3U6
+nU7ZkhhaqafmNbamS12zkE477TQiJElHIgTG7JykBLYLTl+zMIvtgztFQozVYL2eqgqkFHsxhrdc
+furyRYtMRMopFRiqzOHZnYee2Lgd9YavNyVVaq5R9zHGlJIjqFgIob/dBHZQ8xn6hddHfvJszPsX
+fg0igx2JGwAgGHSkmSV2BBE4Jdkz3ZEU2DQlLZjnz53vMw4pisY8q+0Zb921fgwAObApIyXG6Ojo
+G6+9MIzvnJlqlVYlCx2tohQhVKLpFWctqNcL/JPwtKRkAiIqNS1fMHD9+Sfrvmcsts0kpeSMFHBR
+Bmr22nOXeI2xCp6CwYt2i5wffODpveNdHhxNSpAqbw6ODBZV6IkISGOMU+0eTAkGUVUbGCyKojCb
+zUjhj4EejB/GBftGH7ZoJIeBVaKZaLVvpmx1AxGBHFQXzJs31MhDt9PrtZKqZoN3PLqv0zWzHnNG
+zKoww+tffdW6lUMHdmytYgpQjehWPNNJJy7MX3XhKWqqpgxKKTEzOTYzgjPOYOGdb3j5/JpUhw8K
+oxtC4QqklEQuPmXJCUsa5cx0EigkpKQkU5Ptb97+CJoLsuFRppwpeUdzhvPQK43JUoyVTky24J2Z
+QBNEFy8arecZTAEGyGYjC/Yn3EjQ/or22LmD3sNUJJGYHi7TrkPtfgEbVJcvWbZoTi31Wt1epyoj
++/qGXZPfe3J3vxdCgnOIZrp44eJffOXFceJAe6rVTcFKBCBFes25y+c2647YRPtV5yklVQWTmLJS
+SGHNKavfed2VdnCPpQSfxVIgyTv/+gtX53muEpNlvQQFe+8fevTpjdsmsrmLEnkItOrOG8K8kVpV
+RYBVNVR6aGIGuQfgmBF12bJ53h/ZNDOlF1jyNnvouZ8rADAJAAKtWDTURA9RHXkIelXcOtYFc5m6
+BixbsvDEY+ZYZ6aqeoCPMVTKX7tvS0Q9RvEER2qICn7NtZcuG6apA7tjFS26WPbmDfBVZ6+SqCKx
+327BOeecI6IYoxlZlSKxIP3KW64bTtPUnoSYQFCFk5YNXnjCgulOGSWBOYpzlCTxN297TPyAH2gK
+kiooxsvPPa6RUwwSkxLQmiknpjrgnPrhsSqsOHah9XeLFaqYjY3LHzdU0lffz1Rg0dzBhYNOq4Sk
+MI5lfHLHBAiKFKDkcfFZJ+dI7XY7RY2xzWwPbjv85L7oHJEA5MWEBcuWL736wlPbEztCu1Oala2p
+i04dXjg66BwDILIYo/XXooAZpZTYokXqtHvHrZ535dnH2YH9LlS+RqS4/uyFw3WKvXYEqQqimXR3
+7zr4+KYxDI8mBsigqcb+7BPndGYmzEzEAOzff7DTTfCZKUkMcP6kk1cDMCgA4tmpB/nxYrP/aOrM
+AOhwozhpxWKYxSqBvIW4/pk9rVYPXqPBUnXp+etGG/Vut9vtdmHJNIy10tfveoSZUZVJmRx5QgK/
+462vzqjTHj/Y1VT3eM3lawQOJv02F1nmzGznzp2HDk3021xI6pEaAUy9t77uKn/4UK2KoZyaP2fu
+1WsXl2XPmwgjVD2W1Mztjtu/NzFRueYgoIgBonMGR5cvaByeOETkYIyEsQOHkIyd64cWBgdHTjxh
+NROgxgxmHHF+fsboARA8kxm8mSc2NgfYy45fhFbLs6Dbo1rj/m1T+yYnar26aLeH/NTT1111/jI9
+uKuqZtrmWobAzW8+sG335GRo1LxIFlxIUKS1J63+Ny9be3j/nkNTrZed2Lx4+YICqWcuoCtWICRH
+7s/+xzc+8bkv5pkRgkKiWhAte3blBWvOOaHeGzuMkL/t9MFFCxbEXjdKTUQiepHinkPV1+7agoFh
+KxrRnNcCafcF5yxphHY7eRMV6R5qy90P7UbRBNqGDBWtXFmcePxyUAUUZiBE9zzFtD919D9SF565
+pl6nVM5kTq3XnpyZ/vYPdmS5paBWRUdy7VWXFpzahydSqODMkPZMznz5+9szaNJoRgZ1xt75d77l
+ugHuYHz3NZeekWdIwSClSc2kx+z3jR268Zu3f/GW9TsnWqwqxlVMZZJOL9aK4i1vuE4PPD3qW1dd
+dkbV6VaxTFbGUihRrdb44hfv2L1nIh8ZBgvDJa281i86a8nETJfMTAMzP7tr/8Rkq7+CZTikau2Z
+pwwONgEWVfTdutlwcWYN/Zpj5yxfUECjliUyKOwL9zwz2WoXyDRUrOn8c04/deXC8tBejrETSiOd
+iPo3t27dffCwsZpZknYqUwh69roTL1g9ZwlNXHrmCoSeCRxSEnaIcHTTLXeOHa6e7Q7fvWk8d14S
+EcO7XI2qqrr0nNPn19uvOHX+8YvrFkvznChYTCQ4ODZ9652Pobkg5HVl0SqgG85ctXD1otpUr4JK
+ktLA69dv0yAuz0xVk4Di5ZefD0ATe88ATGdl0s8e+uEB94pzjsVMR3qAREvpka0Ttz64vSAF0ky3
+s2D+yDted2W9tS9OTsTKupZcUd90oPfV+7ZmeRFSz4FSSkESUvx3b7vut97wskUDvluWYmpJk1QO
+xf59ez/+11/EwIJqeMENtzzVSd5ENLZC1YuS2p3OnOHGL73pyusvOFHaE0gxRAspEWKR1e6594nd
+4z0amU9ZHSERo2b2+qtX9SZnYqxSjCIyMdF5esseFAPEznOGVC2cN3jhBWtN1YyAlCTMSjoCZrWM
+Td908SmZqReHmKCmAZ+/c3s3xESpkiii111+3tVnrWpv3egCUuhRpcj9335n29jhrlAiUYUZadWR
+l1923q/84jW9bglfC6lXJc9aGfxXvnHfps0H3ILFKGp3P/Hstx/cnrmcNSB2VWIZk8De8sZXnLxi
+kZRaVb0YEAMZwsThqVvueAh5zeo1tkgut870RafMP+3E0UMTB8lYJPqsvn7Ds5PTiYtaFNUkKGeu
+uvrC1SsWMsM5VtCRZgRH6zX7IyXAhace//pLT09T45yMFBY6dz6+767HnrUsN7NOO86bN/ieX3/9
+0mGTZ5/mlKzskXSf3NP9xv1bi+ZI7MVoKcVeaU7MBuu+162CqMBEFKITrem//txtGFrkhpvIaz2N
+H//SvdNdBIsSg6bYK8upVqvW9JrKoBRjJPVQIucefGTTYxt3u3mLimZTWpPc68yr6a++5dz9O8eQ
+JwsmiqmpcN+DT4Pr7J3nTEMcGs1/8zfe6hjoB/nFmNhg/JNvns1qaUOE9++6/pws62mr5wKZxk6K
+n73lyZmeZKIU0Ety6tqV73rTZYMzO93UOLEhBpB9/ntbJiYV3gQBoTLSMmqr0/UZYoykJKmq+9pd
+Dzy6/pndPLowmIfEvN58cO/MA5v2VJRXMWlKzjkw93qtlFIPMamX0EWqpmbS7fc8Dq5TfX7odHxt
+gDpj73nb5SNN7UXEoGYVe7d+w/axsW7WGBAkSYZu7+orzr3g/JNMFJIAMHkF1CoclRSo55MnAvMl
+Zy+98Pw16AUrhb2DS99+YMc99z2Sp1i2eofbXcnSL//iK3/5VRfFZ7eHVDFlHKbv2zz2+BM7fE4x
+BicpxLYYCHlZtWBRA8iqWMbP3XATcq0Pzctqw2S90JNA7pt3PVSqM/iyLGOMaqKWUko97aiCJDiW
+Z3eMPfDQRj9vYULDS0w9e/U1F5x/yvCO7fuFU+plxlW73b3/gUdEc3KZSTBVX9R/6d+8yTQBgHMi
+JR3pqfRCuwP+aM2iwfFQK2r6B2+9wlcThl6qlDudHuWfuOHhpw/FWA8pdrrjzFb7d//h5W++dDFv
+3cCtUjPrSfjrbzzW7nqfUFZ10yhxOoQqGhm4jAGZe/DBTXfcvwVz1/QGhiUlCwCMkt3wRHf7M7sy
+pKAilHd6UxpdmQwhVlF7qqp60413VTbKRQNuPPZmLj9twbtesW7fzq3OAlUK7inld9+6ee8+uKE5
+QUpHGXenrrn85GuuPpvIgcnMsyuIzBkTajYbBfyzV7JMDI5I9UsuWvPqa9bq5DRCx4wQ0wObD//F
+5+9rt6ZqvSoGnq4OePP/+f2/dt25K+PubWgRLLtr4zP3bRrzWgbtxACYVytTVXbaVayCmf7D174R
+kqE51N/yYWaQkiG2p266c2uUQIZeOV1z9YQgUVPMVKY90v0Pbf3ODzbZYMOYqO0uOGXJb/zqpTv3
+P9UJSJQ63Wmm+lPrN97/yBZkpNYjzhFRq+nv/N5vOp4NL/L5iM3WhUQMxGCXAb/zrlfNrVUoo0nM
+OGJw+IZbN3zzjq155mI1Yeo6LXVUfvj3fvmyE5rYuw2pOxmyT9/8eFedUojRdTo9laDJNJnz9OyO
+3TffdT8GRvOBETPTJBoTYjSN3uvtjxzaM14pejHGVJVlDJZiSoEhnbb+w5e/m6ThhhfHTu/8E0f/
+j1+/dubA5pjawq5XuTzPpyZnbr3lqXaoU5H5zDiatFvXv+Zll1126qxsDj+fZq9a3FESpxQy4ILT
+lr/jdWdxpw2pYjUG6cHnf/kPj9z6+K7GgGorppBFcU47n/zwb/zy1atrux/nbuuOB3bc/OC+aBYl
+qaZep1v1UpKQFf6rX71jbCrlQwvUnKmaKJKg/x/hXRPlbffvzTKCaJW6qUQZy1i1ADzw8DObtkzD
+D6HqvuHas3/31y5uj20O01XskERj9ZD8yzfdtXt/jqEh5SKVUav2okW1//h//lvVarbLp/6ZZtHD
+ASj1u+Aw4gfe9/azTpyP6UNwzN1AqMZ68U/++s4HnjqQ16JJq1N2OlFCmvxP733DR37rdXPaW7qT
+B/7+5g2djvVCV7SMAYQ8ae+J9U997u/vxMA8KgZTjCzGKtAEE409IgfWm7//zL5DAkulgJMGTS5l
+U63wrTseiDO2cF7jt995ztuvO2Fm95aZqUgIhfMIKYXON75176ZNUzy3CVQwlyGv+fIjH/7dNScs
+ZeafJvlZXFIZHKuI76dCzRsZ/OR/e99x82rYHwqUSIJMdx1s/9+f+M6j2w/4ok1xSkCt4A9PTVx7
++Rmf++j7rlk7997bv3vvPY9nmROJIlTFkjP/lZvu3HMgYWi+uKIfC0OKECVJGpNpIuLN+8a/fMtT
+Ruh2YrczGYP4DA88uPXRhzdddu26P/nDN75s7fCBHU+maAFUlSGEKePqvgef/t49T7uBIcUMWDTE
+MHPoD97/q29/+ysNooKfZk+WWW/AxQ4Qg0hyPnNf+eo973jvf4+FaDbXfIIHesWaxfj9f3vl6SsW
+9hKSOEeaZ66eefONr9zy+FOP3f/b73nLQN1BCqN0uNd916//6Z7dNT1hOeojRp41kIlQDjYnQVXJ
+NSzF5UX48L+/ouGqKnSg9W53/G8+9e3Tzjz3ta+96MDeTeVMW40qSWrOkpBVt9712G13bEcxkA9l
+sSQHSq3D11657ms3/o+ipgATYDHAZz8a3IunARdRB2lAAHhVY0+qpbrc/85HPvfRj96cjw4GSvBN
+h5p1yqUL/O//8vlnrF1SJBfExSzLYmwUXW3OmRhvNpsdpOjZ5U37wtfu/C8f+mptzmnh2PnKBSgn
+KR0hkUMI5MxQwppQT72x337l2qsvHJhIGXe5TD2fN4cG6eDYPlRNMerI4chSSFb1pu647cnv3T+m
+tUE0PdqpZvWyN3XCmpGbvvLxNWsWKVxMVHjAkj3PwvVFhP75FFLvvb/78U9//p5UH6aaM6KMMw1V
+rZB3vf2SV166ppHEevDFUAdB89gkdsgtwIgSig988C+//8C2YnSVzBlKYnCe+rVw/VA6FFEhxrEq
+tHfOKcve+Qsv9zyONEPUDFVLUqWqMSBEAxN5mhibuenrj23cchCDdXBC9DVulFNTxyyc/tqNXzzr
+nOPVErP1O/6pgH5qvc9+Bk3UZaaD33jvh7709Ue0GDGX4AnkiiwPk61rX7bqDa88ceXS+WWnzOt5
+UsfsmdlEiYWdq5Lft7+9a+fkk+PZ+MTk2PhEq92NMRJRnjlPvHxebeGCOfPn1o9bsWDBsMu5nD68
+N3dWiXdU67Z7kEQsxtTuVE9vfubbt28+NNHNB4ciGVkNwWtnYvmqkb//9EcuvOg0EEBCZGb9JHp6
+vkZQPw/oVeG0F9273/Onn/2724sFx1aWkOWQWl700InzBvw733rehWcvy8lS2RNkxLnPihgjsTji
+mi8ataZlRs6zz1VRlaF/GEQtzztVL0lozRyGpKmpqVDGImuUZVDEGCODRCsDT02Fu+9+8t57Hk+N
+hc7n7BCrlPlanJ5edcLQF770sbNPPRFAEvWeY4zOUb/o8OegxejzfwGJBuclJLz/Ax//i0/eao15
+KBgcwINQhsQ6yXmnL7/mshNOXD2n4dArqxBS0ahXIeV5HkLKfWaooiQV0JF2LJRS6sONMaomhTEj
+SYgSRYQlg5OkaXomPPHknvvv33LwUFUUg1VNWAtOPifrzuw5+5zjPvOZjxx/4kJvHgCzB47kHPRz
+IOjF31j3+aREEHMuwCrQ0Mf+6sb//Kf/Y6pbUWOueY8MgCHlnFLTlWuOW3zxeYtPXL1i7nDTpJdS
+BJtCBMYx6yfhQKCqUY4MQLSXkmZZVpalqvbz4rKsaHdb+/ZPPPbktvVPjU0cVvgmFd60BIgtsypa
+d/xtb7v6I3/2u0sWzzEzIgVIhMyImZmRUnDOPZ///XOAPhoyNhNhygCA8N3vP/nhj3zy9nt2iW/5
+wTkpFCgSJBIaFpQpXzTfn3Xa/OOXDxy/YiEzhodHO71KEUGqKZkIkQGcVFXNixeN3pOZpSSh4oMH
+prdu3b79wMTWrft7VQ1+0DwbCyRSrfBdF3tjixYX/+VP/vDtv/gKxylUMc/qSoGpn+XBqto/2IP5
+SCr7jwD34kePfpYmOFSWF6QWmPL2jHzwo3/15//1i1QbtsJiIN9sJAmgAgZHJGWs+3z+8MCCuX7x
+Il5z0uJFI3Ny7zwTITHDzKKoqvZMxHBwbGL/gak9e6b27p4aH+/FQJUlVx8AGGygCBNSSp2Aavq6
+1174Fx/7o5XHLlIR4sSUaWRj+WFJpgLo25l+DcXz/KgXPXpSggIeQtEgZN7BAyrEN9109wf/9H8+
+tn4X1TJkIFcTo5wpSI/qziIguVPWqtPIKKu7wYHmUKMocnYeZhZSjCJVu5xpddtdiYklKtUKQ4L3
+TLkhmgiSZVSLnR6ku+rYJb/5G9e9+zffNjCQpQTvgf6oUMORTXgzk/7bVRXM7sXl4cxKhwBVZeda
+nfTlG2/9xCdveOzJHarNzA/GZglVgMk5VlIFGRORwakqJMEEZCBjg5qAaiACGzGbCSTC4DOvqdTE
+JJmVEXF65ep573jnde9+9y8umj/ykw8eP9foCRHEIgaXzXTxrW/d9ZnPfemxRzdMHHSo17z3eqSd
+CxuBiDQmEBEZEcHEzPrz0ZEYO1U1Jc8MI4tJUmKtaegUDV17+orXve7lb/2F645ZOs8sEH70xsAL
+Hv/PMXpLMAEziEKMWdZIhqc3bfvyFx/78le/snHj01zUVQk+40ZDq+gzf6QLyQ/Pt+of+YPUb/ii
+RGaiqAJUszwfHcGrrrvirW971YUXnVHPTSQyPHM2O8G9nwtb//xfTACgAtcvz9EfppFWY4cmH3r4
+qXvvX//khu1PPbVnz/7DhFzjjKUEGFyGfneJfiAjMQhwmuUYHa6vWnHMBeeddeYZZ1x40bIVK5Y7
+d6QbDpAdKUmbpebcP8foVYgIzEcmIRFMQdQvU+kftAYFJic723fs3L179+4dM1NTU+MTE+12NyQh
+Ipfl3vuRkXzevDlLly065pjFK1csWbRwTiN3gIqK40ykX//Uf1ASO8ILPInn+fTzjJ5MoR5erX/O
+AKWkjlkh/Yho3454dkeOZqTnqqV/eIV+/aqTfjOyBHWg/q00VaIcQEpwHgpl4n5x4Kyk0OAoose/
+SLR/4eMQ62e2sMFSSt57OlIIeqS+xx3JYtcfntT5z8IW1G+QBYaxqSrMOWeAST9ogyPdoRgAUkrM
+OY6cd/jj/dzZ11FD31dKeiSHtL8DTErK6AfmjA1mdORQsT74f3J6YL981yAE1zdT/SJeBYRAsCO3
+Emb9/qdHij3/FaB/ST+hXjrg+qjpJfRHTS+hP2p6Cf1R00voj5peQn/U9BL6o6aX0B81vYT+qOkl
+9EdNL6E/anoJ/VHTS+iPmv5fEUobjCiYIUEAAAAASUVORK5CYII=
+
+      	</field>
+      </record>
+      <record id="brand_volvo" model="fleet.vehicle.model.brand">
+      	<field name="name">Volvo</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAA5gUlEQVR4nO29eZRdV3UnvM94hzfX
+XJolS/IgD/I8Y8U2GBsDdjCQEPIl6ZBAOmlIyEA6kKET6CTdzRdIJ00n3U0AJ0CYJ8cDxsQ2tjzI
+ljxqKlklqVRz1ZvvdIb9/XFePZVlKZ9KlmzWava666337rvvvnN/55x99tkjQUT4Cb0eRF/vBvzf
+Sz+B/nWjn0D/utFPoH/d6CfQv270E+hfN/oJ9K8b8de7AUfI7TAIIe6j1hkhhDECABYtJXLRZXbh
+MquN4kws3IMiIgAlhABod2bRKwCC0qkQonvSGDQapaRALABorQkhjDFrrbWWcw5gj9naLLNScgRD
+gGhtGRMECAAAOdHnJT/eWyq76A0/5leIuPAIDvFOpyilFiAGa4EQWOjT7g8JLOrpxdd3b0sptVYf
+s2WUcmuBECQEAai1lhCKFig70Wf78YMeXzZwrLXu4TmXL7sKDSJaa915awEACHTwRewCDZ0vAADA
+GMUY01q7X2mtOecAkKaplN7inyCCtUgpIccbxdj5lyTNpJSI6CboidOPH/QA0HlyQwihlLpxqrPO
+R0IdrgsTwjJ4JTwIQNxNABEYd2MT3OxBRIeoMQoAGGMAAJYCgLVorWWMEXrkPsckbSxjlAAYA4x1
+LlMqFcI7wWf8sYPeWuvg7r4BAG00Z47hICAimO7laBldeHStDCIyxigVDnrozANrrSUUCRBjGKIB
+AM4dutZYzf4tNnFsXg8AxiKjvhv+AECoRTAExPGuP4p+XJbZLsum1AAYACDUWERjVavVajabMxPj
+WuskSeI4iuM4SSKllDGGMeZ5XhDkgiAIgqBYLFUqlUKhUKz0087QpQhorGGELazb3BiDiEka7dz5
+4tNPb5uens4HFAA455TSNE2VUowxSumibn4ZaZKglevWbHrrrXdIId0Mo3QJPOd1g74767tkrUVE
+SnWUtGZnZ+v1erU6Pz09PTs33W63C4GPiIjGWotoO11FbJq2EYnukEVESjildGD58PDQslWr1gwO
+LO/tHfBEDoAZY6xByhyTsZ4ny+ViuVKcmZ2Yq461Wi0A8H3fNcZ1g9LpMdufYqPVNGmavv3ttwNx
+s5EsSVh/3RjOUdBba40x1tqndzw0MTExX51ljHFOEZFzHgSeimMEg4jGGGOUe7XWWkxdnxHCCCHW
+otZaKZVoZS20WymgOGPdWVdecd3GDWd7XrCwDCCiIdQSQAvZ1NTUQw995eDBg7VaTUrJOXddq7Ve
+4EtHEwuz2el2MbfiTz72KQDP3XaBSZ4QnXbo0QICuPa4ae4AJcA6ixixKosnJg+PjOwZGztYDEPG
+GGOMULTWOnwBQKnUGKO1dkB3u8o4UQe1O9llzUrHTnqJ47jRaCBif3//8PDwdde8bXBwiMscAFOK
+EGCcQaogy6Z27X7hyW2PTE2MCUEYY0ZrRoU2MWMMEY1VlFLGiGuGz3PNRhrmez/6Rx8HEI6J0aVI
+Oaed4RDakRG01ogoBAOAOI4DLySUxnFrdHTf3pHdtdp8sZhfd8badq3hfthlst1lgCxQd7g40Akh
+tCOjo7XoukRK6TopCALP89I0bTab1Wr1hedGV69ae8VV155//sVCCKUMEOZJELx86SVXL1s29PS2
+rbt2P99o1DhjUkoE5vZZQgj315wTxthxloAl0GvB67PMNZ0DgNYZ5zwMQwAzun9kz95dUdQqFvPD
+yzamadxo1ALpd7iKNV2sAYBS6vY4izkVIYQAAhjs9I8hFBgBBtTND9cNlFLHuI0xRrP9o3t279l5
+7vkX3fSmW5YtWw2AxiCjHoBdvmxt/g0yzMldu59v1htx3PY8j1KklACSNEsopVJKePXAvwbQa22l
+5NCRGoFznqlkdnb2uWefohQYo6VynhDSajUQjZScIHEcxoHusHYg4gK5jw5WJMaB3l1+ASwiKmWl
+lIwxpZSbcJRSxhgj6FVCpe2Op7c+88xTN974pi0/dYMQktEeq3F2furZZ57atXtnEPr5MBwdHc2y
+jFLKGDdGG43MI4SQNNXyxLetx6HTDr1bpowxABaAtaPm/v37Dx48mM9LIYRjx8YopZS1lDGwaWdA
+LWYvbuQu5jPdjxaBUgpAnd7FGG0MIoLneYQQa22XVyil0jSlAJxzAmTZ8r44Tr/9na89vf3xt73t
+7ZvPvX5q+vCu3c/t27d3dnYWiB4eHLzwwgtffHG3Usp1gO/7jDFEa6199YrH14LhIBpKAYBOTU/s
+3bu31Wr29FSCgFhrnTSitbYW0XYYthMSLFpYkDidsAGOuVvb5STWWmNd3+iuWo1RSSgCgDHGyf5O
+I8YY833f53SuWuecE0Kk5OvXrZqv1/7fv/rLt94y1tNbOnBw7+iBvZ7PPM+bnZ3LMrNixYrZ2dla
+rWatFkK4yefJ4Pg7rROl0w59kkS+7yPiyL49k5OTiLa/vz+Xy7Xbc9agtUiACu5ba41xIkqHxXf2
+rQCUUkqpMarL9N2dHQoMOCIao11PWNTWIlgwNiaEcM6d0ibLMjdXGo2oVCgYxCiKPc9TynIC551z
+dqqqL+7aMz09Lj2SzwdJkiVxRklUKpVKpRIiNhoN1/0AyDlH+2qxP+3Q+76fpunIyMj4xFg+n+/v
+79Na12o1RpEQwpggxGptraEEgFGmMe7ydABwDJpS2tNTdl1irV2YKBYRKRduRFur4ziu1+v1ei2K
+IiCQZZnbGXXXDEJILpdrNdtSyiAItNZK23K5fMYZZ0zNTk1Nj3EOuSBoNGuc+T09Pc1GvHvX3vUb
+1vX19SmlsiyhlBqjsywT9NVCd+qhN8Y46TbNYk96FtI9Iy/Mzsz39/fk80WttVI6DHOtqFEqhkpH
+rVaDc0YZ1wkBZBnLAVhGrC9CzizaJI4acdyePXRgZmZmbq6qlEJLjDGUUiE84SOlLAzD3p7+vr6h
+oaHB4eEhY+x8LWq3mxMTh1WaMo4WrWAsU0nToCGWM2KNzjLd3z/Y19dXqzWmJyck44CQxFqKEADi
+tM09sKDGxw/19PQuG14xMjLi+UwIimi1psgTJo3RhDGORFFGLMCJL76nGPpms1koFABsmqae50Vx
+9NzzT1NKBwYGpJRuqDoOUC4V2u0mIZDPl3WmtLaUmSRO8oWc4AJBV+enR1/a/dK+3bPTE0kS+Tnf
+qcaE8BhjhDDf97mkSiFj2G632634wIFDQni5sOD7fk/f4KpVK1atXtaoVscOH5yZmTLMAjDfF9ba
+LMusgb6+vqGhoVartXfv3iDksEh9Dwv77Xw+1BomJiZy6wvDw8PV2lyaJsZo3yu49cYpPi1Ya9Di
+gpbvtYTeabKCIHD7SelxpdWePXustfl8vpAvWGuNyRhjhFBENCbO54tRFMUtRSk1WcYYrF47NDE5
+uuPZF3dsf2p8/BBY7QfclzIMpGVWcC6lFFy6mwCYOG1xlkNLCGPS86WUlHJrbLvdbkYvzVdnCoVC
+pVg6d9P5aZpOTU6Ojo5mqUZEa2BwcHB4eHhqamp8fLJYLGoTuwc5Cv1MZ1lmpB8cOHjw3HPPr9bn
+LWCYz5kM3WIDhAACAUIpgaVoBk4Z9G7145w6+R0ARkb2NpuNM9avdkorAOCcd0eK1dhs1iUPPMmt
+zoZWDLdasw888J177v5mq9XKsiz0/WKxKIVw/WpQoqE6MwAJ59z3AyklEKKBI1CrMFUxtFPP8wqF
+Qj6XMzbVOqtWq1mcFIulYrG8etX6gf7lO/dsn5ubC4IAkYyMjGRZFgRemsZcHEMFgIhKJUGQ58xP
+YvXoo49ecsklO3e+gJYSAowxJxx3EOhu3E+MThn0hGCaJp7nUQpplo6PH67X66tWrepsfJAwxhBJ
+lmXWopSSM1bI5Y3BIPQyBQ89dP89935z78gLnGjf94uFkicDrU2SRpzLIMhVKqtXLF+1Zs2a3t7e
+MMx7nse5AAADWinVbrdrtVq1Olev15MkabfmKj15SnkYhpywarXeaia9lb5yuXzF5dfs3Lnz4KHR
+Wq3meV6WZcaYYimvtXqlOosQwqgwBgFNtdpsNeNzzr6gVOx95JFHpCCUUmdT1BqAW0YoHt+0chqh
+BzeoraKUTkyMT0xM9PX15XJBvVF1MoYb7L7vZ5kyxnAmlM4KOW/s8P5vfP3LDz9yfxRXGbHF3kFK
+eKudNBo6X6ycfdZ5V1517TnnnDs0tDEIAul5HcUsLmxpiDLWIBpKqUXdaNSmp6fn5+f3v7R7dna2
+ZdJCmMuFBc55FLcazVqxnLvwwouWL1++fcdTjUYjlwsRTJqmR6nau2yHMo9QOT8f1RvJe9/7Sxs2
+nr/2jLNHD05NjO3OssyJm5QCHteQeHy4Xh3aRyhTiRQSgE3PTFWr1UKhUCjk2m2nA6FaWWOMlJJS
+CkC01pLRQs7f+vi//tM//p8Xd20XEgs5yQWbm2v6frhsxdrLLrv2jTfdeuGFlxOQdkELZzUiWsa4
+G1zWABDBFjwSrMkK+b5KeZAA2Xz+hXv27JmcHK/Nz0VRKwg9Xwrf95uNeE9rZOXK5VdecfWT27bO
+z8+WygVrjdM5u/u4NwsfZZrY+fn6bW9/99VXbRHCT5Pkisuue6A52YrmsiwDAErBgvvJ6wG9m3rG
+mvHxcQAYGhqIoohzrk3mHsMpwdM0tRaDIJAUvvmtL//zVz87dnikVOaBx6MoaTRhcGDdLbfc+o53
+vGftuk0AItMUgTMGBFNC2YIwbdFaQEqZmwELD8MlACAaixiG5U3nXHD++ZvHx0ZfeOHZemMuUylH
+KqVPKT106FBfX+/111//zDPbX9z5fG9vj9PzvBL9TJkHfvDgZZdee+uttwOwOEqCMHf22efu3fNo
+vTndfXxjDVuKiQpOGvqjfGY65wCfe+5Za+3w8HAUJZRyY5AJYrVVGZZK5bid+NLnFJMk+pv/9Zf3
+ff+7cVrr7RdGY70JFPrfdOMtH/qtPxkaGnIbYEKI7DaQvMzcTI5vkSCEEQJaZ4x7hJAVqzb2D62e
+nJzYtWvX/v37e3ua1nIp/dmphkrI5k2XlHLF7dufDEt5pZRTORhjAYBSSgg88cgLY6NTpeLOnbue
+Ovusc4OQASju8avecMvoWK3ZiAEQiOXga2UFP828fvHoOKJJBzIxOcE59zzP7SGd6spqy6jHA16r
+tgJfEqoR0s9+7m/vvvcbcdyWIctSbLf04ODyP/j9T7z5prdGCXcmuq7uZZE30hJo0fXoSW94eJhz
+Pjw8/NwzDwtBW1GrkCsqHc/M6VUr1xBCntzxRF9fX5IkbrOWy+Xa7fb9999/+ND8jW/cUunrue/7
+96xYtbIQ9ihtBPeHhobWrVt/eGyiHbXDoEAIFYKdduHyKOjde2305ORkPp8vFArOncipGy0yQpjR
+JBfkk7The/qzn/+b79z1BaPbxZ5AK6oyes7ZZ//xH/7F5ouuAmBhyAGOaG9gkdJmiUSd9tiZUKTw
+li1b1tfXR4naO7KH8zRTMTVAWTA1M3/GurNma3Ojo6P5fD4XhmkWT05O7tq1S2v95pt/av369VEU
+7djx1ONbz7vxhlsF95RCIbwLN1+8elXN94Mjs38pLOfVqj67poyZmRlrred5bnfX5ZWeDJIkZYRa
+q0uF8Gvf+Kcv3PmZTLXDIkRRnMTqDdfe8oV/+Nbmi64F9NK4o4h3JtkjYsbJok8IQ0RrAQEBiBBy
+0zmXXH7ZNdLPW2uYoK1WK8v01HT94osvL5f7kiSL4zSO0kOHDrXb7S1btpxxxspqdYpx6O8t3Xvf
+3ePjhwEAkCKQNWvWbd58IaMCAJRSS27cST3SEXLoKKWmpqbK5TLn3Km2HbtARJ2ZfJgzVnkSHt36
+w3/6x/+TKShXGFoeR3DddTd/8r/9baE8aBSPoszzJaW0qzeGBXO5MUu2ClnbnTqcUgpICRBKKCF8
+2bI1Z248J1cop4mSnu95wfz8fKsZX33VGwr5ShQljIn+vsGrr766XC7VarMAmhLT01uuzc1te+px
+QCMEIcApEZxJpZTz9XTqvBNv4auC3v2T1rparSqlisUiIURrTSl1liZE1BoZY+WiNzE18nd//8la
+Y2poKIiaplFjW667+c8/8dfCK6pUMw5hTgI5Mo3cnR3n7TiILYUohe78R3TmXOqeN03Vhg3nnLvp
+4jDfSwhrxy0ZsInxmXyuvHHj2aVihTE2NDRULpdbrVbohU7hgcYMDPZsfeTBscP7gaiFu1Hnu8kY
+oxQWfNxOrIVLfSQ4WrCBOI6npqYqlYrT9HYZjhv1vvCTqNmK5j772b/ef+AFP6AMaBrD5Zfc8qlP
+fq5QGjYahceB2ChuAOiuuti9LmY7J0Fu7HcNLAAABDzPM4auW3fO5gsuVYZwTgFMGBZGRw/29w2u
+XLkqy3SSJPV6XUoZxypuxcYg46SQ9w+Pjz780H1Wt4zpoCylBIClOlzCKfGvT9O0Wq329vYmSYKI
+nufBojVAa93f3/vNb33l+/d/D0GX8rmpqfbgQP9//rO/lbwClnfc/FCFgWdBd3/oxJvuTZbcrK4/
+HiGUUs7dbg60NQBAgFlDV6/ecMH5m7XWlGmtbL3eQMS1a9fm83mtdblcjqJIiiAXFn3hR1FECKxc
+OfzYY49oEzFKrOn8RZfRL6mdJwO9tQAIgOBMevtH965YOZgkESHIGHF+z5S6KW/zou/AyMF77vqG
+AeWH0IjbQILf+Z1PLVvdzwMC1DjvPEoYAKPADVhL0IA1YA2xGowGA5wYtO6wgIsP7LTlFQcBQoHQ
+xScpAuWUaJ0RpijTAGb1mo1nnXPFzCwQIgr53vHDM5yFGzdsApRJbDkLLPGbETJRzlLPGF+KAgC5
+//77rQJiwWQAFgQXRlmVZcfzlzpV0FvGOl78Fm2zWZeS5fIeAOVcIhKlDCLR2hqDvh8iaX3ne189
+eHjU94EzWp2z7/vlf3/D9bcA8GMeFGj3YMC6ByXUHaTjK985LNrFBwK64994ZEolAQHAAZgnw55K
+/6pVa7WdF34baX2u9tLgcLBuQ28rGpdBYskc4TWNM34uJrxGeE0G7V17t1JpLWguQWtME804F1Ie
+/09PBfQIBsAaY4AAopqYHBOSUIoAhDGOCMZYQiiljFImpVdrvXTvA19rtduex9qR3bD+jHe8871+
+WD7e/Qku7WBAFx8UiTuOdz0gUNKdCJQAG+wfOmvj2cR6oP1AVtp1I2hpqG+dSji1OWI9ir7JmGR5
+Yj1OwkLY+9Lescmp3YS3gSguiOdzALB6aX58S4a+o7YyBgCE8JIkzefKiGCtslYRYgmxAEZKxjlJ
+kva37vrCxNTecg+xQKI2/MIv/eoZ684GAAvGgkGwRx1gbccrvnt0/lh3DlAvO455EhRiduzDAloA
+ALTWaA3ECo/39fX19g40my1ACsDrtVap2Ldi+TqjBSEcgCFSRKqUZUz6fg6APfDQv1Bi4rTpPCeS
+RMNro8MRQgJCliGFXOD3oDWe5zpDOBcP3w+MMVNTU9/73vespVlGMSGbNm2+46d/AUAAADmeFfO4
+g2Ghqcd8wIWTXcmaHA+IbldSShb+zA8KZ1+wph5PIos9n8amXsz3r1w3tH37hPAsADBKM5VYajm3
+1tpSf/D8s/vhnV7gSSc3SckpdXv747X/eM9zwqS0EtwnADPT8YHRw3OzzTTyjDEG21prp8CJosjZ
++w8cOKDTgTUr1rRaERPe5RfdPLK7FUcNSjxDj7hULn5DkRzzvIEjH4/pC7X4FRZJwEd/S4STe50v
+bcfFCg3q+v59JkkSAMhUUi7bJFGHDgghwZlE4jgGAM55kiS+3zM+Nnfnnffc+MYtQ0O9aaal5Ahg
+gZz4BuQkPI0VgDAKvvOth+69+yGVEUSqMiMkceEA1to47njn1mo1n9NisRylSZpknp9vNtvWgif9
+Vhp3cVyMZqbMYqS6XymkR513b7ob3aM2BIs/vqxXaMdlCgCcGdldUAh6nHDc1dY584612u1UsswZ
+lkmaplJKaqpeAB/6rfd98Dd/zqBhlChtxDHNjMehk2E41oIxMDkxP7p/oreyIk3QGEDLtXaPQZWS
+1lrGOCEDWSIPzaQGQt/vmR5vCJkHsNPtFuU+voIAILNHRnHX9QwAlDmiVluMJqXeMYFePOpfNlEo
+GmO06USGLvgtY6PaYIwxJowBSrkxJkniQqGgNWGMxXGMSDzPORvzKNYlWdk/u2/H9l2IwChBMIKL
+o8PnTjX0mlIRteDA/plycaXKCCEWiCHMSMa0Nlmm/UDEcZsLiJM2EGYE4cyL1JxfsACkWYPQG7L0
+gLFAgKfaUElTFVvMpM8hCj0pq9Wq4J4XBFmWcQ5J0s7n8qnSWgFlXEoZZ2k7aoS5HOgaJYLRQCsX
+3QDGKs8XGaio1fZ9P43b0vON0owJlWaax8LP6RgJEVzKdtQQghFCkLcY91WWUE4Eo4IbYmJBUHFF
+eCHHi3EcWRpzTk3CBMtX7WyhsOGRR3fXqu2eXoOWEyJwKY44J7nMNptRFCXWWkTaCTGwieBSG6W0
+8vy8NmnSbPq+n5lGkCslcVuZFlKjlEHKmZQmKUkhorhBGW/WGkGuwD2vXm0Kj9WqrZ7KgFKm1WpJ
+yY22vp9LslkgjHvUGtAohLBBzlqsBV7eGKVNXfjCGGMMYZy3WqnMCUKRoPZ8zogFBEqsEIxxkWVR
+zg8RtVJxMSeUjgEsJyWdWckkA2a1IWCDsEARBG0Rw9IkZYRyytOkZS0IjxFLrLWtVjQ3W+3pLVNK
+YSlD/uSgp4AwOzvbaDSMsQSI1poywqDSakSMhZxi0qZgipwAakYJqc4qKfIez2VZnTMkgjYbseBh
+o9GO0mRoaEgbohNUKYLxk2Q2CPzJiUNCiDD00zRiTKiECV7KtNIGAQAtyTLDuU8pbcyTfKFCIU2T
+JMs0o9ILy8QmaR0Cr2CyDNFkWgNyzj3BJBidxnWdIaGgYp2r5LJUE4KW+gw1pRQQOef1ao0R9HwW
+myan6IkSYTTJEsZYEPBE1RmTaLBRb42NjW84s+JG++mFHgEJwNxcNYoitAEQgghS+Ao0F4YL1DrT
+2vqhACDGaEJoLu/pjKksE1Jo20xVHBYKXKRZM6nkw/nqpJQyy5oWk1VrlxkmAj/XqPEkSarVmVY7
+7ikvB/CipFnpKassiqKW53kAWlBUypT7cgSSNDXW0GKhrE0yXx/N530PKko36625fCHneYwzYdFG
+7aZOkqFlhUZrgnFAk4HFfGg5hywTzdZcFNU5h97e3lXrwsCHufnJAEmrUYuSluQFT3qpMq1WEuQD
+bZBQTGM1fngK4AIAYpcSKn4y0FtrGYF6va5VRzyglHqe96nP/GYYSoQsiuvGKkaF1gaAlopDz+44
+8JHf/dOw5H38z3//7E0r2tG8tVZZHBoYPLjfvO3Wd/t+8Zfe99OXXblxxarK8IpljAAgbN8+PTF5
+6Mkndtz5ue8m7cTvaXzkox+88cYrtYoIVbX5aj6fl0wqmUjW+4+fv+sPP/oXF19+w6f/+5/JsDFb
+fYknZUu0RRWEIVpOaP6hh7Z/9D/+2fBA8W8+8wfLVvoWU62YFAUp+f7RPbff/LENZw/efsetW37q
+6ny+PDg4OLDMPzg2OnOg8dyzu7/z3Qce+MHTiSqUy0OtVtRuZl6IlApC2Px8A4ABkqWKiifFcAAa
+jZa1lhFqDXHa8PvvezjI0Qsv3rh+w3JlWgBAgO3bt/9bn/+BZP1Ry1ijv3/fA2Pjg7fcuiWX857f
+9dLf/o9vtZv2pjdf8qu/+u/Ov2AAqAZIPveFb29/atcbb7zl5recB3TghhsvuurKy/7wP/7V2HT7
+8cd2TE+Pnblx6NZbr121vEQAkkh9/Z4H94/MPfbICNggjeH++3+YK7Xe/JYrhgq9Siecs0Trxx9/
+7rnnxg4eaCplm83mtqceu4gtu+bay0Kv/6EHd+wb2b9/dM8d77j2jz7+GwPDMp8vIorPf/6bO55/
+6lfe/94rLj/nqqvPu+PdN335S/f9l/9656GDBwcGzojTTMMcABCg9VoDgKLtxEYvQUHwSgnv/48y
+tPjpT3751ht/9/abPv72G//zLVv++PabPn7Zpg9dsunf/enHvpC0EQ0ajWjxqW3Pb9pw+wUbf+Wq
+C/7oivM+tmbojt/+0KeSGNMU33XHJwqFi7dsec/DD29Hi2gwbmffv+uHKwduKYgtZ699z713vWgR
+LUYW8e8+881y/peK+XcGwbW/8ev/NU0QDaJGzPCKKz/M6I09pfeuGPqNof5fBbgul7/+M3//CBpM
+mjEa1BrvvPP7jF8EcMOygV/vK7zH9y7+4If/qJ3i9Ay+4Zr/AHD+mRvueGnPDKLSOBultY9+7NOV
+0hsANl148Xv2vrC7Pj8VxdVGM/6Dj/4dkMuD8C1+7rawclMu/3YO1/7ehz/p2o8WXeaGE6ST1NfH
+cdxx9gTQWkdR1NszJEXu8ce2PfHEC0CAUETACzaf8xsf/JU4rWVZ3I5qq9cM/eoHfkH68L27v7Lt
+kfpAefP551189TWbDUYA4DPxD39/n46HVy+7+uD++IH7HwcAgBQh+pX333bRRRfm8kGWtClTUgJC
+BpAgRj5bXcqvklImWdVgY/mylWhyn/7kFw+N7vHyRNsWgLnjnTfe/ra3F3KVdkulWq9Zt+79//4D
+XMKXvvLdh370aLGw/P2/9ptr1/Y1m3NRuzkxVv3ql35Yq+f7S9c8+1TyxX/8ei7INZtzTGQ/fcdN
+52/eoHSLS0UIMcYY6GyAnSbjeKHlx6ST0FwiAKSJYdRPYquU4ZwCUameKZd7ZibV1778wzQBY1OE
+hDHz3p9/47mb1sdRBJi88ebNG84qxwl89u+2AskosCsvv94CGLRIYWwcn3l2zPZM18jB0vLc4zt2
+tBMAyKHxiIVz31Cabh3OVdakuqIAgGbAjEaOYg68ceo1rfV1VrLIkDXGJnf+6SfuMeABg0wr4cEH
+fvOtMl9DwZiFD//WL204oziy98Dn/ue/ePQMysw5myWQjAtCmLdn39jY1Gy+nIvIlMlNHDoU1FuC
++7QRT6xZO7xi2UqdaY/6wkrUlBDSzpoGMm00IBB7ogkSTgZ66KSXIbjgBuJ23oyKOErRsh3bX7z3
+7kc4840xACZf4u9579vbyeHBZd7P/fwdAPD1r/5gZPdkmKMaoyiuAwBjTJtM+gQh9XAYs0JjPisX
+yoAWIWFMWwvclEJejpspWEIBlAG0QnDps97GPKZtr5gvK1V/w3UXfPrTf9lTqfzLPT984ol91jBf
+eibT11x14Qd//b2N+nOr1/vXbbmCQO5//o87tz/3QhhKwT0ETyeS2YJkJYI+ZqiijFMPEp5kM1wY
+pRIAagwSQorF3nYrstZSBgDotAsn4TJxEkpjYgw4w3c3vM/5DVBK+/oGkwjvvftH1blMcB/AZqp9
+w00Xbb508M1vu2T12tL4RPOv/ts/gOmL03mDycGxQ0qB8/YIcrB8Tbk+o3IsH0q5evVAPqAUEEDr
+LH3+6Z0+F4JpSmJKgDNCEHQKSbtR8POVfOnQ2ItCTr77Zy/7xV+4fLi/MjMb/e///RXGgyTJtGp7
+LL3trVetXcl/96N3rNtQeWrbvru+/Wgp3yMkNNutsQN17kGtVmvWG+VCUKnkiIaQl8HkVqzOMy9r
+t9u+l0fLxw5NNBr1XK7knhcApOTkpNxVTmbUI4ILEXHLhTM3u+jsVjNCK598fNfXvnIPIFfaSCHL
+PeIP/vjX3nb7FgvwpX/6dnXeStHfNzA8O1Pd9uRz+/bNAAggmC/CO951Q6Ws9xx6MJ9vvOUtV7pg
+WzS5xx558cUdB00qTGbRIFigNgdEMgIEsjROpiamewqFX/zFd11zzUVJBO0aJzz39W/84JEf7WNU
++lI0q3PnX3DGFz735zfcfD4AfP6z396/vyllGKV1rc1X//nuqNXo68/19gXr1vfdeONmwuanpveu
+Ghp6+ztujOPmshVrA7/vy//87Rd37i0Ve+Mks1ZTSi1az/PsSYUTnowigVIIw9AYQ/BIjGuaZsYi
+ZbJcrszOJV/75/tuevP1q9bkM4WEwMUXX4AEdu0c/6d//F65uDxqqPlDM+vWXfDcs4f/7E/++598
+/Nc2rB9U1rzvA+9C4zcatU3nbrzhjRciAIX8gz8c+cjv/XUr3vcfPvT+szetPmNDEWhbQ8QhIIH/
+O3/4plr1GikK69atOfPcYuDF2gTMqws/aLfj3/7wJ+6757OVSuh73Bp6zZYrNG3/6NHn77rrkWJ+
+ECjxA4/J4kMPbfvI7/+X//Rnv9fTH/b0io//xYdWrx8Y2Xvw/R/4tfPOW5OZzGT+N75+32f+9k5j
+IFfIT05Mex4AWABbKOas1YwyxIUsMKcPes6hWCx2xzsCunhGrROENIqUJ/P7R8bvveuJm265Wnoe
+EB2l7cAv/vMXf5i0/SxpSY95zLeGUSjee8+2Wu0T7/yZm6668tLhoaFf/sDbKIU0hfmaGhkZ+9FD
+z3zxznv2j9Ty/eL8i896w3UXZ1l1/9hMpuJcLq8VXP2GS5I0ohBEbTU31wLWnp2cp5whqsDr2bF9
+/3e/++CW6y7t6QsnRpN8kSlLvnjnPQcPHh7o29hsVb2QUcql4J//3BMzs3/z0++8/prrziv3937k
+Y+/3OElt1JwlI3snHn306b//X1/eNzKVzw9MTU0UKgWdNt12sqenZwGEpdGS9fUWUwret7725N98
+6ktgcwCAkCJkUhSiuG6ttoaFfu/k5LTwsp4+XyGZnjnc01OOY6LTMEuJwiTMsShJk4jk/IrS7ag9
+SXhUKhWXDa5Yua6HCmo0jo9P7dy5P0tYpmix0Ac68H0ZJ60gEELSNIvjuM05p5Rnql4qVRpVSyml
+XKGRSdu3wQwxOdQxkzO9fQVjCvWolStjYAov7TskZT6fz0dJlMvl4jhOlCKZJ31iMQ5y9tzz161c
+3ce4np2dnnipufPFl9KUIYS5fMkLZLUxT6iRlFktjK39w+c/9u53bSFAwQogp9PT2BhDGQRBQCnt
+Ru1aaxuNhvQAQRtlZmfneyqDSdqcna4py3xvYH4m4byctLnwhcdMoqYp59LztTFo/CBYHvrMKLNn
+Z+v5Fw9bMNooxgVnJRn4wLLMKkGhnbYMgIqzaC4JAk9p61GTNLJcESamDzHo9WWpOl/1PMalTtJ2
+wa9kWmvND4014ozkS+XZ8cNB0wvDoXLFHzt8oFAqRlFkXPInnrXbaT7XEzXx4QcmMrVfijBTqc+n
+wrCHQc6isJo0Gk3GCeOUGJclhBcKuc4mdom72SVDLzgDhEJRSD+LWhnnvtaZtZrwQpQoYwJKqQih
+mc4iIpOhVpkBQbgwiCzUQG2qEKAfQQFFpE1giIhtA4jI8hBA7mVGD1SSA4BBMIS4azGfI4ip5IDG
+iIBninPuA0Bi6jKQCJDZ2BM8M5PIEcDjQua5AjWTQ8Hybcp5o53kCqFSKaXACLHWJlqIIEx1zDjz
+qBUe59z6RoBabjVljDDQiIYiQ0WJwdhkuaJqtQ6tXb8cQGQqE1QQoKdRX4+AaGHjxo2EcECqM0Zp
+QaVtL49AkGi3p0ZCjTVGGxSSGZOiMZlGzwuiOHbZaSiHBRM1LnpzDDsULCjpAIB0EjihewMAQPQr
+fwUABAuwwIKPeOYQAGuNcgkDJadOPEawRohYCBrHsU607/seZ9amQDET2HFidMlHFkzKUhbmZw5d
+cNF5fX0DymRCUAIacAl4Lh16RKVVX7/o6SnNTk9KXqBUcOapiFnL0Rgn73NCwGqlVJYhpdTjgqD2
+aK4WGQE5anyjX2aD7b52/WSPeiWMdWFdDDFQ59qB7pV0bbDEOfgBOn/U7opmibUWwVJKKQO0YIw1
+VoMJEUXIAkssQ6qzzCotpVTUiRLuTzWASytKijmv2YgvOHdTbyVHQRFw4qYAONFki0uGnhLuecJq
+uOjSMw8c3B+1G1FKjDFofWdH7voGa6sznXqeBxSV1mmSWQz7esNmcxaRAJoj8DlwAQCAoH0ZZF3V
+RZx1cV/8xtIjapPFXxEWHfM8J7yTRgRpJ6OFNYhYLA1Oz4wyoJ4nrDZup5oq6rRchCAg0gX5nVA8
+PDFXrhTPOWcdQdAWBZMuevLEkTwJ4VIAAGVw2zu2FEq4bdu2YimfpqmQGgCcEw4AOG/vNJU/uP9e
+CqBtluvLb77g0ve9771pAmg50kUjdxEdT+I6ys/7CJrkGNADAOCxRx+FjjvtQvaiTubSRmv83vvu
+rs/PGau1zoqF3Ozs9MjIiE1Sl+4YABaUJtpaOzRw5h//yUfe8pa3EAKMSAAQTBgNpzFQ31pANIyR
+1Wv6fvGXbyv2ZOvXn5GpxI3WrrAPC54atfrzrVZd6ZQw2tOfXnTpimI4AODZpQvCxyQ83k4Sjy3l
+WWs549BxbDO0I5DYmbk+TzbSLDEqkx4tFXJPPLGVs/mKL92eHRGt1d0cOys2bv7Z99wiWGAMUkKM
+7rgenjgtneFQMAYWkqJCT0+PMdaToSTBwgUdbw7npb3l2jc+8uiDiFpbU51pPPj9h2++5d2c8SV6
+yS2dyLH9rTsp6oAAAO08vk3SbPcLhziUKxUPiOmplJrNaquu+4rLPK8z1Dv6eKOkMcaY2267WTCa
+JjHjOUIJ5aC15RxOXLhcsg7HGGSMuexk2pCVyze2m8BphVCFkCKkFhNj4zRrZqqlTfSmN16dzxEm
+kiAwSTL7rw/d3ahPgFVHfChP7Og6TR7tW/ly3+7OpoYAWo6WAx59UORgOViuEw5GAAqVivq8sibK
+hRQhy9ImQjI5sf/A6K5CiaPUKBVKhVKTQPM8EQXwSvSKS68AIJQKzmjHvZ7GAPGJI7l09Vkn9zgj
+wDhj/QNlZWrKzCdaKbSp0anRGhAZ1YDtNBF82WWX3URAZklr2XBlbP/uL33hs2A0ag6249iNwBG4
+0tQcx/MbgBMq3QFELD7Iy52+u+Sc67s9ceSgnVfhE2AWiG60p/eNvpBYLcN8qlmxssz3y1sff9Lz
+mLGR1Hmh/XJYwCwNuMSUpA266YyrKj3rAXJC+kBASCAAguYI5E4j9LSz4ncizTzPK5UqjUbDZTOE
+l0uEjLEkNVdcfnWx0MdEMDMzt2LVym3bHn/y8YcIA6WyjmM0utlKO07Ap5NcBomFZF/QarcmJyet
+tYVCIY7jMOcXi/mtjz3SbDYppUEQuBxUSqkwDI3BXK6QZXbLDTe++pYsXV9Pj/hdG2t9PxzoH4oj
+1c2Q2A2kc3GzWWr8oPiWW25DKwv5SrvdNJB86ztfPnDwBeEhZSRLkQBwTo1VlJyC/JH/Nrm2u7iX
+TCUzMzONRsMlwiQEK5XS9MzEc889g2ByuYLWaFATRtI0pUxQyprtpH9w+eWXXfPqW3JyttkFuRAp
+AdrXN1AolJrNpgvbdIJN14qSpqbZiNdvOHfLdTc1Wqm1treveODw7m984wvTk6NANCWgFBAERmGh
+ysVpJEpdym2KiNPT07VaVQgmBEuSuFIpB6F8ctvWJG1zTsMwTOIMiOWcUyYIoZTIVjN54423EB6e
+gpacxG/c0AZwMZU0DAorV6yJoihJErfndt6/iJhlGVLUFqK2uvLKnxroWwlURmnU21fYvuOx7971
+tbnpw1wQAqiNJUCsPTUS579NlIK1enZuulqtIqLLV+L7MgjFgYMjowf2MuZKZYDv5/0gYIIGQUC5
+bEXpGevOuummt4JdWuzOsZux9J90UjY79K0FADo8vDyXy7lEfF2e44Y/EAXEZtqilT/9jp8Jw0Kj
+0QgLuXIpt/3px7793a/MzRziEjmjaIHRU/BIJ0Jzc3NTU1OIVkpujAFi+/v7JyYOP/TQA4QYytD3
+PZVp3wuE5AuRwGANfdNNbymWh1C/2tSucNLBm4yRBYYOAMA5X716NQA4zwiyKOOzxohzSFNlgS8b
+Xnv11df3VAayVBUKBSH4s888cdfdX5ubPgREq8wsSf10chTHcbU6V6vVjDFCCKfJ8X2/Wpt75tkd
+E5OH/UBIjwrJhBDWgrXagDGAUTvZdN75l19+VSfc8VXTyXkkvFwOQQCE5cPLGWNp2km03/HyoVRK
+Gmdt3/eTOJubrW7efPEll12WJFmj0SoUc9Kjjz/xo69+7YsHRvdLzztONZxTSXHcnp6e1iYrFosu
+/iIMw1wut3379pdeGhkc7GeMeJ5I0zSXywFQS8D3fSllmqbXXnNdqdJ3qqSwU5a/HiGbm5vbuvWR
+nt5yEHhpmhLibOWdrOYAoLUOggAADhw48PCD/8I5MO6SHtOeyuDVV2257NJrKKu4GxptCSGUdUru
+WOrUaovS8QEiIkGnTD4S3v+yVqEB6MTPN5qN+fm5NFNSiCDwm8161G4ODQ1ErebDDz+4d2S7C4YC
+QJclFtForVPIAr84Pla9aPPVH/rg71HiLSl+4d+gU1g6QGcqnZmZeeqpJweH+jmniC7QsBO5QWkn
+sbnv+9baPTt3vLjzuThuBqHknKvMSpHfuPHsW275mTAMj+Q4A3Bpzo6jkjnSFS/TJHdkgYVYHJXM
+z88nSSyEIMC5oPV6zdi0r6fSaFaffHzriy8+L6VO0zQMwzRNoiiSHnetpT6fn2+g8f/jR/7TqpXr
+rWFCLC165Hh0yqC3mFFCjdWu6sqy5UNJEmmt3ZYkSRKX/jbLMs65lLKczx889NLWrT9qR/Ug8Djn
+YZifn69Vepade+65F190WW/vAABXmaKUMya70GNHX7AQr2M7GZte2SIASJKk1W6kaQqALjeyNSyK
+WoxDpRzW6nNbH/nXnbueE4JRgi5OCgCkFO12O8uycrk8325U51rvvOO9N7/pNgChNbhMYq8mc4Oj
+UwZ9liVSSmNVHEdbtz5CKQ1zvpvvQggXIeYyMyGiUqrg59MszrL46e1PTEyOlUoFY1Q+nyeEUcqL
+hfKa1RvOOmvTsmWrgQhAoi0u5iqLHv7o8iAuiUur1UJEpVOllJQiDENrbRy308QWS3lAvX90z/PP
+bjs8PgqohKTtVpzP52dn53zf932/2Wx6npck2cRsdct1N/w/P/c+bRhnHgDNskwuMTD8mHQqa5Uk
+SeL70qKempp85pnthUKBC5qmsStWBgtpHJyBEDObz+eNVfl87sDBfU8++RihhjGSL4ScScYEASlF
+2NPTv3zZ6v7+wf6h5Zzzo2rVdd84O0GWZS7XvDEGwRhjOOdB4FNKlUoRUQjhSalU+tzzO7Y/9Xg7
+qjFqjcm4oEnsSgQwpXQUJWEYMipeeumldWee99sf/ogn8gBiQXWoXcb8VwnXqYQ+y7SUrl6iHT2w
+f+fOnZ4n8gXfyftSSqWUUsrzPGNMIMTc3HyxUPZ9nwvaatVfeHFHO2oCaM8LwjDvyYAQjpZQKjjn
+pUp/EAT5fD4MQymlEMKxMovU1W3pej47/VIQBMYYa53JjHRKNnBSq04+88wzL43sMTbjlGiTWasZ
+AY06y7JcWKjXG5RytGRycnrlytU/+/PvX7NqnbWM0iO1J45VE3HJdMqg1wq4AKWMEAzREIJPPb2t
+Vqvl8sIV2erqoQDAGGNVK58rt1uZteB5QRhKIWFqeuLQgVGX/FxKGQQ5V6qIMWEpE0J4nudKMHSg
+ZEyIomuAS3PreZ77SZIknDOXU8r3JWOsWpubmprau/ux+fl5SiklpN1uh2HoC392dpZKQwgxGrNM
+eTJXrdY9L3j3u37mrE1XNRqtYrGcpVZKatFBb+CEq64dj07dqEcAAGPRGLUw9mHbU0/u2fv8mjVr
+CCFJknSzQxFCKLRVZgXPE/C0MtooIUi5UqiUixMTE+Pj4+12k1IqJXd1NUSQd1g7zs4Yc+cJybtu
+cOyoU1iJEM+TbpEPAk8pdWjswO7du8fHx6WY9zxPKaNSxZgwmclSLYSI1FwQ5JI487xwcmIagL/n
+Z3/ugosuThLf90OjgTHQGrgAAKtNylnwKgE77XWptm1/oNlsaq2l8BljWndK5qBZMDF3hUKLhBDK
+MAgCl28xjuNWqxXHsdY6DApkoe6Fq8XgIA7yvd00dZ7ndfPehR5aa1vtxsTExKFDB6rVKgBIyZEk
+iNiOEq2tEEIZzDJFKUWcBWDW0Jnphifzt97yjiuu2gLgtP6nhV6Damztp3c8PTY2Foah4wCMsTSL
+GQhneCOIji0QBESM4qaTPjnn7o3v+57nVec79aoWp4kCAGSSMda9zJnjlVKzk2PNVr1er0dR5Cps
+OssqF6iUQgKEEKVUojJrAAB8zxiDh8emK+WB229795lnXwCGARLgp0JpcCw67dBrk3DGxw4fev6F
+HVpnpXKeEMyyhKLvoKcLUrnVxlrrsgw41VvX3sIYKxYqR416J6drQGeqzrIsTdMoitrtdpqmDIxb
+1RENY4wQ7KzGNkNEylmWJXHc5h7nnEdRZDJy8MDYWWdtuu3tdyxfeQagAKA2Q+qdLiPy6R/16OoX
+2bn56W1PPRbF9Z6esrUaDe8IJAsCO0EghMRJmywQLIqyc7GiboHtvgKAxk6BPFyUlRQRVep2c2CM
+ybLEuREAQSm8dtRSJnPdbcAonUVRVJ3Fiy68eMuW64eHV1kDaAnjHPA0Vl9/LaCHTvUorXTy4s5n
+94+OcE6L+Qo4ZHUnpygFQikF0ikxeFTDrDmSu2/xBYR3HP+617uvPOEvVF7KrLV2oSpzuxWFYUgY
+0SZDxCiNWq1WmsbXXnn7tdde6/mBVoYzCYSgXbDunh467dBbA2mqglAAuEq4dnJ6/MknnySgnFmO
+E9pJf2KMtVYIsdiZp0vHa6cy2SuvRESwjsNkzs3PcTBrNSEsascW0Pf9RqM1Pjm5evXaG264YeOG
+S13ND1hQzVJKT5Wm7Jj0GhU9VUpZaz1PAECaplrrp57+1zRN0zRlQNwWCbDDtTur7stzCXVLgsHL
+86w4xe+CC9+RCnpJElHaifnSRimljFHuymKx3GzFhw4eljK46JIrLrv0ynKlV6lOacokSZyMiojG
+Ks7804TJawC9XaiefqRyozHIWHNyamLfvn1z0zMA4Ps+ZwwXsjotDFJX/Jcutr28khHBgnFmMdsh
+VC1U/3WGYmMXariNjh6kTF64+bKLLrxicHg1AFgNhHdLwrtC5NaioYS++q3T8eh1K/VrDVAGxpjZ
+mfG9IzvHxw4QasrlosDcgkldIyJdyBZk4Mjodl3oSKkjNUa6PYSInGgAq01mrWGMWMzm5mamp6c1
+K124+eJLL71soG8ZALOWunwqp4+nH49exyrLYIxljBBiAO3E4QOjB16amZnO0tgVWgzDjtrLgYsL
+W5vFQL/8hi/T12ex8XxhrZ2fn52dnQWwvb29vb29193wtlwux6hY8IdyEtFp5OnHo9cNekcLs9tZ
+GQ1Yu2vf03Nzc7Ozs3HSVkoBYD6fL5VKOktgEa9fnJurm2+6w2GsRcTpmbY1aIwRwhsaGjrzzLPX
+rVvneb7zf7fH1fK/dvT6MRyrCSEAFCwiEkoWjB801jaL47jdbk9PTx06dGhmdiqO41LOd+J8lxzD
+ccYNa63bT6Vp6mBdtnL9mjXrVq1cUypVwqBACAOAJNa+f0TjiACIdkHj/1p3w48d9EjcUmwBwKKL
+S8m0VtPjh51GPkmSNE1dYSJrbVdx5nleGIalUqlSqeRyOU2ML30ACsBcrXtCjq6W9n8p9I5eyXCA
+et0MskAs7UQ0LLjjL2RFB8frCYEu07DWGgOOjVAKVLtKqEL4ABStBXCpDDpqd3i9Gc7/B/yCsT+K
+i8tpAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+      <record id="brand_willys" model="fleet.vehicle.model.brand">
+      	<field name="name">Willys</field>
+      	<field name="image">
+iVBORw0KGgoAAAANSUhEUgAAAH4AAABmCAIAAACCxLIpAAArRElEQVR4nO28d5SeV3Xv/92nPO3t
+09RlybJsueAONuBOtTElNN/QAhenB8gltEXuDSHhrpBLfglwEyC0HxAgmGJTjSnG2DLucpMlNzWr
+a/q85Xmfcs7evz/ekcPFUi4ikPnjN981a5bWq5lzznye/eyz9z6FRASLWgiphR7A/3+1iH7BtIh+
+wbSIfsG0iH7BtIh+wbSIfsG0iH7BtIh+wbSIfsG0iH7BtIh+wbSIfsG0iH7BtIh+wbSIfsG0iH7B
+tIh+wbSIfsG0iH7BtIh+wbSIfsG0iH7BdMzoS8H8xh0/+GIwQ0oWZEAH6CAHGB4+ZfCvOKyf3x00
+/+8CcEABATKgK334HvJeB4Bj9J2U2RTcBJwDkAF9nwI9ACVQogekg0aO2PhCiI65by9Q5AkeYAiB
+NACAgcCVEA2IWCoABbJCoGMeEzMDUGreLESEiDKwgYIXEeInewU0oBkgCDxBo/QwOmOJjECEhUgp
+EbB3WoGUAtSgwSP29Z+pY++SnEgxTx5EgGKYHIFniAIUoCljW5QkeUH5sTY/MIUn0YjI4JMIbJwz
+BVtGqOeHHjBY0Cekjkk0SsArAMYQuuyISsWUZqqfeQOvFDr+59t8sqMFsf1jtvoCeQCFUqAMSAHz
+nkcioGDkgkBzCAGMeOQloug/Mr6BVRJRn8iDGS4EIhAYIM3CThkFqFwUEXvOY7IgkxdpGEhZhhqk
+NAAF5AxWKj7MfUEs/edljvUXHBAAEAUHWO6Ld8RKq0qm0kh3AyigCZgMCHQW6f8Q+J8DpAEFZdNU
+37sVGx+afXQnrRhqXHRusGYt1q2Q0LIDrHKDeYaLxAcQ6xVPowQwBBt5BQE0PflKLayO2eozV0aw
+8AwtPeMyKANEQDjThSW4AlCwMYKKs5hiLPmVbGvgE/4PwxTgti345Ddmv/7dOG2HlZrP+m2fBq97
+ZeWPXpE988wcqiHWExhixfdIBVnH7p/G9t3wHmtX9lcMc7VV+Tkfy8xEC/YkjtnqrbFgCCOVgqGG
+4TCRYs+03/qz8seb8p89UFRs/vxzh3/nVfHJZy4pDI7R7I9oCnmehw9tmfj7T9evvaUZEZbXU+5p
+X7aqo/kXvz0zErTOWcdBFWRJYJkwm8fb7i0/fC2u34T2DOARN9RLz4/f9V/yU84Mw/CpPf7nP4Bj
+Rl8CosCBIoRVlHhkP75ww9TXbqpsu1ujbMQavuQHHlI7OvibdxxYf/yyY2z/qQjyPE/TNPydD1R2
+bAtrhNil+SGu1ylutrtlHW7ujvuwZzxZU+2Rd0o3POZ+eHfjXX+Z7d2la9YcZ733fmYc130fW3al
+N38WwID+Apo8/r0IxwE5QyBgBxRABrQBj26Rz1rPCSt//R3Tv/ve9t98YGjvLdHIrK146NiF9WLp
+yP7dD6MoEzCYB2H1HIAcyLjtcwgKQBiCEn4aLj8AHABQtF1vKpueRMnU5hzYAxfuO9C67O3FjkNJ
+ozGTlKjUkrJZ3cn2UFr3gJ4LcuCAKnQUZ5rQK/75Y43XvE0ObWusHHKx6fW07tcCaoRROPfwXa2/
++ZcwyKdQoIQT8g7IfYZjjsQcco88RVmARYAcyDGN7Jdv4ahWnxuEWkHgPRsATkEQaUCqsHCq7T/8
+hfBdn2iUB/WSCma6RbreN6HLuSBHOVU2Ljkdw0sVlChHAgVlMQhHVV2HcCjZB1o76AKSkFrGgABP
+HHKf+XqkW3jzS7BmeQmMTE7if3w6fWRrxA61oNVVB7qdVrzOX3hy2Dt0YM+9y3oVVa131zSqHohQ
+/8pNxSdvQKho+fKpThcqqSOa6XXDVuinJhtk0m47yUsVRQCIoDUg9CtkfhqKSo4h3ipPMGAw14/F
+vR4VPbG0fZnYwCgj4tmwBsMB3kjfmw9+2nzkk73goBOpTpF79sXl2/60uu8J/N0/YGJfceY5jatf
+j5FGlcFKNMQCftCbQQoY5bXRnAKJ0rrqnBgBdk+mH/2C+/jntVlKZx7fO365ybP42jvxtZ8ktXJq
+FMPbd0LbZUtOb/+v99YveCZ/43P1997ccdXo/HMx1io17GO78JFv0UOPZEubNvdVV/er19iXPLeV
+z05841ujcR296U5sbeFMZEAgwuHU/JjjehbS3pIosSgBR7k2gXXH4MKP+oNBSRwGBaCYOyjaZDTy
+5QZQ4cyH/mno419Ef5ZrCdafqF91VXn1y0J08JHbDj1xsHHmGY33/T6ec0bqkXhoxWAiBixmhA0p
+gEmVMTvYkAGCdUY5IHpit/vy9+qqm0k7IvSBpVv24GPXFDLJdT0864q4Gqw+Df/jHebFz0KA9I7N
+SU/U2An9K58du6CwWftL36w/sNUGNVdN9M62Xr8W7/oTvPQsHDw0dOcm7NhTVHX9aRtsVPU47GsJ
+UAiOfc7rQ6pKwaEEABcFJoW27hhaOGqXXrlIDAAv1NC24XJsfQztHJtuKv/p8zPTE63RoVq7KFeO
+5SNk/vHr5bWfPjTF5vLL7Z+8Fpefm8NFpCEKADRpD+2hA2U8Y9sOHBwv9+2xL76ibyvssqpJCqB4
+4vF6p1MGok9chdNWVlHgW7dkmx9UqyItGWaL9rpTm//tLelVFwDOf+KL0bc2Kt3CK68szzoxNt7c
+usl9+0ZIp1jejLpAawy//4r2a5/dAVY8cVCmOjOQ1iln4uzToUMDBfVvpk7HntUTWVjAwUHqPsdM
+T0ZG8lKF/3Grn7BqqQM6TrcMeoyPXTv++esqvojctqbkYRKjncEEct8D+e13B1PT0erWyje9Fn/8
+VixfkhNn6JIygVEC8koZBzgYFmx5bPpvP17euzl1s2tFKq99SWkCnSPqZenUhEFntgxHzzuvvWFl
+ffM2/Ou3y1pWyzTmSrhW8sLLszc/hwB6+E79qWuQzrqznq6vfm5SG/K+4z/8FbtzJ4biXr+s9KLe
+21/c+sOXHQJWux5fc73eskM1luGqV2D1coghYU9P4mZ97OgNOCWVRIjgcffDeOBh9YYrddw6lhaO
+ogSAEqeZgUAcWvHYqjE8+HBvdtrasAhClUF1xUtgLjoruuxsvOAyrFvrk1ZRiA2URV3gwSWxhiEA
+IMA65F2z+aGhx7Z3MF78078GjdHw8gsQGMpMhdEtp+Ml5+OFz/EI5dqbacdjtESQOrgIp5ybvPM1
+baC+/fHsNX+NBx5Pq6Mz73hl9ay1DUb+o7vVj+5OqERQq45Ldt6p5p2/jdCsn0nla9/jH96qlPbn
+PI1f+kJVC+GgtSrAA94CRaKOtcwXFkU/iIQQ9Pv4+o3ZjXfqi86mk38d6Os9ySuqUw8SIK+idvVl
+OHNs7x+8b+V+hdhgqIHnns1XXR6fcgZqKzCWtAPUHXQhUUCdHHUCvE7b+xPVxFANBplCCjdULdsy
+W69JLWnx7XfLP1yTjjSz888Zrhh00goMnXgOnvP0Wr/MbnkgbibUm0yjZtC3+u2vK5fW9P134fc+
+FD60K43j5E9/O3n55SmALAs+9SMyCnGMNLdS49+6UKpDZersLZv7H/pS8sTOuZXDQ29/gz9+aUEI
+GBAIwaM0sKTVsc+yAJMCBCj27g9vvV/f/5CdbPtiUGb55SRHE0spItMFi2Re+pLKX7xP7Jg0R1O1
+Onvr/0wnDvSkzKXnpJC8SEVKkb4TcTIrIpOPy7v/2l/1Nrd7SrJSvBMn+0Rky8Oy9hKpLpXqKbuH
+l6VDw3LOOXLDN3iqx9+5y697hVz3oLD4n/6ot+ZcMadKdUPZWs7PvEK60/L//LMcf5FD8+DY2t5f
+fEAOzc2JiBe+6Y79F768XT1RVjxL6pftP+0NMuGkx/Iv38xPfIHgZFn+QvfZa7kzIz6XVJxI6rJJ
+SQ9IwVkhXek5kTJri8icSFtmRcqyzEXEy6yUIl5KyZzPRERK8ZlI95CIsMjkhPz5P4g+NcMy+fuP
+dH2WiUjfSyZSSk8kF/EuE5c9FfBRrV4IzB6J9QIoRNv3Ttxyz6gwCublo/G5p2Jo2EGxIzEEZSxg
+2pNmdhKb9qrrbuKf3OZm5sz73qSXDEkABnSBpgYce8XamEK5VU+/pH/jPdh0CH/2Sb5ku37jlfTT
+v8Pw6pTAD22PpuZgIheVHIXGhp1X/HHx6G69a9zU1y/549fg7b/jqvX6nBQNCW64P374YKVRw1R7
+KiqW/eEVkBx/869T134nfGy3Xr1Sfu9l5tXPn6tUIoBiZ4ss9hIrBZchibtWjKLBCpAPkYeogE3R
+EROh5xpaI4nEICwVPLxVmRLA1hlOOXPX/dmXrzeUhfWEb7iz8sbX5S0rmgkKCkagCEKD4vov6qjo
+HWCFYMEiII9v3lrevoVD7fpwp6zBM0/3yuqCtQ4dCIBBifd/kr/w9bTfpcSqfkHLl6tLzoZBf1DF
+LyWxhOm5HpdB6dXy+tTf/r7+f8+NP/nV6cceGnrk4OzGzemtfxfHCGfbweZtJu37mpqitDqX80M7
+at1ZFFF64tOSP/9D96pL+7GuAah5IMOdWxuTHb80UKHlisb0od1vfs+KW7ZW2jN2w3r9njfjNS/a
+a3UFUBnsP3xqetPDQ0EdVJmZmWr9xX91Z6+r+rAXqwRwISKG+vIN/MB9nTolO2fbq06sv+nydM2K
+hGAFjhRBJR65htm9p/25a4Kdj5ixmu9O6we2Yfsufe7pXs9btPEgAyYNOoJHO3pwCbGkOlzWjObu
+TPG1Hy3PmatWpRqnrcPqUQeErGBAAAQHfWfpwUOqO16VjL0BK7tyJdac5AQaEKCToIYSDz0S9AvP
+Eh0oho8/c/Z9z8YpqxrvfbdHr/naS5t2jH2m9s1i+374tB2EVRtVCosyKJJ670Xntd79Fjz99J4C
+A9P97pCW/kNb0vZ4c2iUs4kioEonx8e+u/JA99CwHX3FRfpPXsMnr561eghIplzvjrvsp79m9k1A
+qiioXLcCjUQFIVIYkO44XTV4fHf6oc8lW7YEo1YOjsdXv8PahABWACMUFPNBQx+f/mZx4621egKr
+vC/7/anqLXeY00/2gc3Fh6IVD/wHCY4wix89mwUDOlNSY1/e/aDc+xAqkaNeECTVdWvyIMyBUAOC
+wVJdopuuFXabKnYqzARisX49RkY0YBwE6BqqtSd7t9xZ6fURxrBNlFHQMq7fyScPTL30WSvf9SLl
+oXoZdo+X41O2YqLQhp0CoMkzjxt+8+taL3++q4UdoAaQFx1HDNfYMb5v8lCz6AWxRr0S9NTE+OTo
+2We2/uBF5qUXYqzhEFaBoACyPP/8NTyxJ1mzLNvXdzYee8urceKKAAA4AMF5sJq960736MMJ5eQ8
+D7eSNz0fY1ULDgsFD5Tcr6CjafgHG/H5b4x0+lk1iibTYHh09/jECd+5Ba98iV492iMKRQOAAKQF
+/hjQG4hzZRQEKPLy+z+LyjYMcV7CtnRSAcAANMAggbeo94ry8fHqrDdBBG1mEqPHIq/QYgAgRh0l
+tjzO9z2IvItI+xWj7RYq37u9/Rf/PGSWV676bcxpVODqsc77adZrWBXlTCnj7BNGPvOXnfWn1jKY
+HE2VkdVg8mmW15Jk14GlE134NK+w2T7t1q0P3n41XnaFWb9mFmUCG/ThIwAO3/92/Wf3GonRLmaZ
+Ky84F6++uNBkvbhEOaiorjB+KPvxbS1fIIq4WwbPeQafvrpvmUGIFDx7zQ347iPb3H//pJk4BM+F
+TriVJNYNxz3c+gC27MDyYRgFAjxgwYBmeWrmcNRUQkOcggIw17a3bOYQLiitEHxZHJrQjgMgVWDl
+IM6BMTkl+yeIdOE9SrTaLti7r1WmQJkbgBFs3cXX/DDcfxChR7eNs09tTR5UH/poa24vli1LV2xA
+MtzVeQ/wXqIwhDFSCgpMd3OsX2GZe5FH4MkHyNAxUtaqSU9QZLoQICsDpyvVcNWKxu+95uD6NbNw
+VdjAMRRKAjodeWyPGZ9DVOUDbR4dja9+SbasNcfOaZoCHHuvGVu31TY+GIYGjhIeNs+7XNlQw4ZQ
+yPN+2XbI8Oiu6oeu699zN2LjGhX9X64IrnpJNiutyhC76fbdW5E7ggIxmEGDOFY/lfDRszgvylgB
+kPbDHYfykLt1rU2APJ/ecwBpqQW5OKUAEQ8ev+d2/+g2bSOXBIhVIWl361bcvxVctMFwvvjhnRNf
+vcGmbWkGzBkuO7v/45+qm39Cie5EcTK8HowOcR3a6Epo4tm8l2lCpeEOduYe3RepNEHRIxmPkEa2
+JjboS1nR7SyVgDEUp8hRFlOP70VPJ8AIG5NmED8bFB7Awe7eGzdBTC8hpRv11atw3tMIdrQXhSmW
+OFRLzf0sf/Ax2rnLhTxbU279uvLKi0GWxOOJQ/jJ5vCBnd0nto9f8838s1+Jlg6hn5oT1th3/rZ5
+9fODnpFuSoraj+9B5tT8NhhhgQcgR4hwjo4+C3Kg2i8wPo52u+pVc0aXOgLnycZ7cN33AJeS2QsN
+TckT+6sf+agJUxhFzCmXgW1FD+3y7/9f+P6jbvON+Kt3Bh/40JKD0xhbNt3uqLq4c0+N//Y6FykU
+JrQGtB/Ey4qYxGCJ5rgedlsIAygOZl3jx3cILImppMWYQ+LhnFcRKYd6VMnRx0xnRAJYX5+dxU9u
+zeDA7qAlZy0oSAFs271q+0EEZSXv+jCLnv00mCAAEAJhCdUbD2Fv2Rn84/VBXONaM8+1uex0u6IC
+pYL7thbv+Etc8Qb1+nfWf/eDrQ9+vmymc70UF1+Oj3ywXHUCfLe9PilZ9VvNlbduArcFFqXKKloJ
+J07gjiXCKY0DDIzJ27Mub1eGYxSlZDkSL49v63zqmlrKKy48B5UQD249cO31yx6aQNgsZqeDJXWG
+77Unq81mZ+NteuPbGqrTnt0fV4N0aZBMdYalgac/Ldx5kB/dEYSmE3O4c2963Y/Vn2/ou7gCmGX1
+uWHbqgXI5sC+CYsvfbX3xtcFFSuJDQAqYUR74q5hf9JoOtxc2Y2yspOPRK0nUnzlR/XXXQSDOkLT
+R9MBEWPX9rafqTfhctPTQeOME6YbtaEMYKSBzdlVgd6NNxfjB1tJC5Nlc+kaXHCuj6oOJd76v+Of
+bcRINPv4483HD0GbHlTjsufiv71ezjujUgIuDiuVoFSKfFbnyIuFwsBdE6COMa7vhggBEOsk7EHi
+suz7fsUEiFSj44q7705375V/WaIiQ5MTdvtOcNhXWTA2JFmuxFeWD6PXq2V9qH3I+xiq+Xw2iJSt
+xZjS/NJXqW37irIXhaVrmFo7Vd+8ybzu+dHqUybINtasCk9YhR/ehvY0ljaRqPbd9wafuTZ42XOy
+1WP7gNCiAQBKAY31J8wNVbF/xtWdqsXQeXfjrdWv3NB92YVlFJgYgQOKbHb//rzfq9uIdBLpAFFS
+AM7BaHSBuoqjG27tXX+r8iWSGFM9PG0dLjmrAzQP7cXETI60syRuUg1zhOGh6nMvNm95u3/62v3A
+EotgblbNpSj7xslcrRJBGRwOJ4kdkT6m4NJAAngYmFYzrjZUbzaICWCkJSoRsbGz4+bAQXIZIhXV
+gr6h0rFhZz04cyysIot6haUzOxrXFLleFpQKs/1e5fjo1S/OPvxFaoUumwhyIAjNozvx7n/E77xq
+9LzLMHsgKBSqNUSj/dhmE5160pp9/wei8R3R61+8ct0ab6raK6Q+yDL8+Pa1nRyBCxJdTE37aqS5
+h/f8U9XHuPLZeaOWGRX1S6WUqTfApdasO5n72o1LNxyHNWthMJZm2PQY/vqzyZbtNJawZokVFX38
+9J5mprHtviKfsa1qOJX7bq+nInfRCeYLfyZYEwFNINg73v3W9/XEPtQNul06eQ2CSGNQiWZACihz
+pNLOUdHXBBCdKp/EVVo6il2ztpYg64lPMqfKgIyIFQVUwSUyF8Y6zgCXIo5VHGVZ38GU1aQ1kQ4h
+yGfnopNW0Vx3zh+qX3XpzJrlidLBbEHNCuUeyoF67prrO7v314e/SijzBx+muYM+oSi3oYqV0UNl
+2v7Ml8qbbq2ddUaw/gQoy7v3z+07YO+4ubpzXFBEGI5sAE+xc9j7RPmev6Nbf2bO2aBtjP2T0Z33
+w2dFhAApEu1/8FNPRfjSC5Ek2LRt6sa7hjc/4hOYyKpehojS2+91d2yJpx1BAmSuEqmsr0dGkgzU
+drpPCDuY8eGDu/DF76jPfSMeUmVDo+tqzzoblSoEzNCaAfBRiqJH34eT9hHGmUbU6bT/4M+LL39l
+JAxRsZAExIDLihRWRZUqMkZapmmZRDHynlQ1NevIij5TFtl62tUOEJ5OJByfrpzyLP/dvz+0dv3y
+r97Wueqq2kgEpdGn6SQb6odZikjNATorelEyys6rIsfYSCZzplzq8sxYYu09OBag04cvJlvD9fNO
+Cmb7csdWNqJHa0j7iCs8NZ42K5XGKE0xZtpACQU0IkGZBUFYhl3RnePGGipKHp9QjGJU9wNqtKmc
+65QXbFD1RnSw2223KWhVzjo59bOz1/5web+PRgwOceIJ7ePDfu6jx8ej7btD1UVos4kJv2Jl5brP
+4dxTAeNYjCoB6VCY4AjR5dHXVIIQChZAVEle/4KpzXc1Nu+wQeDFaTCsjwxBU9HvdzIfJtXJZ1y0
+5pxTDn7v2mTPrnqv2+3NVVes1gfbcyORSrvNSuL2TJsTn4kPvjdde8oIFC44A2c+vfPYvTUikMnY
+oVmLcgdNHZa5s89aeelz1RNTs9f/JJrp2laoxZlAoHNkfUBBRYWy3lYrb/zd4K0vQTvtveVD+e33
+mJwTS7YzoZYkdjYrJ/eTROnokFm/vOI07t9JLWsUqySo91B95KCIItFSCTsorAsxx+nw8uhNrw4v
+ORfOVn3WTjRqo0nuk9bK8qOfk043GK352++oP6LrhRS5S5tKVRO7a0aG1lXedjU2rC5IBQJogvcQ
+UQaajxRLHq1m7EQyEdcTKUVk0v/lf5fmiYIRaZ5SjKzNlq2U4SViGm1EE8PHy2uvzrdPSK8jn/7U
+XGNViUCGxvLmmCTHiVrOSBixnH6R3LwxE5EJkVz6IvLdb84uPUmwPK+ty5etzcNhwQrBquLlb8q2
+bpqTQh59Qt7xv/ut8xgr02qjU6m4el1sg7F03/CZe9/wbrlrm7SlLzIu4jY/Km/6674+SSqrJGxk
+WCLhibL6Evfm93R+/IOivU9+eHv3jKtTLBd7UmFPkvhswal+5GK54o96Z7y8v/ZCGblUzPPlgnfJ
+jnZbpJPLrIiUIqnsF+n0M/nMNfmaCxlrxsdOy6OlkpzgRk5rR2sZK6V6fvn+j0m7x1LMiZsvubtU
+sk5vQPMpOqrDYYjyBELhRXOp51J8Z+PBT10zeue3NQKoGnTFbdhQXnxO/Krn49ynZYmN4JGVuOP+
+8prvpxvvCidmQu/6jWX65NXhC56BF5yP9asKChSUEQ0qkWa48bbsy9dHdzyM6Y5f2tRnnnjgrVcv
+O2kdGgk04IFOie17H930wEnXfhfTczPssXxJeOaG5NJzcc4p0kzIhyAIgQSYy8rH9/UefiI/MFWs
+ag2vWRmvXlLUAoqCwFr0PU/OqE98p/Pwln53aqwylp+6jl50XjmmKhe9N9O7bNHQaavzZy8J/+p1
+AeBFz1IwLKUn8oAFKPXYMelu2rTrtvtOePBBsKQs/ZF65fwzoisuwjknoRF3mSMdkDAJlFLeeyGQ
+0k91OEdFX4ADr+AAg45GiTJC4btT8X1bOXMBhTAxVizH6FDarLeh6kAJKCCGmOkpdDvweer7iQyj
+nuSj1Z6KCiAEIkbs0A4AIECBffuidgbmYqTKS0YiiT0hB3vAQkUASiDNJUqLNLdeKRMjjCQOu0AP
+GIYv4D1IQ1sg8EDqUAqURzUSgxzwgB6w814pwtwUvAdH8ApLKsVH/zX4049lK3OV1fySdfHf/mH2
+ojMMoGG7ULXSiVUZJINPYEIP5MB0J5VJzcqI1jZCs4XE9ggZMAxADn8RQGASD9inTLZHRe/AxhEy
+hlb9iDLJK8wBGWgrAmYR74y1EEA8ihI+ggaejGAJMJy6IpEIBGiUAmIYAA5gwAMVZAoEhGDknEHK
+0NbEgblgZ21AADyDFBiFNuRhB3/YYL+UARhQDhCo+c0PYCFS8z8DAYloEhGwKFIAgY0nr5UWAjF8
+0S2f85bogYcRAUXcvvKS+kffgyEFEuQGpODntw+JQjl4fgIwRIO9aCYMNvN4AIAFBsuGpYcIjIGC
+JxZST51U/52lEjZGIVFOkQAxhQGAEpmI0gRN0DaHJ7hAKcTasSeiwbkNeCYReIopAOZHY+FZ+5Ko
+ML6Ab/mwUJxBNLQBtFYRq6gEtIFCoIKB1YgGA44kzA9nhgrQIvADwlQOVgxADFHwCh4QglUQL4pI
+Cebr5YPvjDzQSQkCxELf/EB+71ZUPTKVW9u7YEN9OPRcZkpVAhKGD+cNCU9yB6BABTQRFENBiEvj
+hEDQgCUSG2oIwAIi8QxDT02qjoq+B82QRIlhEe9hrFcQhdAQzdsUAC1KFwADRpUDq2Mor+enczX4
+L4jygIgCKcVWSQIFVRqWRGkNpUUB8AalQuTn31YpwYCODi+wBQA9Wfaer4WTMIyZt3EPImgDEBzg
+CVqT8oA7/BYOvjM7qMGT8GDz9ZtMmUI0ONRrl4xddE5GErI4LV4pTZQDCjBy+IWTeQsoBxuuCWrw
+ASklXqHskBL2rAIaDABQSh1xreSo6JsgYgExlFjlD/+9kkMbgio8sQaDAlhCqQClNRS8QEhrCIFK
+QJAFcCCrQWLmxw1mQIiJVDDI+BiiUCqUAGmIhzHzQ8uBYlAFOXyARQADBajBxDVHUASlQAqGoAiD
+QK4/ePs1oKFk/nMBwjK3iGcNYqC3fYu9eWOtolByWiG58MTKhlUOQpYMXAnSUEBBUIqUAEyDM3Fw
+QDJwXyAGFNS8oxWpeQLIKxTgEhJCK4COdKbsqOh1BpBC0YPrQQNm4AE0cq+thWgEFkUJ1lSWgVY9
+kxuyKAZ2T8RAKSAbOEdGsyJP4iAMCAszK10GFFBpyIFApDhSLlIMWGQZzPzADHNYFAhCMEFrCIMA
+azz7blmISJ1AxkApeIbzIIIQRAINWAutwDyIryEizKgEcZ9drKToDf34Tjd1COSQFm7dMpx/PLwL
+0xIWFc5ABl2qVAKAIYKy1MJaU2gUa9LFYZZagwgiwt6xt/sdQtLLWnGk+sQMiPdKH6FCfFT0ByIs
+E2DTE70bbwv3TujCdzW4mjQyD42eZCrROReRUdzvK/aJbcIBeeE1UI8LDZ9loYcRojjWmsrCWVbW
+RGCFvITtIUzAxnlPgfaU+zJln1W4WZalMjp3pSEV2AB5CW1SlVpjqGDlWOlAM6rMMIGXUocBtMqK
+vCgKCxUHIbRhV0IRa3IQL8zMAWljDCtrD3CxxFKD8PHvmelpDDUml1VGtkwWD+1Jt34p6qHvUuVL
+DoJKW82pQoOUF+0lUJq0IUB552uZFE4VohgovBSePazW25eO1E5YOXbFhVgzoi1w5Fo98O9EOG2P
+CAg6bTz6WHnnJtl4j9z1oOzeH9EUiwegVABF4pgAkIJEIIKwhyOIggLEw0H1RQBRCopgGAZQAuGB
+E3uKGJ2AlSIL0QwR0KA1P/AvQgxDTIDS0ARi5ETai/MQbZUj8czaUJBFBKJ59wxAHJwAOgzSvFtR
+Nc9iWq1cu0JJjSx6syDyeVkWLlCBYgIIyngJtWA+TkSESkWCICcudKraRZxDwwAmDSNaNRavXnbw
+tVcu2XA8nXQcmlGhWQ2qmI5hftHwj17DGRxGJZAU4AJzbew9kB44kHztO9nOfW7rE+HBKQNHxkhd
+5xUVZSLsCxaGGB1YY8AiBZcRMbPyoojMYIupY3iPIyQZAADNEDitvNJiFBERi3gO+woGXkumBCSh
+g/ECplK8nY9xARXMN04qbQKAEmgBWEigiUiALERRIjSw3EWZGVVTYXigy1woGECDLOp1rsV5HJSh
+Ua1VZqypVg6jWVUsZjrDoQ6me7j/YbBDEGLlKM46Ec8+DWefgFXDKBPUE1iImU90BnuGoX/puB6l
+QHxBxFY/ufO/cK7Wn5b9E/6Bx9zt98k9m+223cGhSS/pdIsTbas6AGsURe5ZrNVhYGcVAg2jAVf6
+PjNro4wZLJgeQd5GzOyYhUAkWikRIRawCpjgAXFQjEByW/aN1EujrIVXcAwxvmTxYkyA9iwAQEGE
+IYPwR0GPo5a0wmrZV1xAC6I6Mi5bTfvGV5WKiootm1UMNexIKx5qqCgGe0y0sWcKOyaw/RB2HJQ9
+E0WnF64aw8nH4fwNOHtNuWGVtGoOEKAyf5iVS7CB1iADwDOe4u6Pjt57QM9b0yCweHJDugUI6LVx
+4AAefBx3bs637ghvulXyvuPSRhaJBTz7wnNppQYRkEABikSJF/HCgYRH7DZ3FAzObMrgJgA4JZ5U
+pkujtCWlmBULCZid9z4oCigrHqUTkBUyRkc6ijs1q8NI16qqWZdaTdXrpllHFMuylXR8FT/aiG/e
+WLZnrYv3hbb5iXdUXvTqQkqqBkYrSjPsnfTb9vd27TPbNus9s3brQd4+1StdcdxodMHptXNOnD5j
+XWPlUr1yiYtMdpiK9ig1Bu59cKqYjngaEsC/l1IRkzARFBE0QcngEZjcwAEaEtfphDrWrccLL/Xt
+Nh68393zsPvRXXT3ozQ5DuQqMqoRzZXTgbKB0lq0eMUOHgKljrhmBiAiAB5IvXasSLQBBQTVcA4M
+OIecuSBRRlNCQiJE9ToPNcrlQ7J2Ja9Z6paNhaPDtVqCMESlhkrEccRJ4pKIwlDngqhfbrzdtvv9
+WFsXrFi2Cheeg2zcbdmu79tGj+zF9n3YP6GnpuzcVFQUOaTXHEkuObPxvGfiwjPLk1bNNipVEZB2
+UABHUDQoCyvMk39yigFDER3pePRRrb4DaLACFFjBA/DwBCkQB1B2ENA6DIoEIIAcXIGpGTy2rbx9
+U37T3f6erXpyIqj6gAnzQT3BqCKg3CDKjozeai3KlbqAIcuKMoO+RkldPxlQrOPEVeqyfGl42km0
+YS2WjMg5p1MUw1oJLZIKB4G3QRApFkfKzO8LAJzM3yuggWDnzrkX/3FjyyNzq6OkDatGpl5wemvL
+w9xLdT+nNPPttnBhjEYSz5x/cf30Dfq55+EZp0qrWcBahmJASpA4cWwUkdYiigEoeDUIZOeDTnV4
+hv7l0adgAvR8UgIUDnI4slbwzGwUkdKHaxpIBSFcIB4+lBL7JrFtt9s9Xn72K9mBCd5zIOmnsTGo
+GYTclzwq7JEfuVaxFsuMopBM+mzLoC5BtfJbz7HHr8BpJ+D4pVgyzK0628BDDt+YcDirFEBAhIz+
+zSq0HH4CgnHdHfvE99K/+nginek4k75rcrWTuSbl6BdcZECQj45l559krnhG7VmnY8kZqEaoBCmU
+gwSeIgd4pAmHgH4yW1bzl3KEcgQD57JUwS/+vUf39Y4Hli2GngwDFWA8QAIlHhBwAadACsrCDoYx
+qK9qQJdwfW/yKew6hNvvx4839u64myf2JcbregQ58kb0ySAYLoTSHHnuq/XygrOjl1+Bi58xs/S4
+ej0GoATsB+81AHidayJmJhEaTGXeQSlwPP/KE0MJlAAQCFxGL3u//+FNRS2Pez3UkpTLZE6VvijH
+RsqzTq6/8FJ63qVYc5wL4C0UwyjQfAnBg1jADs66CjQcoThcyjMAOSkPr4h7eMUSKK2E4GX+fMcv
+hf7XpQJi0FdMrh8/cRA/fUCu+1l659Zk8n6nYWsxtILzAHuUEhrKM+mZsrYsuPIF+vdfWTxjvbM6
+AQHxsfbsvVdKEQgi4j0NMuSbfzD77g83N2/nWpn2+9VeAj3MZ27Y/kdXrTnjFHviKhervoKFtoA+
+UmTy69Ixn5z7FTR43KUJad3K6Pil9PKLK+0efvB9d/N9/ZvvD/YdisIQdSvZnJvNrR4xb3qR+a9X
+FmefoYJmUCLoOcTmWE87/YJJDbi7PDfX328emSn6nsNmcdYZuOjZeN4F2UXnrh8vUK/AghTCwVsr
+wJG8x69Lv3Grd4fRC0TADuLBg2tcEnA0Pokb73bfuqV/6yY/NdlcMuI/9T59xmkYG/EwOgcAF2IG
+GP2VR8ACAETi3MTERHDZn4ZJFF96Nn7rmcU5JyAe0oAcLus69kJkSNFgaib6zRnnbxx9D2yBYHCJ
+iz9cc9dAPr90VFKhpCj2HvSP7656ffB5zxxCEAzWlkIUGhDYEvTLn1H6Bc1X67QviqmpqWjP/vrQ
+MJqjqFUQIieEDugjr2FQm9UYVMX5cJTya4Txf+g37+vBEBEmDKrkhzeC6ieTNT24uQku9aHVhZZA
+ERgecAoKYsXDCeyRI6KjyXtPREopCNj7weKoy/NceRMkBAQMUciBiBm5d7Gdj80Fnj0UeVICHDnx
++3XoP2Ga9VAQrTwRP+lDS0DDaTjAZqI9AcgIeYL6vINiiBeCBzO4RFlB/Vh7ZuZ/Qw/MV40coAeL
+lIwQOXmPwsCbIlZKQSkR8SRQ2gEeUvmNmf1vHr0AAIsTEf2k2TPmQlUd1MoIKYGBBNAlPA0WF5BT
+mYMNVAyQA8yxWf3PD+Df0IvAzwf8OXnMF1g8AE2HF67p8MouULoy+pX7/b/pN46+AJOASAiDy8sG
+pRmuu3B+oVUAdiAP5Qp4K/XBIkQ4eDlYYMnrI50N+L9JBjf7CYR5PpX3vmd0BFYY3ArDkTdgFCEC
+gfNOG8MAe6dAWmnwkbaN/Zr0n+DrF3VkLd7uumBaRL9gWkS/YFpEv2BaRL9gWkS/YFpEv2BaRL9g
+WkS/YFpEv2BaRL9gWkS/YFpEv2BaRL9gWkS/YFpEv2BaRL9gWkS/YFpEv2BaRL9gWkS/YPr/AGCe
+xQCk5vMhAAAAAElFTkSuQmCC
+
+      	</field>
+      </record>
+    </data>
+</openerp>
diff --git a/addons/fleet/fleet_data.xml b/addons/fleet/fleet_data.xml
new file mode 100644
index 00000000000..9b8ebb19e19
--- /dev/null
+++ b/addons/fleet/fleet_data.xml
@@ -0,0 +1,440 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+      <!--
+      <record forcecreate="True" id="ir_cron_service_services_reminders" model="ir.cron">
+        <field name="name">Creation of Vehicle services and Services renewals reminders</field>
+        <field eval="True" name="active" />
+        <field name="user_id" ref="base.user_root" />
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field eval="False" name="doall" />
+        <field eval="'fleet.vehicle'" name="model" />
+        <field eval="'run_scheduler'" name="function" />
+        <field eval="'()'" name="args" />
+      </record>
+    -->
+
+      <record forcecreate="True" id="ir_cron_contract_costs_generator" model="ir.cron">
+        <field name="name">Generation of contracts costs based on the costs frequency</field>
+        <field eval="True" name="active" />
+        <field name="user_id" ref="base.user_root" />
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="numbercall">-1</field>
+        <field eval="False" name="doall" />
+        <field eval="'fleet.vehicle.log.contract'" name="model" />
+        <field eval="'run_scheduler'" name="function" />
+        <field eval="'()'" name="args" />
+      </record>
+
+      <record id="type_service_service_1" model="fleet.service.type">
+          <field name="name">Calculation Benefit In Kind</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_2" model="fleet.service.type">
+          <field name="name">Depreciation and Interests</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_3" model="fleet.service.type">
+          <field name="name">Tax roll</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_5" model="fleet.service.type">
+          <field name="name">Summer tires</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_6" model="fleet.service.type">
+          <field name="name">Snow tires</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_7" model="fleet.service.type">
+          <field name="name">Summer tires</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_8" model="fleet.service.type">
+          <field name="name">Repair and maintenance</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_9" model="fleet.service.type">
+          <field name="name">Assistance</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_10" model="fleet.service.type">
+          <field name="name">Replacement Vehicle</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_11" model="fleet.service.type">
+          <field name="name">Management Fee</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_12" model="fleet.service.type">
+          <field name="name">Rent (Excluding VAT)</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_13" model="fleet.service.type">
+          <field name="name">Entry into service tax</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_14" model="fleet.service.type">
+          <field name="name">Total expenses (Excluding VAT)</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_15" model="fleet.service.type">
+          <field name="name">Residual value (Excluding VAT)</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_16" model="fleet.service.type">
+          <field name="name">Options</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_17" model="fleet.service.type">
+          <field name="name">Emissions</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_18" model="fleet.service.type">
+          <field name="name">Touring Assistance</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_service_19" model="fleet.service.type">
+          <field name="name">Residual value in %</field>
+          <field name="category">service</field>
+      </record>
+
+    	<record id="type_service_1" model="fleet.service.type">
+          <field name="name">A/C Compressor Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_2" model="fleet.service.type">
+          <field name="name">A/C Condenser Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_3" model="fleet.service.type">
+          <field name="name">A/C Diagnosis</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_4" model="fleet.service.type">
+          <field name="name">A/C Evaporator Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_5" model="fleet.service.type">
+          <field name="name">A/C Recharge</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_6" model="fleet.service.type">
+          <field name="name">Air Filter Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_7" model="fleet.service.type">
+          <field name="name">Alternator Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_8" model="fleet.service.type">
+          <field name="name">Ball Joint Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_9" model="fleet.service.type">
+          <field name="name">Battery Inspection</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_10" model="fleet.service.type">
+          <field name="name">Battery Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_11" model="fleet.service.type">
+          <field name="name">Brake Caliper Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_12" model="fleet.service.type">
+          <field name="name">Brake Inspection</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_13" model="fleet.service.type">
+          <field name="name">Brake Pad(s) Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_14" model="fleet.service.type">
+          <field name="name">Car Wash</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_15" model="fleet.service.type">
+          <field name="name">Catalytic Converter Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_16" model="fleet.service.type">
+          <field name="name">Charging System Diagnosis</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_17" model="fleet.service.type">
+          <field name="name">Door Window Motor/Regulator Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_18" model="fleet.service.type">
+          <field name="name">Engine Belt Inspection</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_19" model="fleet.service.type">
+          <field name="name">Engine Coolant Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_20" model="fleet.service.type">
+          <field name="name">Engine/Drive Belt(s) Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_21" model="fleet.service.type">
+          <field name="name">Exhaust Manifold Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_22" model="fleet.service.type">
+          <field name="name">Fuel Injector Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_23" model="fleet.service.type">
+          <field name="name">Fuel Pump Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_24" model="fleet.service.type">
+          <field name="name">Head Gasket(s) Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_25" model="fleet.service.type">
+          <field name="name">Heater Blower Motor Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_26" model="fleet.service.type">
+          <field name="name">Heater Control Valve Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_27" model="fleet.service.type">
+          <field name="name">Heater Core Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_28" model="fleet.service.type">
+          <field name="name">Heater Hose Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_29" model="fleet.service.type">
+          <field name="name">Ignition Coil Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_30" model="fleet.service.type">
+          <field name="name">Intake Manifold Gasket Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_31" model="fleet.service.type">
+          <field name="name">Oil Change</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_32" model="fleet.service.type">
+          <field name="name">Oil Pump Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_33" model="fleet.service.type">
+          <field name="name">Other Maintenance</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_34" model="fleet.service.type">
+          <field name="name">Oxygen Sensor Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_35" model="fleet.service.type">
+          <field name="name">Power Steering Hose Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_36" model="fleet.service.type">
+          <field name="name">Power Steering Pump Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_37" model="fleet.service.type">
+          <field name="name">Radiator Repair</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_38" model="fleet.service.type">
+          <field name="name">Resurface Rotors</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_39" model="fleet.service.type">
+          <field name="name">Rotate Tires</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_40" model="fleet.service.type">
+          <field name="name">Rotor Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_41" model="fleet.service.type">
+          <field name="name">Spark Plug Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_42" model="fleet.service.type">
+          <field name="name">Starter Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_43" model="fleet.service.type">
+          <field name="name">Thermostat Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_44" model="fleet.service.type">
+          <field name="name">Tie Rod End Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_45" model="fleet.service.type">
+          <field name="name">Tire Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_46" model="fleet.service.type">
+          <field name="name">Tire Service</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_47" model="fleet.service.type">
+          <field name="name">Transmission Filter Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_48" model="fleet.service.type">
+          <field name="name">Transmission Fluid Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_49" model="fleet.service.type">
+          <field name="name">Transmission Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_50" model="fleet.service.type">
+          <field name="name">Water Pump Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_51" model="fleet.service.type">
+          <field name="name">Wheel Alignment</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_52" model="fleet.service.type">
+          <field name="name">Wheel Bearing Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+      <record id="type_service_53" model="fleet.service.type">
+          <field name="name">Windshield Wiper(s) Replacement</field>
+          <field name="category">service</field>
+      </record>
+
+
+      <record id="type_contract_omnium" model="fleet.service.type">
+          <field name="name">Omnium</field>
+          <field name="category">contract</field>
+      </record>
+
+      <record id="type_contract_leasing" model="fleet.service.type">
+          <field name="name">Leasing</field>
+          <field name="category">contract</field>
+      </record>
+
+       <record id="type_contract_repairing" model="fleet.service.type">
+          <field name="name">Repairing</field>
+          <field name="category">both</field>
+      </record>  
+
+      <record id="type_service_refueling" model="fleet.service.type">
+          <field name="name">Refueling</field>
+          <field name="category">service</field>
+      </record> 
+
+      <record id="vehicle_tag_junior" model="fleet.vehicle.tag" >
+        <field name="name">Junior</field>
+      </record>
+
+      <record id="vehicle_tag_senior" model="fleet.vehicle.tag" >
+        <field name="name">Senior</field>
+      </record>
+
+      <record id="vehicle_tag_leasing" model="fleet.vehicle.tag" >
+        <field name="name">Employee Car</field>
+      </record>
+
+      <record id="vehicle_tag_purchased" model="fleet.vehicle.tag" >
+        <field name="name">Purchased</field>
+      </record>
+
+      <record id="vehicle_tag_compact" model="fleet.vehicle.tag" >
+        <field name="name">Compact</field>
+      </record>
+
+      <record id="vehicle_tag_sedan" model="fleet.vehicle.tag" >
+        <field name="name">Sedan</field>
+      </record>
+
+      <record id="vehicle_tag_convertible" model="fleet.vehicle.tag" >
+        <field name="name">Convertible</field>
+      </record>
+
+      <record id="vehicle_tag_break" model="fleet.vehicle.tag" >
+        <field name="name">Break</field>
+      </record>
+     </data>
+</openerp>
diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/fleet_demo.xml
new file mode 100644
index 00000000000..4760e336dd1
--- /dev/null
+++ b/addons/fleet/fleet_demo.xml
@@ -0,0 +1,1166 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+      <record id="model_corsa" model="fleet.vehicle.model">
+          <field name="modelname">Corsa</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_astra" model="fleet.vehicle.model">
+          <field name="modelname">Astra</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_agila" model="fleet.vehicle.model">
+          <field name="modelname">Agila</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_combotour" model="fleet.vehicle.model">
+          <field name="modelname">Combo Tour</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_meriva" model="fleet.vehicle.model">
+          <field name="modelname">Meriva</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_astragtc" model="fleet.vehicle.model">
+          <field name="modelname">AstraGTC</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_zafira" model="fleet.vehicle.model">
+          <field name="modelname">Zafira</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_zafiratourer" model="fleet.vehicle.model">
+          <field name="modelname">Zafira Tourer</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_insignia" model="fleet.vehicle.model">
+          <field name="modelname">Insignia</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_mokka" model="fleet.vehicle.model">
+          <field name="modelname">Mokka</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_antara" model="fleet.vehicle.model">
+          <field name="modelname">Antara</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_ampera" model="fleet.vehicle.model">
+          <field name="modelname">Ampera</field>
+          <field name="brand" ref="brand_opel" />
+      </record>
+
+      <record id="model_a1" model="fleet.vehicle.model">
+          <field name="modelname">A1</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a3" model="fleet.vehicle.model">
+          <field name="modelname">A3</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a4" model="fleet.vehicle.model">
+          <field name="modelname">A4</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a5" model="fleet.vehicle.model">
+          <field name="modelname">A5</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a6" model="fleet.vehicle.model">
+          <field name="modelname">A6</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a7" model="fleet.vehicle.model">
+          <field name="modelname">A7</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_a8" model="fleet.vehicle.model">
+          <field name="modelname">A8</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_q3" model="fleet.vehicle.model">
+          <field name="modelname">Q3</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_q5" model="fleet.vehicle.model">
+          <field name="modelname">Q5</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_q7" model="fleet.vehicle.model">
+          <field name="modelname">Q7</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_tt" model="fleet.vehicle.model">
+          <field name="modelname">TT</field>
+          <field name="brand" ref="brand_audi" />
+      </record>
+
+      <record id="model_serie1" model="fleet.vehicle.model">
+          <field name="modelname">Serie 1</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_serie3" model="fleet.vehicle.model">
+          <field name="modelname">Serie 3</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_serie5" model="fleet.vehicle.model">
+          <field name="modelname">Serie 5</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_serie6" model="fleet.vehicle.model">
+          <field name="modelname">Serie 6</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_serie7" model="fleet.vehicle.model">
+          <field name="modelname">Serie 7</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_seriex" model="fleet.vehicle.model">
+          <field name="modelname">Serie X</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_seriez4" model="fleet.vehicle.model">
+          <field name="modelname">Serie Z4</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_seriem" model="fleet.vehicle.model">
+          <field name="modelname">Serie M</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_seriehybrid" model="fleet.vehicle.model">
+          <field name="modelname">Serie Hybrid</field>
+          <field name="brand" ref="brand_bmw" />
+      </record>
+
+      <record id="model_classa" model="fleet.vehicle.model">
+          <field name="modelname">Class A</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classb" model="fleet.vehicle.model">
+          <field name="modelname">Class B</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classc" model="fleet.vehicle.model">
+          <field name="modelname">Class C</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classcl" model="fleet.vehicle.model">
+          <field name="modelname">Class CL</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classcls" model="fleet.vehicle.model">
+          <field name="modelname">Class CLS</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classe" model="fleet.vehicle.model">
+          <field name="modelname">Class E</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classm" model="fleet.vehicle.model">
+          <field name="modelname">Class M</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classgl" model="fleet.vehicle.model">
+          <field name="modelname">Class GL</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classglk" model="fleet.vehicle.model">
+          <field name="modelname">Class GLK</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classr" model="fleet.vehicle.model">
+          <field name="modelname">Class R</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classs" model="fleet.vehicle.model">
+          <field name="modelname">Class S</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classslk" model="fleet.vehicle.model">
+          <field name="modelname">Class SLK</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="model_classsls" model="fleet.vehicle.model">
+          <field name="modelname">SLS</field>
+          <field name="brand" ref="brand_mercedes" />
+      </record>
+
+      <record id="vehicle_state_inshop" model="fleet.vehicle.state">
+        <field name="name">In shop</field>
+        <field name="sequence">1</field>
+      </record>
+
+      <record id="vehicle_state_active" model="fleet.vehicle.state">
+        <field name="name">Active</field>
+        <field name="sequence">2</field>
+      </record>
+
+      <record id="vehicle_state_inactive" model="fleet.vehicle.state">
+        <field name="name">Inactive</field>
+        <field name="sequence">3</field>
+      </record>
+
+      <record id="vehicle_state_sold" model="fleet.vehicle.state">
+        <field name="name">Sold</field>
+        <field name="sequence">4</field>
+      </record>
+
+      <record id="vehicle_1" model="fleet.vehicle">
+          <field name="license_plate">1-ACK-205</field>
+          <field name="vin_sn">5454541</field>
+          <field name="model_id" ref="model_astra"/>
+          <field name="color">Black</field>
+          <field name="location">Grand-Rosiere</field>
+          <field name="doors">5</field>
+          <field name="driver" ref="base.res_partner_address_18" />
+          <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
+          <field name="state" ref="vehicle_state_active"/>
+          <field name="odometer_unit">kilometers</field>
+          <field name="car_value">20000</field>
+          <field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_break'),ref('fleet.vehicle_tag_senior')])]" name="tag_ids"/>
+      </record>
+
+      <record id="vehicle_2" model="fleet.vehicle">
+          <field name="license_plate">1-SYN-404</field>
+          <field name="vin_sn">1337</field>
+          <field name="model_id" ref="model_corsa"/>
+          <field name="color">Red</field>
+          <field name="location">Grand-Rosiere</field>
+          <field name="doors">5</field>
+          <field name="driver" ref="base.res_partner_address_19" />
+          <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
+          <field name="state" ref="vehicle_state_inactive"/>
+          <field name="odometer_unit">kilometers</field>
+          <field name="car_value">16000</field>
+          <field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_compact'),ref('fleet.vehicle_tag_junior')])]" name="tag_ids"/>
+      </record>
+
+      <record id="vehicle_3" model="fleet.vehicle">
+          <field name="license_plate">1-BMW-001</field>
+          <field name="vin_sn">54818</field>
+          <field name="model_id" ref="model_serie1"/>
+          <field name="color">Titanium Grey</field>
+          <field name="location">Grand-Rosiere</field>
+          <field name="doors">3</field>
+          <field name="driver" ref="base.res_partner_address_17" />
+          <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
+          <field name="state" ref="vehicle_state_active"/>
+          <field name="odometer_unit">kilometers</field>
+          <field name="car_value">20000</field>
+          <field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_compact'),ref('fleet.vehicle_tag_senior')])]" name="tag_ids"/>
+      </record>
+
+       <record id="vehicle_4" model="fleet.vehicle">
+          <field name="license_plate">1-AUD-001</field>
+          <field name="vin_sn">455257985</field>
+          <field name="model_id" ref="model_a1"/>
+          <field name="color">White</field>
+          <field name="location">Grand-Rosiere</field>
+          <field name="doors">3</field>
+          <field name="driver" ref="base.res_partner_address_16" />
+          <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
+          <field name="state" ref="vehicle_state_active"/>
+          <field name="odometer_unit">kilometers</field>
+          <field name="car_value">20000</field>
+          <field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_compact'),ref('fleet.vehicle_tag_senior')])]" name="tag_ids"/>
+      </record>
+
+      <record id="vehicle_5" model="fleet.vehicle">
+          <field name="license_plate">1-MER-001</field>
+          <field name="vin_sn">789546128</field>
+          <field name="model_id" ref="model_classa"/>
+          <field name="color">Brown</field>
+          <field name="location">Grand-Rosiere</field>
+          <field name="doors">5</field>
+          <field name="driver" ref="base.res_partner_address_15" />
+          <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
+          <field name="state" ref="vehicle_state_active"/>
+          <field name="odometer_unit">kilometers</field>
+          <field name="car_value">18000</field>
+          <field eval="[(6,0,[ref('vehicle_tag_leasing'),ref('fleet.vehicle_tag_compact'),ref('fleet.vehicle_tag_senior')])]" name="tag_ids"/>
+      </record>
+
+      <record id="log_odometer_1" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-01-01</field>
+          <field name="value">0</field>
+      </record>
+
+       <record id="log_fuel_1" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-01-01</field>
+          <field name="liter">40</field>
+          <field name="price_per_liter">1.3</field>
+          <field name="amount">52</field>
+          <field name="inv_ref">67458</field>
+          <field name="odometer_id" ref="log_odometer_1" />
+          <field name="notes">First refueling</field>
+      </record>
+
+      <record id="log_odometer_2" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-02-11</field>
+          <field name="value">658</field>
+      </record>
+
+      <record id="log_fuel_2" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-02-11</field>
+          <field name="liter">50</field>
+          <field name="price_per_liter">1.3</field>
+          <field name="amount">65</field>
+          <field name="inv_ref">455812</field>
+          <field name="odometer_id" ref="log_odometer_2" />
+          <field name="notes">Second refueling of the car</field>
+      </record>
+
+      <record id="log_odometer_3" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-03-23</field>
+          <field name="value">1360</field>
+      </record>
+
+       <record id="log_fuel_3" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-03-23</field>
+          <field name="liter">45</field>
+          <field name="price_per_liter">1.32</field>
+          <field name="amount">59.4</field>
+          <field name="inv_ref">45199877</field>
+          <field name="odometer_id" ref="log_odometer_3" />
+          <field name="notes">Some notes ...</field>
+      </record>
+
+      <record id="log_odometer_4" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-04-5</field>
+          <field name="value">2044</field>
+      </record>
+
+      <record id="log_fuel_4" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-04-5</field>
+          <field name="liter">55</field>
+          <field name="price_per_liter">1.32</field>
+          <field name="amount">72.6</field>
+          <field name="inv_ref">654</field>
+          <field name="odometer_id" ref="log_odometer_4" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_5" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-04-25</field>
+          <field name="value">2756</field>
+      </record>
+
+      <record id="log_fuel_5" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-04-25</field>
+          <field name="liter">40</field>
+          <field name="price_per_liter">1.35</field>
+          <field name="amount">54</field>
+          <field name="inv_ref">55488</field>
+          <field name="odometer_id" ref="log_odometer_5" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_6" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-05-15</field>
+          <field name="value">3410</field>
+      </record>
+
+      <record id="log_fuel_6" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-05-15</field>
+          <field name="liter">55.8</field>
+          <field name="price_per_liter">1.35</field>
+          <field name="amount">75.33</field>
+          <field name="inv_ref">4952</field>
+          <field name="odometer_id" ref="log_odometer_6" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_7" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-06-11</field>
+          <field name="value">3750</field>
+      </record>
+
+      <record id="log_fuel_7" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-06-11</field>
+          <field name="liter">55.8</field>
+          <field name="price_per_liter">1.35</field>
+          <field name="amount">75.33</field>
+          <field name="inv_ref">4952</field>
+          <field name="odometer_id" ref="log_odometer_7" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_8" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-07-02</field>
+          <field name="value">4115</field>
+      </record>
+
+      <record id="log_fuel_8" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-07-02</field>
+          <field name="liter">47.8</field>
+          <field name="price_per_liter">1.35</field>
+          <field name="amount">64.53</field>
+          <field name="inv_ref">15151</field>
+          <field name="odometer_id" ref="log_odometer_8" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_9" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-07-28</field>
+          <field name="value">4750</field>
+      </record>
+
+      <record id="log_fuel_9" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-07-28</field>
+          <field name="liter">25</field>
+          <field name="price_per_liter">1.35</field>
+          <field name="amount">33.75</field>
+          <field name="inv_ref">874195</field>
+          <field name="odometer_id" ref="log_odometer_9" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_10" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-08-17</field>
+          <field name="value">5171</field>
+      </record>
+
+       <record id="log_fuel_10" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-08-17</field>
+          <field name="liter">51.2</field>
+          <field name="price_per_liter">1.35</field>
+          <field name="amount">69.12</field>
+          <field name="inv_ref">4431</field>
+          <field name="odometer_id" ref="log_odometer_10" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_11" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-09-11</field>
+          <field name="value">5873</field>
+      </record>
+
+      <record id="log_fuel_11" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-09-11</field>
+          <field name="liter">45.36</field>
+          <field name="price_per_liter">1.35</field>
+          <field name="amount">61.236</field>
+          <field name="inv_ref">11234</field>
+          <field name="odometer_id" ref="log_odometer_11" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_12" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-10-06</field>
+          <field name="value">6571</field>
+      </record>
+
+      <record id="log_fuel_12" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-10-06</field>
+          <field name="liter">53.4</field>
+          <field name="price_per_liter">1.37</field>
+          <field name="amount">73.158</field>
+          <field name="inv_ref">798846</field>
+          <field name="odometer_id" ref="log_odometer_12" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_13" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-11-02</field>
+          <field name="value">7954</field>
+      </record>
+
+      <record id="log_fuel_13" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-11-02</field>
+          <field name="liter">48.5</field>
+          <field name="price_per_liter">1.37</field>
+          <field name="amount">66.445</field>
+          <field name="inv_ref">7954</field>
+          <field name="odometer_id" ref="log_odometer_13" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_14" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-12-02</field>
+          <field name="value">7981</field>
+      </record>
+
+      <record id="log_fuel_14" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-12-02</field>
+          <field name="liter">35</field>
+          <field name="price_per_liter">1.4</field>
+          <field name="amount">49</field>
+          <field name="inv_ref">545</field>
+          <field name="odometer_id" ref="log_odometer_14" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_15" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="date">2012-01-01</field>
+          <field name="value">0</field>
+      </record>
+
+      <record id="log_fuel_15" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-01-01</field>
+          <field name="liter">45</field>
+          <field name="price_per_liter">1.27</field>
+          <field name="amount">57.15</field>
+          <field name="inv_ref">5881418</field>
+          <field name="odometer_id" ref="log_odometer_15" />
+          <field name="notes">First refueling</field>
+      </record>
+
+      <record id="log_odometer_16" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="date">2012-02-11</field>
+          <field name="value">702</field>
+      </record>
+
+      <record id="log_fuel_16" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-02-11</field>
+          <field name="liter">30</field>
+          <field name="price_per_liter">1.3</field>
+          <field name="amount">39</field>
+          <field name="inv_ref">884351</field>
+          <field name="odometer_id" ref="log_odometer_16" />
+          <field name="notes">Second refueling of the car</field>
+      </record>
+
+      <record id="log_odometer_17" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="date">2012-03-23</field>
+          <field name="value">1205.4</field>
+      </record>
+
+       <record id="log_fuel_17" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-03-23</field>
+          <field name="liter">52</field>
+          <field name="price_per_liter">1.32</field>
+          <field name="amount">68.64</field>
+          <field name="inv_ref">984</field>
+          <field name="odometer_id" ref="log_odometer_17" />
+          <field name="notes">Some notes ...</field>
+      </record>
+
+      <record id="log_odometer_18" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="date">2012-04-5</field>
+          <field name="value">2122</field>
+      </record>
+
+      <record id="log_fuel_18" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-04-5</field>
+          <field name="liter">35</field>
+          <field name="price_per_liter">1.32</field>
+          <field name="amount">46.2</field>
+          <field name="inv_ref">777</field>
+          <field name="odometer_id" ref="log_odometer_18" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_19" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="date">2012-04-25</field>
+          <field name="value">2430</field>
+      </record>
+
+      <record id="log_fuel_19" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-04-25</field>
+          <field name="liter">55</field>
+          <field name="price_per_liter">1.35</field>
+          <field name="amount">74.25</field>
+          <field name="inv_ref">4454112</field>
+          <field name="odometer_id" ref="log_odometer_19" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_20" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="date">2012-05-15</field>
+          <field name="value">3015</field>
+      </record>
+
+      <record id="log_fuel_20" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-05-15</field>
+          <field name="liter">41.8</field>
+          <field name="price_per_liter">1.35</field>
+          <field name="amount">56.43</field>
+          <field name="inv_ref">98754</field>
+          <field name="odometer_id" ref="log_odometer_20" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_21" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="date">2012-06-11</field>
+          <field name="value">3602.1</field>
+      </record>
+
+      <record id="log_fuel_21" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-06-11</field>
+          <field name="liter">50</field>
+          <field name="price_per_liter">1.35</field>
+          <field name="amount">67.5</field>
+          <field name="inv_ref">4952</field>
+          <field name="odometer_id" ref="log_odometer_21" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_22" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="date">2012-07-02</field>
+          <field name="value">4205.5</field>
+      </record>
+
+      <record id="log_fuel_22" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-07-02</field>
+          <field name="liter">50</field>
+          <field name="price_per_liter">1.35</field>
+          <field name="amount">67.5</field>
+          <field name="inv_ref">8976435</field>
+          <field name="odometer_id" ref="log_odometer_22" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_23" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="date">2012-07-28</field>
+          <field name="value">4935</field>
+      </record>
+
+      <record id="log_fuel_23" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-07-28</field>
+          <field name="liter">50</field>
+          <field name="price_per_liter">1.35</field>
+          <field name="amount">67.5</field>
+          <field name="inv_ref">9564</field>
+          <field name="odometer_id" ref="log_odometer_23" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_24" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="date">2012-08-17</field>
+          <field name="value">5555</field>
+      </record>
+
+       <record id="log_fuel_24" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-08-17</field>
+          <field name="liter">20</field>
+          <field name="price_per_liter">1.35</field>
+          <field name="amount">27</field>
+          <field name="inv_ref">975</field>
+          <field name="odometer_id" ref="log_odometer_24" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_25" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="date">2012-09-11</field>
+          <field name="value">5987</field>
+      </record>
+
+      <record id="log_fuel_25" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-09-11</field>
+          <field name="liter">44.5</field>
+          <field name="price_per_liter">1.35</field>
+          <field name="amount">60.075</field>
+          <field name="inv_ref">9876</field>
+          <field name="odometer_id" ref="log_odometer_25" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_26" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="date">2012-10-06</field>
+          <field name="value">6571</field>
+      </record>
+
+      <record id="log_fuel_26" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-10-06</field>
+          <field name="liter">48.5</field>
+          <field name="price_per_liter">1.37</field>
+          <field name="amount">66.445</field>
+          <field name="inv_ref">786</field>
+          <field name="odometer_id" ref="log_odometer_26" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_27" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="date">2012-11-02</field>
+          <field name="value">7201.5</field>
+      </record>
+
+      <record id="log_fuel_27" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-11-02</field>
+          <field name="liter">55</field>
+          <field name="price_per_liter">1.37</field>
+          <field name="amount">75.35</field>
+          <field name="inv_ref">895</field>
+          <field name="odometer_id" ref="log_odometer_27" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_28" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="date">2012-12-02</field>
+          <field name="value">8001.2</field>
+      </record>
+
+      <record id="log_fuel_28" model="fleet.vehicle.log.fuel">
+          <field name="purchaser_id" ref="base.res_partner_address_18" />
+          <field name="vehicle_id" ref="vehicle_2" />
+          <field name="vendor_id">6</field>
+          <field name="date">2012-12-02</field>
+          <field name="liter">35</field>
+          <field name="price_per_liter">1.4</field>
+          <field name="amount">49</field>
+          <field name="inv_ref">545</field>
+          <field name="odometer_id" ref="log_odometer_28" />
+          <field name="notes">Some notes</field>
+      </record>
+
+      <record id="log_odometer_29" model="fleet.vehicle.odometer">
+          <field name="vehicle_id" ref="vehicle_1" />
+          <field name="date">2012-10-01</field>
+          <field name="value">1000</field>
+      </record>
+
+      <record id="log_service_1" model="fleet.vehicle.log.services" >
+        <field name="vehicle_id" ref="vehicle_2" />
+        <field name="amount">650</field>
+        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="date">2012-09-02</field>
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="inv_ref">4586</field>
+        <field name="vendor_id" ref="base.res_partner_13" />
+        <field name="notes">Usual vehicle repairing</field>
+      </record>
+
+      <record id="services_cost_11" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_2" />
+        <field name="amount">50</field>
+        <field name="cost_subtype" ref="type_service_7"/>
+        <field name="date">2012-09-02</field>
+        <field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
+      </record>
+
+      <record id="services_cost_12" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_2" />
+        <field name="amount">25</field>
+        <field name="cost_subtype" ref="type_service_8"/>
+        <field name="date">2012-09-02</field>
+        <field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
+      </record>
+
+      <record id="services_cost_13" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_2" />
+        <field name="amount">100</field>
+        <field name="cost_subtype" ref="type_service_9"/>
+        <field name="date">2012-09-02</field>
+        <field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
+      </record>
+
+      <record id="log_service_2" model="fleet.vehicle.log.services" >
+        <field name="vehicle_id" ref="vehicle_2" />
+        <field name="amount">350</field>
+        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="date">2012-11-02</field>
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="inv_ref">4814</field>
+        <field name="vendor_id" ref="base.res_partner_13" />
+        <field name="notes">After crash repairing</field>
+      </record>
+
+      <record id="services_cost_21" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_2" />
+        <field name="amount">100</field>
+        <field name="cost_subtype" ref="type_service_10"/>
+        <field name="date">2012-11-02</field>
+        <field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
+      </record>
+
+      <record id="services_cost_22" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_2" />
+        <field name="amount">150</field>
+        <field name="cost_subtype" ref="type_service_11"/>
+        <field name="date">2012-11-02</field>
+        <field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
+      </record>
+
+      <record id="services_cost_23" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_2" />
+        <field name="amount">100</field>
+        <field name="cost_subtype" ref="type_service_12"/>
+        <field name="date">2012-11-02</field>
+        <field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
+      </record>
+
+      <record id="log_service_3" model="fleet.vehicle.log.services" >
+        <field name="vehicle_id" ref="vehicle_1" />
+        <field name="amount">513</field>
+        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="date">2012-10-15</field>
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="inv_ref">124</field>
+        <field name="vendor_id" ref="base.res_partner_13" />
+        <field name="notes">Maintenance</field>
+      </record>
+
+      <record id="log_service_4" model="fleet.vehicle.log.services" >
+        <field name="vehicle_id" ref="vehicle_3" />
+        <field name="amount">412</field>
+        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="date">2012-10-08</field>
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="inv_ref">20984</field>
+        <field name="vendor_id" ref="base.res_partner_13" />
+        <field name="notes">Maintenance</field>
+      </record>
+
+      <record id="log_service_5" model="fleet.vehicle.log.services" >
+        <field name="vehicle_id" ref="vehicle_4" />
+        <field name="amount">275</field>
+        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="date">2012-09-25</field>
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="inv_ref">241</field>
+        <field name="vendor_id" ref="base.res_partner_13" />
+        <field name="notes">Maintenance</field>
+      </record>
+
+      <record id="log_service_6" model="fleet.vehicle.log.services" >
+        <field name="vehicle_id" ref="vehicle_5" />
+        <field name="amount">302</field>
+        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="date">2012-09-15</field>
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="inv_ref">22513</field>
+        <field name="vendor_id" ref="base.res_partner_13" />
+        <field name="notes">Maintenance</field>
+      </record>
+
+      <record id="log_contract_1" model="fleet.vehicle.log.contract" >
+        <field name="vehicle_id" ref="vehicle_2" />
+        <field name="amount">0</field>
+        <field name="cost_generated">20</field>
+        <field name="cost_frequency">daily</field>
+        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="date" eval="time.strftime('%Y-01-01')" />
+        <field name="start_date" eval="time.strftime('%Y-01-01')" />
+        <field name="expiration_date" eval="(DateTime.now() + timedelta(5)).strftime('%Y-%m-%d')" />
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="insurer_id" ref="base.res_partner_13" />
+        <field name="notes">Daily leasing contract</field>
+      </record>
+
+      <record id="contract_cost_11" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_2" />
+        <field name="amount">50</field>
+        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
+      </record>
+
+      <record id="contract_cost_12" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_2" />
+        <field name="amount">25</field>
+        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
+      </record>
+
+      <record id="contract_cost_13" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_2" />
+        <field name="amount">100</field>
+        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
+      </record>
+
+      <record id="log_contract_2" model="fleet.vehicle.log.contract" >
+        <field name="vehicle_id" ref="vehicle_1" />
+        <field name="amount">0</field>
+        <field name="cost_generated">150</field>
+        <field name="cost_frequency">weekly</field>
+        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="date" eval="time.strftime('%Y-01-01')" />
+        <field name="start_date" eval="time.strftime('%Y-01-01')" />
+        <field name="expiration_date" eval="(DateTime.now() + timedelta(-1)).strftime('%Y-%m-%d')" />
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="insurer_id" ref="base.res_partner_13" />
+        <field name="notes">Weekly leasing contract</field>
+      </record>
+
+      <record id="contract_cost_21" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_1" />
+        <field name="amount">50</field>
+        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
+      </record>
+
+      <record id="contract_cost_22" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_1" />
+        <field name="amount">25</field>
+        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
+      </record>
+
+      <record id="contract_cost_23" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_1" />
+        <field name="amount">100</field>
+        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
+      </record>
+
+      <record id="log_contract_3" model="fleet.vehicle.log.contract" >
+        <field name="vehicle_id" ref="vehicle_3" />
+        <field name="amount">0</field>
+        <field name="cost_generated">400</field>
+        <field name="cost_frequency">monthly</field>
+        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="date" eval="time.strftime('%Y-01-01')"/>
+        <field name="start_date" eval="time.strftime('%Y-01-01')" />
+        <field name="expiration_date" eval="time.strftime('%Y-12-31')" />
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="insurer_id" ref="base.res_partner_13" />
+        <field name="notes">Monthly leasing contract</field>
+      </record>
+
+      <record id="contract_cost_31" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_3" />
+        <field name="amount">50</field>
+        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
+      </record>
+
+      <record id="contract_cost_32" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_3" />
+        <field name="amount">25</field>
+        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
+      </record>
+
+      <record id="contract_cost_33" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_3" />
+        <field name="amount">100</field>
+        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
+      </record>
+
+      <record id="log_contract_4" model="fleet.vehicle.log.contract" >
+        <field name="vehicle_id" ref="vehicle_4" />
+        <field name="amount">0</field>
+        <field name="cost_generated">4000</field>
+        <field name="cost_frequency">yearly</field>
+        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="date" eval="time.strftime('%Y-01-01')" />
+        <field name="start_date" eval="time.strftime('%Y-01-01')" />
+        <field name="expiration_date" eval="time.strftime('%Y-12-31')" />
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="insurer_id" ref="base.res_partner_13" />
+        <field name="notes">Yearly leasing contract</field>
+      </record>
+
+      <record id="contract_cost_41" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_4" />
+        <field name="amount">50</field>
+        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
+      </record>
+
+      <record id="contract_cost_42" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_4" />
+        <field name="amount">25</field>
+        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
+      </record>
+
+      <record id="contract_cost_43" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_4" />
+        <field name="amount">100</field>
+        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
+      </record>
+
+      <record id="log_contract_5" model="fleet.vehicle.log.contract" >
+        <field name="vehicle_id" ref="vehicle_5" />
+        <field name="amount">17000</field>
+        <field name="cost_generated">0</field>
+        <field name="cost_frequency">no</field>
+        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="date" eval="time.strftime('2012-01-01')" />
+        <field name="start_date" eval="time.strftime('2012-01-01')" />
+        <field name="expiration_date" eval="time.strftime('2016-12-31')" />
+        <field name="purchaser_id" ref="base.res_partner_address_18" />
+        <field name="insurer_id" ref="base.res_partner_13" />
+        <field name="notes">Unique leasing contract</field>
+      </record>
+
+      <record id="contract_cost_51" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_5" />
+        <field name="amount">50</field>
+        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
+      </record>
+
+      <record id="contract_cost_52" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_5" />
+        <field name="amount">25</field>
+        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
+      </record>
+
+      <record id="contract_cost_53" model="fleet.vehicle.cost" >
+        <field name="vehicle_id" ref="vehicle_5" />
+        <field name="amount">100</field>
+        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="date">2012-01-01</field>
+        <field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
+      </record>
+    </data>
+</openerp>
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
new file mode 100644
index 00000000000..bed4cd872fa
--- /dev/null
+++ b/addons/fleet/fleet_view.xml
@@ -0,0 +1,906 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record model='ir.ui.view' id='fleet_vehicle_model_form'>
+            <field name="name">fleet.vehicle.model.form</field>
+            <field name="model">fleet.vehicle.model</field>
+            <field name="arch" type="xml">
+                <form string="Model" version="7.0">
+                    <sheet>
+                        <field name="image_medium" widget='image' class="oe_left oe_avatar"/>
+                        <group col="2">
+                            <group>
+                                <field name="brand" on_change="on_change_brand(brand)"/>
+                            </group>
+                            <group>
+                                <field name="modelname" />   
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Vendors">
+                                <field name="vendors" widget="many2many_kanban"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+        <record model='ir.ui.view' id='fleet_vehicle_model_tree'>
+            <field name="name">fleet.vehicle.model.tree</field>
+            <field name="model">fleet.vehicle.model</field>
+            <field name="arch" type="xml">
+                <tree string="Models" version="7.0">
+                    <field name="brand" />
+                    <field name="modelname" />
+                </tree>
+            </field>
+        </record>
+
+        <record model='ir.actions.act_window' id='fleet_vehicle_model_act'>
+            <field name="name">Vehicle Model</field>
+            <field name="res_model">fleet.vehicle.model</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new model.
+              </p><p>
+                You can define several models (e.g. A3, A4) for each brand (Audi).
+              </p>
+            </field>
+        </record>
+ 
+        <record model='ir.ui.view' id='fleet_vehicle_model_brand_tree'>
+            <field name="name">fleet.vehicle.model.brand.tree</field>
+            <field name="model">fleet.vehicle.model.brand</field>
+            <field name="arch" type="xml">
+                <tree string="Model Brand" version="7.0">
+                    <field name="name" />
+                </tree>
+            </field>
+        </record>
+
+        <record model='ir.ui.view' id='fleet_vehicle_model_brand_form'>
+            <field name="name">fleet.vehicle.model.brand.form</field>
+            <field name="model">fleet.vehicle.model.brand</field>
+            <field name="arch" type="xml">
+                <form string="Model Brand" version="7.0">
+                    <sheet>
+                        <group>
+                            <div>
+                                <field name="image_medium" widget="image" class="oe_left oe_avatar"/>
+                                <label for="name" class="oe_edit_only"/>
+                                <h1>
+                                    <field name="name" class="oe_inline" />
+                                </h1>
+                            </div>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model='ir.ui.view' id='fleet_vehicle_model_brand_kanban'>
+            <field name="name">fleet.vehicle.model.brandkanban</field>
+            <field name="model">fleet.vehicle.model.brand</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <field name="name" />
+                    <field name="image" />
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div class="oe_kanban_vignette oe_semantic_html_override">
+                                <a type="open" href="#" class="oe_kanban_action oe_kanban_action_a">
+                                    <img t-att-src="kanban_image('fleet.vehicle.model.brand', 'image_small', record.id.value)" class="oe_employee_picture"/>
+                                </a>
+                                <div style="text-align:center;">
+                                    <h4 class="oe_partner_heading">
+                                        <a type="open">
+                                            <field name="name"/>
+                                        </a>
+                                    </h4>
+                                </div>
+                            </div>
+                            <script>
+                            $('.oe_picture').load(function() { if($(this).width() > $(this).height()) { $(this).addClass('oe_employee_picture_wide') } });
+                        </script>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record model='ir.actions.act_window' id='fleet_vehicle_model_brand_act'>
+            <field name="name">Model brand of Vehicle</field>
+            <field name="res_model">fleet.vehicle.model.brand</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new brand.
+              </p>
+            </field>
+        </record>
+
+        <record model='ir.ui.view' id='fleet_vehicle_state_tree'>
+            <field name="name">fleet.vehicle.state.tree</field>
+            <field name="model">fleet.vehicle.state</field>
+            <field name="arch" type="xml">
+                <tree string="State" version="7.0" editable="bottom">
+                    <field name="sequence" widget="handler" invisible="1"/>
+                    <field name="name" />
+                    
+                </tree>
+            </field>
+        </record>
+
+        <record model='ir.actions.act_window' id='fleet_vehicle_state_act'>
+            <field name="name">States of Vehicle</field>
+            <field name="res_model">fleet.vehicle.state</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a vehicule status.
+              </p><p>
+                You can customize available status to track the evolution of
+                each vehicule. Example: Active, Being Repaired, Sold.
+              </p>
+            </field>
+        </record>
+
+        <menuitem name="Fleet" id="menu_root" sequence="70" />
+        <menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="3" />
+        <menuitem action="fleet_vehicle_model_act" parent="fleet_configuration" id="fleet_vehicle_model_menu" groups="base.group_no_one"/>
+        <menuitem action="fleet_vehicle_model_brand_act" parent="fleet_configuration" id="fleet_vehicle_model_brand_menu" groups="base.group_no_one"/>
+        <menuitem action="fleet_vehicle_state_act" parent="fleet_configuration" id="fleet_vehicle_state_menu" />
+
+        <record model='ir.ui.view' id='fleet_vehicle_form'>
+            <field name="name">fleet.vehicle.form</field>
+            <field name="model">fleet.vehicle</field>
+            <field name="arch" type="xml">
+                <form string="Vehicle" version="7.0">
+                    <header>
+                        <field name="state"  widget="statusbar" clickable="True" />
+                    </header>
+                    <sheet> 
+                        <field name="image_medium" widget='image' class="oe_left oe_avatar"/> 
+                        <div class="oe_title">
+                            <label for="model_id" class="oe_edit_only"/>
+                            <h1>
+                                <field name="model_id" class="oe_inline" on_change="on_change_model(model_id)"/>
+                            </h1>
+                            <label for="license_plate" class="oe_edit_only"/>
+                            <h2>
+                                <field name="license_plate" class="oe_inline"/>
+                            </h2>
+                            <label for="tag_ids" class="oe_edit_only"/>
+                            <field name="tag_ids" widget="many2many_tags" />
+                        </div>
+                        <div class="oe_right oe_button_box">
+                            <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_contract_act'}" string="Contracts" help="show the contract for this vehicle" />
+                            <button name="act_show_log_cost" type="object" string="Costs" help="show all the costs for this vehicle" />
+                            <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_services_act'}" string="Services" help="show the services logs for this vehicle" />
+                            <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_fuel_act'}" string="Fuel Logs" help="show the fuel logs for this vehicle" />
+                            <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_odometer_act'}" string="Odometer Logs" help="show the odometer logs for this vehicle" />
+                        </div> 
+                        <group col="2" string="General Properties">
+                            <group >
+                                <field name="driver" />
+                                <field name="location" />
+                                <field name="vin_sn" />
+                                <field name="company_id" groups="base.group_multi_company"/>
+                            </group>
+                            <group >
+                                <label for="odometer" />
+                                <div>
+                                    <field name="odometer" class="oe_inline"/>
+                                    <field name="odometer_unit" class="oe_inline"/>
+                                </div>
+                                <field name="acquisition_date" />
+                                <field name="car_value" />
+                            </group>
+                        </group>
+                        <group col="2">
+                            <group string="Additional Properties">
+                                <field name="seats" />
+                                <field name="doors" />
+                                <field name="color" />
+                            </group>
+                            <group string="Engine Options">
+                                <field name="transmission" />
+                                <field name="fuel_type" />
+                                <field name="co2" />
+                                <field name="horsepower" />
+                                <field name="horsepower_tax" />
+                                <field name="power" />
+                            </group>  
+                        </group>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}'/>
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                    </div>
+                </form>
+            </field>
+        </record>
+        <record model='ir.ui.view' id='fleet_vehicle_tree'>
+            <field name="name">fleet.vehicle.tree</field>
+            <field name="model">fleet.vehicle</field>
+            <field name="arch" type="xml">
+                <tree string="Vehicle" version="7.0" colors="orange:contract_renewal_due_soon and not contract_renewal_overdue;red:contract_renewal_overdue">
+                    <field name="license_plate" />
+                    <field name="model_id" />
+                    <field name="driver" />
+                    <field name="vin_sn" />
+                    <field name="acquisition_date" />
+                    <field name="state"/>
+                    <field name="odometer" />
+                    <field name="odometer_unit" />
+                    <field name="contract_renewal_due_soon" invisible="1"/>
+                    <field name="contract_renewal_overdue" invisible="1" />
+                    <field name="contract_renewal_total" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="fleet_vehicle_search">
+            <field name="name">fleet.vehicle.search</field>
+            <field name="model">fleet.vehicle</field>
+            <field name="arch" type="xml">
+                <search string="All vehicles">
+                    <field name="name" filter_domain="['|', ('name','ilike',self), ('license_plate','ilike',self)]" string="Vehicle"/>
+                    <field name="driver"/>
+                    <field name="tag_ids"/>
+                    <field name="location"/>
+                    <field name="state" />
+                    <field name="state" />
+                    <filter name="alert_true" domain="['|',('contract_renewal_due_soon','=',True),('contract_renewal_overdue','=',True)]" string="Has Alert(s)"/>
+               </search>
+            </field>
+        </record>
+
+
+        <record model='ir.ui.view' id='fleet_vehicle_kanban'>
+            <field name="name">fleet.vehicle.kanban</field>
+            <field name="model">fleet.vehicle</field>
+            <field name="arch" type="xml">
+                <kanban>
+                    <field name="license_plate" />
+                    <field name="model_id" />
+                    <field name="driver" />
+                    <field name="location" />
+                    <field name="state" />
+
+                    <field name="image" />
+                    <field name="tag_ids" />
+                    <field name="contract_renewal_due_soon" />
+                    <field name="contract_renewal_overdue" />
+                    <field name="contract_renewal_name" />
+                    <field name="contract_renewal_total" />
+                    
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div class="oe_kanban_vignette oe_semantic_html_override">
+                                <a type="open" href="#" class="oe_kanban_action oe_kanban_action_a">
+                                    <img t-att-src="kanban_image('fleet.vehicle', 'image_small', record.id.value)"/>
+                                </a>
+                                <div class="oe_kanban_details">
+                                    <h4 class="oe_partner_heading">
+                                        <a type="open">
+                                            <field name="license_plate"/><br/>
+                                            <field name="model_id" />
+                                        </a>
+                                    </h4>
+                                    <t t-if="record.contract_renewal_due_soon.raw_value and !record.contract_renewal_overdue.raw_value">
+                                        <a data-type="object" data-name="return_action_to_open" href="#" class="oe_kanban_action oe_kanban_action_a" data-context='{"xml_id":"fleet_vehicle_log_contract_act"}'>
+                                            <span class="oe_tag oe_kanban_color_3"><field name="contract_renewal_name" />
+                                               <t t-if="record.contract_renewal_total.raw_value > 0"> and <field name="contract_renewal_total" /> other(s) </t>
+                                            </span>
+                                        </a>
+                                    </t>
+
+                                    <t t-if="record.contract_renewal_overdue.raw_value">
+                                        <a data-type="object" data-name="return_action_to_open" href="#" class="oe_kanban_action oe_kanban_action_a" data-context='{"xml_id":"fleet_vehicle_log_contract_act"}'>
+                                            <span class="oe_tag oe_kanban_color_2"><field name="contract_renewal_name" />
+                                                <t t-if="record.contract_renewal_total.raw_value > 0"> and <field name="contract_renewal_total" /> other(s) </t>
+                                            </span>
+                                        </a>
+                                    </t>
+                                    
+                                    <ul>
+                                        <li>
+                                            <t t-if="record.driver.raw_value"><field name="driver"/></t>
+                                        </li>
+                                        <li>
+                                            <t t-if="record.location.raw_value"><field name="location"/></t>
+                                        </li>
+                                        
+                                    </ul>
+
+                                    <div class="oe_kanban_partner_categories">
+                                        <span class="oe_kanban_list_many2many">
+                                            <div modifiers="{}" name="tag_ids" class="oe_form_field oe_tags" model="fleet.vehicle.tag" t-att-data="record.tag_ids.raw_value" />
+                                        </span>
+                                    </div>
+
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+        
+
+        <record model='ir.actions.act_window' id='fleet_vehicle_act'>
+            <field name="name">Vehicles</field>
+            <field name="res_model">fleet.vehicle</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new vehicle. 
+              </p><p>
+                You will be able to manage your fleet by keeping track of the
+                contracts, services, fixed and recurring costs, odometers and
+                fuel logs associated to each vehicle.
+            </p><p>
+                OpenERP will warn you when services or contract have to be
+                renewed.
+              </p>
+            </field>
+        </record>
+
+        <menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" sequence="2" />
+        <menuitem action="fleet_vehicle_act" parent="fleet_vehicles" id="fleet_vehicle_menu" />
+
+
+
+        <record model='ir.ui.view' id='fleet_vehicle_log_contract_form'>
+            <field name="name">fleet.vehicle.log_contract.form</field>
+            <field name="model">fleet.vehicle.log.contract</field>
+            <field name="arch" type="xml">
+                <form string="Contract logs" version="7.0">
+                    <header>
+                        <button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="open" type="object" class="oe_highlight" string="Terminate Contract"/>
+                        <button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="toclose" type="object" class="oe_highlight" string="Terminate Contract"/>
+                        <button modifiers="{'invisible': [['state', 'not in', ['closed']]]}" name="contract_open" states="closed" type="object" class="oe_highlight" string="Set Contract In Progress"/>
+                        <button class="oe_highlight" name="act_renew_contract" type="object" string="Renew Contract" help="Create a new contract automatically with all the same informations except for the date that will start at the end of current contract" />
+                        <field name="state" widget="statusbar" />
+                    </header>
+                    <sheet>
+                        <group col="2">
+                            <group string="Contract details">
+                                <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
+                                <field name="cost_subtype" required="1" domain="['|',('category','=','contract'),('category','=','both')]"/>
+                                <field name="amount" string="Activation Cost"/>
+                                <label for="cost_generated"/>
+                                <div>
+                                    <field name="cost_generated" class="oe_inline" attrs="{'invisible': [('cost_frequency','=','no')]}" />
+                                    <field name="cost_frequency" class="oe_inline"  />
+                                </div>
+                            </group>
+                            <group string="Odometer details">
+                                <label for="odometer"/>
+                                <div>
+                                    <field name="odometer" class="oe_inline"/>
+                                    <field name="odometer_unit" class="oe_inline"/>
+                                </div>
+                            </group>
+                        </group>
+                        <group col="2">
+                            <group>
+                                <field name="date" string="Invoice Date"/>
+                                <field name="start_date"/>
+                                <field name="expiration_date" />
+                            </group>
+                            <group>
+                                <field name="insurer_id" />
+                                <field name="purchaser_id" />
+                                <field name="ins_ref" />
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Included Services">
+                                <group>
+                                    <field name="cost_ids" context="{'vehicle_id': vehicle_id}" nolabel="1" on_change="on_change_indic_cost(cost_ids)">
+                                        <tree version="7.0" editable="bottom">
+                                            <field name="cost_subtype" string="Service" domain="[('category','=','service')]"/>
+                                            <field name="amount" sum="Price" string="Indicative Cost" />
+                                        </tree>
+                                    </field>
+
+                                </group>
+                                <div class="oe_right"><group><field name="sum_cost" string="Indicative Costs Total"/></group></div>
+                            </page>
+                            <page string="Generated Costs">
+                                <group>
+                                    <field name="generated_cost_ids" context="{'vehicle_id': vehicle_id}" nolabel="1" sum="amount">
+                                        <tree version="7.0" editable="bottom" >
+                                            <field name="date" />
+                                            <field name="amount" sum="amount"/>
+                                        </tree>
+
+                                    </field>
+                                </group>
+                            </page>
+                        </notebook>
+                        <group string="Terms and Conditions">
+                            <field name="notes" nolabel="1" placeholder="Write here all other information relative to this contract" />
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <act_window
+            
+            id="act_renew_contract"
+            name="Renew Contract"
+            res_model="fleet.vehicle.log.contract"
+            src_model="fleet.vehicle.log.contract"
+            view_mode="form"
+            view_type="form"
+            />
+
+
+        <record model='ir.ui.view' id='fleet_vehicle_log_contract_tree'>
+            <field name="name">fleet.vehicle.log.contract.tree</field>
+            <field name="model">fleet.vehicle.log.contract</field>
+            <field name="arch" type="xml">
+                <tree string="Contract logs" version="7.0" colors="orange:days_left>0 and days_left&lt;15;red:days_left==0;grey:state=='closed'">
+                    <field name="start_date" />
+                    <field name="expiration_date" />
+                    <field name="days_left" invisible="1"/>
+                    <field name="vehicle_id" />
+                    <field name="cost_subtype"/>
+                    <field name="insurer_id" />
+                    <field name="amount" string="Activation Cost"/>
+                    <field name="cost_generated"/>
+                    <field name="cost_frequency"/>
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="fleet_vehicle_log_contract_graph">
+           <field name="name">fleet.vehicle.log.contract.graph</field>
+           <field name="model">fleet.vehicle.log.contract</field>
+           <!--<field name="type">graph</field>-->
+           <field name="arch" type="xml">
+                <graph string="Contract Costs Per Month">
+                    <field name="date" />
+                    <field name="cost_amount" operator="+"/>
+                    <field name="vehicle_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model='ir.actions.act_window' id='fleet_vehicle_log_contract_act'>
+            <field name="name">Vehicles Contracts</field>
+            <field name="res_model">fleet.vehicle.log.contract</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new contract. 
+              </p><p>
+                Manage all your contracts (leasing, insurances, etc.) with
+                their related services, costs. OpenERP will automatically warn
+                you when some contracts have to be renewed.
+              </p><p>
+                Each contract (e.g.: leasing) may include several services
+                (reparation, insurances, periodic maintenance).
+              </p>
+            </field>
+        </record>
+
+        <menuitem action="fleet_vehicle_log_contract_act" parent="fleet_vehicles" id="fleet_vehicle_log_contract_menu" />
+
+       <record model='ir.ui.view' id='fleet_vehicle_odometer_form'>
+            <field name="name">fleet.vehicle.odometer.form</field>
+            <field name="model">fleet.vehicle.odometer</field>
+            <field name="arch" type="xml">
+                <form string="Odometer Logs" version="7.0">
+                    <sheet>
+                        <group>
+                            <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
+                                <div>
+                                    <field name="value" class="oe_inline"/>
+                                    <field name="unit" class="oe_inline"/>
+                                </div>
+                            <field name="date" />
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model='ir.ui.view' id='fleet_vehicle_odometer_tree'>
+            <field name="name">fleet.vehicle.odometer.tree</field>
+            <field name="model">fleet.vehicle.odometer</field>
+            <field name="arch" type="xml">
+                <tree string="Odometer Logs" version="7.0" editable="top">
+                    <field name="date" />
+                    <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
+                    <field name="value" />
+                    <field name="unit" />
+                </tree>
+            </field>
+        </record>
+        <!--
+        <record model='ir.ui.view' id='fleet_vehicle_odometer_search'>
+            <field name="name">fleet.vehicle.odometer.search</field>
+            <field name="model">fleet.vehicle.odometer</field>
+            <field name="arch" type="xml">
+                <search string="Vehicles odometers" >
+                    <field name="vehicle_id" />
+                    <field name="value"/>
+                    <field name="unit"/>
+                    <field name="date"/>
+                    <filter name="groupby_vehicle" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
+                </search>
+            </field>
+        </record>
+        -->
+
+        <record model="ir.ui.view" id="fleet_vehicle_odometer_graph">
+           <field name="name">fleet.vehicle.odometer.graph</field>
+           <field name="model">fleet.vehicle.odometer</field>
+           <!--<field name="type">graph</field>-->
+           <field name="arch" type="xml">
+                <graph string="Odometer Values Per Month">
+                    <field name="date" />
+                    <field name="value" operator="+"/>
+                    <field name="vehicle_id" group="True"/> 
+                </graph>
+            </field>
+        </record>
+
+        <record model='ir.actions.act_window' id='fleet_vehicle_odometer_act'>
+            <field name="name">Vehicles Odometer</field>
+            <field name="res_model">fleet.vehicle.odometer</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,graph</field>
+            <field name="context">{"search_default_groupby_vehicle" : True}</field>
+            <field name="help" type="html">
+              <p>
+                Here you can add various odometer entries for all vehicles.
+                You can also show odometer value for a particular vehicle using
+                the search field.
+              </p>
+            </field>
+        </record>
+
+        <menuitem action="fleet_vehicle_odometer_act" parent="fleet_vehicles" id="fleet_vehicle_odometer_menu" />
+
+        <record model='ir.ui.view' id='fleet_vehicle_log_fuel_form'>
+            <field name="name">fleet.vehicle.log.fuel.form</field>
+            <field name="model">fleet.vehicle.log.fuel</field>
+            <field name="arch" type="xml">
+                <form string="Fuel Logs" version="7.0">
+                    <sheet>
+                        <group col="2">
+                            <group string="Vehicle Details">
+                                <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
+                            </group>
+                            <group string="Refueling Details">
+                                <field name="liter" on_change="on_change_liter(liter,price_per_liter,amount)"/>
+                                <field name="price_per_liter" on_change="on_change_price_per_liter(liter,price_per_liter,amount)" />
+                                <field name="amount" on_change="on_change_amount(liter,price_per_liter,amount)"/>
+                            </group>
+                        </group>
+                        <group col="2">
+                            <group string="Odometer Details">
+                                <label for="odometer"/>
+                                <div>
+                                    <field name="odometer" class="oe_inline"/>
+                                    <field name="odometer_unit" class="oe_inline"/>
+                                </div>
+                            </group>
+                            <group string="Additional Details">
+                                <field name="date" />
+                                <field name="purchaser_id" />
+                                <field name="inv_ref" />
+                                <field name="vendor_id" />
+                            </group>
+                        </group>
+                        <group string="Notes">
+                            <field nolabel="1" name="notes" placeholder="Write here any other information"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model='ir.ui.view' id='fleet_vehicle_log_fuel_tree'>
+            <field name="name">fleet.vehicle.log.fuel.tree</field>
+            <field name="model">fleet.vehicle.log.fuel</field>
+            <field name="arch" type="xml">
+                <tree string="Fuel Logs">
+                    <field name="date" /> 
+                    <field name="vehicle_id" />
+                    <field name="odometer" invisible="1"/>
+                    <field name="odometer_unit" invisible="1"/>
+                    <field name="purchaser_id" />             
+                    <field name="inv_ref" invisible="1"/>
+                    <field name="vendor_id" invisible="1"/>
+                    <field name="liter" />
+                    <field name="price_per_liter" invisible="1"/>
+                    <field name="amount" sum="Price"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="fleet_vehicle_log_fuel_graph">
+           <field name="name">fleet.vehicle.log.fuel.graph</field>
+           <field name="model">fleet.vehicle.log.fuel</field>
+           <!--<field name="type">graph</field>-->
+           <field name="arch" type="xml">
+                <graph string="Fuel Costs Per Month">
+                    <field name="date" /> 
+                    <field name="cost_amount" operator="+"/>
+                    <field name="vehicle_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model='ir.actions.act_window' id='fleet_vehicle_log_fuel_act'>
+            <field name="name">Vehicles Fuel Logs</field>
+            <field name="res_model">fleet.vehicle.log.fuel</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new fuel log. 
+              </p><p>
+                Here you can add refuelling entries for all vehicles.  You can
+                also filter logs of a particular vehicle using the search
+                field.
+              </p>
+            </field>
+        </record>
+
+        <menuitem action="fleet_vehicle_log_fuel_act" parent="fleet_vehicles" id="fleet_vehicle_log_fuel_menu" />
+
+
+        <record model='ir.ui.view' id='fleet_vehicle_log_services_form'>
+            <field name="name">fleet.vehicle.log.services.form</field>
+            <field name="model">fleet.vehicle.log.services</field>
+            <field name="arch" type="xml">
+                <form string="Services Logs" version="7.0">
+                    <sheet>
+                        <group col="2">
+                            <group string="Services Details">
+                                <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
+                                <field name="cost_subtype" string="Service Type" domain="['|',('category','=','service'),('category','=','both')]" required="1"/>
+                                <field name="amount" string="Price"/>
+                            </group>
+                            <group string="Odometer Details">
+                                <label for="odometer"/>
+                                <div>
+                                    <field name="odometer" class="oe_inline"/>
+                                    <field name="odometer_unit" class="oe_inline"/>
+                                </div>
+                            </group>
+                        </group>
+                        <group col="2">
+                            <group string="Additional Details">
+                                <field name="date" />
+                                <field name="purchaser_id" />
+                                <field name="vendor_id" />
+                                <field name="inv_ref" />
+                            </group>
+                        </group>
+                        <group string="Included Services">
+                            <field name="cost_ids" nolabel="1">
+                                <tree string="Included Services" version="7.0" editable="bottom">
+                                    <field name="cost_subtype" string="Service" domain="[('category','=','service')]"/>
+                                    <field name="amount" sum="Price" string="Cost"/>
+                                </tree>
+                            </field>
+                        </group>
+                        <group string="Notes">
+                            <field nolabel="1" name="notes" placeholder="Write here any other information related to the service completed."/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model='ir.ui.view' id='fleet_vehicle_log_services_tree'>
+            <field name="name">fleet.vehicle.log.services.tree</field>
+            <field name="model">fleet.vehicle.log.services</field>
+            <field name="arch" type="xml">
+                <tree string="Services Logs">
+                    <field name="date" />
+                    <field name="vehicle_id" />
+                    <field name="cost_subtype"/>
+                    <field name="purchaser_id"/>
+                    <field name="vendor_id" />
+                    <field name="inv_ref" />
+                    <field name="notes" />
+                    <field name="amount" sum="Total"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="fleet_vehicle_log_services_graph">
+           <field name="name">fleet.vehicle.log.services.graph</field>
+           <field name="model">fleet.vehicle.log.services</field>
+           <field name="arch" type="xml">
+                <graph string="Services Costs Per Month">
+                    <field name="date" />
+                    <field name="cost_amount" operator="+"/>
+                    <field name="vehicle_id" group="True"/> 
+                </graph>
+            </field>
+        </record>
+
+        <record model='ir.actions.act_window' id='fleet_vehicle_log_services_act'>
+            <field name="name">Vehicles Services Logs</field>
+            <field name="res_model">fleet.vehicle.log.services</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new service entry. 
+              </p><p>
+                OpenERP helps you keeping track of all the services done
+                on your vehicle. Services can be of many type: occasional
+                repair, fixed maintenance, etc.
+              </p>
+            </field>
+        </record>
+
+        <menuitem action="fleet_vehicle_log_services_act" parent="fleet_vehicles" id="fleet_vehicle_log_services_menu" />
+
+        <record model='ir.ui.view' id='fleet_vehicle_service_types_tree'>
+            <field name="name">fleet.service.type.tree</field>
+            <field name="model">fleet.service.type</field>
+            <field name="arch" type="xml">
+                <tree string="Service types" editable="bottom">
+                    <field name="name" />
+                    <field name="category"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model='ir.actions.act_window' id='fleet_vehicle_service_types_act'>
+            <field name="name">Service Types</field>
+            <field name="res_model">fleet.service.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new type of service.
+              </p><p>
+                Each service can used in contracts, as a standalone service or both.
+              </p>
+            </field>
+        </record>
+
+        <menuitem action="fleet_vehicle_service_types_act" parent="fleet_configuration" id="fleet_vehicle_service_types_menu" groups="base.group_no_one"/>
+
+
+        <record model='ir.ui.view' id='fleet_vehicle_costs_tree'>
+            <field name="name">fleet.vehicle.cost.tree</field>
+            <field name="model">fleet.vehicle.cost</field>
+            <field name="arch" type="xml">
+                <tree string="Vehicles costs" >
+                    <field name="date"/>
+                    <field name="vehicle_id" />
+                    <field name="cost_type"/>
+                    <field name="cost_subtype"/>
+                    <field name="amount" sum="Total Cost"/>
+                    <field name="parent_id" invisible="1" />
+                    <field name="year" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model='ir.ui.view' id='fleet_vehicle_costs_search'>
+            <field name="name">fleet.vehicle.cost.search</field>
+            <field name="model">fleet.vehicle.cost</field>
+            <field name="arch" type="xml">
+                <search string="Vehicles costs" >
+                    <field name="vehicle_id" />
+                    <field name="cost_subtype"/>
+                    <field name="year"/>
+                    <field name="date"/>
+                    <field name="parent_id"/>
+                    <filter name="parent_false" domain="[('parent_id','=',False)]" string="Effective Costs"/>
+                    <filter name="parent_true" domain="[('parent_id','!=',False)]" string="Indicative Costs"/>
+                    <group expand="1" string="Group By...">
+                        <filter name="groupby_year" context="{'group_by' : 'year'}" string="Year"/>
+                        <filter name="groupby_date" context="{'group_by' : 'date'}" string="Date"/>
+                        <filter name="groupby_cost_type" context="{'group_by' : 'cost_type'}" string="Cost Type"/>
+                        <filter name="groupby_cost_subtype" context="{'group_by' : 'cost_subtype'}" string="Cost Subtype"/>
+                        <filter name="groupby_vehicle_id" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
+                        <filter name="groupby_parent_id" context="{'group_by' : 'parent_id'}" string="Parent"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record model='ir.ui.view' id='fleet_vehicle_costs_form'>
+            <field name="name">fleet.vehicle.cost.form</field>
+            <field name="model">fleet.vehicle.cost</field>
+            <field name="arch" type="xml">
+                <form string="Vehicle costs" version="7.0">
+                    <sheet>
+                        <group col="2" string="Cost Details">
+                            <group>
+                                <field name="vehicle_id" />
+                                <field name="cost_subtype"/>
+                                <field name="amount"/>
+                            </group>
+                            <group>
+                                <field name="date"/>
+                                <field name="parent_id"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="fleet_vehicle_costs_graph">
+           <field name="name">fleet.vehicle.cost.graph</field>
+           <field name="model">fleet.vehicle.cost</field>
+           <field name="arch" type="xml">
+                <graph string="Costs Per Month">
+                    <field name="date" />
+                    <field name="amount"/>
+                    <field name="vehicle_id" group="True"/>
+                </graph>
+            </field>
+        </record>
+
+        <record model='ir.actions.act_window' id='fleet_vehicle_costs_act'>
+            <field name="name">Vehicle Costs</field>
+            <field name="res_model">fleet.vehicle.cost</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form,graph</field>
+            <field name="context">{"search_default_parent_false" : True, "search_default_groupby_vehicle_id" : True,}</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create a new cost.
+              </p><p>
+                OpenERP helps you managing the costs for your different
+                vehicles. Costs are created automatically from services,
+                contracts (fixed or recurring) and fuel logs.
+              </p>
+            </field>
+        </record>
+
+        <menuitem action="fleet_vehicle_costs_act" parent="fleet_vehicles" id="fleet_vehicle_costs_menu" />
+<!--    
+        <record model='ir.ui.view' id='fleet_hr_employee_form'>
+            <field name="name">fleet.hr.employee.form</field>
+            <field name="model">hr.employee</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="hr.view_employee_form" />
+            <field name="arch" type="xml">
+                <notebook position="inside">
+                    <page string="Vehicle">
+                        <group>
+                            <field name="vehicle_id" widget="many2many_tags"/>
+                        </group>
+                    </page>
+                </notebook>
+            </field>
+        </record>
+
+     <record model="fleet.vehicle.model" id="citroen">
+            <field name="name">Citroen</field>
+        </record>
+
+        <record model="fleet.vehicle" id="stw_vehicle">
+            <field name="name">240BTN</field>
+            <field name="model_id" ref="citroen" />
+        </record>
+ -->
+    </data>
+</openerp>
diff --git a/addons/fleet/security/ir.model.access.csv b/addons/fleet/security/ir.model.access.csv
new file mode 100644
index 00000000000..823b3cb2945
--- /dev/null
+++ b/addons/fleet/security/ir.model.access.csv
@@ -0,0 +1,13 @@
+id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
+fleet_vehicle_model_access_right,fleet_vehicle_model_access_right,model_fleet_vehicle_model,,1,1,1,1
+fleet_vehicle_tag_access_right,fleet_vehicle_tag_access_right,model_fleet_vehicle_tag,,1,1,1,1
+fleet_vehicle_state_access_right,fleet_vehicle_state_access_right,model_fleet_vehicle_state,,1,1,1,1
+fleet_vehicle_odometer_access_right,fleet_vehicle_odometer_access_right,model_fleet_vehicle_odometer,,1,1,1,1
+fleet_vehicle_model_brand_access_right,fleet_vehicle_model_brand_access_right,model_fleet_vehicle_model_brand,,1,1,1,1
+fleet_vehicle_access_right,fleet_vehicle_access_right,model_fleet_vehicle,,1,1,1,1
+fleet_vehicle_log_fuel_access_right,fleet_vehicle_log_fuel_access_right,model_fleet_vehicle_log_fuel,,1,1,1,1
+fleet_vehicle_log_services_access_right,fleet_vehicle_log_services_access_right,model_fleet_vehicle_log_services,,1,1,1,1
+fleet_vehicle_log_contract_access_right,fleet_vehicle_log_contract_access_right,model_fleet_vehicle_log_contract,,1,1,1,1
+fleet_service_type_access_right,fleet_service_type_access_right,model_fleet_service_type,,1,1,1,1
+access_fleet_vehicle_cost,access_fleet_vehicle_cost,model_fleet_vehicle_cost,,1,1,1,1
+access_fleet_contract_state,access_fleet_contract_state,model_fleet_contract_state,,1,1,1,1
diff --git a/addons/fleet/static/src/img/icon.png b/addons/fleet/static/src/img/icon.png
new file mode 100644
index 00000000000..5b41e43c5bd
Binary files /dev/null and b/addons/fleet/static/src/img/icon.png differ
diff --git a/addons/google_base_account/__openerp__.py b/addons/google_base_account/__openerp__.py
index 9dc4a233dcb..b4d996f2807 100644
--- a/addons/google_base_account/__openerp__.py
+++ b/addons/google_base_account/__openerp__.py
@@ -24,16 +24,18 @@
     'name': 'Google Users',
     'version': '1.0',
     'category': 'Tools',
-    'description': """The module adds google user in res user.""",
+    'description': """
+The module adds google user in res user.
+========================================
+""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [
-                  'google_base_account_view.xml',
-                  'wizard/google_login_view.xml',
-                   ],
-    'demo_xml': [],
+    'data': [
+        'google_base_account_view.xml',
+        'wizard/google_login_view.xml',
+    ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/google_base_account/i18n/ar.po b/addons/google_base_account/i18n/ar.po
index 5f486db31ae..be4c2d9bb21 100644
--- a/addons/google_base_account/i18n/ar.po
+++ b/addons/google_base_account/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/de.po b/addons/google_base_account/i18n/de.po
index 6a5090f22ed..a684bba0d3f 100644
--- a/addons/google_base_account/i18n/de.po
+++ b/addons/google_base_account/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/es.po b/addons/google_base_account/i18n/es.po
new file mode 100644
index 00000000000..c0779f7159a
--- /dev/null
+++ b/addons/google_base_account/i18n/es.po
@@ -0,0 +1,124 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-11-07 12:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-08 04:47+0000\n"
+"X-Generator: Launchpad (build 16232)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "Acceso de Google"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "¡Error en la importacion de los contactos de Google!"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " Sincronización "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "¡No puede tener dos usuarios con el mismo identificador!"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "Acceso Google"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "Usuarios"
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "Contraseña de Google"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "_Cancelar"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "Cuenta de Google"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "Usuario de Google"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Por favor, instale gdata-python-client de http://code.google.com/p/gdata-"
+"python-client/downloads/list o desde el administrador de paquetes de su "
+"distribución"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "Contacto Google"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr "Iniciar _sesión"
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"La compañía seleccionada no está entre las companías permitidas para este "
+"usuario"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "Contraseña"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr "Fallo en la autenticación. ¡Compruebe el usuario y la contraseña!"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "ejemplo: usuario@gmail.com"
diff --git a/addons/google_base_account/i18n/es_CR.po b/addons/google_base_account/i18n/es_CR.po
index acbc66c7e66..bb2b117091f 100644
--- a/addons/google_base_account/i18n/es_CR.po
+++ b/addons/google_base_account/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/fi.po b/addons/google_base_account/i18n/fi.po
index 0e8231c4e38..178ded6a45d 100644
--- a/addons/google_base_account/i18n/fi.po
+++ b/addons/google_base_account/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/fr.po b/addons/google_base_account/i18n/fr.po
index 882dc8da7c9..96b7834449c 100644
--- a/addons/google_base_account/i18n/fr.po
+++ b/addons/google_base_account/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/it.po b/addons/google_base_account/i18n/it.po
index db9c09edd4b..88e17026385 100644
--- a/addons/google_base_account/i18n/it.po
+++ b/addons/google_base_account/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/ja.po b/addons/google_base_account/i18n/ja.po
index b6329507d3d..7d3c245bd19 100644
--- a/addons/google_base_account/i18n/ja.po
+++ b/addons/google_base_account/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/mn.po b/addons/google_base_account/i18n/mn.po
new file mode 100644
index 00000000000..940a83c37d7
--- /dev/null
+++ b/addons/google_base_account/i18n/mn.po
@@ -0,0 +1,119 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-11-08 03:11+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-09 04:39+0000\n"
+"X-Generator: Launchpad (build 16250)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "Хэрэглэгчийн нэр"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr ""
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr ""
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Ижил нэвтрэх нэртэй хоёр хэрэглэгч байж болохгүй!"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "Алдаа"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "_Цуцлах"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr ""
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr ""
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr ""
diff --git a/addons/google_base_account/i18n/nb.po b/addons/google_base_account/i18n/nb.po
new file mode 100644
index 00000000000..67697fa390e
--- /dev/null
+++ b/addons/google_base_account/i18n/nb.po
@@ -0,0 +1,122 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 19:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "Brukernavn:"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "Google Logg inn"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Google kontakter Import Feil!"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " Synkronisering "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Du kan ikke ha to brukere med samme login!"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "Feil"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "Google Logg Inn."
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.Brukere."
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "Google passord."
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "_Avbryt"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "Google-konto"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "Google Brukernavn."
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Vennligst Installer gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "Google kontakt"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr "_Logg inn"
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Det valgte firmaet er ikke i listen over tillatte firmaer for denne brukeren"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "Passord:"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr "Autentisering mislykkes sjekk brukernavn og passord!"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "Ex:Bruker@gmail.com"
diff --git a/addons/google_base_account/i18n/nl.po b/addons/google_base_account/i18n/nl.po
index 5b592546bcc..50cee71c378 100644
--- a/addons/google_base_account/i18n/nl.po
+++ b/addons/google_base_account/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-13 14:24+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/pl.po b/addons/google_base_account/i18n/pl.po
new file mode 100644
index 00000000000..0bb099137e4
--- /dev/null
+++ b/addons/google_base_account/i18n/pl.po
@@ -0,0 +1,121 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-11-02 14:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-11-03 05:04+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr ""
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr ""
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr ""
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr ""
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Zainstaluj gdata-python-client z http://code.google.com/p/gdata-python-"
+"client/downloads/list"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr ""
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr ""
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr ""
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "np: user@gmail.com"
diff --git a/addons/google_base_account/i18n/pt.po b/addons/google_base_account/i18n/pt.po
index e55a46b1c5c..641e19e8e13 100644
--- a/addons/google_base_account/i18n/pt.po
+++ b/addons/google_base_account/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/pt_BR.po b/addons/google_base_account/i18n/pt_BR.po
index c1ac6c5e6f2..bedac10b3bb 100644
--- a/addons/google_base_account/i18n/pt_BR.po
+++ b/addons/google_base_account/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/ro.po b/addons/google_base_account/i18n/ro.po
index 09c868e8b45..86313bee481 100644
--- a/addons/google_base_account/i18n/ro.po
+++ b/addons/google_base_account/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/ru.po b/addons/google_base_account/i18n/ru.po
new file mode 100644
index 00000000000..547e3fc4834
--- /dev/null
+++ b/addons/google_base_account/i18n/ru.po
@@ -0,0 +1,123 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-26 14:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: google_base_account
+#: field:res.users,gmail_user:0
+msgid "Username"
+msgstr "Имя пользователя"
+
+#. module: google_base_account
+#: model:ir.actions.act_window,name:google_base_account.act_google_login_form
+msgid "Google Login"
+msgstr "Логин Google"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid "Google Contacts Import Error!"
+msgstr "Ошибка импорта контактов Google!"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid " Synchronization "
+msgstr " Синхронизация "
+
+#. module: google_base_account
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Вы не можете создать двух пользователей с одним логином!"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Error"
+msgstr "Ошибка"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "Google login"
+msgstr "Логин Google"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: google_base_account
+#: field:google.login,password:0
+msgid "Google Password"
+msgstr "Пароль Google"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Cancel"
+msgstr "_Отмена"
+
+#. module: google_base_account
+#: view:res.users:0
+msgid "Google Account"
+msgstr "Аккаунт Google"
+
+#. module: google_base_account
+#: field:google.login,user:0
+msgid "Google Username"
+msgstr "Имя пользователя Google"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:29
+#, python-format
+msgid ""
+"Please install gdata-python-client from http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+msgstr ""
+"Установите, пожалуйста, gdata-python-client с http://code.google.com/p/gdata-"
+"python-client/downloads/list"
+
+#. module: google_base_account
+#: model:ir.model,name:google_base_account.model_google_login
+msgid "Google Contact"
+msgstr "Контакт Google"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "_Login"
+msgstr "_Логин"
+
+#. module: google_base_account
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"Выбранная компания отсутствует в списке разрешённых компаний для этого "
+"пользователя"
+
+#. module: google_base_account
+#: field:res.users,gmail_password:0
+msgid "Password"
+msgstr "Пароль"
+
+#. module: google_base_account
+#: code:addons/google_base_account/wizard/google_login.py:75
+#, python-format
+msgid "Authentication fail check the user and password !"
+msgstr "Ошибка авторизации, проверьте имя пользователя и пароля!"
+
+#. module: google_base_account
+#: view:google.login:0
+msgid "ex: user@gmail.com"
+msgstr "пример: user@gmail.com"
diff --git a/addons/google_base_account/i18n/sl.po b/addons/google_base_account/i18n/sl.po
index 00b1a739f32..2fd0bc7b36f 100644
--- a/addons/google_base_account/i18n/sl.po
+++ b/addons/google_base_account/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/sr@latin.po b/addons/google_base_account/i18n/sr@latin.po
index 9fcd82281da..196ca0198ef 100644
--- a/addons/google_base_account/i18n/sr@latin.po
+++ b/addons/google_base_account/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/sv.po b/addons/google_base_account/i18n/sv.po
index 50f76ee5b23..46afc04d012 100644
--- a/addons/google_base_account/i18n/sv.po
+++ b/addons/google_base_account/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/tr.po b/addons/google_base_account/i18n/tr.po
index 7c13b07fb22..6f792a81c57 100644
--- a/addons/google_base_account/i18n/tr.po
+++ b/addons/google_base_account/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/i18n/zh_CN.po b/addons/google_base_account/i18n/zh_CN.po
index 2c8161a73ed..7454a41c59a 100644
--- a/addons/google_base_account/i18n/zh_CN.po
+++ b/addons/google_base_account/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: google_base_account
 #: field:res.users,gmail_user:0
diff --git a/addons/google_base_account/wizard/google_login.py b/addons/google_base_account/wizard/google_login.py
index c502f101f07..7eb568075c3 100644
--- a/addons/google_base_account/wizard/google_login.py
+++ b/addons/google_base_account/wizard/google_login.py
@@ -38,12 +38,12 @@ class google_login(osv.osv_memory):
 
     def google_login(self, user, password, type='', context=None):
         if type == 'group':
-            gd_client = gdata.contacts.client.ContactsClient(source='OpenERP')
-        if type == 'contact':
             gd_client = gdata.contacts.service.ContactsService()
-        if type == 'calendar':
+        elif type == 'contact':
+            gd_client = gdata.contacts.service.ContactsService()
+        elif type == 'calendar':
             gd_client = gdata.calendar.service.CalendarService()
-        if type =='docs_client':
+        elif type =='docs_client':
             gd_client = gdata.docs.client.DocsClient()
         else:
             gd_client = gdata.contacts.service.ContactsService()
diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index 8cc5671e08a..2d064fdb8a9 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -27,12 +27,15 @@
     'category': 'Tools',
     'installable': True,
     'auto_install': False,
-    'web': True,
     'js': ['static/src/js/gdocs.js'],
-    'update_xml': [
+    'qweb': ['static/src/xml/gdocs.xml'],
+    'data': [
         'security/ir.model.access.csv',
         'res_config_user_view.xml'
     ],
-    'depends': ['google_base_account'],
-    'description': 'Module to attach a google document to any model.'
+    'depends': ['google_base_account','document'],
+    'description': """
+Module to attach a google document to any model.
+================================================
+"""
 }
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 270c105daab..462c8240810 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -17,7 +17,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
+from datetime import datetime
+from tools import DEFAULT_SERVER_DATETIME_FORMAT
 from osv import osv, fields
 from tools.translate import _
 try:
@@ -26,8 +27,11 @@ try:
     from gdata.client import RequestError
     from gdata.docs.service import DOCUMENT_LABEL
     import gdata.auth
+    from gdata.docs.data import Resource
 except ImportError:
-    raise osv.except_osv(_('Google Docs Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list.'))
+    import logging
+    _logger = logging.getLogger(__name__)
+    _logger.warning("Please install latest gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list")
 
 class google_docs_ir_attachment(osv.osv):
     _inherit = 'ir.attachment'
@@ -58,7 +62,8 @@ class google_docs_ir_attachment(osv.osv):
         #login with the base account google module
         client = self._auth(cr, uid, context=context)
         # create the document in google docs
-        local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL)
+        title = "%s %s" % (context.get("name","Untitled Document."), datetime.today().strftime(DEFAULT_SERVER_DATETIME_FORMAT))
+        local_resource = gdata.docs.data.Resource(gdata.docs.data.DOCUMENT_LABEL,title=title)
         #create a new doc in Google Docs 
         gdocs_resource = client.post(entry=local_resource, uri='https://docs.google.com/feeds/default/private/full/')
         # create an ir.attachment into the db
@@ -66,10 +71,12 @@ class google_docs_ir_attachment(osv.osv):
             'res_model': res_model,
             'res_id': res_id,
             'type': 'url',
-            'name': _('Google Doc'),
+            'name': title,
             'url': gdocs_resource.get_alternate_link().href,
         }, context=context)
-        return gdocs_resource.resource_id.text
+        return {'resource_id': gdocs_resource.resource_id.text,
+                'title': title,
+                'url': gdocs_resource.get_alternate_link().href}
 
     def copy_gdoc(self, cr, uid, res_model, res_id, name_gdocs, gdoc_template_id, context=None):
         '''
@@ -86,7 +93,7 @@ class google_docs_ir_attachment(osv.osv):
         try:
             original_resource = client.get_resource_by_id(gdoc_template_id)
             #copy the document you choose in the configuration
-            copy_resource = client.copy_resource(original_resource, 'copy_%s' % original_resource.title.text)
+            copy_resource = client.copy_resource(original_resource, name_gdocs)
         except:
             raise osv.except_osv(_('Google Docs Error!'), _("Your resource id is not correct. You can find the id in the google docs URL."))
         # create an ir.attachment
@@ -111,7 +118,8 @@ class google_docs_ir_attachment(osv.osv):
             a length of 1 element only (batch processing is not supported in the code, though nothing really prevent it)
           :return: the google document object created
         '''
-        assert len(ids) == 1, 'Creating google docs may only be done by one at a time'
+        if len(ids) != 1:
+            raise osv.except_osv(_('Google Docs Error!'), _("Creating google docs may only be done by one at a time."))
         res_id = ids[0]
         pool_ir_attachment = self.pool.get('ir.attachment')
         pool_gdoc_config = self.pool.get('google.docs.config')
@@ -122,7 +130,10 @@ class google_docs_ir_attachment(osv.osv):
         google_docs_config = pool_gdoc_config.search(cr, uid, [('model_id', '=', res_model)], context=context)
         if google_docs_config:
             name_gdocs = pool_gdoc_config.browse(cr, uid, google_docs_config, context=context)[0].name_template
-            name_gdocs = name_gdocs % model_fields_dic
+            try:
+                name_gdocs = name_gdocs % model_fields_dic
+            except:
+                raise osv.except_osv(_('Key Error!'), _("Your Google Doc Name Pattern's key does not found in object."))
             google_template_id = pool_gdoc_config.browse(cr, uid, google_docs_config[0], context=context).gdocs_resource_id
             google_document = pool_ir_attachment.copy_gdoc(cr, uid, res_model, res_id, name_gdocs, google_template_id, context=context)
         else:
@@ -134,16 +145,16 @@ class config(osv.osv):
     _description = "Google Docs templates config"
 
     _columns = {
-        'model_id': fields.many2one('ir.model', 'Model'),
-        'gdocs_resource_id': fields.char('Google resource ID', size=64,help='''
+        'model_id': fields.many2one('ir.model', 'Model', required=True),
+        'gdocs_resource_id': fields.char('Google Resource ID to Use as Template', size=64, help='''
 This is the id of the template document, on google side. You can find it thanks to its URL: 
 *for a text document with url like `https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is `document:123456789`
 *for a spreadsheet document with url like `https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, the ID is `spreadsheet:123456789`
 *for a presentation (slide show) document with url like `https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id.p`, the ID is `presentation:123456789`
 *for a drawing document with url like `https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is `drawings:123456789`
 ...
-'''),
-        'name_template': fields.char('GDoc name template ', size=64, help='This is the name which appears on google side'),
+''', required=True),
+        'name_template': fields.char('Google Doc Name Pattern', size=64, help='Choose how the new google docs will be named, on google side. Eg. gdoc_%(field_name)s', required=True),
     }
 
     _defaults = {
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 4aabba3ac5a..e6c4223735f 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -8,9 +8,10 @@
             <field name="name">google_docs.config.tree</field>
             <field name="model">google.docs.config</field>
             <field name="arch" type="xml">
-                <group name="default_filters" position="inside">
+                <tree string="Google Docs Configuration">
                     <field name="model_id"/>
-                </group>
+                    <field name="name_template"/>
+                </tree>
             </field>
         </record>
 
@@ -18,11 +19,25 @@
             <field name="name">google_docs.config.form</field>
             <field name="model">google.docs.config</field>
             <field name="arch" type="xml">
-            <group colspan='4'>
-                <field name="model_id"/>
-                <field name='gdocs_resource_id'/>
-                <field name='name_template'/>
-            </group>
+                <form string="Google Docs Configuration" version="7.0">
+                <group>
+                    <field name="model_id"/>
+                    <label for='gdocs_resource_id'/>
+                    <div>
+                        <field name='gdocs_resource_id'/>
+                        <p class="oe_grey">
+This is the id of the template document, on google side. You can find it thanks to its URL:
+<ul>
+<li>for a text document with url like `https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is `document:123456789`</li>
+<li>for a spreadsheet document with url like `https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, the ID is `spreadsheet:123456789`</li>
+<li>for a presentation (slide show) document with url like `https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id.p`, the ID is `presentation:123456789`</li>
+<li>for a drawing document with url like `https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is `drawings:123456789`</li>
+</ul>
+                        </p>
+                    </div>
+                    <field name='name_template'/>
+                </group>
+                </form>
             </field>
         </record>
 
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index 8f41a9d7b21..45e1d09d42c 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -1,41 +1,40 @@
 openerp.google_docs = function(instance, m) {
-var _t = instance.web._t;
+var _t = instance.web._t,
+    QWeb = instance.web.qweb;
 
-    instance.web.Sidebar = instance.web.Sidebar.extend({
-        on_attachments_loaded: function(attachments) {
-            self = this
-            self._super(attachments);
-            // if attachment contains a google doc url do nothing
-            // else display a button to create a google doc
-            var flag = false;
-            _.each(attachments, function(i) {
-                if (i.url && i.url.match('/docs.google.com/')) { flag = true; }
+    instance.web.Sidebar.include({
+        redraw: function() {
+            var self = this;
+            this._super.apply(this, arguments);
+            self.$el.find('.oe_sidebar_add_attachment').after(QWeb.render('AddGoogleDocumentItem', {widget: self}))
+            self.$el.find('.oe_sidebar_add_google_doc').on('click', function (e) {
+                self.on_google_doc();
             });
-            if (! flag) {
-                this.add_items('files', [
-                    { label: _t('Google Doc'), callback: self.on_google_doc },
-                ]);
-            }
         },
         on_google_doc: function() {
             var self = this;
-            var form = self.getParent();
-            form.sidebar_context().then(function (context) {
-                var ds = new instance.web.DataSet(this, 'ir.attachment', context);
-                ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context], function(r) {
-                    if (r == 'False') {
-                        var params = {
-                            error: response,
-                            message: _t("The user google credentials are not set yet. Contact your administrator for help.")
+            var view = self.getParent();
+            var ids = ( view.fields_view.type != "form" )? view.groups.get_selection().ids : [ view.datarecord.id ];
+            if( !_.isEmpty(ids) ){
+                view.sidebar_context().done(function (context) {
+                    var ds = new instance.web.DataSet(this, 'ir.attachment', context);
+                    ds.call('google_doc_get', [view.dataset.model, ids, context]).done(function(r) {
+                        if (r == 'False') {
+                            var params = {
+                                error: response,
+                                message: _t("The user google credentials are not set yet. Contact your administrator for help.")
+                            }
+                            $(openerp.web.qweb.render("DialogWarning", params)).dialog({
+                                title: _t("User Google credentials are not yet set."),
+                                modal: true,
+                            });
                         }
-                        $(openerp.web.qweb.render("DialogWarning", params)).dialog({
-                            title: _t("User Google credentials are not yet set."),
-                            modal: true,
-                        });
-                    }
-                    form.reload();
+                    }).done(function(r){
+                        window.open(r.url,"_blank");
+                        view.reload();
+                    });
                 });
-            })
+            }
         }
-    })
-}
+    });
+};
diff --git a/addons/google_docs/static/src/xml/gdocs.xml b/addons/google_docs/static/src/xml/gdocs.xml
new file mode 100644
index 00000000000..0c8d9c3b01f
--- /dev/null
+++ b/addons/google_docs/static/src/xml/gdocs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+<t t-name="AddGoogleDocumentItem">
+     <li class="oe_sidebar_add_google_doc"><span><b>Add Google Doc...</b></span></li>
+</t>
+</templates>
diff --git a/addons/google_map/__init__.py b/addons/google_map/__init__.py
deleted file mode 100644
index d276c1debeb..00000000000
--- a/addons/google_map/__init__.py
+++ /dev/null
@@ -1,24 +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 google_map_launch
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/google_map/google_map_launch.py b/addons/google_map/google_map_launch.py
deleted file mode 100644
index 8ee9a16fb0a..00000000000
--- a/addons/google_map/google_map_launch.py
+++ /dev/null
@@ -1,50 +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
-
-class launch_map(osv.osv):
-
-    _inherit = "res.partner"
-
-    def open_map(self, cr, uid, ids, context=None):
-        address_obj= self.pool.get('res.partner')
-        partner = address_obj.browse(cr, uid, ids, context=context)[0]
-        url="http://maps.google.com/maps?oi=map&q="
-        if partner.street:
-            url+=partner.street.replace(' ','+')
-        if partner.city:
-            url+='+'+partner.city.replace(' ','+')
-        if partner.state_id:
-            url+='+'+partner.state_id.name.replace(' ','+')
-        if partner.country_id:
-            url+='+'+partner.country_id.name.replace(' ','+')
-        if partner.zip:
-            url+='+'+partner.zip.replace(' ','+')
-        return {
-        'type': 'ir.actions.act_url',
-        'url':url,
-        'target': 'new'
-        }
-
-launch_map()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/google_map/i18n/ar.po b/addons/google_map/i18n/ar.po
deleted file mode 100644
index bcbd6fc7df3..00000000000
--- a/addons/google_map/i18n/ar.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-09-05 23:08+0000\n"
-"Last-Translator: Majed Majbour <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "خريطة جوجل"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "عناوين الشريك"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "شارع 2: "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "فتح خريطة جوجل"
-
-#~ msgid "Google Map"
-#~ msgstr "خرائط جوجل"
-
-#~ 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 ""
-#~ "هذا البرنامج يضيف خانة خرائط جوجل في عنوان الشريك\n"
-#~ "و بالتالي يمكنك فتح مباشرة خرائط جوجل من\n"
-#~ "الـ URL للملحق."
diff --git a/addons/google_map/i18n/bg.po b/addons/google_map/i18n/bg.po
deleted file mode 100644
index d1dc0a0fd40..00000000000
--- a/addons/google_map/i18n/bg.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-08-03 06:15+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: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Карта"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Адрес на партньора"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Улица2 : "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Невалиден XML за преглед на архитектурата"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Зареди \"Гугъл карта\""
-
-#~ msgid "Google Map"
-#~ msgstr "Гугъл карта"
-
-#~ 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 ""
-#~ "Модулът добавя поле \"Гугъл карта\" в адреса на партньоратака че можем да "
-#~ "атворим гугъл карта директно отurl джаджата."
diff --git a/addons/google_map/i18n/br.po b/addons/google_map/i18n/br.po
deleted file mode 100644
index 0dd63ea3f49..00000000000
--- a/addons/google_map/i18n/br.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Breton 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-12 10:00+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Breton <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: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Kartenn"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Straed2 : "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Lañsañ Google Map"
diff --git a/addons/google_map/i18n/bs.po b/addons/google_map/i18n/bs.po
deleted file mode 100644
index 78443b59e10..00000000000
--- a/addons/google_map/i18n/bs.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-04-10 08:38+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adrese partnera"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
diff --git a/addons/google_map/i18n/ca.po b/addons/google_map/i18n/ca.po
deleted file mode 100644
index 71d03d4bf38..00000000000
--- a/addons/google_map/i18n/ca.po
+++ /dev/null
@@ -1,51 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-08-03 06:15+0000\n"
-"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
-"<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: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adreces d'empresa"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Carrer2 : "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Mostra Google Map"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invàlid per a la definició de la vista!"
-
-#~ 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 ""
-#~ "Mòdul que afegeix un camp Google Map en la direcció de l'empresa\n"
-#~ "per poder obrir directament Google Map des de\n"
-#~ "un camp de tipus URL."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
diff --git a/addons/google_map/i18n/cs.po b/addons/google_map/i18n/cs.po
deleted file mode 100644
index 53325c42e9b..00000000000
--- a/addons/google_map/i18n/cs.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-05-09 08:19+0000\n"
-"Last-Translator: Jan B. Krejčí <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adresy partnerů"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Ulice2 "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalidní XML pro zobrazení architektury!"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Spustit Google Mapy"
-
-#~ msgid "Google Map"
-#~ msgstr "Google Mapy"
-
-#~ 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 ""
-#~ "Tento modul přidá pole Google Map do adresy partnera,\n"
-#~ "takže z ní pak můžeme rovnou mapu otevřít."
diff --git a/addons/google_map/i18n/da.po b/addons/google_map/i18n/da.po
deleted file mode 100644
index 0fbe30ca441..00000000000
--- a/addons/google_map/i18n/da.po
+++ /dev/null
@@ -1,51 +0,0 @@
-# Danish 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-11-08 21:48+0000\n"
-"Last-Translator: OpenERP Danmark / Henning Dinsen <Unknown>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Kort"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partneradresser"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Gade2: "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ugyldig XML for View Architecture!"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Start Google Map"
-
-#~ 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 ""
-#~ "Modulet tilføjer Google Map område i partner-adresse, \n"
-#~ "således man umiddelbart kan åbne Google Map fra \n"
-#~ "url henvisningen."
-
-#~ msgid "Google Map"
-#~ msgstr "Google kort"
diff --git a/addons/google_map/i18n/de.po b/addons/google_map/i18n/de.po
deleted file mode 100644
index 8b5cdc52e14..00000000000
--- a/addons/google_map/i18n/de.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-13 04:40+0000\n"
-"Last-Translator: silas <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Karte"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partner Adressen"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Strasse2: "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Öffne Google Map"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#~ 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 ""
-#~ "Dieses Modul fügt ein Google Map Feld in die Partner Adresse ein, so dass "
-#~ "Google Maps direkt aufgerufen werden kann."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
diff --git a/addons/google_map/i18n/el.po b/addons/google_map/i18n/el.po
deleted file mode 100644
index 36419d05744..00000000000
--- a/addons/google_map/i18n/el.po
+++ /dev/null
@@ -1,51 +0,0 @@
-# Greek 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-13 11:20+0000\n"
-"Last-Translator: Dimitrios Ntoulas <Unknown>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Χάρτης"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Διεύθυνση Συνεργάτη"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Οδός 2: "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Εκκίνηση Google Map"
-
-#~ 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 Map στους συνεργάτες\n"
-#~ "έτσι να μπορεί ο χρήστης ν' ανοίξει κατ' ευθείαν τον χάρτη του Google\n"
-#~ "από το πεδίο."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Άκυρο XML για την Αρχιτεκτονική Όψης!"
-
-#~ msgid "Google Map"
-#~ msgstr "Χάρτης Google"
diff --git a/addons/google_map/i18n/en_GB.po b/addons/google_map/i18n/en_GB.po
deleted file mode 100644
index 5fac8ddaf11..00000000000
--- a/addons/google_map/i18n/en_GB.po
+++ /dev/null
@@ -1,51 +0,0 @@
-# English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-08-25 11:53+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Map"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partner Addresses"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Street2 : "
-
-#~ 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 ""
-#~ "The module adds google map field in partner address\n"
-#~ "so that we can directly open google map from the\n"
-#~ "url widget."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Launch Google Map"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Invalid XML for View Architecture!"
diff --git a/addons/google_map/i18n/es.po b/addons/google_map/i18n/es.po
deleted file mode 100644
index 342ef119707..00000000000
--- a/addons/google_map/i18n/es.po
+++ /dev/null
@@ -1,51 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-22 21:33+0000\n"
-"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
-"<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: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Direcciones de empresa"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Calle2 : "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Mostrar Google Map"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ 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 ""
-#~ "El módulo añade un campo mapa de google en la dirección de la empresa\n"
-#~ "para poder abrir directamente Google Maps desde\n"
-#~ "el campo de tipo URL."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
diff --git a/addons/google_map/i18n/es_AR.po b/addons/google_map/i18n/es_AR.po
deleted file mode 100644
index 1659a2a4f70..00000000000
--- a/addons/google_map/i18n/es_AR.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-09-14 13:54+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: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Calle 2 : "
-
-#~ 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 ""
-#~ "Módulo que agrega el Google Map en la información del partner\n"
-#~ "para poder abrir su dirección directamente en Google Map mediante\n"
-#~ "un campo de tipo URL."
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Mostrar Google Map"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para la definición de la vista!"
diff --git a/addons/google_map/i18n/es_CR.po b/addons/google_map/i18n/es_CR.po
deleted file mode 100644
index af12bb30830..00000000000
--- a/addons/google_map/i18n/es_CR.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-13 20:26+0000\n"
-"Last-Translator: Carlos Vásquez (CLEARCORP) "
-"<carlos.vasquez@clearcorp.co.cr>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"Language: \n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Direcciones de empresa"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Calle2 : "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Mostrar Google Map"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ 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 ""
-#~ "El módulo añade un campo mapa de google en la dirección de la empresa\n"
-#~ "para poder abrir directamente Google Maps desde\n"
-#~ "el campo de tipo URL."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
diff --git a/addons/google_map/i18n/es_EC.po b/addons/google_map/i18n/es_EC.po
deleted file mode 100644
index 7ae47d38acc..00000000000
--- a/addons/google_map/i18n/es_EC.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-13 04:30+0000\n"
-"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Direcciones de empresa"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Calle2 : "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Mostrar Google Map"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ 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 ""
-#~ "El módulo añade un campo mapa de google en la dirección de la empresa\n"
-#~ "para poder abrir directamente Google Maps desde\n"
-#~ "el campo de tipo URL."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
diff --git a/addons/google_map/i18n/es_MX.po b/addons/google_map/i18n/es_MX.po
deleted file mode 100644
index 781923eff72..00000000000
--- a/addons/google_map/i18n/es_MX.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-22 21:33+0000\n"
-"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
-"<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: 2011-09-05 04:55+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Calle2 : "
-
-#. module: google_map
-#: model:ir.actions.wizard,name:google_map.wizard_google_map
-msgid "Launch Google Map"
-msgstr "Mostrar Google Map"
-
-#. module: google_map
-#: model:ir.module.module,description:google_map.module_meta_information
-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 ""
-"El módulo añade un campo mapa de google en la dirección de la empresa\n"
-"para poder abrir directamente Google Maps desde\n"
-"el campo de tipo URL."
-
-#. module: google_map
-#: model:ir.module.module,shortdesc:google_map.module_meta_information
-msgid "Google Map"
-msgstr "Google Map"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Direcciones de empresa"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/google_map/i18n/es_PY.po b/addons/google_map/i18n/es_PY.po
deleted file mode 100644
index 0a10a4c3526..00000000000
--- a/addons/google_map/i18n/es_PY.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-03-07 02:02+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Direcciones de empresa"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Calle2 : "
-
-#~ 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 ""
-#~ "El módulo añade un campo mapa de google en la dirección de la empresa\n"
-#~ "para poder abrir directamente Google Maps desde\n"
-#~ "el campo de tipo URL."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Mostrar Google Map"
diff --git a/addons/google_map/i18n/es_VE.po b/addons/google_map/i18n/es_VE.po
deleted file mode 100644
index 781923eff72..00000000000
--- a/addons/google_map/i18n/es_VE.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-22 21:33+0000\n"
-"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
-"<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: 2011-09-05 04:55+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Calle2 : "
-
-#. module: google_map
-#: model:ir.actions.wizard,name:google_map.wizard_google_map
-msgid "Launch Google Map"
-msgstr "Mostrar Google Map"
-
-#. module: google_map
-#: model:ir.module.module,description:google_map.module_meta_information
-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 ""
-"El módulo añade un campo mapa de google en la dirección de la empresa\n"
-"para poder abrir directamente Google Maps desde\n"
-"el campo de tipo URL."
-
-#. module: google_map
-#: model:ir.module.module,shortdesc:google_map.module_meta_information
-msgid "Google Map"
-msgstr "Google Map"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Direcciones de empresa"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/google_map/i18n/et.po b/addons/google_map/i18n/et.po
deleted file mode 100644
index 01e369f3599..00000000000
--- a/addons/google_map/i18n/et.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-10-10 19:33+0000\n"
-"Last-Translator: Aare Vesi <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Kaart"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partneri aadressid"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Tänav2: "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Käivita Google kaart"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
-
-#~ 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 ""
-#~ "See moodul lisab google kaardi välja partneri\n"
-#~ "aadressile nii, et me saame otse avada google\n"
-#~ "kaardi url vidinast."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
diff --git a/addons/google_map/i18n/eu.po b/addons/google_map/i18n/eu.po
deleted file mode 100644
index dca70071050..00000000000
--- a/addons/google_map/i18n/eu.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Basque 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-11-01 08:43+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Basque <eu@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr ""
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Abiarazi Google mapa"
diff --git a/addons/google_map/i18n/fi.po b/addons/google_map/i18n/fi.po
deleted file mode 100644
index ab64a615a94..00000000000
--- a/addons/google_map/i18n/fi.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# Finnish 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-13 07:27+0000\n"
-"Last-Translator: Pekka Pylvänäinen <Unknown>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Kartta"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Kumppanien osoitteet"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Osoite2 "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Virheellinen XML näkymäarkkitehtuurille!"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Käynnistä Google Map"
-
-#~ 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 ""
-#~ "Tämä moduuli lisää google map osoitteen kumppanin tietoihin\n"
-#~ "jotta osoite voidaan avata suoraan url widgetillä."
diff --git a/addons/google_map/i18n/fr.po b/addons/google_map/i18n/fr.po
deleted file mode 100644
index a29737763e2..00000000000
--- a/addons/google_map/i18n/fr.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-11 05:46+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Plan/Carte"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adresses du partenaire"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Adresse suite "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valide pour l'architecture de la vue"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Lancer Google Map"
-
-#~ 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 ""
-#~ "Le module ajoute un champ Google Maps sur l'adresse partenaire\n"
-#~ "qui vous permet d'ouvrir directement Google Maps depuis le composant URL."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
diff --git a/addons/google_map/i18n/gl.po b/addons/google_map/i18n/gl.po
deleted file mode 100644
index 749ff00f18c..00000000000
--- a/addons/google_map/i18n/gl.po
+++ /dev/null
@@ -1,51 +0,0 @@
-# Galician 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-09-24 12:48+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
-"Language-Team: Galician <gl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Enderezos da Empresa"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Rúa2 : "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Lanzar Google Maps"
-
-#~ 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 ""
-#~ "O módulo engade un campo de google maps no enderezo do partner\n"
-#~ "de maneira que poidamos abrir un mapa directamente deste o\n"
-#~ "trebello de URL."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML non válido para a definición da vista!"
-
-#~ msgid "Google Map"
-#~ msgstr "Mapa de Google"
diff --git a/addons/google_map/i18n/google_map.pot b/addons/google_map/i18n/google_map.pot
deleted file mode 100644
index dff0900e204..00000000000
--- a/addons/google_map/i18n/google_map.pot
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+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: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr ""
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr ""
-
diff --git a/addons/google_map/i18n/gu.po b/addons/google_map/i18n/gu.po
deleted file mode 100644
index c303c173506..00000000000
--- a/addons/google_map/i18n/gu.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Gujarati translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-03-06 18:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "નકશો"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "દ્રશ્ય બંધારણ માટે અમાન્ય એક્સ.એમ.એલ!"
diff --git a/addons/google_map/i18n/hi.po b/addons/google_map/i18n/hi.po
deleted file mode 100644
index 5f8655772ff..00000000000
--- a/addons/google_map/i18n/hi.po
+++ /dev/null
@@ -1,51 +0,0 @@
-# Hindi 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-08-03 06:15+0000\n"
-"Last-Translator: vir (Open ERP) <vir@tinyerp.com>\n"
-"Language-Team: Hindi <hi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "नक़्शा"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "सहयोगियों के पते"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "स्ट्रीट 2 "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "आरम्भ करना Google Map"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "संरचना देखने के लिए अमान्य XML!"
-
-#~ msgid "Google Map"
-#~ msgstr "गूगल मानचित्र"
-
-#~ 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 ""
-#~ "यह भाग गूगल मानचित्र पृष्ठभूमि को सहयोगी के पते पर डालता है\n"
-#~ "ताकि हम सीधे\n"
-#~ "यू.आर.एल. विज़ेट से गूगल मानचित्र खोल सकें।"
diff --git a/addons/google_map/i18n/hr.po b/addons/google_map/i18n/hr.po
deleted file mode 100644
index f63034a08f7..00000000000
--- a/addons/google_map/i18n/hr.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-28 21:38+0000\n"
-"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Karta"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adrese partnera"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Ulica 2 : "
-
-#~ 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 ""
-#~ "Modul dodaje Google zemljovid u polje adrese stranke\n"
-#~ "tako da je moguće izravno otvoriti Google mapu iz\n"
-#~ "URL komponente."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neispravan XML za arhitekturu prikaza!"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Pokreni Google zemljovid"
diff --git a/addons/google_map/i18n/hu.po b/addons/google_map/i18n/hu.po
deleted file mode 100644
index 43a7be19217..00000000000
--- a/addons/google_map/i18n/hu.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-13 23:48+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Térkép"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partnerek címei"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Utca 2: "
-
-#~ 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 ""
-#~ "Ez a modul egy Google Maps mezőt ad hozzá a partner címéhez.\n"
-#~ "Így közvetlenül megnyitja a Google Maps -et a böngészőben."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nem valós XML"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Google Maps indítása"
-
-#~ msgid "Google Map"
-#~ msgstr "Google térkép"
diff --git a/addons/google_map/i18n/id.po b/addons/google_map/i18n/id.po
deleted file mode 100644
index 28cc783035b..00000000000
--- a/addons/google_map/i18n/id.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-11-09 13:49+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Peta"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Alamat partner"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Jalan "
-
-#~ 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 ""
-#~ "Modul menambah kolom google map di alamat partner\n"
-#~ "sehingga kita dapat langsung membuka peta google dari\n"
-#~ "url widget."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Jalankan Google Map"
diff --git a/addons/google_map/i18n/it.po b/addons/google_map/i18n/it.po
deleted file mode 100644
index 8b1b0de0a88..00000000000
--- a/addons/google_map/i18n/it.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-25 22:10+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mappa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Indirizzi dei Partner"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Indirizzo2 : "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Lancia Google Map"
-
-#~ 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 ""
-#~ "Il modulo aggiunge un campo di Google Map nell'indirizzo del partner\n"
-#~ "in questo modo è possibile aprire direttamente Google Maps\n"
-#~ "dal widget url"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per la struttura della vista"
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
diff --git a/addons/google_map/i18n/ja.po b/addons/google_map/i18n/ja.po
deleted file mode 100644
index 4631750611e..00000000000
--- a/addons/google_map/i18n/ja.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-01 05:50+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "地図"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "パートナの住所"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "住所２： "
diff --git a/addons/google_map/i18n/ko.po b/addons/google_map/i18n/ko.po
deleted file mode 100644
index e036dfef7ab..00000000000
--- a/addons/google_map/i18n/ko.po
+++ /dev/null
@@ -1,45 +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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-09-08 12:46+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: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "맵"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "스트리트2: "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "뷰 아키텍처를 위한 XML이 유효하지 않음."
-
-#~ 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 "이 모듈은 파트너 주소지에 구글 맵 필드를 추가합니다."
-
-#~ msgid "Launch Google Map"
-#~ msgstr "구글 맵 시작"
diff --git a/addons/google_map/i18n/lo.po b/addons/google_map/i18n/lo.po
deleted file mode 100644
index 65068c78a1c..00000000000
--- a/addons/google_map/i18n/lo.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# Lao translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-17 17:58+0000\n"
-"Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
-"Language-Team: Lao <lo@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "ເເຜນທີ່"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "ທີ່ຢູ່ຄຸຄ້າ"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "ຖນົນທີ໒ "
-
-#~ msgid "Google Map"
-#~ msgstr "ປະຕີທິນ ກູເກີນ"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "ຍິງປະຕີທິນ ກູເກີນ"
-
-#~ 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 ""
-#~ "ຕົວປະກອບຕົວນີ້ເອົາທີ່ຢູ່ຄູ່ຄ້າ ດັ່ງນັ້ນທ່ານຈະເປີດເເຜນທີ່ກູເກີນໄດ້ໂດຍຕົງຈາກ "
-#~ "url widget"
diff --git a/addons/google_map/i18n/lt.po b/addons/google_map/i18n/lt.po
deleted file mode 100644
index 1eb9cc9a23f..00000000000
--- a/addons/google_map/i18n/lt.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-08-03 03:59+0000\n"
-"Last-Translator: Giedrius Slavinskas - inovera.lt "
-"<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: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Žemėlapis"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Gatvė (2): "
-
-#~ 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 ""
-#~ "Šis modulis įtraukia Google žemėlapio laukelį partnerio \n"
-#~ "adrese, todėl galime tiesiogiai atidaryti Google \n"
-#~ "žemėlapį sekdami nuoroda (URL)."
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Paleisti Google Žemėlapį"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Netinkamas XML peržiūros architektūrai!"
diff --git a/addons/google_map/i18n/lv.po b/addons/google_map/i18n/lv.po
deleted file mode 100644
index f7db14b5387..00000000000
--- a/addons/google_map/i18n/lv.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Latvian 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-03-03 23:54+0000\n"
-"Last-Translator: Diana Mamajeva <Unknown>\n"
-"Language-Team: Latvian <lv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Karte"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partnera Adreses"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Iela 2: "
-
-#~ 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 ""
-#~ "Modulis pievieno Google Map lauku partnera adresei, \n"
-#~ "tas ļauj atvērt Google Map no URL miniprogrammas."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nederīgs XML vērtējot pēc Skata Arhitektūras"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Atvērt Google Map"
-
-#~ msgid "Google Map"
-#~ msgstr "Google Karte"
diff --git a/addons/google_map/i18n/lv_LV.po b/addons/google_map/i18n/lv_LV.po
deleted file mode 100644
index 26a13214b2f..00000000000
--- a/addons/google_map/i18n/lv_LV.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# Latvian 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-05-19 14:36+0000\n"
-"PO-Revision-Date: 2009-07-13 21:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Latvian <lv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-08-28 10:56+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: google_map
-#: model:ir.module.module,description:google_map.module_meta_information
-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 ""
-
-#. module: google_map
-#: model:ir.actions.wizard,name:google_map.wizard_google_map
-msgid "Launch Google Map"
-msgstr ""
-
-#. module: google_map
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr ""
diff --git a/addons/google_map/i18n/mk.po b/addons/google_map/i18n/mk.po
deleted file mode 100644
index e4b8a64d376..00000000000
--- a/addons/google_map/i18n/mk.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Macedonian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-09-14 08:11+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Macedonian <mk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Мапа"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Адреса на партнерот"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr ""
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Стартувај Google Map"
diff --git a/addons/google_map/i18n/mn.po b/addons/google_map/i18n/mn.po
deleted file mode 100644
index 7e972fa679d..00000000000
--- a/addons/google_map/i18n/mn.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Mongolian 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-10-22 10:33+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Газрын зураг"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Харилцагчийн хаягууд"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Гудамж2 "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Google Map ачаалах"
-
-#~ 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 ""
-#~ "Энэ модуль нь харилцагчийн хаяг дээр газарзүйн\n"
-#~ " байршлын мэдээлэл нэмж газрын зураг дээр шууд \n"
-#~ "харах боломжтой болгоно."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Дэлгэцийн XML алдаатай!"
diff --git a/addons/google_map/i18n/nb.po b/addons/google_map/i18n/nb.po
deleted file mode 100644
index 189a84dcf8f..00000000000
--- a/addons/google_map/i18n/nb.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# Norwegian Bokmal translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-03-31 18:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Norwegian Bokmal <nb@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Kart"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partner adresse"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Gate2 : "
-
-#~ 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 ""
-#~ "Denne modulen legger til et google map felt under partner adresse\n"
-#~ "slik at vi kan åpne google map direkte."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Start Google Map"
diff --git a/addons/google_map/i18n/nl.po b/addons/google_map/i18n/nl.po
deleted file mode 100644
index ed38eaa8ae1..00000000000
--- a/addons/google_map/i18n/nl.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-12 13:14+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Kaart"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Relatieadressen"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Adres2 : "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Start Google Maps"
-
-#~ 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 ""
-#~ "De module voegt een Google Map-veld toe aan het adres \n"
-#~ "van een relatie zodat een Google Map geopend kan worden\n"
-#~ "van de URL widget."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave!"
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
diff --git a/addons/google_map/i18n/nl_BE.po b/addons/google_map/i18n/nl_BE.po
deleted file mode 100644
index ad58d4dcd66..00000000000
--- a/addons/google_map/i18n/nl_BE.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-04-20 09: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: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr ""
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr ""
diff --git a/addons/google_map/i18n/oc.po b/addons/google_map/i18n/oc.po
deleted file mode 100644
index 7d3312c422a..00000000000
--- a/addons/google_map/i18n/oc.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# Occitan (post 1500) 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-08-03 04:04+0000\n"
-"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
-"Language-Team: Occitan (post 1500) <oc@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Adreça seguida : "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invalid per l'arquitectura de la vista"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Aviar Google Map"
diff --git a/addons/google_map/i18n/pl.po b/addons/google_map/i18n/pl.po
deleted file mode 100644
index 459f5f2f56a..00000000000
--- a/addons/google_map/i18n/pl.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-07 20:14+0000\n"
-"Last-Translator: Andrzej Król <andrzej.krol@poczta.onet.eu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adres partnera"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Ulica2 : "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Uruchom Mapy Google"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#~ 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 ""
-#~ "Moduł dodaje pole map google w adresie partnerskim\n"
-#~ "więc możemy bezpośrednio otworzyć mapy google z\n"
-#~ "widgetu url."
diff --git a/addons/google_map/i18n/pt.po b/addons/google_map/i18n/pt.po
deleted file mode 100644
index 810202f2819..00000000000
--- a/addons/google_map/i18n/pt.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-11-27 14:40+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Endereços do Parceiro"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Rua2 : "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Iniciar Google Map"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a arquitectura da vista!"
-
-#~ msgid "Google Map"
-#~ msgstr "Mapa Google"
-
-#~ 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 ""
-#~ "Este módulo adiciona o campo google map no endereço do parceiro\n"
-#~ "assim é possivel abrir diretamente o google mapa a partir de um url widget."
diff --git a/addons/google_map/i18n/pt_BR.po b/addons/google_map/i18n/pt_BR.po
deleted file mode 100644
index 3bfbc2a7d1f..00000000000
--- a/addons/google_map/i18n/pt_BR.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-16 16:09+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Endereços do parceiro"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Rua2: "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Executar o Google Map"
-
-#~ 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 ""
-#~ "O módulo adiciona um campo Google Map no endereço do parceiro\n"
-#~ "de modo que possamos abrir o Google Maps diretamente da\n"
-#~ "URL do widget."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para a arquitetura de exibição"
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
diff --git a/addons/google_map/i18n/ro.po b/addons/google_map/i18n/ro.po
deleted file mode 100644
index 8428c76eabf..00000000000
--- a/addons/google_map/i18n/ro.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-11-27 06:36+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Harta"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adresele partenerului"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Strada2 "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
-#~ msgid "Google Map"
-#~ msgstr "Harta Google"
-
-#~ 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 ""
-#~ "Modulul adaugă câmpul hartă google în adresa partener\n"
-#~ "pentru a putea deschide google map direct\n"
-#~ "din widget-ul URL."
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Lansare Google Map (Harta Google)"
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
deleted file mode 100644
index 6bd28a2ee23..00000000000
--- a/addons/google_map/i18n/ru.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-11-29 07:46+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Карта"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Адреса партнера"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Улица2 : "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Запустить Google Map"
-
-#~ 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 картой в адрес партнера\n"
-#~ "поэтому мы можем открыть карту Google непосредственно из\n"
-#~ "адреса виджета."
-
-#~ msgid "Google Map"
-#~ msgstr "Карты Google"
diff --git a/addons/google_map/i18n/sk.po b/addons/google_map/i18n/sk.po
deleted file mode 100644
index 0ae1320b1c8..00000000000
--- a/addons/google_map/i18n/sk.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Slovak 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-10-23 07:01+0000\n"
-"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
-"Language-Team: Slovak <sk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adresy partnera"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Ulica2 : "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neplatná XML pre zobrazenie architektúry!"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Spustenie Google Map"
-
-#~ 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 ""
-#~ "Modul pridáva Google Map do poľa na adresu partnera\n"
-#~ "takže môžete otvoriť adresu partnera priamo v Google Map."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
diff --git a/addons/google_map/i18n/sl.po b/addons/google_map/i18n/sl.po
deleted file mode 100644
index 02eaeff336c..00000000000
--- a/addons/google_map/i18n/sl.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-12 02:05+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Zemljevid"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Naslovi stranke"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Ulica2: "
-
-#~ 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 ""
-#~ "Modul doda polje google zemljevida v partnerjev naslov\n"
-#~ "tako, da lahko neposredno odpremo google zemljevid iz\n"
-#~ "url gradnika."
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Poženi Google Zemljevid"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neveljaven XML za arhitekturo pogleda!"
-
-#~ msgid "Google Map"
-#~ msgstr "Zemljevid Google"
diff --git a/addons/google_map/i18n/sq.po b/addons/google_map/i18n/sq.po
deleted file mode 100644
index 1ca5472d0e6..00000000000
--- a/addons/google_map/i18n/sq.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Albanian 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-09-08 13:42+0000\n"
-"Last-Translator: heroid <heroid@ayih.org>\n"
-"Language-Team: Albanian <sq@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Harta"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Rruga2 : "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Shfaqe Google Harten"
diff --git a/addons/google_map/i18n/sr.po b/addons/google_map/i18n/sr.po
deleted file mode 100644
index 23e903e5fc2..00000000000
--- a/addons/google_map/i18n/sr.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Serbian 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-11-02 07:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Serbian <sr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "mapa"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Adresa Partnera"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Ulica2 "
-
-#~ 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 ""
-#~ "Ovaj Modul ubacuje sliku google map u partnerovoj adresi\n"
-#~ "tako da mozemo direktno da otvorimo google map iz tog\n"
-#~ "prozora."
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Ppkreni Google Map"
diff --git a/addons/google_map/i18n/sr@latin.po b/addons/google_map/i18n/sr@latin.po
deleted file mode 100644
index 57d2b68228a..00000000000
--- a/addons/google_map/i18n/sr@latin.po
+++ /dev/null
@@ -1,51 +0,0 @@
-# Serbian latin 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: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-10-06 13:57+0000\n"
-"Last-Translator: Milan Milosevic <Unknown>\n"
-"Language-Team: Serbian latin <sr@latin@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Karta"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Partnerove adrese"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Ulica2 : "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Pokreni Google Map"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za pregled arhitekture"
-
-#~ 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 ""
-#~ "Ovaj Modul dodaje google map polje u partnerovoj adresi\n"
-#~ "tako da možemo direktno otvoriti google map iz\n"
-#~ "url vidžeta."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
diff --git a/addons/google_map/i18n/sv.po b/addons/google_map/i18n/sv.po
deleted file mode 100644
index 4f41bd0ecdc..00000000000
--- a/addons/google_map/i18n/sv.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.14\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-13 16:55+0000\n"
-"Last-Translator: Aries Bucquet, Aspirix AB <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Karta"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Företagsadress"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Gata 2: "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Starta Google Map"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ogiltig XML för Vy-arkitektur!"
-
-#~ 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 ""
-#~ "Modulen lägger till ett fält kopplat till Google Map  under partner adressen."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
diff --git a/addons/google_map/i18n/tlh.po b/addons/google_map/i18n/tlh.po
deleted file mode 100644
index 21ad1acc2d2..00000000000
--- a/addons/google_map/i18n/tlh.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+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: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr ""
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr ""
diff --git a/addons/google_map/i18n/tr.po b/addons/google_map/i18n/tr.po
deleted file mode 100644
index 524f8581ed5..00000000000
--- a/addons/google_map/i18n/tr.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2011-01-22 22:56+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Harita"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Bağlantılı Adresler"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Cadde2: "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Google Map'i Başlat"
-
-#~ 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 ""
-#~ "Bu modül, google haritasını url elemanından doğrudan açabilmemiz için, ortak "
-#~ "adrese google harita alanı ekler"
-
-#~ msgid "Google Map"
-#~ msgstr "Google Harita"
diff --git a/addons/google_map/i18n/uk.po b/addons/google_map/i18n/uk.po
deleted file mode 100644
index 2d03a57adff..00000000000
--- a/addons/google_map/i18n/uk.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2008-11-17 23:41+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: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Карта"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "Вулиця2 : "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильний XML для Архітектури Вигляду!"
diff --git a/addons/google_map/i18n/vi.po b/addons/google_map/i18n/vi.po
deleted file mode 100644
index be51c5a4263..00000000000
--- a/addons/google_map/i18n/vi.po
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-12-20 09:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Vietnamese <vi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "Bản đồ"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "Địa chỉ của đối tác"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "đường 2 : "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML không hợp lệ để xem Kiến trúc"
-
-#~ msgid "Launch Google Map"
-#~ msgstr "Khởi động Google Map"
-
-#~ 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 ""
-#~ "Module này cho biết thêm bản đồ google trong lĩnh vực đối tác địa chỉ\n"
-#~ "để chúng tôi trực tiếp có thể mở bản đồ google từ\n"
-#~ "url widget."
-
-#~ msgid "Google Map"
-#~ msgstr "Google Map"
diff --git a/addons/google_map/i18n/zh_CN.po b/addons/google_map/i18n/zh_CN.po
deleted file mode 100644
index e1a6446f6ae..00000000000
--- a/addons/google_map/i18n/zh_CN.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-11-24 09:41+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr "地图"
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr "业务伙伴地址"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr "街道2: "
-
-#~ msgid "Launch Google Map"
-#~ msgstr "启动Google地图"
-
-#~ msgid "Google Map"
-#~ msgstr "Google地图"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "无效的视图结构xml文件!"
-
-#~ 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 ""
-#~ "该模块在业务伙伴加入谷歌地图字段\n"
-#~ "使我们可以从URL直接打开谷歌地图"
diff --git a/addons/google_map/i18n/zh_TW.po b/addons/google_map/i18n/zh_TW.po
deleted file mode 100644
index b2f6067c6b3..00000000000
--- a/addons/google_map/i18n/zh_TW.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* google_map
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2009-01-30 13:19+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Map"
-msgstr ""
-
-#. module: google_map
-#: model:ir.model,name:google_map.model_res_partner_address
-msgid "Partner Addresses"
-msgstr ""
-
-#. module: google_map
-#: view:res.partner:0
-msgid "Street2 : "
-msgstr ""
diff --git a/addons/google_map/static/src/js/google_map.js b/addons/google_map/static/src/js/google_map.js
deleted file mode 100644
index bd871eafe6b..00000000000
--- a/addons/google_map/static/src/js/google_map.js
+++ /dev/null
@@ -1,75 +0,0 @@
-openerp.event = function(instance, mod) {
-    instance.web.form.widgets.add('many2one_address_google_map', 'instance.google_map.Many2OneAddress');
-
-    var googleMapsLoaded = null;
-
-    instance.google_map.GoogleMapConnector = instance.web.Class.extend({
-        map_load: function() {
-            var self = this;
-            if(googleMapsLoaded === null) {
-                googleMapsLoaded = $.Deferred();
-                // global
-                openerp_googleMapsCallback = googleMapsLoaded.resolve;
-                $.ajax({
-                    url: "https://maps.googleapis.com/maps/api/js?v=3&callback=openerp_googleMapsCallback&sensor=false",
-                    dataType: "script"
-                }).fail(googleMapsLoaded.reject);
-            }
-            return googleMapsLoaded;
-        },
-        render_map: function(address,element) {
-            this.map_load().then(function() {
-                var geocoder = new google.maps.Geocoder();
-                geocoder.geocode({'address': address}, function(results, status) {
-                    if (status == google.maps.GeocoderStatus.OK) {
-                        var lat = results[0].geometry.location.lat();
-                        var lng = results[0].geometry.location.lng();
-                        var myOptions = {
-                            zoom: 17,
-                            center: new google.maps.LatLng(lat,lng),
-                            mapTypeId: google.maps.MapTypeId.ROADMAP
-                        };
-                        var map = new google.maps.Map(element,myOptions);
-                        var position = new google.maps.LatLng(lat,lng);
-                        var marker = new google.maps.Marker({ map: map, position: position });
-                        return marker;
-                    }
-                });
-            });
-        },
-    });
-
-    instance.google_map.Many2OneAddress = instance.web.form.FieldMany2One.extend({
-        init: function(field_manager, node){
-          this._super(field_manager, node);
-          this.map = new instance.google_map.GoogleMapConnector();
-        },
-        get_address:function(value){
-            var self = this;
-            if (!value || value.length == 0){
-                return $.Deferred().reject();
-            }
-            (value instanceof Array)?value = parseInt(value[0]):false;
-            var data = new instance.web.DataSet(this,this.field.relation, this.build_context());
-            data.read_ids(value,["street","city","zip","country_id"]).done(function(value){
-                var address;
-                if (value['country_id']) {
-                    address = _.str.sprintf('%(street)s, %(zip)s %(city)s, %(country_id[1])s', value);
-                } else {
-                    address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
-                }
-                // TODO repalce by widget_option selector self.options.selector
-                var el = self.view.$element.find(".oe_google_map")[0];
-                self.map.render_map(address,el);
-            });
-        },
-        set_value:function(value){
-            this._super(value);
-            this.get_address(value);
-        },
-        render_value:function(no_recurse){
-            this.get_address(this.get("value"));
-            this._super(no_recurse);
-        }
-    });
-};
diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py
index 65b2d5fc08f..b4b8e982845 100644
--- a/addons/hr/__openerp__.py
+++ b/addons/hr/__openerp__.py
@@ -20,21 +20,25 @@
 ##############################################################################
 
 {
-    "name": "Employee Directory",
-    "version": "1.1",
-    "author": "OpenERP SA",
-    "category": "Human Resources",
-    "sequence": 12,
-    "website": "http://www.openerp.com",
-    "summary": "All Infos on Employees",
-    "description": """
-Module for Human Resource Management.
-=====================================
+    'name': 'Employee Directory',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'category': 'Human Resources',
+    'sequence': 21,
+    'website': 'http://www.openerp.com',
+    'summary': 'Jobs, Departments, Employees Details',
+    'description': """
+Human Resources Management
+==========================
+
+This application enables you to manage important aspects of your company's staff and other details such as their skills, contacts, working time...
+
 
 You can manage:
-    * Employees and hierarchies : You can define your employee with User and display hierarchies
-    * HR Departments
-    * HR Jobs
+---------------
+* Employees and hierarchies : You can define your employee with User and display hierarchies
+* HR Departments
+* HR Jobs
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
@@ -45,8 +49,7 @@ You can manage:
         'static/src/img/default_image.png',
     ],
     'depends': ['base_setup','mail', 'resource', 'board'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/hr_security.xml',
         'security/ir.model.access.csv',
         'board_hr_view.xml',
@@ -57,17 +60,14 @@ You can manage:
         'hr_data.xml',
         'res_config_view.xml',
     ],
-    'demo_xml': [
-        'hr_demo.xml',
-    ],
+    'demo': ['hr_demo.xml'],
     'test': [
-             'test/open2recruit2close_job.yml',
-             'test/hr_demo.yml',
-             ],
+        'test/open2recruit2close_job.yml',
+        'test/hr_demo.yml',
+    ],
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0086710558965',
-    "css": [ 'static/src/css/hr.css' ],
+    'css': [ 'static/src/css/hr.css' ],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr/board_hr_view.xml b/addons/hr/board_hr_view.xml
index 4d01038b671..84db6128f41 100644
--- a/addons/hr/board_hr_view.xml
+++ b/addons/hr/board_hr_view.xml
@@ -22,6 +22,20 @@
         <field name="view_mode">form</field>
         <field name="usage">menu</field>
         <field name="view_id" ref="board_hr_form"/>
+            <field name="help" type="html">
+              <div class="oe_empty_custom_dashboard">
+                  <p>
+                    <b>Human Resources dashboard is empty.</b>
+                  </p><p>
+                    To add your first report into this dashboard, go to any
+                    menu, switch to list or graph view, and click <i>'Add to
+                    Dashboard'</i> in the extended search options.
+                  </p><p>
+                    You can filter and group data before inserting into the
+                    dashboard using the search options.
+                  </p>
+              </div>
+            </field>
     </record>
     <menuitem id="menu_hr_dashboard" 
               parent="base.menu_reporting_dashboard" 
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 966c29cab07..5f3a5653307 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -90,16 +90,17 @@ class hr_job(osv.osv):
 
     _name = "hr.job"
     _description = "Job Description"
+    _inherit = ['mail.thread']
     _columns = {
         'name': fields.char('Job Name', size=128, required=True, select=True),
-        'expected_employees': fields.function(_no_of_employee, string='Total Employees',
+        'expected_employees': fields.function(_no_of_employee, string='Total Forecasted Employees',
             help='Expected number of employees for this job position after new recruitment.',
             store = {
                 'hr.job': (lambda self,cr,uid,ids,c=None: ids, ['no_of_recruitment'], 10),
                 'hr.employee': (_get_job_position, ['job_id'], 10),
             },
             multi='no_of_employee'),
-        'no_of_employee': fields.function(_no_of_employee, string="Number of Employees",
+        'no_of_employee': fields.function(_no_of_employee, string="Current Number of Employees",
             help='Number of employees currently occupying this job position.',
             store = {
                 'hr.employee': (_get_job_position, ['job_id'], 10),
@@ -111,7 +112,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', 'In Position'), ('recruit', 'In Recruitement')], 'Status', readonly=True, required=True,
+        'state': fields.selection([('open', 'No Recruitment'), ('recruit', 'Recruitement in Progress')], 'Status', readonly=True, required=True,
             help="By default 'In position', set it to 'In Recruitment' if recruitment process is going on for this job position."),
     }
     _defaults = {
@@ -157,6 +158,8 @@ class hr_employee(osv.osv):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
     
     _columns = {
+        #we need a related field in order to be able to sort the employee by name
+        'name_related': fields.related('resource_id', 'name', type='char', string='Name', readonly=True, store=True),
         'country_id': fields.many2one('res.country', 'Nationality'),
         'birthday': fields.date("Date of Birth"),
         'ssnid': fields.char('SSN No', size=32, help='Social Security Number'),
@@ -180,17 +183,16 @@ class hr_employee(osv.osv):
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True),
         'coach_id': fields.many2one('hr.employee', 'Coach'),
         'job_id': fields.many2one('hr.job', 'Job'),
+        # image: all image fields are base64 encoded and PIL-supported
         'image': fields.binary("Photo",
-            help="This field holds the image used as a photo for the "\
-                 "employee. The image is base64 encoded, and PIL-supported. "\
-                 "It is limited to a 1024x1024 px image."),
+            help="This field holds the image used as photo for the employee, limited to 1024x1024px."),
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
             string="Medium-sized photo", type="binary", multi="_get_image",
             store = {
                 'hr.employee': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized photo of the employee. It is automatically "\
-                 "resized as a 180x180 px image, with aspect ratio preserved. "\
+                 "resized as a 128x128px image, with aspect ratio preserved. "\
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Smal-sized photo", type="binary", multi="_get_image",
@@ -198,7 +200,7 @@ class hr_employee(osv.osv):
                 'hr.employee': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized photo of the employee. It is automatically "\
-                 "resized as a 50x50 px image, with aspect ratio preserved. "\
+                 "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
         'passport_id':fields.char('Passport No', size=64),
         'color': fields.integer('Color Index'),
@@ -207,12 +209,14 @@ class hr_employee(osv.osv):
         'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1),
     }
 
+    _order='name_related'
+
     def create(self, cr, uid, data, context=None):
         employee_id = super(hr_employee, self).create(cr, uid, data, context=context)
         try:
             (model, mail_group_id) = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'group_all_employees')
             employee = self.browse(cr, uid, employee_id, context=context)
-            self.pool.get('mail.group').message_append_note(cr, uid, [mail_group_id], body='Welcome to %s! Please help him make its first steps in OpenERP!' % (employee.name), context=context)
+            self.pool.get('mail.group').message_post(cr, uid, [mail_group_id], body='Welcome to %s! Please help them take the first steps with OpenERP!' % (employee.name), context=context)
         except:
             pass # group deleted: do not push a message
         return employee_id
@@ -231,7 +235,7 @@ class hr_employee(osv.osv):
     def onchange_address_id(self, cr, uid, ids, address, context=None):
         if address:
             address = self.pool.get('res.partner').browse(cr, uid, address, context=context)
-            return {'value': {'work_email': address.email, 'work_phone': address.phone, 'mobile_phone': address.mobile}}
+            return {'value': {'work_phone': address.phone, 'mobile_phone': address.mobile}}
         return {'value': {}}
 
     def onchange_company(self, cr, uid, ids, company, context=None):
@@ -262,7 +266,6 @@ class hr_employee(osv.osv):
     _defaults = {
         'active': 1,
         'image': _get_default_image,
-        'marital': 'single',
         'color': 0,
     }
 
@@ -290,8 +293,12 @@ class hr_department(osv.osv):
         'member_ids': fields.one2many('hr.employee', 'department_id', 'Members', readonly=True),
     }
 
-hr_department()
-
+    def copy(self, cr, uid, ids, default=None, context=None):
+        if default is None:
+            default = {}
+        default = default.copy()
+        default['member_ids'] = []
+        return super(hr_department, self).copy(cr, uid, ids, default, context=context)
 
 class res_users(osv.osv):
     _name = 'res.users'
diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml
index 18c50836f07..25c882f2201 100644
--- a/addons/hr/hr_data.xml
+++ b/addons/hr/hr_data.xml
@@ -2,14 +2,16 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Employee Directory has been installed</value>
-            <value>Manage your human resources in OpenERP: employees and hierarchy, HR departments and jobs.
-
-More HR features are available from the following modules: Recruitment Process (manage job positions and recruitment), Timesheets Validation (record timesheets and attendance), Leaves Management (keep track of employee leaves), Expenses Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager.)</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Employee Directory application installed!</field>
+            <field name="body"><![CDATA[<p>Manage your human resources with OpenERP: employees and their hierarchy, HR departments and job positions.</p>
+<p>More HR features are available via extra applications: Recruitment Process (manage job positions and recruitment), Timesheet Validation (record timesheets and attendance),
+Leave Management (keep track of employee leaves), Expense Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager).</p>]]></field>
+        </record>
 
         <record id="employee" model="hr.employee">
             <field name="name">Administrator</field>
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 20d3e093505..914f373d02a 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -4,107 +4,6 @@
 
     <!--Users-->
 
-      <record id="base.user_root" model="res.users">
-          <field name="image">/9j/4AAQSkZJRgABAQEAZABkAAD/4gv4SUNDX1BST0ZJTEUAAQEAAAvoAAAAAAIAAABtbnRyUkdCIFhZWiAH2QADABsAFQAkAB9hY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA9tYAAQAAAADTLQAAAAAp+D3er/JVrnhC+uTKgzkNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBkZXNjAAABRAAAAHliWFlaAAABwAAAABRiVFJDAAAB1AAACAxkbWRkAAAJ4AAAAIhnWFlaAAAKaAAAABRnVFJDAAAB1AAACAxsdW1pAAAKfAAAABRtZWFzAAAKkAAAACRia3B0AAAKtAAAABRyWFlaAAAKyAAAABRyVFJDAAAB1AAACAx0ZWNoAAAK3AAAAAx2dWVkAAAK6AAAAId3dHB0AAALcAAAABRjcHJ0AAALhAAAADdjaGFkAAALvAAAACxkZXNjAAAAAAAAAB9zUkdCIElFQzYxOTY2LTItMSBibGFjayBzY2FsZWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAACSgAAAPhAAAts9jdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//2Rlc2MAAAAAAAAALklFQyA2MTk2Ni0yLTEgRGVmYXVsdCBSR0IgQ29sb3VyIFNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAAAABQAAAAAAAAbWVhcwAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACWFlaIAAAAAAAAAMWAAADMwAAAqRYWVogAAAAAAAAb6IAADj1AAADkHNpZyAAAAAAQ1JUIGRlc2MAAAAAAAAALVJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUMgNjE5NjYtMi0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLXRleHQAAAAAQ29weXJpZ2h0IEludGVybmF0aW9uYWwgQ29sb3IgQ29uc29ydGl1bSwgMjAwOQAAc2YzMgAAAAAAAQxEAAAF3///8yYAAAeUAAD9j///+6H///2iAAAD2wAAwHX/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCABaAGQDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDvvH/wU1XVJpp9Fj0S+TflVedo2/8AQCP/AB6vI9Z+DfxD0vfcx+ALn5f47G4hmb8lk3/+O16p8WPh1Lqs76l4ekiS9/59ppPLV/8AclHzRt/47/u14lrfiD4meEJIUutf8ZaXE00kUG/U5pIXkjZkdUYuyNhl+7/wL7tevRnP7Ml8zyMTCHN70X8jG1nSfEOjx79Y0PxBpSf3riwuIf8Ax4ptra0LTk03SZtY1X/j4ZF8iCaRvkhf+OXP8R/hX/gVdP4P+L3xPuNN1K9vfFslxptvD9mT7RaQ+Y1xKrBNrxxqfk/1n/fNcdryPeabZaakcr3FxdM1zd3MnmM8j8szZ/5af3mb5q3p8/2zlfJ8UdfU43xb4p1Ce1dIpI0indt33tzrtx1rn5rvULsJaW8/+q+bb/y0dv72P4quy2TzSTTNH8zOzN+7+4vzf0qPWdMuIZIXf/Wr8jbPvfIzDt/u0TgTTqQLWhpKkHnX3yW8u5F/ebWZuobHB4rv/B+rXCWiWz+VePLu8+L5WXyz/eRj83zVwdrpkqWrvdxyzW6f88rjasufSptNvfsDpbpJvZk+6/zQsx/hGfSrE/5jvNa0yL7J/aWleakSor3NtNuVrf5sbkZvvR/+g1hyXD/I/wDf+9/vVa8L69cabrP2a8+S3uPk2vceZby54+Zj92k8X6S+iT+d9zTbj5YJHk/1TfxRO394fw/3l+b+9UC/vRKUlw/l76ktLvfB/uP/AD5rMRll+eKSOb/ck3fyqOOWGGT5/KT+9+FaGfObD3Cbv9Z/5EorL+3WX8dxbZ/66LRQaH3tAm+/tf8Aruv/AKFXmviHTrS8fUIbm3imt7idknV4/MWVQzffQ/K2P4f/AB3bXqFqn/Eytk/g85f/AEKvPNW/4+7r/rvLuX/gTV5UD25nivjpNB8MWumeG7PzIYIHkup1+aRlluGQ8fxbliWJV3fN/DurJ0K4TWIE022/0Z0ulbb5m5k/eZZtw+83zfM1YXxjlf8A4WhqyeZK6QTKu1P721Dt/BWr1r4DeHrG51pL+aOKbyoPlb+4x/8AHV+9Xd8EeY8uHv1eUJ/AGnaPpP8Ax7/PAm6Xf82/e2yX/wBkqlqXg23sNaheazi/dXXzf3XjPDN/8VXuereG/t6eTD8kTI0Uq/7JX+jVS8Q6Db38E9tcx/61P3v930+8Kw9sdv1Y821b4e2L6b9mSzimif5tqe/5f99V5TrvgCbRLt0tvtMNu33oH2yL+RBr6T0K0vv7Jhs7+T/SLVPK83/nrs4V2/2j/FVLUtG86TZN5T/7VEKxE8NGZ8v6Tol3NrX2Z7OKaJvlZX+WN13fxjkN/vLXuvwdE8XidNP0u8udKa4gaKCVI45Gl2Lv8p0bI+7W34p8F6cnhPUNVhs4/Ngh3XO/5flC/M+3+L+7/e2v/srXkvwwu/EMXxa0m2tJPtk76pG3lvJ+8dVZfNf8IpHZ/wDvpauc+eEjCEPYzj5n0lqfgTRtY/5C/gzwlqkz/enuNMjWRvxXmsx/hN4Og2fZvDFjpUq/9A6/Zd3/AABkZa9I2O8nyfJF/e/ip8cSJ9z7/wDerzuaR6nJE84uPAE3nsth4v8AHOlwrgfZLS6tJI4jgdDJAzHP3uWP3uMDABXfMn+k3H++P/QVop88h8sT468M/tWeKLRbdtf8KaTrUkIj33EU72k0jD+NvvJuP+ytW9G+LX277bNbap9tia9klXT9Ujb7RFDJIx2JKv8Ac3fe3Mv+z91a+aQf8/Wtvw1cJbatazSXEcMSzKszS7tqRvw7NtBbbht3yq1dkIRPPnOTO78fTf2r471O5SOWF72682KL/WbN6r8u6vqP4DeHn0HwJBc38fky3XzbX+9FGP8A2Y1534r8DW9nr3hPUbYf6VeOlrth+75cFigjfkBufLdv/Qq+gf7OR9FTTYZNiRIsSt9KdafuKJOGo+85SM/xD4y0zSrTe9vfOip/yxt9zf8AfNc3aeNNO1KTZbfbod//AD827R/1rjfih4JvhcfufG/je3lZ90s8V/tX/cWJdqxrVHw14ImudTe8sJNXhi/dbYprhpFT+9I0rEs2f7tRCEeU3nOXMeqR6jElZ/8AwkOjWd+iXOqWMMv8KzXCrv8Azp/izSbtPDU1npsn/EwitfN3eXu/u5214ZfeHvFf9pWzw+KNJmfzm+1rcWHnR+Xu4ZFZN27b95f++aIQjMJzlA+j/EVzYaj8NfEF1p1zFcSrplyyqnzb9sbMv/oNfL/gP4g2GhXqfES18OfbVsoPssVh9r8nZcS/KX8zY3SLfjj+OvoD4S2mv217DDq/9mXNhdfPFc28fkttO5TFLFltrf7rba+cPHegpo/g3UE02DyVg1qy06WC3j3fvEhumdu//PJGqqPJ70SK05e7L+tD09P2rbl/+aaRf+FF/wDc9WR+1DeNvz8Pbddvrrcjf+0K+ZIILz+C01H5flbZaSf/ABFa1pb6ikbv/Z+pfc/js5F/pW/1Wkcv1zEf0j9APBtw3iDw1Ya3MI4JL+1humjhBKp5kSOFyRk4DAZ4zjOBnAKj+DZJ+GHhtmO0tpFkcf8AbrFRXkyep7kFeKZ+XoTdDN/31Uke1k2t91vl3LU09u9o+yX+L5aZLaXFtJCk0exZUWWNv70b9Gr1DyPjPuH4TunxC+GHh3X57yVr6yjRZ2MnmTLd26pFNv8A99Y0k/7bvur06C4/d7/ub6+Kf2btQ1628WT2FneXv9jJayX+oWqSN5bbNio5X+9uZPmr7G83946VySgdlKfP7walcWn33+fZ/f8AmqPw9qKald3SQx/JaorN+LMF/wDQaxtWR3k2fvXrJu9PtJrTzv7YlsH+ZPPhvPs+/wDvIvPzU+QXOegfZ/tOtTf63elr8q/98iuLv7fSb+ebztPtklt52iZvL/iDYb5f96uTjh8aXN28MN5KkqOv2a5SSFvNUfxKvP8A6DW5YQypG/nSedL9+WR/vPIeWZqvk5PtBz8/Q7fwn5Vs9t5PleVvX7n3du6vHvFOl3Fh8LYNWmcfaNW8VPdfJJ/D5N0q5avTvD3mzSJCnzu+77lY/wAfdOt7DwNpFhZx7LeDV49qvIzN/qbr5iTWcfi9Rz+H0PF7R38t/wDW/fb/AJaUX7/uH/d0+C3f5/8Af/8AiaL+L9xXccJ9XfCuRG+G/ht1dFDaTZnDdf8Aj3joqn8Kd/8AwrXw0q/w6PZA/X7NHRXjT+Jnqw+FHw1b+BtW1qO9mubP7Bv8v7M95+73sG+ZmUfP93/Zrf0T4TeHbFHudWurnV2RGdlU/Z4f/HSXb/vuu0gu3ufntpIn2/eien/aIXtLpPL+fyG3RfxV7Mzy4R5DzlLWyur/APsHRbCPTbCVGlu1i3bmhjVnbexyzZ27Vr6l0TUWvdI0nUBH811plpc7f+ulujV87fD3ZZ6l/pP753tZfPlf/lq3nKjf+O7K9d+G189z8PrPTXk/4mXhr/iUz/w7o4/+Pd/+BwbP++HrOtuXhjrb93vJ/syeaiP95krjNa+F/h6wvn1vRJPsdw3zyweW0lvK3+3Fkdf7ysrV1vh7VrSaTybn9y/8Na1/b6ZNH88kSP8A3ax55QOnkjM8ck8C32q7LZNc+wf7VpHJu+9/fZ2213Ph7Sf7BsEsH1S+v3VN8s99J50zsfvfPxWvHplokn+s+9Rqb2KSIn2iOH5Gllkm+VbeMLl3f/ZC/NROfORCHIcr408f33gzVtMh0e3sbnULpJZZFu42aNLUNs+XaQdzv/6B/tVn+M/iEnjDw9DbXOjyaVdWt6rM32jzoXxHKPvYDL/rK8n8Vay3iPxJpPiXy5Vt9Ukvfs0L/eSyXyvIXv8ANhPMP+0710W/ZpKb/v3G52raEIe7IxnWlzOJp2iff/ub/vU+dP3FYUd28MCTQyeTuT/vhhxWhpt99vg2XPlQ3H/jvP8AFxWhmfTvwgTzvhvoTf3dPtl/KCMUVD8E5kb4c6XGJYmaGJIXCSg7GRFUqfcYoryanxM9Wn8KPlK0l+x3c0M3mw733r/eRv8A4mtrzfOkSF4/9IV/mZPuuv8AeX/Zrn7lme0O9i22fjJzj7/+A/IVZ8OfNdw7ufk7/wC61eseVApSIln4s2fcSXzV/wC+1U/+hLXW6Lqc2lalDrdt9908i+i+6sqiuW8S/L4hh28fOvT/AHWrc0n/AFzr/Dvbjt92iYQOw1byr+B7/SpPv/eV/l6f3v8AaFY0fiHWbb5PM37P7/zf+PVn6MzKyKrEL5B4B44mdR+SgL9ABWncf8fb1A5zZNH4n1m5kRP3Sf7X+z+NcH8TPFV94jP/AAhXh64+XUX8rUr7/nuo5KJ/0zG3c3977v3auePpJE06ZUdlBTkA4BrnPBKquqaoyqAyae20gcr9PSnyomrVnDYfqX2e58QpbWf/AB5aXBFawf7vzb62p5dkaQ/wI7J/uLWFpKr/AGtN8o+bzc8df9KatOf/AFn/AANq1IgEc0Pl7/4Ef90tSWEv+nvN/AibV/H722qsf+r/AOB0R/8As8n/ALJQM6mzxPAssWzB/v8AX2/TFFY9uS0QLHJ96Kgs/9k=</field>
-      </record>
-
-
-      <record id="base.user_fp" model="res.users">
-          <field name="name">Fabien</field>
-          <field name="login">fp</field>
-          <field name="password">fp</field>
-          <field name="image">/9j/4AAQSkZJRgABAQEAZABkAAD/4gv4SUNDX1BST0ZJTEUAAQEAAAvoAAAAAAIAAABtbnRyUkdCIFhZWiAH2QADABsAFQAkAB9hY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA9tYAAQAAAADTLQAAAAAp+D3er/JVrnhC+uTKgzkNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBkZXNjAAABRAAAAHliWFlaAAABwAAAABRiVFJDAAAB1AAACAxkbWRkAAAJ4AAAAIhnWFlaAAAKaAAAABRnVFJDAAAB1AAACAxsdW1pAAAKfAAAABRtZWFzAAAKkAAAACRia3B0AAAKtAAAABRyWFlaAAAKyAAAABRyVFJDAAAB1AAACAx0ZWNoAAAK3AAAAAx2dWVkAAAK6AAAAId3dHB0AAALcAAAABRjcHJ0AAALhAAAADdjaGFkAAALvAAAACxkZXNjAAAAAAAAAB9zUkdCIElFQzYxOTY2LTItMSBibGFjayBzY2FsZWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAACSgAAAPhAAAts9jdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//2Rlc2MAAAAAAAAALklFQyA2MTk2Ni0yLTEgRGVmYXVsdCBSR0IgQ29sb3VyIFNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAAAABQAAAAAAAAbWVhcwAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACWFlaIAAAAAAAAAMWAAADMwAAAqRYWVogAAAAAAAAb6IAADj1AAADkHNpZyAAAAAAQ1JUIGRlc2MAAAAAAAAALVJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUMgNjE5NjYtMi0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLXRleHQAAAAAQ29weXJpZ2h0IEludGVybmF0aW9uYWwgQ29sb3IgQ29uc29ydGl1bSwgMjAwOQAAc2YzMgAAAAAAAQxEAAAF3///8yYAAAeUAAD9j///+6H///2iAAAD2wAAwHX/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCABaAGQDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDvvH/wU1XVJpp9Fj0S+TflVedo2/8AQCP/AB6vI9Z+DfxD0vfcx+ALn5f47G4hmb8lk3/+O16p8WPh1Lqs76l4ekiS9/59ppPLV/8AclHzRt/47/u14lrfiD4meEJIUutf8ZaXE00kUG/U5pIXkjZkdUYuyNhl+7/wL7tevRnP7Ml8zyMTCHN70X8jG1nSfEOjx79Y0PxBpSf3riwuIf8Ax4ptra0LTk03SZtY1X/j4ZF8iCaRvkhf+OXP8R/hX/gVdP4P+L3xPuNN1K9vfFslxptvD9mT7RaQ+Y1xKrBNrxxqfk/1n/fNcdryPeabZaakcr3FxdM1zd3MnmM8j8szZ/5af3mb5q3p8/2zlfJ8UdfU43xb4p1Ce1dIpI0indt33tzrtx1rn5rvULsJaW8/+q+bb/y0dv72P4quy2TzSTTNH8zOzN+7+4vzf0qPWdMuIZIXf/Wr8jbPvfIzDt/u0TgTTqQLWhpKkHnX3yW8u5F/ebWZuobHB4rv/B+rXCWiWz+VePLu8+L5WXyz/eRj83zVwdrpkqWrvdxyzW6f88rjasufSptNvfsDpbpJvZk+6/zQsx/hGfSrE/5jvNa0yL7J/aWleakSor3NtNuVrf5sbkZvvR/+g1hyXD/I/wDf+9/vVa8L69cabrP2a8+S3uPk2vceZby54+Zj92k8X6S+iT+d9zTbj5YJHk/1TfxRO394fw/3l+b+9UC/vRKUlw/l76ktLvfB/uP/AD5rMRll+eKSOb/ck3fyqOOWGGT5/KT+9+FaGfObD3Cbv9Z/5EorL+3WX8dxbZ/66LRQaH3tAm+/tf8Aruv/AKFXmviHTrS8fUIbm3imt7idknV4/MWVQzffQ/K2P4f/AB3bXqFqn/Eytk/g85f/AEKvPNW/4+7r/rvLuX/gTV5UD25nivjpNB8MWumeG7PzIYIHkup1+aRlluGQ8fxbliWJV3fN/DurJ0K4TWIE022/0Z0ulbb5m5k/eZZtw+83zfM1YXxjlf8A4WhqyeZK6QTKu1P721Dt/BWr1r4DeHrG51pL+aOKbyoPlb+4x/8AHV+9Xd8EeY8uHv1eUJ/AGnaPpP8Ax7/PAm6Xf82/e2yX/wBkqlqXg23sNaheazi/dXXzf3XjPDN/8VXuereG/t6eTD8kTI0Uq/7JX+jVS8Q6Db38E9tcx/61P3v930+8Kw9sdv1Y821b4e2L6b9mSzimif5tqe/5f99V5TrvgCbRLt0tvtMNu33oH2yL+RBr6T0K0vv7Jhs7+T/SLVPK83/nrs4V2/2j/FVLUtG86TZN5T/7VEKxE8NGZ8v6Tol3NrX2Z7OKaJvlZX+WN13fxjkN/vLXuvwdE8XidNP0u8udKa4gaKCVI45Gl2Lv8p0bI+7W34p8F6cnhPUNVhs4/Ngh3XO/5flC/M+3+L+7/e2v/srXkvwwu/EMXxa0m2tJPtk76pG3lvJ+8dVZfNf8IpHZ/wDvpauc+eEjCEPYzj5n0lqfgTRtY/5C/gzwlqkz/enuNMjWRvxXmsx/hN4Og2fZvDFjpUq/9A6/Zd3/AABkZa9I2O8nyfJF/e/ip8cSJ9z7/wDerzuaR6nJE84uPAE3nsth4v8AHOlwrgfZLS6tJI4jgdDJAzHP3uWP3uMDABXfMn+k3H++P/QVop88h8sT468M/tWeKLRbdtf8KaTrUkIj33EU72k0jD+NvvJuP+ytW9G+LX277bNbap9tia9klXT9Ujb7RFDJIx2JKv8Ac3fe3Mv+z91a+aQf8/Wtvw1cJbatazSXEcMSzKszS7tqRvw7NtBbbht3yq1dkIRPPnOTO78fTf2r471O5SOWF72682KL/WbN6r8u6vqP4DeHn0HwJBc38fky3XzbX+9FGP8A2Y1534r8DW9nr3hPUbYf6VeOlrth+75cFigjfkBufLdv/Qq+gf7OR9FTTYZNiRIsSt9KdafuKJOGo+85SM/xD4y0zSrTe9vfOip/yxt9zf8AfNc3aeNNO1KTZbfbod//AD827R/1rjfih4JvhcfufG/je3lZ90s8V/tX/cWJdqxrVHw14ImudTe8sJNXhi/dbYprhpFT+9I0rEs2f7tRCEeU3nOXMeqR6jElZ/8AwkOjWd+iXOqWMMv8KzXCrv8Azp/izSbtPDU1npsn/EwitfN3eXu/u5214ZfeHvFf9pWzw+KNJmfzm+1rcWHnR+Xu4ZFZN27b95f++aIQjMJzlA+j/EVzYaj8NfEF1p1zFcSrplyyqnzb9sbMv/oNfL/gP4g2GhXqfES18OfbVsoPssVh9r8nZcS/KX8zY3SLfjj+OvoD4S2mv217DDq/9mXNhdfPFc28fkttO5TFLFltrf7rba+cPHegpo/g3UE02DyVg1qy06WC3j3fvEhumdu//PJGqqPJ70SK05e7L+tD09P2rbl/+aaRf+FF/wDc9WR+1DeNvz8Pbddvrrcjf+0K+ZIILz+C01H5flbZaSf/ABFa1pb6ikbv/Z+pfc/js5F/pW/1Wkcv1zEf0j9APBtw3iDw1Ya3MI4JL+1humjhBKp5kSOFyRk4DAZ4zjOBnAKj+DZJ+GHhtmO0tpFkcf8AbrFRXkyep7kFeKZ+XoTdDN/31Uke1k2t91vl3LU09u9o+yX+L5aZLaXFtJCk0exZUWWNv70b9Gr1DyPjPuH4TunxC+GHh3X57yVr6yjRZ2MnmTLd26pFNv8A99Y0k/7bvur06C4/d7/ub6+Kf2btQ1628WT2FneXv9jJayX+oWqSN5bbNio5X+9uZPmr7G83946VySgdlKfP7walcWn33+fZ/f8AmqPw9qKald3SQx/JaorN+LMF/wDQaxtWR3k2fvXrJu9PtJrTzv7YlsH+ZPPhvPs+/wDvIvPzU+QXOegfZ/tOtTf63elr8q/98iuLv7fSb+ebztPtklt52iZvL/iDYb5f96uTjh8aXN28MN5KkqOv2a5SSFvNUfxKvP8A6DW5YQypG/nSedL9+WR/vPIeWZqvk5PtBz8/Q7fwn5Vs9t5PleVvX7n3du6vHvFOl3Fh8LYNWmcfaNW8VPdfJJ/D5N0q5avTvD3mzSJCnzu+77lY/wAfdOt7DwNpFhZx7LeDV49qvIzN/qbr5iTWcfi9Rz+H0PF7R38t/wDW/fb/AJaUX7/uH/d0+C3f5/8Af/8AiaL+L9xXccJ9XfCuRG+G/ht1dFDaTZnDdf8Aj3joqn8Kd/8AwrXw0q/w6PZA/X7NHRXjT+Jnqw+FHw1b+BtW1qO9mubP7Bv8v7M95+73sG+ZmUfP93/Zrf0T4TeHbFHudWurnV2RGdlU/Z4f/HSXb/vuu0gu3ufntpIn2/eien/aIXtLpPL+fyG3RfxV7Mzy4R5DzlLWyur/APsHRbCPTbCVGlu1i3bmhjVnbexyzZ27Vr6l0TUWvdI0nUBH811plpc7f+ulujV87fD3ZZ6l/pP753tZfPlf/lq3nKjf+O7K9d+G189z8PrPTXk/4mXhr/iUz/w7o4/+Pd/+BwbP++HrOtuXhjrb93vJ/syeaiP95krjNa+F/h6wvn1vRJPsdw3zyweW0lvK3+3Fkdf7ysrV1vh7VrSaTybn9y/8Na1/b6ZNH88kSP8A3ax55QOnkjM8ck8C32q7LZNc+wf7VpHJu+9/fZ2213Ph7Sf7BsEsH1S+v3VN8s99J50zsfvfPxWvHplokn+s+9Rqb2KSIn2iOH5Gllkm+VbeMLl3f/ZC/NROfORCHIcr408f33gzVtMh0e3sbnULpJZZFu42aNLUNs+XaQdzv/6B/tVn+M/iEnjDw9DbXOjyaVdWt6rM32jzoXxHKPvYDL/rK8n8Vay3iPxJpPiXy5Vt9Ukvfs0L/eSyXyvIXv8ANhPMP+0710W/ZpKb/v3G52raEIe7IxnWlzOJp2iff/ub/vU+dP3FYUd28MCTQyeTuT/vhhxWhpt99vg2XPlQ3H/jvP8AFxWhmfTvwgTzvhvoTf3dPtl/KCMUVD8E5kb4c6XGJYmaGJIXCSg7GRFUqfcYoryanxM9Wn8KPlK0l+x3c0M3mw733r/eRv8A4mtrzfOkSF4/9IV/mZPuuv8AeX/Zrn7lme0O9i22fjJzj7/+A/IVZ8OfNdw7ufk7/wC61eseVApSIln4s2fcSXzV/wC+1U/+hLXW6Lqc2lalDrdt9908i+i+6sqiuW8S/L4hh28fOvT/AHWrc0n/AFzr/Dvbjt92iYQOw1byr+B7/SpPv/eV/l6f3v8AaFY0fiHWbb5PM37P7/zf+PVn6MzKyKrEL5B4B44mdR+SgL9ABWncf8fb1A5zZNH4n1m5kRP3Sf7X+z+NcH8TPFV94jP/AAhXh64+XUX8rUr7/nuo5KJ/0zG3c3977v3auePpJE06ZUdlBTkA4BrnPBKquqaoyqAyae20gcr9PSnyomrVnDYfqX2e58QpbWf/AB5aXBFawf7vzb62p5dkaQ/wI7J/uLWFpKr/AGtN8o+bzc8df9KatOf/AFn/AANq1IgEc0Pl7/4Ef90tSWEv+nvN/AibV/H722qsf+r/AOB0R/8As8n/ALJQM6mzxPAssWzB/v8AX2/TFFY9uS0QLHJ96Kgs/9k=</field>
-      </record>
-
-      <record id="base.user_al" model="res.users">
-          <field name="name">Antony</field>
-          <field name="login">al</field>
-          <field name="password">al</field>
-          <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/wAALCADmAJMBAREA/8QAHQAAAQQDAQEAAAAAAAAAAAAAAAQGBwgBAwUCCf/EAEAQAAEDAwIEAwYEBQIGAQUAAAECAwQABREGIQcSMUETUWEIFCJxgZEyQqGxFSNSwfAkchYzYoLR4Rc0c5Ki8f/aAAgBAQAAPwCEXGmWYiz4YB6nA61iKGRFUhSwkY2yQMUztXW6EorltPkSPzpG6VevoaaZrFFFZAycCsUUUUUV7YDanUpdUUIJwpQGcDzxSl2OwISn25CVOJd5SjzSRsR+1IzRRU0upCmilDyCDnIJ/vXHlSCEBlCEE46qwcbU07+UuOKXIlJKEDZAO6leg9OlNo0UUUUUUUUUUUUUUVIb9mk5Kmprg36EnFc+5Rp0KGVvSEgYwCNyPp2poyXA48pQzjO2fKtVFL7TFZdK5ElQ8Fr8nNhTisHCRgelI3lBbhUEhI8hXiiiiiiisgZ6CsVnBIzisUVN0tKMEkjPkO1N/VEXxbY4TzDKCcY9evyqMjWK3QmUvyW2lr8NClAKWR+EedbnJSUs+Aw0lk/hWtJyVD5+p8qR0UUUUUUUrtiYq5ITKdLST+FXLzAH1Hl0H1rfdYhtt05XY+WichBOyk9xn+9bn7ehcBcy2rLrYf8ABI6LAUAU7dx1Hz/XVGtL8kIU3jw1N+IXB0CckKJ8sEH5gZFZbtyOX4mZSiCRzITlJweoqYQ0hX5Rygbk1xdWyi3a5BaZ5llBAPYf5tUSnrQnJOBvmtqscoQlHxnAwM7f+zUpcFuEsrV8p25XQLYs0E5lLBwSQOYoB88fvXK406Vtem58JdtBQmYhTnh/0pzhJx2yMHFR5RRRRRRWQcHNbnZch5hDDrqltoOUg9qwFJMZSSohQOw7KH+f3pQzcHmreuMhRSSrqBvynqM/MDt9a8i5TUgJS+tIA6Cp3DaAccmaZHEy6hmEqC20nnc2UvskeXzqM63Q0qVISlAWpatkhI3Ksbfriu7pKyO3LUbFvCFqkc+VJB/CR5n51d+PpyPo/gfbrKygtPzjzyP6yt1JUQe+cfDVZPaKtTke6txveBIdjvojOLJH/MUnOB5gYx9Kj2fpibHRcWnY5Eu3rS2tDR5grYlR+w5vvTbNYoooorOKFApUQRgjrR0O9KXobzcJmYUHwncgH1H+f5sSmqxbg5G1YOd+bGOu3/8AahziJOQ/djHbXzBCipZ/6j2+g/emtSu0uOMzm3G1+GQcc22wOxxnvg1Yz2UtItXfVrs5BbdbbaGVr655sHPmScH6GrS8Ureu4rtq2sBEee2AQoAKcIIbT9CM/aqle1Ha5Vq4gQS6SpUgtXAHHY7DoMbBOKdOttMTZet5uotPRR4ztviXARm0/wDObUhTanB/3AfPnqtGqLYuFNcdEZcdpazhtQ/B6fL/ADyrjUUUVkAk4Aya3x1xwhTchtfTKVIxkH1z1Hp+1YlvPSHfeHlcylHHMdyf/PXvWxmXyRlMORmXgTkFaTlPyIIrWt4mOhlLjoQCSpsqyjPYgfX/ADNaasQpfMhQ2HN3zUCX9p5m9TESEkOeMonPcE7GkNe2vxAAbk1d32NrQqBaZbr7CUqRGZeSkHdSllZAI/2kVPOsYrMnSaUrKkvolJknk/rB+EfQEfaoB9q2xLcladvHgNOcqVROflzzq5QpA+pSofWt/CK/L0/q62Wm6crTFwt6o1pnLyfESleWEK27HmbI8ljyrr8dODNm1MF3GG0LZcA2tx5jk5krcxkKAGOYK6HB8j1O9G9TWeVZrq/EksKZKFnCTnpntnqK5VFZTjO9e2uVLiStPOjO4BxkdxXZ1TEgQ3oMu0+KliQwHOV3BwoHBx1BB2OOxyO1cdtC3SrGyUjKj2A869vstNthbcltzJxygEKx59MfrmtFGD5VY4tjlwB1OKYHFLTrshDVzioBW2gh3A3UBuP71GFOvhbpmTqfUzcVtpSozQ8SSsJzyo7/AFNfQD2c7QmLapVxeirabmPczIUN1JSMJP1+Ij05alGVF/iAdZdaACWyeQjopfxb/LGPrUNceoridCe8spUty3zosptJ68iVf+FHP0pv8RuH0k6XEm2JbXYZKhOhOJCvFtcnGFJGN/DVufQjtgYc/BLiMzrW0vWrUSogvEJoNoUk/wD1CU5HNj5/alHHH2ftM6/tjs+LH9xviM8r7fR7/ck7Z9e/6ilGsuC+qdMXURLiz4bLiyhmRjLTihvy8w6Kxvjr6Uy2bBLavnuE1hbfItIcCgRsTj/CNvI0q1VZYlkcSlEgSedSwlII5kpxsT6g1xJD8chBjs+CtOQo8xPON+3bbFeVSueD7qtsK5F8zS/zJGMEeoO3yx6mu6W4cfRQXIjFT0hf8h9BCgkjcpPcHBH/AOPl14ERKVPBS0eIhvC1o3+JIIyNt+lKFWyQt6QIg94aZcUkOJIwoA4yPuPvSbwnF/ERv02Tj+1WUQgAAFINI7nHMmOWUt8yd8+RqHL9pWTHmyXkYEcKUrP9Pf61aj2ZuGVmVZY8uS26UPhDjjK3uUO5A/EBuQfLIHY96tfYIUeOwlTTaQAMJ+H8I7AfSugtKW+ZacJKzlRpt680zH1BpG425xoJcdYUltSTuO4rTw4Ycb0qxb5zQWhLSUr5jkc2ACPvUfcTuDbb17TqLTDr0J8qSp5lgDC1D82DtzYzv379SacvDGDNfgBxep5zilAgxl/CE4OCnlOceXp2pdqvhrpm6l+TNjOvmQjw3ud1SiTn4VJ3+EgntjqaoP7R9gvWguIj9onIWuKUBUV07+M2R15sfLPqKiNch1aita1OKIIJXv1+daaK9+IvkKAohJxkDYHHTNeaV264SYC1KjqThWMpUMg/Tv3+9JCcknGKtElI/pHSsOp5hgkgHqMUyOI9wtlrsjzBcb98dSQhsH4txj7b1KHsy8TrTF8KBebiw0+6lICiQEoA7Dy7Vc+xSY0q2tvRXEONq6KSrNLHEhYwemQftWSAUkEbHbFR/wAEJ7lw0/NQ66tww7g/HUVDGVJWf8+1SBTY1PaG0SW7rFcUxISolS0ucmdjtnyO/WlOmbpEuUIcz63lFahl0Y+JJwoEflUCMFPpt51H/tP8MoPEXhxcY6GG/wCNRAJFuex8SVAY5M/0qxgj5HtVBtBcJ9U61gzX7DFEh+Hgux+blcKd9052P4SMZ61pVwp1sq4e5xrJNeXzlBHgKSpBHUKSRlP7etI9c8O9U6LQhV/t64oUEkZH9QJTv03we/Y00qxRRVopDrUdhx99aUNNJK1LVsEgDc/aow1jxILq1QdOkDOQqS4QB0/KD+5+1Rm485LmeLMfWtbix4jijzH5+tWE0FwHt2o9ORr5p/VkV2cElZiuLAC/kR0PoafmnNS644ZXWJZrkiU1b0PcqyolbZwcZSsDp03HSrTaN1dEvUFhQdCnF4KgTukEbE+e9OgLCiAjfzNR3wSdbb/40icyv9LqeaAVf0khX7lVLdd6j1TFipe0nbYUsBRSoyXCArtkY7DI3/sc1FcSHxe1Ihki/tHxApRjlpbbbSl9U8+DkJAO4J9Kemj+HWtLExzq1VDceWtLjzJYK2lqAKSTnB3TgHp9O72mW268qDlD4RgJCHSkpG2+43rg6d0rbdKNOfwW2qZUVLWApOFbqKyM+QVkjturzp5WeREmR0yGW20ukfzBy4Uk9we9MziLw8t+t4F7tF5j88KY2jwFADmbdSk8q0ntgk/Taqx6w9lnRmkbZLul/wBe+6xUNqKVuNhAScbDqSTkEd+tVIcACyEnIB2PnWKkfTHA7ijqSwxL5Z9Ky34ExHiMO8yU86ckZwTnBxUq3eH7/aZUFRwJDK2if9wIz+tK/Z64cw5fAzVlwVpyzz9Us6gTbULnwUSi03yNcobS4CAVLdxkDJyPKmLJ0TZESXkTbY0Hdgrly2AemwTgD6VH3u8CLeVx7VIusSYlzkbMZwqPNnYJAGfXrTka1DxYi3RenWZl8uS0Ml5UObHK1htKedSileSAEgk4PQZp26O9omXpGVbVwbK5IQhhPv7Mh0AF4KO7RAylJTy9e5PbFTxbPbS4fripVcLBqBh7HxobbbWAfQ84z+lJYPtccPUT5CbHo7Uzrsl/x1oajtErXy4JwHO+BXi6+0tM5FiHwt1Y0hQOPEglIx1+29IrV7TcpopbuGhNUIQkYy1EJP709rV7Vug0p5b3btRWvHVci2rwPny5p4WP2h+EF4WluNrOC0pRACZWY5yf/uctdb/5i4VvpeSrWtnHgq5HOd3HIfXPSo51r7S3DDSFx5oNyN8eKMLagK8T6c34R8s1APEn2v8AX1/8WJpaJE07DVslwJD0gj/cr4QfkPrTQ01we44cWp6LrKt11dakDm/id8fU03y9inn+JSf9iTTG1hoS86Uul5tN4QG7hapHhONpGUOJBIK0K7jYHp0P0rjabs8q+3mPbIfIX31hKQtQSDn1NfVjQD0ax6GsdmkeC09Ct7LC0s/gBSgA436bVT4kDfOKlr2VXmDddYWBSmUOSPc7rGSsn+Y4gqQtWPJJbj5x/WK4PHey2V2+Ku+m0l2LJW4JDiR/LDgPxJHcHmKgRjbGPlAXDSAtjiSp5DaEvGQosqX+ELCvPtUr8UbJK1nck6oYYk2C7JbLMh9l5SPFTjBUCDkZSSD5g/eDY3DyTqPinZND2tK8vNpDz6cq5G+ZSlOY7AJPTzx51O3FH2OoFu0NMvehr5d5lzhsF82+chDhkhIypKC2lJCsZwMKycDbOakX2MrLFi8A7XeoQYKpanzICWgHEuIeWj4ldVAgA79Pl06/F/TkWXBTNB5VupAUAgkE7nO2/ln6U3OFXCPTupbW87N1HcETUFSAzDUlpKRjY/EkqI6Ht9KYNjuXEXQE646TS5fF3pF2Q4ytwh2M4wEkcnIRzHKlJVkZBB7YBPf1yqbNuTdh4h6RtMyVIaSpbngJUnKh0CvxNqGd+VQI86rOrRutpesLzwx0lCn3Bh2c3JMNsDBCUqLK1qOAnCHTkkgb79BU98MfYsmSWW5vEPUfuWSCbfawFrA8lPKHKD6BKh61Zbh7wY4aaCId03pSC3MA2mSQX3wcdlryU57hOBT+WpKEFajsOtVV9vHTtub04zqpmK21PYeaS86lP/PbUVJKVb/FjCdj2+VN72MuG9mRoCVrydb2p1wekqRG8VAWGmm8HmTnooq79dvU1PDFgvN2aTcGpJaQ8MpRvsBt/aqykbZGfrSeZHcLrMqHMlQJsZXiR5UdfK40r9QpJ2ykggjY+jlRxH1jKtIsd00pbdQeIrPvttcEV9Zx+NbS/hUvzwoZpmT0TrNJVcP+DtUQ2nFeIVTrLIbx3JStCVpI+RNYl8VPj8BdpuLrQV093dGAMeaPT9amT2R7N/HL3f8AiHItC4EiW6mFBadQQWWWwFHGRkcyj+lWhQCEgHGcdqg7h1Fa4acTNY8PHf8AT2S+81/05zqSEla8NyYyCSPiSvwylAz8Jz33dkxm2aitv+nktOoT8SRzYKTt8Kh2I327Uk0lY/4atTafDCg58Kx8KvlmpIisoDTZdSFuAZ5lbn6H603NVWyHJXzCEyV9lKSN6h7gnDZHtR8QVtISA1BtxOB0V7uRj7GrHVhSgElR6AZrjT54W/4KVgNhWFEdetRn7QGnn9b6bXZkJbU2t1KlAnpyhWP1I6edOng3pqHpLQdrsMZALQKuoG53Uf8APSnhZo6I9tZaBStIyUH/AKSSU/oRVHhnvQR59KVWRzwLtEWjAUHU4J6ZyMf2q1gDjtsjDmACm0A8pwMkdv0rc86+iMpa5C0gJ+IZ6Drn9KT8Im1OW6ZcHUqC5UlbiSoblOcJP2SKekx9EaOp1eSAOg6n0pua00tpTiFZP4TqC2RLpFCgtIdHxNnupChhSFY7gg0xHuAkGMla9P671db3SMITKkonNIG22HUFeNh0WOlcdfBribFfDsHiqw+QSR49ueRj0wmQRj6V07ZpTj3bOVLOttLykJBx7xHex18sE/rSy66N4zX0tibxE07ZUpBClWuxrcWR83XcfpTl4T8MrFw7jz12+TPuVzubiXbhcp7ocfkKAwASAAlI3wkDbPenxXKu88tp5GSCBhRIPVO//gfem/GU0iUFKAUHBsc75FbZsYh5wNpzzYyT50osoUmJGjKJCmwU5BzglJH96UNaRtSGwlTk1wjbmVJVk/baqZUHpWFg8ux36g+R7frVleHF6RdNKwnHHkrUE8i8HoR2/aurqha5UaFaWif9YpSnlg4w2nBUPqVJHyJp7WSMiLAbaSjkwBtj0pW+lKm1cwBwD1qO4Ei5QZ8hxptSW0uZ5D6/2p7WC5oucRbgHKttZbWn1FdGiiig0zL46Pf3FAFr8nKD+tabQj+ctZUSAOYZ3wNv/YpbzKLzuMp5+XI9ANv3rbp50GeErI/Nue5pzZqidFZHr0qROC10THui7a6sht5BU2nO3ONyfrnFTJLnMQ5sOfKOGmVEOkA5CFY3x5ApTT4g3KHMa8Rl0FOM5Nc24X9lCloaQtxLZw4UDm/bpSS43G3tW5UtMN5Pj7hRaIzjpuaUaGhuMW96U6hTZlueIlB7Jxt/enDRRWFEJSVHoBmtMp0tILnMkISkk57+VM64h2ZIccTlCs7gdzWWkuxm1OED+YAceWN/tWX3QhhS15Odsn071AHtSa4n2DTkKFBluRm5UxkreZcUhwISsKO43GwH3qpquKfEkrUoa81KnJJwLm9gZ/7qnoVnqcCgDJxSqz3WNZLzBuT6jlt0BI8ycjH6g/Spi1VfuWzFUZclx19P8lJb5idgQcd85xSrhz7y7DDT9zmRVqJCgEpUlJ/pwc+fY7VJelkx7IHYDssyH3F8+Qk5UT5+Xau057rIlhEk7pSSloq+HbGTjucmugMY26VmiivKjhafixkEAeZpHIYdkuhKyQ0Acgdz0rQ5ARyyQCASObIHQ4/9Vyng2hS0JQojmGBnqMdPvTW1LdEtMOsMrPMTygBOQBt+u+1VA9rK5uyfdmln4Q78IzkAb9PtVeqtZyHbHlmsp2CgADnvQoYOP8NcjUbLz0aOIxHjJfQUbZ3JwP3qX9Gqiv215VwZdhz3ORrmW4cFPXIHfOf08zUkWPTL7UdDUENrab5lBOwJBJJyfr+1ehAv72r0T2W3WWUsg8mAckEnHp0rroRqCYOeXGdQ+pKQtQHUFQUpP6AZ9KURp94gw4q5jLjbDbobWlIJUc5IPqN8H6UtvGq0RlrDTLyuQFSQEZ58YyPMd/18qU6f1MxcZJjuBTS1kFoKGCQRkenypx0EA9RWEjlAA6UnmPIjNLWSnmIzvTeuam23HHUkcpJO4/N8/rUQ328i6XSQyyUNIQg/EobEevke1VD9pG8JuGrm4jTnMiOk5wMJJPcfb9aiurWhSubOa5l8vlqssfxrlNbYBGyScqV8kjc/Sol1hxLudwkLYsylQYg2C8DxV+pPb6femi3fLuiU1JNylrcaWHE87ylDIORsTV8tK6ntHEHhdb5TsRLyVRyog/8AMYcGyiCNxvtselcvSEjW0eW43ClOvxAtKGA6vCypSsJAV36Hr5U+0an1Lb5KEz2pCXyj8CEjfcdCNj1rtWrWWpJmFRbbMX8S0AOtgAlPU7/In6GnCLvf34SfebK04Fcqh8Q8sg4+eK2uRrxLQZyrewxyfE2y4oFSsnJHTboK5NrtrsiUu3uNOoa5McyF5KSADkb/AA4JOPlT6LpStlGcHGVJJ3/zfP0pQkgpBB2NYX2xnOegNcy5S0NNuqeUhxGU+GAOnzqIOImpXZxRbIil+M6o48M4OMDJV5DHeo+1NIdsulHDIKPeH1fhB+I7DYb/AC+5qoHENTx1C547hcUoc+Sc9T0+Qxj6U26sLxB1azpe2pKQHp74IjtE7Jx+dXoPLv8Ac1Al0uEy5zXJs99b77h+JSv2HkPSktFTL7M+t3LFeXbIt0NtyyVNqV06YWn6gDf0PnVxNIOYAchlDpb/AJgbQrKk/iz9tvWnsm4olTGXpEcLLasdBjA9P+0V14rinXkpYQUNlSlpSE9VKyVfua7sdvkRjAB+e+PWthGRiuLd3G7fPjPtONpceWGvDOwOc4/WtlrfacdWt5YMgKOT1G/TH0wPpSwyit5DbPKQRkknoKR3S4tRBkrBe5TkDr0OKjrVV+kvRU+G94SHhkkkZWT0A8/X6Uw0Oe7yXZa0OuuuuBvwyMkgq2SkDsRnp2pqcRrTcCJMq5OIakkKPhY+CMgHqe3QffaqhaxuKLnqOXJZz4AXyNb/AJU7A/Xr9a49LLtc592mGXcZTkl8jHOs9vIeQpHRRW+BJehTGpcdZQ60sKSodiKvvwPLmp9FQrkiU634zYCnGVcpOd8EfMmpOg2W5w49sjMPPKAUPHUeruMZ6eeD96flqjOtt87rylZGAnGAMV0K0SXw1sQoFQPKcZGaZWqQ6bmyh9/xWEJUV+iglOCB8lfcV4t0+RAIQgg+ICG8nJwMnf1wKXfxLwWlOc5LnLylHNjcbnOfr9BUf6s1ShqNKejvASClPL8OV5P5Rv5K233J7U3NJ2O96lmMuR43N4DfguOqPIyx3yTjrg42327dalqzaUgWrldgAyJoRyKnOkhCE+SBnby2yfWqo+2TxEgW9D2gNPv+NKcXzXOSPxY7IPlsenYeu9VPNFFFFFZq2vsS68iM2qTpSY+pKkKK20kbYPXB8/8AxVv7aHnWXEeMk8gRuDlSQSckfQGu3DmxpTa1sOBSUHCj9M1skPtMMqedWENpGSo9BSVyfHMR2RzAtMqIWoHpj9+tRJrbW9ot1zZZTOQ2t54ZWpPM2EZ5SsjOwI648jUZW3jExDkXCK66tTaXlKZWocx5NiR26gnb1xWtq86o1fcy1AMt9pxakseCk86kncKVgYzuR9qmDQvDFxCVS9SpLjviFSWfE6gj8yhvttgJx8+1SUxb4sVktnw0R0n4GUpCG0DsMDr9arT7UftHwNLsSNK6PkNyr2FFt5aRluHtg8xGxWD+Xt37ZopcJkqfNemzX3JEl9ZW64s5UtR6kmtFFFFFFFd3Q2pp+kdRxr1biPFZO6T0UO4NW+4Ke0fp5+AqJeluQ5Ia/mFY5knJPNg+ucjy6VIFr4v6ajBh5N3jiLKTkgLThIPKOnXO/wBK9Xvj7pO1QGi1cW5o5DhCDk42ASR8iTvUY6h413XUNuesOl7bIfbdAacdaCwVHuE7fIDrtn68ax8FeK2povx2x2ApzmSZV0k+GEgqJADe6sd/w9zUw8NfZmsVlkfxHVtyXfZyslSEjw2snrnuofapxslltNkje7Wm3xobXQpaQBn5nqaxqK+WfTloeu99ucS2wGBlyRJdCEJ9MnqT2A3PaqTe0h7VkjUTbmnOGi5Vvt24euygW33wRjDSerY6/Efi8gnG9UlKUpRUolSicknqTWKKKKKKKKKenBWZHh8Rbb72yl6M8otOoUMhST2x36dK+gsPRGjbhATjS1pdbcayMxG84OM4OM52G/pXCHBfQcm9tSY9hiMqa5VFnH8p05/MPLbGKmDS8GDaLaiJCszNtRgEpjsBKVHpn4R+9dsEEZ/fatM+ZEgQ3ps+UxEispK3XnnAhDaR3Uo7AepqtfGL2vtH6bMi2aGi/wDE9ySFJEoqKITS9wDzfidAO/w4BHRdUt4k8RNX8RLyq6arvL81fMS0xzFLDA8m0dE/Pqe5NNSiiiiiiiiiildpnv2y4MzYxHiNKCgFDIPoavHwO4/6DudkjQrvfGbBcWkJQtu4HkbVgDJDh+Hz6kH0qTXuL3CuNID0zXenD8JAUzPbcCuh/IT9jXB1L7VPB7TsUpiXm4X55HwhiBFKv/3c5EY+RNQzr72177KCo+idKxLaggj3q4uF9zfoQhPKlJHqViq56/4ja416+l3V2prhdQhZW2y4vlZbUe6Wk4Qk/ICmqaxRRRRRRRRRRRRWRRRWKKKKKKKKKKKKKKKKKKKKKKKKKKKK/9k=</field>
-      </record>
-
-      <record id="base.user_mit" model="res.users">
-          <field name="name">Minh</field>
-          <field name="login">mit</field>
-          <field name="password">mit</field>
-          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2ODApLCBxdWFsaXR5ID0gNzUK/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAoACgAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A77avUmnBY+c8+5oZVVsbweeueKNsanLSrj65/lWhAp2YxtHtRvGRxj6UI8B3jDsT93CnikfbjKBsHpuGKYhDNjI5pPNBwTmk+XAGVyfU4wKaQo5DK2OwB/nQA7zlBJAxUbzEDcT8o7mnKJDglFAJ7jFcP478ZRaPaz6ZBCXu5oirMThY1YHn3OM0hWOw+3QyRxSRMsiSnajJggnnv+FY3iG+WS0NnDLG1y7j5G6EDkj615H4dvZQ1jbXF1MtnFcboI88K5HUenPPpXcReXNFJ+9y8Fw43IeRzkH8Qf0p3A0rJizBZIHib03BgfxFcr4ouI5dZRVUZhQrnvnPNb9xqiW1m8odGl+7kevqa4HU7mV9QQwsHJUluepz60iytrCmS2RiBlXFR2bDkN6VLNILq0aMhkdTkhh6VAPlm46E8fWmDJLvzsRSI5xEflU9uc0698Vard6haXdw6ma0bfF5a7QO5HHb/GrKQPdBYowTI52qPU1j3cMlpeTQTY3xuU+XnkEioktR20PoPTb+LVLCG7t5UdZEViFbO0kZIPvVtVYtgDJPGK4DwDdtbyW8LDEd9ab1x0MkR2k/UrtNd8ZOOrD8atbGfkBjbuKAppyTYA2kZXsBSGck8g0wJDDI4yCoz2dqlSGSMF/OCj/ZHWgMgfdjJ9cf40bWc/NMqr6Z/pUhoO+bKsbhY1IxknJ/Hk0ixRu2d8sh/wBletKirFki5UfRc0b1bg3MuPYUegxfsqLHuEMjP6MKRonC5KrGo65f9MCms0CfdVn93Y1EZYieYxj2oAcrF258pQOhY5x+deQ/FXVtLnvoYIUWS/iUCWZMbdvZeOtd9431U6Z4VupLeApM42LKpJZc/wAVfO80jSOWdixPc0myooRrqZlUF2wowoz0pY7u4iOUldfdWIpkYDv8wJrWttBudQfbbrg4zg+lQ5WLUHLYhttUukBBkZlP3gT1rV0uWKZpmZsMzZAzVWXwxqdvIE8gsT6dKgNncWN4kc8TRN1B9aIzTYSpzjq0aOqQTLbtIkzkZGQcdPrVTeYU/eBzkZ5FbM8ZmsnQg8pS6eVlsYyQDgYOa0ZJh/2nJt2xl0bs6kgitbQ9C1DxNO95/ro4Zo4p/mAkfd/dz1PB/OnTWhbUY5VQbeAeOnrXaeCbiK016fTTiOK+h81MDpKhyCPfBP5UmhSZq6haRaTa6TeWpRYLG9TbtXaRDIPLIPfOTz7iusCbjyQD71W1vRpdQ0O8s0KmadSVkYYAbII/DIq9DbzrbxCdVEu0BsHILY7U0QyHbjjApmDkjnFXTCYz84Gcd6hdMnn9KoQKjnopb/gNIxZSQQFx2xT/AN5nBkYj03YqVGiVkZow20fMC33j60hlUuegJz6VIrRjGVMhIz97FSEK0u9FCD0HOKsieJSVy5TGBljQNFQJySYicdjnipPtnljCwQr9VzTljBctMpWPGASMc/4UgaIfLuXaf7opBY4z4pXM8/guUliFWZAQowME4/wrwEozMa+mfGdnDqfg7U7URgOIC6HHJZeR/Kvnz+xbsQGdVQqq5cZwVH+cVMmjSEXJaEOlWguLyKNuAW5NetaPp1vB+8Tkng/SuE8MxWsNyZZnjLqPl5yBXSXPiKPTn2BkYlQ4/iGD6kHg1zVE5StE66NoR5pHUXUUYYbR1rk/FVmr2cdxt+eGVeg7E4P+NXtP8QjUVfeUVlXdj2rMv9XM87W7MhToyqv9amNOSlY6alWHs73KA5XFUtLfyzNAT9xiRXWR6PafZBOXl2lN3zcdvSseXSftGpQxm3kgSJCZXwcsxHH9K6nUR5dr7DoY3lOEVmJ9Bmtm30vUVj+028RjvbUefbEnBLD+HHowyK1dLTbbopChgMNgYyR3rQaY2bC4ETP5ZDFE6ms/bNu1g5dDp/D+qw+I9Htr+CLBlX5kJyQw6r+B4q5NFGjlCD/tZHf0rjPDDX9n4x1fTmR7bTLpDf26H72SVDHHbJJ4rsmZEchZG3f7bdK2M0iVBbLGVZVHIIY9T/8AWpryQswSOEEngMvf86q7jICAQf8AdFRfaJEk5cooH5U7BewcMTtxj3pFA34z+NIOhO4A+mKBn1FMTJQqK33SwHcnFTRTx8sUAbsV4qrj3pB/vUDRLLK8x/euSB0zVW81ew0mF5rqYRrGu4tjcQPoKq3l+6B4bNRJMv32zwn59TXN3elzXkE0VyS3mjDMeefX8KmUkikmU/FWu+ILkRjTiBYzod5WMFyD2yfaufjeLU9HSNBIbmFsNGHC4HOePyrc0+XyLp9Hvh5bKA0LseDj0NM8R+HfOgkvbTdFqEIydnHmj0+uOlYzfMdeHqeyb0vc5bT7eGIP8qsCckMM1efw9aakjMly0BPUAZB/wrGtJ3Pyk4OcEHrXSadE8kLsjAsuMAmsHJpnZBQktUTafbWGknyBIqSsNjySDBcfyxUEegWTXwlEpYFvujGCCfWtePynti93ctEV/gNsWz9CDzVnSNNaa6ErnKLyOMden40KTvdCqKCha2hoWOnfbb6NX2raod8oI6gdB+J/Sk8X6czPHqts7B1wkxA6jscfpVw6taaSGFwUWEnmUsAB7e9bO2G4g5Cywyrj1DAj/wCvXVCK5TypNpnB6ZdlpWVyOcMCvTHT8OR+tdFgSxZHUVz91ZvperLESI2UHZNt3LInYMPbpmt+1k82NSyYJ67DkE1zzTTKRa0a0dtQfWLuXzLt7dbYxk/KqqTyPrwa2sgk4VeetUNL8sGVN4Vs5UH0q5ja3XI/KuqnK6uZNO5IJXTIREBPemMkbt+8J24PpyaBtHr19aC2ScZwParuIQDHVRnNOkbcBhQmB270zkgkMpAOOvNLk5O4HpQMAc8k/pWTrWqLYp5Ubfv3HbkqPWtKeVbW3eebKxKpYt7VxLeZqV9NclSvmHPvjsPypSdkNK7JbVJp45ZIyVVOTjktzWlBHMsYYMJF74NVrKT7PIFRGIJ7VryQNCheEbj1KAY3CsJSNUjE1nS01a3KcJcRndFJjHPofY1zZ1PU7YG1uM/JgFX+8pByMGvQB5c8auvQ9D3+lZut2Pn2wmSNHkhHzRuMiVO445BHY1N7Fo4i+0hNVYXOnbIrxvvxE7Vf3HvUFjfSabcm3vonhkAwyuMZHr9K1SbUndaF43HIyCSD7irQ1Xz40hv9NklB4DeXvU/4VMopmsKjiRrPaTlBHcM2eig5rS1DWYND0ld3JPO0cFj6fT3rG1K50/w/bC5tbCOOaXKqDn8fpXEXl7d6pc+bcM0jfwqo6D0A9KqnS6k1sRzKx0Njp2oeLr5rq4dktN2Ax+6PZR0rufD0U1nepZaVJJPp0eRciRtyo3YIeu7PUDiua8I+HtWe3bz7mS1sZuGRfvMPb+79a7VPM0+NYLFdgQBcDsKu7UvIwtzK7L2raYmqWw58u4jH7pyOh9D7Vz1k7QyFCWilBw6EcZrehvb1Yz9oWMj/AGeGNU9WsfNP9pWh3Mq4ljH8aj+opzSmtCVeOjLMfI3jCv6gVetLoFsSBS44K46j2zWPY3IliVlbIIyPpVh8giRchhyDWEJODLaTNvzdrghAoHbNNfBJPAzjp2qCCUXEQfkHv9akBAHfNdid1dGJ5PLHLbSmNwyOvBGMGmi6uVPyzOR2+Y13N94YmvwBNqbybT8vmIP5isxvBE+75LxAO2VP+NdEakdpGDg+hjQXs8iLHPdTNHxiJpCRxyK6G3MUMalz8zDIUHmsbUvD8ulNBI86yrKxTKqRg9RSo+7gHPzbR/Wuao+Z6HTT91HRK6uRtUH2x0q7HOyKEK/L096o6ZZkwEyEjIwMelXPsm0grdzhR/CxBH61hKxsncUlIy8qcAnLL6e9R+fuMm0/cAYfiaSUNuGz5kHfp/kVWsUV31ACQsDMoGRgqoCnH4c0mhmj9nhdt7xqJMZDDgn8RTJLVJQUcuSeATyR+NTO2E3cDAz9KhdmC70kB75U84pINjzCPR9S8Q3t1G5LrYfugzttDncRnOD6E10Nn4HSKFi8uGIx+5JGD9Tyf0+lanhGNotLmjlw0y3MiufXB4/TFbyja208r2PpVOT2JSV7lezaa30+NbllaVflZh0bHQ/yqRZUiiUucyPyT6morzOYSoBXJZsnFZdnd/2gXkRsxtIQhHZeg/kT+IqRm2twqLvlYKD0zRHOI2EkZDK3UetQPJFEVTAkmI+UHmp0lWMfvDuYjt/nimtHdA0mZuoWw09hd2inyGb94mfuH1+lWre6WaIcmpJGgmglhJ2pKpVgawbR5rG48iYEY6Hs3uDRNX1RK0OitpliuMZ+Rzj6GtMMAK5wyAg4PX1NbOn3SXEIK4Lp8r89DVUZdGTUj1NAxyHB2Dn0pgQg42nNPWc7dnykDnkc0skjPtJRsjjIroM7XOU8b3kdtp1tETiV5gyqR6A8/mRXL6FJ9t1WKEsAhBbk9hya1viXA7WtldiXEkbFPLbuDzkfl+tcVpN2TcRTLwwOCCe9S9ho9XaWNFCxLuxwOwFEStISXcknjA4x9BWRpt08smwnI25z6VqW9wot3mxlWfYgHfFc+xve5I1sFO5rhwPTAqq8qQSErITk8qQCTj3qaNZGJeQ5Zu3YCgRxM5Ujn2oABcechJTaOwJqIQ7CXgIVCfmjPTPt3FPmjCsqqxLkZVAO2cZpjR3GWCkqre3NFuwrsjsdkOp30IGN+ybHuQQf/Qats5yozxmoIrbZceaSd23YWPUjrj86SeaOKIPJIiAN1dgo/Wkxoqa3eG10y7k43CLao/2jwP1NccNYk0TzooJBlbZcBuQGLcHHsBW14mDX628Fq8chkfAKyDDHqBnpzj8689vVvbrUWtVhnlvGwohSMluB6f561UUDasejeHNTGoWokkl33GcMe9bivG9w8O/dMqh2jU8qD0z6Zry3Q31XQdaeKWGNbhY932SaUIW449s85xwauN4niu1ntZpbrSLySQGa6UE7yBjDL1X8OlNrsSpHpXmQI2wqGI6gdqrahbC4hHkEiRDuCnv7A1wdrq2v+HWS4vYmvdLdx/pC/vEYequOn0Neh2mqWd4QkFwhcqGMR+VwD04PNLbcFqecav4m1KCX7KsT2wwd24Yf/wCt+FdN4M1T+zYreC7uIZItRk3Q7W3MrdDu9OgFQ+ObKBUs7xogZDJsdx1KDnB/z0qDQDHd6g9xbW6wsybI1SPLM3ryMKPcVpFK10ZTvex6ftXgqSCDmh3J58zJz0rZXSY0jU/eI7Z4NZ+rQ2unafcahMpiihUsxLDH0A96vmCzPI/iJqrS6w1ouXW3jC+25huP8xXEWUzW05LYAYjp2Na3iTUjrepy3RjWENg7F9uMn3xWHtPXdQwR6Bo2qkFwSSzrtzXR6TKz2xJOQrEL7V5TZan9lfDnHoa6Sw8STQjAb5GOQKyavsaRfc9CEpRT69qRG2sOfnbkn0rnrXxAJtokXB9a1I7nzG3dazaaLUrmgjFrmSY8AgIo9h/9cmrK/MKopM204jP1pRc+WCWBA9e1Ayy5JB3oVAwPY15v8TEXdp7oMr86n68dq9Akuw2wYYqe4GAa86+Jl4HNhbjadu5iRz6Afypx3E2cW8d1BChIkiicAr1ANMtr29gmeSC6mjmkG1mVzuYehP5Vq3+r2t7olva/ZvKmgJw4/izgAewGM/jWArEjOK2Zl0uddZ2uk6rCbLVZJtP1lW4uJSWWYHoGz0/D/wCtVfUtMvNImFrrlrIUZtqXUXJ+oPRh7GtLwnFpurWh0rXbhkMpzZTSPhcdCit/Cc8+nPStnUdO8SeELF4ZY01fQuN0U652Lz+I+oyPpUXs7AjmkttU0WwW/wBNv1n02ZxGXjOVzn7rxnoeKdr/AIkvp/EaXEjRCazbyo3jQKcA8g+vORWZE1k+ry3VtHKljF++2SsCwx0XI6/NgA+lR6ZYza9rMdokgWSZizSNzjgmqS7jses2gj8a+HLR9/lBpNzZwSpGQetdJonh/TdMU+W2JMY3udze/wBPwrL8PaJdaZpX2W4ugxVj5TwJtO3HQg575rQOlrMxWW4uHUjBXfgEfhTSsiG0yqvxH1FSQ1nbH0GTXG+O/GV/riw27oqQL83ko3Bb1Pr7ZqSdLCWN3tfOiVB8rSMfn+nWuVvtAlklnuBcypOSG8uQdQeRyOh+tdUqWnurX/M5o4iPNaT0MiWaZE3Mqj2HNUTPO/PAB9qfOJoJjHODvU4IJpnmqRzjPYVztWdmdKd1dFSd33bWYmpIJ7hEBjlPsCelQTK4O4g81JG37k+opK1xtmlbeINQtmwdrY7NXQWfjqaKMLLZ89ij/wBDXHsQX3dcsBT93IH40+RPcXMzv08biS2P+k3FrL2xErj8QTVSL4iXkE5WeJZ4zwWi+Un361x0bg5JHXoKcRnsAKapRBzZ1GoePbgXavpVu0MG3DpKd28+/pWDrmr3GtrFqEyIgjxDtQn0znn/ADxVJl+X5cZ9+9RLA0qyKSFIBfGeOP8A61JwS2BSbK7zF+OgpvnP0zxTAOv5UnQ9Kgsvx6gUgMOWMZbcYzyufUDsa2LTxnrGmQG2s9UuTblceVLiRfphs8VzSJufHSr0cSKAAAT700rkt2Bbme4Vo8hVZ974GMn/ACauwXdzaxPFBO8SOQWCHGSPcc1AoWMcAZoB5LHr2FaqK6kuTPWfBXjhdRWPTNSfF2PljlJ/1nsf9r+dd3uI4r5sRmWQOpIZSCpB5B9a9s8AeKotf057TUELahbDJcNgyp/ex6+tNx6onyOeurOxhVzAzyQKOFMn3mz2x68/lVGQalaRzwpuitwFdw+OATx/n0riF1e98oRm7l2DohbIFLcane3mWluXkJxnnHTgVr9ZXLyNXXnr/kc7wvvc19fLQ2NX8Pzs81w93awjB5llA3sMcD0JBBrjmjk3cg1bydxPf1NPB4ya5pylKV2dUI8q5dytHKR8sgOD3NSGNfvIRyKlyPTIpMoD93H0qUyiFuFUcdaX70h9BUjRgn1FRO4Ube9Vcmw9DuYL0FTnB4xVaIgAmrCgEbia0RLF46cGnW8Ya5EeOJfkw3qabgsf7opJJGiKyIfnRgQabEtynPavDJhvwxTHj2qCM8danlkkmcu2Dli3HvyaRuh9KysmattFYHnI5qzG5GOetaXhnwvf+KdU+w2AUMFLvI/3VHufeqNzZz2F89rcxGOaN9rK3UULQT1JCcYA6nrSswAIHU1C77WYj1xUZYsRzVOViVG5bGQox1q3pmpXej6lDfWj7J4jlT2Psfas/cUwAcmpI3BJ8xscZHGapTT0YONj/9k=</field>
-      </record>
-
-      <record id="base.user_niv" model="res.users">
-          <field name="name">Nicolas</field>
-          <field name="login">niv</field>
-          <field name="password">niv</field>
-          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gODUK/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxERExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgA4wDIAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A+YLpJGifLBtpwSDkH6VnNGpcDOD6V0AtlkjRYwWKgKcjrWLPDJDNlkYDPUjrXPFmvLZ3JGTbgD0rQ0dsq6Hsc1TMbyKGRSRVjTVMdx8xABGOTWMk2rHp0akVJWJtVRDbrvHAkXv71V1Kyiig3xAqQRnk07UbhLmNoVU4DZyDnpUEt1JJaiAuDgYJxyRRTjKyFXq05SaZQZfkLAnNRMPm65q8IJPKD7G2NkKxXAOOuKqEcDjBHBrqTvsefytbkYRc8Uo44x+VOx6CrMFnIzAyIUTPPrRcEiBf9W/4UzPPStGa1iDuIchOPvH0qWDTZJXKInzKu7GDkipckUkZYUnn1oVGZgFGTWxHYuTtUKWzgKOT+lPhtQBhjtUnG7Hek5FoxGUgkEVFJgcAc11i6EJ418mUGNs4d12gn/Prim3fgjVAC0GyVhnKqwPfBwe+KIzjcU07aHIGgdKt6jYXVhcNb3MZjkHUVUwc1te+xy2a3A0DpSnpSdKRQlBpcUUCsFIvFL0HQUAE9jQMRThqKCCvJ/Siiwr2Op/tBIuUUmoZriW5ZR5JYdwBmtN20u0ODChb/aOaY2uQxqNsYCE9dnFcCqPoj1nSivikZjXEMPylJMgdMYxTneU2S3a2/wC5Z/LD5/ixmte4FvqUG4qoyOCKz47jy9Lu9NcD76unsRnP86bm101Lp4eDbu+mhjysN+MHd0PPelhUuwGcDuSabNBIuZSGwW4wOuaYgkjlUuCARuA9RXXe60PLacZ6nsvxE0KLR/hT4RhDq7tH9oJ24IMo3Efhx+VeSTRb5WQDmu38YeK5/EOlaJZMjpFYWSRHd/EwGC30wB+tZ3hLTra91tDcgtFGu58H3rzsthVo0W627bf4noY6UKlRKn0SIPDPhWa7KTXSssZIwqjLf4fnXSW2g2caPI93axquCqyYdm56YBrpL+W3jt1iSMQwMuB/ESAOP8k1iNp9vdQrDYu4ZWzudQAPrVyrORCo2KuoWWnBl8lWW4VxtbyFRSMeh4HPFV9U0+YRhfs9tNklhNGPLcdM5A4AH079615tB1CMhZQssYx80fzY9xWvY+Hbt4mbfvwnyFgTuHceoI9vWkqttx+yOP0y1uLGWLV9sTAFlBY5+Yrjp6jOfwpmhaE93qUSi3aRFUyOD02LySfyr0vw/oNquj6lZ3iKglVSjHqjrkqR+ZqW08NmCOe3uL1o7drQKJ0XAfDAsox144pe2KVE5u7ubC9uIbPTWS18hQmYgEjTAwzE8s7HnHSrmmRKhKWssIhVsPOYW3yE4+XJOKdYab9muXgtrNYzMvM0p2HYeMD09z1roYY9CtNMtYpZhOI5T58pGFJ7KvP1zWbqLoN0mjg/Emm6ZdQSW1/LK7gHyjLwU9MHOe/cV5Vr2mf2de+WrmSNhlGIwcH2r6E1vSbC+nW8sGNvuJVI1RcEdyc9Rz1rzf4j6IsGnSujJL5T7hICBxnHTt9K6aFazsYVqV1c8wI4pp64qcpjHeomJ78etdyOHZDcH6UDBOM5oGD0PWnWzRJdI0sZlRWBZA23cPTPah6E3uxpJGMCnRyld29QwYcZ7fSrOrz21zfNNZ2UdjAcbYUdnxx6sSTVVkZcMTtzzzQtRyVnZMTJcgY4xjAopuSP8aKr0IOxvY8xyEpyy5BIrKBaS2UYyAABXSSqZFCOTtXoM0yO1gjGAgXFeWpdz3qlJt6FPQ4mhtCXyAWJA9BVG/KteSFT1Nb89vPPEY7YoGCknPpWFdW8trOEuI+TyMHg++atSTZMocsUkO86MadsJUHzMbfUVWhfy7pJSgcDjkdqJlZZMDaoAA6d8DNTW1jdXCb1+72JOM4rWNlHU5Zqc5qy2LN9P5sCSxDbgEENxXWfBvE9xfebgpgbvlBOPQE9K4G7jMYZHX5weua7/wCDKh1v4TIVJAbHqBUzXLTY781TXc7mazK6Wz2aRSkngKq5Oe3qT9KzNP8ADl3eT77narKcY3f0FdloUOLYL5KYIwWC43GvRPA+gRlleSGMBeT8oOa86U3sd0NDl/CPgp4bRyw37lwMHgVdvNE1JoGtILTHz7sjqD6g17NaW0CAKqL9AK0YILZSCIUz64qbNl2tqzxD/hFfEdxp2ya0ilYHIkC4fr0PrWtoPg++nsxbXls0ZhfcoIyPfFe220SfKNi/lUl1Ei4IQZ+lP2d9zL26TtY8dv8A4ZWs7tdSyNK7cgYx9K5nW/hhbbVZGZCvQAZFe7XI9qwdZQNGcAUcqRrzNo8FudDl0WbLQpImzG8sR+dcP8SrCW98M3KQrbIx2sXZwqnBz948V7vrlvFcwTwuASBkGvn34uxHTvD1zFDMdsrBcZPHPP6VrQ+NWOat8LbPFbmAwNsZ0Y4z8pyPzqjIpyT71aBJyCxPHFQz8Hj0r25OPN7ux5PLpqQFHxkCmgc1LuKg8ZqIkk5PWhamckktB6cnjBxViOwupIzM0TrGMZZhxz0qC2dUmBfGK6dbj7VoYjjfasSKHUj7xBwCPwxWFWbjsdGHpxqfEc3JA8Jw6Yz3orWnjUoM42YwaKuMtAnRs9DormQxxs+Mt2FYF7qF4C/zBdrbTiuiu03Qvx1HFczfKN8u7o2D+OBXHRXMz0cW5RehY07Vri2uEEr70bjNb+rwrNp/mgD5PnX6d647BII646V17Zj0AeZnf5GCD9OKqrTSd0Rh6jaakYN4G+0kFSDtH51JbX81tEI02YznkZNNnYO0TZJO3afyq5oixtduGRSduVyM45ouuXUaT9pZMy7ljIWcvuPtXZfBqQx+ImjOMPH3PvWB4iiiSRZFChj2HcVq/CaZYvGVqXICkNnI9qG1Ok7Gc4uFWzZ9GaVZRRruyc/e+mfSvRPB00RtwEjIGOM15rNqRjWSJhggAA4ruvBJkFqsjbgD0z3ryJSsz0oQujurRieelaEUyhgDWba7fKAzljWjbwM2CRVQbZq0ktTWtbhVx/KrMswkHUCqdrbbzhjirDWLKeH4rpSdjzZqCkZt6eTiuc1mRwhwOldbeQJGv3sk1gav9kjiZrieONe5ZsVnKB105xcTgdYwYWkU8kFa+e/jApk8PXxlKq8M6jGeT717R408SaRp0pijuhIrd0ORXjPxJ0278Rx3D6SqzHyPOfDYyqtzVYe6nZmddc0NDw1xzgA+lROmARk/jVp05I6HPPtUOCCQQa9pHiO5WIY9CB/WmMAR0wassdsRwOp5OaiIHU/4VSZDK+Dmr2lXps5WDH91IhRwPQ96qOMnpTQMUpxUlZhGbg7o1/OilhKCUc9/SiscdaKj2dti3XctWekuu/jOe1ZU+iSzSttkRVPrV7E0gB83ZnnCrzWZrglt44ZPtE5jdirfN3GD2+tebSlrY97E07w52ixb6TY2R3XVyrEDOCQBUeq6hFPtt7di0efmbsaxDPB2Qk+uKako3DaOBiuqzerPO50tEXnHyZHVSD+taFlYvOBIJvLzx8vWqGePqK2NBcbCnoc1lOTUdDto04zmrjNQ0qOGJXLySFuCWNdP4A8DeKr23j8QaRphmghkyCGAZwOuB3rK1GW3NvteQBgeAa+tfhtHYn4a6Dc6WVCGCNQU6hsYYfmDWPtZqJ1rDU5TPNNLuPt2tWiXMbxkN80bjByPb8K9Ta/jsbUM/Cg8cdBWH4v0xf8AhM7W7jgCF1/eso4LAdfyNb/9inVJo1dz5aYJGetebN3ZtyqKsRWGvazfXGNOhUQp94nqT6ZNXbjxJ4vtSBFYW8gXqN4bP61HrOm6hBCkFgGCZwx7AfTvU2n+HreTUILny53CgeYJTuyRjp9cV0UUpaXsY1Yu10rkmieOteknMV5pGxc/fB6V3Gk6rPeQBnUqTzgZrLh0uCSV7gwJCh6RgHH/ANan6VJ9nunhXgenpTTnFkunCS0WpD4t1ma0i2RAmZvuLnvXl/inTtWuiRqd1PiXjZGmQRz3Yj9K9D1tUOux/aFLLIpVecYOc0/VLV9QEYfomMNnJ/M1cWr+8S4OySPHZ9C0aS4OiT6c8NzsLBpXJJ+hzjvVXwVpC6d4yksryPEDWkgBPQDg/wBDXpV14fVdQW8kLSuowGc5NcZ8QUMcWuTxS+TLHo0zRsODuBH+NKOs7IbSWp8j63EsOp3MSfdEjbfTGeKzn9+ea6FBZajCqSErOPl981HpWjGW+YT8LFzg/wAQr1VWSvc8iWHlOV49TnpAQOgFRkEcnn2rvpNKs7m0mj+zxrMoyrbcc81xmoW0lpI0Lg5B64qqVaMzPE4SVHXoU442m3Ku4kDI96rsSDjGKuWU5t5S+3ORjIqvLiSRn6ZNbq9zkdrEXHvRSgc0VRJ6ROoSUBeMD0rN123e6s2jTJZWDgD8q1b5SsoI71AeG3N3XtXz1OTTufa1aalBxZzEekS7dz5A7Z4qwunxxqSTz6AVqyYUEHsagmbIBA6iuv2smeYsJTiUHXaRjp0q5orlbgr2ZTj61VkGRzTrGTy7qN/Q1e8RR92asGps32j5s173+yP4tkj1KfwneTZtZf8ASLcMfuuMBgPqOfwrxXWLZXi8xetM8Ha3d+HvEFnq9k22a2kDjPf1B9iKElOnYcr06tz7l8eNbiWzeMgkSbW+pB/+tT/D037wrwOKyNN1ez8XeAl1Kw/eNIgnX1Rl6r/MVJ4cuBujk3cMOa8isvePQjblO7iiV1zjOfWrduiJ0jH5VUsZFZB9K0IsY5ramluc9RhPnZnGOOgrDVxHfE/xZ5rW1Wd1tZDEhLAcVzWnuvmu8ko3s3c1U3rYuhH3bsb4tYt5Myg/I2SRV7TWE1orD07Ua5FajTZHa4UnHrVXwg5fSQz8/MwB9RTad7l+70JNUGyJjnivGvivfhNO1V42jBNsICT1+c9B78V674mmEdnIx7Cvlv4nahJPrckXmEp94rnjPat8NDmqI4sXU5IM8lsfKhkmEjqsscmQD1Na0M4+1rMuQSMGub1net/MWGCXJFSWuollUtwyDn6V21qOt0edRxKUbM7Ka8tLOBrlgVXqRn9BXCaxfyahdNNJ8q5+VOwFJqN/LdsAxIjX7q/1qkcnmroUOTV7kYnFuqlFbDWA74o+TaARQ3PB603FdLOEaQD0opTxRQB6bfruAOM4NUZQPLHGQOtaF4vyEcc1nnlSDXzUGfdTKjfM7E55qCThM4qd+D61DJ0NdcTgqKxUk5qIHDVM3HeoTwxrojqjkk7M6RFF1ZLyOVrnbiFoLgrit3QZN9vsP8Jq3HpKaxqCWds0XmkFizvtUADJyf8APas6cnCTRtXip0076nT/AAM1/XbHXjZ2OozQWjxs00QAKtx6HpXu/hW5eKaaxlfLwP8AKfVTgg/kRXA/CzwW2maSbmeMLPNjcR/CPT9a7XV4JrGaz1ONSAV8qb8Oh/mK8vEV1UqtR2OmjBxpLm3PUtGuMqPet2OTjtXC+HdRSWFW3DkA4zXX2cgliLA5pxbSM5WZZaeMkru5rNu9It50eQwAE91ODUWqQajD+/s5lPrGVzge1ZyaprAVh8hI7Zx+ldEWmXSozmrxY2bRGjHmyNNKAejHgCrkE8VvbrCqbABjAHSsTVdT1l49okVCx4CjJrQ0qzdbQyXk8jSkZJY/06VM2uhVWlOktWYvje+2adINwzivlrxPdC41i5k6qXIB+le0/GjxNb6XaSR+aFd/kX6mvBJJlmywYNu5yO9enl1LeTPCx9W9onF66pk1GZiRnPbpWU6lcEcf1rRvCftMoPUO2fzqhPnIGe9d73PNuNxnmmk88mnjFMYd8UwA+uOKacdqcPXPFNxz6UBYa1FB680UxHqc4+Tis08PjrWjKxwV61SuAFO6vl4H3tQz5hhsn1qvMeetWrnqfeqkhBFdkNjz6qsyvJ1NV2+9jnNWJf0pqqAckZNddOLZ51eoo6E+nvLGrqDjd1rpPBOoW2leIrW9vIzJbq+JFHXB7j6VzsIwM/j9aswEt1NaypRaaOJ1ZNp9j7T8NQWF/pEVzp8sc0E8e6N15BFWjpcd/ps1o65J5H1r58+BPxEk8LaoumapKX0e5b5snPkMf4x7eo/HtX01ZNGLwmF1eN8SRsvIZT3FfO1cK6E/I9qlifbR8zzS1muvD+rfZrjd5DNhG9PY16P4f1JJI1IYEHtTvE/h621W1LbFJI+bivPSmr+F7tiUkuLTPUZLJ/jVpMHJNnscL+Z8ygVU1OwM43JGu76VzfhbxbY38atFOhboyk4Irpl1m0QbpZVHGetbwiTzuL0KMOlxxZaQKH/PFYHjHV7fSrCaeWdURATnNa2teJNNjt3ma5iRFySxcCvl/wCOXxATW7g6Tpc5a1T/AFsitw59B7VrSoynIyr10o3ZwvxG8SzeI9bkuNxFujERKT+tc1Bcy28m6NiQeozxRIQevNQP04r2IR5VZHi1Jc7uyrftuvJXAwHbdVK6+6CPUVoOofg+tULqNkIG4kfTpWlzCxCDxjFGRSj2oYZpgMLBW6U0lmPFOPX3pOnagLiYz1NFO6UUxnp2Tmqd4MpzVt+H6VWuDlG/Svlon3dRWMyY/KKrSEKDk4qxcMqIQx+btVAku2TzXp0KfOePi66p6dRCSwyegp6r0yaAgqeIDcBjp1r0IxUVY8WU3J3ZIqAD5TmnJxwR9KMZP3fyoJ2n2oM7lmGTkZ4r3D4FfEf7LPbeHdauD5OdlrO7fcyfuH2z09K8KQke4FTwyYOQSCK561FVI2ZtSquDuj9A7SUFB0INU9V06G4RvlGT2rwT4JfGGONIfD3iu42gYS3vXPvwrn+v519ApOksKyRMrowyrKcgivMdJwdmelGqp6o871/wdYTTmdI2t5s/6yBih/SsJ/C8zs0cmvalsH8JlHT8q9J1eRQrEH9a828YXjssio5QAHcwbGB9aqK1shSkeWfF+8sNItjpNhLLcXEn+tlkkLbR6DtXkkjk8+tavinURqGuTSIxaFWKISeoHf8AGsbPykehr1aMOWJ5tafNIa/X61G5wKc5+U4qFmGDx2rc52xgPrzTZFVlPGfrSjBzSE5BFAjOljaNyD09aYTxxWhIoZSGGc/pVKWMxtg00SQnnnvQB7n86celBGQKYDc5/Cil49MUUBY9PnHB9qoXUgjRmY8YrRuxjPzdRXN+I5zhLdSAWPP0r5mhHnkkfdYqapxbZQaVriVpD0PQe1SLjGOlQooAwB0FTRjpmvehFRWh8jVm5yuyRB7mpoV+UtkjNNVRipwuIwOOKu5ixq+1OODwe9G0EgngUjEZxmkSKrHoTTwdvIqE5HTGRTt3GaBj3k28nkdeK7nwF8V/FHhFEtrecX2njpb3BJC/7pzla4IEdD0qJsryvT0pOKe5UZtbHv8Ae/H/AE+6sSH0O5juCPurICufr1ry7xl8QNV8QI1vGFs7Rz8yIfmf6muPLA8+vamFsHgUlSitUipVW1YQkButNU/vWFI3DA+9BbE2R6VsjIR+GIqCQYNSyNkg96hl/vGgljenPT0FAGBSDn6n9KcBxgdO9AhoU9TTZIg64IzmpV+dgO1a3hrRbvXNZtdLsYzJPcSBFGOnqT7AZP4UpS5VcaV3Yy77w7qdrpcGptbs1nMCVkAyBg459KyCnHSvtGbwbZ2nh230hUV4reBYhkdcDBP414l4/wDhb5Mkl1pACHqYj0P09K46eMTdpHZPBu14njJznFFXdRsLiynMFzE0Ui9QaK7VJPY43FrRnoF5KNik8ADmuLuZftOoSy9Qp2rXQ61I8NrIw6beDXLWHMQbuxJryMBT3kfS5vVekS4lSxjBpsSljgVbt1UAHH516iR4DdhwUlRx9akYenSlVyM4pvmEHIP/ANegybAEgcjFMk/vDrTpXLAdD9Ki39/50xXFVtw96RDgEGmE7TkHijd/EKZSHFiM+1MJ460snYjp0qInBosFwJ+Y0E4ppPNIx4HNMVwc/MDTGP7xeeMUr5wDmmOfmWgVxZODUUh9TwKlc8Cs/UnZICV4O6mS2WAy560pIPA4+tYyXcgPIBFdd4K/4Ra8uki1y4u7cEjJQqF/PFTN8quOOrsQ6PY3N/eRWdjbyTzysFjjRcsxNfWHwP8AhjH4Q046pqYR9ZuY8EdRAp/hHv6n8Kg+F+meEdFtVl0K1h8yRRm4Zt7t/wAC/wAK9Ktb1XUAGvPq1XN26HZSpcurIr23LEgqNvauZ1jS0k3AqCK7Qsjqc1QvLcEHgVzTh1O2E7HhnjjwRZ6lE3mwDcOjAciivU9QsUlypAz9KKzVWcdLmjpwlq0fIfik40txXO6eM26fSuk8WrjTHI7cVzelkeSoPoa7MA/cYZv/ABUaUWAVHqantzww96rREbh6Cp7Y8Me26u88dkqt82M9RSHJGR1FI3PPSkDfNkHg9KaIdgyAcj8RTHw2QRgkU5yPxpuRjP8AkUxELMycN0pA2MqPqKlkUMOaqB2VwrZ46UKwXsWg2V571G36ilRhkj06U2QndntTACQQajOe9L1z1zSH3NMQjkcCmMSCKVjznimSEkr9aQNj5D8tUNSP7vGOpq23TrVHUjiNfrTQiiEDDtTVDI2CeaFJB4okJJzVMSOq8GeN9Z8N3Cm2uGeDI3QsePw9K+i/h38VNN12JYzMIbkABonIB/D1r5MABGRwamtbia3lWWGRo3U5DKcEVzVaMZm9Os4n31Y6ykqgq4I+taK3quBzx618g+CPizqWmNHb6puuYRx5g+8P8a9v8K+P9K1i3DW13G5x93d8w/CuGpSlE7oVYyPQJ5R5ue1FYZ1FZlykgPsKK5JXudd0fKnilz/ZcjN1Jrm7A7FUf7Na3iaUnTSM9TWNCcLHz0OK78DG1MjNZXqmlE3yD1JqxakYOecNVVegx29qntT8rH3ruPILJGR2pmMp7jpQDnimvxyOxoJG7xjmhgMZHHrTH4O4dPSnK2Rkc0wGFiOR0qCfDkOvUdRU7euP0qF+DkUxMcjDK+9E33QfQ1G2Aw+vFStzGfpQIYTkA01jjp3pI24A9qH5XGeaAGluaZIRxRk801z0x60CHN93rVLUOYPoatk8VWuxmF/pTQGaeMH1ppoz2pAfU1RI5Dg4708NhhUXfpn1p2eRSGT47gkGprS6ubSUSwSyRup4ZGwaijGY885zS5xRy3DmsegeE/ijq+mOsd+TdQ9znDD/ABorz513DK0Vzyw0W7nRHESS3Og8SE/ZVHq2KzScJn0xUmp3D3ALuSfm4GeBUTZyRnrWeHg4wszsx1RTqXL6NkZqzanMZ+tUbVswoevFXLUnyifc10HCT59KD05pN3OM0jEnvxTJeoxgMn3pnKNx0qRzxTCcjHGaaCw4nIBB4NRS8gggYpnzJ90ZXuPSkd9y8GgQw8EfWplztHOaryNgZFTJIrKCO4oEiIfK3tmnHrnJpJepx6ZpobKjmgQ0ghjzTZPQUsvY+lMc0BsLn5e1QzcxsPUVITTG5pgZIRmcKOucCr7aVKIGldwMDIAGaqR4F2oc8bq6NS7RBAoZMelROTjYqKT3OXVym4eowaWMgEHGSe2akvAqXUgXpu6DtUSkK6mrXcjYs5wAO9GfT9abnJJxQOa0IJVOOaKENFF7DvYtXX+pb6ilk6L9BRRXJS2O2t0J7L/Un2Y1dtfuCiitTFkx603tRRTYgwD1qM9aKKEAMSGGO9QyABuKKKBEM33jRb/doopoSJJOq1Evf60UUmHUa/SmP2oooExhJpO1FFAkZtx/r2+tPFzcLHsWZwvpmiihjID60hoopslk0Z/d1JF80iA8gnFFFaEs7Cxs7WPayQIG25zjnpRRRWTJZ//Z</field>
-      </record>
-
-      <record id="base.user_stw" model="res.users">
-          <field name="name">Stéphane</field>
-          <field name="login">stw</field>
-          <field name="password">stw</field>
-          <field name="image">/9j/4AAQSkZJRgABAgAAAQABAAD//gAEKgD/4gv4SUNDX1BST0ZJTEUAAQEAAAvoAAAAAAIAAABtbnRyUkdCIFhZWiAH2QADABsAFQAkAB9hY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA9tYAAQAAAADTLQAAAAAp+D3er/JVrnhC+uTKgzkNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBkZXNjAAABRAAAAHliWFlaAAABwAAAABRiVFJDAAAB1AAACAxkbWRkAAAJ4AAAAIhnWFlaAAAKaAAAABRnVFJDAAAB1AAACAxsdW1pAAAKfAAAABRtZWFzAAAKkAAAACRia3B0AAAKtAAAABRyWFlaAAAKyAAAABRyVFJDAAAB1AAACAx0ZWNoAAAK3AAAAAx2dWVkAAAK6AAAAId3dHB0AAALcAAAABRjcHJ0AAALhAAAADdjaGFkAAALvAAAACxkZXNjAAAAAAAAAB9zUkdCIElFQzYxOTY2LTItMSBibGFjayBzY2FsZWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAACSgAAAPhAAAts9jdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//2Rlc2MAAAAAAAAALklFQyA2MTk2Ni0yLTEgRGVmYXVsdCBSR0IgQ29sb3VyIFNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAAAABQAAAAAAAAbWVhcwAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACWFlaIAAAAAAAAAMWAAADMwAAAqRYWVogAAAAAAAAb6IAADj1AAADkHNpZyAAAAAAQ1JUIGRlc2MAAAAAAAAALVJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUMgNjE5NjYtMi0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLXRleHQAAAAAQ29weXJpZ2h0IEludGVybmF0aW9uYWwgQ29sb3IgQ29uc29ydGl1bSwgMjAwOQAAc2YzMgAAAAAAAQxEAAAF3///8yYAAAeUAAD9j///+6H///2iAAAD2wAAwHX/2wBDAAUEBAUEAwUFBAUGBgUGCA4JCAcHCBEMDQoOFBEVFBMRExMWGB8bFhceFxMTGyUcHiAhIyMjFRomKSYiKR8iIyL/2wBDAQYGBggHCBAJCRAiFhMWIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiL/wgARCACvALQDACIAAREBAhEB/8QAHAAAAQUBAQEAAAAAAAAAAAAABgIDBAUHAQAI/8QAGQEAAwEBAQAAAAAAAAAAAAAAAQIDAAQF/8QAGQEAAwEBAQAAAAAAAAAAAAAAAQIDAAQF/9oADAMAAAERAhEAAAHJi4NLM9joubaLWJH5KivIcgZQuiC7fnsLxL2EGq4E+uEpUupdwu/Vy2MpTK6G6MM2Uywau8QrBhOOXxpaWtSy8iJIt5GJJwhaTBtdwoa9g7U2lG2lUNrWnngRlRxGcuC6Mdx1DdMZQrTOMTb0CwIzq6o7UXIX45DSFT4v8uBJZhUo5BT1wCnQWVqqU6zTXWLTqlcSkIjrElsbSqgcY6HHmZ1seqj3G2PTIb46CklGiKvMR9R0BUCdADSxCIOx7dPA4MQpbLqLUrWQCYX3MiVFeOKq6KaK03PCWzpu29YoDLiFnVN0ELk+BXmqoUuGAr3FDZhBIwqdySBDi4ySUQuil+Ca3kmnx53oeTdURYUmQi2JVVuC7WwVrWQ6RHs1amtau/JRhJlkqterH9DwEo80WnWXx5IL0OH0qVjJ9n9Jrdj+V9Et8kcBPKahLs42iW03NVXcaRzex9BV+Z0FYH+XIU/PzQs8P3hVB5mGKZLL8FWa8rpXSc007MqLzvvI3lJ4GlWlT6fXIRH9XhKKe6Ho9klhaZei2tlVuBR4BbZfhCg36SBwcxhmntgZJU6QXY3v2QEDvFpRuc97ZcuFPWilEL7wH4EbyVdm1smXf5bfGm79K/P2/wB+Ga2w6whsWtGdXrjuuq87PgFcCI7yNE+50ZRYJWjA4bsuPPL2rBMOuukqa2savjeN7pGN24r9Evhhjfk7Tz0vOu7fihCAc3Edsx773PRHU92UpCti5dTKdKVpSZuhDjO3kqTj2VE6GNNWxc+pY4lDt/XjWOT64jo/fQdsU57nPT3OpBV5Pjl9T3D/xAAtEAABBAIBBAAFAwUBAAAAAAABAAIDBAUREgYQEyEUICIjMRUlMyQyNDVBRf/aAAgBAAABBQJh1JGfpCxR/oOxOkLDXLIz8VNYc5GYlhl+kva5OPKXn6hd6XrvXvSwKvehnV+3K+6ojtiw/uh2fotmi4t3JalGPZGyUaTWMcbdbxmJnJzzxlZJxlEpLmShy5hB7V5GryNThC8qA/a/7Dkpqcf65aRzdpHLW3ts2nDH0YRXhsTMEVg8iXoHk1v0Sl6L0yQ8g9zZI2hsPxtVCMSI26rXeWKROGjV9wKX89gVU1NdUrXEWQGNKCuDRHvsCg7k9v8AqCVW/wAb/wBCoNxE7VP+MIVZLC/TJ1+lzqfHWGqm0xZQysiFjKQKW0HiSw0IWmFWvdaP0bHaL3JVgZJX+AgQrMAOPgKFONvakfqCota5eJi8Ma8MadCGZbIw2JHOY/dSo+WOWN3NrHKQf0uuInP0KEbe0luKbZn5M/xjasB+Oc59RVTqwPzjvz3s/ShKArb4nzNDK+LemuCIMql1G5xJ7M9IyMONZQeW/ir4WF2O9UlEdTLHf3d7g3TltFwMp5zTc38ncmOPOk/+vzEXjuL/AKoP5MhJFFiqEXmi+AroVY2gKlibN6CvjYBjzSrxxWIfE7sfavxOq2IH7lmglEbSQnS7dhmfdyTfPiP+FEaAOqkcj7EYbLE2KHJyJld4ZbpfDu6XjDcY6bipJtqWUkdyHZOsdxP+KeWOk2o2GR3xPwsnKP8ATAoY+T5g1pGzWpY15aC2JS3mtD8k7kXue7pJw8EganjRtTsrxTZzZGVtcMbA/JZiO0/HWp5obTjChEuQjD5A919s2Pdy0BK4JkrQ7HWqETZMnXBnyYIbBbup0WnBYCWSvbeNh6yMZkpaDe3SY/ds3H+98SEyUCOScaJ32zbfJjfkb2xtmRleT+QKDflbLuCxO0K7kI42H8rpL/adQt1nzoKN3ht2HeabWu1r7nSfyN/KgnbHA6Zpdeg8F3fjrHOWBWkuTTlzi+Tt0p6y3Uzf3/x+w2SaUk79lcUBz6O+YtJXicsuzcsqaPtnij36V9ZfqYfvbf761yaonvMkmwtqnC2XowjXygoO0A7ayB4RlRJ2gt7W+2ArEYeWlWsx2uma3OTptzXO6YlCPT9kKLA2HPqV2w47KUhj7x+VkEjlFj4XxXpfJO53EQkmVwG/WtIDk+GIV64PvW06vyM+o2s+okpjtO6naBlz8uKsfS7HQPIOkGl5cfe+TQPZesPH5szz97+246kJ9WXaQTvTF1J/P2PejL4rvkK4enPTWFx8Lk8fbLOKx04q3YuoYy6Jwfj5PcO/UkfJ0EBlfaI866jH2+x7j0WzyOa5zFzDV5XIyOXkcVvaB0WO2MLfjOPHuqw/TI3kowI4i7k9dQDeO+aCwGxH8u9/NA/Tqj+Ela6A2M9rD9V+2YbyxHbX099po2SnI/LWfyDXbjrz67WX7W+1tvko9t/T8n//xAAjEQABBAICAgIDAAAAAAAAAAABAAIQEQMSBDEgIRMiI0FR/9oACAECEQE/AXoyzESLRxIiouKh/SC1C190qRTxJMWn9RssZtyddp10vdeNp3UsNFbBFyc71LQD2iILvrfgbai9GyIDfraulsrK0LmGoBj5LFFekXILYpuNj3LNgGNuwjhamy7oIcIn2Ss2MM6gJ0Nhhorke2Q3LphI/qxHbACuVRFw3tEwJ+T6alWnLiZwGlhXJeC2vFsnqNG/ty/EFkyB56WEMeKIWRmjqlvfhXgx2rrXK9kGCh4//8QAIREAAgICAgMAAwAAAAAAAAAAAAECEBExEiEDIEETMlH/2gAIAQERAT8Bju5Nom8s4o48SPTOXdKWKjsb6Ms5PIq2hGCKyJHFC3WCUfpG/tIVK3oSvGKbawkfq6j2YHWzB9HUdnE4xE8Omu641gkuzBlxQptup/MH5kiM+V4VTp6IbqMctEupHjENHH6YHeO81HpHki85IIjSqerVcv4diWBykiLys19Ja9M+j7PDqkPXr//EADkQAAEDAgMFBQUGBwEAAAAAAAEAAhEDIRASMSAyQVFhBBMicZFScoGhsSMwQoKSwRRDYnPR4fCi/9oACAEAAAY/AghgPM7FvReExZWMNKAdwRAHFMBwg7VjLfZKAnK/kU85yOmAw/NjB4rPTMcV3bDPtPUtZJ5laKKgQLD4UDKE6K+FirrVarVS4AnBqCyUsmU3uF/L/St5v6UWmpwjQKi0Eklg8SaOPFQ0Xxyu0Kex3AWV9g1X3bC0PomPZurKTdTTNvJdEEEMT5Kkzg2+0yoNdEcQvIfuneSZ5JyPvYEdcPs4tqtQtR6JuQF3ujRNaRfKpquhFragVl4jhI54A4N81eSOUrdUAv8A1FbvzUNzAdDg4YPzAFbjfRbjfRbjfRUXNEBzSFmp08zY5q4Ce46MGHD0UFdUydcBKeW/BDxn1TZ9lEB5jzUvMmcB1QVT4bFN/suUuROnknXbcSbqcBTZvOMIsI8Q5oTh8EWNQqNY8t4GF+RXdrqm4N88KmxUjUXVjwV1LBFrxhdUneyZU8KgnYbI8JdCbQY05iU7vZLRpdbnzUDMB72D6vZg0hh0J1TabqcZh4p1WSlTDf6uK8M5eeMcEaZ3TdpV1na0QvFGD6r9MpDf3XZ6zJJZrjqFPHMI9FSFSHOLiBPwTpcwANs1o4q8NHVAVHtLl9m7M3mi/u4LnHx810RUcNjtOffZU8PRRxCgnDoqRa1rmt/A4SE40mhtPupAjCfwjVQ1ZeOb9lTdUzMDDI5qW0785koz81ZS8knqu0tvMjyxz1TDVHZqfxciHOZJ4huio0qz3OYTLr8FVpVGzByO+CkCCrFXx7plV3dVGacOqthLmz5r2avN6jvQfJfZX+CzU2HLzUHXBtGpXIpv/lC914cKjWiSRYK2FQ8qJ+oXa517w4faLwY9krf9cbN8K8ulrW+GeaPTBtTMQ6ZkcE19iCOChFs+Iq2Fb+yfqF2rzB/8jBrnMztbwRc1mUY03ey1v+NtzXficEVUaN3UIEawmta1jDFyG6qX1HH4rXGp/ZP1Cq+636YOFCm5518IlXx/L9HbdsKbxxsgwaK87LutI/UJ3uBN80/uXQHiHSnPfEnF/Pu6n7/cWBVOTJldSiMbYUXE7xJWXtFJtT3kHdmqPp303grdqn8n+14e0MP5Vv0j8T/hfaOYxnOZX8CHS1zXNzHqjQD89pnLG0zLTJzaJrqvamtceHJBsyGfVX3l5q6jCG6nRUqI0pMDU3DUqJvyhXVkCg8fjpA/XadQeMzNVPd+hUqSrLW+Fl2Vp9vN6XT/ACTHdV54dTgOuHZz/RH/AHrtU3dYW781LlDdFZfh/UFlHJaj1TK28W8F46LhLYs6UxzdDdNdgXO0VtFlbusth2V3vD6bYdm16r/Ss354WKucZQ7PUMPabI7BPPCkeVT9tvK7h9xHNBZKu7zxd6Y1f6SD88Z2ev3AOADtMAMe0M5sOI2f/8QAJxABAAICAQMDBAMBAAAAAAAAAQARITFBUWFxEIGRobHB8CDR8eH/2gAIAQAAAT8hufeWQUv7Er9AFsqF315EwBFtnMx28VfvLTq6IHBbZgWQpUwRQGNxd+5AcHgnLBQcM3Besqz45/5CEvfuMrTroDgzol030l57QcnvFZ5/Y9SnThGI1suDP9zIMBm4vifMAFzWSVvEYgp5iWLffTzFpdt4YyHaOu4COGNRBWQlxsnVU9J/jyv/AIZi/rO4LE9GbuhB+p+JTaxvLfz2ijinu/uZeDwJhdKVFx1qCXfyzaF35jmM897AHcGWiSgogrkxQm7p5SwyvPxHdcTcLxAVYvMaErNBdegCcB7E3GoKbKgLtEjgb6o/BxCPo5zC/rAq2rfEv8xXv6TCMwtqYC2wO2Kdba0CcWqxEw8YlaRlXvDGDDkIPScJlt+79pb+6Js612jvovRyrrzTrxuP1fWB5CsFZY1RlEJ4uUk6dZ0kZSUB0idZrrGBopCZNSpQFvJDQwUHAi2ZuY8tT9bKgh0JLWu2C/DFPT2cMeTz+GC4pVWX1n+Yn+AleviQluFOpHJh24e0M8s3hmBm43EOtS+beYXt0+8sl7cDFec3iLQVABpT9orNOLXFFiWHl6K/ErFziAL32XsTiUjoSL9PMV/o5/hntxQ+GGqe0UKK97MPL2spdsqXh8xBZNrKQgyQ9moQVddPRjthGNULBhWkLXPnPwjZ7N5agwOsNS5+EOHoxfAfmDLlxuJae2YlIKNCxhLcA5d4LbEttCU8L7CC5NHRzz+95nFytGaqdXGVvzMAyt4ARmxqB2PJ+9Yt/wBpeEnAvRRtFgq6EwTw858+YD8RWvfcIS6m3WXLgoqrHMyKe2IKHOC7GWWkGcdcQvbzMFV5hr8iKYoBB2p+pL2m1w9s9pfHtXlcA+/iwBoU1W0yNly4fG7bYXnNJiVa93T09q8QFUCgalzu3oTjmKK+iqwfSByw0qHIaj6T6oMXdPX+oe8OwaeMLqUulxEKlobVKBeW7uAAMtjsD+5c66/Ccf1LOzz/ADERkjD3nXmMmvariKRtry39dzgMsLbI8pT0uXGf+uI3ogC4y4aa1ynvr3h6k3dtUSr788JMu0xjiEuc8wfjapyarF+feFihbywuuHtGN+lUrgET4v2j+y8n7RZ8hDTkG+JbKo3mZMux9VVvfr2ljZYHmOlrAgCjCCsg86qtRyT5JfbXdFG4ikorYE8yBfufj+CdJkdUMaZcdhCustTEDsiRE4hXLRM5StqNnR7wIwpLxK4qMVn3lLcO/ot0M7jh9EICKyW5w/nMyinARexCC+39Gn8Sl3Ob4PgjEq28Qt7OusMHxCrmUxVqsutRZ1Jp9IoVPmMqGI7+6n0QsS9szxexUHXEtgImElcTFBklrXC/X2/jqXNGnYhO73PsJ+ZdNRtg8zu6lerGDSu4yosvgwycV8X7xGsEAG47afNFSiZ6JUGB79KiL+NbnUHLEFrOxGxcP0P8i+5KObXEBXWY9CdIzG+sZWV4eX+oIOGkWnh2Tvu7g8c/WUoO+XTkvKIxj25Ag5J9of5HLkjcZ3j3mALL6n3YM+j6eYHQbaYa/WGSK3E8MsMsAymur7B7TMbPpAG+Et7cT3HWBMxCJWoHWVO0D2K/E90siC3sxDvRzOvPQi63xUK+k3Ov43NAn1ofiPPo+hFtGgVddfafSqgfAzde0Y6eYAeiBse4RWwY6wrqA0gC/TtG3YT8TKT4Mz3Ey6g0zA2ufos/lD2bi8+nD1c682h0Y9X8IUGA7y80Ri/8QtzAiNtRbx8xzn2Qwk7PTsr8xTzt+RqJtZUZ3kQveWToSpijtjDqKR1L+nf0e3rt6ESCQMLC42UXof8AVxZh9/6VF6cHgv7y8Kj8RRdj3zFbRTTZK8SxSBfSb/v0a6KNcS9GCrjL8r9PGL9Xozn1Mw+DamZt0S2N8x3iXK9cn1D+VL2UzHTMO5tCYY7whr0z/YfwPyxjqae6vWpjuBl7CLZOHzFmceo02TqldMqfEq8B8Qee0odP0XDc6LzWI7nEcDv6VMks5J//2gAMAwAAARECEQAAEBdEOjLEJ/si44FIY7sRfZh+We9X51X0GL/Me04gpkGvqiG2MaP/AK53RzpXcZRfettJIrv0dBr4MUxqzvmNNzBW+fC9FStO0Gg8a5N8Dj9HtAVqRV22QzmNXu5/d5fhG5AHJyv/xAAjEQADAAICAgICAwAAAAAAAAAAAREQITFBUWGBkSAwccHh/9oACAECEQE/EF1kiiaRDSKILJqyLEibjPWJGqDTSXQ1LqkxBaG3Lgps2ihiEMtIbgGqXNLNkCUPEdjUivR1c1PA6SEoFGLZoHahKmIbTrSHs3BNwsd4ulyMWlxs9iYBpFTwDXZqj2iOd+/8K1+ysRG6is16V3BOk2x8C1oZ1+McMR2In/yhJIkfMr4IWl8+hIA+Bkkfs6Coa5uikfaSFc91GiN/0NOHAxs5ZWisnxfCbL5H9IXnpNcnPgWfHDUX6S9S9EJeGh4cvx//xAAfEQEBAQADAAMBAQEAAAAAAAABABEQITFBUWEgccH/2gAIAQERAT8Qk48Ty9KG7mj2TvpDsk1++BDRftPUfqUSdUJgiBc5LNLNkQGR7ab1Cup8gpDbP26M8HUcQZBrkF5PcoH1y0QlGw41DODEkfaMOke+peyChDcf+N2VeuAAImfxfEndI2JliTeVlinh/wCjeANkXnD1Gm/Nl6ODuLpO7afBDUbY5DWR8jL07tfUXreTOFjCFATDvAOAHsd1ysbC1mC7s/yu5GxJ5Ds9uT+Qxl2Z9Sce6P42/8QAJxABAAICAQMEAwEBAQEAAAAAAQARITFBUWFxgZGhscHR8BDhIPH/2gAIAQAAAT8QyW4EtVIVpYQ+YVt0vm/zKJj/ADIir4gAgFCb/wCmsd4iAQtQyaCnZv56RDmzea5dXG4WV5AsVdH4MQJZ0EZOfuVNWmisr3413xGAbGjtnv3rEzb3RvKbHthIFFtSlzrj3meWk8wgLUyDeZamveULLLzA1T21+h36PZmFji4Bemh8Ye0y7wCpEFnBLCN5ToJQ+Zjep+EoPAfy/mVDH7hALmVvO/HmIML2WBh1KFa1004RGviyDoHlynAXiYoEtOy7zMJY9QvC48/ESqqo4T/kEpQrnlg/aehGVhbVNa+IE1tUVZA466jZ18hd1R/cRJKpa2o9DtAdgoFZOmvSYDwgXEFT7Lynya4/RF/2Jd1TLrY6qMAq2+CewwWvpSQQF2DGH8xMq66DA8n85ib4Geiz1vJ+JgT4Ot8BYxycxuJgUxgqugOFy2Zg1KLnKtXcopZ2YKTglujOMYsgNcOrl24LDGeKS4YPN/3aMF1LFO1n/wA9YoFg6uczAWNHpWT6lB2gqcX/AN+IvcVVRbbuuTXSGRo5bP7lFxFHHLH1DEXRDY+JTjXLfP8AVAWYwBH6xFDdrfk/8m3Vn5qYeg+YJpd7z0/5zEGqzw78nruEcNQUfcemJY4muDYGH1MKctlRQUa2kpGZyhUDYYvdRSpqLZTyJAoZpYXnfETQ0DmMm837wxZYT4qIcu1MmlTZF7R7/wDIKr0s2A9LL/LnyaniKlyCgt06ENTn9kP1KKefwxJAx+XVe0G0fSzvz0nVIoGzAChcwmgK5iESTK0XrjZHvVcy+kAAisE9NS/K0u+ubjFFak5fJmuDzEWEoJyQgrBtL73GxxbdWW08Z+WWAZpuAlogcC5fuWVI4YC3q84R9YqGN+f7gOi6AD2uJdgLa2L7UrRL67iYGUOvIPRT8zB3lECThd09Xifz34my/wCrtOI/H6oqanSjI3XcT2gkxmO1z1e0IAtQLrleBLKjOju79pxCO0upRLo4ofe4hIW89kxaWu45eSAD2IUJnEby2YRF2qfKvmKcPBoiUdcdfWJKuigyXmOJK3C3msJGWDiXjmNnuqlgaxnHDv3+JQnf8ftLFkQwuD/CWDoMOwi/UBkAWwkAIovsREbHBrQq7ukJjAjlICJfcmsJb1q9okEoKAu7zT04IBDQdH9/XFcDEFqWwObz/wAlqxdNXVz3rHpFJqvC7lwZBH2loWUa7NJnLyC6oZXg13ZU8hX0H+V14AL1x+YVKUo/X5igdVjBCCGoKAgvY+gxDJYDMokB268sW0IihgHqihgebbuATJu+Lmf27g1VLfa0hkqe+dLN5yXrgcSsAaND0mkMTJo+sJZnChZYjDurhDdPbXm76ta29oli6CwI6HIUPa0UdFcoH5g/XwcPn/BgPsO9yYukcod7xMFECjirZONK4iRfFnFdXk+WYPkGn3U4+PthYJSpTVMEFv61OAAMo7fIlekowwC+8bLJUGvFxJVbTMxQpKd3WBfEYXg6vHvQKB24ohPEBNzedw9SioDvZVfHmw/MAq1ZWaV/oTtnjCABM8vxKKnFrymay0nv6yoGiRV11w18kJ1Gaxb7D9sG2VlAVXAOTvWM3woVtwaoIZJdLhdnrYWKdQkMC9BTiBWYEzi/EErn0iKHM2kMM6mUB0duYeMvW3mX2uD5uaHTF6lmNLmX4tkjXEoSXWQdYYFMTbKaG/LQjTshVwKr5lCy+1z2GnMXCMK93wM4eCXVWLkqg9vtCmEB2Sr5Snl7QCwKttVXNK1ooqAE62Gs9K5+IjMnAqL74iFRtRfMKVqWkKAHTku8VVU2NsAepdRqRbvrK9qFtlugI9iZBUnmn7gFWkouzr3GWaRLgwrpQpWkQKKgYUg7KU12XcQoC8KV/v7iJfsHMByI6SkQJwEosoYaHrKzRLHSGAtvDQekQtgMF1EWDu0+TMu4VZAXF8NnGWu8WSYFhZ6sweWnpzGYFi6L6hH3hKDDmX4Ny5FUtLPQWvi5Y11JtmXAC10S4IgVhWXlou7uKcQmUrnb63KoD/szkXAtuFK5BXvraRMU6u19YFzcI4tIvFhcDKBV5EWz4jtjRARc5I4Z2VWPeEBc7UySzKsfHEAQtsDpnfH/ADBWPeYeJyKkyMS1lHf+7S2CHmZLJURimWhawdojXqe0D8RmaVZEEQRUQ2M9uoQL4JgQTArHtOEvcceZXBWDKcKLDH2cy+wtsIBfQ1G+OIlC3IwBCjW1flYsg6zUtjCmIqLrW3sgAVDXPoz7QYWPMHOPEJAqt9/pl/8AIAOsF4PrBZvPqq269WvaKEkbG8wA0yRcmg7NnpEIK5oZLZ+MRFfIVgzdi3xXSoFUu6o+xD0mUUYVbUy4ilw1Nxu4iIFBxrmr8Q0swMyhDLHRlAULd95dAVgpE4ijZ6QI+pOfF3XaxzOZ0jLsJszNrDs94QLJL/3T9yxBTUTFDnyvWK0ShfdlQwK62Jp4mRboOIijNjnROzXaXlG0M82/iNxr9+mIDdmQ9EJzkqEbHJvee8JA5RDVcRIyiqwfmI4t1GkNZ7TOPeM6RY59olCtN3GndZRO52gl92a1WXEOxYtr4iUeVjV6PQmXMBYE3NiO5hLy4l8EnACrmRGYBqr9/UhCPcA9fpElFOXRphZlQ9VKAZOQrtVpkLVlKr0WU+n4HfP5QjOcafgDL5YI2wZcLAYo0Fe6y4aeMFLCvycwTDXSczRhMeEYrL0dAtRaHXLhgCVtWsbAtnipQCRvlWHYP08INDddL/EI7oGhm+h7ywBRp3mbAF8U47wmQso2CtBMlgA00W+XvAAvB+thOMyokWOij9kVUkKAWu+IrIBbgqDZYyrrLs013zcoIbD1T6Jln+HidK/wZGrTWXkU7OfMxnBMDXOABvpBCVug9esQF5J5gS6sVAJMqacye1cEzV7SgquHSFr9fWVYfqQBBDOnk6IEZUaInmUGqgqqaNSxHO5lINY9jLBAxGWlJxGyuLFB0mqhIouSrw780+kW/Z+yJnmWPR/2KAU/MLFrtVAeVoIWzHn90MoHkJIi5djrEirPKew3EmScd7ds92uJRKXRZLmlJQ3s3JhioXSMAeCZlqdjUCWFl4P3CaoIHXb8s4I9Jhh8iPtL/wAVj/WAlER7xPELBEyEt2h+1T2lsQ1ZnAhmANgGHujwuu6fwjFGld3vFcCzoRg8kNNh+GGdrKy8C+G32EdbktPeKR2lBbeISyPQZmRdW3mOT9xwDUq4FfwRscxYGXY/1Uq8xvBAJ0uz7go5SrtnUoJ0pbxKWFq9ZKpjmYHeJ1VLj3lgvSvhmVMUYgvibMjn15gOITNI2JB8pNOE/tgq0dJArPRFsPtBC9O3+L3ay74JZBJd0wWOTEmWlmb6Z9JyVmXyf35iW9ucj+e0swp0xVWM3HXadInIGZ0CwOgcogLFxYzlzKa9D1lL3StI4URvfWCz17gJXuR5FZGmLnLOlT71DJ/gswwbkZ//2Q==</field>
-      </record>
-
-      <record id="base.user_chs" model="res.users">
-          <field name="name">Christophe</field>
-          <field name="login">chs</field>
-          <field name="password">chs</field>
-          <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/4gv4SUNDX1BST0ZJTEUAAQEAAAvoAAAAAAIAAABtbnRyUkdCIFhZWiAH2QADABsAFQAkAB9hY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA9tYAAQAAAADTLQAAAAAp+D3er/JVrnhC+uTKgzkNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBkZXNjAAABRAAAAHliWFlaAAABwAAAABRiVFJDAAAB1AAACAxkbWRkAAAJ4AAAAIhnWFlaAAAKaAAAABRnVFJDAAAB1AAACAxsdW1pAAAKfAAAABRtZWFzAAAKkAAAACRia3B0AAAKtAAAABRyWFlaAAAKyAAAABRyVFJDAAAB1AAACAx0ZWNoAAAK3AAAAAx2dWVkAAAK6AAAAId3dHB0AAALcAAAABRjcHJ0AAALhAAAADdjaGFkAAALvAAAACxkZXNjAAAAAAAAAB9zUkdCIElFQzYxOTY2LTItMSBibGFjayBzY2FsZWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAACSgAAAPhAAAts9jdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//2Rlc2MAAAAAAAAALklFQyA2MTk2Ni0yLTEgRGVmYXVsdCBSR0IgQ29sb3VyIFNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAAAABQAAAAAAAAbWVhcwAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACWFlaIAAAAAAAAAMWAAADMwAAAqRYWVogAAAAAAAAb6IAADj1AAADkHNpZyAAAAAAQ1JUIGRlc2MAAAAAAAAALVJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUMgNjE5NjYtMi0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLXRleHQAAAAAQ29weXJpZ2h0IEludGVybmF0aW9uYWwgQ29sb3IgQ29uc29ydGl1bSwgMjAwOQAAc2YzMgAAAAAAAQxEAAAF3///8yYAAAeUAAD9j///+6H///2iAAAD2wAAwHX/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAEOALQDASIAAhEBAxEB/8QAHAAAAQQDAQAAAAAAAAAAAAAAAwACBAYBBQcI/8QAPRAAAQMDAwIEBAQDBgYDAAAAAQACAwQFERIhMQZBEyJRYQcycYEUkaGxQlLBCBUjM2LhFiQlQ/DxRHKC/8QAGgEAAgMBAQAAAAAAAAAAAAAAAAEDBAUCBv/EACoRAAICAgICAQMEAgMAAAAAAAABAhEDBCExEkEiBRNRFDJhgRVxkcHw/9oADAMBAAIRAxEAPwDy3rS1E8lDynZXBKP1LOooWVkcoFQUOOOSmvckhyOCaE0Aq5dEZxyeFryi1MniSHHAQkCEkEkkAZWQm8DJT45S1p8jDnjIQBuOm5dNaYzxI39VYnBU63TGOqik/lcM/RXTGrBHBQKgJamkIzghuCAAuCYUUhMcEDBEJpCI4YTSECB4TSnkbprggBuPdJZwkgKNWs5TR9Usj1SJB4IwntPsha8cBY8UgbIAK4kDhQ6uTSzGdynSSOPdQZnFzznshCbMZSymjlLumcj0k1Intn6oAyTnfsllY7rI33PCACRbu3+yvFql8e3xSZ304P2VGjOHAq19Jyh9PLATu05H0KANqQhuCkOHshuBQABwQnBSHBDcEAAcExwR3BDcEABITSikJpCABFJPI3SQBospZQDOwcbphnPYLkmUWScphd7qM6V5HOEwkkbkosf2wk8mBsd0OV24OdiEI8oh3hB7tOF0iJoblPY0ucPRYijMh2x75OFtaemp4qds879GHYxn5vyzhFhRDZT9wSQ35i0Zx6IrqVrHOe9rmx6A5p9z/wC0QMzKXwNByflHv2T6vU9scTS8sa0HSeQfT6JCIUbA92wGBsPqnPpyB7lbKOn0+JoaHA58vJbjfnuiVVIxkXkOoHDmuJ5BONkWNI0jmgE6DkD1W06drm09c3UcNeNJQqiibG3LycZxgcnda2UPjk1AadJyAmhM6GKmMtBJG6zqY7ghU3+8ZDGwAnYKRRXN4maHHZAi0FqG4J1PM2ZmppBTnBAEdwQ3BSHBDcEAAcEwhGcEwhAAiN0k/A9kkAUwLKSyuC4JJJYLh6oCxjxgp8ADiYyQNXc8BNcQ5uQi2+MSTDW7SwcldLognSZKpKfQ3LmskBbqBbICP0P6KfHQy1LTIWSyuxgaG5+30RrfBTtk8INLADjOMucfoun9CdKuqXMrHF+l2HDJOdlHOairY4Y3N0iidP8AT8lW0tbHK1+PIQ3Baff2ypr+m7pLORBbp3iMYOWEcBek+nrHSwMa8UrC/nOkb/dWWOghG7YYw4j+VVHtO+C9HTXs8mW7o291NR4TKSaBryCHaO2crZ3n4ZXinifJDIHsAwMjgH/deoxb4tG0bG49G8LWXC3hzX+X7YUf6mZKtOFHjqvgnoKgU9wgLHt8oceFAuFOWE5wQ4ZDtPZeiOu+j4K6J7vCaSQc7LiFZaKijnkpJC5pjyW53GFbw5vMo59d43/BU2DA0+myyCQchSrhEY5SCGk86mnOQVFVkqG1s1e6KVrXHYnCtgw5oI7rn7HFrgR2KudhqfxNECeW7IAkuahkbqQ8ZQnDdAAHDdMIRnD2Q3BAgeAknJIEUbX6BZbqc4N4ymBZ16e6fijt5ZB56Z0bcucCgcJOmc4EkkprXkoo4tsc35i31RKR5YXaMh3YoXDwVOtFOKitMJdgObnJ4HuVyyTuKN1YpzJOGN5J3d3K9I/D+nbNSRtYPK1oAAHC842amfR3CJ7wcFxIzsML0f8AChzRbY36nbu1k5yd1Q3HSs0NFcs6ZbqQBg5GMcdlsm0zWAZIO6g0UzXfJuf0W4p2SOjyGgjGDlUezSqkR/BbjIPAUK4MYY85O3IBWynikyCAAPohOotTTq2ASOik3MtcHNcO2xwuL/E23Mpar8XpGhx3x2Xd+qRaqSAmprqeAkcukDcrjXX9XQV1FNDBVtkAGW78+49VZw+UWVc6UotHF+oqZ0bHTNaWxu9d9RHOP3WiVivVQZrRJESQ+LYgHGr3VdactBWrHoxJcMRVh6Om88kJPO4VeW06XeW3Zgz8wITEXBzUJzVIcENwygRHLUwtUjGyG4BAiOW7pIpASQBz5ww4hMkG2UeVu4IQn/KiLtHeSPjJoE07/VZZkOwmg4OU885XRwPdu1bCyuIuMJa7GoEZ+ygDhHopTDNHI3mN4d+q5kSY/aOjQRRy0LJHgahs1v8AKBuSut/C6sJo43ua2KJ5y0YwAB7/AEXImzg28NiIa5zwGt5xn3985XU7PbwJrfb5pRBTtixKXA89gB3POwVDYXlSNDUfjbOhUnUz43vjt9H+LbH/ANzxA1mfcnj91mD4lXOCuZTzWqCSI4BfAyR2k5xgnGM/v+i2nSUloFbS2ezW+Gor6o4jNQRGHHGds+b8gFr7h1bdDUVbG22AtopzTz5YfI8dj3H1Oyi8HGNqPBY+6nKr5OidO3OO7UAkdFofqwRjBH2K1XV8lVFb5m08oZJkhhPuMKqUvWlbbrhRCrooDTVuY2GmLnSNkxloLXdiM757LXfEa/Xt0Yqae0Sx00Tg6SWSdgwOPlGSeVD4ybTJFPho0LugqeuuElx6ov58A7iFmxIHqTwot6t/w28B1PRETTMBAEfiyPP3GR9ltutOjRdfhzSXKhuLBXVnhaIZXu1SZb/iF7uW+bIAGOFQoena22dM0VM+IC5U0hcahvl1b/KcbuA539dlZlHwXylyVoSeR/GPH5Oa9UdPvhuFfNbWST2+JuqUkAPiae5bnOMn0VHja9gLHtLXDsRhd0ntzG3WeeVmkVlvqIZQwbbROIJ9gQue9ZXKG+Wbp6jobVS0j7Pb308xga4OnJcZHPfnl2S4kj1VvFkTiUMuOSm1RTlLs8oiuULydg5RFlrtLg4chTEJ0Rs8cnykJOCq9gqpZqprMnAO6tLggQL6oTkV6G4ICwZO6SyRukgRRHbtUc7qR2wo5GCQlAs7C6YE8lOWJB5lkb4XZVCM3CLEPPj1QmZGQVdvg50pD1h1rT2qoP8AgtjfNI3VgvDQNs/cLibUYtslwJyyJL2R7dd46SzRzOjbJJBK1waTjU4HIB9jj8l23o25ir6htk8F8fcoaumGqaCEN/CyzwOHhEAY1NeQM98jvlbO4/B7p1luq5rNamR18T2afEkLmEhwJbgkjJGRwrR0yyhrLfLbDC1kEgA0xjQRwQRjgggEHthZ89iPDSNL9JNNxsH0wyqgrmXFsboKgwtbG8OLX05GMgY4OR/RWPqKjr6qonrKSJrGVeh1VJG3QZHNGMk85IxlbO39Os8QyCtrZHuOomR7SSTyc6clbmpsdLUxNhqTPWjH/fneWt//ACCB+ihWT4ePlwWPt/NS8eTnDmxSS2+jjbTaqarfO5w80jWiIt83YAuO3flbW8U5uVhnjazJcwg7/wBFL6tooLcyGnpYY4GSEMDY2Bo254W86atjKi3uOpoAA1AnhRXb4LcIqCbl7OTdDT3GR81ARDO+mf5oaiRwLTvuNj9VZ66w3atjLhPa4Wk7hscj3D89K1HXkI6c64o7nQkvfANdZG0f5lOTh2fcHce4910DXGBradYIyCO4K7lP20QrCq4Zy7qXpOOO11H4u4VFQdB1RMAhjd7EN3P0JK5v8JrZbK7rC7UlRTxkspJgzO+jIAJ/UrtnXEgbRSBg7LgfQtULfX9YXw5H4eJ2hw2GcPyP0UuNuUX/AER1GGVOvycme0Me5gOQ0kA+uE0psbi6NpPON1krUMI3fR2DcXNIzlqtzxsqr0THquEj/wCVitj0HIBwQyiu5QigBpG6SwfqkgRQkOVvccIiw4ZGFxF8l7KrgR8AndZGBwEQta3krHiMHAUpREGudwF0L4BX6m6Z+Jltr69zW0suqmkeTgMEgwHH2zhC+G/RH/Fcji2p2ZguY3nCD8Suk5OkeoP7vc1xhljEkZd3HdKeO40/Y8WXwmpLtHs+x2ptbdK8OlxEJGlo9iM/n2VBf/0TrWekOBTzSGSEjjBcdvscj8lVfgF8SzcbZH0/ca/wrtSM0QukcB+KjaPJueXN4I5IwVfeubdJXWCC8QPLp6U+I/yjIjPzceh3/NY0sfg/Fnonk+5FZIF6slUSBl4O+30W+EjNJxt3GFzzpC5+PRMcXN1txk+qtLqsNYTnG3P9FBJNMmhNSIPVUrZK6nlMWtkORxnBI5x7LUdP2+7UtNUPguzqwySF7jJsBnsB2x6LaSh1U7S0A57k7YU2igZSwaQ9rnHtkDI9cLuKa7JPuRl8Uig3i01MNRUy1ThLNX6W1Mj9yI2naNg7N3P15U+kuh8IRuABaOAey3nUNRRGEmTwnyN50jP2yqY2rtlRW+C2XRNpJ9z9k3FS7OZynBdEfrGua63yu/0H77LzXdrs2j6duduhkxVV1UWzAdoRh36uGF3frVzqWzhr3Yc4vbv6Y/3XmK8TCS5VLhwZDhXtSCa5MbbytPghwHLCPREKBCcSY9UdXjPLh0TTaKOSoI+c4C3kg7qJ01H4dkgGNyMqW9IVgXoLu6O/dBcgQJ3KSy7lJAihJLAWVGadWhs7QdJzj3TGxsPmJyivGYiO4UYHbCl7M5qm0dm/st18VH1nUMldiKWHScnbK2v9p/qKz3W6UNBTtP46jJD3Y20kLlPRN4NollmjJbJjYpvV12N2uP46RxMhAyVK38aIq+Vmrc98NUySN7mOBy1zTgg+oKu9J8V+u6awvs0N7cKd0ZiL3QtdLpO2NZGf6qjTnVGHhSLZUtpqkTvjbIwDcFV5Ri3yi7Ccljfi6PSvwi6kFystPUfLMGhk7fRw7j68rr1LOyrp9Adl3IwvJnSPXkP9+W6kjhZTNld4EjuGnPy5++PzXerBeHOk8N5dHM3YtJwf/PdZ2xiqVl3XzOUS2dSXKrtdNG2lp3FpOl7ttsrSR1V5rIT+Dhge7G7pJSCtk28RTHwqqMFp23GQiOp6OZh/C6WHGdm8lVYyr9xr4MuOCpoq9fSXeeKSS4XGGGIjAhgG5x6uP7rR22mNFXS1zGlkL24Afu5wG/Kuz7YZnD8SJpADs0YH54VY61BpIMOIZG1uSG/wrtc8Ie1txcaiqKF8WeofFpnCI5MbS1rfV5C8/PcS4l3Od/qu3WK1HqCoqrhUN108Ac2Bh4Lzy4/QKj3npGpmsVFc4oTHJI18bnEjEjmOLTn0OwO61deKpwj6PN7L6m/ZRs4eD7rYUEP4irjiz8xUGphlp5nwzxujkYcOa4YIKk0MzoZI5hy0qYrnTaeIQ0scY/hGE161VnvUdUwMkcA5bN5zukIE9BcUV/KE9AAyUkjykg5KE3hZTGuGOydkeqjZoxdoyP3UY+V5CkoE4w8Ed1JDoq541Kx0bi3cFZdIwjDmklYYMhMlaQclSEAdjg6PAWGnyEEZwm05GS1OGziPVRy/JLi5dDQ8xva+NmHtILXDkHsvVdjgqbjZ6SSuifTV4hjdI0OGpji0HkLhHwas5u3XEMvhNlZb4nVjmuAIJb8uc/6iF6LobhDUTwVcY0axokiP8AJJaM9+4z9FDsY7h5L0T6snGfi+mDgutTbpWtro/GiJwZANx9R/VXO03SE07ZKeOOpa7dpatPV0MUuCWAtI5/oo1F044Sk2+unpXH5hG7Y/Y7LPqL7L0nKPRvbhcY2OfI/Vkj/KHK5j13WT3h7rPQOEk0hBqZmnLYW+me5V4qOkXTAurK2rqC4bjXpH6LVyWiltrHQ08QYMngf+bruDjHlHElOfZrelbRHQ2V8LG4aBtv7ItLb6H/gSKkkEP4iKpleG5ydDpHDJHpv+isFspHG3kFpBwdgtJ11Zb7aKGWRr45ooaNkpjY/JZ5skgEe/ZWtJv7jZDuQi8ajaTOY/GT4eFllZe6TaeNzGPa5uMtI237491yZ1iulNIYpabB5HmC9Z3q8UF7+GdSx8bnOdRNOWlrgHceuRyuIV8XjPpJMAl8QJx7rcxa0c7bffBi5M0sKX9lJo7HWsHjGZseOw3W/inljhY0vbIcb7EFbWrgAjaAAPZQ54WtGQz7gKw/p2NIrrbmyLJLM8bENQD+IB/wA1p9iFJAPABLjsBhbGO2NbDqlGHEJLQxvhIb2pLs0ZM+f81v5JLZPovNs3P3SS/wAfAP1kjmWUgcLCysijTUmhwe4d0nvLhgpqSVUDk32Oa8tCUkjnDGE0hLHb3TOQkIw7JKK/ZwIUd7tLi3nCOzL2AAEk8AIfI4unZefgvPVxdU1MFAGmpqaR0ceo7Z1tP9F0it6gNLNbxGGt8aNrJ2O+aCaNxyAPRwdyeMED1VI+CFqroOtKO4g+G+MO0NI3Jxn+iv8A8VKKlpOvob7A1raC6NJeztT1DvX0BOfoSPVOSlCFyXoljOMslRfs6lZ5mVtHG4HdzcggqTSCWnmyw4I7Huqv0HUSQU0UEp3YMHJ59Fd54hhs7Rkd1iPhmvdom0VU2V2iUN1Bu2Qq1WQieoe4+YNPGP1W8NLHOzUHY9MFCFJFC0Nbue3umFoJYaZjXQ+IGlpeMh7tIIBzjOCpfX1yo7hNXRSUMWXUBwYJw5zSD/KQCftlbbpGkfLO+X8A6rbCzGkOwA4/1x+6j9VUlBUV1VFU2qsg1UDxq06tK1dGMYxt9syfqEnKfiukcstfQ1Nc7AyeN1RpqoZA0R6dJO+MZGRuBsuPTQGnrDRvD9VI98RzzsTj9CF37oqK4xdNg0xkqKeGpJD2VDmDBwcHHdcW64t77P1xX08hjIlHjx6Xlw/lO5J7aD91t6rUMq/m1/2ZWeUsmJpvqn/zwaqZrXPAzyd0q1rGRaQAogkfLPhudjypFSC6SOIjJWs+jNqmNtVMHzGolb5W7MH9VNkzNJjGAOESENDgwcAcJ72Bu4/dOMaRxKVuyE+EtdgE4+qSlvd5thn7JIoPI4ekkkvInozCyFgrKAMp9NGZZw0DPcpjGuc4NaCSdgArNbLY2CmPi7zSDzY/hHomouTqPYWkrZoaGgqK+pLIW4bnzPPAV5svT0dNE1zMPcRu8jf/AGUemhZTMDY4w1g4AC3FqrAwhhJx6Fa+rqRi/l2Z2fPKX7SxdEVH91Xulq3f/HqmyHP8p2P6Lq96obJc+sWWmuZm0XIAho/hyDsD2IP6YXHA/RKKhhy0jS4Z7LovQc1yvldTNa1znW1wMZ5GG+bJ9yHY+wXe5iVJ/wBHOrN88/8AuiyXbpK59EysdNNLcbG4AQXHT5oh2bMBx7P4PfHJstgrGTsEEjgcjbfkey13V/V90mb030jZpY6WouFY5zpHt1s8ONjpC0juHHS0+yfX2212y001XBM+yVbATIIw6WiD+SNO+lpOcaXDHp2Xmsum+4m9i3EuJG8mphEcsy0LEDRkve4Na3dznbAD3Kg2bqSjr4YIagxh8h0eLDJ4kOrsNWxGe2QFpvivW1NNb6eyULyyavOJXBmotiyBx6k/soIYJSyKDVFnJnjHG5p2b+xdZVzri99prmU9qZHpiEkLcTkneV2o53/hGQNIGecKZ1D8TKK0zMqbgxlQ2eF0B/BkksPqcjB54BXE+mKrVd5ZH/LDVOijYXFxaGhg/UHP5pfECsJujaEhw/Dtw/Ix5j7fTC9Jg1ISnGNcHnc2xJRcr5Ou9B1HRtxp6uNtdRNE0Yk0yTiMFwc4eZpI82NK5T8frfQx3yxS0cUbPFEjHOjGzgGuHPfZrfyVOeA9mkAOzsduyRIOkHcNHlz2+nori0FGakpe7Ky3Pi012qAxQshZkNGw9FGhPiVjn52CPXP8OLGd/qhUDNLC88nlX3+CourJUbsyEZ2KL8zMADZRm7aiOUWN22BlNM5Yi453ICSa93mO6SQqOJJJBJeRPSmCp1Ba6msY10enB7kqEVZ+mnhtu1NPm1EJNSdKJ3BR5cuh9ttUdFJnUJZ/Xs36LeU1Nj5huUyjpy17XPG/K20UWRqW9q6yxx/kydjO5v8AgFT07JNnAYT6m1DT4kBOQpUcWMFS6d+2Crygim5tdGroZ3MzBP8ATddh+AlzjppaukkDWvDmyF5/k4P6bfZcsrqUSHWwDV6LZdF3j+5r5BUVAd4GdMzR/Ew8qHZxOeNpE2vkSnf5LR17eDbvihRtjhjmbb6Sokax42hNQ8CM44zpZnfbDlc5K+e+WdlS+qdJ40YIDtmk/wD14G4wuP1dVUXi73O6Vx/52rq3yaj3YDpjaPQBjW4Vo+GfVkfTd2Yy4wGa3yuHiYaC+E/zsz+o7qo9N/aUo/uJltL7jT6KtNab9brxWttkVTFpkDwSCIpIjwDnY6cj8vZd5+HfQ1xu7Ka5XyWYvbABFDr1CNrufM7PvxlF+IVLbaiipOpLZJFUU7sAysOpskbuN+2Dke2oLrnT8TYbPTPOGtdBGSSeBgd1RzZOuC3CLfs4zTW+2dIV9/Mw0RU7Y6vyfM7LSwjVjJJcWrid1rqi43OeuqSXT1Ehkec53Jyuof2jLlTHqhtFR1IefC/5gMdsPMXNBPfY5/JcmaHElwPsFr6cGoeT9mZsyTl4r0Ocd84HomucGtc/b2WJDgbn7qJVSEt8Np/JWyslZHeHVE+AQWjupewjw3ttsmUsbWtyR+ac5wGRhJHbE0kZx/7RGP3wSEJp3zlLIByTunYmh0nzbZx7JJhfk8D8kkWc0ca4SKSS8ielErZ0dQl9slqCeX+Uew5VTXQ+ji1tgp9tzqz9cq5o41PLz6K21NxhwbEMBY0j0wVMpSNm4Udh9sdsI0QDTt27reiZMicG7bBMI0uyMJzHbLEgxg442XZGFY4H6p5jjeNWkZ+iBHzjgo+cNwmcsa6M48pwRwsE6zh+0g4908E57ZKxI0P5IHugLNhZeorvZYailpZ9VNUMcyWnlGqN2RjVjsRsQR6LtNm+J/SzeiYRLU1b7pS0gD4Z248SQAABp3BBP3XAiXDDXjUOx9FmIFxPhuy4Hg8qtn1Mef8AcWMWxPGqRMvNwqbrc6ivqnl888hc89gT2HsOAgZIGG8DYLE7/wDAYwDGsajn07bpoJGRqzjhWUkuEQN3ywUxLRySQgMbqdkoz3ZOyG52Bho+pSGhznBp2CETkHdIuJ+qbknuOdkDHZ2+iaXE9sLBdv8ARMJw5IYTDj3SQS8g7bpJWFHJEkkl5Q9AYwTsOV0i105prVHANixgO3r3VCs0QnutNEeHSDP05XShh244K0/p0O5FHcl1EdA7xI9R2d3UiI+UbBQKWTRO+B2xByPcKeMY52O611+Sg0SGOxjhE2wd1HYdt+yK12cBdkbQ9g29fqnFwaAScpbY7ZQi4A+6LEGa7O5GVkOP1JQmnOM8Hung8gYwixUPdnOywA0uDtIy05HsmB+cjO+FkHt3TsKHEnOSSmSDnBynOOOOUGV+4GMfdIaBvcRzv/RNOT2/VZkx6e6YThuMoOqGkjPO/wCqzkBv7phPcbn2WHHO53SsYVo/mPbKFJ6/+BIP+iY8jPPKTY0jBJHdJDkLg7bj6JLmxnLVgrKwvLG6bHpva90uf5j+xV5op/MY3EbHZc/tEnh3SmeO0rf3V4qGOZL4ozz2Wr9PlUH/ALKO2rkiXVsdls0e72Ht3CmQyiSJrxvsoNLOHjSTv2ysteYJg0bMkO3+l3+60k65KTj6NmzH5o8ZwFDjcDwco7XD0xlSJkbRIJGAQhlwB4OU0Oz9fdIuyNt07OaHB254T2u7ZQc9wUtR7IsKCl2+w/JZ1HOMYQy7AzlY18nsmFBXHg/+0GTcauPZEDhjOUCU5PO6VjSMPJGN0PUT6LDiQ3Y5TNQzuErOkghd75WM7YAwmB+ThIvHABSsZknG+6G9+2wwk88ZKFI4bpWNIRcfXH3SQXOyf9klHY/E5wsJFYXmjbNj0/SOq7nEBnTGQ9x9gVfSA75gq/0zA2ltoqNi+bzH2HYKa+vdnSGra04LHjt+zO2Jec+PRLfGyN4J8qPO0SQ4J2cMZ9D2KiQzGdpilAO2QUSmccPhccgbgq2mnwVn+SVRyv8ADHiDztOl3pt3Uprs+31UKBxcHBGa/thdro4fZMac7fukxxzuUBpzj0SJIdyurESScnf90teNwgSHGFlpIbkosVBHOyceqYCSTwsOeW+6ZqxuUASWnbJO6HKccBY17D6Jkmcn2QCGl+DgIbztssPdsUw4G3fC5s7RnX7rAk3OyY7YZTR9N0hhdY5QnHOfRLKYTvjCTY0Ncd+Uk4t9ElwFn//Z</field>
-      </record>
-
-      <record id="base.user_qdp" model="res.users">
-          <field name="name">Quentin</field>
-          <field name="login">qdp</field>
-          <field name="password">qdp</field>
-          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gOTAK/9sAQwADAgIDAgIDAwMDBAMDBAUIBQUEBAUKBwcGCAwKDAwLCgsLDQ4SEA0OEQ4LCxAWEBETFBUVFQwPFxgWFBgSFBUU/9sAQwEDBAQFBAUJBQUJFA0LDRQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQU/8AAEQgAUABQAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A/VHijilpCcCgA4qG4ZRyew7Ul3eRWkZeVtqiua1TxC9yClsMKRg56kGha7AeUaL+218JdW+LF98PT4lFn4jtbo2ZF7C0MEswODGkp4LZ7Zr3iORdoO4MD0I71+XPjHwH4el8ffErwzrumRXUFxrstxHfR/Jc2zSKrpNG3XgvnHQ4r339l39oTUJfD3iLwl4y1BpfEXgyA3L6gFJOoaeFwkyju4VcNjvj1rsqYZwgprY6J0WoKSPoX45/G7wx8CfBF94j8RX8MQijb7PaPMqSXcm0lYowTyTjFfnbZftOfF342ftLeFtJg12XS9L/ALUgF34f0aRBEipIWdWlyS42clgdp5GOa474jfHzWv2ifi5qt8PB0c93aWpTStL1cY+x2wG5pXEmE81wynkcAhRX2h+w1+zj4U8H+A/DvjqGFLrxNqdkZJLjcWWFHbd5aqR8pXAUkd1PavIvVqS2tE+gjhcJhMJ7es1KUlpboz65s8EDGMYxxVniordCuCcE4qbtXWfLK/UKr3d0ltA8j8BRn61OeAa5fxTdlnW2B4AyaBmPqF/LqUpd247KOlQYJwBydwK9yCO4Hc01eAKZPKsMbSu/lpH+8ZvQAgk57YxTjordwaPzd/aDk8Wah+0B8QNQTUIPCum2U9uFs5kSRbsLAuHd8/KrLt4HPNcNL8ej4I8ZeH/EvhmG4g13TF/4m0bWZbytPcqJ1kR8BjjBTg889K7z4h61P471XX/Elkj3Eeoav9uiRGAM1vE+yMqCQG+VAwH06ZryrSo9Y1fXLTSpbzV9ankmlk1S+v4ZdkcDRGN4t8nJZiUbA4GFI7mu6rXq0nDDtaM3rYmpTlChy7npHibVW+LPjTVfiTdx3PhZ7zY9pb2kgjlS0ijwDMcEMzqMt2GBjpX3r+zbFc+H/gv4ODho7mSwS4dGGCPNJl2kdsb/ANK/Pb4LaLqHxh1vRPhfEsrT6fKYPElzhgIrCF9vBxy0yBVHsSelfqHHEttEI41SNEGxY0GNgHQfgKrFSjCKpwR04ieipvod9pt6t/bJMgGDwQOxq5XI+Gb37PdGDpHIMhfQ11oORXnHngehrhNckZtRmY8kHAruz0NcRrsRh1O4zyHAK8dD7UAc/reu2PhvR7nVNUuoLCws42kuLqdysaKOST3HHP6V8afGv9oLx78TobnQvCtrF4L8I31syPqmooTqV7AwwTHD/wAsVZTxuO7Br0T9s7xzF4VTwRZ6phfC13fyT3zOMrcPCheCJ8cbWcg7e4T3r5u1/WPFF34n0G8u9AuLLSdfe5l+3amfJmlRRy6RYDAEsoDEY5yBgV6mDo0pazep6WFoQm1KbEGnW2mx+H9EVW+wvOkEsanyzJGkLtsLDpuKKmc/x8da4HxB451Wzsp9a1jQLDw59gnSK3gtrL7OVHm7BED1mLLuyfbmu/8AEMsV0bHS0sF1fUdTnENpYOwTewOS7P8Awqq8liOMVws/wx8LWmry6xL4h0vxamknz7izs7u5kWz+faXHmNtk2k56AYFeTmvJTzCmnUsjwc2XJj4KVS1uh9dfsaSaXZeJvHNvDYR2+pXYtdQNwUAd0wYivrgbRx/tV9T53dDkds18efszXMlt8bLRFBKXel3EWP75Do/H4V9huGXOcZGenYelduLShUt1PWxCSno73LNn+7vYHXhgwxXfJyK4LTkNxe28YPIkyfp1rvVrkORC1zniqzJRbgAsV4IFdGeaingE8ZR13KaTGebXWn2t5BGl1bRXESEOqTRiTa394E8ZFfHX7Tl+b/4/W1t5h/4lmgxskbdIzLM+7/0Bfyr7e1fSZNNcuuTCcngZx7Yr8/v2vbmTwl+01o13fAxaV4h0VbS2uDwn2iGR22E+4fvXfgnD2seY6cM/3i5mefa9ol0fEGjazYxxXU2mpcW8lpM5QTxSxlHG7swyAK881+yuLLTG8JeFvB+sQapru6xgmvLqOaOOJiGbaU5xx36c8DNeq65rll4f0+W8v50htogWJfnf1wo9ST0A6ng8GtX4Q+E9a1/xDbyrbB/FutR740ckx6Tp4I5c8YPOSByzHGcCvL4mpYeElOOtR7LoePxJDD05KpBXqvYq2nwr8F/DfTtPvviBrd/r3iURCJZ7XUJLVLc4A2QLCQTjoTg+9e8/sl+OtX1bxv8AEHwnNq1/r3h3RPsr2FzqchmuYPMDFoWkOCwAVThuRml0z9jy9hmle48as09y5abUo7AG6KFiQFdnYJgNgbVHA6Zr3T4PfBfQPhvpEumeHbF4Ip5/tF3eXDF57iTGC8jnlyf8ivAy3DY1VfbYmd/LoeJluHxyqe1xMvkeheF7HzJftDdY+Aex9T/KuqBqvbWqW0SxRjaFFWAMCvpdz6oWkI4opaAIZohIpDAMDxg18Kf8FEPhrpXjfxJ8MdF1JLiPTp5b/a9tJtaOVYQ6kHB/u96+7pBlfSvEf2qfhDf/ABY8Axf2FPFaeKNHuU1LS5pj8nmrkGNv9l1JU/WuXEwqSpSVJ2l0OPFwqToyVF2l0Pz50b9nvwl8OVk13U77U9aXTlNyg1S4DwxbRkHbjBPBwfUDj1+0v2UfhXfaf4I/4S/VbXb4h8TBbuRX+U2tsB+4tx6BVO4+rOfQV4ToHwZ+JnxT8WaP4a8SeDrjwn4cgukn1m8uLqORZUQ7hBDtOSHOMkgcD3r9C9Ps4rSzigt1EcMahUVewA4r5/J8Ji4t1sc+aXQ+byTB4yHNXzB80uhmWnhYbxJcMHIP3V6GtyK3WFAqqFA6YFSquABS19Xd2sfXrYMc0Uv4UlIZ/9k=</field>
-      </record>
-
-      <record id="base.user_fme" model="res.users">
-          <field name="name">Fabien M.</field>
-          <field name="login">fme</field>
-          <field name="password">fme</field>
-      </record>
-
-      <record id="base.user_fpi" model="res.users">
-          <field name="name">Francois</field>
-          <field name="login">fpi</field>
-          <field name="password">fpi</field>
-          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gODUK/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxERExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgAlgDIAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A+hI4anSEVLGlTqlXzkcpCsNSLD6VOqVIqUcw7FdYqd5QqyqUoSi4WK/le1HlVa2e1Gyi4WKvlUnlg1a2UhXvii4WKpjHpSeUPSrRX2ppWncLFYxj0ppj9qtEYrJ1/XtF0GDztX1G3s0PQSP8zfRRyfwFFwsWTHUbJivLPFPxx0a03RaDYS38nI82b91GPcD7x/HbXk/iL4n+LNYZxPq0tvE2f3VqfKQA9uOSPqTVJCsfS+paxo2nhzfapZW2w4bzZ1Ug+hyawNQ+IPgqz3CXxBaOQOkW6X/0EGvlWa+lbJLZJ5JPeq8l6TzxnueaYcp9Rj4n+Bn3n+2cBDjJt5efp8tVrj4p+CI1kP8AacrbACNttJ8/GeOP54r5fe7cg8gA9hUL3JPH8OehFHMhcp9K6T8XPCd5G7Xr3GmkYx5sZcN9Nmf1FJefFnwbFKI4p7u4yfvRwYH/AI8Qf0r5rN2p4wVx0xTHvMLwSW9TRzByH0hc/FjwZGQBcXcmRklLc4Htz/Tiud1T406LE+2y0i8uOesjrHx68bq8HmumYn09KqyTvnOafOw9mj2jUvjU32iP7JoSLCDmTzZyWYcdMAAHr60V4ZK7Nkk0UvaMPZo/RqPHY5qZMV5pD9pIGS65JICyY/StC31LUbdwn2qQYGQWYEEfQ/0rzli4vc73hJLqegKBUigVx8HiW74LRQMoPJGQf51b/wCEqjXbus3wT1Vx/WtVWg+pi6E10OpAFO4rNsNVtbtB5UmGP8LDB/8Ar/hV3zBWiaexm01uS4HrSEj1rO1fWdN0e0N3ql9b2cA43zSBQT6DPU+w5ry7xX8dtCsWaHQrOXVJB/y1cmKIfTI3H8hTEewkiqOsavpWkW32jVdQtbKLs08oQH6Z6/hXy34n+M/jPVg0cN7HpkJ/gs12H/vskt+RFeeX2p3V3MZbq5lnkPVpHLE/iapRFc+qPEPxq8F6cjiznn1SYcBYIyq592bH5gGvPNd+P2tTMU0rSrKzX1lYzP8AnwP0rw57hjxnmopJiO+KpJBY9Pn+JHxF8RtJbWmp3r4UsyWcSxlV9SUAOPxrg9Qvrx7mVrtpmmDESGTJbd05z3pPC2uXejX017ay7HSBiOAQfwPB/HsTXSeKdYx8NdJlW1gS81qSWS6lK7nIVwcAnpljnjnj3rCdWUJqNtGdUKEJU3K+qOMe5LE8/nVeS5z0NUXmOc5qIyn1Nb3OexdM/PJqN5x/eqmzHP3qTeM0XFYtljsLjp3qPzAVDZyDUBk4OTx+lMLZ7j6UrhYnMh6gHFMd39OahLZPJxQZX2bQBnqT3ouA5idwUkDIzzSTeQIQQ7tITyMcAfWoi7YwRn60wjPTOPpSbuNCTFNgKtknt6UU14j/ABHbkcUUBY+1LLWNOnSRfs0si7fkZYn6+/I/rUk11GkJkXquWPmxnC+nP/1qp2sOrRAql6VDf9Mk44xxxWhFNrg35vImDjBBgX+nNed9SqX6fed/1un5kVvrylVDpHGAMKyIBkfhyRUzT2wkw8jF8HMa5Vge4wRWX/YdyZvOa4jLFs826Y+n+eazvEfhDWddkZr3xHdFCNojWMBQvYcHJH1JrVYKXczeLitkWtR8baHpanfcLNID/qkXe2fz4/HFcprXxj8QNC1vo6pZJ/z1k/eSfhuyB+R+tKfhLKQQNbcZ9YBx/wCPVWn+EFw3/Mf/AANuP/i66aeF5DnqYjnPPNc1rUdWuWutSvp7yf8AvyyFiB6DPQewrKeTABPGefwr0uf4O3WNqa8g/wC3f/7Oqcvwh1BTka3ExHf7P/8AZ1uqbMPaRPOJHU/xE/rVdmHT5h9RXpY+FmoIuJNWhYf9cf8A7Knj4cFYVjllSQqMZUbM/XrmjkkP2kO55fkMpAkOOvAqNmCjOQfxr0if4cADEbAHud/+Aqu3w5DD97cMGHcc5/l/OocZLoWpQfU4ayhkk067uuQigD9QP6/pW/4yVh4E8Mtg4jNzH+qH/Gn6lZR2Hh+5s4lZmW8WDGOSBksfwxmut/seHX/A+mxBF3xTsduCRggZ6fhXBVqe/F+f6HqU6NqT9Dxds980hJx0Nenz+B9LgcicKjZ4Xeyj/wAe/wAatweCNJKBWWDGOrT44+o+tbuvBbnD7GR5E2eaQgn1+levnwHo64drnTwAOA1zkDH0qjL4Q0aGYn7dprZUjC736+2P5UKvF7A6TR5aCQcAc0c7uBmvSz4f0mGVW8u2kA/h8o46Ut1YaU+Cmi2b4YEhS6cenBp876InkXc802Hqoxxg5pFikkkCxoXJPRRzXbavotvcPG1pZRaeoB3IJ3kB9/m/+vUK6HGcGabzNvZySF+gpqTauDikczFp1y0ixNGI5DjiZwnHr8xHFTX2lPaFEnvLL5lz+6nWUA+h2Zrbbw/aGVnFywU9FAA/z9KtfYrSKLy41xkYyBz+eKNe4tF0OUkggfLfa49wA2qwYAnvzjFFdBcWcckex2UgDCryFH+Jop69xXXY+mY0lP8AHg9uKehm3bfPB+i4BqvGDkqWB44JNSJLtX7zD1JHFdaOYtLG6/N5/HU4p7Bv+fjI9AAarpMjEYZZPcLkYp7SRK2RJnHXAwPypiJVAUHMvOPb/CkKsqBjMwHuMfpTXmxHuLZYnPP/ANYVH5u8Bg3HoP8AP+FK5LQj5ILJNkH2qJg23/WEE+9LPOoOWQFVP905FQTT+YpCo5PYlCP51VxWGTbuu8ke4qrIDnHmn6VNKwCjcwyOoPSq0rg4IbH41SZNiCYNyS5GTVSZgoJZ+nXJqeWRQDggk++a5nxJ4i0qztblZL+DMY/ehZASnbBA5yTxihy0HGN3Y57xBBPHpcN7xi71CUD33RkZ/In866+OwbT/AA9psMqFJCjFiBxnivFPGXjy/wBUt7CzskNrawlwm5ssWOPn9AcED8OtdT8PLibYkUl35zSxMxBYk7gw/wAa8ynTftYyfdnt1aqdKUY9l+B2s0zvHsebKn19Kw73SiCZ4EZkXkCJSzH3x0/DFa1yrKQrJnIz8rDFVLtpltZFjIXjpk/XsM16M4xluebFtGCTcpziN0/2xtb8qYtwZTwp3D+HHH8jT7JeXYRyxFTgqS2CT6A8fpUd7DIz+ZvVcf7Rya4JwVzojK6LSQsRukjyP9g4qQfZgMByv15qC3bcgdV5/wBpgB+mTQ6vI3ykjHUKpH86xaa2KvcsNGmPlLSfgMfyqvOkpzuhP0H+eKI4Z0/i/IVYilcDD9R601Jg0UZI04JRx74qB7KVm3BwVxwMHitdzDJ94DpndUEsAK5jc/ic/wA6tMkx57Fsfe/pRVy4WRQc7icdOn40VVxWPaIp12ZLFuBk4/TipGuIEcEyRL6ZOCf0rHTUIwcvIxx0wcD+ZFWjeh/khUh+oO3P412nGaS3LMCYuc8Bt3+PFOV5FzycDgcg4/D/ABzWabt3UI06pg5J3KOfxzViMjepkkGD0JOfyI6UCLqsoBARnbkt0Apks8zpmKMbeufX8cVVmurKEkGQMc9ACSc+/aq0moYH7lSqg8MznP8AOhahojSWR8fvG2nHIB4qpdXqpyCM+nWsya9klYZl2H09B9ce1RmZdqjc0g54GT+tUl3IuWXvlckBnDdMYqtNeJkiOPPqfWmNIvl/MCueMlsfhVMy7M4AJz+nbtVqwWZJJcOeN65xkDaRXz74/kibxdqMcTuY2uiWXOBuA+Y4+pNe7TMzAMsjoc89s14V8Tbea18W3TSNE3nESIVPRSMAH34P1696zq7G1NWZha4D/aUMUcRVY4QOORnJ/wDrivSPAEm29szC8iu8Um8ZxjPJB/KvPy6z35eU/KijO3uCc/8As1em+AIbhnM8srmJISATnli3GPwH61xx+KKO+1oyZ2HPPJz7EVGx56inN0PcVXkDnLqyhR1OP/r12XOMWREkKpI3H8KhsAn/AD3rFuo4grLMQNpxnOOau6jdSrmOJo9mMEo3zH6/y4rJmMezlwn481y1ZJmsERrJFFMBAGdieRVzdeytmOWJE9CuTWQnlpPvklVxnoB1/Stm3VRyoQA88CsXozQmgRwvzusjDrgY/rRKm8ZctntilXeGySCB2AxSyyLgkkAd6loCk3mqpClmHuKhW4JOGcqfrjBq08ysMKykfWqU4GSG2kHn3FSNai3F9tDAruB6Y9qKqTKgxgIw75FFUmxWPV4XVIgXcx5HdiT/ADpyS228Zcybc5w+M+xAJ/UVmW5glwqlnx6gkj8jgVoIYoYh5hijQcZaTB3emP8ACvSucNrl6OeKJC4jCIw5wWz+Oef0pkksBIV0VmIx+8OQfb/Iqo1zBHEr+bIxPClZQR+vJFRGVt7lcHOM5Gc/jj+VLcGi+suxs+XZRDH8CZb8Mnj9ailvUkOBbq2B953wB+FVRtPMssUWOcKBu/maabuxiGPNZj/vqpHHfoaeguVkwkuXYlVgVR/cAGPxwahuBduysHUjPysz8r9OOagfUE3fL9odTwGwNoppuAT8yk+igDB/LkU0xpBI9yPkM2TngAHP5VEZWUeXIzOc8ZcCpDK6DZHtjLdlOP0qCZ8HcEPfHzE5/I0cxaiLNMWbocetcD488NJrWsxTC4aGVowuNm4cE/412M9wVYE7V9MqR/OsS9uDJqIkVslGUj8+lc9epaOh2YSiqlRJ7HMWPw11J9Zlsor6BnhVNxZCAwKg479jiu6tdNv9ML2U5WaVW5dc7fujjntjFa2lTKnja8m6ZhjOP+2a1o+JsLdx3AwRKg6DPI4/wrzMLXlKtaXY9bH4ONLD80F1MBbeRAzsWbHOxcgH61nahdnJBXg9scCtuSVYVLs3/Ac1zmoXImcgACvUlKyPBitSk0inPGao3MpIICY9jV84z1qGVIiSxRWx65rmbN0ULZJJJBlMqDz6VuwFdoxx7VmCWNHwECgf3avRSB0BByDSAuq+V4zUMsYdecg+wB/pTY3YcEDA6HOc053J9hUiKyW/lbgCwB5yWz+nalMfBJIyfenBjkjLN3GV6VGzf3uo96GMpzQIM5DMaKkmOeMY9z1ooSFc7V7tokzNK8fOARwPphev41Vk1eKMth53YdN2Co9eM8VnR23nPuklTH8QV8/oKt29tZRMBvLMvQOrJj8Rz+tejY5GSJfTSMNsTbm/iEfX+fH41ajS7mGNvA43KBn+WKeWit0zs8pDyV3Bs/nmmyagDjy4xECMBgQPzGf60BYcloXzkyH1YKSPoR1/KlFsq/MxOR0O09Ppmq81/tB8y7jPPcnP6Aiqkmp2bHBkLbupKFifoaG0OxoSSqjgbo3z8vHP58ZFK0z4JCvgHspH86zjfhQBDaKrHoWK5/IVWuL66l+Q3CxjP3VxmodQtIv3V3DbjMpCsRnCglsf0qg+rwsMRxOT7qP/ANX86iKwYO/czn+L1qS2giQCSQDPZc8Co5m2VawGOe5Tzbg+UgG4KWySeuSfT2rF025jOpiBnLbDu/D0+netXX7gJpkzDjI25rz3W4Xi0B9UlJZ5pRAgyRtAyS3/AI7j86yrQ5lY7sHWVH32egLqhXxa08S7422oSp6jaAea6+8vIr2yS4gckQMUdeu3OMfyrwbwPdFdXjgfDQz/ACOn17j3HrXqHhq88j7do4/eFlLxyE8nndz+ORXD7H2Uo1F0PTli1iqcqVtXqWdUnBXGWrBLtk5xmpLu782TAyfXFQ5HpXdOVzw4xsOMmPXn2qvLIwJ71MSOoOKZKYyvJFZlIoMWd+oXnn3q5akZwwBI9aqvgMcAnP6U+CTDfNnAoGzUEhIz0HenLIWGDkfSqqOHQdPw5odyuNigj64qSCV3RSCWx9TUZmVyMSKfUdaaz89Mj3qGR9vXoe9ACzMcfJ680VXlfcMKRg9SDzRRcTNiK7gQ7SFk9mmY/oR/KpDq8kWY44gmOm6QsPy7VkmUIAgQIcfwyAj8B/8AXpyXDBNpkOD2bB/pXfzGFrF2S/vGzlmHuCTj6EdKI/tkpyHkkPruyR+dRW2GJkjIDDqyuc/kARUxvVIwxkk+oBB/Hg1LaAsW1izjLrL74bp+VWG+wWgzJuDA8gSZJ+oFUcXk8W4yrbW3dlbbn8zyaqypHGxCybh2JHP5VLlbYpRL8+pSODHb7YEP8KALn6nrUKvI2QrOeex61XjVmHzqFGMYPWpwyp93avuOP61OrK0RYjGwgngjp/n1qUynoapmbjBbA9c1GZFJwJBj8aey0C92LqCpeXFvYzSNEkjEsy9RxVTVdPsbrRn0tm2RAYVtuWU5yG/Ojdv1VPnOUiY5B9SBUknyn5Wy3qeayV+Zs6J2VOKMjwl4ct9Kumu2vUupgCI/kKhAe/J61s6rM8Bhvozh4pFOV9CcEfTmqqSSox3vuGf7oAFMvZfNtZIwc5HSlN3i0FFuNRSRb1Vit7J5AQBjvxnHXmq0U0pUGRAvPP0qS9kjjZTI4XcoCjPXgVXcK64Vyp64yc1jFuyNai99lneCcZxTXUYyWqrko/3yVAxjsKckgUjY7MP4lboB7HrTuZ8qFcKrY4B+tV5WCn075qaeQBeADxxWcznozBt3IIH6VSEzRsZS+ecgd6t5wMbifrWdZSjYwxg+1WXc470iSTzJNxBUBccHPNMlO7grke9R7n9c01nYZ5z7cVKYrCEKgwqgD0AoqCZm4xwO/FFNCHoIGAw+G+oX+tSmWKJRwjn18zn8hxWZ9sLNhFGTxuUbasq8cCB5Q0knVdwwp/qa67mRoRStcHiObjujE4Ht6VMs9raffk+0PjhQTgH3IP8AKscXNzcEgyEJ2VeAPwFWIYgBzgH/AGgam7Y9EXp7uW/IeaTbgYUBTgfzp8RVBlVU/wC0vJqquxf4JPwORTt/IID+xwR/LmmtALnnKTwwP9KaX5IR8fif6VVEmTtbYSR1A/8ArUhkOeXU/Uii4WJy4J+ZgSO+c1Fc7ljzHk5I+YHFMMqsOST7Hn9aTIxweDSbKSsyc3dvG3l+QzGRNvmP1HIIx+Wfx9slA6c/Ov8A3yOKpXDAbSecHjpUgl3ryFrOPum05OdmTttYcOPXpVO5QNkZGMduPennaD/9emkZ78UpMS0I7Yzz7oJctk5UnpjFWECxkoDyDggDvUafK2VbBp38RbPJ6ms7alOTY6RWwXTBwOM+tMZmCjPLH2okYlQPMIAqGR2CjJ5Hf1pBcc0m4cgelVJXG/aFfkdewp+75jj7vX8ahm5GAAfXI61SEx9nMElB6g8Vpblxx+lYWcFiSPbHarVtc5G3aTg07EM0DJn2+tMZzUbP+NRMcg5/Q0CJJG6Hg/jRVUnAIHT0ooQWK63IgJ8pPnHcgf8A66IC80hJOSfU0UVsnqJl0FkwC5/CnCXb1z+QooqrkEizBeSOP90U6OYt0PHb5cfyNFFSxolikCsxPG3qAOD/ACqMSHls/pRRSLsJ5uDyM0vmZNFFA7DZGG0g1HDJ8vTpRRUyKWxIH9qXf14ooqWMN4x0o8w5I9KKKkBjSEcc88VE0uT34FFFAFSSVgCVJGDgc0vm5jV8dQDRRQgKsswUlQCehqe0kxgD+KiimySz5gGM55pkjEg4JFFFIkhDlU+Zi3viiiimmB//2Q==</field>
-      </record>
-
-      <record id="base.user_jth" model="res.users">
-          <field name="name">Julien</field>
-          <field name="login">jth</field>
-          <field name="password">jth</field>
-          <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAC2AIkDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD2Dwnq9n4d0C1sJt6YTk44J71pnxZochxcXO8Y4GK4e5RJI/LEwmj6hC/8qz3s7QSFXR0YdAK914GdV8/c8tYunTVn0NfVNVtra5km00gLIdxAGKpy+Jry5uA+8oQMAg1JdmzESpE8+7A6oDzVGSF5kA+xnzB/GgOT+FdlPLlPWZyVMyULpIrz6pqF1P8AvZnmboMtxirA167OnmxmjDgfccdUp0GjX033LaQe7jH86Zd6Xc2p/fwPH7noa9P2GEb5bI8361i0ufWwunakbV/tBubgS4x8p5qze+JtSkGyK7keJxykgyRWd9n/ANmj7P8A7NUsDhk72E8xrtWuVNRlnv7jz7pzJJjbk+npVb7N/s1sC39qX7NXXBqCsjic23dmN9m/2aYbX2rd+y+1IbX2q+cVzANr/s1GbX2roDae1MNp/s0e0QXZzxtfao3tfauhe09qie09qOcd2c3LaA9qg+xrXSvaf7NQ/Zfak5oaZ1CBWBPlYkPcf4UC2rfhhW5cLJgjGRsAGPariaZaxyRRO7hnyeccYryFjadNWZ6E8JUqPTVHMJBggheRVyOe7RNscjoe5B612kemeEnt133jxsD88hk5PsBUWqz+D50jhsoxE/TeMj/9dc08yozlZwb+RrDLa8NVNI46Sa8l+WSYmoXjlcbXdyOuCa7az0bQ45YpbrUEkiwS6b8Ejt070upDwqUMdsgRhyCknJ9qFmVCErQh+BX9nYmavN/icL9mpRa10U8EMrqtrbugx3Oc0+0t7a0LS3kCTDGFjLkc/hXZPGqELv7jihgpznyL7+hzwtasW+nXE5xDBJJzj5EJro4LqEguNHg3E4yc4A9hVptT1azijS0kso4cfdByR9RXHPMp/YgdsMrV/fmZf/CG6sHg324Cy4+YHhM+tOvfBt9BeLbRPFcB/wDlovAH1rUfVdZmjANwh+X+5xUQOoPjE5Q9yD1rBYvGbuyNfqmDWiuzP1fwsmm2TSTXsbzg8RqOCPWsP7IR0WuokspZpN80xkPc96ljsbAf6zP4vitqeN9nD947syqYL2k/3SsjjXs/aoXsv9mu5uItKjA/dIT6JzUB/s7AAREPvgU/7Uj2J/sqfc5KLQrudN0cfHqTiof7Ff8A56wf9/BXW3AhyAJkbHoc1S+yW3+z/wB9Vk8xqM6lllNb3AaUhLPvmJc5OCangsFiO5Fct6nk1agmX/lo/H1q5BdrEVMD+WQOp5NczxT7G31VPqYHiyKS08OahclXjaOEuH2cg+v614nbaxrFtLPapqVwYhhgCc4JHvX0Lr7JqGjX0F3dGYPbOAMcdMj9RXzrHJDLemXY4ymDgcivnM4xVT2id7aH0+RYWn7Oaavr19D0T4aa/NqGgatLqiR3c2nlHBwA5jPHOP516MlrCAMQoMcj5BXz9p1yLB7jycjzUKExqeQexr3bwnqlvqfhyyu48kmMK+eu8cGt8tzF1f3b6GGcZaqH71bN/wBfqaIDY4z9KUQoeqjNOFwAcBTz6055oweUyP8AexXqOszxFTRF5MZxliaZcG1tYPNmuIYIx/HIQB+tJ9rtuRvj3DqM9K84+Il++paqttEvmWcCYXZhwXPeufFY10Kd2duBwCxNTlR6iL6SODyY5o9jrnOAc1Cbmdvk89B/wCuc8DX0I8L2kDygSwAxkOeRz3rXe7gGf3qU6danOCl3IrUKlOo6fYdPLcFj/pDtmq5kfn97g/7gqOW9tx/GKpz39tzvkAx61v7an3M/Y1uzOH+J/jZ9KN5YQT+S1vGHnuAATymQg9PrXB+H72a+0yK/e5uHmnQSklyNmaz/AIz6XqviDWb2fToY3i+0nDmQJvjCJg+/INa2h74dIs7ZoAhjgjUgkZyBivmcfXVRt3vr+B9bleHcLLktp+LO5+Gep3kjzWEu9x5fmoDzs5wcH3rtN1x/tf8AfNef+DtQj0/UJrmZB5jwiJOeMZ/+tXVf8JKP+eSfnXq5bi4qgk2eNm+CqvEt01oY/wDwlkmf3flgfQmgeMbiNgxf5f7gjHNcPGVQcrUiOoThCD/vHNeVWz+ta0PyPVo8O0N6n5m/4l8VX2qRC2VXt4D1RM5k+vtWCI/RpM+vSnXH2oiLyUnkZ89MkgfSrtpo2sSgeY4j5zlxz+Irw6+InXfPUd2erQnTw/7qjDRFaziQSR/6wg9Setb2mXVzYBjZXDxxnrGeAff6+9OtPD8yRr5tzv7udner9xovmR7YJ3gk9c5/SohUnB88NGb1pwqQtNX8h8ev3jfJK9xGR3J4/OptOuTqsZfzpnIc8FzVaLSJggWS7QnvgVWi8MoJS76jdhR9wRP5f5kda1rY7EzVudmNHCYVO/IX7w3MYkSFsKB3yM/jWPKHij2yJ5Y962otHgilEm+6mx0SWd3T8jVuW2jl2eau/HTNYvFVJ/xHc6FRp0/4SscskssUmYrgI3qKnHiFvLOMzEfeMcZNdCLW2HSNPypQqJwOB7UfWmtjOpRnU3a+45w3L3YybW6Pfo6VVntbyTHlwTD2JOP1NdS5X1qN34OVU/Wh4ubVrhDCqGvU5iTRb6QBZVABHfHNRnQroDhoQfeuneRQNu39KgeR+cdu9QqjN9UYSaRcrlWuIwvWk/sn/p6StiUSuGPYHB9vaquG9X/Oq9pIPmQRaZZrgEF+O9XbawsbfHlwRg+uMmmxhiiqFc/SrkVtckBfLk68HZWrTOS8OpNGVA2gAVIGYgf0pLewvj85tyPYmrsWlXb/ADbUHrk1k4TH7SmiAf3TnH86UbAetaMWjzFOXQZ9Kmi0X+/IT9BR7OQfWIIzAVxxnFSg8fdrX/sqAffdzS/ZNOiHz4/4G+Kn2Pdh9aXRGSMntihAR8xx+FbA+wAj/UY+tS+dp0Y/5Zg+y5pclNdQ9vUe0GYBRieFJphicjiN+PaugfUrMH5M/glVZNTiGWCuR74FTz0V1LvXf2DINpcc4hkx7im/2feOOLf9a0X1dccQD8XqF9XfP+pjH41Pt6JfscT2KX9lXhw2ET1BakbSJTnLxj6GpZdWfOB5eeuKrSapLyxdMZwvFNYimL2FcU6Q43bJo138njqaZ/Y8v/PxH/3waY+qS5ZA4JA5wOlU/wDhIJfST8hT+sQY/q9fujdGp2ygeXDIfySh9V6YhA+r5rmI5nSAvKwcheCCc1JbFcFRNN5jjI4rN1qz3ZssLQXQ6H+03b7rIPoKjTUJyTi5cY6YrHgeZJOWcDHHpUkqf6Mdk+zPR85rlfO92aqFNbQNgajdnpdSY+opDfSuNzyye+TWa8beXGvySdzgYz71IgidSd2z6kUWb3ZXuLZEmoavYWEAm1K9gt1zgGV8Z+masxXMMo3xyxn3HNfMfj3U7zXvGF0kkgISc28CB8xoM4GK+ifC+nvpmh2diW3tHGPMf1OOa7cRgFQhBt6s5aGNdebSWiKfxIGqz+Db5NHkcXYG793w5QdQPfFcZ8B9fu7q21GxvtQ8zyiGhjlfLj169qo/GD4g3VtqM/h7RmhjWIbbm46uSR9wemPWvH0lcE4JUnrg16OFy7nwzU9L7Hn4jHqnXTjrY+u3lbBKvketQ+YSMyPj3NeX/AfxBc31pdaFfPJJHaIJYHP9wnlCf5V6dKzyQbUiAXuMZNeVXw/sKjps9ShX9rBSQzzf3e/dsGepqORyqDk7uvSnPvkx5bGONDy5xz9KquY5JzEJTIqcnnj8TWfIac4GRfvx4JHBJ7VCZBL827Izs9OfapOTudFQR9veoZdqyb/N4x0HOapJCuOJJBG+KPBx5hOc1N9p/wCnxP8Avgf4VTH7w71TZHn+M9TSeXN/s/m9Hs7BzXJ4jJ+8SYeZySHqO0WAyEFjBN1QEkACi485fLWPzkLkfPgHj0pUmcSSwzSHahGw7OuRWvJoRzk15aedErQuUlyCcHrT0EqSx25ijGzl+elRnaLcKHeTByRnH8qnB3n/AFO8bMBw/T2rJpheIefDFdtmaNFcfxtsH0ryf4u+NL+21htC0a5FvDAmLmSLrISOn0Ar0zxBq0Wl6HeX93s8uCBzzzk44H54r5w8Q2rW0Fk9y5N7exm6m+boHPyD645/GvUyvDqc+eZ5uZYhwhyQKdncyWt3Fcw4EsTh0JGeRX0N8Ptf1rX/AANLqJ8uTVAZI4QE2I7jpmvm7OOtfQfwPfHw8iSPBYzSnBB6/Wu/NYL2anbW5w5XN+0cL6WPCdTN2NQulvmP2sTP5+efnzz+tVwwPei+d3vJ3kbcxkcnnvmog/0xXppaHmt6nsP7PT2xGrpv/wBLPlkIR1T/APXXq8iAJseU5PJxXhHwHmaLxrJEkyJ5to6YPfkHAr3FyI84kR+fnKfyr5rMadq7Z9Jl1S9BDn2YCjftHAQ8D65qKQ/ugkZGM/OSf09qbuYpukbd7JUMnlu/Kfc6d8E1wpHbzDpD5hALJgjIH+AqGT5YgIkTdgnlOlDybOVBB6ZHWoZD8jIHKE+vrVqBPOPzkjEuc9ML39ai87/bH5Gh3AIAyVHRB/WovJuP+fz/AMco5Bc5OJZdnIIA71J5nK/P3zz3rNE2DJ5jlACQRv6VIsvHDEEe+Qa2aITL4mXODIPoRUvmqenb8KzkuMgjgntSPdbIDNITtjznjkAd/pWXIyudHI/FjUFv7nTPDfm+XFITc3z5+5EnPP615Hr+of2nrF1fBdkcj/u0/uIOAPyxWp4w8RJqesatPAv/AB8OIUcdPKTsPqa5lywHbPpX02Coeygrny+NxHtZu39f1+pIDzXuHwEuXfwndW5J2x3Z79MgV4Pl+Pmr2j4KbrWw1ez3xvJHdJn0OUqMyV6BplbtXPLNdiNvrl/bvkGO5kH6mqRrT8Yyeb4r1NwQc3L/AHOlZOa66fwI46mk2afhjVH0fxBZapGxH2eYE+6d/wBK+moruOaCOWFx5bgMjgZyK+Uute2fCTXf7S8NJZzN++sP3RO7GU/gP9K83NKF0qi6Hp5VXs3TfU78yb8qXH41DvDfN35wfT3qpvHlfvF389x1pJJXALgA+9eNyHtXLDttHTg96iDjHrnqc9ahkkOeWIOemcfnUUhYoVD49xVJBcstL/CDTPn96qu6jCI5/GofOf8AvD9abRmmPDhE5wPqetIJXB4TA9TURfcP3bAjBA45z6UIfkBkMnX866LaGXO7lpyxQ/PsYe9ct8SNebR/D8cNvN/pt4DEMcfJ3NbssnlIJZv3IPygFsmvMfjEkp1m0nDSfZng2xhz36n+dbYSmp1kmc+NqOFFtHE9KZRjI9aCDwOeOte8fOCBg5KjqK9R+C9w8Oia7cOxEMYD59whrgPCemnV/ENrZ5AV/vk9ABmvUn0Gz8O+BtRgEhnlMMjvMDjkj6/hXFjakLeye7PRwFOd/a9EeQu5Z2ctkuScmm+uajQ4wKtadAt1qEFs3SWQLx712PQ89akOa7H4T6l9i8T/AGRziO7TZg/3xyK42RXilkifqhKflT7O6e0vIbmFsSROJB9RU1Ie0g0aUans5qZ9HmU9A4H1Bx+lRSFg4cYfH3cdqqW1+l9p0FzFs8q4hDI/uRT0hhjEWJpptiZcykIZD/wAcCvmrW3Pqee+xPiYgOUKJ603dn5mJAx6dKqT3sSbUuJkjPQRjmmS3UJTcLjEcZ+cjAA9c0kmDaRZMo2ZEvPaq3nN/wBM/wAjTJJELl9+9fLGwxjJJJ/LGKg82f8A55W//f4f4VdiLl/zGeBlLDOfl396WfzZEKw/JKBkxh8Z/PiqMl05tIr3bN5OM7OAQcZ5B71Kl3ZyuJoZzNA8eUORz+XcVrsjN6suReXIg+0lxM68ITz7j8K8V8d6o+o6/MguBNBbEwwuBjIB5OK9I8SaqNG8PXd55qGaeMLAM5y5GMj09a8WJ967sBR1czzsxraKmX9Dthe6lFCx2RjMkh9EAyf5VUnlMsjynguSa2NMD2Hha+1I8SXriygOOo6yf0FYLliMIvOcV6MHds82atBHffBgomt3sxRCwgCISOmTXaeO5o28L6ixRH2QEZPJBP8AWsf4WW88HhuFxb7BcyPIZeDnsB7dK3PEtpdato11p1tJHD5qbSkg4znOf0rx6819aue3h6b+q8p4ZnA45qbT7hob+CY4HlzI/Psaua/oWo6K8cd/EieZkoUfOah0OKK51mzt5hmKSZEf6Zr2OdOF1seJyNTs9y54xgW28S3yRDbG8nmJ9Dz/AFrJjDyyCONN7PwoHUmvRfifots1kdatYiJYykcmzps6CvPbC5axv4rxeWicOPbms6FT2lO6NsRR9nWsz2fwBZX1j4agttQJGCSiddgPOK3jbKY48TcbskH07Vn2l959utwFmjilAIdIySfcD9M0+5uLeYNEXnSQDIAbgemK8GfO53Z70ORQsuhJJZ2jyCSWINJH3I5+tMfyPkQs7kkguQAPpSJKpgHlrMe+NmCarb2uF3PDG5yAgHB+p9h/WqgtWKbVkWisbhnkfzGJxkjj/wDVUf2dP+ep/KmGVI3CTYhzwiDO/PsKm5/55T/98GhtoEk+liGe2ubu0ktruaFIzJlQBjZkDgn+vSlgtnt5XiiuYS2Ml40CE/Qd8E57cUFJdg2yfMODjIxUWqXy6VZT6ldND5caZ/effc+g/GtLu3IZ2XxnmXxI1ea+1n+ziCkVk5TZvzl+544rltjyMEjXe5IAA75p93cS3NzLdS48yVyx/Gul+GWi/wBr6+ZpYkktbMCSQSdCTwBXspKhT9DwW3XrepJ8Q47bT00nRLfINtah5zkEGQ1yaI8koSMHL4CoPWtHxXdC78Q3t3Dv8rziI8kEhBwOlS+B7f7T4ns0OMI/mHPTjmiF6dO7Km1VrWR7LpVl/Z+lW9nFzHHGI8om/wCfHIJ7H61FBdLKPNhYSHnCCTvn74yKjkLxygozvNJgO285x1yB/n2p8sW+T7fcTJgjAI+cuD39un8q8K122+p9Bz2SS6HCfFu9nuLmxSaCOGQBz8gweccf/XrlPDgeTXtPRB8xnTg/Wug+Kohj1i0ihQD9yWc9ySe9Yvgof8VTYs+co+cD2FezQSWG0PExDbxWvc9c1W5W8srrSikc8ssZEgiHlxxZ6D614ddK8cslvJwyOVP4V7pblLsx5tgAnzmFxg89815X8Q7H7H4qutqMFlAlAOOh61z4F2bgzpx6vBTR3Xw21D7X4XWF3fdaHyiU4OO34100iohXZHHCw5OwA5FeWfC7U5bTW5bRGAW5j756ivSL/dLJFMHEcicb+enfj8K5sRDkrW7nVhZ+0op9i3HHFFl/3xYp9w9T+HaoZDc+fCqPGkWH84OfnH9zHbr61XJlfEqSImD8hGf0qR5H52Yc4xkdK5etzp3ViQzZnLRtNHgBBITkkfWqXkQf8/t//wCBr/41JBJcrE1uPLHzjJ7kfWmbf+mMn/j9ElZji01qPf8A4+4yoHnLuwx+6c+orgPipqNxPq9tpROEhTe/913PfFFFd+DSdRXPOxkmqMrHEZwMmvTdBFz4e+HN5dILd5Z4/NDgHKh1wv4iiiuzGawhfujjwWk527M8x3lgc9T1rsvhFHG3iKeRkBEdscDOO9FFaYr+CzHCfxkek9cxqdzx43MRt9OR1yfrT4JSI920d93/ANaiivCex78Nzyv4nSb/ABTIqjAWBAKoeC5fJ8T2Dtk/vOcUUV7kP4HyPFn/AL18z2kMrxl9u0ZHArzX4tR7bqxuicmRCoHpg0UV5eC/jI9TH/wWcho85h1W0nVnDLKnQ9s17ZKdyFzyq9Qe9FFdOY7wOXLdpjJn8vllDeYQD9M4qC3mV4UeNNiAlUXPQA4oori+ydy3JC+1QFGGLZJpvnS/89WooqDQ/9k=</field>
-      </record>
-
-      <record id="base.user_ngh" model="res.users">
-          <field name="name">Nicoleta</field>
-          <field name="login">ngh</field>
-          <field name="password">ngh</field>
-          <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/4gv4SUNDX1BST0ZJTEUAAQEAAAvoAAAAAAIAAABtbnRyUkdCIFhZWiAH2QADABsAFQAkAB9hY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA9tYAAQAAAADTLQAAAAAp+D3er/JVrnhC+uTKgzkNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBkZXNjAAABRAAAAHliWFlaAAABwAAAABRiVFJDAAAB1AAACAxkbWRkAAAJ4AAAAIhnWFlaAAAKaAAAABRnVFJDAAAB1AAACAxsdW1pAAAKfAAAABRtZWFzAAAKkAAAACRia3B0AAAKtAAAABRyWFlaAAAKyAAAABRyVFJDAAAB1AAACAx0ZWNoAAAK3AAAAAx2dWVkAAAK6AAAAId3dHB0AAALcAAAABRjcHJ0AAALhAAAADdjaGFkAAALvAAAACxkZXNjAAAAAAAAAB9zUkdCIElFQzYxOTY2LTItMSBibGFjayBzY2FsZWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAACSgAAAPhAAAts9jdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//2Rlc2MAAAAAAAAALklFQyA2MTk2Ni0yLTEgRGVmYXVsdCBSR0IgQ29sb3VyIFNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAAAABQAAAAAAAAbWVhcwAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACWFlaIAAAAAAAAAMWAAADMwAAAqRYWVogAAAAAAAAb6IAADj1AAADkHNpZyAAAAAAQ1JUIGRlc2MAAAAAAAAALVJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUMgNjE5NjYtMi0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLXRleHQAAAAAQ29weXJpZ2h0IEludGVybmF0aW9uYWwgQ29sb3IgQ29uc29ydGl1bSwgMjAwOQAAc2YzMgAAAAAAAQxEAAAF3///8yYAAAeUAAD9j///+6H///2iAAAD2wAAwHX/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAEGAMMDASIAAhEBAxEB/8QAHAAAAQUBAQEAAAAAAAAAAAAABQADBAYHAgEI/8QAQhAAAgEDAwIEAgkCAwYFBQAAAQIDAAQRBRIhMUEGE1FhByIUIzJxgZGhscFC0RXw8QgkUmJy4RYlQ4KSMzSDorL/xAAbAQACAwEBAQAAAAAAAAAAAAADBAECBQAGB//EACcRAAICAgIBAwUBAQEAAAAAAAABAhEDIQQSMSJBUQUGExQyYSNC/9oADAMBAAIRAxEAPwD44AzXqk+nSuhG4PSlsbsDXaOED64/LmvS5J5J5rtIJZGwijI9TUlNKvXAIi6981HavJeKlLVENiM9TXPU9OKJDRrs5yEHPc1y2k3C874hj/mqO6ZMsU/cgIxU7gfwpwKkudnDVKXTJTwJrf8AFxTq6LOSCtza/jLXd0iFjYLZcEblw1d7G2eZ2JwKMjR7kn5prJv/AMtezaRcmNEW4tQg6KJAar+SJd4ZJWBcfpXoUkCpf0R0mZHYEjuOQalW1qM8pwe+ataB9QWsTnkBjzUhLOc87G69jVw0ixslGZ5UdmXhVUcGiNzprpB9VCvIyAEyaq5UXUEUT/DZduQDk9jTT2F0FzsyParJdQ3S/Zhb3JWmFklVwpVQD14ru5zgVySGVT86EfhXAXIq1vaxz7iqqT354odfaQyndEuARnGalSK9QMAM8ilzng96eaF0bG1gR7VyEfrsJOasmRTOAvrivMcHNPGGQ9EauRGzOECMW9K6yKZwo7mnrUYuYzgY3DivWt7joYmHPpTsFrN5isUAUEE81HdE9WglK2ZGOe9Kuzt7DilVbKng0xM5xwacTSYc5Iqr/Srk9Z5OOnzmvWurrvPJ+DGqdJfI3+bH8Fjk0ZMbsEE9+a6jsdRgA8ibcOykGq4Lu6I5uZj/AO410Ly8AwLiXH/Ua7pIn80PZBu9lvYxi4t2QH+oAkftUItvyVfd7UPN5ddPpEmP+o0ypfcWy2T71ZQoFky34LFpmmT3zfUx/L3JqyWXhYjmcqB7YqiWt9fQjy4LuaMZ6KxAorp93qMsh33tx5acsS559qXy4py8Ma4+fFB+pFm1Gw0vToi0rbmP9A61V7y7R5Asa7Uz6U5K11cvLLvd8DO5jnApswIAHcknirYcPXcjuRn7fyRQxJIIHBp9HOdvH4GunJZjhFX7hTlrDuk+sJUH070fQmE9HtZp8NHJ5bZxxknFW2C0+iwebNKwYDjeRk/v/FA9HliiKoqqGzgl8E/saf1O6eeEW8bgIPtMCf7/AMVVl0iHq+o26uUWQ+/TP5CgVzcQvJ8kbH3p25hhz8gLEdWPQ/dUCXO/CgjHrUJEStD8dx5ZPDj2WpsN4oK5Y5xzuoSQcc9Sea6WYouzG7PbFWoqmGZrZZcScH0IofPbxGRirc9+K4t7l42HzEqPWnbiYuvmHIznkVHVl1JDTwSqAyHIz1BqNLHMreaqsrg9RXbPN5TAOeD1FNGe4Az5jHIrqfuVlJEuK+MoCPw2PuzSG5m6E0OILNuOc+oFP29xMh2iQ7T2NS40Qp2Ek3bRlqVeIPlH9qVUBWis+U+cHg139HlK5GMU5blpC25wMDj3pku4GCc80d2WHVtZDgAA596mWGi3l4dsGxiO2eaHBn6hj+ddpNMjhldl9wcVDtrRaDipeosEfg/VGOCYo8n+pqfTwNqJwTc2f/zP9qHWniXV7dQi3LOno+CKen8SXUy/OCh9QaWaz3o0IviNb8hCPwNfLuL3tmq9T9Yf7VzDYHAtIGLgttJUcn7qj2Vxc3aSDzdzOQoB6D3qz2Ma6ZZi9+1M2Ut/XPdh6Yzx71W5p+o5wxP+URJrKCyiNtGitLj6znqar12QJmBKgDptoxezEiTMjLK/Vsf555oatjO4+rhJHXOe3+RRof6K5FuiMhaThEU+po/oWh3U7+Y2YoSMkkct93pU7w9okUUf0m4ZVRR82epJ7Yqw2q/SZPK3eVABwgwC2PUkgY71ZsrGIKWyWKMGJERS3Dn5s/3obqEZdst8xHHfj7hV1s7e3uyYxIJJAcEqMAD24wKE6zbRRS+XGS23r0OeBQ7YekUmaGUMSwwPXBqFJH82EBb1zR+9tsqX6HPAJzUFrRgTxjcM81ZMo4MFPGUOcH7yaSxytjCnn0olHZM822NQxH40VTw7qDxeesBKeoPT9alzSIjhb9ivxFAGRiwbuCOK5YAJuwD2/wC9G5NDu/M2vE498cVzN4fukZQjA54wM8VH5Yos8EvgFQW6yRHYVYkcjqaizw+U5TYxGOKJfR59OuC7gjnBxnmiMUNvfwllH1g/OpUk9oE4OPlFUWCRzlUJ7dealR6VehPNaAhF5JJFdahbywPnyyoz+tR47i481VMjbScY3VzZFRS2T1L7RtBx2pUgB70qpsBaKuBXo5pDjivVFMlhKM9672tn2rxB8xx2qy6TpNtc2MUsqncwJ4ah5cscatjHG40+Q+sUVzYc9a9VG6A9autt4esZCAY3/wDlRSHwppfltJ5UgKjPLUnLn406ZqR+gZ2uyRV9LCwhFH2iMsSOKLSztLIhL/ZOE54UdaESMFuZFHyopwOalW6GacQxE7mYAEHgUX+toSd4/SyRbp5+6dlYqN20Due5/KjXh7Tllld5nKQj7b9QMEfL+eAPvpWFtDNfiztUjwifKxPyjHU/f/FE7nZCy6db4AfDPt/4ccfp2qzkvAOMXJnsoa5kjji2iIE+Wnf/AKm9vSoZlaa5aygRpTuCts7t7e1P3F5HGkqwgebIuxGPUL3qDHqJ06L6gKHJ5fuPWoRzVFx0K2gsoCrTA3Dg/KG49Mf3Nd3lmJIdyLsJGSyJye2PuqoaXdmW8DzXLKpI56EVoGl3EE0axQkZU4GDnI9a5o5Oil3em+UX3KQM/MWGSaHpp9xdXUcUSl5mO1EUflWj6jZq0RTyUbOSDnkmr78EPAMT3q69fRB1RsxK44LcUGclBbHMEO7Bvw++EEdrpqXmqpK1yyhvLwueQOOatcvgi1lZYYLWTC8lpP261rLWoIIyDzycd6Ze0jUg7Rke1ZmTJJvyaePHFGRXfw6tpSsbAoAcll7+woVqfw+t44XA8117A4zW13UC4zjg0Lu7YMGz0oX5JfIdY4s+dfFfgq3ksTDb27gjk5FY9qdjdaBqflNxg5FfYWuacjo20c4r5/8Ai9owMxl2gEGnOLmd0xLmcZdbRSp7WLUrbzo8F2+0B61V9SsntLsBhgBvl96sXhWaSK72bj5Z4x2zT/iG1hnE7qAhhO4YFafYxXjTRXgAe4pVyiqyBmK5PXilV9CvQq3WulrlRxXQ4+6jFT2Lhzmr94ci3aTCSO1UKMZJzWkeF4z/AINbn/lrP+oS6wPQ/b0O2cMabagkcZqfrNxa6dpMrSsN7KQqg80R8KWH0y5SLBycAYqh/FS11Ky12WO6jkSIk+UCMcCvOcZR5PI6t+D1/wBT5P6fHcktsqZk3MWJwck4qTa3TWjGVCGcjK+xocHyBnO7HJFdx5GWG7kYGa9aopKj5vKfeTa9y3+GJDGrzNNljkFu5z1/TP51IurwCVplJDuSEOecetBLS58m2jQYXC4OPfiu0k8yQc5C4FBkt2NRaSoJTTMoMnb+n+aGSvl8t8zHp7U7POWOM4A7VFjbc561aKYOdBGxDEjzD8vcDqav3hy5MUKJGxXOAEUcmqHYxZdQCc461uPwc8A3mqFb+8jaK0wCueC//auyTUEFw4XNh3wF4WudXmilmTETHOSMjHoPWt30qxi0+2jtYV2qgxUbRdNt9Ot1ihGCBj8KMQqSM1k5cjmzUjBY1Rw3A455piU9TU5k46VCuIyMkUKUdF8bRHn5ReaH3KdeT1og2emKjzxEoTjvQfA3BIrOqKcHAFYz8XrTfZF1Ugnrj7ia2zUkYZ44zWa/Ea2LaPPIE3lUJH37TRMLqVlc6uDR866fBFGeWAYnPXpyf7Cu74/7jcuzMd5PT0FR7tm/x0QRkAEgZx3IGf5rzXWeK4a0VyVWI/jW4tpHnJKrRXUcbByv5UqYjZdgpVcUsC9u9dDkd65B4rpfXBxTAI6i75rV/CVuX0O1IB5XNZTCMk5revh5YCbw9YEjgxCsP67m/FgTPWfaePvnkEPD8ktlMJkGGByD6VUPjPd3eqvHez3JcxsyDLdvSvoTwV4DtdWA83I+Qtx+dfOXxZK3dxc3ds2y0iuTEqdSxyQSfyrz30iUsvI7rweg+u5sLxSxe6M9gQMoUY55waeADOAcBV6AVxEGC7sYNPIBsGPxr3DPnUUds5x6A1IhfbGBnGevNRT6g4xXUZ+Y/NkY5wKrVhO1EmWXJCqOT1qVaQM0gRQST3Fc6RYzXkrHhUTlpCOFHp71tvwb+HJv9Th1LUbUi0hwywt19i370KeRQQzhwObGfhr8NtQuYotXutMMy8GGB2K7vdvb2rb7DS/HE1usMV1pumwKuBHCuSo/Kj5eO0iVFCoqjAxwPagereP9J0iTy7i5+sA+z2NZss7mzTjjUEP3XhjxusHmQeKomcAbUI25P30Dfxb468L3ITWdKN1bjrMoyD+NDLz43acyyxwwzyGMclF6nPueKm6V8QrXVVgWS0mjScEiSSIqh9hkAMfuq9SSuirp+5ZPD/xZ0zU5lgu7C4sZDxlhlc5q+xTR3EQljOVYZBHeqHaQabNIJTaQsDyTsH+fSrhphQQKkYwq9KBOd+wZY6Vjkq4YkVxIV8v5qWoSCFCxJGKrer6qXs3it5QJCOCO1B8sKrqx7UmhO5d6g9xkA1nHjPY8Lxf0kEYJ6UJ1nwl4h1S9aRtRABOd/m4xQfV/AWvWML3B8Ql2CHCqCaYx44+bAZMkvBjogz4qkO0FvOYgH0BqH4j+XWtijll2kn34H70U092/xtxcHbJG5y3XPOc4/CvBbLqXiaCS4DGNAu4D0GM/lmtWGkYuS7ZQBkDtSp2WERSNHI5RlJBXPSlRROgCMgdqcjDMR0FN/wBIqRblcEnjFGK0SLWzZ1kKldygt161vvw0uEGgaagXnyhWART+XLkLkdPwrYvhvqkEdvZIJB8sYTHvXnfuHE8nGaR677Wyxx5n/p9Z/CyeK3iM821ESIkt6YFfDHju8b/xHq9rAZUsnv5ZI4yMcbzg47da+wPBmrwSWLwFhkxMBlwMnHTmvkP4mgyeKr6U4Mhmctzk9c9R99Y3206fSSCfXsMoZZZPkrQOeQMn3roZPoBUdTggY5POadjUtjgAE8+1e2Z5VOzouM7UzU3S7aS5nWFFzkgH1Ne6fptxeNtt4mZsE8DNaj8LPCr2+uW8k6CSY5ITGdnuaFOaihjDgc5qywfDfwGVkt3uYVaTh1i6rH/zH/mr6G8N2EFjZpBGgwq9utAdIsUsosDBkb7R9TVq0kEjJzmsnNNyZ6TFijGJIns0uh9YoYH1FANR8BaNezebNbQs3qygmrjAigY9a6ljPXFBVrwDkk9Mx7W/hDMn0k6JqU1tHcAJLF1DDII6e4o/pWgzab4UtdAlsIHWEn55Dk7upI4yKvTowBAP61H+jmV/n/ej/sSqmDeCLdgrwvoz29iwupI5NnKbD0H3Ud0+RVVcYHtXLxrDEVj4HfmmrRWdiQCFHel5y7BFHRC8c3hh08+Wxy/Ax61kureMH0uc2kNhPc3CxtIRuVFwBnO4+2eK1PxVG7Wg3nhCCMffVc1Pwl4b1y0Iu7GPe0eFkBKtjHr+VGwdb9QKcZeEUDTPG3iLU7C41C00stbW5HmKrbigwct06cYp6LxfBrWiyzJuj2Ag7+DuA5/f9Ksdn4PuND0650/S5Y1tpyWk3J82B2yDz1rOPFvhAada6jfRkowhZyAvBOKY/wCbehWUZx8mR2tyz6+84ON8rLnHbOfT2olojEX94kxYMLZ/nHUAjGf/ANhQa0hT6R5Scow3gjjBGTmpy3KxXUUkLBvpNq0UoPY5GP0ApyPgRyoA67EDrF06ElXkLj/3c/zSp97xHILLzgA8egxSolCVFDJIHepcKgRgkcnmvPoq4Hzc969dTkjPAFMWBs9iQuSc4q0+FtRbTvmdgISQGJGSD2IqswZOFAzmjOnWck8YjG7JbjBoGaMZRaY3xZShNSiaNb+Kr4WbLZykuchZAcFQR1zVI8QsqAKz+ZM5Jd+vX1NFlnh0izMMUTtKV+YsRnP9qrV2ZJ59+DyepNI8Xi48UrijR5vMyZorsxi1iWRwCATnHXFWrT9NtvIUuqAucHjJx99VeBisvHGG6mrFZ3YDQckEEZ9+aem2Z+LrZuXw98DPa6ePMtXhN1GZBMVBAUj5QPx/erP4T0iKynlnK/WtwT3AzRv4O3l5e6BHFcwN5EYRYpihTK4HHPXFcSqLfXbm3Q5VHI9utZM5tyaNvGkkmg3aoXZQB07VaNNj2r0xxVf0ZGb5nxnnpVnsl+X8KXkx1PRPgWpSwlhUaJtuKmxTKq4PNFx17imVy9iLcQbQcioQx5mM1I1G9VQcnFCZWuPKa4wUB4Ve9DyedBsSdbJV0V3Ydxj2NewSqEwuMULhtbmTLySEkjvRS0tj5YzycVRKw0kktgnxXIBp8mD1BoXpKG50uKTo6rgn1o34htPNtGQDBA70O8LqptjHx5iHDCrLRKSaEp3DEmc9+eKqPxIsoZtAvFxtLQuMg+1X27tRtZhwRWcfFi/+g+FtQkZuViYL+IxRMatg86XU+VrUyeYNpVSitGQO45/vSkAFwhjLFQ7kE9SByP5pq2aRJmyCcnn8P8ijVzBDDa2Tk4naMmRewXACn8Qc/jWnF+xi51aKy7RKxV0O4daVRp7mWWeSUuFLsWx6ZOaVHM6wUhGDwDXIiZ2UAc56V5DhkA9aP6daJDb+fcIuSOFNEnKimPH2ZFsbBlPzjB7VfPC1lbwRfSdiyuBkljhRVRS5YKWHSpX+JSSgZkKRqOFzjP30rNSl4H8ShAJaxHcX95NMCojUFgF6fh7UNvrIR20Lxgn5d7H78jH6UR0y83QXjyquxIcJz1JqZKkQ0+JeAwiw2D3H+tVUnEu4qSKS6kYJGfm7VMLtHKh9MEfhzT0tsct8pBzupicZdMnNH7WLJdWfRnwx+I8t/o8enW9tMZ7ZQoLH5PSrPYvJ/iztNKWd2DMR0JrEvg1Olpru2VCySgdBzWzyKYtbgZM+VKu4E9sHp+orNyRUZGriyNo0jRApgXHU1YrVNoxVY8PSoNoLZ9KtsP2QcjOKUmPX6UJuKh3N7IX8i3Xe57noKnSKcEiq/qUtzZ2UlzbR+YyhmKdzVVKiYpMK2tmNwln+skx36CpM6LIpQjiq1p3ikTxRmWzuELAkYAYYHXGDRW11uwlAxMoz0DAgn86Ik6Iadkf6NNEXVLmRHHKZOV+6pWn3sqbVugofpkHg1JaWGVM5Rx1GDQa+sZp33RymPByMc1G0y9OSCGv6jax2ryvIgAByTVZ8KGV9RmulRhBIM7iMZNQtSsZWuQ11cPIitkIen5UV0i5M8WwdV6VMnS2QvSqDtyQImJxXz9/tNaqIfDyWaMVkuJgpwccDk1tWrXMkEIDYLN0H+e1fKfxy1WbWPE7RwkSRWmQB1+ZvtfxRsFWC5MrjSM+t23SKJAd24ZGPz+/oKLXsrNBI7t8qLkkjsOF/z7UJ0+GQzbmBwOeala7KsejPbgfWl1JOegwa0Ek2ZMm1F2BBCJR5nk7t3OfWlUq3tmEKDcelKi6Mq2CfD9p9KuFUg7EOWJoprN3ljFGxJU4A7YqVpMK2GkrMV+slGW45xQ6K3e7vTHEpaQ/M3HQVDlcrGlGo0NwwllDTEhMZrh2RmIA6dj3qdqSC2QQ7jkDn2oeiAkYzk9W9atZV/AS08/UOjt9px8varDkNpZbODnv0qtw7YlAJJL9MDpR7c6W0MTfZOMUGStjWKVI7MJkiJDZZUUn7j/rQiSHEzDIPcYogl0W1fEQ2qMIBng4UCvbq123UjIcLlgPwrraOa7B/wWXtLyG4RvmVguD+Y/z7Vu95F9J0m11K07YPHuMEfnisB0sSQpHcAnDEDI7ECtx+GupxXelNptw4aKQAdeFaleQn5GcL1RafCOp+bMqNw69VJ6VpVi6lA3dqxWJZNH1xo2yBuwDWqeHL5ZoBg54pOfyPwdqixDnPNRmhBVlIzk09E2RXrrxniheSVplfkgk0pmltkE1swO6EAfLnrjFENOl0bVbWC1l8snsjcEfzUqRN6nPIoVcaJG83nRHy3zkkUxjleizgprzTCd14Pgmkle1vJbccbQnQfhQK98MeIoLaVxrC7EyVUpywH407Pd6to6nyrzejH+sk0M1vxTq02nNbpJFGSMbsUaXUjHxuT/5doz/xBq2v2/iRdGiuYZZNoaQopIXLH+BWmeFrBbayUyOzO2N7H9az3SLBpdd+lSAvI3LyHvV/lv0s9OkfPIHHrS+RX4GMq6LZXfiVr1vpemahfSOojt49ignqf++R+tfKbyy3NzJczfM8pLufUk8/vWg/G3X21WaXRraZfIswZrl+zvnhfwzVK0DQr6awhluYipmTdGjHDBP+I/xTMMVRszXmi5bBscfnTjIG1e54HXvQ3xBbeTeNE00MwY5Oxs4I/wBatV5o0V9DNaRzvGqnG5e5Hb3FZ3bRNDe3ETtuZWKk/jTuGOjL5WS/AXiHyDgUqUOREvLdPWlRKMqz3UptwMaqMRKAB0qLY6g9hbyPCAJpeGbGTRHVbeW8kkNvG2x32owBIOAPTmos2kS24Cz/AFYHc8dvuoaZqyi2BroytJvdizN1Jru3IVt8mfxp2WNA5AkEkmccDiiOj6Lc3socopVexOM1dySQNQbZFtoZZ5DIiPtHeiUsxiXzZCTxhc9jRS/t3tYBEoghJ4wDk0Cvk2ShZZkDHgIDkj3NUTb8BXURzSFAdruRiqr8+T60Yss30IOTnCsffsarF7qP1IsbfBA+03qatXgthPLDb/1MpUn7wf5qMqpWWwSTdBiws3MMkIJK/aAzRvwHfS6dqqwux+jzHbyeUb3/AB/igWkXZt9eSCVvlkAKbuxGOKm6yw0+U3MOPtguuc59/wDPpQ5eqIf+ZG36nA2pR296SCwG1gB0ajHhK/ktZvo1wdp7Z71WPh1qseqaWkjScPjK9uw6fl+VXO90osqOu1ZRyrA9/wDSs960x6NrZcre6U4ORg1PDBlBqjabqMkbfR7kBXXgHsasumagjny2cZHqaF1CXYTIx91dEDZSQbuldldqkGrxTRDewLqcSSj5sECg1xpts+TtzntVinjTnIofdoETKVF/I7CbS0Ao7RUuQQoGOuKzv4z+NY9A0kQRSD6TKCI07k+v3Vpd1KtvZXE0jKMKeT24r48+KviA654vub3czwRkxxjtgd/zpnjx7SM/l5OqI9xqSJwzCZ3ctKx53tz/AH/Sm9R8ZXMEQXeWxwFHp/pVcaSSYMyAAhck/dQQuxJYnO4kmtNY09GHLM4+DYYL21XSo7mE5WQA5B6E9azktu1e8K5wzZ/Wu/Cd/PNIumGQ7WPyg/tXt1F5GsXkYGCpANco0ymWfaFk5Psjj9aVewj6pfmHSlXWIErULkWNo7wSyI7sVCq5HHr+lVq51NmdmkleU/8AMxNSvEMyzXbKmML8uM9TQMxuWJwevFdjh8mjmyPwiUNRnRg0QI9xUyLxBqMfO9gPUCodvZ7j8+AR156V61vLn/dkLDkE7aJSBdpIVxqV1OWeW9lyTyMYzUR7himxXbHfmvJUZD8ykHvTbBj7VekDcmzqN2BCqWBrQPBcxtxbkcOwXaT0zWfKzAgHA/Crl4fdyLRcnK4P60DkL0jPEfrDGuyka/CqBUZX6g9DnOfwo3eXSTaYsl1Gcuu3zAOA3Y/carPinEGoh+xLYPc1YNIaO/8ACIiYkspY4/AYoK8Djbci6/A+4d5nslO4q2QPv4/mvojSWE+noJMM3IB9hwP0x+tfGHhLWr3QNYimSV0j3YOO3sa+xfh7fRav4ciuoxtD8n3JpHkwraNDBPtGiZdaUlwu1wQezelB7+y1GwxLHudF6MOv41cogUbaw5HenXWNhgHg9qWTou1vRXPD/ieOUCG4fbKOobirC96jpkMOnrVc1zRNPmJk8ny3/wCNDtNZ74x8Q6p4WhZ7e5S5jVSSJuCAPeixd6RynGO5GuidWbGR+dR9QaNUO5lHHevmi1/2iGiYefocrH1SXIP6U1q3x01nV4mg0jSvJdhjfK+QvvRP1psj97Gi5/HrxrFo+hSaXaSBru6zGMHlVI5PFfNdxteB2dQ3Q/nUjVb+81C7mutTuZLi5Zjljxj2A9KHXkw+jYXIbIXB9Kdw4upncrP+Twc3gRbF2iOMKRxVbUgsw6ADij7D/wAskzncM45oGYyGySBkU5BGXkO7CWS3uIp4yVZGBBBxRcXf02+ubroJX3Y+/PH7UF2ggAEk0Q0vCh9w2/fUyQJ3VB+Er5S8dqVRFvYFAX096VC6FOpEureQ3T7vkIJJ965uLTySkQIY7QzsO2QDR7xHBHFekW7L9au7G3GPlGf3oPdmbZFERsaRfmz146VMHY7kjTGpZX86IW6lY05Vcfa9zRCae6VVFvJJBGw+wo6nvT2lXVhpcn10SXE4XIPUA0RtNTtJGWV4YlyDmQjOPYCpZRbKvLa7oS0wlzkkMcAH8KHum5uhxVs1zVdOltzGsUj3Oev9G2qpLM7Pltqj0FSisqGlBeUAHABq3+HSi3cDAMyhMsfeqgpH/pp35Jq5aTC64CLg7CcL14FC5HgY4q9VhTU7WLUZ2yzFYrRm6dGwTXXg68K2kSuDtOQ2aO+H9Njl0fWbj/1VteCeo4ql6P5tvLCXO5ZVLKCOCeR/FAhLVDklTCl1pzSeIBaMWjFxKuAB0ycCvpP/AGZ9Ra48M3en3JJntJyhz1x/kVjPhu1fUvH+jl0U/NG5X2UA/wAVtHwqsG0n4heJLJGCxkxSBR2LLk/qP1oGWV6G+OqRrUpG3AGcdDUd5BjJHNOlcAAu5GajXnCEK2RnvSNB1dgXxBqEcELZkIx2FfPPxw1lv8IuG34Zz5Sep5B/bNbN4vdhG5ZwBg9K+aPjrqAOoWWnBsbFMzDHcjH8Gm+LC5ivKn1hRnUSlpR5fzEkgDHPJ4FWa2BtLBlLEPIQnHt1/eg2hrGZQ5G3bzuPrRK5nja+JUZjjACntnvWnN6MrGrdgq5k8s7mJABIP51E836QDxkbvlr3VzJLduY1wmc80zYkRONxzmrQWrKZJbokyFjYMOo4wKHiPgSP16ECp842IV7F8D/P400sRyykcZ/OrxBT2NKp4IUAemKejQscsePenY4+20kDpT2NvyhRmpIob8lRwQM/fSroHj7JpVB1BjVw1w8VxIzfKx+z6Y/0qDdeaZcOS0soBUY5HoBXsFwLr6Oke0k4B9sCrV9FtbVZLsIDKigRnrjjr/FBVoZm1Ipt7YPYyCKV189xuKg525qWhjgttnyMNvOTzTapJe3UreWX3ks7ZOQf7VGvokj3JtDMTweoH3Va9lPCIl5/9Tfxnt3wKhMNzZPGPUVPhsJpVZ1Q4HJryCBCN83HdV9T6VePkG18kvwlpQ1TU0iZtqp8xyetaB4Ks4zNqM0mzZHGVQ9j0zVE0e8NheC5iOOCvHU5q86bJL9FttKsoJDdT8yLtyWJOR+4/KlOQmP8RIsGi25Tw/rN2+EhkiOGJwApDAfsPzqlzwER6fFFwI4CxOem5iRWua94au9I+G19HqRZbqcRpFEAAoLEAfl1qjaxpj2104JH1axRNgY6IpP7il8cvYZlHZePg5ZfTfGIunX5beAAnHrnGK0bwUWn+KHiS8xhCsKg+uBj+Kg/CWwWx8Om8ZAJZyAOMfLjiinw/kSXVdTuEBBM2wnHUr/rQZu5DWM0J5QAR70L1KcLH1pyWfgjPrVf1u8xEQDyPeg0ERVPF94XLAn5VBJz0wK+U/GmoPrHiu8uVOY92xM91XpX0J46nkltXtkmWGS5YRKzMF27uM5JA4znqK+evGWmDQ/EVxp8NzFcLCxAkiyUIJzkEjkds9M9M07xGrozOdLwNWcbRxZLDOema7kfy4eenXbUe2vUlZYmC4zjJHWpF+B9K8vphex604ouxZzUY6BkrGWYMecjpXKxgN0IxXWAuRz14OaTAsckGj0Kbbs7vHKKuM9Qea7iAYbskgnPNMgGSdQF3bRUqSN41iByAy7hxUIlneCFPTnp/NefLtPPQcGkcnbjpnGadjglZRhcBmxmrHDRYZpVOj0xGQM6szHqc9aVRRxWNNuZIJsqccYqyjUJZIEhDth/l+4VUJAVyT0q2eD4PPl82Ty9sYJO70qJI7G/YOIINH0cNK6rLP8AtntVZvL0mRjGqruPXHP+tda/dyXt40jbhjplwFGOmO/6UJBDSKpccnknOPzqkY/JeUgsLgtZmIbgxHLHvXttDaRREz5c7coqt0NR5ZE2gQ4OOGINcLJFtVfmJHXJBolUDts9mMfnnygVA5Wt5/2efDk1882vTlWltwBGX5+Y/wCg/OsGUqXLuQBngVrfwD8U31hqF5ZC5s44TC0wW6nEScDoCc5J6UryF6BvjZOr2at8UXutTudG0qQxoJJ/NcZ5IQHJP4kVR7qzfUb6KONd/wBJnJXueWOPyXZRXxRrcepa3d6zbt9Xa2Swxnrtlfr/AP0oqX4AtTc+K7eJSWjtYS2ffgZ+/GKRjo016jUmhttM0UBmBht4M8dyB1/egvwpDf8Ahj/EJF2teTyzc9cFjj9MV38V74WPhs2doP8Aeb1hbQIOuW4/vROzs00fQbOxjGPIiC498DJ/el3rYxFEm4ujuIBFBdRzNuOTjvUmIPMc56mnri1xCxIzgZzVLZaqMf8AHUZvL4QjJSMZxnqf+/TFY18QtIlsdaWQI4hliG1iBywHI6nnr159q3rVLbzbu5kOQGJ/Gsu+Iem3c8WGcmGBSIFMhIQZ7DOR0HtTnGmoz2ZvMxdlZl0se0oQM4J7U7Zu0snLsrDuT1p1gBjIy4BDCmoY2YvuGG+0vvjk/pWt52ZO09nXl4PHI5r1sgZbdjGRjtSVvNzIMqMdMYxTch4VVYktwfXFSSdWZ2sXDHk8g+lT55C0cIPWOML+pqJbxHoOB0GadYkuetccdofnGOmRiiyruYLnCo4oSAcAAcetHLZC8bscjKhuBXHHrQ8n5W/+VKpDhd55NKps4zmRSQ3tUjTdTurWJo4HIVhh+3FeSriJRt5Y802yBGIQHOMcVzVoGnRYdI1bcWWa2ikRl2jKDP35qF4g0tre4zEkhR/mU8kYPWhtu0kUikAgirRp+qXl7pz2G6PLjbyuSFqlNBYu9FWhkZCEJ6np2qfH5YU71AI6Y71HvrGa1k8uZWVu2e1e20rv9SfrAO5q3lFdokxRs3zPgDrRPQrxtK1aCeUt5JYBivB2k4PNQNqbgB2GDivJRNEEYEspPGTUSjcdkp7s13SLtnsrK2SKVk1G+eVeBl8bdo46/ZHOMc1q3w8kt7PVZrh0RWlWQxljztUhfTpxWD6bfi88P6NC4Cm380A5OMgK3PI9K0Dwbqtrd3lpptrtik+jKkl27dGP4cMeR16VlZY9Ta48k0rNH01H8U+OzqD5OnaUW2+jze33c8+59KtfiE7UBBwBx/NcaLaWukaelnaIscaKAuO/qTzTeqSme2KEZ5pOTH6vwe6UgYKQM96IX8JNuwAIyMVC0CQLGFPJFGpB5qe1d7EMzTV7MxFuMcnn9qz/AMR2ccs80Cwwl3X52ZwSc5IwD06dvz7Vsviex/3ZmUYxWSa2Hj1yPyQjtKnzJIxAHUZAHfmujtgeRCLijDte06bTNQcvGNjMcEZwfzqBCplmjIG3HNaj4x0dbqGZOAxGQwwOR9381l8yKjeUQcqORW1gn3VGLyMX43ZKvBbqvEkRZuoU1GihQFpHkiUHuT0qHMPLZCB8uafAUkEMT9xpiha7JDyxsCseQB3Pf7q5UFiDkcetcZATjFOQ4JBIrqOQ6VKgA9hzj1NGrD/7eM4J+QrzQcgux5wMiiFiQsarnO2TPWuJHluY9o3A570qiSHbIynGQTSrjittzMFbkKOKbKhvMfuDSpVIIYKkuVOOB1orot21vMrLngUqVQ/AXH5DfjK5ttQ02G98uRbg4Uk4xiqzaRbI974YmlSrkdPySxg7SR+VeMpaIuGIIz3pUqkog34WmRljtpPMISVsYY45T0z7Vvdp4bjh1NpLaby4IraB/K28McE8/jSpVm8vwa/H/gutv4wtzawCe3lWaXIwgG0EEDrkcYPpUzU71IVU7XJf7qVKsqG/I7gbsf0eVg3H9VWaBjtBNKlVkMS8g/XnD2UysM/LkZ9a+a9c1D6VrDi4mlhltZ2RnhTO8AhgMbhx2/X2pUqNEU5XsWjWLRXO5sEkcjtjrWM+N7BNO1p/LwVkTdj0OaVKm+L/AGLcxLoV6ULtVjknBpm0fcGUilSrUMcfU/L+OKkQkAZx2pUqhkofQkOfwFSLIHMp4JxnmlSriw7IgZyxzzSpUq44/9k=</field>
-      </record>
-
-      <record id="base.user_vad" model="res.users">
-          <field name="name">Valérie</field>
-          <field name="login">vad</field>
-          <field name="password">vad</field>
-          <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/4gv4SUNDX1BST0ZJTEUAAQEAAAvoAAAAAAIAAABtbnRyUkdCIFhZWiAH2QADABsAFQAkAB9hY3NwAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA9tYAAQAAAADTLQAAAAAp+D3er/JVrnhC+uTKgzkNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBkZXNjAAABRAAAAHliWFlaAAABwAAAABRiVFJDAAAB1AAACAxkbWRkAAAJ4AAAAIhnWFlaAAAKaAAAABRnVFJDAAAB1AAACAxsdW1pAAAKfAAAABRtZWFzAAAKkAAAACRia3B0AAAKtAAAABRyWFlaAAAKyAAAABRyVFJDAAAB1AAACAx0ZWNoAAAK3AAAAAx2dWVkAAAK6AAAAId3dHB0AAALcAAAABRjcHJ0AAALhAAAADdjaGFkAAALvAAAACxkZXNjAAAAAAAAAB9zUkdCIElFQzYxOTY2LTItMSBibGFjayBzY2FsZWQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAACSgAAAPhAAAts9jdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//2Rlc2MAAAAAAAAALklFQyA2MTk2Ni0yLTEgRGVmYXVsdCBSR0IgQ29sb3VyIFNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAAAABQAAAAAAAAbWVhcwAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACWFlaIAAAAAAAAAMWAAADMwAAAqRYWVogAAAAAAAAb6IAADj1AAADkHNpZyAAAAAAQ1JUIGRlc2MAAAAAAAAALVJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUMgNjE5NjYtMi0xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA9tYAAQAAAADTLXRleHQAAAAAQ29weXJpZ2h0IEludGVybmF0aW9uYWwgQ29sb3IgQ29uc29ydGl1bSwgMjAwOQAAc2YzMgAAAAAAAQxEAAAF3///8yYAAAeUAAD9j///+6H///2iAAAD2wAAwHX/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCACWAMgDASIAAhEBAxEB/8QAHQAAAQUBAQEBAAAAAAAAAAAABQAEBgcIAwIBCf/EAEcQAAIBAwIDBQQGBgYKAwEAAAECAwAEEQUhBhIxBxNBUWEicYHBFDJCkaGxCCMkUnLRFTNTYnPhFiU0VGOCkrLw8TZDosL/xAAZAQADAQEBAAAAAAAAAAAAAAABAwQCAAX/xAAqEQACAgICAgEDAgcAAAAAAAAAAQIRAyESMQRBEyJRYRSBIzJxkdHw8f/aAAwDAQACEQMRAD8AiVmskWGRip8wcUSF0ZUEd5bwXaAggSoDgjx99P5NFuol3hJA8V3rh9DZTgqQfdTxK+6OGpadpOsFnuJLu2lbGSJCybdNum3nQu74Nv3mmuLKW3vw6N7XMO8Y42yCAPeRv49aOi3I8K9ojoeZSQfMUKTOPXD1tdR6WkV3DNDJGxXklYswHhueoookOfCuNvqF3GOV2EqeUgzT2G/snP66F4G/eT2h91cce4IfSnLRDuXH901y0+2jd8rfpdZP8LfdRk2Uf0cNzpzMSpTfmHqfQ/Kus5ETePfYVGu0sNDwTfug39gfe4qa3tuI7pUQD2jjFRXtbi7rgmceLTRA46/Wz8qD2mFaaK34O1F7qa100W5Z8H2gfLJ6VPEsmwNiKrXhV3XibTpLb9UTexgcjEbFxkZ69DWiJdPt5SSU5T5rtS8dtMt8zHHH8bj7in++yBiwIORkHzrr9Bu2jLKhZVGSx2x8elTVbC3hUExKW8yc1zlHMcYHL5U3hfZFzroqzi3VF4f00Xd5bSPzSBAqkA753391NtE1XS9YhL2NyHkxl422dfh/Kl2/Rn+gogNv2lPyaqVglntpVljZ0dTlXQkEUhyplEVasvaWGvEMOZQMeNQPh3j25iCQ6uhuounfIMSD3jofzqwNGvrHU1WexuEmTO+Oq+hHUVqMkzMotHV4ceFcmiPlRJ0BNeDFTaMWDTEPKvDRelEjEKYavK9pbd4iBjzAb9KD0EbtCMdK4yRALv8AjQm81ecZ57lYh5AAUGu9WgJPPO8p+JpfyB4h68mtUB5pkz5A5/KlUQn1ZNxHCfiaVZ5sPE1lEMJk16MEUoxJGre8V5jxy10U71QTIbnR7SUZUFD6GuEnD79Y5Fb37UXhIA6V2jffFAJF5dHuo8kwkgeI3prJaMp3Uj31OYH38Otd3jhlAEkSNnzFcc2Vw9qwOVyDXeC+1G2wFmZlH2X9ofjU2m0fT5eiGM/3TTa54biETSRz7DwZa45Mj8N7HNIklzalXU5DRN8jUb7Xmt5eDgEugiG7i7zmBDKN98eNTyDS7WHeTMjD4Cof21RJJwYYo7Yle+DHu0+qAD7Rx0Az1O1FqkFO2VXw9p96L7R76OxuHsVvE5ZxFlT+sGckeVX20saD23VBnqTiqh4Lvb+20rNjcSWyGV8RofZG/kdqOvr93uL2zhuM7F1zG/3ilxXEpz5nmUU1XFUT6Zw24II8wa48uWqH6TfWYaV4Hvbd3G/eNzgH3j51KLTULaUKqyDO2/maapImcWVd2/LjSLcedyv/AGtVKlCDjGauvt8P+rrRT/vP/wDBqn+X2l2FST2yqLaSGXdqTt7LelGOBpZ4uLdOSORkLTqrFTjmU+Bpi6KS+3TFPuCATxppYH9svzrK7NXaZeKDIyaRXNek2Fes4qsmORQUK4jT9g6fbFGA++OU0M4jH7Af4xQl0zl2VjxMuLvI68maBE53JqQ8VDE7HyiqKtJUvbKUkkdWYD1pU3aQ+JpV1B5GuoOLbrA+l6dazjxIyp+dPYeJdGlP6+wuYD5owYCnUnD2nOoKvInxBplLwyhz3Vyh/iXFWWyFRiErfUdCmGItT7onwmQrT6KASjNtdW048OSQVF5uGbxRlBG/uamk2h6hCc/RpR5FR/KhYa/JNVguYjl4mHr1FATqd9JqU6d68USuVReXGw2zvQWOfWrM4juruLHgWOPuNOE4n1uPCzGG5XyliB/EVykgOLJNbzTFRmVz8acXc7jKCSQLgbE1F4+K484udHjB8WhkK/gacHXtInTLve2pP7yBwPurXJGOEharqc1qOdTzDP1WHWgPanHd32gQxWgJmLlgqvjYDOPX3U9vILfUHQW+vWRQkcyyAq2PTO1Cu05XuLOztLYhpy5dJIpfqYHXb0yKzJ6bNxi7ojFjxPZabwXbfSkhmvSzbyDmYKMBQBsTtgDwAFDV1ziPULFJ7Th6zIbJ5+8bcD+6eho32ZcK2Wo6y3Kn0q5jwJJCP1aH91R4n31orhns809EV5tOhd8D2nGalllosx4HLZk/WIOLbm2jntrGa2kZvZMLk+zy+Xnk1OOEOKAtpa2WtWaWd/8A1fetHyrNjxz4E+NaZuOB9JZGA062BYbnuxVQdqfZfLb2015pcLSIAS9sd1YePL5GhHPTNy8a1plM9vDhrOywcjvyf/xVTZBdanHaD/SI0y2sr0FlhctFKftxkYA94qAsG5gFz7jXN2zlDR1b7f8A54U+4F/+aaWf+MvzoS7sudtvSi/A2/GWm4/tgfwND2gcaTLvQ7CvYrip2G9eubeqyU+n61DOIz+wH+MUSJoXxIf2D/nFdLo5dlb8Wf1j/wCD/OocTipjxX9Z/wDC/nUNbrUa7ZVLpHhiaVI0qNmTbgncAb5r0tyd6a8wwN6Q6HfxqsjQSS7O21dBdrkbmh67qtMOI7uex0a7ubZQ1xHCzRKVzzNjbbx91BulYUrJHHdIeuD765SJYzH9ZbQN55QVRUfG3aA8n6u0BXO2bHH51IdM4h45eLvLnT4wPS3/AJGkPyYIevGm/aLNbSNIlODaqv8ACxFfLvhrSPohde9ByNsg1Vt3x9xPYyYk0iGQDzikX8qazdtF4kfc3fDwHmUnYfgVox8jHIL8XKv+liT6XpNupIthKR++xIqCzNBdX2oLAkcTDEKBRgZOSaZWva7ol4e5uLO9tnf2QTyuoJ28Dn8KZ8GXi3HGEILKySSPIATsfDNHJNNaOhCSezQPYTwxBpGkRKY0aUjmlfH1mO5P5Vd1lGO7AAGw2qCcCQWcOmNe6nMsFouyBn5QfUn5VL9M1HRbgyXWlXEUgjH6wRk4x/540hLdlTdKkF+6yNx76EavDbTQsjNGc7HJHXyooNQhkjQKwPedN/OgurcUaPpshsriCboWJFuSnKOrZA6etHimjEZSj2ZZ/SY4Wisrf6dawr3UkntAfYc+I99ZlvUaKVcjAbcHzr9Au1Ph7T9f4Su5IF76wvoO8ixvyNjIK+Xgawbqi9289nIodoZCC3iOozQ9GnqWgHLJ7RFGOBphHxZZTFWYRuWblGTgKaAP/W49asnsSsLWWTWL+6ClYVSIZ64YknH3CtLbR03UWHzrN1dXCRxRSxxvsOXAOffXQPrMZLJKeUfZc5yPjUzXStLiKGJAZFyzZOyjwxTfUbW3W3EoYA+pxQnkmmM8fDjnG5IG6fdfSIwfHofQ+INNeJD/AKv/AOcVxsy0WrZQERTKQ3lkdPnXviNv2D3uKojLlC2R5sfx5OJXXFZGX/wv51DmzgMNhUu4tbHe+fdfzqFRux26ip49sZLpHU9KVfCaVEFG0IGs1hRJL+WRlGC7wFS3rgDFc4Y1UNnXYmJbK81vjA8q8h8gbnpXQE8nxqpqyRDyH6OI1X6fbs2NznGaa67pz6hBEltfWilebJMmOo8K6QEdwmRnau0YXO6qfeKzKKaphi6dojl1wvczxFBHp7sVxzi5bOfPrjNJeGdTNjJA8hV2Qp3kMwyAdgR61JeSP+zTP8Ipd3Cf/qT/AKaVLDFjY5ZIrqXgLiWPe34l1gbfb5JPnTKbhDjeIEf0406+U1grfOrUighJwY1r1dW8AQcilTnflcj51n4EMXkzKB4u0LiLTNLlu76LSXRftfQCjfAjxplwjcCDtDsLMkLgJH16HkB+/OatPtMRJdOisiryLLKoKlzvvVO8K2N5N2jQCCN5JzMzRYJHt749+cYA8SRWOKhKhqm8kbN5afpFjq2macLpZClqVljVMY5wNiQdjj1otd6fBpmj3As4XXmDOSx8T1PvoL2XXq3ug2k5By8anB6ipfrbJNaLEQAvONsda5aQ5xXNAqKMwWNo7gqvs5Y9BtRSTT4ZYxLJaW0hG6vy52+FeYYLs2QSeVWiXdcdT5DFPLCQLCEjB9nYg+Iro6M5He0RviC0hTSJbeKCOFCpCqi4A+Ffn92m8NXej8TandDka0lvpYk5XyynAkAI8Mg7eeDX6HcWZ+hScq4PKfyrI/6RlnpI1fh2xsFc394izXQHQlgFTbz2bHoaPSdB4ppMzJIuLjH96pv2UXTQXd4ruTA0sZZPM71EdShMOqtE6lSrlWB8CDgj76sHsW4cXULi8vLxGjjICwN9UnxLDz8BRSbdIXyUaf5LHhkzkLgZHMCDnY9K+66hFiSsjKCBkrsRv867PoV5Zsz2579cDps33VwvZlnhELMI3U+0D1HpvSmpJ7PQxyxyX0gqX29VhlxyoY2CqMDcY8Pcaa8SHFiP4xXywRpNYubkuzKqhBnz/wDVLiT/AGJf8Qfkaqgqxnl+XXzOit+LOsv+HUTXvYlCNFyCUBwzLuRvgj0qWcVkBpSRsI+lRJtsMpx6VjHjck2jGSaVL8HrmBOPGlXlCMdBnxpVk62bA0m+tNStFubKYSxHbmAx+FEOU8tUzpmsXeiXifRx9FZD9HukxlefP1iDtv5/zq2eHNVh1ew71cLMm0seeh8x6Hwpnj51mjfsHleNLx5Ux/agmJPLFOo1PX0pW0B7hMD7Ip7DbswzjwpxNY3jQs2wr2kLhtxTpgkDKIypYfWyetdBzNymQKNsDBrmjrBkk0Fu4FxPHDzdOdsZr6txaTSFRdxkKux5gPa+NeNdhUSEsoII8Rmqp4qs5p+JJoUW5ghIBWWJQQDyjbz3O1Tzlki1xVj8UMc3UpcfySHjy7tDqdhEtxG5FyqsoYEj2gOlBjdaVw9dS3tnDi9AzHMTumPqkeWDVcWdtq2kaq7X8FzA8j4QyAhs+e9P769a/JljbmwvLj76nnkfyK1Rc8EYxcYyujYX6Pus2er8IWN1G4J9sMCMHPMcjHvzU+4nguO/t5oHkeFPrwI3KX8vaxmsocC9oumcD2nDJs7C6SxubRzqKqOcpIsjK0vm26knYYGPKtP8K8VaTxJaRTWN5BcxyIGjZHBDCmSVAhO2pfYMWqmS2HLp1yTj6stwcVy0q0ni1LvpmEQ5cd3ETyfEHqaMWjSNGQuBjzplqNwtrbvJIVU5wN6MujudtxGXGFwkdhO7EBQh/KsNcfa3dXvbFG2pQRwGxuoogo2UpGAFO/XIwc+taR7cOI9aueE7u04XBlvXUqHQczL58o8TWUO1ttRbju4u7shZTFbMExy8gMKNgL4dTQf8r+5naaXoHWuh/wCkPaBLMIVa2Sd5JQBhWbnOB8cAn/Ort03Sbe2UMEjDcuMKCAPhVIaLxVquiZFnHZuCxY95ESSScnJBq3OzHjm24mZ9Pu4lstRReYIr+zKPErnfI8jVOKNJWTTmpS0HkkaH2GGUXcjO4H8qF8TWVtdIjSYkTAbmX6y+nrUsu7VXi9ok48SMmgV5Z4QgYZMnYeH+XpTTCb9ETuEhiYi3IaNcDCjHLQfiQ/saesg/I1JLu1EV4bhQeRj7XpTDWtLW7BCOVz7QA86ElapArZUfFx3n/wAMVFbiSJ7dJMFJgeUhVATlAGD1zzHfNT3i/QNXzP3VlJMCmxj3ziq/lgmjlEEsLxykjaQFT+NSqNdjnNaX4PjMqAgEuxwVI2HrmlXyUckhTcEbYP49KVdoW21ovK6hW6svpYh7/uv1d2pHtyQnYN13ZcYPqo8676Bq0+h6v3LOxeNQVdvqTxHofiOvkRUq0ng3itbiad7aDnmYly/IobKBcEDboB91PE7LtZurmCe4urZTCMJuWK75wPStLEozk4rt3/v7f2NxzN4I457a1f4/yiZaPrekSadC5eUsVGQI+h8qdT8QabDaTPGkpYIcZAHzodpXAF1BAsL6iSF/dSii8Bwd2VuLi4ZGGGzhRinNsn0QLiHio6dIizappM5kjDMttIZWjJGeQnGObz/9VHr/ALQLpw0dnqAiXxbPJnbwyKsqTgTs407H0xNNUrt+uuQT92aSHsz07/ZbbT5GH+72RkP38vzpT5/c9SGbwIxX8Nt/1RDeGeJJNSZ7OXUzdRW/KRMEdicnPLk7miGp3um2bTXmoNJDY8oDSSREKp+PWpNJxdokC8tjod9KB0xEkS/iflVRduuv3esT6fFLYmxtI0dhGZufnbP1jgAbDamY5uJ53kcMs3KKpfYjfHXEtvrOrudMMUkK8wV0hKFs+YPXalw1Yd9pqsYzEZJXVSw2OCQfhkYoXBNpMHCDqXC6gZFmhUDJdicb+QC/jUy7OIu80try/wCd4LVQRzDbJIA/M1BnfOTkXYF8cFE98XRLpvA2lz4UMk01s5Az7ErlsH3HNaC4N4ZtW4dtW093gu7SNFS5gbkd15AVJxsTggb+VUnr8VvrENzowmia1SL6SDzb82CVx57nceWa0d2eadc6Np+nrc5aOfT4ObbowXH5EUFN2kb4UmwnpGtcQwRLDcSW95y7B2Uxv8QMg/hXjiBr+9hLXU+BjaNNgKN3NlCJO8C7HxFMtREYhx1JGMmnXoxdkMMItrnTERcc7NnHgMVRH6U+ifQ+JNI1kRgC7sjbu2PtwsVH3oU/GtIWtk13q9scZWBdvjUP/Su4ejuuyw3/ACjvtNuo5QcdFf2G/MfdRxP6zGfcTGz4yT51702+l0zVbW/tn5ZYJVkBHod/wyK+SLsRjpTK4OFPuqwgNc20nPGFlXDMMq3nnpTa5tYy/N3Tq5GDynrXrQZRJpdrHMPbEEYYHz5RRYIjpysAwx41tdDCE6nFEju5f2QPbUqQR61DNY1WzeeKxgjuhLIeWGVYWwcb7Y3NW/d2yEboGIGxIyQKiOpW09hqC6hpkUKXNsxaDnQlemGGxHUEj0rM1KtGotJ2Rc2epGEK7cyAbFW+sPU0C4m0az1aya1nhdZQPYY+0UbwZT1946GpnZXstxB3t+8BupWZphFtGhY5CjPgM/GoxxdfQ6ck1zI3dRow5WLA5PmK6lWwXbKH1KJoL+aAgqYpGT2lwdj5eFKuvEOpDUtbur5UKiWTmApUigO2zap4x1KTa20uwT+KV5D+AFdI9X4wutoDHCD/AGNj83Jpxas4ABuTGP8AhxqtPlezUAz3Ttnb2pjv8BTOL+4vkgU9pxbcD9q1i+jU9QbhIR9y4pv/AKLJcNm91ITt4hppJjUntzaq2YrLmPmY/m1PkuJQPZijjHq/yFdxByItb8H6ZFjEMzn+5bhPxaiUHDlkoHLZZ/xZ/koo5EWcMZSpO2OUYrgVy2C00mRnHeYH4V3FHcmMhpVvBv3dlCPSLJ+9jVKfpOxRqdHaKbvMwzqcAADdfIVezwqpBWOJD54yaoX9Km/iaTR9KSRmuVWWVtsAIeUY+8V1HJ2Ufpv0Z7mAXRlVFKg8u4A9R41P0vr/AE7QIdMSe3W2un72ZYn5zhOjnG6g9MHxqC2FuxkBPXqakWn3UlvGyqkcyPjnWRc5+PWlSwcuijHn49hjh3ia909e6jhjblm72KSRAxGOgwfDGdq252S8R6bx/wAC2uq2ixx3MX6m6tlP9RIBuv8ACRgj091YS1C9luWTmjhhReiRIFH+Z99TnsK7R5+zzjKO7cvJpV1iK/gXfmjzs4H7y9R5jI8aC8dKJp53Jm13sZY/YGSvkfCh11p2ZNgSTUlstQsdU0+C/sJ4rm1uIxJDNGcq6kZBBrnMi56UpxobGV7Bmn6cloGfHtud6i/bJpp1Xsz4ksguWfT5XUf3lHMP+2py7AjamOoWy3NpNbuoKzI0bA+TAj50I6Zz2nZ+aswyxPnvQ67XfHnRrWLd7PUrm0cYa3meI+9WI+VBbzPMAu5JwAOpq4i9mmOEpp7vhLSdTjzKstnGW/fUgYPv3Bo9Zagr4DHxplwZbtY8HaXZPF3bQ20SMnip5QTn1zmul/YhyJY3MbnqR6/+vxpi6NLboOK6ONqE6zZgQSSIcHlIpsjXtqcd8kieBbAND9W1PWZ4mt7e1t1UnHe97nb3YrXoHsjF+og72QqM3GERSPs5+saoXirW7zUr+W0ku+e1SdhGWGMDmIBOOuBV/wBxZ3PM0t1Jh8btncfyrOHFFk2m67eWJJPcylQT4jqD9xpGS0jfYxmh5AzKVdFcoHU7MfQdaVGOG+HrnWJxPymKzTZ5COvovnSpNmljb2aztblMHFuuOhLnP86JWjxg86pCrZzkJk/jVC8FcFahaarDqV5rU0AicOIreViz48GY7Y8xg1cNpeDGObf0pyk2tk7X2Jdbz5wWkY/GiFs6ZBwKi1teqAC2wHiTTyHVYfqrKHPlGCx/CjYKJJDcAs2/l868wTjnyT9j50Ftr0gMSrjJGAcZPX7qX0pkTmnvEhT0wv4mgFoPSTLjJ2XzJwKyp296rHqXaddpGQyWsSQAg5HTJ/OtEC/s3OYVmvG/ewSP+ptvurJnaFdvP2g65LIOVjeMMZzjGBQYUj5ZMoPdnAz409aRU6bketBEmDKN9x0r2bhnH94dfUedMTBQZeVXQFTnxFci5wGFC7a4Kkr67U8V8g11hL//AEYO2BeGL1OE+I7rGh3Un7NO52spSfHyjY9fI7+da8lYFAwYEEZBB8K/MLvORs/Z8a0d+jf22m0W24L4uu/2XaPTr6Vv6ryicn7P7reHQ7YwnLC9ofjn6ZqE3KhuUHeujNzIG8RvUcivQdSePm6DNGUuQY/hUqKmYD7aLNdO7UuJ7NRhU1KYqPIMeYf91NeySCO443haREfuInlAZc4IwMj1GaLfpIXMM3bTxKYCOUXKq2OnOI1DfiKD9jXeNxpI6fVjsLhnPkMAfnirJOokUVc6NCWjB3CocquST5nH+dOJXQTcjdO6z9xodazRwwmSN1dQASRuCvidvvqOdoPF1tw/pVxfKBPKcRQoGHU5wT6beFU9IXdkkuLyNgU9oDqW8fhQu61C2jJHexpgeLjP41mvUuJdY1K4ea8vpeZzljGoXJ+GKFO73EhBklkZjgAndjSnkfpDuEF3IvzXOMdAt1uIZbqO5dYmd4oWDHlA3quNK4LvuKtYm4g1OM2thcP3kcXOO8kXwHoMePjQK00mbSrpXv7URTgBhFLuOUjow9R4UZPE2tpMHGoEADZVVeX3Yxit/p8uSKekZ+XHCXsni6Zb29uIY41gt4lwABgADypVF7PjyVuWG/sl5QPrwHG/8J/nSqaXj5U6opWbE12GtE1yS6Yx20O46mRsflmpLZz3j457kqPKNAPxOTSpVyeyVha3MYHNIrSEeMjFj+NFLa8YKAi4HlSpVt6MD2G6kJyxz8K4ww2qN35gEkrb88hLke7PSlSoI4ex3js4RRv6msncaTd7xlrEuMc17Jt7jj5UqVB9nRGUcmR412WXLKD9bwYfOlSrYUIScsqsBsSRjyNPIZiSNutKlQRzPUj+FcRIQ/J1z0pUq0zl2Xz2F9q+pxyR8P6qJbxhDy2lwTllVd+R89RjoevhV9HjJLfRJtRlhmMcMZkZVwSQPLelSqeUVzKoSbgYc471c6zxbq+r8jILy8lmCsclQzEgGp72I6fHBwdxJxG3tTMhs4x+6oXnY/ElfupUqOZ/SYwL6yqrDVdRsZOayvrm2bGMxykU64gErwadcTXVxcy3Fr3sjTOWwS7DA9MAUqVOTZMwSB5VovsS7IrSbTYeINTuY5biQc0XKpYRDHgDjJ36n4UqVdV6YbcYuS7JTxB2A2ur3815Y8STQySnmKT2wdQfQhgcelVX2hdkmu8IqZ7vUdMurX/hc6ufgV+dKlVuLLK+Polm9tlaXsYjkxFtnwO4pUqVUZFUnQYu0j//2Q==</field>
-      </record>
-
-      <record id="base.user_apr" model="res.users">
-          <field name="name">Aline</field>
-          <field name="login">apr</field>
-          <field name="password">apr</field>
-          <field name="image">iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAgAElEQVR42u2ceZhcV3nmf+fcW/vS1fuilnqV3NpXa7csS8YbtoMxdiBjwr5kAYYhDJMwBDIMMyEJEJ4MYchjIAPENmDAC15kW7KQZVloaVl7q7vV+961dXXtde8580e1WpJtJeC2w2PHXz/VVXXurVv3vvWt73fOFbyCGAJaHSG3V/s/WELZnRW6ptGnA04TBxIjbWhzKC+yQwmihwsU9o+Koc4O0Z1OFPgPJ+KVBneYa1fUq8YvVun6G0p1hV8gUSgATEw8eHHjxsIiRSI5KgYPnZenHh2RA+1hMXrGoVzhLivxHw/ARlkqF4j5t9fpxq95daAqTdLvwkOFrsUtPPjx49IuHDgoaqOc/WyOrJoW8WyfODdy2PjVNwvk/+/pwqT1ZgfQANqAcJuswDTknUoU3jcuB35sCqN1OWsrV9VczYodq2hZ2YKcNmAKDAxsLCQWTjQGCokhPAQc9bqpzMLakQyGCwuDtUlvnrFJlX5Ta+D9wBdbKe10OcxtBuaqTer6L15duq2s9R0LqVhTweCuQYaeHsJK20wTJiI7COgc9dpPGV4AbAQJnPQGLBo2+NWGLevkgY4jY99+9P+tPJoennizAmh6ne5vX1VSf39zffPHRk/2lW0WN3xl2/Yb/LXX1GK4Dc5+/yz5SJ58JoclutmknRiqliQ5bBQFbDSacWMKc1kJH922k0BTjTzSd4qVtYuqtNC3A/e+aQFM27kD3oJ5wBqKf3eF4xrvLe96p184BNlolsx4hpoNNZx44kVscZJ3qhaiJJkiTbc5QcSXRvsMDIfJqiVLuX7h1aSrnNy76wGGxof5yPa7pRff59ocpU92FGJDb0oAsbV1Mtn3jc9X3PXOYzVDdWeOnGHFdSswTIN8Is/hR15A58/ySbWFHjHOvtB5yhbXsPOqG6iorMAjHKhkHo/DidLw832PcVfDFgaap6h0BanRDc0WfPYqh/2Zc4WE9eYDEGiiYs3T4wNlH2hbx9HaozSFmph6OM7zXU+hHf18wb6d3f4OrE1B3rf6vQSqQuBzFD1obwxtOhGAIQQuZZCmwMZlawl3DWEqh2y0F384a6SeaHXaT3bnU28uAEOGYdaqpju265vc+7uPcuuyDTzy+A+Z6kxS3pDn3T0b2VPdycob17Jk6RIo9SCkRCsbJpKQs2bjkUZz5+LtZEIGAPlcnoKyqFUN3lrR9NU+o6MdUm+qgGIslPNrFullX2qSraGFN62g58VDbNm0iinXpFU6gLQDgmvv3E5Zaz37h06z59h+9h07SHhkjIVmJeiXVjEStyVhOktvdJzdJ05SpesJ6NLqSTESCAixK6Iz6k2jgUHh31imKxeUL6vAGDOI9btwns5wfrzPbLVCbHjvdqIexe4X93Ddyi1cv3wDTOXIDIZBAQXQaQ1OEB6BEAJshVaSJ9v3UoNNgTwNNDOmFr2/wzj6dJtd8fMOwm8OAA2M20KUS53VRE5FSGvBcdnLzQs3s2DBAhYvaSNrW6xsaUMoXdS4EheedAkqlsaesjG1LKbkFmhTI4QgaeXwTMBGNZ+nZT+tqo0WtcQ9Lge/HHGO7CVP9E0BoFO713nxMtU1hUWBDsdhPrrjv9JSOx/TdCCExmMaoDVaCKZzWc4NdHHszAlGRoZZUdvGtrpVlGoXCIoaCETScdxJSaUOUCLCFMhTQx2N9uIlcTn5/pWO6q8fL4y/4QGUTjzNWXJoNBNimNVWKc+fPoLT6UTKC8WKIJnL8cCBx/mLn32Tc/U5xptNCmk/DreXUKgMUe4uauGM9IZHcOcM/Lhp1SXkyOLBS7Wup1LVfSRHruzNoIHSqZ3eNEkEkqgYZLVu4NT+dsamIsXIqjUaODPYzQhxrr36Vt519x9SUlGK0or6UC3GIj+iMYAwJVprLK0Z6B9kviqjkgALCJEhhURSQohau6nZIVzb2xxvfAylQBITkzOZSIIAbipjbuv+fY8oKJqkAFY2trF2yybyZpbBr3fyg7/7NqejZ4iL5EUS0WEgEIwloyS7oyykBi9ugtqFLfIAhAgR0pXOUlV9J0LJNzyABZEjSwbQOFF4cHLQ6Pn5U+37Xoylk0UN1Jp8KkPPUD+6Dtp7D7G2bj0t82tYtLB59mAaUAIeOryH5lQ5FfhxY2JgYGgTACcuvPgoVzWrTGX63/AApsX0iEUBhcLQipTIqW4x8d2BydHHz48PFj2gEPhcbm4WbdR32UxYZ3jb5rX8zw9+jnlllUVSUWmEpdg/eIrpM5M0OatxVgfwOt2YuHEZ3pl0W+DFh0f7a0zpDL3ho3CSqb0pkfgDSxeYEEkro/MSdN4pzUGnNGd1S7od1NZWU1NXw7XLN4JWCF3MorXWkCkQTiZ44rlnudFaRNOyFmS0gH9rA7E9A8xbvZB8ewEUOHBgYPqdyu19wwOYFZkfT8rhu6dUzIwj95+Uw/Wr1II/z9YZ2YaqumKhMfNPFNECbc+a7AUQ7ViWR47tZcVEFasal+JqKIEKCzWaIhE0CZaWMKkmEQgkEoEwldBveACl0vlnonL83m552gpRKR+V7W8/y8izWxauuanE4yOZzzI6FQEhQIiZJzH7QAhIF3jhdDtWe5SddesIfWwtYjIDJS5Gzg2SX1pFti87+6VZMiiUVMJyv+EBPGWF09j6s13yRLtTu1tjIp42nEbyhsWbnQAF22JiOlbUMq2LCkgxtdFotKU4feo0h585xDuCG6m6Zy0Mp9CNJUR2n+Mp1yjVTS1kxjIzzLVNkmlsCli88dt4EuC0HU7GReQr42K4okLXbssr60Q4FskLDWXeAKvmLwTgaMcJhmNFMyyas+DcuS4efOhR7jG2UrVzcVErUxaxXed4NnkeueUqHNMOfHU+AKZJUKBA3sgoh8Nwz8fzG51oCAiC6QMzAM5SMKsw5VVG6e+eDyz6M/34kDz/PQPzU5Zlv+f+g489s7i17ZbauhpsW3Hg+GEGwiMsW7SUeC5LwOHi+JlTfP++H/LZ4B1Ubl2MmC5gjyQZePAIRzODjDTWsXrREqxpi3wijxaaST2Bwqa1sUy2lWz+6n0vPvk2bOJXOsEGfP6QP9hcX12zbcm8q3bOK6+uyFt5byKVTIxFxkcGo6PHXFHX3mhq6swQmX/37tVlbc0lZrlfSPFhEJZl2/tW1i/61p3rb9zYOdRjNobqeNt1b1M/3v/okWO9p59cVbXwk91HOkKfXn0PTY1N8FAvMVeecxO9nNDjjIcqufa9t+EJuol3xImciNDTdZ5RhkkYYT78e+tpXt7GZ+7764eOdp34RJbC0DA5VrpqZDw35faYnraGqnnXb1689ve3LFm/ZGnDQndlIIQUkguxzLYtJobDdJw7lz06fObgwbET3zo+1PVkTyGW/J0AeEGWOSpAawpa+ZXW6xdXNa7btHTtpo7J/mOHu09+z1MwPnIn6//bH11zjzNQMEi80E+PNc6InKbbkWfU5eL2D95N6cJSMuMZhn81TM9zPfSq81gU8DRF+F/v/ijOhjJGpqL87PnHB473nXlmKp1ISmFUtVQ3rFi7cHnjpsXrvNUlZTNmoi87XV1Q6HAeETTBY2ALwVBswtpzfH/7Y0f3fPVo18nHS0xv9oQ1+e8P4EvFg8AFMuQI1C3RdV/7pH3ju7bRJuOOJIP5CINEmHRqxk0vgUA913x0O64yF8IQ9DzYQ+/+HvpVHxZ5op5B/uLud7BkzXJwz3gQIcgU8uStAqZh4nW6EBrQanb7RQCLlJoeziKqXeAokh1cyEmlQXvPmfwXfvA3ewYmRx7N6+xeh3Z2nrWj1u8MQIA2R3nrdXrJ/X9k7VznQjJMjPOM0+/KUXCFIBNgacsaFr9nMdmJLN46L30P99F7uIchPYCFRc6V4O6blrNj0xZEyIMQv93JzkJoafRkDjIKJIhaF7iM2QvSwK4TL/DET48q21bx05ljT40Vhv5WINvPFiKvLaX/b+3QYoaoN0pWvFtteOhu++rl5xjloGOQswEbSlsRRjmeRDn1jibKl5STmcjgDDk596NzdJ/tYphBbGxyrgS/f9MqdmzejCh1z/KG+hV+xZcY60y/5ZIxpSFeQBcUSAFJGxFygNYKUTxyY/V8BiZGxarMds8a3+ZlJWbpezM6tdyDdV7auYkkSr/uAK6U1QhDrNuhFj/YZte0HvcmKKlZz5ba9+AzK+gJ91A2XUOAErzzvHiqPEwPJel44gx9U73EiZEhTSEU4T03Xc3OrVsRQffFPsoFdXmpTegrmIiYMVUh0NM2QoFwGeAUMJpF92QEXgkeAwn4yty0H+lWlWaNWOBsdiz3rF0WMsrfVSCTLViR4wmU9boC6DIN7zI974EFRu3yBfU3c+e8T1DrbORnE/cxMj5GbaEBl8dN2bIyrLxF34lezo92EdaTxImSDoyyfUMDH77xJlasXoHwOoo55IVK5tLXVxi7WAGJWWJDCIHwmwiHALdE9WTQXSlIWOgpG9noQQhBqb+Eg91HRHlqPlpoXMJNvbPR2+Bs2TmlYpXaju+N6nzhdQNwnhG4bYlvzaf/tPmr4mr/No6n2vn+0HeoiM+jVFeCgGxFmqNDz3E0foBRNciUiOKsTrFjUxOfvPkO1q9dQ3B+JTiMl+iUfgVXfKWxlwcRMjY6ryGr0GeTaD2T3hcUstELpkAKQdye4tTJbpRQOKWbGkctbuk1mlyL1sZUxJmxxvfGdeFVdwnNK21okl7v1f7Nf/TFBd+UARHioehPODj6PC35pThwotF0cQpVMsw7b7yGkGMT2UKOg4On2NS0ko1L14LbQEhxhZglfsOYJmaf9QwdpsZzqEMxsGYirxAXdzMEGEUwNdBQU8Ph2JPElYtjrhwtoS3cGLoNU5hye+CWT/bnz/+qz+5//DUFsEWWynp33Z99pvZL2z34+NHkvfSPD3KVtQqBIE+eQfoYqz7J//nDv6SkvGT2Ujdu2lx0z+LfCg6QtQporfGYDi4Nyf9qEBGgOpNgaTQz5Mbsrhq8JphiFvJQoAS318P6RCOrMgV2FfaxT3q5tfSd2Np2r/Zu+uz57OC+GOpVJd+vTKkLa9G7yt776QZns3nf5D8zOjZBk3UVAsE005ynkwlGWbGgmWAwMENxFZlroTWGuPh+9sFLxoDnzx5lZCpaJCausN/MxuLYBSM3LzFvfckDEKXFH2PmHR6nG+URpMghEFxvLeJ0ZBcdmTOs8q3lat/WzW3u1ltazFdHDL0igM3uRbfeFHpH6InYo/RP9DPPbkSjiRNjgF4KWGTJUOELctHP/3bBQQCyoMla+cuDw4w+aa1fOYhokIv8M2Z6iZkLARpEyIS8Qh2OowYyGELQ6Z488gujvXOaLG4cbMnWsjv+EDmdZYN/i7PNs+wTDl4dufsyAMvAuSVw3Z3hQoT9E3tothYDECfGIP3kyNDvOEX5ogxOaYKlLlJbs8/6kvdXGoPWkjpi8Qh6RmMu7JHMphnsG3iF4xafRbkDub0cuSKAWOhD1LugxCxWJT6zqK2TeVRXikw2rxKu3P2/kh3X3m/++uduHKqJSqxEP13ZczS6mljl3bAxaJQte00ANIS5oNXVtmR37DEaMkWzTTLNCEMkiDFaepo/uflt/PftHyhqSqowQ2/NaMhlf/wrY1BueElMJy5q14U/w2RkcuySMWY1c1aTXRJR70GuCGKsL8XYXo5xXXmxNnZI5FU+jC2lJHLT1mhksrOrEBt7UQx8aK9xbp8DkxarhBOpw7ikm6WeVWa1o+6mVsM/dwCbnPMXCaR3Mh4mSCl5cgwxSExMkjDOMj9UwvbGNfgcLixto+MZtK1m/ZUGjvd1oLR+xVJs9rWlkFmLxHgUMtasDwNwmg4imQTanvV6lwUWbWvsX8dRPamLvk+CCDiKkV+AbPaC22AoMpbojg50AnQVYvGn5ak/j4tUokoHGcv2YWubcqOCec6GDbaw5ZwB9Jq+mmPJw7I+34JCMcQgETGGkH38gX01uXSW3b1HcJtOpAaVK6C7Iui+OFoVF0M88PRD2JGLwF403plgkbdgJEEilSKEC90TRZ0Lo7ojqO4IjvMxMtFp0qnsbIC5LLAYAmNjCNngvXhMBWokix7MoGIFLsSfF3tOdxe01Tc7Y0LGDnWJ8ccDeFCFJLa28Bo+qh11Kwx++0jyMgCn7al473S38hMkwRQxIuTlALfZK3Bh0mRWcnKih97pCQwpydlWsaTK26CLB1y9eCV7Du1D90/BWBImU8XH2DQMJ6AvDimLn53Zy+KqJhDF6C0KNqJgg6VwGAYTw8NXCEjFEk74zNntOpxHj2Qhp4opTk+afKHAsd7T++KQnwVQRdVxMfgLhVZOpRFC4jW8VJhVIaVV/ZwBTKnkgLANJRCEmWTM6OE61YgLB05MXOOKbQ1r+OmJp9FCMpVNzqYeWMVu3e0br+dkbojjQ13oeBYm0xBOo6MZSORQtubpvnZsNLXBSjK2TTiTpH86wvmpCSLZJE2l83ix8zQ6b18hSL0ksDglosoJXqP47DHoPHve6hrqe+KyCyzAEdF/qEuMJUylsbWNR3gJGiGnKc36OSfSWZ3pDlIykiPXOEWMtBxTi+zVMkeBZqooWDbtXSe5fdm1/OPBn7CkooE6f1mRIcnbCLcDt+ng429/L9/42T8xGB9nnr+MoNtPwOUjnc+y6/yvGZgaZ2lVc/5Tv/y77u7IUM9kOt6Ts/MRWynf0qrmj29ZsCI4nJjgtsgOzBr/bG4nXlLNXBjTIRMhAVMWR0JOdj32bDjkC7Yzdfk1Tsh49JweG6pStSEbC6d04hIes8Qoq6AwNTcA+wrZeN7InsmRbZySYWuKxJNRkrdUEpR5bKoIcqjrJFUbSrl98bWMp+OXlhYQLL70OV186O338MXvfZXr5q9ldGqMiVScU+PnLVurPo/TvffnZ579hSHkwVpfdfR4dgyAUkykwLx18bb/0j7Swb6Th9hRdi3aZV5ecYjLKS6hgaBjdmykEEM4VEWVP/TuCox7w9iz9a7bMtNjcqq7XFcss7SFV/owhETCbz3b6RXJhFojtLpetWzukx3xITH0Sacwb2nRVf4joodGKpgupOkviXPzwk10TvbRVrGgeOJSQNA1e5yA24PX5+f+5x890h8fe+ZsuO/BiVT8r8Lp+Jd7E6M/71fJzrDKZHqzk5f0jBV2OtOes/I3vG/NbTV7ug/R6K/BVx68eIJKo8dyMGWBR77cEQnB3pO/Zn2wWa6qWrizNzKyRmQL+RrpC1dLbz4k/ZYSenuVKF23seI2fIaf7myn3p/cvXfYir0wZwD9hkr5CN6ZIS1icvRvhsUUXpxbIyIlHjKOcl5O7scr5fWtG4K9sWFay+svXkPIjZByxtlrqkurONZ/5hlrKvOhR8Mn907YqYGozuaSF5iAV5CIzqYnoxO/iqRj2+5YurP60RPPsnreVZg+VzFgDGUhr4olXaSALHNeFmRsrfnl809xTe1yWkrrHDubr17sc3ruHp6efE/aym3K6vygA7mqTlSs21x+O34jQG/uvH4huffZASv8/JwB9BnWcFIkxgI6dGtCxs5aovDtc2I0HpHJXFikdo+J+J+FPMHGnS1Xr8xaOUJuH05pom2N8DvBKWd9lGkYJKaTnsHExA+OTnRnf9MTi6hMOBydeFxpe21Dad38Y92nxMoFbeA20bECwiHROYUwBYQcl9FdedvihRNH2Fa3HFMIvE4X6+ctFre2XVOyYf6yJS+OdrZl8zk5j4q29eW3EDJKOZ/t0s8ln9n92wL4ioljTyGrJpn4wbDR+ykT80NAvdL66xGRuiNN9hPZQqZvbDr8Qiw1xYKSaiKZRLFeBUhkL6kpiq9KhMurxJWpsyvJOSs6cKD/+G0Pnt79hf0Dxyfue/ohVCKHLHNCTiHLHWCKl1Ustm2hnRJZ7gVTInTRR5a5fGyet5S7lu7caKF2aK1n53QbwsAQcu6VyCyIVkJF7LHvZcl8BE1I2xan8hPqTCGiekgRTsc7RpORbKnbTywzXUwnhEBP54uz9C/4+7zF5ORkPucTr4q03BPrTBwaPvXXvx46vfMfnn/ggZ/t/mVWmwrZ6kNLgShxXAwsM3poGCbCkKhKLzSVQplnRjmLSc/bF202S1w+rxRCmdXF31WhUajsawYgQI9KcaYQ7pBCHDmtY5dtC2cSPcOJ8bjTMIllpkkWcsXTt1QxeS7Y6JxFdjDKwd4TJ/Yefu5VN7uHyKqc0qems6n3PX3q4GcefuyJtNU5XVxm4TNm6bELFYtpGIR8AZRSxbSm2g+NodlI3hMbReUwHRjSrDLRWmMUZ4yp1xTAC3Iy//LmdEIlo+fCA2NKa5pKa3mu/zggi2Y8lYXuKPnuCL9o3xPf23/sG0HDl59L76G7EOasHc1vXbTyH3/c+dTH7j/xy6hl52eC7uWViiEkLtNJIhqHC7SYx4GYF0AbksP956iwK6iQJZjlF/s0vIo+3aueo1wmg9mu6GBPzi7QEKwiZ+X41cAJCmjyWtE+3sOX9n7XerBz72dUobD/VO61WdLw/t1/z4qKlvseOLbrAz/Z88iYmkxdUm/PVCVAQ+0CHtu7i0TPJDqZL5qv28QOuRgai1NGKR5M8sE8WmoMTLTAfaVkufQK9L35ai+kubTJGpqe6EzkUni8IW5dtJndvUf50p57SeYzLK5qxuNwjcRSUw+csWOv6dKuz7ffp2rxPJI8+nB+aVXTT1fJFX7KLzTqiwn21sXrePLws/n3/vDznbe3bWt79/bbTF9NiGmvYippYSCRSpM3cgiHwCt90sAof+l3LZCmXO/fcUu1o+6aGkft5PH0r/eeSB9r77SK1/SqNXBX5BgTydi5yVRMaQ0OaXBT6wa+csPH+ebb/zMf3/H7OIKegch0/HWZUjFKho5Y/1PfOfzQk/nJ6aLvvSSZcQrBn972fjND4V/+9rkffu5/PPitZD6ZJZVPI3JOFAKXbZDOp8AJfiOAU7gbl8vKyzCpcs4L+aT3ryLW2LISo/QL91R8/Lkmd+tHN5lNczNhgJSd7R5ORq3i1BRdTGwXlEBTCOr8aFOMKa1ftzXCjd4a1R0bGopnU8Xq5CW0V8Djk0KIpT6H++8f69z/9V8e3K20Bqd2E9TVOLQgHZ9G+zWlZimVZtWitEhdxqqmrGT+UOq5xw9O/+qOX8Z/8uWcyjvvLvvDrwzqoRVzBlApNRZPTSVnGWOti3mX0wQBhpRZgXi98COWnZYBh2eR1+cFh7yM7tJS8sM9P08PTY5++1h2VClbfe1fDjx6YHJsEqkNSnUdttaEx8cRZYJys4JW95JFUpqbF4mLiwcSVj6JkN9HOfOdmVM/OZM5PtLmXhlqdS++dc4ASiWjsex08kIGphUz3bPiSMG2nFq/fitblbAXvX3Rlq3+ihKQ8iLFJQRnh3p46MCT39NKHQTosKOJvvjIpx97YVfUthRBXUYSxfBwL7pK4xROtgau8zf45n/L5/LsaJUlEmCYac7mJ3v6mKKgc+HJwuiI0koudF21qcXwe+cEYFwnk2mVi1/oiokZGvhCHWIajpBhmK/LaqQVgTrnDS0bP3fXquuDBF2X9V+U1jzz4nMDg7Gxr3WoiwHsjg03tu/pbf+rnJ2zXLjJU0JiaARVqcCA9f4tXBO4vvk/rbrp4eayef/QIkKznboNjhYc0rUgYJTUew0vcTu60S+DfzyniyuglJKEL+1bzDJOQuBwOits7NccQBdQ7Qre9IHVt94drC5DmPKySmQsHlbPnjjwnaQ9PXDp5/7y2X9WE4nJ9oxIWTaKgG5FhONMGXHEfEFgSYBbPfcwFE7471p2/T0et2vBhc9O6rG65d51f7vGt6mu0lGlwoXw/mq14HPmXC7EApAyri/h6LikIij3ldS7DIebSyj110KazYqqG1o2/e9V86/yEnIXv++Sc3j25MGRI/0n7xtDqVdobEUTIm7ZWBh48WfLOHfkJBvXXAvjsGLrKnbsfQ8/Pfk9t5/AV9e6XZ1O4Srb5Nu+9drATYs2B7bRmTuVjxeiNRvU9WVzAlCBMpSYXZR4kY4ToBUtdY0h03A0AideK/CWmtVyfqjiC3ct27nErPQhDHHZRKTpXJaHD+16UmjRdwXHOZQUsb4smWUOnNi6gSPPHGDNtRtxdbsx1hjcsu0dXHNyhzPcN3n7dHZamcqUoViIyppqzLTBk4cfcd9pfWhjQk8zJwD9wiGDpruqGIEV+kIEnOlvLpm/0KwprdzI9MBrBmDKSm++a9n1H1xQXQtB10zdcXHC4Yn+DnVmuPsXQ7wyL2ALKzmtpw6EmVgWpAQwUREP7f90hI1/sgUOgGyQlKwLUdISgjzF6OQBJW0e+tqPCcSqCFBCv+iZWxSu8ld46wNV9QJ9kc66pPkd9PplbXnlzQvFa7OWo1H4g1saln/5rmXXeSkvErdc2pAXgjMDXYlsNnfkigSo7VAZkXy0T3ZaaYqrIjz4OH2ig7PfOYtarSAA4pRApAXCKaAJCvMKPPijf6Grq4cgpUwxxZgYHJqTBgZNV2NTaV3VBfenXzKrzwSuqmtZt+vYvhpgbC7ftVCGZJkv+OGPrbtjqy8UAL/z8llcM7ck6B7tH7GVfUXmp0NFaDNK9w3J7hcHVMO6hSwu3kxN2Tx/9HkGewdp23wV/qt9OPxOCiLPxIvjPP7Th8mdsanQNWRI08d5InLsgTkBuLy8eVmFN+QFPRMEBSiF1nJ2zs/y5sVVCNajeWRO6idE1U2tmz67oX6JKSq9swsgL4386UKevtGBtM/0Kqwrr7npKMQSSxzyU8eN5+932M4FTbQikSit6Iv00fNoD/ZjBUzTIKdzqILGTwUBBFmy9NFDn3F2JCYmvjsnE67wliz3OVxytgLQGmx92UyrluoFzupgxYq5mm/A6dn6tpb1NY4SD7jMlzfbBUSnpxiLT05cSBD+1VRImwdGZUxspUYAAAIiSURBVP/v7TMfOXRMHFQpUrPuwMDAqdzIvANPwY+PABpNlCidnOWMcTg6KDs/L4XR+ao10AEy6PTWmbJIaM5OwrXUJXohKPOX0Fw3v7I8K3gi1/+qAfQ63IvmlVRDoHh3kJfPmBGc6DilYsnELi2MfxPAY9Y4C43yF6dk5OaD5lOfG1X9f9xkL/aXUokTF+Zsu0iTJUeYcYZkd3ZU9j01JaJfNDBPnMqPq1cNoBuchpALijNRZ2ZOaQ22uqz5bdk26VwGS8xtVUHeyg8MTY3TMFldxMxdvHeXbdskYnGOdZ3m+3t/vK9gFX7UYf9mt6TpsiNgE11klP/5eePU0yOy9ysVqm5Via5wOrQTgJzIEBXjySkZ3psRqW9opfdrIfKn8uNz4wMtsOLZ5KnJdGJbtTckZzUwbUFp0aFbWrPr2L74mb7uh7vV3O6pGs+lHvy753+0tDe+45YSt78sZ+Xdw1MTtI90WOejwyPRbOIXWvOP5+zob31Dn047opZT8UxWJA8Mys5lA6KzTXCBUdBx4IBA9J3Jh1+m2XOiSuZLX9mOhjVf2dqw+l0hT6Binr+CSl8pVHoZyIV59sQLE7tf3P95LHHvC8me1ySVEeD3gd8EpwcXZWbAkoaMn8xN/E7uMzonAO+qWcOvx8+ZXsO1wGGYK1yGY4nX4a5GCJKF7NlUNvWM1PScVbE3zc3G3pK35C15S96St+QteUvekrcE4P8DJVtUGUwHKt4AAAAASUVORK5CYII=</field>
-      </record>
-
-      <record id="base.user_phu" model="res.users">
-          <field name="name">Phuong</field>
-          <field name="login">phu</field>
-          <field name="password">phu</field>
-      </record>
-
     <!--Department-->
 
       <record id="dep_management" model="hr.department">
@@ -193,7 +92,7 @@
 
       <record id="employee_fp" model="hr.employee">
           <field name="name">Fabien Pinckaers</field>
-          <field name="user_id" ref="base.user_fp"/>
+          <field name="user_id" ref="base.user_root"/>
           <field name="department_id" ref="dep_management"/>
           <field name="job_id" ref="hr.job_ceo"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_2')])]"/>
@@ -205,7 +104,6 @@
 
       <record id="employee_al" model="hr.employee">
           <field name="name">Antony Lesuisse</field>
-          <field name="user_id" ref="base.user_al"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="job_id" ref="hr.job_cto"/>
           <field name="category_ids" eval="[(6, 0, [ref('employee_category_3')])]"/>
@@ -217,7 +115,6 @@
 
       <record id="employee_mit" model="hr.employee">
           <field name="name">Minh Tran</field>
-          <field name="user_id" ref="base.user_mit"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -231,7 +128,6 @@
 
       <record id="employee_niv" model="hr.employee">
           <field name="name">Nicolas Vanhoren</field>
-          <field name="user_id" ref="base.user_niv"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -239,12 +135,11 @@
           <field name="work_location">Grand-Rosière</field>
           <field name="work_phone">+3281813700</field>
           <field name="work_email">niv@openerp.com</field>
-          <field name="image">/9j/4AAQSkZJRgABAQAAAQABAAD//gA7Q1JFQVRPUjogZ2QtanBlZyB2MS4wICh1c2luZyBJSkcgSlBFRyB2NjIpLCBxdWFsaXR5ID0gODUK/9sAQwAFAwQEBAMFBAQEBQUFBgcMCAcHBwcPCwsJDBEPEhIRDxERExYcFxMUGhURERghGBodHR8fHxMXIiQiHiQcHh8e/9sAQwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e/8AAEQgA4wDIAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A+YLpJGifLBtpwSDkH6VnNGpcDOD6V0AtlkjRYwWKgKcjrWLPDJDNlkYDPUjrXPFmvLZ3JGTbgD0rQ0dsq6Hsc1TMbyKGRSRVjTVMdx8xABGOTWMk2rHp0akVJWJtVRDbrvHAkXv71V1Kyiig3xAqQRnk07UbhLmNoVU4DZyDnpUEt1JJaiAuDgYJxyRRTjKyFXq05SaZQZfkLAnNRMPm65q8IJPKD7G2NkKxXAOOuKqEcDjBHBrqTvsefytbkYRc8Uo44x+VOx6CrMFnIzAyIUTPPrRcEiBf9W/4UzPPStGa1iDuIchOPvH0qWDTZJXKInzKu7GDkipckUkZYUnn1oVGZgFGTWxHYuTtUKWzgKOT+lPhtQBhjtUnG7Hek5FoxGUgkEVFJgcAc11i6EJ418mUGNs4d12gn/Prim3fgjVAC0GyVhnKqwPfBwe+KIzjcU07aHIGgdKt6jYXVhcNb3MZjkHUVUwc1te+xy2a3A0DpSnpSdKRQlBpcUUCsFIvFL0HQUAE9jQMRThqKCCvJ/Siiwr2Op/tBIuUUmoZriW5ZR5JYdwBmtN20u0ODChb/aOaY2uQxqNsYCE9dnFcCqPoj1nSivikZjXEMPylJMgdMYxTneU2S3a2/wC5Z/LD5/ixmte4FvqUG4qoyOCKz47jy9Lu9NcD76unsRnP86bm101Lp4eDbu+mhjysN+MHd0PPelhUuwGcDuSabNBIuZSGwW4wOuaYgkjlUuCARuA9RXXe60PLacZ6nsvxE0KLR/hT4RhDq7tH9oJ24IMo3Efhx+VeSTRb5WQDmu38YeK5/EOlaJZMjpFYWSRHd/EwGC30wB+tZ3hLTra91tDcgtFGu58H3rzsthVo0W627bf4noY6UKlRKn0SIPDPhWa7KTXSssZIwqjLf4fnXSW2g2caPI93axquCqyYdm56YBrpL+W3jt1iSMQwMuB/ESAOP8k1iNp9vdQrDYu4ZWzudQAPrVyrORCo2KuoWWnBl8lWW4VxtbyFRSMeh4HPFV9U0+YRhfs9tNklhNGPLcdM5A4AH079615tB1CMhZQssYx80fzY9xWvY+Hbt4mbfvwnyFgTuHceoI9vWkqttx+yOP0y1uLGWLV9sTAFlBY5+Yrjp6jOfwpmhaE93qUSi3aRFUyOD02LySfyr0vw/oNquj6lZ3iKglVSjHqjrkqR+ZqW08NmCOe3uL1o7drQKJ0XAfDAsox144pe2KVE5u7ubC9uIbPTWS18hQmYgEjTAwzE8s7HnHSrmmRKhKWssIhVsPOYW3yE4+XJOKdYab9muXgtrNYzMvM0p2HYeMD09z1roYY9CtNMtYpZhOI5T58pGFJ7KvP1zWbqLoN0mjg/Emm6ZdQSW1/LK7gHyjLwU9MHOe/cV5Vr2mf2de+WrmSNhlGIwcH2r6E1vSbC+nW8sGNvuJVI1RcEdyc9Rz1rzf4j6IsGnSujJL5T7hICBxnHTt9K6aFazsYVqV1c8wI4pp64qcpjHeomJ78etdyOHZDcH6UDBOM5oGD0PWnWzRJdI0sZlRWBZA23cPTPah6E3uxpJGMCnRyld29QwYcZ7fSrOrz21zfNNZ2UdjAcbYUdnxx6sSTVVkZcMTtzzzQtRyVnZMTJcgY4xjAopuSP8aKr0IOxvY8xyEpyy5BIrKBaS2UYyAABXSSqZFCOTtXoM0yO1gjGAgXFeWpdz3qlJt6FPQ4mhtCXyAWJA9BVG/KteSFT1Nb89vPPEY7YoGCknPpWFdW8trOEuI+TyMHg++atSTZMocsUkO86MadsJUHzMbfUVWhfy7pJSgcDjkdqJlZZMDaoAA6d8DNTW1jdXCb1+72JOM4rWNlHU5Zqc5qy2LN9P5sCSxDbgEENxXWfBvE9xfebgpgbvlBOPQE9K4G7jMYZHX5weua7/wCDKh1v4TIVJAbHqBUzXLTY781TXc7mazK6Wz2aRSkngKq5Oe3qT9KzNP8ADl3eT77narKcY3f0FdloUOLYL5KYIwWC43GvRPA+gRlleSGMBeT8oOa86U3sd0NDl/CPgp4bRyw37lwMHgVdvNE1JoGtILTHz7sjqD6g17NaW0CAKqL9AK0YILZSCIUz64qbNl2tqzxD/hFfEdxp2ya0ilYHIkC4fr0PrWtoPg++nsxbXls0ZhfcoIyPfFe220SfKNi/lUl1Ei4IQZ+lP2d9zL26TtY8dv8A4ZWs7tdSyNK7cgYx9K5nW/hhbbVZGZCvQAZFe7XI9qwdZQNGcAUcqRrzNo8FudDl0WbLQpImzG8sR+dcP8SrCW98M3KQrbIx2sXZwqnBz948V7vrlvFcwTwuASBkGvn34uxHTvD1zFDMdsrBcZPHPP6VrQ+NWOat8LbPFbmAwNsZ0Y4z8pyPzqjIpyT71aBJyCxPHFQz8Hj0r25OPN7ux5PLpqQFHxkCmgc1LuKg8ZqIkk5PWhamckktB6cnjBxViOwupIzM0TrGMZZhxz0qC2dUmBfGK6dbj7VoYjjfasSKHUj7xBwCPwxWFWbjsdGHpxqfEc3JA8Jw6Yz3orWnjUoM42YwaKuMtAnRs9DormQxxs+Mt2FYF7qF4C/zBdrbTiuiu03Qvx1HFczfKN8u7o2D+OBXHRXMz0cW5RehY07Vri2uEEr70bjNb+rwrNp/mgD5PnX6d647BII646V17Zj0AeZnf5GCD9OKqrTSd0Rh6jaakYN4G+0kFSDtH51JbX81tEI02YznkZNNnYO0TZJO3afyq5oixtduGRSduVyM45ouuXUaT9pZMy7ljIWcvuPtXZfBqQx+ImjOMPH3PvWB4iiiSRZFChj2HcVq/CaZYvGVqXICkNnI9qG1Ok7Gc4uFWzZ9GaVZRRruyc/e+mfSvRPB00RtwEjIGOM15rNqRjWSJhggAA4ruvBJkFqsjbgD0z3ryJSsz0oQujurRieelaEUyhgDWba7fKAzljWjbwM2CRVQbZq0ktTWtbhVx/KrMswkHUCqdrbbzhjirDWLKeH4rpSdjzZqCkZt6eTiuc1mRwhwOldbeQJGv3sk1gav9kjiZrieONe5ZsVnKB105xcTgdYwYWkU8kFa+e/jApk8PXxlKq8M6jGeT717R408SaRp0pijuhIrd0ORXjPxJ0278Rx3D6SqzHyPOfDYyqtzVYe6nZmddc0NDw1xzgA+lROmARk/jVp05I6HPPtUOCCQQa9pHiO5WIY9CB/WmMAR0wassdsRwOp5OaiIHU/4VSZDK+Dmr2lXps5WDH91IhRwPQ96qOMnpTQMUpxUlZhGbg7o1/OilhKCUc9/SiscdaKj2dti3XctWekuu/jOe1ZU+iSzSttkRVPrV7E0gB83ZnnCrzWZrglt44ZPtE5jdirfN3GD2+tebSlrY97E07w52ixb6TY2R3XVyrEDOCQBUeq6hFPtt7di0efmbsaxDPB2Qk+uKako3DaOBiuqzerPO50tEXnHyZHVSD+taFlYvOBIJvLzx8vWqGePqK2NBcbCnoc1lOTUdDto04zmrjNQ0qOGJXLySFuCWNdP4A8DeKr23j8QaRphmghkyCGAZwOuB3rK1GW3NvteQBgeAa+tfhtHYn4a6Dc6WVCGCNQU6hsYYfmDWPtZqJ1rDU5TPNNLuPt2tWiXMbxkN80bjByPb8K9Ta/jsbUM/Cg8cdBWH4v0xf8AhM7W7jgCF1/eso4LAdfyNb/9inVJo1dz5aYJGetebN3ZtyqKsRWGvazfXGNOhUQp94nqT6ZNXbjxJ4vtSBFYW8gXqN4bP61HrOm6hBCkFgGCZwx7AfTvU2n+HreTUILny53CgeYJTuyRjp9cV0UUpaXsY1Yu10rkmieOteknMV5pGxc/fB6V3Gk6rPeQBnUqTzgZrLh0uCSV7gwJCh6RgHH/ANan6VJ9nunhXgenpTTnFkunCS0WpD4t1ma0i2RAmZvuLnvXl/inTtWuiRqd1PiXjZGmQRz3Yj9K9D1tUOux/aFLLIpVecYOc0/VLV9QEYfomMNnJ/M1cWr+8S4OySPHZ9C0aS4OiT6c8NzsLBpXJJ+hzjvVXwVpC6d4yksryPEDWkgBPQDg/wBDXpV14fVdQW8kLSuowGc5NcZ8QUMcWuTxS+TLHo0zRsODuBH+NKOs7IbSWp8j63EsOp3MSfdEjbfTGeKzn9+ea6FBZajCqSErOPl981HpWjGW+YT8LFzg/wAQr1VWSvc8iWHlOV49TnpAQOgFRkEcnn2rvpNKs7m0mj+zxrMoyrbcc81xmoW0lpI0Lg5B64qqVaMzPE4SVHXoU442m3Ku4kDI96rsSDjGKuWU5t5S+3ORjIqvLiSRn6ZNbq9zkdrEXHvRSgc0VRJ6ROoSUBeMD0rN123e6s2jTJZWDgD8q1b5SsoI71AeG3N3XtXz1OTTufa1aalBxZzEekS7dz5A7Z4qwunxxqSTz6AVqyYUEHsagmbIBA6iuv2smeYsJTiUHXaRjp0q5orlbgr2ZTj61VkGRzTrGTy7qN/Q1e8RR92asGps32j5s173+yP4tkj1KfwneTZtZf8ASLcMfuuMBgPqOfwrxXWLZXi8xetM8Ha3d+HvEFnq9k22a2kDjPf1B9iKElOnYcr06tz7l8eNbiWzeMgkSbW+pB/+tT/D037wrwOKyNN1ez8XeAl1Kw/eNIgnX1Rl6r/MVJ4cuBujk3cMOa8isvePQjblO7iiV1zjOfWrduiJ0jH5VUsZFZB9K0IsY5ramluc9RhPnZnGOOgrDVxHfE/xZ5rW1Wd1tZDEhLAcVzWnuvmu8ko3s3c1U3rYuhH3bsb4tYt5Myg/I2SRV7TWE1orD07Ua5FajTZHa4UnHrVXwg5fSQz8/MwB9RTad7l+70JNUGyJjnivGvivfhNO1V42jBNsICT1+c9B78V674mmEdnIx7Cvlv4nahJPrckXmEp94rnjPat8NDmqI4sXU5IM8lsfKhkmEjqsscmQD1Na0M4+1rMuQSMGub1net/MWGCXJFSWuollUtwyDn6V21qOt0edRxKUbM7Ka8tLOBrlgVXqRn9BXCaxfyahdNNJ8q5+VOwFJqN/LdsAxIjX7q/1qkcnmroUOTV7kYnFuqlFbDWA74o+TaARQ3PB603FdLOEaQD0opTxRQB6bfruAOM4NUZQPLHGQOtaF4vyEcc1nnlSDXzUGfdTKjfM7E55qCThM4qd+D61DJ0NdcTgqKxUk5qIHDVM3HeoTwxrojqjkk7M6RFF1ZLyOVrnbiFoLgrit3QZN9vsP8Jq3HpKaxqCWds0XmkFizvtUADJyf8APas6cnCTRtXip0076nT/AAM1/XbHXjZ2OozQWjxs00QAKtx6HpXu/hW5eKaaxlfLwP8AKfVTgg/kRXA/CzwW2maSbmeMLPNjcR/CPT9a7XV4JrGaz1ONSAV8qb8Oh/mK8vEV1UqtR2OmjBxpLm3PUtGuMqPet2OTjtXC+HdRSWFW3DkA4zXX2cgliLA5pxbSM5WZZaeMkru5rNu9It50eQwAE91ODUWqQajD+/s5lPrGVzge1ZyaprAVh8hI7Zx+ldEWmXSozmrxY2bRGjHmyNNKAejHgCrkE8VvbrCqbABjAHSsTVdT1l49okVCx4CjJrQ0qzdbQyXk8jSkZJY/06VM2uhVWlOktWYvje+2adINwzivlrxPdC41i5k6qXIB+le0/GjxNb6XaSR+aFd/kX6mvBJJlmywYNu5yO9enl1LeTPCx9W9onF66pk1GZiRnPbpWU6lcEcf1rRvCftMoPUO2fzqhPnIGe9d73PNuNxnmmk88mnjFMYd8UwA+uOKacdqcPXPFNxz6UBYa1FB680UxHqc4+Tis08PjrWjKxwV61SuAFO6vl4H3tQz5hhsn1qvMeetWrnqfeqkhBFdkNjz6qsyvJ1NV2+9jnNWJf0pqqAckZNddOLZ51eoo6E+nvLGrqDjd1rpPBOoW2leIrW9vIzJbq+JFHXB7j6VzsIwM/j9aswEt1NaypRaaOJ1ZNp9j7T8NQWF/pEVzp8sc0E8e6N15BFWjpcd/ps1o65J5H1r58+BPxEk8LaoumapKX0e5b5snPkMf4x7eo/HtX01ZNGLwmF1eN8SRsvIZT3FfO1cK6E/I9qlifbR8zzS1muvD+rfZrjd5DNhG9PY16P4f1JJI1IYEHtTvE/h621W1LbFJI+bivPSmr+F7tiUkuLTPUZLJ/jVpMHJNnscL+Z8ygVU1OwM43JGu76VzfhbxbY38atFOhboyk4Irpl1m0QbpZVHGetbwiTzuL0KMOlxxZaQKH/PFYHjHV7fSrCaeWdURATnNa2teJNNjt3ma5iRFySxcCvl/wCOXxATW7g6Tpc5a1T/AFsitw59B7VrSoynIyr10o3ZwvxG8SzeI9bkuNxFujERKT+tc1Bcy28m6NiQeozxRIQevNQP04r2IR5VZHi1Jc7uyrftuvJXAwHbdVK6+6CPUVoOofg+tULqNkIG4kfTpWlzCxCDxjFGRSj2oYZpgMLBW6U0lmPFOPX3pOnagLiYz1NFO6UUxnp2Tmqd4MpzVt+H6VWuDlG/Svlon3dRWMyY/KKrSEKDk4qxcMqIQx+btVAku2TzXp0KfOePi66p6dRCSwyegp6r0yaAgqeIDcBjp1r0IxUVY8WU3J3ZIqAD5TmnJxwR9KMZP3fyoJ2n2oM7lmGTkZ4r3D4FfEf7LPbeHdauD5OdlrO7fcyfuH2z09K8KQke4FTwyYOQSCK561FVI2ZtSquDuj9A7SUFB0INU9V06G4RvlGT2rwT4JfGGONIfD3iu42gYS3vXPvwrn+v519ApOksKyRMrowyrKcgivMdJwdmelGqp6o871/wdYTTmdI2t5s/6yBih/SsJ/C8zs0cmvalsH8JlHT8q9J1eRQrEH9a828YXjssio5QAHcwbGB9aqK1shSkeWfF+8sNItjpNhLLcXEn+tlkkLbR6DtXkkjk8+tavinURqGuTSIxaFWKISeoHf8AGsbPykehr1aMOWJ5tafNIa/X61G5wKc5+U4qFmGDx2rc52xgPrzTZFVlPGfrSjBzSE5BFAjOljaNyD09aYTxxWhIoZSGGc/pVKWMxtg00SQnnnvQB7n86celBGQKYDc5/Cil49MUUBY9PnHB9qoXUgjRmY8YrRuxjPzdRXN+I5zhLdSAWPP0r5mhHnkkfdYqapxbZQaVriVpD0PQe1SLjGOlQooAwB0FTRjpmvehFRWh8jVm5yuyRB7mpoV+UtkjNNVRipwuIwOOKu5ixq+1OODwe9G0EgngUjEZxmkSKrHoTTwdvIqE5HTGRTt3GaBj3k28nkdeK7nwF8V/FHhFEtrecX2njpb3BJC/7pzla4IEdD0qJsryvT0pOKe5UZtbHv8Ae/H/AE+6sSH0O5juCPurICufr1ry7xl8QNV8QI1vGFs7Rz8yIfmf6muPLA8+vamFsHgUlSitUipVW1YQkButNU/vWFI3DA+9BbE2R6VsjIR+GIqCQYNSyNkg96hl/vGgljenPT0FAGBSDn6n9KcBxgdO9AhoU9TTZIg64IzmpV+dgO1a3hrRbvXNZtdLsYzJPcSBFGOnqT7AZP4UpS5VcaV3Yy77w7qdrpcGptbs1nMCVkAyBg459KyCnHSvtGbwbZ2nh230hUV4reBYhkdcDBP414l4/wDhb5Mkl1pACHqYj0P09K46eMTdpHZPBu14njJznFFXdRsLiynMFzE0Ui9QaK7VJPY43FrRnoF5KNik8ADmuLuZftOoSy9Qp2rXQ61I8NrIw6beDXLWHMQbuxJryMBT3kfS5vVekS4lSxjBpsSljgVbt1UAHH516iR4DdhwUlRx9akYenSlVyM4pvmEHIP/ANegybAEgcjFMk/vDrTpXLAdD9Ki39/50xXFVtw96RDgEGmE7TkHijd/EKZSHFiM+1MJ460snYjp0qInBosFwJ+Y0E4ppPNIx4HNMVwc/MDTGP7xeeMUr5wDmmOfmWgVxZODUUh9TwKlc8Cs/UnZICV4O6mS2WAy560pIPA4+tYyXcgPIBFdd4K/4Ra8uki1y4u7cEjJQqF/PFTN8quOOrsQ6PY3N/eRWdjbyTzysFjjRcsxNfWHwP8AhjH4Q046pqYR9ZuY8EdRAp/hHv6n8Kg+F+meEdFtVl0K1h8yRRm4Zt7t/wAC/wAK9Ktb1XUAGvPq1XN26HZSpcurIr23LEgqNvauZ1jS0k3AqCK7Qsjqc1QvLcEHgVzTh1O2E7HhnjjwRZ6lE3mwDcOjAciivU9QsUlypAz9KKzVWcdLmjpwlq0fIfik40txXO6eM26fSuk8WrjTHI7cVzelkeSoPoa7MA/cYZv/ABUaUWAVHqantzww96rREbh6Cp7Y8Me26u88dkqt82M9RSHJGR1FI3PPSkDfNkHg9KaIdgyAcj8RTHw2QRgkU5yPxpuRjP8AkUxELMycN0pA2MqPqKlkUMOaqB2VwrZ46UKwXsWg2V571G36ilRhkj06U2QndntTACQQajOe9L1z1zSH3NMQjkcCmMSCKVjznimSEkr9aQNj5D8tUNSP7vGOpq23TrVHUjiNfrTQiiEDDtTVDI2CeaFJB4okJJzVMSOq8GeN9Z8N3Cm2uGeDI3QsePw9K+i/h38VNN12JYzMIbkABonIB/D1r5MABGRwamtbia3lWWGRo3U5DKcEVzVaMZm9Os4n31Y6ykqgq4I+taK3quBzx618g+CPizqWmNHb6puuYRx5g+8P8a9v8K+P9K1i3DW13G5x93d8w/CuGpSlE7oVYyPQJ5R5ue1FYZ1FZlykgPsKK5JXudd0fKnilz/ZcjN1Jrm7A7FUf7Na3iaUnTSM9TWNCcLHz0OK78DG1MjNZXqmlE3yD1JqxakYOecNVVegx29qntT8rH3ruPILJGR2pmMp7jpQDnimvxyOxoJG7xjmhgMZHHrTH4O4dPSnK2Rkc0wGFiOR0qCfDkOvUdRU7euP0qF+DkUxMcjDK+9E33QfQ1G2Aw+vFStzGfpQIYTkA01jjp3pI24A9qH5XGeaAGluaZIRxRk801z0x60CHN93rVLUOYPoatk8VWuxmF/pTQGaeMH1ppoz2pAfU1RI5Dg4708NhhUXfpn1p2eRSGT47gkGprS6ubSUSwSyRup4ZGwaijGY885zS5xRy3DmsegeE/ijq+mOsd+TdQ9znDD/ABorz513DK0Vzyw0W7nRHESS3Og8SE/ZVHq2KzScJn0xUmp3D3ALuSfm4GeBUTZyRnrWeHg4wszsx1RTqXL6NkZqzanMZ+tUbVswoevFXLUnyifc10HCT59KD05pN3OM0jEnvxTJeoxgMn3pnKNx0qRzxTCcjHGaaCw4nIBB4NRS8gggYpnzJ90ZXuPSkd9y8GgQw8EfWplztHOaryNgZFTJIrKCO4oEiIfK3tmnHrnJpJepx6ZpobKjmgQ0ghjzTZPQUsvY+lMc0BsLn5e1QzcxsPUVITTG5pgZIRmcKOucCr7aVKIGldwMDIAGaqR4F2oc8bq6NS7RBAoZMelROTjYqKT3OXVym4eowaWMgEHGSe2akvAqXUgXpu6DtUSkK6mrXcjYs5wAO9GfT9abnJJxQOa0IJVOOaKENFF7DvYtXX+pb6ilk6L9BRRXJS2O2t0J7L/Un2Y1dtfuCiitTFkx603tRRTYgwD1qM9aKKEAMSGGO9QyABuKKKBEM33jRb/doopoSJJOq1Evf60UUmHUa/SmP2oooExhJpO1FFAkZtx/r2+tPFzcLHsWZwvpmiihjID60hoopslk0Z/d1JF80iA8gnFFFaEs7Cxs7WPayQIG25zjnpRRRWTJZ//Z</field>
+          <field name="image">iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wKAQ0xLdB+waQAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAgAElEQVR42r2dV4+cV3L+q3OOM9MTOBwxipREaYFdA7uA7Yu11zBgwPe+8lexv5IB+8rwlSHJGYuVZUkrkWKa2DOdc/xf7P7KTx++Q1LB/wEITuh++33PqVPhqaeqYn/913+9jsVitl6vbb1eG1/r9dri8biZmcViMYvH4xaLxSwWi5mZWSKR8O/NzJLJpH/P6/mKx+P+fr4SicTGNfQz9Jp8Jn9LJBL+Pdflfvkd3+vvuQ9+5pn5Xtcg6u9mZqvVKnI9+J710+fgd8vl0tbrtV+D6/Hzcrnc+Jn38jN/4x6Xy6W/hvfquvM7XQPWm71drVaWDDf2OkHQzdLNDTeO9+vC62v1SxcskUjYer32z9H7etPP+lkshH7marXyzdd71Ovxuqj71YUPhSWZTPr33LsKSnh//Kwbqq9lHUIhDtcNgdI94Rl5Xl2H8Gf2NZlKpSI/IJT+8GH0guHJ0g+8TouwUCqZ4ckOP083Rk87rwmfQx8+1Abh4oYCGwqLnkjVjrrZPE/UveizRAlEqL3YZBU2FRz9GxpVnxeB5HXh8/JzEtUdLkQoSbrY+mGhqlVJvu60qkq67lr62aGaDlVkKOnXCXAoyCrEfJ5uqi58uNlRmizq5/Bvem09GLpRoVDrPcRiMZvP579T37J34UarhgjXTQUsyQZE2bko26KLrAuqm83v9dqhmWDzw00O/QZ9X7hAeg/XnWDVRtfdMydIhSk0ZXr6VYBCkxkeIr1f1RDz+Xzj3lQrLhaLjefhtbFYzBaLhW/ufD63VCrlG856LhYL1xKpVGpj70ITkgydOf1KJpO2WCw2FlA3OGqjowQi9DNCZy5KAPS6ofpHDYbSHWWyVHuFrwkXJupLDwafGapRXZeo0897V6uV2/jlcumOGGu0Wq1sNpttvI6fk8mkzedzGw6Hvids/nw+39j88JCFppPruwkIJTl0ckLVEW4qNxtGB9wUi8P/urHh5utmqVMTerFRvkjUtTTqCBdCFyTKPoced+h/hNcM/QHVZJzq9Xrt37M+fM1mM5vNZpZKpVwY+HmxWNhoNLLxeOz7kkgkbDgc2nw+t3w+/4q3n8lkIk0A+xWLxf5XAPjS8IKHQKr0QVgA3XwN79brtaVSqVe81Os2KhQq3WRUmr5GVWiUH6ECpqpdT7T6Kbwe1ag2W4U+DF9DNa+nP51Ov3INVLwejvV6bdPp1KbTqSWTSVff0+nUtcBoNLJOp2PD4dBWq5VlMhnXAtls1maz2YagJ5PJDRMQ5QOs12tLptPpV1QZQhBlU1OplN9QNps1jSJUAqMwgChfIdQI2GKkXNWfboRuVChQURpBTQYLrIIQOmThFypc1XboK/A3vuewqMc+n89dAFQwEWgOHD/P53NrNps2Ho9tOp2amVkul7N0Ou1CNJvN/JAkk0nfF/Ym9Fd03TY0gKoobnK5XPpG8EBsyGAwsGQyablc7hVbqdogNAvhqRd1tLE5KhChMKXTaVssFpGRRigE6oTxPw5uMpk0NYOYPBUCNlzDqnDTuPdQ8+jBYA1Xq5Vrx9VqZYPBwJ9lMpnYfD63+Xxuo9HILi8vbTqd2uHhob3zzjtWq9UsnU5bsVi0yWRiw+HQer2eXVxcWLfbNTOzTCZjHOxQy4VhbVLVdBhWsfmpVMrG47FfaLlcWjqdtvF4bN1u121QJpNx9C50mDTWj0IM4/H4hr+hYU0sFrNsNrth97lvTgGfo9fQU8k1Z7PZxv3ppqnghrY69Flw4kKwSDdf1wBNMJ/PN9ZgPB7baDTya2IO2u22jUYj29/ft0ePHlmtVrNkMmnT6dSft1KpWKVSsYODA7t165ZdXl7axcWFLRYL9xFCACzU6Mko0CRElBKJhGWzWRcCVFQikbDFYmHj8dgmk4llMhnL5XKWy+X8RMzncz9NqCSNDvSm9KZ5D5vA36/DEXSxo6BctNpkMtnYaDYyk8lsePMKqXL9dDq9oQ31eUKfBfurWod1y2QytlqtbDqd2mAwMDOz0Whkq9XK+v2+TSYTq1Qq9gd/8Ad2dHRk0+nUut2ujcdjy+Vyls/nrVQquSZMJpNWKpX81OOzzedz9yM0pNeDmQwXK7T14/HYT3wikdi4oL5nMpnYYDCwfD5vhULBCoWChykOOvz+dCJUbPhyuXSnhwdis9Vu6+kO4380BqqU989mM1uv1y6k0+nUZrOZbxChLqEVn81nhmGZxuFqKnkWfh/G3PF43KbTqc3nc79+r9fbEACcwIcPH9rdu3ctn89bv9+3Xq9nq9XKqtWqlctlMzMbDAYusKj8eDxu1WrVxuOxC5KaOzXHHLJkFLiDpKRSKRuNRm7rkdr5fG6TyWTj4efzufV6Pet2u1YoFCybzVomk7FCobARouRyOV8kTjt2HhWN2eEe4vG4TSaTjVPFRvP/dDrdiK3T6bQtl0sbj8f+fhZyNBq5msSUpdNpP11476PRyHq9nmvA6XS64WzhgCkit1gsbDabbWhR1nUymdhkMrFUKmWTycRarZZNJhMXUtT97u6uTSYT6/f7tlwuLZvN2tbWluXzeY8GWGcEj1BxMpnYxcWFo4UhJhBGPcmomJgXpFIpKxQK1mw2bTgcWiKRsPl87lFAMpm0RqNh6XTa+v2+pVIpGwwGLtmo6VqtZvV63TKZjC0WCysWi75YCjWzMEhuGOKxsJgGDRFxnhAm1CEabD6f+4JyeliUdDpt6/XaMpmM1Wo1v79Op+MnNJlMWj6fd0Hl+qh0TiP3n06nN7THarVyAYzH4+64LRYLq1ar9v7779uDBw8smUxuvC4Wi1m1WrVqtWoXFxd2eXlpsVjM6vW6m4BEImGDwcBOTk787xwADlMU6BWPxy0ZJiY0xEokEn6Ke72en/pMJmM3btywcrlsuVzOMpmMOzfL5dL6/b51u13rdDp2eXlp3377rV1cXNju7q5VKhWbTqdWLBY9tEN1Et4MBgMbjUaWyWRcfbGJCCiqGMEgKuH1qVTKfRQEdrFYeLwdhqPz+dxyuZxriOVyaa1Wy1+bTCZtOBx69IHpMjMrFAruA4xGI5tMJhaLxSyfz7uQoZYXi4X1ej1rt9tmZnbv3j17+PCh7e3t+d+r1apr4mq1aslk0o6Pj63dblu5XPbnn06ndnFx4UI6HA5dkPFRWIcoR9B9gChol3iVB2HhqtWqPXz40G7dumXxeNy63a6r93a7bel02mq1mtvdwWBg5+fn9vz5czs+PrbT01Mrl8u2v79v1WrVVRwOYz6ft3g87hoE4cKBGg6HvvCTycSFDvVHSJXJZHyTFouFLw5OqcbhGhpyMgjD5vP5xknDZ0gmkzabzTbWZrVaOVIHDsD1h8Oh9ft9f8Z6vW4PHjywo6Mji8fjdnx8bIVCwXZ3dx3BSyaTNplM7OTkxBaLhe3u7lqz2bTBYGCdTsc6nY6buHq9voEa4t+EoZ/6TavV6ncaICo7pRApsX42m7V79+7Z/fv3LZ1O++J0Oh1brVa2v7+/YYvn87m/5+joyF6+fGmPHz+28/Nz63a7dnR0ZKVSyYrFot8s6ns6ndpwOLRSqeSLjXodj8c2Ho83HD6EpNfr2XK5tEwmY5lMxqbTqXvYCuTEYjEHUPDmua5qDrWhGi3wmTjF2WzW0TfWD8eWpE2hULBarWZ37tyxRqNhhULBxuOx9Xo9Ozg4sKOjIzd5k8nEnj17Zq1Wy+r1uq3Xa/vkk0+s2+36vaFViAi4j2w2a+l0esN5VUxDTX5SwZQQqUP9xeNxBx8ODw9dja/Xa3dErq6urN/vW6FQcOnP5XK2XC799N24ccN2d3ft/Pzcnj59ak+fPrVUKmXb29tu08bjsVWrVZvNZnZ1deVqz8ys0+n4aRsMBu485XI5MzPr9/sutLPZzIbDoT80GkR9iOl06g5g6CzhQHGi+CzWBKFRxC6VSrn5BKMvFApWKpXs6OjIbt++bclk0vESrvn+++9brVaz0Whk7Xbbut2uffXVV2Zmdvv2bTs7O7PPPvvMOp2O4/+DwcCdUA4jmq1UKr2S7g7RUieEED5FwbXJZNLG47FL0nK5dD+AB0GFHxwc2Hg8tuFw6DhAv9934ZlMJtZuty0ej1s+n7d79+5Zt9u18/Nza7VabvPRKJxmkLJMJmPtdtt6vd5GCMbf0Ro8j7J4cIgIyVD1vJ6NwGHi+pxywkGNHJSYQXjMPRElFYtFu3//vt2+fdvq9bqfWMLlcrlsN27csGQyaV988YU9fvzYo656vW47Ozv261//2p4+fer3cXFxYavVyur1umvm7e1tv0fFB0IgKIoEk1QnJ4oeRoiFre12u7a1teVxZyKRcCcMxA6PvFqtWi6Xs3a7bZlMxszM2u22n5x8Pm937tzxk8gJwJNl4/v9vm8GPgcYA/eHP0Asz0azUdwfD48GwOeJcjQJ8TQ/j4pHCADCNL6Ox+NWqVTswYMH9ujRIzMzOzk5sVarZbFYzMrlsqXTactms9bpdOzjjz+2Xq9n6XTaMpmMgz+ffvqptVotdy77/b6t12ur1WqWz+dtuVx6xEJkgu8T0vhCphdAWHI6nbrNi8rdK349nU7t8vLStra2XOK40GKxsH6/b8Ph0AVhMBhYuVy27e1tm0wmDhc3m02/IdDFarVqtVrNKpWKnZ+fu9k4Pz/3WJfNXq1WVigUNsJHzYUDJs1mM+P5WMTVamW5XM5V92Kx2DjRRBAIVz6f3/A3EDAFmxCwVCrlm3B4eGgHBweutXq9nt8fWuPLL7+08/NzSyQSVi6XXQM9fvzYnj596sKpzmM+n3dImP/B//P5vBWLRReCEN+J4jokNSRSbD3k0WFjWq2WXV1dWavVsidPnrgDqAsTj8cdVCkWi1av161Wq1kul7NGo+FeLwuCBpjNZlYsFu3GjRtuR588eWKtVsuGw+GGgC6XS8vlcq+kpAkt1aFlgzjJIIGoeoRQEz+kXBF8BLtQKHgIymejbVC71WrVCoWCnZ+fW7/ft2Kx6E4bgvTixQszMyuXy5bJZCyVStnZ2Zk9e/bM31Mul13YMT2xWMw1YiqV2hCKSqXiiTndS+U7hMygJA8fMnRCIoeGWthOzXlr2nM6nfpNptNpOz4+tlqtZltbW1apVCybzdrOzo5dXl76hgHVEmsDKT948MC++eYbe/r06caiA8xkMhnXNqh1NkUdQrQVDh0mBS1Bfl2TMkDc4/HYTQiOJc6hIpzgGPl83iaTiXW7XXeW5/O5h2yK6c9mM+v3+3Z8fGyXl5e2Xq+tVCpZNpt9hYSCEGoCD43Fe3QfVQtcJwRJMlHhyVebxvcIwHw+t3K5bNls1jFnNhKgBBiWB2i329ZsNq1arVqj0XCAiU1D/eJPdLvdjQih3+/b1dWVaw0YMiwUWgBnLJ/PWzab9VAMFJGfsfssqpJczMyy2ayHsmy0PiNwMGaCjQHNHA6H1mq1LJPJ2HA49GfkhM5mM+v1ev7/YDBw7VGv1111A4otFgsrl8tWLBbt6urKhsOhFQoFq1QqViwWLZ/PuylUplEUQVZ/5wKgjJdQCxCjx2IxpyURekFQYLGjSArL5dJGo5ENh0Nrt9t2cnJipVLJ6vW6M1rIgWsGkdTter22vb09W6/X1m63ffNGo5HnGTSDh60n3ELNg9ghaEQ1bKhSsXCyeAYlU6BBUPkIg/L4wAjI25MEUriYz0eQG42G3bp1y5bLpXU6Hev3+zYajdwslkolOz4+tkQiYVtbW1Yqldx8cG115qPYxSHmkwRx0wxdFD+f/wnPtra2bGtry2FWThYwKR/AzeEwJRIJm0wm1ul07OzszBqNhhWLRV9IbC5qi5xDoVCw7e3tjfhZ2Tn9fn9D6EDycIi4j9FotEF305CSU6/ED5ws3VieC43A6VN2EUKUTqet1+ttIJOwewgLcRrff/99WywW9vTpUzs7O7NMJmPvvfeePXjwwBKJhD1+/NgSiYQLFY4gzwbsGxJrVXhDTkAydK6UxROSNFjIbrdrs9nMyuWye6jJZNLK5bJn0IBE2SxQKuLfcrnsMTMqTuFYVD2bkEqlPFkzGAxstVo5SUTBGBIwOJfE96VSySMdngWUThm5OJfcR5iL4DPJTCqLSqHnRCLheEilUnEzQrjLRm1tbdnBwYHdv3/fJpOJ/c///I+Nx2P74IMP7Kc//ant7+/b5eWlff755/b48WO7uLiw2Wxm9XrdisWip935F0UBjyoscR/gOgFQ9a+IEg5Xr9dzx4cHA4YFz+ZEsvB49vgGSm1W5q+eNE4VmT60AfdEKEQUgbpTlg3eNH9HowFq4UzmcjkX2OFwaJVKxfEL7pkNJvYP6V+8Bt9EqWKpVMqd3FwuZ/v7+1YsFm1vb89Go5GdnZ3Z7du37b333rN79+5ZLBazr7/+2j7//HP77LPP7PLy0vGDRCLh903oGUWvD/mNoYAkcT50QcNyLYiGhCDL5dJqtZrdvXvXdnZ2rNVqWSqVslqt5naNTCL+wGAwsMFgYIVCwarVqidOULUkfQqFwv+CFBL/p9NpD4PCUi312pU8ClLG33DQ2FB9P9EEwgOYxN8J31DhHAxON9gHqGM6nXZoGFi81+tZKpWyarXqzhv3EovF7Gc/+9kGEeTf/u3f7PPPP7erqytPjqEds9msVatVNz+hE69FpSGBZoMSBoIWVYXL/5xSUr/YO2xdp9OxZ8+euYYgPh8Oh76JkBrIy49GI78xYFNQRLBtEjqAPqgvhJTFHQwG7n8o+0W5epwGzXKSNkVQR6ORdbtdF3hOD+8BNBqPxw68KMMHc6KMH4T58vLSUqmUryGfl0qlrF6v29HRkWf0njx5Yv/+7/9uJycnDrKBGbDG5XLZfQw119h8TX6FxBRlCCcBMa4r7QpLjVDHGg8TjigTJZ/Pu4SiDofDoacwye6x2GiHXC63kWvA8YzH41YqlaxUKrnjCTSqvADUvBZHsNgICouAs6lmYzqdujOIjddcCPep96axNpvA58AjUEY0pqdWq1m5XLaDgwMHjr766iv79ttvrdPpmJlZs9m0xWJhpVLJIfhyuWy7u7uv0O7C2kW0ngqE+gDr9fpVUmgUdqwXQE02m027urqy3d1dy+Vy/r8CF2gL4mA8WBYon89vkEUJ60qlknvZRAI4gZAtlPBBXkI3AUwAXwIsAPOkn4tNV2YvKpxTjfnB+SMtrBlEdUhJlIFzFItFN4ecZuL60WhkL168sIuLC5tMJu7j4CSyvth6NAD+CT4Qgs+948Brql1rFZwVHJUACku2edNsNvMFHAwGVq1WXT3zwSwQG63IFSqQ0x+WO8Mu5lrD4dA/E82DltCEjz4sOAI2n3vR+n08ZsJC5SESp3OawRIAk6CGKfqJE8s9cc8kj/gd+XrIHvwe5HR7e9s/g8MCwshnYZaV6Uv6G3NL+h5NFR5w9+9C/r3ChWH5MbYTlXh5eWnb29uO/vF7bB3ACypcbTDqGgiYBM5gMNionlHiCQ7meDy2crlspVLJzs/P3dZxH4AwRAx6InE+Qfk06wc3sN/vO7qH08V9wUtASIl02HDY1Nr0gtdpxDAYDFwbpdNpJ88Wi8WNAwnuAb+PNR0Oh3Z5ebnhkIK3gINoJBU6hBucwNDmh1x9dQx5cOz6dDq1UqlktVrN8/g4SthTWMKJRMJjfmBlvHtej/dNipeEB963ersIHJuuNYRq69hcNl1j/5ABpckkyKb4Pggtm8HnKsdAM6t8Dj8jIAhxIpGwQqHgryNa4rWEi9ls1kqlklUqFTe/Z2dnjsdkMhmrVqtuprSwBzN6XeVU8nUtWLRsilOEpBYKhQ027d7eniUSCbu6unIqNeEZ7ysUChvZMz6DRUEoFIXUh2IxST2DHmryhw1E8wCzQlPXjVFBgbip1HI4jWTx2GwgcVSsCp9WILE+vAeNqn4MGoT1x2QB8+IMT6dT+81vfmODwcArtXBasf8ayoeV1VGb705gWBKGpCLNWj4FcxZaFhCsMlQUhOEE8rAwXzEpePzqwOAo6TUgPOqJxz7yN8gjLOpwOHRnaLlcuteM567EETJ/EFlwUOHhq5etnneIF/A6NgHhQDXjcyiHQXmQYAgIYa/Xc0LtYDCw7e1t29rackHDjPR6vVcEIOwiEhbCbpSG6QsgNnARVAmOhmLMUL3UYdJKFd4HeyWXy3kxRL/fd44fsLGig4AkYUxPCEclEf4Dmxmmc3H2UOd47oobAGlDKAERVGg5LEdXRwznk+gHnoUykObz+Qb5hChFHW8E7/Ly0vMu5+fnDibhNxGF8D5Q2WKx6GViVAkrOBR2PElG9aaJx+OO2wM0KIhAGEIcS0rz8PDQGo2Ge9nq7CH5gCMsFKcbu0r9u7JeWCRSqnjrqExsPGqewhKcLZJCcPEwbYBASidD4OEjwkxSP4mDQkEMrGYioHa77YtNKIlQazIKv6JQKJjiMUQ+8Co0la3JN+BpyCOAaVoMEoJAYWeyZBRnXF9E2KY5cxw6Ejnkv+fzuTUaDU/0oKYgi2rcjKc+Go3cs0UIMBMsEF47n8sCF4tFP4VhEwp9HmwsWARIJWaEjdPeO5goHEBUuKZ/0Q6qxjudjucCNErAbivXYDgcerkXIWqv1/MNxoFjMwGXQo3C37WgVfsKRYX6nuDLZDJ/GyUE3HgID+PV4zWTxOh0OhseMckWABjsZdhsCmcL+6cpWh5EmzpooQY8fT5L6wUIvwCjtJII/Fzts7KfqYRWUAffh/doKlqjAoSD6+OHABVrpY6matGUHD78I3V+sfcAWJhO/JyQCazInxJkN3o9ROWIkXqyfJy2DTrx708ETgdqCMnudru+mHr6QOU0aYNXTZ0B94AAoW4BTzAfhGkqMFqNk81m/b6pt1e4O4yfgYa1PI7nw4lVmpmukyayyPghqFQ+AUhxTXwJTSFzD5qFJIEFGKRMKD2sXEcPYtjAK6SZJdWx0rw231Ob3mw2LZfLWblc9kwWN4mztVgsHCdvNpt2cXHhcTwnFsklG8cDKhSraCGOpJaO40ySgua0UMqlKeidnZ0NbAHgJ8zwodLBNlRLEfL2+/3INCvfEzJqlw6cNSXOoraV/4BwIyjkGVRzKita0Vqc6vF4vFFVrdB02CrPcZ6oJohqB7VSl1PLjYdJETaSm1sul/bs2TNbLBZWr9edxIBNVaKmEi1ZxJCujaSHDg3ZRTQGwsRGFItFa7Va7jtoVhHVq6GTNpAoFApWLpc3IouwoQXQMHQ5hZUxAUQrmtLmWooXICSsgTpzbCbaKuyHoJwNbU6hvI6w21vyujax3Bixv2aVsOvKR+MkEJ6Rsy4Wi9ZsNr0wFBAJB04jD2w9to3TgDYgQpjP59ZutzccSd4T0r1Qg/V63drttqOL5Cj0FIYVRYSkULBCRm06nbbd3V3nRHBNIhvNxmmLO4QeBw/ToJgCTi/PCEil8DKCo4QdzKtqFu28ErbpSV7X1pSbZ8FB87hJLbNS+0WWj5CmXC67Q4QdRl1pjT1eOGYFaUetad884FxUc7FYdGYskYl20chkMlav1204HFqz2XSwhetwigqFgt8fGobXqs1GpVYqFc/SUQ6mGgYkD22iEDQwOVouDNnCSElVOYLDSeeQsMGEkGEz7lAAXtEAYemQEiVHo5G3IMEBU6+Wzbq8vHRBgRuITbp3755LM7ZM26ngfEGd5tRRWo2NZZOSyaTduHHDYehut2utVss9ckrZbt++7ZuLAHD/OFyq9tUOU52s/YNYKw0nB4PBBoaB/YfEodnSMLTUBBsHQsvllMOgvgfaCR8LB1EFWxt2qnZ01DDsDaTsEsIKkCVsG5Idpli1nBr1pNk+ECytK6RQQr1TIgJt3gC0i53nQc7Pz21nZ8cODg4skUhYs9m0VqvlDw/jFhDlyZMnG02UtKePLhrOKwKvzB+ej2KMb7/91k5PT18pvADtxBSioXgdIJDCwqq+tXsahwUsRJFXTUMjPJgCbaSlbWM8GrkuT6xvRJ3zIKhuPpyNB/YFoEAtKhmDUiZFFzVeR0rpkaMOJk4ZThILdn5+7lWy/X7fzs/PPeTDPGQyGRuPx7azs2PT6dQ6nc4GWql9DePxuBWLRavVahsJLIWoWZfT01N7/vy5lctlb17BsyNAnE7YRBwYoh1COU4yWkDTu0Ds2o5PcziKl6AhNebX9LBWfyfDduvalZoXEpuSsODNmgbV6CAkRlA9w41j/+kGQi5ds3qoX/L4OG4IU7lc9n56JycnfiIhT6B2i8Wio5GZTMYODg7s/Pzc4V78F/6vVquOIaDteBbMHZS3eDxu7XbbisWit9ABlEK44BgSLfA3TAwkETQjf6c1DE44lPRwyoo2fML/wQmn7gCtElkdrAkCJVrSrAHkiQRHsVj0sm9tR6perjZj1KSJtjrF8+VkE5sjEDh/8Xjc8w60m8G5I3EyHo+t2WzajRs3rFKp2N7ennU6HdciQK1ci+wZAofw0cAK+pZqwul0apVKxelqtVrNLi4urN/ve+JGMQGteUD9a94A86RriGOrJBXtTYSvQtaVugMAJ91HCCNoOFX/G+2A1uv13143HEEbHKKWifXJd8NfUyIFAoHfoIAGYaM2jETtqQcconDh3BwWW9OeeL74GIRpuVzOrq6uNihiLCYNmPGi6ejBPfFsy+XSbt26ZT/96U/t0aNH9uzZM3v69Kn1er2NlrFhf2Ht8q10d7x/bDaePYdFW9Jq61d4FcrQDiFvnGHqNtkvADJtZHEtKTTMDuLJq7NEXRsqFx9Au1PxN806AhGjWQjzuB7eNIzjVCrlqkzbw3U6HY+3i8Wiq7ydnR371a9+5bafknbg3FKptJF6ZXFRscTY0LbW67WVy2V79OiR7e/v21dffWX/8R//4RAtMbt62lpXyNpQhAPzR3MC2WzW6xEQEqWn6yHSv+OnafFNOFQiqvm14wDhL6KaCeDhg2tD9ZEuVVUAACAASURBVA67UOlNYuOw50QU6ohwXR4mZLLg1WKvySqenZ15WIjq7Xa77qS2Wi3b2dmxX/7yl1YoFOzbb7+1yWRip6envlnKw+OUl8tld/qobMImHx4e2s2bNy2Xy9kXX3yxQfve29uzer1uV1dXNpvNvLRsvV57M0g2qdVqbaCI1P+ToEIQUe/KiELda09mDgDrqagop/51X8m3mZjB5mKv2XxNFfMzsWooddTDA3qogCjIAX8QAATPmqYUJycnnnINPfLhcOhgT6/XswcPHtgvf/lLK5VKNp/PPTfRbrft4ODAaw07nY4nV9gEFhZNtL+/7899dna2AQbt7e3Zcrm0drvtHINKpeL+w/Hx8UbpPP6OpnYVjuagof2g0ysVD98Hh0+7izebTccDwizvdxaAEKRBpaEmcZbwZEHyFBjRxAb5A62goW5AByCAD4xGI2u1WnZ6empnZ2cblKpUKmWNRsOxfzTEarWy09NT+9d//Vf7oz/6I2s0Gvbhhx/aixcv7Isvvtjosbuzs+PPpuQS0DoiCbxyml+yJrVazebzuZ2cnDgC2e12HSRindAku7u71mq1vLW7gj/L5dKbPCkhFdgc1R/OIAJzYM0hlLzNV8LM/vZtXogah7oM+0SLKJTkGTWpAx8CIcEhhHnDyUD19vt9a7Va7vnjA5RKJfuzP/sz+8u//EsvpNjZ2bH9/X1Lp9OuNXq9nn300Ud2584dV7lffvml3zebS8wNlR3WEM0Y79y5Yw8fPrRMJmOff/65ffLJJw6ykCWkuwfaiI2nvQykkGq16j4PQqw2XKn5YcMn1UjqbGtKWRNA4fST72UCVAOk02mrVCreuBgcHpWkdi0kIQJEqBnARuG9Q98CPGq323Z1deUVQ2zcz3/+c/urv/orOzs7s7OzM+8qVqlU7PDw0FKplH399dd2fHxs//zP/2wffvihVatVu3//vv3kJz+xjz/+2Pr9vtVqNff42QzCT4pgKdJgLMtvf/vbjSwmIZpmNxXp03yAZv4Ul1eOAGwixT0UGFJCq/Z05jAhMDicSmz5XgKAigfVggeooQfaQSuIwL5RY4REYZWtMnnoG0ivYcrNC4WC7e3t+Wm/e/eu3blzx/7u7/7Ojo+P3V9YLBbWaDSsUqlYuVy2Vqtl//iP/2i//OUv7Wc/+5llMhm7d++e/cu//ItrpGw2a7VazcEo9Zwho5CNbLVa9uLFi1fGy4EbtFotz4/QDhbNpVR7soZsuFZbcU/KWdQwkJONxlU2NWSUMMP5uqGabyUAePWUZCFdQL1g9oAYnHht1ITaw3GhzzCADeQONh+7jgdeLpft7OzMSqWSffnll/Y3f/M3dnp66vxBCJfcG6fw5cuX9umnn9rDhw+9OUWtVtuAmUlPg+ZhfjjBy+XSLi8v7fnz53ZxcbGBlwyHQ2+FB8CEo9btdu309NSfN5/Pe5dVNlB5f7lcznsS4DNganXcnCbYeFaIuRwcEmdhNdB3FgBOLYkdbpTFxB/gxrVVnI5N0Ro56M7MuVFvn25aqMTt7W07OjqyVqvlTiIhmlbjoHFAF/Hizcw+/vhj+8lPfmJ37951RhEJo9lsZpVKZaPog+vgC1CKReMqzcqtVit3TvP5vDfKbrfb1ul03DGMxWJWq9U22tLpM3D/FH8Sqob5Fg4kzweaiXMK+KPh4ev8gLf2AbBH1Mbh0NDVilAPXqAieMra1d44eO3KwqWlChD07u6ubW9vW7PZ9JkE+/v7ls/nvU/R+fm5FQoFe+edd6xYLG4kg9brtZ2cnNgXX3zhC1ur1ezs7MydJMgWACgIhTpWWhkdptAXi4U3hNTRcOpAc69XV1de0qV+ElpIwzz8g5Bsi0lRB5rZBjibYBFKZP1BAhCCRYRJ6iwR4uGIaEs0tUcssgqGdt8EnKG3D9y+eDxuFxcXls1m7e7du+4bpNNpq9frtrW1Za1Wy5rNZjgazU5PT+3evXu+uRRQKF9Q+/5Rb4dHn8vl7PHjx3Z6eup2lzZ3hKZRi0wX1Nu3bzsW0e12N7x57LwWq+APhA629kgMKfE0vFD08XUO4PcWAPWAsUna1Im4VeNbJTUqQgUvHhAEFc/3qOWjoyPb2dmx58+f2/Pnz225XHqx5P7+vs3nc7fR4O7JZNK2trY8cfP48WPb3t52zQURk3sijRoOoKa9HQSV1Wplt2/ftp///Oc2n8/t5cuXHqri2HL/jUbDGo2GjUYje/78uTd+UHg8RF05vVrgoYwewlVtdknGUBtTkgR6HRr4vQVAhUBbwK1WK2s0GhtMmjBWBWAB66aJtOa24eGTH6hUKvbo0SPHBl6+fGlnZ2cORmnWi82/efOmFYtFm06ndnJyYt9++639+Z//uR0eHm7M8AkHQcAd4F6/+eYb+/rrr+3Fixcewu3t7XluAObR6empHR8fO8iDxvvmm2/s2bNnG40zdWillr2TNldIHb9AtYD2XAAkol6T5JMigf8nAoA5wHFrt9t+ksrlsjeC1N45IG3a3RpJ5oShVrWefzKZ2NbWlt25c8eFQlPMGmd/9NFH9hd/8Re2v79v//Vf/2WffvqpnZ2d2dXVlf3mN7/xTmXgEdvb2+7MaqfSs7Mzn0vQarWs1+u5k9jtdu34+Ni/v7i4sKurKzs7O3PCKr2VNVJRnAD8gWrgarXqHAjCT1S9oqc6cg/HudfreXNJ1chRDaJ+VAFQdUbcDI+AMiw2Rjt+8X+hUPAOWEC/JHpIFtGF/L333rPbt29bLpezZrPpI1XT6bQdHR3ZL37xC/vVr35l9+/f99ielC1q+eTkxEGsdDpt+/v7Vq/XPcXa7/e9ATbetpacg8E/efLE08gIhxJlwzGy2o9Aq3lyuZxtbW1ZvV73WUHK5tUkmYJHMIza7badn59bu912kxwV+n1vHOBtv5Qxq2FNpVLxn4l5MQsQIaCJkchBELTbZywWs//8z/+0er1u7777rj169MiTLnt7e3bz5k3fWDz7Tz75xD777DO3meGsXvwBnFXeCwDDvRK26exETh2E0LAdW1iJG85XZs3IM/CM2pFVu4MgkDjQYP9MVQG3CNnDb/r6UQRA6+P4B5FyvV57HyFGukBcAIZVyhmA09nZmTWbTcvn8xsNIcbjsXU6HXv69KndvXvXkbdkMmm//vWvPa1LeEhH8t3dXSdVagsXwij1N6iG0l482igSzl+/3/cIQWsZFPELTx4ADtpPYWhCQzQIEQFAkPYdxCwS98NS0qZR4AH/5wKgI0wJD+mxQ5NmNltn2yDhODjkznGA+L1WFnOKmESGiVGzAyrGpt28edN5ftTeA1NfXV15h7KrqysPq9rt9gYHkdY3OkiC1LiqbbANhXcVOMKeF4tF297e9kER+jmQUnXSiY7RJVmmc5N0LgIb//9FA6C2wslUWkYGnw41TNysXDxqDpQkyoLTQFJ77ShVClWKH4LK39vb8w6nV1dXrmHYFOz2fD53u688f9Qsp5AKITYILafOKwAZI294Fl6jgx1Wq5W12+2N3v48jzpuCAcAD+tCvSTUNqhfb7PxP4oAhMObtW2bti0D2ybLValUNhhGmiWjB7G2VwnBErSExs3k5jVkArLWJtKMalNBzGaztru76w2vOEHMJ9J5Q/g0nGpOPGBVrVZzdc6mgHNACiHUZcMY+KCkTy2708ZWaFvtR6RE1O+y+T9YALSbuA4oiCq9xnZpBpFN0qnXpVLJGo2Gx8WYg+FwuKE5MAnMHaTfPvV0mBiEq1ar2c7Ojq1WKydvLBYLn2ISj8et2Wx69rJer7tDhbMHtqHdxbXnMIKpcwS0lbuOvuV3PD//a/ZPi0C01AwtqLkHravUXgBvhQOETSLf9KbwPdpiXtOUABRaHcsD0BaF7KDGtDiOZma1Ws1LzTEXyj2kTW29Xt8Aj/Dctdki7eyVy6hVN7FYzE89/ARiarRCo9GwWCxml5eXXstIBxMyjNQXMFVU+Xm01UcjaHUvCTatRQwLdnQ4Ns2mdZq78ileRwbdEICQcRKGMK/jCeiNsdG6wPwepA1vHnWueYKwvSuOJKeq1Wp5Z3KkXMfNQIciHsavgJ51eHhog8HAnj59aoPBwIrFov32t7/1xed90+nUer2eHR8fb8wMaDQadnBwYNPp1Me2VCoVq1Qqtr+/b1tbW96QgkLRQqGwEcpholTolAOgtZba0EqHXHNQlEuhdRVKHVNyTqQAhBOm9MWaz1dh0FkCesrxcLH1LCbUcR3MCIKHLQTG1K6gYTNm7QKGc6g2kmpkHCRYsldXV3bv3j3b2dmxd955x0ajkV1cXPj0biBYnWgCT5Fnv3//vv3hH/6hN3UGH9ja2vKws1KpWLVatcViYS9evLBer+eHAdgcmFbL6nXGj1ZeAxgpt1Cze0Qp2r4W+pmm5TWCeGVsnGLWWq8fOnZKXdJ+dGysxv+a09ZetdgtnCAWgykjqC/tIMqDQnemho4SLrWF9NrH6Tw9PbXlcmknJyceGRwdHfl8wn/4h3+wZ8+eucqkyIVIgOu/++679qd/+qf27rvvWiwWs5s3b24wlI+Pj+3i4mKjqghvn0iBGb/UG2itoU4rw2/g+TGpOl8hnNymCCRmLao/cFi8+vs9TL5iE8O5gcrl1wFFYYGCUsUpXYLeXCqVnOaMetSCEgAhHpze/TraleHLMGsI8ba2tuy9997zesF+v2/Pnz+3VCplN27csAcPHtjOzo7dvXvXp5ZhGv7+7//evvnmGx80BSwNoPPgwQP7kz/5E3v48KHVajWbTCZ2fn5uZ2dn9uWXXzrggj9ycHDgJWS6ljjC+XzemVXaDIpKYW16rb2VcTDDTB/aCgdbm3WogITd09wEaFdQddiUyKhVPVr1E1YR65RxiJSq3rB5FD3gSVPVQ/k3Dpj28tXrQ96kMxlcQtR4t9v1NC6TOUH5mLZlZvbo0SMHkL766isnp/B5lUrF7t69a7u7uxaLxezJkyd2enpqnU7H0um03bhxw2sm6/X6Rl8gnFEqgNComoQiCtB8gQ6vRiAVGlccBLuvGlYHf4Ut/yIFQHv2aP2/5qDZCGWfhqxWtIfCuTBoSL1qIaY2kdZWKdg1kDDat1KUiZ9AIke7mXBSYP1cXFzYaDTyaZyUkt+6dcsX7Pbt29bpdOzi4sKeP3/u6jSfz9sHH3xgN2/edESTFPPBwYFrLIRaR9lh43F0da4ybF80gA6Z0HpCDfVUfYeTP/TUh/Wd6t+pEGwcqnq97jehHayQUOWp83ft+KUOZMhaCSdXU/2C9Kojh93iVAB34lOg8vAhVOohhzBRQ3ECFpV709CJ59vd3bU//uM/tn/6p3+ys7Mzi8fj9u6779qHH37ooSWRAiex1Wq5FiJtC4WbfL7iG9qMChhZJ6BroYcW5Gqzae2UzhpQSKI1m8oI1v5B4Rj5WCxmSQY98QFawasl32rLUHU6RBE0LlQx2o9GsQBCHxYr6kQg3WQEydrpa5WNfH5+7rOJEAz8B/LtOmO41+t5k0umdkM+rdfrfprhMBK9LJdL5ycy+DmXyzmFjA0g/uf0q33m+XSolbajp9wrbLKpWUk0MmtCxBSOhdE2t684gaVSaSPUUzukaJoKgvbWi5o4rhpBgRu8f8UclPqkdYc6c1B5e0onw9OmglbvlQgC2jnMY3oVLxYLu7y8dBIFQBO+SbfbdeeV59WUN+1hcHbxMxSy1aYXIJKaqlU+H6RaKpv00OhwakUJWTMtog3nAoYnP+zUmtS8d0hG0M3Um1YGLaefEIeEiBIXwOEJX+h8rZ+n71GqU6/X81gXDh8pYO2OoRQrunIQOZBta7VaDgErCxmTpk2ZIaEA7GiBBVqAhWemkZpGjZ6y2ezGVBFtya/VP3yxycqn1N6GIWSsRTdKxdcDG2plNwEIgPa71y5UattxcpRYwQQrat50cZVSrmXL6tHSHBqzAyOYSIBuXIVCwa6urrwlOqcDNV2v132aBu/Vnv2ocO3zq3Q2yCpbW1sb7XAo9NSkE30LwlH2bAb8Ai1xRxtoZzUlniiDN/TqtV5Bcwv8HI76Cb39UAhUaye1758WbnBBBYeIdZE0hhofHh76KHRt0c5D9ft9582jAXRGgGbBtFduo9HwPj6EeDpniEEOW1tbbqvr9bovrrafQYgRYFrPwaVjwiil5CwsAkYPIcJbpb/zNz390MV0Wil2n+whzwRYplpFeQD4SeQe1I9C8KImvkT9/4oTGE6aVlQpjEk5+bQpqdfrdnh46ClSnf5N/Nrv952Qqb2Ew6aFnEZ1QrGzxWLRbt265VVEL168sKurKx8rz0RxCj6SyaTXCSgsjG1U4dRCS04o3ruGt1oRrdM62UASQXoSaRGH2WIDwT1Go5GXg/HMFHfosIr5fO6+js4SwhTomkY1g4wSAHcCQzuqXiwLpBoCgaA3H+VOVKZwQnWOADV/2iufE8rpx1bS1bNWqzlLdmdnx1O6nU7HisWiHR8fe4eu7e1te/fdd93Ot9ttz7hxYsg9EIlwGunYQY8DGMmz2cxTrfP5fGPz9URqzcNgMNgAgWAf0/6F6WOwpunnw2fBStYBFth2spSEwZgpnTqGA61+VJTtj8wFXDeLF0dPYeBCoeBMVnrlgburwGAzaaMCJ48iBmraKBylxvDu3btebKk1CIBJlKOR2mWIImFXu912rz7s74cPwQkiT0+RCnX++XzeGo2GF4dq8ynWRImuSmBBu7Tb7Q2uIyggjRzwWyjorNVqPj6WiSU4s2AnJNbwCarVqkcrHK6ws2mIx0TODAonhoYtTNiMfD5vu7u7tre35ySK58+fW7/f3+CuK8OFLhrQxqkRVNCC5hMkknSxIV2s12unT8MeoukTPggspND7V8IJiKIOuNY5RKhknfaJkJCMwTYrcEOGUDuIE1HAfGIDobtvb2+7Cbm4uLDpdGrVatUpcJhiQj91vqk3hA2tXUQ0dA83XSOaJJIbzp8Np4nxb2dnx46OjqxUKtlwOPTJ1rBpGYbMZtK4WDtXqqOjgA/dNCjBRqKx05gEyKS8jzicTdN4XjUEPkmr1fLNvbi4cJXa7/c36gFRqdqyheeAL8jzaFcUhc77/b6XwuvUEW2gTaka60j4qlpPQTidEKIhofpPYV+AqLFxv1/X5MbUT3UadKYedW63b9+2RqPhwIeWUOFA4ZjQGq3f73sRqaJTOnYVh/P8/Nxvrl6vO0MmKrWMzUTiNUTKZrP+mYSWvJ/PpCMYG0tDSVWh6q9At9ahGqSv8ch1PjCDM/hcchya54dyhlkF8k4mk9ZoNNxH0LAPbYWW0MYShKnheLgwRHQB0IrSMG+sbWIZ6gzjlQoeSA7quOh0cZoWYOcAXwqFgmMHvF4na+K0gQ4SJkWlN9XOaeME/AxidnL+mJjlcumOZbPZdIYPm06IDEVdu6VpJ1P1BxRNZaIq96CDrkKnjOtVKhXfj2q1ant7exvFrpq9DdlZ4Sj5qInwYbVQEnuEM4Oq00ERsFaxV0rgwLNlJBtEEN0AbGiv1/NeenjvtHTR/jfK/lGyI/dXLpdf6WccBX2GKhFKuHbdhjlMFROntdPp2NXVlXU6HW+EwVRUaiDJTUS1bsH/KZVKXiehI2HVWdRMHu1s+R0jYzWZpB3bwxOuML6iuNcKAKoFR0sbQ/IguVzODg4ObH9/3x0oJR8OBgNrtVqOvhGC6ciWxWJh5XLZHSgAIpwkJYHSekVn/GjffG2qqCPtwspbhbS1Q6n25CMzhybCwwZHgL0zHo/d2Vwul3Z2duYhG2APhJUQStfZStp3EY2h+X1yFcVi0ckpCBEOJtcja6r7RnQQzn2+lhSK1BEr41ThpeN0lMtlV4Nal/bs2TNrNpsu+bRuB6zgVKXTaSuXy7azs+PAiHL+BoOBpdNp29nZ8Qfls8IUNZogbN8e1dUsNGtcQxdG43pOVbFY9HIysA3wjUePHtnjx4/tv//7v+3ly5cb08hR19w7k1Y1eaat4bRCWodWcX/ML0ZDo3kQYlLROoyCz7rOXG4IgDJTtVMl6V6cCy3WoIiTQQk4iNls1q6urpw0Cfdue3vbKpWK4/HqBMK+JSWLpGubdmywIpNhgibKf4kalBhVyAoIFZZvA1wRFUBFAwmFkk5Bq5JIVYPp+DvN08N9pKsZJkW1FllM1W4ahjIJhaykjrsLJ5xEaYIkJUsaRumg43Q67V0uyLQ1m017+fKlXV1dOSGz0Wj4Io1GI5daPNrt7W0rFAp+85x+2rW8fPnS4+hut2ulUmmDiMIGQRnTiCCKABlOQrvuNaHp0BF6G23Vf29PdVpKqVSyBw8eWKfTsXa7bc1m0712+vZoqzkQUcI6nYWkcwSUZl8sFr0IlcolzJJODNE2dJqO1iFUkRpA27ihQrS4EQYuJ2EwGFin0/GGSDs7Ow5IMCNHR7cRA+OBY2u10LNSqXgVsNLQFIPgARDU10m1aoHrClrC94c9dfX3YfELCwwgBdyt9YsKVNG48cmTJ/bFF19Yr9fzzdXaSp5ZfQOtkSSFzqR25W1GCXw4KDoUbDOzJPZeY38dvAj+jTPG5pG6BYTQUmdOOiEizQuo5yf+Jv6HSaxxLOowHHKgUv+6jY8qbLkuXXrd96pKNWmFX0RKm6ojHDJOsWYuKUTJZrP29OlT1wzaWFMLa3VSG7UG2H7WSec1cR1FD0MGUNQaJCFf4lGTQtUhyQgJrFlei2PIB8HaQTKpsKHrxng8tlwu59RuRdHK5bK3aydmZiG0uDPqZIdqPIwGNNn1XSufwxMTOpPcDz4La8ZpY8IpG9loNOy9997zg6RNHmA7gTNoGxhNZOHh46Dq/6yVmoHr6gIcCAodKwQADxNnjU4UyqRBihUQQYgUqmVB6f8LsofaL5VKtrW1ZXt7e84DDIcmauUsDpVONSE8Cnv4hQ7RdxWC6zRN6EzqJBTeq8OwILUCDgEAtdttOz099XVDMGiVQyMutCQzB5VxBTLImod0vdeGgUoCYfMpVIRgMRgM7OzszJ0cOnlxw8ToPCxhIPkAOPHn5+fWbDa9iyaZN+W+aUmZJk9QeyB5Oi0T1fv/4+t1miH0KdR84GdB9yLKYOCVAkm0ziXNrvUX4C3UWLDOShQJi0uvFQAdlarACoALOfJOp2Pdbtfa7bbj4bPZzClUOsVbawNyuZy3SwV6PTo6cpIIqg7J1aISFQQWipOk3rq2onvlAZM/WhukDW7+63yI1zmbOHV60NQBjhqfE3YG0RoL6ivK5bJfSwt33hgGsvhadswLyazh+QPKcIMvX760fr/vBRpk2HTyGJ6uDoTW1mjQusgPwDSiQ6i2a8XhQhCURBkKQFQs/GNsfsjk/a5mRDEX7ZqGWUWjcnh08igOJS3ydMCGtpdTAm+UGVBhSKKqASxQVWrTYLZoMShtVV68eGH9ft8ODw8d8MG2U3WrvYNAu0h8aOVMqVTyf/gNIX2c+QQKKEWd/uuIkj9U7cN6ft2pepMghWxdVe8KYlEVxGcXCgUbDodeTcW18DNUIyqLSyOG0IlOggEoNVl7+iJF2twRm02fuuPj442RrtgjcAMtdOB1Gl6hEknMkIdXzxYToZ1BgYPDHkWvc+DedMKvwwi0+AIBeNvrX8fYjQKy1JcIJ4hoOx3lVugoWZ1Ypn9TjbhBCsWBwq4oX15Hu2KbsDOkLSeTiV1eXvo4Vs1SUfWCv4BHr0AQGT+SMuT+EQKlqmt/Ae3H+zab+LYnPAoNDLt0fVehCnsFvs45ex1iqRVGWgSi1H0dSqXtdJQUu1EXgErRiZ84cMDBKkU4G7PZzOr1ut2+fdtqtZpz4Smtos2LpnIRGAAgHDrlIiiYlMvlHEVE7elmaCgYhft/H/Wv1w3RQK0njIqto75/HUbxNgIaFV2w2TCr1IygHbWKWGsP1YeJxWKWhMnKw4Pusfmkd0ulktewa6KkUql4OROVN2dnZ45+gSKGiRhMC2lQTe/qiBSIJ9qrX/+9LiT7Po5eWAKmqValkL9u80MgSkfrvgmqfhvoWjWUIpQcEK3VVO2jmsFR1cFg4PN0ydNz2qfT6cbwZn1IcG8yeGwocf/x8bE1m82NGUPcoBahUi+o49iVc09rVqIKVWPXER1+aOu7KMw86iSGqj38m45+05F63/d+Q2hbS/b0HrT9DL8Lexi7Cej3+96ZAzuv3axDM8BpJURjQ4fDoR0fHzuql8lkvPASyJhYPpvN2vb29kZjJKja/E7DGBg5YcdN7dwZRX58kyaI+nuo/tGMSvyM+rsmdcJZflra9UOFNXx/FOU7bNmnLf3Ub1itVr9LByu0CEEDG0NzIxI46l3CXKVNC1yA0WjkDRNh/AwGA2+ipM4e9oxCEPh/+AaJRMIajYZnwBSxVAfwdZm/60xFeKKi0qakazVUi+qUHv5Np6L9mBoqqkvrdbhE2NgLraCl48lwYdRhgCmjw4m0BbrWtpE5hCHDe7RrNYUPzMYBAatUKra7u2s7Ozsb7c3wM6rV6kZvvTCOfpsQ7nWp4+tGrKm9jUIU1Q9Rc7RcLh3Gns/nG/TyN/kO3yfCCFvLXnftMHu4Xq8tSfiF1ELxLhaLzuHTRgUaKuEVU5qUy+W8Xg8Onzor29vbrhmAfXO5nO3t7TnhlMhAoVL4AkQTav/1wd9kp68TBBZEZx/qc2oLl6hiC1XtmEwGN2hq9k3RwY+Vj3idVtS1W61WvxMArehRlYetRWo4gTpAAQcnn8/78AbYxEgnHL/9/X03AWANygwmsYNPAsRZKBT8c0OuX6h2NfzhvlVFR/kLKiBRIZt601Fcex2YSSpXO4OGTbd+LC3wplz/m/ydeDz+uw4h8Obz+bwDLDokWgtEiOdxbMjW0Q+PDVRnkPQkzCGkUOf+oYmoRZhMJt5ujeJKLVOPsseKE4SC8aakkJ54fd+bSJX6euBvohayf6GjpgydH4pYDgR4SwAAA9dJREFUvq0AXfeepJZfkQ8gw6QZNeBazAFlUQgE41K11z0LCFuIIkZwftq14xRqJhLbqSPkON1aGKEPH5qGsE9R1MnTcbZRztN1v1fnSpk82vFDtaoOh/4xVH+I6n1f7ZEkXIF5w0biC4AKalNHwsV2u+1gES1iKFakTSv99nTaqHYl0evze04sMwHRPho1RLF9o9RsCBeHm6/099f5E6HwYAZD6jl+lHZQjRLAEGz6LnkFjVjeNul1nclJku2jwQHJGLpta/MBHWUWdhidzWZWLpftnXfe8UaOpI8PDw89vQkxFC5BNpt1SrQCKL1ez4tBtahDgZq3IWdcpzIVliY9HUUvuw7CxVGN0hAbSJvAttqp5Psmrfh8vcbbIopRWi1Jipa5uKlUynF9VDUOIE6N2mvIIJlMxu7cuWP37t3zkS7dbtfq9bodHR25KkSTgPejcSCehCHkhrQG6FYYir0poRL6C9quLQqajWIM6+mLQgy5njbLxJ/gfdfhCT+UqvZ9vpLaIClkqLK5+ANskjZ/4GGq1aq98847tr+/7xmp0Whk+/v7dnBw4IQGTgVevuYDOOX03iUFi/Opi36dQ/VdnCJl57xJlYb2X6MjVf0IqvY5oEYSk/FjbP53jSCuZQTVarUNLoDCvYpoEd4RJdRqNbu6urLJZGLFYtG2trZsZ2fHdnZ2NtBEql7QIjrIQZNQVL+gJcg9AENjV7W9XFRPgyiELzw1uvnaZet18bT23VXYl4wc6e7QqYUers0tfyj480Mynq/4TUz7pnw6HOaEh99oNPyh6caJEzibzRzkIU5vNBobuQKcJcid+BbgDrSSo4S6Xq97VKKUcBY1PMlvetiQJo4ZigKUov7XieDq+IX9A3Bsw1lK2sXz+2y64hqvYyq/TfSg2jSpDlZIocZJgpqEyoeC1Gg0vMffL37xCxcSTi3onTaGDAdL4KljimiRgu3UodSh06Uz9q7L7SsdShtghckb3eSopA9OXFiQCt+Bg8Azanipn/tdPf7Q9CgjKep1UaVtobbcaAoK81ZbnELDGgwGTsTQzhU4g/V63SaTid25c8c++OADr5bRChotpcIGcoKippVAO9OfQ3KjkkJoSxOVjCHJpZulsw/CEE0dwzBM472hsCEY2sFU/QLNw1/ns7xp83WMz3WmTVv5hc/1WicQ+HI0Gm10BaFBojZooM8fSGEul7OHDx/aRx995CxeYn9UJaoeRxNgJ+xMhunR9ueoVgoqQg0QcvS+C+PnuuzZm+YkRUUTIeWKk6rZRAT7u1LUtCtK2Eo3Kjp506SwUDv8PzpGIdvjPcPUAAAAAElFTkSuQmCC</field>
       </record>
 
       <record id="employee_stw" model="hr.employee">
           <field name="name">Stéphane Wirtel</field>
-          <field name="user_id" ref="base.user_stw"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -257,7 +152,6 @@
 
       <record id="employee_chs" model="hr.employee">
           <field name="name">Christophe Simonis</field>
-          <field name="user_id" ref="base.user_chs"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -270,7 +164,7 @@
 
       <record id="employee_qdp" model="hr.employee">
           <field name="name">Quentin De Paoli</field>
-          <field name="user_id" ref="base.user_qdp"/>
+          <field name="user_id" ref="base.user_demo"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -283,7 +177,6 @@
 
       <record id="employee_fme" model="hr.employee">
           <field name="name">Fabien Meghazi</field>
-          <field name="user_id" ref="base.user_fme"/>
           <field name="department_id" ref="dep_rd"/>
           <field name="parent_id" ref="employee_al"/>
           <field name="job_id" ref="hr.job_developer"/>
@@ -295,7 +188,6 @@
 
       <record id="employee_fpi" model="hr.employee">
           <field name="name">Francois Pietquin</field>
-          <field name="user_id" ref="base.user_fpi"/>
           <field name="department_id" ref="dep_ps"/>
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_consultant"/>
@@ -308,7 +200,6 @@
 
       <record id="employee_jth" model="hr.employee">
           <field name="name">Julien Thewys</field>
-          <field name="user_id" ref="base.user_jth"/>
           <field name="department_id" ref="dep_ps"/>
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_consultant"/>
@@ -321,7 +212,6 @@
 
       <record id="employee_ngh" model="hr.employee">
           <field name="name">Nicoleta Gherlea</field>
-          <field name="user_id" ref="base.user_ngh"/>
           <field name="department_id" ref="dep_sales"/>
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_marketing"/>
@@ -334,7 +224,6 @@
 
       <record id="employee_vad" model="hr.employee">
           <field name="name">Valérie Descamps</field>
-          <field name="user_id" ref="base.user_vad"/>
           <field name="department_id" ref="dep_administration"/>
           <field name="parent_id" ref="employee_fp"/>
           <field name="job_id" ref="hr.job_hrm"/>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 0dcc675e665..8918c5012c3 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -20,16 +20,12 @@
             <field name="arch" type="xml">
                 <form string="Employee" version="7.0">
                     <sheet>
-                        <field name="image_small" widget='image' class="oe_right oe_image_small"/>
+                        <field name="image_medium" widget='image' class="oe_left oe_avatar"/>
                         <div class="oe_title">
                             <label for="name" class="oe_edit_only"/>
                             <h1>
                                 <field name="name"/>
                             </h1>
-                            <label for="job_id" class="oe_edit_only"/>
-                            <h2>
-                                <field name="job_id" options='{"no_open": true}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
-                            </h2>
                             <label for="category_ids" class="oe_edit_only"/>
                             <field name="category_ids" widget="many2many_tags" placeholder="e.g. Part Time"/>
                         </div>
@@ -37,44 +33,56 @@
                             <!-- Put here related buttons -->
                         </div>
                         <notebook>
-                            <page string="Information">
+                            <page string="Public Information">
                                 <group>
-                                    <group>
+                                    <group string="Contact Information">
+                                        <field name="address_id" on_change="onchange_address_id(address_id)" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
+                                        <field name="work_email" widget="email"/>
+                                        <field name="work_phone"/>
+                                        <field name="mobile_phone"/>
+                                        <field name="work_location"/>
+                                    </group>
+                                    <group string="Position">
                                         <field name="department_id" on_change="onchange_department_id(department_id)"/>
-                                        <field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
-                                        <field name="user_id" on_change="onchange_user(user_id)"/>
+                                        <field name="job_id" options='{"no_open": True}' domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
                                         <field name="parent_id"/>
                                         <field name="coach_id"/>
                                     </group>
                                     <group>
-                                        <field name="work_email" widget="email"/>
-                                        <field name="work_phone"/>
-                                        <field name="address_id" on_change="onchange_address_id(address_id)"/>
-                                        <field name="mobile_phone"/>
-                                        <field name="identification_id" groups="base.group_hr_user"/>
-                                        <field name="passport_id" groups="base.group_hr_user"/>
-                                        <field name="otherid" groups="base.group_hr_user"/>
-                                    </group>
-                                    <group name="active_group">
-                                        <field name="active"/>
+                                        <field name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
+                                        <field name="user_id" on_change="onchange_user(user_id)" string="Related User"/>
                                     </group>
                                 </group>
                                 <field name="notes" placeholder="Other Information ..." colspan="4"/>
                             </page>
                             <page string="Personal Information" groups="base.group_hr_user">
-                                <group col="4">
-                                    <group>
-                                        <field name="country_id" options='{"no_open": true}'/>
+                                <group>
+                                    <group string="Citizenship &amp; Other Info">
+                                        <field name="country_id" options='{"no_open": True}'/>
+                                        <field name="identification_id" groups="base.group_hr_user"/>
+                                        <field name="passport_id" groups="base.group_hr_user"/>
                                         <field name="bank_account_id"/>
-                                        <field name="address_home_id"/>
+                                        <field name="otherid" groups="base.group_hr_user"/>
                                     </group>
-                                    <group>
+                                    <group string="Contact Information">
+                                        <field name="address_home_id" context="{'show_address': 1}" options='{"always_reload": True, "highlight_first_line": True}'/>
+                                    </group>
+                                    <group string="Status">
                                         <field name="gender"/>
                                         <field name="marital"/>
+                                    </group>
+                                    <group string="Birth">
                                         <field name="birthday"/>
                                     </group>
                                 </group>
                             </page>
+                            <page string="HR Settings" groups="base.group_hr_user">
+                                <group>
+                                    <group string="Active" name="active_group">
+                                        <field name="active"/>
+                                    </group>
+                                </group>
+                            </page>
                         </notebook>
                     </sheet>
                 </form>
@@ -105,8 +113,6 @@
                 <search string="Employees">
                     <field name="name" string="Employees"/>
                     <field name="department_id" />
-                    <field name="job_id"/>
-                    <field name="parent_id"/>
                     <field name="category_ids"/>
                     <group expand="0" string="Group By...">
                         <filter string="Manager" icon="terp-personal" domain="[]" context="{'group_by':'parent_id'}"/>
@@ -130,11 +136,11 @@
                     <t t-name="kanban-box">
                         <div class="oe_employee_vignette">
                             <div class="oe_employee_image">
-                                <a type="edit"><img t-att-src="kanban_image('hr.employee', 'image_medium', record.id.value)" class="oe_employee_picture"/></a>
+                                <a type="open"><img t-att-src="kanban_image('hr.employee', 'image_medium', record.id.value)" class="oe_employee_picture"/></a>
                             </div>
                             <div class="oe_employee_details">
                                 <h4>
-                                    <a type="edit"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
+                                    <a type="open"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
                                 </h4>
                                 <ul>
                                     <li id="last_login">
@@ -173,7 +179,7 @@
             <field name="name">Employees</field>
             <field name="res_model">hr.employee</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">form,tree</field>
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_employee_filter"/>
         </record>
@@ -198,25 +204,6 @@
             </field>
         </record>
 
-        <record id="open_view_employee_list_my_kanban" model="ir.actions.act_window.view">
-            <field name="sequence" eval="0"/>
-            <field name="view_mode">kanban</field>
-            <field name="act_window_id" ref="open_view_employee_list_my"/>
-        </record>
-        <record id="open_view_employee_list_my_tree2" model="ir.actions.act_window.view">
-            <field name="sequence" eval="1"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_employee_tree"/>
-            <field name="act_window_id" ref="open_view_employee_list_my"/>
-        </record>
-
-        <record id="open_view_employee_list_my_form2" model="ir.actions.act_window.view">
-            <field name="sequence" eval="2"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_employee_form"/>
-            <field name="act_window_id" ref="open_view_employee_list_my"/>
-        </record>
-
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
         <record id="ir_ui_view_sc_employee" model="ir.ui.view_sc">
@@ -301,7 +288,7 @@
         </record>
 
         <record id="open_view_categ_form" model="ir.actions.act_window">
-            <field name="name">Categories of Employee</field>
+            <field name="name">Categories of Employees</field>
             <field name="res_model">hr.employee.category</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -343,39 +330,38 @@
             <field name="arch" type="xml">
                 <form string="Job" version="7.0">
                     <header>
-                        <span groups="base.group_user">
-                            <button name="job_recruitement" string="In Recruitement" states="open" type="object" class="oe_highlight"/>
-                            <button name="job_open" string="Recruitment Done" states="recruit" type="object" class="oe_highlight"/>
-                        </span>
+                        <button name="job_recruitement" string="Launch Recruitement" states="open" type="object" class="oe_highlight" groups="base.group_user"/>
+                        <button name="job_open" string="Stop Recruitment" states="recruit" type="object" class="oe_highlight" groups="base.group_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>
-                        <label for="name" class="oe_edit_only"/>
-                        <h1>
-                            <field name="name" class="oe_inline"/>
-                            <label class="oe_inline" string="(" attrs="{'invisible': [('department_id', '=', False)]}"/>
-                            <field name="department_id" class="oe_inline"/>
-                            <label class="oe_inline" string=")" attrs="{'invisible': [('department_id', '=', False)]}"/>
-                        </h1>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1><field name="name" class="oe_inline"/></h1>
+                        </div>
                         <group>
                             <group>
                                 <field name="no_of_employee" groups="base.group_user"/>
-                                <field name="expected_employees" groups="base.group_user"/>
                                 <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
+                                <field name="expected_employees" groups="base.group_user"/>
                             </group>
                             <group>
                                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            </group>
+                                <field name="department_id"/>                            </group>
                         </group>
-                        <notebook>
-                            <page string="Description">
-                                <label for="description"/>
-                                <field name="description"/>
-                                <label for="requirements"/>
-                                <field name="requirements"/>
-                            </page>
-                        </notebook>
+                        <div>
+                            <label for="description"/>
+                            <field name="description"/>
+                        </div>
+                        <div>
+                            <label for="requirements"/>
+                            <field name="requirements"/>
+                        </div>
                     </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/hr/i18n/ar.po b/addons/hr/i18n/ar.po
index 31b087dc2da..e60d05f989e 100644
--- a/addons/hr/i18n/ar.po
+++ b/addons/hr/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/bg.po b/addons/hr/i18n/bg.po
index 0f9bbee4250..42e1176db33 100644
--- a/addons/hr/i18n/bg.po
+++ b/addons/hr/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/bn.po b/addons/hr/i18n/bn.po
index 03ae7a65d26..29a75c33ae8 100644
--- a/addons/hr/i18n/bn.po
+++ b/addons/hr/i18n/bn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/bs.po b/addons/hr/i18n/bs.po
index 902d47c2819..d21715e7b19 100644
--- a/addons/hr/i18n/bs.po
+++ b/addons/hr/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/ca.po b/addons/hr/i18n/ca.po
index f95122de88f..dc7ea55f93a 100644
--- a/addons/hr/i18n/ca.po
+++ b/addons/hr/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/cs.po b/addons/hr/i18n/cs.po
index 91da0206f0a..3230a330df6 100644
--- a/addons/hr/i18n/cs.po
+++ b/addons/hr/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/da.po b/addons/hr/i18n/da.po
index ce535d07b30..36611d2f648 100644
--- a/addons/hr/i18n/da.po
+++ b/addons/hr/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/de.po b/addons/hr/i18n/de.po
index 63a91372f72..23ef8345c2d 100644
--- a/addons/hr/i18n/de.po
+++ b/addons/hr/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/el.po b/addons/hr/i18n/el.po
index f045b0e4bea..8f1b5a3fc60 100644
--- a/addons/hr/i18n/el.po
+++ b/addons/hr/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr/i18n/en_AU.po b/addons/hr/i18n/en_AU.po
index c4a6de9014f..4cefbf93ae2 100644
--- a/addons/hr/i18n/en_AU.po
+++ b/addons/hr/i18n/en_AU.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/en_GB.po b/addons/hr/i18n/en_GB.po
index e4fc29762eb..fefdf1d87e4 100644
--- a/addons/hr/i18n/en_GB.po
+++ b/addons/hr/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/es.po b/addons/hr/i18n/es.po
index ae23c8c9b60..72ec3e0bdbc 100644
--- a/addons/hr/i18n/es.po
+++ b/addons/hr/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/es_AR.po b/addons/hr/i18n/es_AR.po
index a3097c5536a..9f79abde427 100644
--- a/addons/hr/i18n/es_AR.po
+++ b/addons/hr/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/es_CL.po b/addons/hr/i18n/es_CL.po
index 9142eba2a6e..e89a4a703d4 100644
--- a/addons/hr/i18n/es_CL.po
+++ b/addons/hr/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/es_CR.po b/addons/hr/i18n/es_CR.po
index 08bc8e163ce..240db109ae3 100644
--- a/addons/hr/i18n/es_CR.po
+++ b/addons/hr/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: hr
diff --git a/addons/hr/i18n/es_EC.po b/addons/hr/i18n/es_EC.po
index 19f7caa1ee0..bfbbb7fa180 100644
--- a/addons/hr/i18n/es_EC.po
+++ b/addons/hr/i18n/es_EC.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-03 02:55+0000\n"
-"Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
-"<chris.ormaza@gmail.com>\n"
+"PO-Revision-Date: 2012-11-10 17:20+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-11-11 04:57+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -199,6 +198,8 @@ msgstr "Mujer"
 msgid ""
 "Expected number of employees for this job position after new recruitment."
 msgstr ""
+"Número de Empleados para este puesto de trabajo después de las nuevas "
+"contrataciones"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -291,7 +292,7 @@ msgstr "Categorías"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Employees"
-msgstr ""
+msgstr "Total de Empleados"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -435,7 +436,7 @@ msgstr "Estado"
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
 msgid "Categories Structure"
-msgstr ""
+msgstr "Estructura de categorías"
 
 #. module: hr
 #: field:hr.employee,partner_id:0
@@ -465,7 +466,7 @@ msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Subordinate Hierarchy"
-msgstr ""
+msgstr "Jerarquía subirdinada"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -715,12 +716,12 @@ msgstr "Subordinados"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "Number of employees currently occupying this job position."
-msgstr ""
+msgstr "Número de empleados ocupando actualmente este puesto de trabajo"
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Number of new employees you expect to recruit."
-msgstr ""
+msgstr "Número de empleados que espera contratar"
 
 #~ msgid "Working Time Categories"
 #~ msgstr "Categorías de Horarios de Trabajo"
diff --git a/addons/hr/i18n/et.po b/addons/hr/i18n/et.po
index 50159b2f084..5f5436bd6c1 100644
--- a/addons/hr/i18n/et.po
+++ b/addons/hr/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/fi.po b/addons/hr/i18n/fi.po
index 7deeef50c62..c9a8d5b96f6 100644
--- a/addons/hr/i18n/fi.po
+++ b/addons/hr/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index e3b59c53ce6..28c5dece6fc 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/fr_BE.po b/addons/hr/i18n/fr_BE.po
index eea65636ecd..f4dfcc3f37a 100644
--- a/addons/hr/i18n/fr_BE.po
+++ b/addons/hr/i18n/fr_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/gl.po b/addons/hr/i18n/gl.po
index 085152128d3..ac1d6f2ea66 100644
--- a/addons/hr/i18n/gl.po
+++ b/addons/hr/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/gu.po b/addons/hr/i18n/gu.po
index fc160e02ca9..c578acf93f4 100644
--- a/addons/hr/i18n/gu.po
+++ b/addons/hr/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/hi.po b/addons/hr/i18n/hi.po
index f21375560cd..a432086e023 100644
--- a/addons/hr/i18n/hi.po
+++ b/addons/hr/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/hr.po b/addons/hr/i18n/hr.po
index ed5e41a58a2..20e06e36ea7 100644
--- a/addons/hr/i18n/hr.po
+++ b/addons/hr/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: hr
diff --git a/addons/hr/i18n/hu.po b/addons/hr/i18n/hu.po
index e00c26ddd38..8acf22a23d2 100644
--- a/addons/hr/i18n/hu.po
+++ b/addons/hr/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -57,7 +57,7 @@ msgstr "Csoportosítás..."
 #. module: hr
 #: model:ir.actions.act_window,name:hr.view_department_form_installer
 msgid "Create Your Departments"
-msgstr ""
+msgstr "Saját osztály létrehozása"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -192,7 +192,7 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendance"
-msgstr ""
+msgstr "Jelenlét"
 
 #. module: hr
 #: view:hr.employee:0
@@ -313,7 +313,7 @@ msgstr "Alkalmazotti kapcsolat"
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Saját vezérlőpult"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -455,7 +455,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account Number"
-msgstr ""
+msgstr "Bankszámla szám"
 
 #. module: hr
 #: view:hr.department:0
@@ -474,7 +474,7 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Vezérlőpult"
 
 #. module: hr
 #: selection:hr.job,state:0
@@ -524,7 +524,7 @@ msgstr "Személyes információk"
 #. module: hr
 #: field:hr.employee,city:0
 msgid "City"
-msgstr ""
+msgstr "Város"
 
 #. module: hr
 #: field:hr.employee,passport_id:0
@@ -534,7 +534,7 @@ msgstr "Útlevélszám"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr ""
+msgstr "Munkahelyi mobil"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -579,7 +579,7 @@ msgstr "Nemzetiség"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Leaves"
-msgstr ""
+msgstr "Szabadságok"
 
 #. module: hr
 #: view:board.board:0
@@ -637,7 +637,7 @@ msgstr "OpenERP felhasználó létrehozása"
 #. module: hr
 #: field:hr.employee,login:0
 msgid "Login"
-msgstr ""
+msgstr "Bejelentkezés"
 
 #. module: hr
 #: view:hr.employee:0
@@ -653,7 +653,7 @@ msgstr "Álláspozíciók"
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "Egyéb azonosító"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,coach_id:0
diff --git a/addons/hr/i18n/id.po b/addons/hr/i18n/id.po
index ea792ef6454..c8da2b84a04 100644
--- a/addons/hr/i18n/id.po
+++ b/addons/hr/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/it.po b/addons/hr/i18n/it.po
index 95dd8770979..c2b5aaa9850 100644
--- a/addons/hr/i18n/it.po
+++ b/addons/hr/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/ja.po b/addons/hr/i18n/ja.po
index eca07fe7b70..ff4d2db5f62 100644
--- a/addons/hr/i18n/ja.po
+++ b/addons/hr/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/ko.po b/addons/hr/i18n/ko.po
index 1b01e75ffaf..d411de2d3d5 100644
--- a/addons/hr/i18n/ko.po
+++ b/addons/hr/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/lo.po b/addons/hr/i18n/lo.po
index 1d65d7e988b..81e9ad6e041 100644
--- a/addons/hr/i18n/lo.po
+++ b/addons/hr/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/lt.po b/addons/hr/i18n/lt.po
index 35adc34d76b..ccac2480803 100644
--- a/addons/hr/i18n/lt.po
+++ b/addons/hr/i18n/lt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:17+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-10-22 07:48+0000\n"
+"Last-Translator: nanothole <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -56,7 +56,7 @@ msgstr ""
 #. module: hr
 #: model:ir.actions.act_window,name:hr.view_department_form_installer
 msgid "Create Your Departments"
-msgstr ""
+msgstr "Sukurkite padalinius"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -77,12 +77,12 @@ msgstr "Padalinys"
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "Pažymeti kaip sena"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "Darbai"
 
 #. module: hr
 #: view:hr.job:0
@@ -103,7 +103,7 @@ msgstr ""
 #. module: hr
 #: model:ir.actions.todo.category,name:hr.category_hr_management_config
 msgid "HR Management"
-msgstr ""
+msgstr "Žmogiškųjų išteklių valdymas"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -130,7 +130,7 @@ msgstr "Pastabos"
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Married"
-msgstr ""
+msgstr "Vedęs"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_create_hr_employee_installer
@@ -152,7 +152,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Spalvos indeksas"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -169,7 +169,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr ""
+msgstr "Asmens kodas"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -185,12 +185,12 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendance"
-msgstr ""
+msgstr "Lankomumas"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr ""
+msgstr "SODRA Nr."
 
 #. module: hr
 #: field:hr.employee,work_phone:0
@@ -206,7 +206,7 @@ msgstr "Žemesniosios kategorijos"
 #: view:hr.job:0 field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "Darbo aprašymas"
 
 #. module: hr
 #: field:hr.employee,work_location:0
@@ -227,7 +227,7 @@ msgstr "Darbuotojas"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "Kita informacija"
 
 #. module: hr
 #: field:hr.employee,work_email:0
@@ -237,7 +237,7 @@ msgstr "Darbo el. paštas"
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr ""
+msgstr "Gimimo data"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -253,7 +253,7 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,job_id:0 view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "Darbas"
 
 #. module: hr
 #: field:hr.department,member_ids:0
@@ -268,7 +268,7 @@ msgstr "Nustatymai"
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,category_ids:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorijos"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
@@ -799,3 +799,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Objekto pavadinimas turi prasidėti su x_ ir jame negali būti specialiųjų "
 #~ "ženklų!"
+
+#~ msgid "Work E-mail"
+#~ msgstr "Darbinis el. paštas"
diff --git a/addons/hr/i18n/lv.po b/addons/hr/i18n/lv.po
index e1260f3a2e4..8e456b02347 100644
--- a/addons/hr/i18n/lv.po
+++ b/addons/hr/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/mk.po b/addons/hr/i18n/mk.po
index 47d4662dc9c..627c6722000 100644
--- a/addons/hr/i18n/mk.po
+++ b/addons/hr/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/mn.po b/addons/hr/i18n/mn.po
index b89b0307b2f..76e087de4c6 100644
--- a/addons/hr/i18n/mn.po
+++ b/addons/hr/i18n/mn.po
@@ -20,8 +20,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/nb.po b/addons/hr/i18n/nb.po
index de0d6fe5b86..fced3fe044a 100644
--- a/addons/hr/i18n/nb.po
+++ b/addons/hr/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -40,7 +40,7 @@ msgstr "Koble den ansatte til informasjon"
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr ""
+msgstr "SIN No"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_main
@@ -57,7 +57,7 @@ msgstr "Grupper etter..."
 #. module: hr
 #: model:ir.actions.act_window,name:hr.view_department_form_installer
 msgid "Create Your Departments"
-msgstr ""
+msgstr "Opprett Dine Avdelinger."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -68,6 +68,11 @@ msgid ""
 "will be used in the recruitment process to evaluate the applicants for this "
 "job position."
 msgstr ""
+"Ledige stillingene brukes til å definere jobber og deres krav. Du kan holde "
+"rede på hvor mange ansatte du har per stilling, og hvor mange du forventer i "
+"fremtiden. Du kan også legge ved en undersøkelse til en stilling som vil bli "
+"brukt i rekrutteringsprosessen for å evaluere søkere til denne jobben "
+"stilling."
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,department_id:0 view:hr.job:0
@@ -78,7 +83,7 @@ msgstr "Avdeling"
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "Merk som gammel."
 
 #. module: hr
 #: view:hr.job:0
@@ -88,7 +93,7 @@ msgstr "Jobber"
 #. module: hr
 #: view:hr.job:0
 msgid "In Recruitment"
-msgstr ""
+msgstr "I Rekruttering."
 
 #. module: hr
 #: field:hr.department,company_id:0 view:hr.employee:0 view:hr.job:0
@@ -99,12 +104,12 @@ msgstr "Firma"
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr ""
+msgstr "Forventet på rekruttering"
 
 #. module: hr
 #: model:ir.actions.todo.category,name:hr.category_hr_management_config
 msgid "HR Management"
-msgstr ""
+msgstr "HR ledelse."
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -112,6 +117,8 @@ msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
 msgstr ""
+"Partner som er relatert til den aktuelle medarbeideren. Regnskapsmessig "
+"transaksjon vil bli skrevet på denne partneren tilhører ansatt."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
@@ -141,6 +148,10 @@ msgid ""
 "operations on all the employees of the same category, i.e. allocating "
 "holidays."
 msgstr ""
+"Opprett ansatte form og koble dem til en OpenERP bruker hvis du vil at de "
+"skal få tilgang til denne forekomsten. Kategorier kan settes på ansatte til "
+"å utføre massive operasjoner på alle de ansatte i samme kategori, det vil si "
+"tildeling helligdager."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -149,11 +160,14 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Firmaets avdeling Struktur brukes til å administrere alle dokumenter knyttet "
+"til ansatte ved avdelinger: kostnader og timeliste validering, forlater "
+"ledelsen, rekruttering, etc."
 
 #. module: hr
 #: field:hr.employee,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Fargeindeks"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -161,16 +175,18 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
+"Beslektet bruker feltet på Ansatt skjemaet tillater å knytte OpenERP "
+"brukeren (og hennes rettigheter) til den ansatte."
 
 #. module: hr
 #: view:hr.job:0 selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr ""
+msgstr "I Rekruttering."
 
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr ""
+msgstr "ID nummer"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -186,7 +202,7 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendance"
-msgstr ""
+msgstr "Oppmøte"
 
 #. module: hr
 #: view:hr.employee:0
@@ -249,7 +265,7 @@ msgstr "Rapportering"
 #: model:ir.actions.act_window,name:hr.open_board_hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard_user
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "Personaladministrasjon Konsoll"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,job_id:0 view:hr.job:0
@@ -307,7 +323,7 @@ msgstr "Ansattkontakt"
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Mitt Styret."
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -339,7 +355,7 @@ msgstr "hr.department"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_create_hr_employee_installer
 msgid "Create your Employees"
-msgstr ""
+msgstr "Opprett dine Ansatte."
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -360,11 +376,22 @@ msgid ""
 "they will be able to enter time through the system. In the note tab, you can "
 "enter text data that should be recorded for a specific employee."
 msgstr ""
+"Her kan du administrere arbeidsstyrken ved å lage ansatte og tildele dem "
+"spesifikke egenskaper i systemet. Opprettholde alle ansatte relatert "
+"informasjon og holde styr på alt som trenger å bli registrert for dem. Den "
+"personlige informasjonen kategorien vil hjelpe deg å opprettholde sine "
+"identitetsdata. Kategorier kategorien gir deg muligheten til å tildele dem "
+"relaterte ansattes kategorier avhengig av deres stilling og virksomhet i "
+"selskapet. En kategori kan være en ansiennitet nivå i bedriften eller en "
+"avdeling. Den Timelister kategorien gjør det mulig å tildele dem en bestemt "
+"timeliste og analytisk journal hvor de vil være i stand til å angi tid "
+"gjennom systemet. I notatet kategorien kan du angi tekstdata som bør tas opp "
+"for en bestemt ansatt."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "Ansatt bank lønnskonto."
 
 #. module: hr
 #: field:hr.department,note:0
@@ -380,6 +407,7 @@ msgstr "Ansattstruktur"
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"Det valgte firmaet er ikke i listen over tillatte firmaer for denne brukeren"
 
 #. module: hr
 #: view:hr.employee:0
@@ -415,7 +443,7 @@ msgstr "ukjent"
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employees with that job."
-msgstr ""
+msgstr "Nummere av ansatte som har den jobben ."
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -430,7 +458,7 @@ msgstr "Aktiv"
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursiv Hierarki av ansatte."
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
@@ -444,11 +472,14 @@ msgid ""
 "employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Dine avdelinger strukturer brukes til å administrere alle dokumenter knyttet "
+"til ansatte ved avdelinger: kostnader og timeliste validering, forlater "
+"ledelsen, rekruttering, etc."
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account Number"
-msgstr ""
+msgstr "Bankkonto nummer."
 
 #. module: hr
 #: view:hr.department:0
@@ -461,16 +492,18 @@ msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
 msgstr ""
+"I den ansatte form, det er forskjellige type informasjon som "
+"kontaktinformasjon."
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Kontrollpanel"
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr ""
+msgstr "Gammel"
 
 #. module: hr
 #: sql_constraint:res.users:0
@@ -495,7 +528,7 @@ msgstr "ir.actions.act_window"
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr ""
+msgstr "Ansatt form og struktur."
 
 #. module: hr
 #: field:hr.employee,photo:0
@@ -515,17 +548,17 @@ msgstr "Personlig informasjon"
 #. module: hr
 #: field:hr.employee,city:0
 msgid "City"
-msgstr ""
+msgstr "By"
 
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr ""
+msgstr "Pass No"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr ""
+msgstr "Jobbmobil"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -555,7 +588,7 @@ msgstr "Jobbnavn"
 #. module: hr
 #: view:hr.job:0 selection:hr.job,state:0
 msgid "In Position"
-msgstr ""
+msgstr "I posisjon."
 
 #. module: hr
 #: view:hr.department:0
@@ -570,12 +603,12 @@ msgstr "Nasjonalitet"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Leaves"
-msgstr ""
+msgstr "Etterlater."
 
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr ""
+msgstr "HR ledelse styret."
 
 #. module: hr
 #: field:hr.employee,resource_id:0
@@ -608,7 +641,7 @@ msgstr "Ansatte"
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr ""
+msgstr "Sosialtrygdnummer"
 
 #. module: hr
 #: field:hr.department,name:0
@@ -628,44 +661,44 @@ msgstr "Opprettelse av en OpenERP bruker"
 #. module: hr
 #: field:hr.employee,login:0
 msgid "Login"
-msgstr ""
+msgstr "Logg inn"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Job Information"
-msgstr ""
+msgstr "Jobbinformasjon"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_job
 #: model:ir.ui.menu,name:hr.menu_hr_job
 msgid "Job Positions"
-msgstr ""
+msgstr "Jobb posisjon"
 
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "Andre ID"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,coach_id:0
 msgid "Coach"
-msgstr ""
+msgstr "Trener"
 
 #. module: hr
 #: sql_constraint:hr.job:0
 msgid "The name of the job position must be unique per company!"
-msgstr ""
+msgstr "Navnet på stilling må være unikt per selskap!"
 
 #. module: hr
 #: view:hr.job:0
 msgid "My Departments Jobs"
-msgstr ""
+msgstr "Mine Avdelinger Jobber."
 
 #. module: hr
 #: field:hr.department,manager_id:0 view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr ""
+msgstr "Leder"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -825,3 +858,18 @@ msgstr ""
 
 #~ msgid "Configure"
 #~ msgstr "Konfigurer"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Nødvendig antall ansatte totalt for den jobben."
+
+#~ msgid "Expected Employees"
+#~ msgstr "Forventet ansatte."
+
+#~ msgid "HR Manager Dashboard"
+#~ msgstr "HR Ledelse Kontrollpanel."
+
+#~ msgid "Subordonate Hierarchy"
+#~ msgstr "Subordonate Hierarki"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Nummer av ansatte."
diff --git a/addons/hr/i18n/nl.po b/addons/hr/i18n/nl.po
index e5981591688..ac91e9c0fa4 100644
--- a/addons/hr/i18n/nl.po
+++ b/addons/hr/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:28+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-09-03 17:10+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -195,7 +195,7 @@ msgstr "Vrouw"
 #: help:hr.job,expected_employees:0
 msgid ""
 "Expected number of employees for this job position after new recruitment."
-msgstr ""
+msgstr "Verwachte aantal werknemers voor deze functie na de nieuwe werving."
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -288,7 +288,7 @@ msgstr "Categorieën"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Employees"
-msgstr ""
+msgstr "Totaal aantal werknemers"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -710,12 +710,12 @@ msgstr "Ondergeschikten"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "Number of employees currently occupying this job position."
-msgstr ""
+msgstr "Huidige aantal werknemers welke deze functie bekleden ."
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Number of new employees you expect to recruit."
-msgstr ""
+msgstr "Verwachte aantal te werven nieuwe werknemers."
 
 #~ msgid "Sunday"
 #~ msgstr "Zondag"
diff --git a/addons/hr/i18n/nl_BE.po b/addons/hr/i18n/nl_BE.po
index f52f4183f50..058d4527d9c 100644
--- a/addons/hr/i18n/nl_BE.po
+++ b/addons/hr/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/pl.po b/addons/hr/i18n/pl.po
index 7224fffbe5f..32e80eb9a85 100644
--- a/addons/hr/i18n/pl.po
+++ b/addons/hr/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -34,7 +34,7 @@ msgstr "Błąd! Nie możesz tworzyć rekurencyjnych działów"
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "Powiązanie Pracownika do informacji"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -56,7 +56,7 @@ msgstr "Grupuj wg..."
 #. module: hr
 #: model:ir.actions.act_window,name:hr.view_department_form_installer
 msgid "Create Your Departments"
-msgstr ""
+msgstr "Utwórz swój dział"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -103,7 +103,7 @@ msgstr ""
 #. module: hr
 #: model:ir.actions.todo.category,name:hr.category_hr_management_config
 msgid "HR Management"
-msgstr ""
+msgstr "Kadry"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -132,7 +132,7 @@ msgstr "Uwagi"
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Married"
-msgstr ""
+msgstr "Zamężna/Żonaty"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_create_hr_employee_installer
@@ -154,7 +154,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Indeks kolorów"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -189,7 +189,7 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendance"
-msgstr ""
+msgstr "Obecności"
 
 #. module: hr
 #: view:hr.employee:0
@@ -342,7 +342,7 @@ msgstr ""
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_create_hr_employee_installer
 msgid "Create your Employees"
-msgstr ""
+msgstr "Utwórz pracowników"
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -382,7 +382,7 @@ msgstr "Struktura pracowników"
 #. module: hr
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Wybrana firma jest niedozwolona dla tego użytkownika"
 
 #. module: hr
 #: view:hr.employee:0
@@ -413,12 +413,12 @@ msgstr "Struktura kategorii"
 #. module: hr
 #: field:hr.employee,partner_id:0
 msgid "unknown"
-msgstr ""
+msgstr "nieznane"
 
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employees with that job."
-msgstr ""
+msgstr "Liczba pracowników na tym stanowisku"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -451,7 +451,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account Number"
-msgstr ""
+msgstr "Numer Konta Bankowego"
 
 #. module: hr
 #: view:hr.department:0
@@ -468,22 +468,22 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Konsola"
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr ""
+msgstr "Stare"
 
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Nie może być dwóch użytkowników o tym samym loginie !"
 
 #. module: hr
 #: view:hr.job:0 field:hr.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -503,7 +503,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,photo:0
 msgid "Photo"
-msgstr ""
+msgstr "Fotografia"
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
@@ -518,17 +518,17 @@ msgstr "Informacje osobiste"
 #. module: hr
 #: field:hr.employee,city:0
 msgid "City"
-msgstr ""
+msgstr "Miasto"
 
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport No"
-msgstr ""
+msgstr "Nr paszportu"
 
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr ""
+msgstr "Służbowy telefon komórkowy"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -543,22 +543,22 @@ msgstr "Adres domowy"
 #. module: hr
 #: view:hr.job:0
 msgid "Description"
-msgstr ""
+msgstr "Opis:"
 
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Single"
-msgstr ""
+msgstr "Wolny"
 
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
-msgstr ""
+msgstr "Nazwa stanowiska"
 
 #. module: hr
 #: view:hr.job:0 selection:hr.job,state:0
 msgid "In Position"
-msgstr ""
+msgstr "Na stanowisku"
 
 #. module: hr
 #: view:hr.department:0
@@ -573,17 +573,17 @@ msgstr "Narodowość"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Leaves"
-msgstr ""
+msgstr "Nieobecności"
 
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr ""
+msgstr "Konsola Dyrektora kadr"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Zasób"
 
 #. module: hr
 #: field:hr.department,complete_name:0
@@ -621,17 +621,17 @@ msgstr "Nazwa departamentu"
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr ""
+msgstr "PESEL"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr ""
+msgstr "Tworznei użytkownika OpenERP"
 
 #. module: hr
 #: field:hr.employee,login:0
 msgid "Login"
-msgstr ""
+msgstr "Logowanie"
 
 #. module: hr
 #: view:hr.employee:0
@@ -642,27 +642,27 @@ msgstr "Informacja o pracy"
 #: model:ir.actions.act_window,name:hr.action_hr_job
 #: model:ir.ui.menu,name:hr.menu_hr_job
 msgid "Job Positions"
-msgstr ""
+msgstr "Stanowisko"
 
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "Inne ID"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,coach_id:0
 msgid "Coach"
-msgstr ""
+msgstr "Trener"
 
 #. module: hr
 #: sql_constraint:hr.job:0
 msgid "The name of the job position must be unique per company!"
-msgstr ""
+msgstr "Nazwa stanowiska musi być unikalna w firmie!"
 
 #. module: hr
 #: view:hr.job:0
 msgid "My Departments Jobs"
-msgstr ""
+msgstr "Stanowiska mojego działu"
 
 #. module: hr
 #: field:hr.department,manager_id:0 view:hr.employee:0
@@ -673,7 +673,7 @@ msgstr "Menedżer"
 #. module: hr
 #: selection:hr.employee,marital:0
 msgid "Widower"
-msgstr ""
+msgstr "Wdowa(iec)"
 
 #. module: hr
 #: field:hr.employee,child_ids:0
@@ -882,3 +882,15 @@ msgstr ""
 
 #~ msgid "HR Manager Dashboard"
 #~ msgstr "Konsola Dyrektora kadr"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "Wymagana liczba pracowników dla tego stanowiska."
+
+#~ msgid "Work E-mail"
+#~ msgstr "E-mail w pracy"
+
+#~ msgid "Subordonate Hierarchy"
+#~ msgstr "Hierarchia podrzędna"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Liczba pracowników"
diff --git a/addons/hr/i18n/pt.po b/addons/hr/i18n/pt.po
index 286c3b5d641..6cc50c44617 100644
--- a/addons/hr/i18n/pt.po
+++ b/addons/hr/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/pt_BR.po b/addons/hr/i18n/pt_BR.po
index f90681e39fa..6855bdee2c3 100644
--- a/addons/hr/i18n/pt_BR.po
+++ b/addons/hr/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:47+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-10-16 23:42+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@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: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -24,7 +24,7 @@ msgstr "Usuário Openerp"
 #. module: hr
 #: view:hr.job:0 field:hr.job,requirements:0
 msgid "Requirements"
-msgstr "Requisitos"
+msgstr "Pré-requisitos"
 
 #. module: hr
 #: constraint:hr.department:0
@@ -197,6 +197,7 @@ msgstr "Feminino"
 msgid ""
 "Expected number of employees for this job position after new recruitment."
 msgstr ""
+"Número de empregados para esta posição após o novo processo de contratação."
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -289,7 +290,7 @@ msgstr "Categorias"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Employees"
-msgstr ""
+msgstr "Total de Empregados"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -462,7 +463,7 @@ msgstr "Erro! Você não pode criar hierarquia recursiva de funcionários."
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Subordinate Hierarchy"
-msgstr ""
+msgstr "Subordinação hierárquica"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.view_department_form_installer
@@ -712,12 +713,12 @@ msgstr "Subordinados"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "Number of employees currently occupying this job position."
-msgstr ""
+msgstr "Número de empregados atualmente ocupando esta posição"
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Number of new employees you expect to recruit."
-msgstr ""
+msgstr "Número de novos empregados a serem contratados."
 
 #~ msgid "Sunday"
 #~ msgstr "Domingo"
diff --git a/addons/hr/i18n/ro.po b/addons/hr/i18n/ro.po
index fd2d0275135..1f459555ec7 100644
--- a/addons/hr/i18n/ro.po
+++ b/addons/hr/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -39,7 +39,7 @@ msgstr "Conectati angajatul la informatii"
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr "Nr SIN"
+msgstr "CNP"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_main
@@ -186,7 +186,7 @@ msgstr "In recrutare"
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr "Nr. de identificare"
+msgstr "Seria si numar BI/CI"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -448,7 +448,7 @@ msgstr "Numarul de angajati cu acel post."
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr "Nr de SS (Securitate Sociala)"
+msgstr "CNP"
 
 #. module: hr
 #: view:hr.employee:0
diff --git a/addons/hr/i18n/ru.po b/addons/hr/i18n/ru.po
index 9df351fa421..9b6c027a222 100644
--- a/addons/hr/i18n/ru.po
+++ b/addons/hr/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/sk.po b/addons/hr/i18n/sk.po
index 2b9a56714b1..199e9af8d01 100644
--- a/addons/hr/i18n/sk.po
+++ b/addons/hr/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/sl.po b/addons/hr/i18n/sl.po
index ce500b20c90..c3b1de2eb64 100644
--- a/addons/hr/i18n/sl.po
+++ b/addons/hr/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/sq.po b/addons/hr/i18n/sq.po
index 29bf6fb1bbd..6382c026673 100644
--- a/addons/hr/i18n/sq.po
+++ b/addons/hr/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/sr.po b/addons/hr/i18n/sr.po
index 7cce751f4a2..657118ea94d 100644
--- a/addons/hr/i18n/sr.po
+++ b/addons/hr/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/sr@latin.po b/addons/hr/i18n/sr@latin.po
index dad9cb80d5a..6efb3344d23 100644
--- a/addons/hr/i18n/sr@latin.po
+++ b/addons/hr/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/sv.po b/addons/hr/i18n/sv.po
index 27d3abe54fd..607896c1867 100644
--- a/addons/hr/i18n/sv.po
+++ b/addons/hr/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -46,7 +46,7 @@ msgstr "Personnummer"
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr "Personalresurser"
+msgstr "Personal"
 
 #. module: hr
 #: view:hr.employee:0 view:hr.job:0
@@ -669,7 +669,7 @@ msgstr "Jobbinformation"
 #: model:ir.actions.act_window,name:hr.action_hr_job
 #: model:ir.ui.menu,name:hr.menu_hr_job
 msgid "Job Positions"
-msgstr "Platser"
+msgstr "Befattningar"
 
 #. module: hr
 #: field:hr.employee,otherid:0
diff --git a/addons/hr/i18n/th.po b/addons/hr/i18n/th.po
index 46b1bb35635..1819b8dc88b 100644
--- a/addons/hr/i18n/th.po
+++ b/addons/hr/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/tlh.po b/addons/hr/i18n/tlh.po
index 1a0eaa41b12..69504ecd736 100644
--- a/addons/hr/i18n/tlh.po
+++ b/addons/hr/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/tr.po b/addons/hr/i18n/tr.po
index 4490bae8d7a..c504132652f 100644
--- a/addons/hr/i18n/tr.po
+++ b/addons/hr/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -29,12 +29,12 @@ msgstr "Gereksinimler"
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr "Hata! Yinelenen bölümler oluşturamazsınız."
+msgstr "Hata! Özyinelemeli bölümler oluşturamazsınız."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr "Personeli danışmaya bağla"
+msgstr "Çalışanı danışmaya bağla"
 
 #. module: hr
 #: field:hr.employee,sinid:0
@@ -56,7 +56,7 @@ msgstr "Gruplandır..."
 #. module: hr
 #: model:ir.actions.act_window,name:hr.view_department_form_installer
 msgid "Create Your Departments"
-msgstr ""
+msgstr "Bölümlerinizi Oluşturun"
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.action_hr_job
@@ -68,7 +68,7 @@ msgid ""
 "job position."
 msgstr ""
 "İş Durumları, işlerin ve gereksinimlerinin tanımlanması için kullanılır. Her "
-"iş durumunda kullanılan personel sayısını ve gelecekte kaç personel "
+"iş durumunda kullanılan çalışan sayısını ve gelecekte kaç çalışan "
 "beklediğinizin kayıtlarını tutabilirsiniz. Bu iş durumu için başvuranların "
 "değerlendirilmesi için seçme işleminde kullanmak üzere bir anket de "
 "ekleyebilirsiniz."
@@ -108,7 +108,7 @@ msgstr "Seçim için Bekleniyor"
 #. module: hr
 #: model:ir.actions.todo.category,name:hr.category_hr_management_config
 msgid "HR Management"
-msgstr ""
+msgstr "İK Yönetimi"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -116,13 +116,13 @@ msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
 msgstr ""
-"Geçerli personelle ilgili Paydaştır. Muhasebe işlemi personelle ilişkili bu "
+"Geçerli çalışanla ilişkili Paydaştır. Muhasebe işlemi çalışanla ilişkili bu "
 "paydaşa yazılacaktır."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Link a user to an employee"
-msgstr "Kullanıcıyı bir personele bağla"
+msgstr "Kullanıcıyı bir çalışana bağla"
 
 #. module: hr
 #: field:hr.department,parent_id:0
@@ -147,6 +147,10 @@ msgid ""
 "operations on all the employees of the same category, i.e. allocating "
 "holidays."
 msgstr ""
+"Çalışanlar formu oluşturun ve bu oluşuma erişmelerini istiyorsanız onları "
+"bir OpenERP kullanıcısına bağlayın. Aynı kategoriye ait tüm çalışanlara "
+"toplu işlemler uygulamak için çalışanlara kategoriler ayarlanabilir, örn "
+"tatil tahsisleri.."
 
 #. module: hr
 #: model:ir.actions.act_window,help:hr.open_module_tree_department
@@ -155,14 +159,14 @@ msgid ""
 "to employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
-"Firmanızın Bölüm Yapısı, bölümlere göre personelle ilgili belgelerin "
+"Firmanızın Bölüm Yapısı, bölümlere göre çalışanla ilgili belgelerin "
 "yönetilmesinde kullanılır: giderler, zaman çizelgesi onayları, izin "
 "yönetimi, seçme işlemlemleri, v.b"
 
 #. module: hr
 #: field:hr.employee,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Renk İndeksi"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -170,8 +174,8 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
-"Personel formundaki İlişkili Kullanıcı alanı OpenERP kullanıcısının "
-"personele bağlanmasını sağlar."
+"Çalışan formundaki İlişkili kullanıcı alanı OpenERP kullanıcısının çalışana "
+"bağlanmasını sağlar."
 
 #. module: hr
 #: view:hr.job:0 selection:hr.job,state:0
@@ -197,7 +201,7 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendance"
-msgstr ""
+msgstr "Devamlılık"
 
 #. module: hr
 #: view:hr.employee:0
@@ -228,13 +232,13 @@ msgstr "Ofis Konumu"
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr "Bölümümdeki Personel"
+msgstr "Bölümlerimdeki Çalışan"
 
 #. module: hr
 #: view:hr.employee:0 model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
-msgstr "Personel"
+msgstr "Çalışan"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
@@ -300,7 +304,7 @@ msgstr "Ana Kategori"
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error ! You cannot create recursive Categories."
-msgstr "Hata ! Yinelenen Kategoriler oluşturamazsınız."
+msgstr "Hata ! Özyinelemeli Kategoriler oluşturamazsınız."
 
 #. module: hr
 #: view:hr.department:0
@@ -313,7 +317,7 @@ msgstr "Bölümler"
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr "Personel İletişimi"
+msgstr "Çalışan İletişimi"
 
 #. module: hr
 #: view:board.board:0
@@ -329,18 +333,18 @@ msgstr "Erkek"
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
 msgid "Categories of Employee"
-msgstr "Personel Kategorileri"
+msgstr "Çalışan Kategorileri"
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr "Personel Kategorisi"
+msgstr "Çalışan Kategorisi"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr "Personel Sözleşmesi"
+msgstr "Çalışan Sözleşmesi"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
@@ -350,7 +354,7 @@ msgstr "ik.bölümü"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_create_hr_employee_installer
 msgid "Create your Employees"
-msgstr ""
+msgstr "Çalışanlarınızı Oluşturun"
 
 #. module: hr
 #: field:hr.employee.category,name:0
@@ -374,19 +378,19 @@ msgstr ""
 "Burada, çalışanlar oluşturarak ve onları sistemde belirli niteliklere "
 "atayarak iş gücünüzü yönetebilirsiniz. Çalışanlarınızla ilgili bilgileri "
 "elde edin ve onlarla ilgili kayıt edilmesi gereken her şeyin kaydını tutun. "
-"Personel bilgisi sekmesi, personelin kimlik bilgilerini elde etmenizi "
-"sağlar. Kategori sekmesi, şirket içindeki durumlarına ve etkinliklerine "
-"bağlı olarak personelinizi ilgili çaşıan kategorisine atamanıza fırsat "
-"sağlar. Bir kategori şirket içinde veya bir bölümde bir kıdemlilik "
-"kategorisi olabilir. Zaman Çizelgesi sekmesi onların sistemden zaman "
-"girişlerini yapabilecekleri, belirli bir zaman çizelgesine ve analitik "
-"yevmiyeye atamanızı  sağlar. Not sekmesinde, belirli bir çalışan için kayıt "
-"etmeniz gereken bir metin girmenizi sağlar."
+"Çalışan bilgisi sekmesi, personelin kimlik bilgilerini elde etmenizi sağlar. "
+"Kategori sekmesi, firma içindeki durumlarına ve etkinliklerine bağlı olarak "
+"çalışanınızı ilgili çalışan kategorisine atamanıza fırsat sağlar. Bir "
+"kategori firma içinde veya bir bölümde bir kıdemlilik kategorisi olabilir. "
+"Zaman Çizelgesi sekmesi onların sistemden zaman girişlerini yapabilecekleri, "
+"belirli bir zaman çizelgesine ve analitik günlüğe atamanızı  sağlar. Not "
+"sekmesinde, belirli bir çalışan için kayıt etmeniz gereken bir metin "
+"girmenizi sağlar."
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr "Personel maaş banka hesabı"
+msgstr "Çalışan maaş banka hesabı"
 
 #. module: hr
 #: field:hr.department,note:0
@@ -396,7 +400,7 @@ msgstr "Not"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 msgid "Employees Structure"
-msgstr "Personel Yapısı"
+msgstr "Çalışanların Yapısı"
 
 #. module: hr
 #: constraint:res.users:0
@@ -437,7 +441,7 @@ msgstr "bilinmeyen"
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employees with that job."
-msgstr ""
+msgstr "O işle ilgili çalışan sayısı"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -452,7 +456,7 @@ msgstr "Etkin"
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "Hata ! Yinelemeli Personel Sıradizini yaratamazsınız."
+msgstr "Hata ! Özyinelemeli Çalışanlar Sıradizini yaratamazsınız."
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
@@ -466,6 +470,9 @@ msgid ""
 "employees by departments: expenses and timesheet validation, leaves "
 "management, recruitments, etc."
 msgstr ""
+"Bölümlerinizin yapısı, bölümlere göre çalışnalarla ilişkili bütün belgeleri "
+"yönetmek için kullanılır: gider ve zaman çizelgelerinin doğrulanması, "
+"izinlerin yönetimi, işealımlar, v.b."
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
@@ -482,12 +489,12 @@ msgstr "Firmalar"
 msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
-msgstr "Personel formunda sözleşme bilgileri gibi farklı bilgiler vardır."
+msgstr "Çalışan formunda sözleşme bilgileri gibi farklı bilgiler vardır."
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_dashboard
 msgid "Dashboard"
-msgstr ""
+msgstr "Kontrol Paneli"
 
 #. module: hr
 #: selection:hr.job,state:0
@@ -517,7 +524,7 @@ msgstr "ir.actions.act_window"
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr "Personel formu ve yapısı"
+msgstr "Çalışan formu ve yapısı"
 
 #. module: hr
 #: field:hr.employee,photo:0
@@ -537,7 +544,7 @@ msgstr "Kişisel Bilgiler"
 #. module: hr
 #: field:hr.employee,city:0
 msgid "City"
-msgstr ""
+msgstr "İl"
 
 #. module: hr
 #: field:hr.employee,passport_id:0
@@ -547,12 +554,12 @@ msgstr "Pasaport No"
 #. module: hr
 #: field:hr.employee,mobile_phone:0
 msgid "Work Mobile"
-msgstr ""
+msgstr "İş Cep"
 
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr "Personel Kategorileri"
+msgstr "Çalışanların Kategorileri"
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
@@ -592,7 +599,7 @@ msgstr "Uyruğu"
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Leaves"
-msgstr ""
+msgstr "İzinler"
 
 #. module: hr
 #: view:board.board:0
@@ -625,7 +632,7 @@ msgstr "Cinsiyeti"
 #: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
 msgid "Employees"
-msgstr "Personeller"
+msgstr "Çalışanlar"
 
 #. module: hr
 #: help:hr.employee,sinid:0
@@ -650,7 +657,7 @@ msgstr "OpenERP kullanıcısı Oluşturma"
 #. module: hr
 #: field:hr.employee,login:0
 msgid "Login"
-msgstr ""
+msgstr "Oturum aç"
 
 #. module: hr
 #: view:hr.employee:0
@@ -666,7 +673,7 @@ msgstr "İş Durumları"
 #. module: hr
 #: field:hr.employee,otherid:0
 msgid "Other Id"
-msgstr ""
+msgstr "Diğer ID"
 
 #. module: hr
 #: view:hr.employee:0 field:hr.employee,coach_id:0
@@ -676,12 +683,12 @@ msgstr "Çalıştırıcı"
 #. module: hr
 #: sql_constraint:hr.job:0
 msgid "The name of the job position must be unique per company!"
-msgstr ""
+msgstr "Her firma için iş durumu adı benzersiz olmalı!"
 
 #. module: hr
 #: view:hr.job:0
 msgid "My Departments Jobs"
-msgstr ""
+msgstr "Bölümlerimin İşleri"
 
 #. module: hr
 #: field:hr.department,manager_id:0 view:hr.employee:0
@@ -908,9 +915,6 @@ msgstr ""
 #~ msgid "Periodic Evaluations"
 #~ msgstr "Süreli Değerlendirmeler"
 
-#~ msgid "Expected Employees"
-#~ msgstr "Beklenen Personel"
-
 #~ msgid "Helps you manage and streamline your recruitment process."
 #~ msgstr "Eleman seçme işleminizi yönetmenizi ve yürütmenizi sağlar."
 
@@ -978,3 +982,15 @@ msgstr ""
 #~ "    * İK Bölümleri\n"
 #~ "    * İK İşleri\n"
 #~ "    "
+
+#~ msgid "Subordonate Hierarchy"
+#~ msgstr "İkincil Sıradüzeni"
+
+#~ msgid "Expected Employees"
+#~ msgstr "Beklenen Çalışanlar"
+
+#~ msgid "Required number of employees in total for that job."
+#~ msgstr "O işte çalışacak gerekli toplam çalışan sayısı"
+
+#~ msgid "Number of Employees"
+#~ msgstr "Çalışanların Sayısı"
diff --git a/addons/hr/i18n/uk.po b/addons/hr/i18n/uk.po
index c23ec33612f..d7315f19006 100644
--- a/addons/hr/i18n/uk.po
+++ b/addons/hr/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/vi.po b/addons/hr/i18n/vi.po
index 7d4614e3902..248dd0708a1 100644
--- a/addons/hr/i18n/vi.po
+++ b/addons/hr/i18n/vi.po
@@ -19,8 +19,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 1bed37cdf83..2485196150e 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:25+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-10-25 16:29+0000\n"
+"Last-Translator: fenshuajiang <openerp@126.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
@@ -181,7 +181,7 @@ msgstr "女性"
 #: help:hr.job,expected_employees:0
 msgid ""
 "Expected number of employees for this job position after new recruitment."
-msgstr ""
+msgstr "新的招聘后这个工作岗位上期望的员工人数"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
@@ -274,7 +274,7 @@ msgstr "分类"
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Total Employees"
-msgstr ""
+msgstr "员工总数"
 
 #. module: hr
 #: selection:hr.employee,marital:0
@@ -685,12 +685,12 @@ msgstr "下属"
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "Number of employees currently occupying this job position."
-msgstr ""
+msgstr "这个工作岗位上现有的员工人数"
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Number of new employees you expect to recruit."
-msgstr ""
+msgstr "您计划招聘的新员工数。"
 
 #~ msgid "Group name"
 #~ msgstr "组名"
diff --git a/addons/hr/i18n/zh_TW.po b/addons/hr/i18n/zh_TW.po
index 3a1acd58539..d90c09c9324 100644
--- a/addons/hr/i18n/zh_TW.po
+++ b/addons/hr/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 4973417ec88..299c5ca68fe 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -26,23 +26,25 @@ class hr_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_hr_timesheet_sheet': fields.boolean('allow timesheets validation by managers',
+        'module_hr_timesheet_sheet': fields.boolean('Allow timesheets validation by managers',
             help ="""This installs the module hr_timesheet_sheet."""),
-        'module_hr_attendance': fields.boolean('track attendances',
+        'module_hr_attendance': fields.boolean('Install attendances feature',
             help ="""This installs the module hr_attendance."""),
-        'module_hr_timesheet': fields.boolean('manage timesheets',
+        'module_hr_timesheet': fields.boolean('Manage timesheets',
             help ="""This installs the module hr_timesheet."""),
-        'module_hr_holidays': fields.boolean('manage leaves and allocation requests',
+        'module_hr_holidays': fields.boolean('Manage holidays, leaves and allocation requests',
             help ="""This installs the module hr_holidays."""),
-        'module_hr_expense': fields.boolean('manage employees expenses',
+        'module_hr_expense': fields.boolean('Manage employees expenses',
             help ="""This installs the module hr_expense."""),
-        'module_hr_recruitment': fields.boolean('manage the recruitment pipe',
+        'module_hr_recruitment': fields.boolean('Manage the recruitment process',
             help ="""This installs the module hr_recruitment."""),
-        'module_hr_contract': fields.boolean('manage contract per employee',
+        'module_hr_contract': fields.boolean('Record contracts per employee',
             help ="""This installs the module hr_contract."""),
-        'module_hr_evaluation': fields.boolean('manage employees periodic evaluation',
+        'module_hr_evaluation': fields.boolean('Organize employees periodic evaluation',
             help ="""This installs the module hr_evaluation."""),
-        'module_hr_payroll': fields.boolean('manage payroll',
+        'module_account_analytic_analysis': fields.boolean('Allow invoicing based on timesheets (the sale application will be installed)',
+            help ="""This installs the module account_analytic_analysis, which will install sales management too."""),
+        'module_hr_payroll': fields.boolean('Manage payroll',
             help ="""This installs the module hr_payroll."""),
     }
 
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index ad36818e525..632ceb56918 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -7,10 +7,9 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('menu_hr_root')}"/>
         </record>
-        <record id="todo_open_hr_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_hr_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
         </record>
     </data>
     <data>
@@ -18,7 +17,7 @@
             <field name="name">Payroll</field>
             <field name="res_model">ir.module.module</field>
             <field name="view_mode">kanban,tree,form</field>
-            <field name="context" eval="{'search_default_category_id': ref('base.module_category_localization'), 'search_default_name': 'payroll'}"/>
+            <field name="context" eval="{'search_default_category_id': ref('base.module_category_localization')}"/>
             <field name="search_view_id" ref="base.view_module_filter"/>
         </record>
 
@@ -33,6 +32,19 @@
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
                     <separator string="Human Resources Management"/>
+                    <group name="recruitment_grp">
+                        <label for="id" string="Talent Management"/>
+                        <div name="recruitment">
+                            <div>
+                                <field name="module_hr_recruitment" class="oe_inline"/>
+                                <label for="module_hr_recruitment"/>
+                            </div>
+                            <div>
+                                <field name="module_hr_evaluation" class="oe_inline"/>
+                                <label for="module_hr_evaluation"/>
+                            </div>
+                        </div>
+                    </group>
                     <group>
                         <label for="id" string="Additional Features"/>
                         <div>
@@ -44,21 +56,6 @@
                                 <field name="module_hr_expense" class="oe_inline"/>
                                 <label for="module_hr_expense"/>
                             </div>
-                            <div>
-                                <field name="module_hr_evaluation" class="oe_inline"/>
-                                <label for="module_hr_evaluation"/>
-                            </div>
-                            <div>
-                                <field name="module_hr_contract" class="oe_inline"/>
-                                <label for="module_hr_contract"/>
-                            </div>
-                            <div name="hr_payroll">
-                                <field name="module_hr_payroll" class="oe_inline"/>
-                                <label for="module_hr_payroll"/>
-                                <button name="%(open_payroll_modules)d" type="action"
-                                    string="Install your country's payroll" icon="gtk-go-forward"
-                                    attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
-                            </div>
                         </div>
                     </group>
                     <group name="timesheet_grp">
@@ -72,18 +69,29 @@
                                 <field name="module_hr_timesheet_sheet" class="oe_inline"/>
                                 <label for="module_hr_timesheet_sheet"/>
                             </div>
-                            <div>
+                            <div name="account_analytic_analysis">
+                                <field name="module_account_analytic_analysis" class="oe_inline"/>
+                                <label for="module_account_analytic_analysis"/>
+                            </div>
+                            <div name="hr_attendance">
                                 <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
                                 <label for="module_hr_attendance"/>
                             </div>
                         </div>
                     </group>
-                    <group name="recruitment_grp">
-                        <label for="id" string="Recruitment"/>
-                        <div name="recruitment">
+                    <group name="contract_grp">
+                        <label for="id" string="Contracts"/>
+                        <div>
                             <div>
-                                <field name="module_hr_recruitment" class="oe_inline"/>
-                                <label for="module_hr_recruitment"/>
+                                <field name="module_hr_contract" class="oe_inline"/>
+                                <label for="module_hr_contract"/>
+                            </div>
+                            <div name="hr_payroll">
+                                <field name="module_hr_payroll" class="oe_inline"/>
+                                <label for="module_hr_payroll"/>
+                                <button name="%(open_payroll_modules)d" type="action"
+                                    string="Install your country's payroll" icon="gtk-go-forward"
+                                    attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
                             </div>
                         </div>
                     </group>
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 5e4c3052858..d46a0f0ba19 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -2,13 +2,19 @@
 <openerp>
     <data noupdate="1">
 
+    <record model="res.groups" id="base.group_user">
+        <field name="comment">the user will be able to manage his own human resources stuff (leave request, timesheets, ...), if he is linked to an employee in the system.</field>
+    </record>
+
     <record id="base.group_hr_user" model="res.groups">
         <field name="name">Officer</field>
         <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
+        <field name="comment">the user will be able to approve document created by employees.</field>
     </record>
     <record id="base.group_hr_manager" model="res.groups">
         <field name="name">Manager</field>
+        <field name="comment">the user will have an access to the human resources configuration as well as statistic reports.</field>
         <field name="category_id" ref="base.module_category_human_resources"/>
         <field name="implied_ids" eval="[(4, ref('base.group_hr_user'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css
index 11e72fad31e..f395f9939e5 100644
--- a/addons/hr/static/src/css/hr.css
+++ b/addons/hr/static/src/css/hr.css
@@ -1,5 +1,5 @@
 .oe_employee_vignette {
-  padding: 8px 0;
+  padding: 8px 8px;
   min-height: 100px;
 }
 
@@ -18,10 +18,11 @@
   -o-border-radius: 3px;
   -ms-border-radius: 3px;
   border-radius: 3px;
+  border-collapse: separate;
   -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
   -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-  -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  box-shadow: 0 1px 4px 3px rgba(0, 0, 0, 0.4);
 }
 
 .oe_employee_picture {
@@ -65,4 +66,5 @@
 
 .oe_employee_details li {
   margin: 2px 0;
+  padding: 0;
 }
diff --git a/addons/hr_attendance/__init__.py b/addons/hr_attendance/__init__.py
index dadb043e016..feb32e22792 100644
--- a/addons/hr_attendance/__init__.py
+++ b/addons/hr_attendance/__init__.py
@@ -22,5 +22,6 @@
 import hr_attendance
 import wizard
 import report
+import res_config
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py
index a1ba099d012..631880ec73b 100644
--- a/addons/hr_attendance/__openerp__.py
+++ b/addons/hr_attendance/__openerp__.py
@@ -34,24 +34,27 @@ actions(Sign in/Sign out) performed by them.
     'author': 'OpenERP SA',
     'images': ['images/hr_attendances.jpeg'],
     'depends': ['hr'],
-    'update_xml': [
+    'data': [
+        'security/ir_rule.xml',
         'security/ir.model.access.csv',
         'hr_attendance_view.xml',
         'hr_attendance_report.xml',
-        'security/ir.model.access.csv',
-        'security/ir_rule.xml',
         'wizard/hr_attendance_bymonth_view.xml',
         'wizard/hr_attendance_byweek_view.xml',
         'wizard/hr_attendance_error_view.xml',
-        'wizard/hr_attendance_sign_in_out_view.xml',
+        'res_config_view.xml',
     ],
-    'demo_xml': ['hr_attendance_demo.xml'],
+    'demo': ['hr_attendance_demo.xml'],
     'test': [
         'test/attendance_process.yml',
         'test/hr_attendance_report.yml',
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0063495605613',
+    
+    #web
+    "js": ["static/src/js/attendance.js"],
+    'qweb' : ["static/src/xml/attendance.xml"],
+    'css' : ["static/src/css/slider.css"],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 7a0cc7a8e51..a2ee3650a2f 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -55,7 +55,7 @@ class hr_attendance(osv.osv):
         'name': fields.datetime('Date', required=True, select=1),
         'action': fields.selection([('sign_in', 'Sign In'), ('sign_out', 'Sign Out'), ('action','Action')], 'Action', required=True),
         'action_desc': fields.many2one("hr.action.reason", "Action Reason", domain="[('action_type', '=', action)]", help='Specifies the reason for Signing In/Signing Out in case of extra hours.'),
-        'employee_id': fields.many2one('hr.employee', "Employee's Name", required=True, select=True),
+        'employee_id': fields.many2one('hr.employee', "Employee", required=True, select=True),
         'day': fields.function(_day_compute, type='char', string='Day', store=True, select=1, size=32),
     }
     _defaults = {
@@ -112,9 +112,32 @@ class hr_employee(osv.osv):
         for res in cr.fetchall():
             result[res[1]] = res[0] == 'sign_in' and 'present' or 'absent'
         return result
+    
+    def _last_sign(self, cr, uid, ids, name, args, context=None):
+        result = {}
+        if not ids:
+            return result
+        for id in ids:
+            result[id] = False
+            cr.execute("""select max(name) as name
+                        from hr_attendance
+                        where action in ('sign_in', 'sign_out') and employee_id = %s""",(id,))
+            for res in cr.fetchall():
+                result[id] = res[0]
+        return result
+
+    def _attendance_access(self, cr, uid, ids, name, args, context=None):
+        # this function field use to hide attendance button to singin/singout from menu
+        group = self.pool.get('ir.model.data').get_object(cr, uid, 'base', 'group_hr_attendance')
+        visible = False
+        if uid in [user.id for user in group.users]:
+            visible = True
+        return dict([(x, visible) for x in ids])
 
     _columns = {
        'state': fields.function(_state, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'),
+       'last_sign': fields.function(_last_sign, type='datetime', string='Last Sign'),
+       'attendance_access': fields.function(_attendance_access, type='boolean'),
     }
 
     def _action_check(self, cr, uid, emp_id, dt=False, context=None):
@@ -122,30 +145,25 @@ class hr_employee(osv.osv):
         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')
-        id = False
-        warning_sign = 'sign'
-        res = {}
+    def attendance_action_change(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        action_date = context.get('action_date', False)
+        action = context.get('action', False)
+        hr_attendance = self.pool.get('hr.attendance')
+        warning_sign = {'sign_in': _('Sign In'), 'sign_out': _('Sign Out')}
+        for employee in self.browse(cr, uid, ids, context=context):
+            if not action:
+                if employee.state == 'present': action = 'sign_out'
+                if employee.state == 'absent': action = 'sign_in'
 
-        #Special case when button calls this method: type=context
-        if isinstance(type, dict):
-            type = type.get('type','action')
-        if type == 'sign_in':
-            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,))
+            if not self._action_check(cr, uid, employee.id, action_date, context):
+                raise osv.except_osv(_('Warning'), _('You tried to %s with a date anterior to another event !\nTry to contact the HR Manager to correct attendances.')%(warning_sign[action],))
 
-            res = {'action': type, 'employee_id': emp['id']}
-            if dt:
-                res['name'] = dt
-        id = obj_attendance.create(cr, uid, res, context=context)
-
-        if type != 'action':
-            return id
+            vals = {'action': action, 'employee_id': employee.id}
+            if action_date:
+                vals['name'] = action_date
+            hr_attendance.create(cr, uid, vals, context=context)
         return True
 
 hr_employee()
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index bda89fd9d63..c38ee45b510 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -76,9 +76,9 @@
 
         <menuitem id="menu_hr_time_tracking" name="Time Tracking" parent="hr.menu_hr_root" sequence="5" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
 
-        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="10" groups="base.group_user,base.group_hr_user,base.group_hr_manager"/>
+        <menuitem id="menu_hr_attendance" name="Attendances" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_attendance"/>
 
-        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="20"/>
+        <menuitem action="open_view_attendance" id="menu_open_view_attendance" parent="menu_hr_attendance" sequence="20" groups="base.group_hr_attendance"/>
 
         <record id="edit_attendance_reason" model="ir.ui.view">
             <field name="name">hr.action.reason.form</field>
@@ -114,9 +114,8 @@
         </record>
 
         <menuitem
-            sequence="35" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendance"
-            groups="base.group_no_one"/>
-        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config" groups="base.group_no_one"/>
+            sequence="35" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" groups="base.group_hr_attendance" name="Attendance"/>
+        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config" groups="base.group_hr_attendance"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">
             <field name="name">hr.employee.form1</field>
@@ -124,11 +123,11 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="before">
-                    <label for="state"/>
-                    <div>
-                        <field name="state" class="oe_inline"/>
-                        <button class="oe_inline oe_right" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
-                        <button class="oe_inline oe_right" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+                    <label for="state" groups="base.group_hr_attendance"/>
+                    <div groups="base.group_hr_attendance">
+                        <field name="state" class="oe_inline"/> - 
+                        <button class="oe_link" name="attendance_action_change" states="present" string="Sign Out" type="object" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+                        <button class="oe_link" name="attendance_action_change" states="absent" string="Sign In" type="object" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
                     </div>
                 </field>
             </field>
@@ -136,3 +135,5 @@
 
     </data>
 </openerp>
+
+
diff --git a/addons/hr_attendance/i18n/ar.po b/addons/hr_attendance/i18n/ar.po
index 248947e9c33..cf3771f0d06 100644
--- a/addons/hr_attendance/i18n/ar.po
+++ b/addons/hr_attendance/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/bg.po b/addons/hr_attendance/i18n/bg.po
index 85237aa25da..2c5585c4cce 100644
--- a/addons/hr_attendance/i18n/bg.po
+++ b/addons/hr_attendance/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/bs.po b/addons/hr_attendance/i18n/bs.po
index 17393f57a09..0a31345f58a 100644
--- a/addons/hr_attendance/i18n/bs.po
+++ b/addons/hr_attendance/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/ca.po b/addons/hr_attendance/i18n/ca.po
index 01e350e8039..a529f5de9e3 100644
--- a/addons/hr_attendance/i18n/ca.po
+++ b/addons/hr_attendance/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/cs.po b/addons/hr_attendance/i18n/cs.po
index ff262d509f7..178e26bbf50 100644
--- a/addons/hr_attendance/i18n/cs.po
+++ b/addons/hr_attendance/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: czech\n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/da.po b/addons/hr_attendance/i18n/da.po
index 66484807ab5..9cb6ef3a672 100644
--- a/addons/hr_attendance/i18n/da.po
+++ b/addons/hr_attendance/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/de.po b/addons/hr_attendance/i18n/de.po
index cf22b269470..c6a22ec97d4 100644
--- a/addons/hr_attendance/i18n/de.po
+++ b/addons/hr_attendance/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/el.po b/addons/hr_attendance/i18n/el.po
index b2ee7c61a24..999fd583185 100644
--- a/addons/hr_attendance/i18n/el.po
+++ b/addons/hr_attendance/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_attendance/i18n/es.po b/addons/hr_attendance/i18n/es.po
index 44803f88617..b1e6fcf095d 100644
--- a/addons/hr_attendance/i18n/es.po
+++ b/addons/hr_attendance/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/es_AR.po b/addons/hr_attendance/i18n/es_AR.po
index a5b75617668..88e2652eea3 100644
--- a/addons/hr_attendance/i18n/es_AR.po
+++ b/addons/hr_attendance/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/es_CL.po b/addons/hr_attendance/i18n/es_CL.po
index 874753f1c93..d97a103f860 100644
--- a/addons/hr_attendance/i18n/es_CL.po
+++ b/addons/hr_attendance/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/es_CR.po b/addons/hr_attendance/i18n/es_CR.po
index 45c0c363d42..ae70c32a5c3 100644
--- a/addons/hr_attendance/i18n/es_CR.po
+++ b/addons/hr_attendance/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: hr_attendance
diff --git a/addons/hr_attendance/i18n/es_EC.po b/addons/hr_attendance/i18n/es_EC.po
index 8464f24858d..286e4444974 100644
--- a/addons/hr_attendance/i18n/es_EC.po
+++ b/addons/hr_attendance/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/es_PY.po b/addons/hr_attendance/i18n/es_PY.po
index 8e42a27daae..55920f05f91 100644
--- a/addons/hr_attendance/i18n/es_PY.po
+++ b/addons/hr_attendance/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/et.po b/addons/hr_attendance/i18n/et.po
index c47fac329b2..f55cfd58604 100644
--- a/addons/hr_attendance/i18n/et.po
+++ b/addons/hr_attendance/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/fi.po b/addons/hr_attendance/i18n/fi.po
index 9f588e3dca2..0985d32fdb8 100644
--- a/addons/hr_attendance/i18n/fi.po
+++ b/addons/hr_attendance/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/fr.po b/addons/hr_attendance/i18n/fr.po
index aafb1958f1b..d4a321a9b89 100644
--- a/addons/hr_attendance/i18n/fr.po
+++ b/addons/hr_attendance/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
diff --git a/addons/hr_attendance/i18n/gl.po b/addons/hr_attendance/i18n/gl.po
index 46a1cd6e77e..a36e388d3d1 100644
--- a/addons/hr_attendance/i18n/gl.po
+++ b/addons/hr_attendance/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/he.po b/addons/hr_attendance/i18n/he.po
index 2ee71fe3f38..ef0391070a5 100644
--- a/addons/hr_attendance/i18n/he.po
+++ b/addons/hr_attendance/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/hr.po b/addons/hr_attendance/i18n/hr.po
index 06703e28bb7..90e0bedc2db 100644
--- a/addons/hr_attendance/i18n/hr.po
+++ b/addons/hr_attendance/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/hu.po b/addons/hr_attendance/i18n/hu.po
index e7ae467aed6..951e3ee2926 100644
--- a/addons/hr_attendance/i18n/hu.po
+++ b/addons/hr_attendance/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/id.po b/addons/hr_attendance/i18n/id.po
index 448519e4323..5cac8aa8187 100644
--- a/addons/hr_attendance/i18n/id.po
+++ b/addons/hr_attendance/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/it.po b/addons/hr_attendance/i18n/it.po
index fe3749cd3da..2e54571673f 100644
--- a/addons/hr_attendance/i18n/it.po
+++ b/addons/hr_attendance/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/ja.po b/addons/hr_attendance/i18n/ja.po
index 37df3f11a27..2ad5f37945b 100644
--- a/addons/hr_attendance/i18n/ja.po
+++ b/addons/hr_attendance/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/ko.po b/addons/hr_attendance/i18n/ko.po
index 77630dfb35d..60d096a4205 100644
--- a/addons/hr_attendance/i18n/ko.po
+++ b/addons/hr_attendance/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/lt.po b/addons/hr_attendance/i18n/lt.po
index 17b6ae8af7f..ab7711445a0 100644
--- a/addons/hr_attendance/i18n/lt.po
+++ b/addons/hr_attendance/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/lv.po b/addons/hr_attendance/i18n/lv.po
index 642a6ec230f..101f26090d4 100644
--- a/addons/hr_attendance/i18n/lv.po
+++ b/addons/hr_attendance/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/mk.po b/addons/hr_attendance/i18n/mk.po
index a26f82657b9..7d8af7c6268 100644
--- a/addons/hr_attendance/i18n/mk.po
+++ b/addons/hr_attendance/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/mn.po b/addons/hr_attendance/i18n/mn.po
index 9ee48b966a7..b38b2e4fbf9 100644
--- a/addons/hr_attendance/i18n/mn.po
+++ b/addons/hr_attendance/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/nb.po b/addons/hr_attendance/i18n/nb.po
new file mode 100644
index 00000000000..8fe9c5c4ef5
--- /dev/null
+++ b/addons/hr_attendance/i18n/nb.po
@@ -0,0 +1,576 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
+msgid "Time Tracking"
+msgstr "Tid Sporing"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Today"
+msgstr "I dag"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid ""
+"You did not sign out the last time. Please enter the date and time you "
+"signed out."
+msgstr ""
+"Du logget ikke ut siste gang. Vennligst skriv inn datoen og klokkeslettet du "
+"logget ut."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Total period:"
+msgstr "Total periode:"
+
+#. module: hr_attendance
+#: field:hr.action.reason,name:0
+msgid "Reason"
+msgstr "Grunn"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Print Attendance Report Error"
+msgstr "Skriv ut Oppmøte Rapporter Feil."
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:161
+#, python-format
+msgid "The sign-out date must be in the past"
+msgstr "Logg - ut må være i fortiden."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Signed"
+msgstr "Signeringsdato"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.open_view_attendance
+msgid ""
+"The Time Tracking functionality aims to manage employee attendances from "
+"Sign in/Sign out actions. You can also link this feature to an attendance "
+"device using OpenERP's web service features."
+msgstr ""
+"Tid Sporing funksjonalitet mål er å forvalte de ansattes tilskuertall fra "
+"Logg inn / Logg ut handlinger. Du kan også koble denne funksjonen til en "
+"frammøte enheten ved hjelp OpenERP web-service funksjoner."
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Attendance reasons"
+msgstr "Oppmøte grunner"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: field:hr.attendance,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Present"
+msgstr "Presentere"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out_ask
+msgid "Ask for Sign In Out"
+msgstr "Spør for pålogging ut."
+
+#. module: hr_attendance
+#: field:hr.attendance,action_desc:0
+#: model:ir.model,name:hr_attendance.model_hr_action_reason
+msgid "Action Reason"
+msgstr "Handling grunn."
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Ok"
+msgstr "Ok"
+
+#. module: hr_attendance
+#: view:hr.action.reason:0
+msgid "Define attendance reason"
+msgstr "Definer frammøte grunn."
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/report/attendance_by_month.py:184
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
+#, python-format
+msgid "Attendances By Month"
+msgstr "Tilskuertall Pr.mnd"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,name:0
+#: field:hr.sign.in.out.ask,name:0
+msgid "Employees name"
+msgstr "Ansattnavn"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason
+msgid "Attendance Reasons"
+msgstr "Oppmøte grunner"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:161
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:167
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:179
+#, python-format
+msgid "UserError"
+msgstr "Brukerfeil"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,end_date:0
+#: field:hr.attendance.week,end_date:0
+msgid "Ending Date"
+msgstr "Sluttdato"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:140
+#, python-format
+msgid "Warning"
+msgstr "Advarsel"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:174
+#, python-format
+msgid "The Sign-in date must be in the past"
+msgstr "Logg inn dato må være i fortiden."
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:167
+#, python-format
+msgid "A sign-in must be right after a sign-out !"
+msgstr "En pålogging må være rett etter en logg ut!"
+
+#. module: hr_attendance
+#: field:hr.employee,state:0
+#: model:ir.model,name:hr_attendance.model_hr_attendance
+msgid "Attendance"
+msgstr "Oppmøte"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,max_delay:0
+msgid "Max. Delay (Min)"
+msgstr "Maks. Forsinkelse (Min)"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.attendance.week:0
+msgid "Print"
+msgstr "Skriv ut"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Hr Attendance Search"
+msgstr "Hr Oppmøte Søk."
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_week
+msgid "Attendances By Week"
+msgstr "Tilskuertall etter uke."
+
+#. module: hr_attendance
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr "Feil: Logg på (hhv. Logg ut) må følge Logg ut (hhv. Logg inn)"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "July"
+msgstr "juli"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_error
+#: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
+msgid "Attendance Error Report"
+msgstr "Oppmøte Feilrapport"
+
+#. module: hr_attendance
+#: field:hr.attendance.error,init_date:0
+#: field:hr.attendance.week,init_date:0
+msgid "Starting Date"
+msgstr "Startdato"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Min Delay"
+msgstr "Minimum forsinkelse."
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign In"
+msgstr "Logg Inn"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Operation"
+msgstr "Handling"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No Data Available"
+msgstr "Ingen informasjon tilgjengelig"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "September"
+msgstr "September"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "December"
+msgstr "Desember"
+
+#. module: hr_attendance
+#: field:hr.attendance.month,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: hr_attendance
+#: field:hr.action.reason,action_type:0
+msgid "Action Type"
+msgstr "Handlingstype"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A negative delay means that the employee worked more than encoded."
+msgstr ""
+"(*) En negativ forsinkelse innebærer at arbeidstakeren jobbet mer enn kodet."
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "My Attendance"
+msgstr "Min Oppmøte"
+
+#. module: hr_attendance
+#: help:hr.attendance,action_desc:0
+msgid ""
+"Specifies the reason for Signing In/Signing Out in case of extra hours."
+msgstr "Angir årsaken til pålogging / logge ut I tilfelle ekstra timer."
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_month
+msgid "Print Monthly Attendance Report"
+msgstr "Skriv ut månedlig Oppmøte Rapporter."
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_sign_in_out
+msgid "Sign In Sign Out"
+msgstr "Logg inn - Logg ut"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:105
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:129
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:146
+#: view:hr.sign.in.out:0
+#: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_sigh_in_out
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_sigh_in_out
+#, python-format
+msgid "Sign in / Sign out"
+msgstr "Logg inn / Logg ut"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.out.ask"
+msgstr "hr.signere.ut.spør."
+
+#. module: hr_attendance
+#: view:hr.attendance.week:0
+msgid "Print Attendance Report Weekly"
+msgstr "Skriv ut Oppmøte Rapporter Ukentlig."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "August"
+msgstr "August"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:179
+#, python-format
+msgid "A sign-out must be right after a sign-in !"
+msgstr "Et logg-ut må være rett etter en logg - inn!"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_error
+msgid "Print Error Attendance Report"
+msgstr "Print Feil Oppmøte Rapporter."
+
+#. module: hr_attendance
+#: field:hr.attendance,name:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "November"
+msgstr "November"
+
+#. module: hr_attendance
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Feil! Du kan ikke opprette rekursiv Hierarki av ansatte."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "January"
+msgstr "Januar"
+
+#. module: hr_attendance
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign in"
+msgstr "Logg inn"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Analysis Information"
+msgstr "Analyse Informasjon."
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid "Sign-out Entry Must Follow Sign-in."
+msgstr ""
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Attendance Errors"
+msgstr "Oppmøte feil"
+
+#. module: hr_attendance
+#: field:hr.attendance,action:0
+#: selection:hr.attendance,action:0
+msgid "Action"
+msgstr "Handling"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out:0
+msgid ""
+"If you need your staff to sign in when they arrive at work and sign out "
+"again at the end of the day, OpenERP allows you to manage this with this "
+"tool. If each employee has been linked to a system user, then they can "
+"encode their time with this action button."
+msgstr ""
+"Hvis du trenger dine ansatte til å logge på når de kommer på jobb og logge "
+"ut igjen på slutten av dagen, kan OpenERP tillate deg å administrere dette "
+"med dette verktøyet. Hvis hver ansatt har vært knyttet til et system bruker, "
+"så de kan kode sin tid med denne handlingen knappen."
+
+#. module: hr_attendance
+#: model:ir.model,name:hr_attendance.model_hr_attendance_week
+msgid "Print Week Attendance Report"
+msgstr "Skriv Ut Uke Oppmøte Rapporter."
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,emp_id:0
+#: field:hr.sign.in.out.ask,emp_id:0
+msgid "Empoyee ID"
+msgstr "Ansatt ID"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+#: view:hr.attendance.month:0
+#: view:hr.attendance.week:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: hr_attendance
+#: help:hr.action.reason,name:0
+msgid "Specifies the reason for Signing In/Signing Out."
+msgstr "Angir årsaken til pålogging / logger av."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid ""
+"(*) A positive delay means that the employee worked less than recorded."
+msgstr ""
+"(*) En positiv forsinkelse innebærer at arbeidstakeren jobbet mindre enn "
+"registrert."
+
+#. module: hr_attendance
+#: view:hr.attendance.month:0
+msgid "Print Attendance Report Monthly"
+msgstr "Skriv ut Oppmøte Rapporter Månedlig."
+
+#. module: hr_attendance
+#: selection:hr.action.reason,action_type:0
+#: view:hr.sign.in.out:0
+#: view:hr.sign.in.out.ask:0
+msgid "Sign out"
+msgstr "Logg av"
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Delay"
+msgstr "Forsinkelse"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+#: model:ir.model,name:hr_attendance.model_hr_employee
+msgid "Employee"
+msgstr "Ansatt"
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/hr_attendance.py:140
+#, python-format
+msgid ""
+"You tried to %s with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
+msgstr ""
+"Du prøvde å% s med en dato fremre til en annen hendelse!\n"
+"Prøv å kontakte administrator for å rette tilskuertall."
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+#: field:hr.sign.in.out.ask,last_time:0
+msgid "Your last sign out"
+msgstr "Din siste Logg ut."
+
+#. module: hr_attendance
+#: report:report.hr.timesheet.attendance.error:0
+msgid "Date Recorded"
+msgstr "Dato Innspilt"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,name:hr_attendance.open_view_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
+#: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
+msgid "Attendances"
+msgstr "Tilskuertall"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "May"
+msgstr "Mai"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "Your last sign in"
+msgstr "Din siste logg inn."
+
+#. module: hr_attendance
+#: selection:hr.attendance,action:0
+#: view:hr.employee:0
+msgid "Sign Out"
+msgstr "Logg Ut"
+
+#. module: hr_attendance
+#: model:ir.actions.act_window,help:hr_attendance.action_hr_attendance_sigh_in_out
+msgid ""
+"Sign in / Sign out. In some companies, staff have to sign in when they "
+"arrive at work and sign out again at the end of the day. If each employee "
+"has been linked to a system user, then they can encode their time with this "
+"action button."
+msgstr ""
+"Logg inn / Logg ut. I noen bedrifter, ansatte må logge inn når de kommer på "
+"jobb og Logg ut igjen på slutten av dagen. Hvis hver ansatt har vært knyttet "
+"til et system bruker, så de kan kode sin tid med denne handlingen knappen."
+
+#. module: hr_attendance
+#: field:hr.attendance,employee_id:0
+msgid "Employee's Name"
+msgstr "Ansatte's navn."
+
+#. module: hr_attendance
+#: selection:hr.employee,state:0
+msgid "Absent"
+msgstr "Fraværende"
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: hr_attendance
+#: view:hr.attendance:0
+msgid "Employee attendances"
+msgstr "Ansattes tilskuertall"
+
+#. module: hr_attendance
+#: field:hr.sign.in.out,state:0
+msgid "Current state"
+msgstr "Nåværende tilstand."
+
+#. module: hr_attendance
+#: selection:hr.attendance.month,month:0
+msgid "April"
+msgstr "April"
+
+#. module: hr_attendance
+#: view:hr.attendance.error:0
+msgid "Bellow this delay, the error is considered to be voluntary"
+msgstr "Under denne forsinkelsen, er feilen anses å være frivillig."
+
+#. module: hr_attendance
+#: code:addons/hr_attendance/wizard/hr_attendance_error.py:49
+#, python-format
+msgid "No records found for your selection!"
+msgstr "Ingen rader funnet med angitt utvalg!"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid ""
+"You did not sign in the last time. Please enter the date and time you signed "
+"in."
+msgstr ""
+"Du hadde ikke logget ut siste gang. Vennligst skriv inn datoen og "
+"klokkeslettet du logget."
+
+#. module: hr_attendance
+#: field:hr.attendance.month,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: hr_attendance
+#: view:hr.sign.in.out.ask:0
+msgid "hr.sign.in.out.ask"
+msgstr "hr.Logg.i.ut.spør"
+
+#~ msgid "Sign-Out Entry must follow Sign-In."
+#~ msgstr "Logg ut Entry må følge pålogging."
diff --git a/addons/hr_attendance/i18n/nl.po b/addons/hr_attendance/i18n/nl.po
index 70f87e4516b..ca1bdc29d1d 100644
--- a/addons/hr_attendance/i18n/nl.po
+++ b/addons/hr_attendance/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/nl_BE.po b/addons/hr_attendance/i18n/nl_BE.po
index be11a5b77f7..8d173bba19c 100644
--- a/addons/hr_attendance/i18n/nl_BE.po
+++ b/addons/hr_attendance/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/pl.po b/addons/hr_attendance/i18n/pl.po
index 3548c7721fd..8fad425c308 100644
--- a/addons/hr_attendance/i18n/pl.po
+++ b/addons/hr_attendance/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/pt.po b/addons/hr_attendance/i18n/pt.po
index 3e74c509949..244c51baf79 100644
--- a/addons/hr_attendance/i18n/pt.po
+++ b/addons/hr_attendance/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po
index c6b56383c6c..be4570a47a4 100644
--- a/addons/hr_attendance/i18n/pt_BR.po
+++ b/addons/hr_attendance/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/ro.po b/addons/hr_attendance/i18n/ro.po
index 7917aebb7f2..0b0cd8e5273 100644
--- a/addons/hr_attendance/i18n/ro.po
+++ b/addons/hr_attendance/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/ru.po b/addons/hr_attendance/i18n/ru.po
index edbc7e6034c..3774c88b25c 100644
--- a/addons/hr_attendance/i18n/ru.po
+++ b/addons/hr_attendance/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/sl.po b/addons/hr_attendance/i18n/sl.po
index ff18a0b8118..d546d0c80f4 100644
--- a/addons/hr_attendance/i18n/sl.po
+++ b/addons/hr_attendance/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/sq.po b/addons/hr_attendance/i18n/sq.po
index b467b646afb..9335cc24194 100644
--- a/addons/hr_attendance/i18n/sq.po
+++ b/addons/hr_attendance/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/sr.po b/addons/hr_attendance/i18n/sr.po
index 2110f779409..715acfbf09a 100644
--- a/addons/hr_attendance/i18n/sr.po
+++ b/addons/hr_attendance/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/sr@latin.po b/addons/hr_attendance/i18n/sr@latin.po
index a54469db34d..d4a65f3e22f 100644
--- a/addons/hr_attendance/i18n/sr@latin.po
+++ b/addons/hr_attendance/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/sv.po b/addons/hr_attendance/i18n/sv.po
index f94afe6ef6a..94c366bba6c 100644
--- a/addons/hr_attendance/i18n/sv.po
+++ b/addons/hr_attendance/i18n/sv.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
 msgid "Time Tracking"
-msgstr "Tidsuppföljning"
+msgstr "Tidrapporter"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -85,7 +85,7 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.action.reason:0
 msgid "Attendance reasons"
-msgstr "Attendance reasons"
+msgstr "Närvaro orsaker"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -136,7 +136,7 @@ msgstr "Anställds namn"
 #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance_reason
 #: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance_reason
 msgid "Attendance Reasons"
-msgstr "Attendance Reasons"
+msgstr "Närvaro Orsaker"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:161
@@ -214,7 +214,7 @@ msgstr "juli"
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_error
 #: model:ir.actions.report.xml,name:hr_attendance.attendance_error_report
 msgid "Attendance Error Report"
-msgstr "Attendance Error Report"
+msgstr "Närvarofelrapport"
 
 #. module: hr_attendance
 #: field:hr.attendance.error,init_date:0
@@ -481,7 +481,7 @@ msgstr "Date Recorded"
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_open_view_attendance
 msgid "Attendances"
-msgstr "Attendances"
+msgstr "Närvaro"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
diff --git a/addons/hr_attendance/i18n/tlh.po b/addons/hr_attendance/i18n/tlh.po
index f2291249076..997d0c1e1b4 100644
--- a/addons/hr_attendance/i18n/tlh.po
+++ b/addons/hr_attendance/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/tr.po b/addons/hr_attendance/i18n/tr.po
index ab86b511164..25ebbb6981a 100644
--- a/addons/hr_attendance/i18n/tr.po
+++ b/addons/hr_attendance/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
@@ -196,7 +196,7 @@ msgstr "İK Devamlılık Ara"
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_week
 msgid "Attendances By Week"
-msgstr ""
+msgstr "Haftaya göre Devamlılık"
 
 #. module: hr_attendance
 #: constraint:hr.attendance:0
@@ -272,7 +272,7 @@ msgstr ""
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendance"
-msgstr ""
+msgstr "Devam Durumum"
 
 #. module: hr_attendance
 #: help:hr.attendance,action_desc:0
@@ -309,7 +309,7 @@ msgstr "hr.sign.out.ask"
 #. module: hr_attendance
 #: view:hr.attendance.week:0
 msgid "Print Attendance Report Weekly"
-msgstr ""
+msgstr "Devamlılık Raporun Haftalık Yazdır"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
diff --git a/addons/hr_attendance/i18n/uk.po b/addons/hr_attendance/i18n/uk.po
index c8ce7f04b5d..4c9c0a86b7e 100644
--- a/addons/hr_attendance/i18n/uk.po
+++ b/addons/hr_attendance/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/vi.po b/addons/hr_attendance/i18n/vi.po
index 93023575958..17a964d70ab 100644
--- a/addons/hr_attendance/i18n/vi.po
+++ b/addons/hr_attendance/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/zh_CN.po b/addons/hr_attendance/i18n/zh_CN.po
index 0689ae9bc50..f976b9420f6 100644
--- a/addons/hr_attendance/i18n/zh_CN.po
+++ b/addons/hr_attendance/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/i18n/zh_TW.po b/addons/hr_attendance/i18n/zh_TW.po
index ae11ed814c1..931e3b17103 100644
--- a/addons/hr_attendance/i18n/zh_TW.po
+++ b/addons/hr_attendance/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:54+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
diff --git a/addons/hr_attendance/report/attendance_by_month.py b/addons/hr_attendance/report/attendance_by_month.py
index 17cf548345e..6d41869ff23 100644
--- a/addons/hr_attendance/report/attendance_by_month.py
+++ b/addons/hr_attendance/report/attendance_by_month.py
@@ -31,6 +31,7 @@ from report.interface import toxml
 from report import report_sxw
 from tools import ustr
 from tools.translate import _
+from tools import to_xml
 
 one_day = relativedelta(days=1)
 month2name = [0, 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
@@ -57,6 +58,7 @@ class report_custom(report_rml):
         if emp_ids:
             for emp in obj_emp.read(cr, uid, emp_ids, ['name']):
                 stop, days_xml = False, []
+                total_wh = 0.0
                 user_repr = '''
                 <user>
                   <name>%s</name>
@@ -86,15 +88,21 @@ class report_custom(report_rml):
                     for att in attendences:
                         dt = datetime.strptime(att['name'], '%Y-%m-%d %H:%M:%S')
                         if ldt and att['action'] == 'sign_out':
+                            if dt.date() > ldt.date():
+                                dt = ldt
                             wh += (float((dt - ldt).seconds)/60/60)
                         else:
                             ldt = dt
                     # Week xml representation
+                    total_wh += wh
                     wh = hour2str(wh)
                     today_xml = '<day num="%s"><wh>%s</wh></day>' % ((today - month).days+1, (wh))
                     dy=(today - month).days+1
                     days_xml.append(today_xml)
                     today, tomor = tomor, tomor + one_day
+                total_wh = hour2str(total_wh)
+                today_xml = '<day num="Total"><wh>%s</wh></day>' % (total_wh)
+                days_xml.append(today_xml)
                 user_xml.append(user_repr % '\n'.join(days_xml))
 
         rpt_obj = pooler.get_pool(cr.dbname).get('hr.employee')
@@ -104,7 +112,7 @@ class report_custom(report_rml):
         <date>%s</date>
         <company>%s</company>
         </header>
-        ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name)
+        ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),to_xml(pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name))
 
         first_date = str(month)
         som = datetime.strptime(first_date, '%Y-%m-%d %H:%M:%S')
@@ -172,8 +180,9 @@ class report_custom(report_rml):
                     cell=cell+x
                     width_dict[j]=x
                 day_diff1=day_diff1-x
+        date_xml += ['<dayy name="Total" cell="Total"/>']
         date_xml.append('</days>')
-        date_xml.append('<cols>3.5cm%s</cols>\n' % (',0.74cm' * (int(dy))))
+        date_xml.append('<cols>3.5cm%s,1.2cm</cols>\n' % (',0.74cm' * (int(dy))))
         xml = '''<?xml version="1.0" encoding="UTF-8" ?>
         <report>
         %s
@@ -181,7 +190,7 @@ class report_custom(report_rml):
         %s
         %s
         </report>
-        ''' % (header_xml,_('Attendances By Month'),'\n'.join(user_xml),date_xml)
+        ''' % (header_xml,_('Attendances by Month'),'\n'.join(user_xml),date_xml)
         return xml
 
 report_custom('report.hr.attendance.bymonth', 'hr.employee', '', 'addons/hr_attendance/report/bymonth.xsl')
diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py
index 900f982dc74..5df1bae4dba 100644
--- a/addons/hr_attendance/report/timesheet.py
+++ b/addons/hr_attendance/report/timesheet.py
@@ -20,12 +20,15 @@
 ##############################################################################
 
 
+import time
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
 import pooler
 from report.interface import report_rml
 from report.interface import toxml
+from report import report_sxw
+from tools.translate import _
 import tools
 
 one_week = relativedelta(days=7)
@@ -39,6 +42,7 @@ 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')
 
+        emp_ids = datas['active_ids']
         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 - relativedelta(days=start_date.date().weekday())
@@ -47,9 +51,16 @@ class report_custom(report_rml):
         if last_monday < first_monday:
             first_monday, last_monday = last_monday, first_monday
 
+        rpt_obj = pooler.get_pool(cr.dbname).get('hr.employee')
+        rml_obj=report_sxw.rml_parse(cr, uid, rpt_obj._name,context)
+        header_xml = '''
+        <header>
+        <date>%s</date>
+        <company>%s</company>
+        </header>
+        ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name)
         user_xml = []
-
-        for employee_id in ids:
+        for employee_id in emp_ids:
             emp = obj_emp.read(cr, uid, [employee_id], ['id', 'name'])[0]
             monday, n_monday = first_monday, first_monday + one_week
             stop, week_xml = False, []
@@ -88,7 +99,7 @@ class report_custom(report_rml):
                             ldt = dt
 
                 # Week xml representation
-                week_repr = ['<week>', '<weekstart>%s</weekstart>' % monday.strftime('%Y-%m-%d'), '<weekend>%s</weekend>' % n_monday.strftime('%Y-%m-%d')]
+                week_repr = ['<week>', '<weekstart>%s</weekstart>' % monday.strftime('%Y-%m-%d'), '<weekend>%s</weekend>' % (n_monday - relativedelta(days=1)).strftime('%Y-%m-%d')]
                 for idx in range(7):
                     week_repr.append('<%s>' % num2day[idx])
                     if idx in week_wh:
@@ -98,17 +109,17 @@ class report_custom(report_rml):
                 week_repr.append('<worked>%sh%02d</worked>' % to_hour(reduce(lambda x,y:x+y, week_wh.values(), 0)))
                 week_repr.append('</total>')
                 week_repr.append('</week>')
-                if len(week_repr) > 21: # 21 = minimal length of week_repr
-                    week_xml.append('\n'.join(week_repr))
+                week_xml.append('\n'.join(week_repr))
 
                 monday, n_monday = n_monday, n_monday + one_week
             user_xml.append(user_repr % '\n'.join(week_xml))
-
         xml = '''<?xml version="1.0" encoding="UTF-8" ?>
         <report>
         %s
+        <title>%s</title>
+        %s
         </report>
-        ''' % '\n'.join(user_xml)
+        ''' % (header_xml,_('Attendances by Week'),'\n'.join(user_xml))
         xml = tools.ustr(xml).encode('utf8')
         return self.post_process_xml_data(cr, uid, xml, context)
 
diff --git a/addons/hr_attendance/report/timesheet.xsl b/addons/hr_attendance/report/timesheet.xsl
index f815c0880fc..4d113512801 100644
--- a/addons/hr_attendance/report/timesheet.xsl
+++ b/addons/hr_attendance/report/timesheet.xsl
@@ -3,12 +3,15 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
+    <xsl:import href="hr_custom_default.xsl"/>
+    <xsl:import href="hr_custom_rml.xsl"/>
+
 	<xsl:template match="/">
         <xsl:call-template name="rml" />
     </xsl:template>
 
 
-    <xsl:template name="rml">
+    <xsl:template name="stylesheet">
 		<document filename="timesheet.pdf">
 			<template pageSize="29.7cm,21cm" leftMargin="2.0cm" rightMargin="2.0cm" topMargin="2.0cm" bottomMargin="2.0cm" title="Timesheets" author="Generated by Open ERP, Fabien Pinckaers" allowSplitting="20">
 				<pageTemplate id="first">
@@ -20,11 +23,17 @@
 			</template>
 			
 			<stylesheet>
+			   <paraStyle name="title" fontName="Helvetica-Bold" fontSize="15.0" leading="17" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+			   <paraStyle name="emp" fontSize="13.0"/>
 		       <blockTableStyle id="week">
-		           <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="-1,0"/>
-		           <blockBackground colorName="grey" start="0,0" stop="-1,0"/>
-		           <blockTextColor colorName="red" start="-1,0" stop="-1,-1"/>
-		           <lineStyle kind="LINEBEFORE" colorName="grey" start="-1,0" stop="-1,-1"/>
+		           <blockFont name="Helvetica" size="9" start="0,0" stop="-1,-1"/>
+		           <blockFont name="Helvetica-BoldOblique" size="12" start="0,0" stop="0,0"/>
+		           <blockBackground colorName="lightgrey" start="1,0" stop="-1,0"/>
+		           <blockFont name="Helvetica-BoldOblique" start="-1,0" stop="-1,-1"/>
+		            <lineStyle kind="LINEABOVE" colorName="black" start="0,0" stop="-1,0" />
+                    <lineStyle kind="LINEBEFORE" colorName="black" start="0,0" stop="-1,-1"/>
+                    <lineStyle kind="LINEAFTER" colorName="black" start="-1,0" stop="-1,-1"/>
+                    <lineStyle kind="LINEBELOW" colorName="black" start="0,0" stop="-1,-1"/>
 		           <blockValign value="TOP"/>
 		       </blockTableStyle>
 			</stylesheet>
@@ -36,32 +45,37 @@
     </xsl:template>
 
     <xsl:template name="story">
+        <spacer length="1cm" />
+        <xsl:apply-templates select="report/title"/>
         <xsl:apply-templates select="report/user"/>
     </xsl:template>
 
+    <xsl:template match="title">
+        <para style="title">
+            <xsl:value-of select="."/>
+        </para>
+        <spacer length="1cm"/>
+    </xsl:template>
+
     <xsl:template match="user">
-        <para>
-            <b>Name:</b>
+        <spacer length="1cm" />
+        <para style="emp">
+            <b>Employee: </b>
             <i><xsl:value-of select="name" /></i>
         </para>
-        <blockTable colWidths="4cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm,1.5cm" style="week">
-            <tr>
-                <td></td>
-                <td>Mon</td>
-                <td>Tue</td>
-                <td>Wed</td>
-                <td>Thu</td>
-                <td>Fri</td>
-                <td>Sat</td>
-                <td>Sun</td>
-                <td>Tot</td>
-            </tr>
-            <xsl:for-each select="week">
-                <tr></tr>
+        <spacer length="0.5cm" />
+        <xsl:for-each select="week">
+            <blockTable colWidths="8cm,2cm,2cm,2cm,2cm,2cm,2cm,2cm,2cm" style="week">
                 <tr>
-                    <td>Week:</td>
-                    <td></td>
-                    <td>from <xsl:value-of select="weekstart" /> to <xsl:value-of select="weekend" /></td>
+                    <td>From <xsl:value-of select="weekstart" /> to <xsl:value-of select="weekend" /></td>
+                    <td>Mon</td>
+                    <td>Tue</td>
+                    <td>Wed</td>
+                    <td>Thu</td>
+                    <td>Fri</td>
+                    <td>Sat</td>
+                    <td>Sun</td>
+                    <td>Total</td>
                 </tr>
                 <tr>
                     <td>Worked hours</td>
@@ -70,7 +84,7 @@
                             <xsl:when test="Monday/workhours">
                                 <xsl:value-of select="Monday/workhours" />
                             </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
+                            <xsl:otherwise>0h00</xsl:otherwise>
                         </xsl:choose>							
                     </td>
                     <td>
@@ -78,7 +92,7 @@
                             <xsl:when test="Tuesday/workhours">
                                 <xsl:value-of select="Tuesday/workhours" />
                             </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
+                            <xsl:otherwise>0h00</xsl:otherwise>
                         </xsl:choose>							
                     </td>
                     <td>
@@ -86,7 +100,7 @@
                             <xsl:when test="Wednesday/workhours">
                                 <xsl:value-of select="Wednesday/workhours" />
                             </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
+                            <xsl:otherwise>0h00</xsl:otherwise>
                         </xsl:choose>							
                     </td>
                     <td>
@@ -94,7 +108,7 @@
                             <xsl:when test="Thursday/workhours">
                                 <xsl:value-of select="Thursday/workhours" />
                             </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
+                            <xsl:otherwise>0h00</xsl:otherwise>
                         </xsl:choose>							
                     </td>
                     <td>
@@ -102,7 +116,7 @@
                             <xsl:when test="Friday/workhours">
                                 <xsl:value-of select="Friday/workhours" />
                             </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
+                            <xsl:otherwise>0h00</xsl:otherwise>
                         </xsl:choose>							
                     </td>
                     <td>
@@ -110,7 +124,7 @@
                             <xsl:when test="Saturday/workhours">
                                 <xsl:value-of select="Saturday/workhours" />
                             </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
+                            <xsl:otherwise>0h00</xsl:otherwise>
                         </xsl:choose>							
                     </td>
                     <td>
@@ -118,14 +132,24 @@
                             <xsl:when test="Sunday/workhours">
                                 <xsl:value-of select="Sunday/workhours" />
                             </xsl:when>
-                            <xsl:otherwise>0</xsl:otherwise>
+                            <xsl:otherwise>0h00</xsl:otherwise>
                         </xsl:choose>							
                     </td>
                     <td>
                         <xsl:value-of select="total/worked" />
                     </td>
                 </tr>
-            </xsl:for-each>
-        </blockTable>
+            </blockTable>
+            <xsl:if test="position() != last()">
+                <blockTable colWidths="24cm" style="week">
+                    <tr>
+                        <td colspan="6"></td>
+                    </tr>
+                </blockTable>
+            </xsl:if>
+        </xsl:for-each>
+        <xsl:if test="position() != last()">
+            <pageBreak/>
+        </xsl:if>
     </xsl:template>
 </xsl:stylesheet>
diff --git a/addons/import_sugarcrm/wizard/import_message.py b/addons/hr_attendance/res_config.py
similarity index 69%
rename from addons/import_sugarcrm/wizard/import_message.py
rename to addons/hr_attendance/res_config.py
index 1d2e765580b..61e2f784a5a 100644
--- a/addons/import_sugarcrm/wizard/import_message.py
+++ b/addons/hr_attendance/res_config.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -18,14 +18,16 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+
 from osv import fields, osv
 
-class import_message(osv.osv):
-     """Import Message"""
+class hr_attendance_config_settings(osv.osv_memory):
+    _inherit = 'hr.config.settings'
 
-     _name = "import.message"
-     _description = __doc__
-     
-import_message()
+    _columns = {
+        'group_hr_attendance': fields.boolean('Track attendances for all employees',
+            implied_group='base.group_hr_attendance',
+            help="Allocates attendance group to all users."),
+    }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_attendance/res_config_view.xml b/addons/hr_attendance/res_config_view.xml
new file mode 100644
index 00000000000..252672ad86d
--- /dev/null
+++ b/addons/hr_attendance/res_config_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="hr_attendace_group" model="ir.ui.view">
+            <field name="name">hr.config.settings.inherit</field>
+            <field name="model">hr.config.settings</field>
+            <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
+            <field name="arch" type="xml">
+            <data>
+                 <xpath expr="//div[@name='hr_attendance']" position="after">
+                    <div>
+                        <field name="group_hr_attendance" class="oe_inline"/>
+                        <label for="group_hr_attendance"/>
+                    </div>
+                 </xpath>
+            </data>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/hr_attendance/security/ir_rule.xml b/addons/hr_attendance/security/ir_rule.xml
index b934dc16f5a..e08af0644bc 100644
--- a/addons/hr_attendance/security/ir_rule.xml
+++ b/addons/hr_attendance/security/ir_rule.xml
@@ -2,6 +2,11 @@
 <openerp>
     <data noupdate="True">
 
+        <record id="base.group_hr_attendance" model="res.groups">
+            <field name="name">Attendances</field>
+            <field name="category_id" ref="base.module_category_hidden"/>
+        </record>
+
         <record id="property_rule_attendace_manager" model="ir.rule">
             <field name="name">Manager Attendance</field>
             <field model="ir.model" name="model_id" ref="model_hr_attendance"/>
diff --git a/addons/hr_attendance/static/src/css/slider.css b/addons/hr_attendance/static/src/css/slider.css
new file mode 100644
index 00000000000..664d4f96e41
--- /dev/null
+++ b/addons/hr_attendance/static/src/css/slider.css
@@ -0,0 +1,33 @@
+
+.openerp .oe_attendance_status {
+    height: 32px;
+    width: 32px;
+    display: inline-block;
+}
+.openerp .oe_attendance_signin {
+    float:left;
+    height: 32px;
+    width: 32px;
+    background: url(/hr_attendance/static/src/img/emp-out32.png);
+    cursor: pointer;
+}
+.openerp .oe_attendance_signin:hover {
+    background: url(/hr_attendance/static/src/img/emp-out-disable32.png);
+}
+.openerp .oe_attendance_status.oe_attendance_signed .oe_attendance_signin {
+    display: none;
+}
+
+.openerp .oe_attendance_signout {
+    float:right;
+    height: 32px;
+    width: 32px;
+    background: url(/hr_attendance/static/src/img/emp-in32.png);
+    cursor: pointer;
+}
+.openerp .oe_attendance_signout:hover {
+    background: url(/hr_attendance/static/src/img/emp-in-disable32.png);
+}
+.openerp .oe_attendance_status.oe_attendance_nosigned .oe_attendance_signout {
+    display: none;
+}
diff --git a/addons/hr_attendance/static/src/img/emp-in-disable32.png b/addons/hr_attendance/static/src/img/emp-in-disable32.png
new file mode 100644
index 00000000000..1968e0de464
Binary files /dev/null and b/addons/hr_attendance/static/src/img/emp-in-disable32.png differ
diff --git a/addons/hr_attendance/static/src/img/emp-in32.png b/addons/hr_attendance/static/src/img/emp-in32.png
new file mode 100644
index 00000000000..26e3c01556b
Binary files /dev/null and b/addons/hr_attendance/static/src/img/emp-in32.png differ
diff --git a/addons/hr_attendance/static/src/img/emp-out-disable32.png b/addons/hr_attendance/static/src/img/emp-out-disable32.png
new file mode 100644
index 00000000000..b7099e44529
Binary files /dev/null and b/addons/hr_attendance/static/src/img/emp-out-disable32.png differ
diff --git a/addons/hr_attendance/static/src/img/emp-out32.png b/addons/hr_attendance/static/src/img/emp-out32.png
new file mode 100644
index 00000000000..d2a6cbb5013
Binary files /dev/null and b/addons/hr_attendance/static/src/img/emp-out32.png differ
diff --git a/addons/hr_attendance/static/src/js/attendance.js b/addons/hr_attendance/static/src/js/attendance.js
new file mode 100644
index 00000000000..84516353b9d
--- /dev/null
+++ b/addons/hr_attendance/static/src/js/attendance.js
@@ -0,0 +1,87 @@
+
+openerp.hr_attendance = function (instance) {
+    
+    var QWeb = instance.web.qweb;
+    var _t = instance.web._t;
+    var _lt = instance.web._lt;
+
+    instance.hr_attendance.AttendanceSlider = instance.web.Widget.extend({
+        template: 'AttendanceSlider',
+        init: function (parent) {
+            this._super(parent);
+            this.set({"signed_in": false});
+        },
+        start: function() {
+            var self = this;
+            var tmp = function() {
+                this.$el.toggleClass("oe_attendance_nosigned", ! this.get("signed_in"));
+                this.$el.toggleClass("oe_attendance_signed", this.get("signed_in"));
+            };
+            this.on("change:signed_in", this, tmp);
+            _.bind(tmp, this)();
+            this.$(".oe_attendance_signin").click(function() {
+                self.do_update_attendance();
+            });
+            this.$(".oe_attendance_signout").click(function() {
+                self.do_update_attendance();
+            });
+            this.$el.tipsy({
+                title: function() {
+                    var last_text = instance.web.format_value(self.last_sign, {type: "datetime"});
+                    var current_text = instance.web.format_value(new Date(), {type: "datetime"});
+                    var duration = self.last_sign ? $.timeago(self.last_sign) : "none";
+                    if (self.get("signed_in")) {
+                        return _.str.sprintf(_t("Last sign in: %s,<br />%s.<br />Click to sign out."), last_text, duration);
+                    } else {
+                        return _.str.sprintf(_t("Click to Sign In at %s."), current_text);
+                    }
+                },
+                html: true,
+            });
+            return this.check_attendance();
+        },
+        do_update_attendance: function () {
+            var self = this;
+            var hr_employee = new instance.web.DataSet(self, 'hr.employee');
+            hr_employee.call('attendance_action_change', [
+                [self.employee.id]
+            ]).done(function (result) {
+                self.last_sign = new Date();
+                self.set({"signed_in": ! self.get("signed_in")});
+            });
+        },
+        check_attendance: function () {
+            var self = this;
+            self.employee = false;
+            this.$el.hide();
+            var employee = new instance.web.DataSetSearch(self, 'hr.employee', self.session.user_context, [
+                ['user_id', '=', self.session.uid]
+            ]);
+            return employee.read_slice(['id', 'name', 'state', 'last_sign', 'attendance_access']).then(function (res) {
+                if (_.isEmpty(res) )
+                    return;
+                if (res[0].attendance_access == false){
+                    return;
+                }
+                self.$el.show();
+                self.employee = res[0];
+                self.last_sign = instance.web.str_to_datetime(self.employee.last_sign);
+                self.set({"signed_in": self.employee.state !== "absent"});
+            });
+        },
+    });
+
+    instance.web.UserMenu.include({
+        do_update: function () {
+            this._super();
+            var self = this;
+            this.update_promise = this.update_promise.done(function () {
+                if (self.attendanceslider)
+                    return;
+                self.attendanceslider = new instance.hr_attendance.AttendanceSlider(self);
+
+                self.attendanceslider.prependTo(instance.webclient.$('.oe_systray'));
+            });
+        },
+    });
+}
diff --git a/addons/hr_attendance/static/src/xml/attendance.xml b/addons/hr_attendance/static/src/xml/attendance.xml
new file mode 100644
index 00000000000..3fd9bcf2798
--- /dev/null
+++ b/addons/hr_attendance/static/src/xml/attendance.xml
@@ -0,0 +1,13 @@
+<template>
+    <t t-name="AttendanceSlider">
+        <div class="oe_attendance_status oe_attendance_nosigned" data-tipsy="true">
+             <div class="oe_attendance_signin"></div>
+             <div class="oe_attendance_signout"></div>
+        </div>
+    </t>
+</template>
+
+
+
+
+
diff --git a/addons/hr_attendance/test/attendance_process.yml b/addons/hr_attendance/test/attendance_process.yml
index 4ad765d65df..7902bf11d9d 100644
--- a/addons/hr_attendance/test/attendance_process.yml
+++ b/addons/hr_attendance/test/attendance_process.yml
@@ -1,16 +1,8 @@
 -
   In order to test attendance process in OpenERP, I entry of SignIn of employee.
 -
-  !python {model: hr.sign.in.out}: |
-    context.update({'emp_id': [ref('hr.employee_al')]}) #TOFIX: emp_ids instead of 'emp_id'
--
-  !record {model: hr.sign.in.out, id: employee_sign_in}:
-    {}
--
-  Employee Signs In.
--
-  !python {model: hr.sign.in.out}: |
-    self.si_check(cr, uid, [ref("employee_sign_in")], context=context)
+  !python {model: hr.employee}: |
+    self.attendance_action_change(cr, uid, [ref("hr.employee_al")], context=context)
 -
   I check that Employee is "Present".
 -
@@ -19,10 +11,10 @@
 -
   After few seconds, employee sign's out.
 -
-  !python {model: hr.sign.in.out}: |
+  !python {model: hr.employee}: |
     import time
     time.sleep(2)
-    self.so_check(cr, uid, [ref("employee_sign_in")], context=context)
+    self.attendance_action_change(cr, uid, [ref("hr.employee_al")], context=context)
 -
   I check that Employee is "Absent".
 -
diff --git a/addons/hr_attendance/wizard/__init__.py b/addons/hr_attendance/wizard/__init__.py
index a414c9a8798..6269c507d8c 100644
--- a/addons/hr_attendance/wizard/__init__.py
+++ b/addons/hr_attendance/wizard/__init__.py
@@ -19,9 +19,8 @@
 #
 ##############################################################################
 
-import hr_attendance_sign_in_out
 import hr_attendance_error
 import hr_attendance_byweek
 import hr_attendance_bymonth
 
-# 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_attendance/wizard/hr_attendance_bymonth.py b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
index 40dca536d7d..03e1db5dc3a 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth.py
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
@@ -50,4 +50,4 @@ class hr_attendance_bymonth(osv.osv_memory):
 
 hr_attendance_bymonth()
 
-# 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_attendance/wizard/hr_attendance_byweek.py b/addons/hr_attendance/wizard/hr_attendance_byweek.py
index 139ff94cd5a..420773eaf13 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek.py
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek.py
@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import time
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 
 from osv import osv, fields
 
@@ -30,13 +31,14 @@ class hr_attendance_byweek(osv.osv_memory):
         'end_date': fields.date('Ending Date', required=True)
     }
     _defaults = {
-         'init_date': lambda *a: time.strftime('%Y-%m-%d'),
-         'end_date': lambda *a: time.strftime('%Y-%m-%d'),
+         'init_date': (datetime.today() - relativedelta(days=datetime.date(datetime.today()).weekday())).strftime('%Y-%m-%d'),
+         'end_date': (datetime.today() + relativedelta(days=6 - datetime.date(datetime.today()).weekday())).strftime('%Y-%m-%d'),
     }
 
     def print_report(self, cr, uid, ids, context=None):
         datas = {
              'ids': [],
+             'active_ids': context['active_ids'],
              'model': 'hr.employee',
              'form': self.read(cr, uid, ids)[0]
         }
@@ -48,4 +50,4 @@ class hr_attendance_byweek(osv.osv_memory):
 
 hr_attendance_byweek()
 
-# 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_attendance/wizard/hr_attendance_error.py b/addons/hr_attendance/wizard/hr_attendance_error.py
index e2f9dc94b3f..d489e699d89 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error.py
+++ b/addons/hr_attendance/wizard/hr_attendance_error.py
@@ -66,4 +66,4 @@ class hr_attendance_error(osv.osv_memory):
 
 hr_attendance_error()
 
-# 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_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
deleted file mode 100644
index 0ad4323ad78..00000000000
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ /dev/null
@@ -1,184 +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 time
-
-from osv import osv, fields
-from tools.translate import _
-
-class hr_si_so_ask(osv.osv_memory):
-    _name = 'hr.sign.in.out.ask'
-    _description = 'Ask for Sign In Out'
-    _columns = {
-        'name': fields.char('Employees name', size=32, required=True, readonly=True),
-        'last_time': fields.datetime('Your last sign out', required=True),
-        'emp_id': fields.many2one('hr.employee', 'Empoyee ID', readonly=True),
-        }
-
-    def _get_empname(self, cr, uid, context=None):
-        emp_id = context.get('emp_id', self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context))
-        if emp_id:
-            employee = self.pool.get('hr.employee').browse(cr, uid, emp_id, context=context)[0].name
-            return employee
-        return ''
-
-    def _get_empid(self, cr, uid, context=None):
-        emp_id = context.get('emp_id', self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context))
-        if emp_id:
-            return emp_id[0]
-        return False
-
-    _defaults = {
-         'name': _get_empname,
-         'emp_id': _get_empid,
-                 }
-
-    def sign_in(self, cr, uid, ids, context=None):
-        data = self.read(cr, uid, ids, [], context=context)[0]
-        data['emp_id'] = data['emp_id'] and data['emp_id'][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, [], context=context)[0]
-        data['emp_id'] = data['emp_id'] and data['emp_id'][0]
-        return self.pool.get('hr.sign.in.out').sign_out(cr, uid, data, context)
-
-hr_si_so_ask()
-
-class hr_sign_in_out(osv.osv_memory):
-    _name = 'hr.sign.in.out'
-    _description = 'Sign In Sign Out'
-
-    _columns = {
-        'name': fields.char('Employees name', size=32, required=True, readonly=True),
-        'state': fields.char('Current state', size=32, required=True, readonly=True),
-        'emp_id': fields.many2one('hr.employee', 'Empoyee ID', readonly=True),
-                }
-
-    def _get_empid(self, cr, uid, context=None):
-        emp_id = context.get('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]
-            return {'name': employee.name, 'state': employee.state, 'emp_id': emp_id[0]}
-        return {}
-
-    def default_get(self, cr, uid, fields_list, context=None):
-        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)
-        return res
-
-    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, [], context=context)[0]
-        data['emp_id'] = data['emp_id'] and data['emp_id'][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, context=context)
-        if last_att:
-            last_att = last_att[0]
-        cond = not last_att or last_att.action == 'sign_out'
-        if cond:
-            return self.sign_in(cr, uid, data, context)
-        else:
-            model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_hr_attendance_so_ask')], 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',
-                'view_mode': 'tree,form',
-                'res_model': 'hr.sign.in.out.ask',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'context': context,
-                'target': 'new',
-            }
-
-    def so_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, [], context=context)[0]
-        data['emp_id'] = data['emp_id'] and data['emp_id'][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)
-        if last_att:
-            last_att = last_att[0]
-        if not att_id and not last_att:
-            model_data_ids = obj_model.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_hr_attendance_message')], 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',
-                'view_mode': 'tree,form',
-                'res_model': 'hr.sign.in.out',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'context': context,
-                'target': 'new',
-            }
-
-        cond = last_att and last_att['action'] == 'sign_in'
-        if cond:
-            return self.sign_out(cr, uid, data, context)
-        else:
-            model_data_ids = obj_model.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_hr_attendance_si_ask')], 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',
-                'view_mode': 'tree,form',
-                'res_model': 'hr.sign.in.out.ask',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-            }
-
-    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(_('User Error!'), _('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}, context=context)
-        try:
-            self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_in')
-        except:
-            raise osv.except_osv(_('User Error!'), _('A sign-in must be right after a sign-out!'))
-        return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
-
-    def sign_out(self, cr, uid, data, context=None):
-        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(_('User Error!'), _('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}, context=context)
-        try:
-            self.pool.get('hr.employee').attendance_action_change(cr, uid, [emp_id], 'sign_out')
-        except:
-            raise osv.except_osv(_('User Error!'), _('A sign-out must be right after a sign-in.'))
-        return {'type': 'ir.actions.act_window_close'} # To do: Return Success message
-
-hr_sign_in_out()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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
deleted file mode 100644
index 5c84be5107f..00000000000
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <record id="view_hr_attendance_sigh_in_out" model="ir.ui.view">
-            <field name="name">hr.sign.in.out.form</field>
-            <field name="model">hr.sign.in.out</field>
-            <field name="arch" type="xml">
-                <form string="Sign in / Sign out" version="7.0">
-                    <group>
-                        <separator colspan="4" string="Sign in / Sign out"/>
-                        <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
-                        <newline/>
-                    </group>
-                    <group colspan="4" >
-                    <field name="name" />
-                    <field name="state" />
-                    </group>
-                    <footer>
-                        <button string="Sign in" name="si_check" type="object" class="oe_highlight"/>
-                        <button string="Sign out" name="so_check" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-               </form>
-            </field>
-        </record>
-
-       <record id="view_hr_attendance_message" model="ir.ui.view">
-            <field name="name">hr.sign.in.out.form</field>
-            <field name="model">hr.sign.in.out</field>
-            <field name="arch" type="xml">
-                <form string="Sign in / Sign out" version="7.0">
-                    <separator string="Sign-out Entry Must Follow Sign-in." colspan="4" />
-               </form>
-            </field>
-        </record>
-
-        <record id="action_hr_attendance_sigh_in_out" model="ir.actions.act_window">
-            <field name="name">Sign in / Sign out</field>
-            <field name="res_model">hr.sign.in.out</field>
-            <field name="view_type">form</field>
-            <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"
-            parent="menu_hr_attendance" sequence="4"/>
-
-       <record id="view_hr_attendance_so_ask" model="ir.ui.view">
-            <field name="name">hr.sign.in.out.ask.form</field>
-            <field name="model">hr.sign.in.out.ask</field>
-            <field name="arch" type="xml">
-                <form string="hr.sign.out.ask" version="7.0">
-                    <header>
-                        <button string="Sign in" name="sign_in" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group colspan="4" >
-                    <separator string="You did not sign out the last time. Please enter the date and time you signed out." colspan="4" />
-                    <field name="name" />
-                    <field name="last_time" string="Your last sign out" />
-                    </group>
-               </form>
-            </field>
-        </record>
-
-       <record id="view_hr_attendance_si_ask" model="ir.ui.view">
-            <field name="name">hr.sign.in.out.ask.form</field>
-            <field name="model">hr.sign.in.out.ask</field>
-            <field name="arch" type="xml">
-                <form string="hr.sign.in.out.ask" version="7.0">
-                    <header>
-                        <button string="Sign out" name="sign_out" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </header>
-                    <group colspan="4" >
-                    <separator string="You did not sign in the last time. Please enter the date and time you signed in." colspan="4" />
-                    <field name="name" />
-                    <field name="last_time" string="Your last sign in" />
-                    </group>
-               </form>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index 766ec803b75..ec33b5f44aa 100644
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    'name': "Employee Contracts",
+    'name': 'Employee Contracts',
     'version': '1.0',
     'category': 'Human Resources',
     'description': """
@@ -39,17 +39,14 @@ You can assign several contracts per employee.
     'website': 'http://www.openerp.com',
     'images': ['images/hr_contract.jpeg'],
     'depends': ['hr'],
-    'init_xml': ['hr_contract_data.xml'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
-        'hr_contract_view.xml'
-        ],
-    'demo_xml': [],
-    'test': [
-             'test/test_hr_contract.yml'
-             ],
+        'hr_contract_view.xml',
+        'hr_contract_data.xml'
+    ],
+    'demo': [],
+    'test': ['test/test_hr_contract.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0046298028637',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 10620cb9a4b..0659d661420 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        
+        
+<!-- Contracts Button on Employee Form -->
 
+        <record id="act_hr_employee_2_hr_contract" model="ir.actions.act_window">
+            <field name="res_model">hr.contract</field>
+            <field name="view_type">form</field>
+            <field name="name">Contracts</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
+        </record>
+        
         <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="30" groups="base.group_no_one"/>
         <record id="hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
@@ -9,19 +20,20 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='parent_id']" position="before">
+                    <xpath expr="//div[@name='button_box']" position="inside">
+                        <button name="%(act_hr_employee_2_hr_contract)d" string="Contracts" type="action" groups="base.group_hr_manager"/>
+                    </xpath>
+                    <xpath expr="//field[@name='coach_id']" position="after">
                         <field name="manager"/>
                     </xpath>
                     <xpath expr="//group[@name='active_group']" position="before">
-                        <group>
+                        <group string="Contract">
+                            <field name="medic_exam" string="Medical Exam"/>
                             <field name="vehicle"/>
                             <field name="vehicle_distance"/>
                         </group>
                     </xpath>
-                    <field name="active" position="before">
-                        <field name="medic_exam" string="Medical Exam"/>
-                    </field>
-                    <field name="birthday" position="before">
+                    <field name="marital" position="after">
                         <field name="children"/>
                     </field>
                     <field name="birthday" position="after">
@@ -177,15 +189,5 @@
         <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6" groups="base.group_no_one"/>
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager"/>
 
-        <!-- Contracts Button on Employee Form -->
-
-        <act_window
-        context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-        id="act_hr_employee_2_hr_contract"
-        name="Contracts"
-        res_model="hr.contract"
-        src_model="hr.employee"
-        groups="base.group_hr_manager"/>
-
     </data>
 </openerp>
diff --git a/addons/hr_contract/i18n/ar.po b/addons/hr_contract/i18n/ar.po
index 133e26f6525..b0555d98231 100644
--- a/addons/hr_contract/i18n/ar.po
+++ b/addons/hr_contract/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/bg.po b/addons/hr_contract/i18n/bg.po
index be6d31fc273..ef6a7ac72e2 100644
--- a/addons/hr_contract/i18n/bg.po
+++ b/addons/hr_contract/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/bs.po b/addons/hr_contract/i18n/bs.po
index cd3d722fed3..7af2885190d 100644
--- a/addons/hr_contract/i18n/bs.po
+++ b/addons/hr_contract/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ca.po b/addons/hr_contract/i18n/ca.po
index 84988845118..6f47fcacdbf 100644
--- a/addons/hr_contract/i18n/ca.po
+++ b/addons/hr_contract/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/cs.po b/addons/hr_contract/i18n/cs.po
index cb2befabac9..3da768b574b 100644
--- a/addons/hr_contract/i18n/cs.po
+++ b/addons/hr_contract/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/da.po b/addons/hr_contract/i18n/da.po
index a78c81d95fa..fca80a62781 100644
--- a/addons/hr_contract/i18n/da.po
+++ b/addons/hr_contract/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/de.po b/addons/hr_contract/i18n/de.po
index 7b468b12f4e..c079cf800e5 100644
--- a/addons/hr_contract/i18n/de.po
+++ b/addons/hr_contract/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/el.po b/addons/hr_contract/i18n/el.po
index 0d02e35078f..da8e93cefbe 100644
--- a/addons/hr_contract/i18n/el.po
+++ b/addons/hr_contract/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_contract/i18n/es.po b/addons/hr_contract/i18n/es.po
index 0258090f1d4..ba9b828c65d 100644
--- a/addons/hr_contract/i18n/es.po
+++ b/addons/hr_contract/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/es_AR.po b/addons/hr_contract/i18n/es_AR.po
index f20e81f4666..d29127465ec 100644
--- a/addons/hr_contract/i18n/es_AR.po
+++ b/addons/hr_contract/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/es_CR.po b/addons/hr_contract/i18n/es_CR.po
index 367e76ce334..9f8153b06aa 100644
--- a/addons/hr_contract/i18n/es_CR.po
+++ b/addons/hr_contract/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: hr_contract
diff --git a/addons/hr_contract/i18n/es_EC.po b/addons/hr_contract/i18n/es_EC.po
index fc6a8e99cb6..087dc6bfdd7 100644
--- a/addons/hr_contract/i18n/es_EC.po
+++ b/addons/hr_contract/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/es_PY.po b/addons/hr_contract/i18n/es_PY.po
index 537bc8a6feb..2e0a4ca83e1 100644
--- a/addons/hr_contract/i18n/es_PY.po
+++ b/addons/hr_contract/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/et.po b/addons/hr_contract/i18n/et.po
index ee70410833b..4a5ad2ed443 100644
--- a/addons/hr_contract/i18n/et.po
+++ b/addons/hr_contract/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/fi.po b/addons/hr_contract/i18n/fi.po
index 37f4bdd836e..fcbd3daacd1 100644
--- a/addons/hr_contract/i18n/fi.po
+++ b/addons/hr_contract/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/fr.po b/addons/hr_contract/i18n/fr.po
index 07cb6663104..44a9d42ab3b 100644
--- a/addons/hr_contract/i18n/fr.po
+++ b/addons/hr_contract/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/gl.po b/addons/hr_contract/i18n/gl.po
index 3e13175bf0d..ffcfb86150d 100644
--- a/addons/hr_contract/i18n/gl.po
+++ b/addons/hr_contract/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/gu.po b/addons/hr_contract/i18n/gu.po
index dd66082ed23..474f7898ad1 100644
--- a/addons/hr_contract/i18n/gu.po
+++ b/addons/hr_contract/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/hi.po b/addons/hr_contract/i18n/hi.po
index 40452b480cd..9431a27ce34 100644
--- a/addons/hr_contract/i18n/hi.po
+++ b/addons/hr_contract/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/hr.po b/addons/hr_contract/i18n/hr.po
index 8dfcec6be84..3433b6dcbdc 100644
--- a/addons/hr_contract/i18n/hr.po
+++ b/addons/hr_contract/i18n/hr.po
@@ -13,85 +13,85 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
 msgid "Wage"
-msgstr "Plata"
+msgstr "Plaća"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Information"
-msgstr ""
+msgstr "Informacije"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Trial Period"
-msgstr ""
+msgstr "Probni period"
 
 #. module: hr_contract
 #: field:hr.contract,trial_date_start:0
 msgid "Trial Start Date"
-msgstr ""
+msgstr "Početak probnog perioda"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
-msgstr ""
+msgstr "Sistematski pregled"
 
 #. module: hr_contract
 #: field:hr.employee,vehicle:0
 msgid "Company Vehicle"
-msgstr ""
+msgstr "Službeno vozilo"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Razno"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Current"
-msgstr ""
+msgstr "Važeći"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: hr_contract
 #: field:hr.contract,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Odjel"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Overpassed"
-msgstr ""
+msgstr "Nevažeći"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.contract,employee_id:0
 #: model:ir.model,name:hr_contract.model_hr_employee
 msgid "Employee"
-msgstr "Uposlenik"
+msgstr "Zaposlenik"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Search Contract"
-msgstr ""
+msgstr "Pretraži ugovor"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Contracts in progress"
-msgstr ""
+msgstr "Važeći ugovori"
 
 #. module: hr_contract
 #: field:hr.employee,vehicle_distance:0
 msgid "Home-Work Distance"
-msgstr ""
+msgstr "Udaljenost od kuće do posla"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -105,54 +105,54 @@ msgstr "Ugovori"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Personal Info"
-msgstr ""
+msgstr "Informacije o zaposleniku"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Contracts whose end date already passed"
-msgstr ""
+msgstr "Ugovori koji su istekli"
 
 #. module: hr_contract
 #: help:hr.employee,contract_id:0
 msgid "Latest contract of the employee"
-msgstr ""
+msgstr "Aktualni ugovor zaposlenika"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
-msgstr ""
+msgstr "Radno mjesto"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: field:hr.contract,advantages:0
 msgid "Advantages"
-msgstr ""
+msgstr "Prednosti"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Valid for"
-msgstr ""
+msgstr "Važeći za"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Work Permit"
-msgstr ""
+msgstr "Radna dozvola"
 
 #. module: hr_contract
 #: field:hr.employee,children:0
 msgid "Number of Children"
-msgstr ""
+msgstr "Broj djece"
 
 #. module: hr_contract
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type
 msgid "Contract Types"
-msgstr ""
+msgstr "Vrsta ugovora"
 
 #. module: hr_contract
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Pogreška ! Ne možete kreirati rekurzivnu hijerarhiju zaposlenika."
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -162,17 +162,17 @@ msgstr "Završni Datum"
 #. module: hr_contract
 #: help:hr.contract,wage:0
 msgid "Basic Salary of the employee"
-msgstr ""
+msgstr "Neto plaća zaposlenika"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
 msgid "Contract Reference"
-msgstr ""
+msgstr "Referenca ugovora"
 
 #. module: hr_contract
 #: help:hr.employee,vehicle_distance:0
 msgid "In kilometers"
-msgstr ""
+msgstr "U kilometrima"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -183,7 +183,7 @@ msgstr "Bilješke"
 #. module: hr_contract
 #: field:hr.contract,permit_no:0
 msgid "Work Permit No"
-msgstr ""
+msgstr "Broj radne dozvole (licence)"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -206,27 +206,27 @@ msgstr "Vrsta Ugovora"
 #: view:hr.contract:0
 #: field:hr.contract,working_hours:0
 msgid "Working Schedule"
-msgstr ""
+msgstr "Radni tjedan"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Job Info"
-msgstr ""
+msgstr "Informacije o poslu"
 
 #. module: hr_contract
 #: field:hr.contract,visa_expire:0
 msgid "Visa Expire Date"
-msgstr ""
+msgstr "Datum isteka vize"
 
 #. module: hr_contract
 #: field:hr.contract,job_id:0
 msgid "Job Title"
-msgstr ""
+msgstr "Naziv radnog mjesta"
 
 #. module: hr_contract
 #: field:hr.employee,manager:0
 msgid "Is a Manager"
-msgstr ""
+msgstr "Menadžer"
 
 #. module: hr_contract
 #: field:hr.contract,date_start:0
@@ -237,36 +237,37 @@ msgstr "Početni Datum"
 #: constraint:hr.contract:0
 msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
+"Greška! Datum početka ugovora mora biti ranije od datuma kraja ugovora."
 
 #. module: hr_contract
 #: field:hr.contract,visa_no:0
 msgid "Visa No"
-msgstr ""
+msgstr "Broj vize"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
 msgid "Place of Birth"
-msgstr "Mjesto Rođenja"
+msgstr "Mjesto rođenja"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Duration"
-msgstr ""
+msgstr "Trajanje"
 
 #. module: hr_contract
 #: field:hr.employee,medic_exam:0
 msgid "Medical Examination Date"
-msgstr ""
+msgstr "Datum sistematskog pregleda"
 
 #. module: hr_contract
 #: field:hr.contract,trial_date_end:0
 msgid "Trial End Date"
-msgstr ""
+msgstr "Kraj probnog roka"
 
 #. module: hr_contract
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
-msgstr ""
+msgstr "Pretraži tip ugovora"
 
 #~ msgid "Wage Types"
 #~ msgstr "Vrste Plata"
diff --git a/addons/hr_contract/i18n/hu.po b/addons/hr_contract/i18n/hu.po
index 86a0a977ce1..3b240f73ab7 100644
--- a/addons/hr_contract/i18n/hu.po
+++ b/addons/hr_contract/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/id.po b/addons/hr_contract/i18n/id.po
index 7dd17005f68..c86dced5353 100644
--- a/addons/hr_contract/i18n/id.po
+++ b/addons/hr_contract/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/it.po b/addons/hr_contract/i18n/it.po
index 8ac0d74ef84..33f83ec2607 100644
--- a/addons/hr_contract/i18n/it.po
+++ b/addons/hr_contract/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ja.po b/addons/hr_contract/i18n/ja.po
index 6e8451caeb7..b53bd54c831 100644
--- a/addons/hr_contract/i18n/ja.po
+++ b/addons/hr_contract/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ko.po b/addons/hr_contract/i18n/ko.po
index 173901b3a2a..dc2e0b1e93b 100644
--- a/addons/hr_contract/i18n/ko.po
+++ b/addons/hr_contract/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/lo.po b/addons/hr_contract/i18n/lo.po
index 719455e7330..e6b83679ee8 100644
--- a/addons/hr_contract/i18n/lo.po
+++ b/addons/hr_contract/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/lt.po b/addons/hr_contract/i18n/lt.po
index 413eb266b34..8244fec2aa3 100644
--- a/addons/hr_contract/i18n/lt.po
+++ b/addons/hr_contract/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/lv.po b/addons/hr_contract/i18n/lv.po
index 89425ba1419..28e3874f127 100644
--- a/addons/hr_contract/i18n/lv.po
+++ b/addons/hr_contract/i18n/lv.po
@@ -14,23 +14,23 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
 msgid "Wage"
-msgstr ""
+msgstr "Alga"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Information"
-msgstr ""
+msgstr "Informācija"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Trial Period"
-msgstr ""
+msgstr "Pārbaudes laiks"
 
 #. module: hr_contract
 #: field:hr.contract,trial_date_start:0
@@ -40,7 +40,7 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
-msgstr ""
+msgstr "Medicīniskā Pārbaude"
 
 #. module: hr_contract
 #: field:hr.employee,vehicle:0
@@ -55,17 +55,17 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Current"
-msgstr ""
+msgstr "Pašreizējais"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupēt pēc..."
 
 #. module: hr_contract
 #: field:hr.contract,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Nodaļa"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -77,7 +77,7 @@ msgstr ""
 #: field:hr.contract,employee_id:0
 #: model:ir.model,name:hr_contract.model_hr_employee
 msgid "Employee"
-msgstr ""
+msgstr "Darbinieks"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -101,7 +101,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract
 msgid "Contracts"
-msgstr ""
+msgstr "Līgumi"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -173,7 +173,7 @@ msgstr ""
 #. module: hr_contract
 #: help:hr.employee,vehicle_distance:0
 msgid "In kilometers"
-msgstr ""
+msgstr "Kilometros"
 
 #. module: hr_contract
 #: view:hr.contract:0
diff --git a/addons/hr_contract/i18n/mk.po b/addons/hr_contract/i18n/mk.po
new file mode 100644
index 00000000000..490c60c7fab
--- /dev/null
+++ b/addons/hr_contract/i18n/mk.po
@@ -0,0 +1,271 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-10-09 08:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: hr_contract
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Плата"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Information"
+msgstr "Информации"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Trial Period"
+msgstr "Пробен Период"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "Пробен Почетен Датум"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Medical Examination"
+msgstr "Систематски Преглед"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle:0
+msgid "Company Vehicle"
+msgstr "Службено Возило"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Miscellaneous"
+msgstr "Разно"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Current"
+msgstr "Тековен"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Group By..."
+msgstr "Групирај По..."
+
+#. module: hr_contract
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "Сектор"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Overpassed"
+msgstr "Изминат"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,employee_id:0
+#: model:ir.model,name:hr_contract.model_hr_employee
+msgid "Employee"
+msgstr "Вработен"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Search Contract"
+msgstr "Пребарај Договор"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Contracts in progress"
+msgstr "Договори во тек"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle_distance:0
+msgid "Home-Work Distance"
+msgstr "Дома-Работа Одалеченост"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.employee,contract_ids:0
+#: model:ir.actions.act_window,name:hr_contract.act_hr_employee_2_hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract
+msgid "Contracts"
+msgstr "Договори"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Personal Info"
+msgstr "Лични информации"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Contracts whose end date already passed"
+msgstr "Договори чии што краен рок е веќе поминат"
+
+#. module: hr_contract
+#: help:hr.employee,contract_id:0
+msgid "Latest contract of the employee"
+msgstr "Последен договор на вработениот"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Job"
+msgstr "Работно Место"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,advantages:0
+msgid "Advantages"
+msgstr "Придобивки"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Valid for"
+msgstr "Валиден за"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Work Permit"
+msgstr "Дозвола за Работа"
+
+#. module: hr_contract
+#: field:hr.employee,children:0
+msgid "Number of Children"
+msgstr "Број на Деца"
+
+#. module: hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type
+msgid "Contract Types"
+msgstr "Типови на Договор"
+
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Грешка! Не можете да креирате рекурзивна хиерархија на вработените."
+
+#. module: hr_contract
+#: field:hr.contract,date_end:0
+msgid "End Date"
+msgstr "Краен датум"
+
+#. module: hr_contract
+#: help:hr.contract,wage:0
+msgid "Basic Salary of the employee"
+msgstr "Основна Плата на вработениот"
+
+#. module: hr_contract
+#: field:hr.contract,name:0
+msgid "Contract Reference"
+msgstr "Референца"
+
+#. module: hr_contract
+#: help:hr.employee,vehicle_distance:0
+msgid "In kilometers"
+msgstr "во километри"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,notes:0
+msgid "Notes"
+msgstr "Забелешки"
+
+#. module: hr_contract
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr "Број на Дозвола за Работа"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.employee,contract_id:0
+#: model:ir.model,name:hr_contract.model_hr_contract
+#: model:ir.ui.menu,name:hr_contract.next_id_56
+msgid "Contract"
+msgstr "Договор"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,type_id:0
+#: view:hr.contract.type:0
+#: field:hr.contract.type,name:0
+#: model:ir.model,name:hr_contract.model_hr_contract_type
+msgid "Contract Type"
+msgstr "Тип на Договор"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "Распоред за Работа"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Job Info"
+msgstr "Информации за Работата"
+
+#. module: hr_contract
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr "Виза Датум на Истекување"
+
+#. module: hr_contract
+#: field:hr.contract,job_id:0
+msgid "Job Title"
+msgstr "Звање"
+
+#. module: hr_contract
+#: field:hr.employee,manager:0
+msgid "Is a Manager"
+msgstr "Менаџер"
+
+#. module: hr_contract
+#: field:hr.contract,date_start:0
+msgid "Start Date"
+msgstr "Почетен датум"
+
+#. module: hr_contract
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+"Грешка! Почетниот датум на договорот мора да биде помал од крајниот датум."
+
+#. module: hr_contract
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr "Број на Виза"
+
+#. module: hr_contract
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
+msgstr "Место на раѓање"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Duration"
+msgstr "Траење"
+
+#. module: hr_contract
+#: field:hr.employee,medic_exam:0
+msgid "Medical Examination Date"
+msgstr "Датум за Систематски Преглед"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_end:0
+msgid "Trial End Date"
+msgstr "Пробен Краен Датум"
+
+#. module: hr_contract
+#: view:hr.contract.type:0
+msgid "Search Contract Type"
+msgstr "Пребарај Тип на Договор"
diff --git a/addons/hr_contract/i18n/mn.po b/addons/hr_contract/i18n/mn.po
index b1dc0846c03..61a04ffc981 100644
--- a/addons/hr_contract/i18n/mn.po
+++ b/addons/hr_contract/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/nb.po b/addons/hr_contract/i18n/nb.po
new file mode 100644
index 00000000000..498d34529ef
--- /dev/null
+++ b/addons/hr_contract/i18n/nb.po
@@ -0,0 +1,270 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-08 18:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: hr_contract
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Lønn"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Information"
+msgstr "Informasjon"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Trial Period"
+msgstr "Prøveperiode"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "Prøve Startdato"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Medical Examination"
+msgstr "Legeundersøkelse"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle:0
+msgid "Company Vehicle"
+msgstr "Selskapets Kjøretøy."
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Miscellaneous"
+msgstr "Diverse"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Current"
+msgstr "Nåværende"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: hr_contract
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "Avdeling"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Overpassed"
+msgstr "Overpassert"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,employee_id:0
+#: model:ir.model,name:hr_contract.model_hr_employee
+msgid "Employee"
+msgstr "Ansatt"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Search Contract"
+msgstr "Søk Kontrakt"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Contracts in progress"
+msgstr "Kontrakter i fremgang"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle_distance:0
+msgid "Home-Work Distance"
+msgstr "Hjem-arbeid Avstand."
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.employee,contract_ids:0
+#: model:ir.actions.act_window,name:hr_contract.act_hr_employee_2_hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract
+msgid "Contracts"
+msgstr "Kontrakter"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Personal Info"
+msgstr "Personlig Info"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Contracts whose end date already passed"
+msgstr "Kontrakter som sluttdato har allerede passert."
+
+#. module: hr_contract
+#: help:hr.employee,contract_id:0
+msgid "Latest contract of the employee"
+msgstr "Siste kontrakten av den ansatte"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Job"
+msgstr "Jobb"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,advantages:0
+msgid "Advantages"
+msgstr "Fordeler"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Valid for"
+msgstr "Gyldig for."
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Work Permit"
+msgstr "Arbeidstillatelse"
+
+#. module: hr_contract
+#: field:hr.employee,children:0
+msgid "Number of Children"
+msgstr "Antall barn"
+
+#. module: hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type
+msgid "Contract Types"
+msgstr "Kontrakt typer."
+
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Feil! Du kan ikke opprette rekursiv Hierarki av ansatte."
+
+#. module: hr_contract
+#: field:hr.contract,date_end:0
+msgid "End Date"
+msgstr "Sluttdato"
+
+#. module: hr_contract
+#: help:hr.contract,wage:0
+msgid "Basic Salary of the employee"
+msgstr "Grunnlønn for den ansatte."
+
+#. module: hr_contract
+#: field:hr.contract,name:0
+msgid "Contract Reference"
+msgstr "Kontrakt referanse."
+
+#. module: hr_contract
+#: help:hr.employee,vehicle_distance:0
+msgid "In kilometers"
+msgstr "I kilometer."
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,notes:0
+msgid "Notes"
+msgstr "Notater"
+
+#. module: hr_contract
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr "Arbeidstillatelse Ingen."
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.employee,contract_id:0
+#: model:ir.model,name:hr_contract.model_hr_contract
+#: model:ir.ui.menu,name:hr_contract.next_id_56
+msgid "Contract"
+msgstr "Kontrakt"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,type_id:0
+#: view:hr.contract.type:0
+#: field:hr.contract.type,name:0
+#: model:ir.model,name:hr_contract.model_hr_contract_type
+msgid "Contract Type"
+msgstr "Kontrakt type."
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "Arbeidsplan"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Job Info"
+msgstr "Jobb informasjon."
+
+#. module: hr_contract
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr "Visa utløpsdato."
+
+#. module: hr_contract
+#: field:hr.contract,job_id:0
+msgid "Job Title"
+msgstr "Jobb Tittel"
+
+#. module: hr_contract
+#: field:hr.employee,manager:0
+msgid "Is a Manager"
+msgstr "Er en leder."
+
+#. module: hr_contract
+#: field:hr.contract,date_start:0
+msgid "Start Date"
+msgstr "Startdato"
+
+#. module: hr_contract
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr "Feil! Kontrakten startdato må være lavere enn kontrakt sluttdato."
+
+#. module: hr_contract
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr "Visa Nei."
+
+#. module: hr_contract
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
+msgstr "Fødested"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Duration"
+msgstr "Varighet"
+
+#. module: hr_contract
+#: field:hr.employee,medic_exam:0
+msgid "Medical Examination Date"
+msgstr "Legeundersøkelse Dato"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_end:0
+msgid "Trial End Date"
+msgstr "Prøve Sluttdato ."
+
+#. module: hr_contract
+#: view:hr.contract.type:0
+msgid "Search Contract Type"
+msgstr "Søk Kontraktstype"
diff --git a/addons/hr_contract/i18n/nl.po b/addons/hr_contract/i18n/nl.po
index 7cc2688ab79..d95c92f7a2b 100644
--- a/addons/hr_contract/i18n/nl.po
+++ b/addons/hr_contract/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-19 12:41+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/nl_BE.po b/addons/hr_contract/i18n/nl_BE.po
index 8b024691cff..3f667721f6c 100644
--- a/addons/hr_contract/i18n/nl_BE.po
+++ b/addons/hr_contract/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/pl.po b/addons/hr_contract/i18n/pl.po
index dacfbe7e1c4..5e62f44a1a9 100644
--- a/addons/hr_contract/i18n/pl.po
+++ b/addons/hr_contract/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/pt.po b/addons/hr_contract/i18n/pt.po
index cd21cc86917..4d9edca4b66 100644
--- a/addons/hr_contract/i18n/pt.po
+++ b/addons/hr_contract/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/pt_BR.po b/addons/hr_contract/i18n/pt_BR.po
index a97d3021069..1f485b8770d 100644
--- a/addons/hr_contract/i18n/pt_BR.po
+++ b/addons/hr_contract/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ro.po b/addons/hr_contract/i18n/ro.po
index 0e3107175ed..c5184bdf182 100644
--- a/addons/hr_contract/i18n/ro.po
+++ b/addons/hr_contract/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/ru.po b/addons/hr_contract/i18n/ru.po
index bf5eb3324b4..b479741e088 100644
--- a/addons/hr_contract/i18n/ru.po
+++ b/addons/hr_contract/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sl.po b/addons/hr_contract/i18n/sl.po
index b7930343cad..b1b70e076c6 100644
--- a/addons/hr_contract/i18n/sl.po
+++ b/addons/hr_contract/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sq.po b/addons/hr_contract/i18n/sq.po
index 0410b887166..2f8860f6161 100644
--- a/addons/hr_contract/i18n/sq.po
+++ b/addons/hr_contract/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sr.po b/addons/hr_contract/i18n/sr.po
index 62d10ccd1cb..9d7d717531a 100644
--- a/addons/hr_contract/i18n/sr.po
+++ b/addons/hr_contract/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sr@latin.po b/addons/hr_contract/i18n/sr@latin.po
index 63fec6d0c21..95387071391 100644
--- a/addons/hr_contract/i18n/sr@latin.po
+++ b/addons/hr_contract/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/sv.po b/addons/hr_contract/i18n/sv.po
index 2817a19cc83..4cd8d268511 100644
--- a/addons/hr_contract/i18n/sv.po
+++ b/addons/hr_contract/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
@@ -126,7 +126,7 @@ msgstr "Jobb"
 #: view:hr.contract:0
 #: field:hr.contract,advantages:0
 msgid "Advantages"
-msgstr "Fördelar"
+msgstr "Förmåner"
 
 #. module: hr_contract
 #: view:hr.contract:0
diff --git a/addons/hr_contract/i18n/tlh.po b/addons/hr_contract/i18n/tlh.po
index e14adf66883..a24861d9850 100644
--- a/addons/hr_contract/i18n/tlh.po
+++ b/addons/hr_contract/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/tr.po b/addons/hr_contract/i18n/tr.po
index 7f56484eeda..9e2ac5b4730 100644
--- a/addons/hr_contract/i18n/tr.po
+++ b/addons/hr_contract/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
@@ -24,7 +24,7 @@ msgstr "Ücret"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Information"
-msgstr ""
+msgstr "Bilgi"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -86,7 +86,7 @@ msgstr "Sözleşme Ara"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Contracts in progress"
-msgstr ""
+msgstr "Sürmekte olan sözleşmeler"
 
 #. module: hr_contract
 #: field:hr.employee,vehicle_distance:0
@@ -110,7 +110,7 @@ msgstr "Personel Bilgisi"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Contracts whose end date already passed"
-msgstr ""
+msgstr "Bitiş tarihi çoktan geçmiş sözleşmeler"
 
 #. module: hr_contract
 #: help:hr.employee,contract_id:0
@@ -162,7 +162,7 @@ msgstr "Bitiş Tarihi"
 #. module: hr_contract
 #: help:hr.contract,wage:0
 msgid "Basic Salary of the employee"
-msgstr ""
+msgstr "Çalışanın Temel Ücreti"
 
 #. module: hr_contract
 #: field:hr.contract,name:0
@@ -183,7 +183,7 @@ msgstr "Notlar"
 #. module: hr_contract
 #: field:hr.contract,permit_no:0
 msgid "Work Permit No"
-msgstr ""
+msgstr "İş İzin No"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -216,7 +216,7 @@ msgstr "İş Bilgisi"
 #. module: hr_contract
 #: field:hr.contract,visa_expire:0
 msgid "Visa Expire Date"
-msgstr ""
+msgstr "Vize Bitiş Tarihi"
 
 #. module: hr_contract
 #: field:hr.contract,job_id:0
@@ -242,7 +242,7 @@ msgstr ""
 #. module: hr_contract
 #: field:hr.contract,visa_no:0
 msgid "Visa No"
-msgstr ""
+msgstr "Vize No"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
diff --git a/addons/hr_contract/i18n/uk.po b/addons/hr_contract/i18n/uk.po
index 39f5d7039a9..3c537afbf0f 100644
--- a/addons/hr_contract/i18n/uk.po
+++ b/addons/hr_contract/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/vi.po b/addons/hr_contract/i18n/vi.po
index 23caf5ff1e4..23131d34557 100644
--- a/addons/hr_contract/i18n/vi.po
+++ b/addons/hr_contract/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po
index 519a87d0584..c43ed942544 100644
--- a/addons/hr_contract/i18n/zh_CN.po
+++ b/addons/hr_contract/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_contract/i18n/zh_TW.po b/addons/hr_contract/i18n/zh_TW.po
index c36fa6987a0..222172bd2f7 100644
--- a/addons/hr_contract/i18n/zh_TW.po
+++ b/addons/hr_contract/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py
index bb1322bccf3..fb303ff28e4 100644
--- a/addons/hr_evaluation/__openerp__.py
+++ b/addons/hr_evaluation/__openerp__.py
@@ -20,42 +20,49 @@
 ##############################################################################
 
 {
-    "name" : "Employee Appraisals",
-    "version": "0.1",
-    "author": "OpenERP SA",
-    "category": "Human Resources",
-    "website": "http://www.openerp.com",
-    "summary": "Periodical Evaluations, Surveys",
-    "images": ["images/hr_evaluation_analysis.jpeg","images/hr_evaluation.jpeg"],
-    "depends": ["hr","base_calendar","survey"],
-    "description": """
-Ability to create employees evaluation.
-=======================================
+    'name' : 'Employee Appraisals',
+    'version': '0.1',
+    'author': 'OpenERP SA',
+    'category': 'Human Resources',
+    'sequence': 31,
+    'website': 'http://www.openerp.com',
+    'summary': 'Periodical Evaluations, Appraisals, Surveys',
+    'images': ['images/hr_evaluation_analysis.jpeg','images/hr_evaluation.jpeg'],
+    'depends': ['hr','base_calendar','survey'],
+    'description': """
+Periodical Employees evaluation and appraisals
+==============================================
 
-An evaluation can be created by employee for subordinates, juniors as well as
-his manager. The evaluation is done under a plan in which various surveys can be
-created and it can be defined which level of employee hierarchy fills what and
-final review and evaluation is done by the manager. Every evaluation filled by
-the employees can be viewed in the form of pdf file.
-         """,
+By using this application you can maintain the motivational process by doing periodical evaluations of your employees' performance. The regular assessment of human resources can benefit your people as well your organization. 
+
+An evaluation plan can be assigned to each employee. These plans define the frequency and the way you manage your periodic personal evaluations. You will be able to define steps and attach interview forms to each step. 
+
+Manages several types of evaluations: bottom-up, top-down, self-evaluations and the final evaluation by the manager.
+
+Key Features
+------------
+* Ability to create employees evaluations.
+* An evaluation can be created by an employee for subordinates, juniors as well as his manager.
+* The evaluation is done according to a plan in which various surveys can be created. Each survey can be answered by a particular level in the employees hierarchy. The final review and evaluation is done by the manager.
+* Every evaluation filled by employees can be viewed in a PDF form.
+* Interview Requests are generated automatically by OpenERP according to employees evaluation plans. Each user receives automatic emails and requests to perform a periodical evaluation of their colleagues.
+""",
     "demo": ["hr_evaluation_demo.xml"],
     "data": [
-        "security/ir.model.access.csv",
-        "security/hr_evaluation_security.xml",
-#        "wizard/hr_evaluation_mail_view.xml",
-        "hr_evaluation_view.xml",
-        "report/hr_evaluation_report_view.xml",
-        "board_hr_evaluation_view.xml",
+        'security/ir.model.access.csv',
+        'security/hr_evaluation_security.xml',
+        'hr_evaluation_view.xml',
+        'report/hr_evaluation_report_view.xml',
+        'board_hr_evaluation_view.xml',
         'hr_evaluation_data.xml',
         'hr_evaluation_installer.xml',
     ],
-    "test": [
-        "test/test_hr_evaluation.yml",
-        "test/hr_evalution_demo.yml",
+    'test': [
+        'test/test_hr_evaluation.yml',
+        'test/hr_evalution_demo.yml',
     ],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00883207679172998429",
+    'auto_install': False,
+    'installable': True,
     'application': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index def21f2b169..eece0c7497e 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -43,6 +43,7 @@ class hr_evaluation_plan(osv.osv):
         'month_next': 12,
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
     }
+
 hr_evaluation_plan()
 
 class hr_evaluation_plan_phase(osv.osv):
@@ -95,6 +96,7 @@ Thanks,
 
         '''),
     }
+
 hr_evaluation_plan_phase()
 
 class hr_employee(osv.osv):
@@ -141,6 +143,7 @@ hr_employee()
 
 class hr_evaluation(osv.osv):
     _name = "hr_evaluation.evaluation"
+    _inherit = "mail.thread"
     _description = "Employee Appraisal"
     _rec_name = 'employee_id'
     _columns = {
@@ -209,8 +212,6 @@ class hr_evaluation(osv.osv):
                 elif phase.action == "self":
                     children = [evaluation.employee_id]
                 for child in children:
-#                    if not child.user_id:
-#                        continue
 
                     int_id = hr_eval_inter_obj.create(cr, uid, {
                         'evaluation_id': evaluation.id,
@@ -228,9 +229,13 @@ class hr_evaluation(osv.osv):
                         body = phase.mail_body % {'employee_name': child.name, 'user_signature': child.user_id.signature,
                             'eval_name': phase.survey_id.title, 'date': time.strftime('%Y-%m-%d'), 'time': time }
                         sub = phase.email_subject
-                        dest = [child.work_email]
-                        if dest:
-                           mail_message.schedule_with_attach(cr, uid, evaluation.employee_id.work_email, dest, sub, body, context=context)
+                        if child.work_email:
+                            vals = {'state': 'outgoing',
+                                    'subject': sub,
+                                    'body_html': '<pre>%s</pre>' % body,
+                                    'email_to': child.work_email,
+                                    'email_from': evaluation.employee_id.work_email}
+                            self.pool.get('mail.mail').create(cr, uid, vals, context=context)
 
         self.write(cr, uid, ids, {'state':'wait'}, context=context)
         return True
@@ -238,12 +243,14 @@ class hr_evaluation(osv.osv):
     def button_final_validation(self, cr, uid, ids, context=None):
         request_obj = self.pool.get('hr.evaluation.interview')
         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', 'in', ['done','cancel'])], context=context)):
+        for evaluation in self.browse(cr, uid, ids, context=context):
+            if evaluation.employee_id and evaluation.employee_id.parent_id and evaluation.employee_id.parent_id.user_id:
+                self.message_subscribe_users(cr, uid, [evaluation.id], user_ids=[evaluation.employee_id.parent_id.user_id.id], context=context)
+            if len(evaluation.survey_request_ids) != len(request_obj.search(cr, uid, [('evaluation_id', '=', evaluation.id),('state', 'in', ['done','cancel'])], context=context)):
                 raise osv.except_osv(_('Warning!'),_("You cannot change state, because some appraisal(s) are in waiting answer or draft state."))
         return True
 
-    def button_done(self,cr, uid, ids, context=None):
+    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)
         return True
 
@@ -259,6 +266,10 @@ class hr_evaluation(osv.osv):
         return True
 
     def write(self, cr, uid, ids, vals, context=None):
+        if vals.get('employee_id'):
+            employee_id = self.pool.get('hr.employee').browse(cr, uid, vals.get('employee_id'), context=context)
+            if employee_id.parent_id and employee_id.parent_id.user_id:
+                vals['message_follower_ids'] = [(4, employee_id.parent_id.user_id.partner_id.id)]
         if 'date' in vals:
             new_vals = {'date_deadline': vals.get('date')}
             obj_hr_eval_iterview = self.pool.get('hr.evaluation.interview')
@@ -280,6 +291,7 @@ survey_request()
 class hr_evaluation_interview(osv.osv):
     _name = 'hr.evaluation.interview'
     _inherits = {'survey.request': 'request_id'}
+    _inherit =  'mail.thread'
     _rec_name = 'request_id'
     _description = 'Appraisal Interview'
     _columns = {
diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml
index cf632a795cc..2afb5200091 100644
--- a/addons/hr_evaluation/hr_evaluation_data.xml
+++ b/addons/hr_evaluation/hr_evaluation_data.xml
@@ -1,25 +1,20 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
-        <record id="hr.todo_open_hr_menu" model="ir.actions.todo">
-            <field name="state">done</field>
-        </record>
-    </data>
-
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
-        <record id="todo_open_hr_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="hr.action_client_hr_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
         </record>
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Employee Appraisals has been installed</value>
-            <value>Create evaluations for your subordinates or manager. You can define a plan with several surveys, where you organize evaluation surveys related to the hierarchy levels. Evaluations filled by employees can exported as pdf files.</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Employee Appraisals application installed!</field>
+            <field name="body"><![CDATA[<p>Manage employee reviews: you can define an appraisal campaign with several steps, with specific evaluation surveys according to hierarchy levels. Evaluations filled by employees may be exported as pdf files.</p>]]></field>
+        </record>
 
         <record id="survey_2" model="survey">
             <field name="title">Self Appraisal</field>
@@ -397,12 +392,6 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="type">char</field>
             <field eval="5" name="sequence"/>
         </record>
-        <record id="survey_answer_98" model="survey.answer">
-            <field name="answer">Title</field>
-            <field name="question_id" ref="survey_question_2"/>
-            <field name="type">char</field>
-            <field eval="6" name="sequence"/>
-        </record>
         <record id="survey_question_column_heading_4" model="survey.question.column.heading">
             <field name="in_visible_rating_weight">1</field>
             <field name="in_visible_menu_choice">1</field>
@@ -822,8 +811,8 @@ Once the form had been filled, the employee send it to his supervisor.
             <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
             <field name="descriptive_text">* His direct reports will be invited through OpenERP to express a feedback on their supervisor's leadership and to give their opinion about their own engagement and effectiveness, the continuous improvement and openness in action in the company, ...
 
-* The employees will send back their anonymous answers to OpenERP. The data will be handled by the HR manager and a  brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor.
-* The appraiser should rate the employee’s major work accomplishments and     performance according to the metric provided below :
+* The employees will send back their anonymous answers to OpenERP. The data will be handled by the HR manager and a brief summary of the data will be sent to the concerned supervisor, to his team and to the supervisor's supervisor.
+* The appraiser should rate the employee’s major work accomplishments and performance according to the metric provided below :
 
     1 - Significantly exceeds standards and expectations required of the position
     2 - Exceeds standards and expectations
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 47b0c323622..e0978847acb 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -58,6 +58,16 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
+        
+      <!-- Appraisal Interviews Action -->
+      
+        <record id="act_hr_employee_2_hr__evaluation_interview" model="ir.actions.act_window">
+            <field name="res_model">hr.evaluation.interview</field>
+            <field name="view_type">form</field>
+            <field name="name">Interviews</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id}</field>
+        </record>
 
         <menuitem name="Appraisal" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="25"/>
         <menuitem name="Periodic Appraisal" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/>
@@ -128,14 +138,15 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Personal Information" position="after">
-                    <page string="Appraisal" groups="base.group_hr_user">
-                        <group col="4">
-                            <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
-                            <field name="evaluation_date"/>
-                        </group>
-                    </page>
-                </page>
+            <xpath expr="//group[@name='active_group']" position="before">
+                <group string="Appraisals">
+                    <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
+                    <field name="evaluation_date"/>
+                </group>
+            </xpath>
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button name="%(act_hr_employee_2_hr__evaluation_interview)d" string="Appraisal Interviews" type="action"/>
+            </xpath>
             </field>
         </record>
 
@@ -167,7 +178,7 @@
                         <field nolabel="1" name="survey_request_ids">
                             <form string="Interview Appraisal" version="7.0">
                                 <div class="oe_right oe_button_box">
-                                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                                     <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
                                 </div>
                                 <group>
@@ -198,6 +209,10 @@
                         <field nolabel="1" name="note_summary" placeholder="Action Plan..."/>
                     </group>
               </sheet>
+	          <div class="oe_chatter">
+	              <field name="message_follower_ids" widget="mail_followers"/>
+	              <field name="message_ids" widget="mail_thread"/>
+	          </div>
               </form>
             </field>
         </record>
@@ -241,7 +256,7 @@
             <field name="name">Appraisal</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="view_mode">tree,form</field>
             <field name="search_view_id" ref="hr_evaluation.evaluation_search"/>
              <field name="context">{"search_default_next_month":1}</field>
             <field name="help" type="html">
@@ -251,7 +266,7 @@
                 Each employee may be assigned an Appraisal Plan. Such a plan
                 defines the frequency and the way you manage your periodic
                 personnel evaluation. You will be able to define steps and
-                attach interviews to each step. OpenERP manages all kind of
+                attach interviews to each step. OpenERP manages all kinds of
                 evaluations: bottom-up, top-down, self-evaluation and final
                 evaluation by the manager.
               </p>
@@ -267,16 +282,27 @@
             <field name="arch" type="xml">
                 <form string="Interview Appraisal" version="7.0">
                     <header>
-                        <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" class="oe_highlight"/>
-                        <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to"/>
-                        <button string="Cancel" name="survey_req_cancel" states="draft,waiting_answer" type="object" icon="gtk-cancel"/>
-                        <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
-                        <button name="action_print_survey" string="Print Survey" type="object" states="draft" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
+                        <button string="Cancel" name="survey_req_cancel" type="object"
+                            states="draft,waiting_answer" class="oe_left"/>
+                        <button string="Print Survey" name="action_print_survey"  type="object"
+                            states="draft" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}"
+                            attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
+                        <button string="Send Request" name="survey_req_waiting_answer" type="object"
+                            states="draft" class="oe_highlight"/>
+                        <button string="Answer Survey" name="%(survey.action_view_survey_question_message)d" type="action"
+                            states="waiting_answer"
+                            context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}"
+                            attrs="{'readonly':[('survey_id','=',False)]}"/>
+                        <button string="Done" name="survey_req_done" type="object"
+                            states="waiting_answer"/>
                         <field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box" name="button_box">
-                            <button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" states="waiting_answer" class="oe_link"/>
+                            <button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" type="action"
+                                states="waiting_answer"
+                                context="{'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
+                                            'default_subject': 'Reminder to fill up Survey' }"/>
                         </div>
                         <group>
                             <group col="3" colspan="1">
@@ -307,7 +333,7 @@
                     <field name="user_id" string="Interviewer"/>
                     <field name="user_to_review_id"/>
                     <field name="response" readonly="1" invisible="True"/>
-                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                     <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                     <button name="%(mail.action_email_compose_message_wizard)d" string="Send Reminder Email" icon="terp-mail-message-new" type="action" states="waiting_answer"/>
                     <field name="state"/>
@@ -389,21 +415,15 @@
 
       <!-- Email Compose message Action-->
       <act_window
-      id="evaluation_reminders" name="Appraisal Reminders"
-      res_model="mail.compose.message"
-      src_model="hr.evaluation.interview"
-      view_type="form" view_mode="form"
-      target="new" multi="True"
-      key2="client_action_multi"
-      context="{'mail.compose.message.mode':'mass_mail'}"/>
-
-      <!-- Appraisal Interviews Button on Employee Form -->
-      <act_window
-      context="{'search_default_user_to_review_id': [active_id], 'default_user_to_review_id': active_id}"
-      id="act_hr_employee_2_hr__evaluation_interview"
-      name="Appraisal Interviews"
-      res_model="hr.evaluation.interview"
-      src_model="hr.employee"/>
+        id="evaluation_reminders" name="Appraisal Reminders"
+        res_model="mail.compose.message"
+        src_model="hr.evaluation.interview"
+        view_type="form" view_mode="form"
+        target="new" multi="True"
+        key2="client_action_multi"
+        context="{'default_composition_mode': 'mass_mail',
+                    'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
+                    'default_subject': 'Reminder to fill up Survey'}"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_evaluation/i18n/ar.po b/addons/hr_evaluation/i18n/ar.po
index d97f18eae42..db82700ac0e 100644
--- a/addons/hr_evaluation/i18n/ar.po
+++ b/addons/hr_evaluation/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/bg.po b/addons/hr_evaluation/i18n/bg.po
index f995810152a..5e0eacdabec 100644
--- a/addons/hr_evaluation/i18n/bg.po
+++ b/addons/hr_evaluation/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/ca.po b/addons/hr_evaluation/i18n/ca.po
index d48266005b9..5a6834949da 100644
--- a/addons/hr_evaluation/i18n/ca.po
+++ b/addons/hr_evaluation/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/da.po b/addons/hr_evaluation/i18n/da.po
index 40ad3e32d78..6f2e339db56 100644
--- a/addons/hr_evaluation/i18n/da.po
+++ b/addons/hr_evaluation/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/de.po b/addons/hr_evaluation/i18n/de.po
index 9330beb4aa8..c467b752f1c 100644
--- a/addons/hr_evaluation/i18n/de.po
+++ b/addons/hr_evaluation/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/es.po b/addons/hr_evaluation/i18n/es.po
index eba538a32cb..d69c15ce2fa 100644
--- a/addons/hr_evaluation/i18n/es.po
+++ b/addons/hr_evaluation/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/es_CR.po b/addons/hr_evaluation/i18n/es_CR.po
index be3d1184afe..7184b84d126 100644
--- a/addons/hr_evaluation/i18n/es_CR.po
+++ b/addons/hr_evaluation/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: hr_evaluation
diff --git a/addons/hr_evaluation/i18n/es_EC.po b/addons/hr_evaluation/i18n/es_EC.po
index ac5fb17bf13..3283be8528f 100644
--- a/addons/hr_evaluation/i18n/es_EC.po
+++ b/addons/hr_evaluation/i18n/es_EC.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/et.po b/addons/hr_evaluation/i18n/et.po
index f24a2f8ccd1..26365be831c 100644
--- a/addons/hr_evaluation/i18n/et.po
+++ b/addons/hr_evaluation/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/fi.po b/addons/hr_evaluation/i18n/fi.po
index 597119e99f9..10049b36b23 100644
--- a/addons/hr_evaluation/i18n/fi.po
+++ b/addons/hr_evaluation/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/fr.po b/addons/hr_evaluation/i18n/fr.po
index 590aa799113..74d1a99d761 100644
--- a/addons/hr_evaluation/i18n/fr.po
+++ b/addons/hr_evaluation/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/gl.po b/addons/hr_evaluation/i18n/gl.po
index c7765a75fe1..f26b28643c3 100644
--- a/addons/hr_evaluation/i18n/gl.po
+++ b/addons/hr_evaluation/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/hr.po b/addons/hr_evaluation/i18n/hr.po
index 116a0c51fe0..16f35c56ce7 100644
--- a/addons/hr_evaluation/i18n/hr.po
+++ b/addons/hr_evaluation/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/hu.po b/addons/hr_evaluation/i18n/hu.po
index 88d5b7061d7..318d02990d5 100644
--- a/addons/hr_evaluation/i18n/hu.po
+++ b/addons/hr_evaluation/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/id.po b/addons/hr_evaluation/i18n/id.po
index c01fc71c902..cc395c5daab 100644
--- a/addons/hr_evaluation/i18n/id.po
+++ b/addons/hr_evaluation/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/it.po b/addons/hr_evaluation/i18n/it.po
index 35befc9553c..7e101b35c0e 100644
--- a/addons/hr_evaluation/i18n/it.po
+++ b/addons/hr_evaluation/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/ja.po b/addons/hr_evaluation/i18n/ja.po
index 8e20337f962..d72e70e0d21 100644
--- a/addons/hr_evaluation/i18n/ja.po
+++ b/addons/hr_evaluation/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/mn.po b/addons/hr_evaluation/i18n/mn.po
index 3ae8b24082b..2c972efcf0a 100644
--- a/addons/hr_evaluation/i18n/mn.po
+++ b/addons/hr_evaluation/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/nl.po b/addons/hr_evaluation/i18n/nl.po
index d1e76a48f92..539df58574b 100644
--- a/addons/hr_evaluation/i18n/nl.po
+++ b/addons/hr_evaluation/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:31+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-08-26 14:02+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -316,7 +316,7 @@ msgstr "Beoordelingen gedaan in aflelopen maand"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "E-mail samenstellen wizard"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -332,7 +332,7 @@ msgstr "Alle antwoorden naar de manager versturen"
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Plan In Progress"
-msgstr "Plan loopt"
+msgstr "Plan in behandeling"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -435,7 +435,7 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "In progress"
-msgstr "Loopt"
+msgstr "In behandeling"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
@@ -745,7 +745,7 @@ msgstr "Herinnering om het onderzoek in te vullen"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "In Progress"
-msgstr "Loopt"
+msgstr "In behandeling"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
diff --git a/addons/hr_evaluation/i18n/pt.po b/addons/hr_evaluation/i18n/pt.po
index 77184eb4626..42ae5b65214 100644
--- a/addons/hr_evaluation/i18n/pt.po
+++ b/addons/hr_evaluation/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/pt_BR.po b/addons/hr_evaluation/i18n/pt_BR.po
index ddc74bb051c..f5f03321acd 100644
--- a/addons/hr_evaluation/i18n/pt_BR.po
+++ b/addons/hr_evaluation/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-13 11:31+0000\n"
-"Last-Translator: Mauricio Pacheco de Andrade <Unknown>\n"
+"PO-Revision-Date: 2012-10-17 00:10+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -317,7 +317,7 @@ msgstr "Avaliações feitas no mês passado"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Assistente para compor Email"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
diff --git a/addons/hr_evaluation/i18n/ro.po b/addons/hr_evaluation/i18n/ro.po
index a54cb26dd1f..1b41595a25c 100644
--- a/addons/hr_evaluation/i18n/ro.po
+++ b/addons/hr_evaluation/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/ru.po b/addons/hr_evaluation/i18n/ru.po
index 3d3c2b468d8..c9e96b98177 100644
--- a/addons/hr_evaluation/i18n/ru.po
+++ b/addons/hr_evaluation/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/sr.po b/addons/hr_evaluation/i18n/sr.po
index 0fda93d6633..b559f01168a 100644
--- a/addons/hr_evaluation/i18n/sr.po
+++ b/addons/hr_evaluation/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/sr@latin.po b/addons/hr_evaluation/i18n/sr@latin.po
index 1dd3ecb6765..3b8fcea6b1f 100644
--- a/addons/hr_evaluation/i18n/sr@latin.po
+++ b/addons/hr_evaluation/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/sv.po b/addons/hr_evaluation/i18n/sv.po
index e8278d6ce4c..f0bb3372130 100644
--- a/addons/hr_evaluation/i18n/sv.po
+++ b/addons/hr_evaluation/i18n/sv.po
@@ -14,35 +14,35 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Send an anonymous summary to the manager"
-msgstr ""
+msgstr "Skicka en anonym sammanfattning till chefen"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Start Appraisal"
-msgstr ""
+msgstr "Starta Bedömning"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr.evaluation.report:0
 #: view:hr_evaluation.plan:0
 msgid "Group By..."
-msgstr "Gruppera efter"
+msgstr "Gruppera efter..."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal that overpassed the deadline"
-msgstr ""
+msgstr "Bedömning som passerat tidsfristen"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,request_id:0
 #: field:hr.evaluation.report,request_id:0
 msgid "Request_id"
-msgstr ""
+msgstr "Request_id"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,progress_bar:0
@@ -58,12 +58,12 @@ msgstr "Mars"
 #. module: hr_evaluation
 #: field:hr.evaluation.report,delay_date:0
 msgid "Delay to Start"
-msgstr ""
+msgstr "Fördröjning till Start"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal that are in waiting appreciation state"
-msgstr ""
+msgstr "Bedömning som väntar"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:244
@@ -76,13 +76,13 @@ msgstr "Varning !"
 #: view:hr_evaluation.plan:0 field:hr_evaluation.plan,company_id:0
 #: field:hr_evaluation.plan.phase,company_id:0
 msgid "Company"
-msgstr "Bolag"
+msgstr "Företag"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,evaluation_id:0
 #: field:hr_evaluation.plan.phase,survey_id:0
 msgid "Appraisal Form"
-msgstr ""
+msgstr "Bedömningsformulär"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,day:0
@@ -92,7 +92,7 @@ msgstr "Dag"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan:0 field:hr_evaluation.plan,phase_ids:0
 msgid "Appraisal Phases"
-msgstr ""
+msgstr "Bedömningsfaser"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_first:0
@@ -100,6 +100,8 @@ msgid ""
 "This number of months will be used to schedule the first evaluation date of "
 "the employee when selecting an evaluation plan. "
 msgstr ""
+"Det antal månader ska användas för att schemalägga den första "
+"Utvärderingsdatumet för den anställde, när man väljer en Utvärderingsplan. "
 
 #. module: hr_evaluation
 #: view:hr.employee:0
@@ -109,7 +111,7 @@ msgstr "Anteckningar"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(eval_name)s:Appraisal Name"
-msgstr ""
+msgstr "(Eval_name): Bedömnings namn"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.open_view_hr_evaluation_tree
@@ -120,21 +122,26 @@ msgid ""
 "manages all kind of evaluations: bottom-up, top-down, self-evaluation and "
 "final evaluation by the manager."
 msgstr ""
+"Varje anställd kan tilldelas en Bedömnings plan. En sådan plan definierar "
+"frekvensen och hur du hanterar din regelbundna personal Utvärdering. Du "
+"kommer att kunna definiera steg och bifoga intervjuer till varje steg. "
+"OpenERP hanterar alla typer av Utvärderingar: bottom-up, top-down, "
+"självutvärdering och slutlig utvärdering av projektledaren."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Body"
-msgstr ""
+msgstr "Meddelande"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,wait:0
 msgid "Wait Previous Phases"
-msgstr ""
+msgstr "Invänta tidigare faser"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_evaluation
 msgid "Employee Appraisal"
-msgstr ""
+msgstr "Bedömning av anställd"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -146,7 +153,7 @@ msgstr "Avbruten"
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Did not meet expectations"
-msgstr ""
+msgstr "Uppfyller inte förväntningarna"
 
 #. module: hr_evaluation
 #: view:hr.employee:0 view:hr_evaluation.evaluation:0
@@ -154,12 +161,12 @@ msgstr ""
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_tree
 msgid "Appraisal"
-msgstr ""
+msgstr "Bedömning"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Managers"
-msgstr ""
+msgstr "Skicka till chefer"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date_close:0
@@ -172,11 +179,12 @@ msgid ""
 "If the evaluation does not meet the expectations, you can proposean action "
 "plan"
 msgstr ""
+"Om Utvärderingen inte uppfyller förväntningarna, kan du föreslå handlingsplan"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Send to Employees"
-msgstr ""
+msgstr "Skicka till anställda"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:82
@@ -198,16 +206,31 @@ msgid ""
 "\n"
 "        "
 msgstr ""
+"\n"
+"Datum: %(date)s\n"
+"\n"
+"%(employee_name)s,\n"
+"\n"
+"Jag gör en utvärdering om %(eval_name)s.\n"
+"\n"
+"Vänligen bidra med dina åsikter.\n"
+"\n"
+"\n"
+"Tack på förhand,\n"
+"--\n"
+"%(user_signature)s\n"
+"\n"
+"        "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal that are in Plan In Progress state"
-msgstr ""
+msgstr "Bedömning som pågår"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Återställ till Utkast"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,deadline:0
@@ -222,35 +245,35 @@ msgstr " Månad "
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "In progress Evaluations"
-msgstr ""
+msgstr "Pågående Utvärderingar"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_survey_request
 msgid "survey.request"
-msgstr ""
+msgstr "undersöknings.begäran"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(date)s: Current Date"
-msgstr ""
+msgstr "(Datum)s: Aktuellt datum"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_employee:0
 msgid "Send an anonymous summary to the employee"
-msgstr ""
+msgstr "Skicka en anonym sammanfattning till den anställde"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:81
 #, python-format
 msgid "Regarding "
-msgstr ""
+msgstr "Beträffande "
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr.evaluation.report:0
 #: field:hr.evaluation.report,state:0 view:hr_evaluation.evaluation:0
 #: field:hr_evaluation.evaluation,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,employee_id:0
@@ -268,24 +291,26 @@ msgstr "Ny"
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_body:0
 msgid "Email"
-msgstr "Email"
+msgstr "E-post"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Exceeds expectations"
-msgstr ""
+msgstr "Överträffar förväntningarna"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,mail_feature:0
 msgid ""
 "Check this box if you want to send mail to employees coming under this phase"
 msgstr ""
+"Markera denna ruta om du vill skicka e-post till anställda som omfattas av "
+"denna fas"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Evaluation done in last month"
-msgstr ""
+msgstr "Utvärdering gjorda i förra månaden"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
@@ -295,18 +320,18 @@ msgstr ""
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Skapades"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_manager:0
 msgid "Send all answers to the manager"
-msgstr ""
+msgstr "Skicka alla svar till chefen"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Plan In Progress"
-msgstr ""
+msgstr "Planering pågår"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -316,22 +341,22 @@ msgstr "Publika Inlägg"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Send Reminder Email"
-msgstr ""
+msgstr "Skicka Påminnelse E-post"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr_evaluation.evaluation,rating:0
 msgid "Appreciation"
-msgstr ""
+msgstr "Värdering"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Print Interview"
-msgstr ""
+msgstr "Skriv Intervju"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Pending"
-msgstr ""
+msgstr "Pågående"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,closed:0
@@ -342,12 +367,12 @@ msgstr "stängd"
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Meet expectations"
-msgstr ""
+msgstr "Möter Förväntningarna"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,nbr:0
 msgid "# of Requests"
-msgstr ""
+msgstr "# Av begäran"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -357,7 +382,7 @@ msgstr "Juli"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_plans_installer
 msgid "Review Appraisal Plans"
-msgstr ""
+msgstr "Recension Bedömning Planer"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -367,33 +392,33 @@ msgstr "    Månad-1    "
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Action to Perform"
-msgstr ""
+msgstr "Åtgärd som ska utföras"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_action:0
 msgid "Action Plan"
-msgstr ""
+msgstr "Handlingsplan"
 
 #. module: hr_evaluation
 #: model:ir.ui.menu,name:hr_evaluation.menu_eval_hr_config
 msgid "Periodic Appraisal"
-msgstr ""
+msgstr "Regelbunden Bedömning"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal to close within the next 7 days"
-msgstr ""
+msgstr "Bedömning som skall stängas inom de närmaste 7 dagarna"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Ending Summary"
-msgstr ""
+msgstr "Avsluta Sammanfattning"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Significantly exceeds expectations"
-msgstr ""
+msgstr "Väsentligt överstiger förväntningarna"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_hr_evaluation_interview_tree
@@ -402,6 +427,9 @@ msgid ""
 "employee's Appraisal Plan. Each user receives automatic emails and requests "
 "to evaluate their colleagues periodically."
 msgstr ""
+"Intervjuförfrågningar genereras automatiskt av OpenERP enligt medarbetares "
+"Bedömningsplan. Varje användare får automatiska e-post och förfrågningar om "
+"att Utvärdera sina kollegor regelbundet."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -411,13 +439,13 @@ msgstr "Pågående"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Interview Request"
-msgstr ""
+msgstr "Begär Intervju"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,send_answer_employee:0
 #: field:hr_evaluation.plan.phase,send_answer_manager:0
 msgid "All Answers"
-msgstr ""
+msgstr "Alla svar"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -432,7 +460,7 @@ msgstr "December"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Evaluation done in current year"
-msgstr ""
+msgstr "Utvärdering görs under innevarande år"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,month:0
@@ -442,22 +470,22 @@ msgstr "Månad"
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Group by..."
-msgstr ""
+msgstr "Gruppera efter ..."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Mail Settings"
-msgstr ""
+msgstr "E-postinställningar"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.evaluation_reminders
 msgid "Appraisal Reminders"
-msgstr ""
+msgstr "BedömningsPåminnelser"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Interview Question"
-msgstr ""
+msgstr "Intervju Fråga"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,wait:0
@@ -465,16 +493,18 @@ msgid ""
 "Check this box if you want to wait that all preceding phases are finished "
 "before launching this phase."
 msgstr ""
+"Markera den här rutan om du vill invänta att alla föregående faser är klara "
+"innan du startar denna fas."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Legend"
-msgstr ""
+msgstr "Teckenförklaring"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_first:0
 msgid "First Appraisal in (months)"
-msgstr ""
+msgstr "Första Bedömning i (månader)"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,state:0
@@ -485,7 +515,7 @@ msgstr "Utkast"
 #: field:hr_evaluation.plan.phase,send_anonymous_employee:0
 #: field:hr_evaluation.plan.phase,send_anonymous_manager:0
 msgid "Anonymous Summary"
-msgstr ""
+msgstr "Anonym Sammanfattning"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -497,12 +527,12 @@ msgstr "7 dagar"
 #: field:hr_evaluation.plan,name:0 field:hr_evaluation.plan.phase,plan_id:0
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan
 msgid "Appraisal Plan"
-msgstr ""
+msgstr "BedömningsPlan"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Print Survey"
-msgstr ""
+msgstr "Skriv Undersökning"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -518,18 +548,18 @@ msgstr "Juni"
 #: selection:hr.evaluation.report,rating:0
 #: selection:hr_evaluation.evaluation,rating:0
 msgid "Significantly bellow expectations"
-msgstr ""
+msgstr "Betydligt under förväntningarna"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid " (employee_name)s: Partner name"
-msgstr ""
+msgstr " (Employee_name) s: Partners namn"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,plan_id:0
 #: view:hr_evaluation.evaluation:0 field:hr_evaluation.evaluation,plan_id:0
 msgid "Plan"
-msgstr ""
+msgstr "Plan"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,active:0
@@ -544,17 +574,17 @@ msgstr "November"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Extended Filters..."
-msgstr "Utökade filter..."
+msgstr "Utöka filter..."
 
 #. module: hr_evaluation
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "Fel! Du kan inte skapa rekursiva hierarkier av anställda."
+msgstr "Fel ! Du kan inte skapa rekursiva hierarkier av anställda."
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_plan_phase
 msgid "Appraisal Plan Phase"
-msgstr ""
+msgstr "BedömningPlan fas"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -564,7 +594,7 @@ msgstr "Januari"
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.act_hr_employee_2_hr__evaluation_interview
 msgid "Appraisal Interviews"
-msgstr ""
+msgstr "Utvecklingssamtal"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -579,7 +609,7 @@ msgstr "Undersökning"
 #. module: hr_evaluation
 #: help:hr_evaluation.evaluation,rating:0
 msgid "This is the appreciation on that summarize the evaluation"
-msgstr ""
+msgstr "Detta är en uppskattning på att sammanfatta Utvärderingen"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,action:0
@@ -589,49 +619,49 @@ msgstr "Åtgärd"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 selection:hr.evaluation.report,state:0
 msgid "Final Validation"
-msgstr ""
+msgstr "Slutlig validering"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.evaluation,state:0
 msgid "Waiting Appreciation"
-msgstr ""
+msgstr "Väntar Värdering"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 #: model:ir.actions.act_window,name:hr_evaluation.action_evaluation_report_all
 #: model:ir.ui.menu,name:hr_evaluation.menu_evaluation_report_all
 msgid "Appraisal Analysis"
-msgstr ""
+msgstr "BedömningsAnalys"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,date:0
 msgid "Appraisal Deadline"
-msgstr ""
+msgstr "Tidsfrist Bedömning"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,rating:0
 msgid "Overall Rating"
-msgstr ""
+msgstr "Totalbetyg"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,email_subject:0
 msgid "char"
-msgstr ""
+msgstr "bokstäver"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Interviewer"
-msgstr ""
+msgstr "Intervjuare"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_report
 msgid "Evaluations Statistics"
-msgstr ""
+msgstr "Utvärderingar Statistik"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0
 msgid "Deadline Date"
-msgstr ""
+msgstr "Datum Tidsfrist"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/wizard/mail_compose_message.py:45
@@ -643,11 +673,16 @@ msgid ""
 "\n"
 " Thanks,"
 msgstr ""
+"Hej %s, \n"
+"\n"
+" Skicka vänligen Ditt svar för '%s' undersökning intervju. \n"
+"\n"
+" Tack,"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Top-Down Appraisal Requests"
-msgstr ""
+msgstr "Uppifrån och ner Begäran om Bedömning"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,help:hr_evaluation.action_evaluation_plans_installer
@@ -657,6 +692,10 @@ msgid ""
 "OpenERP can automatically generate interview requests to managers and/or "
 "subordinates."
 msgstr ""
+"Du kan definiera Bedömningsplaner (ex: första intervju efter 6 månader, "
+"därefter varje år). Sedan kan varje anställd kopplas till en Bedömningsplan "
+"så att OpenERP automatiskt kan generera intervjuförfrågningar till chefer "
+"och / eller underordnade."
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
@@ -666,29 +705,29 @@ msgstr "Allmänt"
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_answer_employee:0
 msgid "Send all answers to the employee"
-msgstr ""
+msgstr "Skicka alla svar till den anställde"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Appraisal Data"
-msgstr ""
+msgstr "Bedömning Data"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 selection:hr.evaluation.report,state:0
 #: view:hr_evaluation.evaluation:0 selection:hr_evaluation.evaluation,state:0
 msgid "Done"
-msgstr ""
+msgstr "Klar"
 
 #. module: hr_evaluation
 #: model:ir.actions.act_window,name:hr_evaluation.open_view_hr_evaluation_plan_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_view_hr_evaluation_plan_tree
 msgid "Appraisal Plans"
-msgstr ""
+msgstr "BedömningsPlaner"
 
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_hr_evaluation_interview
 msgid "Appraisal Interview"
-msgstr ""
+msgstr "Utvecklingssamtal"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
@@ -699,7 +738,7 @@ msgstr "Avbryt"
 #: code:addons/hr_evaluation/wizard/mail_compose_message.py:49
 #, python-format
 msgid "Reminder to fill up Survey"
-msgstr ""
+msgstr "Påminnelse att fylla i undersökning"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
@@ -714,12 +753,12 @@ msgstr "Att göra"
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Final Validation Evaluations"
-msgstr ""
+msgstr "Slutliga Validation Utvärderingar"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,mail_feature:0
 msgid "Send mail for this phase"
-msgstr ""
+msgstr "Skicka e-post till denna fas"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
@@ -737,11 +776,13 @@ msgid ""
 "The date of the next appraisal is computed by the appraisal plan's dates "
 "(first appraisal + periodicity)."
 msgstr ""
+"Datumet för nästa Bedömning beräknas genom Bedömningsplanens datum (första "
+"Bedömning + periodicitet)."
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,overpass_delay:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Har passerat tidsfristen"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan,month_next:0
@@ -749,21 +790,23 @@ msgid ""
 "The number of month that depicts the delay between each evaluation of this "
 "plan (after the first one)."
 msgstr ""
+"Antal månader som skildrar fördröjningen mellan varje Utvärdering i denna "
+"plan (efter den första)."
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan,month_next:0
 msgid "Periodicity of Appraisal (months)"
-msgstr ""
+msgstr "Periodicitet av Bedömning (månader)"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Self Appraisal Requests"
-msgstr ""
+msgstr "Egen Begäran om Bedömning"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,survey_request_ids:0
 msgid "Appraisal Forms"
-msgstr ""
+msgstr "BedömningsBlanketter"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -778,17 +821,17 @@ msgstr "Interna anteckningar"
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Final Interview"
-msgstr ""
+msgstr "Slutlig Intervju"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,name:0
 msgid "Phase"
-msgstr ""
+msgstr "Fas"
 
 #. module: hr_evaluation
 #: selection:hr_evaluation.plan.phase,action:0
 msgid "Bottom-Up Appraisal Requests"
-msgstr ""
+msgstr "Nerifrån och upp Begäran om Bedömning"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:244
@@ -797,6 +840,8 @@ msgid ""
 "You cannot change state, because some appraisal in waiting answer or draft "
 "state"
 msgstr ""
+"Du kan inte ändra tillståndet, eftersom vissa Bedömningar inväntar svar "
+"eller är i utkastläge"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -806,28 +851,28 @@ msgstr "Februari"
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Interview Appraisal"
-msgstr ""
+msgstr "Intervju Bedömning"
 
 #. module: hr_evaluation
 #: field:survey.request,is_evaluation:0
 msgid "Is Appraisal?"
-msgstr ""
+msgstr "Är Bedömning?"
 
 #. module: hr_evaluation
 #: code:addons/hr_evaluation/hr_evaluation.py:317
 #, python-format
 msgid "You cannot start evaluation without Appraisal."
-msgstr ""
+msgstr "Du kan inte starta Utvärdering utan Bedömning."
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
 msgid "Evaluation done in current month"
-msgstr ""
+msgstr "Utvärdering görs i aktuell månad"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.interview,user_to_review_id:0
 msgid "Employee to Interview"
-msgstr ""
+msgstr "Anställd att Intervjua"
 
 #. module: hr_evaluation
 #: selection:hr.evaluation.report,month:0
@@ -837,17 +882,17 @@ msgstr "April"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "Appraisal Plan Phases"
-msgstr ""
+msgstr "Bedömning Plan faser"
 
 #. module: hr_evaluation
 #: view:hr_evaluation.evaluation:0
 msgid "Validate Appraisal"
-msgstr ""
+msgstr "Validera Bedömning"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.interview:0 view:hr_evaluation.evaluation:0
 msgid "Search Appraisal"
-msgstr ""
+msgstr "Sök Bedömning"
 
 #. module: hr_evaluation
 #: field:hr_evaluation.plan.phase,sequence:0
@@ -857,7 +902,7 @@ msgstr "Sekvens"
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
 msgid "(user_signature)s: User name"
-msgstr ""
+msgstr "(User_signature) s: Användarnamn"
 
 #. module: hr_evaluation
 #: view:board.board:0
@@ -865,12 +910,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_evaluation.action_hr_evaluation_interview_tree
 #: model:ir.ui.menu,name:hr_evaluation.menu_open_hr_evaluation_interview_requests
 msgid "Interview Requests"
-msgstr ""
+msgstr "Intervjuförfrågningar"
 
 #. module: hr_evaluation
 #: field:hr.evaluation.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Skapa datum"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0 field:hr.evaluation.report,year:0
@@ -880,12 +925,12 @@ msgstr "År"
 #. module: hr_evaluation
 #: field:hr_evaluation.evaluation,note_summary:0
 msgid "Appraisal Summary"
-msgstr ""
+msgstr "Bedömning Sammanfattning"
 
 #. module: hr_evaluation
 #: field:hr.employee,evaluation_date:0
 msgid "Next Appraisal Date"
-msgstr ""
+msgstr "Nästa datum för Bedömande"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Felaktigt namn för modell i händelsedefinitionen."
diff --git a/addons/hr_evaluation/i18n/tr.po b/addons/hr_evaluation/i18n/tr.po
index 37c1605af05..83a5a186caf 100644
--- a/addons/hr_evaluation/i18n/tr.po
+++ b/addons/hr_evaluation/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
diff --git a/addons/hr_evaluation/i18n/zh_CN.po b/addons/hr_evaluation/i18n/zh_CN.po
index 1a4dc786095..5f939c8e735 100644
--- a/addons/hr_evaluation/i18n/zh_CN.po
+++ b/addons/hr_evaluation/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:47+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-10-25 17:16+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_evaluation
 #: help:hr_evaluation.plan.phase,send_anonymous_manager:0
@@ -304,7 +304,7 @@ msgstr "上个月完成的评估"
 #. module: hr_evaluation
 #: model:ir.model,name:hr_evaluation.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "电子邮件撰写向导"
 
 #. module: hr_evaluation
 #: view:hr.evaluation.report:0
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index fb1186ae401..d4907c90f11 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -6,7 +6,7 @@
         <field name="name">hr.evaluation.report.tree</field>
         <field name="model">hr.evaluation.report</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';black:state in ('wait','progress');gray:state in('done','cancel')"
+            <tree colors="blue:state == 'draft';black:state in ('wait','progress');gray:state in('done','cancel')" create="false"
              string="Appraisal Analysis">
                 <field name="create_date" invisible="1"/>
                 <field name="employee_id" invisible="1"/>
diff --git a/addons/hr_evaluation/security/ir.model.access.csv b/addons/hr_evaluation/security/ir.model.access.csv
index f9b8897eb01..a304ee84c10 100644
--- a/addons/hr_evaluation/security/ir.model.access.csv
+++ b/addons/hr_evaluation/security/ir.model.access.csv
@@ -39,4 +39,4 @@ access_survey_response_hr_employee,survey.response.employee,survey.model_survey_
 access_survey_question_column_heading_hr_employee,survey.question.column.heading.employee,survey.model_survey_question_column_heading,base.group_user,1,0,0,0
 access_survey_response_line_hr_employee,survey.response.line.employee,survey.model_survey_response_line,base.group_user,1,1,1,0
 access_survey_response_answer_hr_employee,survey.response.answer.hr.employee,survey.model_survey_response_answer,base.group_user,1,1,1,0
-
+access_survey_tbl_column_heading_hr_employee,survey.tbl.column.heading,survey.model_survey_tbl_column_heading,base.group_user,1,1,1,0
diff --git a/addons/hr_evaluation/test/test_hr_evaluation.yml b/addons/hr_evaluation/test/test_hr_evaluation.yml
index 2bdc3513962..a66731531fa 100644
--- a/addons/hr_evaluation/test/test_hr_evaluation.yml
+++ b/addons/hr_evaluation/test/test_hr_evaluation.yml
@@ -54,7 +54,6 @@
                str(ref("survey_question_2")) +"_" +str(ref("survey_answer_20")) + "_multi" :'3',
                str(ref("survey_question_2")) +"_" +str(ref("survey_answer_25")) + "_multi" :'2011-12-02 16:42:00',
                str(ref("survey_question_2")) +"_" +str(ref("survey_answer_43")) + "_multi" :'HR',
-               str(ref("survey_question_2")) +"_" +str(ref("survey_answer_98")) + "_multi" :'tpa review'
                }, context = ctx)
 -
   I close this Evaluation survey by giving answer of questions.
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail.py b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
deleted file mode 100644
index 35c54a4cca3..00000000000
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail.py
+++ /dev/null
@@ -1,42 +0,0 @@
-##############################################################################
-#
-#    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 tools
-
-class hr_evaluation_reminder(osv.osv_memory):
-    _name = "hr.evaluation.reminder"
-    _description = "Sends Reminders to employees to fill the evaluations"
-    _columns = {
-        'evaluation_id': fields.many2one('hr.evaluation.interview', 'Interview', required=True)
-    }
-
-    def send_mail(self, cr, uid, ids, context=None):
-        mail_message = self.pool.get('mail.message')
-        hr_evaluation_interview_obj = self.pool.get('hr.evaluation.interview')
-        evaluation_data = self.read(cr, uid, ids, context=context)[0]
-        current_interview = hr_evaluation_interview_obj.browse(cr, uid, evaluation_data.get('evaluation_id'))
-        if current_interview.state == "waiting_answer" and current_interview.user_to_review_id.work_email :
-            msg = " Hello %s, \n\n Kindly post your response for '%s' survey interview. \n\n Thanks,"  %(current_interview.user_to_review_id.name, current_interview.survey_id.title)
-            mail_message.schedule_with_attach(cr, uid, tools.config['email_from'], [current_interview.user_to_review_id.work_email],\
-                                          'Reminder to fill up Survey', msg, context=context)
-        return {'type': 'ir.actions.act_window_close'}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml b/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
deleted file mode 100644
index 89ae99bb6c3..00000000000
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail_view.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-    <record id="view_hr_evaluation_send_mail" model="ir.ui.view">
-        <field name="name">hr.evaluation.send.mail</field>
-        <field name="model">hr.evaluation.reminder</field>
-        <field name="arch" type="xml">
-            <form string="Evaluation Reminders" version="7.0">
-                <group string="Send Evaluation Reminder">
-                    <field name="evaluation_id"/>
-                </group>
-                <footer>
-                    <button name="send_mail" string="Send Mail" type="object" class="oe_highlight"/>
-                    or
-                    <button string="Cancel" class="oe_link" special="cancel" />
-                </footer>
-             </form>
-        </field>
-    </record>
-
-    <record id="action_hr_evaluation_send_mail" model="ir.actions.act_window">
-        <field name="name">Evaluation Send Mail</field>
-        <field name="res_model">hr.evaluation.reminder</field>
-        <field name="type">ir.actions.act_window</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
-        <field name="view_id" ref="view_hr_evaluation_send_mail"/>
-        <field name="context">{'record_id':active_id}</field>
-        <field name="target">new</field>
-    </record>
-
-     </data>
-</openerp>
diff --git a/addons/hr_evaluation/wizard/mail_compose_message.py b/addons/hr_evaluation/wizard/mail_compose_message.py
deleted file mode 100644
index 7e4ba326947..00000000000
--- a/addons/hr_evaluation/wizard/mail_compose_message.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>)
-#
-#    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
-from osv import fields
-import tools
-from tools.translate import _
-
-class mail_compose_message(osv.osv_memory):
-    _inherit = 'mail.compose.message'
-
-    def get_value(self, cr, uid, model, resource_id, context=None):
-        '''
-        To get values of the resource_id for the model
-        @param model: Object
-        @param resource_id: id of a record for which values to be read
-
-        @return: Returns a dictionary
-        '''
-        if context is None:
-            context = {}
-        result = super(mail_compose_message, self).get_value(cr, uid,  model, resource_id, context=context)
-        if model == 'hr.evaluation.interview' and resource_id:
-            model_pool = self.pool.get(model)
-            record_data = model_pool.browse(cr, uid, resource_id, context)
-            if record_data.state == "waiting_answer":
-                msg = _("Hello %s, \n\n Kindly post your response for '%s' survey interview. \n\n Thanks,")  %(record_data.user_to_review_id.name, record_data.survey_id.title)
-                result.update({
-                        'email_to': record_data.user_to_review_id.work_email or False,
-                        'subject': _("Reminder to fill up Survey"),
-                        'body_text': msg,
-                    })
-        return result
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index 5ecf8f8e75b..ec108b696bf 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -21,31 +21,33 @@
 
 
 {
-    'name': 'Expenses Management',
+    'name': 'Expense Management',
     'version': '1.0',
     'category': 'Human Resources',
-    "sequence": 30,
-    "summary": "Expenses Validation, Invoicing",
+    'sequence': 29,
+    'summary': 'Expenses Validation, Invoicing',
     'description': """
-This module aims to manage employee's expenses.
-===============================================
+Manage expenses by Employees
+============================
 
-The whole workflow is implemented:
-    * Draft expense
-    * Confirmation of the sheet by the employee
-    * Validation by his manager
-    * Validation by the accountant and receipt creation
+This application allows you to manage your employees' daily expenses. It gives you access to your employees’ fee notes and give you the right to complete and validate or refuse the notes. After validation it creates an invoice for the employee.
+Employee can encode their own expenses and the validation flow puts it automatically in the accounting after validation by managers.
 
-This module also uses the analytic accounting and is compatible with
-the invoice on timesheet module so that you will be able to automatically
-re-invoice your customer's expenses if your work by project.
+
+The whole flow is implemented as:
+----------------------------------
+* Draft expense
+* Confirmation of the sheet by the employee
+* Validation by his manager
+* Validation by the accountant and receipt creation
+
+This module also uses analytic accounting and is compatible with the invoice on timesheet module so that you are able to automatically re-invoice your customers' expenses if your work by project.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/hr_expenses_analysis.jpeg', 'images/hr_expenses.jpeg'],
     'depends': ['hr', 'account_voucher'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'hr_expense_data.xml',
         'hr_expense_sequence.xml',
@@ -58,16 +60,13 @@ re-invoice your customer's expenses if your work by project.
         'board_hr_expense_view.xml',
         'hr_expense_installer_view.xml',
     ],
-    'demo_xml': [
-        'hr_expense_demo.xml',
-        ],
+    'demo': ['hr_expense_demo.xml'],
     'test': [
-             'test/expense_demo.yml',
-             'test/expense_process.yml',
-             ],
+        'test/expense_demo.yml',
+        'test/expense_process.yml',
+    ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0062479841789',
     'application': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_expense/board_hr_expense_view.xml b/addons/hr_expense/board_hr_expense_view.xml
index fe89a4afc7a..3f896a76fae 100644
--- a/addons/hr_expense/board_hr_expense_view.xml
+++ b/addons/hr_expense/board_hr_expense_view.xml
@@ -17,7 +17,7 @@
             <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/board/column[1]" position="inside">
-                     <action name="%(action_my_expense)d" string="My Expenses" creatable="true"/>
+                     <action name="%(action_my_expense)d" string="My Expenses"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 594b869c71e..ccb8af68e21 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -64,22 +64,22 @@ class hr_expense_expense(osv.osv):
     _description = "Expense"
     _order = "id desc"
     _columns = {
-        'name': fields.char('Description', size=128, required=True),
+        'name': fields.char('Description', size=128, required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'id': fields.integer('Sheet ID', readonly=True),
-        'date': fields.date('Date', select=True),
+        'date': fields.date('Date', select=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is done."),
-        'employee_id': fields.many2one('hr.employee', "Employee", required=True),
+        'employee_id': fields.many2one('hr.employee', "Employee", required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'user_id': fields.many2one('res.users', 'User', required=True),
-        'date_confirm': fields.date('Confirmation Date', select=True, help = "Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
-        'date_valid': fields.date('Validation Date', select=True, help = "Date of the acceptation of the sheet expense. It's filled when the button Accept is pressed."),
-        'user_valid': fields.many2one('res.users', 'Validation User'),
+        'date_confirm': fields.date('Confirmation Date', select=True, help="Date of the confirmation of the sheet expense. It's filled when the button Confirm is pressed."),
+        'date_valid': fields.date('Validation Date', select=True, help="Date of the acceptation of the sheet expense. It's filled when the button Accept is pressed."),
+        'user_valid': fields.many2one('res.users', 'Validation By', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'account_move_id': fields.many2one('account.move', 'Ledger Posting'),
         'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
         'amount': fields.function(_amount, string='Total Amount', digits_compute= dp.get_precision('Account')),
         'voucher_id': fields.many2one('account.voucher', "Employee's Receipt"),
-        'currency_id': fields.many2one('res.currency', 'Currency', required=True),
-        'department_id':fields.many2one('hr.department','Department'),
+        'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'department_id':fields.many2one('hr.department','Department', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'state': fields.selection([
             ('draft', 'New'),
@@ -100,6 +100,12 @@ class hr_expense_expense(osv.osv):
         'currency_id': _get_currency,
     }
 
+    def unlink(self, cr, uid, ids, context=None):
+        for rec in self.browse(cr, uid, ids, context=context):
+            if rec.state != 'draft':
+                raise osv.except_osv(_('Warning!'),_('You can only delete draft expenses!'))
+        return super(hr_expense_expense, self).unlink(cr, uid, ids, context)
+
     def onchange_currency_id(self, cr, uid, ids, currency_id=False, company_id=False, context=None):
         res =  {'value': {'journal_id': False}}
         journal_ids = self.pool.get('account.journal').search(cr, uid, [('type','=','purchase'), ('currency','=',currency_id), ('company_id', '=', company_id)], context=context)
@@ -118,6 +124,9 @@ class hr_expense_expense(osv.osv):
         return {'value': {'department_id': department_id, 'company_id': company_id}}
 
     def expense_confirm(self, cr, uid, ids, *args):
+        for expense in self.browse(cr, uid, ids):
+            if expense.employee_id and expense.employee_id.parent_id.user_id:
+                self.message_subscribe_users(cr, uid, [expense.id], user_ids=[expense.employee_id.parent_id.user_id.id])
         self.write(cr, uid, ids, {
             'state':'confirm',
             'date_confirm': time.strftime('%Y-%m-%d')
@@ -186,7 +195,7 @@ class hr_expense_expense(osv.osv):
                 raise osv.except_osv(_('Error!'), _('The employee must have a home address.'))
             acc = exp.employee_id.address_home_id.property_account_payable.id
             voucher = {
-                'name': exp.name,
+                'name': exp.name or '/',
                 'reference': sequence_obj.get(cr, uid, 'hr.expense.invoice'),
                 'account_id': acc,
                 'type': 'purchase',
@@ -230,19 +239,9 @@ hr_expense_expense()
 class product_product(osv.osv):
     _inherit = "product.product"
     _columns = {
-        'hr_expense_ok': fields.boolean('Can Constitute an Expense', help="Determines if the product can be visible in the list of product within a selection from an HR expense sheet line."),
+        'hr_expense_ok': fields.boolean('Can be Expensed', help="Specify if the product can be selected in an HR expense line."),
     }
 
-    def on_change_hr_expense_ok(self, cr, uid, id, hr_expense_ok):
-
-        if not hr_expense_ok:
-            return {}
-        data_obj = self.pool.get('ir.model.data')
-        cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense')
-        categ_id = data_obj.browse(cr, uid, cat_id).res_id
-        res = {'value' : {'type':'service','procure_method':'make_to_stock','supply_method':'buy','purchase_ok':True,'sale_ok' :False,'categ_id':categ_id }}
-        return res
-
 product_product()
 
 class hr_expense_line(osv.osv):
@@ -256,6 +255,10 @@ class hr_expense_line(osv.osv):
         res = dict(cr.fetchall())
         return res
 
+    def _get_uom_id(self, cr, uid, context=None):
+        result = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product', 'product_uom_unit')
+        return result and result[1] or False
+
     _columns = {
         'name': fields.char('Expense Note', size=128, required=True),
         'date_value': fields.date('Date', required=True),
@@ -264,7 +267,7 @@ class hr_expense_line(osv.osv):
         'unit_amount': fields.float('Unit Price', digits_compute=dp.get_precision('Product Price')),
         'unit_quantity': fields.float('Quantities', digits_compute= dp.get_precision('Product Unit of Measure')),
         'product_id': fields.many2one('product.product', 'Product', domain=[('hr_expense_ok','=',True)]),
-        'uom_id': fields.many2one('product.uom', 'Unit of Measure'),
+        'uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True),
         'description': fields.text('Description'),
         'analytic_account': fields.many2one('account.analytic.account','Analytic account'),
         'ref': fields.char('Reference', size=32),
@@ -273,20 +276,31 @@ class hr_expense_line(osv.osv):
     _defaults = {
         'unit_quantity': 1,
         'date_value': lambda *a: time.strftime('%Y-%m-%d'),
+        'uom_id': _get_uom_id,
     }
     _order = "sequence, date_value desc"
 
-    def onchange_product_id(self, cr, uid, ids, product_id, uom_id, employee_id, context=None):
+    def onchange_product_id(self, cr, uid, ids, product_id, context=None):
         res = {}
         if product_id:
             product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             res['name'] = product.name
             amount_unit = product.price_get('standard_price')[product.id]
             res['unit_amount'] = amount_unit
-            if not uom_id:
-                res['uom_id'] = product.uom_id.id
+            res['uom_id'] = product.uom_id.id
         return {'value': res}
 
+    def onchange_uom(self, cr, uid, ids, product_id, uom_id, context=None):
+        res = {'value':{}}
+        if not uom_id or not product_id:
+            return res
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        uom = self.pool.get('product.uom').browse(cr, uid, uom_id, context=context)
+        if uom.category_id.id != product.uom_id.category_id.id:
+            res['warning'] = {'title': _('Warning'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure')}
+            res['value'].update({'uom_id': product.uom_id.id})
+        return res
+
 hr_expense_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_expense/hr_expense_data.xml b/addons/hr_expense/hr_expense_data.xml
index 6e41f3d4e05..f54156ac5ec 100644
--- a/addons/hr_expense/hr_expense_data.xml
+++ b/addons/hr_expense/hr_expense_data.xml
@@ -2,20 +2,20 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Expenses Management has been installed</value>
-            <value>Manage your employee's expenses, with validations by employee manager and accountant, creation and payment of invoices.
-
-This module also uses the analytic accounting and is compatible with the invoice on timesheet module so that you will be able to automatically re-invoice your customer's expenses if your work by project.</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Expense Management application installed!</field>
+            <field name="body"><![CDATA[<p>Manage your employees' expenses, after due validation by their manager and the accountant, then generate and pay the corresponding invoices.</p>
+<p>This feature is also linked to analytic accounting and compatible with timesheet invoices, so you will be able to automatically re-invoice project-related expenses to your customers.</p>]]></field>
+        </record>
 
         <!-- Resource: product.uom.categ -->
         <record id="cat_expense" model="product.category">
             <field name="parent_id" ref="product.product_category_all"/>
             <field name="name">Expenses</field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_demo.xml b/addons/hr_expense/hr_expense_demo.xml
index e1d6b0a00b0..eddaf03ad38 100644
--- a/addons/hr_expense/hr_expense_demo.xml
+++ b/addons/hr_expense/hr_expense_demo.xml
@@ -11,6 +11,8 @@
             <field name="type">service</field>
             <field name="name">Car Travel Expenses</field>
             <field name="default_code">CarTRA</field>
+            <field name="uom_id" ref="product.product_uom_km"/>
+            <field name="uom_po_id" ref="product.product_uom_km"/>
             <field name="categ_id" ref="hr_expense.cat_expense"/>
             <field name="hr_expense_ok" eval="True" />
             <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCACAAIADASIAAhEBAxEB/8QAHQABAAMBAQEBAQEAAAAAAAAAAAYHCAUEAgMBCf/EAD0QAAEDAwMCBAQDBgILAAAAAAECAwQABREGEiEHMRMiQVEUYXGBCDJCFVKRobHBJHIjJSYzU2JjkqLR8f/EABsBAQADAAMBAAAAAAAAAAAAAAABAgMEBQYH/8QAIREAAgICAgIDAQAAAAAAAAAAAAECEQMxBCESQQUTUWH/2gAMAwEAAhEDEQA/ANl0pSgFKUoBSlKAUpSgFKUoBSlKAUpSgFKUoBSlKAUpSgFKUoBSlKAUpSgFKUPHegFKqHUP4gtE2TXh07LcJgoy29dUry028P04A5SOxXnAPpgE1JI3UITZkQw7HcDbHnkNOTXE4QkrVtTgjKSMlOeQRkcHnFZSUdkWTqlKVYkUpSgFKUoBSlKAUpXE1xMulv0vMm2cxhLZSFgyM+GlORuUrHIATk/b1qG6Vg7ZIHc4qNaj11piwrLM25oXIGR8OwkuuZAzgpTnB5HfFQeTZdYX8PN3i7lCOApiNuc86TlaVHyNp4IAOF9s5znPI6j6ah6S6eXS5QGC1P8ACKWpD7xeU3htawNoASMLQPygE5I9TnD7rdIo5P0d299Urk7GcVYLO2yEpUS9O3KSkjuFBHlGMHPn4xzWf+tnVPUEh1Nni6tdnvutlD7cTLDCSrgM5GN54OSQQPRRAOIrctd3U6MtGjUY8KFtakORStXibfKlWVAFKNoSoggH37VCY6ZbL0gKt6UPqVtbfU4MqSfTk5Hb78e1bKPthJvtn2i2NiIVXNxK+fEVtPc+xz+ntx645x2q4/w89U2YUiboXVCXYtuuEdMeBdnFK2Q9qdjbSgo4DQz5VJxtOArjGyrm2y3aplxcX4zkRtDyuMgZdQjA/wC/Ga5Oqp4MVQTyokhORkE+386SUZ2i9H+lOnppuNliTFpCHHGgXUfuL/Un6g5H2r31lD8LPW+NAeh9ONWuhkKV4dsmqVkBZyrwnD8zkpUfmPQVq+pSpUBSlKkClKUArk3m+x4ClMto+IkpHKEqwEf5len05PyqLXnqA0qZc7ZEbVEXBeLDrzxCVgj9SUH0PO1R4I55qttQa8tMRCm/j20jJJ2qK1E+pOM8/WrKP6VcixpespgdKX32WEezIz/M819sXq1XJCmH5aJSHElDranMkpIwoY+hNZyvvVG3N7gw0+8r5kJH9/6VCrlr+5z3P8FFaZVnyqJKiPvxVvG+inmkaR6vWm6XnpmyI0xKH23izcAuYhlLrjYU3u3OnbgLSVbPXII5AqsurXUlFi6YR+nfhplagdUpElBUsphpLhUhlCjys7SEjBKQngFQwa7GutcX3S+grVKbiPLub7CPEuyHCExJPhJbdQoAYKlBsLAUcEqKiCUis7Wtplx5+7uOmXIySSs7ikkZOCe6vf6/XPEx4v30WUVdnmZdnW1pEaTIQ4XleYk8NH90+/19Tx7Z6d1c0/OsMdpMyQzNZWsy5ToIZCR2Awnyqzj1OMnPoK/F1SGoy33mytx9OFIUnkJI/JgjP1FerR9jTPv8Ry5SEORY2Hww5kkkKATvJJCtqlA49QOScVbO1GHm21XfRtjVvxS2Xj0W6VQbppC4S7/MhBmehCWhHdWVuNIdbd3KKkpKFZ8pwD3BPOQbP0/orRRjqdTpi2pZQNjS0FTgW2M4P1PJ9TznknnixrlEYuirN8SFtIS0ypWQUJI8MEj67Nx5PJ+RzNL3c0xVfDoTtbCMg+mc9v8A73z64OPG8jm5c7t9HY/QoKl7IDrXpR03vYU27p2PbFKjrdhzYp/0jqinJBbIyoJBSR6Z7j3sjor+1bfppWnL9fReJ1uecbjvqaKVripVtRuUSfFUkgpK+DwMjPKonp+beJ18iMSYMl21yWkre3tEtI3NhxCgVDGQrbyPXNdaM87a5chKch21J+JbISUpUjcpS0pGBnxEL291eYcklFb8H5HJgyJTdxK5cCa62WlXy4422MuLSn2ye9RzWGqWLNNh2popVPmJW4AeQ20j8yz9SQAPqedpFeG33tmUwVpWC8OHNx8wPzr2KVnWN0Sd2elP+7bUr5qO0f8Av+Vc6ZcXlJKfHDYP/DHP8T/bFcaVcfdVciZdAkHzVdRKuRR/XnpZrGfcF3vSVyRcvOVuQpjpS73Jw252wCcgHbgjOTk1nfVN41hZ2HWNQ2qZapiAUp+IjKShw+4VjaftxW35N1JJwquRcbhEU2USi0pK+CleDu+WPWrqBRyRgiFqyciSFzW0SW8+Ydj9vSrl6UR2dQartwaT/g20/GOkjshIyM/faPvVwXLRGjr86r/Yy0urPd1UVLSj9wN1fpaek1hscG4v22Iq3qkMbXfAeWAUpO4ABROBkDOO9Sk1tkOn2kVjrzTolWU3+VqJS1SyqZ8A40Qhkr525Ku4TgE49KgMaBPhRkKctc2JBffKg8Y60NLTgEjcocn2we38tb6f0XZLWlEhMZoyCkbn3AFOH5bjzj5V+2qLDpq+W/4G7wxJZGdqQ4pGCRjPBHPPHtUSSeiYWtmSEyDKkPyjhLcfhBUO6+c/w/vUs6KFiVqb4aU+USSUuJU3jKACf3sDuUd8f3rgdQNLS9DXUxVuqftYG6HJcwTIUT+VWOygAB7flxxXO0fqlNm1XCmr8kcqKLglxHKUHGSfXAUEHjuBxXXc/FLJx5wjujl8eajkjJ6NGavkSUaptbCg1CakR222kqUA22dxSSAkEpSVZ75JIUe2APXe71Mt8VyLMl+NsT5VDkAdsA4B9D3yf6V+V1tMC6WaN4KmfEfUBCkB3ISrnc1+YknKUY743n6VH9WW25sSVIvihHS3ILCnEhSmXlAE5BAynjBAI5BOOxFeGjO1o9B4J0Szpzd79b9YIgy5a3bdIaCg0V7ko3I3pUnP5T2BHYg+vBFlXV1hy5xfihva8Vt0jKU7Qg7iSc5UBtBx37/pJxWumbe/EQu6PEttMN+L4jx2hW4KwST8kng4+5xUvsEVV5vq2GtoRPyXE5CiljCUrcKh2Ckp2pHuoHnHDDDJlko122YZ1GLcl6R99f8ARNy1Xb5z2m7oLVqYRVxYshTqkBTZIJRweCRuAVg7d5I5ArHcbXPWHpC+mzamtklyMydjQuCFHA/6T6TyPllQHtW2uvGlnr7CgzoEow7hBcK47wUUgKIwQSOQDx5h2IFQS0ajuakpsmqWGlOq8gRLQkeL9P0ufVOa+jJnn/4Qbpp1jd1daYzsiO5BnSZSozEZRDod2hGVhWEYTlYHPr6nBxZ93tV9iqQiVJitleM4bPH/AJVz9R6Z0u6mOxL0/ZpIaR4jTbkVKvCCieyTwnJB7d8VFbhFsiY6X4dptewZCHERkEcexxitV5PTMnS2SCTAd+JQybiJfiAEFlwBI+RIA9vevjUlw0toiz/tW+T4kRCuEuPDcXFeyEDKln7Go7YrwtqRIkTJJ8Fsc+gSkDKjx8qg8bTEjqXqJOodRoubsOXIDEKPEJRllLqEOYcKVBKUJWpWwAFzw3DkYzUzk49CCUuz1x+vWm7jfGosCdJjulwJZcfihttRzwMjtn54q2pOoPjrGp9HAdjk49iU8isfdcOn8bSa7fcrYzPisyh4ciJLWFuRpCUpK0pWEp8RvJUlK9oyW19wATpK1ufCabjR5jqWlljCysgYURk/1qMb8tia8X0S9dzdU0nzY8orrQrLHmJbW7qizN+IAQ2mQFOD5FJxzVUy7zECdrkyRKOPyNDw0fx7/wAzXPN6fBKYENmPnuoJ3KP39amUor2EpP0XLqTpPbtQRBHmXNclkAkbYYVtVwUrSd/BBGQaqbSH4ZpMXWFwumqbquXDYdxbURI53PoyTveSrhJHHlBVznngZ8bMG93VwA/EO5OQOcD7VLrB071LL2nxJDST/wA5FYuTbNVGkTmLo1+2x3E2mTcQpWCpp9tXhukdtxCs/fn6HAxH9W6a1TcoyIqdLvObVBxXguJ8EqxjKUZTtPzxzx6ZBlen+lD6QlU2fIVj08U1OrToe0wkjLfiEeqjmuo5PxHH5E3k7Te69nMw8zJiVLtf0q3T2mtbzGmWZNvh2dKUhLj8p/x3iUgBJQE8oAx23f0AEz0fo692ic7KfujcpTy9ziwVFaz7qJFT+NAiRkgNMoTj2FeoADsK34vx+HjO4Lv9ZTLyJ5dnjulvZuEcsvDIIqA6g6cuvMuIgzlpbUMFlwBxsj22qzx9MVZVK5ybWjjtJ7M63LSeqrE24iHbLctkncRGa8Hce2cDIzUEuX7WhtLjrtT8ZtSysthRUgKPchPYfathuNoWMLSCPmK5Vx05apwIeitkn5VosrRm8SZhjXd7etdmSlTbjSpbyGB5VDgqG4k/5c1ZfS7Ulu05p6JeEwlyQLeqK4I7Sd6XGy45sVglSiUhaxwkDcANxXxd2pOkumb3BchzYTbrDndJ4wfcEcg/MVAJf4aLWp3/AFdqO7QG1DatKFgkj23DB/jmqzm5Oy0IKKozp1h+M1tq9y1W5LLU1UpyZMcS0geCQNjYUtCQpZxkjf5khSQexqeWPSmoLiwz4zTrz+xIccOTuVjk8/OtCaE6KaQ0lEDEGIXFE5cddIUtw+5P9gAKsCFaLfESEsx0JA+VULmdtP8ASC5yilUkbEn3qxLB0itcQJVJAWoVaaUpSMJAFf2gOHa9LWi3pAZit5Hriuw0y02MIQlI+Qr9KUApSlAKUpQClKUApSlAKUpQClKUApSlAKUpQClKUApSlAf/2Q==</field>
diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index c2d1d88d1bf..b897673f4ec 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -1,22 +1,16 @@
 <openerp>
-  <data>
-      <record id="hr.todo_open_hr_menu" model="ir.actions.todo">
-          <field name="state">done</field>
-      </record>
-  </data>
   <data noupdate="1">
       <!-- After installation of the module, open the related menu -->
-      <record id="todo_open_hr_menu" model="ir.actions.todo">
+      <record id="base.open_menu" model="ir.actions.todo">
           <field name="action_id" ref="hr.action_client_hr_menu"/>
-          <field name="type">automatic</field>
-          <field name="sequence">100</field>
+          <field name="state">open</field>
       </record>
   </data>
   <data>
         <record id="product_expense_installer_tree_view" model="ir.ui.view">
             <field name="name">product.product.tree</field>
             <field name="model">product.product</field>
-            <field eval="7" name="priority"/>
+            <field eval="37" name="priority"/>
             <field name="arch" type="xml">
                 <tree editable="bottom" string="Products">
                     <field name="name"/>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 9978490b29a..d4b7cbae1ce 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -79,7 +79,7 @@
                         </group>
                         <group>
                             <field name="name"/>
-                            <field name="user_valid"/>
+                            <field name="user_valid" attrs="{'invisible': [('state','=','draft')]}"/>
                             <field name="currency_id" groups="base.group_multi_currency" on_change="onchange_currency_id(currency_id, company_id)"/>
                         </group>
                     </group>
@@ -89,7 +89,7 @@
                                 <form string="Expense Lines" version="7.0">
                                     <group>
                                         <group>
-                                            <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
+                                            <field name="product_id" on_change="onchange_product_id(product_id, context)" context="{'default_hr_expense_ok':1}"/>
                                             <field name="name"/>
                                             <field name="ref"/>
                                             <field domain="[('type','=','normal')]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
@@ -99,24 +99,36 @@
                                             <label for="unit_quantity"/>
                                             <div>
                                                 <field name="unit_quantity" class="oe_inline"/> 
-                                                <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" class="oe_inline"/>
+                                                <field name="uom_id" on_change="onchange_uom(product_id, uom_id, context)" class="oe_inline"/>
                                             </div>
                                             <field name="date_value" />
                                         </group>
                                     </group>
                                 </form>
+                                <tree string="Expense Lines" editable="bottom">
+                                    <field name="sequence" invisible="1"/>
+                                    <field name="product_id" on_change="onchange_product_id(product_id, context)" context="{'default_hr_expense_ok':1}"/>
+                                    <field name="date_value" string="Expense Date"/>
+                                    <field name="name"/>
+                                    <field name="ref"/>
+                                    <field domain="[('type','in',['normal','contract']), ('parent_id','!=',False)]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
+                                    <field name="uom_id" on_change="onchange_uom(product_id, uom_id, context)"/>
+                                    <field name="unit_amount"/>
+                                    <field name="unit_quantity"/>
+                                    <field name="total_amount" sum="Total"/>
+                                </tree>
                             </field>
                             <group>
                                 <div>
                                     <separator string="Notes"/>
                                     <field name="note" placeholder="Free Notes"/>
                                 </div>
-                                <group class="oe_subtotal_footer">
-                                    <field name="amount"/>
+                                <group class="oe_subtotal_footer oe_right">
+                                    <field name="amount" widget="monetary" options="{'currency_field': 'currency_id'}" class="oe_subtotal_footer_separator"/>
                                 </group>
                             </group>
                         </page>
-                        <page string="Other Info">
+                        <page string="Accounting" groups="account.group_account_user">
                             <group>
                                 <group string="Accounting Data">
                                     <field name="journal_id" widget="selection" domain="[('type', '=', 'purchase')]"/>
@@ -127,8 +139,8 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
@@ -143,11 +155,12 @@
                     <field name="name" string="Expenses"/>
                     <field name="date"/>
                     <filter icon="terp-document-new" domain="[('state','=','draft')]" string="New" help="New Expense"/>
-                    <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expense"/>
+                    <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" help="Confirmed Expenses"/>
                     <filter icon="terp-dolar" domain="[('state','=','accepted')]" string="To Pay" help="Expenses to Invoice"/>
+                    <separator/>
+                    <filter domain="[('user_id', '=', uid)]" string="My Expenses"/>
                     <field name="employee_id"/>
                     <field name="department_id" string="Department" context="{'invisible_department': False}"/>
-                    <field name="user_id"  string="User"/>
                     <group expand="0" string="Group By...">
                         <filter string="Employee" icon="terp-personal" domain="[]" context="{'group_by':'employee_id'}"/>
                         <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
@@ -175,19 +188,32 @@
             </field>
         </record>
 
-        <menuitem id="next_id_49" name="Expenses" sequence="15" parent="hr.menu_hr_root"/>
-        <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49"/>
 
         <record id="view_product_hr_expense_form" model="ir.ui.view">
             <field name="name">product.product.expense.form</field>
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-            <field name="purchase_ok" position="after">
-            <field name="hr_expense_ok" on_change="on_change_hr_expense_ok(hr_expense_ok)"/>
-            </field>
+                <div name="options" position="inside">
+                    <field name="hr_expense_ok"/>
+                    <label for="hr_expense_ok"/>
+                </div>
             </field>
         </record>
 
+        <record id="hr_expense_product" model="ir.actions.act_window">
+            <field name="name">Products</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="context">{"default_hr_expense_ok":1}</field>
+            <field name="domain">[('hr_expense_ok','=',True)]</field>
+            <field name="search_view_id" ref="product.product_search_form_view"/>
+        </record>
+
+        <menuitem id="menu_hr_product" name="Type of Expenses" parent="hr.menu_hr_configuration" action="hr_expense_product"/>
+        <menuitem id="next_id_49" name="Expenses" sequence="15" parent="hr.menu_hr_root"/>
+        <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49"/>
+
     </data>
 </openerp>
diff --git a/addons/hr_expense/i18n/ar.po b/addons/hr_expense/i18n/ar.po
index 7c9882be661..4b62ade3845 100644
--- a/addons/hr_expense/i18n/ar.po
+++ b/addons/hr_expense/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/bg.po b/addons/hr_expense/i18n/bg.po
index dea8cd73ad7..daaa472cc5a 100644
--- a/addons/hr_expense/i18n/bg.po
+++ b/addons/hr_expense/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/bs.po b/addons/hr_expense/i18n/bs.po
index ef680483b10..e2a3104acf8 100644
--- a/addons/hr_expense/i18n/bs.po
+++ b/addons/hr_expense/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/ca.po b/addons/hr_expense/i18n/ca.po
index d075b1b7d06..6d9dd91f4cb 100644
--- a/addons/hr_expense/i18n/ca.po
+++ b/addons/hr_expense/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/cs.po b/addons/hr_expense/i18n/cs.po
index 8c66f5f3737..73cad38bbff 100644
--- a/addons/hr_expense/i18n/cs.po
+++ b/addons/hr_expense/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/da.po b/addons/hr_expense/i18n/da.po
index 8d2a64bb83f..6791dd7b315 100644
--- a/addons/hr_expense/i18n/da.po
+++ b/addons/hr_expense/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index d354571da8e..a532892250c 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/el.po b/addons/hr_expense/i18n/el.po
index da5432deee2..580731f4e83 100644
--- a/addons/hr_expense/i18n/el.po
+++ b/addons/hr_expense/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index f6578dd23e5..d01d3de1f2a 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -262,7 +262,7 @@ msgstr ""
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Expenses during last month"
-msgstr ""
+msgstr "Gastos del último mes"
 
 #. module: hr_expense
 #: report:hr.expense:0 view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/es_AR.po b/addons/hr_expense/i18n/es_AR.po
index 62ea120604c..841b33be330 100644
--- a/addons/hr_expense/i18n/es_AR.po
+++ b/addons/hr_expense/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/es_CR.po b/addons/hr_expense/i18n/es_CR.po
index 9a531a0df85..1fcf985dc0a 100644
--- a/addons/hr_expense/i18n/es_CR.po
+++ b/addons/hr_expense/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/es_EC.po b/addons/hr_expense/i18n/es_EC.po
index 54ddf6481c2..f55ce2d2dc7 100644
--- a/addons/hr_expense/i18n/es_EC.po
+++ b/addons/hr_expense/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/et.po b/addons/hr_expense/i18n/et.po
index e460e300937..5a7e43a4f6d 100644
--- a/addons/hr_expense/i18n/et.po
+++ b/addons/hr_expense/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/fi.po b/addons/hr_expense/i18n/fi.po
index f0e3e8bcfda..686fda1959b 100644
--- a/addons/hr_expense/i18n/fi.po
+++ b/addons/hr_expense/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/fr.po b/addons/hr_expense/i18n/fr.po
index 24fbed9c90f..1942f773561 100644
--- a/addons/hr_expense/i18n/fr.po
+++ b/addons/hr_expense/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/hr.po b/addons/hr_expense/i18n/hr.po
index e892196510a..d5312f5c764 100644
--- a/addons/hr_expense/i18n/hr.po
+++ b/addons/hr_expense/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -35,38 +35,38 @@ msgstr "Računovođa isplaćuje troškove"
 #: field:hr.expense.expense,date_confirm:0
 #: field:hr.expense.report,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "Datum potvrde"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0 view:hr.expense.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: hr_expense
 #: model:product.template,name:hr_expense.air_ticket_product_template
 msgid "Air Ticket"
-msgstr ""
+msgstr "Avionska karta"
 
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Validated By"
-msgstr ""
+msgstr "Potvrđeno od strane"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0 field:hr.expense.expense,department_id:0
 #: view:hr.expense.report:0 field:hr.expense.report,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Odjel"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "New Expense"
-msgstr ""
+msgstr "Novi trošak"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Ožujak"
 
 #. module: hr_expense
 #: field:hr.expense.report,invoiced:0
diff --git a/addons/hr_expense/i18n/hu.po b/addons/hr_expense/i18n/hu.po
index 18a07e4f354..354bc2d047c 100644
--- a/addons/hr_expense/i18n/hu.po
+++ b/addons/hr_expense/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/id.po b/addons/hr_expense/i18n/id.po
index 7dc9e0ebcd4..56fac9f5e90 100644
--- a/addons/hr_expense/i18n/id.po
+++ b/addons/hr_expense/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/it.po b/addons/hr_expense/i18n/it.po
index 07d3421a8af..f4c78a8cdcb 100644
--- a/addons/hr_expense/i18n/it.po
+++ b/addons/hr_expense/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/ja.po b/addons/hr_expense/i18n/ja.po
index 2e985a57521..946b3ad3872 100644
--- a/addons/hr_expense/i18n/ja.po
+++ b/addons/hr_expense/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/ko.po b/addons/hr_expense/i18n/ko.po
index 0efe477be8f..fe5a4cb66ba 100644
--- a/addons/hr_expense/i18n/ko.po
+++ b/addons/hr_expense/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/lt.po b/addons/hr_expense/i18n/lt.po
index 8c66f5f3737..73cad38bbff 100644
--- a/addons/hr_expense/i18n/lt.po
+++ b/addons/hr_expense/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/lv.po b/addons/hr_expense/i18n/lv.po
index ae8d59c5a36..0d467dc8327 100644
--- a/addons/hr_expense/i18n/lv.po
+++ b/addons/hr_expense/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/mn.po b/addons/hr_expense/i18n/mn.po
index 37807c888a8..435942d7b4c 100644
--- a/addons/hr_expense/i18n/mn.po
+++ b/addons/hr_expense/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/nl.po b/addons/hr_expense/i18n/nl.po
index 4cfdcf12ce7..5cf84e2e1d7 100644
--- a/addons/hr_expense/i18n/nl.po
+++ b/addons/hr_expense/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -597,7 +597,7 @@ msgstr "Goedgekeurde declaraties"
 #. module: hr_expense
 #: report:hr.expense:0 field:hr.expense.line,unit_amount:0
 msgid "Unit Price"
-msgstr "Prijs per eenheid"
+msgstr "Prijs"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -720,7 +720,7 @@ msgstr "Aantallen"
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Price"
-msgstr "Prijs"
+msgstr "Bedrag"
 
 #. module: hr_expense
 #: field:hr.expense.report,no_of_account:0
diff --git a/addons/hr_expense/i18n/nl_BE.po b/addons/hr_expense/i18n/nl_BE.po
index e1c8196a24a..65f22606fbd 100644
--- a/addons/hr_expense/i18n/nl_BE.po
+++ b/addons/hr_expense/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/pl.po b/addons/hr_expense/i18n/pl.po
index c2af5fca653..81b39e7a95f 100644
--- a/addons/hr_expense/i18n/pl.po
+++ b/addons/hr_expense/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/pt.po b/addons/hr_expense/i18n/pt.po
index 33be0c31d33..626a02c4296 100644
--- a/addons/hr_expense/i18n/pt.po
+++ b/addons/hr_expense/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index d5f8e80b415..0e023c54379 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/ro.po b/addons/hr_expense/i18n/ro.po
index b8b14054f73..65c77bf60cf 100644
--- a/addons/hr_expense/i18n/ro.po
+++ b/addons/hr_expense/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/ru.po b/addons/hr_expense/i18n/ru.po
index 55e30b96841..24c06651add 100644
--- a/addons/hr_expense/i18n/ru.po
+++ b/addons/hr_expense/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/sl.po b/addons/hr_expense/i18n/sl.po
index 20052d7bbb4..c563bfa77c6 100644
--- a/addons/hr_expense/i18n/sl.po
+++ b/addons/hr_expense/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/sq.po b/addons/hr_expense/i18n/sq.po
index 992e59194f3..a2893003c85 100644
--- a/addons/hr_expense/i18n/sq.po
+++ b/addons/hr_expense/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/sr.po b/addons/hr_expense/i18n/sr.po
index d8d22bc1a80..8857199c6d0 100644
--- a/addons/hr_expense/i18n/sr.po
+++ b/addons/hr_expense/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/sr@latin.po b/addons/hr_expense/i18n/sr@latin.po
index 5dac268b40b..bce47b1c12f 100644
--- a/addons/hr_expense/i18n/sr@latin.po
+++ b/addons/hr_expense/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/sv.po b/addons/hr_expense/i18n/sv.po
index dafa9c1d1b7..6aaeec193b8 100644
--- a/addons/hr_expense/i18n/sv.po
+++ b/addons/hr_expense/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -110,6 +110,8 @@ msgid ""
 "Date of the acceptation of the sheet expense. It's filled when the button "
 "Accept is pressed."
 msgstr ""
+"Datum för acceptans av utgiftsblanketten. Den fylls i när knappen Acceptera "
+"trycks in."
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -144,7 +146,7 @@ msgstr "Avbruten"
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_refused0
 msgid "The direct manager refuses the sheet.Reset as draft."
-msgstr ""
+msgstr "Chefen underkänner blanketten. Sätt som utkast."
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -170,7 +172,7 @@ msgstr "Referens"
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "Certified honest and conform,"
-msgstr ""
+msgstr "Certifierad ärlig och överensstämmer,"
 
 #. module: hr_expense
 #: help:hr.expense.expense,date_confirm:0
@@ -178,6 +180,8 @@ msgid ""
 "Date of the confirmation of the sheet expense. It's filled when the button "
 "Confirm is pressed."
 msgstr ""
+"Datum för bekräftelse av utgiftsblanketten. Den fylls i när knappen Bekräfta "
+"trycks in."
 
 #. module: hr_expense
 #: view:hr.expense.report:0 field:hr.expense.report,nbr:0
@@ -208,23 +212,23 @@ msgstr "Godkänn"
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_supplierinvoice0
 msgid "The accoutant validates the sheet"
-msgstr ""
+msgstr "Den som bokför bekräftar blanketten"
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:187
 #, python-format
 msgid "The employee's home address must have a partner linked."
-msgstr ""
+msgstr "Arbetstagarens hemadress måste ha en partner länkad."
 
 #. module: hr_expense
 #: field:hr.expense.report,delay_valid:0
 msgid "Delay to Valid"
-msgstr ""
+msgstr "Försening att bekräfta"
 
 #. module: hr_expense
 #: help:hr.expense.line,sequence:0
 msgid "Gives the sequence order when displaying a list of expense lines."
-msgstr ""
+msgstr "Sekvensen ordning vid visning av en lista över kostnadsrader."
 
 #. module: hr_expense
 #: field:hr.expense.line,analytic_account:0 view:hr.expense.report:0
@@ -250,6 +254,8 @@ msgid ""
 "Please configure Default Expense account for Product purchase, "
 "`property_account_expense_categ`"
 msgstr ""
+"Vänligen konfigurera kontot StandardKostnad för produktinköpet, "
+"`property_account_expense_categ`"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -285,7 +291,7 @@ msgstr "Totalt pris"
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_reinvoicing0
 msgid "Some costs may be reinvoices to the customer"
-msgstr ""
+msgstr "Vissa kostnader kan faktureras kunden"
 
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:173
@@ -314,17 +320,17 @@ msgstr "Personalutgifter"
 #. module: hr_expense
 #: field:hr.expense.expense,id:0
 msgid "Sheet ID"
-msgstr ""
+msgstr "Blankett ID"
 
 #. module: hr_expense
 #: model:process.transition,name:hr_expense.process_transition_reimburseexpense0
 msgid "Reimburse expense"
-msgstr ""
+msgstr "Ersätt Kostnader"
 
 #. module: hr_expense
 #: field:hr.expense.expense,journal_id:0 field:hr.expense.report,journal_id:0
 msgid "Force Journal"
-msgstr ""
+msgstr "Forcera Journal"
 
 #. module: hr_expense
 #: view:hr.expense.report:0 field:hr.expense.report,no_of_products:0
@@ -339,12 +345,12 @@ msgstr "juli"
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_reimburseexpense0
 msgid "After creating invoice, reimburse expenses"
-msgstr ""
+msgstr "Efter skapandet av faktura, ersätt kostnader"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reimbursement0
 msgid "Reimbursement"
-msgstr ""
+msgstr "Ersättning"
 
 #. module: hr_expense
 #: view:hr.expense.report:0
@@ -354,7 +360,7 @@ msgstr "    Månad-1    "
 #. module: hr_expense
 #: field:hr.expense.expense,date_valid:0 field:hr.expense.report,date_valid:0
 msgid "Validation Date"
-msgstr ""
+msgstr "Bekräftad datum"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -384,7 +390,7 @@ msgstr "Utläggstransaktioner"
 #. module: hr_expense
 #: field:hr.expense.report,delay_confirm:0
 msgid "Delay to Confirm"
-msgstr ""
+msgstr "Fördröjning att bekräfta"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -399,7 +405,7 @@ msgstr "december"
 #. module: hr_expense
 #: view:hr.expense.report:0
 msgid "Invoiced Expenses"
-msgstr ""
+msgstr "Fakturerade Utgifter"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0 view:hr.expense.report:0
@@ -421,7 +427,7 @@ msgstr "Väntar på godkännande"
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_draftexpenses0
 msgid "Employee encode all his expenses"
-msgstr ""
+msgstr "Anställd koda alla hans utgifter"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0 view:hr.expense.report:0
@@ -432,12 +438,12 @@ msgstr "Fakturerad"
 #. module: hr_expense
 #: field:product.product,hr_expense_ok:0
 msgid "Can Constitute an Expense"
-msgstr ""
+msgstr "Kan utgöra en utgift"
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0 selection:hr.expense.report,state:0
 msgid "Reimbursed"
-msgstr ""
+msgstr "Återbetalad"
 
 #. module: hr_expense
 #: field:hr.expense.expense,note:0
@@ -447,7 +453,7 @@ msgstr "Anteckning"
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_reimbursereinvoice0
 msgid "Create Customer invoice"
-msgstr ""
+msgstr "Skapa kundfaktura"
 
 #. module: hr_expense
 #: selection:hr.expense.report,state:0
@@ -472,7 +478,7 @@ msgstr "augusti"
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_approved0
 msgid "The direct manager approves the sheet"
-msgstr ""
+msgstr "Chefen godkänner blanketten."
 
 #. module: hr_expense
 #: field:hr.expense.expense,amount:0
@@ -487,7 +493,7 @@ msgstr "juni"
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_draftexpenses0
 msgid "Draft Expenses"
-msgstr ""
+msgstr "Utkast Kostnader"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -497,7 +503,7 @@ msgstr "Kundprojekt"
 #. module: hr_expense
 #: model:ir.actions.act_window,name:hr_expense.product_normal_form_view_installer
 msgid "Review Your Expenses Products"
-msgstr ""
+msgstr "Granska dina utgiftsprodukter"
 
 #. module: hr_expense
 #: report:hr.expense:0 field:hr.expense.expense,date:0
@@ -524,7 +530,7 @@ msgstr "Användare"
 #: code:addons/hr_expense/hr_expense.py:185
 #, python-format
 msgid "The employee must have a Home address."
-msgstr ""
+msgstr "Arbetstagaren måste ha en hemadress."
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -559,7 +565,7 @@ msgstr "Skicka till chef"
 #. module: hr_expense
 #: model:process.node,note:hr_expense.process_node_confirmedexpenses0
 msgid "The employee validates his expense sheet"
-msgstr ""
+msgstr "Den anställde bekräftar sin kostnadsblankett"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -622,7 +628,7 @@ msgstr "Annan information"
 #. module: hr_expense
 #: help:hr.expense.expense,journal_id:0
 msgid "The journal used when the expense is invoiced"
-msgstr ""
+msgstr "Journalen används när kostnaden faktureras"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -648,7 +654,7 @@ msgstr "Godkänn"
 #. module: hr_expense
 #: report:hr.expense:0
 msgid "This document must be dated and signed for reimbursement"
-msgstr ""
+msgstr "Detta dokument skall vara daterad och undertecknad för ersättning"
 
 #. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_refuseexpense0
@@ -664,6 +670,12 @@ msgid ""
 "based on real costs, set the cost at 0.00. The user will set the real price "
 "when recording his expense sheet."
 msgstr ""
+"Definiera en produkt för varje utgift typ som är tillåten för anställda "
+"(bilresa, hotell, restaurangnota, etc). Om du ersätter de anställda till en "
+"fast summa, sätt då en kostnad och en måttenhet på produkten (ex. "
+"milersättning). Om du ersätter baserat på faktiska kostnader, ställ då in "
+"kostnaden vid 0,00. Användaren anger det verkliga priset vid upprättandet av "
+"hans kostnadsblankett."
 
 #. module: hr_expense
 #: selection:hr.expense.expense,state:0 view:hr.expense.report:0
@@ -741,6 +753,11 @@ msgid ""
 "and the employee can be reimbursed. You can also reinvoice the customer at "
 "the end of the flow."
 msgstr ""
+"OpenERP kostnadshanteringmodul gör att du kan spåra hela flödet. Varje månad "
+"registrerar de anställda sina kostnader. I slutet av månaden, bekräftar "
+"deras chefer kostnadsblanketten, som skapar kostnader för projekt / det "
+"analytiska konton. Den som bokför bekräftar de föreslagna posterna och den "
+"anställde kan ersättas. Du kan även återfakturera kunden i slutet av flödet."
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -751,7 +768,7 @@ msgstr "Denna månad"
 #: field:hr.expense.expense,user_valid:0 view:hr.expense.report:0
 #: field:hr.expense.report,user_id:0
 msgid "Validation User"
-msgstr ""
+msgstr "Bekräfta Användare"
 
 #. module: hr_expense
 #: report:hr.expense:0
@@ -781,7 +798,7 @@ msgstr "Skapar leverantörsfaktura"
 #. module: hr_expense
 #: model:product.template,name:hr_expense.hotel_rent_product_template
 msgid "Hotel Accommodation"
-msgstr ""
+msgstr "Hotellboende"
 
 #. module: hr_expense
 #: selection:hr.expense.report,month:0
@@ -803,6 +820,12 @@ msgid ""
 " If an invoice is made for the expense request, the state is 'Invoiced'.\n"
 " If the expense is paid to user, the state is 'Reimbursed'."
 msgstr ""
+"När kostnadsbegäran skapas blir statusen \"Utkast\".\n"
+"  När den bekräftas av användaren och begäran skickas till admin, är "
+"statusen \"Inväntar bekräftelse\".\n"
+"Om administratören godkänner det, blir statusen \"Godkänd\".\n"
+"  Om en faktura görs för kostnadsbegäran, blir statusen \"Fakturerad\".\n"
+"  Om kostnaden betalas till användaren blir statusen \"Återbetalad\"."
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -859,6 +882,8 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from an HR expense sheet line."
 msgstr ""
+"Avgör om produkten visas i listan över produkter i ett urval från en "
+"personalkostnadsblankettsrad."
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_reinvoicing0
@@ -872,3 +897,6 @@ msgstr "Återfakturera"
 
 #~ msgid "Human Resources Expenses Tracking"
 #~ msgstr "Human Resources Expenses Tracking"
+
+#~ msgid "Accounting data"
+#~ msgstr "Redovisningsdata"
diff --git a/addons/hr_expense/i18n/tlh.po b/addons/hr_expense/i18n/tlh.po
index a07fa61b338..52d519515ca 100644
--- a/addons/hr_expense/i18n/tlh.po
+++ b/addons/hr_expense/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index 659d31f1322..dc6e8ce52ed 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/uk.po b/addons/hr_expense/i18n/uk.po
index e0372c2e485..362fb794068 100644
--- a/addons/hr_expense/i18n/uk.po
+++ b/addons/hr_expense/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/vi.po b/addons/hr_expense/i18n/vi.po
index 828177d4e68..638b2863025 100644
--- a/addons/hr_expense/i18n/vi.po
+++ b/addons/hr_expense/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/zh_CN.po b/addons/hr_expense/i18n/zh_CN.po
index 80f092ebbf6..f7c5e286ba2 100644
--- a/addons/hr_expense/i18n/zh_CN.po
+++ b/addons/hr_expense/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/i18n/zh_TW.po b/addons/hr_expense/i18n/zh_TW.po
index d2eb967784a..d634f1ce8e0 100644
--- a/addons/hr_expense/i18n/zh_TW.po
+++ b/addons/hr_expense/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index bf456cfc4d6..3e07516c01b 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -231,7 +231,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line.unit_quantity) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.total_amount) ]] [[ o.currency_id.symbol ]] </para>
+            <para style="terp_default_Right_9">[[ formatLang(line.total_amount, currency_obj=o.currency_id) ]] </para>
           </td>
         </tr>
         <tr>
@@ -277,7 +277,7 @@
           <para style="terp_tblheader_Details">Total:</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount, currency_obj=o.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 1cd1e10c5ed..9f94c264c5e 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -6,7 +6,7 @@
         <field name="name">hr.expense.report.tree</field>
         <field name="model">hr.expense.report</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','done');gray:state == 'cancelled'" string="Expenses Analysis">
+            <tree colors="blue:state == 'draft';black:state in ('confirm','accepted','done');gray:state == 'cancelled'" create="false" string="Expenses Analysis">
                 <field name="employee_id" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index 0455302319e..092424ef7e6 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -9,6 +9,7 @@ access_product_template_hr_expense_user,product.template.hr.expense.user,product
 access_product_uom_hr_expense_user,product.uom.hr.expense.user,product.model_product_uom,base.group_hr_user,1,1,1,1
 access_product_price_type_user,product.price.type.user,product.model_product_price_type,base.group_hr_user,1,1,1,1
 access_account_journal_user,account.journal.user,account.model_account_journal,base.group_hr_user,1,1,1,1
+access_account_journal_employee,account.journal.employee,account.model_account_journal,base.group_user,1,0,0,0
 access_account_invoice_user,account.invoice.user,account.model_account_invoice,base.group_hr_user,1,1,1,1
 access_account_invoice_line_user,account.invoice.line.user,account.model_account_invoice_line,base.group_hr_user,1,1,1,1
 access_account_analytic_journal_user,account.ianalytic.journal.user,account.model_account_analytic_journal,base.group_hr_user,1,1,1,1
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 45dd9ea39a5..417748d874b 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -21,43 +21,32 @@
 
 
 {
-    "name": "Leaves Management",
-    "version": "1.5",
-    "author": "OpenERP SA",
-    "category": "Human Resources",
-    "sequence": 28,
-    "summary": "Holidays, Allocation and Leave Requests",
-    "website": "http://www.openerp.com",
-    "description": """
-This module allows you to manage leaves and leave's requests.
-=============================================================
+    'name': 'Leave Management',
+    'version': '1.5',
+    'author': 'OpenERP SA',
+    'category': 'Human Resources',
+    'sequence': 27,
+    'summary': 'Holidays, Allocation and Leave Requests',
+    'website': 'http://www.openerp.com',
+    'description': """
+Manage leaves and allocation requests
+=====================================
 
-Implements a dashboard for human resource management that includes:
--------------------------------------------------------------------
-    * Leaves
+This application controls the holiday schedule of your company. It allows employees to request holidays. Then, managers can review requests for holidays and approve or reject them. This way you can control the overall holiday planning for the company or department.
 
-Note that:
-    - A synchronisation with an internal agenda (use of the CRM module) is
-      possible: in order to automatically create a case when an holiday request
-      is accepted, you have to link the holidays status to a case section. You
-      can setup this info and your colour preferences in
-                Human Resources/Configuration/Leave Type
-    - An employee can make an ask for more off-days by making a new Allocation. It will increase his total of that leave type available (if the request is accepted).
-    - There are two ways to print the employee's holidays:
-        * The first will allow to choose employees by department and is used by clicking the menu item located in
-                Reporting/Human Resources/Leaves/Leaves by Department
-        * The second will allow you to choose the holidays report for specific employees. Go on the list
-                Human Resources/Human Resources/Employees
-                then select the ones you want to choose, click on the print icon and select the option
-                'Leaves Summary'
-    - The wizard allows you to choose if you want to print either the Approved & Confirmed holidays or both. These states must be set up by a user from the group 'HR'. You can define these features in the security tab from the user data in
-                Settings/Users/Users
-                for example, you maybe will do it for the user 'admin'.
+You can configure several kinds of leaves (sickness, holidays, paid days, ...) and allocate leaves to an employee or department quickly using allocation requests. An employee can also make a request for more days off by making a new Allocation. It will increase the total of available days for that leave type (if the request is accepted).
+
+You can keep track of leaves in different ways by following reports: 
+
+* Leaves Summary
+* Leaves by Department
+* Leaves Analysis
+
+A synchronization with an internal agenda (Meetings of the CRM module) is also possible in order to automatically create a meeting when a holiday request is accepted by setting up a type of meeting in Leave Type.
 """,
     'images': ['images/hr_allocation_requests.jpeg', 'images/hr_leave_requests.jpeg', 'images/leaves_analysis.jpeg'],
     'depends': ['hr', 'base_calendar', 'process', 'resource'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'security/ir_rule.xml',
         'hr_holidays_workflow.xml',
@@ -70,13 +59,12 @@ Note that:
         'wizard/hr_holidays_summary_employees_view.xml',
         'board_hr_holidays_view.xml',
         ],
-    'demo_xml': ['hr_holidays_demo.xml',],
+    'demo': ['hr_holidays_demo.xml',],
     'test': ['test/test_hr_holiday.yml',
              'test/hr_holidays_report.yml',
-             ],
+    ],
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0086579209325',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 45c65511a1a..92b1d57ce15 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -25,7 +25,9 @@ import datetime, time
 from itertools import groupby
 from operator import itemgetter
 
+import math
 import netsvc
+import tools
 from osv import fields, osv
 from tools.translate import _
 
@@ -88,13 +90,25 @@ class hr_holidays_status(osv.osv):
         'color_name': 'red',
         'active': True,
     }
+
+    def name_get(self, cr, uid, ids, context=None):
+        if not ids:
+            return []
+        res = []
+        for record in self.browse(cr, uid, ids, context=context):
+            name = record.name
+            if not record.limit:
+                name = name + ('  (%d/%d)' % (record.leaves_taken or 0.0, record.max_leaves or 0.0))
+            res.append((record.id, name))
+        return res
+
 hr_holidays_status()
 
 class hr_holidays(osv.osv):
     _name = "hr.holidays"
     _description = "Leave"
     _order = "type desc, date_from asc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = [ 'mail.thread','ir.needaction_mixin']
 
     def _employee_get(self, cr, uid, context=None):
         ids = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
@@ -111,20 +125,25 @@ class hr_holidays(osv.osv):
                 result[hol.id] = hol.number_of_days_temp
         return result
 
+    def _check_date(self, cr, uid, ids):
+        for holiday in self.browse(cr, uid, ids):
+            holiday_ids = self.search(cr, uid, [('date_from', '<=', holiday.date_to), ('date_to', '>=', holiday.date_from), ('employee_id', '=', holiday.employee_id.id), ('id', '<>', holiday.id)])
+            if holiday_ids:
+                return False
+        return True
+
     _columns = {
-        'name': fields.char('Description', required=True, size=64),
+        'name': fields.char('Description', size=64),
         'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')],
-            'State', readonly=True, help='The state is set to \'To Submit\', when a holiday request is created.\
-            \nThe state is \'To Approve\', when holiday request is confirmed by user.\
-            \nThe state is \'Refused\', when holiday request is refused by manager.\
-            \nThe state is \'Approved\', when holiday request is approved by manager.'),
+            'Status', readonly=True, help='The status is set to \'To Submit\', when a holiday request is created.\
+            \nThe status is \'To Approve\', when holiday request is confirmed by user.\
+            \nThe status is \'Refused\', when holiday request is refused by manager.\
+            \nThe status is \'Approved\', when holiday request is approved by manager.'),
         'user_id':fields.related('employee_id', 'user_id', type='many2one', relation='res.users', string='User', store=True),
         'date_from': fields.datetime('Start Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, select=True),
         'date_to': fields.datetime('End Date', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'holiday_status_id': fields.many2one("hr.holidays.status", "Leave Type", required=True,readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'employee_id': fields.many2one('hr.employee', "Employee", select=True, invisible=False, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='Leave Manager can let this field empty if this leave request/allocation is for every employee'),
-        #'manager_id': fields.many2one('hr.employee', 'Leave Manager', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
-        #'notes': fields.text('Notes',readonly=True, states={'draft':[('readonly',False)]}),
         'manager_id': fields.many2one('hr.employee', 'First Approval', invisible=False, readonly=True, help='This area is automatically filled by the user who validate the leave'),
         'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
@@ -134,8 +153,8 @@ class hr_holidays(osv.osv):
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
         'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
-        'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee'),
-        'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Type', help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
+        'category_id': fields.many2one('hr.employee.category', "Category", help='Category of Employee', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
+        'holiday_type': fields.selection([('employee','By Employee'),('category','By Employee Category')], 'Allocation Mode', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help='By Employee: Allocation/Request for individual Employee, By Employee Category: Allocation/Request for group of employees in category', required=True),
         'manager_id2': fields.many2one('hr.employee', 'Second Approval', readonly=True, help='This area is automaticly filled by the user who validate the leave with second level (If Leave type need second validation)'),
         'double_validation': fields.related('holiday_status_id', 'double_validation', type='boolean', relation='hr.holidays.status', string='Apply Double Validation'),
     }
@@ -146,17 +165,16 @@ class hr_holidays(osv.osv):
         'user_id': lambda obj, cr, uid, context: uid,
         'holiday_type': 'employee'
     }
+    _constraints = [
+        (_check_date, 'You can not have 2 leaves that overlaps on same day!', ['date_from','date_to']),
+    ] 
+    
     _sql_constraints = [
-        ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "You have to select an employee or a category."),
-        ('date_check2', "CHECK ( (type='add') OR (date_from <= date_to))", "The start date must be before the end date !"),
-        ('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0 !"),
+        ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "The employee or employee category of this request is missing."),
+        ('date_check2', "CHECK ( (type='add') OR (date_from <= date_to))", "The start date must be anterior to the end date."),
+        ('date_check', "CHECK ( number_of_days_temp >= 0 )", "The number of days must be greater than 0."),
     ]
-    
-    def create(self, cr, uid, vals, context=None):
-        obj_id = super(hr_holidays, self).create(cr, uid, vals, context=context)
-        self.create_notificate(cr, uid, [obj_id], context=context)
-        return obj_id
-    
+
     def _create_resource_leave(self, cr, uid, leaves, context=None):
         '''This method will create entry in resource calendar leave object at the time of holidays validated '''
         obj_res_leave = self.pool.get('resource.calendar.leaves')
@@ -188,6 +206,13 @@ class hr_holidays(osv.osv):
                 }
         return result
 
+    def onchange_employee(self, cr, uid, ids, employee_id):
+        result = {'value': {'department_id': False}}
+        if employee_id:
+            employee = self.pool.get('hr.employee').browse(cr, uid, employee_id)
+            result['value'] = {'department_id': employee.department_id.id}
+        return result
+
     # TODO: can be improved using resource calendar method
     def _get_number_of_days(self, date_from, date_to):
         """Returns a float equals to the timedelta between two dates given as string."""
@@ -201,29 +226,62 @@ class hr_holidays(osv.osv):
 
     def unlink(self, cr, uid, ids, context=None):
         for rec in self.browse(cr, uid, ids, context=context):
-            if rec.state<>'draft':
-                raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is not in draft state !'))
+            if rec.state not in ['draft', 'cancel', 'confirm']:
+                raise osv.except_osv(_('Warning!'),_('You cannot delete a leave which is in %s state.')%(rec.state))
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
 
     def onchange_date_from(self, cr, uid, ids, date_to, date_from):
-        result = {}
-        if date_to and date_from:
+        """
+        If there are no date set for date_to, automatically set one 8 hours later than
+        the date_from.
+        Also update the number_of_days.
+        """
+        # date_to has to be greater than date_from
+        if (date_from and date_to) and (date_from > date_to):
+            raise osv.except_osv(_('Warning!'),_('The start date must be anterior to the end date.'))
+
+        result = {'value': {}}
+
+        # No date_to set so far: automatically compute one 8 hours later
+        if date_from and not date_to:
+            date_to_with_delta = datetime.datetime.strptime(date_from, tools.DEFAULT_SERVER_DATETIME_FORMAT) + datetime.timedelta(hours=8)
+            result['value']['date_to'] = str(date_to_with_delta)
+
+        # Compute and update the number of days
+        if (date_to and date_from) and (date_from <= date_to):
             diff_day = self._get_number_of_days(date_from, date_to)
-            result['value'] = {
-                'number_of_days_temp': round(diff_day)+1
-            }
-            return result
-        result['value'] = {
-            'number_of_days_temp': 0,
-        }
+            result['value']['number_of_days_temp'] = round(math.floor(diff_day))+1
+        else:
+            result['value']['number_of_days_temp'] = 0
+
         return result
 
-    def onchange_status_id(self, cr, uid, ids, status_id, context=None):
-        double_validation = False
-        if status_id:
-            holiday_status = self.pool.get('hr.holidays.status').browse(cr, uid, status_id, context=context)
-            double_validation = holiday_status.double_validation
-        return {'value': {'double_validation': double_validation}}
+    def onchange_date_to(self, cr, uid, ids, date_to, date_from):
+        """
+        Update the number_of_days.
+        """
+
+        # date_to has to be greater than date_from
+        if (date_from and date_to) and (date_from > date_to):
+            raise osv.except_osv(_('Warning!'),_('The start date must be anterior to the end date.'))
+
+        result = {'value': {}}
+
+        # Compute and update the number of days
+        if (date_to and date_from) and (date_from <= date_to):
+            diff_day = self._get_number_of_days(date_from, date_to)
+            result['value']['number_of_days_temp'] = round(math.floor(diff_day))+1
+        else:
+            result['value']['number_of_days_temp'] = 0
+
+        return result
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        check_fnct = self.pool.get('hr.holidays.status').check_access_rights
+        for  holiday in self.browse(cr, uid, ids, context=context):
+            if holiday.state in ('validate','validate1') and not check_fnct(cr, uid, 'write', raise_exception=False):
+                raise osv.except_osv(_('Warning!'),_('You cannot modify a leave request that has been approved. Contact a human resource manager.'))
+        return super(hr_holidays, self).write(cr, uid, ids, vals, context=context)
 
     def set_to_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {
@@ -244,29 +302,30 @@ class hr_holidays(osv.osv):
             self.unlink(cr, uid, to_unlink, context=context)
         return True
 
-    def holidays_validate(self, cr, uid, ids, context=None):
+    def holidays_first_validate(self, cr, uid, ids, context=None):
         self.check_holidays(cr, uid, ids, context=context)
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
-        self.holidays_validate_notificate(cr, uid, ids, context=context)
+        self.holidays_first_validate_notificate(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'validate1', 'manager_id': manager})
 
-    def holidays_validate2(self, cr, uid, ids, context=None):
+    def holidays_validate(self, cr, uid, ids, context=None):
         self.check_holidays(cr, uid, ids, context=context)
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
         self.write(cr, uid, ids, {'state':'validate'})
         data_holiday = self.browse(cr, uid, ids)
-        holiday_ids = []
         for record in data_holiday:
-            if record.holiday_status_id.double_validation:
-                holiday_ids.append(record.id)
+            if record.double_validation:
+                self.write(cr, uid, [record.id], {'manager_id2': manager})
+            else:
+                self.write(cr, uid, [record.id], {'manager_id': manager})
             if record.holiday_type == 'employee' and record.type == 'remove':
                 meeting_obj = self.pool.get('crm.meeting')
                 meeting_vals = {
-                    'name': record.name,
+                    'name': record.name or _('Leave Request'),
                     'categ_ids': record.holiday_status_id.categ_id and [(6,0,[record.holiday_status_id.categ_id.id])] or [],
                     'duration': record.number_of_days_temp * 8,
                     'description': record.notes,
@@ -274,7 +333,7 @@ class hr_holidays(osv.osv):
                     'date': record.date_from,
                     'end_date': record.date_to,
                     'date_deadline': record.date_to,
-                    'state': 'done',            # to block that meeting date in the calendar
+                    'state': 'open',            # to block that meeting date in the calendar
                 }
                 meeting_id = meeting_obj.create(cr, uid, meeting_vals)
                 self._create_resource_leave(cr, uid, [record], context=context)
@@ -301,25 +360,27 @@ class hr_holidays(osv.osv):
                     wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'confirm', cr)
                     wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'validate', cr)
                     wf_service.trg_validate(uid, 'hr.holidays', leave_id, 'second_validate', cr)
-        if holiday_ids:
-            self.holidays_valid2_notificate(cr, uid, holiday_ids, context=context)
-            self.write(cr, uid, holiday_ids, {'manager_id2': manager})
+        self.holidays_validate_notificate(cr, uid, ids, context=context)
         return True
 
     def holidays_confirm(self, cr, uid, ids, context=None):
         self.check_holidays(cr, uid, ids, context=context)
+        for record in self.browse(cr, uid, ids, context=context):
+            if record.employee_id and record.employee_id.parent_id and record.employee_id.parent_id.user_id:
+                self.message_subscribe_users(cr, uid, [record.id], user_ids=[record.employee_id.parent_id.user_id.id], context=context)
         self.holidays_confirm_notificate(cr, uid, ids, context=context)
         return self.write(cr, uid, ids, {'state':'confirm'})
 
-    def holidays_refuse(self, cr, uid, ids, approval, context=None):
+    def holidays_refuse(self, cr, uid, ids, context=None):
         obj_emp = self.pool.get('hr.employee')
         ids2 = obj_emp.search(cr, uid, [('user_id', '=', uid)])
         manager = ids2 and ids2[0] or False
-        if approval == 'first_approval':
-            self.write(cr, uid, ids, {'state': 'refuse', 'manager_id': manager})
-        else:
-            self.write(cr, uid, ids, {'state': 'refuse', 'manager_id2': manager})
-        self.holidays_refuse_notificate(cr, uid, ids, approval, context=context)
+        for holiday in self.browse(cr, uid, ids, context=context):
+            if holiday.state == 'validate1':
+                self.write(cr, uid, [holiday.id], {'state': 'refuse', 'manager_id': manager})
+            else:
+                self.write(cr, uid, [holiday.id], {'state': 'refuse', 'manager_id2': manager})
+        self.holidays_refuse_notificate(cr, uid, ids, context=context)
         self.holidays_cancel(cr, uid, ids, context=context)
         return True
 
@@ -333,7 +394,7 @@ class hr_holidays(osv.osv):
             # If a category that created several holidays, cancel all related
             wf_service = netsvc.LocalService("workflow")
             for request in record.linked_request_ids or []:
-                wf_service.trg_validate(uid, 'hr.holidays', request.id, 'cancel', cr)
+                wf_service.trg_validate(uid, 'hr.holidays', request.id, 'refuse', cr)
 
         self._remove_resource_leave(cr, uid, ids, context=context)
         return True
@@ -347,68 +408,50 @@ class hr_holidays(osv.osv):
                     if leaves_rest < record.number_of_days_temp:
                         raise osv.except_osv(_('Warning!'), _('There are not enough %s allocated for employee %s; please create an allocation request for this leave type.') % (record.holiday_status_id.name, record.employee_id.name))
         return True
-    
+
     # -----------------------------
     # OpenChatter and notifications
     # -----------------------------
-    
-    def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        result = super(hr_holidays, self).get_needaction_user_ids(cr, uid, ids, context=context)
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.state == 'confirm' and obj.employee_id.parent_id:
-                result[obj.id] = [obj.employee_id.parent_id.user_id.id]
-            elif obj.state == 'validate1':
-                # get group_hr_manager: everyone will be warned of second validation
-                res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_hr_manager') or False
-                obj_id = res and res[1] or False
-                if obj_id:
-                    hr_manager_group = self.pool.get('res.groups').read(cr, uid, [obj_id], ['users'], context=context)[0]
-                    result[obj.id] = hr_manager_group['users']
-        return result
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' and 'manager' to the monitored fields """
-        res = super(hr_holidays, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        # TODO: add manager
-        return res + ['user_id']
-        
+    def needaction_domain_get(self, cr, uid, ids, context=None):
+        emp_obj = self.pool.get('hr.employee')
+        empids = emp_obj.search(cr, uid, [('parent_id.user_id', '=', uid)], context=context)
+        dom = ['&', ('state', '=', 'confirm'), ('employee_id', 'in', empids)]
+        # if this user is a hr.manager, he should do second validations
+        if self.pool.get('res.users').has_group(cr, uid, 'base.group_hr_manager'):
+            dom = ['|'] + dom + [('state', '=', 'validate1')]
+        return dom
+
     def create_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, ids, _('System notification'),
-                        _("The %s request has been <b>created</b> and is waiting confirmation.")
-                        % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+            self.message_post(cr, uid, ids,
+                _("Request <b>created</b>, waiting confirmation."), context=context)
         return True
-    
+
     def holidays_confirm_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
-            self.message_append_note(cr, uid, [obj.id], _('System notification'), 
-                    _("The %s request has been <b>confirmed</b> and is waiting for validation by the manager.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification')
-    
+            self.message_post(cr, uid, [obj.id],
+                _("Request <b>submitted</b>, waiting for validation by the manager."), context=context)
+
+    def holidays_first_validate_notificate(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_post(cr, uid, [obj.id],
+                _("Request <b>approved</b>, waiting second validation."), context=context)
+
     def holidays_validate_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
-            if obj.holiday_status_id.double_validation:
-                self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>approved</b>. A second validation is necessary and is now pending.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
+            if obj.double_validation:
+                self.message_post(cr, uid, [obj.id],
+                    _("Request <b>validated</b>."), context=context)
             else:
-                self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>approved</b>. The validation process is now over.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
-    
-    def holidays_valid2_notificate(self, cr, uid, ids, context=None):
+                self.message_post(cr, uid, [obj.id],
+                    _("The request has been <b>approved</b>."), context=context)
+
+    def holidays_refuse_notificate(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids):
-            self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>double validated</b>. The validation process is now over.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
-    
-    def holidays_refuse_notificate(self, cr, uid, ids, approval, context=None):
-        for obj in self.browse(cr, uid, ids):
-            self.message_append_note(cr, uid, [obj.id], _('System notification'),
-                    _("The %s request has been <b>refused</b>. The validation process is now over.")
-                    % ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
-    
-hr_holidays()
+            self.message_post(cr, uid, [obj.id],
+                _("Request <b>refused</b>"), context=context)
+
 
 class resource_calendar_leaves(osv.osv):
     _inherit = "resource.calendar.leaves"
@@ -458,10 +501,10 @@ class hr_employee(osv.osv):
     def _get_remaining_days(self, cr, uid, ids, name, args, context=None):
         cr.execute("""SELECT
                 sum(h.number_of_days) as days,
-                h.employee_id 
+                h.employee_id
             from
                 hr_holidays h
-                join hr_holidays_status s on (s.id=h.holiday_status_id) 
+                join hr_holidays_status s on (s.id=h.holiday_status_id)
             where
                 h.state='validate' and
                 s.limit=False and
@@ -476,9 +519,9 @@ class hr_employee(osv.osv):
                 remaining[employee_id] = 0.0
         return remaining
 
-    def _get_leave_status(self, cr, uid, ids, name, args, context=None):       
+    def _get_leave_status(self, cr, uid, ids, name, args, context=None):
         holidays_obj = self.pool.get('hr.holidays')
-        holidays_id = holidays_obj.search(cr, uid, 
+        holidays_id = holidays_obj.search(cr, uid,
            [('employee_id', 'in', ids), ('date_from','<=',time.strftime('%Y-%m-%d %H:%M:%S')),
            ('date_to','>=',time.strftime('%Y-%m-%d 23:59:59')),('type','=','remove'),('state','not in',('cancel','refuse'))],
            context=context)
@@ -504,7 +547,7 @@ class hr_employee(osv.osv):
             ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')]),
         'current_leave_id': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Type",type='many2one', relation='hr.holidays.status'),
         'leave_date_from': fields.function(_get_leave_status, multi='leave_status', type='date', string='From Date'),
-        'leave_date_to': fields.function(_get_leave_status, multi='leave_status', type='date', string='To Date'),        
+        'leave_date_to': fields.function(_get_leave_status, multi='leave_status', type='date', string='To Date'),
     }
 
 hr_employee()
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index 9db0f2e987a..5af0c60fc44 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -1,24 +1,22 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
-        <record id="hr.todo_open_hr_menu" model="ir.actions.todo">
-            <field name="state">done</field>
-        </record>
-    </data>
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
-        <record id="todo_open_hr_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="hr.action_client_hr_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
         </record>
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Leaves Management has been installed</value>
-            <value>Manage employee leaves from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR people.  Once validated, they are visible in the employee's calendar.  HR people can define leave types and allocate off-days for employees.</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Leave Management application installed!</field>
+            <field name="body"><![CDATA[<p>Manage employee leaves from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR officers.</p>
+<p>Once validated, they are visible in the employee's calendar. HR officers can define leave types and allocate leaves to employees and employee categories.</p>]]></field>
+        </record>
+
 
         <!-- Casual leave -->
         <record model="hr.holidays.status" id="holiday_status_cl">
diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml
index 6ad5a442a38..accf8c26935 100644
--- a/addons/hr_holidays/hr_holidays_demo.xml
+++ b/addons/hr_holidays/hr_holidays_demo.xml
@@ -12,7 +12,7 @@
 
     <record model="hr.holidays" id="hr_holidays_employee1_cl">
       <field name="name">Trip with Family</field>
-      <field name="holiday_status_id" ref="holiday_status_cl"/>
+      <field name="holiday_status_id" ref="holiday_status_comp"/>
       <field eval="time.strftime('%Y-%m-01')" name="date_from"/>
       <field eval="time.strftime('%Y-%m-03')" name="date_to"/>
       <field name="type">remove</field>
@@ -34,8 +34,8 @@
     <record model="hr.holidays" id="hr_holidays_employee1_vc">
       <field name="name">Summer Vacation</field>
       <field name="holiday_status_id" ref="holiday_status_unpaid"/>
-      <field eval="time.strftime('%Y-%m-20')" name="date_from"/>
-      <field eval="time.strftime('%Y-%m-22')" name="date_to"/>
+      <field eval="time.strftime('%Y-%m-23')" name="date_from"/>
+      <field eval="time.strftime('%Y-%m-25')" name="date_to"/>
       <field name="type">add</field>
       <field name="state">draft</field>
       <field name="number_of_days_temp">7</field>
@@ -45,20 +45,17 @@
     <record model="hr.holidays" id="hr_holidays_employee1_int_tour">
       <field name="name">International Tour</field>
       <field name="holiday_status_id" ref="holiday_status_comp"/>
-      <field eval="time.strftime('%Y-%m-20')" name="date_from"/>
-      <field eval="time.strftime('%Y-%m-22')" name="date_to"/>
+      <field eval="time.strftime('%Y-%m-26')" name="date_from"/>
+      <field eval="time.strftime('%Y-%m-28')" name="date_to"/>
       <field name="type">add</field>
       <field name="number_of_days_temp">7</field>
       <field name="employee_id" ref="hr.employee_fp"/>
     </record>
 
-    <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
     <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_allocation_cl"/>
 
-    <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
     <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_sl"/>
 
-    <workflow action="confirm" model="hr.holidays" ref="hr_holidays_employee1_int_tour"/>
     <workflow action="validate" model="hr.holidays" ref="hr_holidays_employee1_int_tour"/>
   </data>
 </openerp>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 711d07bbfe8..752d278baed 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -8,14 +8,14 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_holidays"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_holidays_unread" model="ir.values">
             <field name="name">action_holidays_unread</field>
             <field name="action_id" ref="actions_server_holidays_unread"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_holidays_unread'))" />
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_holidays_unread'))"/>
             <field name="key">action</field>
-            <field name="model_id" ref="model_hr_holidays" />
+            <field name="model_id" ref="model_hr_holidays"/>
             <field name="model">hr.holidays</field>
             <field name="key2">client_action_multi</field>
         </record>
@@ -26,14 +26,14 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_holidays"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_holidays_read" model="ir.values">
             <field name="name">action_holidays_read</field>
             <field name="action_id" ref="actions_server_holidays_read"/>
-            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_holidays_read'))" />
+            <field name="value" eval="'ir.actions.server,' + str(ref('actions_server_holidays_read'))"/>
             <field name="key">action</field>
-            <field name="model_id" ref="model_hr_holidays" />
+            <field name="model_id" ref="model_hr_holidays"/>
             <field name="model">hr.holidays</field>
             <field name="key2">client_action_multi</field>
         </record>
@@ -44,10 +44,9 @@
             <field name="arch" type="xml">
                 <search string="Search Leave">
                     <field name="date_from"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" domain="[('state','=','draft')]" string="To Confirm"/>
-                    <filter icon="terp-camera_test" domain="[('state','=','confirm')]" string="To Approve" name="approve"/>
+                    <filter icon="terp-camera_test" domain="[('state','in',('confirm','validate1'))]" string="To Approve" name="approve"/>
                     <filter icon="terp-camera_test" domain="[('state','=','validate')]" string="Validated" name="validated"/>
                     <separator/>
                     <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
@@ -84,60 +83,46 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="edit_holiday_new">
+        <record id="edit_holiday_new" model="ir.ui.view">
             <field name="name">Leave Request</field>
             <field name="model">hr.holidays</field>
             <field name="priority">1</field>
             <field name="arch" type="xml">
                 <form string="Leave Request" version="7.0">
                 <header>
-                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager" class="oe_highlight"/>
-                    <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user" />
+                    <button string="Refuse" name="refuse" states="confirm,validate1,validate" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Reset to New" name="set_to_draft" states="refuse" type="object" groups="base.group_hr_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet string="Leave Request">
                     <group>
                         <group>
                             <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
-                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
-                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
-                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
-                        </group>
-                        <group>
-                            <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                            <label for="number_of_days_temp" string="Duration"/>
+                            <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
+                            <label for="number_of_days_temp" string="Duration" help="The default duration interval between the start date and the end date is 8 hours.  Feel free to adapt it to your needs."/>
                             <div>
-                                <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/> - 
-                                <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/>
+                                <group col="3">
+                                    <field name="date_from" nolabel="1" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/><label string="-" class="oe_inline"/>
+                                    <field name="date_to" nolabel="1" on_change="onchange_date_to(date_to, date_from)" required="1" class="oe_inline"/>
+                                </group>
                                 <div>
                                     <field name="number_of_days_temp" class="oe_inline"/> days
                                 </div>
                             </div>
+                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
+                        </group>
+                        <group>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
+                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" on_change="onchange_employee(employee_id)" groups="base.group_hr_user"/>
+                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>
                     </group>
-                    <notebook colspan="4">
-                        <page string="General">
-                            <group>
-                                <group>
-                                    <field name="manager_id" groups="base.group_no_one"/>
-                                    <field name="double_validation" invisible="1"/>
-                                </group>
-                                <group>
-                                    <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
-                                </group>
-                            </group>
-                            <newline/>
-                            <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
-                        </page>
-                    </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
@@ -150,41 +135,31 @@
             <field name="arch" type="xml">
                 <form string="Allocation Request" version="7.0">
                 <header>
-                    <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
-                    <button string="Reset to New" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user" />
+                    <button string="Refuse" name="refuse" states="confirm,validate,validate1" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Reset to New" name="set_to_draft" states="cancel,refuse" type="object" groups="base.group_hr_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet>
                     <group>
                         <group>
-                            <field name="name"/>
-                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
-                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
-                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/>
-                            <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
-                        </group>
-                        <group>
-                            <field name="holiday_status_id" on_change="onchange_status_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <field name="name" required="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
+                            <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
                             <field name="number_of_days_temp"/>
                         </group>
+                        <group>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)"/>
+                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
+                            <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')]}"/>
+                            <field name="department_id" attrs="{'invisible':[('holiday_type','=','category')]}"/>
+                        </group>
                     </group>
-                    <notebook>
-                        <page string="General">
-                            <group col="4">
-                                <field name="double_validation" invisible="1"/>
-                                <field name="manager_id"/>
-                                <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
-                            </group>
-                            <field name="notes" placeholder="Add a reason..."/>
-                        </page>
-                    </notebook>
+                    <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
@@ -194,8 +169,7 @@
             <field name="name">hr.holidays.allocation.tree</field>
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == 'draft';black:state in ('confirm','validate','validate1')" string="Allocation Requests">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree colors="red:state == 'refuse';blue:state == 'draft';black:state in ('confirm','validate','validate1')" string="Allocation Requests">
                     <field name="employee_id"/>
                     <field name="holiday_type"/>
                     <field name="category_id"/>
@@ -225,7 +199,6 @@
                         <field name="state"/>
                     </header>
                     <group col="4">
-                        <field name="name"/>
                         <field name="holiday_status_id"/>
                         <field name="type"/>
                         <field name="date_from" on_change="onchange_date_from(date_to, date_from)" attrs="{'readonly':[('type','=','add')], 'required':[('type','=','remove')]}"/>
@@ -233,7 +206,7 @@
                         <field name="number_of_days_temp"/>
                         <field name="manager_id"/>
                     </group>
-                    <field name="notes"/>
+                    <field name="name" placeholder="Add a reason..."/>
                 </form>
             </field>
         </record>
@@ -243,8 +216,7 @@
             <field name="model">hr.holidays</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leaves Summary">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leaves Summary">
                     <field name="employee_id"/>
                     <field name="category_id" invisible="1"/>
                     <field name="department_id" invisible="1"/>
@@ -261,13 +233,11 @@
             </field>
         </record>
 
-
         <record model="ir.ui.view" id="view_holiday">
             <field name="name">hr.holidays.tree</field>
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leave Requests">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leave Requests">
                     <field name="employee_id"/>
                     <field name="holiday_type" string="Mode" groups="base.group_hr_user"/>
                     <field name="name"/>
@@ -280,7 +250,6 @@
                     <field name="holiday_status_id" invisible="1"/>
                     <field name="manager_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
-                    <!--field name="type"/-->
                 </tree>
             </field>
         </record>
@@ -288,16 +257,16 @@
         <menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="20"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
-            <field name="name">Leave Requests</field>
+            <field name="name">My Leave Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="edit_holiday_new"/>
             <field name="context">{}</field>
-            <field name="domain">[('type','=','remove')]</field>
+            <field name="domain">[('type','=','remove'),('employee_id.user_id','=', uid)]</field>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to create a new leave request. 
+                Click to create a new leave request.
               </p><p>
                 Once you have recorded your leave request, it will be sent
                 to a manager for validation. Be sure to set the right leave
@@ -357,11 +326,11 @@
         <menuitem name="Leave Requests to Approve" parent="menu_open_ask_holidays" id="menu_request_approve_holidays" action="request_approve_holidays" groups="base.group_hr_user"/>
 
         <record model="ir.actions.act_window" id="open_allocation_holidays">
-            <field name="name">Allocation Requests</field>
+            <field name="name">My Allocation Requests</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="context">{'default_type':'add'}</field>
-            <field name="domain">[('type','=','add')]</field>
+            <field name="domain">[('type','=','add'),('employee_id.user_id','=', uid)]</field>
             <field name="view_id" ref="allocation_leave_new"/>
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
@@ -380,7 +349,33 @@
             <field name="act_window_id" ref="open_allocation_holidays"/>
         </record>
 
-        <menuitem name="Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/>
+        <menuitem name="My Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/>
+
+        <record model="ir.actions.act_window" id="request_approve_allocation">
+            <field name="name">Allocation Requests to Approve</field>
+            <field name="res_model">hr.holidays</field>
+            <field name="view_type">form</field>
+            <field name="context">{'default_type': 'add', 'search_default_approve':1}</field>
+            <field name="domain">[('type','=','add')]</field>
+            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="search_view_id" ref="view_hr_holidays_filter"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_request_approve_allocation_tree">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_holiday_allocation_tree"/>
+            <field name="act_window_id" ref="request_approve_allocation"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_request_approve_allocation_form">
+            <field name="sequence" eval="2"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="act_window_id" ref="request_approve_allocation"/>
+        </record>
+
+        <menuitem parent="menu_open_ask_holidays" id="menu_request_approve_allocation" action="request_approve_allocation" groups="base.group_hr_manager"/>
 
         <record model="ir.actions.act_window" id="open_company_allocation">
             <field name="name">Leaves Summary</field>
@@ -395,7 +390,7 @@
 
         <menuitem name="Leaves Summary" parent="menu_open_ask_holidays" id="menu_open_company_allocation" action="open_company_allocation" sequence="40"/>
 
-        <!-- holidays status -->
+        <!-- Holidays status -->
         <record id="view_holidays_status_filter" model="ir.ui.view">
             <field name="name">hr.holidays.status.filter</field>
             <field name="model">hr.holidays.status</field>
@@ -446,6 +441,7 @@
                 </tree>
             </field>
         </record>
+
         <record model="ir.ui.view" id="view_holiday_status_normal_tree">
             <field name="name">hr.holidays.status.normal.tree</field>
             <field name="model">hr.holidays.status</field>
@@ -470,7 +466,7 @@
         </record>
 
         <record id="open_view_holiday_status" model="ir.actions.act_window">
-            <field name="name">Leave Type</field>
+            <field name="name">Leave Types</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays.status</field>
             <field name="view_type">form</field>
@@ -480,9 +476,9 @@
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
-        <menuitem name="Leave Type" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10" />
+        <menuitem name="Leave Type" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10"/>
 
-    <!-- holiday on resource leave -->
+        <!-- Holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
             <field name="name">resource.calendar.leaves.form.inherit</field>
             <field name="model">resource.calendar.leaves</field>
@@ -494,7 +490,7 @@
             </field>
         </record>
 
-    <!--  Shortcuts -->
+        <!-- Shortcuts -->
         <record id="act_hr_employee_holiday_request" model="ir.actions.act_window">
             <field name="name">Leaves</field>
             <field name="type">ir.actions.act_window</field>
@@ -507,11 +503,11 @@
             <field name="view_id" eval="view_holiday"/>
         </record>
 
-       <!--  Assing leave       -->
-
+       <!-- Assing leave -->
         <record id="hr_holidays_leaves_assign_tree_view" model="ir.ui.view">
             <field name="name">hr.employee.leave.tree</field>
             <field name="model">hr.employee</field>
+            <field name="priority" eval="20"/>
             <field name="arch" type="xml">
                 <tree string="Assign Leaves" editable="bottom">
                     <field name="name" string="Employee"/>
@@ -536,19 +532,22 @@
        </record>
 
         <!-- Hr employee inherit Legal Leaves -->
-
         <record id="view_employee_form_leave_inherit" model="ir.ui.view">
             <field name="name">hr.employee.leave.form.inherit</field>
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <field name="active" position="before">
-                    <label for="remaining_leaves"/>
-                    <div>
-                        <field name="remaining_leaves" class="oe_inline"/>
-                        <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline oe_right"/>
-                    </div>
-                </field>
+                <xpath expr="//group[@name='active_group']" position="before">
+                    <group string="Leaves">
+                        <label for="remaining_leaves"/>
+                        <div>
+                            <field name="remaining_leaves" class="oe_inline"/>
+                        </div>
+                    </group>
+                </xpath>
+                <xpath expr="//div[@name='button_box']" position="inside">
+                    <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" groups="base.group_hr_user"/>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
index 7013d62a5ed..a2e1d54f96c 100644
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ b/addons/hr_holidays/hr_holidays_workflow.xml
@@ -2,7 +2,16 @@
 <openerp>
 <data>
 
-    <!-- Workflow definition -->
+    <!-- Workflow definition 
+        1. draft->submitted (no signal)
+        2. submitted->accepted (validate signal) if not double_validation
+        2. submitted -> first_accepted (validate signal) if double_validation
+        2. submitted->refused (refuse signal)
+        3. accepted->refused (refuse signal)
+        4. first_accepted -> accepted (second_validate  signal)
+        4. first_accepted -> refused (refuse signal)
+
+    -->
 
     <record model="workflow" id="wkf_holidays">
         <field name="name">hr.wkf.holidays</field>
@@ -10,13 +19,13 @@
         <field name="on_create">True</field>
     </record>
 
-    <record model="workflow.activity" id="act_draft">
+    <record model="workflow.activity" id="act_draft"> <!-- draft -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="flow_start">True</field>
         <field name="name">draft</field>
     </record>
 
-    <record model="workflow.activity" id="act_confirm">
+    <record model="workflow.activity" id="act_confirm"> <!-- submitted -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">confirm</field>
         <field name="kind">function</field>
@@ -24,74 +33,94 @@
         <field name="split_mode">OR</field>
     </record>
 
-    <record model="workflow.activity" id="act_validate">
+    <record model="workflow.activity" id="act_validate"> <!-- accepted -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">validate</field>
         <field name="kind">function</field>
         <field name="action">holidays_validate()</field>
     </record>
 
-    <record model="workflow.activity" id="act_validate1">
+    <record model="workflow.activity" id="act_validate1"> <!-- first_accepted -->
         <field name="wkf_id" ref="wkf_holidays" />
-        <field name="name">second_validate</field>
+        <field name="name">first_validate</field>
         <field name="kind">function</field>
-        <field name="action">holidays_validate2()</field>
+        <field name="action">holidays_first_validate()</field>
+        <field name="split_mode">OR</field>
     </record>
 
 
-    <record model="workflow.activity" id="act_refuse">
+    <record model="workflow.activity" id="act_refuse"> <!-- refused -->
         <field name="wkf_id" ref="wkf_holidays" />
         <field name="name">refuse</field>
         <field name="flow_stop">True</field>
-        <field name="kind">stopall</field>
+        <field name="kind">function</field>
+        <field name="action">holidays_refuse()</field>
     </record>
 
     <!--
         workflow transition
     -->
 
-    <record model="workflow.transition" id="t1">
+    <record model="workflow.transition" id="holiday_draft2confirm"> <!-- 1. draft->submitted (no signal) -->
         <field name="act_from" ref="act_draft" />
         <field name="act_to" ref="act_confirm" />
-        <field name="signal">confirm</field>
     </record>
 
-    <record model="workflow.transition" id="t2">
+    <record model="workflow.transition" id="holiday_confirm2validate"> <!-- 2. submitted->accepted (validate signal) if not double_validation-->
         <field name="act_from" ref="act_confirm" />
         <field name="act_to" ref="act_validate" />
         <field name="signal">validate</field>
+        <field name="condition">not double_validation</field>
+        <field name="group_id" ref="base.group_hr_user"/>
+    </record>
+
+    <record model="workflow.transition" id="holiday_confirm2validate1"> <!-- 2. submitted -> first_accepted (validate signal) if double_validation-->
+        <field name="act_from" ref="act_confirm" />
+        <field name="act_to" ref="act_validate1" />
+        <field name="condition">double_validation</field>
+        <field name="group_id" ref="base.group_hr_user"/>
+    </record>
+
+
+    <record model="workflow.transition" id="holiday_confirm2refuse"> <!-- 2. submitted->refused (refuse signal) -->
+        <field name="act_from" ref="act_confirm" />
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
         <field name="condition">True</field>
         <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
-    <record model="workflow.transition" id="t3">
-        <field name="act_from" ref="act_confirm" />
-        <field name="act_to" ref="act_refuse" />
-        <field name="signal">refuse</field>
-        <field name="condition">holidays_refuse('first_approval')</field>
-        <field name="group_id" ref="base.group_hr_user"/>
-    </record>
-
-    <record model="workflow.transition" id="t4">
+    <record model="workflow.transition" id="holiday_validate2refuse"> <!-- 3. accepted->refused (refuse signal) -->
         <field name="act_from" ref="act_validate" />
         <field name="act_to" ref="act_refuse" />
         <field name="signal">refuse</field>
-        <field name="condition">holidays_refuse('second_approval')</field>
+        <field name="condition">True</field>
         <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
-    <record model="workflow.transition" id="t8">
+    <record model="workflow.transition" id="holiday_validate2refuse"> <!-- 3. accepted->refused (refuse signal) -->
         <field name="act_from" ref="act_validate" />
-        <field name="act_to" ref="act_validate1" />
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
+        <field name="condition">True</field>
+        <field name="group_id" ref="base.group_hr_user"/>
+    </record>
+
+
+    <record model="workflow.transition" id="holiday_validate1_validate"> <!-- 4. first_accepted -> accepted (second_validate  signal) -->
+        <field name="act_from" ref="act_validate1" />
+        <field name="act_to" ref="act_validate" />
+        <field name="condition">True</field>
         <field name="signal">second_validate</field>
-        <field name="group_id" ref="base.group_hr_manager" />
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
-    <record model="workflow.transition" id="t11">
-        <field name="act_from" ref="act_validate" />
-        <field name="act_to" ref="act_validate1" />
-        <field name="condition">not holiday_status_id.double_validation</field>
-        <field name="signal" eval="False"/>
+    <record model="workflow.transition" id="holiday_validate1_refuse"> <!-- 4. first_accepted->refused (refuse signal) -->
+        <field name="act_from" ref="act_validate1" />
+        <field name="act_to" ref="act_refuse" />
+        <field name="signal">refuse</field>
+        <field name="condition">True</field>
+        <field name="group_id" ref="base.group_hr_user"/>
     </record>
 
 </data>
diff --git a/addons/hr_holidays/i18n/ar.po b/addons/hr_holidays/i18n/ar.po
index bba9e481509..40a8ff2f23e 100644
--- a/addons/hr_holidays/i18n/ar.po
+++ b/addons/hr_holidays/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr "نوع التوزيع"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "في انتظار الموافقة الثانية"
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr "وضع تخصيص"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "الإدارة"
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr "الموافقة على الطلبات"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "مرفوض"
 
@@ -74,7 +77,7 @@ msgstr "تصنيف الموظف"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid " Month-1"
-msgstr ""
+msgstr " شهر - ١"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -138,7 +141,8 @@ msgid "Summary Of Leaves"
 msgstr "ملخص الاجازات"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "مقبول"
@@ -202,7 +206,8 @@ msgid "Leaves by Department"
 msgstr "اجازة حسب الإدارة"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "ملغي"
 
@@ -254,7 +259,8 @@ msgstr "هذه المنطقة تملأ بشكل آلي عن طريق المست
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -281,8 +287,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "لديك لتحديد ما لا يقل عن قسم ١. وحاول مرة اخرى"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "مؤكد"
 
@@ -309,7 +317,8 @@ msgid "Remaining Leaves"
 msgstr "الاجازات المتبقية"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "الحالة"
 
@@ -319,14 +328,17 @@ msgid "Total holidays by type"
 msgstr "المجموع الكلي للأجازات حسب النوع"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "موظف"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr "جديد"
 
@@ -367,7 +379,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "عدد الأيام"
@@ -403,7 +416,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "في انتظار الموافقة"
 
@@ -437,6 +451,7 @@ msgid "Lavender"
 msgstr "ارجواني"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr "شهر"
@@ -460,7 +475,8 @@ msgid "Employee's Holidays"
 msgstr "اجازات الموظفين"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "الفئة"
 
@@ -503,7 +519,8 @@ msgid "Holiday"
 msgstr "عطلة"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "إجتماع"
 
@@ -545,7 +562,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "خطأ ! لايمكنك انشاء تسلسل هرمي عودي  للعاملين"
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr "المغادرات القانونية المتبقية"
 
@@ -626,7 +644,8 @@ msgid "Compensatory Days"
 msgstr "أيام التعويضية"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "الأسباب"
 
@@ -637,7 +656,8 @@ msgid "Leaves Analysis"
 msgstr "تحليل الاجازة"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "إلغاء"
 
@@ -650,13 +670,17 @@ msgstr ""
 "سيتستخدم هذا اللون في ملخص الاجازات الموجود في التقرير/اجازات حسب الإدارة"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "تم التحقق"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "طلب التوزيع"
 
@@ -672,7 +696,8 @@ msgid "Apply Double Validation"
 msgstr "قم بالتحقق من صلاحية الازدواج"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "طباعة"
 
@@ -693,7 +718,8 @@ msgid "By Employee Category"
 msgstr "حسب تصنيف الموظف"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "طلب الاجازة"
 
@@ -818,7 +844,8 @@ msgid "Approve"
 msgstr "تصديق"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "تاريخ البدء"
 
diff --git a/addons/hr_holidays/i18n/bg.po b/addons/hr_holidays/i18n/bg.po
index 39e8d55e5a3..a80223468f8 100644
--- a/addons/hr_holidays/i18n/bg.po
+++ b/addons/hr_holidays/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "Чакащи второ одобрение"
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Отдел"
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Отказана"
 
@@ -133,7 +136,8 @@ msgid "Summary Of Leaves"
 msgstr "Обобщена информация за Отпуски"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Одобрена"
@@ -190,7 +194,8 @@ msgid "Leaves by Department"
 msgstr "Напускащи по отдел"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Отказанa"
 
@@ -238,7 +243,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -265,8 +271,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Потвърден"
 
@@ -293,7 +301,8 @@ msgid "Remaining Leaves"
 msgstr "Оставащи отпуски"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Състояние"
 
@@ -303,14 +312,17 @@ msgid "Total holidays by type"
 msgstr "Общо отпуски по тип"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Служител"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -351,7 +363,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Брой дни"
@@ -387,7 +400,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Чака одобрение"
 
@@ -419,6 +433,7 @@ msgid "Lavender"
 msgstr "Светлолилав"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -442,7 +457,8 @@ msgid "Employee's Holidays"
 msgstr "Празници на служител"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Категория"
 
@@ -485,7 +501,8 @@ msgid "Holiday"
 msgstr "Ваканция"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Среща"
 
@@ -527,7 +544,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -607,7 +625,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Причини"
 
@@ -618,7 +637,8 @@ msgid "Leaves Analysis"
 msgstr "Анализи на Отпуски"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Отказ"
 
@@ -630,13 +650,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Проверен"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -652,7 +676,8 @@ msgid "Apply Double Validation"
 msgstr "Прилагане на двойно одобрение"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Печат"
 
@@ -673,7 +698,8 @@ msgid "By Employee Category"
 msgstr "По категория на служител"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Молба за отпуск"
 
@@ -794,7 +820,8 @@ msgid "Approve"
 msgstr "Одобри"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Начална дата"
 
diff --git a/addons/hr_holidays/i18n/bs.po b/addons/hr_holidays/i18n/bs.po
index b61a1596772..9ee39fca2e5 100644
--- a/addons/hr_holidays/i18n/bs.po
+++ b/addons/hr_holidays/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr ""
 
@@ -133,7 +136,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr ""
@@ -190,7 +194,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -238,7 +243,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -265,8 +271,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr ""
 
@@ -293,7 +301,8 @@ msgid "Remaining Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -303,14 +312,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -351,7 +363,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr ""
@@ -387,7 +400,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -419,6 +433,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -442,7 +457,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -485,7 +501,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -527,7 +544,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -607,7 +625,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -618,7 +637,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr ""
 
@@ -630,13 +650,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -652,7 +676,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr ""
 
@@ -673,7 +698,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -794,7 +820,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/ca.po b/addons/hr_holidays/i18n/ca.po
index fb05ef9d7e3..372dd476f81 100644
--- a/addons/hr_holidays/i18n/ca.po
+++ b/addons/hr_holidays/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr "Tipus d'assignació"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "A l'espera de segona aprovació"
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Departament"
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Rebutjada"
 
@@ -140,7 +143,8 @@ msgid "Summary Of Leaves"
 msgstr "Resum d'absències"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Aprovada"
@@ -199,7 +203,8 @@ msgid "Leaves by Department"
 msgstr "Ausencias por departamento"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Cancel·lat"
 
@@ -250,7 +255,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -277,8 +283,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "Heu de seleccionar almenys 1 departament. I intenteu de nou."
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Confirmat"
 
@@ -305,7 +313,8 @@ msgid "Remaining Leaves"
 msgstr "Vacances disponibles"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Estat"
 
@@ -315,14 +324,17 @@ msgid "Total holidays by type"
 msgstr "Total absències per tipus"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Empleat"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -365,7 +377,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Número de dies"
@@ -401,7 +414,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Esperant aprovació"
 
@@ -435,6 +449,7 @@ msgid "Lavender"
 msgstr "Lavanda"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -458,7 +473,8 @@ msgid "Employee's Holidays"
 msgstr "Absències de l'empleat"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Categoria"
 
@@ -503,7 +519,8 @@ msgid "Holiday"
 msgstr "Absències"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Reunió"
 
@@ -545,7 +562,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -627,7 +645,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Raons"
 
@@ -638,7 +657,8 @@ msgid "Leaves Analysis"
 msgstr "Anàlisi d'absències"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -652,13 +672,17 @@ msgstr ""
 "Absències per departament"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Validat"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Petició d'assignació"
 
@@ -674,7 +698,8 @@ msgid "Apply Double Validation"
 msgstr "Aplica doble validació"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Imprimeix"
 
@@ -695,7 +720,8 @@ msgid "By Employee Category"
 msgstr "Per categoria d'empleat"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Petició d'absència"
 
@@ -823,7 +849,8 @@ msgid "Approve"
 msgstr "Aprova"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Data d'inici"
 
diff --git a/addons/hr_holidays/i18n/cs.po b/addons/hr_holidays/i18n/cs.po
index 1a8f859dac9..b68eb097767 100644
--- a/addons/hr_holidays/i18n/cs.po
+++ b/addons/hr_holidays/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_holidays
@@ -29,7 +29,8 @@ msgid "Allocation Type"
 msgstr "Typ přidělení"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "Čekající na druhé schválení"
 
@@ -54,7 +55,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Oddělení"
 
@@ -64,7 +66,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Odmítnuto"
 
@@ -141,7 +144,8 @@ msgid "Summary Of Leaves"
 msgstr "Souhrn uvolnění"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Scháleno"
@@ -200,7 +204,8 @@ msgid "Leaves by Department"
 msgstr "Uvolnění podle oddělení"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Zrušeno"
 
@@ -251,7 +256,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -278,8 +284,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "Musíte vybrat nejméně jedno oddělení. A zkuste znova"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Potvrzeno"
 
@@ -306,7 +314,8 @@ msgid "Remaining Leaves"
 msgstr "Zbývajících uvolnění"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Stav"
 
@@ -316,14 +325,17 @@ msgid "Total holidays by type"
 msgstr "Celkem dovolených podle typu"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Zaměstnanec"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -365,7 +377,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Počet dní"
@@ -401,7 +414,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Čekající na schválení"
 
@@ -435,6 +449,7 @@ msgid "Lavender"
 msgstr "Levandulová"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -458,7 +473,8 @@ msgid "Employee's Holidays"
 msgstr "Dovolené zaměstnanců"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Kategorie"
 
@@ -503,7 +519,8 @@ msgid "Holiday"
 msgstr "Dovolená"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Setkání"
 
@@ -545,7 +562,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -627,7 +645,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Důvody"
 
@@ -638,7 +657,8 @@ msgid "Leaves Analysis"
 msgstr "Analýza uvolnění"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -652,13 +672,17 @@ msgstr ""
 "podle oddělení"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Ověřeno"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Požadavek na přidělení"
 
@@ -674,7 +698,8 @@ msgid "Apply Double Validation"
 msgstr "Použít dvojté ověření"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Tisk"
 
@@ -695,7 +720,8 @@ msgid "By Employee Category"
 msgstr "Podle kategorie zaměstnance"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Požavek na uvolnění"
 
@@ -822,7 +848,8 @@ msgid "Approve"
 msgstr "Schválit"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Počáteční datum"
 
diff --git a/addons/hr_holidays/i18n/da.po b/addons/hr_holidays/i18n/da.po
index 68aed1263ab..4dc594e0442 100644
--- a/addons/hr_holidays/i18n/da.po
+++ b/addons/hr_holidays/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr ""
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr ""
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr ""
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr ""
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr ""
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr ""
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po
index 39a3e53e210..69f17e4d33b 100644
--- a/addons/hr_holidays/i18n/de.po
+++ b/addons/hr_holidays/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr "Typ Anspruch"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "Zweite Genehmigung"
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr "Zuteilungsmethode"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Abteilung"
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr "Anfragen Genehmigung"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Abgelehnt"
 
@@ -141,7 +144,8 @@ msgid "Summary Of Leaves"
 msgstr "Überblick Urlaub"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Genehmigt"
@@ -205,7 +209,8 @@ msgid "Leaves by Department"
 msgstr "Urlaub nach Abteilung"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
@@ -260,7 +265,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -287,8 +293,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "Sie müssen mindestens eine Abteilung auswählen. Nochmals versuchen!"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Bestätigt"
 
@@ -315,7 +323,8 @@ msgid "Remaining Leaves"
 msgstr "Resturlaub"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Status"
 
@@ -325,14 +334,17 @@ msgid "Total holidays by type"
 msgstr "Gesamte Urlaube je Typ"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Mitabeiter"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr "Neu"
 
@@ -374,7 +386,8 @@ msgid "Allocation for %s"
 msgstr "Zuteilung für %s"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Anzahl Tage"
@@ -419,7 +432,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Erwarte Genehmigung"
 
@@ -453,6 +467,7 @@ msgid "Lavender"
 msgstr "Lavendel"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr "Monat"
@@ -476,7 +491,8 @@ msgid "Employee's Holidays"
 msgstr "Mitarbeiter Urlaub"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Kategorie"
 
@@ -521,7 +537,8 @@ msgid "Holiday"
 msgstr "Urlaub"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Meeting"
 
@@ -564,7 +581,8 @@ msgstr ""
 "Fehler ! Sie können keine rekursive Hierachie bei Mitarbeitern definieren."
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr "Verbleibende gesetzlicher Urlaub"
 
@@ -646,7 +664,8 @@ msgid "Compensatory Days"
 msgstr "Augleichstage"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Abwesenheitsgrund"
 
@@ -657,7 +676,8 @@ msgid "Leaves Analysis"
 msgstr "Analyse Abwesenheit"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -672,13 +692,17 @@ msgstr ""
 "  Auswertungen/Urlaub nach Abteilungen auffinden."
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Bestätigt"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Urlaubsanspruch"
 
@@ -694,7 +718,8 @@ msgid "Apply Double Validation"
 msgstr "Doppelte Genehmigung"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Druck"
 
@@ -715,7 +740,8 @@ msgid "By Employee Category"
 msgstr "Nach Mitarbeiter Kategorie"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Urlaubsanfrage"
 
@@ -845,7 +871,8 @@ msgid "Approve"
 msgstr "Genehmige"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Start am"
 
diff --git a/addons/hr_holidays/i18n/el.po b/addons/hr_holidays/i18n/el.po
index 03c7a556acd..7f3c47ced01 100644
--- a/addons/hr_holidays/i18n/el.po
+++ b/addons/hr_holidays/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -30,7 +30,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -55,7 +56,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -65,7 +67,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Απορριφθείσα"
 
@@ -136,7 +139,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Εγκεκριμένη"
@@ -193,7 +197,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -241,7 +246,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -268,8 +274,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Επιβεβαιωμένη"
 
@@ -296,7 +304,8 @@ msgid "Remaining Leaves"
 msgstr "Άδειες που απομένουν"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -306,14 +315,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Υπάλληλος"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -354,7 +366,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Ημέρες"
@@ -390,7 +403,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -422,6 +436,7 @@ msgid "Lavender"
 msgstr "Βιολετί"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -445,7 +460,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -488,7 +504,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -530,7 +547,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -610,7 +628,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -621,7 +640,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -633,13 +653,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Επικυρωμένη"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -655,7 +679,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Εκτύπωση"
 
@@ -676,7 +701,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -797,7 +823,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/es.po b/addons/hr_holidays/i18n/es.po
index e3f1b1bdde6..63950a38b72 100644
--- a/addons/hr_holidays/i18n/es.po
+++ b/addons/hr_holidays/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr "Tipo de asignación"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "A la espera de segunda aprobación"
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Departamento"
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Rechazado"
 
@@ -140,7 +143,8 @@ msgid "Summary Of Leaves"
 msgstr "Resumen de ausencias"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Aprobado"
@@ -199,7 +203,8 @@ msgid "Leaves by Department"
 msgstr "Ausencias por departamento"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Cancelada"
 
@@ -250,7 +255,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -277,8 +283,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "Debe seleccionar al menos 1 departamento. E inténtelo de nuevo"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Confirmado"
 
@@ -305,7 +313,8 @@ msgid "Remaining Leaves"
 msgstr "Vacaciones disponibles"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Estado"
 
@@ -315,14 +324,17 @@ msgid "Total holidays by type"
 msgstr "Total ausencias por tipo"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Empleado"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -365,7 +377,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Número de días"
@@ -401,7 +414,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Esperando aprobación"
 
@@ -435,6 +449,7 @@ msgid "Lavender"
 msgstr "Lavanda"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -458,7 +473,8 @@ msgid "Employee's Holidays"
 msgstr "Ausencias del empleado"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Categoría"
 
@@ -503,7 +519,8 @@ msgid "Holiday"
 msgstr "Ausencias"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Reunión"
 
@@ -545,7 +562,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -627,7 +645,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Razones"
 
@@ -638,7 +657,8 @@ msgid "Leaves Analysis"
 msgstr "Análisis de ausencias"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -652,13 +672,17 @@ msgstr ""
 "Ausencias por departamento"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Validado"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Petición de asignación"
 
@@ -674,7 +698,8 @@ msgid "Apply Double Validation"
 msgstr "Aplicar doble validación"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Imprimir"
 
@@ -695,7 +720,8 @@ msgid "By Employee Category"
 msgstr "Por categoría de empleado"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Petición de ausencia"
 
@@ -823,7 +849,8 @@ msgid "Approve"
 msgstr "Aprobar"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Fecha inicio"
 
diff --git a/addons/hr_holidays/i18n/es_AR.po b/addons/hr_holidays/i18n/es_AR.po
index 8dca5bc8511..a6e1be5da76 100644
--- a/addons/hr_holidays/i18n/es_AR.po
+++ b/addons/hr_holidays/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Rechazado"
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Aprobado"
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Confirmada"
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr "Vacaciones restantes"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Empleado"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Cantidad de días"
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr "Lavanda"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Validado"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Imprimir"
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/es_CR.po b/addons/hr_holidays/i18n/es_CR.po
index 63cb01d3493..ec3a71c8003 100644
--- a/addons/hr_holidays/i18n/es_CR.po
+++ b/addons/hr_holidays/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: hr_holidays
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr "Tipo de asignación"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "A la espera de segunda aprobación"
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr "Modo de asignación"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Departamento"
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr "Solicitudes Aprobadas"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Rechazado"
 
@@ -141,7 +144,8 @@ msgid "Summary Of Leaves"
 msgstr "Resumen de ausencias"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Aprobado"
@@ -208,7 +212,8 @@ msgid "Leaves by Department"
 msgstr "Ausencias por departamento"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Cancelada"
 
@@ -262,7 +267,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -289,8 +295,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "Debe seleccionar al menos 1 departamento. E inténtelo de nuevo"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Confirmado"
 
@@ -317,7 +325,8 @@ msgid "Remaining Leaves"
 msgstr "Vacaciones disponibles"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Estado"
 
@@ -327,14 +336,17 @@ msgid "Total holidays by type"
 msgstr "Total ausencias por tipo"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Empleado"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr "Nuevo"
 
@@ -377,7 +389,8 @@ msgid "Allocation for %s"
 msgstr "Asignación para %s"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Número de días"
@@ -422,7 +435,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Esperando aprobación"
 
@@ -456,6 +470,7 @@ msgid "Lavender"
 msgstr "Lavanda"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr "Mes"
@@ -479,7 +494,8 @@ msgid "Employee's Holidays"
 msgstr "Ausencias del empleado"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Categoría"
 
@@ -524,7 +540,8 @@ msgid "Holiday"
 msgstr "Ausencias"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Reunión"
 
@@ -566,7 +583,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr "Resto de permisos legales"
 
@@ -648,7 +666,8 @@ msgid "Compensatory Days"
 msgstr "Días compensatorios"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Razones"
 
@@ -659,7 +678,8 @@ msgid "Leaves Analysis"
 msgstr "Análisis de ausencias"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -673,13 +693,17 @@ msgstr ""
 "Ausencias por departamento"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Validado"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Petición de asignación"
 
@@ -695,7 +719,8 @@ msgid "Apply Double Validation"
 msgstr "Aplicar doble validación"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Imprimir"
 
@@ -716,7 +741,8 @@ msgid "By Employee Category"
 msgstr "Por categoría de empleado"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Petición de ausencia"
 
@@ -846,7 +872,8 @@ msgid "Approve"
 msgstr "Aprobar"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Fecha inicio"
 
diff --git a/addons/hr_holidays/i18n/es_EC.po b/addons/hr_holidays/i18n/es_EC.po
index f997f8ddcb7..4d69268974b 100644
--- a/addons/hr_holidays/i18n/es_EC.po
+++ b/addons/hr_holidays/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Rechazado"
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Aprobado"
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Confirmado"
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr "Vacaciones disponibles"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Empleado"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Número de días"
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr "Lavanda"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Validado"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Imprimir"
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/et.po b/addons/hr_holidays/i18n/et.po
index e8da4619e1a..2a4dd128c81 100644
--- a/addons/hr_holidays/i18n/et.po
+++ b/addons/hr_holidays/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Tagasi lükatud"
 
@@ -133,7 +136,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Heakskiidetud"
@@ -190,7 +194,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -238,7 +243,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -265,8 +271,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Kinnitatud"
 
@@ -293,7 +301,8 @@ msgid "Remaining Leaves"
 msgstr "Järelejäänud puhkusepäevi"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -303,14 +312,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Töötaja"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -351,7 +363,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Päevade arv"
@@ -387,7 +400,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -419,6 +433,7 @@ msgid "Lavender"
 msgstr "Lavendel (Kahvatulilla)"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -442,7 +457,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -485,7 +501,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -527,7 +544,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -607,7 +625,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -618,7 +637,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Katkesta"
 
@@ -630,13 +650,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Kinnitatud"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -652,7 +676,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Prindi"
 
@@ -673,7 +698,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -794,7 +820,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/fi.po b/addons/hr_holidays/i18n/fi.po
index 73260d163cf..96342953de3 100644
--- a/addons/hr_holidays/i18n/fi.po
+++ b/addons/hr_holidays/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "Odottaa toista hyväksyntää"
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Osasto"
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Hylätty"
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr "Poissaolojen yhteenveto"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Hyväksytty"
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr "Poissaolot osastoittain"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Peruttu"
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Vahvistettu"
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr "Jäljellä olevat lomat"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Työntekijä"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Päivien lukumäärä"
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Vahvistettu"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Tulosta"
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index 4fdc0f5dafd..75da9cafc0d 100644
--- a/addons/hr_holidays/i18n/fr.po
+++ b/addons/hr_holidays/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr "Type d'attribution"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "En attente d'une deuxième approbation"
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr "Mode d'allocation"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Département"
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr "Approuver la demande"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Refusée"
 
@@ -141,7 +144,8 @@ msgid "Summary Of Leaves"
 msgstr "Résumé des congés"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Approuvée"
@@ -207,7 +211,8 @@ msgid "Leaves by Department"
 msgstr "Congés par département"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Annulé"
 
@@ -262,7 +267,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -289,8 +295,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "Vous devez sélectionner au moins 1 département. Veuillez réessayer."
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Confirmé"
 
@@ -317,7 +325,8 @@ msgid "Remaining Leaves"
 msgstr "Congés restants"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Statut"
 
@@ -327,14 +336,17 @@ msgid "Total holidays by type"
 msgstr "Total des congés par type"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Employé"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr "Nouveau"
 
@@ -376,7 +388,8 @@ msgid "Allocation for %s"
 msgstr "Allocation pour %s"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Nombre de jours"
@@ -420,7 +433,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "En attente d'approbation"
 
@@ -454,6 +468,7 @@ msgid "Lavender"
 msgstr "Lavande"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr "Mois"
@@ -477,7 +492,8 @@ msgid "Employee's Holidays"
 msgstr "Congés des employés"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Catégorie"
 
@@ -522,7 +538,8 @@ msgid "Holiday"
 msgstr "Vacances"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Rendez-vous"
 
@@ -565,7 +582,8 @@ msgstr ""
 "Erreur ! Vous ne pouvez pas créer de hiérarchie d'employés récursives."
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr "Jours de congés restants"
 
@@ -647,7 +665,8 @@ msgid "Compensatory Days"
 msgstr "Jours de compensation"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Raisons"
 
@@ -658,7 +677,8 @@ msgid "Leaves Analysis"
 msgstr "Analyse des congés"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -672,13 +692,17 @@ msgstr ""
 "Rapports\\Congés par département"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Validé"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Demande d'attribution"
 
@@ -694,7 +718,8 @@ msgid "Apply Double Validation"
 msgstr "Appliquer la double validation"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Imprimer"
 
@@ -715,7 +740,8 @@ msgid "By Employee Category"
 msgstr "Par catégorie d'employé"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Demande de congé"
 
@@ -847,7 +873,8 @@ msgid "Approve"
 msgstr "Approuver"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Date de début"
 
diff --git a/addons/hr_holidays/i18n/gu.po b/addons/hr_holidays/i18n/gu.po
index 534f02b3d64..b52dcf382a1 100644
--- a/addons/hr_holidays/i18n/gu.po
+++ b/addons/hr_holidays/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr "ફાળવણી પ્રકાર"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "વિભાગ"
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr ""
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "મંજૂર થઇ ચૂકી છે"
@@ -147,7 +151,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Refuse"
-msgstr ""
+msgstr "નકારવા"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:344
@@ -178,7 +182,7 @@ msgstr ""
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays
 msgid "Leave"
-msgstr ""
+msgstr "છોડો"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "રદ થયેલ"
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "સમર્થિત"
 
@@ -280,7 +288,7 @@ msgstr "તરફથી"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Confirm"
-msgstr "ખાતરી"
+msgstr "ખાતરી કરો"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:384
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "સ્થિતિ"
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "કર્મચારી"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr "નવું"
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr ""
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr "મહિનો"
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "શ્રેણી"
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr "રજાનો દિવસ"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "સભા"
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "રદ કરો"
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "છાપો"
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/hi.po b/addons/hr_holidays/i18n/hi.po
index da654a794da..82cd1fe0e20 100644
--- a/addons/hr_holidays/i18n/hi.po
+++ b/addons/hr_holidays/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "मना कर दिया"
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "स्वीकृत"
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "पुष्टि"
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr "शेष छुट्टी"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "कर्मचारी"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "दिनों की संख्या"
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr "लैवेंडर"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "रद्द करें"
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "प्रिंट"
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/hr.po b/addons/hr_holidays/i18n/hr.po
index b0cdbe9591d..68649f231ba 100644
--- a/addons/hr_holidays/i18n/hr.po
+++ b/addons/hr_holidays/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr ""
 
@@ -133,7 +136,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Odobreno"
@@ -190,7 +194,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -238,7 +243,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -265,8 +271,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Potvrđen"
 
@@ -293,7 +301,8 @@ msgid "Remaining Leaves"
 msgstr "Neiskorišteni GO"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -303,14 +312,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Djelatnik"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -351,7 +363,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr ""
@@ -387,7 +400,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -419,6 +433,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -442,7 +457,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -485,7 +501,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -527,7 +544,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -607,7 +625,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -618,7 +637,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr ""
 
@@ -630,13 +650,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -652,7 +676,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr ""
 
@@ -673,7 +698,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -794,7 +820,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/hu.po b/addons/hr_holidays/i18n/hu.po
index da62836ca36..466b6573091 100644
--- a/addons/hr_holidays/i18n/hu.po
+++ b/addons/hr_holidays/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr "Juttatás típusa"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "Várakozás a második jóváhagyásra"
 
@@ -50,20 +51,22 @@ msgstr "Csoportosítás..."
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Allocation Mode"
-msgstr ""
+msgstr "Jóváhagyás módja"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Osztály, részleg"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
 msgid "Requests Approve"
-msgstr ""
+msgstr "Jóváhagyás igénylése"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Elutasított"
 
@@ -75,7 +78,7 @@ msgstr "Alkalmazotti kategória"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid " Month-1"
-msgstr ""
+msgstr " Előző hó"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -117,7 +120,7 @@ msgstr "Világoszöld"
 #. module: hr_holidays
 #: field:hr.employee,current_leave_id:0
 msgid "Current Leave Type"
-msgstr ""
+msgstr "Aktuális távollét tipusa"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr "Szabadságok összegzése"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Jóváhagyott"
@@ -183,7 +187,7 @@ msgstr "Szabadság"
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
 msgid "Leave Requests to Approve"
-msgstr ""
+msgstr "Jóváhagyandó kérelmek"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr "Szabadságok osztályonként"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Törölt"
 
@@ -219,7 +224,7 @@ msgstr "Érvényesítés"
 #: code:addons/hr_holidays/hr_holidays.py:377
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Figyelem !"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Megerősítve"
 
@@ -275,7 +283,7 @@ msgstr "Megerősítve"
 #: field:hr.holidays.summary.dept,date_from:0
 #: field:hr.holidays.summary.employee,date_from:0
 msgid "From"
-msgstr ""
+msgstr "Kezdő dátum"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr "Hátralévő szabadságok"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Állapot"
 
@@ -304,16 +313,19 @@ msgid "Total holidays by type"
 msgstr "Összes szabadság típusok szerint"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Alkalmazott"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
-msgstr ""
+msgstr "Új"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Napok száma"
@@ -378,7 +391,7 @@ msgstr "Szabadságtípusok keresése"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "You have to select an employee or a category"
-msgstr ""
+msgstr "Választani kell egy alkalmazottat vagy egy kategóriát!"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Várakozás a  jóváhagyásra"
 
@@ -420,9 +434,10 @@ msgid "Lavender"
 msgstr "Levendula"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
-msgstr ""
+msgstr "Hó"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr "Munkavállalói szabadások"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Kategória"
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr "Szabadság"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Találkozó"
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -552,7 +570,7 @@ msgstr "Szabadságok összegzése"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Holidays during last month"
-msgstr ""
+msgstr "Szabadnapok múlt hónapban"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Okok"
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr "Szabadságok elemzése"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Érvényesített"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr "Dupla érvényesítés alkalmazása"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Nyomtatás"
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr "Alkalmazotti kategóriák szerint"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Szabadságolási kérelem"
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr "Jóváhagy"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Kezdő dátum"
 
@@ -824,12 +851,12 @@ msgstr "Menedzser"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Confirm"
-msgstr ""
+msgstr "Jóváhagyandó"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Year"
-msgstr ""
+msgstr "Év"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
diff --git a/addons/hr_holidays/i18n/id.po b/addons/hr_holidays/i18n/id.po
index 20f44c95fdf..15ba81f6db2 100644
--- a/addons/hr_holidays/i18n/id.po
+++ b/addons/hr_holidays/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr "Jenis Alokasi"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "Menunggu Persetujuan Kedua"
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Departmen"
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Ditolak"
 
@@ -139,7 +142,8 @@ msgid "Summary Of Leaves"
 msgstr "Ikhtisar Dari Cuti"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Disetujui"
@@ -198,7 +202,8 @@ msgid "Leaves by Department"
 msgstr "Cuti dari Departemen"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Dibatalkan"
 
@@ -257,7 +262,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -284,8 +290,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "Anda harus memilih minimal 1 Departemen. Dan coba lagi"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Dikonfirmasi"
 
@@ -312,7 +320,8 @@ msgid "Remaining Leaves"
 msgstr "Sisa Cuti"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Status"
 
@@ -322,14 +331,17 @@ msgid "Total holidays by type"
 msgstr "Total liburan menurut jenis"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Karyawan"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -371,7 +383,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Jumlah Hari"
@@ -407,7 +420,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Menunggu Persetujuan"
 
@@ -441,6 +455,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -464,7 +479,8 @@ msgid "Employee's Holidays"
 msgstr "Liburan Karyawan"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Kategori"
 
@@ -509,7 +525,8 @@ msgid "Holiday"
 msgstr "Hari Libur"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Pertemuan"
 
@@ -551,7 +568,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -633,7 +651,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Alasan"
 
@@ -644,7 +663,8 @@ msgid "Leaves Analysis"
 msgstr "Analisa Cuti"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Batal"
 
@@ -658,13 +678,17 @@ msgstr ""
 "Cuti dari Dinas"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Sudah DIvalidasi"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Permintaan Alokasi"
 
@@ -680,7 +704,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Cetak"
 
@@ -701,7 +726,8 @@ msgid "By Employee Category"
 msgstr "Berdasarkan Kategori Karyawan"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Permohonan Cuti"
 
@@ -829,7 +855,8 @@ msgid "Approve"
 msgstr "Disetujui"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Tanggal Mulai"
 
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index bac05827ace..5e11b0210c1 100644
--- a/addons/hr_holidays/i18n/it.po
+++ b/addons/hr_holidays/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr "Tipo assegnazione"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "In attesa della seconda approvazione"
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Dipartimento"
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Rifiutato"
 
@@ -135,7 +138,8 @@ msgid "Summary Of Leaves"
 msgstr "Riepilogo permessi"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Approvato"
@@ -192,7 +196,8 @@ msgid "Leaves by Department"
 msgstr "Permessi per Dipartimento"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Annullato"
 
@@ -244,7 +249,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -271,8 +277,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "E' necessario selezionare almeno un Dipartimento. Riprova ancora"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Confermato"
 
@@ -299,7 +307,8 @@ msgid "Remaining Leaves"
 msgstr "Permessi rimanenti"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Stato"
 
@@ -309,14 +318,17 @@ msgid "Total holidays by type"
 msgstr "Totale ferie per tipo"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Dipendente/Impiegato"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -358,7 +370,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Numero Giorni"
@@ -394,7 +407,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "In attesa di approvazione"
 
@@ -426,6 +440,7 @@ msgid "Lavender"
 msgstr "Lavanda"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -449,7 +464,8 @@ msgid "Employee's Holidays"
 msgstr "Ferie dell'impiegato"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Categoria"
 
@@ -494,7 +510,8 @@ msgid "Holiday"
 msgstr "Ferie"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -536,7 +553,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -618,7 +636,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Motivazioni"
 
@@ -629,7 +648,8 @@ msgid "Leaves Analysis"
 msgstr "Analisi permessi"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -643,13 +663,17 @@ msgstr ""
 "/ Permessi per reparto"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Convalidata"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Richiesta assegnazione"
 
@@ -665,7 +689,8 @@ msgid "Apply Double Validation"
 msgstr "Applica doppia convalida"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Stampa"
 
@@ -686,7 +711,8 @@ msgid "By Employee Category"
 msgstr "Per categoria d'impiegato"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Richiesta permesso"
 
@@ -813,7 +839,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Data inizio"
 
diff --git a/addons/hr_holidays/i18n/ja.po b/addons/hr_holidays/i18n/ja.po
index 03b5a40cb48..7e6c11d1bfc 100644
--- a/addons/hr_holidays/i18n/ja.po
+++ b/addons/hr_holidays/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr "割当てタイプ"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "2番目の承認待ち"
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr "割振りモード"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "部門"
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr "承認を申請"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "拒否"
 
@@ -136,7 +139,8 @@ msgid "Summary Of Leaves"
 msgstr "休暇の要約"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "承認済み"
@@ -197,7 +201,8 @@ msgid "Leaves by Department"
 msgstr "部門別の休暇"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "キャンセルされました。"
 
@@ -247,7 +252,8 @@ msgstr "この項目は、休暇を承認されたユーザによって自動的
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -274,8 +280,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "少なくとも一つの部門を指定して、やり直して下さい。"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "確認済み"
 
@@ -302,7 +310,8 @@ msgid "Remaining Leaves"
 msgstr "残りの休暇日数"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "状態"
 
@@ -312,14 +321,17 @@ msgid "Total holidays by type"
 msgstr "タイプ別の休暇日数"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "従業員"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr "新規"
 
@@ -360,7 +372,8 @@ msgid "Allocation for %s"
 msgstr "%s の割当て"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "日数"
@@ -399,7 +412,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "承認待ち"
 
@@ -431,6 +445,7 @@ msgid "Lavender"
 msgstr "薄紫色"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr "月"
@@ -454,7 +469,8 @@ msgid "Employee's Holidays"
 msgstr "従業員の休暇"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "カテゴリー"
 
@@ -497,7 +513,8 @@ msgid "Holiday"
 msgstr "休暇"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "ミーティング"
 
@@ -539,7 +556,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "エラー：従業員の反復した階層構造を作ることはできません。"
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr "法定休暇の残り日数"
 
@@ -619,7 +637,8 @@ msgid "Compensatory Days"
 msgstr "振替休日"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "理由"
 
@@ -630,7 +649,8 @@ msgid "Leaves Analysis"
 msgstr "休暇分析"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -642,13 +662,17 @@ msgid ""
 msgstr "部門別休暇報告書の休暇ようやくに、この色が使われます。"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "承諾済み"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "割当て申請"
 
@@ -664,7 +688,8 @@ msgid "Apply Double Validation"
 msgstr "二重承認を適用する。"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "印刷"
 
@@ -685,7 +710,8 @@ msgid "By Employee Category"
 msgstr "従業員カテゴリー別"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "休暇申請"
 
@@ -806,7 +832,8 @@ msgid "Approve"
 msgstr "承認"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "開始日"
 
diff --git a/addons/hr_holidays/i18n/ko.po b/addons/hr_holidays/i18n/ko.po
index 0d559138f52..ab506eb4f46 100644
--- a/addons/hr_holidays/i18n/ko.po
+++ b/addons/hr_holidays/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "거부됨"
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "승인됨"
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "확정됨"
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr "남은 휴가 일수"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "직원"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "일 수"
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr "라벤더"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "취소"
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "검증됨"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "인쇄"
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/lt.po b/addons/hr_holidays/i18n/lt.po
index b7eb6fe7f60..2cb94e07fe3 100644
--- a/addons/hr_holidays/i18n/lt.po
+++ b/addons/hr_holidays/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Atmestos"
 
@@ -133,7 +136,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Patvirtintas"
@@ -190,7 +194,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -238,7 +243,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -265,8 +271,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Patvirtinta"
 
@@ -293,7 +301,8 @@ msgid "Remaining Leaves"
 msgstr "Neišnaudotos atostogos"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -303,14 +312,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Darbuotojas"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -351,7 +363,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Dienų skaičius"
@@ -387,7 +400,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -419,6 +433,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -442,7 +457,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -485,7 +501,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -527,7 +544,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -607,7 +625,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -618,7 +637,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Atšaukti"
 
@@ -630,13 +650,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Patvirtintos"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -652,7 +676,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Spausdinti"
 
@@ -673,7 +698,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -794,7 +820,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/lv.po b/addons/hr_holidays/i18n/lv.po
index 3b62f2ccc13..4842fa90f40 100644
--- a/addons/hr_holidays/i18n/lv.po
+++ b/addons/hr_holidays/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr ""
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr ""
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr ""
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr ""
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr ""
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr ""
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/mk.po b/addons/hr_holidays/i18n/mk.po
new file mode 100644
index 00000000000..d04264e2b75
--- /dev/null
+++ b/addons/hr_holidays/i18n/mk.po
@@ -0,0 +1,888 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-10-09 08:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Blue"
+msgstr "Сина"
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_type:0
+msgid "Allocation Type"
+msgstr "Тип на Распределба"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Waiting Second Approval"
+msgstr "Се чека на второ одобрување"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,remaining_leaves:0
+msgid "Maximum Leaves Allowed - Leaves Already Taken"
+msgstr "Максимален број на дозволени отсуства - Отсуствата се веќе земени"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Leaves Management"
+msgstr "Менаџирање на Отсуства"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Group By..."
+msgstr "Групирај По..."
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Allocation Mode"
+msgstr "Режим на Распределба"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
+msgid "Department"
+msgstr "Сектор"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
+msgid "Requests Approve"
+msgstr "Одобри Барања"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Refused"
+msgstr "Одбиени"
+
+#. module: hr_holidays
+#: help:hr.holidays,category_id:0
+msgid "Category of Employee"
+msgstr "Категорија на Вработен"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid " Month-1"
+msgstr " Месец-1"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Brown"
+msgstr "Кафена"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Remaining Days"
+msgstr "Останати Денови"
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee"
+msgstr "По Вработен"
+
+#. module: hr_holidays
+#: help:hr.holidays,employee_id:0
+msgid ""
+"Leave Manager can let this field empty if this leave request/allocation is "
+"for every employee"
+msgstr ""
+"Менаџерот за отсуства може да го остави ова поле празно ако барањето за "
+"отсуство/распределба е за секој вработен"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Set to Draft"
+msgstr "Сетирај на Драфт"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Cyan"
+msgstr "Светла Цијан"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Green"
+msgstr "Светло зелено"
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_id:0
+msgid "Current Leave Type"
+msgstr "Тековен Тип на Отсуство"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leave requests can be recorded by employees and validated by their managers. "
+"Once a leave request is validated, it appears automatically in the agenda of "
+"the employee. You can define several allowance types (paid holidays, "
+"sickness, etc.) and manage allowances per type."
+msgstr ""
+"Барањата за отсуство може да се евидентираат од страна на вработените и да "
+"се валидираат од нивните менаџери. Кога еднаш ќе се валидира барањето, се "
+"појавува автоматски во агендата на вработениот. Можете да дефинирате неколку "
+"типови на отсуства (платени денови, боледување, итн.) и да менаџирате "
+"отсуства по тип."
+
+#. module: hr_holidays
+#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
+msgid "Summary Of Leaves"
+msgstr "Збир на Отсуства"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,state:0
+msgid "Approved"
+msgstr "Одобрено"
+
+#. module: hr_holidays
+#: field:hr.employee,last_login:0
+msgid "Latest Connection"
+msgstr "Последна Конекција"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Refuse"
+msgstr "Одбиј"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s: too few remaining days (%s)."
+msgstr ""
+"Не можете да валидирате отсуства за вработениот %s: премалку преостанати "
+"денови (%s)."
+
+#. module: hr_holidays
+#: help:hr.holidays,state:0
+msgid ""
+"The state is set to 'Draft', when a holiday request is created.            \n"
+"The state is 'Waiting Approval', when holiday request is confirmed by user.  "
+"          \n"
+"The state is 'Refused', when holiday request is refused by manager.          "
+"  \n"
+"The state is 'Approved', when holiday request is approved by manager."
+msgstr ""
+"Чекор 'Драфт', кога е креирано барање за отсуство.\n"
+"Чекор 'Се чека на одобрување', кога отсуството е потврдено.\n"
+"Чекор 'Одбиено', кога барањето е одбиено од менаџерот.\n"
+"Чекор 'Одобрено', кога барањето е одобрено од менаџерот."
+
+#. module: hr_holidays
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
+msgid "Leaves"
+msgstr "Отсуства"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays
+msgid "Leave"
+msgstr "Отсуство"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
+msgid "Leave Requests to Approve"
+msgstr "Барања за отсуства за одобрување"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
+msgid "Leaves by Department"
+msgstr "Отсуства по Сектор"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Cancelled"
+msgstr "Откажано"
+
+#. module: hr_holidays
+#: help:hr.holidays,type:0
+msgid ""
+"Choose 'Leave Request' if someone wants to take an off-day. \n"
+"Choose 'Allocation Request' if you want to increase the number of leaves "
+"available for someone"
+msgstr ""
+"Одбери 'Барање за Отсуство' ако некој сака да земе слободен ден.\n"
+"Одбери 'Барање за Преместување' ако сакате да го зголемите бројот на "
+"дозволени отсуства."
+
+#. module: hr_holidays
+#: help:hr.employee,remaining_leaves:0
+msgid ""
+"Total number of legal leaves allocated to this employee, change this value "
+"to create allocation/leave requests."
+msgstr ""
+"Вкупен број на легални отсуства дадени на овој вработен, промени ја оваа "
+"вредност за да креирате барање за отсуство/распределба"
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr "Потврдување"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid "Warning !"
+msgstr "Внимание !"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,color_name:0
+msgid "Color in Report"
+msgstr "Боја во Извештај"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
+msgid "HR Holidays Summary Report By Employee"
+msgstr "Збир на отсуства по вработен"
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id:0
+msgid "This area is automatically filled by the user who validate the leave"
+msgstr "Ова е автоматски пополнето од корисник кој го потврдил отсуството"
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_status_id:0
+#: field:hr.holidays.remaining.leaves.user,leave_type:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
+#: field:hr.holidays.summary.dept,holiday_type:0
+#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
+#: model:ir.model,name:hr_holidays.model_hr_holidays_status
+#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
+msgid "Leave Type"
+msgstr "Тип на Отсуство"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid "Warning!"
+msgstr "Предупредување!"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Magenta"
+msgstr "Магента"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least 1 Department. And try again"
+msgstr "Морате да одберете барем 1 сектор. И да се обидете повторно"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
+msgid "Confirmed"
+msgstr "Потврдено"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,date_from:0
+#: field:hr.holidays.summary.employee,date_from:0
+msgid "From"
+msgstr "Од"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Confirm"
+msgstr "Потврди"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:384
+#, python-format
+msgid "Leave Request for %s"
+msgstr "Барање за Отсуство за %s"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,remaining_leaves:0
+msgid "Remaining Leaves"
+msgstr "Преостанати отсуства"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
+msgid "State"
+msgstr "Состојба"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
+msgid "Total holidays by type"
+msgstr "Вкупен број на годишни одмори по тип"
+
+#. module: hr_holidays
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
+#: field:hr.holidays.remaining.leaves.user,name:0
+#: model:ir.model,name:hr_holidays.model_hr_employee
+msgid "Employee"
+msgstr "Вработен"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "New"
+msgstr "Ново"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Type"
+msgstr "Тип"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Red"
+msgstr "Црвена"
+
+#. module: hr_holidays
+#: view:hr.holidays.remaining.leaves.user:0
+msgid "Leaves by Type"
+msgstr "Отсуства по Тип"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Wheat"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+"Грешка! Почетниот датум за отсуство мора да биде помал од крајниотдатум."
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:382
+#, python-format
+msgid "Allocation for %s"
+msgstr "Распределба за %s"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
+#: field:hr.holidays,number_of_days_temp:0
+msgid "Number of Days"
+msgstr "Број на денови"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid ""
+"The feature behind the field 'Remaining Legal Leaves' can only be used when "
+"there is only one leave type with the option 'Allow to Override Limit' "
+"unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot "
+"decide on which leave type the update has to be done. \n"
+"You may prefer to use the classic menus 'Leave Requests' and 'Allocation "
+"Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
+"the employees if the configuration does not allow to use this field."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
+msgstr "Пребарај Тип на Отсуство"
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "You have to select an employee or a category"
+msgstr "Мора да одберете вработен или категорија"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,double_validation:0
+msgid ""
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Waiting Approval"
+msgstr "Се чека на одобрување"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,emp:0
+msgid "Employee(s)"
+msgstr "Вработен(и)"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,categ_id:0
+msgid ""
+"If you set a meeting type, OpenERP will create a meeting in the calendar "
+"once a leave is validated."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,linked_request_ids:0
+msgid "Linked Requests"
+msgstr "Поврзани Барања"
+
+#. module: hr_holidays
+#: field:hr.holidays,parent_id:0
+msgid "Parent"
+msgstr "Родител"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Lavender"
+msgstr "Лаванда"
+
+#. module: hr_holidays
+#: xsl:holidays.summary:0
+#: view:hr.holidays:0
+msgid "Month"
+msgstr "Месец"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
+msgid "Leave Requests"
+msgstr "Барање за Отсуство"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,limit:0
+msgid "Allow to Override Limit"
+msgstr "Дозвола за пречекорување на лимитот"
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.employee:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
+msgid "Employee's Holidays"
+msgstr "Годишни одмори на вработениот"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
+msgid "Category"
+msgstr "Категорија"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,max_leaves:0
+msgid ""
+"This value is given by the sum of all holidays requests with a positive "
+"value."
+msgstr ""
+"Оваа вредност е зададена од сумата на сите барања за годишни одмори со "
+"позитивна вредост."
+
+#. module: hr_holidays
+#: view:board.board:0
+msgid "All Employee Leaves"
+msgstr "Сите отсуства на вработениот"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Coral"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
+msgid "Holidays by Department"
+msgstr "Годишни одмори по Сектор"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Black"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
+msgid "Allocate Leaves for Employees"
+msgstr "Рспредели отсуства за Вработени"
+
+#. module: hr_holidays
+#: field:resource.calendar.leaves,holiday_id:0
+msgid "Holiday"
+msgstr "Одмор"
+
+#. module: hr_holidays
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
+msgid "Meeting"
+msgstr "Состанок"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Ivory"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Both Validated and Confirmed"
+msgstr "Валидиран и Потврден"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,leaves_taken:0
+msgid "Leaves Already Taken"
+msgstr "Отсуствата се веќе зафаени"
+
+#. module: hr_holidays
+#: field:hr.holidays,user_id:0
+#: field:hr.holidays.remaining.leaves.user,user_id:0
+msgid "User"
+msgstr "Корисник"
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The start date must be before the end date !"
+msgstr "Почетниот датум мора да биде пред крајниот датум !"
+
+#. module: hr_holidays
+#: field:hr.holidays.status,active:0
+msgid "Active"
+msgstr "Активен"
+
+#. module: hr_holidays
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Грешка! Не можете да креирате рекурзивна хиерархија на вработените."
+
+#. module: hr_holidays
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
+msgid "Remaining Legal Leaves"
+msgstr "Останати Легални Отсуства"
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id:0
+msgid "First Approval"
+msgstr "Прво Одобрување"
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
+msgid "Unpaid"
+msgstr "Неплатени"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
+msgstr "Збир на Отсуства"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Holidays during last month"
+msgstr "Неработни денови во последниот месец"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "Error"
+msgstr "Грешка"
+
+#. module: hr_holidays
+#: view:hr.employee:0
+msgid "Assign Leaves"
+msgstr "Додели Отсуства"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Blue"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "My Department Leaves"
+msgstr "Мои Секторски Отсуства"
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_state:0
+msgid "Current Leave Status"
+msgstr "Тековен Статус на Отсуства"
+
+#. module: hr_holidays
+#: field:hr.holidays,type:0
+msgid "Request Type"
+msgstr "Тип на Барање"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the leave "
+"type without removing it."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Misc"
+msgstr "Разно"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "General"
+msgstr "Општо"
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
+msgid "Compensatory Days"
+msgstr "Денови за Компензација"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
+msgid "Reasons"
+msgstr "Причини"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
+msgid "Leaves Analysis"
+msgstr "Анализа на Отсуства"
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
+msgid "Cancel"
+msgstr "Откажи"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,color_name:0
+msgid ""
+"This color will be used in the leaves summary located in Reporting\\Leaves "
+"by Departement"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
+msgid "Validated"
+msgstr "Валидирано"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Allocation Request"
+msgstr "Барање за Распределба"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
+msgid "Leave Detail"
+msgstr "Детал за Отсуство"
+
+#. module: hr_holidays
+#: field:hr.holidays,double_validation:0
+#: field:hr.holidays.status,double_validation:0
+msgid "Apply Double Validation"
+msgstr "Аплицирај Дупла Валидација"
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
+msgid "Print"
+msgstr "Печати"
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Details"
+msgstr "Детали"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
+msgid "My Leaves"
+msgstr "Мои отсуства"
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee Category"
+msgstr "По категорија на вработен"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Leave Request"
+msgstr "Барање за Отсуство"
+
+#. module: hr_holidays
+#: field:hr.holidays,name:0
+msgid "Description"
+msgstr "Опис"
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
+msgid "Legal Leaves"
+msgstr "Легални Отсуства"
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The number of days must be greater than 0 !"
+msgstr "Бројот на денови мора да е поголем од 0 !"
+
+#. module: hr_holidays
+#: help:hr.holidays,holiday_type:0
+msgid ""
+"By Employee: Allocation/Request for individual Employee, By Employee "
+"Category: Allocation/Request for group of employees in category"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#, python-format
+msgid "You cannot delete a leave which is not in draft state !"
+msgstr "Не можете да избришете отсуство што не е во драфт статус !"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Search Leave"
+msgstr "Пребарај Отсуство"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,holiday_type:0
+msgid "Select Holiday Type"
+msgstr "Одбери тип на годишен одмор"
+
+#. module: hr_holidays
+#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
+msgid "Remaining leaves"
+msgstr "Преостанати отсуства"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,depts:0
+msgid "Department(s)"
+msgstr "Сектор(и)"
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id2:0
+msgid "Second Approval"
+msgstr "Второ Одобрување"
+
+#. module: hr_holidays
+#: field:hr.holidays,date_to:0
+msgid "End Date"
+msgstr "Краен датум"
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
+msgid "Sick Leaves"
+msgstr "Отсуства за боледување"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,limit:0
+msgid ""
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,leaves_taken:0
+msgid ""
+"This value is given by the sum of all holidays requests with a negative "
+"value."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Violet"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal
+msgid ""
+"You can assign remaining Legal Leaves for each employee, OpenERP will "
+"automatically create and validate allocation requests."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr "Максимално дозволени"
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id2:0
+msgid ""
+"This area is automaticly filled by the user who validate the leave with "
+"second level (If Leave type need second validation)"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Mode"
+msgstr "Режим"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
+msgid "HR Holidays Summary Report By Department"
+msgstr "Извештај за слободни денови по сектор"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Approve"
+msgstr "Одобри"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
+msgid "Start Date"
+msgstr "Почетен датум"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
+msgid "Allocation Requests"
+msgstr "Барање за Распределба"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Yellow"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Pink"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Manager"
+msgstr "Менаџер"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Confirm"
+msgstr "За Потврдување"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Year"
+msgstr "Година"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Approve"
+msgstr "За Одобрување"
+
+#~ msgid "Leaves To Validate"
+#~ msgstr "Отсуства за Валидација"
diff --git a/addons/hr_holidays/i18n/mn.po b/addons/hr_holidays/i18n/mn.po
index fc6ed871d50..042b49922de 100644
--- a/addons/hr_holidays/i18n/mn.po
+++ b/addons/hr_holidays/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr "Хуваарилах төрөл"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "2 дахь зөвшөөрлийг хүлээж байна"
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr "Хуваарилах горим"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Хэлтэс"
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr "зөвшөөрөх хүсэлт"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Татгалзсан"
 
@@ -139,7 +142,8 @@ msgid "Summary Of Leaves"
 msgstr "Амралт, чөлөөний товчоо"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Зөвшөөрсөн"
@@ -202,7 +206,8 @@ msgid "Leaves by Department"
 msgstr "Хэлтсийн амралт, чөлөө"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Цуцлагдсан"
 
@@ -257,7 +262,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -284,8 +290,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "Та цөөндөө 1 хэлтэс сонгох хэрэгтэй. Дахин оролдоно уу."
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Баталсан"
 
@@ -312,7 +320,8 @@ msgid "Remaining Leaves"
 msgstr "Үлдсэн амралт, чөлөө"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Төлөв"
 
@@ -322,14 +331,17 @@ msgid "Total holidays by type"
 msgstr "Төрлөөр ангилсан амралт, чөлөө"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Ажилтан"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr "Шинэ"
 
@@ -371,7 +383,8 @@ msgid "Allocation for %s"
 msgstr "%s хуваарилалт"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Хоногийн тоо"
@@ -413,7 +426,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Зөвшөөрөл хүлээж байгаа"
 
@@ -447,6 +461,7 @@ msgid "Lavender"
 msgstr "Цайвар ягаан"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr "Сар"
@@ -470,7 +485,8 @@ msgid "Employee's Holidays"
 msgstr "Ажилтны амралт, чөлөө"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Зэрэглэл"
 
@@ -515,7 +531,8 @@ msgid "Holiday"
 msgstr "Амралт, чөлөө"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Уулзалт"
 
@@ -557,7 +574,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Алдаа! Ажилтны рекурс мод үүсгэж болохгүй"
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr "Цалинтай амралт, чөлөөний үлдэгдэл"
 
@@ -639,7 +657,8 @@ msgid "Compensatory Days"
 msgstr "Нөхөн амралт"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Амралт, чөлөөний шалтгаан"
 
@@ -650,7 +669,8 @@ msgid "Leaves Analysis"
 msgstr "Амралт, чөлөөний шинжилгээ"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Цуцлах"
 
@@ -664,13 +684,17 @@ msgstr ""
 "товчоонд энэ өнгийг ашиглана."
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Батламжилсан"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Амралт, чөлөө хуваарилах хүсэл"
 
@@ -686,7 +710,8 @@ msgid "Apply Double Validation"
 msgstr "2 удаа батламжлах эсэх"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Хэвлэх"
 
@@ -707,7 +732,8 @@ msgid "By Employee Category"
 msgstr "Ажилтны зэрэглэлээр"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Амралт, чөлөөний хүсэлт"
 
@@ -838,7 +864,8 @@ msgid "Approve"
 msgstr "Зөвшөөрөх"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Эхэлсэн огноо"
 
diff --git a/addons/hr_holidays/i18n/nl.po b/addons/hr_holidays/i18n/nl.po
index 8c253d78b95..672dbdb9193 100644
--- a/addons/hr_holidays/i18n/nl.po
+++ b/addons/hr_holidays/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-19 13:05+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"PO-Revision-Date: 2012-09-03 17:12+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr "Soort reservering"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "Wacht op tweede goedkeuring"
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr "Reserveringsmode"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Afdeling"
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr "Goedkeuringsaanvraag"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Geweigerd"
 
@@ -139,7 +142,8 @@ msgid "Summary Of Leaves"
 msgstr "Samenvatting verlof"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Goedgekeurd"
@@ -205,7 +209,8 @@ msgid "Leaves by Department"
 msgstr "Verlof per afdeling"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Geannuleerd"
 
@@ -248,7 +253,7 @@ msgstr "Kleur in overzicht"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
 msgid "HR Holidays Summary Report By Employee"
-msgstr "HR Vakantie samenvatting overzicht per werknemer"
+msgstr "HR Verlof samenvatting overzicht per werknemer"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id:0
@@ -260,7 +265,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -287,8 +293,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "U moet tenminste één afdeling selecteren. Probeer nog eens"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Bevestigd"
 
@@ -315,24 +323,28 @@ msgid "Remaining Leaves"
 msgstr "Resterend verlof"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Status"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
 msgid "Total holidays by type"
-msgstr "Totaal vakantiedagen per soort"
+msgstr "Totaal verlofdagen per soort"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Werknemer"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr "Nieuw"
 
@@ -373,7 +385,8 @@ msgid "Allocation for %s"
 msgstr "Reservering voor %s"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Aantal dagen"
@@ -416,9 +429,12 @@ msgid ""
 "When selected, the Allocation/Leave Requests for this type require a second "
 "validation to be approved."
 msgstr ""
+"Wanneer aangevinkt heeft deze toewijzing of aanvraag een tweede controle "
+"nodig om te worden goedgekeurd."
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Wacht op goedkeuring"
 
@@ -452,6 +468,7 @@ msgid "Lavender"
 msgstr "Lavendel"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr "Maand"
@@ -472,10 +489,11 @@ msgstr "Toestaan om de limiet te overschrijden"
 #: view:hr.holidays.summary.employee:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 msgid "Employee's Holidays"
-msgstr "Werknemer vakantie"
+msgstr "Werknemers verloven"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Categorie"
 
@@ -485,7 +503,7 @@ msgid ""
 "This value is given by the sum of all holidays requests with a positive "
 "value."
 msgstr ""
-"Deze waarde wordt bepaalt door de som van alle vakantieaanvragen met een "
+"Deze waarde wordt bepaalt door de som van alle verlofaanvragen met een "
 "positieve waarde."
 
 #. module: hr_holidays
@@ -517,10 +535,11 @@ msgstr "Wijs verloven voor werknemers toe"
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
-msgstr "Vakantie"
+msgstr "Verlof"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Afspraak"
 
@@ -562,7 +581,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Fout ! U kunt geen recursieve werknemershiërarchie aanmaken."
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr "Overgebleven wettelijke verlofdagen"
 
@@ -586,7 +606,7 @@ msgstr "Verlof samenvatting"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Holidays during last month"
-msgstr "Vakanties gedurende afgelopen maand"
+msgstr "Verlofdagen gedurende afgelopen maand"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
@@ -644,7 +664,8 @@ msgid "Compensatory Days"
 msgstr "Compensatie dagen"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Redenen"
 
@@ -655,7 +676,8 @@ msgid "Leaves Analysis"
 msgstr "Verlof analyse"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -669,13 +691,17 @@ msgstr ""
 "/ Verlof per afdeling"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Goedgekeurd"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Reserveringsaanvraag"
 
@@ -691,7 +717,8 @@ msgid "Apply Double Validation"
 msgstr "Gebruik dubbele goedkeuring"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Afdrukken"
 
@@ -712,7 +739,8 @@ msgid "By Employee Category"
 msgstr "Per werknemer categorie"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Verlofaanvraag"
 
@@ -787,6 +815,8 @@ msgid ""
 "If you select this checkbox, the system allows the employees to take more "
 "leaves than the available ones for this type."
 msgstr ""
+"Indien u deze optie aanvinkt, dan staat u toe dat werknemers meer verlof "
+"aanvragen dan dat ze nog beschikbaar hebben."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -794,7 +824,7 @@ msgid ""
 "This value is given by the sum of all holidays requests with a negative "
 "value."
 msgstr ""
-"De waarde wordt bepaald door de som van alle vakantieaanvragen met een "
+"De waarde wordt bepaald door de som van alle verlofaanvragen met een "
 "negatieve waarde."
 
 #. module: hr_holidays
@@ -834,7 +864,7 @@ msgstr "Modus"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
 msgid "HR Holidays Summary Report By Department"
-msgstr "HR Vakantie samenvatting overzicht per afdeling"
+msgstr "HR Verlofsamenvatting overzicht per afdeling"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -842,7 +872,8 @@ msgid "Approve"
 msgstr "Goedkeuren"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Begindatum"
 
diff --git a/addons/hr_holidays/i18n/nl_BE.po b/addons/hr_holidays/i18n/nl_BE.po
index b22e60797ee..b152df8f6df 100644
--- a/addons/hr_holidays/i18n/nl_BE.po
+++ b/addons/hr_holidays/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr ""
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr ""
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr ""
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr ""
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr ""
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr ""
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/pl.po b/addons/hr_holidays/i18n/pl.po
index e33ebef7fe7..9e950347d56 100644
--- a/addons/hr_holidays/i18n/pl.po
+++ b/addons/hr_holidays/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "Oczekuje na drugą aprobatę"
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Dział"
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Odrzucone"
 
@@ -135,7 +138,8 @@ msgid "Summary Of Leaves"
 msgstr "Podsumowanie urlopów"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Zaaprobowane"
@@ -192,7 +196,8 @@ msgid "Leaves by Department"
 msgstr "Nieobecności wg działów"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Anulowano"
 
@@ -243,7 +248,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -270,8 +276,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "Musisz wybrać co najmniej 1 wydział. Spróbuj ponownie."
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Potwierdzone"
 
@@ -298,7 +306,8 @@ msgid "Remaining Leaves"
 msgstr "Pozostało dni urlopu"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Stan"
 
@@ -308,14 +317,17 @@ msgid "Total holidays by type"
 msgstr "Syma urlopów wg typów"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Pracownik"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -356,7 +368,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Liczba dni"
@@ -392,7 +405,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Oczekuje na aprobatę"
 
@@ -424,6 +438,7 @@ msgid "Lavender"
 msgstr "Lawendowy"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -447,7 +462,8 @@ msgid "Employee's Holidays"
 msgstr "Urlopy pracowników"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -490,7 +506,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -532,7 +549,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -612,7 +630,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -623,7 +642,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -635,13 +655,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Zatwierdzony"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -657,7 +681,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Drukuj"
 
@@ -678,7 +703,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -802,7 +828,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/pt.po b/addons/hr_holidays/i18n/pt.po
index a5422a8b3d7..e2bf8c688fd 100644
--- a/addons/hr_holidays/i18n/pt.po
+++ b/addons/hr_holidays/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr "Tipo de alocação"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "A aguardar confirmação da aprovação"
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr "Modo de Alocação"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Departamento"
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr "Aprovar Pedidos"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Recusado"
 
@@ -139,7 +142,8 @@ msgid "Summary Of Leaves"
 msgstr "Listagem de Ausências"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Aprovado"
@@ -204,7 +208,8 @@ msgid "Leaves by Department"
 msgstr "Ausências por Departamento"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -258,7 +263,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -285,8 +291,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "Deve selecionar pelo menos 1 Departamento. E volte a tentar"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Confirmado"
 
@@ -313,7 +321,8 @@ msgid "Remaining Leaves"
 msgstr "Ausências Restantes"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Estado"
 
@@ -323,14 +332,17 @@ msgid "Total holidays by type"
 msgstr "Total de férias, por tipo"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Funcionário"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr "Novo"
 
@@ -371,7 +383,8 @@ msgid "Allocation for %s"
 msgstr "Alocação para %s"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Numero de dias"
@@ -412,7 +425,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Aguardando aprovação"
 
@@ -446,6 +460,7 @@ msgid "Lavender"
 msgstr "Lavanda"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr "Mês"
@@ -469,7 +484,8 @@ msgid "Employee's Holidays"
 msgstr "Férias do funcionário"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Categori­a"
 
@@ -514,7 +530,8 @@ msgid "Holiday"
 msgstr "Feriado"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Reunião"
 
@@ -556,7 +573,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Erro ! Não pode criar uma Hierarquia recursiva de Funcionários."
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr "Ausências Legais Remanescentes"
 
@@ -638,7 +656,8 @@ msgid "Compensatory Days"
 msgstr "Dias Compensatórios"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Razões"
 
@@ -649,7 +668,8 @@ msgid "Leaves Analysis"
 msgstr "Análise de Ausências"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -663,13 +683,17 @@ msgstr ""
 "Ausências por Departamento"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Validado"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Pedido de Atribuição"
 
@@ -685,7 +709,8 @@ msgid "Apply Double Validation"
 msgstr "Aplicar validação dupla"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Imprimir"
 
@@ -706,7 +731,8 @@ msgid "By Employee Category"
 msgstr "Por categoria de funcionário"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Pedido de Ausência"
 
@@ -836,7 +862,8 @@ msgid "Approve"
 msgstr "Aprovar"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Data de início"
 
diff --git a/addons/hr_holidays/i18n/pt_BR.po b/addons/hr_holidays/i18n/pt_BR.po
index dba532f0014..1c856d5bd21 100644
--- a/addons/hr_holidays/i18n/pt_BR.po
+++ b/addons/hr_holidays/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-19 15:06+0000\n"
-"Last-Translator: Gustavo T <Unknown>\n"
+"PO-Revision-Date: 2012-10-17 00:16+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr "Tipo de Alocação"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "Aguardando Segunda Aprovação"
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr "Modo de Alocação"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Departamento"
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr "Aprovar Solicitações"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Recusado"
 
@@ -140,7 +143,8 @@ msgid "Summary Of Leaves"
 msgstr "Resumo das Folgas"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Aprovado"
@@ -204,7 +208,8 @@ msgid "Leaves by Department"
 msgstr "Folgas por Departamento"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -258,7 +263,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -285,8 +291,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "Você deve selecionar pelo menos 1 Departamento."
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Confirmado"
 
@@ -313,7 +321,8 @@ msgid "Remaining Leaves"
 msgstr "Folhas Restantes"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Status"
 
@@ -323,14 +332,17 @@ msgid "Total holidays by type"
 msgstr "Total de Folgas por tipo"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Funcionário"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr "Novo"
 
@@ -371,7 +383,8 @@ msgid "Allocation for %s"
 msgstr "Alocação para %s"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Número de Dias"
@@ -413,9 +426,12 @@ msgid ""
 "When selected, the Allocation/Leave Requests for this type require a second "
 "validation to be approved."
 msgstr ""
+"Quando selecionado, a Locação/Requerimento de Saída deste tipo necessita de "
+"uma segunda aprovação."
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Aguardando Aprovação"
 
@@ -449,6 +465,7 @@ msgid "Lavender"
 msgstr "Lavanda"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr "Mês"
@@ -472,7 +489,8 @@ msgid "Employee's Holidays"
 msgstr "Férias de Funcionários"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Categoria"
 
@@ -517,7 +535,8 @@ msgid "Holiday"
 msgstr "Feriado"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Reunião"
 
@@ -559,7 +578,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Erro! Você não pode criar uma Hierarquia de Funcionários recursiva."
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr "Folgas Restantes"
 
@@ -641,7 +661,8 @@ msgid "Compensatory Days"
 msgstr "Dias Compensatórios"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Motivos"
 
@@ -652,7 +673,8 @@ msgid "Leaves Analysis"
 msgstr "Análise de Folgas"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -666,13 +688,17 @@ msgstr ""
 "departamento"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Validado"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Solicitação de Alocação"
 
@@ -688,7 +714,8 @@ msgid "Apply Double Validation"
 msgstr "Aplicar Validação Dupla"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Imprimir"
 
@@ -709,7 +736,8 @@ msgid "By Employee Category"
 msgstr "Por Categoria de Funcionário"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Pedido de Folga"
 
@@ -785,6 +813,8 @@ msgid ""
 "If you select this checkbox, the system allows the employees to take more "
 "leaves than the available ones for this type."
 msgstr ""
+"Caso esta caixa seja selecionada, o sistema autoriza os empregados deste "
+"tipo a tirarem mais licenças do que as disponíveis para este tipo."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,leaves_taken:0
@@ -839,7 +869,8 @@ msgid "Approve"
 msgstr "Aprovar"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Data Inicial"
 
diff --git a/addons/hr_holidays/i18n/ro.po b/addons/hr_holidays/i18n/ro.po
index 7fa6e26db8d..961194cf430 100644
--- a/addons/hr_holidays/i18n/ro.po
+++ b/addons/hr_holidays/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr "Tipul alocarii"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "Se asteapta a doua aprobare"
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr "Mod Alocare"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Departament"
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr "Aprobare cereri"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Respins"
 
@@ -140,7 +143,8 @@ msgid "Summary Of Leaves"
 msgstr "Rezumat Concedii"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Aprobat(e)"
@@ -206,7 +210,8 @@ msgid "Leaves by Department"
 msgstr "Concedii dupa Departament"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Anulat(a)"
 
@@ -261,7 +266,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -289,8 +295,10 @@ msgstr ""
 "Trebuie sa selectati cel putin un departament.Apoi incercati din nou."
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Confirmat(a)"
 
@@ -317,7 +325,8 @@ msgid "Remaining Leaves"
 msgstr "Concedii ramase"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Stare"
 
@@ -327,14 +336,17 @@ msgid "Total holidays by type"
 msgstr "Total concedii dupa tip"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Angajat"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr "Nou(a)"
 
@@ -377,7 +389,8 @@ msgid "Allocation for %s"
 msgstr "Alocare pentru %s"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Numar de zile"
@@ -422,7 +435,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Asteapta aprobare"
 
@@ -456,6 +470,7 @@ msgid "Lavender"
 msgstr "Lavanda"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr "Luna"
@@ -479,7 +494,8 @@ msgid "Employee's Holidays"
 msgstr "Concediile Angajatului"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Categorie"
 
@@ -524,7 +540,8 @@ msgid "Holiday"
 msgstr "Concediu"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Intalnire"
 
@@ -566,7 +583,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Eroare ! Nu puteti crea Ierarhii recursive ale Angajatilor."
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr "Concedii legale ramase"
 
@@ -648,7 +666,8 @@ msgid "Compensatory Days"
 msgstr "Zile compensatorii"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Motive"
 
@@ -659,7 +678,8 @@ msgid "Leaves Analysis"
 msgstr "Analiza concediu"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Anulati"
 
@@ -673,13 +693,17 @@ msgstr ""
 "Rapoarte\\Concedii dupa Departament"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Validat(a)"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "Cerere Alocare"
 
@@ -695,7 +719,8 @@ msgid "Apply Double Validation"
 msgstr "Aplicati Validarea Dubla"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Tipariti"
 
@@ -716,7 +741,8 @@ msgid "By Employee Category"
 msgstr "Dupa Categoria Angajatului"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Cerere de concediu"
 
@@ -846,7 +872,8 @@ msgid "Approve"
 msgstr "Aprobati"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Data de inceput"
 
diff --git a/addons/hr_holidays/i18n/ru.po b/addons/hr_holidays/i18n/ru.po
index f606b8a4f86..5363f726a61 100644
--- a/addons/hr_holidays/i18n/ru.po
+++ b/addons/hr_holidays/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "Ожидает второго подтверждения"
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Отклонено"
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr "Сумма отгулов"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Утвержденный"
@@ -192,7 +196,8 @@ msgid "Leaves by Department"
 msgstr "Отгулы по отделу"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -240,7 +245,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -267,8 +273,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "Вы должны выбрать хотя бы 1 отдел. Затем повторите попытку"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Подтверждено"
 
@@ -295,7 +303,8 @@ msgid "Remaining Leaves"
 msgstr "Оставшиеся отпуска"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Состояние"
 
@@ -305,14 +314,17 @@ msgid "Total holidays by type"
 msgstr "Сумма выходных по типу"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Сотрудник"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -353,7 +365,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Кол-во дней"
@@ -389,7 +402,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Ожидает утверждения"
 
@@ -423,6 +437,7 @@ msgid "Lavender"
 msgstr "Бледно-лиловый"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -446,7 +461,8 @@ msgid "Employee's Holidays"
 msgstr "Выходные сотрудника"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -489,7 +505,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -531,7 +548,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -611,7 +629,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -622,7 +641,8 @@ msgid "Leaves Analysis"
 msgstr "Анализ отгулов"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -636,13 +656,17 @@ msgstr ""
 "Отгулы по отделам."
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Проверено"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -658,7 +682,8 @@ msgid "Apply Double Validation"
 msgstr "Применить двойное утверждение"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Печать"
 
@@ -679,7 +704,8 @@ msgid "By Employee Category"
 msgstr "По категории сотрудника"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Заявка на отгул"
 
@@ -802,7 +828,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/sl.po b/addons/hr_holidays/i18n/sl.po
index 41ef504215c..5608e0f8a03 100644
--- a/addons/hr_holidays/i18n/sl.po
+++ b/addons/hr_holidays/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Zavrnjeno"
 
@@ -133,7 +136,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Odobreno"
@@ -190,7 +194,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -238,7 +243,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -265,8 +271,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Potrjeno"
 
@@ -293,7 +301,8 @@ msgid "Remaining Leaves"
 msgstr "Preostali odhodi"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -303,14 +312,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Zaposlenec"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -351,7 +363,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Število dni"
@@ -387,7 +400,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -419,6 +433,7 @@ msgid "Lavender"
 msgstr "Sivka"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -442,7 +457,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -485,7 +501,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -527,7 +544,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -607,7 +625,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -618,7 +637,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -630,13 +650,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Potrjeno"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -652,7 +676,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Natisni"
 
@@ -673,7 +698,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -794,7 +820,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/sq.po b/addons/hr_holidays/i18n/sq.po
index 4afcc391a38..7a48facb583 100644
--- a/addons/hr_holidays/i18n/sq.po
+++ b/addons/hr_holidays/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr ""
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr ""
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr ""
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr ""
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr ""
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr ""
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/sr.po b/addons/hr_holidays/i18n/sr.po
index 920eaf10349..520e28abcea 100644
--- a/addons/hr_holidays/i18n/sr.po
+++ b/addons/hr_holidays/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr ""
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr ""
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr ""
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr ""
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr ""
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr ""
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/sr@latin.po b/addons/hr_holidays/i18n/sr@latin.po
index ab6924599b1..6652c511f9a 100644
--- a/addons/hr_holidays/i18n/sr@latin.po
+++ b/addons/hr_holidays/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "U Očekivanju Druge POtvrde"
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr ""
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr ""
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr ""
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr ""
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr ""
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr ""
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/sv.po b/addons/hr_holidays/i18n/sv.po
index 9f3e7818729..2a7b2921278 100644
--- a/addons/hr_holidays/i18n/sv.po
+++ b/addons/hr_holidays/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -24,22 +24,23 @@ msgstr "Blå"
 #. module: hr_holidays
 #: field:hr.holidays,holiday_type:0
 msgid "Allocation Type"
-msgstr ""
+msgstr "Typ av Ledighetstilldelning"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
-msgstr ""
+msgstr "Väntar på Andra godkännandet"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,remaining_leaves:0
 msgid "Maximum Leaves Allowed - Leaves Already Taken"
-msgstr ""
+msgstr "Maximal tillåten ledighet - Ledigheten är redan förbrukad"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Leaves Management"
-msgstr "Närvarohantering"
+msgstr "Ledighetshantering"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -49,27 +50,29 @@ msgstr "Gruppera på..."
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Allocation Mode"
-msgstr ""
+msgstr "Läge för Ledighetstilldelning"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Avdelning"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
 msgid "Requests Approve"
-msgstr ""
+msgstr "Begär Godkännande"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Nekad"
 
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category of Employee"
-msgstr ""
+msgstr "Kategori av anställd"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -89,7 +92,7 @@ msgstr "Återstående dagar"
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee"
-msgstr "Per anställd"
+msgstr "Av Anställd"
 
 #. module: hr_holidays
 #: help:hr.holidays,employee_id:0
@@ -97,6 +100,8 @@ msgid ""
 "Leave Manager can let this field empty if this leave request/allocation is "
 "for every employee"
 msgstr ""
+"Den som beslutar om ledighet kan låta detta fält vara tomt om denna "
+"ledighetsförfrågan / tilldelning gäller för alla anställda"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -116,7 +121,7 @@ msgstr "Ljusgrön"
 #. module: hr_holidays
 #: field:hr.employee,current_leave_id:0
 msgid "Current Leave Type"
-msgstr ""
+msgstr "Aktuell ledighetstyp"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
@@ -126,14 +131,19 @@ msgid ""
 "the employee. You can define several allowance types (paid holidays, "
 "sickness, etc.) and manage allowances per type."
 msgstr ""
+"Ledighetsönskemål kan registreras av de anställda och bekräftas av "
+"respektive chef. När en ledighetsbegäran bekräftas, visas den automatiskt i "
+"agendan för den anställde. Du kan definiera flera typer av orsaker (betald "
+"semester, sjukdom etc.) och hantera frånvaro per orsak."
 
 #. module: hr_holidays
 #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
 msgid "Summary Of Leaves"
-msgstr ""
+msgstr "Sammanfattning av ledighet"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Godkänd"
@@ -154,6 +164,8 @@ msgstr "Vägra"
 msgid ""
 "You cannot validate leaves for employee %s: too few remaining days (%s)."
 msgstr ""
+"Du kan inte bekräfta ledighet för arbetstagare %s: För få kvarvarande dagar "
+"(%s)."
 
 #. module: hr_holidays
 #: help:hr.holidays,state:0
@@ -165,6 +177,11 @@ msgid ""
 "  \n"
 "The state is 'Approved', when holiday request is approved by manager."
 msgstr ""
+"Statusen är satt till 'Utkast', när en semesterbegäran skapas. \n"
+"Statusen 'Väntar på godkännande', när semesterbegäran bekräftas av "
+"användaren. \n"
+"Statusen 'Ej godkänd' när semesterbegäran avslås av chef. \n"
+"Statusen 'Godkänd', när semesterbegäran har godkänts av chef."
 
 #. module: hr_holidays
 #: view:board.board:0
@@ -172,25 +189,26 @@ msgstr ""
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
 msgid "Leaves"
-msgstr "Frånvaro"
+msgstr "Ledighet"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays
 msgid "Leave"
-msgstr "Lämna"
+msgstr "Ledig"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
 msgid "Leave Requests to Approve"
-msgstr "Frånvaroansökan att godkänna"
+msgstr "Ledighetsansökan att godkänna"
 
 #. module: hr_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
 msgid "Leaves by Department"
-msgstr "Frånvaro per avdelning"
+msgstr "Ledighet per avdelning"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Avbruten"
 
@@ -201,6 +219,8 @@ msgid ""
 "Choose 'Allocation Request' if you want to increase the number of leaves "
 "available for someone"
 msgstr ""
+"Välj 'Ledighetsförfrågan' om någon vill ta en ledig dag. \n"
+"Välj 'Tilldela ledighet' om du vill öka antalet ledigheter för någon"
 
 #. module: hr_holidays
 #: help:hr.employee,remaining_leaves:0
@@ -208,6 +228,8 @@ msgid ""
 "Total number of legal leaves allocated to this employee, change this value "
 "to create allocation/leave requests."
 msgstr ""
+"Totalt antal semesterdagar tilldelad den anställda. Ändra detta värde för "
+"att tilldela ledighet eller ledighetsförfrågningar."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -223,28 +245,30 @@ msgstr "Varning !"
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
-msgstr ""
+msgstr "Färg i rapporten"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
 msgid "HR Holidays Summary Report By Employee"
-msgstr ""
+msgstr "HR Sammanfattande semesterrapport per anställd"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id:0
 msgid "This area is automatically filled by the user who validate the leave"
 msgstr ""
+"Detta område fylls i automatiskt av användaren som bekräftar ledigheten"
 
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
 #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
 msgid "Leave Type"
-msgstr "Frånvarotyp"
+msgstr "Ledighetstyp"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:199
@@ -262,11 +286,13 @@ msgstr "Magenta"
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
 #, python-format
 msgid "You have to select at least 1 Department. And try again"
-msgstr ""
+msgstr "Du måste välja minst 1 avdelning. Och försök igen"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Godkänd"
 
@@ -279,38 +305,42 @@ msgstr "Från"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Confirm"
-msgstr "Godkönn"
+msgstr "Godkänn"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:384
 #, python-format
 msgid "Leave Request for %s"
-msgstr ""
+msgstr "Ledighetsbegäran för %s"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,remaining_leaves:0
 msgid "Remaining Leaves"
-msgstr "Återstående frånvaro"
+msgstr "Återstående ledighet"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Status"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
 msgid "Total holidays by type"
-msgstr ""
+msgstr "Total semester efter typ"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Anställd"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr "Ny"
 
@@ -327,7 +357,7 @@ msgstr "Röd"
 #. module: hr_holidays
 #: view:hr.holidays.remaining.leaves.user:0
 msgid "Leaves by Type"
-msgstr "Frånvarotyp"
+msgstr "Ledighetstyp"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -337,21 +367,22 @@ msgstr "Ljusrosa"
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Wheat"
-msgstr ""
+msgstr "Vete"
 
 #. module: hr_holidays
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
-msgstr "Fel! Lämna start-datum måste vara lägre sedan lämna slutdatum."
+msgstr "Fel! Ledighet - Startdatum måste ligga före Slutdatum."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:382
 #, python-format
 msgid "Allocation for %s"
-msgstr ""
+msgstr "Tilldelning för %s"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Antal dagar"
@@ -368,16 +399,24 @@ msgid ""
 "Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
 "the employees if the configuration does not allow to use this field."
 msgstr ""
+"Funktionen bakom fältet 'Kvarvarande Semester' kan endast användas när det "
+"bara finns en ledighetstyp med alternativet 'Tillåt att överskrida gränsen' "
+"ej är markerad. (%s hittades). Annars är uppdateringen tvetydig eftersom vi "
+"inte kan besluta om vilken ledighetstyp uppdateringen måste göras för. \n"
+"Du kanske föredrar att använda de klassiska menyer 'Ledighetsbegäran' och "
+"'Tilldela Ledighet' som ligger i 'Personal \\ Frånvaro' för att hantera "
+"semesterdagar för de anställda om konfigurationen inte tillåter att använda "
+"detta fält."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Search Leave Type"
-msgstr ""
+msgstr "Sök LedighetsTyp"
 
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "You have to select an employee or a category"
-msgstr ""
+msgstr "Du måste välja en anställd eller en kategori"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,double_validation:0
@@ -387,7 +426,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Väntar på godkännande"
 
@@ -402,11 +442,13 @@ msgid ""
 "If you set a meeting type, OpenERP will create a meeting in the calendar "
 "once a leave is validated."
 msgstr ""
+"Om du bokar ett typmöte, kommer OpenERP skapar ett möte i kalendern när en "
+"ledighet bekräftas."
 
 #. module: hr_holidays
 #: field:hr.holidays,linked_request_ids:0
 msgid "Linked Requests"
-msgstr ""
+msgstr "Länkad Begäran"
 
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
@@ -419,6 +461,7 @@ msgid "Lavender"
 msgstr "Lavendel"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr "Månad"
@@ -428,21 +471,22 @@ msgstr "Månad"
 #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
 msgid "Leave Requests"
-msgstr ""
+msgstr "LedighetsBegäran"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,limit:0
 msgid "Allow to Override Limit"
-msgstr ""
+msgstr "Tillåt överskrida gränsen"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.employee:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 msgid "Employee's Holidays"
-msgstr ""
+msgstr "Anställdas Ledighet"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Kategori"
 
@@ -452,22 +496,24 @@ msgid ""
 "This value is given by the sum of all holidays requests with a positive "
 "value."
 msgstr ""
+"Detta värde kommer av summan av alla ledighetsförfrågningar med positivt "
+"värde."
 
 #. module: hr_holidays
 #: view:board.board:0
 msgid "All Employee Leaves"
-msgstr "All personalfrånvaro"
+msgstr "All personalledighet"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Light Coral"
-msgstr ""
+msgstr "Ljus Coral"
 
 #. module: hr_holidays
 #: view:hr.holidays.summary.dept:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
 msgid "Holidays by Department"
-msgstr ""
+msgstr "Ledighet per avdelning"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -477,15 +523,16 @@ msgstr "Svart"
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
 msgid "Allocate Leaves for Employees"
-msgstr "Allokera frånvaro för personal"
+msgstr "Tilldela ledighet för personal"
 
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
-msgstr "Helgdag"
+msgstr "Ledighet"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Möte"
 
@@ -498,12 +545,12 @@ msgstr "Elfenbensvit"
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
 msgid "Both Validated and Confirmed"
-msgstr "Både beslutad och godkönd"
+msgstr "Både bekräftad och godkänd"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,leaves_taken:0
 msgid "Leaves Already Taken"
-msgstr "Frånvaro redan tagen"
+msgstr "Ledigheten redan förbrukad"
 
 #. module: hr_holidays
 #: field:hr.holidays,user_id:0
@@ -514,7 +561,7 @@ msgstr "Användare"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The start date must be before the end date !"
-msgstr ""
+msgstr "Startdatum måste vara före slutdatumet!"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,active:0
@@ -527,14 +574,15 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "Fel! Du kan inte skapa rekursiva hierarkier av anställda."
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
-msgstr "Återstående semester"
+msgstr "Återstående Semester"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
 msgid "First Approval"
-msgstr ""
+msgstr "Första godkännande"
 
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
@@ -546,12 +594,12 @@ msgstr "Obetald"
 #: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
 #: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
 msgid "Leaves Summary"
-msgstr "Frånvarosummering"
+msgstr "Ledighetssummering"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Holidays during last month"
-msgstr ""
+msgstr "Ledighet under förra månaden"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
@@ -562,7 +610,7 @@ msgstr "Fel"
 #. module: hr_holidays
 #: view:hr.employee:0
 msgid "Assign Leaves"
-msgstr "Tilldela frånvaro"
+msgstr "Tilldela ledighet"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -572,17 +620,17 @@ msgstr "Ljusblå"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "My Department Leaves"
-msgstr "Min avdelnings frånvaro"
+msgstr "Min avdelnings ledighet"
 
 #. module: hr_holidays
 #: field:hr.employee,current_leave_state:0
 msgid "Current Leave Status"
-msgstr ""
+msgstr "Aktuell Ledighetsstatus"
 
 #. module: hr_holidays
 #: field:hr.holidays,type:0
 msgid "Request Type"
-msgstr ""
+msgstr "Typ av begäran"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,active:0
@@ -590,6 +638,8 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the leave "
 "type without removing it."
 msgstr ""
+"Om det aktiva fältet är satt till Falskt, kommer du att kunna dölja ledighet "
+"utan att ta bort den."
 
 #. module: hr_holidays
 #: view:hr.holidays.status:0
@@ -604,10 +654,11 @@ msgstr "Allmän"
 #. module: hr_holidays
 #: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
 msgid "Compensatory Days"
-msgstr ""
+msgstr "Kompensationsdagar"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "Anledningar"
 
@@ -615,10 +666,11 @@ msgstr "Anledningar"
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
 #: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
 msgid "Leaves Analysis"
-msgstr "Frånvaroanalys"
+msgstr "Ledighetsanalys"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -628,31 +680,38 @@ msgid ""
 "This color will be used in the leaves summary located in Reporting\\Leaves "
 "by Departement"
 msgstr ""
+"Denna färg kommer att användas i sammanfattningen för ledigheten som finns  "
+"under Rapportering\\Ledighet per avdelning"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
-msgstr "Beslutad"
+msgstr "Bekräftad"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
-msgstr ""
+msgstr "Ledighetstilldelning"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
 msgid "Leave Detail"
-msgstr ""
+msgstr "Ledighet Detalj"
 
 #. module: hr_holidays
 #: field:hr.holidays,double_validation:0
 #: field:hr.holidays.status,double_validation:0
 msgid "Apply Double Validation"
-msgstr ""
+msgstr "Applicera Dubbel validering"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Skriv ut"
 
@@ -665,17 +724,18 @@ msgstr "Detaljer"
 #: view:hr.holidays:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
 msgid "My Leaves"
-msgstr "Mina frånvaro"
+msgstr "Min Ledighet"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee Category"
-msgstr ""
+msgstr "Per anställningskategori"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
-msgstr ""
+msgstr "Lämna förfrågan"
 
 #. module: hr_holidays
 #: field:hr.holidays,name:0
@@ -690,7 +750,7 @@ msgstr "Semester"
 #. module: hr_holidays
 #: sql_constraint:hr.holidays:0
 msgid "The number of days must be greater than 0 !"
-msgstr ""
+msgstr "Antalet dagar måste vara större än 0!"
 
 #. module: hr_holidays
 #: help:hr.holidays,holiday_type:0
@@ -698,17 +758,19 @@ msgid ""
 "By Employee: Allocation/Request for individual Employee, By Employee "
 "Category: Allocation/Request for group of employees in category"
 msgstr ""
+"Per Anställd: Ledighetstilldening per enskild anställd, per "
+"anställningskategori: Tilldelning för en grupp av anställda i kategorin"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:199
 #, python-format
 msgid "You cannot delete a leave which is not in draft state !"
-msgstr ""
+msgstr "Du kan inte ta bort en ledighet som inte är i status Utkast!"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Search Leave"
-msgstr ""
+msgstr "Sök Ledighet"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,holiday_type:0
@@ -718,7 +780,7 @@ msgstr "Välj semestertyp"
 #. module: hr_holidays
 #: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
 msgid "Remaining leaves"
-msgstr "Återstående frånvaro"
+msgstr "Återstående ledighet"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.dept,depts:0
@@ -728,7 +790,7 @@ msgstr "Avdelning(ar)"
 #. module: hr_holidays
 #: field:hr.holidays,manager_id2:0
 msgid "Second Approval"
-msgstr ""
+msgstr "Andra godkännandet"
 
 #. module: hr_holidays
 #: field:hr.holidays,date_to:0
@@ -753,6 +815,8 @@ msgid ""
 "This value is given by the sum of all holidays requests with a negative "
 "value."
 msgstr ""
+"Detta värde kommer av summan av alla helgdagsförfrågningar med ett negativt "
+"värde."
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -765,11 +829,13 @@ msgid ""
 "You can assign remaining Legal Leaves for each employee, OpenERP will "
 "automatically create and validate allocation requests."
 msgstr ""
+"Du kan tilldela återstående Semester för varje anställd. OpenERP kommer "
+"automatiskt skapa och bekräfta ledighetstilldeningar."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
 msgid "Maximum Allowed"
-msgstr ""
+msgstr "Högsta tillåtna"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -777,6 +843,8 @@ msgid ""
 "This area is automaticly filled by the user who validate the leave with "
 "second level (If Leave type need second validation)"
 msgstr ""
+"Detta område fylls automatiskt i av användaren som bekräftar ledighet med "
+"andra nivån (Om ledigheten behöver en 2:a bekräftelse)"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -786,7 +854,7 @@ msgstr "Läge"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
 msgid "HR Holidays Summary Report By Department"
-msgstr ""
+msgstr "HR Holidays sammanfattande rapport avdelningen"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -794,7 +862,8 @@ msgid "Approve"
 msgstr "Godkänn"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Startdatum"
 
@@ -803,7 +872,7 @@ msgstr "Startdatum"
 #: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
 #: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
 msgid "Allocation Requests"
-msgstr ""
+msgstr "Ledighetstilldening"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -823,12 +892,12 @@ msgstr "Chef"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "To Confirm"
-msgstr ""
+msgstr "För att bekräfta"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -841,5 +910,19 @@ msgstr "Att godkänna"
 #~ msgid "Human Resources: Holidays management"
 #~ msgstr "Personaladministration: Semesterhantering"
 
+#~ msgid ""
+#~ "If its True then its Allocation/Request have to be validated by second "
+#~ "validator"
+#~ msgstr ""
+#~ "Om detta stämmer, så måste ledighetstilldelningen bekräftas av ytterligare "
+#~ "en."
+
 #~ msgid "Leaves To Validate"
-#~ msgstr "Frånvaro att granska"
+#~ msgstr "Ledighet att bekräfta"
+
+#~ msgid ""
+#~ "If you tick this checkbox, the system will allow, for this section, the "
+#~ "employees to take more leaves than the available ones."
+#~ msgstr ""
+#~ "Om du markerar den här kryssrutan, kommer systemet tillåta de anställda att "
+#~ "ta mer ledighet än vad som finns tillgängligt."
diff --git a/addons/hr_holidays/i18n/th.po b/addons/hr_holidays/i18n/th.po
index 34e38c9c1c1..53cdb9ef48d 100644
--- a/addons/hr_holidays/i18n/th.po
+++ b/addons/hr_holidays/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "กำลังรอการอนุมัติระดับที่สอง"
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "แผนก"
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "ถูกปฏิเสธ"
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr "สรุปการลา"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "อนุมัติแล้ว"
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr "การลาออกแบ่งตามแผนก"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "ยกเลิกแล้ว"
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "คุณต้องเลือกอย่างน้อย 1 แผนก แล้วลองอีกครั้ง"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "ยืนยันแล้ว"
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr "วันที่เหลืออยู่"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "สถานะ"
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr "รวมวันหยุดตามประเภท"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "พนักงาน"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "จำนวนวัน"
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "กำลังรอการอนุมัติ"
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr "วันหยุดของพนักงาน"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "ประเภท"
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr "วันหยุด"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "การประชุม"
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "เหตุผล"
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr "วิเคราะห์การลา"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "ยกเลิก"
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "ผ่านการตรวจสอบแล้ว"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "พิมพ์"
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr "ตามประเภทของพนักงาน"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "ยื่นใบลา"
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr "อนุมัติ"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "วันที่เริ่มต้น"
 
diff --git a/addons/hr_holidays/i18n/tlh.po b/addons/hr_holidays/i18n/tlh.po
index 98b36a6f40c..c0d3145b3a3 100644
--- a/addons/hr_holidays/i18n/tlh.po
+++ b/addons/hr_holidays/i18n/tlh.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr ""
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr ""
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr ""
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr ""
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr ""
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr ""
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/tr.po b/addons/hr_holidays/i18n/tr.po
index d6ff2aa5b4d..af8c5e7ac17 100644
--- a/addons/hr_holidays/i18n/tr.po
+++ b/addons/hr_holidays/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr ""
 
@@ -133,7 +136,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Onaylanmış"
@@ -190,7 +194,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -238,7 +243,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -265,8 +271,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Onaylandı"
 
@@ -293,7 +301,8 @@ msgid "Remaining Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -303,14 +312,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Personel"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -351,7 +363,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Gün Sayısı"
@@ -387,7 +400,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -419,6 +433,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -442,7 +457,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -485,7 +501,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -527,7 +544,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -607,7 +625,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -618,7 +637,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "İptal"
 
@@ -630,13 +650,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "Doğrulanmış"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -652,7 +676,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "Yazdır"
 
@@ -673,7 +698,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -794,7 +820,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/uk.po b/addons/hr_holidays/i18n/uk.po
index 2889dc474d4..dfe64a2dcbe 100644
--- a/addons/hr_holidays/i18n/uk.po
+++ b/addons/hr_holidays/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr ""
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr ""
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr ""
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr ""
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr ""
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr ""
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/i18n/vi.po b/addons/hr_holidays/i18n/vi.po
index c6fe222e4c4..f994696f1ea 100644
--- a/addons/hr_holidays/i18n/vi.po
+++ b/addons/hr_holidays/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:51+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -28,7 +28,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "Đang chờ Chấp thuận Thứ hai"
 
@@ -53,7 +54,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "Phòng ban"
 
@@ -63,7 +65,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "Đã từ chối"
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "Được chấp thuận"
@@ -191,7 +195,8 @@ msgid "Leaves by Department"
 msgstr "Ngày nghỉ theo Phòng ban"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "Bị hủy bỏ"
 
@@ -239,7 +244,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -266,8 +272,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "Bạn phải chọn ít nhất 1 Phòng ban. Và thử lại"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "Đã xác nhận"
 
@@ -294,7 +302,8 @@ msgid "Remaining Leaves"
 msgstr "Số ngày nghỉ còn lại"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "Trạng thái"
 
@@ -304,14 +313,17 @@ msgid "Total holidays by type"
 msgstr "Tổng số ngày nghỉ theo loại"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "Người lao động"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -352,7 +364,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "Số ngày"
@@ -388,7 +401,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "Đang chờ Chấp thuận"
 
@@ -420,6 +434,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -443,7 +458,8 @@ msgid "Employee's Holidays"
 msgstr "Các ngày lễ của Người lao động"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "Phân loại"
 
@@ -486,7 +502,8 @@ msgid "Holiday"
 msgstr "Ngày lễ"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "Cuộc họp"
 
@@ -528,7 +545,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -608,7 +626,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -619,7 +638,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "Hủy bỏ"
 
@@ -631,13 +651,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -653,7 +677,8 @@ msgid "Apply Double Validation"
 msgstr "Thực hiện Xét duyệt Hai lần"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "In"
 
@@ -674,7 +699,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "Yêu cầu Nghỉ"
 
@@ -795,7 +821,8 @@ msgid "Approve"
 msgstr "Chấp thuận"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "Ngày bắt đầu"
 
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index cce07c2bc58..28f9441ce0b 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr "分配类型"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr "等待第二次审批"
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr "分配模式"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr "部门"
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr "需要审批"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr "已拒绝"
 
@@ -134,7 +137,8 @@ msgid "Summary Of Leaves"
 msgstr "准假摘要"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr "已审批"
@@ -195,7 +199,8 @@ msgid "Leaves by Department"
 msgstr "部门的准假"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr "已取消"
 
@@ -245,7 +250,8 @@ msgstr "这个字段会被自动填充，值是审批这个请假申请的用户
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -272,8 +278,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr "您至少得选一个部门，请再试。"
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr "已确认"
 
@@ -300,7 +308,8 @@ msgid "Remaining Leaves"
 msgstr "剩余准假"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr "状态"
 
@@ -310,14 +319,17 @@ msgid "Total holidays by type"
 msgstr "这类型假期的合计"
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr "员工"
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr "新建"
 
@@ -358,7 +370,8 @@ msgid "Allocation for %s"
 msgstr "%s 的年假"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr "天数"
@@ -397,7 +410,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr "等待审批"
 
@@ -429,6 +443,7 @@ msgid "Lavender"
 msgstr "淡紫色"
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr "月"
@@ -452,7 +467,8 @@ msgid "Employee's Holidays"
 msgstr "员工假期"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr "分类"
 
@@ -495,7 +511,8 @@ msgid "Holiday"
 msgstr "假期"
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr "会议"
 
@@ -537,7 +554,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr "错误！您不能创建循环的员工等级。"
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr "剩余的法定假期"
 
@@ -617,7 +635,8 @@ msgid "Compensatory Days"
 msgstr "补偿日数"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr "原因"
 
@@ -628,7 +647,8 @@ msgid "Leaves Analysis"
 msgstr "准假分析"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr "取消"
 
@@ -640,13 +660,17 @@ msgid ""
 msgstr "这颜色将用在准假摘要位置在：报告/部门准假。"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr "已生效"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr "分配准假"
 
@@ -662,7 +686,8 @@ msgid "Apply Double Validation"
 msgstr "要两次生效"
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr "打印"
 
@@ -683,7 +708,8 @@ msgid "By Employee Category"
 msgstr "按员工分类"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr "准假申请"
 
@@ -804,7 +830,8 @@ msgid "Approve"
 msgstr "审批"
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr "开始日期"
 
diff --git a/addons/hr_holidays/i18n/zh_TW.po b/addons/hr_holidays/i18n/zh_TW.po
index 5e6eb969ab3..9be9366f71e 100644
--- a/addons/hr_holidays/i18n/zh_TW.po
+++ b/addons/hr_holidays/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -27,7 +27,8 @@ msgid "Allocation Type"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Second Approval"
 msgstr ""
 
@@ -52,7 +53,8 @@ msgid "Allocation Mode"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,department_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
 msgid "Department"
 msgstr ""
 
@@ -62,7 +64,8 @@ msgid "Requests Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Refused"
 msgstr ""
 
@@ -133,7 +136,8 @@ msgid "Summary Of Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 view:hr.holidays:0
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
 #: selection:hr.holidays,state:0
 msgid "Approved"
 msgstr ""
@@ -190,7 +194,8 @@ msgid "Leaves by Department"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Cancelled"
 msgstr ""
 
@@ -238,7 +243,8 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,holiday_status_id:0
 #: field:hr.holidays.remaining.leaves.user,leave_type:0
-#: view:hr.holidays.status:0 field:hr.holidays.status,name:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
 #: field:hr.holidays.summary.dept,holiday_type:0
 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
 #: model:ir.model,name:hr_holidays.model_hr_holidays_status
@@ -265,8 +271,10 @@ msgid "You have to select at least 1 Department. And try again"
 msgstr ""
 
 #. module: hr_holidays
+#: code:addons/hr_holidays/report/holidays_summary_report.py:114
 #: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Confirmed"
 msgstr ""
 
@@ -293,7 +301,8 @@ msgid "Remaining Leaves"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,state:0
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
 msgid "State"
 msgstr ""
 
@@ -303,14 +312,17 @@ msgid "Total holidays by type"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 view:hr.holidays:0 field:hr.holidays,employee_id:0
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
 #: field:hr.holidays.remaining.leaves.user,name:0
 #: model:ir.model,name:hr_holidays.model_hr_employee
 msgid "Employee"
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "New"
 msgstr ""
 
@@ -351,7 +363,8 @@ msgid "Allocation for %s"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,number_of_days:0
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
 #: field:hr.holidays,number_of_days_temp:0
 msgid "Number of Days"
 msgstr ""
@@ -387,7 +400,8 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: selection:hr.employee,current_leave_state:0 selection:hr.holidays,state:0
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
 msgid "Waiting Approval"
 msgstr ""
 
@@ -419,6 +433,7 @@ msgid "Lavender"
 msgstr ""
 
 #. module: hr_holidays
+#: xsl:holidays.summary:0
 #: view:hr.holidays:0
 msgid "Month"
 msgstr ""
@@ -442,7 +457,8 @@ msgid "Employee's Holidays"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,category_id:0
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
 msgid "Category"
 msgstr ""
 
@@ -485,7 +501,8 @@ msgid "Holiday"
 msgstr ""
 
 #. module: hr_holidays
-#: field:hr.holidays,case_id:0 field:hr.holidays.status,categ_id:0
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
 msgid "Meeting"
 msgstr ""
 
@@ -527,7 +544,8 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.employee:0 field:hr.employee,remaining_leaves:0
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
 msgid "Remaining Legal Leaves"
 msgstr ""
 
@@ -607,7 +625,8 @@ msgid "Compensatory Days"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,notes:0
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
 msgid "Reasons"
 msgstr ""
 
@@ -618,7 +637,8 @@ msgid "Leaves Analysis"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Cancel"
 msgstr ""
 
@@ -630,13 +650,17 @@ msgid ""
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays.summary.dept,holiday_type:0
+#: code:addons/hr_holidays/report/holidays_summary_report.py:117
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
 #: selection:hr.holidays.summary.employee,holiday_type:0
+#, python-format
 msgid "Validated"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Allocation Request"
 msgstr ""
 
@@ -652,7 +676,8 @@ msgid "Apply Double Validation"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays.summary.dept:0 view:hr.holidays.summary.employee:0
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
 msgid "Print"
 msgstr ""
 
@@ -673,7 +698,8 @@ msgid "By Employee Category"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 selection:hr.holidays,type:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
 msgid "Leave Request"
 msgstr ""
 
@@ -794,7 +820,8 @@ msgid "Approve"
 msgstr ""
 
 #. module: hr_holidays
-#: view:hr.holidays:0 field:hr.holidays,date_from:0
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
 msgid "Start Date"
 msgstr ""
 
diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index 8a782075853..cadd3a22ce6 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -31,6 +31,7 @@ import time
 from report import report_sxw
 from tools import ustr
 from tools.translate import _
+from tools import to_xml
 
 def lengthmonth(year, month):
     if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
@@ -240,7 +241,7 @@ class report_custom(report_rml):
         <date>%s</date>
         <company>%s</company>
         </header>
-        '''  % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name)
+        ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),to_xml(pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name))
 
         # Computing the xml
         xml='''<?xml version="1.0" encoding="UTF-8" ?>
diff --git a/addons/hr_holidays/security/ir.model.access.csv b/addons/hr_holidays/security/ir.model.access.csv
index b21b6ca64e4..0375a17ac53 100644
--- a/addons/hr_holidays/security/ir.model.access.csv
+++ b/addons/hr_holidays/security/ir.model.access.csv
@@ -4,5 +4,5 @@ access_hr_holidays_user,hr.holidays.user,model_hr_holidays,base.group_hr_user,1,
 access_hr_holidays_employee,hr.holidays.employee,model_hr_holidays,base.group_user,1,1,1,1
 access_hr_holydays_status_employee,hr.holidays.status employee,model_hr_holidays_status,base.group_user,1,0,0,0
 access_hr_holidays_remain_user,hr.holidays.ramain.user,model_hr_holidays_remaining_leaves_user,base.group_hr_user,1,1,1,1
-access_resource_calendar_leaves_manager,resource_calendar_leaves_manager,resource.model_resource_calendar_leaves,base.group_hr_manager,1,1,1,1
+access_resource_calendar_leaves_user,resource_calendar_leaves_user,resource.model_resource_calendar_leaves,base.group_hr_user,1,1,1,1
 access_crm_meeting_type_manager,crm.meeting.type.manager,base_calendar.model_crm_meeting_type,base.group_hr_manager,1,1,1,1
diff --git a/addons/hr_holidays/security/ir_rule.xml b/addons/hr_holidays/security/ir_rule.xml
index 8e8c97bf7ea..ff0270026a4 100644
--- a/addons/hr_holidays/security/ir_rule.xml
+++ b/addons/hr_holidays/security/ir_rule.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0"?>
 <openerp>
   <data>
-
+    <record id="property_rule_holidays_employee" model="ir.rule">
+        <field name="name">Employee Holidays</field>
+        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="domain_force">[('employee_id.user_id','=',user.id)]</field>
+        <field name="groups" eval="[(4,ref('base.group_user'))]"/>
+    </record>
+    
+    <record id="property_rule_holidays_officer" model="ir.rule">
+        <field name="name">Holidays Officer</field>
+        <field model="ir.model" name="model_id" ref="model_hr_holidays"/>
+        <field name="domain_force">[(1,'=',1)]</field>
+        <field name="groups" eval="[(4,ref('base.group_hr_user'))]"/>
+    </record>
+    
   </data>
 </openerp>
diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index 9228a7a381e..f0e85d552cb 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -10,10 +10,6 @@
     date_to: !eval time.strftime('%Y-%m-11 19:00:00')
     employee_id: hr.employee_fp
     type: remove
--
-  I confirmed the holiday request by clicking on "Confirm" button.
--
-  !workflow {model: hr.holidays, action: confirm, ref: hr_holidays_employee1_cl}
 -
   I find a small mistake on my leave request to I click on "Refuse" button to correct a mistake.
 -
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index 66e7fd8a8f1..dfa87622264 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -23,7 +23,7 @@
     'name': 'Payroll',
     'version': '1.0',
     'category': 'Human Resources',
-    "sequence": 38,
+    'sequence': 38,
     'description': """
 Generic Payroll system.
 =======================
@@ -46,9 +46,7 @@ Generic Payroll system.
         'hr_holidays',
         'decimal_precision',
     ],
-    'init_xml': [
-    ],
-    'update_xml': [
+    'data': [
         'security/hr_security.xml',
         'wizard/hr_payroll_payslips_by_employees.xml',
         'hr_payroll_view.xml',
@@ -61,17 +59,14 @@ Generic Payroll system.
         'res_config_view.xml',
     ],
     'test': [
-         'test/payslip.yml',
-#         'test/payment_advice.yml',
-#         'test/payroll_register.yml',
-        # 'test/hr_payroll_report.yml',
-    ],
-    'demo_xml': [
-        'hr_payroll_demo.xml'
+        'test/payslip.yml',
+#        'test/payment_advice.yml',
+#        'test/payroll_register.yml',
+       # 'test/hr_payroll_report.yml',
     ],
+    'demo': ['hr_payroll_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001046261404562128861',
     'application': False,
 }
 
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index c82c6db446b..c0e4bc39321 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -81,10 +81,9 @@ class hr_payroll_structure(osv.osv):
         """
         if not default:
             default = {}
-        default.update({
-            'code': self.browse(cr, uid, id, context=context).code + "(copy)",
-            'company_id': self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
-        })
+        default.update(
+            code=_("%s (copy)") % (self.browse(cr, uid, id, context=context).code),
+            company_id=self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id)
         return super(hr_payroll_structure, self).copy(cr, uid, id, default, context=context)
 
     def get_all_rules(self, cr, uid, structure_ids, context=None):
@@ -273,10 +272,10 @@ class hr_payslip(osv.osv):
             ('done', 'Done'),
             ('cancel', 'Rejected'),
         ], 'Status', select=True, readonly=True,
-            help='* When the payslip is created the state is \'Draft\'.\
-            \n* If the payslip is under verification, the state is \'Waiting\'. \
-            \n* If the payslip is confirmed then state is set to \'Done\'.\
-            \n* When user cancel payslip the state is \'Rejected\'.'),
+            help='* When the payslip is created the status is \'Draft\'.\
+            \n* If the payslip is under verification, the status is \'Waiting\'. \
+            \n* If the payslip is confirmed then status is set to \'Done\'.\
+            \n* When user cancel payslip the status is \'Rejected\'.'),
 #        'line_ids': fields.one2many('hr.payslip.line', 'slip_id', 'Payslip Line', required=False, readonly=True, states={'draft': [('readonly', False)]}),
         'line_ids': one2many_mod2('hr.payslip.line', 'slip_id', 'Payslip Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, readonly=True, states={'draft': [('readonly', False)]}),
@@ -305,7 +304,7 @@ class hr_payslip(osv.osv):
                 return False
         return True
 
-    _constraints = [(_check_dates, "Payslip 'Date From' must be before 'Date To'.", ['date_from', 'date_to'])]  
+    _constraints = [(_check_dates, "Payslip 'Date From' must be before 'Date To'.", ['date_from', 'date_to'])]
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
@@ -313,12 +312,10 @@ class hr_payslip(osv.osv):
         company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         default.update({
             'line_ids': [],
-            'move_ids': [],
-            'move_line_ids': [],
             'company_id': company_id,
-            'period_id': False,
-            'basic_before_leaves': 0.0,
-            'basic_amount': 0.0
+            'number': '',
+            'payslip_run_id': False,
+            'paid': False,
         })
         return super(hr_payslip, self).copy(cr, uid, id, default, context=context)
 
@@ -329,6 +326,7 @@ class hr_payslip(osv.osv):
         return self.write(cr, uid, ids, {'paid': True, 'state': 'done'}, context=context)
 
     def hr_verify_sheet(self, cr, uid, ids, context=None):
+        self.compute_sheet(cr, uid, ids, context)
         return self.write(cr, uid, ids, {'state': 'verify'}, context=context)
 
     def refund_sheet(self, cr, uid, ids, context=None):
@@ -361,6 +359,12 @@ class hr_payslip(osv.osv):
     def check_done(self, cr, uid, ids, context=None):
         return True
 
+    def unlink(self, cr, uid, ids, context=None):
+        for payslip in self.browse(cr, uid, ids, context=context):
+            if payslip.state not in  ['draft','cancel']:
+                raise osv.except_osv(_('Warning!'),_('You cannot delete a payslip which is not draft or cancelled!'))
+        return super(hr_payslip, self).unlink(cr, uid, ids, context)
+
     #TODO move this function into hr_contract module, on hr.employee object
     def get_contract(self, cr, uid, employee, date_from, date_to, context=None):
         """
@@ -669,26 +673,26 @@ class hr_payslip(osv.osv):
         if not context.get('contract', False):
             #fill with the first contract of the employee
             contract_ids = self.get_contract(cr, uid, employee_id, date_from, date_to, context=context)
-            res['value'].update({
-                        'struct_id': contract_ids and contract_obj.read(cr, uid, contract_ids[0], ['struct_id'], context=context)['struct_id'][0] or False,
-                        'contract_id': contract_ids and contract_ids[0] or False,
-            })
         else:
             if contract_id:
                 #set the list of contract for which the input have to be filled
                 contract_ids = [contract_id]
-                #fill the structure with the one on the selected contract
-                contract_record = contract_obj.browse(cr, uid, contract_id, context=context)
-                res['value'].update({
-                            'struct_id': contract_record.struct_id.id,
-                            'contract_id': contract_id
-                })
             else:
                 #if we don't give the contract, then the input to fill should be for all current contracts of the employee
                 contract_ids = self.get_contract(cr, uid, employee_id, date_from, date_to, context=context)
-                if not contract_ids:
-                    return res
 
+        if not contract_ids:
+            return res
+        contract_record = contract_obj.browse(cr, uid, contract_ids[0], context=context)
+        res['value'].update({
+                    'contract_id': contract_record and contract_record.id or False
+        })
+        struct_record = contract_record and contract_record.struct_id or False
+        if not struct_record:
+            return res
+        res['value'].update({
+                    'struct_id': struct_record.id,
+        })
         #computation of the salary input
         worked_days_line_ids = self.get_worked_day_lines(cr, uid, contract_ids, date_from, date_to, context=context)
         input_line_ids = self.get_inputs(cr, uid, contract_ids, date_from, date_to, context=context)
@@ -851,7 +855,7 @@ result = rules.NET > categories.NET * 0.10''',
         """
         :param rule_id: id of rule to compute
         :param localdict: dictionary containing the environement in which to compute the rule
-        :return: returns a tuple build as the base/amount computed, the quantity and the rate 
+        :return: returns a tuple build as the base/amount computed, the quantity and the rate
         :rtype: (float, float, float)
         """
         rule = self.browse(cr, uid, rule_id, context=context)
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/hr_payroll_demo.xml
index 836814860c1..a22809b00e3 100644
--- a/addons/hr_payroll/hr_payroll_demo.xml
+++ b/addons/hr_payroll/hr_payroll_demo.xml
@@ -75,7 +75,7 @@
         <record id="hr_salary_rule_meal_voucher" model="hr.salary.rule">
             <field name="amount_select">fix</field>
             <field eval="10" name="amount_fix"/>
-            <field name="quantity">worked_days.WORK100.number_of_days</field>
+            <field name="quantity">worked_days.WORK100 and worked_days.WORK100.number_of_days</field>
             <field name="code">MA</field>
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="register_id" ref="hr_meal_voucher_register"/>
@@ -89,7 +89,7 @@
             <field name="category_id" ref="hr_payroll.ALW"/>
             <field name="name">Get 1% of sales</field>
             <field name="sequence" eval="17"/>
-            <field name="amount_python_compute">result = (inputs.SALEURO.amount + inputs.SALASIA.amount) * 0.01</field>
+            <field name="amount_python_compute">result = ((inputs.SALEURO and inputs.SALEURO.amount) + (inputs.SALASIA and inputs.SALASIA.amount)) * 0.01</field>
          </record>
 
         <!-- Rule Inputs -->
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 58484a91567..c87d36de591 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -99,8 +99,8 @@
         <menuitem
             id="menu_hr_payroll_structure_view"
             action="action_view_hr_payroll_structure_list_form"
-            parent="hr.menu_hr_configuration"
-            sequence="20"
+            parent="payroll_configure"
+            sequence="2"
         />
         <record id="action_view_hr_payroll_structure_tree" model="ir.actions.act_window">
             <field name="name">Salary Structures Hierarchy</field>
@@ -234,7 +234,7 @@
                         </h2>
                     </div>
                     <group col="4">
-                        <field name="contract_id" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
+                        <field name="contract_id" domain="[('employee_id','=',employee_id),('date_start','&lt;=',date_to),'|',('date_end','&gt;=',date_from),('date_end','=',False)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)" context="{'default_employee_id': employee_id}"/>
                         <field name="number"/>
                         <field name="struct_id" attrs="{'required':[('contract_id','&lt;&gt;',False)]}"/>
                         <field name="name"/>
@@ -369,14 +369,16 @@
             <field name="view_id" ref="view_hr_payslip_tree"/>
             <field name="search_view_id" ref="view_hr_payslip_filter"/>
         </record>
-        <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
-        <act_window name="Payslips"
-                    context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-                    res_model="hr.payslip"
-                    src_model="hr.employee"
-                    view_id ="view_hr_payslip_tree"
-                    id="act_hr_employee_payslip_list"
-                    groups="base.group_hr_manager"/>
+
+        <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll" groups="base.group_hr_user"/>        
+
+        <record id="act_hr_employee_payslip_list" model="ir.actions.act_window">
+            <field name="res_model">hr.payslip</field>
+            <field name="name">Payslips</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
+        </record>
 
         <!-- Employee View -->
         <record id="payroll_hr_employee_view_form" model="ir.ui.view">
@@ -386,7 +388,7 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="//div[@name='button_box']" position="inside">
-                        <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
+                        <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action" groups="base.group_hr_user"/>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/hr_payroll/i18n/ar.po b/addons/hr_payroll/i18n/ar.po
index 07653838057..e04b29ca9fe 100644
--- a/addons/hr_payroll/i18n/ar.po
+++ b/addons/hr_payroll/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/bg.po b/addons/hr_payroll/i18n/bg.po
index abc426ad31b..658ccd1cdb3 100644
--- a/addons/hr_payroll/i18n/bg.po
+++ b/addons/hr_payroll/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/ca.po b/addons/hr_payroll/i18n/ca.po
index 8978d26055c..a0e1320954b 100644
--- a/addons/hr_payroll/i18n/ca.po
+++ b/addons/hr_payroll/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/cs.po b/addons/hr_payroll/i18n/cs.po
index 2dbd958298b..6aeb2c39296 100644
--- a/addons/hr_payroll/i18n/cs.po
+++ b/addons/hr_payroll/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_payroll
diff --git a/addons/hr_payroll/i18n/da.po b/addons/hr_payroll/i18n/da.po
index 0958fc8abd9..44acc8922f7 100644
--- a/addons/hr_payroll/i18n/da.po
+++ b/addons/hr_payroll/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/de.po b/addons/hr_payroll/i18n/de.po
index 94575ba76de..5d66797816d 100644
--- a/addons/hr_payroll/i18n/de.po
+++ b/addons/hr_payroll/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/en_GB.po b/addons/hr_payroll/i18n/en_GB.po
index d61b9bbc2d1..1685647de1b 100644
--- a/addons/hr_payroll/i18n/en_GB.po
+++ b/addons/hr_payroll/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/es.po b/addons/hr_payroll/i18n/es.po
index 3e1758b192f..caf8a9cfe49 100644
--- a/addons/hr_payroll/i18n/es.po
+++ b/addons/hr_payroll/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/es_CR.po b/addons/hr_payroll/i18n/es_CR.po
index a80db4287d0..4dd2680353e 100644
--- a/addons/hr_payroll/i18n/es_CR.po
+++ b/addons/hr_payroll/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: hr_payroll
diff --git a/addons/hr_payroll/i18n/es_EC.po b/addons/hr_payroll/i18n/es_EC.po
index b34932d1f37..c7cfa489436 100644
--- a/addons/hr_payroll/i18n/es_EC.po
+++ b/addons/hr_payroll/i18n/es_EC.po
@@ -8,15 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-06-11 13:23+0000\n"
-"Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
-"<chris.ormaza@gmail.com>\n"
+"PO-Revision-Date: 2012-10-17 04:38+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -170,7 +169,7 @@ msgstr "Todas las reglas hijas"
 #. module: hr_payroll
 #: view:hr.payslip:0 view:hr.salary.rule:0
 msgid "Input Data"
-msgstr ""
+msgstr "Datos de entrada"
 
 #. module: hr_payroll
 #: constraint:hr.payslip:0
@@ -228,7 +227,7 @@ msgstr "Detalle regla salarial"
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
 msgid "Note"
-msgstr ""
+msgstr "Notas"
 
 #. module: hr_payroll
 #: field:hr.payroll.structure,code:0 field:hr.payslip,number:0
@@ -271,7 +270,7 @@ msgstr "Suma de el sueldo de todos los contratos actuales del empleado"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Total Working Days"
-msgstr ""
+msgstr "Total de días trabajado"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,code:0 help:hr.salary.rule,code:0
@@ -363,7 +362,7 @@ msgstr "Semi-anualmente"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Definición de Hijos"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
@@ -373,29 +372,29 @@ msgstr "Correo electrónico"
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 msgid "Search Payslip Batches"
-msgstr ""
+msgstr "Buscar bloque de roles"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount_percentage_base:0
 #: field:hr.salary.rule,amount_percentage_base:0
 msgid "Percentage based on"
-msgstr ""
+msgstr "Porcentaje basado en"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,amount_percentage:0
 #: help:hr.salary.rule,amount_percentage:0
 msgid "For example, enter 50.0 to apply a percentage of 50%"
-msgstr ""
+msgstr "Por ejemplo, ingrese 50.0 para aplicar el 50%"
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
 msgid "Made Payment Order ? "
-msgstr ""
+msgstr "Orden de Pago generada ? "
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
 msgid "PaySlip Lines by Contribution Register"
-msgstr ""
+msgstr "Detalle de nómina por contribución registrada"
 
 #. module: hr_payroll
 #: help:hr.payslip,state:0
@@ -513,7 +512,7 @@ msgstr "Regla de salario hija"
 #: field:hr.payslip.run,date_end:0 report:paylip.details:0 report:payslip:0
 #: field:payslip.lines.contribution.register,date_to:0
 msgid "Date To"
-msgstr ""
+msgstr "Fecha hasta"
 
 #. module: hr_payroll
 #: selection:hr.payslip.line,condition_select:0
@@ -576,7 +575,7 @@ msgstr "El contrato al cual aplica este ingreso"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Computation"
-msgstr ""
+msgstr "Cálculo"
 
 #. module: hr_payroll
 #: help:hr.payslip.input,amount:0
@@ -711,7 +710,7 @@ msgstr "Expresión de python"
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
 msgid "Designation"
-msgstr ""
+msgstr "Designación"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
@@ -839,7 +838,7 @@ msgstr "Registrar Nombre"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "General"
-msgstr ""
+msgstr "General"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:664
@@ -913,7 +912,7 @@ msgstr "Detalle del rol"
 #: 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 Payslips"
-msgstr ""
+msgstr "Roles de Empleado"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0 field:hr.payslip.line,register_id:0
@@ -1004,7 +1003,7 @@ msgstr "Lineas de roles por registro de contribuciones"
 #. module: hr_payroll
 #: selection:hr.payslip,state:0
 msgid "Waiting"
-msgstr ""
+msgstr "Esperando"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
diff --git a/addons/hr_payroll/i18n/es_MX.po b/addons/hr_payroll/i18n/es_MX.po
index a0f4837d947..4c9f256d438 100644
--- a/addons/hr_payroll/i18n/es_MX.po
+++ b/addons/hr_payroll/i18n/es_MX.po
@@ -1,1759 +1,1119 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-18 11:08+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-10-10 21:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Dirección de correo electrónico"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Basado"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Salario neto"
+#: view:hr.payslip:0 field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.line:0 view:hr.salary.rule:0
+msgid "Group By..."
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Recalcular plantilla"
+msgid "States"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Detalles salario de los empleados"
+#: field:hr.payslip.line,input_ids:0 view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
-msgstr "Primas con base:"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Departamento"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Deducciones:"
-
-#. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "¿Uso de propina?"
-
-#. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Días de trabajo"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Préstamo"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Registro de pago de nómina"
-
-#. module: hr_payroll
-#: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: field:hr.employee,slip_ids:0 view:hr.payslip:0 view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
 msgid "Payslips"
-msgstr "Nóminas"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Informe anual de salarios"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Nómina pagada"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "("
-msgstr "("
-
-#. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
-#: field:hr.payroll.structure,company_id:0
-#: field:hr.payslip,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "El responsable"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Detalles de la carta"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf: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 "Cambiar a borrador"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Error variable: %s "
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Vencimiento"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Vacaciones con media paga"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Otros"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,slip_id:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
-msgid "Pay Slip"
-msgstr "Nómina"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Detalles del contrato:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Campo de cálculo"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Seleccione la dirección del banco de donde se pagará la nómina."
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Aviso bancario"
-
-#. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Rechazado"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Ausencias"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
-#: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Registro"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
-"¡Error! No puede seleccionar un departamento que tenga el empleado como "
-"responsable."
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Total deducciones"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Valor"
+#: report:paylip.details:0 report:payslip:0
+msgid "("
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Nombre del empleado"
+#: field:hr.contribution.register,company_id:0
+#: field:hr.payroll.structure,company_id:0 field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0 field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
+msgid "Company"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr "Líneas de registro"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid ","
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.run:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0 field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip report:payslip:0
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.salary.rule:0
+msgid "Input Data"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Salary Computation"
-msgstr "Cálculo de la nómina"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
-msgid "Amount"
-msgstr "Importe"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
 msgstr ""
-"Por favor, compruebe la configuración de %s, falta la cabecera de la nómina"
 
 #. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Porcentaje"
+#: report:contribution.register.lines:0 field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0 report:paylip.details:0 report:payslip:0
+msgid "Amount"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-msgid "Other Information"
-msgstr "Otra información"
-
-#. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "País de emisión"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Deducción del empleado"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Otras deducciones"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Vacaciones pagada"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Fecha expiración pasaporte"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Vacaciones no pagadas"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Válido desde"
-
-#. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
-msgstr "Campo usado en cálculos internos, no lo coloque en un formulario."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Importe (en palabras):"
-
-#. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Pago"
-
-#. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
+#: view:hr.payslip:0 view:hr.payslip.line:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_line
 msgid "Payslip Line"
-msgstr "Línea de nómina"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Identification No"
-msgstr "Nº identificación"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Basado en"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Esperando verificación"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Nóminas de recursos humanos"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Total:"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Posted"
-msgstr "Fijado"
-
-#. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
-msgid ""
-"Generic Payroll system\n"
-"    * Employee Details\n"
-"    * Employee Contracts\n"
-"    * Passport based Contract\n"
-"    * Allowances / Deductions\n"
-"    * Allow to configure Basic / Grows / Net Salary\n"
-"    * Employee Payslip\n"
-"    * Monthly Payroll Register\n"
-"    * Integrated with Holiday Management\n"
-"    "
 msgstr ""
-"Sistema de nóminas genérico\n"
-"    * Detalles de empleado\n"
-"    * Contratos de empleado\n"
-"    * Contratos basados en pasaportes\n"
-"    * Complementos/deducciones\n"
-"    * Permite configurar salario base/bruto/neto\n"
-"    * Nómina de empleado\n"
-"    * Registro mensual de nóminas\n"
-"    * Integrado con la gestión de vacaciones\n"
-"    "
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Tipo de ausencia"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Fecha :"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Subtotal"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Pagos -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Número de Visa"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Desde"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Por salario"
-
-#. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
-msgid "Employee PaySlip"
-msgstr "Nómina del empleado"
-
-#. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Deducciones por ausencia"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Firma autorizada"
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Valor de función"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
-msgstr "Línea de registro de contribución"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Notas:"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
-#: field:hr.payslip,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr "Líneas de pago"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Otras líneas"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Argumentos de la función"
+msgid "Other Information"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "Contribuciones de la compañía"
+#: help:hr.payslip.line,amount_select:0 help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: 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
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Note"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.structure,code:0 field:hr.payslip,number:0
+#: report:paylip.details:0 report:payslip:0
+msgid "Reference"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Total Working Days"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,code:0 help:hr.salary.rule,code:0
+msgid ""
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,rate:0
+msgid "Rate (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
+msgid "Employee PaySlip"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,state:0 field:hr.payslip.run,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,employee_id:0 field:hr.payslip.line,employee_id:0
 #: model:ir.model,name:hr_payroll.model_hr_employee
 msgid "Employee"
-msgstr "Empleado"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Fórmula"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr "Líneas de notificación bancaria"
+#: view:hr.salary.rule:0
+msgid "Children Definition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0 report:payslip:0
 msgid "Email"
-msgstr "Correo electrónico"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
 
 #. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "¡ Error !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Comprobar hoja"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "Número de días/semanas trabajados para un empleado."
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'.            \n"
+"* If the payslip is under verification, the state is 'Waiting'.             "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'.            \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "Nuevo justificante"
+msgid "Rejected"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "Base neta"
+#: view:hr.payroll.structure:0 field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Salario bruto"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Ingresos totales"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
-msgstr "Declaración salario del empleado"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Otros pagos"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Deducciones"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr "C/D"
-
-#. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "Nº permiso trabajo"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Salario empleado"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
-msgstr "Cada uno de nuestros"
-
-#. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Total por empleado"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Importe fijo"
-
-#. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Para"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
+#: code:addons/hr_payroll/hr_payroll.py:337
 #, python-format
-msgid "Variable Error !"
-msgstr "¡Error de variable!"
+msgid "Refund: "
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "rrhh.nomina.empleados.detalle"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 selection:hr.payslip,state:0 view:hr.payslip.run:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0 field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,active:0 help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Pagar nómina"
+msgid "Worked Days & Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
-msgstr "Cuenta bancaria"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
-msgstr "Líneas de contribución"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "Para el mes de"
+#: help:hr.payslip.line,register_id:0 help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Deducción"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr "Observación aviso bancario"
+#: view:hr.payslip:0
+msgid "PaySlip Batch"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,child_ids:0 field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0 report:paylip.details:0 report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
 #: view:hr.payslip:0
 msgid "Payslip"
-msgstr "Nómina"
+msgstr ""
 
 #. module: hr_payroll
 #: constraint:hr.contract:0
 msgid "Error! contract start-date must be lower then contract end-date."
 msgstr ""
-"¡Error! La fecha de inicio de contrato debe ser menor que la fecha de "
-"finalización."
 
 #. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "Entrega anticipo"
+#: view:hr.contract:0
+msgid "Payslip Info"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "Comprobación RH completa"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "Atentamente"
+#: code:addons/hr_payroll/hr_payroll.py:872
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr "Nº SS"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Importe neto"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Estructura salarial:"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Detalle salario empleado"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "Línea de función"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+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 "Hoja de confirmación"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Otros:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr "Función de cálculo"
-
-#. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Días trabajados"
-
-#. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Total por compañía"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
-msgstr "D/C"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "País y Dirección"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Código de empleado"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
-msgstr "Salario base - Ausencias"
-
-#. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0 field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
-msgstr "Tipo de importe"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: field:hr.payslip.line,category_id:0
+#: field:hr.payslip.line,category_id:0 view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
 msgid "Category"
-msgstr "Categoría"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
-msgstr "Contribución compañía"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
-msgstr "Cabeceras"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Imprimir declaración"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 selection:hr.payslip,state:0 view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0 report:paylip.details:0 report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Percentage (%)"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "Ingresos"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Básico"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Todos los pasaportes"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
-msgstr "Registro salarial"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Nombre del empleado"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Detalle pasaporte"
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Percentage (%)"
-msgstr "Porcentaje (%)"
-
-#. 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 "Registro de nóminas"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "Para"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Contratos"
+msgid "Worked Day"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 msgid "Employee Function"
-msgstr "Función del empleado"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Pagado"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Aprobar hoja"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "¿Pagado? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Validación"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Título"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr "Buscar contribución de la compañía"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Líneas de pago"
+#: field:hr.payslip,credit_note:0 field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
-msgstr "Calcular hoja"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0 field:hr.salary.rule,active:0
 msgid "Active"
-msgstr "Activo"
+msgstr ""
 
 #. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr "Aplicar este encabezado en el cálculo si la condición es verdadera"
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Detalles del salario anual"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Condición"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "Esperando verificación de RRHH"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
-msgstr "Aviso de pago:"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Calcular"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0 report:payslip:0
 msgid "Designation"
-msgstr "Designación"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "Responsable de RRHH"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Salario base"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "Código categoría"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Información del salario"
-
-#. 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 "Categoría prima/deducción"
+#: code:addons/hr_payroll/hr_payroll.py:861
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Companies"
-msgstr "Compañías"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0 report:payslip:0
 msgid "Authorized Signature"
-msgstr "Firma autorizada"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,contract_id:0
+#: field:hr.payslip,contract_id:0 field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contract
 msgid "Contract"
-msgstr "Contrato"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr "Hoja borrador"
+#: report:paylip.details:0 report:payslip:0
+msgid "Credit"
+msgstr ""
 
 #. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
-msgstr "Fecha próximo mes"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Fecha"
+#: code:addons/hr_payroll/hr_payroll.py:861
+#: code:addons/hr_payroll/hr_payroll.py:866
+#: code:addons/hr_payroll/hr_payroll.py:872
+#: code:addons/hr_payroll/hr_payroll.py:889
+#: code:addons/hr_payroll/hr_payroll.py:895
+#, python-format
+msgid "Error"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Fecha expiración visado"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "Buscar pasaporte"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "Nº Teléfono"
-
-#. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
+#: view:hr.contribution.register:0
 msgid "Contribution"
-msgstr "Contribución"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Etiqueta"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:895
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0 field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.structure:0
 #: view:hr.payslip:0
-#: view:hr.payslip.line:0
+msgid "Refund"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
 msgid "Company Contribution"
-msgstr "Contribución compañía"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
-msgstr "Otro Nº"
-
-#. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
-#: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0 field:hr.payslip.input,code:0
+#: field:hr.payslip.line,code:0 field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0 field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0 report:paylip.details:0
+#: report:payslip:0
 msgid "Code"
-msgstr "Código"
-
-#. 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
-msgid "Payment Advice"
-msgstr "Aviso de pago"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Número :"
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
 msgstr ""
-"Esto se utiliza para calcular los valores de los campos %, en general en su "
-"base, pero puede utilizar todas las cabeceras de los campos de código en "
-"letra pequeña como un nombre de variable, por ejemplo hra, ma, lta, etc., "
-"también puede utilizar variable estática básica."
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
-msgstr "Resumen del cálculo"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
-msgstr "Salario sobre"
+#: field:hr.payslip.input,sequence:0 field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0 field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Número"
+#: report:contribution.register.lines:0 report:paylip.details:0
+msgid "Register Name"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
-#: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
-#: view:hr.payslip:0
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:664
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,struct_id:0 view:hr.payroll.structure:0 view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
 #: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
 msgid "Salary Structure"
-msgstr "Estructura salarial"
-
-#. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
-msgid "Register Line"
-msgstr "Línea registro"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Importe / Porcentaje"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Primas"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr "Fecha mes actual"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Salario"
-
-#. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Número de pasaporte"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Pasaporte"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Salario total"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "por periodo"
-
-#. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "Cabecera nómina"
-
-#. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
-msgid "Contribution Register"
-msgstr "Registro de contribución"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "Correo electrónico"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
-msgstr "Cabeceras salario"
-
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Imprimir informe"
-
-#. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
-msgid "Calculations"
-msgstr "Cálculos"
-
-#. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
 msgstr ""
-"Define el ratio de contribución de la compañía 1,00=100% de la contribución. "
-"Si el empleado contribuye con el 5%, entonces si aquí la compañía tiene un "
-"ratio de 0.50, la compañía contribuirá con el 50% del 5% de la contribución "
-"del empleado."
 
 #. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Otra información"
+#: field:hr.contribution.register,register_line_ids:0
+msgid "Register Line"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Mes"
+#: view:hr.payslip:0 view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
+msgid "Cancel"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr "Incidencia"
+#: view:hr.payslip.run:0 selection:hr.payslip.run,state:0
+msgid "Close"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "Cálculo Dinámico"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr "Salario base sin ausencias:"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+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 Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0 field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:889
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
 #: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Función"
+msgid "Calculations"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "States"
-msgstr "Estados"
+msgid "Worked Days"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Apreciado Sr./Sra.,"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
-msgstr "Cabeceras prima/deducción"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "Sal. bruto"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,note:0
 #: view:hr.payslip:0
-#: field:hr.payslip,note:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,note:0
+msgid "Search Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0 field:hr.contribution.register,note:0
+#: field:hr.payroll.structure,note:0 field:hr.payslip,name:0
+#: field:hr.payslip,note:0 field:hr.payslip.input,name:0
+#: view:hr.payslip.line:0 field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0 field:hr.rule.input,name:0
+#: view:hr.salary.rule:0 field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
 msgid "Description"
-msgstr "Descripción"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr "Deducción -"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0 report:payslip:0
 msgid ")"
-msgstr ")"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
-msgstr "Registros de contribución"
+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
 #: model:ir.ui.menu,name:hr_payroll.payroll_configure
 msgid "Payroll"
-msgstr "Nómina"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Tipo de salario"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
 
 #. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "Sal. neto"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr "¡El número de pasaporte debe ser único!"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Nombre categoría"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
-msgstr "hr.nómina.año.salario"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Address"
-msgstr "Dirección"
-
-#. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr "Línea justificante"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "Número de hojas"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Banco"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "Cancelar hoja"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Adelanto"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr "Primas y deducciones especiales por empleado:"
-
-#. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
-#: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
-#: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr "Hojas de deducción"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "País"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
-#: view:hr.payslip:0
-msgid "Employees"
-msgstr "Empleados"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Bank Account"
-msgstr "Cuenta bancaria"
-
-#. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr "Registro de contribución basado en la empresa"
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
-msgid "Use to arrange calculation sequence"
-msgstr "Se utiliza para organizar la secuencia de cálculo"
-
-#. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Pago total"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr "Línea de deducciones por ausencias:"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
 #: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr "Esperando por verificación de la cuenta"
+msgid "Waiting"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr "Deducción de la Compañía"
+#: report:paylip.details:0 report:payslip:0
+msgid "Address"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Configuración nómina"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
+#: code:addons/hr_payroll/hr_payroll.py:866
 #, python-format
-msgid "Please define bank account for the %s employee"
-msgstr "Por favor, defina la cuenta bancaria para el empleado %s"
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "Fecha de emisión del pasaporte"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: 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 "Prima"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "N º de hojas"
+#: report:contribution.register.lines:0 field:hr.contribution.register,name:0
+#: field:hr.payroll.structure,name:0 field:hr.payslip.line,name:0
+#: field:hr.payslip.run,name:0 field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0 report:paylip.details:0
+#: report:payslip:0
+msgid "Name"
+msgstr ""
 
 #. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "Otro id"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Detalles bancarios"
+#: view:hr.payslip:0 view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0 view:hr.payslip.line:0
+msgid "Employees"
+msgstr ""
 
 #. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
-msgstr "ID justificante"
+#: report:paylip.details:0 report:payslip:0
+msgid "Bank Account"
+msgstr ""
 
 #. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: help:hr.payslip.line,sequence:0 help:hr.salary.rule,sequence:0
+msgid "Use to arrange calculation sequence"
+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 "Nómina de los empleados"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will be used to compute the % fields values; in general it is on basic, "
+"but you can also use categories code fields in lowercase as a variable names "
+"(hra, ma, lta, etc.) and the variable basic."
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "Contenido carta"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Salario anual"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
 
 #. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr "Prima / Deducción"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
 
 #. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr "Aviso de pago del banco"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip.line,total:0
+#: report:paylip.details:0 report:payslip:0
+msgid "Total"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
 
 #. module: hr_payroll
 #: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr "Buscar nóminas"
+msgid "Details By Salary Rule Category"
+msgstr ""
 
 #. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Total"
+#: help:hr.payslip.input,code:0 help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
 
 #. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr "Contribuciones"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
 
-#~ msgid "Categoty Code"
-#~ msgstr "Código de categoría"
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
 
-#~ msgid "Categoty Name"
-#~ msgstr "Nombre categoría"
+#. module: hr_payroll
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre del modelo inválido en la definición de acción."
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
 
-#~ msgid "Analytic Account for Salary Analysis"
-#~ msgstr "Cuenta analítica para análisis de nóminas"
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
 
-#~ msgid "Employee No"
-#~ msgstr "Núm. trabajador"
-
-#~ msgid "Employee Payable Account"
-#~ msgstr "Cuenta a pagar del trabajador"
-
-#~ msgid "Account"
-#~ msgstr "Cuenta"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "¡ Aviso !"
-
-#~ msgid "Payment From"
-#~ msgstr "Pago desde"
-
-#~ msgid "Keep empty to use the period of the validation(Payslip) date."
-#~ msgstr ""
-#~ "Deje en blanco para usar el período de la fecha de validación de la nómina"
-
-#~ msgid "Analytic Account"
-#~ msgstr "Cuenta analítica"
-
-#~ msgid "Force Period"
-#~ msgstr "Forzar período"
-
-#~ msgid "Accounting Information"
-#~ msgstr "Información contable"
-
-#, python-format
-#~ msgid "Integrity Error !"
-#~ msgstr "¡Error de integridad!"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Misceláneos"
-
-#~ msgid "Error! You can not create recursive analytic accounts."
-#~ msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#~ msgid "Account Lines"
-#~ msgstr "Movimientos"
-
-#~ msgid "Accounting Informations"
-#~ msgstr "Información contable"
-
-#~ msgid "Print"
-#~ msgstr "Imprimir"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Accounting Lines"
-#~ msgstr "Movimientos contables"
-
-#~ msgid "Bank Journal"
-#~ msgstr "Diario bancario"
-
-#~ msgid "Expense"
-#~ msgstr "Gastos"
-
-#~ msgid "Payment Entries"
-#~ msgstr "Asientos de pago"
-
-#~ msgid "Salary Account"
-#~ msgstr "Cuenta de nómina"
-
-#~ msgid "Employee Contract"
-#~ msgstr "Contrato de trabajador"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "General Account"
-#~ msgstr "Cuenta general"
-
-#~ msgid "Process"
-#~ msgstr "Proceso"
-
-#~ msgid "Employee Account"
-#~ msgstr "Cuenta trabajador"
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "Accounting Details"
-#~ msgstr "Detalles de contabilidad"
-
-#~ msgid "Account Information"
-#~ msgstr "Información de la cuenta"
-
-#~ msgid "Generalities"
-#~ msgstr "Generalidades"
-
-#~ msgid "Contract Duration"
-#~ msgstr "Duración del contrato"
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
-#~ msgid "Fiscal Year"
-#~ msgstr "Ejercicio fiscal"
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
diff --git a/addons/hr_payroll/i18n/et.po b/addons/hr_payroll/i18n/et.po
index 6dcf69908ca..6d6fd2de4e9 100644
--- a/addons/hr_payroll/i18n/et.po
+++ b/addons/hr_payroll/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/fi.po b/addons/hr_payroll/i18n/fi.po
index 9a9975e33ca..ca4cc20362a 100644
--- a/addons/hr_payroll/i18n/fi.po
+++ b/addons/hr_payroll/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/fr.po b/addons/hr_payroll/i18n/fr.po
index c2a29dc248c..c21a60cf0bf 100644
--- a/addons/hr_payroll/i18n/fr.po
+++ b/addons/hr_payroll/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/gl.po b/addons/hr_payroll/i18n/gl.po
index ee657304fa2..dfd97f0792c 100644
--- a/addons/hr_payroll/i18n/gl.po
+++ b/addons/hr_payroll/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/gu.po b/addons/hr_payroll/i18n/gu.po
index 20ba6016337..15cbc3cd318 100644
--- a/addons/hr_payroll/i18n/gu.po
+++ b/addons/hr_payroll/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/he.po b/addons/hr_payroll/i18n/he.po
index 4def38eef47..d7d31aa6bce 100644
--- a/addons/hr_payroll/i18n/he.po
+++ b/addons/hr_payroll/i18n/he.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/hr.po b/addons/hr_payroll/i18n/hr.po
index c8f251faded..e19c65fc1ad 100644
--- a/addons/hr_payroll/i18n/hr.po
+++ b/addons/hr_payroll/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/hu.po b/addons/hr_payroll/i18n/hu.po
index 810f73b27d0..8adde3a7f85 100644
--- a/addons/hr_payroll/i18n/hu.po
+++ b/addons/hr_payroll/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -32,7 +32,7 @@ msgstr ""
 #: view:hr.payslip:0 field:hr.payslip,line_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
 msgid "Payslip Lines"
-msgstr ""
+msgstr "Fizetési jegyzék sorai"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0
@@ -120,7 +120,7 @@ msgstr ""
 #: field:hr.payslip,payslip_run_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_run
 msgid "Payslip Batches"
-msgstr ""
+msgstr "Fizetési jegyzék kötegek"
 
 #. module: hr_payroll
 #: view:hr.payslip.employees:0
@@ -133,7 +133,7 @@ msgstr ""
 #: report:contribution.register.lines:0 report:paylip.details:0
 #: report:payslip:0
 msgid "Quantity/Rate"
-msgstr ""
+msgstr "Mennyiség / Arány"
 
 #. module: hr_payroll
 #: field:hr.payslip.input,payslip_id:0 field:hr.payslip.line,slip_id:0
@@ -145,7 +145,7 @@ msgstr "Fizetési jegyzék"
 #. module: hr_payroll
 #: view:hr.payslip.employees:0
 msgid "Generate"
-msgstr ""
+msgstr "Létrehozás"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,amount_percentage_base:0
@@ -166,7 +166,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip:0 view:hr.salary.rule:0
 msgid "Input Data"
-msgstr ""
+msgstr "Adatbevitel"
 
 #. module: hr_payroll
 #: constraint:hr.payslip:0
@@ -219,7 +219,7 @@ msgstr ""
 #. module: hr_payroll
 #: report:paylip.details:0
 msgid "Details by Salary Rule Category:"
-msgstr ""
+msgstr "Részletek fizetési szabályok szerint"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
@@ -230,7 +230,7 @@ msgstr ""
 #: field:hr.payroll.structure,code:0 field:hr.payslip,number:0
 #: report:paylip.details:0 report:payslip:0
 msgid "Reference"
-msgstr ""
+msgstr "Hivatkozás"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -241,7 +241,7 @@ msgstr ""
 #: code:addons/hr_payroll/hr_payroll.py:422
 #, python-format
 msgid "Normal Working Days paid at 100%"
-msgstr ""
+msgstr "Normál munkanap 100%-an fizetve"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_range_max:0
@@ -257,7 +257,7 @@ msgstr "Személyi igazolvány száma"
 #. module: hr_payroll
 #: field:hr.payslip,struct_id:0
 msgid "Structure"
-msgstr ""
+msgstr "Szerkezet"
 
 #. module: hr_payroll
 #: help:hr.employee,total_wage:0
@@ -284,7 +284,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.payslip.line,rate:0
 msgid "Rate (%)"
-msgstr ""
+msgstr "Arány (%)"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -313,7 +313,7 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip.employees:0
 msgid "Payslips by Employees"
-msgstr ""
+msgstr "Fizetési jegyzékek alkalmazottak szerint"
 
 #. module: hr_payroll
 #: selection:hr.contract,schedule_pay:0
@@ -362,7 +362,7 @@ msgstr "E-mail"
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 msgid "Search Payslip Batches"
-msgstr ""
+msgstr "Fizetési jegyzék kötegek keresése"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount_percentage_base:0
@@ -399,7 +399,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.payslip.worked_days,number_of_days:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Napok száma"
 
 #. module: hr_payroll
 #: selection:hr.payslip,state:0
@@ -434,7 +434,7 @@ msgstr ""
 #: field:hr.payslip.line,appears_on_payslip:0
 #: field:hr.salary.rule,appears_on_payslip:0
 msgid "Appears on Payslip"
-msgstr ""
+msgstr "Fizetési jegyzéken feltüntetve"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount_fix:0
@@ -453,17 +453,17 @@ msgstr ""
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Worked Days & Inputs"
-msgstr ""
+msgstr "Ledolgozott napok és adatbevitelek"
 
 #. module: hr_payroll
 #: field:hr.payslip,details_by_salary_rule_category:0
 msgid "Details by Salary Rule Category"
-msgstr ""
+msgstr "Részletek fizetési szabályok szerint"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
 msgid "PaySlip Lines"
-msgstr ""
+msgstr "Fizetési jegyzék sor"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,register_id:0 help:hr.salary.rule,register_id:0
@@ -473,12 +473,12 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.payslip.worked_days,number_of_hours:0
 msgid "Number of Hours"
-msgstr ""
+msgstr "Órák száma"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "PaySlip Batch"
-msgstr ""
+msgstr "Fizetési jegyzék köteg"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_range_min:0
@@ -496,7 +496,7 @@ msgstr ""
 #: field:hr.payslip.run,date_end:0 report:paylip.details:0 report:payslip:0
 #: field:payslip.lines.contribution.register,date_to:0
 msgid "Date To"
-msgstr ""
+msgstr "Dátumig"
 
 #. module: hr_payroll
 #: selection:hr.payslip.line,condition_select:0
@@ -508,7 +508,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
 msgid "Salary Structures Hierarchy"
-msgstr ""
+msgstr "Bérszerkezet hierarchia"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -523,12 +523,12 @@ msgstr "Hiba! A szerződés kezdetének előbb kell lennie mint a végének."
 #. module: hr_payroll
 #: view:hr.contract:0
 msgid "Payslip Info"
-msgstr ""
+msgstr "Fizetési jegyzék info"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
 msgid "Payslip Computation Details"
-msgstr ""
+msgstr "Fizetési jegyzék számításának részletei"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:872
@@ -539,7 +539,7 @@ msgstr ""
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_input
 msgid "Payslip Input"
-msgstr ""
+msgstr "Fizetési jegyzék adatbevitel"
 
 #. module: hr_payroll
 #: view:hr.salary.rule.category:0
@@ -590,12 +590,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
 msgid "Salary Structures"
-msgstr ""
+msgstr "Bérszerkezetek"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 msgid "Draft Payslip Batches"
-msgstr ""
+msgstr "Fizetési jegyzék vázlatok"
 
 #. module: hr_payroll
 #: view:hr.payslip:0 selection:hr.payslip,state:0 view:hr.payslip.run:0
@@ -608,7 +608,7 @@ msgstr "Tervezet"
 #: field:hr.payslip.run,date_start:0 report:paylip.details:0 report:payslip:0
 #: field:payslip.lines.contribution.register,date_from:0
 msgid "Date From"
-msgstr ""
+msgstr "Dátumtól"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
@@ -646,7 +646,7 @@ msgstr "Alkalmazotti funkció"
 #. module: hr_payroll
 #: field:hr.payslip,credit_note:0 field:hr.payslip.run,credit_note:0
 msgid "Credit Note"
-msgstr ""
+msgstr "Jóváírás"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -671,7 +671,7 @@ msgstr "Hiba! Nem hozhat létre rekurzív alkalmazotti hierarchiát."
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
 msgid "PaySlip Details"
-msgstr ""
+msgstr "Fizetési jegyzék részletei"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,condition_range_min:0
@@ -723,7 +723,7 @@ msgstr "Szerződés"
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
 msgid "Credit"
-msgstr ""
+msgstr "Követel"
 
 #. module: hr_payroll
 #: field:hr.contract,schedule_pay:0
@@ -772,7 +772,7 @@ msgstr ""
 #. module: hr_payroll
 #: field:hr.payslip.line,quantity:0 field:hr.salary.rule,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Mennyiség"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -821,7 +821,7 @@ msgstr ""
 #: code:addons/hr_payroll/hr_payroll.py:664
 #, python-format
 msgid "Salary Slip of %s for %s"
-msgstr ""
+msgstr "%s fizetési jegyzéke, időszak: %s"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_employees
@@ -885,7 +885,7 @@ msgstr ""
 #: 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 Payslips"
-msgstr ""
+msgstr "Fizetési jegyzékek"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0 field:hr.payslip.line,register_id:0
@@ -921,7 +921,7 @@ msgstr "Számítások"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Worked Days"
-msgstr ""
+msgstr "Ledolgozott nap"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -933,7 +933,7 @@ msgstr "Fizetési jegyzékek keresése"
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
 msgid "Payslips Batches"
-msgstr ""
+msgstr "Fizetési jegyzék kötegek"
 
 #. module: hr_payroll
 #: view:hr.contribution.register:0 field:hr.contribution.register,note:0
@@ -990,7 +990,7 @@ msgstr ""
 #: field:hr.payslip,worked_days_line_ids:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
 msgid "Payslip Worked Days"
-msgstr ""
+msgstr "Fizetési jegyzék ledolgozott napjai"
 
 #. module: hr_payroll
 #: view:hr.salary.rule.category:0
@@ -1009,7 +1009,7 @@ msgstr "Név"
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 msgid "Payroll Structures"
-msgstr ""
+msgstr "Fizetési jegyzék szerkezet"
 
 #. module: hr_payroll
 #: view:hr.payslip:0 view:hr.payslip.employees:0
diff --git a/addons/hr_payroll/i18n/id.po b/addons/hr_payroll/i18n/id.po
index bd4af32ca10..fbd4e2311e1 100644
--- a/addons/hr_payroll/i18n/id.po
+++ b/addons/hr_payroll/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/it.po b/addons/hr_payroll/i18n/it.po
index 562432afb24..74c6f6646d8 100644
--- a/addons/hr_payroll/i18n/it.po
+++ b/addons/hr_payroll/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/ja.po b/addons/hr_payroll/i18n/ja.po
index 216934fbc7e..6f08b8066b7 100644
--- a/addons/hr_payroll/i18n/ja.po
+++ b/addons/hr_payroll/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/lo.po b/addons/hr_payroll/i18n/lo.po
index 2865166f869..d4fb57805df 100644
--- a/addons/hr_payroll/i18n/lo.po
+++ b/addons/hr_payroll/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/lt.po b/addons/hr_payroll/i18n/lt.po
index 28e13dc0ebe..7d63d390b23 100644
--- a/addons/hr_payroll/i18n/lt.po
+++ b/addons/hr_payroll/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/lv.po b/addons/hr_payroll/i18n/lv.po
index f54bf17ea07..de2e8b95cf3 100644
--- a/addons/hr_payroll/i18n/lv.po
+++ b/addons/hr_payroll/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/mn.po b/addons/hr_payroll/i18n/mn.po
index 99addf251a2..8a19ce129b1 100644
--- a/addons/hr_payroll/i18n/mn.po
+++ b/addons/hr_payroll/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/nb.po b/addons/hr_payroll/i18n/nb.po
index 9c2b00c64d4..6611d33891b 100644
--- a/addons/hr_payroll/i18n/nb.po
+++ b/addons/hr_payroll/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/nl.po b/addons/hr_payroll/i18n/nl.po
index a06cbc4db7d..bbe33fd07f1 100644
--- a/addons/hr_payroll/i18n/nl.po
+++ b/addons/hr_payroll/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-22 19:09+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"PO-Revision-Date: 2012-09-03 17:17+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
@@ -130,6 +130,8 @@ msgid ""
 "This wizard will generate payslips for all selected employee(s) based on the "
 "dates and credit note specified on Payslips Run."
 msgstr ""
+"Deze wizzard zal salarisstroken genereren,  voor alle geselecteerde "
+"medewerkers, gebaseerd op ?"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0 report:paylip.details:0
@@ -153,7 +155,7 @@ msgstr "Genereren"
 #: help:hr.payslip.line,amount_percentage_base:0
 #: help:hr.salary.rule,amount_percentage_base:0
 msgid "result will be affected to a variable"
-msgstr ""
+msgstr "resultaat wordt beïnvloed door een variabele"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -205,7 +207,7 @@ msgstr "Overige informatie"
 #. module: hr_payroll
 #: help:hr.payslip.line,amount_select:0 help:hr.salary.rule,amount_select:0
 msgid "The computation method for the rule amount."
-msgstr ""
+msgstr "De berekeningsmethode voor de regel totaalbedrag."
 
 #. module: hr_payroll
 #: view:payslip.lines.contribution.register:0
@@ -278,6 +280,8 @@ msgid ""
 "The code of salary rules can be used as reference in computation of other "
 "rules. In that case, it is case sensitive."
 msgstr ""
+"De code van het salaris regels kan worden gebruikt als referentie berekening "
+"voor andere regels. In dat geval is het hoofdlettergevoelig."
 
 #. module: hr_payroll
 #: selection:hr.contract,schedule_pay:0
@@ -303,7 +307,7 @@ msgstr "Loonstrook werkenemer"
 #: help:hr.payslip.line,condition_range_max:0
 #: help:hr.salary.rule,condition_range_max:0
 msgid "The maximum amount, applied for this rule."
-msgstr ""
+msgstr "Het maximum bedrag, van toepassing voor deze regel"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,condition_python:0
@@ -312,6 +316,8 @@ msgid ""
 "Applied this rule for calculation if condition is true. You can specify "
 "condition like basic > 1000."
 msgstr ""
+"Toegepaste regel voor de berekening als de conditie waar is. U kunt een "
+"conditie opgeven, zoals basic > 1000."
 
 #. module: hr_payroll
 #: view:hr.payslip.employees:0
@@ -335,6 +341,10 @@ msgid ""
 "for Meal Voucher having fixed amount of 1€ per worked day can have its "
 "quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
+"Het wordt gebruikt in berekening voor percentage en vaste totaalbedrag.  "
+"Voor bijvoorbeeld een regel van een maaltijdbon ,met vast bedrag van 1 € per "
+"gewerkt dag, kan de hoeveelheid gedefinieerd worden als "
+"worked_days.WORK100.number_of_days."
 
 #. module: hr_payroll
 #: view:hr.salary.rule:0
@@ -355,7 +365,7 @@ msgstr "Half-jaarlijks"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Children Definition"
-msgstr ""
+msgstr "Definitie onderliggende"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
@@ -457,11 +467,13 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the salary "
 "rule without removing it."
 msgstr ""
+"Als u de actief optie uitvinkt, dan kan u de salaris regel verbergen zonder "
+"ze te verwijderen."
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Worked Days & Inputs"
-msgstr ""
+msgstr "Gewerkte dagen & ingaves"
 
 #. module: hr_payroll
 #: field:hr.payslip,details_by_salary_rule_category:0
@@ -518,7 +530,7 @@ msgstr "Bereik"
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
 msgid "Salary Structures Hierarchy"
-msgstr ""
+msgstr "Salaris structuur hiërarchie"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
@@ -544,7 +556,7 @@ msgstr "Details salarisstrookberekening"
 #: code:addons/hr_payroll/hr_payroll.py:872
 #, python-format
 msgid "Wrong python code defined for salary rule %s (%s) "
-msgstr ""
+msgstr "Verkeerde python code gedefinieerd voor de salaris regel %s (%s) "
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_input
@@ -765,19 +777,19 @@ msgstr "Contributie"
 #: code:addons/hr_payroll/hr_payroll.py:347
 #, python-format
 msgid "Refund Payslip"
-msgstr ""
+msgstr "Credit salarisstrook"
 
 #. module: hr_payroll
 #: field:hr.rule.input,input_id:0
 #: model:ir.model,name:hr_payroll.model_hr_rule_input
 msgid "Salary Rule Input"
-msgstr ""
+msgstr "Salaris regelinvoer"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:895
 #, python-format
 msgid "Wrong python condition defined for salary rule %s (%s)"
-msgstr ""
+msgstr "Verkeerde python code gedefinieerd voor de salaris regel %s (%s)"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,quantity:0 field:hr.salary.rule,quantity:0
@@ -848,7 +860,7 @@ msgstr "Salaris Structuur"
 #. module: hr_payroll
 #: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
-msgstr ""
+msgstr "Register regel"
 
 #. module: hr_payroll
 #: view:hr.payslip:0 view:hr.payslip.employees:0
@@ -902,7 +914,7 @@ msgstr "Werknemer loonafschrift"
 #: field:hr.salary.rule,register_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
-msgstr ""
+msgstr "Contributie registratie"
 
 #. module: hr_payroll
 #: view:payslip.lines.contribution.register:0
@@ -921,7 +933,7 @@ msgstr ""
 #: code:addons/hr_payroll/hr_payroll.py:889
 #, python-format
 msgid "Wrong range condition defined for salary rule %s (%s)"
-msgstr ""
+msgstr "Verkeerde voorwaardelijst gedefinieerd voor de salaris regel %s (%s)"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0
@@ -966,7 +978,7 @@ msgstr ")"
 #: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
 #: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
-msgstr ""
+msgstr "Contributie registraties"
 
 #. module: hr_payroll
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
@@ -995,12 +1007,14 @@ msgstr "Adres"
 #, python-format
 msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
 msgstr ""
+"Verkeerde basispercentage of hoeveelheid gedefinieerd voor de salaris regel "
+"%s (%s)"
 
 #. module: hr_payroll
 #: field:hr.payslip,worked_days_line_ids:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
 msgid "Payslip Worked Days"
-msgstr ""
+msgstr "Loonstrook gewerkte dagen"
 
 #. module: hr_payroll
 #: view:hr.salary.rule.category:0
@@ -1019,7 +1033,7 @@ msgstr "Naam"
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 msgid "Payroll Structures"
-msgstr ""
+msgstr "Payroll Structuren"
 
 #. module: hr_payroll
 #: view:hr.payslip:0 view:hr.payslip.employees:0
@@ -1077,7 +1091,7 @@ msgstr "Totaal"
 #: help:hr.payslip.line,appears_on_payslip:0
 #: help:hr.salary.rule,appears_on_payslip:0
 msgid "Used for the display of rule on payslip"
-msgstr ""
+msgstr "Wordt gebruikt om de regel van de salaristrook weer te geven"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0
@@ -1087,13 +1101,13 @@ msgstr "Zoek loonafschrift regels"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Details By Salary Rule Category"
-msgstr ""
+msgstr "details per salarisregel categorie"
 
 #. module: hr_payroll
 #: help:hr.payslip.input,code:0 help:hr.payslip.worked_days,code:0
 #: help:hr.rule.input,code:0
 msgid "The code that can be used in the salary rules"
-msgstr ""
+msgstr "De code die gebruikt kan worden in de salaris regels"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
diff --git a/addons/hr_payroll/i18n/pl.po b/addons/hr_payroll/i18n/pl.po
index 19d7ffc37f8..af73be8c449 100644
--- a/addons/hr_payroll/i18n/pl.po
+++ b/addons/hr_payroll/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/pt.po b/addons/hr_payroll/i18n/pt.po
index e27b5e154ee..bda682c49de 100644
--- a/addons/hr_payroll/i18n/pt.po
+++ b/addons/hr_payroll/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/pt_BR.po b/addons/hr_payroll/i18n/pt_BR.po
index dee54cb1542..0eb782c235d 100644
--- a/addons/hr_payroll/i18n/pt_BR.po
+++ b/addons/hr_payroll/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/ro.po b/addons/hr_payroll/i18n/ro.po
index 8422409569d..19c52c96780 100644
--- a/addons/hr_payroll/i18n/ro.po
+++ b/addons/hr_payroll/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/ru.po b/addons/hr_payroll/i18n/ru.po
index 12278e48c44..8f4d3d78cd0 100644
--- a/addons/hr_payroll/i18n/ru.po
+++ b/addons/hr_payroll/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/sr.po b/addons/hr_payroll/i18n/sr.po
index 94d1d1eba06..03d90ec27fd 100644
--- a/addons/hr_payroll/i18n/sr.po
+++ b/addons/hr_payroll/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/sr@latin.po b/addons/hr_payroll/i18n/sr@latin.po
index 6a0a112dd69..48265183d34 100644
--- a/addons/hr_payroll/i18n/sr@latin.po
+++ b/addons/hr_payroll/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/sv.po b/addons/hr_payroll/i18n/sv.po
index 2187a52310b..fdd2137743e 100644
--- a/addons/hr_payroll/i18n/sv.po
+++ b/addons/hr_payroll/i18n/sv.po
@@ -14,14 +14,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
 #: field:hr.salary.rule,condition_select:0
 msgid "Condition Based on"
-msgstr ""
+msgstr "Tillstånd Baserat på"
 
 #. module: hr_payroll
 #: selection:hr.contract,schedule_pay:0
@@ -32,14 +32,14 @@ msgstr "Månatlig"
 #: view:hr.payslip:0 field:hr.payslip,line_ids:0
 #: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
 msgid "Payslip Lines"
-msgstr ""
+msgstr "Lönespecifikation Rader"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0
 #: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
 #: report:paylip.details:0
 msgid "Salary Rule Category"
-msgstr ""
+msgstr "LöneRegel Kategori"
 
 #. module: hr_payroll
 #: help:hr.salary.rule.category,parent_id:0
@@ -47,6 +47,7 @@ msgid ""
 "Linking a salary category to its parent is used only for the reporting "
 "purpose."
 msgstr ""
+"Länka en lönekategori till överordnad används endast för rapportering."
 
 #. module: hr_payroll
 #: view:hr.payslip:0 view:hr.payslip.line:0 view:hr.salary.rule:0
@@ -56,7 +57,7 @@ msgstr "Gruppera på..."
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "States"
-msgstr "Tillstånd"
+msgstr "Status"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,input_ids:0 view:hr.salary.rule:0
@@ -68,7 +69,7 @@ msgstr "Indata"
 #: field:hr.payslip.line,parent_rule_id:0
 #: field:hr.salary.rule,parent_rule_id:0
 msgid "Parent Salary Rule"
-msgstr ""
+msgstr "Överordnad LöneRegel"
 
 #. module: hr_payroll
 #: field:hr.employee,slip_ids:0 view:hr.payslip:0 view:hr.payslip.run:0
@@ -81,7 +82,7 @@ msgstr "Lönespecifikationer"
 #: field:hr.payroll.structure,parent_id:0
 #: field:hr.salary.rule.category,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Överordnad"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
@@ -99,7 +100,7 @@ msgstr "Företag"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Done Slip"
-msgstr ""
+msgstr "Färdig Specifikation"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
@@ -109,7 +110,7 @@ msgstr ","
 #. module: hr_payroll
 #: view:hr.payslip:0 view:hr.payslip.run:0
 msgid "Set to Draft"
-msgstr "Sätt till preliminär"
+msgstr "Sätt till Utkast"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_salary_rule
@@ -120,7 +121,7 @@ msgstr "hr.salary.rule"
 #: field:hr.payslip,payslip_run_id:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_run
 msgid "Payslip Batches"
-msgstr "Betalningsslipbatch"
+msgstr "Betalningspecifikation parti"
 
 #. module: hr_payroll
 #: view:hr.payslip.employees:0
@@ -128,12 +129,14 @@ msgid ""
 "This wizard will generate payslips for all selected employee(s) based on the "
 "dates and credit note specified on Payslips Run."
 msgstr ""
+"Den här guiden kommer att generera lönebesked för alla valda anställd (s) "
+"baserat på datum och kreditnota anges på lönebeskeden Kör."
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0 report:paylip.details:0
 #: report:payslip:0
 msgid "Quantity/Rate"
-msgstr ""
+msgstr "Antal / Pris"
 
 #. module: hr_payroll
 #: field:hr.payslip.input,payslip_id:0 field:hr.payslip.line,slip_id:0
@@ -151,7 +154,7 @@ msgstr "Skapa"
 #: help:hr.payslip.line,amount_percentage_base:0
 #: help:hr.salary.rule,amount_percentage_base:0
 msgid "result will be affected to a variable"
-msgstr ""
+msgstr "resultat kommer att påverkas av en variabel"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
@@ -161,7 +164,7 @@ msgstr "Totalt:"
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
 msgid "All Children Rules"
-msgstr ""
+msgstr "Alla underordnade Regler"
 
 #. module: hr_payroll
 #: view:hr.payslip:0 view:hr.salary.rule:0
@@ -203,12 +206,12 @@ msgstr "Övrig information"
 #. module: hr_payroll
 #: help:hr.payslip.line,amount_select:0 help:hr.salary.rule,amount_select:0
 msgid "The computation method for the rule amount."
-msgstr ""
+msgstr "Beräkningsmetoden för regeln beloppet."
 
 #. module: hr_payroll
 #: view:payslip.lines.contribution.register:0
 msgid "Contribution Register's Payslip Lines"
-msgstr ""
+msgstr "Bidrag registrets lönebeskedsrader"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
@@ -219,7 +222,7 @@ msgstr "Varning !"
 #. module: hr_payroll
 #: report:paylip.details:0
 msgid "Details by Salary Rule Category:"
-msgstr ""
+msgstr "Uppgifter per Lön Regel Kategori:"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
@@ -235,24 +238,24 @@ msgstr "Hänvisning"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Draft Slip"
-msgstr ""
+msgstr "Utkast Slip"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:422
 #, python-format
 msgid "Normal Working Days paid at 100%"
-msgstr ""
+msgstr "Normala arbetsdagar betalas 100%"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_range_max:0
 #: field:hr.salary.rule,condition_range_max:0
 msgid "Maximum Range"
-msgstr ""
+msgstr "Maximalt omfång"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
 msgid "Identification No"
-msgstr "Identifikations nr"
+msgstr "Identifikations Nr"
 
 #. module: hr_payroll
 #: field:hr.payslip,struct_id:0
@@ -262,12 +265,12 @@ msgstr "Struktur"
 #. module: hr_payroll
 #: help:hr.employee,total_wage:0
 msgid "Sum of all current contract's wage of employee."
-msgstr ""
+msgstr "Summan av alla gällande avtal lön för anställd."
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Total Working Days"
-msgstr ""
+msgstr "Totalt Arbetsdagar"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,code:0 help:hr.salary.rule,code:0
@@ -275,6 +278,8 @@ msgid ""
 "The code of salary rules can be used as reference in computation of other "
 "rules. In that case, it is case sensitive."
 msgstr ""
+"Koden för löneregler kan användas som referens vid beräkning av andra "
+"regler. I så fall är det små bokstäver."
 
 #. module: hr_payroll
 #: selection:hr.contract,schedule_pay:0
@@ -300,7 +305,7 @@ msgstr "Anställds lönespecifikation"
 #: help:hr.payslip.line,condition_range_max:0
 #: help:hr.salary.rule,condition_range_max:0
 msgid "The maximum amount, applied for this rule."
-msgstr ""
+msgstr "Det högsta beloppet, gäller för denna regel."
 
 #. module: hr_payroll
 #: help:hr.payslip.line,condition_python:0
@@ -309,11 +314,13 @@ msgid ""
 "Applied this rule for calculation if condition is true. You can specify "
 "condition like basic > 1000."
 msgstr ""
+"Tillämpat denna regel för beräkning om villkoret är sant. Du kan ange "
+"villkor som grundläggande> 1000."
 
 #. module: hr_payroll
 #: view:hr.payslip.employees:0
 msgid "Payslips by Employees"
-msgstr ""
+msgstr "Lönespecifikationer av anställda"
 
 #. module: hr_payroll
 #: selection:hr.contract,schedule_pay:0
@@ -323,7 +330,7 @@ msgstr "Kvartalsvis"
 #. module: hr_payroll
 #: field:hr.payslip,state:0 field:hr.payslip.run,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: hr_payroll
 #: help:hr.salary.rule,quantity:0
@@ -332,11 +339,14 @@ msgid ""
 "for Meal Voucher having fixed amount of 1€ per worked day can have its "
 "quantity defined in expression like worked_days.WORK100.number_of_days."
 msgstr ""
+"Det används i beräkningen för procent och fasta summor. T.ex. en regel för "
+"måltidskupong med fast belopp på 10 SEK per arbetad dag kan ha sin kvantitet "
+"som definieras i uttryck som worked_days.WORK100.number_of_days."
 
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Search Salary Rule"
-msgstr ""
+msgstr "Sök Lön Regel"
 
 #. module: hr_payroll
 #: field:hr.payslip,employee_id:0 field:hr.payslip.line,employee_id:0
@@ -347,7 +357,7 @@ msgstr "Anställd"
 #. module: hr_payroll
 #: selection:hr.contract,schedule_pay:0
 msgid "Semi-annually"
-msgstr ""
+msgstr "Halvårsvis"
 
 #. module: hr_payroll
 #: view:hr.salary.rule:0
@@ -357,34 +367,34 @@ msgstr ""
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
 msgid "Email"
-msgstr "Epost"
+msgstr "E-post"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 msgid "Search Payslip Batches"
-msgstr ""
+msgstr "Sök lönebesked i partier"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount_percentage_base:0
 #: field:hr.salary.rule,amount_percentage_base:0
 msgid "Percentage based on"
-msgstr ""
+msgstr "Procentsats baserad på"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,amount_percentage:0
 #: help:hr.salary.rule,amount_percentage:0
 msgid "For example, enter 50.0 to apply a percentage of 50%"
-msgstr ""
+msgstr "Ange till exempel 50,0 för att tillämpa en procentsats på 50%"
 
 #. module: hr_payroll
 #: field:hr.payslip,paid:0
 msgid "Made Payment Order ? "
-msgstr ""
+msgstr "Tillverkade betalningsorder? "
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
 msgid "PaySlip Lines by Contribution Register"
-msgstr ""
+msgstr "Lönespecifikationsrader från Bidrags Register"
 
 #. module: hr_payroll
 #: help:hr.payslip,state:0
@@ -395,6 +405,10 @@ msgid ""
 "* If the payslip is confirmed then state is set to 'Done'.            \n"
 "* When user cancel payslip the state is 'Rejected'."
 msgstr ""
+"* När lönebesked skapas blir statusen 'Utkast'. \n"
+"* Om lönebesked är under kontroll, är statusen 'Väntar'. \n"
+"* Om lönebesked bekräftas då är statusen satt till 'Klar'. \n"
+"* När användaren avbryta lönespecifikation är statusen 'Avvisad'."
 
 #. module: hr_payroll
 #: field:hr.payslip.worked_days,number_of_days:0
@@ -404,7 +418,7 @@ msgstr "Antal dagar"
 #. module: hr_payroll
 #: selection:hr.payslip,state:0
 msgid "Rejected"
-msgstr "Nekade"
+msgstr "Avvisad"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0 field:hr.payroll.structure,rule_ids:0
@@ -412,29 +426,29 @@ msgstr "Nekade"
 #: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
 #: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
 msgid "Salary Rules"
-msgstr ""
+msgstr "LöneRegler"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:337
 #, python-format
 msgid "Refund: "
-msgstr ""
+msgstr "Återbetalning: "
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
 msgid "PaySlip Lines by Contribution Registers"
-msgstr ""
+msgstr "Lönespecifikationsrader genom Bidrags Register"
 
 #. module: hr_payroll
 #: view:hr.payslip:0 selection:hr.payslip,state:0 view:hr.payslip.run:0
 msgid "Done"
-msgstr "Färdig"
+msgstr "Klar"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,appears_on_payslip:0
 #: field:hr.salary.rule,appears_on_payslip:0
 msgid "Appears on Payslip"
-msgstr ""
+msgstr "Visas på lönespecifikation"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,amount_fix:0
@@ -449,26 +463,28 @@ msgid ""
 "If the active field is set to false, it will allow you to hide the salary "
 "rule without removing it."
 msgstr ""
+"Om det aktiva fältet är satt till falskt, kommer det att tillåta dig dölja "
+"löneneregeln utan att ta bort det."
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Worked Days & Inputs"
-msgstr ""
+msgstr "Arbetade Dagar & Indata"
 
 #. module: hr_payroll
 #: field:hr.payslip,details_by_salary_rule_category:0
 msgid "Details by Salary Rule Category"
-msgstr ""
+msgstr "Uppgifter per Lön Regel Kategori"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
 msgid "PaySlip Lines"
-msgstr ""
+msgstr "Lönespecifikatiosrader"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,register_id:0 help:hr.salary.rule,register_id:0
 msgid "Eventual third party involved in the salary payment of the employees."
-msgstr ""
+msgstr "Eventuell tredje part inblandad i lön betala de anställda."
 
 #. module: hr_payroll
 #: field:hr.payslip.worked_days,number_of_hours:0
@@ -478,42 +494,42 @@ msgstr "Antal timmar"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "PaySlip Batch"
-msgstr ""
+msgstr "Lönespecifikation Batch"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_range_min:0
 #: field:hr.salary.rule,condition_range_min:0
 msgid "Minimum Range"
-msgstr ""
+msgstr "Minimum"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,child_ids:0 field:hr.salary.rule,child_ids:0
 msgid "Child Salary Rule"
-msgstr ""
+msgstr "Underordnad LöneRegel"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0 field:hr.payslip,date_to:0
 #: field:hr.payslip.run,date_end:0 report:paylip.details:0 report:payslip:0
 #: field:payslip.lines.contribution.register,date_to:0
 msgid "Date To"
-msgstr ""
+msgstr "Datum till"
 
 #. module: hr_payroll
 #: selection:hr.payslip.line,condition_select:0
 #: selection:hr.salary.rule,condition_select:0
 msgid "Range"
-msgstr ""
+msgstr "Tidspann"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
 msgid "Salary Structures Hierarchy"
-msgstr ""
+msgstr "Lönestrukturstatistik Hierarki"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Payslip"
-msgstr ""
+msgstr "Lönespecifikation"
 
 #. module: hr_payroll
 #: constraint:hr.contract:0
@@ -523,36 +539,36 @@ msgstr "Fel! avtalsstartdatum måste komma före avtalsslutdatum."
 #. module: hr_payroll
 #: view:hr.contract:0
 msgid "Payslip Info"
-msgstr ""
+msgstr "Lönespecifikation Info"
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
 msgid "Payslip Computation Details"
-msgstr ""
+msgstr "Lönespecifikation Computation Detaljer"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:872
 #, python-format
 msgid "Wrong python code defined for salary rule %s (%s) "
-msgstr ""
+msgstr "Fel python kod som definieras för lön regel %s (%s) "
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_input
 msgid "Payslip Input"
-msgstr ""
+msgstr "Lönespecifikation ingång"
 
 #. module: hr_payroll
 #: view:hr.salary.rule.category:0
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
 msgid "Salary Rule Categories"
-msgstr ""
+msgstr "Lön Rule Kategorier"
 
 #. module: hr_payroll
 #: help:hr.payslip.input,contract_id:0
 #: help:hr.payslip.worked_days,contract_id:0
 msgid "The contract for which applied this input"
-msgstr ""
+msgstr "Kontraktet som gäller denna indata"
 
 #. module: hr_payroll
 #: view:hr.salary.rule:0
@@ -566,12 +582,15 @@ msgid ""
 "basic salary for per product can defined in expression like result = "
 "inputs.SALEURO.amount * contract.wage*0.01."
 msgstr ""
+"Det används i beräkningen. T.ex. en regel för försäljning med 1% provision "
+"av grundlönen för varje produkt kan definieras i uttryck som result = "
+"inputs.SALEURO.amount * contract.wage * 0,01."
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0 field:hr.payslip.line,amount_select:0
 #: field:hr.salary.rule,amount_select:0
 msgid "Amount Type"
-msgstr ""
+msgstr "Antal Typ"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,category_id:0 view:hr.salary.rule:0
@@ -585,40 +604,42 @@ msgid ""
 "If its checked, indicates that all payslips generated from here are refund "
 "payslips."
 msgstr ""
+"Om den markeras anges det att alla lönespecifikationer som genereras "
+"härifrån är återbetalningslönespecifikationer."
 
 #. module: hr_payroll
 #: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
 msgid "Salary Structures"
-msgstr ""
+msgstr "Lönestruktur"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 msgid "Draft Payslip Batches"
-msgstr ""
+msgstr "Utkast lönespecifikation i partier"
 
 #. module: hr_payroll
 #: view:hr.payslip:0 selection:hr.payslip,state:0 view:hr.payslip.run:0
 #: selection:hr.payslip.run,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Utkast"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0 field:hr.payslip,date_from:0
 #: field:hr.payslip.run,date_start:0 report:paylip.details:0 report:payslip:0
 #: field:payslip.lines.contribution.register,date_from:0
 msgid "Date From"
-msgstr ""
+msgstr "Datum från"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 msgid "Done Payslip Batches"
-msgstr ""
+msgstr "Klara lönebesked parti"
 
 #. module: hr_payroll
 #: report:paylip.details:0
 msgid "Payslip Lines by Contribution Register:"
-msgstr ""
+msgstr "Lönespecifikation rader av bidrag Registrera:"
 
 #. module: hr_payroll
 #: view:hr.salary.rule:0
@@ -636,22 +657,22 @@ msgstr "Procent (%)"
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Worked Day"
-msgstr ""
+msgstr "Arbetade dagar"
 
 #. module: hr_payroll
 #: view:hr.payroll.structure:0
 msgid "Employee Function"
-msgstr ""
+msgstr "Arbetsuppgifter det"
 
 #. module: hr_payroll
 #: field:hr.payslip,credit_note:0 field:hr.payslip.run,credit_note:0
 msgid "Credit Note"
-msgstr ""
+msgstr "Kreditnota"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Compute Sheet"
-msgstr ""
+msgstr "Beräkna blankett"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,active:0 field:hr.salary.rule,active:0
@@ -661,7 +682,7 @@ msgstr "Aktiv"
 #. module: hr_payroll
 #: view:hr.salary.rule:0
 msgid "Child Rules"
-msgstr ""
+msgstr "Underordnade Regler"
 
 #. module: hr_payroll
 #: constraint:hr.employee:0
@@ -671,46 +692,46 @@ msgstr "Fel! Du kan inte skapa rekursiva hierarkier av anställda."
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
 msgid "PaySlip Details"
-msgstr ""
+msgstr "Lönebesked Detaljer"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,condition_range_min:0
 #: help:hr.salary.rule,condition_range_min:0
 msgid "The minimum amount, applied for this rule."
-msgstr ""
+msgstr "Det minsta belopp som tillämpas för den här regeln."
 
 #. module: hr_payroll
 #: selection:hr.payslip.line,condition_select:0
 #: selection:hr.salary.rule,condition_select:0
 msgid "Python Expression"
-msgstr ""
+msgstr "Python-uttryck"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
 msgid "Designation"
-msgstr ""
+msgstr "Beteckning"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
 #, python-format
 msgid "You must select employee(s) to generate payslip(s)"
-msgstr ""
+msgstr "Du måste välja anställd (s) för att generera lönebesked (er)"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:861
 #, python-format
 msgid "Wrong quantity defined for salary rule %s (%s)"
-msgstr ""
+msgstr "Fel kvantitet som definieras för lön regel %s (%s)"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Companies"
-msgstr "Bolag"
+msgstr "Företag"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
 msgid "Authorized Signature"
-msgstr ""
+msgstr "Auktoriserad Signatur"
 
 #. module: hr_payroll
 #: field:hr.payslip,contract_id:0 field:hr.payslip.input,contract_id:0
@@ -723,12 +744,12 @@ msgstr "Avtal"
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
 msgid "Credit"
-msgstr ""
+msgstr "Kredit"
 
 #. module: hr_payroll
 #: field:hr.contract,schedule_pay:0
 msgid "Scheduled Pay"
-msgstr ""
+msgstr "Schemalagd Pay"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:861
@@ -744,30 +765,30 @@ msgstr "Fel"
 #: field:hr.payslip.line,condition_python:0
 #: field:hr.salary.rule,condition_python:0
 msgid "Python Condition"
-msgstr ""
+msgstr "Python Skick"
 
 #. module: hr_payroll
 #: view:hr.contribution.register:0
 msgid "Contribution"
-msgstr ""
+msgstr "Bidrag"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:347
 #, python-format
 msgid "Refund Payslip"
-msgstr ""
+msgstr "Återbetalningslönebesked"
 
 #. module: hr_payroll
 #: field:hr.rule.input,input_id:0
 #: model:ir.model,name:hr_payroll.model_hr_rule_input
 msgid "Salary Rule Input"
-msgstr ""
+msgstr "Lön Regel Ingång"
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:895
 #, python-format
 msgid "Wrong python condition defined for salary rule %s (%s)"
-msgstr ""
+msgstr "Fel python villkor definieras för lön regel %s (%s)"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,quantity:0 field:hr.salary.rule,quantity:0
@@ -810,7 +831,7 @@ msgstr "Sekvens"
 #. module: hr_payroll
 #: report:contribution.register.lines:0 report:paylip.details:0
 msgid "Register Name"
-msgstr ""
+msgstr "Registrera Namn"
 
 #. module: hr_payroll
 #: view:hr.salary.rule:0
@@ -821,7 +842,7 @@ msgstr "Allmänt"
 #: code:addons/hr_payroll/hr_payroll.py:664
 #, python-format
 msgid "Salary Slip of %s for %s"
-msgstr ""
+msgstr "Lönebesked för %s för %s"
 
 #. module: hr_payroll
 #: model:ir.model,name:hr_payroll.model_hr_payslip_employees
@@ -838,7 +859,7 @@ msgstr "Lönestruktur"
 #. module: hr_payroll
 #: field:hr.contribution.register,register_line_ids:0
 msgid "Register Line"
-msgstr ""
+msgstr "Registrera rad"
 
 #. module: hr_payroll
 #: view:hr.payslip:0 view:hr.payslip.employees:0
@@ -859,17 +880,22 @@ msgid ""
 "mandatory anymore and thus the rules applied will be all the rules set on "
 "the structure of all contracts of the employee valid for the chosen period"
 msgstr ""
+"Definierar regler som måste tillämpas på denna lönespecifikation, baserat på "
+"det valda kontraktet. Om du låter fältet vara tomt är detta fält inte "
+"obligatoriskt längre och därmed  blir de tillämpade reglerna alla "
+"bestämmelser satta från strukturen på alla avtal för den anställde som "
+"gäller för den valda perioden"
 
 #. module: hr_payroll
 #: field:hr.payroll.structure,children_ids:0
 #: field:hr.salary.rule.category,children_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Underordnade"
 
 #. module: hr_payroll
 #: help:hr.payslip,credit_note:0
 msgid "Indicates this payslip has a refund of another"
-msgstr ""
+msgstr "Indikerar denna lönespecifikation har en återbetalning av en annan"
 
 #. module: hr_payroll
 #: selection:hr.contract,schedule_pay:0
@@ -879,20 +905,20 @@ msgstr "Varannan månad"
 #. module: hr_payroll
 #: report:paylip.details:0
 msgid "Pay Slip Details"
-msgstr ""
+msgstr "Lönespecifikation Detaljer"
 
 #. 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 Payslips"
-msgstr ""
+msgstr "Anställdas lönespecifikation"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0 field:hr.payslip.line,register_id:0
 #: field:hr.salary.rule,register_id:0
 #: model:ir.model,name:hr_payroll.model_hr_contribution_register
 msgid "Contribution Register"
-msgstr ""
+msgstr "Bidrags Register"
 
 #. module: hr_payroll
 #: view:payslip.lines.contribution.register:0
@@ -906,34 +932,37 @@ msgid ""
 "the employees. It can be the social security, the estate or anyone that "
 "collect or inject money on payslips."
 msgstr ""
+"Ett bidrags register är en tredje part inblandad i löneutbetalningen till de "
+"anställda. Det kan vara arbetsförmedlingen, försäkringskassan eller någon "
+"som tar eller skujter till  pengar på lönespecifikationer."
 
 #. module: hr_payroll
 #: code:addons/hr_payroll/hr_payroll.py:889
 #, python-format
 msgid "Wrong range condition defined for salary rule %s (%s)"
-msgstr ""
+msgstr "Fel sortiment som definierats för lön regel %s (%s)"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0
 msgid "Calculations"
-msgstr ""
+msgstr "Uträkningar"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Worked Days"
-msgstr ""
+msgstr "Arbetade dagar"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Search Payslips"
-msgstr ""
+msgstr "Sök lönebesked"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
 msgid "Payslips Batches"
-msgstr ""
+msgstr "Lönespecifikationer parti"
 
 #. module: hr_payroll
 #: view:hr.contribution.register:0 field:hr.contribution.register,note:0
@@ -956,7 +985,7 @@ msgstr ")"
 #: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
 #: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
 msgid "Contribution Registers"
-msgstr ""
+msgstr "Bidrags Register"
 
 #. module: hr_payroll
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
@@ -968,7 +997,7 @@ msgstr "Lön"
 #. module: hr_payroll
 #: model:ir.actions.report.xml,name:hr_payroll.contribution_register
 msgid "PaySlip Lines By Conribution Register"
-msgstr ""
+msgstr "Lönespecifikationsrader från Bidragsregistret"
 
 #. module: hr_payroll
 #: selection:hr.payslip,state:0
@@ -984,18 +1013,18 @@ msgstr "Adress"
 #: code:addons/hr_payroll/hr_payroll.py:866
 #, python-format
 msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
-msgstr ""
+msgstr "Fel procent bas eller kvantitet som definieras för lön regel %s (%s)"
 
 #. module: hr_payroll
 #: field:hr.payslip,worked_days_line_ids:0
 #: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
 msgid "Payslip Worked Days"
-msgstr ""
+msgstr "Lönespecifikation Arbetade dagar"
 
 #. module: hr_payroll
 #: view:hr.salary.rule.category:0
 msgid "Salary Categories"
-msgstr ""
+msgstr "Lönekategorier"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0 field:hr.contribution.register,name:0
@@ -1015,7 +1044,7 @@ msgstr "Lönestrukturer"
 #: view:hr.payslip:0 view:hr.payslip.employees:0
 #: field:hr.payslip.employees,employee_ids:0 view:hr.payslip.line:0
 msgid "Employees"
-msgstr ""
+msgstr "Anställda:"
 
 #. module: hr_payroll
 #: report:paylip.details:0 report:payslip:0
@@ -1025,7 +1054,7 @@ msgstr "Bankkonto"
 #. module: hr_payroll
 #: help:hr.payslip.line,sequence:0 help:hr.salary.rule,sequence:0
 msgid "Use to arrange calculation sequence"
-msgstr ""
+msgstr "Används för att ordna beräkningssekvens"
 
 #. module: hr_payroll
 #: help:hr.payslip.line,condition_range:0
@@ -1035,6 +1064,9 @@ msgid ""
 "but you can also use categories code fields in lowercase as a variable names "
 "(hra, ma, lta, etc.) and the variable basic."
 msgstr ""
+"Detta kommer att användas för att beräkna % fälten värden, i allmänhet är de "
+"grundläggande, men du kan även använda kategorikod fält med gemener som en "
+"variabel namn (hra, ma, lta, etc.) och den variabla grundläggande."
 
 #. module: hr_payroll
 #: selection:hr.contract,schedule_pay:0
@@ -1044,7 +1076,7 @@ msgstr "Årlig"
 #. module: hr_payroll
 #: field:hr.payslip,input_line_ids:0
 msgid "Payslip Inputs"
-msgstr ""
+msgstr "Lönespecifikation indata"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,salary_rule_id:0
@@ -1055,7 +1087,7 @@ msgstr "Regel"
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
 #: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
 msgid "Salary Rule Categories Hierarchy"
-msgstr ""
+msgstr "Lön Regel Kategorier Hierarki"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0 field:hr.payslip.line,total:0
@@ -1067,29 +1099,29 @@ msgstr "Total"
 #: help:hr.payslip.line,appears_on_payslip:0
 #: help:hr.salary.rule,appears_on_payslip:0
 msgid "Used for the display of rule on payslip"
-msgstr ""
+msgstr "Används för visning av regeln om lönebesked"
 
 #. module: hr_payroll
 #: view:hr.payslip.line:0
 msgid "Search Payslip Lines"
-msgstr ""
+msgstr "Sök lönespecifikation Lines"
 
 #. module: hr_payroll
 #: view:hr.payslip:0
 msgid "Details By Salary Rule Category"
-msgstr ""
+msgstr "Detaljer Genom Lön Regel Kategori"
 
 #. module: hr_payroll
 #: help:hr.payslip.input,code:0 help:hr.payslip.worked_days,code:0
 #: help:hr.rule.input,code:0
 msgid "The code that can be used in the salary rules"
-msgstr ""
+msgstr "Den kod som kan användas i lön reglerna"
 
 #. module: hr_payroll
 #: view:hr.payslip.run:0
 #: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
 msgid "Generate Payslips"
-msgstr ""
+msgstr "Generera lönespecifikationer"
 
 #. module: hr_payroll
 #: selection:hr.contract,schedule_pay:0
@@ -1099,24 +1131,24 @@ msgstr "Varannan vecka"
 #. module: hr_payroll
 #: field:hr.employee,total_wage:0
 msgid "Total Basic Salary"
-msgstr ""
+msgstr "Totala grundlönen"
 
 #. module: hr_payroll
 #: selection:hr.payslip.line,condition_select:0
 #: selection:hr.salary.rule,condition_select:0
 msgid "Always True"
-msgstr ""
+msgstr "Alltid sant"
 
 #. module: hr_payroll
 #: report:contribution.register.lines:0
 msgid "PaySlip Name"
-msgstr ""
+msgstr "Lönespecifikation Namn"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_range:0
 #: field:hr.salary.rule,condition_range:0
 msgid "Range Based on"
-msgstr ""
+msgstr "Intervallet baseras på"
 
 #~ msgid "Net Salary"
 #~ msgstr "Nettolön"
@@ -1273,3 +1305,9 @@ msgstr ""
 
 #~ msgid "To"
 #~ msgstr "Till"
+
+#~ msgid "Children definition"
+#~ msgstr "Underordnad definition"
+
+#~ msgid "Company contribution"
+#~ msgstr "Företagsbidrag"
diff --git a/addons/hr_payroll/i18n/tr.po b/addons/hr_payroll/i18n/tr.po
index 67e820b6914..c1b0490b2fe 100644
--- a/addons/hr_payroll/i18n/tr.po
+++ b/addons/hr_payroll/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/vi.po b/addons/hr_payroll/i18n/vi.po
index 55bba840d49..95f49737a70 100644
--- a/addons/hr_payroll/i18n/vi.po
+++ b/addons/hr_payroll/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/i18n/zh_CN.po b/addons/hr_payroll/i18n/zh_CN.po
index 9104ad9d1eb..8c1d4506cba 100644
--- a/addons/hr_payroll/i18n/zh_CN.po
+++ b/addons/hr_payroll/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll
 #: field:hr.payslip.line,condition_select:0
diff --git a/addons/hr_payroll/report/report_contribution_register.py b/addons/hr_payroll/report/report_contribution_register.py
index e32e93532b5..c0285f3de50 100644
--- a/addons/hr_payroll/report/report_contribution_register.py
+++ b/addons/hr_payroll/report/report_contribution_register.py
@@ -72,4 +72,4 @@ class contribution_register_report(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.contribution.register.lines', 'hr.contribution.register', 'hr_payroll/report/report_contribution_register.rml', parser=contribution_register_report)
 
-# 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/report/report_contribution_register.rml b/addons/hr_payroll/report/report_contribution_register.rml
index b3a5de9753d..8a5897c6091 100644
--- a/addons/hr_payroll/report/report_contribution_register.rml
+++ b/addons/hr_payroll/report/report_contribution_register.rml
@@ -206,7 +206,7 @@
             <para style="P2">[[ formatLang(r['amount']) ]]</para>
           </td>
           <td>
-            <para style="P3">[[ formatLang(r['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
+            <para style="P3">[[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]]</para>
           </td>
         </tr>
       </blockTable>
@@ -222,7 +222,7 @@
           <para style="P15">Total:</para>
         </td>
         <td>
-          <para style="P11">[[ formatLang(sum_total()) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
+          <para style="P11">[[ formatLang(sum_total(), currency_obj = o.company_id and o.company_id.currency_id)]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
index e2ef7dab974..df4c729b298 100644
--- a/addons/hr_payroll/report/report_payslip.py
+++ b/addons/hr_payroll/report/report_payslip.py
@@ -46,4 +46,4 @@ class payslip_report(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.payslip', 'hr.payslip', 'hr_payroll/report/report_payslip.rml', parser=payslip_report)
 
-# 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/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml
index 4d96e4b5ef7..990419ee5f1 100644
--- a/addons/hr_payroll/report/report_payslip.rml
+++ b/addons/hr_payroll/report/report_payslip.rml
@@ -197,7 +197,8 @@
           </para>
         </td>
         <td>
-          <para style="P4">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
+          <para style="P4">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]]
+                           [[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]</para>
         </td>
       </tr>
     </blockTable>
@@ -293,7 +294,7 @@
             <para style="P4">[[ formatLang(p.amount) ]]</para>
           </td>
           <td>
-            <para style="P5">[[ formatLang(p.total) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]</para>
+            <para style="P5">[[ formatLang(p.total, currency_obj = o.company_id and o.company_id.currency_id)]]</para>
           </td>
         </tr>
       </blockTable>
diff --git a/addons/hr_payroll/report/report_payslip_details.py b/addons/hr_payroll/report/report_payslip_details.py
index 1e9839eaa6f..5a110cbfdcd 100644
--- a/addons/hr_payroll/report/report_payslip_details.py
+++ b/addons/hr_payroll/report/report_payslip_details.py
@@ -116,4 +116,4 @@ class payslip_details_report(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.paylip.details', 'hr.payslip', 'hr_payroll/report/report_payslip_details.rml', parser=payslip_details_report)
 
-# 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/report/report_payslip_details.rml b/addons/hr_payroll/report/report_payslip_details.rml
index fe6a10dd1f5..4ace0ad2f82 100644
--- a/addons/hr_payroll/report/report_payslip_details.rml
+++ b/addons/hr_payroll/report/report_payslip_details.rml
@@ -234,7 +234,8 @@
           </para>
         </td>
         <td>
-          <para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]</para>
+          <para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]]
+                           [[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]</para>
         </td>
       </tr>
     </blockTable>
@@ -334,7 +335,7 @@
             <para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
           </td>
           <td>
-            <para style="P6">[[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
+            <para style="P6">[[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
           </td>
         </tr>
       </blockTable>
@@ -391,7 +392,7 @@
             <para style="P5">[[ formatLang(r['amount']) ]]</para>
           </td>
           <td>
-            <para style="P6">[[ formatLang(r['total']) ]] [[ o.company_id and o.company_id.currency_id.symbol or '']]<font face="Helvetica">[[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]</font></para>
+            <para style="P6">[[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]]<font face="Helvetica">[[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]</font></para>
           </td>
         </tr>
       </blockTable>
diff --git a/addons/hr_payroll/res_config.py b/addons/hr_payroll/res_config.py
index c39295dd925..72f8b56d5da 100644
--- a/addons/hr_payroll/res_config.py
+++ b/addons/hr_payroll/res_config.py
@@ -24,6 +24,6 @@ from osv import osv, fields
 class human_resources_configuration(osv.osv_memory):
     _inherit = 'hr.config.settings'
     _columns = {
-        'module_hr_payroll_account': fields.boolean('link your payroll to accounting system',
-            help ="""Create Journal Entries from Payslips"""),
+        'module_hr_payroll_account': fields.boolean('Link your payroll to accounting system',
+            help ="""Create journal entries from payslips"""),
     }
diff --git a/addons/hr_payroll_account/__init__.py b/addons/hr_payroll_account/__init__.py
index ffe4b707ac0..ceb8531473b 100644
--- a/addons/hr_payroll_account/__init__.py
+++ b/addons/hr_payroll_account/__init__.py
@@ -23,4 +23,4 @@
 import hr_payroll_account
 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_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py
index f869c93697b..7c7e7bd9dda 100644
--- a/addons/hr_payroll_account/__openerp__.py
+++ b/addons/hr_payroll_account/__openerp__.py
@@ -25,7 +25,7 @@
     'category': 'Human Resources',
     'description': """
 Generic Payroll system Integrated with Accounting.
-===================================================
+==================================================
 
     * Expense Encoding
     * Payment Encoding
@@ -39,20 +39,11 @@ Generic Payroll system Integrated with Accounting.
         'account',
         'hr_expense'
     ],
-    'init_xml': [
-    ],
-    'update_xml': [
-        "hr_payroll_account_view.xml",
-    ],
-    'demo_xml': [
-        'hr_payroll_account_demo.xml'
-    ],
-    'test': [
-         'test/hr_payroll_account.yml',
-     ],
+    'data': ['hr_payroll_account_view.xml'],
+    'demo': ['hr_payroll_account_demo.xml'],
+    'test': ['test/hr_payroll_account.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00923971112835220957',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 71621874066..94df47f6e44 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -36,7 +36,7 @@ class hr_payslip(osv.osv):
 
     _columns = {
         'period_id': fields.many2one('account.period', 'Force Period',states={'draft': [('readonly', False)]}, readonly=True, domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
-        'journal_id': fields.many2one('account.journal', 'Expense Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True),
+        'journal_id': fields.many2one('account.journal', 'Salary Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True),
         'move_id': fields.many2one('account.move', 'Accounting Entry', readonly=True),
     }
 
@@ -108,7 +108,7 @@ class hr_payslip(osv.osv):
                 'journal_id': slip.journal_id.id,
                 'period_id': period_id,
             }
-            for line in slip.line_ids:
+            for line in slip.details_by_salary_rule_category:
                 amt = slip.credit_note and -line.total or line.total
                 partner_id = line.salary_rule_id.register_id.partner_id and line.salary_rule_id.register_id.partner_id.id or default_partner_id
                 debit_account_id = line.salary_rule_id.account_debit.id
@@ -215,7 +215,18 @@ class hr_payslip_run(osv.osv):
     _inherit = 'hr.payslip.run'
     _description = 'Payslip Run'
     _columns = {
-        'journal_id': fields.many2one('account.journal', 'Expense Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True),
+        'journal_id': fields.many2one('account.journal', 'Salary Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True),
+    }
+
+    def _get_default_journal(self, cr, uid, context=None):
+        model_data = self.pool.get('ir.model.data')
+        res = model_data.search(cr, uid, [('name', '=', 'expenses_journal')])
+        if res:
+            return model_data.browse(cr, uid, res[0]).res_id
+        return False
+
+    _defaults = {
+        'journal_id': _get_default_journal,
     }
 
 hr_payslip_run()
diff --git a/addons/hr_payroll_account/i18n/ar.po b/addons/hr_payroll_account/i18n/ar.po
index 4bc2924a7c0..dbf314eac28 100644
--- a/addons/hr_payroll_account/i18n/ar.po
+++ b/addons/hr_payroll_account/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/bg.po b/addons/hr_payroll_account/i18n/bg.po
index 78c2c71e4d6..2862121a73f 100644
--- a/addons/hr_payroll_account/i18n/bg.po
+++ b/addons/hr_payroll_account/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/ca.po b/addons/hr_payroll_account/i18n/ca.po
index fd68235992c..0705d7c5456 100644
--- a/addons/hr_payroll_account/i18n/ca.po
+++ b/addons/hr_payroll_account/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/da.po b/addons/hr_payroll_account/i18n/da.po
index d4b837ded5f..46c8d8ba486 100644
--- a/addons/hr_payroll_account/i18n/da.po
+++ b/addons/hr_payroll_account/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/de.po b/addons/hr_payroll_account/i18n/de.po
index e799e162bf6..071bdfc2e50 100644
--- a/addons/hr_payroll_account/i18n/de.po
+++ b/addons/hr_payroll_account/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
@@ -54,7 +54,7 @@ msgstr "hr.salary.rule"
 #. module: hr_payroll_account
 #: model:ir.model,name:hr_payroll_account.model_hr_payslip_run
 msgid "Payslip Batches"
-msgstr "Lohnzettel Staple"
+msgstr "Lohnzettel Stapel"
 
 #. module: hr_payroll_account
 #: field:hr.contract,journal_id:0
@@ -134,7 +134,7 @@ msgstr "Erzeuge Lohnkonten für alle ausgewählten Mitarbeiter"
 #: code:addons/hr_payroll_account/hr_payroll_account.py:171
 #, python-format
 msgid "Configuration Error!"
-msgstr "Konfigurationsfehler !"
+msgstr "Konfigurationsfehler!"
 
 #. module: hr_payroll_account
 #: view:hr.contract:0
diff --git a/addons/hr_payroll_account/i18n/en_GB.po b/addons/hr_payroll_account/i18n/en_GB.po
index e7453f8d24e..5ed00b13126 100644
--- a/addons/hr_payroll_account/i18n/en_GB.po
+++ b/addons/hr_payroll_account/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/es.po b/addons/hr_payroll_account/i18n/es.po
index 28388a04f8a..4b1309580a8 100644
--- a/addons/hr_payroll_account/i18n/es.po
+++ b/addons/hr_payroll_account/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/es_CR.po b/addons/hr_payroll_account/i18n/es_CR.po
index f4c927ee102..0de8718dcdb 100644
--- a/addons/hr_payroll_account/i18n/es_CR.po
+++ b/addons/hr_payroll_account/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: hr_payroll_account
diff --git a/addons/hr_payroll_account/i18n/es_EC.po b/addons/hr_payroll_account/i18n/es_EC.po
index 9ac4f42c9d7..79985a9d816 100644
--- a/addons/hr_payroll_account/i18n/es_EC.po
+++ b/addons/hr_payroll_account/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/es_PY.po b/addons/hr_payroll_account/i18n/es_PY.po
index 942272da242..e624c5daeee 100644
--- a/addons/hr_payroll_account/i18n/es_PY.po
+++ b/addons/hr_payroll_account/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/fr.po b/addons/hr_payroll_account/i18n/fr.po
index 557f81bd5c5..51fb1aa024a 100644
--- a/addons/hr_payroll_account/i18n/fr.po
+++ b/addons/hr_payroll_account/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/gl.po b/addons/hr_payroll_account/i18n/gl.po
index b058612b33f..a0f99a28a85 100644
--- a/addons/hr_payroll_account/i18n/gl.po
+++ b/addons/hr_payroll_account/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/gu.po b/addons/hr_payroll_account/i18n/gu.po
index d48b8403efb..8c159ea3039 100644
--- a/addons/hr_payroll_account/i18n/gu.po
+++ b/addons/hr_payroll_account/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/hr.po b/addons/hr_payroll_account/i18n/hr.po
index 119f7691933..40c4360ea4a 100644
--- a/addons/hr_payroll_account/i18n/hr.po
+++ b/addons/hr_payroll_account/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/hu.po b/addons/hr_payroll_account/i18n/hu.po
index 8229379a20b..29aa3673d92 100644
--- a/addons/hr_payroll_account/i18n/hu.po
+++ b/addons/hr_payroll_account/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/id.po b/addons/hr_payroll_account/i18n/id.po
index c0bde7ed84e..85eb350e123 100644
--- a/addons/hr_payroll_account/i18n/id.po
+++ b/addons/hr_payroll_account/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/it.po b/addons/hr_payroll_account/i18n/it.po
index 05cddc5a7fa..2316ff2adfc 100644
--- a/addons/hr_payroll_account/i18n/it.po
+++ b/addons/hr_payroll_account/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/ja.po b/addons/hr_payroll_account/i18n/ja.po
index beb0fad4230..dc5e267a4ec 100644
--- a/addons/hr_payroll_account/i18n/ja.po
+++ b/addons/hr_payroll_account/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/lv.po b/addons/hr_payroll_account/i18n/lv.po
index fd6a97e6c16..f27dd2e9dfd 100644
--- a/addons/hr_payroll_account/i18n/lv.po
+++ b/addons/hr_payroll_account/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/mn.po b/addons/hr_payroll_account/i18n/mn.po
index f916f12ae9e..962ddf9739c 100644
--- a/addons/hr_payroll_account/i18n/mn.po
+++ b/addons/hr_payroll_account/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/nb.po b/addons/hr_payroll_account/i18n/nb.po
new file mode 100644
index 00000000000..19f0efaa433
--- /dev/null
+++ b/addons/hr_payroll_account/i18n/nb.po
@@ -0,0 +1,141 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 19:55+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,move_id:0
+msgid "Accounting Entry"
+msgstr "Regnskapsmessig oppføring"
+
+#. module: hr_payroll_account
+#: field:hr.salary.rule,account_tax_id:0
+msgid "Tax Code"
+msgstr "Skattekode"
+
+#. module: hr_payroll_account
+#: field:hr.payslip,journal_id:0
+#: field:hr.payslip.run,journal_id:0
+msgid "Expense Journal"
+msgstr "Bekostning Journal"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:157
+#: code:addons/hr_payroll_account/hr_payroll_account.py:173
+#, python-format
+msgid "Adjustment Entry"
+msgstr "Justering oppføring"
+
+#. module: hr_payroll_account
+#: field:hr.contract,analytic_account_id:0
+#: field:hr.salary.rule,analytic_account_id:0
+msgid "Analytic Account"
+msgstr "Analytisk konto"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr "hr.salary.rule"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr "Lønnsslipp Batcher."
+
+#. module: hr_payroll_account
+#: field:hr.contract,journal_id:0
+msgid "Salary Journal"
+msgstr "lønn Journal"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
+msgstr "Lønnslipp"
+
+#. module: hr_payroll_account
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr "Lønnslipp \" Dato fra \" må være før \" Dato Til \""
+
+#. module: hr_payroll_account
+#: help:hr.payslip,period_id:0
+msgid "Keep empty to use the period of the validation(Payslip) date."
+msgstr "Hold tom for å bruke tid på validering (lønnsslipp) dato."
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:171
+#, python-format
+msgid ""
+"The Expense Journal \"%s\" has not properly configured the Debit Account!"
+msgstr "Bekostning Journal \"% s\" har ikke riktig konfigurert Debet konto!"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:155
+#, python-format
+msgid ""
+"The Expense Journal \"%s\" has not properly configured the Credit Account!"
+msgstr ""
+"Bekostning Journal \"% s\" har ikke riktig konfigurert kreditt-konto!"
+
+#. module: hr_payroll_account
+#: field:hr.salary.rule,account_debit:0
+msgid "Debit Account"
+msgstr "Debetkonto"
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:102
+#, python-format
+msgid "Payslip of %s"
+msgstr "Lønnslipp av %s."
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_contract
+msgid "Contract"
+msgstr "Kontrakt"
+
+#. module: hr_payroll_account
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr "Feil! Kontrakten startdato må være lavere enn kontrakt sluttdato."
+
+#. module: hr_payroll_account
+#: field:hr.payslip,period_id:0
+msgid "Force Period"
+msgstr "Kraft Periode."
+
+#. module: hr_payroll_account
+#: field:hr.salary.rule,account_credit:0
+msgid "Credit Account"
+msgstr "Kredittkonto"
+
+#. module: hr_payroll_account
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr "Generer lønnsslipper for alle utvalgte ansatte."
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:155
+#: code:addons/hr_payroll_account/hr_payroll_account.py:171
+#, python-format
+msgid "Configuration Error!"
+msgstr "Konfigurasjonsfeil!"
+
+#. module: hr_payroll_account
+#: view:hr.contract:0
+#: view:hr.salary.rule:0
+msgid "Accounting"
+msgstr "Regnskap"
diff --git a/addons/hr_payroll_account/i18n/nl.po b/addons/hr_payroll_account/i18n/nl.po
index 065fd58d1fd..29256ba9725 100644
--- a/addons/hr_payroll_account/i18n/nl.po
+++ b/addons/hr_payroll_account/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-20 09:20+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/pl.po b/addons/hr_payroll_account/i18n/pl.po
index a10ce3c6b01..5c1761e7078 100644
--- a/addons/hr_payroll_account/i18n/pl.po
+++ b/addons/hr_payroll_account/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/pt.po b/addons/hr_payroll_account/i18n/pt.po
index 5f3d852c4ca..d525adfe224 100644
--- a/addons/hr_payroll_account/i18n/pt.po
+++ b/addons/hr_payroll_account/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/pt_BR.po b/addons/hr_payroll_account/i18n/pt_BR.po
index 58488016a7a..407e618e22e 100644
--- a/addons/hr_payroll_account/i18n/pt_BR.po
+++ b/addons/hr_payroll_account/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/ro.po b/addons/hr_payroll_account/i18n/ro.po
index cfa618ff32b..dfbd107588c 100644
--- a/addons/hr_payroll_account/i18n/ro.po
+++ b/addons/hr_payroll_account/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/ru.po b/addons/hr_payroll_account/i18n/ru.po
index 566bf5a5626..65178087d15 100644
--- a/addons/hr_payroll_account/i18n/ru.po
+++ b/addons/hr_payroll_account/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/sr@latin.po b/addons/hr_payroll_account/i18n/sr@latin.po
index e7717d3fb71..ed9b7e3f3a2 100644
--- a/addons/hr_payroll_account/i18n/sr@latin.po
+++ b/addons/hr_payroll_account/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/sv.po b/addons/hr_payroll_account/i18n/sv.po
index 0b91689d0af..024e979dce2 100644
--- a/addons/hr_payroll_account/i18n/sv.po
+++ b/addons/hr_payroll_account/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/tr.po b/addons/hr_payroll_account/i18n/tr.po
index deab3fe62dc..ca6d3be9fd2 100644
--- a/addons/hr_payroll_account/i18n/tr.po
+++ b/addons/hr_payroll_account/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/i18n/zh_CN.po b/addons/hr_payroll_account/i18n/zh_CN.po
index 75cd40c08c5..e4a21cc7eaa 100644
--- a/addons/hr_payroll_account/i18n/zh_CN.po
+++ b/addons/hr_payroll_account/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_payroll_account
 #: field:hr.payslip,move_id:0
diff --git a/addons/hr_payroll_account/wizard/__init__.py b/addons/hr_payroll_account/wizard/__init__.py
index 27128f05597..ee460faefb8 100644
--- a/addons/hr_payroll_account/wizard/__init__.py
+++ b/addons/hr_payroll_account/wizard/__init__.py
@@ -22,4 +22,4 @@
 
 import hr_payroll_payslips_by_employees
 
-# 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_account/wizard/hr_payroll_payslips_by_employees.py b/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
index a00ff97ef6b..af41b7b3b51 100644
--- a/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
+++ b/addons/hr_payroll_account/wizard/hr_payroll_payslips_by_employees.py
@@ -31,10 +31,11 @@ class hr_payslip_employees(osv.osv_memory):
             context = {}
         if context and context.get('active_id', False):
             run_data = run_pool.read(cr, uid, context['active_id'], ['journal_id'])
-        journal_id =  run_data.get('journal_id', False)[0]
-        context.update({'journal_id': journal_id})
+        journal_id =  run_data.get('journal_id', False)
+        journal_id = journal_id and journal_id[0] or False
+        if journal_id: context.update({'journal_id': journal_id})
         return super(hr_payslip_employees, self).compute_sheet(cr, uid, ids, context=context)
 
 hr_payslip_employees()
 
-# 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_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 1a6abbef976..63c1cf47ccb 100644
--- a/addons/hr_recruitment/__openerp__.py
+++ b/addons/hr_recruitment/__openerp__.py
@@ -24,18 +24,17 @@
     'name': 'Recruitment Process',
     'version': '1.0',
     'category': 'Human Resources',
-    'sequence': 24,
-    'summary': 'Recruitment Process, Job Descriptions',
+    'sequence': 25,
+    'summary': 'Jobs, Recruitment, Applications, Job Interviews',
     'description': """
-Manages job positions and the recruitment process.
-==================================================
+Manage job positions and the recruitment process
+=================================================
 
-It's integrated with the survey module to allow you to define interview for different jobs.
+This application allows you to easily keep track of jobs, vacancies, applications, interviews...
 
-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.
-    """,
+It is integrated with the mail gateway to automatically fetch email sent to <jobs@yourcompany.com> in the list of applications. It's also integrated with the document management system to store and search in the CV base and find the candidate that you are looking for. Similarly, it is integrated with the survey module to allow you to define interviews for different jobs.
+You can define the different phases of interviews and easily rate the applicant from the kanban view.
+""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/hr_recruitment_analysis.jpeg','images/hr_recruitment_applicants.jpeg'],
@@ -60,16 +59,11 @@ system to store and search in your CV base.
         'res_config_view.xml',
         'hr_recruitment_data.xml'
     ],
-    'demo': [
-        'hr_recruitment_demo.yml',
-    ],
+    'demo': ['hr_recruitment_demo.yml'],
     'js': ['static/src/js/hr_recruitment.js'],
-    'test': [
-        'test/recruitment_process.yml',
-    ],
+    'test': ['test/recruitment_process.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '001073437025460275621',
     'application': True,
 }
 
diff --git a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
index 461ccdf0bbe..79e09937705 100644
--- a/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
+++ b/addons/hr_recruitment/board_hr_recruitment_statistical_view.xml
@@ -6,12 +6,12 @@
         <field name="name">applicants.status.tree</field>
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';black:state in ('open','pending','done','cancel');" string="Applicants Status">
+            <tree  string="Applicants Status">
                 <field name="create_date"/>
                 <field name="job_id"/>
                 <field name="partner_name"/>
                 <field name="stage_id"/>
-                <field name="state" groups="base.group_no_one"/>
+                <field name="user_id"/>
             </tree>
         </field>
     </record>
@@ -32,7 +32,7 @@
         <field name="inherit_id" ref="hr.board_hr_form"/>
         <field name="arch" type="xml">
             <xpath expr="/form/board/column[1]" position="inside">
-                <action name="%(action_applicants_status)d" string="Applicants To be Processed"/>
+                <action name="%(action_applicants_status)d" string="Applications to be Processed"/>
             </xpath>
         </field>
     </record>
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 81a7ae6129e..155f20daf4d 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -19,18 +19,14 @@
 #
 ##############################################################################
 
-import logging
 import time
-from datetime import datetime
-
 import tools
-from osv import fields, osv
-from openerp.modules.registry import RegistryManager
-from openerp import SUPERUSER_ID
-from base_status.base_stage import base_stage
-from tools.translate import _
 
-_logger = logging.getLogger(__name__)
+from base_status.base_stage import base_stage
+from datetime import datetime
+from osv import fields, osv
+from tools.translate import _
+from tools import html2plaintext
 
 AVAILABLE_STATES = [
     ('draft', 'New'),
@@ -66,7 +62,7 @@ class hr_recruitment_stage(osv.osv):
         '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', 'Specific to a Department', help="Stages of the recruitment process may be different per department. If this stage is common to all departments, keep this field empty."),
-        'state': fields.selection(AVAILABLE_STATES, 'State', required=True, help="The related state for the stage. The state of your document will automatically change according to the selected stage. Example, a stage is related to the state 'Close', when your document reach this stage, it will be automatically closed."),
+        'state': fields.selection(AVAILABLE_STATES, 'Status', required=True, help="The related status for the stage. The status of your document will automatically change according to the selected stage. Example, a stage is related to the status 'Close', when your document reach this stage, it will be automatically closed."),
         'fold': fields.boolean('Hide in views if empty', help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
         'requirements': fields.text('Requirements'),
     }
@@ -95,8 +91,7 @@ class hr_applicant(base_stage, osv.Model):
     _name = "hr.applicant"
     _description = "Applicant"
     _order = "id desc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
-    _mail_compose_message = True
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def _get_default_department_id(self, cr, uid, context=None):
         """ Gives default department by checking if present in the context """
@@ -137,13 +132,17 @@ class hr_applicant(base_stage, osv.Model):
         department_id = self._resolve_department_id_from_context(cr, uid, context=context)
         search_domain = []
         if department_id:
-            search_domain += ['|', '&', ('department_id', '=', department_id), ('fold', '=', False)]
-        search_domain += ['|', ('id', 'in', ids), '&', ('department_id', '=', False), ('fold', '=', False)]
+            search_domain += ['|', ('department_id', '=', department_id)]
+        search_domain += ['|', ('id', 'in', ids), ('department_id', '=', False)]
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
         result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
-        return result
+
+        fold = {}
+        for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):
+            fold[stage.id] = stage.fold or False
+        return result, fold
 
     def _compute_day(self, cr, uid, ids, fields, args, context=None):
         """
@@ -166,13 +165,11 @@ class hr_applicant(base_stage, osv.Model):
                         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)
@@ -190,15 +187,15 @@ class hr_applicant(base_stage, osv.Model):
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage',
-                        domain="['|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
+                        domain="['&', ('fold', '=', False), '|', ('department_id', '=', department_id), ('department_id', '=', False)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=AVAILABLE_STATES, string="State", readonly=True,
-                help='The state is set to \'Draft\', when a case is created.\
-                      If the case is in progress the state is set to \'Open\'.\
-                      When the case is over, the state is set to \'Done\'.\
-                      If the case needs to be reviewed then the state is \
+                selection=AVAILABLE_STATES, string="Status", readonly=True,
+                help='The status is set to \'Draft\', when a case is created.\
+                      If the case is in progress the status is set to \'Open\'.\
+                      When the case is over, the status is set to \'Done\'.\
+                      If the case needs to be reviewed then the status is \
                       set to \'Pending\'.'),
-        'categ_ids': fields.many2many('hr.applicant_category', string='Categories'),
+        'categ_ids': fields.many2many('hr.applicant_category', string='Tags'),
         'company_id': fields.many2one('res.company', 'Company'),
         'user_id': fields.many2one('res.users', 'Responsible'),
         # Applicant Columns
@@ -238,7 +235,6 @@ class hr_applicant(base_stage, osv.Model):
         'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
         'department_id': lambda s, cr, uid, c: s._get_default_department_id(cr, uid, c),
-        'priority': lambda *a: '',
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'hr.applicant', context=c),
         'color': 0,
     }
@@ -247,7 +243,7 @@ class hr_applicant(base_stage, osv.Model):
         'stage_id': _read_group_stage_ids
     }
 
-    def onchange_job(self,cr, uid, ids, job, context=None):
+    def onchange_job(self, cr, uid, ids, job, context=None):
         result = {}
 
         if job:
@@ -262,6 +258,17 @@ class hr_applicant(base_stage, osv.Model):
         stage_id = stage_ids and stage_ids[0] or False
         return {'value': {'stage_id': stage_id}}
 
+    def onchange_partner_id(self, cr, uid, ids, partner_id, context=None):
+        data = {'partner_phone': False,
+                'partner_mobile': False,
+                'email_from': False}
+        if partner_id:
+            addr = self.pool.get('res.partner').browse(cr, uid, partner_id, context)
+            data.update({'partner_phone': addr.phone,
+                        'partner_mobile': addr.mobile,
+                        'email_from': addr.email})
+        return {'value': data}
+
     def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
         """ Override of the base.stage method
             Parameter of the stage search taken from the lead:
@@ -300,7 +307,6 @@ class hr_applicant(base_stage, osv.Model):
         res['context'] = {
             'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False,
             'default_user_id': uid,
-            'default_state': 'open',
             'default_name': applicant.name,
             'default_categ_ids': category and [category.id] or False,
         }
@@ -331,16 +337,16 @@ class hr_applicant(base_stage, osv.Model):
             This override updates the document according to the email.
         """
         if custom_values is None: custom_values = {}
+        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
         custom_values.update({
             'name':  msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': desc,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
         })
         if msg.get('priority'):
             custom_values['priority'] = msg.get('priority')
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from', False), context=context))
         return super(hr_applicant,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
 
     def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
@@ -365,7 +371,7 @@ class hr_applicant(base_stage, osv.Model):
             'revenue': 'planned_revenue',
             'probability': 'probability',
         }
-        for line in msg.get('body_text', '').split('\n'):
+        for line in msg.get('body', '').split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower(), False):
@@ -403,7 +409,7 @@ class hr_applicant(base_stage, osv.Model):
         for applicant in self.browse(cr, uid, ids, context=context):
             address_id = False
             if applicant.partner_id:
-                address_id = applicant.partner_id.address_get(['contact'])['contact']
+                address_id = self.pool.get('res.partner').address_get(cr,uid,[applicant.partner_id.id],['contact'])['contact']
             if applicant.job_id:
                 applicant.job_id.write({'no_of_recruitment': applicant.job_id.no_of_recruitment - 1})
                 emp_id = hr_employee.create(cr,uid,{'name': applicant.partner_name or applicant.name,
@@ -462,48 +468,47 @@ class hr_applicant(base_stage, osv.Model):
     # OpenChatter methods and notifications
     # -------------------------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(hr_applicant, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         if not stage_id: return True
         stage_name = self.pool.get('hr.recruitment.stage').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body=_("Stage changed to <b>%s</b>.") % (stage_name), context=context)
 
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
 		return 'Applicant'
 
     def case_open_send_note(self, cr, uid, ids, context=None):
         message = _("Applicant has been set <b>in progress</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def case_close_send_note(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
         for applicant in self.browse(cr, uid, ids, context=context):
+            if applicant.job_id:
+                self.pool.get('hr.job').message_post(cr, uid, [applicant.job_id.id], body=_('New employee joined the company %s.')%(applicant.name,), subtype="hr_recruitment.mt_hired", context=context)
             if applicant.emp_id:
                 message = _("Applicant has been <b>hired</b> and created as an employee.")
-                self.message_append_note(cr, uid, [applicant.id], body=message, context=context)
+                self.message_post(cr, uid, [applicant.id], body=message, context=context)
             else:
                 message = _("Applicant has been <b>hired</b>.")
-                self.message_append_note(cr, uid, [applicant.id], body=message, context=context)
+                self.message_post(cr, uid, [applicant.id], body=message, context=context)
         return True
 
     def case_cancel_send_note(self, cr, uid, ids, context=None):
         msg = 'Applicant <b>refused</b>.'
-        return self.message_append_note(cr, uid, ids, body=msg, context=context)
+        return self.message_post(cr, uid, ids, body=msg, context=context)
 
     def case_reset_send_note(self,  cr, uid, ids, context=None):
         message =_("Applicant has been set as <b>new</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):
         message = _("Applicant has been <b>created</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
-
+        for applicant in self.browse(cr, uid, ids, context=context):
+            if applicant.job_id:
+                self.pool.get('hr.job').message_post(cr, uid, [applicant.job_id.id], body=message, subtype="hr_recruitment.mt_applicant_new", context=context)
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
 class hr_job(osv.osv):
     _inherit = "hr.job"
@@ -515,42 +520,14 @@ class hr_job(osv.osv):
                                     help="Email alias for this job position. New emails will automatically "
                                          "create new applicants for this job position."),
     }
-
     _defaults = {
         'alias_domain': False, # always hide alias during creation
     }
 
     def _auto_init(self, cr, context=None):
         """Installation hook to create aliases for all jobs and avoid constraint errors."""
-
-        # disable the unique alias_id not null constraint, to avoid spurious warning during
-        # super.auto_init. We'll reinstall it afterwards.
-        self._columns['alias_id'].required = False
-
-        super(hr_job,self)._auto_init(cr, context=context)
-
-        registry = RegistryManager.get(cr.dbname)
-        mail_alias = registry.get('mail.alias')
-        hr_jobs = registry.get('hr.job')
-        jobs_no_alias = hr_jobs.search(cr, SUPERUSER_ID, [('alias_id', '=', False)])
-        # Use read() not browse(), to avoid prefetching uninitialized inherited fields
-        for job_data in hr_jobs.read(cr, SUPERUSER_ID, jobs_no_alias, ['name']):
-            alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, {'alias_name': 'job+'+job_data['name'],
-                                                                         'alias_defaults': {'job_id': job_data['id']}},
-                                                      model_name='hr.applicant')
-            hr_jobs.write(cr, SUPERUSER_ID, job_data['id'], {'alias_id': alias_id})
-            _logger.info('Mail alias created for hr.job %s (uid %s)', job_data['name'], job_data['id'])
-
-        # Finally attempt to reinstate the missing constraint
-        try:
-            cr.execute('ALTER TABLE hr_job ALTER COLUMN alias_id SET NOT NULL')
-        except Exception:
-            _logger.warning("Table '%s': unable to set a NOT NULL constraint on column '%s' !\n"\
-                            "If you want to have it, you should update the records and execute manually:\n"\
-                            "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL",
-                            self._table, 'alias_id', self._table, 'alias_id')
-
-        self._columns['alias_id'].required = True
+        self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(hr_job,self)._auto_init,
+            self._columns['alias_id'], 'name', alias_prefix='job+', alias_defaults={'job_id': 'id'}, context=context)
 
     def create(self, cr, uid, vals, context=None):
         mail_alias = self.pool.get('mail.alias')
@@ -585,12 +562,12 @@ class hr_job(osv.osv):
         datas['model'] = 'survey.print'
         context.update({'response_id': [0], 'response_no': 0,})
         return {
-                'type': 'ir.actions.report.xml',
-                'report_name': 'survey.form',
-                'datas': datas,
-                'context' : context,
-                'nodestroy':True,
-            }
+            'type': 'ir.actions.report.xml',
+            'report_name': 'survey.form',
+            'datas': datas,
+            'context' : context,
+            'nodestroy':True,
+        }
 
 class applicant_category(osv.osv):
     """ Category of applicant """
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index d90f5ab596a..adaeed81205 100644
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -2,14 +2,15 @@
 <openerp>
 <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Recruitment Process has been installed</value>
-            <value>Manage job positions and the recruitment process in your company.  This module is integrated with the module Survey to help you to define interviews for different jobs.
-
-You can automatically create application records from an email gateway, that you can configure in the Human Resources Settings.</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Recruitment Process application installed!</field>
+            <field name="body"><![CDATA[<p>Manage job positions and your company's recruitment process. This application is integrated with the Survey application to help you define interviews for different jobs.</p>
+<p>You can automatically receive job application though an email gateway, see the Human Resources settings.</p>]]></field>
+        </record>
 
     <!-- Meeting Types (for interview meetings) -->
     <record model="crm.meeting.type" id="categ_meet_interview">
@@ -312,7 +313,7 @@ You can automatically create application records from an email gateway, that you
         <field eval="0" name="rating_allow_one_column_require"/>
         <field name="req_error_msg">This question requires an answer.</field>
         <field eval="3" name="sequence"/>
-        <field name="question">Exprience</field>
+        <field name="question">Experience</field>
         <field eval="0" name="is_require_answer"/>
         <field name="type">comment</field>
         <field name="comment_valid_err_msg">The comment you entered is in an invalid format.</field>
@@ -459,6 +460,15 @@ You can automatically create application records from an email gateway, that you
         <field name="alias_model_id" ref="model_hr_applicant"/>
         <field name="alias_user_id" ref="base.user_root"/>
     </record>
-    
+
+    <!-- mail: subtypes -->
+    <record id="mt_hired" model="mail.message.subtype">
+        <field name="name">Employee Hired</field>
+        <field name="res_model">hr.job</field>
+    </record>
+    <record id="mt_applicant_new" model="mail.message.subtype">
+        <field name="name">New Applicant</field>
+        <field name="res_model">hr.job</field>
+    </record>
 </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml
index 59508b83c28..2554c690c15 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.yml
+++ b/addons/hr_recruitment/hr_recruitment_demo.yml
@@ -17,7 +17,6 @@
     priority: '3'
     user_id: base.user_demo
     partner_name: 'Marie Justine'
-    state: 'open'
     partner_mobile: '9988774455'
     job_id: hr.job_developer
     stage_id: stage_job4
@@ -41,7 +40,6 @@
     type_id: degree_bac5
     user_id: base.user_root
     partner_name: 'Sandra Elvis'
-    state: 'cancel'
     stage_id: stage_job6
     name: 'More than 5 yrs Experience in PHP'
 -
@@ -50,8 +48,8 @@
     type_id: degree_licenced
     user_id: base.user_demo
     partner_name: 'John Bruno'
-    state: 'done'
     job_id: hr.job_developer
+    color: 5
     stage_id: stage_job5
     name: 'Marketing Job'
 -
@@ -60,8 +58,6 @@
     type_id: degree_licenced
     priority: '4'
     partner_name: 'David Armstrong'
-    state: 'pending'
-    state: open
     partner_mobile: '9966332214'
     job_id: hr.job_developer
     stage_id: stage_job2
@@ -72,7 +68,6 @@
     date: !eval time.strftime('%Y-%m-12 17:49:19')
     type_id: degree_bac5
     partner_name: 'Tina Augustie'
-    state: 'open'
     partner_mobile: '9898745745'
     job_id: hr.job_developer
     stage_id: stage_job4
@@ -84,7 +79,6 @@
     date: !eval time.strftime('%Y-%m-12 17:49:19')
     type_id: degree_bac5
     partner_name: 'Shane Williams'
-    state: 'open'
     partner_mobile: '9812398524'
     stage_id: stage_job4
     name: 'Programmer'
@@ -100,6 +94,9 @@
     partner_name: 'David Armstrong'
     job_id: hr.job_developer
     stage_id: stage_job2
+    color: 4
     name: 'Advertisement'
     salary_expected: 11000.0
-
+-
+  !record {model: hr.job, id: hr.job_developer}:
+    survey_id: hr_recruitment.survey_job_0
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index d1866f124af..c3281b43b94 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -42,7 +42,7 @@
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_hr_applicant"/>
         <field name="state">code</field>
-        <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+        <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
     </record>
     <record id="action_applicant_unread" model="ir.values">
         <field name="name">action_project_unread</field>
@@ -60,7 +60,7 @@
         <field name="type">ir.actions.server</field>
         <field name="model_id" ref="model_hr_applicant"/>
         <field name="state">code</field>
-        <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+        <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
     </record>
     <record id="action_applicant_read" model="ir.values">
         <field name="name">action_project_read</field>
@@ -76,8 +76,8 @@
         <field name="name">Applicants</field>
         <field name="model">hr.applicant</field>
         <field name="arch" type="xml">
-            <tree string="Applicants" fonts="bold:needaction_pending==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
-                <field name="needaction_pending" invisible="1"/>
+            <tree string="Applicants" fonts="bold:message_unread==True" colors="grey:state in ('cancel','done');blue:state=='pending'">
+                <field name="message_unread" invisible="1"/>
                 <field name="create_date" groups="base.group_no_one"/>
                 <field name="name" string="Subject"/>
                 <field name="partner_name"/>
@@ -95,7 +95,7 @@
                 <field name="availability" invisible="1"/>
                 <field name="department_id" invisible="context.get('invisible_department', True)"/>
                 <field name="user_id"/>
-                <field name="state" groups="base.group_no_one"/>
+                <field name="state" invisible="1"/>
             </tree>
         </field>
     </record>
@@ -106,8 +106,8 @@
         <field name="arch" type="xml">
           <form string="Jobs - Recruitment Form" version="7.0">
             <header>
-                <button name="case_close_with_emp" string="Hire" type="object"
-                        states="open,pending" class="oe_highlight"/>
+                <button name="case_close_with_emp" string="Hire &amp; Create Employee" type="object"
+                        states="draft,open,pending,done" class="oe_highlight"/>
                 <button name="case_cancel" string="Refuse" type="object"
                         states="draft,open,pending" class="oe_highlight"/>
                 <field name="stage_id" widget="statusbar" clickable="True"/>
@@ -115,13 +115,13 @@
             <sheet>
                 <div class="oe_right oe_button_box">
                     <button name="action_makeMeeting" type="object"
-                        string="Schedule Interview" icon="gtk-index" help="Schedule interview with this applicant"/>
+                        string="Schedule Meeting" help="Schedule interview with this applicant"/>
                     <button name="%(survey.action_view_survey_question_message)d" type="action"
-                        string="Start Interview" icon="gtk-execute" help="Answer related job question"
+                        string="Start Interview" help="Answer related job question"
                         context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}"
                         attrs="{'invisible':[('survey','=',False)]}"/>
                     <button name="action_print_survey" type="object"
-                        string="Print Interview" icon="gtk-print" help="Print interview report"
+                        string="Print Interview" help="Print interview report"
                         attrs="{'invisible':[('survey','=',False)]}"/>
                 </div>
                 <div class="oe_title">
@@ -135,7 +135,7 @@
                 <group>
                     <group>
                         <field name="partner_id"
-                                on_change="onchange_partner_id(partner_id, email_from)"/>
+                                on_change="onchange_partner_id(partner_id)"/>
                         <field name="email_from" widget="email"/>
                         <field name="partner_phone"/>
                         <field name="partner_mobile"/>
@@ -183,8 +183,8 @@
                 <field name="description" placeholder="Feedback of interviews..."/>
             </sheet>
             <div class="oe_chatter">
-                <field name="message_ids" widget="mail_thread"/>
                 <field name="message_follower_ids" widget="mail_followers"/>
+                <field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
             </div>
           </form>
         </field>
@@ -208,29 +208,28 @@
         <field name="arch" type="xml">
             <search string="Search Jobs">
                 <field name="partner_name" filter_domain="['|','|',('name','ilike',self),('partner_name','ilike',self),('email_from','ilike',self)]" string="Subject / Applicant"/>
-                <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                 <separator/>
-                <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
-                <filter icon="terp-camera_test" string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
-                <filter icon="terp-gtk-media-pause" string="Pending" domain="[('state','=','pending')]" help="Pending Jobs"/>
+                <filter string="New" domain="[('state','=','draft')]" help="All Initial Jobs"/>
+                <filter string="In Progress" domain="[('state','=','open')]" help="Open Jobs"/>
+                <filter string="Pending" domain="[('state','=','pending')]" help="Pending Jobs"/>
                 <separator/>
-                <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments" icon="terp-personal-"/>
+                <filter string="Unassigned Recruitments" domain="[('user_id','=',False)]" help="Unassigned Recruitments"/>
                 <separator/>
-                <filter icon="terp-gtk-jump-to-ltr" string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
+                <filter string="Next Actions" context="{'invisible_next_action':False, 'invisible_next_date':False}"
                     domain="[('date_action','&lt;&gt;',False)]" help="Filter and view on next actions and date"/>
                 <field name="job_id"/>
                 <field name="user_id"/>
                 <group expand="0" string="Group By...">
-                    <filter string="Responsible" icon="terp-personal" domain="[]"  context="{'group_by':'user_id'}"/>
-                    <filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
-                    <filter string="Job" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'job_id'}"/>
-                    <filter string="Degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
-                    <filter string="Availability" icon="terp-camera_test" domain="[]" context="{'group_by':'availability'}"/>
-                    <filter string="Appreciation" icon="terp-face-plain" domain="[]" context="{'group_by':'priority'}"/>
-                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                    <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                    <filter string="Source" icon="terp-face-plain" domain="[]" context="{'group_by':'source_id'}"/>
-                    <filter string="Creation Date" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
+                    <filter string="Responsible" domain="[]"  context="{'group_by':'user_id'}"/>
+                    <filter string="Department" domain="[]" context="{'group_by':'department_id'}"/>
+                    <filter string="Job" domain="[]" context="{'group_by':'job_id'}"/>
+                    <filter string="Degree" domain="[]" context="{'group_by':'type_id'}"/>
+                    <filter string="Availability" domain="[]" context="{'group_by':'availability'}"/>
+                    <filter string="Appreciation" domain="[]" context="{'group_by':'priority'}"/>
+                    <filter string="Stage" domain="[]" context="{'group_by':'stage_id'}"/>
+                    <filter string="Source" domain="[]" context="{'group_by':'source_id'}"/>
+                    <filter string="Creation Date" domain="[]" context="{'group_by':'create_date'}" groups="base.group_no_one"/>
                 </group>
            </search>
         </field>
@@ -278,19 +277,20 @@
                         </ul>
                     </t>
                     <t t-name="kanban-box">
-                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                        <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                 <span class="oe_e">i</span>
                                 <ul class="oe_dropdown_menu">
-                                    <li><a type="edit">Edit...</a></li>
-                                    <li><a type="delete">Delete</a></li>
+                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                    <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                     <li><a name="action_makeMeeting" type="object">Schedule Interview</a></li>
                                     <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                 </ul>
                             </div>
                             <div class="oe_kanban_content" tooltip="kanban-tooltip">
                                 <div>
-                                    <b><field name="name"/></b><br/>
+                                    <t t-if="record.partner_name.raw_value"><b><field name="partner_name"/></b><br/></t>
+                                    <i><field name="name"/></i><br/>
                                     <field name="job_id"/><br/>
                                     <t t-if="record.partner_mobile.raw_value">Mobile: <field name="partner_mobile"/><br/></t>
                                     <t t-if="record.title_action.raw_value"><field name="title_action"/><br/></t>
@@ -315,9 +315,7 @@
                                 </div>
                                 <div class="oe_kanban_footer_left" style="margin-top:5px;">
                                     <div class="oe_left oe_tags">
-                                        <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
-                                            <span class="oe_tag" t-att-data-categ_id="categ_id"></span>
-                                        </t>
+                                        <field name="categ_ids"/>
                                     </div>
                                 </div>
                             </div>
@@ -335,18 +333,18 @@
         <field name="model">hr.job</field>
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
-            <field name="no_of_recruitment" version="7.0" position="after">
+            <field name="expected_employees" version="7.0" position="after">
                 <label for="survey_id" groups="base.group_user"/>
                 <div groups="base.group_user">
-                    <field name="survey_id" class="oe_inline"/>
+                    <field name="survey_id" class="oe_inline" domain="[('type','=','Human Resources')]"/>
                     <button class="oe_inline"
-                        string="Interview" icon="gtk-print"
+                        string="Interview"
                         name="action_print_survey" type="object"
                         attrs="{'invisible':[('survey_id','=',False)]}"/>
                 </div>
             </field>
-            <xpath expr="/form/sheet/h1" version="7.0" position="after">
-                <div colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
+            <xpath expr="//div[@class='oe_title']" version="7.0" position="after">
+                <div attrs="{'invisible': [('alias_domain', '=', False)]}">
                     <field name="alias_id" invisible="1" required="0"/>
                     <label for="alias_name" class="oe_edit_only"/>
                     <field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
@@ -376,10 +374,15 @@
         <field name="arch" type="xml">
             <form string="Stage" version="7.0">
                 <group string="Stage Definition">
-                    <field name="name"/>
-                    <field name="department_id"/>
-                    <field name="sequence"/>
-                    <field name="state"/>
+                    <group>
+                        <field name="name"/>
+                        <field name="department_id"/>
+                    </group>
+                    <group>
+                        <field name="state"/>
+                        <field name="sequence"/>
+                        <field name="fold"/>
+                    </group>
                 </group>
                 <separator string="Requirements"/>
                 <field name="requirements"/>
diff --git a/addons/hr_recruitment/i18n/ar.po b/addons/hr_recruitment/i18n/ar.po
index a4859fdcb84..3b4dcbfec38 100644
--- a/addons/hr_recruitment/i18n/ar.po
+++ b/addons/hr_recruitment/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -35,7 +35,7 @@ msgstr "المتطلبات"
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_source_action
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_source
 msgid "Sources of Applicants"
-msgstr ""
+msgstr "مصادر مقدمين الطلبات"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,delay_open:0
@@ -55,12 +55,12 @@ msgstr "تجميع حسب..."
 #. module: hr_recruitment
 #: field:hr.applicant,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "البريد الإلكتروني للمستخدم"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Filter and view on next actions and date"
-msgstr ""
+msgstr "تصفية و عرض  للإجراءت المقبلة و التاريخ"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0 field:hr.applicant,department_id:0
@@ -76,7 +76,7 @@ msgstr "موعد الاجراء التالي"
 #. module: hr_recruitment
 #: field:hr.applicant,salary_expected_extra:0
 msgid "Expected Salary Extra"
-msgstr ""
+msgstr "راتب إضافي متوقع"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -86,7 +86,7 @@ msgstr "المهام"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Pending Jobs"
-msgstr ""
+msgstr "وظائف معلقة"
 
 #. module: hr_recruitment
 #: field:hr.applicant,company_id:0 view:hr.recruitment.report:0
@@ -103,7 +103,7 @@ msgstr "كلا"
 #: code:addons/hr_recruitment/hr_recruitment.py:436
 #, python-format
 msgid "You must define Applied Job for this applicant."
-msgstr ""
+msgstr "يجب أن تحدد الوظيفة المقدم لها هذا الطلب."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -144,7 +144,7 @@ msgstr "يوم"
 #. module: hr_recruitment
 #: field:hr.applicant,reference:0
 msgid "Refered By"
-msgstr ""
+msgstr "المشار إليه بواسطة"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -164,7 +164,7 @@ msgstr "رفض"
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
 msgid "Master Degree"
-msgstr ""
+msgstr "درجة ماجستير"
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_mobile:0
@@ -220,7 +220,7 @@ msgstr "تجنيدي"
 #. module: hr_recruitment
 #: field:hr.job,survey_id:0
 msgid "Interview Form"
-msgstr ""
+msgstr "نموذج مقابلة"
 
 #. module: hr_recruitment
 #: help:hr.job,survey_id:0
@@ -228,6 +228,8 @@ msgid ""
 "Choose an interview form for this job position and you will be able to "
 "print/answer this interview from all applicants who apply for this job"
 msgstr ""
+"أختر نموذج المقابلة لطبيعة أو وضع هذه الوظيفة وسوف تكون قادر علي طباعة "
+"/إجابة هذه المقابلة من جميع المتقدمين الذين يتقدمون لهذه الوظيفة"
 
 #. module: hr_recruitment
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
@@ -266,6 +268,8 @@ msgid ""
 "Stages of the recruitment process may be different per department. If this "
 "stage is common to all departments, keep tempy this field."
 msgstr ""
+"مراحل عملية التوظيف قد تكون مختلفة من قسم لآخر. إذا كانت هذه المرحلة مشتركة "
+"بين جميع الأقسام، اترك الحقل فارغ."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -275,7 +279,7 @@ msgstr "السابق"
 #. module: hr_recruitment
 #: model:ir.model,name:hr_recruitment.model_hr_recruitment_source
 msgid "Source of Applicants"
-msgstr ""
+msgstr "مصدر مقدمين الطلبات"
 
 #. module: hr_recruitment
 #: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:115
@@ -297,17 +301,17 @@ msgstr "احصائيات التعيينات"
 #: code:addons/hr_recruitment/hr_recruitment.py:476
 #, python-format
 msgid "Changed Stage to: %s"
-msgstr ""
+msgstr "تغيير المرحلة إلي :%s"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Hire"
-msgstr ""
+msgstr "تعيين"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Hired employees"
-msgstr ""
+msgstr "الموظفين المعينيين"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -380,8 +384,8 @@ msgid ""
 "Define here your stages of the recruitment process, for example: "
 "qualification call, first interview, second interview, refused, hired."
 msgstr ""
-"حدد هنا مراحل عملية التوظيف, على سبيل المثال: دعوة التأهيل, المقابلة الاول, "
-"المقابلة الثانية, الرفض, المأجور."
+"حدد هنا مراحل عملية التوظيف، على سبيل المثال: المكالمة الهاتفية، المقابلة "
+"الاولي، المقابلة الثانية، الرفض أو التعيين."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0 field:hr.applicant,create_date:0
@@ -393,7 +397,7 @@ msgstr "تاريخ الإنشاء"
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_hired_employee
 #: model:ir.model,name:hr_recruitment.model_hired_employee
 msgid "Create Employee"
-msgstr ""
+msgstr "إنشاء حساب موظف"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.job2phonecall,deadline:0
@@ -409,7 +413,7 @@ msgstr "التقدير"
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
 msgid "Initial Qualification"
-msgstr ""
+msgstr "المؤهل الأولي"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -478,6 +482,8 @@ msgid ""
 "forget to specify the department if your recruitment process is different "
 "according to the job position."
 msgstr ""
+" اخر ما إذا كانت المراحل التالية مطابقة لعملية التوظيف.  لا تنسي تحديد القسم "
+"إذا كانت عملية التوظيف الخاصة بك تختلف بحسب طبيعة الوظيفة."
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -507,7 +513,7 @@ msgstr "جهة الاتصال"
 #. module: hr_recruitment
 #: help:hr.applicant,salary_expected_extra:0
 msgid "Salary Expected by Applicant, extra advantages"
-msgstr ""
+msgstr "الراتب المتوقع من قبل المتقدم، مزايا إضافية"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -540,7 +546,7 @@ msgstr "مراحل"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Draft recruitment"
-msgstr ""
+msgstr "مشروع التوظيف"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -555,7 +561,7 @@ msgstr "جاري التقدم"
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
 msgid "Review Recruitment Stages"
-msgstr ""
+msgstr "مراجعة مراحل التوظيف"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -580,12 +586,12 @@ msgstr "ديسمبر"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Recruitment performed in current year"
-msgstr ""
+msgstr "توظيف أجري في العام الحالي"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Recruitment during last month"
-msgstr ""
+msgstr "توظيف خلال الشهر الماضي"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0 field:hr.recruitment.report,month:0
@@ -595,7 +601,7 @@ msgstr "شهر"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Unassigned Recruitments"
-msgstr ""
+msgstr "تعيينات غير محددة"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -681,7 +687,7 @@ msgstr "الراتب المتوقع من المتقدم"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "All Initial Jobs"
-msgstr ""
+msgstr "جميع الوظائف المبدئية"
 
 #. module: hr_recruitment
 #: help:hr.applicant,email_cc:0
@@ -812,7 +818,7 @@ msgstr "رد"
 #. module: hr_recruitment
 #: field:hr.recruitment.stage,department_id:0
 msgid "Specific to a Department"
-msgstr ""
+msgstr "خاص بالقسم"
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
@@ -829,7 +835,7 @@ msgstr "جدول المكالمات التليفونية"
 #. module: hr_recruitment
 #: field:hr.applicant,salary_proposed_extra:0
 msgid "Proposed Salary Extra"
-msgstr ""
+msgstr "راتب إضافي مقترح"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -865,7 +871,7 @@ msgstr "هل انت متأكد من انشاء شريك بناءًا على طل
 #. module: hr_recruitment
 #: view:hired.employee:0
 msgid "Would you like to create an employee ?"
-msgstr ""
+msgstr "هل تريد إنشاء موظف ؟"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
@@ -893,7 +899,7 @@ msgstr "محفوظات"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Recruitment performed in current month"
-msgstr ""
+msgstr "توظيف أجري في الشهر الحالي"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,help:hr_recruitment.hr_recruitment_stage_form_installer
@@ -902,6 +908,8 @@ msgid ""
 "forget to specify the department if your recruitment process is different "
 "according to the job position."
 msgstr ""
+"تحقق إذا ما كانت المراحل التالية مطابقة لعملية التوظيف. لاتنسي تحديد القسم "
+"إذا كانت عملية التوظيف الخاصة بك تختلف بحسب طبيعة الوظيفة."
 
 #. module: hr_recruitment
 #: field:hr.applicant,partner_address_id:0
@@ -927,7 +935,7 @@ msgstr "الموقع الإلكتروني للشركة"
 #. module: hr_recruitment
 #: sql_constraint:hr.recruitment.degree:0
 msgid "The name of the Degree of Recruitment must be unique!"
-msgstr ""
+msgstr "أسم درجة الوظيفية يجب أن يكون فريد !"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0 field:hr.recruitment.report,year:0
@@ -959,7 +967,7 @@ msgstr "الشريك موجود بالفعل بنفس الاسم."
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Subject / Applicant"
-msgstr ""
+msgstr "موضوع / مقدم الطلب"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.degree,sequence:0
@@ -982,12 +990,12 @@ msgstr "تحليل التوظيف"
 #. module: hr_recruitment
 #: view:hired.employee:0
 msgid "Create New Employee"
-msgstr ""
+msgstr "إنشاء موظف جديد"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.source,name:hr_recruitment.source_linkedin
 msgid "LinkedIn"
-msgstr ""
+msgstr "LinkedIn"
 
 #. module: hr_recruitment
 #: selection:hr.recruitment.report,month:0
@@ -1032,7 +1040,7 @@ msgstr "توقيع العقد"
 #. module: hr_recruitment
 #: model:hr.recruitment.source,name:hr_recruitment.source_word
 msgid "Word of Mouth"
-msgstr ""
+msgstr "علي لسان العامة"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,state:0 selection:hr.recruitment.report,state:0
@@ -1050,7 +1058,7 @@ msgstr "ويجري التعاقد للطلب ‘%s‘"
 #: selection:hr.applicant,state:0 view:hr.recruitment.report:0
 #: selection:hr.recruitment.report,state:0
 msgid "Hired"
-msgstr "المؤجر"
+msgstr "متعاقد"
 
 #. module: hr_recruitment
 #: selection:hr.applicant,priority:0
@@ -1102,7 +1110,7 @@ msgstr "إبريل"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "Pending recruitment"
-msgstr ""
+msgstr "في إنتظار التعيين"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.source,name:hr_recruitment.source_monster
@@ -1149,7 +1157,7 @@ msgstr "تم وضع طلب الوظيفة ‘%s‘ في ‘التقدم‘."
 #. module: hr_recruitment
 #: help:hr.applicant,salary_proposed_extra:0
 msgid "Salary Proposed by the Organisation, extra advantages"
-msgstr ""
+msgstr "راتب مقترح من قبل المنشأة، مزايا إضافية"
 
 #. module: hr_recruitment
 #: help:hr.recruitment.report,delay_close:0
diff --git a/addons/hr_recruitment/i18n/bg.po b/addons/hr_recruitment/i18n/bg.po
index 1b61f5fd55f..8fcfa402c5c 100644
--- a/addons/hr_recruitment/i18n/bg.po
+++ b/addons/hr_recruitment/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/ca.po b/addons/hr_recruitment/i18n/ca.po
index 07478a239dc..25829433da0 100644
--- a/addons/hr_recruitment/i18n/ca.po
+++ b/addons/hr_recruitment/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/da.po b/addons/hr_recruitment/i18n/da.po
index 895deea1910..892c2aca6b3 100644
--- a/addons/hr_recruitment/i18n/da.po
+++ b/addons/hr_recruitment/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/de.po b/addons/hr_recruitment/i18n/de.po
index dccee664960..85c697b00a2 100644
--- a/addons/hr_recruitment/i18n/de.po
+++ b/addons/hr_recruitment/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/es.po b/addons/hr_recruitment/i18n/es.po
index 2116f71b047..998f9d58ce6 100644
--- a/addons/hr_recruitment/i18n/es.po
+++ b/addons/hr_recruitment/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/es_CR.po b/addons/hr_recruitment/i18n/es_CR.po
index 4a89146e4f5..60e3b4f2c14 100644
--- a/addons/hr_recruitment/i18n/es_CR.po
+++ b/addons/hr_recruitment/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/fr.po b/addons/hr_recruitment/i18n/fr.po
index 4de9711ee13..4fc8b840ee2 100644
--- a/addons/hr_recruitment/i18n/fr.po
+++ b/addons/hr_recruitment/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/hi.po b/addons/hr_recruitment/i18n/hi.po
index 18685f61f4a..a1e099e33ec 100644
--- a/addons/hr_recruitment/i18n/hi.po
+++ b/addons/hr_recruitment/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/hr.po b/addons/hr_recruitment/i18n/hr.po
index 3da91803768..47f3713baf4 100644
--- a/addons/hr_recruitment/i18n/hr.po
+++ b/addons/hr_recruitment/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/hu.po b/addons/hr_recruitment/i18n/hu.po
index fb3b500e33f..b083d8a0f33 100644
--- a/addons/hr_recruitment/i18n/hu.po
+++ b/addons/hr_recruitment/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/id.po b/addons/hr_recruitment/i18n/id.po
index c9a333a8636..a35b862a9fa 100644
--- a/addons/hr_recruitment/i18n/id.po
+++ b/addons/hr_recruitment/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/it.po b/addons/hr_recruitment/i18n/it.po
index 92b3c1179bc..5785ad92e49 100644
--- a/addons/hr_recruitment/i18n/it.po
+++ b/addons/hr_recruitment/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/ja.po b/addons/hr_recruitment/i18n/ja.po
index 1dba38da574..a379b51b728 100644
--- a/addons/hr_recruitment/i18n/ja.po
+++ b/addons/hr_recruitment/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/mk.po b/addons/hr_recruitment/i18n/mk.po
index 01f4e331adf..eb0391a7009 100644
--- a/addons/hr_recruitment/i18n/mk.po
+++ b/addons/hr_recruitment/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/mn.po b/addons/hr_recruitment/i18n/mn.po
index 3f256db60c9..3501c0d7953 100644
--- a/addons/hr_recruitment/i18n/mn.po
+++ b/addons/hr_recruitment/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/nl.po b/addons/hr_recruitment/i18n/nl.po
index 6cd46760699..897a4184e52 100644
--- a/addons/hr_recruitment/i18n/nl.po
+++ b/addons/hr_recruitment/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-19 13:18+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -558,7 +558,7 @@ msgstr "Verwijderen"
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
 msgid "In progress"
-msgstr "Loopt"
+msgstr "In behandeling"
 
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_form_installer
@@ -674,7 +674,7 @@ msgstr "Groepeer op..."
 #. module: hr_recruitment
 #: view:hr.applicant:0 selection:hr.applicant,state:0
 msgid "In Progress"
-msgstr "Loopt"
+msgstr "In behandeling"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -1156,7 +1156,7 @@ msgstr "Toewijzen aan"
 #: code:addons/hr_recruitment/hr_recruitment.py:407
 #, python-format
 msgid "The job request '%s' has been set 'in progress'."
-msgstr "De sollicitatie '%s' is op 'loopt' gezet."
+msgstr "De sollicitatie '%s' is op 'in behandeling' gezet."
 
 #. module: hr_recruitment
 #: help:hr.applicant,salary_proposed_extra:0
diff --git a/addons/hr_recruitment/i18n/pl.po b/addons/hr_recruitment/i18n/pl.po
index 5b5eaee5dce..200a77cce02 100644
--- a/addons/hr_recruitment/i18n/pl.po
+++ b/addons/hr_recruitment/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/pt.po b/addons/hr_recruitment/i18n/pt.po
index 84c1ffacd05..d47496f8244 100644
--- a/addons/hr_recruitment/i18n/pt.po
+++ b/addons/hr_recruitment/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/pt_BR.po b/addons/hr_recruitment/i18n/pt_BR.po
index 07920654ee7..ac65199af8b 100644
--- a/addons/hr_recruitment/i18n/pt_BR.po
+++ b/addons/hr_recruitment/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/ro.po b/addons/hr_recruitment/i18n/ro.po
index 6d3b559185d..ddbb3dc2ac9 100644
--- a/addons/hr_recruitment/i18n/ro.po
+++ b/addons/hr_recruitment/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:28+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/ru.po b/addons/hr_recruitment/i18n/ru.po
index bebe0a711c6..5237c85118e 100644
--- a/addons/hr_recruitment/i18n/ru.po
+++ b/addons/hr_recruitment/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/sr.po b/addons/hr_recruitment/i18n/sr.po
index d72186ed0df..68dd3e11b0b 100644
--- a/addons/hr_recruitment/i18n/sr.po
+++ b/addons/hr_recruitment/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/sr@latin.po b/addons/hr_recruitment/i18n/sr@latin.po
index 15f90745aae..b0256d20b0f 100644
--- a/addons/hr_recruitment/i18n/sr@latin.po
+++ b/addons/hr_recruitment/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/sv.po b/addons/hr_recruitment/i18n/sv.po
index 33d7b54abb4..9e87f4017c5 100644
--- a/addons/hr_recruitment/i18n/sv.po
+++ b/addons/hr_recruitment/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -270,6 +270,8 @@ msgid ""
 "Stages of the recruitment process may be different per department. If this "
 "stage is common to all departments, keep tempy this field."
 msgstr ""
+"Stegen i rekryteringsprocessen kan vara olika per avdelning. Om detta steg "
+"är gemensamt för alla avdelningar, håll detta fält tomt."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -413,7 +415,7 @@ msgstr "Uppskattning"
 #. module: hr_recruitment
 #: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
 msgid "Initial Qualification"
-msgstr ""
+msgstr "Grundläggande Kompetens"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -436,7 +438,7 @@ msgstr "Vilande"
 #. module: hr_recruitment
 #: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
 msgid "Recruitment / Applicants Stages"
-msgstr ""
+msgstr "Rekrytering / Steg Sökande"
 
 #. module: hr_recruitment
 #: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
@@ -482,6 +484,8 @@ msgid ""
 "forget to specify the department if your recruitment process is different "
 "according to the job position."
 msgstr ""
+" Kontrollera om följande steg matchar din rekryteringsprocess. Glöm inte att "
+"ange avdelning om din rekryteringsprocess är olika beroende på befattning."
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -501,7 +505,7 @@ msgstr "Sökande"
 #. module: hr_recruitment
 #: help:hr.recruitment.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of stages."
-msgstr ""
+msgstr "Visaren lista på stegen i sekvens ordning."
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -564,7 +568,7 @@ msgstr "Granska etapperna i rektryteringsprocessen"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Jobs - Recruitment Form"
-msgstr ""
+msgstr "Jobb - Rekryteringsformulär"
 
 #. module: hr_recruitment
 #: field:hr.applicant,probability:0
@@ -865,6 +869,8 @@ msgstr "Samtalsbeskrivning"
 #: view:hr.recruitment.partner.create:0
 msgid "Are you sure you want to create a partner based on this job request ?"
 msgstr ""
+"Är du säker på att du vill skapa en partner utifrån den här begäran om "
+"jobbet?"
 
 #. module: hr_recruitment
 #: view:hired.employee:0
diff --git a/addons/hr_recruitment/i18n/tr.po b/addons/hr_recruitment/i18n/tr.po
index b398ab63a21..a97ba667f0a 100644
--- a/addons/hr_recruitment/i18n/tr.po
+++ b/addons/hr_recruitment/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/vi.po b/addons/hr_recruitment/i18n/vi.po
index df15826afff..092c39773c2 100644
--- a/addons/hr_recruitment/i18n/vi.po
+++ b/addons/hr_recruitment/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/i18n/zh_CN.po b/addons/hr_recruitment/i18n/zh_CN.po
index 0db77c7aeaf..81b6400faff 100644
--- a/addons/hr_recruitment/i18n/zh_CN.po
+++ b/addons/hr_recruitment/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index e888da9ead7..d3faa3f37be 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -41,7 +41,7 @@ class hr_recruitment_report(osv.osv):
     _columns = {
         'user_id': fields.many2one('res.users', 'User', readonly=True),
         'nbr': fields.integer('# of Applications', readonly=True),
-        'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
+        'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
                                   ('05', 'May'), ('06', 'June'), \
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 30a20a25eb8..b33b2eaa053 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -5,7 +5,7 @@
         <field name="name">hr.recruitment.report.tree</field>
         <field name="model">hr.recruitment.report</field>
         <field name="arch" type="xml">
-            <tree string="Recruitment Analysis">
+            <tree string="Recruitment Analysis" create="false">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="job_id"/>
@@ -71,7 +71,6 @@
                    <filter string="Department" name="department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>
                    <filter string="Degree" name="degree" icon="terp-gtk-select-all" domain="[]" context="{'group_by':'type_id'}"/>
                    <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}" />
-                   <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                    <filter string="Day" name = "day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
                    <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
                    <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Creation Date"/>
diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py
index bf247f303f1..d80b0b71727 100644
--- a/addons/hr_recruitment/res_config.py
+++ b/addons/hr_recruitment/res_config.py
@@ -26,10 +26,10 @@ class hr_applicant_settings(osv.osv_memory):
     _inherit = ['hr.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'module_document_ftp': fields.boolean('allow the automatic indexation of resumes',
+        'module_document_ftp': fields.boolean('Allow the automatic indexation of resumes',
             help="""Manage your CV's and motivation letter related to all applicants.
                 This installs the module document_ftp. This will install the knowledge management  module in order to allow you to search using specific keywords through  the content of all documents (PDF, .DOCx...)"""),
-        'fetchmail_applicants': fields.boolean('create applicants from an incoming email account',
+        'fetchmail_applicants': fields.boolean('Create applicants from an incoming email account',
             fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications',   
             help ="""Allow applicants to send their job application to an email address (jobs@mycompany.com),
                 and create automatically application documents in the system."""),
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index 449246bd343..1c692099f60 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -2,17 +2,12 @@
 <openerp>
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
-        <record id="todo_open_hr_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="hr.action_client_hr_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
         </record>
     </data>
     <data>
-        <record id="hr.todo_open_hr_menu" model="ir.actions.todo">
-            <field name="state">done</field>
-        </record>
-
         <record id="view_hr_apll_config_settings" model="ir.ui.view">
             <field name="name">hr settings for recruitment</field>
             <field name="model">hr.config.settings</field>
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 086e63e542b..2d0b85faf70 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -8,5 +8,5 @@ access_survey_hr_user,survey.hr.user,survey.model_survey,base.group_hr_user,1,1,
 access_crm_meeting_hruser,crm.meeting.hruser,base_calendar.model_crm_meeting,base.group_hr_user,1,1,1,1
 access_hr_recruitment_source_hr_officer,hr.recruitment.source,model_hr_recruitment_source,base.group_hr_user,1,1,1,1
 access_hr_recruitment_source_all,hr.recruitment.source,model_hr_recruitment_source,,1,0,0,0
-access_hr_applicant_category,hr.applicant_category,model_hr_applicant_category,,1,0,0,0
+access_hr_applicant_category,hr.applicant_category,model_hr_applicant_category,,1,1,1,0
 access_hr_applicant_category_manager,hr.applicant_category,model_hr_applicant_category,base.group_hr_manager,1,1,1,1
diff --git a/addons/hr_recruitment/static/src/js/hr_recruitment.js b/addons/hr_recruitment/static/src/js/hr_recruitment.js
index 5a2d6bd92b4..d11326ac9de 100644
--- a/addons/hr_recruitment/static/src/js/hr_recruitment.js
+++ b/addons/hr_recruitment/static/src/js/hr_recruitment.js
@@ -10,16 +10,16 @@ openerp.hr_recruitment = function(openerp) {
             var categ_ids = [];
 
             // Collect categories ids
-            self.$element.find('span[data-categ_id]').each(function() {
+            self.$el.find('span[data-categ_id]').each(function() {
                 categ_ids.push($(this).data('categ_id'));
             });
 
             // Find their matching names
             var dataset = new openerp.web.DataSetSearch(self, 'hr.applicant_category', self.session.context, [['id', 'in', _.uniq(categ_ids)]]);
-            dataset.read_slice(['id', 'name']).then(function(result) {
+            dataset.read_slice(['id', 'name']).done(function(result) {
                 _.each(result, function(v, k) {
                     // Set the proper value in the DOM and display the element
-                    self.$element.find('span[data-categ_id=' + v.id + ']').text(v.name);
+                    self.$el.find('span[data-categ_id=' + v.id + ']').text(v.name);
                 });
             });
         },
diff --git a/addons/hr_recruitment/test/recruitment_process.yml b/addons/hr_recruitment/test/recruitment_process.yml
index 841a49dc866..5f0a005939d 100644
--- a/addons/hr_recruitment/test/recruitment_process.yml
+++ b/addons/hr_recruitment/test/recruitment_process.yml
@@ -15,7 +15,7 @@
     applicant_ids = self.search(cr, uid, [('email_from','=', 'Mr. Richard Anderson <Richard_Anderson@yahoo.com>')])
     assert applicant_ids, "Applicant is not created after getting the mail"
     applicant = self.browse(cr, uid, applicant_ids[0], context=context)
-    resume_ids = self.pool.get('ir.attachment').search(cr, uid, [('datas_fname','=','resume.doc'),('res_model','=',self._name),('res_id','=',applicant.id)])
+    resume_ids = self.pool.get('ir.attachment').search(cr, uid, [('datas_fname','=','resume.pdf'),('res_model','=',self._name),('res_id','=',applicant.id)])
     assert applicant.name == "Application for the post of Jr.application Programmer.", "Applicant name does not match."
     assert applicant.stage_id.id == ref('hr_recruitment.stage_job1'), "Stage should be 'Initial qualification' and is '%s'." % (applicant.stage_id.name)
     assert applicant.state == "draft", "Applicant state should be 'draft'."
diff --git a/addons/hr_recruitment/test/resume.eml b/addons/hr_recruitment/test/resume.eml
index 00cc5620563..ad8f4967040 100644
--- a/addons/hr_recruitment/test/resume.eml
+++ b/addons/hr_recruitment/test/resume.eml
@@ -80,760 +80,1525 @@ Content-Transfer-Encoding: 7bit
 --------------010004020303010906010104--
 
 --------------010903010402010104090709
-Content-Type: application/msword;
- name="resume.doc"
+Content-Type: application/pdf;
+ name="resume.pdf"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment;
- filename="resume.doc"
+ filename="resume.pdf"
 
-0M8R4KGxGuEAAAAAAAAAAAAAAAAAAAAAOwADAP7/CQAGAAAAAAAAAAAAAAABAAAASwAAAAAA
-AAAAEAAAAgAAAAEAAAD+////AAAAAAAAAAD/////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-///////////////////////////////////9//////////7///9KAAAABQAAAAYAAAAHAAAA
-CAAAAAkAAAAKAAAACwAAAAwAAAANAAAADgAAAA8AAAAQAAAAEQAAABIAAAATAAAAFAAAABUA
-AAD+////FwAAABgAAAAZAAAAGgAAABsAAAAcAAAAHQAAAB4AAAAfAAAAIAAAACEAAAAiAAAA
-IwAAACQAAAAlAAAAJgAAACcAAAAoAAAA/v///yoAAAArAAAALAAAAC0AAAAuAAAALwAAADAA
-AAAxAAAAMgAAADMAAAA0AAAANQAAADYAAAA3AAAAOAAAADkAAAA6AAAAOwAAADwAAAA9AAAA
-PgAAAD8AAABAAAAAQQAAAEIAAABDAAAARAAAAEUAAABGAAAARwAAAEgAAABJAAAA/v////7/
-//9MAAAATQAAAP7/////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////1IA
-bwBvAHQAIABFAG4AdAByAHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAWAAUA////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAA/v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////////8AAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
-/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP7///8AAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAA////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAA/v///wAAAAAAAAAAAQAAAP7////+////BAAAAAUAAAAGAAAABwAAAP7/
-//8JAAAA/v//////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////8BAP7/
-AwoAAP////8GCQIAAAAAAMAAAAAAAABGGAAAAE1pY3Jvc29mdCBXb3JkLURva3VtZW50AAoA
-AABNU1dvcmREb2MAEAAAAFdvcmQuRG9jdW1lbnQuOAD0ObJxAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAEAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+/wAAAQACAAAAAAAAAAAAAAAAAAAAAAABAAAA
-4IWf8vlPaBCrkQgAKyez2TAAAADsAAAACgAAAAEAAABYAAAAAgAAAGAAAAAEAAAAeAAAAAcA
-AACUAAAACAAAAKQAAAAJAAAAsAAAAAoAAAC8AAAACwAAAMgAAAAMAAAA1AAAAA0AAADgAAAA
-AgAAAOn9AAAeAAAAEAAAAENhbmRpZGF0ZXMgTmFtZQAeAAAAFAAAAHNhZ2FyIHAgc3VyeWF3
-YW5zaGkAHgAAAAcAAABOb3JtYWwAAB4AAAAEAAAAc2FpAB4AAAAEAAAAMTY5AEAAAAAAyPid
-CgAAAEAAAAAAAAAAAAAAAEAAAAAAnpj/jovLAUAAAAAA1LJ/lhzMAQAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAABIAZwAKAAEAWwAPAAIAAAAAAAAAYAAAEPH/AgBgAAAA
-BgBOAG8AcgBtAGEAbAAAABEAAAADJABhJAAxJAEqJAFBJAAALwBCKgBPSgAAUUoAAENKFABt
-SAkEc0gJBFBKAABuSAQIXkoAAGFKFABfSAEEdEgBBABcAAEQAQACAFwAAAAJAEgAZQBhAGQA
-aQBuAGcAIAAxAAAAJwABAAMkA2EkAw3GBQABOAQAXoQAAF2EoAVghAAAE6RkABSkZAAGJAEA
-DwBPSgIAUUoCAENKEgA1CAEAPgACEAEAAgA+AAAACQBIAGUAYQBkAGkAbgBnACAAMgAAAA0A
-AgATpGQAFKRkAAYkAQAMAE9KAgBRSgIAQ0oSADoAAxABAAIAOgAAAAkASABlAGEAZABpAG4A
-ZwAgADMAAAAFAAMABiQBAA8AT0oCAFFKAgBDShIANQgBAFYABBABAAIAVgAAAAkASABlAGEA
-ZABpAG4AZwAgADQAAAAfAAQAEmRoAQEADcYFAAFoAQBehGgBXYQAAGCEmP4GJAEAEgBPSgIA
-UUoCAENKEgA1CAFcCAEyAAUQAQBiBTIAAAAJAEgAZQBhAGQAaQBuAGcAIAA1AAAACgAFABOk
-ZAAUpGQAAwA1CAEAUAAGEAEAAgBQAAAACQBIAGUAYQBkAGkAbgBnACAANgAAABkABgANxgUA
-ATgEAF6EAABdhKAFYIQAAAYkAQASAE9KAgBRSgIAQ0oSAD4qAVwIAWAABxABAAIAYAAAAAkA
-SABlAGEAZABpAG4AZwAgADcAAAAwAAcAQCYGCiYGC0YBAAomBgtGAQAxJAANxgUAARwBADck
-AF6EHAFdhAAAYITk/gYkAQwAT0oCAFFKAgBDShIASAAIEAEAAgBIAAAACQBIAGUAYQBkAGkA
-bgBnACAAOAAAABcACAAxJAA3JABehBwBXYQAAGCE5P4GJAEADABPSgIAUUoCAENKEgAAAEIA
-QUDy/6EAQgAAABkAQQBiAHMAYQB0AHoALQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYA
-dABhAHIAdAAAAAAAAAAAAAAAAABCAP4f8v/xAEIAAAAZAEEAYgBzAGEAdAB6AC0AUwB0AGEA
-bgBkAGEAcgBkAHMAYwBoAHIAaQBmAHQAYQByAHQAAAAAAEgA/h/y/wEBSAAAABwAVwBXAC0A
-QQBiAHMAYQB0AHoALQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYAdABhAHIAdAAAAAAA
-SgD+H/L/EQFKAAAAHQBXAFcALQBBAGIAcwBhAHQAegAtAFMAdABhAG4AZABhAHIAZABzAGMA
-aAByAGkAZgB0AGEAcgB0ADEAAAAAAEwA/h/y/yEBTAAAAB4AVwBXAC0AQQBiAHMAYQB0AHoA
-LQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYAdABhAHIAdAAxADEAAAAAAE4A/h/y/zEB
-TgAAAB8AVwBXAC0AQQBiAHMAYQB0AHoALQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYA
-dABhAHIAdAAxADEAMQAAAAAAUAD+H/L/QQFQAAAAIABXAFcALQBBAGIAcwBhAHQAegAtAFMA
-dABhAG4AZABhAHIAZABzAGMAaAByAGkAZgB0AGEAcgB0ADEAMQAxADEAAAAAAFIA/h/y/1EB
-UgAAACEAVwBXAC0AQQBiAHMAYQB0AHoALQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYA
-dABhAHIAdAAxADEAMQAxADEAAAAAAFQA/h/y/2EBVAAAACIAVwBXAC0AQQBiAHMAYQB0AHoA
-LQBTAHQAYQBuAGQAYQByAGQAcwBjAGgAcgBpAGYAdABhAHIAdAAxADEAMQAxADEAMQAAAAAA
-KgD+H/L/cQEqAAAACQBXAFcAOABOAHUAbQAyAHoAMAAAAAgAT0oBAFFKAQAuAP4f8v+BAS4A
-AAAJAFcAVwA4AE4AdQBtADIAegAxAAAADABPSgcAUUoHAF5KBwAqAP4f8v+RASoAAAAJAFcA
-VwA4AE4AdQBtADIAegAzAAAACABPSgEAUUoBADYA/h/y/6EBNgAAAAkAVwBXADgATgB1AG0A
-MwB6ADAAAAATAE9KAABRSgAANQgBUEoAAF5KAAAAKgD+H/L/sQEqAAAACQBXAFcAOABOAHUA
-bQAzAHoAMQAAAAgAT0oHAFFKBwAqAP4f8v/BASoAAAAJAFcAVwA4AE4AdQBtADMAegAyAAAA
-CABPSggAUUoIACoA/h/y/9EBKgAAAAkAVwBXADgATgB1AG0ANAB6ADAAAAAIAE9KCABRSggA
-LgD+H/L/4QEuAAAACQBXAFcAOABOAHUAbQA0AHoAMQAAAAwAT0oHAFFKBwBeSgcAKgD+H/L/
-8QEqAAAACQBXAFcAOABOAHUAbQA0AHoAMwAAAAgAT0oBAFFKAQA8AP4f8v8BAjwAAAAWAEQA
-ZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAAAAAACoA/h/y/xEC
-KgAAAAkAVwBXADgATgB1AG0AMQB6ADAAAAAIAE9KAABRSgAAKgD+H/L/IQIqAAAACQBXAFcA
-OABOAHUAbQAzAHoAMwAAAAgAT0oBAFFKAQAqAP4f8v8xAioAAAAJAFcAVwA4AE4AdQBtADUA
-egAwAAAACABPSgEAUUoBACoA/h/y/0ECKgAAAAkAVwBXADgATgB1AG0ANQB6ADEAAAAIAE9K
-BwBRSgcAKgD+H/L/UQIqAAAACQBXAFcAOABOAHUAbQA1AHoAMgAAAAgAT0oIAFFKCAAqAP4f
-8v9hAioAAAAJAFcAVwA4AE4AdQBtADcAegAwAAAACABPSgEAUUoBADwA/h/y/3ECPAAAAAkA
-VwBXADgATgB1AG0AOAB6ADAAAAAZAEIqBnBo/wAAAE9KCABRSggAUEoAAF5KAAAALgD+H/L/
-gQIuAAAACQBXAFcAOABOAHUAbQA4AHoAMQAAAAwAT0oHAFFKBwBeSgcAKgD+H/L/kQIqAAAA
-CQBXAFcAOABOAHUAbQA4AHoAMgAAAAgAT0oIAFFKCAAqAP4f8v+hAioAAAAJAFcAVwA4AE4A
-dQBtADgAegAzAAAACABPSgEAUUoBACoA/h/y/7ECKgAAAAkAVwBXADgATgB1AG0AOQB6ADAA
-AAAIAE9KAQBRSgEALAD+H/L/wQIsAAAACgBXAFcAOABOAHUAbQAxADAAegAwAAAACABPSgEA
-UUoBACwA/h/y/9ECLAAAAAoAVwBXADgATgB1AG0AMQAxAHoAMAAAAAgAT0oBAFFKAQAsAP4f
-8v/hAiwAAAAKAFcAVwA4AE4AdQBtADEAMgB6ADAAAAAIAE9KAQBRSgEALAD+H/L/8QIsAAAA
-CgBXAFcAOABOAHUAbQAxADIAegAxAAAACABPSgcAUUoHACwA/h/y/wEDLAAAAAoAVwBXADgA
-TgB1AG0AMQAyAHoAMgAAAAgAT0oIAFFKCAA2AP4f8v8RAzYAAAAKAFcAVwA4AE4AdQBtADEA
-MwB6ADAAAAARAEIqBnBo/wAAAE9KAQBRSgEAADAA/h/y/yEDMAAAAAoAVwBXADgATgB1AG0A
-MQAzAHoAMQAAAAwAT0oHAFFKBwBeSgcALAD+H/L/MQMsAAAACgBXAFcAOABOAHUAbQAxADMA
-egAyAAAACABPSggAUUoIACwA/h/y/0EDLAAAAAoAVwBXADgATgB1AG0AMQAzAHoAMwAAAAgA
-T0oBAFFKAQA+AP4f8v9RAz4AAAAKAFcAVwA4AE4AdQBtADEANAB6ADAAAAAZAEIqBnBo/wAA
-AE9KCABRSggAUEoAAF5KAAAAMAD+H/L/YQMwAAAACgBXAFcAOABOAHUAbQAxADQAegAxAAAA
-DABPSgcAUUoHAF5KBwAsAP4f8v9xAywAAAAKAFcAVwA4AE4AdQBtADEANAB6ADIAAAAIAE9K
-CABRSggALAD+H/L/gQMsAAAACgBXAFcAOABOAHUAbQAxADQAegAzAAAACABPSgEAUUoBACwA
-/h/y/5EDLAAAAAoAVwBXADgATgB1AG0AMQA2AHoAMAAAAAgAT0oBAFFKAQAwAP4f8v+hAzAA
-AAAKAFcAVwA4AE4AdQBtADEANgB6ADEAAAAMAE9KBwBRSgcAXkoHACwA/h/y/7EDLAAAAAoA
-VwBXADgATgB1AG0AMQA2AHoAMgAAAAgAT0oIAFFKCAAsAP4f8v/BAywAAAAKAFcAVwA4AE4A
-dQBtADEAOAB6ADAAAAAIAE9KAQBRSgEALAD+H/L/0QMsAAAACgBXAFcAOABOAHUAbQAxADkA
-egAwAAAACABPSgEAUUoBACwA/h/y/+EDLAAAAAoAVwBXADgATgB1AG0AMgAwAHoAMAAAAAgA
-T0oAAFFKAAAsAP4f8v/xAywAAAAKAFcAVwA4AE4AdQBtADIAMgB6ADAAAAAIAE9KAQBRSgEA
-LAD+H/L/AQQsAAAACgBXAFcAOABOAHUAbQAyADIAegAxAAAACABPSgcAUUoHACwA/h/y/xEE
-LAAAAAoAVwBXADgATgB1AG0AMgAyAHoAMgAAAAgAT0oIAFFKCAAsAP4f8v8hBCwAAAAKAFcA
-VwA4AE4AdQBtADIAMwB6ADAAAAAIAE9KAQBRSgEALAD+H/L/MQQsAAAACgBXAFcAOABOAHUA
-bQAyADQAegAwAAAACABPSgEAUUoBACwA/h/y/0EELAAAAAoAVwBXADgATgB1AG0AMgA0AHoA
-MQAAAAgAT0oHAFFKBwAsAP4f8v9RBCwAAAAKAFcAVwA4AE4AdQBtADIANAB6ADIAAAAIAE9K
-CABRSggALAD+H/L/YQQsAAAACgBXAFcAOABOAHUAbQAyADYAegAwAAAACABPSgEAUUoBADAA
-/h/y/3EEMAAAAAoAVwBXADgATgB1AG0AMgA2AHoAMQAAAAwAT0oIAFFKCABDShAALAD+H/L/
-gQQsAAAACgBXAFcAOABOAHUAbQAyADYAegAyAAAACABPSggAUUoIACwA/h/y/5EELAAAAAoA
-VwBXADgATgB1AG0AMgA2AHoANAAAAAgAT0oHAFFKBwA0AP4f8v+hBDQAAAAKAFcAVwA4AE4A
-dQBtADIANwB6ADAAAAAQAE9KAQBRSgEAUEoAAF5KAgAsAP4f8v+xBCwAAAAKAFcAVwA4AE4A
-dQBtADIANwB6ADEAAAAIAE9KBwBRSgcALAD+H/L/wQQsAAAACgBXAFcAOABOAHUAbQAyADcA
-egAyAAAACABPSggAUUoIACwA/h/y/9EELAAAAAoAVwBXADgATgB1AG0AMgA3AHoAMwAAAAgA
-T0oBAFFKAQAsAP4f8v/hBCwAAAAKAFcAVwA4AE4AdQBtADIAOAB6ADAAAAAIAE9KAQBRSgEA
-QgD+H/L/8QRCAAAAGQBXAFcALQBEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgA
-IABGAG8AbgB0AAAAAAA0AFcQ8v8BBTQAAAAPAFMAdAByAG8AbgBnACAARQBtAHAAaABhAHMA
-aQBzAAAABgA1CAFcCAEmAFgQ8v8RBSYAAAAIAEUAbQBwAGgAYQBzAGkAcwAAAAYANggBXQgB
-NgBVEPL/IQU2AAAADQBJAG4AdABlAHIAbgBlAHQAIABMAGkAbgBrAAAADABCKgJwaAAA/wA+
-KgFGAFYQ8v8xBUYAAAAVAFYAaQBzAGkAdABlAGQAIABJAG4AdABlAHIAbgBlAHQAIABMAGkA
-bgBrAAAADABCKgxwaIAAgAA+KgFCAP4fAgJBBUIAAAAKACAAQwBoAGEAcgAgAEMAaABhAHIA
-AAAeAENKGABtSAkEc0gJBDUIAWFKGABfSAEEdEgBBFwIAUYA/h8BAGIFRgAAAAcASABlAGEA
-ZABpAG4AZwAAAA0AVQATpPAAFKR4AAYkAQAYAE9KCQBRSgkAQ0ocAFBKCgBeSgoAYUocADIA
-QhABAGIFMgAAAAkAVABlAHgAdAAgAGIAbwBkAHkAAAAKAFYAE6RkABSkZAAEAENKGAAcAC8Q
-YQVyBRwAAAAEAEwAaQBzAHQAAAACAFcAAAA8AP4fAQCCBTwAAAAHAEMAYQBwAHQAaQBvAG4A
-AAANAFgAE6R4ABSkeAAMJAEADgBDShgANggBYUoYAF0IASIA/h8BAJIFIgAAAAUASQBuAGQA
-ZQB4AAAABQBZAAwkAQAAADgA/h8BAKIFOAAAAAwATgBvAHIAbQBhAGwAIAAoAFcAZQBiACkA
-AAAKAFoAE6RkABSkZAAEAENKGAA2AP4fAQCyBTYAAAALAEIAbwBkAHkAIABUAGUAeAB0ACAA
-MwAAAAoAWwATpGQAFKRkAAQAQ0oYAHwA/h8BAMIFfAAAABEASABUAE0ATAAgAFAAcgBlAGYA
-bwByAG0AYQB0AHQAZQBkAAAANwBcAA3GMgAQlAMoB7wKUA7kEXgVDBmgHDQgyCNcJ/AqhC4Y
-Mqw1QDkAAAAAAAAAAAAAAAAAAAAAABAAT0oHAFFKBwBQSgcAXkoHAEAAQxABANIFQAAAABAA
-VABlAHgAdAAgAGIAbwBkAHkAIABpAG4AZABlAG4AdAAAAA4AXQBehNACXYQAAGCEAAAAADgA
-ShABAGIFOAAAAAgAUwB1AGIAdABpAHQAbABlAAAACABeAAMkAmEkAg4AQ0oYADUIAWFKGABc
-CAE4AP4fAQDyBTgAAAAIAGMAbwBtAHAAbwBzAGUAZgAAAAoAXwATpGQAFKRkAAwAT0oHAFFK
-BwBQSgsASgD+HwEAAgZKAAAADABIAFQATQBMACAAQQBkAGQAcgBlAHMAcwAAAAIAYAAeAE9K
-CwBRSgsAQ0oYADYIAVBKCwBeSgsAYUoYAF0IAS4AIBABABIGLgAAAAYARgBvAG8AdABlAHIA
-AAAQAGEAMSQADcYIAALgEMAhAQIAADoA/h8BACIGOgAAAAsAQgBvAGQAeQAgAFQAZQB4AHQA
-IAAyAAAAAgBiABAAT0oCAFFKAgBDShIAXkoCACwAHxABADIGLAAAAAYASABlAGEAZABlAHIA
-AAANAGMADcYIAALgEMAhAQIAAAAwAP4fYQVCBjAAAAAOAEYAcgBhAG0AZQAgAGMAbwBuAHQA
-ZQBuAHQAcwAAAAIAZAAAADQA/h8BAFIGNAAAAA4AVABhAGIAbABlACAAQwBvAG4AdABlAG4A
-dABzAAAABQBlAAwkAQAAAD4A/h9RBmIGPgAAAA0AVABhAGIAbABlACAASABlAGEAZABpAG4A
-ZwAAAAsAZgADJAFhJAEMJAEABgA1CAFcCAEAAAAADAEAAA0BAAABAAAAAAAAAAAA/////wIE
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAQAADQEAAAAAAAAACAAAAAAAAAAA
-AACABgAABAAAQAAAAAD/////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAIAADCCwAARg8AAOASAAD+FAAACwAAAAwAAAANAAAADgAAAAAI
-AABQDAAAkgwAAP4MAABoDQAA1A0AAEIOAACuDgAAGA8AACIPAAAsDwAANg8AAEAPAAD2EAAA
-ahMAAO4TAACAFAAAABUAAA8AAAAQAAAAEQAAABIAAAATAAAAFAAAABUAAAAWAAAAFwAAABgA
-AAAZAAAAGgAAABsAAAAcAAAAHQAAAB4AAAAfAAAADwAA8GwAAAAAAAbwGAAAAAYEAAACAAAA
-BQAAAAEAAAABAAAABgAAAB8AAfAsAAAAYgAH8CQAAAAGBiP0F3wAAAAANiQDkRECABAAAGoB
-AAABAAAAMkAAAAAAAABAAB7xEAAAAAQAAAgBAAAIAgAACPcAABAADwAC8BwDAAAQAAjwCAAA
-AAUAAAAFBAAADwAD8K4CAAAPAATwKAAAAAEACfAQAAAAAAAAAAAAAAABgP//AYD//wIACvAI
-AAAAAAQAAAUAAAAPAATwqgAAAKIMCvAIAAAAAgQAAAAKAADTAAvwTgAAAIAAAAABAIEAAAAA
-AIIAAAAAAIMAAAAAAIQAAAAAAIgAAAAAAIEB////AIIBAAAAAIMBAAAAAL8BEAAQAP8BAAAI
-AIQDAAAAAIYDfL4BAEMAIvEYAAAAjwMAAAAAkAMAAAAAkQMAAAAAkgMCAAAAAAAQ8AQAAAAA
-AAAAAAAR8AQAAAABAAAAAAAN8AQAAAAAAAEADwAE8G4AAABCAQrwCAAAAAMEAAAACgAAkwAL
-8DYAAABEAQQAAAB/AQEQAAC/AQAAEADAAQAAAADCAf///wDLATBXAADWAQEAAAD/AQgACAA/
-AgAAAgBDACLxGAAAAI8DAAAAAJADAgAAAJEDAAAAAJIDAgAAAA8ABPBuAAAAQgEK8AgAAAAE
-BAAAAAoAAJMAC/A2AAAARAEEAAAAfwEBEAAAvwEAABAAwAEAAAAAwgH///8AywEwVwAA1gEB
-AAAA/wEIAAgAPwIAAAIAQwAi8RgAAACPAwAAAACQAwIAAACRAwAAAACSAwIAAAAPAATw2AAA
-ALIECvAIAAAABQQAAAAKAADzAAvwiAAAAIEAAAAAAIIAAAAAAIMAAAAAAIQAAAAAAARBAQAA
-AAYBAAAAAD8BAAAAAIEB////AIMBAAAAAL8BEAAQAP8BAAAIAIODLgAAAIQD98ABAIYD98AB
-AL8DIAAgAAUABQAIAIkGAACvDgAAiQYAAOM6AADCPgAA4zoAANVCAACvDgAAiQYAAK8OAABD
-ACLxGAAAAI8DAAAAAJADAgAAAJEDAAAAAJIDAgAAAAAAEPAEAAAAAAAAAAAAEfAEAAAAAQAA
-AA8ABPBOAAAAEgAK8AgAAAABBAAAAA4AAHMAC/AqAAAAgQH///8AgwEAAAAAvwEQABAAwAEB
-AAAIywEAAAAA/wEIAAgAAQICAAAIAAAR8AQAAAABAAAAHAAAAGwAAADcAQAAQQIAAIAGAAAE
-BAAAAAAAAAYAAACsJgAABgAAAHQAAAAAAAMEAAAAAAAAmgAAAKwmAACaAAAAdAAAAAAAAgQA
-AI////9iAAAAOCYAABkHAABUBgAAAAAFBAAAbAAAAPf///+dAQAAKAEAAJRAAAAAAP//AQAA
-AA8AXwBQAGkAYwB0AHUAcgBlAEIAdQBsAGwAZQB0AHMAcAUAAH8GAAAAAAAAcQUAAH8GAAAB
-AAEAAAABAAAA/w//D/8P/w//D/8P/w//D/8PAAACAAAAAQABAAAAAAAAAAAAAAAAAAAAAAAA
-EAAAXoTQAmCEMP0VxgUAAdACBgIAAAApAAEAAAD/AAAAAAAAAAAAAAIAAAAAAAAAAAAQAABe
-hEACYITA/RXGBQABAAAGAAABAAAA/wAAAAAAAAAAAAACAAAAAAAAAAAAEAAAXoTQAmCEMP0V
-xgUAAQAABgAAAQAAAP8AAAAAAAAAAAAAAgAAAAAAAAAAABAAAF6EYANghKD8FcYFAAEAAAYA
-AAEAAAD/AAAAAAAAAAAAAAIAAAAAAAAAAAAQAABehPADYIQQ/BXGBQABAAAGAAABAAAA/wAA
-AAAAAAAAAAACAAAAAAAAAAAAEAAAXoSABGCEgPsVxgUAAQAABgAAAQAAAAAAAQAAAAAAAAAA
-AAAAAAAAAAAAABAAAF6EQAtghJj+FcYFAAFACwYCAAYALgABAAAA/wAAAAAAAAAAAAACAAAA
-AAAAAAAAEAAAXoSgBWCEYPoVxgUAAQAABgAAAQAAAP8AAAAAAAAAAAAAAgAAAAAAAAAAABAA
-AF6EMAZghND5FcYFAAEAAAYAAAEAAAABAAAAAAAAAAAAAAAAAAAA////////AQAAAAAA/0AA
-AAAAgAYAAAAAAAACEAAAAAAAAACABgAAUAAACAAAAAAMAAAARxaQAQAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAFQAaQBtAGUAcwAgAE4AZQB3ACAAUgBvAG0AYQBuAAAA
-NRaQAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFMAeQBtAGIAbwBsAAAA
-MyaQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEEAcgBpAGEAbAAAAEcW
-kAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABUAGkAbQBlAHMAIABOAGUA
-dwAgAFIAbwBtAGEAbgAAADUmkAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AABUAGEAaABvAG0AYQAAAD8WkAECAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AABXAGkAbgBnAGQAaQBuAGcAcwAgADIAAAA3JpABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAVgBlAHIAZABhAG4AYQAAAD80kAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAABDAG8AdQByAGkAZQByACAATgBlAHcAAAA7BpABAgAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVwBpAG4AZwBkAGkAbgBnAHMAAABTJpABgBAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATABpAGIAZQByAGEAdABpAG8AbgAgAFMA
-YQBuAHMAAABBAHIAaQBhAGwAAAA/BpABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAARABlAGoAYQBWAHUAIABTAGEAbgBzAAAASSaQAYAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAEEAcgBpAGEAbAAgAFUAbgBpAGMAbwBkAGUAIABNAFMAAABCAAQA
-AQiNGAAA0AIAAGgBAAAAAHPC62bU3fWmAAAAAAEAAAAAAMkAAAASBgAAAgA/AAAABACDkD8A
-AADJAAAAEgYAAAIAPwAAAD8AAAAAAAAAJwMA8BAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAIAAAAAAAAAAAAAAAAAAPAQAN/f//0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-gAAAAAAAAAAAAAAA//8SAAAAAAAAAA8AQwBhAG4AZABpAGQAYQB0AGUAcwAgAE4AYQBtAGUA
-AAAAAAAAEwBzAGEAZwBhAHIAIABwACAAcwB1AHIAeQBhAHcAYQBuAHMAaABpAAMAcwBhAGkA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAJ4EAABEAGQA7gAjAQAAAAAAAAAAAAAAAAAAAACHAKUA6APoAwAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAADwAE8GYAAACyBArwCAAAAAEEAAAACgAAswAL8EIAAACBAAAA
-AACCAAAAAACDAAAAAACEAAAAAAAEQQEAAAAGAQAAAAA/AQAAAACBAf///wCDAQAAAAC/ARAA
-EAD/AQAACAAAABDwBAAAAAAAAIBiAAfw5AMAAAYGnRZ3tgAAAAB7OGUgEgIAEAAAwAMAAAEA
-AAAAAAAAAAAAAABuHvC4AwAAnRZ3tgAAAAB7OGUgEgIAEP+JUE5HDQoaCgAAAA1JSERSAAAA
-CQAAAAsIAwAAAJqHVykAAAMAUExURQAAAPf39///////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////88f9h0AAAADdFJOU///ANfKDUEA
-AAABYktHRACIBR1IAAAADGNtUFBKQ21wMDcxMgAAAANIAHO8AAAALklEQVQYV22MQQoAAAjC
-rP8/Ol10K8IJiuo7tbChbMtiRIMkMeT7m9B4e5RP2B4eJACOUomEagAAAABJRU5ErkJgggAA
-ngQAAEQAZADuACMBAAAAAAAAAAAAAAAAAAAAAIcApQDoA+gDAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAPAATwZgAAALIECvAIAAAAAQQAAAAKAACzAAvwQgAAAIEAAAAAAIIA
-AAAAAIMAAAAAAIQAAAAAAARBAQAAAAYBAAAAAD8BAAAAAIEB////AIMBAAAAAL8BEAAQAP8B
-AAAIAAAAEPAEAAAAAAAAgGIAB/DkAwAABgadFne2AAAAAHs4ZSASAgAQAADAAwAAAQAAAAAA
-AAAAAAAAAG4e8LgDAACdFne2AAAAAHs4ZSASAgAQ/4lQTkcNChoKAAAADUlIRFIAAAAJAAAA
-CwgDAAAAmodXKQAAAwBQTFRFAAAA9/f3////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////zx/2HQAAAAN0Uk5T//8A18oNQQAAAAFi
-S0dEAIgFHUgAAAAMY21QUEpDbXAwNzEyAAAAA0gAc7wAAAAuSURBVBhXbYxBCgAACMKs/z86
-XXQrwgmK6ju1sKFsy2JEgyQx5Pub0Hh7lE/YHh4kAI5SiYRqAAAAAElFTkSuQmCCAACeBAAA
-RABkAO4AIwEAAAAAAAAAAAAAAAAAAAAAhwClAOgD6AMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAA8ABPBmAAAAsgQK8AgAAAABBAAAAAoAALMAC/BCAAAAgQAAAAAAggAAAAAA
-gwAAAAAAhAAAAAAABEEBAAAABgEAAAAAPwEAAAAAgQH///8AgwEAAAAAvwEQABAA/wEAAAgA
-AAAQ8AQAAAAAAACAYgAH8OQDAAAGBp0Wd7YAAAAAezhlIBICABAAAMADAAABAAAAAAAAAAAA
-AAAAbh7wuAMAAJ0Wd7YAAAAAezhlIBICABD/iVBORw0KGgoAAAANSUhEUgAAAAkAAAALCAMA
-AACah1cpAAADAFBMVEUAAAD39/f/////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-///////////////////////////////////PH/YdAAAAA3RSTlP//wDXyg1BAAAAAWJLR0QA
-iAUdSAAAAAxjbVBQSkNtcDA3MTIAAAADSABzvAAAAC5JREFUGFdtjEEKAAAIwqz/PzpddCvC
-CYrqO7WwoWzLYkSDJDHk+5vQeHuUT9geHiQAjlKJhGoAAAAASUVORK5CYIIAAJ4EAABEAGQA
-7gAjAQAAAAAAAAAAAAAAAAAAAACHAKUA6APoAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAADwAE8GYAAACyBArwCAAAAAEEAAAACgAAswAL8EIAAACBAAAAAACCAAAAAACDAAAA
-AACEAAAAAAAEQQEAAAAGAQAAAAA/AQAAAACBAf///wCDAQAAAAC/ARAAEAD/AQAACAAAABDw
-BAAAAAAAAIBiAAfw5AMAAAYGnRZ3tgAAAAB7OGUgEgIAEAAAwAMAAAEAAAAAAAAAAAAAAABu
-HvC4AwAAnRZ3tgAAAAB7OGUgEgIAEP+JUE5HDQoaCgAAAA1JSERSAAAACQAAAAsIAwAAAJqH
-VykAAAMAUExURQAAAPf39///////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-/////////////////////////////88f9h0AAAADdFJOU///ANfKDUEAAAABYktHRACIBR1I
-AAAADGNtUFBKQ21wMDcxMgAAAANIAHO8AAAALklEQVQYV22MQQoAAAjCrP8/Ol10K8IJiuo7
-tbChbMtiRIMkMeT7m9B4e5RP2B4eJACOUomEagAAAABJRU5ErkJgggAAngQAAEQAZADuACMB
-AAAAAAAAAAAAAAAAAAAAAIcApQDoA+gDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAPAATwZgAAALIECvAIAAAAAQQAAAAKAACzAAvwQgAAAIEAAAAAAIIAAAAAAIMAAAAAAIQA
-AAAAAARBAQAAAAYBAAAAAD8BAAAAAIEB////AIMBAAAAAL8BEAAQAP8BAAAIAAAAEPAEAAAA
-AAAAgGIAB/DkAwAABgadFne2AAAAAHs4ZSASAgAQAADAAwAAAQAAAAAAAAAAAAAAAG4e8LgD
-AACdFne2AAAAAHs4ZSASAgAQ/4lQTkcNChoKAAAADUlIRFIAAAAJAAAACwgDAAAAmodXKQAA
-AwBQTFRFAAAA9/f3////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////zx/2HQAAAAN0Uk5T//8A18oNQQAAAAFiS0dEAIgFHUgAAAAM
-Y21QUEpDbXAwNzEyAAAAA0gAc7wAAAAuSURBVBhXbYxBCgAACMKs/z86XXQrwgmK6ju1sKFs
-y2JEgyQx5Pub0Hh7lE/YHh4kAI5SiYRqAAAAAElFTkSuQmCCAACeBAAARABkAO4AIwEAAAAA
-AAAAAAAAAAAAAAAAhwClAOgD6AMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8A
-BPBmAAAAsgQK8AgAAAABBAAAAAoAALMAC/BCAAAAgQAAAAAAggAAAAAAgwAAAAAAhAAAAAAA
-BEEBAAAABgEAAAAAPwEAAAAAgQH///8AgwEAAAAAvwEQABAA/wEAAAgAAAAQ8AQAAAAAAACA
-YgAH8OQDAAAGBp0Wd7YAAAAAezhlIBICABAAAMADAAABAAAAAAAAAAAAAAAAbh7wuAMAAJ0W
-d7YAAAAAezhlIBICABD/iVBORw0KGgoAAAANSUhEUgAAAAkAAAALCAMAAACah1cpAAADAFBM
-VEUAAAD39/f/////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-///////////////////PH/YdAAAAA3RSTlP//wDXyg1BAAAAAWJLR0QAiAUdSAAAAAxjbVBQ
-SkNtcDA3MTIAAAADSABzvAAAAC5JREFUGFdtjEEKAAAIwqz/PzpddCvCCYrqO7WwoWzLYkSD
-JDHk+5vQeHuUT9geHiQAjlKJhGoAAAAASUVORK5CYIIAAJ4EAABEAGQA7gAjAQAAAAAAAAAA
-AAAAAAAAAACHAKUA6APoAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAE8GYA
-AACyBArwCAAAAAEEAAAACgAAswAL8EIAAACBAAAAAACCAAAAAACDAAAAAACEAAAAAAAEQQEA
-AAAGAQAAAAA/AQAAAACBAf///wCDAQAAAAC/ARAAEAD/AQAACAAAABDwBAAAAAAAAIBiAAfw
-5AMAAAYGnRZ3tgAAAAB7OGUgEgIAEAAAwAMAAAEAAAAAAAAAAAAAAABuHvC4AwAAnRZ3tgAA
-AAB7OGUgEgIAEP+JUE5HDQoaCgAAAA1JSERSAAAACQAAAAsIAwAAAJqHVykAAAMAUExURQAA
-APf39///////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-/////////////88f9h0AAAADdFJOU///ANfKDUEAAAABYktHRACIBR1IAAAADGNtUFBKQ21w
-MDcxMgAAAANIAHO8AAAALklEQVQYV22MQQoAAAjCrP8/Ol10K8IJiuo7tbChbMtiRIMkMeT7
-m9B4e5RP2B4eJACOUomEagAAAABJRU5ErkJgggAAngQAAEQAZADuACMBAAAAAAAAAAAAAAAA
-AAAAAIcApQDoA+gDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAATwZgAAALIE
-CvAIAAAAAQQAAAAKAACzAAvwQgAAAIEAAAAAAIIAAAAAAIMAAAAAAIQAAAAAAARBAQAAAAYB
-AAAAAD8BAAAAAIEB////AIMBAAAAAL8BEAAQAP8BAAAIAAAAEPAEAAAAAAAAgGIAB/DkAwAA
-BgadFne2AAAAAHs4ZSASAgAQAADAAwAAAQAAAAAAAAAAAAAAAG4e8LgDAACdFne2AAAAAHs4
-ZSASAgAQ/4lQTkcNChoKAAAADUlIRFIAAAAJAAAACwgDAAAAmodXKQAAAwBQTFRFAAAA9/f3
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////
-////////zx/2HQAAAAN0Uk5T//8A18oNQQAAAAFiS0dEAIgFHUgAAAAMY21QUEpDbXAwNzEy
-AAAAA0gAc7wAAAAuSURBVBhXbYxBCgAACMKs/z86XXQrwgmK6ju1sKFsy2JEgyQx5Pub0Hh7
-lE/YHh4kAI5SiYRqAAAAAElFTkSuQmCCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAA7KUBAU0gCQQAAAgSvwAAAAAAADAAAAAAAAgAAAAVAAAOAENhb2xhbjgw
-AAAAAAAAAAAAAAAAAAAAAAAACQQWAJxBAAAAAAAAAAAAAHIFAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAA0BAAAAAAAA//8PAAsAAAAEAAAA//8PAA8AAAARAAAA//8PAAAAAAAAAAAAAAAAAAAA
-AACIAAAAAACIFQAAAAAAAIgVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANgV
-AAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADsFQAANAAAACAWAAAkAAAA
-RBYAAIwAAAAAAAAAAAAAACYdAAAGAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAOUaAAAmAAAACxsAAAwAAAAXGwAACAAAAAMdAAACAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALCAAAGICAACOIgAAdAAAABEd
-AAAVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-aRoAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQFgAAmQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAACIFQAAOAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHxsAAB4A
-AADjHAAAGAAAAMAVAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+xwAAAgAAAAAAAAAAAAAAAUdAAAMAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAIA2QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAgACAAIAAgACAAIAAgACAAIAAgACAAQwBVAFIAUgBJAEMAVQBMAFUATQAgAFYA
-SQBUAEEARQANAAgADQBSAGkAYwBoAGEAcgBkACAAQQBuAGQAZQByAHMAbwBuACAACwAxADIA
-MwA0ACwAIABXAGUAcwB0ACAANgA3ACAAUwB0AHIAZQBlAHQALAAgAAsAQwBhAHIAbABpAHMA
-bABlACwAIABNAEEAIAAwADEANwA0ADEALAAgAAsAKAAxADIAMwApAC0ANAA1ADYAIAA3ADgA
-OQAwAC4ADQAIAAsAAQAgAEMAYQByAGUAZQByACAATwBiAGoAZQBjAHQAaQB2AGUADQANAEQA
-ZQBzAGkAcgBlACAAYQAgAGMAaABhAGwAbABlAG4AZwBpAG4AZwAgAHAAbwBzAGkAdABpAG8A
-bgAgAGkAbgAgAHQAaABlACAAYQByAGUAYQAgAG8AZgAgAFMAbwBmAHQAdwBhAHIAZQAgAGQA
-ZQB2AGUAbABvAHAAbQBlAG4AdAAsACAAdwBoAGkAYwBoACAAdwBpAGwAbAAgAHUAdABpAGwA
-aQB6AGUAIABtAHkAIABpAG4AdABlAHIAZABpAHMAYwBpAHAAbABpAG4AYQByAHkALAAgAHQA
-ZQBjAGgAbgBpAGMAYQBsACwAIABhAG4AZAAgAHMAbwBmAHQAdwBhAHIAZQAgAGQAZQB2AGUA
-bABvAHAAbQBlAG4AdAAgAGwAaQBmAGUAIABjAHkAYwBsAGUAIABzAGsAaQBsAGwAcwAgAGkA
-bgAgAGEAIABwAHIAbwBkAHUAYwB0AGkAdgBlACwAIABlAG4AdABoAHUAcwBpAGEAcwB0AGkA
-YwAgAGEAbgBkACAAaQBuACAAYQAgAHQAZQBhAG0ALQBvAHIAaQBlAG4AdABlAGQAIABlAG4A
-dgBpAHIAbwBuAG0AZQBuAHQALgANAA0AAQAgAEUAZAB1AGMAYQB0AGkAbwBuAGEAbAAgAFMA
-dQBtAG0AYQByAHkADQBQ8CAAQwBvAG0AcABsAGUAdABlAGQAIABNAGEAcwB0AGUAcgBzACAA
-aQBuACAAQwBvAG0AcAB1AHQAZQByACAAYQBwAHAAbABpAGMAYQB0AGkAbwBuACAAKABNAC4A
-QwAuAEEAKQAgAHcAaQB0AGgAIAA2ADMALgA3ADEAJQAgAA0AAQAgAFQAZQBjAGgAbgBpAGMA
-YQBsACAASwBuAG8AdwBsAGUAZABnAGUAIABTAHUAbQBtAGEAcgB5AA0ACAANAAEAIAAgAEQA
-ZQB0AGEAaQBsAGUAZAAgAEUAZAB1AGMAYQB0AGkAbwBuAGEAbAAgAEEAYwBhAGQAZQBtAGkA
-YwAgAEMAcgBlAGQAZQBuAHQAaQBhAGwAcwANAEUAeABhAG0AaQBuAGEAdABpAG8AbgAHAEIA
-bwBhAHIAZAAvAFUAbgBpAHYAZQByAHMAaQB0AHkABwBQAGEAcwBzAGkAbgBnACAAWQBlAGEA
-cgAHAFAAZQByAGMAZQBuAHQAYQBnAGUABwAHAAgATQAuAEMALgBBACAABwAHACAAIAAgACAA
-IAAgACAAIAAgACAAUwBlAG0AZQBzAHQAZQByACAAVgBJAAcAQwBhAHIAbABpAHMAbABlACAA
-VQBuAGkAdgBlAHIAcwBpAHQAeQAHADIAMAAxADEABwA2ADMALgA3ADEABwAHACAAIAAgACAA
-IAAgACAAIAAgACAAUwBlAG0AZQBzAHQAZQByACAAVgAHAEMAYQByAGwAaQBzAGwAZQAgAFUA
-bgBpAHYAZQByAHMAaQB0AHkABwAyADAAMQAwAAcANgA3AC4AMQA3AAcABwAgACAAIAAgACAA
-IAAgACAAIAAgAFMAZQBtAGUAcwB0AGUAcgAgAEkAVgAHAEMAYQByAGwAaQBzAGwAZQAgAFUA
-bgBpAHYAZQByAHMAaQB0AHkABwAyADAAMQAwAAcANgAyAC4AOAAwAAcABwAgACAAIAAgACAA
-IAAgACAAIAAgAFMAZQBtAGUAcwB0AGUAcgAgAEkASQBJAAcAQwBhAHIAbABpAHMAbABlACAA
-VQBuAGkAdgBlAHIAcwBpAHQAeQAHADIAMAAxADAABwA2ADIALgAyADUABwAHACAAIAAgACAA
-IAAgACAAIAAgACAAUwBlAG0AZQBzAHQAZQByACAASQBJAAcAQwBhAHIAbABpAHMAbABlACAA
-VQBuAGkAdgBlAHIAcwBpAHQAeQAHADIAMAAwADkABwA2ADUALgA3ADUABwAHACAAIAAgACAA
-IAAgACAAIAAgACAAUwBlAG0AZQBzAHQAZQByACAASQAHAEMAYQByAGwAaQBzAGwAZQAgAFUA
-bgBpAHYAZQByAHMAaQB0AHkABwAyADAAMAA5AAcANgAzAC4AMwAzAAcABwAHAAcABwAHAAcA
-BwAHAAcABwAHAAcABwAHAAcABwAHAAcABwAHAAcAAQAgAFMAdQBiAGoAZQBjAHQAIAAgAEYA
-YQBtAGkAbABpAGEAcgBpAHQAeQA6AA0AUPAgAEQAYQB0AGEAYgBhAHMAZQAgAE0AYQBuAGEA
-ZwBlAG0AZQBuAHQAIABDAG8AbgBjAGUAcAB0AHMADQBQ8CAATwBiAGoAZQBjAHQAIABPAHIA
-aQBlAG4AdABlAGQAIABQAHIAbwBnAHIAYQBtAG0AaQBuAGcAIABDAG8AbgBjAGUAcAB0AA0A
-UPAgAFMAeQBzAHQAZQBtACAAQQBuAGEAbAB5AHMAaQBzACAAYQBuAGQAIABEAGUAcwBpAGcA
-bgANAFDwIABzAG8AZgB0AHcAYQByAGUAIABFAG4AZwBpAG4AZQBlAHIAaQBuAGcAIAANAFDw
-IABPAHAAZQByAGEAdABpAG4AZwAgAFMAeQBzAHQAZQBtACAAQwBvAG4AYwBlAHAAdAANAFDw
-IABVAG4AaQB4ACAAUwBoAGUAbABsACAAUAByAG8AZwByAGEAbQBtAGkAbgBnAA0AAQAgAEEA
-cgBlAGEAIABvAGYAIABJAG4AdABlAHIAZQBzAHQAOgANAFDwIABTAG8AZgB0AHcAYQByAGUA
-IABkAGUAdgBlAGwAbwBwAG0AZQBuAHQAIAAgAHUAcwBpAG4AZwAgAEoAYQB2AGEALwAuAE4A
-ZQB0ACAAdABlAGMAaABuAG8AbABvAGcAaQBlAHMADQBQ8CAATABlAGEAcgBuAGkAbgBnACAA
-bgBlAHcAIAB0AGUAYwBoAG4AbwBsAG8AZwBpAGUAcwAuAA0AAQAgAFAAZQByAHMAbwBuAGEA
-bAAgAEQAZQB0AGEAaQBsAHMADQBOAGEAbQBlADoAIAAgAAkACQBSAGkAYwBoAGEAcgBkACAA
-QQBuAGQAZQByAHMAbwBuAA0AQwB1AHIAcgBlAG4AdAAgAEEAZABkAHIAZQBzAHMACQAxADIA
-MwA0ACwAIABXAGUAcwB0ACAANgA3ACAAUwB0AHIAZQBlAHQALAAgAAsAQwBhAHIAbABpAHMA
-bABlACwAIABNAEEAIAAwADEANwA0ADEALAAgAAsAKAAxADIAMwApAC0ANAA1ADYAIAA3ADgA
-OQAwAC4ADQBEAGEAdABlACAAbwBmACAAQgBpAHIAdABoADoAIAAJADEAcwB0ACAAagB1AG4A
-ZQANAEcAZQBuAGQAZQByADoAIAAJAAkATQBhAGwAZQAJAA0ADQABAA0ATABhAG4AZwB1AGEA
-ZwBlAHMAIABLAG4AbwB3AG4AIAAHAEMALAAgAEMAKwArACwASgBBAFYAQQAsACAALgBOAEUA
-VAAgADMALgA1ACwAIABBAFMAUAAuAE4ARQBUACAAMwAuADUALABWAEIAIAAyADAAMAA4ACwA
-cAB5AHQAaABvAG4ABwAHAEQAQgBNAFMALwBSAEQAQgBNAFMAIAAHAE8AUgBBAEMATABFACwA
-TQBTACAAQQBjAGMAZQBzAHMALAAgAFMAUQBMACwAIABQAG8AcwB0AGcAcgBlAHMAcwAgAFMA
-UQBMAAcABwBXAGUAYgAgAFQAZQBjAGgAbgBvAGwAbwBnAHkABwBIAFQATQBMACwASgBBAFYA
-QQAgAFMAYwByAGkAcAB0AAcABwBPAHAAZQByAGEAdABpAG4AZwAgAFMAeQBzAHQAZQBtAAcA
-VwBpAG4AZABvAHcAcwAgACgAOQA4AC8AMgAwADAANwAvAFgAUAAgAC8AVgBJAFMAVABBACwA
-NwApACwAdQBiAHUAbgB0AHUABwAHAE8AdABoAGUAcgAHAE4AZQB0AHcAbwByAGsAIABQAHIA
-bwBnAHIAYQBtAG0AaQBuAGcAIABpAG4AIABKAGEAdgBhACwAIABVAG4AaQB4ACAAUwBoAGUA
-bABsACAAUAByAG8AZwByAGEAbQBtAGkAbgBnAAcABwAgAA0ADQANAA0AAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAWCAAAOAgAADoIAAA8CAAAXAgAANgI
-AADaCAAA3AgAAN4IAADgCAAAAgkAAAQJAADMCgAAzgoAANAKAADSCgAA+goAAPwKAAD+CgAA
-EgsAAGALAABiCwAAbAsAAHwLAAB+CwAAgAsAALgLAAC6CwAAvAsAAL4LAADACwAAwgsAAPn5
-9Ovh2PTMv7bMANisn7aVjoeHf3h4eGu2YfQAVLZhAAAAABlVCAEDauANAAAwSlAAXkoEAE9K
-BABRSgQAEj4qATUIAV5KBABPSgQAUUoEAAAZVQgBA2pACQAAMEpQAF5KBABPSgQAUUoEAAxe
-SgQAT0oEAFFKBAAADzUIAV5KBABPSgQAUUoEAAxDShIAT0oCAFFKAgAADENKEgBPSgUAUUoF
-AAATMEpQAD4qAV5KBABPSgQAUUoEABlVCAEDaqAEAAAwSlAAXkoEAE9KBABRSgQAEkNKEgA+
-KgE1CAFPSgIAUUoCAAAQMEpQAF5KBABPSgQAUUoEAAAZVQgBA2oAAAAAMEpQAF5KBABPSgQA
-UUoEABcwSlAAQ0oUAD4qAV5KBABPSgQAUUoEABBDShQAXkoEAE9KBABRSgQAABNDShQANQgB
-XkoEAE9KBABRSgQAEENKFABtSAAEc0gABG5IAAQACQNqAAAAAFUIAQxDShYAT0oCAFFKAgAg
-wgsAABYMAAAuDAAAUAwAAGoMAACADAAAggwAAIQMAACGDAAAkgwAAKgMAADADAAA0AwAAOgM
-AADyDAAA/gwAABQNAAAqDQAAOg0AAFINAABcDQAAaA0AAH4NAACWDQAApg0AAL4NAADIDQAA
-1A0AAOoNAAAEDgAAFA4AACwOAAA2DgAAQg4AAFgOAABwDgAAgA4AAJgOAACiDgAArg4AAMQO
-AADaDgAA6g4AAAIPAAAMDwAAGA8AABwPAAAeDwAAIA8AACIPAAAmDwAAKA8AACoPAAAsDwAA
-MA8AADIPAAA0DwAANg8AADoPAAA8DwAAPg8AAEAPAABCDwAARA8AAEYPAAD27Ozs7ADn39/Y
-2M/Y2NjY2M/Y2NjY2M/Y2MnY2M/Y2MnY2M/Y2MnY2M/Y2Mnf2NjYvdjY2N/Y2Njf2NjYALCn
-AAAAAAAAAAAAABAwSlAAXkoEAE9KBABRSgQAABlVCAEDaoASAAAwSlAAXkoEAE9KBABRSgQA
-FkNKEgA1CAFhShIAXAgBT0oGAFFKBgAAC1wIAU9KBgBRSgYAEENKFABeSgQAT0oEAFFKBAAA
-DF5KBABPSgQAUUoEAAAPNQgBXkoEAE9KBABRSgQACQNqAAAAAFUIARNDShIANQgBXkoEAE9K
-BABRSgQAEj4qATUIAV5KBABPSgQAUUoEAEBGDwAAbg8AAHIPAAB0DwAAdg8AALAPAACyDwAA
-tA8AAPwPAAD+DwAAABAAADYQAAA4EAAAOhAAAGYQAABoEAAAahAAAJwQAACeEAAAoBAAAM4Q
-AADQEAAA0hAAAPYQAAD4EAAA+hAAAGARAABiEQAAZBEAAJoRAACcEQAAnhEAAMARAADMEQAA
-0hEAAPQRAAASEgAAFBIAAIwSAACqEgAArhIAALISAAC+EgAA0hIAANoSAADeEgAA4BIAAPLm
-4dra4dra4dra4dra4dra4drazcS64dra4drarcS6pdqbpZaNpdqF2qXapQAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9IKgFeSgQAT0oEAFFKBAAQQ0oUAF5KBABPSgQAUUoE
-AAAIT0oGAFFKBgAAE0NKFAA1CAFeSgQAT0oEAFFKBAAPNQgBXkoEAE9KBABRSgQAGVUIAQNq
-wBsAADBKUABeSgQAT0oEAFFKBAASQ0oSAD4qATUIAU9KAgBRSgIAABAwSlAAXkoEAE9KBABR
-SgQAABlVCAEDaiAXAAAwSlAAXkoEAE9KBABRSgQADF5KBABPSgQAUUoEAAAIT0oFAFFKBQAA
-F0NKEgA1CAFeSgIAYUoSAE9KAgBRSgIAGkNKEgA+KgE1CAFeSgIAYUoSAE9KAgBRSgIALuAS
-AADiEgAAAhMAAAYTAABqEwAAhBMAAM4TAADuEwAAEBQAADQUAAB+FAAAjBQAAPQUAAD+FAAA
-8eri3erd193q3eLdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALXAgB
-T0oGAFFKBgAIT0oGAFFKBgAAD15KBABcCAFPSgQAUUoEAAxeSgQAT0oEAFFKBAAAHFUIAQNq
-YCAAADBKUABeSgQAPAgBT0oEAFFKBAANAAgAADgIAAA8CAAA2AgAAAIJAAAECQAAzAoAAM4K
-AAD6CgAAfAsAALgLAAC8CwAAFgwAAC4MAABQDAAA9wAAAAAAAAAAAAAAAPIAAAAAAAAAAAAA
-AADkAAAAAAAAAAAAAAAA1QAAAAAAAAAAAAAAAMYAAAAAAAAAAAAAAAC3AAAAAAAAAAAAAAAA
-sgAAAAAAAAAAAAAAAK0AAAAAAAAAAAAAAACoAAAAAAAAAAAAAAAAowAAAAAAAAAAAAAAAJ4A
-AAAAAAAAAAAAAACZAAAAAAAAAAAAAAAAiwAAAAAAAAAAAAAAAH0AAAAAAAAAAAAAAAAAAAAA
-AAAAAAANAAAWJAFJZgEAAAASZGgBAQADJAFhJAFHJAAADQAAFiQBSWYBAAAAEmRoAQEAAyQB
-YSQBRyQAAAQAABJkaAEBAAAEAAASZGgBAQAABAAAEmRoAQEAAAQAABJkaAEBAAAEAAASZGgB
-AQAABAAAEmRoAQEAAA5aAAMkA2EkA16EAABdhNACYIQAABOkAAAUpAAAAA5aAAMkA2EkA16E
-AABdhNACYIQAABOkAAAUpAAAAA5aAAMkA2EkA16EAABdhKAFYIQAABOkAAAUpAAADlYAAyQB
-YSQBDcYIAAJwCEALAAATpAAAFKQAAAAEXgADJANhJAMAB14AXoSAFl2EAABghNACAA5QDAAA
-agwAAIAMAACCDAAAkgwAAPEAAAAAAAAAAAAAAADjAAAAAAAAAAAAAAAAZgAAAAAAAAAAAAAA
-AFsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAAfAAAFiQBFyQBSWYBAAAA
-CNZcAARi/8ILeBlyH8IkgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEAAAAA
-AIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAJ1ggAAQABAAEAARLW
-KAAAAP/l5eUAAAAAAAD/5eXlAAAAAAAA/+Xl5QAAAAAAAP/l5eUAAABw1igAAAD/5eXlAAAA
-AAAA/+Xl5QAAAAAAAP/l5eUAAAAAAAD/5eXlAAAANNYGAAEBAwAANNYGAAECA2wANNYGAAEE
-AwAANNYGAAEIA2wAAzQAZjQAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAANAAAWJAFJ
-ZgEAAAASZGgBAQADJAFhJAFHJAAABJIMAACUDAAAwAwAAOgMAADyDAAA/gwAAMQAAAAAAAAA
-AAAAAAC5AAAAAAAAAAAAAAAArgAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAACSAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAFiQBSWYB
-AAAAEmRoAQEAAyQBYSQBRyQAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAAKAAAWJAFJ
-ZgEAAAASZGgBAQBHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAADoAABYkARckAUlmAQAAAAjW
-GgABYv/CJIAAAAAEAQEABAEBAAQBAQAEAQEACdYCAAAS1goAAAD/AAAA/wAAcNYKAAAA/wAA
-AP8AADTWBgABAQMAADTWBgABAgNsADTWBgABBAMAADTWBgABCANsAAM0AGY0AAAF/gwAAAAN
-AAAqDQAAUg0AAFwNAABoDQAAggAAAAAAAAAAAAAAAHcAAAAAAAAAAAAAAABsAAAAAAAAAAAA
-AAAAXgAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAWJAFJ
-ZgEAAAASZGgBAQADJAFhJAFHJAAADQAAFiQBSWYBAAAAEmRoAQEAAyQBYSQBRyQAAAoAABYk
-AUlmAQAAABJkaAEBAEckAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAAfAAAFiQBFyQBSWYBAAAA
-CNZcAARi/8IL0hlyH8IkgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEAAAAA
-AIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAJ1ggAAAAAAAAAABLW
-KAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AABw1igAAAD/AAAA/wAA
-AAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAANNYGAAEBAwAANNYGAAECA2wANNYGAAEE
-AwAANNYGAAEIA2wAAzQAZjQAAAVoDQAAag0AAJYNAAC+DQAAyA0AANQNAACCAAAAAAAAAAAA
-AAAAdwAAAAAAAAAAAAAAAGwAAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAANAAAWJAFJ
-ZgEAAAASZGgBAQADJAFhJAFHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAAoAABYkAUlmAQAA
-ABJkaAEBAEckAAB8AAAWJAEXJAFJZgEAAAAI1lwABGL/wgvSGXIfwiSAAAAABAEBAAQBAQAE
-AQEAAAAAAIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEB
-AAQBAQAEAQEABAEBAAnWCAAAAAAAAAAAEtYoAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA
-/wAAAAAA/wAAAP8AAHDWKAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/
-AAA01gYAAQEDAAA01gYAAQIDbAA01gYAAQQDAAA01gYAAQgDbAADNABmNAAABdQNAADWDQAA
-BA4AACwOAAA2DgAAQg4AAIIAAAAAAAAAAAAAAAB3AAAAAAAAAAAAAAAAbAAAAAAAAAAAAAAA
-AF4AAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAFiQBSWYB
-AAAAEmRoAQEAAyQBYSQBRyQAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAAKAAAWJAFJ
-ZgEAAAASZGgBAQBHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAHwAABYkARckAUlmAQAAAAjW
-XAAEYv/CC9IZch/CJIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAAAAACA
-AAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAEAQEACdYIAAAAAAAAAAAS1igA
-AAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAcNYoAAAA/wAAAP8AAAAA
-AP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AADTWBgABAQMAADTWBgABAgNsADTWBgABBAMA
-ADTWBgABCANsAAM0AGY0AAAFQg4AAEQOAABwDgAAmA4AAKIOAACuDgAAggAAAAAAAAAAAAAA
-AHcAAAAAAAAAAAAAAABsAAAAAAAAAAAAAAAAXgAAAAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAANAAAWJAFJZgEAAAASZGgBAQADJAFhJAFHJAAADQAAFiQBSWYB
-AAAAEmRoAQEAAyQBYSQBRyQAAAoAABYkAUlmAQAAABJkaAEBAEckAAAKAAAWJAFJZgEAAAAS
-ZGgBAQBHJAAAfAAAFiQBFyQBSWYBAAAACNZcAARi/8IL0hlyH8IkgAAAAAQBAQAEAQEABAEB
-AAAAAACAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAE
-AQEABAEBAAQBAQAJ1ggAAAAAAAAAABLWKAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8A
-AAAAAP8AAAD/AABw1igAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAA
-NNYGAAEBAwAANNYGAAECA2wANNYGAAEEAwAANNYGAAEIA2wAAzQAZjQAAAWuDgAAsA4AANoO
-AAACDwAADA8AABgPAACCAAAAAAAAAAAAAAAAdwAAAAAAAAAAAAAAAGwAAAAAAAAAAAAAAABe
-AAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AABYkAUlmAQAA
-ABJkaAEBAAMkAWEkAUckAAANAAAWJAFJZgEAAAASZGgBAQADJAFhJAFHJAAACgAAFiQBSWYB
-AAAAEmRoAQEARyQAAAoAABYkAUlmAQAAABJkaAEBAEckAAB8AAAWJAEXJAFJZgEAAAAI1lwA
-BGL/wgvSGXIfwiSAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAAAAAAgAAA
-AAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEABAEBAAnWCAAAAAAAAAAAEtYoAAAA
-/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAHDWKAAAAP8AAAD/AAAAAAD/
-AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAA01gYAAQEDAAA01gYAAQIDbAA01gYAAQQDAAA0
-1gYAAQgDbAADNABmNAAABRgPAAAaDwAAHA8AAB4PAAAgDwAAIg8AAIIAAAAAAAAAAAAAAAB3
-AAAAAAAAAAAAAAAAbAAAAAAAAAAAAAAAAF4AAAAAAAAAAAAAAABQAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAADQAAFiQBSWYBAAAAEmRoAQEAAyQBYSQBRyQAAA0AABYkAUlmAQAA
-ABJkaAEBAAMkAWEkAUckAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAACgAAFiQBSWYBAAAAEmRo
-AQEARyQAAHwAABYkARckAUlmAQAAAAjWXAAEYv/CC9IZch/CJIAAAAAEAQEABAEBAAQBAQAA
-AAAAgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEB
-AAQBAQAEAQEACdYIAAAAAAAAAAAS1igAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAA
-AAD/AAAA/wAAcNYoAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AADTW
-BgABAQMAADTWBgABAgNsADTWBgABBAMAADTWBgABCANsAAM0AGY0AAAFIg8AACQPAAAmDwAA
-KA8AACoPAAAsDwAAggAAAAAAAAAAAAAAAHcAAAAAAAAAAAAAAABsAAAAAAAAAAAAAAAAXgAA
-AAAAAAAAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAWJAFJZgEAAAAS
-ZGgBAQADJAFhJAFHJAAADQAAFiQBSWYBAAAAEmRoAQEAAyQBYSQBRyQAAAoAABYkAUlmAQAA
-ABJkaAEBAEckAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAAfAAAFiQBFyQBSWYBAAAACNZcAARi
-/8IL0hlyH7gkgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAE
-AQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAJ1ggAAAAAAAAAABLWKAAAAP8A
-AAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AABw1igAAAD/AAAA/wAAAAAA/wAA
-AP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAANNYGAAEBAwAANNYGAAECA2wANNYGAAEEAwAANNYG
-AAEIA2wAAzQAZjQAAAUsDwAALg8AADAPAAAyDwAANA8AADYPAACCAAAAAAAAAAAAAAAAdwAA
-AAAAAAAAAAAAAGwAAAAAAAAAAAAAAABeAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAANAAAWJAFJZgEAAAAS
-ZGgBAQADJAFhJAFHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAAoAABYkAUlmAQAAABJkaAEB
-AEckAAB8AAAWJAEXJAFJZgEAAAAI1lwABGL/wgvSGXIfuCSAAAAABAEBAAQBAQAEAQEAAAAA
-AIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAE
-AQEABAEBAAnWCAAAAAAAAAAAEtYoAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA
-/wAAAP8AAHDWKAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAA01gYA
-AQEDAAA01gYAAQIDbAA01gYAAQQDAAA01gYAAQgDbAADNABmNAAABTYPAAA4DwAAOg8AADwP
-AAA+DwAAQA8AAIIAAAAAAAAAAAAAAAB3AAAAAAAAAAAAAAAAbAAAAAAAAAAAAAAAAF4AAAAA
-AAAAAAAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQAAFiQBSWYBAAAAEmRo
-AQEAAyQBYSQBRyQAAA0AABYkAUlmAQAAABJkaAEBAAMkAWEkAUckAAAKAAAWJAFJZgEAAAAS
-ZGgBAQBHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAHwAABYkARckAUlmAQAAAAjWXAAEYv/C
-C9IZch+4JIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEB
-AAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAEAQEACdYIAAAAAAAAAAAS1igAAAD/AAAA
-/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAAcNYoAAAA/wAAAP8AAAAAAP8AAAD/
-AAAAAAD/AAAA/wAAAAAA/wAAAP8AADTWBgABAQMAADTWBgABAgNsADTWBgABBAMAADTWBgAB
-CANsAAM0AGY0AAAFQA8AAEIPAAByDwAAsA8AAPwPAAA2EAAAZhAAAJwQAADOEAAA9hAAAIIA
-AAAAAAAAAAAAAAB9AAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAHMAAAAAAAAAAAAAAABuAAAA
-AAAAAAAAAAAAaQAAAAAAAAAAAAAAAGQAAAAAAAAAAAAAAABfAAAAAAAAAAAAAAAAWgAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAABJkaAEBAAAEAAASZGgBAQAABAAA
-EmRoAQEAAAQAABJkaAEBAAAEAAASZGgBAQAABAAAEmRoAQEAAAQAABJkaAEBAAAEAAASZGgB
-AQAAfAAAFiQBFyQBSWYBAAAACNZcAARi/8IL0hlyH7gkgAAAAAQBAQAEAQEABAEBAAAAAACA
-AAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEB
-AAQBAQAJ1ggAAAAAAAAAABLWKAAAAP8AAAD/AAAAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8A
-AAD/AABw1igAAAD/AAAA/wAAAAAA/wAAAP8AAAAAAP8AAAD/AAAAAAD/AAAA/wAANNYGAAEB
-AwAANNYGAAECA2wANNYGAAEEAwAANNYGAAEIA2wAAzQAZjQAAAn2EAAAYBEAAJoRAADAEQAA
-9BEAAIwSAAC+EgAA3hIAAOASAADkEgAABhMAAGoTAAD6AAAAAAAAAAAAAAAA9QAAAAAAAAAA
-AAAAAPAAAAAAAAAAAAAAAADoAAAAAAAAAAAAAAAA3QAAAAAAAAAAAAAAANUAAAAAAAAAAAAA
-AADNAAAAAAAAAAAAAAAAxQAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAC1AAAAAAAAAAAAAAAA
-qgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAoAABYkAUlmAQAAABJkaAEBAEckAAAKAAAWJAFJZgEAAAASZGgBAQBHJAAABF4AAyQAYSQA
-AAcAABJkaAEBAAMkA2EkAwAHAAASZGgBAQADJANhJAMABwAAEmRoAQEAAyQDYSQDAAoAABJk
-aAEBAF6EcAhdhAAAYISQ9wAHAAASZGgBAQADJANhJAMABAAAEmRoAQEAAAQAABJkaAEBAAAE
-AAASZGgBAQAAC2oTAABsEwAAhBMAAM4TAADQEwAA7hMAAKwAAAAAAAAAAAAAAAChAAAAAAAA
-AAAAAAAAmQAAAAAAAAAAAAAAAEYAAAAAAAAAAAAAAAA7AAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAFIAABYkARckAUlm
-AQAAAAjWMAACAADeCgIngAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEABAEB
-AAeUSAEJ1gQAAAAAEtYUAAAA/wAAAP8AAAAAAP8AAAD/AABw1hQAAAD/AAAA/wAAAAAA/wAA
-AP8AADTWBgABAQMAADTWBgABAgNsADTWBgABBAMAADTWBgABCANsAAM0AGY0AAAHAAAWJAFJ
-ZgEAAABHJAAACgAAFiQBSWYBAAAAEmRoAQEARyQAAFIAABYkARckAUlmAQAAAAjWMAACAADe
-CgIngAAAAAQBAQAEAQEABAEBAAAAAACAAAAABAEBAAQBAQAEAQEABAEBAAeUOwEJ1gQAAAAA
-EtYUAAAA/wAAAP8AAAAAAP8AAAD/AABw1hQAAAD/AAAA/wAAAAAA/wAAAP8AADTWBgABAQMA
-ADTWBgABAgNsADTWBgABBAMAADTWBgABCANsAAM0AGY0AAAF7hMAABAUAAASFAAANBQAAH4U
-AACAFAAA9AAAAAAAAAAAAAAAAKEAAAAAAAAAAAAAAACWAAAAAAAAAAAAAAAAiwAAAAAAAAAA
-AAAAADgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABSAAAWJAEXJAFJZgEA
-AAAI1jAAAgAA3goCJ4AAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAH
-lFkBCdYEAAAAABLWFAAAAP8AAAD/AAAAAAD/AAAA/wAAcNYUAAAA/wAAAP8AAAAAAP8AAAD/
-AAA01gYAAQEDAAA01gYAAQIDbAA01gYAAQQDAAA01gYAAQgDbAADNABmNAAACgAAFiQBSWYB
-AAAAEmRoAQEARyQAAAoAABYkAUlmAQAAABJkaAEBAEckAABSAAAWJAEXJAFJZgEAAAAI1jAA
-AgAA3goCJ4AAAAAEAQEABAEBAAQBAQAAAAAAgAAAAAQBAQAEAQEABAEBAAQBAQAHlIEBCdYE
-AAAAABLWFAAAAP8AAAD/AAAAAAD/AAAA/wAAcNYUAAAA/wAAAP8AAAAAAP8AAAD/AAA01gYA
-AQEDAAA01gYAAQIDbAA01gYAAQQDAAA01gYAAQgDbAADNABmNAAACgAAFiQBSWYBAAAAEmRo
-AQEARyQAAAWAFAAAjBQAAPQUAAD2FAAA+hQAAPwUAAD+FAAAABUAAPcAAAAAAAAAAAAAAADv
-AAAAAAAAAAAAAAAAnAAAAAAAAAAAAAAAAJoAAAAAAAAAAAAAAACYAAAAAAAAAAAAAAAAlgAA
-AAAAAAAAAAAAAJEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEXgADJABhJAAAAQAAAAEAAAABAAAAUgAA
-FiQBFyQBSWYBAAAACNYwAAIAAN4KAieAAAAABAEBAAQBAQAEAQEAAAAAAIAAAAAEAQEABAEB
-AAQBAQAEAQEAB5RZAQnWBAAAAAAS1hQAAAD/AAAA/wAAAAAA/wAAAP8AAHDWFAAAAP8AAAD/
-AAAAAAD/AAAA/wAANNYGAAEBAwAANNYGAAECA2wANNYGAAEEAwAANNYGAAEIA2wAAzQAZjQA
-AAcAABYkAUlmAQAAAEckAAAHAAAWJAFJZgEAAABHJAAABzAAH7DQLyCw4D0hsKAFIrCgBSOQ
-0AIkkKAFMlAAADGQaAEwcAAAAAAzUAAAKDIADjAAAG4e8GIBAAAj9Bd8AAAAADYkA5ERAgAQ
-/4lQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAABaPTP9wAAAAlwSFlzAAALEgAACxIB0t1+
-/AAAAQNJREFUeJxjYYACFhDx/vXz/yxwke+f3//n5BVkBIv8BwIQzQgELDAGimZkgF3Lhw8v
-GN6/eI5QISgoidsMrGaCwPfv3//D2B/ePGeQlFViRFFw/8Yxhg+vPwBZP4CYA9MELUNnuL1Y
-rSDoBrwKqmdt/d+S6gUXrJm9jaE1zRvVkT9+/IAw/vzAYQVQAqTox4/v2BWcP70PovsPiCeA
-qgBkXytFvqAEoBiw9fC1/8eu38ep2EpTkcHbVgslRlAMAGlGDk9kAAqhlsX78LsAppCTkxND
-4b3b17AajGEAKKndu30OnKh+MMAiD5SqnxM2AOTHKduvY1UIk8drAHoAEQMojkYAJEdjeTsx
-JnYAAAAASUVORK5CYIIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAA/v8AAAEAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAALVzdWcLhsQk5cIACss+a5EAAAA
-BdXN1ZwuGxCTlwgAKyz5rlwAAAAYAAAAAQAAAAEAAAAQAAAAAgAAAOn9AAAYAAAAAQAAAAEA
-AAAQAAAAAgAAAOn9AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABSAG8AbwB0ACAARQBuAHQAcgB5AAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAFAP//////////
-AQAAAAYJAgAAAAAAwAAAAAAAAEYAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAACAAgAAAAAAAAEA
-QwBvAG0AcABPAGIAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAASAAIAAgAAAAUAAAD/////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAGoAAAAAAAAAAQBPAGwAZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAgD/////AwAAAP////8AAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAFAAAAAAAAAAxAFQAYQBiAGwAZQAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgACAAQA
-AAD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAACIwAA
-AAAAAEQAYQB0AGEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAKAAIA////////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAFgAAAP4kAAAAAAAABQBTAHUAbQBtAGEAcgB5AEkAbgBmAG8AcgBtAGEA
-dABpAG8AbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAAgAGAAAACAAAAP////8AAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAHAEAAAAAAABXAG8AcgBkAEQA
-bwBjAHUAbQBlAG4AdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-GgACAAcAAAD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACkA
-AACcQQAAAAAAAE8AYgBqAGUAYwB0AFAAbwBvAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAWAAEA////////////////AAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAA/v///wAAAAAAAAAABQBEAG8AYwB1AG0AZQBuAHQAUwB1AG0A
-bQBhAHIAeQBJAG4AZgBvAHIAbQBhAHQAaQBvAG4AAAAAAAAAAAAAADgAAgD/////////////
-//8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAdAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAP///////////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAP7///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////////AAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////
-//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD+////AAAAAAAA
-AAA=
+JVBERi0xLjQKJcOkw7zDtsOfCjIgMCBvYmoKPDwvTGVuZ3RoIDMgMCBSL0ZpbHRlci9GbGF0
+ZURlY29kZT4+CnN0cmVhbQp4nLVcS28nuY2/+1PUOYCdklQlVQEDA351sAH20NkGcmjsaZPs
+IujexeSSr7/iSyQlle12ZzAY918l8UeKlCiJeqx3Yfnnza/LWv/LIS7ljMs//nrz598t/3sT
+FvjvH/99U+r3uGz5WPKx1ezlb7+7We+O81jT0v9bi+d0dy7pKHdxCftxty0x3xUmizHeJcks
++91uM9NZ7g7OLNnnbWVrhPnweZ+XX6H8VrOh0PcbSpS8fFuOXGvYfh5c5Jst/235n77CW8VO
+JdR6hB2rcReZ16+UAH3hD1P0v77f/P7fvm/L8/8tn1GmmVLp6wpcHr/UGkM1y7ZXkC9/WX7/
+qQoQli9/+/rLGu43+HNr/r75k/7+55c/3rx8ufnc8drSivJOeEUASfBna392RIv4F7PyfeBf
+5f42BmZ93Ecpe0KBB/j4eCVD3Deob20EO8lQdbtyfSuvCAwiCBAAFJkm5BeQ1W0ALgm4BPyM
+vOArlnvCD89VOihxIUKqImQrQiIRoD5f/j4VejuBItQm7ihQcRlEvk0gc0ZFJBAGJAj4t9wf
+KDnopwrVvj9iyScgog/PUF0s8AKVIxL6i18F9FKz0NDzeVYbd0J+Ag2FVaBDuC+/hIhwZyDm
+xEdY1GwwQ9jub3cWL+wgaVShqaZY/7cky9DNc+25eydZyF6B9W8o4SDscEIWqYmEBL7hAfMe
+4ScVe1K+nxfrsnLewFdUox21k0vvNRmlZgTTMaEoiA3FWzHq1PuPdOpyVGdA1NLGIzaw46KB
+HQlM5wjYdC/QrLUjUFuXFn8bMmDW9vWpWrcasBozSjYaMOJP6FfVoKHrl4Gc2GK418qutan/
+k6X70x9u1uU2LN+XE/xk/fVt+Y9B+hKBPh1D7wjP92FtjZ9bXGvc5LD2+AvKXsh91dRL+FSr
+is2VGqdtonGteREcD8FJ+nbfBS6CM4tYXeH5wLqI9L0S3e65MRSg2y0LBlGAHIOorn960Ql8
+a5927tXynXHjjrVyUHtjEfO99PtYKHdnFRAOVu/QQiv5Q/IQOTYc4oK6xBqiYm9T7gpE6O1N
+z3tslTkFl8kDFwdBHoj9RYffV+xfQ4u49rDUhGKpf30TworGRxhvDnIDMVrTU8WphYEuUXvN
+t71wSVCZk3+VFkZEj/fUnwBcmMAQI9DcJolMlKkNtCfFLGqZmMM+FODOd7SFGLcG9dHWUImL
+yqMOnzgDk6BMwgtqoNap9TSbXYV+6poJfIRCZ6uZ9qIYstXE621kMPlbbSTswyiCOiBDJmkC
+2HrDi+35RUdVcJ1tIO56EVkaGz+7D7LOafvCSwVYZWR01t55/GzqyPyh/iz007RZogXzhZo+
+2W3hIA0KH3o4pbMOy9YrFiITJyuuLs29xfW4uR8wAE7GTcl4Y9ykYh8dN4naDoOvjJuxzuFH
+gq8wc0k8P6yzBB4NcRw1Q2KbKPJcM0CzKDzNrPMQIKxm4T86CteJyWwUVVkuR9EQXx9E97JW
+DWBVtuV8vTfAPM+U398of4Rqtkn5uKZ1W/c1r2U96v/nJUKIsDgzEKrtB+xVqCCcglclH5OJ
++aGqrxQHz11wioOmIGU/NquxrQwOIaCxqBj9zQCpq4crOxNLMO4T9EiUOjyjAPUf8hjXq4ZS
+LWtqr9Nr8sa7TqrZjUjX5zksrA8qY5rI0ty5/o3PduLcdcQ91TY164g1Y39HR0T6D3dEpP6R
+jjgQfAU1uBkpreywy1l7VX8GvU86X/VSG5dC29UJXmIrExT27BjN+u9nOq2o6aLTlr1qo3Vb
+b6It4qiEJorWRJJxbaKoxT5qIqL+ARP9IEGaEHwFirQd3fzPaDRpreYahcZ74QaPfVqtOsgn
+MjT3a7Qrrmv6VsEt4acHAIozNDIbbKCmxe23NVpyZGaZZsMTD+rOYpMERX+68jhVFceV/m9j
+2nO4MoESXpogbrF+N40aeMcNPDy0u1C03TWZKHS3hVQb9XdMBUxtFQRXjy0B8T8qh4mCiXP5
+hkRZUosFhBhciwAKD0jlBqvE20Cs0gCbdB6aWiwms6FgorCBlFZFibeBWAUCNkCntbGYzGav
+Wtba7JuVX4m3gVgFAjb7lkxtLCazkZhqrgW+s44hlcUwLUGB2YxAnAMT8G9sTU4tFtAZRniQ
+jgRWiDWlxCINsSH9CRuL6QwjbEhHAizEmlJiEYjYkP6EjcV0hhE2ZBgBFmJNKbEIRGyEjthY
+TG+YEmox6TGQSk39kkDDYDmTc7Qew6nFAorGVssDUspDidNArNIAG6BTNhbTG0bYkI4YWInT
+QKwCHa3HNDYG0xuG2bCCBbgRp4FYBTrUMMzGYnrD7GcdiZphdphSi/olgYbBcianaI+h1GIB
+vWGYB+uBYdkwJqXEmlfYMMrGYnrDCBvSAwOzYUxKiTWvaI8RNgbTG4bZsIIFmAxjUoZNyytq
+GGZjMb1htoLbOKzjrTTlb6UZBcvo96a7ICkH5o3C+KzcrajaN2NNJmw5TW/KwuJ5gwgLUuxW
+VOWbsSQTtpymM8PC4HljMAtW6lZU3ZuxorCQHGTRaJCFxfOGSJsZ7CHVBvuWQGNgOZNzag+h
+1GIBvTGYByuWYVnpJqXEmndqD2E2FtMbRNiQchmYFW9SSqx5p/YQYWMwvVGYDStYgEn5JmXY
+tLxTewizsZjeMDGqWWIwypcEmiWqQ6tFxdcESRkwbxJEZ8UyICvdpIRQcmLzMspA8bwxiAGp
+lCFZ3SYlhJITm38xDBqeNwMyYGUKJCnapBoDziEGQkUMFM8bYD2rLZsJaio0VUsCTYDlTE7W
+nkGpxQJ6MzAPVinDsrpNSok1L2vPYDYW0xtD2JBiGZiVblJKrHlZe4awMZjeJMyG1SvApHqT
+MmxaXtaewWwspjNMPLNxWZBq6m8JMAyVMznqsji1WEBnGOFBChZYUr5NKbHmqcsSNhbTGaax
+QQULMCnfppRY89RlNTYG0xlG2JCCGzAq36YMm5anLkvYWExvmGMz0+DIJy9I/ZJAw2A5k3Oo
+YSi1WEBvGObBCmZYVr5JKbHmHWoYZmMxvWGEDSmYgVn5JqXEmneoYYSNwfSGYTasYAEm5ZuU
+YdPydBosbCymN0yJxpVFjESL+iWBhsFyJkddGacWC+gNwzxYwQzLyjcpJdY8dWXCxmJ6wwgb
+UjADs/JNSok1T11ZY2MwvWGYDStYgEn5JmXYtDx1ZcLGYnrD5NVMg2uqKZ9+olGwjH4302BO
+OTBvFMZn5SIoq739VsKWY6bBwsLieYMIC1IswrLK228lbDlmGtxYGDxvDGbBSiVYUnf7bVhI
+jpkGCwuL5w2xQXRBQisUJuPIlkmcXE6MsUEYvvUQSi0W0BuDebAOGFaIi/V7TCzSEBs2CLOx
+mN4gwob0wMBCXKzfY2IRiNmQUYSNwfRGYTYUu2rATFys3xM2LBCxYcMwG4vJbEyM8fuNjz6a
+uFYX8YLSJhamcUkXsVR8CRD5IJoJz3SBm8RHAZMyo0iRE8Pgc5zDx4JMlKGLPyCkRiZKC3g4
+MQw+L9d9SMMumP1SGiFliV3aqt0JYdB5/WlX5mb9160MEVDXjKUtPp0IBp0XUn6xaZcydomD
+gLr0KW095YQw6Lg+8CsmM0Pv5u4IqLP60hYHRgSDzRNdvxgw08xuAopuRKempc14nRCKL/M1
+P6c1s6VuHoX4OsMqbeLmxDD4PO3wUzMz6HfTAYTUiUJp8w8nhsHn0dPPMOz45Uc2hJQRr7RB
+1Alh0Hk4sAOlccedo+5ceGljgRPBDAV2+6PfmpiHz11ovds2meyAjDHj3MdzpzFHF4/sYs2T
+sPEYAc19dNLE1HwwzEfYwkUc8yKel328bRodcpEjFwWchPTGSFXuo0gm9mGDFj4OEi6iTdOo
+S+7jItO1vFvnd9GaIfQyxhVyt+afr0vdmrWLR0xCC+MqOfcr2Okqy63AutX1ZKE8rvlyvx6b
+rhnceqJbK06WfeMKJverCzMn9pNZP0MOF+uQi/l49vPl6ezOzfzcLH4yJe93Pv0mpNndGna+
+zJZat2M62/kctotyv48z3Wtw+xDdNtNsu2jY/Mj9roSJp/tAuI+uh4v9i4twfvax9mlU2EWM
+3SbALJw/BKlzHz2O0coX51HQcBFlnoZdcx8VncbwXHyvC9eOgdchpJi7WN88HuViVV0ochZS
+HAJkuY9cTaMrLvLSBdZmAbIh3JP7OMw0VuDiCF2YaBbuGYIXuY8qmPWwX8j61XG4iD9cLMez
+XytPV3VuxecW8ZfLcXvioT+KMN8ud1vp3UmJyYmHcZt42L+d7jG6/cd+e3ncJh43PYfdSLOX
+5jfB/M5auNi3vNjK6/bZprtBbqfIbwCOW3nj5tSwaxSjlS/O90DCxe7SdNNl2BOZxu5dXL/f
+rOm3XcathD7GP49Duxh1vwUxbiWMgfEhYj2NqrqIax9QHwPjY5h3iL9OY4QuftiHh8cw7xi0
+HKKJJhbmg1g+MhYu4o4XobguTjaN5rhIjw/gXYXi9KSTP7GU7vRAjT8m447QdCekJied+nM7
+yUyLOMVOwx/6cAdCuvM+k3M7/SkUAT6UDTsNf4TBHW/oTq9MTqH0ZyoEuCibzZyTYLcxbt3n
+C3GmZwWSOkBhwo7Dbza7jWh3xmByWqDf+xZYY352HHY7ddxozRfCTHZ2kzpAYcFuw28Num3D
+bkd42NvtdyoFNjcm4jT8NpfbAut2OCc7lf2+mwCrusRp+E0bt6HT7ddN9t36XSQB1mYsTsNv
+QbjtiW73abKL1O+JCLBRGroNH14fQ+/5QpxprD+pA1x8kNkHi10g2e0RTKL9V0ev3TWIAG0H
+VlbtsuYpd052uF8V+G4s3OjBawl4/pe/xfsQ5NsznwzmI7x4UxbXciN23Plm86lXjPFMMt0G
+Cny76YGQQ6KTx1ToSe5xwwlkPQYPF8LXBOPrhB1cwS1CagDWB7psddAVKzh53eQxuEeE2Pq6
+34UBl4VKeEx6fQiR6Cus0u+VEvzzeZcsPZylpqPqtcxJ1/rLeONguNZxm81B6UqaoSem3A5W
+dzc5ur/lzc+KHNYAUs2gn/UKlt7Gkhvhen8RkeMLqPeTbRh492YKPF7ubtcc8XZ38ZWPGd8r
+uKx9WuXW2Hht7qW/UxsfrdXjfoWM97vtDXJr7Q3vFk/p4JY3Xwt/4vbYEZMtt/PiVs7P23IG
+/YO2HMw4w/yYGS8r/tNmnCH3Zqw/BzPO6NCMT2pGeUWgN2MaXwj4V5lxBv1DZvwEd5Rmxpwh
+f8yYl9X/aWPOkN80JmqNqLKVxzwKEujVBrz71xszbr9Zn5xBf8CYny687Az+Yxa91MFPW3SG
+/B6Lxk0GzNdsGvmWdG/TEMfHRf5FNp1Bf8imgzlnyB8z52X1f9qcM2Q1Jz908jiaE+eiU3Nm
+Y84yN2c8YWHzm5hzCv2D5uwNOcX8kCGvK/6zhpwiv8OQQBfmhjyMIeVNILn0566ixnTObwtD
+xnhbuK1phmvDBPSuO6nDjVSinV8wlUuopkzgif3TWufr8IpNXV3FFf5JYQt7yKHU/7dw1L+w
+diGg7v5ukxdWg/6qI7zY9B1KZfpNtx2hmebNS8uS1NVDExYXozEGKbL1L1RAhVZbYnjDgt72
+iZMy8DoOtVu8LQ6/Ej5rw49NHPTkFbXndG+fmaBfYdab2vMfrW9iB9GnIMILF4zttSm7IqQq
+r+1prKsqr9ePZ7UqD2W+/pKw82A9U2rvW+AzHfI4RtIHLN75BEbCq7764kWQ10DkcQ0YF47x
+xaDAT3W8paJOO+FIb2jHlLjUzliGHSS9RWOdItWAHhGBh9m0DfA7MI/WMZ3wjMjlwyTw9Vkc
+LzzOxDoJhNtXNW/iza6qqiWuqzqU+fq+d3Ck+ae9PWTSPfzkHkl7ac+f6KNQfmyiSm37W5XS
+EteVGspI65YAya1thfYdGifcbXzF7Ns7O3FfQ3wZ8dUaaonrGg5lvg7DY8o0Xkst9MUs/1bQ
++/rppt00qJ6mY13AmOzk2QXJeMdYF7X8x8Y6on19rDNlZKx7qKPZGrY6xj2GpzrW7XUgiPUL
+fH2pvx7mo1yT9GqUyzCF8KMcNoczvNHetcBlYxiKfH33y2bSiCcvWbVm8vpTVmaeWfzLTIMv
+TwWfEsEGVaRppYNDD9AIT32O0TzGaF5kMk99oVhWQnU/zYe25lmbVobd8B33xE+Ish958ojC
+Cg9Y7dt6hwfKayote52G4AFEaLcmsXE5TERM4EGiFR544NRiASVW3orjEeycGyiTmpSSsizM
+BDD2xsQiypEoIsYFZatI3ETcYhMblzM5mSuSJLVYQF8R5oEVYVCuiEkpqeZlqkhjYfF8NdZD
+K7EWOpeLompiw1Lt+0FHCpnkoGOEDcxXANFREIZjEU1KyCSH4ImGwBXLib4dB53kQ0kg1fRs
+EhuXMzlnswCnFgvoKiA8QBwBJUFtSkk172QLCAuL56tRAp1EJYlqKjZhNbFxOZNTtBolGHVK
+QVsN5oECMSiLalJKqnlFqsEsLJ6vxg5njb9zH9122gGn0prYuJxUY8cGKdXYN6tSLmirwTyo
+iwqsECdrSiYWaYgNVoSZWEQ5Ra2O5/tN75Ja5x26dbQdXp2Vc2MGn/t07ym0Z/keF21PjK1z
+OyEMOna4vgO3Zj90iGi7Smw9zoig2NIX+h7WWuPQTqNtwbF1CyeEwedG2jf91kyGBhS7dsbt
+1YlhfZ0Ze45+ZJj6YuenuzFrMvyMI8PR+23jPa3j8540Xfj3qd8+Ot8692nO33X+fnDeo389
+eu839TjOG3V+eeJiR/939N5p6hGct+j85sQFfvbPh8F75Xsc3+xND93SMbTXNPEFSxN3sGvN
+9KjvUOJUaef5mYkM5oQ99/pVWAjQhYBFUh8MO3mz/BbfhMbnuQ7cVAry94HeEdz4IS56f++F
+55BByBLXJNBjyYH2oh51sproFS+aIEoW7iUj6Uavgg0g4XUUfIZ35wfBgkTY9/td3k7fWtmA
+z9UVesJug4fror56bZZ6aMEQh0VaeE6015bueVlGE+CEK7Qus18io/41Gt30T7Pn8MzL2kT6
+h3dQE786jaJ/opemVd0vOJeu/wVasMYoWr09SKMRAkEEZMyLeqZax4h6iPAl0mEBBcOyDEMP
+s3Yagpl4v+PBRyYCr0XYctQU+OtKan9suqelKf3cyEBea1NGZ8Ml1Ug1u5aK6+KmNKrPynV9
+oJfi8DxJX7eSf/sgRFfLkodANavzgV7lxIBUsx12TXio8aS6ReTzok0ed+Fqd2gdAftEaVmJ
+HjbfWssgAtBZCtQlqQtzT5ftjsSxkQSRRvBbhX6iUWsa21RN9yrdW0S4U2n3JDgw7FSzH7In
+p91m1ZZGrRgVUpWTuS2njd5lh+7ALTzbdsal9gSPBeIfo+hNG418vS3c87Dj7wn8SNpNz0r8
+yCoD1QXx7WHaHbZ77gQckoFG8mEBWUevhVT+9AeIddwVCmv8sf7/96Xc5Vr4XP4dH/Ivheft
+hX/L05GvUZUtMQ38kncO/x/uzsJqCmVuZHN0cmVhbQplbmRvYmoKCjMgMCBvYmoKNTYyMApl
+bmRvYmoKCjUgMCBvYmoKPDwvVHlwZS9YT2JqZWN0L1N1YnR5cGUvSW1hZ2UvV2lkdGggOS9I
+ZWlnaHQgMTEvQml0c1BlckNvbXBvbmVudCA4L0xlbmd0aCA2IDAgUgovRmlsdGVyL0ZsYXRl
+RGVjb2RlL0NvbG9yU3BhY2VbIC9JbmRleGVkL0RldmljZVJHQiAyNTUKPDAwMDAwMEY3RjdG
+N0ZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZG
+RkZGRkZGRkZGRkZGRj4KXQovTWFzayA3IDAgUgo+PgpzdHJlYW0KeJxjYoIBBhjJAMSMIALE
+YoAKQ2gGOIJKY1EDNwoGABtnAI4KZW5kc3RyZWFtCmVuZG9iagoKNiAwIG9iagozNQplbmRv
+YmoKCjcgMCBvYmoKPDwvVHlwZS9YT2JqZWN0L1N1YnR5cGUvSW1hZ2UvV2lkdGggOS9IZWln
+aHQgMTEvQml0c1BlckNvbXBvbmVudCAxL0xlbmd0aCA4IDAgUgovRmlsdGVyL0NDSVRURmF4
+RGVjb2RlL0RlY29kZVBhcm1zPDwvSyAtMS9CbGFja0lzMSB0cnVlL0NvbHVtbnMgOT4+Ci9J
+bWFnZU1hc2sgdHJ1ZQovRGVjb2RlWyAwIDEgXQo+PgpzdHJlYW0KJqJKHCXYXbrYrCI+gl2K
+7aWxW1jABABACmVuZHN0cmVhbQplbmRvYmoKCjggMCBvYmoKMjQKZW5kb2JqCgo0IDAgb2Jq
+Cjw8L1R5cGUvWE9iamVjdC9TdWJ0eXBlL0ltYWdlL1dpZHRoIDE2L0hlaWdodCAxNi9CaXRz
+UGVyQ29tcG9uZW50IDgvTGVuZ3RoIDkgMCBSCi9GaWx0ZXIvRmxhdGVEZWNvZGUvQ29sb3JT
+cGFjZS9EZXZpY2VSR0IKL1NNYXNrIDEwIDAgUgo+PgpzdHJlYW0KeJxjYBikYOvha9WztmIi
+oDhW9UCp/9gAUJx49d+/f8ej/jsa+Pz++eN7+NWjCd67fQ2f+s/vgej9++fvX4MQ0PB718/h
+UQ9ScPvcvcvnrl0+BkLnj507vReP+mvn9x7bt/bYLiBaCkLbgORaXOpJDf8hCgA+0bJGCmVu
+ZHN0cmVhbQplbmRvYmoKCjkgMCBvYmoKMTIwCmVuZG9iagoKMTAgMCBvYmoKPDwvVHlwZS9Y
+T2JqZWN0L1N1YnR5cGUvSW1hZ2UvV2lkdGggMTYvSGVpZ2h0IDE2L0JpdHNQZXJDb21wb25l
+bnQgOC9MZW5ndGggMTEgMCBSCi9GaWx0ZXIvRmxhdGVEZWNvZGUvQ29sb3JTcGFjZS9EZXZp
+Y2VHcmF5Ci9EZWNvZGUgWyAxIDAgXQo+PgpzdHJlYW0KeJz7/59kwAADg4RPEQAA18WuUgpl
+bmRzdHJlYW0KZW5kb2JqCgoxMSAwIG9iagoxOQplbmRvYmoKCjEzIDAgb2JqCjw8L0xlbmd0
+aCAxNCAwIFIvRmlsdGVyL0ZsYXRlRGVjb2RlPj4Kc3RyZWFtCnicjVVLi9wwDL7nV/i8kKyk
+OLYDwZDHTGlv2wZ6GHpqu4XSaZm97N+vZOfhzUx2lwETZD0+ffrkgQLVc3ZRwD+DpGxN6uln
+9vVO/c1Qye/pV2bZTkobp4zTfK0e76YQkOtuZA/OY3VVWDX+UPdHrRDU+NgA+vF3dhizh02A
+g9S9fNO9LOhGwKkpW28bcD7XDYKnBg4eGwJfNkg+p/hJ6PNKks+GGECVGKIZWo80JzrgUaJC
+aMn5MEbKJ6fSU+roDDX2/tv4KaJ+UC9Jc4VRpnDKFbTwllxYvsCF70twlabFfXH7fs7uP54r
+NfxTUuD2rDbjcEU9RQe6aObX7fFLhU4DUNWBXjwioGNCOhxQo/U5IjNGwGZig0GLh7X9C7cu
+SVElCRk/FJV6ngp+/pCByoE7PSsL3H74/qO+XIGKokLcdHFqqPU5D7GSUTgeCnSMq6GO20ug
+pKmQs9RprjcVhw52qnPvJEor5dBSXoCAEV0JQToog821WFpxsEEpAWX06z3rcZiEt4M5tG9q
+zecGwEHkXfk5WThicqkm6pQpJSCslIsgEucAot+lLBCQ1F92jts30r7MQMtnFT5Nsk3Wu2U/
+GNRi74JnL0HRMAh17by4U0g8g3VO+jpIa64eBjhKj+ubwDts58Wt40JPdeYSfC0jRb0+Fkyy
+kXYX0LHT0P/7kFU1r/JLZGg8wpx1ZpFPXiUHUhDrYOxWlvpw38pdYDDgwt3RReVo5L3aLE4Z
+l4bC/KMKokwGbp/6mX2Ut5GaqHMzPaYY1U4SBs0ruxY7X8svu0a7u2b4gTDp815JsIxxWqK9
+WrVUua51mpgry/By1/Nzvo86cka6KLecDetu3Vjl99KxZl6FEOQmCl30mPyR/Ae6V6DbCmVu
+ZHN0cmVhbQplbmRvYmoKCjE0IDAgb2JqCjY2MgplbmRvYmoKCjE2IDAgb2JqCjw8L0xlbmd0
+aCAxNyAwIFIvRmlsdGVyL0ZsYXRlRGVjb2RlL0xlbmd0aDEgMjk4OTY+PgpzdHJlYW0KeJzt
+fAtclFX6/znved93Zt65MDMwKPeXm4giEHhDTQcUFEUkQNTKYmAGwYAhBlS0Fi+raOqaKVhm
+SqVm2ppZa6DWWllW5t7M/a2b/btoWRtr/vq5W6vw+n/OeWe4eGnbai+//+fv+M6c97znPOd5
+nvNcvueZ0braehcyoMWIIHtplaOG//jkqwihdxDC1tJ5dfKo/uVwjz+ESymrmVM1f36KEyEC
+92jPnMqGsg2FV9cixK9BaPCZcpfDWZPSPxmh5HJ4PrwcOu5UqjVw3wr3MeVVdQs+CfyTBPdH
+4f6bSnepozTvyyyEbjkM9z+pciyo+Zxr4BFKGQP3crWjylX/Uu1kuL8ToTEf1bg9dbejJVcR
+ctvp85paV03ZRf403BcjJNA1MbzoHwM0RXrPEV4QNVqdpDcYTX5mi9U/wBbYr39QcEhoWHiE
+HBkVHRM7IG5g/KDBCUMSk5JvSUkdOmz4iJFpo0aPuRX9P/AHD0Nt6Di8XkG70Ra8E+7KoPte
+6Gnl9qPlqB56XsPH8SpuCPTtRBfRSRjZhI6T3TzCk1Eq9CJ0WuDQJVyIXgAaaTgAp2lEHvG5
+/At8Pt/Gn+dPoBG8hz/BF/MenEqeEIqEnXClkdc5K3oLRaA2/AHyoIPkc5JKDvMTeBP6gJwg
+u9EnsArsN6yxDm1Hi4CXAOxGjdwiLh96jgkn0GZ4ueH5CbwVnwTuDuJl6BR6mPDcJLQVnwK5
+jqO/omWkkGsEu0zlyoD/Y0DrBMzfjDw8Ek5hCSncYOgD7mGtEvYeRoYIp9jrImqElQvRdrFN
+DNBEwypUYzvxa7hD3IBa0UlyJ7mXvIeX89H8Ln4SWqdqgBSjdUB7M50jluEGkJ2+FlHq3Hy+
+GO9Gn/PFmhKg/TqVCNZ8gcsHicrQYbjmi2aQaTReTlYBp/RpGDqhmcwnwXygoLkfpAbDJsPQ
+XGgtQnvRfjSEtKB1QInJK44Q/gozt/Afgczr8Frur+gEmYDiURl/AXSNAhBqQehFjSjwhMMo
+QTbv42Kznfvst82U35wVOSThmlvZrJH3obx9xga57erVvJl8iDBrnxC6j8Rq9/Gx0R/d7OFH
+QxKm5M2U93VlTvBSzSyeAH0FM6FJ76Ab+jMnsGd00X1CLPzNLt4nl5bLD5gfiB71gNk1agio
+DZUpLXyZsB2ikQYF2w38FSRewVqhkeNR0tF3O25B5nc73u1I9rdEWmIjLZFlPOr0kJDOT5QW
+jembr2rFePD/jyAe3S6cQhKy220ZpJXnWoUlGtSq00aIoQRFYL353Sn7/ApntsNg+8hZHUc7
+gXBSR8olShr4nhWFX/Ajfjw3e0SkRRgWm2qJtEUqeLLyCHa9jSd3bt/Neya1Tbp8ajd1MKpl
+fjJYUSjabI+DwEL6h1oEHlkEgc8wP27ZaGwNWM+DtyGzxGEptJ+ZiGHmzin7bIVT9gUW3jFl
+X0DhHcALuXpk5CyQ8cgRizXNy88lxo/GLPxZI/zZ0i8NOLOnTOeLhCLNQn6hMC+kKUgDfhjE
+B8OGhNaheWJ9sCekLnQpWhG0NHhpyNLQXWhXiGU2mh0LIgwbjkaMxcOGDoiOEjXDxuLUFN4W
+IGpEBM7/SmeOB69NdUx9asXdJxcsfHfmZzgg844g5dLu3bvn4/WjqjZlz2/JGP/OLSmfvXrn
+jpow5Qsm+5arZ3kPyD4Q1dgTkc1fWqGLWCH7t9qMrboNYmirvCF6vbjG9mR8YKg/IgFBoQNk
+cygJiNCJ8VQFgYU+6XVMehD/UgfICfKbO85dOtdh/vSCmb1AJ8nYrnOGOyIcsjOSR7NxOLYF
+8JFRA+KGhYMow0GuwXiY2ugjIBm3/knlN8pndx2bW/hm1cvH2nfsPdC89cmHC16u9bw161Ns
++BmJjTj64Ptfxca+dktKy7qfNu+cX+NZFDPgBVn+7f779lC7hJzHbweb4pARLbGHYSMxIkKM
+GYjoNa0CJkt02CChUFHLG0zmM1P26UEwIxPMQAV7d8zRjhQL3dVz747pSAFZ2Lbyb8HWvkU3
+dZAeDUKT0CxUgeajB5AmEA9GA/BgMhzn4mmGacYiXIbr8UKyHBthM3U4kqRaUm3RlmhL5DAi
+KhxWhimnTr3VdZcQ23mWnOhM3aW04uLX2B5tvWrFryEFCSjIbiBb0TKR8DgI9RfNnR3vvgOa
+7uxIHpFqI9H+F09uX5KvPKMcwXaYNwGi0E6Q2YAX2bOFYFHQSTo+WNKRYEkvccGY0+sl0aLR
+agQLL2i1Gs5COAOMtkD6zZAEjogEPavXGvSSTqsGIb0GGc3vvtOPKgLUkNIvrdu8zVrvJfR8
+qs1ZUfuRCePZ9q9EThQ4CfxaskoDhRhJlsZyY4WhUrKUw00VMiS7NIuby90jzJGKpUVcI3ef
+0Cgsllq4ZiFMg3ScliBeFEANItbwWqTV6JCOlyQDMgUTG2/TBhnMJpmPFGRR1sjaaF2MFKuX
+TbJpDDeKDONThWTtcF2afpwh2ZSFsvBkzs5nCnYhQ8zQZGjtWrtugjTVYDfZTTO5Iu0sQ56p
+jJtDHHyJUCwWa4q1Tp1Tcurno3l4EbeAzOfrhAaxQTNfW6NdYGg0NJpWcE1kJb9KWK57QL/O
+tInfZnrWdAfstX+qDtO/OFqHoye8g0fhtLP07YSySlFeV15VhFNXrPwFel0eLJgvX0TUXu8F
+v2yEXBSAQsAzY5AN61ZoVwq2p7HQbsCH+rdb2wxrQkNsnNamRVM4q19mKJjBpY6jLPaYz13q
+OMf87hJzPHv8uLCasNaw34RdDBPGoXF4HDfONi5ESNAkaZN0CZIbubGbc9vcIbrZ9+LZ2BbJ
+PHKEzYSjZWQxo9QUpEnE1Cv5xs79hhMvzj1WUvqbe5RLyjEc3/kx1rRxO1Zubjdxd93+8rGh
+Q/cOSsAjsYT98Xjl/aObXti7ldqx++pZcgxkikPn7WOMBs6kL4gI1+o4jVQQERGeIenDI3gb
+WoFX8QErbKv6t1v49tg2y5qB4ZI+IkSD8kO0Jo02ICpzoLnzKET6cyBZWppXWrPylwvmv1yw
++izSRKOtxqTG3P0ojtpfVagUqg81JILACfoEw2jdaGm0frRBLyMZx3ADpYH6Qf5JAUm2QYED
+wwdGxMvxkTFxK6QV+hWGFUYr9USOEyVRTwzESEzEj5hJEAkmISSUD9PFJcWPi787vjF+cfyD
+8a3xF+P7w9bfi21MabaAwAgW7cTo3tEuCSdCMB+emhJIVufuun3VqpKN447u+PoPt79WWfaG
+Y+ka1x77noc//FXZC/y4vQMHFhbasyNNgx5ZteVAdPTLw4bNum1KXqxfTPPSrc+EM6CIRoDh
+fCVsRf5opD3IJGj9yNPIgg9rmyQ9aJlHWrPVlBVg7hxzFP6mpLEcdUkNbGnJ+5+1gY4wzZSW
+gMDR2AasDrNED0u14Pl4kbJ8iuell0490dQkbFVeXdfVuip387bfccXr8FjE7HUd2GsL5BE9
+ikEz7TH+IjKuMKDWQLE1NHCHudWwKmp96JpYQ5QuNCjcP5RERoTEgr2CwZ5j+3eu81xPmrAH
+AN7FJ7gT5AR/XDguaraH7w/nZgN3TJWq8lTVcoQmCWQLQKqdRqYEcttXbtu2Ei6sy3k0582T
+fqP33/MRFpSLHytdygWch0NyHiWjDz7x+KFDjz9xkGtoixmgfKV8OWO28uUXnyp/wmtxAy7B
+O7w63QV5oxxiqIhK7f0FC0c4AsGSzxBa0RIiEMxjJGrMne8ctTB99sr3cEFioCly5ksAhmhA
+1iANJBPLiJGz7NaZHBZJsJAmTBLmkH1on6ihsSLShqNx5C5ypOvjk1jpShVOFV1eIgxWeWkC
+HT8BOo5DP/H6DxfudSCux4Ewsj0esLF/s4VvRhtj1/f4T1RIkGmIJiggaqD5zNGOzj7+A4n6
+wl8vmN+w9PUfs8+B/OLBOA5ExCfFT4sns681675JXDXrGDBrfpLnnbt3PD9/58KP/0t5Xzk/
+98vFizpqf364afOij9/G/f5S8Udh++sjhi+eV+qKCBp8+sDpD5OTfpOZtfIn1fdF9B9yZM8b
+5wZQuQ/CuWAyxA0LAtMQIQdZ9KTJ1KY7rJFESANZVhoPUmhuhvj37jvUhF7I89/mz4HFqIxC
+mk21UUsJ7EcmR2QnbHmqvX3UweX+iaHkBavl+Mtd+/nivWWlgsD07Ll6VogDPQeh4fZg4+Om
+vVKzBT+O9vLN/UCdwZogI0oOMAeD/aZ0qNHnElNf8gt+IREhdFWqH6899gqiYJxCXNn5pVeR
+chGbMVp6vmzun3+q/FxZiFfgghV/FkpO3X2Xckz5g3JaOXbX3ScnTcLb8BxcjrdNZD62CPZ/
+COhBQrHoMCDVCH0/nQk93U9sN1nkFREHQ9ujIVz2M6B+pL9Rp9VHEG1A5gBg8513IVerBnr0
+3KVO4PYN6mppljTqbdXJYcnhyRHJcnJkctS4OHuYPdweYZftkfaovLC88LyIPDkvMi8qL64m
+bnlYU3hTRJPcFLk86sG41riLceG+qb5JvgnF4cURxXJxZE14TUSNXBO5OHxxxGJ5cWT/3n58
+Kx4BIQb0A7EGAmFkb+QXyL38wTNL3I+0t7WNO7zymeNdVzD31KbiA4Wul2//n4tcatmiEs/p
+F+JzupbsLnO88sRLR6yNqxMTd8fFddI9fAXeGsQAOIdEvYg2cViLsnizekxIthvNkPfzhGKh
+RrgoiBhStCX6lTY4PP6tg+q5Z64GDbabxJf559BhTsBaHmVpIXyqtgagy6436+y6PF2xrkYn
+qGQoqANSbW188ZVWMeBzystbCIkRFIehX9qHEgq4OAvmvIALMBm2SJIuQ9JwBBDOs1q9oNMC
+1hIkMZQfK4Ui3giMd1JUTVEXDdc3hl3gpjUMZxURjZ/WT8dJNi5A4y8N4AZoZM0AQFtDNcOk
+Cu4+bpGmQVrMLdUslR7kAnmsJ/44hETjBBKnHagbiscQwD86l3aubp62QbcEryXN+FESwOIT
+IFcQEoKUJfotPATfjxvxkNeVxuNK41HhVKeWfAMYJqIT8ejyR8xmzbSuw3C3hF61p0M+QhA+
+OXq2ArGJhCwc4HBJAwcukXbqLETS0geAzDXNFJeDNjQiOwHrBAlOfkdVPZx7t8Oa1utw1Qtw
++sKvF3zKBqqUDD/sx/lRxaCZaB6qQWuQToO1nEh0fCAO4orwTC7PAN7GLcDzuPtILT9fs0Db
+hFdyiw0Pc4+QFr6fCtwpkiORJJo7rFzgYpVFn3Bpv1vZdffKU4KpK4jsvTwYNypLmOw0Xq9j
+ObEfirb7i61W1GpYb13TXxfqF05CbSH9GWTzApgLyTiKs5itqSlWi5mLS6ERIzqKvnOrtzz2
+GPx97LErWKd8feWK8jXWCXnKCeUduE4AQ6l4KE5tVTzKCqVJ8bAUthCvpba3T/mKWyRa4dQz
+wu4nPow2mYwaRKwi8pfYOcefnqIlesTxnqgleqI+l9LBwgU9WWCRswVY+0UP4IYNtY7gFq1Y
+umx5a0vzxk2i9VNl7PnzyuhPvsBvfPgBPtoB622H9dxsvQi7n4aup8FIb+X9tQjWG3Oph65/
+aqDVFsBpoodbhw3ltgPJ5pbW5cuWidYOZcwHHyqjvvgEv37+PH6VxWQn/gAOBMvAJy0H0BYO
+0i5vPvMOKyckQ9aMdHIhXZ9wy7ar56WzvBNsLgzdZY/mgzWWFeaw4FZNQKt5lZGDvG1cA4ii
+XyiWSCiSzGK4uRP3Psmae2nDTLUBh1rz0Qt0m+g+wYFWOaoCFbqwxQdA+uRAGsXeJ0FdrQkz
+Ey7jGOVd5cu7Xiu//cg9P3/77Z/f9nihcGq38pCfn3LhT/+t/EWWj9+SfGDLlgMxkO5AwtXA
+/2pmN9EoCY23x/YHJBUntoYPabWuD18T92Ryf0PMoFBbTKifDqwITMkvMiSZJsFLRzsYiPKd
+v9kdgLvewCnWl51p6YBl7+ioGIi+/r4BwDu3+sEdOx58cOcOZcfS9ejq//lAWb/koSeVr7/+
+Wvl6+6T1y5Zu2LB02Xru9c1NTZsfXdG0uUjev/j53/zm+cX75ag31p3+7LPT697AjrqlS+vg
+Yr6wBGRqApn6M3wYrYkIwitQUKu0g29FqwIjWs3rA9fEakJDI/3DUVRUqJHBQxDA5x2fUnyv
+osPAo0GvBh8JORJ6JOzV8KMRmt3Ww9bPrYBKZo9g+rf604SChg1FqWrajRqAfYKBFj7K2TIF
+UOGo/ZUfKlew+WNMsEV5TvkkZwse60WOEYAJsRFbi+7Efl98igOZY21T7gjnNvlwI7Wz9+Bt
+L5zLwSZfRMs4eiTvzjFwHo9+7+RJRQHZIf4L+8AetYBgEu021Awxtdms5cwSEoKMKShUx1tZ
+JLCoeCyJlo32F/szPO6VITaSfQIM23AJD8MRykfKcSUD8MF+3KKUK3mKQ0i6Mh/3B8CTgPvt
+VDYpi5WfKC3Md+AsSc4DbghC4+whcL5ayZtWGFdK9HzVr40CGqsRTQrIBEBzzgdozMolepyC
+DOcXYg5ZHPJgSGuIgHsBP9/pMMoLbMj53Mfynn/jjefzHsudumN2l/J7yA7i9Cf4Yc8MHnz2
+xImzgwfvjonBY7EJW/GoaOTFdbwT8qw/GmoPIjpETFhsMlnaDJskSI8ol2IYel6hhTRWcADz
+ttAT3v5i9awSbVE3laZd5oeBvLPtvvuan2lvz3i+/pU3uO1dd3Jbt219eXtXkxjQtdXl/LJ7
+XdCHP+C7PusevvG653zrvlBs+7WNu3Zl299ZGaAlXRjO9EoRfzusq0cD0WR7dJAhTGdd4R/Y
+7kfaB0S3xR3Wtfu9FBw2IAhpDRNFq1XOjGc+DdiNAbcOyodZOUW9IC35QPGgxYNaBxHgxmfZ
+sCf9zFxPHLoV0w1Sc0pgv2Gp5IkdzRt37NjYvKNNUS47nrnttq35v3ghbf99v+rs/NV9+9Pa
+uFvfPHPmzWNnznyhfKx8Hhb+fMKgl355R2kJHoXpSWdUSelu6ssHQY7tIIcZhaKx9pDgdmQK
+aBe0baY1+CVyOMxi1U/sB6dNLiuM6jBFzXDnGPdHwaR0xeGLw1vDPwzn8ezYbgWCHXEAA3sL
+gz2A0p9b9A66evWdRc9xI5966KGn6LWra68o7XY6lMPKN/A67MBfHD9//jhcqLt2Us/03A/0
+7C+2W1G7oY3mXavfbcRqy7wm79qjxwUtQovERk2jtlHXKDXqFxkajY2mRr9Gc6NlkbU16GKQ
+pe/ps0969mx8Zk/zhmee2XARW5ULF/9b+RJbyAfn33rr/GdvHvt8i/Km0qH8WTmG07A/DsAj
+me0nAaPfMNufZQ8VzNigfVrETZAuxcMS5w8HRZ2gNfrpcwJolVWiqUhPU9GUfSbWpimKHeOP
+WlnEOJfSCZKkUMPAB+y2PFurjR7TQJVhmCapaHqSpxCb+2Zf6VScpPy2fd++vS+JAY/klZeu
+60wiv12Xe2gP8FUEWHUYX4wM+At7tjBdrRlOl3RkOq0ZTv9ONcNf3qBmSIWYss9Cq+VW+uZP
+3/Qs3yIqGGRgg1pynbLPrHZTGf/hUiO2XxW4QC5QiJKGSdlctpAl2aU7uDuE6VKeVM1VC2VS
+AwCJBqFRaOIe4R4WNkqHucPCr7hj5NdCmMDpiMjrBUmr18GHwcYFkUA+WAjRhugC9DZDLIrF
+0VwcieRjhSgxShOrjdPFSJH6aEMaGc4P16bR2iI3iWTxdj5DsIt2jV07QTdBmqCndcUiVISL
+uDz+NiFfzNfkaQt0hdJ0fSlgGxc3l7j4ucJcca6mWufQzzG4TfWoHjdw95MF/P3CQrFRXKhp
+BEDaoGvULZLm6e83NHErhXWmTWgT3shtIFv4R4WHxYc1j2jtSS2GbaadaCfezm0ne/g9wtPi
+05o92u2GZ02/4J4jL/GHhDbdL01HudfIO/zbQgOrUYZg+hdH63F0Udunn5z+9JM25b3T//3V
+ab64s4XMpdeVVtLSOdfrX7eD7VL/H2kP8vn/GlMb3kSY50+EGJAZxryMBa8On/MfUH2fsMzm
+PfpxrL4YiHvhD/JEW9uo5+47fhVdPX7fc13HwOt37QLPJwe4u/7WscvpwBOwFl4THIrN5/oY
+3QpxvRFsV0RX7HGsTEPPWQL9IJyIRGqkYgYHBiqIAj1h8UijWqbPCikEpN/rdNufetjoSLnJ
+gQvbfzaJm8vRWvUKbjG3ntvOaelCOjhU2JANB5NgfgAagONJPC9rh6FheBQZxSdraf05m2Tz
+WcIk0a6ldjGLzOLztGWoDFeQCn6OUC4Wa+tRHV5EFvH1sP/L0XK8iqziVwkrxBbUgjdxm8nD
+/MPCJnGX8JS4T3tE+4H2qnasr96Mo299Dd+F73pNufMy7GAheeZKqy/nasIgNkah2+0DRKuu
+vx8SwzQ2Q1OYTNpCDgeZNcjip9WKeRatX15of21wVjQN4p2dcABl32qNgXTIDqE0Idr9k2Py
+YmpiHoxphdcvYz6IuRqjg71lGdHWO0tely7jM48sffbl9tr6dTvba+ev3dnePm5fw8I9ZNV9
+8/7yMU2ej2+hyZPb+sSjv3ySJdE5Jfep8X0v2N9Mlr8D0Gh7aE8GXyPhwwFtBsjfAfpcyORZ
+NmqCaep5/VxKdxp3247QNO4PJqgaXbctDsB7aRr/eVvb+OfqX3kT/xof5HZ2ObZte3k7t+hK
+6zNlpRfJLqrHmQDU3wNb06HH7MFatS4IUTFD+zQ6TJ4WtAQOKFiUfF8lGZhJierJgp25RHay
+SPHWDTuuKxzaM2gcG8BN5LI1gl7rp+9PQrSDtbJ+OEnTJuvt2M5lEjtvF8ZrZ5BZ2rv1xbiY
+KyPFfLFQom3UL9Y/qw/xVhTpN4c48l4ytyuHe6Hzfu6FLhdfvKvzvQ27SCyV5VbI59Rv/PBq
++3iNltNZkJ9k0UsI+ZksfsjPaDEYEf0wGSEJGCyQAjKMep0Z6YUm8pJJf9hsMhokHUR+rR/v
+pzf7or2WCa33OZYvbx09ykoZZtiQDm8N6maRXfhzvxSqi4siErSijhgDpX5GszHaOMyYLU2T
+co23626X5kpNxsXGDUarhIAJiNp6k96vH7ZxZt4s9JMC9AGGYFOwXxyKwTGczMtCvHagLlaK
+0ccY4oyDTIP8ZMsI8MxhXDKfLIyUhuuHG0Ya00xpfsmWdET1bGd6VqN5hi5TmmjMNmX72S2F
+6DZ8Gzed5PF5QpE4XVOknaGbARF9umGWaZZfnqUMl3HlUoWpwq/Yski7wLTAbxV6QLdcv9yw
+yrjKtMrvEV2zvtmw2bTZb7t+u2GPaY/fPsuvLR9YrlpcsHOCCatfh47D7PsjbkPuxvs2VOYU
+pkYqo1XnLn9z4eZJKwr53M6NpBJ1Y+otEJsldNger7VAoNNYRIh2Fl/VJUMLSZocRpt0ooB5
+UUsrY3rq4u8etai59pwv1fK9Kik8raSYWSXlbp6TtIFcHBcvDNYWcWXcHK2Hmy8s5VYJP9Nu
+4FqETdonOatO0ImcnkiagSSOHygMFgdr7IZyUmxYRZZDFFsrrtNsJps0u8lTwgHN65rfa74m
+F8nX/EU+ePa9NIhZqNC0zHSwnYv9omsvd8/FrmPtYkBnBT7bdanrGS66630k0FykiffVWFAc
+SkWr7MNj/GIHxA7wi4uJy0APGcIfSlzb/6EY8SHD2gHWNQNj1g+NiwyJBWOymXRGv0jjYFOI
+0e8W/VCKtHSFDJUwh2X1AAq47vB9FXwLM19vtRdM1+o14zHe8vmFa3y4D2AMVL/+ARDW5zQO
+odq/1zPhtzNKS2dMLy2dvvXgocdaDx7q3FRUWjJjRqmT3NLaeXtrxNbDh7Ztaz/Ird/406XN
+zUuXNTeeOXTovfcOHX6PczQv/enGjT9d0tL4t/8Rje8deumP7x0+eEa1C18dTkQv2uN4ahcE
+gpZqGQSeQ6bEKIPw+FlEi21IELDGV2u7afrbn6elBlGCyCAykZ8o3E7uJ8uIRkQaTsvrRBsO
+4IIBPQ2CDDiAi+fjhVhR1o5EqWDMY/gxwghxEsrEmVw2ny1MFGehIrGMq+ArhIVoHp7HNfAN
+Qr24WPsw2iTGgz9Eqt+icpO73jiJT+M//q7rmHDqSj/+88uD1Ror3gDyEZT4InqWw6GI5+mG
+mrtzu3oux3Zjsrf4u07YJoisaPvW228Lp4AM0Nl/9awQD3QsyG4P1HIWPRKaTWt0aIlVGyqN
+BLLp1h6y1Bw6Oju6Y1kag98R/uv8t/kTSrk7u8AZGc7v+4/vfe3VvceVD5RPlU+UD4RTnfUX
+T568SFZ33qmcgRPzIBzDzleQ37aDD+tVfEXaDX669v62NX5tIZuCkNU6sb9BhMTcc7ry4qs3
++uCr3gepXgesOBvkYPKJ7yzV9bOeE9ao9nYuyQunuPxe5yvnLuCGY9+LnO5Vz2y2oma1nhnk
+l0qCbOb+rFDdq57p/eoY3uPUMgZ7J3FnlC5MzpzBWLl6Bg6XC5SVyhvK60oTbhBylDbQzadK
+G56Eg3EInrRduUPZSqsveDsuod/MUQxw9T2liNXo9cgPTbCH6jkNMr1s0DQJL6HDhufMWrMg
+TjNirQFlmVnF/lyatacmxg7Qdr3ZYrfkWYotNRa1eB8gen9/ohbxn/xF1i0VOaySv+b3R7Y4
+HhEHfs7wB9gav5bVc/zRKHt/3GymJR2rWdJyPK3ojLPQkg4rIPjK9uyXSXa9ny3CNs52t+1Z
+m8AQsIp3YyPpz1z4wRDs8AZl7ebNa5WR+M0rVDtXlLeFpK5fP9S04qGdZ997/+OuXaqt86th
+fT2tJonNPNeMlmib+Z9LAtZpCFi+QY3nR6llsGiVvD/CCJ7K6pXe6y2yryuYO9aVxn3TOZaW
+I7N2d51Vfw81Gug3AB7Q4/H2LMEiakTeQngN/RB4zGGIHHCss8BIyaKTMP3QSwB+dBY4EGZI
+Gh7zWsDYnLcFkNjggwR+3vMdOwr6UJAXHIjq76eOWnxnvpsd+a5H4Q9LPC8F8zZpgHQrf4s0
+nZ+hmSmVSfPwQn6epk5ayy+VHuG38Zs0D0kPSjvx0/yz/A7Nk1KrFCoRXoAzrj6Y2ASbLlgf
+TwYIsbpBetk4CqeREcJQDf3NSLIxm2QJmbrJertxFkXr3CwyA3L+LMj5RbpZ+jyj27gANxof
+xRs1e/B2zT7jr40fGK8ak+hXBhz94Qf7DQjvVO7Bu08rB5WDp/HzSu1pHI/j+eKuD7pewW3K
+JG4yF6jci9fBHlxtUcpYPNOjDLu/nkOaZmEfWmIAFJSG1R3uE9vOqd/jdtIgxGKc0W7MMxYb
+1xm3GVmMM/ts+623T5ydOm5FNQS8DcpXl3a3qPV1dDWD28/i5xB7AAqGXeaCCSIZ3Da0hOcQ
+JklH2RLX4VTIX5x2d9c3u4VTf6tScw2td6YCLR1qsIdrLJQWNaIMDUe/3hJErOFC+eEaEENS
+v9lK8254Wi/gwQBHhJ7ml+Th3EjNJG6ipoIr0yzmNHC+gtwSLMIZSpyBZ4ouXCE2iMvxA2Iz
+3ixu05sZ7qUHzEj2NZWZazmqXOyaexTyRQT/0eXB/EdXIrx+NBf4FFCs3UCdiMehZBTi6e+q
+aFQ9By6rS9bkaRaTxTzPQgR1nLe5/+q8G9R3ardX1rnst4pf2gfeHG+hZ31wC6TuC7dSbgq3
+4BAB0j8UwGGe0wHiGigM1I7ghgtDtRO5LMD907k53DxAXstoJUC7kXtUe56ziYQirxASpBEk
+QF/9CcVegzTD+eHCcHGYJtmQTtjvniiaNZTAeaFcmKOZL9QYVpPVws8Ala0zbCaPiY9pDpBf
+aF4nr2v+i/xe8xn5nP9M+JP4NflG+JuYQBHavRSi0a8DqYrf5rZiviuEBCt/7UqFXNq1ipvf
+NanzLPfrrlsQ+06D6rrDWwOX0Xh7dBBqlnTN1iW4Wfp5hEWv5fyDIgRkCg0UgkITdSjUykeq
+AfRd9nvCtO5Ylpa83y9K/amKGj67GxBHe32pEYk34AlPPvbYk8phPHjj+vUbFT3Hn7+8+L7m
+HcrFK12fcW91vd+0es1yrkwZ6669t2bnkedWPREgH3/4zT96a/aFwK8/5ODn7MN0Wg2RRIiC
+RLDwPMkQeWQjvK1ZF9BsXKLnBZFYgOdAkyAFBfGWcQFSqIFn+bnzKGXfogowhqYBa5q1z5HH
++7vQ/fZw9jXlQn8sIAELnEg0rIYQwAWSfjytPMVyA0icOEAzQDtAJ4cPx8O5LJzFlQv1fL0w
+33+luFJDK0ARs9lPK/v5R5NETHOKJVKmaulON2Rt+qKxJ07/cvLqBWfexm9i1Lmsa5XyUHPz
+Q9zhwAd/opTjxpaSrlXCqd//Ye1BblrXhaZly5azGIG4woV3zP5V291+Y/6CIrTs9+nHn964
+1vdbdYhaRZqdkJUR0vb8gB0hTZUS1vsn7df8xH0sfwKVcatB4/3QR3C1wLUFLif0bdV8jibw
+HehefjByk2g0AvrXwbVLCEBNZDI6KLQgD38eLeLS0Cv0Es+jt4QGBCc/eB6B9sG1nTuLnHC/
+Fa7VcC0Buu+J8egtvgzdK1iBBr0CoB2ADvKfoHu536IkcTUqon38YXSr5jgbs5dPRTPpPf8E
+OqjZDONhHe5OWO89tJ/OFXOQh0u7+h5/EvpMQP8wGs3debWF2w+ydcJ9PfSPg+t+uNZRG0NR
+tBKD/oBz8G78BredmMjLpJMv5/cKg4QSYa84QSwRH4DcukLzphZpE7QZ2id0Bt083QO6t6VA
+KV/6mfSVPkO/Uf+h4SvjWONvTCmmOtMf/Y6YR5rfsYwBbPOE5YJ1qLXWut/6sf92/zMBXEBR
+wAKbwea0XfDuxFg0FAkIeb+tf4TuHG/jAuGT/q4/GI/t3q+Hu/cOQ1562NvmYNyT3jaB/qe8
+bR7a+71tARnQS962CLHyLW+bRoOT3rYehaFz3rbR+hj2/UsQExrqv9XbNiO9/++8bQvi/d+H
+FTGvA4aS/T/ytjEKtFm8bQ5pbXHeNoH+JG+bh3amty2g/rY7vG0RBdg83rYWRdmavG09GmV7
+2ts2xo6ynfW2Tah8dJi3bUaBo5d72xakHf3oeHdNQ23FnPI6eWBpvJySnJwqlzTIGRV1nrpa
+l6MqQc6uLk2U0ysr5Xw6yiPnuzyu2nkuZ6J03dThdGqhY17VXHf1HDnDUX6TiRNccx1F9XJp
+uaN6jssjO2pdckW1XFNfUllRKjvdVY6Kat+YAke1J8PtvqfXba9mkavWU+GullMSU1PV7l4D
+ytzVsGodCFFeV1czKinJCf3z6hM97vraUleZu3aOK7HaVZfFhlEeqBTdgssDPS6XXOKqdM+P
+T5S/A8eJ8sTKhppyj1xRVeOurXM55bJad5WcXuua52XFtwbTUL2qod7LSFLP6iCZQ1ZZ61az
+NORb/0jXb8h33kv5mpUrPJJDrqt1OF1Vjtp7ZHfZtVQkKc9VW1XhYeqv8MjlrloXrDWn1lEN
+oieA7CAWTAONgZ4T5Dq37KhukGtgw2CCu6QONFYBKnDIpcC0BCPryl0+PZWWuqtqYDgdUFcO
+1EHLrmoPaC+KqSQqHog5ZYfH4y6tcMB6ktNdWl/lqq5z1FF+yioqYZMGUopsglzgLqubD+qP
+imec1Lpqat3O+lIXI+OsAMEqSurrXJQHqc+EBNjm0sp6J+VkfkVdubu+DpipqvAuRFeoVVUJ
+ZOs9MJ6KkyBXuajUEjMQT3lCrzUS6JpJ7lrZ44J9gNEVwKpX/GuWpswB2Rqq6DpJVR1baH45
+GNZ1E+g2lNXXVsOCLjbR6ZY97gTZU18y11VaR3uofGXuSjA2KlCpu9pZQeXwjJKkQiDnKHHP
+czEJVCtiDHQbQbW7DrbBo/bSXanpsQD1mewpd1RWSiUur9aADfASRx853dVgF7VylbvWdUOx
+5bqGGleZAxZKVJnq+7TK0QDeAtOdFWUV1NAclXVgetAAog6nk0muqo46qKMW+KqvdNRKdCGn
+y1Mxp5qxMUf1VZhELdRRCkQ8dIaPH8+1K1GSEizAFOaovDEB7xwfHz3UgL3qyga5opeZS1Sc
+Whf914dsLG14qCLpvvjcwwU256plk+a7a50eOarbD6Po2r4HUhR12yimMtiZHK+/lLjAkyjV
+etgDqpN57opuxlwL6sBjZEdNDbiXo6TSRR+osgNl2pB6NqXcUSeXOzxA0VXdRyfU6nqs2ynX
+Vzu9DPewKjHmVAm/bVc97krq1Wzb6CY55EoaPcBXfANrHKX3OOaAYOCH1W6Jmuo/ZlR9loKA
+BSy6KssoU5My5axpuYVywbSswhnp+ZlydoGclz+tKHtC5gQ5Kr0A7qMS5BnZhZOmTS+UYUR+
+em7hLHlalpyeO0uekp07IUHOnJmXn1lQIE3Ll7On5uVkZ0Jfdu74nOkTsnMnyhkwL3daoZyT
+PTW7EIgWTmNTvaSyMwsosamZ+eMnwW16RnZOduGsBCkruzAXaAJz+XK6nJeeX5g9fnpOer6c
+Nz0/b1pBJtCYAGRzs3Oz8mGVzKmZIAQQGj8tb1Z+9sRJhQkwqRA6E6TC/PQJmVPT86ckyEBs
+GoicL7MhicAl0JAzi+jkgknpOTlyRnZhQWF+ZvpUOpZqZ2LutKmZUta06bkT0guzp+XKGZkg
+SnpGTqbKG4gyPic9e2qCPCF9avpEKo5vETpMFadHHRKdMDEzNzM/PSdBLsjLHJ9NG6DH7PzM
+8YVsJOgeNJHD2B0/Lbcg87bp0AHjfEskSDMmZbIlQIB0+DueccbEzwVxKZ3CafmF3azMyC7I
+TJDT87ML6I5k5U8Ddul+TstiFjAd9Ek3L9fLL90j2ne9dcAoOtsr4ITM9BwgWEDZgA6pz1iw
+rswFpa6aOmrbXudWQyMLo2rsTGBWqwYBMOGJ1eC4ah9rQloCz2JZR41uPQmbpuMENfSy8AHW
+DZlIDb3OeS6IgB4aSty1kpsGk/kVHubpkAKr3GrOkz2OSlgMZlEvYqMgVjoqYZqnm80+DiX5
+kmFNbQVMmV9bUQfBRHbUQ29txUJvGq71pikmgdwjAV2lJzio/Ne6PDWQpSrmuSobEmFsLc1l
+jJOKasBqVV7RmfpK60b5oEKdPIcRd7rrJEB0ibIkMcT1g6HTd8WyPw4OklQcJH8fHCT14CD5
+e+Ig6Xoc5A3ypYySx5czbgBQewCL9EOwkuzDStJ/BlaS1H34p2ElSXXYH4SVpB8RK0k9WEn+
+nlhJ6oMLvgdWkm6GleTvjpWkXlipt/v2gUuQzyFI/FhwSfLCJfkHwSWpD7vs3PhjQyap2i3/
+YMgk/aiQSfJCJvn7QybpWsgkfx/IJN0QMsn/CGSSCtOLpk6eRtlOn/S90JHUI/kPQUeSDx3J
+PwQdSb3Rkfy90JF0Q3Qk/xB0RI21j6N0Ax/ppsBH/geAj/TtwEf+DsBHYsCnL3b4+4Cmzjfe
+zkCDlAgfid9auUqaX3FPRVIFRJAFiTXlNUneMHZN5QyNR25UgxpQLapAc1A5qkMyGohKUTx8
+pqBkeKVCqwRGyCgDxtQhD1y1yIUcqAolQG82qobxidBKR5XwklF+Ny0Pu3PBpwvmzIN3J4yU
+vsOqw7tXLYSV5sFa9L8gqYbRlA8HzPnHVpwArbkwrwjVw4hSGOtg1FxshoNJJAOVanivgTEl
+QLcCxskw3w2rO9iza+kUMCoe4MgNr3tu8vTGvUWMQw/QdbNVU4DPVHj1Hn1jCmVshiprnXcn
+qOx1wPkolAQvp3f8PBifCOPc8FkL0rjY3FomdyLQcMGcrF7UfHrw7cX1O06fUd262P64QEtu
+NB/G0t34cXRMKU2EJw0wppzNrIBnNYzvOrafVAO1bAa1AEp13jVauVaOHhuq72NDN5OG/gcP
+N5Jd3TMHtHpr7XprltCQH/CSvpOH/Ph+eeP97pG5Ap5IrFXHeqiVVTFd3wN9btiBv8cLlSyP
+0ati1Hqsv4LxVM6eubxyzWGrVHt3PcG77+puqaupNqbacwLjy812v5rNr/F6mLqCG6jWeW2s
+wmsFDkZD1bTkpVnHuLjWnkrZOGqHKnUfBTpa5V21ZRfzV9X2onpZSRTbOTrXyT49jK9SmOPw
+yicxLygFC61iVOrYE59+yqBV6fWkgd089qxA4wrlvw7sV7V+umKPTmhPDfMaJ6xQymb7uHEy
+CeqYrZXA0zr2VF1D+pYVErzeXAqc1TMqqk7mMxsoZ1GnzquZKtbXWyKfDLV9rFLltp7pMKHX
+7tB2FdtPda+lXhHEA7MTbiJHQrecSSyCyIyy6g8q7QqvVvvu/rdL7dOcym1Nt0XXMb56rK5H
+ovlMH1XfaQWfN5SxqF3tldDVa0Une6drJLBPqom5MKKU0VPH+PaP2nGlN7L5dqiUre1kHFd4
+OR3FvLPQy50DKLpZZOjZg96xqEcD10eCahhf5/UGT5+xPl/p0VjvGNB7nsxkdjDOJRab+9qa
+qg01lzi+ZT/dLMvJ3r2vYp898eO77EUdy0Q0czq8EiX20dS3zaU6afDmFnV1qvMyxqPTa0mV
+zE5ru3tUTqlOnb32vLfV+TKog2XEChYzKtmd1C2Rk3FK96u6lzbm9Mmr6kq+GOpg1qParm+N
+a/Xj+bsy+biUvBL0WJiD7dF356DvOtfq40a8JXj3u5LNq7hJNJe6d6eWxVkHiys9dH09nm6L
+9PnLtdnD5Y1zLiaFb6X5TConmx91g3wY1S33tTMkeObLtlG9rEz1mZxr8ksJ83d3L17rvX7g
+s5N58LTiBhpzoQVMz9VeT66Bl5q9HCyiurpn9N53lWdfj3RDTylnEV5mnx4vjy5mSTezE1+s
+u1HsdrJMUM32vbe+bqRVqZfmeu/h9/VVD4uavlzd420+T6LIobIbe9R6Z/SlWMMs+h54n+Pd
+MTUfUquSuqPqPzNS3VyqEq+P1HnzYVm3piahTLbONJQLd3SdaXBXiGYAjsxnz7KhTwYclw9P
+iuBuAvROYPuSzp7Q51HMG2dAm1KchqYzWiqNfHintGdBD6Uts3t6NwXG5wItOjcTzWRrZAK1
+AuBsGrQp7anQmwOfmd5xdMZ46JkO97Q9EVEUqq6XC7MKme/QeZQXldNC6O9ZtS9X2WxFH2dT
+4S4f6E/yPk0H2tmMHuU/geEj2s718qlqLp9RpzqilCnN8cBRDrujvdPhMw/GFTB9pjOZVW5z
+mQxZ8FyVJZNxoO6EytF4+MyDtemIicBXIdMCXanQOzKB7SOVZwKbT1edwkapnE3z7jJt91BJ
+9OpS5YPqv6h75QImfw68ZCZ/IfQUsr1JB/o+uj7bmcgoUL4lpo3pTL50podpbIUMNo5qkeoz
+p9vi8nvtynimL7pvlPMJbKV0ppGCG0rio9Z7d25kHVL3ChOZfJlMUzlsdAHoMRPGZ3f3qPaY
+zWQd79W1SlO1e9UmcnppdzyTke7sbbBqptem0pnu+kpB92kG479HCnUH0r3v43vprGf3c727
+6+OnkK1ceAOtzGC+mMlGpbO9Luj2kSzmv1O9nE/vtrCeGDDda5/Tujnrq1+fH/nGfZfYodLy
+rd13Bycwe8rxcljQrQ11hPQtdNXYlQl5rZSdc+q643bfzN0bNfag0d64M6FXrO2NBNQoPJGN
+rbpmXE+velpSc1bPWac3drvRCdt3OlaxvA/19qAPNXarZ6LeqNfJ8LmKAT3dqMTNcKC7G5nM
+Z097cnqNt3bi7nPOoys7WO5P6F7Ll4t6aKm40sHQAl3NcwNt3jxDSdedDGtYvldXmc/adV5k
+QuWr946l/QuvOQ376j/X74F8wz3wyXIj5NBb/7Vsv2u8Z6kKpmGKJxO9dGuR71zWoxOqAbWu
+VnXNrvdYH6U2Cl1bVaA6mNOLcyfTtYTUGh1dU2Lxylfj+vdXnX7suux/Uj1I6lMPuhZ5/fPq
+QdIN60Hyv7geJH2nelBfJF/ai6eeWodv5HeroN6owiL92+pK8nV1Jen/15V61ZV6Kgz/O+tK
+Up8M+++rK0k3OK39J9SVpBvWlXok+tfUlaRvqRf8a+pKEvpH60o93zr9mHWlHn/rW1e6Wfa9
+eXVJPZ+rSOI/rbokob7VpRtXN/411SXpW7Qr99Lgf3aVSWI2dj2a+ddXmaT/4CqTdE2Vqees
++6+sMkl/t8ok/8uqTNI/UGWS/2lVJonpoAioTmbcqtpOh+f/utqRdMM9/3fVjqTrakfyv612
+JN20dtRTA/rn146kf6B29G10/7m1I19kvXlGub7iI32Pik/vKs2PWfGRflDF5/oz2/er+Ei9
+Kj7fVnf4MSo0ddfRt6OeSoPE1qF3iT/gN1dJTC/3wJXEeHMy1JTI8GsN9PVFY9/+mzP2b5bV
+f7v+E3Q7usGfNm6x/eoVhVwOIH+LJd+kkK9byF9N5C8KuaSQ/4klX5nIf7eQi7HkywfShS8V
+cqGF/LmFdFwmX1wmf1LI56PIZxnkvEI+TSGfnCsQPmkh52DguQJy9uMk4exl8nES+UghHyrk
+gxTyfwLI+y3kjELes5I/3k9OHyJ/UMjvYfjv7yen3p0onLqfvDuRnPxdiHBSIb8LIb9VyG8U
+8muF/EohJ1rIO8fDhXcUcjycvJ1C3lLIG8stwhuh5PVAclQhrynkVYW8opAjCvmlQl5WyEsK
+OayQQwo5aCHtK2KFdoW0vXhIaFPIiwdmCy8eIi8u5g/8IlY4MNt+lRyw87+IJS8o5PkWsl8h
+zylkn0KeVcheJ/m5iTyzJ1Z4xkn27LYKe2LJbit5Gph++jLZpZCnFLJTITusZLtCnnzCJDyZ
+Qp4wkcedpBWGtLaQbQrZ+phB2KqQxwxky6NBwhYneXSzWXg0iGw2k0ck8rBCNrUYhU0KaTGS
+ZpjU3EI2bjAJGweSDSby0GWy/sFDwnqFPLhutvDgIfLgYn7dz2KFdbPJOjv/s1iyViFrVicK
+axSyOpE8AGI+kE5WrdQLqwLISj1pgo4mJ1kBmloRS5ZbyE8VsmypRVimkKUWskQhixXSqBD7
+1Z/cf7/wE4Xcfz+5z0kWFdqERbFkoUIaFLLAROYbyDyJ1Cuk7jLxXCa1l8m9l0mNQtwKqVZI
+ZSS5RyFzLRnC3AJSoZDy+8kcuClTiEshToWUKqREIY5RpPgyuctAZivkDoXcrpBZMyVh1mUy
+UyIzAoOEGSmkSCHTYeXpGaTQRgqwWSjoT/IDyG2T/YXbFJKnJ9MUkjvVLOQqZKqZ5ChkCjyZ
+opDJ2WZhsj/JDjMK2WYyyUgmKiSrhWS2kAkKGc8NEcZfJhmHSPoUYlfIOIWMvdUqjA0gt47x
+E261kjGjjcIY+1U/MtpIRikkTSEjRwQIIy+TEcPNwogAMnyYXhhuJsP0ZGg4STWSlFv0QopC
+btGT5CS9kGwkSXqSOEQnJJrJEB1JSCGDB8UKg51kULxVGBRL4q1kYFysMDCdxMWSAbF6YYAf
+idWTGIVEKyTKj0SCnJFWIjtJxGUSDiKEO0mYkYSCBkMVEnKZBGeQILgJUkh/J+kHmuqnkECY
+FBhEbAoJUIi/QqwwwKoQC8hqySDm+4mfk5gUYjQECkaFGGC0IZDoFSKZiU4hWhimVYgmgIhO
+wsNDHizARqCXKISDe24IwWaCFILbsHP5Wjz4f8Mf9O9m4Fv/hP1faARn5gplbmRzdHJlYW0K
+ZW5kb2JqCgoxNyAwIG9iagoxNDYyNgplbmRvYmoKCjE4IDAgb2JqCjw8L1R5cGUvRm9udERl
+c2NyaXB0b3IvRm9udE5hbWUvREFBQUFBK0RlamFWdVNhbnMKL0ZsYWdzIDQKL0ZvbnRCQm94
+Wy0xMDIwIC00MTUgMTY3OSAxMTY2XS9JdGFsaWNBbmdsZSAwCi9Bc2NlbnQgOTI4Ci9EZXNj
+ZW50IC0yMzUKL0NhcEhlaWdodCAxMTY2Ci9TdGVtViA4MAovRm9udEZpbGUyIDE2IDAgUgo+
+PgplbmRvYmoKCjE5IDAgb2JqCjw8L0xlbmd0aCA0ODYvRmlsdGVyL0ZsYXRlRGVjb2RlPj4K
+c3RyZWFtCnicXZPNjpswFIX3PIWX08UI/IOZkaJImWQiZdEfNdMHIOCkSA0ghyzy9vW5x22l
+LhJ9hnPN5wu33B52h3FYym9x6o5hUedh7GO4TffYBXUKl2EstFH90C15Jf/dtZ2LMtUeH7cl
+XA/jeVqtivJ7undb4kM9bfrpFD4V5dfYhziMF/X0Y3tM6+N9nn+FaxgXVRXrterDOe3zuZ2/
+tNdQStXzoU+3h+XxnEr+BT4ec1BG1poq3dSH29x2IbbjJRSrqlqr1X6/LsLY/3fP55LTufvZ
+xhTVKVpVplonNsJWgy3ZgB3ZgmuyA3vWbsGNcN2AX4R9DX4VbqR2Q5baN+7jwVuy1O64j+Tf
+mReHvbDDdV1xf3hq+ns4aPr7VzD93Q5Mfyf57I/z6uz/Aqa/kVr6G6mlv8VZNP2t5LO/5Olv
+3sH0dzijpr8XZ/p71Jrsj7zJ/ji7oX8DN0N/vwfT36NXhv6N5Onv8SxD/0Yyuf/wN7n/8De5
+/xsw/Rv4G/r7NzD9jeTpX8ueuf/IW/rXyNjsj3dk6e/gbLM/nmXpX+Nclv5OaunfoCeW/k7y
+uf+yD/0demXp7/CuLf0dnC39nTjk78fIx5+/cowB5vTPeKnuHmMaLRlmmSlM0zCGv/M+TzOq
+5PcbeW76GwplbmRzdHJlYW0KZW5kb2JqCgoyMCAwIG9iago8PC9UeXBlL0ZvbnQvU3VidHlw
+ZS9UcnVlVHlwZS9CYXNlRm9udC9EQUFBQUErRGVqYVZ1U2FucwovRmlyc3RDaGFyIDAKL0xh
+c3RDaGFyIDYxCi9XaWR0aHNbNjAwIDMxNyA2MzYgNjM2IDYzNiA2MzYgMzE3IDk4OCA2MTUg
+NTIwIDM5MiA2MzYgNjM2IDYzNCA0MTEgNjk4CjYxMiAyNzcgMjc3IDg2MiA2ODQgNjM2IDM5
+MCAzOTAgMzYwIDYzNiA2MzYgNjM2IDMxNyA3NzAgNTQ5IDYzMwo2MzMgNjM0IDYzNCA2MTEg
+MzUyIDgxNyA2MzQgNTkxIDk3NCA2MzMgNTI0IDU5MSA1NzkgOTUwIDY4NCAyOTQKNzMxIDYz
+NCA3ODcgMjc3IDYwMyA2MzEgNTkxIDI5NCAzMzYgNzQ4IDU1NyA2NTUgNjg2IDY5NCBdCi9G
+b250RGVzY3JpcHRvciAxOCAwIFIKL1RvVW5pY29kZSAxOSAwIFIKPj4KZW5kb2JqCgoyMSAw
+IG9iago8PC9MZW5ndGggMjIgMCBSL0ZpbHRlci9GbGF0ZURlY29kZS9MZW5ndGgxIDI3MjQ0
+Pj4Kc3RyZWFtCnic7X0LeBTV2fA5c2ZmZ2cv2U2yuV8mgQUiIQnhZrjIBhJCICQxBAQBzSa7
+IcEku2Y3YEQE2npt+aRVEfACKEVExTTwKSAqKm0VVLAFW29FW7StRvTzp15iMvzvOTOb3UBQ
+qtb2/54/w86cOZf3vPf3Pe+uj8HWNi8yo1WIIFdds9s/zKh+ihB6CSEcXbc0qBjH7vkc2u8g
+xFXX+xc39/rQLIT40TDnkcVN7fVTE4/9FN5hPF1p8Lo98/Nn5SE0GIbR2AboKFNbDPB+MbwP
+bmgOXvNJQsdr0FwI73uafHXu+zqnPIKQMxber2h2X+NfSyYL8B6Ed6XF3eyN/6jkMni/A6FJ
+Vr8vELwcrT6DUO1WOu5v9foXbKrthveDCBkehD4MF/0zQ1Ok7xzhBdEgGWWT2WKNstmjY2Id
+cfEJiUnJKalp6UpG5qDBziFDh2VdNDx7BPpf+Ifr8Shcj/ajv0N7ErofdZN0xMFVD730+Qiu
+Rl0wXgszV/M34Gp4NvNbEQfjK/mXAQSHR6FadDW0nPxWvB/tQ+/B6tV4jTBduJzOZhtRWJ8J
+z+NPhAKuAM3jm/lJfCe/mu+EGW18Pb8adcC9gHuVv4dfzh/hl6N5FDNcRj8UD7QRz8CD0EZu
+Iy7CibiIexk9y/CfjDfiCcJh4TA6jo7jSpj5CFrGyfi3+FOci+fhTlj1GfoMp8PbGG4MPoX/
+ChivR6+SeYKMNqLbcDS87UcvA97voU9RgAeo6DbhODdcOI6eR++iP0A/QkswB/dUMkI4Dtcn
+aDtaApx5F3PCcTHWkMHXc1+gLvxjbhv3BR6EObiicTpw8wryMl/D/5a/BUaBO6Byo0g6mQL3
+hXSGcBxvBCzeFetxO8yj13LYp4t7ntsDND6N3ga6YHduIbec24jexjvxPsAYoRvwTr7GUMsn
+o43iRn4eOkV5g17lXgZ+VDJ+/BT9VByJPuNF9AkpwzX8dsox5BSeBTPIMMwQo9E6PMPwY6AE
+kXFoOaJW9iJGwrPaBbMkMRWt44eS+wB3jlsR4htuRy9zBaQW3cOu2/EedDvagwIIQJAhTxhE
+gSccRtmKrYNzlno6XJfOU16YnzEi+6xXxWZQOlBlh6Vd2XPmTOU8PlmY3yGkdBCn1ME7B717
+vsF3R2TPrJyn7MHDiot0sMU1RdA5ex406Rt0Q39xERuju3YITvhXWtOh1DUot9puHTT+Vpt3
+/Aiq6eo6vl7YCh7OgNL3Ix4PATaIeMjjWBJu4XiUe/BY10hkO9Z1rCsvxp5hd2bYM+p51BMg
+yT3vqesM1i8+bRWzNB3fDysRaI2EUtBNrvzkJC4lMTUuPi4hNT4+zpkYJ8egnUZxp3lNvBwX
+k0BsKYki4i0GEhdvMxriTCTV1tOVf+xgl70gvsAeXzAS5U48DfsWRBcU5AFxBpvwEf3A0PzM
+zoQUjBe50pMTkhOTkpKTk1LGOsbGFTuK4+Y65sZVpnkd3riatKhFOH/smNFDhuNEDhBXeEes
+aEjD8TEZJAcP4k60Nza236+u5MrwUBxz29qKFa5X1frHx119BZl8+eL6eepq9bPew8Lx37x2
+x9MjoleuVufhgL+K0Qp+mYsWYxnfslxW8W20i3+AE7CFRzbJ1jOxKx/Q7zrdlecyVhprjH7j
+KiOPF8UAEvR6BNerG+mHr/lqsxirvkWdEZp35i/8GND/RDTOlYRewsd460uWY/IWO78l/pB9
+fZJhigXFTkiy9RzMpzI5ebrLpp4+ZfvHqbzdVyavTObwImwHsjJFR2zcqPyx4+xWPEhBdhvK
+yI/jx5TeXrHuwQfXVd/lqn70MvVVdQeei3PnPcxPUt/Kz3vs3nsfyx+pvpmejsdhB1zj0pmD
+pHQKlM54NMaVAMRh+c3oo45DtgesmLOgErvFEmVLoHI73UXl1XX6JIgP5LW7JnFVIsMoY4x9
+9JChGl6M+kvwqPw4IVpdb7E5puf4V1FOXPp4y3Mvcjt65/rwhttbkgYNfXRD7+tibO/22kWn
+GL8pb34NvJGRE93rusgoosR0E/pd/BFxk/WoXXkp/XDKpkHAJDMaFE8SLEaLaVI6scROGAK4
+HTzdlZ9PsQIMT57uAba9f+qzU6BW9uiCPFdZ7tBJyqSMyUNnKbMyFimLMlqUlozrlesz/EN/
+pvws417l3oxHlUcznlKeynDkp+WlT01zpc9Oq0yvS6tJvyFtVfrtaWvT70/bnN6Z1pFuWwQU
+h/g/CTuBeJBB5pAxowdnjAI9BB4YKP0Kz93vv3rBpd5bcaN61/Tdq3e+jqNw5u9v/K/Ab+YE
+/hYEZ23BX5TNKJr18+asm3pXb6tfdPj+X+9JmVORk4PtKakfh2RDuoAndtCXOLvVKBoQOWC6
+w3rIuMsgixYk2aJtPTM7Yqrn7UXSmQMXzz/ItPLk6ZM9B+2MeBwWi4OJJZ505S7KvfVOKpPi
+XSuiLxpGcuMcv/plbw9fs6fFSwQqi4Vn/iJYQSdsYOcXu5Ljt6CjVvsW4ai03noIP0BieWTh
+XElTTBOoQVPeU1OAXbtsJ0FVK9Jq0jTF0LlDNRS2JsxSNe0l23CDun5GZ9sR9TMsHwnuuj/Q
+3h5obW8n+7l5X3bdX7cQl2ICV+minhe3b968nX6Ynsjgg4aCDzJAS3W5UKooGFJFUZBTJVkQ
+BSNtc6k8wfCRUglP5FSjzPPEKfNop8SvETnZKBkEHhy4USQm27HOdIIXHdS80cljXdG6K5KY
+KzJo/5hj6uuZn4ldqxLkXHmuXC+vRCvxSmmlMSjfKm+Sn4HrCFwnZFu0lGJMNzuli4yKuZSf
+JpRI043zyHx+rnCZ2EAawSkvFmvMQbQcX8u3CculoPEW/kbhRukW4wZ+nXCntNH4uLTXeBj9
+Gv+aO2x4TnrZ+Dp6Db/GvW44Lr1hzF2EFuEMkoHZRfhpvduuVFdwWfgwl6Wu6N2ON7yEbeon
+wvHu4ZyTq4qwddCns21918C2fvKbbd3xDbZ+989Dts7XbNVMXbN1QeZpRE5GU10ZyPFHbHxJ
+OiZsMuM/JGyKPmRen5Ls4CSHBRVxlqgJKUzLDoI+a07xJPOKpwCv3NTJqRQvR0Ya7u8QFSRo
+1ijIPU9a7vnZ1R+tWKmuVI+qj+GZOBNLeJK6dllNw49s3Kj666+fWqR25Y3EY3A85Czj1edu
+r1/R1qLxbAn4pVrAdSh6y+WymDmraWxaehrLqgVeHpuenuaUTWnpvIP589iXHMcSNtn5TU5w
+VcPSZFN6sgHNTq6yxhoqM2cNo77qWNdJoIQ5K83D/4N6+Oh4Xe+sNPzpD4iCkolGwSuMRqNs
+NJnMJosxShiUZE6yJFkTorKlHGOOnGPKMedYspQCaYJxgjzBNN483jLTOEOeYZphnm5ZZl5m
+2SftM+6T95n2mfdZnFbRarBKVqNVtpjGWSZnXZllpLrUF1jSMR/niOUzMocMtTOugtHmgh8Z
+M3osiJqPD7x2ZX3dTPdkHPO0+oXa7ftoxVXvBhuXlDZP/vjA6Z66NyDefJKXN2rM8ByTcdDm
+h3ftHjQI20aPHl+Ql2uR0u7/ZecjaSEdGAp8NYE2jnDFiFui0Rbzoej1CcYpUWVkimMCVcSe
+UBg8lff4uJjJiSUxJML/AmIkJG24c88uW7FiWdt117WBSRSrT6on1D+pe3EJWf7wli0P0w9G
+6gtqF1wv4ItxLFwXazKuB1wWQs6biCa4ksw2I4ojFlti3E5i22m8h6xPihlhRuLw/nH5oO3X
+di3A7M5NvpLGZmdENI5n7OQcsdFULYWFS95fof5ULcO7cduK95dcdTTwSlfXK4GjV1WNuxhv
+wV7I87dcPE49XFqkfvG3v6pfFJUyOwG8xHrAi/IoH3i0MxrtNN9DeTQiahwZ4Rh+Fo9cJpQY
+H2NLzE2cnChQRmkIRI8ZzUUyitR3PPdcx6+ee+5XuAGvV8ERqxvUxXgD/7ra0/Wh2oP5D7sw
+j+NVj3qnuk714HvwEnwVvkfLi4BXV0BsMGmxQdxiPhqFtjjWRx1KfiDhaCKZEu1KMBstSTaW
+7Gme5GTXSRaT+2KDMzIUUBdC0YIwOtQBPoUgGgsCy5cvn7G77QiW1c+OtO2eQR3LX2kUeGjT
+poe447WL1CfUXrieWFR7vxjL/MqZ/eo0lrOZUBSa5Eo0cciwSbBC5ia8YX7AJkiiBVvMyGZj
+6dtBZoEMs1Pg5WgeZ6+x++2r7FoeFysOx2Oolun53B9f/tUl9WV6Trf73Y8+XHiTiGhih8GL
+IbJVuA/FoGZXklWQosgWO94lbUGyZDJyRgiXtmhrdSyN1VHVMzts1QtmdtjpLbp6AYRuK3Jd
+PH/iwZ6JBw9GsxzmYNdpQJAihV0Jk9HkGHq8JFG2KHslV0kqHTVcDdGMlqZbsXEToAE5iH2Q
+fZSdG4WvVm+7ZOEe9eVjv+rsFO5TnzuDVGf5uDPoV8fwm3DquYTpPKR/QiJfAwn9711DSSoP
+ETEVDnv0QTgRTgipEGidHEEnIKrCcUfgkcF2bPcmWMjp4bIrPyJtl/oiJA2P19ETsQ0uhcvj
+XNxcrp5bxa3lNnMd+nUArqNwvcOuT+BKFOCsbSEyeNIYnEKS+CFoMB5OsvixaDQuIAV8njQN
+TcOlpJSvka4Rb8I3k5uEm8V1cMrbQDbwdwobxe3kcbyXDAbOxGQYaVxMB8OKx3F4sVqiLuNr
+erqJ+NVmzebhLMO/C3mECeW5YvkD4tPcAbRGOiBjwQgHFkTM2lnloJblQ57/uM1SafFbSDjJ
+p9d+Pqq3lVvcu4Hb+tWbwnH1bfUD+OxQ36Z7bAZbEYHH1K8kRxGEzW/GHo1fb8O7okUOxURZ
+7CUQd21JWhbF4lvuyfxw1E1eRf0KnMocsWDJcfGaO+7Lq4Zsxg2c1R5XAnGX6uWl/9383GG8
+m3vEv0D9KOemZcmDhjyygcv6avP9LPLiiDNN2hPoAeA2svE26j9y2TFGqBH8wipBP8awI4wY
++2WXxq/bgZYR4IuGogddFyEnH5tg1+Iefp53PJ+w087vdN4TjnnJiRDyEjOH2d6iEe9g/4j3
+nu09iG66+3RV+7NwQWpBWkF6gTIjbUb6DGWevCh1YdoV6Vcol2csSfGl+tJ86Q2KD9L2oClo
+DlquS79OuS5jneku891pG9PvUTZmbDNtM2+z7EjdkbYjfYeyI2PYItwvpKVhFtIGD7XH8ZEh
+bXBGPs8fXv5Bw60/md+29cvfqW+qv/8v9c+33YZN111/44Kb73znCFawdTnmhW3qwXEXl1VO
+nJqQkf/S/s//Z+wYXFw2q7p8WllaRt7vOk984mR82oGQYTfENSdqdGUlO6KNvAEpoiEh6k3l
+6CByKG1XSowBxUabJYs4PdYSPT092ZJqG6K5BvAFqdQX9Eykbr1AU4iJkIdNPEndgZ0emsEl
+RKUPzRtaOdQ/dNXQtUMfG2pYhFkW5mBHr9AhJMOuOdhwlsbvK3rS/+whdT3G08rrfZy63lW1
+2A+vDVMeXhzsJNsamk/9pXcuN92SkrTsqu2bet/gpu+76qF7We52ZY1f04NEdRrkkDUoCo91
+TY1KRVECbzJbiDUVXMfZbiQKZoEbiXJaZc4mIHmT9AZBu2xRVpNRoj4FPKPNdmxmh1zNXOHM
+jljmDxHlAXMxNrAGMAZQlAE9Df1AsiQxl7M17HJcXCXn5YLcjeB07mBuZ3eE2zmmu50EHhuJ
+IIB7MwhSHHYIDtFhGCwMFgcbxqAx+GIyVhxrKLAWRBWjYjyDzOCLhWJxMecVb+QgTxdvttxs
+vYtbJ6wTN1g2WLdzO8gO/iHrQ1H/jfeTPXyHsUN+xrTXstf6AnfYctj6YtRr3HtcQZ9rsmIt
+ukzGieCjRoBbrlezSp66+4h/wex4ma/plbgvvhr75J0fjp+ZHvJXhgLwV2b0imsUGWuQDNxY
+zEn0QThIDvFYWTY6ZQN4bImgZ02CUaJeWxZH8vJIBPlMT9exLr3oAsHPHn8e390ZRWjGWW/k
+oqQoYzrnMKRL6UaHPJybzE3nKrgyQ5l8GTffMF9u4HwGn3wnt1Zaa3yI6zB0yEk85gmyxuFE
+YrNehJ1kPB5DKrCLlEhzpfnGSmsDXky80hJjjfUG6VbjXVJCiB+gpXgQRLH9+ANcjefiv6t3
+qNtPq9vV24XjPe+S9O7hfFHPm8T51X6Wg6hzhSvAxuj5dIIrNXw+PWRdj/9EdqXC2dTFTqkR
+WYjt5Mmzj6jOPuPQ84+YiNSSi6YpR0QKshVSkgCkJvf37hblrREJCBlHcxJ2QsWoQ/2U8GI0
+sqB0VxTaanjAasC8hEx23ma19UAGyUI8YJWHM4ZwY0ZHj8sQaZpGePUPG35x+3qctWrVSvXT
+z/FTb76Jn/3HR+qEt99Wx2u29yoQX4B/DP7b/gTazmGIIX3+m7rsV+mhGv9YXQFzt6qfcl8w
+PFJcFrRVfMBqMch2ERGr7RiksSEkYsbS7HBoRlw0xBjD1lXwh7PW3/6LDeqnp/Bv3n4b//qj
+f6iT33xTnfq5hgOcv4Ul7Pw9ymUVadDkwVTi0MWCFDJlK7NigVoxy05zIbjl4U6XMRw6ZaFG
+tcN5zEZD5lflfGdIx8WrAbaMVrtiJIEjoMhGUcC8KGEIySYtJNt1HQYNds2NE+JEm3kimWAo
+IzMNC8g8YZHBRxbTs7XYYKgxryTXGFYa/OYb+BvFHYb4oVw+N0Gaws2Uqrn5wjzpSqmGqxea
+JT93DRzBV0q3Cmukh6WYRQxTzCyVKuVqbjh+pnckSVTTeneqK4XjvSe4jN5JPae4st7dGl+m
+g32mgl804x+5ZoipYJ8CeEOwT3m0SQa3aBwNTtEEiTgnjzbKhHDUQZphOjhIs1MGYkXItUyS
+2SQbJa3CbDJA4qjz1ETdoznsHl8KWXL+wIY8UFL2vkNW5DHcGCFPLpFdcF0pN8krZeYZBbhk
+8I7Cq/JRGbyj8LEcH8fFklg+WrCJNgATbYyV40xD8GBuuJAlXiQNNw42Oc25VuorR3MThPHi
+eMM46WLzZGsJV0qm8dNpxcM8n8zl50oLjNWm+eYrrfVcDV8r1Ig1hhrJI9eY2jg/HxD8ot/g
+l4Ky3wRJnfgT6Rbjjaafmm+z3iHdbV5r3cY9RLbxDwm/lB4ybjPtMEOKJz4u7TX/Bh8kh/gX
+xePc6+QP/BvCe9Lfje+bPjAvYD4lGdN/OMOEM6bjhfufwsPhs1B9XW1/ar/aDqlgD+F7ea7n
+q82E61FpzQvimpVvB48yDM10DUmBdM3xUtyxxE3RqXDEMR6y7Bq0JfoNdJQMMSOL1eVQpogT
+skK1R5q3ndQqYHCcp8kO+JiLai7ST4WZaMxoWgGLH5NBD2HhkzWJPMpum9HZ9rJ6Gptfbuuc
+AZb8sLq/8WDdFbsXdGzt8l13TcB/3XVP1y7EU7u/woUL67b12NVP1b8oGTh+7JiNW4m4dd3G
+TVvvXLdVr9MXsDp9PMpxOdAB4xp8IE7i4mQkjLDloDgj0U6Odi0rY3XszspETJMmDZtBOEPh
+4zWvIPJZmJt0a9eXX3zU+w+8Dhz0rGWN9fWN16gdcC3hO3uu/uDEn/6GB7mDXvWLBx9SP/cG
+3aEzBsQyZMLtrmlyqgmZjKmSEdGHbBQNopRqAOCp9ICRCvpPHxA/MIIUAiOnEQyC5/EJ2cBa
+WDBgkzlkD1H68SmUM5hYznDsYF+Eu3CzeAOOVkYbSTcqJNc4ikw0TiVlxiqy0FhLmowBcq1x
+NVlF1hhvM96F1pK15C7xHuMm42bymLGD0OsZI70OkAPkiPGI8Sg5Sk4YTxjfIe+Qj40fGz9H
+n5DPxTPGfDB23iwROYZL4VOkGDndAobED5cGy2A8/ARptJxnKeJm8jOlItlnuRGt4m7jbxFv
+k1bJd6E7uY38BnGjtE5+UOzgnuGfkaitHuGPwHnlD+god4L/o3hCOir/Fb3Dfcz/TfxYekf+
+En0mjgdTMDJDMDJLwL9Vm/Dy9/6Gl8Nzu3pDz5fqDdwkbpC6G5f1nuh9Fteq98FRluqPcAvT
+HztSUKXLGY32Rj0t7k1aY9ybICIDiU4zRxkTknk4KaWZ4xw2Q1wiyWDeWUsytNS+IHR2oodr
+lGnLzM2szITTRegrG3tMqKHl51lY/waHRC+44ooFx/8cbAu2/Zmbft3N6lvqa72ruSl4HI6v
+J7dXls+6VD3YG6itc7vVdi5x8HNr/nhMOL7/SPMG5ovRmSlcF+BPUMwTHAQoDmGSq533T7+U
+h0fhQZz1T73/87Zw/MtmFnfgbPM8zLdDTIu3mySOR8IB63ojWhMtxckFNPZE91VaaEYKyvW4
+K8YfsylGOw5qNmzP0EssEDDab7m1Ha9Wn1P3qU+qz0ESs3rvpk17ycqe1erz6iE8Fk/S7JTx
+WUYxaKQrzrzTYNqJ1hhjLAYs2UbwJgk2jtXYGrJU+n1ZXidyYLovZRafMcie0We1+7mVOBWP
+VI+of1HVlXj1cf+11/ohXH3wYW9vN/+0emWzx9NEeXQGjnXCCSbjO13Dzk7cJSTRuCTR8/+z
+ImfgxwtxaLzBSK3PCNZnoYYXxQzPoIf56G+oCGQjlpo7BaeUxxL0Ggg7MjgkOEEmESe+iIzB
+40meXCH7ZBPoLdGDrz0W/xI8TjXe1vtbFnm7uNiezb0/5dr6zvHCZ0CHEV3nSjWMpd9MjwXX
+4qSJ8LOSIGIDN5I3QAYsaxlwge4fQl858h/RD817DRgtco2WRWRKFC/GJXiGOBfPFytNi3GD
+WGPahx8XrYlckuESbpShFBJhl2EOd7mhnms0mFi6wIoxLFvYyaXjZrWq912WvSIeQfaKevTf
+CbwHt3LwifR7xRSXlduOdvHbIccBnYvp971iKFV6j36DRD98jbpC3QbJHaN7KBjqGjjLx6BL
+XSk2AZulLSLehB6wirtkDo6YBqNgsRRHmWJtb1F5hbIy5icndoVrTSfze7psp2hWCidLYZVh
+lcQtwg44OaZiDYFB9lG09EvW/KZsIs5XX1E3dna+9JoY++G4ovIzqGczqcGo/InHQnXUbuET
+OMTOdDkTk+JCpdSkvSl9xdSUtOTEkeZRKDdmhDg8jVY+TvYcBLs6yApxcOllVVoa6LwyHfTc
+KfKhuirfv64KuGUI3WvVQ79kxdX9+Ed3Ynv7is+ve//LT96euDjrQ26eb9o0VmBtxPfRAmvJ
+NPXMxx+papQNZ9IfPNDfy3DV1/44PfOGK6Mm/gOlS0xMhx+648bQb0hoVdGwGziNkRT+YQlk
+e81qauRPTc766UkO/zKqF7PQfu5p9Aj/NJondKJHhHo0j3wKz31oIfciROmRSGb9zWge/zxa
+IqyEeSdgHayFOY9wT5/ZT36PkoVxKF1YhvbD3M0UnvA8ul2ai3ZAf6LhM+iHuWQ76iAyehWe
+W4U2JIuj0H6DB02ne4lbYU4WShcTAR+wfHElvL8Nn8NnusROtJ+MQu+R5Wio+HNUD7gPQfeg
+32AbGN2fuCSugWuA3HQG2cyX8b/g/yQME5YKnaJZ/Jn4tEE0DDbskYZJJ41LjHuM7xt75GHy
+XHm36Q5Tt/kSS5LlWssvLK9YzVa/9QVrV9TYqLU6p3JQFliAZhE25KKcFT7iMuDJQ18SvqSP
+n+v7eItBedfrbQ7mPaC3CUB4UG/z0H5CbwtwVv6t3hZRFPq93qZR7c962wS6+n/0tiX6XmzT
+21Y0OuZRvW1Dpph39bYd8TFdsCPmIY3BeTGf6G2M4hyK3uaQ5BirtwlSHJfobR7aV+htASU4
+rtfbIkpzrNPbEsp07NbbJjTe8ZretjjHx9n0thU1TJiht20obkKn3rYjacILU33+9tbGxQ1B
+ZVhdlpKflzdKqW1XpjQGA8FWr7s5WyltqctRCpualCo6K6BUeQPe1qVeT458ztKxdGm1e2nz
+El/LYmWKu+E8C4u8S9xz25S6BnfLYm9Acbd6lcYWxd9W29RYp3h8ze7GltCc2e6WwBRfkyfi
+VRnofa63NdDoa1Hyc0aN0sbo0IiIqfW+FkAiCDQ1BIP+8bm5Huhf2pYT8LW11nnrfa2LvTkt
+3uA0No2iRInq44MyLOD1KrXeJt+yrBzlAgjIUUqa2v0NAaWx2e9rDXo9Sn2rr1kpbPUu1VEJ
+7cEY1qYxLHIbWQ7vDuS5FQ21Pq7LI772Tz5XPhcsWuWsnRsDslsJtro93mZ361WKr/5sKLJc
+6W1tbgwwGTQGlAZvqxf2WtzqbgHSs4F2IAuWAceAz9lK0Ke4W9oVP0gNFvhqg8CxRmCBW6kD
+pGWYGWzwhvhUV+dr9sN0OiHYANCBy96WAHAvk7EkMwuAeRR3IOCra4QjhUf2+Oramr0tQXeQ
+4lPf2ARCGkYhsgXKbF99cBmwPzOLYdLq9bf6PG11XgbG0wiENda2Bb0UB7nfgmwQc11Tm4di
+sqwx2OBrCwIyzY36RnSHVo2VALYtAPMpOdlKs5dSLTMFCTRkR+yRTffM9bUqAS/IAWY3Aqo6
++WdtTZEDsH7KaDj7MtaxjZY1gGKds4CKob6ttQU29LKFHp8S8GUrgbbaJd66IO2h9NX7mkDZ
+KEF1vhZPI6UjMF6WqwGcu9a31Mso0LSIIdCnBC2+IIghoPVSqfjDGqCNKYEGd1OTXOvVuQZo
+gJW4+9HpawG9aFWafa3eAclWgu1+b70bNsrRkOo/2uxuB2uB5Z7G+kaqaO6mIKgeNACo2+Nh
+lGusowbqbgW82prcrTLdyOMNNC5uYWgs1mwVFlENddcBkABdEcIncPZOFKQMGzCGuZsGBqCv
+CeERhgbotTS1K40Rai5Tclq99Ee8bC5tBCgjqVxC5uEFnfO2skXLfK2egJLZZ4eZdO/QgJxJ
+zTaTsQwkU6bbS60XLIlCbQMZUJ4s9TX2Iea9JggWo7j9fjAvd22Tlw5otANk2pDDQmlwB5UG
+dwAgelv68YRqXVi7PUpbi0dHOIyqzJDTKPw6qQbAeYNVM7FRIbmVJuo9wFZCE/3uuqvci4Ew
+sMMWn0xV9Z9Tqn5bgcMCFL1N9RSp6cXKtIryamV2xbTqywqripXS2UplVcXc0qLiIiWzcDa8
+Z2Yrl5VWT6+YU63AjKrC8ur5SsU0pbB8vjKztLwoWymeV1lVPHu2XFGllM6qLCsthr7S8qll
+c4pKy0uUKbCuvKJaKSudVVoNQKsr2FIdVGnxbApsVnHV1OnwWjiltKy0en62PK20uhxgAnJV
+SqFSWVhVXTp1TllhlVI5p6qyYnYxwCgCsOWl5dOqYJfiWcVABACaWlE5v6q0ZHp1Niyqhs5s
+ubqqsKh4VmHVzGwFgFUAyVUKm5IDWAIMpXguXTx7emFZmTKltHp2dVVx4Sw6l3KnpLxiVrE8
+rWJOeVFhdWlFuTKlGEgpnFJWrOEGpEwtKyydla0UFc4qLKHkhDah0zRywuyQ6YKS4vLiqsKy
+bGV2ZfHUUtoAPpZWFU+tZjOB98CJMobu1Iry2cWXzoEOmBfaIlu+bHox2wIIKIR/UxlmjPxy
+IJfCqa6oqu5D5bLS2cXZSmFV6WwqkWlVFYAulWfFNKYBc4CfVHjlOr5URrTvXO2AWXS1TmBR
+cWEZAJxN0YAOud9c0K7ia+q8/iDVbd24NdfI3KjmO7OZ1mpOAFS4pAUMV+tjTQhLYFks6mje
+LRywaTjO1lwvcx+g3RCJNNfrWeoFDxigrsTXKvuoM1nWGGCWDiGw2afFPCXgboLNYBW1IjYL
+fKW7CZYF+tDsZ1ByKBj6WxthybLWxiA4E8XdBr2tjdfqYbhVD1OMAiVMAd0l7Bw0/Fu9AT9E
+qcal3qb2HJjbSmMZw6SxBXK1Zp10xr664PhQqhBUFjPgHl9QhowuR5FllnF959TpQlPb7ycP
+krU8SPk2eZAczoOUb5kHyefmQbqTr2OQAqGYMUCCGk5Y5O+SKymhXEn+z8iVZE0O/7JcSdYM
+9jvlSvL3mCvJ4VxJ+Za5ktwvL/gWuZJ8vlxJufBcSY7IlSLNt1+6BPEcnMT3lS7JerqkfKd0
+Se6HLjs3ft8pk9ziU75zyiR/rymTrKdMyrdPmeSzUybl26RM8oApk/LPpExydeHcWTMqKNqF
+079VdiSHKf8u2ZEcyo6U75IdyZHZkfKtsiN5wOxI+S7ZEVXWfobSl/jI5018lH8i8ZG/PvFR
+LiDxkVni0z93+OaEJhia72JJg5wDj5yvrVzlLmu8qjG3ETzINTn+Bn+u7sbOKqShqciH/Kgd
+taJGtBg1oCBS0DBUh7LgmY/y4BoFrVqYoaApMCeIAvBpRV7kRs0oG3pLUQvMz4FWIWqCS0FV
+fbAC7M0LTy+sWQp3D8yUL2DXsX27VsNOS2GvJbCmBWZTPNyw5p/bsQhaS2DdXNQGM+pgrptB
+87IVbkaRAlBa4O6HObUAtxHmKbDeB7u72djZcGYzKAHAyAfzPecZVS54fC7DOgB7+Rgm+YD7
+KLgi14VWjTgP1Hq2VuNEUJcT5UwQ6BqPcuHy6POXwvwcmOeDZyvQ6mVrWxlXcgCGF9ZMi4AW
+4lJIUufqAx2jnPcy6XkBOx9aBnOprL4fCVBIJTDSDnMa2MpGGPMzvINM2pQDrWwF1Q8KdelZ
+XDmbjrCGtfXTsPNRI8M1EO2a9NzQiuTauboug+y+/SVfkP18/1Y7sLzDNDfCiMxaQdZDtayZ
+8foq6POBBL4JF0pZJYPXzKCF7aCR4dTAxrw6XYvZLi261LN1uWvS0nbTdEzT52yGl49Jv4Wt
+9+u2pu3gA6hBXccadS1wMxgap2UdZpBhcbY+1bF5VA816CEIdLaGu6bLXma5mu5lRmhJJpMc
+XethzwDDqw7WuHX6ZGYFdaChzQxKkI2E+FMPrSbdkob14Rjegfoain8Q9FfTfrpjmCe0x8+s
+xgM71LHVIWw8jIIg07VaGA2yUW0P+Wt2yNatuQ4wa2NQNJ4sYzrQwLxOUOdMM+uLpChEQ2s/
+rdSwbWM8zI6QDm03M3lqspYjPEgAVmefh47sPjpzmQdRGGTNHjTYjTpX+0v/66kOcU7D1t+n
+0UGGV1jrwhQtY/xovqAdQtZQz7x2i06hN2JHD7vTPbLZk3JiCcyoY/C0OSH51bMYonm2kITq
+2N4ehnGjjul4Zp3VOnZugOhjniEsg0hfFObAuZ6gBeYHdWsI9JsbspUwxyJ9QOQ6hdHsZpjL
+zDf31zWNG1oscX+NPH0syim67JvZM+w/LkQWQRaJaOR06xTl9OPU162lPGnXY4u2O+V5PcPR
+o2tSE9PT1r4eDVPKU0+EzCO1LhRB3SwiNjKf0cTe5D6KPAxTKq+WCG4s7hdXtZ1CPtTNtEfT
+3dAeZ/Mn8I00hbCUdQrCGuZmMrpwDPrvczY/BsItW5d3E1vXeB5vLvdJp5X5WTfzK2G4oZ5A
+n0aG7OXs6OHV/ZyXURHaaRmjysPWZw4QDzP76D57hQxjoWibGaFlms2UnRVfapm9+yJwbdPt
+IKQnS2G0cQCOedE1jM8tuiX74dKil5t5VG/fiki5aziHeuQBLaWBeXiFPQM6jl6mSefTk5Cv
+G8h3e1gkaGFyj+TXQFyVIzgXKcNva6sBPfNWdEpC1hayJJo5NPXlHq36iv4Q/Uyjr4L7Yl1i
+WjykWiX3edV/pac6P1W1uo0E9XhY38ep6aiY7VOByuGN7lMBb9XoMsgjq9hYKfQpkMdVwchc
+eCuC3iIml0I2QsczmTVeBm0KsQLNYbA0GFVwp7DnQw+FrbB3+jYT5pcDLLq2GM1jexQDtNmA
+WQW0KexZ0FsGz2J9Hl0xFXrmwDttlyCahWr7lcOqamY7dB3FRcO0GvrDu/bHqpTtGMJsFrxV
+Afzp+mghwC5l8Cj+2Sw/ou1yHU+Nc1UMOuURhUxhTgWMytgb7Z0Dz0qYN5vxs5DRrGFbzmiY
+BuMaLcUMA00SGkZT4VkJe9MZJYBXNeMC3alan5nN5EjpKWLr6a4z2SwNswpdyrQdhpKj81LD
+g/J/bt/Osxn9ZXApjP5q6KlmsikE+CG4Id0pYRAo3jLjxhxGXyHjQwXbYQqbR7lI+VnWp3FV
+EVKZyvhF5UYxL2I7FTKOzB6QkhC0SOkMpB1y3w4ljL5ixqkyNns28LEY5pf29Wj6WMponarz
+WoOp6b2mE2UR3J3KaKSSvRR2LdZ1qpDxrj8VVE6XMfzDVGgSKNTvUyN4FpZ+uS7dED7VbOfq
+AbhyGbPFYjarkMl6dp+NTGP2O0vHfE6fhoV9wBxdPyv6MOvP35AdheZdiO/QYIX27i/BIqZP
+ZTqGs/u4oc2Qvwau5ruKIa7VsXNOsM9v94/ckVljOBuNzDuzI3xtZCageeESNrf5rHnhXu20
+pMWs8FknMncb6IQdOh1ruXwo6w1nH5rv1s5EkVmvh+XnWg4Y6MtKfCwP9PVlJsvYaDim+/Xa
+ia/fOY/u7GaxP7tvr1AsCsPS8ko3yxboboEBuHn+CCWfczL0s3iv7bKMtYN6ZkLpa9Pn0v5r
+zzoNh+o/58pAGVAGIVoGyhwi+d/K5O3Xz1KNjMM0n8zR4bai0LkszBPKAa2u1nyW1MPaR6GN
+R2dXFSgPFkdg7mG8lpFWo6N7ysxfhWpc//6q0/ddtf1PqgfJ/epBZ2de/7p6kDxgPUj5getB
+8gXVg/pn8nUROIVrHaGZF1ZBHajCIv/b6krKOXUl+f/XlSLqSuEKw/+bdSW5X4T999WV5AFO
+a/8JdSV5wLpSmKIfpq4kf0294IepK8non60rhb91+j7rSmF7619XOl/0PX91STufa5nEf1p1
+SUb9q0sDVzd+mOqS/DXcVSI4+J9dZZKZjp2bzfzwVSb5P7jKJJ9VZQqfdX/IKpP8jVUm5Qer
+Msn/RJVJ+ZdVmWTGg7kAdQbDVuN2IYz/cLUjeUCZ/7tqR/I5tSPl31Y7ks9bOwrXgP71tSP5
+n6gdfR3cf23tKORZzx9Rzq34yN+i4hNZpfk+Kz7yd6r4nHtm+3YVHzmi4vN1dYfvo0ITPAe+
+C4UrDTLbh77lfIffXOUyvlwFn1yGm4dlTTksf/VDX/9s7Ot/kYb0/04anbkeXY4G+Cv8CbcK
+D0EqItiJ7HAfjDMAZwEPRt3wNgjFwT1T78tk82ibYIWNp6Mn4Z4GOxGcykZTUCLck1Ea3JNY
+TyK7J7B7PLvHsbsDxyIrQHWwN9omOIa1o9k9ClvRChiPYm+0TbAFm9HPoM/C+izoAOKxGZvA
+ZwhshGD6/+PgsQnLaAj00RECdxf00R6CjWylxO4GZGZ3ukLsvCtHKIzBIqNLYHeezSKMIo71
+YHZHrjMryJlLiKqSnq+yhR6VfJVNulXy5RclwpcryBcl5PNu8plK/qGS0yr5P0+ST1XyPyr5
+RCUfp5FTKvmoSxY+UkmXTLpc/IcfyMKH+eQDmfy9m/zt53HC31Ty127yfjd5D17eU8lJlfxF
+JX9WybsqeUclJ1Typ27y9lsJwtse8lYCeXNzmvCmh7zxulN4o5u87iR/fNUp/LGb/OG1WOEP
+ceS14zbhtVhy3EaO/d4kHFPI703kdzDjd93kVYD/qpMcvcMsHB1EjrwSKxwZQl55OVp4JZa8
+HE1eguGXUsnhWHLoxSeFQyp58YVFwotPkhdX8S+4zvzWKbywiLzg4n/rJL9Rya895OBam3BQ
+Jc+nkOdU8qxKDjwzXjjQTZ55NFl4Zjx5+qkk4el88tR+u/BUEtn/ZJSw306e3GcWnowi+8xk
+L2y2VyV7VPKEgzweTf5bJbtVskslnfHkV4mkI448BnAe6yY74bGzmzwK8x9NJo/A45EV5GGV
+7BhCHlLJdpU8qJJtKvmlTLaq5IH7rcIDKrnfSu538VuAUVu6yWZYsjmNbILHpm5yHxB/Xwq5
+VyX33P2kcI9K7t64SLj7SXL3Kn7jbU5h4yKy0cVvUMl60I71Krkrh6yDhevSXGfInbD0ToXc
+YSa3Q9ftM8kv4PELlfwc+PDzOLLWRm5zkv9SyRqV/EwlP1XJrSq5RSU33+QUblbJTU5yo0pu
+UMlP8smP15EfqWS1SlYlkpUyuV4lK1RynUqWd5Nru0m7SpYt3SYsU8nSbaQtmCy0dZNgMgl0
+k9YV5GqV+H3Zgi+btHST5m7S1E2uUskSlTSqpKHOLDTkk8Uqqc8nXo8seFXikYnHxdfVykKd
+mdTKxF3jENzrSA22CzUOcqVMrlDJIpUshPeFKllwebKwQCWXw9vlyWS+SuZ1k8tUMhfeXWfm
+qmSOSqrTyOxYUnVpolDVTS6FgUsTSWVFolDZTSrK7UJFIim3k1lppGxmrFDmIDNn2IWZsWRG
+qVWYYSelVjK9m5RMixVKHGRaLCnuJkVTrUJRFJlqJVMKncKUblIIMAudxDU5SnCpZPIlVmFy
+FLnESiZNtAiT4shEC5ngIeNVUhBLLlbJuBgydkySMNZJxoyOFcYkkTEH+NGyRRgdS0av4kfl
+m4VRsWSUi883k5F524SRKskD+HnbSK6Z5MSQEdnjhRHdJNvhFLLHk+EecpGHZKlkmIMMjbcL
+Q9PIEIU408jgQcCA4YPTyCA7yUQWIbObZESRDBevxJJ0maSlkdSURCHVSVKiYoSURJKyB3zG
+z/lkC0lKnCkkrSCJsGniTJKgkng7iYPd4rqJA/ocThLrITF2Eq0SO7zbVWLzkCirTYiKIVEH
+eKuNWFfxFhixdBNzPjEBaaY4YlrFyxYiu3ijSiSVGFQiCrIgqkSQieDi+W5CPISDVZwK3ssi
+YDtBFoL3YM8Na/Dw/x1/6N+NwL/wLxX9X3o5MywKZW5kc3RyZWFtCmVuZG9iagoKMjIgMCBv
+YmoKMTI0OTMKZW5kb2JqCgoyMyAwIG9iago8PC9UeXBlL0ZvbnREZXNjcmlwdG9yL0ZvbnRO
+YW1lL0NBQUFBQStEZWphVnVTYW5zLUJvbGQKL0ZsYWdzIDQKL0ZvbnRCQm94Wy0xMDY5IC00
+MTUgMTk3NCAxMTc0XS9JdGFsaWNBbmdsZSAwCi9Bc2NlbnQgOTI4Ci9EZXNjZW50IC0yMzUK
+L0NhcEhlaWdodCAxMTc0Ci9TdGVtViA4MAovRm9udEZpbGUyIDIxIDAgUgo+PgplbmRvYmoK
+CjI0IDAgb2JqCjw8L0xlbmd0aCA0MjYvRmlsdGVyL0ZsYXRlRGVjb2RlPj4Kc3RyZWFtCnic
+XZNNj9owEIbv+RU+bg+rxIMT70ooEguLxKEfKtsfEBJDI5UkMuHAv6/fedNW6gH0eDxjPx5N
+8u1hdxj6Of8Wx/YYZnPuhy6G23iPbTCncOmHzIrp+nZeVvrfXpspy1Pt8XGbw/UwnMf1Osu/
+p73bHB/madONp/Apy7/GLsR+uJinH9tjWh/v0/QrXMMwmyKra9OFczrnczN9aa4h16rnQ5e2
++/nxnEr+JXw8pmBE15Yq7diF29S0ITbDJWTroqjNer+vszB0/+25kiWnc/uziSnVptSiKKVO
+LMrVK3hFXoEd+QVcki24UvZa6xl34BdlKcCvyk7zN8x5B7+RS/CW5+hdO8b34HfWanxPRtwW
+zMG9lv7VBkx/DwdLf1+B6e9wl6W/V6Z/tQXTv8Rdlv7VDkx/j55Y+juN09/jjZb+gv5Y+gve
+aOkvWkv/Em5Cf/cGpr/34KX/yvR3mk9/j/OF/g5vF/oLeiKLP94l9C/hJvQv4SCLP9yE/iv0
+TehfoVdCf+d1eJYpwRhhzv+Mp2nvMabR1I9BZxLT2A/h7/cyjROq9PcbJvPUpgplbmRzdHJl
+YW0KZW5kb2JqCgoyNSAwIG9iago8PC9UeXBlL0ZvbnQvU3VidHlwZS9UcnVlVHlwZS9CYXNl
+Rm9udC9DQUFBQUErRGVqYVZ1U2Fucy1Cb2xkCi9GaXJzdENoYXIgMAovTGFzdENoYXIgNDUK
+L1dpZHRoc1s2MDAgNzcwIDM0MiA1OTIgNzExIDY3NCA0OTMgNzE1IDM0OCA3NzMgNzExIDY3
+OCA1OTUgNjg3IDczMyA4NTAKNzE1IDM0MiA0NzggNjUxIDY4MyA3MTEgMzQyIDcyMCAxMDQx
+IDY1MSA5OTUgNzE1IDQ1NyAzNzkgNDU3IDY4Mgo3NzQgOTIzIDcxNSA4MzAgNjQ1IDc2MiAz
+NjUgODEyIDczMiA3MjQgODM2IDM5OSA0MzUgODIwIF0KL0ZvbnREZXNjcmlwdG9yIDIzIDAg
+UgovVG9Vbmljb2RlIDI0IDAgUgo+PgplbmRvYmoKCjI2IDAgb2JqCjw8L0xlbmd0aCAyNyAw
+IFIvRmlsdGVyL0ZsYXRlRGVjb2RlL0xlbmd0aDEgMTQyMTI+PgpzdHJlYW0KeJzde3l8FEX6
+d1V1dU/33GeOCXNlch9MSGYSQo5pcpBjgIRAQhIYkkACIRwJScAQsoZVOWTlUBRZ72t11V2J
+oAiaXVBcRF1d8VhX3fVadHXXqLvruv6EmbxP9wyXy34+7+/9851MdT9dXd31VNXzfOv7VE0G
++9d3ITXajBgkLlvT0ffCg/u3I4R+ixA2Ltsw6ORK7lOD/CGk/cv7VqxZFZP3B4SYIbievmL1
+xuXP/mLaHQjRMYTSRrq7Ojpv2WXTIZSdBe/I74aMnWE1D9edcJ3UvWZw6LMpzxO4lur4bHXv
+so6D7mV2hKb2wfWGNR1DfQeIncL1Z3DtXNuxputY6/SlCHngHeymvt6BwSFUN4mQ9zrpfl9/
+V1/fuO8DuH4AIQI6Igx/0kfSmZOuCUNZTsELSpVao9XpDUaT2RITGxdvTZhiszucrkR3UnJK
+alp6RmZW9lRPzrTcPK8vv2B6Ifr/5MPZOTP7NXuajtAg8yekR2jyL5MfhYfCneEW5mbkmJxE
++9Aj6Cg6iV6djH7QOHpOPm9AB9Fx9PLkJR/0Y3QzehDs41301YW8/egu9Cgau6zcHjn3AfQw
+egwdQk+jE5C3Hd0IuT9Dv7ikXC/ahnaj29E96A1si+adIGYc0eBzpCan8QDehawoC1WgxWgA
+XY22gl6n8GzIK4G8esjtR0PoJsg9ik5N/scHSjWhIOpBa9HjUOJZOS8DchegTsiFvGi5dWgY
+XY/uRQ+hZ0CvYdDsRnTbFd73Y+IiLjSIPoG3vYRvISfRL+CZLZwZKcFOTyMHeERQOkJvf4RQ
+uHPyX+AzS8k35D5yIzpAetBsUV2Qn5LsMBk1apaSLOcYk1zprnR3dO9wVnY7d7gr2iuyswIN
+zZUVCS5XS3aWE7IrnGO43Vk5NmtDd9yOSqnAmDFzjCRXSqlnTPxJOwjuCpfLBXdMF+8cmTx+
+wyW3HkdQV/eCZqlKKbV3O8co3JQPCZAT1UC6190OR3cFKHDF/MtUnOWe1b5jxyy3c9aO9h0d
+RyY3L3U79e4djwcCO/oq251jqL55DEP+0z9JGJt1Q8uYvr0bz4CWSUrMamj2J7gM8JbAfHdg
+Xmuzs3JHe/S90Zzp8hUikoMrEDg3AyfzUxyhSEqeV/70inyYluMyuAzJcMBQ6vvNLDornREI
+ABLo+smP6EPsBEpEBahTrOA0MZrC5LxpeQU1yWXTygvacJOm3lnv6nKtn6a1Muk1NpMpttbG
+6IivhlFaszxGtwsZBXRHoa7QUUg8LmH/dP23E0H9p4ZC/YTHWFiI/BN+Y2Eo1+OZMBZOywli
+M3InpqSmEJ/XWJCflJcbE2txT8XuRKQoxdKVHSu8KalSDqfQYotZysnLzacPhd96Z+0TlU3B
+xmAzjjlaVJ+unLKu6O1JZFlw/6q2G2c3t7xc4J/aV9J40xxCZhZOXeW/8UH85z+HP6oon4+N
+z57EuVetG1VqjukSwv/8JM/n9pU8vTM4nO00p2XEpDvuesqXlf64hJj3grXeyH6NnOhWcVO9
+o91BWIYzxDAWQ5KhiJ2u8Wn9Nr+90BFgqzWV2jpbnb3G0cYEaZBdJDQZ2uKXJASntNna7D1M
+J9dlWGrptfeRQcOodXTKqD0Z6fS6bN4zJUcn6jidTlVrIsRRi3kH4V0xMc67EnWJjkSi15Of
+uvTf5nqC0gH6DflDuf6JPE9Q6sBgOvaV4oJS7POmSJ3k9kkdRy1mqb+kr4veeE6/8o1Fx3f9
+9PpFb3YpqyZ6P8E0MyN1ZWDVmWWM63TrEy1Pvzc6eK1Y9rp7xp9+1bi3rHSoZuVvFkDrQ9AF
+X2AbWFOMqCZNmEfZHuzHBHuCEzCUYE1uQx7+4quv5DLDk+/TO9h/oniUBvZzs9iXnem15CV6
+U715FZaZiRWplXn1lkXxrQmtjgWJbZktWW3TFuQtKGjnl2qXGpfGt7vbUzdoNxg3ZW012h5O
+edBDUmKUHsrYqvTEVw325UQmbDIhj1KT7kIxKU50Z8TOnC6NJtfF3SrZWp4HzO2MoRDsDQ6G
+PM86SVH/hDG2MHje3pJ83vwC31TosaRoT1nsmJG7L2JgsaXYJFtdqmxykr3dEX7jzD/CH+25
+dmgAm9/6ACuvHr7h5omfbb763nkNyT8pWzbbMW+Dpy/Yuubp3TcdwHc/O4m+PzHyYhEn7u//
++Ye//1nXiQKueIzUrRodWl69Mt04w1S2KzSwuHd6TEritJ/3bBvbF/W+3exXSIXcaKaYk48L
+VV51kbEozmuvxDWqCnXAGIirsKstNQJxgcPpXOiuZF2yI5kkuLj9SbKnfRtprtRUPXE5iUFv
+dDmNWDaPK7jR7rPh78Lf/Pt7LGD1v8P/446PT3JvbFuyKSkxPibJtbFzyQj5PNwbvh6P4B14
+J94UHj335Lz3btv/4dw5c+fW1X65647X589tmCt5yjOg/RbA9wzUJ85V8lY+ky/hfYaSmABf
+YWjlF6T38MO82maz1kgqi8lMsqs2mbMTndKhJEqltpZTOhOddTZsM7uQ0yagu7N0WY4sItye
+qf9UhhAJQ4ITHiTbPsAIXAGSyKMqtUoCEl+e3K6CS9trcFlchvNoQrfMLqt+4drhj+dqG/7Y
+U7XFm5Xt83hvWdx8fxGzOTQzs9W18fDs+mb8TvevZ84K5CW94a1Jy80cqpvT40xxxKnJ5IHw
+IKXp3oLHpDbfBuhwC7SZQ3ViroCVJAlX4wBpJhsZBQN0y0kIA7jK1LIM4XW8g99EGAYRQnUS
+FaMeaIexEHAxiPz+kKEQ2oK36Se2HcdBAbuxy+eit4SW/J68cm6MOUv/cVbLJh6ABx+Cnh4B
+TCpBt4h9KhXrsaosnnRViie9uFjlM09L9HpqVZXm8sRyTxNuYVtUjZ4e1XJPT/GQaoNn0Lep
+2OqdUTGDFM0ArMLZhmySnZ1e6xCmEZ3GoSEajaFWULpdBfapMS5mqn1GAVUz9/h1foefqG8r
+jYxFrDQWAOIXxwJOnlBhxMns2PJfRyQT++Dy4uhE8EoamqgjUm1OaW154OWNI1/P0TV+usq/
+K2tqdl529uba1ln7n5yanrm0tO33bRKMrXmwvLr2wFU5I+SVzGtWLH/EP6u8yH16em1GelbP
+vPqVdkfsg6PD+fOsVnNF6Wl3UVpWzvZFI0fjtHyeNHYDk5+ws9gvwF47xFoWawTOHIMTBLMl
+2ZJvKTcv4puVzdpF+kVp7UyHuY9s0PWZTTExVq+RZGSkeDllDFoHBoolG/Vk+bN6s1inRd2d
+KXkhuGGx3DNSgjENJstQDMhzhZnuMocsyGNnFbRUl+xuui/876Xtq7uXtmHNA0Nf3aTb9I8d
+656sqpzTWD7rme7d36/Rro7LiDUlLOpow8nPHcGJnR3LZ9T8bcWSmjmBT/bd+XFVbdXSpdDK
+veFdxC+js09MseIMnEl8qJBUomrSiFpIJxC13zBqMNMmiCwosRJCPME8D9J/kytrDnZoIv7w
+pzc9hm2hdWS31HOvowT2aRoCnCoU3cwvMF3A/0KpU2CFqME5GlFD0KPKzRjjDPZRhUgx9QSL
+z4QgBYNIFovPwJtdBrcBDNyQZ3CxT4c+eDD0AXE9CNSxWBLuIa7QB1BT1uTfyF/BvywoR5zS
+AyBEjHkWRqFQeRnBZDKa0VWxuljMdcVIVimBvzQ1eiLwZ+Z+YH5SdeSvX72Yc0++Kn3Iv3iN
+NUEX/g3B+Nrn3zSoj2rtGalpg7OZrrskJmQFrroEalYAa90vrhQFXMtVKoggKHmyDdpmhjuC
+ktkGzTOzLDfCDSgI481Riso+JaMUlByDh1nM8jo15hQCw6pREipEZagVOPUgPIvWquGWks1k
+89k5bCPbxW5iFWynChoCLQFYiJVAIVjsLywEzJNGYps+FDx+/HjkxANEoKDLzbgYwAmTgNkl
+b9wUGrnpRWLH/Ej4bPh7fHe4gz19boi8F0qGnjzfHg7dIC6vwtWEsJRVcAu5rRwD1BxhVkEX
+0q2UoWaGMDyukGFsAI8QDrFkPYMZQLBKVMsQghkKjZkRbQqH1gKyYfiqmEzGxzQyXcwmhmM6
+FVJToC1BAG4J3wDpCi+0QzrwMsy5cJ6kfejj8Hehj9/Eb+A32NPfeyB9zNpB71Og93TQW0Cr
+xLlqhUPhVVQq5ik6FOsUig0c1mHCObCF83IV3HxuFW7nRnEfp1JjypFW3MgRosA8jAXlOUwU
+JjSk0qlEFSEmuloZmS8BdoFQFfuLI+r1rwvKHYsl88SGPHb6v0KlR3Eeue4o6/3+t+zpsyI9
+HtGL3gl6qVCR6BZ8iNNzhOMw6yOM0od5inggSwManQZzghmvVkNFuRIsBIsjdKQQiMm0nHQs
+T05yoneey2TeOvd3Ricl9vRYuHss9DaKxOz0S9kWU8U4TH0cw/A6wSHUCQxahM10UR1Ymif4
+TeiMPI/kXvQu+mXoi5OhL+Bp1/cfsK4x6W1bAfcI4F4Ouk3cqBIYB3In8GZHOp8Wl+RI8hTy
++frpJp8jP6OWr9TXmCodtakVGc2kMaHR0Zi9Kn55QpdjeWa7Z1NMn6PPOZgxmL3V6BZErb6A
+lw7IYE2jNs7lSvbapFkdgNKVZrEaLMhlFdBgri63L5cIPdMumdKjM7qUDGD203IyMy/M6Eng
+wDH0woSRep60AXamJF3ka3bMknk19W/tuzc8uUW7Dqddc+SVjmWBA0tPHsPF/7wTEELbGP7b
+jXc/275R/KLhwZ/jhxc+UiRWFxd9t2T5joFlS6xmqznj5fuf+ao466/Vbdd1B3umaNMsWQcl
+JJBGeh/0vh5i1iaxZIa5xBYwB2z12gW6Lp0i3osUegVRKIQ4r5IReJ3L4SIGixO6V0R9iKJe
+l87ld5F4hVlY7YxYwTfBCWmgJCOIuHaktZmyzV0S80BGBLrovsrSOa/fc/Ikvnnr09WNwVfz
+C3I2LXn+oaF9Hk8q1S17uHTOnNBb7OnsnMJHts3pT3IkhH6Z6cnpAdSX/CdTRtAklIcaxDxW
+bVGnqhtJk2U0njMasrx2u8Lm5Zlsr4KPsRizdDpFsgWt8+l8oo/Ys8yK1d6o7U7IVGXivP1O
+RNw5OlKuqObRSRyfb4BLbkCETcuFpEs2c0HVghdvD32Nj95/X21D7erWWx8LH0pK82xd9gVG
+wbXQqtH8qpzrl4ZfxNw1D/qme/FLvY8UlAEQxKVkblvSc0s273iZ0Pza2ARNuMFkt7eFbmvt
+SY7XhX6fkJTaCaN2NNxJ99ARZILIbY7oyyWFllxnOamxlDmbjCuMV/MjU5RagYstM1A1axc5
+QaU2J6A9EG/5E4k2QbCqt7ukdkvDNSENljxehZeRTRiuPIvEXoyR4EFhiJDqPXOryg51LtxZ
+Mz4eeKbnpY+e27F73gOB+oGaO8dI8faP5tbOS0kLZ7H/s97fGP5d+IuXTs0qDG1Lsr4peWcJ
+6D1Kg+DrN4gzqYxr9Vw718dxAqNg45lYdhauYZrRQryREYjCCo+wVkDtGjSLEsQQyhI16YYJ
+CogmRUcmj4uJgr5AjaagWoDrYcSinYJOAAg30UraRddTll7D68/IQJ0JtC4Izui/iNTwlWca
+iQZIQE1HQ4MvvhYu/y1eiFtp8HsFfp2mnnueKZZ0L538Kwmxd6EEVC1mqVkrGB6j0itKNSol
+m5AQ62eEOtuojWjRDTZeo7cqeSAM+gLF9in6bzNzc2Hihvg2GJnB8/IizD5Z7mmfwe3Lk5gC
+4ORFpkRCvh9Ne/Tg6Og4vi48wsfFzKmb2hkDmGM88jJpuAvPDB+7K8w0L8tMS04QJP2Ogie3
+wWQXgwrERMYSY1lvYfQavsxEtRhreGJFN8Y54trjiF5l1WyPPW/20uzgjyxXQLh7MayA0Y+E
+FRbaNm6Mi18SmPPzOePjzePLnvw1GZmzLSUjfXbRuV9z5tArNQ3vviJhSQ8w93VglSoUi0rF
+rCKtV+81F8UEtBX6CnMghtf5BWrxM0o1mGK8Lt4R74/vjafGBG5L3OXRHfidHiJZZNCjvFx0
+IXaVrG9d+LO/TYQ/x7ETf8Nxzz1y608ffmT/vkfJ1PBX4edxMTbAX0n4RPird954453X33n7
+fL+AVlfoF/b/rV8s/xf9QoMjcrcQYOIfse9CPBMLcW+TWEYRhRlcZYxFsVy8Ot64EC9k5yva
+VM2aZkObaX6sfoOw0UISvBbi8grKOAszAEEwloJKfzJjt+i6k6IcPNJZQbm3YowWM/lPDm66
+pBdZ+6KOZS2Lz957Z3iytbWjfXEzZm+7Z7IqfO6jP4dDmH//faxgUzrD7x85Ev5TR9fy7mXL
+sPPoYexasbR7ZagDJ+Ki8G/C74ffA9QqiM4c7P7ozDEsLuCxDWfjGbjQVqmrNlfbWnGTrsXc
+i1eSdmWX6mq8XmUg+BCU1iusXpFgoGhxXggjWXlSEV2MwQJ0QqPRO2HM4hkzYqUJRfKboEwS
+g9KARCYVaVAgkhwOxR2XFogidOACPpsun13Y/eHJsDb8+Ul877Ynquctum9XR7Y3c0P956eW
+3DAtO5PUh8bY0+7svNuvuvedAny/uCzRFht61ZWdsSbKgzZAG1nkFA2EocB9EFJAMECB9XDS
+QBgkVj7hl8kOuDDdcK7hJPkMCN4HKMrvvoXn1Wij2NKkxNPJdDZf2UvamV62XTlK+phRtk+p
+ahSalK0qppMZZNYDm1YSRkBUT720gi6gPZSjVAFUBst7GQxLzGhIq9M6tPVahjUpVmuizgP4
+FqV6MsGWDKMfBfvBenGE8AEdZb89GV66Idx1FGvxTrwZm1jm3K3Myu9DQKZPMCWSzisn/8L8
+k16FXGihOFPnrnOTTJyozYhJipuBfdoZMb64GlynrNDWxcyMa8GN2pW4SzuMB7Qmvd7sV1OX
+ywpQqEM73bEJwpZE0OvycDGIo7AnsR3JMi9EihEPhyEryGP+ueThto0vVdfU4+x/tx+do2x6
+auE9R598oHCDJ73aopyVnVtVXf3HvdiIp+enni6vfvu1l96xx1k8BhmFPqXt4O9xYJetophC
+MzU5tEhTbC+nAU3A3qqpj+nRtMcOaYbtWlzscOimlFioSqXw6wS1Ot6Kdrskg/S7GAdOMG45
+T2rk6EtuhEQOpGa4LmK1BRrkjPiZ0RIFCtp+7sXSfO/upv6/TFO2nVwT/mv4FM785uN/PYX3
+7rv1kJokrPjptJycRVmvpOWD41igLWXh7/6ZcfN9B6+DUVg7+QnzNh0CVrNXXMcRIcFC4hNS
+hIykXKE4qUyYnbSEDcbMdzV5FuT2sqtj2p2dnq5c8zA7ahh0bkwbzNyBt2u2WLel3YxvS1Ah
+bVw6tTObE3FiYkqpnUKIWcoIrvSEOG0CcsUp0C4gRA6f39fmG/Wxiq3eK/PXYITABvEPwk+f
+N/UCfZXG77IxjZUpbExsDPN26L2R381StrzbOXJDSsrqtB/79m4qnDH9l6s6X6lQVr+6bMWu
+zIwl3h9nXltVhct++nyR+43yuvqmssTEOCFOm3rr2srhHE/BNPeLvpq6uZVud4w6TmmvqZUQ
+NnwV+x0gbDKahraKHRK60jhqk9DVEhdjW6xq0bQYFgO2LoxfaBt06hsdXY71tsFsmpzs8jGq
+dK+dE2TUtRAPYK7dxKG8gRRLAhI4G6NLGMjT5WFdniPPn8dkAQDnRgBYWibK1U98GlknkgPA
+CX90xS6IIyb+n6sigNR6oojaDXMpPn9XvL7ksTeEuGzL5Qjdsqjjg3HaeV36uriELy5F6/Be
+nebYQcpchtQdEoLDZLgj0H91vJK5+z9xe3W4hZaDf7iBxK8V55aYSjNys2bkVAgB0+yMsqxA
+ziIcZFtjevBqtidmhO1zGhJZo8uSJsp2IzKaqTMtCh2HOVeS0Yq4OHRTriPXn0syE+K2TANH
+kReo9cAtPUF5hor4TKFf4jt65Lps1aJE7idiuGA20CeGS8CAlofD4W9aHm5QTj3V2X61221v
+vH3o1N/mzZr59OKOa2vUY+OBH4u3H7zupw0/Gw2fCX8bH3vc6Juanrq2YnlFOQTfij2nZ1fV
+pablnPs96Ui0vXZy/Dl/lCsx/cBDjWi66EIavcapYdQAWoiWK3WsACBvFs19ZqJWWIXtJhkC
+ZKD3F8MAGyJ7O+4fEoJYpl+ZUZe/8L7A+Hjfoy3TsrKYPUphTsm5v9Dgz1oDrEKqeTHMHzvl
+GeEZ8a4qZgWzkWE0WEUoJSzLq1WxOJ6JY+P5eFU6k86nq4pIIZNLvXyxkKecoQqQClrBzxbK
+lQFVI24ljbSVXahoERqVXbiHdNEetkfokuYVOsCPCP3KEdVUtRlqVZg5FuJqDCGTQFhexQhq
+COgZwhchLxdAFdwwWs9xqB8mFb+2TTuqpdwKjf5LMHIplJNWa4LylCsx5ihhlpZwgTLDV7Ez
+/KMPwi+EX303vOFlXIi9YGi4QFrnoG+ezWJPn82gvz9rpx9LcQswxD3AUaW4ZZ5Y6CU+XZEl
+x1lBKnUBi+hcCLHLKL9pivp87IIhdlGq+P917KI4z15/GLvUlVc9srxtVyVYTt3B3pOfPHfd
+3oafV0PwcsfjpOCGD2fX1WWneIHTvjlzfvi18Kenflc1PbQ5acor0g4ADN9VoDuD7MAFMOZH
+WczehKyjEI5spxBghOTOiu4aXTU+zpmjDKBIXkmZIboZH+L1POF5VikzH0GayjU6jaip1zA8
+Y2YvrKSEcs9P5esi+1AumZC7DHls0clQ/MmT5C8nyTuhVPZ06Aiphp49ANpdy74n74zmiHZc
+QUSVpoAwHFjVqICFm1A7teJ2SeftPCh7JnRGVtefKfFtCEAYSetr33xTPT7Oxp34Phm8A7AC
+xqs8Ol4BMa/YmjNlurPOWjal2tnMdXN9esGIiYGNm6mlmLeXsUqDGfj0TZGxSkjgt7iiy1C5
+uej8QPllRu37geMbfuj44/PGVoCnV1Y82dG8HTxq9lDVXWPb99U/sH7WXOzFhl3vz51dn5yK
+z3w/SX6caP3jSy/8rgr6uwkhLh90V6Pt4hoNY2OycAZJZ5JpCpvEZ6q8uIitwAF2IW6mLexC
+1RqylHbyPUKncpVqI/4R6aeD/CZhQDmssqul6FNhBcdBgv4Sr2EJr+McnIdj0C6tHvylV8sg
+7lqNFN5d9JdL3OW8s0CIiU1cfvhPj4U/Cv/5l+F3n38Fx96O7c/R4Nn7meC5+2nw3N1Mh5Qk
+pHgy3MnooO8tEG8WwAgq4nG8Io1JY+twNVPN1inacJuiF/cqRvEQGeJGFUYFxuphGIgcaVVN
+56DbY2TeEiyO2CXMSu4UactMJiwKjljMRmluZnSfPP78849/Mm+vvzhQU1p825xw58v4QyAl
+2fjDl5U1x0Y3hf/wwKPhM5s3vVApzSDrJv8s7+RF9tEreRpP02lxcnGmb+rs5NmZ5VObaVts
+MK4hoQ9vStYZbLk15vQaM2eL7oP5DILbhQQruiuywZnlsu67dCO9sDASJUtbYOf30YmCoxcZ
+h7HgAoP0osisemEf/eJmQymmu1taF4W/POpdnKS09cz801lz8IGOxbcEmltw1h9WH6lsXPyS
+ON2z2r/noXwxe3XZ3HtmYYYpOxF+rq9/RKU+pkvAwufTc5K8JePXnsH28vL54bMP3D7uzU59
+4v62oWyHJSPNko7w5Mfh15jFMjLki8kAsiyOwcl4OqpBFbgJr8BX4a1YiY2E8UDYI40N8UiT
+iUc2kongtuOSeTCLQ3m/JC9x5u/GFRXS+FdE14ZV6Dnx1vV4WEGUlFVaqUWZRd3KAmEOLVM2
+M220mV0o1CsXqrqZNbSbXSG0K1eoNtEBZaxKwh/BzCsAWaBi1sxxCpYqsFLFEV7asdNgjsSQ
+FJJPqghMevF8Ol/IV/Ng4AolldaYNRA0p6B8VIXqEYeWa3iBi+fSuUKummvjOG45oFUwV0pA
+hTyeYDBq/NF9vvNfBHxIIG7ZDaTV8OmhMMGfhHvC7X8gijB7Bt+IbwMcc4Z0pCt0O/mMfB66
+nwRB9+uhp96Se2CqGC/QXI5RMrmY16xR8qpWpRkioVZmDejwTa4+BOlT+ZcD0gJxOvblGdw+
+lwUwjbwVeuLECTL7xIn99N79+8+2IXnfqJNMyL41VyzhGM5kYSymFJzCpJhSLFVYZERTlaWe
+qTe1M+2mjWgDBGp9pg1mixFT9XqEjX7oHqpyoJti5X2ZSzwMyJ2051eQb/R5iUSKfXkxRjIB
+7jXn9qLSmtoS/9554G6kOPxG2PmysvKFTZvxlEcfwGmbRo/VKF8OS9Hv44C6CwHD5BULFRev
+GFYwhLUIrAEQFvMyxEaWLFRWflvseYiV58Li6IqFL7q0lHdxScmQRxeOtz22cuz5cb01oamh
+5peB8ZFA/duvQRdd17gxMyttdhFTBvU/CzzoAPSOCv1InJdG/oDfExgB6zQObCMOTTb2aHJU
+omqBaiUZxtLmGrZCUV54gqiUjJInrJIFJAK8hMi/T9r8Rgj4lagBo7Oy16vPs6k8KbCXV1ki
+C3Lb9MePD/8rjh6XgFPaPVnncuPIOhQAJz3wXVgcHh8njonQ/+DPB8M/4cznrMQTOichUjf0
+mA2ipRSIl4bFBWoldccrLW7aop1nX5y1Uttu683epBw299k2ZSkJn1aSY4A53GBw8nVT8JQp
+cX4nnTaTh77V2bDNkAodbFOhG6NBETM1QbXFewGgosw2Qm0hJDq/IgFWLnd7hIJIkVB+UsEV
+d4IZg1wqOtPZnolvTPMMN9z6+pqu5dj+QHZGWl9J7eEOZcFrXRsOiP6yZ5o+r5jXOXjVsgeu
+MpQYYx2nbh+9MzvbydvEBXGx+tTkY7qkVM/Um1aHbcC6zKbYjsb2jjlRlquIBaafiXrEaiaJ
+STclmdIrnBUpT2UoDifjZIdtCh9blpZIbSzWT+HFbOzIzskWs+uz+7JZZMUd+mTVFJ1V77Ba
+p3Q49KJ+s57RSzsx4G9ScAhcX1qVKZZpMXSEvD1+6WIZtNVwxbWz2MgKmiJ2XGOJbZpXd1cd
+QyPinNulxbQDy/rvTu0fX3XkABmp3pqWmVVXEltiD/nISO2WtMzMCwts7Y3tjR+ckleWwWal
+lWUOIsCZKTQdSEAhN4vWcFw6W8iK7Dy2nWU5aUqnVoYwaSiVmY4KmFpUxQC2Ej66DQjYRzAj
+ryzboyvL0royRTulbUCGMTFdzHqGMtfI+3/6b4KZ8gbbpdt/8JURL8KP6Wi4+Fdh/29xK14o
+zfMwx29jNkoaH5z8iE0HdLMBM0x3G91xJUyJMJuZLVxluiqWn6JhLF5OmWBGGxw6h8MhOhid
+Wb3KfslCafFllBfmwkudXdoRzmPTq+bNefX6G16rmld10pWadWvPqn3Zqa6TpOm+v9fPnlVb
+3fDZw8ymc5s23lA4s2xmWeHeNcwO0KwY+nIz9KUKvSveIKgSsJkxKxKEVCZVUYyKsJfxUi/n
+VRQJJcrZKIArGAhKuApFQJijbMWNTCvbqGgVGlW9uJ1ZybYreoXlKreOIN5Pcvg6IvI/In08
+L1iVKqVMr2T4YKyUpTBJqWCOocN0vUS0KMgwRWkwjIqKUqU8LFNgWDhQcqe0+yj9pEPUtGlg
+rgJEvkaejyKL/bnyan9kZ/aKM5LrwoQE4LJ5Inwi/Ox7+Ilw/QQuwsV/DNfgX4bnk2ySE27F
+D4belfcpIemtz51s0xX/CyXw8m9sH7m6Iv38722BB7QodkrbzUgATIp84BleFW645Ge5+Ac/
+053BS7scMeh6SPeSz1EIzsPR62cg3QbpIXYfGoB7e8lrwG9vQK8z96MsdghZ5XQOnWJ16BT9
+EhjDENpK34DrEbg+h47ScVTCpKJSVg/ye6hHOnOz0QC7B+4PolPcr+GciVbS51EPnNdK9+C5
+1UwPOqr4HC2W3kFy0TNAdk/B+YB0D+pvYu5DT4Je65j7Jj9mN6EKZgm6HvL2wvsfhzqfpa+i
+bsWpSP0QlRyEM1gVcqCf41Rcit8nJeQp8g/mFsrTXPhbQR9g1Ww3+wT7V87APazgFdcpPuRL
++V387wSr0CqcVE5XNisPqoyq9WqV+j5NkqZD86G2VNui3ak9ojPoNuhO6AP6Dfp/G5IMA4ZD
+RrXxVpPGtNx0yFwa7fEZqBT4GZJ/B6pHHjRd+m0T9kOedDcNf3phXMovjBHQf7jC0acUqDYq
+M/D8vKhMIX9zVGYh6tgWlTnI3xuVFVD+NqkmysB71OhFWWZlTd6SZU7O/0SWFXL+32WZl2SM
+ZVmAN23FhqiMkRbfGpUJyD+Lygxagg9FZYq05Hx5FsURR1TmIL8gKivQElIpy0pJB3K/LKuk
+eskBWVbL+cdkWSvLL8uyXqqXvC3LJpCNJKK/WS7zb1m2SO9hGFmOkfIZkyzHS88yEX0S5DLZ
+smyTy5TIskOWa2Q5SS7fKMvZsrxMknlZZ2adLEfe/yNJVkfyr5dlSX/E3LJgY1/X8o5lXc6O
+tZ3Ozo7BDufDzmmFhfnOOSuX9fcO9C4fdJb39vf19ncMruxdO9U5c/VqZ8PKFd2DA86GroGu
+/g1dnU1d/Z0dazsaulasX93Rf+G5GdF8Z/SGdD0A73BOc6ZdKJQeLXT+Xu7UPN/FLPnxlQPO
+Dudgf0dn15qO/lXO3uVXVg3NRb2oH61BHWg1SEvRRqxBXfJP3D+HdPHefDQI57WoE479qJO5
+jXmc+RVzDNJR5mnmF2gB2oj64MnlcH8ZnJ3R0k75CelZJ3oY0jRUCH/50lYzWgkl+6GOAUjL
+oYwTHESqsU8+Sk+tBGktmgp3ZoIOq+HcAHkrUDfcG5CvuuDcBaU3wLETAnZJ7pTr7pDvrkDr
+4TlJ5/+sb8YPyjt/8MT5+wNRPSTtnSjtCm9K/8GbfvhcLrQhD/muWOpi7SvlNknSoNz+Tri/
+RtZkFeRJNf1veu3Skb0oS1crr3jvo8vKrYa6Lx1zedT/yztXQ5mNl15TO51GA7SKlsCx8LIa
+1sJ7/9tb5sJxg9xuyfJmQn4/jMVaWYv//sxFOYrJaHI2GrrS/7DIROxgem6+/qDzoHiw/mDf
+wc0H7zk4dvC1gx8eVB4/+PVBIhXpezI2Lt9RgXVNjiZS19jWSHoX4LsXHFhA5s2PpQ3zY+j8
+BgutrWmgs2oKaFVNLq2GVOMrpMX+XFriL6Glfhct99tomb+BzoQkQvL7YG7K66R5Pi/1eRdQ
+r89OX/N+6P3ayxyZ/PLQE8nV+UcmPzz0hN4N5y9FzROCLv8JazXdcGjrIVDr60OH5BLfi5OH
+hKT8Q+Zqev12E+1b3TdEdHd8cBcR74yJzxfviEnIF2+NBWlfbEL+1i0mh+463RbdLt1u3R7H
+dY5djt2eXZu3bN6++8Y9W/Zs27NdJ14j6PN1/Y5+Iq4T1Pm6Ndh5CjtfwP6TX50kzt+IvyFo
+KUZL9UuJ2HFPB9EtwtlmA80yJ9NMcyHNMJtoutlCHWY7dTnLqdNcTF+0VlJrQhVNsBZTq1n6
+0XghNYG6RrOVGiD1mbFonlmer9NmOBCHNScCDvVzAYfyeMAhQGLHAw76q4CDORpwkKcDDnw4
+4EBPBRwnnstwHD+W4fiV2DTucjx91OV46rDL8dyJ5zXHjj+rGf/Vr9VHn35GffipI2r9+OZx
+Ih7dfJToDvsP1x0ePUx1hz0g9oJ47PDvDk8e5pVCAVVrCEuJ9Cs9ROpZfARPbtm50za2L9DQ
+PLbZ1nKER4EFzWN4DO9qGeMD86MiypQ+A4MDA5lX+IwxlWNcZXfHGOeuGJAutNKF1l0BwphO
+knXuikw8Zq7sHjOD9B8vGTj/yRyI3oxUJB/Q+ivVKekyCMfM/wP6LW6UCmVuZHN0cmVhbQpl
+bmRvYmoKCjI3IDAgb2JqCjEwMzExCmVuZG9iagoKMjggMCBvYmoKPDwvVHlwZS9Gb250RGVz
+Y3JpcHRvci9Gb250TmFtZS9HQUFBQUErVmVyZGFuYQovRmxhZ3MgNAovRm9udEJCb3hbLTQ5
+IC0yMDYgMTQ0NSAxMDAwXS9JdGFsaWNBbmdsZSAwCi9Bc2NlbnQgMTAwNQovRGVzY2VudCAt
+MjA5Ci9DYXBIZWlnaHQgMTAwMAovU3RlbVYgODAKL0ZvbnRGaWxlMiAyNiAwIFIKPj4KZW5k
+b2JqCgoyOSAwIG9iago8PC9MZW5ndGggNDc0L0ZpbHRlci9GbGF0ZURlY29kZT4+CnN0cmVh
+bQp4nF2TTY+bMBCG7/wKH7eHFdjGdlaKkLLJRsqhH2q2P4CAk0XaACLkkH9fv/PSVuoh0cN4
+PDxjPPn2sDv03Zz/mIbmGGd17vp2irfhPjVRneKl6zNtVNs18/Ik/821HrM87T0+bnO8Hvrz
+sF5n+c+0dpunh3ratMMpfsny71Mbp66/qKdf22N6Pt7H8TNeYz+rIqsq1cZzqvO1Hr/V15jL
+rudDm5a7+fGctvxLeH+MURl51lRphjbexrqJU91fYrYuikqt9/sqi33735oL3HI6Nx/1lFJ1
+Si0K66vEhmzAVti8gUvGV2BHLsCe7MCBHMArsgW/CJfCG9bcgl/JUmdLfgXvmL8Bv5E1eC/s
+4KkLxuGm6V/CQdPflWD6O7xX09/hXZr+JXrU9A8Sp394AdM/SB36e/Su6e/3YPp7caB/KXH6
+O6m/+KNfTf9yl9jQ38PN0N/D39A/SHzxR++G/h5na+gfUN/Q30mc/l7i9Pd4r1nOH/5m8UeP
+ZvFHj4b+QerQ30g+/a3k09+gR0t/hxy7nD9yLP2NMP0D+rKLP76vpb9HX5b+Hmdil/PH97X0
+d7KX/mEll3m5tbjWmLs/46Ka+zSlUZHhlBnBdHR9/Du/4zBil/x+A9ck8I0KZW5kc3RyZWFt
+CmVuZG9iagoKMzAgMCBvYmoKPDwvVHlwZS9Gb250L1N1YnR5cGUvVHJ1ZVR5cGUvQmFzZUZv
+bnQvR0FBQUFBK1ZlcmRhbmEKL0ZpcnN0Q2hhciAwCi9MYXN0Q2hhciA1NwovV2lkdGhzWzEw
+MDAgNjM1IDYzNSAzNjMgNjM1IDYzNSA2MzUgNjM1IDYzNSA2OTggMzYzIDM1MSA4MTggNDU0
+IDY4MyA2ODMKNzQ4IDYzMiA2MTYgNjgzIDYwMyA2ODUgNjIzIDU5MSAzOTQgNjMyIDYwNiA2
+MzIgNzg3IDY5NSA1NTYgODQyCjUyMCA1OTUgNTIwIDc4NyA2MjMgNDI2IDk4OCA2MjMgMjc0
+IDc1MSAyNzQgNjIzIDgxOCA0NTQgNjM1IDQ1NAo2ODUgNDIwIDQ1NCA2MzIgNTkxIDYwMCA5
+NzIgNTkxIDczMSA1OTEgXQovRm9udERlc2NyaXB0b3IgMjggMCBSCi9Ub1VuaWNvZGUgMjkg
+MCBSCj4+CmVuZG9iagoKMzEgMCBvYmoKPDwvTGVuZ3RoIDMyIDAgUi9GaWx0ZXIvRmxhdGVE
+ZWNvZGUvTGVuZ3RoMSAyMDA2ND4+CnN0cmVhbQp4nO18e3xU1bXw2vuceWSSSWZC3plkTphk
+eEwekAQDIZIJeSDG8ErAhBLJZHKSGZjJhJlJQtRqrCI1olJbaaWt+Ba1rUNAb0D7ge8WH9D6
+aLUqaLHqbSm0n9rrg8xde5+Tl6DXe7/vj+/3+5iTtffae6+99nrtdfY5DBMO9soQB4MggNPt
+d/VMN8bqAeBFAJLo7gtLt70VfhPx4wDaOZ09Xf5L755tBtCbADSRLt9A5w3XxF4OYDyEfX/3
+yK6OVc75CQApEeRxgQc7Wka/p8P2h9jO9fjDm09r+uwAqXHYnukLuF236j4xYLsU2yl+1+ae
+JkO3iO1LsC11u/zyiudfugHbPgDH73oCofAOmB0FqHay8Z6g3PPzgTsysN0GYDiDfQQv9kH+
+RMvaVBA1Wp0+Bv4//WgOQDpChuYBSBftkAYQ/QDhQ1aPeqMfsnFW039H4hEVAHbDL4kXfgkH
+4SlyGmc9AvthH/wGUqEGfgZXwo9gK2hhLfbcAKvw0mD/j0h6dB8UwV0YS3fBS0h7KVwFByCF
+pEU/gqthi/AKztoCRpgOVbACAnATuSTaC+vgmHgtlMEl0A09ZDDaHL05emv0XrgP9gu/iZ6B
+WMgAN14vRf+u+WP0LSjAGbfB7XCM3BrzKDhxlUGk/DkEYafQKpJoV/RzlCAH+lEGERrgJXKI
+OpC7DB+QNHKlUI1c7olGos8glQVawQM74QCZR5bQHM26aEP0JUjBNTYj19thGB7DawR+DW+S
+OM3p6L3R05AO+bAU9dkHL5NDwuiZa0YrmaHRSrNgAY4E4H/B83CU2MiTNKCJ0xRrnJrLo69C
+EsyF1SjtAzjzL+Rf9Cq8rhaeE+uiiyEe7fIDZm14Ft4lGaSILCdr6CwaoHcIQdDjinPx6gAv
+2vsnyP0d4iCP0Th6RLhHfFj8Qps1ejwajx6xw0/h5/AkMaKmEgmR75HXyZ9pNV1Pf0rfE34k
+Pij+XudCrS8DP9wED8O/SCKZT1aS7xAPuZJsJT8gt5OXyFHyIa2iTXQjPSV4hE3Cr8XFeDWK
+IfFazfWaG7UfjjaPPjP6u9F/RYuj18NKjIdrUPrb4A7UbD8cgTfwOgbvEQ2JJfF4SSSHrCZX
+4HUVuYncTXaTB8k+XOUoeY98RP5JPiFfUMBLSzNpDp2Ol40GaT/9Ef0ZPYLXUfo3+pmQKkwX
+HMI8oUJoEQIo1VZhO16PCu+KGeIRMYp2Ltbs0OzS7NY8rHlKc1obp/ueHvQvfnnPmdln3hmF
+0e+P7hgdHt0XfReS0YcZaAUrVKD0Lrw2oL93YMQ9Aq+QOLRdBplNFpFL0DLryQayiWxGS15H
+dpL7uOy/Ik+glf5ATqHMRmrhMhfSeXQxXY7XZVSmm+h2eivdR1+nnws6IVZIEJKF2cISoVWQ
+hbAwIOwQIsKLwtvCe8Knwpd4RUWDaBWni3bRIS4R14u94h3iB+IHmnWaFzTvaw1av/Z67Yj2
+H7oLdIt0K3Qrda26W3SP6V7Vt2F0Pg2Pwr9N3vPkuHCNUCs8CjfTEjGdvkxfxnheDx1CA8VI
+pbvJ9+l3yT6aq9msXUgXkmVwWrSjrZ+ju+indKHQQOpJI2ygcxVu2iTxIawqxKfhpPgE6vYy
+ct6sjSNX0VPaOBgmQBfgms8Kc0SH8AK8KRwjOvEu+JNoIKnkJH1AWIFR8GtxkaYZcoSfwa+E
+TeS78CitxYz9hX4bxvEy8hDmhSZSTP5DiIJAl2EUlQl/hmthI/0jnMR9/H34MekQu+BmKCFX
+wgdwP+6KWZpu7WxtMvkt9YpDdBrZB1R8ELVbQHKJoEmC60irsFN7ir4BvXBENMA7wi9Q+iP0
+V0KDeFqzinhwB3wXrodN0WtgQNMs/p50gUDWQJ54HLPblUKxmIP11ZhV1mFOewx39wHMA1VC
+A/akYeRcgnGxGjPETrx+gnlCxAjy4h6/FLPYy7BP20RHoEsTTzDrAIgvjK6CtdH74fZoF3RH
+b4UCzAdbo1cix93wPtwCu8mW0SugB7Jx57xDLtHU0SOaumgBHaJv0Ea6Y6p/0dp5JA3+Ha9f
+QR0s0jwOQ+IfoBEqo9uir2F0z8QMezu0w8VwArX8O65wkXAISkaX0T3ROqEH9T0GK6MPRK3E
+AJ6oD5bDE3CfTgMuncNZVeWsXHRhxcLyBfPL5pWWFM+dU1RYkO+YPWvmDHterm16jmTNzrJk
+ZqSnpaYkJ01LNJsS4o1xsYYYvU6rEQVKIL/WVtcmRextEdFuu+iiAta2ubDDNamjLSJhV91U
+mojUxsmkqZROpOz8CqVToXSOUxKTVAEVBflSrU2KvFRjk0bI2pXNiN9UY2uRIic53sDx7Rw3
+Ip6TgxOk2jRPjRQhbVJtpK7PM1TbVoPs9sQaqm3VsqEgH/YYYhGNRSySauvZQ1IXEY7Q1Nry
+PRT0RhQqkmGrqY2k22qYBBEhr9bVEVmxsrm2JjMnp6UgP0Kq3bb2CNgWRxIcnATPLGyZiLY6
+ouPLSF6mDdwo7ck/NLRtxATtbY64DluHa11zRHC1sDXMDly3JpJ6+Ym0iSYyT6xu3jp5NFMY
+qk3zSqw5NLRVity5snnyaA4rW1qQB86leXVtQ3W49DY0Yn2jhKvRLS3NEbIFl5SYJkwrRT/Z
+Vst62jZIkRjbYptnaEMbuiZjKAKrBnKGMzKc+6PHIaNWGmpqtuVEKjNtLa4ay54kGFo1sDfd
+KaVPHSnI32MyK4bdE5+gInHGyYg8PsYxTs6w+lXjliVMIttSDIiI5JZQkmYb6jSfFfJ8GHLP
+RzL8tBCcFelAj3gjMdVtQ6Zy1s/mRzR5Jps09AlgBNhO/m1qj0vt0eaZPgGGsjgZDzUcH8Mj
+Dkdk9mwWIrpq9CnKuIi35xXk941Qm63HJGGF5oMVaFtXS3kRmj8nhzn4xhEntGMjMriyWWlL
+0J45DM4iR0uEtrGRQ2MjyavZyODYyPj0NhtG8j5++E2O6O3jfwmmlGm1nvIISfmGYVkZr2+0
+1a9c2yzVDrWptq1vmtJSxuePj6lYZFp1s5BJVYxmCnwUg3LdODFrNMdFxDz80/Kg7hjR6TEq
+eQ+R6iKmtouUssWQk/MtJ41ET7NZvJqYpooZKXdMbS+c0p4iXtyQgALjTbC+ae3QkGHKGIaa
+suBStcKIh6bmHKk6AqtxZ+bh30j00HwGLZkRJ5qsmhFg/CldanMKYaaKt+CHRWdBfh0muqGh
+OptUN9Q25BqJDrbbJJNtaD99ij411FPbNhY4I9EDN2ZG6ra1oK08pLwAKOGHTw3gaVYHi/dR
+ckKrG6G3O6eBRjwhgEEnniCQrtdqTlDhCbypx+ARrxDSHKZPK85ULDN9XNFwpgIqETd9icXc
+OTnmHHMeFgRvaV9KwqEvnRr4AiTxEHu66ox+oOnTvAJZMOJsc9MNWVSCYqMb71zhrEG4Lms7
+7NQ8LNxn3C/sMz5vPAonsv53ljk+McuclSXM1s40z7ZI1iXGNUmXJq9J92g2Zl2ReGPiTuH2
++J2W3eReutv8Wvw0vIdmmJJMGSIdib4zPHMBQUM5Z8xcYEoAImZOy44TMrPFGJM94WKwS4SQ
+DGuqXdITfXq2e12aAxVqbTi5zPQplh+fhMqTlSfNqQvmziEOR2vrJmglQZKqFW3Tc+m80sTc
+kmIxVWe326ZraXJSYkpJ8QXivqcuHH36/ZOjf/jpI6T6qbdI/sKDJU/98ME/r/P/5fp73qN0
+7qkvniTdv3+frN5z/IWCO2+9e/TUDx4f/WjoCTzA1kQ/FGeIi/AJJx2edLYm6gzpcUu0F+nX
+aFv0XVqvXl9qKk8sT5mXVmuqT6xPqU1bp1kXs8rUmtiasirNr/HHdJj8if6UjrR+khyj1Ri/
+IzRpmgzfifMJskY2+OIMqRZRZ7bExibl6phVpuXmlc7REdCZdJJO0M09lkkyWX96tq10DuLx
+ueBEEitUonBzM0rLmNdbHSdNmxytn7Yiwu2DxtnUCptwszljGjWNMe2a9hiRtLZMM5VdUFIM
+yUlarW06TEti5plXyoxVc+8Nz/6JpFzx1xuPjZ7cP7z1+uG9W7YO4yFsxs19o++eeemv3yPZ
+xPjiCy/+7tkXDmPUbMVTpB3tYoPn9kNM9I/OqlhjaZ54QjwR827q+5LmNc2nEk3VS7aYtEwp
+RhBs2RZtMqqp1RGtLSPdZDiaR7bn3ZlH81JTM+LztpuJeYS0PpqWt50pTFqd6UBLbHnkKJDt
+cCdQpvBy3A/puXkjZPPenCUr0hyOZR+3bgpisJ/ACDn5ceuZZbVyzV82BTH0KyoqKysaTCdN
+LFSIOXFBIgZM9YAzPi5pmj0pzpxJEo3JmQQcGETXkFZodZSYS5IvQOOkpLIi2Wwzl/IoUjBE
+ENt6V/H9G/p+bL3q8B0P7bWtW9Tzo33NHZdcUy7ab1u2vr35wCOPnZlBf+5bX37bvWd+TIc3
+b16x8wdn3kBHbR31ijlorUQ8DR5x3hdnKjBdaKo3iZVSRKJWaVacLas4uThrcVaPtF3Sl6eW
+Z16cenFmi/47cetS12Vu0G+M85r8qRszD0mvJL2d9nbGK9knkk5kH5eiUopNdJgcyfPEclOd
+eLFpren92L9mjZpizfFCisXCrJ1iiY+F+PTcowZiMjgNbYZBg2gIk2kltCQxD+AQIdvJnSRC
+ThPRSirxIVUg6dYlZWmEbzxmX9OZj0+YzrRuwtjC4MLdx62JGw9HYdO0McPh2ZFiWNlnmIVJ
+gbX13vJbPd8/uqH32BVrbyk039+3+eEHwqE9o17Nr4dWrtwW/ck9o1/ceEn5mS+Ee1965oXX
+Xjj8B4yuazExlWkOoL+37QdN9NDesvmlGtwGe0vnKfWcuUo9PY/Xzrzk1NIEjRUfFY9pxOVY
+nNYIVk2PZlAT1YiYTg1UyCMwonBitTOjZF7pLiCH4DT6ByQ4CscxOy4TWWDhjtoUdDgqWBat
+xL3EW/jBGDFfu09z4PM6nFOPmSEbfZqMmfMdZ4cVLMl0tdCqaY1ZHSsLGzWBGDlWbwITMdEZ
+iW9oPk/6NEM3N7E8fa6lKrEho8qyMnFd+iqLK9Gf4bJs1m5O/pR+mmaCFJJgTE1dkdKW0pOC
+HkzYbrrTRE0mMdNi0MEIfcgZQ26bZhFjU51GpkXMjNmlESMxZliZbnn2UlY7s1iysBJrSokp
+V+fMnV1q1VXqlmM6Sc9mCYP51YG7ZhkmDcenmxwNLGmcOVF5MnFBUWvFmU0VbMNwH7OdQTax
+/MryhdkEmDzMSbqcFOZfkmOfwTwsXHYg/+/7Pxo9RZLeeo3Eky8/NAxvcW878yZdGTd/zQ1X
+PkjWpN6zj1gxsOLIzNF3Rj8zSY8c8JDbrq/23M/uQLnRf9LZmtshFQb3gwH1sNlLY5geVYgM
+phMgcUYDESDFFONIMGBAC7EJpukwnRgT8+JIVKevjalt0/XoBnXbdSJg3rxTF9Ed0h3VaXUH
+6AZIIxfs6VScinF8kt0WT3xcwfIkoiyWzSUlpt8yZR2OvFQWwfZ5Ztu8EnMZRrbNnMSUpaaM
+SyraffnXXbf30UenOWZm37XLtEi+m7q3EZ1v9KZtZ37YkJ+Bj6pQF/1QOIaRa8aoeN35sIGK
+xjxjqbHGqJmXNM9yKW0yrEpqtHTRDo0c405qsxyyvqp5bdrb6e9Pez/pVOpf09/POm6NWlOs
+VkdGRUpFRn1Gj3W7VVdIc42FKeV0nrGe1hrrkpZaLjWsMXYZ39d+kPI5+TjeRJKF+Fi8nWZa
+YnVmMCSjidJKCOSZE/JMpqNmYjI7zW3mQbNoDifmHtQd0R3TRXXipLBYoYTFpoaTuNErMHGe
+qTjBTcTAvMCs7nh2V8mZp9ioNJGnS9wTZNJ+F+bLz1z9Wu+GV69t21G094z0i96++3Zfsfmu
+6+/Y9sU9u4gwtLKKxn9eRxNfPPzkc2+++Ax79EWgv/vbz0pvb1ufUPGJPlPPn4jv/vOM2RPP
+x6NerR1PKQAx6vtgPk+3aHQZVE88RH/lValBC8q7DM3z0CmGoEb7EGzFeit5Hq7Fuh7HcrGu
+Q9oL8HqWrCQf0kH6e6FfeFvsVzkaIJflCCYlmKAIFuPTf5zhDGYn1lsnLAN2UuNC8lLg8wy8
+JfBZ8USv4gJcRlJUXAQDCau4BsP0KhXXIv0OFdfBM+ReFdeDnXpUPAaG6M0qbhCfEtJUPBba
+dW+qeBx06itU3Kjdp79bxeNhXcKacVtdnTCs4gQ0prkqTvEEcoGKC1BkulDFRaTxqbgG4kyb
+VFyL9N9VcR20m65TcT1MM/1FxWOg1vSZihuoy7xIxWNh7rRd42/5S6YdVXGjsDZJUPF4KExt
+RUmIyKwel3ojxzXMI6k/5riW9z/AcR3v38txPcef5jj7N4PR1FdUHH2U9jsVRx+l/UnF0Udp
+H6k4+ih9iYqjj9JXqjj6KN2r4uij9H4VRx9lLFRx9FGGS8XRRxl/VXH0kfWXKo4+khJUHH0k
+9ao4+mjGLI4bmF4ztnA8luky4wccj+P9d3E8nuMKTxPTZcZ+jk9DPHHG8xxP4jRvcDyZ83mf
+4ym8/xOOp7O5MwnHMxnNTEW2LEYz08pxK8cdHM/l9GUcn83xWo4XsJ0xs5Hhei6/ivO1Zq5n
+eJzSv5HjXJeZ/dAEA/jcIUMnuMCNtQQPIjSBh+MNEIBuhLBKJeHOD0AQcVa6sN/LKSTs8eH8
+QsRqeL/r/5BT0bhkEjTiiA96x2lC2LcUa2W9ubAArzlQoGLFvLcKZ/iwXoVzulCGMJ+1CvmF
+EILQh2UHUgVx3IWUbKQL1/BhK3iWtOWTKKWv0JbDGs4xNK4Bk2A+lhLMRE5elDOIIyGETuQ4
+axKvr5s5QdGAdpho/YpblNmrA2f6+fobsY9x/p/bWsJeppEXJQlziZhtJGwzmrDKdTX6QYIV
+fL4Edr5eA5bLce1ObnMX0rN5MnJlVu7nMxm3wnPIpPg3gOsymXqQduBrqWQeV4yun0vVNb6u
+V43aAu6XALSrUi/jIx4eOS6UJn9c9iAf8fIIbcSyl0ut+EGJJuaBai5JmFt5zG5BlEVCKpca
+g0okebntO3hksVjr5mtNjhe3ysvFZWMz/Zwjk9uD6/s5R8X6Epfaxddzq95QRpjUIdUfLq6j
+Mm9g3P9eNcp7VA/K3DYhHnmKdmMecqny9/LVJL7CZKnGPM9sw9r9nLdnUjQw2gDnpaw91q9Y
+O6xaxK1GaugsujDylLlVvFgrvN1qTy+3NIuoiZgO8B0b5Bb18flMUuZPvzprbAU3n9+nrupV
+NVX2HuMwYYVOvod9au+EXb2qdQOqJl5O38tbE14N8Sj1cenOHRNjOTU0rgsb83N+EzxYbtio
+SutS7e/m2U5Sd+mYzTr42l28V5nPdphX9aGH77seNUYCWLId3adaW+EwkeVd3FdKdEjchm5V
+fy/3mo/T9PC9p0RjN5+paDI5ur3jkcV2/mbVM34uDYvNPnVvKXnHNy6Hn7cmojf8lTtR6Cv6
+udU12jmHXm7pjimxKcMm7B+zbC//9+4xDTt5bEs8BjZz24Z43IXH84nidSa7st/DatZQdlNI
+jbKJ7KmM+rlHXHA5n69Izfi6+ehEpCmrd3Br9fBdMjCuxdja3TxnsnEXt0RQXYPtIcWKYT5/
+TOIx7j08hvw8b47JVsjveWEcK8d7aRHyZVchp5qcYQt5dvIjhYfvJR9ifsS6uYdk3grBeh4D
+iscLxyn/767QzyNGoZUnrbIMM30T3u/rEKox8hi+HHvZHaAOy0t4fy32NGLJYnMJ3glq8Wrg
+vU1gxCcDBk08mkLniDVpvF/ZJ4pFe1SbT8Tot7uLTXhmLCOP+bmdjw4gfe/4mu7x3KbE88T9
+aHK2VDLHRB5V9q9XzZkhdU93cS7yeE5ku7VFXY3t7j41l7aP342UNcPfYJmx3Nk/np1kdcfJ
+4zEd5PkjrO7nTjUez2WvsV3ILCZP4jKxi89er0O9A7IIbOeZUZG6XfVMt8r5XB6awbWaaikl
+I58dFWevPJbbWBZz8TOoC1f1qdYOqTnk69Zm1l+NPRN5duAsX8jqKWPymUvJ3i4uUQ+3rFc9
+6Xwbn0tqLHZPym1j67JM0sEt7Z10FwlOOiPnj1MHJ8XtxL37my3FpPNz/mNxFZjCr5/7fyP3
+5uRz6Fh+nKAMIK1yQu3lFmf8PeP6KHJNjm6/mlEV+yu7qkeNj4nMOzWGvkmjifhYynU/23Nj
+Zy92z5HVE5qijXLec3Ovdn/FB8Gv2HuCc4ifVtmJpEO9D/Xxs1E/TD5d/dfeH+MXVM9/XvVZ
+51ynuLP9qFhr4sTq5jzP3sdjHnN9xdad/y1pJ6x89gpT7/dTJZLVU2wY7z1jHNjzSRUoTwIz
+8QxfCmX4rCVhORdbBfiEWIowB9hbgtVQr1LO4d8JK8VLwcugBIHNugDm4bMAA8b9v3ev+5/f
+GcfGir5ivfH7YdNAj9zpcsvSg1KTR5YaAt2BMHZJ1YFgTyDoCnsD3VKPz10o1bjCrv+CqIgx
+kxoDvl7WE5KWduO8uQsWzCnAorhQqvL5pFXeLk84JK2SQ3KwT+6oCnpdvlVyV6/PFRxjW847
+JbW3fI0cDLEFigvnF0szG7zuYCAU6AzP4lSTB3lHQxOvdktNQVeH7HcFN0qBzm+UWgrKXd5Q
+WA7KHZK3Wwoj6epGaYUrLNmlpgZpeWdnoeTq7pBkX0ju9yBZ4Tgn1DfQFXT1eAYmd8lSTdDV
+7+3uYnO9aNoCaVWgHVkv87o9AZ8rlM+4B71ur0tqdPV2d6AOaKb5xdWB7rDsZ7IFB6SQCy2I
+RvJ2Sh1yyNvVnS8pdnEjlcuLg/5AUJY8vX5XN4ovuT2uoMuNamDD6w6hHq5uCccGmP5eNHkP
+Kii75VAogMsxhVzIv9ftkbwqK6Z8b7cs9XvDHm4GfyDQwWYzHMUOoyBuNGporC/cL3eHvTJS
+uxHpDQ4UStzSgT456EJfh4OyK+zHITbB3Yv+DrHFmPfkIBehs9fnQ5TLisv7A7iIt7ujNxTm
+qobCAz55siVYpIbYKnLQ7+3mFMHARmTrQvndvbiQ4sAOr6srwMb7PWhzySP7etAiAanL2ydz
+Ah7yLsmH5pD8Mtqu2+tGcldPj4xm7HbLuIhibi8zliRvRmX8sm9AQt1CGDs+xsPv9XHzhtVN
+FFLXc+OMdlnqDWFIcWvKm3qZsL1uZn+pM4AqI0dUKhxmcYKqB2X0exhDA90UQpPx8MSm39Xl
+utzbjazlsDtfMRpO7/CGenyuAbYEm90t94d6XD0oGpJ0oIhhb4gxZuQ9wYA/wLkVesLhnvKi
+ov7+/kK/GrCF7oC/yBP2+4r8Yfbd7iJ/aL2LKV7IOr/lhH7Zh70yn7JsedPSuqXVVU1Lly+T
+ltdJlyytrl3WWCtVLVlVW9tQu6zJaDAamjxo1jGrMRMzn6CgqEGYW/QcW4wrwwKZ6dw+IA0E
+etlMN4s2tDPfR0pYYnDwGEX/4vbrRnJXV1CWWSQWSi04zePCMAi0s22EM8NThGHR2c/CSUbH
+yczSQdkdRj93oh0n5GIuDHTJnIS7eHweugajt703jKxRzADuqEkKzQiNCYWBPG6K8cks2qQ+
+l6/X1Y4R5gphhEyeXSit7uYxOzCmBeqkZi4Mb5cU6pHdXkw6Z2suoRW7ebSxua6ODi+LCYzK
+IM/I+aw7yG3Ld/dXhPJ5/V6mEC7C6foDwY0hJUh5PPLOQD8m1N52nzfkYesgL8XcfgxUlB9d
+1TMgKcGrWmjqQtweSzsnlGPZa1OvHOLLYN5zy8FuVYOgKjcnDnkCvb4O3EN9XrlfSVdnqc/o
+0JMyZoCOiRQ3riOKxROrOzzhY6aYS5W689xsucjjE9R9rzLCdVzhckawurEKbwIz55eWzZLK
+5s4vmFM6Z05MzOp67Jwzd25pKZZlJWVS2QXzFsxbYDR8za77xs3IWkWqeHwf4qNqgD/ksUM5
+e0QbIEa88W/AA8BH/NgwNtbIj0HsIZEd2jqEncIe4dfCQYT9wgHhF+df6Z9/pQ/nX+mff6V/
+/pX++Vf651/pn3+lf/6V/vlX+udf6Z9/pX/+lf75V/rnX+n/P/hKf8qT/wTu4vTnGnv3K3Pk
+Ke8E+FuBr+Hp4xE+qS1mi3PFenGJeCGWC6aswHLw13FZxvcMyz2K9h4SIXcJwPfF1885Nz7+
+XV6IzoAdcI5PlQ0ShFQ4hRBFEMCKZRHCcoT1CLcg7ELQcjrWE0C4GuEgwmk+4hRSh28tcY5g
+dSOv9m7wFfOmS2mua+XNvZe2KHXDSqWuWaqQlStkc0uV7sLFSj0jX6kT84oHWW0wFh+qShFS
+4KjAvnzZgyWhz0ACIWCFO4VkiCBQQav2OIXEvbn24l0HBRGIQAWCNrVGDwlk2GgurjLQKD0F
+iWClf6cnlRF6cm+8uXhX1cX0PXgE4SCCQN/D6136LlxNjwOBBCwrEXYhHEQ4gnAKQUuP43UM
+r3foO0j1NhQhVCKsR9iFcBDhFIKOvo2lib7Fvg3MS4ZXIlD6FpYm+idU609YJtA3EXuTvomi
+vTJctqB4P0ccRSpizVOR1EwVSUwpHqG/H/5slnWE/nmv5LDeWTWHvgoRBIqLvYrMXwUJYQVC
+G0IPghax1xF7HQYRtiPciRBB0OKc13HO6zjnMMKLCK/DHAQnwgoEPT06jMuM0CPD9sXWqhT6
+Mn0eUtGoL9Hf8PpF+hyvX6DP8vq3WGdjfZg+N5xthapYHAecY8LahHURjmvok3tzE63RKjM9
+iOaxYlmEUImwHGE9wi0IWnqQTh/usCYik8fhsB6Qchg+4vX9cLcenBusTns1xpjECnv5hYhh
+sUvaZadO+47bsckK+823IsYK+3XbEGOF/fJrEGOF3deHGCvsHRsQY4V97XrEWGFf3oQYFiP0
+jn/LnWEtW76RSFUJtB+t1I9W6kcr9YNI+9kFn4lMtp8Oz56NFtvpdMyabR08QAafIIOryODd
+ZFAmg1eRwWvIYAUZvIwMOsighQxmk0EnGXyczEdTDBLnvinNBc40MniYDP6SDIbIoJ0M5pHB
+XDIokTLnCM0ZXlrCq1pe7a1i+wrrCxcVJ6CMOWjRHAzrHNz2B7E8ghDlLScSSdMV4vRsVk/f
+O7tSaReWFweqLqJP48Sn0Q1PwzEEER30NIbR08iEfTs9ActKhPUIhxBOIUQRtEg9HQW/hZcJ
+WBYhVCKsR7ga4RSClotzCoFCQBXxES5YkSr0ctaiT+PFfo0jh+Y4s0wWk8N0kXCLhSRkk+XZ
+0WxaBinsfyckmvXmEWJ87F/G//iXEWKqYujN9BbIQkdsV+tbhj/Lso6QnwzbH7dWJZMfQ7aI
+UUcWgJ3kYT0fQrw9Dyx6VpeChT6MdfGwZQ1OSxi251sPkHg26zHrZ5YT1o8sIxTRDy2PW/8g
+jYhk2Poa9jz8mPVVyw3W3xaN6LHnCfsIweqAxEn3W+Zbf3mYk16DAzuHrVex6jHrdy1LrBst
+fEBWBi4LYcuZYF1lX2u9CPnVWNqtzhDyfMxaabnMWqFQzWNzHrPOQREcCjobhZ1l4YvasjnD
+1WUjxOPM1+3QNeuW6y7QFevydTk6qy5Ll6lL0ifqTfp4fZzeoNfrtXpRT/WgTxqJHnc62H+u
+SNKaWKUVWSly3ERZSZX/Z0KJnsLFEJkm1NP6xsWkPnLIDfXtUuTTRtsIMaxcG9HYFpNIYj3U
+Ny2OzHfUj+iiqyJljvqIbsV3mvcQcnML9kbo90cINDWPkCjr2pLJfkpgPxBi3nJTJqtnbrmp
+pQXSUvoq0yoTF5kX1NWco2hTS8fEJ20KnhXZUd/YHHkoqyVSzJBoVkt95Ifstwb2k3+S07U1
++8k/WNXSvF9YRP5Zu4r1C4tqWlrqR8gaTgcS+QfSYcT8g9Pps0FidCDpsxW6nQpdHs5HulxW
+IV1MDORxuryYGE4nEka3J5RbW7MnN5fTpOLRk9OEUqXJNIfzkCYvj9OkDMJhTnM4ZZDRRBZx
+EosFSbItnIRkgIWTWEgGJ1kzQVKkktwwTnIDX0kgEzQWhcZ4fIzGeBxpHN/2Iy92OMjehS3u
+dex3GtpstTJCW+TGPk9aZLBdkva4W9QfcLC3tbs9rHbJkRabXBNx22qkPQvXnWN4HRteaKvZ
+A+tqm5r3rHPKNcMLnQtrba6alr1LVpSWTVnrhvG1Slecg9kKxqyUrbWk7BzDZWx4CVurjK1V
+xtZa4lzC1wIe4yua9+hhcUv1OqXeS2MNGK9tmTkti1NMPYt48C7MSbsq8wAeSHZDrKMlEmdb
+HDEisKGCqoIqNoR7ig3Fsx/jUIfSrlqYk3mA7FaHTNhtti0GR7g31Atptd4a5S+EH+wK9zKD
+K6Uj9HUfHKuNOF01oTBAfWR2Y32kcuXa5j06Hfa2MZUi5WN9sbG1I9FDSmchdpazTkEYJ2R9
+FawvJkYlPNv/vWpdzXbBIH18L3FmE3yoaxEi2fVNFFNBk/qrBwfwuMRuD6EWVDBEHCQ0xoOL
+DQoOTN8xCPeqmGqHsFors3BKaMwc4x+cg6nqPwHT8gurCmVuZHN0cmVhbQplbmRvYmoKCjMy
+IDAgb2JqCjkzNDYKZW5kb2JqCgozMyAwIG9iago8PC9UeXBlL0ZvbnREZXNjcmlwdG9yL0Zv
+bnROYW1lL0ZBQUFBQStBcmlhbE1UCi9GbGFncyA0Ci9Gb250QkJveFstNjY0IC0zMjQgMjAy
+NyAxMDM3XS9JdGFsaWNBbmdsZSAwCi9Bc2NlbnQgOTA1Ci9EZXNjZW50IC0yMTEKL0NhcEhl
+aWdodCAxMDM3Ci9TdGVtViA4MAovRm9udEZpbGUyIDMxIDAgUgo+PgplbmRvYmoKCjM0IDAg
+b2JqCjw8L0xlbmd0aCAyNjUvRmlsdGVyL0ZsYXRlRGVjb2RlPj4Kc3RyZWFtCnicXZDLbsMg
+EEX3fAXLdBGBHSdpJAupcmTJiz5Utx+AYewg1YAwXvjvyyNtpS5AZ2buhZkhTXfttPLkzRnR
+g8ej0tLBYlYnAA8wKY2KEksl/D1Kt5i5RSR4+23xMHd6NHWNyHuoLd5tePckzQAPiLw6CU7p
+Ce8+mz7E/WrtF8ygPaaIMSxhDO88c/vCZyDJte9kKCu/7YPlT/CxWcBliovcijASFssFOK4n
+QDWlDNdtyxBo+a92yY5hFDfugrIISkpLygKXiatD5EPiUxu5ynyNfEx8TvpTzjeRz5mPkR+z
+pop8yfkq9XL/NXYV1/YzLRarc2HStNs0YhxOafhdvzU2utL5BqsMgBYKZW5kc3RyZWFtCmVu
+ZG9iagoKMzUgMCBvYmoKPDwvVHlwZS9Gb250L1N1YnR5cGUvVHJ1ZVR5cGUvQmFzZUZvbnQv
+RkFBQUFBK0FyaWFsTVQKL0ZpcnN0Q2hhciAwCi9MYXN0Q2hhciA5Ci9XaWR0aHNbNzUwIDI3
+NyA3MjIgNTU2IDgzMyA1NTYgMjIyIDU1NiAyNzcgNTU2IF0KL0ZvbnREZXNjcmlwdG9yIDMz
+IDAgUgovVG9Vbmljb2RlIDM0IDAgUgo+PgplbmRvYmoKCjM2IDAgb2JqCjw8L0xlbmd0aCAz
+NyAwIFIvRmlsdGVyL0ZsYXRlRGVjb2RlL0xlbmd0aDEgMjkwOD4+CnN0cmVhbQp4nO1WWW8b
+VRQ+d8Zjp6VLtpYUF3qHKVDIOIsDiEopmCRO4oQmwXbKGCLBxL1xph2PjZdAKpUCAlossYlV
+bAKEhBBCugliEZVQUeGBTYitCFokxEtf2gdAPICoy7njyaISiT/AWDP3O+d853zn3HhuXCqU
+GayBu0GGSDpr5psJAbw+ByCN6ZkSndj4sIL4Z/SNTeUz2W+3zZ8EkDrwZhl7durPwxdJAL5n
+MP78NDN3nxw42g6gXIn21dPouPfMTQG0bbS3TmdLd35Ptteh/SjadXYubeowglAR+f6seWe+
+Wd6MDSgvoU0dM8sOf3y8ivYRvGP5XLHUDHvOApy3RsTzBZZvaf3tTbR1tNvwJuC2jxMB8bv2
+/9cT8Bg8CG9CDF6BFLTDlaBDGG6DG0GDPugBFT6Ej+ErOAqvwgPwFNwDz8FLwOE1iMABuI88
+D5vkY8p1yutwi9LAQefQNMyvGDP40EyKg3ZdC/e3GjtSrm9/in7LSVNbS4gTnf7I17SGuKQP
+x42ollJDXNatFsojY4bKI6kQ9+kiVdXUfcZPwS9SQeQZZ4KnU0FN5UqrwftnUm4glcJ6ir52
+4uYQ9+tzF5NDqE4PTUwEOWCZgD631XVFFl11emMD3d4e4qt0ul+IfIRlKJcviWmU+y4d4jBm
+VFjFpAJcE1TVVLDiWvGaJQRX17qrD9arWPE8nX7tjrNGp+080DphUDqg9Zt7qEF3T9ZKCN5a
+oYzStEIHKv2mVqEVzZXTRHEeQSbOJxw8woSBOetcpR3HWlQ1SI9VcBswKYbdjHu9qS5tva7R
+Y564Ro3hRFDlJGVUcKCYVtFoJVbRTJFQSxFLiNeLP0Mj9t0gBhCg8ZwBKmLRzD23LZ9EpDbp
+OETloNi2od1aJcDpmNEdPIKRZv0tiJBITw8Zfq8e0uA+BXncEM+4oU1i91pPEBei9eDOR+LG
+PFDoTffME0pw4TTNN7HNC1obdI5e3Bd8hMS3VsLvJki7lXE8mQLQNkegvXs+4Ft/OjznV050
+z8sSQpiThVsR7vmA/7K/u+eJ8Hc1qA2XqA1qn0SrW8kz1Wll/K83+nxfgDgRHoe/lapfhXVo
+nO+XJdkfkC67uivcBMpx7dezpx7J3XTwLTaZvIPc5Ve73q2+Xf20+l2sn7w/WKyelO6H2qky
+1dX1+65Hfrh1ffcfsKXOfdE+C33y5PIXz1XBcw5nqV2YF9h15sAyyrnnkySdgj7/TuwRoHY0
+Encv1ns1JLQl2Cjc8kLuxeTFxToHFmsSWI0W8bICeALUsIz+Rz3sQ/yshxVYi+9/DfvRP1fD
++GiBwx4msAq+8bAEDXDCwzLUw2kXE5d/xsPIJxs8LMEWcpGHZWgkO2qT4UMlox4W/LyHJTif
+zHpYhgZS61kMvYG87GECdeQdD2M/5AMPy9BEvnSxDx+byS8eFvWrHpagUQp4WIbN0ibcGeJb
+hXZVusrDBJrlLg9LsE4e8LCM/nEP+xBbHlbgAnm/h/3of3pb+nIa7ujYThNlh+600oVccbZY
+YtkijTnpttXJwWg8SvtGowk6MpqkUSOWSNJaTmcnHSrbFnPoiDnJSqvH4tHeaB8Su0PXLmUk
+xnt7o9G+pZxR25qxWIEOmradK43mmZOYzU7m7DjLlG2zsORYQrtYoWjlHNrZEW4LL7mvt22a
+nM3nMgUzP22laT8zS+UCK95gZWrAI7DFSG8um8U6i4T+nJMuYeUiLS3Wub28rEIyVy6xIp36
+Lx4dL5aZbbuSbIE0ZRXT07g9O5/N2FZ6ei+zSsxZSHFc5vXl4j6GMafsZIpmAeMjuULWxMgi
+r7/s7ENpiyYtryoWvYHVoslyqcQo0hdYCwGat16gOG7Zsf7dEt3LnCwr7D23GySxxdAAyzLm
+IN3M55lt7dm7rCfYhifq5XhYhqEDP9sRJaAMDq47wcJYAXJQhFm8S8AgiyvFf+4ORtrwxU3C
+IEQhjjfFI3QU1wSiEURJXKNgIDfh4uU6nfihMIQ6NmowV20ETJhEXMKqY27FXrz7vIrdEIJr
+V9RIwDgyBVewV9IZdVVmXKUC2oOoZOMnh1qjkHf1EzhhFvVz6I+jJ+P2ZiJ/JcZKvl1u9SKq
+5Nx5OlE/jHsUXpHtno3udTYDzf/+GQXwHjl7PycPwTCvGzPmCHk4NdcvfiHwevzx0xxHcHfq
+QvxPPmGkeHMrwD8BVWMeCmVuZHN0cmVhbQplbmRvYmoKCjM3IDAgb2JqCjE2NDIKZW5kb2Jq
+CgozOCAwIG9iago8PC9UeXBlL0ZvbnREZXNjcmlwdG9yL0ZvbnROYW1lL0VBQUFBQStPcGVu
+U3ltYm9sCi9GbGFncyA0Ci9Gb250QkJveFstMTc5IC0zMTIgMTA4MiA5MTZdL0l0YWxpY0Fu
+Z2xlIDAKL0FzY2VudCA3OTkKL0Rlc2NlbnQgLTIwMAovQ2FwSGVpZ2h0IDkxNgovU3RlbVYg
+ODAKL0ZvbnRGaWxlMiAzNiAwIFIKPj4KZW5kb2JqCgozOSAwIG9iago8PC9MZW5ndGggMjIx
+L0ZpbHRlci9GbGF0ZURlY29kZT4+CnN0cmVhbQp4nF2QwW7DIBBE73zFHpNDBI6Um2WpShXJ
+h6RV3X4AhrWDFC9ojQ/++wB1W6kHkIaZB7PIc/vakovynb3pMMLgyDLOfmGD0OPoSFRHsM7E
+TZXdTDoImdhunSNOLQ2+roX8SN4ceYXdi/U97oV8Y4vsaITd17lLultCeOCEFEGJpgGLQ7rn
+qsNNTygLdWhtsl1cDwn5C3yuAeFYdPVdxXiLc9AGWdOIolaqgfpyaQSS/edtRD+Yu+aUrHJS
+nVTJbqeZymP9tAGzMKcmZfZSIT/uCH+/J/iQqbKehPFtjgplbmRzdHJlYW0KZW5kb2JqCgo0
+MCAwIG9iago8PC9UeXBlL0ZvbnQvU3VidHlwZS9UcnVlVHlwZS9CYXNlRm9udC9FQUFBQUEr
+T3BlblN5bWJvbAovRmlyc3RDaGFyIDAKL0xhc3RDaGFyIDEKL1dpZHRoc1szNjUgNzg3IF0K
+L0ZvbnREZXNjcmlwdG9yIDM4IDAgUgovVG9Vbmljb2RlIDM5IDAgUgo+PgplbmRvYmoKCjQx
+IDAgb2JqCjw8L0xlbmd0aCA0MiAwIFIvRmlsdGVyL0ZsYXRlRGVjb2RlL0xlbmd0aDEgMjk0
+MTI+PgpzdHJlYW0KeJztvXl8m8W1MDwzz6J9tazFS/TIsuVF3uLIsZ2Y+HFiOwSTxFmxARMr
+thwLvMWWs1BIzBowW1IggUIblxZIgRLFDsEJpJilUNpLSaGlQNtL2oYGKLmkLdstsfSdGT1e
+Ailv732/P77f90PKPHNm5pyZM+ecOXNmpMiRvoEQ0qNBxCG5tSvYe8uumwcRQv+BELa2bopI
+f//2sUyAjyOkKm/v3dA1cBLVI6RxIiQs3tC5tT28dukzCBlbEPJe1REKthWsvdCI0OzfQx9z
+O6CiN3atCqESG5QzO7oiW/5mfvw6KJdD+frOntbgR7f3Xwvlp6Fc0xXc0vua+aciQnOgiKTu
+YFeoyXV6D5QlhIrKenv6I79FeXGE1jfS9t6+UG/OvcZ7obwFIXMn1GF405ceQJGWCccLokqt
+0er0BqPJbLEm2ZLtDqcrJTUtfZZbQv9/fwlHUBpLD6M03ofSEIqfmEyxcPwEbaM5+QCElZ5I
+ymsEPYZ+i3OwhEbxP5EDfY5deDZagnj0GVjLfjSB7kY2tBrtxlaUiexoDVqCecDxo1vxffFN
+8ffReejb6IH4k/ja+CPQfgd6EX0OHPwnj1EZWgb4a1AIvc+9i5ri30FqtAPp0Hy0EttREL0B
+70+AhzvRXegn+Kr45zCqDV0L/VWialQdfzZ+BuWhW/mdwpuaJ9Au9BQW463xMJqFMtAQ8cff
+iL+DfKgJ/QA9Bjz58Th/PvKgK9AN6B7s4l4E6G70QxTDetLMLRLAgmFea1E32oyG0CPo59iK
+G4Q3hdPxb8VPIhEloRzgKYzex6V4KXmQ18cXxN9Gl6DD6GcwX/oe5y/hHxYuiVXFvxt/DiWj
+J7EWP42fFUqE2yeuiX8//jhYpA/NBoksg3HWo+vQs+hl9Df0d7I9vh2dj1bByD/F6VjCPpD4
+G8RFtpFt3OuoEGbbDNwOoL0oCho5gp5CR0E2v0PH0bvYhlPxBXg93oX/TvSkjbzK3ccd5H7N
+Y/5HIG8vygIZRdCD6BCs51fQq1iA/otxA74c9+A9+Lv4OImSD8lnvJq/jv+CnxB8seOxL+LL
+4p8gJ0pBF6Ir0XaQ7Q/QKDqIfol+g/6O/oE+xWZcjjvw93EUH8cfEg3JIMtJL9lNHiQ/5pZx
+u7hn+VJ+IX8F/wr/tnCjcIsqqIqdeSh2Z+zHsV/Fn4z/CmzHCP37UB1I9BqwigfRM+h16P0t
+9Af0J2o/0P98fDG+DEbpxzfhu/CP8U/xr/AHMEvE3hlkPqmBUXtIH8jpWnInuQtGfxXex8jb
+5A/kr+QTTuAyuLncRu77XJQb445xf+HNvI8v5Gfzy/mL+ThopkRYLKwS9gmPCs8Jp8VKsU3s
+Fd9TXau6Xv0fE3kT/xlDsY5YNDYKtqsGS7oSJPE99ADY/UHQwc9Bor8Ejo+jj0ELKdiDs4Hv
+ClyH6/FSfBG+FIfwtXgH/ja+B9+HH8CPwwxgDkQFvPtJNVlFgiREric7yG3kILyPkJfJG+RN
+cgo4d3Bezs/N5pZwF3OXcN0whwi3jbseJLuLe4R7lXudO8m9x50CrTn4WfwAfyV/L/8wf5D/
+lXCh0AXvB4RnhHHhV8IZ4YxIxBQxTSwSLxf3iX9Siaq5qgbVzapfq/6h7sVpOA84l2Z6C+KC
+NTiLPEJs/HZ8CirSMY9MMHM/6GEVrIp/oCouBnox0nbgLZm4+CRKKcp8FOgj+ClUin+KtouE
+A0/MH0cj+PfkOP88OQ/9BrdgF/8w1y38nHjQo+CNdpKnyVN4ITpIKslacj+H8Lt4H3oX7H0L
+ugtfgfvRo/gUnoevxmV4O/o1sXOr8PWoMv4A4bEGL8GnEXCAruHb0GVf7wVxBfo9ej/2Pd7A
+XwX+aQztBo0+ht7BP0L/xEL8Q/BuHHijIHiZW8Heb0DU6zXDOtsO69EFHqRTfBUdpDuKqkxc
+wF+JTqP/Ru8LR8CiFoInPRkL89/j/xwvixfACoNVhvbBuutAi2HFvAtWchTKtHQprHQt+JIS
+WNUN6GLUhq4Gr7crHo3fH78uvjXeg34BtP/E+fifeBhWxBhQVKKfwfsO9Ba+Bdbh4v/dLhBr
+Q+PoA+zEWbgE1sMpYZOwU3hEOCj8RHhFnA3Svh7dBxb9J7BmLcygFf0KfYA+w2rQjQvlowDw
+Ww68N6JO0sQdRYtwCuqFNZsDfnyhMpN+6OVakN79sJ6Pwto4DX7iUvQT9CYm2AEzaoXx1dBP
+Pch5HWA/BBq8Do9CTRt47Tz0V5i3EZeTCIwnQ0+7wWuNA0+/R38BaccZX/ngF2rwWujrM3QR
+aoMR5qIGfADVxQ+Bp1qGarj/AHlnYjNaiDPwD4GuBVaoEaWjCuHPmKD82LJ4OQlzR2GPiUP9
+MOxeqeg8vBG4MME8JlAyXo5KYytRvizLVQvOq5w/r6K8rDQwp2R2cVFhQb4/Lzcn25eV6c3w
+SO5Z6WmpKS6nw55sS7JazCajQa/TatQqUeA5glF+rbeuRYr6WqK8z3v++QW07A1CRXBGRUtU
+gqq6s3GiUgtDk87GlAGz/UuYcgJTnsLEZqkSVRbkS7VeKfpKjVcawxevaAT4thpvkxQ9xeCl
+DN7JYAPAHg8QSLXOjhopiluk2mjdpo6h2pYa6O6ATrvIuyikLchHB7Q6AHUARR3e3gPYsQAz
+gDhq5x0gSG0ApqIp3praqMtbQzmIclm1wbZow4rG2ppUj6epID+KF7V610eRd2HU5GcoaBEb
+JiouiqrYMFKYzgbdIh3IHx+6dcyM1rf49W3etuCljVEu2ETHsPhh3Jqo48oTzukidG5d1Lhj
+ZmsqN1TrDEu0ODS0Q4qOr2ic2eqhz6Ym6ANoSVZdy1AdDH0rCLF+lQSjkRuaGqP4BhhSojOh
+s0rML+StpTUtl0tRjXeht2Po8hZQTcpQFK3c6hlJSZEPx4+jlFppaHWj1xOtSvU2BWvSDtjQ
+0Mqtoy5Zcp3dUpB/wGxJCPaA0aQAesNMIDTVxiCGTqH6lVOSxZQj7xIwiKjUKgEnjV6YUzl9
+hMrRUGs5oMGrCQNVtA00Eo5qFrUMmefRekofFbLMXmnoEwQW4D314dk1QaVGzDJ/gihI7WTK
+1KB9Eo76/dG8PGoiqkWgU+BxASuXFuRvGiNzvb1mCTIQH2oA2Qab5hWB+D0equBbxmS0HgrR
+wRWNibKE1qeOILnI3xQlLbRlfLIleQ1tGZxsmSJv8YIlH2RngOSo2jf1z2S2J9V2zIti+9c0
+hxLt9au89SsubpRqh1oU2davPquUaC+falOgaNKiRi6VKBBJ5VgrGOWlU8i00KiP8lnwT2RG
+3RblwChZBZbqouaW8xPPJq3H8y9pxlTqGURj8dOUimXTZAqX0Xn+s8vzzyqfxZ1+iAN+eR+p
+X33x0JD2rLY6cEBDQ3VeqW6oZSg4Fh9c75XM3qHD5GHy8FBvbcukQsfiR25Jjdbd2gST6MDz
+CiAkoNIW4A07rAotPEhwTFSNkSo5CQl8jENaFR/DyKUWhRjhnsY+pIHA0omcfvOnlROVy8wf
+Vy6dqERVAJvPwGN2scfisWTBA8NmfUbixs/IAvoCSfw4Pf0F4yeFy4TXIXr9tbz0Rs3Ntpvt
+e9E94kuaX3O/1n3CabI0OfocQ64t1z4gDGhuFNSqJJXDkeRw5JI8LktQ5QhVeDm+V9ijeZn7
+qU6FV5rp2fc0BJ1j8fFRizPAcq0Bcnyx7HAW8GqjbLQGjPXrTHi5CZvkZGfANIZz5AxrgZYz
+fWRciz5C0CXBKcVpOC05e1iFTSq3qljFgRRuHU3dtsrph1k2b1x6apm5+dPmpac+PoWqJj72
+N2884ac5BWYXo2bc3NyMBZH3SshiRh7JYXcIPp83Q7SY7XNK5vJV2L0w9sqHsd/HbsJX4gA2
+7Gsrif0u5cFNP/jFz4Y3PUJSLzn9Pr4D4upufPfey6J1fdd/EPtn7IMPd1O53Qlyy4SzoAsN
+yeUqtUqjMjvUds1i9WKN6iLNWvNu8x7LPcn32R82P2n/bfK74qeizqDXY0RUWUkavU4yvGrE
+xjFyi5whpzaktqRyvamDqURKLU4dTh1P5VMxkZDkKnaNuzgXoI2mzB5ITJtqd6m5eWPfp80J
+RZ+qqqw0g5px88Ykj8XmsNPJzS0FpZuNxJvh82X7Su/EObqkO67aNpiCc4qvefPx197aZksX
+jpz5y9Hyi7s27H6c85+JxT5/e3dT8L412z4FG4RoAglPw/yS4RT4uXxthWmJ6SLV5brL9Y9o
+HjYOew8Z39RoRbWohUlr5xrrjHUmldqssdiMNpPNPNc417TYNGDcan5dq9ui2eLalH6T5ibX
+jemixm7T6E3GVcYB4/XGu4w/MApGyaC3GQx6kz7Z4LBnJZltuMU2bCM2G5I8WQQTg9GYjNTG
+Mfy0nI0MZgMx/Do1e1iMiuPiMZEXd/R6seQt9hKvJ1mCYLCYmh4ILGN267TAQF6fNp/6uBkM
+hQqLLg5rRVHzRsixxVpRsaPQ32y82vwCtlQgKDPr2djcPMfiKbFDtCKq7HZHkocrJF6vxcLE
+GwCxer27Sc9ffzP43LMtV18+GvveG32rL2uv/N1vLq9cfn7mwZPCkeU/v/bB36aV3/ho7E+4
+6tEmz8T93LLMxoUXXKIXqA3dCo+DIGMO9RxGAiyTkkBAoMvFm8VyucrmCCBBFhqEQeG4ILiF
+FqFXOC3wgwIsD8IhNeHeAm8RhZiNG6eLjk7/GJR41M3P3quskz7FIVQljKTP7/fDxCy34hzh
+yD/rgI/vwrnjQeFxcDnnySkNKto3D2sbqXkhRUW4mVIVZx+eluoyc4z2C1Cia9qrJ/m7OIcc
+Fx7/YslndI674KTjgjnq8WOyTsf51D4dx3OYA48oa9LmBbTSvPkBzVj8+KiSyz9MK4RaeIga
+tfbPmg+1PK/RapNIGm/WuLVeks9LmiLtBtLBhzSXazeTLfwPNY9on9Ac0X6q+afWvpffqdmr
+fVHzsva35E3+Dc1b2pPkPf5dzQdaw2bNFu115Fb+Os2t2p1E1agLkcv5DZoO7SaylVfVkHq+
+RlOvvUh9kaZRq3Jqi4wBMo8PaOZrq4wqjuh5UaPRJpMU3qFRjcXnywWcViPxao2mhONtHMcT
+nVZbwhEAiU7NcXqeEL1Wq9Go1G661rFhlEa6R0g50/UlzQkdO1atDgglKlm1XY3VR7eDaI7q
+JJ2ejJFy2QrKlQERyYCEStx6rKfdGKgvMH+88ZTfb678L3Nliss8sXFiY2WK0zzh90OF+cRG
+0IuZWbrVUbFDKPTvuPqFHYVOmvlBVfXRpFWNh5E6fvyATiovb6KuEl7MNvzIv5GqEmO6ccBB
+3bILPwWnCRV+OnYq9ofYn2P/CZ7Dyb33zzr+2i+20YRwPA7+YjXoWUQfjSIOq0G/I9YKpubV
+KfMC4+o38BvkLf4tQaDC3iLswbvJvfw9wl61mkM6sUhNFdqi3oxVLmQXc5FPXIIWixfBDsgR
+ImFkwxiJHM9LgmgTBJEbI+tlnYjUAg9ixkQ4QuAsCuI0WSt0PN7OD/Lv8Md5nh/DOlm7nRvk
+3uGOg+GBxJ8ADJDyEaxDhARlTTHG2KW6TPEWSydcHzf7mz9ubvY7T00J8dTZIgQJgndohkO+
+HzV7MBUVJrqJj3E17scb8LyJfwhHvnieP4+trnxYXYdBMirUJ3uLNMV8sdCg6dUManZqVCIW
+SBYcflRIrXE4UvjtAhbGcIGsFVUSLoYjGqw6KFo4YwPpJYNkJ+GJSz3xWILX+hWNB4hc3lS5
+FNbjRCU8akM1J9hKn6isZEsSVFjqSQY1vhNbyt8WW8Y/9/nnXyyAbmmM8QzjSotLDiNV/E1Z
+U1YREHPgoaJ2qckpDYgyPKD0ptzgyYY2eOSiPD5PyNEW6ctRmVClvxxdTkJcu9Ch3qB9jzNd
+IGKi1mBYGRpepcHgOVQ2hFSiZkpzaq2ckr5AS4fQpaQHtFmE40ReQ927UVQR0CdGaj0IA/xN
+UNa5MbuCG8QcHiOZssatwcUgO6I5QjIRT/Ungcxcuhn6+7R5I3g958QykMZfJh3+0lPg14sq
+YX1Unq1LlbmycscLL7BFoVtVH50FQd9hxMVjI2peeyQeA9GcOSDy5fTVBGr3s5fHw8Ebe5I4
+Tngm9pPBiUNbYy+S+bgi7+cv4qWxUVghQ0SaOA76vxv0fxokrUM75fPAXlXqLNHqFnCxsF8g
+gqDheLrLaTVZOgRH4XqOnK9FOqxLkQzFBtnAGXjNTAesn71qpgNuplHAx5UfJwI+mix0X4MI
+mO0oI+kVAl2JKSw7kFQBrDcBEieYqX3AKk/2KOluvurM++T4hMTNEY58Hnvqs9jGz4D7C+J/
+4f8O8SGcZeTzDlvG0g/lvJjPQxCYDEFgstMfEkI5EXGLIZLzlv4Nr75Ju8a4JqPJ26Fvt27w
+hHM25G9OvzF9t0dv9VIfP8sdoLkccqUEVmSs8D6b8ayX35ix0XtNxjXeP2b80Sv6tXmGzIxM
+b4Uh4K3X1htqMhZ5LzeEvFsNV2bcbBjKeEj7sGFfRpJGqzGIGaLXpXUZ7BmqDK/WwGPHWqfs
+kgI9Ttzj3OskziMkhFLBzvQpFe5UnFpg49D5mBrekhQpUIxl3ABnsp14GOLncazG/8XLKRVm
+HvMFeRrnR3EHdshJjoCjXpXtSyl0Zw+bo2ZirscfWRLacBW8pqiiflXjAQTrcCmNMJaZP4Xc
+30dj0o1+8CUnEnmf/wS44oSPZerJAHmkpi8AeRxT8j+PJFVkgHggg9LL4D+hdIy6NINkrdCy
+ZKJ178lGPdQZKrROmphap19NNHzZiJuTslgoyEIV+i4NzJ07R+ITQbBKTIZQkWfRDY2QL8BS
+yt4dd+w678LA4f9q2bH9ox9hG3aoYm8mXX31NUuK8stx9NWBW+PomdgHsTfwH9J23bR1RWBJ
+qrVw/tqtj/c+3/73nxs2tpZmVASyitq7jt6y7fdXgMMG+7kt/h6/ivchO7pfdlxk2WDZLXAa
+0SVWkkpLPam3nCQq0xiJyBZeZ0faZJtNqxGTbL7kZHB8ubLRLkuZgf12HLdje4qT6s6ekRnY
+6Rx2kl7naSf5yImdWp1Po6ZNJsAdVuPTsJG6HFWVTDkgbmWlAPQppKWnKs0sHGJuoepU4qTg
+KRVFGivTsNk2HUFzy+YdDV/xyIXY5V5ZdX5fHnbtXbP+skd2k+GY83ho/vKBE3j8i7dpvLwD
+5nkXrHITSkPfPYys8c/l2bqKstTFqcS6VlyrXWtf62xK+0wllvLzDfOTSlNr+XpDfVJt6l2q
+ezVavRGCLpQCghgRVDYqjySdzoS0Do86pXcWnmXOJZzPRCWix71okFpfelV1YoLg2iYq/7LM
+vBHsjvr+U/REALPaCNNa1Cjr2sV2bbu93RlOE5qbUDOL/ebOKbHCmQhmnJ2cBHaQMBM4Gu3A
+rmtHnovFJg5fckC2BpZsbb7u+g2hG4UjE6fvip2M/XfsdOztS5ruJ3kPLu/d++ih70PoSOIP
+xFbgh1gcm4xukZfaVT6V5JirOqQWBh2Y4wWUbDOY9WYNZ0JYZvEph5phvnyyuM6MzbdrTNjm
+I2bw4yl3OPByWHiGOWaIdVwQdR8hVyAPufwAaJOtNdfSE85lLJxXTj/NbLuDUB78u2UOc2zM
+t4GrToKZJltsTLPZZZNavQ27SvcM5AXLZ9u8Jn+ZlT+E+diZnV988YuHLzOZTvNCVuBa7hOq
+02rQaTa/ANlQGv7BYWQGndbpKu7VfMew27xPeFj7lOYpw1iKWm3D55PFYp12+ax9hkPioZSX
+tD/Tv6F9U/+56jODIc2UliynpgeSZaMlYEp+JvnVZC6ZBvmmWVUsNzogJ7fJcCyyNhhbjMTo
+tFIvdciVGsBzrOz8nC4lztEZuYncX5DInWksl01GU2CYXtOYge11VitY0CivszqpJWXqVMiD
+i5I9yyEKTSmatW5Wz6y9s/hZJo9aNpgCald6OGFJ/rMO1KfASck2p5xjq3LKs0zwSDXDI81S
+xXxM1QRzYlZgAjCslBlAYjng0XxkEhU2Y+aXGAGCBmsFZXrEQbPoqEa7gBWrPVUQegL+CT+o
+spkNb5RBSkY6qJEOb5RBWIh1yrZycKVwfpvDjjVg2XDYF70SODozmlOCOA/TeFLC2znIP7Fz
+7vv7Y3+9IYxtr5/CVnFC5q4NLrw4m9uy9tLKSoxXFn3n+0/s+gPsBP7YS7GjV99yPu68cvui
+Rf3Uj60BW6gCW3ChP8orGk1N1iZ7hylsDduvdm517SF79C+aX3T+1vyG833xffX7Se8nfy4m
+lSeVJ19gvcBe52zSh/WqedYye5mT2yxsNu0QbjTd7Npnfdh+2HrIrjEyXaYGjCw8tQWMcwy0
+xjUrwHKTJWA4gnmkBW1aLTokAyqSAQ/N2QnB6xHwtDw0SQ4VprXYg4oMFDAkVJ6q8thcKY0J
+JVMdUxX7Pz7lp7cmzSf8iUsTyBP7BviNxDVJso3Kr4wKNYPeoMwpsfOzY381ti4PX739iob2
+ZGzzf/zK+7G/Yvup594lH5asWr3rkaP3X9JT9JPnsA/zcGLIepjKzh1/j+wSvguye0XOlZCE
+vdpc0zzjBcYmk8qVjJycPRk5rEmw31iJDTs5jUqr0jvHMJZNyDHsiDq4FsjGHZxjDPMjMCw1
+b5RMb8UisBPq4DhYhFARXgdOFDDkHCfnc1jXJFfZ9tr227gW26Btp+2Y7bRNQDazTbIV23gQ
+yJbhyfNxfbQMAr/5LPCzxcdpQH0mEU+bP3adQE7qUCcqKeoJ5mRM8KI2h5O9ic2izCEqFy0W
+b+mc0iwLuXJcl52WfYFz/VUXXlmh01xzDU7hfcdjq6/1p6W+nTdnRe3su/Grx1//YexmkM8e
+iBCvB/+pgRNCFUSIopClktTF6mfU76j5IvVONVGrUSJM1ECMWCUuF4m4kkNQTpF0xTqiOztG
+1J4rRmyuVA4GkxcfX4kB93CnJuaTton7afz34OcTu6gPXAJ2Xwh270UleJncoUpRpwnp9pQL
+Us9PW5L1O/M7Fs1cV53rIl+7a4PvRt+3XXemPJRyOPWllJ+l6kXRkGwXXfZsMTe5ybWZ3Ege
+Ep8QXxT1zwTeMpP0zJLZlnxDpuwvDGTKGTnwcKUHejLPZJLMunTq1IrBqZ2XjlG6OT2a/t/p
+fHp6Pp6DZKg1ITewtsZDHYOHOgaP7EwJeMAcnuBVeoM2n64aaMtX3BHLASOfGoxs082a7VPn
+anIMTW79Xj2BY3UcdhsINgL6lOUBHGgBndxOj4Vzcj3rHPgduietc/SA/bnmKL4SrAbc5MZT
+zVS8/kTpBNuPwDmBnME5sdiPCdt/ip4awHQ4o7lS2ZvoSsuGeIzeL3E2u8NDQzS2U9EwrWxu
+WWI/xqKoSixEqJpbikNx/2uvPj1Wz6VmxT7QmVXc+T9s/uHRtfd9+6cXNvTUr8aXzf0gs6yx
+5sLaOWYd+VPhd+5quvnJ2NitN1yYVuZS19WN3HTxbfVpWVLaitr5sdesJc7syvlrS3xlmSG6
+TrchJN4Dus7G8w+jXNBAs0VbBctfnyza9QEuoA44A94aUquuddZ49RJXlLtK05I7mLs394fi
+w6qH9E+IT+ijucdyj+caUW5RbgM0PJP7Tq6YK6ekBaqgPMgaBZWHV6Wk22m0o1VRrcmzeJXZ
+YslOTUvzZWvhoG8y+6wW+eLSFgvusWDLGKmTTSmpvvQ0qOtJwy1pOA3qDmbBmoMVnzuCUDZz
+lJoqmstzge9sQM2WqyFVQsrMDmTL884LFGW/mv1ONmfKdmcPZnMoW8ouzo5n89munD9XTipW
+CaMrl5pPQaQIp0k/rJZP4eRXqVyjsUsBM4u06O1h4sYQ9/mpVrE/yZNM1epgynXYkyEICWRT
+XYoM9E2C2zB3y3j77uK6By4deCAnPXYyPXvF/I7C2MlZVXOrOwpiJ3nfrh+tXrNm9bpLa+6Z
+aCLrvldYef4tu2OE1N13cX7d9fdOnIFFcCco7jEWe6nQ5sNIQ28NYfaypkFDBjVRzbjmmOYj
+jeDWtGi2a4ahQuBEFRL4L8dioiCqeC1Rgd9mp39PZoB3qZUg2j91g5gItc6Ksvr8NM7CkO7E
+rthJ7EoEVF9cwPsgNMYzOFzFzqRyLuVPaBDIoBAVxoVjwkeJq83twjBUCMAMB1sd58NokhPk
+4r/CiTL2nMS4yk3mDoS4MrBgM9on5+wRsMaIVwntwoDAFVkbjR3GXiuv1Zj0bj25Qx/Xkyr9
+cj3Rj5HNcq5KhZGWI6I2B2nMmmJNr4bXpGy37rWSddbt1v3WY1beakY+zNEgXEfIIBwbCXZZ
+qg7jNDQZiDODSUSnEKfCxsFOGGBSFSV0v4A1j+qjDthrSmGvOaAtKYd43EOdL7UVh4pZhgUP
+gxCFRVfUtDRdtPi8+SuLeN+eK2pKPymsfiT2N5ijMbaCXwknqiQcOGjNEXASPVA79RDJ2SGc
+U9GHSB+CHeoIFaE7ZV4AljFv0BlFM0FJIp9EeI6jN2pJLRCAj+H9slVnMhQZc5CUXJzcksyd
+TsYsOM3wBWguW9NmBZLpDVUFJztdAXpNOYazZQ1hJdiIaMmKK5CcNjegnI9tLyg7rD9xqQb/
+lEsZvx8cpvnjEzR8L0rcsWHYWNlKslYAoDLSTzTo/Rp9NddHzSC0eSC0Ed6MjsRPIxw/fYAz
+Y3Ypo1x2wKHYYKlKMie54GF1Vglj8dOjUKD5CJQTfTUleZKSPFhl5LwZ2dkswDFCvPc59sZu
+XpS16KLtDSuWuRaWrr/MxfsmjOTvZ8jh5vXnZVh+b+hvovvhy2DNfwLp0/VWKKdy5eChy8Go
+9nOEiD4sCcUCEfarX3mUfh5Hb+XMlZ/Sz2jgnDm5TF5OLBPOQPMz/6BP2vNK2Gm/A7ZrgDhp
+j3z+e/ik+rOkz5L5l8h7ArG6BJeGNJnXJq21Nzn3kHvEe9R79GOa35DfCb/X/EZ/Ujgpvmcw
+P6z+BfkP8Xn1i3phQH2zeL2aszAvq3NQL2vjVbYKVUpLam8qSTV60FlBYeL4yBhlR8eNcHbU
+hM3t1nZ72MljenTEzUkBK1gqnOfg6Jjpy7JNHxxXDk3c/zcciL384bdjnw1haXd39913d3fv
+Jhm3YnEo9tJHf4s9f3183/f27Ru+f98+uts4YdJ/EV5HdjQml8zlcR4vmSVLEz/oFNT8M06S
+bLcQm9VuMSaZkNmYhJGZ2DRqkw6v08Uh5KET0orYYkpcDrBdxAz9gm2AWdu0mjlV6uXqBjWn
+zjEXWdZZiIWGhgZjko/Y1qFh+7id2OkpS6MP2F2OLYdJOLGM/RsT0d+ZZggAXYlFTOMlSFXw
+qChRoj/q7JPmsDsVZekmJ8+BgNBj8Trvr7h3YEu/b9GC80pfey128n7e13Dj9asyXzBXrKj/
+w5knuSXKJyN8E+jbjvbKTlWSI+lidYeaH+Mx7LPmGnWN6X2zINJppVtURoOo1+nAQxHssyN2
+JwJLADr5mjsRvZHujAaDfupqRI9P01P1WVcjUy4rcTuiuNeZdyMbqYua3rYsbHubRZL5ptjJ
+zBUVSyJ+6q9ueb35O8vdZNZjofKG60dibt53/8FFHdd/i860GCzbDDPNI93y90SL6FVnOywO
+7z3We2x7su/O06hsdTZifcpw2PiS513v54ZPM8RcwxpDyHC3bo/14YzDelW1V86s8W3IaPPt
+sO6w3ZhxXaamzFcr1ukuMCw31XkWZqgyMrN9ZfpST2lGqbc0UyVqBYvG4zRk6zMyMryqzAw5
+v1+/xbY1eVPuQN5NydfnfSf57ryDGQe9hkF8h+NW5715P8qL5osZY/FfjObkQSiZyDPYpWUm
+LR8fdWcmyq4UVpZTAbjCgOdm1GXcY7gr44WMX2eIngy9gedT6M71BJzf0Rx6kh91FFRh5ajL
+yhlZAXYPmQ5xEcKJm0i+BQ/i05hD2MzuJXmGmWQHTDgI9SIer+NP84Svy9HZZejaPschQ78O
+GTp1yKVlAQeNpB1yVi48oF+Tw82CVt6xJkUG+zCl4IaUeApJqUtSOTx22eMN2OU0d8Btx+/A
++pmj9jRk3ZFFsmRneiArJZ99NAUbdUM+Ls7HRfk4f5anGPaKOXC6VEKtxCf82qrENq0xwDbt
+3zJGTesMOFoWHiuG5d9ISxBY0UvRZnYryl708/rmjfST+75E0UKvSBO3Bf7EGtsIr+Zm5uIz
+4y/LGp21ypQDD9DAh4cMFXqbvoKCI3p6L/rBAV0Fux4AX98EXixxAwpxMwRg2ZnsBpTGZDMv
+QOmX0WjUXYxTrN2tXWVZtuQlsccu2fb2u2//Oif2mWVdY0+xlObDzzY1fvzRWxO4yL9yTU5a
+kZRss9QvWHvv0NO33zJ7wUK33TsrOa39gvobv/1aFHw5vfP/nN0GpqLNcpYoHLYddnKLBbxB
+eAOcuSXLYDSiVDM90ZmQ2p69X4Xphy6jGl2AfslBtrvTi9Nb0nvTB9OFdLNp5uEubebhbim4
+bSrc6aMd+8YHu/6FyEhysPtdOEJ4vS4y/bn13fh32Lhy2yPr9yy7/OVnH9i/adFl55cOC0fs
+nj/s3zEWtiRP/JZ/LtZSuL66ocOghYHvQkgIwnzMcPDaLs/JEXK0ix0hPqQX8hwVjvPtTfYO
+u1DhmJu6I/VeYbdOcFuyMCJJ1iyTWe36yuySBj1Y8hR7iMdilZBkLjYTM52adPbUmqfmlvhk
+Y/Ja21MC07Im21QifXs92AI6XkBganRud5H0J1uuGWspKGtfet36H068jnP+cFXZ+esqKztX
+LXhCOJLmey528pdPXDfcWp/n5p87U2q0rv3pI48carcaEfuiE/nVh08ar1qzzlT5idqlZt8G
+feDPlVPf8qe3neI9sG9hOK/jya/LIqRaEFuGFk1/gfZLXyj1iFBFKkCOL6EgpDsh7Ybyrfyf
+0XfFR9AuYW08DnA+1CNhLbob0gVQvg3SDlIRf4DvR9WQ1pBHkBvq9gC8RJWOtkEfd9LEpaMd
+UGeE9pehfSXkTsh3QV0x6+8lqkU0F96v4YX4Y1JO2rmLuZN8CX9SqBPbxbdVjaoX1D/XdGg+
+19bpKvV2/Qb9dw0mwy8NXxj7jf8wdZj/aFli+QmbmQfNSXyGCE8zKkLVcHJcau6EqIjWruOv
+RPTbS+yLtOzJMYloWYljVGqsVmAONWKzAvPIhjsUWEBOfJUCiwDfpcAq9AJ+TIHVyEd6FViD
+hshuBdbyz3GSAuvQetWfFFiP2tU1CmwQD6ofUWAjutR02ZTOtpuOKDBGgrlCgQnizQsUmEP5
+5oUKzCOtuVuBBaQ3b1FgEeDrFViF1pt3KrAaJZn/rsAaVGsRFFhLgpYLFFiHZic9OvU/c+Yk
+/V6BDdzFNpMCG1GhIwycYJ5K3ejYo8A8SnE8yGAB6rWOZxSYR3bHywwWoV50vKPAPLI63mWw
+iurF8ZkCgy4ccQaroV7vTFJgHjmdbgZrqH6dZQoM+nWVKjD046pSYNCva7ECQ5+uvQoM+nWN
+KjDo1/ULBQb9uv6swKDflIcVGPSb8ooCg35TL1Jg0K/kUmDQr/QtBQb9Sn9UYNBv9t0Mpt7M
+mP03BQZZZSfmqIN6a45LgXk0K8fPYD2dS84SBQb+c1Yw2EgtPyekwDxKyxlgsJn1s0uBaT8/
+YHASlXnOswoMMs95icE2yk/OWwoM/OScZHAy1NtysQLzSMpNZrCd4ueWKjDg5y5isIvhNysw
+xd/I4FRqA7m7FBhsIPc+BqdTfnIPKDDwk/skg90M/2UFpvivMziT2kDu+woMNpD7CYPzqHzy
+DAoM8slL8FlAPUFergLzk7CayX8KBv7zmP2o2bzyVigwrV9HYX0Cf6sC0/odDGZ6yfu+AtNx
+f4RWo62oF4VQOwqiVsgl9CNIq1EHg5eiHtQNKaJgSeCte1AfwPQZhPoww5CgphPoCwGqYfXB
+/8ueiqY4k9AqaOlEA1M4/VC3BPLEeLNRBbyLUYEClbDaaqDohHwl0GwAHiKMaiX01w+pD22C
+Zxtg9UF7EDAXsjHavsLnvBk40hTWPLSW9dI/xTUdtRyeEsqBPsLAWx+09ENqh75yz9nLv+pj
+GrdgBl+rZ9Q/ziRL5dYGfXRB3oeugDo62v9e5hLUhkBaYeApwnijMpKgTHEiSq9rQB8SamD0
+EvKx8ZbCczmM3c5kHwR8SheCXqm0NzNK2lvhOXhK6LkHxqU89QLu1n+JFWL2RfE2M642TI0b
+Vqy3gGm5B61XuF7GWjqYFIPATf4U732sJcwsdRU8BxjXCY0krIrqYhHjJMKkPCm3PuBFAqyg
+YosJiwoz2bcxC6M2183Gmqn3VqWvIOONUnaxHinfHTB+F+sxIX2JcR1k47Uq2ki0UK77FX0E
+2RwTdFun9B9WrL1X0WCIyaafWWNidpMaCir8D7DRJDbCTK4mNU9lQ8ubWd8dM6yB4vawvhJj
+T9YnpB1RJNKqWGr/V/Ai0GeISSUMeaLvVqVmgEmaWtS0TfewldvHJNrJ6CmnVJ9dCtXkCK2M
+fpMyaliZaWI90h6mpdAOmLS3RO20XMOKdHuUmYQZ/gArTWu1n1lpJ+Pu3DYx6Vv7p+ZC27pY
+f9N9UH9xhcJtUJF/K/N6krJKJ2XWxsbewGoT9HSFhRUddrB116vYSA886YrepEg70cO0tw8y
+XSWsQ2IybFXmH2Za62Q4vWztJayxm1EmZjLTusNTlkVX/hZFM12MG2qbm5S1lfA7nVN8dLHS
+tPVGvrQj9X9pfq3KGOtZDwNM0m1n2WYIbYT6SclS226dmmE7s22J2cAWJtt+ZneRKX+S0Drl
+PbHeI4rXSKymfsXKpr1norWLaSSIrmT0Ca5pv62sddrSEqO3MWn1slWydWoWk2N3M59J24NM
+En3KGHQNJaQYYfSTHE/23stsqIv5zUneCtneF4G2ebCnFkG/9F3IsGZ62ELmnboAo4OtpU6A
+ugDqZhoKsVI/WsdsIKHxwinM/3dH2MwsJoEbmjHKMvD0q2Hfr4O0CCyPwsuhlu4AdfC8kNXX
+Qs0qeFLbXAw7QS28l7La1cgApymaVjNr6j+HrUlT9Yl1kpBoryLzaRv993axac1MeuRJPa9n
+rVsBf2BqzNYp35aw5+n9aKa3THiOaT+aWL9hxWf2K2t6A+slNOUT6WptUkajq3uT4kvXT+1G
+iTEjXyOZSd+5eco7hZQVF5qy6T7mPyLKem5X7PFc8ppchVRioRm9TK/ir47XpuyA1ALXM8+Y
+4Hq9oplupedzaSibzepsSSU88let4qsjT/o26sWCLBYNwqidirT7FR/yr8am0l8DNdN+dutX
+dBFSooyZMVfCewcZR71MsmEl0vl3dC4pttg9w7dNjks9SRuTdHjGLtI3I1bOn8Lum2G303v3
+10uKctfF+p+0q56z+tvM9H8F0+bMOHTSP05j9gBuIkIdYBKn/XdMzSfB10zr7lI8akL+iVXV
+q9jHtOc924a+bkbT9rGEzf2rmpuMveieE1IitMRsEvFeK9Nq95d00PcleU/33M+i1QEW9Sf2
+oU0sNtqMZkZX/2ftT/bXp8R/YeXMc64o7qt6TEhrOmJtZX1+dR1Paiz4JVm3/4+4nZbyV0c4
+e78/m6OQEsVGYO+Z7IGeT6pR4iSQAzF8AJXB+UuC52woFcBJMQCpGNHbkTWoXsEshtbZ0BJQ
+4DI0BxKlmotK4SxAE+39f7bX/e93xsm2oi9Jb2o/XL21N9QebA1JP5JWd4SkpT3dPRGokhb1
+9PX29AUj4Z5uqbeztVCqCUaC/wekItqZtKqnc4DW9EtLuoFudkVFcQE8Sgql6s5OaWV4Q0ek
+X1oZ6g/1bQq1VfeFg50LezrbJvucx2okWjVvbaivn3ZdUlheIuUsDbf29fT3tEdyp1FmYrDa
+AtbXagbvk1b3BdtCXcG+K6Se9q/lXOoLbQj3R0J9oTYp3C1FAHXNKqkhGJF80uql0vL29kIp
+2N0mhTr7Q5s7AK1wqieYc8+GvmBvx9aZVSGppi+4Ody9gdKGQbwF0sqe9dD1snBrR09nsD+f
+9t4Xbg0HpVXBge42mAiIqrxkUU93JNRFeevbKvUHQYogqHC71BbqD2/ozpcSc28FrGAYGrt6
++kJSx0BXsBvYl1o7gn3BVpgGFMKt/TCPYLcEbVvp/MMg9l6YYKg11N/fA8PRCQWh/4HWDims
+dEUnP9AdkjaHIx1MDF09PW2UmsLAdgQYaQWh9k/WRTaHuiPhEGC3AjDQt7VQYpLu2RTqC4K+
+I32hYKQLmihB6wDovJ8ORvUY6mMstA90dgLIeIXhu3pgkHB320B/hE21P7K1MzRTEtRa++ko
+ob6ucDfD6Ou5AroNAv+tAzBQQoFt4eCGHtq+uQNkLnWEOntBIj3ShvCmEENgZh+UOkEcUlcI
+ZNcdbgX0YG9vCMTY3RqCQRLiDlNhSaEtMJmuUOdWCebWD7bTSfvoCncy8UaUhdSvjNcKFOtD
+0kA/mBSTZmjjAGV2oJXKX2rvgSlDjzCpSITaCUy9LwR6j4BpgJr6QWTMPKHYFdwQvDLcDV2H
+Iq35CaEBeVu4v7czuJUOQam7Q5v7e4O9wBqgtAGLkXA/7Zii9/b1dPWw3go7IpHeeUVFmzdv
+LuxSDLawtaerqCPS1VnUFaG/Y1XU1b8uSCdeSCv/TYLNoU6oDTGSZctXL6lbsqh69ZLly6Tl
+ddKFSxbVLltVK1UvXllbu7R22WqD1qBd3QFinZQaFTHVCTAKM4gwiZ5jibHJUEOmc16/Vdra
+M0ApW6m1gZzZOkqYJRgHs1HQLyy/bkAPbugLhaglFkpNQNYRBDPoWU+XEVBGzmKGWudmak4h
+UFyISrov1BoBPbeDHKf5oirs2RBiKEzFU3SgGrDe9QMR6BrY7IEVNWNC2f2TTIEhT4liipha
+m7Qp2DkQXA8WFuwHC5lJXSit6WY2u3VyFjAnxXOBeQel/t5QaxiczldnLoEUu5m1UdpgW1uY
+2gRYZR/zyvm0uo/Jlq3uLzHVGe4K0wnBIAxvc0/fFf0JI2X2yCp7NoNDHVjfGe7voONAXwlx
+d4GhAv+gqt6tUsJ4FQmdPRCTx5L26clR77VxINTPhgG/1xrq61Zm0KfwzZD7O3oGOttgDW0K
+hzYn3NVXpk/xQJMh8ABt0y5uao7AFnOsrZFpHdOJBRWu28/dLWN5ikBZ90pHME4wMo8irFlV
+DZtATnmgLFcqm11eUBwoLtZo1tRDZfHs2YEAPMvmlEllc0srSisM2n+x6r52MdJSkcIeW4dw
+XA0pQRINdWZes5zdEkED2AChwftn4UzXtqOzr7klpaZOufSY2aLUcTdxR7kXuGfgeWBm+1n1
+33xs8M3HBt98bPDNxwbffGzwzccG33xs8M3HBt98bPDNxwbffGzwzccG33xs8M3HBt98bPD/
+4Y8Npu4Pwuhf3SwkWi6EPGGtPaxm4Czcr7YuZl6j/yysybo69D6Ur0CfAv77UHf2rcPZbZM0
+k/FVzzl7nG5dy6CZOIma81lpE7vvOLv97JYGZfcdYGe/HrYqZ2Kfq32mpHr+pQx7eDe/gJ/P
+L+Ln8uW8zJ/H1/MVM7HP2b76nDc607V1X5lPoqaelvBswJnZNl1br8SmV3yJ4xn12IL+xHnB
+Sma0T9X9u3bzb8rm3+7v6+xK+b48imej36JzvI5y30EmTH9MYZy7Z9RsK5HHuHtHTUklcrWZ
+uxs1QCIoyi1F45AI6uF2oe2QCKDXjxTMLjlMgVGtscQM+LcgCdIgJA4NwxOzsgyJ4t8ymmSn
+3V83YrIwum+NFAcSwKjZWdJQbeO2IMyFuG7kRW5uG+SzIG+FPB3y9Vwb+AnKpzxqMpcMwnhV
+gF7FJYMTcnPVnB2VQF7DpaBUhjYwYkyMMzCSk1dSreUWcU6GYuIM4I3cnJpTjZS4pac4GTiV
+uZtGNTrK300j5uSSo9wNnArZAGsQsBxu01FOi4og0ZmsHtUYSnZW67nVMM3VIBY3R7+qv5c9
+Za57BDqC8Wq5NGSHtiu4dJQMeR03ayTZPf4UdydD+zbtBcZbMKKeQ7NRg7FkvFrD0f8NEOVu
+B4nfzkbbOeorL0HVPi4HFUMiINTtANFfcTNzQwANgZqGQDVDoJoh4GIIiaD3m6HlZsAp4q5E
+vdxmtBPSXoB56DJ5BCR4mAGZOSWHORfnBEmYnwLZYahNGdUYKWfOEWsSQ3OO6o0lVUe5frQc
+EgHmI6MOZ0nPU1wem0r+qDOVEvSOaPQgOkdCF0Bopzo4yqVxs5gk0pkEotVuKGNk4twIk5+T
+Y1Q65HXyG6pf+scDWP4LJX9FyX+ZyOPj5NgojCKPkddofrw6jbwLna0jf0B7ASLkKfI8bDRu
+8jYZo1yQt8hhVAX5m1Bug/ww5HMgPzLi+Zl7jIyNQga83zdisNPJkudH/EUK4M5SAEeqAljt
+JdVZ5DnyLEqDLn4LeSbkz5JxlAH5M5A7IR8nEfQzyJ8gpWg+5AeV/AXyNLVp8iQ5BDumm4yO
+GCkL0REVzfaPiDR7fAQlSg1F7qfJ4+RRlAKoPx7xpUDtvlFfptv0FPSHyYMkMpLutlZryfdx
+I/4YkIbRmzRHVvLASBntZOfI05L7MNlJdsrOMjlLLpAf4oqziguKH+KkLKlAKpMekqrN5HYk
+gPBgwZJb4Am7MwHrgSRD2kluHuHLotUTMCc6L4IG4TnMoBZ49jIIwdM81XqaQVXkBrQcEoE+
+tkHaDmkQ0jWIh+eVkL4F6SpIV7OaCKQBSJvBffQCRS9Q9AJFL6PoBYpeoOgFil5G0ctGH4BE
+KVqAogUoWoCihVG0AEULULQARQujoPy2AEULo2gAigagaACKBkbRABQNQNEAFA2MogEoGoCi
+gVHIQCEDhQwUMqOQgUIGChkoZEYhA4UMFDKjKAaKYqAoBopiRlEMFMVAUQwUxYyiGCiKgaKY
+UUhAIQGFBBQSo5CAQgIKCSgkRiEBhQQUEqMwA4UZKMxAYWYUZqAwA4UZKMyMwsz0MwCJUhwH
+iuNAcRwojjOK40BxHCiOA8VxRnEcKI4DxXGy+QB3rPqnQHIMSI4ByTFGcgxIjgHJMSA5xkiO
+AckxIDmmTD3ChEHAbLZB2g5pEBKlHQfacaAdB9pxRjvOzGsAEqWNAkUUKKJAEWUUUaCIAkUU
+KKKMIgoUUaCIMophoBgGimGgGGYUw0AxDBTDQDHMKIaZ4Q5AohT/c6P8H6uGXIMb1bC5kkGc
+y/Lt6EOWb0NvsvxqdIDlV6GHWP4tdC3Lr0RlLN+MfCyH/lgeQW41HnGXmart4AKWQ1oHqQfS
+Xkj7IT0DScWgVyG9AylOSuUM3qRartqr2q96RiXsVx1XEZO4XNwr7hefEYX94nGRSNWpxMD8
+KLgWdAd7bofnR5BgE4FnFYOqSADGDYCfLYV3gARkyynpozz8ah5+Jg/vz8N35OFqDVmMeebp
+IM4nwDhulPW+Be43IZX5sheAZ7r90IcO94hvrnsMP53IcmU/5B9COgDpIUjXQiqDVAKpAFIW
+JDerywP8RjlD6fJpSNmQPJAkOgSy2yG2sVrU8mFiwA+N/tSA6E+BjmTnAN1TI9nFkI2NZC+H
+7MmR7PXuag0+hLJpGISfAM09Cvn+EfcJaP5xIntsxP0UZPtG3AHImkeyCyG7ZCT7FXe1Aa9B
+bp6SrlbyVTBvmq8cca8FtBUj7lzI/CPZPoqdBwNlQWsubkQnIM9SqDITI3lH3PMhyxhxV1Bs
+NcqmisciKmDsCZBozo0CQx8dxo08lnXuU+473R8C+V9BsGAeb0ljPGSvZo3htbLW/XTB9wC5
+2j1SraX4sD8cUPIozZ9wP5R1s/s+6AtnHXLf6y50314wpobq24Dvm9kQI+5rpTHyqJzkHnQX
+uyMFJ9z97gvcQfdKd3MW1I+4L3U/TdlETbiRPHrI3QAdLoFZZI24F2eNMRbr3FvdsjvbXSE9
+TeWLyhP9lhU8TSWAShKj54N887LGqI2vKRvDFjlPdVq1U3WJaqFqvsqrylDNUqWrbGqr2qw2
+qvVqrVqtFtW8mqiR2kb/87yf/udKm0h/sQGJPH3yDDYT+iSJ/0FLsJqgC1A0iasn9asW4vro
+eCuqXy9FP13lHcPaFRdHBe9CHLXWo/rVC6Pl/voxVXxltMxfH1U1XNJ4AOPbm6A2Sm4aw2h1
+4xiO06obUunfvTiA0Q23pR5GGLtuuK2pCTntm6qcVdYFloq6mnM8WpTnjJ/ZdM4E06O761c1
+Rh9Jb4qWUCCe3lQfvYb+VYzDxEQMtTWHiZFmTY2H+V5iql1J6/nemiZAO8HQwJqNgIayaQZo
+6oVIomjgTxZSNNBRAs8H5IDnoRngaQ3Ix/B8WgPD4zHFO/CmVFtzQJIYThZCbzKcN7PQDByw
+GKCtOeDzMSyvhBspFm70SoyxXNaR2w0oBW6GAuc2N+vIjdlg0aJplCwFpXQKpZSNxeFpHHcC
+x5YziWPLARz//+UrtNCPR2cPbHue/qGRFm9tCFJL9JZNHc7o4HpJOrBtQPkLJL6W9a0dNA+G
+ogPeUE10m7dGOjD7+XM0P0+bZ3trDqDna1c3HnheDtWMzJZn13qDNU2jVZWN1WeNdfPUWI2V
+5+isknbWSMeqqj5HczVtrqJjVdOxqulYVXIVG6s2TO2+ofGAGi2kv3TD8lGi04INt6R6mhba
+zb0LqEEfnu9xbks9wiO8D+n8TVG9d2HUAIk2FVQXVNMmWGe0yUj/mozS5Nw235N6BO9TmsxQ
+bfEuRJOiRRSJ/l5RfdSz6uJGaipROXhunfXTF2t2otpwDfyDcoQleM/ERP3nfEXO9RoYGOin
+jwE/nJHro3mr6qNz6a8nqVQwVEtNE9QVTtZxHKs7oNHUjsXHodEPTOAIHY5Cfkx/g1LWwqlL
+RYbFYRWhR4XIaEp6Sc9R2MG3Q4JzHNk8UsTOy2TzaEYWPb9ERotKEzmcT2k+kuIpob9oUAak
+NM9K5LKlAICdWTsLdpYNZw0XDJeJ9CdmHoJK90N0Kx0peohDEX//pCAAjDShxE9jwnjfH0lL
+ZwMPU8Dvb/L3s18tQl8WtV/5ZSQQ+pRg+5Ve+1n3kUmFJOr7UQI50egfmCQaUEhY4wAjAfD/
+AR2uw4IKZW5kc3RyZWFtCmVuZG9iagoKNDIgMCBvYmoKMTU3NjEKZW5kb2JqCgo0MyAwIG9i
+ago8PC9UeXBlL0ZvbnREZXNjcmlwdG9yL0ZvbnROYW1lL0JBQUFBQStBcmlhbC1Cb2xkTVQK
+L0ZsYWdzIDQKL0ZvbnRCQm94Wy02MjcgLTM3NiAyMDMyIDEwNDddL0l0YWxpY0FuZ2xlIDAK
+L0FzY2VudCA5MDUKL0Rlc2NlbnQgLTIxMQovQ2FwSGVpZ2h0IDEwNDcKL1N0ZW1WIDgwCi9G
+b250RmlsZTIgNDEgMCBSCj4+CmVuZG9iagoKNDQgMCBvYmoKPDwvTGVuZ3RoIDM2Ny9GaWx0
+ZXIvRmxhdGVEZWNvZGU+PgpzdHJlYW0KeJxdkstugzAQRfd8hZftIgLzMI2EkFISJBZ9qLQf
+QOwhRSoGGbLg7+uZSVupC9AxvsMcGIdVc2zssIavbtItrKIfrHGwTFenQZzhMthAxsIMer2t
+6K7Hbg5CX9tuywpjY/upKILwze8tq9vE3cFMZ7gPwhdnwA32Iu4+qtav2+s8f8EIdhVRUJbC
+QO/f89TNz90IIVXtGuO3h3Xb+ZK/wPs2g4hpLVlFTwaWudPgOnuBoIiiUhR1XQZgzb+9JOaS
+c68/O+ej0kejKI5KzzFxmiAnxFmGnDLHyBln9siKuULOmY/ID5xXyHvmFPnAGYn8yEzvrzhD
+fY/EOT0/ESvqWzMfPMuIGTOS/RXWSvbPsZdk/xQdJPsr7CvZX6GnZH+F3yLZX+G3SPbPsa9k
+/5wy7J+QA/urGpn9FfVif3VCZv+c3Ng/w/8cs3+a0oBuk8BR4Vn6OQJCX53z46cDR3PHiQ8W
+fs/kPM1YRdc31B+2IgplbmRzdHJlYW0KZW5kb2JqCgo0NSAwIG9iago8PC9UeXBlL0ZvbnQv
+U3VidHlwZS9UcnVlVHlwZS9CYXNlRm9udC9CQUFBQUErQXJpYWwtQm9sZE1UCi9GaXJzdENo
+YXIgMAovTGFzdENoYXIgMzIKL1dpZHRoc1s3NTAgMjc3IDcyMiA3MjIgNzIyIDI3NyA2MTAg
+ODMzIDY2NiA2MTAgNzIyIDY2NiA2NjYgNjEwIDYxMCAyNzcKNTU2IDU1NiAzMzMgNjEwIDU1
+NiA4ODkgMjc3IDI3NyAzODkgNTU2IDMzMyA2MTAgMzMzIDYxMCA1NTYgNjY2CjcyMiBdCi9G
+b250RGVzY3JpcHRvciA0MyAwIFIKL1RvVW5pY29kZSA0NCAwIFIKPj4KZW5kb2JqCgo0NiAw
+IG9iago8PC9GMSA0NSAwIFIvRjIgMjUgMCBSL0YzIDIwIDAgUi9GNCA0MCAwIFIvRjUgMzUg
+MCBSL0Y2IDMwIDAgUgo+PgplbmRvYmoKCjQ3IDAgb2JqCjw8L0ZvbnQgNDYgMCBSCi9YT2Jq
+ZWN0PDwvSW00IDQgMCBSL0ltNSA1IDAgUj4+Ci9Qcm9jU2V0Wy9QREYvVGV4dC9JbWFnZUMv
+SW1hZ2VJL0ltYWdlQl0KPj4KZW5kb2JqCgoxIDAgb2JqCjw8L1R5cGUvUGFnZS9QYXJlbnQg
+MTUgMCBSL1Jlc291cmNlcyA0NyAwIFIvTWVkaWFCb3hbMCAwIDYxMiA3OTJdL0dyb3VwPDwv
+Uy9UcmFuc3BhcmVuY3kvQ1MvRGV2aWNlUkdCL0kgdHJ1ZT4+L0NvbnRlbnRzIDIgMCBSPj4K
+ZW5kb2JqCgoxMiAwIG9iago8PC9UeXBlL1BhZ2UvUGFyZW50IDE1IDAgUi9SZXNvdXJjZXMg
+NDcgMCBSL01lZGlhQm94WzAgMCA2MTIgNzkyXS9Hcm91cDw8L1MvVHJhbnNwYXJlbmN5L0NT
+L0RldmljZVJHQi9JIHRydWU+Pi9Db250ZW50cyAxMyAwIFI+PgplbmRvYmoKCjE1IDAgb2Jq
+Cjw8L1R5cGUvUGFnZXMKL1Jlc291cmNlcyA0NyAwIFIKL01lZGlhQm94WyAwIDAgNjEyIDc5
+MiBdCi9LaWRzWyAxIDAgUiAxMiAwIFIgXQovQ291bnQgMj4+CmVuZG9iagoKNDggMCBvYmoK
+PDwvVHlwZS9DYXRhbG9nL1BhZ2VzIDE1IDAgUgovT3BlbkFjdGlvblsxIDAgUiAvWFlaIG51
+bGwgbnVsbCAwXQovVmlld2VyUHJlZmVyZW5jZXM8PC9EaXNwbGF5RG9jVGl0bGUgdHJ1ZQo+
+PgovTGFuZyhlbi1JTikKPj4KZW5kb2JqCgo0OSAwIG9iago8PC9UaXRsZTxGRUZGMDA0MzAw
+NjEwMDZFMDA2NDAwNjkwMDY0MDA2MTAwNzQwMDY1MDA3MzAwMjAwMDRFMDA2MTAwNkQwMDY1
+PgovQXV0aG9yPEZFRkYwMDczMDA2MTAwNjcwMDYxMDA3MjAwMjAwMDcwMDAyMDAwNzMwMDc1
+MDA3MjAwNzkwMDYxMDA3NzAwNjEwMDZFMDA3MzAwNjgwMDY5PgovQ3JlYXRvcjxGRUZGMDA1
+NzAwNzIwMDY5MDA3NDAwNjUwMDcyPgovUHJvZHVjZXI8RkVGRjAwNEMwMDY5MDA2MjAwNzIw
+MDY1MDA0RjAwNjYwMDY2MDA2OTAwNjMwMDY1MDAyMDAwMzMwMDJFMDAzNT4KL0NyZWF0aW9u
+RGF0ZShEOjIwMTIxMDE4MTczMjU0KzA1JzMwJyk+PgplbmRvYmoKCnhyZWYKMCA1MAowMDAw
+MDAwMDAwIDY1NTM1IGYgCjAwMDAwNzk2NzYgMDAwMDAgbiAKMDAwMDAwMDAxOSAwMDAwMCBu
+IAowMDAwMDA1NzEwIDAwMDAwIG4gCjAwMDAwMDc3NjkgMDAwMDAgbiAKMDAwMDAwNTczMSAw
+MDAwMCBuIAowMDAwMDA3NDkxIDAwMDAwIG4gCjAwMDAwMDc1MTAgMDAwMDAgbiAKMDAwMDAw
+Nzc1MCAwMDAwMCBuIAowMDAwMDA4MDYyIDAwMDAwIG4gCjAwMDAwMDgwODIgMDAwMDAgbiAK
+MDAwMDAwODI3OSAwMDAwMCBuIAowMDAwMDc5ODIwIDAwMDAwIG4gCjAwMDAwMDgyOTkgMDAw
+MDAgbiAKMDAwMDAwOTAzNCAwMDAwMCBuIAowMDAwMDc5OTY2IDAwMDAwIG4gCjAwMDAwMDkw
+NTUgMDAwMDAgbiAKMDAwMDAyMzc2OCAwMDAwMCBuIAowMDAwMDIzNzkxIDAwMDAwIG4gCjAw
+MDAwMjM5ODYgMDAwMDAgbiAKMDAwMDAyNDU0MiAwMDAwMCBuIAowMDAwMDI0OTQ0IDAwMDAw
+IG4gCjAwMDAwMzc1MjQgMDAwMDAgbiAKMDAwMDAzNzU0NyAwMDAwMCBuIAowMDAwMDM3NzQ3
+IDAwMDAwIG4gCjAwMDAwMzgyNDMgMDAwMDAgbiAKMDAwMDAzODU4NyAwMDAwMCBuIAowMDAw
+MDQ4OTg1IDAwMDAwIG4gCjAwMDAwNDkwMDggMDAwMDAgbiAKMDAwMDA0OTE5OSAwMDAwMCBu
+IAowMDAwMDQ5NzQzIDAwMDAwIG4gCjAwMDAwNTAxMjcgMDAwMDAgbiAKMDAwMDA1OTU2MCAw
+MDAwMCBuIAowMDAwMDU5NTgyIDAwMDAwIG4gCjAwMDAwNTk3NzMgMDAwMDAgbiAKMDAwMDA2
+MDEwOCAwMDAwMCBuIAowMDAwMDYwMjk4IDAwMDAwIG4gCjAwMDAwNjIwMjYgMDAwMDAgbiAK
+MDAwMDA2MjA0OCAwMDAwMCBuIAowMDAwMDYyMjQwIDAwMDAwIG4gCjAwMDAwNjI1MzEgMDAw
+MDAgbiAKMDAwMDA2MjY5MiAwMDAwMCBuIAowMDAwMDc4NTQwIDAwMDAwIG4gCjAwMDAwNzg1
+NjMgMDAwMDAgbiAKMDAwMDA3ODc1OSAwMDAwMCBuIAowMDAwMDc5MTk2IDAwMDAwIG4gCjAw
+MDAwNzk0ODQgMDAwMDAgbiAKMDAwMDA3OTU2NyAwMDAwMCBuIAowMDAwMDgwMDczIDAwMDAw
+IG4gCjAwMDAwODAyMTYgMDAwMDAgbiAKdHJhaWxlcgo8PC9TaXplIDUwL1Jvb3QgNDggMCBS
+Ci9JbmZvIDQ5IDAgUgovSUQgWyA8ODY5MjMyNUIzMkVDNDJEMDM2NEY4RDIzNzg4NzY2RDc+
+Cjw4NjkyMzI1QjMyRUM0MkQwMzY0RjhEMjM3ODg3NjZENz4gXQovRG9jQ2hlY2tzdW0gLzU0
+MDIyMDJFMDIxMjc2QkZGRkZBOTQxQkRBMkIxMEQxCj4+CnN0YXJ0eHJlZgo4MDU1NAolJUVP
+Rgo=
 --------------010903010402010104090709--
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 418a42bef93..f1fa6446588 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
@@ -29,7 +29,7 @@ class hr_recruitment_partner_create(osv.osv_memory):
         'close': fields.boolean('Close job request'),
                 }
 
-    def view_init(self, cr , uid , fields_list, context=None):
+    def view_init(self, cr, uid, fields_list, context=None):
         case_obj = self.pool.get('hr.applicant')
         if context is None:
             context = {}
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
index 291c16a7644..0b57082c019 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_employee_hired.py
@@ -26,7 +26,7 @@ class hired_employee(osv.osv_memory):
     _name = 'hired.employee'
     _description = 'Create Employee'
 
-    def case_close(self, cr, uid,ids, context=None):
+    def case_close(self, cr, uid, ids, context=None):
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -39,7 +39,7 @@ class hired_employee(osv.osv_memory):
         self.pool.get('hr.applicant').case_close(cr, uid,context.get('active_ids',[]))
         return {}
 
-    def case_close_with_emp(self, cr, uid,ids, context=None):
+    def case_close_with_emp(self, cr, uid, ids, context=None):
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py
index d6a6232d1a0..bff25e8e55d 100644
--- a/addons/hr_timesheet/__openerp__.py
+++ b/addons/hr_timesheet/__openerp__.py
@@ -23,7 +23,8 @@
 {
     'name': 'Timesheets',
     'version': '1.0',
-    "category": "Human Resources",
+    'category': 'Human Resources',
+    'sequence': 23,
     'description': """
 This module implements a timesheet system.
 ==========================================
@@ -41,8 +42,7 @@ up a management by affair.
     'website': 'http://www.openerp.com',
     'images': ['images/hr_timesheet_lines.jpeg'],
     'depends': ['account', 'hr', 'base', 'hr_attendance', 'process'],
-    'init_xml': ['hr_timesheet_data.xml'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'security/hr_timesheet_security.xml',
         'hr_timesheet_view.xml',
@@ -53,8 +53,9 @@ up a management by affair.
         'wizard/hr_timesheet_print_users_view.xml',
         'wizard/hr_timesheet_sign_in_out_view.xml',
         'hr_timesheet_installer.xml',
+        'hr_timesheet_data.xml'
     ],
-    'demo_xml': ['hr_timesheet_demo.xml'],
+    'demo': ['hr_timesheet_demo.xml'],
     'test': [
         'test/test_hr_timesheet.yml',
         'test/hr_timesheet_report.yml',
@@ -62,6 +63,5 @@ up a management by affair.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0071405533469',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index bd71f6479bd..216541501b1 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -137,11 +137,13 @@ class hr_analytic_timesheet(osv.osv):
         if context is None:
             context = {}
         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:
-                return emp.journal_id.id
-        return False
+        if not emp_id :
+            raise osv.except_osv(_('Warning!'), _('Please create an employee for this user, using the menu: Human Resources > Employees.'))
+        emp = emp_obj.browse(cr, uid, emp_id[0], context=context)
+        if emp.journal_id:
+            return emp.journal_id.id
+        else :
+            raise osv.except_osv(_('Warning!'), _('No analytic journal defined for \'%s\'.\nYou should assign an analytic journal on the employee form.')%(emp.name))
 
 
     _defaults = {
@@ -152,7 +154,7 @@ class hr_analytic_timesheet(osv.osv):
         'date': lambda self, cr, uid, ctx: ctx.get('date', fields.date.context_today(self,cr,uid,context=ctx)),
         'user_id': lambda obj, cr, uid, ctx: ctx.get('user_id', uid),
     }
-    def on_change_account_id(self, cr, uid, ids, account_id):
+    def on_change_account_id(self, cr, uid, ids, account_id, context=None):
         return {'value':{}}
 
     def on_change_date(self, cr, uid, ids, date):
@@ -188,17 +190,14 @@ class hr_analytic_timesheet(osv.osv):
             'journal_id': self._getAnalyticJournal(cr, uid, context),
         }}
 
-hr_analytic_timesheet()
-
 class account_analytic_account(osv.osv):
 
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
-    
     _columns = {
-        'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"),
+        'use_timesheets': fields.boolean('Use Timesheets', help="Check this field if this project manages timesheets"),
     }
-    
+
     def on_change_template(self, cr, uid, ids, template_id, context=None):
         res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
         if template_id and 'value' in res:
@@ -206,6 +205,4 @@ class account_analytic_account(osv.osv):
             res['value']['use_timesheets'] = template.use_timesheets
         return res
 
-account_analytic_account()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index d364d605b5f..ebdd05ed59c 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -6,12 +6,12 @@
             <field name="name">hr.analytic.timesheet.tree</field>
             <field name="model">hr.analytic.timesheet</field>
             <field name="arch" type="xml">
-                <tree editable="bottom" string="Timesheet Lines">
+                <tree editable="bottom" string="Timesheet Activities">
                     <field name="date" on_change="on_change_date(date)"/>
-                    <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
+                    <field name="user_id" on_change="on_change_user_id(user_id)" required="1" options='{"no_open": True}'/>
                     <field name="journal_id" invisible="1"/>
                     <field name="name"/>
-                    <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1}"/>
+                    <field domain="[('type','=','normal'),('use_timesheets','=',1)]" name="account_id" context="{'default_use_timesheets': 1, 'default_type': 'contract'}"/>
                     <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]" invisible="1"/>
                     <field name="unit_amount" string="Duration" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" sum="Total time" widget="float_time"/>
                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" invisible="1"/>
@@ -24,7 +24,7 @@
             <field name="name">hr.analytic.timesheet.form</field>
             <field name="model">hr.analytic.timesheet</field>
             <field name="arch" type="xml">
-                <form string="Timesheet Lines" version="7.0">
+                <form string="Timesheet Activities" version="7.0">
                     <sheet>
                     <group>
                         <group>
@@ -77,23 +77,54 @@
                 </search>
             </field>
         </record>
-        
+
+        <record model="ir.actions.act_window" id="act_analytic_cost_revenue">
+            <field name="context">{'search_default_account_id': [active_id], 'default_account_id': active_id, 'search_default_group_date': 1, 'search_default_group_journal': 1}</field>
+            <field name="name">Costs &amp; Revenues</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="src_model">account.analytic.account</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_type">form</field>
+            <field name="help" type="html">
+              <p>
+                No activity yet on this contract.
+              </p><p>
+                In OpenERP, contracts and projects are implemented using
+                analytic account. So, you can track costs and revenues to analyse
+                your margins easily.
+              </p><p>
+                Costs will be created automatically when you register supplier
+                invoices, expenses or timesheets.
+              </p><p>
+                Revenues will be created automatically when you create customer
+                invoices. Customer invoices can be created based on sale orders
+                (fixed price invoices), on timesheets (based on the work done) or
+                on expenses (e.g. reinvoicing of travel costs).
+              </p>
+            </field>
+        </record>
+
+ 
         <record id="account_analytic_account_timesheet_form" model="ir.ui.view">
             <field name="name">account.analytic.account.invoice.form</field>
             <field name="model">account.analytic.account</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                <xpath expr='//div[@name="project"]' position='inside'>
                     <field name="use_timesheets"/>
+                    <label for="use_timesheets"/>
+                </xpath>
+                <xpath expr='//div[@name="buttons"]' position='inside'>
+                    <button string="Costs and Revenues"
+                        name="%(act_analytic_cost_revenue)d"
+                        type="action"/>
+
                 </xpath>
             </field>
         </record>
 
         <record id="act_hr_timesheet_line_evry1_all_form" model="ir.actions.act_window">
-            <field name="name">Timesheet Lines</field>
+            <field name="name">Timesheet Activities</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.analytic.timesheet</field>
             <field name="view_type">form</field>
@@ -102,10 +133,12 @@
             <field name="search_view_id" ref="hr_timesheet_line_search"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to your timesheets.
+                Click to record activities.
               </p><p>
-                Through this menu you can register and follow your workings
-                hours by project every day.
+                You can register and track your workings hours by project every
+                day. Every time spent on a project will become a cost in the
+                analytic accounting/contract and can be re-invoiced to
+                customers if required.
               </p>
             </field>
         </record>
@@ -117,16 +150,12 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Personal Information" position="after">
-                    <page string="Timesheets" groups="base.group_hr_user">
-                        <group>
-                            <group col="2">
-                                <field name="product_id" domain="[('type','=','service')]"/>
-                                <field name="journal_id"/>
-                            </group>
-                        </group>
-                    </page>
-                </page>
+                <xpath expr="//group[@name='active_group']" position="before">
+                    <group string="Timesheets">
+                        <field name="product_id" domain="[('type','=','service')]"/>
+                        <field name="journal_id"/>
+                    </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet/i18n/ar.po b/addons/hr_timesheet/i18n/ar.po
index f0a1d28363c..f76ea83cbf2 100644
--- a/addons/hr_timesheet/i18n/ar.po
+++ b/addons/hr_timesheet/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/bg.po b/addons/hr_timesheet/i18n/bg.po
index 00260fac5ee..f2be76ea809 100644
--- a/addons/hr_timesheet/i18n/bg.po
+++ b/addons/hr_timesheet/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/bs.po b/addons/hr_timesheet/i18n/bs.po
index 9ae10625205..ae2bec7316c 100644
--- a/addons/hr_timesheet/i18n/bs.po
+++ b/addons/hr_timesheet/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/ca.po b/addons/hr_timesheet/i18n/ca.po
index a2f330d3108..ddb75aaae9e 100644
--- a/addons/hr_timesheet/i18n/ca.po
+++ b/addons/hr_timesheet/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/cs.po b/addons/hr_timesheet/i18n/cs.po
index 3885fb6e9de..98371111237 100644
--- a/addons/hr_timesheet/i18n/cs.po
+++ b/addons/hr_timesheet/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/da.po b/addons/hr_timesheet/i18n/da.po
index be372d6db86..6132ff21723 100644
--- a/addons/hr_timesheet/i18n/da.po
+++ b/addons/hr_timesheet/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/de.po b/addons/hr_timesheet/i18n/de.po
index 1c272279949..a1ac73f5d7a 100644
--- a/addons/hr_timesheet/i18n/de.po
+++ b/addons/hr_timesheet/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:22+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-11-18 00:40+0000\n"
+"Last-Translator: Felix Schubert <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-11-19 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -37,7 +37,7 @@ msgstr "Kein Mitarbeiter für diesen Benutzer definiert!"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Group By..."
-msgstr "Gruppierung..."
+msgstr "Gruppieren nach"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
@@ -66,7 +66,7 @@ msgstr "Analytisches Journal"
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Stop Working"
-msgstr "Beende Arbeit"
+msgstr "Arbeitsende"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
@@ -172,13 +172,13 @@ msgstr "Warnung !"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "UserError"
-msgstr "BenutzerFehler"
+msgstr "Benutzer Fehler"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
 #, python-format
 msgid "No cost unit defined for this employee !"
-msgstr "Keine Kosten Einheit für diesen Mitarbeiter definiert!"
+msgstr "Kein Stundensatz für diesen Mitarbeiter definiert!"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -254,7 +254,7 @@ msgstr "Juli"
 #: field:hr.sign.in.project,date:0
 #: field:hr.sign.out.project,date_start:0
 msgid "Starting Date"
-msgstr "Anfangsdatum"
+msgstr "Start Datum"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
@@ -271,8 +271,8 @@ msgstr ""
 #: help:hr.employee,product_id:0
 msgid "Specifies employee's designation as a product with type 'service'."
 msgstr ""
-"Spezifiziere ein Produkt mit dem Typ 'Dienstleistungen'  bei den "
-"Mitarbeitereinstellungen auf dem Aktenreiter 'Zeiterfassung'."
+"Definiert ein Produkt mit dem Typ \"Dienstleistung\" in den Einstellungen "
+"für den Mitarbeiter"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -318,7 +318,7 @@ msgstr "Aufgabenbeschreibung"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Invoice Analysis"
-msgstr "Statistik Rechnungen"
+msgstr "Rechnungsanalyse"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
@@ -334,7 +334,7 @@ msgstr "Anmelden / Abmelden bei Projekt"
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
 msgid "Define your Analytic Structure"
-msgstr "Definieren Sie die Strukture der Analysekonten"
+msgstr "Definiere die Struktur der Analytischen Konten"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -348,14 +348,14 @@ msgid ""
 "Analytic journal is not defined for employee %s \n"
 "Define an employee for the selected user and assign an analytic journal!"
 msgstr ""
-"Analytisches Journal ist für diesen Mitarbeiter nicht definiert: %s\n"
-"Definiere einen Mitarbeiter für den ausgewählten Benutzer und weise dann "
-"noch ein analytisches Konto zu!"
+"Es wurde kein Analytisches Journal für diesen Mitarbeiter definiert: %s\n"
+"Weise einen Mitarbeiter dem ausgewählten Benutzer und ein analytisches Konto "
+"zu!"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(Keep empty for current time)"
-msgstr "(Leer lassen für aktuelle Zeit)"
+msgstr "(Frei lassen für den aktuellen Zeitpunkt)"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
@@ -369,9 +369,9 @@ msgid ""
 "analyse costs and revenues. In OpenERP, analytic accounts are also used to "
 "track customer contracts."
 msgstr ""
-"Um Erlöse und Kosten zu analysiren, benötigen Sie einen strukturierte "
-"Analyse Kontenplan. In OpenERP wird  damit auch die Entwicklung der "
-"Kundenkontrakte verfolgt."
+"Um Erlöse und Kosten zu analysieren, sollten Sie einen strukturierte "
+"analytischen Kontenplan erstellen. In OpenERP können damit auch "
+"Kundenverträge verfolgt werden."
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
@@ -424,7 +424,7 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
 msgid "Closing Date"
-msgstr "Ende Datum"
+msgstr "Enddatum"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -475,12 +475,12 @@ msgstr "Mitarbeiter Nr."
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "General Information"
-msgstr "Grundinformation"
+msgstr "Allgemeine Informationen"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
 msgid "My Current Timesheet"
-msgstr ""
+msgstr "Meine Zeiterfassung"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -524,8 +524,8 @@ msgid ""
 "Through this menu you can register and follow your workings hours by project "
 "every day."
 msgstr ""
-"Mit diesem Menüpunkt können Sie sich registrieren und die Arbeitsstunden je "
-"Projekt und Tage verfoglen."
+"Mit diesem Menüpunkt können Sie die Arbeitsstunden pro Projekt und Tage "
+"verfolgen."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,server_date:0
@@ -561,12 +561,12 @@ msgstr "Mai"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total time"
-msgstr "Gesamtzeit"
+msgstr "Gesamtdauer"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(local time on the server side)"
-msgstr "(Ortszeit auf dem Server)"
+msgstr "(Ortszeit auf Serverseite)"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
@@ -585,7 +585,7 @@ msgstr "Februar"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
 msgid "Sign Out By Project"
-msgstr "Anmelden / Abmelden Projekte"
+msgstr "Anmelden / Abmelden Projekt"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
@@ -617,7 +617,7 @@ msgid ""
 "No analytic account defined on the project.\n"
 "Please set one or we can not automatically fill the timesheet."
 msgstr ""
-"Kein Analytisches Konto für Projekt definiert.\n"
+"Kein Analytisches Konto für das Projekt definiert.\n"
 "Bitte definieren Sie ein Konto, damit wir automatisch die Zeiterfassung "
 "buchen können."
 
@@ -630,12 +630,12 @@ msgstr "Benutzer"
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "Start Working"
-msgstr "Beginne Arbeit"
+msgstr "Arbeitsbeginn"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by user"
-msgstr "Arbeitszeiten nach Mitarbeitern"
+msgstr "Auswertung nach Mitarbeiter"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
diff --git a/addons/hr_timesheet/i18n/el.po b/addons/hr_timesheet/i18n/el.po
index 27fc1345fe8..c9a8d9b1dee 100644
--- a/addons/hr_timesheet/i18n/el.po
+++ b/addons/hr_timesheet/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_timesheet/i18n/es.po b/addons/hr_timesheet/i18n/es.po
index ce33cdb6b9c..303a6a44408 100644
--- a/addons/hr_timesheet/i18n/es.po
+++ b/addons/hr_timesheet/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/es_AR.po b/addons/hr_timesheet/i18n/es_AR.po
index 8e995c29e29..49836a1e787 100644
--- a/addons/hr_timesheet/i18n/es_AR.po
+++ b/addons/hr_timesheet/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/es_CR.po b/addons/hr_timesheet/i18n/es_CR.po
index a6a2d9d5967..a20553b5023 100644
--- a/addons/hr_timesheet/i18n/es_CR.po
+++ b/addons/hr_timesheet/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/es_EC.po b/addons/hr_timesheet/i18n/es_EC.po
index b61b2f907c1..5141433b264 100644
--- a/addons/hr_timesheet/i18n/es_EC.po
+++ b/addons/hr_timesheet/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/et.po b/addons/hr_timesheet/i18n/et.po
index 6d420be21cc..e14850bcc25 100644
--- a/addons/hr_timesheet/i18n/et.po
+++ b/addons/hr_timesheet/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/fi.po b/addons/hr_timesheet/i18n/fi.po
index 3ef9c73ecb0..1dc8e81238a 100644
--- a/addons/hr_timesheet/i18n/fi.po
+++ b/addons/hr_timesheet/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/fr.po b/addons/hr_timesheet/i18n/fr.po
index 76b85c34b1f..a76781f2664 100644
--- a/addons/hr_timesheet/i18n/fr.po
+++ b/addons/hr_timesheet/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Erreur : l'UdV doit appartenir à une autre catégorie que l'UdM"
diff --git a/addons/hr_timesheet/i18n/gl.po b/addons/hr_timesheet/i18n/gl.po
index deac873b5d7..6d78a4b0da6 100644
--- a/addons/hr_timesheet/i18n/gl.po
+++ b/addons/hr_timesheet/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/hr.po b/addons/hr_timesheet/i18n/hr.po
index f035ff74b6f..77280093f8a 100644
--- a/addons/hr_timesheet/i18n/hr.po
+++ b/addons/hr_timesheet/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/i18n/hu.po b/addons/hr_timesheet/i18n/hu.po
index 4aa18c0abc6..735454bcf85 100644
--- a/addons/hr_timesheet/i18n/hu.po
+++ b/addons/hr_timesheet/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -107,7 +107,7 @@ msgstr "P"
 #. module: hr_timesheet
 #: field:hr.employee,uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "ME"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -152,7 +152,7 @@ msgstr "Alkalmazottak neve"
 #. module: hr_timesheet
 #: field:hr.sign.out.project,account_id:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Projekt /Gyűjtőkód"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
@@ -195,7 +195,7 @@ msgstr "Figyelmeztetés"
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -220,7 +220,7 @@ msgstr "V"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Gyűjtőkód"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -316,7 +316,7 @@ msgstr "Munka leírása"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Invoice Analysis"
-msgstr ""
+msgstr "Számlaelemzés"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
@@ -332,7 +332,7 @@ msgstr "Projektbe bejelentkezés/kijelentkezés"
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
 msgid "Define your Analytic Structure"
-msgstr ""
+msgstr "Gyűjtőkód szerkezet beállítása"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -371,7 +371,7 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
 msgid "Analytic Line"
-msgstr ""
+msgstr "Gyűjtőkód tétel"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -518,6 +518,8 @@ msgid ""
 "Through this menu you can register and follow your workings hours by project "
 "every day."
 msgstr ""
+"Ebben a menüben projektenként rögzítheti és követheti a napi munkaóra "
+"ráfordításait."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,server_date:0
diff --git a/addons/hr_timesheet/i18n/id.po b/addons/hr_timesheet/i18n/id.po
index f00b06dab3b..7b9c682eb7b 100644
--- a/addons/hr_timesheet/i18n/id.po
+++ b/addons/hr_timesheet/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/it.po b/addons/hr_timesheet/i18n/it.po
index d947fc0dee9..8ee7b1fdba5 100644
--- a/addons/hr_timesheet/i18n/it.po
+++ b/addons/hr_timesheet/i18n/it.po
@@ -13,15 +13,15 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Wed"
-msgstr "Mercoledi"
+msgstr "Mer"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
@@ -106,7 +106,7 @@ msgstr "Ven"
 #. module: hr_timesheet
 #: field:hr.employee,uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "U.M."
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -151,7 +151,7 @@ msgstr "Nome Impiegato"
 #. module: hr_timesheet
 #: field:hr.sign.out.project,account_id:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Progetto / Conto analitico"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
@@ -194,7 +194,7 @@ msgstr "Attenzione"
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -219,7 +219,7 @@ msgstr "Dom"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Conto analitico"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -262,7 +262,7 @@ msgstr "Categorie"
 #. module: hr_timesheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
+msgstr "Non è possibile modificare un Timesheet Confermato/Completato"
 
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
@@ -325,7 +325,7 @@ msgstr "Timesheet dipendente"
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
 msgid "Sign in / Sign out by project"
-msgstr "Entrate/Uscite per Progetto"
+msgstr "Entrata / Uscita per progetto"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
@@ -335,7 +335,7 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "Sign in / Sign out"
-msgstr "Entrate/Uscite"
+msgstr "Entrata / Uscita"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:175
@@ -343,7 +343,10 @@ msgstr "Entrate/Uscite"
 msgid ""
 "Analytic journal is not defined for employee %s \n"
 "Define an employee for the selected user and assign an analytic journal!"
-msgstr "Il giornale analitico non è stato definito per l'impiegato %s"
+msgstr ""
+"Il Sezionale Analitico dell'impiegato %s non è specificato\n"
+"Definisci un impiegato per l'utente selezionato e assegna un Sezionale "
+"Analitico!"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -353,7 +356,7 @@ msgstr "(lasciare vuoto per orario attuale)"
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Timesheets"
-msgstr "Timesheets"
+msgstr "Timesheet"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,help:hr_timesheet.action_define_analytic_structure
@@ -362,11 +365,14 @@ msgid ""
 "analyse costs and revenues. In OpenERP, analytic accounts are also used to "
 "track customer contracts."
 msgstr ""
+"Crea una struttura dei conti analitici in base alle tue necessità di analisi "
+"dei costi e dei ricavi. In OpenERP, i conti analitici si usano anche per "
+"gestire i contratti con i clienti."
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
 msgid "Analytic Line"
-msgstr ""
+msgstr "Riga analitica"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -436,7 +442,7 @@ msgstr "Gennaio"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Key dates"
-msgstr "Fate Chiave"
+msgstr "Date chiave"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -448,7 +454,7 @@ msgstr "Gio"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis stats"
-msgstr "Statistiche Analisi"
+msgstr "Statistiche"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
@@ -553,7 +559,7 @@ msgstr "Tempo totale"
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(local time on the server side)"
-msgstr "(ora locale sul lato server)"
+msgstr "(ora locale lato server)"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
diff --git a/addons/hr_timesheet/i18n/ja.po b/addons/hr_timesheet/i18n/ja.po
index 4942e31dc9e..39b6ef022a1 100644
--- a/addons/hr_timesheet/i18n/ja.po
+++ b/addons/hr_timesheet/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/ko.po b/addons/hr_timesheet/i18n/ko.po
index 6ebe772ec59..dd5399fd705 100644
--- a/addons/hr_timesheet/i18n/ko.po
+++ b/addons/hr_timesheet/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/lt.po b/addons/hr_timesheet/i18n/lt.po
index 5968c5372e6..9a89e866a72 100644
--- a/addons/hr_timesheet/i18n/lt.po
+++ b/addons/hr_timesheet/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/lv.po b/addons/hr_timesheet/i18n/lv.po
index a88e106bda8..1258cf7140f 100644
--- a/addons/hr_timesheet/i18n/lv.po
+++ b/addons/hr_timesheet/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/mk.po b/addons/hr_timesheet/i18n/mk.po
new file mode 100644
index 00000000000..a402aa85041
--- /dev/null
+++ b/addons/hr_timesheet/i18n/mk.po
@@ -0,0 +1,645 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-10-20 13:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Wed"
+msgstr "Сре"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "(Keep empty for current_time)"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Group By..."
+msgstr "Групирај По..."
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.action_hr_timesheet_sign_in
+msgid ""
+"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."
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Today"
+msgstr "Денес"
+
+#. module: hr_timesheet
+#: field:hr.employee,journal_id:0
+msgid "Analytic Journal"
+msgstr "Аналитичка картица"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Stop Working"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
+msgid "Employee Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Work done stats"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet
+msgid "Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Mon"
+msgstr "Пон"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in"
+msgstr "Најава"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Fri"
+msgstr "Пет"
+
+#. module: hr_timesheet
+#: field:hr.employee,uom_id:0
+msgid "UoM"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid ""
+"Employees can encode their time spent on the different projects they are "
+"assigned on. A  project is an analytic account and the time spent on a "
+"project generates costs on the analytic account. This feature allows to "
+"record at the same time the attendance and the timesheet."
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,analytic_amount:0
+msgid "Minimum Analytic Amount"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Monthly Employee Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Work done in the last period"
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,state:0
+#: field:hr.sign.out.project,state:0
+msgid "Current state"
+msgstr "Тековен статус"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,name:0
+#: field:hr.sign.out.project,name:0
+msgid "Employees name"
+msgstr "Име на Вработениот"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,account_id:0
+msgid "Project / Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
+msgid "Print Employees Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:175
+#: code:addons/hr_timesheet/hr_timesheet.py:177
+#, python-format
+msgid "Warning !"
+msgstr "Внимание !"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
+#, python-format
+msgid "UserError"
+msgstr "Корисничка Грешка"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
+#, python-format
+msgid "No cost unit defined for this employee !"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Tue"
+msgstr "Вто"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
+#, python-format
+msgid "Warning"
+msgstr "Предупредување"
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,partner_id:0
+msgid "Partner"
+msgstr "Партнер"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Sign In/Out by Project"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Sat"
+msgstr "Саб"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Sun"
+msgstr "Нед"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Analytic account"
+msgstr "Аналитичко конто"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+msgid "Print"
+msgstr "Печати"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
+msgid "Timesheet Lines"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Monthly Employees Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "July"
+msgstr "Јули"
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,date:0
+#: field:hr.sign.out.project,date_start:0
+msgid "Starting Date"
+msgstr "Почетен датум"
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Categories"
+msgstr "Категории"
+
+#. module: hr_timesheet
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+
+#. module: hr_timesheet
+#: help:hr.employee,product_id:0
+msgid "Specifies employee's designation as a product with type 'service'."
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total cost"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "September"
+msgstr "Септември"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.users,employee_ids:0
+msgid "employees"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by month"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: field:hr.analytical.timesheet.employee,month:0
+#: field:hr.analytical.timesheet.users,month:0
+msgid "Month"
+msgstr "Месец"
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,info:0
+msgid "Work Description"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Invoice Analysis"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
+msgid "Employee timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
+msgid "Sign in / Sign out by project"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
+msgid "Define your Analytic Structure"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Sign in / Sign out"
+msgstr "Најава / Одјава"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:175
+#, python-format
+msgid ""
+"Analytic journal is not defined for employee %s \n"
+"Define an employee for the selected user and assign an analytic journal!"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(Keep empty for current time)"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.employee:0
+msgid "Timesheets"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.action_define_analytic_structure
+msgid ""
+"You should create an analytic account structure depending on your needs to "
+"analyse costs and revenues. In OpenERP, analytic accounts are also used to "
+"track customer contracts."
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.analytic.timesheet,line_id:0
+msgid "Analytic Line"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "August"
+msgstr "Август"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "June"
+msgstr "Јуни"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "Print My Timesheet"
+msgstr "Печати мои работни часови"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Date"
+msgstr "Датум"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "November"
+msgstr "Ноември"
+
+#. module: hr_timesheet
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Грешка! Не можете да креирате рекурзивна хиерархија на вработените."
+
+#. module: hr_timesheet
+#: field:hr.sign.out.project,date:0
+msgid "Closing Date"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "October"
+msgstr "Октомври"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "January"
+msgstr "Јануари"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Key dates"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:43
+#: code:addons/hr_timesheet/report/users_timesheet.py:77
+#, python-format
+msgid "Thu"
+msgstr "Чет"
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Analysis stats"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
+msgid "Print Employee Timesheet & Print My Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,emp_id:0
+#: field:hr.sign.out.project,emp_id:0
+msgid "Employee ID"
+msgstr "Идентификационен Број на Вработениот"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "General Information"
+msgstr "Општи информации"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
+msgid "My Current Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "December"
+msgstr "Декември"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+#: view:hr.analytical.timesheet.users:0
+#: view:hr.sign.in.project:0
+#: view:hr.sign.out.project:0
+msgid "Cancel"
+msgstr "Откажи"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_users
+#: model:ir.actions.report.xml,name:hr_timesheet.report_users_timesheet
+#: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
+#: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
+msgid "Employees Timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Information"
+msgstr "Информации"
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,employee_id:0
+#: model:ir.model,name:hr_timesheet.model_hr_employee
+msgid "Employee"
+msgstr "Вработен"
+
+#. module: hr_timesheet
+#: model:ir.actions.act_window,help:hr_timesheet.act_hr_timesheet_line_evry1_all_form
+msgid ""
+"Through this menu you can register and follow your workings hours by project "
+"every day."
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.sign.in.project,server_date:0
+#: field:hr.sign.out.project,server_date:0
+msgid "Current Date"
+msgstr "Тековен датум"
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.employee:0
+msgid "This wizard will print monthly timesheet"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+#: field:hr.employee,product_id:0
+msgid "Product"
+msgstr "Продукт"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Invoicing"
+msgstr "Фактурирање"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "May"
+msgstr "Мај"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Total time"
+msgstr "Вкупно време"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "(local time on the server side)"
+msgstr ""
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
+msgid "Sign In By Project"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "February"
+msgstr "Февруари"
+
+#. module: hr_timesheet
+#: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
+msgid "Sign Out By Project"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:hr.analytical.timesheet.users:0
+msgid "Employees"
+msgstr "Вработени"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "March"
+msgstr "Март"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/report/user_timesheet.py:40
+#: code:addons/hr_timesheet/report/users_timesheet.py:73
+#: selection:hr.analytical.timesheet.employee,month:0
+#: selection:hr.analytical.timesheet.users,month:0
+#, python-format
+msgid "April"
+msgstr "Април"
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/hr_timesheet.py:177
+#, python-format
+msgid ""
+"No analytic account defined on the project.\n"
+"Please set one or we can not automatically fill the timesheet."
+msgstr ""
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+#: view:hr.analytic.timesheet:0
+msgid "Users"
+msgstr "Корисници"
+
+#. module: hr_timesheet
+#: view:hr.sign.in.project:0
+msgid "Start Working"
+msgstr ""
+
+#. module: hr_timesheet
+#: view:account.analytic.account:0
+msgid "Stats by user"
+msgstr ""
+
+#. module: hr_timesheet
+#: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
+#, python-format
+msgid "No employee defined for this user"
+msgstr ""
+
+#. module: hr_timesheet
+#: field:hr.analytical.timesheet.employee,year:0
+#: field:hr.analytical.timesheet.users,year:0
+msgid "Year"
+msgstr "Година"
+
+#. module: hr_timesheet
+#: view:hr.analytic.timesheet:0
+msgid "Accounting"
+msgstr "Сметководство"
+
+#. module: hr_timesheet
+#: view:hr.sign.out.project:0
+msgid "Change Work"
+msgstr ""
+
+#~ msgid "Sum"
+#~ msgstr "Вкупно"
+
+#~ msgid "Total"
+#~ msgstr "Вкупно"
+
+#~ msgid "My Timesheet"
+#~ msgstr "Мои работни часови"
diff --git a/addons/hr_timesheet/i18n/mn.po b/addons/hr_timesheet/i18n/mn.po
index fd54284e9e2..7a592d07253 100644
--- a/addons/hr_timesheet/i18n/mn.po
+++ b/addons/hr_timesheet/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/nb.po b/addons/hr_timesheet/i18n/nb.po
index a7d97abe870..3cf784ccea4 100644
--- a/addons/hr_timesheet/i18n/nb.po
+++ b/addons/hr_timesheet/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -65,7 +65,7 @@ msgstr "Analytisk Journal"
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Stop Working"
-msgstr ""
+msgstr "Stopp å jobbe."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
@@ -76,7 +76,7 @@ msgstr "Ansatttimeliste"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Work done stats"
-msgstr ""
+msgstr "Arbeid gjort statistikk."
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -116,6 +116,10 @@ msgid ""
 "project generates costs on the analytic account. This feature allows to "
 "record at the same time the attendance and the timesheet."
 msgstr ""
+"Ansatte kan koden sin tid brukt på de ulike prosjektene de er tildelt på. Et "
+"prosjekt er et analytisk konto og tid brukt på et prosjekt genererer "
+"kostnader på det analytiske konto. Denne funksjonen gjør det mulig å spille "
+"inn på samme tid om fremmøtet og timeliste."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
@@ -136,7 +140,7 @@ msgstr "Arbeid utført i forrige periode"
 #: field:hr.sign.in.project,state:0
 #: field:hr.sign.out.project,state:0
 msgid "Current state"
-msgstr ""
+msgstr "Nåværende tilstand."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,name:0
@@ -228,12 +232,12 @@ msgstr "Skriv ut"
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Timeliste linjer."
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Monthly Employees Timesheet"
-msgstr ""
+msgstr "Månedlig ansatte Timerliste."
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -258,12 +262,12 @@ msgstr "Kategorier"
 #. module: hr_timesheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
+msgstr "Du kan ikke endre en oppføring i en Bekreftet / Ferdig timeliste!."
 
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
 msgid "Specifies employee's designation as a product with type 'service'."
-msgstr ""
+msgstr "Angir ansattes betegnelse som et produkt med type \"service\"."
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -309,7 +313,7 @@ msgstr "Arbeidsbeskrivelse"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Invoice Analysis"
-msgstr ""
+msgstr "Faktura Analyse."
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
@@ -320,12 +324,12 @@ msgstr "Ansattimeliste"
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
 msgid "Sign in / Sign out by project"
-msgstr ""
+msgstr "Logg inn / Logg ut av prosjektet."
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
 msgid "Define your Analytic Structure"
-msgstr ""
+msgstr "Definer Dine Analytiske Strukturer."
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -339,11 +343,13 @@ msgid ""
 "Analytic journal is not defined for employee %s \n"
 "Define an employee for the selected user and assign an analytic journal!"
 msgstr ""
+"Analytisk journal er ikke definert for ansattes% s\n"
+"Definer en ansatt for den valgte brukeren og tilordne et analytisk journal!"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(Keep empty for current time)"
-msgstr ""
+msgstr "(Hold tom for gjeldende tid)"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
@@ -357,11 +363,14 @@ msgid ""
 "analyse costs and revenues. In OpenERP, analytic accounts are also used to "
 "track customer contracts."
 msgstr ""
+"Du bør lage en analytisk kontostruktur avhengig av dine behov for å "
+"analysere kostnader og inntekter. I OpenERP er analytiske kontoer også "
+"brukes til å spore kundekontrakter."
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,line_id:0
 msgid "Analytic Line"
-msgstr ""
+msgstr "Analytisk linje"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -403,12 +412,12 @@ msgstr "November"
 #. module: hr_timesheet
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursiv Hierarki av ansatte."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
 msgid "Closing Date"
-msgstr ""
+msgstr "Sluttdato"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -431,7 +440,7 @@ msgstr "Januar"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Key dates"
-msgstr ""
+msgstr "Viktige datoer."
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -443,12 +452,13 @@ msgstr "Tor"
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Analysis stats"
-msgstr ""
+msgstr "Analyser statistikk."
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_employee
 msgid "Print Employee Timesheet & Print My Timesheet"
 msgstr ""
+"Skriv ut Ansattes Timeregistrering og skrive ut Min Timeregistrering."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,emp_id:0
@@ -489,7 +499,7 @@ msgstr "Avbryt"
 #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet_users
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_users
 msgid "Employees Timesheet"
-msgstr ""
+msgstr "Ansattes Timeregistrering."
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -508,6 +518,8 @@ msgid ""
 "Through this menu you can register and follow your workings hours by project "
 "every day."
 msgstr ""
+"Gjennom denne menyen kan du registrere og følge hjemkomsten timer etter "
+"prosjekt hver dag."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,server_date:0
@@ -518,7 +530,7 @@ msgstr "Dagens dato"
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "This wizard will print monthly timesheet"
-msgstr ""
+msgstr "Denne veiviseren vil skrive ut månedlig timeliste."
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -548,12 +560,12 @@ msgstr "Totaltid"
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(local time on the server side)"
-msgstr ""
+msgstr "(lokal tid på serversiden)"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_in_project
 msgid "Sign In By Project"
-msgstr ""
+msgstr "Logg inn av prosjekt."
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -567,7 +579,7 @@ msgstr "Februar"
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_sign_out_project
 msgid "Sign Out By Project"
-msgstr ""
+msgstr "Logg ut av prosjekt."
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
@@ -599,6 +611,8 @@ msgid ""
 "No analytic account defined on the project.\n"
 "Please set one or we can not automatically fill the timesheet."
 msgstr ""
+"Ingen analytisk konto definert på prosjektet.\n"
+"Vennligst sett ett eller så kan vi ikke automatisk fylle timeliste."
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -631,12 +645,12 @@ msgstr "År"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Accounting"
-msgstr ""
+msgstr "Regnskap"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Change Work"
-msgstr ""
+msgstr "Endre jobb."
 
 #~ msgid "Analytic Account"
 #~ msgstr "Analytisk konto"
diff --git a/addons/hr_timesheet/i18n/nl.po b/addons/hr_timesheet/i18n/nl.po
index dd270f09098..6e5d92fdda9 100644
--- a/addons/hr_timesheet/i18n/nl.po
+++ b/addons/hr_timesheet/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:47+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-08-26 13:58+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -118,13 +118,13 @@ msgid ""
 msgstr ""
 "Werknemer kunnen gewerkte tijd boeken op verschillende projecten waaraan ze "
 "zijn toegewezen. Een project is een kostenplaats en de gewerkte tijd op een "
-"project genereet kosten op de kostenplaats. Dit kenmerk laat tegelijkertijd "
-"de aanwezigheid en de urenverantwoording vastleggen."
+"project genereert kosten op de kostenplaats. Deze functionaliteit laat "
+"tegelijkertijd de aanwezigheid en de urenverantwoording vastleggen."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr "Minimum analytisch bedrag"
+msgstr "Minimum bedrag kostenplaats"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
@@ -327,7 +327,7 @@ msgstr "Urenstaat werknemer"
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_out
 msgid "Sign in / Sign out by project"
-msgstr "Klok in / Klok uit per project"
+msgstr "Inklokken/Uitklokken per project"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_define_analytic_structure
@@ -477,7 +477,7 @@ msgstr "Algemene informatie"
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
 msgid "My Current Timesheet"
-msgstr ""
+msgstr "Mijn huidige urenstaat"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
diff --git a/addons/hr_timesheet/i18n/pl.po b/addons/hr_timesheet/i18n/pl.po
index 01f86d314bf..5786e591cc1 100644
--- a/addons/hr_timesheet/i18n/pl.po
+++ b/addons/hr_timesheet/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/pt.po b/addons/hr_timesheet/i18n/pt.po
index 949e354dbe8..8e2eab17d5a 100644
--- a/addons/hr_timesheet/i18n/pt.po
+++ b/addons/hr_timesheet/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/pt_BR.po b/addons/hr_timesheet/i18n/pt_BR.po
index 38945934adb..fbf7030e610 100644
--- a/addons/hr_timesheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/ro.po b/addons/hr_timesheet/i18n/ro.po
index ae447969829..43fed4397e9 100644
--- a/addons/hr_timesheet/i18n/ro.po
+++ b/addons/hr_timesheet/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/ru.po b/addons/hr_timesheet/i18n/ru.po
index 4bb59325107..b4b710f9d03 100644
--- a/addons/hr_timesheet/i18n/ru.po
+++ b/addons/hr_timesheet/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/sl.po b/addons/hr_timesheet/i18n/sl.po
index 1a50a39546c..6b0916444c3 100644
--- a/addons/hr_timesheet/i18n/sl.po
+++ b/addons/hr_timesheet/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/sq.po b/addons/hr_timesheet/i18n/sq.po
index 8253f29ec86..0ed204799c2 100644
--- a/addons/hr_timesheet/i18n/sq.po
+++ b/addons/hr_timesheet/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/sr@latin.po b/addons/hr_timesheet/i18n/sr@latin.po
index 20ccd05cdf8..1f56407b061 100644
--- a/addons/hr_timesheet/i18n/sr@latin.po
+++ b/addons/hr_timesheet/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/sv.po b/addons/hr_timesheet/i18n/sv.po
index 2223c1b1cf9..431475f17d8 100644
--- a/addons/hr_timesheet/i18n/sv.po
+++ b/addons/hr_timesheet/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/tlh.po b/addons/hr_timesheet/i18n/tlh.po
index 97a4857b968..6f2bb9d13d2 100644
--- a/addons/hr_timesheet/i18n/tlh.po
+++ b/addons/hr_timesheet/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/tr.po b/addons/hr_timesheet/i18n/tr.po
index a4dba10bf50..152df519e58 100644
--- a/addons/hr_timesheet/i18n/tr.po
+++ b/addons/hr_timesheet/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -26,13 +26,13 @@ msgstr "Çrş"
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "(Keep empty for current_time)"
-msgstr ""
+msgstr "(geçerli_süre için boş Bırak)"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "No employee defined for your user !"
-msgstr ""
+msgstr "Kullanıcınız için tanımlanan personel yok !"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
@@ -56,53 +56,53 @@ msgstr "Bugün"
 #. module: hr_timesheet
 #: field:hr.employee,journal_id:0
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Analiz Günlüğü"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Stop Working"
-msgstr ""
+msgstr "Çalışmayı Durdur"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_employee
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_timesheet_employee
 msgid "Employee Timesheet"
-msgstr ""
+msgstr "Personel Zaman Çizelgesi"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Work done stats"
-msgstr ""
+msgstr "Bite İşler İstat"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_reporting_timesheet
 msgid "Timesheet"
-msgstr ""
+msgstr "Zaman Çizelgesi"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Mon"
-msgstr ""
+msgstr "Pzt"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "Sign in"
-msgstr ""
+msgstr "Giriş"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Fri"
-msgstr ""
+msgstr "Cum"
 
 #. module: hr_timesheet
 #: field:hr.employee,uom_id:0
 msgid "UoM"
-msgstr ""
+msgstr "Ölçü Birimi"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -116,77 +116,77 @@ msgstr ""
 #. module: hr_timesheet
 #: field:hr.sign.out.project,analytic_amount:0
 msgid "Minimum Analytic Amount"
-msgstr ""
+msgstr "Enaz Analiz Tutarı"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 msgid "Monthly Employee Timesheet"
-msgstr ""
+msgstr "Aylık Personel Zaman Çizelgesi"
 
 #. module: hr_timesheet
 #: view:hr.sign.out.project:0
 msgid "Work done in the last period"
-msgstr ""
+msgstr "Son dönemde yapılan işler"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,state:0
 #: field:hr.sign.out.project,state:0
 msgid "Current state"
-msgstr ""
+msgstr "Geçerli durum"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,name:0
 #: field:hr.sign.out.project,name:0
 msgid "Employees name"
-msgstr ""
+msgstr "Personel adı"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,account_id:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Proje / Analiz Hesabı"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytical_timesheet_users
 msgid "Print Employees Timesheet"
-msgstr ""
+msgstr "Personel Zaman Çizelgelerini Yazdır"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:175
 #: code:addons/hr_timesheet/hr_timesheet.py:177
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Uyarı!"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:132
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Kullanıcı Hatası"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:77
 #, python-format
 msgid "No cost unit defined for this employee !"
-msgstr ""
+msgstr "Bu personel için tanımlanan maliyet birimi yok !"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Tue"
-msgstr ""
+msgstr "Sal"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:42
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Uyarı"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Paydaş"
 
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
@@ -199,37 +199,37 @@ msgstr ""
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sat"
-msgstr ""
+msgstr "Cts"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
 #: code:addons/hr_timesheet/report/users_timesheet.py:77
 #, python-format
 msgid "Sun"
-msgstr ""
+msgstr "Paz"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Analiz Hesabı"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.employee:0
 #: view:hr.analytical.timesheet.users:0
 msgid "Print"
-msgstr ""
+msgstr "Yazdır"
 
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 #: model:ir.actions.act_window,name:hr_timesheet.act_hr_timesheet_line_evry1_all_form
 #: model:ir.ui.menu,name:hr_timesheet.menu_hr_working_hours
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Zaman Çizelgesi Satırları"
 
 #. module: hr_timesheet
 #: view:hr.analytical.timesheet.users:0
 msgid "Monthly Employees Timesheet"
-msgstr ""
+msgstr "Aylık Personel Zaman Çizelgesi"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -238,23 +238,23 @@ msgstr ""
 #: selection:hr.analytical.timesheet.users,month:0
 #, python-format
 msgid "July"
-msgstr ""
+msgstr "Temmuz"
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,date:0
 #: field:hr.sign.out.project,date_start:0
 msgid "Starting Date"
-msgstr ""
+msgstr "Başlama Tarihi"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategoriler"
 
 #. module: hr_timesheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
+msgstr "Onaylı/Yapıldı durumundaki zaman çizelgesini değiştiremezsiniz !."
 
 #. module: hr_timesheet
 #: help:hr.employee,product_id:0
@@ -264,7 +264,7 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Total cost"
-msgstr ""
+msgstr "Toplam maliyet"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
@@ -273,44 +273,44 @@ msgstr ""
 #: selection:hr.analytical.timesheet.users,month:0
 #, python-format
 msgid "September"
-msgstr ""
+msgstr "Eylül"
 
 #. module: hr_timesheet
 #: model:ir.model,name:hr_timesheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Zaman Çizelgesi Satırı"
 
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
 msgid "employees"
-msgstr ""
+msgstr "personeller"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Stats by month"
-msgstr ""
+msgstr "Aylı İstat"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 #: field:hr.analytical.timesheet.employee,month:0
 #: field:hr.analytical.timesheet.users,month:0
 msgid "Month"
-msgstr ""
+msgstr "Ay"
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,info:0
 msgid "Work Description"
-msgstr ""
+msgstr "İş Açıklaması"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
 msgid "Invoice Analysis"
-msgstr ""
+msgstr "Fatura İncelemesi"
 
 #. module: hr_timesheet
 #: model:ir.actions.report.xml,name:hr_timesheet.report_user_timesheet
 msgid "Employee timesheet"
-msgstr ""
+msgstr "Personel Zaman Çizelgesi"
 
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_sign_in
@@ -636,3 +636,6 @@ msgstr ""
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
+#~ msgid "Sign In/Out By Project"
+#~ msgstr "Projeye göre Giriş/Çıkış"
diff --git a/addons/hr_timesheet/i18n/uk.po b/addons/hr_timesheet/i18n/uk.po
index 90e3d65b3b3..7202747b472 100644
--- a/addons/hr_timesheet/i18n/uk.po
+++ b/addons/hr_timesheet/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/vi.po b/addons/hr_timesheet/i18n/vi.po
index 933e5b3e34c..301a76df275 100644
--- a/addons/hr_timesheet/i18n/vi.po
+++ b/addons/hr_timesheet/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/i18n/zh_CN.po b/addons/hr_timesheet/i18n/zh_CN.po
index ba38faee42a..3935013cbf5 100644
--- a/addons/hr_timesheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:19+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-10-25 17:20+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
@@ -468,7 +468,7 @@ msgstr "一般信息"
 #. module: hr_timesheet
 #: model:ir.actions.act_window,name:hr_timesheet.action_hr_timesheet_my
 msgid "My Current Timesheet"
-msgstr ""
+msgstr "我当前的时间表"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:40
diff --git a/addons/hr_timesheet/i18n/zh_TW.po b/addons/hr_timesheet/i18n/zh_TW.po
index ae1bda78a9c..2cb483efc8a 100644
--- a/addons/hr_timesheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:48+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:43
diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py
index 7699f94f41b..8d2a7d35678 100644
--- a/addons/hr_timesheet/report/user_timesheet.py
+++ b/addons/hr_timesheet/report/user_timesheet.py
@@ -28,6 +28,7 @@ import time
 import pooler
 from report import report_sxw
 from tools import ustr
+from tools import to_xml
 
 def lengthmonth(year, month):
     if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
@@ -94,7 +95,7 @@ class report_custom(report_rml):
             <date>%s</date>
             <company>%s</company>
             </header>
-            ''' %  (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,user_id).company_id.name)
+            ''' % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),to_xml(pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,user_id).company_id.name))
 
         account_xml = []
         for account, telems in accounts.iteritems():
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index d5f89098a69..069a5a9c170 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -1,8 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_hr_analytic_timesheet,hr.analytic.timesheet,model_hr_analytic_timesheet,base.group_hr_user,1,1,1,1
-access_hr_analytic_timesheet_employee,hr.analytic.timesheet,model_hr_analytic_timesheet,base.group_user,1,1,1,0
+access_hr_analytic_timesheet_employee,hr.analytic.timesheet,model_hr_analytic_timesheet,base.group_user,1,1,1,1
 access_hr_account_analytic_line,account.account.analytic.line,account.model_account_analytic_line,base.group_hr_user,1,1,1,1
-access_hr_account_analytic_line_employee,account.account.analytic.line employee,account.model_account_analytic_line,base.group_user,1,1,1,0
+access_hr_account_analytic_line_employee,account.account.analytic.line employee,account.model_account_analytic_line,base.group_user,1,1,1,1
 access_account_analytic_journal,account.account.analytic.journal,account.model_account_analytic_journal,base.group_hr_user,1,1,1,1
 access_product_product_user,product.product user,product.model_product_product,base.group_hr_user,1,1,1,1
 access_product_template_hr_timesheet,product.template.hr.timesheet,product.model_product_template,base.group_hr_user,1,1,1,1
diff --git a/addons/hr_timesheet/test/test_hr_timesheet.yml b/addons/hr_timesheet/test/test_hr_timesheet.yml
index cc04bed734d..59d688f183b 100644
--- a/addons/hr_timesheet/test/test_hr_timesheet.yml
+++ b/addons/hr_timesheet/test/test_hr_timesheet.yml
@@ -23,7 +23,7 @@
     import time
     uid = ref('base.user_demo')
     new_id = self.create(cr, uid, {'emp_id': ref('hr.employee_qdp'), 'name': 'Quentin Paolino',
-    'server_date': time.strftime('%Y-%m-%d %H:%M:%S'), 'state': 'present'})
+    'server_date': time.strftime('%Y-%m-%d %H:%M:%S')})
     self.sign_in_result(cr, uid, [new_id], context)
 -
   I change my project "Thymbra" and I click on the "Change Work" button of this wizard
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
index 75bb089bbc7..96ce23fb855 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
@@ -27,8 +27,9 @@ class analytical_timesheet_employee(osv.osv_memory):
     _name = 'hr.analytical.timesheet.employee'
     _description = 'Print Employee Timesheet & Print My Timesheet'
     _columns = {
-        'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
-                                  'Month', required=True),
+        'month': fields.selection([(1,'January'), (2,'February'), (3,'March'), (4,'April'),
+            (5,'May'), (6,'June'), (7,'July'), (8,'August'), (9,'September'),
+            (10,'October'), (11,'November'), (12,'December')], 'Month', required=True),
         'year': fields.integer('Year', required=True),
         'employee_id': fields.many2one('hr.employee', 'Employee', required=True)
 
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
index 865ccacb393..2a91bb607a4 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
@@ -27,8 +27,9 @@ class analytical_timesheet_employees(osv.osv_memory):
     _name = 'hr.analytical.timesheet.users'
     _description = 'Print Employees Timesheet'
     _columns = {
-        'month': fields.selection([(x, datetime.date(2000, x, 1).strftime('%B')) for x in range(1, 13)],
-                                  'Month', required=True),
+        'month': fields.selection([(1,'January'), (2,'February'), (3,'March'), (4,'April'),
+            (5,'May'), (6,'June'), (7,'July'), (8,'August'), (9,'September'),
+            (10,'October'), (11,'November'), (12,'December')], 'Month', required=True),
         'year': fields.integer('Year', required=True),
         'employee_ids': fields.many2many('hr.employee', 'timesheet_employee_rel', 'timesheet_id', 'employee_id', 'employees', required=True)
                 }
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 34cfee40262..3991696b331 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -33,7 +33,7 @@ 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.related('emp_id', 'state', string='Current state', type='char', required=True, readonly=True),
+        'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True),
         'server_date': fields.datetime('Current Date', required=True, readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Employee ID')
                 }
@@ -91,7 +91,7 @@ class hr_so_project(osv.osv_memory):
         emp_obj = self.pool.get('hr.employee')
         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], {'action':'sign_out', 'action_date':data.date})
             self._write(cr, uid, data, emp_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
@@ -99,7 +99,7 @@ class hr_so_project(osv.osv_memory):
         emp_obj = self.pool.get('hr.employee')
         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)
+            emp_obj.attendance_action_change(cr, uid, [emp_id], {'action':'action', 'action_date':data.date})
             self._write(cr, uid, data, emp_id, context=context)
         return {'type': 'ir.actions.act_window_close'}
 
@@ -111,7 +111,7 @@ class hr_si_project(osv.osv_memory):
     _description = 'Sign In By Project'
     _columns = {
         'name': fields.char('Employees name', size=32,  readonly=True),
-        'state': fields.related('emp_id', 'state', string='Current state', type='char', required=True, readonly=True),
+        'state': fields.related('emp_id', 'state', string='Current Status', type='char', required=True, readonly=True),
         'date': fields.datetime('Starting Date'),
         'server_date': fields.datetime('Current Date',  readonly=True),
         'emp_id': fields.many2one('hr.employee', 'Employee ID')
@@ -147,7 +147,7 @@ class hr_si_project(osv.osv_memory):
             'view_type': 'form',
             'view_mode': 'tree,form',
             'res_model': 'hr.sign.%s.project' % in_out,
-            'views': [(False,'tree'), (resource_id,'form')],
+            'views': [(resource_id,'form')],
             'type': 'ir.actions.act_window',
             'target': 'new'
         }
@@ -156,7 +156,7 @@ class hr_si_project(osv.osv_memory):
         emp_obj = self.pool.get('hr.employee')
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
-            emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data.date or False)
+            emp_obj.attendance_action_change(cr, uid, [emp_id], {'action':'sign_in', 'action_date':data.date})
         return {'type': 'ir.actions.act_window_close'}
 
     def default_get(self, cr, uid, fields_list, context=None):
diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index e233158bda3..d15dd3b0e3b 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -48,14 +48,12 @@ reports.""",
         'wizard/hr_timesheet_invoice_create_view.xml',
         'wizard/hr_timesheet_invoice_create_final_view.xml',
     ],
-    'demo': [
-        'hr_timesheet_invoice_demo.xml',
-    ],
+    'demo': ['hr_timesheet_invoice_demo.xml'],
     'test': ['test/test_hr_timesheet_invoice.yml',
+             'test/test_hr_timesheet_invoice_no_prod_tax.yml',
              'test/hr_timesheet_invoice_report.yml',
-             ],
+    ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0056091842381',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 4cba4a18680..a24208d6ce0 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -26,8 +26,9 @@ from tools.translate import _
 class hr_timesheet_invoice_factor(osv.osv):
     _name = "hr_timesheet_invoice.factor"
     _description = "Invoice Rate"
+    _order = 'factor'
     _columns = {
-        'name': fields.char('Internal name', size=128, required=True, translate=True),
+        'name': fields.char('Internal Name', size=128, required=True, translate=True),
         'customer_name': fields.char('Name', size=128, help="Label for the customer"),
         'factor': fields.float('Discount (%)', required=True, help="Discount in percentage"),
     }
@@ -70,8 +71,7 @@ class account_analytic_account(osv.osv):
         'amount_invoiced': fields.function(_invoiced_calc, string='Invoiced Amount',
             help="Total invoiced"),
         'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Timesheet Invoicing Ratio',
-            help="This field allows you to define the rate in case you plan to reinvoice " \
-            "the costs in this analytic account: timesheets, expenses, ..."),
+            help="You usually invoice 100% of the timesheets. But if you mix fixed price and timesheet invoicing, you may use another ratio. For instance, if you do a 20% advance invoice (fixed price, based on a sale order), you should invoice the rest on timesheet with a 80% ratio."),
     }
     _defaults = {
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
@@ -84,8 +84,8 @@ class account_analytic_account(osv.osv):
             res['value']['to_invoice'] = ir_model_obj.get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')[1]
         return res
 
-    def on_change_partner_id(self, cr, uid, ids,partner_id, name, context=None):
-        res = super(account_analytic_account,self).on_change_partner_id(cr, uid, ids,partner_id, name, context=context)
+    def on_change_partner_id(self, cr, uid, ids, partner_id, name, context=None):
+        res = super(account_analytic_account, self).on_change_partner_id(cr, uid, ids, partner_id, name, context=context)
         part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
         pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
         if pricelist:
@@ -93,27 +93,27 @@ class account_analytic_account(osv.osv):
         return res
 
     def set_close(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state':'close'}, context=context)
+        self.write(cr, uid, ids, {'state': 'close'}, context=context)
         message = _("Contract has been <b>closed</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, subtype="hr_timesheet_invoice.mt_account_closed", context=context)
         return True
 
     def set_cancel(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
-        message = _("Contract has been <b>cancelled</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.write(cr, uid, ids, {'state': 'cancelled'}, context=context)
+        message = _("Contract has been <b>canceled</b>.")
+        self.message_post(cr, uid, ids, body=message, subtype="hr_timesheet_invoice.mt_account_canceled", context=context)
         return True
 
     def set_open(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state':'open'}, context=context)
+        self.write(cr, uid, ids, {'state': 'open'}, context=context)
         message = _("Contract has been <b>opened</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def set_pending(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state':'pending'}, context=context)
+        self.write(cr, uid, ids, {'state': 'pending'}, context=context)
         message = _("Contract has been set as <b>pending</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
 account_analytic_account()
@@ -123,21 +123,24 @@ class account_analytic_line(osv.osv):
     _inherit = 'account.analytic.line'
     _columns = {
         'invoice_id': fields.many2one('account.invoice', 'Invoice', ondelete="set null"),
-        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="It allows to set the discount while making invoice"),
+        'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Invoiceable', help="It allows to set the discount while making invoice, keep empty if the activities should not be invoiced."),
     }
 
     def _default_journal(self, cr, uid, context=None):
         proxy = self.pool.get('hr.employee')
         record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
-        employee = proxy.browse(cr, uid, record_ids[0], context=context)
-        return employee.journal_id and employee.journal_id.id or False
+        if record_ids:
+            employee = proxy.browse(cr, uid, record_ids[0], context=context)
+            return employee.journal_id and employee.journal_id.id or False
+        return False
 
     def _default_general_account(self, cr, uid, context=None):
         proxy = self.pool.get('hr.employee')
         record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
-        employee = proxy.browse(cr, uid, record_ids[0], context=context)
-        if employee.product_id and employee.product_id.property_account_income:
-            return employee.product_id.property_account_income.id
+        if record_ids:
+            employee = proxy.browse(cr, uid, record_ids[0], context=context)
+            if employee.product_id and employee.product_id.property_account_income:
+                return employee.product_id.property_account_income.id
         return False
 
     _defaults = {
@@ -174,7 +177,7 @@ account_analytic_line()
 
 class hr_analytic_timesheet(osv.osv):
     _inherit = "hr.analytic.timesheet"
-    def on_change_account_id(self, cr, uid, ids, account_id):
+    def on_change_account_id(self, cr, uid, ids, account_id, user_id=False):
         res = {}
         if not account_id:
             return res
@@ -199,6 +202,7 @@ class hr_analytic_timesheet(osv.osv):
 
 hr_analytic_timesheet()
 
+
 class account_invoice(osv.osv):
     _inherit = "account.invoice"
 
@@ -218,6 +222,7 @@ class account_invoice(osv.osv):
 
 account_invoice()
 
+
 class account_move_line(osv.osv):
     _inherit = "account.move.line"
 
@@ -234,4 +239,3 @@ class account_move_line(osv.osv):
 account_move_line()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
index 462888e0b39..e82b6fd19e8 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
@@ -16,5 +16,21 @@
             <field name="customer_name">50%</field>
             <field name="factor">50.0</field>
         </record>
+        <record id="timesheet_invoice_factor4" model="hr_timesheet_invoice.factor">
+            <field name="name">80%</field>
+            <field name="customer_name">80%</field>
+            <field name="factor">20.0</field>
+        </record>
+
+        <!-- mail: subtypes -->
+        <record id="mt_account_closed" model="mail.message.subtype">
+            <field name="name">finished</field>
+            <field name="res_model">account.analytic.account</field>
+        </record>
+        <record id="mt_account_canceled" model="mail.message.subtype">
+            <field name="name">canceled</field>
+            <field name="res_model">account.analytic.account</field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
index cc531fc8f10..0ebe16ad49f 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
@@ -7,7 +7,7 @@
             <field name="factor">50.0</field>
         </record>
         <record id="timesheet_invoice_factor3" model="hr_timesheet_invoice.factor">
-            <field name="name">Gratis</field>
+            <field name="name">Free of charge</field>
             <field name="customer_name">Offered developments</field>
             <field name="factor">100.0</field>
         </record>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index b752ade8da0..b3ec10e59c2 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -9,8 +9,8 @@
             <field name="arch" type="xml">
                 <xpath expr='//separator[@name="description"]' position='before'>
                     <group string="Invoice on Timesheets Options" name="invoice_on_timesheets" col="4">
-                        <field name="pricelist_id" />
-                        <field name="to_invoice" widget="selection"/>
+                        <field name="pricelist_id" groups="product.group_sale_pricelist"/>
+                        <field name="to_invoice"/>
                     </group>
                  </xpath>
                 <xpath expr="//field[@name='use_timesheets']" position="replace">
@@ -19,10 +19,10 @@
                 <xpath expr="/form/sheet" position='before'>
                     <header>
                         <button name="set_pending" string="Pending" type="object" states="open" />
-                        <button name="set_close" string="Close" type="object" states="open,pending" />
+                        <button name="set_close" string="Contract Finished" type="object" states="open,pending" />
                         <button name="set_open" string="Re-open project" type="object" states="pending,close" />
                         <button name="set_open" string="Re-open project" type="object" states="cancelled,draft"/>
-                        <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
+                        <button name="set_cancel" string="Cancel Contract" type="object" states="open,pending"/>
                         <field name="state" readonly="1" widget="statusbar"
                             statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
                     </header>
@@ -50,7 +50,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
             <field name="arch" type="xml">
                 <field name="account_id" position="replace">
-                    <field domain="[('type','in',['normal','contract']),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" context="{'default_use_timesheets': 1}"/>
+                    <field domain="[('type','in',['normal','contract']),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id, user_id)" context="{'default_use_timesheets': 1}"/>
                 </field>
             </field>
         </record>
@@ -72,7 +72,7 @@
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_tree"/>
             <field name="arch" type="xml">
                 <field name="account_id" position="replace">
-                    <field domain="[('type','in',['normal','contract']),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" context="{'default_use_timesheets': 1}"/>
+                    <field domain="[('type','in',['normal','contract']),('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id, user_id)" context="{'default_use_timesheets': 1}"/>
                 </field>
             </field>
         </record>
@@ -91,6 +91,20 @@
             </field>
         </record>
 
+        <record id="view_hr_timesheet_line_search_to_invoice" model="ir.ui.view">
+            <field name="name">hr.analytic.timesheet.search.to_invoice</field>
+            <field name="model">hr.analytic.timesheet</field>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='account_id']" position="after">
+                    <separator/>
+                    <filter name="to_invoice" string="To Invoice" context="{'to_invoice': 1}" domain="[('invoice_id','=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/>
+                    <filter name="invoiced" string="Invoiced" domain="[('invoice_id','!=',False), ('to_invoice','&lt;&gt;',False)]" icon="terp-dolar"/> 
+                </xpath>
+            </field>
+        </record>
+
+
         <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>
diff --git a/addons/hr_timesheet_invoice/i18n/ar.po b/addons/hr_timesheet_invoice/i18n/ar.po
index 48d137a2fe7..691b628db35 100644
--- a/addons/hr_timesheet_invoice/i18n/ar.po
+++ b/addons/hr_timesheet_invoice/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/bg.po b/addons/hr_timesheet_invoice/i18n/bg.po
index 42839430555..c4e49b7dff0 100644
--- a/addons/hr_timesheet_invoice/i18n/bg.po
+++ b/addons/hr_timesheet_invoice/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/bs.po b/addons/hr_timesheet_invoice/i18n/bs.po
index 834d99c929e..8999da61b1a 100644
--- a/addons/hr_timesheet_invoice/i18n/bs.po
+++ b/addons/hr_timesheet_invoice/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/ca.po b/addons/hr_timesheet_invoice/i18n/ca.po
index 907ab15dadf..38507480da6 100644
--- a/addons/hr_timesheet_invoice/i18n/ca.po
+++ b/addons/hr_timesheet_invoice/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/cs.po b/addons/hr_timesheet_invoice/i18n/cs.po
index 10a65d7c233..6d1c3bc3102 100644
--- a/addons/hr_timesheet_invoice/i18n/cs.po
+++ b/addons/hr_timesheet_invoice/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/da.po b/addons/hr_timesheet_invoice/i18n/da.po
index 1a540f768c7..4c6f555383c 100644
--- a/addons/hr_timesheet_invoice/i18n/da.po
+++ b/addons/hr_timesheet_invoice/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/de.po b/addons/hr_timesheet_invoice/i18n/de.po
index babcd57b88d..70696598d6b 100644
--- a/addons/hr_timesheet_invoice/i18n/de.po
+++ b/addons/hr_timesheet_invoice/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:04+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-10-12 23:22+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -769,7 +769,7 @@ msgstr "Menge"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr "Datum/Kurzbez."
+msgstr "Dat/Kurzb."
 
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,general_account_id:0
diff --git a/addons/hr_timesheet_invoice/i18n/el.po b/addons/hr_timesheet_invoice/i18n/el.po
index 0d9aacff4d7..6e60da49aea 100644
--- a/addons/hr_timesheet_invoice/i18n/el.po
+++ b/addons/hr_timesheet_invoice/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_timesheet_invoice/i18n/es.po b/addons/hr_timesheet_invoice/i18n/es.po
index f993c4d2375..3c2f29b7081 100644
--- a/addons/hr_timesheet_invoice/i18n/es.po
+++ b/addons/hr_timesheet_invoice/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/es_AR.po b/addons/hr_timesheet_invoice/i18n/es_AR.po
index e870b303cd3..242bd59fbd1 100644
--- a/addons/hr_timesheet_invoice/i18n/es_AR.po
+++ b/addons/hr_timesheet_invoice/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/es_CR.po b/addons/hr_timesheet_invoice/i18n/es_CR.po
index 962fdb2a693..0a505f0f052 100644
--- a/addons/hr_timesheet_invoice/i18n/es_CR.po
+++ b/addons/hr_timesheet_invoice/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/hr_timesheet_invoice/i18n/es_EC.po b/addons/hr_timesheet_invoice/i18n/es_EC.po
index 1e2f74adc7f..b6cea817e80 100644
--- a/addons/hr_timesheet_invoice/i18n/es_EC.po
+++ b/addons/hr_timesheet_invoice/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/et.po b/addons/hr_timesheet_invoice/i18n/et.po
index e8421f9cbb1..3479fa8f963 100644
--- a/addons/hr_timesheet_invoice/i18n/et.po
+++ b/addons/hr_timesheet_invoice/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/fi.po b/addons/hr_timesheet_invoice/i18n/fi.po
index 701f0f57dfb..98deafbde61 100644
--- a/addons/hr_timesheet_invoice/i18n/fi.po
+++ b/addons/hr_timesheet_invoice/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/fr.po b/addons/hr_timesheet_invoice/i18n/fr.po
index 99f2815d9aa..6175aa03500 100644
--- a/addons/hr_timesheet_invoice/i18n/fr.po
+++ b/addons/hr_timesheet_invoice/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/hr.po b/addons/hr_timesheet_invoice/i18n/hr.po
index a948bb21f52..dd3bb94114d 100644
--- a/addons/hr_timesheet_invoice/i18n/hr.po
+++ b/addons/hr_timesheet_invoice/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/hu.po b/addons/hr_timesheet_invoice/i18n/hu.po
index c6ce74ffc04..173ff04104f 100644
--- a/addons/hr_timesheet_invoice/i18n/hu.po
+++ b/addons/hr_timesheet_invoice/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/id.po b/addons/hr_timesheet_invoice/i18n/id.po
index 06eb2bf781f..9b193ec0eed 100644
--- a/addons/hr_timesheet_invoice/i18n/id.po
+++ b/addons/hr_timesheet_invoice/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/it.po b/addons/hr_timesheet_invoice/i18n/it.po
index c0afafa49ea..6a88ab45e85 100644
--- a/addons/hr_timesheet_invoice/i18n/it.po
+++ b/addons/hr_timesheet_invoice/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/ja.po b/addons/hr_timesheet_invoice/i18n/ja.po
index d8314e0ff6f..aa35057cde5 100644
--- a/addons/hr_timesheet_invoice/i18n/ja.po
+++ b/addons/hr_timesheet_invoice/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/ko.po b/addons/hr_timesheet_invoice/i18n/ko.po
index d48ca901d4c..f0f4a4f153f 100644
--- a/addons/hr_timesheet_invoice/i18n/ko.po
+++ b/addons/hr_timesheet_invoice/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/lt.po b/addons/hr_timesheet_invoice/i18n/lt.po
index 5915530c598..08947ea00da 100644
--- a/addons/hr_timesheet_invoice/i18n/lt.po
+++ b/addons/hr_timesheet_invoice/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/lv.po b/addons/hr_timesheet_invoice/i18n/lv.po
index 12a1aef2ff7..3bcb7496f94 100644
--- a/addons/hr_timesheet_invoice/i18n/lv.po
+++ b/addons/hr_timesheet_invoice/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/mn.po b/addons/hr_timesheet_invoice/i18n/mn.po
index 2a3ea56fef2..fdefe2a77d2 100644
--- a/addons/hr_timesheet_invoice/i18n/mn.po
+++ b/addons/hr_timesheet_invoice/i18n/mn.po
@@ -23,8 +23,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/nl.po b/addons/hr_timesheet_invoice/i18n/nl.po
index 6502a31bcfd..07a900dcfb8 100644
--- a/addons/hr_timesheet_invoice/i18n/nl.po
+++ b/addons/hr_timesheet_invoice/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -417,7 +417,7 @@ msgstr "Werk doorberekenen"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
 #: model:ir.ui.menu,name:hr_timesheet_invoice.hr_timesheet_invoice_factor_view
 msgid "Types of Invoicing"
-msgstr "Declaratiesoorten"
+msgstr "Factureertarief"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -562,7 +562,7 @@ msgstr ""
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:132
 #, python-format
 msgid "No income account defined for product '%s'"
-msgstr "Geen opbrengsten verkoop rekening gedefinieerd voor product '%s'"
+msgstr "Geen omzetrekening gedefinieerd voor product '%s'"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -859,7 +859,7 @@ msgid ""
 "a customer. From this menu, you can create additional types of invoicing to "
 "speed up your invoicing."
 msgstr ""
-"Hier kunt u standaard declaratiesoorten maken. U moet wellicht regelmatig "
+"Hier kunt u standaard factureertarieven maken. U moet wellicht regelmatig "
 "kortingen toekennen vanwege specifieke contracten of overeenkomsten met "
 "klanten. Vanuit dit menu kunt u aanvullende declaratiesoorten maken om de "
 "facturatie te versnellen."
@@ -1089,7 +1089,7 @@ msgstr "Factuur is reeds gekoppeld aan enkele kostenplaatsenregel(s)!"
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
 msgid "Types of invoicing"
-msgstr "Declaratiesoorten"
+msgstr "Factureertarieven"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.act_res_users_2_report_timehsheet_account
diff --git a/addons/hr_timesheet_invoice/i18n/nl_BE.po b/addons/hr_timesheet_invoice/i18n/nl_BE.po
index 2a8697221c4..b8db133ef7d 100644
--- a/addons/hr_timesheet_invoice/i18n/nl_BE.po
+++ b/addons/hr_timesheet_invoice/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/pl.po b/addons/hr_timesheet_invoice/i18n/pl.po
index 27a2e359782..aa896867778 100644
--- a/addons/hr_timesheet_invoice/i18n/pl.po
+++ b/addons/hr_timesheet_invoice/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -60,12 +60,12 @@ msgstr "Przychód"
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account.date:0
 msgid "Daily Timesheets for this year"
-msgstr ""
+msgstr "Dzienne karty czasu pracy na ten rok"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Ponownie otwórz projekt"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_user
@@ -139,7 +139,7 @@ msgstr "JM"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.invoice.create,time:0
@@ -155,12 +155,12 @@ msgstr "Kwota zafakturowana"
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Uninvoiced line with billing rate"
-msgstr ""
+msgstr "Pozycje niezafakturowane ze stawką"
 
 #. module: hr_timesheet_invoice
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Numer faktury musi być unikalny w firmie!"
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,account_id:0
@@ -175,7 +175,7 @@ msgstr "Kwota"
 #. module: hr_timesheet_invoice
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Niepoprawna wartość Winien lub Ma w zapisie !"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,name:0
@@ -186,12 +186,12 @@ msgstr "Szczegóły każdej wykonanej pracy będą widoczne w fakturze"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:209
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Ostrzeżenie !"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_hr_timesheet_invoice_create
 msgid "Create invoice from timesheet"
-msgstr ""
+msgstr "Utwórz fakturę z karty czasu pracy"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -206,17 +206,17 @@ msgstr "Konto analityczne do zamknięcia"
 #. module: hr_timesheet_invoice
 #: view:board.board:0
 msgid "Uninvoice Lines With Billing Rate"
-msgstr ""
+msgstr "Niezafakturowane pozycje ze stawkami"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupuj wg..."
 
 #. module: hr_timesheet_invoice
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Niedozwolona komunikacja strukturalna BBA !"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -256,7 +256,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Błąd! Nie możesz tworzyć rekurencyjnych kont analitycznych."
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,time:0
@@ -394,7 +394,7 @@ msgstr "Wyświetl szczegóły pracy w pozycjach faktury."
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "July"
-msgstr ""
+msgstr "Lipiec"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -405,7 +405,7 @@ msgstr "Data druku"
 #: 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 "Bill Tasks Works"
-msgstr ""
+msgstr "Fakturuj przebieg zadania"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_factor_form
@@ -422,7 +422,7 @@ msgstr "Teoretyczny"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:132
 #, python-format
 msgid "Configuration Error"
-msgstr ""
+msgstr "Błąd konfiguracji"
 
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
@@ -458,7 +458,7 @@ msgstr "Upust (%)"
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor1
 msgid "Yes (100%)"
-msgstr ""
+msgstr "Tak (100%)"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_final_invoice_create.py:55
@@ -474,7 +474,7 @@ msgstr "Faktury"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "December"
-msgstr ""
+msgstr "Grudzień"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create.final:0
@@ -488,6 +488,8 @@ msgid ""
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Wybrane konto wymaga podania drugiej waluty. Powinieneś usunąć drugą walutę "
+"z konta lub wybrać wielowalutowy widok w dzienniku."
 
 #. module: hr_timesheet_invoice
 #: field:report.account.analytic.line.to.invoice,month:0
@@ -507,7 +509,7 @@ msgstr "Waluta"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Pozycje zapisów"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,product:0
@@ -521,7 +523,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.profit:0
 msgid "Users"
-msgstr ""
+msgstr "Użytkownicy"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -532,7 +534,7 @@ msgstr ""
 #: view:account.analytic.line:0
 #: field:report.timesheet.line,invoice_id:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Zafakturowano"
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,quantity_max:0
@@ -545,12 +547,14 @@ msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"Data jest poza okresem! Musisz zmienić datę lub zdjąć ograniczenie w "
+"dzienniku."
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:132
 #, python-format
 msgid "No income account defined for product '%s'"
-msgstr ""
+msgstr "Nie zdefiniowano konta dochodów dla produktu '%s'"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -565,7 +569,7 @@ msgstr "Karta czasu pracy wg konta"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr ""
+msgstr "Oczekiwanie"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_invoiced:0
@@ -580,7 +584,7 @@ msgstr "Okres do"
 #. module: hr_timesheet_invoice
 #: model:ir.model,name:hr_timesheet_invoice.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Pozycja analityczna"
 
 #. module: hr_timesheet_invoice
 #: selection:report.account.analytic.line.to.invoice,month:0
@@ -589,7 +593,7 @@ msgstr ""
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "August"
-msgstr ""
+msgstr "Sierpień"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -605,7 +609,7 @@ msgstr "Rejestr kosztów"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "October"
-msgstr ""
+msgstr "Październik"
 
 #. module: hr_timesheet_invoice
 #: model:hr_timesheet_invoice.factor,name:hr_timesheet_invoice.timesheet_invoice_factor2
@@ -619,7 +623,7 @@ msgstr ""
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "June"
-msgstr ""
+msgstr "Czerwiec"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,date:0
@@ -657,12 +661,12 @@ msgstr "Wypełnij pole adresu dla partnera: %s."
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozszerzone filtry..."
 
 #. module: hr_timesheet_invoice
 #: field:report_timesheet.invoice,amount_invoice:0
@@ -688,7 +692,7 @@ msgstr "Użytkownik"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "Nazwa zapisu"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -702,12 +706,12 @@ msgstr "Suma:"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "January"
-msgstr ""
+msgstr "Styczeń"
 
 #. module: hr_timesheet_invoice
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Nie możesz księgować na zamkniętych kontach"
 
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
@@ -739,7 +743,7 @@ msgstr "Saldo"
 #. module: hr_timesheet_invoice
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Nie można tworzyć zapisów dla kont typu widok."
 
 #. module: hr_timesheet_invoice
 #: field:report.analytic.account.close,quantity:0
@@ -755,7 +759,7 @@ msgstr "Ilość"
 #. module: hr_timesheet_invoice
 #: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Data/Kod"
 
 #. module: hr_timesheet_invoice
 #: field:report.timesheet.line,general_account_id:0
@@ -794,12 +798,12 @@ msgstr "Maks. cena faktury"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "September"
-msgstr ""
+msgstr "Wrzesień"
 
 #. module: hr_timesheet_invoice
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Nie możesz tworzyć pozycji analitycznych na koncie widokowym."
 
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,invoice_id:0
@@ -812,6 +816,7 @@ msgstr "Faktura"
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Nie możesz zmieniać zapisów w potwierdzonej/wykonanej karcie czasu pracy"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
@@ -825,7 +830,7 @@ msgstr "Anuluj"
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
 msgid "Close"
-msgstr ""
+msgstr "Zamknięte"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create.final,price:0
@@ -847,7 +852,7 @@ msgstr ""
 #: model:ir.model,name:hr_timesheet_invoice.model_report_timesheet_line
 #: view:report.timesheet.line:0
 msgid "Timesheet Line"
-msgstr ""
+msgstr "Pozycja karty czasu pracy"
 
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
@@ -866,7 +871,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "Firma musi być ta sama dla związanego konta i okresu."
 
 #. module: hr_timesheet_invoice
 #: help:hr_timesheet_invoice.factor,customer_name:0
@@ -884,7 +889,7 @@ msgstr "Do"
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_timesheet_invoice_create_final
 msgid "Create Invoice"
-msgstr ""
+msgstr "Utwórz fakturę"
 
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:108
@@ -900,7 +905,7 @@ msgstr "Rzeczywista data każdej pracy będzie widoczna w fakturze"
 #. module: hr_timesheet_invoice
 #: field:account.analytic.account,pricelist_id:0
 msgid "Customer Pricelist"
-msgstr ""
+msgstr "Cennik klienta"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.invoice:0
@@ -943,7 +948,7 @@ msgstr "Nazwa wewnętrzna"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: hr_timesheet_invoice
 #: field:hr.timesheet.analytic.profit,journal_ids:0
@@ -995,7 +1000,7 @@ msgstr "W tym miesiącu"
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.analytic.cost.ledger:0
 msgid "Select Period"
-msgstr ""
+msgstr "Wybierz okres"
 
 #. module: hr_timesheet_invoice
 #: report:account.analytic.profit:0
@@ -1009,12 +1014,12 @@ msgstr "Okres od daty rozpoczęcia"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "February"
-msgstr ""
+msgstr "Luty"
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,customer_name:0
 msgid "Name"
-msgstr ""
+msgstr "Nazwa"
 
 #. module: hr_timesheet_invoice
 #: view:report_timesheet.account.date:0
@@ -1038,7 +1043,7 @@ msgstr "Karty czasu pracy na dni"
 #: selection:report_timesheet.account.date,month:0
 #: selection:report_timesheet.user,month:0
 msgid "April"
-msgstr ""
+msgstr "Kwiecień"
 
 #. module: hr_timesheet_invoice
 #: view:account.analytic.account:0
@@ -1085,7 +1090,7 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: field:account.analytic.line,to_invoice:0
 msgid "Type of Invoicing"
-msgstr ""
+msgstr "Typ fakturowania"
 
 #. module: hr_timesheet_invoice
 #: view:report.account.analytic.line.to.invoice:0
@@ -1125,7 +1130,7 @@ msgstr "Koszt"
 #: field:report_timesheet.account.date,name:0
 #: field:report_timesheet.user,name:0
 msgid "Year"
-msgstr ""
+msgstr "Rok"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
@@ -1246,3 +1251,6 @@ msgstr ""
 
 #~ msgid "Invoice rate"
 #~ msgstr "Współczynnik fakturowania"
+
+#~ msgid "Accounts to invoice"
+#~ msgstr "Konta do faktur"
diff --git a/addons/hr_timesheet_invoice/i18n/pt.po b/addons/hr_timesheet_invoice/i18n/pt.po
index d76e4ef34ed..e7a12894b4b 100644
--- a/addons/hr_timesheet_invoice/i18n/pt.po
+++ b/addons/hr_timesheet_invoice/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/pt_BR.po b/addons/hr_timesheet_invoice/i18n/pt_BR.po
index 77ad7210cea..2547abd8381 100644
--- a/addons/hr_timesheet_invoice/i18n/pt_BR.po
+++ b/addons/hr_timesheet_invoice/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/ro.po b/addons/hr_timesheet_invoice/i18n/ro.po
index fe17462c4c1..14d2d0d2910 100644
--- a/addons/hr_timesheet_invoice/i18n/ro.po
+++ b/addons/hr_timesheet_invoice/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/ru.po b/addons/hr_timesheet_invoice/i18n/ru.po
index bd3afdb5b2b..b4c01bca352 100644
--- a/addons/hr_timesheet_invoice/i18n/ru.po
+++ b/addons/hr_timesheet_invoice/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/sl.po b/addons/hr_timesheet_invoice/i18n/sl.po
index 15c2bd03851..ef2c629dc55 100644
--- a/addons/hr_timesheet_invoice/i18n/sl.po
+++ b/addons/hr_timesheet_invoice/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/sq.po b/addons/hr_timesheet_invoice/i18n/sq.po
index bc153a70ae5..6e6b2bad179 100644
--- a/addons/hr_timesheet_invoice/i18n/sq.po
+++ b/addons/hr_timesheet_invoice/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/sr@latin.po b/addons/hr_timesheet_invoice/i18n/sr@latin.po
index a63f160c05c..7055cc58422 100644
--- a/addons/hr_timesheet_invoice/i18n/sr@latin.po
+++ b/addons/hr_timesheet_invoice/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/sv.po b/addons/hr_timesheet_invoice/i18n/sv.po
index 8e827d5e54f..2b954b0123b 100644
--- a/addons/hr_timesheet_invoice/i18n/sv.po
+++ b/addons/hr_timesheet_invoice/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/tlh.po b/addons/hr_timesheet_invoice/i18n/tlh.po
index aab1178a358..8b7a9b8df54 100644
--- a/addons/hr_timesheet_invoice/i18n/tlh.po
+++ b/addons/hr_timesheet_invoice/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/tr.po b/addons/hr_timesheet_invoice/i18n/tr.po
index a719365548f..ff521990cc0 100644
--- a/addons/hr_timesheet_invoice/i18n/tr.po
+++ b/addons/hr_timesheet_invoice/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/uk.po b/addons/hr_timesheet_invoice/i18n/uk.po
index f24fbf65bf2..deec17ef678 100644
--- a/addons/hr_timesheet_invoice/i18n/uk.po
+++ b/addons/hr_timesheet_invoice/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/vi.po b/addons/hr_timesheet_invoice/i18n/vi.po
index 4f3da02e6f0..961315dfcee 100644
--- a/addons/hr_timesheet_invoice/i18n/vi.po
+++ b/addons/hr_timesheet_invoice/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/zh_CN.po b/addons/hr_timesheet_invoice/i18n/zh_CN.po
index e20484e6961..e8cdbbc0d27 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_CN.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/i18n/zh_TW.po b/addons/hr_timesheet_invoice/i18n/zh_TW.po
index 87479881108..cf72545995a 100644
--- a/addons/hr_timesheet_invoice/i18n/zh_TW.po
+++ b/addons/hr_timesheet_invoice/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_invoice
 #: view:report.timesheet.line:0
diff --git a/addons/hr_timesheet_invoice/report/account_analytic_profit.py b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
index 8b6cd7f9fbd..fc44089bf9e 100644
--- a/addons/hr_timesheet_invoice/report/account_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/report/account_analytic_profit.py
@@ -120,4 +120,4 @@ class account_analytic_profit(report_sxw.rml_parse):
 
 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:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
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 6b6dd9f6e52..7af9603ebd8 100644
--- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
+++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report.py
@@ -31,7 +31,7 @@ class report_timesheet_line(osv.osv):
         'user_id': fields.many2one('res.users', 'User', readonly=True),
         'date': fields.date('Date', readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
+        'quantity': fields.float('Time', readonly=True),
         'cost': fields.float('Cost', readonly=True),
         'product_id': fields.many2one('product.product', 'Product',readonly=True),
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
@@ -83,7 +83,7 @@ class report_timesheet_user(osv.osv):
     _columns = {
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
+        'quantity': fields.float('Time', readonly=True),
         'cost': fields.float('Cost', readonly=True),
         '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),
@@ -117,7 +117,7 @@ class report_timesheet_account(osv.osv):
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
+        'quantity': fields.float('Time', readonly=True),
         '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),
 
@@ -151,7 +151,7 @@ class report_timesheet_account_date(osv.osv):
         'name': fields.char('Year',size=64,required=False, readonly=True),
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'account_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
+        'quantity': fields.float('Time', readonly=True),
         '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),
     }
@@ -185,7 +185,7 @@ class report_timesheet_invoice(osv.osv):
         'user_id':fields.many2one('res.users', 'User', readonly=True),
         'account_id':fields.many2one('account.analytic.account', 'Project', readonly=True),
         'manager_id':fields.many2one('res.users', 'Manager', readonly=True),
-        'quantity': fields.float('Quantity', readonly=True),
+        'quantity': fields.float('Time', readonly=True),
         'amount_invoice': fields.float('To invoice', readonly=True)
     }
     _rec_name = 'user_id'
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 2d4b0debde8..6d6fe2f3776 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
@@ -347,18 +347,11 @@
         src_model="res.users"/>
 
         <act_window
-            context="{'search_default_account_id': [active_id],'default_account_id': [active_id]}"
-            id="act_account_analytic_account_2_report_timehsheet_account"
-            name="Timesheets"
-            res_model="hr.analytic.timesheet"
-            src_model="account.analytic.account"/>
-
-        <act_window
-        context="{'search_default_manager_id': [active_id]}"
-        id="act_res_users_2_report_timesheet_invoice"
-        name="Costs to invoice"
-        res_model="report_timesheet.invoice"
-        src_model="res.users"/>
+            context="{'search_default_manager_id': [active_id]}"
+            id="act_res_users_2_report_timesheet_invoice"
+            name="Costs to invoice"
+            res_model="report_timesheet.invoice"
+            src_model="res.users"/>
 
 
     </data>
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index 9e0b8dd59ee..a2566688799 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -122,13 +122,13 @@
             <field name="search_view_id" ref="account_analytic_line_to_invoice_view_filter"/>
         </record>
 
-        <act_window
-        domain="[('invoice_id','=',False),('to_invoice','&lt;&gt;',False), ('journal_id.type', '=', 'general')]"
-        context="{'search_default_account_id': [active_id], 'default_account_id': active_id,'search_default_to_invoice': 1}"
-        id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice"
-        name="Timesheet Lines to Invoice"
-        res_model="account.analytic.line"
-        src_model="account.analytic.account"/>
+        <record id="act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice" model="ir.actions.act_window">
+            <field name="domain">[]</field>
+            <field name="context">{'search_default_account_id': [active_id], 'default_account_id': active_id,'search_default_to_invoice': 1}</field>
+            <field name="name">To Invoice</field>
+            <field name="res_model">account.analytic.line</field>
+            <field name="src_model">account.analytic.account</field>
+        </record>
 
     </data>
 </openerp>
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 91520da56a2..de19ea8fb3a 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -30,6 +30,42 @@
 -
   !python {model: hr.analytic.timesheet}: |
     self.on_change_account_id(cr, uid, [ref('account_analytic_line_developyamlforhrmodule0')], ref('account.analytic_agrolait'))
+
+-
+  I create a Tax Codes
+-
+  !record {model: account.tax.code, id: tax_case}:
+    name: Tax_case
+    company_id: base.main_company
+    sign: 1
+-
+  I create a Tax
+-
+  !record {model: account.tax, id: tax10}:
+    name: Tax 10.0
+    amount: 10.0
+    type: fixed
+    sequence: 1
+    company_id: base.main_company
+    type_tax_use: all
+    tax_code_id: tax_case
+-
+  I create an Account with the tax
+-
+  !record {model: account.account, id: account_income_i000}:
+    name: "income account"
+    code: "I000"
+    type: 'other'
+    user_type: "account.data_account_type_income"
+    tax_ids: [tax10]
+- 
+  I set the account as property_account_income on the product and I set the tax on the product 
+-  
+  !record {model: product.product, id: product.product_product_consultant}:
+    property_account_income: account_income_i000
+    uom_id: product.product_uom_hour
+    taxes_id: [tax10] 
+    list_price: 75
 -
   I create invoice on analytic Line using "Invoice analytic Line" wizard.
 -
@@ -39,13 +75,11 @@
     price: 1
     product: product.product_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 created for this timesheet.
 -
@@ -67,8 +101,8 @@
     assert product == product_exp
     assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
     assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
-    # The expected amount is hard coded here, please keep updated:
     assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
+    assert invoice_id.amount_tax == 50, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
 -
   I create final invoice for this analytic account.
 -
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
new file mode 100644
index 00000000000..68e827e79f1
--- /dev/null
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
@@ -0,0 +1,119 @@
+-
+  In order to test hr_timesheet_invoice in OpenERP, I create account line to manage invoice based on costs.
+-
+  I create an account analytic line.
+-
+  !record {model: account.analytic.line, id: account_analytic_line_developyamlforhrmodule1 }:
+    account_id: account.analytic_agrolait
+    amount: -1.0
+    general_account_id: account.a_expense
+    journal_id: hr_timesheet.analytic_journal
+    name: develop yaml for hr module
+    product_id: product.product_product_consultant
+    product_uom_id: product.product_uom_hour
+    to_invoice: hr_timesheet_invoice.timesheet_invoice_factor2
+    unit_amount: 5.00
+-
+  Assign partner name and price list in analytic account.
+-
+  !record {model: account.analytic.account, id: account.analytic_agrolait}:
+    partner_id: base.res_partner_2
+    pricelist_id: product.list0
+-
+  I open this account and make the state as pending.
+-
+  !python {model: account.analytic.account}: |
+    self.set_open(cr, uid, [ref('account.analytic_agrolait')], None)
+    self.set_pending(cr, uid, [ref('account.analytic_agrolait')], None)
+-
+  I assign account on analytic account line.
+-
+  !python {model: hr.analytic.timesheet}: |
+    self.on_change_account_id(cr, uid, [ref('account_analytic_line_developyamlforhrmodule1')], ref('account.analytic_agrolait'))
+-
+  I create a Tax Code
+-
+  !record {model: account.tax.code, id: tax_case}:
+    name: Tax_case
+    company_id: base.main_company
+    sign: 1
+-
+  I create a Tax
+-
+  !record {model: account.tax, id: tax8}:
+    name: Tax 8.0
+    amount: 8.0
+    type: fixed
+    sequence: 1
+    company_id: base.main_company
+    type_tax_use: all
+    tax_code_id: tax_case
+-
+  I create an Account with the tax
+-
+  !record {model: account.account, id: account_income_i000}:
+    name: "income account"
+    code: "I000"
+    type: 'other'
+    user_type: "account.data_account_type_income"
+    tax_ids: [tax8]
+-
+  I set the account as property_account_income on the product and I set no tax on the product (so default tax from the account will be used)
+-
+  !record {model: product.product, id: product.product_product_consultant}:
+    property_account_income: account_income_i000
+    uom_id: product.product_uom_hour
+    taxes_id: []
+    list_price: 75
+-
+  I create invoice on analytic Line using "Invoice analytic Line" wizard.
+-
+  !record {model: hr.timesheet.invoice.create, id: hr_timesheet_invoice_create_0}:
+    date: 1
+    name: 1
+    price: 1
+    product: product.product_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_developyamlforhrmodule1")]})
+-
+  I check that Invoice is created for this timesheet.
+-
+  !python {model: account.analytic.line}: |
+    aline = self.browse(cr, uid, ref('account_analytic_line_developyamlforhrmodule1'))
+    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]
+    partner = aline.account_id.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'][0]
+
+    assert product == product_exp
+    assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
+    assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
+    assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
+    assert invoice_id.amount_tax == 40, "Invoice tax mismatch: %s" %  invoice_id.amount_tax
+-
+  I create final invoice for this analytic account.
+-
+  !record {model: hr.timesheet.invoice.create.final, id: hr_timesheet_invoice_create_final_0}:
+    date: 1
+    name: 1
+    price: 1
+    time: 1
+-
+  I click on "Create Invoice" button to create Invoice and validate the invoice.
+-
+  !python {model: hr.timesheet.invoice.create.final}: |
+    import netsvc
+    wkf_service = netsvc.LocalService("workflow")
+    res = self.do_create(cr, uid, [ref("hr_timesheet_invoice_create_final_0")], {"active_ids": [ref("account.analytic_agrolait")]})
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 4b98f7ec23f..2671cd1ab90 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
@@ -36,14 +36,17 @@ class final_invoice_create(osv.osv_memory):
     _description = 'Create invoice from timesheet final'
     _columns = {
         'date': fields.boolean('Date', help='Display date in the history of works'),
-        'time': fields.boolean('Time spent', help='Display time in the history of works'),
-        'name': fields.boolean('Name of entry', help='Display detail of work in the invoice line.'),
+        'time': fields.boolean('Time Spent', help='Display time in the history of works'),
+        'name': fields.boolean('Log of Activity', help='Display detail of work in the invoice line.'),
         'price': fields.boolean('Cost', help='Display cost of the item you reinvoice'),
         'product': fields.many2one('product.product', 'Product', help='The product that will be used to invoice the remaining amount'),
     }
 
     def do_create(self, cr, uid, ids, context=None):
         data = self.read(cr, uid, ids, [], context=context)[0]
+        # hack for fixing small issue (context should not propagate implicitly between actions)
+        if 'default_type' in context:
+            del context['default_type']
         ids = self.pool.get('account.analytic.line').search(cr, uid, [('invoice_id','=',False),('to_invoice','<>', False), ('account_id', 'in', context['active_ids'])], context=context)
         invs = self.pool.get('account.analytic.line').invoice_cost_create(cr, uid, ids, data, context=context)
         mod_obj = self.pool.get('ir.model.data')
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 76314e1986a..695d589ee2e 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -29,6 +29,15 @@ from tools.translate import _
 
 class account_analytic_line(osv.osv):
     _inherit = "account.analytic.line"
+    def _get_invoice_price(self, cr, uid, account, product_id, user_id, qty, context = {}):
+        pro_price_obj = self.pool.get('product.pricelist')
+        if account.pricelist_id:
+            pl = account.pricelist_id.id
+            price = pro_price_obj.price_get(cr,uid,[pl], product_id, qty or 1.0, account.partner_id.id, context=context)[pl]
+        else:
+            price = 0.0
+        return price
+
 
     #
     # data = {
@@ -38,20 +47,20 @@ class account_analytic_line(osv.osv):
     #   'price': boolean
     #   'product': many2one id
     # }
-    def invoice_cost_create(self, cr, uid, ids, data={}, context=None):
+    def invoice_cost_create(self, cr, uid, ids, data=None, context=None):
         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 = {}
+        if data is None:
+            data = {}
 
         account_ids = {}
         for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context):
@@ -79,26 +88,33 @@ class account_analytic_line(osv.osv):
             curr_invoice = {
                 'name': time.strftime('%d/%m/%Y')+' - '+account.name,
                 'partner_id': account.partner_id.id,
+                'company_id': account.company_id.id,
                 '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 = invoice_obj.create(cr, uid, curr_invoice, context=context)
-            invoices.append(last_invoice)
 
             context2 = context.copy()
             context2['lang'] = partner.lang
-            cr.execute("SELECT product_id, to_invoice, sum(unit_amount), product_uom_id, name " \
+            # set company_id in context, so the correct default journal will be selected
+            context2['force_company'] = curr_invoice['company_id']
+            # set force_company in context so the correct product properties are selected (eg. income account)
+            context2['company_id'] = curr_invoice['company_id']
+
+            last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context2)
+            invoices.append(last_invoice)
+
+            cr.execute("SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id, name " \
                     "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, product_uom_id, name", (account.id, tuple(ids),))
+                    "GROUP BY product_id, user_id, to_invoice, product_uom_id, name", (account.id, tuple(ids),))
 
-            for product_id, factor_id, qty, uom, line_name in cr.fetchall():
+            for product_id, user_id, factor_id, qty, uom, line_name in cr.fetchall():
                 if data.get('product'):
-                     product_id = data['product'][0]
+                    product_id = data['product'][0]
                 product = product_obj.browse(cr, uid, product_id, context=context2)
                 if not product:
                     raise osv.except_osv(_('Error!'), _('There is no product defined for the line %s. Please select one or force the product through the wizard.') % (line_name))
@@ -109,17 +125,14 @@ class account_analytic_line(osv.osv):
 
                 ctx =  context.copy()
                 ctx.update({'uom':uom})
-                if account.pricelist_id:
-                    pl = account.pricelist_id.id
-                    price = pro_price_obj.price_get(cr,uid,[pl], product_id, qty or 1.0, account.partner_id.id, context=ctx)[pl]
-                else:
-                    price = 0.0
 
-                taxes = product.taxes_id
-                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
-                if not account_id:
+                price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, ctx)
+
+                general_account = product.product_tmpl_id.property_account_income or product.categ_id.property_account_income_categ
+                if not general_account:
                     raise osv.except_osv(_("Configuration Error!"), _("Please define income account for product '%s'.") % product.name)
+                taxes = product.taxes_id or general_account.tax_ids
+                tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
                 curr_line = {
                     'price_unit': price,
                     'quantity': qty,
@@ -130,7 +143,7 @@ class account_analytic_line(osv.osv):
                     'product_id': product_id,
                     'invoice_line_tax_id': [(6,0,tax)],
                     'uos_id': uom,
-                    'account_id': account_id,
+                    'account_id': general_account.id,
                     'account_analytic_id': account.id,
                 }
 
@@ -155,7 +168,8 @@ class account_analytic_line(osv.osv):
                         details.append(line['name'])
                     note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
 
-                curr_line['name'] += "\n".join(map(lambda x: unicode(x) or '',note))
+                if note:
+                    curr_line['name'] += "\n" + ("\n".join(map(lambda x: unicode(x) or '',note)))
                 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(ids)))
 
@@ -196,7 +210,7 @@ class hr_timesheet_invoice_create(osv.osv_memory):
         data = context and context.get('active_ids', [])
         for analytic in analytic_obj.browse(cr, uid, data, context=context):
             if analytic.invoice_id:
-                     raise osv.except_osv(_('Warning!'), _("Invoice is already linked to some of the analytic line(s)!"))
+                raise osv.except_osv(_('Warning!'), _("Invoice is already linked to some of the analytic line(s)!"))
 
     def do_create(self, cr, uid, ids, context=None):
         data = self.read(cr, uid, ids, [], context=context)[0]
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index a0a0ceea2ac..d1c95212139 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -26,13 +26,19 @@
             <field name="model">hr.timesheet.invoice.create.final</field>
             <field name="arch" type="xml">
             <form string="Invoice contract" version="7.0">
-                    <separator string="Do you want to display work details on the invoice?" colspan="4"/>
-                    <field name="date"/>
-                    <field name="time"/>
-                    <field name="name"/>
-                    <field name="price"/>
-                    <separator string="Force to use a special product" colspan="4"/>
-                    <field name="product"/>
+                    <p>Do you want to show details of each activity to your customer?</p>
+                    <group>
+                        <group>
+                            <field name="date"/>
+                            <field name="time"/>
+                        </group><group>
+                            <field name="name"/>
+                            <field name="price"/>
+                        </group>
+                    </group>
+                    <group string="Force to use a special product" groups="base.group_no_one">
+                        <field name="product"/>
+                    </group>
                 <footer>
                     <button name="do_create" string="Create Invoice" type="object" class="oe_highlight"/>
                     or
diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py
index 1acaa5780b8..5f988439b50 100644
--- a/addons/hr_timesheet_sheet/__openerp__.py
+++ b/addons/hr_timesheet_sheet/__openerp__.py
@@ -24,35 +24,30 @@
     'name': 'Timesheets',
     'version': '1.0',
     'category': 'Human Resources',
-    "sequence": 16,
-    "summary": "Timesheets, Attendances, Activities",
+    'sequence': 24,
+    'summary': 'Timesheets, Attendances, Activities',
     'description': """
-This module helps you to easily encode and validate timesheet and attendances within the same view.
-===================================================================================================
+Record and validate timesheets and attendances easily
+=====================================================
 
-    * It will maintain attendances and track (sign in/sign out) events.
-    * Track the timesheet lines.
+This application supplies a new screen enabling you to manage both attendances (Sign in/Sign out) and your work encoding (timesheet) by period. Timesheet entries are made by employees each day. At the end of the defined period, employees validate their sheet and the manager must then approve his team's entries. Periods are defined in the company forms and you can set them to run monthly or weekly.
 
-Other tabs contains statistics views to help you analyse your
-time or the time of your team:
-    * Time spent by day (with attendances)
-    * Time spent by project
-
-This module also implements a complete timesheet validation process:
-    * Draft sheet
-    * Confirmation at the end of the period by the employee
-    * Validation by the project manager
+The complete timesheet validation process is:
+---------------------------------------------
+* Draft sheet
+* Confirmation at the end of the period by the employee
+* Validation by the project manager
 
 The validation can be configured in the company:
-    * Period size (day, week, month, year)
-    * Maximal difference between timesheet and attendances
+------------------------------------------------
+* Period size (Day, Week, Month)
+* Maximal difference between timesheet and attendances
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/hr_my_timesheet.jpeg','images/hr_timesheet_analysis.jpeg','images/hr_timesheet_sheet_analysis.jpeg','images/hr_timesheets.jpeg'],
     'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'security/hr_timesheet_sheet_security.xml',
         'hr_timesheet_sheet_view.xml',
@@ -65,13 +60,13 @@ The validation can be configured in the company:
         'hr_timesheet_sheet_data.xml',
         'res_config_view.xml',
     ],
-    'demo_xml': ['hr_timesheet_sheet_demo.xml',
-
-                 ],
+    'demo': ['hr_timesheet_sheet_demo.xml'],
     'test':['test/test_hr_timesheet_sheet.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0073297700829',
     'application': True,
+    'js': ['static/src/js/timesheet.js',],
+    'css': ['static/src/css/timesheet.css',],
+    'qweb': ['static/src/xml/timesheet.xml',],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index ca28b5bdb28..bf6790c6be3 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -27,206 +27,29 @@ from osv import fields, osv
 from tools.translate import _
 import netsvc
 
-class one2many_mod2(fields.one2many):
-    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if context is None:
-            context = {}
-
-        if values is None:
-            values = {}
-
-        # res6 = {id: date_current, ...}
-        res6 = dict([(rec['id'], rec['date_current'])
-            for rec in obj.read(cr, user, ids, ['date_current'], context=context)])
-
-        dom = []
-        for c, id in enumerate(ids):
-            if id in res6:
-                if c: # skip first
-                    dom.insert(0 ,'|')
-                dom.append('&')
-                dom.append('&')
-                dom.append(('name', '>=', res6[id]))
-                dom.append(('name', '<=', res6[id]))
-                dom.append(('sheet_id', '=', id))
-
-        ids2 = obj.pool.get(self._obj).search(cr, user, dom, limit=self._limit)
-
-        res = {}
-        for i in ids:
-            res[i] = []
-
-        for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2, [self._fields_id], context=context, load='_classic_read'):
-            if r[self._fields_id]:
-                res[r[self._fields_id][0]].append(r['id'])
-        return res
-
-    def set(self, cr, obj, id, field, values, user=None, context=None):
-        if context is None:
-            context = {}
-
-        context = context.copy()
-        context['sheet_id'] = id
-        return super(one2many_mod2, self).set(cr, obj, id, field, values, user=user, context=context)
-
-
-class one2many_mod(fields.one2many):
-    def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if context is None:
-            context = {}
-
-        if values is None:
-            values = {}
-
-
-        res5 = obj.read(cr, user, ids, ['date_current'], context=context)
-        res6 = {}
-        for r in res5:
-            res6[r['id']] = r['date_current']
-
-        ids2 = []
-        for id in ids:
-            dom = []
-            if id in res6:
-                dom = [('date', '=', res6[id]), ('sheet_id', '=', id)]
-            ids2.extend(obj.pool.get(self._obj).search(cr, user,
-                dom, limit=self._limit))
-        res = {}
-        for i in ids:
-            res[i] = []
-        for r in obj.pool.get(self._obj)._read_flat(cr, user, ids2,
-                [self._fields_id], context=context, load='_classic_read'):
-            if r[self._fields_id]:
-                res[r[self._fields_id][0]].append(r['id'])
-
-        return res
-
 class hr_timesheet_sheet(osv.osv):
     _name = "hr_timesheet_sheet.sheet"
+    _inherit = "mail.thread"
     _table = 'hr_timesheet_sheet_sheet'
     _order = "id desc"
     _description="Timesheet"
 
-    def _total_attendances(self, cr, uid, ids, name, args, context=None):
-        """ Get the total attendance for the timesheets
-            Returns a dict like :
-                {id: {'date_current': '2011-06-17',
-                      'total_per_day': {day: timedelta, ...},
-                     },
-                 ...
-                }
-        """
-        context = context or {}
-        attendance_obj = self.pool.get('hr.attendance')
-        res = {}
-        for sheet_id in ids:
-            sheet = self.browse(cr, uid, sheet_id, context=context)
-            date_current = sheet.date_current
-            # field attendances_ids of hr_timesheet_sheet.sheet only
-            # returns attendances of timesheet's current date
-            attendance_ids = attendance_obj.search(cr, uid, [('sheet_id', '=', sheet_id)], context=context)
-            attendances = attendance_obj.browse(cr, uid, attendance_ids, context=context)
-            total_attendance = {}
-            for attendance in [att for att in attendances
-                               if att.action in ('sign_in', 'sign_out')]:
-                day = attendance.name[:10]
-                if not total_attendance.get(day, False):
-                    total_attendance[day] = timedelta(seconds=0)
-
-                attendance_in_time = datetime.strptime(attendance.name, '%Y-%m-%d %H:%M:%S')
-                attendance_interval = timedelta(hours=attendance_in_time.hour,
-                                                minutes=attendance_in_time.minute,
-                                                seconds=attendance_in_time.second)
-                if attendance.action == 'sign_in':
-                    total_attendance[day] -= attendance_interval
-                else:
-                    total_attendance[day] += attendance_interval
-
-                # if the delta is negative, it means that a sign out is missing
-                # in a such case, we want to have the time to the end of the day
-                # for a past date, and the time to now for the current date
-                if total_attendance[day] < timedelta(0):
-                    if day == date_current:
-                        now = datetime.now()
-                        total_attendance[day] += timedelta(hours=now.hour,
-                                                           minutes=now.minute,
-                                                           seconds=now.second)
-                    else:
-                        total_attendance[day] += timedelta(days=1)
-
-            res[sheet_id] = {'date_current': date_current,
-                             'total_per_day': total_attendance}
-        return res
-
-    def _total_timesheet(self, cr, uid, ids, name, args, context=None):
-        """ Get the total of analytic lines for the timesheets
-            Returns a dict like :
-                {id: {day: timedelta, ...}}
-        """
-        context = context or {}
-        sheet_line_obj = self.pool.get('hr.analytic.timesheet')
-
-        res = {}
-        for sheet_id in ids:
-            # field timesheet_ids of hr_timesheet_sheet.sheet only
-            # returns lines of timesheet's current date
-            sheet_lines_ids = sheet_line_obj.search(cr, uid, [('sheet_id', '=', sheet_id)], context=context)
-            sheet_lines = sheet_line_obj.browse(cr, uid, sheet_lines_ids, context=context)
-            total_timesheet = {}
-            for line in sheet_lines:
-                day = line.date
-                if not total_timesheet.get(day, False):
-                    total_timesheet[day] = timedelta(seconds=0)
-                total_timesheet[day] += timedelta(hours=line.unit_amount)
-            res[sheet_id] = total_timesheet
-        return res
-
     def _total(self, cr, uid, ids, name, args, context=None):
         """ Compute the attendances, analytic lines timesheets and differences between them
             for all the days of a timesheet and the current day
         """
-        def sum_all_days(sheet_amounts):
-            if not sheet_amounts:
-                return timedelta(seconds=0)
-            total = reduce(lambda memo, value: memo + value, sheet_amounts.values())
-            return total
-
-        def timedelta_to_hours(delta):
-            hours = 0.0
-            seconds = float(delta.seconds)
-            if delta.microseconds:
-                seconds += float(delta.microseconds) / 100000
-            hours += delta.days * 24
-            if seconds:
-                hours += seconds / 3600
-            return hours
 
         res = {}
-        all_timesheet_attendances = self._total_attendances(cr, uid, ids, name, args, context=context)
-        all_timesheet_lines = self._total_timesheet(cr, uid, ids, name, args, context=context)
-        for id in ids:
-            res[id] = {}
-
-            all_attendances_sheet = all_timesheet_attendances[id]
-
-            date_current = all_attendances_sheet['date_current']
-            total_attendances_sheet = all_attendances_sheet['total_per_day']
-            total_attendances_all_days = sum_all_days(total_attendances_sheet)
-            total_attendances_day = total_attendances_sheet.get(date_current, timedelta(seconds=0))
-
-            total_timesheets_sheet = all_timesheet_lines[id]
-            total_timesheets_all_days = sum_all_days(total_timesheets_sheet)
-            total_timesheets_day = total_timesheets_sheet.get(date_current, timedelta(seconds=0))
-            total_difference_all_days = total_attendances_all_days - total_timesheets_all_days
-            total_difference_day = total_attendances_day - total_timesheets_day
-
-            res[id]['total_attendance'] = timedelta_to_hours(total_attendances_all_days)
-            res[id]['total_timesheet'] = timedelta_to_hours(total_timesheets_all_days)
-            res[id]['total_difference'] = timedelta_to_hours(total_difference_all_days)
-
-            res[id]['total_attendance_day'] = timedelta_to_hours(total_attendances_day)
-            res[id]['total_timesheet_day'] = timedelta_to_hours(total_timesheets_day)
-            res[id]['total_difference_day'] = timedelta_to_hours(total_difference_day)
+        for sheet in self.browse(cr, uid, ids, context=context or {}):
+            res.setdefault(sheet.id, {
+                'total_attendance': 0.0,
+                'total_timesheet': 0.0,
+                'total_difference': 0.0,
+            })
+            for period in sheet.period_ids:
+                res[sheet.id]['total_attendance'] += period.total_attendance
+                res[sheet.id]['total_timesheet'] += period.total_timesheet
+                res[sheet.id]['total_difference'] += period.total_attendance - period.total_timesheet
         return res
 
     def check_employee_attendance_state(self, cr, uid, sheet_id, context=None):
@@ -247,7 +70,7 @@ class hr_timesheet_sheet(osv.osv):
             if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
                 raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must link the employee to a product, like \'Consultant\'.'))
             if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).journal_id:
-                raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must assign the employee to an analytic journal, like \'Timesheet\'.'))
+                raise osv.except_osv(_('Configuration Error!'), _('In order to create a timesheet for this employee, you must assign an analytic journal to the employee, like \'Timesheet Journal\'.'))
         return super(hr_timesheet_sheet, self).create(cr, uid, vals, *args, **argv)
 
     def write(self, cr, uid, ids, vals, *args, **argv):
@@ -256,15 +79,17 @@ class hr_timesheet_sheet(osv.osv):
             if not new_user_id:
                 raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must assign it to a user.'))
             if not self._sheet_date(cr, uid, ids, forced_user_id=new_user_id):
-                raise osv.except_osv(_('Error!'), _('You cannot have 2 timesheets that overlaps!\nYou should use the menu \'My Timesheet\' to avoid this problem.'))
+                raise osv.except_osv(_('Error!'), _('You cannot have 2 timesheets that overlap!\nYou should use the menu \'My Timesheet\' to avoid this problem.'))
             if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).product_id:
                 raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must link the employee to a product.'))
             if not self.pool.get('hr.employee').browse(cr, uid, vals['employee_id']).journal_id:
-                raise osv.except_osv(_('Error!'), _('In order to create a timesheet for this employee, you must assign the employee to an analytic journal.'))
+                raise osv.except_osv(_('Configuration Error!'), _('In order to create a timesheet for this employee, you must assign an analytic journal to the employee, like \'Timesheet Journal\'.'))
         return super(hr_timesheet_sheet, self).write(cr, uid, ids, vals, *args, **argv)
 
     def button_confirm(self, cr, uid, ids, context=None):
         for sheet in self.browse(cr, uid, ids, context=context):
+            if sheet.employee_id and sheet.employee_id.parent_id and sheet.employee_id.parent_id.user_id:
+                self.message_subscribe_users(cr, uid, [sheet.id], user_ids=[sheet.employee_id.parent_id.user_id.id], context=context)
             self.check_employee_attendance_state(cr, uid, sheet.id, context=context)
             di = sheet.user_id.company_id.timesheet_max_difference
             if (abs(sheet.total_difference) < di) or not di:
@@ -274,69 +99,12 @@ class hr_timesheet_sheet(osv.osv):
                 raise osv.except_osv(_('Warning!'), _('Please verify that the total difference of the sheet is lower than %.2f.') %(di,))
         return True
 
-    def date_today(self, cr, uid, ids, context=None):
+    def attendance_action_change(self, cr, uid, ids, context=None):
+        hr_employee = self.pool.get('hr.employee')
+        employee_ids = []
         for sheet in self.browse(cr, uid, ids, context=context):
-            if datetime.today() <= datetime.strptime(sheet.date_from, '%Y-%m-%d'):
-                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}, context=context)
-            elif datetime.now() >= datetime.strptime(sheet.date_to, '%Y-%m-%d'):
-                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')}, context=context)
-        return True
-
-    def date_previous(self, cr, uid, ids, context=None):
-        for sheet in self.browse(cr, uid, ids, context=context):
-            if datetime.strptime(sheet.date_current, '%Y-%m-%d') <= datetime.strptime(sheet.date_from, '%Y-%m-%d'):
-                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}, context=context)
-            else:
-                self.write(cr, uid, [sheet.id], {
-                    'date_current': (datetime.strptime(sheet.date_current, '%Y-%m-%d') + relativedelta(days=-1)).strftime('%Y-%m-%d'),
-                }, context=context)
-        return True
-
-    def date_next(self, cr, uid, ids, context=None):
-        for sheet in self.browse(cr, uid, ids, context=context):
-            if datetime.strptime(sheet.date_current, '%Y-%m-%d') >= datetime.strptime(sheet.date_to, '%Y-%m-%d'):
-                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
-            else:
-                self.write(cr, uid, [sheet.id], {
-                    'date_current': (datetime.strptime(sheet.date_current, '%Y-%m-%d') + relativedelta(days=1)).strftime('%Y-%m-%d'),
-                }, context=context)
-        return True
-
-    def button_dummy(self, cr, uid, ids, context=None):
-        for sheet in self.browse(cr, uid, ids, context=context):
-            if datetime.strptime(sheet.date_current, '%Y-%m-%d') <= datetime.strptime(sheet.date_from, '%Y-%m-%d'):
-                self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}, context=context)
-            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,}, context=context)
-        return True
-
-    def check_sign(self, cr, uid, ids, typ, context=None):
-        sheet = self.browse(cr, uid, ids, context=context)[0]
-        if not sheet.date_current == time.strftime('%Y-%m-%d'):
-            raise osv.except_osv(_('Error!'), _('You cannot sign in/sign out from other date than today.'))
-        return True
-
-    def sign(self, cr, uid, ids, typ, context=None):
-        self.check_sign(cr, uid, ids, typ, context=context)
-        sign_obj = self.pool.get('hr.sign.in.out')
-        sheet = self.browse(cr, uid, ids, context=context)[0]
-        context['emp_id'] = [sheet.employee_id.id]
-        sign_id = sign_obj.create(cr, uid, {}, context=context)
-        methods = {'sign_in': sign_obj.si_check,
-                   'sign_out': sign_obj.so_check}
-        wizard_result = methods[typ](cr, uid, [sign_id], context=context)
-        if wizard_result.get('type', False) == 'ir.actions.act_window_close':
-            return True  # ensure we do not close the main window !
-        wizard_result['nodestroy'] = True  # do not destroy the main window !
-        return wizard_result
-
-    def sign_in(self, cr, uid, ids, context=None):
-        return self.sign(cr, uid, ids, 'sign_in', context=context)
-
-    def sign_out(self, cr, uid, ids, context=None):
-        return self.sign(cr, uid, ids, 'sign_out', context=context)
+            if sheet.employee_id.id not in employee_ids: employee_ids.append(sheet.employee_id.id)
+        return hr_employee.attendance_action_change(cr, uid, employee_ids, context=context)
 
     _columns = {
         'name': fields.char('Note', size=64, select=1,
@@ -345,26 +113,22 @@ class hr_timesheet_sheet(osv.osv):
         'user_id': fields.related('employee_id', 'user_id', type="many2one", relation="res.users", store=True, string="User", required=False, readonly=True),#fields.many2one('res.users', 'User', required=True, select=1, states={'confirm':[('readonly', True)], 'done':[('readonly', True)]}),
         'date_from': fields.date('Date from', required=True, select=1, readonly=True, states={'new':[('readonly', False)]}),
         'date_to': fields.date('Date to', required=True, select=1, readonly=True, states={'new':[('readonly', False)]}),
-        'date_current': fields.date('Current date', required=True, select=1),
-        'timesheet_ids' : one2many_mod('hr.analytic.timesheet', 'sheet_id',
-            'Timesheet lines', domain=[('date', '=', time.strftime('%Y-%m-%d'))],
+        'timesheet_ids' : fields.one2many('hr.analytic.timesheet', 'sheet_id',
+            'Timesheet lines',
             readonly=True, states={
                 'draft': [('readonly', False)],
                 'new': [('readonly', False)]}
             ),
-        'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances'),
+        'attendances_ids' : fields.one2many('hr.attendance', 'sheet_id', 'Attendances'),
         'state' : fields.selection([
             ('new', 'New'),
             ('draft','Open'),
             ('confirm','Waiting Approval'),
             ('done','Approved')], 'Status', select=True, required=True, readonly=True,
-            help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed timesheet. \
-                \n* The \'Confirmed\' state is used for to confirm the timesheet by user. \
-                \n* The \'Done\' state is used when users timesheet is accepted by his/her senior.'),
+            help=' * The \'Draft\' status is used when a user is encoding a new and unconfirmed timesheet. \
+                \n* The \'Confirmed\' status is used for to confirm the timesheet by user. \
+                \n* The \'Done\' status is used when users timesheet is accepted by his/her senior.'),
         'state_attendance' : fields.related('employee_id', 'state', type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Current Status', readonly=True),
-        'total_attendance_day': fields.function(_total, method=True, string='Total Attendance', multi="_total"),
-        'total_timesheet_day': fields.function(_total, method=True, string='Total Timesheet', multi="_total"),
-        'total_difference_day': fields.function(_total, method=True, string='Difference', multi="_total"),
         'total_attendance': fields.function(_total, method=True, string='Total Attendance', multi="_total"),
         'total_timesheet': fields.function(_total, method=True, string='Total Timesheet', multi="_total"),
         'total_difference': fields.function(_total, method=True, string='Difference', multi="_total"),
@@ -374,7 +138,7 @@ class hr_timesheet_sheet(osv.osv):
         'department_id':fields.many2one('hr.department','Department'),
     }
 
-    def _default_date_from(self,cr, uid, context=None):
+    def _default_date_from(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':
@@ -385,7 +149,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=None):
+    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':
@@ -402,7 +166,6 @@ class hr_timesheet_sheet(osv.osv):
 
     _defaults = {
         'date_from' : _default_date_from,
-        'date_current' : lambda *a: time.strftime('%Y-%m-%d'),
         'date_to' : _default_date_to,
         'state': 'new',
         'employee_id': _default_employee,
@@ -422,16 +185,9 @@ class hr_timesheet_sheet(osv.osv):
                     return False
         return True
 
-    def _date_current_check(self, cr, uid, ids, context=None):
-        for sheet in self.browse(cr, uid, ids, context=context):
-            if sheet.date_current < sheet.date_from or sheet.date_current > sheet.date_to:
-                return False
-        return True
-
 
     _constraints = [
-        (_sheet_date, 'You cannot have 2 timesheets that overlaps !\nPlease use the menu \'My Current Timesheet\' to avoid this problem.', ['date_from','date_to']),
-        (_date_current_check, 'You must select a Current date which is in the timesheet dates !', ['date_current']),
+        (_sheet_date, 'You cannot have 2 timesheets that overlap!\nPlease use the menu \'My Current Timesheet\' to avoid this problem.', ['date_from','date_to']),
     ]
 
     def action_set_to_draft(self, cr, uid, ids, *args):
@@ -442,10 +198,12 @@ class hr_timesheet_sheet(osv.osv):
         return True
 
     def name_get(self, cr, uid, ids, context=None):
-        if not len(ids):
+        if not ids:
             return []
-        return [(r['id'], r['date_from'] + ' - ' + r['date_to']) \
-                for r in self.read(cr, uid, ids, ['date_from', 'date_to'],
+        if isinstance(ids, (long, int)):
+            ids = [ids]
+        return [(r['id'], _('Week ')+datetime.strptime(r['date_from'], '%Y-%m-%d').strftime('%U')) \
+                for r in self.read(cr, uid, ids, ['date_from'],
                     context=context, load='_classic_write')]
 
     def unlink(self, cr, uid, ids, context=None):
@@ -465,16 +223,26 @@ class hr_timesheet_sheet(osv.osv):
 
 hr_timesheet_sheet()
 
-
-class hr_timesheet_line(osv.osv):
-    _inherit = "hr.analytic.timesheet"
+class account_analytic_line(osv.osv):
+    _inherit = "account.analytic.line"
 
     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')
+        #get the default date (should be: today)
+        res = super(account_analytic_line, self)._get_default_date(cr, uid, context=context)
+        #if we got the dates from and to from the timesheet and if the default date is in between, we use the default
+        #but if the default isn't included in those dates, we use the date start of the timesheet as default
+        if context.get('timesheet_date_from') and context.get('timesheet_date_to'):
+            if context['timesheet_date_from'] <= res <= context['timesheet_date_to']:
+                return res
+            return context.get('timesheet_date_from')
+        #if we don't get the dates from the timesheet, we return the default value from super()
+        return res
+
+
+class hr_timesheet_line(osv.osv):
+    _inherit = "hr.analytic.timesheet"
 
     def _sheet(self, cursor, user, ids, name, args, context=None):
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
@@ -512,7 +280,7 @@ class hr_timesheet_line(osv.osv):
 
     _columns = {
         'sheet_id': fields.function(_sheet, string='Sheet',
-            type='many2one', relation='hr_timesheet_sheet.sheet',
+            type='many2one', relation='hr_timesheet_sheet.sheet', ondelete="cascade",
             store={
                     'hr_timesheet_sheet.sheet': (_get_hr_timesheet_sheet, ['employee_id', 'date_from', 'date_to'], 10),
                     'account.analytic.line': (_get_account_analytic_line, ['user_id', 'date'], 10),
@@ -520,9 +288,6 @@ class hr_timesheet_line(osv.osv):
                   },
             ),
     }
-    _defaults = {
-        'date': _get_default_date,
-    }
 
     def _check_sheet_state(self, cr, uid, ids, context=None):
         if context is None:
@@ -548,6 +313,10 @@ class hr_timesheet_line(osv.osv):
                 raise osv.except_osv(_('Error!'), _('You cannot modify an entry in a confirmed timesheet.'))
         return True
 
+    def multi_on_change_account_id(self, cr, uid, ids, account_ids, context=None):
+        return dict([(el, self.on_change_account_id(cr, uid, ids, el, context.get('user_id', uid))) for el in account_ids])
+
+
 hr_timesheet_line()
 
 class hr_attendance(osv.osv):
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
index f9c9070ddbf..095a92c032d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
@@ -2,31 +2,26 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Timesheets Validation has been installed</value>
-            <value>From the top menu "Human Resources", encode and validate timesheets and attendances.</value>
-        </function>
+        <record model="mail.message" id="hr_timesheet_module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Timesheet Validation application installed!</field>
+            <field name="body"><![CDATA[<p>From the top menu "Human Resources", enter and validate timesheets and attendances.</p>]]></field>
+        </record>
 
         <record id="ir_actions_server_timsheet_sheet" model="ir.actions.server">
-            <field eval="5" name="sequence"/>
-            <field eval="&quot;&quot;&quot;code&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;ir.actions.server&quot;&quot;&quot;" name="type"/>
+            <field name="sequence" eval="5"/>
+            <field name="state">code</field>
+            <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_hr_timesheet_current_open"/>
-            <field eval="[(6,0,[])]" name="child_ids"/>
-            <field eval="&quot;&quot;&quot;action = pool.get('hr.timesheet.current.open').open_timesheet(cr, uid, None, context)&quot;&quot;&quot;" name="code"/>
-            <field eval="&quot;&quot;&quot;True&quot;&quot;&quot;" name="condition"/>
-            <field eval="&quot;&quot;&quot;My Timesheet&quot;&quot;&quot;" name="name"/>
+            <field name="code">action = pool.get('hr.timesheet.current.open').open_timesheet(cr, uid, None, context)</field>
+            <field name="condition">True</field>
+            <field name="name">My Timesheet</field>
         </record>
 
-        <record id="menu_act_hr_timesheet_sheet_form_my_current" model="ir.ui.menu">
-            <field name="name">My Current Timesheet</field>
-            <field eval="1" name="sequence"/>
-            <field name="parent_id" ref="hr_attendance.menu_hr_time_tracking"/>
-            <field name="icon">STOCK_JUSTIFY_FILL</field>
-            <field name="action" ref="ir_actions_server_timsheet_sheet"/>
-        </record>
+        <menuitem name="My Current Timesheet" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
index a73bbb3050e..4e0e1becbe9 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
@@ -2,12 +2,11 @@
 <openerp>
     <data noupdate="1">
         
-        <record id="sheet1" model="hr_timesheet_sheet.sheet">
+<!--        <record id="sheet1" model="hr_timesheet_sheet.sheet">
             <field name="name">Sheet 1</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="employee_id" ref="hr.employee_fp" />
-            <field eval="time.strftime('%Y-%m-%d')" name="date_current"/>
         </record>
-
+-->
     </data>
 </openerp>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 6c4ee63cbe6..6de6be6c08d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -40,30 +40,57 @@
             </field>
         </record>
 
+
+        <record model="ir.actions.act_window" id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet">
+            <field name="context">{'search_default_sheet_id': [active_id]}</field>
+            <field name="name">Timesheet Activities</field>
+            <field name="res_model">hr.analytic.timesheet</field>
+            <field name="src_model">hr_timesheet_sheet.sheet</field>
+        </record>
+
+
+        <record model="ir.actions.act_window" id="act_hr_timesheet_sheet_sheet_2_hr_attendance">
+            <field name="context">{'search_default_sheet_id': [active_id]}</field>
+            <field name="name">Attendances</field>
+            <field name="res_model">hr.attendance</field>
+            <field name="src_model">hr_timesheet_sheet.sheet</field>
+        </record>
+
+
         <record id="hr_timesheet_sheet_form" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.form</field>
             <field name="model">hr_timesheet_sheet.sheet</field>
             <field name="arch" type="xml">
                 <form string="Timesheet" version="7.0">
                 <header>
-                    <button name="button_confirm" states="draft" string="Submited to Manager" type="object" class="oe_highlight"/>
+                    <button name="button_confirm" states="draft" string="Submit to Manager" type="object" class="oe_highlight"/>
                     <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
                     <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" />
                     <button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <field name="state" widget="statusbar" statusbar_visible="new,confirm,done"/>
                 </header>
                 <sheet>
-                    <label for="employee_id" class="oe_edit_only"/>
-                    <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
-                    <label for="date_from" class="oe_edit_only" string="Timesheet Period"/>
-                    <h2>From <field name="date_from"/> to <field name="date_to"/></h2>
+                    <div class="oe_right oe_button_box" name="buttons">
+                        <button type="action"
+                            name="%(act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet)d"
+                            string="Timesheet Activities" />
+                        <button type="action" groups="base.group_hr_attendance"
+                            name="%(act_hr_timesheet_sheet_sheet_2_hr_attendance)d"
+                            string="Attendances" />
+                    </div>
+                    <div class="oe_title">
+                        <label for="employee_id" class="oe_edit_only"/>
+                        <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)" class="oe_inline"/></h1>
+                    </div>
                     <group>
                         <group>
-                            <field name="name"/>
-                            <field name="department_id"/>
+                            <label for="date_from" string="Timesheet Period"/>
+                            <div><field name="date_from" class="oe_inline"/> to <field name="date_to" class="oe_inline"/></div>
+                            <field name="name" invisible="1"/>
+                            <field name="department_id" invisible="1"/>
                             <field name="company_id" groups="base.group_multi_company"/>
                         </group>
-                        <group>
+                        <group groups="base.group_hr_attendance">
                             <field name="total_attendance" widget="float_time"/>
                             <field name="total_timesheet" widget="float_time"/>
                             <field name="total_difference" widget="float_time"/>
@@ -71,42 +98,17 @@
                         </group>
                     </group>
                     <notebook>
-                        <page string="Daily">
-                            <group>
-                                <div>
-                                    <button name="button_dummy" class="oe_inline" string="Go to" type="object" icon="terp-gtk-jump-to-ltr"/> :
-                                    <field name="date_current" class="oe_inline"/>
-                                </div>
-                                <div align="right">
-                                    <button class="oe_inline" icon="terp-gtk-go-back-ltr" name="date_previous" string="" type="object"/>
-                                    <button class="oe_inline" name="date_today" string="Today" type="object" icon="terp-go-today"/>
-                                    <button class="oe_inline" icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
-                                </div>
-                            </group>
-                            <group colspan="4" col="3">
-                                <field context="{'name':date_current,'user_id':user_id}" name="attendances_ids" nolabel="1">
-                                    <tree string="Attendances" editable="bottom">
-                                        <field name="name"/>
-                                        <field name="action"/>
-                                        <field invisible="1" name="employee_id"/>
-                                    </tree>
-                                </field>
-                                <group>
-                                    <div align="right">
-                                        <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
-                                        <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
-                                    </div>
-                                </group>
-                            </group>
-                            <group col="4">
-                                <field name="state_attendance"/>
-                            </group>
-                            <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
-                                <tree editable="top" string="Timesheet Lines">
-                                    <field invisible="1" name="date"/>
-                                    <field domain="[('type','in',['normal', 'contract']), ('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id)" context="{'default_use_timesheets': 1}"/>
+                        <page string="Summary">
+                            <widget type="weekly_timesheet">
+                            </widget>
+                        </page>
+                        <page string="Details">
+                            <field context="{'user_id':user_id, 'timesheet_date_from': date_from, 'timesheet_date_to': date_to}" name="timesheet_ids" nolabel="1">
+                                <tree editable="top" string="Timesheet Activities">
+                                    <field name="date"/>
+                                    <field domain="[('type','in',['normal', 'contract']), ('state', '&lt;&gt;', 'close'),('use_timesheets','=',1)]" name="account_id" on_change="on_change_account_id(account_id, user_id)" context="{'default_use_timesheets': 1}"/>
                                     <field name="name"/>
-                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time" string="Hours" sum="Hours"/>
                                     <field name="to_invoice" widget="selection"/>
                                     <field invisible="1" name="journal_id"/>
                                     <field invisible="1" name="product_id" domain="[('type','=','service')]" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
@@ -115,9 +117,9 @@
                                     <field invisible="1" name="general_account_id"/>
                                     <field invisible="1" name="user_id" required="1"/>
                                 </tree>
-                                <form string="Timesheet Lines" version="7.0">
+                                <form string="Timesheet Activities" version="7.0">
                                     <field name="date"/>
-                                    <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
+                                    <field domain="[('type','=','normal'), ('state', '&lt;&gt;', 'close')]" name="account_id" on_change="on_change_account_id(account_id, user_id)"/>
                                     <field name="name"/>
                                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
                                     <field name="to_invoice"/>
@@ -130,18 +132,39 @@
                                 </form>
                             </field>
                         </page>
-                        <page string="Summary">
-                            <field colspan="4" name="period_ids" nolabel="1">
+                        <page string="Attendances" groups="base.group_hr_attendance">
+                            <group>
+                                <field context="{'user_id':user_id}" name="attendances_ids" nolabel="1">
+                                    <tree string="Attendances" editable="bottom">
+                                        <field name="name"/>
+                                        <field name="action"/>
+                                        <field invisible="1" name="employee_id"/>
+                                    </tree>
+                                </field>
+                                <group>
+                                    <label for="state_attendance"/>
+                                    <div>
+                                        <field name="state_attendance"/>
+                                        <button name="attendance_action_change" attrs="{'invisible': [('state_attendance', '=', 'present')]}" type="object" string="Sign In" class="oe_link"/>
+                                        <button name="attendance_action_change" attrs="{'invisible': ['|', ('state_attendance','=',False), ('state_attendance', '=', 'absent')]}" type="object" string="Sign Out" class="oe_link"/>
+                                    </div>
+                                </group>
+                            </group>
+                            <field name="period_ids">
                                 <tree colors="red:total_difference&lt;0.1;blue:total_difference&gt;=0.1" string="Period">
                                     <field name="name"/>
-                                    <field name="total_attendance" widget="float_time"/>
-                                    <field name="total_timesheet" widget="float_time"/>
-                                    <field name="total_difference" widget="float_time"/>
+                                    <field name="total_attendance" widget="float_time" sum="Attendances"/>
+                                    <field name="total_timesheet" widget="float_time" sum="Timesheets"/>
+                                    <field name="total_difference" widget="float_time" sum="Differences"/>
                                 </tree>
                             </field>
                         </page>
                     </notebook>
                 </sheet>
+                <div class="oe_chatter">
+                    <field name="message_ids" widget="mail_thread"/>
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                </div>
                 </form>
             </field>
         </record>
@@ -152,8 +175,8 @@
             <field name="arch" type="xml">
                 <search string="Search Timesheet">
                     <field name="date_from"/>
-                    <filter icon="terp-document-new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
-                    <filter icon="terp-camera_test" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
+                    <filter name="new" string="In Draft" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
+                    <filter name="to_approve" string="To Approve" domain="[('state','=','confirm')]" help="Confirmed Timesheets"/>
                     <field name="employee_id"/>
                     <field name="department_id"/>
                     <group expand="0" string="Group By...">
@@ -165,29 +188,29 @@
         </record>
 
         <record id="act_hr_timesheet_sheet_form" model="ir.actions.act_window">
-            <field name="name">Timesheets</field>
+            <field name="name">Timesheets to Validate</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr_timesheet_sheet.sheet</field>
             <field name="view_type">form</field>
             <field name="view_id" eval="False"/>
-            <field name="context">{'search_default_my_timesheet':1}</field>
+            <field name="context">{'search_default_to_approve':1}</field>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to go to your timesheet. 
+                New timesheet to approve.
               </p><p>
                 You must record timesheets every day and confirm at the end
-                of the week. Once the timesheet is confirmed, it his sent to
-                the manager for validation.
+                of the week. Once the timesheet is confirmed, it should be
+                validated by a manager.
               </p><p>
                 Timesheets can also be invoiced to customers, depending on the
-                configuration of the project.
+                configuration of each project's related contract.
               </p>
             </field>
         </record>
 
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
-             sequence="2" groups="base.group_hr_user,base.group_hr_manager"/>
+             sequence="2" groups="base.group_hr_user"/>
 
         <!--
             Company inheritancy
@@ -280,33 +303,20 @@
         </record>
 
         <act_window
-        context="{'search_default_sheet_id': [active_id]}"
-        id="act_hr_timesheet_sheet_sheet_by_account"
-        name="Timesheet by Account"
-        res_model="hr_timesheet_sheet.sheet.account"
-        src_model="hr_timesheet_sheet.sheet"/>
+            context="{'search_default_sheet_id': [active_id]}"
+            id="act_hr_timesheet_sheet_sheet_by_account"
+            name="Timesheet by Account"
+            groups="base.group_hr_attendance"
+            res_model="hr_timesheet_sheet.sheet.account"
+            src_model="hr_timesheet_sheet.sheet"/>
 
         <act_window
-        context="{'search_default_sheet_id': [active_id]}"
-        id="act_hr_timesheet_sheet_sheet_by_day"
-        name="Timesheet by Day"
-        res_model="hr_timesheet_sheet.sheet.day"
-        src_model="hr_timesheet_sheet.sheet"/>
-
-        <act_window
-        context="{'search_default_sheet_id': [active_id]}"
-        id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet"
-        name="Timesheet Lines"
-        res_model="hr.analytic.timesheet"
-        src_model="hr_timesheet_sheet.sheet"/>
-
-
-        <act_window
-        context="{'search_default_sheet_id': [active_id]}"
-        id="act_hr_timesheet_sheet_sheet_2_hr_attendance"
-        name="Attendances"
-        res_model="hr.attendance"
-        src_model="hr_timesheet_sheet.sheet"/>
+            context="{'search_default_sheet_id': [active_id]}"
+            id="act_hr_timesheet_sheet_sheet_by_day"
+            name="Timesheet by Day"
+            groups="base.group_hr_attendance"
+            res_model="hr_timesheet_sheet.sheet.day"
+            src_model="hr_timesheet_sheet.sheet"/>
 
         <record id="hr_timesheet_sheet_tree_simplified" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.tree</field>
@@ -317,10 +327,10 @@
                     <field name="employee_id"/>
                     <field name="date_from"/>
                     <field name="date_to"/>
-                    <field name="department_id"/>
-                    <field name="total_attendance" widget="float_time"/>
+                    <field name="department_id" invisible="1"/>
+                    <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
                     <field name="total_timesheet" widget="float_time"/>
-                    <field name="total_difference" widget="float_time"/>
+                    <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -332,25 +342,30 @@
             <field name="arch" type="xml">
                 <tree colors="blue:total_difference&lt;0.1;red:total_difference&gt;=0.1" string="Period">
                     <field name="name"/>
-                    <field name="total_attendance" widget="float_time" sum="Total Attendances"/>
+                    <field name="total_attendance" widget="float_time" sum="Total Attendances" groups="base.group_hr_attendance"/>
                     <field name="total_timesheet" widget="float_time" sum="Total Timesheet"/>
-                    <field name="total_difference" widget="float_time" sum="Total Difference"/>
+                    <field name="total_difference" widget="float_time" sum="Total Difference" groups="base.group_hr_attendance"/>
                 </tree>
             </field>
         </record>
 
   <!-- Timesheet Button on Employee Form -->
-  <act_window
-           context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-           id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
            
+    <record id="act_hr_employee_2_hr_timesheet" model="ir.actions.act_window">
+        <field name="res_model">hr_timesheet_sheet.sheet</field>
+        <field name="view_type">form</field>
+        <field name="name">Timesheets</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_employee_id': [active_id], 'default_employee_id': active_id}</field>
+    </record>
+         
       <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.employee.extd_form</field>
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_employee_extd_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='button_box']" position="inside">
-                    <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
+                    <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action" groups="base.group_hr_manager"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/i18n/ar.po b/addons/hr_timesheet_sheet/i18n/ar.po
index 50b83002f15..442fb082227 100644
--- a/addons/hr_timesheet_sheet/i18n/ar.po
+++ b/addons/hr_timesheet_sheet/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -194,7 +194,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Difference"
-msgstr ""
+msgstr "مجموع الاختلافات"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
@@ -976,7 +976,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/bg.po b/addons/hr_timesheet_sheet/i18n/bg.po
index b5a40c7be4a..02800fd0aeb 100644
--- a/addons/hr_timesheet_sheet/i18n/bg.po
+++ b/addons/hr_timesheet_sheet/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/bs.po b/addons/hr_timesheet_sheet/i18n/bs.po
index 9ab1ea2e668..41ce1a8258a 100644
--- a/addons/hr_timesheet_sheet/i18n/bs.po
+++ b/addons/hr_timesheet_sheet/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ca.po b/addons/hr_timesheet_sheet/i18n/ca.po
index 4a2ec9ecfc2..b8f2052a7ac 100644
--- a/addons/hr_timesheet_sheet/i18n/ca.po
+++ b/addons/hr_timesheet_sheet/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -991,7 +991,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/cs.po b/addons/hr_timesheet_sheet/i18n/cs.po
index 77e0e1d0918..1809fe217ee 100644
--- a/addons/hr_timesheet_sheet/i18n/cs.po
+++ b/addons/hr_timesheet_sheet/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/da.po b/addons/hr_timesheet_sheet/i18n/da.po
index a9128aeb3bd..40c81319cc3 100644
--- a/addons/hr_timesheet_sheet/i18n/da.po
+++ b/addons/hr_timesheet_sheet/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -958,7 +958,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po
index ad380ee08a7..dd9a9d83d1f 100644
--- a/addons/hr_timesheet_sheet/i18n/de.po
+++ b/addons/hr_timesheet_sheet/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -1009,8 +1009,8 @@ msgstr "Sie können nicht an einem anderen Tag ein oder aus cheken"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
-msgstr "Bestätigen zur Überprüfung"
+msgid "Submit to Manager"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1368,3 +1368,6 @@ msgstr "Journal"
 #~ "* Periodendauer des Unternehmens (Tag, Woche, Monat, Jahr)\n"
 #~ "* Maximal akzeptierte Abweichung zwischen Anwesenheit und Arbeitszeit u.a.\n"
 #~ "    "
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Bestätigen zur Überprüfung"
diff --git a/addons/hr_timesheet_sheet/i18n/el.po b/addons/hr_timesheet_sheet/i18n/el.po
index 855400091c4..0f8d7e2a0c4 100644
--- a/addons/hr_timesheet_sheet/i18n/el.po
+++ b/addons/hr_timesheet_sheet/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -963,7 +963,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/es.po b/addons/hr_timesheet_sheet/i18n/es.po
index dd6d393686b..8cbb8f967af 100644
--- a/addons/hr_timesheet_sheet/i18n/es.po
+++ b/addons/hr_timesheet_sheet/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -990,7 +990,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/es_AR.po b/addons/hr_timesheet_sheet/i18n/es_AR.po
index ea033d95c80..1e12c9e9b1e 100644
--- a/addons/hr_timesheet_sheet/i18n/es_AR.po
+++ b/addons/hr_timesheet_sheet/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -959,7 +959,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/es_CR.po b/addons/hr_timesheet_sheet/i18n/es_CR.po
index 6e02e77d4f5..1f9284a5134 100644
--- a/addons/hr_timesheet_sheet/i18n/es_CR.po
+++ b/addons/hr_timesheet_sheet/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: hr_timesheet_sheet
@@ -1010,8 +1010,8 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
-msgstr "Propuesto al Director"
+msgid "Submit to Manager"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1363,3 +1363,6 @@ msgstr "Diario"
 #~ "* El tamaño del período (día, semana, mes, año)\n"
 #~ "* Diferencia máxima entre el parte de horas y de las visitas\n"
 #~ "    "
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Propuesto al Director"
diff --git a/addons/hr_timesheet_sheet/i18n/es_EC.po b/addons/hr_timesheet_sheet/i18n/es_EC.po
index fd79b6a6633..8cbafe7ee6a 100644
--- a/addons/hr_timesheet_sheet/i18n/es_EC.po
+++ b/addons/hr_timesheet_sheet/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -975,7 +975,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/et.po b/addons/hr_timesheet_sheet/i18n/et.po
index 639f7f5eb51..91da061965b 100644
--- a/addons/hr_timesheet_sheet/i18n/et.po
+++ b/addons/hr_timesheet_sheet/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/fi.po b/addons/hr_timesheet_sheet/i18n/fi.po
index ee12df9b7bc..7a59e9098d7 100644
--- a/addons/hr_timesheet_sheet/i18n/fi.po
+++ b/addons/hr_timesheet_sheet/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -978,8 +978,8 @@ msgstr "Et voi kirjautua sisään/ulos muulle kuin kuluvalle päivälle"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
-msgstr "Lähetetty esimiehelle"
+msgid "Submit to Manager"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1265,3 +1265,6 @@ msgstr "Loki"
 #, python-format
 #~ msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
 #~ msgstr "Ei voida poistaa tuntilistoja joilla on läsnäoloja syötettynä"
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Lähetetty esimiehelle"
diff --git a/addons/hr_timesheet_sheet/i18n/fr.po b/addons/hr_timesheet_sheet/i18n/fr.po
index c27efc425a1..95a292d880e 100644
--- a/addons/hr_timesheet_sheet/i18n/fr.po
+++ b/addons/hr_timesheet_sheet/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -1016,8 +1016,8 @@ msgstr "Vous ne pouvez pas pointer pour un autre jour qu'aujourd'hui"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
-msgstr "Soumettre au responsable"
+msgid "Submit to Manager"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1327,3 +1327,6 @@ msgstr "Journal"
 #~ "* Durée de la période (jour, semaine, mois, année)\n"
 #~ "* Différence maximale entre les feuilles de temps et les présences\n"
 #~ "    "
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Soumettre au responsable"
diff --git a/addons/hr_timesheet_sheet/i18n/hr.po b/addons/hr_timesheet_sheet/i18n/hr.po
index 5912cb2fd90..e685f2e8d10 100644
--- a/addons/hr_timesheet_sheet/i18n/hr.po
+++ b/addons/hr_timesheet_sheet/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
index ae27ef19b88..2bcddb74da5 100644
--- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
+++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
@@ -976,7 +976,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/hu.po b/addons/hr_timesheet_sheet/i18n/hu.po
index 9dbfa103757..918bbc43ef8 100644
--- a/addons/hr_timesheet_sheet/i18n/hu.po
+++ b/addons/hr_timesheet_sheet/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -127,7 +127,7 @@ msgstr "Munkaidő-kimutatás alapján"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by day of date"
-msgstr ""
+msgstr "Csoportosítás nap szerint"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
@@ -143,7 +143,7 @@ msgstr "Jóváhagyás"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Approved"
-msgstr ""
+msgstr "Jóváhagyott"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
@@ -220,7 +220,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Projekt /Gyűjtőkód"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -361,7 +361,7 @@ msgstr "Órák"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Csoportosítás hónap szerint"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.attendance:0
@@ -400,7 +400,7 @@ msgstr "Munka a feladaton"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Daily"
-msgstr ""
+msgstr "Napi"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,quantity:0
@@ -467,7 +467,7 @@ msgstr "Megnyitja az Ön aktuális munkaidő-kimutatását"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
 #, python-format
 msgid "You cannot duplicate a timesheet!"
-msgstr ""
+msgstr "Munkaidő kimutatást nem lehet duplikálni!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
@@ -493,6 +493,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product!"
 msgstr ""
+"Ahhoz, hogy munkaidő kimutatást lehessen létrehozni ennek a mukavállalónak, "
+"hozzá kell kapcsolni egy termékhez!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -502,7 +504,7 @@ msgstr "Bejelentkezés/Kijelentkezés"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Jóváhagyásra vár"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -528,7 +530,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Note"
-msgstr ""
+msgstr "Megjegyzés"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -694,7 +696,7 @@ msgstr "Vállalatok"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "Összegzés"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -706,7 +708,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Unvalidated Timesheets"
-msgstr ""
+msgstr "Nem jóváhagyott munkaidő-kimutatások"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
@@ -723,7 +725,7 @@ msgstr "Mennyiség"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
 #, python-format
 msgid "You cannot delete a timesheet which is already confirmed!"
-msgstr ""
+msgstr "Jóváhagyott munkaidő kimutatást nem lehet törölni!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
@@ -821,7 +823,7 @@ msgstr "Munkaidő-kimutatás megnyitása"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Csoportosítás év szerint"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
@@ -860,7 +862,7 @@ msgstr "Munkaidő-kimutatás keresése"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Confirmed Timesheets"
-msgstr ""
+msgstr "Jóváhagyott munkaidő kimutatások"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
@@ -914,7 +916,7 @@ msgstr "Feladattételeket mozgat a munkaidő-kimutatás sorba"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendances"
-msgstr ""
+msgstr "Összes jelenlét"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
@@ -992,7 +994,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/id.po b/addons/hr_timesheet_sheet/i18n/id.po
index 0f765996a13..fdec57698f0 100644
--- a/addons/hr_timesheet_sheet/i18n/id.po
+++ b/addons/hr_timesheet_sheet/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/it.po b/addons/hr_timesheet_sheet/i18n/it.po
index eef7d92772a..6759b6ec492 100644
--- a/addons/hr_timesheet_sheet/i18n/it.po
+++ b/addons/hr_timesheet_sheet/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -968,7 +968,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/ja.po b/addons/hr_timesheet_sheet/i18n/ja.po
index dfaa50f637f..d89a4fad922 100644
--- a/addons/hr_timesheet_sheet/i18n/ja.po
+++ b/addons/hr_timesheet_sheet/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -971,8 +971,8 @@ msgstr "今日とは別の日付でサインイン / サインアウトするこ
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
-msgstr "マネジャに提出済み"
+msgid "Submit to Manager"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1040,5 +1040,8 @@ msgstr "合計"
 msgid "Journal"
 msgstr "仕訳帳"
 
+#~ msgid "Submited to Manager"
+#~ msgstr "マネジャに提出済み"
+
 #~ msgid "My Timesheet"
 #~ msgstr "私の勤務表"
diff --git a/addons/hr_timesheet_sheet/i18n/ko.po b/addons/hr_timesheet_sheet/i18n/ko.po
index e0d802af7e7..7c2aa2fce4e 100644
--- a/addons/hr_timesheet_sheet/i18n/ko.po
+++ b/addons/hr_timesheet_sheet/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -958,7 +958,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/lt.po b/addons/hr_timesheet_sheet/i18n/lt.po
index c33b22207e1..a6f10db403c 100644
--- a/addons/hr_timesheet_sheet/i18n/lt.po
+++ b/addons/hr_timesheet_sheet/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/lv.po b/addons/hr_timesheet_sheet/i18n/lv.po
index 64e62650f3f..780ae89edb5 100644
--- a/addons/hr_timesheet_sheet/i18n/lv.po
+++ b/addons/hr_timesheet_sheet/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -958,7 +958,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/mk.po b/addons/hr_timesheet_sheet/i18n/mk.po
new file mode 100644
index 00000000000..c2311ff4c03
--- /dev/null
+++ b/addons/hr_timesheet_sheet/i18n/mk.po
@@ -0,0 +1,1031 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-10-22 12:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Macedonian <mk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: hr_timesheet_sheet
+#: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
+#: field:hr_timesheet_sheet.sheet.account,sheet_id:0
+#: field:hr_timesheet_sheet.sheet.day,sheet_id:0
+msgid "Sheet"
+msgstr "Лист"
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid "Service"
+msgstr "Сервис"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
+#, python-format
+msgid "No employee defined for your user !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
+#: view:timesheet.report:0
+msgid "Group By..."
+msgstr "Групирај По..."
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_attendance:0
+#: field:hr_timesheet_sheet.sheet,total_attendance_day:0
+msgid "Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,department_id:0 view:timesheet.report:0
+#: field:timesheet.report,department_id:0
+msgid "Department"
+msgstr "Сектор"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet in current year"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Task timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Today"
+msgstr "Денес"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
+#, python-format
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "March"
+msgstr "Март"
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,cost:0
+msgid "#Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet of last month"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,company_id:0
+#: field:hr_timesheet_sheet.sheet,company_id:0 view:timesheet.report:0
+#: field:timesheet.report,company_id:0
+msgid "Company"
+msgstr "Фирма"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_report
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_timesheet_report
+#: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
+#: view:timesheet.report:0
+msgid "Timesheet"
+msgstr "Работни Часови"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Set to Draft"
+msgstr "Сетирај на Драфт"
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_to:0 field:timesheet.report,date_to:0
+msgid "Date to"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Based on the timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by day of date"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
+msgid "Validate"
+msgstr "Потврди"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+msgid "Approved"
+msgstr "Одобрено"
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Present"
+msgstr "Присутен"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Total Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:263
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign the "
+"employee to an analytic journal!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
+msgid "Refuse"
+msgstr "Одбиј"
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:639
+#, python-format
+msgid ""
+"You cannot enter an attendance date outside the current timesheet dates!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
+msgid ""
+"My Timesheet opens your timesheet so that you can book your activities into "
+"the system. From the same form, you can register your attendances (Sign "
+"In/Out) and describe the working hours made on the different projects. At "
+"the end of the period defined in the company, the timesheet is confirmed by "
+"the user and can be validated by his manager. If required, as defined on the "
+"project, you can generate the invoices based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Total Difference"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "My Departments Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
+msgid "Timesheet by Day"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,name:0
+msgid "Project / Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
+msgid "Employee's timesheet entry"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,account_id:0
+#: view:timesheet.report:0 field:timesheet.report,account_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:timesheet.report,nbr:0
+msgid "#Nbr"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_from:0
+#: field:timesheet.report,date_from:0
+msgid "Date from"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0
+msgid " Month "
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_employee_2_hr_timesheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form
+#: view:res.company:0
+msgid "Timesheets"
+msgstr "Работни часови"
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.day,total_attendance:0
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
+#: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
+msgid "Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_draftconfirmtimesheet0
+msgid "Confirm"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,timesheet_ids:0
+msgid "Timesheet lines"
+msgstr "Редови на работни часови"
+
+#. module: hr_timesheet_sheet
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state:0 view:timesheet.report:0
+#: field:timesheet.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
+msgid "State is 'confirmed'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+#: selection:timesheet.report,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
+msgid "My Total Attendances By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:248
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:250
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:257
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:263
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:548
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:646
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,total:0
+msgid "Total Time"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
+msgid "Timesheet Lines"
+msgstr "Редови на работни часови"
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+msgid "Hours"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by month of date"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.attendance:0
+msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
+msgid "The project manager validates the timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
+msgid "Work on Task"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Daily"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,quantity:0
+msgid "#Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_timesheet:0
+#: field:hr_timesheet_sheet.sheet,total_timesheet_day:0
+#: view:hr_timesheet_sheet.sheet.day:0
+#: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
+msgid "Total Timesheet"
+msgstr "Вкупно работни часови"
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Available Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign In"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_timesheet:0
+msgid "#Total Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
+msgid "hr.timesheet.current.open"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Go to:"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:248
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must link the employee "
+"to a product, like 'Consultant'!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "It will open your current timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
+#, python-format
+msgid "You cannot duplicate a timesheet!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
+#: selection:res.company,timesheet_range:0 view:timesheet.report:0
+#: field:timesheet.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_diff:0
+msgid "#Total Diff"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "In Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must link the employee "
+"to a product!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "Sign in/out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state:0
+msgid "Waiting Approval"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "Billing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_timesheetdraft0
+msgid ""
+"The timesheet line represents the time spent by the employee on a specific "
+"service provided."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid "You must select a Current date which is in the timesheet dates !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,name:0
+msgid "Note"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+msgid ""
+"This report performs analysis on timesheets created by your human resources "
+"in the system. It allows you to have a full overview of  entries done by "
+"your employees. You can group them by specific selection criteria thanks to "
+"the search tool."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_max_difference:0
+msgid "Timesheet allowed difference(Hours)"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
+msgid "The invoice is created based on the timesheet."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "Draft Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:res.company,timesheet_range:0
+msgid "Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Approve"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Current Status"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:646
+#, python-format
+msgid "You cannot modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
+msgid "Timesheets by Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,user_id:0
+#: field:hr_timesheet_sheet.sheet,user_id:0 view:timesheet.report:0
+#: field:timesheet.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
+msgid "Timesheet by Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,date:0 field:hr_timesheet_sheet.sheet.day,name:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:res.company,timesheet_range:0
+msgid "Timesheet range"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:548
+#, python-format
+msgid "You can not modify an entry in a confirmed timesheet !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:board.board:0
+msgid "My Total Attendance By Week"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
+#, python-format
+msgid ""
+"You cannot have 2 timesheets that overlaps!\n"
+"You should use the menu 'My Timesheet' to avoid this problem."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
+msgid ""
+"Check your timesheets for a specific period. You can also encode time spent "
+"on a project (i.e. an analytic account) thus generating costs in the "
+"analytic account concerned."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:237
+#, python-format
+msgid ""
+"The timesheet cannot be validated as it does not contain an equal number of "
+"sign ins and sign outs!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
+msgid "The employee signs in and signs out."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Summary"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr_timesheet_sheet.sheet:0
+msgid ""
+"You cannot have 2 timesheets that overlaps !\n"
+"Please use the menu 'My Current Timesheet' to avoid this problem."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Unvalidated Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
+#, python-format
+msgid "You cannot delete a timesheet which have attendance entries!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,quantity:0
+msgid "Quantity"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
+#, python-format
+msgid "You cannot delete a timesheet which is already confirmed!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
+#: view:timesheet.report:0 field:timesheet.report,general_account_id:0
+msgid "General Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_range:0
+msgid "Periodicity on which you validate your timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Search Account"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:res.company,timesheet_max_difference:0
+msgid ""
+"Allowed difference in hours between the sign in/out and the timesheet "
+"computation for one sheet. Set this to 0 if you do not want any control."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Period"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,day:0
+#: selection:res.company,timesheet_range:0 view:timesheet.report:0
+#: field:timesheet.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_current_open
+#: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current
+msgid "My Current Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 selection:timesheet.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
+msgid "State is 'draft'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: constraint:hr.analytic.timesheet:0
+msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
+msgid "Invoice on Work"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Timesheet in current month"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Timesheet by Accounts"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
+#, python-format
+msgid "Open Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 view:timesheet.report:0
+msgid "Group by year of date"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
+msgid "State is 'validated'."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: help:hr_timesheet_sheet.sheet,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"timesheet.                 \n"
+"* The 'Confirmed' state is used for to confirm the timesheet by user.        "
+"         \n"
+"* The 'Done' state is used when users timesheet is accepted by his/her "
+"senior."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
+msgid "Timesheet Analysis"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Search Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Confirmed Timesheets"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
+msgid "Timesheet Line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,product_id:0
+#: view:timesheet.report:0 field:timesheet.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+#: field:hr_timesheet_sheet.sheet,attendances_ids:0
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance
+msgid "Attendances"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,name:0 field:timesheet.report,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "The employee periodically confirms his own timesheets."
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
+msgid "Defines the work summary of task"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Sign Out"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
+msgid "Moves task entry into the timesheet line"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.day:0
+msgid "Total Attendances"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
+#: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
+msgid "Timesheet Sheet Analysis"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,total_difference:0
+#: field:hr_timesheet_sheet.sheet,total_difference_day:0
+#: field:hr_timesheet_sheet.sheet.day,total_difference:0
+msgid "Difference"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr_timesheet_sheet.sheet,state_attendance:0
+msgid "Absent"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Employees"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
+msgid "Information of time spent on a service"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
+msgid "Confirmation"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
+msgid "Invoice rate"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:639
+#, python-format
+msgid "UserError"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:250
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign the "
+"employee to an analytic journal, like 'Timesheet'!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
+#, python-format
+msgid "You cannot sign in/sign out from an other date than today"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "Submit to Manager"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,account_ids:0
+msgid "Analytic accounts"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,to_invoice:0
+msgid "Type of Invoicing"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
+#: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:257
+#, python-format
+msgid ""
+"In order to create a timesheet for this employee, you must assign it to a "
+"user!"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:timesheet.report:0 field:timesheet.report,total_attendance:0
+msgid "#Total Attendance"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,cost:0
+msgid "Cost"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr_timesheet_sheet.sheet,date_current:0
+#: field:timesheet.report,date_current:0
+msgid "Current date"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
+msgid "Hr Timesheet"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.report:0 field:hr.timesheet.report,year:0
+#: view:timesheet.report:0 field:timesheet.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr.timesheet.current.open:0 selection:hr_timesheet_sheet.sheet,state:0
+msgid "Open"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet:0
+msgid "To Approve"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: view:hr_timesheet_sheet.sheet.account:0
+msgid "Total"
+msgstr ""
+
+#. module: hr_timesheet_sheet
+#: field:hr.timesheet.report,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#~ msgid "My Timesheet"
+#~ msgstr "Мои работни часови"
diff --git a/addons/hr_timesheet_sheet/i18n/mn.po b/addons/hr_timesheet_sheet/i18n/mn.po
index 72486013404..6c55a6c6951 100644
--- a/addons/hr_timesheet_sheet/i18n/mn.po
+++ b/addons/hr_timesheet_sheet/i18n/mn.po
@@ -27,8 +27,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -1009,8 +1009,8 @@ msgstr "Өнөөдрөөс өөр өдөрт нэвтрэх/гарах үйлд
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
-msgstr "Менежерт илгээгдсэн"
+msgid "Submit to Manager"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1062,7 +1062,7 @@ msgstr "Он"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0 selection:hr_timesheet_sheet.sheet,state:0
 msgid "Open"
-msgstr "Нээлттэй"
+msgstr "Нээх"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -1305,3 +1305,6 @@ msgstr "Журнал"
 #, python-format
 #~ msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
 #~ msgstr "Ирцийн бичлэгүүд бүртгэгдсэн цаг бүртгэлийг устгаж болохгүй !"
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Менежерт илгээгдсэн"
diff --git a/addons/hr_timesheet_sheet/i18n/nl.po b/addons/hr_timesheet_sheet/i18n/nl.po
index fc62efe88f0..ad632dfad12 100644
--- a/addons/hr_timesheet_sheet/i18n/nl.po
+++ b/addons/hr_timesheet_sheet/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-20 09:55+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"PO-Revision-Date: 2012-11-02 10:13+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:04+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -1007,8 +1007,8 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
-msgstr "Verzonden naar de manager"
+msgid "Submit to Manager"
+msgstr "Aanbieden aan manager"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1350,3 +1350,6 @@ msgstr "Dagboek"
 #~ "* periode grootte (dag, week, maand, jaar)\n"
 #~ "* maximaal verschil tussen urenstaat en aanwezigheid\n"
 #~ "    "
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Verstuur naar manager"
diff --git a/addons/hr_timesheet_sheet/i18n/nl_BE.po b/addons/hr_timesheet_sheet/i18n/nl_BE.po
index 9b4964af93a..bc100d47ef5 100644
--- a/addons/hr_timesheet_sheet/i18n/nl_BE.po
+++ b/addons/hr_timesheet_sheet/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/pl.po b/addons/hr_timesheet_sheet/i18n/pl.po
index ba34750d3cc..ff393735711 100644
--- a/addons/hr_timesheet_sheet/i18n/pl.po
+++ b/addons/hr_timesheet_sheet/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -228,7 +228,7 @@ msgstr "Ostrzeżenie !"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr ""
+msgstr "Zapis pracownika w karcie"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,account_id:0
@@ -314,7 +314,7 @@ msgstr "Nowe"
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
 msgid "My Total Attendances By Week"
-msgstr ""
+msgstr "Moje obecności w tygodniach"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
@@ -372,7 +372,7 @@ msgstr "Niedozwolona akcja !"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr ""
+msgstr "Manedżer projektu zatwierdza projekt"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
@@ -410,7 +410,7 @@ msgstr "Suma karty czasu pracy"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Available Attendance"
-msgstr ""
+msgstr "Znane obecności"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -449,6 +449,8 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product, like 'Consultant'!"
 msgstr ""
+"Do utworzenia karty dla pracownika musisz w Pracowniku wybrać produkt jak "
+"np. 'Konsultant'!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -476,7 +478,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "In Draft"
-msgstr ""
+msgstr "Projekt"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
@@ -485,11 +487,13 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product!"
 msgstr ""
+"Do utworzenia karty dla pracownika musisz w Pracowniku wybrać produkt jak "
+"np. 'Konsultant'!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Sign in/out"
-msgstr ""
+msgstr "Wejście/Wyjście"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
@@ -604,23 +608,23 @@ msgstr "Data"
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Listopad"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Rozszerzone filtry..."
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timesheet range"
-msgstr ""
+msgstr "Zakres kart"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:548
 #, python-format
 msgid "You can not modify an entry in a confirmed timesheet !"
-msgstr ""
+msgstr "Nie możesz modyfikować wpisów w potwierdzonych kartach"
 
 #. module: hr_timesheet_sheet
 #: view:board.board:0
@@ -638,7 +642,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Październik"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
@@ -659,7 +663,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Styczeń"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
@@ -669,12 +673,12 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Firmy"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "Podsumowanie"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -697,7 +701,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
 msgid "Quantity"
-msgstr ""
+msgstr "Ilość"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
@@ -709,7 +713,7 @@ msgstr ""
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
 #: view:timesheet.report:0 field:timesheet.report,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Konto ogólne"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_range:0
@@ -757,22 +761,23 @@ msgstr "Wykonano"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "State is 'draft'."
-msgstr ""
+msgstr "Stan jest 'Projekt'."
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
 msgstr ""
+"Nie możesz zmieniać zapisów w potwierdzonej/wykonanej karcie czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "Anulowanie"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated"
-msgstr ""
+msgstr "Zatwierdzone"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
@@ -821,7 +826,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
 msgid "Timesheet Analysis"
-msgstr ""
+msgstr "Analiza czasu pracy"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -842,7 +847,7 @@ msgstr "Pozycja karty czasu pracy"
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,product_id:0
 #: view:timesheet.report:0 field:timesheet.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produkt"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -864,7 +869,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
@@ -907,17 +912,17 @@ msgstr "Nieobecny(a)"
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Luty"
 
 #. module: hr_timesheet_sheet
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Nazwa firmy musi być unikalna !"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr ""
+msgstr "Pracownicy"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
@@ -927,12 +932,12 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Kwiecień"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirmation"
-msgstr ""
+msgstr "Potwierdzenie"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
@@ -944,7 +949,7 @@ msgstr "Współczynnik fakturowania"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:639
 #, python-format
 msgid "UserError"
-msgstr ""
+msgstr "Błąd Użytkownika"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:250
@@ -962,7 +967,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
@@ -992,7 +997,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Koszt"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
@@ -1014,12 +1019,12 @@ msgstr "Rok"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0 selection:hr_timesheet_sheet.sheet,state:0
 msgid "Open"
-msgstr ""
+msgstr "Otwarte"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "To Approve"
-msgstr ""
+msgstr "Do aprobaty"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -1029,7 +1034,7 @@ msgstr "Suma"
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dziennik"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
@@ -1213,3 +1218,6 @@ msgstr ""
 #~ msgstr ""
 #~ "Dozwolone różnice między wejściami/wyśjciami a wyliczeniami karty czasu "
 #~ "pracy dla jednej karty. Ustaw 0, jeśli nie chcesz żadnej kontroli."
+
+#~ msgid "My Timesheet"
+#~ msgstr "Moja karta czasu pracy"
diff --git a/addons/hr_timesheet_sheet/i18n/pt.po b/addons/hr_timesheet_sheet/i18n/pt.po
index 6fb87a90670..ce6aac27d1d 100644
--- a/addons/hr_timesheet_sheet/i18n/pt.po
+++ b/addons/hr_timesheet_sheet/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -1002,8 +1002,8 @@ msgstr "Não pode signin / signout duma data diferente da de hoje"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
-msgstr "Submetido ao Gestor"
+msgid "Submit to Manager"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1350,3 +1350,6 @@ msgstr "Diário"
 #, python-format
 #~ msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
 #~ msgstr "?!?!?!?!?!?!?!?!?!?Não é possível eliminar Folha(s) que têm  !"
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Submetido ao Gestor"
diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po
index a95e675b8ed..839fffcaf6a 100644
--- a/addons/hr_timesheet_sheet/i18n/pt_BR.po
+++ b/addons/hr_timesheet_sheet/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -192,6 +192,13 @@ msgid ""
 "the user and can be validated by his manager. If required, as defined on the "
 "project, you can generate the invoices based on the timesheet."
 msgstr ""
+"Minha folha de horas abre seu quadro de horários de modo que você pode "
+"reservar suas atividades no sistema. Da mesma forma, você pode registrar "
+"seus atendimentos (Registrar Entrada / Saída) e descrever as horas de "
+"trabalho feitas em diferentes projetos. No final do período de tempo "
+"definido na empresa, a folha de horas é confirmada pelo usuário e pode ser "
+"validado pelo seu gerente. Se necessário, conforme definido no projeto, você "
+"pode gerar as faturas com base na folha de horas."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
@@ -243,7 +250,7 @@ msgstr "Conta Analítica"
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
 msgid "#Nbr"
-msgstr ""
+msgstr "#Nbr"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
@@ -847,6 +854,11 @@ msgid ""
 "* The 'Done' state is used when users timesheet is accepted by his/her "
 "senior."
 msgstr ""
+" * 'Provisório' é usado quando um usuário está cadastrando uma folha de "
+"horas nova e sem confirmação\n"
+"* 'Confirmado' é usado para confirmar a folha de horas por usuário.\n"
+"* 'Concluído' é usado quando a folha de horas do usuário é aceita por seu "
+"superior."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -996,8 +1008,8 @@ msgstr "Você não pode entrar/sair a partir de outra data que não hoje"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
-msgstr "Enviar ao Gerente"
+msgid "Submit to Manager"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1017,11 +1029,13 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign it to a "
 "user!"
 msgstr ""
+"Para criar uma folha de horas para este funcionário, você precisa associar a "
+"um usuário!"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_attendance:0
 msgid "#Total Attendance"
-msgstr ""
+msgstr "#Presenças Totais"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
@@ -1037,7 +1051,7 @@ msgstr "Data atual"
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet"
-msgstr ""
+msgstr "Folha de Horas de RH"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,year:0
@@ -1048,12 +1062,12 @@ msgstr "Ano"
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0 selection:hr_timesheet_sheet.sheet,state:0
 msgid "Open"
-msgstr ""
+msgstr "Aberto"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "To Approve"
-msgstr ""
+msgstr "Para Aprovar"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
@@ -1063,7 +1077,7 @@ msgstr "Total"
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Diário"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
@@ -1104,3 +1118,6 @@ msgstr ""
 
 #~ msgid "My Timesheet"
 #~ msgstr "Minha Planilha de Horas"
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Enviar ao Gerente"
diff --git a/addons/hr_timesheet_sheet/i18n/ro.po b/addons/hr_timesheet_sheet/i18n/ro.po
index 4705e13b242..6403ad99096 100644
--- a/addons/hr_timesheet_sheet/i18n/ro.po
+++ b/addons/hr_timesheet_sheet/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -1009,8 +1009,8 @@ msgstr "Nu puteti semna de intrare / iesire cu o alta data decat cea de azi"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
-msgstr "Inmanat Managerului"
+msgid "Submit to Manager"
+msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
@@ -1181,3 +1181,6 @@ msgstr "Jurnal"
 
 #~ msgid "My Timesheet"
 #~ msgstr "Fisa mea de pontaj"
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Inmanat Managerului"
diff --git a/addons/hr_timesheet_sheet/i18n/ru.po b/addons/hr_timesheet_sheet/i18n/ru.po
index e9e42a2a018..bf6bfa3d0ff 100644
--- a/addons/hr_timesheet_sheet/i18n/ru.po
+++ b/addons/hr_timesheet_sheet/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -972,7 +972,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/sl.po b/addons/hr_timesheet_sheet/i18n/sl.po
index c98b1afd25a..ba098f74eab 100644
--- a/addons/hr_timesheet_sheet/i18n/sl.po
+++ b/addons/hr_timesheet_sheet/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/sq.po b/addons/hr_timesheet_sheet/i18n/sq.po
index 3a452cf0673..5c39fd8f682 100644
--- a/addons/hr_timesheet_sheet/i18n/sq.po
+++ b/addons/hr_timesheet_sheet/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:49+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -958,7 +958,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/sv.po b/addons/hr_timesheet_sheet/i18n/sv.po
index 6fa17b7569b..b5cf1623ffc 100644
--- a/addons/hr_timesheet_sheet/i18n/sv.po
+++ b/addons/hr_timesheet_sheet/i18n/sv.po
@@ -13,15 +13,15 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
 #: field:hr_timesheet_sheet.sheet.account,sheet_id:0
 #: field:hr_timesheet_sheet.sheet.day,sheet_id:0
 msgid "Sheet"
-msgstr "Sheet"
+msgstr "Rapport"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_timesheetdraft0
@@ -32,7 +32,7 @@ msgstr "Tjänst"
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "No employee defined for your user !"
-msgstr "No employee defined for your user !"
+msgstr "Ingen anställd som definierats för ditt användarnamn!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:hr_timesheet_sheet.sheet:0
@@ -44,7 +44,7 @@ msgstr "Gruppera på..."
 #: field:hr_timesheet_sheet.sheet,total_attendance:0
 #: field:hr_timesheet_sheet.sheet,total_attendance_day:0
 msgid "Total Attendance"
-msgstr "Total Attendance"
+msgstr "Total Närvaro"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -61,7 +61,7 @@ msgstr "Årets tidrapporter"
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Task timesheet"
-msgstr ""
+msgstr "Uppgift tidrapport"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -80,7 +80,7 @@ msgstr ""
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "March"
-msgstr "mars"
+msgstr "Mars"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,cost:0
@@ -107,22 +107,22 @@ msgstr "Bolag"
 #: model:process.node,name:hr_timesheet_sheet.process_node_timesheet0
 #: view:timesheet.report:0
 msgid "Timesheet"
-msgstr "Timesheet"
+msgstr "Tidrapport"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Set to Draft"
-msgstr "Set to Draft"
+msgstr "Satt till utkast"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_to:0 field:timesheet.report,date_to:0
 msgid "Date to"
-msgstr "Date to"
+msgstr "Datum till"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Based on the timesheet"
-msgstr ""
+msgstr "Baserat på tidrapporten"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
@@ -133,7 +133,7 @@ msgstr "Gruppera på dagen i datumet"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:615
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet!"
-msgstr ""
+msgstr "Du kan inte ändra en post i en Bekräftad tidrapport!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_validatetimesheet0
@@ -148,7 +148,7 @@ msgstr "Godkänd"
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Present"
-msgstr "Present"
+msgstr "Närvarande"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
@@ -162,12 +162,14 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal!"
 msgstr ""
+"För att skapa en tidrapport för den anställde måste du koppla den anställde "
+"till en analytisk journal!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_refusetimesheet0
 msgid "Refuse"
-msgstr "Refuse"
+msgstr "Avslå"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
@@ -176,6 +178,7 @@ msgstr "Refuse"
 msgid ""
 "You cannot enter an attendance date outside the current timesheet dates!"
 msgstr ""
+"Du kan inte ange ett närvaro datum utanför nuvarande tidrapport datum!"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_current_open
@@ -187,11 +190,17 @@ msgid ""
 "the user and can be validated by his manager. If required, as defined on the "
 "project, you can generate the invoices based on the timesheet."
 msgstr ""
+"Min tidrapport öppnar din tidrapport så att du kan boka aktiviteter i "
+"systemet. Från samma formulär kan du registrera dina närvaro (Logga in / ut) "
+"och beskriva den arbetstid som gjorts på de olika projekten. Vid slutet av "
+"perioden som anges i företaget, är tidrapporten bekräftas av användaren och "
+"kan valideras av sin chef. Om det behövs, enligt definitionen i projektet, "
+"kan du skapa fakturor baserade på tidrapporten."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Difference"
-msgstr "Total Difference"
+msgstr "Totalt Skillnad"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
@@ -201,17 +210,17 @@ msgstr " Månad-1 "
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "My Departments Timesheet"
-msgstr ""
+msgstr "Mina avdelningstidrapporter"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_day
 msgid "Timesheet by Day"
-msgstr "Timesheet by Day"
+msgstr "Tidrapport för dag"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,name:0
 msgid "Project / Analytic Account"
-msgstr ""
+msgstr "Projekt / Analytisk konto"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_validatetimesheet0
@@ -222,29 +231,29 @@ msgstr "Granskning"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:274
 #, python-format
 msgid "Warning !"
-msgstr "Warning !"
+msgstr "Varning !"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_attendance0
 msgid "Employee's timesheet entry"
-msgstr ""
+msgstr "Arbetstagarens tidrapport start"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,account_id:0
 #: view:timesheet.report:0 field:timesheet.report,account_id:0
 msgid "Analytic Account"
-msgstr "Analytic Account"
+msgstr "Analytiskt Konto"
 
 #. module: hr_timesheet_sheet
 #: field:timesheet.report,nbr:0
 msgid "#Nbr"
-msgstr ""
+msgstr "Antal"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_from:0
 #: field:timesheet.report,date_from:0
 msgid "Date from"
-msgstr "Date from"
+msgstr "Datum från"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0
@@ -264,24 +273,24 @@ msgstr "Tidrapporter"
 #: model:process.node,name:hr_timesheet_sheet.process_node_confirmedtimesheet0
 #: view:timesheet.report:0 selection:timesheet.report,state:0
 msgid "Confirmed"
-msgstr "Confirmed"
+msgstr "Bekräftad"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.day,total_attendance:0
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_attendance
 #: model:process.node,name:hr_timesheet_sheet.process_node_attendance0
 msgid "Attendance"
-msgstr "Attendance"
+msgstr "Närvaro"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_draftconfirmtimesheet0
 msgid "Confirm"
-msgstr "Confirm"
+msgstr "Bekräfta"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,timesheet_ids:0
 msgid "Timesheet lines"
-msgstr "Timesheet lines"
+msgstr "Tidrapportrader"
 
 #. module: hr_timesheet_sheet
 #: constraint:res.company:0
@@ -297,7 +306,7 @@ msgstr "Status"
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_confirmedtimesheet0
 msgid "State is 'confirmed'."
-msgstr ""
+msgstr "Status är 'Bekräftad'."
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,employee_id:0
@@ -308,12 +317,12 @@ msgstr "Anställd"
 #: selection:hr_timesheet_sheet.sheet,state:0
 #: selection:timesheet.report,state:0
 msgid "New"
-msgstr "New"
+msgstr "Ny"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_week_attendance_graph
 msgid "My Total Attendances By Week"
-msgstr ""
+msgstr "Min totala närvaro per vecka"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
@@ -331,23 +340,23 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:38
 #, python-format
 msgid "Error !"
-msgstr "Error !"
+msgstr "Fel !"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,total:0
 msgid "Total Time"
-msgstr "Total Time"
+msgstr "Total Tid"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet
 msgid "Timesheet Lines"
-msgstr "Timesheet Lines"
+msgstr "Tidrapportrader"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 msgid "Hours"
-msgstr "timmar"
+msgstr "Timmar"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
@@ -365,17 +374,17 @@ msgstr ""
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
 #, python-format
 msgid "Invalid action !"
-msgstr "Invalid action !"
+msgstr "Ogiltig åtgärd !"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_validatetimesheet0
 msgid "The project manager validates the timesheets."
-msgstr ""
+msgstr "Projektledaren validerar tidrapporter."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "July"
-msgstr "juli"
+msgstr "Juli"
 
 #. module: hr_timesheet_sheet
 #: view:res.company:0
@@ -385,7 +394,7 @@ msgstr "Konfiguration"
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_workontask0
 msgid "Work on Task"
-msgstr ""
+msgstr "Arbeta från uppgift"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -395,7 +404,7 @@ msgstr "Daglig"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,quantity:0
 msgid "#Quantity"
-msgstr ""
+msgstr "Antal"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,total_timesheet:0
@@ -403,22 +412,22 @@ msgstr ""
 #: view:hr_timesheet_sheet.sheet.day:0
 #: field:hr_timesheet_sheet.sheet.day,total_timesheet:0
 msgid "Total Timesheet"
-msgstr "Total Timesheet"
+msgstr "Total Tidrapport"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Available Attendance"
-msgstr ""
+msgstr "Tillgänglig Närvaro"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign In"
-msgstr "Sign In"
+msgstr "Logga in"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_timesheet:0
 msgid "#Total Timesheet"
-msgstr ""
+msgstr "# Totalt Tidrapport"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_current_open
@@ -428,17 +437,17 @@ msgstr "hr.timesheet.current.open"
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Go to:"
-msgstr "Go to:"
+msgstr "Gå till:"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "September"
-msgstr "september"
+msgstr "September"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "December"
-msgstr "december"
+msgstr "December"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:248
@@ -447,17 +456,19 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product, like 'Consultant'!"
 msgstr ""
+"För att skapa en tidrapport för den anställde måste du länka den anställde "
+"till en produkt, som t.ex 'konsult'!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "It will open your current timesheet"
-msgstr ""
+msgstr "Det kommer att öppna din nuvarande tidrapport"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:241
 #, python-format
 msgid "You cannot duplicate a timesheet!"
-msgstr ""
+msgstr "Du kan inte kopiera en tidrapport!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,month:0
@@ -469,12 +480,12 @@ msgstr "Månad"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_diff:0
 msgid "#Total Diff"
-msgstr ""
+msgstr "# Total Diff"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "In Draft"
-msgstr ""
+msgstr "Som utkast"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:261
@@ -483,16 +494,18 @@ msgid ""
 "In order to create a timesheet for this employee, you must link the employee "
 "to a product!"
 msgstr ""
+"För att skapa en tidrapport för den anställde måste du länka den anställde "
+"till en produkt!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "Sign in/out"
-msgstr ""
+msgstr "Logga in / ut"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "Väntar på godkännande"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_invoiceontimesheet0
@@ -505,16 +518,18 @@ msgid ""
 "The timesheet line represents the time spent by the employee on a specific "
 "service provided."
 msgstr ""
+"Tidrapportenraden representerar den tid som den anställde lagt ner på "
+"specifik tjänst."
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
 msgid "You must select a Current date which is in the timesheet dates !"
-msgstr ""
+msgstr "Du måste välja en aktuell datum som finns i tidrapporten!"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,name:0
 msgid "Note"
-msgstr ""
+msgstr "Anteckning"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
@@ -524,36 +539,40 @@ msgid ""
 "your employees. You can group them by specific selection criteria thanks to "
 "the search tool."
 msgstr ""
+"Rapporten utför analys av tidrapporter som skapats av din personal i "
+"systemet. Det låter dig ha full överblick över poster som görs av dina "
+"anställda. Du kan gruppera dem genom specifika urvalskriterier tack vare "
+"sökverktyget."
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
 msgid "Draft"
-msgstr "Draft"
+msgstr "Utkast"
 
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_max_difference:0
 msgid "Timesheet allowed difference(Hours)"
-msgstr ""
+msgstr "Tidrapport tillåten skillnad (timmar)"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_invoiceontimesheet0
 msgid "The invoice is created based on the timesheet."
-msgstr ""
+msgstr "Fakturan skapas utifrån tidrapporten."
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "Draft Timesheet"
-msgstr ""
+msgstr "Utkast av Tidrapport"
 
 #. module: hr_timesheet_sheet
 #: selection:res.company,timesheet_range:0
 msgid "Week"
-msgstr "Week"
+msgstr "Vecka"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Augusti"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
@@ -563,24 +582,24 @@ msgstr "Godkänn"
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "June"
-msgstr "juni"
+msgstr "Juni"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Current Status"
-msgstr "Current Status"
+msgstr "Nuvarande Status"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:646
 #, python-format
 msgid "You cannot modify an entry in a confirmed timesheet !"
-msgstr "You cannot modify an entry in a confirmed timesheet !"
+msgstr "Du kan inte ändra en post i en bekräftad tidrapport!"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_account
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_timesheet_sheet_sheet_day
 msgid "Timesheets by Period"
-msgstr ""
+msgstr "Tidrapporter efter period"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,user_id:0
@@ -592,17 +611,17 @@ msgstr "Användare"
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_by_account
 msgid "Timesheet by Account"
-msgstr "Timesheet by Account"
+msgstr "Tidrapport per Konto"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,date:0 field:hr_timesheet_sheet.sheet.day,name:0
 msgid "Date"
-msgstr "Date"
+msgstr "Datum"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "November"
-msgstr "november"
+msgstr "November"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
@@ -612,18 +631,18 @@ msgstr "Utökade filter..."
 #. module: hr_timesheet_sheet
 #: field:res.company,timesheet_range:0
 msgid "Timesheet range"
-msgstr ""
+msgstr "Tidrapport område"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:548
 #, python-format
 msgid "You can not modify an entry in a confirmed timesheet !"
-msgstr "You can not modify an entry in a confirmed timesheet !"
+msgstr "Du kan inte ändra en post i en bekräftad tidrapport!"
 
 #. module: hr_timesheet_sheet
 #: view:board.board:0
 msgid "My Total Attendance By Week"
-msgstr ""
+msgstr "Min totala närvaro per vecka"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:259
@@ -632,11 +651,13 @@ msgid ""
 "You cannot have 2 timesheets that overlaps!\n"
 "You should use the menu 'My Timesheet' to avoid this problem."
 msgstr ""
+"Du kan inte ha 2 tidrapporter som överlappar!\n"
+"Du bör använda menyn 'Min tidrapport' för att undvika detta problem."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "October"
-msgstr "oktober"
+msgstr "Oktober"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,help:hr_timesheet_sheet.act_hr_timesheet_sheet_form
@@ -645,6 +666,9 @@ msgid ""
 "on a project (i.e. an analytic account) thus generating costs in the "
 "analytic account concerned."
 msgstr ""
+"Kontrollera dina tidrapporter för en viss period. Du kan också koda tid på "
+"ett projekt (dvs. ett analytiskt konto) vilket genererar kostnader i "
+"analytiska kontot i fråga."
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:237
@@ -653,26 +677,28 @@ msgid ""
 "The timesheet cannot be validated as it does not contain an equal number of "
 "sign ins and sign outs!"
 msgstr ""
+"Tidrapporten kan inte valideras, eftersom den inte innehåller lika många "
+"inloggningar och utloggningar."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "January"
-msgstr "januari"
+msgstr "Januari"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_attendancetimesheet0
 msgid "The employee signs in and signs out."
-msgstr ""
+msgstr "De anställdas inloggningar och utloggningar."
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_res_company
 msgid "Companies"
-msgstr "Bolag"
+msgstr "Företag"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammanfattning"
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
@@ -680,17 +706,19 @@ msgid ""
 "You cannot have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
+"Du kan inte ha 2 tidrapporter som överlappar! \n"
+"Var god använd menyn 'Min aktuella Tidrapport' för att undvika detta problem."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Unvalidated Timesheets"
-msgstr "Unvalidated Timesheets"
+msgstr "Icke validerade Tidrapporter"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:457
 #, python-format
 msgid "You cannot delete a timesheet which have attendance entries!"
-msgstr ""
+msgstr "Du kan inte ta bort en tidrapport som har närvaro poster!"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,quantity:0
@@ -701,7 +729,7 @@ msgstr "Antal"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:455
 #, python-format
 msgid "You cannot delete a timesheet which is already confirmed!"
-msgstr ""
+msgstr "Du kan inte ta bort en tidrapport som redan bekräftasts!"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,general_account_id:0
@@ -712,12 +740,12 @@ msgstr "Huvudkonton"
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_range:0
 msgid "Periodicity on which you validate your timesheets."
-msgstr ""
+msgstr "Periodicitet som du validerar dina tidrapporter."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Search Account"
-msgstr ""
+msgstr "Sök Konto"
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
@@ -725,6 +753,8 @@ msgid ""
 "Allowed difference in hours between the sign in/out and the timesheet "
 "computation for one sheet. Set this to 0 if you do not want any control."
 msgstr ""
+"Tillåten skillnad i timmar mellan Logga in / ut och tidrapportberäkning för "
+"en tidrapport. Ställ den här till 0 om du inte vill ha någon kontroll."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0
@@ -737,7 +767,7 @@ msgstr "Period"
 #: selection:res.company,timesheet_range:0 view:timesheet.report:0
 #: field:timesheet.report,day:0
 msgid "Day"
-msgstr "Day"
+msgstr "Dag"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
@@ -750,58 +780,58 @@ msgstr "My Current Timesheet"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 selection:timesheet.report,state:0
 msgid "Done"
-msgstr "Done"
+msgstr "Klar"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_drafttimesheetsheet0
 msgid "State is 'draft'."
-msgstr ""
+msgstr "Statusen är 'utkast'."
 
 #. module: hr_timesheet_sheet
 #: constraint:hr.analytic.timesheet:0
 msgid "You cannot modify an entry in a Confirmed/Done timesheet !."
-msgstr ""
+msgstr "Du kan inte ändra en post i en Bekräftad / Klar tidrapport!."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "Validated"
-msgstr ""
+msgstr "Validerad"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,name:hr_timesheet_sheet.process_node_invoiceonwork0
 msgid "Invoice on Work"
-msgstr "Invoice on Work"
+msgstr "Fakturera mot arbete"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Timesheet in current month"
-msgstr ""
+msgstr "Tidrapport i innevarande månad"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Timesheet by Accounts"
-msgstr "Timesheet by Accounts"
+msgstr "Tidrapport per konton"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py:51
 #, python-format
 msgid "Open Timesheet"
-msgstr ""
+msgstr "Öppna Tidrapport"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 view:timesheet.report:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Gruppera efter år"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_validatedtimesheet0
 msgid "State is 'validated'."
-msgstr ""
+msgstr "Status 'validerad'."
 
 #. module: hr_timesheet_sheet
 #: help:hr_timesheet_sheet.sheet,state:0
@@ -813,136 +843,142 @@ msgid ""
 "* The 'Done' state is used when users timesheet is accepted by his/her "
 "senior."
 msgstr ""
+" * Tillståndet 'Utkast' används när en användare skapar en ny och obekräftad "
+"tidrapport.\n"
+" * Tillståndet 'Bekräftad' används för att bekräfta tidrapporten för "
+"användaren.\n"
+" * Tillståndet 'Klar' används när användarens tidrapport accepterats av hans "
+"eller hennes chef."
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_hr_timesheet_report_stat_all
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_hr_timesheet_report_all
 msgid "Timesheet Analysis"
-msgstr ""
+msgstr "Tidrapport analys"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Search Timesheet"
-msgstr ""
+msgstr "Sök Tidrapport"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Confirmed Timesheets"
-msgstr ""
+msgstr "Bekräftade Tidrapporter"
 
 #. module: hr_timesheet_sheet
 #: model:ir.model,name:hr_timesheet_sheet.model_hr_analytic_timesheet
 msgid "Timesheet Line"
-msgstr "Timesheet Line"
+msgstr "Tidrapportrader"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,product_id:0
 #: view:timesheet.report:0 field:timesheet.report,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Produkt"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 #: field:hr_timesheet_sheet.sheet,attendances_ids:0
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.act_hr_timesheet_sheet_sheet_2_hr_attendance
 msgid "Attendances"
-msgstr "Attendances"
+msgstr "Närvaro"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,name:0 field:timesheet.report,name:0
 msgid "Description"
-msgstr "Description"
+msgstr "Beskrivnig"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "The employee periodically confirms his own timesheets."
-msgstr ""
+msgstr "Den anställde bekräftar periodvis sina egna tidrapporter."
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_workontask0
 msgid "Defines the work summary of task"
-msgstr ""
+msgstr "Definierar arbetssammanfattningen av uppgiften"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Sign Out"
-msgstr "Sign Out"
+msgstr "Logga ut"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_tasktimesheet0
 msgid "Moves task entry into the timesheet line"
-msgstr ""
+msgstr "Flyttar uppgiftrad till tidrapportrad"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Total Attendances"
-msgstr ""
+msgstr "Totalt närvaro"
 
 #. module: hr_timesheet_sheet
 #: model:ir.actions.act_window,name:hr_timesheet_sheet.action_timesheet_report_stat_all
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_timesheet_report_all
 msgid "Timesheet Sheet Analysis"
-msgstr ""
+msgstr "Tidrapport Rapportanalys"
 
 #. 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 "Difference"
+msgstr "Skillnad"
 
 #. module: hr_timesheet_sheet
 #: selection:hr_timesheet_sheet.sheet,state_attendance:0
 msgid "Absent"
-msgstr "Absent"
+msgstr "Frånvarande"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: hr_timesheet_sheet
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Företagsnamnet måste vara unikt!"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "Employees"
-msgstr ""
+msgstr "Anställda:"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_timesheet0
 msgid "Information of time spent on a service"
-msgstr ""
+msgstr "Information om tid spenderat på en tjänst"
 
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,name:hr_timesheet_sheet.process_transition_confirmtimesheet0
 msgid "Confirmation"
-msgstr ""
+msgstr "Bekräftelse"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet.account,invoice_rate:0
 msgid "Invoice rate"
-msgstr "Invoice rate"
+msgstr "Fakturakostnad"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:619
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:639
 #, python-format
 msgid "UserError"
-msgstr "UserError"
+msgstr "Användarfel"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:250
@@ -951,27 +987,29 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign the "
 "employee to an analytic journal, like 'Timesheet'!"
 msgstr ""
+"För att skapa en tidrapport för den anställde måste du tilldela den "
+"anställde till en analytisk journal, som 'Tidrapport'!"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:318
 #, python-format
 msgid "You cannot sign in/sign out from an other date than today"
-msgstr ""
+msgstr "Du kan inte logga in / logga ut från en annan tidpunkt än i dag"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,account_ids:0
 msgid "Analytic accounts"
-msgstr "Analytic accounts"
+msgstr "Analytiska Konton"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,to_invoice:0
 msgid "Type of Invoicing"
-msgstr ""
+msgstr "Typ av fakturering"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
@@ -981,53 +1019,55 @@ msgid ""
 "In order to create a timesheet for this employee, you must assign it to a "
 "user!"
 msgstr ""
+"För att skapa en tidrapport för den anställde måste du tilldela den till en "
+"användare!"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,total_attendance:0
 msgid "#Total Attendance"
-msgstr ""
+msgstr "# Total Närvaro"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Kostnad"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,date_current:0
 #: field:timesheet.report,date_current:0
 msgid "Current date"
-msgstr "Current date"
+msgstr "Aktuellt datum"
 
 #. module: hr_timesheet_sheet
 #: model:process.process,name:hr_timesheet_sheet.process_process_hrtimesheetprocess0
 msgid "Hr Timesheet"
-msgstr ""
+msgstr "HR Tidrapport"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,year:0
 #: view:timesheet.report:0 field:timesheet.report,year:0
 msgid "Year"
-msgstr "Year"
+msgstr "År"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.current.open:0 selection:hr_timesheet_sheet.sheet,state:0
 msgid "Open"
-msgstr ""
+msgstr "Öppna"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
 msgid "To Approve"
-msgstr ""
+msgstr "Att godkänna"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.account:0
 msgid "Total"
-msgstr "Total"
+msgstr "Totalt"
 
 #. module: hr_timesheet_sheet
 #: field:hr.timesheet.report,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Journal"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -1230,3 +1270,9 @@ msgstr ""
 
 #~ msgid "My Department's Timesheet to Validate"
 #~ msgstr "My Department's Timesheet to Validate"
+
+#~ msgid "My Timesheet"
+#~ msgstr "Min tidrapport"
+
+#~ msgid "Submited to Manager"
+#~ msgstr "Lämnas till chef"
diff --git a/addons/hr_timesheet_sheet/i18n/tlh.po b/addons/hr_timesheet_sheet/i18n/tlh.po
index 303d084740f..1ca475eebe0 100644
--- a/addons/hr_timesheet_sheet/i18n/tlh.po
+++ b/addons/hr_timesheet_sheet/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/tr.po b/addons/hr_timesheet_sheet/i18n/tr.po
index c75cc189c26..a157127e22c 100644
--- a/addons/hr_timesheet_sheet/i18n/tr.po
+++ b/addons/hr_timesheet_sheet/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/uk.po b/addons/hr_timesheet_sheet/i18n/uk.po
index 440e9236f2e..8512154163c 100644
--- a/addons/hr_timesheet_sheet/i18n/uk.po
+++ b/addons/hr_timesheet_sheet/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/vi.po b/addons/hr_timesheet_sheet/i18n/vi.po
index dce2de88527..a0f17730e36 100644
--- a/addons/hr_timesheet_sheet/i18n/vi.po
+++ b/addons/hr_timesheet_sheet/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -958,7 +958,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/zh_CN.po b/addons/hr_timesheet_sheet/i18n/zh_CN.po
index c0b4350bf7c..00e890dae9d 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_CN.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-29 05:42+0000\n"
-"Last-Translator: ccdos <Unknown>\n"
+"PO-Revision-Date: 2012-11-01 08:13+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:04+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -78,7 +78,7 @@ msgstr "请核实这表的总差异少于  %.2f  ！"
 #. module: hr_timesheet_sheet
 #: selection:hr.timesheet.report,month:0 selection:timesheet.report,month:0
 msgid "March"
-msgstr ""
+msgstr "三月"
 
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,cost:0
@@ -186,7 +186,7 @@ msgid ""
 "project, you can generate the invoices based on the timesheet."
 msgstr ""
 "用\"我的计工单\"菜单开启您的计工单所以您能在系统预定你的活动。用相同方式，您能记录您的考勤（签入/签出）同时记录在不同项目的工作时间。在公司定义的期末"
-"，确认用户的记工单和经由经理使其生效。如果需要，可以定义为一个项目，你能给这计工单开发票。"
+"，确认用户的计工单和经由经理使其生效。如果需要，可以定义为一个项目，你能给这计工单开发票。"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
@@ -733,7 +733,7 @@ msgstr "签入/签出和在一个计工单里的容许的差异小时。如果
 #: view:hr_timesheet_sheet.sheet:0 field:hr_timesheet_sheet.sheet,period_ids:0
 #: view:hr_timesheet_sheet.sheet.day:0
 msgid "Period"
-msgstr "周期"
+msgstr "考勤详情"
 
 #. module: hr_timesheet_sheet
 #: view:hr.timesheet.report:0 field:hr.timesheet.report,day:0
@@ -966,7 +966,7 @@ msgstr "你只能做今天的签入/签出"
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr "提交给经理"
 
 #. module: hr_timesheet_sheet
@@ -977,7 +977,7 @@ msgstr "辅助核算项"
 #. module: hr_timesheet_sheet
 #: view:timesheet.report:0 field:timesheet.report,to_invoice:0
 msgid "Type of Invoicing"
-msgstr "开票类型"
+msgstr "发票类型"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:246
@@ -1285,3 +1285,6 @@ msgstr "账簿"
 #, python-format
 #~ msgid "Cannot delete Sheet(s) which have attendance entries encoded !"
 #~ msgstr "无法删除这记工单因为它有考勤记录！"
+
+#~ msgid "Submited to Manager"
+#~ msgstr "提交给经理"
diff --git a/addons/hr_timesheet_sheet/i18n/zh_TW.po b/addons/hr_timesheet_sheet/i18n/zh_TW.po
index 013f514e2c8..19feff2ea66 100644
--- a/addons/hr_timesheet_sheet/i18n/zh_TW.po
+++ b/addons/hr_timesheet_sheet/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: hr_timesheet_sheet
 #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0
@@ -957,7 +957,7 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet:0
-msgid "Submited to Manager"
+msgid "Submit to Manager"
 msgstr ""
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
index 49b18f75e4b..1fdcac9f7c6 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report.py
@@ -43,7 +43,7 @@ class hr_timesheet_report(osv.osv):
         'account_id': fields.many2one('account.analytic.account', 'Analytic Account',readonly=True),
         'company_id': fields.many2one('res.company', 'Company',readonly=True),
         'cost': fields.float('Cost',readonly=True, digits_compute=dp.get_precision('Account')),
-        'quantity': fields.float('Quantity',readonly=True),
+        'quantity': fields.float('Time',readonly=True),
     }
 
     def init(self, cr):
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 37c40f60f6d..9ee55f9c9f5 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -15,7 +15,7 @@
             <field name="name">hr.timesheet.report.tree</field>
             <field name="model">hr.timesheet.report</field>
             <field name="arch" type="xml">
-                <tree string="Timesheet Analysis">
+                <tree string="Timesheet Analysis" create="false">
                     <field name="year" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="date" invisible="1"/>
@@ -26,7 +26,6 @@
                     <field name="product_id" invisible="1"/>
                     <field name="account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
                     <field name="general_account_id" invisible="1"/>
-
                     <field name="quantity" sum="Hours"/>
                     <field name="cost" sum="Total Cost"/>
                 </tree>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report.py b/addons/hr_timesheet_sheet/report/timesheet_report.py
index 38e19d708d4..e276980ddf7 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report.py
+++ b/addons/hr_timesheet_sheet/report/timesheet_report.py
@@ -32,6 +32,7 @@ class timesheet_report(osv.osv):
             ('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),
+        'date': fields.date('Date', readonly=True),
         'name': fields.char('Description', size=64,readonly=True),
         'product_id' : fields.many2one('product.product', 'Product'),
         'general_account_id' : fields.many2one('account.account', 'General Account', readonly=True),
@@ -52,7 +53,7 @@ class timesheet_report(osv.osv):
             ('draft','Draft'),
             ('confirm','Confirmed'),
             ('done','Done')], 'Status', readonly=True),
-        'quantity': fields.float('#Quantity',readonly=True),
+        'quantity': fields.float('Time',readonly=True),
         'cost': fields.float('#Cost',readonly=True),
         }
 
@@ -62,13 +63,13 @@ class timesheet_report(osv.osv):
             create or replace view timesheet_report as (
                     select
                         min(aal.id) as id,
-                        htss.date_current,
                         htss.name,
+                        aal.date as date,
                         htss.date_from,
                         htss.date_to,
-                        to_char(htss.date_current,'YYYY') as year,
-                        to_char(htss.date_current,'MM') as month,
-                        to_char(htss.date_current, 'YYYY-MM-DD') as day,
+                        to_char(htss.date_from, 'YYYY-MM-DD') as day,
+                        to_char(htss.date_from, 'YYYY') as year,
+                        to_char(htss.date_from, 'MM') as month,
                         count(*) as nbr,
                         aal.unit_amount as quantity,
                         aal.amount as cost,
@@ -77,18 +78,15 @@ class timesheet_report(osv.osv):
                         (SELECT   sum(day.total_difference)
                             FROM hr_timesheet_sheet_sheet AS sheet 
                             LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
-                            ON (sheet.id = day.sheet_id 
-                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_diff,
+                            ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_diff,
                         (SELECT sum(day.total_timesheet)
                             FROM hr_timesheet_sheet_sheet AS sheet 
                             LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
-                            ON (sheet.id = day.sheet_id 
-                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_timesheet,
+                            ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_timesheet,
                         (SELECT sum(day.total_attendance)
                             FROM hr_timesheet_sheet_sheet AS sheet 
                             LEFT JOIN hr_timesheet_sheet_sheet_day AS day 
-                            ON (sheet.id = day.sheet_id 
-                            AND day.name = sheet.date_current) where sheet.id=htss.id) as total_attendance,
+                            ON (sheet.id = day.sheet_id) where sheet.id=htss.id) as total_attendance,
                         aal.to_invoice,
                         aal.general_account_id,
                         htss.user_id,
@@ -99,15 +97,12 @@ class timesheet_report(osv.osv):
                     left join hr_analytic_timesheet as hat ON (hat.line_id=aal.id)
                     left join hr_timesheet_sheet_sheet as htss ON (hat.line_id=htss.id)
                     group by
-                        to_char(htss.date_current,'YYYY'),
-                        to_char(htss.date_current,'MM'),
-                        to_char(htss.date_current, 'YYYY-MM-DD'),
                         aal.account_id,
+                        aal.date,
                         htss.date_from,
                         htss.date_to,
                         aal.unit_amount,
                         aal.amount,
-                        htss.date_current,
                         aal.to_invoice,
                         aal.product_id,
                         aal.general_account_id,
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index 7b31f72235b..aee07fc23b6 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -17,7 +17,7 @@
             <field name="model">timesheet.report</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';black:state in ('confirm','new');gray:state == 'cancel'" string="Timesheet">
-                    <field name="date_current" invisible="1"/>
+                    <field name="date" invisible="1"/>
                     <field name="name" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="date_from" invisible="1"/>
@@ -56,7 +56,6 @@
                         <field name="product_id"/>
                         <field name="department_id"/>
                         <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="date_current"/>
                         <field name="date_to"/>
                         <field name="date_from"/>
                     </group>
diff --git a/addons/hr_timesheet_sheet/res_config_view.xml b/addons/hr_timesheet_sheet/res_config_view.xml
index d265a145342..6c52a907724 100644
--- a/addons/hr_timesheet_sheet/res_config_view.xml
+++ b/addons/hr_timesheet_sheet/res_config_view.xml
@@ -2,16 +2,12 @@
 <openerp>
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
-        <record id="todo_open_hr_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="hr.action_client_hr_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
         </record>
     </data>
     <data>
-        <record id="hr.todo_open_hr_menu" model="ir.actions.todo">
-            <field name="state">done</field>
-        </record>
         <record id="view_hr_timehseet_config_settings" model="ir.ui.view">
             <field name="name">hr settings for timesheets</field>
             <field name="model">hr.config.settings</field>
diff --git a/addons/hr_timesheet_sheet/static/src/css/Makefile b/addons/hr_timesheet_sheet/static/src/css/Makefile
new file mode 100644
index 00000000000..e60087d9b33
--- /dev/null
+++ b/addons/hr_timesheet_sheet/static/src/css/Makefile
@@ -0,0 +1,3 @@
+timesheet.css: timesheet.sass
+	sass -t expanded timesheet.sass timesheet.css
+
diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.css b/addons/hr_timesheet_sheet/static/src/css/timesheet.css
new file mode 100644
index 00000000000..36ea9a34db9
--- /dev/null
+++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.css
@@ -0,0 +1,65 @@
+@charset "utf-8";
+.openerp .oe_form_readonly .oe_timesheet_weekly .oe_timesheet_button_add {
+  display: none;
+}
+.openerp .oe_form_readonly .oe_timesheet_weekly div.oe_view_nocontent {
+  display: none;
+}
+.openerp .oe_timesheet_weekly {
+  overflow-x: auto;
+}
+.openerp .oe_timesheet_weekly table {
+  width: 100%;
+}
+.openerp .oe_timesheet_weekly td {
+  padding: 3px;
+  text-align: right;
+}
+.openerp .oe_timesheet_weekly th {
+  text-align: center;
+  color: #006699;
+  font-family: "Helvetica Neue", Arial, Verdana, "Nimbus Sans L", sans-serif;
+  font-size: 10px;
+  background: #eeeeee;
+  min-width: 47px;
+}
+.openerp .oe_timesheet_weekly .oe_timesheet_total {
+  background: #eeeeee;
+}
+.openerp .oe_timesheet_weekly .oe_timesheet_weekly_account {
+  text-align: left;
+}
+.openerp .oe_timesheet_weekly .oe_timesheet_first_col {
+  min-width: 130px;
+}
+.openerp .oe_timesheet_weekly td input.oe_timesheet_weekly_input {
+  padding: 5px 2px !important;
+  width: 40px;
+  text-align: right;
+  min-width: 0 !important;
+}
+.openerp .oe_timesheet_weekly td.oe_timesheet_total {
+  font-weight: bold;
+  padding: 5px 3px !important;
+}
+.openerp .oe_timesheet_weekly .oe_timesheet_weekly_adding_tot {
+  display: table;
+  width: 100%;
+}
+.openerp .oe_timesheet_weekly .oe_timesheet_weekly_adding {
+  display: table-cell;
+  text-align: left;
+}
+.openerp .oe_timesheet_weekly .oe_timesheet_weekly_tottot {
+  display: table-cell;
+}
+.openerp .oe_timesheet_weekly .oe_timesheet_weekly_add_row td {
+  text-align: left;
+}
+.openerp .oe_timesheet_weekly .oe_timesheet_weekly_add_row .oe_form_field_many2one {
+  display: inline-block;
+  width: 200px;
+}
+.openerp .oe_timesheet_weekly .oe_timesheet_weekly_today {
+  background: #ffddee;
+}
diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.sass b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass
new file mode 100644
index 00000000000..5e04271037c
--- /dev/null
+++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass
@@ -0,0 +1,52 @@
+@charset "utf-8"
+
+.openerp
+    .oe_form_readonly
+        .oe_timesheet_weekly
+            .oe_timesheet_button_add
+                display: none
+            div.oe_view_nocontent
+                display: none
+    .oe_timesheet_weekly
+        overflow-x: auto
+        table
+            width: 100%
+        td
+            padding: 3px
+            text-align: right
+        th
+            text-align: center
+            color: #069
+            font-family: 'Helvetica Neue', Arial, Verdana, 'Nimbus Sans L', sans-serif
+            font-size: 10px
+            background: #eee
+            min-width: 47px
+        .oe_timesheet_total
+            background: #eee
+        .oe_timesheet_weekly_account
+            text-align: left
+        .oe_timesheet_first_col
+            min-width: 130px
+        td input.oe_timesheet_weekly_input
+            padding: 5px 2px !important
+            width: 40px
+            text-align: right
+            min-width: 0 !important
+        td.oe_timesheet_total
+            font-weight: bold
+            padding: 5px 3px !important
+        .oe_timesheet_weekly_adding_tot
+            display: table
+            width: 100%
+        .oe_timesheet_weekly_adding
+            display: table-cell
+            text-align: left
+        .oe_timesheet_weekly_tottot
+            display: table-cell
+        .oe_timesheet_weekly_add_row td
+            text-align: left
+        .oe_timesheet_weekly_add_row .oe_form_field_many2one
+            display: inline-block
+            width: 200px
+        .oe_timesheet_weekly_today
+            background: #fde
diff --git a/addons/hr_timesheet_sheet/static/src/js/timesheet.js b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
new file mode 100644
index 00000000000..efff48d93b8
--- /dev/null
+++ b/addons/hr_timesheet_sheet/static/src/js/timesheet.js
@@ -0,0 +1,316 @@
+
+openerp.hr_timesheet_sheet = function(instance) {
+    var QWeb = instance.web.qweb;
+    var _t = instance.web._t;
+
+    instance.hr_timesheet_sheet.WeeklyTimesheet = instance.web.form.FormWidget.extend(instance.web.form.ReinitializeWidgetMixin, {
+        events: {
+            "click .oe_timesheet_weekly_account a": "go_to",
+        },
+        init: function() {
+            this._super.apply(this, arguments);
+            this.set({
+                sheets: [],
+                date_to: false,
+                date_from: false,
+            });
+            this.field_manager.on("field_changed:timesheet_ids", this, this.query_sheets);
+            this.field_manager.on("field_changed:date_from", this, function() {
+                this.set({"date_from": instance.web.str_to_date(this.field_manager.get_field_value("date_from"))});
+            });
+            this.field_manager.on("field_changed:date_to", this, function() {
+                this.set({"date_to": instance.web.str_to_date(this.field_manager.get_field_value("date_to"))});
+            });
+            this.field_manager.on("field_changed:user_id", this, function() {
+                this.set({"user_id": this.field_manager.get_field_value("user_id")});
+            });
+            this.on("change:sheets", this, this.update_sheets);
+            this.res_o2m_drop = new instance.web.DropMisordered();
+            this.render_drop = new instance.web.DropMisordered();
+            this.description_line = _t("/");
+        },
+        go_to: function(event) {
+            var id = JSON.parse($(event.target).data("id"));
+            this.do_action({
+                type: 'ir.actions.act_window',
+                res_model: "account.analytic.account",
+                res_id: id,
+                views: [[false, 'form']],
+                target: 'current'
+            });
+        },
+        query_sheets: function() {
+            var self = this;
+            if (self.updating)
+                return;
+            var commands = this.field_manager.get_field_value("timesheet_ids");
+            this.res_o2m_drop.add(new instance.web.Model(this.view.model).call("resolve_2many_commands", ["timesheet_ids", commands, [], 
+                    new instance.web.CompoundContext()]))
+                .done(function(result) {
+                self.querying = true;
+                self.set({sheets: result});
+                self.querying = false;
+            });
+        },
+        update_sheets: function() {
+            var self = this;
+            if (self.querying)
+                return;
+            self.updating = true;
+            self.field_manager.set_values({timesheet_ids: self.get("sheets")}).done(function() {
+                self.updating = false;
+            });
+        },
+        initialize_field: function() {
+            instance.web.form.ReinitializeWidgetMixin.initialize_field.call(this);
+            var self = this;
+            self.on("change:sheets", self, self.initialize_content);
+            self.on("change:date_to", self, self.initialize_content);
+            self.on("change:date_from", self, self.initialize_content);
+            self.on("change:user_id", self, self.initialize_content);
+        },
+        initialize_content: function() {
+            var self = this;
+            if (self.setting)
+                return;
+            // don't render anything until we have date_to and date_from
+            if (!self.get("date_to") || !self.get("date_from"))
+                return;
+            this.destroy_content();
+
+            // it's important to use those vars to avoid race conditions
+            var dates;
+            var accounts;
+            var account_names;
+            var default_get;
+            return this.render_drop.add(new instance.web.Model("hr.analytic.timesheet").call("default_get", [
+                ['account_id','general_account_id', 'journal_id','date','name','user_id','product_id','product_uom_id','to_invoice','amount','unit_amount'],
+                new instance.web.CompoundContext({'user_id': self.get('user_id')})]).then(function(result) {
+                default_get = result;
+                // calculating dates
+                dates = [];
+                var start = self.get("date_from");
+                var end = self.get("date_to");
+                while (start <= end) {
+                    dates.push(start);
+                    start = start.clone().addDays(1);
+                }
+                // group by account
+                accounts = _(self.get("sheets")).chain()
+                .map(function(el) {
+                    // much simpler to use only the id in all cases
+                    if (typeof(el.account_id) === "object")
+                        el.account_id = el.account_id[0];
+                    return el;
+                })
+                .groupBy("account_id").value();
+
+                var account_ids = _.map(_.keys(accounts), function(el) { return el === "false" ? false : Number(el) });
+
+                return new instance.web.Model("hr.analytic.timesheet").call("multi_on_change_account_id", [[], account_ids,
+                    new instance.web.CompoundContext({'user_id': self.get('user_id')})]).then(function(accounts_defaults) {
+                    accounts = _(accounts).chain().map(function(lines, account_id) {
+                        account_defaults = _.extend({}, default_get, (accounts_defaults[account_id] || {}).value || {});
+                        // group by days
+                        account_id = account_id === "false" ? false :  Number(account_id);
+                        var index = _.groupBy(lines, "date");
+                        var days = _.map(dates, function(date) {
+                            var day = {day: date, lines: index[instance.web.date_to_str(date)] || []};
+                            // add line where we will insert/remove hours
+                            var to_add = _.find(day.lines, function(line) { return line.name === self.description_line });
+                            if (to_add) {
+                                day.lines = _.without(day.lines, to_add);
+                                day.lines.unshift(to_add);
+                            } else {
+                                day.lines.unshift(_.extend(_.clone(account_defaults), {
+                                    name: self.description_line,
+                                    unit_amount: 0,
+                                    date: instance.web.date_to_str(date),
+                                    account_id: account_id,
+                                }));
+                            }
+                            return day;
+                        });
+                        return {account: account_id, days: days, account_defaults: account_defaults};
+                    }).value();
+
+                    // we need the name_get of the analytic accounts
+                    return new instance.web.Model("account.analytic.account").call("name_get", [_.pluck(accounts, "account"),
+                        new instance.web.CompoundContext()]).then(function(result) {
+                        account_names = {};
+                        _.each(result, function(el) {
+                            account_names[el[0]] = el[1];
+                        });
+                        accounts = _.sortBy(accounts, function(el) {
+                            return account_names[el.account];
+                        });
+                    });;
+                });
+            })).then(function(result) {
+                // we put all the gathered data in self, then we render
+                self.dates = dates;
+                self.accounts = accounts;
+                self.account_names = account_names;
+                self.default_get = default_get;
+                //real rendering
+                self.display_data();
+            });
+        },
+        destroy_content: function() {
+            if (this.dfm) {
+                this.dfm.destroy();
+                this.dfm = undefined;
+            }
+        },
+        display_data: function() {
+            var self = this;
+            self.$el.html(QWeb.render("hr_timesheet_sheet.WeeklyTimesheet", {widget: self}));
+            _.each(self.accounts, function(account) {
+                _.each(_.range(account.days.length), function(day_count) {
+                    if (!self.get('effective_readonly')) {
+                        self.get_box(account, day_count).val(self.sum_box(account, day_count)).change(function() {
+                            var num = Number($(this).val());
+                            if (isNaN(num)) {
+                                $(this).val(self.sum_box(account, day_count));
+                            } else {
+                                account.days[day_count].lines[0].unit_amount += num - self.sum_box(account, day_count);
+                                self.display_totals();
+                                self.sync();
+                            }
+                        });
+                    } else {
+                        self.get_box(account, day_count).html(self.sum_box(account, day_count));
+                    }
+                });
+            });
+            self.display_totals();
+            self.$(".oe_timesheet_weekly_adding button").click(_.bind(this.init_add_account, this));
+        },
+        init_add_account: function() {
+            var self = this;
+            if (self.dfm)
+                return;
+            self.$(".oe_timesheet_weekly_add_row").show();
+            self.dfm = new instance.web.form.DefaultFieldManager(self);
+            self.dfm.extend_field_desc({
+                account: {
+                    relation: "account.analytic.account",
+                },
+            });
+            self.account_m2o = new instance.web.form.FieldMany2One(self.dfm, {
+                attrs: {
+                    name: "account",
+                    type: "many2one",
+                    domain: [
+                        ['type','in',['normal', 'contract']],
+                        ['state', '<>', 'close'],
+                        ['use_timesheets','=',1],
+                        ['id', 'not in', _.pluck(self.accounts, "account")],
+                    ],
+                    context: {
+                        default_use_timesheets: 1,
+                        default_type: "contract",
+                    },
+                    modifiers: '{"required": true}',
+                },
+            });
+            self.account_m2o.prependTo(self.$(".oe_timesheet_weekly_add_row td"));
+            self.$(".oe_timesheet_weekly_add_row button").click(function() {
+                var id = self.account_m2o.get_value();
+                if (id === false) {
+                    self.dfm.set({display_invalid_fields: true});
+                    return;
+                }
+                var ops = self.generate_o2m_value();
+                new instance.web.Model("hr.analytic.timesheet").call("on_change_account_id", [[], id]).then(function(res) {
+                    var def = _.extend({}, self.default_get, res.value, {
+                        name: self.description_line,
+                        unit_amount: 0,
+                        date: instance.web.date_to_str(self.dates[0]),
+                        account_id: id,
+                    });
+                    ops.push(def);
+                    self.set({"sheets": ops});
+                });
+            });
+        },
+        get_box: function(account, day_count) {
+            return this.$('[data-account="' + account.account + '"][data-day-count="' + day_count + '"]');
+        },
+        get_total: function(account) {
+            return this.$('[data-account-total="' + account.account + '"]');
+        },
+        get_day_total: function(day_count) {
+            return this.$('[data-day-total="' + day_count + '"]');
+        },
+        get_super_total: function() {
+            return this.$('.oe_timesheet_weekly_supertotal');
+        },
+        sum_box: function(account, day_count) {
+            var line_total = 0;
+            _.each(account.days[day_count].lines, function(line) {
+                line_total += line.unit_amount;
+            });
+            return line_total;
+        },
+        display_totals: function() {
+            var self = this;
+            var day_tots = _.map(_.range(self.dates.length), function() { return 0 });
+            var super_tot = 0;
+            _.each(self.accounts, function(account) {
+                var acc_tot = 0;
+                _.each(_.range(self.dates.length), function(day_count) {
+                    var sum = self.sum_box(account, day_count);
+                    acc_tot += sum;
+                    day_tots[day_count] += sum;
+                    super_tot += sum;
+                });
+                self.get_total(account).html(acc_tot);
+            });
+            _.each(_.range(self.dates.length), function(day_count) {
+                self.get_day_total(day_count).html(day_tots[day_count]);
+            });
+            self.get_super_total().html(super_tot);
+        },
+        sync: function() {
+            var self = this;
+            self.setting = true;
+            self.set({sheets: this.generate_o2m_value()});
+            self.setting = false;
+        },
+        generate_o2m_value: function() {
+            var self = this;
+            var ops = [];
+
+            _.each(self.accounts, function(account) {
+                var auth_keys = _.extend(_.clone(account.account_defaults), {
+                    name: true, unit_amount: true, date: true, account_id:true,
+                });
+                _.each(account.days, function(day) {
+                    _.each(day.lines, function(line) {
+                        if (line.unit_amount !== 0) {
+                            var tmp = _.clone(line);
+                            tmp.id = undefined;
+                            _.each(line, function(v, k) {
+                                if (v instanceof Array) {
+                                    tmp[k] = v[0];
+                                }
+                            });
+                            // we have to remove some keys, because analytic lines are shitty
+                            _.each(_.keys(tmp), function(key) {
+                                if (auth_keys[key] === undefined) {
+                                    tmp[key] = undefined;
+                                }
+                            });
+                            ops.push(tmp);
+                        }
+                    });
+                });
+            });
+            return ops;
+        },
+    });
+
+    instance.web.form.custom_widgets.add('weekly_timesheet', 'instance.hr_timesheet_sheet.WeeklyTimesheet');
+
+};
diff --git a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
new file mode 100644
index 00000000000..4390c7c6ed1
--- /dev/null
+++ b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates>
+    <t t-name="hr_timesheet_sheet.WeeklyTimesheet">
+        <div class="oe_timesheet_weekly">
+            <table>
+                <tr>
+                    <th class="oe_timesheet_first_col"> </th>
+                    <t t-foreach="widget.dates" t-as="date">
+                        <th t-att-class="'oe_timesheet_weekly_date_head' + (Date.compare(date, Date.today()) === 0 ? ' oe_timesheet_weekly_today' : '')">
+                            <t t-esc="date.toString('ddd')"/><br />
+                            <t t-esc="date.toString('MMM d')"/>
+                        </th>
+                    </t>
+                    <th class="oe_timesheet_weekly_date_head">Total</th>
+                </tr>
+                <tr t-foreach="widget.accounts" t-as="account">
+                    <td class="oe_timesheet_weekly_account"><a href="javascript:void(0)" t-att-data-id="JSON.stringify(account.account)"><t t-esc="widget.account_names[account.account]"/></a></td>
+                    <t t-set="day_count" t-value="0"/>
+                    <t t-foreach="account.days" t-as="day">
+                        <td t-att-class="(Date.compare(day.day, Date.today()) === 0 ? 'oe_timesheet_weekly_today' : '')">
+                            <input t-if="!widget.get('effective_readonly')" class="oe_timesheet_weekly_input" t-att-data-account="account.account"
+                                t-att-data-day-count="day_count" type="text"/>
+                            <span t-if="widget.get('effective_readonly')" t-att-data-account="account.account"
+                                t-att-data-day-count="day_count" class="oe_timesheet_weekly_box"/>
+                            <t t-set="day_count" t-value="day_count + 1"/>
+                        </td>
+                    </t>
+                    <td t-att-data-account-total="account.account" class="oe_timesheet_total"> </td>
+                </tr>
+                <tr class="oe_timesheet_weekly_add_row" style="display: none">
+                    <td t-att-colspan="widget.dates.length + 2">
+                        <button class="oe_highlight">Add</button>
+                    </td>
+                </tr>
+                <tr class="oe_timesheet_total">
+                    <td>
+                        <div class="oe_timesheet_weekly_adding_tot">
+                            <div class="oe_timesheet_weekly_adding"><button class="oe_timesheet_button_add">Add a Line</button></div>
+                            <div class="oe_timesheet_weekly_tottot"><span>Total</span></div>
+                        </div>
+                    </td>
+                    <t t-set="day_count" t-value="0"/>
+                    <t t-foreach="widget.dates" t-as="date">
+                        <td class="oe_timesheet_total">
+                            <span class="oe_timesheet_weekly_box" t-att-data-day-total="day_count">
+                            </span>
+                            <t t-set="day_count" t-value="day_count + 1"/>
+                        </td>
+                    </t>
+                    <td class="oe_timesheet_weekly_supertotal oe_timesheet_total"> </td>
+                </tr>
+            </table>
+            <div t-if="widget.accounts.length == 0">
+                <div class="oe_view_nocontent">
+                    <p class="oe_view_nocontent_create">
+                        Click to add projects/analytic accounts you worked on.
+                    </p><p>
+                        You will be able to register your working hours and
+                        activities.
+                    </p><p>
+                        By default, you record timesheets on analytic accounts.
+                        But if an analytic account represents a customer
+                        contract, you can change the type of the analytic
+                        account to 'Contract or Project' to setup the invoicing
+                        options.
+                    </p>
+                </div>
+            </div>
+        </div>
+    </t>
+</templates>
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 f4f9326890f..71776af61ba 100644
--- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
+++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml
@@ -13,54 +13,33 @@
     product_id: product.product_product_consultant
     journal_id: hr_timesheet.analytic_journal
 -
-  I create my current timesheet for employee "Quentin Paolinon".
+  I create a timesheet for employee "Quentin Paolinon".
 -
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}:
-    date_current: !eval time.strftime('%Y-%m-%d')
     date_from: !eval time.strftime('%Y-%m-01')
     name: Quentin Paolinon
     state: new
     user_id: base.user_demo
     employee_id: 'hr.employee_qdp'
 -
-  Now, at the time of login, I create Attendances and perform "Sign In" action.
+  Quentin "Sign In" at around 9am.
 -
-  !python {model: hr_timesheet_sheet.sheet}: |
-    self.sign_in(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {})
-    task_work = self.search(cr, uid, [("name","=","Quentin Paolinon")],context)[0]
-    task_ids = self.browse(cr, uid, task_work, context)
-    assert task_ids.state == "draft", "I State In Timesheet"
+  !record {model: hr.attendance, id: hr_attendance_1}:
+    action: sign_in
+    employee_id: 'hr.employee_qdp'
+    name: !eval datetime.now().strftime('%Y-%m-%d 09:%M:%S')
 -
-  I want to check attendance and work of yesterday. I click on <- button.
+  I test that Quentin in signed in
 -
-  !python {model: hr_timesheet_sheet.sheet}: |
-    date_prev = self.date_previous(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None)
-    assert date_prev == True, "I See Previous Date Timesheet"
--
-  Then I click on "Today" button to fill today's timesheet.
--
-  !python {model: hr_timesheet_sheet.sheet}: |
-    date_to = self.date_today(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None)
-    assert date_to == True, "I See Today Date Timesheet"
--
-  I can also move to next day by clicking on -> button.
--
-  !python {model: hr_timesheet_sheet.sheet}: |
-    date_next = self.date_next(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None)
-    assert date_next == True, "I See Next Date Timesheet"
--
-  I want to go to a particular date and see attendance then I select the date and click on "Go to:" button.
--
-  !python {model: hr_timesheet_sheet.sheet}: |
-    button_dumy = self.button_dummy(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None)
-    assert button_dumy == True, "I See Particular Date Attendance"
+  !assert {model: hr.employee, id: hr.employee_qdp}:
+    - state == 'present'
 -
   At the time of logout, I create attendance and perform "Sign Out".
 -
-  !record {model: hr.attendance, id: hr_attendance_1}:
+  !record {model: hr.attendance, id: hr_attendance_2}:
     action: sign_out
     employee_id: 'hr.employee_qdp'
-    name: !eval (datetime.now() + timedelta(hours=8.25)).strftime('%Y-%m-%d %H:%M:%S')
+    name: !eval datetime.now().strftime('%Y-%m-%d 17:30:00')
 -
   I create Timesheet Entry for time spend on today work.
 -
@@ -69,7 +48,7 @@
       - account_id: account.analytic_agrolait
         date: !eval time.strftime('%Y-%m-%d')
         name: 'Develop yaml for hr module'
-        user_id: base.user_qdp
+        user_id: base.user_demo
         unit_amount: 6.00
         amount: -90.00
         product_id: product.product_product_consultant
@@ -97,11 +76,16 @@
         date: !eval time.strftime('%Y-%m-%d')
         name: 'Develop yaml for hr module'
         unit_amount: 2.00
-        user_id: base.user_qdp
+        user_id: base.user_demo
         amount: -90.00
         product_id: product.product_product_consultant
         general_account_id: account.a_expense
         journal_id: hr_timesheet.analytic_journal
+-
+  I set an allowed difference of 1 hour
+-
+  !record {model: res.company, id: base.main_company}:
+    timesheet_max_difference: 1.00
 -
   I tried again to confirm the timesheet after modification.
 -
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
index fdab774a250..652d5139288 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
@@ -35,14 +35,13 @@ class hr_timesheet_current_open(osv.osv_memory):
 
         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!'), _('Please define employee 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'))], context=context)
+            raise osv.except_osv(_('Error!'), _('Please create an employee and associate it with this user.'))
+        ids = ts.search(cr, uid, [('user_id','=',uid),('state','in',('draft','new')),('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')}, context=context)
             domain = "[('user_id', '=', uid)]"
         else:
             domain = "[('user_id', '=', uid)]"
@@ -61,4 +60,4 @@ class hr_timesheet_current_open(osv.osv_memory):
 
 hr_timesheet_current_open()
 
-# 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_timesheet_sheet/wizard/hr_timesheet_current_view.xml b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
index c982a9bbd39..dfe89c87f70 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current_view.xml
@@ -5,7 +5,7 @@
         <field name="name">hr_timesheet_current_open.form</field>
         <field name="model">hr.timesheet.current.open</field>
         <field name="arch" type="xml">
-            <form string="My Current Timesheet" version="7.0">
+            <form string="My Timesheet" version="7.0">
                <group>
                     <separator string="It will open your current timesheet"/>
                </group>
@@ -19,7 +19,7 @@
     </record>
 
     <record id="action_hr_timesheet_current_open" model="ir.actions.act_window">
-        <field name="name">My Current Timesheet</field>
+        <field name="name">My Timesheet</field>
         <field name="res_model">hr.timesheet.current.open</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form</field>
@@ -28,7 +28,7 @@
         <field name="help">My Timesheet opens your timesheet so that you can book your activities into the system. From the same form, you can register your attendances (Sign In/Out) and describe the working hours made on the different projects. At the end of the period defined in the company, the timesheet is confirmed by the user and can be validated by his manager. If required, as defined on the project, you can generate the invoices based on the timesheet.</field>
     </record>
 
-    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Current Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
+    <menuitem action="action_hr_timesheet_current_open" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" name="My Timesheet" parent="hr_attendance.menu_hr_time_tracking" sequence="1"/>
 
     </data>
 </openerp>
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 7ee4a72de05..8f32e1e91c4 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -35,19 +35,15 @@ The managers can obtain an easy view of best ideas from all the users.
 Once installed, check the menu 'Ideas' in the 'Tools' main menu.""",
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
-    'depends': ['base_tools','mail'],
-    'init_xml': [],
-    'update_xml': [
+    'depends': ['mail'],
+    'data': [
         'security/idea_security.xml',
         'security/ir.model.access.csv',
         'idea_view.xml',
         'idea_workflow.xml',
     ],
-    'demo_xml': [
-        "idea_data.xml"
-    ],
-    'test':[
-    ],
+    'demo': ['idea_data.xml'],
+    'test':[],
     'installable': True,
     'images': [],
 }
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index 3be4dd2e28d..a382948e15c 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -39,6 +39,7 @@ class idea_category(osv.osv):
         ('name', 'unique(name)', 'The name of the category must be unique' )
     ]
     _order = 'name asc'
+
 idea_category()
 
 class idea_idea(osv.osv):
@@ -65,24 +66,22 @@ class idea_idea(osv.osv):
     }
     _order = 'name asc'
 
-    def idea_cancel(self, cr, uid, ids, context={}):
+    def idea_cancel(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, { 'state': 'cancel' })
-        self.message_append_note(cr, uid, ids, body=_('Idea canceled.'), context=context)
+        self.message_post(cr, uid, ids, body=_('Idea canceled.'), context=context)
         return True
 
     def idea_open(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, { 'state': 'open'})
-        self.message_append_note(cr, uid, ids, body=_('Idea accepted.'), context=context)
+        self.write(cr, uid, ids, {'state': 'open'}, context=context)
+        self.message_post(cr, uid, ids, body=_('Idea accepted.'), context=context)
         return True
 
     def idea_close(self, cr, uid, ids, context={}):
-        self.message_append_note(cr, uid, ids, body=_('Idea done.'), context=context)
-        self.write(cr, uid, ids, { 'state': 'close' })
+        self.write(cr, uid, ids, {'state': 'close'}, context=context)
+        self.message_post(cr, uid, ids, body=_('Idea closed.'), context=context)
         return True
 
     def idea_draft(self, cr, uid, ids, context={}):
-        self.message_append_note(cr, uid, ids, body=_('Idea reset to draft.'), context=context)
-        self.write(cr, uid, ids, { 'state': 'draft' })
+        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
+        self.message_post(cr, uid, ids, body=_('Idea reset to draft.'), context=context)
         return True
-idea_idea()
-
diff --git a/addons/idea/idea_data.xml b/addons/idea/idea_data.xml
index d63eb907ef8..421cb6a9eef 100644
--- a/addons/idea/idea_data.xml
+++ b/addons/idea/idea_data.xml
@@ -15,6 +15,7 @@
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('base.group_tool_user'))]"/>
         </record>
+
     </data>
 </openerp>
 
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index eab3d03ceea..5d9054bf4b7 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+        <!-- Top menu item -->
+        <menuitem name="Tools" id="base.menu_tools" sequence="160"/>
     <!-- Idea Categories Search View-->
     <record model="ir.ui.view" id="view_idea_category_search">
         <field name="name">idea.category.search</field>
@@ -77,8 +79,8 @@
                     <field name="description"/>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
             </form>
         </field>
diff --git a/addons/import_base/i18n/ar.po b/addons/import_base/i18n/ar.po
deleted file mode 100644
index f900f0fb189..00000000000
--- a/addons/import_base/i18n/ar.po
+++ /dev/null
@@ -1,100 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-06 07:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid ""
-"but failed, in consequence no data were imported to keep database "
-"consistency \n"
-" error : \n"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid ""
-"The import of data \n"
-" instance name : %s \n"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr ""
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr "إستيراد"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr ""
diff --git a/addons/import_base/i18n/de.po b/addons/import_base/i18n/de.po
deleted file mode 100644
index 927a06628a0..00000000000
--- a/addons/import_base/i18n/de.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-09 15:22+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr "Der Import schlug fehl - unerwarteter Fehler"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-msgstr "begann um %s und eendete um %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr "Der Import Ihrer Daten endete um %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid ""
-"but failed, in consequence no data were imported to keep database "
-"consistency \n"
-" error : \n"
-msgstr ""
-"schlug aber fehl, keine Daten wurden importiert um Inkonsistenzen zu "
-"vermeiden.\n"
-"Fehler  : \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid ""
-"The import of data \n"
-" instance name : %s \n"
-msgstr ""
-"Der Import der Daten\n"
-" Instanz Name : %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-msgstr "%s wurde erfolgreich importiert von: %s %s, %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr "Der Datenimport schlug fehl %s infolge eines unvorhergesehen Fehlers"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr "Import abgeschlossen, Benachrichtigung per Mail versandt"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr "%s ist kein gültiger Modellname"
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr "Import"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr "ohne Warnung"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr "mit Warnung : %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr " importierte Felder : "
diff --git a/addons/import_base/i18n/es_CR.po b/addons/import_base/i18n/es_CR.po
deleted file mode 100644
index 4fdfd729a2d..00000000000
--- a/addons/import_base/i18n/es_CR.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# Spanish (Costa Rica) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-17 15:38+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
-"Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr "Importación ha fallado debido a un error inesperado"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-msgstr "iniciado en %s y finalizado en %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr "La importación de los datos a finalizado en %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid ""
-"but failed, in consequence no data were imported to keep database "
-"consistency \n"
-" error : \n"
-msgstr ""
-"pero no pudo, en consecuencia, no hay datos fueron importados a mantener la "
-"coherencia de base de datos\n"
-"  error: \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid ""
-"The import of data \n"
-" instance name : %s \n"
-msgstr ""
-"La importación de los datos\n"
-"  nombre de la instancia: %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-msgstr "%s asido exitosamente  importados desde %s %s, %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr "Importación de datos falló en% s debido a un error inesperado"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr "Importar a finalizado, notificación de correo electrónico enviado"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr "%s no es un nombre de modelo válido"
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr "Importar"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr "sin previo aviso"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr "con aviso : %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr " Archivos importados : "
diff --git a/addons/import_base/i18n/fi.po b/addons/import_base/i18n/fi.po
deleted file mode 100644
index 3b4db1223d9..00000000000
--- a/addons/import_base/i18n/fi.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-03-26 06:59+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr "Tuonti epäonnistui tuntemattoman virheen takia"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-msgstr "aloitettu %s ja valmistui %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr "Tietojen tuonti valmistui %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid ""
-"but failed, in consequence no data were imported to keep database "
-"consistency \n"
-" error : \n"
-msgstr ""
-"mutta epäonnistui, tietojen yhtenäisyyden säilyttämiseksi tietoja ei tuotu \n"
-" virhe: \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid ""
-"The import of data \n"
-" instance name : %s \n"
-msgstr ""
-"Tietojen tuonti \n"
-" Instanssin nimi: %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-msgstr "%s on onnistuneesti tuotu %s %s, %s :stä \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr "Tietojen tuonti epäonnistui %s:ssä tuntemattoman virheen takia"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr "Tuonti valmis, muistutussähköposti on lähetety"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr "%s ei ole sallittu mallin nimi"
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr "Tuo"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr "ei varoituksia"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr "varoituksella : %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr " Tuodut kentät : "
diff --git a/addons/import_base/i18n/fr.po b/addons/import_base/i18n/fr.po
deleted file mode 100644
index bf94c953323..00000000000
--- a/addons/import_base/i18n/fr.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-03-05 21: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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr "Échec de l'importation en raison d'une erreur inattendue"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-msgstr "commencé à %s et terminé à %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr "Import de vos données terminé à %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid ""
-"but failed, in consequence no data were imported to keep database "
-"consistency \n"
-" error : \n"
-msgstr ""
-"mais n'a pas réussi, en conséquence aucune donnée n'a été importée pour "
-"maintenir la cohérence de base de données \n"
-" erreur : \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid ""
-"The import of data \n"
-" instance name : %s \n"
-msgstr ""
-"Import des données\n"
-" nom de l'instance  : %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-msgstr "%s a été correctement importé de %s %s, %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr "Échec de l'importation à %s en raison d'une erreur inattendue"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr "Importation terminée, un courriel de notification a été envoyé"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr "%s n'est pas un nom de modèle valide"
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr "sans avertissement"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr "avec avertissement : %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr " champs importés : "
diff --git a/addons/import_base/i18n/import_base.pot b/addons/import_base/i18n/import_base.pot
deleted file mode 100644
index cc227de8993..00000000000
--- a/addons/import_base/i18n/import_base.pot
+++ /dev/null
@@ -1,100 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* import_base
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+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: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-""
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid "but failed, in consequence no data were imported to keep database consistency \n"
-" error : \n"
-""
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid "The import of data \n"
-" instance name : %s \n"
-""
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-""
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr ""
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr ""
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr ""
-
diff --git a/addons/import_base/i18n/ja.po b/addons/import_base/i18n/ja.po
deleted file mode 100644
index 0744b46ad06..00000000000
--- a/addons/import_base/i18n/ja.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-24 18:29+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr "予期しないエラーでインポートが失敗しました。"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-msgstr "%s で起動し %s で終了 \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr "データのインポートは %s で終了しました。"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid ""
-"but failed, in consequence no data were imported to keep database "
-"consistency \n"
-" error : \n"
-msgstr ""
-"失敗しました。結果としてデータベースの整合性維持のためデータはインポートされませんでした。 \n"
-"　エラー： \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid ""
-"The import of data \n"
-" instance name : %s \n"
-msgstr ""
-"データのインポート\n"
-"　インスタンス名：%s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-msgstr "%s は正常にインポートされました。元：%s %s、%s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr "データインポートは %s で予期しないエラーのため失敗しました。"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr "インポートが完了しました。通知メールが送信されました。"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr "%s は有効なモデル名ではありません。"
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr "インポート"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr "警告なしで"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr "警告付きで：%s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr " 項目がインポートされました： "
diff --git a/addons/import_base/i18n/nl.po b/addons/import_base/i18n/nl.po
deleted file mode 100644
index 7ade4bf3173..00000000000
--- a/addons/import_base/i18n/nl.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-21 18:42+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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr "Import is mislukt door een onverwachte fout"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-msgstr "gestart op %s en geëindigd op %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr "Import van uw gegevens geëindigd op %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid ""
-"but failed, in consequence no data were imported to keep database "
-"consistency \n"
-" error : \n"
-msgstr ""
-"maar mislukt, waardoor geen gegevens zijn geïmporteerd, zodat de database "
-"consistent blijft \n"
-" fout: \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid ""
-"The import of data \n"
-" instance name : %s \n"
-msgstr ""
-"De import van gegevens \n"
-"\n"
-" instantie naam: %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-msgstr "%s is succesvol geïmporteerd van %s %s, %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr "Gegevens import mislukt op %s door een onverwachte fout"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr "Import beëindigd. Notificatie e-mail is verzonden"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr "%s is geen geldige model naam"
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr "Importeren"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr "met geen waarsschuwing"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr "met waarschuwing: %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr " velden geïmporteerd: "
diff --git a/addons/import_base/i18n/pl.po b/addons/import_base/i18n/pl.po
deleted file mode 100644
index fa3e90dc555..00000000000
--- a/addons/import_base/i18n/pl.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# Polish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-25 20:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr "Import nieudany z nieznanego powodu"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-msgstr "rozpoczęty %s i zakończony %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr "Import danych zakończony o %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid ""
-"but failed, in consequence no data were imported to keep database "
-"consistency \n"
-" error : \n"
-msgstr ""
-"ale nieudany, w konsekwencji żadne dane nie zostały zaimportowane, aby "
-"utrzymać spójność bazy danych \n"
-" błąd : \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid ""
-"The import of data \n"
-" instance name : %s \n"
-msgstr ""
-"Import danych \n"
-" nazwa instancji : %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-msgstr "%s zostało poprawnie zaimportowanych z %s %s, %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr "Import danych nie powiódł się o %s z nieznanego powodu"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr "Import zakończony, mail informacyjny wysłany"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr "%s nie jest dozwoloną nazwą modelu"
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr "Importuj"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr "bez ostrzeżeń"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr "z ostrzeżeniami : %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr " zaimportowane pola : "
diff --git a/addons/import_base/i18n/pt.po b/addons/import_base/i18n/pt.po
deleted file mode 100644
index 8baa0309054..00000000000
--- a/addons/import_base/i18n/pt.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-04-09 13:46+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr "A importação falhou devido a um erro inesperado"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-msgstr "começado em %s e finalizado em %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr "Importação de dados terminou em %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid ""
-"but failed, in consequence no data were imported to keep database "
-"consistency \n"
-" error : \n"
-msgstr ""
-"mas não conseguiu, em consequência da não existência de dados, foram "
-"importados para manter a consistência do banco de dados \n"
-" erro: \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid ""
-"The import of data \n"
-" instance name : %s \n"
-msgstr ""
-"Importação de dados \n"
-" nome da instância: %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-msgstr "%s foi importado com sucesso para %s %s,%s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr "Importação de dados falhada em %s devido a um erro inesperado"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr "Importação concluída, notificação enviada para o email"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr "%s não é um nome de modelo válido"
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr "Importar"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr "Sem avisos"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr "com aviso: %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr " campos importados: "
diff --git a/addons/import_base/i18n/pt_BR.po b/addons/import_base/i18n/pt_BR.po
deleted file mode 100644
index 2a6f49957be..00000000000
--- a/addons/import_base/i18n/pt_BR.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-08-01 01:59+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr "A importação falhou devido a um erro inesperado"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-msgstr "Início em %s e término em %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr "A Importação de seus dados terminou em %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid ""
-"but failed, in consequence no data were imported to keep database "
-"consistency \n"
-" error : \n"
-msgstr ""
-"mas falhou, por isso nenhum dado foi importado para manter a consistência do "
-"banco de dados \n"
-" erro: \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid ""
-"The import of data \n"
-" instance name : %s \n"
-msgstr ""
-"A importação de dados \n"
-" nome da instância: %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-msgstr "%s foi importada com sucesso de %s %s, %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr "A importação falhou em %s devido a um erro inesperado"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr "Importação Concluída, o email de notificação foi enviado"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr "%s não é um nome de modelo válido"
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr "Importar"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr "sem nenhum erro"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr "com avisos:  %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr " campos importados: "
diff --git a/addons/import_base/i18n/ro.po b/addons/import_base/i18n/ro.po
deleted file mode 100644
index 2fb6ac74e65..00000000000
--- a/addons/import_base/i18n/ro.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-26 19:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr "Importul a esuat datorita unei greseli neasteptate"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-msgstr "inceput la %s si finalizat la %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr "Importul datelor d-voastra s-a finalizat la %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid ""
-"but failed, in consequence no data were imported to keep database "
-"consistency \n"
-" error : \n"
-msgstr ""
-"dar a esuat, in consecinta nu au fost importate datele pentru a mentine "
-"consistenta bazei de date \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid ""
-"The import of data \n"
-" instance name : %s \n"
-msgstr ""
-"Importul datelor \n"
-" nume instanta : %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-msgstr "%s a fost importat cu succes de la %s %s, %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr "Importul de date a esuat la %s datorita unei erori neasteptate"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr "Importul s-a finalizat, a fost trimis e-mail-ul de instiintare"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr "%s nu este nu nume valid de model"
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr "Importati"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr "fara avertizare"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr "cu avertizare : %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr " campuri importate : "
diff --git a/addons/import_base/i18n/sv.po b/addons/import_base/i18n/sv.po
deleted file mode 100644
index 058d87b1e68..00000000000
--- a/addons/import_base/i18n/sv.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-04 10:28+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr "Import misslyckades på grund av oväntat fel"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-msgstr "Startade på %s och avslutade på %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr "Importen av dina data avslutades på %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid ""
-"but failed, in consequence no data were imported to keep database "
-"consistency \n"
-" error : \n"
-msgstr ""
-"men misslyckades, till följd att inga data importerades för att hålla "
-"databasen konsistent\n"
-"  fel: \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid ""
-"The import of data \n"
-" instance name : %s \n"
-msgstr ""
-"Importen av data \n"
-" instans namn: %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-msgstr "%s har importerats från %s %s, %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr "Data import misslyckades vid %s på grund av ett oväntat fel"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr "Import genomförd, e-post notifiering har skickats"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr "%s är inte ett tillåtet modellnamn"
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr "Import"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr "utan varning"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr "med varning: %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr " importerade fält: "
diff --git a/addons/import_base/i18n/tr.po b/addons/import_base/i18n/tr.po
deleted file mode 100644
index b7b874132b9..00000000000
--- a/addons/import_base/i18n/tr.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-09 22:46+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr "Beklenmeyen hata nedeniyle içeri aktarım yapılamadı"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-msgstr "Başlama zamanı %s bitiş zamanı %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr "Veri aktarımı bitiş zamanı %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid ""
-"but failed, in consequence no data were imported to keep database "
-"consistency \n"
-" error : \n"
-msgstr ""
-"ama başarısız oldu, sonuç olarak veri tutarlılığını korumak için hiçbir veri "
-"içeri aktarılmadı \n"
-" hata: \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid ""
-"The import of data \n"
-" instance name : %s \n"
-msgstr ""
-"Veri Aktarımı \n"
-"  Kurulum adı: %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-msgstr "%s başarılı şekide içeri aktarıldı, kaynak %s %s, %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr ""
-"beklenmeyen bir hata sebebiyle Veri aktarımı başarısız oldu,  yer  %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr "Aktarım tamamlandı, bildirim e-postası gönderildi"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr "%s geçerli bir model adı değil"
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr "İçe aktar"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr "Uyarı olmadan"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr "Uyarılar ile birlikte: %s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr " alan aktarıldı : "
diff --git a/addons/import_base/i18n/zh_CN.po b/addons/import_base/i18n/zh_CN.po
deleted file mode 100644
index 1982d1476ce..00000000000
--- a/addons/import_base/i18n/zh_CN.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-13 05:01+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:434
-#, python-format
-msgid "Import failed due to an unexpected error"
-msgstr "导入失败，发生了未知的错误。"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:461
-#, python-format
-msgid "started at %s and finished at %s \n"
-msgstr "从 %s 开始， 到 %s 结束 \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:448
-#, python-format
-msgid "Import of your data finished at %s"
-msgstr "您的数据导入在 %s 完成"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:463
-#, python-format
-msgid ""
-"but failed, in consequence no data were imported to keep database "
-"consistency \n"
-" error : \n"
-msgstr "但失败了，为了保证数据库的完整性，本次导入的数据被忽略。 \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:477
-#, python-format
-msgid ""
-"The import of data \n"
-" instance name : %s \n"
-msgstr ""
-"数据导入\n"
-" 实例名称：%s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:470
-#, python-format
-msgid "%s has been successfully imported from %s %s, %s \n"
-msgstr ""
-"Copy text \t\n"
-"成功导入了%s，来自 %s %s, %s \n"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:447
-#, python-format
-msgid "Data Import failed at %s due to an unexpected error"
-msgstr "导入数据失败在 %s，失败原因未知"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:436
-#, python-format
-msgid "Import finished, notification email sended"
-msgstr "导入完成，已发送通知邮件。"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:190
-#, python-format
-msgid "%s is not a valid model name"
-msgstr "%s 不是一个正确的模型名称"
-
-#. module: import_base
-#: model:ir.ui.menu,name:import_base.menu_import_crm
-msgid "Import"
-msgstr "导入"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:467
-#, python-format
-msgid "with no warning"
-msgstr "没有警告"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:469
-#, python-format
-msgid "with warning : %s"
-msgstr "有警告：%s"
-
-#. module: import_base
-#: code:addons/import_base/import_framework.py:191
-#, python-format
-msgid " fields imported : "
-msgstr " 已导入的字段： "
diff --git a/addons/import_base/import_base_view.xml b/addons/import_base/import_base_view.xml
deleted file mode 100644
index bcfbfa80c4b..00000000000
--- a/addons/import_base/import_base_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <menuitem name="Import &amp; Synchronize" id="base.menu_import_crm" parent="base.menu_base_partner" sequence="6"/>
-    </data>
-</openerp>
diff --git a/addons/import_base/import_framework.py b/addons/import_base/import_framework.py
deleted file mode 100644
index 74d2185b57e..00000000000
--- a/addons/import_base/import_framework.py
+++ /dev/null
@@ -1,501 +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 pprint
-import mapper
-import pooler
-import tools
-from tools.translate import _
-
-from threading import Thread
-import datetime
-import logging
-import StringIO
-import traceback
-pp = pprint.PrettyPrinter(indent=4)
-_logger = logging.getLogger(__name__)
-
-
-
-class import_framework(Thread):
-    """
-        This class should be extends,
-        get_data and get_mapping have to extends
-        get_state_map and initialize can be extended
-        for advanced purpose get_default_hook can also be extended
-        @see dummy import for a minimal exemple
-    """
-
-    """
-        for import_object, this domain will avoid to find an already existing object
-    """
-    DO_NOT_FIND_DOMAIN = [('id', '=', 0)]
-
-    #TODO don't use context to pass credential parameters
-    def __init__(self, obj, cr, uid, instance_name, module_name, email_to_notify=False, context=None):
-        Thread.__init__(self)
-        self.external_id_field = 'id'
-        self.obj = obj
-        self.cr = cr
-        self.uid = uid
-        self.instance_name = instance_name
-        self.module_name = module_name
-        self.context = context or {}
-        self.email = email_to_notify
-        self.table_list = []
-        self.initialize()
-
-    """
-        Abstract Method to be implemented in
-        the real instance
-    """
-    def initialize(self):
-        """
-            init before import
-            usually for the login
-        """
-        pass
-
-    def init_run(self):
-        """
-            call after intialize run in the thread, not in the main process
-            TO use for long initialization operation
-        """
-        pass
-
-    def get_data(self, table):
-        """
-            @return: a list of dictionaries
-                each dictionnaries contains the list of pair  external_field_name : value
-        """
-        return [{}]
-
-    def get_link(self, from_table, ids, to_table):
-        """
-            @return: a dictionaries that contains the association between the id (from_table)
-                     and the list (to table) of id linked
-        """
-        return {}
-
-    def get_external_id(self, data):
-        """
-            @return the external id
-                the default implementation return self.external_id_field (that has 'id') by default
-                if the name of id field is different, you can overwrite this method or change the value
-                of self.external_id_field
-        """
-        return data[self.external_id_field]
-
-    def get_mapping(self):
-        """
-            @return: { TABLE_NAME : {
-                'model' : 'openerp.model.name',
-                #if true import the table if not just resolve dependencies, use for meta package, by default => True
-                #Not required
-                'import' : True or False,
-                #Not required
-                'dependencies' : [TABLE_1, TABLE_2],
-                #Not required
-                'hook' : self.function_name, #get the val dict of the object, return the same val dict or False
-                'map' : { @see mapper
-                    'openerp_field_name' : 'external_field_name', or val('external_field_name')
-                    'openerp_field_id/id' : ref(TABLE_1, 'external_id_field'), #make the mapping between the external id and the xml on the right
-                    'openerp_field2_id/id_parent' : ref(TABLE_1,'external_id_field') #indicate a self dependencies on openerp_field2_id
-                    'state' : map_val('state_equivalent_field', mapping), # use get_state_map to make the mapping between the value of the field and the value of the state
-                    'text_field' : concat('field_1', 'field_2', .., delimiter=':'), #concat the value of the list of field in one
-                    'description_field' : ppconcat('field_1', 'field_2', .., delimiter='\n\t'), #same as above but with a prettier formatting
-                    'field' : call(callable, arg1, arg2, ..), #call the function with all the value, the function should send the value : self.callable
-                    'field' : callable
-                    'field' : call(method, val('external_field') interface of method is self, val where val is the value of the field
-                    'field' : const(value) #always set this field to value
-                    + any custom mapper that you will define
-                }
-            },
-
-            }
-        """
-        return {}
-
-    def default_hook(self, val):
-        """
-            this hook will be apply on each table that don't have hook
-            here we define the identity hook
-        """
-        return val
-
-    def _import_table(self, table):
-        data = self.get_data(table)
-        map = self.get_mapping()[table]['map']
-        hook = self.get_mapping()[table].get('hook', self.default_hook)
-        model = self.get_mapping()[table]['model']
-
-        final_data = []
-        for val in data:
-            res = hook(val)
-            if res:
-                final_data.append(res)
-        return self._save_data(model, dict(map), final_data, table)
-
-    def _save_data(self, model, mapping, datas, table):
-        """
-            @param model: the model of the object to import
-            @param table : the external table where the data come from
-            @param mapping : definition of the mapping
-                             @see: get_mapping
-            @param datas : list of dictionnaries
-                datas = [data_1, data_2, ..]
-                data_i is a map external field_name => value
-                and each data_i have a external id => in data_id['id']
-        """
-        _logger.info(' Importing %s into %s' % (table, model))
-        if not datas:
-            return (0, 'No data found')
-        mapping['id'] = 'id_new'
-        res = []
-
-
-        self_dependencies = []
-        for k in mapping.keys():
-            if '_parent' in k:
-                self_dependencies.append((k[:-7], mapping.pop(k)))
-
-        for data in datas:
-            for k, field_name in self_dependencies:
-                data[k] = data.get(field_name) and self._generate_xml_id(data.get(field_name), table)
-
-            data['id_new'] = self._generate_xml_id(self.get_external_id(data), table)
-            fields, values = self._fields_mapp(data, mapping, table)
-            res.append(values)
-
-        model_obj = self.obj.pool.get(model)
-        if not model_obj:
-            raise ValueError(_("%s is not a valid model name.") % model)
-        _logger.debug(_(" fields imported : ") + str(fields))
-        (p, r, warning, s) = model_obj.import_data(self.cr, self.uid, fields, res, mode='update', current_module=self.module_name, noupdate=True, context=self.context)
-        for (field, field_name) in self_dependencies:
-            self._import_self_dependencies(model_obj, field, datas)
-        return (len(res), warning)
-
-    def _import_self_dependencies(self, obj, parent_field, datas):
-        """
-            @param parent_field: the name of the field that generate a self_dependencies, we call the object referenced in this
-                field the parent of the object
-            @param datas: a list of dictionnaries
-                Dictionnaries need to contains
-                    id_new : the xml_id of the object
-                    field_new : the xml_id of the parent
-        """
-        fields = ['id', parent_field]
-        for data in datas:
-            if data.get(parent_field):
-                values = [data['id_new'], data[parent_field]]
-                obj.import_data(self.cr, self.uid, fields, [values], mode='update', current_module=self.module_name, noupdate=True, context=self.context)
-
-    def _preprocess_mapping(self, mapping):
-        """
-            Preprocess the mapping :
-            after the preprocces, everything is
-            callable in the val of the dictionary
-
-            use to allow syntaxical sugar like 'field': 'external_field'
-            instead of 'field' : value('external_field')
-        """
-        map = dict(mapping)
-        for key, value in map.items():
-            if isinstance(value, basestring):
-                map[key] = mapper.value(value)
-            #set parent for instance of dbmapper
-            elif isinstance(value, mapper.dbmapper):
-                value.set_parent(self)
-        return map
-
-
-    def _fields_mapp(self,dict_sugar, openerp_dict, table):
-        """
-            call all the mapper and transform data
-            to be compatible with import_data
-        """
-        fields=[]
-        data_lst = []
-        mapping = self._preprocess_mapping(openerp_dict)
-        for key,val in mapping.items():
-            if key not in fields and dict_sugar:
-                fields.append(key)
-                value = val(dict(dict_sugar))
-                data_lst.append(value)
-        return fields, data_lst
-
-    def _generate_xml_id(self, name, table):
-        """
-            @param name: name of the object, has to be unique in for a given table
-            @param table : table where the record we want generate come from
-            @return: a unique xml id for record, the xml_id will be the same given the same table and same name
-                     To be used to avoid duplication of data that don't have ids
-        """
-        sugar_instance = self.instance_name
-        name = name.replace('.', '_').replace(',', '_')
-        return sugar_instance + "_" + table + "_" + name
-
-
-    """
-        Public interface of the framework
-        those function can be use in the callable function defined in the mapping
-    """
-    def xml_id_exist(self, table, external_id):
-        """
-            Check if the external id exist in the openerp database
-            in order to check if the id exist the table where it come from
-            should be provide
-            @return the xml_id generated if the external_id exist in the database or false
-        """
-        if not external_id:
-            return False
-
-        xml_id = self._generate_xml_id(external_id, table)
-        id = self.obj.pool.get('ir.model.data').search(self.cr, self.uid, [('name', '=', xml_id), ('module', '=', self.module_name)])
-        return id and xml_id or False
-
-    def name_exist(self, table, name, model):
-        """
-            Check if the object with the name exist in the openerp database
-            in order to check if the id exist the table where it come from
-            should be provide and the model of the object
-        """
-        fields = ['name']
-        data = [name]
-        return self.import_object(fields, data, model, table, name, [('name', '=', name)])
-
-    def get_mapped_id(self, table, external_id, context=None):
-        """
-            @return return the databse id linked with the external_id
-        """
-        if not external_id:
-            return False
-
-        xml_id = self._generate_xml_id(external_id, table)
-        return self.obj.pool.get('ir.model.data').get_object_reference(self.cr, self.uid, self.module_name, xml_id)[1]
-
-    def import_object_mapping(self, mapping, data, model, table, name, domain_search=False):
-        """
-            same as import_objects but instead of two list fields and data,
-            this method take a dictionnaries : external_field : value
-                            and the mapping similar to the one define in 'map' key
-            @see import_object, get_mapping
-        """
-        fields, datas = self._fields_mapp(data, mapping, table)
-        return self.import_object(fields, datas, model, table, name, domain_search)
-
-    def import_object(self, fields, data, model, table, name, domain_search=False):
-        """
-            This method will import an object in the openerp, usefull for field that is only a char in sugar and is an object in openerp
-            use import_data that will take care to create/update or do nothing with the data
-            this method return the xml_id
-
-            To be use, when you want to create an object or link if already exist
-            use DO_NOT_LINK_DOMAIN to create always a new object
-            @param fields: list of fields needed to create the object without id
-            @param data: the list of the data, in the same order as the field
-                ex : fields = ['firstname', 'lastname'] ; data = ['John', 'Mc donalds']
-            @param model: the openerp's model of the create/update object
-            @param table: the table where data come from in sugarcrm, no need to fit the real name of openerp name, just need to be unique
-            @param unique_name: the name of the object that we want to create/update get the id
-            @param domain_search : the domain that should find the unique existing record
-
-            @return: the xml_id of the ressources
-        """
-        domain_search = not domain_search and [('name', 'ilike', name)] or domain_search
-        obj = self.obj.pool.get(model)
-        if not obj: #if the model doesn't exist
-            return False
-
-        xml_id = self._generate_xml_id(name, table)
-        xml_ref = self.mapped_id_if_exist(model, domain_search, table, name)
-        fields.append('id')
-        data.append(xml_id)
-        obj.import_data(self.cr, self.uid, fields, [data], mode='update', current_module=self.module_name, noupdate=True, context=self.context)
-        return xml_ref or xml_id
-
-
-    def mapped_id_if_exist(self, model, domain, table, name):
-        """
-            To be use when we want link with and existing object, if the object don't exist
-            just ignore.
-            @param domain : search domain to find existing record, should return a unique record
-            @param xml_id: xml_id give to the mapping
-            @param name: external_id or name of the object to create if there is no id
-            @param table: the name of the table of the object to map
-            @return : the xml_id if the record exist in the db, False otherwise
-        """
-        obj = self.obj.pool.get(model)
-        ids = obj.search(self.cr, self.uid, domain, context=self.context)
-        if ids:
-            xml_id = self._generate_xml_id(name, table)
-            ir_model_data_obj = obj.pool.get('ir.model.data')
-            id = ir_model_data_obj._update(self.cr, self.uid, model,
-                             self.module_name, {}, mode='update', xml_id=xml_id,
-                             noupdate=True, res_id=ids[0], context=self.context)
-            return xml_id
-        return False
-
-
-    def set_table_list(self, table_list):
-        """
-            Set the list of table to import, this method should be call before run
-            @param table_list: the list of external table to import
-               ['Leads', 'Opportunity']
-        """
-        self.table_list = table_list
-
-    def run(self):
-        """
-            Import all data into openerp,
-            this is the Entry point to launch the process of import
-
-
-        """
-        self.data_started = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        self.cr = pooler.get_db(self.cr.dbname).cursor()
-        error = False
-        result = []
-        try:
-            self.init_run()
-            imported = set() #to invoid importing 2 times the sames modules
-            for table in self.table_list:
-                to_import = self.get_mapping()[table].get('import', True)
-                if not table in imported:
-                    res = self._resolve_dependencies(self.get_mapping()[table].get('dependencies', []), imported)
-                    result.extend(res)
-                    if to_import:
-                        (position, warning) = self._import_table(table)
-                        result.append((table, position, warning))
-                    imported.add(table)
-            self.cr.commit()
-
-        except Exception, err:
-            sh = StringIO.StringIO()
-            traceback.print_exc(file=sh)
-            error = sh.getvalue()
-            print error
-
-
-        self.date_ended = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        self._send_notification_email(result, error)
-
-        self.cr.close()
-
-    def _resolve_dependencies(self, dep, imported):
-        """
-            import dependencies recursively
-            and avoid to import twice the same table
-        """
-        result = []
-        for dependency in dep:
-            if not dependency in imported:
-                to_import = self.get_mapping()[dependency].get('import', True)
-                res = self._resolve_dependencies(self.get_mapping()[dependency].get('dependencies', []), imported)
-                result.extend(res)
-                if to_import:
-                    r = self._import_table(dependency)
-                    (position, warning) = r
-                    result.append((dependency, position, warning))
-                imported.add(dependency)
-        return result
-
-    def _send_notification_email(self, result, error):
-        if not self.email:
-            return False	
-        email_obj = self.obj.pool.get('mail.message')
-        email_id = email_obj.create(self.cr, self.uid, {
-            'email_from' : 'import@module.openerp',
-            'email_to' : self.email,
-            'body_text' : self.get_email_body(result, error),
-            'subject' : self.get_email_subject(result, error),
-            'auto_delete' : True})
-        email_obj.send(self.cr, self.uid, [email_id])
-        if error:
-            _logger.error(_("Import failed due to an unexpected error"))
-        else:
-            _logger.info(_("Import finished, notification email sended"))
-
-    def get_email_subject(self, result, error=False):
-        """
-            This method define the subject of the email send by openerp at the end of import
-            @param result: a list of tuple
-                (table_name, number_of_record_created/updated, warning) for each table
-            @return the subject of the mail
-
-        """
-        if error:
-            return _("Data Import failed at %s due to an unexpected error") % self.date_ended
-        return _("Import of your data finished at %s") % self.date_ended
-
-    def get_email_body(self, result, error=False):
-        """
-            This method define the body of the email send by openerp at the end of import. The body is separated in two part
-            the header (@see get_body_header), and the generate body with the list of table and number of record imported.
-            If you want to keep this it's better to overwrite get_body_header
-            @param result: a list of tuple
-                (table_name, number_of_record_created/updated, warning) for each table
-            @return the subject of the mail
-
-        """
-
-        body = _("started at %s and finished at %s \n") % (self.data_started, self.date_ended)
-        if error:
-            body += _("but failed, in consequence no data were imported to keep database consistency \n error : \n") + error
-
-        for (table, nb, warning) in result:
-            if not warning:
-                warning = _("with no warning")
-            else:
-                warning = _("with warning : %s") % warning
-            body += _("%s has been successfully imported from %s %s, %s \n") % (nb, self.instance_name, table, warning)
-        return self.get_body_header(result) + "\n\n" + body
-
-    def get_body_header(self, result):
-        """
-            @return the first sentences written in the mail's body
-        """
-        return _("The import of data \n instance name : %s \n") % self.instance_name
-
-
-    #TODO documentation test
-    def run_test(self):
-        back_get_data = self.get_data
-        back_get_link = self.get_link
-        back_init = self.initialize
-        self.get_data = self.get_data_test
-        self.get_link = self.get_link_test
-        self.initialize = self.intialize_test
-        self.run()
-        self.get_data = back_get_data
-        self.get_link = back_get_link
-        self.initialize = back_init
-
-    def get_data_test(self, table):
-        return [{}]
-
-    def get_link_test(self, from_table, ids, to_table):
-        return {}
-
-    def intialize_test(self):
-        pass
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_base/mapper.py b/addons/import_base/mapper.py
deleted file mode 100644
index d68447ad3dd..00000000000
--- a/addons/import_base/mapper.py
+++ /dev/null
@@ -1,171 +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 tools
-
-class mapper(object):
-    """
-        super class for all mapper class
-        They are call before import data
-        to transform the mapping into real value that we
-        will import
-        
-        the call function receive a dictionary with external data
-            'external_field' : value
-    """
-    def __call__(self, external_values):
-        raise NotImplementedError()
-
-class dbmapper(mapper):
-    """
-        Super class for mapper that need to access to 
-        data base or any function of the import_framework
-        
-        self.parent contains a reference to the instance of
-        the import framework
-    """
-    def set_parent(self, parent):
-        self.parent = parent
-        
-
-class concat(mapper):
-    """
-        Use : contact('field_name1', 'field_name2', delimiter='_')
-        concat value of fields using the delimiter, delimiter is optional
-        and by default is a space
-    """
-    def __init__(self, *arg, **delimiter):
-        self.arg = arg
-        self.delimiter = delimiter and delimiter.get('delimiter', ' ') or ' '
-        
-    def __call__(self, external_values):
-        return self.delimiter.join(map(lambda x : tools.ustr(external_values.get(x,'')), self.arg))
-    
-class ppconcat(mapper):
-    """
-        Use : contact('field_name1', 'field_name2', delimiter='_')
-        concat external field name and value of fields using the delimiter, 
-        delimiter is optional and by default is a two line feeds
-        
-    """
-    def __init__(self, *arg, **delimiter):
-        self.arg = arg
-        self.delimiter = delimiter and delimiter.get('delimiter', ' ') or '\n\n'
-        
-    def __call__(self, external_values):
-        return self.delimiter.join(map(lambda x : x + ": " + tools.ustr(external_values.get(x,'')), self.arg))
-    
-class const(mapper):
-    """
-        Use : const(arg)
-        return always arg
-    """
-    def __init__(self, val):
-        self.val = val
-        
-    def __call__(self, external_values):
-        return self.val 
-    
-class value(mapper):
-    """
-        Use : value(external_field_name)
-        Return the value of the external field name
-        this is equivalent to the a single string
-        
-        usefull for call if you want your call get the value
-        and don't care about the name of the field
-        call(self.method, value('field1'))
-    """
-    def __init__(self, val, default='', fallback=False):
-        self.val = val
-        self.default = default
-        self.fallback = fallback
-        
-    def __call__(self, external_values):
-        val = external_values.get(self.val, self.default) 
-        if self.fallback and (not val or val == self.default):
-            val = external_values.get(self.fallback, self.default)
-        return val 
-    
-    
-class map_val(mapper):
-    """
-        Use : map_val(external_field, val_mapping)
-        where val_mapping is a dictionary 
-        with external_val : openerp_val
-        
-        usefull for selection field like state
-        to map value 
-    """
-    def __init__(self, val, map, default='draft'):
-        self.val = value(val)
-        self.map = map
-        self.default = default
-        
-    def __call__(self, external_values):
-        return self.map.get(self.val(external_values), self.default)
-    
-class ref(dbmapper):
-    """
-        Use : ref(table_name, external_id)
-        return the xml_id of the ressource
-        
-        to associate an already imported object with the current object
-    """
-    def __init__(self, table, field_name):
-        self.table = table
-        self.field_name = field_name
-        
-    def __call__(self, external_values):
-        return self.parent.xml_id_exist(self.table, external_values.get(self.field_name))
-  
-class refbyname(dbmapper):  
-    """
-        Use : refbyname(table_name, external_name, res.model)
-        same as ref but use the name of the ressource to find it
-    """
-    def __init__(self, table, field_name, model):
-        self.table = table
-        self.field_name = field_name
-        self.model = model
-        
-    def __call__(self, external_values):
-        v = external_values.get(self.field_name, '')
-        return self.parent.name_exist(self.table, v , self.model)
-        
-class call(mapper):
-    """
-        Use : call(function, arg1, arg2)
-        to call the function with external val follow by the arg specified 
-    """
-    def __init__(self, fun, *arg):
-        self.fun = fun
-        self.arg = arg
-    
-    def __call__(self, external_values):
-        args = []
-        for arg in self.arg:
-            if isinstance(arg, mapper):
-                args.append(arg(external_values))
-            else:
-                args.append(arg)
-        return self.fun(external_values, *args)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/__openerp__.py b/addons/import_google/__openerp__.py
deleted file mode 100644
index 9e47a213072..00000000000
--- a/addons/import_google/__openerp__.py
+++ /dev/null
@@ -1,45 +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/>.
-#
-##############################################################################
-
-{
-    'name': 'Google Import',
-    'version': '1.0',
-    'category': 'Customer Relationship Management',
-    'description': """The module adds google contact in partner address and add google calendar events details in Meeting.""",
-    'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'depends': ['base', 'import_base', 'google_base_account', 'base_calendar'],
-    'init_xml': [],
-    'update_xml': ['security/ir.model.access.csv',
-                'sync_google_calendar_view.xml',
-                'wizard/import_google_data_view.xml',
-                'wizard/google_import_message_view.xml'
-
-               ],
-    'demo_xml': [],
-    'test': [
-             #'test/test_sync_google_contact_import_partner.yml',
-             #'test/test_sync_google_calendar.yml',
-    ],
-    'installable': True,
-    'auto_install': False,
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/i18n/ar.po b/addons/import_google/i18n/ar.po
deleted file mode 100644
index a5e6d0f2dbb..00000000000
--- a/addons/import_google/i18n/ar.po
+++ /dev/null
@@ -1,224 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-07 15:59+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_google
-#: help:synchronize.google.import,group_name:0
-msgid "Choose which group to import, By default it takes all."
-msgstr "قم باختيار أي مجموعة لتقوم بجلبها، افتراضياً يقوم بأخذ الكل"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Google Calendar Events"
-msgstr "قم بجلب أحداث تقويم جوجل"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Events"
-msgstr "_جلب الأحداث"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid ""
-"No Google Username or password Defined for user.\n"
-"Please define in user view"
-msgstr ""
-"لم يتم تعريف اسم مستخدم جوجل و لا كلمة مرور للمستخدم\n"
-"رجاء قم بالتعريف في رؤية المستخدم"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#, python-format
-msgid ""
-"Invalid login detail !\n"
-" Specify Username/Password."
-msgstr ""
-"تفاصيل الدخول غير صالحة!\n"
-"* حدد اسم المستخدم/كلمة الرور ."
-
-#. module: import_google
-#: field:synchronize.google.import,supplier:0
-msgid "Supplier"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Options"
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,group_name:0
-msgid "Group Name"
-msgstr ""
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_crm_case_categ
-msgid "Category of Case"
-msgstr ""
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
-#: model:ir.ui.menu,name:import_google.menu_sync_contact
-msgid "Import Google Contacts"
-msgstr "جلب اتصالات قوقل"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "Import Google Data"
-msgstr "جلب معلومات جوجل"
-
-#. module: import_google
-#: view:crm.meeting:0
-msgid "Meeting Type"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid ""
-"Please install gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-msgstr ""
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_login
-msgid "Google Contact"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import contacts from a google account"
-msgstr "جلب الاتصالات من حساب جوجل"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Please specify correct user and password !"
-msgstr "رجاء قم بتحديد الاسم وكلمة المرور الصحيحة !"
-
-#. module: import_google
-#: field:synchronize.google.import,customer:0
-msgid "Customer"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_synchronize_google_import
-msgid "synchronize.google.import"
-msgstr "synchronize.google.import"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Contacts"
-msgstr "إستيراد جهة الإتصال"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_form
-#: model:ir.ui.menu,name:import_google.menu_sync_calendar
-msgid "Import Google Calendar"
-msgstr "‘ستيراد تقويم جوجل"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:50
-#, python-format
-msgid "Import google"
-msgstr "اجلب قوقل"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,create_partner:0
-msgid "Options"
-msgstr ""
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "_Ok"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Google Contacts Import Error!"
-msgstr ""
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_import_message
-msgid "Import Message"
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,calendar_name:0
-msgid "Calendar Name"
-msgstr "اسم التقويم"
-
-#. module: import_google
-#: help:synchronize.google.import,supplier:0
-msgid "Check this box to set newly created partner as Supplier."
-msgstr "قم باختيار هذا المربع لإنشاء شريك جديد كمورد"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Import only address"
-msgstr "اجلب فقط العنوان"
-
-#. module: import_google
-#: field:crm.case.categ,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Partner Status for this Group:"
-msgstr ""
-
-#. module: import_google
-#: field:google.import.message,name:0
-msgid "Message"
-msgstr ""
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Create partner for each contact"
-msgstr "انشاء شريك لكل اتصال"
-
-#. module: import_google
-#: help:synchronize.google.import,customer:0
-msgid "Check this box to set newly created partner as Customer."
-msgstr "تحقق من هذا المربع ليتم وضع الشريك الجديد كمورد"
-
-#~ msgid "Partner status for this group:"
-#~ msgstr "حالة الشريك لهذه المجموعة:"
diff --git a/addons/import_google/i18n/de.po b/addons/import_google/i18n/de.po
deleted file mode 100644
index fe2ed0c5b90..00000000000
--- a/addons/import_google/i18n/de.po
+++ /dev/null
@@ -1,226 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:48+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_google
-#: help:synchronize.google.import,group_name:0
-msgid "Choose which group to import, By default it takes all."
-msgstr "Wählen Sie die zu importierenden Gruppen, Standard sind alle"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Google Calendar Events"
-msgstr "Importiere Goggle Kalender Termine"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Events"
-msgstr "_Import Termine"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid ""
-"No Google Username or password Defined for user.\n"
-"Please define in user view"
-msgstr ""
-"Kein Google Benutzer oder Passwort definiert.\n"
-"Bitte diese in der Benuzter Sicht definieren"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#, python-format
-msgid ""
-"Invalid login detail !\n"
-" Specify Username/Password."
-msgstr ""
-"Ungültiges Login Detail!\n"
-" Geben Sie Benuztername und Passwort ein!"
-
-#. module: import_google
-#: field:synchronize.google.import,supplier:0
-msgid "Supplier"
-msgstr "Lieferant"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Options"
-msgstr "Import-Einstellungen"
-
-#. module: import_google
-#: field:synchronize.google.import,group_name:0
-msgid "Group Name"
-msgstr "Gruppe Bezeichnung"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_crm_case_categ
-msgid "Category of Case"
-msgstr "Fall Kategorie"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
-#: model:ir.ui.menu,name:import_google.menu_sync_contact
-msgid "Import Google Contacts"
-msgstr "Import Google Kontakte"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "Import Google Data"
-msgstr "Import Google Data"
-
-#. module: import_google
-#: view:crm.meeting:0
-msgid "Meeting Type"
-msgstr "Terminart"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid ""
-"Please install gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-msgstr ""
-"Bitte installieren Sie gdata-python-client von "
-"http://code.google.com/p/gdata-python-client/downloads/list"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_login
-msgid "Google Contact"
-msgstr "Google Kontakt"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import contacts from a google account"
-msgstr "Importiere Kontakte von einem Google Konto"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Please specify correct user and password !"
-msgstr "Bitte richtigen Namen und Passwort eingeben!"
-
-#. module: import_google
-#: field:synchronize.google.import,customer:0
-msgid "Customer"
-msgstr "Kunde"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Cancel"
-msgstr "_Abbrechen"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_synchronize_google_import
-msgid "synchronize.google.import"
-msgstr "synchronize.google.import"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Contacts"
-msgstr "_Importiere Kontakte"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_form
-#: model:ir.ui.menu,name:import_google.menu_sync_calendar
-msgid "Import Google Calendar"
-msgstr "Import Google Kalender"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:50
-#, python-format
-msgid "Import google"
-msgstr "Import Google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Error"
-msgstr "Fehler"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "Warning !"
-msgstr "Warnung !"
-
-#. module: import_google
-#: field:synchronize.google.import,create_partner:0
-msgid "Options"
-msgstr "Einstellungen"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "_Ok"
-msgstr "_OK"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Google Contacts Import Error!"
-msgstr "Google Kontakt Import Fehler!"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_import_message
-msgid "Import Message"
-msgstr "Importiere Nachricht"
-
-#. module: import_google
-#: field:synchronize.google.import,calendar_name:0
-msgid "Calendar Name"
-msgstr "Kalendername"
-
-#. module: import_google
-#: help:synchronize.google.import,supplier:0
-msgid "Check this box to set newly created partner as Supplier."
-msgstr "Anhaken, um den neuen Partner als Lieferant zu kennzeichnen"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Import only address"
-msgstr "Importiere nur Adressen"
-
-#. module: import_google
-#: field:crm.case.categ,user_id:0
-msgid "User"
-msgstr "Benutzer"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Partner Status for this Group:"
-msgstr "Partner Status für diese Gruppe:"
-
-#. module: import_google
-#: field:google.import.message,name:0
-msgid "Message"
-msgstr "Mitteilung"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Create partner for each contact"
-msgstr "Erzeuge Partner für jeden Kontakt"
-
-#. module: import_google
-#: help:synchronize.google.import,customer:0
-msgid "Check this box to set newly created partner as Customer."
-msgstr "Anhaken, um den neuen Partner als Kunden zu kennzeichnen"
-
-#~ msgid "Partner status for this group:"
-#~ msgstr "Partner Status für diese Gruppe:"
diff --git a/addons/import_google/i18n/es.po b/addons/import_google/i18n/es.po
deleted file mode 100644
index 3db7c708258..00000000000
--- a/addons/import_google/i18n/es.po
+++ /dev/null
@@ -1,217 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-21 21:08+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_google
-#: help:synchronize.google.import,group_name:0
-msgid "Choose which group to import, By default it takes all."
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Google Calendar Events"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Events"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid ""
-"No Google Username or password Defined for user.\n"
-"Please define in user view"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#, python-format
-msgid ""
-"Invalid login detail !\n"
-" Specify Username/Password."
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,supplier:0
-msgid "Supplier"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Options"
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,group_name:0
-msgid "Group Name"
-msgstr ""
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_crm_case_categ
-msgid "Category of Case"
-msgstr ""
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
-#: model:ir.ui.menu,name:import_google.menu_sync_contact
-msgid "Import Google Contacts"
-msgstr ""
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "Import Google Data"
-msgstr ""
-
-#. module: import_google
-#: view:crm.meeting:0
-msgid "Meeting Type"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid ""
-"Please install gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-msgstr ""
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_login
-msgid "Google Contact"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import contacts from a google account"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Please specify correct user and password !"
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,customer:0
-msgid "Customer"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_synchronize_google_import
-msgid "synchronize.google.import"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Contacts"
-msgstr ""
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_form
-#: model:ir.ui.menu,name:import_google.menu_sync_calendar
-msgid "Import Google Calendar"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:50
-#, python-format
-msgid "Import google"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,create_partner:0
-msgid "Options"
-msgstr ""
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "_Ok"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Google Contacts Import Error!"
-msgstr ""
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_import_message
-msgid "Import Message"
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,calendar_name:0
-msgid "Calendar Name"
-msgstr ""
-
-#. module: import_google
-#: help:synchronize.google.import,supplier:0
-msgid "Check this box to set newly created partner as Supplier."
-msgstr ""
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Import only address"
-msgstr ""
-
-#. module: import_google
-#: field:crm.case.categ,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Partner Status for this Group:"
-msgstr ""
-
-#. module: import_google
-#: field:google.import.message,name:0
-msgid "Message"
-msgstr ""
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Create partner for each contact"
-msgstr ""
-
-#. module: import_google
-#: help:synchronize.google.import,customer:0
-msgid "Check this box to set newly created partner as Customer."
-msgstr ""
diff --git a/addons/import_google/i18n/es_CR.po b/addons/import_google/i18n/es_CR.po
deleted file mode 100644
index 2d21a82ab5f..00000000000
--- a/addons/import_google/i18n/es_CR.po
+++ /dev/null
@@ -1,229 +0,0 @@
-# Spanish (Costa Rica) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-17 15:57+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
-"Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_google
-#: help:synchronize.google.import,group_name:0
-msgid "Choose which group to import, By default it takes all."
-msgstr ""
-"Elija a qué grupo importar, de forma predeterminada se lo lleva todo."
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Google Calendar Events"
-msgstr "Importar calendario de eventos calendar"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Events"
-msgstr "_Importar Eventos"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid ""
-"No Google Username or password Defined for user.\n"
-"Please define in user view"
-msgstr ""
-"No Nombre de usuario o contraseña definida por Google para el usuario.\n"
-"Por favor, defina en el punto de vista del usuario"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#, python-format
-msgid ""
-"Invalid login detail !\n"
-" Specify Username/Password."
-msgstr ""
-"¡Datos de acceso no válido!\n"
-"  Especifique nombre de usuario / contraseña."
-
-#. module: import_google
-#: field:synchronize.google.import,supplier:0
-msgid "Supplier"
-msgstr "Proveedor"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Options"
-msgstr "Opciones de importación"
-
-#. module: import_google
-#: field:synchronize.google.import,group_name:0
-msgid "Group Name"
-msgstr "Nombre grupo"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_crm_case_categ
-msgid "Category of Case"
-msgstr "Categoría de caso"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
-#: model:ir.ui.menu,name:import_google.menu_sync_contact
-msgid "Import Google Contacts"
-msgstr "Importar contactos de google"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "Import Google Data"
-msgstr "Importar datos de google"
-
-#. module: import_google
-#: view:crm.meeting:0
-msgid "Meeting Type"
-msgstr "Tipo de reunión"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid ""
-"Please install gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-msgstr ""
-"Por favor instale gdata-python-client desde http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_login
-msgid "Google Contact"
-msgstr "Contacto Google"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import contacts from a google account"
-msgstr "Importar contactos desde una cuenta de google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Please specify correct user and password !"
-msgstr "¡Por favor especifique el usuario y contraseña correctos!"
-
-#. module: import_google
-#: field:synchronize.google.import,customer:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_synchronize_google_import
-msgid "synchronize.google.import"
-msgstr "synchronize.google.import"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Contacts"
-msgstr "_Importar Contactos"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_form
-#: model:ir.ui.menu,name:import_google.menu_sync_calendar
-msgid "Import Google Calendar"
-msgstr "Importar calendario de google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:50
-#, python-format
-msgid "Import google"
-msgstr "Importar google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "Warning !"
-msgstr "¡ Advertencia !"
-
-#. module: import_google
-#: field:synchronize.google.import,create_partner:0
-msgid "Options"
-msgstr "Opciones"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "_Ok"
-msgstr "_Aceptar"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Google Contacts Import Error!"
-msgstr "¡Contactos de Google Error de importación!"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_import_message
-msgid "Import Message"
-msgstr "Importar mensaje"
-
-#. module: import_google
-#: field:synchronize.google.import,calendar_name:0
-msgid "Calendar Name"
-msgstr "Nombre de calendario"
-
-#. module: import_google
-#: help:synchronize.google.import,supplier:0
-msgid "Check this box to set newly created partner as Supplier."
-msgstr ""
-"Marque esta casilla para establecer socios de nueva creación como proveedor."
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Import only address"
-msgstr "Importar solo direcciones"
-
-#. module: import_google
-#: field:crm.case.categ,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Partner Status for this Group:"
-msgstr ""
-
-#. module: import_google
-#: field:google.import.message,name:0
-msgid "Message"
-msgstr "Mensaje"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Create partner for each contact"
-msgstr "Crear socio para cada contacto"
-
-#. module: import_google
-#: help:synchronize.google.import,customer:0
-msgid "Check this box to set newly created partner as Customer."
-msgstr ""
-"Marque esta casilla para establecer pareja recién creado como cliente."
-
-#~ msgid "Partner status for this group:"
-#~ msgstr "Socio de estado para este grupo:"
diff --git a/addons/import_google/i18n/fr.po b/addons/import_google/i18n/fr.po
deleted file mode 100644
index 20fb4c3a617..00000000000
--- a/addons/import_google/i18n/fr.po
+++ /dev/null
@@ -1,230 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-03-21 18:30+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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_google
-#: help:synchronize.google.import,group_name:0
-msgid "Choose which group to import, By default it takes all."
-msgstr "Choisisser le groupe a importer, par défaut il les prend tous"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Google Calendar Events"
-msgstr "Importation des évènements du calendrier"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Events"
-msgstr "_Importer les évènements"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid ""
-"No Google Username or password Defined for user.\n"
-"Please define in user view"
-msgstr ""
-"Pas de nom et d'utilisateur Google définit pour cet utilisateur.\n"
-"Veuillez en définir un pour la vue utilisateur"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#, python-format
-msgid ""
-"Invalid login detail !\n"
-" Specify Username/Password."
-msgstr ""
-"Détail de connexion non valide!\n"
-" Spécifier un Utilisateur/Mot de passe."
-
-#. module: import_google
-#: field:synchronize.google.import,supplier:0
-msgid "Supplier"
-msgstr "Fournisseur"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Options"
-msgstr "Options d'importation"
-
-#. module: import_google
-#: field:synchronize.google.import,group_name:0
-msgid "Group Name"
-msgstr "Nom du groupe"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_crm_case_categ
-msgid "Category of Case"
-msgstr "Catégorie de cas"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
-#: model:ir.ui.menu,name:import_google.menu_sync_contact
-msgid "Import Google Contacts"
-msgstr "Importer les contacts Google"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "Import Google Data"
-msgstr "Importer les données Google"
-
-#. module: import_google
-#: view:crm.meeting:0
-msgid "Meeting Type"
-msgstr "Type de réunion"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid ""
-"Please install gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-msgstr ""
-"Merci d'installer gdata-python-client à partir de "
-"http://code.google.com/p/gdata-python-client/downloads/list"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_login
-msgid "Google Contact"
-msgstr "Contact Google"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import contacts from a google account"
-msgstr "Importer les contacts depuis un compte google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Please specify correct user and password !"
-msgstr "Veuiller spécifier un utilisateur et un mot de passe correct !"
-
-#. module: import_google
-#: field:synchronize.google.import,customer:0
-msgid "Customer"
-msgstr "Client"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Cancel"
-msgstr "_Annuler"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_synchronize_google_import
-msgid "synchronize.google.import"
-msgstr "synchronize.google.import"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Contacts"
-msgstr "_Importer les contacts"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_form
-#: model:ir.ui.menu,name:import_google.menu_sync_calendar
-msgid "Import Google Calendar"
-msgstr "Importer les calendriers Google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:50
-#, python-format
-msgid "Import google"
-msgstr "Import Google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Error"
-msgstr "Erreur"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "Warning !"
-msgstr "Avertissement !"
-
-#. module: import_google
-#: field:synchronize.google.import,create_partner:0
-msgid "Options"
-msgstr "Options"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Google Contacts Import Error!"
-msgstr "Erreur lors de l'import des contacts Google !"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_import_message
-msgid "Import Message"
-msgstr "Importer un message"
-
-#. module: import_google
-#: field:synchronize.google.import,calendar_name:0
-msgid "Calendar Name"
-msgstr "Nom du calendrier"
-
-#. module: import_google
-#: help:synchronize.google.import,supplier:0
-msgid "Check this box to set newly created partner as Supplier."
-msgstr ""
-"Cocher cette case pour mettre les nouveaux partenaires crées comme "
-"fournisseur."
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Import only address"
-msgstr "Importer les adresses seulement"
-
-#. module: import_google
-#: field:crm.case.categ,user_id:0
-msgid "User"
-msgstr "utilisateur"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Partner Status for this Group:"
-msgstr ""
-
-#. module: import_google
-#: field:google.import.message,name:0
-msgid "Message"
-msgstr "Message"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Create partner for each contact"
-msgstr "Créer un partenaire pour chaque contact"
-
-#. module: import_google
-#: help:synchronize.google.import,customer:0
-msgid "Check this box to set newly created partner as Customer."
-msgstr ""
-"Cocher cette case pour mettre les nouveaux partenaires créer en tant que "
-"client"
-
-#~ msgid "Partner status for this group:"
-#~ msgstr "Statut du partenaire pour ce groupe"
diff --git a/addons/import_google/i18n/import_google.pot b/addons/import_google/i18n/import_google.pot
deleted file mode 100644
index 6693d75616f..00000000000
--- a/addons/import_google/i18n/import_google.pot
+++ /dev/null
@@ -1,212 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* import_google
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+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: import_google
-#: help:synchronize.google.import,group_name:0
-msgid "Choose which group to import, By default it takes all."
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Google Calendar Events"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Events"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "No Google Username or password Defined for user.\n"
-"Please define in user view"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#, python-format
-msgid "Invalid login detail !\n"
-" Specify Username/Password."
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,supplier:0
-msgid "Supplier"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Options"
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,group_name:0
-msgid "Group Name"
-msgstr ""
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_crm_case_categ
-msgid "Category of Case"
-msgstr ""
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
-#: model:ir.ui.menu,name:import_google.menu_sync_contact
-msgid "Import Google Contacts"
-msgstr ""
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "Import Google Data"
-msgstr ""
-
-#. module: import_google
-#: view:crm.meeting:0
-msgid "Meeting Type"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list"
-msgstr ""
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_login
-msgid "Google Contact"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import contacts from a google account"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Please specify correct user and password !"
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,customer:0
-msgid "Customer"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_synchronize_google_import
-msgid "synchronize.google.import"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Contacts"
-msgstr ""
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_form
-#: model:ir.ui.menu,name:import_google.menu_sync_calendar
-msgid "Import Google Calendar"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:50
-#, python-format
-msgid "Import google"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,create_partner:0
-msgid "Options"
-msgstr ""
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "_Ok"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Google Contacts Import Error!"
-msgstr ""
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_import_message
-msgid "Import Message"
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,calendar_name:0
-msgid "Calendar Name"
-msgstr ""
-
-#. module: import_google
-#: help:synchronize.google.import,supplier:0
-msgid "Check this box to set newly created partner as Supplier."
-msgstr ""
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Import only address"
-msgstr ""
-
-#. module: import_google
-#: field:crm.case.categ,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Partner Status for this Group:"
-msgstr ""
-
-#. module: import_google
-#: field:google.import.message,name:0
-msgid "Message"
-msgstr ""
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Create partner for each contact"
-msgstr ""
-
-#. module: import_google
-#: help:synchronize.google.import,customer:0
-msgid "Check this box to set newly created partner as Customer."
-msgstr ""
-
diff --git a/addons/import_google/i18n/ja.po b/addons/import_google/i18n/ja.po
deleted file mode 100644
index 452a84f76b4..00000000000
--- a/addons/import_google/i18n/ja.po
+++ /dev/null
@@ -1,223 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-09 04:44+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_google
-#: help:synchronize.google.import,group_name:0
-msgid "Choose which group to import, By default it takes all."
-msgstr "インポートするグループを選択して下さい。デフォルトでは全てを取得します。１"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Google Calendar Events"
-msgstr "Googleカレンダーイベントのインポート"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Events"
-msgstr "イベントのインポート"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid ""
-"No Google Username or password Defined for user.\n"
-"Please define in user view"
-msgstr ""
-"ユーザのGoogleユーザ名またはパスワードが定義されていません。\n"
-"ユーザビューで定義して下さい。"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#, python-format
-msgid ""
-"Invalid login detail !\n"
-" Specify Username/Password."
-msgstr ""
-"ログインの詳細が無効です。\n"
-"　ユーザ名 / パスワードを指定して下さい。"
-
-#. module: import_google
-#: field:synchronize.google.import,supplier:0
-msgid "Supplier"
-msgstr "仕入先"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Options"
-msgstr "インポートオプション"
-
-#. module: import_google
-#: field:synchronize.google.import,group_name:0
-msgid "Group Name"
-msgstr "グループ名"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_crm_case_categ
-msgid "Category of Case"
-msgstr "案件の分類"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
-#: model:ir.ui.menu,name:import_google.menu_sync_contact
-msgid "Import Google Contacts"
-msgstr "Googleコンタクトのインポート"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "Import Google Data"
-msgstr "Googleデータのインポート"
-
-#. module: import_google
-#: view:crm.meeting:0
-msgid "Meeting Type"
-msgstr "ミーティングタイプ"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid ""
-"Please install gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-msgstr ""
-"gdata-python-client をインストールして下さい。URL：http://code.google.com/p/gdata-python-"
-"client/downloads/list"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_login
-msgid "Google Contact"
-msgstr "Googleコンタクト"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import contacts from a google account"
-msgstr "Googleアカウントからコンタクトのインポート"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Please specify correct user and password !"
-msgstr "正しいユーザとパスワードを指定して下さい。"
-
-#. module: import_google
-#: field:synchronize.google.import,customer:0
-msgid "Customer"
-msgstr "顧客"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Cancel"
-msgstr "キャンセル"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_synchronize_google_import
-msgid "synchronize.google.import"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Contacts"
-msgstr "コンタクトのインポート"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_form
-#: model:ir.ui.menu,name:import_google.menu_sync_calendar
-msgid "Import Google Calendar"
-msgstr "Googleカレンダーのインポート"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:50
-#, python-format
-msgid "Import google"
-msgstr "Googleのインポート"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Error"
-msgstr "エラー"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "Warning !"
-msgstr "警告"
-
-#. module: import_google
-#: field:synchronize.google.import,create_partner:0
-msgid "Options"
-msgstr "オプション"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "_Ok"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Google Contacts Import Error!"
-msgstr "Googleコンタクトのインポートエラーです。"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_import_message
-msgid "Import Message"
-msgstr "メッセージのインポート"
-
-#. module: import_google
-#: field:synchronize.google.import,calendar_name:0
-msgid "Calendar Name"
-msgstr "カレンダー名"
-
-#. module: import_google
-#: help:synchronize.google.import,supplier:0
-msgid "Check this box to set newly created partner as Supplier."
-msgstr "仕入先として新しく作成したパートナを設定するにはこのボックスをチェックして下さい。"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Import only address"
-msgstr "住所のみをインポート"
-
-#. module: import_google
-#: field:crm.case.categ,user_id:0
-msgid "User"
-msgstr "ユーザ"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Partner Status for this Group:"
-msgstr "このグループのパートナステータス："
-
-#. module: import_google
-#: field:google.import.message,name:0
-msgid "Message"
-msgstr "メッセージ"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Create partner for each contact"
-msgstr "各コンタクトのパートナの作成"
-
-#. module: import_google
-#: help:synchronize.google.import,customer:0
-msgid "Check this box to set newly created partner as Customer."
-msgstr "顧客として新しく作成したパートナを設定するにはこのボックスをチェックして下さい。"
diff --git a/addons/import_google/i18n/nl.po b/addons/import_google/i18n/nl.po
deleted file mode 100644
index db2e8259556..00000000000
--- a/addons/import_google/i18n/nl.po
+++ /dev/null
@@ -1,229 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:15+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_google
-#: help:synchronize.google.import,group_name:0
-msgid "Choose which group to import, By default it takes all."
-msgstr ""
-"Kies welke groep moet worden geïmporteerd. Standaard worden alle geroepen "
-"genomen"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Google Calendar Events"
-msgstr "Importeer Google agenda afspraken"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Events"
-msgstr "_Importeer afspraken"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid ""
-"No Google Username or password Defined for user.\n"
-"Please define in user view"
-msgstr ""
-"Geen Google gebruikersnaam of wachtwoord gedefinieerd bij de gebruiker.\n"
-"Definieer deze in de gebruikersweergave"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#, python-format
-msgid ""
-"Invalid login detail !\n"
-" Specify Username/Password."
-msgstr ""
-"Ongeldige login detail!\n"
-" Specificeer gebruikersnaam en wachtwoord."
-
-#. module: import_google
-#: field:synchronize.google.import,supplier:0
-msgid "Supplier"
-msgstr "Leverancier"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Options"
-msgstr "Importeeropties"
-
-#. module: import_google
-#: field:synchronize.google.import,group_name:0
-msgid "Group Name"
-msgstr "Groepsnaam"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_crm_case_categ
-msgid "Category of Case"
-msgstr "Dossiercategorie"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
-#: model:ir.ui.menu,name:import_google.menu_sync_contact
-msgid "Import Google Contacts"
-msgstr "Importeer Google contacten"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "Import Google Data"
-msgstr "Importeer Google gegevens"
-
-#. module: import_google
-#: view:crm.meeting:0
-msgid "Meeting Type"
-msgstr "Soort afspraak"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid ""
-"Please install gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-msgstr ""
-"Installeer a.u.b. gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_login
-msgid "Google Contact"
-msgstr "Google Contactpersoon"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import contacts from a google account"
-msgstr "Importeer contacten van een Google account"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Please specify correct user and password !"
-msgstr "Geef alstublieft een juiste gebruikersnaam en wachtwoord op!"
-
-#. module: import_google
-#: field:synchronize.google.import,customer:0
-msgid "Customer"
-msgstr "Klant"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Cancel"
-msgstr "_Annuleren"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_synchronize_google_import
-msgid "synchronize.google.import"
-msgstr "synchronize.google.import"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Contacts"
-msgstr "_Importeer contacten"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_form
-#: model:ir.ui.menu,name:import_google.menu_sync_calendar
-msgid "Import Google Calendar"
-msgstr "Importeer Google agenda"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:50
-#, python-format
-msgid "Import google"
-msgstr "Importeer Google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Error"
-msgstr "Fout"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "Warning !"
-msgstr "Waarschuwing !"
-
-#. module: import_google
-#: field:synchronize.google.import,create_partner:0
-msgid "Options"
-msgstr "Opties"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Google Contacts Import Error!"
-msgstr "Google contactpersonen import fout!"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_import_message
-msgid "Import Message"
-msgstr "Bericht importeren"
-
-#. module: import_google
-#: field:synchronize.google.import,calendar_name:0
-msgid "Calendar Name"
-msgstr "Agendanaam"
-
-#. module: import_google
-#: help:synchronize.google.import,supplier:0
-msgid "Check this box to set newly created partner as Supplier."
-msgstr ""
-"Vink deze optie aan om van de nieuwe relatie een leverancier te maken"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Import only address"
-msgstr "Importeer alleen adres"
-
-#. module: import_google
-#: field:crm.case.categ,user_id:0
-msgid "User"
-msgstr "Gebruiker"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Partner Status for this Group:"
-msgstr "Relatiestatus voor deze groep"
-
-#. module: import_google
-#: field:google.import.message,name:0
-msgid "Message"
-msgstr "Bericht"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Create partner for each contact"
-msgstr "Maak relatie van ieder contact"
-
-#. module: import_google
-#: help:synchronize.google.import,customer:0
-msgid "Check this box to set newly created partner as Customer."
-msgstr "Vink deze optie aan om van de nieuwe relatie een klant te maken"
-
-#~ msgid "Partner status for this group:"
-#~ msgstr "Relatiestatus voor deze groep"
diff --git a/addons/import_google/i18n/pt.po b/addons/import_google/i18n/pt.po
deleted file mode 100644
index e6513fd3227..00000000000
--- a/addons/import_google/i18n/pt.po
+++ /dev/null
@@ -1,227 +0,0 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-21 12:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_google
-#: help:synchronize.google.import,group_name:0
-msgid "Choose which group to import, By default it takes all."
-msgstr "Escolha qual o grupo a importar, por padrão, ele leva tudo."
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Google Calendar Events"
-msgstr "Importar Os Eventos do Calendário Google"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Events"
-msgstr "_Importar Eventos"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid ""
-"No Google Username or password Defined for user.\n"
-"Please define in user view"
-msgstr ""
-"Nenhum nome de utilizador do Google ou password definida para o utilizador.\n"
-"Por favor, defina na vista do utilizador"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#, python-format
-msgid ""
-"Invalid login detail !\n"
-" Specify Username/Password."
-msgstr ""
-"Detalhe do Login Inválido !\n"
-" Especifique Nome de Utilizador / Password."
-
-#. module: import_google
-#: field:synchronize.google.import,supplier:0
-msgid "Supplier"
-msgstr "Fornecedor"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Options"
-msgstr "Opções da Importação"
-
-#. module: import_google
-#: field:synchronize.google.import,group_name:0
-msgid "Group Name"
-msgstr "Nome do Grupo"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_crm_case_categ
-msgid "Category of Case"
-msgstr "Categoria do Caso"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
-#: model:ir.ui.menu,name:import_google.menu_sync_contact
-msgid "Import Google Contacts"
-msgstr "Importar Contatos do Google"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "Import Google Data"
-msgstr "Importar Dados do Google"
-
-#. module: import_google
-#: view:crm.meeting:0
-msgid "Meeting Type"
-msgstr "Tipo de reunião"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid ""
-"Please install gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-msgstr ""
-"Por Favor instale gdata-python-client de http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_login
-msgid "Google Contact"
-msgstr "Contato Google"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import contacts from a google account"
-msgstr "Importar Contatos de uma Conta Google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Please specify correct user and password !"
-msgstr "Por Favor Especifique um Utilizador e uma Password Correta !"
-
-#. module: import_google
-#: field:synchronize.google.import,customer:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_synchronize_google_import
-msgid "synchronize.google.import"
-msgstr "synchronize.google.import"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Contacts"
-msgstr "_Importar Contatos"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_form
-#: model:ir.ui.menu,name:import_google.menu_sync_calendar
-msgid "Import Google Calendar"
-msgstr "Importar Calendário Google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:50
-#, python-format
-msgid "Import google"
-msgstr "Importar Google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Error"
-msgstr "Erro"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "Warning !"
-msgstr "Aviso !"
-
-#. module: import_google
-#: field:synchronize.google.import,create_partner:0
-msgid "Options"
-msgstr "Opções"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Google Contacts Import Error!"
-msgstr "Erro na importação dos contatos Google!"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_import_message
-msgid "Import Message"
-msgstr "Importar mensagem"
-
-#. module: import_google
-#: field:synchronize.google.import,calendar_name:0
-msgid "Calendar Name"
-msgstr "Nome do Calendário"
-
-#. module: import_google
-#: help:synchronize.google.import,supplier:0
-msgid "Check this box to set newly created partner as Supplier."
-msgstr ""
-"Marque esta caixa para definir parceiro recém-criado como Fornecedor."
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Import only address"
-msgstr "Importar apenas o endereço"
-
-#. module: import_google
-#: field:crm.case.categ,user_id:0
-msgid "User"
-msgstr "Utilizador"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Partner Status for this Group:"
-msgstr ""
-
-#. module: import_google
-#: field:google.import.message,name:0
-msgid "Message"
-msgstr "Mensagem"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Create partner for each contact"
-msgstr "Criar parceiro para cada contato"
-
-#. module: import_google
-#: help:synchronize.google.import,customer:0
-msgid "Check this box to set newly created partner as Customer."
-msgstr "Marque esta caixa para definir parceiro recém-criado como cliente."
-
-#~ msgid "Partner status for this group:"
-#~ msgstr "Estatuto de parceiro para este grupo:"
diff --git a/addons/import_google/i18n/pt_BR.po b/addons/import_google/i18n/pt_BR.po
deleted file mode 100644
index d6992af426a..00000000000
--- a/addons/import_google/i18n/pt_BR.po
+++ /dev/null
@@ -1,226 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-28 21:30+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_google
-#: help:synchronize.google.import,group_name:0
-msgid "Choose which group to import, By default it takes all."
-msgstr "Escolha qual grupo importar, por padrão todos são importados."
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Google Calendar Events"
-msgstr "Importar o Calendário de Eventos da Google"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Events"
-msgstr "_Importar Eventos"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid ""
-"No Google Username or password Defined for user.\n"
-"Please define in user view"
-msgstr ""
-"Não foi definido nome de usuário ou senha para o usuário Google.\n"
-"Por favor definir na visão de usuário"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#, python-format
-msgid ""
-"Invalid login detail !\n"
-" Specify Username/Password."
-msgstr ""
-"Detalhes de acesso inválidos!\n"
-" Especificar Usuário/Senha."
-
-#. module: import_google
-#: field:synchronize.google.import,supplier:0
-msgid "Supplier"
-msgstr "Fornecedor"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Options"
-msgstr "Opções de importação"
-
-#. module: import_google
-#: field:synchronize.google.import,group_name:0
-msgid "Group Name"
-msgstr "Nome do Grupo"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_crm_case_categ
-msgid "Category of Case"
-msgstr "Categoria de Caso"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
-#: model:ir.ui.menu,name:import_google.menu_sync_contact
-msgid "Import Google Contacts"
-msgstr "Importar Contatos do Google"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "Import Google Data"
-msgstr "Importar Dados do Google"
-
-#. module: import_google
-#: view:crm.meeting:0
-msgid "Meeting Type"
-msgstr "Tipo de Reunião"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid ""
-"Please install gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-msgstr ""
-"Por favor instale gdata-python-client de http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_login
-msgid "Google Contact"
-msgstr "Contatos do Google"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import contacts from a google account"
-msgstr "Importar contatos de uma conta Google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Please specify correct user and password !"
-msgstr "Por favor especificar usuário e senha corretos !"
-
-#. module: import_google
-#: field:synchronize.google.import,customer:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_synchronize_google_import
-msgid "synchronize.google.import"
-msgstr "sincronizar.importação.google"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Contacts"
-msgstr "_Importar Contatos"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_form
-#: model:ir.ui.menu,name:import_google.menu_sync_calendar
-msgid "Import Google Calendar"
-msgstr "Importar Calendário do Google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:50
-#, python-format
-msgid "Import google"
-msgstr "Importar do Google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Error"
-msgstr "Erro"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "Warning !"
-msgstr "Aviso !"
-
-#. module: import_google
-#: field:synchronize.google.import,create_partner:0
-msgid "Options"
-msgstr "Opções"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Google Contacts Import Error!"
-msgstr "Erro de importação dos contatos Google!"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_import_message
-msgid "Import Message"
-msgstr "Importar Mensagem"
-
-#. module: import_google
-#: field:synchronize.google.import,calendar_name:0
-msgid "Calendar Name"
-msgstr "Nome do Calendário"
-
-#. module: import_google
-#: help:synchronize.google.import,supplier:0
-msgid "Check this box to set newly created partner as Supplier."
-msgstr "Selecione para marcar este parceiro recém criado como Fornecedor."
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Import only address"
-msgstr "Importar somente endereços"
-
-#. module: import_google
-#: field:crm.case.categ,user_id:0
-msgid "User"
-msgstr "Usuário"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Partner Status for this Group:"
-msgstr "Situação do Parceiro para este grupo."
-
-#. module: import_google
-#: field:google.import.message,name:0
-msgid "Message"
-msgstr "Mensagem"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Create partner for each contact"
-msgstr "Criar um parceiro para cada contato"
-
-#. module: import_google
-#: help:synchronize.google.import,customer:0
-msgid "Check this box to set newly created partner as Customer."
-msgstr "Selecione para marcar o parceiro recém criado como Cliente"
-
-#~ msgid "Partner status for this group:"
-#~ msgstr "Situação do Parceiro para este grupo"
diff --git a/addons/import_google/i18n/ro.po b/addons/import_google/i18n/ro.po
deleted file mode 100644
index 887047c475a..00000000000
--- a/addons/import_google/i18n/ro.po
+++ /dev/null
@@ -1,229 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-26 19:22+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_google
-#: help:synchronize.google.import,group_name:0
-msgid "Choose which group to import, By default it takes all."
-msgstr "Alegeti grupul pe care sa il importati, implicit sunt alese toate."
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Google Calendar Events"
-msgstr "Importati Evenimente Google Calendar"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Events"
-msgstr "_Importati Evenimente"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid ""
-"No Google Username or password Defined for user.\n"
-"Please define in user view"
-msgstr ""
-"Nu a fost definit(a) nici un nume de utilizator sau o parola pentru "
-"utilizator.\n"
-"Va rugam sa definiti in vizualizarea utilizatorului"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#, python-format
-msgid ""
-"Invalid login detail !\n"
-" Specify Username/Password."
-msgstr ""
-"Detalii de autentificare nevalide !\n"
-" Specificati Numele de utilizator/Parola."
-
-#. module: import_google
-#: field:synchronize.google.import,supplier:0
-msgid "Supplier"
-msgstr "Furnizor"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Options"
-msgstr "Importati Optiuni"
-
-#. module: import_google
-#: field:synchronize.google.import,group_name:0
-msgid "Group Name"
-msgstr "Numele grupului"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_crm_case_categ
-msgid "Category of Case"
-msgstr "Categoria Cazului"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
-#: model:ir.ui.menu,name:import_google.menu_sync_contact
-msgid "Import Google Contacts"
-msgstr "Importati Contacte Google"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "Import Google Data"
-msgstr "Importati Date Google"
-
-#. module: import_google
-#: view:crm.meeting:0
-msgid "Meeting Type"
-msgstr "Tipul intalnirii"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid ""
-"Please install gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-msgstr ""
-"Va rugam sa instalati gdata-python-client de la adresa "
-"http://code.google.com/p/gdata-python-client/downloads/list"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_login
-msgid "Google Contact"
-msgstr "Contact Google"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import contacts from a google account"
-msgstr "Importati contacte dintr-un cont google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Please specify correct user and password !"
-msgstr "Va rugam sa specificati utilizatorul si parola corecte !"
-
-#. module: import_google
-#: field:synchronize.google.import,customer:0
-msgid "Customer"
-msgstr "Client"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Cancel"
-msgstr "_Anulati"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_synchronize_google_import
-msgid "synchronize.google.import"
-msgstr "sincronizati.import.google"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Contacts"
-msgstr "_Importati Contacte"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_form
-#: model:ir.ui.menu,name:import_google.menu_sync_calendar
-msgid "Import Google Calendar"
-msgstr "Importati Google Calendar"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:50
-#, python-format
-msgid "Import google"
-msgstr "Import google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Error"
-msgstr "Eroare"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "Warning !"
-msgstr "Avertizare !"
-
-#. module: import_google
-#: field:synchronize.google.import,create_partner:0
-msgid "Options"
-msgstr "Optiuni"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Google Contacts Import Error!"
-msgstr "Eroare Import Contacte Google!"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_import_message
-msgid "Import Message"
-msgstr "Importati Mesajul"
-
-#. module: import_google
-#: field:synchronize.google.import,calendar_name:0
-msgid "Calendar Name"
-msgstr "Nume Calendar"
-
-#. module: import_google
-#: help:synchronize.google.import,supplier:0
-msgid "Check this box to set newly created partner as Supplier."
-msgstr ""
-"Bifati aceasta casuta pentru a seta partenerul nou creat drept Furnizor."
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Import only address"
-msgstr "Importati doar adresa"
-
-#. module: import_google
-#: field:crm.case.categ,user_id:0
-msgid "User"
-msgstr "Utilizator"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Partner Status for this Group:"
-msgstr ""
-
-#. module: import_google
-#: field:google.import.message,name:0
-msgid "Message"
-msgstr "Mesaj"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Create partner for each contact"
-msgstr "Creati partenerul pentru fiecare contact"
-
-#. module: import_google
-#: help:synchronize.google.import,customer:0
-msgid "Check this box to set newly created partner as Customer."
-msgstr ""
-"Bifati aceasta casuta pentru a seta partenerul nou creat drept Client."
-
-#~ msgid "Partner status for this group:"
-#~ msgstr "Statusul partenerului acestui grup:"
diff --git a/addons/import_google/i18n/sr@latin.po b/addons/import_google/i18n/sr@latin.po
deleted file mode 100644
index ab1e17d3f99..00000000000
--- a/addons/import_google/i18n/sr@latin.po
+++ /dev/null
@@ -1,226 +0,0 @@
-# Serbian Latin translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:12+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Serbian Latin <sr@latin@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_google
-#: help:synchronize.google.import,group_name:0
-msgid "Choose which group to import, By default it takes all."
-msgstr "Izaberite grupu za uvoz, po defaultu, uzima ih sve"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Google Calendar Events"
-msgstr "Uvezi događaje iz Google-ovog kalendara"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Events"
-msgstr "_Uvezi događaje"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid ""
-"No Google Username or password Defined for user.\n"
-"Please define in user view"
-msgstr ""
-"Nema određenog korisničkog imena ili lozinke za korisnika.\n"
-"Molimo odredite ih u korisničkom pregledu"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#, python-format
-msgid ""
-"Invalid login detail !\n"
-" Specify Username/Password."
-msgstr ""
-"Nevažeći detalji prijave !\n"
-" Odredite korisničko ime/ lozinku."
-
-#. module: import_google
-#: field:synchronize.google.import,supplier:0
-msgid "Supplier"
-msgstr "Dobavljač"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Options"
-msgstr "Opcije uvoza"
-
-#. module: import_google
-#: field:synchronize.google.import,group_name:0
-msgid "Group Name"
-msgstr "Ime grupe"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_crm_case_categ
-msgid "Category of Case"
-msgstr "Kategorija slučaja"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
-#: model:ir.ui.menu,name:import_google.menu_sync_contact
-msgid "Import Google Contacts"
-msgstr "Uvezi Google kontakte"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "Import Google Data"
-msgstr "Uvezi Google podatke"
-
-#. module: import_google
-#: view:crm.meeting:0
-msgid "Meeting Type"
-msgstr "Tip sastanka"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid ""
-"Please install gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-msgstr ""
-"Molimo instalirajte gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_login
-msgid "Google Contact"
-msgstr "Google kontakt"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import contacts from a google account"
-msgstr "Uvezi kontakte s Google naloga"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Please specify correct user and password !"
-msgstr "Molimo odredite tačnog korisnika i lozinku !"
-
-#. module: import_google
-#: field:synchronize.google.import,customer:0
-msgid "Customer"
-msgstr "Mušterija"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Cancel"
-msgstr "_Otkaži"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_synchronize_google_import
-msgid "synchronize.google.import"
-msgstr "synchronize.google.import"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Contacts"
-msgstr "_Uvezi kontakte"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_form
-#: model:ir.ui.menu,name:import_google.menu_sync_calendar
-msgid "Import Google Calendar"
-msgstr "Uvezi Google-ov kalendar"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:50
-#, python-format
-msgid "Import google"
-msgstr "Uvezi Google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Error"
-msgstr "Greška"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "Warning !"
-msgstr "Upozorenje !"
-
-#. module: import_google
-#: field:synchronize.google.import,create_partner:0
-msgid "Options"
-msgstr "Opcije"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Google Contacts Import Error!"
-msgstr "Greška u uvozu kontakata s Google-a"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_import_message
-msgid "Import Message"
-msgstr "Uvezi poruku"
-
-#. module: import_google
-#: field:synchronize.google.import,calendar_name:0
-msgid "Calendar Name"
-msgstr "Ime kalendara"
-
-#. module: import_google
-#: help:synchronize.google.import,supplier:0
-msgid "Check this box to set newly created partner as Supplier."
-msgstr "Označite ovu kućicu da biste novog partnera odredili kao Dobavljača."
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Import only address"
-msgstr "Uvezi samo adrese"
-
-#. module: import_google
-#: field:crm.case.categ,user_id:0
-msgid "User"
-msgstr "Korisnik"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Partner Status for this Group:"
-msgstr "Stanje partnera za ovu grupu:"
-
-#. module: import_google
-#: field:google.import.message,name:0
-msgid "Message"
-msgstr "Poruka"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Create partner for each contact"
-msgstr "Napravi partnera za svaki kontakt"
-
-#. module: import_google
-#: help:synchronize.google.import,customer:0
-msgid "Check this box to set newly created partner as Customer."
-msgstr "Označite ovu kućicu da biste novog partnera odredili kao Mušteriju."
-
-#~ msgid "Partner status for this group:"
-#~ msgstr "Stanje partnera za ovu grupu:"
diff --git a/addons/import_google/i18n/sv.po b/addons/import_google/i18n/sv.po
deleted file mode 100644
index 52d02141ae1..00000000000
--- a/addons/import_google/i18n/sv.po
+++ /dev/null
@@ -1,219 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-27 11:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_google
-#: help:synchronize.google.import,group_name:0
-msgid "Choose which group to import, By default it takes all."
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Google Calendar Events"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Events"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid ""
-"No Google Username or password Defined for user.\n"
-"Please define in user view"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#, python-format
-msgid ""
-"Invalid login detail !\n"
-" Specify Username/Password."
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,supplier:0
-msgid "Supplier"
-msgstr "Leverantör"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Options"
-msgstr "Importalternativ"
-
-#. module: import_google
-#: field:synchronize.google.import,group_name:0
-msgid "Group Name"
-msgstr "Gruppnamn"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_crm_case_categ
-msgid "Category of Case"
-msgstr "Ärendekategori"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
-#: model:ir.ui.menu,name:import_google.menu_sync_contact
-msgid "Import Google Contacts"
-msgstr "Importera Googlekontakter"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "Import Google Data"
-msgstr "Importera Google-data"
-
-#. module: import_google
-#: view:crm.meeting:0
-msgid "Meeting Type"
-msgstr "Mötestyp"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid ""
-"Please install gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-msgstr ""
-"Vänligen installera gdata-python-client från http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_login
-msgid "Google Contact"
-msgstr "Google-kontakt"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import contacts from a google account"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Please specify correct user and password !"
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,customer:0
-msgid "Customer"
-msgstr "Kund"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Cancel"
-msgstr "_Avbryt"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_synchronize_google_import
-msgid "synchronize.google.import"
-msgstr "synchronize.google.import"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Contacts"
-msgstr ""
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_form
-#: model:ir.ui.menu,name:import_google.menu_sync_calendar
-msgid "Import Google Calendar"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:50
-#, python-format
-msgid "Import google"
-msgstr ""
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Error"
-msgstr "Fel"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "Warning !"
-msgstr "Varning !"
-
-#. module: import_google
-#: field:synchronize.google.import,create_partner:0
-msgid "Options"
-msgstr "Alternativ"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Google Contacts Import Error!"
-msgstr "Google kontaktimportfel!"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_import_message
-msgid "Import Message"
-msgstr ""
-
-#. module: import_google
-#: field:synchronize.google.import,calendar_name:0
-msgid "Calendar Name"
-msgstr "Kalendernamn"
-
-#. module: import_google
-#: help:synchronize.google.import,supplier:0
-msgid "Check this box to set newly created partner as Supplier."
-msgstr ""
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Import only address"
-msgstr ""
-
-#. module: import_google
-#: field:crm.case.categ,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Partner Status for this Group:"
-msgstr ""
-
-#. module: import_google
-#: field:google.import.message,name:0
-msgid "Message"
-msgstr ""
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Create partner for each contact"
-msgstr ""
-
-#. module: import_google
-#: help:synchronize.google.import,customer:0
-msgid "Check this box to set newly created partner as Customer."
-msgstr ""
diff --git a/addons/import_google/i18n/zh_CN.po b/addons/import_google/i18n/zh_CN.po
deleted file mode 100644
index 6f34d41ce74..00000000000
--- a/addons/import_google/i18n/zh_CN.po
+++ /dev/null
@@ -1,222 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:51+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_google
-#: help:synchronize.google.import,group_name:0
-msgid "Choose which group to import, By default it takes all."
-msgstr "选择导入的组, 默认全部"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Google Calendar Events"
-msgstr "导入google日历事件"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Events"
-msgstr "导入事件"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid ""
-"No Google Username or password Defined for user.\n"
-"Please define in user view"
-msgstr "用户未定义google用户名和密码, 请在用户视图 定义"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#, python-format
-msgid ""
-"Invalid login detail !\n"
-" Specify Username/Password."
-msgstr "非法的登陆描述, 指定用户名/密码"
-
-#. module: import_google
-#: field:synchronize.google.import,supplier:0
-msgid "Supplier"
-msgstr "供应商"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import Options"
-msgstr "导入选项"
-
-#. module: import_google
-#: field:synchronize.google.import,group_name:0
-msgid "Group Name"
-msgstr "组名"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_crm_case_categ
-msgid "Category of Case"
-msgstr "业务类型"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_contact_form
-#: model:ir.ui.menu,name:import_google.menu_sync_contact
-msgid "Import Google Contacts"
-msgstr "导入google 联系人"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "Import Google Data"
-msgstr "导入google数据"
-
-#. module: import_google
-#: view:crm.meeting:0
-msgid "Meeting Type"
-msgstr "会议类型"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid ""
-"Please install gdata-python-client from http://code.google.com/p/gdata-"
-"python-client/downloads/list"
-msgstr ""
-"请下载并安装gdata-python-client，地址是 http://code.google.com/p/gdata-python-"
-"client/downloads/list"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_login
-msgid "Google Contact"
-msgstr "Google联系人"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Import contacts from a google account"
-msgstr "从google账户导入联系人"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Please specify correct user and password !"
-msgstr "请指定正确的用户和密码"
-
-#. module: import_google
-#: field:synchronize.google.import,customer:0
-msgid "Customer"
-msgstr "客户"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_synchronize_google_import
-msgid "synchronize.google.import"
-msgstr "synchronize.google.import"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "_Import Contacts"
-msgstr "导入联系人"
-
-#. module: import_google
-#: model:ir.actions.act_window,name:import_google.act_google_login_form
-#: model:ir.ui.menu,name:import_google.menu_sync_calendar
-msgid "Import Google Calendar"
-msgstr "导入google日历"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:50
-#, python-format
-msgid "Import google"
-msgstr "导入 google"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:127
-#: code:addons/import_google/wizard/import_google_data.py:133
-#, python-format
-msgid "Error"
-msgstr "错误"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google_data.py:71
-#, python-format
-msgid "Warning !"
-msgstr "警告！"
-
-#. module: import_google
-#: field:synchronize.google.import,create_partner:0
-msgid "Options"
-msgstr "选项"
-
-#. module: import_google
-#: view:google.import.message:0
-msgid "_Ok"
-msgstr "确定(_O)"
-
-#. module: import_google
-#: code:addons/import_google/wizard/import_google.py:38
-#: code:addons/import_google/wizard/import_google_data.py:28
-#, python-format
-msgid "Google Contacts Import Error!"
-msgstr "导入Google联系人失败！"
-
-#. module: import_google
-#: model:ir.model,name:import_google.model_google_import_message
-msgid "Import Message"
-msgstr "导入信息"
-
-#. module: import_google
-#: field:synchronize.google.import,calendar_name:0
-msgid "Calendar Name"
-msgstr "日历名称"
-
-#. module: import_google
-#: help:synchronize.google.import,supplier:0
-msgid "Check this box to set newly created partner as Supplier."
-msgstr "选中此复选框设置为新建立的合作伙伴为供应商"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Import only address"
-msgstr "只导入地址"
-
-#. module: import_google
-#: field:crm.case.categ,user_id:0
-msgid "User"
-msgstr "用户名"
-
-#. module: import_google
-#: view:synchronize.google.import:0
-msgid "Partner Status for this Group:"
-msgstr "该组伙伴状态"
-
-#. module: import_google
-#: field:google.import.message,name:0
-msgid "Message"
-msgstr "信息"
-
-#. module: import_google
-#: selection:synchronize.google.import,create_partner:0
-msgid "Create partner for each contact"
-msgstr "为每个联系人创建合作伙伴"
-
-#. module: import_google
-#: help:synchronize.google.import,customer:0
-msgid "Check this box to set newly created partner as Customer."
-msgstr "选中此复选框设置新创建合作伙伴作为客户。"
-
-#~ msgid "Partner status for this group:"
-#~ msgstr "该组伙伴状态"
diff --git a/addons/import_google/security/ir.model.access.csv b/addons/import_google/security/ir.model.access.csv
deleted file mode 100644
index cb0a8946d46..00000000000
--- a/addons/import_google/security/ir.model.access.csv
+++ /dev/null
@@ -1,4 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_res_users_partner_manager,google.res.partner.manager,base.model_ir_model_data,base.group_partner_manager,1,1,1,0
-access_ir_model_data_partner_manager,ir.model.data.partner.manager,base.model_res_users,base.group_partner_manager,1,1,0,0
-access_google_import_message_partner_manager,google.import.message.partner.manager,model_google_import_message,base.group_partner_manager,1,1,0,0
diff --git a/addons/import_google/sync_google_calendar_view.xml b/addons/import_google/sync_google_calendar_view.xml
deleted file mode 100644
index e44c6ea8c21..00000000000
--- a/addons/import_google/sync_google_calendar_view.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record model="ir.ui.view" id="view_crm_meeting_form">
-            <field name="name">CRM - Meetings Form (Inherited)</field>
-            <field name="model">crm.meeting</field>
-            <field name="inherit_id" ref="base_calendar.view_crm_meeting_form"/>
-            <field name="arch" type="xml">
-                <field name="categ_ids" position="attributes">
-                    <attribute name="domain">[('user_id', 'in', [uid, False])]</attribute>
-                </field>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/import_google/test/test_sync_google_calendar.yml b/addons/import_google/test/test_sync_google_calendar.yml
deleted file mode 100644
index 28863f358bb..00000000000
--- a/addons/import_google/test/test_sync_google_calendar.yml
+++ /dev/null
@@ -1,36 +0,0 @@
--
-  In order to test google calendar feature with OpenERP, I import events from
-  a google account and store them in Meetings.
-- |
-  I create a record for the gmail account for which I want to import the contacts.
-- 
-  !record {model: google.login, id: google_login_id0}:
-    user: testmail.openerp@gmail.com
-    password: openerptiny
-- |
-  I login into that account.
--
-  !python {model: google.login}: |
-    self.login(cr, uid, [ref('google_login_id0')], context)
-- |
-  Now I want to import all the events from all the calendars in the user account.
-- |
-  I select all calendars.
--
-  !record {model: synchronize.google.import, id: synchronize_google_import_id0}:
-    calendar_name: all
-- |
-  I import the events from the google calendar.
--
-  !python {model: synchronize.google.import}: |
-    self.import_google(cr, uid, [ref('synchronize_google_import_id0')], context={'calendar':True})
-- |
-  Now I check my meetings are created or not.
--
-  !python {model: crm.meeting}: |
-    model_obj = self.pool.get('ir.model.data')
-    meeting_ids = self.search(cr, uid, [])
-    model_ids = model_obj.search(cr, uid, [('res_id','in',meeting_ids),('model','=','crm.meeting'),('module','=','synchronize_google')])
-    assert model_ids, 'Meetings not created !'
-    
-    
diff --git a/addons/import_google/test/test_sync_google_contact_import_partner.yml b/addons/import_google/test/test_sync_google_contact_import_partner.yml
deleted file mode 100644
index 08aa0f30718..00000000000
--- a/addons/import_google/test/test_sync_google_contact_import_partner.yml
+++ /dev/null
@@ -1,35 +0,0 @@
--
-  In order to test Importing contacts from any google account into OpenERP,
-  I use a gmail account and import the contact details and create Partners.
-- |
-  I create a record for the gmail account for which I want to import the contacts.
--
-  !record {model: google.login, id: google_login_id1}:
-    user: testmail.openerp@gmail.com
-    password: openerptiny
-- |
-  I login into that account.
--
-  !python {model: google.login}: |
-    self.login(cr, uid, [ref('google_login_id1')], context)
-- |
-  Now I select from which group I want to get the contact details and I want to create partner for all contacts.
--
-  !record {model: synchronize.google.import, id: synchronize_google_import_id1}:
-    group_name: all
-- |
-  I import the contacts.
--
-  !python {model: synchronize.google.import}: |
-    self.import_google(cr, uid, [ref('synchronize_google_import_id1')], context={'contact':True})
-- |
-  I check whether the Partners are created or not.
--
-  !python {model: res.partner }: |
-    addr_obj = self.pool.get('ir.model.data')
-    addr_ids = addr_obj.search(cr, uid, [])
-    data_ids = addr_obj.search(cr, uid, [('model','=','res.partner'),('module','=','synchronize_google')])
-    address_ids = map(lambda x: x.res_id, [child for child in addr_obj.browse(cr, uid, data_ids) if child.res_id])
-    partner_ids = map(lambda x: x.parent_id.id, [addr for addr in self.browse(cr, uid, address_ids) if addr.parent_id])
-    assert partner_ids, 'Partners not created !'
-    
diff --git a/addons/import_google/wizard/__init__.py b/addons/import_google/wizard/__init__.py
deleted file mode 100644
index 41c118a0ef3..00000000000
--- a/addons/import_google/wizard/__init__.py
+++ /dev/null
@@ -1,24 +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 import_google
-import import_google_data
-import google_import_message
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/wizard/google_import_message_view.xml b/addons/import_google/wizard/google_import_message_view.xml
deleted file mode 100644
index 158aff29bf3..00000000000
--- a/addons/import_google/wizard/google_import_message_view.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <!-- Import Message Form View -->
-        <record model="ir.ui.view" id="view_google_import_message_form">
-            <field name="name">google.import.message.form</field>
-            <field name="model">google.import.message</field>
-            <field name="arch" type="xml">
-                <form string="Import Google Data" version="7.0">
-                    <group>
-                        <field name='name'/>
-                    </group>
-                </form>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/import_google/wizard/import_google.py b/addons/import_google/wizard/import_google.py
deleted file mode 100644
index c34a14e224d..00000000000
--- a/addons/import_google/wizard/import_google.py
+++ /dev/null
@@ -1,358 +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 re
-import urllib
-import dateutil
-import pytz
-from dateutil import *
-from pytz import timezone
-from datetime import datetime
-import time
-from osv import *
-from tools.translate import _
-
-try:
-    import gdata
-    import gdata.contacts.service
-    import gdata.calendar.service
-    import gdata.contacts
-    import gdata.calendar
-except ImportError:
-    raise osv.except_osv(_('Google Contacts Import Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list'))
-from import_base.import_framework import *
-from import_base.mapper import *
-
-class google_import(import_framework):
-
-    gd_client = False
-    calendars = False
-    contact = False
-    DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
-    TABLE_CONTACT = 'Contact'
-    TABLE_ADDRESS ='Address'
-    TABLE_EVENT = 'Events'
-
-    def initialize(self):
-        google = self.obj.pool.get('google.login')
-        self.gd_client = google.google_login(self.context.get('user'),
-                                       self.context.get('password'),
-                                        self.context.get('instance'))
-
-        if self.context.get('instance') and self.context.get('instance') == 'contact':
-            self.contact = self.context.get('contact')
-        if self.context.get('instance') and self.context.get('instance') == 'calendar':
-            self.calendars = self.context.get('calendars')
-
-    def get_mapping(self):
-        return {
-            self.TABLE_EVENT: self.get_event_mapping(),
-            self.TABLE_CONTACT: self.get_contact_mapping(),
-            self.TABLE_ADDRESS: self.get_address_mapping(),
-        }
-
-    def get_data(self, table):
-        data_fetching_function = {
-              self.TABLE_CONTACT: self.get_contact,
-              self.TABLE_ADDRESS: self.get_contact,
-              self.TABLE_EVENT: self.get_events,
-        }
-
-        return data_fetching_function.get(table)()
-
-
-    def _get_tinydates(self, stime, etime, au_tz):
-        stime = dateutil.parser.parse(stime)
-        etime = dateutil.parser.parse(etime)
-        try:
-            au_dt = au_tz.normalize(stime.replace(tzinfo=pytz.utc).astimezone(au_tz))
-            timestring = datetime.datetime(*au_dt.timetuple()[:6]).strftime('%Y-%m-%d %H:%M:%S')
-            au_dt = au_tz.normalize(etime.replace(tzinfo=pytz.utc).astimezone(au_tz))
-            timestring_end = datetime.datetime(*au_dt.timetuple()[:6]).strftime('%Y-%m-%d %H:%M:%S')
-        except:
-            timestring = datetime.datetime(*stime.timetuple()[:6]).strftime('%Y-%m-%d %H:%M:%S')
-            timestring_end = datetime.datetime(*etime.timetuple()[:6]).strftime('%Y-%m-%d %H:%M:%S')
-        return (timestring, timestring_end)
-
-    def _get_rules(self, datas):
-        new_val = {}
-        if  datas['FREQ'] == 'WEEKLY' and datas.get('BYDAY'):
-            for day in datas['BYDAY'].split(','):
-                new_val[day.lower()] = True
-            datas.pop('BYDAY')
-
-        if datas.get('UNTIL'):
-            until = parser.parse(''.join((re.compile('\d')).findall(datas.get('UNTIL'))))
-            new_val['end_date'] = until.strftime('%Y-%m-%d')
-            new_val['end_type'] = 'end_date'
-            datas.pop('UNTIL')
-
-        if datas.get('COUNT'):
-            new_val['count'] = datas.get('COUNT')
-            new_val['end_type'] = 'count'
-            datas.pop('COUNT')
-
-        if datas.get('INTERVAL'):
-            new_val['interval'] = datas.get('INTERVAL')
-        else:
-            new_val['interval'] = 1
-
-        if datas.get('BYMONTHDAY'):
-            new_val['day'] = datas.get('BYMONTHDAY')
-            datas.pop('BYMONTHDAY')
-            new_val['select1'] = 'date'
-
-        if datas.get('BYDAY'):
-            d = datas.get('BYDAY')
-            if '-' in d:
-                new_val['byday'] = d[:2]
-                new_val['week_list'] = d[2:4].upper()
-            else:
-                new_val['byday'] = d[:1]
-                new_val['week_list'] = d[1:3].upper()
-            new_val['select1'] = 'day'
-
-        if datas.get('BYMONTH'):
-            new_val['month_list'] = datas.get('BYMONTH')
-            datas.pop('bymonth')
-        return new_val
-
-
-    def _get_repeat_status(self, str_google):
-        rrule = str_google[str_google.find('FREQ'):str_google.find('\nBEGIN')]
-        status = {}
-        for rule in rrule.split(';'):
-            status[rule.split('=')[0]] = rule.split('=')[-1:] and rule.split('=')[-1:][0] or ''
-        rules = self._get_rules(status)
-        if status.get('FREQ') == 'WEEKLY':
-            status.update({'rrule_type': 'weekly'})
-            status.pop('FREQ')
-        elif status.get('FREQ') == 'DAILY':
-            status.update({'rrule_type': 'daily'})
-            status.pop('FREQ')
-        elif status.get('FREQ') == 'MONTHLY':
-            status.update({'rrule_type': 'monthly'})
-            status.pop('FREQ')
-        elif status.get('FREQ') == 'YEARLY':
-            status.update({'rrule_type': 'yearly'})
-            status.pop('FREQ')
-        status.update(rules)
-        return status
-
-
-    def _get_repeat_dates(self, x):
-        if len(x) > 4:
-            if x[3].startswith('BY'):
-                zone_time = x[4].split('+')[-1:][0].split(':')[0][:4]
-            else:
-                zone_time = x[3].split('+')[-1:][0].split(':')[0][:4]
-        else:
-            zone_time = x[2].split('+')[-1:][0].split(':')[0][:4]
-        tz_format = zone_time[:2]+':'+zone_time[2:]
-        repeat_start = x[1].split('\n')[0].split(':')[1]
-        repeat_end = x[2].split('\n')[0].split(':')[1]
-        o = repeat_start.split('T')
-        repeat_start = str(o[0][:4]) + '-' + str(o[0][4:6]) + '-' + str(o[0][6:8])
-        if len(o) == 2:
-            repeat_start += ' ' + str(o[1][:2]) + ':' + str(o[1][2:4]) + ':' + str(o[1][4:6])
-        else:
-            repeat_start += ' ' + '00' + ':' + '00' + ':' + '00'
-        p = repeat_end.split('T')
-        repeat_end = str(p[0][:4]) + '-' + str(p[0][4:6]) + '-' + str(p[0][6:8])
-        if len(p) == 2:
-            repeat_end += ' ' + str(p[1][:2]) + ':' + str(p[1][2:4]) + ':' + str(p[1][4:6])
-        else:
-            repeat_end += ' ' + '00' + ':' + '00' + ':' + '00'
-        return (repeat_start, repeat_end, tz_format)
-
-    def get_events(self):
-        if 'tz' in self.context and self.context['tz']:
-            time_zone = self.context['tz']
-        else:
-            time_zone = tools.get_server_timezone()
-        au_tz = timezone(time_zone)
-        event_vals = []
-        for cal in self.calendars:
-            events_query = gdata.calendar.service.CalendarEventQuery(user=urllib.unquote(cal.split('/')[~0]))
-            events_query.start_index = 1
-            events_query.max_results = 1000
-            event_feed = self.gd_client.GetCalendarEventFeed(events_query.ToUri())
-            for feed in event_feed.entry:
-                event = {
-                    'recurrency': False,
-                    'end_date' : False,
-                    'end_type' : False,
-                    'byday': 0,
-                    'count' : 0,
-                    'interval': 1,
-                    'day': False,
-                    'select1': False,
-                    'week_list': "",
-                    'month_list': False,
-                    'rrule_type': False,
-                }
-
-                timestring = timestring_end = datetime.datetime.now().strftime(self.DATETIME_FORMAT)
-                if feed.when:
-                    timestring, timestring_end = self._get_tinydates(feed.when[0].start_time, feed.when[0].end_time, au_tz)
-                else:
-                    x = feed.recurrence.text.split(';')
-                    repeat_status = self._get_repeat_status(feed.recurrence.text)
-                    repeat_start, repeat_end, zone_time = self._get_repeat_dates(x)
-                    timestring = time.strftime('%Y-%m-%d %H:%M:%S', time.strptime(repeat_start, "%Y-%m-%d %H:%M:%S"))
-                    timestring_end = time.strftime('%Y-%m-%d %H:%M:%S', time.strptime(repeat_end, "%Y-%m-%d %H:%M:%S"))
-                    if repeat_status:
-                        repeat_status.update({'recurrency': True})
-                        event.update(repeat_status)
-
-                event.update({'id' : feed.id.text,
-                              'DateStart': timestring,
-                              'DateEnd': timestring_end,
-                              'Category':event_feed.title.text,
-                              'Name': feed.title.text or 'No title',
-                              'Description': feed.content.text,
-                              })
-                event_vals.append(event)
-        return event_vals
-
-
-    def get_event_category(self, val, name):
-        nameid = 'event_category_' + name
-        fields = ['name']
-        data = [name]
-        return self.import_object(fields, data, 'crm.meeting.type', "crm_meeting_type", nameid, [('name', 'ilike', name)])
-
-    def get_rec(self, val):
-        if val.get("recurrency"):
-            return "1"
-        return "0"
-
-    def get_event_mapping(self):
-        return {
-            'model': 'crm.meeting',
-            'map': {
-                    'id': 'id',
-                    'name': 'Name',
-                    'description': 'Description',
-                    'email_from': 'Email',
-                    'date': 'DateStart',
-                    'date_deadline': 'DateEnd',
-                    'categ_id/id': call(self.get_event_category, value('Category')),
-                    'recurrency': self.get_rec,
-                    'end_date' : 'end_date',
-                    'end_type' : 'end_type',
-                    'byday':'byday',
-                    'count' : 'count',
-                    'interval': 'interval',
-                    'day': 'day',
-                    'select1': 'date',
-                    'week_list': 'week_list',
-                    'month_list':'month_list',
-                    'rrule_type': 'rrule_type',
-                }
-        }
-
-
-    def get_contact(self):
-        table = self.context.get('table')[0]
-        datas = []
-        if self.context.get('group_name'):
-            query = gdata.contacts.service.ContactsQuery()
-            query.group = self.context.get('group_name')
-            self.contact = self.gd_client.GetContactsFeed(query.ToUri())
-        else:
-            self.contact = self.gd_client.GetContactsFeed()
-        while self.contact:
-            for entry in self.contact.entry:
-                data = {}
-                data['id'] = entry.id.text
-                name = tools.ustr(entry.title.text)
-                if name == "None":
-                    name = entry.email and entry.email[0].address or ''
-                data['name'] = name or _('Unknown')
-                emails = ','.join(email.address for email in entry.email)
-                data['email'] = emails
-                if table == 'Contact':
-                    data.update({'customer': str(self.context.get('customer')),
-                                 'supplier': str(self.context.get('supplier'))})
-                if entry.organization:
-                    if entry.organization.org_name:
-                        data.update({'company': entry.organization.org_name.text})
-                    if entry.organization.org_title:
-                        data.update ({'function': entry.organization.org_title.text})
-                if entry.phone_number:
-                    for phone in entry.phone_number:
-                        if phone.rel == gdata.contacts.REL_WORK:
-                            data['phone'] = phone.text
-                        if phone.rel == gdata.contacts.PHONE_MOBILE:
-                            data['mobile'] = phone.text
-                        if phone.rel == gdata.contacts.PHONE_WORK_FAX:
-                            data['fax'] = phone.text
-                datas.append(data)
-            next = self.contact.GetNextLink()
-            self.contact = next and self.gd_client.GetContactsFeed(next.href) or None
-        return datas
-
-
-
-    def get_contact_mapping(self):
-        return {
-            'model': 'res.partner',
-            #'dependencies': [self.TABLE_ADDRESS],
-            'map': {
-                'id':'id',
-                'name': value('company', fallback='name'),
-                'customer': 'customer',
-                'supplier': 'supplier',
-                'child_ids/id': ref(self.TABLE_ADDRESS, 'id'),
-                }
-            }
-
-    def get_partner_id(self, val):
-        partner_id = False
-        company_pool = self.obj.pool.get('res.partner')
-        if 'company' in val:
-            partner_ids = company_pool.search(self.cr, self.uid, [('name', '=', val.get('company'))])
-            return partner_ids and partner_ids[0] or False
-        contact = self.xml_id_exist(self.TABLE_CONTACT, val.get('id'))
-        if contact:
-            partner_id = self.get_mapped_id(self.TABLE_CONTACT, val.get('id'))
-        return partner_id
-
-    def get_address_mapping(self):
-        return {
-            'model': 'res.partner',
-            'dependencies': [],
-            'map': {
-                'id':'id',
-                'parent_id/.id': self.get_partner_id,
-                'name': 'name',
-                'city': 'city',
-                'phone': 'phone',
-                'mobile': 'mobile',
-                'email': 'email',
-                'fax': 'fax',
-                'function': 'function'
-                }
-
-        }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/wizard/import_google_data.py b/addons/import_google/wizard/import_google_data.py
deleted file mode 100644
index bcc24b9e0de..00000000000
--- a/addons/import_google/wizard/import_google_data.py
+++ /dev/null
@@ -1,181 +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 datetime
-
-try:
-    import gdata
-    import gdata.contacts.service
-    import gdata.contacts
-except ImportError:
-    raise osv.except_osv(_('Google Contacts Import Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list'))
-from osv import fields
-from osv import osv
-from tools.translate import _
-from import_google import google_import
-
-
-class google_login_contact(osv.osv_memory):
-    
-    _inherit = 'google.login'
-    
-    def _get_next_action(self, cr, uid, context=None):
-        data_obj = self.pool.get('ir.model.data')
-        data_id = data_obj._get_id(cr, uid, 'import_google', 'view_synchronize_google_contact_import_form')
-        view_id = False
-        if context.get('contact'):
-             data_id = data_obj._get_id(cr, uid, 'import_google', 'view_synchronize_google_contact_import_form')
-        if  context.get('calendar'):
-             data_id = data_obj._get_id(cr, uid, 'import_google', 'view_synchronize_google_calendar_import_form')     
-        if data_id:
-            view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
-        value = {
-            'name': _('Import google'),
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'synchronize.google.import',
-            'view_id': False,
-            'context': context,
-            'views': [(view_id, 'form')],
-            'type': 'ir.actions.act_window',
-            'target': 'new',
-        }
-        return value
-    
-google_login_contact()
-
-class synchronize_google(osv.osv_memory):
-    _name = 'synchronize.google.import'
-
-    def _get_group(self, cr, uid, context=None):
-
-        # all the selection field which have method are called at load time. why ?
-        
-        res = []
-        if context:
-            user_obj = self.pool.get('res.users').browse(cr, uid, uid,context=context)
-            google=self.pool.get('google.login')
-            if not user_obj.gmail_user or not user_obj.gmail_password:
-                raise osv.except_osv(_('Warning!'), _("No Google Username or password is defined for user.\nPlease define on user's form."))
-            gd_client = google.google_login(user_obj.gmail_user,user_obj.gmail_password,type='group')
-            if not gd_client:
-                return [('failed', 'Connection to google fail')]
-    
-            res = []
-            query = gdata.contacts.service.GroupsQuery(feed='/m8/feeds/groups/default/full')
-            if gd_client:
-                groups = gd_client.GetFeed(query.ToUri())
-                for grp in groups.entry:
-                    res.append((grp.id.text, grp.title.text))
-            res.append(('all','All Groups'))
-        return res
-
-    def _get_calendars(self, cr, uid, context=None):
-        user_obj = self.pool.get('res.users').browse(cr, uid, uid)
-        google = self.pool.get('google.login')
-        res = []
-        try:
-            gd_client = google.google_login(user_obj.gmail_user, user_obj.gmail_password, type='calendar')
-            calendars = gd_client.GetAllCalendarsFeed()
-            for cal in calendars.entry:
-                res.append((cal.id.text, cal.title.text))
-        except Exception, e:
-            return [('failed', 'Connection to google fail')]
-        res.append(('all', 'All Calendars'))
-        return res
-
-    _columns = {
-        'customer': fields.boolean('Customer', help="Check this box to set newly created partner as Customer."),
-        'supplier': fields.boolean('Supplier', help="Check this box to set newly created partner as Supplier."),
-        'group_name': fields.selection(_get_group, "Group Name",help="Choose which group to import, By default it takes all."),
-        'calendar_name': fields.selection(_get_calendars, "Calendar Name"),
-     }
-
-    _defaults = {
-        'group_name': 'all',
-    }
-
-    def import_google(self, cr, uid, ids, context=None):
-        if context == None:
-            context = {}
-        if not ids:
-            return {'type': 'ir.actions.act_window_close'}
-        obj = self.browse(cr, uid, ids, context=context)[0]
-        cust = obj.customer
-        sup = obj.supplier
-        tables=[]
-        user_obj = self.pool.get('res.users').browse(cr, uid, uid)
-        
-        gmail_user = user_obj.gmail_user
-        gmail_pwd = user_obj.gmail_password
-        google = self.pool.get('google.login')
-        if not gmail_user or not gmail_pwd:
-            raise osv.except_osv(_('Error!'), _("Invalid login detail !\nPlease specify correct username and password."))
-        
-        if context.get('contact'):
-            msg = "  Your contacts are being imported in background, an email to %s will be sent when the process is over." % (user_obj.gmail_user)
-            gd_client = google.google_login(gmail_user, gmail_pwd, type='contact')
-            if not gd_client:
-                raise osv.except_osv(_('Error!'), _("Please specify correct username and password!"))        
-            if obj.group_name not in ['all']:
-                context.update({ 'group_name': obj.group_name})
-            tables.append('Contact')
-            context.update({'user': gmail_user,
-                            'password': gmail_pwd,
-                            'instance': 'contact',
-                            'table':tables,
-                            'customer':cust,
-                            'supplier':sup})
-              
-        elif context.get('calendar'):
-            msg = "  Your meetings are being imported in background, an email to %s will be sent when the process is over."%(user_obj.gmail_user)
-         
-            tables.append('Events')
-            current_rec = self.browse(cr, uid, ids, context=context)
-            calendars = False
-            for rec in current_rec:
-                if rec.calendar_name != 'all':
-                    calendars = [rec.calendar_name]
-                else:
-                    calendars = map(lambda x: x[0], [cal for cal in self._get_calendars(cr, uid, context) if cal[0] != 'all'])
-            context.update({'user': gmail_user,
-                        'password': gmail_pwd,
-                        'calendars': calendars,
-                        'instance': 'calendar'})
-        imp = google_import(self, cr, uid,'import_google' , "synchronize_google", gmail_user, context)
-        imp.set_table_list(tables)
-        imp.start()
-        context.update({'message': msg})
-        obj_model = self.pool.get('ir.model.data')
-        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','view_google_import_message_form')])
-        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        return {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'google.import.message',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-               'context': context,
-            }
-
-synchronize_google()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml
deleted file mode 100644
index f8e110e6a5d..00000000000
--- a/addons/import_google/wizard/import_google_data_view.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record model="ir.ui.view" id="view_synchronize_google_contact_import_form">
-            <field name="name">synchronize.base.form</field>
-            <field name="model">synchronize.google.import</field>
-            <field name="arch" type="xml">
-                <form string="Import contacts from a google account" version="7.0">
-                    <group colspan="4" col="4" width="430">
-                       <field name="group_name" colspan="4"/>
-                       <newline/>
-                       <group colspan="4" col="4">
-                            <separator string="Partner Status for this Group:" colspan="4"/>
-                            <field name="customer" colspan="4"/>
-                            <field name="supplier"  colspan="4"/>
-                       </group>
-                    </group>
-                    <footer>
-                        <button name="import_google" string="_Import Contacts" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-
-
-        <record model="ir.ui.view" id="view_synchronize_google_calendar_import_form">
-            <field name="name">synchronize.google.calendar.form</field>
-            <field name="model">synchronize.google.import</field>
-            <field name="arch" type="xml">
-                <form string="Import Google Calendar Events" version="7.0">
-                    <group colspan="4" col="4" width="320">
-                       <field name="calendar_name" />
-                    </group>
-                    <footer>
-                        <button name="import_google" string="_Import Events" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-        <!--
-            Login Action
-        -->
-        <record model="ir.actions.act_window" id="act_google_login_form">
-          <field name="name">Import Google Calendar</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">google.login</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-          <field name="context">{'calendar':True}</field>
-          <field name="view_id" ref="google_base_account.view_google_login_form" />
-        </record>
-
-        <record model="ir.actions.act_window" id="act_google_login_contact_form">
-          <field name="name">Import Google Contacts</field>
-          <field name="type">ir.actions.act_window</field>
-          <field name="res_model">google.login</field>
-          <field name="view_type">form</field>
-          <field name="view_mode">form</field>
-          <field name="target">new</field>
-          <field name="context">{'contact':True}</field>
-          <field name="view_id" ref="google_base_account.view_google_login_form" />
-        </record>
-
-        <menuitem id="menu_sync_contact"
-                  parent="base.menu_import_crm"
-                  action="act_google_login_contact_form"
-                  sequence="5" />
-
-        <menuitem id="menu_sync_calendar"
-                  parent="base.menu_import_crm"
-                  action="act_google_login_form"
-                  sequence="15" />
-
-    </data>
-</openerp>
diff --git a/addons/import_sugarcrm/doc/import_sugarcrm_installation_manual.odt b/addons/import_sugarcrm/doc/import_sugarcrm_installation_manual.odt
deleted file mode 100644
index 2dfde16bc97..00000000000
Binary files a/addons/import_sugarcrm/doc/import_sugarcrm_installation_manual.odt and /dev/null differ
diff --git a/addons/import_sugarcrm/doc/import_sugarcrm_user_manual.odt b/addons/import_sugarcrm/doc/import_sugarcrm_user_manual.odt
deleted file mode 100644
index 2a16eeb566c..00000000000
Binary files a/addons/import_sugarcrm/doc/import_sugarcrm_user_manual.odt and /dev/null differ
diff --git a/addons/import_sugarcrm/doc/import_sugarcrm_zsi_installation.txt b/addons/import_sugarcrm/doc/import_sugarcrm_zsi_installation.txt
deleted file mode 100644
index e399d63120b..00000000000
--- a/addons/import_sugarcrm/doc/import_sugarcrm_zsi_installation.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Install the SOAP framwwork for Python :
-	1. download the soap framework from http://pypi.python.org/pypi/ZSI/
-		extract the file “ZSI-2.0-rc3.tar.gz” and run following 2 commands 
-		./setup.py build 
-		./setup.py install 
-		this will install soap framework for python.
-
-or use the ZSI package of your distribution
diff --git a/addons/import_sugarcrm/i18n/ar.po b/addons/import_sugarcrm/i18n/ar.po
deleted file mode 100644
index bcff97a4acf..00000000000
--- a/addons/import_sugarcrm/i18n/ar.po
+++ /dev/null
@@ -1,404 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-03-05 11:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "Error !!"
-msgstr "خطأ !!"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "(Coming Soon)"
-msgstr "قريباً"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,document:0
-msgid "Documents"
-msgstr "وثائق"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import your data from SugarCRM :"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Choose data you want to import. Click 'Import' to get data manually or "
-"'Schedule Reccurent Imports' to get recurrently and automatically data."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,contact:0
-msgid "Contacts"
-msgstr "جهات الاتصال"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "HR"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,bug:0
-msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,instance_name:0
-msgid "Instance's Name"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project_task:0
-msgid "Project Tasks"
-msgstr "مهام المشروع"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_from:0
-msgid "Notify End Of Import To:"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,user:0
-msgid ""
-"Check this box to import sugarCRM Users into OpenERP users, warning if a "
-"user with the same login exist in OpenERP, user information will be erase by "
-"sugarCRM user information"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#, python-format
-msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Schedule Recurrent Imports"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Do not forget the email address to be notified of the success of the import."
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,call:0
-msgid "Check this box to import sugarCRM Calls into OpenERP calls"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"If you make recurrent or ponctual import, data already  in OpenERP will be "
-"updated by SugarCRM data."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,employee:0
-msgid "Employee"
-msgstr "الموظف"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Document"
-msgstr "مستند"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,document:0
-msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import Data From SugarCRM"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "CRM"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid ""
-"Data are importing, the process is running in the background, an email will "
-"be sent to the given email address if it was defined."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,call:0
-msgid "Calls"
-msgstr "مكالمات"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Multi Instance Management"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid "_Ok"
-msgstr "م_وافق"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,opportunity:0
-msgid ""
-"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
-"and Opportunities"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_history:0
-msgid "Email and Note"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,url:0
-msgid ""
-"Webservice's url where to get the data.                      example : "
-"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
-"application "
-"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
-msgstr ""
-
-#. module: import_sugarcrm
-#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
-#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
-msgid "Import SugarCRM"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Import"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,user:0
-msgid "User"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "%s data required %s Module to be installed, Please install %s module"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,claim:0
-msgid "Cases"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,meeting:0
-msgid ""
-"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,email_history:0
-msgid ""
-"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
-"Messages and Attachments"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project:0
-msgid "Projects"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid ""
-"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
-"http://pypi.python.org/pypi/ZSI/"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project:0
-msgid "Check this box to import sugarCRM Projects into OpenERP projects"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Select Module to Import."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,meeting:0
-msgid "Meetings"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,employee:0
-msgid "Check this box to import sugarCRM Employees into OpenERP employees"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,url:0
-msgid "SugarSoap Api url:"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Address Book"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid ""
-"Authentication error !\n"
-"Bad Username or Password bad SugarSoap Api url !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,bug:0
-msgid "Bugs"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Project"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project_task:0
-msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,opportunity:0
-msgid "Leads & Opp"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#, python-format
-msgid ""
-"Authentication error !\n"
-"Bad Username or Password or bad SugarSoap Api url !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,instance_name:0
-msgid ""
-"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
-"from different server."
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,contact:0
-msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,password:0
-msgid "Password"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Login Information"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,claim:0
-msgid "Check this box to import sugarCRM Cases into OpenERP claims"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Notification When Import is Finished"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,username:0
-msgid "User Name"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.message:0
-#: model:ir.model,name:import_sugarcrm.model_import_message
-msgid "Import Message"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,account:0
-msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Online documentation:"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,account:0
-msgid "Accounts"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid "ZSI Import Error!"
-msgstr ""
-
-#. module: import_sugarcrm
-#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
-msgid "Import SugarCRM DATA"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Address to Notify"
-msgstr ""
diff --git a/addons/import_sugarcrm/i18n/es_CR.po b/addons/import_sugarcrm/i18n/es_CR.po
deleted file mode 100644
index 8874446fcf9..00000000000
--- a/addons/import_sugarcrm/i18n/es_CR.po
+++ /dev/null
@@ -1,458 +0,0 @@
-# Spanish (Costa Rica) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-17 16:37+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
-"Language-Team: Spanish (Costa Rica) <es_CR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "Error !!"
-msgstr "¡ Error !"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
-msgstr ""
-"Utilice la URL SugarSoap API (leer descripción) y un inicio de sesión de "
-"SugarCRM acceso completo."
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "(Coming Soon)"
-msgstr "(Próximamente)"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,document:0
-msgid "Documents"
-msgstr "Documentos"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import your data from SugarCRM :"
-msgstr "Importar sus datos desde SugarCRM :"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Choose data you want to import. Click 'Import' to get data manually or "
-"'Schedule Reccurent Imports' to get recurrently and automatically data."
-msgstr ""
-"Elija los datos que desea importar. Haga clic en \"Importar\" para obtener "
-"los datos de forma manual o \"programar importaciones reccurent 'para "
-"obtener los datos de forma recurrente y automática."
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,contact:0
-msgid "Contacts"
-msgstr "Contactos"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "HR"
-msgstr "RH"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,bug:0
-msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
-msgstr ""
-"Marque esta casilla para importar los errores en las cuestiones del proyecto "
-"de SugarCRM OpenERP"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,instance_name:0
-msgid "Instance's Name"
-msgstr "Nombre de las instanseas"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project_task:0
-msgid "Project Tasks"
-msgstr "Tareas de proyecto"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_from:0
-msgid "Notify End Of Import To:"
-msgstr "Notificación del final de importación:"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,user:0
-msgid ""
-"Check this box to import sugarCRM Users into OpenERP users, warning if a "
-"user with the same login exist in OpenERP, user information will be erase by "
-"sugarCRM user information"
-msgstr ""
-"Marque esta casilla para importar los usuarios de SugarCRM en los usuarios "
-"de OpenERP, advirtiendo si un usuario con el mismo nombre de usuario existe "
-"en OpenERP, la información del usuario será borrado por la información de "
-"los usuarios de SugarCRM"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#, python-format
-msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
-msgstr ""
-"Por favor, instale SOAP para python - ZSI-2.0-rc3.tar.gz - python-ZCI"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Schedule Recurrent Imports"
-msgstr "_Programar importaciones recurrentes"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Do not forget the email address to be notified of the success of the import."
-msgstr ""
-"No te olvides de la dirección de correo electrónico para ser notificado del "
-"éxito de la importación."
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,call:0
-msgid "Check this box to import sugarCRM Calls into OpenERP calls"
-msgstr ""
-"Marque esta casilla para importar llamadas en las llamadas SugarCRM OpenERP"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"If you make recurrent or ponctual import, data already  in OpenERP will be "
-"updated by SugarCRM data."
-msgstr ""
-"Si usted hace la importación recurrente o puntual, los datos que ya están en "
-"OpenERP se actualiza con los datos de SugarCRM."
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,employee:0
-msgid "Employee"
-msgstr "Empleado"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Document"
-msgstr "Documento"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,document:0
-msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr ""
-"Marque esta casilla para importar documentos de SugarCRM en los documentos "
-"de OpenERP"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import Data From SugarCRM"
-msgstr "Importar datos de SugarCRM"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "CRM"
-msgstr "CRM"
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid ""
-"Data are importing, the process is running in the background, an email will "
-"be sent to the given email address if it was defined."
-msgstr ""
-"Datos se están importando, el proceso se ejecuta en segundo plano, un correo "
-"electrónico será enviado a la dirección de correo electrónico dada si se ha "
-"definido."
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,call:0
-msgid "Calls"
-msgstr "Llamadas"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Multi Instance Management"
-msgstr "Gestión de multi instancia"
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid "_Ok"
-msgstr "_Aceptar"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,opportunity:0
-msgid ""
-"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
-"and Opportunities"
-msgstr ""
-"Marque esta casilla para importar clientes potenciales y oportunidades de "
-"SugarCRM OpenERP en clientes potenciales y oportunidades"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_history:0
-msgid "Email and Note"
-msgstr "Correo electrónico y nota"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,url:0
-msgid ""
-"Webservice's url where to get the data.                      example : "
-"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
-"application "
-"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
-msgstr ""
-"ServicioWeb URL de dónde obtener los datos. ejemplo: "
-"\"http://example.com/sugarcrm/soap.php ', o copiar la dirección de su "
-"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index "
-"aplicación SugarCRM"
-
-#. module: import_sugarcrm
-#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
-#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
-msgid "Import SugarCRM"
-msgstr "Importar SugarCRM"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Import"
-msgstr "_Importar"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,user:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "%s data required %s Module to be installed, Please install %s module"
-msgstr ""
-"%s datos requeridos %s módulo a instalar,Por favor  instale %s el módulo"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,claim:0
-msgid "Cases"
-msgstr "Casos"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,meeting:0
-msgid ""
-"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
-msgstr ""
-"Marque esta casilla para importar SugarCRM reuniones y tareas a las "
-"reuniones de OpenERP"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,email_history:0
-msgid ""
-"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
-"Messages and Attachments"
-msgstr ""
-"Marque esta casilla para importar SugarCRM correos electrónicos, notas y "
-"archivos adjuntos en mensajes de OpenERP y adjuntos"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project:0
-msgid "Projects"
-msgstr "Proyectos"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid ""
-"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
-"http://pypi.python.org/pypi/ZSI/"
-msgstr ""
-"Por favor instale SOAP para python - ZSI-2.0-rc3.tar.gz from "
-"http://pypi.python.org/pypi/ZSI/"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project:0
-msgid "Check this box to import sugarCRM Projects into OpenERP projects"
-msgstr ""
-"Marque esta casilla para importar proyectos de SugarCRM en los proyectos de "
-"OpenERP"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Select Module to Import."
-msgstr "Seleccione el modulo a importar"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,meeting:0
-msgid "Meetings"
-msgstr "Reuniones"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,employee:0
-msgid "Check this box to import sugarCRM Employees into OpenERP employees"
-msgstr ""
-"Marque esta casilla para importar empleados en SugarCRM OpenERP empleados"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,url:0
-msgid "SugarSoap Api url:"
-msgstr "SugarSoap Api url:"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Address Book"
-msgstr "Libreta de direcciones"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid ""
-"Authentication error !\n"
-"Bad Username or Password bad SugarSoap Api url !"
-msgstr ""
-"¡ Error de autenticación !\n"
-"! Nombre de usuario o contraseña incorrectos mala url SugarSoap Api!"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,bug:0
-msgid "Bugs"
-msgstr "Pulgas"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project_task:0
-msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
-msgstr ""
-"Marque esta casilla para importar las tareas de SugarCRM proyecto en tareas "
-"OpenERP"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,opportunity:0
-msgid "Leads & Opp"
-msgstr "Guías y Opp"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#, python-format
-msgid ""
-"Authentication error !\n"
-"Bad Username or Password or bad SugarSoap Api url !"
-msgstr ""
-"¡ Error de autenticación!\n"
-"¡ Nombre de usuario o contraseña incorrectos o url mal SugarSoap Api!"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Warning !"
-msgstr "¡ Advertencia !"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,instance_name:0
-msgid ""
-"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
-"from different server."
-msgstr ""
-"Prefijo de Identificación de SugarCRM para diferenciar xml_id de datas "
-"SugarCRM modelos vienen de otro servidor."
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,contact:0
-msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
-msgstr ""
-"Marque esta casilla para importar los contactos de SugarCRM en direcciones "
-"OpenERP"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,password:0
-msgid "Password"
-msgstr "Contraseña"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Login Information"
-msgstr "Información conexión"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,claim:0
-msgid "Check this box to import sugarCRM Cases into OpenERP claims"
-msgstr ""
-"Marque esta casilla para importar los casos de SugarCRM en demandas OpenERP"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Notification When Import is Finished"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,username:0
-msgid "User Name"
-msgstr "Nombre de usuario"
-
-#. module: import_sugarcrm
-#: view:import.message:0
-#: model:ir.model,name:import_sugarcrm.model_import_message
-msgid "Import Message"
-msgstr "Importar mensaje"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,account:0
-msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
-msgstr ""
-"Marque esta casilla para importar cuentas de SugarCRM en socios de OpenERP"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Online documentation:"
-msgstr "Documentación en linea:"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,account:0
-msgid "Accounts"
-msgstr "Cuentas"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid "ZSI Import Error!"
-msgstr "¡Error al importar ZSI !"
-
-#. module: import_sugarcrm
-#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
-msgid "Import SugarCRM DATA"
-msgstr "Importar DATOS SugarCRM"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Address to Notify"
-msgstr "Direcciones de correo electrónico a notificar"
-
-#~ msgid "Email Notification When Import is finished"
-#~ msgstr ""
-#~ "Notificación por correo electrónico cuando haya terminado la importación"
diff --git a/addons/import_sugarcrm/i18n/fr.po b/addons/import_sugarcrm/i18n/fr.po
deleted file mode 100644
index c8f7f9daf21..00000000000
--- a/addons/import_sugarcrm/i18n/fr.po
+++ /dev/null
@@ -1,416 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-24 17:37+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "Error !!"
-msgstr "Erreur !!"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "(Coming Soon)"
-msgstr "(Prochainement)"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,document:0
-msgid "Documents"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import your data from SugarCRM :"
-msgstr "Importer vos données depuis SugarCRM :"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Choose data you want to import. Click 'Import' to get data manually or "
-"'Schedule Reccurent Imports' to get recurrently and automatically data."
-msgstr ""
-"Choisissez les données que vous voulez importer. Cliquez sur \"Importer\" "
-"pour obtenir les données manuellement ou 'Planifier les imports récurrents' "
-"pour obtenir les données de manière récurrente et automatique."
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,contact:0
-msgid "Contacts"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "HR"
-msgstr "RH"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,bug:0
-msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
-msgstr ""
-"Cochez la case pour importer les bugs SugarCRM dans les tickets OpenERP"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,instance_name:0
-msgid "Instance's Name"
-msgstr "Nom de l'instance"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project_task:0
-msgid "Project Tasks"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_from:0
-msgid "Notify End Of Import To:"
-msgstr "Notifier la fin de l'import à:"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,user:0
-msgid ""
-"Check this box to import sugarCRM Users into OpenERP users, warning if a "
-"user with the same login exist in OpenERP, user information will be erase by "
-"sugarCRM user information"
-msgstr ""
-"Cocher cette case pour importer les utilisateurs sugarCRM dans les "
-"utilisateurs OpenERP. Attention s'il y a déjà un utilisateur avec le même "
-"login dans OpenERP, les informations utilisateur seront remplacées par les "
-"informations utilisateur sugarCRM"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#, python-format
-msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
-msgstr ""
-"Veuillez installez SOAP pour Python - ZSI-2.0-rc3.tar.gz - python-zci"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Schedule Recurrent Imports"
-msgstr "_Planifier les imports récurrents"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Do not forget the email address to be notified of the success of the import."
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,call:0
-msgid "Check this box to import sugarCRM Calls into OpenERP calls"
-msgstr ""
-"Cochez cette case pour importer les appels sugarCRM dans les appels OpenERP"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"If you make recurrent or ponctual import, data already  in OpenERP will be "
-"updated by SugarCRM data."
-msgstr ""
-"Si vous faîtes de l'import récurrent ou ponctuel, les données déjà "
-"existantes dans OpenERP seront mises à jour par les données sugarCRM"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,employee:0
-msgid "Employee"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Document"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,document:0
-msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import Data From SugarCRM"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "CRM"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid ""
-"Data are importing, the process is running in the background, an email will "
-"be sent to the given email address if it was defined."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,call:0
-msgid "Calls"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Multi Instance Management"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid "_Ok"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,opportunity:0
-msgid ""
-"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
-"and Opportunities"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_history:0
-msgid "Email and Note"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,url:0
-msgid ""
-"Webservice's url where to get the data.                      example : "
-"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
-"application "
-"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
-msgstr ""
-
-#. module: import_sugarcrm
-#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
-#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
-msgid "Import SugarCRM"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Import"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,user:0
-msgid "User"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "%s data required %s Module to be installed, Please install %s module"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,claim:0
-msgid "Cases"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,meeting:0
-msgid ""
-"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,email_history:0
-msgid ""
-"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
-"Messages and Attachments"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project:0
-msgid "Projects"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid ""
-"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
-"http://pypi.python.org/pypi/ZSI/"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project:0
-msgid "Check this box to import sugarCRM Projects into OpenERP projects"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Select Module to Import."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,meeting:0
-msgid "Meetings"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,employee:0
-msgid "Check this box to import sugarCRM Employees into OpenERP employees"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,url:0
-msgid "SugarSoap Api url:"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Address Book"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid ""
-"Authentication error !\n"
-"Bad Username or Password bad SugarSoap Api url !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,bug:0
-msgid "Bugs"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Project"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project_task:0
-msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,opportunity:0
-msgid "Leads & Opp"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#, python-format
-msgid ""
-"Authentication error !\n"
-"Bad Username or Password or bad SugarSoap Api url !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,instance_name:0
-msgid ""
-"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
-"from different server."
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,contact:0
-msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,password:0
-msgid "Password"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Login Information"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,claim:0
-msgid "Check this box to import sugarCRM Cases into OpenERP claims"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Notification When Import is Finished"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,username:0
-msgid "User Name"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.message:0
-#: model:ir.model,name:import_sugarcrm.model_import_message
-msgid "Import Message"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,account:0
-msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Online documentation:"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,account:0
-msgid "Accounts"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid "ZSI Import Error!"
-msgstr ""
-
-#. module: import_sugarcrm
-#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
-msgid "Import SugarCRM DATA"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Address to Notify"
-msgstr ""
diff --git a/addons/import_sugarcrm/i18n/import_sugarcrm.pot b/addons/import_sugarcrm/i18n/import_sugarcrm.pot
deleted file mode 100644
index 75caa61ccc3..00000000000
--- a/addons/import_sugarcrm/i18n/import_sugarcrm.pot
+++ /dev/null
@@ -1,377 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* import_sugarcrm
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-02-08 00:36+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: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "Error !!"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "(Coming Soon)"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,document:0
-msgid "Documents"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import your data from SugarCRM :"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Choose data you want to import. Click 'Import' to get data manually or 'Schedule Reccurent Imports' to get recurrently and automatically data."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,contact:0
-msgid "Contacts"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "HR"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,bug:0
-msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,instance_name:0
-msgid "Instance's Name"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project_task:0
-msgid "Project Tasks"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_from:0
-msgid "Notify End Of Import To:"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,user:0
-msgid "Check this box to import sugarCRM Users into OpenERP users, warning if a user with the same login exist in OpenERP, user information will be erase by sugarCRM user information"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#, python-format
-msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Schedule Recurrent Imports"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Do not forget the email address to be notified of the success of the import."
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,call:0
-msgid "Check this box to import sugarCRM Calls into OpenERP calls"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "If you make recurrent or ponctual import, data already  in OpenERP will be updated by SugarCRM data."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,employee:0
-msgid "Employee"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Document"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,document:0
-msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import Data From SugarCRM"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "CRM"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid "Data are importing, the process is running in the background, an email will be sent to the given email address if it was defined."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,call:0
-msgid "Calls"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Multi Instance Management"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid "_Ok"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,opportunity:0
-msgid "Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads and Opportunities"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_history:0
-msgid "Email and Note"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,url:0
-msgid "Webservice's url where to get the data.                      example : 'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm application http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
-msgstr ""
-
-#. module: import_sugarcrm
-#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
-#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
-msgid "Import SugarCRM"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Import"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,user:0
-msgid "User"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "%s data required %s Module to be installed, Please install %s module"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,claim:0
-msgid "Cases"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,meeting:0
-msgid "Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,email_history:0
-msgid "Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP Messages and Attachments"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project:0
-msgid "Projects"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz from http://pypi.python.org/pypi/ZSI/"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project:0
-msgid "Check this box to import sugarCRM Projects into OpenERP projects"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Select Module to Import."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,meeting:0
-msgid "Meetings"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,employee:0
-msgid "Check this box to import sugarCRM Employees into OpenERP employees"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,url:0
-msgid "SugarSoap Api url:"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Address Book"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid "Authentication error !\n"
-"Bad Username or Password bad SugarSoap Api url !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,bug:0
-msgid "Bugs"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Project"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project_task:0
-msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,opportunity:0
-msgid "Leads & Opp"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#, python-format
-msgid "Authentication error !\n"
-"Bad Username or Password or bad SugarSoap Api url !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,instance_name:0
-msgid "Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come from different server."
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,contact:0
-msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,password:0
-msgid "Password"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Login Information"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,claim:0
-msgid "Check this box to import sugarCRM Cases into OpenERP claims"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Notification When Import is Finished"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,username:0
-msgid "User Name"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.message:0
-#: model:ir.model,name:import_sugarcrm.model_import_message
-msgid "Import Message"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,account:0
-msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Online documentation:"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,account:0
-msgid "Accounts"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Cancel"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid "ZSI Import Error!"
-msgstr ""
-
-#. module: import_sugarcrm
-#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
-msgid "Import SugarCRM DATA"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Address to Notify"
-msgstr ""
-
diff --git a/addons/import_sugarcrm/i18n/ja.po b/addons/import_sugarcrm/i18n/ja.po
deleted file mode 100644
index c5327631b27..00000000000
--- a/addons/import_sugarcrm/i18n/ja.po
+++ /dev/null
@@ -1,417 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-07-09 18:11+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "Error !!"
-msgstr "エラー"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
-msgstr "SugarSoap API URL（ツールヒントを参照）とフルアクセスのSugarCRMログインを使用します。"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "(Coming Soon)"
-msgstr "(ただいま準備中です。もうしばらくお待ちください。)"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,document:0
-msgid "Documents"
-msgstr "ドキュメント"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import your data from SugarCRM :"
-msgstr "データをSugarCRMからインポートする。"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Choose data you want to import. Click 'Import' to get data manually or "
-"'Schedule Reccurent Imports' to get recurrently and automatically data."
-msgstr ""
-"インポートしたいデータを選択します。データを手動で取得するにはインポートを、データを繰り返し自動で取得するにはスケジュール反復インポートをクリックします。"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,contact:0
-msgid "Contacts"
-msgstr "コンタクト"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "HR"
-msgstr "人事"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,bug:0
-msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
-msgstr "OpenERPのプロジェクト問題にSugarCRMのバグをインポートするには、このボックスをクリックします。"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,instance_name:0
-msgid "Instance's Name"
-msgstr "インスタンスの名前"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project_task:0
-msgid "Project Tasks"
-msgstr "プロジェクトのタスク"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_from:0
-msgid "Notify End Of Import To:"
-msgstr "インポート終了の通知先："
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,user:0
-msgid ""
-"Check this box to import sugarCRM Users into OpenERP users, warning if a "
-"user with the same login exist in OpenERP, user information will be erase by "
-"sugarCRM user information"
-msgstr ""
-"OpenERPユーザにSugarCRMユーザをインポートするには、このボックスをチェックします。OpenERPの中に同じログインユーザが存在する場合は、S"
-"ugarCRMユーザ情報によりユーザ情報が消されることに注意して下さい。"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#, python-format
-msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
-msgstr "Python SOAPをインストールして下さい。- ZSI-2.0-rc3.tar.gz - python-zci"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Schedule Recurrent Imports"
-msgstr "スケジュール反復インポート"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Do not forget the email address to be notified of the success of the import."
-msgstr "インポート完了を通知するEメールアドレスを忘れないで下さい。"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,call:0
-msgid "Check this box to import sugarCRM Calls into OpenERP calls"
-msgstr "OpenERP通話にSugarCRM通話をインポートするには、このボックスをチェックします。"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"If you make recurrent or ponctual import, data already  in OpenERP will be "
-"updated by SugarCRM data."
-msgstr "反復あるいは定時インポートをする場合、OpenERP内のデータはSugarCRMのデータによって更新されます。"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,employee:0
-msgid "Employee"
-msgstr "従業員"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Document"
-msgstr "ドキュメント"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,document:0
-msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr "SugarCRMドキュメントをOpenERPドキュメントへインポートするには、このボックスをチェックします。"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import Data From SugarCRM"
-msgstr "SugarCRMからデータのインポート"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "CRM"
-msgstr "CRM"
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid ""
-"Data are importing, the process is running in the background, an email will "
-"be sent to the given email address if it was defined."
-msgstr "データインポートのプロセスはバックグラウンドで実行されます。それが定義されている場合、所定のEメールアドレスにEメールが送信されます。"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,call:0
-msgid "Calls"
-msgstr "通話"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Multi Instance Management"
-msgstr "複数インスタンスの管理"
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid "_Ok"
-msgstr "OK"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,opportunity:0
-msgid ""
-"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
-"and Opportunities"
-msgstr "OpenERPのリードと商談の中に、SugarCRMのリードと商談をインポートするには、このボックスをチェックします。"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_history:0
-msgid "Email and Note"
-msgstr "Ｅメールと備考"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,url:0
-msgid ""
-"Webservice's url where to get the data.                      example : "
-"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
-"application "
-"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
-msgstr ""
-"データを取得するためのWebサービスのURL。例：'http://example.com/sugarcrm/soap.php'、または、あなたのSugar"
-"CRMアプリケーションのアドレスをコピーします。 "
-"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
-
-#. module: import_sugarcrm
-#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
-#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
-msgid "Import SugarCRM"
-msgstr "SugarCRMをインポート"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Import"
-msgstr "インポート"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,user:0
-msgid "User"
-msgstr "ユーザ"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "%s data required %s Module to be installed, Please install %s module"
-msgstr "%s のデータは %s モジュールがインストールされていることを要求します。%s モジュールをインストールして下さい。"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,claim:0
-msgid "Cases"
-msgstr "案件"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,meeting:0
-msgid ""
-"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
-msgstr "OpenERPミーティングにSugarCRMのミーティングとタスクをインポートするには、このボックスをチェックします。"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,email_history:0
-msgid ""
-"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
-"Messages and Attachments"
-msgstr ""
-"OpenERPメッセージと添付ファイにSugarCRMのEメール、ノート、添付ファイルをインポートするには、このボックスをチェックします。"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project:0
-msgid "Projects"
-msgstr "プロジェクト"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid ""
-"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
-"http://pypi.python.org/pypi/ZSI/"
-msgstr ""
-"Python SOAPをインストールして下さい。- ZSI-2.0-rc3.tar.gz from "
-"http://pypi.python.org/pypi/ZSI/"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project:0
-msgid "Check this box to import sugarCRM Projects into OpenERP projects"
-msgstr "OpenERPプロジェクトにSugarCRMプロジェクトをインポートするには、このボックスをチェックして下さい。"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Select Module to Import."
-msgstr "インポートするモジュールを選択"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,meeting:0
-msgid "Meetings"
-msgstr "ミーティング"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,employee:0
-msgid "Check this box to import sugarCRM Employees into OpenERP employees"
-msgstr "OpenERP従業員にSugarCRM従業員をインポートするには、このボックスをチェックします。"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,url:0
-msgid "SugarSoap Api url:"
-msgstr "SugarSoap API URL："
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Address Book"
-msgstr "アドレス帳"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid ""
-"Authentication error !\n"
-"Bad Username or Password bad SugarSoap Api url !"
-msgstr ""
-"認証エラー。\n"
-"ユーザ名、パスワード、SugarSoap API URLの何れかに問題があります。"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,bug:0
-msgid "Bugs"
-msgstr "バグ"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Project"
-msgstr "プロジェクト"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project_task:0
-msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
-msgstr "OpenERPタスクにSugarCRMプロジェクトタスクをインポートするには、このボックスをチェックします。"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,opportunity:0
-msgid "Leads & Opp"
-msgstr "リード ＆ 商談"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#, python-format
-msgid ""
-"Authentication error !\n"
-"Bad Username or Password or bad SugarSoap Api url !"
-msgstr ""
-"認証エラー。\n"
-"ユーザ名、パスワード、SugarSoap API URLの何れかに問題があります。"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid "Error !"
-msgstr "エラー"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Warning !"
-msgstr "警告"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,instance_name:0
-msgid ""
-"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
-"from different server."
-msgstr "SugarCRMモデルデータの xml_id を区別するためのSugarCRM IDのサフィックス（接頭辞）は異なるサーバから来ます。"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,contact:0
-msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
-msgstr "OpenERP住所録にSugarCRMコンタクトをインポートするには、このボックスをチェックします。"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,password:0
-msgid "Password"
-msgstr "パスワード"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Login Information"
-msgstr "ログイン情報"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,claim:0
-msgid "Check this box to import sugarCRM Cases into OpenERP claims"
-msgstr "OpenERP苦情にSugarCRMケースをインポートするには、このボックスをチェックします。"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Notification When Import is Finished"
-msgstr "インポート完了時にEメール通知"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,username:0
-msgid "User Name"
-msgstr "ユーザ名"
-
-#. module: import_sugarcrm
-#: view:import.message:0
-#: model:ir.model,name:import_sugarcrm.model_import_message
-msgid "Import Message"
-msgstr "メッセージのインポート"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,account:0
-msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
-msgstr "OpenERPパートナにSugarCRMアカウントをインポートするには、このボックスをチェックします。"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Online documentation:"
-msgstr "オンラインドキュメンテーション："
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,account:0
-msgid "Accounts"
-msgstr "顧客情報"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Cancel"
-msgstr "キャンセル"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid "ZSI Import Error!"
-msgstr "ZSI のインポートエラー"
-
-#. module: import_sugarcrm
-#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
-msgid "Import SugarCRM DATA"
-msgstr "SugarCRMのデータをインポート"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Address to Notify"
-msgstr "通知のEメールアドレス"
diff --git a/addons/import_sugarcrm/i18n/nl.po b/addons/import_sugarcrm/i18n/nl.po
deleted file mode 100644
index 5a14a04fa8b..00000000000
--- a/addons/import_sugarcrm/i18n/nl.po
+++ /dev/null
@@ -1,409 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:16+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <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: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "Error !!"
-msgstr "Fout!"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "(Coming Soon)"
-msgstr "(Komt snel)"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,document:0
-msgid "Documents"
-msgstr "Documenten"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import your data from SugarCRM :"
-msgstr "Import uw gegevens van SugerCRM:"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Choose data you want to import. Click 'Import' to get data manually or "
-"'Schedule Reccurent Imports' to get recurrently and automatically data."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,contact:0
-msgid "Contacts"
-msgstr "Contacten"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "HR"
-msgstr "HR"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,bug:0
-msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,instance_name:0
-msgid "Instance's Name"
-msgstr "Instantienaam"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project_task:0
-msgid "Project Tasks"
-msgstr "Project taken"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_from:0
-msgid "Notify End Of Import To:"
-msgstr "Meld het einde van de import aan:"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,user:0
-msgid ""
-"Check this box to import sugarCRM Users into OpenERP users, warning if a "
-"user with the same login exist in OpenERP, user information will be erase by "
-"sugarCRM user information"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#, python-format
-msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Schedule Recurrent Imports"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Do not forget the email address to be notified of the success of the import."
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,call:0
-msgid "Check this box to import sugarCRM Calls into OpenERP calls"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"If you make recurrent or ponctual import, data already  in OpenERP will be "
-"updated by SugarCRM data."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,employee:0
-msgid "Employee"
-msgstr "Werknemer"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Document"
-msgstr "Document"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,document:0
-msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import Data From SugarCRM"
-msgstr "Import gegevens van SugarCRM"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "CRM"
-msgstr "Relatiebeheer"
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid ""
-"Data are importing, the process is running in the background, an email will "
-"be sent to the given email address if it was defined."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,call:0
-msgid "Calls"
-msgstr "Gesprekken"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Multi Instance Management"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,opportunity:0
-msgid ""
-"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
-"and Opportunities"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_history:0
-msgid "Email and Note"
-msgstr "E-mail en make notitie"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,url:0
-msgid ""
-"Webservice's url where to get the data.                      example : "
-"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
-"application "
-"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
-msgstr ""
-
-#. module: import_sugarcrm
-#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
-#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
-msgid "Import SugarCRM"
-msgstr "Importeer SugarCRM"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Import"
-msgstr "_Importeren"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,user:0
-msgid "User"
-msgstr "Gebruiker"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "%s data required %s Module to be installed, Please install %s module"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,claim:0
-msgid "Cases"
-msgstr "Dossiers"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,meeting:0
-msgid ""
-"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,email_history:0
-msgid ""
-"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
-"Messages and Attachments"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project:0
-msgid "Projects"
-msgstr "Projecten"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid ""
-"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
-"http://pypi.python.org/pypi/ZSI/"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project:0
-msgid "Check this box to import sugarCRM Projects into OpenERP projects"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Select Module to Import."
-msgstr "Select module om te importeren"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,meeting:0
-msgid "Meetings"
-msgstr "Afspraken"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,employee:0
-msgid "Check this box to import sugarCRM Employees into OpenERP employees"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,url:0
-msgid "SugarSoap Api url:"
-msgstr "SugarSoap Api url:"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Address Book"
-msgstr "Adresboek"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid ""
-"Authentication error !\n"
-"Bad Username or Password bad SugarSoap Api url !"
-msgstr ""
-"Authenticatie fout !\n"
-"Foutieve gebruikersnaam of wachtwoord of SugarSoap Api url !"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,bug:0
-msgid "Bugs"
-msgstr "Fouten/bugs"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Project"
-msgstr "Project"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project_task:0
-msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,opportunity:0
-msgid "Leads & Opp"
-msgstr "Leads & Pros."
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#, python-format
-msgid ""
-"Authentication error !\n"
-"Bad Username or Password or bad SugarSoap Api url !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid "Error !"
-msgstr "Fout !"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Warning !"
-msgstr "Waarschuwing !"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,instance_name:0
-msgid ""
-"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
-"from different server."
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,contact:0
-msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,password:0
-msgid "Password"
-msgstr "Wachtwoord"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Login Information"
-msgstr "Aanmeldingsinformatie"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,claim:0
-msgid "Check this box to import sugarCRM Cases into OpenERP claims"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Notification When Import is Finished"
-msgstr "E-mail melding als de import gereed is"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,username:0
-msgid "User Name"
-msgstr "Gebruikersnaam"
-
-#. module: import_sugarcrm
-#: view:import.message:0
-#: model:ir.model,name:import_sugarcrm.model_import_message
-msgid "Import Message"
-msgstr "Import bericht"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,account:0
-msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Online documentation:"
-msgstr "Online documentatie:"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,account:0
-msgid "Accounts"
-msgstr "Accounts"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Cancel"
-msgstr "_Annuleren"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid "ZSI Import Error!"
-msgstr "ZSI Import fout!"
-
-#. module: import_sugarcrm
-#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
-msgid "Import SugarCRM DATA"
-msgstr "Importeer SugarCRM DATA"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Address to Notify"
-msgstr "E-mail adres voor melding"
-
-#~ msgid "Email Notification When Import is finished"
-#~ msgstr "E-mail melding als de import gereed is"
diff --git a/addons/import_sugarcrm/i18n/pt.po b/addons/import_sugarcrm/i18n/pt.po
deleted file mode 100644
index d70749d0fdd..00000000000
--- a/addons/import_sugarcrm/i18n/pt.po
+++ /dev/null
@@ -1,404 +0,0 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-21 12:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "Error !!"
-msgstr "Erro !!"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "(Coming Soon)"
-msgstr "(Em breve)"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,document:0
-msgid "Documents"
-msgstr "Documentos"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import your data from SugarCRM :"
-msgstr "Importar os seus dados do SugarCRM:"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Choose data you want to import. Click 'Import' to get data manually or "
-"'Schedule Reccurent Imports' to get recurrently and automatically data."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,contact:0
-msgid "Contacts"
-msgstr "Contatos"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "HR"
-msgstr "RH"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,bug:0
-msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,instance_name:0
-msgid "Instance's Name"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project_task:0
-msgid "Project Tasks"
-msgstr "Tarefas do Projeto"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_from:0
-msgid "Notify End Of Import To:"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,user:0
-msgid ""
-"Check this box to import sugarCRM Users into OpenERP users, warning if a "
-"user with the same login exist in OpenERP, user information will be erase by "
-"sugarCRM user information"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#, python-format
-msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Schedule Recurrent Imports"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Do not forget the email address to be notified of the success of the import."
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,call:0
-msgid "Check this box to import sugarCRM Calls into OpenERP calls"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"If you make recurrent or ponctual import, data already  in OpenERP will be "
-"updated by SugarCRM data."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,employee:0
-msgid "Employee"
-msgstr "Funcionário"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Document"
-msgstr "Documento"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,document:0
-msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import Data From SugarCRM"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "CRM"
-msgstr "CRM"
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid ""
-"Data are importing, the process is running in the background, an email will "
-"be sent to the given email address if it was defined."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,call:0
-msgid "Calls"
-msgstr "Chamadas"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Multi Instance Management"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,opportunity:0
-msgid ""
-"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
-"and Opportunities"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_history:0
-msgid "Email and Note"
-msgstr "Email e Notas"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,url:0
-msgid ""
-"Webservice's url where to get the data.                      example : "
-"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
-"application "
-"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
-msgstr ""
-
-#. module: import_sugarcrm
-#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
-#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
-msgid "Import SugarCRM"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Import"
-msgstr "_Importar"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,user:0
-msgid "User"
-msgstr "Utilizador"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "%s data required %s Module to be installed, Please install %s module"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,claim:0
-msgid "Cases"
-msgstr "Casos"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,meeting:0
-msgid ""
-"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,email_history:0
-msgid ""
-"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
-"Messages and Attachments"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project:0
-msgid "Projects"
-msgstr "Projetos"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid ""
-"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
-"http://pypi.python.org/pypi/ZSI/"
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project:0
-msgid "Check this box to import sugarCRM Projects into OpenERP projects"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Select Module to Import."
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,meeting:0
-msgid "Meetings"
-msgstr "Reuniões"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,employee:0
-msgid "Check this box to import sugarCRM Employees into OpenERP employees"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,url:0
-msgid "SugarSoap Api url:"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Address Book"
-msgstr "Lista de Contatos"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid ""
-"Authentication error !\n"
-"Bad Username or Password bad SugarSoap Api url !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,bug:0
-msgid "Bugs"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Project"
-msgstr "Projeto"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project_task:0
-msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,opportunity:0
-msgid "Leads & Opp"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#, python-format
-msgid ""
-"Authentication error !\n"
-"Bad Username or Password or bad SugarSoap Api url !"
-msgstr ""
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid "Error !"
-msgstr "Erro !"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Warning !"
-msgstr "Aviso !"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,instance_name:0
-msgid ""
-"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
-"from different server."
-msgstr ""
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,contact:0
-msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,password:0
-msgid "Password"
-msgstr "Password"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Login Information"
-msgstr "Informação de Login"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,claim:0
-msgid "Check this box to import sugarCRM Cases into OpenERP claims"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Notification When Import is Finished"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,username:0
-msgid "User Name"
-msgstr "Nome do Utilizador"
-
-#. module: import_sugarcrm
-#: view:import.message:0
-#: model:ir.model,name:import_sugarcrm.model_import_message
-msgid "Import Message"
-msgstr "Importar mensagem"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,account:0
-msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Online documentation:"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,account:0
-msgid "Accounts"
-msgstr "Contas"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid "ZSI Import Error!"
-msgstr ""
-
-#. module: import_sugarcrm
-#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
-msgid "Import SugarCRM DATA"
-msgstr ""
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Address to Notify"
-msgstr ""
diff --git a/addons/import_sugarcrm/i18n/ro.po b/addons/import_sugarcrm/i18n/ro.po
deleted file mode 100644
index a10afa8670d..00000000000
--- a/addons/import_sugarcrm/i18n/ro.po
+++ /dev/null
@@ -1,456 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-26 19:35+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 05:00+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "Error !!"
-msgstr "Eroare !!"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login."
-msgstr ""
-"Utilizati URL API SugarSoap (unealta de citire) si acces complet la "
-"autentificarea SugarCRM."
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "(Coming Soon)"
-msgstr "(In curand)"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,document:0
-msgid "Documents"
-msgstr "Documente"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import your data from SugarCRM :"
-msgstr "Importati-va datele din SugarCRM :"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Choose data you want to import. Click 'Import' to get data manually or "
-"'Schedule Reccurent Imports' to get recurrently and automatically data."
-msgstr ""
-"Alegeti datele pe care doriti sa le importati. Faceti click pe 'Importa' "
-"pentru a obtine datele manual sau 'Programeaza Importuri Recurente' pentru a "
-"obtine date in mod recurent si automat."
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,contact:0
-msgid "Contacts"
-msgstr "Contacte"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "HR"
-msgstr "RU"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,bug:0
-msgid "Check this box to import sugarCRM Bugs into OpenERP project issues"
-msgstr ""
-"Bifati aceasta casuta pentru a importa sugarCRM Bugs in problemele "
-"proiectului OpenERP"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,instance_name:0
-msgid "Instance's Name"
-msgstr "Numele Instantei"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project_task:0
-msgid "Project Tasks"
-msgstr "Sarcini Proiect"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_from:0
-msgid "Notify End Of Import To:"
-msgstr "Anuntati Finalizarea Importului la:"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,user:0
-msgid ""
-"Check this box to import sugarCRM Users into OpenERP users, warning if a "
-"user with the same login exist in OpenERP, user information will be erase by "
-"sugarCRM user information"
-msgstr ""
-"Bifati aceasta casuta pentru a importa Utilizatori sugarCRM in utilizatorii "
-"OpenERP, avertizare daca exista un utilizator cu acelasi nume de "
-"autentificare in OpenERP, informatiile despre utilizatori vor fi sterse de "
-"informatiile despre utilizatorii sugarCRM"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#, python-format
-msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci"
-msgstr ""
-"Va rugam sa instalati SOAP pentru pyhton - ZSI-2.0-rc3.tar.gz - python-zci"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Schedule Recurrent Imports"
-msgstr "_Programati Importuri Recurente"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"Do not forget the email address to be notified of the success of the import."
-msgstr ""
-"Nu uitati adresa de e-mail la care sa fiti instiintat ca importul a avut "
-"succes."
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,call:0
-msgid "Check this box to import sugarCRM Calls into OpenERP calls"
-msgstr ""
-"Bifati aceasta casuta pentru a importa Apeluri sugarCRM in apeluri OpenERP"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid ""
-"If you make recurrent or ponctual import, data already  in OpenERP will be "
-"updated by SugarCRM data."
-msgstr ""
-"Daca efectuati importuri recurente sau punctuale, datele deja existente in "
-"OpenERP vor fi actualizate cu datele SugarCRM."
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,employee:0
-msgid "Employee"
-msgstr "Angajat"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Document"
-msgstr "Document"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,document:0
-msgid "Check this box to import sugarCRM Documents into OpenERP documents"
-msgstr ""
-"Bifati aceasta casuta pentru a importa Documente sugarCRM in documentele "
-"OpenERP"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Import Data From SugarCRM"
-msgstr "Importati Date din SugarCRM"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "CRM"
-msgstr "CRM (MRC-Managementul Relatiei cu Clientii)"
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid ""
-"Data are importing, the process is running in the background, an email will "
-"be sent to the given email address if it was defined."
-msgstr ""
-"Datele sunt importate, procesul ruleaza in fundal, iar un e-mail va fi "
-"trimis la adresa de e-mail data daca a fost definita."
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,call:0
-msgid "Calls"
-msgstr "Apeluri"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Multi Instance Management"
-msgstr "Managementul Multi Instantelor"
-
-#. module: import_sugarcrm
-#: view:import.message:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,opportunity:0
-msgid ""
-"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads "
-"and Opportunities"
-msgstr ""
-"Bifati aceasta casuta pentru a importa Piste si Oportunitati sugarCRM in "
-"Pistele si Oportunitatile OpenERP"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,email_history:0
-msgid "Email and Note"
-msgstr "E-mail si Nota"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,url:0
-msgid ""
-"Webservice's url where to get the data.                      example : "
-"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm "
-"application "
-"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"
-msgstr ""
-"Url-ul serii web de unde obtineti datele. De exemplu : "
-"'http://example.com/sugarcrm/soap/php', sau copiati adresa aplicatiei d-"
-"voastre sugarcrm "
-"http://trial.sugarcrm.com/qbquyi4802/index.php?module=Home&action=index"
-
-#. module: import_sugarcrm
-#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm
-#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import
-msgid "Import SugarCRM"
-msgstr "importati SugarCRM"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Import"
-msgstr "_Importati"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,user:0
-msgid "User"
-msgstr "Utilizator"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1105
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1131
-#, python-format
-msgid "%s data required %s Module to be installed, Please install %s module"
-msgstr ""
-"datele %s necesita instalarea Modulului %s, va rugam sa instalati modulul %s"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,claim:0
-msgid "Cases"
-msgstr "Cazuri"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,meeting:0
-msgid ""
-"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"
-msgstr ""
-"Bifati aceasta casuta pentru a importa Intalniri si Sarcini sugarCRM in "
-"Intalniri OpenERP"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,email_history:0
-msgid ""
-"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP "
-"Messages and Attachments"
-msgstr ""
-"Bifati aceasta casuta pentru a importa E-mail-uri, Note si Atasamente in "
-"Mesajele si Atasamentele OpenERP"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,project:0
-msgid "Projects"
-msgstr "Proiecte"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid ""
-"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from "
-"http://pypi.python.org/pypi/ZSI/"
-msgstr ""
-"Va rugam sa instalati SOAP pentru python - ZSI-2.0-rc3.tar.gz de la adresa "
-"http://pypi.python.org/pypi/ZSI/"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project:0
-msgid "Check this box to import sugarCRM Projects into OpenERP projects"
-msgstr ""
-"Bifati aceasta casuta pentru a importa Proiecte sugarCRM in proiectele "
-"OpenERP"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Select Module to Import."
-msgstr "Selectati Modulul care va fi Importat."
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,meeting:0
-msgid "Meetings"
-msgstr "Intalniri"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,employee:0
-msgid "Check this box to import sugarCRM Employees into OpenERP employees"
-msgstr ""
-"Bifati aceasta casuta pentru a importa Angajati sugarCRM in Angajati OpenERP"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,url:0
-msgid "SugarSoap Api url:"
-msgstr "Url SugarSoap Api:"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Address Book"
-msgstr "Agenda"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid ""
-"Authentication error !\n"
-"Bad Username or Password bad SugarSoap Api url !"
-msgstr ""
-"Eroare de autentificare !\n"
-"Numele de utilizator sau Parola sunt gresite Url SugarSoap Api !"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,bug:0
-msgid "Bugs"
-msgstr "Virusi"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Project"
-msgstr "Proiect"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,project_task:0
-msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks"
-msgstr ""
-"Bifati aceasta casuta pentru a importa Sarcini pentru Proiecte sugarCRM in "
-"sarcini OpenERP"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,opportunity:0
-msgid "Leads & Opp"
-msgstr "Piste & Oportunitati"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#, python-format
-msgid ""
-"Authentication error !\n"
-"Bad Username or Password or bad SugarSoap Api url !"
-msgstr ""
-"Eroare de autentificare !\n"
-"Numele de utilizator sau parola sunt gresite sau Url-ul SugarSoap Api este "
-"gresit !"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:79
-#: code:addons/import_sugarcrm/sugar.py:60
-#, python-format
-msgid "Error !"
-msgstr "Eroare !"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1098
-#: code:addons/import_sugarcrm/import_sugarcrm.py:1124
-#, python-format
-msgid "Warning !"
-msgstr "Avertizare !"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,instance_name:0
-msgid ""
-"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come "
-"from different server."
-msgstr ""
-"Prefix id SugarCRM pentru a diferentia intre id_xml datele modelului "
-"SugarCRM care provin de la un server diferit."
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,contact:0
-msgid "Check this box to import sugarCRM Contacts into OpenERP addresses"
-msgstr ""
-"Bifati aceasta casuta pentru a importa Contacte sugarCRM in adresele OpenERP"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,password:0
-msgid "Password"
-msgstr "Parola"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Login Information"
-msgstr "Informatii de autentificare"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,claim:0
-msgid "Check this box to import sugarCRM Cases into OpenERP claims"
-msgstr ""
-"Bifati aceasta casuta pentru a importa Cazuri sugarCRM in solicitari OpenERP"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Notification When Import is Finished"
-msgstr ""
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,username:0
-msgid "User Name"
-msgstr "Nume de utilizator"
-
-#. module: import_sugarcrm
-#: view:import.message:0
-#: model:ir.model,name:import_sugarcrm.model_import_message
-msgid "Import Message"
-msgstr "Importati Mesajul"
-
-#. module: import_sugarcrm
-#: help:import.sugarcrm,account:0
-msgid "Check this box to import sugarCRM Accounts into OpenERP partners"
-msgstr ""
-"Bifati aceasta casuta pentru a importa Conturi sugarCRM in partenerii OpenERP"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Online documentation:"
-msgstr "Documentatie online:"
-
-#. module: import_sugarcrm
-#: field:import.sugarcrm,account:0
-msgid "Accounts"
-msgstr "Conturi"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "_Cancel"
-msgstr "_Anulati"
-
-#. module: import_sugarcrm
-#: code:addons/import_sugarcrm/sugarsoap_services.py:23
-#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14
-#, python-format
-msgid "ZSI Import Error!"
-msgstr "Eroare Import ZSI!"
-
-#. module: import_sugarcrm
-#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm
-msgid "Import SugarCRM DATA"
-msgstr "Importati DATE SugarCRM"
-
-#. module: import_sugarcrm
-#: view:import.sugarcrm:0
-msgid "Email Address to Notify"
-msgstr "Adresa de e-mail pentru instiintare"
-
-#~ msgid "Email Notification When Import is finished"
-#~ msgstr "Instiintare prin e-mail atunci cand Importul este finalizat"
diff --git a/addons/import_sugarcrm/import_sugarcrm.py b/addons/import_sugarcrm/import_sugarcrm.py
deleted file mode 100644
index 440a7b2b6f6..00000000000
--- a/addons/import_sugarcrm/import_sugarcrm.py
+++ /dev/null
@@ -1,1150 +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 sugar
-from tools.translate import _
-from import_base.import_framework import *
-from import_base.mapper import *
-from datetime import datetime
-import base64
-import pprint
-pp = pprint.PrettyPrinter(indent=4)
-#copy old import here
-
-import htmllib
-
-def unescape_htmlentities(s):
-    p = htmllib.HTMLParser(None)
-    p.save_bgn()
-    p.feed(s)
-    return p.save_end()
-
-class related_ref(dbmapper):
-    def __init__(self, type):
-        self.type = type
-        
-    def __call__(self, external_val):
-        if external_val.get('parent_type') in self.type and external_val.get('parent_id'):
-            return self.parent.xml_id_exist(external_val['parent_type'], external_val['parent_id'])
-        return ''
-
-class sugar_import(import_framework):
-    URL = False   
-    TABLE_CONTACT = 'Contacts'
-    TABLE_ACCOUNT = 'Accounts'
-    TABLE_USER = 'Users'
-    TABLE_EMPLOYEE = 'Employees'
-    TABLE_RESSOURCE = "resource"
-    TABLE_OPPORTUNITY = 'Opportunities'
-    TABLE_LEAD = 'Leads'
-    TABLE_STAGE = 'crm_stage'
-    TABLE_ATTENDEE = 'calendar_attendee'
-    TABLE_CALL = 'Calls'
-    TABLE_MEETING = 'Meetings'
-    TABLE_TASK = 'Tasks'
-    TABLE_PROJECT = 'Project'
-    TABLE_PROJECT_TASK = 'ProjectTask'
-    TABLE_BUG = 'Bugs'
-    TABLE_CASE = 'Cases'
-    TABLE_NOTE = 'Notes'
-    TABLE_EMAIL = 'Emails'
-    TABLE_COMPAIGN = 'Campaigns'
-    TABLE_DOCUMENT = 'Documents'
-    TABLE_HISTORY_ATTACHMNET = 'history_attachment'
-    
-    MAX_RESULT_PER_PAGE = 200
-    
-    def initialize(self):
-        #login
-        PortType,sessionid = sugar.login(self.context.get('username',''), self.context.get('password',''), self.context.get('url',''))
-        if sessionid == '-1':
-            raise osv.except_osv(_('Error!'), _('Authentication error!\nBad username or password or bad SugarSoap Api url!'))
-        self.context['port'] = PortType
-        self.context['session_id'] = sessionid
-        
-    def get_data(self, table):
-        offset = 0
-        res = []
-        while True:
-            r = sugar.search(self.context.get('port'), self.context.get('session_id'), table, offset, self.MAX_RESULT_PER_PAGE)
-            res.extend(r)
-            if len(r) < self.MAX_RESULT_PER_PAGE:
-                break;
-            offset += self.MAX_RESULT_PER_PAGE
-        return res
-    
-    #def get_link(self, from_table, ids, to_table):
-        #return sugar.relation_search(self.context.get('port'), self.context.get('session_id'), from_table, module_id=ids, related_module=to_table)
-
-    """
-    Common import method
-    """
-    def get_category(self, val, model, name):
-        fields = ['name', 'object_id']
-        data = [name, model]
-        return self.import_object(fields, data, 'crm.case.categ', 'crm_categ', name, [('object_id.model','=',model), ('name', 'ilike', name)])
-
-    def get_job_title(self, dict, salutation):
-        fields = ['shortcut', 'name', 'domain']
-        if salutation:
-            data = [salutation, salutation, 'Contact']
-            return self.import_object(fields, data, 'res.partner.title', 'contact_title', salutation, [('shortcut', '=', salutation)])
-
-    def get_channel_id(self, dict, val):
-        if not val:
-            return False
-        fields = ['name']
-        data = [val]
-        return self.import_object(fields, data, 'crm.case.channel', 'crm_channel', val)
-    
-    def get_all_states(self, external_val, country_id):
-        """Get states or create new state unless country_id is False"""
-        state_code = external_val[0:3] #take the tree first char
-        fields = ['country_id/id', 'name', 'code']
-        data = [country_id, external_val, state_code]
-        if country_id:
-            return self.import_object(fields, data, 'res.country.state', 'country_state', external_val) 
-        return False
-
-    def get_all_countries(self, val):
-        """Get Country, if no country match do not create anything, to avoid duplicate country code"""
-        return self.mapped_id_if_exist('res.country', [('name', 'ilike', val)], 'country', val)
-    
-    def get_float_time(self, dict, hour, min):
-        min = int(min) * 100 / 60
-        return "%s.%i" % (hour, min)
-    
-    """
-    import Documents
-    """
-    
-    def import_related_document(self, val):
-        res_model = False
-        res_id = False
-        sugar_document_account = sugar.relation_search(self.context.get('port'), self.context.get('session_id'), 'Documents', module_id=val.get('id'), related_module='Accounts', query=None, deleted=None)
-        sugar_document_contact = sugar.relation_search(self.context.get('port'), self.context.get('session_id'), 'Documents', module_id=val.get('id'), related_module=self.TABLE_CONTACT, query=None, deleted=None)
-        sugar_document_opportunity = sugar.relation_search(self.context.get('port'), self.context.get('session_id'), 'Documents', module_id=val.get('id'), related_module=self.TABLE_OPPORTUNITY, query=None, deleted=None)
-        sugar_document_case = sugar.relation_search(self.context.get('port'), self.context.get('session_id'), 'Documents', module_id=val.get('id'), related_module=self.TABLE_CASE, query=None, deleted=None)
-        sugar_document_bug = sugar.relation_search(self.context.get('port'), self.context.get('session_id'), 'Documents', module_id=val.get('id'), related_module=self.TABLE_BUG, query=None, deleted=None)
-        if sugar_document_account:
-            res_id = self.get_mapped_id(self.TABLE_ACCOUNT,sugar_document_account[0])
-            res_model = 'res.partner'
-        elif sugar_document_contact:
-            res_id = self.get_mapped_id(self.TABLE_CONTACT, sugar_document_contact[0])
-            res_model = 'res.partner'
-        elif sugar_document_opportunity:
-            res_id = self.get_mapped_id(self.TABLE_OPPORTUNITY, sugar_document_opportunity[0])
-            res_model = 'crm.lead'
-        elif sugar_document_case:
-            res_id = self.get_mapped_id(self.TABLE_CASE, sugar_document_case[0])
-            res_model = 'crm.claim'
-        elif sugar_document_bug:
-            res_id = self.get_mapped_id(self.TABLE_BUG, sugar_document_bug[0])
-            res_model = 'project.issue'
-        return res_id,res_model
-    
-    def import_document(self, val):
-        File,Filename = sugar.get_document_revision_search(self.context.get('port'), self.context.get('session_id'), val.get('document_revision_id'))
-        #File = base64.encodestring(File)
-        res_id, res_model  = self.import_related_document(val)
-        val['res_id'] = res_id
-        val['res_model'] = res_model
-        if File:
-            val['datas'] = File
-            val['datas_fname'] = Filename
-        return val   
-        
-    def get_document_mapping(self): 
-        return { 
-                'model' : 'ir.attachment',
-                'dependencies' : [self.TABLE_USER],
-                'hook' : self.import_document,
-                'map' : {
-                         'name':'document_name',
-                         'description': ppconcat('description'),
-                         'datas': 'datas',
-                         'datas_fname': 'datas_fname',
-                         'res_model': 'res_model',
-                         'res_id': 'res_id',
-                }
-            }     
-        
-    
-    """
-    import Emails
-    """
-
-      
-    def import_email(self, val):
-        vals = sugar.email_search(self.context.get('port'), self.context.get('session_id'), self.TABLE_EMAIL, val.get('id'))
-        model_obj =  self.obj.pool.get('ir.model.data')
-        for val in vals:
-            xml_id = self.xml_id_exist(val.get('parent_type'), val.get('parent_id'))
-            model_ids = model_obj.search(self.cr, self.uid, [('name', 'like', xml_id)])
-            if model_ids:
-                model = model_obj.browse(self.cr, self.uid, model_ids)[0]
-                if model.model == 'res.partner':
-                    val['partner_id/.id'] = model.res_id
-                else:    
-                    val['res_id'] = model.res_id
-                    val['model'] = model.model
-        return val   
-        
-    def get_email_mapping(self): 
-        return { 
-                'model' : 'mail.message',
-                'dependencies' : [self.TABLE_USER, self.TABLE_ACCOUNT, self.TABLE_CONTACT, self.TABLE_LEAD, self.TABLE_OPPORTUNITY, self.TABLE_MEETING, self.TABLE_CALL],
-                'hook' : self.import_email,
-                'map' : {
-                        'subject':'name',
-                        'state' : const('received'),
-                        'date':'date_sent',
-                        'email_from': 'from_addr_name',
-                        'email_to': 'to_addrs_names',
-                        'email_cc': 'cc_addrs_names',
-                        'email_bcc': 'bcc_addrs_names',
-                        'message_id': 'message_id',
-                        'res_id': 'res_id',
-                        'model': 'model',
-                        'partner_id/.id': 'partner_id/.id',                         
-                        'user_id/id': ref(self.TABLE_USER, 'assigned_user_id'),
-                        'body_text': 'description',
-                        'body_html' : 'description_html',
-                        
-                }
-            } 
-    
-    """
-    import History(Notes)
-    """
-    
-
-    def import_history(self, val):
-        model_obj =  self.obj.pool.get('ir.model.data')
-        xml_id = self.xml_id_exist(val.get('parent_type'), val.get('parent_id'))
-        model_ids = model_obj.search(self.cr, self.uid, [('name', 'like', xml_id)])
-        if model_ids:
-            model = model_obj.browse(self.cr, self.uid, model_ids)[0]
-            if model.model == 'res.partner':
-                val['partner_id/.id'] = model.res_id
-            val['res_id'] = model.res_id
-            val['model'] = model.model
-        File, Filename = sugar.attachment_search(self.context.get('port'), self.context.get('session_id'), self.TABLE_NOTE, val.get('id')) 
-        if File:
-            val['datas'] = File
-            val['datas_fname'] = Filename
-        return val    
-    
-    def get_history_mapping(self): 
-        return { 
-                'model' : 'ir.attachment',
-                'dependencies' : [self.TABLE_USER, self.TABLE_ACCOUNT, self.TABLE_CONTACT, self.TABLE_LEAD, self.TABLE_OPPORTUNITY, self.TABLE_MEETING, self.TABLE_CALL, self.TABLE_EMAIL],
-                'hook' : self.import_history,
-                'map' : {
-                      'name':'name',
-                      'user_id/id': ref(self.TABLE_USER, 'created_by'),
-                      'description': ppconcat('description', 'description_html'),
-                      'res_id': 'res_id',
-                      'res_model': 'model',
-                      'partner_id/.id' : 'partner_id/.id',
-                      'datas' : 'datas',
-                      'datas_fname' : 'datas_fname'
-                }
-            }     
-    
-    """
-    import Claims(Cases)
-    """
-    def get_claim_priority(self, val):
-        priority_dict = {            
-                'P1': '2',
-                'P2': '3',
-                'P3': '4'
-        }
-        return priority_dict.get(val.get('priority'), '')
-        
-    def get_contact_info_from_account(self, val):
-        partner_id = self.get_mapped_id(self.TABLE_ACCOUNT, val.get('account_id'))
-        partner_address_id = False
-        partner_phone = False
-        partner_email = False
-        partner = self.obj.pool.get('res.partner').browse(self.cr, self.uid, [partner_id])[0]
-        if partner.address and partner.address[0]:
-            address = partner.address[0]
-            partner_address_id = address.id
-            partner_phone = address.phone
-            partner_email = address.email
-        return partner_address_id, partner_phone,partner_email
-    
-    def import_crm_claim(self, val):
-        partner_address_id, partner_phone,partner_email =  self.get_contact_info_from_account(val)
-        val['partner_address_id/.id'] = partner_address_id
-        val['partner_phone'] = partner_phone
-        val['email_from'] = partner_email
-        return val
-    
-    def get_crm_claim_mapping(self): 
-        return { 
-                'model' : 'crm.claim',
-                'dependencies' : [self.TABLE_USER, self.TABLE_ACCOUNT, self.TABLE_CONTACT, self.TABLE_LEAD],
-                'hook' : self.import_crm_claim,
-                'map' : {
-                    'name': concat('case_number','name', delimiter='-'),
-                    'date': 'date_entered',
-                    'user_id/id': ref(self.TABLE_USER, 'assigned_user_id'),
-                    'description': ppconcat('description', 'resolution', 'work_log'),
-                    'partner_id/id': ref(self.TABLE_ACCOUNT, 'account_id'),
-                    'partner_address_id/.id': 'partner_address_id/.id',
-                    'categ_id/id': call(self.get_category, 'crm.claim', value('type')),
-                    'partner_phone': 'partner_phone',
-                    'email_from': 'email_from',                                        
-                    'priority': self.get_claim_priority,
-                    'state': map_val('status', self.project_issue_state)
-                }
-            }    
-    """
-    Import Project Issue(Bugs)
-    """
-    project_issue_state = {
-            'New' : 'draft',
-            'Assigned':'open',
-            'Closed': 'done',
-            'Pending': 'pending',
-            'Rejected': 'cancel',
-    }
-     
-    def get_project_issue_priority(self, val):
-        priority_dict = {
-                'Urgent': '1',
-                'High': '2',
-                'Medium': '3',
-                'Low': '4'
-         }
-        return priority_dict.get(val.get('priority'), '')     
-      
-    def get_bug_project_id(self, dict, val):
-        fields = ['name']
-        data = [val]
-        return self.import_object(fields, data, 'project.project', 'project_issue', val)    
-    
-    def get_project_issue_mapping(self):
-        return { 
-                'model' : 'project.issue',
-                'dependencies' : [self.TABLE_USER],
-                'map' : {
-                    'name': concat('bug_number', 'name', delimiter='-'),
-                    'project_id/id': call(self.get_bug_project_id, 'sugarcrm_bugs'),
-                    'categ_id/id': call(self.get_category, 'project.issue', value('type')),
-                    'description': ppconcat('description', 'source', 'resolution', 'work_log', 'found_in_release', 'release_name', 'fixed_in_release_name', 'fixed_in_release'),
-                    'priority': self.get_project_issue_priority,
-                    'state': map_val('status', self.project_issue_state),
-                    'assigned_to/id' : ref(self.TABLE_USER, 'assigned_user_id'),
-                }
-            }
-    
-    """
-    import Project Tasks
-    """
-    project_task_state = {
-            'Not Started': 'draft',
-            'In Progress': 'open',
-            'Completed': 'done',
-            'Pending Input': 'pending',
-            'Deferred': 'cancelled',
-     }
-    
-    def get_project_task_priority(self, val):
-        priority_dict = {
-            'High': '0',
-            'Medium': '2',
-            'Low': '3'
-        }
-        return priority_dict.get(val.get('priority'), '')
-    
-    def get_project_task_mapping(self):
-        return { 
-                'model' : 'project.task',
-                'dependencies' : [self.TABLE_USER, self.TABLE_PROJECT],
-                'map' : {
-                    'name': 'name',
-                    'date_start': 'date_start',
-                    'date_end': 'date_finish',
-                    'project_id/id': ref(self.TABLE_PROJECT, 'project_id'),
-                    'planned_hours': 'estimated_effort',
-                    'priority': self.get_project_task_priority,
-                    'description': ppconcat('description','milestone_flag', 'project_task_id', 'task_number', 'percent_complete'),
-                    'user_id/id': ref(self.TABLE_USER, 'assigned_user_id'),
-                    'partner_id/id': 'partner_id/id',
-                    'contact_id/id': 'contact_id/id',
-                    'state': map_val('status', self.project_task_state)
-                }
-            }
-
-    """
-    import Projects
-    """
-    project_state = {
-            'Draft' : 'draft',
-            'In Review': 'open',
-            'Published': 'close'
-     }
-    
-    def import_project_account(self, val):
-        partner_id = False
-        partner_invoice_id = False        
-        sugar_project_account = sugar.relation_search(self.context.get('port'), self.context.get('session_id'), 'Project', module_id=val.get('id'), related_module=self.TABLE_ACCOUNT, query=None, deleted=None)
-        sugar_project_contact = sugar.relation_search(self.context.get('port'), self.context.get('session_id'), 'Project', module_id=val.get('id'), related_module=self.TABLE_CONTACT, query=None, deleted=None)
-        for contact_id in sugar_project_contact:
-            partner_invoice_id = self.get_mapped_id(self.TABLE_CONTACT, contact_id)
-        for account_id in sugar_project_account:
-            partner_id = self.get_mapped_id(self.TABLE_ACCOUNT, account_id)
-        return partner_id, partner_invoice_id      
-           
-    def import_project(self, val):
-        partner_id, partner_invoice_id  = self.import_project_account(val)    
-        val['partner_id/.id'] = partner_id
-        val['contact_id/.id'] = partner_invoice_id
-        return val
-    
-    def get_project_mapping(self):
-        return { 
-                'model' : 'project.project',
-                'dependencies' : [self.TABLE_CONTACT, self.TABLE_ACCOUNT, self.TABLE_USER],
-                'hook' : self.import_project,
-                'map' : {
-                    'name': 'name',
-                    'date_start': 'estimated_start_date',
-                    'date': 'estimated_end_date',
-                    'user_id/id': ref(self.TABLE_USER, 'assigned_user_id'),
-                    'partner_id/.id': 'partner_id/.id',
-                    'contact_id/.id': 'contact_id/.id',
-                    'state': map_val('status', self.project_state)
-                }
-            }
-    
-    """
-    import Tasks
-    """
-    task_state = {
-            'Completed' : 'done',
-            'Not Started':'draft',
-            'In Progress': 'open',
-            'Pending Input': 'draft',
-            'deferred': 'cancel'
-        }
-
-    def import_task(self, val):
-        date =  val.get('date_start') or datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
-        val['date'] = ''.join(date)
-        date_deadline = val.get('date_due') or datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
-        val['date_deadline'] = ''.join(date_deadline)
-        return val
-
-    def get_task_mapping(self):
-        return { 
-                'model' : 'crm.meeting',
-                'dependencies' : [self.TABLE_CONTACT, self.TABLE_ACCOUNT, self.TABLE_USER],
-                'hook' : self.import_task,
-                'map' : {
-                    'name': 'name',
-                    'date': 'date',
-                    'date_deadline': 'date_deadline',
-                    'user_id/id': ref(self.TABLE_USER, 'assigned_user_id'),
-                    'categ_id/id': call(self.get_category, 'crm.meeting', const('Tasks')),
-                    'partner_id/id': related_ref(self.TABLE_ACCOUNT),
-                    'partner_address_id/id': ref(self.TABLE_CONTACT,'contact_id'),
-                    'state': map_val('status', self.task_state)
-                }
-            }
-       
-    """
-    import Calls
-    """  
-    #TODO adapt with project trunk-crm-imp   
-    call_state = {   
-            'Planned' : 'open',
-            'Held':'done',
-            'Not Held': 'pending',
-        }
-
-    def get_calls_mapping(self):
-        return { 
-                'model' : 'crm.phonecall',
-                'dependencies' : [self.TABLE_ACCOUNT, self.TABLE_CONTACT, self.TABLE_OPPORTUNITY, self.TABLE_LEAD],
-                'map' : {
-                    'name': 'name',
-                    'date': 'date_start',
-                    'duration': call(self.get_float_time, value('duration_hours'), value('duration_minutes')),
-                    'user_id/id':  ref(self.TABLE_USER, 'assigned_user_id'),
-                    'partner_id/id': related_ref(self.TABLE_ACCOUNT),
-                    'partner_address_id/id': related_ref(self.TABLE_CONTACT),
-                    'categ_id/id': call(self.get_category, 'crm.phonecall', value('direction')),
-                    'opportunity_id/id': related_ref(self.TABLE_OPPORTUNITY),
-                    'description': ppconcat('description'),   
-                    'state': map_val('status', self.call_state)                      
-                }
-            }       
-         
-    """
-        import meeting
-    """
-    meeting_state = {
-            'Planned' : 'draft',
-            'Held': 'open',
-            'Not Held': 'draft', 
-        }
-#TODO    
-    def get_attendee_id(self, cr, uid, module_name, module_id):
-        contact_id = False
-        user_id = False
-        attendee_id= []
-        attendee_dict = sugar.user_get_attendee_list(self.context.get('port'), self.context.get('session_id'), module_name, module_id)
-        for attendee in attendee_dict:
-            user_id = self.xml_id_exist(self.TABLE_USER, attendee.get('id', False))
-            contact_id = False
-            if not user_id:
-                contact_id = self.xml_id_exist(self.TABLE_CONTACT, attendee.get('id', False))
-            fields = ['user_id/id', 'email', 'partner_address_id/id']
-            data = [user_id, attendee.get('email1'), contact_id]
-            attendee_xml_id = self.import_object(fields, data, 'calendar.attendee', self.TABLE_ATTENDEE, user_id or contact_id or attendee.get('email1'), ['|',('user_id', '=', attendee.get('id')),('partner_address_id','=',attendee.get('id')),('email', '=', attendee.get('email1'))])
-            attendee_id.append(attendee_xml_id)
-        return ','.join(attendee_id) 
-    
-    def get_alarm_id(self, dict_val, val):
-        alarm_dict = {
-            '60': '1 minute before',
-            '300': '5 minutes before',
-            '600': '10 minutes before',
-            '900': '15 minutes before',
-            '1800':'30 minutes before',
-            '3600': '1 hour before',
-        }
-        return self.mapped_id_if_exist('res.alarm', [('name', 'like', alarm_dict.get(val))], 'alarm', val)
-    
-    #TODO attendees
-
-    def import_meeting(self, val):
-        attendee_id = self.get_attendee_id(self.cr, self.uid, 'Meetings', val.get('id')) #TODO
-        val['attendee_ids/id'] = attendee_id
-        return val
-
-    def get_meeting_mapping(self):
-        return { 
-                'model' : 'crm.meeting',
-                'dependencies' : [self.TABLE_CONTACT, self.TABLE_OPPORTUNITY, self.TABLE_LEAD, self.TABLE_TASK],
-                'hook': self.import_meeting,
-                'map' : {
-                    'name': 'name',
-                    'date': 'date_start',
-                    'duration': call(self.get_float_time, value('duration_hours'), value('duration_minutes')),
-                    'location': 'location',
-                    'attendee_ids/id':'attendee_ids/id',
-                    'alarm_id/id': call(self.get_alarm_id, value('reminder_time')),
-                    'user_id/id': ref(self.TABLE_USER, 'assigned_user_id'),
-                    'partner_id/id': related_ref(self.TABLE_ACCOUNT),
-                    'partner_address_id/id': related_ref(self.TABLE_CONTACT),
-                    'state': map_val('status', self.meeting_state)
-                }
-            }
-    
-    """
-        import Opportunity
-    """
-    opp_state = {
-            'Need Analysis' : 'New',
-            'Closed Lost': 'Lost',
-            'Closed Won': 'Won', 
-            'Value Proposition': 'Proposition',
-            'Negotiation/Review': 'Negotiation'
-        }
-        
-    def get_opportunity_status(self, sugar_val):
-        fields = ['name', 'case_default']
-        name = 'Opportunity_' + sugar_val['sales_stage']
-        data = [sugar_val['sales_stage'], '1']
-        return self.import_object(fields, data, 'crm.case.stage', self.TABLE_STAGE, name, [('name', 'ilike', sugar_val['sales_stage'])])
-    
-    def import_opportunity_contact(self, val):
-        sugar_opportunities_contact = set(sugar.relation_search(self.context.get('port'), self.context.get('session_id'), 'Opportunities', module_id=val.get('id'), related_module='Contacts', query=None, deleted=None))
-            
-        partner_contact_id = False 
-        partner_contact_email = False       
-        partner_address_obj = self.obj.pool.get('res.partner')
-        partner_xml_id = self.name_exist(self.TABLE_ACCOUNT, val['account_name'], 'res.partner')
-        
-        for contact in sugar_opportunities_contact:
-            address_id = self.get_mapped_id(self.TABLE_CONTACT, contact)
-            if address_id:                    
-                address = partner_address_obj.browse(self.cr, self.uid, address_id)
-                partner_name = address.partner_id and address.partner_id.name or False
-                if not partner_name: #link with partner id 
-                    fields = ['partner_id/id']
-                    data = [partner_xml_id]
-                    self.import_object(fields, data, 'res.partner', self.TABLE_CONTACT, contact, self.DO_NOT_FIND_DOMAIN)
-                if not partner_name or partner_name == val.get('account_name'):
-                    partner_contact_id = self.xml_id_exist(self.TABLE_CONTACT, contact)
-                    partner_contact_email = address.email
-        return partner_contact_id, partner_contact_email
-
-    def import_opp(self, val):    
-        partner_contact_id, partner_contact_email = self.import_opportunity_contact(val)
-        val['partner_address_id/id'] = partner_contact_id
-        val['email_from'] = partner_contact_email
-        return val
-    
-    def get_opp_mapping(self):
-        return {
-            'model' : 'crm.lead',
-            'dependencies' : [self.TABLE_USER, self.TABLE_ACCOUNT, self.TABLE_CONTACT,self.TABLE_COMPAIGN],
-            'hook' : self.import_opp,
-            'map' :  {
-                'name': 'name',
-                'probability': 'probability',
-                'partner_id/id': refbyname(self.TABLE_ACCOUNT, 'account_name', 'res.partner'),
-                'title_action': 'next_step',
-                'partner_address_id/id': 'partner_address_id/id',
-                'planned_revenue': 'amount',
-                'date_deadline': 'date_closed',
-                'user_id/id' : ref(self.TABLE_USER, 'assigned_user_id'),
-                'stage_id/id' : self.get_opportunity_status,
-                'type' : const('opportunity'),
-                'categ_id/id': call(self.get_category, 'crm.lead', value('opportunity_type')),
-                'email_from': 'email_from',
-                'state': map_val('status', self.opp_state),
-                'description' : 'description',
-            }
-        }
-        
-    """
-    import campaign
-    """
-    
-    def get_compaign_mapping(self):
-        return {
-            'model' : 'crm.case.resource.type',
-            'map' : {
-                'name': 'name',
-                } 
-        }    
-        
-    """
-        import lead
-    """
-    def get_lead_status(self, sugar_val):
-        fields = ['name', 'case_default']
-        name = 'lead_' + sugar_val.get('status', '')
-        data = [sugar_val.get('status', ''), '1']
-        return self.import_object(fields, data, 'crm.case.stage', self.TABLE_STAGE, name, [('name', 'ilike', sugar_val.get('status', ''))])
-    
-    lead_state = {
-        'New' : 'draft',
-        'Assigned':'open',
-        'In Progress': 'open',
-        'Recycled': 'cancel',
-        'Dead': 'done',
-        'Converted': 'done',
-    }
-    
-    def import_lead(self, val):
-        if val.get('opportunity_id'): #if lead is converted into opp, don't import as lead
-            return False
-        if val.get('primary_address_country'):
-            country_id = self.get_all_countries(val.get('primary_address_country'))
-            val['country_id/id'] =  country_id
-            val['state_id/id'] =  self.get_all_states(val.get('primary_address_state'), country_id)
-        return val
-    
-    def get_lead_mapping(self):
-        return {
-            'model' : 'crm.lead',
-            'dependencies' : [self.TABLE_COMPAIGN, self.TABLE_USER],
-            'hook' : self.import_lead,
-            'map' : {
-                'name': concat('first_name', 'last_name'),
-                'contact_name': concat('first_name', 'last_name'),
-                'description': ppconcat('description', 'refered_by', 'lead_source', 'lead_source_description', 'website', 'email2', 'status_description', 'lead_source_description', 'do_not_call'),
-                'partner_name': 'account_name',
-                'email_from': 'email1',
-                'phone': 'phone_work',
-                'mobile': 'phone_mobile',
-                'title/id': call(self.get_job_title, value('salutation')),
-                'function':'title',
-                'street': 'primary_address_street',
-                'street2': 'alt_address_street',
-                'zip': 'primary_address_postalcode',
-                'city':'primary_address_city',
-                'user_id/id' : ref(self.TABLE_USER, 'assigned_user_id'),
-                'stage_id/id' : self.get_lead_status,
-                'type' : const('lead'),
-                'state': map_val('status', self.lead_state) ,
-                'fax': 'phone_fax',
-                'referred': 'refered_by',
-                'opt_out': 'do_not_call',
-                'channel_id/id': call(self.get_channel_id, value('lead_source')),
-                'type_id/id': ref(self.TABLE_COMPAIGN, 'campaign_id'),
-                'country_id/id': 'country_id/id',
-                'state_id/id': 'state_id/id',
-                } 
-        }
-    
-    """
-        import contact
-    """
-    
-    def get_email(self, val):
-        email_address = sugar.get_contact_by_email(self.context.get('port'), self.context.get('username'), self.context.get('password'), val.get('email1'))
-        if email_address:
-            return ','.join(email_address)     
-    
-    def import_contact(self, val):
-        if val.get('primary_address_country'):
-            country_id = self.get_all_countries(val.get('primary_address_country'))
-            state = self.get_all_states(val.get('primary_address_state'), country_id)
-            val['country_id/id'] =  country_id
-            val['state_id/id'] =  state
-        return val    
-        
-    def get_contact_mapping(self):
-        return { 
-            'model' : 'res.partner',
-            #'dependencies' : [self.TABLE_ACCOUNT],
-            'hook' : self.import_contact,
-            'map' :  {
-                'name': concat('first_name', 'last_name'),
-                'parent_id/id': ref(self.TABLE_ACCOUNT,'account_id'),
-                'phone': 'phone_work',
-                'mobile': 'phone_mobile',
-                'fax': 'phone_fax',
-                'function': 'title',
-                'street': 'primary_address_street',
-                'zip': 'primary_address_postalcode',
-                'city': 'primary_address_city',
-                'country_id/id': 'country_id/id',
-                'state_id/id': 'state_id/id',
-                'email': self.get_email,
-                'type': const('contact')
-            }
-        }
-    
-    """ 
-        import Account
-    """
-    
-    def get_address_type(self, val, type):
-        if type == 'invoice':
-            type_address = 'billing'
-        else:
-            type_address = 'shipping' 
-            
-        if type == 'default':
-            map_partner_address = {
-                'name': 'name',
-                'type': const('default'),
-                'email': 'email1' 
-            }
-        else:        
-            map_partner_address = {
-                'name': 'name',
-                'phone': 'phone_office',
-                'mobile': 'phone_mobile',
-                'fax': 'phone_fax',
-                'type': 'type',
-                'street': type_address + '_address_street',
-                'zip': type_address +'_address_postalcode',
-                'city': type_address +'_address_city',
-                 'country_id/id': 'country_id/id',
-                 'type': 'type',
-                }
-            
-        if val.get(type_address +'_address_country'):
-            country_id = self.get_all_countries(val.get(type_address +'_address_country'))
-            state = self.get_all_states(val.get(type_address +'_address_state'), country_id)
-            val['country_id/id'] =  country_id
-            val['state_id/id'] =  state
-            
-        val['type'] = type
-        val['id_new'] = val['id'] + '_address_' + type
-        return self.import_object_mapping(map_partner_address, val, 'res.partner', self.TABLE_CONTACT, val['id_new'], self.DO_NOT_FIND_DOMAIN) 
-        
-    def get_partner_address(self, val):
-        address_id=[]
-        type_dict = {'billing_address_street' : 'invoice', 'shipping_address_street' : 'delivery', 'type': 'default'}
-        for key, type_value in type_dict.items():
-            if val.get(key):
-                id = self.get_address_type(val, type_value)
-                address_id.append(id)
-          
-        return ','.join(address_id)
-    
-    def get_partner_mapping(self):
-        return {
-                'model' : 'res.partner',
-                'dependencies' : [self.TABLE_USER],
-                'map' : {
-                    'name': 'name',
-                    'website': 'website',
-                    'user_id/id': ref(self.TABLE_USER,'assigned_user_id'),
-                    'ref': 'sic_code',
-                    'comment': ppconcat('description', 'employees', 'ownership', 'annual_revenue', 'rating', 'industry', 'ticker_symbol'),
-                    'customer': const('1'),
-                    'supplier': const('0'),
-                    'address/id':'address/id', 
-                    'parent_id/id_parent' : 'parent_id',
-                    'address/id' : self.get_partner_address,
-                }
-        }
-
-    """
-        import Employee
-    """
-    def get_ressource(self, val):
-        map_resource = { 
-            'name': concat('first_name', 'last_name'),
-        }        
-        return self.import_object_mapping(map_resource, val, 'resource.resource', self.TABLE_RESSOURCE, val['id'], self.DO_NOT_FIND_DOMAIN)
-    
-    def get_job_id(self, val):
-        fields = ['name']
-        data = [val.get('title')]
-        return self.import_object(fields, data, 'hr.job', 'hr_job', val.get('title'))
-
-    def get_user_address(self, val):
-        map_user_address = {
-            'name': concat('first_name', 'last_name'),
-            'city': 'address_city',
-            'country_id/id': 'country_id/id',
-            'state_id/id': 'state_id/id',
-            'street': 'address_street',
-            'zip': 'address_postalcode',
-            'fax': 'phone_fax',
-            'phone': 'phone_work',
-            'mobile':'phone_mobile',
-            'email': 'email1'
-        }
-        
-        if val.get('address_country'):
-            country_id = self.get_all_countries(val.get('address_country'))
-            state_id = self.get_all_states(val.get('address_state'), country_id)
-            val['country_id/id'] =  country_id
-            val['state_id/id'] =  state_id
-            
-        return self.import_object_mapping(map_user_address, val, 'res.partner', self.TABLE_CONTACT, val['id'], self.DO_NOT_FIND_DOMAIN)
-
-    def get_employee_mapping(self):
-        return {
-            'model' : 'hr.employee',
-            'dependencies' : [self.TABLE_USER],
-            'map' : {
-                'resource_id/id': self.get_ressource, 
-                'name': concat('first_name', 'last_name'),
-                'work_phone': 'phone_work',
-                'mobile_phone':  'phone_mobile',
-                'user_id/id': ref(self.TABLE_USER, 'id'), 
-                'address_home_id/id': self.get_user_address,
-                'notes': ppconcat('messenger_type', 'messenger_id', 'description'),
-                'job_id/id': self.get_job_id,
-                'work_email' : 'email1',
-                'coach_id/id_parent' : 'reports_to_id',
-            }
-     }
-    
-    """
-        import user
-    """  
-    def import_user(self, val):
-        user_obj = self.obj.pool.get('res.users')
-        user_ids = user_obj.search(self.cr, self.uid, [('login', '=', val.get('user_name'))])
-        if user_ids: 
-            val['.id'] = str(user_ids[0])
-        else:
-            val['password'] = 'sugarcrm' #default password for all user #TODO needed in documentation
-            
-        val['lang'] = self.context.get('lang','en_US')
-        return val
-    
-    def get_users_department(self, val):
-        dep = val.get('department')
-        fields = ['name']
-        data = [dep]
-        if not dep:
-            return False
-        return self.import_object(fields, data, 'hr.department', 'hr_department_user', dep)
-
-    def get_user_mapping(self):
-        return {
-            'model' : 'res.users',
-            'hook' : self.import_user,
-            'map' : { 
-                'name': concat('first_name', 'last_name'),
-                'login': value('user_name', fallback='last_name'),
-                'lang' : 'context_lang',
-                'password' : 'password',
-                '.id' : '.id',
-                'email' : 'email1',
-            }
-        }
-
-
-    def get_mapping(self):
-        return {
-            self.TABLE_USER : self.get_user_mapping(),
-            self.TABLE_EMPLOYEE : self.get_employee_mapping(),
-            self.TABLE_ACCOUNT : self.get_partner_mapping(),
-            self.TABLE_CONTACT : self.get_contact_mapping(),
-            self.TABLE_LEAD : self.get_lead_mapping(),
-            self.TABLE_OPPORTUNITY : self.get_opp_mapping(),
-            self.TABLE_MEETING : self.get_meeting_mapping(),
-            self.TABLE_CALL : self.get_calls_mapping(),
-            self.TABLE_TASK : self.get_task_mapping(),
-            self.TABLE_PROJECT : self.get_project_mapping(),
-            self.TABLE_PROJECT_TASK: self.get_project_task_mapping(),
-            self.TABLE_BUG: self.get_project_issue_mapping(),
-            self.TABLE_CASE: self.get_crm_claim_mapping(),
-            self.TABLE_NOTE: self.get_history_mapping(),
-            self.TABLE_EMAIL: self.get_email_mapping(),
-            self.TABLE_DOCUMENT: self.get_document_mapping(),
-            self.TABLE_COMPAIGN: self.get_compaign_mapping()
-        }
-        
-    """
-        Email notification
-    """   
-    def get_email_subject(self, result, error=False):
-        if error:
-            return "Sugarcrm data import failed at %s due to an unexpected error." % self.date_ended
-        return "your sugarcrm data were successfully imported at %s." % self.date_ended 
-    
-    def get_body_header(self, result):
-        return "Sugarcrm import : report of last import" 
-
-
-class import_sugarcrm(osv.osv):
-    """Import SugarCRM DATA"""
-    
-    _name = "import.sugarcrm"
-    _description = __doc__
-    _columns = {
-        'username': fields.char('User Name', size=64, required=True),
-        'password': fields.char('Password', size=24,required=True),
-        'url' : fields.char('SugarSoap Api url:', size=264, required=True, help="Webservice's url where to get the data.\
-                      example : 'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm application http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index"),
-        'user' : fields.boolean('User', help="Check this box to import sugarCRM Users into OpenERP users, warning if a user with the same login exist in OpenERP, user information will be erase by sugarCRM user information", readonly=True),
-        'opportunity': fields.boolean('Leads & Opp', help="Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads and Opportunities"),
-        'contact': fields.boolean('Contacts', help="Check this box to import sugarCRM Contacts into OpenERP addresses"),
-        'account': fields.boolean('Partner/Account', help="Check this box to import sugarCRM Accounts into OpenERP partners"),
-        'employee': fields.boolean('Employee', help="Check this box to import sugarCRM Employees into OpenERP employees"),
-        'meeting': fields.boolean('Meetings', help="Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings"),
-        'call': fields.boolean('Calls', help="Check this box to import sugarCRM Calls into OpenERP calls"),
-        'claim': fields.boolean('Cases', help="Check this box to import sugarCRM Cases into OpenERP claims"),
-        'email_history': fields.boolean('Email and Note',help="Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP Messages and Attachments"),
-        'project': fields.boolean('Projects', help="Check this box to import sugarCRM Projects into OpenERP projects"),
-        'project_task': fields.boolean('Project Tasks', help="Check this box to import sugarCRM Project Tasks into OpenERP tasks"),
-        'bug': fields.boolean('Bugs', help="Check this box to import sugarCRM Bugs into OpenERP project issues"),
-        'document': fields.boolean('Documents', help="Check this box to import sugarCRM Documents into OpenERP documents"),
-        'email_from': fields.char('Notify End Of Import To:', size=128),
-        'instance_name': fields.char("Instance's Name", size=64, help="Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come from different server."),
-    }
-    
-    def _get_email_id(self, cr, uid, context=None):
-        return self.pool.get('res.users').browse(cr, uid, uid, context=context).email
-    
-    def _module_installed(self, cr, uid, model, context=None):
-        module_id = self.pool.get('ir.module.module').search(cr, uid, [('name', '=', model), ('state', "=", "installed")], context=context)
-        return bool(module_id)
-                
-    def _project_installed(self, cr, uid, context=None):
-        return self._module_installed(cr,uid,'project',context=context)
-                        
-    def _crm_claim_installed(self, cr, uid, context=None):
-        return self._module_installed(cr,uid,'crm_claim',context=context)
-                    
-    def _project_issue_installed(self, cr, uid, context=None):
-        return self._module_installed(cr,uid,'project_issue',context=context)
-    
-    def _hr_installed(self, cr, uid, context=None):
-        return self._module_installed(cr,uid,'hr',context=context)
-    
-    _defaults = {#to be set to true, but easier for debugging
-       'user' : True,
-       'opportunity': True,
-       'contact' : True,
-       'account' : True,
-        'employee' : _hr_installed,
-        'meeting' : True,
-        'call' : True,
-        'claim' : _crm_claim_installed,    
-        'email_history' : True, 
-        'project' : _project_installed,   
-        'project_task': _project_installed,     
-        'bug': _project_issue_installed,
-        'document': True,
-        'instance_name': 'sugarcrm',
-        'email_from': _get_email_id,
-        'username' : 'admin',
-        'password' : '',
-        'url':  "http://sugarcrm.example.com/soap.php"
-    }
-    
-    def check_url(self, url, context):
-        if not context:
-            context = {}
-        user = context.get('username')
-        password = context.get('password')
-        
-        try :
-            sugar.login(user, password, url)
-            return True
-        except Exception:
-            return False
-                
-        
-    def parse_valid_url(self, context=None):
-        if not context:
-            context = {}
-        url = context.get('url')
-        url_split = str(url).split('/')
-        while len(url_split) >= 3:
-            #3 case, soap.php is already at the end of url should be valid
-            #url end by / or not
-            if url_split[-1] == 'soap.php':
-                url = "/".join(url_split)
-            elif url_split[-1] == '':
-                url = "/".join(url_split) + "soap.php"
-            else:
-                url = "/".join(url_split) + "/soap.php"
-            
-            if self.check_url(url, context):
-                return url
-            else: 
-                url_split = url_split[:-1] #take parent folder
-        return url
-            
-    def get_key(self, cr, uid, ids, context=None):
-        """Select Key as For which Module data we want import data."""
-        if not context:
-            context = {}
-        key_list = []
-        module = {}
-        for current in self.browse(cr, uid, ids, context):
-            context.update({'username': current.username, 'password': current.password, 'url': current.url, 'email_user': current.email_from or False, 'instance_name': current.instance_name or False})
-            if current.user:
-                key_list.append('Users')
-            if current.contact:
-                key_list.append('Contacts')
-            if current.account:
-                key_list.append('Accounts')  
-            if current.opportunity:
-                key_list.append('Leads')
-                key_list.append('Opportunities')
-            if current.employee:
-                key_list.append('Employees')
-                module.update({'Employees':'hr'}) 
-            if current.meeting:
-                key_list.append('Meetings')
-            if current.call:
-                key_list.append('Calls')
-            if current.claim:
-                key_list.append('Cases')  
-                module.update({'Cases':'crm_claim'})
-            if current.email_history:
-                key_list.append('Emails') 
-                key_list.append('Notes') 
-            if current.project:
-                key_list.append('Project')
-                module.update({'Project':'project'})
-            if current.project_task:
-                key_list.append('ProjectTask')
-                module.update({'ProjectTask':'project'})
-            if current.bug:
-                key_list.append('Bugs')
-                module.update({'Bugs':'project_issue'})
-            if current.document:
-                key_list.append('Documents')
-        return key_list,module
-
-
-    def do_import_all(self, cr, uid, *args):
-        """
-        scheduler Method
-        """
-        context = {'username': args[4], 'password': args[5], 'url': args[3], 'instance_name': args[3]}
-        imp = sugar_import(self, cr, uid, args[2], "import_sugarcrm", args[1], context)
-        imp.set_table_list(args[0])
-        imp.start()
-        return True 
-
-    def import_from_scheduler_all(self, cr, uid, ids, context=None):
-        keys, module_list = self.get_key(cr, uid, ids, context)
-        if not keys:
-            raise osv.except_osv(_('Warning!'), _('Select Module to Import.'))
-        key_list = module_list.keys()
-        for module in key_list :
-            module = module_list[module]
-            state = self.get_all(cr,uid,module,context=context)
-            if state == False:
-                keys =  ', '.join(key_list)
-                raise osv.except_osv(_('Error !!'), _("%s data required %s Module to be installed, Please install %s module.") %(keys,module,module))
-        cron_obj = self.pool.get('ir.cron')
-        url = self.parse_valid_url(context)
-        args = (keys,context.get('email_user'), context.get('instance_name'), url, context.get('username'), context.get('password') )
-        new_create_id = cron_obj.create(cr, uid, {'name': 'Import SugarCRM datas','interval_type': 'hours','interval_number': 1, 'numbercall': -1,'model': 'import.sugarcrm','function': 'do_import_all', 'args': args, 'active': False})
-        return {
-            'name': 'SugarCRM Scheduler',
-            'view_type': 'form',
-            'view_mode': 'form,tree',
-            'res_model': 'ir.cron',
-            'res_id': new_create_id,
-            'type': 'ir.actions.act_window',
-        }
-        
-    def import_all(self, cr, uid, ids, context=None):
-        
-#        """Import all sugarcrm data into openerp module"""
-        keys, module_list = self.get_key(cr, uid, ids, context)
-        if not keys:
-            raise osv.except_osv(_('Warning!'), _('Select Module to Import.'))
-        key_list = module_list.keys()
-        for module in key_list :
-            module = module_list[module]
-            state = self._module_installed(cr,uid,module,context=context)
-            if state == False:
-                keys =  ', '.join(key_list)
-                raise osv.except_osv(_('Error !!'), _("%s data required %s Module to be installed, Please install %s module.") %(keys,module,module))
-        url = self.parse_valid_url(context)
-        context.update({'url': url})
-        imp = sugar_import(self, cr, uid, context.get('instance_name'), "import_sugarcrm", context.get('email_user'), context)
-        imp.set_table_list(keys)
-        imp.start()
-        obj_model = self.pool.get('ir.model.data')
-        model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'),('name','=','import.message.form')])
-        resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])
-        return {
-                'view_type': 'form',
-                'view_mode': 'form',
-                'res_model': 'import.message',
-                'views': [(resource_id,'form')],
-                'type': 'ir.actions.act_window',
-                'target': 'new',
-            }
-        
-import_sugarcrm()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml
deleted file mode 100644
index 7206233569a..00000000000
--- a/addons/import_sugarcrm/import_sugarcrm_view.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-  <data>
-
-    <!-- Import Sugarcrm Form View -->
-    <record model="ir.ui.view" id="view_import_sugarcrm_form">
-      <field name="name">import.sugarcrm.form</field>
-      <field name="model">import.sugarcrm</field>
-      <field name="arch" type="xml">
-        <form string="Import Data From SugarCRM" version="7.0">
-            <header>
-                <button name="import_all" string="_Import"
-                        type="object" class="oe_highlight"/>
-                <button name="import_from_scheduler_all" string="_Schedule Recurrent Imports"
-                        type="object"/> or
-                <button special="cancel" string="_Cancel" class="oe_link"/>
-            </header>
-            <sheet>
-              <group col="8" >
-                <group colspan="5">
-                  <separator string="Login Information" colspan="4"/>
-                  <field name="url" colspan="2" widget="url"/>
-                  <field name="username" colspan="2"/>
-                  <field name="password" password="True" colspan="2"/>
-
-                  <group colspan="4">
-                    <separator string="Data to Import" colspan="4"/>
-                    <group colspan="1" col="2">
-                      <field name="user" />
-                      <field name= "account" />
-                      <field name= "contact" />
-                    </group>
-                    <group colspan="1" col="2">
-                      <field name="opportunity" />
-                      <field name= "call" />
-                      <field name= "meeting" />
-                      <field name= "claim" />
-                    </group>
-                    <group colspan="1" col="2">
-                      <field name= "project" />
-                      <field name= "project_task" />
-                      <field name= "bug"/>
-                    </group>
-                    <group colspan="1" col="2">
-                      <field name="employee" />
-                      <field name="email_history"/>
-                      <field name= "document" />
-                    </group>
-                  </group>
-
-                  <group colspan="4">
-                    <separator string="Email Notification When Import is Finished" colspan="2"/>
-                    <field name="email_from" widget="email" string="Email Address to Notify" colspan="2"/>
-                  </group>
-
-                  <group colspan="4" groups="base.group_no_one">
-                    <separator string="Multi Instance Management" colspan="4"/>
-                    <field name="instance_name" colspan="2"/>
-                </group>
-              </group>
-              </group>
-          </sheet>
-        </form>
-      </field>
-    </record>
-
-    <!-- Import Sugarcrm Action -->
-
-    <record model="ir.actions.act_window" id="action_import_sugarcrm">
-      <field name="name">Import SugarCRM</field>
-      <field name="res_model">import.sugarcrm</field>
-      <field name="view_type">form</field>
-      <field name="view_mode">tree,form</field>
-      <field name="view_id" ref="view_import_sugarcrm_form"/>
-      <field name="target">new</field>
-    </record>
-
-
-    <menuitem name="Import SugarCRM" id="menu_sugarcrm_import" parent="base.menu_import_crm" action="action_import_sugarcrm" icon="STOCK_EXECUTE" sequence="20"/>
-
-  </data>
-</openerp>
diff --git a/addons/import_sugarcrm/security/ir.model.access.csv b/addons/import_sugarcrm/security/ir.model.access.csv
deleted file mode 100644
index 5aadbf32950..00000000000
--- a/addons/import_sugarcrm/security/ir.model.access.csv
+++ /dev/null
@@ -1,3 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_import_sugarcrm_system,import.sugarcrm system,model_import_sugarcrm,base.group_system,1,1,1,1
-access_import_message_system,import.message system,model_import_message,base.group_system,1,1,1,1
diff --git a/addons/import_sugarcrm/sugar.py b/addons/import_sugarcrm/sugar.py
deleted file mode 100644
index 658ddc9e76d..00000000000
--- a/addons/import_sugarcrm/sugar.py
+++ /dev/null
@@ -1,180 +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 hashlib
-from sugarsoap_services import *
-from sugarsoap_services_types import *
-from osv import osv
-from tools.translate import _
-import base64
-from lxml import etree
-import tools
-import import_sugarcrm
-
-import logging
-
-import sys
-_logger = logging.getLogger(__name__)
-
-debug = False
-
-
-class LoginError(Exception): pass
-
-def login(username, password, url):
-    setURL(url)
-    loc = sugarsoapLocator()
-    if debug:
-        portType = loc.getsugarsoapPortType(url, tracefile=sys.stdout)
-    else:
-        portType = loc.getsugarsoapPortType(url)
-    request = loginRequest()
-    uauth = ns0.user_auth_Def(request)
-    request._user_auth = uauth
-
-    uauth._user_name = username
-    uauth._password = hashlib.md5(password).hexdigest()
-    uauth._version = '1.1'
-    try:
-        response = portType.login(request)
-    except:
-        raise osv.except_osv(_('Error!'), _('Authentication error!\nBad username or password or bad SugarSoap Api url!'))
-    if -1 == response._return._id:
-        raise LoginError(response._return._error._description)
-    
-    return (portType, response._return._id)
-
-def relation_search(portType, sessionid, module_name=None, module_id=None, related_module=None, query=None, deleted=None):
-    se_req = get_relationshipsRequest()
-    se_req._session = sessionid
-    se_req._module_name = module_name
-    se_req._module_id = module_id
-    se_req._related_module =  related_module 
-    se_resp = portType.get_relationships(se_req)
-    ans_list = []
-    if se_resp:
-        list = se_resp._return.get_element_ids()
-        for i in list:
-            ans_list.append(i.get_element_id())
-    return ans_list
-
-def attachment_search(portType, sessionid, module_name, module_id=None):
-    se_req = get_note_attachmentRequest()
-    se_req._session = sessionid
-    se_req._id = module_id
-    se_req._module_name = module_name
-    se_resp = portType.get_note_attachment(se_req)
-    file = se_resp._return._note_attachment.File
-    filename = se_resp._return._note_attachment.Filename
-    return file, filename
-
-def user_get_attendee_list(portType, sessionid, module_name=None, module_id=None):
-    se_req = get_attendee_listRequest()
-    se_req._session = sessionid
-    se_req._module_name = module_name
-    se_req._id = module_id
-    se_resp = portType.get_attendee_list(se_req)
-    list = se_resp.get_element_return()
-    arch = base64.decodestring(list.Result)
-    eview = etree.XML(arch)
-    attendee_list = []
-    for child in eview:
-        attendee_dict = {}
-        for ch in child.getchildren():
-            attendee_dict[ch.tag] = tools.ustr(ch.text)
-        attendee_list.append(attendee_dict)
-    return attendee_list         
-
-def get_contact_by_email(portType, username, password, email_address=None):
-    se_req = contact_by_emailRequest()
-    se_req._user_name = username
-    se_req._password = password
-    se_req._email_address = email_address
-    try:
-        se_resp = portType.contact_by_email(se_req)
-        email_list = []
-        for list in se_resp.get_element_return():
-            if list.Email_address in email_list:
-                continue
-            elif list.Email_address:
-                email_list.append(list.Email_address)
-        return email_list
-    except Exception,e:
-        _logger.error('Exception: %s\n' % (tools.ustr(e)))
-        return False
-
-def get_document_revision_search(portType, sessionid, module_id=None):
-    se_req = get_document_revisionRequest()
-    se_req._session = sessionid
-    se_req._i = module_id
-    se_resp = portType.get_document_list(se_req)
-    file = se_resp._return.Document_revision.File
-    filename = se_resp._return.Document_revision.Filename
-    return file, filename
-
-
-def email_search(portType, sessionid, module_name, module_id, select_fields=None):
-    se_req = get_entryRequest()
-    se_req._session = sessionid
-    se_req._module_name = module_name
-    se_req._id = module_id
-    se_req._select_fields = select_fields
-  
-    se_resp = portType.get_entry(se_req)
-    ans_list = []
-    if se_resp:
-        list = se_resp._return._entry_list
-      
-        for i in list:
-            ans_dir = {}
-            for j in i._name_value_list:
-                ans_dir[tools.ustr(j._name)] = tools.ustr(j._value)
-            #end for
-            ans_list.append(ans_dir)
-    #end for
-    return ans_list
-
-def search(portType, sessionid, module_name, offset, max_results, query=None, order_by=None, select_fields=None, deleted=None):
-    se_req = get_entry_listRequest()
-    se_req._session = sessionid
-    se_req._module_name = module_name
-    if query != None:
-        se_req._query = query
-    se_req._order_by = order_by
-    se_req._offset = offset
-    se_req._select_fields = select_fields
-    se_req._max_results = max_results
-    se_req._deleted = deleted
-    se_resp = portType.get_entry_list(se_req)
-    ans_list = []
-    if se_resp:
-        list = se_resp._return._entry_list
-        for i in list:
-            ans_dir = {}
-            for j in i._name_value_list:
-                ans_dir[tools.ustr(j._name)] = import_sugarcrm.unescape_htmlentities(tools.ustr(j._value))
-            #end for
-            ans_list.append(ans_dir)
-    #end for
-    return ans_list
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_sugarcrm/sugarsoap_services.py b/addons/import_sugarcrm/sugarsoap_services.py
deleted file mode 100644
index 38454de9c2a..00000000000
--- a/addons/import_sugarcrm/sugarsoap_services.py
+++ /dev/null
@@ -1,1422 +0,0 @@
-##################################################
-# sugarsoap_services.py
-# generated by ZSI.generate.wsdl2python
-##################################################
-
-
-from sugarsoap_services_types import *
-from osv import osv
-from tools.translate import _
-import socket
-import import_sugarcrm
-
-
-
-IP = socket.gethostbyname(socket.gethostname())
-URL = False
-
-try:
-    import ZSI
-    from ZSI.TCcompound import Struct
-    from ZSI import client
-except ImportError:
-    raise osv.except_osv(_('ZSI Import Error!'), _('Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci'))
-
-def setURL(url):
-    global URL
-    URL = url
-
-# Locator
-class sugarsoapLocator:
-    sugarsoapPortType_address = URL
-    def getsugarsoapPortTypeAddress(self):
-        return sugarsoapLocator.sugarsoapPortType_address
-    def getsugarsoapPortType(self, url=None, **kw):
-        return sugarsoapBindingSOAP(url or sugarsoapLocator.sugarsoapPortType_address, **kw)
-
-# Methods
-class sugarsoapBindingSOAP:
-    def __init__(self, url, **kw):
-        kw.setdefault("readerclass", None)
-        kw.setdefault("writerclass", None)
-        # no resource properties
-        self.binding = client.Binding(url=url, **kw)
-        # no ws-addressing
-
-    # op: create_session
-    def create_session(self, request):
-        if isinstance(request, create_sessionRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction= URL+"/create_session", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=create_sessionResponse.typecode.ofwhat, pyclass=create_sessionResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: end_session
-    def end_session(self, request):
-        if isinstance(request, end_sessionRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/end_session", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=end_sessionResponse.typecode.ofwhat, pyclass=end_sessionResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: contact_by_email
-    def contact_by_email(self, request):
-        if isinstance(request, contact_by_emailRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/contact_by_email", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=contact_by_emailResponse.typecode.ofwhat, pyclass=contact_by_emailResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: user_list
-    def user_list(self, request):
-        if isinstance(request, user_listRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/user_list", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=user_listResponse.typecode.ofwhat, pyclass=user_listResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: search
-    def search(self, request):
-        if isinstance(request, searchRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/search", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=searchResponse.typecode.ofwhat, pyclass=searchResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: track_email
-    def track_email(self, request):
-        if isinstance(request, track_emailRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/track_email", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=track_emailResponse.typecode.ofwhat, pyclass=track_emailResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: create_contact
-    def create_contact(self, request):
-        if isinstance(request, create_contactRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/create_contact", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=create_contactResponse.typecode.ofwhat, pyclass=create_contactResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: create_lead
-    def create_lead(self, request):
-        if isinstance(request, create_leadRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/create_lead", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=create_leadResponse.typecode.ofwhat, pyclass=create_leadResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: create_account
-    def create_account(self, request):
-        if isinstance(request, create_accountRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/create_account", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=create_accountResponse.typecode.ofwhat, pyclass=create_accountResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: create_opportunity
-    def create_opportunity(self, request):
-        if isinstance(request, create_opportunityRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/create_opportunity", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=create_opportunityResponse.typecode.ofwhat, pyclass=create_opportunityResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: create_case
-    def create_case(self, request):
-        if isinstance(request, create_caseRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/create_case", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=create_caseResponse.typecode.ofwhat, pyclass=create_caseResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: login
-    def login(self, request):
-        if isinstance(request, loginRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/login", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=loginResponse.typecode.ofwhat, pyclass=loginResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: is_loopback
-    def is_loopback(self, request):
-        if isinstance(request, is_loopbackRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/is_loopback", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=is_loopbackResponse.typecode.ofwhat, pyclass=is_loopbackResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: seamless_login
-    def seamless_login(self, request):
-        if isinstance(request, seamless_loginRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/seamless_login", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=seamless_loginResponse.typecode.ofwhat, pyclass=seamless_loginResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    #op: get_document_list
-    def get_document_list(self, request):
-        if isinstance(request, get_document_revisionRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction="http://"+ IP +"/sugarcrm/soap.php/get_document_list", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_document_revisionResponse.typecode.ofwhat, pyclass=get_document_revisionResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response    
-
-    # op: get_entry_list
-    def get_entry_list(self, request):
-        if isinstance(request, get_entry_listRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_entry_list", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_entry_listResponse.typecode.ofwhat, pyclass=get_entry_listResponse.typecode.pyclass)
-        try:
-            response = self.binding.Receive(typecode)
-        except:
-            return None
-        return response
-
-    # op: get_entry
-    def get_entry(self, request):
-        if isinstance(request, get_entryRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_entry", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_entryResponse.typecode.ofwhat, pyclass=get_entryResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: get_entries
-    def get_entries(self, request):
-        if isinstance(request, get_entriesRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_entries", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_entriesResponse.typecode.ofwhat, pyclass=get_entriesResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: set_entry
-    def set_entry(self, request):
-        if isinstance(request, set_entryRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/set_entry", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=set_entryResponse.typecode.ofwhat, pyclass=set_entryResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: set_entries
-    def set_entries(self, request):
-        if isinstance(request, set_entriesRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/set_entries", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=set_entriesResponse.typecode.ofwhat, pyclass=set_entriesResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: set_note_attachment
-    def set_note_attachment(self, request):
-        if isinstance(request, set_note_attachmentRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/set_note_attachment", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=set_note_attachmentResponse.typecode.ofwhat, pyclass=set_note_attachmentResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: get_note_attachment
-    def get_note_attachment(self, request):
-        if isinstance(request, get_note_attachmentRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_note_attachment", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_note_attachmentResponse.typecode.ofwhat, pyclass=get_note_attachmentResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: relate_note_to_module
-    def relate_note_to_module(self, request):
-        if isinstance(request, relate_note_to_moduleRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/relate_note_to_module", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=relate_note_to_moduleResponse.typecode.ofwhat, pyclass=relate_note_to_moduleResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: get_related_notes
-    def get_related_notes(self, request):
-        if isinstance(request, get_related_notesRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_related_notes", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_related_notesResponse.typecode.ofwhat, pyclass=get_related_notesResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: logout
-    def logout(self, request):
-        if isinstance(request, logoutRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/logout", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=logoutResponse.typecode.ofwhat, pyclass=logoutResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: get_module_fields
-    def get_module_fields(self, request):
-        if isinstance(request, get_module_fieldsRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_module_fields", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_module_fieldsResponse.typecode.ofwhat, pyclass=get_module_fieldsResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: get_available_modules
-    def get_available_modules(self, request):
-        if isinstance(request, get_available_modulesRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_available_modules", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_available_modulesResponse.typecode.ofwhat, pyclass=get_available_modulesResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: update_portal_user
-    def update_portal_user(self, request):
-        if isinstance(request, update_portal_userRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/update_portal_user", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=update_portal_userResponse.typecode.ofwhat, pyclass=update_portal_userResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: test
-    def test(self, request):
-        if isinstance(request, testRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/test", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=testResponse.typecode.ofwhat, pyclass=testResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: get_user_id
-    def get_user_id(self, request):
-        if isinstance(request, get_user_idRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_user_id", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_user_idResponse.typecode.ofwhat, pyclass=get_user_idResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: get_user_team_id
-    def get_user_team_id(self, request):
-        if isinstance(request, get_user_team_idRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_user_team_id", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_user_team_idResponse.typecode.ofwhat, pyclass=get_user_team_idResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: get_server_time
-    def get_server_time(self, request):
-        if isinstance(request, get_server_timeRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_server_time", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_server_timeResponse.typecode.ofwhat, pyclass=get_server_timeResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: get_gmt_time
-    def get_gmt_time(self, request):
-        if isinstance(request, get_gmt_timeRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_gmt_time", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_gmt_timeResponse.typecode.ofwhat, pyclass=get_gmt_timeResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: get_sugar_flavor
-    def get_sugar_flavor(self, request):
-        if isinstance(request, get_sugar_flavorRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_sugar_flavor", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_sugar_flavorResponse.typecode.ofwhat, pyclass=get_sugar_flavorResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: get_server_version
-    def get_server_version(self, request):
-        if isinstance(request, get_server_versionRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_server_version", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_server_versionResponse.typecode.ofwhat, pyclass=get_server_versionResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: get_relationships
-    def get_relationships(self, request):
-        if isinstance(request, get_relationshipsRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_relationships", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_relationshipsResponse.typecode.ofwhat, pyclass=get_relationshipsResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: set_relationship
-    def set_relationship(self, request):
-        if isinstance(request, set_relationshipRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/set_relationship", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=set_relationshipResponse.typecode.ofwhat, pyclass=set_relationshipResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: set_relationships
-    def set_relationships(self, request):
-        if isinstance(request, set_relationshipsRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/set_relationships", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=set_relationshipsResponse.typecode.ofwhat, pyclass=set_relationshipsResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: set_document_revision
-    def set_document_revision(self, request):
-        if isinstance(request, set_document_revisionRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/set_document_revision", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=set_document_revisionResponse.typecode.ofwhat, pyclass=set_document_revisionResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: search_by_module
-    def search_by_module(self, request):
-        if isinstance(request, search_by_moduleRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/search_by_module", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=search_by_moduleResponse.typecode.ofwhat, pyclass=search_by_moduleResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: sync_get_modified_relationships
-    def sync_get_modified_relationships(self, request):
-        if isinstance(request, sync_get_modified_relationshipsRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/sync_get_modified_relationships", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=sync_get_modified_relationshipsResponse.typecode.ofwhat, pyclass=sync_get_modified_relationshipsResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: get_modified_entries
-    def get_modified_entries(self, request):
-        if isinstance(request, get_modified_entriesRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_modified_entries", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_modified_entriesResponse.typecode.ofwhat, pyclass=get_modified_entriesResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-    # op: get_attendee_list
-    def get_attendee_list(self, request):
-        if isinstance(request, get_attendee_listRequest) is False:
-            raise TypeError, "%s incorrect request type!" % (request.__class__)
-        kw = {}
-        # no input wsaction
-        self.binding.Send(None, None, request, soapaction=URL+"/get_attendee_list", encodingStyle="http://schemas.xmlsoap.org/soap/encoding/", **kw)
-        # no output wsaction
-        typecode = Struct(pname=None, ofwhat=get_attendee_listResponse.typecode.ofwhat, pyclass=get_attendee_listResponse.typecode.pyclass)
-        response = self.binding.Receive(typecode)
-        return response
-
-_create_sessionRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","create_session"), ofwhat=[ZSI.TC.String(pname="user_name", aname="_user_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="password", aname="_password", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class create_sessionRequest:
-    typecode = _create_sessionRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._user_name = None
-        self._password = None
-        return
-create_sessionRequest.typecode.pyclass = create_sessionRequest
-
-_create_sessionResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","create_sessionResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class create_sessionResponse:
-    typecode = _create_sessionResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-create_sessionResponse.typecode.pyclass = create_sessionResponse
-
-_end_sessionRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","end_session"), ofwhat=[ZSI.TC.String(pname="user_name", aname="_user_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class end_sessionRequest:
-    typecode = _end_sessionRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._user_name = None
-        return
-end_sessionRequest.typecode.pyclass = end_sessionRequest
-
-_end_sessionResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","end_sessionResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class end_sessionResponse:
-    typecode = _end_sessionResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-end_sessionResponse.typecode.pyclass = end_sessionResponse
-
-_contact_by_emailRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","contact_by_email"), ofwhat=[ZSI.TC.String(pname="user_name", aname="_user_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="password", aname="_password", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="email_address", aname="_email_address", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class contact_by_emailRequest:
-    typecode = _contact_by_emailRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._user_name = None
-        self._password = None
-        self._email_address = None
-        return
-contact_by_emailRequest.typecode.pyclass = contact_by_emailRequest
-
-_contact_by_emailResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","contact_by_emailResponse"), ofwhat=[ns0.contact_detail_array_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class contact_by_emailResponse:
-    typecode = _contact_by_emailResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-contact_by_emailResponse.typecode.pyclass = contact_by_emailResponse
-
-_user_listRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","user_list"), ofwhat=[ZSI.TC.String(pname="user_name", aname="_user_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="password", aname="_password", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class user_listRequest:
-    typecode = _user_listRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._user_name = None
-        self._password = None
-        return
-user_listRequest.typecode.pyclass = user_listRequest
-
-_user_listResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","user_listResponse"), ofwhat=[ns0.user_detail_array_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class user_listResponse:
-    typecode = _user_listResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-user_listResponse.typecode.pyclass = user_listResponse
-
-_searchRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","search"), ofwhat=[ZSI.TC.String(pname="user_name", aname="_user_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="password", aname="_password", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="name", aname="_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class searchRequest:
-    typecode = _searchRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._user_name = None
-        self._password = None
-        self._name = None
-        return
-searchRequest.typecode.pyclass = searchRequest
-
-_searchResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","searchResponse"), ofwhat=[ns0.contact_detail_array_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class searchResponse:
-    typecode = _searchResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-searchResponse.typecode.pyclass = searchResponse
-
-_track_emailRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","track_email"), ofwhat=[ZSI.TC.String(pname="user_name", aname="_user_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="password", aname="_password", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="parent_id", aname="_parent_id", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="contact_ids", aname="_contact_ids", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TCtimes.gDate(pname="date_sent", aname="_date_sent", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="email_subject", aname="_email_subject", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="email_body", aname="_email_body", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class track_emailRequest:
-    typecode = _track_emailRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._user_name = None
-        self._password = None
-        self._parent_id = None
-        self._contact_ids = None
-        self._date_sent = None
-        self._email_subject = None
-        self._email_body = None
-        return
-track_emailRequest.typecode.pyclass = track_emailRequest
-
-_track_emailResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","track_emailResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class track_emailResponse:
-    typecode = _track_emailResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-track_emailResponse.typecode.pyclass = track_emailResponse
-
-_create_contactRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","create_contact"), ofwhat=[ZSI.TC.String(pname="user_name", aname="_user_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="password", aname="_password", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="first_name", aname="_first_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="last_name", aname="_last_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="email_address", aname="_email_address", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class create_contactRequest:
-    typecode = _create_contactRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._user_name = None
-        self._password = None
-        self._first_name = None
-        self._last_name = None
-        self._email_address = None
-        return
-create_contactRequest.typecode.pyclass = create_contactRequest
-
-_create_contactResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","create_contactResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class create_contactResponse:
-    typecode = _create_contactResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-create_contactResponse.typecode.pyclass = create_contactResponse
-
-_create_leadRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","create_lead"), ofwhat=[ZSI.TC.String(pname="user_name", aname="_user_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="password", aname="_password", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="first_name", aname="_first_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="last_name", aname="_last_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="email_address", aname="_email_address", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class create_leadRequest:
-    typecode = _create_leadRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._user_name = None
-        self._password = None
-        self._first_name = None
-        self._last_name = None
-        self._email_address = None
-        return
-create_leadRequest.typecode.pyclass = create_leadRequest
-
-_create_leadResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","create_leadResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class create_leadResponse:
-    typecode = _create_leadResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-create_leadResponse.typecode.pyclass = create_leadResponse
-
-_create_accountRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","create_account"), ofwhat=[ZSI.TC.String(pname="user_name", aname="_user_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="password", aname="_password", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="name", aname="_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="phone", aname="_phone", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="website", aname="_website", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class create_accountRequest:
-    typecode = _create_accountRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._user_name = None
-        self._password = None
-        self._name = None
-        self._phone = None
-        self._website = None
-        return
-create_accountRequest.typecode.pyclass = create_accountRequest
-
-_create_accountResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","create_accountResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class create_accountResponse:
-    typecode = _create_accountResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-create_accountResponse.typecode.pyclass = create_accountResponse
-
-_create_opportunityRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","create_opportunity"), ofwhat=[ZSI.TC.String(pname="user_name", aname="_user_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="password", aname="_password", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="name", aname="_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="amount", aname="_amount", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class create_opportunityRequest:
-    typecode = _create_opportunityRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._user_name = None
-        self._password = None
-        self._name = None
-        self._amount = None
-        return
-create_opportunityRequest.typecode.pyclass = create_opportunityRequest
-
-_create_opportunityResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","create_opportunityResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class create_opportunityResponse:
-    typecode = _create_opportunityResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-create_opportunityResponse.typecode.pyclass = create_opportunityResponse
-
-_create_caseRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","create_case"), ofwhat=[ZSI.TC.String(pname="user_name", aname="_user_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="password", aname="_password", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="name", aname="_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class create_caseRequest:
-    typecode = _create_caseRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._user_name = None
-        self._password = None
-        self._name = None
-        return
-create_caseRequest.typecode.pyclass = create_caseRequest
-
-_create_caseResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","create_caseResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class create_caseResponse:
-    typecode = _create_caseResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-create_caseResponse.typecode.pyclass = create_caseResponse
-
-_loginRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","login"), ofwhat=[ns0.user_auth_Def(pname="user_auth", aname="_user_auth", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="application_name", aname="_application_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class loginRequest:
-    typecode = _loginRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._user_auth = None
-        self._application_name = None
-        return
-loginRequest.typecode.pyclass = loginRequest
-
-_loginResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","loginResponse"), ofwhat=[ns0.set_entry_result_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class loginResponse:
-    typecode = _loginResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-loginResponse.typecode.pyclass = loginResponse
-
-_is_loopbackRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","is_loopback"), ofwhat=[], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class is_loopbackRequest:
-    typecode = _is_loopbackRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        return
-is_loopbackRequest.typecode.pyclass = is_loopbackRequest
-
-_is_loopbackResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","is_loopbackResponse"), ofwhat=[ZSI.TCnumbers.Iint(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class is_loopbackResponse:
-    typecode = _is_loopbackResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-is_loopbackResponse.typecode.pyclass = is_loopbackResponse
-
-_seamless_loginRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","seamless_login"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class seamless_loginRequest:
-    typecode = _seamless_loginRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        return
-seamless_loginRequest.typecode.pyclass = seamless_loginRequest
-
-_seamless_loginResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","seamless_loginResponse"), ofwhat=[ZSI.TCnumbers.Iint(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class seamless_loginResponse:
-    typecode = _seamless_loginResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-seamless_loginResponse.typecode.pyclass = seamless_loginResponse
-
-_get_entry_listRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_entry_list"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_name", aname="_module_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="query", aname="_query", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="order_by", aname="_order_by", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TCnumbers.Iint(pname="offset", aname="_offset", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.select_fields_Def(pname="select_fields", aname="_select_fields", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TCnumbers.Iint(pname="max_results", aname="_max_results", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TCnumbers.Iint(pname="deleted", aname="_deleted", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_entry_listRequest:
-    typecode = _get_entry_listRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._module_name = None
-        self._query = None
-        self._order_by = None
-        self._offset = None
-        self._select_fields = None
-        self._max_results = None
-        self._deleted = None
-        return
-get_entry_listRequest.typecode.pyclass = get_entry_listRequest
-
-_get_entry_listResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_entry_listResponse"), ofwhat=[ns0.get_entry_list_result_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_entry_listResponse:
-    typecode = _get_entry_listResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_entry_listResponse.typecode.pyclass = get_entry_listResponse
-
-_get_entryRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_entry"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_name", aname="_module_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="id", aname="_id", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.select_fields_Def(pname="select_fields", aname="_select_fields", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_entryRequest:
-    typecode = _get_entryRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._module_name = None
-        self._id = None
-        self._select_fields = None
-        return
-get_entryRequest.typecode.pyclass = get_entryRequest
-
-_get_entryResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_entryResponse"), ofwhat=[ns0.get_entry_result_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_entryResponse:
-    typecode = _get_entryResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_entryResponse.typecode.pyclass = get_entryResponse
-
-_get_entriesRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_entries"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_name", aname="_module_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.select_fields_Def(pname="ids", aname="_ids", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.select_fields_Def(pname="select_fields", aname="_select_fields", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_entriesRequest:
-    typecode = _get_entriesRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._module_name = None
-        self._ids = None
-        self._select_fields = None
-        return
-get_entriesRequest.typecode.pyclass = get_entriesRequest
-
-_get_entriesResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_entriesResponse"), ofwhat=[ns0.get_entry_result_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_entriesResponse:
-    typecode = _get_entriesResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_entriesResponse.typecode.pyclass = get_entriesResponse
-
-_set_entryRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","set_entry"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_name", aname="_module_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.name_value_list_Def(pname="name_value_list", aname="_name_value_list", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-
-class get_document_revisionRequest:
-    def __init__(self):
-        self._session = None
-        self._i = None
-        return
-get_document_revisionRequest.typecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_document_revision"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="i", aname="_i", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=get_document_revisionRequest, encoded="http://www.sugarcrm.com/sugarcrm")
-
-class get_document_revisionResponse:
-    def __init__(self):
-        self._return = None
-        return
-get_document_revisionResponse.typecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_document_revisionResponse"), ofwhat=[ns0.return_document_revision_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=get_document_revisionResponse, encoded="http://www.sugarcrm.com/sugarcrm")
-
-
-
-class set_entryRequest:
-    typecode = _set_entryRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._module_name = None
-        self._name_value_list = None
-        return
-set_entryRequest.typecode.pyclass = set_entryRequest
-
-_set_entryResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","set_entryResponse"), ofwhat=[ns0.set_entry_result_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class set_entryResponse:
-    typecode = _set_entryResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-set_entryResponse.typecode.pyclass = set_entryResponse
-
-_set_entriesRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","set_entries"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_name", aname="_module_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.name_value_lists_Def(pname="name_value_lists", aname="_name_value_lists", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class set_entriesRequest:
-    typecode = _set_entriesRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._module_name = None
-        self._name_value_lists = None
-        return
-set_entriesRequest.typecode.pyclass = set_entriesRequest
-
-_set_entriesResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","set_entriesResponse"), ofwhat=[ns0.set_entries_result_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class set_entriesResponse:
-    typecode = _set_entriesResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-set_entriesResponse.typecode.pyclass = set_entriesResponse
-
-_set_note_attachmentRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","set_note_attachment"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.note_attachment_Def(pname="note", aname="_note", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class set_note_attachmentRequest:
-    typecode = _set_note_attachmentRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._note = None
-        return
-set_note_attachmentRequest.typecode.pyclass = set_note_attachmentRequest
-
-_set_note_attachmentResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","set_note_attachmentResponse"), ofwhat=[ns0.set_entry_result_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class set_note_attachmentResponse:
-    typecode = _set_note_attachmentResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-set_note_attachmentResponse.typecode.pyclass = set_note_attachmentResponse
-
-_get_note_attachmentRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_note_attachment"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="id", aname="_id", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_note_attachmentRequest:
-    typecode = _get_note_attachmentRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._id = None
-        return
-get_note_attachmentRequest.typecode.pyclass = get_note_attachmentRequest
-
-_get_note_attachmentResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_note_attachmentResponse"), ofwhat=[ns0.return_note_attachment_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_note_attachmentResponse:
-    typecode = _get_note_attachmentResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_note_attachmentResponse.typecode.pyclass = get_note_attachmentResponse
-
-_relate_note_to_moduleRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","relate_note_to_module"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="note_id", aname="_note_id", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_name", aname="_module_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_id", aname="_module_id", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class relate_note_to_moduleRequest:
-    typecode = _relate_note_to_moduleRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._note_id = None
-        self._module_name = None
-        self._module_id = None
-        return
-relate_note_to_moduleRequest.typecode.pyclass = relate_note_to_moduleRequest
-
-_relate_note_to_moduleResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","relate_note_to_moduleResponse"), ofwhat=[ns0.error_value_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class relate_note_to_moduleResponse:
-    typecode = _relate_note_to_moduleResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-relate_note_to_moduleResponse.typecode.pyclass = relate_note_to_moduleResponse
-
-_get_related_notesRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_related_notes"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_name", aname="_module_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_id", aname="_module_id", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.select_fields_Def(pname="select_fields", aname="_select_fields", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_related_notesRequest:
-    typecode = _get_related_notesRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._module_name = None
-        self._module_id = None
-        self._select_fields = None
-        return
-get_related_notesRequest.typecode.pyclass = get_related_notesRequest
-
-_get_related_notesResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_related_notesResponse"), ofwhat=[ns0.get_entry_result_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_related_notesResponse:
-    typecode = _get_related_notesResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_related_notesResponse.typecode.pyclass = get_related_notesResponse
-
-_logoutRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","logout"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class logoutRequest:
-    typecode = _logoutRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        return
-logoutRequest.typecode.pyclass = logoutRequest
-
-_logoutResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","logoutResponse"), ofwhat=[ns0.error_value_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class logoutResponse:
-    typecode = _logoutResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-logoutResponse.typecode.pyclass = logoutResponse
-
-_get_module_fieldsRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_module_fields"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_name", aname="_module_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_module_fieldsRequest:
-    typecode = _get_module_fieldsRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._module_name = None
-        return
-get_module_fieldsRequest.typecode.pyclass = get_module_fieldsRequest
-
-_get_module_fieldsResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_module_fieldsResponse"), ofwhat=[ns0.module_fields_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_module_fieldsResponse:
-    typecode = _get_module_fieldsResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_module_fieldsResponse.typecode.pyclass = get_module_fieldsResponse
-
-_get_available_modulesRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_available_modules"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_available_modulesRequest:
-    typecode = _get_available_modulesRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        return
-get_available_modulesRequest.typecode.pyclass = get_available_modulesRequest
-
-_get_available_modulesResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_available_modulesResponse"), ofwhat=[ns0.module_list_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_available_modulesResponse:
-    typecode = _get_available_modulesResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_available_modulesResponse.typecode.pyclass = get_available_modulesResponse
-
-_update_portal_userRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","update_portal_user"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="portal_name", aname="_portal_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.name_value_list_Def(pname="name_value_list", aname="_name_value_list", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class update_portal_userRequest:
-    typecode = _update_portal_userRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._portal_name = None
-        self._name_value_list = None
-        return
-update_portal_userRequest.typecode.pyclass = update_portal_userRequest
-
-_update_portal_userResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","update_portal_userResponse"), ofwhat=[ns0.error_value_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class update_portal_userResponse:
-    typecode = _update_portal_userResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-update_portal_userResponse.typecode.pyclass = update_portal_userResponse
-
-_testRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","test"), ofwhat=[ZSI.TC.String(pname="string", aname="_string", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class testRequest:
-    typecode = _testRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._string = None
-        return
-testRequest.typecode.pyclass = testRequest
-
-_testResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","testResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class testResponse:
-    typecode = _testResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-testResponse.typecode.pyclass = testResponse
-
-_get_user_idRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_user_id"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_user_idRequest:
-    typecode = _get_user_idRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        return
-get_user_idRequest.typecode.pyclass = get_user_idRequest
-
-_get_user_idResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_user_idResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_user_idResponse:
-    typecode = _get_user_idResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_user_idResponse.typecode.pyclass = get_user_idResponse
-
-_get_user_team_idRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_user_team_id"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_user_team_idRequest:
-    typecode = _get_user_team_idRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        return
-get_user_team_idRequest.typecode.pyclass = get_user_team_idRequest
-
-_get_user_team_idResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_user_team_idResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_user_team_idResponse:
-    typecode = _get_user_team_idResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_user_team_idResponse.typecode.pyclass = get_user_team_idResponse
-
-_get_server_timeRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_server_time"), ofwhat=[], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_server_timeRequest:
-    typecode = _get_server_timeRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        return
-get_server_timeRequest.typecode.pyclass = get_server_timeRequest
-
-_get_server_timeResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_server_timeResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_server_timeResponse:
-    typecode = _get_server_timeResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_server_timeResponse.typecode.pyclass = get_server_timeResponse
-
-_get_gmt_timeRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_gmt_time"), ofwhat=[], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_gmt_timeRequest:
-    typecode = _get_gmt_timeRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        return
-get_gmt_timeRequest.typecode.pyclass = get_gmt_timeRequest
-
-_get_gmt_timeResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_gmt_timeResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_gmt_timeResponse:
-    typecode = _get_gmt_timeResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_gmt_timeResponse.typecode.pyclass = get_gmt_timeResponse
-
-_get_sugar_flavorRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_sugar_flavor"), ofwhat=[], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_sugar_flavorRequest:
-    typecode = _get_sugar_flavorRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        return
-get_sugar_flavorRequest.typecode.pyclass = get_sugar_flavorRequest
-
-_get_sugar_flavorResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_sugar_flavorResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_sugar_flavorResponse:
-    typecode = _get_sugar_flavorResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_sugar_flavorResponse.typecode.pyclass = get_sugar_flavorResponse
-
-_get_server_versionRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_server_version"), ofwhat=[], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_server_versionRequest:
-    typecode = _get_server_versionRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        return
-get_server_versionRequest.typecode.pyclass = get_server_versionRequest
-
-_get_server_versionResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_server_versionResponse"), ofwhat=[ZSI.TC.String(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_server_versionResponse:
-    typecode = _get_server_versionResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_server_versionResponse.typecode.pyclass = get_server_versionResponse
-
-_get_relationshipsRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_relationships"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_name", aname="_module_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_id", aname="_module_id", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="related_module", aname="_related_module", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="related_module_query", aname="_related_module_query", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TCnumbers.Iint(pname="deleted", aname="_deleted", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_relationshipsRequest:
-    typecode = _get_relationshipsRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._module_name = None
-        self._module_id = None
-        self._related_module = None
-        self._related_module_query = None
-        self._deleted = None
-        return
-get_relationshipsRequest.typecode.pyclass = get_relationshipsRequest
-
-_get_relationshipsResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_relationshipsResponse"), ofwhat=[ns0.get_relationships_result_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_relationshipsResponse:
-    typecode = _get_relationshipsResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_relationshipsResponse.typecode.pyclass = get_relationshipsResponse
-
-_set_relationshipRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","set_relationship"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.set_relationship_value_Def(pname="set_relationship_value", aname="_set_relationship_value", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class set_relationshipRequest:
-    typecode = _set_relationshipRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._set_relationship_value = None
-        return
-set_relationshipRequest.typecode.pyclass = set_relationshipRequest
-
-_set_relationshipResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","set_relationshipResponse"), ofwhat=[ns0.error_value_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class set_relationshipResponse:
-    typecode = _set_relationshipResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-set_relationshipResponse.typecode.pyclass = set_relationshipResponse
-
-_set_relationshipsRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","set_relationships"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.set_relationship_list_Def(pname="set_relationship_list", aname="_set_relationship_list", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class set_relationshipsRequest:
-    typecode = _set_relationshipsRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._set_relationship_list = None
-        return
-set_relationshipsRequest.typecode.pyclass = set_relationshipsRequest
-
-_set_relationshipsResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","set_relationshipsResponse"), ofwhat=[ns0.set_relationship_list_result_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class set_relationshipsResponse:
-    typecode = _set_relationshipsResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-set_relationshipsResponse.typecode.pyclass = set_relationshipsResponse
-
-_set_document_revisionRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","set_document_revision"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.document_revision_Def(pname="note", aname="_note", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class set_document_revisionRequest:
-    typecode = _set_document_revisionRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._note = None
-        return
-set_document_revisionRequest.typecode.pyclass = set_document_revisionRequest
-
-_set_document_revisionResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","set_document_revisionResponse"), ofwhat=[ns0.set_entry_result_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class set_document_revisionResponse:
-    typecode = _set_document_revisionResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-set_document_revisionResponse.typecode.pyclass = set_document_revisionResponse
-
-_search_by_moduleRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","search_by_module"), ofwhat=[ZSI.TC.String(pname="user_name", aname="_user_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="password", aname="_password", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="search_string", aname="_search_string", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.select_fields_Def(pname="modules", aname="_modules", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TCnumbers.Iint(pname="offset", aname="_offset", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TCnumbers.Iint(pname="max_results", aname="_max_results", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class search_by_moduleRequest:
-    typecode = _search_by_moduleRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._user_name = None
-        self._password = None
-        self._search_string = None
-        self._modules = None
-        self._offset = None
-        self._max_results = None
-        return
-search_by_moduleRequest.typecode.pyclass = search_by_moduleRequest
-
-_search_by_moduleResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","search_by_moduleResponse"), ofwhat=[ns0.get_entry_list_result_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class search_by_moduleResponse:
-    typecode = _search_by_moduleResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-search_by_moduleResponse.typecode.pyclass = search_by_moduleResponse
-
-_sync_get_modified_relationshipsRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","sync_get_modified_relationships"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_name", aname="_module_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="related_module", aname="_related_module", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="from_date", aname="_from_date", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="to_date", aname="_to_date", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TCnumbers.Iint(pname="offset", aname="_offset", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TCnumbers.Iint(pname="max_results", aname="_max_results", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TCnumbers.Iint(pname="deleted", aname="_deleted", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_id", aname="_module_id", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.select_fields_Def(pname="select_fields", aname="_select_fields", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.select_fields_Def(pname="ids", aname="_ids", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="relationship_name", aname="_relationship_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="deletion_date", aname="_deletion_date", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TCnumbers.Iint(pname="php_serialize", aname="_php_serialize", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class sync_get_modified_relationshipsRequest:
-    typecode = _sync_get_modified_relationshipsRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._module_name = None
-        self._related_module = None
-        self._from_date = None
-        self._to_date = None
-        self._offset = None
-        self._max_results = None
-        self._deleted = None
-        self._module_id = None
-        self._select_fields = None
-        self._ids = None
-        self._relationship_name = None
-        self._deletion_date = None
-        self._php_serialize = None
-        return
-sync_get_modified_relationshipsRequest.typecode.pyclass = sync_get_modified_relationshipsRequest
-
-_sync_get_modified_relationshipsResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","sync_get_modified_relationshipsResponse"), ofwhat=[ns0.get_entry_list_result_encoded_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class sync_get_modified_relationshipsResponse:
-    typecode = _sync_get_modified_relationshipsResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-sync_get_modified_relationshipsResponse.typecode.pyclass = sync_get_modified_relationshipsResponse
-
-_get_modified_entriesRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_modified_entries"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_name", aname="_module_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.select_fields_Def(pname="ids", aname="_ids", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ns0.select_fields_Def(pname="select_fields", aname="_select_fields", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_modified_entriesRequest:
-    typecode = _get_modified_entriesRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._module_name = None
-        self._ids = None
-        self._select_fields = None
-        return
-get_modified_entriesRequest.typecode.pyclass = get_modified_entriesRequest
-
-_get_modified_entriesResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_modified_entriesResponse"), ofwhat=[ns0.get_sync_result_encoded_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_modified_entriesResponse:
-    typecode = _get_modified_entriesResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_modified_entriesResponse.typecode.pyclass = get_modified_entriesResponse
-
-_get_attendee_listRequestTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_attendee_list"), ofwhat=[ZSI.TC.String(pname="session", aname="_session", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="module_name", aname="_module_name", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True), ZSI.TC.String(pname="id", aname="_id", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_attendee_listRequest:
-    typecode = _get_attendee_listRequestTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._session = None
-        self._module_name = None
-        self._id = None
-        return
-get_attendee_listRequest.typecode.pyclass = get_attendee_listRequest
-
-_get_attendee_listResponseTypecode = Struct(pname=("http://www.sugarcrm.com/sugarcrm","get_attendee_listResponse"), ofwhat=[ns0.get_sync_result_encoded_Def(pname="return", aname="_return", typed=False, encoded=None, minOccurs=1, maxOccurs=1, nillable=True)], pyclass=None, encoded="http://www.sugarcrm.com/sugarcrm")
-class get_attendee_listResponse:
-    typecode = _get_attendee_listResponseTypecode
-    __metaclass__ = pyclass_type
-    def __init__(self):
-        self._return = None
-        return
-get_attendee_listResponse.typecode.pyclass = get_attendee_listResponse
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_sugarcrm/sugarsoap_services_types.py b/addons/import_sugarcrm/sugarsoap_services_types.py
deleted file mode 100644
index 182e9ce4c37..00000000000
--- a/addons/import_sugarcrm/sugarsoap_services_types.py
+++ /dev/null
@@ -1,648 +0,0 @@
-##################################################
-# sugarsoap_services_types.py
-# generated by ZSI.generate.wsdl2python
-##################################################
-from osv import osv
-from tools.translate import _
-try:
-    import ZSI
-    import ZSI.TCcompound
-    from ZSI.TC import TypeDefinition
-    from ZSI.TC import _get_type_definition as GTD
-    from ZSI.generate.pyclass import pyclass_type
-except ImportError:
-    raise osv.except_osv(_('ZSI Import Error!'), _('Please install SOAP for python - ZSI-2.0-rc3.tar.gz from http://pypi.python.org/pypi/ZSI/'))
-
-##############################
-# targetNamespace
-# http://www.sugarcrm.com/sugarcrm
-##############################
-
-class ns0:
-    targetNamespace = "http://www.sugarcrm.com/sugarcrm"
-
-    class contact_detail_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "contact_detail")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #Unused variable ns.
-            #ns = ns0.contact_detail_Def.schema
-            TClist = [ZSI.TC.String(pname="email_address", aname="_email_address", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="name1", aname="_name1", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="name2", aname="_name2", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="association", aname="_association", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="id", aname="_id", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="msi_id", aname="_msi_id", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="type", aname="_type", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._email_address = None
-                    self._name1 = None
-                    self._name2 = None
-                    self._association = None
-                    self._id = None
-                    self._msi_id = None
-                    self._type = None
-                    return
-            Holder.__name__ = "contact_detail_Holder"
-            self.pyclass = Holder
-
-    class contact_detail_array_Def(ZSI.TC.Array, TypeDefinition):
-        #complexType/complexContent base="SOAP-ENC:Array"
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "contact_detail_array")
-        def __init__(self, pname, ofwhat=(), extend=False, restrict=False, attributes=None, **kw):
-            ofwhat = ns0.contact_detail_Def(None, typed=False)
-            atype = (u'http://www.sugarcrm.com/sugarcrm', u'contact_detail[]')
-            ZSI.TCcompound.Array.__init__(self, atype, ofwhat, pname=pname, childnames='item', **kw)
-
-    class user_detail_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "user_detail")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.user_detail_Def.schema
-            TClist = [ZSI.TC.String(pname="email_address", aname="_email_address", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="user_name", aname="_user_name", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="first_name", aname="_first_name", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="last_name", aname="_last_name", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="department", aname="_department", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="id", aname="_id", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="title", aname="_title", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._email_address = None
-                    self._user_name = None
-                    self._first_name = None
-                    self._last_name = None
-                    self._department = None
-                    self._id = None
-                    self._title = None
-                    return
-            Holder.__name__ = "user_detail_Holder"
-            self.pyclass = Holder
-
-    class user_detail_array_Def(ZSI.TC.Array, TypeDefinition):
-        #complexType/complexContent base="SOAP-ENC:Array"
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "user_detail_array")
-        def __init__(self, pname, ofwhat=(), extend=False, restrict=False, attributes=None, **kw):
-            ofwhat = ns0.user_detail_Def(None, typed=False)
-            atype = (u'http://www.sugarcrm.com/sugarcrm', u'user_detail[]')
-            ZSI.TCcompound.Array.__init__(self, atype, ofwhat, pname=pname, childnames='item', **kw)
-
-    class note_attachment_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "note_attachment")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-           # ns = ns0.note_attachment_Def.schema
-            TClist = [ZSI.TC.String(pname="id", aname="_id", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="filename", aname="_filename", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="file", aname="_file", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._id = None
-                    self._filename = None
-                    self._file = None
-                    return
-            Holder.__name__ = "note_attachment_Holder"
-            self.pyclass = Holder
-
-    class return_note_attachment_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "return_note_attachment")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.return_note_attachment_Def.schema
-            TClist = [GTD("http://www.sugarcrm.com/sugarcrm","note_attachment",lazy=False)(pname="note_attachment", aname="_note_attachment", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","error_value",lazy=False)(pname="error", aname="_error", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._note_attachment = None
-                    self._error = None
-                    return
-            Holder.__name__ = "return_note_attachment_Holder"
-            self.pyclass = Holder
-
-    class user_auth_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "user_auth")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.user_auth_Def.schema
-            TClist = [ZSI.TC.String(pname="user_name", aname="_user_name", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="password", aname="_password", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="version", aname="_version", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._user_name = None
-                    self._password = None
-                    self._version = None
-                    return
-            Holder.__name__ = "user_auth_Holder"
-            self.pyclass = Holder
-
-    class field_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "field")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.field_Def.schema
-            TClist = [ZSI.TC.String(pname="name", aname="_name", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="type", aname="_type", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="label", aname="_label", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TCnumbers.Iint(pname="required", aname="_required", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","name_value_list",lazy=False)(pname="options", aname="_options", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._name = None
-                    self._type = None
-                    self._label = None
-                    self._required = None
-                    self._options = None
-                    return
-            Holder.__name__ = "field_Holder"
-            self.pyclass = Holder
-
-    class field_list_Def(ZSI.TC.Array, TypeDefinition):
-        #complexType/complexContent base="SOAP-ENC:Array"
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "field_list")
-        def __init__(self, pname, ofwhat=(), extend=False, restrict=False, attributes=None, **kw):
-            ofwhat = ns0.field_Def(None, typed=False)
-            atype = (u'http://www.sugarcrm.com/sugarcrm', u'field[]')
-            ZSI.TCcompound.Array.__init__(self, atype, ofwhat, pname=pname, childnames='item', **kw)
-
-    class name_value_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "name_value")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.name_value_Def.schema
-            TClist = [ZSI.TC.String(pname="name", aname="_name", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="value", aname="_value", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._name = None
-                    self._value = None
-                    return
-            Holder.__name__ = "name_value_Holder"
-            self.pyclass = Holder
-
-    class name_value_list_Def(ZSI.TC.Array, TypeDefinition):
-        #complexType/complexContent base="SOAP-ENC:Array"
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "name_value_list")
-        def __init__(self, pname, ofwhat=(), extend=False, restrict=False, attributes=None, **kw):
-            ofwhat = ns0.name_value_Def(None, typed=False)
-            atype = (u'http://www.sugarcrm.com/sugarcrm', u'name_value[]')
-            ZSI.TCcompound.Array.__init__(self, atype, ofwhat, pname=pname, childnames='item', **kw)
-
-    class name_value_lists_Def(ZSI.TC.Array, TypeDefinition):
-        #complexType/complexContent base="SOAP-ENC:Array"
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "name_value_lists")
-        def __init__(self, pname, ofwhat=(), extend=False, restrict=False, attributes=None, **kw):
-            ofwhat = ns0.name_value_list_Def(None, typed=False)
-            atype = (u'http://www.sugarcrm.com/sugarcrm', u'name_value_list[]')
-            ZSI.TCcompound.Array.__init__(self, atype, ofwhat, pname=pname, childnames='item', **kw)
-
-    class select_fields_Def(ZSI.TC.Array, TypeDefinition):
-        #complexType/complexContent base="SOAP-ENC:Array"
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "select_fields")
-        def __init__(self, pname, ofwhat=(), extend=False, restrict=False, attributes=None, **kw):
-            ofwhat = ZSI.TC.String(None, typed=False)
-            atype = (u'http://www.w3.org/2001/XMLSchema', u'string[]')
-            ZSI.TCcompound.Array.__init__(self, atype, ofwhat, pname=pname, childnames='item', **kw)
-
-    class module_fields_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "module_fields")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-           # ns = ns0.module_fields_Def.schema
-            TClist = [ZSI.TC.String(pname="module_name", aname="_module_name", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","field_list",lazy=False)(pname="module_fields", aname="_module_fields", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","error_value",lazy=False)(pname="error", aname="_error", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._module_name = None
-                    self._module_fields = None
-                    self._error = None
-                    return
-            Holder.__name__ = "module_fields_Holder"
-            self.pyclass = Holder
-
-    class module_list_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "module_list")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.module_list_Def.schema
-            TClist = [GTD("http://www.sugarcrm.com/sugarcrm","select_fields",lazy=False)(pname="modules", aname="_modules", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","error_value",lazy=False)(pname="error", aname="_error", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._modules = None
-                    self._error = None
-                    return
-            Holder.__name__ = "module_list_Holder"
-            self.pyclass = Holder
-
-    class error_value_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "error_value")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.error_value_Def.schema
-            TClist = [ZSI.TC.String(pname="number", aname="_number", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="name", aname="_name", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="description", aname="_description", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._number = None
-                    self._name = None
-                    self._description = None
-                    return
-            Holder.__name__ = "error_value_Holder"
-            self.pyclass = Holder
-
-    class entry_value_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "entry_value")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.entry_value_Def.schema
-            TClist = [ZSI.TC.String(pname="id", aname="_id", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="module_name", aname="_module_name", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","name_value_list",lazy=False)(pname="name_value_list", aname="_name_value_list", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._id = None
-                    self._module_name = None
-                    self._name_value_list = None
-                    return
-            Holder.__name__ = "entry_value_Holder"
-            self.pyclass = Holder
-
-    class entry_list_Def(ZSI.TC.Array, TypeDefinition):
-        #complexType/complexContent base="SOAP-ENC:Array"
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "entry_list")
-        def __init__(self, pname, ofwhat=(), extend=False, restrict=False, attributes=None, **kw):
-            ofwhat = ns0.entry_value_Def(None, typed=False)
-            atype = (u'http://www.sugarcrm.com/sugarcrm', u'entry_value[]')
-            ZSI.TCcompound.Array.__init__(self, atype, ofwhat, pname=pname, childnames='item', **kw)
-
-    class get_entry_list_result_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "get_entry_list_result")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.get_entry_list_result_Def.schema
-            TClist = [ZSI.TCnumbers.Iint(pname="result_count", aname="_result_count", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TCnumbers.Iint(pname="next_offset", aname="_next_offset", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","field_list",lazy=False)(pname="field_list", aname="_field_list", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","entry_list",lazy=False)(pname="entry_list", aname="_entry_list", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","error_value",lazy=False)(pname="error", aname="_error", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._result_count = None
-                    self._next_offset = None
-                    self._field_list = None
-                    self._entry_list = None
-                    self._error = None
-                    return
-            Holder.__name__ = "get_entry_list_result_Holder"
-            self.pyclass = Holder
-
-    class get_entry_result_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "get_entry_result")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.get_entry_result_Def.schema
-            TClist = [GTD("http://www.sugarcrm.com/sugarcrm","field_list",lazy=False)(pname="field_list", aname="_field_list", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","entry_list",lazy=False)(pname="entry_list", aname="_entry_list", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","error_value",lazy=False)(pname="error", aname="_error", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._field_list = None
-                    self._entry_list = None
-                    self._error = None
-                    return
-            Holder.__name__ = "get_entry_result_Holder"
-            self.pyclass = Holder
-
-    class set_entry_result_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "set_entry_result")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.set_entry_result_Def.schema
-            TClist = [ZSI.TC.String(pname="id", aname="_id", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","error_value",lazy=False)(pname="error", aname="_error", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._id = None
-                    self._error = None
-                    return
-            Holder.__name__ = "set_entry_result_Holder"
-            self.pyclass = Holder
-
-    class set_entries_result_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "set_entries_result")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.set_entries_result_Def.schema
-            TClist = [GTD("http://www.sugarcrm.com/sugarcrm","select_fields",lazy=False)(pname="ids", aname="_ids", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","error_value",lazy=False)(pname="error", aname="_error", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._ids = None
-                    self._error = None
-                    return
-            Holder.__name__ = "set_entries_result_Holder"
-            self.pyclass = Holder
-
-    class id_mod_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "id_mod")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.id_mod_Def.schema
-            TClist = [ZSI.TC.String(pname="id", aname="_id", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="date_modified", aname="_date_modified", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TCnumbers.Iint(pname="deleted", aname="_deleted", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._id = None
-                    self._date_modified = None
-                    self._deleted = None
-                    return
-            Holder.__name__ = "id_mod_Holder"
-            self.pyclass = Holder
-
-    class ids_mods_Def(ZSI.TC.Array, TypeDefinition):
-        #complexType/complexContent base="SOAP-ENC:Array"
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "ids_mods")
-        def __init__(self, pname, ofwhat=(), extend=False, restrict=False, attributes=None, **kw):
-            ofwhat = ns0.id_mod_Def(None, typed=False)
-            atype = (u'http://www.sugarcrm.com/sugarcrm', u'id_mod[]')
-            ZSI.TCcompound.Array.__init__(self, atype, ofwhat, pname=pname, childnames='item', **kw)
-
-    class get_relationships_result_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "get_relationships_result")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.get_relationships_result_Def.schema
-            TClist = [GTD("http://www.sugarcrm.com/sugarcrm","ids_mods",lazy=False)(pname="ids", aname="_ids", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","error_value",lazy=False)(pname="error", aname="_error", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._ids = None
-                    self._error = None
-                    return
-            Holder.__name__ = "get_relationships_result_Holder"
-            self.pyclass = Holder
-
-    class set_relationship_value_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "set_relationship_value")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.set_relationship_value_Def.schema
-            TClist = [ZSI.TC.String(pname="module1", aname="_module1", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="module1_id", aname="_module1_id", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="module2", aname="_module2", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="module2_id", aname="_module2_id", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._module1 = None
-                    self._module1_id = None
-                    self._module2 = None
-                    self._module2_id = None
-                    return
-            Holder.__name__ = "set_relationship_value_Holder"
-            self.pyclass = Holder
-
-    class set_relationship_list_Def(ZSI.TC.Array, TypeDefinition):
-        #complexType/complexContent base="SOAP-ENC:Array"
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "set_relationship_list")
-        def __init__(self, pname, ofwhat=(), extend=False, restrict=False, attributes=None, **kw):
-            ofwhat = ns0.set_relationship_value_Def(None, typed=False)
-            atype = (u'http://www.sugarcrm.com/sugarcrm', u'set_relationship_value[]')
-            ZSI.TCcompound.Array.__init__(self, atype, ofwhat, pname=pname, childnames='item', **kw)
-
-    class set_relationship_list_result_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "set_relationship_list_result")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.set_relationship_list_result_Def.schema
-            TClist = [ZSI.TCnumbers.Iint(pname="created", aname="_created", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TCnumbers.Iint(pname="failed", aname="_failed", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","error_value",lazy=False)(pname="error", aname="_error", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._created = None
-                    self._failed = None
-                    self._error = None
-                    return
-            Holder.__name__ = "set_relationship_list_result_Holder"
-            self.pyclass = Holder
-
-    class document_revision_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "document_revision")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.document_revision_Def.schema
-            TClist = [ZSI.TC.String(pname="id", aname="_id", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="document_name", aname="_document_name", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="revision", aname="_revision", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="filename", aname="_filename", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="file", aname="_file", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._id = None
-                    self._document_name = None
-                    self._revision = None
-                    self._filename = None
-                    self._file = None
-                    return
-            Holder.__name__ = "document_revision_Holder"
-            self.pyclass = Holder
-
-    class get_entry_list_result_encoded_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "get_entry_list_result_encoded")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-           # ns = ns0.get_entry_list_result_encoded_Def.schema
-            TClist = [ZSI.TCnumbers.Iint(pname="result_count", aname="_result_count", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TCnumbers.Iint(pname="next_offset", aname="_next_offset", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TCnumbers.Iint(pname="total_count", aname="_total_count", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","select_fields",lazy=False)(pname="field_list", aname="_field_list", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="entry_list", aname="_entry_list", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","error_value",lazy=False)(pname="error", aname="_error", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._result_count = None
-                    self._next_offset = None
-                    self._total_count = None
-                    self._field_list = None
-                    self._entry_list = None
-                    self._error = None
-                    return
-            Holder.__name__ = "get_entry_list_result_encoded_Holder"
-            self.pyclass = Holder
-
-    class get_sync_result_encoded_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "get_sync_result_encoded")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-           # ns = ns0.get_sync_result_encoded_Def.schema
-            TClist = [ZSI.TC.String(pname="result", aname="_result", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","error_value",lazy=False)(pname="error", aname="_error", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._result = None
-                    self._error = None
-                    return
-            Holder.__name__ = "get_sync_result_encoded_Holder"
-            self.pyclass = Holder
-
-    class get_quick_sync_result_encoded_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "get_quick_sync_result_encoded")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.get_quick_sync_result_encoded_Def.schema
-            TClist = [ZSI.TC.String(pname="result", aname="_result", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TCnumbers.Iint(pname="result_count", aname="_result_count", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TCnumbers.Iint(pname="next_offset", aname="_next_offset", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TCnumbers.Iint(pname="total_count", aname="_total_count", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","error_value",lazy=False)(pname="error", aname="_error", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._result = None
-                    self._result_count = None
-                    self._next_offset = None
-                    self._total_count = None
-                    self._error = None
-                    return
-            Holder.__name__ = "get_quick_sync_result_encoded_Holder"
-            self.pyclass = Holder
-
-    class return_document_revision_Def(ZSI.TCcompound.ComplexType, TypeDefinition):
-        schema = "http://www.sugarcrm.com/sugarcrm"
-        type = (schema, "return_document_revision")
-        def __init__(self, pname, ofwhat=(), attributes=None, extend=False, restrict=False, **kw):
-            #ns = ns0.return_document_revision_Def.schema
-            TClist = [GTD("http://www.sugarcrm.com/sugarcrm","document_revision",lazy=False)(pname="document_revision", aname="_document_revision", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), GTD("http://www.sugarcrm.com/sugarcrm","error_value",lazy=False)(pname="error", aname="_error", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded"))]
-            self.attribute_typecode_dict = attributes or {}
-            if extend: TClist += ofwhat
-            if restrict: TClist = ofwhat
-            ZSI.TCcompound.ComplexType.__init__(self, None, TClist, pname=pname, inorder=0, **kw)
-            class Holder:
-                __metaclass__ = pyclass_type
-                typecode = self
-                def __init__(self):
-                    # pyclass
-                    self._document_revision = None
-                    self._error = None
-                    return
-            Holder.__name__ = "return_document_revision_Holder"
-            self.pyclass = Holder
-
-# end class ns0 (tns: http://www.sugarcrm.com/sugarcrm)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_sugarcrm/wizard/import_message_view.xml b/addons/import_sugarcrm/wizard/import_message_view.xml
deleted file mode 100644
index cae8e9cabda..00000000000
--- a/addons/import_sugarcrm/wizard/import_message_view.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-    <!-- Import Message Form View -->
-        <record model="ir.ui.view" id="view_import_message_form">
-            <field name="name">import.message.form</field>
-            <field name="model">import.message</field>
-            <field name="arch" type="xml">
-                <form string="Import Message" version="7.0">
-                   <label colspan="4" nolabel="1" string="Data are importing, the process is running in the background, an email will be sent to the given email address if it was defined."/>
-                </form>
-            </field>
-        </record>
-
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index f6b042f364b..49600f63ddd 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -21,12 +21,12 @@
 
 
 {
-    "name" : "Knowledge Management System",
-    "version" : "1.0",
-    "depends" : ["base","base_setup"],
-    "author" : "OpenERP SA",
+    'name' : 'Knowledge Management System',
+    'version' : '1.0',
+    'depends' : ['base','base_setup'],
+    'author' : 'OpenERP SA',
     'category': 'Hidden/Dependency',
-    "description": """
+    'description': """
 Installer for knowledge-based Hidden.
 =====================================
 
@@ -34,17 +34,15 @@ Makes the Knowledge Application Configuration available from where you can insta
 document and Wiki based Hidden.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/knowledge_security.xml',
         'security/ir.model.access.csv',
         'knowledge_view.xml',
         'res_config_view.xml',
     ],
-    'demo_xml': ['knowledge_demo.xml'],
+    'demo': ['knowledge_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001278773815843749581',
     'images': ['images/1_config_knowledge.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/knowledge/i18n/ar.po b/addons/knowledge/i18n/ar.po
index 98ca036c616..6dad6809311 100644
--- a/addons/knowledge/i18n/ar.po
+++ b/addons/knowledge/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/bg.po b/addons/knowledge/i18n/bg.po
index 1baad7ea77e..767e9bc3099 100644
--- a/addons/knowledge/i18n/bg.po
+++ b/addons/knowledge/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/ca.po b/addons/knowledge/i18n/ca.po
index f5a73abe934..060db5c6a52 100644
--- a/addons/knowledge/i18n/ca.po
+++ b/addons/knowledge/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/cs.po b/addons/knowledge/i18n/cs.po
index 2918863fae3..105d19a9457 100644
--- a/addons/knowledge/i18n/cs.po
+++ b/addons/knowledge/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: knowledge
diff --git a/addons/knowledge/i18n/da.po b/addons/knowledge/i18n/da.po
index eb1d7785457..139f4a716ca 100644
--- a/addons/knowledge/i18n/da.po
+++ b/addons/knowledge/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/de.po b/addons/knowledge/i18n/de.po
index 5883cdc7d8f..55df0b8000f 100644
--- a/addons/knowledge/i18n/de.po
+++ b/addons/knowledge/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/en_GB.po b/addons/knowledge/i18n/en_GB.po
index 9f888c23345..13aa0e454a9 100644
--- a/addons/knowledge/i18n/en_GB.po
+++ b/addons/knowledge/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/es.po b/addons/knowledge/i18n/es.po
index a0f94867f64..8653e5c4220 100644
--- a/addons/knowledge/i18n/es.po
+++ b/addons/knowledge/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/es_AR.po b/addons/knowledge/i18n/es_AR.po
index 55c5df202c0..5063e7e787b 100644
--- a/addons/knowledge/i18n/es_AR.po
+++ b/addons/knowledge/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/es_CR.po b/addons/knowledge/i18n/es_CR.po
index 5f7c0927052..01ff709c0a2 100644
--- a/addons/knowledge/i18n/es_CR.po
+++ b/addons/knowledge/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: knowledge
diff --git a/addons/knowledge/i18n/et.po b/addons/knowledge/i18n/et.po
index c3584f1a23c..579934ef6c9 100644
--- a/addons/knowledge/i18n/et.po
+++ b/addons/knowledge/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/fi.po b/addons/knowledge/i18n/fi.po
index f5e677461a1..0582a89388d 100644
--- a/addons/knowledge/i18n/fi.po
+++ b/addons/knowledge/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/fr.po b/addons/knowledge/i18n/fr.po
index b5189ba7117..421f82bb8f0 100644
--- a/addons/knowledge/i18n/fr.po
+++ b/addons/knowledge/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/gl.po b/addons/knowledge/i18n/gl.po
index dc24ea903f2..4efaa4c20a0 100644
--- a/addons/knowledge/i18n/gl.po
+++ b/addons/knowledge/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/hi.po b/addons/knowledge/i18n/hi.po
index bbb6539b2df..660adaa400c 100644
--- a/addons/knowledge/i18n/hi.po
+++ b/addons/knowledge/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/hr.po b/addons/knowledge/i18n/hr.po
index 1d3474b1dc5..8b8c8a59789 100644
--- a/addons/knowledge/i18n/hr.po
+++ b/addons/knowledge/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/hu.po b/addons/knowledge/i18n/hu.po
index 8330d694443..1f7aa595b55 100644
--- a/addons/knowledge/i18n/hu.po
+++ b/addons/knowledge/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/it.po b/addons/knowledge/i18n/it.po
index 534732a8335..9285d337ae4 100644
--- a/addons/knowledge/i18n/it.po
+++ b/addons/knowledge/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/ja.po b/addons/knowledge/i18n/ja.po
index 4621d95f718..fc955131944 100644
--- a/addons/knowledge/i18n/ja.po
+++ b/addons/knowledge/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/lo.po b/addons/knowledge/i18n/lo.po
index 5dabe96bfa5..1413e610012 100644
--- a/addons/knowledge/i18n/lo.po
+++ b/addons/knowledge/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/lv.po b/addons/knowledge/i18n/lv.po
index 1f3f40378e6..f869a65175e 100644
--- a/addons/knowledge/i18n/lv.po
+++ b/addons/knowledge/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/mn.po b/addons/knowledge/i18n/mn.po
index 3c83287a7ea..01e704db917 100644
--- a/addons/knowledge/i18n/mn.po
+++ b/addons/knowledge/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/nb.po b/addons/knowledge/i18n/nb.po
index 65487e82e1a..ba0a8e33a6a 100644
--- a/addons/knowledge/i18n/nb.po
+++ b/addons/knowledge/i18n/nb.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
 msgid "Collaborative Content"
-msgstr ""
+msgstr "Samarbeidende innhold"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
diff --git a/addons/knowledge/i18n/nl.po b/addons/knowledge/i18n/nl.po
index cc82bb59dba..492d62be124 100644
--- a/addons/knowledge/i18n/nl.po
+++ b/addons/knowledge/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/nl_BE.po b/addons/knowledge/i18n/nl_BE.po
new file mode 100644
index 00000000000..c8d870cffc5
--- /dev/null
+++ b/addons/knowledge/i18n/nl_BE.po
@@ -0,0 +1,33 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-10-02 07:31+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <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: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr "Gemeenschappelijke inhoud"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "Instellingen"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr "Kennis"
diff --git a/addons/knowledge/i18n/pl.po b/addons/knowledge/i18n/pl.po
index de89dfffd15..dc8c3b347e6 100644
--- a/addons/knowledge/i18n/pl.po
+++ b/addons/knowledge/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/pt.po b/addons/knowledge/i18n/pt.po
index 4eac22b22db..e9c69a328ba 100644
--- a/addons/knowledge/i18n/pt.po
+++ b/addons/knowledge/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/pt_BR.po b/addons/knowledge/i18n/pt_BR.po
index 44aa7a9b8c5..23e741eb2cc 100644
--- a/addons/knowledge/i18n/pt_BR.po
+++ b/addons/knowledge/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
@@ -25,7 +25,7 @@ msgstr "Conteúdo Colaborativo"
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
-msgstr "Configuração."
+msgstr "Configuração"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document
diff --git a/addons/knowledge/i18n/ro.po b/addons/knowledge/i18n/ro.po
index b386102b4b2..e94055bae40 100644
--- a/addons/knowledge/i18n/ro.po
+++ b/addons/knowledge/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/ru.po b/addons/knowledge/i18n/ru.po
index 41e3d0b49d0..e23af69ca84 100644
--- a/addons/knowledge/i18n/ru.po
+++ b/addons/knowledge/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/sk.po b/addons/knowledge/i18n/sk.po
index 1e647b2c8a5..9fa6d6e1e60 100644
--- a/addons/knowledge/i18n/sk.po
+++ b/addons/knowledge/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/sr.po b/addons/knowledge/i18n/sr.po
index 5e02d1d0301..010ad182a1a 100644
--- a/addons/knowledge/i18n/sr.po
+++ b/addons/knowledge/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/sr@latin.po b/addons/knowledge/i18n/sr@latin.po
index 78c0ae12f4d..9fc48f0f919 100644
--- a/addons/knowledge/i18n/sr@latin.po
+++ b/addons/knowledge/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/sv.po b/addons/knowledge/i18n/sv.po
index 4783eab3d85..5db2a5df937 100644
--- a/addons/knowledge/i18n/sv.po
+++ b/addons/knowledge/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/tr.po b/addons/knowledge/i18n/tr.po
index f1e1c2c920f..51d382b0b19 100644
--- a/addons/knowledge/i18n/tr.po
+++ b/addons/knowledge/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/zh_CN.po b/addons/knowledge/i18n/zh_CN.po
index d6703a38dbf..6d0289f4cad 100644
--- a/addons/knowledge/i18n/zh_CN.po
+++ b/addons/knowledge/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/zh_TW.po b/addons/knowledge/i18n/zh_TW.po
new file mode 100644
index 00000000000..8cfc713739e
--- /dev/null
+++ b/addons/knowledge/i18n/zh_TW.po
@@ -0,0 +1,33 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-19 10:38+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document2
+msgid "Collaborative Content"
+msgstr "協作內容"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "設置"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr "知識"
diff --git a/addons/knowledge/res_config.py b/addons/knowledge/res_config.py
index 7d9f161701b..012bd670ee3 100644
--- a/addons/knowledge/res_config.py
+++ b/addons/knowledge/res_config.py
@@ -25,16 +25,16 @@ class knowledge_config_settings(osv.osv_memory):
     _name = 'knowledge.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_document_page': fields.boolean('create static web pages',
+        'module_document_page': fields.boolean('Create static web pages',
             help="""This installs the module document_page."""),
-        'module_document': fields.boolean('manage documents',
+        'module_document': fields.boolean('Manage documents',
             help="""This is a complete document management system, with: user authentication,
                 full document search (but pptx and docx are not supported), and a document dashboard.
                 This installs the module document."""),
-        'module_document_ftp': fields.boolean('share repositories (FTP)',
+        'module_document_ftp': fields.boolean('Share repositories (FTP)',
             help="""Access your documents in OpenERP through an FTP interface.
                 This installs the module document_ftp."""),
-        'module_document_webdav': fields.boolean('share repositories (WebDAV)',
+        'module_document_webdav': fields.boolean('Share repositories (WebDAV)',
             help="""Access your documents in OpenERP through WebDAV.
                 This installs the module document_webdav."""),
     }
diff --git a/addons/l10n_ar/__openerp__.py b/addons/l10n_ar/__openerp__.py
index ef04805d1b0..2546e1f6bb4 100644
--- a/addons/l10n_ar/__openerp__.py
+++ b/addons/l10n_ar/__openerp__.py
@@ -17,34 +17,30 @@
 #    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": "Argentina Localization Chart Account",
-    "version": "1.0",
-    "description": """
+    'name': 'Argentina Localization Chart Account',
+    'version': '1.0',
+    'description': """
 Argentinian accounting chart and tax localization.
+==================================================
 
 Plan contable argentino e impuestos de acuerdo a disposiciones vigentes
 
     """,
-    "author": ["Cubic ERP"],
-    "website": "http://cubicERP.com",
-    "category": "Localization/Account Charts",
-    "depends": [
-			"account_chart",
-			],
-	"data":[
-        "account_tax_code.xml",
-        "l10n_ar_chart.xml",
-        "account_tax.xml",
-        "l10n_ar_wizard.xml",			
-			],
-    "demo_xml": [
-			],
-    "update_xml": [
-			],
-    "active": False,
-    "installable": True,
+    'author': ['Cubic ERP'],
+    'website': 'http://cubicERP.com',
+    'category': 'Localization/Account Charts',
+    'depends': ['account_chart'],
+    'data':[
+        'account_tax_code.xml',
+        'l10n_ar_chart.xml',
+        'account_tax.xml',
+        'l10n_ar_wizard.xml',
+    ],
+    'demo': [],
+    'active': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_ar.jpeg','images/l10n_ar_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ar/i18n/es.po b/addons/l10n_ar/i18n/es.po
index 097598864fe..ed67f04345d 100644
--- a/addons/l10n_ar/i18n/es.po
+++ b/addons/l10n_ar/i18n/es.po
@@ -1,72 +1,54 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-10 13:46+0000\n"
-"Last-Translator: Yury Tello <ytello@cubicerp.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: 2011-01-15 05:56+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
-
-#. module: l10n_ar
-#: model:ir.module.module,description:l10n_ar.module_meta_information
-msgid ""
-"\n"
-"    Argentinian Accounting : chart of Account\n"
-"    "
-msgstr ""
-"\n"
-"    Contabilidad Peruana : Plan de cuentas\n"
-"    "
-
-#. module: l10n_ar
-#: model:ir.module.module,shortdesc:l10n_ar.module_meta_information
-msgid "Argentinian Chart of Account"
-msgstr "Plan de cuentas de Argentina"
-
-#. module: l10n_ar
-#: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal
-msgid ""
-"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-"the name of the company, the chart template to follow, the no. of digits to "
-"generate the code for your accounts and Bank account, currency to create "
-"Journals. Thus,the pure copy of chart Template is generated.\n"
-"\tThis is the same wizard that runs from Financial "
-"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-"Chart of Accounts from a Chart Template."
-msgstr ""
-"Generar el plan contable a partir de una plantilla de plan contable. Se le "
-"pedirá el nombre de la compañia, la plantilla de plan contable a utilizar, "
-"el número de dígitos para generar el código de las cuentas y de la cuenta "
-"bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
-"exacta de la plantilla de plan contable.\n"
-"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
-"Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
-"plan contable a partir de una plantilla de plan contable."
-
-#~ msgid "Liability"
-#~ msgstr "Pasivo"
-
-#~ msgid "Asset"
-#~ msgstr "Activo"
-
-#~ msgid "Closed"
-#~ msgstr "Cerrado"
-
-#~ msgid "Income"
-#~ msgstr "Ingreso"
-
-#~ msgid "Expense"
-#~ msgstr "Gasto"
-
-#~ msgid "View"
-#~ msgstr "Vista"
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2012-10-18 15:51+0000\n"
+"Last-Translator: Cubic ERP <ytello@cubicerp.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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_ar
+#: model:ir.module.module,description:l10n_ar.module_meta_information
+msgid ""
+"\n"
+"    Argentinian Accounting : chart of Account\n"
+"    "
+msgstr ""
+"\n"
+"    Contabilidad Peruana : Plan de cuentas\n"
+"    "
+
+#. module: l10n_ar
+#: model:ir.module.module,shortdesc:l10n_ar.module_meta_information
+msgid "Argentinian Chart of Account"
+msgstr "Plan de cuentas de Argentina"
+
+#. module: l10n_ar
+#: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generar el plan contable a partir de una plantilla de plan contable. Se le "
+"pedirá el nombre de la compañia, la plantilla de plan contable a utilizar, "
+"el número de dígitos para generar el código de las cuentas y de la cuenta "
+"bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
+"exacta de la plantilla de plan contable.\n"
+"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
+"Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
+"plan contable a partir de una plantilla de plan contable."
diff --git a/addons/l10n_ar/i18n/es_AR.po b/addons/l10n_ar/i18n/es_AR.po
index 2260a43cf74..1f2b2dd250a 100644
--- a/addons/l10n_ar/i18n/es_AR.po
+++ b/addons/l10n_ar/i18n/es_AR.po
@@ -1,21 +1,21 @@
-# Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Spanish (Argentina) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-21 16:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish (Paraguay) <es_PY@li.org>\n"
+"PO-Revision-Date: 2012-11-13 15:04+0000\n"
+"Last-Translator: Eduardo Alberto Calvo <Unknown>\n"
+"Language-Team: Spanish (Argentina) <es_AR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-22 04:36+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2012-11-14 04:40+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
 
 #. module: l10n_ar
 #: model:ir.module.module,description:l10n_ar.module_meta_information
@@ -31,7 +31,7 @@ msgstr ""
 #. module: l10n_ar
 #: model:ir.module.module,shortdesc:l10n_ar.module_meta_information
 msgid "Argentinian Chart of Account"
-msgstr "Plan de cuentas de la Argentina"
+msgstr "Plan de cuentas de Argentina"
 
 #. module: l10n_ar
 #: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal
@@ -45,7 +45,7 @@ msgid ""
 "Chart of Accounts from a Chart Template."
 msgstr ""
 "Generar el plan contable a partir de una plantilla de plan contable. Se le "
-"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, "
+"pedirá el nombre de la compañia, la plantilla de plan contable a utilizar, "
 "el número de dígitos para generar el código de las cuentas y de la cuenta "
 "bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
 "exacta de la plantilla de plan contable.\n"
diff --git a/addons/l10n_ar/i18n/zh_CN.po b/addons/l10n_ar/i18n/zh_CN.po
new file mode 100644
index 00000000000..1190e4fa511
--- /dev/null
+++ b/addons/l10n_ar/i18n/zh_CN.po
@@ -0,0 +1,46 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2012-11-02 15:23+0000\n"
+"Last-Translator: 杨清云 <13836962@qq.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: 2012-11-03 05:04+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
+
+#. module: l10n_ar
+#: model:ir.module.module,description:l10n_ar.module_meta_information
+msgid ""
+"\n"
+"    Argentinian Accounting : chart of Account\n"
+"    "
+msgstr ""
+"\n"
+"    阿根廷会计：会计科目表\n"
+"    "
+
+#. module: l10n_ar
+#: model:ir.module.module,shortdesc:l10n_ar.module_meta_information
+msgid "Argentinian Chart of Account"
+msgstr "阿根廷科目表"
+
+#. module: l10n_ar
+#: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
diff --git a/addons/l10n_ar/l10n_ar_wizard.xml b/addons/l10n_ar/l10n_ar_wizard.xml
index 9a2fa377155..82e7671b4d3 100644
--- a/addons/l10n_ar/l10n_ar_wizard.xml
+++ b/addons/l10n_ar/l10n_ar_wizard.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
-		<record id="config_call_account_template_ar" model="ir.actions.todo">
-	        <field name="name">Generate Chart of Accounts from a Chart Template</field>
-	        <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
-    	</record>
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py
index fc266e40d51..e9fdd4bf8fd 100644
--- a/addons/l10n_at/__openerp__.py
+++ b/addons/l10n_at/__openerp__.py
@@ -20,20 +20,21 @@
 ##############################################################################
 
 {
-    "name" : "Austria - Accounting",
-    "version" : "1.0",
-    "author" : "conexus.at",
-    "website" : "http://www.conexus.at",
-    "category" : "Localization/Account Charts",
-    "depends" : ["account_chart", 'base_vat'],
-    "description": """
-This module provides the standard Accounting Chart for Austria which is based on
-the Template from BMF.gv.at. Please keep in mind that you should review and adapt
-it with your Accountant, before using it in a live Environment.""",
-    "demo_xml" : [],
-    "update_xml" : ['account_tax_code.xml',"account_chart.xml",'account_tax.xml',"l10n_chart_at_wizard.xml"],
-    "auto_install": False,
-    "installable": True
+    'name': 'Austria - Accounting',
+    'version': '1.0',
+    'author': 'conexus.at',
+    'website': 'http://www.conexus.at',
+    'category': 'Localization/Account Charts',
+    'depends': ['account_chart', 'base_vat'],
+    'description': """
+This module provides the standard Accounting Chart for Austria which is based on the Template from BMF.gv.at.
+============================================================================================================= 
+Please keep in mind that you should review and adapt it with your Accountant, before using it in a live Environment.
+""",
+    'demo': [],
+    'data': ['account_tax_code.xml','account_chart.xml','account_tax.xml','l10n_chart_at_wizard.xml'],
+    'auto_install': False,
+    'installable': True
 }
 
 
diff --git a/addons/l10n_at/l10n_chart_at_wizard.xml b/addons/l10n_at/l10n_chart_at_wizard.xml
index b23d9be6cb5..19d27fb47c7 100644
--- a/addons/l10n_at/l10n_chart_at_wizard.xml
+++ b/addons/l10n_at/l10n_chart_at_wizard.xml
@@ -1,12 +1,8 @@
 <openerp>
-    <data>
+    <data noupdate="1">
 
-        <record id="config_call_account_template_at" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
 
     </data>
diff --git a/addons/l10n_be/__init__.py b/addons/l10n_be/__init__.py
index 1b2677d295e..e994d524775 100644
--- a/addons/l10n_be/__init__.py
+++ b/addons/l10n_be/__init__.py
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-import company
 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/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index 1f4bcfe6284..a956ea7ebe0 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-{   'name': 'Belgium - Accounting',
+{   
+    'name': 'Belgium - Accounting',
     'version': '1.1',
     'category': 'Localization/Account Charts',
     'description': """
@@ -34,16 +35,20 @@ After installing this module, the Configuration wizard for accounting is launche
 Thus, the pure copy of Chart Template is generated.
 
 Wizards provided by this module:
+--------------------------------
     * Partner VAT Intra: Enlist the partners with their related VAT and invoiced
       amounts. Prepares an XML file format.
-            Path to access : Invoicing/Reporting/Legal Reports/Belgium Statements/Partner VAT Intra
+      
+        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium Statements/Partner VAT Intra
     * Periodical VAT Declaration: Prepares an XML file for Vat Declaration of
       the Main company of the User currently Logged in.
-            Path to access : Invoicing/Reporting/Legal Reports/Belgium Statements/Periodical VAT Declaration
+      
+        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium Statements/Periodical VAT Declaration
     * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for Vat
       Declaration of the Main company of the User currently Logged in Based on
       Fiscal year.
-            Path to access : Invoicing/Reporting/Legal Reports/Belgium Statements/Annual Listing Of VAT-Subjected Customers
+      
+        **Path to access :** Invoicing/Reporting/Legal Reports/Belgium Statements/Annual Listing Of VAT-Subjected Customers
 
     """,
     'author': 'Noviat & OpenERP SA',
@@ -52,10 +57,9 @@ Wizards provided by this module:
         'base_vat',
         'base_iban',
         'account_chart',
-        'account_coda',
+        'l10n_be_coda',
     ],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'account_financial_report.xml',
         'account_pcmn_belgium.xml',
         'account_tax_code_template.xml',
@@ -70,9 +74,8 @@ Wizards provided by this module:
         'security/ir.model.access.csv',
         'l10n_be_wizard.yml'
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
-    'certificate': '0031977724637',
     'images': ['images/1_config_chart_l10n_be.jpeg','images/2_l10n_be_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/company.py b/addons/l10n_be/company.py
deleted file mode 100644
index 118696ec9f6..00000000000
--- a/addons/l10n_be/company.py
+++ /dev/null
@@ -1,45 +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
-
-class res_company(osv.osv):
-    _inherit = "res.company"
-    _description = 'Company'
-
-    def _get_default_ad(self, addresses):
-        name = email = phone = city = post_code = address = country_code = ""
-        for ads in addresses:
-            if ads.type == 'default':
-                city = ads.city or ""
-                post_code = ads.zip or ""
-                if ads.street:
-                    address = ads.street or ""
-                if ads.street2:
-                    address += " " + ads.street2
-                if ads.country_id:
-                    country_code = ads.country_id and ads.country_id.code or ""
-                name = ads.name or ""
-                email = ads.email or ""
-                phone = ads.phone or ""
-        return name, email, phone, city, post_code, address, country_code
-res_company()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be/i18n/ar.po b/addons/l10n_be/i18n/ar.po
index 834e29950fd..58ef6bf69be 100644
--- a/addons/l10n_be/i18n/ar.po
+++ b/addons/l10n_be/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/bg.po b/addons/l10n_be/i18n/bg.po
index 8e2933c2121..7efa3e4f5fa 100644
--- a/addons/l10n_be/i18n/bg.po
+++ b/addons/l10n_be/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/bs.po b/addons/l10n_be/i18n/bs.po
index 15190075a8b..20b362a4a5e 100644
--- a/addons/l10n_be/i18n/bs.po
+++ b/addons/l10n_be/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/ca.po b/addons/l10n_be/i18n/ca.po
index 7a3c201adf1..1cfe34e8208 100644
--- a/addons/l10n_be/i18n/ca.po
+++ b/addons/l10n_be/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/cs.po b/addons/l10n_be/i18n/cs.po
index 4dbb6ac93c2..fe6e6ee7cca 100644
--- a/addons/l10n_be/i18n/cs.po
+++ b/addons/l10n_be/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/da.po b/addons/l10n_be/i18n/da.po
index fd58b6a3fd3..c3a583e0195 100644
--- a/addons/l10n_be/i18n/da.po
+++ b/addons/l10n_be/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/de.po b/addons/l10n_be/i18n/de.po
index 352a54f12d6..39ab12b003b 100644
--- a/addons/l10n_be/i18n/de.po
+++ b/addons/l10n_be/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/en_GB.po b/addons/l10n_be/i18n/en_GB.po
index 47cf8f73f02..64424b4bffc 100644
--- a/addons/l10n_be/i18n/en_GB.po
+++ b/addons/l10n_be/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/es.po b/addons/l10n_be/i18n/es.po
index e614022347d..762b3eec986 100644
--- a/addons/l10n_be/i18n/es.po
+++ b/addons/l10n_be/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/es_AR.po b/addons/l10n_be/i18n/es_AR.po
index 66147ee3330..d5e3a26d57b 100644
--- a/addons/l10n_be/i18n/es_AR.po
+++ b/addons/l10n_be/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/es_CR.po b/addons/l10n_be/i18n/es_CR.po
index 19d82f0d0d5..3d851e000cc 100644
--- a/addons/l10n_be/i18n/es_CR.po
+++ b/addons/l10n_be/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: l10n_be
diff --git a/addons/l10n_be/i18n/et.po b/addons/l10n_be/i18n/et.po
index 6bc8a1ec234..d1ff6367002 100644
--- a/addons/l10n_be/i18n/et.po
+++ b/addons/l10n_be/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/fi.po b/addons/l10n_be/i18n/fi.po
index 7cfb8f01402..96499a476e2 100644
--- a/addons/l10n_be/i18n/fi.po
+++ b/addons/l10n_be/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/fr.po b/addons/l10n_be/i18n/fr.po
index 223cbcd2bbb..62c7c1351a3 100644
--- a/addons/l10n_be/i18n/fr.po
+++ b/addons/l10n_be/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/gl.po b/addons/l10n_be/i18n/gl.po
index 344510b42ee..12fa51a47fd 100644
--- a/addons/l10n_be/i18n/gl.po
+++ b/addons/l10n_be/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/hr.po b/addons/l10n_be/i18n/hr.po
index 817dbcea70b..fd3a5902d77 100644
--- a/addons/l10n_be/i18n/hr.po
+++ b/addons/l10n_be/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/hu.po b/addons/l10n_be/i18n/hu.po
index 2a7c3da3577..d29934db763 100644
--- a/addons/l10n_be/i18n/hu.po
+++ b/addons/l10n_be/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/id.po b/addons/l10n_be/i18n/id.po
index 2a1660b6b35..bfdd0acbcfa 100644
--- a/addons/l10n_be/i18n/id.po
+++ b/addons/l10n_be/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/it.po b/addons/l10n_be/i18n/it.po
index 36ff406dc5e..d9068e6f2f0 100644
--- a/addons/l10n_be/i18n/it.po
+++ b/addons/l10n_be/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/ja.po b/addons/l10n_be/i18n/ja.po
index ad08349f15b..30a1051c852 100644
--- a/addons/l10n_be/i18n/ja.po
+++ b/addons/l10n_be/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/ko.po b/addons/l10n_be/i18n/ko.po
index 4574dde5090..1a203c272f6 100644
--- a/addons/l10n_be/i18n/ko.po
+++ b/addons/l10n_be/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/lt.po b/addons/l10n_be/i18n/lt.po
index 2a7c3da3577..d29934db763 100644
--- a/addons/l10n_be/i18n/lt.po
+++ b/addons/l10n_be/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/nl.po b/addons/l10n_be/i18n/nl.po
index e0696afea4f..f2cc940f460 100644
--- a/addons/l10n_be/i18n/nl.po
+++ b/addons/l10n_be/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-23 09:56+0000\n"
 "PO-Revision-Date: 2012-02-09 11:35+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/nl_BE.po b/addons/l10n_be/i18n/nl_BE.po
index 32ee7826130..88ae7cd0855 100644
--- a/addons/l10n_be/i18n/nl_BE.po
+++ b/addons/l10n_be/i18n/nl_BE.po
@@ -1,30 +1,33 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* l10n_be
-#
+# * l10n_be
+# Els Van Vossel <evv@agaplan.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-23 09:56+0000\n"
-"PO-Revision-Date: 2009-02-03 14:48+0000\n"
-"Last-Translator: Niels Huylebroeck <Unknown>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2012-10-01 14:57+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
+"Language-Team: Els Van Vossel\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+"Language: nl\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
 msgid "Test XML file"
-msgstr "Test XML bestand"
+msgstr "Test XML-bestand"
 
 #. module: l10n_be
 #: view:partner.vat.list_13:0
 msgid "You can remove customers which you do not want in exported xml file"
 msgstr ""
+"U kunt klanten die u niet wilt, verwijderen uit het geëxporteerde xml-"
+"bestand."
 
 #. module: l10n_be
 #: view:partner.vat_13:0
@@ -32,34 +35,36 @@ msgid ""
 "This wizard will create an XML file for VAT details and total invoiced "
 "amounts per partner."
 msgstr ""
+"Deze assistent zal een XML-bestand maken met de btw-gegevens en totaal "
+"gefactureerde bedragen per relatie."
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tiers_receiv
 msgid "Tiers - Recevable"
-msgstr ""
+msgstr "Derden - te ontvangen"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:102
 #, python-format
 msgid "Wrong Period Code"
-msgstr ""
+msgstr "Verkeerde periode"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:52
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:109
 #, python-format
 msgid "No partner has a VAT Number asociated with him."
-msgstr ""
+msgstr "Er is geen relatie met een btw-nummer."
 
 #. module: l10n_be
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "U kunt niet dezelfde bedrijven maken."
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tiers
 msgid "Tiers"
-msgstr ""
+msgstr "Derde"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,period_id:0
@@ -69,18 +74,18 @@ msgstr "Periode"
 #. module: l10n_be
 #: field:partner.vat.intra,period_ids:0
 msgid "Period (s)"
-msgstr ""
+msgstr "Periode(n)"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 #: view:partner.vat.intra:0
 msgid "Save the File with '.xml' extension."
-msgstr ""
+msgstr "Bestand opslaan met '.xml'-extensie"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_charge
 msgid "Charge"
-msgstr ""
+msgstr "Kosten"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:47
@@ -89,13 +94,13 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:109
 #, python-format
 msgid "Data Insufficient!"
-msgstr ""
+msgstr "Onvoldoende gegevens"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 #: view:partner.vat.list_13:0
 msgid "Create XML"
-msgstr "XML Aanmaken"
+msgstr "XML maken"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_capitaux
@@ -105,23 +110,23 @@ msgstr "Kapitaal"
 #. module: l10n_be
 #: view:partner.vat.list_13:0
 msgid "Print"
-msgstr ""
+msgstr "Afdrukken"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "Save XML"
-msgstr ""
+msgstr "XML opslaan"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:219
 #, python-format
 msgid "Save"
-msgstr ""
+msgstr "Opslaan"
 
 #. module: l10n_be
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "De firmanaam moet uniek zijn"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
@@ -133,65 +138,65 @@ msgstr "Bestand aangemaakt"
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "_Close"
-msgstr ""
+msgstr "_Sluiten"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:131
 #, python-format
 msgid "Save XML For Vat declaration"
-msgstr ""
+msgstr "XML voor btw-aangifte opslaan"
 
 #. module: l10n_be
 #: view:partner.vat.list_13:0
 msgid "Customers"
-msgstr ""
+msgstr "Klanten"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tax_in
 msgid "Taxes à l'entrée"
-msgstr ""
+msgstr "Te ontvangen btw"
 
 #. module: l10n_be
 #: help:l1on_be.vat.declaration,ask_restitution:0
 msgid "It indicates whether a resitution is to made or not?"
-msgstr ""
+msgstr "Het geeft aan of een teruggave nodig is of niet"
 
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_declaration
 msgid "Vat Declaraion"
-msgstr ""
+msgstr "Btw-aangifte"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
 #: field:partner.vat.intra,no_vat:0
 msgid "Partner With No VAT"
-msgstr ""
+msgstr "Relatie zonder btw"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_immo
 msgid "Immobilisation"
-msgstr "Onroerende goederen"
+msgstr "Activa"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 #: view:partner.vat.intra:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_13
 msgid "partner.vat_13"
-msgstr ""
+msgstr "partner.vat_13"
 
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.partner_vat_listing
 msgid "Annual Listing Of VAT-Subjected Customers"
-msgstr ""
+msgstr "Jaarlijke klantenlisting"
 
 #. module: l10n_be
 #: view:partner.vat.list_13:0
 msgid "XML File has been Created."
-msgstr "XML bestand is aangemaakt"
+msgstr "XML-bestand is gemaakt."
 
 #. module: l10n_be
 #: help:l1on_be.vat.declaration,client_nihil:0
@@ -199,64 +204,66 @@ msgid ""
 "Tick this case only if it concerns only the last statement on the civil or "
 "cessation of activity"
 msgstr ""
+"Dit vakje alleen inschakelen als het gaat om de laatste aangifte van het "
+"boekjaar of om de stopzetting van een activiteit."
 
 #. module: l10n_be
 #: view:partner.vat.list_13:0
 msgid "Select Fiscal Year"
-msgstr "Selecteer Fiscaaljaar"
+msgstr "Selecteer boekjaar"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,ask_restitution:0
 msgid "Ask Restitution"
-msgstr ""
+msgstr "Teruggave"
 
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_intra
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_intra
 msgid "Partner VAT Intra"
-msgstr ""
+msgstr "Intracommunautaire opgave"
 
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.l10_be_vat_declaration
 #: view:l1on_be.vat.declaration:0
 msgid "Periodical VAT Declaration"
-msgstr ""
+msgstr "Periodieke btw-aangifte"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "Note: "
-msgstr ""
+msgstr "Opmerking: "
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "_Preview"
-msgstr ""
+msgstr "_Voorbeeld"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tiers_payable
 msgid "Tiers - Payable"
-msgstr ""
+msgstr "Derden - te betalen"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,tax_code_id:0
 #: field:partner.vat.intra,tax_code_id:0
 msgid "Tax Code"
-msgstr ""
+msgstr "Btw-code"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "Periods"
-msgstr ""
+msgstr "Perioden"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_produit
 msgid "Produit"
-msgstr "Product"
+msgstr "Opbrengsten"
 
 #. module: l10n_be
 #: help:partner.vat.intra,test_xml:0
 msgid "Sets the XML output as test file"
-msgstr ""
+msgstr "Maakt een testbestand in xml"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_view
@@ -266,18 +273,19 @@ msgstr "Weergave"
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 msgid "Ok"
-msgstr "Ok"
+msgstr "OK"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,ask_payment:0
 msgid "Ask Payment"
-msgstr ""
+msgstr "Betaling vragen"
 
 #. module: l10n_be
 #: help:partner.vat.intra,no_vat:0
 msgid ""
 "The Partner whose VAT number is not defined they doesn't include in XML File."
 msgstr ""
+"Een relatie zonder btw-nummer wordt niet opgenomen in het xml-bestand."
 
 #. module: l10n_be
 #: field:partner.vat_13,limit_amount:0
@@ -287,44 +295,44 @@ msgstr "Bestedingslimiet"
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Bedrijven"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "Create _XML"
-msgstr ""
+msgstr "_XML maken"
 
 #. module: l10n_be
 #: help:partner.vat.intra,period_ids:0
 msgid ""
 "Select here the period(s) you want to include in your intracom declaration"
-msgstr ""
+msgstr "Kies hier de periode(n) voor uw intracommunautaire opgave"
 
 #. module: l10n_be
 #: view:partner.vat_13:0
 msgid "View Customers"
-msgstr ""
+msgstr "Klanten bekijken"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:102
 #, python-format
 msgid "The period code you entered is not valid."
-msgstr ""
+msgstr "De periode die u heeft ingevoerd, is onjuist."
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 msgid "Is Last Declaration"
-msgstr ""
+msgstr "Laatste aangifte"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_stock
 msgid "Stock et Encours"
-msgstr ""
+msgstr "Voorraden in bestelling"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,client_nihil:0
 msgid "Last Declaration of Enterprise"
-msgstr ""
+msgstr "Laatste aangifte van bedrijf"
 
 #. module: l10n_be
 #: help:partner.vat.intra,mand_id:0
@@ -332,6 +340,8 @@ msgid ""
 "This identifies the representative of the sending company. This is a string "
 "of 14 characters"
 msgstr ""
+"Identificatie van de vertegenwoordiger van de verzender. Dit is een reeks "
+"van 14 tekens."
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:75
@@ -339,37 +349,37 @@ msgstr ""
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:98
 #, python-format
 msgid "Data Insufficient"
-msgstr ""
+msgstr "Onvoldoende gegevens"
 
 #. module: l10n_be
 #: model:ir.ui.menu,name:l10n_be.menu_finance_belgian_statement
 msgid "Belgium Statements"
-msgstr ""
+msgstr "Belgische aangiften"
 
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_vat_intra
 msgid "Partner Vat Intra"
-msgstr ""
+msgstr "Intracommunautaire opgave"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 msgid "Declare Periodical VAT"
-msgstr ""
+msgstr "Periodieke btw-aangifte"
 
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_partner_vat_list_13
 msgid "partner.vat.list_13"
-msgstr ""
+msgstr "partner.vat.list_13"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 msgid "Save xml"
-msgstr ""
+msgstr "Xml opslaan"
 
 #. module: l10n_be
 #: field:partner.vat.intra,mand_id:0
 msgid "MandataireId"
-msgstr ""
+msgstr "MandataireId"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,file_save:0
@@ -391,23 +401,32 @@ msgid ""
 "      YYYY stands for the year (4 positions).\n"
 "    "
 msgstr ""
+"Hier typt u de periode voor de intracommunautaire opgave in het formaat: "
+"ppyyyy\n"
+"      PP betekent een maand: van '01' tot '12'.\n"
+"      PP kan ook een kwartaal beteken: '31','32','33','34'\n"
+"          Het eerste cijfer duidt aan dat het om een kwartaal gaat,\n"
+"          Het tweede cijfer geeft het specifieke kwartaal aan.\n"
+"      PP kan ook een volledig boekjaar betekenen: '00'.\n"
+"      YYYY duidt het jaar aan (4 posities).\n"
+"    "
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,name:0
 #: field:partner.vat.intra,name:0
 #: field:partner.vat.list_13,name:0
 msgid "File Name"
-msgstr ""
+msgstr "Bestandsnaam"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tax_out
 msgid "Taxes à la sortie"
-msgstr ""
+msgstr "Te betalen btw"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tax
 msgid "Tax"
-msgstr "Belasting"
+msgstr "Btw"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:75
@@ -415,83 +434,83 @@ msgstr "Belasting"
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:98
 #, python-format
 msgid "No VAT Number Associated with Main Company!"
-msgstr ""
+msgstr "De firma heeft geen btw-nummer."
 
 #. module: l10n_be
 #: model:ir.model,name:l10n_be.model_l1on_be_vat_declaration
 msgid "Vat Declaration"
-msgstr ""
+msgstr "Btw-aangifte"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
 #: field:partner.vat.intra,country_ids:0
 msgid "European Countries"
-msgstr ""
+msgstr "Europese landen"
 
 #. module: l10n_be
 #: model:ir.actions.act_window,name:l10n_be.action_partner_vat_listing_13
 #: view:partner.vat_13:0
 msgid "Partner VAT Listing"
-msgstr ""
+msgstr "Intracommunautaire opgave"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "General Information"
-msgstr ""
+msgstr "Algemene informatie"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "Create an XML file for Vat Intra"
-msgstr ""
+msgstr "Maak een xml-bestand voor de IC-opgave"
 
 #. module: l10n_be
 #: field:partner.vat.intra,period_code:0
 msgid "Period Code"
-msgstr ""
+msgstr "Periodecode"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_financiers
 msgid "Financier"
-msgstr ""
+msgstr "Financieel"
 
 #. module: l10n_be
 #: field:partner.vat_13,year:0
 msgid "Year"
-msgstr ""
+msgstr "Jaar"
 
 #. module: l10n_be
 #: view:partner.vat_13:0
 msgid "Cancel"
-msgstr "Annuleer"
+msgstr "Annuleren"
 
 #. module: l10n_be
 #: view:l1on_be.vat.declaration:0
 #: view:partner.vat.intra:0
 #: view:partner.vat.list_13:0
 msgid "Close"
-msgstr ""
+msgstr "Sluiten"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:105
 #, python-format
 msgid "Please select at least one Period."
-msgstr ""
+msgstr "Selecteer minimaal een periode."
 
 #. module: l10n_be
 #: help:l1on_be.vat.declaration,ask_payment:0
 msgid "It indicates whether a payment is to made or not?"
-msgstr ""
+msgstr "Het geeft aan of een betaling nodig is of niet"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "Partner VAT intra"
-msgstr ""
+msgstr "Intracommunautaire opgave"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:47
 #, python-format
 msgid "No data for the selected Year."
-msgstr ""
+msgstr "Geen gegevens voor het geselecteerde jaar."
 
 #~ msgid "Notification"
 #~ msgstr "Mededeling"
diff --git a/addons/l10n_be/i18n/pl.po b/addons/l10n_be/i18n/pl.po
index 2a7c3da3577..d29934db763 100644
--- a/addons/l10n_be/i18n/pl.po
+++ b/addons/l10n_be/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/pt.po b/addons/l10n_be/i18n/pt.po
index 1497e955ff9..1deb7e284ba 100644
--- a/addons/l10n_be/i18n/pt.po
+++ b/addons/l10n_be/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/pt_BR.po b/addons/l10n_be/i18n/pt_BR.po
index 43b40e5a0f0..be90e46a0b9 100644
--- a/addons/l10n_be/i18n/pt_BR.po
+++ b/addons/l10n_be/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-23 09:56+0000\n"
-"PO-Revision-Date: 2011-03-10 23:28+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-10-17 00:22+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@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: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
@@ -25,6 +25,7 @@ msgstr "Test XML file"
 #: view:partner.vat.list_13:0
 msgid "You can remove customers which you do not want in exported xml file"
 msgstr ""
+"Você pode remover os clientes não quer incluir no arquivo xml a ser exportado"
 
 #. module: l10n_be
 #: view:partner.vat_13:0
@@ -32,11 +33,13 @@ msgid ""
 "This wizard will create an XML file for VAT details and total invoiced "
 "amounts per partner."
 msgstr ""
+"Este assistente irá criar um arquivo XML para detalhamento de VAT e "
+"quantidades totais faturadas por parceiro."
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tiers_receiv
 msgid "Tiers - Recevable"
-msgstr ""
+msgstr "Níveis - Contas a Receber"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_vat_intra.py:102
@@ -59,7 +62,7 @@ msgstr "Error! You can not create recursive companies."
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tiers
 msgid "Tiers"
-msgstr ""
+msgstr "Níveis"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,period_id:0
@@ -80,7 +83,7 @@ msgstr "Save the File with '.xml' extension."
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_charge
 msgid "Charge"
-msgstr ""
+msgstr "Despesa"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_partner_vat_listing.py:47
@@ -100,12 +103,12 @@ msgstr "Create XML"
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_capitaux
 msgid "Capital"
-msgstr ""
+msgstr "Capital"
 
 #. module: l10n_be
 #: view:partner.vat.list_13:0
 msgid "Print"
-msgstr ""
+msgstr "Impressão"
 
 #. module: l10n_be
 #: view:partner.vat.intra:0
@@ -121,7 +124,7 @@ msgstr "Save"
 #. module: l10n_be
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "O nome da empresa deve ser único!"
 
 #. module: l10n_be
 #: field:l1on_be.vat.declaration,msg:0
@@ -133,7 +136,7 @@ msgstr "File created"
 #. module: l10n_be
 #: view:partner.vat.intra:0
 msgid "_Close"
-msgstr ""
+msgstr "_Fechar"
 
 #. module: l10n_be
 #: code:addons/l10n_be/wizard/l10n_be_account_vat_declaration.py:131
@@ -144,7 +147,7 @@ msgstr "Save XML For Vat declaration"
 #. module: l10n_be
 #: view:partner.vat.list_13:0
 msgid "Customers"
-msgstr ""
+msgstr "Clientes"
 
 #. module: l10n_be
 #: model:account.account.type,name:l10n_be.user_type_tax_in
diff --git a/addons/l10n_be/i18n/ro.po b/addons/l10n_be/i18n/ro.po
index 2a7c3da3577..d29934db763 100644
--- a/addons/l10n_be/i18n/ro.po
+++ b/addons/l10n_be/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/ru.po b/addons/l10n_be/i18n/ru.po
index 0dd2a315a96..e536db30be1 100644
--- a/addons/l10n_be/i18n/ru.po
+++ b/addons/l10n_be/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/sl.po b/addons/l10n_be/i18n/sl.po
index 4bd8c8b1fa2..3e85194e825 100644
--- a/addons/l10n_be/i18n/sl.po
+++ b/addons/l10n_be/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/sq.po b/addons/l10n_be/i18n/sq.po
index faad45a89aa..cdc2bcfa895 100644
--- a/addons/l10n_be/i18n/sq.po
+++ b/addons/l10n_be/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/sr@latin.po b/addons/l10n_be/i18n/sr@latin.po
index 1c35be9bb78..475b03cd8d5 100644
--- a/addons/l10n_be/i18n/sr@latin.po
+++ b/addons/l10n_be/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/sv.po b/addons/l10n_be/i18n/sv.po
index 2fb7a1c6a11..bb09d5840a3 100644
--- a/addons/l10n_be/i18n/sv.po
+++ b/addons/l10n_be/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/tlh.po b/addons/l10n_be/i18n/tlh.po
index e378a757c32..b79fe3e5314 100644
--- a/addons/l10n_be/i18n/tlh.po
+++ b/addons/l10n_be/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/tr.po b/addons/l10n_be/i18n/tr.po
index 88a7d471d80..e9db76eca83 100644
--- a/addons/l10n_be/i18n/tr.po
+++ b/addons/l10n_be/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/uk.po b/addons/l10n_be/i18n/uk.po
index 87a399a0fe6..66548717ced 100644
--- a/addons/l10n_be/i18n/uk.po
+++ b/addons/l10n_be/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/vi.po b/addons/l10n_be/i18n/vi.po
index 04d61c81f87..728bf95ee8c 100644
--- a/addons/l10n_be/i18n/vi.po
+++ b/addons/l10n_be/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/zh_CN.po b/addons/l10n_be/i18n/zh_CN.po
index 7ce2124f8d7..792c7135c84 100644
--- a/addons/l10n_be/i18n/zh_CN.po
+++ b/addons/l10n_be/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/i18n/zh_TW.po b/addons/l10n_be/i18n/zh_TW.po
index 539a001d6e8..c9e6804f33e 100644
--- a/addons/l10n_be/i18n/zh_TW.po
+++ b/addons/l10n_be/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:50+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be
 #: field:partner.vat.intra,test_xml:0
diff --git a/addons/l10n_be/l10n_be_wizard.yml b/addons/l10n_be/l10n_be_wizard.yml
index 178009be7ff..0b16827225f 100644
--- a/addons/l10n_be/l10n_be_wizard.yml
+++ b/addons/l10n_be/l10n_be_wizard.yml
@@ -1,10 +1,6 @@
--
-  !record {model: ir.actions.todo, id: config_call_account_template}:
-    action_id: account.action_wizard_multi_chart
-    type: automatic
 -
   !python {model: ir.actions.todo}: |
-    install_todo = self.browse(cr, uid, ref('l10n_be.config_call_account_template'))
+    install_todo = self.browse(cr, uid, ref('account.action_wizard_multi_chart_todo'))
     if install_todo.state == 'open':
         wiz = self.pool.get('wizard.multi.charts.accounts')
         values = {
diff --git a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
index 5e357facd86..092d907e4ab 100644
--- a/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
+++ b/addons/l10n_be/wizard/l10n_be_account_vat_declaration.py
@@ -45,8 +45,8 @@ class l10n_be_vat_declaration(osv.osv_memory):
         'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', domain=[('parent_id', '=', False)], required=True),
         'msg': fields.text('File created', size=64, readonly=True),
         'file_save': fields.binary('Save File'),
-        'ask_restitution': fields.boolean('Ask Restitution',help='It indicates whether a restitution is to made or not?'),
-        'ask_payment': fields.boolean('Ask Payment',help='It indicates whether a payment is to made or not?'),
+        'ask_restitution': fields.boolean('Ask Restitution',help='It indicates whether a restitution is to make or not?'),
+        'ask_payment': fields.boolean('Ask Payment',help='It indicates whether a payment is to make or not?'),
         'client_nihil': fields.boolean('Last Declaration, no clients in client listing', help='Tick this case only if it concerns only the last statement on the civil or cessation of activity: ' \
             'no clients to be included in the client listing.'),
         'comments': fields.text('Comments'),
@@ -70,6 +70,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
         obj_tax_code = self.pool.get('account.tax.code')
         obj_acc_period = self.pool.get('account.period')
         obj_user = self.pool.get('res.users')
+        obj_partner = self.pool.get('res.partner')
         mod_obj = self.pool.get('ir.model.data')
 
         if context is None:
@@ -83,7 +84,7 @@ class l10n_be_vat_declaration(osv.osv_memory):
             obj_company = obj_user.browse(cr, uid, uid, context=context).company_id
         vat_no = obj_company.partner_id.vat
         if not vat_no:
-            raise osv.except_osv(_('Insufficient Data!'), _('No VAT Number Associated with Main Company.'))
+            raise osv.except_osv(_('insufficient data!'), _('No VAT number associated with your company.'))
         vat_no = vat_no.replace(' ','').upper()
         vat = vat_no[2:]
 
@@ -93,8 +94,9 @@ class l10n_be_vat_declaration(osv.osv_memory):
         ctx['period_id'] = data['period_id'][0]
         tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
 
-        name = email = phone = address = post_code = city = country_code = ''
-        name, email, phone, city, post_code, address, country_code = self.pool.get('res.company')._get_default_ad(obj_company.partner_id)
+        default_address = obj_partner.address_get(cr, uid, [obj_company.partner_id.id])
+        default_address_id = default_address.get("default", obj_company.partner_id.id)
+        address_id= obj_partner.browse(cr, uid, default_address_id, context)
 
         account_period = obj_acc_period.browse(cr, uid, data['period_id'][0], context=context)
         issued_by = vat_no[:2]
@@ -106,21 +108,21 @@ class l10n_be_vat_declaration(osv.osv_memory):
         ending_month = account_period.date_stop[5:7]
         quarter = str(((int(starting_month) - 1) / 3) + 1)
 
-        if not email:
+        if not address_id.email:
             raise osv.except_osv(_('Insufficient Data!'),_('No email address associated with the company.'))
-        if not phone:
+        if not address_id.phone:
             raise osv.except_osv(_('Insufficient Data!'),_('No phone associated with the company.'))
         file_data = {
                         'issued_by': issued_by,
                         'vat_no': vat_no,
                         'only_vat': vat_no[2:],
                         'cmpny_name': obj_company.name,
-                        'address': address,
-                        'post_code': post_code,
-                        'city': city,
-                        'country_code': country_code,
-                        'email': email,
-                        'phone': phone.replace('.','').replace('/','').replace('(','').replace(')','').replace(' ',''),
+                        'address': "%s %s"%(address_id.street or "",address_id.street2 or ""),
+                        'post_code': address_id.zip or "",
+                        'city': address_id.city or "",
+                        'country_code': address_id.country_id and address_id.country_id.code or "",
+                        'email': address_id.email or "",
+                        'phone': address_id.phone.replace('.','').replace('/','').replace('(','').replace(')','').replace(' ',''),
                         'send_ref': send_ref,
                         'quarter': quarter,
                         'month': starting_month,
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
index 8cad2d01a3e..53948945e04 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.py
@@ -61,16 +61,18 @@ class partner_vat(osv.osv_memory):
             company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         period_ids = obj_period.search(cr, uid, [('date_start' ,'>=', date_start), ('date_stop','<=',date_stop), ('company_id','=',company_id)])
         if not period_ids:
-             raise osv.except_osv(_('Insufficient Data!'), _('No data for the selected year.'))
+             raise osv.except_osv(_('insufficient data!'), _('No data for the selected year.'))
 
         partners = []
         partner_ids = obj_partner.search(cr, uid, [('vat_subjected', '!=', False), ('vat','ilike','BE%')], context=context)
+        if not partner_ids:
+             raise osv.except_osv(_('Error'),_('No belgian contact with a VAT number in your database.'))
         cr.execute("""SELECT sub1.partner_id, sub1.name, sub1.vat, sub1.turnover, sub2.vat_amount
                 FROM (SELECT l.partner_id, p.name, p.vat, SUM(CASE WHEN c.code ='49' THEN -l.tax_amount ELSE l.tax_amount END) as turnover
                       FROM account_move_line l
                       LEFT JOIN res_partner p ON l.partner_id = p.id
                       LEFT JOIN account_tax_code c ON l.tax_code_id = c.id
-                      WHERE c.code IN ('01','02','03','45','49')
+                      WHERE c.code IN ('00','01','02','03','45','49')
                       AND l.partner_id IN %s
                       AND l.period_id IN %s
                       GROUP BY l.partner_id, p.name, p.vat) AS sub1
@@ -87,6 +89,9 @@ class partner_vat(osv.osv_memory):
             if record['turnover'] >= data['limit_amount']:
                 id_client = obj_vat_lclient.create(cr, uid, record, context=context)
                 partners.append(id_client)
+        
+        if not partners:
+            raise osv.except_osv(_('insufficient data!'), _('No data found for the selected year.'))
         context.update({'partner_ids': partners, 'year': data['year'], 'limit_amount': data['limit_amount']})
         model_data_ids = obj_model_data.search(cr, uid, [('model','=','ir.ui.view'), ('name','=','view_vat_listing')])
         resource_id = obj_model_data.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id']
@@ -187,10 +192,10 @@ class partner_vat_list(osv.osv_memory):
         addr = obj_partner.address_get(cr, uid, [obj_cmpny.partner_id.id], ['invoice'])
         if addr.get('invoice',False):
             ads = obj_partner.browse(cr, uid, [addr['invoice']], context=context)[0]
-            phone = ads.phone.replace(' ','') or ''
+            phone = ads.phone and ads.phone.replace(' ','') or ''
             email = ads.email or ''
             name = ads.name or ''
-            city = obj_partner.get_city(cr, uid, ads.id)
+            city = ads.city or ''
             zip = obj_partner.browse(cr, uid, ads.id, context=context).zip or ''
             if not city:
                 city = ''
@@ -256,6 +261,8 @@ class partner_vat_list(osv.osv_memory):
 
         # Turnover and Farmer tags are not included
         client_datas = self._get_datas(cr, uid, ids, context=context)
+        if not client_datas:
+            raise osv.except_osv(_('Data Insufficient!'),_('No data available for the client.'))
         data_client_info = ''
         for amount_data in client_datas:
             data_client_info += """
@@ -306,6 +313,8 @@ class partner_vat_list(osv.osv_memory):
         datas['year'] = context['year']
         datas['limit_amount'] = context['limit_amount']
         datas['client_datas'] = self._get_datas(cr, uid, ids, context=context)
+        if not datas['client_datas']:
+            raise osv.except_osv(_('Error!'),_('No record to print.'))
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'partner.vat.listing.print',
diff --git a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
index 563396c8a03..4ac165344e8 100644
--- a/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
+++ b/addons/l10n_be/wizard/l10n_be_partner_vat_listing.xml
@@ -6,18 +6,18 @@
       <field name="model">partner.vat</field>
       <field name="arch" type="xml">
         <form string="Partner VAT Listing" version="7.0">
-          <header>
+          <p class="oe_grey">
+              This wizard will create an XML file for VAT details and total invoiced amounts per partner.
+          </p>
+          <group>
+            <field name="year"/>
+            <field name="limit_amount"/>
+          </group>
+          <footer>
             <button name="get_partner" string="View Customers" type="object"  class="oe_highlight"  />
             or 
             <button string="Cancel" class="oe_link" special="cancel" />
-          </header>
-          <group>
-            <label string="This wizard will create an XML file for VAT details and total invoiced amounts per partner." colspan="4"/>
-          </group>
-          <newline/>
-          <field name="year"/>
-          <newline/>
-          <field name="limit_amount"/>
+          </footer>
         </form>
       </field>
     </record>
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra.py b/addons/l10n_be/wizard/l10n_be_vat_intra.py
index 47a29a8457f..aa4dac11072 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra.py
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra.py
@@ -108,7 +108,7 @@ class partner_vat_intra(osv.osv_memory):
         # Get Company vat
         company_vat = data_company.partner_id.vat
         if not company_vat:
-            raise osv.except_osv(_('Insufficient Data!'),_('No VAT number associated with the company.'))
+            raise osv.except_osv(_('insufficient data!'),_('No VAT number associated with your company.'))
         company_vat = company_vat.replace(' ','').upper()
         issued_by = company_vat[:2]
 
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
index 415f3a08f1f..ff1a2c2064d 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
@@ -108,7 +108,7 @@
             <para style="terp_default_9">[[ l['code'] (l['intra_code']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ l['amount'] or O.OO ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l['amount'], currency_obj=company.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -129,7 +129,7 @@
           <para style="terp_tblheader_General_Right">Total:</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">[[ data['form']['amountsum'] or 0.00 ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_General_Right">[[ formatLang(data['form']['amountsum'], currency_obj=company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account_coda/README.txt b/addons/l10n_be_coda/README.txt
similarity index 100%
rename from addons/account_coda/README.txt
rename to addons/l10n_be_coda/README.txt
diff --git a/addons/account_coda/__init__.py b/addons/l10n_be_coda/__init__.py
similarity index 98%
rename from addons/account_coda/__init__.py
rename to addons/l10n_be_coda/__init__.py
index 2750c8ff4a8..4a58b8ad059 100644
--- a/addons/account_coda/__init__.py
+++ b/addons/l10n_be_coda/__init__.py
@@ -20,7 +20,7 @@
 #
 ##############################################################################
 
-import account_coda
+import l10n_be_coda
 import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_coda/__openerp__.py b/addons/l10n_be_coda/__openerp__.py
similarity index 50%
rename from addons/account_coda/__openerp__.py
rename to addons/l10n_be_coda/__openerp__.py
index 094ab45acc0..2c8931f484c 100644
--- a/addons/account_coda/__openerp__.py
+++ b/addons/l10n_be_coda/__openerp__.py
@@ -20,74 +20,91 @@
 #
 ##############################################################################
 {
-    "name": 'Belgium - Import Bank CODA Statements',
-    "version": '2.1',
-    "author": 'Noviat',
-    "category": 'Accounting & Finance',
-    "description": '''
+    'name': 'Belgium - Import Bank CODA Statements',
+    'version': '2.1',
+    'author': 'Noviat',
+    'category': 'Accounting & Finance',
+    'description': '''
 Module to import CODA bank statements.
 ======================================
 
 Supported are CODA flat files in V2 format from Belgian bank accounts.
+----------------------------------------------------------------------
     * CODA v1 support.
     * CODA v2.2 support.
     * Foreign Currency support.
     * Support for all data record types (0, 1, 2, 3, 4, 8, 9).
-    * Parsing & logging of all Transaction Codes and Structured Format Communications.
+    * Parsing & logging of all Transaction Codes and Structured Format 
+      Communications.
     * Automatic Financial Journal assignment via CODA configuration parameters.
     * Support for multiple Journals per Bank Account Number.
-    * Support for multiple statements from different bank accounts in a single CODA file.
-    * Support for 'parsing only' CODA Bank Accounts (defined as type='info' in the CODA Bank Account configuration records).
-    * Multi-language CODA parsing, parsing configuration data provided for EN, NL, FR.
+    * Support for multiple statements from different bank accounts in a single 
+      CODA file.
+    * Support for 'parsing only' CODA Bank Accounts (defined as type='info' in 
+      the CODA Bank Account configuration records).
+    * Multi-language CODA parsing, parsing configuration data provided for EN, 
+      NL, FR.
 
 The machine readable CODA Files are parsed and stored in human readable format in 
 CODA Bank Statements. Also Bank Statements are generated containing a subset of 
-the CODA information (only those transaction lines that are required for the creation 
-of the Financial Accounting records). The CODA Bank Statement is a 'read-only' 
-object, hence remaining a reliable representation of the original CODA file whereas 
-the Bank Statement will get modified as required by accounting business processes.
+the CODA information (only those transaction lines that are required for the 
+creation of the Financial Accounting records). The CODA Bank Statement is a 
+'read-only' object, hence remaining a reliable representation of the original
+CODA file whereas the Bank Statement will get modified as required by accounting 
+business processes.
 
 CODA Bank Accounts configured as type 'Info' will only generate CODA Bank Statements.
 
-A removal of one object in the CODA processing results in the removal of the associated 
-objects. The removal of a CODA File containing multiple Bank Statements will also 
-remove those associated statements.
+A removal of one object in the CODA processing results in the removal of the 
+associated objects. The removal of a CODA File containing multiple Bank 
+Statements will also remove those associated statements.
 
 The following reconciliation logic has been implemented in the CODA processing:
-
-1) The Company's Bank Account Number of the CODA statement is compared against the Bank Account Number field of the Company's CODA Bank Account configuration records (whereby bank accounts defined in type='info' configuration records are ignored). If this is the case an 'internal transfer' transaction is generated using the 'Internal Transfer Account' field of the CODA File Import wizard.
-2) As a second step the 'Structured Communication' field of the CODA transaction line is matched against the reference field of in- and outgoing invoices (supported : Belgian Structured Communication Type).
-3) When the previous step doesn't find a match, the transaction counterparty is located via the Bank Account Number configured on the OpenERP Customer and Supplier records.
-4) In case the previous steps are not successful, the transaction is generated by using the 'Default Account for Unrecognized Movement' field of the CODA File Import wizard in order to allow further manual processing.
+-------------------------------------------------------------------------------
+    1) The Company's Bank Account Number of the CODA statement is compared against 
+       the Bank Account Number field of the Company's CODA Bank Account 
+       configuration records (whereby bank accounts defined in type='info' 
+       configuration records are ignored). If this is the case an 'internal transfer'
+       transaction is generated using the 'Internal Transfer Account' field of the 
+       CODA File Import wizard.
+    2) As a second step the 'Structured Communication' field of the CODA transaction
+       line is matched against the reference field of in- and outgoing invoices 
+       (supported : Belgian Structured Communication Type).
+    3) When the previous step doesn't find a match, the transaction counterparty is 
+       located via the Bank Account Number configured on the OpenERP Customer and 
+       Supplier records.
+    4) In case the previous steps are not successful, the transaction is generated 
+       by using the 'Default Account for Unrecognized Movement' field of the CODA 
+       File Import wizard in order to allow further manual processing.
 
 In stead of a manual adjustment of the generated Bank Statements, you can also 
 re-import the CODA after updating the OpenERP database with the information that 
 was missing to allow automatic reconciliation.
 
 Remark on CODA V1 support:
-In some cases a transaction code, transaction category or structured communication code has been given a new or clearer description in CODA V2.
-The description provided by the CODA configuration tables is based upon the CODA V2.2 specifications.
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+In some cases a transaction code, transaction category or structured 
+communication code has been given a new or clearer description in CODA V2.The
+description provided by the CODA configuration tables is based upon the CODA 
+V2.2 specifications.
 If required, you can manually adjust the descriptions via the CODA configuration menu.
 ''',
-    "images"   : ["images/coda_logs.jpeg","images/import_coda_logs.jpeg"],
-    "depends": ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'],
-    "demo_xml": [],
-    "init_xml": [
-        'account_coda_trans_type.xml',
-        'account_coda_trans_code.xml',
-        'account_coda_trans_category.xml',
-        'account_coda_comm_type.xml',
-    ],
-    "update_xml" : [
+    'images'   : ['images/coda_logs.jpeg','images/import_coda_logs.jpeg'],
+    'depends': ['account_voucher','base_iban', 'l10n_be_invoice_bba', 'account_bank_statement_extensions'],
+    'demo': [],
+    'data': [
+        'l10n_be_coda_trans_type.xml',
+        'l10n_be_coda_trans_code.xml',
+        'l10n_be_coda_trans_category.xml',
+        'l10n_be_coda_comm_type.xml',
         'security/ir.model.access.csv',
         'security/account_security.xml',
-        'account_coda_wizard.xml',
-        'account_coda_view.xml',
+        'l10n_be_coda_wizard.xml',
+        'l10n_be_coda_view.xml',
     ],
-    "auto_install": False,
-    "installable": True,
-    "license": 'AGPL-3',
-    "certificate" : "001237207321716002029",
+    'auto_install': False,
+    'installable': True,
+    'license': 'AGPL-3',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_coda/i18n/account_coda.pot b/addons/l10n_be_coda/i18n/account_coda.pot
similarity index 100%
rename from addons/account_coda/i18n/account_coda.pot
rename to addons/l10n_be_coda/i18n/account_coda.pot
diff --git a/addons/account_coda/i18n/ar.po b/addons/l10n_be_coda/i18n/ar.po
similarity index 96%
rename from addons/account_coda/i18n/ar.po
rename to addons/l10n_be_coda/i18n/ar.po
index 409ebef1aca..7550c467da3 100644
--- a/addons/account_coda/i18n/ar.po
+++ b/addons/l10n_be_coda/i18n/ar.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
 msgid "Cash withdrawal on card (PROTON)"
-msgstr ""
+msgstr "السحب النقدي على البطاقة (بروتون)"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_412
@@ -30,12 +30,12 @@ msgstr "تحذير بغرامات نهاية الصلاحية"
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_11
 msgid "Your purchase of luncheon vouchers"
-msgstr ""
+msgstr "مشترواتك من بدل التغذية"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_05
 msgid "Partial payment subscription"
-msgstr ""
+msgstr "إشتراك الدفع الجزئي"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_54
@@ -50,22 +50,22 @@ msgstr "أمر نقل فردي من المصرف"
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_21
 msgid "Charges for preparing pay packets"
-msgstr ""
+msgstr "تكاليف لإعداد حزم الأجور"
 
 #. module: account_coda
 #: model:account.coda.trans.type,description:account_coda.actt_9
 msgid "Detail of 7. The records in a separate application keep type 9."
-msgstr ""
+msgstr "التفاصيل من ٧. السجلات في التطبيق المنفصل تبقى على نوع ٩."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_426
 msgid "Belgian broker's commission"
-msgstr ""
+msgstr "لجنة الوسيط البلجيى"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_031
 msgid "Charges foreign cheque"
-msgstr ""
+msgstr "ثمن الشيك الخارجى"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_002
@@ -83,11 +83,13 @@ msgid ""
 "cheques debited on account, but debit cancelled afterwards for lack of cover "
 "(double debit/contra-entry of transaction 01 or 05)"
 msgstr ""
+"خصم الشيكات على حساب، لكن تم الإلغاء بعد ذلك لعدم التغطية (ضعف الخصم/  قيد "
+"عكسي للعملية ٠١ - ٠٥)"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_05
 msgid "Bill claimed back"
-msgstr ""
+msgstr "تم إسترداد الفاتورة"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_016
@@ -103,12 +105,12 @@ msgstr "تم إستيراد ملف CODA:"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_066
 msgid "Fixed loan advance - reimbursement"
-msgstr ""
+msgstr "القرض ثابت مقدما - السداد"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_05
 msgid "Purchase of foreign bank notes"
-msgstr ""
+msgstr "مشتريات أوراق نقد أجنبية"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:277
@@ -127,7 +129,7 @@ msgstr "حساب التأمين"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_042
 msgid "Payment card costs"
-msgstr ""
+msgstr "تكاليف بطاقة الدفع"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_212
@@ -146,17 +148,17 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_66
 msgid "Financial centralization"
-msgstr ""
+msgstr "المركزية المالية"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_420
 msgid "Retention charges"
-msgstr ""
+msgstr "استبقاء الرسوم"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_50
 msgid "Transfer in your favour"
-msgstr ""
+msgstr "نقل في صالحك"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_87
@@ -172,17 +174,17 @@ msgstr ""
 #: model:account.coda.trans.code,description:account_coda.actcc_43_87
 #: model:account.coda.trans.code,description:account_coda.actcc_47_87
 msgid "Reimbursement of costs"
-msgstr ""
+msgstr "سداد التكاليف"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_56
 msgid "Remittance of supplier's bill with guarantee"
-msgstr ""
+msgstr "التحويلات المالية من فاتورة المورد مع الضمان"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_002
 msgid "Communication of the bank"
-msgstr ""
+msgstr "إتصالات البنك"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,amount:0
@@ -197,12 +199,12 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_413
 msgid "Acceptance charges"
-msgstr ""
+msgstr "قبول الثمن"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,counterparty_bic:0
 msgid "Counterparty BIC"
-msgstr ""
+msgstr "رقم كود البنك (BIC) للطرف الآخر"
 
 #. module: account_coda
 #: help:coda.bank.account,def_receivable:0
@@ -269,12 +271,12 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_207
 msgid "Non-conformity fee"
-msgstr ""
+msgstr "رسوم عدم المطابقة"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_022
 msgid "Priority costs"
-msgstr ""
+msgstr "أولوية التكاليف"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:268
@@ -288,7 +290,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_045
 msgid "Handling costs"
-msgstr ""
+msgstr "التعامل مع التكاليف"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_47_13
@@ -303,38 +305,38 @@ msgstr "تاريخ الاستيراد"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_039
 msgid "Telecommunications"
-msgstr ""
+msgstr "الاتصالات السلكية واللاسلكية"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,globalisation_id:0
 msgid "Globalisation ID"
-msgstr ""
+msgstr "معرف العولمة"
 
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:399
 #, python-format
 msgid "Delete operation not allowed !"
-msgstr ""
+msgstr "حذف العملية غير مسموح !"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_000
 msgid "Net amount"
-msgstr ""
+msgstr "صافي القيمة"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_11
 msgid "Department store cheque"
-msgstr ""
+msgstr "إدارة الشيكات"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_206
 msgid "Surety fee/payment under reserve"
-msgstr ""
+msgstr "رسوم الضمان / الدفع بموجب الاحتياطي"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_53
 msgid "Cash deposit at an ATM"
-msgstr ""
+msgstr "الإيداع النقدي من أجهزة الصرف الآلي"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_30_52
@@ -350,13 +352,13 @@ msgstr ""
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_bank_statement_line_global
 msgid "Batch Payment Info"
-msgstr ""
+msgstr "معلومات دفعة السداد"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_00_33
 #: model:account.coda.trans.code,description:account_coda.actcc_00_83
 msgid "Value correction"
-msgstr ""
+msgstr "تصحيح القيمة"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_27
@@ -366,17 +368,17 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_01
 msgid "Payment of foreign bill"
-msgstr ""
+msgstr "مدفوعات فواتير أجنبية"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_024
 msgid "Growth premium"
-msgstr ""
+msgstr "علاوة نمو"
 
 #. module: account_coda
 #: selection:account.coda.trans.code,type:0
 msgid "Transaction Code"
-msgstr ""
+msgstr "رسم الحركة"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_13
@@ -386,17 +388,17 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_05
 msgid "Direct debit"
-msgstr ""
+msgstr "الخصم المباشر"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_47_11
 msgid "Bills of lading"
-msgstr ""
+msgstr "فواتير الشحن"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_00
 msgid "Undefined transactions"
-msgstr ""
+msgstr "معاملات غير معرفة"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_11_62
@@ -426,7 +428,7 @@ msgstr ""
 #. module: account_coda
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "يجب أن يكون اليومية و الفترة مرتبطين لشركة واحدة."
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_115
@@ -467,7 +469,7 @@ msgstr "التواصل"
 #: model:account.coda.trans.code,description:account_coda.actcc_00_35
 #: model:account.coda.trans.code,description:account_coda.actcc_00_85
 msgid "Correction"
-msgstr ""
+msgstr "تصحيح"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:404
@@ -486,7 +488,7 @@ msgstr ""
 #: model:account.coda.trans.code,description:account_coda.actcc_30_33
 #: model:account.coda.trans.code,description:account_coda.actcc_30_83
 msgid "Value (date) correction"
-msgstr ""
+msgstr "تصحيح قيم التاريخ"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_063
@@ -523,18 +525,18 @@ msgstr "معلومات إضافية"
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_120
 msgid "Correction of a transaction"
-msgstr ""
+msgstr "تصحيح المعاملة"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_64
 #: model:account.coda.trans.code,description:account_coda.actcc_41_64
 msgid "Transfer to your account"
-msgstr ""
+msgstr "نقلها لحسابك"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_124
 msgid "Number of the credit card"
-msgstr ""
+msgstr "عدد كروت الإئتمان"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_13
@@ -550,7 +552,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_104
 msgid "Equivalent in EUR"
-msgstr ""
+msgstr "المساوي لليورو"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_50
@@ -560,7 +562,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_03
 msgid "Your purchase by payment card"
-msgstr ""
+msgstr "مشترواتك بكارت الإئتمان"
 
 #. module: account_coda
 #: model:account.coda.trans.type,description:account_coda.actt_1
@@ -584,12 +586,12 @@ msgstr ""
 #. module: account_coda
 #: view:coda.bank.statement.line:0
 msgid "Credit Transactions."
-msgstr ""
+msgstr "العمليات الائتمانية."
 
 #. module: account_coda
 #: field:account.coda.trans.type,type:0
 msgid "Transaction Type"
-msgstr ""
+msgstr "نوع المعاملة"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
@@ -599,18 +601,18 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_029
 msgid "Protest charges"
-msgstr ""
+msgstr "رسوم الإعتراض"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_053
 #: model:account.coda.trans.code,description:account_coda.actcc_80_43
 msgid "Printing of forms"
-msgstr ""
+msgstr "طباعة النماذج"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_003
 msgid "Credit commission"
-msgstr ""
+msgstr "لجنة الائتمان"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_43_58
@@ -637,7 +639,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_50
 msgid "Sale of securities"
-msgstr ""
+msgstr "مبيعات الأوراق المالية"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_51
@@ -718,7 +720,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_01
 msgid "Short-term loan"
-msgstr ""
+msgstr "قروض قصيرة الأمد"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_01
@@ -733,30 +735,30 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_402
 msgid "Certification costs"
-msgstr ""
+msgstr "شهادة التكاليف"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_015
 msgid "Correspondent charges"
-msgstr ""
+msgstr "أثمان متوافقة"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_415
 #: model:account.coda.trans.code,description:account_coda.actcc_80_39
 msgid "Surety fee"
-msgstr ""
+msgstr "رسوم الضمان"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_017
 #: model:account.coda.trans.code,description:account_coda.actcc_80_23
 #: model:account.coda.trans.code,description:account_coda.actcc_80_41
 msgid "Research costs"
-msgstr ""
+msgstr "تكاليف البحث"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_07
 msgid "Collective transfer"
-msgstr ""
+msgstr "نقل تجميعي"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:912
@@ -787,7 +789,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_52
 msgid "Payment in your favour"
-msgstr ""
+msgstr "مدفوعات لصالحك"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_08
@@ -824,7 +826,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_01_52
 msgid "Payment by a third person"
-msgstr ""
+msgstr "مدفوعات من شخص ثالث"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_60
@@ -846,12 +848,12 @@ msgstr "ملاحظات"
 #. module: account_coda
 #: field:coda.bank.statement,balance_end_real:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "رصيد ختامي"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_64
 msgid "Your issue"
-msgstr ""
+msgstr "إصدارك"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:870
@@ -871,7 +873,7 @@ msgstr ""
 #. module: account_coda
 #: field:coda.bank.statement.line,val_date:0
 msgid "Valuta Date"
-msgstr ""
+msgstr "تاريخ سعر العملة"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_11_01
@@ -929,7 +931,7 @@ msgstr "شركة"
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_35
 msgid "Cash advance"
-msgstr ""
+msgstr "نقدية كمقدم"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_47
@@ -996,17 +998,17 @@ msgstr "مورِّد"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_009
 msgid "Travelling expenses"
-msgstr ""
+msgstr "نفقات السفر"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_30
 msgid "Various transactions"
-msgstr ""
+msgstr "معاملات متنوعة"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_406
 msgid "Collection charges"
-msgstr ""
+msgstr "رسوم إنتقاء"
 
 #. module: account_coda
 #: view:coda.bank.statement:0
@@ -1021,7 +1023,7 @@ msgstr "دفع نقدي"
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_27
 msgid "Subscription fee"
-msgstr ""
+msgstr "رسوم إشتراك"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_036
@@ -1123,6 +1125,7 @@ msgid ""
 "Code to identify transactions belonging to the same globalisation level "
 "within a batch payment"
 msgstr ""
+"كود تعريف المعاملات التى تنتمى الى نفس مستوى العالمي من خلال دفعة السداد"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_05
@@ -1634,7 +1637,7 @@ msgstr "كشف حساب بنك"
 #. module: account_coda
 #: field:coda.bank.statement.line,counterparty_name:0
 msgid "Counterparty Name"
-msgstr ""
+msgstr "اسم الطرف الآخر"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_006
@@ -2048,7 +2051,7 @@ msgstr ""
 #. module: account_coda
 #: view:coda.bank.statement.line:0
 msgid "Glob. Am."
-msgstr ""
+msgstr "القيمة الإجمالية"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_17
@@ -2714,7 +2717,7 @@ msgstr ""
 #: view:coda.bank.statement:0
 #: view:coda.bank.statement.line:0
 msgid "Glob. Amount"
-msgstr ""
+msgstr "المبلغ الإجمالي"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_58
@@ -2876,7 +2879,7 @@ msgstr ""
 #. module: account_coda
 #: field:coda.bank.statement.line,counterparty_number:0
 msgid "Counterparty Number"
-msgstr ""
+msgstr "رقم الطرف الآخر"
 
 #. module: account_coda
 #: view:account.coda.import:0
@@ -3079,7 +3082,7 @@ msgstr ""
 #. module: account_coda
 #: sql_constraint:account.bank.statement.line.global:0
 msgid "The code must be unique !"
-msgstr ""
+msgstr "يجب أن يكون الكود مميزاً !"
 
 #. module: account_coda
 #: help:coda.bank.account,currency:0
@@ -3297,7 +3300,7 @@ msgstr ""
 #. module: account_coda
 #: field:coda.bank.statement.line,counterparty_currency:0
 msgid "Counterparty Currency"
-msgstr ""
+msgstr "عملة الطرف الآخر"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_202
diff --git a/addons/account_coda/i18n/bg.po b/addons/l10n_be_coda/i18n/bg.po
similarity index 99%
rename from addons/account_coda/i18n/bg.po
rename to addons/l10n_be_coda/i18n/bg.po
index 82c333d4a07..39868c59488 100644
--- a/addons/account_coda/i18n/bg.po
+++ b/addons/l10n_be_coda/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/ca.po b/addons/l10n_be_coda/i18n/ca.po
similarity index 99%
rename from addons/account_coda/i18n/ca.po
rename to addons/l10n_be_coda/i18n/ca.po
index 0176dd77e22..415d0df7a2c 100644
--- a/addons/account_coda/i18n/ca.po
+++ b/addons/l10n_be_coda/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/da.po b/addons/l10n_be_coda/i18n/da.po
similarity index 99%
rename from addons/account_coda/i18n/da.po
rename to addons/l10n_be_coda/i18n/da.po
index a1e55dffaa7..332cea6874a 100644
--- a/addons/account_coda/i18n/da.po
+++ b/addons/l10n_be_coda/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/de.po b/addons/l10n_be_coda/i18n/de.po
similarity index 99%
rename from addons/account_coda/i18n/de.po
rename to addons/l10n_be_coda/i18n/de.po
index 21387895d18..c8357406e9b 100644
--- a/addons/account_coda/i18n/de.po
+++ b/addons/l10n_be_coda/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/el.po b/addons/l10n_be_coda/i18n/el.po
similarity index 99%
rename from addons/account_coda/i18n/el.po
rename to addons/l10n_be_coda/i18n/el.po
index f97b7d2c908..e8b7466c3af 100644
--- a/addons/account_coda/i18n/el.po
+++ b/addons/l10n_be_coda/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/l10n_be_coda/i18n/en_AU.po b/addons/l10n_be_coda/i18n/en_AU.po
new file mode 100644
index 00000000000..fc232f3fc92
--- /dev/null
+++ b/addons/l10n_be_coda/i18n/en_AU.po
@@ -0,0 +1,3739 @@
+# English (Australia) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-09-27 03:22+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English (Australia) <en_AU@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_21
+msgid "Cash withdrawal on card (PROTON)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_412
+msgid "Advice of expiry charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_11
+msgid "Your purchase of luncheon vouchers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_05
+msgid "Partial payment subscription"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_54
+msgid "Unexecutable transfer order"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_02
+msgid "Individual transfer order initiated by the bank"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_21
+msgid "Charges for preparing pay packets"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_9
+msgid "Detail of 7. The records in a separate application keep type 9."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_426
+msgid "Belgian broker's commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_031
+msgid "Charges foreign cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_002
+msgid "Interest paid"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.type,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_62
+msgid ""
+"cheques debited on account, but debit cancelled afterwards for lack of cover "
+"(double debit/contra-entry of transaction 01 or 05)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_05
+msgid "Bill claimed back"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_016
+msgid "BLIW/IBLC dues"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:911
+#, python-format
+msgid "CODA File is Imported  :"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_066
+msgid "Fixed loan advance - reimbursement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_05
+msgid "Purchase of foreign bank notes"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:277
+#: code:addons/account_coda/wizard/account_coda_import.py:469
+#, python-format
+msgid ""
+"\n"
+"The File contains an invalid CODA Transaction Family : %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_030
+msgid "Account insurance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_042
+msgid "Payment card costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_212
+msgid "Warehousing fee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:300
+#, python-format
+msgid ""
+"Cannot delete CODA Bank Statement '%s' of Journal '%s'.\n"
+"The associated Bank Statement has already been confirmed !\n"
+"Please undo this action first!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_66
+msgid "Financial centralization"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_420
+msgid "Retention charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_50
+msgid "Transfer in your favour"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_87
+#: model:account.coda.trans.code,description:account_coda.actcc_04_87
+#: model:account.coda.trans.code,description:account_coda.actcc_05_87
+#: model:account.coda.trans.code,description:account_coda.actcc_07_87
+#: model:account.coda.trans.code,description:account_coda.actcc_09_87
+#: model:account.coda.trans.code,description:account_coda.actcc_11_87
+#: model:account.coda.trans.code,description:account_coda.actcc_13_87
+#: model:account.coda.trans.code,description:account_coda.actcc_30_87
+#: model:account.coda.trans.code,description:account_coda.actcc_35_87
+#: model:account.coda.trans.code,description:account_coda.actcc_41_87
+#: model:account.coda.trans.code,description:account_coda.actcc_43_87
+#: model:account.coda.trans.code,description:account_coda.actcc_47_87
+msgid "Reimbursement of costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_56
+msgid "Remittance of supplier's bill with guarantee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_002
+msgid "Communication of the bank"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_70
+msgid "Only with stockbrokers when they deliver the securities to the bank"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_413
+msgid "Acceptance charges"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_bic:0
+msgid "Counterparty BIC"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,def_receivable:0
+msgid ""
+"Set here the receivable account that will be used, by default, if the "
+"partner is not found."
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,def_payable:0
+msgid ""
+"Set here the payable account that will be used, by default, if the partner "
+"is not found."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:144
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_39
+msgid "Return of an irregular bill of exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_011
+msgid "VAT"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_09
+msgid "Debit of the agios to the account of the drawee"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.comm.type:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_comm_type_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_comm_type_form
+msgid "CODA Structured Communication Types"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_50
+msgid "Spot sale of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,ref:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_58
+msgid "Remittance of supplier's bill without guarantee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_03
+msgid "Payment receipt card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_207
+msgid "Non-conformity fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_022
+msgid "Priority costs"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:268
+#: code:addons/account_coda/wizard/account_coda_import.py:460
+#, python-format
+msgid ""
+"\n"
+"The File contains an invalid CODA Transaction Type : %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_045
+msgid "Handling costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_47_13
+msgid "Debit customer, payment of agios, interest, exchange commission, etc."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_039
+msgid "Telecommunications"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,globalisation_id:0
+msgid "Globalisation ID"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:399
+#, python-format
+msgid "Delete operation not allowed !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_000
+msgid "Net amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_11
+msgid "Department store cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_206
+msgid "Surety fee/payment under reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_53
+msgid "Cash deposit at an ATM"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_52
+msgid "Forward sale of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_05
+msgid ""
+"Debit of the subscriber for the complementary payment of partly-paid shares"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_bank_statement_line_global
+msgid "Batch Payment Info"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_33
+#: model:account.coda.trans.code,description:account_coda.actcc_00_83
+msgid "Value correction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_27
+msgid "For publications of the financial institution"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_01
+msgid "Payment of foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_024
+msgid "Growth premium"
+msgstr ""
+
+#. module: account_coda
+#: selection:account.coda.trans.code,type:0
+msgid "Transaction Code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_13
+msgid "Discount foreign supplier's bills"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_05
+msgid "Direct debit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_47_11
+msgid "Bills of lading"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_00
+msgid "Undefined transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_62
+msgid "When reimbursed separately to the subscriber"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.category:0
+msgid "CODA Transaction Category"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_067
+msgid "Fixed loan advance - extension"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_07
+msgid "Your repayment instalment credits"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_13
+msgid "On the account of the head office"
+msgstr ""
+
+#. module: account_coda
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_115
+msgid "Terminal cash deposit"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:301
+#: code:addons/account_coda/wizard/account_coda_import.py:493
+#, python-format
+msgid ""
+"\n"
+"The File contains an invalid Structured Communication Type : %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_43_01
+msgid ""
+"Debit of a cheque in foreign currency or in EUR in favour of a foreigner"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_54
+msgid "Discount abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_62
+msgid "Remittance of documents abroad - credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,name:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_35
+#: model:account.coda.trans.code,description:account_coda.actcc_00_85
+msgid "Correction"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:404
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        No partner record assigned: There are multiple partners with the "
+"same Bank Account Number '%s'!\n"
+"        Please correct the configuration and perform the import again or "
+"otherwise change the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_33
+#: model:account.coda.trans.code,description:account_coda.actcc_30_83
+msgid "Value (date) correction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_063
+msgid "Rounding differences"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:295
+#: code:addons/account_coda/wizard/account_coda_import.py:487
+#, python-format
+msgid "Transaction Category unknown, please consult your bank."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.code:0
+msgid "CODA Transaction Code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_052
+msgid "Residence state tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_17
+msgid "Amount of the cheque; if any, charges receive code 37"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Additional Information"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_120
+msgid "Correction of a transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_64
+#: model:account.coda.trans.code,description:account_coda.actcc_41_64
+msgid "Transfer to your account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_124
+msgid "Number of the credit card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_13
+msgid "Renting of safes"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,find_bbacom:0
+msgid ""
+"Partner lookup via the 'BBA' Structured Communication field of the Invoice."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_104
+msgid "Equivalent in EUR"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_50
+msgid "Remittance of foreign bill credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_03
+msgid "Your purchase by payment card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_1
+msgid ""
+"Amount as totalised by the customer; e.g. a file regrouping payments of "
+"wages or payments made to suppliers or a file regrouping collections for "
+"which the customer is debited or credited with one single amount. As a "
+"matter of principle, this type is also used when no detailed data is "
+"following (type 5)."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:519
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on information data record 3.3, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Credit Transactions."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.type,type:0
+msgid "Transaction Type"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "Object to store CODA Data Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_029
+msgid "Protest charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_053
+#: model:account.coda.trans.code,description:account_coda.actcc_80_43
+msgid "Printing of forms"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_003
+msgid "Credit commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_58
+msgid "Remittance of foreign cheque credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_8
+msgid "Detail of 3."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_05_58
+msgid ""
+"(cancellation of an undue debit of the debtor at the initiative of the "
+"financial institution or the debtor for lack of cover)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_11
+msgid "Payable coupons/repayable securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_50
+msgid "Sale of securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_51
+msgid "Transfer in your favour – initiated by the bank"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,coda_data:0
+#: field:account.coda.import,coda_data:0
+msgid "CODA File"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_38
+msgid "Provisionally unpaid"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_003
+msgid "RBP data"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_06
+msgid "Share option plan – exercising an option"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_051
+msgid "Withholding tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_006
+msgid "Information concerning the detail amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_37
+msgid "Costs relating to payment of foreign cheques"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,parent_id:0
+msgid "Family"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_66
+msgid "Retrocession of issue commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_68
+msgid "Credit after Proton payments"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: field:coda.bank.statement,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:588
+#: code:addons/account_coda/wizard/account_coda_import.py:926
+#, python-format
+msgid "CODA Import failed !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_01
+msgid ""
+"Withdrawal by counter cheque or receipt; cash remitted by the bank clerk"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_01
+msgid "Short-term loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_01
+msgid "Domestic or local SEPA credit transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_03
+msgid "Settlement credit cards"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_402
+msgid "Certification costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_015
+msgid "Correspondent charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_415
+#: model:account.coda.trans.code,description:account_coda.actcc_80_39
+msgid "Surety fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_017
+#: model:account.coda.trans.code,description:account_coda.actcc_80_23
+#: model:account.coda.trans.code,description:account_coda.actcc_80_41
+msgid "Research costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_07
+msgid "Collective transfer"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:912
+#, python-format
+msgid ""
+"\n"
+"\n"
+"Number of statements : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_05
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_07
+msgid ""
+"The principal will be debited for the total amount of the file entered."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:332
+#: code:addons/account_coda/wizard/account_coda_import.py:357
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on movement data record 2.3, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_52
+msgid "Payment in your favour"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_08
+msgid "Registering compensation for savings accounts"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_51
+msgid "Company issues paper in return for cash"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,journal:0
+#: view:coda.bank.statement:0
+#: field:coda.bank.statement,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_19
+msgid "Settlement of credit cards"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_87
+msgid "Reimbursement of cheque-related costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_50
+msgid "Settlement of instalment credit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_52
+msgid "Payment by a third person"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_60
+msgid "Remittance of documents abroad - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_52
+msgid "Loading GSM cards"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+#: field:coda.bank.statement.line,note:0
+msgid "Notes"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,balance_end_real:0
+msgid "Ending Balance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_64
+msgid "Your issue"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:870
+#, python-format
+msgid ""
+"\n"
+"\n"
+"Bank Journal: %s\n"
+"CODA Version: %s\n"
+"CODA Sequence Number: %s\n"
+"Paper Statement Sequence Number: %s\n"
+"Bank Account: %s\n"
+"Account Holder Name: %s\n"
+"Date: %s, Starting Balance:  %.2f, Ending Balance: %.2f%s"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,val_date:0
+msgid "Valuta Date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_01
+msgid ""
+"Purchase of domestic or foreign securities, including subscription rights, "
+"certificates, etc."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_38
+msgid "Costs relating to incoming foreign and non-SEPA transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_52
+msgid "Whatever the currency of the security"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_069
+msgid "Forward arbitrage contracts : sum to be supplied by customer"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:388
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        There is no invoice matching the Structured Communication '%s'!\n"
+"        Please verify and adjust the invoice and perform the import again or "
+"otherwise change the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_407
+msgid "Costs Article 45"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_007
+msgid "Information concerning the detail cash"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,company_id:0
+#: field:coda.bank.account,company_id:0
+#: field:coda.bank.statement,company_id:0
+#: field:coda.bank.statement.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_35
+msgid "Cash advance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_47
+msgid "Foreign commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_15
+msgid ""
+"Hire-purchase agreement under which the financial institution is the lessor"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_66
+msgid "Remittance of cheque by your branch - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_50
+msgid "Credit of the remitter"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.category,category:0
+msgid "Transaction Category"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,statement_ids:0
+msgid "Generated CODA Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_09
+msgid "Purchase of petrol coupons"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_52
+msgid "Remittance of foreign bill credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_061
+#: model:account.coda.trans.code,description:account_coda.actcc_80_47
+msgid "Charging fees for transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_trans_category
+msgid "CODA transaction category"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_21
+msgid "Other credit applications"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Supplier"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_009
+msgid "Travelling expenses"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_30
+msgid "Various transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_406
+msgid "Collection charges"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+msgid "Transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_50
+msgid "Cash payment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_27
+msgid "Subscription fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_036
+msgid "Costs relating to a refused cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_101
+msgid "Credit transfer or cash payment with structured format communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_127
+msgid "European direct debit (SEPA)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_068
+msgid "Countervalue of an entry"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_010
+#: model:account.coda.trans.code,description:account_coda.actcc_80_31
+msgid "Writ service fee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:635
+#, python-format
+msgid ""
+"\n"
+"The CODA Statement %s Starting Balance (%.2f) does not correspond with the "
+"previous Closing Balance (%.2f) in journal %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_13
+msgid "Your repurchase of issue"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_409
+msgid "Safe deposit charges"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_055
+msgid "Repayment loan or credit capital"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_05
+msgid "Settlement of fixed advance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_15
+msgid ""
+"Commission collected to the debit of the customer to whom the bank delivers "
+"a key which gives access to the night safe"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_059
+msgid "Default interest"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,coda_st_naming:0
+msgid ""
+"Define the rules to create the name of the Bank Statements generated by the "
+"CODA processing.\n"
+"E.g. %(code)s%(y)s/%(paper)s\n"
+"\n"
+"Variables:\n"
+"Bank Journal Code: %(code)s\n"
+"Current Year with Century: %(year)s\n"
+"Current Year without Century: %(y)s\n"
+"CODA sequence number: %(coda)s\n"
+"Paper Statement sequence number: %(paper)s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_108
+#: model:account.coda.trans.code,description:account_coda.actcc_35_01
+#: model:account.coda.trans.code,description:account_coda.actcc_35_50
+msgid "Closing"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.statement.line,globalisation_id:0
+msgid ""
+"Code to identify transactions belonging to the same globalisation level "
+"within a batch payment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_05
+msgid "Commercial paper claimed back"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_411
+msgid "Fixed collection charge"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_64
+msgid "Your winning lottery ticket"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_009
+msgid ""
+"Identification of the de ultimate ordering customer/debtor (SEPA SCT/SDD)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_05
+msgid "Card charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_03
+msgid "Payment card charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_54
+msgid "Remittance of commercial paper for discount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_01
+msgid "Payment"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_07
+msgid "Purchase of gold/pieces"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_15
+msgid "Balance due insurance premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_11
+msgid "Debit of the issuer by the bank in charge of the financial service"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_58
+msgid "Remittance of cheques, vouchers, etc. credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_19
+#: model:account.coda.trans.code,description:account_coda.actcc_09_68
+msgid "Difference in payment"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,date:0
+msgid "Entry Date"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:193
+#, python-format
+msgid ""
+"\n"
+"Please check if the 'Bank Account Number', 'Currency' and 'Account "
+"Description' fields of your configuration record match with '%s', '%s' and "
+"'%s' !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_58
+msgid "Idem without guarantee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:139
+#, python-format
+msgid ""
+"\n"
+"CODA File with Filename '%s' and Creation Date '%s' has already been "
+"imported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_63
+msgid "Second credit of unpaid cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_065
+msgid "Interest payment advice"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,type:0
+#: field:coda.bank.account,state:0
+#: field:coda.bank.statement,type:0
+#: field:coda.bank.statement.line,type:0
+msgid "Type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_112
+msgid "ATM payment (usually Eurocheque card)"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,description1:0
+msgid "Primary Account Description"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_126
+msgid "Term investments"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_100
+msgid ""
+"(SEPA) payment with a structured format communication applying the ISO "
+"standard 11649: Structured creditor reference to remittan"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:164
+#, python-format
+msgid ""
+"\n"
+"Foreign bank accounts with IBAN structure are not supported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_100
+msgid "Gross amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_62
+msgid "Reversal of cheques"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:299
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_64
+#: model:account.coda.trans.code,comment:account_coda.actcc_41_13
+#: model:account.coda.trans.code,comment:account_coda.actcc_41_64
+msgid "Intracompany"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_01
+msgid "Spot purchase of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_429
+msgid "Foreign Stock Exchange tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_05
+#: model:account.coda.trans.code,description:account_coda.actcc_05_54
+msgid "Reimbursement"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:868
+#, python-format
+msgid "None"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_405
+msgid "Bill guarantee commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_06
+msgid "Extension"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_008
+msgid "Identification of the de ultimate beneficiary/creditor (SEPA SCT/SDD)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_49
+msgid "Foreign counter transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_01
+msgid "Cash withdrawal"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_37
+msgid ""
+"Fixed right, either one-off or periodical; for details, see \"categories\""
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_05
+msgid "Loading Proton"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_21
+msgid "Pay-packet charges"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,transfer_account:0
+msgid "Default Internal Transfer Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_074
+msgid "Mailing costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_07
+msgid "Unpaid foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_07
+msgid "Payment by GSM"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: selection:coda.bank.account,state:0
+#: view:coda.bank.statement:0
+#: selection:coda.bank.statement,type:0
+msgid "Normal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_50
+msgid "Credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_80
+msgid "Separately charged costs and provisions"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: field:coda.bank.account,currency:0
+#: field:coda.bank.statement,currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_06
+msgid "Extension of maturity date"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,def_receivable:0
+msgid "Default Receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_15
+msgid "Night safe"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Total Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_214
+msgid "Issue commission (delivery order)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_07
+msgid ""
+"Often by standing order or direct debit. In case of direct debit, family 13 "
+"is used."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_01
+msgid "Loading a GSM card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_021
+msgid "Costs for drawing up a bank cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_026
+msgid "Handling commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_201
+msgid "Advice notice commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_64
+#: model:account.coda.trans.code,description:account_coda.actcc_47_64
+msgid "Warrant"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_07
+msgid "Unpaid commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:120
+#: code:addons/account_coda/wizard/account_coda_import.py:130
+#: code:addons/account_coda/wizard/account_coda_import.py:159
+#: code:addons/account_coda/wizard/account_coda_import.py:168
+#: code:addons/account_coda/wizard/account_coda_import.py:174
+#: code:addons/account_coda/wizard/account_coda_import.py:198
+#: code:addons/account_coda/wizard/account_coda_import.py:272
+#: code:addons/account_coda/wizard/account_coda_import.py:281
+#: code:addons/account_coda/wizard/account_coda_import.py:305
+#: code:addons/account_coda/wizard/account_coda_import.py:440
+#: code:addons/account_coda/wizard/account_coda_import.py:464
+#: code:addons/account_coda/wizard/account_coda_import.py:473
+#: code:addons/account_coda/wizard/account_coda_import.py:497
+#, python-format
+msgid "Data Error!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_010
+msgid "Information pertaining to sale or purchase of securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_54
+msgid "Your payment ATM"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_123
+msgid "Fees and commissions"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:689
+#, python-format
+msgid ""
+"Free Communication:\n"
+" %s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_15
+msgid "Purchase of an international bank cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,coda_st_naming:0
+msgid "Bank Statement Naming Policy"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,date:0
+msgid "Date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_00
+#: model:account.coda.trans.code,description:account_coda.actcc_30_39
+#: model:account.coda.trans.code,description:account_coda.actcc_30_89
+msgid "Undefined transaction"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_06
+msgid "Costs chargeable to the remitter"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_205
+msgid ""
+"Documentary payment commission | Document commission | Drawdown fee | "
+"Negotiation fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_60
+msgid "Settlement of mortgage loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_01
+msgid "Purchase of securities"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import Log"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_07
+msgid "Domestic commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_034
+msgid "Reinvestment fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_12
+msgid "Costs for opening a bank guarantee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_414
+msgid "Regularisation charges"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: field:coda.bank.statement.line,statement_id:0
+#: model:ir.actions.act_window,name:account_coda.act_account_bank_statement_goto_coda_bank_statement
+#: model:ir.model,name:account_coda.model_coda_bank_statement
+msgid "CODA Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_15
+msgid "Your repayment hire-purchase and similar claims"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_62
+msgid "Reversal of cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,code:0
+msgid "Code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_032
+msgid "Drawing up a circular cheque"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+msgid "Seq"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_52
+msgid "Payment night safe"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.act_coda_bank_statement_goto_account_bank_statement
+#: model:ir.model,name:account_coda.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_name:0
+msgid "Counterparty Name"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_006
+msgid "Various fees/commissions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_209
+msgid "Transfer commission"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Information"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_39
+#: model:account.coda.trans.code,description:account_coda.actcc_00_89
+msgid "Cancellation of a transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_3
+msgid ""
+"Simple amount with detailed data; e.g. in case of charges for cross-border "
+"credit transfers."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_15
+msgid "Your purchase of lottery tickets"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_05
+msgid "Collective payments of wages"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_17
+msgid "Collected for unsealed deposit of securities, and other parcels"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_004
+msgid "Counterparty’s banker"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:426
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        No matching partner record found!\n"
+"        Please adjust the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,journal:0
+msgid "Bank Journal for the Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Globalisation"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_54
+msgid "Fixed advance – capital and interest"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_11
+msgid "Payment documents abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_09
+msgid ""
+"Postage recouped to the debit of the customer (including forwarding charges)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_04
+msgid "Costs for holding a documentary cash credit"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,balance_start:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_13
+msgid "Settlement of bank acceptances"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_200
+msgid "Overall documentary credit charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_25
+msgid "Renting of direct debit box"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_52
+msgid ""
+"Payment of coupons from a deposit or settlement of coupons delivered over "
+"the counter - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.statement.line,globalisation_level:0
+msgid ""
+"The value which is mentioned (1 to 9), specifies the hierarchy level of the "
+"globalisation of which this record is the first.\n"
+"The same code will be repeated at the end of the globalisation."
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,description2:0
+msgid "Secondary Account Description"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_211
+msgid "Credit arrangement fee | Additional credit arrangement fee"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: model:ir.actions.act_window,name:account_coda.action_coda_bank_statements
+#: model:ir.ui.menu,name:account_coda.menu_coda_bank_statements
+msgid "CODA Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_62
+msgid "Term loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_70
+msgid "Sale of traveller’s cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,name:0
+#: field:coda.bank.statement,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,coda_creation_date:0
+msgid "CODA Creation Date"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:583
+#: code:addons/account_coda/wizard/account_coda_import.py:904
+#, python-format
+msgid ""
+"\n"
+"Unknown Error : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_035
+msgid "Charges foreign documentary bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_39
+msgid "Agios on guarantees given"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_070
+msgid "Forward arbitrage contracts : sum to be supplied by bank"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_56
+#: model:account.coda.trans.code,description:account_coda.actcc_11_56
+msgid "Reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_23
+msgid ""
+"Costs charged for all kinds of research (information on past transactions, "
+"address retrieval, ...)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_14
+msgid "Handling costs instalment credit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_6
+msgid ""
+"Detail of 2. Simple amount without detailed data. Normally, data of this "
+"kind comes after type 2. The customer may ask for a separate file containing "
+"the detailed data. In that case, one will speak of a ‘separate application’. "
+"The records in a separate application keep type 6."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_17
+msgid "Financial centralisation"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_404
+msgid "Discount commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_45
+msgid "Documentary credit charges"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:913
+#, python-format
+msgid ""
+"\n"
+"Number of errors : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_22
+msgid "Management/custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_51
+msgid "Tender"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_56
+msgid "Non-presented certified cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_408
+msgid "Cover commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_071
+msgid "Fixed loan advance - availability"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+#: field:account.coda.import,coda_fname:0
+msgid "CODA Filename"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_31
+msgid "E.g. for signing invoices"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_37
+msgid "Various costs for possessing or using a payment card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_37
+msgid "Costs related to commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_043
+#: model:account.coda.trans.code,description:account_coda.actcc_80_07
+msgid "Insurance costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_431
+msgid "Delivery of a copy"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,transfer_account:0
+msgid ""
+"Set here the default account that will be used for internal transfer between "
+"own bank accounts (e.g. transfer between current and deposit bank accounts)."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: view:coda.bank.account:0
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,awaiting_account:0
+msgid "Default Account for Unrecognized Movement"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:580
+#: code:addons/account_coda/wizard/account_coda_import.py:897
+#, python-format
+msgid ""
+"\n"
+"System Error : "
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_60
+msgid "Non-presented circular cheque"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,line_ids:0
+msgid "CODA Bank Statement lines"
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:account.coda:0
+msgid "This CODA has already been imported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_19
+msgid "Documentary import credits"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:320
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on movement data record 2.2, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_001
+msgid "Data concerning the counterparty"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.comm.type:0
+msgid "CODA Structured Communication Type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_07
+msgid "Contra-entry of a direct credit or of a discount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_55
+msgid "Interest term investment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_007
+#: model:account.coda.trans.code,description:account_coda.actcc_80_37
+msgid "Access right to database"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_trans_type
+msgid "CODA transaction type"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,account_id:0
+msgid "Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_37
+msgid "Costs relating to the payment of a foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_13
+msgid "Eurocheque written out abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_01
+msgid "Capital and/or interest (specified by the category)"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Glob. Am."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_17
+msgid "Charge for safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_102
+msgid ""
+"Credit transfer or cash payment with reconstituted structured format "
+"communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_86
+msgid "Payment after cession"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_14
+#: model:account.coda.trans.code,description:account_coda.actcc_47_14
+msgid "Warrant fallen due"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,name:account_coda.action_imported_coda_files
+#: model:ir.ui.menu,name:account_coda.menu_imported_coda_files
+msgid "Imported CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_29
+msgid "Charges collected for: - commercial information - sundry information"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_15
+msgid "In case of subscription before the interest due date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_43
+msgid "Foreign cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_62
+msgid "Sale of gold/pieces under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_51
+msgid "The bank takes the initiative for crediting the customer’s account."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_05
+msgid "Full or partial reimbursement of a fixed advance at maturity date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_26
+msgid "Travel insurance premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_416
+msgid "Charges for the deposit of security"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_04
+msgid "At home as well as abroad"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:192
+#, python-format
+msgid ""
+"\n"
+"No matching CODA Bank Account Configuration record found !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_50
+msgid "Remittance of commercial paper - credit after collection"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+msgid "Search CODA Bank Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_410
+msgid "Reclamation charges"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.act_window,help:account_coda.action_coda_bank_statements
+msgid ""
+"The CODA Bank Statements contain the information encoded in their "
+"originating CODA file in a human readable format. The Bank Statements "
+"associated with a CODA contain the subset of the CODA Bank Statement data "
+"that is required for the creation of the Accounting Entries."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_114
+msgid "POS credit - individual transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_70
+msgid "Settlement of discount bank acceptance"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_02
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_08
+msgid "Eurozone = countries which have the euro as their official currency"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_02
+msgid "The bank takes the initiative for debiting the customer’s account."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_58
+msgid "Reversal"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: selection:coda.bank.account,state:0
+#: view:coda.bank.statement:0
+#: selection:coda.bank.statement,type:0
+msgid "Info"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_02
+msgid "Costs relating to electronic output"
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:account.coda.comm.type:0
+msgid "The Structured Communication Code must be unique !"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:57
+#, python-format
+msgid "Wizard in incorrect state. Please hit the Cancel button!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_418
+msgid "Endorsement commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_005
+msgid "Renting of letterbox"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_13
+msgid "Commission for renting a safe deposit box"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_39
+msgid "To be used for issued circular cheques given in consignment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_11
+msgid "Securities"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Free Communication"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_2
+msgid ""
+"Amount as totalised by the bank; e.g. : the total amount of a series of "
+"credit transfers with a structured communication As a matter of principle, "
+"this type will also be used when no detailed data (type 6 or 7) is following."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_37
+msgid "Cheque-related costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_033
+msgid "Charges for a foreign bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_13
+msgid "Cash withdrawal by your branch or agents"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_049
+msgid "Fiscal stamps/stamp duty"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_58
+msgid ""
+"Also for vouchers, postal orders, anything but bills of exchange, "
+"acquittances, promissory notes, etc."
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Select Your File :"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_06
+msgid "Damage relating to bills and cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_09
+msgid "Unpaid voucher"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_13
+msgid "Unissued part (see 64)"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_import
+#: model:ir.actions.act_window,name:account_coda.wizard_account_coda_import_1
+#: model:ir.actions.act_window,name:account_coda.wizard_account_coda_import_2
+#: model:ir.model,name:account_coda.model_account_coda_import
+msgid "Import CODA File"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:289
+#: code:addons/account_coda/wizard/account_coda_import.py:481
+#, python-format
+msgid "Transaction Code unknown, please consult your bank."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_55
+msgid "Fixed advance – interest only"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.type:0
+msgid "CODA Transaction Type"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,globalisation_level:0
+msgid "Globalisation Level"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_020
+msgid "Costs of physical delivery"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_60
+msgid "Sale of foreign bank notes"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.import,note:0
+msgid "Log"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+msgid "Search CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_52
+msgid "Remittance of commercial paper - credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the Bank "
+"Account without removing it."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_54
+msgid "Among other things advances or promissory notes"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_10
+msgid "Purchase of Smartcard"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:664
+#, python-format
+msgid ""
+"Transaction Type: %s - %s\n"
+"Transaction Family: %s - %s\n"
+"Transaction Code: %s - %s\n"
+"Transaction Category: %s - %s\n"
+"Structured Communication Type: %s - %s\n"
+"Communication: %s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_208
+msgid "Commitment fee deferred payment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_005
+msgid "Data concerning the correspondent"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_66
+msgid "For professionals such as insurances and stockbrokers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_19
+msgid ""
+"Collected for securities, gold, pass-books, etc. placed in safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_19
+msgid ""
+"Used in case of payments accepted under reserve of count, result of "
+"overcrediting"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:630
+#, python-format
+msgid ""
+"\n"
+"Configuration Error in journal %s!\n"
+"Please verify the Default Debit and Credit Account settings."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_09
+msgid "Agio on supplier's bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_213
+msgid "Financing fee"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement.line.global,coda_statement_line_ids:0
+msgid "CODA Bank Statement Lines"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:170
+#, python-format
+msgid ""
+"\n"
+"Unsupported bank account structure !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_037
+msgid "Commission for handling charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_03
+msgid "Subscription to securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_425
+msgid "Foreign broker's commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_7
+msgid ""
+"Detail of 2. Simple account with detailed data The records in a separate "
+"application keep type 7."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_125
+#: model:account.coda.trans.code,description:account_coda.actcf_13
+#: view:coda.bank.statement.line:0
+msgid "Credit"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:155
+#, python-format
+msgid ""
+"\n"
+"Foreign bank accounts with BBAN structure are not supported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_09
+msgid "Counter transactions"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_coda_bank_statement_line
+msgid "CODA Bank Statement Line"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_17
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_66
+msgid ""
+"In case of centralisation by the bank, type 2 will be allotted to this "
+"transaction. This total can be followed by the detailed movement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_057
+msgid "Interest subsidy"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_41
+msgid "International credit transfers - non-SEPA credit transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_87
+msgid "Overall amount, VAT included"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_01
+msgid "Payment of a foreign cheque"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "General"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:856
+#, python-format
+msgid ""
+"\n"
+"Incorrect ending Balance in CODA Statement %s for Bank Account %s!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_04
+msgid "Issues"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_37
+msgid ""
+"If any, detail in the category (e.g. costs for presentation for acceptance, "
+"etc.)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_17
+msgid "Purchase of fiscal stamps"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_01
+#: model:account.coda.trans.code,description:account_coda.actcc_41_50
+msgid "Transfer"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "View Bank Statement(s)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_20
+msgid "Drawing up a certificate"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_013
+msgid "Payment commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_01
+msgid ""
+"Bills of exchange, acquittances, promissory notes; debit of the drawee"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "View CODA Bank Statement(s)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_15
+msgid "Your purchase bank cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_05
+msgid "Payment of voucher"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_68
+msgid "Documentary export credits"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,find_bbacom:0
+msgid "Lookup Invoice"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_03
+msgid "Cheques"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_56
+msgid "Unexecutable reimbursement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_03
+msgid "Unpaid debt"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_52
+msgid ""
+"First credit of cheques, vouchers, luncheon vouchers, postal orders, credit "
+"under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_05
+msgid ""
+"Bill claimed back at the drawer's request (bill claimed back before maturity "
+"date)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_11
+msgid ""
+"Costs chargeable to clients who ask to have their correspondence kept at "
+"their disposal at the bank's counter"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_64
+msgid ""
+"Amount paid to the issuer by the bank in charge of the placement (firm "
+"underwriting or not); also used for the payment in full of partly-paid "
+"shares, see transaction 05"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_15
+msgid "Cheque drawn by the bank on itself, usually with charges."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_072
+msgid "Countervalue of commission to third party"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_01
+msgid "Individual transfer order"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:436
+#, python-format
+msgid ""
+"\n"
+"Movement data records of type 2.%s are not supported !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_02
+msgid "Payment by means of a payment card within the Eurozone"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_01
+msgid ""
+"Credit transfer given by the customer on paper or electronically, even if "
+"the execution date of this transfer is in the future. Domestic payments as "
+"well as euro payments meeting the requirements."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_35
+msgid "Closing (periodical settlements for interest, costs,…)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_51
+msgid "Unloading Proton"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_019
+msgid "Tax on physical delivery"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,statement_id:0
+msgid "Associated Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_08
+msgid ""
+"Debit of the remitter when the drawee pays in advance directly to the "
+"remitter (regards bank acceptances)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_103
+msgid "number (e.g. of the cheque, of the card, etc.)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_24
+msgid "Participation in and management of interest refund system"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+msgid "Glob. Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_58
+msgid "Payment by your branch/agents"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_25
+#: model:account.coda.trans.code,description:account_coda.actcc_43_70
+msgid "Purchase of traveller’s cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_39
+msgid "Your issue circular cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_09
+msgid ""
+"For professionals (stockbrokers) only, whoever the issuer may be (Belgian or "
+"foreigner)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_33
+msgid ""
+"Costs not specified otherwise, often with a manual communication (e.g. for "
+"collecting, ordering funds). VAT excluded = type 0 VAT included = type 3 (at "
+"least 3 articles)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_023
+msgid "Exercising fee"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:934
+#, python-format
+msgid "Import CODA File result"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_111
+msgid "POS credit – Globalisation"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Search Bank Transactions"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:577
+#, python-format
+msgid ""
+"\n"
+"Application Error : "
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,description1:0
+#: help:coda.bank.account,description2:0
+msgid ""
+"The Primary or Secondary Account Description should match the corresponding "
+"Account Description in the CODA file."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_17
+msgid "Management fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_03
+msgid "Cash withdrawal by card (ATM)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_16
+msgid "Bank confirmation to revisor or accountant"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcf_04
+msgid "Cards"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Statement"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.type:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_trans_type_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_trans_type_form
+msgid "CODA Transaction Types"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_50
+msgid "Credit after a payment at a terminal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_02
+msgid "Long-term loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_05
+#: model:account.coda.trans.code,description:account_coda.actcc_30_54
+msgid "Capital and/or interest term investment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_68
+msgid "Credit of a payment via electronic purse"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_028
+msgid "Fidelity premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_39
+msgid "Provisionally unpaid due to other reason than manual presentation"
+msgstr ""
+
+#. module: account_coda
+#: constraint:coda.bank.account:0
+msgid ""
+"\n"
+"\n"
+"Configuration Error! \n"
+"The Bank Account Currency should match the Journal Currency !"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_35
+msgid ""
+"Costs charged for calculating the amount of the tax to be paid (e.g. "
+"Fiscomat)."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_014
+msgid "Collection commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_52
+msgid "Remittance of foreign cheque credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_number:0
+msgid "Counterparty Number"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_03
+msgid "See annexe III : communication 124"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:420
+#, python-format
+msgid ""
+"\n"
+"    Bank Statement '%s' line '%s':\n"
+"        The bank account '%s' is not defined for the partner '%s'!\n"
+"        Please correct the configuration and perform the import again or "
+"otherwise change the corresponding entry manually in the generated Bank "
+"Statement."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_113
+msgid "ATM/POS debit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_30_03
+msgid "Forward purchase of foreign exchange"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_50
+msgid "Credit of a payment via terminal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_52
+msgid "Credit provider"
+msgstr ""
+
+#. module: account_coda
+#: selection:account.coda.trans.code,type:0
+msgid "Transaction Family"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_68
+msgid "In case coupons attached to a purchased security are missing"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:57
+#: code:addons/account_coda/wizard/account_coda_import.py:325
+#: code:addons/account_coda/wizard/account_coda_import.py:337
+#: code:addons/account_coda/wizard/account_coda_import.py:362
+#: code:addons/account_coda/wizard/account_coda_import.py:513
+#: code:addons/account_coda/wizard/account_coda_import.py:524
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.statement,type:0
+msgid ""
+"No Bank Statements are associated with CODA Bank Statements of type 'Info'."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_58
+msgid ""
+"Takes priority over transaction 52 (hence a payment made by an agent in a "
+"night safe = 58 and not 52)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_121
+msgid "Commercial bills"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_11
+msgid "Costs for the safe custody of correspondence"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_041
+msgid "Credit card costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_56
+msgid "Subsidy"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_06
+msgid "Payment with tank card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_107
+msgid "Direct debit – DOM’80"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_60
+msgid "Reversal of voucher"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_87
+msgid "Costs refunded"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_17
+msgid "Financial centralisation (debit)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_02
+msgid "Payment to the bank on maturity date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_025
+msgid "Individual entry for exchange charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_004
+#: model:account.coda.trans.code,description:account_coda.actcc_80_09
+msgid "Postage"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_50
+msgid ""
+"For own account - the comment for the client is given in the communication; "
+"also for mixed payments (cash + cheques) - not to be communicated to the "
+"clients; for payments made by a third person: see family 01"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_09_68
+msgid ""
+"In case of payment accepted under reserve of count; result of undercrediting "
+"- see also transaction 19"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,bank_id:0
+msgid ""
+"Bank Account Number.\n"
+"The CODA import function will find its CODA processing parameters on this "
+"number."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_05
+msgid "Payment of wages, etc."
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:coda.bank.account:0
+msgid ""
+"The combination of Bank Account, Account Description and Currency must be "
+"unique !"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Debit"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_10
+msgid "Renewal of agreed maturity date"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_55
+msgid "Income from payments by GSM"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_19
+msgid "Regularisation costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_13
+#: model:account.coda.trans.code,description:account_coda.actcc_41_13
+msgid "Transfer from your account"
+msgstr ""
+
+#. module: account_coda
+#: sql_constraint:account.bank.statement.line.global:0
+msgid "The code must be unique !"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,currency:0
+#: help:coda.bank.statement,currency:0
+msgid "The currency of the CODA Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_07
+msgid "Collective transfers"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:116
+#, python-format
+msgid ""
+"\n"
+"CODA V%s statements are not supported, please contact your bank!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_427
+msgid "Belgian Stock Exchange tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_12
+msgid "Safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_001
+msgid "Interest received"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_import
+msgid "Import CODA Files"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_105
+msgid "original amount of the transaction"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_09
+msgid "Your semi-standing order"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:508
+#, python-format
+msgid ""
+"\n"
+"CODA parsing error on information data record 3.2, seq nr %s!\n"
+"Please report this issue via your OpenERP support channel."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_09
+#: model:account.coda.trans.code,description:account_coda.actcc_11_70
+msgid "Settlement of securities"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_01
+msgid "Debit customer who is loading"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_047
+msgid "Charges extension bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_18
+msgid "Trade information"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.trans.code,comment:0
+msgid "Comment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_203
+msgid ""
+"Confirmation fee | Additional confirmation fee | Commitment fee | Flat fee | "
+"Confirmation reservation commission | Additional reservation commission"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_027
+msgid "Charges for unpaid bills"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_204
+msgid "Amendment fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_11
+msgid "Your semi-standing order – payment to employees"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "CODA Processing"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_11
+msgid "Your repayment mortgage loan"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_00_37
+#: model:account.coda.trans.code,description:account_coda.actcc_01_37
+#: model:account.coda.trans.code,description:account_coda.actcc_04_37
+#: model:account.coda.trans.code,description:account_coda.actcc_05_37
+#: model:account.coda.trans.code,description:account_coda.actcc_09_37
+#: model:account.coda.trans.code,description:account_coda.actcc_11_37
+#: model:account.coda.trans.code,description:account_coda.actcc_30_37
+#: model:account.coda.trans.code,description:account_coda.actcc_35_37
+#: model:account.coda.trans.code,description:account_coda.actcc_80_35
+msgid "Costs"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_050
+msgid "Capital term investment"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_03_05
+msgid "Payment of holiday pay, etc."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_25
+msgid ""
+"Commission for the renting of boxes put at the disposal for the "
+"correspondence"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_008
+#: model:account.coda.trans.code,description:account_coda.actcc_80_29
+msgid "Information charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_03
+msgid ""
+"Credit transfer for which the order has been given once and which is carried "
+"out again at regular intervals without any change."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_0
+msgid ""
+"Simple amount without detailed data; e.g. : an individual credit transfer "
+"(free of charges)."
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,find_partner:0
+msgid "Partner lookup via Bank Account Number."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_403
+msgid "Minimum discount rate"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_47_56
+msgid "Remittance of guaranteed foreign supplier's bill"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_02
+msgid "Tenders"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_43_07
+msgid "Unpaid foreign cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_11_03
+msgid ""
+"Bonds, shares, tap issues of CDs, with or without payment of interest, etc."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_09_66
+msgid "Repurchase of petrol coupons"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_058
+msgid "Capital premium"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_15
+#: model:account.coda.trans.code,description:account_coda.actcc_11_62
+msgid "Interim interest on subscription"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,counterparty_currency:0
+msgid "Counterparty Currency"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_202
+msgid "Advising commission | Additional advising commission"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,find_partner:0
+msgid "Lookup Partner"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+msgid "Glob. Id"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement:0
+#: view:coda.bank.statement.line:0
+#: model:ir.actions.act_window,name:account_coda.action_coda_bank_statement_line
+#: model:ir.ui.menu,name:account_coda.coda_bank_statement_line
+msgid "CODA Statement Lines"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,globalisation_amount:0
+msgid "Globalisation Amount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_01_13
+msgid ""
+"Transfer from one account to another account of the same customer at the "
+"bank's or the customer's initiative (intracompany)."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:890
+#, python-format
+msgid ""
+"\n"
+"Error ! "
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_trans_code
+msgid "CODA transaction code"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_05_52
+msgid "Credit under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:125
+#, python-format
+msgid ""
+"\n"
+"The CODA creation date doesn't fall within a defined Accounting Period!\n"
+"Please create the Accounting Period for date %s."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_04_50
+msgid "Except Proton"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_011
+msgid "Information pertaining to coupons"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_122
+msgid "Bills - calculation of interest"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.code:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_trans_code_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_trans_code_form
+msgid "CODA Transaction Codes"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,state:0
+msgid ""
+"No Bank Statements will be generated for CODA Bank Statements from Bank "
+"Accounts of type 'Info'."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_49_03
+msgid "ATM withdrawal"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_012
+msgid "Exchange commission"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: model:ir.actions.act_window,name:account_coda.action_coda_bank_account_form
+#: model:ir.model,name:account_coda.model_coda_bank_account
+#: model:ir.ui.menu,name:account_coda.menu_action_coda_bank_account_form
+msgid "CODA Bank Account Configuration"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.account,active:0
+msgid "Active"
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/wizard/account_coda_import.py:724
+#, python-format
+msgid ""
+"Partner name: %s \n"
+"Partner Account Number: %s\n"
+"Transaction Type: %s - %s\n"
+"Transaction Family: %s - %s\n"
+"Transaction Code: %s - %s\n"
+"Transaction Category: %s - %s\n"
+"Structured Communication Type: %s - %s\n"
+"Communication: %s"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_04
+msgid "Cash withdrawal from an ATM"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,balance_end:0
+msgid "Balance"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_statement_id:0
+msgid "Associated CODA Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_13_37
+msgid "Credit-related costs"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_manage_coda
+msgid "CODA Configuration"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_07_39
+msgid "Debit of the drawer after credit under usual reserve or discount"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_66
+msgid "Financial centralisation (credit)"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_08
+msgid "Payment in advance"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Close"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_19
+msgid "Special charge for safe custody"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_01
+msgid "Payment of your cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_43_07
+msgid "Foreign cheque remitted for collection that returns unpaid"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_80_07
+msgid ""
+"- insurance costs of account holders against fatal accidents - passing-on of "
+"several insurance costs"
+msgstr ""
+
+#. module: account_coda
+#: help:coda.bank.account,awaiting_account:0
+msgid ""
+"Set here the default account that will be used if the partner cannot be "
+"unambiguously identified."
+msgstr ""
+
+#. module: account_coda
+#: code:addons/account_coda/account_coda.py:280
+#, python-format
+msgid "No CODA Bank Statement found for this Bank Statement!"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_07
+msgid "Definitely unpaid cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_04_08
+msgid "Payment by means of a payment card outside the Eurozone"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.comm.type,description:account_coda.acct_106
+msgid ""
+"Method of calculation (VAT, withholding tax on income, commission, etc.)"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda_comm_type
+msgid "CODA structured communication type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_64
+msgid "Reversal of settlement of credit card"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_58
+msgid ""
+"Repayable securities from a deposit or delivered at the counter - credit "
+"under usual reserve"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.type,description:account_coda.actt_5
+msgid ""
+"Detail of 1. Standard procedure is no detailing. However, the customer may "
+"ask for detailed data to be included into his file after the overall record "
+"(type 1)."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.comm.type,description:0
+#: field:account.coda.trans.category,description:0
+#: field:account.coda.trans.code,description:0
+#: field:account.coda.trans.type,description:0
+msgid "Description"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_07_01
+msgid "Payment commercial paper"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_419
+msgid "Bank service fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_41_37
+msgid "Costs relating to outgoing foreign transfers and non-SEPA transfers"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_03_17
+msgid "Your certified cheque"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_400
+msgid "Acceptance fee"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_11_68
+msgid "Compensation for missing coupon"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Debit Transactions."
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_33
+msgid "Miscellaneous fees and commissions"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_03
+#: model:account.coda.trans.code,description:account_coda.actcc_41_03
+msgid "Standing order"
+msgstr ""
+
+#. module: account_coda
+#: selection:coda.bank.statement.line,type:0
+msgid "Customer"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_49
+#: model:account.coda.trans.code,description:account_coda.actcc_01_99
+#: model:account.coda.trans.code,description:account_coda.actcc_03_49
+#: model:account.coda.trans.code,description:account_coda.actcc_03_99
+#: model:account.coda.trans.code,description:account_coda.actcc_04_49
+#: model:account.coda.trans.code,description:account_coda.actcc_04_99
+#: model:account.coda.trans.code,description:account_coda.actcc_05_49
+#: model:account.coda.trans.code,description:account_coda.actcc_05_99
+#: model:account.coda.trans.code,description:account_coda.actcc_07_49
+#: model:account.coda.trans.code,description:account_coda.actcc_07_99
+#: model:account.coda.trans.code,description:account_coda.actcc_09_49
+#: model:account.coda.trans.code,description:account_coda.actcc_09_99
+#: model:account.coda.trans.code,description:account_coda.actcc_11_49
+#: model:account.coda.trans.code,description:account_coda.actcc_11_99
+#: model:account.coda.trans.code,description:account_coda.actcc_13_49
+#: model:account.coda.trans.code,description:account_coda.actcc_13_99
+#: model:account.coda.trans.code,description:account_coda.actcc_30_49
+#: model:account.coda.trans.code,description:account_coda.actcc_30_99
+#: model:account.coda.trans.code,description:account_coda.actcc_35_49
+#: model:account.coda.trans.code,description:account_coda.actcc_35_99
+#: model:account.coda.trans.code,description:account_coda.actcc_41_49
+#: model:account.coda.trans.code,description:account_coda.actcc_41_99
+#: model:account.coda.trans.code,description:account_coda.actcc_43_49
+#: model:account.coda.trans.code,description:account_coda.actcc_43_99
+#: model:account.coda.trans.code,description:account_coda.actcc_47_49
+#: model:account.coda.trans.code,description:account_coda.actcc_47_99
+#: model:account.coda.trans.code,description:account_coda.actcc_80_49
+#: model:account.coda.trans.code,description:account_coda.actcc_80_99
+msgid "Cancellation or correction"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.account:0
+#: field:coda.bank.account,bank_id:0
+#: field:coda.bank.statement,coda_bank_account_id:0
+#: view:coda.bank.statement.line:0
+#: field:coda.bank.statement.line,coda_bank_account_id:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,comment:account_coda.actcc_13_56
+msgid "Interest or capital subsidy"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "Fin.Account"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_01_62
+msgid "Unpaid postal order"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_428
+msgid "Interest accrued"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda.comm.type,code:0
+msgid "Structured Communication Type"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_401
+msgid "Visa charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_210
+msgid "Commitment fee"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.trans.category:0
+#: model:ir.actions.act_window,name:account_coda.action_account_coda_trans_category_form
+#: model:ir.ui.menu,name:account_coda.menu_action_account_coda_trans_category_form
+msgid "CODA Transaction Categories"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda.import:0
+msgid "Results :"
+msgstr ""
+
+#. module: account_coda
+#: field:coda.bank.statement,coda_id:0
+#: model:ir.actions.act_window,name:account_coda.act_coda_bank_statement_goto_account_coda
+msgid "CODA Data File"
+msgstr ""
+
+#. module: account_coda
+#: view:coda.bank.statement.line:0
+msgid "CODA Statement Line"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_073
+msgid "Costs of ATM abroad"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_018
+msgid "Tental guarantee charges"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.category,description:account_coda.actrca_430
+msgid "Recovery of foreign tax"
+msgstr ""
+
+#. module: account_coda
+#: model:account.coda.trans.code,description:account_coda.actcc_80_01
+msgid "Guarantee card charges"
+msgstr ""
diff --git a/addons/account_coda/i18n/en_GB.po b/addons/l10n_be_coda/i18n/en_GB.po
similarity index 99%
rename from addons/account_coda/i18n/en_GB.po
rename to addons/l10n_be_coda/i18n/en_GB.po
index 34877f12e4a..c338563938b 100644
--- a/addons/account_coda/i18n/en_GB.po
+++ b/addons/l10n_be_coda/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/es.po b/addons/l10n_be_coda/i18n/es.po
similarity index 99%
rename from addons/account_coda/i18n/es.po
rename to addons/l10n_be_coda/i18n/es.po
index 5b25f024134..d50e504740b 100644
--- a/addons/account_coda/i18n/es.po
+++ b/addons/l10n_be_coda/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/es_CR.po b/addons/l10n_be_coda/i18n/es_CR.po
similarity index 99%
rename from addons/account_coda/i18n/es_CR.po
rename to addons/l10n_be_coda/i18n/es_CR.po
index c2e39055856..0a9093b441b 100644
--- a/addons/account_coda/i18n/es_CR.po
+++ b/addons/l10n_be_coda/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: account_coda
diff --git a/addons/account_coda/i18n/es_EC.po b/addons/l10n_be_coda/i18n/es_EC.po
similarity index 99%
rename from addons/account_coda/i18n/es_EC.po
rename to addons/l10n_be_coda/i18n/es_EC.po
index bf0190949f8..e56bb0c70fc 100644
--- a/addons/account_coda/i18n/es_EC.po
+++ b/addons/l10n_be_coda/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/es_MX.po b/addons/l10n_be_coda/i18n/es_MX.po
similarity index 100%
rename from addons/account_coda/i18n/es_MX.po
rename to addons/l10n_be_coda/i18n/es_MX.po
diff --git a/addons/account_coda/i18n/es_PY.po b/addons/l10n_be_coda/i18n/es_PY.po
similarity index 99%
rename from addons/account_coda/i18n/es_PY.po
rename to addons/l10n_be_coda/i18n/es_PY.po
index 61e1c70cd00..2f76f64a0c0 100644
--- a/addons/account_coda/i18n/es_PY.po
+++ b/addons/l10n_be_coda/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/es_VE.po b/addons/l10n_be_coda/i18n/es_VE.po
similarity index 100%
rename from addons/account_coda/i18n/es_VE.po
rename to addons/l10n_be_coda/i18n/es_VE.po
diff --git a/addons/account_coda/i18n/et.po b/addons/l10n_be_coda/i18n/et.po
similarity index 99%
rename from addons/account_coda/i18n/et.po
rename to addons/l10n_be_coda/i18n/et.po
index 58a5306722b..c87d9dda17e 100644
--- a/addons/account_coda/i18n/et.po
+++ b/addons/l10n_be_coda/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/fa.po b/addons/l10n_be_coda/i18n/fa.po
similarity index 99%
rename from addons/account_coda/i18n/fa.po
rename to addons/l10n_be_coda/i18n/fa.po
index 52e3fd35f17..f336ad309db 100644
--- a/addons/account_coda/i18n/fa.po
+++ b/addons/l10n_be_coda/i18n/fa.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/fi.po b/addons/l10n_be_coda/i18n/fi.po
similarity index 99%
rename from addons/account_coda/i18n/fi.po
rename to addons/l10n_be_coda/i18n/fi.po
index 4b19bec3304..c5a714926de 100644
--- a/addons/account_coda/i18n/fi.po
+++ b/addons/l10n_be_coda/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/fr.po b/addons/l10n_be_coda/i18n/fr.po
similarity index 99%
rename from addons/account_coda/i18n/fr.po
rename to addons/l10n_be_coda/i18n/fr.po
index fd16b59661d..67cd0cee126 100644
--- a/addons/account_coda/i18n/fr.po
+++ b/addons/l10n_be_coda/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/gl.po b/addons/l10n_be_coda/i18n/gl.po
similarity index 99%
rename from addons/account_coda/i18n/gl.po
rename to addons/l10n_be_coda/i18n/gl.po
index 8c3fb121484..6a127f9e6e5 100644
--- a/addons/account_coda/i18n/gl.po
+++ b/addons/l10n_be_coda/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/hr.po b/addons/l10n_be_coda/i18n/hr.po
similarity index 99%
rename from addons/account_coda/i18n/hr.po
rename to addons/l10n_be_coda/i18n/hr.po
index 3a5bfaa8744..752bf599172 100644
--- a/addons/account_coda/i18n/hr.po
+++ b/addons/l10n_be_coda/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/hu.po b/addons/l10n_be_coda/i18n/hu.po
similarity index 99%
rename from addons/account_coda/i18n/hu.po
rename to addons/l10n_be_coda/i18n/hu.po
index 8ea46c0b4f8..062c5b36b8a 100644
--- a/addons/account_coda/i18n/hu.po
+++ b/addons/l10n_be_coda/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/it.po b/addons/l10n_be_coda/i18n/it.po
similarity index 99%
rename from addons/account_coda/i18n/it.po
rename to addons/l10n_be_coda/i18n/it.po
index da1085e1ebc..a5368fe2f95 100644
--- a/addons/account_coda/i18n/it.po
+++ b/addons/l10n_be_coda/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/ja.po b/addons/l10n_be_coda/i18n/ja.po
similarity index 99%
rename from addons/account_coda/i18n/ja.po
rename to addons/l10n_be_coda/i18n/ja.po
index f00e380c995..c0685cc5b8d 100644
--- a/addons/account_coda/i18n/ja.po
+++ b/addons/l10n_be_coda/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/lv.po b/addons/l10n_be_coda/i18n/lv.po
similarity index 99%
rename from addons/account_coda/i18n/lv.po
rename to addons/l10n_be_coda/i18n/lv.po
index c79bcc98ff6..314893bba57 100644
--- a/addons/account_coda/i18n/lv.po
+++ b/addons/l10n_be_coda/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/mn.po b/addons/l10n_be_coda/i18n/mn.po
similarity index 99%
rename from addons/account_coda/i18n/mn.po
rename to addons/l10n_be_coda/i18n/mn.po
index 998797c671f..fb87652d3ce 100644
--- a/addons/account_coda/i18n/mn.po
+++ b/addons/l10n_be_coda/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
@@ -25,12 +25,12 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_412
 msgid "Advice of expiry charges"
-msgstr ""
+msgstr "Хугацаа дууссаныг өөрчлөх заавар"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_11
 msgid "Your purchase of luncheon vouchers"
-msgstr ""
+msgstr "Чиний өглөөний хоолны худалдан авах ваучер"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_05
@@ -103,7 +103,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_066
 msgid "Fixed loan advance - reimbursement"
-msgstr ""
+msgstr "Үндсэн зээлийн урьдчилгаа - нөхөн төлбөр"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_05
@@ -197,7 +197,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_413
 msgid "Acceptance charges"
-msgstr ""
+msgstr "Өөрчлөлтийг хүлээн авах"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,counterparty_bic:0
@@ -227,7 +227,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_39
 msgid "Return of an irregular bill of exchange"
-msgstr ""
+msgstr "Арилжааны нэхэмжлэлийг буруу буцаасан"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_011
@@ -298,7 +298,7 @@ msgstr ""
 #. module: account_coda
 #: field:account.coda,date:0
 msgid "Import Date"
-msgstr ""
+msgstr "Импортлох огноо"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_039
@@ -411,7 +411,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_067
 msgid "Fixed loan advance - extension"
-msgstr ""
+msgstr "Зээлийн үндсэн урьдчилгаа-нэмэлт"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_07
@@ -456,7 +456,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_62
 msgid "Remittance of documents abroad - credit after collection"
-msgstr ""
+msgstr "Мөнгөн гуйвуулгыг баримтаар илгээх - кредитийн дараах тусламж"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,name:0
@@ -513,7 +513,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_03_17
 msgid "Amount of the cheque; if any, charges receive code 37"
-msgstr ""
+msgstr "Чекийн дүн; Хэрвээ ямар нэг зардал илгээх бол код 37"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -679,7 +679,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_43_37
 msgid "Costs relating to payment of foreign cheques"
-msgstr ""
+msgstr "Чекийн гадаад зардалын холболт"
 
 #. module: account_coda
 #: field:account.coda.trans.code,parent_id:0
@@ -929,7 +929,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_35
 msgid "Cash advance"
-msgstr ""
+msgstr "Бэлэн мөнгөний урьдчилгаа"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_47
@@ -955,7 +955,7 @@ msgstr ""
 #. module: account_coda
 #: field:account.coda.trans.category,category:0
 msgid "Transaction Category"
-msgstr ""
+msgstr "Бүлэг ангилал"
 
 #. module: account_coda
 #: field:account.coda,statement_ids:0
@@ -1256,7 +1256,7 @@ msgstr "Үндсэн дансны тодорхойлолт"
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_126
 msgid "Term investments"
-msgstr ""
+msgstr "Хөрөнгө оруулалтын хугацаа"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_100
@@ -1357,7 +1357,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_05
 msgid "Loading Proton"
-msgstr ""
+msgstr "Протон унших"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_21
@@ -1498,7 +1498,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_54
 msgid "Your payment ATM"
-msgstr ""
+msgstr "Таны ATM-н төлбөр"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_123
diff --git a/addons/account_coda/i18n/nb.po b/addons/l10n_be_coda/i18n/nb.po
similarity index 89%
rename from addons/account_coda/i18n/nb.po
rename to addons/l10n_be_coda/i18n/nb.po
index 4ea23bb7363..9a60f33494f 100644
--- a/addons/account_coda/i18n/nb.po
+++ b/addons/l10n_be_coda/i18n/nb.po
@@ -14,18 +14,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
 msgid "Cash withdrawal on card (PROTON)"
-msgstr ""
+msgstr "Kontantuttak på kortet (PROTON)"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_412
 msgid "Advice of expiry charges"
-msgstr ""
+msgstr "Råd av utløp kostnader"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_11
@@ -35,7 +35,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_05
 msgid "Partial payment subscription"
-msgstr ""
+msgstr "Delbetaling abonnement"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_54
@@ -45,27 +45,27 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_02
 msgid "Individual transfer order initiated by the bank"
-msgstr ""
+msgstr "Individuell oppdraget initiert av banken"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_21
 msgid "Charges for preparing pay packets"
-msgstr ""
+msgstr "Kostnader for utarbeidelse lønn pakker"
 
 #. module: account_coda
 #: model:account.coda.trans.type,description:account_coda.actt_9
 msgid "Detail of 7. The records in a separate application keep type 9."
-msgstr ""
+msgstr "Detalj av 7. Postene i et eget program beholde Type 9."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_426
 msgid "Belgian broker's commission"
-msgstr ""
+msgstr "Belgisk megler provisjon"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_031
 msgid "Charges foreign cheque"
-msgstr ""
+msgstr "Utenlandsk kostnad sjekk"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_002
@@ -83,16 +83,18 @@ msgid ""
 "cheques debited on account, but debit cancelled afterwards for lack of cover "
 "(double debit/contra-entry of transaction 01 or 05)"
 msgstr ""
+"sjekker trukket på konto, men debet kansellert etterpå for manglende dekning "
+"(dobbel belastning / motpost av transaksjonen 01 eller 05)"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_05
 msgid "Bill claimed back"
-msgstr ""
+msgstr "Regning hevdet tilbake"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_016
 msgid "BLIW/IBLC dues"
-msgstr ""
+msgstr "BLIW / IBLC avgiften"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:911
@@ -103,12 +105,12 @@ msgstr "CODA fil er importert :"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_066
 msgid "Fixed loan advance - reimbursement"
-msgstr ""
+msgstr "Fast lån forhånd - refusjon"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_05
 msgid "Purchase of foreign bank notes"
-msgstr ""
+msgstr "Kjøp av utenlandske sedler"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:277
@@ -118,21 +120,23 @@ msgid ""
 "\n"
 "The File contains an invalid CODA Transaction Family : %s!"
 msgstr ""
+"\n"
+"Filen inneholder en ugyldig CODA Transaksjons Familie:% s!"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_030
 msgid "Account insurance"
-msgstr ""
+msgstr "konto forsikring"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_042
 msgid "Payment card costs"
-msgstr ""
+msgstr "Betalingskort kostnader"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_212
 msgid "Warehousing fee"
-msgstr ""
+msgstr "lagerhold avgift"
 
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:300
@@ -142,21 +146,24 @@ msgid ""
 "The associated Bank Statement has already been confirmed !\n"
 "Please undo this action first!"
 msgstr ""
+"Kan ikke slette CODA Bank erklæringen '% s' av Journal '% s'.\n"
+" Den tilhørende Bank erklæringen har allerede blitt bekreftet!\n"
+" Vennligst angre denne handlingen først!"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_66
 msgid "Financial centralization"
-msgstr ""
+msgstr "finansiell sentralisering"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_420
 msgid "Retention charges"
-msgstr ""
+msgstr "oppbevaring av kostnader"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_50
 msgid "Transfer in your favour"
-msgstr ""
+msgstr "Overfør i din favør"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_87
@@ -172,37 +179,37 @@ msgstr ""
 #: model:account.coda.trans.code,description:account_coda.actcc_43_87
 #: model:account.coda.trans.code,description:account_coda.actcc_47_87
 msgid "Reimbursement of costs"
-msgstr ""
+msgstr "Refusjon av kostnader"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_56
 msgid "Remittance of supplier's bill with guarantee"
-msgstr ""
+msgstr "Remittering av leverandørens regning med garanti"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_002
 msgid "Communication of the bank"
-msgstr ""
+msgstr "Kommunikasjon av banken"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Beløp"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_11_70
 msgid "Only with stockbrokers when they deliver the securities to the bank"
-msgstr ""
+msgstr "Bare med stockbrokers når de levere papirene til banken"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_413
 msgid "Acceptance charges"
-msgstr ""
+msgstr "godkjenningskriterier kostnader"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,counterparty_bic:0
 msgid "Counterparty BIC"
-msgstr ""
+msgstr "Motpart BIC"
 
 #. module: account_coda
 #: help:coda.bank.account,def_receivable:0
@@ -210,6 +217,8 @@ msgid ""
 "Set here the receivable account that will be used, by default, if the "
 "partner is not found."
 msgstr ""
+"Sett fordringen konto som skal brukes som standard, hvis partneren ikke er "
+"funnet."
 
 #. module: account_coda
 #: help:coda.bank.account,def_payable:0
@@ -217,64 +226,66 @@ msgid ""
 "Set here the payable account that will be used, by default, if the partner "
 "is not found."
 msgstr ""
+"Sett den betalbare konto som skal brukes som standard, hvis partneren ikke "
+"er funnet."
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:144
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Advarsel !"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_39
 msgid "Return of an irregular bill of exchange"
-msgstr ""
+msgstr "Retur av en uregelmessig veksel"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_011
 msgid "VAT"
-msgstr ""
+msgstr "MVA"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_07_09
 msgid "Debit of the agios to the account of the drawee"
-msgstr ""
+msgstr "Belastning av Agios til kontoen til den drawee"
 
 #. module: account_coda
 #: view:account.coda.comm.type:0
 #: model:ir.actions.act_window,name:account_coda.action_account_coda_comm_type_form
 #: model:ir.ui.menu,name:account_coda.menu_action_account_coda_comm_type_form
 msgid "CODA Structured Communication Types"
-msgstr ""
+msgstr "CODA Strukturerte typer kommunikasjon"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_30_50
 msgid "Spot sale of foreign exchange"
-msgstr ""
+msgstr "Sted salg av valuta"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Referanse"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_58
 msgid "Remittance of supplier's bill without guarantee"
-msgstr ""
+msgstr "Remittering av leverandørens regning uten garanti."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_03
 msgid "Payment receipt card"
-msgstr ""
+msgstr "kvitteringskortet betaling"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_207
 msgid "Non-conformity fee"
-msgstr ""
+msgstr "Avvik avgift"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_022
 msgid "Priority costs"
-msgstr ""
+msgstr "prioriterte kostnader"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:268
@@ -284,16 +295,18 @@ msgid ""
 "\n"
 "The File contains an invalid CODA Transaction Type : %s!"
 msgstr ""
+"\n"
+"Filen inneholder en ugyldig CODA Transaksjon Type:% s!"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_045
 msgid "Handling costs"
-msgstr ""
+msgstr "håndtering kostnader"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_47_13
 msgid "Debit customer, payment of agios, interest, exchange commission, etc."
-msgstr ""
+msgstr "Debet kunde, betaling av Agios, renter, Exchange Commission, osv."
 
 #. module: account_coda
 #: field:account.coda,date:0
@@ -303,90 +316,90 @@ msgstr "Importdato"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_039
 msgid "Telecommunications"
-msgstr ""
+msgstr "telekommunikasjon"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,globalisation_id:0
 msgid "Globalisation ID"
-msgstr ""
+msgstr "Globalisering ID"
 
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:399
 #, python-format
 msgid "Delete operation not allowed !"
-msgstr ""
+msgstr "Slett operasjonen ikke tillatt!"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_000
 msgid "Net amount"
-msgstr ""
+msgstr "nettobeløp"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_11
 msgid "Department store cheque"
-msgstr ""
+msgstr "Varehus sjekk"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_206
 msgid "Surety fee/payment under reserve"
-msgstr ""
+msgstr "Kausjonist avgift / betaling under Minstepris"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_53
 msgid "Cash deposit at an ATM"
-msgstr ""
+msgstr "Depositum ved en minibank"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_30_52
 msgid "Forward sale of foreign exchange"
-msgstr ""
+msgstr "Videresend salg av valuta"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_11_05
 msgid ""
 "Debit of the subscriber for the complementary payment of partly-paid shares"
-msgstr ""
+msgstr "Debet av abonnenten for utfyllende betaling av delvis betalte aksjer"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_bank_statement_line_global
 msgid "Batch Payment Info"
-msgstr ""
+msgstr "Satsvis Betalingsinformasjon"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_00_33
 #: model:account.coda.trans.code,description:account_coda.actcc_00_83
 msgid "Value correction"
-msgstr ""
+msgstr "verdi korreksjon"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_27
 msgid "For publications of the financial institution"
-msgstr ""
+msgstr "For publikasjoner av finansinstitusjon."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_01
 msgid "Payment of foreign bill"
-msgstr ""
+msgstr "Betaling av utenlandsk regning"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_024
 msgid "Growth premium"
-msgstr ""
+msgstr "vekst premie"
 
 #. module: account_coda
 #: selection:account.coda.trans.code,type:0
 msgid "Transaction Code"
-msgstr ""
+msgstr "Transaksjonskode"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_13
 msgid "Discount foreign supplier's bills"
-msgstr ""
+msgstr "Rabatt utenlandsk leverandørens regninger"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_05
 msgid "Direct debit"
-msgstr ""
+msgstr "Direkte belastning"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_47_11
@@ -396,42 +409,42 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_00
 msgid "Undefined transactions"
-msgstr ""
+msgstr "Udefinerte transaksjoner"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_11_62
 msgid "When reimbursed separately to the subscriber"
-msgstr ""
+msgstr "Når refundert separat til abonnenten"
 
 #. module: account_coda
 #: view:account.coda.trans.category:0
 msgid "CODA Transaction Category"
-msgstr ""
+msgstr "CODA Transaksjon Kategori"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_067
 msgid "Fixed loan advance - extension"
-msgstr ""
+msgstr "Fast lån før - forlengelse"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_07
 msgid "Your repayment instalment credits"
-msgstr ""
+msgstr "Tilbakebetaling kreditter avdrag."
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_09_13
 msgid "On the account of the head office"
-msgstr ""
+msgstr "På grunn av hovedkontoret."
 
 #. module: account_coda
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "Tidsskriftet og perioden valgt å tilhøre samme selskap."
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_115
 msgid "Terminal cash deposit"
-msgstr ""
+msgstr "Terminal depositum"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:301
@@ -441,33 +454,36 @@ msgid ""
 "\n"
 "The File contains an invalid Structured Communication Type : %s!"
 msgstr ""
+"\n"
+"Filen inneholder en ugyldig Strukturert Kommunikasjon Type:% s!"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_43_01
 msgid ""
 "Debit of a cheque in foreign currency or in EUR in favour of a foreigner"
 msgstr ""
+"Belastning av en sjekk i utenlandsk valuta eller euro i favør av en utlending"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_54
 msgid "Discount abroad"
-msgstr ""
+msgstr "Rabatt i utlandet"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_62
 msgid "Remittance of documents abroad - credit after collection"
-msgstr ""
+msgstr "Remittering av dokumenter i utlandet - kreditt etter samling"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,name:0
 msgid "Communication"
-msgstr ""
+msgstr "Kommunikasjon"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_00_35
 #: model:account.coda.trans.code,description:account_coda.actcc_00_85
 msgid "Correction"
-msgstr ""
+msgstr "Rettelse"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:404
@@ -481,86 +497,94 @@ msgid ""
 "otherwise change the corresponding entry manually in the generated Bank "
 "Statement."
 msgstr ""
+"\n"
+"    Bank erklæring '% s' linjen '% s'\n"
+"Ingen partner rekord tildelt: Det er flere partnere med samme "
+"bankkontonummer '% s'!\n"
+"Vennligst korriger konfigurasjonen og utføre import igjen eller på annen "
+"måte endre den tilsvarende oppføringen manuelt i den genererte "
+"kontoutskriften."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_30_33
 #: model:account.coda.trans.code,description:account_coda.actcc_30_83
 msgid "Value (date) correction"
-msgstr ""
+msgstr "Verdi (dato) korreksjon."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_063
 msgid "Rounding differences"
-msgstr ""
+msgstr "Avrundings differanser"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:295
 #: code:addons/account_coda/wizard/account_coda_import.py:487
 #, python-format
 msgid "Transaction Category unknown, please consult your bank."
-msgstr ""
+msgstr "Transaksjon Kategori ukjent, ta kontakt med din bank."
 
 #. module: account_coda
 #: view:account.coda.trans.code:0
 msgid "CODA Transaction Code"
-msgstr ""
+msgstr "CODA Transaksjonskode"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_052
 msgid "Residence state tax"
-msgstr ""
+msgstr "Bosatt i statlig skatt"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_03_17
 msgid "Amount of the cheque; if any, charges receive code 37"
-msgstr ""
+msgstr "Beløpet på sjekken, om noen, kostnader mottakskoden 37"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Additional Information"
-msgstr ""
+msgstr "Tilleggsinformasjon"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_120
 msgid "Correction of a transaction"
-msgstr ""
+msgstr "Korreksjon av en transaksjon."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_64
 #: model:account.coda.trans.code,description:account_coda.actcc_41_64
 msgid "Transfer to your account"
-msgstr ""
+msgstr "Overføring til kontoen din."
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_124
 msgid "Number of the credit card"
-msgstr ""
+msgstr "Antall kredittkort"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_13
 msgid "Renting of safes"
-msgstr ""
+msgstr "Leie av safer"
 
 #. module: account_coda
 #: help:coda.bank.account,find_bbacom:0
 msgid ""
 "Partner lookup via the 'BBA' Structured Communication field of the Invoice."
 msgstr ""
+"Partner oppslag via \"BBA 'Strukturert Kommunikasjon feltet av fakturaen."
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_104
 msgid "Equivalent in EUR"
-msgstr ""
+msgstr "Tilsvarende i EUR."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_50
 msgid "Remittance of foreign bill credit after collection"
-msgstr ""
+msgstr "Remittering av utenlandsk regning kreditt etter samling."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_03
 msgid "Your purchase by payment card"
-msgstr ""
+msgstr "Ditt kjøp med betalingskort."
 
 #. module: account_coda
 #: model:account.coda.trans.type,description:account_coda.actt_1
@@ -571,6 +595,11 @@ msgid ""
 "matter of principle, this type is also used when no detailed data is "
 "following (type 5)."
 msgstr ""
+"Beløp som summerte av kunden; f.eks en fil omgruppering betaling av lønn "
+"eller utbetalinger til leverandører eller en fil samle lokaliseringer "
+"samlinger som kunden er debitert eller kreditert med ett beløp. Som et "
+"spørsmål om prinsipp, er denne typen også brukes når ingen detaljerte data "
+"følger (type 5)."
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:519
@@ -580,47 +609,50 @@ msgid ""
 "CODA parsing error on information data record 3.3, seq nr %s!\n"
 "Please report this issue via your OpenERP support channel."
 msgstr ""
+"\n"
+"CODA analysefeil på informasjon datapost 3.3, seq nr% s!\n"
+"Vennligst rapporter dette problemet via OpenERP støtte kanal."
 
 #. module: account_coda
 #: view:coda.bank.statement.line:0
 msgid "Credit Transactions."
-msgstr ""
+msgstr "Kreditt transaksjoner."
 
 #. module: account_coda
 #: field:account.coda.trans.type,type:0
 msgid "Transaction Type"
-msgstr ""
+msgstr "Transaksjon type"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda
 msgid "Object to store CODA Data Files"
-msgstr ""
+msgstr "Objektet til butikken CODA Datafiler."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_029
 msgid "Protest charges"
-msgstr ""
+msgstr "Protest kostnader."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_053
 #: model:account.coda.trans.code,description:account_coda.actcc_80_43
 msgid "Printing of forms"
-msgstr ""
+msgstr "Trykking av skjemaer."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_003
 msgid "Credit commission"
-msgstr ""
+msgstr "Kreditt provisjon."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_43_58
 msgid "Remittance of foreign cheque credit after collection"
-msgstr ""
+msgstr "Remittering av utenlandsk sjekk kreditt etter samling."
 
 #. module: account_coda
 #: model:account.coda.trans.type,description:account_coda.actt_8
 msgid "Detail of 3."
-msgstr ""
+msgstr "Detalj av 3."
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_05_58
@@ -628,63 +660,65 @@ msgid ""
 "(cancellation of an undue debit of the debtor at the initiative of the "
 "financial institution or the debtor for lack of cover)"
 msgstr ""
+"(kansellering av en unødig belastning for skyldneren på initiativ fra den "
+"finansinstitusjon eller debitor for manglende dekning)"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_11
 msgid "Payable coupons/repayable securities"
-msgstr ""
+msgstr "Betalbare kuponger / tilbakebetalingspliktige verdipapirer"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_50
 msgid "Sale of securities"
-msgstr ""
+msgstr "Salg av verdipapirer."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_51
 msgid "Transfer in your favour – initiated by the bank"
-msgstr ""
+msgstr "Overfør I DIN favør - initiert AV banken."
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,coda_data:0
 #: field:account.coda.import,coda_data:0
 msgid "CODA File"
-msgstr ""
+msgstr "CODA Fil."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_38
 msgid "Provisionally unpaid"
-msgstr ""
+msgstr "Foreløpig ubetalt."
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_003
 msgid "RBP data"
-msgstr ""
+msgstr "RBP data."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_06
 msgid "Share option plan – exercising an option"
-msgstr ""
+msgstr "Aksjeopsjonsprogram - Trener et alternativ"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_051
 msgid "Withholding tax"
-msgstr ""
+msgstr "Kildeskatt."
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_006
 msgid "Information concerning the detail amount"
-msgstr ""
+msgstr "Opplysninger Om Detalj BELØP."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_43_37
 msgid "Costs relating to payment of foreign cheques"
-msgstr ""
+msgstr "Kostnader knyttet Til betaling AV utenlandske sjekker."
 
 #. module: account_coda
 #: field:account.coda.trans.code,parent_id:0
 msgid "Family"
-msgstr ""
+msgstr "Familie"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_66
@@ -694,46 +728,48 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_68
 msgid "Credit after Proton payments"
-msgstr ""
+msgstr "Kreditt etter Proton betalinger."
 
 #. module: account_coda
 #: view:coda.bank.statement:0
 #: field:coda.bank.statement,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Periode"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:588
 #: code:addons/account_coda/wizard/account_coda_import.py:926
 #, python-format
 msgid "CODA Import failed !"
-msgstr ""
+msgstr "CODA Import Feil!"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_09_01
 msgid ""
 "Withdrawal by counter cheque or receipt; cash remitted by the bank clerk"
 msgstr ""
+"Uttak av telleren sjekk eller kvittering, kontanter ettergitt av banken "
+"kontorist."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_01
 msgid "Short-term loan"
-msgstr ""
+msgstr "Kortsiktig lån."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_01
 msgid "Domestic or local SEPA credit transfers"
-msgstr ""
+msgstr "Innenlandske eller lokale SEPA Credit overføringer."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_03
 msgid "Settlement credit cards"
-msgstr ""
+msgstr "Oppgjør kredittkort."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_402
 msgid "Certification costs"
-msgstr ""
+msgstr "Sertifiseringsomkostninger"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_015
@@ -744,19 +780,19 @@ msgstr ""
 #: model:account.coda.trans.category,description:account_coda.actrca_415
 #: model:account.coda.trans.code,description:account_coda.actcc_80_39
 msgid "Surety fee"
-msgstr ""
+msgstr "Kausjonist avgift"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_017
 #: model:account.coda.trans.code,description:account_coda.actcc_80_23
 #: model:account.coda.trans.code,description:account_coda.actcc_80_41
 msgid "Research costs"
-msgstr ""
+msgstr "Forskning Koster"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_07
 msgid "Collective transfer"
-msgstr ""
+msgstr "Kollektiv transport."
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:912
@@ -766,13 +802,16 @@ msgid ""
 "\n"
 "Number of statements : "
 msgstr ""
+"\n"
+"\n"
+"Antall uttalelser: "
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_01_05
 #: model:account.coda.trans.code,comment:account_coda.actcc_01_07
 msgid ""
 "The principal will be debited for the total amount of the file entered."
-msgstr ""
+msgstr "Rektor vil bli belastet for den totale mengden av filen inn."
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:332
@@ -783,21 +822,24 @@ msgid ""
 "CODA parsing error on movement data record 2.3, seq nr %s!\n"
 "Please report this issue via your OpenERP support channel."
 msgstr ""
+"\n"
+"CODA analysefeil på bevegelse datapost 2.3, seq nr% s! Vennligst rapporter "
+"dette problemet via OpenERP støtte kanal."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_52
 msgid "Payment in your favour"
-msgstr ""
+msgstr "Betaling i larm Favør."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_08
 msgid "Registering compensation for savings accounts"
-msgstr ""
+msgstr "Du registrerer kompensasjon for sparekonti."
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_11_51
 msgid "Company issues paper in return for cash"
-msgstr ""
+msgstr "Selskapet utsteder papir i retur for kontanter."
 
 #. module: account_coda
 #: field:coda.bank.account,journal:0
@@ -809,49 +851,49 @@ msgstr "Journal"
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_19
 msgid "Settlement of credit cards"
-msgstr ""
+msgstr "Oppgjør av kredittkort"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_87
 msgid "Reimbursement of cheque-related costs"
-msgstr ""
+msgstr "Refusjon AV sjekk-relaterte kostnader"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_50
 msgid "Settlement of instalment credit"
-msgstr ""
+msgstr "Oppgjør av avbetaling."
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_01_52
 msgid "Payment by a third person"
-msgstr ""
+msgstr "Betaling av en tredje person."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_60
 msgid "Remittance of documents abroad - credit under usual reserve"
-msgstr ""
+msgstr "Remittering AV Dokumenter i Utlandet - kreditt etter vänlig reserve."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_52
 msgid "Loading GSM cards"
-msgstr ""
+msgstr "Varig GSM-Kort"
 
 #. module: account_coda
 #: view:coda.bank.statement:0
 #: view:coda.bank.statement.line:0
 #: field:coda.bank.statement.line,note:0
 msgid "Notes"
-msgstr ""
+msgstr "Notater"
 
 #. module: account_coda
 #: field:coda.bank.statement,balance_end_real:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "sluttsaldo"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_64
 msgid "Your issue"
-msgstr ""
+msgstr "Ditt Problem."
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:870
@@ -871,7 +913,7 @@ msgstr ""
 #. module: account_coda
 #: field:coda.bank.statement.line,val_date:0
 msgid "Valuta Date"
-msgstr ""
+msgstr "Valuta date."
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_11_01
@@ -879,16 +921,19 @@ msgid ""
 "Purchase of domestic or foreign securities, including subscription rights, "
 "certificates, etc."
 msgstr ""
+"Kjøp av innenlandske eller utenlandske verdipapirer, herunder "
+"tegningsretter, sertifikater og lignende"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_41_38
 msgid "Costs relating to incoming foreign and non-SEPA transfers"
 msgstr ""
+"Kostnader knyttet til innkommende utenlandske og ikke-SEPA overføringer."
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_11_52
 msgid "Whatever the currency of the security"
-msgstr ""
+msgstr "Uansett valutaen sikkerheten"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_069
@@ -910,12 +955,12 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_407
 msgid "Costs Article 45"
-msgstr ""
+msgstr "Kostnade Artikkel 45"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_007
 msgid "Information concerning the detail cash"
-msgstr ""
+msgstr "Informasjon Om detaljene kontanter"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -929,18 +974,18 @@ msgstr "Firma"
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_35
 msgid "Cash advance"
-msgstr ""
+msgstr "Kontant På forhånd"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_47
 msgid "Foreign commercial paper"
-msgstr ""
+msgstr "Utenlandske sertifikater."
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_13_15
 msgid ""
 "Hire-purchase agreement under which the financial institution is the lessor"
-msgstr ""
+msgstr "Avbetalingskjøp avtale som finansinstitusjonen er utleier"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_66
@@ -950,98 +995,99 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_07_50
 msgid "Credit of the remitter"
-msgstr ""
+msgstr "Kreditt av betaleren"
 
 #. module: account_coda
 #: field:account.coda.trans.category,category:0
 msgid "Transaction Category"
-msgstr ""
+msgstr "Transaksjonen kategori."
 
 #. module: account_coda
 #: field:account.coda,statement_ids:0
 msgid "Generated CODA Bank Statements"
-msgstr ""
+msgstr "Genererte CODA kontoutskrifter."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_09
 msgid "Purchase of petrol coupons"
-msgstr ""
+msgstr "Kjøp av Bensin kuponger"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_52
 msgid "Remittance of foreign bill credit under usual reserve"
-msgstr ""
+msgstr "Remittering AV utenlandsk Regning kreditt etter vänlig reserve."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_061
 #: model:account.coda.trans.code,description:account_coda.actcc_80_47
 msgid "Charging fees for transactions"
-msgstr ""
+msgstr "Lading for transaksjoner"
 
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_trans_category
 msgid "CODA transaction category"
-msgstr ""
+msgstr "CODA transaksjonen kategori"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_21
 msgid "Other credit applications"
-msgstr ""
+msgstr "Andre kreditt programmerer."
 
 #. module: account_coda
 #: selection:coda.bank.statement.line,type:0
 msgid "Supplier"
-msgstr ""
+msgstr "Leverandør"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_009
 msgid "Travelling expenses"
-msgstr ""
+msgstr "Reiseutgifter"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_30
 msgid "Various transactions"
-msgstr ""
+msgstr "Ulike transaksjoner."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_406
 msgid "Collection charges"
-msgstr ""
+msgstr "Inkassogebyrer."
 
 #. module: account_coda
 #: view:coda.bank.statement:0
 msgid "Transactions"
-msgstr ""
+msgstr "Transaksjoner"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_50
 msgid "Cash payment"
-msgstr ""
+msgstr "Kontant betaling."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_27
 msgid "Subscription fee"
-msgstr ""
+msgstr "Abonnement avgift"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_036
 msgid "Costs relating to a refused cheque"
-msgstr ""
+msgstr "Kostnader knyttet Til no nektet sjekk."
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_101
 msgid "Credit transfer or cash payment with structured format communication"
 msgstr ""
+"Kontooverføring eller kontant betaling med strukturert format kommunikasjon"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_127
 msgid "European direct debit (SEPA)"
-msgstr ""
+msgstr "Europens direkte belastning (SEPA)"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_068
 msgid "Countervalue of an entry"
-msgstr ""
+msgstr "Motverdien AV no oppføring."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_010
@@ -1061,12 +1107,12 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_13
 msgid "Your repurchase of issue"
-msgstr ""
+msgstr "Din tilbakekjøp AV problemet."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_409
 msgid "Safe deposit charges"
-msgstr ""
+msgstr "ankbokser kostnader"
 
 #. module: account_coda
 #: field:coda.bank.account,def_payable:0
@@ -1076,12 +1122,12 @@ msgstr "Standard konto for leverandørgjeld"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_055
 msgid "Repayment loan or credit capital"
-msgstr ""
+msgstr "Nedbetaling Lån Eller kreditt Kapital."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_05
 msgid "Settlement of fixed advance"
-msgstr ""
+msgstr "Oppgjør AV rask forhånd."
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_15
@@ -1089,6 +1135,8 @@ msgid ""
 "Commission collected to the debit of the customer to whom the bank delivers "
 "a key which gives access to the night safe"
 msgstr ""
+"Kommisjonen samles til belastning for kunden hvem banken leverer en nøkkel "
+"som gir tilgang til nattsafe."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_059
@@ -1115,7 +1163,7 @@ msgstr ""
 #: model:account.coda.trans.code,description:account_coda.actcc_35_01
 #: model:account.coda.trans.code,description:account_coda.actcc_35_50
 msgid "Closing"
-msgstr ""
+msgstr "lukker"
 
 #. module: account_coda
 #: help:coda.bank.statement.line,globalisation_id:0
@@ -1123,83 +1171,86 @@ msgid ""
 "Code to identify transactions belonging to the same globalisation level "
 "within a batch payment"
 msgstr ""
+"Kode for å identifisere transaksjoner tilhører samme globalisering nivå "
+"innenfor en batch betaling"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_05
 msgid "Commercial paper claimed back"
-msgstr ""
+msgstr "Sertifikater kreves Tilbake"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_411
 msgid "Fixed collection charge"
-msgstr ""
+msgstr "Rask samling kostnad."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_64
 msgid "Your winning lottery ticket"
-msgstr ""
+msgstr "Din vinnende lodd"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_009
 msgid ""
 "Identification of the de ultimate ordering customer/debtor (SEPA SCT/SDD)"
 msgstr ""
+"Identifisering av de ultimate bestiller kunde / debitor (SEPA SCT / SDD)"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_05
 msgid "Card charges"
-msgstr ""
+msgstr "Kort kostnader."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_03
 msgid "Payment card charges"
-msgstr ""
+msgstr "Betalingskort kostnader"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_54
 msgid "Remittance of commercial paper for discount"
-msgstr ""
+msgstr "Remittering av sertifikatlån for rabatt."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_05_01
 msgid "Payment"
-msgstr ""
+msgstr "Betaling"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Avbryt"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_07
 msgid "Purchase of gold/pieces"
-msgstr ""
+msgstr "Kjøp AV gull / stykk"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_15
 msgid "Balance due insurance premium"
-msgstr ""
+msgstr "Balansere På grunn forsikringspremie."
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_11_11
 msgid "Debit of the issuer by the bank in charge of the financial service"
-msgstr ""
+msgstr "Belastning av utsteder ved bredden ansvarlig for finansiell tjeneste"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_58
 msgid "Remittance of cheques, vouchers, etc. credit after collection"
-msgstr ""
+msgstr "Remittering av sjekker, kuponger, etc. kreditt etter samling."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_19
 #: model:account.coda.trans.code,description:account_coda.actcc_09_68
 msgid "Difference in payment"
-msgstr ""
+msgstr "Forskjellen i betaling."
 
 #. module: account_coda
 #: field:coda.bank.statement.line,date:0
 msgid "Entry Date"
-msgstr ""
+msgstr "Registreringsdato"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:193
@@ -1210,11 +1261,14 @@ msgid ""
 "Description' fields of your configuration record match with '%s', '%s' and "
 "'%s' !"
 msgstr ""
+"\n"
+"Vennligst sjekk om den \"bankkontonummer ',' valuta 'og' Konto Beskrivelse-"
+"feltene i konfigurasjonen posten kamp med«% s ','% s ​​'og'% s '!"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_58
 msgid "Idem without guarantee"
-msgstr ""
+msgstr "Idem uten garanti"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:139
@@ -1228,12 +1282,12 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_63
 msgid "Second credit of unpaid cheque"
-msgstr ""
+msgstr "Andre kreditt for ubetalt sjekk."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_065
 msgid "Interest payment advice"
-msgstr ""
+msgstr "Rentebetaling Råd"
 
 #. module: account_coda
 #: field:account.coda.trans.code,type:0
@@ -1241,7 +1295,7 @@ msgstr ""
 #: field:coda.bank.statement,type:0
 #: field:coda.bank.statement.line,type:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_112
@@ -1251,12 +1305,12 @@ msgstr ""
 #. module: account_coda
 #: field:coda.bank.account,description1:0
 msgid "Primary Account Description"
-msgstr ""
+msgstr "Primære kontobeskrivelsen"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_126
 msgid "Term investments"
-msgstr ""
+msgstr "Langsiktige Investeringer."
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_100
@@ -1264,6 +1318,8 @@ msgid ""
 "(SEPA) payment with a structured format communication applying the ISO "
 "standard 11649: Structured creditor reference to remittan"
 msgstr ""
+"(SEPA) betaling med en strukturert format kommunikasjon søker ISO standard "
+"11649: Strukturert kreditor referanse til remittan."
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:164
@@ -1272,29 +1328,31 @@ msgid ""
 "\n"
 "Foreign bank accounts with IBAN structure are not supported !"
 msgstr ""
+"\n"
+"Utenlandske bankkonti med IBAN struktur støttes ikke!"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_100
 msgid "Gross amount"
-msgstr ""
+msgstr "Bruttobeløp."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_43_62
 msgid "Reversal of cheques"
-msgstr ""
+msgstr "Tilbakeføring AV sjekker"
 
 #. module: account_coda
 #: code:addons/account_coda/account_coda.py:299
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Ugyldig hendelse !"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_01_64
 #: model:account.coda.trans.code,comment:account_coda.actcc_41_13
 #: model:account.coda.trans.code,comment:account_coda.actcc_41_64
 msgid "Intracompany"
-msgstr ""
+msgstr "Bedriftsinterne."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_30_01
@@ -1310,13 +1368,13 @@ msgstr ""
 #: model:account.coda.trans.code,description:account_coda.actcc_05_05
 #: model:account.coda.trans.code,description:account_coda.actcc_05_54
 msgid "Reimbursement"
-msgstr ""
+msgstr "Refusjon"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:868
 #, python-format
 msgid "None"
-msgstr ""
+msgstr "Ingen"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_405
@@ -1326,27 +1384,27 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_06
 msgid "Extension"
-msgstr ""
+msgstr "Utvidelse"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_008
 msgid "Identification of the de ultimate beneficiary/creditor (SEPA SCT/SDD)"
-msgstr ""
+msgstr "Identifisering av de ultimate mottaker / kreditor (SEPA SCT / SDD)"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_49
 msgid "Foreign counter transactions"
-msgstr ""
+msgstr "Utenlandske telleren transaksjoner"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_01
 msgid "Cash withdrawal"
-msgstr ""
+msgstr "Kontantuttak"
 
 #. module: account_coda
 #: field:coda.bank.statement.line,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_37
@@ -1357,7 +1415,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_05
 msgid "Loading Proton"
-msgstr ""
+msgstr "Lasting av Proton"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_21
@@ -1367,22 +1425,22 @@ msgstr ""
 #. module: account_coda
 #: field:coda.bank.account,transfer_account:0
 msgid "Default Internal Transfer Account"
-msgstr ""
+msgstr "Standard Intern overføring Konto."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_074
 msgid "Mailing costs"
-msgstr ""
+msgstr "Portoutgifter"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_07
 msgid "Unpaid foreign bill"
-msgstr ""
+msgstr "Ubetalte utenlandsk Regning."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_07
 msgid "Payment by GSM"
-msgstr ""
+msgstr "Betaling med GSM"
 
 #. module: account_coda
 #: view:coda.bank.account:0
@@ -1390,29 +1448,29 @@ msgstr ""
 #: view:coda.bank.statement:0
 #: selection:coda.bank.statement,type:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_05_50
 msgid "Credit after collection"
-msgstr ""
+msgstr "Kreditt etter samling."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_80
 msgid "Separately charged costs and provisions"
-msgstr ""
+msgstr "Separat lade kostnader og avsetninger"
 
 #. module: account_coda
 #: view:coda.bank.account:0
 #: field:coda.bank.account,currency:0
 #: field:coda.bank.statement,currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_06
 msgid "Extension of maturity date"
-msgstr ""
+msgstr "Utvidelse AV forfall"
 
 #. module: account_coda
 #: field:coda.bank.account,def_receivable:0
@@ -1422,24 +1480,24 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_15
 msgid "Night safe"
-msgstr ""
+msgstr "Nattsafe"
 
 #. module: account_coda
 #: view:coda.bank.statement.line:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Totalt BELØP"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_214
 msgid "Issue commission (delivery order)"
-msgstr ""
+msgstr "Problemet kommisjon (leveranse)"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_13_07
 msgid ""
 "Often by standing order or direct debit. In case of direct debit, family 13 "
 "is used."
-msgstr ""
+msgstr "I tilfelle av direkte belastning, er familien 13 brukes."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_01
@@ -1449,17 +1507,17 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_021
 msgid "Costs for drawing up a bank cheque"
-msgstr ""
+msgstr "Kostnader ved utarbeidelse av en bank sjekk."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_026
 msgid "Handling commission"
-msgstr ""
+msgstr "Håndtering provisjon."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_201
 msgid "Advice notice commission"
-msgstr ""
+msgstr "Råd varsel kommisjon"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_64
@@ -1488,22 +1546,22 @@ msgstr ""
 #: code:addons/account_coda/wizard/account_coda_import.py:497
 #, python-format
 msgid "Data Error!"
-msgstr ""
+msgstr "Data Feil!"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_010
 msgid "Information pertaining to sale or purchase of securities"
-msgstr ""
+msgstr "Informasjon vedrørende Salg Eller Kjøp Av verdipapirer."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_54
 msgid "Your payment ATM"
-msgstr ""
+msgstr "Betalingen ATM."
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_123
 msgid "Fees and commissions"
-msgstr ""
+msgstr "Provisjoner og gebyrer."
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:689
@@ -1512,11 +1570,13 @@ msgid ""
 "Free Communication:\n"
 " %s"
 msgstr ""
+"Gratis Kommunikasjon:\n"
+"%s"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_43_15
 msgid "Purchase of an international bank cheque"
-msgstr ""
+msgstr "Kjøp AV no Internasjonal bank sjekk"
 
 #. module: account_coda
 #: field:coda.bank.account,coda_st_naming:0
@@ -1526,24 +1586,24 @@ msgstr ""
 #. module: account_coda
 #: field:coda.bank.statement,date:0
 msgid "Date"
-msgstr ""
+msgstr "Dato"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_00_00
 #: model:account.coda.trans.code,description:account_coda.actcc_30_39
 #: model:account.coda.trans.code,description:account_coda.actcc_30_89
 msgid "Undefined transaction"
-msgstr ""
+msgstr "Udefinert transaksjon."
 
 #. module: account_coda
 #: view:coda.bank.statement.line:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utvidet Filtere ..."
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_07_06
 msgid "Costs chargeable to the remitter"
-msgstr ""
+msgstr "Kostnader avgiftspliktige Til betaleren."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_205
@@ -1555,7 +1615,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_60
 msgid "Settlement of mortgage loan"
-msgstr ""
+msgstr "Oppgjør av boliglån."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_01
@@ -1565,7 +1625,7 @@ msgstr ""
 #. module: account_coda
 #: field:account.coda,note:0
 msgid "Import Log"
-msgstr ""
+msgstr "Importør logg."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_07
@@ -1580,7 +1640,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_12
 msgid "Costs for opening a bank guarantee"
-msgstr ""
+msgstr "Kostnader for å. Apne en bankgaranti"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_414
@@ -1598,32 +1658,32 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_15
 msgid "Your repayment hire-purchase and similar claims"
-msgstr ""
+msgstr "Tilbakebetaling Leie Eller Kjøp og lignende krav."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_03_62
 msgid "Reversal of cheque"
-msgstr ""
+msgstr "Tilbakeføring AV sjekk."
 
 #. module: account_coda
 #: field:account.coda.trans.code,code:0
 msgid "Code"
-msgstr ""
+msgstr "KODE"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_032
 msgid "Drawing up a circular cheque"
-msgstr ""
+msgstr "Skriver opp en sirkulær sjekk."
 
 #. module: account_coda
 #: view:coda.bank.statement:0
 msgid "Seq"
-msgstr ""
+msgstr "Sekvens"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_52
 msgid "Payment night safe"
-msgstr ""
+msgstr "Nattsafe Betaling."
 
 #. module: account_coda
 #: model:ir.actions.act_window,name:account_coda.act_coda_bank_statement_goto_account_bank_statement
@@ -1634,12 +1694,12 @@ msgstr "Kontoutskrift"
 #. module: account_coda
 #: field:coda.bank.statement.line,counterparty_name:0
 msgid "Counterparty Name"
-msgstr ""
+msgstr "Motpartens navn"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_006
 msgid "Various fees/commissions"
-msgstr ""
+msgstr "Ulike avgifter / provisjoner"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_209
@@ -1649,13 +1709,13 @@ msgstr ""
 #. module: account_coda
 #: selection:coda.bank.statement.line,type:0
 msgid "Information"
-msgstr ""
+msgstr "Informasjon"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_00_39
 #: model:account.coda.trans.code,description:account_coda.actcc_00_89
 msgid "Cancellation of a transaction"
-msgstr ""
+msgstr "Kansellering AV en transaksjon."
 
 #. module: account_coda
 #: model:account.coda.trans.type,description:account_coda.actt_3
@@ -1667,12 +1727,12 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_15
 msgid "Your purchase of lottery tickets"
-msgstr ""
+msgstr "Ditt Kjøp av lodd."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_41_05
 msgid "Collective payments of wages"
-msgstr ""
+msgstr "Kollektive utbetalinger AV Lønn."
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_17
@@ -1682,7 +1742,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_004
 msgid "Counterparty’s banker"
-msgstr ""
+msgstr "Motpartens bankmann."
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:426
@@ -1698,22 +1758,22 @@ msgstr ""
 #. module: account_coda
 #: help:coda.bank.account,journal:0
 msgid "Bank Journal for the Bank Statement"
-msgstr ""
+msgstr "Bank Journal for kontoutskrift."
 
 #. module: account_coda
 #: selection:coda.bank.statement.line,type:0
 msgid "Globalisation"
-msgstr ""
+msgstr "Globalisering."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_54
 msgid "Fixed advance – capital and interest"
-msgstr ""
+msgstr "Rask forhånd - Kapital og Interesse"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_11
 msgid "Payment documents abroad"
-msgstr ""
+msgstr "Betalingsdokumenter i Utlandet."
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_09
@@ -1724,7 +1784,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_04
 msgid "Costs for holding a documentary cash credit"
-msgstr ""
+msgstr "Kostnader for å. Holde en dokumentar kassekreditt."
 
 #. module: account_coda
 #: field:coda.bank.statement,balance_start:0
@@ -1764,7 +1824,7 @@ msgstr ""
 #. module: account_coda
 #: field:coda.bank.account,description2:0
 msgid "Secondary Account Description"
-msgstr ""
+msgstr "Sekundær kontobeskrivelsen."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_211
@@ -1776,23 +1836,23 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_coda.action_coda_bank_statements
 #: model:ir.ui.menu,name:account_coda.menu_coda_bank_statements
 msgid "CODA Bank Statements"
-msgstr ""
+msgstr "CODA kontoutskrifter."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_62
 msgid "Term loan"
-msgstr ""
+msgstr "Lån"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_70
 msgid "Sale of traveller’s cheque"
-msgstr ""
+msgstr "Salg av reisesjekk."
 
 #. module: account_coda
 #: field:coda.bank.account,name:0
 #: field:coda.bank.statement,name:0
 msgid "Name"
-msgstr ""
+msgstr "Navn"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -1808,6 +1868,8 @@ msgid ""
 "\n"
 "Unknown Error : "
 msgstr ""
+"\n"
+"Ukjent feil: "
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_035
@@ -1828,7 +1890,7 @@ msgstr ""
 #: model:account.coda.trans.code,description:account_coda.actcc_09_56
 #: model:account.coda.trans.code,description:account_coda.actcc_11_56
 msgid "Reserve"
-msgstr ""
+msgstr "Reserve"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_23
@@ -1836,11 +1898,13 @@ msgid ""
 "Costs charged for all kinds of research (information on past transactions, "
 "address retrieval, ...)"
 msgstr ""
+"Kostnader belastet for alle typer forskning (informasjon på tidligere "
+"transaksjoner, adresse henting, ...)"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_14
 msgid "Handling costs instalment credit"
-msgstr ""
+msgstr "Håndtering kostnader avbetaling."
 
 #. module: account_coda
 #: model:account.coda.trans.type,description:account_coda.actt_6
@@ -1854,7 +1918,7 @@ msgstr ""
 #. module: account_coda
 #: view:account.coda:0
 msgid "CODA Files"
-msgstr ""
+msgstr "CODA-Filer"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_17
@@ -1864,7 +1928,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_404
 msgid "Discount commission"
-msgstr ""
+msgstr "Rabatt kommisjon."
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_45
@@ -1878,11 +1942,13 @@ msgid ""
 "\n"
 "Number of errors : "
 msgstr ""
+"\n"
+"Antall feil: "
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_22
 msgid "Management/custody"
-msgstr ""
+msgstr "Ledelse / varetekt"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_51
@@ -1897,7 +1963,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_408
 msgid "Cover commission"
-msgstr ""
+msgstr "Dekke Kommisjon."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_071
@@ -1908,12 +1974,12 @@ msgstr ""
 #: field:account.coda,name:0
 #: field:account.coda.import,coda_fname:0
 msgid "CODA Filename"
-msgstr ""
+msgstr "CODA filnavn"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_31
 msgid "E.g. for signing invoices"
-msgstr ""
+msgstr "EG for signering av fakturaer."
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_04_37
@@ -1929,7 +1995,7 @@ msgstr ""
 #: model:account.coda.trans.category,description:account_coda.actrca_043
 #: model:account.coda.trans.code,description:account_coda.actcc_80_07
 msgid "Insurance costs"
-msgstr ""
+msgstr "Forsikringskostnader."
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_431
diff --git a/addons/account_coda/i18n/nl.po b/addons/l10n_be_coda/i18n/nl.po
similarity index 99%
rename from addons/account_coda/i18n/nl.po
rename to addons/l10n_be_coda/i18n/nl.po
index 09d94e628b4..9a89c7a1002 100644
--- a/addons/account_coda/i18n/nl.po
+++ b/addons/l10n_be_coda/i18n/nl.po
@@ -14,43 +14,43 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
 msgid "Cash withdrawal on card (PROTON)"
-msgstr ""
+msgstr "Stornering"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_412
 msgid "Advice of expiry charges"
-msgstr ""
+msgstr "Bericht van afloop kosten"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_11
 msgid "Your purchase of luncheon vouchers"
-msgstr ""
+msgstr "Uw aankoop van maaltijdbonnen"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_05
 msgid "Partial payment subscription"
-msgstr ""
+msgstr "Gedeeltelijke betalings omschrijving"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_54
 msgid "Unexecutable transfer order"
-msgstr ""
+msgstr "Niet uitvoerbare overschrijvingsopdracht"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_02
 msgid "Individual transfer order initiated by the bank"
-msgstr ""
+msgstr "Individuele overschrijvingsopdracht door de bank"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_21
 msgid "Charges for preparing pay packets"
-msgstr ""
+msgstr "Kosten voorbereiding van loonstroken"
 
 #. module: account_coda
 #: model:account.coda.trans.type,description:account_coda.actt_9
@@ -60,7 +60,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_426
 msgid "Belgian broker's commission"
-msgstr ""
+msgstr "Belgische handelaars provisie"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_031
@@ -70,7 +70,7 @@ msgstr "Kosten buitenlandse cheque"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_002
 msgid "Interest paid"
-msgstr ""
+msgstr "Betaalde rente"
 
 #. module: account_coda
 #: field:account.coda.trans.type,parent_id:0
@@ -3736,7 +3736,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_073
 msgid "Costs of ATM abroad"
-msgstr "Kosten buitenlandse ATM"
+msgstr "ATM Kosten Buitenland"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_018
diff --git a/addons/account_coda/i18n/nl_BE.po b/addons/l10n_be_coda/i18n/nl_BE.po
similarity index 99%
rename from addons/account_coda/i18n/nl_BE.po
rename to addons/l10n_be_coda/i18n/nl_BE.po
index 3eb846c99f5..2b59df9afdf 100644
--- a/addons/account_coda/i18n/nl_BE.po
+++ b/addons/l10n_be_coda/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/pl.po b/addons/l10n_be_coda/i18n/pl.po
similarity index 99%
rename from addons/account_coda/i18n/pl.po
rename to addons/l10n_be_coda/i18n/pl.po
index eb058fe3156..ebbc391d691 100644
--- a/addons/account_coda/i18n/pl.po
+++ b/addons/l10n_be_coda/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
@@ -222,7 +222,7 @@ msgstr ""
 #: code:addons/account_coda/wizard/account_coda_import.py:144
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Ostrzeżenie !"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_39
@@ -232,7 +232,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_011
 msgid "VAT"
-msgstr ""
+msgstr "VAT"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_07_09
diff --git a/addons/account_coda/i18n/pt.po b/addons/l10n_be_coda/i18n/pt.po
similarity index 99%
rename from addons/account_coda/i18n/pt.po
rename to addons/l10n_be_coda/i18n/pt.po
index 9e9d37db04b..e4bbc5faf4b 100644
--- a/addons/account_coda/i18n/pt.po
+++ b/addons/l10n_be_coda/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/pt_BR.po b/addons/l10n_be_coda/i18n/pt_BR.po
similarity index 99%
rename from addons/account_coda/i18n/pt_BR.po
rename to addons/l10n_be_coda/i18n/pt_BR.po
index 0595eb4a099..973d6a43697 100644
--- a/addons/account_coda/i18n/pt_BR.po
+++ b/addons/l10n_be_coda/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/ro.po b/addons/l10n_be_coda/i18n/ro.po
similarity index 99%
rename from addons/account_coda/i18n/ro.po
rename to addons/l10n_be_coda/i18n/ro.po
index a783e720443..88d6314b5b2 100644
--- a/addons/account_coda/i18n/ro.po
+++ b/addons/l10n_be_coda/i18n/ro.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-01-20 20:13+0000\n"
-"Last-Translator: Mihai Satmarean <Unknown>\n"
+"PO-Revision-Date: 2012-10-17 08:26+0000\n"
+"Last-Translator: filsys <office@filsystem.ro>\n"
 "Language-Team: Romanian <ro@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
@@ -2433,7 +2433,7 @@ msgstr ""
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Select Your File :"
-msgstr ""
+msgstr "Selectati fisierul :"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_06
diff --git a/addons/account_coda/i18n/ru.po b/addons/l10n_be_coda/i18n/ru.po
similarity index 99%
rename from addons/account_coda/i18n/ru.po
rename to addons/l10n_be_coda/i18n/ru.po
index 882a1b678f5..1649b5e11a5 100644
--- a/addons/account_coda/i18n/ru.po
+++ b/addons/l10n_be_coda/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/sl.po b/addons/l10n_be_coda/i18n/sl.po
similarity index 99%
rename from addons/account_coda/i18n/sl.po
rename to addons/l10n_be_coda/i18n/sl.po
index 35f91ad711c..7efd0abbd7d 100644
--- a/addons/account_coda/i18n/sl.po
+++ b/addons/l10n_be_coda/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/sq.po b/addons/l10n_be_coda/i18n/sq.po
similarity index 99%
rename from addons/account_coda/i18n/sq.po
rename to addons/l10n_be_coda/i18n/sq.po
index 9374162f3c1..3c80bf4736f 100644
--- a/addons/account_coda/i18n/sq.po
+++ b/addons/l10n_be_coda/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/sr.po b/addons/l10n_be_coda/i18n/sr.po
similarity index 99%
rename from addons/account_coda/i18n/sr.po
rename to addons/l10n_be_coda/i18n/sr.po
index 24de0938b50..009b34d4919 100644
--- a/addons/account_coda/i18n/sr.po
+++ b/addons/l10n_be_coda/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/sr@latin.po b/addons/l10n_be_coda/i18n/sr@latin.po
similarity index 99%
rename from addons/account_coda/i18n/sr@latin.po
rename to addons/l10n_be_coda/i18n/sr@latin.po
index 12ae7182144..28b36a6eb27 100644
--- a/addons/account_coda/i18n/sr@latin.po
+++ b/addons/l10n_be_coda/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/sv.po b/addons/l10n_be_coda/i18n/sv.po
similarity index 98%
rename from addons/account_coda/i18n/sv.po
rename to addons/l10n_be_coda/i18n/sv.po
index dcf16fa5d41..9d36c4a599a 100644
--- a/addons/account_coda/i18n/sv.po
+++ b/addons/l10n_be_coda/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
@@ -550,7 +550,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_104
 msgid "Equivalent in EUR"
-msgstr ""
+msgstr "Motsvarighet i EUR"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_47_50
@@ -605,7 +605,7 @@ msgstr ""
 #: model:account.coda.trans.category,description:account_coda.actrca_053
 #: model:account.coda.trans.code,description:account_coda.actcc_80_43
 msgid "Printing of forms"
-msgstr ""
+msgstr "Skriver ut formulär"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_003
@@ -834,7 +834,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_52
 msgid "Loading GSM cards"
-msgstr ""
+msgstr "Laddar GSM-kort"
 
 #. module: account_coda
 #: view:coda.bank.statement:0
@@ -910,7 +910,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_407
 msgid "Costs Article 45"
-msgstr ""
+msgstr "Kostnadsartikel 45"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_007
@@ -996,7 +996,7 @@ msgstr "Leverantör"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_009
 msgid "Travelling expenses"
-msgstr ""
+msgstr "Resekostnad"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcf_30
@@ -1137,7 +1137,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_64
 msgid "Your winning lottery ticket"
-msgstr ""
+msgstr "Din vinnande lott"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_009
@@ -1382,7 +1382,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_07
 msgid "Payment by GSM"
-msgstr ""
+msgstr "Betalning via GSM"
 
 #. module: account_coda
 #: view:coda.bank.account:0
@@ -1444,7 +1444,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_01
 msgid "Loading a GSM card"
-msgstr ""
+msgstr "Laddar GSM-kort"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_021
@@ -1488,7 +1488,7 @@ msgstr ""
 #: code:addons/account_coda/wizard/account_coda_import.py:497
 #, python-format
 msgid "Data Error!"
-msgstr ""
+msgstr "Datafel!"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_010
@@ -1667,7 +1667,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_15
 msgid "Your purchase of lottery tickets"
-msgstr ""
+msgstr "Ditt köp av lotter"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_41_05
@@ -1808,6 +1808,8 @@ msgid ""
 "\n"
 "Unknown Error : "
 msgstr ""
+"\n"
+"Okänt fel : "
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_035
@@ -1854,7 +1856,7 @@ msgstr ""
 #. module: account_coda
 #: view:account.coda:0
 msgid "CODA Files"
-msgstr ""
+msgstr "CODA-filer"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_17
@@ -1878,6 +1880,8 @@ msgid ""
 "\n"
 "Number of errors : "
 msgstr ""
+"\n"
+"Antal fel : "
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_80_22
@@ -1908,7 +1912,7 @@ msgstr ""
 #: field:account.coda,name:0
 #: field:account.coda.import,coda_fname:0
 msgid "CODA Filename"
-msgstr ""
+msgstr "CODA-filnamn"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_31
@@ -1934,7 +1938,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_431
 msgid "Delivery of a copy"
-msgstr ""
+msgstr "Leverans av kopia"
 
 #. module: account_coda
 #: help:coda.bank.account,transfer_account:0
@@ -1964,6 +1968,8 @@ msgid ""
 "\n"
 "System Error : "
 msgstr ""
+"\n"
+"Systemfel : "
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_60
@@ -2122,7 +2128,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_04_04
 msgid "At home as well as abroad"
-msgstr ""
+msgstr "Hemma och utomlands"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:192
@@ -2170,7 +2176,7 @@ msgstr ""
 #: model:account.coda.trans.code,comment:account_coda.actcc_04_02
 #: model:account.coda.trans.code,comment:account_coda.actcc_04_08
 msgid "Eurozone = countries which have the euro as their official currency"
-msgstr ""
+msgstr "Eurozon = Länder som använder euro som deras officiella valuta"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_01_02
@@ -2298,7 +2304,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_coda.wizard_account_coda_import_2
 #: model:ir.model,name:account_coda.model_account_coda_import
 msgid "Import CODA File"
-msgstr ""
+msgstr "Importera CODA-fil"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:289
@@ -2340,7 +2346,7 @@ msgstr "Logg"
 #. module: account_coda
 #: view:account.coda:0
 msgid "Search CODA Files"
-msgstr ""
+msgstr "Sök CODA-filer"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_52
@@ -2504,7 +2510,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_03_87
 msgid "Overall amount, VAT included"
-msgstr ""
+msgstr "Totalt belopp, inklusive moms"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_43_01
@@ -2545,7 +2551,7 @@ msgstr ""
 #: model:account.coda.trans.code,description:account_coda.actcc_41_01
 #: model:account.coda.trans.code,description:account_coda.actcc_41_50
 msgid "Transfer"
-msgstr ""
+msgstr "Överföring"
 
 #. module: account_coda
 #: view:account.coda.import:0
@@ -2686,7 +2692,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_019
 msgid "Tax on physical delivery"
-msgstr ""
+msgstr "Moms på fysisk leverans"
 
 #. module: account_coda
 #: field:coda.bank.statement,statement_id:0
@@ -2725,7 +2731,7 @@ msgstr ""
 #: model:account.coda.trans.code,description:account_coda.actcc_09_25
 #: model:account.coda.trans.code,description:account_coda.actcc_43_70
 msgid "Purchase of traveller’s cheque"
-msgstr ""
+msgstr "Köp av resecheckar"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_39
@@ -2775,6 +2781,8 @@ msgid ""
 "\n"
 "Application Error : "
 msgstr ""
+"\n"
+"Applikationsfel : "
 
 #. module: account_coda
 #: help:coda.bank.account,description1:0
@@ -2824,7 +2832,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_02
 msgid "Long-term loan"
-msgstr ""
+msgstr "Långtidslån"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_30_05
@@ -2967,7 +2975,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_041
 msgid "Credit card costs"
-msgstr ""
+msgstr "Kreditkortskostnad"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_13_56
@@ -3013,7 +3021,7 @@ msgstr ""
 #: model:account.coda.trans.category,description:account_coda.actrca_004
 #: model:account.coda.trans.code,description:account_coda.actcc_80_09
 msgid "Postage"
-msgstr ""
+msgstr "Porto"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_09_50
@@ -3041,7 +3049,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_05
 msgid "Payment of wages, etc."
-msgstr ""
+msgstr "Betalning av löner, etc."
 
 #. module: account_coda
 #: sql_constraint:coda.bank.account:0
@@ -3063,7 +3071,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_55
 msgid "Income from payments by GSM"
-msgstr ""
+msgstr "Ingående betalningar via GSM"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_19
@@ -3074,7 +3082,7 @@ msgstr ""
 #: model:account.coda.trans.code,description:account_coda.actcc_01_13
 #: model:account.coda.trans.code,description:account_coda.actcc_41_13
 msgid "Transfer from your account"
-msgstr ""
+msgstr "Överföring från ditt konto"
 
 #. module: account_coda
 #: sql_constraint:account.bank.statement.line.global:0
@@ -3118,7 +3126,7 @@ msgstr ""
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_import
 msgid "Import CODA Files"
-msgstr ""
+msgstr "Importera CODA-filer"
 
 #. module: account_coda
 #: model:account.coda.comm.type,description:account_coda.acct_105
@@ -3354,7 +3362,7 @@ msgstr "Användare"
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_trans_code
 msgid "CODA transaction code"
-msgstr ""
+msgstr "CODA-transaktionskod"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_05_52
@@ -3402,7 +3410,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_49_03
 msgid "ATM withdrawal"
-msgstr ""
+msgstr "Bankomatuttag"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_012
@@ -3439,7 +3447,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_04_04
 msgid "Cash withdrawal from an ATM"
-msgstr ""
+msgstr "Kontantuttag från bankomat"
 
 #. module: account_coda
 #: field:coda.bank.statement,balance_end:0
@@ -3459,7 +3467,7 @@ msgstr ""
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_manage_coda
 msgid "CODA Configuration"
-msgstr ""
+msgstr "CODA-konfiguration"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_07_39
@@ -3474,7 +3482,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_07_08
 msgid "Payment in advance"
-msgstr ""
+msgstr "Förbetalning"
 
 #. module: account_coda
 #: view:account.coda.import:0
@@ -3670,7 +3678,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_62
 msgid "Unpaid postal order"
-msgstr ""
+msgstr "Obetald postorder"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_428
@@ -3685,7 +3693,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_401
 msgid "Visa charges"
-msgstr ""
+msgstr "Visa-kostnad"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_210
@@ -3723,7 +3731,7 @@ msgstr ""
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_073
 msgid "Costs of ATM abroad"
-msgstr ""
+msgstr "Bankomatkostnad utomlands"
 
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_018
@@ -3797,3 +3805,6 @@ msgstr ""
 #, python-format
 #~ msgid "The bank account %s is not defined for the partner %s.\n"
 #~ msgstr "Bankkontot %s är inte definierat för partner %s.\n"
+
+#~ msgid "Select your file :"
+#~ msgstr "Välj din fil :"
diff --git a/addons/account_coda/i18n/tr.po b/addons/l10n_be_coda/i18n/tr.po
similarity index 99%
rename from addons/account_coda/i18n/tr.po
rename to addons/l10n_be_coda/i18n/tr.po
index 2442192cc39..53859d4ee42 100644
--- a/addons/account_coda/i18n/tr.po
+++ b/addons/l10n_be_coda/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/vi.po b/addons/l10n_be_coda/i18n/vi.po
similarity index 99%
rename from addons/account_coda/i18n/vi.po
rename to addons/l10n_be_coda/i18n/vi.po
index d6bfd44b355..8982c7aa34c 100644
--- a/addons/account_coda/i18n/vi.po
+++ b/addons/l10n_be_coda/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/i18n/zh_CN.po b/addons/l10n_be_coda/i18n/zh_CN.po
similarity index 99%
rename from addons/account_coda/i18n/zh_CN.po
rename to addons/l10n_be_coda/i18n/zh_CN.po
index 16883f70c71..c18ff96e735 100644
--- a/addons/account_coda/i18n/zh_CN.po
+++ b/addons/l10n_be_coda/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-04-21 06:27+0000\n"
+"PO-Revision-Date: 2012-11-03 03:35+0000\n"
 "Last-Translator: chiachen <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-11-04 04:55+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
@@ -25,27 +25,27 @@ msgstr "信用卡取现"
 #. module: account_coda
 #: model:account.coda.trans.category,description:account_coda.actrca_412
 msgid "Advice of expiry charges"
-msgstr ""
+msgstr "费用逾期建议"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_11
 msgid "Your purchase of luncheon vouchers"
-msgstr ""
+msgstr "你购买的午餐券"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_11_05
 msgid "Partial payment subscription"
-msgstr ""
+msgstr "分期付款认购"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_54
 msgid "Unexecutable transfer order"
-msgstr ""
+msgstr "未执行的转帐"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_01_02
 msgid "Individual transfer order initiated by the bank"
-msgstr ""
+msgstr "银行初始化个人转帐"
 
 #. module: account_coda
 #: model:account.coda.trans.code,comment:account_coda.actcc_80_21
diff --git a/addons/account_coda/i18n/zh_TW.po b/addons/l10n_be_coda/i18n/zh_TW.po
similarity index 99%
rename from addons/account_coda/i18n/zh_TW.po
rename to addons/l10n_be_coda/i18n/zh_TW.po
index ca129f53305..035678ca4da 100644
--- a/addons/account_coda/i18n/zh_TW.po
+++ b/addons/l10n_be_coda/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: account_coda
 #: model:account.coda.trans.code,description:account_coda.actcc_09_21
diff --git a/addons/account_coda/account_coda.py b/addons/l10n_be_coda/l10n_be_coda.py
similarity index 98%
rename from addons/account_coda/account_coda.py
rename to addons/l10n_be_coda/l10n_be_coda.py
index cd117b5be88..1dab4ab1964 100644
--- a/addons/account_coda/account_coda.py
+++ b/addons/l10n_be_coda/l10n_be_coda.py
@@ -107,11 +107,12 @@ class coda_bank_account(osv.osv):
         if not default:
             default = {}
         default = default.copy()
-        default.update({'journal_id': None})
-        default['description1'] = cba['description1'] or ''
-        default['description2'] = cba['description2'] or ''
-        default['name'] = (cba['name'] or '') + ' (copy)'
-        default['state'] = cba['state']
+        default.update(
+            journal_id=None,
+            description1=cba['description1'] or '',
+            description2=cba['description2'] or '',
+            name=_("%s (copy)") % (cba['name'] or ''),
+            state=cba['state'])
         return super(coda_bank_account, self).copy(cr, uid, id, default, context)
 
     def onchange_state(self, cr, uid, ids, state):
@@ -170,6 +171,7 @@ class account_coda_trans_type(osv.osv):
         'parent_id': fields.many2one('account.coda.trans.type', 'Parent'),
         'description': fields.text('Description', translate=True),
     }
+
 account_coda_trans_type()
 
 class account_coda_trans_code(osv.osv):
@@ -186,6 +188,7 @@ class account_coda_trans_code(osv.osv):
         'description': fields.char('Description', size=128, translate=True, select=2),
         'comment': fields.text('Comment', translate=True),
     }
+
 account_coda_trans_code()
 
 class account_coda_trans_category(osv.osv):
@@ -196,6 +199,7 @@ class account_coda_trans_category(osv.osv):
         'category': fields.char('Transaction Category', size=3, required=True),
         'description': fields.char('Description', size=256, translate=True),
     }
+
 account_coda_trans_category()
 
 class account_coda_comm_type(osv.osv):
@@ -208,14 +212,17 @@ class account_coda_comm_type(osv.osv):
     }
     _sql_constraints = [
         ('code_uniq', 'unique (code)','The Structured Communication Code must be unique !')
-        ]
+    ]
+
 account_coda_comm_type()
 
 class coda_bank_statement(osv.osv):
     _name = 'coda.bank.statement'
     _description = 'CODA Bank Statement'
 
-    def _default_journal_id(self, cr, uid, context={}):
+    def _default_journal_id(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         if context.get('journal_id', False):
             return context['journal_id']
         return False
@@ -231,7 +238,7 @@ class coda_bank_statement(osv.osv):
             res[r] = round(res[r], 2)
         return res
 
-    def _get_period(self, cr, uid, context={}):
+    def _get_period(self, cr, uid, context=None):
         periods = self.pool.get('account.period').find(cr, uid)
         if periods:
             return periods[0]
@@ -403,6 +410,7 @@ class account_bank_statement_line_global(osv.osv):
     _columns = {
         'coda_statement_line_ids': fields.one2many('coda.bank.statement.line', 'globalisation_id', 'CODA Bank Statement Lines', readonly=True),
     }
+
 account_bank_statement_line_global()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_coda/account_coda_comm_type.xml b/addons/l10n_be_coda/l10n_be_coda_comm_type.xml
similarity index 100%
rename from addons/account_coda/account_coda_comm_type.xml
rename to addons/l10n_be_coda/l10n_be_coda_comm_type.xml
diff --git a/addons/account_coda/account_coda_trans_category.xml b/addons/l10n_be_coda/l10n_be_coda_trans_category.xml
similarity index 100%
rename from addons/account_coda/account_coda_trans_category.xml
rename to addons/l10n_be_coda/l10n_be_coda_trans_category.xml
diff --git a/addons/account_coda/account_coda_trans_code.xml b/addons/l10n_be_coda/l10n_be_coda_trans_code.xml
similarity index 100%
rename from addons/account_coda/account_coda_trans_code.xml
rename to addons/l10n_be_coda/l10n_be_coda_trans_code.xml
diff --git a/addons/account_coda/account_coda_trans_type.xml b/addons/l10n_be_coda/l10n_be_coda_trans_type.xml
similarity index 100%
rename from addons/account_coda/account_coda_trans_type.xml
rename to addons/l10n_be_coda/l10n_be_coda_trans_type.xml
diff --git a/addons/account_coda/account_coda_view.xml b/addons/l10n_be_coda/l10n_be_coda_view.xml
similarity index 96%
rename from addons/account_coda/account_coda_view.xml
rename to addons/l10n_be_coda/l10n_be_coda_view.xml
index 0b42ad6352f..d5067e7951a 100644
--- a/addons/account_coda/account_coda_view.xml
+++ b/addons/l10n_be_coda/l10n_be_coda_view.xml
@@ -16,11 +16,11 @@
                 <filter string="Info" domain="[('state','=','info')]" icon="terp-folder-yellow"/>
                 <field name="bank_id"/>
                 <field name="journal"/>
-                <field name="currency"/>
+                <field name="currency" groups="base.group_multi_currency"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <group expand="0" string="Group By...">
                     <filter string="Bank Account" icon="terp-folder-yellow" domain="[]" context="{'group_by':'bank_id'}"/>
-                    <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}"/>
+                    <filter string="Currency" icon="terp-dolar" domain="[]" context="{'group_by':'currency'}" groups="base.group_multi_currency"/>
                 </group>
             </search>
         </field>
@@ -32,7 +32,7 @@
         <tree string="CODA Bank Account Configuration">
           <field name="name"/>
           <field name="bank_id"/>
-          <field name="currency"/>
+          <field name="currency" groups="base.group_multi_currency"/>
           <field name="description1"/>
           <field name="journal"/>
           <field name="state"/>
@@ -48,7 +48,7 @@
                 <field name="name" colspan="4"/>
                 <field name="bank_id" domain="[('partner_id.ref_companies', 'in', [company_id])]"/>
                 <field name="description1"/>
-                <field name="currency"/>
+                <field name="currency" groups="base.group_multi_currency"/>
                 <field name="description2"/>
                 <field name="coda_st_naming"/>
                 <field name="state" on_change="onchange_state(state)"/>
@@ -305,7 +305,7 @@
                       <field name="name"/>
                       <field name="date"/>
                       <field name="coda_bank_account_id"/>
-                      <field name="currency"/>
+                      <field name="currency" groups="base.group_multi_currency"/>
                       <field name="period_id"/>
                       <field name="type"/>
                       <newline/>
@@ -404,9 +404,9 @@
           <field name="name"/>
           <field name="statement_id" readonly="1"/>
           <field name="ref" readonly="1"/>
-          <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-          <field name="type" on_change="onchange_type(partner_id, type)"/>
-          <field name="account_id" domain="[('journal_id','=',parent.journal_id)]"/>
+          <field name="partner_id" />
+          <field name="type" />
+          <field name="account_id" />
           <field name="amount" readonly="1" sum="Total Amount"/>
           <field name="globalisation_id" string="Glob. Id"/>
           <field name="globalisation_amount" string="Glob. Am."/>
@@ -426,9 +426,9 @@
                 <field name="val_date"/>
                 <field name="name"/>
                 <field name="ref" readonly="0"/>
-                <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                <field name="type" on_change="onchange_type(partner_id, type)"/>
-                <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
+                <field name="partner_id"/>
+                <field name="type" />
+                <field domain="[('type', '&lt;&gt;', 'view')]" name="account_id"/>
                 <field name="amount"/>
                 <field name="globalisation_id"/>
                 <field name="sequence" readonly="0"/>
@@ -473,7 +473,7 @@
       <field name="name">CODA Statement Lines</field>
       <field name="res_model">coda.bank.statement.line</field>
       <field name="view_type">form</field>
-      <field name="view_mode">tree,graph,form</field>
+      <field name="view_mode">tree,form</field>
       <field name="context">{'block_statement_line_delete' : 1}</field>
       <field name="search_view_id" ref="view_coda_bank_statement_line_filter"/>
       <field name="view_id" ref="view_coda_bank_statement_line_list"/>
diff --git a/addons/account_coda/account_coda_wizard.xml b/addons/l10n_be_coda/l10n_be_coda_wizard.xml
similarity index 100%
rename from addons/account_coda/account_coda_wizard.xml
rename to addons/l10n_be_coda/l10n_be_coda_wizard.xml
diff --git a/addons/account_coda/security/account_security.xml b/addons/l10n_be_coda/security/account_security.xml
similarity index 100%
rename from addons/account_coda/security/account_security.xml
rename to addons/l10n_be_coda/security/account_security.xml
diff --git a/addons/account_coda/security/ir.model.access.csv b/addons/l10n_be_coda/security/ir.model.access.csv
similarity index 100%
rename from addons/account_coda/security/ir.model.access.csv
rename to addons/l10n_be_coda/security/ir.model.access.csv
diff --git a/addons/account_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt b/addons/l10n_be_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
similarity index 100%
rename from addons/account_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
rename to addons/l10n_be_coda/test_coda_file/Ontvangen_CODA.2011-01-11-18.59.15.txt
diff --git a/addons/account_coda/wizard/__init__.py b/addons/l10n_be_coda/wizard/__init__.py
similarity index 100%
rename from addons/account_coda/wizard/__init__.py
rename to addons/l10n_be_coda/wizard/__init__.py
diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/l10n_be_coda/wizard/account_coda_import.py
similarity index 99%
rename from addons/account_coda/wizard/account_coda_import.py
rename to addons/l10n_be_coda/wizard/account_coda_import.py
index bb46593b158..46c545f0f48 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/l10n_be_coda/wizard/account_coda_import.py
@@ -28,6 +28,7 @@ import logging
 import re
 from traceback import format_exception
 from sys import exc_info
+from base_iban import base_iban
 _logger = logging.getLogger(__name__)
 
 class account_coda_import(osv.osv_memory):
@@ -398,6 +399,7 @@ class account_coda_import(osv.osv_memory):
                                 st_line['account_id'] = transfer_acc
                                 match = True
                             elif find_partner:
+                                counterparty_number = base_iban._pretty_iban(base_iban._format_iban(counterparty_number))
                                 bank_ids = partner_bank_obj.search(cr,uid,[('acc_number','=', counterparty_number)])
                         if not match and find_partner and bank_ids:
                             if len(bank_ids) > 1:
@@ -942,7 +944,7 @@ class account_coda_import(osv.osv_memory):
     def action_open_coda_statements(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        module, xml_id = 'account_coda', 'action_coda_bank_statements'
+        module, xml_id = 'l10n_be_coda', 'action_coda_bank_statements'
         res_model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, module, xml_id)
         action = self.pool.get('ir.actions.act_window').read(cr, uid, res_id, context=context)
         domain = eval(action.get('domain') or '[]')
@@ -973,9 +975,9 @@ def str2float(str):
         return 0.0
 
 def list2float(lst):
-            try:
-                return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst))
-            except:
-                return 0.0
+    try:
+        return str2float((lambda s : s[:-3] + '.' + s[-3:])(lst))
+    except:
+        return 0.0
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_be_hr_payroll/__openerp__.py b/addons/l10n_be_hr_payroll/__openerp__.py
index e0d7ada059b..9d6fa87dfca 100644
--- a/addons/l10n_be_hr_payroll/__openerp__.py
+++ b/addons/l10n_be_hr_payroll/__openerp__.py
@@ -40,13 +40,11 @@ Belgian Payroll Rules.
     """,
 
     'auto_install': False,
-    'demo': [
-     'l10n_be_hr_payroll_demo.xml',
-    ],
+    'demo': ['l10n_be_hr_payroll_demo.xml'],
     'data':[
-     'l10n_be_hr_payroll_view.xml',
-     'l10n_be_hr_payroll_data.xml',
-     'data/hr.salary.rule.csv',
+        'l10n_be_hr_payroll_view.xml',
+        'l10n_be_hr_payroll_data.xml',
+        'data/hr.salary.rule.csv',
     ],
     'installable': True
 }
diff --git a/addons/l10n_be_hr_payroll/i18n/de.po b/addons/l10n_be_hr_payroll/i18n/de.po
new file mode 100644
index 00000000000..6c95585909e
--- /dev/null
+++ b/addons/l10n_be_hr_payroll/i18n/de.po
@@ -0,0 +1,163 @@
+# German translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-11-18 21:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-19 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,disabled_spouse_bool:0
+msgid "if recipient spouse is declared disabled by law"
+msgstr ""
+"Wenn Ehepartner des Empfängers gesetzlich als Behindert anerkannt wurde"
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,disabled_children_bool:0
+msgid "if recipient children is/are declared disabled by law"
+msgstr ""
+"Wenn Kind(er) des Empfängers gesetzlich als behindert anerkannt ist (sind)"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,misc_onss_deduction:0
+msgid "Miscellaneous exempt ONSS "
+msgstr "Diverse Ausnahmen (ONSS) "
+
+#. module: l10n_be_hr_payroll
+#: model:ir.model,name:l10n_be_hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr "Angestellte/r"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_spouse_bool:0
+msgid "Disabled Spouse"
+msgstr "Als Behindert anerkannter Ehepartner"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,retained_net_amount:0
+msgid "Net retained "
+msgstr "Einbehalten Netto "
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,resident_bool:0
+msgid "Nonresident"
+msgstr "Im Ausland wohnhaft"
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,resident_bool:0
+msgid "if recipient lives in a foreign country"
+msgstr "Wenn Empfänger in anderem Land wohnhaft ist"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.employee:0
+msgid "if spouse has professionnel income or not"
+msgstr "Ob Ehepartner berufliches Einkommen hat oder nicht"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.contract:0
+msgid "Miscellaneous"
+msgstr "Verschiedenes"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,insurance_employee_deduction:0
+msgid "Insurance Group - by worker "
+msgstr "Vericherungsgruppe nach Mitarbeiter "
+
+#. module: l10n_be_hr_payroll
+#: selection:hr.employee,spouse_fiscal_status:0
+msgid "With Income"
+msgstr "Mit Einkommen"
+
+#. module: l10n_be_hr_payroll
+#: selection:hr.employee,spouse_fiscal_status:0
+msgid "Without Income"
+msgstr "Ohne Einkommen"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_children_number:0
+msgid "Number of disabled children"
+msgstr "Anzahl behinderter Kinder"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,additional_net_amount:0
+msgid "Net supplements"
+msgstr "Netto-Zulagen"
+
+#. module: l10n_be_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+"Fehler ! Sie können keine rekursive Hierachie bei Mitarbeitern definieren."
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,car_company_amount:0
+msgid "Company car employer"
+msgstr "Firmenfahrzeug des Arbeitgebers"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,misc_advantage_amount:0
+msgid "Benefits of various nature "
+msgstr "Geldwerte Vorteile verschiedener Art "
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,car_employee_deduction:0
+msgid "Company Car Deduction for Worker"
+msgstr "Abzüge beim Mitarbeiter für Firmenfahrzeug"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_children_bool:0
+msgid "Disabled Children"
+msgstr "Behinderte Kinder"
+
+#. module: l10n_be_hr_payroll
+#: model:ir.model,name:l10n_be_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr "Vertrag"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,meal_voucher_amount:0
+msgid "Check Value Meal "
+msgstr "Verköstigungswert prüfen "
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,travel_reimbursement_amount:0
+msgid "Reimbursement of travel expenses"
+msgstr "Erstattung von Reisespesen"
+
+#. module: l10n_be_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+"Fehler! Datum des Vertragsbeginns muss zeitlich vor dem  Datum des "
+"Vertragsendes sein."
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,spouse_fiscal_status:0
+msgid "Tax status for spouse"
+msgstr "Steuerklasse des Ehepartners"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.contract:0
+msgid "by Worker"
+msgstr "nach Mitarbeiter"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.employee:0
+msgid "number of dependent children declared as disabled"
+msgstr "Anzahl anhängiger, als behindert anerkannter Kinder"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,meal_voucher_employee_deduction:0
+msgid "Check Value Meal - by worker "
+msgstr "Verköstigungswerte - nach Mitarbeitern "
diff --git a/addons/l10n_be_hr_payroll/i18n/es.po b/addons/l10n_be_hr_payroll/i18n/es.po
new file mode 100644
index 00000000000..c0deb99952c
--- /dev/null
+++ b/addons/l10n_be_hr_payroll/i18n/es.po
@@ -0,0 +1,158 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-11-12 16:09+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-13 05:17+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,disabled_spouse_bool:0
+msgid "if recipient spouse is declared disabled by law"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,disabled_children_bool:0
+msgid "if recipient children is/are declared disabled by law"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,misc_onss_deduction:0
+msgid "Miscellaneous exempt ONSS "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: model:ir.model,name:l10n_be_hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_spouse_bool:0
+msgid "Disabled Spouse"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,retained_net_amount:0
+msgid "Net retained "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,resident_bool:0
+msgid "Nonresident"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,resident_bool:0
+msgid "if recipient lives in a foreign country"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: view:hr.employee:0
+msgid "if spouse has professionnel income or not"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: view:hr.contract:0
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,insurance_employee_deduction:0
+msgid "Insurance Group - by worker "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: selection:hr.employee,spouse_fiscal_status:0
+msgid "With Income"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: selection:hr.employee,spouse_fiscal_status:0
+msgid "Without Income"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_children_number:0
+msgid "Number of disabled children"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,additional_net_amount:0
+msgid "Net supplements"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,car_company_amount:0
+msgid "Company car employer"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,misc_advantage_amount:0
+msgid "Benefits of various nature "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,car_employee_deduction:0
+msgid "Company Car Deduction for Worker"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_children_bool:0
+msgid "Disabled Children"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: model:ir.model,name:l10n_be_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,meal_voucher_amount:0
+msgid "Check Value Meal "
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,travel_reimbursement_amount:0
+msgid "Reimbursement of travel expenses"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,spouse_fiscal_status:0
+msgid "Tax status for spouse"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: view:hr.contract:0
+msgid "by Worker"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: view:hr.employee:0
+msgid "number of dependent children declared as disabled"
+msgstr ""
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,meal_voucher_employee_deduction:0
+msgid "Check Value Meal - by worker "
+msgstr ""
diff --git a/addons/l10n_be_hr_payroll/i18n/es_CR.po b/addons/l10n_be_hr_payroll/i18n/es_CR.po
index b42480033f0..8082a824146 100644
--- a/addons/l10n_be_hr_payroll/i18n/es_CR.po
+++ b/addons/l10n_be_hr_payroll/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be_hr_payroll
 #: help:hr.employee,disabled_spouse_bool:0
diff --git a/addons/l10n_be_hr_payroll/i18n/pt_BR.po b/addons/l10n_be_hr_payroll/i18n/pt_BR.po
new file mode 100644
index 00000000000..91c7c5a0d26
--- /dev/null
+++ b/addons/l10n_be_hr_payroll/i18n/pt_BR.po
@@ -0,0 +1,162 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-10-16 23:34+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,disabled_spouse_bool:0
+msgid "if recipient spouse is declared disabled by law"
+msgstr "Caso o cônjuge beneficiário seja considerado incapaz perante a lei"
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,disabled_children_bool:0
+msgid "if recipient children is/are declared disabled by law"
+msgstr ""
+"Caso o(s) filho(s) beneficiário(s) seja(m) considerado(s) incapaz(es) "
+"perante a lei"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,misc_onss_deduction:0
+msgid "Miscellaneous exempt ONSS "
+msgstr "Outros isentos de INSS "
+
+#. module: l10n_be_hr_payroll
+#: model:ir.model,name:l10n_be_hr_payroll.model_hr_employee
+msgid "Employee"
+msgstr "Empregado"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_spouse_bool:0
+msgid "Disabled Spouse"
+msgstr "Cõnjuge incapaz"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,retained_net_amount:0
+msgid "Net retained "
+msgstr "Líquido retido "
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,resident_bool:0
+msgid "Nonresident"
+msgstr "Não residente no país local"
+
+#. module: l10n_be_hr_payroll
+#: help:hr.employee,resident_bool:0
+msgid "if recipient lives in a foreign country"
+msgstr "Caso o beneficiário resida em outro país"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.employee:0
+msgid "if spouse has professionnel income or not"
+msgstr "Caso o cônjuge possua renda"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.contract:0
+msgid "Miscellaneous"
+msgstr "Outros"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,insurance_employee_deduction:0
+msgid "Insurance Group - by worker "
+msgstr "Categoria do Seguro - por empregado "
+
+#. module: l10n_be_hr_payroll
+#: selection:hr.employee,spouse_fiscal_status:0
+msgid "With Income"
+msgstr "Com renda"
+
+#. module: l10n_be_hr_payroll
+#: selection:hr.employee,spouse_fiscal_status:0
+msgid "Without Income"
+msgstr "Sem renda"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_children_number:0
+msgid "Number of disabled children"
+msgstr "Quantidade de filho(s) incapaz(es)"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,additional_net_amount:0
+msgid "Net supplements"
+msgstr "Renda suplementar"
+
+#. module: l10n_be_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Erro! Você não pode criar uma Hierarquia de Empregados recursiva."
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,car_company_amount:0
+msgid "Company car employer"
+msgstr "Carro da empresa"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,misc_advantage_amount:0
+msgid "Benefits of various nature "
+msgstr "Benefícios de outras naturezas "
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,car_employee_deduction:0
+msgid "Company Car Deduction for Worker"
+msgstr "Dedução referente ao carro da empresa"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,disabled_children_bool:0
+msgid "Disabled Children"
+msgstr "Filho(s) incapaz(es)"
+
+#. module: l10n_be_hr_payroll
+#: model:ir.model,name:l10n_be_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr "Contrato"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,meal_voucher_amount:0
+msgid "Check Value Meal "
+msgstr "Vale refeição "
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,travel_reimbursement_amount:0
+msgid "Reimbursement of travel expenses"
+msgstr "Reembolso de despeza de viagem"
+
+#. module: l10n_be_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+"Erro! A data de início do contrato deve ser menor que a data de término do "
+"contrato."
+
+#. module: l10n_be_hr_payroll
+#: field:hr.employee,spouse_fiscal_status:0
+msgid "Tax status for spouse"
+msgstr "Situação fiscal do cônjuge"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.contract:0
+msgid "by Worker"
+msgstr "por Empregado"
+
+#. module: l10n_be_hr_payroll
+#: view:hr.employee:0
+msgid "number of dependent children declared as disabled"
+msgstr "Quantidade de filhos declarados como incapazes"
+
+#. module: l10n_be_hr_payroll
+#: field:hr.contract,meal_voucher_employee_deduction:0
+msgid "Check Value Meal - by worker "
+msgstr "Vale refeição - por empregado "
diff --git a/addons/l10n_be_hr_payroll/i18n/sr@latin.po b/addons/l10n_be_hr_payroll/i18n/sr@latin.po
index 14f912d9f9a..36dbdce2405 100644
--- a/addons/l10n_be_hr_payroll/i18n/sr@latin.po
+++ b/addons/l10n_be_hr_payroll/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be_hr_payroll
 #: help:hr.employee,disabled_spouse_bool:0
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
index 893a977e62c..b1951a2a032 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
@@ -38,11 +38,11 @@
         <record id="hr_employee_form__l10n_be_view_for" model="ir.ui.view">
             <field name="name">hr.employee.inherit.form</field>
             <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="inherit_id" ref="hr_contract.hr_hr_employee_view_form2"/>
             <field name="priority">30</field>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//field[@name='gender']" position="before">
+                <xpath expr="//field[@name='vehicle_distance']" position="after">
                     <field name="resident_bool" eval="False"/> 
                 </xpath>
                 <xpath expr="//field[@name='marital']" position="after">
diff --git a/addons/l10n_be_hr_payroll_account/__openerp__.py b/addons/l10n_be_hr_payroll_account/__openerp__.py
index 4ad70f9687c..7ba7caaa3e0 100644
--- a/addons/l10n_be_hr_payroll_account/__openerp__.py
+++ b/addons/l10n_be_hr_payroll_account/__openerp__.py
@@ -26,14 +26,14 @@
     'version': '1.0',
     'description': """
 Accounting Data for Belgian Payroll Rules.
+==========================================
     """,
 
     'auto_install': True,
-    'demo': [
-    ],
+    'demo': [],
     'data':[
-     'l10n_be_hr_payroll_account_data.xml',
-     'data/hr.salary.rule.csv',
+        'l10n_be_hr_payroll_account_data.xml',
+        'data/hr.salary.rule.csv',
     ],
     'installable': True
 }
diff --git a/addons/l10n_be_invoice_bba/__openerp__.py b/addons/l10n_be_invoice_bba/__openerp__.py
index 9f4efe1b31e..2c787d6c30f 100644
--- a/addons/l10n_be_invoice_bba/__openerp__.py
+++ b/addons/l10n_be_invoice_bba/__openerp__.py
@@ -28,19 +28,19 @@
     'category' : 'Localization',
     'description': """
     
-Belgian localisation for in- and outgoing invoices (prereq to account_coda):
+Belgian localization for in- and outgoing invoices (prereq to account_coda):
+============================================================================
     - Rename 'reference' field labels to 'Communication'
     - Add support for Belgian Structured Communication
 
-A Structured Communication can be generated automatically on outgoing invoices
-according to the following algorithms:
-
+A Structured Communication can be generated automatically on outgoing invoices according to the following algorithms:
+---------------------------------------------------------------------------------------------------------------------
     1) Random : +++RRR/RRRR/RRRDD+++
-        R..R = Random Digits, DD = Check Digits
+        **R..R =** Random Digits, **DD =** Check Digits
     2) Date : +++DOY/YEAR/SSSDD+++
-        DOY = Day of the Year, SSS = Sequence Number, DD = Check Digits)
+        **DOY =** Day of the Year, **SSS =** Sequence Number, **DD =** Check Digits
     3) Customer Reference +++RRR/RRRR/SSSDDD+++
-        R..R = Customer Reference without non-numeric characters, SSS = Sequence Number, DD = Check Digits)  
+        **R..R =** Customer Reference without non-numeric characters, **SSS =** Sequence Number, **DD =** Check Digits  
         
 The preferred type of Structured Communication and associated Algorithm can be
 specified on the Partner records. A 'random' Structured Communication will
@@ -48,9 +48,8 @@ generated if no algorithm is specified on the Partner record.
 
     """,
     'depends': ['account'],
-    'demo_xml': [],
-    'init_xml': [],
-    'update_xml' : [
+    'demo': [],
+    'data' : [
         'partner_view.xml',
         'account_invoice_view.xml',        
     ],
diff --git a/addons/l10n_be_invoice_bba/account_invoice_view.xml b/addons/l10n_be_invoice_bba/account_invoice_view.xml
index c344f1e9b6f..c4c53261f57 100644
--- a/addons/l10n_be_invoice_bba/account_invoice_view.xml
+++ b/addons/l10n_be_invoice_bba/account_invoice_view.xml
@@ -8,15 +8,13 @@
       <field name="model">account.invoice</field>
       <field name="inherit_id" ref="account.invoice_form"/>
       <field name="arch" type="xml">
-        <field name="payment_term" position="after">
-          <group col="4" colspan="2">
-              <field name="reference_type" nolabel="1"  size="0" attrs="{'readonly':[('state','!=','draft')]}"
-                 on_change="generate_bbacomm(type,reference_type, partner_id,reference, context)" colspan="1"/>
-              <field name="reference" nolabel="1"  colspan="3" attrs="{'readonly':[('state','!=','draft')]}"/>
-          </group>
+        <field name="date_due" position="after">
+              <field name="reference_type" nolabel="1"  attrs="{'readonly':[('state','!=','draft')]}"
+                 on_change="generate_bbacomm(type,reference_type, partner_id,reference, context)"/>
+              <field name="reference" nolabel="1"  attrs="{'readonly':[('state','!=','draft')]}"/>
         </field>
       </field>
     </record>
-    
+
   </data>
 </openerp>
diff --git a/addons/l10n_be_invoice_bba/i18n/ar.po b/addons/l10n_be_invoice_bba/i18n/ar.po
index fc39b17d975..6ca6d3a1e01 100644
--- a/addons/l10n_be_invoice_bba/i18n/ar.po
+++ b/addons/l10n_be_invoice_bba/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be_invoice_bba
 #: sql_constraint:account.invoice:0
diff --git a/addons/l10n_be_invoice_bba/i18n/es.po b/addons/l10n_be_invoice_bba/i18n/es.po
new file mode 100644
index 00000000000..42f11478e9d
--- /dev/null
+++ b/addons/l10n_be_invoice_bba/i18n/es.po
@@ -0,0 +1,141 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-11-12 16:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-13 05:17+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
+
+#. module: l10n_be_invoice_bba
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: model:ir.model,name:l10n_be_invoice_bba.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Random"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: help:res.partner,out_inv_comm_type:0
+msgid "Select Default Communication Type for Outgoing Invoices."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: help:res.partner,out_inv_comm_algorithm:0
+msgid ""
+"Select Algorithm to generate the Structured Communication on Outgoing "
+"Invoices."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:114
+#: code:addons/l10n_be_invoice_bba/invoice.py:140
+#, python-format
+msgid ""
+"The daily maximum of outgoing invoices with an automatically generated BBA "
+"Structured Communications has been exceeded!\n"
+"Please create manually a unique BBA Structured Communication."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:155
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:126
+#, python-format
+msgid ""
+"The Partner should have a 3-7 digit Reference Number for the generation of "
+"BBA Structured Communications!\n"
+"Please correct the Partner record."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:113
+#: code:addons/l10n_be_invoice_bba/invoice.py:125
+#: code:addons/l10n_be_invoice_bba/invoice.py:139
+#: code:addons/l10n_be_invoice_bba/invoice.py:167
+#: code:addons/l10n_be_invoice_bba/invoice.py:177
+#: code:addons/l10n_be_invoice_bba/invoice.py:202
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: field:res.partner,out_inv_comm_type:0
+msgid "Communication Type"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:178
+#: code:addons/l10n_be_invoice_bba/invoice.py:203
+#, python-format
+msgid ""
+"The BBA Structured Communication has already been used!\n"
+"Please create manually a unique BBA Structured Communication."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: model:ir.model,name:l10n_be_invoice_bba.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:156
+#, python-format
+msgid ""
+"Unsupported Structured Communication Type Algorithm '%s' !\n"
+"Please contact your OpenERP support channel."
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: field:res.partner,out_inv_comm_algorithm:0
+msgid "Communication Algorithm"
+msgstr ""
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:168
+#, python-format
+msgid ""
+"Empty BBA Structured Communication!\n"
+"Please fill in a unique BBA Structured Communication."
+msgstr ""
diff --git a/addons/l10n_be_invoice_bba/i18n/es_CR.po b/addons/l10n_be_invoice_bba/i18n/es_CR.po
index 88fa3108e1c..18fcbcfeb42 100644
--- a/addons/l10n_be_invoice_bba/i18n/es_CR.po
+++ b/addons/l10n_be_invoice_bba/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be_invoice_bba
 #: sql_constraint:account.invoice:0
diff --git a/addons/l10n_be_invoice_bba/i18n/fr.po b/addons/l10n_be_invoice_bba/i18n/fr.po
index 72f70e65a72..56383eb06ad 100644
--- a/addons/l10n_be_invoice_bba/i18n/fr.po
+++ b/addons/l10n_be_invoice_bba/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be_invoice_bba
 #: sql_constraint:account.invoice:0
diff --git a/addons/l10n_be_invoice_bba/i18n/nl.po b/addons/l10n_be_invoice_bba/i18n/nl.po
index d653bed00d6..b201d2442cb 100644
--- a/addons/l10n_be_invoice_bba/i18n/nl.po
+++ b/addons/l10n_be_invoice_bba/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be_invoice_bba
 #: sql_constraint:account.invoice:0
diff --git a/addons/l10n_be_invoice_bba/i18n/nl_BE.po b/addons/l10n_be_invoice_bba/i18n/nl_BE.po
new file mode 100644
index 00000000000..c4a4eeb0a16
--- /dev/null
+++ b/addons/l10n_be_invoice_bba/i18n/nl_BE.po
@@ -0,0 +1,155 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-10-02 07:48+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <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: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_be_invoice_bba
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr "Factuurnummer moet uniek zijn per bedrijf"
+
+#. module: l10n_be_invoice_bba
+#: model:ir.model,name:l10n_be_invoice_bba.model_account_invoice
+msgid "Invoice"
+msgstr "Factuur"
+
+#. module: l10n_be_invoice_bba
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr "U kunt niet dezelfde leden maken."
+
+#. module: l10n_be_invoice_bba
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr "Ongeldige gestructureerde mededeling"
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Random"
+msgstr "Willekeurig"
+
+#. module: l10n_be_invoice_bba
+#: help:res.partner,out_inv_comm_type:0
+msgid "Select Default Communication Type for Outgoing Invoices."
+msgstr "Kies het standaard communicatietype voor uitgaande facturen"
+
+#. module: l10n_be_invoice_bba
+#: help:res.partner,out_inv_comm_algorithm:0
+msgid ""
+"Select Algorithm to generate the Structured Communication on Outgoing "
+"Invoices."
+msgstr ""
+"Kies het algoritme voor de gestructureerde mededeling op uitgaande facturen."
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:114
+#: code:addons/l10n_be_invoice_bba/invoice.py:140
+#, python-format
+msgid ""
+"The daily maximum of outgoing invoices with an automatically generated BBA "
+"Structured Communications has been exceeded!\n"
+"Please create manually a unique BBA Structured Communication."
+msgstr ""
+"Het dagelijkse maximumaantal uitgaande facturen met een automatische "
+"gestructureerde mededeling is overschreden.\n"
+"Gelieve manueel een unieke gestructureerde mededeling te maken."
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:155
+#, python-format
+msgid "Error!"
+msgstr "Fout"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:126
+#, python-format
+msgid ""
+"The Partner should have a 3-7 digit Reference Number for the generation of "
+"BBA Structured Communications!\n"
+"Please correct the Partner record."
+msgstr ""
+"De relatie moet een referentienummer van 3-7 cijfers hebben om een "
+"gestructureerde mededeling te kunnen maken.\n"
+"Gelieve de relatie aan te passen."
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:113
+#: code:addons/l10n_be_invoice_bba/invoice.py:125
+#: code:addons/l10n_be_invoice_bba/invoice.py:139
+#: code:addons/l10n_be_invoice_bba/invoice.py:167
+#: code:addons/l10n_be_invoice_bba/invoice.py:177
+#: code:addons/l10n_be_invoice_bba/invoice.py:202
+#, python-format
+msgid "Warning!"
+msgstr "Waarschuwing"
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Customer Reference"
+msgstr "Referentie klant"
+
+#. module: l10n_be_invoice_bba
+#: field:res.partner,out_inv_comm_type:0
+msgid "Communication Type"
+msgstr "Communicatietype"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:178
+#: code:addons/l10n_be_invoice_bba/invoice.py:203
+#, python-format
+msgid ""
+"The BBA Structured Communication has already been used!\n"
+"Please create manually a unique BBA Structured Communication."
+msgstr ""
+"Deze gestructureerde mededeling is al gebruikt.\n"
+"Gelieve manueel een unieke gestructureerde mededeling te maken."
+
+#. module: l10n_be_invoice_bba
+#: selection:res.partner,out_inv_comm_algorithm:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: l10n_be_invoice_bba
+#: model:ir.model,name:l10n_be_invoice_bba.model_res_partner
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:156
+#, python-format
+msgid ""
+"Unsupported Structured Communication Type Algorithm '%s' !\n"
+"Please contact your OpenERP support channel."
+msgstr ""
+"Het algoritme voor de gestructureerde mededeling '%s' wordt niet "
+"ondersteund.\n"
+"Gelieve contact op te nemen met de supportafdeling van OpenERP."
+
+#. module: l10n_be_invoice_bba
+#: field:res.partner,out_inv_comm_algorithm:0
+msgid "Communication Algorithm"
+msgstr "Communicatiealgoritme"
+
+#. module: l10n_be_invoice_bba
+#: code:addons/l10n_be_invoice_bba/invoice.py:168
+#, python-format
+msgid ""
+"Empty BBA Structured Communication!\n"
+"Please fill in a unique BBA Structured Communication."
+msgstr ""
+"Lege gestructureerde mededeling.\n"
+"Gelieve een unieke gestructureerde mededeling in te vullen."
diff --git a/addons/l10n_be_invoice_bba/i18n/sr@latin.po b/addons/l10n_be_invoice_bba/i18n/sr@latin.po
index 14ae3508738..731906837cd 100644
--- a/addons/l10n_be_invoice_bba/i18n/sr@latin.po
+++ b/addons/l10n_be_invoice_bba/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_be_invoice_bba
 #: sql_constraint:account.invoice:0
diff --git a/addons/l10n_be_invoice_bba/invoice.py b/addons/l10n_be_invoice_bba/invoice.py
index bb03e4d6d02..188a8d896fd 100644
--- a/addons/l10n_be_invoice_bba/invoice.py
+++ b/addons/l10n_be_invoice_bba/invoice.py
@@ -2,9 +2,9 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    
+#
 #    Copyright (c) 2011 Noviat nv/sa (www.noviat.be). All rights reserved.
-# 
+#
 #    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
@@ -36,23 +36,23 @@ class account_invoice(osv.osv):
     _inherit = 'account.invoice'
 
     def _get_reference_type(self, cursor, user, context=None):
-        """Add BBA Structured Communication Type and change labels from 'reference' into 'communication' """  
+        """Add BBA Structured Communication Type and change labels from 'reference' into 'communication' """
         res = super(account_invoice, self)._get_reference_type(cursor, user,
                 context=context)
         res[[i for i,x in enumerate(res) if x[0] == 'none'][0]] = ('none', 'Free Communication')
         res.append(('bba', 'BBA Structured Communication'))
-        #l_logger.warning('reference_type =  %s' %res ) 
+        #l_logger.warning('reference_type =  %s' %res )
         return res
 
-    def check_bbacomm(self, val):
+    def check_bbacomm(self, val):
         supported_chars = '0-9+*/ '
         pattern = re.compile('[^' + supported_chars + ']')
         if pattern.findall(val or ''):
-            return False                
+            return False
         bbacomm = re.sub('\D', '', val or '')
         if len(bbacomm) == 12:
             base = int(bbacomm[:10])
-            mod = base % 97 or 97      
+            mod = base % 97 or 97
             if mod == int(bbacomm[-2:]):
                 return True
         return False
@@ -64,29 +64,29 @@ class account_invoice(osv.osv):
         return True
 
     def onchange_partner_id(self, cr, uid, ids, type, partner_id,
-            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):       
+            date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False):
         result = super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id,
             date_invoice, payment_term, partner_bank_id, company_id)
 #        reference_type = self.default_get(cr, uid, ['reference_type'])['reference_type']
 #        _logger.warning('partner_id %s' % partner_id)
         reference = False
         reference_type = 'none'
-        if partner_id:        
+        if partner_id:
             if (type == 'out_invoice'):
                 reference_type = self.pool.get('res.partner').browse(cr, uid, partner_id).out_inv_comm_type
                 if reference_type:
                     reference = self.generate_bbacomm(cr, uid, ids, type, reference_type, partner_id, '', context={})['value']['reference']
-        res_update = {       
+        res_update = {
             'reference_type': reference_type or 'none',
             'reference': reference,
         }
         result['value'].update(res_update)
-        return result                    
+        return result
 
     def generate_bbacomm(self, cr, uid, ids, type, reference_type, partner_id, reference, context=None):
         partner_obj =  self.pool.get('res.partner')
-        reference = reference or ''
-        algorithm = False
+        reference = reference or ''
+        algorithm = False
         if partner_id:
             algorithm = partner_obj.browse(cr, uid, partner_id, context=context).out_inv_comm_algorithm
         algorithm = algorithm or 'random'
@@ -97,7 +97,7 @@ class account_invoice(osv.osv):
                         doy = time.strftime('%j')
                         year = time.strftime('%Y')
                         seq = '001'
-                        seq_ids = self.search(cr, uid, 
+                        seq_ids = self.search(cr, uid,
                             [('type', '=', 'out_invoice'), ('reference_type', '=', 'bba'),
                              ('reference', 'like', '+++%s/%s/%%' % (doy, year))], order='reference')
                         if seq_ids:
@@ -110,7 +110,7 @@ class account_invoice(osv.osv):
                                       '\nPlease create manually a unique BBA Structured Communication.'))
                         bbacomm = doy + year + seq
                         base = int(bbacomm)
-                        mod = base % 97 or 97   
+                        mod = base % 97 or 97
                         reference = '+++%s/%s/%s%02d+++' % (doy, year, seq, mod)
                 elif algorithm == 'partner_ref':
                     if not self.check_bbacomm(reference):
@@ -119,13 +119,13 @@ class account_invoice(osv.osv):
                         if (len(partner_ref_nr) < 3) or (len(partner_ref_nr) > 7):
                             raise osv.except_osv(_('Warning!'),
                                 _('The Partner should have a 3-7 digit Reference Number for the generation of BBA Structured Communications!' \
-                                  '\nPlease correct the Partner record.'))                            
+                                  '\nPlease correct the Partner record.'))
                         else:
                             partner_ref_nr = partner_ref_nr.ljust(7, '0')
                             seq = '001'
-                            seq_ids = self.search(cr, uid, 
+                            seq_ids = self.search(cr, uid,
                                 [('type', '=', 'out_invoice'), ('reference_type', '=', 'bba'),
-                                 ('reference', 'like', '+++%s/%s/%%' % (partner_ref_nr[:3], partner_ref_nr[3:]))], order='reference')                            
+                                 ('reference', 'like', '+++%s/%s/%%' % (partner_ref_nr[:3], partner_ref_nr[3:]))], order='reference')
                             if seq_ids:
                                 prev_seq = int(self.browse(cr, uid, seq_ids[-1]).reference[12:15])
                                 if prev_seq < 999:
@@ -133,10 +133,10 @@ class account_invoice(osv.osv):
                                 else:
                                     raise osv.except_osv(_('Warning!'),
                                         _('The daily maximum of outgoing invoices with an automatically generated BBA Structured Communications has been exceeded!' \
-                                          '\nPlease create manually a unique BBA Structured Communication.'))                            
+                                          '\nPlease create manually a unique BBA Structured Communication.'))
                         bbacomm = partner_ref_nr + seq
                         base = int(bbacomm)
-                        mod = base % 97 or 97                           
+                        mod = base % 97 or 97
                         reference = '+++%s/%s/%s%02d+++' % (partner_ref_nr[:3], partner_ref_nr[3:], seq, mod)
                 elif algorithm == 'random':
                     if not self.check_bbacomm(reference):
@@ -144,67 +144,66 @@ class account_invoice(osv.osv):
                         bbacomm = str(base).rjust(7, '0')
                         base = int(bbacomm)
                         mod = base % 97 or 97
-                        mod = str(mod).rjust(2, '0')               
+                        mod = str(mod).rjust(2, '0')
                         reference = '+++%s/%s/%s%s+++' % (bbacomm[:3], bbacomm[3:7], bbacomm[7:], mod)
                 else:
                     raise osv.except_osv(_('Error!'),
                         _("Unsupported Structured Communication Type Algorithm '%s' !" \
-                          "\nPlease contact your OpenERP support channel.") % algorithm)   
-        return {'value': {'reference': reference}}    
-    
+                          "\nPlease contact your OpenERP support channel.") % algorithm)
+        return {'value': {'reference': reference}}
+
     def create(self, cr, uid, vals, context=None):
         if vals.has_key('reference_type'):
             reference_type = vals['reference_type']
-            if reference_type == 'bba':               
+            if reference_type == 'bba':
                 if vals.has_key('reference'):
                     bbacomm = vals['reference']
                 else:
                     raise osv.except_osv(_('Warning!'),
                         _('Empty BBA Structured Communication!' \
-                          '\nPlease fill in a unique BBA Structured Communication.'))       
+                          '\nPlease fill in a unique BBA Structured Communication.'))
                 if self.check_bbacomm(bbacomm):
                     reference = re.sub('\D', '', bbacomm)
-                    vals['reference'] = '+++' + reference[0:3] + '/' + reference[3:7] + '/' + reference[7:] + '+++'     
-                    same_ids = self.search(cr, uid, 
+                    vals['reference'] = '+++' + reference[0:3] + '/' + reference[3:7] + '/' + reference[7:] + '+++'
+                    same_ids = self.search(cr, uid,
                         [('type', '=', 'out_invoice'), ('reference_type', '=', 'bba'),
                          ('reference', '=', vals['reference'])])
                     if same_ids:
                         raise osv.except_osv(_('Warning!'),
                             _('The BBA Structured Communication has already been used!' \
-                              '\nPlease create manually a unique BBA Structured Communication.'))                 
-        return super(account_invoice, self).create(cr, uid, vals, context=context)     
+                              '\nPlease create manually a unique BBA Structured Communication.'))
+        return super(account_invoice, self).create(cr, uid, vals, context=context)
 
-    def write(self, cr, uid, ids, vals, context={}):
+    def write(self, cr, uid, ids, vals, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
-        for inv in self.browse(cr, uid, ids, context):    
+        for inv in self.browse(cr, uid, ids, context):
             if vals.has_key('reference_type'):
                 reference_type = vals['reference_type']
-            else:    
+            else:
                 reference_type = inv.reference_type or ''
-            if reference_type == 'bba':               
+            if reference_type == 'bba':
                 if vals.has_key('reference'):
                     bbacomm = vals['reference']
                 else:
                     bbacomm = inv.reference or ''
                 if self.check_bbacomm(bbacomm):
                     reference = re.sub('\D', '', bbacomm)
-                    vals['reference'] = '+++' + reference[0:3] + '/' + reference[3:7] + '/' + reference[7:] + '+++'     
-                    same_ids = self.search(cr, uid, 
-                        [('id', '!=', inv.id), ('type', '=', 'out_invoice'), 
+                    vals['reference'] = '+++' + reference[0:3] + '/' + reference[3:7] + '/' + reference[7:] + '+++'
+                    same_ids = self.search(cr, uid,
+                        [('id', '!=', inv.id), ('type', '=', 'out_invoice'),
                          ('reference_type', '=', 'bba'), ('reference', '=', vals['reference'])])
                     if same_ids:
                         raise osv.except_osv(_('Warning!'),
                             _('The BBA Structured Communication has already been used!' \
-                              '\nPlease create manually a unique BBA Structured Communication.'))                 
-        return super(account_invoice, self).write(cr, uid, ids, vals, context)    
+                              '\nPlease create manually a unique BBA Structured Communication.'))
+        return super(account_invoice, self).write(cr, uid, ids, vals, context)
 
     _columns = {
         'reference': fields.char('Communication', size=64, help="The partner reference of this invoice."),
         'reference_type': fields.selection(_get_reference_type, 'Communication Type',
             required=True),
     }
-    
     _constraints = [
         (_check_communication, 'Invalid BBA Structured Communication !', ['Communication']),
         ]
diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py
index 022fa1b6a4d..766ae6c60bb 100644
--- a/addons/l10n_br/__openerp__.py
+++ b/addons/l10n_br/__openerp__.py
@@ -26,7 +26,7 @@ Base module for the Brazilian localization.
 ===========================================
 
 This module consists in:
-
+------------------------
  - Generic Brazilian chart of accounts
  - Brazilian taxes such as:
 
@@ -63,7 +63,7 @@ for online use of 'private modules'.""",
     'website': 'http://openerpbrasil.org',
     'version': '0.6',
     'depends': ['account','account_chart'],
-    'init_xml': [        
+    'data': [        
         'data/account.account.type.csv',
         'data/account.tax.code.template.csv',
         'data/account.account.template.csv',
@@ -71,13 +71,10 @@ for online use of 'private modules'.""",
         'data/account_tax_template.xml',
         'data/l10n_br_data.xml',
         'security/ir.model.access.csv',
-                ],
-    'update_xml': [
         'account_view.xml',
         'l10n_br_view.xml',
-    ],
+                ],
     'installable': True,
-    'certificate' : '001280994939126801405',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_br/account.py b/addons/l10n_br/account.py
index 6e38aaa690f..64d3c2cda79 100644
--- a/addons/l10n_br/account.py
+++ b/addons/l10n_br/account.py
@@ -29,6 +29,7 @@ import decimal_precision as dp
 from tools.misc import currency
 from tools.translate import _
 from tools import config
+from openerp import SUPERUSER_ID
 
 class account_tax_code_template(osv.osv):
 
@@ -53,7 +54,7 @@ class account_tax_template(osv.osv):
     
     def get_precision_tax():
         def change_digit_tax(cr):
-            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account')
             return (16, res+2)
         return change_digit_tax
     
@@ -91,7 +92,7 @@ class account_tax(osv.osv):
     
     def get_precision_tax():
         def change_digit_tax(cr):
-            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, 1, 'Account')
+            res = pooler.get_pool(cr.dbname).get('decimal.precision').precision_get(cr, SUPERUSER_ID, 'Account')
             return (16, res+2)
         return change_digit_tax
     
diff --git a/addons/l10n_br/data/account_tax_template.xml b/addons/l10n_br/data/account_tax_template.xml
index 9719b211228..0d3ece9d129 100644
--- a/addons/l10n_br/data/account_tax_template.xml
+++ b/addons/l10n_br/data/account_tax_template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="True">
+    <data noupdate="1">
 
         <record id="tax_template_1" model="account.tax.template">
             <field name="description">IPI</field>
diff --git a/addons/l10n_br/data/l10n_br_account_chart_template.xml b/addons/l10n_br/data/l10n_br_account_chart_template.xml
index 8f45e94b625..60e1a1c4f02 100644
--- a/addons/l10n_br/data/l10n_br_account_chart_template.xml
+++ b/addons/l10n_br/data/l10n_br_account_chart_template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <record id="l10n_br_account_chart_template" model="account.chart.template">
             <field name="name">Planilha de Contas Brasileira</field>
diff --git a/addons/l10n_br/i18n/ar.po b/addons/l10n_br/i18n/ar.po
index 2f43237d91f..16f9c436c03 100644
--- a/addons/l10n_br/i18n/ar.po
+++ b/addons/l10n_br/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/bg.po b/addons/l10n_br/i18n/bg.po
index b1f76b90b2b..710fe0e33c1 100644
--- a/addons/l10n_br/i18n/bg.po
+++ b/addons/l10n_br/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/ca.po b/addons/l10n_br/i18n/ca.po
index 6ff5d25fcb7..0f0ea98481f 100644
--- a/addons/l10n_br/i18n/ca.po
+++ b/addons/l10n_br/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/da.po b/addons/l10n_br/i18n/da.po
index 874be24c44e..46b9b60b2af 100644
--- a/addons/l10n_br/i18n/da.po
+++ b/addons/l10n_br/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/en_GB.po b/addons/l10n_br/i18n/en_GB.po
index df23c097bba..390e7ca7a1e 100644
--- a/addons/l10n_br/i18n/en_GB.po
+++ b/addons/l10n_br/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/es.po b/addons/l10n_br/i18n/es.po
index 17f85f29b7f..423115d4e28 100644
--- a/addons/l10n_br/i18n/es.po
+++ b/addons/l10n_br/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/es_CR.po b/addons/l10n_br/i18n/es_CR.po
index 6d11059976c..f182788e04f 100644
--- a/addons/l10n_br/i18n/es_CR.po
+++ b/addons/l10n_br/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_br
diff --git a/addons/l10n_br/i18n/es_PY.po b/addons/l10n_br/i18n/es_PY.po
index b603a7a6eec..d859d3da93f 100644
--- a/addons/l10n_br/i18n/es_PY.po
+++ b/addons/l10n_br/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/fr.po b/addons/l10n_br/i18n/fr.po
index 09c86e59316..e2adbd06699 100644
--- a/addons/l10n_br/i18n/fr.po
+++ b/addons/l10n_br/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/gl.po b/addons/l10n_br/i18n/gl.po
index 1788e6ca6c1..d3cfca4eb2d 100644
--- a/addons/l10n_br/i18n/gl.po
+++ b/addons/l10n_br/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/hi.po b/addons/l10n_br/i18n/hi.po
index d5ea9e9310d..9e92cbf1cf3 100644
--- a/addons/l10n_br/i18n/hi.po
+++ b/addons/l10n_br/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/it.po b/addons/l10n_br/i18n/it.po
index f0a0944ebc2..b297bd60f8e 100644
--- a/addons/l10n_br/i18n/it.po
+++ b/addons/l10n_br/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/nb.po b/addons/l10n_br/i18n/nb.po
index 3a95a10e2a3..d84a753829f 100644
--- a/addons/l10n_br/i18n/nb.po
+++ b/addons/l10n_br/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/oc.po b/addons/l10n_br/i18n/oc.po
index 7204f279198..d9941926288 100644
--- a/addons/l10n_br/i18n/oc.po
+++ b/addons/l10n_br/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/pt_BR.po b/addons/l10n_br/i18n/pt_BR.po
index 116764736f0..e997081110b 100644
--- a/addons/l10n_br/i18n/pt_BR.po
+++ b/addons/l10n_br/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
@@ -23,7 +23,7 @@ msgstr ""
 #: field:account.tax.code.template,tax_discount:0
 #: field:account.tax.template,tax_discount:0
 msgid "Discount this Tax in Prince"
-msgstr "Desconta esta taxa no Preço"
+msgstr "Desconta este imposto no Preço"
 
 #. module: l10n_br
 #: model:ir.actions.act_window,name:l10n_br.action_l10n_br_cst_form
@@ -31,13 +31,13 @@ msgstr "Desconta esta taxa no Preço"
 #: model:ir.ui.menu,name:l10n_br.menu_action_l10n_br_cst
 #: view:l10n_br_account.cst:0
 msgid "Tax Situation Code"
-msgstr "Código de Situação da Taxa"
+msgstr "Código da Situação do Imposto"
 
 #. module: l10n_br
 #: model:ir.model,name:l10n_br.model_account_tax_code
 #: field:l10n_br_account.cst,tax_code_id:0
 msgid "Tax Code"
-msgstr "Código da Taxa"
+msgstr "Código do Imposto"
 
 #. module: l10n_br
 #: help:account.tax.code,domain:0
@@ -103,7 +103,7 @@ msgstr "Erro ! Você não pode criar Códigos de Impostos recursivos"
 #. module: l10n_br
 #: sql_constraint:account.tax:0
 msgid "Tax Name must be unique per company!"
-msgstr "O Nome da taxa tem que ser único por empresa!"
+msgstr "O Nome do Imposto deve ser único por empresa!"
 
 #. module: l10n_br
 #: model:ir.model,name:l10n_br.model_account_tax
@@ -121,7 +121,7 @@ msgstr "Receita"
 #: model:ir.ui.menu,name:l10n_br.menu_action_l10n_br_cst_template
 #: view:l10n_br_account.cst.template:0
 msgid "Tax Situation Code Template"
-msgstr "Modelo do Código de Situação da Taxa"
+msgstr "Modelo de CST - Código da Situação Tributária"
 
 #. module: l10n_br
 #: model:ir.model,name:l10n_br.model_wizard_multi_charts_accounts
@@ -186,7 +186,7 @@ msgstr "Um percentual decimal em % entre 0-1"
 #: model:ir.model,name:l10n_br.model_account_tax_code_template
 #: field:l10n_br_account.cst.template,tax_code_template_id:0
 msgid "Tax Code Template"
-msgstr "Modelo de código de taxa"
+msgstr "Modelo do Código do Imposto"
 
 #~ msgid "Brazilian Localization"
 #~ msgstr "Localização Brasileira"
diff --git a/addons/l10n_br/i18n/ru.po b/addons/l10n_br/i18n/ru.po
index 1ba828d09af..25d67f6c2e1 100644
--- a/addons/l10n_br/i18n/ru.po
+++ b/addons/l10n_br/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/sl.po b/addons/l10n_br/i18n/sl.po
index 5a1e75b6b0d..e62cc9aaf3d 100644
--- a/addons/l10n_br/i18n/sl.po
+++ b/addons/l10n_br/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/sq.po b/addons/l10n_br/i18n/sq.po
index 9f4596f8a05..f212fbe0637 100644
--- a/addons/l10n_br/i18n/sq.po
+++ b/addons/l10n_br/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/sr@latin.po b/addons/l10n_br/i18n/sr@latin.po
index aa242925626..228c7c239d2 100644
--- a/addons/l10n_br/i18n/sr@latin.po
+++ b/addons/l10n_br/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/i18n/tr.po b/addons/l10n_br/i18n/tr.po
index 4a4defad6a6..036108f5d61 100644
--- a/addons/l10n_br/i18n/tr.po
+++ b/addons/l10n_br/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_br
 #: field:account.tax,tax_discount:0
diff --git a/addons/l10n_br/l10n_br.py b/addons/l10n_br/l10n_br.py
index af387334cd1..f35ced7ea09 100644
--- a/addons/l10n_br/l10n_br.py
+++ b/addons/l10n_br/l10n_br.py
@@ -81,4 +81,4 @@ class l10n_br_account_cst(osv.osv):
     
 l10n_br_account_cst()
 
-# 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/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index bd5fe4e6ea0..9c3cfea2fb1 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -19,20 +19,19 @@
 #
 ##############################################################################
 {
-    "name" : "Canada - Accounting",
-    "version" : "1.0",
-    "author" : "Savoir-faire Linux",
-    "website" : "http://www.savoirfairelinux.com",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name': 'Canada - Accounting',
+    'version': '1.0',
+    'author': 'Savoir-faire Linux',
+    'website': 'http://www.savoirfairelinux.com',
+    'category': 'Localization/Account Charts',
+    'description': """
 This is the module to manage the English and French - Canadian accounting chart in OpenERP.
 ===========================================================================================
 
 Canadian accounting charts and localizations.
     """,
-    "depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
-    "init_xml" : [],
-    "update_xml" : [
+    'depends': ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
+    'data': [
         'account_chart_en.xml',
         'account_tax_code_en.xml',
         'account_chart_template_en.xml',
@@ -45,9 +44,8 @@ Canadian accounting charts and localizations.
         'fiscal_templates_fr.xml',
         'l10n_ca_wizard.xml',
     ],
-    "demo_xml" : [],
-    "installable" : True,
-    "certificate" : '00941680933773696173',
+    'demo': [],
+    'installable': True,
     'images': ['images/config_chart_l10n_ca.jpeg','images/l10n_ca_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml
index 0d67e081d08..acb4fa4802b 100644
--- a/addons/l10n_ca/account_chart_en.xml
+++ b/addons/l10n_ca/account_chart_en.xml
@@ -6,7 +6,6 @@
         <record id="chart0_en" model="account.account.template">
             <field name="code">0</field>
             <field name="name">Account Chart CA EN</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="account.data_account_type_view"/>
         </record>
diff --git a/addons/l10n_ca/i18n/ar.po b/addons/l10n_ca/i18n/ar.po
index 2c1888d54ef..20904e23975 100644
--- a/addons/l10n_ca/i18n/ar.po
+++ b/addons/l10n_ca/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/ca.po b/addons/l10n_ca/i18n/ca.po
index 43def9ba9e7..a1f5126ad7d 100644
--- a/addons/l10n_ca/i18n/ca.po
+++ b/addons/l10n_ca/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/da.po b/addons/l10n_ca/i18n/da.po
index 771e02ca55f..8378e619d4f 100644
--- a/addons/l10n_ca/i18n/da.po
+++ b/addons/l10n_ca/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/de.po b/addons/l10n_ca/i18n/de.po
index 849a1742637..a02e9093319 100644
--- a/addons/l10n_ca/i18n/de.po
+++ b/addons/l10n_ca/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/en_GB.po b/addons/l10n_ca/i18n/en_GB.po
index 6a58f79da01..2bbbbf9f0b4 100644
--- a/addons/l10n_ca/i18n/en_GB.po
+++ b/addons/l10n_ca/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/es.po b/addons/l10n_ca/i18n/es.po
index 4d094424045..2fb5fb2eea5 100644
--- a/addons/l10n_ca/i18n/es.po
+++ b/addons/l10n_ca/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/es_CR.po b/addons/l10n_ca/i18n/es_CR.po
index bd26a422f4c..e48e8995f02 100644
--- a/addons/l10n_ca/i18n/es_CR.po
+++ b/addons/l10n_ca/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/es_PY.po b/addons/l10n_ca/i18n/es_PY.po
index 5325c7560c2..35447b68ff8 100644
--- a/addons/l10n_ca/i18n/es_PY.po
+++ b/addons/l10n_ca/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/fr.po b/addons/l10n_ca/i18n/fr.po
index cf09926ae48..7ebcdd8bac8 100644
--- a/addons/l10n_ca/i18n/fr.po
+++ b/addons/l10n_ca/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/gl.po b/addons/l10n_ca/i18n/gl.po
index df881313eb4..cf57cfdf6a1 100644
--- a/addons/l10n_ca/i18n/gl.po
+++ b/addons/l10n_ca/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/hu.po b/addons/l10n_ca/i18n/hu.po
index 813a88a6c29..9ff3afa8716 100644
--- a/addons/l10n_ca/i18n/hu.po
+++ b/addons/l10n_ca/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/it.po b/addons/l10n_ca/i18n/it.po
index 64f898babc2..163f62a85d7 100644
--- a/addons/l10n_ca/i18n/it.po
+++ b/addons/l10n_ca/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/nb.po b/addons/l10n_ca/i18n/nb.po
new file mode 100644
index 00000000000..8c1c020f103
--- /dev/null
+++ b/addons/l10n_ca/i18n/nb.po
@@ -0,0 +1,128 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-02 21:08+0000\n"
+"PO-Revision-Date: 2012-09-09 16:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_receivable
+msgid "Receivable"
+msgstr "Fordring"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_asset_view
+msgid "Asset View"
+msgstr "Eiendel Vis"
+
+#. module: l10n_ca
+#: model:ir.module.module,description:l10n_ca.module_meta_information
+msgid ""
+"This is the module to manage the canadian accounting chart in OpenERP."
+msgstr ""
+"Dette er modulen for å administrere kanadiske regnskap diagrammet i OpenERP."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_expense_view
+msgid "Expense View"
+msgstr "Kostnad Vis"
+
+#. module: l10n_ca
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Feil ! Du kan ikke opprette rekursive konto maler."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_income_view
+msgid "Income View"
+msgstr "Inntekt Vis"
+
+#. module: l10n_ca
+#: model:ir.module.module,shortdesc:l10n_ca.module_meta_information
+msgid "Canada - Chart of Accounts"
+msgstr "Canada - Kontoplan"
+
+#. module: l10n_ca
+#: constraint:account.account.type:0
+msgid "Error ! You can not create recursive types."
+msgstr "Feil ! Du kan ikke opprette rekursive typer."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_tax
+msgid "Tax"
+msgstr "Skatt"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_cash
+msgid "Cash"
+msgstr "Kontant"
+
+#. module: l10n_ca
+#: model:ir.actions.todo,note:l10n_ca.config_call_account_template_ca
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generere Kontoplan fra en diagrammal. Du vil bli bedt om å passere navnet på "
+"selskapet, diagrammal til følge, nei. sifre som skal generere koden for "
+"kontoene og bankkonto, valuta å skape Journals. Dermed er den rene kopi av "
+"diagrammal generert.\n"
+"\t Dette er den samme veiviser som går fra økonomistyring / konfigurasjon / "
+"finansiell Regnskap / finansregnskapet / Generer Kontoplan fra en diagrammal."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_payable
+msgid "Payable"
+msgstr "Utgift"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_asset
+msgid "Asset"
+msgstr "Eiendel"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_equity
+msgid "Equity"
+msgstr "Egenkapital"
+
+#. module: l10n_ca
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Feil ! Du kan ikke opprette rekursive skatte koder."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_liability_view
+msgid "Liability View"
+msgstr "Ansvar Vis."
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_expense
+msgid "Expense"
+msgstr "Utgift"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_income
+msgid "Income"
+msgstr "Inntekt"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_view
+msgid "View"
+msgstr "Vis"
diff --git a/addons/l10n_ca/i18n/pt.po b/addons/l10n_ca/i18n/pt.po
index 00e11f1e750..93cab78a9ae 100644
--- a/addons/l10n_ca/i18n/pt.po
+++ b/addons/l10n_ca/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/pt_BR.po b/addons/l10n_ca/i18n/pt_BR.po
index f7671489a85..4512596cf14 100644
--- a/addons/l10n_ca/i18n/pt_BR.po
+++ b/addons/l10n_ca/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/sr@latin.po b/addons/l10n_ca/i18n/sr@latin.po
index 893f6068373..4be6cf9be96 100644
--- a/addons/l10n_ca/i18n/sr@latin.po
+++ b/addons/l10n_ca/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/tr.po b/addons/l10n_ca/i18n/tr.po
index 5ea63687d94..b2a8da50aef 100644
--- a/addons/l10n_ca/i18n/tr.po
+++ b/addons/l10n_ca/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ca
 #: model:account.account.type,name:l10n_ca.account_type_receivable
diff --git a/addons/l10n_ca/i18n/zh_CN.po b/addons/l10n_ca/i18n/zh_CN.po
new file mode 100644
index 00000000000..0674fbaa45a
--- /dev/null
+++ b/addons/l10n_ca/i18n/zh_CN.po
@@ -0,0 +1,121 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-08-02 21:08+0000\n"
+"PO-Revision-Date: 2012-08-19 21:20+0000\n"
+"Last-Translator: Heling Yao <Unknown>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_receivable
+msgid "Receivable"
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_asset_view
+msgid "Asset View"
+msgstr "资产视图"
+
+#. module: l10n_ca
+#: model:ir.module.module,description:l10n_ca.module_meta_information
+msgid ""
+"This is the module to manage the canadian accounting chart in OpenERP."
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_expense_view
+msgid "Expense View"
+msgstr ""
+
+#. module: l10n_ca
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_income_view
+msgid "Income View"
+msgstr ""
+
+#. module: l10n_ca
+#: model:ir.module.module,shortdesc:l10n_ca.module_meta_information
+msgid "Canada - Chart of Accounts"
+msgstr ""
+
+#. module: l10n_ca
+#: constraint:account.account.type:0
+msgid "Error ! You can not create recursive types."
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_tax
+msgid "Tax"
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_cash
+msgid "Cash"
+msgstr ""
+
+#. module: l10n_ca
+#: model:ir.actions.todo,note:l10n_ca.config_call_account_template_ca
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_payable
+msgid "Payable"
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_asset
+msgid "Asset"
+msgstr "资产"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_equity
+msgid "Equity"
+msgstr ""
+
+#. module: l10n_ca
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.acct_type_liability_view
+msgid "Liability View"
+msgstr "负债视图"
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_expense
+msgid "Expense"
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_income
+msgid "Income"
+msgstr ""
+
+#. module: l10n_ca
+#: model:account.account.type,name:l10n_ca.account_type_view
+msgid "View"
+msgstr "视图"
diff --git a/addons/l10n_ca/l10n_ca_wizard.xml b/addons/l10n_ca/l10n_ca_wizard.xml
index 3bdc380325d..19d27fb47c7 100644
--- a/addons/l10n_ca/l10n_ca_wizard.xml
+++ b/addons/l10n_ca/l10n_ca_wizard.xml
@@ -1,13 +1,9 @@
 <openerp>
-    <data>
+    <data noupdate="1">
 
-        <record id="config_call_account_template_ca" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
-          </record>
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index 6de20acf98a..ec50d9b0f8e 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -19,22 +19,24 @@
 #
 ##############################################################################
 
-{"name" : "Switzerland - Accounting",
- "description" :  """
-Swiss localisation :
- - DTA generation for a lot of payment types
- - BVR management (number generation, report.)
- - Import account move from the bank file (like v11)
- - Simplify the way you handle the bank statement for reconciliation
+{
+    'name': 'Switzerland - Accounting',
+    'description':  """
+Swiss localization :
+====================
+    - DTA generation for a lot of payment types
+    - BVR management (number generation, report.)
+    - Import account move from the bank file (like v11)
+    - Simplify the way you handle the bank statement for reconciliation
 
 You can also add ZIP and bank completion with:
- - l10n_ch_zip
- - l10n_ch_bank
+----------------------------------------------
+    - l10n_ch_zip
+    - l10n_ch_bank
  
- Author: Camptocamp SA
- Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
-
-------------------------------------------------------------------------
+ **Author:** Camptocamp SA
+ 
+ **Donors:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
 
 Module incluant la localisation Suisse de OpenERP revu et corrigé par Camptocamp.
 Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement
@@ -43,16 +45,18 @@ et l'import du relevé de compte depuis la banque de manière automatisée. De p
 nous avons intégré la définition de toutes les banques Suisses(adresse, swift et clearing).
 
 Par ailleurs, conjointement à ce module, nous proposons la complétion NPA:
-
-Vous pouvez ajouter la completion des banques et des NPA avec with:
- - l10n_ch_zip
- - l10n_ch_bank
- 
- Auteur: Camptocamp SA
- Donateurs: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
-
 --------------------------------------------------------------------------
+Vous pouvez ajouter la completion des banques et des NPA avec with:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    - l10n_ch_zip
+    - l10n_ch_bank
+ 
+ **Auteur:** Camptocamp SA
+ 
+ **Donateurs:** Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA
+
 TODO :
+------
     - Implement bvr import partial reconciliation
     - Replace wizard by osv_memory when possible
     - Add mising HELP
@@ -60,47 +64,44 @@ TODO :
     - Improve demo data
 
 """,
- "version": "6.1",
- "author": "Camptocamp",
- 'category': 'Localization/Account Charts',
- "website": "http://www.camptocamp.com",
-
- "depends" : [ "account_cancel",
-               "base_iban",
-               "account_payment",
-               "account_voucher",
-               "report_webkit",
-               "l10n_multilang"],
-
- "init_xml": ["dta_data.xml",
-              "journal_data.xml",
-              #FR sterchi chart data
-              'sterchi_chart/account.xml',
-              'sterchi_chart/vat.xml',
-              'sterchi_chart/vat2011.xml',
-              'sterchi_chart/fiscal_position.xml'],
-
- "demo_xml": ["demo/demo.xml",
-              "demo/dta_demo.xml"],
-
- "update_xml": ["wizard.xml",
-                "wizard/bvr_import_view.xml",
-                "wizard/create_dta_view.xml",
-                "company_view.xml",
-                "account_invoice.xml",
-                "bank_view.xml",
-                "security/ir.model.access.csv",
-                "report/report_webkit_html_view.xml"],
- 
- "test": ['test/l10n_ch_report.yml',
-          'test/l10n_ch_dta.yml',
+    'version': '6.1',
+    'author': 'Camptocamp',
+    'category': 'Localization/Account Charts',
+    'website': 'http://www.camptocamp.com',
+    'depends': ['account_cancel',
+                 'base_iban',
+                 'account_payment',
+                 'account_voucher',
+                 'report_webkit',
+                 'l10n_multilang'
+    ],
+    'data': ['dta_data.xml',
+             'journal_data.xml',
+             #FR sterchi chart data
+             'sterchi_chart/account.xml',
+             'sterchi_chart/vat.xml',
+             'sterchi_chart/vat2011.xml',
+             'sterchi_chart/fiscal_position.xml',
+             'wizard.xml',
+             'wizard/bvr_import_view.xml',
+             'wizard/create_dta_view.xml',
+             'company_view.xml',
+             'account_invoice.xml',
+             'bank_view.xml',
+             'security/ir.model.access.csv',
+             'report/report_webkit_html_view.xml'
+    ],
+    'demo': ['demo/demo.xml',
+             'demo/dta_demo.xml'
+    ],
+    'test': ['test/l10n_ch_report.yml',
+             'test/l10n_ch_dta.yml',
           #TODO: uncomment the 2 following tests once they are fixed
           #'test/l10n_ch_v11.yml',
           #'test/l10n_ch_v11_part.yml'
-         ],
-
- "auto_install": False,
- "installable": True,
- "certificate": "001103836064567088989",
- 'images': ['images/config_chart_l10n_ch.jpeg','images/l10n_ch_chart.jpeg']}
+    ],
+    'auto_install': False,
+    'installable': True,
+    'images': ['images/config_chart_l10n_ch.jpeg','images/l10n_ch_chart.jpeg']
+}
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ch/account_wizard.py b/addons/l10n_ch/account_wizard.py
index 7b80e3697ee..306207c612d 100644
--- a/addons/l10n_ch/account_wizard.py
+++ b/addons/l10n_ch/account_wizard.py
@@ -36,8 +36,9 @@ class WizardMultiChartsAccounts(osv.osv_memory):
     def execute(self, cr, uid, ids, context=None):
         """Override of code in order to be able to link journal with account in XML"""
         res = super(WizardMultiChartsAccounts, self).execute(cr, uid, ids, context)
-        path = addons.get_module_resource(os.path.join('l10n_ch','sterchi_chart','account_journal_rel.xml'))
+        path = addons.get_module_resource('l10n_ch','sterchi_chart','account_journal_rel.xml')
         tools.convert_xml_import(cr, 'l10n_ch', path, idref=None, mode='init', noupdate=True, report=None)
+        res.update({'type': 'ir.actions.act_window_close'})
         return res
 
 WizardMultiChartsAccounts()
diff --git a/addons/l10n_ch/bank.py b/addons/l10n_ch/bank.py
index 9dd0caddf38..4e4c0e0aa8c 100644
--- a/addons/l10n_ch/bank.py
+++ b/addons/l10n_ch/bank.py
@@ -48,25 +48,10 @@ class ResPartnerBank(osv.osv):
         'dta_code': fields.char('DTA code', size=5),
         'print_bank': fields.boolean('Print Bank on BVR'),
         'print_account': fields.boolean('Print Account Number on BVR'),
-        'acc_number': fields.char('Account/IBAN Number', size=64),
+        'acc_number': fields.char('Account Number', size=64),
         'my_bank': fields.boolean('Use my account to print BVR ?', help="Check to print BVR invoices"),
     }
 
-    def name_get(self, cursor, uid, ids, context=None):
-        if not len(ids):
-            return []
-        bank_type_obj = self.pool.get('res.partner.bank.type')
-
-        type_ids = bank_type_obj.search(cursor, uid, [])
-        bank_type_names = {}
-        for bank_type in bank_type_obj.browse(cursor, uid, type_ids,
-                context=context):
-            bank_type_names[bank_type.code] = bank_type.name
-        res = []
-        for r in self.read(cursor, uid, ids, ['name','state'], context):
-            res.append((r['id'], r['name']+' : '+bank_type_names.get(r['state'], '')))
-        return res
-
     def _prepare_name(self, bank):
         "Hook to get bank number of bank account"
         res = u''
diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml
index da1badd7fe8..017f9bd1f9b 100644
--- a/addons/l10n_ch/bank_view.xml
+++ b/addons/l10n_ch/bank_view.xml
@@ -28,34 +28,6 @@
                 </field>
             </field>
         </record>
-        
-        <!-- res.partner.bank in res partner form-->
-        <!-- Partner -> Bank Details -->
-        
-        <record model="ir.ui.view" id="l10nch_view_res_partner_bank_add_groups">
-            <field name="name">res.partner_bank.form.hide.f2</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="account.view_partner_property_form"/>
-            <field name="arch" type="xml">
-                <field name="state" position="after">
-                    <newline/>
-                    <separator colspan="4" string="Account Infos"/>
-                    <group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" >
-                        <field name="acc_number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
-                        <field name="dta_code"/>
-                        <newline/>
-                    </group>
-                    <newline/>
-                    <group string="Postal account info" colspan="4"  attrs="{'invisible': [('state','not in', ['bvpost','bvrpost','bvbank','bvrbank'])]}" >
-                        <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])]}"/>
-                        <newline/>
-                    </group>
-                    <separator colspan="4" string="Financial Institute Infos"/>
-                    <field name="bank" />
-                </field>
-            </field>
-        </record>
-
 
         <!-- res.partner.bank base form-->
         <!-- Sales -> Configuration -> Address Book -> Bank accounts -->
@@ -66,35 +38,21 @@
             <field name="model">res.partner.bank</field>
             <field name="inherit_id" ref="base.view_partner_bank_form"/>
             <field name="arch" type="xml">
-                <field name="state" position="after">
-                    <newline/>
-                    
-                    <separator colspan="4" string="Account Infos"/>
-                        <newline/>
-                    <group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" >
-                            <field name="acc_number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/>
-                            <field name="dta_code"/>
-                        <newline/>
+                <xpath expr="//field[@name='acc_number']" position="attributes">
+                    <attribute name="attrs">{'required': [('state','not in',['bvpost','bvrpost'])]}</attribute>
+                </xpath>
+                <xpath expr="//field[@name='acc_number']" position="after">
+                    <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])], 'invisible': [('state','not in', ['bvpost','bvrpost','bvbank','bvrbank'])]}"/>
+                    <field name="dta_code" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}"/>
+                    <field name="my_bank"  attrs="{'invisible': ['|', ('state', 'not in', ['bvrpost','bvrbank']), ('company_id', '=', False)]}" />
+                </xpath>
+                <xpath expr="//group[@name='bank']" position="after">
+                    <group string="BVR print options" attrs="{'invisible': [('my_bank', '!=', True)]}" >
+                        <field name="bvr_adherent_num" attrs="{'invisible': [('state','!=','bvrbank')]}"/>
+                        <field name="print_bank"/>
+                        <field name="print_account"/>
                     </group>
-                    <newline/>
-                    <group string="Postal account info" colspan="4"  attrs="{'invisible': [('state','not in', ['bvpost','bvrpost','bvbank','bvrbank'])]}" >
-                        <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])]}"/>
-                        <newline/>
-                    </group>
-                    <separator colspan="4" string="Financial Institute Infos"/>
-                    <newline/>
-                    <group attrs="{'invisible': ['|', ('state', 'not in', ['bvrpost','bvrbank']), ('company_id', '=', False)]}" colspan="4">
-                        <field name="my_bank"  attrs="{'invisible': [('company_id', '=', False)]}" />
-                        <group string="BVR print options" colspan="4"  attrs="{'invisible': [('my_bank', '!=', True)]}" >
-                            <field name="bvr_adherent_num" attrs="{'invisible': [('state','!=','bvrbank')]}"/>
-                            <field name="print_bank"/>
-                            <field name="print_account"/>
-                            <newline/>
-                        </group>
-                    </group>
-                    <newline/>
-                    <field name="bank" />
-                </field>
+                </xpath>
             </field>
         </record>        
 
diff --git a/addons/l10n_ch/i18n/ar.po b/addons/l10n_ch/i18n/ar.po
index 2aed1b52fac..db2d03abf06 100644
--- a/addons/l10n_ch/i18n/ar.po
+++ b/addons/l10n_ch/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/bg.po b/addons/l10n_ch/i18n/bg.po
index 160898b0835..c65abac404a 100644
--- a/addons/l10n_ch/i18n/bg.po
+++ b/addons/l10n_ch/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/bs.po b/addons/l10n_ch/i18n/bs.po
index 8b1d5ae1aa4..20f3ff29b69 100644
--- a/addons/l10n_ch/i18n/bs.po
+++ b/addons/l10n_ch/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/ca.po b/addons/l10n_ch/i18n/ca.po
index 5d58cc67073..39617027bf2 100644
--- a/addons/l10n_ch/i18n/ca.po
+++ b/addons/l10n_ch/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/cs.po b/addons/l10n_ch/i18n/cs.po
index 19f1fc71c9b..ad6553f7a22 100644
--- a/addons/l10n_ch/i18n/cs.po
+++ b/addons/l10n_ch/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/da.po b/addons/l10n_ch/i18n/da.po
index 94681288d47..d794bb248dc 100644
--- a/addons/l10n_ch/i18n/da.po
+++ b/addons/l10n_ch/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/de.po b/addons/l10n_ch/i18n/de.po
index db0fa15667e..a77dcc48ce7 100644
--- a/addons/l10n_ch/i18n/de.po
+++ b/addons/l10n_ch/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/es.po b/addons/l10n_ch/i18n/es.po
index ec826214893..d422d262772 100644
--- a/addons/l10n_ch/i18n/es.po
+++ b/addons/l10n_ch/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/es_AR.po b/addons/l10n_ch/i18n/es_AR.po
index 3e5f0c89d57..7241f47d1c1 100644
--- a/addons/l10n_ch/i18n/es_AR.po
+++ b/addons/l10n_ch/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/es_CR.po b/addons/l10n_ch/i18n/es_CR.po
index 0772980d9d1..8cc26404ea0 100644
--- a/addons/l10n_ch/i18n/es_CR.po
+++ b/addons/l10n_ch/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/et.po b/addons/l10n_ch/i18n/et.po
index 27217e9330f..b295a493d56 100644
--- a/addons/l10n_ch/i18n/et.po
+++ b/addons/l10n_ch/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/fr.po b/addons/l10n_ch/i18n/fr.po
index ba71ad98635..90caa06cc16 100644
--- a/addons/l10n_ch/i18n/fr.po
+++ b/addons/l10n_ch/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/hr.po b/addons/l10n_ch/i18n/hr.po
index 6f7d7d8f553..5097eb12869 100644
--- a/addons/l10n_ch/i18n/hr.po
+++ b/addons/l10n_ch/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/hu.po b/addons/l10n_ch/i18n/hu.po
index 6f7d7d8f553..5097eb12869 100644
--- a/addons/l10n_ch/i18n/hu.po
+++ b/addons/l10n_ch/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/id.po b/addons/l10n_ch/i18n/id.po
index a0b8ed1e7f7..38c219b5e20 100644
--- a/addons/l10n_ch/i18n/id.po
+++ b/addons/l10n_ch/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/it.po b/addons/l10n_ch/i18n/it.po
index 1f0c15507b1..adf05ebeb43 100644
--- a/addons/l10n_ch/i18n/it.po
+++ b/addons/l10n_ch/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/ko.po b/addons/l10n_ch/i18n/ko.po
index efee4c1d1af..f22ed7b82e0 100644
--- a/addons/l10n_ch/i18n/ko.po
+++ b/addons/l10n_ch/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/lt.po b/addons/l10n_ch/i18n/lt.po
index 6f7d7d8f553..5097eb12869 100644
--- a/addons/l10n_ch/i18n/lt.po
+++ b/addons/l10n_ch/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/nl.po b/addons/l10n_ch/i18n/nl.po
index 3079550e3e9..c4f849d7ee2 100644
--- a/addons/l10n_ch/i18n/nl.po
+++ b/addons/l10n_ch/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/nl_BE.po b/addons/l10n_ch/i18n/nl_BE.po
index 59a464beb12..701cd2328ea 100644
--- a/addons/l10n_ch/i18n/nl_BE.po
+++ b/addons/l10n_ch/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/pl.po b/addons/l10n_ch/i18n/pl.po
index 200a69fd55f..5a01007dd6f 100644
--- a/addons/l10n_ch/i18n/pl.po
+++ b/addons/l10n_ch/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/pt.po b/addons/l10n_ch/i18n/pt.po
index 36d5e19938c..96ad64d8b95 100644
--- a/addons/l10n_ch/i18n/pt.po
+++ b/addons/l10n_ch/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/pt_BR.po b/addons/l10n_ch/i18n/pt_BR.po
index f5712df877f..6f345deae5d 100644
--- a/addons/l10n_ch/i18n/pt_BR.po
+++ b/addons/l10n_ch/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/ro.po b/addons/l10n_ch/i18n/ro.po
index 6f7d7d8f553..5097eb12869 100644
--- a/addons/l10n_ch/i18n/ro.po
+++ b/addons/l10n_ch/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/ru.po b/addons/l10n_ch/i18n/ru.po
index b2fdcad3ac2..d7f20e48f96 100644
--- a/addons/l10n_ch/i18n/ru.po
+++ b/addons/l10n_ch/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/sl.po b/addons/l10n_ch/i18n/sl.po
index d1b11ac5f6d..21f5ef03120 100644
--- a/addons/l10n_ch/i18n/sl.po
+++ b/addons/l10n_ch/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/sq.po b/addons/l10n_ch/i18n/sq.po
index 1c0075c18d8..7ed0ea6b2d1 100644
--- a/addons/l10n_ch/i18n/sq.po
+++ b/addons/l10n_ch/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/sr@latin.po b/addons/l10n_ch/i18n/sr@latin.po
index 848975aad84..46485d96f6c 100644
--- a/addons/l10n_ch/i18n/sr@latin.po
+++ b/addons/l10n_ch/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/sv.po b/addons/l10n_ch/i18n/sv.po
index 7ac19fbacbf..2be5879b290 100644
--- a/addons/l10n_ch/i18n/sv.po
+++ b/addons/l10n_ch/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/tr.po b/addons/l10n_ch/i18n/tr.po
index 31d372216b5..340baf5eb32 100644
--- a/addons/l10n_ch/i18n/tr.po
+++ b/addons/l10n_ch/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/uk.po b/addons/l10n_ch/i18n/uk.po
index 4c5c6fad5c9..463172d677f 100644
--- a/addons/l10n_ch/i18n/uk.po
+++ b/addons/l10n_ch/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/vi.po b/addons/l10n_ch/i18n/vi.po
index 4521e148607..9a71da7a52e 100644
--- a/addons/l10n_ch/i18n/vi.po
+++ b/addons/l10n_ch/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:55+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/zh_CN.po b/addons/l10n_ch/i18n/zh_CN.po
index 1f8fc8af60f..bf38f786b73 100644
--- a/addons/l10n_ch/i18n/zh_CN.po
+++ b/addons/l10n_ch/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/i18n/zh_TW.po b/addons/l10n_ch/i18n/zh_TW.po
index 78c7b2474fa..5097eb12869 100644
--- a/addons/l10n_ch/i18n/zh_TW.po
+++ b/addons/l10n_ch/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ch
 #: model:ir.model,name:l10n_ch.model_account_tax_code
diff --git a/addons/l10n_ch/journal_data.xml b/addons/l10n_ch/journal_data.xml
index 04870ca936b..ede9136c3d2 100644
--- a/addons/l10n_ch/journal_data.xml
+++ b/addons/l10n_ch/journal_data.xml
@@ -19,6 +19,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field name="update_posted" eval="True" />
             <field name="entry_posted" eval="True" />
+            <field name="currency" model="res.currency" ref="base.CHF" />
         </record>
         
         <record id="bank_euro_journal" model="account.journal">
diff --git a/addons/l10n_ch/partner.py b/addons/l10n_ch/partner.py
index 9301c564227..aba9ea7b204 100644
--- a/addons/l10n_ch/partner.py
+++ b/addons/l10n_ch/partner.py
@@ -30,4 +30,4 @@ class res_partner(osv.osv):
     }
 
 res_partner()
-# 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/l10n_ch/payment.py b/addons/l10n_ch/payment.py
index aba757502b0..a681daf569d 100644
--- a/addons/l10n_ch/payment.py
+++ b/addons/l10n_ch/payment.py
@@ -24,7 +24,7 @@ from osv import osv
 class payment_order(osv.osv):
     _inherit = 'payment.order'
 
-    def get_wizard(self,mode):
+    def get_wizard(self, mode):
         if mode == 'dta':
             return 'l10n_ch', 'action_dta_create'
 
diff --git a/addons/l10n_ch/report/report_webkit_html.py b/addons/l10n_ch/report/report_webkit_html.py
index 1699871dc26..6b6a84e0cf4 100644
--- a/addons/l10n_ch/report/report_webkit_html.py
+++ b/addons/l10n_ch/report/report_webkit_html.py
@@ -76,7 +76,7 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse):
             self._check(ids)
         return super(l10n_ch_report_webkit_html, self).set_context(objects, data, ids, report_type=report_type)
 
-    def police_absolute_path(self, inner_path) :
+    def police_absolute_path(self, inner_path):
         """Will get the ocrb police absolute path"""
         path = addons.get_module_resource(os.path.join('l10n_ch', 'report', inner_path))
         return  path
diff --git a/addons/l10n_ch/sterchi_chart/account.xml b/addons/l10n_ch/sterchi_chart/account.xml
index 588fa5fed61..bd848642a97 100644
--- a/addons/l10n_ch/sterchi_chart/account.xml
+++ b/addons/l10n_ch/sterchi_chart/account.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-    <data noupdate="True">
+    <data noupdate="1">
        <record id="account_type_view" model="account.account.type">
            <field name="name">Autre : Vue</field>
            <field name="code">view</field>
@@ -11807,7 +11807,6 @@
             <field name="property_account_income" ref="ch_3200"/>
             <field name="property_account_income_opening" ref="ch_2990"/>
             <field name="property_account_expense_opening" ref="ch_2990"/>
-            <field name="property_reserve_and_surplus_account" ref="ch_2991"/>
         </record>
         
         <!-- journal configuration of account -->
diff --git a/addons/l10n_ch/sterchi_chart/account_journal_rel.xml b/addons/l10n_ch/sterchi_chart/account_journal_rel.xml
index 43dbbe5e8fa..bb2e4c255ff 100644
--- a/addons/l10n_ch/sterchi_chart/account_journal_rel.xml
+++ b/addons/l10n_ch/sterchi_chart/account_journal_rel.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-    <data noupdate="True">
+    <data noupdate="1">
         <!-- journal configuration of account -->
         
         <record id="expenses_journal" model="account.journal">
diff --git a/addons/l10n_ch/test/l10n_ch_dta.yml b/addons/l10n_ch/test/l10n_ch_dta.yml
index 06c15d524b2..8867c46df75 100644
--- a/addons/l10n_ch/test/l10n_ch_dta.yml
+++ b/addons/l10n_ch/test/l10n_ch_dta.yml
@@ -25,7 +25,7 @@
 -
   !record {model: account.invoice.line, id: dta_invoice_line, view: False}:
     account_id: account.a_expense
-    name: '[PC1] Basic PC'
+    name: '[PCSC234] PC Assemble SC234'
     price_unit: 700.0
     quantity: 10.0
     product_id: product.product_product_3
diff --git a/addons/l10n_ch/test/l10n_ch_v11.yml b/addons/l10n_ch/test/l10n_ch_v11.yml
index 4bacbf730f8..975e3569eb4 100644
--- a/addons/l10n_ch/test/l10n_ch_v11.yml
+++ b/addons/l10n_ch/test/l10n_ch_v11.yml
@@ -26,7 +26,7 @@
 -
   !record {model: account.invoice.line, id: v11_test_invoice_line, view: False}:
     account_id: account.a_expense
-    name: '[PC1] Basic PC'
+    name: '[PCSC234] PC Assemble SC234'
     price_unit: 888.00
     quantity: 1.0
     product_id: product.product_product_3
diff --git a/addons/l10n_ch/test/l10n_ch_v11_part.yml b/addons/l10n_ch/test/l10n_ch_v11_part.yml
index 811ee77bc4a..01e3a9624ea 100644
--- a/addons/l10n_ch/test/l10n_ch_v11_part.yml
+++ b/addons/l10n_ch/test/l10n_ch_v11_part.yml
@@ -27,7 +27,7 @@
 -
   !record {model: account.invoice.line, id: v11_part_test_invoice_line, view: False}:
     account_id: account.a_expense
-    name: '[PC1] Basic PC'
+    name: '[PCSC234] PC Assemble SC234'
     price_unit: 250.00
     quantity: 1.0
     product_id: product.product_product_3
diff --git a/addons/l10n_ch/wizard.xml b/addons/l10n_ch/wizard.xml
index 084159aa36d..dde7a77516a 100644
--- a/addons/l10n_ch/wizard.xml
+++ b/addons/l10n_ch/wizard.xml
@@ -1,13 +1,7 @@
 <openerp>
-    <data>
-        <record id="config_call_account_template_l10n_ch" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts for l10n_ch</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. Please let the nuber to 0 for Swiss charts. 
-                This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial
-                Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="sequence">4</field>
-            <field name="type">automatic</field>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_ch/wizard/create_dta.py b/addons/l10n_ch/wizard/create_dta.py
index 695fe763aa9..f2d8f14b772 100644
--- a/addons/l10n_ch/wizard/create_dta.py
+++ b/addons/l10n_ch/wizard/create_dta.py
@@ -41,7 +41,7 @@ TRANS=[
     (u'ä','a'),
 ]
 
-def _u2a(text) :
+def _u2a(text):
     """Tries to convert unicode charactere to asci equivalence"""
     if not text : return ""
     txt = ""
diff --git a/addons/l10n_cl/__openerp__.py b/addons/l10n_cl/__openerp__.py
index d10acdae575..5417faed3f4 100644
--- a/addons/l10n_cl/__openerp__.py
+++ b/addons/l10n_cl/__openerp__.py
@@ -17,34 +17,29 @@
 #    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": "Chile Localization Chart Account",
-    "version": "1.0",
-    "description": """
+    'name': 'Chile Localization Chart Account',
+    'version': '1.0',
+    'description': """
 Chilean accounting chart and tax localization.
-
+==============================================
 Plan contable chileno e impuestos de acuerdo a disposiciones vigentes
 
     """,
-    "author": "Cubic ERP",
-    "website": "http://cubicERP.com",
-    "category": "Localization/Account Charts",
-    "depends": [
-			"account_chart",
-			],
-	"data":[
-        "account_tax_code.xml",
-        "l10n_cl_chart.xml",
-        "account_tax.xml",
-        "l10n_cl_wizard.xml",
-			],
-    "demo_xml": [
-			],
-    "update_xml": [
-			],
-    "active": False,
-    "installable": True,
+    'author': 'Cubic ERP',
+    'website': 'http://cubicERP.com',
+    'category': 'Localization/Account Charts',
+    'depends': ['account_chart'],
+    'data': [
+        'account_tax_code.xml',
+        'l10n_cl_chart.xml',
+        'account_tax.xml',
+        'l10n_cl_wizard.xml',
+    ],
+    'demo': [],
+    'active': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_cl.jpeg','images/l10n_cl_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_cl/i18n/es.po b/addons/l10n_cl/i18n/es.po
index f8b17197008..46f375441f3 100644
--- a/addons/l10n_cl/i18n/es.po
+++ b/addons/l10n_cl/i18n/es.po
@@ -1,72 +1,54 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-10 13:46+0000\n"
-"Last-Translator: Yury Tello <ytello@cubicerp.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: 2011-01-15 05:56+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
-
-#. module: l10n_cl
-#: model:ir.module.module,description:l10n_cl.module_meta_information
-msgid ""
-"\n"
-"    Chilean Accounting : chart of Account\n"
-"    "
-msgstr ""
-"\n"
-"    Contabilidad Peruana : Plan de cuentas\n"
-"    "
-
-#. module: l10n_cl
-#: model:ir.module.module,shortdesc:l10n_cl.module_meta_information
-msgid "Chilean Chart of Account"
-msgstr "Plan de cuentas de Chile"
-
-#. module: l10n_cl
-#: model:ir.actions.todo,note:l10n_cl.config_call_account_template_in_minimal
-msgid ""
-"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-"the name of the company, the chart template to follow, the no. of digits to "
-"generate the code for your accounts and Bank account, currency to create "
-"Journals. Thus,the pure copy of chart Template is generated.\n"
-"\tThis is the same wizard that runs from Financial "
-"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-"Chart of Accounts from a Chart Template."
-msgstr ""
-"Generar el plan contable a partir de una plantilla de plan contable. Se le "
-"pedirá el nombre de la compañia, la plantilla de plan contable a utilizar, "
-"el número de dígitos para generar el código de las cuentas y de la cuenta "
-"bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
-"exacta de la plantilla de plan contable.\n"
-"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
-"Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
-"plan contable a partir de una plantilla de plan contable."
-
-#~ msgid "Liability"
-#~ msgstr "Pasivo"
-
-#~ msgid "Asset"
-#~ msgstr "Activo"
-
-#~ msgid "Closed"
-#~ msgstr "Cerrado"
-
-#~ msgid "Income"
-#~ msgstr "Ingreso"
-
-#~ msgid "Expense"
-#~ msgstr "Gasto"
-
-#~ msgid "View"
-#~ msgstr "Vista"
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2012-10-18 15:51+0000\n"
+"Last-Translator: Cubic ERP <ytello@cubicerp.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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_cl
+#: model:ir.module.module,description:l10n_cl.module_meta_information
+msgid ""
+"\n"
+"    Chilean Accounting : chart of Account\n"
+"    "
+msgstr ""
+"\n"
+"    Contabilidad Peruana : Plan de cuentas\n"
+"    "
+
+#. module: l10n_cl
+#: model:ir.module.module,shortdesc:l10n_cl.module_meta_information
+msgid "Chilean Chart of Account"
+msgstr "Plan de cuentas de Chile"
+
+#. module: l10n_cl
+#: model:ir.actions.todo,note:l10n_cl.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generar el plan contable a partir de una plantilla de plan contable. Se le "
+"pedirá el nombre de la compañia, la plantilla de plan contable a utilizar, "
+"el número de dígitos para generar el código de las cuentas y de la cuenta "
+"bancaria, la moneda para crear los diarios. Así pues, se genere una copia "
+"exacta de la plantilla de plan contable.\n"
+"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
+"Configuración / Contabilidad financiera / Cuentas financieras / Generar el "
+"plan contable a partir de una plantilla de plan contable."
diff --git a/addons/l10n_cl/i18n/zh_CN.po b/addons/l10n_cl/i18n/zh_CN.po
new file mode 100644
index 00000000000..179d0649d3d
--- /dev/null
+++ b/addons/l10n_cl/i18n/zh_CN.po
@@ -0,0 +1,43 @@
+# Chinese (Simplified) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2012-11-02 14:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-11-03 05:04+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
+
+#. module: l10n_cl
+#: model:ir.module.module,description:l10n_cl.module_meta_information
+msgid ""
+"\n"
+"    Chilean Accounting : chart of Account\n"
+"    "
+msgstr ""
+
+#. module: l10n_cl
+#: model:ir.module.module,shortdesc:l10n_cl.module_meta_information
+msgid "Chilean Chart of Account"
+msgstr ""
+
+#. module: l10n_cl
+#: model:ir.actions.todo,note:l10n_cl.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
diff --git a/addons/l10n_cl/l10n_cl_wizard.xml b/addons/l10n_cl/l10n_cl_wizard.xml
index fd0d29f1edb..704ac4daf38 100644
--- a/addons/l10n_cl/l10n_cl_wizard.xml
+++ b/addons/l10n_cl/l10n_cl_wizard.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-
-		<record id="config_call_account_template_cl" model="ir.actions.todo">
-	        <field name="name">Generate Chart of Accounts from a Chart Template</field>
-	        <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-	        <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
-    	</record>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index e173c5ebba2..3dd702a2d67 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -18,31 +18,28 @@
 #
 ##############################################################################
 {
-    "name" : "中国会计科目表 - Accounting",
-    "version" : "1.0",
-    "category": "Localization/Account Charts",
-    "author" : "openerp-china.org",
-    "maintainer":"openerp-china.org",
-    "website":"http://openerp-china.org",
-    "url":"http://code.google.com/p/openerp-china/source/browse/#svn/trunk/l10n_cn",
-    "description": """
+    'name': '中国会计科目表 - Accounting',
+    'version': '1.0',
+    'category': 'Localization/Account Charts',
+    'author': 'openerp-china.org',
+    'maintainer':'openerp-china.org',
+    'website':'http://openerp-china.org',
+    'url': 'http://code.google.com/p/openerp-china/source/browse/#svn/trunk/l10n_cn',
+    'description': """
 添加中文省份数据
 科目类型\会计科目表模板\增值税\辅助核算类别\管理会计凭证簿\财务会计凭证簿
 ============================================================
     """,
-    "depends" : ["base","account"],
-    'init_xml': [
+    'depends': ['base','account'],
+    'demo': [],
+    'data': [
+        'account_chart.xml',
+        'l10n_chart_cn_wizard.xml',
         'base_data.xml',
     ],
-    "demo_xml" : [],
-    "update_xml" : [
-        'account_chart.xml',
-        "l10n_chart_cn_wizard.xml",
-    ],
-    "license": "GPL-3",
-    "auto_install": False,
-    "installable": True,
-    "certificate": '00925445983542952285',
+    'license': 'GPL-3',
+    'auto_install': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_cn.jpeg','images/l10n_cn_chart.jpeg'],
 }
 
diff --git a/addons/l10n_cn/account_chart.xml b/addons/l10n_cn/account_chart.xml
index e51a9d70654..afcb3e04b0c 100644
--- a/addons/l10n_cn/account_chart.xml
+++ b/addons/l10n_cn/account_chart.xml
@@ -957,7 +957,6 @@
             <field name="property_account_payable" ref="chart2202"/>
             <field name="property_account_expense_categ" ref="chart1401"/>
             <field name="property_account_income_categ" ref="chart6001"/>
-            <field name="property_reserve_and_surplus_account" ref="chart4103"/>            
         </record>
         <!-- 增值税 -->
         <record id="vats" model="account.tax.template">
diff --git a/addons/l10n_cn/base_data.xml b/addons/l10n_cn/base_data.xml
index 18242ba38b9..c65978b6560 100644
--- a/addons/l10n_cn/base_data.xml
+++ b/addons/l10n_cn/base_data.xml
@@ -1,162 +1,162 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-
-        <!-- 添加省份数据 -->
-        <record id="state_BJ" model="res.country.state">
-            <field name="name">北京市</field>
-            <field name="code">京</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SH" model="res.country.state">
-            <field name="name">上海市</field>
-            <field name="code">沪</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_ZJ" model="res.country.state">
-            <field name="name">浙江省</field>
-            <field name="code">浙</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_TJ" model="res.country.state">
-            <field name="name">天津市</field>
-            <field name="code">津</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_AH" model="res.country.state">
-            <field name="name">安徽省</field>
-            <field name="code">皖</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_FJ" model="res.country.state">
-            <field name="name">福建省</field>
-            <field name="code">闽</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_CQ" model="res.country.state">
-            <field name="name">重庆市</field>
-            <field name="code">渝 </field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_JX" model="res.country.state">
-            <field name="name">江西省</field>
-            <field name="code">赣</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SD" model="res.country.state">
-            <field name="name">山东省</field>
-            <field name="code">鲁</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HeN" model="res.country.state">
-            <field name="name">河南省</field>
-            <field name="code">豫</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_NM" model="res.country.state">
-            <field name="name">内蒙古自治区</field>
-            <field name="code">蒙</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HuB" model="res.country.state">
-            <field name="name">湖北省</field>
-            <field name="code">鄂</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_XJ" model="res.country.state">
-            <field name="name">新疆维吾尔自治区</field>
-            <field name="code">新</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HuN" model="res.country.state">
-            <field name="name">湖南省</field>
-            <field name="code">湘</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_NX" model="res.country.state">
-            <field name="name">宁夏回族自治区</field>
-            <field name="code">宁</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_GD" model="res.country.state">
-            <field name="name">广东省</field>
-            <field name="code">粤</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_XZ" model="res.country.state">
-            <field name="name">西藏自治区</field>
-            <field name="code">藏</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HaN" model="res.country.state">
-            <field name="name">海南省</field>
-            <field name="code">琼</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_GX" model="res.country.state">
-            <field name="name">广西壮族自治区</field>
-            <field name="code">桂</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SC" model="res.country.state">
-            <field name="name">四川省</field>
-            <field name="code">蜀</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HeB" model="res.country.state">
-            <field name="name">河北省</field>
-            <field name="code">冀</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_GZ" model="res.country.state">
-            <field name="name">贵州省</field>
-            <field name="code">黔</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SX" model="res.country.state">
-            <field name="name">山西省</field>
-            <field name="code">晋</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_YN" model="res.country.state">
-            <field name="name">云南省</field>
-            <field name="code">滇</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_LN" model="res.country.state">
-            <field name="name">辽宁省</field>
-            <field name="code">辽</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_SX" model="res.country.state">
-            <field name="name">陕西省</field>
-            <field name="code">陕</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_JL" model="res.country.state">
-            <field name="name">吉林省</field>
-            <field name="code">吉</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_GS" model="res.country.state">
-            <field name="name">甘肃省</field>
-            <field name="code">甘</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_HL" model="res.country.state">
-            <field name="name">黑龙江省</field>
-            <field name="code">黑</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_QH" model="res.country.state">
-            <field name="name">青海省</field>
-            <field name="code">青</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-        <record id="state_JS" model="res.country.state">
-            <field name="name">江苏省</field>
-            <field name="code">苏</field>
-            <field name="country_id" ref="base.cn"/>
-        </record>
-    </data>
-</openerp>
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+        <!-- 添加省份数据 -->
+        <record id="state_BJ" model="res.country.state">
+            <field name="name">北京市</field>
+            <field name="code">京</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_SH" model="res.country.state">
+            <field name="name">上海市</field>
+            <field name="code">沪</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_ZJ" model="res.country.state">
+            <field name="name">浙江省</field>
+            <field name="code">浙</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_TJ" model="res.country.state">
+            <field name="name">天津市</field>
+            <field name="code">津</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_AH" model="res.country.state">
+            <field name="name">安徽省</field>
+            <field name="code">皖</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_FJ" model="res.country.state">
+            <field name="name">福建省</field>
+            <field name="code">闽</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_CQ" model="res.country.state">
+            <field name="name">重庆市</field>
+            <field name="code">渝 </field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_JX" model="res.country.state">
+            <field name="name">江西省</field>
+            <field name="code">赣</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_SD" model="res.country.state">
+            <field name="name">山东省</field>
+            <field name="code">鲁</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_HeN" model="res.country.state">
+            <field name="name">河南省</field>
+            <field name="code">豫</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_NM" model="res.country.state">
+            <field name="name">内蒙古自治区</field>
+            <field name="code">蒙</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_HuB" model="res.country.state">
+            <field name="name">湖北省</field>
+            <field name="code">鄂</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_XJ" model="res.country.state">
+            <field name="name">新疆维吾尔自治区</field>
+            <field name="code">新</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_HuN" model="res.country.state">
+            <field name="name">湖南省</field>
+            <field name="code">湘</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_NX" model="res.country.state">
+            <field name="name">宁夏回族自治区</field>
+            <field name="code">宁</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_GD" model="res.country.state">
+            <field name="name">广东省</field>
+            <field name="code">粤</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_XZ" model="res.country.state">
+            <field name="name">西藏自治区</field>
+            <field name="code">藏</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_HaN" model="res.country.state">
+            <field name="name">海南省</field>
+            <field name="code">琼</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_GX" model="res.country.state">
+            <field name="name">广西壮族自治区</field>
+            <field name="code">桂</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_SC" model="res.country.state">
+            <field name="name">四川省</field>
+            <field name="code">蜀</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_HeB" model="res.country.state">
+            <field name="name">河北省</field>
+            <field name="code">冀</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_GZ" model="res.country.state">
+            <field name="name">贵州省</field>
+            <field name="code">黔</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_SX" model="res.country.state">
+            <field name="name">山西省</field>
+            <field name="code">晋</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_YN" model="res.country.state">
+            <field name="name">云南省</field>
+            <field name="code">滇</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_LN" model="res.country.state">
+            <field name="name">辽宁省</field>
+            <field name="code">辽</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_SX" model="res.country.state">
+            <field name="name">陕西省</field>
+            <field name="code">陕</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_JL" model="res.country.state">
+            <field name="name">吉林省</field>
+            <field name="code">吉</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_GS" model="res.country.state">
+            <field name="name">甘肃省</field>
+            <field name="code">甘</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_HL" model="res.country.state">
+            <field name="name">黑龙江省</field>
+            <field name="code">黑</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_QH" model="res.country.state">
+            <field name="name">青海省</field>
+            <field name="code">青</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+        <record id="state_JS" model="res.country.state">
+            <field name="name">江苏省</field>
+            <field name="code">苏</field>
+            <field name="country_id" ref="base.cn"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/l10n_cn/i18n/ar.po b/addons/l10n_cn/i18n/ar.po
index 7db57c46cb1..09f042d93a8 100644
--- a/addons/l10n_cn/i18n/ar.po
+++ b/addons/l10n_cn/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/ca.po b/addons/l10n_cn/i18n/ca.po
index 0cacc48c0e7..10571001e97 100644
--- a/addons/l10n_cn/i18n/ca.po
+++ b/addons/l10n_cn/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/da.po b/addons/l10n_cn/i18n/da.po
index ab683c020bb..f972fca181b 100644
--- a/addons/l10n_cn/i18n/da.po
+++ b/addons/l10n_cn/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/es.po b/addons/l10n_cn/i18n/es.po
index 7efd7dbe9e0..1e0ce0b791d 100644
--- a/addons/l10n_cn/i18n/es.po
+++ b/addons/l10n_cn/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/es_CR.po b/addons/l10n_cn/i18n/es_CR.po
index 19277ac9a0a..e20fe450dc4 100644
--- a/addons/l10n_cn/i18n/es_CR.po
+++ b/addons/l10n_cn/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_cn
diff --git a/addons/l10n_cn/i18n/es_PY.po b/addons/l10n_cn/i18n/es_PY.po
index fd7ddd604db..b141cd52c5f 100644
--- a/addons/l10n_cn/i18n/es_PY.po
+++ b/addons/l10n_cn/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/gl.po b/addons/l10n_cn/i18n/gl.po
index dd675db0848..3a8694f9a79 100644
--- a/addons/l10n_cn/i18n/gl.po
+++ b/addons/l10n_cn/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/it.po b/addons/l10n_cn/i18n/it.po
index 6a813ace97f..378b87451ed 100644
--- a/addons/l10n_cn/i18n/it.po
+++ b/addons/l10n_cn/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/nb.po b/addons/l10n_cn/i18n/nb.po
new file mode 100644
index 00000000000..c6d83738b3e
--- /dev/null
+++ b/addons/l10n_cn/i18n/nb.po
@@ -0,0 +1,66 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-12-23 09:56+0000\n"
+"PO-Revision-Date: 2012-09-08 19:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
+msgid "损益类"
+msgstr "Gevinst eller tap kategori."
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_all
+msgid "所有科目"
+msgstr "Alle fag."
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_equity
+msgid "所有者权益类"
+msgstr "Eiernes egenkapital."
+
+#. module: l10n_cn
+#: model:ir.actions.todo,note:l10n_cn.config_call_account_template_cn_chart
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generere Kontoplan fra en diagrammal. Du vil bli bedt om å passere navnet på "
+"selskapet, diagrammal til følge, nei. sifre som skal generere koden for "
+"kontoene og bankkonto, valuta å skape Journals. Dermed er den rene kopi av "
+"diagrammal generert.\n"
+"\t Dette er den samme veiviser som går fra økonomistyring / konfigurasjon / "
+"finansiell Regnskap / finansregnskapet / Generer Kontoplan fra en diagrammal."
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_debt
+msgid "负债类"
+msgstr "Gjeld klasse."
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_cost
+msgid "成本类"
+msgstr "Kostnaden for klassen"
+
+#. module: l10n_cn
+#: model:account.account.type,name:l10n_cn.user_type_capital
+msgid "资产类"
+msgstr "Aktivaklasser"
diff --git a/addons/l10n_cn/i18n/pt_BR.po b/addons/l10n_cn/i18n/pt_BR.po
index 65ab9eff28a..947a577cf42 100644
--- a/addons/l10n_cn/i18n/pt_BR.po
+++ b/addons/l10n_cn/i18n/pt_BR.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-12-23 09:56+0000\n"
-"PO-Revision-Date: 2011-03-09 22:08+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-10-16 23:56+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
 msgid "损益类"
-msgstr ""
+msgstr "Categoria Lucro ou Prejuízo"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_all
 msgid "所有科目"
-msgstr ""
+msgstr "Todos os assuntos"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_equity
 msgid "所有者权益类"
-msgstr ""
+msgstr "Capital Próprio"
 
 #. module: l10n_cn
 #: model:ir.actions.todo,note:l10n_cn.config_call_account_template_cn_chart
@@ -43,28 +43,28 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-"the name of the company, the chart template to follow, the no. of digits to "
-"generate the code for your accounts and Bank account, currency to create "
-"Journals. Thus,the pure copy of chart Template is generated.\n"
-"\tThis is the same wizard that runs from Financial "
-"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-"Chart of Accounts from a Chart Template."
+"Gerar Gráfico de Contas apartir de um modelo. Você deverá informar o nome da "
+"empresa, o gráfico modelo, o número de dígitos para gerar o código para suas "
+"contas, a conta bancária e a moeda para gerar a sequência. Em seguida uma "
+"cópia do gráfico modelo é gerada.\n"
+"Este é o mesmo assistente que é executado a partir de Gerenciamento "
+"Financeiro/Configuração/Contabilidade Financeira/Contas Financeiras/Gerar "
+"Gráfico de Contas a partir de um Gráfico Modelo."
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_debt
 msgid "负债类"
-msgstr ""
+msgstr "Classe Passivos"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_cost
 msgid "成本类"
-msgstr ""
+msgstr "Custo da Classe"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_capital
 msgid "资产类"
-msgstr ""
+msgstr "Classe Ativos"
 
 #~ msgid "中国会计科目表"
 #~ msgstr "中国会计科目表"
diff --git a/addons/l10n_cn/i18n/sr@latin.po b/addons/l10n_cn/i18n/sr@latin.po
index f560f3ba928..0d4b3b2a50d 100644
--- a/addons/l10n_cn/i18n/sr@latin.po
+++ b/addons/l10n_cn/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/tr.po b/addons/l10n_cn/i18n/tr.po
index 3b61d5dfe33..80ef4e897ec 100644
--- a/addons/l10n_cn/i18n/tr.po
+++ b/addons/l10n_cn/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/i18n/zh_CN.po b/addons/l10n_cn/i18n/zh_CN.po
index bc1663caf12..4d054868ec3 100644
--- a/addons/l10n_cn/i18n/zh_CN.po
+++ b/addons/l10n_cn/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cn
 #: model:account.account.type,name:l10n_cn.user_type_profit_and_loss
diff --git a/addons/l10n_cn/l10n_chart_cn_wizard.xml b/addons/l10n_cn/l10n_chart_cn_wizard.xml
index 0a098120682..52aaa88fdab 100644
--- a/addons/l10n_cn/l10n_chart_cn_wizard.xml
+++ b/addons/l10n_cn/l10n_chart_cn_wizard.xml
@@ -1,12 +1,7 @@
 <openerp>
-    <data>
-
-        <record id="config_call_account_template_cn_chart" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
 
     </data>
diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py
index 562af835398..79a769e9e8e 100644
--- a/addons/l10n_cr/__openerp__.py
+++ b/addons/l10n_cr/__openerp__.py
@@ -44,6 +44,7 @@ Chart of accounts for Costa Rica.
 =================================
 
 Includes:
+---------
     * account.type
     * account.account.template
     * account.tax.template
@@ -54,9 +55,8 @@ Everything is in English with Spanish translation. Further translations are welc
 please go to http://translations.launchpad.net/openerp-costa-rica.
     """,
     'depends': ['account', 'account_chart', 'base'],
-    'init_xml': [],
-    'demo_xml': [],
-    'update_xml': [
+    'demo': [],
+    'data': [
         'l10n_cr_base_data.xml',
         'data/account_account_type.xml',
         'data/account_account_template.xml',
@@ -68,7 +68,6 @@ please go to http://translations.launchpad.net/openerp-costa-rica.
     'license': 'Other OSI approved licence',
     'installable': True,
     'auto_install': False,
-    'certificate' : '00531476623680631853',
     'images': ['images/config_chart_l10n_cr.jpeg','images/l10n_cr_chart.jpeg'],
 }
 
diff --git a/addons/l10n_cr/i18n/ar.po b/addons/l10n_cr/i18n/ar.po
index c24f5ee4aa7..fabe21e0114 100644
--- a/addons/l10n_cr/i18n/ar.po
+++ b/addons/l10n_cr/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/ca.po b/addons/l10n_cr/i18n/ca.po
index 81b02dbc9e3..6a37fdef758 100644
--- a/addons/l10n_cr/i18n/ca.po
+++ b/addons/l10n_cr/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/da.po b/addons/l10n_cr/i18n/da.po
index d3a5a993558..b032b639448 100644
--- a/addons/l10n_cr/i18n/da.po
+++ b/addons/l10n_cr/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/es.po b/addons/l10n_cr/i18n/es.po
index 842bc3e9b92..eb32685b658 100644
--- a/addons/l10n_cr/i18n/es.po
+++ b/addons/l10n_cr/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/es_CR.po b/addons/l10n_cr/i18n/es_CR.po
index c21962416db..f37eccde818 100644
--- a/addons/l10n_cr/i18n/es_CR.po
+++ b/addons/l10n_cr/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_cr
diff --git a/addons/l10n_cr/i18n/es_PY.po b/addons/l10n_cr/i18n/es_PY.po
index 1ced31086f5..21e02f39c30 100644
--- a/addons/l10n_cr/i18n/es_PY.po
+++ b/addons/l10n_cr/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/fr.po b/addons/l10n_cr/i18n/fr.po
index 28233c121f4..c2a2dc4ff4e 100644
--- a/addons/l10n_cr/i18n/fr.po
+++ b/addons/l10n_cr/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/gl.po b/addons/l10n_cr/i18n/gl.po
index c49a3a1aa5d..3d1af9e43a1 100644
--- a/addons/l10n_cr/i18n/gl.po
+++ b/addons/l10n_cr/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/it.po b/addons/l10n_cr/i18n/it.po
index 38ef1138b42..8485618ae1f 100644
--- a/addons/l10n_cr/i18n/it.po
+++ b/addons/l10n_cr/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/pt_BR.po b/addons/l10n_cr/i18n/pt_BR.po
index 9c333c1752a..146fcc92d6d 100644
--- a/addons/l10n_cr/i18n/pt_BR.po
+++ b/addons/l10n_cr/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/i18n/tr.po b/addons/l10n_cr/i18n/tr.po
index 2c623deef1d..a5aae5318c7 100644
--- a/addons/l10n_cr/i18n/tr.po
+++ b/addons/l10n_cr/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_cr
 #: model:res.partner.title,name:l10n_cr.res_partner_title_ing
diff --git a/addons/l10n_cr/l10n_wizard.xml b/addons/l10n_cr/l10n_wizard.xml
index ef37667b318..6919eb199b6 100644
--- a/addons/l10n_cr/l10n_wizard.xml
+++ b/addons/l10n_cr/l10n_wizard.xml
@@ -1,10 +1,8 @@
 <openerp>
     <data>
-
-    <record id="config_call_account_template" model="ir.actions.todo">
-        <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="type">automatic</field>
-    </record>
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
index 232a1abb3ad..e9507595402 100644
--- a/addons/l10n_de/__openerp__.py
+++ b/addons/l10n_de/__openerp__.py
@@ -38,19 +38,19 @@
 # Die Zuordnung der Steuern für Ein- und Ausfuhren aus EU Ländern, sowie auch
 # für den Ein- und Verkauf aus und in Drittländer sollten beim Partner
 # (Lieferant/Kunde)hinterlegt werden (in Anhängigkeit vom Herkunftsland
-# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist "höherwertig" als
+# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist 'höherwertig' als
 # die Zuordnung bei Produkten und überschreibt diese im Einzelfall.
 #
 # Zur Vereinfachung der Steuerausweise und Buchung bei Auslandsgeschäften
 # erlaubt OpenERP ein generelles Mapping von Steuerausweis und Steuerkonten
-# (z.B. Zuordnung "Umsatzsteuer 19%" zu "steuerfreie Einfuhren aus der EU")
+# (z.B. Zuordnung 'Umsatzsteuer 19%' zu 'steuerfreie Einfuhren aus der EU')
 # zwecks Zuordnung dieses Mappings zum ausländischen Partner (Kunde/Lieferant).
 
 # Die Rechnungsbuchung beim Einkauf bewirkt folgendes:
 # Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den
 # jeweiligen Kategorien für den Vorsteuer Steuermessbetrag (z.B. Vorsteuer
 # Steuermessbetrag Voller Steuersatz 19%).
-# Der Steuerbetrag erscheint unter der Kategorie "Vorsteuern" (z.B. Vorsteuer
+# Der Steuerbetrag erscheint unter der Kategorie 'Vorsteuern' (z.B. Vorsteuer
 # 19%). Durch multidimensionale Hierachien können verschiedene Positionen
 # zusammengefasst werden und dann in Form eines Reports ausgegeben werden.
 #
@@ -58,7 +58,7 @@
 # Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den
 # jeweiligen Kategorien für den Umsatzsteuer Steuermessbetrag
 # (z.B. Umsatzsteuer Steuermessbetrag Voller Steuersatz 19%).
-# Der Steuerbetrag erscheint unter der Kategorie "Umsatzsteuer"
+# Der Steuerbetrag erscheint unter der Kategorie 'Umsatzsteuer'
 # (z.B. Umsatzsteuer 19%). Durch multidimensionale Hierachien können
 # verschiedene Positionen zusammengefasst werden.
 # Die zugewiesenen Steuerausweise können auf Ebene der einzelnen
@@ -89,19 +89,19 @@
 # Die Zuordnung der Steuern für Ein- und Ausfuhren aus EU Ländern, sowie auch
 # für den Ein- und Verkauf aus und in Drittländer sollten beim Partner
 # (Lieferant/Kunde) hinterlegt werden (in Anhängigkeit vom Herkunftsland
-# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist "höherwertig" als
+# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist 'höherwertig' als
 # die Zuordnung bei Produkten und überschreibt diese im Einzelfall.
 #
 # Zur Vereinfachung der Steuerausweise und Buchung bei Auslandsgeschäften
 # erlaubt OpenERP ein generelles Mapping von Steuerausweis und Steuerkonten
-# (z.B. Zuordnung "Umsatzsteuer 19%" zu "steuerfreie Einfuhren aus der EU")
+# (z.B. Zuordnung 'Umsatzsteuer 19%' zu 'steuerfreie Einfuhren aus der EU')
 # zwecks Zuordnung dieses Mappings zum ausländischen Partner (Kunde/Lieferant).
 
 # Die Rechnungsbuchung beim Einkauf bewirkt folgendes:
 # Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den
 # jeweiligen Kategorien für den Vorsteuer Steuermessbetrag (z.B. Vorsteuer
 # Steuermessbetrag Voller Steuersatz 19%).
-# Der Steuerbetrag erscheint unter der Kategorie "Vorsteuern" (z.B. Vorsteuer
+# Der Steuerbetrag erscheint unter der Kategorie 'Vorsteuern' (z.B. Vorsteuer
 # 19%). Durch multidimensionale Hierachien können verschiedene Positionen
 # zusammengefasst werden und dann in Form eines Reports ausgegeben werden.
 #
@@ -109,7 +109,7 @@
 # Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den
 # jeweiligen Kategorien für den Umsatzsteuer Steuermessbetrag
 # (z.B. Umsatzsteuer Steuermessbetrag Voller Steuersatz 19%).
-# Der Steuerbetrag erscheint unter der Kategorie "Umsatzsteuer"
+# Der Steuerbetrag erscheint unter der Kategorie 'Umsatzsteuer'
 # (z.B. Umsatzsteuer 19%). Durch multidimensionale Hierachien können
 # verschiedene Positionen zusammengefasst werden.
 # Die zugewiesenen Steuerausweise können auf Ebene der einzelnen
@@ -121,35 +121,33 @@
 
 
 {
-    "name" : "Deutschland - Accounting",
-    "version" : "1.0",
-    "author" : "openbig.org",
-    "website" : "http://www.openbig.org",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name': 'Deutschland - Accounting',
+    'version': '1.0',
+    'author': 'openbig.org',
+    'website': 'http://www.openbig.org',
+    'category': 'Localization/Account Charts',
+    'description': """
 Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03.
 ==============================================================================
 
 German accounting chart and localization.
     """,
-    "depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
-    "init_xml" : [ ],
-    "demo_xml" : [ ],
-    "update_xml" : [
-        "account_tax_skr03.xml",
-        "account_types_skr03.xml",
-        "account_chart_skr03.xml",
-        "account_chart_template_skr03.xml",
-        "account_tax_fiscal_position_skr03.xml",
-        "account_tax_skr04.xml",
-        "account_types_skr04.xml",
-        "account_chart_skr04.xml",
-        "account_chart_template_skr04.xml",
-        "account_tax_fiscal_position_skr04.xml",
-        "l10n_de_wizard.xml",
+    'depends': ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
+    'demo': [ ],
+    'data': [
+        'account_tax_skr03.xml',
+        'account_types_skr03.xml',
+        'account_chart_skr03.xml',
+        'account_chart_template_skr03.xml',
+        'account_tax_fiscal_position_skr03.xml',
+        'account_tax_skr04.xml',
+        'account_types_skr04.xml',
+        'account_chart_skr04.xml',
+        'account_chart_template_skr04.xml',
+        'account_tax_fiscal_position_skr04.xml',
+        'l10n_de_wizard.xml',
     ],
-    "installable": True,
-    "certificate": "00517849017945584893",
+    'installable': True,
     'images': ['images/config_chart_l10n_de.jpeg','images/l10n_de_chart.jpeg'],
 }
 
diff --git a/addons/l10n_de/i18n/ar.po b/addons/l10n_de/i18n/ar.po
index a158ea93cb1..ea7d61435b8 100644
--- a/addons/l10n_de/i18n/ar.po
+++ b/addons/l10n_de/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/bg.po b/addons/l10n_de/i18n/bg.po
index 1687dcd8e2a..035e699910d 100644
--- a/addons/l10n_de/i18n/bg.po
+++ b/addons/l10n_de/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/bs.po b/addons/l10n_de/i18n/bs.po
index 1687dcd8e2a..035e699910d 100644
--- a/addons/l10n_de/i18n/bs.po
+++ b/addons/l10n_de/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/ca.po b/addons/l10n_de/i18n/ca.po
index d4639985b25..f140e91dcc8 100644
--- a/addons/l10n_de/i18n/ca.po
+++ b/addons/l10n_de/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/cs.po b/addons/l10n_de/i18n/cs.po
index 1687dcd8e2a..035e699910d 100644
--- a/addons/l10n_de/i18n/cs.po
+++ b/addons/l10n_de/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/da.po b/addons/l10n_de/i18n/da.po
index 78bc635fe91..89ad7c27953 100644
--- a/addons/l10n_de/i18n/da.po
+++ b/addons/l10n_de/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/de.po b/addons/l10n_de/i18n/de.po
index dd1037444a2..2ce4825e89c 100644
--- a/addons/l10n_de/i18n/de.po
+++ b/addons/l10n_de/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/es.po b/addons/l10n_de/i18n/es.po
index d979176fd4b..a29154a6ac8 100644
--- a/addons/l10n_de/i18n/es.po
+++ b/addons/l10n_de/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/es_CR.po b/addons/l10n_de/i18n/es_CR.po
index a95fedebfef..b655d68c296 100644
--- a/addons/l10n_de/i18n/es_CR.po
+++ b/addons/l10n_de/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: l10n_de
diff --git a/addons/l10n_de/i18n/es_PY.po b/addons/l10n_de/i18n/es_PY.po
index 7989393c6e3..67162110546 100644
--- a/addons/l10n_de/i18n/es_PY.po
+++ b/addons/l10n_de/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/et.po b/addons/l10n_de/i18n/et.po
index 1687dcd8e2a..035e699910d 100644
--- a/addons/l10n_de/i18n/et.po
+++ b/addons/l10n_de/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/fr.po b/addons/l10n_de/i18n/fr.po
index e393d248ffe..3892cebb4c8 100644
--- a/addons/l10n_de/i18n/fr.po
+++ b/addons/l10n_de/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/gl.po b/addons/l10n_de/i18n/gl.po
index 4fccb5061eb..57b625c1ef9 100644
--- a/addons/l10n_de/i18n/gl.po
+++ b/addons/l10n_de/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/hr.po b/addons/l10n_de/i18n/hr.po
index a158ea93cb1..ea7d61435b8 100644
--- a/addons/l10n_de/i18n/hr.po
+++ b/addons/l10n_de/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/hu.po b/addons/l10n_de/i18n/hu.po
index 1687dcd8e2a..035e699910d 100644
--- a/addons/l10n_de/i18n/hu.po
+++ b/addons/l10n_de/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/id.po b/addons/l10n_de/i18n/id.po
index 676a2f78982..3df4757ce06 100644
--- a/addons/l10n_de/i18n/id.po
+++ b/addons/l10n_de/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/it.po b/addons/l10n_de/i18n/it.po
index 4a43583b80b..facbc444adb 100644
--- a/addons/l10n_de/i18n/it.po
+++ b/addons/l10n_de/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-15 15:05+0000\n"
-"PO-Revision-Date: 2011-01-12 16:10+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-10-18 14:14+0000\n"
+"Last-Translator: Stephane Wirtel (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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/ko.po b/addons/l10n_de/i18n/ko.po
index 1687dcd8e2a..035e699910d 100644
--- a/addons/l10n_de/i18n/ko.po
+++ b/addons/l10n_de/i18n/ko.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/lt.po b/addons/l10n_de/i18n/lt.po
index 676a2f78982..3df4757ce06 100644
--- a/addons/l10n_de/i18n/lt.po
+++ b/addons/l10n_de/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/nb.po b/addons/l10n_de/i18n/nb.po
new file mode 100644
index 00000000000..10df654482e
--- /dev/null
+++ b/addons/l10n_de/i18n/nb.po
@@ -0,0 +1,66 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-15 15:05+0000\n"
+"PO-Revision-Date: 2012-09-08 19:47+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr04
+msgid "Kunde Ausland"
+msgstr "Kunde Ausland"
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_sale_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_sale_skr04
+msgid "Kunde EU (ohne USt-ID)"
+msgstr "Kunde EU (ohne USt-ID)"
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_purchase_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_purchase_skr04
+msgid "Lieferant Ausland"
+msgstr ""
+
+#. module: l10n_de
+#: model:ir.module.module,shortdesc:l10n_de.module_meta_information
+msgid "Deutschland - SKR03 and SKR04"
+msgstr ""
+
+#. module: l10n_de
+#: model:ir.module.module,description:l10n_de.module_meta_information
+msgid ""
+"Dieses  Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem "
+"SKR03."
+msgstr ""
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_purchase_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_purchase_skr04
+msgid "Lieferant EU Unternehmen (mit USt-ID)"
+msgstr ""
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_purchase_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_no_id_purchase_skr04
+msgid "Lieferant EU (ohne Ust-ID)"
+msgstr ""
+
+#. module: l10n_de
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_sale_skr03
+#: model:account.fiscal.position.template,name:l10n_de.fiscal_position_eu_vat_id_sale_skr04
+msgid "Kunde EU Unternehmen (mit USt-ID)"
+msgstr ""
diff --git a/addons/l10n_de/i18n/nl.po b/addons/l10n_de/i18n/nl.po
index 9574d341f8d..6a6aa88a167 100644
--- a/addons/l10n_de/i18n/nl.po
+++ b/addons/l10n_de/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/pl.po b/addons/l10n_de/i18n/pl.po
index 1687dcd8e2a..035e699910d 100644
--- a/addons/l10n_de/i18n/pl.po
+++ b/addons/l10n_de/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/pt.po b/addons/l10n_de/i18n/pt.po
index a158ea93cb1..ea7d61435b8 100644
--- a/addons/l10n_de/i18n/pt.po
+++ b/addons/l10n_de/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/pt_BR.po b/addons/l10n_de/i18n/pt_BR.po
index bf2a9c54aa0..2d2aa300f65 100644
--- a/addons/l10n_de/i18n/pt_BR.po
+++ b/addons/l10n_de/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/ro.po b/addons/l10n_de/i18n/ro.po
index 1687dcd8e2a..035e699910d 100644
--- a/addons/l10n_de/i18n/ro.po
+++ b/addons/l10n_de/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/ru.po b/addons/l10n_de/i18n/ru.po
index 1687dcd8e2a..035e699910d 100644
--- a/addons/l10n_de/i18n/ru.po
+++ b/addons/l10n_de/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/sl.po b/addons/l10n_de/i18n/sl.po
index a158ea93cb1..ea7d61435b8 100644
--- a/addons/l10n_de/i18n/sl.po
+++ b/addons/l10n_de/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/sr@latin.po b/addons/l10n_de/i18n/sr@latin.po
index 847d1982a6e..0559830466f 100644
--- a/addons/l10n_de/i18n/sr@latin.po
+++ b/addons/l10n_de/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/sv.po b/addons/l10n_de/i18n/sv.po
index 676a2f78982..3df4757ce06 100644
--- a/addons/l10n_de/i18n/sv.po
+++ b/addons/l10n_de/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/tr.po b/addons/l10n_de/i18n/tr.po
index a158ea93cb1..ea7d61435b8 100644
--- a/addons/l10n_de/i18n/tr.po
+++ b/addons/l10n_de/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/vi.po b/addons/l10n_de/i18n/vi.po
index fed70a284b2..f380653a407 100644
--- a/addons/l10n_de/i18n/vi.po
+++ b/addons/l10n_de/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/zh_CN.po b/addons/l10n_de/i18n/zh_CN.po
index a158ea93cb1..ea7d61435b8 100644
--- a/addons/l10n_de/i18n/zh_CN.po
+++ b/addons/l10n_de/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/i18n/zh_TW.po b/addons/l10n_de/i18n/zh_TW.po
index a158ea93cb1..ea7d61435b8 100644
--- a/addons/l10n_de/i18n/zh_TW.po
+++ b/addons/l10n_de/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_de
 #: model:account.fiscal.position.template,name:l10n_de.fiscal_position_non_eu_sale_skr03
diff --git a/addons/l10n_de/l10n_de_wizard.xml b/addons/l10n_de/l10n_de_wizard.xml
index 3a0dcd34bd3..19d27fb47c7 100644
--- a/addons/l10n_de/l10n_de_wizard.xml
+++ b/addons/l10n_de/l10n_de_wizard.xml
@@ -1,12 +1,9 @@
 <openerp>
-    <data>
+    <data noupdate="1">
 
-        <record id="config_call_account_template_de" model="ir.actions.todo">
-            <field name="name">Generiert Kontenplan aus Vorlage</field>
-            <field name="note">Der Assistent generiert einen Kontenplan auf Basis eines Templates (Vorlage). Sie werden aufgefordert den Namen der Firma einzugeben, sowie die entsprechende Kontenvorlage zu wählen. Ausserdem können Sie für die Initialisierung der Journale die gewünschte Stellenanzahl der Konten, sowie die Hauptwährung Ihres Betriebes auswählen. Dieser Assistent ist identisch mit dem Open ERP Menü Finanzen/Konfiguration/Finanzkonten/Erzeuge Konten aus Vorlage.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
-         </record>
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index 9dd81606036..3414f969dcd 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -27,24 +27,21 @@ This is the base module to manage the accounting chart for Ecuador in OpenERP.
 
 Accounting chart and localization for Ecuador.
     """,
-    'author': 'OpenERP SA',
+    'author': 'Gnuthink Co.Ltd.',
     'depends': [
-                'account',
-                'base_vat',
-                'base_iban',
-                'account_chart',
-                'account_coda',
-                ],
-    'init_xml': [],
-    'update_xml': [
-                'account_tax_code.xml',
-                'account_chart.xml',
-                'account_tax.xml',
-                'l10n_chart_ec_wizard.xml',
-                   ],
-    'demo_xml': [],
+        'account',
+        'base_vat',
+        'base_iban',
+        'account_chart',
+    ],
+    'data': [
+        'account_tax_code.xml',
+        'account_chart.xml',
+        'account_tax.xml',
+        'l10n_chart_ec_wizard.xml',
+    ],
+    'demo': [],
     'installable': True,
-    'certificate' : '001226484516187330589',
     'images': ['images/config_chart_l10n_ec.jpeg','images/l10n_ec_chart.jpeg'],
 }
 
diff --git a/addons/l10n_ec/i18n/ar.po b/addons/l10n_ec/i18n/ar.po
index 200792ae861..2e64965a8a3 100644
--- a/addons/l10n_ec/i18n/ar.po
+++ b/addons/l10n_ec/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/ca.po b/addons/l10n_ec/i18n/ca.po
index 7116127ec51..e1e176f585b 100644
--- a/addons/l10n_ec/i18n/ca.po
+++ b/addons/l10n_ec/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/da.po b/addons/l10n_ec/i18n/da.po
index 2bf3aeeee90..6a757e2b29e 100644
--- a/addons/l10n_ec/i18n/da.po
+++ b/addons/l10n_ec/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/es.po b/addons/l10n_ec/i18n/es.po
index 0816a3f2c5c..df6a82bbd1b 100644
--- a/addons/l10n_ec/i18n/es.po
+++ b/addons/l10n_ec/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/es_CR.po b/addons/l10n_ec/i18n/es_CR.po
index 223ed99790a..98ff8fceb7f 100644
--- a/addons/l10n_ec/i18n/es_CR.po
+++ b/addons/l10n_ec/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_ec
diff --git a/addons/l10n_ec/i18n/es_EC.po b/addons/l10n_ec/i18n/es_EC.po
index 8df05cef8ae..f310852d8a0 100644
--- a/addons/l10n_ec/i18n/es_EC.po
+++ b/addons/l10n_ec/i18n/es_EC.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-12-23 09:56+0000\n"
-"PO-Revision-Date: 2011-04-11 18:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-10-17 04:39+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
 msgid "Gasto"
-msgstr ""
+msgstr "Gasto"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_stock
 msgid "Inventario"
-msgstr ""
+msgstr "Inventario"
 
 #. module: l10n_ec
 #: model:ir.actions.todo,note:l10n_ec.config_call_account_template_ec
@@ -50,47 +50,47 @@ msgstr ""
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_receivable
 msgid "Por Cobrar"
-msgstr ""
+msgstr "Por Cobrar"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_asset
 msgid "Activo"
-msgstr ""
+msgstr "Activo"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_tax
 msgid "Impuesto"
-msgstr ""
+msgstr "Impuesto"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_liability
 msgid "Pasivo"
-msgstr ""
+msgstr "Pasivo"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_capital
 msgid "Capital"
-msgstr ""
+msgstr "Capital"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_cash
 msgid "Efectivo"
-msgstr ""
+msgstr "Efectivo"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_payable
 msgid "Por Pagar"
-msgstr ""
+msgstr "Por Pagar"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_income
 msgid "Ingreso"
-msgstr ""
+msgstr "Ingreso"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_view
 msgid "View"
-msgstr ""
+msgstr "Vista"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/l10n_ec/i18n/es_PY.po b/addons/l10n_ec/i18n/es_PY.po
index 29cdc482be9..b352d8fb5c9 100644
--- a/addons/l10n_ec/i18n/es_PY.po
+++ b/addons/l10n_ec/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/fr.po b/addons/l10n_ec/i18n/fr.po
index e8933bfee3c..aae0d2b9b14 100644
--- a/addons/l10n_ec/i18n/fr.po
+++ b/addons/l10n_ec/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/gl.po b/addons/l10n_ec/i18n/gl.po
index 3b0cbdb1653..ab26a07f9fe 100644
--- a/addons/l10n_ec/i18n/gl.po
+++ b/addons/l10n_ec/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/it.po b/addons/l10n_ec/i18n/it.po
index e201ff59f0f..d61230d8ad4 100644
--- a/addons/l10n_ec/i18n/it.po
+++ b/addons/l10n_ec/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/pt.po b/addons/l10n_ec/i18n/pt.po
index ab15ee715e9..cbe80457830 100644
--- a/addons/l10n_ec/i18n/pt.po
+++ b/addons/l10n_ec/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/pt_BR.po b/addons/l10n_ec/i18n/pt_BR.po
index 38590c9449e..7ba368f1c12 100644
--- a/addons/l10n_ec/i18n/pt_BR.po
+++ b/addons/l10n_ec/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/i18n/tr.po b/addons/l10n_ec/i18n/tr.po
index e772a3f06fe..6d8ccf94333 100644
--- a/addons/l10n_ec/i18n/tr.po
+++ b/addons/l10n_ec/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ec
 #: model:account.account.type,name:l10n_ec.account_type_expense
diff --git a/addons/l10n_ec/l10n_chart_ec_wizard.xml b/addons/l10n_ec/l10n_chart_ec_wizard.xml
index 9906cf9828c..52aaa88fdab 100644
--- a/addons/l10n_ec/l10n_chart_ec_wizard.xml
+++ b/addons/l10n_ec/l10n_chart_ec_wizard.xml
@@ -1,13 +1,8 @@
 <openerp>
-    <data>
-
-        <record id="config_call_account_template_ec" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-           <field name="type">automatic</field>
-       </record>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index b2897e07748..2264988fd99 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -22,12 +22,12 @@
 ##############################################################################
 
 {
-    "name" : "Spanish - Accounting (PGCE 2008)",
-    "version" : "3.0",
-    "author" : "Spanish Localization Team",
-    'website' : 'https://launchpad.net/openerp-spain',
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name': 'Spanish - Accounting (PGCE 2008)',
+    'version': '3.0',
+    'author': 'Spanish Localization Team',
+    'website': 'https://launchpad.net/openerp-spain',
+    'category': 'Localization/Account Charts',
+    'description': """
 Spanish Charts of Accounts (PGCE 2008).
 =======================================
 
@@ -37,26 +37,23 @@ Spanish Charts of Accounts (PGCE 2008).
     * Defines templates for sale and purchase VAT
     * Defines tax code templates
 
-Note: You should install the l10n_ES_account_balance_report module for yearly
+**Note:** You should install the l10n_ES_account_balance_report module for yearly
       account reporting (balance, profit & losses).
 """,
-    "license" : "GPL-3",
-    "depends" : ["account", "base_vat", "base_iban"],
-    "init_xml" : [
-        "account_chart.xml",
-        "taxes_data.xml",
-        "fiscal_templates.xml",
-        "account_chart_pymes.xml",
-        "taxes_data_pymes.xml",
-        "fiscal_templates_pymes.xml",
-        "l10n_es_wizard.xml"
+    'license': 'GPL-3',
+    'depends': ['account', 'base_vat', 'base_iban'],
+    'data': [
+        'account_chart.xml',
+        'taxes_data.xml',
+        'fiscal_templates.xml',
+        'account_chart_pymes.xml',
+        'taxes_data_pymes.xml',
+        'fiscal_templates_pymes.xml',
+        'l10n_es_wizard.xml'
     ],
-    "demo_xml" : [],
-    "update_xml" : [
-    ],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00408828172062583229",
+    'demo': [],
+    'auto_install': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_es.jpeg','images/l10n_es_chart.jpeg'],
 }
 
diff --git a/addons/l10n_es/account_chart.xml b/addons/l10n_es/account_chart.xml
index 5147024deae..8ffabd17fe7 100644
--- a/addons/l10n_es/account_chart.xml
+++ b/addons/l10n_es/account_chart.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
 
     <!-- Tipos de cuenta para PGCE y PGCE PYMES -->
 
diff --git a/addons/l10n_es/account_chart_pymes.xml b/addons/l10n_es/account_chart_pymes.xml
index 76cd713fe94..ed2e4f18e7c 100644
--- a/addons/l10n_es/account_chart_pymes.xml
+++ b/addons/l10n_es/account_chart_pymes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
   
       <!-- 
       Plantilla del árbol de cuentas del Plan General Contable PYMES 2008.
diff --git a/addons/l10n_es/fiscal_templates.xml b/addons/l10n_es/fiscal_templates.xml
index 5f126d448cf..5c6d056d2f6 100644
--- a/addons/l10n_es/fiscal_templates.xml
+++ b/addons/l10n_es/fiscal_templates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
 
     <!-- Definición de posiciones fiscales Régimen Nacional, Recargo de Equivalencia,
          Extracomunitario, Intracomunitario y Retención de IRPF 18%, 15%, 7%, 1%
diff --git a/addons/l10n_es/fiscal_templates_pymes.xml b/addons/l10n_es/fiscal_templates_pymes.xml
index f44bfc949c6..05871fad842 100644
--- a/addons/l10n_es/fiscal_templates_pymes.xml
+++ b/addons/l10n_es/fiscal_templates_pymes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
 
       <!--
       Definición de posiciones fiscales Régimen Nacional, Recargo de Equivalencia,
diff --git a/addons/l10n_es/i18n/ar.po b/addons/l10n_es/i18n/ar.po
index 6dc97157320..f8ca509fa1a 100644
--- a/addons/l10n_es/i18n/ar.po
+++ b/addons/l10n_es/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/ca.po b/addons/l10n_es/i18n/ca.po
index 3599d4a8869..7b08f77c84b 100644
--- a/addons/l10n_es/i18n/ca.po
+++ b/addons/l10n_es/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/da.po b/addons/l10n_es/i18n/da.po
index f3883747a73..c1a18a4448f 100644
--- a/addons/l10n_es/i18n/da.po
+++ b/addons/l10n_es/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/de.po b/addons/l10n_es/i18n/de.po
index 86ee81eb0f3..3f1df16afa0 100644
--- a/addons/l10n_es/i18n/de.po
+++ b/addons/l10n_es/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/es.po b/addons/l10n_es/i18n/es.po
index afab7ea37e0..46325e1215c 100644
--- a/addons/l10n_es/i18n/es.po
+++ b/addons/l10n_es/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/es_CR.po b/addons/l10n_es/i18n/es_CR.po
index 1d0ecbd6edd..e87f84a2009 100644
--- a/addons/l10n_es/i18n/es_CR.po
+++ b/addons/l10n_es/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: l10n_es
diff --git a/addons/l10n_es/i18n/es_PY.po b/addons/l10n_es/i18n/es_PY.po
index 8abd450b323..e1d93ef4a76 100644
--- a/addons/l10n_es/i18n/es_PY.po
+++ b/addons/l10n_es/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/fr.po b/addons/l10n_es/i18n/fr.po
index c17ae6c88d6..4abf78c822a 100644
--- a/addons/l10n_es/i18n/fr.po
+++ b/addons/l10n_es/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/gl.po b/addons/l10n_es/i18n/gl.po
index 9cd1d288adb..a46b44263c1 100644
--- a/addons/l10n_es/i18n/gl.po
+++ b/addons/l10n_es/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/hu.po b/addons/l10n_es/i18n/hu.po
index a65bd23cc4e..999e6722e5b 100644
--- a/addons/l10n_es/i18n/hu.po
+++ b/addons/l10n_es/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/it.po b/addons/l10n_es/i18n/it.po
index e7890980a60..29220a271a6 100644
--- a/addons/l10n_es/i18n/it.po
+++ b/addons/l10n_es/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/oc.po b/addons/l10n_es/i18n/oc.po
index 714557d5ea3..dd8a2dbe6b5 100644
--- a/addons/l10n_es/i18n/oc.po
+++ b/addons/l10n_es/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/pt.po b/addons/l10n_es/i18n/pt.po
index d2181ab3e12..67dfb24c43f 100644
--- a/addons/l10n_es/i18n/pt.po
+++ b/addons/l10n_es/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/pt_BR.po b/addons/l10n_es/i18n/pt_BR.po
index 77a44bbbdc8..83c16cb8555 100644
--- a/addons/l10n_es/i18n/pt_BR.po
+++ b/addons/l10n_es/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/sr@latin.po b/addons/l10n_es/i18n/sr@latin.po
index 039256bb182..bf8fc501fec 100644
--- a/addons/l10n_es/i18n/sr@latin.po
+++ b/addons/l10n_es/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/i18n/tr.po b/addons/l10n_es/i18n/tr.po
index aa4c9c41548..1cd5c88c0a4 100644
--- a/addons/l10n_es/i18n/tr.po
+++ b/addons/l10n_es/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_es
 #: model:account.account.type,name:l10n_es.inmo
diff --git a/addons/l10n_es/l10n_es_wizard.xml b/addons/l10n_es/l10n_es_wizard.xml
index cd6d89726b6..52aaa88fdab 100644
--- a/addons/l10n_es/l10n_es_wizard.xml
+++ b/addons/l10n_es/l10n_es_wizard.xml
@@ -1,9 +1,7 @@
 <openerp>
-    <data>
-
-        <record id="config_call_account_template" model="ir.actions.todo">
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
 
     </data>
diff --git a/addons/l10n_es/taxes_data.xml b/addons/l10n_es/taxes_data.xml
index 8935f1d1ad8..41b52ee077d 100644
--- a/addons/l10n_es/taxes_data.xml
+++ b/addons/l10n_es/taxes_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
         
      <!--
      Definición de IVA y retenciones, códigos de impuestos y cuentas contables adicionales
diff --git a/addons/l10n_es/taxes_data_pymes.xml b/addons/l10n_es/taxes_data_pymes.xml
index e62fcac0db6..7467dbb9596 100644
--- a/addons/l10n_es/taxes_data_pymes.xml
+++ b/addons/l10n_es/taxes_data_pymes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="0">
+    <data noupdate="1">
 
       <!--
       Plantillas de impuestos para el Plan General Contable PYMES 2008.
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index ec31f71513a..e1d4b9ac334 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -26,53 +26,50 @@
 #
 ##############################################################################
 {
-    "name" : "France - Accounting",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "website": "http://www.openerp.com",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name': 'France - Accounting',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'category': 'Localization/Account Charts',
+    'description': """
 This is the module to manage the accounting chart for France in OpenERP.
 ========================================================================
 
 This module applies to companies based in France mainland. It doesn't apply to
 companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, Mayotte).
 
-This localisation module creates the VAT taxes of type "tax included" for purchases
-(it is notably required when you use the module "hr_expense"). Beware that these
-"tax included" VAT taxes are not managed by the fiscal positions provided by this
-module (because it is complex to manage both "tax excluded" and "tax included"
+This localisation module creates the VAT taxes of type 'tax included' for purchases
+(it is notably required when you use the module 'hr_expense'). Beware that these
+'tax included' VAT taxes are not managed by the fiscal positions provided by this
+module (because it is complex to manage both 'tax excluded' and 'tax included'
 scenarios in fiscal positions).
 
 This localisation module doesn't properly handle the scenario when a France-mainland
 company sells services to a company based in the DOMs. We could manage it in the
-fiscal positions, but it would require to differentiate between "product" VAT taxes
-and "service" VAT taxes. We consider that it is too "heavy" to have this by default
+fiscal positions, but it would require to differentiate between 'product' VAT taxes
+and 'service' VAT taxes. We consider that it is too 'heavy' to have this by default
 in l10n_fr; companies that sell services to DOM-based companies should update the
 configuration of their taxes and fiscal positions manually.
 
-Credits: Sistheo, Zeekom, CrysaLEAD, Akretion and Camptocamp.
+**Credits:** Sistheo, Zeekom, CrysaLEAD, Akretion and Camptocamp.
 """,
-    "depends" : ['base_iban', 'account', 'account_chart', 'base_vat', 'l10n_fr_rib'],
-    "init_xml" : [],
-    "update_xml" : [
-        "fr_report.xml",
-        "plan_comptable_general.xml",
-        "l10n_fr_view.xml",
-        "l10n_fr_wizard.xml",
-        "fr_pcg_taxes.xml",
-        "fr_tax.xml",
-        "fr_fiscal_templates.xml",
-        "security/ir.model.access.csv",
-        "wizard/fr_report_bilan_view.xml",
-        "wizard/fr_report_compute_resultant_view.xml",
-
+    'depends': ['base_iban', 'account', 'account_chart', 'base_vat', 'l10n_fr_rib'],
+    'data': [
+        'fr_report.xml',
+        'plan_comptable_general.xml',
+        'l10n_fr_view.xml',
+        'l10n_fr_wizard.xml',
+        'fr_pcg_taxes.xml',
+        'fr_tax.xml',
+        'fr_fiscal_templates.xml',
+        'security/ir.model.access.csv',
+        'wizard/fr_report_bilan_view.xml',
+        'wizard/fr_report_compute_resultant_view.xml',
     ],
-    "test": ['test/l10n_fr_report.yml'],
-    "demo_xml" : [],
-    "certificate" : "00435321693876313629",
-    "auto_install": False,
-    "installable": True,
+    'test': ['test/l10n_fr_report.yml'],
+    'demo': [],
+    'auto_install': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_fr.jpeg','images/l10n_fr_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr/fr_pcg_taxes.xml b/addons/l10n_fr/fr_pcg_taxes.xml
index b44d04439f0..78b34f2d696 100644
--- a/addons/l10n_fr/fr_pcg_taxes.xml
+++ b/addons/l10n_fr/fr_pcg_taxes.xml
@@ -441,7 +441,6 @@
             <field name="property_account_payable" ref="fr_pcg_pay"/>
             <field name="property_account_expense_categ" ref="pcg_6071"/>
             <field name="property_account_income_categ" ref="pcg_7071"/>
-            <field name="property_reserve_and_surplus_account" ref="pcg_120"/>
         </record>
 
   </data>
diff --git a/addons/l10n_fr/fr_tax.xml b/addons/l10n_fr/fr_tax.xml
index fc5d4608f45..36c5feb47b6 100644
--- a/addons/l10n_fr/fr_tax.xml
+++ b/addons/l10n_fr/fr_tax.xml
@@ -131,8 +131,8 @@
       <field name="tax_code_id" ref="tax_acq_196"/>
       <field name="tax_sign" eval="-1"/>
 
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
+      <field name="account_collected_id" ref="pcg_445662"/>
+      <field name="account_paid_id" ref="pcg_445662"/>
 
       <field name="ref_base_code_id" ref="tax_acq_196_ht"/>
       <field name="ref_base_sign" eval="1"/>
diff --git a/addons/l10n_fr/i18n/ar.po b/addons/l10n_fr/i18n/ar.po
index ee7bbb15953..143448c2083 100644
--- a/addons/l10n_fr/i18n/ar.po
+++ b/addons/l10n_fr/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/bg.po b/addons/l10n_fr/i18n/bg.po
index be40039f9e8..9b0deec542f 100644
--- a/addons/l10n_fr/i18n/bg.po
+++ b/addons/l10n_fr/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/bs.po b/addons/l10n_fr/i18n/bs.po
index 24f575ea1f6..e046a073be4 100644
--- a/addons/l10n_fr/i18n/bs.po
+++ b/addons/l10n_fr/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/ca.po b/addons/l10n_fr/i18n/ca.po
index 70ccbb2b7fc..5807e426dc0 100644
--- a/addons/l10n_fr/i18n/ca.po
+++ b/addons/l10n_fr/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/cs.po b/addons/l10n_fr/i18n/cs.po
index 24f575ea1f6..e046a073be4 100644
--- a/addons/l10n_fr/i18n/cs.po
+++ b/addons/l10n_fr/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/da.po b/addons/l10n_fr/i18n/da.po
index f57cd228607..3984867c31e 100644
--- a/addons/l10n_fr/i18n/da.po
+++ b/addons/l10n_fr/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/de.po b/addons/l10n_fr/i18n/de.po
index 5bcd70f3cb6..8f079e3c385 100644
--- a/addons/l10n_fr/i18n/de.po
+++ b/addons/l10n_fr/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/es.po b/addons/l10n_fr/i18n/es.po
index 8d4987f43ba..96f93cf97ee 100644
--- a/addons/l10n_fr/i18n/es.po
+++ b/addons/l10n_fr/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/es_AR.po b/addons/l10n_fr/i18n/es_AR.po
index 0d4ad78fa2b..9887e119541 100644
--- a/addons/l10n_fr/i18n/es_AR.po
+++ b/addons/l10n_fr/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/es_CR.po b/addons/l10n_fr/i18n/es_CR.po
index 458f57992fe..37f1e2b96c3 100644
--- a/addons/l10n_fr/i18n/es_CR.po
+++ b/addons/l10n_fr/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/es_PY.po b/addons/l10n_fr/i18n/es_PY.po
index d19f5561f34..fb73570d8a9 100644
--- a/addons/l10n_fr/i18n/es_PY.po
+++ b/addons/l10n_fr/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/et.po b/addons/l10n_fr/i18n/et.po
index 2a8db1dc1e1..af427bf6de2 100644
--- a/addons/l10n_fr/i18n/et.po
+++ b/addons/l10n_fr/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/fr.po b/addons/l10n_fr/i18n/fr.po
index 7ac0392a158..4b6c8aa600d 100644
--- a/addons/l10n_fr/i18n/fr.po
+++ b/addons/l10n_fr/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/gl.po b/addons/l10n_fr/i18n/gl.po
index 58eaacbc259..7ef02b2a8b3 100644
--- a/addons/l10n_fr/i18n/gl.po
+++ b/addons/l10n_fr/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/hr.po b/addons/l10n_fr/i18n/hr.po
index 24f575ea1f6..e046a073be4 100644
--- a/addons/l10n_fr/i18n/hr.po
+++ b/addons/l10n_fr/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/hu.po b/addons/l10n_fr/i18n/hu.po
index 24f575ea1f6..e046a073be4 100644
--- a/addons/l10n_fr/i18n/hu.po
+++ b/addons/l10n_fr/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/id.po b/addons/l10n_fr/i18n/id.po
index 31168616ce1..ffe8ed1625a 100644
--- a/addons/l10n_fr/i18n/id.po
+++ b/addons/l10n_fr/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/it.po b/addons/l10n_fr/i18n/it.po
index 85cb7f75ce8..cb4fbb9e819 100644
--- a/addons/l10n_fr/i18n/it.po
+++ b/addons/l10n_fr/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/ko.po b/addons/l10n_fr/i18n/ko.po
index 148ac38ea36..7ee83106b1d 100644
--- a/addons/l10n_fr/i18n/ko.po
+++ b/addons/l10n_fr/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/lt.po b/addons/l10n_fr/i18n/lt.po
index 3575a6f1e26..c6b2b3a02dc 100644
--- a/addons/l10n_fr/i18n/lt.po
+++ b/addons/l10n_fr/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/nl.po b/addons/l10n_fr/i18n/nl.po
index 66dd4f79950..1aea769e377 100644
--- a/addons/l10n_fr/i18n/nl.po
+++ b/addons/l10n_fr/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/nl_BE.po b/addons/l10n_fr/i18n/nl_BE.po
index ba46de88df3..6d650d51905 100644
--- a/addons/l10n_fr/i18n/nl_BE.po
+++ b/addons/l10n_fr/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/oc.po b/addons/l10n_fr/i18n/oc.po
index 063052ad42e..76a0c8056f0 100644
--- a/addons/l10n_fr/i18n/oc.po
+++ b/addons/l10n_fr/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/pl.po b/addons/l10n_fr/i18n/pl.po
index 057fc5c227c..988e5ca11cb 100644
--- a/addons/l10n_fr/i18n/pl.po
+++ b/addons/l10n_fr/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/pt.po b/addons/l10n_fr/i18n/pt.po
index efeec847f6d..3b2792dd88d 100644
--- a/addons/l10n_fr/i18n/pt.po
+++ b/addons/l10n_fr/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/pt_BR.po b/addons/l10n_fr/i18n/pt_BR.po
index f2825c2499b..41f272b7675 100644
--- a/addons/l10n_fr/i18n/pt_BR.po
+++ b/addons/l10n_fr/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/ro.po b/addons/l10n_fr/i18n/ro.po
index 24f575ea1f6..e046a073be4 100644
--- a/addons/l10n_fr/i18n/ro.po
+++ b/addons/l10n_fr/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/ru.po b/addons/l10n_fr/i18n/ru.po
index 01d6c8491dc..00d5014d529 100644
--- a/addons/l10n_fr/i18n/ru.po
+++ b/addons/l10n_fr/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/sl.po b/addons/l10n_fr/i18n/sl.po
index 66f4fd56740..72042945281 100644
--- a/addons/l10n_fr/i18n/sl.po
+++ b/addons/l10n_fr/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/sq.po b/addons/l10n_fr/i18n/sq.po
index e82c8d58f71..720420a3191 100644
--- a/addons/l10n_fr/i18n/sq.po
+++ b/addons/l10n_fr/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/sr@latin.po b/addons/l10n_fr/i18n/sr@latin.po
index da9ca30146e..5cd95a57e6a 100644
--- a/addons/l10n_fr/i18n/sr@latin.po
+++ b/addons/l10n_fr/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/sv.po b/addons/l10n_fr/i18n/sv.po
index 20818f27438..11f07763685 100644
--- a/addons/l10n_fr/i18n/sv.po
+++ b/addons/l10n_fr/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/tlh.po b/addons/l10n_fr/i18n/tlh.po
index 19f5817f2a6..15c8a59c852 100644
--- a/addons/l10n_fr/i18n/tlh.po
+++ b/addons/l10n_fr/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/tr.po b/addons/l10n_fr/i18n/tr.po
index c1228c5aa16..d52c629e7b2 100644
--- a/addons/l10n_fr/i18n/tr.po
+++ b/addons/l10n_fr/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/uk.po b/addons/l10n_fr/i18n/uk.po
index 41575e35b51..7e217f5fbda 100644
--- a/addons/l10n_fr/i18n/uk.po
+++ b/addons/l10n_fr/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/vi.po b/addons/l10n_fr/i18n/vi.po
index 850656d3875..1e13563a7f3 100644
--- a/addons/l10n_fr/i18n/vi.po
+++ b/addons/l10n_fr/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/zh_CN.po b/addons/l10n_fr/i18n/zh_CN.po
index b3ed3e6924a..012723bf2f2 100644
--- a/addons/l10n_fr/i18n/zh_CN.po
+++ b/addons/l10n_fr/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/i18n/zh_TW.po b/addons/l10n_fr/i18n/zh_TW.po
index e997afc77e1..c69a5a26cf3 100644
--- a/addons/l10n_fr/i18n/zh_TW.po
+++ b/addons/l10n_fr/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_receivable
diff --git a/addons/l10n_fr/l10n_fr.py b/addons/l10n_fr/l10n_fr.py
index 5efb4244306..e1240ddd83a 100644
--- a/addons/l10n_fr/l10n_fr.py
+++ b/addons/l10n_fr/l10n_fr.py
@@ -29,7 +29,6 @@ class l10n_fr_report(osv.osv):
         'name': fields.char('Name', size=128),
         'line_ids': fields.one2many('l10n.fr.line', 'report_id', 'Lines'),
     }
-
     _sql_constraints = [
         ('code_uniq', 'unique (code)','The code report must be unique !')
     ]
@@ -61,7 +60,4 @@ class res_company(osv.osv):
 
 res_company()
 
-
-
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml
index 897da1d5414..704ac4daf38 100644
--- a/addons/l10n_fr/l10n_fr_wizard.xml
+++ b/addons/l10n_fr/l10n_fr_wizard.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-    <!-- This ir.actions.todo triggers the screen "Generate your chart of account
-     from a chart template" in the install wizard of the l10n_fr module -->
-    <record id="config_call_account_template_fr" model="ir.actions.todo">
-        <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="type">automatic</field>
-    </record>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_fr/plan_comptable_general.xml b/addons/l10n_fr/plan_comptable_general.xml
index 525dabfcc8a..268f4bd6336 100644
--- a/addons/l10n_fr/plan_comptable_general.xml
+++ b/addons/l10n_fr/plan_comptable_general.xml
@@ -3903,7 +3903,7 @@
       <field name="name">Associés - Comptes courants</field>
       <field name="code">455</field>
       <field name="type">view</field>
-      <field name="user_type" ref="account.data_account_type_view"/>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="note">Pour frais avancés personnellement</field>
       <field name="parent_id" ref="pcg_45"/>
       <field name="reconcile" eval="True"/>
@@ -3912,8 +3912,8 @@
     <record id="pcg_4551" model="account.account.template">
       <field name="name">Principal</field>
       <field name="code">4551</field>
-      <field name="type">receivable</field>
-      <field name="user_type" ref="account.data_account_type_receivable"/>
+      <field name="type">payable</field>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_455"/>
       <field name="reconcile" eval="True"/>
     </record>
@@ -3921,8 +3921,8 @@
     <record id="pcg_4558" model="account.account.template">
       <field name="name">Intérêts courus</field>
       <field name="code">4558</field>
-      <field name="type">receivable</field>
-      <field name="user_type" ref="account.data_account_type_receivable"/>
+      <field name="type">payable</field>
+      <field name="user_type" ref="account.data_account_type_payable"/>
       <field name="parent_id" ref="pcg_455"/>
       <field name="reconcile" eval="True"/>
     </record>
diff --git a/addons/l10n_fr/report/base_report.py b/addons/l10n_fr/report/base_report.py
index 2c44b062f45..c93d5308901 100644
--- a/addons/l10n_fr/report/base_report.py
+++ b/addons/l10n_fr/report/base_report.py
@@ -117,4 +117,4 @@ class base_report(report_sxw.rml_parse):
                         break
         self._set_variable(code, sum)
 
-# 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/l10n_fr/wizard/fr_report_bilan.py b/addons/l10n_fr/wizard/fr_report_bilan.py
index cec2e513a6a..adeab4f0ab4 100644
--- a/addons/l10n_fr/wizard/fr_report_bilan.py
+++ b/addons/l10n_fr/wizard/fr_report_bilan.py
@@ -49,9 +49,9 @@ class account_bilan_report(osv.osv_memory):
         data = {}
         data['form'] = {}
         data['ids'] = active_ids
-        data['form']['fiscalyear'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
+        data['form']['fiscalyear_id'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
         return {'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.bilan', 'datas': data}
 
 account_bilan_report()
 
-# 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/l10n_fr/wizard/fr_report_compute_resultant.py b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
index d90466ea6c4..f3833b372c4 100644
--- a/addons/l10n_fr/wizard/fr_report_compute_resultant.py
+++ b/addons/l10n_fr/wizard/fr_report_compute_resultant.py
@@ -49,9 +49,9 @@ class account_cdr_report(osv.osv_memory):
         data = {}
         data['form'] = {}
         data['ids'] = active_ids
-        data['form']['fiscalyear'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
+        data['form']['fiscalyear_id'] = self.browse(cr, uid, ids)[0].fiscalyear_id.id
         return { 'type': 'ir.actions.report.xml', 'report_name': 'l10n.fr.compute_resultant', 'datas': data}
 
 account_cdr_report()
 
-# 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/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py
index c3b2c332a46..62d364a5277 100755
--- a/addons/l10n_fr_hr_payroll/__openerp__.py
+++ b/addons/l10n_fr_hr_payroll/__openerp__.py
@@ -33,6 +33,7 @@ French Payroll Rules.
     - New payslip report
 
 TODO :
+------
     - Integration with holidays module for deduction and allowance
     - Integration with hr_payroll_account for the automatic account_move_line
       creation from the payslip
@@ -44,9 +45,9 @@ TODO :
     """,
 
     'active': False,
-    'update_xml':[
-     'l10n_fr_hr_payroll_view.xml',
-     'l10n_fr_hr_payroll_data.xml',
+    'data': [
+        'l10n_fr_hr_payroll_view.xml',
+        'l10n_fr_hr_payroll_data.xml',
     ],
     'installable': True
 }
diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
index 5221b00c462..76c6eb9dedf 100644
--- a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
+++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
@@ -290,9 +290,7 @@
             <tr>
               <td>
                 <para style="terp_default_Bold_8">[[o.employee_id.name or '_']]</para>
-                <para style="terp_default_Bold_8">[[o.employee_id.address_home_id.street or '_' ]]</para>
-                <para style="terp_default_Bold_8">[[o.employee_id.address_home_id.street2 or '' ]]</para>
-                <para style="terp_default_Bold_8">[[o.employee_id.address_home_id.zip or '_' ]] [[o.employee_id.address_home_id.city or '' ]]</para>
+                <para style="terp_default_Bold_8">[[display_address(o.employee_id.address_home_id) or '_' ]]</para>
               </td>
             </tr>
           </blockTable>
diff --git a/addons/l10n_fr_rib/__openerp__.py b/addons/l10n_fr_rib/__openerp__.py
index fedac46381d..386f4be71e8 100644
--- a/addons/l10n_fr_rib/__openerp__.py
+++ b/addons/l10n_fr_rib/__openerp__.py
@@ -22,20 +22,23 @@
 {
     'name': 'French RIB Bank Details',
     'version': '1.0',
-    "category": 'Hidden/Dependency',
-    'description': '''
+    'category': 'Hidden/Dependency',
+    'description': """
 This module lets users enter the banking details of Partners in the RIB format (French standard for bank accounts details).
 ===========================================================================================================================
 
-RIB Bank Accounts can be entered in the "Accounting" tab of the Partner form by specifying
-the account type "RIB". The four standard RIB fields will then become mandatory:
+RIB Bank Accounts can be entered in the "Accounting" tab of the Partner form by specifying the account type "RIB". 
+
+The four standard RIB fields will then become mandatory:
+--------------------------------------------------------    
     - Bank Code
     - Office Code
     - Account number
     - RIB key
+    
 As a safety measure, OpenERP will check the RIB key whenever a RIB is saved, and
 will refuse to record the data if the key is incorrect. Please bear in mind that
-this can only happen when the user presses the "save" button, for example on the
+this can only happen when the user presses the 'save' button, for example on the
 Partner Form. Since each bank account may relate to a Bank, users may enter the
 RIB Bank Code in the Bank form - it will the pre-fill the Bank Code on the RIB
 when they select the Bank. To make this easier, this module will also let users
@@ -44,14 +47,12 @@ find Banks using their RIB code.
 The module base_iban can be a useful addition to this module, because French banks
 are now progressively adopting the international IBAN format instead of the RIB format.
 The RIB and IBAN codes for a single account can be entered by recording two Bank
-Accounts in OpenERP: the first with the type "RIB", the second with the type "IBAN". 
-''',
+Accounts in OpenERP: the first with the type 'RIB', the second with the type 'IBAN'. 
+""",
     'author' : u'Numérigraphe SARL',
     'depends': ['account', 'base_iban'],
-    'init_xml': ['bank_data.xml', ],
-    'update_xml': ['bank_view.xml', ],
+    'data': ['bank_data.xml', 'bank_view.xml'],
     'installable': True,
-    'certificate': '003407950790',
     'auto_install': False,
 }
 
diff --git a/addons/l10n_fr_rib/bank_data.xml b/addons/l10n_fr_rib/bank_data.xml
index 030bccb6ef0..ac085cc1667 100644
--- a/addons/l10n_fr_rib/bank_data.xml
+++ b/addons/l10n_fr_rib/bank_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
         <!--
         RIB bank details
diff --git a/addons/l10n_fr_rib/bank_view.xml b/addons/l10n_fr_rib/bank_view.xml
index a25867ffa6a..414ad51954a 100644
--- a/addons/l10n_fr_rib/bank_view.xml
+++ b/addons/l10n_fr_rib/bank_view.xml
@@ -8,14 +8,6 @@
             <field name="inherit_id" ref="account.view_partner_property_form" />
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//field[@name='bank_ids']/form/field[@name='acc_number']" position="before">
-                        <newline />
-                        <field name="bank_code" />
-                        <field name="office" />
-                        <field name="rib_acc_number" />
-                        <field name="key" />
-                        <newline />
-                    </xpath>
                     <xpath expr="//field[@name='bank_ids']/tree/field[@name='acc_number']" position="after">
                         <field name="rib_acc_number"/>
                     </xpath>
diff --git a/addons/l10n_fr_rib/i18n/ar.po b/addons/l10n_fr_rib/i18n/ar.po
index 14d16624329..a5865cde67f 100644
--- a/addons/l10n_fr_rib/i18n/ar.po
+++ b/addons/l10n_fr_rib/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr_rib
 #: constraint:res.partner.bank:0
diff --git a/addons/l10n_fr_rib/i18n/es.po b/addons/l10n_fr_rib/i18n/es.po
new file mode 100644
index 00000000000..e0accc79fcb
--- /dev/null
+++ b/addons/l10n_fr_rib/i18n/es.po
@@ -0,0 +1,136 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-11-08 16:01+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-09 04:39+0000\n"
+"X-Generator: Launchpad (build 16250)\n"
+
+#. module: l10n_fr_rib
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
+"\n"
+"Por favor defina el código BIC/Swift del banco para una cuenta de tipo IBAN "
+"para realizar pagos válidos"
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type,name:l10n_fr_rib.bank_rib
+msgid "RIB and optional IBAN"
+msgstr "CC e IBAN opcional"
+
+#. module: l10n_fr_rib
+#: field:res.partner.bank,rib_acc_number:0
+msgid "RIB account number"
+msgstr "Número de la cuenta"
+
+#. module: l10n_fr_rib
+#: field:res.partner.bank,bank_code:0
+msgid "Bank Code"
+msgstr "Código de banco"
+
+#. module: l10n_fr_rib
+#: code:addons/l10n_fr_rib/bank.py:54
+#, python-format
+msgid "The RIB key %s does not correspond to the other codes: %s %s %s."
+msgstr "La clave de la CC %s no se corresponde con otros códigos: %s %s %s."
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_office_field
+msgid "office"
+msgstr "oficina"
+
+#. module: l10n_fr_rib
+#: field:res.bank,rib_code:0
+msgid "RIB Bank Code"
+msgstr "Código CC"
+
+#. module: l10n_fr_rib
+#: code:addons/l10n_fr_rib/bank.py:58
+#, python-format
+msgid "The IBAN %s is not valid."
+msgstr "El IBAN %s no es válido."
+
+#. module: l10n_fr_rib
+#: model:ir.model,name:l10n_fr_rib.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Cuentas bancarias"
+
+#. module: l10n_fr_rib
+#: field:res.partner.bank,office:0
+msgid "Office Code"
+msgstr "Código de oficina"
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_bic_field
+msgid "bank_bic"
+msgstr "Número BIC"
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_bank_code_field
+msgid "bank_code"
+msgstr "código bancario"
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_key_field
+msgid "key"
+msgstr "clave"
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_rib_acc_number_field
+msgid "rib_acc_number"
+msgstr "Número CC"
+
+#. module: l10n_fr_rib
+#: help:res.partner.bank,key:0
+msgid ""
+"The key is a number allowing to check the correctness of the other codes."
+msgstr ""
+"La clave es un número que permite comprobar si el resto de códigos son "
+"correctos."
+
+#. module: l10n_fr_rib
+#: field:res.partner.bank,key:0
+msgid "Key"
+msgstr "Clave"
+
+#. module: l10n_fr_rib
+#: code:addons/l10n_fr_rib/bank.py:53
+#: code:addons/l10n_fr_rib/bank.py:58
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type,format_layout:l10n_fr_rib.bank_rib
+msgid "%(bank_name)s: %(bank_code)s %(office)s %(rib_acc_number)s %(key)s"
+msgstr "%(bank_name)s: %(bank_code)s %(office)s %(rib_acc_number)s %(key)s"
+
+#. module: l10n_fr_rib
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr "La CC y/o IBAN no es válida"
+
+#. module: l10n_fr_rib
+#: model:ir.model,name:l10n_fr_rib.model_res_bank
+msgid "Bank"
+msgstr "Banco"
+
+#. module: l10n_fr_rib
+#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_acc_number_field
+msgid "acc_number"
+msgstr "Número cuenta"
diff --git a/addons/l10n_fr_rib/i18n/es_CR.po b/addons/l10n_fr_rib/i18n/es_CR.po
index 02d09fade95..53f2950165a 100644
--- a/addons/l10n_fr_rib/i18n/es_CR.po
+++ b/addons/l10n_fr_rib/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr_rib
 #: constraint:res.partner.bank:0
diff --git a/addons/l10n_fr_rib/i18n/fr.po b/addons/l10n_fr_rib/i18n/fr.po
index a219f926c40..4d21177c254 100644
--- a/addons/l10n_fr_rib/i18n/fr.po
+++ b/addons/l10n_fr_rib/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr_rib
 #: constraint:res.partner.bank:0
diff --git a/addons/l10n_fr_rib/i18n/pt.po b/addons/l10n_fr_rib/i18n/pt.po
index fbe1f64191c..876d3567ead 100644
--- a/addons/l10n_fr_rib/i18n/pt.po
+++ b/addons/l10n_fr_rib/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_fr_rib
 #: constraint:res.partner.bank:0
diff --git a/addons/l10n_gr/__openerp__.py b/addons/l10n_gr/__openerp__.py
index 0ad042b3b28..aac13487189 100644
--- a/addons/l10n_gr/__openerp__.py
+++ b/addons/l10n_gr/__openerp__.py
@@ -20,28 +20,27 @@
 #
 ##############################################################################
 {
-    "name" : "Greece - Accounting",
-    "version" : "0.2",
-    "author" : "P. Christeas, OpenERP SA.",
-    "website": "http://openerp.hellug.gr/",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name': 'Greece - Accounting',
+    'version': '0.2',
+    'author': 'P. Christeas, OpenERP SA.',
+    'website': 'http://openerp.hellug.gr/',
+    'category': 'Localization/Account Charts',
+    'description': """
 This is the base module to manage the accounting chart for Greece.
 ==================================================================
 
 Greek accounting chart and localization.
     """,
-    "depends" : ["base", "account", "base_iban", "base_vat", "account_chart"],
-    "init_xml" : [],
-    "demo_xml" : [],
-    "update_xml" : [ "account_types.xml",
-                    "account_chart.xml",
-                    "account_full_chart.xml",
-                    "account_tax.xml",
-                    "account_tax_vat.xml",
-                    "l10n_gr_wizard.xml"],
-    "installable": True,
-    'certificate': '001146244418929008029',
+    'depends': ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
+    'demo': [],
+    'data': [ 'account_types.xml',
+               'account_chart.xml',
+               'account_full_chart.xml',
+               'account_tax.xml',
+               'account_tax_vat.xml',
+               'l10n_gr_wizard.xml'
+    ],
+    'installable': True,
     'images': ['images/config_chart_l10n_gr.jpeg','images/l10n_gr_chart.jpeg'],
 }
 
diff --git a/addons/l10n_gr/account_chart.xml b/addons/l10n_gr/account_chart.xml
index 0ad5579d867..950d9e7b09c 100644
--- a/addons/l10n_gr/account_chart.xml
+++ b/addons/l10n_gr/account_chart.xml
@@ -7,7 +7,6 @@
         <record id="chartgr_0" model="account.account.template">
             <field name="code">0</field>
             <field name="name">Γενικό Λογιστικό Σχέδιο</field>
-            <!--<field eval="0" name="parent_id"/> -->
             <field name="type">view</field>
             <field name="user_type" ref="account_type_view"/>
         </record>
diff --git a/addons/l10n_gr/i18n/ar.po b/addons/l10n_gr/i18n/ar.po
index 113f97c6ab8..b8fee3f8a1e 100644
--- a/addons/l10n_gr/i18n/ar.po
+++ b/addons/l10n_gr/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/ca.po b/addons/l10n_gr/i18n/ca.po
index b5b74f7379d..701feeb0900 100644
--- a/addons/l10n_gr/i18n/ca.po
+++ b/addons/l10n_gr/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/da.po b/addons/l10n_gr/i18n/da.po
index 88cebc307bd..02ad1dfa601 100644
--- a/addons/l10n_gr/i18n/da.po
+++ b/addons/l10n_gr/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/de.po b/addons/l10n_gr/i18n/de.po
index 3b183190482..c014631fc0b 100644
--- a/addons/l10n_gr/i18n/de.po
+++ b/addons/l10n_gr/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/el.po b/addons/l10n_gr/i18n/el.po
index bf60461c3d5..8849dc152fb 100644
--- a/addons/l10n_gr/i18n/el.po
+++ b/addons/l10n_gr/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/es.po b/addons/l10n_gr/i18n/es.po
index a427b7e811e..d5acd1d69ef 100644
--- a/addons/l10n_gr/i18n/es.po
+++ b/addons/l10n_gr/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/es_CR.po b/addons/l10n_gr/i18n/es_CR.po
index 0385e1c72ec..2f5fc4d1aa3 100644
--- a/addons/l10n_gr/i18n/es_CR.po
+++ b/addons/l10n_gr/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_gr
diff --git a/addons/l10n_gr/i18n/es_PY.po b/addons/l10n_gr/i18n/es_PY.po
index 66f93904c8e..2820b4dcd22 100644
--- a/addons/l10n_gr/i18n/es_PY.po
+++ b/addons/l10n_gr/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/fr.po b/addons/l10n_gr/i18n/fr.po
index 21fae604cfc..a0fee0edac3 100644
--- a/addons/l10n_gr/i18n/fr.po
+++ b/addons/l10n_gr/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/gl.po b/addons/l10n_gr/i18n/gl.po
index 9c2ee3125ae..bad85ec90e1 100644
--- a/addons/l10n_gr/i18n/gl.po
+++ b/addons/l10n_gr/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/hu.po b/addons/l10n_gr/i18n/hu.po
index cc91ee6788b..c5be8dd07e4 100644
--- a/addons/l10n_gr/i18n/hu.po
+++ b/addons/l10n_gr/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/it.po b/addons/l10n_gr/i18n/it.po
index d0d56a99f71..4d91313bca7 100644
--- a/addons/l10n_gr/i18n/it.po
+++ b/addons/l10n_gr/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/nl.po b/addons/l10n_gr/i18n/nl.po
index bcf3942a58e..b535398c021 100644
--- a/addons/l10n_gr/i18n/nl.po
+++ b/addons/l10n_gr/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/pt.po b/addons/l10n_gr/i18n/pt.po
index b15849d367f..9a3827a0e19 100644
--- a/addons/l10n_gr/i18n/pt.po
+++ b/addons/l10n_gr/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/pt_BR.po b/addons/l10n_gr/i18n/pt_BR.po
index 521810a2ceb..2371f47f12d 100644
--- a/addons/l10n_gr/i18n/pt_BR.po
+++ b/addons/l10n_gr/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/sr@latin.po b/addons/l10n_gr/i18n/sr@latin.po
index 082da32ebba..4541f80b562 100644
--- a/addons/l10n_gr/i18n/sr@latin.po
+++ b/addons/l10n_gr/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/i18n/tr.po b/addons/l10n_gr/i18n/tr.po
index f8bed2c2d22..e63e0714a70 100644
--- a/addons/l10n_gr/i18n/tr.po
+++ b/addons/l10n_gr/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gr
 #: model:account.account.type,name:l10n_gr.account_type_cash
diff --git a/addons/l10n_gr/l10n_gr_wizard.xml b/addons/l10n_gr/l10n_gr_wizard.xml
index 4fa564e2155..52aaa88fdab 100644
--- a/addons/l10n_gr/l10n_gr_wizard.xml
+++ b/addons/l10n_gr/l10n_gr_wizard.xml
@@ -1,12 +1,7 @@
 <openerp>
-    <data>
-
-        <record id="config_call_account_template_gr" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
 
     </data>
diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py
index 44389e68439..adba0898449 100644
--- a/addons/l10n_gt/__openerp__.py
+++ b/addons/l10n_gt/__openerp__.py
@@ -46,16 +46,14 @@ taxes and the Quetzal currency.""",
     'author': 'José Rodrigo Fernández Menegazzo',
     'website': 'http://solucionesprisma.com/',
     'depends': ['base', 'account', 'account_chart'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'account_types.xml',
         'account_chart.xml',
         'account_tax.xml',
         'l10n_gt_base.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
-    'certificate': '00815146661827601309',
     'images': ['images/config_chart_l10n_gt.jpeg','images/l10n_gt_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_gt/account_chart.xml b/addons/l10n_gt/account_chart.xml
index ffb4177d743..0f9aecfb423 100644
--- a/addons/l10n_gt/account_chart.xml
+++ b/addons/l10n_gt/account_chart.xml
@@ -7,7 +7,6 @@
         <record id="plan_raiz" model="account.account.template">
             <field name="code">-</field>
             <field name="name">Plan contable de Guatemala (sencillo)</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="cuenta_vista"/>
         </record>
diff --git a/addons/l10n_gt/i18n/ar.po b/addons/l10n_gt/i18n/ar.po
index a9e26cbeee1..38e7872c2a0 100644
--- a/addons/l10n_gt/i18n/ar.po
+++ b/addons/l10n_gt/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/ca.po b/addons/l10n_gt/i18n/ca.po
index e90ef2d8426..f5389a24a4c 100644
--- a/addons/l10n_gt/i18n/ca.po
+++ b/addons/l10n_gt/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/da.po b/addons/l10n_gt/i18n/da.po
index 4f768ada059..ba47aa9b19e 100644
--- a/addons/l10n_gt/i18n/da.po
+++ b/addons/l10n_gt/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/es.po b/addons/l10n_gt/i18n/es.po
index 2bb2ac18fc7..8390b8b08d1 100644
--- a/addons/l10n_gt/i18n/es.po
+++ b/addons/l10n_gt/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/es_CR.po b/addons/l10n_gt/i18n/es_CR.po
index 70160ea54b3..b94e5ad01ee 100644
--- a/addons/l10n_gt/i18n/es_CR.po
+++ b/addons/l10n_gt/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: l10n_gt
diff --git a/addons/l10n_gt/i18n/es_PY.po b/addons/l10n_gt/i18n/es_PY.po
index 38e1466c8db..881c13a8bb9 100644
--- a/addons/l10n_gt/i18n/es_PY.po
+++ b/addons/l10n_gt/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/fr.po b/addons/l10n_gt/i18n/fr.po
index cbbfd959a1a..ac85791d59e 100644
--- a/addons/l10n_gt/i18n/fr.po
+++ b/addons/l10n_gt/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/gl.po b/addons/l10n_gt/i18n/gl.po
index 4423caff842..a647bb2f082 100644
--- a/addons/l10n_gt/i18n/gl.po
+++ b/addons/l10n_gt/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/hu.po b/addons/l10n_gt/i18n/hu.po
index c154661e3a6..bcf9bca1f98 100644
--- a/addons/l10n_gt/i18n/hu.po
+++ b/addons/l10n_gt/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/it.po b/addons/l10n_gt/i18n/it.po
index 579ab6fd9ea..67ad5ca69ad 100644
--- a/addons/l10n_gt/i18n/it.po
+++ b/addons/l10n_gt/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/oc.po b/addons/l10n_gt/i18n/oc.po
index 8e1ce76b614..910ee67c5de 100644
--- a/addons/l10n_gt/i18n/oc.po
+++ b/addons/l10n_gt/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/pt.po b/addons/l10n_gt/i18n/pt.po
index a745bffd8db..591e0f6ab04 100644
--- a/addons/l10n_gt/i18n/pt.po
+++ b/addons/l10n_gt/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/pt_BR.po b/addons/l10n_gt/i18n/pt_BR.po
index b4c813d4596..505273b8343 100644
--- a/addons/l10n_gt/i18n/pt_BR.po
+++ b/addons/l10n_gt/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/sr@latin.po b/addons/l10n_gt/i18n/sr@latin.po
index 2221f05ac8c..5d01b4a281f 100644
--- a/addons/l10n_gt/i18n/sr@latin.po
+++ b/addons/l10n_gt/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/i18n/tr.po b/addons/l10n_gt/i18n/tr.po
index 5ca0dfe444a..583ff6fdd24 100644
--- a/addons/l10n_gt/i18n/tr.po
+++ b/addons/l10n_gt/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_gt
 #: model:account.account.type,name:l10n_gt.cuenta_vista
diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml
index 91561dca41b..8caf6ebe48c 100644
--- a/addons/l10n_gt/l10n_gt_base.xml
+++ b/addons/l10n_gt/l10n_gt_base.xml
@@ -1,14 +1,8 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="config_call_account_template_gt_minimal" model="ir.actions.todo">
-            <field name="name">Generar la nomenclatura contable a partir de un modelo</field>
-            <field name="note">Generar la nomenclatura contable a partir de un modelo.  Deberá seleccionar una compañía, el modelo a utilizar, el número de digitos a usar en la nomenclatura, la moneda para crear los diarios.</field>
-            <!--<field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus, the pure copy of chart Template is generated.
-            This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>-->
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
 
         <!-- Moneda Quetzal -->
@@ -35,7 +29,6 @@
             <field name="bank_account_view_id" ref="cta1101"/>
             <field name="property_account_receivable" ref="cta110201"/>
             <field name="property_account_payable" ref="cta210101"/>
-            <field name="property_reserve_and_surplus_account" ref="cta310103"/>
             <field name="property_account_income_categ" ref="cta410101"/>
             <field name="property_account_expense_categ" ref="cta510101"/>
         </record>
diff --git a/addons/l10n_hn/__openerp__.py b/addons/l10n_hn/__openerp__.py
index 25655e52e70..0f72b3e446c 100644
--- a/addons/l10n_hn/__openerp__.py
+++ b/addons/l10n_hn/__openerp__.py
@@ -37,20 +37,22 @@
     'version': '0.1',
     'category': 'Localization/Account Charts',
     'description': """
+This is the base module to manage the accounting chart for Honduras.
+====================================================================
+    
 Agrega una nomenclatura contable para Honduras. También incluye impuestos y la
 moneda Lempira. -- Adds accounting chart for Honduras. It also includes taxes
 and the Lempira currency.""",
     'author': 'Salvatore Josue Trimarchi Pinto',
     'website': 'http://trimarchi.co.cc',
     'depends': ['base', 'account', 'account_chart'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'account_types.xml',
         'account_chart.xml',
         'account_tax.xml',
         'l10n_hn_base.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_hn/account_chart.xml b/addons/l10n_hn/account_chart.xml
index 7bd17b0e82d..228c60ef4dc 100644
--- a/addons/l10n_hn/account_chart.xml
+++ b/addons/l10n_hn/account_chart.xml
@@ -7,7 +7,6 @@
         <record id="plan_raiz" model="account.account.template">
             <field name="code">-</field>
             <field name="name">Plan contable de Honduras (sencillo)</field>
-            <field eval="0" name="parent_id"/>
             <field name="type">view</field>
             <field name="user_type" ref="cuenta_vista"/>
         </record>
diff --git a/addons/l10n_hn/i18n/ca.po b/addons/l10n_hn/i18n/ca.po
index b83f5180889..1af5137c6ec 100644
--- a/addons/l10n_hn/i18n/ca.po
+++ b/addons/l10n_hn/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/es.po b/addons/l10n_hn/i18n/es.po
index 577c591fd49..269ddb86e8a 100644
--- a/addons/l10n_hn/i18n/es.po
+++ b/addons/l10n_hn/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/es_CR.po b/addons/l10n_hn/i18n/es_CR.po
index 3920e3e65a3..630959731cd 100644
--- a/addons/l10n_hn/i18n/es_CR.po
+++ b/addons/l10n_hn/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: l10n_hn
diff --git a/addons/l10n_hn/i18n/fr.po b/addons/l10n_hn/i18n/fr.po
index d743875a119..5658c5e8aad 100644
--- a/addons/l10n_hn/i18n/fr.po
+++ b/addons/l10n_hn/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/gl.po b/addons/l10n_hn/i18n/gl.po
index 7e9a65b82a4..8da949b1066 100644
--- a/addons/l10n_hn/i18n/gl.po
+++ b/addons/l10n_hn/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/hu.po b/addons/l10n_hn/i18n/hu.po
index 7d903ca9b3f..37322bebe5c 100644
--- a/addons/l10n_hn/i18n/hu.po
+++ b/addons/l10n_hn/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/it.po b/addons/l10n_hn/i18n/it.po
index c059ed1af27..f691e5fa9f6 100644
--- a/addons/l10n_hn/i18n/it.po
+++ b/addons/l10n_hn/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/pt.po b/addons/l10n_hn/i18n/pt.po
index f645c368328..7b17e48e878 100644
--- a/addons/l10n_hn/i18n/pt.po
+++ b/addons/l10n_hn/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/pt_BR.po b/addons/l10n_hn/i18n/pt_BR.po
index 0f17e698421..589840d964b 100644
--- a/addons/l10n_hn/i18n/pt_BR.po
+++ b/addons/l10n_hn/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/sr@latin.po b/addons/l10n_hn/i18n/sr@latin.po
index e5351f030db..ba9795193e8 100644
--- a/addons/l10n_hn/i18n/sr@latin.po
+++ b/addons/l10n_hn/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/i18n/tr.po b/addons/l10n_hn/i18n/tr.po
index 1224e7f4c67..4a1f466744a 100644
--- a/addons/l10n_hn/i18n/tr.po
+++ b/addons/l10n_hn/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_hn
 #: model:account.account.type,name:l10n_hn.cuenta_vista
diff --git a/addons/l10n_hn/l10n_hn_base.xml b/addons/l10n_hn/l10n_hn_base.xml
index 1a080e3c2dd..b8b85c3f2a7 100644
--- a/addons/l10n_hn/l10n_hn_base.xml
+++ b/addons/l10n_hn/l10n_hn_base.xml
@@ -2,13 +2,7 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="config_call_account_template_hn_minimal" model="ir.actions.todo">
-            <field name="name">Generar la nomenclatura contable a partir de un modelo</field>
-            <field name="note">Generar la nomenclatura contable a partir de un modelo.  Deberá seleccionar una compañía, el modelo a utilizar, el número de digitos a usar en la nomenclatura, la moneda para crear los diarios.</field>
-            <!--<field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus, the pure copy of chart Template is generated.
-            This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>-->
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
 
@@ -21,7 +15,6 @@
             <field name="bank_account_view_id" ref="cta1101"/>
             <field name="property_account_receivable" ref="cta110201"/>
             <field name="property_account_payable" ref="cta210101"/>
-            <field name="property_reserve_and_surplus_account" ref="cta310103"/>
             <field name="property_account_income_categ" ref="cta410101"/>
             <field name="property_account_expense_categ" ref="cta510101"/>
         </record>
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index 1e49509c627..b3dab229201 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -20,32 +20,31 @@
 ##############################################################################
 
 {
-    "name": "Indian - Accounting",
-    "version": "1.0",
-    "description": """
+    'name': 'Indian - Accounting',
+    'version': '1.0',
+    'description': """
 Indian Accounting: Chart of Account.
 ====================================
 
 Indian accounting chart and localization.
     """,
-    "author": ['OpenERP SA', 'Axelor'],
-    "category": "Localization/Account Charts",
-    "depends": [
-        "account",
-        "account_chart"
+    'author': ['OpenERP SA', 'Axelor'],
+    'category': 'Localization/Account Charts',
+    'depends': [
+        'account',
+        'account_chart'
     ],
-    "demo_xml": [],
-    "update_xml": [
-        "l10n_in_tax_code_template.xml",
-        "l10n_in_public_chart.xml",
-        "l10n_in_public_tax_template.xml",
-        "l10n_in_private_chart.xml",
-        "l10n_in_private_tax_template.xml",
-        "l10n_in_wizard.xml",
+    'demo': [],
+    'data': [
+        'l10n_in_tax_code_template.xml',
+        'l10n_in_public_chart.xml',
+        'l10n_in_public_tax_template.xml',
+        'l10n_in_private_chart.xml',
+        'l10n_in_private_tax_template.xml',
+        'l10n_in_wizard.xml',
     ],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "001308250150600713245",
+    'auto_install': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_in.jpeg','images/l10n_in_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in/i18n/ar.po b/addons/l10n_in/i18n/ar.po
index 848b5ad20c7..7bcad9acfbb 100644
--- a/addons/l10n_in/i18n/ar.po
+++ b/addons/l10n_in/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_in
 #: model:account.account.type,name:l10n_in.account_type_asset_view
diff --git a/addons/l10n_in/i18n/br.po b/addons/l10n_in/i18n/br.po
index 6c096a8cc46..e919fd2b2ec 100644
--- a/addons/l10n_in/i18n/br.po
+++ b/addons/l10n_in/i18n/br.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/ca.po b/addons/l10n_in/i18n/ca.po
index 6a318578f7e..d7217d40e19 100644
--- a/addons/l10n_in/i18n/ca.po
+++ b/addons/l10n_in/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:27+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/da.po b/addons/l10n_in/i18n/da.po
index 9052653a257..c7a14cadad4 100644
--- a/addons/l10n_in/i18n/da.po
+++ b/addons/l10n_in/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_in
 #: model:account.account.type,name:l10n_in.account_type_asset_view
diff --git a/addons/l10n_in/i18n/de.po b/addons/l10n_in/i18n/de.po
index ba06b84307a..867c7e63421 100644
--- a/addons/l10n_in/i18n/de.po
+++ b/addons/l10n_in/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/es.po b/addons/l10n_in/i18n/es.po
index 7ecd582f42b..d8064ec1d56 100644
--- a/addons/l10n_in/i18n/es.po
+++ b/addons/l10n_in/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/es_CR.po b/addons/l10n_in/i18n/es_CR.po
index b6f78093082..374c8b07ba4 100644
--- a/addons/l10n_in/i18n/es_CR.po
+++ b/addons/l10n_in/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/es_PY.po b/addons/l10n_in/i18n/es_PY.po
index 4c2ea9833b5..89c0927dde9 100644
--- a/addons/l10n_in/i18n/es_PY.po
+++ b/addons/l10n_in/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_in
 #: model:account.account.type,name:l10n_in.account_type_asset_view
diff --git a/addons/l10n_in/i18n/et.po b/addons/l10n_in/i18n/et.po
index e02f6e7a2d2..037c7128540 100644
--- a/addons/l10n_in/i18n/et.po
+++ b/addons/l10n_in/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/fr.po b/addons/l10n_in/i18n/fr.po
index 76d333df6d4..6ffdc754965 100644
--- a/addons/l10n_in/i18n/fr.po
+++ b/addons/l10n_in/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/gl.po b/addons/l10n_in/i18n/gl.po
index 6439e73fef0..427a732f295 100644
--- a/addons/l10n_in/i18n/gl.po
+++ b/addons/l10n_in/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_in
 #: model:account.account.type,name:l10n_in.account_type_asset_view
diff --git a/addons/l10n_in/i18n/hu.po b/addons/l10n_in/i18n/hu.po
index 6a38f815e30..0ad49edadce 100644
--- a/addons/l10n_in/i18n/hu.po
+++ b/addons/l10n_in/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/it.po b/addons/l10n_in/i18n/it.po
index 7341e98edf7..0bf0d3d5897 100644
--- a/addons/l10n_in/i18n/it.po
+++ b/addons/l10n_in/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/oc.po b/addons/l10n_in/i18n/oc.po
index a2c17c999b8..73ddcb82c8e 100644
--- a/addons/l10n_in/i18n/oc.po
+++ b/addons/l10n_in/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_in
 #: model:account.account.type,name:l10n_in.account_type_asset_view
diff --git a/addons/l10n_in/i18n/pt.po b/addons/l10n_in/i18n/pt.po
index eb3b3f232aa..636a99de614 100644
--- a/addons/l10n_in/i18n/pt.po
+++ b/addons/l10n_in/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/pt_BR.po b/addons/l10n_in/i18n/pt_BR.po
index 808a62d7db5..029632361e8 100644
--- a/addons/l10n_in/i18n/pt_BR.po
+++ b/addons/l10n_in/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/ru.po b/addons/l10n_in/i18n/ru.po
index 112fe091196..5f4cd14b9ba 100644
--- a/addons/l10n_in/i18n/ru.po
+++ b/addons/l10n_in/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/sr@latin.po b/addons/l10n_in/i18n/sr@latin.po
index e2dd751b76c..110d31a6fc8 100644
--- a/addons/l10n_in/i18n/sr@latin.po
+++ b/addons/l10n_in/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/sv.po b/addons/l10n_in/i18n/sv.po
index 62a5ea82149..6fae3504579 100644
--- a/addons/l10n_in/i18n/sv.po
+++ b/addons/l10n_in/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/i18n/tr.po b/addons/l10n_in/i18n/tr.po
index a8d1f5037ad..2d1f96132c9 100644
--- a/addons/l10n_in/i18n/tr.po
+++ b/addons/l10n_in/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_chart_in
 #: model:ir.module.module,description:l10n_chart_in.module_meta_information
diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml
index db11d0638c8..671fdc334d9 100644
--- a/addons/l10n_in/l10n_in_private_chart.xml
+++ b/addons/l10n_in/l10n_in_private_chart.xml
@@ -8,7 +8,6 @@
             <field name="name">Partnership/Private Firm Chart of Account</field>
             <field name="code">0</field>
             <field name="type">view</field>
-            <field eval="0" name="parent_id"/>
             <field name="user_type" ref="account.data_account_type_view"/>
             <field name="reconcile" eval="False"/>
         </record>
@@ -278,7 +277,7 @@
             <field name="type">view</field>
             <field name="user_type" ref="account.data_account_type_liability"/>
             <field name="reconcile" eval="False"/>
-            <field name="parent_id" ref="a1"/>
+            <field name="parent_id" ref="a20"/>
         </record>
         
       <!--  <record model="account.account.template" id="290">
@@ -515,9 +514,8 @@
             <field name="property_account_payable" ref="a215"/>
             <field name="property_account_expense_categ" ref="a540"/>
             <field name="property_account_income_categ" ref="a311"/>
-            <field name="property_reserve_and_surplus_account" ref="a260"/>
         </record>
         
         
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
index 2c2dda0dd9d..9612afddc39 100644
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -9,7 +9,6 @@
             <field name="name">Public Firm Chart of Account</field>
             <field name="code">0</field>
             <field name="type">view</field>
-			<field eval="0" name="parent_id"/>
             <field name="user_type" ref="account.data_account_type_view"/>
             <field name="reconcile" eval="False"/>
         </record>
@@ -669,8 +668,7 @@
             <field name="property_account_payable" ref="p21000"/>
             <field name="property_account_expense_categ" ref="p41010"/>
             <field name="property_account_income_categ" ref="p31010"/>
-            <field name="property_reserve_and_surplus_account" ref="p24600"/> 
         </record>
         
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/l10n_in/l10n_in_wizard.xml b/addons/l10n_in/l10n_in_wizard.xml
index 20d35aa09a2..704ac4daf38 100644
--- a/addons/l10n_in/l10n_in_wizard.xml
+++ b/addons/l10n_in/l10n_in_wizard.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-
-        <record id="config_call_account_template_in_minimal" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
 
     </data>
diff --git a/addons/base_module_doc_rst/__init__.py b/addons/l10n_in_hr_payroll/__init__.py
similarity index 76%
rename from addons/base_module_doc_rst/__init__.py
rename to addons/l10n_in_hr_payroll/__init__.py
index 87582ff4c7c..9631ccf0317 100644
--- a/addons/base_module_doc_rst/__init__.py
+++ b/addons/l10n_in_hr_payroll/__init__.py
@@ -1,13 +1,13 @@
-# -*- encoding: utf-8 -*-
+#-*- coding:utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
 #
 #    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.
+#    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
@@ -18,8 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import base_module_doc_rst
-import wizard
-import report
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+import l10n_in_hr_payroll
+import report
+import wizard
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/__openerp__.py b/addons/l10n_in_hr_payroll/__openerp__.py
new file mode 100644
index 00000000000..6d891c7a08e
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/__openerp__.py
@@ -0,0 +1,68 @@
+# -*- encoding: 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/>.
+#
+##############################################################################
+{
+    'name': 'Indian Payroll',
+    'category': 'Localization',
+    'init_xml': [],
+    'author': 'OpenERP SA',
+    'website':'http://www.openerp.com',
+    'depends': ['hr_payroll'],
+    'version': '1.0',
+    'description': """
+Indian Payroll Salary Rules.
+============================
+
+    -Configuration of hr_payroll for India localization
+    -All main contributions rules for India payslip.
+    * New payslip report
+    * Employee Contracts
+    * Allow to configure Basic / Gross / Net Salary
+    * Employee PaySlip
+    * Allowance / Deduction
+    * Integrated with Holiday Management
+    * Medical Allowance, Travel Allowance, Child Allowance, ...
+    - Payroll Advice and Report
+    - Yearly Salary by Head and Yearly Salary by Employee Report
+    """,
+    'active': False,
+    'update_xml': [
+         'l10n_in_hr_payroll_view.xml',
+         'data/l10n_in_hr_payroll_data.xml',
+         'data/hr.salary.rule.csv',
+         'security/ir.model.access.csv',
+         'l10n_in_hr_payroll_report.xml',
+         'l10n_in_hr_payroll_sequence.xml',
+         'wizard/hr_salary_employee_bymonth_view.xml',
+         'wizard/hr_yearly_salary_detail_view.xml',
+         'report/payment_advice_report_view.xml',
+         'report/payslip_report_view.xml',
+
+     ],
+    'test': [
+        'test/payment_advice.yml',
+        'test/payment_advice_batch.yml'
+    ],
+
+    'demo_xml': ['l10n_in_hr_payroll_demo.xml'],
+    'installable': True
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
new file mode 100644
index 00000000000..2fe1ba739f4
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/data/hr.salary.rule.csv
@@ -0,0 +1,5 @@
+"id","amount_select","condition_range_min","condition_range_max","amount_percentage","amount_fix","name","category_id","sequence","code","parent_rule_id/id","condition_select","condition_range","amount_percentage_base"
+1,"fix",1,1,,100,"Education Allowance For One Child","Allowance",23,"CHEAONE","hr_payroll_rule_child1","range","employee.children",
+2,"fix",2,10,,200,"Education Allowance For Two Child","Allowance",24,"CHEATWO","hr_payroll_rule_child1","range","employee.children",
+3,"fix",1,1,,300,"Child Hostel Allowance For One Child","Allowance",26,"CHOONE","hr_payroll_rule_child2","range","employee.children",
+4,"fix",2,10,,600,"Child Hostel Allowance For Two Child","Allowance",27,"CHOTWO","hr_payroll_rule_child2","range","employee.children",
diff --git a/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
new file mode 100644
index 00000000000..8c6449e6336
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/data/l10n_in_hr_payroll_data.xml
@@ -0,0 +1,584 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- Contribution Register -->
+
+        <record id="hr_houserent_allowance_register" model="hr.contribution.register">
+            <field name="name">Register for House Rent Allowance</field>
+        </record>
+
+        <record id="hr_register_provident_fund" model="hr.contribution.register">
+            <field name="name">Register for Provident Fund</field>
+        </record>
+
+        <record id="hr_professional_tax_deduction_register" model="hr.contribution.register">
+            <field name="name">Register for Professional Tax</field>
+        </record>
+
+        <record id="hr_food_coupen_register" model="hr.contribution.register">
+            <field name="name">Register for Food Coupen</field>
+        </record>
+
+        <record id="hr_tds_register" model="hr.contribution.register">
+            <field name="name">Register for TDS</field>
+        </record>
+
+        <record id="hr_nps_contribution_register" model="hr.contribution.register">
+            <field name="name">Register for NPS Contribution</field>
+        </record>
+
+        <record id="hr_vpf_contribution_register" model="hr.contribution.register">
+            <field name="name">Register for Voluntarily Provident Fund</field>
+        </record>
+
+        <record id="hr_company_transport_register" model="hr.contribution.register">
+            <field name="name">Register for Company Provided Transport Deduction</field>
+        </record>
+
+        <record id="hr_labour_Welfare_fund_register" model="hr.contribution.register">
+            <field name="name">Register for State Labour Welfare Fund Deduction</field>
+        </record>
+
+        <record id="hr_group_term_insurance_register" model="hr.contribution.register">
+            <field name="name">Register for Company Provided Group Term Insurance Deduction</field>
+        </record>
+
+        <record id="hr_leave_availed_register" model="hr.contribution.register">
+            <field name="name">Register for Leave Availed Deduction</field>
+        </record>
+
+        <record id="hr_medical_insurance_register" model="hr.contribution.register">
+            <field name="name">Register for Company Provided Medical Insurance Deduction</field>
+        </record>
+
+        <record id="hr_other_deduction_register" model="hr.contribution.register">
+            <field name="name">Register for Other Deduction from Employer</field>
+        </record>
+        <!-- Hr Salary Rules for allowance-->
+
+        <record id="hr_salary_rule_da" model="hr.salary.rule">
+            <field name="code">DA</field>
+            <field name="name">Dearness Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">percentage</field>
+            <field name="amount_percentage_base">contract.wage</field>
+            <field name="amount_percentage" eval="50"/>
+            <field name="sequence" eval="13"/>
+            <field name="note">Dearness allowance (D.A.) is part of a person's salary. It is calculated as a percent of the basic salary. This amount is then added to the basic salary along with house rent allowance to get the total salary. Or you can say that The Dearness Allowance is a part of the total compensation a person receives for having performed his or her job.</field>
+        </record>
+
+        <record id="hr_salary_rule_houserentallowancemetro_nonmetro" model="hr.salary.rule">
+            <field name="code">HRAMN</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and 
+((contract.wage + DA) * contract.house_rent_allowance_metro_nonmetro / 100)
+or (contract.wage * contract.house_rent_allowance_metro_nonmetro / 100))</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="name">House Rent Allowance</field>
+            <field name="register_id" ref="hr_houserent_allowance_register"/>
+            <field name="sequence" eval="51"/>
+            <field name="note">HRA is an allowance given by the employer to the employee for taking care of his rental or accommodation expenses.</field>
+        </record>
+
+        <record id="hr_salary_trans_allownce" model="hr.salary.rule">
+            <field name="code">TCA</field>
+            <field name="name">Transport/Conveyance Allownace</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="800.0" name="amount_fix"/>
+            <field name="sequence" eval="14"/>
+            <field name="note">A conveyance allowance refers to an amount of money reimbursed to someone for the operation of a vehicle or the riding of a vehicle. The allowance is typically a designated amount or percentage of total transportation expenses that is referenced in a country's tax laws or code. Organizations and private or public businesses may also offer a conveyance allowance in addition to reimbursing employees or members for transportation expenses. In this instance, the conveyance allowance may identify an unusual transport occurrence that may not be covered by a designated travel expense report such as travel to a specific job site that requires a daily bus or taxi ride.</field>
+        </record>
+
+        <record id="hr_salary_rule_special" model="hr.salary.rule">
+            <field name="code">SA</field>
+            <field name="name">Grade/Special/Management/Supplementary Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.supplementary_allowance)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = contract.supplementary_allowance</field>
+            <field name="sequence" eval="20"/>
+            <field name="note">This allowance is normally given as an additional benefit to employees and is fully taxable.</field>
+        </record>
+
+        <record id="hr_payroll_rule_child1" model="hr.salary.rule">
+            <field name="code">CHEA</field>
+            <field name="name">Child Education Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(employee.children)</field>
+            <field name="amount_select">fix</field>
+            <field name="sequence" eval="18"/>
+            <field name="note">Per school going child 1200 per annum is non-taxable.Maximum for 2 children, so max 2400 per annum becomes non-taxable.</field>
+        </record>
+
+        <record id="hr_payroll_rule_child2" model="hr.salary.rule">
+             <field name="code">CHEAH</field>
+             <field name="name">Child Hostel Allowance</field>
+             <field name="category_id" ref="hr_payroll.ALW"/>
+             <field name="condition_select">python</field>
+             <field name="condition_python">result = bool(employee.children)</field>
+             <field name="amount_select">fix</field>
+             <field name="note">In case the children are in hostel, the exemption available for child.</field>
+             <field name="sequence" eval="19"/>
+         </record>
+
+        <record id="hr_payroll_rule_city1" model="hr.salary.rule">
+            <field name="code">CBDA</field>
+            <field name="name">City Compensatory Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">none</field>
+            <field name="sequence" eval="21"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and ((contract.wage + DA) * 0.10) 
+or (contract.wage * 0.10))</field>
+            <field name="note">This allowance is paid to Employees who are posted in big cities. The purpose is to compensate the high cost of living in cities like Mumbai, Delhi, etc. However it is Fully Taxable.</field>
+        </record>
+
+        <record id="hr_payroll_rule_metrocity" model="hr.salary.rule">
+            <field name="code">CMETRO</field>
+            <field name="name">City Allowance for Metro city</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">none</field>
+            <field name="sequence" eval="22"/>
+            <field name="amount_select">fix</field>
+            <field name="amount_fix">850.0</field>
+        </record>
+
+        <record id="hr_payroll_rule_nonmetrocity" model="hr.salary.rule">
+            <field name="code">CNMETRO</field>
+            <field name="name">City Allowance for Non Metro city</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">none</field>
+            <field name="sequence" eval="25"/>
+            <field name="amount_select">fix</field>
+            <field name="amount_fix">800.0</field>
+        </record>
+
+        <record id="hr_salary_rule_arrears" model="hr.salary.rule">
+            <field name="code">ARRE</field>
+            <field name="name">Arrears</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.ARS.amount</field>
+            <field eval="0.0" name="amount_fix"/>
+            <field name="sequence" eval="28"/>
+            <field name="note">Generally arrears are fully taxable, but employee may claim exemption u/s 89(1).
+One would need to compute income tax on the arrears if it would have been received in actual year.
+Now difference of income tax between payment year and actual year would be allowed for deduction.</field>
+        </record>
+
+        <record id="hr_salary_rule_lta" model="hr.salary.rule">
+            <field name="code">LTA</field>
+            <field name="name">Leave Travel Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">percentage</field>
+            <field name="amount_percentage_base">contract.wage</field>
+            <field name="amount_percentage" eval="8.33"/>
+            <field name="sequence" eval="29"/>
+            <field name="note">As per Income tax rules of India, if transport bills for LTA are not provided,the amount will be taxed. E.g. If an employee has LTA allowance as Rs 50,000 in his CTC(cost to company),and he provides proofs of Rs 40,000 (boarding pass,air tickets, taxi vouchers) then income tax will be deducted for rest of the Rs 10,000. Does not matter whats the amount of LTA in an employee’s package, income tax laws only permits domestic air tickets only for LTA claim.</field>
+        </record>
+
+        <record id="hr_salary_rule_le" model="hr.salary.rule">
+            <field name="code">LE</field>
+            <field name="name">Leave Encashment</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">none</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.LE.amount</field>
+            <field name="sequence" eval="30"/>
+            <field name="note">Payment by way of leave encashment received by Central and State Govt.employees at the time of retirement in respect of the period of earned leave at credit is fully exempt. In case of other employees, the exemption is to be limited to minimum of all below:
+    1.The actual amount received
+    2.The cash equivalent of leave balance (max 30 days per year of service)
+    3.Maximum of 10 months of leave encashment, based on last 10 months average salary
+    4.Rs. 3 Lakh</field>
+        </record>
+
+        <record id="hr_salary_rule_performance" model="hr.salary.rule">
+            <field name="code">PI</field>
+            <field name="name">Performance Incentive</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.PERF.amount</field>
+            <field name="sequence" eval="31"/>
+            <field name="note">This would be fully taxable based on incentive.</field>
+        </record>
+
+        <record id="hr_salary_rule_bonus" model="hr.salary.rule">
+            <field name="code">BONUS</field>
+            <field name="name">Bonus</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.BNS.amount</field>
+            <field name="sequence" eval="41"/>
+            <field name="note">This would be fully taxable based on Bonus.</field>
+        </record>
+
+        <record id="hr_salary_rule_medical_allow" model="hr.salary.rule">
+            <field name="code">MEDA</field>
+            <field name="name">Medical Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="1250.0" name="amount_fix"/>
+            <field name="sequence" eval="43"/>
+            <field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
+        </record>
+
+        <record id="hr_salary_rule_medical" model="hr.salary.rule">
+            <field name="code">MEDA</field>
+            <field name="name">Medical Reimbursement</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.MR.amount</field>
+            <field name="sequence" eval="32"/>
+            <field name="note">This component is on-taxable up to 15000 per year (or Rs 1250 per month) on producing medical bills.</field>
+        </record>
+
+         <record id="hr_salary_rule_food_coupon" model="hr.salary.rule">
+            <field name="amount_select">fix</field>
+            <field eval="50" name="amount_fix"/>
+            <field name="quantity">worked_days.WORK100.number_of_days</field>
+            <field name="code">FC</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="name">Food Allowance</field>
+            <field name="register_id" ref="hr_food_coupen_register"/>
+            <field name="sequence" eval="33"/>
+         </record>
+
+        <record id="hr_salary_rule_journals" model="hr.salary.rule">
+            <field name="code">PERJ</field>
+            <field name="name">Periodical Journals</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.PJ.amount</field>
+            <field name="sequence" eval="34"/>
+            <field name="note">Some employers may provide component for buying magazines, journals and books as a part of knowledge enhancement for business growth.This part would become non taxable on providing original bills.</field>
+        </record>
+
+        <record id="hr_salary_rule_uniform_senior" model="hr.salary.rule">
+            <field name="code">UNIFS</field>
+            <field name="name">Uniform/Dress Allowance for Senior Executive</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="1000" name="amount_fix"/>
+            <field name="sequence" eval="35"/>
+            <field name="note">Some sections of employees mat get allowance for purchase of office dress/uniform.In such case, the component would become non-taxable.</field>
+        </record>
+
+        <record id="hr_salary_rule_uniform_junior" model="hr.salary.rule">
+            <field name="code">UNIFJ</field>
+            <field name="name">Uniform/Dress Allowance for Junior Executive</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="600" name="amount_fix"/>
+            <field name="sequence" eval="42"/>
+            <field name="note">Some sections of employees mat get allowance for purchase of office dress/uniform.In such case, the component would become non-taxable.</field>
+        </record>
+
+        <record id="hr_salary_rule_telephone" model="hr.salary.rule">
+            <field name="code">TELR</field>
+            <field name="name">Telephone Reimbursement</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.TR.amount</field>
+            <field name="sequence" eval="36"/>
+            <field name="note">In some of the cases, companies may provide a component for telephone bills.Employees may provide actual phone usage bills to reimburse this component and make it non-taxable.
+            </field>
+        </record>
+
+        <record id="hr_salary_rule_prof_develope" model="hr.salary.rule">
+            <field name="code">PDA</field>
+            <field name="name">Professional Development Allowance</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">fix</field>
+            <field eval="0.0" name="amount_fix"/>
+            <field name="sequence" eval="37"/>
+        </record>
+
+        <record id="hr_payroll_rule_car" model="hr.salary.rule">
+            <field name="code">CAR</field>
+            <field name="name">Car Expenses Reimbursement</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.CEI.amount</field>
+            <field name="sequence" eval="38"/>
+            <field name="note">In case company provides component for this and employee use self owned car for official and personal purposes, Rs 1800 per month would be non-taxable on showing bills for fuel or can maintenance. This amount would be Rs 2400 in case car is more capacity than 1600cc.</field>
+        </record>
+
+        <record id="hr_salary_rule_internet" model="hr.salary.rule">
+            <field name="code">INT</field>
+            <field name="name">Internet Expense</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = inputs.IE.amount</field>
+            <field name="sequence" eval="39"/>
+            <field name="note">Employer may also provide reimbursement of internet expenses and thus this would become non taxable.</field>
+        </record>
+
+        <record id="hr_salary_rule_driver" model="hr.salary.rule">
+            <field name="code">DRI</field>
+            <field name="name">Driver Salary</field>
+            <field name="category_id" ref="hr_payroll.ALW"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.driver_salay)</field>
+            <field name="amount_select">fix</field>
+            <field eval="900.0" name="amount_fix"/>
+            <field name="sequence" eval="40"/>
+             <field name="note">Rs. 900 per month (non taxable)</field>
+        </record>
+
+
+        <!--hr salary rules for Deductions -->
+
+        <record id="hr_payslip_rule_tds" model="hr.salary.rule">
+            <field name="code">TDS</field>
+            <field name="name">Tax Deducted at Source</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.tds)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = -(contract.tds)</field>
+            <field name="register_id" ref="hr_tds_register"/>
+            <field name="sequence" eval="140"/>
+            <field name="note">As per income tax rules, all payment which are taxable in nature should be done after deduction of taxes at the source itself. Hence employer compute income tax on salary payment and deduct it every month. This TDS is based on employee’s saving/investment declaration at the start of year. If investments for tax saving is not done, large amount may be deducted in last few months.</field>
+        </record>
+
+        <record id="hr_payslip_line_professional_tax" model="hr.salary.rule">
+            <field name="code">PTD</field>
+            <field name="name">Professional Tax</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = contract.wage &gt;= 3000 </field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (-200 if contract.wage &gt;= 12000 
+else -150 if ((contract.wage &gt;= 9000) and (contract.wage &lt;= 11999)) 
+else -80 if ((contract.wage &gt;= 6000) and (contract.wage &lt;= 8999)) 
+else -20 if  ((contract.wage &gt;= 3000) and (contract.wage &lt;= 5999))  
+else -0)</field>
+            <field name="register_id" ref="hr_professional_tax_deduction_register"/>
+            <field eval="145" name="sequence"/>
+            <field name="note">Workers living in states that impose the professional tax must submit a payment each half-year for the right to practice a profession or trade. It applies equally to employees who work for the national or state government, and those employed by private corporations. The professional tax uses a six-month accounting system, which divides the year into two periods, beginning on April 1 and October 1.</field>
+        </record>
+
+        <record id="hr_payslip_rule_epf" model="hr.salary.rule">
+            <field name="code">EPMF</field>
+            <field name="name">Employee's PF Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) 
+or - (contract.wage * 0.12))</field>
+            <field name= "note">Employer contribution does not become part of employee’s income and hence income tax is not payable on this part.</field>
+            <field name="register_id" ref="hr_register_provident_fund"/>
+            <field name="sequence" eval="150"/>
+        </record>
+
+        <record id="hr_payslip_rule_enps" model="hr.salary.rule">
+            <field name="code">ENPFC</field>
+            <field name="name">Employee's NPS Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) 
+or - (contract.wage * 0.10))</field>
+            <field name="sequence" eval="155"/>
+            <field name="register_id" ref="hr_nps_contribution_register"/>
+            <field name="note">Employee can claim deduction even of employer's contribution to NPS.</field>
+        </record>
+
+        <record id="hr_payslip_rule_vpf" model="hr.salary.rule">
+            <field name="code">VPF</field>
+            <field name="name">Voluntarily Provident Fund Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.voluntary_provident_fund)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and 
+- ((contract.wage + DA) * contract.voluntary_provident_fund / 100) 
+or - (contract.wage * contract.voluntary_provident_fund / 100))</field>
+            <field name="sequence" eval="160"/>
+            <field name="register_id" ref="hr_vpf_contribution_register"/>
+            <field name="note">VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government.This additional amount enjoys all the benefits of PF except that the employer is not liable to contribute any extra amount apart from 12%.An added advantage is that the interest rate is equal to the interest rate of PF and he withdrawal is tax free. Please note that the maximum contribution towards VPF is 100% of your Basic.The highest rate of interest (close to 9%) makes it a very attractive saving scheme. Because of these advantages many employees chose not to close their PF account even after getting employment else where other than India.Employees also get a major tax break on their entire contribution to the fund up to a ceiling of Rs. 70,000/-</field>
+        </record>
+
+        <record id="hr_payslip_rule_cpt" model="hr.salary.rule">
+            <field name="code">CPT</field>
+            <field name="name">Deduction for Company Provided Transport</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">none</field>
+            <field name="amount_select">fix</field>
+            <field eval="-1500.0" name="amount_fix"/>
+            <field name="register_id" ref="hr_company_transport_register"/>
+            <field name="sequence" eval="165"/>
+            <field name="appears_on_payslip" eval="False"/>
+            <field name="note">Company provided transport amount is based on company.</field>
+        </record>
+
+         <record id="hr_salary_rule_food_coupon_ded" model="hr.salary.rule">
+            <field name="amount_select">fix</field>
+            <field eval="-50" name="amount_fix"/>
+            <field name="quantity">worked_days.WORK100.number_of_days</field>
+            <field name="code">FD</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="name">Deduction Towards Food Coupons</field>
+            <field name="register_id" ref="hr_food_coupen_register"/>
+            <field name="sequence" eval="166"/>
+         </record>
+
+        <record id="hr_payslip_rule_lwf_employee" model="hr.salary.rule">
+            <field name="code">LWFE</field>
+            <field name="name">Employee's Deduction Towards State Labour Welfare Fund</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-3.0" name="amount_fix"/>
+            <field name="sequence" eval="170"/>
+            <field name="register_id" ref="hr_labour_Welfare_fund_register"/>
+            <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
+        </record>
+
+        <record id="hr_payslip_rule_lwf_employer" model="hr.salary.rule">
+            <field name="code">LWF</field>
+            <field name="name">Employer's Deduction Towards State Labour Welfare Fund </field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-6.0" name="amount_fix"/>
+            <field name="sequence" eval="171"/>
+            <field name="register_id" ref="hr_labour_Welfare_fund_register"/>
+            <field name="appears_on_payslip" eval="False"/>
+            <field name="note">The LWF is applicable to all the members of the organisation except the Management staff (Staffs having authority to sign on the cheque/official documents on behalf of the organisation). for e.x. Employee Contribution is Rs. 3.00 and Employer contribution Rs. 6.00 Total Rs 9.00 and deposited to the LWF office.It is half yearly contribution (June and December).</field>
+        </record>
+
+        <record id="hr_payslip_rule_cgti" model="hr.salary.rule">
+            <field name="code">CGTI</field>
+            <field name="name">Deduction Towards Company Provided Group Term Insurance</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-1000.0" name="amount_fix"/>
+            <field name="register_id" ref="hr_group_term_insurance_register"/>
+            <field name="sequence" eval="175"/>
+            <field name="note">Group term insurance provides a solid foundation to a comprehensive employee benifit program,backed up by government asistance in the form of valuable tax incentives to both employees and employers.</field>
+        </record>
+
+        <record id="hr_payslip_rule_dla" model="hr.salary.rule">
+            <field name="code">DLA</field>
+            <field name="name">Deduction Towards Leave Availed</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">none</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = - (inputs.LAI.amount)</field>
+            <field name="register_id" ref="hr_leave_availed_register"/>
+            <field name="sequence" eval="180"/>
+        </record>
+
+        <record id="hr_payslip_rule_cmt" model="hr.salary.rule">
+            <field name="code">CMT</field>
+            <field name="name">Deduction Towards Company Provided Medical Insurance</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="condition_select">python</field>
+            <field name="condition_python">result = bool(contract.medical_insurance)</field>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = - (contract.medical_insurance)</field>
+            <field eval="-50.0" name="amount_fix"/>
+            <field name="appears_on_payslip" eval="False"/>
+            <field name="register_id" ref="hr_medical_insurance_register"/>
+            <field name="sequence" eval="185"/>
+        </record>
+
+        <record id="hr_payslip_rule_ode" model="hr.salary.rule">
+            <field name="code">ODE</field>
+            <field name="name">Other Deduction from Employer</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">fix</field>
+            <field eval="-200.0" name="amount_fix"/>
+            <field name="appears_on_payslip" eval="False"/>
+            <field name="register_id" ref="hr_other_deduction_register"/>
+            <field name="sequence" eval="187"/>
+        </record>
+
+        <record id="hr_payslip_rule_ernps" model="hr.salary.rule">
+            <field name="code">ENPC</field>
+            <field name="name">Employer's NPS Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.10) 
+or - (contract.wage * 0.10))</field>
+            <field name="sequence" eval="190"/>
+            <field name="register_id" ref="hr_nps_contribution_register"/>
+            <field name="appears_on_payslip" eval="False"/>
+            <field name= "note">Any amount contributed by your employer to your NPS account is treated as part of your salary and is included in your income but you can claim deduction under Section 80C for this too.thus, effectively making it exempt from tax within the limit of 10% of your basic salary. This is very useful and tax efficient for you particularly if you fall in the maximum tax.</field>
+        </record>
+
+        <record id="hr_payslip_rule_erpf" model="hr.salary.rule">
+            <field name="code">EPF</field>
+            <field name="name">Employer's PF Contribution</field>
+            <field name="category_id" ref="hr_payroll.DED"/>
+            <field name="amount_select">code</field>
+            <field name="amount_python_compute">result = (payslip.company_id.dearness_allowance and - ((contract.wage + DA) * 0.12) 
+or - (contract.wage * 0.12))</field>
+            <field name="sequence" eval="195"/>
+            <field name="register_id" ref="hr_register_provident_fund"/>
+            <field name="appears_on_payslip" eval="False"/>
+            <field name="note">Both the employees and employer contribute to the fund at the rate of 12% of the basic wages, dearness allowance and retaining allowance, if any, payable to employees per month.</field>
+        </record>
+
+        <!-- Rule Inputs -->
+
+        <record id="hr_rule_input_performance" model="hr.rule.input">
+            <field name="code">PERF</field>
+            <field name="name">Performance of Employee</field>
+            <field name="input_id" ref="hr_salary_rule_performance"/>
+        </record>
+
+        <record id="hr_rule_input_bonus" model="hr.rule.input">
+            <field name="code">BNS</field>
+            <field name="name">Bonus of Employee</field>
+            <field name="input_id" ref="hr_salary_rule_bonus"/>
+        </record>
+
+        <record id="hr_rule_input_arrears" model="hr.rule.input">
+            <field name="code">ARS</field>
+            <field name="name">Arrears</field>
+            <field name="input_id" ref="hr_salary_rule_arrears"/>
+        </record>
+
+        <record id="hr_rule_input_le" model="hr.rule.input">
+            <field name="code">LE</field>
+            <field name="name">Leave Encashment</field>
+            <field name="input_id" ref="hr_salary_rule_le"/>
+        </record>
+
+        <record id="hr_rule_input_journals" model="hr.rule.input">
+            <field name="code">PJ</field>
+            <field name="name">Periodical Journals</field>
+            <field name="input_id" ref="hr_salary_rule_journals"/>
+        </record>
+
+        <record id="hr_rule_input_telephone" model="hr.rule.input">
+            <field name="code">TR</field>
+            <field name="name">Telephone Reimbursement</field>
+            <field name="input_id" ref="hr_salary_rule_telephone"/>
+        </record>
+
+        <record id="hr_rule_input_car" model="hr.rule.input">
+            <field name="code">CEI</field>
+            <field name="name">Car Expenses</field>
+            <field name="input_id" ref="hr_payroll_rule_car"/>
+        </record>
+
+        <record id="hr_rule_input_internet" model="hr.rule.input">
+            <field name="code">IE</field>
+            <field name="name">Internet Expence</field>
+            <field name="input_id" ref="hr_salary_rule_internet"/>
+        </record>
+
+        <record id="hr_rule_input_leave_avail" model="hr.rule.input">
+            <field name="code">LAI</field>
+            <field name="name">Leave Availed</field>
+            <field name="input_id" ref="hr_payslip_rule_dla"/>
+        </record>
+        <record id="hr_rule_input_medical" model="hr.rule.input">
+            <field name="code">MR</field>
+            <field name="name">Medical Reimbursement</field>
+            <field name="input_id" ref="hr_salary_rule_medical"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/i18n/bn.po b/addons/l10n_in_hr_payroll/i18n/bn.po
new file mode 100644
index 00000000000..f6580b2e853
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/bn.po
@@ -0,0 +1,941 @@
+# Bengali Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-10-10 12:31+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"Language-Team: Bengali <bn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,employee_bank_no:0
+msgid "Employee Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in draft state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Title"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice from"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
+msgid "Hr Salary Employee By Category Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Department"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "A/C no."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,driver_salay:0
+msgid "Driver Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
+msgid "Yearly Salary by Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.advice.line,company_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ","
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "to"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Total :"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payslip.run,available_advice:0
+msgid "Made Payment Advice?"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Advices which are paid using NEFT transfer"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,tds:0
+msgid "Amount for Tax Deduction at Source"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Month of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,batch_id:0
+msgid "Batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Other Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
+#: report:paylip.details.in:0
+msgid "Reference"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,medical_insurance:0
+msgid "Medical Insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Identification No"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+#: field:payment.advice.report,bysal:0
+#: report:payroll.advice:0
+msgid "By Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+#: field:payment.advice.report,cheque_nos:0
+msgid "Cheque Numbers"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
+msgid "Yearly Salary by Head"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Email"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payslip.run,available_advice:0
+msgid ""
+"If this box is checked which means that Payment Advice exists for current "
+"batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,debit_credit:0
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.employee.bymonth:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
+msgid "Print Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
+#: view:payment.advice.report:0
+msgid "Advices Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid ""
+"This wizard will print report which displays employees break-up of Net Head "
+"for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc:0
+msgid "IFSC"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:res.company,dearness_allowance:0
+msgid "Dearness Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in confirm state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "or"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
+msgid "Hr Salary Employee By Month Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, python-format
+msgid ""
+"Payment advice already exists for %s, 'Set to Draft' to create a new advice."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "To Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: selection:payment.advice.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
+msgid "Payment Advice Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Status"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,city_type:0
+msgid "Type of City"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:res.company,dearness_allowance:0
+msgid "Check this box if your company provide Dearness Allowance to employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc_code:0
+#: field:payment.advice.report,ifsc_code:0
+#: report:payroll.advice:0
+msgid "IFSC Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,nbr:0
+msgid "# Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:payment.advice.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
+msgid "This report performs analysis on Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Designation"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "Pay Head Employee Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:payroll.advice:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice.line:0
+msgid "Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "To,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid "Check this box if you provide allowance for driver"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+#: field:hr.payslip,advice_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Other No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,neft:0
+msgid "Check this box if your company use online transfer for salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Day of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid ""
+"This wizard will print report which display a pay head employee breakup for "
+"a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Total Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.report,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Compute Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Payroll"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "NEFT"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,bank_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,bank_id:0
+#: report:payroll.advice:0
+#: report:salary.detail.byyear:0
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,end_date:0
+#: field:yearly.salary.detail,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,name:0
+#: report:paylip.details.in:0
+#: field:payment.advice.report,name:0
+#: report:salary.employee.bymonth:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: field:hr.salary.employee.month,employee_ids:0
+#: view:yearly.salary.detail:0
+#: field:yearly.salary.detail,employee_ids:0
+msgid "Employees"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employe"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,start_date:0
+#: field:yearly.salary.detail,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank from which the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "Employee Pay Head Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Phone No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Credit"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,name:0
+#: report:payroll.advice:0
+msgid "Bank Account No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,date:0
+msgid "Advice Date is used to search Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Create Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,neft:0
+#: field:payment.advice.report,neft:0
+msgid "NEFT Transaction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "form period"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
diff --git a/addons/l10n_in_hr_payroll/i18n/es.po b/addons/l10n_in_hr_payroll/i18n/es.po
new file mode 100644
index 00000000000..52f443733fb
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/es.po
@@ -0,0 +1,942 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-11-12 17:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-13 05:17+0000\n"
+"X-Generator: Launchpad (build 16251)\n"
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,employee_bank_no:0
+msgid "Employee Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in draft state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Title"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice from"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
+msgid "Hr Salary Employee By Category Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Department"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "A/C no."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,driver_salay:0
+msgid "Driver Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
+msgid "Yearly Salary by Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.advice.line,company_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ","
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "to"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Total :"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payslip.run,available_advice:0
+msgid "Made Payment Advice?"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Advices which are paid using NEFT transfer"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,tds:0
+msgid "Amount for Tax Deduction at Source"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Month of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,batch_id:0
+msgid "Batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Other Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
+#: report:paylip.details.in:0
+msgid "Reference"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,medical_insurance:0
+msgid "Medical Insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Identification No"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+#: field:payment.advice.report,bysal:0
+#: report:payroll.advice:0
+msgid "By Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+#: field:payment.advice.report,cheque_nos:0
+msgid "Cheque Numbers"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
+msgid "Yearly Salary by Head"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Email"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payslip.run,available_advice:0
+msgid ""
+"If this box is checked which means that Payment Advice exists for current "
+"batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,debit_credit:0
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.employee.bymonth:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
+msgid "Print Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
+#: view:payment.advice.report:0
+msgid "Advices Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid ""
+"This wizard will print report which displays employees break-up of Net Head "
+"for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc:0
+msgid "IFSC"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:res.company,dearness_allowance:0
+msgid "Dearness Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in confirm state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "or"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
+msgid "Hr Salary Employee By Month Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, python-format
+msgid ""
+"Payment advice already exists for %s, 'Set to Draft' to create a new advice."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "To Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: selection:payment.advice.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
+msgid "Payment Advice Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Status"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,city_type:0
+msgid "Type of City"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:res.company,dearness_allowance:0
+msgid "Check this box if your company provide Dearness Allowance to employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc_code:0
+#: field:payment.advice.report,ifsc_code:0
+#: report:payroll.advice:0
+msgid "IFSC Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,nbr:0
+msgid "# Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:payment.advice.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
+msgid "This report performs analysis on Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Designation"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "Pay Head Employee Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:payroll.advice:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice.line:0
+msgid "Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "To,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid "Check this box if you provide allowance for driver"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+#: field:hr.payslip,advice_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Other No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,neft:0
+msgid "Check this box if your company use online transfer for salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Day of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid ""
+"This wizard will print report which display a pay head employee breakup for "
+"a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Total Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.report,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Compute Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Payroll"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "NEFT"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,bank_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,bank_id:0
+#: report:payroll.advice:0
+#: report:salary.detail.byyear:0
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,end_date:0
+#: field:yearly.salary.detail,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,name:0
+#: report:paylip.details.in:0
+#: field:payment.advice.report,name:0
+#: report:salary.employee.bymonth:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: field:hr.salary.employee.month,employee_ids:0
+#: view:yearly.salary.detail:0
+#: field:yearly.salary.detail,employee_ids:0
+msgid "Employees"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employe"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,start_date:0
+#: field:yearly.salary.detail,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank from which the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "Employee Pay Head Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Phone No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Credit"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,name:0
+#: report:payroll.advice:0
+msgid "Bank Account No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,date:0
+msgid "Advice Date is used to search Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Create Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,neft:0
+#: field:payment.advice.report,neft:0
+msgid "NEFT Transaction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "form period"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
diff --git a/addons/l10n_in_hr_payroll/i18n/gu.po b/addons/l10n_in_hr_payroll/i18n/gu.po
new file mode 100644
index 00000000000..b1fac643c04
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/gu.po
@@ -0,0 +1,941 @@
+# Gujarati Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-10-10 12:31+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,employee_bank_no:0
+msgid "Employee Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in draft state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Title"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice from"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
+msgid "Hr Salary Employee By Category Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Department"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "A/C no."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,driver_salay:0
+msgid "Driver Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
+msgid "Yearly Salary by Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.advice.line,company_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ","
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "to"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Total :"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payslip.run,available_advice:0
+msgid "Made Payment Advice?"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Advices which are paid using NEFT transfer"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,tds:0
+msgid "Amount for Tax Deduction at Source"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Month of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,batch_id:0
+msgid "Batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Other Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
+#: report:paylip.details.in:0
+msgid "Reference"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,medical_insurance:0
+msgid "Medical Insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Identification No"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+#: field:payment.advice.report,bysal:0
+#: report:payroll.advice:0
+msgid "By Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+#: field:payment.advice.report,cheque_nos:0
+msgid "Cheque Numbers"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
+msgid "Yearly Salary by Head"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Email"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payslip.run,available_advice:0
+msgid ""
+"If this box is checked which means that Payment Advice exists for current "
+"batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,debit_credit:0
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.employee.bymonth:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
+msgid "Print Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
+#: view:payment.advice.report:0
+msgid "Advices Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid ""
+"This wizard will print report which displays employees break-up of Net Head "
+"for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc:0
+msgid "IFSC"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:res.company,dearness_allowance:0
+msgid "Dearness Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in confirm state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "or"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
+msgid "Hr Salary Employee By Month Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, python-format
+msgid ""
+"Payment advice already exists for %s, 'Set to Draft' to create a new advice."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "To Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: selection:payment.advice.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
+msgid "Payment Advice Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Status"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,city_type:0
+msgid "Type of City"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:res.company,dearness_allowance:0
+msgid "Check this box if your company provide Dearness Allowance to employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc_code:0
+#: field:payment.advice.report,ifsc_code:0
+#: report:payroll.advice:0
+msgid "IFSC Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,nbr:0
+msgid "# Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:payment.advice.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
+msgid "This report performs analysis on Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Designation"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "Pay Head Employee Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:payroll.advice:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice.line:0
+msgid "Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "To,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid "Check this box if you provide allowance for driver"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+#: field:hr.payslip,advice_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Other No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,neft:0
+msgid "Check this box if your company use online transfer for salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Day of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid ""
+"This wizard will print report which display a pay head employee breakup for "
+"a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Total Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.report,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Compute Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Payroll"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "NEFT"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,bank_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,bank_id:0
+#: report:payroll.advice:0
+#: report:salary.detail.byyear:0
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,end_date:0
+#: field:yearly.salary.detail,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,name:0
+#: report:paylip.details.in:0
+#: field:payment.advice.report,name:0
+#: report:salary.employee.bymonth:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: field:hr.salary.employee.month,employee_ids:0
+#: view:yearly.salary.detail:0
+#: field:yearly.salary.detail,employee_ids:0
+msgid "Employees"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employe"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,start_date:0
+#: field:yearly.salary.detail,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank from which the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "Employee Pay Head Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Phone No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Credit"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,name:0
+#: report:payroll.advice:0
+msgid "Bank Account No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,date:0
+msgid "Advice Date is used to search Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Create Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,neft:0
+#: field:payment.advice.report,neft:0
+msgid "NEFT Transaction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "form period"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
diff --git a/addons/l10n_in_hr_payroll/i18n/hi.po b/addons/l10n_in_hr_payroll/i18n/hi.po
new file mode 100644
index 00000000000..26053cb02a8
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/hi.po
@@ -0,0 +1,941 @@
+# Hindi Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-10-10 12:31+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"Language-Team: Hindi <hi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,employee_bank_no:0
+msgid "Employee Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in draft state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Title"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice from"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
+msgid "Hr Salary Employee By Category Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Department"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "A/C no."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,driver_salay:0
+msgid "Driver Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
+msgid "Yearly Salary by Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.advice.line,company_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ","
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "to"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Total :"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payslip.run,available_advice:0
+msgid "Made Payment Advice?"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Advices which are paid using NEFT transfer"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,tds:0
+msgid "Amount for Tax Deduction at Source"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Month of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,batch_id:0
+msgid "Batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Other Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
+#: report:paylip.details.in:0
+msgid "Reference"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,medical_insurance:0
+msgid "Medical Insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Identification No"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+#: field:payment.advice.report,bysal:0
+#: report:payroll.advice:0
+msgid "By Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+#: field:payment.advice.report,cheque_nos:0
+msgid "Cheque Numbers"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
+msgid "Yearly Salary by Head"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Email"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payslip.run,available_advice:0
+msgid ""
+"If this box is checked which means that Payment Advice exists for current "
+"batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,debit_credit:0
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.employee.bymonth:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
+msgid "Print Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
+#: view:payment.advice.report:0
+msgid "Advices Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid ""
+"This wizard will print report which displays employees break-up of Net Head "
+"for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc:0
+msgid "IFSC"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:res.company,dearness_allowance:0
+msgid "Dearness Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in confirm state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "or"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
+msgid "Hr Salary Employee By Month Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, python-format
+msgid ""
+"Payment advice already exists for %s, 'Set to Draft' to create a new advice."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "To Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: selection:payment.advice.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
+msgid "Payment Advice Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Status"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,city_type:0
+msgid "Type of City"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:res.company,dearness_allowance:0
+msgid "Check this box if your company provide Dearness Allowance to employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc_code:0
+#: field:payment.advice.report,ifsc_code:0
+#: report:payroll.advice:0
+msgid "IFSC Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,nbr:0
+msgid "# Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:payment.advice.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
+msgid "This report performs analysis on Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Designation"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "Pay Head Employee Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:payroll.advice:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice.line:0
+msgid "Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "To,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid "Check this box if you provide allowance for driver"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+#: field:hr.payslip,advice_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Other No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,neft:0
+msgid "Check this box if your company use online transfer for salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Day of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid ""
+"This wizard will print report which display a pay head employee breakup for "
+"a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Total Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.report,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Compute Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Payroll"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "NEFT"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,bank_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,bank_id:0
+#: report:payroll.advice:0
+#: report:salary.detail.byyear:0
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,end_date:0
+#: field:yearly.salary.detail,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,name:0
+#: report:paylip.details.in:0
+#: field:payment.advice.report,name:0
+#: report:salary.employee.bymonth:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: field:hr.salary.employee.month,employee_ids:0
+#: view:yearly.salary.detail:0
+#: field:yearly.salary.detail,employee_ids:0
+msgid "Employees"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employe"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,start_date:0
+#: field:yearly.salary.detail,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank from which the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "Employee Pay Head Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Phone No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Credit"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,name:0
+#: report:payroll.advice:0
+msgid "Bank Account No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,date:0
+msgid "Advice Date is used to search Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Create Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,neft:0
+#: field:payment.advice.report,neft:0
+msgid "NEFT Transaction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "form period"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
diff --git a/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
new file mode 100644
index 00000000000..552f85b5997
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/l10n_in_hr_payroll.pot
@@ -0,0 +1,933 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-08-17 06: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: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,employee_bank_no:0
+msgid "Employee Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in draft state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Title"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice from"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
+msgid "Hr Salary Employee By Category Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Department"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "A/C no."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,driver_salay:0
+msgid "Driver Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
+msgid "Yearly Salary by Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.advice.line,company_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ","
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "to"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Total :"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payslip.run,available_advice:0
+msgid "Made Payment Advice?"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Advices which are paid using NEFT transfer"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,tds:0
+msgid "Amount for Tax Deduction at Source"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Month of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,batch_id:0
+msgid "Batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Other Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
+#: report:paylip.details.in:0
+msgid "Reference"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,medical_insurance:0
+msgid "Medical Insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Identification No"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+#: field:payment.advice.report,bysal:0
+#: report:payroll.advice:0
+msgid "By Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+#: field:payment.advice.report,cheque_nos:0
+msgid "Cheque Numbers"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
+msgid "Yearly Salary by Head"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Email"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payslip.run,available_advice:0
+msgid "If this box is checked which means that Payment Advice exists for current batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,debit_credit:0
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.employee.bymonth:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
+msgid "Print Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
+#: view:payment.advice.report:0
+msgid "Advices Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc:0
+msgid "IFSC"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:res.company,dearness_allowance:0
+msgid "Dearness Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in confirm state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "or"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
+msgid "Hr Salary Employee By Month Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, python-format
+msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "To Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: selection:payment.advice.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
+msgid "Payment Advice Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Status"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,city_type:0
+msgid "Type of City"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:res.company,dearness_allowance:0
+msgid "Check this box if your company provide Dearness Allowance to employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc_code:0
+#: field:payment.advice.report,ifsc_code:0
+#: report:payroll.advice:0
+msgid "IFSC Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,nbr:0
+msgid "# Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:payment.advice.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
+msgid "This report performs analysis on Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Designation"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "Pay Head Employee Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:payroll.advice:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice.line:0
+msgid "Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "To,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid "Check this box if you provide allowance for driver"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+#: field:hr.payslip,advice_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Other No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,neft:0
+msgid "Check this box if your company use online transfer for salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Day of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "This wizard will print report which display a pay head employee breakup for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Total Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.report,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Compute Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr "Dear Sir/Madam,"
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Payroll"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "NEFT"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,bank_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,bank_id:0
+#: report:payroll.advice:0
+#: report:salary.detail.byyear:0
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,end_date:0
+#: field:yearly.salary.detail,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,name:0
+#: report:paylip.details.in:0
+#: field:payment.advice.report,name:0
+#: report:salary.employee.bymonth:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: field:hr.salary.employee.month,employee_ids:0
+#: view:yearly.salary.detail:0
+#: field:yearly.salary.detail,employee_ids:0
+msgid "Employees"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employe"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,start_date:0
+#: field:yearly.salary.detail,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank from which the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "Employee Pay Head Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Phone No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Credit"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,name:0
+#: report:payroll.advice:0
+msgid "Bank Account No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,date:0
+msgid "Advice Date is used to search Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Create Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,neft:0
+#: field:payment.advice.report,neft:0
+msgid "NEFT Transaction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "form period"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/ta.po b/addons/l10n_in_hr_payroll/i18n/ta.po
new file mode 100644
index 00000000000..16b4519a734
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/ta.po
@@ -0,0 +1,941 @@
+# Tamil Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-10-10 12:31+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"Language-Team: Tamil <ta@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,employee_bank_no:0
+msgid "Employee Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in draft state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Title"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice from"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
+msgid "Hr Salary Employee By Category Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Department"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "A/C no."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,driver_salay:0
+msgid "Driver Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
+msgid "Yearly Salary by Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.advice.line,company_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ","
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "to"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Total :"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payslip.run,available_advice:0
+msgid "Made Payment Advice?"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Advices which are paid using NEFT transfer"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,tds:0
+msgid "Amount for Tax Deduction at Source"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Month of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,batch_id:0
+msgid "Batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Other Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
+#: report:paylip.details.in:0
+msgid "Reference"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,medical_insurance:0
+msgid "Medical Insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Identification No"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+#: field:payment.advice.report,bysal:0
+#: report:payroll.advice:0
+msgid "By Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+#: field:payment.advice.report,cheque_nos:0
+msgid "Cheque Numbers"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
+msgid "Yearly Salary by Head"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Email"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payslip.run,available_advice:0
+msgid ""
+"If this box is checked which means that Payment Advice exists for current "
+"batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,debit_credit:0
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.employee.bymonth:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
+msgid "Print Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
+#: view:payment.advice.report:0
+msgid "Advices Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid ""
+"This wizard will print report which displays employees break-up of Net Head "
+"for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc:0
+msgid "IFSC"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:res.company,dearness_allowance:0
+msgid "Dearness Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in confirm state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "or"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
+msgid "Hr Salary Employee By Month Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, python-format
+msgid ""
+"Payment advice already exists for %s, 'Set to Draft' to create a new advice."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "To Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: selection:payment.advice.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
+msgid "Payment Advice Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Status"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,city_type:0
+msgid "Type of City"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:res.company,dearness_allowance:0
+msgid "Check this box if your company provide Dearness Allowance to employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc_code:0
+#: field:payment.advice.report,ifsc_code:0
+#: report:payroll.advice:0
+msgid "IFSC Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,nbr:0
+msgid "# Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:payment.advice.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
+msgid "This report performs analysis on Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Designation"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "Pay Head Employee Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:payroll.advice:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice.line:0
+msgid "Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "To,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid "Check this box if you provide allowance for driver"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+#: field:hr.payslip,advice_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Other No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,neft:0
+msgid "Check this box if your company use online transfer for salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Day of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid ""
+"This wizard will print report which display a pay head employee breakup for "
+"a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Total Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.report,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Compute Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Payroll"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "NEFT"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,bank_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,bank_id:0
+#: report:payroll.advice:0
+#: report:salary.detail.byyear:0
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,end_date:0
+#: field:yearly.salary.detail,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,name:0
+#: report:paylip.details.in:0
+#: field:payment.advice.report,name:0
+#: report:salary.employee.bymonth:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: field:hr.salary.employee.month,employee_ids:0
+#: view:yearly.salary.detail:0
+#: field:yearly.salary.detail,employee_ids:0
+msgid "Employees"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employe"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,start_date:0
+#: field:yearly.salary.detail,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank from which the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "Employee Pay Head Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Phone No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Credit"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,name:0
+#: report:payroll.advice:0
+msgid "Bank Account No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,date:0
+msgid "Advice Date is used to search Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Create Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,neft:0
+#: field:payment.advice.report,neft:0
+msgid "NEFT Transaction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "form period"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
diff --git a/addons/l10n_in_hr_payroll/i18n/te.po b/addons/l10n_in_hr_payroll/i18n/te.po
new file mode 100644
index 00000000000..c2042b2c77c
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/i18n/te.po
@@ -0,0 +1,941 @@
+# Telugu Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * l10n_in_hr_payroll
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-17 06:46+0000\n"
+"PO-Revision-Date: 2012-10-10 12:31+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"Language-Team: Telugu <te@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "E-mail Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,employee_bank_no:0
+msgid "Employee Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in draft state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Title"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Payment Advice from"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
+msgid "Hr Salary Employee By Category Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employees Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Allowances with Basic:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Department"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Deductions:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "A/C no."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,driver_salay:0
+msgid "Driver Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
+msgid "Yearly Salary by Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
+msgid "Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "("
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,company_id:0
+#: field:hr.payroll.advice.line,company_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "The Manager"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Letter Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ","
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,number_of_year:0
+msgid "Total years of work experience"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "to"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Total :"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payslip.run,available_advice:0
+msgid "Made Payment Advice?"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Advices which are paid using NEFT transfer"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,tds:0
+msgid "Amount for Tax Deduction at Source"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
+msgid "Pay Slip"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Month of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,batch_id:0
+msgid "Batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Other Information"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "For"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,voluntary_provident_fund:0
+msgid "VPF computed as percentage(%)"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,number:0
+#: report:paylip.details.in:0
+msgid "Reference"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,medical_insurance:0
+msgid "Medical Insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Identification No"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.payroll.advice,state:0
+#: selection:payment.advice.report,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,bysal:0
+#: field:payment.advice.report,bysal:0
+#: report:payroll.advice:0
+msgid "By Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Confirm"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,chaque_nos:0
+#: field:payment.advice.report,cheque_nos:0
+msgid "Cheque Numbers"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
+msgid "Yearly Salary by Head"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#, python-format
+msgid "You can not confirm Payment advice without advice lines."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,state:0
+#: field:payment.advice.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Yours Sincerely"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,medical_insurance:0
+msgid "Deduction towards company provided medical insurance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
+msgid "Bank Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Email"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payslip.run,available_advice:0
+msgid ""
+"If this box is checked which means that Payment Advice exists for current "
+"batch"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Print"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,debit_credit:0
+#: report:payroll.advice:0
+msgid "C/D"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.employee.bymonth:0
+msgid "Yearly Salary Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
+msgid "Print Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,line_ids:0
+msgid "Employee Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
+msgid "Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
+#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
+#: view:payment.advice.report:0
+msgid "Advices Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid ""
+"This wizard will print report which displays employees break-up of Net Head "
+"for a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc:0
+msgid "IFSC"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,tds:0
+msgid "TDS"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,join_date:0
+msgid "Join Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.contract:0
+msgid "Error! Contract start-date must be less than contract end-date."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:res.company,dearness_allowance:0
+msgid "Dearness Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Deduction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Search Payment advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "SI. No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Payment Advices which are in confirm state"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Confirm Sheet"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Non Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "or"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
+msgid "Hr Salary Employee By Month Report"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
+#, python-format
+msgid ""
+"Payment advice already exists for %s, 'Set to Draft' to create a new advice."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "To Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.employee,number_of_year:0
+msgid "No. of Years of Service"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Note"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: selection:hr.payroll.advice,state:0
+#: view:payment.advice.report:0
+#: selection:payment.advice.report,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Date From"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,voluntary_provident_fund:0
+msgid "Voluntary Provident Fund"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Employee Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
+msgid "Payment Advice Analysis"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:payment.advice.report:0
+msgid "Status"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.contract,city_type:0
+msgid "Type of City"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:res.company,dearness_allowance:0
+msgid "Check this box if your company provide Dearness Allowance to employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,ifsc_code:0
+#: field:payment.advice.report,ifsc_code:0
+#: report:payroll.advice:0
+msgid "IFSC Code"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,nbr:0
+msgid "# Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,date:0
+#: field:payment.advice.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
+msgid "This report performs analysis on Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Designation"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid "Pay Head Employee Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:payroll.advice:0
+msgid "Authorized Signature"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
+msgid "Contract"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice.line:0
+msgid "Advice Lines"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "To,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.contract,driver_salay:0
+msgid "Check this box if you provide allowance for driver"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice.line,advice_id:0
+#: field:hr.payslip,advice_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
+msgid "Bank Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Other No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Draft Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,neft:0
+msgid "Check this box if your company use online transfer for salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "To"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:payment.advice.report,number:0
+msgid "Number"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: view:hr.salary.employee.month:0
+#: view:yearly.salary.detail:0
+msgid "Cancel"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Day of Payment Advices"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: constraint:hr.employee:0
+msgid "Error! You cannot create recursive hierarchy of Employee(s)."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:yearly.salary.detail:0
+msgid ""
+"This wizard will print report which display a pay head employee breakup for "
+"a specified dates."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Payslip Batches ready to be Adviced"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Total Salary"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,employee_id:0
+#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
+#: view:payment.advice.report:0
+#: field:payment.advice.report,employee_id:0
+msgid "Employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+msgid "Compute Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.employee,join_date:0
+msgid "Joining date of employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Dear Sir/Madam,"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,note:0
+msgid "Description"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid ")"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:res.company:0
+msgid "Payroll"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "NEFT"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+msgid "Address"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,bank_id:0
+#: view:payment.advice.report:0
+#: field:payment.advice.report,bank_id:0
+#: report:payroll.advice:0
+#: report:salary.detail.byyear:0
+msgid "Bank"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,end_date:0
+#: field:yearly.salary.detail,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payroll.advice:0
+#: field:hr.payroll.advice,name:0
+#: report:paylip.details.in:0
+#: field:payment.advice.report,name:0
+#: report:salary.employee.bymonth:0
+msgid "Name"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:hr.contract,city_type:0
+msgid "Metro"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+#: field:hr.salary.employee.month,employee_ids:0
+#: view:yearly.salary.detail:0
+#: field:yearly.salary.detail,employee_ids:0
+msgid "Employees"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "Name of the Employe"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
+#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
+#, python-format
+msgid "Please define bank account for the %s employee"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.salary.employee.month,start_date:0
+#: field:yearly.salary.detail,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.contract:0
+msgid "Allowance"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,bank_id:0
+msgid "Select the Bank from which the salary is going to be paid"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.salary.employee.month:0
+msgid "Employee Pay Head Breakup"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:salary.detail.byyear:0
+msgid "Phone No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+msgid "Credit"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice.line,name:0
+#: report:payroll.advice:0
+msgid "Bank Account No."
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: help:hr.payroll.advice,date:0
+msgid "Advice Date is used to search Payslips"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: selection:payment.advice.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:hr.payslip.run:0
+msgid "Create Advice"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+#: field:payment.advice.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: field:hr.payroll.advice,neft:0
+#: field:payment.advice.report,neft:0
+msgid "NEFT Transaction"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:paylip.details.in:0
+#: report:salary.detail.byyear:0
+#: report:salary.employee.bymonth:0
+msgid "Total"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: report:payroll.advice:0
+msgid "form period"
+msgstr ""
+
+#. module: l10n_in_hr_payroll
+#: view:payment.advice.report:0
+msgid "Year of Payment Advices"
+msgstr ""
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
new file mode 100644
index 00000000000..b7c3926d727
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py
@@ -0,0 +1,283 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+from calendar import isleap
+
+from tools.translate import _
+from osv import fields, osv
+import netsvc
+import decimal_precision as dp
+
+DATETIME_FORMAT = "%Y-%m-%d"
+
+class hr_contract(osv.osv):
+    """
+    Employee contract allows to add different values in fields.
+    Fields are used in salary rule computation.
+    """
+
+    _inherit = 'hr.contract'
+    _description = 'HR Contract'
+
+    _columns = {
+        'tds': fields.float('TDS', digits_compute=dp.get_precision('Payroll'), help="Amount for Tax Deduction at Source"),
+        'driver_salay': fields.boolean('Driver Salary', help="Check this box if you provide allowance for driver"),
+        'medical_insurance': fields.float('Medical Insurance', digits_compute=dp.get_precision('Payroll'), help="Deduction towards company provided medical insurance"),
+        'voluntary_provident_fund': fields.float('Voluntary Provident Fund (%)', digits_compute=dp.get_precision('Payroll'), help="VPF is a safe option wherein you can contribute more than the PF ceiling of 12% that has been mandated by the government and VPF computed as percentage(%)"),
+        'house_rent_allowance_metro_nonmetro': fields.float('House Rent Allowance (%)', digits_compute=dp.get_precision('Payroll'), help="HRA is an allowance given by the employer to the employee for taking care of his rental or accommodation expenses for metro city it is 50 % and for non metro 40%.HRA computed as percentage(%)"),
+        'supplementary_allowance': fields.float('Supplementary Allowance', digits_compute=dp.get_precision('Payroll')),
+    }
+
+hr_contract()
+
+class payroll_advice(osv.osv):
+    '''
+    Bank Advice
+    '''
+    _name = 'hr.payroll.advice'
+    _description = 'Bank Advice'
+    _columns = {
+        'name':fields.char('Name', size=32, readonly=True, required=True, states={'draft': [('readonly', False)]},),
+        'note': fields.text('Description'),
+        'date': fields.date('Date', readonly=True, required=True, states={'draft': [('readonly', False)]}, help="Advice Date is used to search Payslips"),
+        'state':fields.selection([
+            ('draft', 'Draft'),
+            ('confirm', 'Confirmed'),
+            ('cancel', 'Cancelled'),
+        ], 'Status', select=True, readonly=True),
+        'number':fields.char('Reference', size=16, readonly=True),
+        'line_ids':fields.one2many('hr.payroll.advice.line', 'advice_id', 'Employee Salary', states={'draft': [('readonly', False)]}, readonly=True),
+        'chaque_nos':fields.char('Cheque Numbers', size=256),
+        'neft': fields.boolean('NEFT Transaction', help="Check this box if your company use online transfer for salary"),
+        'company_id':fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'bank_id':fields.many2one('res.bank', 'Bank', readonly=True, states={'draft': [('readonly', False)]}, help="Select the Bank from which the salary is going to be paid"),
+        'batch_id': fields.many2one('hr.payslip.run', 'Batch', readonly=True)
+    }
+
+    _defaults = {
+        'date': lambda * a: time.strftime('%Y-%m-%d'),
+        'state': lambda * a: 'draft',
+        'company_id': lambda self, cr, uid, context: \
+                self.pool.get('res.users').browse(cr, uid, uid,
+                    context=context).company_id.id,
+        'note': "Please make the payroll transfer from above account number to the below mentioned account numbers towards employee salaries:"
+    }
+
+    def compute_advice(self, cr, uid, ids, context=None):
+        """
+        Advice - Create Advice lines in Payment Advice and
+        compute Advice lines.
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of Advice’s IDs
+        @return: Advice lines
+        @param context: A standard dictionary for contextual values
+        """
+        payslip_pool = self.pool.get('hr.payslip')
+        advice_line_pool = self.pool.get('hr.payroll.advice.line')
+        payslip_line_pool = self.pool.get('hr.payslip.line')
+
+        for advice in self.browse(cr, uid, ids, context=context):
+            old_line_ids = advice_line_pool.search(cr, uid, [('advice_id', '=', advice.id)], context=context)
+            if old_line_ids:
+                advice_line_pool.unlink(cr, uid, old_line_ids, context=context)
+            slip_ids = payslip_pool.search(cr, uid, [('date_from', '<=', advice.date), ('date_to', '>=', advice.date), ('state', '=', 'done')], context=context)
+            for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
+                if not slip.employee_id.bank_account_id and not slip.employee_id.bank_account_id.acc_number:
+                    raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
+                line_ids = payslip_line_pool.search(cr, uid, [ ('slip_id', '=', slip.id), ('code', '=', 'NET')], context=context)
+                if line_ids:
+                    line = payslip_line_pool.browse(cr, uid, line_ids, context=context)[0]
+                    advice_line = {
+                            'advice_id': advice.id,
+                            'name': slip.employee_id.bank_account_id.acc_number,
+                            'employee_id': slip.employee_id.id,
+                            'bysal': line.total
+                            }
+                    advice_line_pool.create(cr, uid, advice_line, context=context)
+                payslip_pool.write(cr, uid, slip_ids, {'advice_id': advice.id}, context=context)
+        return True
+
+    def confirm_sheet(self, cr, uid, ids, context=None):
+        """
+        confirm Advice - confirmed Advice after computing Advice Lines..
+        @param cr: the current row, from the database cursor,
+        @param uid: the current user’s ID for security checks,
+        @param ids: List of confirm Advice’s IDs
+        @return: confirmed Advice lines and set sequence of Advice.
+        @param context: A standard dictionary for contextual values
+        """
+        seq_obj = self.pool.get('ir.sequence')
+        for advice in self.browse(cr, uid, ids, context=context):
+            if not advice.line_ids:
+                raise osv.except_osv(_('Error !'), _('You can not confirm Payment advice without advice lines.'))
+            advice_date = datetime.strptime(advice.date, DATETIME_FORMAT)
+            advice_year = advice_date.strftime('%m') + '-' + advice_date.strftime('%Y')
+            number = seq_obj.get(cr, uid, 'payment.advice')
+            sequence_num = 'PAY' + '/' + advice_year + '/' + number
+            self.write(cr, uid, [advice.id], {'number': sequence_num, 'state': 'confirm'}, context=context)
+        return True
+
+    def set_to_draft(self, cr, uid, ids, context=None):
+        """Resets Advice as draft.
+        """
+        return self.write(cr, uid, ids, {'state':'draft'}, context=context)
+
+    def cancel_sheet(self, cr, uid, ids, context=None):
+        """Marks Advice as cancelled.
+        """
+        return self.write(cr, uid, ids, {'state':'cancel'}, context=context)
+
+    def onchange_company_id(self, cr, uid, ids, company_id=False, context=None):
+        res = {}
+        if company_id:
+            company = self.pool.get('res.company').browse(cr, uid, [company_id], context=context)[0]
+            if company.partner_id.bank_ids:
+                res.update({'bank_id': company.partner_id.bank_ids[0].bank.id})
+        return {
+            'value':res
+        }
+payroll_advice()
+
+class hr_payslip_run(osv.osv):
+
+    _inherit = 'hr.payslip.run'
+    _description = 'Payslip Batches'
+    _columns = {
+        'available_advice': fields.boolean('Made Payment Advice?', help="If this box is checked which means that Payment Advice exists for current batch", readonly=False),
+    }
+    def copy(self, cr, uid, id, default={}, context=None):
+        if not default:
+            default = {}
+        default.update({'available_advice': False})
+        return super(hr_payslip_run, self).copy(cr, uid, id, default, context=context)    
+
+    def draft_payslip_run(self, cr, uid, ids, context=None):
+        res = super(hr_payslip_run, self).draft_payslip_run(cr, uid, ids, context=context)
+        self.write(cr, uid, ids, {'available_advice': False}, context=context)
+        return res
+    
+    def create_advice(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        payslip_pool = self.pool.get('hr.payslip')
+        payslip_line_pool = self.pool.get('hr.payslip.line')
+        advice_pool = self.pool.get('hr.payroll.advice')
+        advice_line_pool = self.pool.get('hr.payroll.advice.line')
+        users = self.pool.get('res.users').browse(cr, uid, [uid], context=context)
+        for run in self.browse(cr, uid, ids, context=context):
+            if run.available_advice:
+                raise osv.except_osv(_('Error !'), _("Payment advice already exists for %s, 'Set to Draft' to create a new advice.") %(run.name))
+            advice_data = {
+                        'batch_id': run.id,
+                        'company_id': users[0].company_id.id,
+                        'name': run.name,
+                        'date': run.date_end,
+                        'bank_id': users[0].company_id.bank_ids and users[0].company_id.bank_ids[0].id or False
+                    }
+            advice_id = advice_pool.create(cr, uid, advice_data, context=context)
+            slip_ids = []
+            for slip_id in run.slip_ids:
+                wf_service.trg_validate(uid, 'hr.payslip', slip_id.id, 'hr_verify_sheet', cr)
+                wf_service.trg_validate(uid, 'hr.payslip', slip_id.id, 'process_sheet', cr)
+                slip_ids.append(slip_id.id)
+
+            for slip in payslip_pool.browse(cr, uid, slip_ids, context=context):
+                if not slip.employee_id.bank_account_id or not slip.employee_id.bank_account_id.acc_number:
+                    raise osv.except_osv(_('Error !'), _('Please define bank account for the %s employee') % (slip.employee_id.name))
+                line_ids = payslip_line_pool.search(cr, uid, [('slip_id', '=', slip.id), ('code', '=', 'NET')], context=context)
+                if line_ids:
+                    line = payslip_line_pool.browse(cr, uid, line_ids, context=context)[0]
+                    advice_line = {
+                            'advice_id': advice_id,
+                            'name': slip.employee_id.bank_account_id.acc_number,
+                            'employee_id': slip.employee_id.id,
+                            'bysal': line.total
+                    }
+                    advice_line_pool.create(cr, uid, advice_line, context=context)
+        return self.write(cr, uid, ids, {'available_advice' : True})
+
+hr_payslip_run()
+
+class payroll_advice_line(osv.osv):
+    '''
+    Bank Advice Lines
+    '''
+    def onchange_employee_id(self, cr, uid, ids, employee_id=False, context=None):
+        res = {}
+        hr_obj = self.pool.get('hr.employee')
+        if not employee_id:
+            return {'value': res}
+        employee = hr_obj.browse(cr, uid, [employee_id], context=context)[0]
+        res.update({'name': employee.bank_account_id.acc_number , 'ifsc_code': employee.bank_account_id.bank_bic or ''})
+        return {'value': res}
+
+    _name = 'hr.payroll.advice.line'
+    _description = 'Bank Advice Lines'
+    _columns = {
+        'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice'),
+        'name': fields.char('Bank Account No.', size=25, required=True),
+        'ifsc_code': fields.char('IFSC Code', size=16),
+        'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
+        'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
+        'debit_credit': fields.char('C/D', size=3, required=False),
+        'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
+        'ifsc': fields.related('advice_id', 'neft', type='boolean', string='IFSC'),
+    }
+    _defaults = {
+        'debit_credit': 'C',
+    }
+
+payroll_advice_line()
+
+class hr_payslip(osv.osv):
+    '''
+    Employee Pay Slip
+    '''
+    _inherit = 'hr.payslip'
+    _description = 'Pay Slips'
+    _columns = {
+        'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice')
+    }
+
+    def copy(self, cr, uid, id, default={}, context=None):
+        if not default:
+            default = {}
+        default.update({'advice_id' : False})
+        return super(hr_payslip, self).copy(cr, uid, id, default, context=context)
+
+hr_payslip()
+
+class res_company(osv.osv):
+
+    _inherit = 'res.company'
+    _columns = {
+        'dearness_allowance': fields.boolean('Dearness Allowance', help="Check this box if your company provide Dearness Allowance to employee")
+    }
+    _defaults = {
+        'dearness_allowance': True,
+    }
+
+res_company()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
new file mode 100644
index 00000000000..bcb168467a9
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_demo.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Salary Structure -->
+
+        <record id="hr_payroll_salary_structure_ind_emp" model="hr.payroll.structure">
+            <field name="code">NE</field>
+            <field name="name">Non-Executive Employee</field>
+            <field eval="[(6, 0, [ref('hr_salary_rule_medical'), ref('hr_salary_rule_da'), ref('hr_salary_rule_lta'), ref('hr_salary_rule_telephone'), ref('hr_salary_rule_internet'), ref('hr_payroll_rule_child1')])]" name="rule_ids"/>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="parent_id" ref="hr_payroll.structure_base"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
new file mode 100644
index 00000000000..7f27291051f
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <report
+            auto="False"
+            id="payslip_details_report"
+            model="hr.payslip"
+            name="paylip.details.in"
+            rml="l10n_in_hr_payroll/report/report_payslip_details.rml"
+            string="PaySlip Details" />
+
+        <report
+            auto="False" 
+            id="payroll_advice" 
+            model="hr.payroll.advice" 
+            name="payroll.advice" 
+            rml="l10n_in_hr_payroll/report/report_payroll_advice.rml"
+            string="Print Advice" />
+
+        <report
+            auto="False" 
+            id="hr_salary_employee_bymonth" 
+            model="hr.salary.employee.month" 
+            name="salary.employee.bymonth" 
+            rml="l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml"
+            string="Yearly Salary by Head" /> 
+
+        <report
+            auto="False" 
+            id="yearly_salary" 
+            model="yearly.salary.detail" 
+            name="salary.detail.byyear" 
+            rml="l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml"
+            string="Yearly Salary by Employee" /> 
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
new file mode 100644
index 00000000000..3941d6461c9
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_sequence.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+    
+        <record id="seq_type_payment_advice" model="ir.sequence.type">
+            <field name="name">Payment Advice</field>
+            <field name="code">payment.advice</field>
+        </record>
+        
+        <record id="seq_payment_advice" model="ir.sequence">
+            <field name="name">Payment Advice</field>
+            <field name="code">payment.advice</field>
+            <field name="padding">3</field>
+        </record>
+        
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
new file mode 100644
index 00000000000..37d2f865770
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_view.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="hr_contract_form_in_inherit" model="ir.ui.view">
+            <field name="name">hr.contract.form.in.inherit</field>
+            <field name="model">hr.contract</field>
+            <field name="inherit_id" ref="hr_payroll.hr_contract_form_inherit"/>
+            <field name="arch" type="xml">
+            <data>
+                 <xpath expr="//field[@name='struct_id']" position="after">
+                 <group col="2" colspan="2" name="right_column">
+                    <separator colspan="2" string="Allowance"/>
+                        <field name="driver_salay"/>
+                        <field name="house_rent_allowance_metro_nonmetro"/>
+                        <field name="supplementary_allowance"/>
+                 </group>
+                 <group col="2" colspan="2" name="left_column">
+                    <separator colspan="2" string="Deduction"/>
+                        <field name="tds"/>
+                        <field name="voluntary_provident_fund"/>
+                        <field name="medical_insurance"/>
+                 </group>
+                 </xpath>
+            </data>
+            </field>
+        </record>
+
+        <record id="hr_payslip_run_form_inherit" model="ir.ui.view">
+            <field name="name">hr.payslip.run.form.inherit</field>
+            <field name="model">hr.payslip.run</field>
+            <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='credit_note']" position="after">
+                    <newline/>
+                    <field name="available_advice"/>
+                </xpath>
+                 <xpath expr="//button[@string='Set to Draft']" position="after">
+                    <button name="create_advice" string="Create Advice" type="object" states="close" />
+                 </xpath>
+            </data>
+            </field>
+        </record>
+
+        <record id="hr_payslip_run_search_inherit" model="ir.ui.view">
+            <field name="name">hr.payslip.run.search.inherit</field>
+            <field name="model">hr.payslip.run</field>
+            <field name="inherit_id" ref="hr_payroll.hr_payslip_run_filter"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='date_end']" position="after">
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-gtk-go-back-rtl" string="To Advice" domain="[('available_advice','=', False)]" help="Payslip Batches ready to be Adviced"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
+
+        <record id="view_hr_bank_advice_tree" model="ir.ui.view">
+            <field name="name">hr.payroll.advice.tree</field>
+            <field name="model">hr.payroll.advice</field>
+            <field name="arch" type="xml">
+                <tree string="Bank Advice">
+                    <field name="date"/>
+                    <field name="number"/>
+                    <field name="name"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    <field name="bank_id"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_hr_bank_advice_form" model="ir.ui.view">
+            <field name="name">hr.payroll.advice.form</field>
+            <field name="model">hr.payroll.advice</field>
+            <field name="arch" type="xml">
+                <form string="Bank Advice" version="7.0">
+                    <header>
+                        <button name="confirm_sheet"  string="Confirm Sheet" states="draft" type="object" class="oe_highlight"/>
+                        <button name="compute_advice" string="Compute Advice" states="draft" type="object" class="oe_highlight"/>
+                        <button name="cancel_sheet" string="Cancel" states="draft"  type="object"/>
+                        <button name="set_to_draft" string="Set to Draft" states="cancel,confirm" type="object"/>
+                        <div class="oe_right">
+                            <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft"/>
+                        </div>
+                        <div class="oe_clear"/>
+                    </header>
+                    <sheet>
+                        <group>
+                            <label for="Name" class="oe_edit_only" string="Name"/>
+                            <h2><field name="name"/></h2>
+                            <label for="date" class="oe_edit_only"/>
+                            <h2><field name="date"/></h2>
+                            <group colspan="3" col="6">
+                                <field name="bank_id"/>
+                                <field name="number"/>
+                            </group>
+                        </group>
+                        <notebook colspan="4">
+                            <page string="Payment Lines">
+                                <field name="line_ids" colspan="4" nolabel="1">
+                                    <tree string="Payment Lines" editable="bottom">
+                                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
+                                        <field name="name"/>
+                                        <field name="ifsc" invisible="1"/>
+                                        <field name="ifsc_code" attrs="{'invisible':[('ifsc','=', False)]}" />
+                                        <field name="bysal"/>
+                                        <field name="debit_credit"/>
+                                    </tree>
+                                </field>
+                            </page>
+                            <page string="Other Information">
+                                <group colspan="4" col="6">
+                                <field name="company_id" on_change="onchange_company_id(company_id)" groups="base.group_multi_company" widget="selection"/>
+                                <field name="chaque_nos"/>
+                                <newline/>
+                                <field name="neft"/>
+                                <field name="batch_id"/>
+                                </group>
+                                <separator colspan="4" string="Letter Details"/>
+                                <field name="note" colspan="4" nolabel="1"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_hr_payroll_advice_filter" model="ir.ui.view">
+            <field name="name">hr.payroll.advice.select</field>
+            <field name="model">hr.payroll.advice</field>
+            <field name="arch" type="xml">
+                <search string="Search Payment advice">
+                    <group>
+                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Advices"/>
+                        <filter icon="terp-camera_test" string="Confirm" domain="[('state','=','confirm')]" help="Confirm Advices"/>
+                        <separator orientation="vertical"/>
+                        <field name="date"/>
+                        <field name="number"/>
+                        <field name="name"/>
+                        <field name="bank_id"/>
+                        <field name="batch_id"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                        <filter string="Bank" name="bank_id" icon="terp-go-home" context="{'group_by':'bank_id'}"/>
+                        <separator orientation="vertical"/>
+                        <filter string="Status" name="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                        <separator orientation="vertical" />
+                        <filter string="Company" name="company_id" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_view_hr_bank_advice_tree" model="ir.actions.act_window">
+            <field name="name">Payment Advices</field>
+            <field name="res_model">hr.payroll.advice</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_hr_bank_advice_tree"/>
+            <field name="search_view_id" ref="view_hr_payroll_advice_filter"/>
+        </record>
+
+        <menuitem
+            action="action_view_hr_bank_advice_tree"
+            id="hr_menu_payment_advice"
+            parent="hr_payroll.menu_hr_root_payroll"
+        />
+
+        <record id="view_advice_line_form" model="ir.ui.view">
+            <field name="name">advice.line.form</field>
+            <field name="model">hr.payroll.advice.line</field>
+            <field name="arch" type="xml">
+                <form string="Advice Lines" version="7.0">
+                    <sheet>
+                    <label for="advice_id" class="oe_edit_only"/>
+                    <h1><field name="advice_id"/></h1>
+                        <group>
+                            <field name="employee_id" on_change="onchange_employee_id(employee_id)" />
+                            <field name="name" />
+                            <field name="ifsc" invisible="1"/>
+                            <field name="ifsc_code" attrs="{'invisible':[('ifsc','=', False)]}" />
+                            <field name="bysal" />
+                            <field name="debit_credit" />
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_res_company_da" model="ir.ui.view">
+            <field name="name">res.company.inherit</field>
+            <field name="model">res.company</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+            <data>
+                 <page string="Configuration" position="inside">
+                    <group name="rule" string="Payroll">
+                        <field name="dearness_allowance"/>
+                    </group>
+                 </page>
+            </data>
+            </field>
+        </record>
+
+        <!--  Shortcuts -->
+
+        <act_window name="Payslips"
+            domain="[('advice_id', '=', active_id)]"
+            res_model="hr.payslip"
+            src_model="hr.payroll.advice"
+            view_id ="hr_payroll.view_hr_payslip_tree"
+            id="act_hr_emp_payslip_list"
+         />
+
+    </data>
+</openerp>
diff --git a/addons/base_module_doc_rst/report/__init__.py b/addons/l10n_in_hr_payroll/report/__init__.py
similarity index 65%
rename from addons/base_module_doc_rst/report/__init__.py
rename to addons/l10n_in_hr_payroll/report/__init__.py
index 9df659665ef..8a20170c384 100644
--- a/addons/base_module_doc_rst/report/__init__.py
+++ b/addons/l10n_in_hr_payroll/report/__init__.py
@@ -1,13 +1,16 @@
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
 #
 #    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.
+#    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
@@ -19,8 +22,11 @@
 #
 ##############################################################################
 
-import ir_module_reference_print_graph
-import report_proximity_graph
+import report_payslip_details
+import report_payroll_advice
+import report_hr_salary_employee_bymonth
+import payment_advice_report
+import report_hr_yearly_salary_detail
+import payslip_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report.py b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
new file mode 100644
index 00000000000..a264368be94
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-Today OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import tools
+from osv import fields, osv
+
+class payment_advice_report(osv.osv):
+    _name = "payment.advice.report"
+    _description = "Payment Advice Analysis"
+    _auto = False
+    _columns = {
+        'name':fields.char('Name', size=32, readonly=True),
+        'date': fields.date('Date', 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'),
+            ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'state':fields.selection([
+            ('draft', 'Draft'),
+            ('confirm', 'Confirmed'),
+            ('cancel', 'Cancelled'),
+        ], 'Status', select=True, readonly=True),
+        'employee_id': fields.many2one('hr.employee', 'Employee', readonly=True),
+        'nbr': fields.integer('# Payment Lines', readonly=True),
+        'number':fields.char('Number', size=16, readonly=True),
+        'bysal': fields.float('By Salary', readonly=True),
+        'bank_id':fields.many2one('res.bank', 'Bank', readonly=True),
+        'company_id':fields.many2one('res.company', 'Company', readonly=True),
+        'cheque_nos':fields.char('Cheque Numbers', size=256, readonly=True),
+        'neft': fields.boolean('NEFT Transaction', readonly=True),
+        'ifsc_code': fields.char('IFSC Code', size=32, readonly=True),
+        'employee_bank_no': fields.char('Employee Bank Account', size=32, required=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'payment_advice_report')
+        cr.execute("""
+            create or replace view payment_advice_report as (
+                select
+                    min(l.id) as id,
+                    sum(l.bysal) as bysal,
+                    p.name,
+                    p.state,
+                    p.date,
+                    p.number,
+                    p.company_id,
+                    p.bank_id,
+                    p.chaque_nos as cheque_nos,
+                    p.neft,
+                    l.employee_id,
+                    l.ifsc_code,
+                    l.name as employee_bank_no,
+                    to_char(p.date, 'YYYY') as year,
+                    to_char(p.date, 'MM') as month,
+                    to_char(p.date, 'YYYY-MM-DD') as day,
+                    1 as nbr
+                from
+                    hr_payroll_advice as p
+                    left join hr_payroll_advice_line as l on (p.id=l.advice_id)
+                where 
+                    l.employee_id IS NOT NULL
+                group by
+                    p.number,p.name,p.date,p.state,p.company_id,p.bank_id,p.chaque_nos,p.neft,
+                    l.employee_id,l.advice_id,l.bysal,l.ifsc_code, l.name
+            )
+        """)
+payment_advice_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
new file mode 100644
index 00000000000..38f1272718b
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <record id="view_payment_advice_tree" model="ir.ui.view">
+        <field name="name">payment.advice.report.tree</field>
+        <field name="model">payment.advice.report</field>
+        <field name="arch" type="xml">
+            <tree colors="blue:state == 'draft';black:state == 'confirm';gray:state == 'cancel' " create="false" string="Advices Analysis">
+                <field name="nbr" sum="# Payment Lines"/>
+                <field name="name" invisible="1"/>
+                <field name="employee_id" invisible="1"/>
+                <field name="date" invisible="1"/>
+                <field name="bank_id" invisible="1"/>
+                <field name="state" invisible="1"/>
+                <field name="number" invisible="1"/>
+                <field name="bysal" sum="Total Salary"/>
+                <field name="year" invisible="1"/>
+                <field name="day" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="cheque_nos" invisible="1"/>
+                <field name="neft" invisible="1"/>
+                <field name="ifsc_code" invisible="1"/>
+            </tree>
+        </field>
+    </record>
+
+
+    <record id="view_payment_advice_search" model="ir.ui.view">
+        <field name="name">payment.advice.report.search</field>
+        <field name="model">payment.advice.report</field>
+        <field name="arch" type="xml">
+            <search string="Advices Analysis">
+                 <group>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Payment Advices which are in draft state"/>
+                    <filter icon="terp-check" string="Confirm" name="confirm" domain="[('state','=','confirm')]" help="Payment Advices which are in confirm state"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-camera_test" string="NEFT" domain="[('neft','=',True)]" help="Advices which are paid using NEFT transfer"/>
+                    <separator orientation="vertical"/>
+                    <field name="date"/>
+                    <separator orientation="vertical"/>
+                    <field name="number"/>
+                    <field name="name"/>
+                    <field name="employee_id"/>
+                    <field name="cheque_nos"/>
+                </group>
+                <newline/>
+                 <group expand="0" string="Extended Filters...">
+                    <field name="ifsc_code"/>
+                    <field name="bank_id" widget="selection"/>
+                    <field name="employee_bank_no"/>
+                    <separator orientation="vertical"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By...">
+                    <filter string="Employee" icon="terp-personal" context="{'group_by':'employee_id'}" />
+                    <filter string="Bank" icon="terp-go-home" context="{'group_by':'bank_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day of Payment Advices"/>
+                    <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of Payment Advices"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of Payment Advices"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_payment_advice_report_all" model="ir.actions.act_window">
+        <field name="name">Advices Analysis</field>
+        <field name="res_model">payment.advice.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_payment_advice_tree"/>
+        <field name="context">{'search_default_confirm':1,'group_by_no_leaf':1,'group_by':[]}</field>
+        <field name="help">This report performs analysis on Payment Advices</field>
+    </record>
+
+    <menuitem action="action_payment_advice_report_all" id="menu_reporting_payment_advice" parent="hr.menu_hr_reporting" sequence="5" groups="base.group_hr_manager"/>
+
+</data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/report/payslip_report.py b/addons/l10n_in_hr_payroll/report/payslip_report.py
new file mode 100644
index 00000000000..a78d9850667
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/payslip_report.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-Today OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import tools
+from osv import fields, osv
+
+class payslip_report(osv.osv):
+    _name = "payslip.report"
+    _description = "Payslip Analysis"
+    _auto = False
+    _columns = {
+        'name':fields.char('Name', size=32, readonly=True),
+        'date_from': fields.date('Date From', readonly=True,),
+        'date_to': fields.date('Date To', 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'),
+            ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'state': fields.selection([
+            ('draft', 'Draft'),
+            ('done', 'Done'),
+            ('cancel', 'Rejected'),
+        ], 'Status', readonly=True),
+        'employee_id': fields.many2one('hr.employee', 'Employee', readonly=True),
+        'nbr': fields.integer('# Payslip lines', readonly=True),
+        'number': fields.char('Number', size=16, readonly=True),
+        'struct_id': fields.many2one('hr.payroll.structure', 'Structure', readonly=True),
+        'company_id':fields.many2one('res.company', 'Company', readonly=True),
+        'paid': fields.boolean('Made Payment Order ? ', readonly=True),
+        'total': fields.float('Total', readonly=True),
+        'category_id':fields.many2one('hr.salary.rule.category', 'Category', readonly=True),
+    }
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'payslip_report')
+        cr.execute("""
+            create or replace view payslip_report as (
+                select
+                    min(l.id) as id,
+                    l.name,
+                    p.struct_id,
+                    p.state,
+                    p.date_from,
+                    p.date_to,
+                    p.number,
+                    p.company_id,
+                    p.paid,
+                    l.category_id,
+                    l.employee_id,
+                    sum(l.total) as total,
+                    to_char(p.date_from, 'YYYY') as year,
+                    to_char(p.date_from, 'MM') as month,
+                    to_char(p.date_from, 'YYYY-MM-DD') as day,
+                    to_char(p.date_to, 'YYYY') as to_year,
+                    to_char(p.date_to, 'MM') as to_month,
+                    to_char(p.date_to, 'YYYY-MM-DD') as to_day,
+                    1 AS nbr
+                from
+                    hr_payslip as p
+                    left join hr_payslip_line as l on (p.id=l.slip_id)
+                where 
+                    l.employee_id IS NOT NULL
+                group by
+                    p.number,l.name,p.date_from,p.date_to,p.state,p.company_id,p.paid,
+                    l.employee_id,p.struct_id,l.category_id
+            )
+        """)
+payslip_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/payslip_report_view.xml b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
new file mode 100644
index 00000000000..d71cb283336
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <record id="view_payslip_tree" model="ir.ui.view">
+        <field name="name">payslip.report.tree</field>
+        <field name="model">payslip.report</field>
+        <field name="arch" type="xml">
+            <tree colors="blue:state == 'draft';black:state == 'done';gray:state == 'cancel' " create="false" string="Payslip Analysis">
+                <field name="nbr" sum="# Payslip Lines"/>
+                <field name="name"/>
+                <field name="employee_id" invisible="1"/>
+                <field name="date_to" invisible="1"/>
+                <field name="date_from" invisible="1"/>
+                <field name="state" invisible="1"/>
+                <field name="number" invisible="1"/>
+                <field name="struct_id" invisible="1"/>
+                <field name="year" invisible="1"/>
+                <field name="day" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <field name="paid" invisible="1"/>
+                <field name="total" />
+                <field name="category_id" invisible="1"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_payslip_search" model="ir.ui.view">
+        <field name="name">payslip.report.search</field>
+        <field name="model">payslip.report</field>
+        <field name="arch" type="xml">
+            <search string="Payslip Analysis">
+                 <group>
+                    <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Payslips which are in draft state"/>
+                    <filter icon="terp-check" string="Done" name="done" domain="[('state','=','done')]" help="Payslips which are in done state"/>
+                    <separator orientation="vertical"/>
+                    <filter icon="terp-camera_test" string="Paid" domain="[('paid','=',True)]" help="Payslips which are paid"/>
+                    <separator orientation="vertical"/>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <separator orientation="vertical"/>
+                    <field name="number"/>
+                    <field name="name"/>
+                    <field name="employee_id"/>
+                </group>
+                <newline/>
+                 <group expand="1" string="Extended Filters...">
+                    <separator orientation="vertical"/>
+                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                </group>
+                <newline/>
+                <group expand="1" string="Group By...">
+                    <filter string="Employee" name="employee" icon="terp-personal" context="{'group_by':'employee_id'}" />
+                    <filter string="Structure" context="{'group_by':'struct_id'}" />
+                    <filter string="Category" name="category" context="{'group_by':'category_id'}" />
+                    <filter string="Payslip Line" context="{'group_by':'name'}" />
+                    <separator orientation="vertical"/>
+                    <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Company" icon="terp-go-home" groups="base.group_multi_company" context="{'group_by':'company_id'}"/>
+                    <separator orientation="vertical"/>
+                    <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Day of Payslip"/>
+                    <filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Month of Payslip"/>
+                    <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Year of Payslip"/>
+
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_payslip_report_all" model="ir.actions.act_window">
+        <field name="name">Payslip Analysis</field>
+        <field name="res_model">payslip.report</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree</field>
+        <field name="view_id" ref="view_payslip_tree"/>
+        <field name="context">{'search_default_employee':1,'search_default_category':1,'group_by_no_leaf':uid,'group_by':[]}</field>
+        <field name="help">This report performs analysis on Payslip</field>
+    </record>
+
+    <menuitem action="action_payslip_report_all" id="menu_reporting_payslip" parent="hr.menu_hr_reporting" sequence="5" groups="base.group_hr_manager"/>
+
+</data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
new file mode 100644
index 00000000000..54b0daa7749
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -0,0 +1,133 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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 datetime
+import time
+
+from report import report_sxw
+
+class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(report_hr_salary_employee_bymonth, self).__init__(cr, uid, name, context=context)
+
+        self.localcontext.update({
+            'time': time,
+            'get_employee': self.get_employee,
+            'get_periods': self.get_periods,
+            'get_months_tol': self.get_months_tol,
+            'get_total': self.get_total,
+        })
+
+        self.context = context
+        self.mnths = []
+        self.mnths_total = []
+        self.total = 0.0
+
+    def get_periods(self, form):
+#       Get start year-month-date and end year-month-date
+        first_year = int(form['start_date'][0:4])
+        last_year = int(form['end_date'][0:4])
+
+        first_month = int(form['start_date'][5:7])
+        last_month = int(form['end_date'][5:7])
+        no_months = (last_year-first_year) * 12 + last_month - first_month + 1
+        current_month = first_month
+        current_year = first_year
+
+#       Get name of the months from integer
+        mnth_name = []
+        for count in range(0, no_months):
+            m = datetime.date(current_year, current_month, 1).strftime('%b')
+            mnth_name.append(m)
+            self.mnths.append(str(current_month) + '-' + str(current_year))
+            if current_month == 12:
+                current_month = 0
+                current_year = last_year
+            current_month = current_month + 1
+        for c in range(0, (12-no_months)):
+            mnth_name.append('None')
+            self.mnths.append('None')
+        return [mnth_name]
+
+    def get_salary(self, form, emp_id, emp_salary, total_mnths):
+        category_id = form.get('category_id', [])
+        category_id = category_id and category_id[0] or False
+        self.cr.execute("select to_char(date_to,'mm-yyyy') as to_date ,sum(pl.total) \
+                             from hr_payslip_line as pl \
+                             left join hr_payslip as p on pl.slip_id = p.id \
+                             left join hr_employee as emp on emp.id = p.employee_id \
+                             left join resource_resource as r on r.id = emp.resource_id  \
+                            where p.state = 'done' and p.employee_id = %s and pl.category_id = %s \
+                            group by r.name, p.date_to,emp.id",(emp_id, category_id,))
+        sal = self.cr.fetchall()
+        salary = dict(sal)
+        total = 0.0
+        cnt = 1
+
+        for month in self.mnths:
+            if month <> 'None':
+                if len(month) != 7:
+                    month = '0' + str(month)
+                if month in salary and salary[month]:
+                    emp_salary.append(salary[month])
+                    total += salary[month]
+                    total_mnths[cnt] = total_mnths[cnt] + salary[month]
+                else:
+                    emp_salary.append(0.00)
+            else:
+                emp_salary.append('')
+                total_mnths[cnt] = ''
+            cnt = cnt + 1
+        return emp_salary, total, total_mnths
+
+    def get_employee(self, form):
+        emp_salary = []
+        salary_list = []
+        total_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+        emp_obj = self.pool.get('hr.employee')
+        emp_ids = form.get('employee_ids', [])
+        employees  = emp_obj.browse(self.cr, self.uid, emp_ids, context=self.context)
+
+        for emp_id in employees:
+            emp_salary.append(emp_id.name)
+            total = 0.0
+            emp_salary, total, total_mnths = self.get_salary(form, emp_id.id, emp_salary, total_mnths)
+            emp_salary.append(total)
+            salary_list.append(emp_salary)
+            emp_salary = []
+        self.mnths_total.append(total_mnths)
+        return salary_list
+
+    def get_months_tol(self):
+        return self.mnths_total
+
+    def get_total(self):
+        for item in self.mnths_total:
+            for count in range(1, len(item)):
+              if item[count] == '':
+                  continue
+              self.total += item[count]
+        return self.total
+
+report_sxw.report_sxw('report.salary.employee.bymonth', 'hr.salary.employee.month', 'l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml', parser=report_hr_salary_employee_bymonth, header='internal')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
new file mode 100644
index 00000000000..6368a644f4b
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
@@ -0,0 +1,293 @@
+<?xml version="1.0"?>
+<document filename="yearly salary report.pdf">
+  <template pageSize="(620.0,842.0)" title="Yearly Salary Report" author="OpenERP" allowSplitting="50">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0"  width="539" height="772"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" 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="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <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="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <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_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" 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_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="7.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="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="5.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="5.0" leading="2" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="5.0" leading="11" alignment="RIGHT" 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_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="5.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P1">Yearly Salary Details </para>
+    <para style="P5">From <u>[[ formatLang(data['form']['start_date'], date=True) ]]</u> To <u>[[ formatLang(data['form']['end_date'], date=True) ]]</u> of <u>[[ (data['form']['category_id'][1]) ]]</u> Category</para>
+    <para style="P6">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
+      <blockTable colWidths="55.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table1">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Name</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[0] != 'None' and m[0] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[1] != 'None' and m[1] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[2] != 'None' and m[2] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[3] != 'None' and m[3] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[4] != 'None' and m[4] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[5] != 'None' and m[5] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[6] != 'None' and m[6] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[7] != 'None' and m[7] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[8] != 'None' and m[8] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[9] != 'None' and m[9] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[10] != 'None' and m[10] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[11] != 'None' and m[11] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Total</para>
+          </td>
+        </tr>
+      </blockTable>
+      <section>
+        <para style="terp_default_1">[[ repeatIn(get_employee(data['form']),'e') ]]</para>
+        <blockTable colWidths="55.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table2">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ e[0] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[1]!='' and formatLang(e[1])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[2]!='' and formatLang(e[2])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[3]!='' and formatLang(e[3])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[4]!='' and formatLang(e[4])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[5]!='' and formatLang(e[5])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[6]!='' and formatLang(e[6])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[7]!='' and formatLang(e[7])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[8]!='' and formatLang(e[8])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[9]!='' and formatLang(e[9])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[10]!='' and formatLang(e[10])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[11]!='' and formatLang(e[11])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_8">
+                <font face="Helvetica" size="5.0">[[ (e[12]!='' and formatLang(e[12])) or removeParentNode('font') ]]</font>
+              </para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9_Bold">[[ formatLang(e[13],currency_obj= company.currency_id)]] </para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
+    </section>
+    <section>
+      <para style="terp_default_1">[[ repeatIn(get_months_tol(),'t') ]]</para>
+      <blockTable colWidths="55.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table6">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Total</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[1],currency_obj= company.currency_id) or removeParentNode('para') ]] </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[2],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[3],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[4],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[5],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[6],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[7],currency_obj= company.currency_id) or removeParentNode('para')]] ]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[8],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[9],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[10],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[11],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(t[12],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">[[ formatLang(get_total(), currency_obj = company.currency_id)]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+  </story>
+</document>
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
new file mode 100644
index 00000000000..576fd302f6f
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
@@ -0,0 +1,164 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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 datetime
+from report import report_sxw
+
+class employees_yearly_salary_report(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(employees_yearly_salary_report, self).__init__(cr, uid, name, context)
+
+        self.localcontext.update({
+            'time': time,
+            'get_employee': self.get_employee,
+            'get_employee_detail': self.get_employee_detail,
+            'cal_monthly_amt': self.cal_monthly_amt,
+            'get_periods': self.get_periods,
+            'get_total': self.get_total,
+            'get_allow': self.get_allow,
+            'get_deduct': self.get_deduct,
+        })
+
+        self.context = context
+
+    def get_periods(self, form):
+        self.mnths = []
+#       Get start year-month-date and end year-month-date
+        first_year = int(form['date_from'][0:4])
+        last_year = int(form['date_to'][0:4])
+
+        first_month = int(form['date_from'][5:7])
+        last_month = int(form['date_to'][5:7])
+        no_months = (last_year-first_year) * 12 + last_month - first_month + 1
+        current_month = first_month
+        current_year = first_year
+
+#       Get name of the months from integer
+        mnth_name = []
+        for count in range(0, no_months):
+            m = datetime.date(current_year, current_month, 1).strftime('%b')
+            mnth_name.append(m)
+            self.mnths.append(str(current_month) + '-' + str(current_year))
+            if current_month == 12:
+                current_month = 0
+                current_year = last_year
+            current_month = current_month + 1
+        for c in range(0, (12-no_months)):
+            mnth_name.append('None')
+            self.mnths.append('None')
+        return [mnth_name]
+
+    def get_employee(self, form):
+        return self.pool.get('hr.employee').browse(self.cr,self.uid, form.get('employee_ids', []), context=self.context)
+
+    def get_employee_detail(self, form, obj):
+        self.allow_list = []
+        self.deduct_list = []
+        self.total = 0.00
+        gross = False
+        net = False
+
+        payslip_lines = self.cal_monthly_amt(form, obj.id)
+        for line in payslip_lines:
+            for line[0] in line:
+                if line[0][0]  == "Gross":
+                    gross = line[0]
+                elif line[0][0]  == "Net":
+                    net = line[0]
+                elif line[0][13] > 0.0 and line[0][0] != "Net":
+                    self.total += line[0][len(line[0])-1]
+                    self.allow_list.append(line[0])
+                elif line[0][13] < 0.0:
+                    self.total += line[0][len(line[0])-1]
+                    self.deduct_list.append(line[0])
+        if gross:
+            self.allow_list.append(gross)
+        if net:
+            self.deduct_list.append(net)
+        return None
+
+    def cal_monthly_amt(self, form, emp_id):
+        category_obj = self.pool.get('hr.salary.rule.category')
+        result = []
+        res = []
+        salaries = {}
+        self.cr.execute('''SELECT rc.code, pl.name, sum(pl.total), \
+                to_char(date_to,'mm-yyyy') as to_date  FROM hr_payslip_line as pl \
+                LEFT JOIN hr_salary_rule_category AS rc on (pl.category_id = rc.id) \
+                LEFT JOIN hr_payslip as p on pl.slip_id = p.id \
+                LEFT JOIN hr_employee as emp on emp.id = p.employee_id \
+                WHERE p.employee_id = %s \
+                GROUP BY rc.parent_id, pl.sequence, pl.id, pl.category_id,pl.name,p.date_to,rc.code \
+                ORDER BY pl.sequence, rc.parent_id''',(emp_id,))
+        salary = self.cr.fetchall()
+        for category in salary:
+            if category[0] not in salaries:
+                salaries.setdefault(category[0], {})
+                salaries[category[0]].update({category[1]: {category[3]: category[2]}})
+            elif category[1] not in salaries[category[0]]:
+                salaries[category[0]].setdefault(category[1], {})
+                salaries[category[0]][category[1]].update({category[3]: category[2]})
+            else:
+                salaries[category[0]][category[1]].update({category[3]: category[2]})
+        
+        category_ids = category_obj.search(self.cr,self.uid, [], context=self.context)
+        categories = category_obj.read(self.cr, self.uid, category_ids, ['code'], context=self.context)
+        for code in map(lambda x: x['code'], categories):
+            if code in salaries:
+                res = self.salary_list(salaries[code])
+            result.append(res)
+        return result
+
+    def salary_list(self, salaries):
+        cat_salary_all = []
+        for category_name,amount in salaries.items():
+            cat_salary = []
+            total = 0.0
+            cat_salary.append(category_name)
+            for mnth in self.mnths:
+                if mnth <> 'None':
+                    if len(mnth) != 7:
+                        mnth = '0' + str(mnth)
+                    if mnth in amount and amount[mnth]:
+                        cat_salary.append(amount[mnth])
+                        total += amount[mnth]
+                    else:
+                        cat_salary.append(0.00)
+                else:
+                    cat_salary.append('')
+            cat_salary.append(total)
+            cat_salary_all.append(cat_salary)
+        return cat_salary_all
+
+    def get_allow(self):
+        return self.allow_list
+
+    def get_deduct(self):
+        return self.deduct_list
+
+    def get_total(self):
+        return self.total
+
+report_sxw.report_sxw('report.salary.detail.byyear', 'yearly.salary.detail', 'hr_payroll/report/report_hr_yearly_salary_detail.rml', parser=employees_yearly_salary_report, header='internal landscape')
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
new file mode 100644
index 00000000000..502eaa7b0ff
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
@@ -0,0 +1,588 @@
+<?xml version="1.0"?>
+<document filename="hr_yearly_salary_detail_report.pdf">
+  <template pageSize="(842.0,595.0)" title="hr_yearly_salary_detail_report" author="Openerp S.A." allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="57.0" width="786" height="481"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table12">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table10">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table11">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table9">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" 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="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="Drawing" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Helvetica"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.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" rightIndent="0.0" leftIndent="-3.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" 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_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" 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="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="terp_default_8">[[ repeatIn(get_employee(data['form']), 'o') ]] </para>
+    <blockTable colWidths="785.0" style="Table12">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_9">From <u>[[ formatLang(data['form']['date_from'], date=True) ]]</u> To <u>[[ formatLang(data['form']['date_to'], date=True) ]]</u></para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_Centre_9">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Employee Code</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.identification_id ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Department</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.department_id and o.department_id.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Bank</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.bank_account_id and o.bank_account_id.bank.name or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Employee Name</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Other No.</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.otherid or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Address</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[o.address_home_id and o.address_home_id.name or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="100.0,162.0,92.0,161.0,103.0,167.0" style="Table5">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Designation</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.job_id and o.job_id.name or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Phone No.</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[ o.work_phone or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">E-mail Address</para>
+        </td>
+        <td>
+          <para style="terp_default_9">[[o.work_email or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
+      <font color="white"> </font>
+    </para>
+    <section>
+    <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
+      <para style="terp_default_1">[[ get_employee_detail((data['form']),o) ]]</para>
+      <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table4">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Title</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[0] != 'None' and m[0] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[1] != 'None' and m[1] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[2] != 'None' and m[2] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[3] != 'None' and m[3] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[4] != 'None' and m[4] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[5] != 'None' and m[5] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[6] != 'None' and m[6] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[7] != 'None' and m[7] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[8] != 'None' and m[8] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[9] != 'None' and m[9] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[10] != 'None' and m[10] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">[[ m[11] != 'None' and m[11] or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Total</para>
+          </td>
+        </tr>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <section>
+        <blockTable colWidths="803.0" style="Table7">
+          <tr>
+            <td>
+              <para style="terp_tblheader_Details">Allowances with Basic: </para>
+            </td>
+          </tr>
+        </blockTable>
+        <section>
+          <para style="terp_default_1">[[ repeatIn(get_allow(),'e1') ]]</para>
+          <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table6">
+            <tr>
+              <td>
+                <para style="terp_default_9"><b>[[ e1[0] in ["Basic","Gross"] and e1[0] ]]</b> </para>
+                <para style="terp_default_9">[[ e1[0] not in ["Basic","Gross"] and e1[0] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e1[0] in ["Basic","Gross"] and e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e1[0] not in ["Basic","Gross"] and e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e1[13],currency_obj= company.currency_id) ]] </para>
+              </td>
+            </tr>
+          </blockTable>
+        </section>
+        <blockTable colWidths="803.0" style="Table10">
+          <tr>
+            <td>
+              <para style="terp_tblheader_Details">Deductions: </para>
+            </td>
+          </tr>
+        </blockTable>
+        <section>
+          <para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
+          <blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table8">
+            <tr>
+              <td>
+                <para style="terp_default_9"><b>[[ e2[0] in ["Net"] and e2[0] ]]</b> </para>
+                <para style="terp_default_9">[[ e2[0] not in ["Net"] and e2[0] ]]</para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_8">
+                  <font face="Helvetica-Bold" size="7.0">[[ (e2[0] in ["Net"] and e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
+                  <font face="Helvetica" size="7.0">[[ (e2[0] not in ["Net"] and e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
+                </para>
+              </td>
+              <td>
+                <para style="terp_default_Right_9_Bold">[[ formatLang(e2[13],currency_obj= company.currency_id) ]] </para>
+              </td>
+            </tr>
+          </blockTable>
+        </section>
+      </section>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+    </section>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
new file mode 100644
index 00000000000..d4eeaf3d218
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py
@@ -0,0 +1,82 @@
+#-*- coding:utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#    d$
+#
+#    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
+from datetime import datetime
+
+from report import report_sxw
+from tools import amount_to_text_en
+
+class payroll_advice_report(report_sxw.rml_parse):
+    
+    def __init__(self, cr, uid, name, context):
+        super(payroll_advice_report, self).__init__(cr, uid, name, context=context)
+
+        self.localcontext.update({
+            'time': time,
+            'get_month': self.get_month,
+            'convert': self.convert,
+            'get_detail': self.get_detail,
+            'get_bysal_total': self.get_bysal_total,
+        })
+        self.context = context
+        
+    def get_month(self, input_date):
+        payslip_pool = self.pool.get('hr.payslip')
+        res = {
+               'from_name': '', 'to_name': ''
+               }
+        slip_ids = payslip_pool.search(self.cr, self.uid, [('date_from','<=',input_date), ('date_to','>=',input_date)], context=self.context)
+        if slip_ids:
+            slip = payslip_pool.browse(self.cr, self.uid, slip_ids, context=self.context)[0]
+            from_date = datetime.strptime(slip.date_from, '%Y-%m-%d')
+            to_date =  datetime.strptime(slip.date_to, '%Y-%m-%d')
+            res['from_name']= from_date.strftime('%d')+'-'+from_date.strftime('%B')+'-'+from_date.strftime('%Y')
+            res['to_name']= to_date.strftime('%d')+'-'+to_date.strftime('%B')+'-'+to_date.strftime('%Y')
+        return res
+
+    def convert(self, amount, cur):
+        return amount_to_text_en.amount_to_text(amount, 'en', cur);
+
+    def get_bysal_total(self):
+        return self.total_bysal
+        
+    def get_detail(self, line_ids):
+        result = []
+        self.total_bysal = 0.00
+        for l in line_ids:
+            res = {}
+            res.update({
+                    'name': l.employee_id.name,
+                    'acc_no': l.name,
+                    'ifsc_code': l.ifsc_code,
+                    'bysal': l.bysal,
+                    'debit_credit': l.debit_credit,
+                    })
+            self.total_bysal += l.bysal
+            result.append(res) 
+        return result
+
+report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'l10n_in_hr_payroll/report/report_payroll_advice.rml', parser=payroll_advice_report, header="external")
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
new file mode 100644
index 00000000000..879314a24d9
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
@@ -0,0 +1,425 @@
+<?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="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </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="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-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="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="6.0" leading="8" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica" alignment="LEFT"/>
+    <paraStyle name="P12" fontName="Helvetica" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" rightIndent="-0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="JUSTIFY" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <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="Caption" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <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="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="8.0" leading="10" 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="0.0" spaceAfter="0.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="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" 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="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" 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_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_0.30cmspace" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="9.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="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="4.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_space" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="1.0"/>
+    <paraStyle name="Drawing" fontName="Helvetica-Oblique" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Helvetica"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
+    <blockTable colWidths="234.0,305.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P7">[[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]]</para>
+          <para style="P9"/>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P6">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">To, </para>
+          <para style="terp_default_Bold_9">The Manager</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_Bold_9">[[ o.bank_id.name ]] Bank</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_1">
+            <font color="white"> </font>
+          </para>
+          <para style="terp_default_9">Dear Sir/Madam,</para>
+        </td>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="539.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P10">Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="539.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_9">[[ o.note ]] </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_8_space">
+      <font color="white"> </font>
+    </para>
+   <blockTable colWidths="47.0,146.0,158.0,105.0,83.0" style="Table4">[[ o.neft == True and removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="P1">SI. No.</para>
+        </td>
+        <td>
+          <para style="P1">Name of the Employe</para>
+        </td>
+        <td>
+          <para style="P3">Bank Account No.</para>
+        </td>
+        <td>
+          <para style="P3">By Salary</para>
+        </td>
+        <td>
+          <para style="P3">C/D</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
+    <blockTable colWidths="47.0,146.0,158.0,105.0,83.0" style="Table5">[[ o.neft == True and removeParentNode('blockTable') ]]
+        <tr>
+          <td>
+            <para style="P11" leftIndent="15" bulletIndent="0">
+              <bullet><seq id="L1"/>.</bullet>
+              <font color="white"> </font>
+            </para>
+          </td>
+          <td>
+            <para style="P8">[[ line['name'] ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['acc_no'] ]]</para>
+          </td>
+          <td>
+            <para style="P8">[[formatLang(line['bysal'], currency_obj = company.currency_id) ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['debit_credit'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+      <blockTable colWidths="40.0,129.0,141.0,104.0,77.0,49.0" style="Table4">[[ o.neft != True and removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="P1">SI. No.</para>
+        </td>
+        <td>
+          <para style="P1">Name of the Employe</para>
+        </td>
+        <td>
+          <para style="P3">Bank Account No.</para>
+        </td>
+        <td>
+          <para style="P3">IFSC Code</para>
+        </td>
+        <td>
+          <para style="P3">By Salary</para>
+        </td>
+        <td>
+          <para style="P3">C/D</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
+    <blockTable colWidths="39.0,129.0,140.0,104.0,78.0,49.0" style="Table5">[[ o.neft !=True and removeParentNode('blockTable') ]]
+        <tr>
+          <td>
+            <para style="P11" leftIndent="15" bulletIndent="0">
+              <bullet><seq id="L1"/>.</bullet>
+            </para>
+          </td>
+          <td>
+            <para style="P8">[[ line['name'] ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['acc_no'] ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['ifsc_code'] ]]</para>
+          </td>
+          <td>
+            <para style="P8">[[formatLang(line['bysal'], currency_obj = company.currency_id) ]]</para>
+          </td>
+          <td>
+            <para style="P5">[[ line['debit_credit'] ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+       <blockTable colWidths="50.0,144.0,158.0,107.0,80.0" style="Table6">[[ o.neft == True and removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P1">Total : <font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font></para>
+          <para style="P4"/>
+        </td>
+        <td>
+          <para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+     <blockTable colWidths="50.0,119.0,244.0,99.0,27.0" style="Table6">[[ o.neft !=True and removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P2">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P1">Total : <font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font></para>
+          <para style="P4"/>
+        </td>
+        <td>
+          <para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]]</para>
+        </td>
+        <td>
+          <para style="P4">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_0.30cmspace">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="269.0,269.0" style="Table7">
+      <tr>
+        <td>
+          <para style="terp_default_9">Yours Sincerely</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">For [[ company.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="terp_default_9">Authorized Signature</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_9">
+      <font color="white"> </font>
+    </para>
+    <para>
+      <seqReset id="L1"/>
+    </para>
+  </story>
+</document>
diff --git a/addons/caldav/caldav.py b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
similarity index 51%
rename from addons/caldav/caldav.py
rename to addons/l10n_in_hr_payroll/report/report_payslip_details.py
index 0f0f5ddd762..2732d5d09ae 100644
--- a/addons/caldav/caldav.py
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.py
@@ -1,13 +1,13 @@
-# -*- coding: utf-8 -*-
+#-*- coding:utf-8 -*-
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
 #
 #    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.
+#    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
@@ -19,11 +19,17 @@
 #
 ##############################################################################
 
-from document_webdav import webdav
-import urlparse
-urlparse.uses_netloc.append('caldav')
-urlparse.uses_netloc.append('caldavs')
+from report import report_sxw
+from hr_payroll import report
 
-#EOF
+class payslip_details_report_in(report.report_payslip_details.payslip_details_report):
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+    def __init__(self, cr, uid, name, context):
+        super(payslip_details_report_in, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'get_details_by_rule_category': self.get_details_by_rule_category,
+        })
+
+report_sxw.report_sxw('report.paylip.details.in', 'hr.payslip', 'l10n_in_hr_payroll/report/report_payslip_details.rml', parser=payslip_details_report_in)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
new file mode 100644
index 00000000000..c4ce55bfa41
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
@@ -0,0 +1,372 @@
+<?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="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table10">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table11">
+      <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="Table12">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </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="Table16">
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table13">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="2.0" leading="3"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="2.0" leading="3"/>
+    <paraStyle name="P3" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P14" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="8.0" leading="10"/>
+    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P19" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT"/>
+    <paraStyle name="P20" fontName="Helvetica" fontSize="2.0" leading="3"/>
+    <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P22" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P23" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
+    <paraStyle name="P24" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P25" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P26" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <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="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_space" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_10" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" 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="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="payslip_adj" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P3">[[repeatIn(objects,'o')]]</para>
+    <blockTable colWidths="539.0" style="Table1">
+      <tr>
+        <td>
+          <para style="P8">Pay Slip Details</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_header_Centre">
+      <font face="Helvetica" size="6.0">[[o.credit_note==False and removeParentNode('para')]]</font>
+      <font face="Helvetica-Bold" size="14.0">Credit</font>
+      <font face="Helvetica" size="14.0"/>
+      <font face="Helvetica-Bold" size="14.0">Note</font>
+    </para>
+    <para style="P9">([[o.name or removeParentNode('para')]])</para>
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table2">
+      <tr>
+        <td>
+          <para style="P16">Name</para>
+        </td>
+        <td>
+          <para style="P16">[[o.employee_id.name]]</para>
+        </td>
+        <td>
+          <para style="P16">Designation </para>
+        </td>
+        <td>
+          <para style="P5">[[ o.employee_id.job_id.name or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="63.0,476.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_8">
+            <font face="Helvetica">Address </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">[[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table4">
+      <tr>
+        <td>
+          <para style="P16">Email</para>
+        </td>
+        <td>
+          <para style="P5">[[ o.employee_id.work_email or '' ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_8">
+            <font face="Helvetica">Identification No</font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">[[ o.employee_id.identification_id or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table5">
+      <tr>
+        <td>
+          <para style="P16">Reference</para>
+        </td>
+        <td>
+          <para style="P5">[[ o.number or '' ]]</para>
+        </td>
+        <td>
+          <para style="P16">Bank Account</para>
+        </td>
+        <td>
+          <para style="P5">[[ o.employee_id.otherid or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="63.0,206.0,89.0,181.0" style="Table6">
+      <tr>
+        <td>
+          <para style="P16">Date From</para>
+        </td>
+        <td>
+          <para style="P5">[[ o.date_from or '']]</para>
+        </td>
+        <td>
+          <para style="terp_default_Bold_8">
+            <font face="Helvetica" size="8.0">Date To</font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">[[ o.date_to or '' ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P7"/>
+    <para style="P11">
+      <font color="white"> </font>
+    </para>
+    <para style="P5">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="539.0" style="Table10">
+      <tr>
+        <td>
+          <para style="P10">Details by Salary Rule Category: </para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="54.0,388.0,97.0" style="Table11">
+      <tr>
+        <td>
+          <para style="P15">Code</para>
+        </td>
+        <td>
+          <para style="P15">Salary Rule Category</para>
+        </td>
+        <td>
+          <para style="P14">Total</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <section>
+      <para style="P16">[[repeatIn(get_details_by_rule_category(o.details_by_salary_rule_category),'h') ]]</para>
+      <blockTable colWidths="54.0,388.0,97.0" style="Table12">
+        <tr>
+          <td>
+            <para style="P16">
+              <font face="Helvetica">[[ h['code'] ]]</font>
+              <font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font')]]</font>
+            </para>
+          </td>
+          <td>
+            <para style="P17"><font face="Helvetica" color="white">[[ '..'*h['level'] ]]</font>[[ h['rule_category'] ]]<font face="Helvetica">[[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]</font></para>
+          </td>
+          <td>
+            <para style="P6">[[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] <font face="Helvetica" size="8.0">[[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]</font></para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="P7">
+      <font color="white"> </font>
+    </para>
+
+    <blockTable colWidths="269.0,269.0" style="Table13">
+      <tr>
+        <td>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+          <para style="P12">
+            <font color="white"> </font>
+          </para>
+          <para style="P12">Authorized Signature </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P4">
+      <font color="white"> </font>
+    </para>
+  </story>
+</document>
+
diff --git a/addons/l10n_in_hr_payroll/security/ir.model.access.csv b/addons/l10n_in_hr_payroll/security/ir.model.access.csv
new file mode 100644
index 00000000000..7ca0834449b
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_hr_payroll_advice_user","hr.payroll.advice","model_hr_payroll_advice","base.group_hr_user",1,1,1,1
+"access_hr_payroll_advice_line_user","hr.payroll.advice.line","model_hr_payroll_advice_line","base.group_hr_user",1,1,1,1
+"access_hr_payroll_advice_report_user","payment.advice.report","model_payment_advice_report","base.group_hr_manager",1,1,1,1
+"access_hr_payroll_payslip_report_user","payslip.report","model_payslip_report","base.group_hr_manager",1,1,1,1
diff --git a/addons/l10n_in_hr_payroll/static/src/img/icon.png b/addons/l10n_in_hr_payroll/static/src/img/icon.png
new file mode 100644
index 00000000000..ddaf38f8b6d
Binary files /dev/null and b/addons/l10n_in_hr_payroll/static/src/img/icon.png differ
diff --git a/addons/l10n_in_hr_payroll/test/payment_advice.yml b/addons/l10n_in_hr_payroll/test/payment_advice.yml
new file mode 100644
index 00000000000..20b45830c5e
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/test/payment_advice.yml
@@ -0,0 +1,41 @@
+-
+  In order to test Payment Advice I create a new Payment Advice 
+-
+  I create a new Payment Advice with NEFT Transaction Enable
+-
+  !record {model: hr.payroll.advice, id: payment_advice_1}: 
+    name: 'NEFT Advice'
+    bank_id: base.res_bank_1
+    line_ids:
+      - employee_id: hr.employee_fp
+        name: '90125452552'
+        ifsc_code: 'abn45215145'
+        bysal: 25000.00
+      - employee_id: hr.employee_al
+        name: '00014521111232'
+        ifsc_code: 'sbi45452145'
+        bysal: 20000.00 
+-
+  I check that the Payment Advice is in "Draft"
+-
+  !assert {model: hr.payroll.advice, id: payment_advice_1}:
+    - state == 'draft'
+-
+  Now I confirm Payment Advice
+-    
+  !python {model: hr.payroll.advice}: |
+    self.confirm_sheet(cr, uid, [ref('payment_advice_1')])
+-
+  I check that the Payment Advice state is "Confirmed"
+-
+  !python {model: hr.payroll.advice}: |
+    advice = self.browse(cr, uid, ref("payment_advice_1"))
+    assert (advice.state == 'confirm')
+-
+  In order to test the PDF report defined on a Payment Advice, we will print a Print Advice Report when NEFT is checked
+-
+  !python {model: hr.payroll.advice}: |
+    import netsvc, tools, os
+    (data, format) = netsvc.LocalService('report.payroll.advice').create(cr, uid, [ref('l10n_in_hr_payroll.payment_advice_1')], {})
+    if tools.config['test_report_directory']:
+        file(os.path.join(tools.config['test_report_directory'], 'l10n_in_hr_payroll_summary report'+format), 'wb+').write(data)
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
new file mode 100644
index 00000000000..d1a1436b50b
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/test/payment_advice_batch.yml
@@ -0,0 +1,61 @@
+-
+  In order to test Payment Advice Creation from Payslip Bacth I create New Payslip Batch
+-
+  I Create a bank record
+-
+  !record {model: res.partner.bank, id: res_partner_bank_0}:
+    acc_number: '3025632343043'
+    partner_id: base.res_partner_21
+    state: bank
+    bank: base.res_bank_1
+-
+  I create a new employee “Rahul”
+-
+  !record {model: hr.employee, id: hr_employee_rahul0}:
+    country_id: base.in
+    department_id: hr.dep_rd
+    name: Rahul
+    bank_account_id: res_partner_bank_0
+-
+  I want to generate a payslip from Payslip Batch.
+-
+  !record {model: hr.payslip.run, id: hr_payslip_run_forAdvice}:
+    name: Payslip Batch
+-
+  I create record for generating the Payslip for Payslip Batch.
+-
+  !record {model: hr.payslip.employees, id: hr_payslip_employees}:
+    employee_ids:
+      - hr_employee_rahul0
+-
+  I generate the payslip by clicking on Generate button wizard.
+-
+  !python {model: hr.payslip.employees}: |
+     self.compute_sheet(cr, uid, [ref('hr_payslip_employees')], context={'active_id': ref('hr_payslip_run_forAdvice')})
+-
+  I check that the Payslip Batch is in "Draft"
+-
+  !assert {model: hr.payslip.run, id: hr_payslip_run_forAdvice}:
+    - state == 'draft'
+-
+  Now I close Payslip Batch
+-    
+  !python {model: hr.payslip.run}: |
+    self.close_payslip_run(cr, uid, [ref('hr_payslip_run_forAdvice')])
+-
+  I check that the Payslip Batch is "Close"
+-
+  !python {model: hr.payslip.run}: |
+    batch = self.browse(cr, uid, ref("hr_payslip_run_forAdvice"))
+    assert (batch.state == 'close')
+- 
+  I create Advice from Payslip Batch using Create Advice button
+-
+    !python {model: hr.payslip.run}: |
+     self.create_advice(cr, uid, [ref('hr_payslip_run_forAdvice')])
+-
+  I check for Advice is created from Payslip Batch
+-
+  !python {model: hr.payroll.advice}: |
+    advice_ids = self.search(cr, uid, [('batch_id','=',ref('hr_payslip_run_forAdvice'))])
+    assert advice_ids,"Advice is not created from Payslip Batch."
\ No newline at end of file
diff --git a/addons/event_project/__init__.py b/addons/l10n_in_hr_payroll/wizard/__init__.py
similarity index 94%
rename from addons/event_project/__init__.py
rename to addons/l10n_in_hr_payroll/wizard/__init__.py
index c43297c86f4..36635aec3c2 100644
--- a/addons/event_project/__init__.py
+++ b/addons/l10n_in_hr_payroll/wizard/__init__.py
@@ -18,8 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import event_project
-import wizard
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+import hr_salary_employee_bymonth
+import hr_yearly_salary_detail
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
new file mode 100644
index 00000000000..25cc615a1df
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
@@ -0,0 +1,71 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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
+
+from osv import osv, fields
+
+class hr_salary_employee_bymonth(osv.osv_memory):
+
+    _name = 'hr.salary.employee.month'
+    _description = 'Hr Salary Employee By Month Report'
+    _columns = {
+        'start_date': fields.date('Start Date', required=True),
+        'end_date': fields.date('End Date', required=True),
+        'employee_ids': fields.many2many('hr.employee', 'payroll_year_rel', 'payroll_year_id', 'employee_id', 'Employees', required=True),
+        'category_id': fields.many2one('hr.salary.rule.category', 'Category', required=True),
+    }
+
+    def _get_default_category(self, cr, uid, context=None):
+        category_ids = self.pool.get('hr.salary.rule.category').search(cr, uid, [('code', '=', 'NET')], context=context)
+        return category_ids and category_ids[0] or False
+
+    _defaults = {
+         'start_date': lambda *a: time.strftime('%Y-01-01'),
+         'end_date': lambda *a: time.strftime('%Y-%m-%d'),
+         'category_id': _get_default_category
+    }
+
+    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
+        """
+        if context is None:
+            context = {}
+        datas = {'ids': context.get('active_ids', [])}
+
+        res = self.read(cr, uid, ids, context=context)
+        res = res and res[0] or {}
+        datas.update({'form': res})
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'salary.employee.bymonth',
+            'datas': datas,
+       }
+
+hr_salary_employee_bymonth()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
new file mode 100644
index 00000000000..a3be8266e2e
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_salary_employee_month" model="ir.ui.view">
+            <field name="name">Hr monthly Employee Salary</field>
+            <field name="model">hr.salary.employee.month</field>
+            <field name="arch" type="xml">
+            <form string="Employee Pay Head Breakup" version="7.0">
+                <label string="This wizard will print report which displays employees break-up of Net Head for a specified dates."/>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                        or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+                <group>
+                    <field name="start_date"/>
+                    <field name="end_date"/>
+                    <field name="category_id"/>
+                    <separator string="Employees" />
+                    <field name="employee_ids"  nolabel="1" colspan="4"/>
+                </group>
+            </form>
+            </field>
+        </record>
+
+        <record id="action_salary_employee_month" model="ir.actions.act_window">
+            <field name="name">Yearly Salary by Head</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">hr.salary.employee.month</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+            name="Yearly Salary by Head"
+            parent="hr.menu_hr_reporting_timesheet"
+            sequence="200" icon="STOCK_PRINT"
+            action="action_salary_employee_month"
+            id="menu_salary_employee_month"
+           />
+
+    </data>
+</openerp>
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
new file mode 100644
index 00000000000..16bfd63bdc9
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
@@ -0,0 +1,66 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    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
+
+from osv import fields, osv
+
+class yearly_salary_detail(osv.osv_memory):
+
+   _name ='yearly.salary.detail'
+   _description = 'Hr Salary Employee By Category Report'
+   _columns = {
+        'employee_ids': fields.many2many('hr.employee', 'payroll_emp_rel', 'payroll_id', 'employee_id', 'Employees', required=True),
+        'date_from': fields.date('Start Date', required=True),
+        'date_to': fields.date('End Date', required=True),
+    }
+
+   _defaults = {
+        'date_from': lambda *a: time.strftime('%Y-01-01'),
+        'date_to': lambda *a: time.strftime('%Y-%m-%d'),
+
+    }
+
+   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
+        """
+        if context is None:
+            context = {}
+        datas = {'ids': context.get('active_ids', [])}
+
+        res = self.read(cr, uid, ids, context=context)
+        res = res and res[0] or {}
+        datas.update({'form': res})
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'salary.detail.byyear',
+            'datas': datas,
+       }
+
+yearly_salary_detail()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
new file mode 100644
index 00000000000..780df624757
--- /dev/null
+++ b/addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_yearly_salary_detail" model="ir.ui.view">
+            <field name="name">Employee Yearly Salary</field>
+            <field name="model">yearly.salary.detail</field>
+            <field name="arch" type="xml">
+            <form string="Pay Head Employee Breakup" version="7.0">
+                <label string="This wizard will print report which display a pay head employee breakup for a specified dates."/>
+                <footer>
+                    <button name="print_report" string="Print" type="object" class="oe_highlight"/>
+                    or
+                    <button string="Cancel" class="oe_link" special="cancel" />
+                </footer>
+                <group>
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                    <separator string="Employees" />
+                    <field name="employee_ids"  nolabel="1" colspan="4"/>
+                </group>
+            </form>
+            </field>
+        </record>
+
+        <record id="action_yearly_salary_detail" model="ir.actions.act_window">
+            <field name="name">Yearly Salary by Employee</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">yearly.salary.detail</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+            name="Yearly Salary by Employee"
+            parent="hr.menu_hr_reporting_timesheet"
+            action="action_yearly_salary_detail"
+            sequence="250" icon="STOCK_PRINT"
+            id="menu_yearly_salary_detail"
+           />
+
+</data>
+</openerp>
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index 96f3b3510ff..00ba19e9c42 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -28,22 +28,20 @@
 ##############################################################################
 
 {
-    "name" : "Italy - Accounting",
-    "version" : "0.1",
-    "depends" : ['base_vat','account_chart','base_iban'],
-    "author" : "OpenERP Italian Community",
-    "description": """
+    'name': 'Italy - Accounting',
+    'version': '0.1',
+    'depends': ['base_vat','account_chart','base_iban'],
+    'author': 'OpenERP Italian Community',
+    'description': """
 Piano dei conti italiano di un'impresa generica.
 ================================================
 
 Italian accounting chart and localization.
     """,
-    "license": "AGPL-3",
-    "category" : "Localization/Account Charts",
+    'license': 'AGPL-3',
+    'category': 'Localization/Account Charts',
     'website': 'http://www.openerp-italia.org/',
-    'init_xml': [
-        ],
-    'update_xml': [
+    'data': [
         'data/account.account.template.csv',
         'data/account.tax.code.template.csv',
         'account_chart.xml',
@@ -51,10 +49,8 @@ Italian accounting chart and localization.
         'data/account.fiscal.position.template.csv',
         'l10n_chart_it_generic.xml',
         ],
-    'demo_xml': [
-        ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00926677190009155165',
     'images': ['images/config_chart_l10n_it.jpeg','images/l10n_it_chart.jpeg'],
 }
diff --git a/addons/l10n_it/data/account.tax.code.template.csv b/addons/l10n_it/data/account.tax.code.template.csv
index 290396052f4..d6d6667f43b 100644
--- a/addons/l10n_it/data/account.tax.code.template.csv
+++ b/addons/l10n_it/data/account.tax.code.template.csv
@@ -60,6 +60,3 @@ IVC21det40,template_ivacode_pagata_21det40,IVA a credito 21% detraibile 40%,temp
 IVC21Idet40,template_impcode_pagata_21det40,IVA a credito 21% detraibile 40% (imponibile),template_impcode_pagata
 IVC21det50,template_ivacode_pagata_21det50,IVA a credito 21% detraibile 50%,template_ivacode_pagata
 IVC21Idet50,template_impcode_pagata_21det50,IVA a credito 21% detraibile 50% (imponibile),template_impcode_pagata
-Rit,template_ra,Ritenute d'acconto,vat_code_chart_root
-RitD20,template_ritcode_20,Ritenute a debito 20%,template_ra
-RitD20I,template_ritimpcode_20,Ritenute a debito 20% (imponibile),template_ra
diff --git a/addons/l10n_it/data/account.tax.template.csv b/addons/l10n_it/data/account.tax.template.csv
index 36c4f99db79..641f495dd72 100644
--- a/addons/l10n_it/data/account.tax.template.csv
+++ b/addons/l10n_it/data/account.tax.template.csv
@@ -62,4 +62,3 @@ id,description,chart_template_id:id,name,sequence,amount,parent_id:id,child_depe
 21I5,21I5,l10n_it_chart_template_generic,IVA al 21% detraibile al 50%,,0.21,,True,percent,,,purchase,template_impcode_pagata_21det50,,template_impcode_pagata_21det50,,,,False,-1,-1
 21I5b,21I5b,l10n_it_chart_template_generic,IVA al 21% detraibile al 50% (I),1,0.5,21I5,False,percent,,,purchase,,,,,,,False,,
 21I5a,21I5a,l10n_it_chart_template_generic,IVA al 21% detraibile al 50% (D),2,0,21I5,False,balance,1601,1601,purchase,,template_ivacode_pagata_21det50,,template_ivacode_pagata_21det50,,,False,,
-rit-20,rit-20,l10n_it_chart_template_generic,Ritenuta d'acconto al 20% (debito),,-0.2,,False,percent,2602,2602,purchase,template_ritimpcode_20,template_ritcode_20,template_ritimpcode_20,template_ritcode_20,-1,1,False,1,-1
diff --git a/addons/l10n_it/i18n/ar.po b/addons/l10n_it/i18n/ar.po
index 5f31b7d9d5c..906183a731e 100644
--- a/addons/l10n_it/i18n/ar.po
+++ b/addons/l10n_it/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/ca.po b/addons/l10n_it/i18n/ca.po
index 73272b70396..65b22029499 100644
--- a/addons/l10n_it/i18n/ca.po
+++ b/addons/l10n_it/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/da.po b/addons/l10n_it/i18n/da.po
index c2005ef8bce..b4adca52eda 100644
--- a/addons/l10n_it/i18n/da.po
+++ b/addons/l10n_it/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/es.po b/addons/l10n_it/i18n/es.po
index fb98d152955..deaeb5fc5f3 100644
--- a/addons/l10n_it/i18n/es.po
+++ b/addons/l10n_it/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/es_CR.po b/addons/l10n_it/i18n/es_CR.po
index 549b8a4189e..22456e7da90 100644
--- a/addons/l10n_it/i18n/es_CR.po
+++ b/addons/l10n_it/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_it
diff --git a/addons/l10n_it/i18n/es_PY.po b/addons/l10n_it/i18n/es_PY.po
index 13f4675a08b..2203100b0b9 100644
--- a/addons/l10n_it/i18n/es_PY.po
+++ b/addons/l10n_it/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/fr.po b/addons/l10n_it/i18n/fr.po
index 1f43673a206..46d66652ceb 100644
--- a/addons/l10n_it/i18n/fr.po
+++ b/addons/l10n_it/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/gl.po b/addons/l10n_it/i18n/gl.po
index 680a34807e8..4403880af07 100644
--- a/addons/l10n_it/i18n/gl.po
+++ b/addons/l10n_it/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/it.po b/addons/l10n_it/i18n/it.po
index 1f29e11f41f..12c7ff419ad 100644
--- a/addons/l10n_it/i18n/it.po
+++ b/addons/l10n_it/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/pt_BR.po b/addons/l10n_it/i18n/pt_BR.po
index df22956f602..b487066db86 100644
--- a/addons/l10n_it/i18n/pt_BR.po
+++ b/addons/l10n_it/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/i18n/tr.po b/addons/l10n_it/i18n/tr.po
index 27b72b5257b..5dac47b3bcd 100644
--- a/addons/l10n_it/i18n/tr.po
+++ b/addons/l10n_it/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_it
 #: model:account.account.type,name:l10n_it.account_type_cash
diff --git a/addons/l10n_it/l10n_chart_it_generic.xml b/addons/l10n_it/l10n_chart_it_generic.xml
index 52269c71962..dde7a77516a 100644
--- a/addons/l10n_it/l10n_chart_it_generic.xml
+++ b/addons/l10n_it/l10n_chart_it_generic.xml
@@ -1,12 +1,7 @@
 <openerp>
-    <data>
-
-        <record id="config_call_account_template_generic" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index 1ade34faaca..588102989ac 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -34,8 +34,7 @@ This is the base module to manage the accounting chart for Luxembourg.
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['account', 'base_vat', 'base_iban'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'account.tax.code.template.csv',
         'l10n_lu_data.xml',
         'l10n_lu_wizard.xml',
@@ -43,10 +42,9 @@ This is the base module to manage the accounting chart for Luxembourg.
         'wizard/print_vat_view.xml'
     ],
     'test': ['test/l10n_lu_report.yml'],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0078164766621',
     'images': ['images/config_chart_l10n_lu.jpeg','images/l10n_lu_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_lu/i18n/ar.po b/addons/l10n_lu/i18n/ar.po
index 385c80e37b7..9c45d9555b7 100644
--- a/addons/l10n_lu/i18n/ar.po
+++ b/addons/l10n_lu/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/bg.po b/addons/l10n_lu/i18n/bg.po
index 1ee73cb4cf2..246683055da 100644
--- a/addons/l10n_lu/i18n/bg.po
+++ b/addons/l10n_lu/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/bs.po b/addons/l10n_lu/i18n/bs.po
index 3a68ef4901a..f888a0c5d1d 100644
--- a/addons/l10n_lu/i18n/bs.po
+++ b/addons/l10n_lu/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/ca.po b/addons/l10n_lu/i18n/ca.po
index 2c63233d022..a0c20667cb6 100644
--- a/addons/l10n_lu/i18n/ca.po
+++ b/addons/l10n_lu/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/cs.po b/addons/l10n_lu/i18n/cs.po
index d832d6421e5..576eb430fed 100644
--- a/addons/l10n_lu/i18n/cs.po
+++ b/addons/l10n_lu/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/da.po b/addons/l10n_lu/i18n/da.po
index cd6a994fcb2..7bbf95dc16a 100644
--- a/addons/l10n_lu/i18n/da.po
+++ b/addons/l10n_lu/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/de.po b/addons/l10n_lu/i18n/de.po
index 68c36f6e377..95103f2b39a 100644
--- a/addons/l10n_lu/i18n/de.po
+++ b/addons/l10n_lu/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/es.po b/addons/l10n_lu/i18n/es.po
index 59e8b3feb49..e141fc9ea63 100644
--- a/addons/l10n_lu/i18n/es.po
+++ b/addons/l10n_lu/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/es_AR.po b/addons/l10n_lu/i18n/es_AR.po
index b84fcdb7cd4..026019a4724 100644
--- a/addons/l10n_lu/i18n/es_AR.po
+++ b/addons/l10n_lu/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/es_CR.po b/addons/l10n_lu/i18n/es_CR.po
index 8840ffebc33..e33d8850025 100644
--- a/addons/l10n_lu/i18n/es_CR.po
+++ b/addons/l10n_lu/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: l10n_lu
diff --git a/addons/l10n_lu/i18n/es_PY.po b/addons/l10n_lu/i18n/es_PY.po
index 68ca6dce656..b930ba6b53b 100644
--- a/addons/l10n_lu/i18n/es_PY.po
+++ b/addons/l10n_lu/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/et.po b/addons/l10n_lu/i18n/et.po
index da0ef97ff1f..6689588d08c 100644
--- a/addons/l10n_lu/i18n/et.po
+++ b/addons/l10n_lu/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/fr.po b/addons/l10n_lu/i18n/fr.po
index 2afabb38986..b0e14b42e97 100644
--- a/addons/l10n_lu/i18n/fr.po
+++ b/addons/l10n_lu/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/gl.po b/addons/l10n_lu/i18n/gl.po
index 5924e33cb50..e105a82dd0a 100644
--- a/addons/l10n_lu/i18n/gl.po
+++ b/addons/l10n_lu/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/hr.po b/addons/l10n_lu/i18n/hr.po
index 318a6e8d029..4e6c184d640 100644
--- a/addons/l10n_lu/i18n/hr.po
+++ b/addons/l10n_lu/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/hu.po b/addons/l10n_lu/i18n/hu.po
index 3a68ef4901a..f888a0c5d1d 100644
--- a/addons/l10n_lu/i18n/hu.po
+++ b/addons/l10n_lu/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/id.po b/addons/l10n_lu/i18n/id.po
index ad9d17090e0..7ca9e8699b7 100644
--- a/addons/l10n_lu/i18n/id.po
+++ b/addons/l10n_lu/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/it.po b/addons/l10n_lu/i18n/it.po
index f5bef5036a8..412689a35a8 100644
--- a/addons/l10n_lu/i18n/it.po
+++ b/addons/l10n_lu/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/ko.po b/addons/l10n_lu/i18n/ko.po
index 40ce779de38..abf23113159 100644
--- a/addons/l10n_lu/i18n/ko.po
+++ b/addons/l10n_lu/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/lt.po b/addons/l10n_lu/i18n/lt.po
index 07f48f7cf3b..d1e870a045f 100644
--- a/addons/l10n_lu/i18n/lt.po
+++ b/addons/l10n_lu/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/nl.po b/addons/l10n_lu/i18n/nl.po
index 6dea7599331..9e476c59206 100644
--- a/addons/l10n_lu/i18n/nl.po
+++ b/addons/l10n_lu/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/nl_BE.po b/addons/l10n_lu/i18n/nl_BE.po
index 4683304c56c..4b02fae9224 100644
--- a/addons/l10n_lu/i18n/nl_BE.po
+++ b/addons/l10n_lu/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/oc.po b/addons/l10n_lu/i18n/oc.po
index b4c95cc44a4..3f6ab4a90c4 100644
--- a/addons/l10n_lu/i18n/oc.po
+++ b/addons/l10n_lu/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/pl.po b/addons/l10n_lu/i18n/pl.po
index d344c31d864..a9302ee1508 100644
--- a/addons/l10n_lu/i18n/pl.po
+++ b/addons/l10n_lu/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/pt.po b/addons/l10n_lu/i18n/pt.po
index 4d7e5141863..2430ab9237e 100644
--- a/addons/l10n_lu/i18n/pt.po
+++ b/addons/l10n_lu/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/pt_BR.po b/addons/l10n_lu/i18n/pt_BR.po
index 12a3889abaa..eb66facdb79 100644
--- a/addons/l10n_lu/i18n/pt_BR.po
+++ b/addons/l10n_lu/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/ro.po b/addons/l10n_lu/i18n/ro.po
index 3a68ef4901a..08dea23f73c 100644
--- a/addons/l10n_lu/i18n/ro.po
+++ b/addons/l10n_lu/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/ru.po b/addons/l10n_lu/i18n/ru.po
index 3ac1306b6ff..f7979ca69f9 100644
--- a/addons/l10n_lu/i18n/ru.po
+++ b/addons/l10n_lu/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/sl.po b/addons/l10n_lu/i18n/sl.po
index 96fffa8116d..3ceb665c363 100644
--- a/addons/l10n_lu/i18n/sl.po
+++ b/addons/l10n_lu/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/sq.po b/addons/l10n_lu/i18n/sq.po
index 1ba6e5a2bec..701c2c0481e 100644
--- a/addons/l10n_lu/i18n/sq.po
+++ b/addons/l10n_lu/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/sr@latin.po b/addons/l10n_lu/i18n/sr@latin.po
index ad6b7eab834..924a70baf04 100644
--- a/addons/l10n_lu/i18n/sr@latin.po
+++ b/addons/l10n_lu/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/sv.po b/addons/l10n_lu/i18n/sv.po
index 4c3d38100e8..36e9b80c771 100644
--- a/addons/l10n_lu/i18n/sv.po
+++ b/addons/l10n_lu/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/tlh.po b/addons/l10n_lu/i18n/tlh.po
index c4a94039936..8a6612ae351 100644
--- a/addons/l10n_lu/i18n/tlh.po
+++ b/addons/l10n_lu/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/tr.po b/addons/l10n_lu/i18n/tr.po
index 87458736c0c..1cb2daad961 100644
--- a/addons/l10n_lu/i18n/tr.po
+++ b/addons/l10n_lu/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/uk.po b/addons/l10n_lu/i18n/uk.po
index 6bac1454679..8645ccc0483 100644
--- a/addons/l10n_lu/i18n/uk.po
+++ b/addons/l10n_lu/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/vi.po b/addons/l10n_lu/i18n/vi.po
index cfb2feb938a..f8f5d7e12c1 100644
--- a/addons/l10n_lu/i18n/vi.po
+++ b/addons/l10n_lu/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/zh_CN.po b/addons/l10n_lu/i18n/zh_CN.po
index 70f61884525..0f0558e7ab7 100644
--- a/addons/l10n_lu/i18n/zh_CN.po
+++ b/addons/l10n_lu/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/i18n/zh_TW.po b/addons/l10n_lu/i18n/zh_TW.po
index 6c43fc66b0b..fb031f0d24b 100644
--- a/addons/l10n_lu/i18n/zh_TW.po
+++ b/addons/l10n_lu/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:19+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_lu
 #: view:vat.declaration.report:0
diff --git a/addons/l10n_lu/l10n_lu_wizard.xml b/addons/l10n_lu/l10n_lu_wizard.xml
index 32351428bb6..52aaa88fdab 100644
--- a/addons/l10n_lu/l10n_lu_wizard.xml
+++ b/addons/l10n_lu/l10n_lu_wizard.xml
@@ -1,10 +1,8 @@
 <openerp>
-    <data>
-
-    <record id="config_call_account_template_lu" model="ir.actions.todo">
-        <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="type">automatic</field>
-    </record>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_lu/wizard/pdf_ext.py b/addons/l10n_lu/wizard/pdf_ext.py
index 3b58fab5b68..e90cf0527d2 100644
--- a/addons/l10n_lu/wizard/pdf_ext.py
+++ b/addons/l10n_lu/wizard/pdf_ext.py
@@ -57,7 +57,7 @@ trailer
 %%EOF
 """
 
-def output_field( f ):
+def output_field(f):
     return "\xfe\xff" + "".join( [ "\x00"+c for c in f ] )
 
 def extract_keys(lines):
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index 52f453af8bb..6cc213c8d2f 100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
@@ -20,11 +20,11 @@
 ##############################################################################
 
 {
-    "name" : "Maroc - Accounting",
-    "version" : "1.0",
-    "author" : "kazacube",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name' : 'Maroc - Accounting',
+    'version' : '1.0',
+    'author' : 'kazacube',
+    'category' : 'Localization/Account Charts',
+    'description': """
 This is the base module to manage the accounting chart for Maroc.
 =================================================================
 
@@ -33,23 +33,19 @@ générer les états comptables aux normes marocaines (Bilan, CPC (comptes de
 produits et charges), balance générale à 6 colonnes, Grand livre cumulatif...).
 L'intégration comptable a été validé avec l'aide du Cabinet d'expertise comptable
 Seddik au cours du troisième trimestre 2010.""",
-    "website": "http://www.kazacube.com",
-    "depends" : ["base", "account"],
-    "init_xml" : [],
-    "update_xml" : [
-                    "security/compta_security.xml",
-                    "security/ir.model.access.csv",
-                    "account_type.xml",
-                    "account_pcg_morocco.xml",
-                    "l10n_ma_wizard.xml",
-                    "l10n_ma_tax.xml",
-                    "l10n_ma_journal.xml",
-
-                    ],
-    "demo_xml" : [],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00599614652359069981",
+    'website': 'http://www.kazacube.com',
+    'depends' : ['base', 'account'],
+    'data' : [
+        'security/ir.model.access.csv',
+        'account_type.xml',
+        'account_pcg_morocco.xml',
+        'l10n_ma_wizard.xml',
+        'l10n_ma_tax.xml',
+        'l10n_ma_journal.xml',
+    ],
+    'demo' : [],
+    'auto_install': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_ma.jpeg','images/l10n_ma_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ma/i18n/ar.po b/addons/l10n_ma/i18n/ar.po
index caf9f411379..2dc96b53948 100644
--- a/addons/l10n_ma/i18n/ar.po
+++ b/addons/l10n_ma/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/ca.po b/addons/l10n_ma/i18n/ca.po
index 7846d4c72cf..d87f516b181 100644
--- a/addons/l10n_ma/i18n/ca.po
+++ b/addons/l10n_ma/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/da.po b/addons/l10n_ma/i18n/da.po
index 1fa7b95b113..590385856b8 100644
--- a/addons/l10n_ma/i18n/da.po
+++ b/addons/l10n_ma/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/de.po b/addons/l10n_ma/i18n/de.po
index 7cbe4b7ae53..e81df1f002a 100644
--- a/addons/l10n_ma/i18n/de.po
+++ b/addons/l10n_ma/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/es.po b/addons/l10n_ma/i18n/es.po
index ef8c773f0f8..a3e6ce088cc 100644
--- a/addons/l10n_ma/i18n/es.po
+++ b/addons/l10n_ma/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/es_CR.po b/addons/l10n_ma/i18n/es_CR.po
index ba9eaffe1e7..f63e2ad71ae 100644
--- a/addons/l10n_ma/i18n/es_CR.po
+++ b/addons/l10n_ma/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_ma
diff --git a/addons/l10n_ma/i18n/es_PY.po b/addons/l10n_ma/i18n/es_PY.po
index 11bd7bcfaa8..66827aa6281 100644
--- a/addons/l10n_ma/i18n/es_PY.po
+++ b/addons/l10n_ma/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/fr.po b/addons/l10n_ma/i18n/fr.po
index 3ad5efaa79a..3a94d8781ae 100644
--- a/addons/l10n_ma/i18n/fr.po
+++ b/addons/l10n_ma/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/gl.po b/addons/l10n_ma/i18n/gl.po
index cfee9e513e6..15f7befe9c3 100644
--- a/addons/l10n_ma/i18n/gl.po
+++ b/addons/l10n_ma/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/hu.po b/addons/l10n_ma/i18n/hu.po
index 6fc86039ee5..2eac67d7848 100644
--- a/addons/l10n_ma/i18n/hu.po
+++ b/addons/l10n_ma/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/it.po b/addons/l10n_ma/i18n/it.po
index 316c6a0dcd7..d2703024e79 100644
--- a/addons/l10n_ma/i18n/it.po
+++ b/addons/l10n_ma/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/pt.po b/addons/l10n_ma/i18n/pt.po
index 7726e4f8bb1..e1bdcdb7cc1 100644
--- a/addons/l10n_ma/i18n/pt.po
+++ b/addons/l10n_ma/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/pt_BR.po b/addons/l10n_ma/i18n/pt_BR.po
index 5d3f1db5136..abad27c2a2a 100644
--- a/addons/l10n_ma/i18n/pt_BR.po
+++ b/addons/l10n_ma/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-12-23 09:56+0000\n"
-"PO-Revision-Date: 2011-03-10 23:15+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-10-16 23:59+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
@@ -81,7 +81,7 @@ msgstr "Name"
 #. module: l10n_ma
 #: field:l10n.ma.report,line_ids:0
 msgid "Lines"
-msgstr "Lines"
+msgstr "Linhas"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_tax
diff --git a/addons/l10n_ma/i18n/sr@latin.po b/addons/l10n_ma/i18n/sr@latin.po
index 5ef0c8915da..e36dd724bf2 100644
--- a/addons/l10n_ma/i18n/sr@latin.po
+++ b/addons/l10n_ma/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/i18n/tr.po b/addons/l10n_ma/i18n/tr.po
index 83a4a1d85dc..263e8215808 100644
--- a/addons/l10n_ma/i18n/tr.po
+++ b/addons/l10n_ma/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ma
 #: model:account.account.type,name:l10n_ma.cpt_type_imm
diff --git a/addons/l10n_ma/l10n_ma_wizard.xml b/addons/l10n_ma/l10n_ma_wizard.xml
index 428a17e081a..52aaa88fdab 100644
--- a/addons/l10n_ma/l10n_ma_wizard.xml
+++ b/addons/l10n_ma/l10n_ma_wizard.xml
@@ -1,10 +1,8 @@
 <openerp>
-    <data>
-
-    <record id="config_call_account_template_ma" model="ir.actions.todo">
-        <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="type">automatic</field>
-    </record>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_ma/security/compta_security.xml b/addons/l10n_ma/security/compta_security.xml
deleted file mode 100644
index 8d511ae7154..00000000000
--- a/addons/l10n_ma/security/compta_security.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><openerp><data noupdate="0">
-
-    <record id="group_expert_comptable" model="res.groups">
-        <field name="name">Finance / Expert Comptable </field>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
-</data>
-</openerp>
diff --git a/addons/l10n_multilang/__openerp__.py b/addons/l10n_multilang/__openerp__.py
index cf521f124f4..5c91e1472c4 100644
--- a/addons/l10n_multilang/__openerp__.py
+++ b/addons/l10n_multilang/__openerp__.py
@@ -20,11 +20,11 @@
 ##############################################################################
 
 {
-    "name" : "Multi Language Chart of Accounts",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "category": 'Hidden/Dependency',
-    "description": """
+    'name': 'Multi Language Chart of Accounts',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'category': 'Hidden/Dependency',
+    'description': """
     * Multi language support for Chart of Accounts, Taxes, Tax Codes, Journals,
       Accounting Templates, Analytic Chart of Accounts and Analytic Journals.
     * Setup wizard changes
@@ -32,12 +32,9 @@
           templates to target objects.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    "depends" : ['account_accountant'],
-    'update_xml': [
-                ],
-    'demo_xml': [
-                ],
+    'depends' : ['account_accountant'],
+    'data': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/l10n_multilang/i18n/ar.po b/addons/l10n_multilang/i18n/ar.po
new file mode 100644
index 00000000000..6ff075befb6
--- /dev/null
+++ b/addons/l10n_multilang/i18n/ar.po
@@ -0,0 +1,172 @@
+# Arabic translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:06+0000\n"
+"PO-Revision-Date: 2012-11-16 19:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic <ar@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-17 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr "قوالب للمركز المالي"
+
+#. module: l10n_multilang
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr "يجب ان يكون كود الحساب فريداً لكل شركة !"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error!\n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"خطأ في الإعدادات!\n"
+" لاتستطيع تعريف أطفال لحساب من نوع داخلي مختلف ل\"العرض\"! "
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr "يومية تحليلية"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "خطأ ! لا يمكنك انشاء قوالب الحاسب العودية."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_journal
+msgid "Journal"
+msgstr "يومية"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "القوالب لجدول الحساب"
+
+#. module: l10n_multilang
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr "وصف لكل شركة يجب ان تكون فريد!"
+
+#. module: l10n_multilang
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "خطأ ! لايمكنك إنشاء اكواد ضريبية متداخلة."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_template
+msgid "account.tax.template"
+msgstr "account.tax.template"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax
+msgid "account.tax"
+msgstr "account.tax"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account
+msgid "Account"
+msgstr "حساب"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr "wizard.multi.charts.accounts"
+
+#. module: l10n_multilang
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"خطأ في الإعدادات! يجب أن تكون العملة المختارة مشتركة للحسابات الإفتراضية "
+"أيضأً."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "قوالب للحسابات"
+
+#. module: l10n_multilang
+#: help:account.chart.template,spoken_languages:0
+msgid ""
+"State here the languages for which the translations of templates could be "
+"loaded at the time of installation of this localization module and copied in "
+"the final object when generating them from templates. You must provide the "
+"language codes separated by ';'"
+msgstr ""
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "خطأ ! لا يمكن إنشاء حسابات تكرارية."
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
+"التكوين الخطأ!\n"
+"لا يمكنك اختيار  نوع الحساب باستخدام  طريقة التأجيل المختلفه \"عدم "
+"المساواه\" للحسابات من النوع الداخلي \"الدفع / القبض\" "
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "يجب ان يكون الاسم لليومية فريد لكل شركة!"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "حسابات تحليلية"
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "يجب ان يكون الكود لليومية فريد لكل شركة !"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position
+msgid "Fiscal Position"
+msgstr "الوضع المالي"
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"خطأ في الإعدادات!\n"
+"لا يمكنك تحديد فرع لحساب مع نوع داخلي مختلف من \"عرض\"! "
+
+#. module: l10n_multilang
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "خطأ! لا يمكنك إنشاء حسابات تحليلية متكررة."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "قالب رمز الضريبة"
+
+#. module: l10n_multilang
+#: field:account.chart.template,spoken_languages:0
+msgid "Spoken Languages"
+msgstr "اللغات المنطوقة"
diff --git a/addons/l10n_multilang/i18n/de.po b/addons/l10n_multilang/i18n/de.po
index f6368f897bb..bb34e0c406b 100644
--- a/addons/l10n_multilang/i18n/de.po
+++ b/addons/l10n_multilang/i18n/de.po
@@ -14,18 +14,19 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr ""
+msgstr "Vorlagen für die Bilanz"
 
 #. module: l10n_multilang
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
 msgstr ""
+"Die Kurzbezeichnung muss innerhalb eines Unternehmens eindeutig sein!"
 
 #. module: l10n_multilang
 #: constraint:account.account.template:0
@@ -34,6 +35,8 @@ msgid ""
 "You can not define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+"Konfigurationsfehler!\n"
+"Ein untergeordnetes Konto muss den Typ \"Sicht\" haben! "
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_analytic_journal
@@ -63,7 +66,7 @@ msgstr "Die Beschreibung muss je Unternehmen eindeutig sein."
 #. module: l10n_multilang
 #: constraint:account.tax.code.template:0
 msgid "Error ! You can not create recursive Tax Codes."
-msgstr ""
+msgstr "Fehler! Steuerschlüssel dürfen sich nicht auf sich selbst beziehen."
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_tax_template
@@ -107,6 +110,10 @@ msgid ""
 "the final object when generating them from templates. You must provide the "
 "language codes separated by ';'"
 msgstr ""
+"Geben Sie hier an, für welche Sprachen Vorlagenübersetzungen bei der "
+"Installation der Sprachanpassungsmodule geladen und von der Vorlage in das "
+"endgültige Objekt kopiert werden sollen. Sie müssen die Landeskennungen "
+"durch ';' getrennt angeben."
 
 #. module: l10n_multilang
 #: constraint:account.account:0
@@ -120,6 +127,9 @@ msgid ""
 "You can not select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
 msgstr ""
+"Konfigurationsfehler!\n"
+"Forderungen und Verbindlichkeiten müssen, von der Vortragsmethode her, "
+"\"unausgegleichen\" sein "
 
 #. module: l10n_multilang
 #: sql_constraint:account.journal:0
@@ -136,11 +146,13 @@ msgstr "Konstenstellenkonto"
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
 msgstr ""
+"Die Kurzbezeichnung des Berichts muss je Unternehmen (Mandant) eindeutig "
+"sein ."
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_fiscal_position
 msgid "Fiscal Position"
-msgstr ""
+msgstr "Bilanz"
 
 #. module: l10n_multilang
 #: constraint:account.account:0
@@ -149,18 +161,22 @@ msgid ""
 "You can not define children to an account with internal type different of "
 "\"View\"! "
 msgstr ""
+"Konfigurationsfehler!\n"
+"Das übergeordnete Konto muss den Typ \"Sicht\" haben. "
 
 #. module: l10n_multilang
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
+"Fehler ! Analytische Konten dürfen sich nicht auf sich selbst beziehen, also "
+"nicht rekursiv definiert sein."
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr ""
+msgstr "Vorlagen für Steuerschlüssel"
 
 #. module: l10n_multilang
 #: field:account.chart.template,spoken_languages:0
 msgid "Spoken Languages"
-msgstr ""
+msgstr "Gesprochene Sprachen"
diff --git a/addons/l10n_multilang/i18n/es.po b/addons/l10n_multilang/i18n/es.po
new file mode 100644
index 00000000000..4ba54992c5b
--- /dev/null
+++ b/addons/l10n_multilang/i18n/es.po
@@ -0,0 +1,177 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:06+0000\n"
+"PO-Revision-Date: 2012-11-08 14:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-09 04:39+0000\n"
+"X-Generator: Launchpad (build 16250)\n"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr "Plantilla para posición fiscal"
+
+#. module: l10n_multilang
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr "¡El código de la cuenta debe ser único por compañía!"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error!\n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"Error de configuración!\n"
+"¡No puede definir hijos para una cuenta con el tipo interno distinto de "
+"\"Vista\"! "
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr "Diario analítico"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_journal
+msgid "Journal"
+msgstr "Diario"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "Plantillas para el plan contable"
+
+#. module: l10n_multilang
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr "¡La descripción debe ser única por compañia!"
+
+#. module: l10n_multilang
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "¡Error! No puede crear códigos de impuestos recursivos."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_template
+msgid "account.tax.template"
+msgstr "Plantilla de impuestos"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax
+msgid "account.tax"
+msgstr "Impuesto"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account
+msgid "Account"
+msgstr "Cuenta"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr "Asistente de plan de cuentas"
+
+#. module: l10n_multilang
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"¡Error de configuración! La moneda elegida debería ser también la misma en "
+"las cuentas por defecto"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "Plantillas para cuentas"
+
+#. module: l10n_multilang
+#: help:account.chart.template,spoken_languages:0
+msgid ""
+"State here the languages for which the translations of templates could be "
+"loaded at the time of installation of this localization module and copied in "
+"the final object when generating them from templates. You must provide the "
+"language codes separated by ';'"
+msgstr ""
+"Indique aquí los idiomas para los que las traducciones de las plantillas "
+"pueden ser cargadas en el momento de la instalación de este módulo de "
+"localización y copiados en el objeto final cuando se generen desde las "
+"plantillas. Debe proveer los códigos de idioma separados por ';'."
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "¡Error! No se pueden crear cuentas recursivas."
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
+"¡Error de configuración! \n"
+"¡No puede seleccionar un tipo de cuenta con un método de cierre diferente de "
+"\"Reconciliado\" para las cuentas con tipo interno \"A pagar/A cobrar\"! "
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "¡El nombre del diaro debe ser único por compañía!"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "¡El código del diario debe ser único por compañía!"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"¡Error de configuración! \n"
+"¡No puede definir hijos en una cuenta con tipo interno distinto a \"Vista\"! "
+
+#. module: l10n_multilang
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "¡Error! No puede crear cuentas analíticas recursivas."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Plantilla códigos de impuestos"
+
+#. module: l10n_multilang
+#: field:account.chart.template,spoken_languages:0
+msgid "Spoken Languages"
+msgstr "Idiomas hablados"
diff --git a/addons/l10n_multilang/i18n/es_CR.po b/addons/l10n_multilang/i18n/es_CR.po
index 20dfed8ad6c..b6f5203cd04 100644
--- a/addons/l10n_multilang/i18n/es_CR.po
+++ b/addons/l10n_multilang/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
diff --git a/addons/l10n_multilang/i18n/fr.po b/addons/l10n_multilang/i18n/fr.po
index 1f220c618b5..92f209a3487 100644
--- a/addons/l10n_multilang/i18n/fr.po
+++ b/addons/l10n_multilang/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
diff --git a/addons/l10n_multilang/i18n/mn.po b/addons/l10n_multilang/i18n/mn.po
index 48e93562d1e..4243ea58be7 100644
--- a/addons/l10n_multilang/i18n/mn.po
+++ b/addons/l10n_multilang/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-08 04:36+0000\n"
-"X-Generator: Launchpad (build 15757)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
diff --git a/addons/l10n_multilang/i18n/pt.po b/addons/l10n_multilang/i18n/pt.po
index 03aec5927ed..d7dc3921df4 100644
--- a/addons/l10n_multilang/i18n/pt.po
+++ b/addons/l10n_multilang/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
diff --git a/addons/l10n_multilang/i18n/pt_BR.po b/addons/l10n_multilang/i18n/pt_BR.po
new file mode 100644
index 00000000000..b0e3ad51a43
--- /dev/null
+++ b/addons/l10n_multilang/i18n/pt_BR.po
@@ -0,0 +1,178 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:06+0000\n"
+"PO-Revision-Date: 2012-09-16 00:56+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr "Modelo para Posição Fiscal"
+
+#. module: l10n_multilang
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr "O código da conta deve ser único por empresa !"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error!\n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"Erro de configuração!\n"
+"Você não pode definir um filho a uma conta com tipo interno diferente de "
+"\"Visualização\"! "
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr "Diário Analítico"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Erro! Você não pode criar templates recursivos para contas."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_journal
+msgid "Journal"
+msgstr "Diário"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "Modelos para Plano de Contas"
+
+#. module: l10n_multilang
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr "A descrição deve ser única por empresa!"
+
+#. module: l10n_multilang
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Erro ! Você não pode criar Códigos de Impostos recursivos"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_template
+msgid "account.tax.template"
+msgstr "account.tax.template"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax
+msgid "account.tax"
+msgstr "account.tax"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account
+msgid "Account"
+msgstr "Conta Contábil"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr "wizard.multi.charts.accounts"
+
+#. module: l10n_multilang
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Erro de configuração! A moeda escolhida deve ser compartilhada pelas contas "
+"padrão também."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "Modelos para Contas"
+
+#. module: l10n_multilang
+#: help:account.chart.template,spoken_languages:0
+msgid ""
+"State here the languages for which the translations of templates could be "
+"loaded at the time of installation of this localization module and copied in "
+"the final object when generating them from templates. You must provide the "
+"language codes separated by ';'"
+msgstr ""
+"Declare aqui os idiomas para os quais as traduções de modelos poderiam ser "
+"carregados no momento da instalação deste módulo de localização e copiado no "
+"objeto final, quando gerá-los a partir de modelos. Você deve fornecer os "
+"códigos de idioma separados por ';'"
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "Erro! Você não pode criar contas recursivas"
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
+"Erro de Configuração!\n"
+"Você não pode selecionar um tipo de conta com um método de deferimento "
+"diferente de \"Não conciliado\" para contas do tipo \"Pagáveis/Recebíveis\" "
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "O nome do diário deve ser único por empresa!"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Conta Analítica"
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "O código do diário deve ser único por empresa!"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position
+msgid "Fiscal Position"
+msgstr "Posição Fiscal"
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"Erro de configuração!\n"
+"Você não pode definir um filho a uma conta com tipo interno diferente de "
+"\"Visualização\"! "
+
+#. module: l10n_multilang
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Erro! Você não pode criar contas analíticas recursivas."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Modelo do Código do Imposto"
+
+#. module: l10n_multilang
+#: field:account.chart.template,spoken_languages:0
+msgid "Spoken Languages"
+msgstr "Idiomas falados"
diff --git a/addons/l10n_multilang/i18n/ro.po b/addons/l10n_multilang/i18n/ro.po
index 3fdea21d3a4..16a9c338bc8 100644
--- a/addons/l10n_multilang/i18n/ro.po
+++ b/addons/l10n_multilang/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_multilang
 #: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
diff --git a/addons/l10n_multilang/i18n/tr.po b/addons/l10n_multilang/i18n/tr.po
new file mode 100644
index 00000000000..95098cd241a
--- /dev/null
+++ b/addons/l10n_multilang/i18n/tr.po
@@ -0,0 +1,174 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:06+0000\n"
+"PO-Revision-Date: 2012-08-21 07:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template
+msgid "Template for Fiscal Position"
+msgstr "Mali Durum Şablonu"
+
+#. module: l10n_multilang
+#: sql_constraint:account.account:0
+msgid "The code of the account must be unique per company !"
+msgstr "Hesap Kodu her şirket için benzersiz olmalı !"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error!\n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"Yapılandırma Hatası!\n"
+"İç türü \"Görünüm\" den farklı olan bir hesaba alt hesap tanımlayamazsınız! "
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_journal
+msgid "Analytic Journal"
+msgstr "Analiz Günlüğü"
+
+#. module: l10n_multilang
+#: constraint:account.account.template:0
+msgid "Error ! You can not create recursive account templates."
+msgstr "Hata! Yinelemeli hesap şablonları kullanamazsınız."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_journal
+msgid "Journal"
+msgstr "Günlük"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_chart_template
+msgid "Templates for Account Chart"
+msgstr "Hesap Tablosu Şablonu"
+
+#. module: l10n_multilang
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr "Her firma için açıklama benzersiz olmalı!"
+
+#. module: l10n_multilang
+#: constraint:account.tax.code.template:0
+msgid "Error ! You can not create recursive Tax Codes."
+msgstr "Hata! Yinelemeli Vergi Kodları oluşturmazsınız."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_template
+msgid "account.tax.template"
+msgstr "muhasebe.vergi.şablon"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax
+msgid "account.tax"
+msgstr "hesap.vergi"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account
+msgid "Account"
+msgstr "Hesap"
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_wizard_multi_charts_accounts
+msgid "wizard.multi.charts.accounts"
+msgstr "sihirbaz.çoklu.tablolar.hesaplar"
+
+#. module: l10n_multilang
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Yapılandırma hatası! Seçilen para birimi öntanımlı hesaplarla aynı olmalı."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_account_template
+msgid "Templates for Accounts"
+msgstr "Hesap Şablonu"
+
+#. module: l10n_multilang
+#: help:account.chart.template,spoken_languages:0
+msgid ""
+"State here the languages for which the translations of templates could be "
+"loaded at the time of installation of this localization module and copied in "
+"the final object when generating them from templates. You must provide the "
+"language codes separated by ';'"
+msgstr ""
+"Bu yerelleştirme modülünün kurulumu sırasında yüklenebilecek ve şablonlardan "
+"oluşturulan son nesneye kopyalanacak çeviri şablonu dillerini burada "
+"belirtin. Dil kodlarını ';' ile ayırın."
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid "Error ! You can not create recursive accounts."
+msgstr "Hata! Yinelen hesap oluşturamazsınız."
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
+"Yapılandırma Hatası! \n"
+"\"Borç/Alacak\" iç türündeki hesapların \"Uzalaştırılmamış\" tan farklı "
+"erteleme yöntemli bir hesap türünü seçemezsiniz! "
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Günlük adı her firmada benzersiz olmalı."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_analytic_account
+msgid "Analytic Account"
+msgstr "Analiz Hesabı"
+
+#. module: l10n_multilang
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Günlük kodu her firma için benzersiz olmalı."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_fiscal_position
+msgid "Fiscal Position"
+msgstr "Mali Durum"
+
+#. module: l10n_multilang
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+"Yapılandırma Hatası! \n"
+"\"Görüntüle\"den farklı iç tipli hesaba alt hesap tanımlayamazsınız  ! "
+
+#. module: l10n_multilang
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr "Hata! Yinelenen analiz hesabı oluşturamazsınız."
+
+#. module: l10n_multilang
+#: model:ir.model,name:l10n_multilang.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr "Vergi Kodu Şablonu"
+
+#. module: l10n_multilang
+#: field:account.chart.template,spoken_languages:0
+msgid "Spoken Languages"
+msgstr "Konuşulan Diller"
diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py
index b52ac25f1ba..02904431151 100644
--- a/addons/l10n_mx/__openerp__.py
+++ b/addons/l10n_mx/__openerp__.py
@@ -20,23 +20,23 @@
 #
 ##############################################################################
 {
-    "name" : "Mexico - Accounting",
-    "version" : "1.0",
-    "author" : "RelTek Mexico",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name': 'Mexico - Accounting',
+    'version': '1.0',
+    'author': 'RelTek Mexico',
+    'category': 'Localization/Account Charts',
+    'description': """
 This is the module to manage the accounting chart for Mexico in OpenERP.
 ========================================================================
 
 Mexican accounting chart and localization.
     """,
-    "depends" : ["account", "base_vat", "account_chart"],
-    "demo_xml" : [],
-    "update_xml" : ['account_tax_code.xml',"account_chart.xml",
-                    'account_tax.xml','l10n_chart_mx_wizard.xml'],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00858539161332598061",
+    'depends': ['account', 'base_vat', 'account_chart'],
+    'demo': [],
+    'data': ['account_tax_code.xml','account_chart.xml',
+              'account_tax.xml','l10n_chart_mx_wizard.xml'
+    ],
+    'auto_install': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_mx.jpeg','images/l10n_mx_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_mx/i18n/ar.po b/addons/l10n_mx/i18n/ar.po
index 6b2bd0cb6af..cf8cfe69dae 100644
--- a/addons/l10n_mx/i18n/ar.po
+++ b/addons/l10n_mx/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
@@ -25,7 +25,7 @@ msgstr "الدائنون"
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_equity
 msgid "Equity"
-msgstr ""
+msgstr "الأسهم"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_tax
diff --git a/addons/l10n_mx/i18n/bg.po b/addons/l10n_mx/i18n/bg.po
index 745fa73c3ba..c8701fec49b 100644
--- a/addons/l10n_mx/i18n/bg.po
+++ b/addons/l10n_mx/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/ca.po b/addons/l10n_mx/i18n/ca.po
index 3199ea15b96..dd962fb9d11 100644
--- a/addons/l10n_mx/i18n/ca.po
+++ b/addons/l10n_mx/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/da.po b/addons/l10n_mx/i18n/da.po
index aa4a7144fff..2271cabc8dd 100644
--- a/addons/l10n_mx/i18n/da.po
+++ b/addons/l10n_mx/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/es.po b/addons/l10n_mx/i18n/es.po
index 258bf8480bf..bb089ddea7d 100644
--- a/addons/l10n_mx/i18n/es.po
+++ b/addons/l10n_mx/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/es_CR.po b/addons/l10n_mx/i18n/es_CR.po
index b8efa1c3561..f27d3132cab 100644
--- a/addons/l10n_mx/i18n/es_CR.po
+++ b/addons/l10n_mx/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_mx
diff --git a/addons/l10n_mx/i18n/es_MX.po b/addons/l10n_mx/i18n/es_MX.po
index e9822e23498..bf2bab6a0d0 100644
--- a/addons/l10n_mx/i18n/es_MX.po
+++ b/addons/l10n_mx/i18n/es_MX.po
@@ -1,28 +1,41 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-07 06:07+0000\n"
-"PO-Revision-Date: 2011-02-15 15:37+0000\n"
+"POT-Creation-Date: 2011-12-23 09:56+0000\n"
+"PO-Revision-Date: 2012-10-22 22:58+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:58+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_mx
-#: model:ir.module.module,description:l10n_mx.module_meta_information
-msgid ""
-"This is the module to manage the accounting chart for Mexico in Open ERP."
-msgstr ""
-"Este es el módulo para gestionar el plan contable para Méjico en Open ERP."
+#: model:account.account.type,name:l10n_mx.account_type_receivable
+msgid "Receivable"
+msgstr "Por cobrar"
+
+#. module: l10n_mx
+#: model:account.account.type,name:l10n_mx.account_type_equity
+msgid "Equity"
+msgstr "Capital"
+
+#. module: l10n_mx
+#: model:account.account.type,name:l10n_mx.account_type_tax
+msgid "Tax"
+msgstr "Impuesto"
+
+#. module: l10n_mx
+#: model:account.account.type,name:l10n_mx.account_type_cash
+msgid "Cash"
+msgstr "Efectivo"
 
 #. module: l10n_mx
 #: model:ir.actions.todo,note:l10n_mx.config_call_account_template_mx_chart
@@ -35,16 +48,28 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-"Generar Plan Contable a partir de una plantilla de Plan. Se le preguntará "
-"por el nombre de la compañía, la plantilla de plan contable a seguir, el no. "
-"de dígitos para generar el código de sus cuentas y la cuenta bancaria, la "
-"divisa para crear Diarios. Por lo tanto, la copia exacta de la plantilla de "
-"plan contable será generada.\n"
-"Este es el mismo asistente que se ejecuta desde Gestión "
-"Financiera/Configuración/Contabilidad Financiera/Contabilidad "
-"Financiera/Generar Plan Contable a partir de una Plantilla de Plan."
 
 #. module: l10n_mx
-#: model:ir.module.module,shortdesc:l10n_mx.module_meta_information
-msgid "Mexico - Chart of Account"
-msgstr "Méjico - Plan Contable"
+#: model:account.account.type,name:l10n_mx.account_type_payable
+msgid "Payable"
+msgstr "A pagar"
+
+#. module: l10n_mx
+#: model:account.account.type,name:l10n_mx.account_type_asset
+msgid "Asset"
+msgstr "Activo"
+
+#. module: l10n_mx
+#: model:account.account.type,name:l10n_mx.account_type_income
+msgid "Income"
+msgstr "Ingreso"
+
+#. module: l10n_mx
+#: model:account.account.type,name:l10n_mx.account_type_expense
+msgid "Expense"
+msgstr "Gasto"
+
+#. module: l10n_mx
+#: model:account.account.type,name:l10n_mx.account_type_view
+msgid "View"
+msgstr "Vista"
diff --git a/addons/l10n_mx/i18n/es_PY.po b/addons/l10n_mx/i18n/es_PY.po
index 148c45280fe..248dabdcfb1 100644
--- a/addons/l10n_mx/i18n/es_PY.po
+++ b/addons/l10n_mx/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/gl.po b/addons/l10n_mx/i18n/gl.po
index 3ee52eebde6..28240d39aed 100644
--- a/addons/l10n_mx/i18n/gl.po
+++ b/addons/l10n_mx/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/it.po b/addons/l10n_mx/i18n/it.po
index 09fc28de253..a048944f594 100644
--- a/addons/l10n_mx/i18n/it.po
+++ b/addons/l10n_mx/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/pt.po b/addons/l10n_mx/i18n/pt.po
index 57879eb77c2..50625ddfeab 100644
--- a/addons/l10n_mx/i18n/pt.po
+++ b/addons/l10n_mx/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/pt_BR.po b/addons/l10n_mx/i18n/pt_BR.po
index d36844d00b1..2066fdca368 100644
--- a/addons/l10n_mx/i18n/pt_BR.po
+++ b/addons/l10n_mx/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/sr@latin.po b/addons/l10n_mx/i18n/sr@latin.po
index 8739dbdc4d1..f1e6a2ce451 100644
--- a/addons/l10n_mx/i18n/sr@latin.po
+++ b/addons/l10n_mx/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/i18n/tr.po b/addons/l10n_mx/i18n/tr.po
index 1e49ffd7bcc..97a9498372f 100644
--- a/addons/l10n_mx/i18n/tr.po
+++ b/addons/l10n_mx/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_mx
 #: model:account.account.type,name:l10n_mx.account_type_receivable
diff --git a/addons/l10n_mx/l10n_chart_mx_wizard.xml b/addons/l10n_mx/l10n_chart_mx_wizard.xml
index aeea1f3cd69..52aaa88fdab 100644
--- a/addons/l10n_mx/l10n_chart_mx_wizard.xml
+++ b/addons/l10n_mx/l10n_chart_mx_wizard.xml
@@ -1,12 +1,7 @@
 <openerp>
-    <data>
-
-        <record id="config_call_account_template_mx_chart" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
 
     </data>
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 8b9cc3de451..b612d07c147 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -58,7 +58,7 @@
 #   Opschonen van de code en verwijderen van niet gebruikte componenten.
 # Versie 5.0.0.4
 #   Aanpassen a_expense van 3000 -> 7000
-#   record id="btw_code_5b" op negatieve waarde gezet
+#   record id='btw_code_5b' op negatieve waarde gezet
 # Versie 5.0.0.5
 #   BTW rekeningen hebben typeaanduiding gekregen t.b.v. purchase of sale
 # Versie 5.0.0.6
@@ -86,10 +86,10 @@
 #   Changed naming of 7020 and 7030 to Kostprijs omzet xxxx
 
 {
-    "name" : "Netherlands - Accounting",
-    "version" : "1.5",
-    "category": "Localization/Account Charts",
-    "description": """
+    'name' : 'Netherlands - Accounting',
+    'version' : '1.5',
+    'category': 'Localization/Account Charts',
+    'description': """
 This is the module to manage the accounting chart for Netherlands in OpenERP.
 =============================================================================
 
@@ -101,7 +101,7 @@ De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te genereren
 denk b.v. aan intracommunautaire verwervingen waarbij u 19% BTW moet opvoeren,
 maar tegelijkertijd ook 19% als voorheffing weer mag aftrekken.
 
-Na installatie van deze module word de configuratie wizard voor "Accounting" aangeroepen.
+Na installatie van deze module word de configuratie wizard voor 'Accounting' aangeroepen.
     * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook het
       Nederlandse grootboekschema bevind.
 
@@ -112,25 +112,21 @@ Na installatie van deze module word de configuratie wizard voor "Accounting" aan
 
 Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit 4
 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal verhogen.
-De extra cijfers worden dan achter het rekeningnummer aangevult met "nullen".
+De extra cijfers worden dan achter het rekeningnummer aangevult met 'nullen'.
 
     """,
-    "author"  : "Veritos - Jan Verlaan",
-    "website" : "http://www.veritos.nl",
-    "depends" : ["account",
-                 "base_vat",
-                 "base_iban",
-                 "account_chart"
-                 ],
-    "init_xml" : [],
-    "update_xml" : ["account_chart_netherlands.xml",
-                    "l10n_nl_wizard.xml"
-                   ],
-    "demo_xml" : [
-                 ],
-
-    "installable": True,
-    'certificate': '00976041422960053277',
+    'author'  : 'Veritos - Jan Verlaan',
+    'website' : 'http://www.veritos.nl',
+    'depends' : ['account',
+                 'base_vat',
+                 'base_iban',
+                 'account_chart'
+    ],
+    'data' : ['account_chart_netherlands.xml',
+              'l10n_nl_wizard.xml'
+    ],
+    'demo' : [],
+    'installable': True,
     'images': ['images/config_chart_l10n_nl.jpeg','images/l10n_nl_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml
index 4c9fe63308b..f736c6f4895 100644
--- a/addons/l10n_nl/account_chart_netherlands.xml
+++ b/addons/l10n_nl/account_chart_netherlands.xml
@@ -1424,7 +1424,7 @@
                     <field name="reconcile" eval="True"/>
                     <field ref="a_15" name="parent_id"/>
                 </record>
-                <record id="vat_payable6" model="account.account.template">
+                <record id="vat_payable_low" model="account.account.template">
                     <field name="name">Btw af te dragen laag</field>
                     <field name="code">1601</field>
                     <field name="type">other</field>
@@ -1432,7 +1432,7 @@
                     <field name="reconcile" eval="False"/>
                     <field ref="a_15" name="parent_id"/>
                 </record>
-                <record id="vat_payable19" model="account.account.template">
+                <record id="vat_payable_high" model="account.account.template">
                     <field name="name">Btw af te dragen hoog</field>
                     <field name="code">1602</field>
                     <field name="type">other</field>
@@ -1448,7 +1448,7 @@
                     <field name="reconcile" eval="False"/>
                     <field ref="a_15" name="parent_id"/>
                 </record>
-                <record id="vat_refund6" model="account.account.template">
+                <record id="vat_refund_low" model="account.account.template">
                     <field name="name">Btw te vorderen laag</field>
                     <field name="code">1611</field>
                     <field name="type">other</field>
@@ -1456,7 +1456,7 @@
                     <field name="reconcile" eval="False"/>
                     <field ref="a_15" name="parent_id"/>
                 </record>
-                <record id="vat_refund19" model="account.account.template">
+                <record id="vat_refund_high" model="account.account.template">
                     <field name="name">Btw te vorderen hoog</field>
                     <field name="code">1612</field>
                     <field name="type">other</field>
@@ -3909,7 +3909,7 @@
         <record id="btw_code_1a" model="account.tax.code.template">
             <field name="code">1a</field>
             <field name="parent_id" ref="btw_code_binnenland"/>
-            <field name="name">Leveringen/diensten belast met 19% (BTW)</field>
+            <field name="name">Leveringen/diensten belast met 21% (BTW)</field>
         </record>
         <record id="btw_code_1b" model="account.tax.code.template">
             <field name="code">1b</field>
@@ -3955,11 +3955,13 @@
             <field name="code">4a</field>
             <field name="parent_id" ref="btw_code_vanuit_buitenland"/>
             <field name="name">Leveringen uit landen buiten de EU (invoer) (BTW)</field>
+            <field name="sign" eval="-1" />
         </record>
         <record id="btw_code_4b" model="account.tax.code.template">
             <field name="code">4b</field>
             <field name="parent_id" ref="btw_code_vanuit_buitenland"/>
             <field name="name">Verwerving van goederen uit landen binnen de EU (BTW)</field>
+            <field name="sign" eval="-1" />
         </record>
 <!-- 5. Voorbelasting, kleineondernemersregeling, schatting en eindtotaal -->
         <record id="btw_code_voorbelasting" model="account.tax.code.template">
@@ -4019,7 +4021,7 @@
         <record id="omz_code_1a" model="account.tax.code.template">
             <field name="code">1a</field>
             <field name="parent_id" ref="omz_code_binnenland"/>
-            <field name="name">Leveringen/diensten belast met 19% (omzet)</field>
+            <field name="name">Leveringen/diensten belast met 21% (omzet)</field>
         </record>
         <record id="omz_code_1b" model="account.tax.code.template">
             <field name="code">1b</field>
@@ -4147,22 +4149,22 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="description">6% BTW</field>
             <field eval="0.06" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_payable6"/>
-            <field name="account_paid_id" ref="vat_refund6"/>
+            <field name="account_collected_id" ref="vat_payable_low"/>
+            <field name="account_paid_id" ref="vat_refund_low"/>
             <field name="base_code_id" ref="omz_code_1b"/>
             <field name="tax_code_id" ref="btw_code_1b"/>
             <field name="ref_base_code_id" ref="omz_code_1b"/>
             <field name="ref_tax_code_id" ref="btw_code_1b"/>
             <field name="type_tax_use">sale</field>
         </record>
-        <record id="btw_19" model="account.tax.template">
+        <record id="btw_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Verkopen/omzet hoog</field>
-            <field name="description">19% BTW</field>
-            <field eval="0.19" name="amount"/>
+            <field name="description">21% BTW</field>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_payable19"/>
-            <field name="account_paid_id" ref="vat_refund19"/>
+            <field name="account_collected_id" ref="vat_payable_high"/>
+            <field name="account_paid_id" ref="vat_refund_high"/>
             <field name="base_code_id" ref="omz_code_1a"/>
             <field name="tax_code_id" ref="btw_code_1a"/>
             <field name="ref_base_code_id" ref="omz_code_1a"/>
@@ -4174,10 +4176,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Verkopen/omzet overig</field>
             <field name="description">variabel BTW</field>
-            <field eval="0.19" name="amount"/>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_payable19"/>
-            <field name="account_paid_id" ref="vat_refund19"/>
+            <field name="account_collected_id" ref="vat_payable_high"/>
+            <field name="account_paid_id" ref="vat_refund_high"/>
             <field name="base_code_id" ref="omz_code_1a"/>
             <field name="tax_code_id" ref="btw_code_1a"/>
             <field name="ref_base_code_id" ref="omz_code_1c"/>
@@ -4192,20 +4194,20 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="description">6% BTW</field>
             <field eval="0.06" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_refund6"/>
-            <field name="account_paid_id" ref="vat_payable6"/>
+            <field name="account_collected_id" ref="vat_refund_low"/>
+            <field name="account_paid_id" ref="vat_payable_low"/>
             <field name="tax_code_id" ref="btw_code_5b"/>
             <field name="ref_tax_code_id" ref="btw_code_5b"/>
             <field name="type_tax_use">purchase</field>
         </record>
-        <record id="btw_19_buy" model="account.tax.template">
+        <record id="btw_21_buy" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">BTW te vorderen hoog (inkopen)</field>
-            <field name="description">19% BTW</field>
-            <field eval="0.19" name="amount"/>
+            <field name="description">21% BTW</field>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_refund19"/>
-            <field name="account_paid_id" ref="vat_payable19"/>
+            <field name="account_collected_id" ref="vat_refund_high"/>
+            <field name="account_paid_id" ref="vat_payable_high"/>
             <field name="tax_code_id" ref="btw_code_5b"/>
             <field name="ref_tax_code_id" ref="btw_code_5b"/>
             <field name="type_tax_use">purchase</field>
@@ -4214,10 +4216,10 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">BTW te vorderen overig (inkopen)</field>
             <field name="description">variabel BTW</field>
-            <field eval="0.19" name="amount"/>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
-            <field name="account_collected_id" ref="vat_refund19"/>
-            <field name="account_paid_id" ref="vat_payable19"/>
+            <field name="account_collected_id" ref="vat_refund_high"/>
+            <field name="account_paid_id" ref="vat_payable_high"/>
             <field name="tax_code_id" ref="btw_code_5b"/>
             <field name="ref_tax_code_id" ref="btw_code_5b"/>
             <field name="type_tax_use">purchase</field>
@@ -4238,8 +4240,8 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
         <record id="btw_ink_0" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">BTW af te dragen verlegd (inkopen)</field>
-            <field name="description">19% BTW verlegd</field>
-            <field eval="0.19" name="amount"/>
+            <field name="description">21% BTW verlegd</field>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable_verlegd"/>
             <field name="account_paid_id" ref="vat_refund_verlegd"/>
@@ -4275,8 +4277,8 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
         <record id="btw_ink2_0" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">BTW te vorderen verlegd (inkopen)</field>
-            <field name="description">19% BTW verlegd</field>
-            <field eval="0.19" name="amount"/>
+            <field name="description">21% BTW verlegd</field>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_refund_verlegd"/>
             <field name="account_paid_id" ref="vat_payable_verlegd"/>
@@ -4325,11 +4327,11 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_I_6_1" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import binnen EU laag(1)</field>
-                            <field eval="1.00" name="amount"/>
+                            <field eval="-1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_I_6"/>
-                            <field name="account_collected_id" ref="vat_payable6"/>
-                            <field name="account_paid_id" ref="vat_payable6"/>
+                            <field name="account_collected_id" ref="vat_payable_low"/>
+                            <field name="account_paid_id" ref="vat_payable_low"/>
                             <field eval="btw_code_4b" name="tax_code_id"/>
                             <field eval="btw_code_4b" name="ref_tax_code_id"/>
                             <field name="type_tax_use">purchase</field>
@@ -4337,46 +4339,46 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_I_6_2" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import binnen EU laag(2)</field>
-                            <field eval="-1.00" name="amount"/>
+                            <field eval="1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_I_6"/>
-                            <field name="account_collected_id" ref="vat_refund6"/>
-                            <field name="account_paid_id" ref="vat_refund6"/>
+                            <field name="account_collected_id" ref="vat_refund_low"/>
+                            <field name="account_paid_id" ref="vat_refund_low"/>
                             <field eval="btw_code_5b" name="tax_code_id"/>
                             <field eval="btw_code_5b" name="ref_tax_code_id"/>
                             <field name="type_tax_use">purchase</field>
                         </record>
-        <record id="btw_I_19" model="account.tax.template">
+        <record id="btw_I_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Inkopen import binnen EU hoog</field>
-        <field name="description">19% BTW import binnen EU</field>
-            <field eval="0.19" name="amount"/>
+        <field name="description">21% BTW import binnen EU</field>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field eval="True" name="child_depend"/>
             <field eval="omz_code_4b" name="base_code_id"/>
             <field eval="omz_code_4b" name="ref_base_code_id"/>
             <field name="type_tax_use">purchase</field>
         </record>
-                        <record id="btw_I_19_1" model="account.tax.template">
+                        <record id="btw_I_21_1" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import binnen EU hoog(1)</field>
-                            <field eval="1.00" name="amount"/>
+                            <field eval="-1.00" name="amount"/>
                             <field name="type">percent</field>
-                            <field name="parent_id" ref="btw_I_19"/>
-                            <field name="account_collected_id" ref="vat_payable19"/>
-                            <field name="account_paid_id" ref="vat_payable19"/>
+                            <field name="parent_id" ref="btw_I_21"/>
+                            <field name="account_collected_id" ref="vat_payable_high"/>
+                            <field name="account_paid_id" ref="vat_payable_high"/>
                             <field eval="btw_code_4b" name="tax_code_id"/>
                             <field eval="btw_code_4b" name="ref_tax_code_id"/>
                             <field name="type_tax_use">purchase</field>
                         </record>
-                        <record id="btw_I_19_2" model="account.tax.template">
+                        <record id="btw_I_21_2" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import binnen EU hoog(2)</field>
-                            <field eval="-1.00" name="amount"/>
+                            <field eval="1.00" name="amount"/>
                             <field name="type">percent</field>
-                            <field name="parent_id" ref="btw_I_19"/>
-                            <field name="account_collected_id" ref="vat_refund19"/>
-                            <field name="account_paid_id" ref="vat_refund19"/>
+                            <field name="parent_id" ref="btw_I_21"/>
+                            <field name="account_collected_id" ref="vat_refund_high"/>
+                            <field name="account_paid_id" ref="vat_refund_high"/>
                             <field eval="btw_code_5b" name="tax_code_id"/>
                             <field eval="btw_code_5b" name="ref_tax_code_id"/>
                             <field name="type_tax_use">purchase</field>
@@ -4395,11 +4397,11 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_I_overig_1" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import binnen EU overig(1)</field>
-                            <field eval="1.00" name="amount"/>
+                            <field eval="-1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_I_overig"/>
-                            <field name="account_collected_id" ref="vat_payable19"/>
-                            <field name="account_paid_id" ref="vat_payable19"/>
+                            <field name="account_collected_id" ref="vat_payable_high"/>
+                            <field name="account_paid_id" ref="vat_payable_high"/>
                             <field eval="btw_code_4b" name="tax_code_id"/>
                             <field eval="btw_code_4b" name="ref_tax_code_id"/>
                             <field name="type_tax_use">purchase</field>
@@ -4407,11 +4409,11 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_I_overig_2" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import binnen EU overig(2)</field>
-                            <field eval="-1.00" name="amount"/>
+                            <field eval="1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_I_overig"/>
-                            <field name="account_collected_id" ref="vat_refund19"/>
-                            <field name="account_paid_id" ref="vat_refund19"/>
+                            <field name="account_collected_id" ref="vat_refund_high"/>
+                            <field name="account_paid_id" ref="vat_refund_high"/>
                             <field eval="btw_code_5b" name="tax_code_id"/>
                             <field eval="btw_code_5b" name="ref_tax_code_id"/>
                             <field name="type_tax_use">purchase</field>
@@ -4458,11 +4460,11 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_E1_1" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import buiten EU laag(1)</field>
-                            <field eval="1.00" name="amount"/>
+                            <field eval="-1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_E1"/>
-                            <field name="account_collected_id" ref="vat_payable6"/>
-                            <field name="account_paid_id" ref="vat_payable6"/>
+                            <field name="account_collected_id" ref="vat_payable_low"/>
+                            <field name="account_paid_id" ref="vat_payable_low"/>
                             <field eval="btw_code_4a" name="tax_code_id"/>
                             <field eval="btw_code_4a" name="ref_tax_code_id"/>
                             <field name="type_tax_use">purchase</field>
@@ -4470,11 +4472,11 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_E1_2" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import buiten EU laag(2)</field>
-                            <field eval="-1.00" name="amount"/>
+                            <field eval="1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_E1"/>
-                            <field name="account_collected_id" ref="vat_refund6"/>
-                            <field name="account_paid_id" ref="vat_refund6"/>
+                            <field name="account_collected_id" ref="vat_refund_low"/>
+                            <field name="account_paid_id" ref="vat_refund_low"/>
                             <field eval="btw_code_5b" name="tax_code_id"/>
                             <field eval="btw_code_5b" name="ref_tax_code_id"/>
                             <field name="type_tax_use">purchase</field>
@@ -4483,7 +4485,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Inkopen import buiten EU hoog</field>
         <field name="description">BTW import buiten EU</field>
-            <field eval="0.19" name="amount"/>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field eval="True" name="child_depend"/>
             <field eval="omz_code_4a" name="base_code_id"/>
@@ -4493,11 +4495,11 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_E2_1" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import buiten EU hoog(1)</field>
-                            <field eval="1.00" name="amount"/>
+                            <field eval="-1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_E2"/>
-                            <field name="account_collected_id" ref="vat_payable19"/>
-                            <field name="account_paid_id" ref="vat_payable19"/>
+                            <field name="account_collected_id" ref="vat_payable_high"/>
+                            <field name="account_paid_id" ref="vat_payable_high"/>
                             <field eval="btw_code_4a" name="tax_code_id"/>
                             <field eval="btw_code_4a" name="ref_tax_code_id"/>
                             <field name="type_tax_use">purchase</field>
@@ -4505,11 +4507,11 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_E2_2" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import buiten EU hoog(2)</field>
-                            <field eval="-1.00" name="amount"/>
+                            <field eval="1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_E2"/>
-                            <field name="account_collected_id" ref="vat_refund19"/>
-                            <field name="account_paid_id" ref="vat_refund19"/>
+                            <field name="account_collected_id" ref="vat_refund_high"/>
+                            <field name="account_paid_id" ref="vat_refund_high"/>
                             <field eval="btw_code_5b" name="tax_code_id"/>
                             <field eval="btw_code_5b" name="ref_tax_code_id"/>
                             <field name="type_tax_use">purchase</field>
@@ -4518,7 +4520,7 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
             <field name="chart_template_id" ref="l10nnl_chart_template"/>
             <field name="name">Inkopen import buiten EU overig</field>
         <field name="description">BTW import buiten EU</field>
-            <field eval="0.19" name="amount"/>
+            <field eval="0.21" name="amount"/>
             <field name="type">percent</field>
             <field eval="True" name="child_depend"/>
             <field eval="omz_code_4a" name="base_code_id"/>
@@ -4528,11 +4530,11 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_E_overig_1" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import buiten EU overig(1)</field>
-                            <field eval="1.00" name="amount"/>
+                            <field eval="-1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_E_overig"/>
-                            <field name="account_collected_id" ref="vat_payable19"/>
-                            <field name="account_paid_id" ref="vat_payable19"/>
+                            <field name="account_collected_id" ref="vat_payable_high"/>
+                            <field name="account_paid_id" ref="vat_payable_high"/>
                             <field eval="btw_code_4a" name="tax_code_id"/>
                             <field eval="btw_code_4a" name="ref_tax_code_id"/>
                             <field name="type_tax_use">purchase</field>
@@ -4540,11 +4542,11 @@ TODO rubriek 1c en 1d moeten nog, zijn variabel, dus BTW percentage moet door ge
                         <record id="btw_E_overig_2" model="account.tax.template">
                             <field name="chart_template_id" ref="l10nnl_chart_template"/>
                             <field name="name">Inkopen import buiten EU overig(2)</field>
-                            <field eval="-1.00" name="amount"/>
+                            <field eval="1.00" name="amount"/>
                             <field name="type">percent</field>
                             <field name="parent_id" ref="btw_E_overig"/>
-                            <field name="account_collected_id" ref="vat_refund19"/>
-                            <field name="account_paid_id" ref="vat_refund19"/>
+                            <field name="account_collected_id" ref="vat_refund_high"/>
+                            <field name="account_paid_id" ref="vat_refund_high"/>
                             <field eval="btw_code_5b" name="tax_code_id"/>
                             <field eval="btw_code_5b" name="ref_tax_code_id"/>
                             <field name="type_tax_use">purchase</field>
diff --git a/addons/l10n_nl/i18n/ar.po b/addons/l10n_nl/i18n/ar.po
index f31135f7407..28f6478549e 100644
--- a/addons/l10n_nl/i18n/ar.po
+++ b/addons/l10n_nl/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/ca.po b/addons/l10n_nl/i18n/ca.po
index 63b5268fc15..44f475d54b5 100644
--- a/addons/l10n_nl/i18n/ca.po
+++ b/addons/l10n_nl/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/da.po b/addons/l10n_nl/i18n/da.po
index fb588bf36bd..3c57f5498f7 100644
--- a/addons/l10n_nl/i18n/da.po
+++ b/addons/l10n_nl/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/es.po b/addons/l10n_nl/i18n/es.po
index 4db1b178789..8cc6ac1f0a0 100644
--- a/addons/l10n_nl/i18n/es.po
+++ b/addons/l10n_nl/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/es_CR.po b/addons/l10n_nl/i18n/es_CR.po
index 015ef8d5768..e6a3e8af94c 100644
--- a/addons/l10n_nl/i18n/es_CR.po
+++ b/addons/l10n_nl/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_nl
diff --git a/addons/l10n_nl/i18n/es_PY.po b/addons/l10n_nl/i18n/es_PY.po
index eadc2064b2c..28ba3d8e500 100644
--- a/addons/l10n_nl/i18n/es_PY.po
+++ b/addons/l10n_nl/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/gl.po b/addons/l10n_nl/i18n/gl.po
index 4f165282de1..973788d85a0 100644
--- a/addons/l10n_nl/i18n/gl.po
+++ b/addons/l10n_nl/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/it.po b/addons/l10n_nl/i18n/it.po
index f7308af1bef..af787fdb1e4 100644
--- a/addons/l10n_nl/i18n/it.po
+++ b/addons/l10n_nl/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/nl.po b/addons/l10n_nl/i18n/nl.po
index 8640accd2f9..59963862a54 100644
--- a/addons/l10n_nl/i18n/nl.po
+++ b/addons/l10n_nl/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-12-23 09:56+0000\n"
 "PO-Revision-Date: 2012-02-16 11:08+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
@@ -50,21 +50,20 @@ msgid ""
 msgstr ""
 "Na installatie van deze module word de configuratie wizard voor "
 "\"Accounting\" aangeroepen.\n"
-"* U krijgt een lijst met grootboektemplates aangeboden waarin zich ook het "
+"* U krijgt een lijst met grootboekschema's aangeboden waarin zich ook het "
 "Nederlandse grootboekschema bevind.\n"
 "* Als de configuratie wizard start, wordt u gevraagd om de naam van uw "
 "bedrijf in te voeren, welke grootboekschema te installeren, uit hoeveel "
 "cijfers een grootboekrekening mag bestaan, het rekeningnummer van uw bank en "
-"de currency om Journalen te creeren.\n"
+"de valuta om uw dagboeken te creeren.\n"
 "    \n"
-"Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit "
-"4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal "
-"verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult "
-"met \"nullen\"\n"
+"Let op!! -> Het Nederlandse rekeningschema is opgebouwd uit 4 cijfers. Dit "
+"is het minimale aantal welk u moet invullen, u mag het aantal verhogen. De "
+"extra cijfers worden dan achter het rekeningnummer aangevult met \"nullen\"\n"
 "    \n"
 "* Dit is dezelfe configuratie wizard welke aangeroepen kan worden via "
-"Financial Management/Configuration/Financial Accounting/Financial "
-"Accounts/Generate Chart of Accounts from a Chart Template.\n"
+"Financieel\\Instellingen\\ Financiële administratie/Nieuwe Financiële "
+"administratie.\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_cash
diff --git a/addons/l10n_nl/i18n/pt_BR.po b/addons/l10n_nl/i18n/pt_BR.po
index 9b6dbba1815..ff907d0a2fe 100644
--- a/addons/l10n_nl/i18n/pt_BR.po
+++ b/addons/l10n_nl/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/sr@latin.po b/addons/l10n_nl/i18n/sr@latin.po
index e6754c28a2b..86f6a4f70df 100644
--- a/addons/l10n_nl/i18n/sr@latin.po
+++ b/addons/l10n_nl/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/i18n/tr.po b/addons/l10n_nl/i18n/tr.po
index 78bb031c4e7..ce79b2c22eb 100644
--- a/addons/l10n_nl/i18n/tr.po
+++ b/addons/l10n_nl/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_nl
 #: model:account.account.type,name:l10n_nl.user_type_tax
diff --git a/addons/l10n_nl/l10n_nl_wizard.xml b/addons/l10n_nl/l10n_nl_wizard.xml
index bcdd183b12c..52aaa88fdab 100644
--- a/addons/l10n_nl/l10n_nl_wizard.xml
+++ b/addons/l10n_nl/l10n_nl_wizard.xml
@@ -1,19 +1,8 @@
 <openerp>
-    <data>
-
-    <record id="config_call_account_template" model="ir.actions.todo">
-        <field name="name">Genereer Grootboekrekingschema vanuit het Nederlandse Grootboek Template</field>
- <field name="note">Na installatie van deze module word de configuratie wizard voor "Accounting" aangeroepen.
-* U krijgt een lijst met grootboektemplates aangeboden waarin zich ook het Nederlandse grootboekschema bevind.
-* Als de configuratie wizard start, wordt u gevraagd om de naam van uw bedrijf in te voeren, welke grootboekschema te installeren, uit hoeveel cijfers een grootboekrekening mag bestaan, het rekeningnummer van uw bank en de currency om Journalen te creeren.
-    
-Let op!! -&gt; De template van het Nederlandse rekeningschema is opgebouwd uit 4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult met "nullen"
-    
-* Dit is dezelfe configuratie wizard welke aangeroepen kan worden via Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
-</field>
-        <field name="action_id" ref="account.action_wizard_multi_chart"/>
-        <field name="type">automatic</field>
-    </record>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/l10n_pe/__openerp__.py b/addons/l10n_pe/__openerp__.py
index 7908664ca83..f194576aa27 100644
--- a/addons/l10n_pe/__openerp__.py
+++ b/addons/l10n_pe/__openerp__.py
@@ -17,36 +17,31 @@
 #    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": "Peru Localization Chart Account",
-    "version": "1.0",
-    "description": """
-Peruvian accounting chart and tax localization. Acording the PCGE 2010.
+    'name': 'Peru Localization Chart Account',
+    'version': '1.0',
+    'description': """
+Peruvian accounting chart and tax localization. According the PCGE 2010.
+========================================================================
 
 Plan contable peruano e impuestos de acuerdo a disposiciones vigentes de la
 SUNAT 2011 (PCGE 2010).
 
     """,
-    "author": ["Cubic ERP"],
-    "website": "http://cubicERP.com",
-    "category": "Localization/Account Charts",
-    "depends": [
-			"account_chart",
-			],
-	"data":[
-        "account_tax_code.xml",
-        "l10n_pe_chart.xml",
-        "account_tax.xml",
-        "l10n_pe_wizard.xml",			
-			],
-    "demo_xml": [
-			],
-    "update_xml": [
-			],
-    "active": False,
-    "installable": True,
-    "certificate" : "0045046493412",
+    'author': ['Cubic ERP'],
+    'website': 'http://cubicERP.com',
+    'category': 'Localization/Account Charts',
+    'depends': ['account_chart'],
+    'data':[
+        'account_tax_code.xml',
+        'l10n_pe_chart.xml',
+        'account_tax.xml',
+        'l10n_pe_wizard.xml',
+    ],
+    'demo': [],
+    'active': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_pe.jpeg','images/l10n_pe_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_pe/i18n/ar.po b/addons/l10n_pe/i18n/ar.po
new file mode 100644
index 00000000000..90dcc9a47f6
--- /dev/null
+++ b/addons/l10n_pe/i18n/ar.po
@@ -0,0 +1,47 @@
+# Arabic translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2012-11-16 18:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Arabic <ar@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-17 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
+
+#. module: l10n_pe
+#: model:ir.module.module,description:l10n_pe.module_meta_information
+msgid ""
+"\n"
+"    Peruvian Accounting : chart of Account\n"
+"    "
+msgstr ""
+
+#. module: l10n_pe
+#: model:ir.module.module,shortdesc:l10n_pe.module_meta_information
+msgid "Peruvian Chart of Account"
+msgstr ""
+
+#. module: l10n_pe
+#: model:ir.actions.todo,note:l10n_pe.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"إعداد شجرة الحسابات من قالب. ستم سؤالك عن اسم المنشأة، القالب المتبع، و "
+"إعداد أكواد الحسابات و البنوك، بالإضافة إلي يوميات العملة. و لذلك سيكون هناك "
+"قالب جديد. \n"
+"\tهذه لإعداد الحسابات."
diff --git a/addons/l10n_pe/i18n/br.po b/addons/l10n_pe/i18n/br.po
index acebb764fd5..c839fd418f3 100644
--- a/addons/l10n_pe/i18n/br.po
+++ b/addons/l10n_pe/i18n/br.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 16:11+0000\n"
+"PO-Revision-Date: 2012-10-18 12:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Breton <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: 2011-01-20 04:54+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pe
 #: model:ir.module.module,description:l10n_pe.module_meta_information
diff --git a/addons/l10n_pe/i18n/ca.po b/addons/l10n_pe/i18n/ca.po
index 11c546cfbb8..e94104e879d 100644
--- a/addons/l10n_pe/i18n/ca.po
+++ b/addons/l10n_pe/i18n/ca.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-13 02:08+0000\n"
+"PO-Revision-Date: 2012-10-18 12:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-15 04:37+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pe
 #: model:ir.module.module,description:l10n_pe.module_meta_information
diff --git a/addons/l10n_pe/i18n/de.po b/addons/l10n_pe/i18n/de.po
index a28c103e0d8..2804fe173fb 100644
--- a/addons/l10n_pe/i18n/de.po
+++ b/addons/l10n_pe/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-12 20:10+0000\n"
+"PO-Revision-Date: 2012-10-18 12:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-15 05:56+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pe
 #: model:ir.module.module,description:l10n_pe.module_meta_information
diff --git a/addons/l10n_pe/i18n/es.po b/addons/l10n_pe/i18n/es.po
index d057bc56445..13d563b0861 100644
--- a/addons/l10n_pe/i18n/es.po
+++ b/addons/l10n_pe/i18n/es.po
@@ -1,72 +1,54 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-10 13:46+0000\n"
-"Last-Translator: Yury Tello <ytello@cubicerp.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: 2011-01-15 05:56+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
-
-#. module: l10n_pe
-#: model:ir.module.module,description:l10n_pe.module_meta_information
-msgid ""
-"\n"
-"    Peruvian Accounting : chart of Account\n"
-"    "
-msgstr ""
-"\n"
-"    Contabilidad Peruana : Plan de cuentas\n"
-"    "
-
-#. module: l10n_pe
-#: model:ir.module.module,shortdesc:l10n_pe.module_meta_information
-msgid "Peruvian Chart of Account"
-msgstr "Plan de cuentas del Per�"
-
-#. module: l10n_pe
-#: model:ir.actions.todo,note:l10n_pe.config_call_account_template_in_minimal
-msgid ""
-"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
-"the name of the company, the chart template to follow, the no. of digits to "
-"generate the code for your accounts and Bank account, currency to create "
-"Journals. Thus,the pure copy of chart Template is generated.\n"
-"\tThis is the same wizard that runs from Financial "
-"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
-"Chart of Accounts from a Chart Template."
-msgstr ""
-"Generar el plan contable a partir de una plantilla de plan contable. Se le "
-"pedir� el nombre de la compa�ia, la plantilla de plan contable a utilizar, "
-"el n�mero de d�gitos para generar el c�digo de las cuentas y de la cuenta "
-"bancaria, la moneda para crear los diarios. As� pues, se genere una copia "
-"exacta de la plantilla de plan contable.\n"
-"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
-"Configuraci�n / Contabilidad financiera / Cuentas financieras / Generar el "
-"plan contable a partir de una plantilla de plan contable."
-
-#~ msgid "Liability"
-#~ msgstr "Pasivo"
-
-#~ msgid "Asset"
-#~ msgstr "Activo"
-
-#~ msgid "Closed"
-#~ msgstr "Cerrado"
-
-#~ msgid "Income"
-#~ msgstr "Ingreso"
-
-#~ msgid "Expense"
-#~ msgstr "Gasto"
-
-#~ msgid "View"
-#~ msgstr "Vista"
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2012-10-18 15:51+0000\n"
+"Last-Translator: Cubic ERP <ytello@cubicerp.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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_pe
+#: model:ir.module.module,description:l10n_pe.module_meta_information
+msgid ""
+"\n"
+"    Peruvian Accounting : chart of Account\n"
+"    "
+msgstr ""
+"\n"
+"    Contabilidad Peruana : Plan de cuentas\n"
+"    "
+
+#. module: l10n_pe
+#: model:ir.module.module,shortdesc:l10n_pe.module_meta_information
+msgid "Peruvian Chart of Account"
+msgstr "Plan de cuentas del Per�"
+
+#. module: l10n_pe
+#: model:ir.actions.todo,note:l10n_pe.config_call_account_template_in_minimal
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generar el plan contable a partir de una plantilla de plan contable. Se le "
+"pedir� el nombre de la compa�ia, la plantilla de plan contable a utilizar, "
+"el n�mero de d�gitos para generar el c�digo de las cuentas y de la cuenta "
+"bancaria, la moneda para crear los diarios. As� pues, se genere una copia "
+"exacta de la plantilla de plan contable.\n"
+"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / "
+"Configuraci�n / Contabilidad financiera / Cuentas financieras / Generar el "
+"plan contable a partir de una plantilla de plan contable."
diff --git a/addons/l10n_pe/i18n/et.po b/addons/l10n_pe/i18n/et.po
index b296d3eb485..b8eb621dcac 100644
--- a/addons/l10n_pe/i18n/et.po
+++ b/addons/l10n_pe/i18n/et.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 16:11+0000\n"
+"PO-Revision-Date: 2012-10-18 12:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-01-20 04:54+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pe
 #: model:ir.module.module,description:l10n_pe.module_meta_information
diff --git a/addons/l10n_pe/i18n/fr.po b/addons/l10n_pe/i18n/fr.po
index 450c2ed1e26..25da4cc7e27 100644
--- a/addons/l10n_pe/i18n/fr.po
+++ b/addons/l10n_pe/i18n/fr.po
@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-05 22:03+0000\n"
+"PO-Revision-Date: 2012-10-18 12:00+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-15 05:56+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pe
 #: model:ir.module.module,description:l10n_pe.module_meta_information
diff --git a/addons/l10n_pe/i18n/gl.po b/addons/l10n_pe/i18n/gl.po
index d7ebb08204d..b35dc73919c 100644
--- a/addons/l10n_pe/i18n/gl.po
+++ b/addons/l10n_pe/i18n/gl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-11 13:08+0000\n"
+"PO-Revision-Date: 2012-10-18 12:00+0000\n"
 "Last-Translator: Alberto Luengo Cabanillas (Pexego) <alberto@pexego.es>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-02-12 05:00+0000\n"
-"X-Generator: Launchpad (build 12351)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pe
 #: model:ir.module.module,description:l10n_pe.module_meta_information
diff --git a/addons/l10n_pe/i18n/hu.po b/addons/l10n_pe/i18n/hu.po
index f7d6ceb4240..cc66826cf3e 100644
--- a/addons/l10n_pe/i18n/hu.po
+++ b/addons/l10n_pe/i18n/hu.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-10 10:46+0000\n"
+"PO-Revision-Date: 2012-10-18 12:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-15 05:56+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pe
 #: model:ir.module.module,description:l10n_pe.module_meta_information
diff --git a/addons/l10n_pe/i18n/it.po b/addons/l10n_pe/i18n/it.po
index 72ea1497acc..47c0e30fe9e 100644
--- a/addons/l10n_pe/i18n/it.po
+++ b/addons/l10n_pe/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-10 16:30+0000\n"
+"PO-Revision-Date: 2012-10-18 12:00+0000\n"
 "Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-15 05:56+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pe
 #: model:ir.module.module,description:l10n_pe.module_meta_information
diff --git a/addons/l10n_pe/i18n/pt.po b/addons/l10n_pe/i18n/pt.po
index c27aa084cf9..6b4218a47d3 100644
--- a/addons/l10n_pe/i18n/pt.po
+++ b/addons/l10n_pe/i18n/pt.po
@@ -8,30 +8,30 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 16:11+0000\n"
+"PO-Revision-Date: 2012-10-18 12:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-20 04:54+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
-#. module: l10n_in
-#: model:ir.module.module,description:l10n_in.module_meta_information
+#. module: l10n_pe
+#: model:ir.module.module,description:l10n_pe.module_meta_information
 msgid ""
 "\n"
 "    Peruvian Accounting : chart of Account\n"
 "    "
 msgstr ""
 
-#. module: l10n_in
-#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
+#. module: l10n_pe
+#: model:ir.module.module,shortdesc:l10n_pe.module_meta_information
 msgid "Peruvian Chart of Account"
 msgstr ""
 
-#. module: l10n_in
-#: model:ir.actions.todo,note:l10n_in.config_call_account_template_in_minimal
+#. module: l10n_pe
+#: model:ir.actions.todo,note:l10n_pe.config_call_account_template_in_minimal
 msgid ""
 "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
 "the name of the company, the chart template to follow, the no. of digits to "
diff --git a/addons/l10n_pe/i18n/pt_BR.po b/addons/l10n_pe/i18n/pt_BR.po
index 21c2a8bd80c..c2383ad2db5 100644
--- a/addons/l10n_pe/i18n/pt_BR.po
+++ b/addons/l10n_pe/i18n/pt_BR.po
@@ -8,17 +8,17 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-10 23:12+0000\n"
+"PO-Revision-Date: 2012-10-18 12:00+0000\n"
 "Last-Translator: Emerson <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: 2011-03-12 05:02+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
-#. module: l10n_in
-#: model:ir.module.module,description:l10n_in.module_meta_information
+#. module: l10n_pe
+#: model:ir.module.module,description:l10n_pe.module_meta_information
 msgid ""
 "\n"
 "    Peruvian Accounting : chart of Account\n"
@@ -28,13 +28,13 @@ msgstr ""
 "    Peruvian Accounting : chart of Account\n"
 "    "
 
-#. module: l10n_in
-#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
+#. module: l10n_pe
+#: model:ir.module.module,shortdesc:l10n_pe.module_meta_information
 msgid "Peruvian Chart of Account"
 msgstr "Peruvian Chart of Account"
 
-#. module: l10n_in
-#: model:ir.actions.todo,note:l10n_in.config_call_account_template_in_minimal
+#. module: l10n_pe
+#: model:ir.actions.todo,note:l10n_pe.config_call_account_template_in_minimal
 msgid ""
 "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
 "the name of the company, the chart template to follow, the no. of digits to "
diff --git a/addons/l10n_pe/i18n/ru.po b/addons/l10n_pe/i18n/ru.po
index 330f1591d3c..5dd728bcd36 100644
--- a/addons/l10n_pe/i18n/ru.po
+++ b/addons/l10n_pe/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 16:11+0000\n"
+"PO-Revision-Date: 2012-10-18 12:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2011-01-20 04:54+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pe
 #: model:ir.module.module,description:l10n_pe.module_meta_information
diff --git a/addons/l10n_pe/i18n/sr@latin.po b/addons/l10n_pe/i18n/sr@latin.po
index 5278a934ef5..62e6c5e042c 100644
--- a/addons/l10n_pe/i18n/sr@latin.po
+++ b/addons/l10n_pe/i18n/sr@latin.po
@@ -8,30 +8,30 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-10 18:21+0000\n"
-"Last-Translator: Milan Milosevic <Unknown>\n"
+"PO-Revision-Date: 2012-10-18 15:51+0000\n"
+"Last-Translator: Stephane Wirtel (OpenERP) <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-15 05:56+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
-#. module: l10n_in
-#: model:ir.module.module,description:l10n_in.module_meta_information
+#. module: l10n_pe
+#: model:ir.module.module,description:l10n_pe.module_meta_information
 msgid ""
 "\n"
 "    Peruvian Accounting : chart of Account\n"
 "    "
 msgstr ""
 
-#. module: l10n_in
-#: model:ir.module.module,shortdesc:l10n_in.module_meta_information
+#. module: l10n_pe
+#: model:ir.module.module,shortdesc:l10n_pe.module_meta_information
 msgid "Peruvian Chart of Account"
 msgstr ""
 
-#. module: l10n_in
-#: model:ir.actions.todo,note:l10n_in.config_call_account_template_in_minimal
+#. module: l10n_pe
+#: model:ir.actions.todo,note:l10n_pe.config_call_account_template_in_minimal
 msgid ""
 "Generate Chart of Accounts from a Chart Template. You will be asked to pass "
 "the name of the company, the chart template to follow, the no. of digits to "
@@ -41,12 +41,3 @@ msgid ""
 "Management/Configuration/Financial Accounting/Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
-
-#~ msgid "Expense"
-#~ msgstr "Trošak"
-
-#~ msgid "View"
-#~ msgstr "Pregled"
-
-#~ msgid "Expense View"
-#~ msgstr "Pregled troškova"
diff --git a/addons/l10n_pe/i18n/sv.po b/addons/l10n_pe/i18n/sv.po
index 769daab0c98..68caaca8df1 100644
--- a/addons/l10n_pe/i18n/sv.po
+++ b/addons/l10n_pe/i18n/sv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-19 16:11+0000\n"
+"PO-Revision-Date: 2012-10-18 12:00+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-20 04:54+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pe
 #: model:ir.module.module,description:l10n_pe.module_meta_information
diff --git a/addons/l10n_pe/l10n_pe_wizard.xml b/addons/l10n_pe/l10n_pe_wizard.xml
index e1189fbcc2d..82e7671b4d3 100644
--- a/addons/l10n_pe/l10n_pe_wizard.xml
+++ b/addons/l10n_pe/l10n_pe_wizard.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
-        <record id="config_call_account_template_pe" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-                <field name="type">automatic</field>
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
 
     </data>
diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index 4b75dd92b79..a14828fe9de 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -21,12 +21,12 @@
 #
 ##############################################################################
 {
-    "name" : "Poland - Accounting",
-    "version" : "1.0",
-    "author" : "Grzegorz Grzelak (Cirrus)",
-    "website": "http://www.cirrus.pl",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name' : 'Poland - Accounting',
+    'version' : '1.0',
+    'author' : 'Grzegorz Grzelak (Cirrus)',
+    'website': 'http://www.cirrus.pl',
+    'category' : 'Localization/Account Charts',
+    'description': """
 This is the module to manage the accounting chart and taxes for Poland in OpenERP.
 ==================================================================================
 
@@ -34,13 +34,13 @@ To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do po
 VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów zakładając,
 że wszystkie towary są w obrocie hurtowym.
     """,
-    "depends" : ["account", "base_iban", "base_vat", "account_chart"],
-    "demo_xml" : [],
-    "update_xml" : ['account_tax_code.xml',"account_chart.xml",
-                    'account_tax.xml','l10n_chart_pl_wizard.xml'],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00885794372803776829",
+    'depends' : ['account', 'base_iban', 'base_vat', 'account_chart'],
+    'demo' : [],
+    'data' : ['account_tax_code.xml','account_chart.xml',
+              'account_tax.xml','l10n_chart_pl_wizard.xml'
+    ],
+    'auto_install': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_pl.jpeg','images/l10n_pl_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_pl/i18n/ar.po b/addons/l10n_pl/i18n/ar.po
index 3a54fc87858..19256cf7ad8 100644
--- a/addons/l10n_pl/i18n/ar.po
+++ b/addons/l10n_pl/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/ca.po b/addons/l10n_pl/i18n/ca.po
index 64d28793f7e..b9226e458d3 100644
--- a/addons/l10n_pl/i18n/ca.po
+++ b/addons/l10n_pl/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/da.po b/addons/l10n_pl/i18n/da.po
index 5646b731c78..c5f9b99d565 100644
--- a/addons/l10n_pl/i18n/da.po
+++ b/addons/l10n_pl/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/es.po b/addons/l10n_pl/i18n/es.po
index 07005edb1fe..85cf3343058 100644
--- a/addons/l10n_pl/i18n/es.po
+++ b/addons/l10n_pl/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/es_CR.po b/addons/l10n_pl/i18n/es_CR.po
index 1631e416441..cba0f6847d0 100644
--- a/addons/l10n_pl/i18n/es_CR.po
+++ b/addons/l10n_pl/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_pl
diff --git a/addons/l10n_pl/i18n/es_PY.po b/addons/l10n_pl/i18n/es_PY.po
index cb2c17425e2..864dc20dfbd 100644
--- a/addons/l10n_pl/i18n/es_PY.po
+++ b/addons/l10n_pl/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/gl.po b/addons/l10n_pl/i18n/gl.po
index 0edb181d228..7afa6c37024 100644
--- a/addons/l10n_pl/i18n/gl.po
+++ b/addons/l10n_pl/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/it.po b/addons/l10n_pl/i18n/it.po
index 7db71a4d21b..24856f59aec 100644
--- a/addons/l10n_pl/i18n/it.po
+++ b/addons/l10n_pl/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/pt_BR.po b/addons/l10n_pl/i18n/pt_BR.po
index 815358abf18..69b241205e7 100644
--- a/addons/l10n_pl/i18n/pt_BR.po
+++ b/addons/l10n_pl/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/sr@latin.po b/addons/l10n_pl/i18n/sr@latin.po
index 5de1720b3c9..d3468dbf342 100644
--- a/addons/l10n_pl/i18n/sr@latin.po
+++ b/addons/l10n_pl/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/i18n/tr.po b/addons/l10n_pl/i18n/tr.po
index 0b94e1e246a..53d55c8d6ec 100644
--- a/addons/l10n_pl/i18n/tr.po
+++ b/addons/l10n_pl/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_pl
 #: model:account.account.type,name:l10n_pl.account_type_view
diff --git a/addons/l10n_pl/l10n_chart_pl_wizard.xml b/addons/l10n_pl/l10n_chart_pl_wizard.xml
index aded9e3b2a3..52aaa88fdab 100644
--- a/addons/l10n_pl/l10n_chart_pl_wizard.xml
+++ b/addons/l10n_pl/l10n_chart_pl_wizard.xml
@@ -1,12 +1,7 @@
 <openerp>
-    <data>
-
-        <record id="config_call_account_template_pl_chart" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
 
     </data>
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
index f76eb178776..8026d49c3db 100644
--- a/addons/l10n_ro/__openerp__.py
+++ b/addons/l10n_ro/__openerp__.py
@@ -20,23 +20,22 @@
 #
 ##############################################################################
 {
-    "name" : "Romania - Accounting",
-    "version" : "1.1",
-    "author" : "filsys",
-    "website": "http://www.filsystem.ro",
-    "category" : "Localization/Account Charts",
-    "depends" : ["account_chart", 'base_vat'],
-    "description": """
+    'name' : 'Romania - Accounting',
+    'version' : '1.1',
+    'author' : 'filsys',
+    'website': 'http://www.filsystem.ro',
+    'category' : 'Localization/Account Charts',
+    'depends' : ['account_chart', 'base_vat'],
+    'description': """
 This is the module to manage the accounting chart, VAT structure and Registration Number for Romania in OpenERP.
 ================================================================================================================
 
 Romanian accounting chart and localization.
     """,
-    "demo_xml" : [],
-    "update_xml" : ['partner_view.xml','account_tax_code.xml','account_chart.xml','account_tax.xml','l10n_chart_ro_wizard.xml'],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "001308250150602948125",
+    'demo' : [],
+    'data' : ['partner_view.xml','account_tax_code.xml','account_chart.xml','account_tax.xml','l10n_chart_ro_wizard.xml'],
+    'auto_install': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_ro.jpeg','images/l10n_ro_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ro/i18n/ar.po b/addons/l10n_ro/i18n/ar.po
index 0cec0acae10..4dfce1b2d2f 100644
--- a/addons/l10n_ro/i18n/ar.po
+++ b/addons/l10n_ro/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/ca.po b/addons/l10n_ro/i18n/ca.po
index 2d391111574..36971bd8965 100644
--- a/addons/l10n_ro/i18n/ca.po
+++ b/addons/l10n_ro/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/da.po b/addons/l10n_ro/i18n/da.po
index 136187ac283..43bb290d6da 100644
--- a/addons/l10n_ro/i18n/da.po
+++ b/addons/l10n_ro/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/es.po b/addons/l10n_ro/i18n/es.po
index b924e41ceda..3736d2c337b 100644
--- a/addons/l10n_ro/i18n/es.po
+++ b/addons/l10n_ro/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/es_CR.po b/addons/l10n_ro/i18n/es_CR.po
index 8c69c5e9a40..ed0f596c042 100644
--- a/addons/l10n_ro/i18n/es_CR.po
+++ b/addons/l10n_ro/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_ro
diff --git a/addons/l10n_ro/i18n/es_PY.po b/addons/l10n_ro/i18n/es_PY.po
index 189f463e4ab..761226abd1c 100644
--- a/addons/l10n_ro/i18n/es_PY.po
+++ b/addons/l10n_ro/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/gl.po b/addons/l10n_ro/i18n/gl.po
index 4ad9458004c..0714d850984 100644
--- a/addons/l10n_ro/i18n/gl.po
+++ b/addons/l10n_ro/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/it.po b/addons/l10n_ro/i18n/it.po
index 2f94340346b..088ec8339ed 100644
--- a/addons/l10n_ro/i18n/it.po
+++ b/addons/l10n_ro/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/pt.po b/addons/l10n_ro/i18n/pt.po
index 966f99ffb84..d6c4ba7f058 100644
--- a/addons/l10n_ro/i18n/pt.po
+++ b/addons/l10n_ro/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/pt_BR.po b/addons/l10n_ro/i18n/pt_BR.po
index be57076a113..2de8156b432 100644
--- a/addons/l10n_ro/i18n/pt_BR.po
+++ b/addons/l10n_ro/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/ro.po b/addons/l10n_ro/i18n/ro.po
index 866eb5efc49..e85de58e887 100644
--- a/addons/l10n_ro/i18n/ro.po
+++ b/addons/l10n_ro/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/sr@latin.po b/addons/l10n_ro/i18n/sr@latin.po
index 335aa44e00a..528987af498 100644
--- a/addons/l10n_ro/i18n/sr@latin.po
+++ b/addons/l10n_ro/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/i18n/tr.po b/addons/l10n_ro/i18n/tr.po
index 4b01828bb58..55ef071a165 100644
--- a/addons/l10n_ro/i18n/tr.po
+++ b/addons/l10n_ro/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ro
 #: model:account.account.type,name:l10n_ro.account_type_receivable
diff --git a/addons/l10n_ro/l10n_chart_ro_wizard.xml b/addons/l10n_ro/l10n_chart_ro_wizard.xml
index bafb7b26f82..52aaa88fdab 100644
--- a/addons/l10n_ro/l10n_chart_ro_wizard.xml
+++ b/addons/l10n_ro/l10n_chart_ro_wizard.xml
@@ -1,12 +1,7 @@
 <openerp>
-    <data>
-
-        <record id="config_call_account_template_ro" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
 
     </data>
diff --git a/addons/l10n_ro/partner_view.xml b/addons/l10n_ro/partner_view.xml
index 448f9b49639..b3549e5f5a8 100644
--- a/addons/l10n_ro/partner_view.xml
+++ b/addons/l10n_ro/partner_view.xml
@@ -6,9 +6,9 @@
             <field name="inherit_id" ref="base_vat.view_partner_form"/>
             <field name="model">res.partner</field>
             <field name="arch" type="xml">
-                <field name="vat" position="after">
+               <xpath expr="//div[@name='vat_info']" position="after">
                     <field name="nrc"/>
-                </field>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/l10n_syscohada/__openerp__.py b/addons/l10n_syscohada/__openerp__.py
index 2fd6917ec11..73b999d66ba 100644
--- a/addons/l10n_syscohada/__openerp__.py
+++ b/addons/l10n_syscohada/__openerp__.py
@@ -20,26 +20,29 @@
 ##############################################################################
 
 {
-    "name" : "OHADA - Accounting",
-    "version" : "1.0",
-    "author" : "Baamtu Senegal",
-    "category" : "Localization/Account Charts",
-    "description": """
+    'name' : 'OHADA - Accounting',
+    'version' : '1.0',
+    'author' : 'Baamtu Senegal',
+    'category' : 'Localization/Account Charts',
+    'description': """
 This module implements the accounting chart for OHADA area.
 ===========================================================
     
 It allows any company or association to manage its financial accounting.
+
 Countries that use OHADA are the following:
+-------------------------------------------
     Benin, Burkina Faso, Cameroon, Central African Republic, Comoros, Congo,
+    
     Ivory Coast, Gabon, Guinea, Guinea Bissau, Equatorial Guinea, Mali, Niger,
+    
     Replica of Democratic Congo, Senegal, Chad, Togo.
     """,
-    "website": "http://www.baamtu.com",
-    "depends" : ["account", "base_vat"],
-    "demo_xml" : [],
-    "init_xml":[],
-    "update_xml" : ["l10n_syscohada_data.xml","l10n_syscohada_wizard.xml"],
-    "auto_install": False,
-    "installable": True
+    'website': 'http://www.baamtu.com',
+    'depends' : ['account', 'base_vat'],
+    'demo' : [],
+    'data' : ['l10n_syscohada_data.xml','l10n_syscohada_wizard.xml'],
+    'auto_install': False,
+    'installable': True
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_syscohada/i18n/ar.po b/addons/l10n_syscohada/i18n/ar.po
index 5fcfa96f387..5a2a1deca35 100644
--- a/addons/l10n_syscohada/i18n/ar.po
+++ b/addons/l10n_syscohada/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_syscohada
 #: model:account.account.type,name:l10n_syscohada.account_type_receivable
diff --git a/addons/l10n_syscohada/i18n/ca.po b/addons/l10n_syscohada/i18n/ca.po
index 122b6329385..9adf49310d3 100644
--- a/addons/l10n_syscohada/i18n/ca.po
+++ b/addons/l10n_syscohada/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_syscohada
 #: model:account.account.type,name:l10n_syscohada.account_type_receivable
diff --git a/addons/l10n_syscohada/i18n/es.po b/addons/l10n_syscohada/i18n/es.po
index 9c2e7bb8570..f577c2331e1 100644
--- a/addons/l10n_syscohada/i18n/es.po
+++ b/addons/l10n_syscohada/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_syscohada
 #: model:account.account.type,name:l10n_syscohada.account_type_receivable
diff --git a/addons/l10n_syscohada/i18n/es_CR.po b/addons/l10n_syscohada/i18n/es_CR.po
index 13f919ba337..80cd32279da 100644
--- a/addons/l10n_syscohada/i18n/es_CR.po
+++ b/addons/l10n_syscohada/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_syscohada
diff --git a/addons/l10n_syscohada/i18n/fr.po b/addons/l10n_syscohada/i18n/fr.po
index cb911528f46..0833fe8144d 100644
--- a/addons/l10n_syscohada/i18n/fr.po
+++ b/addons/l10n_syscohada/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-12-23 09:56+0000\n"
-"PO-Revision-Date: 2011-06-20 13:17+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-10-18 14:08+0000\n"
+"Last-Translator: Stephane Wirtel (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: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_syscohada
 #: model:account.account.type,name:l10n_syscohada.account_type_receivable
diff --git a/addons/l10n_syscohada/i18n/pt.po b/addons/l10n_syscohada/i18n/pt.po
index aabdc1ac12f..acac4c11437 100644
--- a/addons/l10n_syscohada/i18n/pt.po
+++ b/addons/l10n_syscohada/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_syscohada
 #: model:account.account.type,name:l10n_syscohada.account_type_receivable
diff --git a/addons/l10n_syscohada/i18n/ro.po b/addons/l10n_syscohada/i18n/ro.po
index 43eb5062a55..e55251b6d9c 100644
--- a/addons/l10n_syscohada/i18n/ro.po
+++ b/addons/l10n_syscohada/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_syscohada
 #: model:account.account.type,name:l10n_syscohada.account_type_receivable
diff --git a/addons/l10n_syscohada/i18n/tr.po b/addons/l10n_syscohada/i18n/tr.po
index 5a8a42a8e58..013afdb54ec 100644
--- a/addons/l10n_syscohada/i18n/tr.po
+++ b/addons/l10n_syscohada/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_syscohada
 #: model:account.account.type,name:l10n_syscohada.account_type_receivable
diff --git a/addons/l10n_syscohada/l10n_syscohada_data.xml b/addons/l10n_syscohada/l10n_syscohada_data.xml
index feeea3a2314..d90988e00e3 100644
--- a/addons/l10n_syscohada/l10n_syscohada_data.xml
+++ b/addons/l10n_syscohada/l10n_syscohada_data.xml
@@ -1816,15 +1816,15 @@
     #
     -->
 
-      <record id="base.CFA" model="res.currency">
+      <record id="base.XOF" model="res.currency">
         <field name="name">XOF</field>
         <field name="symbol">CFA</field>
         <field name="rounding">1</field>
         <field name="accuracy">4</field>
     </record>
-    <record id="base.rateCFA" model="res.currency.rate">
+    <record id="base.rateXOF" model="res.currency.rate">
            <field name="rate">655.957</field>
-           <field name="currency_id" ref="base.CFA"/>
+           <field name="currency_id" ref="base.XOF"/>
            <field eval="time.strftime('%Y-01-01')" name="name"/>
        </record>
            <!--
diff --git a/addons/l10n_syscohada/l10n_syscohada_wizard.xml b/addons/l10n_syscohada/l10n_syscohada_wizard.xml
index 7174ef438b7..dde7a77516a 100644
--- a/addons/l10n_syscohada/l10n_syscohada_wizard.xml
+++ b/addons/l10n_syscohada/l10n_syscohada_wizard.xml
@@ -1,11 +1,7 @@
 <openerp>
-    <data>
-    <record id="config_call_account_template_syscohada" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a SYSCOHADA Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
-    </record>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index c1534787721..94340954abc 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -32,10 +32,8 @@ Thai accounting chart and localization.
     'author': 'Almacom',
     'website': 'http://almacom.co.th/',
     'depends': ['account_chart'],
-    'init_xml': [],
-    'update_xml': [ 'account_data.xml' ],
+    'data': [ 'account_data.xml' ],
     'installable': True,
-    'certificate' : '00722263103978957725',
     'images': ['images/config_chart_l10n_th.jpeg','images/l10n_th_chart.jpeg'],
 }
 
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index 48e7b4f33d6..9ae3d9e3364 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -26,7 +26,6 @@
 <record id="a_root" model="account.account.template">
     <field name="code">0</field>
     <field name="name">Simple chart of accounts</field>
-    <field name="parent_id" eval="False"/>
     <field name="type">view</field>
     <field name="user_type" ref="acc_type_view"/>
 </record>
@@ -642,16 +641,12 @@
     <field name="account_paid_id" ref="a_wht_income"/>
     <field name="type_tax_use">sale</field>
 </record>
+</data>
 
-<!-- INSTALL ACTION -->
-
-<record id="config_call_account_template_th" model="ir.actions.todo">
-    <field name="name">Generate Chart of Accounts from a Chart Template</field>
-    <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-    <field name="action_id" ref="account.action_wizard_multi_chart"/>
-    <field name="type">automatic</field>
- </record>
-
+<data noupdate="1">
+        <!-- INSTALL ACTION -->
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
+        </record>
 </data>
 </openerp><!-- vim: set fdm=marker : -->
diff --git a/addons/l10n_th/i18n/ar.po b/addons/l10n_th/i18n/ar.po
index 74395fc28a4..2f58eedf989 100644
--- a/addons/l10n_th/i18n/ar.po
+++ b/addons/l10n_th/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/ca.po b/addons/l10n_th/i18n/ca.po
index 854fede0198..eaae4476b40 100644
--- a/addons/l10n_th/i18n/ca.po
+++ b/addons/l10n_th/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/da.po b/addons/l10n_th/i18n/da.po
index 85d29926e51..0f3169ad310 100644
--- a/addons/l10n_th/i18n/da.po
+++ b/addons/l10n_th/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/es.po b/addons/l10n_th/i18n/es.po
index e08134757fa..f394ca56616 100644
--- a/addons/l10n_th/i18n/es.po
+++ b/addons/l10n_th/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/es_CR.po b/addons/l10n_th/i18n/es_CR.po
index 7a29ea85a04..a54a4671257 100644
--- a/addons/l10n_th/i18n/es_CR.po
+++ b/addons/l10n_th/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_th
diff --git a/addons/l10n_th/i18n/es_PY.po b/addons/l10n_th/i18n/es_PY.po
index dedff25f3f6..50abf8ed3bd 100644
--- a/addons/l10n_th/i18n/es_PY.po
+++ b/addons/l10n_th/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/gl.po b/addons/l10n_th/i18n/gl.po
index 95524ed7447..a20c7b6ecf0 100644
--- a/addons/l10n_th/i18n/gl.po
+++ b/addons/l10n_th/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/it.po b/addons/l10n_th/i18n/it.po
index ec1a91d0fec..0fa57ff8f3b 100644
--- a/addons/l10n_th/i18n/it.po
+++ b/addons/l10n_th/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/nb.po b/addons/l10n_th/i18n/nb.po
new file mode 100644
index 00000000000..ff175d812bf
--- /dev/null
+++ b/addons/l10n_th/i18n/nb.po
@@ -0,0 +1,52 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-12-23 09:56+0000\n"
+"PO-Revision-Date: 2012-09-09 16:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: l10n_th
+#: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"This is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
+msgstr ""
+"Generere Kontoplan fra en diagrammal. Du vil bli bedt om å passere navnet på "
+"selskapet, diagrammal til følge, nei. Sifre som skal generere koden for "
+"kontoene og bankkonto, valuta å skape Journals. Dermed er den rene kopi av "
+"diagrammal generert.\n"
+"Dette er den samme veiviser som går fra økonomistyring / Configuration / "
+"Financial Accounting / finansregnskapet / Generer Kontoplan fra en "
+"diagrammal."
+
+#. module: l10n_th
+#: model:account.account.type,name:l10n_th.acc_type_other
+msgid "Other"
+msgstr "Annet"
+
+#. module: l10n_th
+#: model:account.account.type,name:l10n_th.acc_type_reconciled
+msgid "Reconciled"
+msgstr "Forsonet"
+
+#. module: l10n_th
+#: model:account.account.type,name:l10n_th.acc_type_view
+msgid "View"
+msgstr "Vis"
diff --git a/addons/l10n_th/i18n/pt.po b/addons/l10n_th/i18n/pt.po
index 803d4ea4fb6..61eefb6e98b 100644
--- a/addons/l10n_th/i18n/pt.po
+++ b/addons/l10n_th/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/pt_BR.po b/addons/l10n_th/i18n/pt_BR.po
index 7d1e96269a8..f5f14921469 100644
--- a/addons/l10n_th/i18n/pt_BR.po
+++ b/addons/l10n_th/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/sr@latin.po b/addons/l10n_th/i18n/sr@latin.po
index 19d393fdf16..805dff82644 100644
--- a/addons/l10n_th/i18n/sr@latin.po
+++ b/addons/l10n_th/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/th.po b/addons/l10n_th/i18n/th.po
index 0400cd0d72c..bfb4fe1d688 100644
--- a/addons/l10n_th/i18n/th.po
+++ b/addons/l10n_th/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_th/i18n/tr.po b/addons/l10n_th/i18n/tr.po
index a2dc6e9a21b..3bf1e6d750e 100644
--- a/addons/l10n_th/i18n/tr.po
+++ b/addons/l10n_th/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_th
 #: model:ir.actions.todo,note:l10n_th.config_call_account_template_th
diff --git a/addons/l10n_tr/__openerp__.py b/addons/l10n_tr/__openerp__.py
index d72865a216c..6a0ad411867 100644
--- a/addons/l10n_tr/__openerp__.py
+++ b/addons/l10n_tr/__openerp__.py
@@ -18,7 +18,8 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-{   'name': 'Turkey - Accounting',
+{
+    'name': 'Turkey - Accounting',
     'version': '1.beta',
     'category': 'Localization/Account Charts',
     'description': """
@@ -37,16 +38,15 @@ Bu modül kurulduktan sonra, Muhasebe yapılandırma sihirbazı çalışır
         'base_vat',
         'account_chart',
     ],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'account_code_template.xml',
         'account_tdhp_turkey.xml',
         'account_tax_code_template.xml',
         'account_chart_template.xml',
         'account_tax_template.xml',
         'l10n_tr_wizard.xml',
-		],
-    'demo_xml': [],
+    ],
+    'demo': [],
     'installable': True,
     'images': ['images/chart_l10n_tr_1.jpg','images/chart_l10n_tr_2.jpg','images/chart_l10n_tr_3.jpg'],
 }
diff --git a/addons/l10n_tr/l10n_tr_wizard.xml b/addons/l10n_tr/l10n_tr_wizard.xml
index e7ae8dc2d82..66b9d37221b 100644
--- a/addons/l10n_tr/l10n_tr_wizard.xml
+++ b/addons/l10n_tr/l10n_tr_wizard.xml
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
-    <data>
-        <record id="config_call_account_template_tr_chart" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be 
-asked to pass the name of the company, the chart template to follow, the no. of digits to generate 
-the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of 
-chart Template is generated.
-    This is the same wizard that runs from Financial Management/Configuration/Financial 
-Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py
index 444ea2b9dd3..0590224c364 100644
--- a/addons/l10n_uk/__openerp__.py
+++ b/addons/l10n_uk/__openerp__.py
@@ -24,8 +24,8 @@
     'version': '1.0',
     'category': 'Localization/Account Charts',
     'description': """
-This is the latest UK OpenERP localisation necessary to run OpenERP accounting
-for UK SME's with:
+This is the latest UK OpenERP localisation necessary to run OpenERP accounting for UK SME's with:
+=================================================================================================
     - a CT600-ready chart of accounts
     - VAT100-ready tax structure
     - InfoLogic UK counties listing
@@ -33,8 +33,7 @@ for UK SME's with:
     'author': 'SmartMode LTD',
     'website': 'http://www.smartmode.co.uk',
     'depends': ['base_iban', 'base_vat', 'account_chart'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'data/account.account.type.csv',
         'data/account.account.template.csv',
         'data/account.tax.code.template.csv',
@@ -43,9 +42,7 @@ for UK SME's with:
         'data/res.country.state.csv',
         'l10n_uk_wizard.xml',
     ],
-    'demo_xml' : [
-        'demo/demo.xml'
-    ],
+    'demo' : ['demo/demo.xml'],
     'installable': 'True',
     'images': ['images/config_chart_l10n_uk.jpeg','images/l10n_uk_chart.jpeg'],
 }
diff --git a/addons/l10n_uk/data/account.account.type.csv b/addons/l10n_uk/data/account.account.type.csv
index 0827975b22f..379656ece39 100644
--- a/addons/l10n_uk/data/account.account.type.csv
+++ b/addons/l10n_uk/data/account.account.type.csv
@@ -10,4 +10,4 @@
 "account_type_output_tax","Output Tax","Output Tax","liability","Unreconciled"
 "account_type_input_tax","Input Tax","Input Tax","asset","Unreconciled"
 "account_type_profit_and_loss","Profit and Loss","Profit and Loss","none","None"
-"account_type_view","View","view",,"None"
+"account_type_view","View","view","none","None"
diff --git a/addons/l10n_uk/data/account.chart.template.csv b/addons/l10n_uk/data/account.chart.template.csv
index 9d1812a8df4..5a8c863e3ac 100644
--- a/addons/l10n_uk/data/account.chart.template.csv
+++ b/addons/l10n_uk/data/account.chart.template.csv
@@ -1,2 +1,2 @@
-"id","name","account_root_id:id","tax_code_root_id:id","bank_account_view_id:id","property_account_receivable:id","property_account_payable:id","property_account_expense_categ:id","property_account_income_categ:id","property_reserve_and_surplus_account:id"
-"l10n_uk","UK Tax and Account Chart Template (by SmartMode)","UK0","0","1200","1100","2100","5000","4000","3200"
+"id","name","account_root_id:id","tax_code_root_id:id","bank_account_view_id:id","property_account_receivable:id","property_account_payable:id","property_account_expense_categ:id","property_account_income_categ:id"
+"l10n_uk","UK Tax and Account Chart Template (by SmartMode)","UK0","0","1200","1100","2100","5000","4000"
diff --git a/addons/l10n_uk/i18n/ar.po b/addons/l10n_uk/i18n/ar.po
index 2a7e616027a..16db6f3d951 100644
--- a/addons/l10n_uk/i18n/ar.po
+++ b/addons/l10n_uk/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/bg.po b/addons/l10n_uk/i18n/bg.po
index b17ca88cd91..63fe3a532fa 100644
--- a/addons/l10n_uk/i18n/bg.po
+++ b/addons/l10n_uk/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/bs.po b/addons/l10n_uk/i18n/bs.po
index f135182ef01..942b054e198 100644
--- a/addons/l10n_uk/i18n/bs.po
+++ b/addons/l10n_uk/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/ca.po b/addons/l10n_uk/i18n/ca.po
index 35a9dc1fff8..d4adc140c29 100644
--- a/addons/l10n_uk/i18n/ca.po
+++ b/addons/l10n_uk/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/cs.po b/addons/l10n_uk/i18n/cs.po
index c535f5653f6..f503eec2b43 100644
--- a/addons/l10n_uk/i18n/cs.po
+++ b/addons/l10n_uk/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/da.po b/addons/l10n_uk/i18n/da.po
index 8e2ba1e58ca..e0b15840b88 100644
--- a/addons/l10n_uk/i18n/da.po
+++ b/addons/l10n_uk/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/de.po b/addons/l10n_uk/i18n/de.po
index 05941175155..432751143c1 100644
--- a/addons/l10n_uk/i18n/de.po
+++ b/addons/l10n_uk/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/es.po b/addons/l10n_uk/i18n/es.po
index 5623aa1890a..caf9eaef1e9 100644
--- a/addons/l10n_uk/i18n/es.po
+++ b/addons/l10n_uk/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/es_CR.po b/addons/l10n_uk/i18n/es_CR.po
index aa32a4cb13c..899af3067bb 100644
--- a/addons/l10n_uk/i18n/es_CR.po
+++ b/addons/l10n_uk/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_uk
diff --git a/addons/l10n_uk/i18n/es_PY.po b/addons/l10n_uk/i18n/es_PY.po
index 30fa25f2fae..9e7339e35db 100644
--- a/addons/l10n_uk/i18n/es_PY.po
+++ b/addons/l10n_uk/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/et.po b/addons/l10n_uk/i18n/et.po
index 9db6c2292f2..8c2a189c58c 100644
--- a/addons/l10n_uk/i18n/et.po
+++ b/addons/l10n_uk/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/fr.po b/addons/l10n_uk/i18n/fr.po
index 1b4e307a2b7..d7e76349f76 100644
--- a/addons/l10n_uk/i18n/fr.po
+++ b/addons/l10n_uk/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/gl.po b/addons/l10n_uk/i18n/gl.po
index 884040b22dc..d683be2a41d 100644
--- a/addons/l10n_uk/i18n/gl.po
+++ b/addons/l10n_uk/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/hr.po b/addons/l10n_uk/i18n/hr.po
index a622bcc5697..76cddb770ba 100644
--- a/addons/l10n_uk/i18n/hr.po
+++ b/addons/l10n_uk/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/hu.po b/addons/l10n_uk/i18n/hu.po
index 4b605be30c6..ca594cd4913 100644
--- a/addons/l10n_uk/i18n/hu.po
+++ b/addons/l10n_uk/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/id.po b/addons/l10n_uk/i18n/id.po
index e7ec19ba206..6e7c44734f0 100644
--- a/addons/l10n_uk/i18n/id.po
+++ b/addons/l10n_uk/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/it.po b/addons/l10n_uk/i18n/it.po
index 1a9c191d5a0..6ba0334e858 100644
--- a/addons/l10n_uk/i18n/it.po
+++ b/addons/l10n_uk/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/ko.po b/addons/l10n_uk/i18n/ko.po
index ad52d7b2332..b6c167871a3 100644
--- a/addons/l10n_uk/i18n/ko.po
+++ b/addons/l10n_uk/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/lt.po b/addons/l10n_uk/i18n/lt.po
index 89d8af39240..22725ab8423 100644
--- a/addons/l10n_uk/i18n/lt.po
+++ b/addons/l10n_uk/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/nl.po b/addons/l10n_uk/i18n/nl.po
index 5f39761082a..e5a3cc639ca 100644
--- a/addons/l10n_uk/i18n/nl.po
+++ b/addons/l10n_uk/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/oc.po b/addons/l10n_uk/i18n/oc.po
index 623b588c446..7d9a28527cc 100644
--- a/addons/l10n_uk/i18n/oc.po
+++ b/addons/l10n_uk/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/pl.po b/addons/l10n_uk/i18n/pl.po
index 2d70208286f..7d64bc98570 100644
--- a/addons/l10n_uk/i18n/pl.po
+++ b/addons/l10n_uk/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/pt.po b/addons/l10n_uk/i18n/pt.po
index d69a5250822..d00ea7708e4 100644
--- a/addons/l10n_uk/i18n/pt.po
+++ b/addons/l10n_uk/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/pt_BR.po b/addons/l10n_uk/i18n/pt_BR.po
index 1be2e299084..7e975391bb0 100644
--- a/addons/l10n_uk/i18n/pt_BR.po
+++ b/addons/l10n_uk/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/ro.po b/addons/l10n_uk/i18n/ro.po
index abb18702c9b..be6b9746e53 100644
--- a/addons/l10n_uk/i18n/ro.po
+++ b/addons/l10n_uk/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/ru.po b/addons/l10n_uk/i18n/ru.po
index b62f6305cbd..268382cffc7 100644
--- a/addons/l10n_uk/i18n/ru.po
+++ b/addons/l10n_uk/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/sl.po b/addons/l10n_uk/i18n/sl.po
index e45dc979519..d92abe530f0 100644
--- a/addons/l10n_uk/i18n/sl.po
+++ b/addons/l10n_uk/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/sq.po b/addons/l10n_uk/i18n/sq.po
index 266be67e3d4..3fa97523683 100644
--- a/addons/l10n_uk/i18n/sq.po
+++ b/addons/l10n_uk/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/sr@latin.po b/addons/l10n_uk/i18n/sr@latin.po
index 6719fd8e4de..663356d50fa 100644
--- a/addons/l10n_uk/i18n/sr@latin.po
+++ b/addons/l10n_uk/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/sv.po b/addons/l10n_uk/i18n/sv.po
index 764bd8d988f..0a8cfec6542 100644
--- a/addons/l10n_uk/i18n/sv.po
+++ b/addons/l10n_uk/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/tlh.po b/addons/l10n_uk/i18n/tlh.po
index b32a20e0dcf..c7231cbdeec 100644
--- a/addons/l10n_uk/i18n/tlh.po
+++ b/addons/l10n_uk/i18n/tlh.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/tr.po b/addons/l10n_uk/i18n/tr.po
index 2fbdd8652b0..ffeb347cef3 100644
--- a/addons/l10n_uk/i18n/tr.po
+++ b/addons/l10n_uk/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
@@ -25,7 +25,7 @@ msgstr "Alacak"
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_current_assets
 msgid "Current Assets"
-msgstr ""
+msgstr "Dönen Varlıklar"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_profit_and_loss
@@ -40,12 +40,12 @@ msgstr "Görünüm"
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_output_tax
 msgid "Output Tax"
-msgstr ""
+msgstr "Çıkış Vergisi"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_income
 msgid "Income"
-msgstr ""
+msgstr "Gelir"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_payable
@@ -55,12 +55,12 @@ msgstr "Borç (Ödenmesi Gereken)"
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_fixed_assets
 msgid "Fixed Assets"
-msgstr ""
+msgstr "Duran Varlıklar"
 
 #. module: l10n_uk
 #: model:ir.actions.act_window,name:l10n_uk.action_wizard_multi_chart_uk
 msgid "Generate UK Chart of Accounts from a Chart Template"
-msgstr ""
+msgstr "Tablo Şablonundan UK Hesap Tablosu Oluştur"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_equity
@@ -70,17 +70,17 @@ msgstr "Özkaynak"
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_current_liabilities
 msgid "Current Liabilities"
-msgstr ""
+msgstr "Kısa Vadeli Borçlar"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_input_tax
 msgid "Input Tax"
-msgstr ""
+msgstr "Giriş Vergisi"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_expense
 msgid "Expense"
-msgstr ""
+msgstr "Gider"
 
 #. module: l10n_uk
 #: view:wizard.multi.charts.accounts:0
@@ -89,6 +89,9 @@ msgid ""
 "Management/Configuration/Financial Accounting/ Financial Accounts/Generate "
 "Chart of Accounts from a Chart Template."
 msgstr ""
+"4 HANELİ HESAP SEÇİN.  Bu, Mali Yönetim/Yapılandırma/Mali Muhasebe/ Mali "
+"Hesaplar/Bir Tablo Şablonundan Hesap Tablosu oluştur menüsünden çalıştırılan "
+"sihirbazla aynıdır."
 
 #. module: l10n_uk
 #: view:wizard.multi.charts.accounts:0
@@ -98,6 +101,9 @@ msgid ""
 "Template\n"
 "                        "
 msgstr ""
+"\n"
+"                        Bir Tablo Şablonunda UK Hesap Tablosu Oluştur\n"
+"                        "
 
 #~ msgid "United Kingdom - minimal"
 #~ msgstr "İngiltere - Minimal"
diff --git a/addons/l10n_uk/i18n/uk.po b/addons/l10n_uk/i18n/uk.po
index df15af9236a..358fa16fb45 100644
--- a/addons/l10n_uk/i18n/uk.po
+++ b/addons/l10n_uk/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/vi.po b/addons/l10n_uk/i18n/vi.po
index 2d4017eeb28..c0e30986234 100644
--- a/addons/l10n_uk/i18n/vi.po
+++ b/addons/l10n_uk/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/zh_CN.po b/addons/l10n_uk/i18n/zh_CN.po
index eb8b902834e..ebf4450c229 100644
--- a/addons/l10n_uk/i18n/zh_CN.po
+++ b/addons/l10n_uk/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/i18n/zh_TW.po b/addons/l10n_uk/i18n/zh_TW.po
index 2910157533e..b2a67904475 100644
--- a/addons/l10n_uk/i18n/zh_TW.po
+++ b/addons/l10n_uk/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_uk
 #: model:account.account.type,name:l10n_uk.account_type_receivable
diff --git a/addons/l10n_uk/l10n_uk_wizard.xml b/addons/l10n_uk/l10n_uk_wizard.xml
index cb947163ab3..8a6f1a5a83c 100644
--- a/addons/l10n_uk/l10n_uk_wizard.xml
+++ b/addons/l10n_uk/l10n_uk_wizard.xml
@@ -1,41 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-
-        <record id="view_wizard_multi_chart_uk" model="ir.ui.view">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="model">wizard.multi.charts.accounts</field>
-            <field name="inherit_id" ref="account.view_wizard_multi_chart"/>
-            <field name="arch" type="xml">
-              <data>
-<!--
-                    <xpath expr="//group[@string='res_config_contents']/separator" position="attributes">
-                        <attribute name="string">
-                        Generate Your UK Accounting Chart from a Chart Template
-                        </attribute>
-                    </xpath>
-                    <xpath expr="//group[@string='res_config_contents']/label" position="attributes">
-                        <attribute name="string">SELECT 4 DIGIT ACCOUNTS.  This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/ Financial Accounts/Generate Chart of Accounts from a Chart Template.</attribute>
-                    </xpath>
--->                    
-              </data>
-            </field>
-        </record>
-
-        <record id="action_wizard_multi_chart_uk" model="ir.actions.act_window">
-            <field name="name">Generate UK Chart of Accounts from a Chart Template</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">wizard.multi.charts.accounts</field>
-            <field name="view_id" ref="view_wizard_multi_chart_uk"/>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
-        <record id="l10n_uk_latest_wizard_id" model="ir.actions.todo">
-            <field name="action_id" ref="action_wizard_multi_chart_uk"/>
-            <field name="sequence">10</field>
-            <field name="type">once</field>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
             <field name="state">open</field>
         </record>
 
diff --git a/addons/l10n_us/__openerp__.py b/addons/l10n_us/__openerp__.py
index f900c3d5e99..90c0e6fd4ad 100644
--- a/addons/l10n_us/__openerp__.py
+++ b/addons/l10n_us/__openerp__.py
@@ -19,20 +19,18 @@
 #
 ##############################################################################
 {
-    "name": "United States - Chart of accounts",
-    "version": "1.1",
-    "author": "OpenERP SA",
-    "category": 'Localization/Account Charts',
-    "description": """
+    'name': 'United States - Chart of accounts',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'category': 'Localization/Account Charts',
+    'description': """
 United States - Chart of accounts.
+==================================
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    "depends": [
-        "account_chart",
-        ],
-    'update_xml': [
-        "l10n_us_account_type.xml",
+    'depends': ['account_chart'],
+    'data': [
+        'l10n_us_account_type.xml',
         'account_chart_template.xml',
         'account.account.template.csv',
         'account_tax_code_template.xml',
@@ -40,10 +38,8 @@ United States - Chart of accounts.
         'account_chart_template_after.xml',
         'l10n_us_wizard.xml'
     ],
-    'demo_xml': [
-    ],
-    'test': [
-    ],
+    'demo': [],
+    'test': [],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/l10n_us/account.account.template.csv b/addons/l10n_us/account.account.template.csv
index 46430ac37f8..c7431ce89a7 100644
--- a/addons/l10n_us/account.account.template.csv
+++ b/addons/l10n_us/account.account.template.csv
@@ -69,29 +69,29 @@
 "51800_advertising","51800","Merchant Account Fees","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_advertising"
 "53500_advertising","53500","Subcontracted Services","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_advertising"
 "64200_advertising","64200","Marketing Expense","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_advertising"
-"41200_agriculture","41200","Agricultural Program Payments","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
-"42500_agriculture","42500","Commodity Credit Loans","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
-"42800_agriculture","42800","Cooperative Distributions","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
-"42900_agriculture","42900","Crop Insurance Proceeds","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
-"43000_agriculture","43000","Crop Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
-"43100_agriculture","43100","Custom Hire Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
-"43600_agriculture","43600","Farmers Market Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
-"44100_agriculture","44100","Fuel Tax Credits and Other Inc.","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
-"45500_agriculture","45500","Livestock Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
-"47400_agriculture","47400","Rental Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agricultar"
-"61100_agriculture","61100","Car and Truck Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
-"61500_agriculture","61500","Chemicals Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
-"61900_agriculture","61900","Conservation Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
-"62300_agriculture","62300","Custom Hire and Contract Labor","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
-"62900_agriculture","62900","Feed Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
-"63000_agriculture","63000","Fertilizers and Lime","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
-"63100_agriculture","63100","Freight and Trucking","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
-"63200_agriculture","63200","Gasoline, Fuel and Oil","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
-"67500_agriculture","67500","Seeds and Plants Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
-"67800_agriculture","67800","Small Tools and Equipment","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
-"67900_agriculture","67900","Storage and Warehousing","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
-"68500_agriculture","68500","Uniforms","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
-"68800_agriculture","68800","Veterinary, Breeding, Medicine","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agricultar"
+"41200_agriculture","41200","Agricultural Program Payments","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
+"42500_agriculture","42500","Commodity Credit Loans","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
+"42800_agriculture","42800","Cooperative Distributions","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
+"42900_agriculture","42900","Crop Insurance Proceeds","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
+"43000_agriculture","43000","Crop Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
+"43100_agriculture","43100","Custom Hire Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
+"43600_agriculture","43600","Farmers Market Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
+"44100_agriculture","44100","Fuel Tax Credits and Other Inc.","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
+"45500_agriculture","45500","Livestock Sales","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
+"47400_agriculture","47400","Rental Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_agriculture"
+"61100_agriculture","61100","Car and Truck Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
+"61500_agriculture","61500","Chemicals Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
+"61900_agriculture","61900","Conservation Expenses","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
+"62300_agriculture","62300","Custom Hire and Contract Labor","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
+"62900_agriculture","62900","Feed Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
+"63000_agriculture","63000","Fertilizers and Lime","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
+"63100_agriculture","63100","Freight and Trucking","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
+"63200_agriculture","63200","Gasoline, Fuel and Oil","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
+"67500_agriculture","67500","Seeds and Plants Purchased","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
+"67800_agriculture","67800","Small Tools and Equipment","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
+"67900_agriculture","67900","Storage and Warehousing","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
+"68500_agriculture","68500","Uniforms","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
+"68800_agriculture","68800","Veterinary, Breeding, Medicine","other","l10n_us.user_type_expense","expense","FALSE","l10n_us.account_chart_template_agriculture"
 "24600_construction_trades","24600","Customer Deposits Received","other","l10n_us.user_type_other_current_liability","other_current_liability","FALSE","l10n_us.account_chart_template_construction"
 "45100_construction_trades","45100","Job Income","other","l10n_us.user_type_income","income","FALSE","l10n_us.account_chart_template_construction"
 "50800_construction_trades","50800","Commissions Paid","other","l10n_us.user_type_cogs","cost_of_goods_sold","FALSE","l10n_us.account_chart_template_construction"
diff --git a/addons/l10n_us/account_chart_template.xml b/addons/l10n_us/account_chart_template.xml
index e0b8ed374b3..0863680981f 100644
--- a/addons/l10n_us/account_chart_template.xml
+++ b/addons/l10n_us/account_chart_template.xml
@@ -19,8 +19,8 @@
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_cogs"/>
         </record>
-        <record id="account_chart_template_agricultar" model="account.chart.template">
-            <field name="name">Agricultar</field>
+        <record id="account_chart_template_agriculture" model="account.chart.template">
+            <field name="name">Agriculture</field>
             <field name="complete_tax_set" eval="False" />
             <field name="parent_id" ref="account_chart_template_basic"/>
         </record>
diff --git a/addons/l10n_us/account_chart_template_after.xml b/addons/l10n_us/account_chart_template_after.xml
index 3c570126fcd..5ca3a169aba 100644
--- a/addons/l10n_us/account_chart_template_after.xml
+++ b/addons/l10n_us/account_chart_template_after.xml
@@ -11,7 +11,7 @@
             <field name="bank_account_view_id" ref="cash_expenditure"/>
         </record>
 
-        <record id="account_chart_template_agricultar" model="account.chart.template">
+        <record id="account_chart_template_agriculture" model="account.chart.template">
             <field name="bank_account_view_id" ref="cash_expenditure"/>
         </record>
 
diff --git a/addons/l10n_us/l10n_us_wizard.xml b/addons/l10n_us/l10n_us_wizard.xml
index 8c306f155fe..52aaa88fdab 100644
--- a/addons/l10n_us/l10n_us_wizard.xml
+++ b/addons/l10n_us/l10n_us_wizard.xml
@@ -1,12 +1,7 @@
 <openerp>
-    <data>
-
-        <record id="config_call_account_template" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-    This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.</field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
 
     </data>
diff --git a/addons/l10n_uy/__openerp__.py b/addons/l10n_uy/__openerp__.py
index 5e4eb51ffc0..2a6f10ddb29 100644
--- a/addons/l10n_uy/__openerp__.py
+++ b/addons/l10n_uy/__openerp__.py
@@ -22,35 +22,31 @@
 ##############################################################################
 
 {
-    "name" : "Uruguay - Chart of Accounts",
-    "version" : "0.1",
-    "author" : "Uruguay l10n Team & Guillem Barba",
-    "category" : "Localization/Account Charts",
-    "website" : "https://launchpad.net/openerp-uruguay",
-    "description": """
+    'name': 'Uruguay - Chart of Accounts',
+    'version': '0.1',
+    'author': 'Uruguay l10n Team & Guillem Barba',
+    'category': 'Localization/Account Charts',
+    'website': 'https://launchpad.net/openerp-uruguay',
+    'description': """
 General Chart of Accounts.
 ==========================
 
 Provide Templates for Chart of Accounts, Taxes for Uruguay.
 
 """,
-    "license"   : "AGPL-3",
-    "depends"   : [
-                    "account",
-                  ],
-    "init_xml"  : [],
-    "update_xml": [
-                    "account_types.xml",
-                    "taxes_code_template.xml",
-                    "account_chart_template.xml",
-                    "taxes_template.xml",
-                    "l10n_uy_wizard.xml",
-                  ],
-    "demo_xml": [],
-    "auto_install": False,
-    "installable": True,
-    'certificate' : '0078287892698',
-    "images": ["images/config_chart_l10n_uy.jpeg","images/l10n_uy_chart.jpeg"],
+    'license': 'AGPL-3',
+    'depends': ['account'],
+    'data': [
+        'account_types.xml',
+        'taxes_code_template.xml',
+        'account_chart_template.xml',
+        'taxes_template.xml',
+        'l10n_uy_wizard.xml',
+    ],
+    'demo': [],
+    'auto_install': False,
+    'installable': True,
+    'images': ['images/config_chart_l10n_uy.jpeg','images/l10n_uy_chart.jpeg'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_uy/account_chart_template.xml b/addons/l10n_uy/account_chart_template.xml
index 1548d3ee25a..4ce35184967 100644
--- a/addons/l10n_uy/account_chart_template.xml
+++ b/addons/l10n_uy/account_chart_template.xml
@@ -4,7 +4,6 @@
         <record id="uy_code_0" model="account.account.template">
             <field name="code">0</field>
             <field name="type">view</field>
-            <field name="parent_id" eval="False"/>
             <field name="name">Uruguay - Plan de Cuentas</field>
             <field name="user_type" ref="type_view"/>
         </record>
@@ -1896,7 +1895,6 @@
             <field name="property_account_payable"       ref="uy_code_21100"/>
             <field name="property_account_income_categ"  ref="uy_code_4100"/>
             <field name="property_account_expense_categ" ref="uy_code_5100"/>
-            <field name="property_reserve_and_surplus_account" ref="uy_code_3313"/>
         </record>
 
 
diff --git a/addons/l10n_uy/l10n_uy_wizard.xml b/addons/l10n_uy/l10n_uy_wizard.xml
index 6543664b2b6..3dea57dc5c2 100644
--- a/addons/l10n_uy/l10n_uy_wizard.xml
+++ b/addons/l10n_uy/l10n_uy_wizard.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        <record id="config_call_account_template_uy" model="ir.actions.todo">
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
     </data>
 </openerp>
diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py
index 921bdf13c80..f10f4d0db61 100644
--- a/addons/l10n_ve/__openerp__.py
+++ b/addons/l10n_ve/__openerp__.py
@@ -23,24 +23,24 @@
 #
 ##############################################################################
 {
-    "name" : "Venezuela - Accounting",
-    "version" : "1.0",
-    "author" : ['OpenERP SA', "Netquatro"],
-    "category" : "Localization/Account Charts",
-    "description":
-'''
+    'name' : 'Venezuela - Accounting',
+    'version': '1.0',
+    'author': ['OpenERP SA', 'Netquatro'],
+    'category': 'Localization/Account Charts',
+    'description':
+"""
 This is the module to manage the accounting chart for Venezuela in OpenERP.
 ===========================================================================
 
 Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.
-''',
-    "depends" : ["account", "base_vat", "account_chart"],
-    "demo_xml" : [],
-    "update_xml" : ['account_tax_code.xml',"account_chart.xml",
-                    'account_tax.xml','l10n_chart_ve_wizard.xml'],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00763145921185574557",
+""",
+    'depends': ['account', 'base_vat', 'account_chart'],
+    'demo': [],
+    'data': ['account_tax_code.xml','account_chart.xml',
+              'account_tax.xml','l10n_chart_ve_wizard.xml'
+    ],
+    'auto_install': False,
+    'installable': True,
     'images': ['images/config_chart_l10n_ve.jpeg','images/l10n_ve_chart.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_ve/i18n/ar.po b/addons/l10n_ve/i18n/ar.po
index 6e863cf91be..89a98961860 100644
--- a/addons/l10n_ve/i18n/ar.po
+++ b/addons/l10n_ve/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
@@ -30,7 +30,7 @@ msgstr "المصروفات"
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_equity
 msgid "Equity"
-msgstr ""
+msgstr "الأسهم"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_tax
diff --git a/addons/l10n_ve/i18n/ca.po b/addons/l10n_ve/i18n/ca.po
index e53b2e2cdec..f4e9a5e11a1 100644
--- a/addons/l10n_ve/i18n/ca.po
+++ b/addons/l10n_ve/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/da.po b/addons/l10n_ve/i18n/da.po
index bb8ad5d8413..c269d209919 100644
--- a/addons/l10n_ve/i18n/da.po
+++ b/addons/l10n_ve/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/de.po b/addons/l10n_ve/i18n/de.po
new file mode 100644
index 00000000000..6da2f904bc9
--- /dev/null
+++ b/addons/l10n_ve/i18n/de.po
@@ -0,0 +1,83 @@
+# German translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-12-23 09:56+0000\n"
+"PO-Revision-Date: 2012-10-31 15:43+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: German <de@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:04+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
+
+#. module: l10n_ve
+#: model:account.account.type,name:l10n_ve.account_type_receivable
+msgid "Receivable"
+msgstr "Forderungen"
+
+#. module: l10n_ve
+#: model:account.account.type,name:l10n_ve.account_type_expense
+msgid "Expense"
+msgstr "Ausgaben"
+
+#. module: l10n_ve
+#: model:account.account.type,name:l10n_ve.account_type_equity
+msgid "Equity"
+msgstr ""
+
+#. module: l10n_ve
+#: model:account.account.type,name:l10n_ve.account_type_tax
+msgid "Tax"
+msgstr "Steuer"
+
+#. module: l10n_ve
+#: model:account.account.type,name:l10n_ve.account_type_cash
+msgid "Cash"
+msgstr "Barkasse"
+
+#. module: l10n_ve
+#: model:account.account.type,name:l10n_ve.account_type_payable
+msgid "Payable"
+msgstr "Verbindlichkeiten"
+
+#. module: l10n_ve
+#: model:account.account.type,name:l10n_ve.account_type_asset
+msgid "Asset"
+msgstr "Anlagegüter"
+
+#. module: l10n_ve
+#: model:account.account.type,name:l10n_ve.account_type_income
+msgid "Income"
+msgstr "Einnahmen"
+
+#. module: l10n_ve
+#: model:ir.actions.todo,note:l10n_ve.config_call_account_template_ve_chart
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"This is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template.\n"
+"Genere el Plan de cuentas de una Plantilla de Carta. Le pedirán pasar el "
+"nombre de la compania, la plantilla de carta para seguir, el no. de digitos "
+"para generar el codigo para sus cuentas y cuenta Bancaria, dinero para crear "
+"Diarios. Asi, la copia pura de la carta la Plantilla es generada.\n"
+"Esto es el mismo wizard que corre de la Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template.\n"
+"            "
+msgstr ""
+
+#. module: l10n_ve
+#: model:account.account.type,name:l10n_ve.account_type_view
+msgid "View"
+msgstr "Sicht"
diff --git a/addons/l10n_ve/i18n/es.po b/addons/l10n_ve/i18n/es.po
index 5d1b5e23572..8833098a57d 100644
--- a/addons/l10n_ve/i18n/es.po
+++ b/addons/l10n_ve/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/es_CR.po b/addons/l10n_ve/i18n/es_CR.po
index c8cb29a9f91..8aad3602c6a 100644
--- a/addons/l10n_ve/i18n/es_CR.po
+++ b/addons/l10n_ve/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: l10n_ve
diff --git a/addons/l10n_ve/i18n/es_PY.po b/addons/l10n_ve/i18n/es_PY.po
index 2d02447a464..84954aaf237 100644
--- a/addons/l10n_ve/i18n/es_PY.po
+++ b/addons/l10n_ve/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/gl.po b/addons/l10n_ve/i18n/gl.po
index 5d6e703ec2f..7979fe8472c 100644
--- a/addons/l10n_ve/i18n/gl.po
+++ b/addons/l10n_ve/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/it.po b/addons/l10n_ve/i18n/it.po
index 48b2853f78c..bdead1af4bc 100644
--- a/addons/l10n_ve/i18n/it.po
+++ b/addons/l10n_ve/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/pt.po b/addons/l10n_ve/i18n/pt.po
index 9eabe8a0417..ea3ad7dd217 100644
--- a/addons/l10n_ve/i18n/pt.po
+++ b/addons/l10n_ve/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/pt_BR.po b/addons/l10n_ve/i18n/pt_BR.po
index 21e340093cb..a77a76e9fb8 100644
--- a/addons/l10n_ve/i18n/pt_BR.po
+++ b/addons/l10n_ve/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/sr@latin.po b/addons/l10n_ve/i18n/sr@latin.po
index 61bf2b492d2..cbc1e00f40f 100644
--- a/addons/l10n_ve/i18n/sr@latin.po
+++ b/addons/l10n_ve/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/i18n/tr.po b/addons/l10n_ve/i18n/tr.po
index f1a85cfe0c9..1bb19102ead 100644
--- a/addons/l10n_ve/i18n/tr.po
+++ b/addons/l10n_ve/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: l10n_ve
 #: model:account.account.type,name:l10n_ve.account_type_receivable
diff --git a/addons/l10n_ve/l10n_chart_ve_wizard.xml b/addons/l10n_ve/l10n_chart_ve_wizard.xml
index 823fa833313..52aaa88fdab 100644
--- a/addons/l10n_ve/l10n_chart_ve_wizard.xml
+++ b/addons/l10n_ve/l10n_chart_ve_wizard.xml
@@ -1,15 +1,7 @@
 <openerp>
-    <data>
-
-        <record id="config_call_account_template_ve_chart" model="ir.actions.todo">
-            <field name="name">Generate Chart of Accounts from a Chart Template</field>
-            <field name="note">Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.
-This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
-Genere el Plan de cuentas de una Plantilla de Carta. Le pedirán pasar el nombre de la compania, la plantilla de carta para seguir, el no. de digitos para generar el codigo para sus cuentas y cuenta Bancaria, dinero para crear Diarios. Asi, la copia pura de la carta la Plantilla es generada.
-Esto es el mismo wizard que corre de la Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template.
-            </field>
-            <field name="action_id" ref="account.action_wizard_multi_chart"/>
-            <field name="type">automatic</field>
+    <data noupdate="1">
+        <record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
+            <field name="state">open</field>
         </record>
 
     </data>
diff --git a/addons/lunch/__init__.py b/addons/lunch/__init__.py
index b94760a67fb..fb4acc9982e 100644
--- a/addons/lunch/__init__.py
+++ b/addons/lunch/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2012 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
@@ -20,7 +20,5 @@
 ##############################################################################
 
 import lunch
-import wizard
 import report
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+import wizard
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index ad476588e93..a70f6d82f9e 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2012 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
@@ -20,35 +20,33 @@
 ##############################################################################
 
 {
-    "name": "Lunch Orders",
-    "author": "OpenERP SA",
-    "version": "0.1",
-    "depends": ["base_tools"],
-    "category" : "Tools",
+    'name': 'Lunch Orders',
+    'author': 'OpenERP SA',
+    'version': '0.2',
+    'depends': ['base'],
+    'category' : 'Tools',
+    'summary': 'Lunch Order, Meal, Food',
     'description': """
 The base module to manage lunch.
 ================================
 
-keep track for the Lunch Order, Cash Moves, CashBox, Product. Apply Different
-Category for the product.
-    """,
-    "init_xml": [],
-    "update_xml": [
-        'security/lunch_security.xml',
-        'security/ir.model.access.csv',
-        'wizard/lunch_order_cancel_view.xml',
-        'wizard/lunch_order_confirm_view.xml',
-        'wizard/lunch_cashbox_clean_view.xml',
-        'lunch_view.xml',
-        'lunch_report.xml',
-        'report/report_lunch_order_view.xml',
-        'lunch_installer_view.xml'
-    ],
-    "demo_xml": ['lunch_demo.xml'],
-    "test": ['test/test_lunch.yml', 'test/lunch_report.yml'],
-    "installable": True,
-    "certificate" : "001292377792581874189",
-    'images': ['images/cash_moves.jpeg','images/lunch_orders.jpeg','images/products.jpeg'],
-}
+Many companies order sandwiches, pizzas and other, from usual suppliers, for their employees to offer them more facilities. 
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+However lunches management within the company requires proper administration especially when the number of employees or suppliers is important. 
+
+The “Lunch Order” module has been developed to make this management easier but also to offer employees more tools and usability. 
+
+In addition to a full meal and supplier management, this module offers the possibility to display warning and provides quick order selection based on employee’s preferences.
+
+If you want to save your employees' time and avoid them to always have coins in their pockets, this module is essential.
+    """,
+    'data': ['security/lunch_security.xml','lunch_view.xml','wizard/lunch_order_view.xml','wizard/lunch_validation_view.xml','wizard/lunch_cancel_view.xml','lunch_report.xml',
+        'report/report_lunch_order_view.xml',
+        'security/ir.model.access.csv',],
+    'css':['static/src/css/lunch.css'],
+    'demo': ['lunch_demo.xml',],
+    'installable': True,
+    'application' : True,
+    'certificate' : '001292377792581874189',
+    'images': [],
+}
diff --git a/addons/lunch/i18n/ar.po b/addons/lunch/i18n/ar.po
index cebf22a091e..86f86a35fc3 100644
--- a/addons/lunch/i18n/ar.po
+++ b/addons/lunch/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/bg.po b/addons/lunch/i18n/bg.po
index 9633de4c5aa..baddd90d036 100644
--- a/addons/lunch/i18n/bg.po
+++ b/addons/lunch/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/ca.po b/addons/lunch/i18n/ca.po
index 34aa572d5f4..c7b282a002b 100644
--- a/addons/lunch/i18n/ca.po
+++ b/addons/lunch/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/cs.po b/addons/lunch/i18n/cs.po
index 223258734bc..b9ca0fc69aa 100644
--- a/addons/lunch/i18n/cs.po
+++ b/addons/lunch/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: lunch
diff --git a/addons/lunch/i18n/da.po b/addons/lunch/i18n/da.po
index bbcc10a300f..328d00e30f2 100644
--- a/addons/lunch/i18n/da.po
+++ b/addons/lunch/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/de.po b/addons/lunch/i18n/de.po
index 2e8762b176f..d24f3763ff4 100644
--- a/addons/lunch/i18n/de.po
+++ b/addons/lunch/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/es.po b/addons/lunch/i18n/es.po
index 63aae7be4f0..901fb7acbc7 100644
--- a/addons/lunch/i18n/es.po
+++ b/addons/lunch/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/es_CR.po b/addons/lunch/i18n/es_CR.po
index d4066ec8117..0c3a280ff6b 100644
--- a/addons/lunch/i18n/es_CR.po
+++ b/addons/lunch/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: lunch
diff --git a/addons/lunch/i18n/es_PY.po b/addons/lunch/i18n/es_PY.po
index 3106f6a2a2e..d715afcf0eb 100644
--- a/addons/lunch/i18n/es_PY.po
+++ b/addons/lunch/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/fi.po b/addons/lunch/i18n/fi.po
index 38781830cd7..ef84a6b5122 100644
--- a/addons/lunch/i18n/fi.po
+++ b/addons/lunch/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/fr.po b/addons/lunch/i18n/fr.po
index c474db0c272..78f7546dd0b 100644
--- a/addons/lunch/i18n/fr.po
+++ b/addons/lunch/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
@@ -25,7 +25,7 @@ msgstr "Réinitialiser la caisse"
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "Box amount in current year"
-msgstr ""
+msgstr "Montant des boîtes dans l'année courante"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_form
@@ -96,6 +96,8 @@ msgid ""
 "You can create on cashbox by employee if you want to keep track of the "
 "amount due by employee according to what have been ordered."
 msgstr ""
+"Vous pouvez créer une caisse par employé si vous voulez suivre le montant dû "
+"par employé selon ce qui a été commandé."
 
 #. module: lunch
 #: field:lunch.cashmove,amount:0 field:report.lunch.amount,amount:0
@@ -151,7 +153,7 @@ msgstr "État"
 #. module: lunch
 #: selection:lunch.order,state:0
 msgid "New"
-msgstr ""
+msgstr "Nouveau"
 
 #. module: lunch
 #: field:report.lunch.order,price_total:0
@@ -181,7 +183,7 @@ msgstr "Description de commande"
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "Box amount in last month"
-msgstr ""
+msgstr "Montant des boîtes dans le dernier mois"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm
@@ -233,7 +235,7 @@ msgstr "Déplacement de trésorerie"
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "Tasks performed in last 365 days"
-msgstr ""
+msgstr "Tâches réalisées dans les 365 derniers jours"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
@@ -306,6 +308,10 @@ msgid ""
 "by supplier. It will be easier for the lunch manager to filter lunch orders "
 "by categories."
 msgstr ""
+"Définir tous les produits que les employés peuvent commander pour le "
+"déjeuner. Si vous commandez de différents endroits, vous pouvez utiliser les "
+"catégories de produits pour séparer par fournisseur. Ce sera plus facile "
+"pour le gestionnaire de filtrer les commandes de déjeuner par catégorie."
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
@@ -398,7 +404,7 @@ msgstr "Mettre la caisse à zéro"
 #. module: lunch
 #: view:lunch.product:0
 msgid "General Information"
-msgstr ""
+msgstr "Informations générales"
 
 #. module: lunch
 #: view:lunch.order.confirm:0
@@ -480,7 +486,7 @@ msgstr "Montant total"
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "Tasks performed in last 30 days"
-msgstr ""
+msgstr "Tâches réalisées dans les 30 derniers jours"
 
 #. module: lunch
 #: view:lunch.category:0
@@ -507,17 +513,17 @@ msgstr "Commande de repas"
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "Box amount in current month"
-msgstr ""
+msgstr "Montant des boîtes dans le mois courant"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.view_lunch_product_form_installer
 msgid "Define Your Lunch Products"
-msgstr ""
+msgstr "Définir vos produits de déjeuner"
 
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "Tasks during last 7 days"
-msgstr ""
+msgstr "Tâches réalisées dans les 7 derniers jours"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
@@ -549,7 +555,7 @@ msgstr "Année"
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_create_cashbox
 msgid "Create Lunch Cash Boxes"
-msgstr ""
+msgstr "Créer les caisses de déjeuners"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom de modèle incorrect dans la définition de l'action"
diff --git a/addons/lunch/i18n/gl.po b/addons/lunch/i18n/gl.po
index f94844dfabd..456f87a5a9c 100644
--- a/addons/lunch/i18n/gl.po
+++ b/addons/lunch/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/hr.po b/addons/lunch/i18n/hr.po
index 7e227800a1f..986668939f5 100644
--- a/addons/lunch/i18n/hr.po
+++ b/addons/lunch/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/hu.po b/addons/lunch/i18n/hu.po
index f46739be776..68e565ef5aa 100644
--- a/addons/lunch/i18n/hu.po
+++ b/addons/lunch/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/it.po b/addons/lunch/i18n/it.po
index 91d248bf5e1..85ecf0d78c9 100644
--- a/addons/lunch/i18n/it.po
+++ b/addons/lunch/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/ja.po b/addons/lunch/i18n/ja.po
index 4881ef1f9b1..fce78a0b14c 100644
--- a/addons/lunch/i18n/ja.po
+++ b/addons/lunch/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/nl.po b/addons/lunch/i18n/nl.po
index 047df98fd86..a60979ad4b2 100644
--- a/addons/lunch/i18n/nl.po
+++ b/addons/lunch/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
@@ -161,7 +161,7 @@ msgstr "Totaalprijs"
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "Box Amount by User"
-msgstr ""
+msgstr "Kassa bedrag per gebruiker"
 
 #. module: lunch
 #: field:lunch.cashmove,create_date:0
@@ -181,7 +181,7 @@ msgstr "Order omschrijving"
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "Box amount in last month"
-msgstr ""
+msgstr "Kassa bedrag in laatste maand"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm
@@ -198,7 +198,7 @@ msgstr "Juli"
 #. module: lunch
 #: view:lunch.cashmove:0 view:report.lunch.amount:0 view:report.lunch.order:0
 msgid "Box"
-msgstr ""
+msgstr "Kassa"
 
 #. module: lunch
 #: view:report.lunch.order:0
@@ -367,7 +367,7 @@ msgstr "Januari"
 #. module: lunch
 #: field:lunch.cashmove,box:0 field:report.lunch.amount,box:0
 msgid "Box Name"
-msgstr ""
+msgstr "Kassa naam"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashbox_clean
@@ -413,7 +413,7 @@ msgstr ""
 #. module: lunch
 #: report:lunch.order:0
 msgid "Unit Price"
-msgstr "Eenheidsprijs"
+msgstr "Prijs"
 
 #. module: lunch
 #: field:lunch.order,product:0
@@ -434,7 +434,7 @@ msgstr "Mei"
 #. module: lunch
 #: field:lunch.order,price:0 field:lunch.product,price:0
 msgid "Price"
-msgstr "Prijs"
+msgstr "Bedrag"
 
 #. module: lunch
 #: view:lunch.cashmove:0
@@ -459,7 +459,7 @@ msgstr "Totaal overgebleven"
 #. module: lunch
 #: view:lunch.order:0
 msgid "Total price"
-msgstr ""
+msgstr "Totale prijs"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
diff --git a/addons/lunch/i18n/pt.po b/addons/lunch/i18n/pt.po
index 1b1625ecb34..34e4c26f121 100644
--- a/addons/lunch/i18n/pt.po
+++ b/addons/lunch/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/pt_BR.po b/addons/lunch/i18n/pt_BR.po
index 5ca13c29969..f96627d9b45 100644
--- a/addons/lunch/i18n/pt_BR.po
+++ b/addons/lunch/i18n/pt_BR.po
@@ -8,31 +8,31 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-03-15 01:10+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-10-17 00:27+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
 msgid "Reset cashbox"
-msgstr ""
+msgstr "Reiniciar Caixa"
 
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "Box amount in current year"
-msgstr ""
+msgstr "Valor do Caixa total no ano atual"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_form
 #: model:ir.ui.menu,name:lunch.menu_lunch_order_form
 #: model:ir.ui.menu,name:lunch.menu_lunch_reporting_order
 msgid "Lunch Orders"
-msgstr ""
+msgstr "Pedidos de Almoço"
 
 #. module: lunch
 #: view:lunch.order.cancel:0
@@ -43,7 +43,7 @@ msgstr "Tem certeza que deseja cancelar este pedido?"
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form
 msgid "Cash Moves"
-msgstr ""
+msgstr "Movimentações Financeiras"
 
 #. module: lunch
 #: view:lunch.cashmove:0 view:lunch.order:0 view:report.lunch.amount:0
@@ -96,6 +96,8 @@ msgid ""
 "You can create on cashbox by employee if you want to keep track of the "
 "amount due by employee according to what have been ordered."
 msgstr ""
+"Você pode criar um caixa por funcionário se você deseja rastrear o valor "
+"devido pelo funcionário de acordo com o que ele solicitou."
 
 #. module: lunch
 #: field:lunch.cashmove,amount:0 field:report.lunch.amount,amount:0
@@ -111,7 +113,7 @@ msgstr "Produtos"
 #. module: lunch
 #: model:ir.model,name:lunch.model_report_lunch_amount
 msgid "Amount available by user and box"
-msgstr ""
+msgstr "Valor disponível por usuário e caixa"
 
 #. module: lunch
 #: view:report.lunch.amount:0
@@ -121,12 +123,12 @@ msgstr "   Mês   "
 #. module: lunch
 #: model:ir.model,name:lunch.model_report_lunch_order
 msgid "Lunch Orders Statistics"
-msgstr ""
+msgstr "Estatísticas de Pedido de Almoço"
 
 #. module: lunch
 #: view:lunch.cashmove:0 field:lunch.order,cashmove:0
 msgid "CashMove"
-msgstr ""
+msgstr "Movimentações de Caixa"
 
 #. module: lunch
 #: view:lunch.order:0 selection:lunch.order,state:0
@@ -141,17 +143,17 @@ msgstr "Confirmar"
 #. module: lunch
 #: view:lunch.order:0
 msgid "Search Lunch Order"
-msgstr ""
+msgstr "Procurar Pedido de Almoço"
 
 #. module: lunch
 #: field:lunch.order,state:0
 msgid "State"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: lunch
 #: selection:lunch.order,state:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: lunch
 #: field:report.lunch.order,price_total:0
@@ -161,7 +163,7 @@ msgstr "Preço Total"
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "Box Amount by User"
-msgstr ""
+msgstr "Valor do Caixa por usuário"
 
 #. module: lunch
 #: field:lunch.cashmove,create_date:0
@@ -181,7 +183,7 @@ msgstr "Descrição do Pedido"
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "Box amount in last month"
-msgstr ""
+msgstr "Valor do Caixa no último mês"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm
@@ -218,7 +220,7 @@ msgstr "Data de Criação"
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_category_form
 msgid " Product Categories "
-msgstr ""
+msgstr " Categorias de Produto "
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
@@ -228,12 +230,12 @@ msgstr "Definir como Zero"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashmove
 msgid "Cash Move"
-msgstr ""
+msgstr "Movimentos do Caixa"
 
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "Tasks performed in last 365 days"
-msgstr ""
+msgstr "Tarefas realizadas nos últimos 365 dias"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
@@ -259,7 +261,7 @@ msgstr "Mês"
 #. module: lunch
 #: field:lunch.order.confirm,confirm_cashbox:0
 msgid "Name of box"
-msgstr ""
+msgstr "Nome do Caixa"
 
 #. module: lunch
 #: view:lunch.order.cancel:0
@@ -291,12 +293,12 @@ msgstr "Não"
 #. module: lunch
 #: view:lunch.order.confirm:0
 msgid "Orders Confirmation"
-msgstr ""
+msgstr "Confirmação dos Pedidos"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
 msgid "Are you sure you want to reset this cashbox ?"
-msgstr ""
+msgstr "Tem certeza de que quer reiniciar este caixa?"
 
 #. module: lunch
 #: model:ir.actions.act_window,help:lunch.view_lunch_product_form_installer
@@ -306,6 +308,10 @@ msgid ""
 "by supplier. It will be easier for the lunch manager to filter lunch orders "
 "by categories."
 msgstr ""
+"Definir todos os produtos que os funcionários podem pedir para a hora do "
+"almoço. Se encomendar o almoço em vários lugares, você pode usar as "
+"categorias de produtos para dividir por fornecedor. Será mais fácil para o "
+"gerente de almoço para filtrar almoço pedidos por categorias."
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
@@ -316,7 +322,7 @@ msgstr "Agosto"
 #: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all
 #: view:report.lunch.order:0
 msgid "Lunch Order Analysis"
-msgstr ""
+msgstr "Análise de Pedidos de Almoço"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
@@ -337,7 +343,7 @@ msgstr "Análise de Vendas"
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_category_root_configuration
 msgid "Lunch"
-msgstr ""
+msgstr "Almoço"
 
 #. module: lunch
 #: view:lunch.cashmove:0 view:report.lunch.order:0
@@ -367,12 +373,12 @@ msgstr "Janeiro"
 #. module: lunch
 #: field:lunch.cashmove,box:0 field:report.lunch.amount,box:0
 msgid "Box Name"
-msgstr ""
+msgstr "Nome do Caixa"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashbox_clean
 msgid "clean cashbox"
-msgstr ""
+msgstr "Limpar caixa"
 
 #. module: lunch
 #: field:lunch.cashmove,active:0 field:lunch.product,active:0
@@ -387,18 +393,18 @@ msgstr "Data do Pedido"
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_cashbox
 msgid "Cashbox for Lunch "
-msgstr ""
+msgstr "Caixa do Almoço "
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean_values
 msgid "Set CashBox to Zero"
-msgstr ""
+msgstr "Zerar Caixa"
 
 #. module: lunch
 #: view:lunch.product:0
 msgid "General Information"
-msgstr ""
+msgstr "Informações Gerais"
 
 #. module: lunch
 #: view:lunch.order.confirm:0
@@ -408,7 +414,7 @@ msgstr "Cancelar"
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form
 msgid " Cashboxes "
-msgstr ""
+msgstr " Caixas "
 
 #. module: lunch
 #: report:lunch.order:0
@@ -439,27 +445,27 @@ msgstr "Preço"
 #. module: lunch
 #: view:lunch.cashmove:0
 msgid "Search CashMove"
-msgstr ""
+msgstr "Procurar Movimento do Caixa"
 
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "Total box"
-msgstr ""
+msgstr "Total do Caixa"
 
 #. module: lunch
 #: model:ir.model,name:lunch.model_lunch_product
 msgid "Lunch Product"
-msgstr ""
+msgstr "Produto do Almoço"
 
 #. module: lunch
 #: field:lunch.cashbox,sum_remain:0
 msgid "Total Remaining"
-msgstr ""
+msgstr "Total Restante"
 
 #. module: lunch
 #: view:lunch.order:0
 msgid "Total price"
-msgstr ""
+msgstr "Preço Total"
 
 #. module: lunch
 #: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0
@@ -480,17 +486,17 @@ msgstr "Valor total"
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "Tasks performed in last 30 days"
-msgstr ""
+msgstr "Tarefas realizadas nos últimos 30 dias"
 
 #. module: lunch
 #: view:lunch.category:0
 msgid "Category Related to Products"
-msgstr ""
+msgstr "Categoria Relativa a Produtos"
 
 #. module: lunch
 #: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form view:lunch.cashbox:0
 msgid "Cashboxes"
-msgstr ""
+msgstr "Caixa"
 
 #. module: lunch
 #: view:lunch.category:0 report:lunch.order:0 view:lunch.order:0
@@ -502,28 +508,28 @@ msgstr "Pedido"
 #: model:ir.model,name:lunch.model_lunch_order
 #: model:ir.ui.menu,name:lunch.menu_lunch report:lunch.order:0
 msgid "Lunch Order"
-msgstr ""
+msgstr "Pedido de Almoço"
 
 #. module: lunch
 #: view:report.lunch.amount:0
 msgid "Box amount in current month"
-msgstr ""
+msgstr "Valor do Caixa este mês"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.view_lunch_product_form_installer
 msgid "Define Your Lunch Products"
-msgstr ""
+msgstr "Definir seus produtos de almoço"
 
 #. module: lunch
 #: view:report.lunch.order:0
 msgid "Tasks during last 7 days"
-msgstr ""
+msgstr "Tarefas durante os últimos 7 dias"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree
 #: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree
 msgid "Cash Position by User"
-msgstr ""
+msgstr "Caixa por usuário"
 
 #. module: lunch
 #: field:lunch.cashbox,manager:0
@@ -538,18 +544,21 @@ msgstr "   30 Dias   "
 #. module: lunch
 #: view:lunch.order:0
 msgid "To Confirm"
-msgstr ""
+msgstr "Para Confirmar"
 
 #. module: lunch
 #: field:report.lunch.amount,year:0 view:report.lunch.order:0
 #: field:report.lunch.order,year:0
 msgid "Year"
-msgstr ""
+msgstr "Ano"
 
 #. module: lunch
 #: model:ir.actions.act_window,name:lunch.action_create_cashbox
 msgid "Create Lunch Cash Boxes"
-msgstr ""
+msgstr "Criar Caixa de Almoço"
 
 #~ msgid "Draft"
 #~ msgstr "Provisório"
+
+#~ msgid "Category related to Products"
+#~ msgstr "Categorias relacionadas a Produtos"
diff --git a/addons/lunch/i18n/ro.po b/addons/lunch/i18n/ro.po
index c0e6e8d2ffb..ce6b4948065 100644
--- a/addons/lunch/i18n/ro.po
+++ b/addons/lunch/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/ru.po b/addons/lunch/i18n/ru.po
index 7ec83e2c27f..80153462aee 100644
--- a/addons/lunch/i18n/ru.po
+++ b/addons/lunch/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/sr@latin.po b/addons/lunch/i18n/sr@latin.po
index f3c41dcdac0..d3c3fb66bf0 100644
--- a/addons/lunch/i18n/sr@latin.po
+++ b/addons/lunch/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/sv.po b/addons/lunch/i18n/sv.po
index b4c88b1fe61..abb1c7f6056 100644
--- a/addons/lunch/i18n/sv.po
+++ b/addons/lunch/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/tr.po b/addons/lunch/i18n/tr.po
index d68ef6d42cb..d12f5c73d3c 100644
--- a/addons/lunch/i18n/tr.po
+++ b/addons/lunch/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/zh_CN.po b/addons/lunch/i18n/zh_CN.po
index aaeef553a25..d05f4a792d0 100644
--- a/addons/lunch/i18n/zh_CN.po
+++ b/addons/lunch/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/i18n/zh_TW.po b/addons/lunch/i18n/zh_TW.po
index 45b8a36fc89..dd9d25b407d 100644
--- a/addons/lunch/i18n/zh_TW.po
+++ b/addons/lunch/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: lunch
 #: view:lunch.cashbox.clean:0
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index c249478ad48..0d224ef3a8e 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -19,234 +19,451 @@
 #
 ##############################################################################
 
+from xml.sax.saxutils import escape
+import time
 from osv import osv, fields
+from datetime import datetime
+from lxml import etree
+import tools
+from tools.translate import _
 
-class lunch_category(osv.osv):
-    """ Lunch category """
-
-    _name = 'lunch.category'
-    _description = "Category"
-
-    _columns = {
-        'name': fields.char('Name', required=True, size=50),
-    }
-    _order = 'name'
-
-lunch_category()
-
-
-class lunch_product(osv.osv):
-    """ Lunch Product """
-
-    _name = 'lunch.product'
-    _description = "Lunch Product"
-
-    _columns = {
-        'name': fields.char('Name', size=50, required=True),
-        'category_id': fields.many2one('lunch.category', 'Category'),
-        'description': fields.text('Description', size=128, required=False),
-        'price': fields.float('Price', digits=(16,2)),
-        'active': fields.boolean('Active'),
-    }
-
-    _defaults = {
-        'active': lambda *a : True,
-    }
-
-lunch_product()
-
-
-class lunch_cashbox(osv.osv):
-    """ cashbox for Lunch """
-
-    _name = 'lunch.cashbox'
-    _description = "Cashbox for Lunch "
-
-
-    def amount_available(self, cr, uid, ids, field_name, arg, context=None):
-
-        """ count available amount
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of create menu’s IDs
-        @param context: A standard dictionary for contextual values """
-
-        cr.execute("SELECT box,sum(amount) from lunch_cashmove where active = 't' group by box")
-        amount = dict(cr.fetchall())
-        for i in ids:
-            amount.setdefault(i, 0)
-        return amount
-
-    _columns = {
-        'manager': fields.many2one('res.users', 'Manager'),
-        'name': fields.char('Name', size=30, required=True, unique = True),
-        'sum_remain': fields.function(amount_available, string='Total Remaining'),
-    }
-
-lunch_cashbox()
-
-
-class lunch_cashmove(osv.osv):
-    """ Move cash """
-
-    _name = 'lunch.cashmove'
-    _description = "Cash Move"
-
-    _columns = {
-        'name': fields.char('Description', size=128),
-        'user_cashmove': fields.many2one('res.users', 'User Name', required=True),
-        'amount': fields.float('Amount', digits=(16, 2)),
-        'box': fields.many2one('lunch.cashbox', 'Box Name', size=30, required=True),
-        'active': fields.boolean('Active'),
-        'create_date': fields.datetime('Creation Date', readonly=True),
-    }
-
-    _defaults = {
-        'active': lambda *a: True,
-    }
-
-lunch_cashmove()
-
-
-class lunch_order(osv.osv):
-    """ Apply lunch order """
-
+class lunch_order(osv.Model):
+    """ 
+    lunch order (contains one or more lunch order line(s))
+    """
     _name = 'lunch.order'
-    _description = "Lunch Order"
-    _rec_name = "user_id"
+    _description = 'Lunch Order'
 
-    def _price_get(self, cr, uid, ids, name, args, context=None):
+    def _price_get(self, cr, uid, ids, name, arg, context=None):
+        """ 
+        get and sum the order lines' price
+        """
+        result = dict.fromkeys(ids, 0)
+        for order in self.browse(cr, uid, ids, context=context):
+            result[order.id] = sum(order_line.product_id.price
+                                   for order_line in order.order_line_ids)
+        return result
 
-        """ Get Price of Product
-         @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-         @param ids: List of Lunch order’s IDs
-         @param context: A standard dictionary for contextual values """
+    def _fetch_orders_from_lines(self, cr, uid, ids, name, context=None):
+        """ 
+        return the list of lunch orders to which belong the order lines `ids´
+        """
+        result = set()
+        for order_line in self.browse(cr, uid, ids, context=context):
+            if order_line.order_id:
+                result.add(order_line.order_id.id)
+        return list(result)
 
-        res = {}
-        for price in self.browse(cr, uid, ids, context=context):
-            res[price.id] = price.product.price
+    def add_preference(self, cr, uid, ids, pref_id, context=None):
+        """ 
+        create a new order line based on the preference selected (pref_id)
+        """
+        assert len(ids) == 1
+        orderline_ref = self.pool.get('lunch.order.line')
+        prod_ref = self.pool.get('lunch.product')
+        order = self.browse(cr, uid, ids[0], context=context)
+        pref = orderline_ref.browse(cr, uid, pref_id, context=context)
+        new_order_line = {
+            'date': order.date,
+            'user_id': uid,
+            'product_id': pref.product_id.id,
+            'note': pref.note,
+            'order_id': order.id,
+            'price': pref.product_id.price,
+            'supplier': pref.product_id.supplier.id
+        }
+        return orderline_ref.create(cr, uid, new_order_line, context=context)
+
+    def _alerts_get(self, cr, uid, ids, name, arg, context=None):
+        """ 
+        get the alerts to display on the order form 
+        """
+        result = {}
+        alert_msg = self._default_alerts_get(cr, uid, context=context)
+        for order in self.browse(cr, uid, ids, context=context):
+            if order.state == 'new':
+                result[order.id] = alert_msg
+        return result
+
+    def check_day(self, alert):
+        """ 
+        This method is used by can_display_alert
+        to check if the alert day corresponds
+        to the current day 
+        """
+        today = datetime.now().isoweekday()
+        assert 1 <= today <= 7, "Should be between 1 and 7"
+        mapping = dict((idx, name) for idx, name in enumerate('monday tuestday wednesday thursday friday saturday sunday'.split()))
+        if today in mapping:
+            return mapping[today]
+
+    def can_display_alert(self, alert):
+        """ 
+        This method check if the alert can be displayed today
+        """
+        if alert.alter_type == 'specific':
+            #the alert is only activated on a specific day
+            return alert.specific_day == time.strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+        elif alert.alter_type == 'week':
+            #the alert is activated during some days of the week
+            return self.check_day(alert)
+
+    def _default_alerts_get(self, cr, uid, context=None):
+        """ 
+        get the alerts to display on the order form
+        """
+        alert_ref = self.pool.get('lunch.alert')
+        alert_ids = alert_ref.search(cr, uid, [], context=context)
+        alert_msg = []
+        for alert in alert_ref.browse(cr, uid, alert_ids, context=context):
+            #check if the address must be displayed today
+            if self.can_display_alert(alert):
+                #display the address only during its active time
+                mynow = fields.datetime.context_timestamp(cr, uid, datetime.now(), context=context)
+                hour_to = int(alert.active_to)
+                min_to = int((alert.active_to - hour_to) * 60)
+                to_alert = datetime.strptime(str(hour_to) + ":" + str(min_to), "%H:%M")
+                hour_from = int(alert.active_from)
+                min_from = int((alert.active_from - hour_from) * 60)
+                from_alert = datetime.strptime(str(hour_from) + ":" + str(min_from), "%H:%M")
+                if mynow.time() >= from_alert.time() and mynow.time() <= to_alert.time():
+                    alert_msg.append(alert.message)
+        return '\n'.join(alert_msg)
+
+    def onchange_price(self, cr, uid, ids, order_line_ids, context=None):
+        """
+        Onchange methode that refresh the total price of order
+        """
+        res = {'value': {'total': 0.0}}
+        order_line_ids = self.resolve_o2m_commands_to_record_dicts(cr, uid, "order_line_ids", order_line_ids, ["price"], context=context)
+        if order_line_ids:
+            tot = 0.0
+            product_ref = self.pool.get("lunch.product")
+            for prod in order_line_ids:
+                if 'product_id' in prod:
+                    tot += product_ref.browse(cr, uid, prod['product_id'], context=context).price
+                else:
+                    tot += prod['price']
+            res = {'value': {'total': tot}}
+        return res
+
+    def __getattr__(self, attr):
+        """ 
+        this method catch unexisting method call and if it starts with
+        add_preference_'n' we execute the add_preference method with 
+        'n' as parameter 
+        """
+        if attr.startswith('add_preference_'):
+            pref_id = int(attr[15:])
+            def specific_function(cr, uid, ids, context=None):
+                return self.add_preference(cr, uid, ids, pref_id, context=context)
+            return specific_function
+        return super(lunch_order,self).__getattr__(self,attr)
+
+    def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
+        """ 
+        Add preferences in the form view of order.line 
+        """
+        res = super(lunch_order,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
+        line_ref = self.pool.get("lunch.order.line")
+        if view_type == 'form':
+            doc = etree.XML(res['arch'])
+            pref_ids = line_ref.search(cr, uid, [('user_id', '=', uid)], order='create_date desc', context=context)
+            xml_start = etree.Element("div")
+            #If there are no preference (it's the first time for the user)
+            if len(pref_ids)==0:
+                #create Elements
+                xml_no_pref_1 = etree.Element("div")
+                xml_no_pref_1.set('class','oe_inline oe_lunch_intro')
+                xml_no_pref_2 = etree.Element("h3")
+                xml_no_pref_2.text = _("This is the first time you order a meal")
+                xml_no_pref_3 = etree.Element("p")
+                xml_no_pref_3.set('class','oe_grey')
+                xml_no_pref_3.text = _("Select a product and put your order comments on the note.")
+                xml_no_pref_4 = etree.Element("p")
+                xml_no_pref_4.set('class','oe_grey')
+                xml_no_pref_4.text = _("Your favorite meals will be created based on your last orders.")
+                xml_no_pref_5 = etree.Element("p")
+                xml_no_pref_5.set('class','oe_grey')
+                xml_no_pref_5.text = _("Don't forget the alerts displayed in the reddish area")
+                #structure Elements
+                xml_start.append(xml_no_pref_1)
+                xml_no_pref_1.append(xml_no_pref_2)
+                xml_no_pref_1.append(xml_no_pref_3)
+                xml_no_pref_1.append(xml_no_pref_4)
+                xml_no_pref_1.append(xml_no_pref_5)
+            #Else: the user already have preferences so we display them
+            else:
+                preferences = line_ref.browse(cr, uid, pref_ids, context=context)
+                categories = {} #store the different categories of products in preference
+                count = 0
+                for pref in preferences:
+                    #For each preference
+                    categories.setdefault(pref.product_id.category_id.name, {})
+                    #if this product has already been added to the categories dictionnary
+                    if pref.product_id.id in categories[pref.product_id.category_id.name]:
+                        #we check if for the same product the note has already been added
+                        if pref.note not in categories[pref.product_id.category_id.name][pref.product_id.id]:
+                            #if it's not the case then we add this to preferences
+                            categories[pref.product_id.category_id.name][pref.product_id.id][pref.note] = pref
+                    #if this product is not in the dictionnay, we add it
+                    else:
+                        categories[pref.product_id.category_id.name][pref.product_id.id] = {}
+                        categories[pref.product_id.category_id.name][pref.product_id.id][pref.note] = pref
+
+                currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id
+
+                #For each preferences that we get, we will create the XML structure
+                for key,value in categories.items():
+                    xml_pref_1 = etree.Element("div")
+                    xml_pref_1.set('class','oe_lunch_30pc')
+                    xml_pref_2 = etree.Element("h2")
+                    xml_pref_2.text = key
+                    xml_pref_1.append(xml_pref_2)
+                    i = 0
+                    value = value.values()
+                    for val in value:
+                        for pref in val.values():
+                            #We only show 5 preferences per category (or it will be too long)
+                            if i==5: break
+                            i+=1
+                            xml_pref_3 = etree.Element("div")
+                            xml_pref_3.set('class','oe_lunch_vignette')
+                            xml_pref_1.append(xml_pref_3)
+
+                            xml_pref_4 = etree.Element("span")
+                            xml_pref_4.set('class','oe_lunch_button')
+                            xml_pref_3.append(xml_pref_4)
+
+                            xml_pref_5 = etree.Element("button")
+                            xml_pref_5.set('name',"add_preference_"+str(pref.id))
+                            xml_pref_5.set('class','oe_link oe_i oe_button_plus')
+                            xml_pref_5.set('type','object')
+                            xml_pref_5.set('string','+')
+                            xml_pref_4.append(xml_pref_5)
+
+                            xml_pref_6 = etree.Element("button")
+                            xml_pref_6.set('name',"add_preference_"+str(pref.id))
+                            xml_pref_6.set('class','oe_link oe_button_add')
+                            xml_pref_6.set('type','object')
+                            xml_pref_6.set('string',_("Add"))
+                            xml_pref_4.append(xml_pref_6)
+
+                            xml_pref_7 = etree.Element("div")
+                            xml_pref_7.set('class','oe_group_text_button')
+                            xml_pref_3.append(xml_pref_7)
+
+                            xml_pref_8 = etree.Element("div")
+                            xml_pref_8.set('class','oe_lunch_text')
+                            xml_pref_8.text = escape(pref.product_id.name)+str(" ")
+                            xml_pref_7.append(xml_pref_8)
+
+                            price = pref.product_id.price or 0.0
+                            cur = currency.name or ''
+                            xml_pref_9 = etree.Element("span")
+                            xml_pref_9.set('class','oe_tag')
+                            xml_pref_9.text = str(price)+str(" ")+cur
+                            xml_pref_8.append(xml_pref_9)
+
+                            xml_pref_10 = etree.Element("div")
+                            xml_pref_10.set('class','oe_grey')
+                            xml_pref_10.text = escape(pref.note or '')
+                            xml_pref_3.append(xml_pref_10)
+
+                            xml_start.append(xml_pref_1)
+
+            first_node = doc.xpath("//div[@name='preferences']")
+            if first_node and len(first_node)>0:
+                first_node[0].append(xml_start)
+            res['arch'] = etree.tostring(doc)
         return res
 
     _columns = {
-        'user_id': fields.many2one('res.users', 'User Name', required=True, \
-            readonly=True, states={'draft':[('readonly', False)]}),
-        'product': fields.many2one('lunch.product', 'Product', required=True, \
-            readonly=True, states={'draft':[('readonly', False)]}, change_default=True),
-        'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
-        'cashmove': fields.many2one('lunch.cashmove', 'Cash Move' , readonly=True),
-        'descript': fields.char('Comment', readonly=True, size=250, \
-            states = {'draft':[('readonly', False)]}),
-        'state': fields.selection([('draft', 'New'), ('confirmed', 'Confirmed'), ], \
-            'Status', readonly=True, select=True),
-        'price': fields.function(_price_get, string="Price"),
-        'category': fields.many2one('lunch.category','Category'),
+        'user_id': fields.many2one('res.users', 'User Name', required=True, readonly=True, states={'new':[('readonly', False)]}),
+        'date': fields.date('Date', required=True, readonly=True, states={'new':[('readonly', False)]}),
+        'order_line_ids': fields.one2many('lunch.order.line', 'order_id', 'Products', ondelete="cascade", readonly=True, states={'new':[('readonly', False)]}),
+        'total': fields.function(_price_get, string="Total", store={
+                 'lunch.order.line': (_fetch_orders_from_lines, ['product_id','order_id'], 20),
+            }),
+        'state': fields.selection([('new', 'New'), \
+                                    ('confirmed','Confirmed'), \
+                                    ('cancelled','Cancelled'), \
+                                    ('partially','Partially Confirmed')] \
+                                ,'Status', readonly=True, select=True),
+        'alerts': fields.function(_alerts_get, string="Alerts", type='text'),
     }
 
     _defaults = {
         'user_id': lambda self, cr, uid, context: uid,
         'date': fields.date.context_today,
-        'state': lambda self, cr, uid, context: 'draft',
+        'state': 'new',
+        'alerts': _default_alerts_get,
     }
 
-    def confirm(self, cr, uid, ids, box, context=None):
 
-        """ confirm order
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of confirm order’s IDs
-        @param context: A standard dictionary for contextual values """
+class lunch_order_line(osv.Model):
+    """ 
+    lunch order line: one lunch order can have many order lines
+    """
+    _name = 'lunch.order.line'
+    _description = 'lunch order line'
 
+    def onchange_price(self, cr, uid, ids, product_id, context=None):
+        if product_id:
+            price = self.pool.get('lunch.product').browse(cr, uid, product_id, context=context).price
+            return {'value': {'price': price}}
+        return {'value': {'price': 0.0}}
+
+    def order(self, cr, uid, ids, context=None):
+        """ 
+        The order_line is ordered to the supplier but isn't received yet
+        """
+        for order_line in self.browse(cr, uid, ids, context=context):
+            order_line.write({'state': 'ordered'}, context=context)
+        return self._update_order_lines(cr, uid, ids, context=context)
+
+    def confirm(self, cr, uid, ids, context=None):
+        """ 
+        confirm one or more order line, update order status and create new cashmove 
+        """
         cashmove_ref = self.pool.get('lunch.cashmove')
-        for order in self.browse(cr, uid, ids, context=context):
-            if order.state == 'confirmed':
-                continue
-            new_id = cashmove_ref.create(cr, uid, {'name': order.product.name+' order',
-                            'amount':-order.product.price,
-                            'user_cashmove':order.user_id.id,
-                            'box':box,
-                            'active':True,
-                            })
-            self.write(cr, uid, [order.id], {'cashmove': new_id, 'state': 'confirmed'})
+        for order_line in self.browse(cr, uid, ids, context=context):
+            if order_line.state != 'confirmed':
+                values = {
+                    'user_id': order_line.user_id.id,
+                    'amount': -order_line.price,
+                    'description': order_line.product_id.name,
+                    'order_id': order_line.id,
+                    'state': 'order',
+                    'date': order_line.date,
+                }
+                cashmove_ref.create(cr, uid, values, context=context)
+                order_line.write({'state': 'confirmed'}, context=context)
+        return self._update_order_lines(cr, uid, ids, context=context)
+
+    def _update_order_lines(self, cr, uid, ids, context=None):
+        """
+        Update the state of lunch.order based on its orderlines
+        """
+        orders_ref = self.pool.get('lunch.order')
+        orders = []
+        for order_line in self.browse(cr, uid, ids, context=context):
+            orders.append(order_line.order_id)
+        for order in set(orders):
+            isconfirmed = True
+            for orderline in order.order_line_ids:
+                if orderline.state == 'new':
+                    isconfirmed = False
+                if orderline.state == 'cancelled':
+                    isconfirmed = False
+                    orders_ref.write(cr, uid, [order.id], {'state': 'partially'}, context=context)
+            if isconfirmed:
+                orders_ref.write(cr, uid, [order.id], {'state': 'confirmed'}, context=context)
         return {}
 
-    def lunch_order_cancel(self, cr, uid, ids, context=None):
-
-        """" cancel order
-         @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-         @param ids: List of create menu’s IDs
-         @param context: A standard dictionary for contextual values """
-
-        orders = self.browse(cr, uid, ids, context=context)
-        for order in orders:
-            if not order.cashmove:
-                continue
-        if order.cashmove.id:
-            self.pool.get('lunch.cashmove').unlink(cr, uid, [order.cashmove.id])
-        self.write(cr, uid, ids, {'state':'draft'})
-        return {}
-
-    def onchange_product(self, cr, uid, ids, product):
-
-        """ Get price for Product
-         @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-         @param ids: List of create menu’s IDs
-         @product: Product To Ordered """
-
-        if not product:
-            return {'value': {'price': 0.0}}
-        price = self.pool.get('lunch.product').read(cr, uid, product, ['price'])['price']
-        categ_id = self.pool.get('lunch.product').browse(cr, uid, product).category_id.id
-        return {'value': {'price': price,'category':categ_id}}
-
-lunch_order()
-
-
-class report_lunch_amount(osv.osv):
-    """ Lunch Amount Report """
-
-    _name = 'report.lunch.amount'
-    _description = "Amount available by user and box"
-    _auto = False
-    _rec_name = "user_id"
+    def cancel(self, cr, uid, ids, context=None):
+        """
+        cancel one or more order.line, update order status and unlink existing cashmoves
+        """
+        cashmove_ref = self.pool.get('lunch.cashmove')
+        for order_line in self.browse(cr, uid, ids, context=context):
+            order_line.write({'state':'cancelled'}, context=context)
+            cash_ids = [cash.id for cash in order_line.cashmove]
+            cashmove_ref.unlink(cr, uid, cash_ids, context=context)
+        return self._update_order_lines(cr, uid, ids, context=context)
 
     _columns = {
-        'user_id': fields.many2one('res.users', 'User Name', readonly=True),
-        'amount': fields.float('Amount', readonly=True, digits=(16, 2)),
-        'box': fields.many2one('lunch.cashbox', 'Box Name', size=30, 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'),
-            ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
-        'day': fields.char('Day', size=128, readonly=True),
-        'date': fields.date('Created Date', readonly=True),
+        'name': fields.related('product_id', 'name', readonly=True),
+        'order_id': fields.many2one('lunch.order', 'Order', ondelete='cascade'),
+        'product_id': fields.many2one('lunch.product', 'Product', required=True),
+        'date': fields.related('order_id', 'date', type='date', string="Date", readonly=True, store=True),
+        'supplier': fields.related('product_id', 'supplier', type='many2one', relation='res.partner', string="Supplier", readonly=True, store=True),
+        'user_id': fields.related('order_id', 'user_id', type='many2one', relation='res.users', string='User', readonly=True, store=True),
+        'note': fields.text('Note'),
+        'price': fields.float("Price"),
+        'state': fields.selection([('new', 'New'), \
+                                    ('confirmed', 'Received'), \
+                                    ('ordered', 'Ordered'),  \
+                                    ('cancelled', 'Cancelled')], \
+                                'Status', readonly=True, select=True),
+        'cashmove': fields.one2many('lunch.cashmove', 'order_id', 'Cash Move', ondelete='cascade'),
+
+    }
+    _defaults = {
+        'state': 'new',
     }
 
-    def init(self, cr):
 
-        """ @param cr: the current row, from the database cursor"""
+class lunch_product(osv.Model):
+    """ 
+    lunch product 
+    """
+    _name = 'lunch.product'
+    _description = 'lunch product'
+    _columns = {
+        'name': fields.char('Product', required=True, size=64),
+        'category_id': fields.many2one('lunch.product.category', 'Category', required=True),
+        'description': fields.text('Description', size=256),
+        'price': fields.float('Price', digits=(16,2)), #TODO: use decimal precision of 'Account', move it from product to decimal_precision
+        'supplier': fields.many2one('res.partner', 'Supplier'),
+    }
 
-        cr.execute("""
-            create or replace view report_lunch_amount as (
-                select
-                    min(lc.id) as id,
-                    to_date(to_char(lc.create_date, 'dd-MM-YYYY'),'dd-MM-YYYY') as date,
-                    to_char(lc.create_date, 'YYYY') as year,
-                    to_char(lc.create_date, 'MM') as month,
-                    to_char(lc.create_date, 'YYYY-MM-DD') as day,
-                    lc.user_cashmove as user_id,
-                    sum(amount) as amount,
-                    lc.box as box
-                from
-                    lunch_cashmove lc
-                where
-                    active = 't'
-                group by lc.user_cashmove, lc.box, lc.create_date
-                )""")
+class lunch_product_category(osv.Model):
+    """ 
+    lunch product category 
+    """
+    _name = 'lunch.product.category'
+    _description = 'lunch product category'
+    _columns = {
+        'name': fields.char('Category', required=True), #such as PIZZA, SANDWICH, PASTA, CHINESE, BURGER, ...
+    }
 
-report_lunch_amount()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+class lunch_cashmove(osv.Model):
+    """ 
+    lunch cashmove => order or payment 
+    """
+    _name = 'lunch.cashmove'
+    _description = 'lunch cashmove'
+    _columns = {
+        'user_id': fields.many2one('res.users', 'User Name', required=True),
+        'date': fields.date('Date', required=True),
+        'amount': fields.float('Amount', required=True), #depending on the kind of cashmove, the amount will be positive or negative
+        'description': fields.text('Description'), #the description can be an order or a payment
+        'order_id': fields.many2one('lunch.order.line', 'Order', ondelete='cascade'),
+        'state': fields.selection([('order','Order'), ('payment','Payment')], 'Is an order or a Payment'),
+    }
+    _defaults = {
+        'user_id': lambda self, cr, uid, context: uid,
+        'date': fields.date.context_today,
+        'state': 'payment',
+    }
 
+class lunch_alert(osv.Model):
+    """ 
+    lunch alert 
+    """
+    _name = 'lunch.alert'
+    _description = 'Lunch Alert'
+    _columns = {
+        'message': fields.text('Message', size=256, required=True),
+        'alter_type': fields.selection([('specific', 'Specific Day'), \
+                                    ('week', 'Every Week'), \
+                                    ('days', 'Every Day')], \
+                                string='Recurrency', required=True, select=True),
+        'specific_day': fields.date('Day'),
+        'monday': fields.boolean('Monday'),
+        'tuesday': fields.boolean('Tuesday'),
+        'wednesday': fields.boolean('Wednesday'),
+        'thursday': fields.boolean('Thursday'),
+        'friday': fields.boolean('Friday'),
+        'saturday': fields.boolean('Saturday'),
+        'sunday':  fields.boolean('Sunday'),
+        'active_from': fields.float('Between', required=True),
+        'active_to': fields.float('And', required=True),
+    }
+    _defaults = {
+        'alter_type': 'specific',
+        'specific_day': fields.date.context_today,
+        'active_from': 7,
+        'active_to': 23,
+    }
diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml
index 543086d6620..7488208fd42 100644
--- a/addons/lunch/lunch_demo.xml
+++ b/addons/lunch/lunch_demo.xml
@@ -2,23 +2,192 @@
 <openerp>
     <data noupdate="1">
 
-        <record model="lunch.category" id="categ_sandwich">
+        <record id="base.user_root" model="res.users">
+            <field name="groups_id" eval="[(4,ref('lunch.group_lunch_manager'))]"/> 
+        </record>
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4,ref('lunch.group_lunch_user'))]"/> 
+        </record>
+
+        <record model="lunch.product.category" id="categ_sandwich">
             <field name="name">Sandwich</field>
         </record>
+        <record model="lunch.product.category" id="categ_pizza">
+            <field name="name">Pizza</field>
+        </record>
+        <record model="lunch.product.category" id="categ_pasta">
+            <field name="name">Pasta</field>
+        </record>
 
-        <record model="lunch.product" id="product_club">
-            <field name="name">Club</field>
+        <record model="res.partner" id="partner_coin_gourmand">
+            <field name="name">Coin gourmand</field>
+        </record>
+
+        <record model="res.partner" id="partner_pizza_inn">
+            <field name="name">Pizza Inn</field>
+        </record>
+
+        <record model="lunch.product" id="product_cheese_ham">
+            <field name="name">Cheese And Ham</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
-            <field name="price">2.75</field>
+            <field name="price">3.30</field>
+            <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
+            <field name="description">Cheese, Ham, Salad, Tomatoes, cucumbers, eggs</field>
         </record>
 
-        <record model="lunch.cashbox" id="cashbox_cashbox">
-            <field name="name">Cashbox</field>
-            <field name="manager" ref="base.user_root"/>
+        <record model="lunch.product" id="product_country">
+            <field name="name">The Country</field>
+            <field name="category_id" eval="str(ref('categ_sandwich'))"/>
+            <field name="price">3.30</field>
+            <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
+            <field name="description">Brie, Honey, Walnut Kernels</field>
         </record>
 
-        <record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4,ref('base.group_tool_user'))]"/> 
+        <record model="lunch.product" id="product_tuna">
+            <field name="name">Tuna</field>
+            <field name="category_id" eval="str(ref('categ_sandwich'))"/>
+            <field name="price">2.50</field>
+            <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
+            <field name="description">Tuna, Mayonnaise</field>
+        </record>
+
+        <record model="lunch.product" id="product_gouda">
+            <field name="name">Gouda Cheese</field>
+            <field name="category_id" eval="str(ref('categ_sandwich'))"/>
+            <field name="price">2.50</field>
+            <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
+            <field name="description"></field>
+        </record>
+
+        <record model="lunch.product" id="product_chicken_curry">
+            <field name="name">Chicken Curry</field>
+            <field name="category_id" eval="str(ref('categ_sandwich'))"/>
+            <field name="price">2.60</field>
+            <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
+            <field name="description"></field>
+        </record>
+
+        <record model="lunch.product" id="product_margherita">
+            <field name="name">Pizza Margherita</field>
+            <field name="category_id" eval="str(ref('categ_pizza'))"/>
+            <field name="price">6.90</field>
+            <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
+            <field name="description">Tomatoes, Mozzarella</field>
+        </record>
+
+        <record model="lunch.product" id="product_italiana">
+            <field name="name">Pizza Italiana</field>
+            <field name="category_id" eval="str(ref('categ_pizza'))"/>
+            <field name="price">7.40</field>
+            <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
+            <field name="description">Fresh Tomatoes, Basil, Mozzarella</field>
+        </record>
+
+        <record model="lunch.product" id="product_Bolognese">
+            <field name="name">Bolognese Pasta</field>
+            <field name="category_id" eval="str(ref('categ_pasta'))"/>
+            <field name="price">7.70</field>
+            <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
+            <field name="description"></field>
+        </record>
+
+         <record model="lunch.product" id="product_Napoli">
+            <field name="name">Napoli Pasta</field>
+            <field name="category_id" eval="str(ref('categ_pasta'))"/>
+            <field name="price">7.70</field>
+            <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
+            <field name="description">Tomatoes, Basil</field>
+        </record>
+
+        <record model="lunch.order" id="order_1">
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="date" eval="time.strftime('2012-10-23')"/>
+            <field name="order_line_ids" eval="[]"/>
+            <field name="state">new</field>
+        </record>
+
+        <record model="lunch.order" id="order_2">
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="date" eval="time.strftime('2012-10-22')"/>
+            <field name="order_line_ids" eval="[]"/>
+            <field name="state">confirmed</field>
+        </record>
+
+        <record model="lunch.order" id="order_3">
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="date" eval="time.strftime('2012-10-24')"/>
+            <field name="order_line_ids" eval="[]"/>
+            <field name="state">partially</field>
+        </record>
+
+        <record model="lunch.order.line" id="order_line_1">
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="product_id" ref="product_Bolognese"/>
+            <field name="date" eval="time.strftime('2012-10-23')"/>
+            <field name="state">new</field>
+            <field name="supplier" ref="partner_pizza_inn"/>
+            <field name="note">+Emmental</field>
+            <field name="order_id" ref="order_1"/>
+        </record>
+
+        <record model="lunch.order.line" id="order_line_2">
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="product_id" ref="product_italiana"/>
+            <field name="date" eval="time.strftime('2012-10-22')"/>
+            <field name="state">confirmed</field>
+            <field name="supplier" ref="partner_pizza_inn"/>
+            <field name="note">+Mushrooms</field>
+            <field name="order_id" ref="order_2"/>
+        </record>
+
+        <record model="lunch.order.line" id="order_line_3">
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="product_id" ref="product_gouda"/>
+            <field name="date" eval="time.strftime('2012-10-24')"/>
+            <field name="state">cancelled</field>
+            <field name="supplier" ref="partner_coin_gourmand"/>
+            <field name="note">+Salad +Tomatoes +Cucumbers</field>
+            <field name="order_id" ref="order_3"/>
+        </record>
+
+        <record model="lunch.order.line" id="order_line_4">
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="product_id" ref="product_chicken_curry"/>
+            <field name="date" eval="time.strftime('2012-10-24')"/>
+            <field name="state">confirmed</field>
+            <field name="supplier" ref="partner_coin_gourmand"/>
+            <field name="note">+Salad +Tomatoes +Eggs</field>
+            <field name="order_id" ref="order_3"/>
+        </record>
+    
+        <record model="lunch.cashmove" id="cashmove_1">
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="date" eval="time.strftime('2012-10-23')"/>
+            <field name="description">Pizza Italiana</field>
+            <field name="amount">-7.40</field>
+            <field name="order_id" ref="order_2"/>
+            <field name="state">order</field>
+        </record>
+
+        <record model="lunch.cashmove" id="cashmove_2">
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="date" eval="time.strftime('2012-10-24')"/>
+            <field name="description">Chicken curry</field>
+            <field name="amount">-2.60</field>
+            <field name="order_id" ref="order_3"/>
+            <field name="state">order</field>
+        </record>
+
+        <record model="lunch.cashmove" id="cashmove_3">
+            <field name="user_id" ref="base.user_demo"/>
+            <field name="date" eval="time.strftime('2012-10-24')"/>
+            <field name="description">Payment: 5 lunch tickets (6€)</field>
+            <field name="amount">30</field>
+            <field name="state">payment</field>
+        </record>
+
+        <record model="lunch.alert" id="alert_1">
+            <field name="message">Lunch must be ordered before 10h30 am</field>
         </record>
 
     </data>
diff --git a/addons/lunch/lunch_installer_view.xml b/addons/lunch/lunch_installer_view.xml
deleted file mode 100644
index d63f44b5ff2..00000000000
--- a/addons/lunch/lunch_installer_view.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<openerp>
-    <data>
-        <record model="ir.actions.act_window" id="view_lunch_product_form_installer">
-            <field name="name">Define Your Lunch Products</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">lunch.product</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" eval="False"/>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to add a new product that can be ordered for the lunch.
-              </p><p>
-                We suggest you to put the real price so that the exact due
-                amount is deduced from each employee's cash boxes when they
-                order.
-              </p><p>
-                If you order lunch at several places, you can use the product
-                categories to split by supplier. It will be easier to filter
-                lunch orders.
-              </p>
-            </field>
-        </record>
-
-        <record id="view_lunch_product_form_todo" model="ir.actions.todo">
-            <field name="action_id" ref="view_lunch_product_form_installer"/>
-            <field name="sequence">50</field>
-        </record>
-
-        <record model="ir.actions.act_window" id="action_create_cashbox">
-            <field name="name">Create Lunch Cash Boxes</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">lunch.cashbox</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to add a new cash box.
-              </p><p>
-                You can create on cash box by employee if you want to keep
-                track of the amount due by employee according to what have been
-                ordered.
-              </p>
-            </field>
-        </record>
-
-        <record id="action_create_cashbox_todo" model="ir.actions.todo">
-            <field name="action_id" ref="action_create_cashbox" />
-            <field name="sequence">51</field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/lunch/lunch_report.xml b/addons/lunch/lunch_report.xml
index c5e933847cd..942caadeed3 100644
--- a/addons/lunch/lunch_report.xml
+++ b/addons/lunch/lunch_report.xml
@@ -4,8 +4,8 @@
         <report
             id="report_lunch_order"
             string="Lunch Order"
-            model="lunch.order"
-            name="lunch.order"
+            model="lunch.order.line"
+            name="lunch.order.line"
             rml="lunch/report/order.rml"
             auto="False"
             />
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index bf438a538f9..ea9356bddc5 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -1,390 +1,472 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-          <menuitem name="Lunch Order" parent="base.menu_tools"
-              id="menu_lunch" sequence="1" />
+        <!--Menu and Title-->
+        <menuitem id='menu_lunch' name='Lunch' sequence="300"/>
+        <menuitem name="Lunch" parent="menu_lunch" id="menu_lunch_title" sequence="50" />
+        <menuitem name="Administrate Orders" parent="menu_lunch" id="menu_lunch_admin" sequence="51" groups="group_lunch_manager"/>
+        <menuitem name="Administrate Cash Moves" parent="menu_lunch" id="menu_lunch_cash" sequence="52" groups="group_lunch_manager"/>
+        <menuitem name="Configuration" parent="menu_lunch" id="menu_lunch_config" sequence="53" groups="group_lunch_manager"/>
+        
+         <!--View Search to group/filter by Supplier and time-->
+        <record model="ir.ui.view" id="lunch_order_line_search_view">
+            <field name="name">Search</field>
+            <field name="model">lunch.order.line</field>
+            <field name="arch" type="xml">
+                <search string="Search">
+                    <field name="name" filter_domain="['|', ('name', 'ilike', self), ('note', 'ilike', self)]"/>
+                    <filter name="not_confirmed" string="Not Received" domain="[('state','!=',('confirmed'))]"/>
+                    <filter name="comfirmed" string="Received" domain="[('state','=','confirmed')]"/>
+                    <filter name="cancelled" string="Cancelled" domain="[('state','=','cancelled')]"/>
+                    <separator/>
+                    <filter name="today" string="Today" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
+                    <field name="user_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter name="group_by_supplier" string="By Supplier" context="{'group_by':'supplier'}"/>
+                        <filter name="group_by_date" string="By Date" context="{'group_by':'date'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
-          <menuitem name="Reporting" parent="base.menu_tools"
-              id="base.menu_lunch_reporting" sequence="6" groups="base.group_tool_manager"/>
+        <!--View Search to group by employee and input/output (cashmoves)-->
+        <record id="view_lunch_employee_payment_filter" model="ir.ui.view">
+            <field name='name'>lunch employee payment</field>
+            <field name='model'>lunch.cashmove</field>
+            <field name='arch' type='xml'>
+                <search string="lunch employee payment">
+                    <field name="description"/>
+                    <field name="user_id"/>
+                    <filter name='is_payment' string="Payment" domain="[('state','=','payment')]"/>
+                    <separator/>
+                    <filter name='is_mine' string="My Account" domain="[('user_id','=',uid)]"/>
+                </search>
+            </field>
+        </record>
 
-          <menuitem name="Lunch"
-              parent="base.menu_reporting"
-              id="menu_lunch_reporting_order" sequence="55" />
+        <record id="view_lunch_cashmove_filter" model="ir.ui.view">
+            <field name='name'>lunch cashmove</field>
+            <field name='model'>lunch.cashmove</field>
+            <field name='arch' type='xml'>
+                <search string="lunch cashmove">
+                    <field name="description"/>
+                    <field name="user_id"/>
+                    <group expand="0" string="Group By...">
+                        <filter name='group_by_user' string="By Employee" context="{'group_by':'user_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
 
-          <menuitem name="Configuration" parent="base.menu_tools"
-              id="base.menu_lunch_survey_root" sequence="20" groups="base.group_tool_manager"/>
+        <!--View search for order-->
+        <record id="view_search_my_order" model="ir.ui.view">
+            <field name='name'>lunch orders</field>
+            <field name='model'>lunch.order</field>
+            <field name='arch' type='xml'>
+                <search string="lunch orders">
+                    <field name="date"/>
+                    <field name="order_line_ids"/>
+                    <filter name='is_mine' string="My Orders" domain="[('user_id','=',uid)]"/>
+                </search>
+            </field>
+        </record>
 
-          <menuitem name="Lunch" parent="base.menu_lunch_survey_root"
-              id="menu_lunch_category_root_configuration" sequence="1" />
 
-<!-- Lunch order Form view -->
+        <record model="ir.ui.view" id="alert_search_view">
+            <field name="name">Search</field>
+            <field name="model">lunch.alert</field>
+            <field name="arch" type="xml">
+                <search string="Search">
+                    <field name="message"/>
+                </search>
+            </field>
+        </record>
 
-          <record model="ir.ui.view" id="view_lunch_order_form">
-            <field name="name">Order</field>
+        <!--Action for Your Orders-->
+        <record model="ir.actions.act_window" id="action_lunch_order_form">
+            <field name="name">New Order</field>
+            <field name="res_model">lunch.order</field>
+            <field name="view_mode">form</field>
+        </record>
+        <menuitem name="New Order" parent="menu_lunch_title" id="menu_lunch_order_form" action="action_lunch_order_form" sequence="1"/>
+
+        <record model="ir.actions.act_window" id="action_lunch_order_tree">
+            <field name="name">Your Orders</field>
+            <field name="res_model">lunch.order</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_search_my_order"/>
+            <field name="context">{"search_default_is_mine":1}</field>
+            <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                Click to create a lunch order. 
+            </p>
+            <p>
+                A lunch order is defined by its user, date and order lines.
+                Each order line corresponds to a product, an additional note and a price.
+                Before selecting your order lines, don't forget to read the warnings displayed in the reddish area.
+            </p>
+            </field>
+        </record>
+        <menuitem name="Previous Orders" parent="menu_lunch_title" id="menu_lunch_order_tree" action="action_lunch_order_tree" sequence="2"/>
+
+        <!--Action for Lunch cashmoves-->
+        <record model="ir.actions.act_window" id="action_lunch_cashmove_form">
+            <field name="name">Your Account</field>
+            <field name="res_model">lunch.cashmove</field>
+            <field name="view_mode">tree</field>
+            <field name="search_view_id" ref="view_lunch_employee_payment_filter"/>
+            <field name="context">{"search_default_is_mine":1}</field>
+            <field name="help" type="html">
+              <p>
+                Here you can see your cash moves.<br/>A cash moves can be either an expense or a payment.
+                An expense is automatically created when an order is received while a payment is a reimbursement to the company encoded by the manager.
+              </p>
+            </field>
+        </record>
+        <menuitem name="Your Lunch Account" parent="menu_lunch_title" id="menu_lunch_cashmove_form" action="action_lunch_cashmove_form" sequence="3"/>
+
+        <!--Action for Administrate Orders group by supplier-->
+        <record model="ir.actions.act_window" id="action_lunch_order_by_supplier_form">
+            <field name="name">Orders by Supplier</field>
+            <field name="res_model">lunch.order.line</field>
+            <field name="view_mode">tree</field>
+            <field name="search_view_id" ref="lunch_order_line_search_view"/>
+            <field name="context">{"search_default_group_by_supplier":1, "search_default_today":1}</field>
+            <field name="help" type="html">
+              <p>
+                Here you can see today's orders grouped by suppliers.
+              </p>
+              <p>
+                - Click on the <img src="../../../web/static/src/img/icons/terp-call-start.png"/> to announce that the order is ordered <br/>
+                - Click on the <img src="../../../web/static/src/img/icons/gtk-apply.png"/> to announce that the order is received <br/>
+                - Click on the <img src="../../../web/static/src/img/icons/gtk-cancel.png"/> to announce that the order isn't available
+              </p>
+            </field>
+        </record>
+        <menuitem name="Today's Orders by Supplier" parent="menu_lunch_admin" id="menu_lunch_order_by_supplier_form" action="action_lunch_order_by_supplier_form" />
+
+        <!--Action for control Supplier-->
+        <record model="ir.actions.act_window" id="action_lunch_control_suppliers">
+            <field name="name">Control Suppliers</field>
+            <field name="res_model">lunch.order.line</field>
+            <field name="view_mode">tree</field>
+            <field name="search_view_id" ref="lunch_order_line_search_view"/> 
+            <field name="context">{"search_default_group_by_date":1, "search_default_group_by_supplier":1}</field>
+            <field name="help" type="html">
+              <p>
+                Here you can see every orders grouped by suppliers and by date.
+              </p>
+              <p>
+                - Click on the <img src="../../../web/static/src/img/icons/terp-call-start.png"/> to announce that the order is ordered <br/>
+                - Click on the <img src="../../../web/static/src/img/icons/gtk-apply.png"/> to announce that the order is received <br/>
+                - Click on the <img src="../../../web/static/src/img/icons/gtk-cancel.png"/> red X to announce that the order isn't available
+              </p>
+            </field>
+        </record>
+        <menuitem name="Orders by Supplier" parent="menu_lunch_admin" id="menu_lunch_control_suppliers" action="action_lunch_control_suppliers" />
+
+        <!--Action for Control Accounts-->
+        <record model="ir.actions.act_window" id="action_lunch_control_accounts">
+            <field name="name">Control Accounts</field>
+            <field name="res_model">lunch.cashmove</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_lunch_cashmove_filter"/>
+            <field name="context">{"search_default_group_by_user":1}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                Click to create a new payment. 
+            </p>
+              <p>
+                A cashmove can either be an expense or a payment.<br/>
+                An expense is automatically created at the order receipt.<br/>
+                A payment represents the employee reimbursement to the company.
+              </p>
+            </field>
+        </record>
+        <menuitem name="Control Accounts" parent="menu_lunch_cash" id="menu_lunch_control_accounts" action="action_lunch_control_accounts" />
+
+
+        <!--Action for Payment cashmove-->
+        <record model="ir.actions.act_window" id="action_lunch_cashmove">
+            <field name="name">Register Cash Moves</field>
+            <field name="res_model">lunch.cashmove</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_lunch_employee_payment_filter"/>
+            <field name="context">{"search_default_is_payment":1}</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                Click to create a payment. 
+            </p>
+              <p>
+                Here you can see the employees' payment. A payment is a cash move from the employee to the company.
+              </p>
+            </field>
+        </record>
+        <menuitem name="Employee's Payment" parent="menu_lunch_cash" id="menu_lunch_cashmove" action="action_lunch_cashmove" />
+
+        <!--Action for Products-->
+        <record model="ir.actions.act_window" id="action_lunch_products">
+            <field name="name">Products</field>
+            <field name="res_model">lunch.product</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                Click to create a product for lunch. 
+            </p>
+              <p>
+                A product is defined by its name, category, price and supplier.
+              </p>
+            </field>
+        </record>
+        <menuitem name="Products" parent="menu_lunch_config" id="menu_lunch_products" action="action_lunch_products" />
+
+        <!--Action for Product categories-->
+        <record model="ir.actions.act_window" id="action_lunch_product_categories">
+            <field name="name">Product Categories</field>
+            <field name="res_model">lunch.product.category</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                Click to create a lunch category. 
+            </p>
+              <p>
+                Here you can find every lunch categories for products.
+              </p>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="product_category_form_view">
+            <field name="name">Product category Form</field>
+            <field name="model">lunch.product.category</field>
+            <field name="arch" type="xml">
+                <form string="Products Form" version="7.0">
+                    <sheet>
+                    <group>
+                        <field name='name' string="Product Category: "/>
+                    </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <menuitem name="Product Categories" parent="menu_lunch_config" id="menu_lunch_product_categories" action="action_lunch_product_categories" />
+
+        <!--Action for Alert-->
+        <record model="ir.actions.act_window" id="action_lunch_alert">
+            <field name="name">Alerts</field>
+            <field name="res_model">lunch.alert</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="alert_search_view"/>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                Click to create a lunch alert. 
+            </p>
+              <p>
+                Alerts are used to warn employee from possible issues concerning the lunch orders.
+                To create a lunch alert you have to define its recurrency, the time interval during which the alert should be executed and the message to display.
+            </p>
+            <p>
+                Example: <br/>
+                - Recurency: Everyday<br/>
+                - Time interval: from 00h00 am to 11h59 pm<br/>
+                - Message: "You must order before 10h30 am"
+              </p>
+            </field>
+        </record>
+        <menuitem name="Alerts" parent="menu_lunch_config" id="menu_lunch_alert" action="action_lunch_alert" />
+
+        <!--View for Order lines-->
+        <record model="ir.ui.view" id="orders_order_lines_tree_view">
+            <field name="name">Order lines Tree</field>
+            <field name="model">lunch.order.line</field>
+            <field name="arch" type="xml">
+                <tree string="Order lines Tree"> 
+                    <field name='date'/>
+                    <field name='user_id'/>
+                    <field name='supplier' invisible='1'/> 
+                    <field name='product_id'/>                             
+                    <field name='note'/>
+                    <field name='state'/>
+                    <field name='price' sum="Total"/>
+                    <button name="order" string="Order" type="object" icon="terp-call-start" attrs="{'invisible': ['|',('state','=','confirmed'),('state','=','ordered')]}"/>
+                    <button name="confirm" string="Confirm" type="object" icon="gtk-apply" attrs="{'invisible': [('state','!=','ordered')]}"/>
+                    <button name="cancel" string="Cancel" type="object" icon="gtk-cancel" attrs="{'invisible': [('state','=','cancelled')]}"/>
+                </tree>
+            </field>
+        </record>
+
+        <!--View for Your orders-->
+        <record model="ir.ui.view" id="orders_tree_view">
+            <field name="name">Orders Tree View</field>
             <field name="model">lunch.order</field>
             <field name="arch" type="xml">
-                <form string="Lunch Order" version="7.0">
-                <header>
-                    <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" states="draft" class="oe_highlight"/>
-                    <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" states="confirmed" />
-                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed"/>
-                </header>
-                <sheet string="Order">
-                    <group>
+                <tree string="Orders Tree">
+                    <field name="date"/>
+                    <field name="order_line_ids"/>
+                    <field name="state" />
+                    <field name="total" sum="Total"/>
+                </tree>
+            </field>
+        </record>
+       
+        <record model="ir.ui.view" id="orders_form_view">
+            <field name="name">Lunch Order</field>
+            <field name="model">lunch.order</field>
+            <field name="arch" type="xml">
+                <form string='Orders Form' version='7.0' class="oe_lunch">
+                    <header>
+                        <field name='state' widget='statusbar' statusbar_visible='new,confirmed'/>
+                    </header>
+                    <sheet>
                         <group>
-                            <field name="product" on_change="onchange_product(product)"/>
-                            <field name="descript"/>
-                            <field name="price"/>
-                            <field name="category"/>
+                            <group>
+                                <field name='user_id'/>
+                            </group>
+                            <group> 
+                                <field name='date'/>
+                            </group>
                         </group>
+                        <field name='alerts' attrs="{'invisible': ['|',('state','!=','new'),('alerts','=','')]}" class="oe_inline oe_lunch_alert"/> 
+                        <div name="preferences">
+                        </div>
+                        <separator string='Select your order'/>
+                        <field name='order_line_ids' nolabel='1' on_change='onchange_price(order_line_ids)'>
+                            <tree string='List' editable='bottom'>
+                                <field name='product_id' on_change='onchange_price(product_id)'/>
+                                <field name='note' />
+                                <field name='price' />
+                                <field name='supplier' invisible="1"/>
+                                <field name="state" invisible="1"/>
+                            </tree>
+                        </field> 
+                        <group class='oe_subtotal_footer oe_right'>
+                            <field name='total'/> 
+                        </group>
+                        <br/><br/>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <!--View for Products-->
+        <record model="ir.ui.view" id="products_tree_view">
+            <field name="name">Products Tree</field>
+            <field name="model">lunch.product</field>
+            <field name="arch" type="xml">
+                <tree string="Products Tree">
+                    <field name="name"/>
+                    <field name="category_id"/>
+                    <field name="supplier"/>
+                    <field name="description"/>
+                    <field name="price"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="products_form_view">
+            <field name="name">Products Form</field>
+            <field name="model">lunch.product</field>
+            <field name="arch" type="xml">
+                <form string="Products Form" version="7.0">
+                    <header>
+                    </header>
+                    <sheet>
+                        <group>
+                            <field name='name'/>
+                            <field name='category_id'/>
+                            <field name='supplier'/>
+                            <field name='price'/>
+                        </group>
+                        <label for='description'/>
+                        <field name='description'/>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <!--view for cashmove-->
+        <record model="ir.ui.view" id="casmove_tree_view">
+            <field name="name">cashmove tree</field>
+            <field name="model">lunch.cashmove</field>
+            <field name="arch" type="xml">
+                <tree string="cashmove tree">
+                    <field name="date"/>
+                    <field name="user_id"/>
+                    <field name="description"/>
+                    <field name="amount" sum="Total"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="casmove_form_view">
+            <field name="name">cashmove form</field>
+            <field name="model">lunch.cashmove</field>
+            <field name="arch" type="xml">
+                <form string="cashmove form" version="7.0">
+                    <sheet>
                         <group>
                             <field name="user_id"/>
-                            <field name="cashmove"/>
                             <field name="date"/>
+                            <field name="amount"/>
                         </group>
-                    </group>
+                        <label for='description'/>
+                        <field name="description"/>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <!--view for alerts-->
+        <record model="ir.ui.view" id="alert_tree_view">
+            <field name="name">alert tree</field>
+            <field name="model">lunch.alert</field>
+            <field name="arch" type="xml">
+                <tree string="alert tree">
+                    <field name="message"/>
+                    <field name="alter_type"/>
+                    <field name='active_from' widget='float_time'/>
+                    <field name='active_to' widget='float_time'/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="alert_form_view">
+            <field name="name">alert form</field>
+            <field name="model">lunch.alert</field>
+            <field name="arch" type="xml">
+                <form string="alert tree" version="7.0">
+                    <sheet>
+                        <group string="Schedule Date">
+                            <group>
+                                <field name="alter_type"/>
+                                <field name="specific_day" attrs="{'invisible': [('alter_type','!=','specific')], 'required':[('alter_type','=','specific')]}"/>
+                            </group>
+                        </group>
+                        <group attrs="{'invisible': [('alter_type','!=','week')]}">
+                            <group>
+                                <field name="monday"/>
+                                <field name="tuesday"/>
+                                <field name="wednesday"/>
+                                <field name="thursday"/>
+                            </group>
+                            <group>
+                                <field name="friday"/>
+                                <field name="saturday"/>
+                                <field name="sunday"/>
+                            </group>
+                        </group>
+                        <group string="Schedule Hour">
+                            <field name='active_from' widget='float_time'/>
+                            <field name='active_to' widget='float_time'/>
+                        </group>
+                        <group string='Message'>
+                            <field name='message' nolabel='1' placeholder="Write the message you want to display during the defined period..."/>
+                        </group>
+
                 </sheet>
                 </form>
             </field>
         </record>
 
-<!-- Lunch order Tree view -->
-
-        <record model="ir.ui.view" id="view_lunch_order_tree">
-            <field name="name">Order</field>
-            <field name="model">lunch.order</field>
-            <field name="arch" type="xml">
-                <tree colors="blue:state == 'draft';black:state == 'confirmed'" string="Order">
-                    <field name="date"/>
-                    <field name="user_id"/>
-                    <field name="product"/>
-                    <field name="descript"/>
-                    <field name="category"/>
-                    <field name="price" sum="Total price"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-<!-- Lunch order Search view -->
-
-        <record id="view_lunch_order_filter" model="ir.ui.view">
-            <field name="name">lunch.order.list.select</field>
-            <field name="model">lunch.order</field>
-            <field name="arch" type="xml">
-                <search string="Search Lunch Order">
-                    <field name="date"/>
-                    <filter icon="terp-check" string="To Confirm" domain="[('state','=','draft')]"/>
-                    <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=',('confirmed'))]"/>
-                    <field name="user_id"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]"  context="{'group_by':'category'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-<!-- Lunch order Action -->
-
-        <record model="ir.actions.act_window" id="action_lunch_order_form">
-                <field name="name">Lunch Orders</field>
-                <field name="res_model">lunch.order</field>
-                <field name="view_mode">tree,form</field>
-                <field name="search_view_id" ref="view_lunch_order_filter"/>
-                <field name="context">{"search_default_Today":1}</field>
-        </record>
-
-        <menuitem name="Lunch Orders" parent="menu_lunch"
-            id="menu_lunch_order_form" action="action_lunch_order_form" />
-
-<!--  Cash Box Form view  -->
-
-        <record model="ir.ui.view" id="view_lunch_cashbox_form">
-            <field name="name">Cashboxes</field>
-            <field name="model">lunch.cashbox</field>
-            <field name="arch" type="xml">
-                <form string="Cashboxes" version="7.0">
-                    <group colspan="4">
-                        <field name="name"/>
-                        <field name="manager"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-<!--  Cash Box Tree view  -->
-
-        <record model="ir.ui.view" id="view_lunch_cashbox_tree">
-            <field name="name">Cashboxes</field>
-            <field name="model">lunch.cashbox</field>
-            <field name="arch" type="xml">
-                <tree string="Cashboxes" colors="red:sum_remain&lt;=0">
-                    <field name="name"/>
-                    <field name="manager"/>
-                    <field name="sum_remain"/>
-                </tree>
-            </field>
-        </record>
-
-<!--  Cash Box Action  -->
-
-        <record model="ir.actions.act_window" id="action_lunch_cashbox_form">
-                <field name="name"> Cashboxes </field>
-                <field name="res_model">lunch.cashbox</field>
-        </record>
-
-        <menuitem name="Cashboxes"
-            parent="menu_lunch_category_root_configuration"
-            id="menu_lunch_cashbox_form"
-            action="action_lunch_cashbox_form" />
-
-<!-- Cash Move Form view  -->
-
-        <record model="ir.ui.view" id="view_lunch_cashmove_form">
-            <field name="name">CashMove</field>
-            <field name="model">lunch.cashmove</field>
-            <field name="arch" type="xml">
-                <form string="CashMove" version="7.0">
-                    <sheet>
-                        <group col="4">
-                            <field name="name"/>
-                            <field name="user_cashmove"/>
-                            <field name="amount"/>
-                            <field name="box"/>
-                            <field name="create_date"/>
-                            <field name="active"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-<!-- Cash Move Tree view  -->
-
-        <record model="ir.ui.view" id="view_lunch_cashmove_tree">
-            <field name="name">CashMove</field>
-            <field name="model">lunch.cashmove</field>
-            <field name="arch" type="xml">
-                <tree string="CashMove" editable="top">
-                    <field name="create_date"/>
-                    <field name="box"/>
-                    <field name="name" required="1"/>
-                    <field name="user_cashmove"/>
-                    <field name="amount" sum="Total amount"/>
-                </tree>
-            </field>
-        </record>
-
-<!--  Cash Move Search View  -->
-
-        <record id="view_lunch_cashmove_filter" model="ir.ui.view">
-            <field name="name">lunch.cashmove.list.select</field>
-            <field name="model">lunch.cashmove</field>
-            <field name="arch" type="xml">
-                <search string="Search CashMove">
-                    <field name="create_date"/>
-                    <field name="user_cashmove"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="User" icon="terp-personal" domain="[]"  context="{'group_by':'user_cashmove'}"/>
-                        <filter string="Box" icon="terp-dolar" domain="[]"  context="{'group_by':'box'}"/>
-                        <filter string="Date" icon="terp-go-today" domain="[]"  context="{'group_by':'create_date'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-<!-- Cash Move Action  -->
-
-        <record model="ir.actions.act_window" id="action_lunch_cashmove_form">
-                <field name="name">Cash Moves</field>
-                <field name="res_model">lunch.cashmove</field>
-                <field name="search_view_id" ref="view_lunch_cashmove_filter"/>
-                <field name="context">{"search_default_Today":1}</field>
-        </record>
-
-        <menuitem name="Cash Moves" parent="menu_lunch"
-            id="menu_lunch_cashmove_form"
-            action="action_lunch_cashmove_form" />
-
-<!-- Lunch Category Form view  -->
-
-        <record model="ir.ui.view" id="view_lunch_category_form">
-            <field name="name"> Category of product </field>
-            <field name="model">lunch.category</field>
-            <field name="arch" type="xml">
-                <form string="Category" version="7.0">
-                    <group>
-                        <field name="name"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-<!-- Lunch Category Tree view  -->
-
-        <record model="ir.ui.view" id="view_lunch_category_tree">
-            <field name="name">Category</field>
-            <field name="model">lunch.category</field>
-            <field name="arch" type="xml">
-                <tree string="Order">
-                    <field name="name"/>
-                </tree>
-            </field>
-        </record>
-
-<!-- Lunch Category Action  -->
-
-        <record model="ir.actions.act_window" id="action_lunch_category_form">
-            <field name="name"> Product Categories </field>
-            <field name="res_model">lunch.category</field>
-        </record>
-
-<!-- Lunch Product Form view  -->
-
-        <record model="ir.ui.view" id="view_lunch_product_form">
-            <field name="name">Products</field>
-            <field name="model">lunch.product</field>
-            <field name="arch" type="xml">
-                <form string="Products" version="7.0">
-                    <sheet>
-                        <group>
-                            <group>
-                                <field name="name"/>
-                                <field name="category_id"/>
-                                <field name="price" />
-                            </group>
-                            <group>
-                                <field name="active"/>
-                            </group>
-                            <field name="description" placeholder="Add a description" nolabel="1" colspan="4"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-<!-- Lunch Product Tree view  -->
-
-        <record model="ir.ui.view" id="view_lunch_product_tree">
-            <field name="name">Products</field>
-            <field name="model">lunch.product</field>
-            <field name="arch" type="xml">
-                <tree string="Products">
-                    <field name="name"/>
-                    <field name="category_id"/>
-                    <field name="price"/>
-                    <field name="description"/>
-                </tree>
-            </field>
-        </record>
-
-<!-- Lunch Product Search view  -->
-
-        <record model="ir.ui.view" id="view_lunch_product_search">
-            <field name="name">Products</field>
-            <field name="model">lunch.product</field>
-            <field name="arch" type="xml">
-                <search string="Products">
-                    <field name="name" string="Product"/>
-                    <field name="price"/>
-                    <field name="category_id"/>
-                </search>
-            </field>
-        </record>
-
-<!-- Lunch Product Action  -->
-
-        <record model="ir.actions.act_window" id="action_lunch_product_form">
-            <field name="name">Products</field>
-            <field name="res_model">lunch.product</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_lunch_product_tree"/>
-            <field name="search_view_id" ref="view_lunch_product_search"/>
-        </record>
-
-        <menuitem name="Products"
-            parent="menu_lunch_category_root_configuration"
-            id="menu_lunch_product_form" action="action_lunch_product_form"
-            sequence="2" />
-
-        <menuitem name="Product Categories"
-            parent="menu_lunch_category_root_configuration"
-            id="menu_lunch_category_form"
-            action="action_lunch_category_form" sequence="1" />
-
-
-<!-- Lunch Amount Tree view -->
-
-        <record model="ir.ui.view" id="view_report_lunch_amount_tree">
-            <field name="name">Lunch amount</field>
-            <field name="model">report.lunch.amount</field>
-            <field name="arch" type="xml">
-                <tree string="Box Amount by User">
-                    <field name="date" invisible="1"/>
-                    <field name="year" invisible="1"/>
-                    <field name="day" invisible="1"/>
-                    <field name="month" invisible="1"/>
-                    <field name="box"/>
-                    <field name="user_id"/>
-                    <field name="amount" sum="Total box" />
-                </tree>
-            </field>
-        </record>
-
-<!-- Lunch Amount Form view -->
-
-        <record model="ir.ui.view" id="view_report_lunch_amount_form">
-            <field name="name">Lunch amount</field>
-            <field name="model">report.lunch.amount</field>
-            <field name="arch" type="xml">
-                <form string="Box Amount by User" version="7.0">
-                 <sheet>
-                    <group col="4">
-                        <field name="user_id"/>
-                        <field name="box"/>
-                        <field name="amount"/>
-                    </group>
-                 </sheet>   
-                </form>
-            </field>
-        </record>
-
-<!-- Lunch Amount Search view -->
-
-        <record model="ir.ui.view" id="view_report_lunch_amount_search">
-            <field name="name">Lunch amount</field>
-            <field name="model">report.lunch.amount</field>
-            <field name="arch" type="xml">
-                <search string="Box Amount by User">
-                    <field name="date"/>
-                    <field name="box"/>
-                    <field name="amount"/>
-                    <field name="user_id"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Box" icon="terp-dolar" context="{'group_by':'box'}"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-<!-- Lunch Amount Action -->
-
-        <record model="ir.actions.act_window" id="action_report_lunch_amount_tree">
-            <field name="name">Cash Position by User</field>
-            <field name="res_model">report.lunch.amount</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_year': 1,"search_default_month":1}</field>
-            <field name="search_view_id" ref="view_report_lunch_amount_search"/>
-        </record>
-
-        <menuitem name="Cash Position by User"
-            parent="menu_lunch_reporting_order"
-            action="action_report_lunch_amount_tree"
-            id="menu_lunch_report_amount_tree" />
-
     </data>
 </openerp>
-
-
diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py
index 11ca7f79dbc..abd5b2726a3 100644
--- a/addons/lunch/report/order.py
+++ b/addons/lunch/report/order.py
@@ -54,6 +54,12 @@ class order(report_sxw.rml_parse):
                 users.append(obj.user_id)
         return users
 
+    def get_note(self,objects):
+        notes=[]
+        for obj in objects:
+            notes.append(obj.note)
+        return notes
+        
     def __init__(self, cr, uid, name, context):
         super(order, self).__init__(cr, uid, name, context)
         self.net_total=0.0
@@ -63,9 +69,10 @@ class order(report_sxw.rml_parse):
             'get_users': self.get_users,
             'get_total': self.get_total,
             'get_nettotal': self.get_nettotal,
+            'get_note': self.get_note,
         })
 
-report_sxw.report_sxw('report.lunch.order', 'lunch.order',
+report_sxw.report_sxw('report.lunch.order.line', 'lunch.order.line',
         'addons/lunch/report/order.rml',parser=order, header='external')
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index b09b59bb96b..1ab52a88bda 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -149,10 +149,10 @@
               <para style="terp_default_9_left9">[[ formatLang(lines.date,date='True') ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ (lines.product and lines.product.name) or '' ]]</para>
+              <para style="terp_default_9">[[ (lines.product_id and lines.product_id.name) or '' ]]</para>
             </td>
             <td>
-              <para style="terp_default_9">[[ lines.descript]]</para>
+              <para style="terp_default_9">[[ lines.note]]</para>
             </td>
             <td>
               <para style="terp_default_9_right">[[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
diff --git a/addons/lunch/report/report_lunch_order.py b/addons/lunch/report/report_lunch_order.py
index 7e2b8de9f49..3a0875c1cd1 100644
--- a/addons/lunch/report/report_lunch_order.py
+++ b/addons/lunch/report/report_lunch_order.py
@@ -23,7 +23,7 @@ import tools
 from osv import fields,osv
 
 class report_lunch_order(osv.osv):
-    _name = "report.lunch.order"
+    _name = "report.lunch.order.line"
     _description = "Lunch Orders Statistics"
     _auto = False
     _rec_name = 'date'
@@ -35,32 +35,29 @@ class report_lunch_order(osv.osv):
             ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
         'day': fields.char('Day', size=128, readonly=True),
         'user_id': fields.many2one('res.users', 'User Name'),
-        'box_name': fields.char('Name', size=30),
         'price_total':fields.float('Total Price', readonly=True),
+        'note' : fields.text('Note',size=256,readonly=True),
     }
     _order = 'date desc'
     def init(self, cr):
-        tools.drop_view_if_exists(cr, 'report_lunch_order')
+        tools.drop_view_if_exists(cr, 'report_lunch_order_line')
         cr.execute("""
-            create or replace view report_lunch_order as (
+            create or replace view report_lunch_order_line as (
                select
                    min(lo.id) as id,
+                   lo.user_id as user_id,
                    lo.date as date,
                    to_char(lo.date, 'YYYY') as year,
                    to_char(lo.date, 'MM') as month,
                    to_char(lo.date, 'YYYY-MM-DD') as day,
-                   lo.user_id,
-                   cm.name as box_name,
+                   lo.note as note,
                    sum(lp.price) as price_total
 
             from
-                   lunch_order as lo
-                   left join lunch_cashmove as cm on (cm.id = lo.cashmove)
-                   left join lunch_cashbox as lc on (lc.id = cm.box)
-                   left join lunch_product as lp on (lo.product = lp.id)
-
+                   lunch_order_line as lo
+                   left join lunch_product as lp on (lo.product_id = lp.id)
             group by
-                   lo.date,lo.user_id,cm.name
+                   lo.date,lo.user_id,lo.note
             )
             """)
 report_lunch_order()
diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml
index e92007592ac..f7bfdcd7395 100644
--- a/addons/lunch/report/report_lunch_order_view.xml
+++ b/addons/lunch/report/report_lunch_order_view.xml
@@ -2,50 +2,6 @@
 <openerp>
     <data>
 
-       <record id="view_report_lunch_order_tree" model="ir.ui.view">
-        <field name="name">report.lunch.order.tree</field>
-        <field name="model">report.lunch.order</field>
-        <field name="arch" type="xml">
-            <tree string="Sales Analysis">
-                <field name="date" invisible="1"/>
-                <field name="year" invisible="1"/>
-                <field name="day" invisible="1"/>
-                <field name="month" invisible="1"/>
-                <field name="user_id" />
-                <field name="box_name"/>
-                <field name="price_total"/>
-            </tree>
-        </field>
-    </record>
-
-    <record id="view_report_lunch_order_search" model="ir.ui.view">
-        <field name="name">report.lunch.order.search</field>
-        <field name="model">report.lunch.order</field>
-        <field name="arch" type="xml">
-            <search string="Lunch Order Analysis">
-                <field name="date"/>
-                <group expand="0" string="Group By...">
-                    <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                    <filter string="Box" icon="terp-dolar" context="{'group_by':'box_name'}"/>
-                    <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_lunch_order_all" model="ir.actions.act_window">
-        <field name="name">Lunch Order Analysis</field>
-        <field name="res_model">report.lunch.order</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree</field>
-        <field name="search_view_id" ref="view_report_lunch_order_search"/>
-        <field name="context">{'search_default_month':1,'search_default_User':1}</field>
-    </record>
-
-<!--    <menuitem name="Lunch Order Analysis" parent="menu_lunch_reporting_order"-->
-<!--              id="menu_lunch_order_analysis" action="action_report_lunch_order_all"  sequence="1" />-->
 
     </data>
 </openerp>
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
index 72c06cceb2b..22966129142 100644
--- a/addons/lunch/security/ir.model.access.csv
+++ b/addons/lunch/security/ir.model.access.csv
@@ -1,8 +1,16 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_lunch_order_user,lunch.order user,model_lunch_order,base.group_tool_user,1,1,1,1
-access_lunch_cashmove_user,lunch.cashmove user,model_lunch_cashmove,base.group_tool_user,1,1,1,1
-access_report_lunch_amount_manager,report.lunch.amount manager,model_report_lunch_amount,base.group_tool_manager,1,1,1,1
-access_lunch_category_manager,lunch.category.user,model_lunch_category,base.group_tool_user,1,1,1,1
-access_report_lunch_order_manager,report.lunch.order manager,model_report_lunch_order,base.group_tool_manager,1,1,1,1
-access_lunch_product_user,lunch.product user,model_lunch_product,base.group_tool_user,1,1,1,1
-access_lunch_cashbox_user,lunch.cashbox user,model_lunch_cashbox,base.group_tool_user,1,1,1,1
+id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
+order_user,"Order user",model_lunch_order,group_lunch_manager,1,1,1,1
+order_line_user,"Order Line user",model_lunch_order_line,group_lunch_manager,1,1,1,1
+cashmove_user,"Cashmove user",model_lunch_cashmove,group_lunch_manager,1,1,1,1
+product_user,"Product user",model_lunch_product,group_lunch_manager,1,1,1,1
+product_category_user,"Product category user",model_lunch_product_category,group_lunch_manager,1,1,1,1
+alert_user,"Alert user",model_lunch_alert,group_lunch_manager,1,1,1,1
+order_user,"Order user",model_lunch_order,group_lunch_user,1,1,1,0
+order_line_user,"Order Line user",model_lunch_order_line,group_lunch_user,1,1,1,1
+cashmove_user,"Cashmove user",model_lunch_cashmove,group_lunch_user,1,0,0,0
+product_user,"Product user",model_lunch_product,group_lunch_user,1,0,0,0
+product_category_user,"Product category user",model_lunch_product_category,group_lunch_user,1,0,0,0
+alert_user,"Alert user",model_lunch_alert,group_lunch_user,1,0,0,0
+access_report_order_line,access_report_order_line,model_report_lunch_order_line,,1,1,1,1
+access_lunch_validation,access_lunch_validation,model_lunch_validation,,1,1,1,1
+access_lunch_cancel,access_lunch_cancel,model_lunch_cancel,,1,1,1,1
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 46293a97561..654f844c876 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -1,17 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" ?>
 <openerp>
-<data noupdate="0">
-
-    <record model="res.groups" id="base.group_tool_user">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_tools"/>
-    </record>
-    <record model="res.groups" id="base.group_tool_manager">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_tools"/>
-        <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
-
-</data>
+    <data>
+        <record model="ir.module.category" id="module_lunch_category">
+            <field name="name">Lunch</field>
+            <field name="description">Helps you handle your lunch needs, if you are a manager you will be able to create new products, cashmoves and to confirm or cancel orders.</field>
+            <field name="sequence">16</field>
+        </record>
+        <record id="group_lunch_user" model="res.groups">
+            <field name="name">User</field>
+            <field name="category_id" ref="module_lunch_category"/>
+        </record>
+        <record id="group_lunch_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="implied_ids" eval="[(4, ref('group_lunch_user'))]"/>
+            <field name="category_id" ref="module_lunch_category"/>
+        </record>
+    </data>
 </openerp>
diff --git a/addons/lunch/static/src/css/Makefile b/addons/lunch/static/src/css/Makefile
new file mode 100644
index 00000000000..941e8dbfe7d
--- /dev/null
+++ b/addons/lunch/static/src/css/Makefile
@@ -0,0 +1,3 @@
+lunch.css: lunch.sass
+	sass -t expanded lunch.sass lunch.css
+
diff --git a/addons/lunch/static/src/css/lunch.css b/addons/lunch/static/src/css/lunch.css
new file mode 100644
index 00000000000..96e39c53fa6
--- /dev/null
+++ b/addons/lunch/static/src/css/lunch.css
@@ -0,0 +1,43 @@
+@charset "utf-8";
+.openerp .oe_lunch .oe_lunch_alert textarea {
+  background-color: #ffc7c7;
+  padding: 10px;
+  height: 1em;
+  margin-bottom: 20px;
+}
+.openerp .oe_lunch button.oe_button_add {
+  position: relative;
+  top: -2px;
+  left: 3px;
+}
+.openerp .oe_lunch button.oe_button_plus {
+  margin: -2px;
+}
+.openerp .oe_lunch .oe_lunch_30pc {
+  width: 30%;
+  display: inline-block;
+  vertical-align: top;
+}
+.openerp .oe_lunch .oe_lunch_30pc:nth-child(3) {
+  padding-right: 0;
+}
+.openerp .oe_lunch .oe_lunch_30pc {
+  padding-right: 5%;
+}
+.openerp .oe_lunch h2 {
+  color: #7c7bad;
+}
+.openerp .oe_lunch .oe_lunch_button {
+  float: right;
+}
+.openerp .oe_lunch .oe_lunch_vignette {
+  border-bottom: 1px solid #dddddd;
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+.openerp .oe_lunch .oe_lunch_vignette:last-child {
+  border: none;
+}
+.openerp .oe_lunch .oe_group_text_button {
+  margin-bottom: 3px;
+}
diff --git a/addons/lunch/static/src/css/lunch.sass b/addons/lunch/static/src/css/lunch.sass
new file mode 100644
index 00000000000..9612b5fdd3d
--- /dev/null
+++ b/addons/lunch/static/src/css/lunch.sass
@@ -0,0 +1,36 @@
+@charset "utf-8"
+
+.openerp
+    .oe_lunch
+        .oe_lunch_alert
+            textarea
+                background-color: #ffc7c7
+                padding: 10px
+                height: 1em
+                margin-bottom: 20px
+        button.oe_button_add
+            position: relative
+            top: -2px
+            left: 3px
+        button.oe_button_plus
+            margin: -2px
+        .oe_lunch_30pc
+            width: 30%
+            display: inline-block
+            vertical-align: top
+        .oe_lunch_30pc:nth-child(3)
+            padding-right: 0
+        .oe_lunch_30pc
+            padding-right: 5%
+        h2
+            color: #7C7BAD
+        .oe_lunch_button
+            float: right
+        .oe_lunch_vignette
+            border-bottom: 1px solid #dddddd
+            padding-top: 5px
+            padding-bottom: 5px
+        .oe_lunch_vignette:last-child
+            border: none
+        .oe_group_text_button
+            margin-bottom: 3px
diff --git a/addons/lunch/static/src/img/icon.png b/addons/lunch/static/src/img/icon.png
index 7493a3c7f4e..0dda33edd50 100644
Binary files a/addons/lunch/static/src/img/icon.png and b/addons/lunch/static/src/img/icon.png differ
diff --git a/addons/lunch/test/lunch_report.yml b/addons/lunch/test/lunch_report.yml
deleted file mode 100644
index 2043afe7796..00000000000
--- a/addons/lunch/test/lunch_report.yml
+++ /dev/null
@@ -1,8 +0,0 @@
--
-  In order to test the PDF reports defined on a Lunch, we will print a Lunch Order Report
--
-  !python {model: lunch.order}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.lunch.order').create(cr, uid, [ref('lunch.lunch_order_0'),ref('lunch.lunch_order_1')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'lunch-lunch_order_report.'+format), 'wb+').write(data)
diff --git a/addons/lunch/test/test_lunch.yml b/addons/lunch/test/test_lunch.yml
deleted file mode 100644
index 7cb23f52dbf..00000000000
--- a/addons/lunch/test/test_lunch.yml
+++ /dev/null
@@ -1,128 +0,0 @@
-- |
-  In order to test the Lunch module in OpenERP,
-  I will create one lunch order and then check the effect on cashboxes and cashmoves
-
-- |
-  Given that I have a category of lunch products "Burger".
--
-  !record {model: lunch.category, id: lunch_category_burger0}:
-    name: Burger
-- |
-  Given that I have a product "Club1" in this category with a price of "2.75".
-
--
-  !record {model: lunch.product, id: lunch_product_club1}:
-    category_id: lunch_category_burger0
-    name: Club1
-    price: 2.75
-- |
-  Given that I have a cashbox "Employee Cashbox"
--
-  !record {model: lunch.cashbox, id: lunch_cashbox_cashbox0}:
-    manager: base.user_root
-    name: Employee Cashbox
-- |
-  I create a lunch order "LU001" for the "Club1" product
-- |
-  When I select the product "club1", the price of 2.75 is automatically proposed
--
-  !record {model: lunch.order, id: lunch_order_0}:
-    date: !eval time.strftime('%Y-%m-%d')
-    product: 'lunch_product_club1'
-    price: 2.75
-
-- |
-  I check that lunch order is on draft state after having created it.
--
-  !assert {model: lunch.order, id: lunch_order_0}:
-    - state == 'draft'
-- |
-  I confirm the order "LU001" using the "Confirm Order" wizard.
--
-  !record {model: lunch.order.confirm, id: lunch_order_confirm_0}:
-    confirm_cashbox: 'lunch_cashbox_cashbox0'
--
-  I click on "Confirm Order" button of this wizard.
--
-  !python {model: lunch.order.confirm}: |
-    self.confirm(cr, uid, [ref('lunch_order_confirm_0')], {'active_ids': [ref('lunch_order_0')]})
-
-- |
-  I check that the Cash Moves have been generated with the right box
-  name
--
-  !assert {model: lunch.order, id: lunch_order_0}:
-    - cashmove.id != False
-
-- |
-  I check that the Total on the "Employee Cashbox" is -2.75
-
--
-  !assert {model: lunch.cashbox, id: lunch_cashbox_cashbox0}:
-    - sum_remain == -2.75
-
-- |
-  I create a new lunch order "LU002" for the "Club1" product, at another date.
--
-  !record {model: lunch.order, id: lunch_order_1}:
-    date: !eval "(datetime.now() + timedelta(2)).strftime('%Y-%m-%d')"
-    product: 'lunch_product_club1'
-    price: 2.75
-
-- |
-  I confirm this order.open wizard and select "Employee Cashbox".
--
-  !record {model: lunch.order.confirm, id: lunch_order_confirm_1}:
-    confirm_cashbox: 'lunch_cashbox_cashbox0'
-- |
-  Now I click on "Confirm Order" button of this wizard.
--
-  !python {model: lunch.order.confirm}: |
-    self.confirm(cr, uid, [ref('lunch_order_confirm_1')],  {'active_ids': [ref('lunch_order_1')]})
-
-- |
-  I check that the Total on the "Employee Cashbox" is -5.50
--
-  !assert {model: lunch.cashbox, id: lunch_cashbox_cashbox0}:
-    - sum_remain == -5.50
-
-- |
-  I cancel the order "LU002"
--
-  !record {model: lunch.order.cancel, id: lunch_order_cancel_0}:
-    {}
-- |
-  I click on "Yes" button of this wizard for cancel order.
-
--
-  !python {model: lunch.order.cancel}: |
-    self.cancel(cr, uid, [ref('lunch_order_cancel_0')], {'active_ids': [ref('lunch_order_1')]})
-
-- |
-  I test that the Cash Moves record have been removed for the order LU002.
--
-  !assert {model: lunch.order, id: lunch_order_1}:
-    - cashmove.id == False
-
-- |
-  I check that the Total on the "Employee Cashbox" is -2.75
--
-  !assert {model: lunch.cashbox, id: lunch_cashbox_cashbox0}:
-    - sum_remain == -2.75
-- |
-  I reset the "Employee Cashbox" to zero using the "Set CashBox to Zero" wizard.
--
-  !record {model: lunch.cashbox.clean, id: lunch_cashbox_clean_0}:
-    {}
--
-  Now click on "Set to Zero" button of this wizard.
--
-  !python {model: lunch.cashbox.clean, id: lunch_cashbox_clean_0}: |
-    self.set_to_zero(cr, uid, [ref('lunch_cashbox_clean_0')], {'active_ids': [ref('lunch_cashbox_cashbox0')]})
-
-- |
-  I check that the Total on the "Employee Cashbox" is -5.50
--
-  !assert {model: lunch.cashbox, id: lunch_cashbox_cashbox0}:
-    - sum_remain == 0.00
-
diff --git a/addons/lunch/tests/__init__.py b/addons/lunch/tests/__init__.py
new file mode 100644
index 00000000000..194888974b0
--- /dev/null
+++ b/addons/lunch/tests/__init__.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from . import test_lunch
+
+checks = [
+    test_lunch,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/lunch/tests/test_lunch.py b/addons/lunch/tests/test_lunch.py
new file mode 100644
index 00000000000..128e4796611
--- /dev/null
+++ b/addons/lunch/tests/test_lunch.py
@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import tools
+from openerp.tests import common
+
+class Test_Lunch(common.TransactionCase):
+
+    def setUp(self):
+        """*****setUp*****"""
+        super(Test_Lunch, self).setUp()
+        cr, uid = self.cr, self.uid
+
+        self.res_users = self.registry('res.users')
+        self.lunch_order = self.registry('lunch.order')
+        self.lunch_order_line = self.registry('lunch.order.line')
+        self.lunch_cashmove = self.registry('lunch.cashmove')
+        self.lunch_product = self.registry('lunch.product')
+        self.lunch_alert = self.registry('lunch.alert')
+        self.lunch_product_category = self.registry('lunch.product.category')
+
+        self.demo_id = self.res_users.search(cr, uid, [('name', '=', 'Demo User')])
+        self.product_bolognese_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'lunch', 'product_Bolognese')
+        self.product_Bolognese_id = self.product_bolognese_ref and self.product_bolognese_ref[1] or False
+        self.new_id_order = self.lunch_order.create(cr,uid,{
+            'user_id': self.demo_id[0],
+            'order_line_ids':'[]',
+            },context=None)
+        self.new_id_order_line = self.lunch_order_line.create(cr,uid,{
+            'order_id':self.new_id_order,
+            'product_id':self.product_Bolognese_id,
+            'note': '+Emmental',
+            'cashmove': [],
+            'price': self.lunch_product.browse(cr,uid,self.product_Bolognese_id,context=None).price,
+            })
+
+    def test_00_lunch_order(self):
+        """Change the state of an order line from 'new' to 'ordered'. Check that there are no cashmove linked to that order line"""
+        cr, uid = self.cr, self.uid
+        self.order_one = self.lunch_order_line.browse(cr,uid,self.new_id_order_line,context=None)
+        #we check that our order_line is a 'new' one and that there are no cashmove linked to that order_line:
+        self.assertEqual(self.order_one.state,'new')
+        self.assertEqual(self.order_one.cashmove, [])
+        #we order that orderline so it's state will be 'ordered'
+        self.order_one.order()
+        self.order_one = self.lunch_order_line.browse(cr,uid,self.new_id_order_line,context=None)
+        #we check that our order_line is a 'ordered' one and that there are no cashmove linked to that order_line:
+        self.assertEqual(self.order_one.state,'ordered')
+        self.assertEqual(self.order_one.cashmove, [])
+
+    def test_01_lunch_order(self):
+        """Change the state of an order line from 'new' to 'ordered' then to 'confirmed'. Check that there is a cashmove linked to the order line"""
+        cr, uid = self.cr, self.uid
+        self.test_00_lunch_order()
+        #We receive the order so we confirm the order line so it's state will be 'confirmed'
+        #A cashmove will be created and we will test that the cashmove amount equals the order line price
+        self.order_one.confirm()
+        self.order_one = self.lunch_order_line.browse(cr,uid,self.new_id_order_line,context=None)
+        #we check that our order_line is a 'confirmed' one and that there are a cashmove linked to that order_line with an amount equals to the order line price:
+        self.assertEqual(self.order_one.state,'confirmed')
+        self.assertTrue(self.order_one.cashmove!=[])
+        self.assertTrue(self.order_one.cashmove[0].amount==-self.order_one.price)
+
+    def test_02_lunch_order(self):
+        """Change the state of an order line from 'confirmed' to 'cancelled' and check that the cashmove linked to that order line will be deleted"""
+        cr, uid = self.cr, self.uid
+        self.test_01_lunch_order()
+        #We have a confirmed order with its associate cashmove
+        #We execute the cancel function
+        self.order_one.cancel()
+        self.order_one = self.lunch_order_line.browse(cr,uid,self.new_id_order_line,context=None)
+        #We check that the state is cancelled and that the cashmove has been deleted
+        self.assertEqual(self.order_one.state,'cancelled')
+        self.assertTrue(self.order_one.cashmove==[])
\ No newline at end of file
diff --git a/addons/lunch/wizard/__init__.py b/addons/lunch/wizard/__init__.py
index e6b34c215ac..9af98b65899 100644
--- a/addons/lunch/wizard/__init__.py
+++ b/addons/lunch/wizard/__init__.py
@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#
+#    
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2012 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
@@ -15,13 +15,10 @@
 #    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 lunch_order_confirm
-import lunch_order_cancel
-import lunch_cashbox_clean
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+import lunch_validation
+import lunch_cancel
+import lunch_order
diff --git a/addons/base_module_doc_rst/wizard/__init__.py b/addons/lunch/wizard/lunch_cancel.py
similarity index 72%
rename from addons/base_module_doc_rst/wizard/__init__.py
rename to addons/lunch/wizard/lunch_cancel.py
index b3c66d995c1..648ab4e2396 100644
--- a/addons/base_module_doc_rst/wizard/__init__.py
+++ b/addons/lunch/wizard/lunch_cancel.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2012 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,9 +18,12 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+from osv import osv, fields
 
-import tech_rst_guide
-import generate_relation_graph
+class lunch_cancel(osv.Model):
+    """ lunch cancel """
+    _name = 'lunch.cancel'
+    _description = 'cancel lunch order'
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+    def cancel(self,cr,uid,ids,context=None):
+        return self.pool.get('lunch.order.line').cancel(cr, uid, ids, context=context)
diff --git a/addons/lunch/wizard/lunch_cancel_view.xml b/addons/lunch/wizard/lunch_cancel_view.xml
new file mode 100644
index 00000000000..acc0cfc9f13
--- /dev/null
+++ b/addons/lunch/wizard/lunch_cancel_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record model="ir.ui.view" id="cancel_order_lines_view">
+            <field name="name">cancel order lines</field>
+            <field name="model">lunch.cancel</field>
+            <field name="arch" type="xml">
+                <form string="cancel order lines" version="7.0">
+                    <separator string="Are you sure you want to cancel these meals?"/>
+                	<p class="oe_grey">
+						Cancel a meal means that we didn't receive it from the supplier.
+                        <br/>
+                        A cancelled meal should not be paid by employees.
+					</p>
+					<footer>
+						<button name="cancel" string="Cancel Orders" type="object" class="oe_highlight"/>
+						or
+						<button string="Cancel" class="oe_link" special="cancel" />
+					</footer>
+				</form>
+			</field>
+		</record>
+
+        <act_window id="cancel_order_lines"
+            multi="True"
+            key2="client_action_multi" name="Cancel meals"
+            res_model="lunch.cancel" src_model="lunch.order.line"
+            view_mode="form" target="new" view_type="form" view_id="cancel_order_lines_view"/>
+
+    </data>
+</openerp>
diff --git a/addons/lunch/wizard/lunch_cashbox_clean.py b/addons/lunch/wizard/lunch_cashbox_clean.py
deleted file mode 100644
index e95d05870f9..00000000000
--- a/addons/lunch/wizard/lunch_cashbox_clean.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-class lunch_cashbox_clean(osv.osv_memory):
-
-     _name = "lunch.cashbox.clean"
-     _description = "clean cashbox"
-
-     def set_to_zero(self, cr, uid, ids, context=None):
-
-         """
-         clean Cashbox. set active fields False.
-         @param cr: the current row, from the database cursor,
-         @param uid: the current user’s ID for security checks,
-         @param ids: List  Lunch cashbox Clean’s IDs
-         @return:Dictionary {}.
-         """
-         #TOFIX: use orm methods
-         if context is None:
-            context = {}
-         data = context and context.get('active_ids', []) or []
-         cashmove_ref = self.pool.get('lunch.cashmove')
-         cr.execute("select user_cashmove, box,sum(amount) from lunch_cashmove \
-                 where active = 't' and box IN %s group by user_cashmove, \
-                     box"  , (tuple(data),))
-         res = cr.fetchall()
-
-         cr.execute("update lunch_cashmove set active = 'f' where active= 't' \
-             and box IN %s" , (tuple(data),))
-         #TOCHECK: Why need to create duplicate entry after clean box ?
- 
-         #for (user_id, box_id, amount) in res:
-         #   cashmove_ref.create(cr, uid, {
-         #       'name': 'Summary for user' + str(user_id),
-         #       'amount': amount,
-         #       'user_cashmove': user_id,
-         #       'box': box_id,
-         #       'active': True,
-         #   })
-         return {'type': 'ir.actions.act_window_close'}
-
-lunch_cashbox_clean()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/lunch/wizard/lunch_cashbox_clean_view.xml b/addons/lunch/wizard/lunch_cashbox_clean_view.xml
deleted file mode 100644
index 5ba2a6ff3bf..00000000000
--- a/addons/lunch/wizard/lunch_cashbox_clean_view.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-<!-- Lunch cashbox  -->
-
-          <record id="view_lunch_cashbox_clean" model="ir.ui.view">
-            <field name="name">lunch.cashbox.clean.form</field>
-            <field name="model">lunch.cashbox.clean</field>
-            <field name="arch" type="xml">
-                <form string="Reset cashbox" version="7.0">
-                    <group>
-                        <label string="Are you sure you want to reset this cashbox ?"/>
-                    </group>
-                    <footer>
-                        <button name="set_to_zero" string="Set to Zero" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-               </form>
-            </field>
-          </record>
-
-        <record id="action_lunch_cashbox_clean" model="ir.actions.act_window">
-            <field name="name">Set CashBox to Zero</field>
-            <field name="res_model">lunch.cashbox.clean</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_lunch_cashbox_clean"/>
-           <field name="target">new</field>
-        </record>
-
-        <act_window id="action_lunch_cashbox_clean_values"
-            key2="client_action_multi" name="Set CashBox to Zero"
-            res_model="lunch.cashbox.clean" src_model="lunch.cashbox"
-            view_mode="form" target="new" view_type="form" />
-
-    </data>
-</openerp>
diff --git a/addons/lunch/wizard/lunch_order.py b/addons/lunch/wizard/lunch_order.py
new file mode 100644
index 00000000000..767497bcc4b
--- /dev/null
+++ b/addons/lunch/wizard/lunch_order.py
@@ -0,0 +1,29 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2012 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
+
+class lunch_order_order(osv.TransientModel):
+    """ lunch order meal """
+    _name = 'lunch.order.order'
+    _description = 'Wizard to order a meal'
+
+    def order(self,cr,uid,ids,context=None):
+        return self.pool.get('lunch.order.line').order(cr, uid, ids, context=context)
diff --git a/addons/lunch/wizard/lunch_order_cancel.py b/addons/lunch/wizard/lunch_order_cancel.py
deleted file mode 100644
index a0c8779b323..00000000000
--- a/addons/lunch/wizard/lunch_order_cancel.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-from osv import fields, osv
-
-class lunch_order_cancel(osv.osv_memory):
-    """
-    Cancel Lunch Order
-    """
-    _name = "lunch.order.cancel"
-    _description = "Cancel Order"
-
-    def cancel(self, cr, uid, ids, context=None):
-        """
-        Cancel cashmove entry from cashmoves and update state to draft.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List  Lunch Order Cancel’s IDs
-        """
-        if context is None:
-            context = {}
-        data = context and context.get('active_ids', []) or []
-        return self.pool.get('lunch.order').lunch_order_cancel(cr, uid, data, context)
-
-lunch_order_cancel()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
deleted file mode 100644
index 8421dd74f9b..00000000000
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-<!-- cancel order  -->
-
-        <record id="view_lunch_order_cancel" model="ir.ui.view">
-            <field name="name">lunch.order.cancel.form</field>
-            <field name="model">lunch.order.cancel</field>
-            <field name="arch" type="xml">
-                <form string="Cancel Order" version="7.0">
-                    <group col="4" >
-                        <label string="Are you sure you want to cancel this order ?"/>
-                   </group>
-                    <footer>
-                        <button  name="cancel" string="Yes" type="object" class="oe_highlight"  />
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-               </form>
-            </field>
-        </record>
-
-        <record id="action_lunch_order_cancel" model="ir.actions.act_window">
-            <field name="name">Cancel Order</field>
-            <field name="res_model">lunch.order.cancel</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_lunch_order_cancel"/>
-           <field name="target">new</field>
-        </record>
-        
-        <act_window id="action_lunch_order_cancel_values"
-            key2="client_action_multi" name="Cancel Order"
-            res_model="lunch.order.cancel" src_model="lunch.order"
-            view_mode="form" target="new" view_type="form"/>
-        
-    </data>
-</openerp>
diff --git a/addons/lunch/wizard/lunch_order_confirm.py b/addons/lunch/wizard/lunch_order_confirm.py
deleted file mode 100644
index 279234897de..00000000000
--- a/addons/lunch/wizard/lunch_order_confirm.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-
-from osv import fields, osv
-
-class lunch_order_confirm(osv.osv_memory):
-    """
-    Confirm Lunch Order
-    """
-    _name = "lunch.order.confirm"
-    _description = "confirm Order"
-
-    _columns = {
-        'confirm_cashbox':fields.many2one('lunch.cashbox', 'Name of box', required=True),
-    }
-
-    def confirm(self, cr, uid, ids, context=None):
-        """
-        confirm Lunch Order.Create cashmoves in launch cashmoves when state is
-                        confirm in lunch order.
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List  Lunch Order confirm’s IDs
-        @return: Dictionary {}.
-        """
-        if context is None:
-            context = {}
-        data = context and context.get('active_ids', []) or []
-        order_ref = self.pool.get('lunch.order')
-
-        for confirm_obj in self.browse(cr, uid, ids, context=context):
-            order_ref.confirm(cr, uid, data, confirm_obj.confirm_cashbox.id, context)
-            return {'type': 'ir.actions.act_window_close'}
-
-lunch_order_confirm()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
deleted file mode 100644
index dadde4ed089..00000000000
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-<!-- confirm order  -->
-
-        <record id="view_lunch_order_confirm" model="ir.ui.view">
-            <field name="name">lunch.order.confirm.form</field>
-            <field name="model">lunch.order.confirm</field>
-            <field name="arch" type="xml">
-                <form string="Confirm" version="7.0">
-                    <group col="4">
-                         <separator string="Orders Confirmation" colspan="4"/>
-                         <field name="confirm_cashbox"/>
-                   </group>
-                    <footer>
-                        <button name="confirm" string="Confirm Order" type="object" class="oe_highlight"  />
-                        or 
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-               </form>
-            </field>
-        </record>
-
-        <record id="action_lunch_order_confirm" model="ir.actions.act_window">
-            <field name="name">Confirm Order</field>
-            <field name="res_model">lunch.order.confirm</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-           <field name="view_id" ref="view_lunch_order_confirm"/>
-           <field name="target">new</field>
-        </record>
-
-        <act_window id="action_lunch_order_confirm_values"
-            key2="client_action_multi" name="Confirm Order"
-            res_model="lunch.order.confirm" src_model="lunch.order"
-            view_mode="form" target="new" view_type="form"/>
-
-    </data>
-</openerp>
diff --git a/addons/lunch/wizard/lunch_order_view.xml b/addons/lunch/wizard/lunch_order_view.xml
new file mode 100644
index 00000000000..ba2d372a543
--- /dev/null
+++ b/addons/lunch/wizard/lunch_order_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="order_order_lines_view">
+            <field name="name">Order meal</field>
+            <field name="model">lunch.order.order</field>
+            <field name="arch" type="xml">
+                <form string="Order meal" version="7.0">
+                    <separator string="Are you sure you want to order these meals?"/>
+                    <p class="oe_grey">
+                        Order a meal doesn't mean that we have to pay it.
+                        A meal should be paid when it is received.
+                    </p>
+                    <footer>
+                        <button name="order" string="Order Meals" type="object" class="oe_highlight"/>
+                        or
+                        <button name="cancel" string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <act_window id="order_order_lines"
+            multi="True"
+            key2="client_action_multi" name="Order meals"
+            res_model="lunch.order.order" src_model="lunch.order.line"
+            view_mode="form" target="new" view_type="form" view_id="order_order_lines_view"/>
+
+    </data>
+</openerp>
diff --git a/addons/hr_evaluation/wizard/__init__.py b/addons/lunch/wizard/lunch_validation.py
similarity index 71%
rename from addons/hr_evaluation/wizard/__init__.py
rename to addons/lunch/wizard/lunch_validation.py
index 64406ac6b1e..f4b4b30747d 100644
--- a/addons/hr_evaluation/wizard/__init__.py
+++ b/addons/lunch/wizard/lunch_validation.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2004-2012 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,8 +18,12 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+from osv import osv, fields
 
-#import hr_evaluation_mail
-import mail_compose_message
+class lunch_validation(osv.Model):
+    """ lunch validation """
+    _name = 'lunch.validation'
+    _description = 'lunch validation for order'
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+    def confirm(self,cr,uid,ids,context=None):
+        return self.pool.get('lunch.order.line').confirm(cr, uid, ids, context=context)
diff --git a/addons/lunch/wizard/lunch_validation_view.xml b/addons/lunch/wizard/lunch_validation_view.xml
new file mode 100644
index 00000000000..bec141d2d4a
--- /dev/null
+++ b/addons/lunch/wizard/lunch_validation_view.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    	<record model="ir.ui.view" id="validate_order_lines_view">
+            <field name="name">validate order lines</field>
+            <field name="model">lunch.validation</field>
+            <field name="arch" type="xml">
+                <form string="validate order lines" version="7.0">
+                    <separator string="Did your received these meals?"/>
+                	<p class="oe_grey">
+                        Once a meal is received a new cash move is created for the employee.
+					</p>
+					<footer>
+						<button name="confirm" string="Receive Meals" type="object" class="oe_highlight"/>
+						or
+						<button name="cancel" string="Cancel" class="oe_link" special="cancel" />
+					</footer>
+				</form>
+			</field>
+		</record>
+
+        <act_window id="validate_order_lines"
+            multi="True"
+            key2="client_action_multi" name="Receive meals"
+            res_model="lunch.validation" src_model="lunch.order.line"
+            view_mode="form" target="new" view_type="form" view_id="validate_order_lines_view"/>
+
+    </data>
+</openerp>
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index 289b9080fe7..b34993ffd32 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -19,18 +19,21 @@
 #
 ##############################################################################
 
+import mail_message_subtype
 import mail_alias
-import mail_message
 import mail_followers
+import mail_vote
+import mail_favorite
+import mail_message
+import mail_mail
 import mail_thread
 import mail_group
-import ir_needaction
 import res_partner
 import res_users
 import report
 import wizard
 import res_config
 import mail_group_menu
+import update
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 0e1caabcf65..9ad3232d396 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -22,49 +22,39 @@
 {
     'name': 'Social Network',
     'version': '1.0',
-    'category':'Social Network',
-    "sequence": 2,
-    "summary": "Discussions, Mailing Lists, News",
+    'category': 'Social Network',
+    'sequence': 2,
+    'summary': 'Discussions, Mailing Lists, News',
     'description': """
-A business oriented Social Networking with a fully-integrated email 
-and message management.
-=====================================================================
+Business oriented Social Networking
+===================================
+The Social Networking module provides a unified social network abstraction layer allowing applications to display a complete
+communication history on documents with a fully-integrated email and message management system.
 
-The Social Networking module provides an unified social network
-abstraction layer allowing applications to display a complete 
-communication history on documents. It gives the users the possibility
-to read and send messages and emails in an unified way.
+It enables the users to read and send messages as well as emails. It also provides a feeds page combined to a subscription mechanism that allows to follow documents and to be constantly updated about recent news.
 
-It also provides a feeds page combined to a subscription mechanism, that 
-allows to follow documents, and to be constantly updated about recent
-news.
-        
-The main features of the module are:
-    * a clean and renewed communication history for any OpenERP
-      document that can act as a discussion topic,
-    * a discussion mean on documents,
-    * a subscription mechanism to be updated about new messages on 
-      interesting documents,
-    * an unified feeds page to see recent messages and activity 
-      on followed documents,
-    * user communication through the feeds page,
-    * a threaded discussion design,
-    * relies on the global outgoing mail server, an integrated email
-      management system allowing to send emails with a configurable 
-      scheduler-based processing engine
-    * includes an extensible generic email composition assistant, that can turn
-      into a mass-mailing assistant, and is capable of interpreting
-      simple *placeholder expressions* that will be replaced with
-      dynamic data when each email is actually sent
+Main Features
+-------------
+* Clean and renewed communication history for any OpenERP document that can act as a discussion topic
+* Subscription mechanism to be updated about new messages on interesting documents
+* Unified feeds page to see recent messages and activity on followed documents
+* User communication through the feeds page
+* Threaded discussion design on documents
+* Relies on the global outgoing mail server - an integrated email management system - allowing to send emails with a configurable scheduler-based processing engine
+* Includes an extensible generic email composition assistant, that can turn into a mass-mailing assistant and is capable of interpreting simple *placeholder expressions* that will be replaced with dynamic data when each email is actually sent.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'base_tools', 'base_setup'],
+    'depends': ['base', 'base_setup'],
     'data': [
+        'wizard/invite_view.xml',
         'wizard/mail_compose_message_view.xml',
+        'mail_message_subtype.xml',
         'res_config_view.xml',
         'mail_message_view.xml',
+        'mail_mail_view.xml',
         'mail_followers_view.xml',
+        'mail_favorite_view.xml',
         'mail_thread_view.xml',
         'mail_group_view.xml',
         'res_partner_view.xml',
@@ -75,13 +65,10 @@ The main features of the module are:
         'mail_alias_view.xml',
         'res_users_view.xml',
     ],
-    'demo': [
-        'data/mail_demo.xml',
-    ],
+    'demo': ['data/mail_demo.xml'],
     'installable': True,
     'auto_install': False,
     'application': True,
-    'certificate': '001056784984222247309',
     'images': [
         'images/customer_history.jpeg',
         'images/messages_form.jpeg',
@@ -97,12 +84,12 @@ The main features of the module are:
     'css': [
         'static/src/css/mail.css',
         'static/src/css/mail_group.css',
-        'static/src/css/mail_compose_message.css',
     ],
     'js': [
         'static/lib/jquery.expander/jquery.expander.js',
         'static/src/js/mail.js',
         'static/src/js/mail_followers.js',
+        'static/src/js/many2many_tags_email.js',
     ],
     'qweb': [
         'static/src/xml/mail.xml',
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml
index c8e8b1a488e..9b91c519348 100644
--- a/addons/mail/data/mail_data.xml
+++ b/addons/mail/data/mail_data.xml
@@ -12,5 +12,23 @@
             <field eval="'process_email_queue'" name="function"/>
             <field eval="'()'" name="args"/>
         </record>
+
+        <record id="ir_cron_module_update_notification" model="ir.cron">
+            <field name="name">Update Notification</field>
+            <field eval="True" name="active" />
+            <field name="user_id" ref="base.user_root" />
+            <field name="interval_number">1</field>
+            <field name="interval_type">weeks</field>
+            <field name="numbercall">-1</field>
+            <field eval="False" name="doall" />
+            <field eval="'ir.module.module'" name="model" />
+            <field eval="'update_notification'" name="function" />
+            <field eval="'(None,)'" name="args" />
+            <field name="priority">1000</field>
+        </record>
+
+        <record id="mt_comment" model="mail.message.subtype">
+            <field name="name">Discussions</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml
index e3d7c2ab1e1..a5eaa63956a 100644
--- a/addons/mail/data/mail_demo.xml
+++ b/addons/mail/data/mail_demo.xml
@@ -2,55 +2,90 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="message_blogpost0" model="mail.message">
-            <field name="subject">Internal company announce</field>
-            <field name="model">mail.group</field>
-            <field name="res_id" ref="group_all_employees"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Your monthly meal vouchers arrived. You can get them at Christine's office.
-This month you also have 250 EUR of eco-checks for all employees that worked with us since 1 year minimum.]]></field>
-            <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+        <!-- Update demo user to avoid mail bombing -->
+        <record id="base.partner_demo" model="res.partner">
+            <field name="notification_email_send">none</field>
         </record>
 
+        <!-- Pushed to all employees -->
+        <record id="message_blogpost0" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="body"><![CDATA[<p>Your monthly meal vouchers arrived. You can get them at Christine's office.</p>]]></field>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
+        </record>
         <record id="message_blogpost0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Great.]]></field>
+            <field name="body"><![CDATA[<p>Oh, I had forgotten. This month you also get 250 EUR of eco-vouchers if you have been in the company for more than a year.</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
-
         <record id="message_blogpost0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Yes, that's a good news.]]></field>
+            <field name="body"><![CDATA[<p>Thanks! Could you please remind me where is Christine's office, if I may ask? I'm new here!</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_demo"/>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
-
+        <!-- This one is starred for having mailboxes with demo data -->
         <record id="message_blogpost0_comment2" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_employees"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel.
-
-In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue.
-Donec viverra congue dui eu blandit. In lacinia molestie nulla, ut sagittis risus feugiat eu.
-
-Check the file in attachment for more information !  (third comment)]]></field>
+            <field name="body"><![CDATA[<p>Building B3, second floor on the right :-).</p>]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="favorite_user_ids" eval="[(6, 0, [ref('base.user_root'), ref('base.user_demo')])]"/>
+        </record>
+        <record id="message_blogpost0_comment3" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="group_all_employees"/>
+            <field name="body"><![CDATA[<p>Many thanks. Actually that's good news, next year I'll have to buy a new fridge, I think I will pay it with the eco-vouchers!</p>]]></field>
+            <field name="parent_id" ref="message_blogpost0"/>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
 
-        <record model="ir.config_parameter" id="user_mail_alias">
-            <field name="key">mail.catchall.domain</field>
-            <field name="value">demo.openerp.com</field>
+        <!-- Demo user and admin conversation -->
+        <record id="message_discussion" model="mail.message">
+            <field name="body">Hello Demo User! I was wondering whether you had some issues with our secret task about putting cats everywhere in OpenERP.</field>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="partner_ids" eval="[(6, 0, [ref('base.partner_demo')])]"/>
+        </record>
+        <record id="message_discussion_answer1" model="mail.message">
+            <field name="body">No specific issues, I think everything is clear.</field>
+            <field name="parent_id" ref="message_discussion"/>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="partner_ids" eval="[(6, 0, [ref('base.partner_root')])]"/>
+        </record>
+        <record id="message_discussion_answer2" model="mail.message">
+            <field name="body">Ow, just to be sure... we were talking about lolcats, right ?</field>
+            <field name="parent_id" ref="message_discussion"/>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="partner_ids" eval="[(6, 0, [ref('base.partner_root')])]"/>
+        </record>
+        <record id="message_discussion_answer3" model="mail.message">
+            <field name="body">Absolutely!</field>
+            <field name="parent_id" ref="message_discussion"/>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
+            <field name="partner_ids" eval="[(6, 0, [ref('base.partner_demo')])]"/>
         </record>
 
     </data>
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 2152706d056..64d989f9e9d 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -7,22 +7,21 @@
             <field name="description">Discussion about best sales practices and deals.</field>
         </record>
         <record model="mail.group" id="group_all_employees">
-            <field name="name">All Employees</field>
+            <field name="name">Whole Company</field>
             <field name="group_ids" eval="[(4, ref('base.group_user'))]"/>
-            <field name="description">Discussion about best sales practices and deals.</field>
+            <field name="description">General announces for all employees.</field>
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Welcome to OpenERP!</value>
-            <value>Your homepage is a summary of messages you received and key information about documents you follow.
-
-The top menu bar contains all applications you installed. You can use this &lt;i&gt;Settings&lt;/i&gt; menu to install more applications, activate others features or give access to new users.
-
-To setup your preferences (name, email signature, avatar), click on the top right corner.</value>
-        </function>
-
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Welcome to OpenERP!</field>
+            <field name="body"><![CDATA[<p>Your homepage is a summary of messages you received and key information about documents you follow.</p><p>
+The top menu bar contains all applications you installed. You can use the <i>Settings</i> menu to install more applications, activate others features or give access to new users.</p><p>
+To setup your preferences (name, email signature, avatar), click on the top right corner.</p>]]></field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/mail/doc/index.rst.inc b/addons/mail/doc/index.rst.inc
index c4b87cc18f9..4b01d3ec7bd 100644
--- a/addons/mail/doc/index.rst.inc
+++ b/addons/mail/doc/index.rst.inc
@@ -11,3 +11,4 @@ Mail Module documentation topics
    mail_needaction_howto
    mail_partner
    mail_state
+   mail_subtype
diff --git a/addons/mail/doc/mail_openchatter_howto.rst b/addons/mail/doc/mail_openchatter_howto.rst
index 789acdd87eb..e4c86add7bc 100644
--- a/addons/mail/doc/mail_openchatter_howto.rst
+++ b/addons/mail/doc/mail_openchatter_howto.rst
@@ -57,7 +57,7 @@ Use the thread viewer widget inside your form view by using the mail_thread widg
 Send notifications
 +++++++++++++++++++
 
-When sending a notification is required in your workflow or business logic, use the ``message_append_note`` method. This method is a shortcut to the ``message_append`` method that takes all ``mail.message`` fields as arguments. This latter method calls ``message_create`` that
+When sending a notification is required in your workflow or business logic, use the ``message_post`` method. This method is a shortcut to the ``message_append`` method that takes all ``mail.message`` fields as arguments. This latter method calls ``message_create`` that
 
  - creates the message
  - parses the body to find users you want to push the message to (finding and parsing ``@login`` in the message body)
@@ -74,7 +74,7 @@ You should therefore not worry about subscriptions or anything else than sending
     return res
 
   def do_something_send_note(self, cr, uid, ids, context=None):
-    self.message_append_note(cr, uid, ids, _('My subject'),
+    self.message_post(cr, uid, ids, _('My subject'),
     _("has received a <b>notification</b> and is happy for it."), context=context)
 
 Notifications guidelines
@@ -147,7 +147,7 @@ The best way to direct the messages that will be displayed in the OpenChatter wi
         # add: search in the current task project messages
         '&', '&', ('res_id', '=', my_task.project_id.id), ('model', '=', 'project.project'),
         # ... containing the task name
-        '|', ('body_text', 'like', '%s' % (my_task.name)), ('body_html', 'like', '%s' % (my_task.name))
+        '|', ('body', 'like', '%s' % (my_task.name)), ('body_html', 'like', '%s' % (my_task.name))
         ] + domain, limit=limit, offset=offset, context=context)
     # if asked: add ancestor ids to have complete threads
     if (ascent): msg_ids = self._message_add_ancestor_ids(cr, uid, ids, msg_ids, root_ids, context=context)
diff --git a/addons/mail/doc/mail_state.rst b/addons/mail/doc/mail_state.rst
index 527a31ba835..fc2772bf094 100644
--- a/addons/mail/doc/mail_state.rst
+++ b/addons/mail/doc/mail_state.rst
@@ -1,15 +1,15 @@
 .. _mail_state:
 
-message_state
+message_unread
 =============
 
-``message_state`` is a boolean field that states whether the document
+``message_unread`` is a boolean field that states whether the document
 has unread messages. In previous versions, some documents were going
 back to ``pending`` state when receiving an email through the mail
 gateway. Now the state related to messages differs from the state or
 stage of the document itself.
 
-message_state and need action mechanism
+message_unread and need action mechanism
 +++++++++++++++++++++++++++++++++++++++
 
 The ``mail`` module introduces a default behavior for the need_action
@@ -23,6 +23,6 @@ mechanism [REF].
     """
     result = super(ir_needaction_mixin, self).get_needaction_user_ids(cr, uid, ids, context=context)
     for obj in self.browse(cr, uid, ids, context=context):
-      if obj.message_state == False and obj.user_id:
+      if obj.message_unread == False and obj.user_id:
         result[obj.id].append(obj.user_id.id)
     return result
diff --git a/addons/mail/doc/mail_subtype.rst b/addons/mail/doc/mail_subtype.rst
new file mode 100644
index 00000000000..e63b67936cd
--- /dev/null
+++ b/addons/mail/doc/mail_subtype.rst
@@ -0,0 +1,70 @@
+.. _mail_message_subtype:
+
+OpenChatter Pi (3.1415): Message Subtype
+========================================
+
+  To overcome the problems of crowdy walls in system notification, We have added features of **Message Subtype** in mail.
+
+mail.message.subtype
+++++++++++++++++++++
+``mail.message.subtype`` has following fields:
+
+ - ``Name``: fields.char(' Message Subtype ', size = 128,required = True,help = 'Subtype Of Message'),
+ - ``model_ids``: fields.many2many('ir.model','mail_message_subtyp_message_rel','message_subtype_id', 'model_id', 'Model',help = "link some subtypes to several models, for projet/task"),
+ - ``default``: fields.boolean('Default', help = "When subscribing to the document, users will receive by default messages related to this subtype unless they uncheck this subtype"),
+
+mail.followers
+++++++++++++++
+
+In ``mail.followers`` we have added additional many2many field subtype ids :
+
+ - ``subtype_ids``: fields.many2many('mail.message.subtype','mail_message_subtyp_rel','subscription_id', 'subtype_id', 'Subtype',help = "linking some subscription to several subtype for projet/task")
+
+mail.message
+++++++++++++
+
+In mail_message we have added additional field subtype_id which Indicates the Type of Message
+
+ - ``subtype_id``: fields.many2one('mail.message.subtype', 'Subtype')
+
+mail.thread
++++++++++++
+
+ - In **message_post** method add the *subtype_id* field as parameter and set as default subtype 'Other'.
+ 
+        def message_post(self, cr, uid, thread_id, body='', subject=False, msg_type='notification', parent_id=False, attachments=None, subtype='other', context=None, ``**kwargs``):
+
+ - In **message_subscribe** method add the *subtype_ids* field as parameter.In this method if subtype_ids is None, it fatch the default true subtypes in mail.message.subtypes otherwise pass selected subtypes.
+   For update subtypes call **message_subscribe_udpate_subtypes** method
+
+        def message_subscribe(self, cr, uid, ids, partner_ids,subtype_ids = None, context=None):
+
+ - Add **message_subscribe_udpate_subtypes** method to update the subtype_ids in followers.
+
+    def message_subscribe_udpate_subtypes(self, cr, uid, ids, user_id, subtype_ids,context=None):
+        followers_obj = self.pool.get('mail.followers')
+        followers_ids = followers_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', ids)])
+        return followers_obj.write(cr, uid, followers_ids, {'subtype_ids': [(6, 0 , subtype_ids)]}, context = context)
+
+For Each Addons:
+++++++++++++++++
+
+ - Add data of subtypes for each addons module.
+ - Add subtype field as parameter in **message_post** Method for each addons module.
+
+How It Works:
++++++++++++++
+
+ - In addons module when we Follow a Perticular document It display under the followers button.
+ - In sybtypes there are 3 default subtypes for each addons
+    1) Email
+    2) Comment
+    3) Other
+ - In document display a default subtypes(which are true) related a perticular model_ids wise.
+    
+    Example:-
+        If I have open crm.lead, It display only subtypes of crm.lead
+
+ - When we select subtype it update subtype_ids(which are checked) in mail.follower where match res_model & res_id of the current documents.
+ - when message created update subtype_id of that message in mail.message.
+ - In Feeds display only those notifications of documents which subtypes are selected
diff --git a/addons/mail/i18n/ar.po b/addons/mail/i18n/ar.po
index 4a264fe8e96..2b86f7baaa7 100644
--- a/addons/mail/i18n/ar.po
+++ b/addons/mail/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -74,7 +74,7 @@ msgstr ""
 #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
 #: help:mail.message.common,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "رسالة المستلمين"
 
 #. module: mail
 #: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
diff --git a/addons/mail/i18n/bg.po b/addons/mail/i18n/bg.po
index 3c5156dcc9c..cfd1028ccb0 100644
--- a/addons/mail/i18n/bg.po
+++ b/addons/mail/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/ca.po b/addons/mail/i18n/ca.po
index 2d56066837a..c99b70cd6a9 100644
--- a/addons/mail/i18n/ca.po
+++ b/addons/mail/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/da.po b/addons/mail/i18n/da.po
index 8b77ec859e1..1a9fdd72408 100644
--- a/addons/mail/i18n/da.po
+++ b/addons/mail/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/de.po b/addons/mail/i18n/de.po
index 47076a52a1b..ae2f3446e2d 100644
--- a/addons/mail/i18n/de.po
+++ b/addons/mail/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po
index 35f6e936c51..27f714bb972 100644
--- a/addons/mail/i18n/es.po
+++ b/addons/mail/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/es_CR.po b/addons/mail/i18n/es_CR.po
index 36c0a77dee5..91ecceef7ff 100644
--- a/addons/mail/i18n/es_CR.po
+++ b/addons/mail/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: mail
diff --git a/addons/mail/i18n/es_PY.po b/addons/mail/i18n/es_PY.po
index e202cfb32f5..5b23b42ea04 100644
--- a/addons/mail/i18n/es_PY.po
+++ b/addons/mail/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po
index d17d3e0d3d4..fec729cc86d 100644
--- a/addons/mail/i18n/fi.po
+++ b/addons/mail/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index 076b26689ef..446698d05f7 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -176,7 +176,7 @@ msgstr "Répondre"
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
-msgstr "Envoyer"
+msgstr "Envoyé"
 
 #. module: mail
 #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
diff --git a/addons/mail/i18n/gl.po b/addons/mail/i18n/gl.po
index 3e1de3af0ab..9f7ba85353b 100644
--- a/addons/mail/i18n/gl.po
+++ b/addons/mail/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po
index 9fe02410386..a3a3f4f992f 100644
--- a/addons/mail/i18n/hr.po
+++ b/addons/mail/i18n/hr.po
@@ -8,45 +8,45 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-12-22 17:13+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"PO-Revision-Date: 2012-10-28 19:42+0000\n"
+"Last-Translator: Marijan Rajic <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
 #: field:mail.message.common,subtype:0
 msgid "Message Type"
-msgstr ""
+msgstr "Tip poruke"
 
 #. module: mail
 #: help:mail.compose.message,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Trajno obrisati e-poštu nakon slanja"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open Related Document"
-msgstr ""
+msgstr "Otvori povezani dokument"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open Attachments"
-msgstr "Otvori privitke"
+msgstr "Otvori priloge"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Message Details"
-msgstr "Detalji poruke"
+msgstr "Detalji porukue"
 
 #. module: mail
 #: view:mail.thread:0
 msgid "Communication History"
-msgstr ""
+msgstr "Povijest komunikacije"
 
 #. module: mail
 #: view:mail.message:0
@@ -57,73 +57,73 @@ msgstr "Grupiraj po..."
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: view:mail.compose.message:0
 msgid "Compose Email"
-msgstr ""
+msgstr "Sastavi e-poštu"
 
 #. module: mail
 #: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
 #: help:mail.message.common,body_text:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Verzija poruke u običnom tekstu"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Body"
-msgstr ""
+msgstr "Sadržaj"
 
 #. module: mail
 #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
 #: help:mail.message.common,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Primatelji poruke"
 
 #. module: mail
 #: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
 #: field:mail.message.common,body_text:0
 msgid "Text Contents"
-msgstr ""
+msgstr "Sadržaj"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Received"
-msgstr ""
+msgstr "Primljeno"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Thread"
-msgstr ""
+msgstr "Nit"
 
 #. module: mail
 #: field:mail.message,mail_server_id:0
 msgid "Outgoing mail server"
-msgstr ""
+msgstr "Izlazni poslužitelj e-pošte"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Otkazano"
 
 #. module: mail
 #: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
 #: field:mail.message.common,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Odgovori na"
 
 #. module: mail
 #: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
 #: help:mail.message.common,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Verzija poruke u Rich-text/HTML formatu"
 
 #. module: mail
 #: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Auto brisanje"
 
 #. module: mail
 #: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
 #: help:mail.message.common,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Primatelji skrivene kopije poruke"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner view:mail.message:0
@@ -134,13 +134,13 @@ msgstr "Partner"
 #: field:mail.compose.message,subject:0 field:mail.message,subject:0
 #: field:mail.message.common,subject:0
 msgid "Subject"
-msgstr ""
+msgstr "Naslov"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
 msgid "On %(date)s, "
-msgstr ""
+msgstr "Na %(date)s, "
 
 #. module: mail
 #: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
@@ -151,32 +151,32 @@ msgstr "Od"
 #. module: mail
 #: view:mail.message:0
 msgid "Email message"
-msgstr ""
+msgstr "Poruka e-pošte"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "Pošalji"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Failed"
-msgstr ""
+msgstr "Neuspjelo"
 
 #. module: mail
 #: view:mail.message:0 field:mail.message,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Reply"
-msgstr ""
+msgstr "Odgovor"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Poslano"
 
 #. module: mail
 #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
@@ -185,39 +185,41 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Tip poruke, obično 'html' ili 'običan tekst', koristi se za odabir običnog "
+"ili bogatije formatiranog teksta"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "Primatelji"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Čarobnjak za sastavljanje e-pošte"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
 #: field:mail.message.common,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "Povezani ID dokumenta"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "Napredno"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
 msgid "Re:"
-msgstr ""
+msgstr "Re:"
 
 #. module: mail
 #: field:mail.compose.message,model:0 field:mail.message,model:0
 #: field:mail.message.common,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Povezani model dokumenta"
 
 #. module: mail
 #: view:mail.message:0
@@ -227,42 +229,42 @@ msgstr "Mjesec"
 #. module: mail
 #: view:mail.message:0
 msgid "Email Search"
-msgstr "Pretraživanje e-mailova"
+msgstr "Pretraga e-pošte"
 
 #. module: mail
 #: help:mail.message,original:0
 msgid "Original version of the message, as it was sent on the network"
-msgstr ""
+msgstr "Originalna varijanta poruke, kakva je poslana na mrežu"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Partner Name"
-msgstr "Naziv partnera"
+msgstr "Ime partnera"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "Pokušaj ponovo"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Odlazno"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "Pošalji odmah"
 
 #. module: mail
 #: field:mail.message,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Povezani partner"
 
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "Korisnik"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
@@ -273,19 +275,19 @@ msgstr "Datum"
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Prošireni filteri..."
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "%(sender_name)s wrote:"
-msgstr ""
+msgstr "%(sender_name)s je napisao:"
 
 #. module: mail
 #: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
 #: field:mail.message.common,body_html:0
 msgid "Rich-text Contents"
-msgstr ""
+msgstr "Formatirani tekst"
 
 #. module: mail
 #: field:mail.message,original:0
@@ -346,18 +348,18 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "Otvori"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
 #, python-format
 msgid "[OpenERP-Forward-Failed] %s"
-msgstr ""
+msgstr "[OpenERP-Forward-Failed] %s"
 
 #. module: mail
 #: field:mail.message,user_id:0
 msgid "Related User"
-msgstr ""
+msgstr "Povezani korisnik"
 
 #. module: mail
 #: help:mail.compose.message,headers:0 help:mail.message,headers:0
@@ -366,11 +368,13 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Cjelovito zaglavlje poruke, npr. zaglavlje SMTP sesije (obično dostupno samo "
+"kod dolaznih poruka)"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Mjesec kreiranja"
 
 #. module: mail
 #: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
@@ -387,7 +391,7 @@ msgstr "Detalji"
 #: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
 #: view:mail.thread:0
 msgid "Email Threads"
-msgstr ""
+msgstr "Niti e-pošte"
 
 #. module: mail
 #: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
@@ -396,28 +400,30 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Pošiljatelj poruke, preuzet iz korisničkih preferenci. Ukoliko je prazno, "
+"biti će poruka a ne e-pošta."
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Plain)"
-msgstr ""
+msgstr "Tijelo (obično)"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "You"
-msgstr ""
+msgstr "Vi"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
 #: help:mail.message.common,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Jedinstveni identifikator poruke"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Rich)"
-msgstr ""
+msgstr "Tijelo (formatirano)"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:155
@@ -427,6 +433,9 @@ msgid ""
 " Subject: %s \n"
 "\t"
 msgstr ""
+"%s napisano %s: \n"
+" Predmet: %s \n"
+"\t"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.act_res_partner_emails
@@ -445,64 +454,64 @@ msgstr "Poruke"
 #: field:mail.compose.message,headers:0 field:mail.message,headers:0
 #: field:mail.message.common,headers:0
 msgid "Message Headers"
-msgstr ""
+msgstr "Zaglavlja poruke"
 
 #. module: mail
 #: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
 #: field:mail.message.common,email_bcc:0
 msgid "Bcc"
-msgstr "Bcc"
+msgstr "Skrivena kopija"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_common
 msgid "mail.message.common"
-msgstr ""
+msgstr "mail.message.common"
 
 #. module: mail
 #: help:mail.compose.message,references:0 help:mail.message,references:0
 #: help:mail.message.common,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Reference poruke, poput identifikatora prethodnih poruka"
 
 #. module: mail
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Greška! Nije moguće kreirati pridružene članove rekurzivno."
 
 #. module: mail
 #: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
 #: help:mail.message.common,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Primatelji skrivene kopije"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "Isporuka nije uspjela"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Poruka e-pošte"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
 msgid "Email Thread"
-msgstr ""
+msgstr "Nit e-pošte"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filteri"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:220
 #, python-format
 msgid "Mail attachment"
-msgstr ""
+msgstr "Prilog e-pošte"
 
 #. module: mail
 #: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
 #: help:mail.message.common,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Željena povratna adresa za poruku"
diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po
index 5207c68759d..000980eac99 100644
--- a/addons/mail/i18n/hu.po
+++ b/addons/mail/i18n/hu.po
@@ -7,21 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-01-21 12:01+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
+"PO-Revision-Date: 2012-10-26 12:29+0000\n"
+"Last-Translator: Herczeg Péter <herczegp@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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
 #: field:mail.message.common,subtype:0
 msgid "Message Type"
-msgstr ""
+msgstr "Üzenettípus"
 
 #. module: mail
 #: help:mail.compose.message,auto_delete:0
@@ -31,7 +30,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Open Related Document"
-msgstr ""
+msgstr "Kapcsolódó dokumentum megnyitása"
 
 #. module: mail
 #: view:mail.message:0
@@ -57,7 +56,7 @@ msgstr "Csoportosítás..."
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: view:mail.compose.message:0
 msgid "Compose Email"
-msgstr ""
+msgstr "Email írás"
 
 #. module: mail
 #: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
@@ -68,7 +67,7 @@ msgstr ""
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Body"
-msgstr ""
+msgstr "Levéltörzs"
 
 #. module: mail
 #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
@@ -85,7 +84,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Received"
-msgstr ""
+msgstr "Fogadott"
 
 #. module: mail
 #: view:mail.message:0
@@ -95,18 +94,18 @@ msgstr ""
 #. module: mail
 #: field:mail.message,mail_server_id:0
 msgid "Outgoing mail server"
-msgstr ""
+msgstr "Kimenő levelező szerver"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Megszakítva"
 
 #. module: mail
 #: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
 #: field:mail.message.common,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Válaszcím"
 
 #. module: mail
 #: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
@@ -117,7 +116,7 @@ msgstr ""
 #. module: mail
 #: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Automatikus törlés"
 
 #. module: mail
 #: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
@@ -146,37 +145,37 @@ msgstr ""
 #: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
 #: field:mail.message.common,email_from:0
 msgid "From"
-msgstr ""
+msgstr "Feladó"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Email message"
-msgstr ""
+msgstr "Email üzenet"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "Küldés"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Failed"
-msgstr ""
+msgstr "Sikertelen"
 
 #. module: mail
 #: view:mail.message:0 field:mail.message,state:0
 msgid "State"
-msgstr ""
+msgstr "Állapot"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Reply"
-msgstr ""
+msgstr "Válasz"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Elküldött"
 
 #. module: mail
 #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
@@ -189,7 +188,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "Címzettek"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
@@ -205,7 +204,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "Speciális"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
@@ -242,17 +241,17 @@ msgstr "Partner neve"
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "Újra"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Kimenő"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "Küldés most"
 
 #. module: mail
 #: field:mail.message,partner_id:0
@@ -262,7 +261,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "Felhasználó"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
@@ -273,7 +272,7 @@ msgstr "Dátum"
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Kiterjesztett szűrők…"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
@@ -290,7 +289,7 @@ msgstr ""
 #. module: mail
 #: field:mail.message,original:0
 msgid "Original"
-msgstr ""
+msgstr "Eredeti"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:247 view:res.partner:0
@@ -341,12 +340,12 @@ msgstr ""
 #. module: mail
 #: view:mail.compose.message:0 view:mail.message:0
 msgid "Cancel"
-msgstr ""
+msgstr "Mégsem"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "Megnyitás"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
@@ -357,7 +356,7 @@ msgstr ""
 #. module: mail
 #: field:mail.message,user_id:0
 msgid "Related User"
-msgstr ""
+msgstr "Kapcsolódó felhasználó"
 
 #. module: mail
 #: help:mail.compose.message,headers:0 help:mail.message,headers:0
diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po
index a8c0253ce65..c21eeb8baf7 100644
--- a/addons/mail/i18n/it.po
+++ b/addons/mail/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po
index 61c3d491f87..649ea0bb4d4 100644
--- a/addons/mail/i18n/ja.po
+++ b/addons/mail/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po
index 2cfee22ddb0..276ca7a93af 100644
--- a/addons/mail/i18n/lt.po
+++ b/addons/mail/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/lv.po b/addons/mail/i18n/lv.po
index bfdcda883e3..4ccffd6e47d 100644
--- a/addons/mail/i18n/lv.po
+++ b/addons/mail/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -26,12 +26,12 @@ msgstr ""
 #. module: mail
 #: help:mail.compose.message,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Neatgriezēniski dzēs e-pastus pēc nosūtīšanas"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open Related Document"
-msgstr ""
+msgstr "Atvērt Saistīto Dokumentu"
 
 #. module: mail
 #: view:mail.message:0
@@ -46,7 +46,7 @@ msgstr "Ziņojuma sīkāka informācija"
 #. module: mail
 #: view:mail.thread:0
 msgid "Communication History"
-msgstr ""
+msgstr "Saziņas Vēsture"
 
 #. module: mail
 #: view:mail.message:0
@@ -57,24 +57,24 @@ msgstr "Grupēt pēc..."
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: view:mail.compose.message:0
 msgid "Compose Email"
-msgstr ""
+msgstr "Rakstīt vēstuli"
 
 #. module: mail
 #: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
 #: help:mail.message.common,body_text:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Ziņojuma tiešā teksta versija"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Body"
-msgstr ""
+msgstr "Pamatteksts"
 
 #. module: mail
 #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
 #: help:mail.message.common,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Ziņojuma saņēmēji"
 
 #. module: mail
 #: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
@@ -85,7 +85,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Received"
-msgstr ""
+msgstr "Saņemts"
 
 #. module: mail
 #: view:mail.message:0
@@ -95,18 +95,18 @@ msgstr "Sarakste"
 #. module: mail
 #: field:mail.message,mail_server_id:0
 msgid "Outgoing mail server"
-msgstr ""
+msgstr "Izejošais vēstuļu serveris"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Atcelts"
 
 #. module: mail
 #: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
 #: field:mail.message.common,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Atbildēt uz"
 
 #. module: mail
 #: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
@@ -156,27 +156,27 @@ msgstr ""
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "Sūtīt"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Failed"
-msgstr ""
+msgstr "Neizdevās"
 
 #. module: mail
 #: view:mail.message:0 field:mail.message,state:0
 msgid "State"
-msgstr ""
+msgstr "Stāvoklis"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Reply"
-msgstr ""
+msgstr "Atbildēt"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Nosūtīts"
 
 #. module: mail
 #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
@@ -189,7 +189,7 @@ msgstr ""
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "Adresāti"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
@@ -200,18 +200,18 @@ msgstr ""
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
 #: field:mail.message.common,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "Saistīta Dokumenta ID"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "Paplašināti"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
 msgid "Re:"
-msgstr ""
+msgstr "Atb.:"
 
 #. module: mail
 #: field:mail.compose.message,model:0 field:mail.message,model:0
@@ -242,27 +242,27 @@ msgstr "Partnera nosaukums"
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "Atkārtot"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Izejošais"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "Sūtīt Tagad"
 
 #. module: mail
 #: field:mail.message,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Saistītais partneris"
 
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "Lietotājs"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
@@ -273,7 +273,7 @@ msgstr "Datums"
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Paplašinātie Filtri..."
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
@@ -290,7 +290,7 @@ msgstr ""
 #. module: mail
 #: field:mail.message,original:0
 msgid "Original"
-msgstr ""
+msgstr "Oriģināls"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:247 view:res.partner:0
@@ -341,12 +341,12 @@ msgstr "Teksts"
 #. module: mail
 #: view:mail.compose.message:0 view:mail.message:0
 msgid "Cancel"
-msgstr ""
+msgstr "Atcelt"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "Atvērt"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
@@ -406,13 +406,13 @@ msgstr ""
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "You"
-msgstr ""
+msgstr "Jūs"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
 #: help:mail.message.common,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Ziņojuma unikālais identifikators"
 
 #. module: mail
 #: view:mail.message:0
@@ -456,7 +456,7 @@ msgstr "Bcc"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_common
 msgid "mail.message.common"
-msgstr ""
+msgstr "mail.message.common"
 
 #. module: mail
 #: help:mail.compose.message,references:0 help:mail.message,references:0
@@ -493,16 +493,25 @@ msgstr ""
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtri"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:220
 #, python-format
 msgid "Mail attachment"
-msgstr ""
+msgstr "Pasta pielikums"
 
 #. module: mail
 #: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
 #: help:mail.message.common,reply_to:0
 msgid "Preferred response address for the message"
 msgstr ""
+
+#~ msgid "Message type"
+#~ msgstr "Ziņojuma tips"
+
+#~ msgid "Text contents"
+#~ msgstr "Teksta saturs"
+
+#~ msgid "Related Document model"
+#~ msgstr "Saistīta Dokumenta modelis"
diff --git a/addons/mail/i18n/mn.po b/addons/mail/i18n/mn.po
index ea49507e842..cace24a667d 100644
--- a/addons/mail/i18n/mn.po
+++ b/addons/mail/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po
index 1a5600c5d0b..2656f580004 100644
--- a/addons/mail/i18n/nl.po
+++ b/addons/mail/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:39+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-09-03 17:14+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -196,7 +196,7 @@ msgstr "Ontvangers"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "E-mail samenstellen wizard"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po
index c939ba58a87..cb713dff12a 100644
--- a/addons/mail/i18n/pl.po
+++ b/addons/mail/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/pt.po b/addons/mail/i18n/pt.po
index 9b4283eec84..4ccff2ade77 100644
--- a/addons/mail/i18n/pt.po
+++ b/addons/mail/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po
index d9786945a70..355e06e01ce 100644
--- a/addons/mail/i18n/pt_BR.po
+++ b/addons/mail/i18n/pt_BR.po
@@ -8,30 +8,30 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-01-17 18:39+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-10-17 00:25+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
 #: field:mail.message.common,subtype:0
 msgid "Message Type"
-msgstr ""
+msgstr "Tipo de Mensagem"
 
 #. module: mail
 #: help:mail.compose.message,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Excluir Permanentemente o email após o envio"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open Related Document"
-msgstr ""
+msgstr "Abrir Documento Relacionado"
 
 #. module: mail
 #: view:mail.message:0
@@ -46,7 +46,7 @@ msgstr "Detalhes da Mensagem"
 #. module: mail
 #: view:mail.thread:0
 msgid "Communication History"
-msgstr ""
+msgstr "Histórico de Comunicação"
 
 #. module: mail
 #: view:mail.message:0
@@ -57,35 +57,35 @@ msgstr "Agrupar Por..."
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: view:mail.compose.message:0
 msgid "Compose Email"
-msgstr ""
+msgstr "Escrever Email"
 
 #. module: mail
 #: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
 #: help:mail.message.common,body_text:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Versão em texto"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Body"
-msgstr ""
+msgstr "Corpo"
 
 #. module: mail
 #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
 #: help:mail.message.common,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Destinatários da mensagem"
 
 #. module: mail
 #: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
 #: field:mail.message.common,body_text:0
 msgid "Text Contents"
-msgstr ""
+msgstr "Conteúdo do Texto"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Received"
-msgstr ""
+msgstr "Recebida"
 
 #. module: mail
 #: view:mail.message:0
@@ -95,35 +95,35 @@ msgstr "Tópico"
 #. module: mail
 #: field:mail.message,mail_server_id:0
 msgid "Outgoing mail server"
-msgstr ""
+msgstr "Servidor de envio"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: mail
 #: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
 #: field:mail.message.common,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Responder para"
 
 #. module: mail
 #: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
 #: help:mail.message.common,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Versão em Rich-text/HTML"
 
 #. module: mail
 #: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Excluir automaticamente"
 
 #. module: mail
 #: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
 #: help:mail.message.common,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Cópia oculta para os destinatários"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner view:mail.message:0
@@ -140,7 +140,7 @@ msgstr "Assunto"
 #: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
 msgid "On %(date)s, "
-msgstr ""
+msgstr "Em %(date)s, "
 
 #. module: mail
 #: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
@@ -151,32 +151,32 @@ msgstr "De"
 #. module: mail
 #: view:mail.message:0
 msgid "Email message"
-msgstr ""
+msgstr "Mensagem de Email"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "Enviar"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Failed"
-msgstr ""
+msgstr "Falhou"
 
 #. module: mail
 #: view:mail.message:0 field:mail.message,state:0
 msgid "State"
-msgstr ""
+msgstr "Situação"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Reply"
-msgstr ""
+msgstr "Responder"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Enviado"
 
 #. module: mail
 #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
@@ -185,39 +185,41 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Tipo de mensagem, geralmente 'html' ou 'texto', usado para selecionar texto "
+"puro ou html"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "Destinatários"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Assistente para compor Email"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
 #: field:mail.message.common,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID do Documento Relacionado"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "Avançado"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
 msgid "Re:"
-msgstr ""
+msgstr "Re:"
 
 #. module: mail
 #: field:mail.compose.message,model:0 field:mail.message,model:0
 #: field:mail.message.common,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Modelo de Documento Relacionado"
 
 #. module: mail
 #: view:mail.message:0
@@ -232,7 +234,7 @@ msgstr "Pesquisar Email"
 #. module: mail
 #: help:mail.message,original:0
 msgid "Original version of the message, as it was sent on the network"
-msgstr ""
+msgstr "Versão original da mensagem, como foi enviada pela rede"
 
 #. module: mail
 #: view:mail.message:0
@@ -242,27 +244,27 @@ msgstr "Nome do Parceiro"
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "Tentar Novamente"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Enviando"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "Enviar agora"
 
 #. module: mail
 #: field:mail.message,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Parceiro relacionado"
 
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
@@ -273,24 +275,24 @@ msgstr "Data"
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros Extendidos..."
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "%(sender_name)s wrote:"
-msgstr ""
+msgstr "%(sender_name)s escreveu:"
 
 #. module: mail
 #: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
 #: field:mail.message.common,body_html:0
 msgid "Rich-text Contents"
-msgstr ""
+msgstr "Conteúdo Rich-text"
 
 #. module: mail
 #: field:mail.message,original:0
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:247 view:res.partner:0
@@ -302,7 +304,7 @@ msgstr "Histórico"
 #: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
 #: field:mail.message.common,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "Cód da Mensagem"
 
 #. module: mail
 #: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
@@ -326,6 +328,7 @@ msgstr " em "
 #: help:mail.message,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
 msgstr ""
+"Excluir permanentemente este email depois do envio para economizar espaço"
 
 #. module: mail
 #: field:mail.compose.message,references:0 field:mail.message,references:0
@@ -341,23 +344,23 @@ msgstr "Mostrar o Texto"
 #. module: mail
 #: view:mail.compose.message:0 view:mail.message:0
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
 #, python-format
 msgid "[OpenERP-Forward-Failed] %s"
-msgstr ""
+msgstr "[OpenERP-Forward-Failed] %s"
 
 #. module: mail
 #: field:mail.message,user_id:0
 msgid "Related User"
-msgstr ""
+msgstr "Usuário Relacionado"
 
 #. module: mail
 #: help:mail.compose.message,headers:0 help:mail.message,headers:0
@@ -366,11 +369,13 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Cabeçalho completo da mensagem, Ex. SMTP session headers (geralmente "
+"disponível somente para mensagens recebidas)"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Mês de criação"
 
 #. module: mail
 #: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
@@ -387,7 +392,7 @@ msgstr "Detalhes"
 #: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
 #: view:mail.thread:0
 msgid "Email Threads"
-msgstr ""
+msgstr "Tópicos de Email"
 
 #. module: mail
 #: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
@@ -396,28 +401,30 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Remetente da mensagem, anotado das preferências do usuário, Se estiver vazio "
+"não é um email mas uma mensagem"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Plain)"
-msgstr ""
+msgstr "Corpo (Simples)"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "You"
-msgstr ""
+msgstr "Você"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
 #: help:mail.message.common,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Identificador da mensagem"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Rich)"
-msgstr ""
+msgstr "Corpo (Rich)"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:155
@@ -427,6 +434,9 @@ msgid ""
 " Subject: %s \n"
 "\t"
 msgstr ""
+"%s escreveu em %s: \n"
+" Assunto: %s \n"
+"\t"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.act_res_partner_emails
@@ -445,7 +455,7 @@ msgstr "Mensagens"
 #: field:mail.compose.message,headers:0 field:mail.message,headers:0
 #: field:mail.message.common,headers:0
 msgid "Message Headers"
-msgstr ""
+msgstr "Cabeçalhos da Mensagem"
 
 #. module: mail
 #: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
@@ -456,53 +466,75 @@ msgstr "Cópia Oculta"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_common
 msgid "mail.message.common"
-msgstr ""
+msgstr "mail.message.common"
 
 #. module: mail
 #: help:mail.compose.message,references:0 help:mail.message,references:0
 #: help:mail.message.common,references:0
 msgid "Message references, such as identifiers of previous messages"
 msgstr ""
+"Referências da mensagem, como identificadores de mensagens anteriores"
 
 #. module: mail
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
 
 #. module: mail
 #: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
 #: help:mail.message.common,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Cópia oculta da mensagem para os destinatários"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "Falha no envio"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Mensagem de Email"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
 msgid "Email Thread"
-msgstr ""
+msgstr "Tópico do Email"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtros"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:220
 #, python-format
 msgid "Mail attachment"
-msgstr ""
+msgstr "Anexos"
 
 #. module: mail
 #: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
 #: help:mail.message.common,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Endereço de resposta preferido"
+
+#~ msgid "Message type"
+#~ msgstr "Tipo de Mensagem"
+
+#~ msgid "Text contents"
+#~ msgstr "Conteúdo"
+
+#~ msgid "Related Document model"
+#~ msgstr "Modelo de Documento relacionado"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Assistente de composição de E-mail."
+
+#~ msgid "Rich-text contents"
+#~ msgstr "Conteúdo Rich-text"
+
+#~ msgid "Related user"
+#~ msgstr "Usuário relacionado"
+
+#~ msgid "Message headers"
+#~ msgstr "Cabeçalho da mensagem"
diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po
index c2bb6d4aafe..5d347acb904 100644
--- a/addons/mail/i18n/ro.po
+++ b/addons/mail/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po
index 49b9490d039..e35c40f94fe 100644
--- a/addons/mail/i18n/ru.po
+++ b/addons/mail/i18n/ru.po
@@ -8,30 +8,30 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-01-25 08:25+0000\n"
-"Last-Translator: Alexey Y. Fedotov <Unknown>\n"
+"PO-Revision-Date: 2012-10-30 09:52+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:04+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
 #: field:mail.message.common,subtype:0
 msgid "Message Type"
-msgstr ""
+msgstr "Тип сообщения"
 
 #. module: mail
 #: help:mail.compose.message,auto_delete:0
 msgid "Permanently delete emails after sending"
-msgstr ""
+msgstr "Не сохранять сообщения после отправки"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open Related Document"
-msgstr ""
+msgstr "Открыть связанный документ"
 
 #. module: mail
 #: view:mail.message:0
@@ -46,46 +46,46 @@ msgstr "Подробности сообщения"
 #. module: mail
 #: view:mail.thread:0
 msgid "Communication History"
-msgstr ""
+msgstr "История общения"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Group By..."
-msgstr "Объеденить по..."
+msgstr "Группировать по ..."
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.action_email_compose_message_wizard
 #: view:mail.compose.message:0
 msgid "Compose Email"
-msgstr ""
+msgstr "Написать письмо"
 
 #. module: mail
 #: help:mail.compose.message,body_text:0 help:mail.message,body_text:0
 #: help:mail.message.common,body_text:0
 msgid "Plain-text version of the message"
-msgstr ""
+msgstr "Простая текстовая версия сообщения"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Body"
-msgstr ""
+msgstr "Содержимое"
 
 #. module: mail
 #: help:mail.compose.message,email_to:0 help:mail.message,email_to:0
 #: help:mail.message.common,email_to:0
 msgid "Message recipients"
-msgstr ""
+msgstr "Получатели сообщения"
 
 #. module: mail
 #: field:mail.compose.message,body_text:0 field:mail.message,body_text:0
 #: field:mail.message.common,body_text:0
 msgid "Text Contents"
-msgstr ""
+msgstr "Текстовое содержимое"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Received"
-msgstr ""
+msgstr "Получено"
 
 #. module: mail
 #: view:mail.message:0
@@ -95,40 +95,40 @@ msgstr "Цепочка"
 #. module: mail
 #: field:mail.message,mail_server_id:0
 msgid "Outgoing mail server"
-msgstr ""
+msgstr "Сервер исходящей почты"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отменено"
 
 #. module: mail
 #: field:mail.compose.message,reply_to:0 field:mail.message,reply_to:0
 #: field:mail.message.common,reply_to:0
 msgid "Reply-To"
-msgstr ""
+msgstr "Адрес ответа"
 
 #. module: mail
 #: help:mail.compose.message,body_html:0 help:mail.message,body_html:0
 #: help:mail.message.common,body_html:0
 msgid "Rich-text/HTML version of the message"
-msgstr ""
+msgstr "Форматный текст/HTML версия сообщения"
 
 #. module: mail
 #: field:mail.compose.message,auto_delete:0 field:mail.message,auto_delete:0
 msgid "Auto Delete"
-msgstr ""
+msgstr "Авто удаление"
 
 #. module: mail
 #: help:mail.compose.message,email_bcc:0 help:mail.message,email_bcc:0
 #: help:mail.message.common,email_bcc:0
 msgid "Blind carbon copy message recipients"
-msgstr ""
+msgstr "Получатели скрытой копии сообщения"
 
 #. module: mail
 #: model:ir.model,name:mail.model_res_partner view:mail.message:0
 msgid "Partner"
-msgstr "Контрагент"
+msgstr "Партнёр"
 
 #. module: mail
 #: field:mail.compose.message,subject:0 field:mail.message,subject:0
@@ -140,7 +140,7 @@ msgstr "Тема"
 #: code:addons/mail/wizard/mail_compose_message.py:152
 #, python-format
 msgid "On %(date)s, "
-msgstr ""
+msgstr "За %(date)s, "
 
 #. module: mail
 #: field:mail.compose.message,email_from:0 field:mail.message,email_from:0
@@ -151,32 +151,32 @@ msgstr "От"
 #. module: mail
 #: view:mail.message:0
 msgid "Email message"
-msgstr ""
+msgstr "Сообщение эл. почты"
 
 #. module: mail
 #: view:mail.compose.message:0
 msgid "Send"
-msgstr ""
+msgstr "Отправить"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Failed"
-msgstr ""
+msgstr "Ошибка"
 
 #. module: mail
 #: view:mail.message:0 field:mail.message,state:0
 msgid "State"
-msgstr ""
+msgstr "Состояние"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Reply"
-msgstr ""
+msgstr "Ответить"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Sent"
-msgstr ""
+msgstr "Отправлено"
 
 #. module: mail
 #: help:mail.compose.message,subtype:0 help:mail.message,subtype:0
@@ -185,39 +185,41 @@ msgid ""
 "Type of message, usually 'html' or 'plain', used to select plaintext or rich "
 "text contents accordingly"
 msgstr ""
+"Тип сообщения, обычно 'html' или 'простой', используемый для выбора "
+"содержимого соответственно простого текста или форматного текста"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Recipients"
-msgstr ""
+msgstr "Получатели"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Мастер составления эл. почты"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
 #: field:mail.message.common,res_id:0
 msgid "Related Document ID"
-msgstr ""
+msgstr "ID связанного документа"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Advanced"
-msgstr ""
+msgstr "Дополнительно"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:157
 #, python-format
 msgid "Re:"
-msgstr ""
+msgstr "Ответ:"
 
 #. module: mail
 #: field:mail.compose.message,model:0 field:mail.message,model:0
 #: field:mail.message.common,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Модель связанного документа"
 
 #. module: mail
 #: view:mail.message:0
@@ -232,37 +234,37 @@ msgstr "Искать эл. почту"
 #. module: mail
 #: help:mail.message,original:0
 msgid "Original version of the message, as it was sent on the network"
-msgstr ""
+msgstr "Оригинальная версия сообщения, как было отправлено в сеть"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Partner Name"
-msgstr "Имя партнера"
+msgstr "Название партнера"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Retry"
-msgstr ""
+msgstr "Повторить"
 
 #. module: mail
 #: view:mail.message:0 selection:mail.message,state:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Исходящее"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Send Now"
-msgstr ""
+msgstr "Отправить сейчас"
 
 #. module: mail
 #: field:mail.message,partner_id:0
 msgid "Related partner"
-msgstr ""
+msgstr "Связанный партнер"
 
 #. module: mail
 #: view:mail.message:0
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: mail
 #: field:mail.compose.message,date:0 field:mail.message,date:0
@@ -273,24 +275,24 @@ msgstr "Дата"
 #. module: mail
 #: view:mail.message:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Расширенные фильтры..."
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "%(sender_name)s wrote:"
-msgstr ""
+msgstr "%(sender_name)s написал:"
 
 #. module: mail
 #: field:mail.compose.message,body_html:0 field:mail.message,body_html:0
 #: field:mail.message.common,body_html:0
 msgid "Rich-text Contents"
-msgstr ""
+msgstr "Форматированное содержимое"
 
 #. module: mail
 #: field:mail.message,original:0
 msgid "Original"
-msgstr ""
+msgstr "Оригинал"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:247 view:res.partner:0
@@ -302,13 +304,13 @@ msgstr "История"
 #: field:mail.compose.message,message_id:0 field:mail.message,message_id:0
 #: field:mail.message.common,message_id:0
 msgid "Message-Id"
-msgstr ""
+msgstr "ID сообщения"
 
 #. module: mail
 #: view:mail.compose.message:0 field:mail.compose.message,attachment_ids:0
 #: view:mail.message:0 field:mail.message,attachment_ids:0
 msgid "Attachments"
-msgstr "Прикрепленные файлы"
+msgstr "Вложения"
 
 #. module: mail
 #: field:mail.compose.message,email_cc:0 field:mail.message,email_cc:0
@@ -325,7 +327,7 @@ msgstr " на "
 #. module: mail
 #: help:mail.message,auto_delete:0
 msgid "Permanently delete this email after sending it, to save space"
-msgstr ""
+msgstr "Навсегда удалить это письмо после отправки, для экономии места"
 
 #. module: mail
 #: field:mail.compose.message,references:0 field:mail.message,references:0
@@ -341,23 +343,23 @@ msgstr "Вывести текст"
 #. module: mail
 #: view:mail.compose.message:0 view:mail.message:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Open"
-msgstr ""
+msgstr "Открыть"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:434
 #, python-format
 msgid "[OpenERP-Forward-Failed] %s"
-msgstr ""
+msgstr "[OpenERP-Forward-Failed] %s"
 
 #. module: mail
 #: field:mail.message,user_id:0
 msgid "Related User"
-msgstr ""
+msgstr "Относится к пользователю"
 
 #. module: mail
 #: help:mail.compose.message,headers:0 help:mail.message,headers:0
@@ -366,11 +368,13 @@ msgid ""
 "Full message headers, e.g. SMTP session headers (usually available on "
 "inbound messages only)"
 msgstr ""
+"Полные заголовки сообщения, т.е. заголовки сессии SMTP (обычно доступные "
+"только во входящих сообщениях)"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Месяц создания"
 
 #. module: mail
 #: field:mail.compose.message,email_to:0 field:mail.message,email_to:0
@@ -387,7 +391,7 @@ msgstr "Подробности"
 #: model:ir.actions.act_window,name:mail.action_view_mailgate_thread
 #: view:mail.thread:0
 msgid "Email Threads"
-msgstr ""
+msgstr "Цепочки эл.писем"
 
 #. module: mail
 #: help:mail.compose.message,email_from:0 help:mail.message,email_from:0
@@ -396,28 +400,30 @@ msgid ""
 "Message sender, taken from user preferences. If empty, this is not a mail "
 "but a message."
 msgstr ""
+"Отправитель сообщения, взятый из параметров пользователя. Если пусто, то это "
+"не почта, а сообщение."
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Plain)"
-msgstr ""
+msgstr "Текст (простой)"
 
 #. module: mail
 #: code:addons/mail/wizard/mail_compose_message.py:153
 #, python-format
 msgid "You"
-msgstr ""
+msgstr "Вы"
 
 #. module: mail
 #: help:mail.compose.message,message_id:0 help:mail.message,message_id:0
 #: help:mail.message.common,message_id:0
 msgid "Message unique identifier"
-msgstr ""
+msgstr "Уникальный идентификатор сообщения"
 
 #. module: mail
 #: view:mail.message:0
 msgid "Body (Rich)"
-msgstr ""
+msgstr "Текст (форматный)"
 
 #. module: mail
 #: code:addons/mail/mail_message.py:155
@@ -427,6 +433,9 @@ msgid ""
 " Subject: %s \n"
 "\t"
 msgstr ""
+"%s написал на %s: \n"
+" Тема: %s \n"
+"\t"
 
 #. module: mail
 #: model:ir.actions.act_window,name:mail.act_res_partner_emails
@@ -445,7 +454,7 @@ msgstr "Сообщения"
 #: field:mail.compose.message,headers:0 field:mail.message,headers:0
 #: field:mail.message.common,headers:0
 msgid "Message Headers"
-msgstr ""
+msgstr "Заголовки сообщений"
 
 #. module: mail
 #: field:mail.compose.message,email_bcc:0 field:mail.message,email_bcc:0
@@ -456,53 +465,74 @@ msgstr "Скрытая копия"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message_common
 msgid "mail.message.common"
-msgstr ""
+msgstr "mail.message.common"
 
 #. module: mail
 #: help:mail.compose.message,references:0 help:mail.message,references:0
 #: help:mail.message.common,references:0
 msgid "Message references, such as identifiers of previous messages"
-msgstr ""
+msgstr "Ссылки сообщения, такие как идентификаторы предыдущих сообщений"
 
 #. module: mail
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: mail
 #: help:mail.compose.message,email_cc:0 help:mail.message,email_cc:0
 #: help:mail.message.common,email_cc:0
 msgid "Carbon copy message recipients"
-msgstr ""
+msgstr "Получатели скрытой копии сообщения"
 
 #. module: mail
 #: selection:mail.message,state:0
 msgid "Delivery Failed"
-msgstr ""
+msgstr "Доставка не удалась"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_message
 msgid "Email Message"
-msgstr ""
+msgstr "Сообщение эл.почты"
 
 #. module: mail
 #: model:ir.model,name:mail.model_mail_thread view:mail.thread:0
 msgid "Email Thread"
-msgstr ""
+msgstr "Цепочка эл.почты"
 
 #. module: mail
 #: field:mail.compose.message,filter_id:0
 msgid "Filters"
-msgstr ""
+msgstr "Фильтры"
 
 #. module: mail
 #: code:addons/mail/mail_thread.py:220
 #, python-format
 msgid "Mail attachment"
-msgstr ""
+msgstr "Почтовое вложение"
 
 #. module: mail
 #: help:mail.compose.message,reply_to:0 help:mail.message,reply_to:0
 #: help:mail.message.common,reply_to:0
 msgid "Preferred response address for the message"
-msgstr ""
+msgstr "Предпочтительный адрес ответа для сообщения"
+
+#~ msgid "Message type"
+#~ msgstr "Тип сообщения"
+
+#~ msgid "Text contents"
+#~ msgstr "Текстовое содержимое"
+
+#~ msgid "Related Document model"
+#~ msgstr "Модель связанного документа"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Мастер создания электронной почты"
+
+#~ msgid "Rich-text contents"
+#~ msgstr "Форматное текстовое сообщение"
+
+#~ msgid "Related user"
+#~ msgstr "Связанный пользователь"
+
+#~ msgid "Message headers"
+#~ msgstr "Заголовки сообщения"
diff --git a/addons/mail/i18n/sl.po b/addons/mail/i18n/sl.po
index b88fc2c7062..2333a19aebb 100644
--- a/addons/mail/i18n/sl.po
+++ b/addons/mail/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/sr@latin.po b/addons/mail/i18n/sr@latin.po
index b2612459f9d..6cbea6bb2bc 100644
--- a/addons/mail/i18n/sr@latin.po
+++ b/addons/mail/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po
index 6b612090875..2cc3534aa54 100644
--- a/addons/mail/i18n/sv.po
+++ b/addons/mail/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/tr.po b/addons/mail/i18n/tr.po
index 8b03d2543a3..6fa02d88241 100644
--- a/addons/mail/i18n/tr.po
+++ b/addons/mail/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po
index 1122c6c6b45..3fe80ca3076 100644
--- a/addons/mail/i18n/zh_CN.po
+++ b/addons/mail/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:19+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-08-19 21:16+0000\n"
+"Last-Translator: Heling Yao <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mail
 #: field:mail.compose.message,subtype:0 field:mail.message,subtype:0
@@ -194,7 +194,7 @@ msgstr "收件人"
 #. module: mail
 #: model:ir.model,name:mail.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "电子邮件撰写向导"
 
 #. module: mail
 #: field:mail.compose.message,res_id:0 field:mail.message,res_id:0
diff --git a/addons/mail/ir_needaction.py b/addons/mail/ir_needaction.py
deleted file mode 100644
index 8193ac4f385..00000000000
--- a/addons/mail/ir_needaction.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2012-today OpenERP SA (<http://www.openerp.com>)
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
-from osv import osv
-
-class ir_needaction_mixin(osv.Model):
-    """ Update of ir.needaction_mixin class
-        - override the get_needaction_user_ids method to define the default
-          mail gateway need_action: when the object is unread, the object
-          responsible has an action to perform.
-    """
-    _name = 'ir.needaction_mixin'
-    _inherit = ['ir.needaction_mixin']
-    
-    def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        """ Returns the user_ids that have to perform an action. It the
-            document mail state is unread (False), return object.user_id.id
-            as need_action uid.
-            :return: dict { record_id: [user_ids], }
-        """
-        result = super(ir_needaction_mixin, self).get_needaction_user_ids(cr, uid, ids, context=context)
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.message_state == False and obj.user_id:
-                result[obj.id].append(obj.user_id.id)
-        return result
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/mail_alias.py b/addons/mail/mail_alias.py
index 82b20f39480..ef204d7a8cb 100644
--- a/addons/mail/mail_alias.py
+++ b/addons/mail/mail_alias.py
@@ -19,11 +19,16 @@
 #
 ##############################################################################
 
+import logging
 import re
 import unicodedata
 
 from openerp.osv import fields, osv
 from openerp.tools import ustr
+from openerp.modules.registry import RegistryManager
+from openerp import SUPERUSER_ID
+
+_logger = logging.getLogger(__name__)
 
 # Inspired by http://stackoverflow.com/questions/517923
 def remove_accents(input_str):
@@ -54,7 +59,7 @@ class mail_alias(osv.Model):
 
     def _get_alias_domain(self, cr, uid, ids, name, args, context=None):
         ir_config_parameter = self.pool.get("ir.config_parameter")
-        domain = ir_config_parameter.get_param(cr, uid, "mail.catchall.domain", context=context)   
+        domain = ir_config_parameter.get_param(cr, uid, "mail.catchall.domain", context=context)
         return dict.fromkeys(ids, domain or "")
 
     _columns = {
@@ -81,15 +86,14 @@ class mail_alias(osv.Model):
                                       help="Optional ID of a thread (record) to which all incoming "
                                            "messages will be attached, even if they did not reply to it. "
                                            "If set, this will disable the creation of new records completely."),
-        'alias_domain': fields.function(_get_alias_domain, string="Alias Domain", type='char', size=None),
+        'alias_domain': fields.function(_get_alias_domain, string="Alias domain", type='char', size=None),
     }
 
     _defaults = {
         'alias_defaults': '{}',
         'alias_user_id': lambda self,cr,uid,context: uid,
-        
         # looks better when creating new aliases - even if the field is informative only
-        'alias_domain': lambda self,cr,uid,context: self._get_alias_domain(cr,1,[1],None,None)[1]
+        'alias_domain': lambda self,cr,uid,context: self._get_alias_domain(cr, SUPERUSER_ID,[1],None,None)[1]
     }
 
     _sql_constraints = [
@@ -129,6 +133,56 @@ class mail_alias(osv.Model):
             sequence = (sequence + 1) if sequence else 2
         return new_name
 
+    def migrate_to_alias(self, cr, child_model_name, child_table_name, child_model_auto_init_fct,
+        alias_id_column, alias_key, alias_prefix = '', alias_force_key = '', alias_defaults = {}, context=None):
+        """ Installation hook to create aliases for all users and avoid constraint errors.
+
+            :param child_model_name: model name of the child class (i.e. res.users)
+            :param child_table_name: table name of the child class (i.e. res_users)
+            :param child_model_auto_init_fct: pointer to the _auto_init function
+                (i.e. super(res_users,self)._auto_init(cr, context=context))
+            :param alias_id_column: alias_id column (i.e. self._columns['alias_id'])
+            :param alias_key: name of the column used for the unique name (i.e. 'login')
+            :param alias_prefix: prefix for the unique name (i.e. 'jobs' + ...)
+            :param alias_force_key': name of the column for force_thread_id;
+                if empty string, not taken into account
+            :param alias_defaults: dict, keys = mail.alias columns, values = child
+                model column name used for default values (i.e. {'job_id': 'id'})
+        """
+
+        # disable the unique alias_id not null constraint, to avoid spurious warning during 
+        # super.auto_init. We'll reinstall it afterwards.
+        alias_id_column.required = False
+
+        # call _auto_init
+        child_model_auto_init_fct(cr, context=context)
+
+        registry = RegistryManager.get(cr.dbname)
+        mail_alias = registry.get('mail.alias')
+        child_class_model = registry.get(child_model_name)
+        no_alias_ids = child_class_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)], context={'active_test':False})
+        # Use read() not browse(), to avoid prefetching uninitialized inherited fields
+        for obj_data in child_class_model.read(cr, SUPERUSER_ID, no_alias_ids, [alias_key]):
+            alias_vals = {'alias_name': '%s%s' % (alias_prefix, obj_data[alias_key]) }
+            if alias_force_key:
+                alias_vals['alias_force_thread_id'] = obj_data[alias_force_key]
+            alias_vals['alias_defaults'] = dict( (k, obj_data[v]) for k, v in alias_defaults.iteritems())
+            alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, alias_vals, model_name=child_model_name)
+            child_class_model.write(cr, SUPERUSER_ID, obj_data['id'], {'alias_id': alias_id})
+            _logger.info('Mail alias created for %s %s (uid %s)', child_model_name, obj_data[alias_key], obj_data['id'])
+
+        # Finally attempt to reinstate the missing constraint
+        try:
+            cr.execute('ALTER TABLE %s ALTER COLUMN alias_id SET NOT NULL' % (child_table_name))
+        except Exception:
+            _logger.warning("Table '%s': unable to set a NOT NULL constraint on column '%s' !\n"\
+                            "If you want to have it, you should update the records and execute manually:\n"\
+                            "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL",
+                            child_table_name, 'alias_id', child_table_name, 'alias_id')
+
+        # set back the unique alias_id constraint
+        alias_id_column.required = True
+
     def create_unique_alias(self, cr, uid, vals, model_name=None, context=None):
         """Creates an email.alias record according to the values provided in ``vals``,
         with 2 alterations: the ``alias_name`` value may be suffixed in order to
diff --git a/addons/mail/mail_favorite.py b/addons/mail/mail_favorite.py
new file mode 100644
index 00000000000..4fe5fbdb557
--- /dev/null
+++ b/addons/mail/mail_favorite.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-Today OpenERP SA (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv, fields
+
+
+class mail_favorite(osv.Model):
+    ''' Favorite model: relationship table between messages and users. A favorite
+        message is a message the user wants to see in a specific 'Favorite'
+        mailbox, like a starred mechanism. '''
+
+    _name = 'mail.favorite'
+    _description = 'Favorite messages'
+    _columns = {
+            'message_id': fields.many2one('mail.message', 'Message', select=1,
+                ondelete='cascade', required=True),
+            'user_id': fields.many2one('res.users', 'User', select=1,
+                ondelete='cascade', required=True),
+        }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/mail_favorite_view.xml b/addons/mail/mail_favorite_view.xml
new file mode 100644
index 00000000000..3aa73d5463e
--- /dev/null
+++ b/addons/mail/mail_favorite_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!--  FOLLOWERS !-->
+        <record model="ir.ui.view" id="view_mail_favorite_tree">
+            <field name="name">mail.favorite.tree</field>
+            <field name="model">mail.favorite</field>
+            <field name="arch" type="xml">
+                <tree string="Favorites">
+                    <field name="user_id"/>
+                    <field name="message_id"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_favorite_form">
+            <field name="name">mail.favorite.form</field>
+            <field name="model">mail.favorite</field>
+            <field name="arch" type="xml">
+                <form string="Favorite Form" version="7.0">
+                    <sheet>
+                        <group>
+                            <field name="user_id"/>
+                            <field name="message_id"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_view_favorites" model="ir.actions.act_window">
+            <field name="name">Favorites</field>
+            <field name="res_model">mail.favorite</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        <!-- Add favorites related menu entries in Settings/Email -->
+        <menuitem name="Favorites" id="menu_email_favorites" parent="base.menu_email"
+                    action="action_view_favorites" sequence="40" groups="base.group_no_one"/>
+
+    </data>
+</openerp>
diff --git a/addons/mail/mail_followers.py b/addons/mail/mail_followers.py
index fcdc78d5f0a..8d3876ec91f 100644
--- a/addons/mail/mail_followers.py
+++ b/addons/mail/mail_followers.py
@@ -19,45 +19,156 @@
 #
 ##############################################################################
 
+from openerp import SUPERUSER_ID
 from osv import osv
 from osv import fields
+import tools
+
 
 class mail_followers(osv.Model):
     """ mail_followers holds the data related to the follow mechanism inside
-    OpenERP. Users can choose to follow documents (records) of any kind that
-    inherits from mail.thread. Following documents allow to receive
-    notifications for new messages.
-    A subscription is characterized by:
-        :param: res_model: model of the followed objects
-        :param: res_id: ID of resource (may be 0 for every objects)
-        :param: user_id: user_id of the follower
+        OpenERP. Partners can choose to follow documents (records) of any kind
+        that inherits from mail.thread. Following documents allow to receive
+        notifications for new messages.
+        A subscription is characterized by:
+            :param: res_model: model of the followed objects
+            :param: res_id: ID of resource (may be 0 for every objects)
     """
     _name = 'mail.followers'
-    _rec_name = 'id'
+    _rec_name = 'partner_id'
     _log_access = False
-    _order = 'res_model asc'
-    _description = 'Mail Document Followers'
+    _description = 'Document Followers'
     _columns = {
         'res_model': fields.char('Related Document Model', size=128,
                         required=True, select=1,
                         help='Model of the followed resource'),
         'res_id': fields.integer('Related Document ID', select=1,
                         help='Id of the followed resource'),
-        'user_id': fields.many2one('res.users', string='Related User',
+        'partner_id': fields.many2one('res.partner', string='Related Partner',
                         ondelete='cascade', required=True, select=1),
+        'subtype_ids': fields.many2many('mail.message.subtype', string='Subtype',
+            help="Message subtypes followed, meaning subtypes that will be pushed onto the user's Wall."),
     }
 
+
 class mail_notification(osv.Model):
-    """ mail_notification is a relational table modeling messages pushed to users.
-    """
+    """ Class holding notifications pushed to partners. Followers and partners
+        added in 'contacts to notify' receive notifications. """
     _name = 'mail.notification'
-    _rec_name = 'id'
+    _rec_name = 'partner_id'
     _log_access = False
-    _order = 'message_id desc'
-    _description = 'Mail notification'
+    _description = 'Notifications'
+
     _columns = {
-        'user_id': fields.many2one('res.users', string='User',
+        'partner_id': fields.many2one('res.partner', string='Contact',
                         ondelete='cascade', required=True, select=1),
+        'read': fields.boolean('Read', select=1),
         'message_id': fields.many2one('mail.message', string='Message',
                         ondelete='cascade', required=True, select=1),
     }
+
+    _defaults = {
+        'read': False,
+    }
+
+    def init(self, cr):
+        cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = %s', ('mail_notification_partner_id_read_message_id',))
+        if not cr.fetchone():
+            cr.execute('CREATE INDEX mail_notification_partner_id_read_message_id ON mail_notification (partner_id, read, message_id)')
+
+    def create(self, cr, uid, vals, context=None):
+        """ Override of create to check that we can not create a notification
+            for a message the user can not read. """
+        if self.pool.get('mail.message').check_access_rights(cr, uid, 'read'):
+            return super(mail_notification, self).create(cr, uid, vals, context=context)
+        return False
+
+    def set_message_read(self, cr, uid, msg_ids, read=None, context=None):
+        """ Set messages as (un)read. Technically, the notifications related
+            to uid are set to (un)read. If for some msg_ids there are missing
+            notifications (i.e. due to load more or thread parent fetching),
+            they are created.
+
+            :param bool read: (un)read notification
+        """
+        user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        notif_ids = self.search(cr, uid, [
+            ('partner_id', '=', user_pid),
+            ('message_id', 'in', msg_ids)
+            ], context=context)
+
+        # all message have notifications: already set them as (un)read
+        if len(notif_ids) == len(msg_ids):
+            return self.write(cr, uid, notif_ids, {'read': read}, context=context)
+
+        # some messages do not have notifications: find which one, create notification, update read status
+        notified_msg_ids = [notification.message_id.id for notification in self.browse(cr, uid, notif_ids, context=context)]
+        to_create_msg_ids = list(set(msg_ids) - set(notified_msg_ids))
+        for msg_id in to_create_msg_ids:
+            self.create(cr, uid, {'partner_id': user_pid, 'read': read, 'message_id': msg_id}, context=context)
+        return self.write(cr, uid, notif_ids, {'read': read}, context=context)
+
+    def get_partners_to_notify(self, cr, uid, message, context=None):
+        """ Return the list of partners to notify, based on their preferences.
+
+            :param browse_record message: mail.message to notify
+        """
+        notify_pids = []
+        for notification in message.notification_ids:
+            if notification.read:
+                continue
+            partner = notification.partner_id
+            # Do not send an email to the writer
+            if partner.user_ids and partner.user_ids[0].id == uid:
+                continue
+            # Do not send to partners without email address defined
+            if not partner.email:
+                continue
+            # Partner does not want to receive any emails
+            if partner.notification_email_send == 'none':
+                continue
+            # Partner wants to receive only emails and comments
+            if partner.notification_email_send == 'comment' and message.type not in ('email', 'comment'):
+                continue
+            # Partner wants to receive only emails
+            if partner.notification_email_send == 'email' and message.type != 'email':
+                continue
+            notify_pids.append(partner.id)
+        return notify_pids
+
+    def _notify(self, cr, uid, msg_id, context=None):
+        """ Send by email the notification depending on the user preferences """
+        if context is None:
+            context = {}
+        # mail_noemail (do not send email) or no partner_ids: do not send, return
+        if context.get('mail_noemail'):
+            return True
+        msg = self.pool.get('mail.message').browse(cr, uid, msg_id, context=context)
+
+        notify_partner_ids = self.get_partners_to_notify(cr, uid, msg, context=context)
+        if not notify_partner_ids:
+            return True
+
+        # add the context in the email
+        # TDE FIXME: commented, to be improved in a future branch
+        # quote_context = self.pool.get('mail.message').message_quote_context(cr, uid, msg_id, context=context)
+
+        mail_mail = self.pool.get('mail.mail')
+        # add signature
+        body_html = msg.body
+        # if quote_context:
+            # body_html = tools.append_content_to_html(body_html, quote_context, plaintext=False)
+        signature = msg.author_id and msg.author_id.user_ids and msg.author_id.user_ids[0].signature or ''
+        if signature:
+            body_html = tools.append_content_to_html(body_html, signature, plaintext=True, container_tag='div')
+
+        mail_values = {
+            'mail_message_id': msg.id,
+            'email_to': [],
+            'auto_delete': True,
+            'body_html': body_html,
+            'state': 'outgoing',
+        }
+        mail_values['email_to'] = ', '.join(mail_values['email_to'])
+        email_notif_id = mail_mail.create(cr, uid, mail_values, context=context)
+        return mail_mail.send(cr, uid, [email_notif_id], recipient_ids=notify_partner_ids, context=context)
diff --git a/addons/mail/mail_followers_view.xml b/addons/mail/mail_followers_view.xml
index 62e93430675..a9d1d80240b 100644
--- a/addons/mail/mail_followers_view.xml
+++ b/addons/mail/mail_followers_view.xml
@@ -6,17 +6,37 @@
         <record model="ir.ui.view" id="view_followers_tree">
             <field name="name">mail.followers.tree</field>
             <field name="model">mail.followers</field>
-            <field name="type">tree</field>
             <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Followers">
                     <field name="res_model"/>
                     <field name="res_id"/>
-                    <field name="user_id"/>
+                    <field name="partner_id"/>
                 </tree>
             </field>
         </record>
 
+        <record model="ir.ui.view" id="view_mail_subscription_form">
+            <field name="name">mail.followers.form</field>
+            <field name="model">mail.followers</field>
+            <field name="arch" type="xml">
+                <form string="Followers Form" version="7.0">
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="res_model"/>
+                                <field name="partner_id"/>
+                            </group>
+                            <group>
+                                <field name="res_id"/>
+                                <field name="subtype_ids" widget="many2many_tags"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+        
         <!-- NOTIFICATION !-->
         <record model="ir.ui.view" id="view_notification_tree">
             <field name="name">mail.notification.tree</field>
@@ -24,7 +44,7 @@
             <field name="priority">10</field>
             <field name="arch" type="xml">
                 <tree string="Notifications">
-                    <field name="user_id"/>
+                    <field name="partner_id"/>
                     <field name="message_id"/>
                 </tree>
             </field>
@@ -38,7 +58,7 @@
         </record>
 
         <record id="action_view_notifications" model="ir.actions.act_window">
-            <field name="name">Pushed notif</field>
+            <field name="name">Notifications</field>
             <field name="res_model">mail.notification</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/mail/mail_group.py b/addons/mail/mail_group.py
index 6a14fef83aa..b163882577b 100644
--- a/addons/mail/mail_group.py
+++ b/addons/mail/mail_group.py
@@ -19,24 +19,19 @@
 #
 ##############################################################################
 
-import datetime as DT
 import openerp
 import openerp.tools as tools
-from operator import itemgetter
 from osv import osv
 from osv import fields
-from tools.translate import _
+from openerp import SUPERUSER_ID
+
 
 class mail_group(osv.Model):
-    """
-    A mail_group is a collection of users sharing messages in a discussion
-    group. Group users are users that follow the mail group, using the
-    subscription/follow mechanism of OpenSocial. A mail group has nothing
-    in common with res.users.group.
-    """
-    
+    """ A mail_group is a collection of users sharing messages in a discussion
+        group. The group mechanics are based on the followers. """
     _description = 'Discussion group'
     _name = 'mail.group'
+    _mail_flat_thread = False
     _inherit = ['mail.thread']
     _inherits = {'mail.alias': 'alias_id', 'ir.ui.menu': 'menu_id'}
 
@@ -45,68 +40,54 @@ class mail_group(osv.Model):
         for obj in self.browse(cr, uid, ids, context=context):
             result[obj.id] = tools.image_get_resized_images(obj.image)
         return result
-    
+
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
-    
-    def _get_last_month_msg_nbr(self, cr, uid, ids, name, args, context=None):
-        result = {}
-        for id in ids:
-            lower_date = (DT.datetime.now() - DT.timedelta(days=30)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
-            result[id] = self.message_search(cr, uid, [id], limit=None, domain=[('date', '>=', lower_date)], count=True, context=context)
-        return result
-    
-    def _get_default_image(self, cr, uid, context=None):
-        image_path = openerp.modules.get_module_resource('mail', 'static/src/img', 'groupdefault.png')
-        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
-    
+
     _columns = {
         'description': fields.text('Description'),
         'menu_id': fields.many2one('ir.ui.menu', string='Related Menu', required=True, ondelete="cascade"),
-        'responsible_id': fields.many2one('res.users', string='Responsible',
-            ondelete='set null', required=True, select=1,
-            help="Responsible of the group that has all rights on the record."),
-        'public': fields.selection([('public', 'Public'), ('private', 'Private'), ('groups', 'Selected Group Only')],
-            string='Privacy', required=True,
-            help='This group is visible by non members. '\
-                 'Invisible groups can add members through the invite button.'),
+        'public': fields.selection([('public', 'Public'), ('private', 'Private'), ('groups', 'Selected Group Only')], 'Privacy', required=True,
+            help='This group is visible by non members. \
+            Invisible groups can add members through the invite button.'),
         'group_public_id': fields.many2one('res.groups', string='Authorized Group'),
         'group_ids': fields.many2many('res.groups', rel='mail_group_res_group_rel',
             id1='mail_group_id', id2='groups_id', string='Auto Subscription',
             help="Members of those groups will automatically added as followers. "\
                  "Note that they will be able to manage their subscription manually "\
                  "if necessary."),
+        # image: all image fields are base64 encoded and PIL-supported
         'image': fields.binary("Photo",
-            help="This field holds the image used as photo for the "\
-                 "user. The image is base64 encoded, and PIL-supported. "\
-                 "It is limited to a 12024x1024 px image."),
+            help="This field holds the image used as photo for the group, limited to 1024x1024px."),
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
             string="Medium-sized photo", type="binary", multi="_get_image",
-            store = {
+            store={
                 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized photo of the group. It is automatically "\
-                 "resized as a 180x180px image, with aspect ratio preserved. "\
+                 "resized as a 128x128px image, with aspect ratio preserved. "\
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Small-sized photo", type="binary", multi="_get_image",
-            store = {
+            store={
                 'mail.group': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized photo of the group. It is automatically "\
-                 "resized as a 50x50px image, with aspect ratio preserved. "\
+                 "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
-        'last_month_msg_nbr': fields.function(_get_last_month_msg_nbr, type='integer',
-            string='Messages count for last month'),
-        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", 
-                                    help="The email address associated with this group. New emails received will automatically "
-                                         "create new topics."),
+        'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
+            help="The email address associated with this group. New emails received will automatically "
+                 "create new topics."),
     }
 
     def _get_default_employee_group(self, cr, uid, context=None):
         ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
         return ref and ref[1] or False
 
+    def _get_default_image(self, cr, uid, context=None):
+        image_path = openerp.modules.get_module_resource('mail', 'static/src/img', 'groupdefault.png')
+        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
+
     def _get_menu_parent(self, cr, uid, context=None):
         ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'mail_group_root')
         return ref and ref[1] or False
@@ -114,83 +95,79 @@ class mail_group(osv.Model):
     _defaults = {
         'public': 'groups',
         'group_public_id': _get_default_employee_group,
-        'responsible_id': (lambda s, cr, uid, ctx: uid),
         'image': _get_default_image,
         'parent_id': _get_menu_parent,
-        'alias_domain': False, # always hide alias during creation 
+        'alias_domain': False, # always hide alias during creation
     }
 
-    def _subscribe_user_with_group_m2m_command(self, cr, uid, ids, group_ids_command, context=None):
-        # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
-        user_group_ids = [command[1] for command in group_ids_command if command[0] == 4]
-        user_group_ids += [id for command in group_ids_command if command[0] == 6 for id in command[2]]
-        # retrieve the user member of those groups
-        user_ids = []
-        res_groups_obj = self.pool.get('res.groups')
-        for group in res_groups_obj.browse(cr, uid, user_group_ids, context=context):
-            user_ids += [user.id for user in group.users]
-        # subscribe the users
-        return self.message_subscribe(cr, uid, ids, user_ids, context=context)
+    def _subscribe_users(self, cr, uid, ids, context=None):
+        for mail_group in self.browse(cr, uid, ids, context=context):
+            partner_ids = []
+            for group in mail_group.group_ids:
+                partner_ids += [user.partner_id.id for user in group.users]
+            self.message_subscribe(cr, uid, ids, partner_ids, context=context)
 
     def create(self, cr, uid, vals, context=None):
         mail_alias = self.pool.get('mail.alias')
         if not vals.get('alias_id'):
             vals.pop('alias_name', None) # prevent errors during copy()
-            alias_id = mail_alias.create_unique_alias(cr, uid, 
+            alias_id = mail_alias.create_unique_alias(cr, uid,
                           # Using '+' allows using subaddressing for those who don't
                           # have a catchall domain setup.
                           {'alias_name': "group+"+vals['name']},
                           model_name=self._name, context=context)
             vals['alias_id'] = alias_id
 
-        mail_group_id = super(mail_group, self).create(cr, uid, vals, context)
+        #check access rights for the current user, then create as SUPERUSER because the object inherits
+        #ir.ui.menu (for which normal users do not have creation rights)
+        self.check_access_rights(cr, uid, 'create')
+        mail_group_id = super(mail_group, self).create(cr, SUPERUSER_ID, vals, context=context)
 
         # Create client action for this group and link the menu to it
         ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'action_mail_group_feeds')
         if ref:
-            search_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'view_message_search_wall')
+            search_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'view_message_search')
             params = {
                 'search_view_id': search_ref and search_ref[1] or False,
-                'domain': [('model','=','mail.group'),('res_id','=',mail_group_id)],
-                'res_model': 'mail.group',
-                'res_id': mail_group_id,
-                'thread_level': 2
+                'domain': [('model', '=', 'mail.group'), ('res_id', '=', mail_group_id)],
+                'context': {'default_model': 'mail.group', 'default_res_id': mail_group_id, 'search_default_message_unread': True},
+                'res_model': 'mail.message',
+                'thread_level': 1,
             }
             cobj = self.pool.get('ir.actions.client')
-            newref = cobj.copy(cr, uid, ref[1], default={'params': str(params), 'name': vals['name']}, context=context)
-            self.write(cr, uid, [mail_group_id], {'action': 'ir.actions.client,'+str(newref), 'mail_group_id': mail_group_id}, context=context)
+            newref = cobj.copy(cr, SUPERUSER_ID, ref[1], default={'params': str(params), 'name': vals['name']}, context=context)
+            self.write(cr, SUPERUSER_ID, [mail_group_id], {'action': 'ir.actions.client,' + str(newref), 'mail_group_id': mail_group_id}, context=context)
 
         mail_alias.write(cr, uid, [vals['alias_id']], {"alias_force_thread_id": mail_group_id}, context)
-       
-        if vals.get('group_ids'):
-            self._subscribe_user_with_group_m2m_command(cr, uid, [mail_group_id], vals.get('group_ids'), context=context)
 
+        if vals.get('group_ids'):
+            self._subscribe_users(cr, uid, [mail_group_id], context=context)
         return mail_group_id
 
     def unlink(self, cr, uid, ids, context=None):
+        groups = self.browse(cr, uid, ids, context=context)
         # Cascade-delete mail aliases as well, as they should not exist without the mail group.
         mail_alias = self.pool.get('mail.alias')
-        alias_ids = [group.alias_id.id for group in self.browse(cr, uid, ids, context=context) if group.alias_id]
+        alias_ids = [group.alias_id.id for group in groups if group.alias_id]
+        # Cascade-delete menu entries as well
+        self.pool.get('ir.ui.menu').unlink(cr, uid, [group.menu_id.id for group in groups if group.menu_id], context=context)
+        # Delete mail_group
         res = super(mail_group, self).unlink(cr, uid, ids, context=context)
         mail_alias.unlink(cr, uid, alias_ids, context=context)
         return res
 
     def write(self, cr, uid, ids, vals, context=None):
+        result = super(mail_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('group_ids'):
-            self._subscribe_user_with_group_m2m_command(cr, uid, ids, vals.get('group_ids'), context=context)
-        return super(mail_group, self).write(cr, uid, ids, vals, context=context)
+            self._subscribe_users(cr, uid, ids, context=context)
+        return result
 
-    def action_group_join(self, cr, uid, ids, context=None):
-        return self.message_subscribe(cr, uid, ids, context=context)
+    def action_follow(self, cr, uid, ids, context=None):
+        """ Wrapper because message_subscribe_users take a user_ids=None
+            that receive the context without the wrapper. """
+        return self.message_subscribe_users(cr, uid, ids, context=context)
 
-    def action_group_leave(self, cr, uid, ids, context=None):
-        return self.message_unsubscribe(cr, uid, ids, context=context)
-
-    # ----------------------------------------
-    # OpenChatter methods and notifications
-    # ----------------------------------------
-
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'responsible_id' to the monitored fields """
-        res = super(mail_group, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['responsible_id']
+    def action_unfollow(self, cr, uid, ids, context=None):
+        """ Wrapper because message_unsubscribe_users take a user_ids=None
+            that receive the context without the wrapper. """
+        return self.message_unsubscribe_users(cr, uid, ids, context=context)
diff --git a/addons/mail/mail_group_menu.py b/addons/mail/mail_group_menu.py
index 8625285d640..a29ee2519d5 100644
--- a/addons/mail/mail_group_menu.py
+++ b/addons/mail/mail_group_menu.py
@@ -19,9 +19,10 @@
 #
 ##############################################################################
 
+from openerp import SUPERUSER_ID
 from osv import osv
 from osv import fields
-from tools.translate import _
+
 
 class ir_ui_menu(osv.osv):
     """ Override of ir.ui.menu class. When adding mail_thread module, each
@@ -38,15 +39,19 @@ class ir_ui_menu(osv.osv):
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
         """ Override to take off menu entries (mail.group) the user is not
-            following. """
-        ids = super(ir_ui_menu, self).search(cr, uid, args, offset=0, limit=None, order=order, context=context, count=False)
+            following. Access are done using SUPERUSER_ID to avoid access
+            rights issues for an internal back-end algorithm. """
+        ids = super(ir_ui_menu, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=False)
+        partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
         follower_obj = self.pool.get('mail.followers')
         for menu in self.browse(cr, uid, ids, context=context):
             if menu.mail_group_id:
-                sub_ids = follower_obj.search(cr, uid, [
-                    ('user_id', '=', uid), ('res_model', '=', 'mail.group'),
+                sub_ids = follower_obj.search(cr, SUPERUSER_ID, [
+                    ('partner_id', '=', partner_id), ('res_model', '=', 'mail.group'),
                     ('res_id', '=', menu.mail_group_id.id)
                     ], context=context)
                 if not sub_ids:
                     ids.remove(menu.id)
+        if count:
+            return len(ids)
         return ids
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index a71ec972326..4a880a13c14 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+        <!-- this record will be dynamically adapted to each new menu created -->
         <record id="action_mail_group_feeds" model="ir.actions.client">
             <field name="name">Discussion Group</field>
             <field name="tag">mail.wall</field>
-            <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
+            <field name="res_model">mail.message</field>
         </record>
 
         <!-- Group Kanban View  !-->
@@ -16,6 +17,8 @@
                 <kanban>
                     <field name="message_follower_ids"/>
                     <field name="message_is_follower"/>
+                    <field name="message_summary"/>
+                    <field name="description"/>
                     <templates>
                         <t t-name="kanban-description">
                             <div class="oe_group_description" t-if="record.description.raw_value">
@@ -23,27 +26,24 @@
                             </div>
                         </t>
                         <t t-name="kanban-box">
-                            <div t-attf-class="{record.message_is_follower.raw_value} oe_group_vignette">
+                            <div t-attf-class="{record.message_is_follower.raw_value} oe_group_vignette oe_semantic_html_override">
                                 <div class="oe_group_image">
-                                    <a type="edit"><img t-att-src="kanban_image('mail.group', 'image_medium', record.id.value)" class="oe_group_photo" tooltip="kanban-description"/></a>
+                                    <a type="open"><img t-att-src="kanban_image('mail.group', 'image_medium', record.id.value)" class="oe_group_photo" tooltip="kanban-description"/></a>
                                 </div>
                                 <div class="oe_group_details">
-                                    <h4><a type="edit"><field name="name"/></a></h4>
-                                    <ul>
-                                        <!-- <li><field name="message_follower_count"/> member(s)</li> -->
-                                        <li>
-                                            <t t-raw="record.message_follower_ids.raw_value.length"/> member(s)
-                                        </li>
-                                        <li t-if="! record.message_is_follower.raw_value"><a name="action_group_join" string="Join" type="object" class="oe_group_join">Not following</a></li>
-                                        <li t-if="record.message_is_follower.raw_value"><a name="action_group_leave" string="Join" type="object" class="oe_group_leave">Following</a></li>
-                                        <li><field name="last_month_msg_nbr"/> messages last month</li>
-                                    </ul>
+                                    <h4><a type="open"><field name="name"/></a></h4>
+                                    <div class="oe_grey">
+                                        <field name="description"/>
+                                    </div>
+                                    <div class="oe_kanban_footer_left">
+                                        <t t-raw="record.message_summary.raw_value"/>
+                                    </div>
+                                    <div class="oe_group_button">
+                                        <button t-if="record.message_is_follower.raw_value" name="action_unfollow" type="object" class="oe_group_join">Unfollow</button>
+                                        <button t-if="! record.message_is_follower.raw_value" name="action_follow" type="object">Join Group</button>
+                                    </div>
                                 </div>
                             </div>
-                            <script>
-                                $('.oe_group_join').mouseover(function () { $(this).html('Follow'); }).mouseleave(function () { $(this).html('Not following'); });
-                                $('.oe_group_leave').mouseover(function () { $(this).html('Unfollow'); }).mouseleave(function () { $(this).html('Following'); });
-                            </script>
                         </t>
                     </templates>
                 </kanban>
@@ -58,12 +58,12 @@
             <field name="arch" type="xml">
                 <form string="Group Form" version="7.0">
                     <sheet class="openerp_mail_group_sheet">
-                        <field name="image_small" widget='image' class="oe_avatar oe_left"/>
+                        <field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
                         <div class="oe_title">
                             <div class="oe_edit_only">
-                                <label for="name" string="Group Name"/> 
-                            </div> 
-                            <h1><field name="name"/></h1>
+                                <label for="name" string="Group Name"/>
+                            </div>
+                            <h1><field name="name" readonly="0"/></h1>
                             <div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
                                     <field name="alias_id" invisible="1" required="0"/>
                                     <label for="alias_name" class="oe_edit_only"/>
@@ -80,16 +80,11 @@
                                     />
                                 <field name="group_ids" widget="many2many_tags" class="oe_inline"/>
                             </group>
-                            <group class="oe_edit_only">
-                                <field name="responsible_id" class="oe_inline"/>
-                            </group>
                         </group>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"
-                                options='{"thread_level": 1}'/>
-                        <field name="message_follower_ids" widget="mail_followers"
-                                context="{'lapin': 'nouille'}" image="image_small"/>
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}' placeholder="Send a message to the group..."/>
                     </div>
                 </form>
             </field>
@@ -103,7 +98,6 @@
             <field name="arch" type="xml">
                 <tree string="Groups">
                     <field name="name" string="Group Name"/>
-                    <field name="responsible_id"/>
                 </tree>
             </field>
         </record>
@@ -116,14 +110,13 @@
             <field name="arch" type="xml">
                 <search string="Search Groups">
                     <field name="name" string="Group"/>
-                    <field name="responsible_id"/>
                 </search>
             </field>
         </record>
 
         <!-- group record !-->
         <record id="action_view_groups" model="ir.actions.act_window">
-            <field name="name">Groups</field>
+            <field name="name">Join a group</field>
             <field name="res_model">mail.group</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
@@ -132,6 +125,6 @@
 
         <!-- left-side menu: Groups !-->
         <menuitem id="mail_group_root" parent="mail_feeds_main" sequence="12" name="My Groups"/>
-        <menuitem id="mail_allgroups" parent="mail_feeds" sequence="12" action="action_view_groups"/>
+        <menuitem id="mail_allgroups" parent="mail_group_root" sequence="100" action="action_view_groups"/>
     </data>
 </openerp>
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
new file mode 100644
index 00000000000..741184ef7a3
--- /dev/null
+++ b/addons/mail/mail_mail.py
@@ -0,0 +1,244 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+import base64
+import logging
+import tools
+
+from openerp import SUPERUSER_ID
+from osv import osv, fields
+from tools.translate import _
+
+_logger = logging.getLogger(__name__)
+
+
+class mail_mail(osv.Model):
+    """ Model holding RFC2822 email messages to send. This model also provides
+        facilities to queue and send new email messages.  """
+    _name = 'mail.mail'
+    _description = 'Outgoing Mails'
+    _inherits = {'mail.message': 'mail_message_id'}
+    _order = 'id desc'
+
+    _columns = {
+        'mail_message_id': fields.many2one('mail.message', 'Message', required=True, ondelete='cascade'),
+        'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
+        'state': fields.selection([
+            ('outgoing', 'Outgoing'),
+            ('sent', 'Sent'),
+            ('received', 'Received'),
+            ('exception', 'Delivery Failed'),
+            ('cancel', 'Cancelled'),
+        ], 'Status', readonly=True),
+        'auto_delete': fields.boolean('Auto Delete',
+            help="Permanently delete this email after sending it, to save space"),
+        'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
+        'email_from': fields.char('From', help='Message sender, taken from user preferences.'),
+        'email_to': fields.text('To', help='Message recipients'),
+        'email_cc': fields.char('Cc', help='Carbon copy message recipients'),
+        'reply_to': fields.char('Reply-To', help='Preferred response address for the message'),
+        'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML message"),
+
+        # Auto-detected based on create() - if 'mail_message_id' was passed then this mail is a notification
+        # and during unlink() we will not cascade delete the parent and its attachments
+        'notification': fields.boolean('Is Notification')
+    }
+
+    def _get_default_from(self, cr, uid, context=None):
+        this = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        if this.alias_domain:
+            return '%s@%s' % (this.alias_name, this.alias_domain)
+        elif this.email:
+            return this.email
+        raise osv.except_osv(_('Invalid Action!'), _("Unable to send email, please configure the sender's email address or alias."))
+
+    _defaults = {
+        'state': 'outgoing',
+        'email_from': lambda self, cr, uid, ctx=None: self._get_default_from(cr, uid, ctx),
+    }
+
+    def create(self, cr, uid, values, context=None):
+        if 'notification' not in values and values.get('mail_message_id'):
+            values['notification'] = True
+        return super(mail_mail, self).create(cr, uid, values, context=context)
+
+    def unlink(self, cr, uid, ids, context=None):
+        # cascade-delete the parent message for all mails that are not created for a notification
+        ids_to_cascade = self.search(cr, uid, [('notification', '=', False), ('id', 'in', ids)])
+        parent_msg_ids = [m.mail_message_id.id for m in self.browse(cr, uid, ids_to_cascade, context=context)]
+        res = super(mail_mail, self).unlink(cr, uid, ids, context=context)
+        self.pool.get('mail.message').unlink(cr, uid, parent_msg_ids, context=context)
+        return res
+
+    def mark_outgoing(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'outgoing'}, context=context)
+
+    def cancel(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'cancel'}, context=context)
+
+    def process_email_queue(self, cr, uid, ids=None, context=None):
+        """Send immediately queued messages, committing after each
+           message is sent - this is not transactional and should
+           not be called during another transaction!
+
+           :param list ids: optional list of emails ids to send. If passed
+                            no search is performed, and these ids are used
+                            instead.
+           :param dict context: if a 'filters' key is present in context,
+                                this value will be used as an additional
+                                filter to further restrict the outgoing
+                                messages to send (by default all 'outgoing'
+                                messages are sent).
+        """
+        if context is None:
+            context = {}
+        if not ids:
+            filters = ['&', ('state', '=', 'outgoing'), ('type', '=', 'email')]
+            if 'filters' in context:
+                filters.extend(context['filters'])
+            ids = self.search(cr, uid, filters, context=context)
+        res = None
+        try:
+            # Force auto-commit - this is meant to be called by
+            # the scheduler, and we can't allow rolling back the status
+            # of previously sent emails!
+            res = self.send(cr, uid, ids, auto_commit=True, context=context)
+        except Exception:
+            _logger.exception("Failed processing mail queue")
+        return res
+
+    def _postprocess_sent_message(self, cr, uid, mail, context=None):
+        """Perform any post-processing necessary after sending ``mail``
+        successfully, including deleting it completely along with its
+        attachment if the ``auto_delete`` flag of the mail was set.
+        Overridden by subclasses for extra post-processing behaviors.
+
+        :param browse_record mail: the mail that was just sent
+        :return: True
+        """
+        if mail.auto_delete:
+            # done with SUPERUSER_ID to avoid giving large unlink access rights
+            self.unlink(cr, SUPERUSER_ID, [mail.id], context=context)
+        return True
+
+    def send_get_mail_subject(self, cr, uid, mail, force=False, partner=None, context=None):
+        """ If subject is void and record_name defined: '<Author> posted on <Resource>'
+
+            :param boolean force: force the subject replacement
+            :param browse_record mail: mail.mail browse_record
+            :param browse_record partner: specific recipient partner
+        """
+        if force or (not mail.subject and mail.model and mail.res_id):
+            return '%s posted on %s' % (mail.author_id.name, mail.record_name)
+        return mail.subject
+
+    def send_get_mail_body(self, cr, uid, mail, partner=None, context=None):
+        """ Return a specific ir_email body. The main purpose of this method
+            is to be inherited by Portal, to add a link for signing in, in
+            each notification email a partner receives.
+
+            :param browse_record mail: mail.mail browse_record
+            :param browse_record partner: specific recipient partner
+        """
+        return mail.body_html
+
+    def send_get_email_dict(self, cr, uid, mail, partner=None, context=None):
+        """ Return a dictionary for specific email values, depending on a
+            partner, or generic to the whole recipients given by mail.email_to.
+
+            :param browse_record mail: mail.mail browse_record
+            :param browse_record partner: specific recipient partner
+        """
+        body = self.send_get_mail_body(cr, uid, mail, partner=partner, context=context)
+        subject = self.send_get_mail_subject(cr, uid, mail, partner=partner, context=context)
+        body_alternative = tools.html2plaintext(body)
+        email_to = [partner.email] if partner else tools.email_split(mail.email_to)
+        return {
+            'body': body,
+            'body_alternative': body_alternative,
+            'subject': subject,
+            'email_to': email_to,
+        }
+
+    def send(self, cr, uid, ids, auto_commit=False, recipient_ids=None, context=None):
+        """ Sends the selected emails immediately, ignoring their current
+            state (mails that have already been sent should not be passed
+            unless they should actually be re-sent).
+            Emails successfully delivered are marked as 'sent', and those
+            that fail to be deliver are marked as 'exception', and the
+            corresponding error mail is output in the server logs.
+
+            :param bool auto_commit: whether to force a commit of the mail status
+                after sending each mail (meant only for scheduler processing);
+                should never be True during normal transactions (default: False)
+            :param list recipient_ids: specific list of res.partner recipients.
+                If set, one email is sent to each partner. Its is possible to
+                tune the sent email through ``send_get_mail_body`` and ``send_get_mail_subject``.
+                If not specified, one email is sent to mail_mail.email_to.
+            :return: True
+        """
+        ir_mail_server = self.pool.get('ir.mail_server')
+        for mail in self.browse(cr, uid, ids, context=context):
+            try:
+                # handle attachments
+                attachments = []
+                for attach in mail.attachment_ids:
+                    attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
+                # specific behavior to customize the send email for notified partners
+                email_list = []
+                if recipient_ids:
+                    for partner in self.pool.get('res.partner').browse(cr, uid, recipient_ids, context=context):
+                        email_list.append(self.send_get_email_dict(cr, uid, mail, partner=partner, context=context))
+                else:
+                    email_list.append(self.send_get_email_dict(cr, uid, mail, context=context))
+
+                # build an RFC2822 email.message.Message object and send it without queuing
+                for email in email_list:
+                    msg = ir_mail_server.build_email(
+                        email_from = mail.email_from,
+                        email_to = email.get('email_to'),
+                        subject = email.get('subject'),
+                        body = email.get('body'),
+                        body_alternative = email.get('body_alternative'),
+                        email_cc = tools.email_split(mail.email_cc),
+                        reply_to = mail.reply_to,
+                        attachments = attachments,
+                        message_id = mail.message_id,
+                        references = mail.references,
+                        object_id = mail.res_id and ('%s-%s' % (mail.res_id, mail.model)),
+                        subtype = 'html',
+                        subtype_alternative = 'plain')
+                    res = ir_mail_server.send_email(cr, uid, msg,
+                        mail_server_id=mail.mail_server_id.id, context=context)
+                if res:
+                    mail.write({'state': 'sent', 'message_id': res})
+                else:
+                    mail.write({'state': 'exception'})
+                mail.refresh()
+                if mail.state == 'sent':
+                    self._postprocess_sent_message(cr, uid, mail, context=context)
+            except Exception:
+                _logger.exception('failed sending mail.mail %s', mail.id)
+                mail.write({'state': 'exception'})
+
+            if auto_commit == True:
+                cr.commit()
+        return True
diff --git a/addons/mail/mail_mail_view.xml b/addons/mail/mail_mail_view.xml
new file mode 100644
index 00000000000..72d41e33a84
--- /dev/null
+++ b/addons/mail/mail_mail_view.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_mail_form">
+            <field name="name">mail.mail.form</field>
+            <field name="model">mail.mail</field>
+            <field name="arch" type="xml">
+                <form string="Email message" version="7.0">
+                    <sheet>
+                        <label for="subject" class="oe_edit_only"/>
+                        <h2><field name="subject"/></h2>
+                        <div>
+                            by <field name="author_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/>
+                            <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
+                                context="{'default_composition_mode':'reply', 'default_parent_id': active_id}" states='received,sent,exception,cancel'/>
+                        </div>
+                        <notebook colspan="4">
+                            <page string="Message Details">
+                                <group>
+                                    <group>
+                                        <field name="email_from"/>
+                                        <field name="email_to"/>
+                                        <field name="email_cc"/>
+                                        <field name="reply_to"/>
+                                    </group>
+                                    <group>
+                                        <field name="partner_ids" widget="many2many_tags"/>
+                                    </group>
+                                </group>
+                                <notebook>
+                                    <page string="Body">
+                                        <field name="body_html"/>
+                                    </page>
+                                </notebook>
+                            </page>
+                            <page string="Advanced" groups="base.group_no_one">
+                                <group>
+                                    <group>
+                                        <field name="auto_delete"/>
+                                        <field name="type"/>
+                                        <field name="state" colspan="2"/>
+                                        <field name="mail_server_id"/>
+                                        <field name="model"/>
+                                        <field name="res_id"/>
+                                    </group>
+                                    <group>
+                                        <field name="message_id"/>
+                                        <field name="references"/>
+                                    </group>
+                                </group>
+                            </page>
+                            <page string="Attachments">
+                                <field name="attachment_ids"/>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_tree">
+            <field name="name">mail.mail.tree</field>
+            <field name="model">mail.mail</field>
+            <field name="arch" type="xml">
+                <tree string="Emails" colors="grey:state in ('sent', 'cancel');blue:state=='outgoing';red:state=='exception';black:state=='received'">
+                    <field name="date"/>
+                    <field name="subject"/>
+                    <field name="author_id" string="User"/>
+                    <field name="message_id" invisible="1"/>
+                    <field name="partner_ids" invisible="1"/>
+                    <field name="model" invisible="1"/>
+                    <field name="res_id" invisible="1"/>
+                    <field name="email_from" invisible="1"/>
+                    <field name="state" invisible="1"/>
+                    <field name="type" invisible="1"/>
+                    <button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/>
+                    <button name="mark_outgoing" string="Retry" type="object" icon="gtk-redo" states='exception,cancel'/>
+                    <button name="cancel" string="Cancel" type="object" icon="terp-gtk-stop" states='outgoing'/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_search">
+            <field name="name">mail.mail.search</field>
+            <field name="model">mail.mail</field>
+            <field name="arch" type="xml">
+                <search string="Email Search">
+                    <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
+                    <field name="date"/>
+                    <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
+                    <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
+                    <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
+                    <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
+                    <separator/>
+                    <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/>
+                    <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
+                    <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
+                    <group expand="0" string="Extended Filters...">
+                        <field name="author_id"/>
+                        <field name="partner_ids"/>
+                        <field name="model"/>
+                        <field name="res_id"/>
+                    </group>
+                    <group expand="0" string="Group By...">
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
+                        <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/>
+                        <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="action_view_mail_mail" model="ir.actions.act_window">
+            <field name="name">Emails</field>
+            <field name="res_model">mail.mail</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_outgoing': 1, 'search_default_type_email': 1}</field>
+            <field name="search_view_id" ref="view_mail_search"/>
+        </record>
+
+        <!-- Add menu entry in Settings/Email -->
+        <menuitem name="Emails" id="menu_mail_mail" parent="base.menu_email" action="action_view_mail_mail" />
+    </data>
+</openerp>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 7801a9b42d9..9fd476d9d7f 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -19,27 +19,23 @@
 #
 ##############################################################################
 
-import ast
-import base64
-import dateutil.parser
-import email
 import logging
-import re
-import time
-import datetime
-from email.header import decode_header
-from email.message import Message
-
-from openerp import SUPERUSER_ID
-from osv import osv
-from osv import fields
-import pytz
-from tools import DEFAULT_SERVER_DATETIME_FORMAT
-from tools.translate import _
 import tools
 
+from email.header import decode_header
+from openerp import SUPERUSER_ID
+from openerp.osv import osv, orm, fields
+from openerp.tools import html_email_clean
+from openerp.tools.translate import _
+
 _logger = logging.getLogger(__name__)
 
+try:
+    from mako.template import Template as MakoTemplate
+except ImportError:
+    _logger.warning("payment_acquirer: mako templates not available, payment acquirer will not work!")
+
+
 """ Some tools for parsing / creating email fields """
 def decode(text):
     """Returns unicode() string conversion of the the given encoded smtp header text"""
@@ -47,633 +43,758 @@ def decode(text):
         text = decode_header(text.replace('\r', ''))
         return ''.join([tools.ustr(x[0], x[1]) for x in text])
 
-def mail_tools_to_email(text):
-    """Return a list of the email addresses found in ``text``"""
-    if not text: return []
-    return re.findall(r'([^ ,<@]+@[^> ,]+)', text)
 
-# TODO: remove that after cleaning
-def to_email(text):
-    return mail_tools_to_email(text)
+class mail_message(osv.Model):
+    """ Messages model: system notification (replacing res.log notifications),
+        comments (OpenChatter discussion) and incoming emails. """
+    _name = 'mail.message'
+    _description = 'Message'
+    _inherit = ['ir.needaction_mixin']
+    _order = 'id desc'
+    _rec_name = 'record_name'
 
-class mail_message_common(osv.TransientModel):
-    """ Common abstract class for holding the main attributes of a 
-        message object. It could be reused as parent model for any
-        database model or wizard screen that needs to hold a kind of
-        message.
-        All internal logic should be in another model while this
-        model holds the basics of a message. For example, a wizard for writing
-        emails should inherit from this class and not from mail.message."""
+    _message_read_limit = 30
+    _message_read_fields = ['id', 'parent_id', 'model', 'res_id', 'body', 'subject', 'date', 'to_read', 'email_from',
+        'type', 'vote_user_ids', 'attachment_ids', 'author_id', 'partner_ids', 'record_name', 'favorite_user_ids']
+    _message_record_name_length = 18
+    _message_read_more_limit = 1024
 
-    def get_body(self, cr, uid, ids, name, arg, context=None):
-        """ get correct body version: body_html for html messages, and
-            body_text for plain text messages
-        """
-        result = dict.fromkeys(ids, '')
-        for message in self.browse(cr, uid, ids, context=context):
-            if message.content_subtype == 'html':
-                result[message.id] = message.body_html
-            else:
-                result[message.id] = message.body_text
-        return result
-    
-    def search_body(self, cr, uid, obj, name, args, context=None):
-        # will receive:
-        #   - obj: mail.message object
-        #   - name: 'body'
-        #   - args: [('body', 'ilike', 'blah')]
-        return ['|', '&', ('content_subtype', '=', 'html'), ('body_html', args[0][1], args[0][2]), ('body_text', args[0][1], args[0][2])]
-    
-    def get_record_name(self, cr, uid, ids, name, arg, context=None):
-        result = dict.fromkeys(ids, '')
-        for message in self.browse(cr, uid, ids, context=context):
-            if not message.model or not message.res_id:
+    def _shorten_name(self, name):
+        if len(name) <= (self._message_record_name_length + 3):
+            return name
+        return name[:self._message_record_name_length] + '...'
+
+    def _get_record_name(self, cr, uid, ids, name, arg, context=None):
+        """ Return the related document name, using name_get. It is done using
+            SUPERUSER_ID, to be sure to have the record name correctly stored. """
+        # TDE note: regroup by model/ids, to have less queries to perform
+        result = dict.fromkeys(ids, False)
+        for message in self.read(cr, uid, ids, ['model', 'res_id'], context=context):
+            if not message.get('model') or not message.get('res_id'):
                 continue
-            result[message.id] = self.pool.get(message.model).name_get(cr, uid, [message.res_id], context=context)[0][1]
+            result[message['id']] = self._shorten_name(self.pool.get(message['model']).name_get(cr, SUPERUSER_ID, [message['res_id']], context=context)[0][1])
         return result
 
+    def _get_to_read(self, cr, uid, ids, name, arg, context=None):
+        """ Compute if the message is unread by the current user. """
+        res = dict((id, False) for id in ids)
+        partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        notif_obj = self.pool.get('mail.notification')
+        notif_ids = notif_obj.search(cr, uid, [
+            ('partner_id', 'in', [partner_id]),
+            ('message_id', 'in', ids),
+            ('read', '=', False),
+        ], context=context)
+        for notif in notif_obj.browse(cr, uid, notif_ids, context=context):
+            res[notif.message_id.id] = True
+        return res
+
+    def _search_to_read(self, cr, uid, obj, name, domain, context=None):
+        """ Search for messages to read by the current user. Condition is
+            inversed because we search unread message on a read column. """
+        if domain[0][2]:
+            read_cond = "(read = False OR read IS NULL)"
+        else:
+            read_cond = "read = True"
+        partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        cr.execute("SELECT message_id FROM mail_notification "\
+                        "WHERE partner_id = %%s AND %s" % read_cond,
+                    (partner_id,))
+        return [('id', 'in', [r[0] for r in cr.fetchall()])]
+
     def name_get(self, cr, uid, ids, context=None):
         # name_get may receive int id instead of an id list
         if isinstance(ids, (int, long)):
             ids = [ids]
         res = []
         for message in self.browse(cr, uid, ids, context=context):
-            name = ''
-            if message.subject:
-                name = '%s: ' % (message.subject)
-            if message.body_text:
-                name = '%s%s ' % (name, message.body_text[0:20])
-            if message.date:
-                name = '%s(%s)' % (name, message.date)
-            res.append((message.id, name))
+            name = '%s: %s' % (message.subject or '', message.body or '')
+            res.append((message.id, self._shorten_name(name.lstrip(' :'))))
         return res
 
-    _name = 'mail.message.common'
-    _rec_name = 'subject'
-    _columns = {
-        'subject': fields.char('Subject', size=512),
-        'model': fields.char('Related Document Model', size=128, select=1),
-        'res_id': fields.integer('Related Document ID', select=1),
-        'record_name': fields.function(get_record_name, type='string',
-            string='Message Record Name',
-            help="Name get of the related document."),
-        'date': fields.datetime('Date'),
-        'email_from': fields.char('From', size=128, help='Message sender, taken from user preferences.'),
-        'email_to': fields.char('To', size=256, help='Message recipients'),
-        'email_cc': fields.char('Cc', size=256, help='Carbon copy message recipients'),
-        'email_bcc': fields.char('Bcc', size=256, help='Blind carbon copy message recipients'),
-        'reply_to':fields.char('Reply-To', size=256, help='Preferred response address for the message'),
-        'headers': fields.text('Message Headers', readonly=1,
-            help="Full message headers, e.g. SMTP session headers (usually available on inbound messages only)"),
-        'message_id': fields.char('Message-Id', size=256, help='Message unique identifier', select=1, readonly=1),
-        'references': fields.text('References', help='Message references, such as identifiers of previous messages', readonly=1),
-        'content_subtype': fields.char('Message content subtype', size=32,
-            oldname="subtype", readonly=1,
-            help="Type of message, usually 'html' or 'plain', used to select "\
-                  "plain-text or rich-text contents accordingly"),
-        'body_text': fields.text('Text Contents', help="Plain-text version of the message"),
-        'body_html': fields.html('Rich-text Contents', help="Rich-text/HTML version of the message"),
-        'body': fields.function(get_body, fnct_search = search_body, type='text',
-            string='Message Content', store=True,
-            help="Content of the message. This content equals the body_text field "\
-                 "for plain-test messages, and body_html for rich-text/HTML "\
-                 "messages. This allows having one field if we want to access "\
-                 "the content matching the message content_subtype."),
-        'parent_id': fields.many2one('mail.message.common', 'Parent Message',
-            select=True, ondelete='set null',
-            help="Parent message, used for displaying as threads with hierarchy"),
-    }
-
-    _defaults = {
-        'content_subtype': 'plain',
-        'date': (lambda *a: fields.datetime.now()),
-    }
-
-class mail_message(osv.Model):
-    """Model holding messages: system notification (replacing res.log
-       notifications), comments (for OpenChatter feature) and
-       RFC2822 email messages. This model also provides facilities to
-       parse, queue and send new email messages. Type of messages
-       are differentiated using the 'type' column. """
-
-    _name = 'mail.message'
-    _inherit = 'mail.message.common'
-    _description = 'Mail Message (email, comment, notification)'
-    _order = 'date desc'
-
-    def open_document(self, cr, uid, ids, context=None):
-        """ Open the message related document. Note that only the document of
-            ids[0] will be opened.
-            TODO: how to determine the action to use ?
-        """
-        action_data = False
-        if not ids:
-            return action_data
-        msg = self.browse(cr, uid, ids[0], context=context)
-        ir_act_window = self.pool.get('ir.actions.act_window')
-        action_ids = ir_act_window.search(cr, uid, [('res_model', '=', msg.model)], context=context)
-        if action_ids:
-            action_data = ir_act_window.read(cr, uid, action_ids[0], context=context)
-            action_data.update({
-                    'domain' : "[('id', '=', %d)]" % (msg.res_id),
-                    'nodestroy': True,
-                    'context': {}
-                    })
-        return action_data
-
-    def open_attachment(self, cr, uid, ids, context=None):
-        """ Open the message related attachments.
-            TODO: how to determine the action to use ?
-        """
-        action_data = False
-        if not ids:
-            return action_data
-        action_pool = self.pool.get('ir.actions.act_window')
-        messages = self.browse(cr, uid, ids, context=context)
-        att_ids = [x.id for message in messages for x in message.attachment_ids]
-        action_ids = action_pool.search(cr, uid, [('res_model', '=', 'ir.attachment')], context=context)
-        if action_ids:
-            action_data = action_pool.read(cr, uid, action_ids[0], context=context)
-            action_data.update({
-                'domain': [('id', 'in', att_ids)],
-                'nodestroy': True
-                })
-        return action_data
-    
     _columns = {
         'type': fields.selection([
-                        ('email', 'email'),
+                        ('email', 'Email'),
                         ('comment', 'Comment'),
                         ('notification', 'System notification'),
                         ], 'Type',
             help="Message type: email for email message, notification for system "\
-                  "message, comment for other messages such as user replies"),
-        'partner_id': fields.many2one('res.partner', 'Related partner',
-            help="Deprecated field. Use partner_ids instead."),
-        'partner_ids': fields.many2many('res.partner',
-            'mail_message_res_partner_rel',
-            'message_id', 'partner_id', 'Destination partners',
-            help="When sending emails through the social network composition wizard"\
-                 "you may choose to send a copy of the mail to partners."),
-        'user_id': fields.many2one('res.users', 'Related User', readonly=1),
+                 "message, comment for other messages such as user replies"),
+        'email_from': fields.char('From',
+            help="Email address of the sender. This field is set when no matching partner is found for incoming emails."),
+        'author_id': fields.many2one('res.partner', 'Author', select=1,
+            ondelete='set null',
+            help="Author of the message. If not set, email_from may hold an email address that did not match any partner."),
+        'partner_ids': fields.many2many('res.partner', string='Recipients'),
+        'notified_partner_ids': fields.many2many('res.partner', 'mail_notification',
+            'message_id', 'partner_id', 'Notified partners',
+            help='Partners that have a notification pushing this message in their mailboxes'),
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel',
             'message_id', 'attachment_id', 'Attachments'),
-        'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing mail server', readonly=1),
-        'state': fields.selection([
-                        ('outgoing', 'Outgoing'),
-                        ('sent', 'Sent'),
-                        ('received', 'Received'),
-                        ('exception', 'Delivery Failed'),
-                        ('cancel', 'Cancelled'),
-                        ], 'Status', readonly=True),
-        'auto_delete': fields.boolean('Auto Delete',
-            help="Permanently delete this email after sending it, to save space"),
-        'original': fields.binary('Original', readonly=1,
-            help="Original version of the message, as it was sent on the network"),
-        'parent_id': fields.many2one('mail.message', 'Parent Message',
-            select=True, ondelete='set null',
-            help="Parent message, used for displaying as threads with hierarchy"),
+        'parent_id': fields.many2one('mail.message', 'Parent Message', select=True,
+            ondelete='set null', help="Initial thread message."),
         'child_ids': fields.one2many('mail.message', 'parent_id', 'Child Messages'),
+        'model': fields.char('Related Document Model', size=128, select=1),
+        'res_id': fields.integer('Related Document ID', select=1),
+        'record_name': fields.function(_get_record_name, type='char',
+            store=True, string='Message Record Name',
+            help="Name get of the related document."),
+        'notification_ids': fields.one2many('mail.notification', 'message_id',
+            string='Notifications',
+            help='Technical field holding the message notifications. Use notified_partner_ids to access notified partners.'),
+        'subject': fields.char('Subject'),
+        'date': fields.datetime('Date'),
+        'message_id': fields.char('Message-Id', help='Message unique identifier', select=1, readonly=1),
+        'body': fields.html('Contents', help='Automatically sanitized HTML contents'),
+        'to_read': fields.function(_get_to_read, fnct_search=_search_to_read,
+            type='boolean', string='To read',
+            help='Functional field to search for messages the current user has to read'),
+        'subtype_id': fields.many2one('mail.message.subtype', 'Subtype',
+            ondelete='set null', select=1,),
+        'vote_user_ids': fields.many2many('res.users', 'mail_vote',
+            'message_id', 'user_id', string='Votes',
+            help='Users that voted for this message'),
+        'favorite_user_ids': fields.many2many('res.users', 'mail_favorite',
+            'message_id', 'user_id', string='Favorite',
+            help='Users that set this message in their favorites'),
     }
-        
+
+    def _needaction_domain_get(self, cr, uid, context=None):
+        if self._needaction:
+            return [('to_read', '=', True)]
+        return []
+
+    def _get_default_author(self, cr, uid, context=None):
+        return self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+
     _defaults = {
         'type': 'email',
-        'state': 'received',
+        'date': lambda *a: fields.datetime.now(),
+        'author_id': lambda self, cr, uid, ctx={}: self._get_default_author(cr, uid, ctx),
+        'body': '',
     }
-    
+
     #------------------------------------------------------
-    # Email api
+    # Vote/Like
     #------------------------------------------------------
-    
+
+    def vote_toggle(self, cr, uid, ids, context=None):
+        ''' Toggles vote. Performed using read to avoid access rights issues.
+            Done as SUPERUSER_ID because uid may vote for a message he cannot modify. '''
+        for message in self.read(cr, uid, ids, ['vote_user_ids'], context=context):
+            new_has_voted = not (uid in message.get('vote_user_ids'))
+            if new_has_voted:
+                self.write(cr, SUPERUSER_ID, message.get('id'), {'vote_user_ids': [(4, uid)]}, context=context)
+            else:
+                self.write(cr, SUPERUSER_ID, message.get('id'), {'vote_user_ids': [(3, uid)]}, context=context)
+        return new_has_voted or False
+
+    #------------------------------------------------------
+    # Favorite
+    #------------------------------------------------------
+
+    def favorite_toggle(self, cr, uid, ids, context=None):
+        ''' Toggles favorite. Performed using read to avoid access rights issues.
+            Done as SUPERUSER_ID because uid may star a message he cannot modify. '''
+        for message in self.read(cr, uid, ids, ['favorite_user_ids'], context=context):
+            new_is_favorite = not (uid in message.get('favorite_user_ids'))
+            if new_is_favorite:
+                self.write(cr, SUPERUSER_ID, message.get('id'), {'favorite_user_ids': [(4, uid)]}, context=context)
+            else:
+                self.write(cr, SUPERUSER_ID, message.get('id'), {'favorite_user_ids': [(3, uid)]}, context=context)
+        return new_is_favorite or False
+
+    #------------------------------------------------------
+    # Message loading for web interface
+    #------------------------------------------------------
+
+    def _message_read_dict_postprocess(self, cr, uid, messages, message_tree, context=None):
+        """ Post-processing on values given by message_read. This method will
+            handle partners in batch to avoid doing numerous queries.
+
+            :param list messages: list of message, as get_dict result
+            :param dict message_tree: {[msg.id]: msg browse record}
+        """
+        res_partner_obj = self.pool.get('res.partner')
+        ir_attachment_obj = self.pool.get('ir.attachment')
+        pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=None)['partner_id'][0]
+
+        # 1. Aggregate partners (author_id and partner_ids) and attachments
+        partner_ids = set()
+        attachment_ids = set()
+        for key, message in message_tree.iteritems():
+            if message.author_id:
+                partner_ids |= set([message.author_id.id])
+            if message.partner_ids:
+                partner_ids |= set([partner.id for partner in message.partner_ids])
+            if message.attachment_ids:
+                attachment_ids |= set([attachment.id for attachment in message.attachment_ids])
+
+        # Filter author_ids uid can see
+        # partner_ids = self.pool.get('res.partner').search(cr, uid, [('id', 'in', partner_ids)], context=context)
+        partners = res_partner_obj.name_get(cr, uid, list(partner_ids), context=context)
+        partner_tree = dict((partner[0], partner) for partner in partners)
+
+        # 2. Attachments
+        attachments = ir_attachment_obj.read(cr, uid, list(attachment_ids), ['id', 'datas_fname'], context=context)
+        attachments_tree = dict((attachment['id'], {'id': attachment['id'], 'filename': attachment['datas_fname']}) for attachment in attachments)
+
+        # 3. Update message dictionaries
+        for message_dict in messages:
+            message_id = message_dict.get('id')
+            message = message_tree[message_id]
+            if message.author_id:
+                author = partner_tree[message.author_id.id]
+            else:
+                author = (0, message.email_from)
+            partner_ids = []
+            for partner in message.partner_ids:
+                if partner.id in partner_tree:
+                    partner_ids.append(partner_tree[partner.id])
+            attachment_ids = []
+            for attachment in message.attachment_ids:
+                if attachment.id in attachments_tree:
+                    attachment_ids.append(attachments_tree[attachment.id])
+            message_dict.update({
+                'is_author': pid == author[0],
+                'author_id': author,
+                'partner_ids': partner_ids,
+                'attachment_ids': attachment_ids,
+                })
+        return True
+
+    def _message_read_dict(self, cr, uid, message, parent_id=False, context=None):
+        """ Return a dict representation of the message. This representation is
+            used in the JS client code, to display the messages. Partners and
+            attachments related stuff will be done in post-processing in batch.
+
+            :param dict message: mail.message browse record
+        """
+        # private message: no model, no res_id
+        is_private = False
+        if not message.model or not message.res_id:
+            is_private = True
+        # votes and favorites: res.users ids, no prefetching should be done
+        vote_nb = len(message.vote_user_ids)
+        has_voted = uid in [user.id for user in message.vote_user_ids]
+        is_favorite = uid in [user.id for user in message.favorite_user_ids]
+
+        return {'id': message.id,
+                'type': message.type,
+                'body': html_email_clean(message.body),
+                'model': message.model,
+                'res_id': message.res_id,
+                'record_name': message.record_name,
+                'subject': message.subject,
+                'date': message.date,
+                'to_read': message.to_read,
+                'parent_id': parent_id,
+                'is_private': is_private,
+                'author_id': False,
+                'is_author': False,
+                'partner_ids': [],
+                'vote_nb': vote_nb,
+                'has_voted': has_voted,
+                'is_favorite': is_favorite,
+                'attachment_ids': [],
+            }
+
+    def _message_read_add_expandables(self, cr, uid, messages, message_tree, parent_tree,
+            message_unload_ids=[], thread_level=0, domain=[], parent_id=False, context=None):
+        """ Create expandables for message_read, to load new messages.
+            1. get the expandable for new threads
+                if display is flat (thread_level == 0):
+                    fetch message_ids < min(already displayed ids), because we
+                    want a flat display, ordered by id
+                else:
+                    fetch message_ids that are not childs of already displayed
+                    messages
+            2. get the expandables for new messages inside threads if display
+               is not flat
+                for each thread header, search for its childs
+                    for each hole in the child list based on message displayed,
+                    create an expandable
+
+            :param list messages: list of message structure for the Chatter
+                widget to which expandables are added
+            :param dict message_tree: dict [id]: browse record of this message
+            :param dict parent_tree: dict [parent_id]: [child_ids]
+            :param list message_unload_ids: list of message_ids we do not want
+                to load
+            :return bool: True
+        """
+        def _get_expandable(domain, message_nb, parent_id, max_limit):
+            return {
+                'domain': domain,
+                'nb_messages': message_nb,
+                'type': 'expandable',
+                'parent_id': parent_id,
+                'max_limit':  max_limit,
+            }
+
+        if not messages:
+            return True
+        message_ids = sorted(message_tree.keys())
+
+        # 1. get the expandable for new threads
+        if thread_level == 0:
+            exp_domain = domain + [('id', '<', min(message_unload_ids + message_ids))]
+        else:
+            exp_domain = domain + ['!', ('id', 'child_of', message_unload_ids + parent_tree.keys())]
+        ids = self.search(cr, uid, exp_domain, context=context, limit=1)
+        if ids:
+            # inside a thread: prepend
+            if parent_id:
+                messages.insert(0, _get_expandable(exp_domain, -1, parent_id, True))
+            # new threads: append
+            else:
+                messages.append(_get_expandable(exp_domain, -1, parent_id, True))
+
+        # 2. get the expandables for new messages inside threads if display is not flat
+        if thread_level == 0:
+            return True
+        for message_id in message_ids:
+            message = message_tree[message_id]
+
+            # generate only for thread header messages (TDE note: parent_id may be False is uid cannot see parent_id, seems ok)
+            if message.parent_id:
+                continue
+
+            # check there are message for expandable
+            child_ids = set([child.id for child in message.child_ids]) - set(message_unload_ids)
+            child_ids = sorted(list(child_ids), reverse=True)
+            if not child_ids:
+                continue
+
+            # make groups of unread messages
+            id_min, id_max, nb = max(child_ids), 0, 0
+            for child_id in child_ids:
+                if not child_id in message_ids:
+                    nb += 1
+                    if id_min > child_id:
+                        id_min = child_id
+                    if id_max < child_id:
+                        id_max = child_id
+                elif nb > 0:
+                    exp_domain = [('id', '>=', id_min), ('id', '<=', id_max), ('id', 'child_of', message_id)]
+                    messages.append(_get_expandable(exp_domain, nb, message_id, False))
+                    id_min, id_max, nb = max(child_ids), 0, 0
+                else:
+                    id_min, id_max, nb = max(child_ids), 0, 0
+            if nb > 0:
+                exp_domain = [('id', '>=', id_min), ('id', '<=', id_max), ('id', 'child_of', message_id)]
+                idx = [msg.get('id') for msg in messages].index(message_id) + 1
+                # messages.append(_get_expandable(exp_domain, nb, message_id, id_min))
+                messages.insert(idx, _get_expandable(exp_domain, nb, message_id, False))
+
+        return True
+
+    def message_read(self, cr, uid, ids=None, domain=None, message_unload_ids=None,
+                        thread_level=0, context=None, parent_id=False, limit=None):
+        """ Read messages from mail.message, and get back a list of structured
+            messages to be displayed as discussion threads. If IDs is set,
+            fetch these records. Otherwise use the domain to fetch messages.
+            After having fetch messages, their ancestors will be added to obtain
+            well formed threads, if uid has access to them.
+
+            After reading the messages, expandable messages are added in the
+            message list (see ``_message_read_add_expandables``). It consists
+            in messages holding the 'read more' data: number of messages to
+            read, domain to apply.
+
+            :param list ids: optional IDs to fetch
+            :param list domain: optional domain for searching ids if ids not set
+            :param list message_unload_ids: optional ids we do not want to fetch,
+                because i.e. they are already displayed somewhere
+            :param int parent_id: context of parent_id
+                - if parent_id reached when adding ancestors, stop going further
+                  in the ancestor search
+                - if set in flat mode, ancestor_id is set to parent_id
+            :param int limit: number of messages to fetch, before adding the
+                ancestors and expandables
+            :return list: list of message structure for the Chatter widget
+        """
+        assert thread_level in [0, 1], 'message_read() thread_level should be 0 (flat) or 1 (1 level of thread); given %s.' % thread_level
+        domain = domain if domain is not None else []
+        message_unload_ids = message_unload_ids if message_unload_ids is not None else []
+        if message_unload_ids:
+            domain += [('id', 'not in', message_unload_ids)]
+        limit = limit or self._message_read_limit
+        message_tree = {}
+        message_list = []
+        parent_tree = {}
+
+        # no specific IDS given: fetch messages according to the domain, add their parents if uid has access to
+        if ids is None:
+            ids = self.search(cr, uid, domain, context=context, limit=limit)
+
+        # fetch parent if threaded, sort messages
+        for message in self.browse(cr, uid, ids, context=context):
+            message_id = message.id
+            if message_id in message_tree:
+                continue
+            message_tree[message_id] = message
+
+            # find parent_id
+            if thread_level == 0:
+                tree_parent_id = parent_id
+            else:
+                tree_parent_id = message_id
+                parent = message
+                while parent.parent_id and parent.parent_id.id != parent_id:
+                    parent = parent.parent_id
+                    tree_parent_id = parent.id
+                if not parent.id in message_tree:
+                    message_tree[parent.id] = parent
+            # newest messages first
+            parent_tree.setdefault(tree_parent_id, [])
+            if tree_parent_id != message_id:
+                parent_tree[tree_parent_id].append(self._message_read_dict(cr, uid, message_tree[message_id], parent_id=tree_parent_id, context=context))
+
+        if thread_level:
+            for key, message_id_list in parent_tree.iteritems():
+                message_id_list.sort(key=lambda item: item['id'])
+                message_id_list.insert(0, self._message_read_dict(cr, uid, message_tree[key], context=context))
+
+        parent_list = parent_tree.items()
+        parent_list = sorted(parent_list, key=lambda item: max([msg.get('id') for msg in item[1]]) if item[1] else item[0], reverse=True)
+        message_list = [message for (key, msg_list) in parent_list for message in msg_list]
+
+        # get the child expandable messages for the tree
+        self._message_read_dict_postprocess(cr, uid, message_list, message_tree, context=context)
+        self._message_read_add_expandables(cr, uid, message_list, message_tree, parent_tree,
+            thread_level=thread_level, message_unload_ids=message_unload_ids, domain=domain, parent_id=parent_id, context=context)
+        return message_list
+
+    # TDE Note: do we need this ?
+    # def user_free_attachment(self, cr, uid, context=None):
+    #     attachment = self.pool.get('ir.attachment')
+    #     attachment_list = []
+    #     attachment_ids = attachment.search(cr, uid, [('res_model', '=', 'mail.message'), ('create_uid', '=', uid)])
+    #     if len(attachment_ids):
+    #         attachment_list = [{'id': attach.id, 'name': attach.name, 'date': attach.create_date} for attach in attachment.browse(cr, uid, attachment_ids, context=context)]
+    #     return attachment_list
+
+    #------------------------------------------------------
+    # mail_message internals
+    #------------------------------------------------------
+
     def init(self, cr):
         cr.execute("""SELECT indexname FROM pg_indexes WHERE indexname = 'mail_message_model_res_id_idx'""")
         if not cr.fetchone():
             cr.execute("""CREATE INDEX mail_message_model_res_id_idx ON mail_message (model, res_id)""")
 
-    def check(self, cr, uid, ids, mode, context=None, values=None):
-        """Restricts the access to a mail.message, according to referred model
+    def _search(self, cr, uid, args, offset=0, limit=None, order=None,
+        context=None, count=False, access_rights_uid=None):
+        """ Override that adds specific access rights of mail.message, to remove
+            ids uid could not see according to our custom rules. Please refer
+            to check_access_rule for more details about those rules.
+
+            After having received ids of a classic search, keep only:
+            - if author_id == pid, uid is the author, OR
+            - a notification (id, pid) exists, uid has been notified, OR
+            - uid have read access to the related document is model, res_id
+            - otherwise: remove the id
         """
-        if not ids:
+        # Rules do not apply to administrator
+        if uid == SUPERUSER_ID:
+            return super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
+                context=context, count=count, access_rights_uid=access_rights_uid)
+        # Perform a super with count as False, to have the ids, not a counter
+        ids = super(mail_message, self)._search(cr, uid, args, offset=offset, limit=limit, order=order,
+            context=context, count=False, access_rights_uid=access_rights_uid)
+        if not ids and count:
+            return 0
+        elif not ids:
+            return ids
+
+        pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'])['partner_id'][0]
+        author_ids, partner_ids, allowed_ids = set([]), set([]), set([])
+        model_ids = {}
+
+        messages = super(mail_message, self).read(cr, uid, ids, ['author_id', 'model', 'res_id', 'notified_partner_ids'], context=context)
+        for message in messages:
+            if message.get('author_id') and message.get('author_id')[0] == pid:
+                author_ids.add(message.get('id'))
+            elif pid in message.get('notified_partner_ids'):
+                partner_ids.add(message.get('id'))
+            elif message.get('model') and message.get('res_id'):
+                model_ids.setdefault(message.get('model'), {}).setdefault(message.get('res_id'), set()).add(message.get('id'))
+
+        model_access_obj = self.pool.get('ir.model.access')
+        for doc_model, doc_dict in model_ids.iteritems():
+            if not model_access_obj.check(cr, uid, doc_model, 'read', False):
+                continue
+            doc_ids = doc_dict.keys()
+            allowed_doc_ids = self.pool.get(doc_model).search(cr, uid, [('id', 'in', doc_ids)], context=context)
+            allowed_ids |= set([message_id for allowed_doc_id in allowed_doc_ids for message_id in doc_dict[allowed_doc_id]])
+
+        final_ids = author_ids | partner_ids | allowed_ids
+        if count:
+            return len(final_ids)
+        else:
+            return list(final_ids)
+
+    def check_access_rule(self, cr, uid, ids, operation, context=None):
+        """ Access rules of mail.message:
+            - read: if
+                - author_id == pid, uid is the author, OR
+                - mail_notification (id, pid) exists, uid has been notified, OR
+                - uid have read access to the related document if model, res_id
+                - otherwise: raise
+            - create: if
+                - no model, no res_id, I create a private message
+                - pid in message_follower_ids if model, res_id OR
+                - uid have write access on the related document if model, res_id, OR
+                - otherwise: raise
+            - write: if
+                - uid has write access on the related document if model, res_id
+                - Otherwise: raise
+            - unlink: if
+                - uid has write access on the related document if model, res_id
+                - Otherwise: raise
+        """
+        if uid == SUPERUSER_ID:
             return
-        res_ids = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
-        cr.execute('SELECT DISTINCT model, res_id FROM mail_message WHERE id = ANY (%s)', (ids,))
-        for rmod, rid in cr.fetchall():
-            if not (rmod and rid):
-                continue
-            res_ids.setdefault(rmod,set()).add(rid)
-        if values:
-            if 'res_model' in values and 'res_id' in values:
-                res_ids.setdefault(values['res_model'],set()).add(values['res_id'])
+        partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=None)['partner_id'][0]
+
+        # Read mail_message.ids to have their values
+        message_values = dict.fromkeys(ids)
+        model_record_ids = {}
+        cr.execute('SELECT DISTINCT id, model, res_id, author_id FROM "%s" WHERE id = ANY (%%s)' % self._table, (ids,))
+        for id, rmod, rid, author_id in cr.fetchall():
+            message_values[id] = {'res_model': rmod, 'res_id': rid, 'author_id': author_id}
+            if rmod:
+                model_record_ids.setdefault(rmod, dict()).setdefault(rid, set()).add(id)
+
+        # Author condition, for read and create (private message) -> could become an ir.rule, but not till we do not have a many2one variable field
+        if operation == 'read':
+            author_ids = [mid for mid, message in message_values.iteritems()
+                if message.get('author_id') and message.get('author_id') == partner_id]
+        elif operation == 'create':
+            author_ids = [mid for mid, message in message_values.iteritems()
+                if not message.get('model') and not message.get('res_id')]
+        else:
+            author_ids = []
+
+        # Notification condition, for read (check for received notifications and create (in message_follower_ids)) -> could become an ir.rule, but not till we do not have a many2one variable field
+        if operation == 'read':
+            not_obj = self.pool.get('mail.notification')
+            not_ids = not_obj.search(cr, SUPERUSER_ID, [
+                ('partner_id', '=', partner_id),
+                ('message_id', 'in', ids),
+            ], context=context)
+            notified_ids = [notification.message_id.id for notification in not_obj.browse(cr, SUPERUSER_ID, not_ids, context=context)]
+        elif operation == 'create':
+            notified_ids = []
+            for doc_model, doc_dict in model_record_ids.items():
+                fol_obj = self.pool.get('mail.followers')
+                fol_ids = fol_obj.search(cr, SUPERUSER_ID, [
+                    ('res_model', '=', doc_model),
+                    ('res_id', 'in', list(doc_dict.keys())),
+                    ('partner_id', '=', partner_id),
+                    ], context=context)
+                fol_mids = [follower.res_id for follower in fol_obj.browse(cr, SUPERUSER_ID, fol_ids, context=context)]
+                notified_ids += [mid for mid, message in message_values.iteritems()
+                    if message.get('res_model') == doc_model and message.get('res_id') in fol_mids]
+        else:
+            notified_ids = []
+
+        # Calculate remaining ids, and related model/res_ids
+        model_record_ids = {}
+        other_ids = set(ids).difference(set(author_ids), set(notified_ids))
+        for id in other_ids:
+            if message_values[id]['res_model']:
+                model_record_ids.setdefault(message_values[id]['res_model'], set()).add(message_values[id]['res_id'])
+
+        # CRUD: Access rights related to the document
+        document_related_ids = []
+        for model, mids in model_record_ids.items():
+            model_obj = self.pool.get(model)
+            mids = model_obj.exists(cr, uid, mids)
+            if operation in ['create', 'write', 'unlink']:
+                model_obj.check_access_rights(cr, uid, 'write')
+                model_obj.check_access_rule(cr, uid, mids, 'write', context=context)
+            else:
+                model_obj.check_access_rights(cr, uid, operation)
+                model_obj.check_access_rule(cr, uid, mids, operation, context=context)
+            document_related_ids += [mid for mid, message in message_values.iteritems()
+                if message.get('res_model') == model and message.get('res_id') in mids]
+
+        # Calculate remaining ids: if not void, raise an error
+        other_ids = other_ids - set(document_related_ids)
+        if not other_ids:
+            return
+        raise orm.except_orm(_('Access Denied'),
+                            _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \
+                            (self._description, operation))
 
-        ima_obj = self.pool.get('ir.model.access')
-        for model, mids in res_ids.items():
-            # ignore mail messages that are not attached to a resource anymore when checking access rights
-            # (resource was deleted but message was not)
-            mids = self.pool.get(model).exists(cr, uid, mids)
-            ima_obj.check(cr, uid, model, mode)
-            self.pool.get(model).check_access_rule(cr, uid, mids, mode, context=context)
-    
     def create(self, cr, uid, values, context=None):
-        self.check(cr, uid, [], mode='create', context=context, values=values)
-        return super(mail_message, self).create(cr, uid, values, context)
+        if not values.get('message_id') and values.get('res_id') and values.get('model'):
+            values['message_id'] = tools.generate_tracking_message_id('%(res_id)s-%(model)s' % values)
+        elif not values.get('message_id'):
+            values['message_id'] = tools.generate_tracking_message_id('private')
+        newid = super(mail_message, self).create(cr, uid, values, context)
+        self._notify(cr, SUPERUSER_ID, newid, context=context)
+        return newid
 
-    def read(self, cr, uid, ids, fields_to_read=None, context=None, load='_classic_read'):
-        self.check(cr, uid, ids, 'read', context=context)
-        return super(mail_message, self).read(cr, uid, ids, fields_to_read, context, load)
-
-    def copy(self, cr, uid, id, default=None, context=None):
-        """Overridden to avoid duplicating fields that are unique to each email"""
-        if default is None:
-            default = {}
-        self.check(cr, uid, [id], 'read', context=context)
-        default.update(message_id=False, original=False, headers=False)
-        return super(mail_message,self).copy(cr, uid, id, default=default, context=context)
-    
-    def write(self, cr, uid, ids, vals, context=None):
-        self.check(cr, uid, ids, 'write', context=context, values=vals)
-        return super(mail_message, self).write(cr, uid, ids, vals, context)
-
-    def unlink(self, cr, uid, ids, context=None):
-        self.check(cr, uid, ids, 'unlink', context=context)
-        return super(mail_message, self).unlink(cr, uid, ids, context)
-
-    def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, type='email',
-                             email_cc=None, email_bcc=None, reply_to=False, partner_ids=None, attachments=None,
-                             message_id=False, references=False, res_id=False, content_subtype='plain',
-                             headers=None, mail_server_id=False, auto_delete=False, context=None):
-        """ Schedule sending a new email message, to be sent the next time the
-            mail scheduler runs, or the next time :meth:`process_email_queue` is
-            called explicitly.
-
-            :param string email_from: sender email address
-            :param list email_to: list of recipient addresses (to be joined with commas) 
-            :param string subject: email subject (no pre-encoding/quoting necessary)
-            :param string body: email body, according to the ``content_subtype`` 
-                (by default, plaintext). If html content_subtype is used, the
-                message will be automatically converted to plaintext and wrapped
-                in multipart/alternative.
-            :param list email_cc: optional list of string values for CC header
-                (to be joined with commas)
-            :param list email_bcc: optional list of string values for BCC header
-                (to be joined with commas)
-            :param string model: optional model name of the document this mail
-                is related to (this will also be used to generate a tracking id,
-                used to match any response related to the same document)
-            :param int res_id: optional resource identifier this mail is related
-                to (this will also be used to generate a tracking id, used to
-                match any response related to the same document)
-            :param string reply_to: optional value of Reply-To header
-            :param partner_ids: destination partner_ids
-            :param string content_subtype: optional mime content_subtype for
-                the text body (usually 'plain' or 'html'), must match the format
-                of the ``body`` parameter. Default is 'plain', making the content
-                part of the mail "text/plain".
-            :param dict attachments: map of filename to filecontents, where
-                filecontents is a string containing the bytes of the attachment
-            :param dict headers: optional map of headers to set on the outgoing
-                mail (may override the other headers, including Subject,
-                Reply-To, Message-Id, etc.)
-            :param int mail_server_id: optional id of the preferred outgoing
-                mail server for this mail
-            :param bool auto_delete: optional flag to turn on auto-deletion of
-                the message after it has been successfully sent (default to False)
-        """
-        if context is None:
-            context = {}
-        if attachments is None:
-            attachments = {}
-        if partner_ids is None:
-            partner_ids = []
-        attachment_obj = self.pool.get('ir.attachment')
-        for param in (email_to, email_cc, email_bcc):
-            if param and not isinstance(param, list):
-                param = [param]
-        msg_vals = {
-                'subject': subject,
-                'date': fields.datetime.now(),
-                'user_id': uid,
-                'model': model,
-                'res_id': res_id,
-                'type': type,
-                'body_text': body if content_subtype != 'html' else False,
-                'body_html': body if content_subtype == 'html' else False,
-                'email_from': email_from,
-                'email_to': email_to and ','.join(email_to) or '',
-                'email_cc': email_cc and ','.join(email_cc) or '',
-                'email_bcc': email_bcc and ','.join(email_bcc) or '',
-                'partner_ids': partner_ids,
-                'reply_to': reply_to,
-                'message_id': message_id,
-                'references': references,
-                'content_subtype': content_subtype,
-                'headers': headers, # serialize the dict on the fly
-                'mail_server_id': mail_server_id,
-                'state': 'outgoing',
-                'auto_delete': auto_delete
-            }
-        email_msg_id = self.create(cr, uid, msg_vals, context)
-        attachment_ids = []
-        for attachment in attachments:
-            fname, fcontent = attachment
-            attachment_data = {
-                    'name': fname,
-                    'datas_fname': fname,
-                    'datas': fcontent and fcontent.encode('base64'),
-                    'res_model': self._name,
-                    'res_id': email_msg_id,
-            }
-            if context.has_key('default_type'):
-                del context['default_type']
-            attachment_ids.append(attachment_obj.create(cr, uid, attachment_data, context))
-        if attachment_ids:
-            self.write(cr, uid, email_msg_id, { 'attachment_ids': [(6, 0, attachment_ids)]}, context=context)
-        return email_msg_id
-
-    def mark_outgoing(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'outgoing'}, context=context)
-
-    def cancel(self, cr, uid, ids, context=None):
-        return self.write(cr, uid, ids, {'state':'cancel'}, context=context)
-
-    def process_email_queue(self, cr, uid, ids=None, context=None):
-        """Send immediately queued messages, committing after each
-           message is sent - this is not transactional and should
-           not be called during another transaction!
-
-           :param list ids: optional list of emails ids to send. If passed
-                            no search is performed, and these ids are used
-                            instead.
-           :param dict context: if a 'filters' key is present in context,
-                                this value will be used as an additional
-                                filter to further restrict the outgoing
-                                messages to send (by default all 'outgoing'
-                                messages are sent).
-        """
-        if context is None:
-            context = {}
-        if not ids:
-            filters = ['&', ('state', '=', 'outgoing'), ('type', '=', 'email')]
-            if 'filters' in context:
-                filters.extend(context['filters'])
-            ids = self.search(cr, uid, filters, context=context)
-        res = None
-        try:
-            # Force auto-commit - this is meant to be called by
-            # the scheduler, and we can't allow rolling back the status
-            # of previously sent emails!
-            res = self.send(cr, uid, ids, auto_commit=True, context=context)
-        except Exception:
-            _logger.exception("Failed processing mail queue")
+    def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'):
+        """ Override to explicitely call check_access_rule, that is not called
+            by the ORM. It instead directly fetches ir.rules and apply them. """
+        self.check_access_rule(cr, uid, ids, 'read', context=context)
+        res = super(mail_message, self).read(cr, uid, ids, fields=fields, context=context, load=load)
         return res
 
-    def parse_message(self, message, save_original=False, context=None):
-        """Parses a string or email.message.Message representing an
-           RFC-2822 email, and returns a generic dict holding the
-           message details.
-
-           :param message: the message to parse
-           :type message: email.message.Message | string | unicode
-           :param bool save_original: whether the returned dict
-               should include an ``original`` entry with the base64
-               encoded source of the message.
-           :rtype: dict
-           :return: A dict with the following structure, where each
-                    field may not be present if missing in original
-                    message::
-
-                    { 'message-id': msg_id,
-                      'subject': subject,
-                      'from': from,
-                      'to': to,
-                      'cc': cc,
-                      'headers' : { 'X-Mailer': mailer,
-                                    #.. all X- headers...
-                                  },
-                      'content_subtype': msg_mime_subtype,
-                      'body_text': plaintext_body
-                      'body_html': html_body,
-                      'attachments': [('file1', 'bytes'),
-                                       ('file2', 'bytes') }
-                       # ...
-                       'original': source_of_email,
-                    }
-        """
-        msg_txt = message
-        if isinstance(message, str):
-            msg_txt = email.message_from_string(message)
-
-        # Warning: message_from_string doesn't always work correctly on unicode,
-        # we must use utf-8 strings here :-(
-        if isinstance(message, unicode):
-            message = message.encode('utf-8')
-            msg_txt = email.message_from_string(message)
-
-        message_id = msg_txt.get('message-id', False)
-        msg = {}
-
-        if save_original:
-            # save original, we need to be able to read the original email sometimes
-            msg['original'] = message.as_string() if isinstance(message, Message) \
-                                                  else message
-            msg['original'] = base64.b64encode(msg['original']) # binary fields are b64
-
-        if not message_id:
-            # Very unusual situation, be we should be fault-tolerant here
-            message_id = time.time()
-            msg_txt['message-id'] = message_id
-            _logger.info('Parsing Message without message-id, generating a random one: %s', message_id)
-
-        msg_fields = msg_txt.keys()
-        msg['id'] = message_id
-        msg['message-id'] = message_id
-
-        if 'Subject' in msg_fields:
-            msg['subject'] = decode(msg_txt.get('Subject'))
-
-        if 'Content-Type' in msg_fields:
-            msg['content-type'] = msg_txt.get('Content-Type')
-
-        if 'From' in msg_fields:
-            msg['from'] = decode(msg_txt.get('From') or msg_txt.get_unixfrom())
-
-        if 'To' in msg_fields:
-            msg['to'] = decode(msg_txt.get('To'))
-
-        if 'Delivered-To' in msg_fields:
-            msg['to'] = decode(msg_txt.get('Delivered-To'))
-
-        if 'CC' in msg_fields:
-            msg['cc'] = decode(msg_txt.get('CC'))
-
-        if 'Cc' in msg_fields:
-            msg['cc'] = decode(msg_txt.get('Cc'))
-
-        if 'Reply-To' in msg_fields:
-            msg['reply'] = decode(msg_txt.get('Reply-To'))
-
-        if 'Date' in msg_fields:
-            date_hdr = decode(msg_txt.get('Date'))
-            # convert from email timezone to server timezone
-            date_server_datetime = dateutil.parser.parse(date_hdr).astimezone(pytz.timezone(tools.get_server_timezone()))
-            date_server_datetime_str = date_server_datetime.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
-            msg['date'] = date_server_datetime_str
-
-        if 'Content-Transfer-Encoding' in msg_fields:
-            msg['encoding'] = msg_txt.get('Content-Transfer-Encoding')
-
-        if 'References' in msg_fields:
-            msg['references'] = msg_txt.get('References')
-
-        if 'In-Reply-To' in msg_fields:
-            msg['in-reply-to'] = msg_txt.get('In-Reply-To')
-
-        msg['headers'] = {}
-        msg['content_subtype'] = 'plain'
-        for item in msg_txt.items():
-            if item[0].startswith('X-'):
-                msg['headers'].update({item[0]: item[1]})
-        if not msg_txt.is_multipart() or 'text/plain' in msg.get('content-type', ''):
-            encoding = msg_txt.get_content_charset()
-            body = msg_txt.get_payload(decode=True)
-            if 'text/html' in msg.get('content-type', ''):
-                msg['body_html'] =  body
-                msg['content_subtype'] = 'html'
-                if body:
-                    body = tools.html2plaintext(body)
-            msg['body_text'] = tools.ustr(body, encoding)
-
-        attachments = []
-        if msg_txt.is_multipart() or 'multipart/alternative' in msg.get('content-type', ''):
-            body = ""
-            if 'multipart/alternative' in msg.get('content-type', ''):
-                msg['content_subtype'] = 'alternative'
-            else:
-                msg['content_subtype'] = 'mixed'
-            for part in msg_txt.walk():
-                if part.get_content_maintype() == 'multipart':
-                    continue
-
-                encoding = part.get_content_charset()
-                filename = part.get_filename()
-                if part.get_content_maintype()=='text':
-                    content = part.get_payload(decode=True)
-                    if filename:
-                        attachments.append((filename, content))
-                    content = tools.ustr(content, encoding)
-                    if part.get_content_subtype() == 'html':
-                        msg['body_html'] = content
-                        msg['content_subtype'] = 'html' # html version prevails
-                        body = tools.ustr(tools.html2plaintext(content))
-                        body = body.replace('&#13;', '')
-                    elif part.get_content_subtype() == 'plain':
-                        body = content
-                elif part.get_content_maintype() in ('application', 'image'):
-                    if filename :
-                        attachments.append((filename,part.get_payload(decode=True)))
-                    else:
-                        res = part.get_payload(decode=True)
-                        body += tools.ustr(res, encoding)
-
-            msg['body_text'] = body
-        msg['attachments'] = attachments
-
-        # for backwards compatibility:
-        msg['body'] = msg['body_text']
-        msg['sub_type'] = msg['content_subtype'] or 'plain'
-        return msg
-
-    def _postprocess_sent_message(self, cr, uid, message, context=None):
-        """Perform any post-processing necessary after sending ``message``
-        successfully, including deleting it completely along with its
-        attachment if the ``auto_delete`` flag of the message was set.
-        Overridden by subclasses for extra post-processing behaviors. 
-
-        :param browse_record message: the message that was just sent
-        :return: True
-        """
-        if message.auto_delete:
-            self.pool.get('ir.attachment').unlink(cr, uid,
-                [x.id for x in message.attachment_ids
-                    if x.res_model == self._name and x.res_id == message.id],
-                context=context)
-            message.unlink()
-        return True
-
-    def send(self, cr, uid, ids, auto_commit=False, context=None):
-        """Sends the selected emails immediately, ignoring their current
-           state (mails that have already been sent should not be passed
-           unless they should actually be re-sent).
-           Emails successfully delivered are marked as 'sent', and those
-           that fail to be deliver are marked as 'exception', and the
-           corresponding error message is output in the server logs.
-
-           :param bool auto_commit: whether to force a commit of the message
-                                    status after sending each message (meant
-                                    only for processing by the scheduler),
-                                    should never be True during normal
-                                    transactions (default: False)
-           :return: True
-        """
-        ir_mail_server = self.pool.get('ir.mail_server')
-        self.write(cr, uid, ids, {'state': 'outgoing'}, context=context)
+    def unlink(self, cr, uid, ids, context=None):
+        # cascade-delete attachments that are directly attached to the message (should only happen
+        # for mail.messages that act as parent for a standalone mail.mail record).
+        self.check_access_rule(cr, uid, ids, 'unlink', context=context)
+        attachments_to_delete = []
         for message in self.browse(cr, uid, ids, context=context):
-            try:
-                attachments = []
-                for attach in message.attachment_ids:
-                    attachments.append((attach.datas_fname, base64.b64decode(attach.datas)))
+            for attach in message.attachment_ids:
+                if attach.res_model == self._name and attach.res_id == message.id:
+                    attachments_to_delete.append(attach.id)
+        if attachments_to_delete:
+            self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context)
+        return super(mail_message, self).unlink(cr, uid, ids, context=context)
 
-                body = message.body_html if message.content_subtype == 'html' else message.body_text
-                body_alternative = None
-                content_subtype_alternative = None
-                if message.content_subtype == 'html' and message.body_text:
-                    # we have a plain text alternative prepared, pass it to 
-                    # build_message instead of letting it build one
-                    body_alternative = message.body_text
-                    content_subtype_alternative = 'plain'
+    def copy(self, cr, uid, id, default=None, context=None):
+        """ Overridden to avoid duplicating fields that are unique to each email """
+        if default is None:
+            default = {}
+        default.update(message_id=False, headers=False)
+        return super(mail_message, self).copy(cr, uid, id, default=default, context=context)
 
-                # handle destination_partners
-                partner_ids_email_to = ''
-                for partner in message.partner_ids:
-                    partner_ids_email_to += '%s ' % (partner.email or '')
-                message_email_to = '%s %s' % (partner_ids_email_to, message.email_to or '')
+    #------------------------------------------------------
+    # Messaging API
+    #------------------------------------------------------
 
-                # build an RFC2822 email.message.Message object and send it
-                # without queuing
-                msg = ir_mail_server.build_email(
-                    email_from=message.email_from,
-                    email_to=mail_tools_to_email(message_email_to),
-                    subject=message.subject,
-                    body=body,
-                    body_alternative=body_alternative,
-                    email_cc=mail_tools_to_email(message.email_cc),
-                    email_bcc=mail_tools_to_email(message.email_bcc),
-                    reply_to=message.reply_to,
-                    attachments=attachments, message_id=message.message_id,
-                    references = message.references,
-                    object_id=message.res_id and ('%s-%s' % (message.res_id,message.model)),
-                    subtype=message.content_subtype,
-                    subtype_alternative=content_subtype_alternative,
-                    headers=message.headers and ast.literal_eval(message.headers))
-                res = ir_mail_server.send_email(cr, uid, msg,
-                                                mail_server_id=message.mail_server_id.id,
-                                                context=context)
-                if res:
-                    message.write({'state':'sent', 'message_id': res, 'email_to': message_email_to})
-                else:
-                    message.write({'state':'exception', 'email_to': message_email_to})
-                message.refresh()
-                if message.state == 'sent':
-                    self._postprocess_sent_message(cr, uid, message, context=context)
-            except Exception:
-                _logger.exception('failed sending mail.message %s', message.id)
-                message.write({'state':'exception'})
+    # TDE note: this code is not used currently, will be improved in a future merge, when quoted context
+    # will be added to email send for notifications. Currently only WIP.
+    MAIL_TEMPLATE = """<div>
+    % if message:
+        ${display_message(message)}
+    % endif
+    % for ctx_msg in context_messages:
+        ${display_message(ctx_msg)}
+    % endfor
+    % if add_expandable:
+        ${display_expandable()}
+    % endif
+    ${display_message(header_message)}
+    </div>
 
-            if auto_commit == True:
-                cr.commit()
-        return True
+    <%def name="display_message(message)">
+        <div>
+            Subject: ${message.subject}<br />
+            Body: ${message.body}
+        </div>
+    </%def>
 
+    <%def name="display_expandable()">
+        <div>This is an expandable.</div>
+    </%def>
+    """
 
+    def message_quote_context(self, cr, uid, id, context=None, limit=3, add_original=False):
+        """
+            1. message.parent_id = False: new thread, no quote_context
+            2. get the lasts messages in the thread before message
+            3. get the message header
+            4. add an expandable between them
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+            :param dict quote_context: options for quoting
+            :return string: html quote
+        """
+        add_expandable = False
+
+        message = self.browse(cr, uid, id, context=context)
+        if not message.parent_id:
+            return ''
+        context_ids = self.search(cr, uid, [
+            ('parent_id', '=', message.parent_id.id),
+            ('id', '<', message.id),
+            ], limit=limit, context=context)
+
+        if len(context_ids) >= limit:
+            add_expandable = True
+            context_ids = context_ids[0:-1]
+
+        context_ids.append(message.parent_id.id)
+        context_messages = self.browse(cr, uid, context_ids, context=context)
+        header_message = context_messages.pop()
+
+        try:
+            if not add_original:
+                message = False
+            result = MakoTemplate(self.MAIL_TEMPLATE).render_unicode(message=message,
+                                                        context_messages=context_messages,
+                                                        header_message=header_message,
+                                                        add_expandable=add_expandable,
+                                                        # context kw would clash with mako internals
+                                                        ctx=context,
+                                                        format_exceptions=True)
+            result = result.strip()
+            return result
+        except Exception:
+            _logger.exception("failed to render mako template for quoting message")
+            return ''
+        return result
+
+    def _notify(self, cr, uid, newid, context=None):
+        """ Add the related record followers to the destination partner_ids if is not a private message.
+            Call mail_notification.notify to manage the email sending
+        """
+        message = self.read(cr, uid, newid, ['model', 'res_id', 'author_id', 'subtype_id', 'partner_ids'], context=context)
+
+        partners_to_notify = set([])
+        # message has no subtype_id: pure log message -> no partners, no one notified
+        if not message.get('subtype_id'):
+            return True
+        # all partner_ids of the mail.message have to be notified
+        if message.get('partner_ids'):
+            partners_to_notify |= set(message.get('partner_ids'))
+        # all followers of the mail.message document have to be added as partners and notified
+        if message.get('model') and message.get('res_id'):
+            fol_obj = self.pool.get("mail.followers")
+            fol_ids = fol_obj.search(cr, uid, [
+                ('res_model', '=', message.get('model')),
+                ('res_id', '=', message.get('res_id')),
+                ('subtype_ids', 'in', message.get('subtype_id')[0])
+                ], context=context)
+            fol_objs = fol_obj.read(cr, uid, fol_ids, ['partner_id'], context=context)
+            partners_to_notify |= set(fol['partner_id'][0] for fol in fol_objs)
+        # remove me from notified partners, unless the message is written on my own wall
+        if message.get('author_id') and message.get('model') == "res.partner" and message.get('res_id') == message.get('author_id')[0]:
+            partners_to_notify |= set([message.get('author_id')[0]])
+        elif message.get('author_id'):
+            partners_to_notify = partners_to_notify - set([message.get('author_id')[0]])
+
+        if partners_to_notify:
+            self.write(cr, SUPERUSER_ID, [newid], {'notified_partner_ids': [(4, p_id) for p_id in partners_to_notify]}, context=context)
+
+        self.pool.get('mail.notification')._notify(cr, uid, newid, context=context)
+
+    #------------------------------------------------------
+    # Tools
+    #------------------------------------------------------
+
+    def check_partners_email(self, cr, uid, partner_ids, context=None):
+        """ Verify that selected partner_ids have an email_address defined.
+            Otherwise throw a warning. """
+        partner_wo_email_lst = []
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
+            if not partner.email:
+                partner_wo_email_lst.append(partner)
+        if not partner_wo_email_lst:
+            return {}
+        warning_msg = _('The following partners chosen as recipients for the email have no email address linked :')
+        for partner in partner_wo_email_lst:
+            warning_msg += '\n- %s' % (partner.name)
+        return {'warning': {
+                    'title': _('Partners email addresses not found'),
+                    'message': warning_msg,
+                    }
+                }
diff --git a/addons/mail/mail_message_subtype.py b/addons/mail/mail_message_subtype.py
new file mode 100644
index 00000000000..e37e20259f8
--- /dev/null
+++ b/addons/mail/mail_message_subtype.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from osv import osv
+from osv import fields
+
+
+class mail_message_subtype(osv.osv):
+    """ Class holding subtype definition for messages. Subtypes allow to tune
+        the follower subscription, allowing only some subtypes to be pushed
+        on the Wall. """
+    _name = 'mail.message.subtype'
+    _description = 'mail_message_subtype'
+    _columns = {
+        'name': fields.char('Message Type', required=True, translate=True,
+            help='Message subtype gives a more precise type on the message, '\
+                    'especially for system notifications. For example, it can be '\
+                    'a notification related to a new record (New), or to a stage '\
+                    'change in a process (Stage change). Message subtypes allow to '\
+                    'precisely tune the notifications the user want to receive on its wall.'),
+        'res_model': fields.char('Model',
+            help="Related model of the subtype. If False, this subtype exists for all models."),
+        'default': fields.boolean('Default',
+            help="Checked by default when subscribing."),
+    }
+    _defaults = {
+        'default': True,
+    }
diff --git a/addons/mail/mail_message_subtype.xml b/addons/mail/mail_message_subtype.xml
new file mode 100644
index 00000000000..c1cd510642d
--- /dev/null
+++ b/addons/mail/mail_message_subtype.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="view_message_subtype_tree">
+            <field name="name">mail.message.subtype.tree</field>
+            <field name="model">mail.message.subtype</field>
+            <field name="priority">10</field>
+            <field name="arch" type="xml">
+                <tree string="Subtype">
+                    <field name="name"/>
+                    <field name="res_model"/>
+                    <field name="default"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_mail_message_subtype_form">
+            <field name="name">mail.message.subtype.form</field>
+            <field name="model">mail.message.subtype</field>
+            <field name="arch" type="xml">
+                <form string="Email message" version="7.0">
+                    <sheet>
+                        <group>
+                            <field name="name"/>
+                            <field name="res_model"/>
+                            <field name="default"/>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_view_message_subtype">
+            <field name="name">Subtypes</field>
+            <field name="res_model">mail.message.subtype</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+        <menuitem name="Subtypes" id="menu_message_subtype" parent="base.menu_email" action="action_view_message_subtype"/>
+
+    </data>
+</openerp>
diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml
index 0aa5261d7e7..7d2e9483773 100644
--- a/addons/mail/mail_message_view.xml
+++ b/addons/mail/mail_message_view.xml
@@ -2,15 +2,15 @@
 <openerp>
     <data>
         <!-- mail.message tree: short view !-->
-        <record model="ir.ui.view" id="view_message_tree_short">
-            <field name="name">mail.message.tree.short</field>
+        <record model="ir.ui.view" id="view_message_tree">
+            <field name="name">mail.message.tree</field>
             <field name="model">mail.message</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
                 <tree string="Messages">
                     <field name="date"/>
                     <field name="subject"/>
-                    <field name="user_id"/>
+                    <field name="author_id"/>
                     <field name="model"/>
                     <field name="res_id"/>
                 </tree>
@@ -18,8 +18,8 @@
         </record>
 
         <!-- mail.message form: short view !-->
-        <record model="ir.ui.view" id="view_message_form_short">
-            <field name="name">mail.message.form.short</field>
+        <record model="ir.ui.view" id="view_message_form">
+            <field name="name">mail.message.form</field>
             <field name="model">mail.message</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
@@ -28,244 +28,71 @@
                         <group>
                             <group>
                                 <field name="subject"/>
-                                <field name="user_id"/>
+                                <field name="author_id"/>
+                                <field name="email_from"/>
                                 <field name="date"/>
                                 <field name="type"/>
-                                <field name="content_subtype"/>
+                                <field name="subtype_id"/>
                             </group>
                             <group>
                                 <field name="model"/>
                                 <field name="res_id"/>
                                 <field name="parent_id"/>
                                 <field name="partner_ids" widget="many2many_tags"/>
+                                <field name="notified_partner_ids" widget="many2many_tags"/>
                             </group>
                         </group>
-                        <notebook>
-                            <page string="Body (Rich)">
-                                <field name="body_html"/>
-                            </page>
-                            <page string="Body (Plain)">
-                                <field name="body_text" widget="text"/>
-                            </page>
-                        </notebook>
+                        <field name="body"/>
                     </sheet>
                 </form>
             </field>
         </record>
 
-        <!-- mail.message search: short view !-->
-        <record model="ir.ui.view" id="view_message_search_short">
-            <field name="name">mail.message.search.short</field>
-            <field name="model">mail.message</field>
-            <field name="priority">20</field>
-            <field name="arch" type="xml">
-                <search string="Messages Search">
-                    <field name="model" string="Message"/>
-                    <field name="date"/>
-                    <field name="user_id"/>
-                </search>
-            </field>
-        </record>
-
         <!-- mail.message search: wall view !-->
-        <record model="ir.ui.view" id="view_message_search_wall">
-            <field name="name">mail.message.search.wall</field>
+        <record model="ir.ui.view" id="view_message_search">
+            <field name="name">mail.message.search</field>
             <field name="model">mail.message</field>
             <field name="priority">25</field>
             <field name="arch" type="xml">
                 <search string="Messages Search">
                     <field name="subject" string="Content" filter_domain="['|', ('subject', 'ilike', self), ('body', 'ilike', self)]" />
                     <field name="type"/>
-                    <filter icon="terp-personal+" string="My Feeds"
-                            name="my_feeds" help="My Feeds"
-                            domain="[('user_id','=',uid)]"/>
-                    <filter icon="terp-personal+" string="Comments"
+                    <field name="author_id"/>
+                    <field name="partner_ids"/>
+                    <filter string="Read"
+                            name="message_read" help="Show messages to read"
+                            domain="[('to_read', '=', False)]"/>
+                    <filter string="Unread"
+                            name="message_unread" help="Show messages to read"
+                            domain="[('to_read', '=', True)]"/>
+                    <separator/>
+                    <filter string="Comments"
                             name="comments" help="Comments"
                             domain="[('type', '=', 'comment')]"/>
-                    <filter icon="terp-personal+" string="Notifications"
+                    <filter string="Notifications"
                             name="notifications" help="Notifications"
                             domain="[('type', '=', 'notification')]"/>
-                    <filter icon="terp-personal+" string="Emails"
+                    <filter string="Emails"
                             name="emails" help="Emails"
                             domain="[('type', '=', 'email')]"/>
-                    <filter icon="terp-go-today" string="Today"
-                            name="today" help="Today"
-                            domain="[   ('date', '&lt;=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')),
-                                        ('date', '&gt;=', datetime.date.today().strftime('%%Y-%%m-%%d 00:00:00'))
-                                    ]"/>
-                    <filter icon="terp-go-week" string="This week"
-                            name="7_days" help="This week"
-                            domain="[   ('date', '&lt;=', datetime.date.today().strftime('%%Y-%%m-%%d 23:59:59')),
-                                        ('date', '&gt;=', (datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))
-                                    ]"/>
-                    <field name="user_id"/>
-                </search>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_email_message_form">
-            <field name="name">mail.message.form</field>
-            <field name="model">mail.message</field>
-            <field name="arch" type="xml">
-                <form string="Email message" version="7.0">
-                    <sheet>
-                        <label for="subject" class="oe_edit_only"/>
-                        <h2><field name="subject"/></h2>
-						<div>
-                            by <field name="user_id" class="oe_inline" string="User"/> on <field name="date" class="oe_inline"/>
-                            <button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
-                                context="{'mail.compose.message.mode':'reply', 'message_id':active_id}" states='received,sent,exception,cancel'/>
-                        </div>
-                        <notebook colspan="4">
-                            <page string="Message Details">
-                                <group>
-                                    <group>
-                                        <field name="email_from"/>
-                                        <field name="email_to"/>
-                                        <field name="email_cc"/>
-                                        <field name="email_bcc"/>
-                                        <field name="reply_to"/>
-                                    </group>
-                                    <group>
-                                        <field name="partner_id" readonly="1"/>
-                                        <field name="partner_ids" widget="many2many_tags"/>
-                                    </group>
-                                </group>
-                                <notebook>
-                                    <page string="Body (Rich)">
-                                        <field name="body_html"/>
-                                    </page>
-                                    <page string="Body (Plain)">
-                                        <field name="body_text" widget="text"/>
-                                    </page>
-                                </notebook>
-                            </page>
-                            <page string="Advanced" groups="base.group_no_one">
-                                <group>
-                                    <group>
-                                        <field name="auto_delete"/>
-                                        <field name="type"/>
-                                        <field name="content_subtype"/>
-                                        <field name="state" colspan="2"/>
-                                        <field name="mail_server_id"/>
-                                        <field name="original"/>
-                                        <field name="model"/>
-                                        <field name="res_id"/>
-                                        <button name="open_document" string="Open" type="object" icon="gtk-jump-to" colspan="2"
-                                            attrs="{'invisible':['|', ('model', '=', ''), ('res_id', '=', False)]}"/>
-                                    </group>
-                                    <group>
-                                        <field name="message_id"/>
-                                        <field name="references"/>
-                                        <field name="headers"/>
-                                    </group>
-                                </group>
-                            </page>
-                            <page string="Attachments">
-                                <field name="attachment_ids"/>
-                            </page>
-                        </notebook>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_email_message_tree">
-            <field name="name">mail.message.tree</field>
-            <field name="model">mail.message</field>
-            <field name="arch" type="xml">
-                <tree string="Emails" colors="grey:state in ('sent', 'cancel');blue:state=='outgoing';red:state=='exception';black:state=='received'">
-                    <field name="date"/>
-                    <field name="subject"/>
-                    <field name="email_from"/>
-                    <field name="user_id" string="User"/>
-                    <field name="message_id" invisible="1"/>
-                    <field name="partner_id" invisible="1"/>
-                    <field name="model" invisible="1"/>
-                    <field name="res_id" invisible="1"/>
-                    <field name="state"/>
-                    <button name="send" string="Send Now" type="object" icon="gtk-media-play" states='outgoing'/>
-                    <button name="mark_outgoing" string="Retry" type="object" icon="gtk-redo" states='exception,cancel'/>
-                    <button name="cancel" string="Cancel" type="object" icon="terp-gtk-stop" states='outgoing'/>
-                    <button name="open_document" string="Open Related Document" type="object" icon="gtk-jump-to"/>
-                    <button name="open_attachment" string="Open Attachments" type="object" icon="gtk-jump-to"/>
-                </tree>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="view_email_message_search">
-            <field name="name">mail.message.search</field>
-            <field name="model">mail.message</field>
-            <field name="arch" type="xml">
-                <search string="Email Search">
-                    <field name="email_from" filter_domain="['|' '|',('email_from','ilike',self), ('email_to','ilike',self), ('subject','ilike',self)]" string="Email"/>
-                    <field name="date"/>
-                    <filter icon="terp-camera_test" name="received" string="Received" domain="[('state','=','received')]"/>
-                    <filter icon="terp-call-start" name="outgoing" string="Outgoing" domain="[('state','=','outgoing')]"/>
-                    <filter icon="terp-check" name="sent" string="Sent" domain="[('state','=','sent')]"/>
-                    <filter icon="terp-gtk-stop" name="exception" string="Failed" domain="[('state','=','exception')]"/>
                     <separator/>
-                    <filter icon="terp-camera_test" name="type_email" string="Email" domain="[('type','=','email')]"/>
-                    <filter icon="terp-camera_test" name="type_comment" string="Comment" domain="[('type','=','comment')]"/>
-                    <filter icon="terp-camera_test" name="type_notification" string="Notification" domain="[('type','=','notification')]"/>
-                    <group expand="0" string="Extended Filters...">
-                        <field name="user_id" string="User"/>
-                        <field name="partner_id" string="Partner Name"/>
-                        <field name="model"/>
-                        <field name="res_id"/>
-                    </group>
-                    <group expand="0" string="Group By...">
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                        <filter string="User" name="User" icon="terp-personal" context="{'group_by':'user_id'}"/>
-                        <filter string="Thread" icon="terp-mail-" domain="[]" context="{'group_by':'message_id'}"/>
-                        <filter string="Month" help="Creation Month" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
-                    </group>
+                    <filter string="Has attachments"
+                            name="attachments"
+                            domain="[('attachment_ids', '!=', False)]"/>
                 </search>
             </field>
         </record>
 
-        <record id="action_view_all_messages_short" model="ir.actions.act_window">
-            <field name="name">Messages</field>
-            <field name="res_model">mail.message</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="context">{'tree_view_ref': 'mail.view_message_tree_short', 'form_view_ref': 'mail.view_message_form_short'}</field>
-            <field name="search_view_id" ref="view_message_search_short"/>
-        </record>
-
         <record id="action_view_mail_message" model="ir.actions.act_window">
             <field name="name">Messages</field>
             <field name="res_model">mail.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="context">{'search_default_received': 1, 'search_default_type_email': 1}</field>
-            <field name="search_view_id" ref="view_email_message_search"/>
+            <field name="search_view_id" ref="view_message_search"/>
         </record>
-
-        <act_window domain="[('partner_id', '=', active_id), ('email_from', '!=', False)]"
-            context="{'default_partner_id': active_id}"
-            id="act_res_partner_emails" name="Emails"
-            res_model="mail.message"
-            src_model="res.partner"
-            view_id="view_email_message_tree"/>
-
-        <!-- Add menu entry in Settings/Email -->
-        <menuitem name="Messages" id="menu_email_message" parent="base.menu_email" action="action_view_mail_message" />
         
         <!-- Add menu entry in Settings/Email -->
-        <menuitem name="Feeds" id="menu_email_message_all" parent="base.menu_email" action="action_view_all_messages_short" groups="base.group_no_one"/>
+        <menuitem name="Messages" id="menu_mail_message" parent="base.menu_email" action="action_view_mail_message"/>
 
-        <record id="action_mail_all_feeds" model="ir.actions.client">
-            <field name="name">News Feed</field>
-            <field name="tag">mail.wall</field>
-            <field name="params" eval="{'search_view_id': ref('view_message_search_wall')}"/>
-        </record>
-
-        <record id="action_mail_my_feeds" model="ir.actions.client">
-            <field name="name">My Feeds</field>
-            <field name="tag">mail.wall</field>
-            <field name="params" eval="{'search_view_id': ref('view_message_search_wall'), 'my_feeds': True}"/>
-        </record>
     </data>
-</openerp>
+</openerp>
\ No newline at end of file
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 56c7e6b7088..ee1a015396b 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -20,314 +20,250 @@
 ##############################################################################
 
 import base64
+import dateutil
 import email
 import logging
-import re
+import pytz
 import time
-import xmlrpclib
-from email.utils import parsedate
-from email.message import Message
-
-from osv import osv, fields
-from mail_message import decode, to_email
 import tools
-from tools.translate import _
+import xmlrpclib
+
+from email.message import Message
+from mail_message import decode
+from openerp import SUPERUSER_ID
+from osv import osv, fields
 from tools.safe_eval import safe_eval as eval
 
 _logger = logging.getLogger(__name__)
 
+
 def decode_header(message, header, separator=' '):
-    return separator.join(map(decode,message.get_all(header, [])))
+    return separator.join(map(decode, message.get_all(header, [])))
 
-class many2many_reference(fields.many2many):
-    """ many2many_reference is an override of fields.many2many. It manages
-        many2many-like table where one id is given by two fields, res_model
-        and res_id.
-    """
-    
-    def _get_query_and_where_params(self, cr, model, ids, values, where_params):
-        """ Add in where:
-            - mail_followers.res_model = 'crm.lead'
-        """
-        query = 'SELECT %(rel)s.%(id2)s, %(rel)s.%(id1)s \
-                    FROM %(rel)s, %(from_c)s \
-                    WHERE %(rel)s.%(id1)s IN %%s \
-                    AND %(rel)s.%(id2)s = %(tbl)s.id \
-                    AND %(rel)s.res_model = %%s \
-                    %(where_c)s  \
-                    %(order_by)s \
-                    %(limit)s \
-                    OFFSET %(offset)d' \
-                % values
-        where_params = [model._name] + where_params
-        return query, where_params
 
-    def set(self, cr, model, id, name, values, user=None, context=None):
-        """ Override to add the res_model field in queries. """
-        if not values: return
-        rel, id1, id2 = self._sql_names(model)
-        obj = model.pool.get(self._obj)
-        for act in values:
-            if not (isinstance(act, list) or isinstance(act, tuple)) or not act:
-                continue
-            if act[0] == 0:
-                idnew = obj.create(cr, user, act[2], context=context)
-                cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+',res_model) VALUES (%s,%s,%s)', (id, idnew, model._name))
-            elif act[0] == 3:
-                cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND res_model=%s', (id, act[1], model._name))
-            elif act[0] == 4:
-                # following queries are in the same transaction - so should be relatively safe
-                cr.execute('SELECT 1 FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND res_model=%s', (id, act[1], model._name))
-                if not cr.fetchone():
-                    cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+',res_model) VALUES (%s,%s,%s)', (id, act[1], model._name))
-            elif act[0] == 6:
-                d1, d2,tables = obj.pool.get('ir.rule').domain_get(cr, user, obj._name, context=context)
-                if d1:
-                    d1 = ' and ' + ' and '.join(d1)
-                else:
-                    d1 = ''
-                cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND res_model=%s AND '+id2+' IN (SELECT '+rel+'.'+id2+' FROM '+rel+', '+','.join(tables)+' WHERE '+rel+'.'+id1+'=%s AND '+rel+'.'+id2+' = '+obj._table+'.id '+ d1 +')', [id, model._name, id]+d2)
-                for act_nbr in act[2]:
-                    cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+',res_model) VALUES (%s,%s,%s)', (id, act_nbr, model._name))
-            else:
-                return super(many2many_reference, self).set(cr, model, id, name, values, user, context)
+class mail_thread(osv.AbstractModel):
+    ''' mail_thread model is meant to be inherited by any model that needs to
+        act as a discussion topic on which messages can be attached. Public
+        methods are prefixed with ``message_`` in order to avoid name
+        collisions with methods of the models that will inherit from this class.
 
-class mail_thread(osv.Model):
-    '''Mixin model, meant to be inherited by any model that needs to
-       act as a discussion topic on which messages can be attached.
-       Public methods are prefixed with ``message_`` in order to avoid
-       name collisions with methods of the models that will inherit
-       from this mixin.
+        ``mail.thread`` defines fields used to handle and display the
+        communication history. ``mail.thread`` also manages followers of
+        inheriting classes. All features and expected behavior are managed
+        by mail.thread. Widgets has been designed for the 7.0 and following
+        versions of OpenERP.
 
-       ``mail.thread`` is designed to work without adding any field
-       to the extended models. All functionalities and expected behavior
-       are managed by mail.thread, using model name and record ids.
-       A widget has been designed for the 6.1 and following version of OpenERP
-       web-client. However, due to technical limitations, ``mail.thread``
-       adds a simulated one2many field, to display the web widget by
-       overriding the default field displayed. Using this field
-       is not recommanded has it will disappeear in future version
-       of OpenERP, leading to a pure mixin class.
+        Inheriting classes are not required to implement any method, as the
+        default implementation will work for any model. However it is common
+        to override at least the ``message_new`` and ``message_update``
+        methods (calling ``super``) to add model-specific behavior at
+        creation and update of a thread when processing incoming emails.
 
-       Inheriting classes are not required to implement any method, as the
-       default implementation will work for any model. However it is common
-       to override at least the ``message_new`` and ``message_update``
-       methods (calling ``super``) to add model-specific behavior at
-       creation and update of a thread.
-       
-       #TODO: UPDATE WITH SUBTYPE / NEW FOLLOW MECHANISM
+        Options:
+            - _mail_flat_thread: if set to True, all messages without parent_id
+                are automatically attached to the first message posted on the
+                ressource. If set to False, the display of Chatter is done using
+                threads, and no parent_id is automatically set.
     '''
     _name = 'mail.thread'
     _description = 'Email Thread'
+    _mail_flat_thread = True
+
+    def _get_message_data(self, cr, uid, ids, name, args, context=None):
+        """ Computes:
+            - message_unread: has uid unread message for the document
+            - message_summary: html snippet summarizing the Chatter for kanban views """
+        res = dict((id, dict(message_unread=False, message_summary='')) for id in ids)
+        user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+
+        # search for unread messages, directly in SQL to improve performances
+        cr.execute("""  SELECT m.res_id FROM mail_message m
+                        RIGHT JOIN mail_notification n
+                        ON (n.message_id = m.id AND n.partner_id = %s AND n.read = False)
+                        WHERE m.model = %s AND m.res_id in %s""",
+                    (user_pid, self._name, tuple(ids),))
+        msg_ids = [result[0] for result in cr.fetchall()]
+        for msg_id in msg_ids:
+            res[msg_id]['message_unread'] = True
 
-    def _get_message_data(self, cr, uid, ids, field_names, args, context=None):
-        res = dict.fromkeys(ids)
-        for id in ids:
-            res[id] = {'message_ids': self.message_search(cr, uid, [id], context=context)}
         for thread in self.browse(cr, uid, ids, context=context):
-            message_follower_ids = [follower.id for follower in thread.message_follower_ids]
-            res[thread.id].update({
-                'message_is_follower': uid in message_follower_ids,
-                'message_summary': "<span><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % 
-                    (len(res[thread.id]['message_ids']), len(thread.message_follower_ids))
-                })
+            cls = res[thread.id]['message_unread'] and ' class="oe_kanban_mail_new"' or ''
+            res[thread.id]['message_summary'] = "<span%s><span class='oe_e'>9</span> %d</span> <span><span class='oe_e'>+</span> %d</span>" % (cls, len(thread.message_comment_ids), len(thread.message_follower_ids))
+
         return res
 
-    def _search_message_ids(self, cr, uid, obj, name, args, context=None):
-        msg_obj = self.pool.get('mail.message')
-        msg_ids = msg_obj.search(cr, uid, ['&', ('res_id', 'in', args[0][2]), ('model', '=', self._name)], context=context)
-        return [('id', 'in', msg_ids)]
+    def _get_subscription_data(self, cr, uid, ids, name, args, context=None):
+        """ Computes:
+            - message_subtype_data: data about document subtypes: which are
+                available, which are followed if any """
+        res = dict((id, dict(message_subtype_data='')) for id in ids)
+        user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+
+        # find current model subtypes, add them to a dictionary
+        subtype_obj = self.pool.get('mail.message.subtype')
+        subtype_ids = subtype_obj.search(cr, uid, ['|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
+        subtype_dict = dict((subtype.name, dict(default=subtype.default, followed=False, id=subtype.id)) for subtype in subtype_obj.browse(cr, uid, subtype_ids, context=context))
+        for id in ids:
+            res[id]['message_subtype_data'] = subtype_dict.copy()
+
+        # find the document followers, update the data
+        fol_obj = self.pool.get('mail.followers')
+        fol_ids = fol_obj.search(cr, uid, [
+            ('partner_id', '=', user_pid),
+            ('res_id', 'in', ids),
+            ('res_model', '=', self._name),
+        ], context=context)
+        for fol in fol_obj.browse(cr, uid, fol_ids, context=context):
+            thread_subtype_dict = res[fol.res_id]['message_subtype_data']
+            for subtype in fol.subtype_ids:
+                thread_subtype_dict[subtype.name]['followed'] = True
+            res[fol.res_id]['message_subtype_data'] = thread_subtype_dict
+
+        return res
+
+    def _search_unread(self, cr, uid, obj=None, name=None, domain=None, context=None):
+        partner_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        res = {}
+        notif_obj = self.pool.get('mail.notification')
+        notif_ids = notif_obj.search(cr, uid, [
+            ('partner_id', '=', partner_id),
+            ('message_id.model', '=', self._name),
+            ('read', '=', False)
+        ], context=context)
+        for notif in notif_obj.browse(cr, uid, notif_ids, context=context):
+            res[notif.message_id.res_id] = True
+        return [('id', 'in', res.keys())]
+
+    def _get_followers(self, cr, uid, ids, name, arg, context=None):
+        fol_obj = self.pool.get('mail.followers')
+        fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', 'in', ids)])
+        res = dict((id, dict(message_follower_ids=[], message_is_follower=False)) for id in ids)
+        user_pid = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0]
+        for fol in fol_obj.browse(cr, SUPERUSER_ID, fol_ids):
+            res[fol.res_id]['message_follower_ids'].append(fol.partner_id.id)
+            if fol.partner_id.id == user_pid:
+                res[fol.res_id]['message_is_follower'] = True
+        return res
+
+    def _set_followers(self, cr, uid, id, name, value, arg, context=None):
+        if not value:
+            return
+        partner_obj = self.pool.get('res.partner')
+        fol_obj = self.pool.get('mail.followers')
+
+        # read the old set of followers, and determine the new set of followers
+        fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', '=', id)])
+        old = set(fol.partner_id.id for fol in fol_obj.browse(cr, SUPERUSER_ID, fol_ids))
+        new = set(old)
+
+        for command in value or []:
+            if isinstance(command, (int, long)):
+                new.add(command)
+            elif command[0] == 0:
+                new.add(partner_obj.create(cr, uid, command[2], context=context))
+            elif command[0] == 1:
+                partner_obj.write(cr, uid, [command[1]], command[2], context=context)
+                new.add(command[1])
+            elif command[0] == 2:
+                partner_obj.unlink(cr, uid, [command[1]], context=context)
+                new.discard(command[1])
+            elif command[0] == 3:
+                new.discard(command[1])
+            elif command[0] == 4:
+                new.add(command[1])
+            elif command[0] == 5:
+                new.clear()
+            elif command[0] == 6:
+                new = set(command[2])
+
+        # remove partners that are no longer followers
+        fol_ids = fol_obj.search(cr, SUPERUSER_ID,
+            [('res_model', '=', self._name), ('res_id', '=', id), ('partner_id', 'not in', list(new))])
+        fol_obj.unlink(cr, SUPERUSER_ID, fol_ids)
+
+        # add new followers
+        for partner_id in new - old:
+            fol_obj.create(cr, SUPERUSER_ID, {'res_model': self._name, 'res_id': id, 'partner_id': partner_id})
+
+    def _search_followers(self, cr, uid, obj, name, args, context):
+        fol_obj = self.pool.get('mail.followers')
+        res = []
+        for field, operator, value in args:
+            assert field == name
+            fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('partner_id', operator, value)])
+            res_ids = [fol.res_id for fol in fol_obj.browse(cr, SUPERUSER_ID, fol_ids)]
+            res.append(('id', 'in', res_ids))
+        return res
 
     _columns = {
-        'message_ids': fields.function(_get_message_data,
-			fnct_search=_search_message_ids,
-            type='one2many', obj='mail.message', _fields_id = 'res_id',
-            string='Messages', multi="_get_message_data",
-            help="Field holding discussion about the current document."),
-        'message_follower_ids': many2many_reference('res.users',
-            rel='mail_followers', id1='res_id', id2='user_id', string="Followers",
-            help="Followers of the document. The followers have full access to " \
-                 "the document details, as well as the conversation."),
-        'message_is_follower': fields.function(_get_message_data, method=True,
-            type='boolean', string='I am Follower', multi='_get_message_data',
-            help='True if the current user is following the current document.'),
-        'message_state': fields.boolean('Read',
-            help="When checked, new messages require your attention."),
+        'message_is_follower': fields.function(_get_followers,
+            type='boolean', string='Is a Follower', multi='_get_followers,'),
+        'message_follower_ids': fields.function(_get_followers, fnct_inv=_set_followers,
+                fnct_search=_search_followers, type='many2many',
+                obj='res.partner', string='Followers', multi='_get_followers'),
+        'message_comment_ids': fields.one2many('mail.message', 'res_id',
+            domain=lambda self: [('model', '=', self._name), ('type', 'in', ('comment', 'email'))],
+            string='Comments and emails',
+            help="Comments and emails"),
+        'message_ids': fields.one2many('mail.message', 'res_id',
+            domain=lambda self: [('model', '=', self._name)],
+            string='Messages',
+            help="Messages and communication history"),
+        'message_unread': fields.function(_get_message_data, fnct_search=_search_unread,
+            type='boolean', string='Unread Messages', multi="_get_message_data",
+            help="If checked new messages require your attention."),
         'message_summary': fields.function(_get_message_data, method=True,
-            type='text', string='Summary', multi='_get_message_data',
+            type='text', string='Summary', multi="_get_message_data",
             help="Holds the Chatter summary (number of messages, ...). "\
                  "This summary is directly in html format in order to "\
                  "be inserted in kanban views."),
     }
 
-    _defaults = {
-        'message_state': True,
-    }
-
     #------------------------------------------------------
-    # Automatic subscription when creating/reading
+    # Automatic subscription when creating
     #------------------------------------------------------
 
     def create(self, cr, uid, vals, context=None):
-        """ Override of create to subscribe :
-            - the writer
-            - followers given by the monitored fields
-        """
+        """ Override to subscribe the current user. """
         thread_id = super(mail_thread, self).create(cr, uid, vals, context=context)
-        followers_command = self.message_get_automatic_followers(cr, uid, thread_id, vals, fetch_missing=False, context=context)
-        if followers_command:
-            self.write(cr, uid, [thread_id], {'message_follower_ids': followers_command}, context=context)
+        self.message_subscribe_users(cr, uid, [thread_id], [uid], context=context)
         return thread_id
 
-    def write(self, cr, uid, ids, vals, context=None):
-        """ Override of write to subscribe :
-            - the writer
-            - followers given by the monitored fields
-        """
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        for id in ids:
-            # copy original vals because we are going to modify it
-            specific_vals = dict(vals)
-            # we modify followers: do not subscribe the uid
-            if specific_vals.get('message_follower_ids'):
-                followers_command = self.message_get_automatic_followers(cr, uid, id, specific_vals, add_uid=False, context=context)
-                specific_vals['message_follower_ids'] += followers_command
-            else:
-                followers_command = self.message_get_automatic_followers(cr, uid, id, specific_vals, context=context)
-                specific_vals['message_follower_ids'] = followers_command
-            write_res = super(mail_thread, self).write(cr, uid, ids, specific_vals, context=context)
-        return True
-
     def unlink(self, cr, uid, ids, context=None):
-        """Override unlink, to automatically delete messages
-           that are linked with res_model and res_id, not through
-           a foreign key with a 'cascade' ondelete attribute.
-           Notifications will be deleted with messages
-        """
+        """ Override unlink to delete messages and followers. This cannot be
+            cascaded, because link is done through (res_model, res_id). """
         msg_obj = self.pool.get('mail.message')
+        fol_obj = self.pool.get('mail.followers')
         # delete messages and notifications
-        msg_to_del_ids = msg_obj.search(cr, uid, [('model', '=', self._name), ('res_id', 'in', ids)], context=context)
-        msg_obj.unlink(cr, uid, msg_to_del_ids, context=context)
+        msg_ids = msg_obj.search(cr, uid, [('model', '=', self._name), ('res_id', 'in', ids)], context=context)
+        msg_obj.unlink(cr, uid, msg_ids, context=context)
+        # delete followers
+        fol_ids = fol_obj.search(cr, uid, [('res_model', '=', self._name), ('res_id', 'in', ids)], context=context)
+        fol_obj.unlink(cr, uid, fol_ids, context=context)
         return super(mail_thread, self).unlink(cr, uid, ids, context=context)
 
-    def message_get_automatic_followers(self, cr, uid, id, record_vals, add_uid=True, fetch_missing=False, context=None):
-        """ Return the command for the many2many follower_ids field to manage
-            subscribers. Behavior :
-            - get the monitored fields (ex: ['user_id', 'responsible_id']); those
-              fields should be relationships to res.users (#TODO: res.partner)
-            - if this field is in the record_vals: it means it has been modified
-              thus add its value to the followers
-            - if this fields is not in record_vals, but fetch_missing paramter
-              is set to True: fetch the value in the record (use: at creation
-              for default values, not present in record_vals)
-            - if add_uid: add the current user (for example: writer is subscriber)
-            - generate the command and return it
-            This method has to be used on 1 id, because otherwise it would imply
-            to track which user.id is used for which record.id.
-
-            :param record_vals: values given to the create method of the new
-                record, or values updated in a write.
-            :param monitored_fields: a list of fields that are monitored. Those
-                fields must be many2one fields to the res.users model.
-            :param fetch_missing: is set to True, the method will read the
-                record to find values that are not present in record_vals.
-
-            #TODO : UPDATE WHEN MERGING TO PARTNERS
-        """
-        # get monitored fields
-        monitored_fields = self.message_get_monitored_follower_fields(cr, uid, [id], context=context)
-        modified_fields = [field for field in monitored_fields if field in record_vals.iterkeys()]
-        other_fields = [field for field in monitored_fields if field not in record_vals.iterkeys()] if fetch_missing else []
-        # for each monitored field: if in record_vals, it has been modified/added
-        follower_ids = []
-        for field in modified_fields:
-            # do not add 'False'
-            if record_vals.get(fields):
-                follower_ids.append(record_vals.get(field))
-        # for other fields: read in record if fetch_missing (otherwise list is void)
-        for field in other_fields:
-            record = self.browse(cr, uid, id, context=context)
-            value = getattr(record, field)
-            if value:
-                follower_ids.append(value)
-        # add uid if asked and not already present
-        if add_uid and uid not in follower_ids:
-            follower_ids.append(uid)
-        return self.message_subscribe_get_command(cr, uid, follower_ids, context=context)
+    def copy(self, cr, uid, id, default=None, context=None):
+        default = default or {}
+        default['message_ids'] = []
+        default['message_comment_ids'] = []
+        default['message_follower_ids'] = []
+        return super(mail_thread, self).copy(cr, uid, id, default=default, context=context)
 
     #------------------------------------------------------
     # mail.message wrappers and tools
     #------------------------------------------------------
 
-    def message_create(self, cr, uid, thread_id, vals, context=None):
-        """ OpenChatter: wrapper of mail.message create method
-           - creates the mail.message
-           - automatically subscribe the message writer
-           - push the message to followers
-        """
-        if context is None:
-            context = {}
-
-        # create message
-        msg_id = self.pool.get('mail.message').create(cr, uid, vals, context=context)
-
-        # automatically subscribe the writer of the message
-        if vals.get('user_id'):
-            record = self.browse(cr, uid, thread_id, context=context)
-            follower_ids = [follower.id for follower in record.message_follower_ids]
-            if vals.get('user_id') not in follower_ids:
-                self.message_subscribe(cr, uid, [thread_id], [vals.get('user_id')], context=context)
-
-        # Set as unread if writer is not the document responsible
-        self.message_create_set_unread(cr, uid, [thread_id], context=context)
-        
-        # special: if install mode, do not push demo data
-        if context.get('install_mode', False):
-            return msg_id
-        
-        # get users that will get a notification pushed
-        notification_obj = self.pool.get('mail.notification')
-        user_to_push_ids = self.message_get_user_ids_to_notify(cr, uid, [thread_id], vals, context=context)
-        for id in user_to_push_ids:
-            notification_obj.create(cr, uid, {'user_id': id, 'message_id': msg_id}, context=context)
-        
-        # create the email to send
-        self.message_create_notify_by_email(cr, uid, vals, user_to_push_ids, context=context)
-        
-        return msg_id
-    
-    def message_get_user_ids_to_notify(self, cr, uid, thread_ids, new_msg_vals, context=None):
-        # get body
-        body = new_msg_vals.get('body_html', '') if new_msg_vals.get('content_subtype') == 'html' else new_msg_vals.get('body_text', '')
-        
-        # get subscribers
-        subscr_obj = self.pool.get('mail.followers')
-        subscr_ids = subscr_obj.search(cr, uid, ['&', ('res_model', '=', self._name), ('res_id', 'in', thread_ids)], context=context)
-        notif_user_ids = [sub['user_id'][0] for sub in subscr_obj.read(cr, uid, subscr_ids, ['user_id'], context=context)]
-    
-        # add users requested to perform an action (need_action mechanism)
-        if hasattr(self, 'get_needaction_user_ids') and self._columns.get('user_id'):
-            user_ids_dict = self.get_needaction_user_ids(cr, uid, thread_ids, context=context)
-            for id, user_ids in user_ids_dict.iteritems():
-                notif_user_ids += user_ids
-        
-        # add users notified of the parent messages (because: if parent message contains @login, login must receive the replies)
-        if new_msg_vals.get('parent_id'):
-            notif_obj = self.pool.get('mail.notification')
-            parent_notif_ids = notif_obj.search(cr, uid, [('message_id', '=', new_msg_vals.get('parent_id'))], context=context)
-            parent_notifs = notif_obj.read(cr, uid, parent_notif_ids, context=context)
-            notif_user_ids += [parent_notif['user_id'][0] for parent_notif in parent_notifs]
-
-        # remove duplicate entries
-        notif_user_ids = list(set(notif_user_ids))
-        return notif_user_ids
+    def _needaction_domain_get(self, cr, uid, context=None):
+        if self._needaction:
+            return [('message_unread', '=', True)]
+        return []
 
     #------------------------------------------------------
-    # Generic message api
+    # Mail gateway
     #------------------------------------------------------
 
     def message_capable_models(self, cr, uid, context=None):
+        """ Used by the plugin addon, based for plugin_outlook and others. """
         ret_dict = {}
         for model_name in self.pool.obj_list():
             model = self.pool.get(model_name)
@@ -335,343 +271,20 @@ class mail_thread(osv.Model):
                 ret_dict[model_name] = model._description
         return ret_dict
 
-    def message_append(self, cr, uid, threads, subject, body_text=None, body_html=None,
-                        type='email', email_date=None, parent_id=False,
-                        content_subtype='plain', state=None,
-                        partner_ids=None, email_from=False, email_to=False,
-                        email_cc=None, email_bcc=None, reply_to=None,
-                        headers=None, message_id=False, references=None,
-                        attachments=None, original=None, context=None):
-        """ Creates a new mail.message through message_create. The new message
-            is attached to the current mail.thread, containing all the details 
-            passed as parameters. All attachments will be attached to the 
-            thread record as well as to the actual message.
-           
-            This method calls message_create that will handle management of
-            subscription and notifications, and effectively create the message.
-           
-            If ``email_from`` is not set or ``type`` not set as 'email',
-            a note message is created (comment or system notification), 
-            without the usual envelope attributes (sender, recipients, etc.).
-
-            :param threads: list of thread ids, or list of browse_records
-                representing threads to which a new message should be attached
-            :param subject: subject of the message, or description of the event;
-                this is totally optional as subjects are not important except
-                for specific messages (blog post, job offers) or for emails
-            :param body_text: plaintext contents of the mail or log message
-            :param body_html: html contents of the mail or log message
-            :param type: type of message: 'email', 'comment', 'notification';
-                email by default
-            :param email_date: email date string if different from now, in
-                server timezone
-            :param parent_id: id of the parent message (threaded messaging model)
-            :param content_subtype: optional content_subtype of message: 'plain'
-                or 'html', corresponding to the main body contents (body_text or
-                body_html).
-            :param state: state of message
-            :param partner_ids: destination partners of the message, in addition
-                to the now fully optional email_to; this method is supposed to
-                received a list of ids is not None. The specific many2many
-                instruction will be generated by this method.
-            :param email_from: Email From / Sender address if any
-            :param email_to: Email-To / Recipient address
-            :param email_cc: Comma-Separated list of Carbon Copy Emails To
-                addresses if any
-            :param email_bcc: Comma-Separated list of Blind Carbon Copy Emails To
-                addresses if any
-            :param reply_to: reply_to header
-            :param headers: mail headers to store
-            :param message_id: optional email identifier
-            :param references: optional email references
-            :param dict attachments: map of attachment filenames to binary
-                contents, if any.
-            :param str original: optional full source of the RFC2822 email, for
-                reference
-            :param dict context: if a ``thread_model`` value is present in the
-                context, its value will be used to determine the model of the
-                thread to update (instead of the current model).
-        """
-        if context is None:
-            context = {}
-        if attachments is None:
-            attachments = {}
-
-        if email_date:
-            edate = parsedate(email_date)
-            if edate is not None:
-                email_date = time.strftime('%Y-%m-%d %H:%M:%S', edate)
-
-        if all(isinstance(thread_id, (int, long)) for thread_id in threads):
-            model = context.get('thread_model') or self._name
-            model_pool = self.pool.get(model)
-            threads = model_pool.browse(cr, uid, threads, context=context)
-
-        ir_attachment = self.pool.get('ir.attachment')
-
-        new_msg_ids = []
-        for thread in threads:
-            to_attach = []
-            for attachment in attachments:
-                fname, fcontent = attachment
-                if isinstance(fcontent, unicode):
-                    fcontent = fcontent.encode('utf-8')
-                data_attach = {
-                    'name': fname,
-                    'datas': base64.b64encode(str(fcontent)),
-                    'datas_fname': fname,
-                    'description': _('Mail attachment'),
-                    'res_model': thread._name,
-                    'res_id': thread.id,
-                }
-                to_attach.append(ir_attachment.create(cr, uid, data_attach, context=context))
-            # find related partner: partner_id column in thread object, or self is res.partner model
-            partner_id = ('partner_id' in thread._columns.keys()) and (thread.partner_id and thread.partner_id.id or False) or False
-            if not partner_id and thread._name == 'res.partner':
-                partner_id = thread.id
-            # destination partners
-            if partner_ids is None:
-                partner_ids = []
-            mail_partner_ids = [(6, 0, partner_ids)]
-
-            data = {
-                'subject': subject,
-                'body_text': body_text or thread._model._columns.get('description') and thread.description or '',
-                'body_html': body_html or '',
-                'parent_id': parent_id,
-                'date': email_date or fields.datetime.now(),
-                'type': type,
-                'content_subtype': content_subtype,
-                'state': state,
-                'message_id': message_id,
-                'partner_ids': mail_partner_ids,
-                'attachment_ids': [(6, 0, to_attach)],
-                'user_id': uid,
-                'model' : thread._name,
-                'res_id': thread.id,
-                'partner_id': partner_id,
-            }
-
-            if email_from or type == 'email':
-                for param in (email_to, email_cc, email_bcc):
-                    if isinstance(param, list):
-                        param = ", ".join(param)
-                data.update({
-                    'email_to': email_to,
-                    'email_from': email_from or \
-                        thread._model._columns.get('user_id') and thread.user_id and thread.user_id.user_email,
-                    'email_cc': email_cc,
-                    'email_bcc': email_bcc,
-                    'references': references,
-                    'headers': headers,
-                    'reply_to': reply_to,
-                    'original': original, })
-
-            new_msg_ids.append(self.message_create(cr, uid, thread.id, data, context=context))
-        return new_msg_ids
-
-    def message_append_dict(self, cr, uid, ids, msg_dict, context=None):
-        """Creates a new mail.message attached to the given threads (``ids``),
-           with the contents of ``msg_dict``, by calling ``message_append``
-           with the mail details. All attachments in msg_dict will be
-           attached to the object record as well as to the actual
-           mail message.
-
-           :param dict msg_dict: a map containing the email details and
-                                 attachments. See ``message_process()`` and
-                                ``mail.message.parse()`` for details on
-                                the dict structure.
-           :param dict context: if a ``thread_model`` value is present
-                                in the context, its value will be used
-                                to determine the model of the thread to
-                                update (instead of the current model).
-        """
-        return self.message_append(cr, uid, ids,
-                            subject = msg_dict.get('subject'),
-                            body_text = msg_dict.get('body_text'),
-                            body_html= msg_dict.get('body_html'),
-                            parent_id = msg_dict.get('parent_id', False),
-                            type = msg_dict.get('type', 'email'),
-                            content_subtype = msg_dict.get('content_subtype'),
-                            state = msg_dict.get('state'),
-                            partner_ids = msg_dict.get('partner_ids'),
-                            email_from = msg_dict.get('from', msg_dict.get('email_from')),
-                            email_to = msg_dict.get('to', msg_dict.get('email_to')),
-                            email_cc = msg_dict.get('cc', msg_dict.get('email_cc')),
-                            email_bcc = msg_dict.get('bcc', msg_dict.get('email_bcc')),
-                            reply_to = msg_dict.get('reply', msg_dict.get('reply_to')),
-                            email_date = msg_dict.get('date'),
-                            message_id = msg_dict.get('message-id', msg_dict.get('message_id')),
-                            references = msg_dict.get('references')\
-                                      or msg_dict.get('in-reply-to'),
-                            attachments = msg_dict.get('attachments'),
-                            headers = msg_dict.get('headers'),
-                            original = msg_dict.get('original'),
-                            context = context)
-
-    #------------------------------------------------------
-    # Message loading
-    #------------------------------------------------------
-
-    def _message_search_ancestor_ids(self, cr, uid, ids, child_ids, ancestor_ids, context=None):
-        """ Given message child_ids ids, find their ancestors until ancestor_ids
-            using their parent_id relationship.
-
-            :param child_ids: the first nodes of the search
-            :param ancestor_ids: list of ancestors. When the search reach an
-                                 ancestor, it stops.
-        """
-        def _get_parent_ids(message_list, ancestor_ids, child_ids):
-            """ Tool function: return the list of parent_ids of messages
-                contained in message_list. Parents that are in ancestor_ids
-                or in child_ids are not returned. """
-            return [message['parent_id'][0] for message in message_list
-                        if message['parent_id']
-                        and message['parent_id'][0] not in ancestor_ids
-                        and message['parent_id'][0] not in child_ids
-                    ]
-
-        message_obj = self.pool.get('mail.message')
-        messages_temp = message_obj.read(cr, uid, child_ids, ['id', 'parent_id'], context=context)
-        parent_ids = _get_parent_ids(messages_temp, ancestor_ids, child_ids)
-        child_ids += parent_ids
-        cur_iter = 0; max_iter = 100; # avoid infinite loop
-        while (parent_ids and (cur_iter < max_iter)):
-            cur_iter += 1
-            messages_temp = message_obj.read(cr, uid, parent_ids, ['id', 'parent_id'], context=context)
-            parent_ids = _get_parent_ids(messages_temp, ancestor_ids, child_ids)
-            child_ids += parent_ids
-        if (cur_iter > max_iter):
-            _logger.warning("Possible infinite loop in _message_search_ancestor_ids. "\
-                "Note that this algorithm is intended to check for cycle in "\
-                "message graph, leading to a curious error. Have fun.")
-        return child_ids
-
-    def message_search_get_domain(self, cr, uid, ids, context=None):
-        """ OpenChatter feature: get the domain to search the messages related
-            to a document. mail.thread defines the default behavior as
-            being messages with model = self._name, id in ids.
-            This method should be overridden if a model has to implement a
-            particular behavior.
-        """
-        return ['&', ('res_id', 'in', ids), ('model', '=', self._name)]
-
-    def message_search(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-                        limit=100, offset=0, domain=None, count=False, context=None):
-        """ OpenChatter feature: return thread messages ids according to the
-            search domain given by ``message_search_get_domain``.
-            
-            It is possible to add in the search the parent of messages by
-            setting the fetch_ancestors flag to True. In that case, using
-            the parent_id relationship, the method returns the id list according
-            to the search domain, but then calls ``_message_search_ancestor_ids``
-            that will add to the list the ancestors ids. The search is limited
-            to parent messages having an id in ancestor_ids or having
-            parent_id set to False.
-            
-            If ``count==True``, the number of ids is returned instead of the
-            id list. The count is done by hand instead of passing it as an 
-            argument to the search call because we might want to perform
-            a research including parent messages until some ancestor_ids.
-            
-            :param fetch_ancestors: performs an ascended search; will add 
-                                    to fetched msgs all their parents until
-                                    ancestor_ids
-            :param ancestor_ids: used when fetching ancestors
-            :param domain: domain to add to the search; especially child_of
-                           is interesting when dealing with threaded display.
-                           Note that the added domain is anded with the 
-                           default domain.
-            :param limit, offset, count, context: as usual
-        """
-        search_domain = self.message_search_get_domain(cr, uid, ids, context=context)
-        if domain:
-            search_domain += domain
-        message_obj = self.pool.get('mail.message')
-        message_res = message_obj.search(cr, uid, search_domain, limit=limit, offset=offset, count=count, context=context)
-        if not count and fetch_ancestors:
-            message_res += self._message_search_ancestor_ids(cr, uid, ids, message_res, ancestor_ids, context=context) 
-        return message_res
-
-    def message_read(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-                        limit=100, offset=0, domain=None, context=None):
-        """ OpenChatter feature: read the messages related to some threads.
-            This method is used mainly the Chatter widget, to directly have
-            read result instead of searching then reading.
-
-            Please see message_search for more information about the parameters.
-        """
-        message_ids = self.message_search(cr, uid, ids, fetch_ancestors, ancestor_ids,
-            limit, offset, domain, context=context)
-        messages = self.pool.get('mail.message').read(cr, uid, message_ids, context=context)
-
-        """ Retrieve all attachments names """
-        map_id_to_name = dict((attachment_id, '') for message in messages for attachment_id in message['attachment_ids'])
-
-        ids = map_id_to_name.keys()
-        names = self.pool.get('ir.attachment').name_get(cr, uid, ids, context=context)
-        
-        # convert the list of tuples into a dictionnary
-        for name in names: 
-            map_id_to_name[name[0]] = name[1]
-        
-        # give corresponding ids and names to each message
-        for msg in messages:
-            msg["attachments"] = []
-            
-            for attach_id in msg["attachment_ids"]:
-                msg["attachments"].append({'id': attach_id, 'name': map_id_to_name[attach_id]})
-        
-        # Set the threads as read
-        self.message_check_and_set_read(cr, uid, ids, context=context)
-        # Sort and return the messages
-        messages = sorted(messages, key=lambda d: (-d['id']))
-        return messages
-
-    def message_get_pushed_messages(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None,
-                            limit=100, offset=0, msg_search_domain=[], context=None):
-        """ OpenChatter: wall: get the pushed notifications and used them
-            to fetch messages to display on the wall.
-            
-            :param fetch_ancestors: performs an ascended search; will add
-                                    to fetched msgs all their parents until
-                                    ancestor_ids
-            :param ancestor_ids: used when fetching ancestors
-            :param domain: domain to add to the search; especially child_of
-                           is interesting when dealing with threaded display
-            :param ascent: performs an ascended search; will add to fetched msgs
-                           all their parents until root_ids
-            :param root_ids: for ascent search
-            :return: list of mail.messages sorted by date
-        """
-        notification_obj = self.pool.get('mail.notification')
-        msg_obj = self.pool.get('mail.message')
-        # update message search
-        for arg in msg_search_domain:
-            if isinstance(arg, (tuple, list)):
-                arg[0] = 'message_id.' + arg[0]
-        # compose final domain
-        domain = [('user_id', '=', uid)] + msg_search_domain
-        # get notifications
-        notification_ids = notification_obj.search(cr, uid, domain, limit=limit, offset=offset, context=context)
-        notifications = notification_obj.browse(cr, uid, notification_ids, context=context)
-        msg_ids = [notification.message_id.id for notification in notifications]
-        # get messages
-        msg_ids = msg_obj.search(cr, uid, [('id', 'in', msg_ids)], context=context)
-        if (fetch_ancestors): msg_ids = self._message_search_ancestor_ids(cr, uid, ids, msg_ids, ancestor_ids, context=context)
-        msgs = msg_obj.read(cr, uid, msg_ids, context=context)
-        return msgs
+    def _message_find_partners(self, cr, uid, message, header_fields=['From'], context=None):
+        """ Find partners related to some header fields of the message. """
+        s = ', '.join([decode(message.get(h)) for h in header_fields if message.get(h)])
+        return [partner_id for email in tools.email_split(s)
+                for partner_id in self.pool.get('res.partner').search(cr, uid, [('email', 'ilike', email)], context=context)]
 
     def _message_find_user_id(self, cr, uid, message, context=None):
-        from_local_part = to_email(decode(message.get('From')))[0]
-        user_ids = self.pool.get('res.users').search(cr, uid, [('login', '=', from_local_part)], context=context)
+        from_local_part = tools.email_split(decode(message.get('From')))[0]
+        # FP Note: canonification required, the minimu: .lower()
+        user_ids = self.pool.get('res.users').search(cr, uid, ['|',
+            ('login', '=', from_local_part),
+            ('email', '=', from_local_part)], context=context)
         return user_ids[0] if user_ids else uid
 
-    #------------------------------------------------------
-    # Mail gateway
-    #------------------------------------------------------
-    # message_process will call either message_new or message_update.
-
     def message_route(self, cr, uid, message, model=None, thread_id=None,
                       custom_values=None, context=None):
         """Attempt to figure out the correct target model, thread_id,
@@ -679,11 +292,11 @@ class mail_thread(osv.Model):
         Multiple values may be returned, if a message had multiple
         recipients matching existing mail.aliases, for example.
 
-        The following heuristics are used, in this order: 
+        The following heuristics are used, in this order:
              1. If the message replies to an existing thread_id, and
                 properly contains the thread model in the 'In-Reply-To'
                 header, use this model/thread_id pair, and ignore
-                custom_value (not needed as no creation will take place) 
+                custom_value (not needed as no creation will take place)
              2. Look for a mail.alias entry matching the message
                 recipient, and use the corresponding model, thread_id,
                 custom_values and user_id.
@@ -706,10 +319,12 @@ class mail_thread(osv.Model):
         """
         assert isinstance(message, Message), 'message must be an email.message.Message at this point'
         message_id = message.get('Message-Id')
+        references = decode_header(message, 'References')
+        in_reply_to = decode_header(message, 'In-Reply-To')
 
         # 1. Verify if this is a reply to an existing thread
-        references = decode_header(message, 'References') or decode_header(message, 'In-Reply-To')
-        ref_match = references and tools.reference_re.search(references)
+        thread_references = references or in_reply_to
+        ref_match = thread_references and tools.reference_re.search(thread_references)
         if ref_match:
             thread_id = int(ref_match.group(1))
             model = ref_match.group(2) or model
@@ -719,7 +334,15 @@ class mail_thread(osv.Model):
                 _logger.debug('Routing mail with Message-Id %s: direct reply to model: %s, thread_id: %s, custom_values: %s, uid: %s',
                               message_id, model, thread_id, custom_values, uid)
                 return [(model, thread_id, custom_values, uid)]
-        
+
+        # Verify this is a reply to a private message
+        message_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', in_reply_to)], limit=1, context=context)
+        if message_ids:
+            message = self.pool.get('mail.message').browse(cr, uid, message_ids[0], context=context)
+            _logger.debug('Routing mail with Message-Id %s: direct reply to a private message: %s, custom_values: %s, uid: %s',
+                            message_id, message.id, custom_values, uid)
+            return [(False, 0, custom_values, uid)]
+
         # 2. Look for a matching mail.alias entry
         # Delivered-To is a safe bet in most modern MTAs, but we have to fallback on To + Cc values
         # for all the odd MTAs out there, as there is no standard header for the envelope's `rcpt_to` value.
@@ -728,7 +351,7 @@ class mail_thread(osv.Model):
                        decode_header(message, 'Cc'),
                        decode_header(message, 'Resent-To'),
                        decode_header(message, 'Resent-Cc')])
-        local_parts = [e.split('@')[0] for e in to_email(rcpt_tos)]
+        local_parts = [e.split('@')[0] for e in tools.email_split(rcpt_tos)]
         if local_parts:
             mail_alias = self.pool.get('mail.alias')
             alias_ids = mail_alias.search(cr, uid, [('alias_name', 'in', local_parts)])
@@ -742,7 +365,7 @@ class mail_thread(osv.Model):
                                    eval(alias.alias_defaults), user_id))
                 _logger.debug('Routing mail with Message-Id %s: direct alias match: %r', message_id, routes)
                 return routes
-        
+
         # 3. Fallback to the provided parameters, if they work
         model_pool = self.pool.get(model)
         if not thread_id:
@@ -760,19 +383,21 @@ class mail_thread(osv.Model):
                       message_id, model, thread_id, custom_values, uid)
         return [(model, thread_id, custom_values, uid)]
 
-
     def message_process(self, cr, uid, model, message, custom_values=None,
                         save_original=False, strip_attachments=False,
                         thread_id=None, context=None):
-        """Process an incoming RFC2822 email message, relying on
-           ``mail.message.parse()`` for the parsing operation,
-           and ``message_route()`` to figure out the target model. 
-           
-           Once the target model is known, its ``message_new`` method
-           is called with the new message (if the thread record did not exist)
-            or its ``message_update`` method (if it did). Finally,
-           ``message_forward`` is called to automatically notify other
-           people that should receive this message.
+        """ Process an incoming RFC2822 email message, relying on
+            ``mail.message.parse()`` for the parsing operation,
+            and ``message_route()`` to figure out the target model.
+
+            Once the target model is known, its ``message_new`` method
+            is called with the new message (if the thread record did not exist)
+            or its ``message_update`` method (if it did).
+
+            There is a special case where the target model is False: a reply
+            to a private message. In this case, we skip the message_new /
+            message_update step, to just post a new message using mail_thread
+            message_post.
 
            :param string model: the fallback model to use if the message
                does not match any of the currently configured mail aliases
@@ -792,7 +417,8 @@ class mail_thread(osv.Model):
                overrides the automatic detection based on the message
                headers.
         """
-        if context is None: context = {}
+        if context is None:
+            context = {}
 
         # extract message bytes - we are forced to pass the message as binary because
         # we don't know its encoding until we parse its headers and hence can't
@@ -807,35 +433,34 @@ class mail_thread(osv.Model):
         routes = self.message_route(cr, uid, msg_txt, model,
                                     thread_id, custom_values,
                                     context=context)
-        msg = self.pool.get('mail.message').parse_message(msg_txt, save_original=save_original, context=context)
-        msg['state'] = 'received'     
-        if strip_attachments and 'attachments' in msg:
-            del msg['attachments']
-        for model, thread_id, custom_values, user_id in routes:   
+        msg = self.message_parse(cr, uid, msg_txt, save_original=save_original, context=context)
+        if strip_attachments:
+            msg.pop('attachments', None)
+        thread_id = False
+        for model, thread_id, custom_values, user_id in routes:
             if self._name != model:
                 context.update({'thread_model': model})
-            model_pool = self.pool.get(model)
-            assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
-                "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" % \
-                    (msg['message-id'], model)
-            if thread_id and hasattr(model_pool, 'message_update'):
-                model_pool.message_update(cr, user_id, [thread_id], msg, context=context)
+            if model:
+                model_pool = self.pool.get(model)
+                assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \
+                    "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" % \
+                        (msg['message_id'], model)
+                if thread_id and hasattr(model_pool, 'message_update'):
+                    model_pool.message_update(cr, user_id, [thread_id], msg, context=context)
+                else:
+                    thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
             else:
-                thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context)
-    
-            # Forward the email to other followers
-            self.message_forward(cr, uid, model, [thread_id], msg_txt, context=context)
-            model_pool.message_mark_as_unread(cr, uid, [thread_id], context=context)
-        return True
+                assert thread_id == 0, "Posting a message without model should be with a null res_id, to create a private message."
+                model_pool = self.pool.get('mail.thread')
+            model_pool.message_post_user_api(cr, uid, [thread_id], context=context, content_subtype='html', **msg)
+        return thread_id
 
     def message_new(self, cr, uid, msg_dict, custom_values=None, context=None):
         """Called by ``message_process`` when a new message is received
            for a given thread model, if the message did not belong to
            an existing thread.
            The default behavior is to create a new record of the corresponding
-           model (based on some very basic info extracted from the message),
-           then attach the message to the newly created record
-           (by calling ``message_append_dict``).
+           model (based on some very basic info extracted from the message).
            Additional behavior may be implemented by overriding this method.
 
            :param dict msg_dict: a map containing the email details and
@@ -864,14 +489,12 @@ class mail_thread(osv.Model):
         if custom_values and isinstance(custom_values, dict):
             data.update(custom_values)
         res_id = model_pool.create(cr, uid, data, context=context)
-        self.message_append_dict(cr, uid, [res_id], msg_dict, context=context)
         return res_id
 
     def message_update(self, cr, uid, ids, msg_dict, update_vals=None, context=None):
         """Called by ``message_process`` when a new message is received
-           for an existing thread. The default behavior is to create a
-           new mail.message in the given thread (by calling
-           ``message_append_dict``)
+           for an existing thread. The default behavior is to update the record
+           with update_vals taken from the incoming email.
            Additional behavior may be implemented by overriding this
            method.
            :param dict msg_dict: a map containing the email details and
@@ -883,285 +506,345 @@ class mail_thread(osv.Model):
         """
         if update_vals:
             self.write(cr, uid, ids, update_vals, context=context)
-        return self.message_append_dict(cr, uid, ids, msg_dict, context=context)
-
-    def message_thread_followers(self, cr, uid, ids, context=None):
-        """ Returns a list of email addresses of the people following
-            this thread, including the sender of each mail, and the
-            people who were in CC of the messages, if any.
-        """
-        res = {}
-        if isinstance(ids, (str, int, long)):
-            ids = [long(ids)]
-        for thread in self.browse(cr, uid, ids, context=context):
-            l = set()
-            for message in thread.message_ids:
-                l.add((message.user_id and message.user_id.email) or '')
-                l.add(message.email_from or '')
-                l.add(message.email_cc or '')
-            res[thread.id] = filter(None, l)
-        return res
-
-    def message_forward(self, cr, uid, model, thread_ids, msg, email_error=False, context=None):
-        """Sends an email to all people following the given threads.
-           The emails are forwarded immediately, not queued for sending,
-           and not archived.
-
-        :param str model: thread model
-        :param list thread_ids: ids of the thread records
-        :param msg: email.message.Message object to forward
-        :param email_error: optional email address to notify in case
-                            of any delivery error during the forward.
-        :return: True
-        """
-        model_pool = self.pool.get(model)
-        smtp_server_obj = self.pool.get('ir.mail_server')
-        for res in model_pool.browse(cr, uid, thread_ids, context=context):
-            if hasattr(model_pool, 'message_thread_followers'):
-                followers = model_pool.message_thread_followers(cr, uid, [res.id])[res.id]
-            else:
-                followers = self.message_thread_followers(cr, uid, [res.id])[res.id]
-            message_followers_emails = to_email(','.join(filter(None, followers)))
-            message_recipients = to_email(','.join(filter(None,
-                                                                       [decode(msg['from']),
-                                                                        decode(msg['to']),
-                                                                        decode(msg['cc'])])))
-            forward_to = [i for i in message_followers_emails if (i and (i not in message_recipients))]
-            if forward_to:
-                # TODO: we need an interface for this for all types of objects, not just leads
-                if model_pool._columns.get('section_id'):
-                    del msg['reply-to']
-                    msg['reply-to'] = res.section_id.reply_to
-
-                smtp_from, = to_email(msg['from'])
-                msg['from'] = smtp_from
-                msg['to'] =  ", ".join(forward_to)
-                msg['message-id'] = tools.generate_tracking_message_id(res.id)
-                if not smtp_server_obj.send_email(cr, uid, msg) and email_error:
-                    subj = msg['subject']
-                    del msg['subject'], msg['to'], msg['cc'], msg['bcc']
-                    msg['subject'] = _('[OpenERP-Forward-Failed] %s') % subj
-                    msg['to'] = email_error
-                    smtp_server_obj.send_email(cr, uid, msg)
         return True
 
-    def message_partner_by_email(self, cr, uid, email, context=None):
-        """Attempts to return the id of a partner address matching
-           the given ``email``, and the corresponding partner id.
-           Can be used by classes using the ``mail.thread`` mixin
-           to lookup the partner and use it in their implementation
-           of ``message_new`` to link the new record with a
-           corresponding partner.
-           The keys used in the returned dict are meant to map
-           to usual names for relationships towards a partner
-           and one of its addresses.
+    def _message_extract_payload(self, message, save_original=False):
+        """Extract body as HTML and attachments from the mail message"""
+        attachments = []
+        body = u''
+        if save_original:
+            attachments.append(('original_email.eml', message.as_string()))
+        if not message.is_multipart() or 'text/' in message.get('content-type', ''):
+            encoding = message.get_content_charset()
+            body = message.get_payload(decode=True)
+            body = tools.ustr(body, encoding, errors='replace')
+            if message.get_content_type() == 'text/plain':
+                # text/plain -> <pre/>
+                body = tools.append_content_to_html(u'', body, preserve=True)
+        else:
+            alternative = (message.get_content_type() == 'multipart/alternative')
+            for part in message.walk():
+                if part.get_content_maintype() == 'multipart':
+                    continue # skip container
+                filename = part.get_filename() # None if normal part
+                encoding = part.get_content_charset() # None if attachment
+                # 1) Explicit Attachments -> attachments
+                if filename or part.get('content-disposition', '').strip().startswith('attachment'):
+                    attachments.append((filename or 'attachment', part.get_payload(decode=True)))
+                    continue
+                # 2) text/plain -> <pre/>
+                if part.get_content_type() == 'text/plain' and (not alternative or not body):
+                    body = tools.append_content_to_html(body, tools.ustr(part.get_payload(decode=True),
+                                                                         encoding, errors='replace'), preserve=True)
+                # 3) text/html -> raw
+                elif part.get_content_type() == 'text/html':
+                    html = tools.ustr(part.get_payload(decode=True), encoding, errors='replace')
+                    if alternative:
+                        body = html
+                    else:
+                        body = tools.append_content_to_html(body, html, plaintext=False)
+                # 4) Anything else -> attachment
+                else:
+                    attachments.append((filename or 'attachment', part.get_payload(decode=True)))
+        return body, attachments
 
-           :param email: email address for which a partner
-                         should be searched for.
+    def message_parse(self, cr, uid, message, save_original=False, context=None):
+        """Parses a string or email.message.Message representing an
+           RFC-2822 email, and returns a generic dict holding the
+           message details.
+
+           :param message: the message to parse
+           :type message: email.message.Message | string | unicode
+           :param bool save_original: whether the returned dict
+               should include an ``original`` attachment containing
+               the source of the message
            :rtype: dict
-           :return: a map of the following form::
+           :return: A dict with the following structure, where each
+                    field may not be present if missing in original
+                    message::
 
-                      { 'partner_address_id': id or False,
-                        'partner_id': pid or False }
+                    { 'message_id': msg_id,
+                      'subject': subject,
+                      'from': from,
+                      'to': to,
+                      'cc': cc,
+                      'body': unified_body,
+                      'attachments': [('file1', 'bytes'),
+                                      ('file2', 'bytes')}
+                    }
         """
-        partner_pool = self.pool.get('res.partner')
-        res = {'partner_id': False}
-        if email:
-            email = to_email(email)[0]
-            contact_ids = partner_pool.search(cr, uid, [('email', '=', email)])
-            if contact_ids:
-                contact = partner_pool.browse(cr, uid, contact_ids[0])
-                res['partner_id'] = contact.id
-        return res
+        msg_dict = {
+            'type': 'email',
+            'author_id': False,
+        }
+        if not isinstance(message, Message):
+            if isinstance(message, unicode):
+                # Warning: message_from_string doesn't always work correctly on unicode,
+                # we must use utf-8 strings here :-(
+                message = message.encode('utf-8')
+            message = email.message_from_string(message)
 
-    # for backwards-compatibility with old scripts
-    process_email = message_process
+        message_id = message['message-id']
+        if not message_id:
+            # Very unusual situation, be we should be fault-tolerant here
+            message_id = "<%s@localhost>" % time.time()
+            _logger.debug('Parsing Message without message-id, generating a random one: %s', message_id)
+        msg_dict['message_id'] = message_id
+
+        if 'Subject' in message:
+            msg_dict['subject'] = decode(message.get('Subject'))
+
+        # Envelope fields not stored in mail.message but made available for message_new()
+        msg_dict['from'] = decode(message.get('from'))
+        msg_dict['to'] = decode(message.get('to'))
+        msg_dict['cc'] = decode(message.get('cc'))
+
+        if 'From' in message:
+            author_ids = self._message_find_partners(cr, uid, message, ['From'], context=context)
+            if author_ids:
+                msg_dict['author_id'] = author_ids[0]
+            else:
+                msg_dict['email_from'] = message.get('from')
+        partner_ids = self._message_find_partners(cr, uid, message, ['From', 'To', 'Cc'], context=context)
+        msg_dict['partner_ids'] = [(4, partner_id) for partner_id in partner_ids]
+
+        if 'Date' in message:
+            date_hdr = decode(message.get('Date'))
+            # convert from email timezone to server timezone
+            date_server_datetime = dateutil.parser.parse(date_hdr).astimezone(pytz.timezone(tools.get_server_timezone()))
+            date_server_datetime_str = date_server_datetime.strftime(tools.DEFAULT_SERVER_DATETIME_FORMAT)
+            msg_dict['date'] = date_server_datetime_str
+
+        if 'In-Reply-To' in message:
+            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', decode(message['In-Reply-To']))])
+            if parent_ids:
+                msg_dict['parent_id'] = parent_ids[0]
+
+        if 'References' in message and 'parent_id' not in msg_dict:
+            parent_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', 'in',
+                                                                         [x.strip() for x in decode(message['References']).split()])])
+            if parent_ids:
+                msg_dict['parent_id'] = parent_ids[0]
+
+        msg_dict['body'], msg_dict['attachments'] = self._message_extract_payload(message)
+        return msg_dict
 
     #------------------------------------------------------
     # Note specific
     #------------------------------------------------------
 
     def log(self, cr, uid, id, message, secondary=False, context=None):
-        _logger.warning("log() is deprecated. As this module inherit from \
-                        mail.thread, the message will be managed by this \
-                        module instead of by the res.log mechanism. Please \
-                        use the mail.thread OpenChatter API instead of the \
-                        now deprecated res.log.")
-        self.message_append_note(cr, uid, [id], 'res.log', message, context=context)
+        _logger.warning("log() is deprecated. As this module inherit from "\
+                        "mail.thread, the message will be managed by this "\
+                        "module instead of by the res.log mechanism. Please "\
+                        "use mail_thread.message_post() instead of the "\
+                        "now deprecated res.log.")
+        self.message_post(cr, uid, [id], message, context=context)
 
-    def message_append_note(self, cr, uid, ids, subject=None, body=None, parent_id=False,
-                            type='notification', content_subtype='html', context=None):
-        if content_subtype == 'html':
-            body_html = body
-            body_text = body
+    def message_post(self, cr, uid, thread_id, body='', subject=None, type='notification',
+                        subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
+        """ Post a new message in an existing thread, returning the new
+            mail.message ID. Extra keyword arguments will be used as default
+            column values for the new mail.message record.
+            Auto link messages for same id and object
+            :param int thread_id: thread ID to post into, or list with one ID;
+                if False/0, mail.message model will also be set as False
+            :param str body: body of the message, usually raw HTML that will
+                be sanitized
+            :param str subject: optional subject
+            :param str type: mail_message.type
+            :param int parent_id: optional ID of parent message in this thread
+            :param tuple(str,str) attachments or list id: list of attachment tuples in the form
+                ``(name,content)``, where content is NOT base64 encoded
+            :return: ID of newly created mail.message
+        """
+        if context is None:
+            context = {}
+        if attachments is None:
+            attachments = {}
+
+        assert (not thread_id) or isinstance(thread_id, (int, long)) or \
+            (isinstance(thread_id, (list, tuple)) and len(thread_id) == 1), "Invalid thread_id; should be 0, False, an ID or a list with one ID"
+        if isinstance(thread_id, (list, tuple)):
+            thread_id = thread_id and thread_id[0]
+        mail_message = self.pool.get('mail.message')
+        model = context.get('thread_model', self._name) if thread_id else False
+
+        attachment_ids = []
+        for name, content in attachments:
+            if isinstance(content, unicode):
+                content = content.encode('utf-8')
+            data_attach = {
+                'name': name,
+                'datas': base64.b64encode(str(content)),
+                'datas_fname': name,
+                'description': name,
+                'res_model': context.get('thread_model') or self._name,
+                'res_id': thread_id,
+            }
+            attachment_ids.append((0, 0, data_attach))
+
+        # fetch subtype
+        if subtype:
+            s_data = subtype.split('.')
+            if len(s_data) == 1:
+                s_data = ('mail', s_data[0])
+            ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, s_data[0], s_data[1])
+            subtype_id = ref and ref[1] or False
         else:
-            body_html = body
-            body_text = body
-        return self.message_append(cr, uid, ids, subject, body_html, body_text,
-                                    type, parent_id=parent_id,
-                                    content_subtype=content_subtype, context=context)
+            subtype_id = False
 
-    #------------------------------------------------------
-    # Subscription mechanism
-    #------------------------------------------------------
+        # _mail_flat_thread: automatically set free messages to the first posted message
+        if self._mail_flat_thread and not parent_id and thread_id:
+            message_ids = mail_message.search(cr, uid, ['&', ('res_id', '=', thread_id), ('model', '=', model)], context=context, order="id ASC", limit=1)
+            parent_id = message_ids and message_ids[0] or False
+        # we want to set a parent: force to set the parent_id to the oldest ancestor, to avoid having more than 1 level of thread
+        elif parent_id:
+            message_ids = mail_message.search(cr, SUPERUSER_ID, [('id', '=', parent_id), ('parent_id', '!=', False)], context=context)
+            # avoid loops when finding ancestors
+            processed_list = []
+            if message_ids:
+                message = mail_message.browse(cr, SUPERUSER_ID, message_ids[0], context=context)
+                while (message.parent_id and message.parent_id.id not in processed_list):
+                    processed_list.append(message.parent_id.id)
+                    message = message.parent_id
+                parent_id = message.id
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Returns a list of fields containing a res.user.id. Those fields
-            will be checked to automatically subscribe those users.
-        """
-        return []
-
-    def message_subscribe(self, cr, uid, ids, user_ids = None, context=None):
-        """ Subscribe the user (or user_ids) to the current document.
-            
-            :param user_ids: a list of user_ids; if not set, subscribe
-                             uid instead
-            :param return: new value of followers, for Chatter
-        """
-        to_subscribe_uids = [uid] if user_ids is None else user_ids
-        write_res = self.write(cr, uid, ids, {'message_follower_ids': self.message_subscribe_get_command(cr, uid, to_subscribe_uids, context)}, context=context)
-        return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
-
-    def message_subscribe_get_command(self, cr, uid, follower_ids, context=None):
-        """ Generate the many2many command to add followers. """
-        return [(4, id) for id in follower_ids]
-
-    def message_unsubscribe(self, cr, uid, ids, user_ids = None, context=None):
-        """ Unsubscribe the user (or user_ids) from the current document.
-            
-            :param user_ids: a list of user_ids; if not set, subscribe
-                             uid instead
-            :param return: new value of followers, for Chatter
-        """
-        to_unsubscribe_uids = [uid] if user_ids is None else user_ids
-        write_res = self.write(cr, uid, ids, {'message_follower_ids': self.message_unsubscribe_get_command(cr, uid, to_unsubscribe_uids, context)}, context=context)
-        return [follower.id for thread in self.browse(cr, uid, ids, context=context) for follower in thread.message_follower_ids]
-
-    def message_unsubscribe_get_command(self, cr, uid, follower_ids, context=None):
-        """ Generate the many2many command to remove followers. """
-        return [(3, id) for id in follower_ids]
-
-    #------------------------------------------------------
-    # Notification API
-    #------------------------------------------------------
-
-    def message_create_notify_by_email(self, cr, uid, new_msg_values, user_to_notify_ids, context=None):
-        """ When creating a new message and pushing notifications, emails
-            must be send if users have chosen to receive notifications
-            by email via the notification_email_pref field.
-            
-            ``notification_email_pref`` can have 3 values :
-            - all: receive all notification by email (for example for shared
-              users)
-            - to_me: messages send directly to me (@login, messages on res.users)
-            - never: never receive notifications
-            Note that an user should never receive notifications for messages
-            he has created.
-            
-            :param new_msg_values: dictionary of message values, those that
-                                   are given to the create method
-            :param user_to_notify_ids: list of user_ids, user that will
-                                       receive a notification on their Wall
-        """
-        message_obj = self.pool.get('mail.message')
-        res_users_obj = self.pool.get('res.users')
-        body = new_msg_values.get('body_html', '') if new_msg_values.get('content_subtype') == 'html' else new_msg_values.get('body_text', '')
-        
-        # remove message writer
-        if user_to_notify_ids.count(new_msg_values.get('user_id')) > 0:
-            user_to_notify_ids.remove(new_msg_values.get('user_id'))
-
-        # try to find an email_to
-        email_to = ''
-        for user in res_users_obj.browse(cr, uid, user_to_notify_ids, context=context):
-            # TO BE REFACTORED BY FP, JUSTE REMOVED TO_ME, NOT SURE WHAT S NEW BEHAVIOR
-            if not user.notification_email_pref == 'all':
-                continue
-            if not user.email:
-                continue
-            email_to = '%s, %s' % (email_to, user.email)
-            email_to = email_to.lstrip(', ')
-        
-        # did not find any email address: not necessary to create an email
-        if not email_to:
-            return
-        
-        # try to find an email_from
-        current_user = res_users_obj.browse(cr, uid, [uid], context=context)[0]
-        email_from = new_msg_values.get('email_from')
-        if not email_from:
-            email_from = current_user.email
-        
-        # get email content, create it (with mail_message.create)
-        email_values = self.message_create_notify_get_email_dict(cr, uid, new_msg_values, email_from, email_to, context)
-        email_id = message_obj.create(cr, uid, email_values, context=context)
-        return email_id
-    
-    def message_create_notify_get_email_dict(self, cr, uid, new_msg_values, email_from, email_to, context=None):
-        values = dict(new_msg_values)
-        
-        body_html = new_msg_values.get('body_html', '')
-        if body_html:
-            body_html += '\n\n----------\nThis email was send automatically by OpenERP, because you have subscribed to a document.'
-        body_text = new_msg_values.get('body_text', '')
-        if body_text:
-            body_text += '\n\n----------\nThis email was send automatically by OpenERP, because you have subscribed to a document.'
+        values = kwargs
         values.update({
-            'type': 'email',
-            'state': 'outgoing',
-            'email_from': email_from,
-            'email_to': email_to,
-            'subject': 'New message',
-            'content_subtype': new_msg_values.get('content_subtype', 'plain'),
-            'body_html': body_html,
-            'body_text': body_text,
-            'auto_delete': True,
-            'res_model': '',
-            'res_id': False,
+            'model': model,
+            'res_id': thread_id or False,
+            'body': body,
+            'subject': subject or False,
+            'type': type,
+            'parent_id': parent_id,
+            'attachment_ids': attachment_ids,
+            'subtype_id': subtype_id,
         })
-        return values
 
-    def message_remove_pushed_notifications(self, cr, uid, ids, msg_ids, remove_childs=True, context=None):
-        notif_obj = self.pool.get('mail.notification')
-        msg_obj = self.pool.get('mail.message')
-        if remove_childs:
-            notif_msg_ids = msg_obj.search(cr, uid, [('id', 'child_of', msg_ids)], context=context)
-        else:
-            notif_msg_ids = msg_ids
-        to_del_notif_ids = notif_obj.search(cr, uid, ['&', ('user_id', '=', uid), ('message_id', 'in', notif_msg_ids)], context=context)
-        return notif_obj.unlink(cr, uid, to_del_notif_ids, context=context)
+        # Avoid warnings about non-existing fields
+        for x in ('from', 'to', 'cc'):
+            values.pop(x, None)
+
+        return mail_message.create(cr, uid, values, context=context)
+
+    def message_post_user_api(self, cr, uid, thread_id, body='', subject=False, parent_id=False,
+                                attachment_ids=None, context=None, content_subtype='plaintext', **kwargs):
+        """ Wrapper on message_post, used for user input :
+            - mail gateway
+            - quick reply in Chatter (refer to mail.js), not
+                the mail.compose.message wizard
+            The purpose is to perform some pre- and post-processing:
+            - if body is plaintext: convert it into html
+            - if parent_id: handle reply to a previous message by adding the
+                parent partners to the message
+            - type and subtype: comment and mail.mt_comment by default
+            - attachment_ids: supposed not attached to any document; attach them
+                to the related document. Should only be set by Chatter.
+        """
+        ir_attachment = self.pool.get('ir.attachment')
+        mail_message = self.pool.get('mail.message')
+
+        # 1. Pre-processing: body, partner_ids, type and subtype
+        if content_subtype == 'plaintext':
+            body = tools.plaintext2html(body)
+
+        partner_ids = kwargs.pop('partner_ids', [])
+        if parent_id:
+            parent_message = self.pool.get('mail.message').browse(cr, uid, parent_id, context=context)
+            partner_ids += [(4, partner.id) for partner in parent_message.partner_ids]
+            # TDE FIXME HACK: mail.thread -> private message
+            if self._name == 'mail.thread' and parent_message.author_id.id:
+                partner_ids.append((4, parent_message.author_id.id))
+
+        message_type = kwargs.pop('type', 'comment')
+        message_subtype = kwargs.pop('subtype', 'mail.mt_comment')
+
+        # 2. Post message
+        new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=message_type,
+                        subtype=message_subtype, parent_id=parent_id, context=context, partner_ids=partner_ids, **kwargs)
+
+        # 3. Post-processing
+        # HACK TDE FIXME: Chatter: attachments linked to the document (not done JS-side), load the message
+        if attachment_ids:
+            filtered_attachment_ids = ir_attachment.search(cr, SUPERUSER_ID, [
+                ('res_model', '=', 'mail.compose.message'),
+                ('res_id', '=', 0),
+                ('create_uid', '=', uid),
+                ('id', 'in', attachment_ids)], context=context)
+            if filtered_attachment_ids:
+                ir_attachment.write(cr, SUPERUSER_ID, attachment_ids, {'res_model': self._name, 'res_id': thread_id}, context=context)
+                mail_message.write(cr, SUPERUSER_ID, [new_message_id], {'attachment_ids': [(6, 0, [pid for pid in attachment_ids])]}, context=context)
+
+        return new_message_id
 
     #------------------------------------------------------
-    # Thread_state
+    # Followers API
     #------------------------------------------------------
 
-    def message_create_set_unread(self, cr, uid, ids, context=None):
-        """ When creating a new message, set as unread if uid is not the
-            object responsible. """
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.message_state and self._columns.get('user_id') and (not obj.user_id or obj.user_id.id != uid):
-                self.message_mark_as_unread(cr, uid, [obj.id], context=context)
+    def message_get_subscription_data(self, cr, uid, ids, context=None):
+        """ Wrapper to get subtypes data. """
+        return self._get_subscription_data(cr, uid, ids, None, None, context=context)
 
-    def message_check_and_set_unread(self, cr, uid, ids, context=None):
-        """ Set unread if uid is the object responsible or if the object has
-            no responsible. """
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.message_state and self._columns.get('user_id') and (not obj.user_id or obj.user_id.id == uid):
-                self.message_mark_as_unread(cr, uid, [obj.id], context=context)
+    def message_subscribe_users(self, cr, uid, ids, user_ids=None, subtype_ids=None, context=None):
+        """ Wrapper on message_subscribe, using users. If user_ids is not
+            provided, subscribe uid instead. """
+        if user_ids is None:
+            user_ids = [uid]
+        partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
+        return self.message_subscribe(cr, uid, ids, partner_ids, subtype_ids=subtype_ids, context=context)
+
+    def message_subscribe(self, cr, uid, ids, partner_ids, subtype_ids=None, context=None):
+        """ Add partners to the records followers. """
+        self.write(cr, uid, ids, {'message_follower_ids': [(4, pid) for pid in partner_ids]}, context=context)
+        # if subtypes are not specified (and not set to a void list), fetch default ones
+        if subtype_ids is None:
+            subtype_obj = self.pool.get('mail.message.subtype')
+            subtype_ids = subtype_obj.search(cr, uid, [('default', '=', True), '|', ('res_model', '=', self._name), ('res_model', '=', False)], context=context)
+        # update the subscriptions
+        fol_obj = self.pool.get('mail.followers')
+        fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', 'in', ids), ('partner_id', 'in', partner_ids)], context=context)
+        fol_obj.write(cr, SUPERUSER_ID, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
+        return True
+
+    def message_unsubscribe_users(self, cr, uid, ids, user_ids=None, context=None):
+        """ Wrapper on message_subscribe, using users. If user_ids is not
+            provided, unsubscribe uid instead. """
+        if user_ids is None:
+            user_ids = [uid]
+        partner_ids = [user.partner_id.id for user in self.pool.get('res.users').browse(cr, uid, user_ids, context=context)]
+        return self.message_unsubscribe(cr, uid, ids, partner_ids, context=context)
+
+    def message_unsubscribe(self, cr, uid, ids, partner_ids, context=None):
+        """ Remove partners from the records followers. """
+        return self.write(cr, uid, ids, {'message_follower_ids': [(3, pid) for pid in partner_ids]}, context=context)
+
+    #------------------------------------------------------
+    # Thread state
+    #------------------------------------------------------
 
     def message_mark_as_unread(self, cr, uid, ids, context=None):
         """ Set as unread. """
-        return self.write(cr, uid, ids, {'message_state': False}, context=context)
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        cr.execute('''
+            UPDATE mail_notification SET
+                read=false
+            WHERE
+                message_id IN (SELECT id from mail_message where res_id=any(%s) and model=%s limit 1) and
+                partner_id = %s
+        ''', (ids, self._name, partner_id))
+        return True
 
-    def message_check_and_set_read(self, cr, uid, ids, context=None):
-        """ Set read if uid is the object responsible. """
-        for obj in self.browse(cr, uid, ids, context=context):
-            if not obj.message_state and self._columns.get('user_id') and obj.user_id and obj.user_id.id == uid:
-                self.message_mark_as_read(cr, uid, [obj.id], context=context)
-    
     def message_mark_as_read(self, cr, uid, ids, context=None):
         """ Set as read. """
-        return self.write(cr, uid, ids, {'message_state': True}, context=context)
-
+        partner_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).partner_id.id
+        cr.execute('''
+            UPDATE mail_notification SET
+                read=true
+            WHERE
+                message_id IN (SELECT id FROM mail_message WHERE res_id=ANY(%s) AND model=%s) AND
+                partner_id = %s
+        ''', (ids, self._name, partner_id))
+        return True
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index 68727832e53..3a37218c813 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -1,28 +1,160 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
+        <record id="action_mail_inbox_feeds" model="ir.actions.client">
+            <field name="name">Inbox</field>
+            <field name="tag">mail.wall</field>
+            <field name="res_model">mail.message</field>
+            <field name="context">{
+              'default_model': 'res.users', 
+              'default_res_id': uid,
+            }</field>
+            <field name="params" eval="&quot;{
+                'domain': [
+                  ('notification_ids.partner_id.user_ids', 'in', [uid]),
+                  ('to_read', '=', True),
+                  ('favorite_user_ids', 'not in', [uid])
+                ],
+                'view_mailbox': True,
+                'view_inbox': True,
+                'read_action': 'read'
+            }&quot;"/>
+            <field name="help" type="html">
+                <p>
+                    <b>Good Job!</b> Your inbox is empty.
+                </p><p>
+                    Your inbox contains private messages or emails sent to you
+                    as well as information related to documents or people you
+                    follow.
+                </p>
+            </field>
+        </record>
+
+        <record id="action_mail_to_me_feeds" model="ir.actions.client">
+            <field name="name">To: me</field>
+            <field name="tag">mail.wall</field>
+            <field name="res_model">mail.message</field>
+            <field name="context">{
+              'default_model': 'res.users', 
+              'default_res_id': uid, 
+              'search_default_message_unread': True
+            }</field>
+            <field name="params" eval="&quot;{
+                'domain': [('partner_ids.user_ids', 'in', [uid])],
+                'view_mailbox': True,
+                'read_action': 'read', }&quot;"/>
+            <field name="help" type="html">
+                <p>
+                    <b>No private message.</b>
+                </p><p>
+                    This list contains messages sent to you.
+                </p>
+            </field>
+        </record>
+
+        <record id="action_mail_star_feeds" model="ir.actions.client">
+            <field name="name">Todo</field>
+            <field name="tag">mail.wall</field>
+            <field name="res_model">mail.message</field>
+            <field name="context">{
+              'default_model': 'res.users', 
+              'default_res_id': uid, 
+              'search_default_message_unread': True
+            }</field>
+            <field name="params" eval="&quot;{
+                'domain': [('favorite_user_ids', 'in', [uid])],
+                'view_mailbox': True,
+                'read_action': 'read', }&quot;"/>
+            <field name="help" type="html">
+                <p>
+                    <b>No todo!</b>
+                </p><p>
+                    When you process messages in your inbox, you can mark some
+                    as <i>todo</i>. From this menu, you can process all your todo.
+                </p>
+            </field>
+        </record>
+
+        <record id="action_mail_archives_feeds" model="ir.actions.client">
+            <field name="name">Archives</field>
+            <field name="tag">mail.wall</field>
+            <field name="context">{
+              'default_model': 'res.users', 
+              'default_res_id': uid, 
+              'search_default_message_read': True
+            }</field>
+            <field name="params" eval="&quot;{
+                'domain': [('notification_ids.partner_id.user_ids', 'in', [uid])],
+                'view_mailbox': True,
+                'read_action': 'unread', }&quot;"/>
+            <field name="help" type="html">
+                <p>
+                    No message found.
+                </p>
+            </field>
+        </record>
+
+        <record id="action_mail_sent_feeds" model="ir.actions.client">
+            <field name="name">Sent</field>
+            <field name="tag">mail.wall</field>
+            <field name="context">{
+              'default_model': 'res.users', 
+              'default_res_id': uid
+            }</field>
+            <field name="params" eval="&quot;{
+                'domain': [('author_id.user_ids', 'in', [uid])],
+                'view_mailbox': True, }&quot;"/>
+            <field name="help" type="html">
+                <p>
+                    <b>No message sent yet.</b>
+                </p><p>
+                    Click on the top-right icon to compose a message. This
+                    message will be sent by email if it's an internal contact.
+                </p>
+            </field>
+        </record>
+
+        <!-- MENU -->
 
         <!-- Top menu item -->
-        <menuitem name="Feeds"
-          id="mail_feeds_main"
+        <menuitem name="Messaging"
+          id="mail.mail_feeds_main"
           groups="base.group_user"
           sequence="10"/>
 
-        <!-- left-side menu: Feeds !-->
-        <menuitem id="mail_feeds" name="Feeds" parent="mail_feeds_main" groups="base.group_user" sequence="10"/>
+        <!-- Left-side menu: Feeds -->
+        <menuitem id="mail.mail_feeds" name="Messaging" parent="mail.mail_feeds_main" groups="base.group_user" sequence="10"/>
+        <menuitem id="mail_my_stuff" name="Organizer" parent="mail.mail_feeds_main"/>
 
-        <record id="mail_wallfeeds" model="ir.ui.menu">
-          <field name="name">News Feed</field>
+        <record id="mail_inboxfeeds" model="ir.ui.menu">
+          <field name="name">Inbox</field>
           <field name="sequence" eval="10"/>
-          <field name="action" ref="action_mail_all_feeds"/>
-          <field name="parent_id" ref="mail_feeds"/>
+          <field name="action" ref="action_mail_inbox_feeds"/>
+          <field name="parent_id" ref="mail.mail_feeds"/>
         </record>
-        <record id="mail_myfeeds" model="ir.ui.menu">
-          <field name="name">My Feeds</field>
+        <record id="mail_tomefeeds" model="ir.ui.menu">
+          <field name="name">To: me</field>
           <field name="sequence" eval="11"/>
-          <field name="action" ref="action_mail_my_feeds"/>
-          <field name="parent_id" ref="mail_feeds"/>
+          <field name="action" ref="action_mail_to_me_feeds"/>
+          <field name="parent_id" ref="mail.mail_feeds"/>
+        </record>
+        <record id="mail_starfeeds" model="ir.ui.menu">
+          <field name="name">Todo</field>
+          <field name="sequence" eval="14"/>
+          <field name="action" ref="action_mail_star_feeds"/>
+          <field name="parent_id" ref="mail.mail_feeds"/>
+        </record>
+        <record id="mail_archivesfeeds" model="ir.ui.menu">
+          <field name="name">Archives</field>
+          <field name="sequence" eval="16"/>
+          <field name="action" ref="action_mail_archives_feeds"/>
+          <field name="parent_id" ref="mail.mail_feeds"/>
+        </record>
+        <record id="mail_sentfeeds" model="ir.ui.menu">
+          <field name="name">Sent</field>
+          <field name="sequence" eval="18"/>
+          <field name="action" ref="action_mail_sent_feeds"/>
+          <field name="parent_id" ref="mail.mail_feeds"/>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/analytic_contract_expense_project/__openerp__.py b/addons/mail/mail_vote.py
similarity index 52%
rename from addons/analytic_contract_expense_project/__openerp__.py
rename to addons/mail/mail_vote.py
index b569330d117..1e439fe0aeb 100644
--- a/addons/analytic_contract_expense_project/__openerp__.py
+++ b/addons/mail/mail_vote.py
@@ -2,44 +2,38 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2012-Today OpenERP SA (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
 #    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
+#    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.
+#    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 osv, fields
 
-{
-    'name': 'Projects Management: hr_expense link',
-    'version': '1.1',
-    'category': 'Hidden',
-    'description': """
-This module is for modifying project view to show some data related to the hr_expense module.
 
-""",
-    "author": "OpenERP S.A.",
-    "website": "http://www.openerp.com/",
-    "depends": ["analytic_contract_hr_expense","project"],
-    "init_xml": [],
-    "update_xml": [
-                    "analytic_contract_expense_project_view.xml",
-                    ],
-    'demo_xml': [],
-    "css" : [
-             ],
-    'installable': True,
-    'auto_install': True,
-}
+class mail_vote(osv.Model):
+    ''' Mail vote feature allow users to like and unlike messages attached
+        to a document. This allows for example to build a ranking-based
+        displaying of messages, for FAQ. '''
+
+    _name = 'mail.vote'
+    _description = 'Mail Vote'
+    _columns = {
+            'message_id': fields.many2one('mail.message', 'Message', select=1,
+                ondelete='cascade', required=True),
+            'user_id': fields.many2one('res.users', 'User', select=1,
+                ondelete='cascade', required=True),
+        }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py
index ce2f75687ba..91606e1c720 100644
--- a/addons/mail/res_config.py
+++ b/addons/mail/res_config.py
@@ -19,6 +19,8 @@
 #
 ##############################################################################
 
+import urlparse
+
 from openerp.osv import osv, fields
 
 class project_configuration(osv.TransientModel):
@@ -31,9 +33,16 @@ class project_configuration(osv.TransientModel):
     }
 
     def get_default_alias_domain(self, cr, uid, ids, context=None):
-        return {'alias_domain': self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)}
+        alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)
+        if not alias_domain:
+            domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "web.base.url", context=context)
+            try:
+                alias_domain = urlparse.urlsplit(domain).netloc.split(':')[0]
+            except Exception:
+                pass
+        return {'alias_domain': alias_domain}
 
     def set_alias_domain(self, cr, uid, ids, context=None):
         config_parameters = self.pool.get("ir.config_parameter")
         for record in self.browse(cr, uid, ids, context=context):
-            config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)
\ No newline at end of file
+            config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)
diff --git a/addons/mail/res_partner.py b/addons/mail/res_partner.py
index d3a61b31a8a..060adc291de 100644
--- a/addons/mail/res_partner.py
+++ b/addons/mail/res_partner.py
@@ -19,29 +19,46 @@
 #
 ##############################################################################
 
-from osv import osv
+from osv import osv, fields
 
 class res_partner_mail(osv.Model):
-    """ Inherits partner and adds CRM information in the partner form """
+    """ Update partner to add a field about notification preferences """
     _name = "res.partner"
     _inherit = ['res.partner', 'mail.thread']
+    _mail_flat_thread = False
 
-    def message_search_get_domain(self, cr, uid, ids, context=None):
-        """ Override of message_search_get_domain for partner discussion page.
-            The purpose is to add messages directly sent to the partner. It also
-            adds messages pushed to the related user, if any, using @login.
+    _columns = {
+        'notification_email_send': fields.selection([
+            ('all', 'All feeds'),
+            ('comment', 'Comments and Emails'),
+            ('email', 'Emails only'),
+            ('none', 'Never')
+            ], 'Receive Feeds by Email', required=True,
+            help="Choose in which case you want to receive an email when you "\
+                  "receive new feeds."),
+    }
+
+    _defaults = {
+        'notification_email_send': lambda *args: 'comment'
+    }
+
+    def message_post(self, cr, uid, thread_id, body='', subject=None, type='notification',
+                        subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
+        """ Override related to res.partner. In case of email message, set it as
+            private:
+            - add the target partner in the message partner_ids
+            - set thread_id as None, because this will trigger the 'private'
+                aspect of the message (model=False, res_id=False)
         """
-        initial_domain = super(res_partner_mail, self).message_search_get_domain(cr, uid, ids, context=context)
-        # to avoid models inheriting from res.partner
-        if self._name != 'res.partner':
-            return initial_domain
-        # add message linked to the partner
-        search_domain = ['|'] + initial_domain + ['|', ('partner_id', 'in', ids), ('partner_ids', 'in', ids)]
-        # if partner is linked to a user: find @login
-        res_users_obj = self.pool.get('res.users')
-        user_ids = res_users_obj.search(cr, uid, [('partner_id', 'in', ids)], context=context)
-        for user in res_users_obj.browse(cr, uid, user_ids, context=context):
-            search_domain = ['|'] + search_domain + ['|', ('body_text', 'like', '@%s' % (user.login)), ('body_html', 'like', '@%s' % (user.login))]
-        return search_domain
+        if isinstance(thread_id, (list, tuple)):
+            thread_id = thread_id[0]
+        if type == 'email':
+            partner_ids = kwargs.get('partner_ids', [])
+            if thread_id not in partner_ids:
+                partner_ids.append((4, thread_id))
+            kwargs['partner_ids'] = partner_ids
+            thread_id = False
+        return super(res_partner_mail, self).message_post(cr, uid, thread_id, body=body, subject=subject,
+                type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, **kwargs)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index 2a8430926d5..a4aa56ae971 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -9,9 +9,8 @@
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread" 
-                            options='{"thread_level": 1}'/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread" options='{"thread_level": 1}'/>
                     </div>
                 </xpath>
             </field>
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index f985ac4f88d..20c0715c148 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -19,15 +19,10 @@
 #
 ##############################################################################
 
-import logging
-
 from osv import osv, fields
-from openerp.modules.registry import RegistryManager
 from openerp import SUPERUSER_ID
 from tools.translate import _
 
-_logger = logging.getLogger(__name__)
-
 class res_users(osv.Model):
     """ Update of res.users class
         - add a preference about sending emails about notifications
@@ -39,93 +34,75 @@ class res_users(osv.Model):
     _inherits = {'mail.alias': 'alias_id'}
 
     _columns = {
-        'notification_email_pref': fields.selection([
-            ('all', 'All Feeds'),
-            ('to_me', 'Only send directly to me'),
-            ('none', 'Never')
-            ], 'Receive Feeds by Email', required=True,
-            help="Choose in which case you want to receive an email when you "\
-                 "receive new feeds."),
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True, 
             help="Email address internally associated with this user. Incoming "\
                  "emails will appear in the user's notifications."),
     }
     
     _defaults = {
-        'notification_email_pref': 'to_me',
         'alias_domain': False, # always hide alias during creation
     }
 
     def __init__(self, pool, cr):
-        """ Override of __init__ to add access rights on notification_email_pref
+        """ Override of __init__ to add access rights on notification_email_send
             field. Access rights are disabled by default, but allowed on
             fields defined in self.SELF_WRITEABLE_FIELDS.
         """
         init_res = super(res_users, self).__init__(pool, cr)
         # duplicate list to avoid modifying the original reference
         self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
-        self.SELF_WRITEABLE_FIELDS.append('notification_email_pref')
+        self.SELF_WRITEABLE_FIELDS.append('notification_email_send')
         return init_res
 
     def _auto_init(self, cr, context=None):
-        """Installation hook to create aliases for all users and avoid constraint errors."""
-
-        # disable the unique alias_id not null constraint, to avoid spurious warning during 
-        # super.auto_init. We'll reinstall it afterwards.
-        self._columns['alias_id'].required = False
-
-        super(res_users,self)._auto_init(cr, context=context)
-
-        registry = RegistryManager.get(cr.dbname)
-        mail_alias = registry.get('mail.alias')
-        res_users_model = registry.get('res.users')
-        users_no_alias = res_users_model.search(cr, SUPERUSER_ID, [('alias_id', '=', False)])
-        # Use read() not browse(), to avoid prefetching uninitialized inherited fields
-        for user_data in res_users_model.read(cr, SUPERUSER_ID, users_no_alias, ['login']):
-            alias_id = mail_alias.create_unique_alias(cr, SUPERUSER_ID, {'alias_name': user_data['login'],
-                                                                         'alias_force_id': user_data['id']},
-                                                      model_name=self._name)
-            res_users_model.write(cr, SUPERUSER_ID, user_data['id'], {'alias_id': alias_id})
-            _logger.info('Mail alias created for user %s (uid %s)', user_data['login'], user_data['id'])
-
-        # Finally attempt to reinstate the missing constraint
-        try:
-            cr.execute('ALTER TABLE res_users ALTER COLUMN alias_id SET NOT NULL')
-        except Exception:
-            _logger.warning("Table '%s': unable to set a NOT NULL constraint on column '%s' !\n"\
-                            "If you want to have it, you should update the records and execute manually:\n"\
-                            "ALTER TABLE %s ALTER COLUMN %s SET NOT NULL",
-                            self._table, 'alias_id', self._table, 'alias_id')
-
-        self._columns['alias_id'].required = True
+        """ Installation hook: aliases, partner following themselves """
+        # create aliases for all users and avoid constraint errors
+        self.pool.get('mail.alias').migrate_to_alias(cr, self._name, self._table, super(res_users, self)._auto_init,
+            self._columns['alias_id'], 'login', alias_force_key='id', context=context)
+        # make already existing users follow themselves, using SQL to avoid using the ORM during the auto_init
+        cr.execute("""  SELECT p.id FROM res_partner p
+                        LEFT JOIN mail_followers n
+                        ON (n.partner_id = p.id AND n.res_model = 'res.partner' AND n.res_id = p.id)
+                        WHERE n.id IS NULL
+                    """)
+        params = [(res[0], res[0]) for res in cr.fetchall()]
+        cr.executemany("""  INSERT INTO mail_followers (partner_id, res_model, res_id)
+                            VALUES (%s, 'res.partner', %s)
+                        """, params)
 
     def create(self, cr, uid, data, context=None):
         # create default alias same as the login
+        if not data.get('login', False):
+            raise osv.except_osv(_('Invalid Action!'), _('You may not create a user. To create new users, you should use the "Settings > Users" menu.'))
+
         mail_alias = self.pool.get('mail.alias')
         alias_id = mail_alias.create_unique_alias(cr, uid, {'alias_name': data['login']}, model_name=self._name, context=context)
         data['alias_id'] = alias_id
         data.pop('alias_name', None) # prevent errors during copy()
+
         # create user that follows its related partner
         user_id = super(res_users, self).create(cr, uid, data, context=context)
         user = self.browse(cr, uid, user_id, context=context)
-        self.pool.get('res.partner').message_subscribe(cr, uid, [user.partner_id.id], [user_id], context=context)
+        self.pool.get('res.partner').message_subscribe(cr, uid, [user.partner_id.id], [user.partner_id.id], context=context)
         # alias
         mail_alias.write(cr, SUPERUSER_ID, [alias_id], {"alias_force_thread_id": user_id}, context)
         # create a welcome message
-        self.create_welcome_message(cr, uid, user, context=context)
+        self._create_welcome_message(cr, uid, user, context=context)
         return user_id
 
-    def create_welcome_message(self, cr, uid, user, context=None):
-        company_name = user.company_id.name if user.company_id else _('the company')
-        subject = '''%s has joined %s.''' % (user.name, company_name)
-        body = '''Welcome to OpenERP !''' 
-        # TODO change 1 into user.id but catch errors
-        return self.pool.get('res.partner').message_append_note(cr, 1, [user.partner_id.id],
-            subject=subject, body=body, type='comment', content_subtype='html', context=context)
+    def _create_welcome_message(self, cr, uid, user, context=None):
+        if not self.has_group(cr, uid, 'base.group_user'):
+            return False
+        company_name = user.company_id.name if user.company_id else ''
+        body = _('%s has joined the %s network.') % (user.name, company_name)
+        # TODO change SUPERUSER_ID into user.id but catch errors
+        return self.pool.get('res.partner').message_post(cr, SUPERUSER_ID, [user.partner_id.id],
+            body=body, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         # User alias is sync'ed with login
-        if vals.get('login'): vals['alias_name'] = vals['login']
+        if vals.get('login'):
+            vals['alias_name'] = vals['login']
         return super(res_users, self).write(cr, uid, ids, vals, context=context)
 
     def unlink(self, cr, uid, ids, context=None):
@@ -136,52 +113,49 @@ class res_users(osv.Model):
         alias_pool.unlink(cr, uid, alias_ids, context=context)
         return res
 
-    # --------------------------------------------------
-    # Wrappers on partner methods for Chatter
-    # #FIXME: another branch holds a refactoring of mail.thread
-    # that should help cleaning those wrappers
-    # --------------------------------------------------
+    def message_post_user_api(self, cr, uid, thread_id, body='', subject=False, parent_id=False,
+                                attachment_ids=None, context=None, content_subtype='plaintext', **kwargs):
+        """ Redirect the posting of message on res.users to the related partner.
+            This is done because when giving the context of Chatter on the
+            various mailboxes, we do not have access to the current partner_id.
+            We therefore post on the user and redirect on its partner. """
+        assert thread_id, "res.users does not support posting global messages"
+        if context and 'thread_model' in context:
+            context['thread_model'] = 'res.partner'
+        if isinstance(thread_id, (list, tuple)):
+            thread_id = thread_id[0]
+        partner_id = self.pool.get('res.users').read(cr, uid, thread_id, ['partner_id'], context=context)['partner_id'][0]
+        return self.pool.get('res.partner').message_post_user_api(cr, uid, partner_id, body=body, subject=subject,
+            parent_id=parent_id, attachment_ids=attachment_ids, context=context, content_subtype=content_subtype, **kwargs)
 
-    def message_append(self, cr, uid, threads, subject, body_text=None, body_html=None,
-                        type='email', email_date=None, parent_id=False,
-                        content_subtype='plain', state=None,
-                        partner_ids=None, email_from=False, email_to=False,
-                        email_cc=None, email_bcc=None, reply_to=None,
-                        headers=None, message_id=False, references=None,
-                        attachments=None, original=None, context=None):
-        for user in self.browse(cr, uid, threads, context=context):
-            user.partner_id.message_append(subject, body_text, body_html, type, email_date, parent_id,
-                content_subtype, state, partner_ids, email_from, email_to, email_cc, email_bcc, reply_to,
-                headers, message_id, references, attachments, original)
+    def message_post(self, cr, uid, thread_id, context=None, **kwargs):
+        """ Redirect the posting of message on res.users to the related partner.
+            This is done because when giving the context of Chatter on the
+            various mailboxes, we do not have access to the current partner_id.
+            We therefore post on the user and redirect on its partner. """
+        assert thread_id, "res.users does not support posting global messages"
+        if context and 'thread_model' in context:
+            context['thread_model'] = 'res.partner'
+        if isinstance(thread_id, (list, tuple)):
+            thread_id = thread_id[0]
+        partner_id = self.pool.get('res.users').read(cr, uid, thread_id, ['partner_id'], context=context)['partner_id'][0]
+        return self.pool.get('res.partner').message_post(cr, uid, partner_id, context=context, **kwargs)
 
-    def message_read(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-                        limit=100, offset=0, domain=None, context=None):
-        for user in self.browse(cr, uid, ids, context=context):
-            return user.partner_id.message_read(fetch_ancestors, ancestor_ids, limit, offset, domain)
-
-    def message_search(self, cr, uid, ids, fetch_ancestors=False, ancestor_ids=None, 
-                        limit=100, offset=0, domain=None, count=False, context=None):
-        for user in self.browse(cr, uid, ids, context=context):
-            return user.partner_id.message_search(fetch_ancestors, ancestor_ids, limit, offset, domain, count)
-
-    def message_subscribe(self, cr, uid, ids, user_ids = None, context=None):
-        for user in self.browse(cr, uid, ids, context=context):
-            return user.partner_id.message_subscribe(user_ids)
-
-    def message_unsubscribe(self, cr, uid, ids, user_ids = None, context=None):
-        for user in self.browse(cr, uid, ids, context=context):
-            return user.partner_id.message_unsubscribe(user_ids)
+    def message_update(self, cr, uid, ids, msg_dict, update_vals=None, context=None):
+        partner_id = self.pool.get('res.users').browse(cr, uid, ids)[0].partner_id.id
+        return self.pool.get('res.partner').message_update(cr, uid, [partner_id], msg_dict,
+            update_vals=update_vals, context=context)
 
 
 class res_users_mail_group(osv.Model):
-    """ Update of res.groups class
-        - if adding/removing users from a group, check mail.groups linked to
-          this user group, and subscribe / unsubscribe them from the discussion
-          group. This is done by overriding the write method.
+    """ Update of res.users class
+        - if adding groups to an user, check mail.groups linked to this user
+          group, and the user. This is done by overriding the write method.
     """
     _name = 'res.users'
     _inherit = ['res.users']
 
+    # FP Note: to improve, post processing may be better ?
     def write(self, cr, uid, ids, vals, context=None):
         write_res = super(res_users_mail_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('groups_id'):
@@ -190,26 +164,25 @@ class res_users_mail_group(osv.Model):
             user_group_ids += [id for command in vals['groups_id'] if command[0] == 6 for id in command[2]]
             mail_group_obj = self.pool.get('mail.group')
             mail_group_ids = mail_group_obj.search(cr, uid, [('group_ids', 'in', user_group_ids)], context=context)
-            mail_group_obj.message_subscribe(cr, uid, mail_group_ids, ids, context=context)
+            mail_group_obj.message_subscribe_users(cr, uid, mail_group_ids, ids, context=context)
         return write_res
 
 class res_groups_mail_group(osv.Model):
     """ Update of res.groups class
-        - if adding/removing users from a group, check mail.groups linked to
-          this user group, and subscribe / unsubscribe them from the discussion
-          group. This is done by overriding the write method.
+        - if adding users from a group, check mail.groups linked to this user
+          group and subscribe them. This is done by overriding the write method.
     """
     _name = 'res.groups'
     _inherit = 'res.groups'
 
+    # FP Note: to improve, post processeing, after the super may be better
     def write(self, cr, uid, ids, vals, context=None):
+        write_res = super(res_groups_mail_group, self).write(cr, uid, ids, vals, context=context)
         if vals.get('users'):
             # form: {'group_ids': [(3, 10), (3, 3), (4, 10), (4, 3)]} or {'group_ids': [(6, 0, [ids]}
             user_ids = [command[1] for command in vals['users'] if command[0] == 4]
             user_ids += [id for command in vals['users'] if command[0] == 6 for id in command[2]]
             mail_group_obj = self.pool.get('mail.group')
             mail_group_ids = mail_group_obj.search(cr, uid, [('group_ids', 'in', ids)], context=context)
-            mail_group_obj.message_subscribe(cr, uid, mail_group_ids, user_ids, context=context)
-        return super(res_groups_mail_group, self).write(cr, uid, ids, vals, context=context)
-
-# vim:et:
+            mail_group_obj.message_subscribe_users(cr, uid, mail_group_ids, user_ids, context=context)
+        return write_res
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
index 005d71cb09f..a119765e1ec 100644
--- a/addons/mail/res_users_view.xml
+++ b/addons/mail/res_users_view.xml
@@ -10,7 +10,7 @@
             <field name="arch" type="xml">
             <data>
                 <field name="email" position="before">
-                    <field name="notification_email_pref" readonly="0"/>
+                    <field name="notification_email_send" readonly="0"/>
                 </field>
             </data>
             </field>
@@ -24,7 +24,7 @@
             <field name="arch" type="xml">
             <data>
                 <field name="email" position="before">
-                    <field name="notification_email_pref"/>
+                    <field name="notification_email_send"/>
                 </field>
                 <field name="email" position="after">
                     <field name="alias_domain" invisible="1"/>
diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 1979e2fec05..37c6952717c 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -1,9 +1,21 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_mail_message_all,mail.message.all,model_mail_message,,1,0,0,0
+access_mail_message_all,mail.message.all,model_mail_message,,1,0,1,0
 access_mail_message_group_user,mail.message.group.user,model_mail_message,base.group_user,1,1,1,1
-access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0
-access_mail_followers_all,mail.followers.all,model_mail_followers,,1,1,1,1
-access_mail_notification_all,mail.notification.all,model_mail_notification,,1,1,1,1
-access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1
-access_mail_alias_user,mail.alias,model_mail_alias,base.group_user,1,1,1,0
-access_mail_alias_system,mail.alias,model_mail_alias,base.group_system,1,1,1,1
+access_mail_mail_all,mail.mail.all,model_mail_mail,,0,0,1,0
+access_mail_mail_user,mail.mail,model_mail_mail,base.group_user,1,1,1,0
+access_mail_mail_system,mail.mail.system,model_mail_mail,base.group_system,1,1,1,1
+access_mail_followers_all,mail.followers.all,model_mail_followers,,1,0,0,0
+access_mail_followers_system,mail.followers.system,model_mail_followers,base.group_system,1,1,1,1
+access_mail_notification_all,mail.notification.all,model_mail_notification,,1,0,0,0
+access_mail_notification_group_user,mail.notification.user,model_mail_notification,base.group_user,1,1,1,0
+access_mail_notification_system,mail.notification.system,model_mail_notification,base.group_system,1,1,1,1
+access_mail_group_all,mail.group.all,model_mail_group,,1,0,0,0
+access_mail_group_user,mail.group.user,model_mail_group,base.group_user,1,1,1,1
+access_mail_alias_all,mail.alias.all,model_mail_alias,,1,0,0,0
+access_mail_alias_user,mail.alias.user,model_mail_alias,base.group_user,1,1,1,0
+access_mail_alias_system,mail.alias.system,model_mail_alias,base.group_system,1,1,1,1
+access_mail_message_subtype_all,mail.message.subtype.all,model_mail_message_subtype,,1,0,0,0
+access_mail_vote_all,mail.vote.all,model_mail_vote,,1,1,1,1
+access_mail_favorite_all,mail.favorite.all,model_mail_favorite,,1,1,1,1
+access_mail_thread_all,mail.thread.all,model_mail_thread,,1,1,1,1
+access_publisher_warranty_contract_all,publisher.warranty.contract.all,model_publisher_warranty_contract,,1,1,1,1
diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml
index a12314e6f25..525425c2aa0 100644
--- a/addons/mail/security/mail_security.xml
+++ b/addons/mail/security/mail_security.xml
@@ -2,27 +2,41 @@
 <openerp>
     <data>
 
-        <!-- CATEGORY -->
-        <record model="ir.module.category" id="module_category_social">
-            <field name="name">Social and Sharing Tools</field>
-            <field name="parent_id" ref="base.module_category_tools"/>
-            <field name="sequence">26</field>
-        </record>
-
-        <!-- GROUPS -->
-        <record id="group_mail_manager" model="res.groups">
-            <field name="name">Mail manager</field>
-            <field name="comment"></field>
-            <field name="category_id" ref="module_category_social"/>
-        </record>
-
         <!-- RULES -->
-        <record id="group_rule_public_and_joined" model="ir.rule">
+        <record id="mail_group_public_and_joined" model="ir.rule">
             <field name="name">Mail.group: access only public and joined groups</field>
             <field name="model_id" ref="model_mail_group"/>
             <!-- This rule has to be improved for employee only groups -->
-            <field name="domain_force">['|', '|', ('public', '=', 'public'), ('message_follower_ids', 'in', [user.id]), '&amp;', ('public','=','groups'), ('group_public_id','in', [x.id for x in user.groups_id])]</field>
+            <field name="domain_force">['|', '|', ('public', '=', 'public'), ('message_follower_ids', 'in', [user.partner_id.id]), '&amp;', ('public','=','groups'), ('group_public_id','in', [g.id for g in user.groups_id])]</field>
         </record>
 
+        <record id="mail_followers_read_write_own" model="ir.rule">
+            <field name="name">mail.followers: read and write its own entries</field>
+            <field name="model_id" ref="model_mail_followers"/>
+            <field name="domain_force">[('partner_id', '=', user.partner_id.id)]</field>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+        </record>
+
+        <record id="mail_notification_read_write_own" model="ir.rule">
+            <field name="name">mail.notification: read and write its own entries</field>
+            <field name="model_id" ref="model_mail_notification"/>
+            <field name="domain_force">[('partner_id', '=', user.partner_id.id)]</field>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+        </record>
+
+        <!--
+        This rule can not be uncommented, because we have a more wide method in mail.message. When we implement a many2one_variable field, we will be able to uncomment this.
+        <record id="mail_message_read_partner_or_author" model="ir.rule">
+            <field name="name">mail.message: read if notified or author</field>
+            <field name="model_id" ref="model_mail_message"/>
+            <field name="domain_force">['|', ('partner_ids', 'in', user.partner_id.id), ('author_id', '=', user.partner_id.id)]</field>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+        </record>
+        -->
+
     </data>
 </openerp>
diff --git a/addons/mail/static/scripts/openerp_mailgate.py b/addons/mail/static/scripts/openerp_mailgate.py
old mode 100755
new mode 100644
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 28a32b8c7a3..b0ce6d499b5 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -1,411 +1,568 @@
-/* ------------------------------------------------------------ */
-/* Wall
-/* ------------------------------------------------------------ */
+/* ------------ TOPBAR MAIL BUTTON --------------- */
 
-.openerp div.oe_mail_wall {
-    overflow: auto;
-    padding: 0;
-    background: white;
-}
+/* FIXME this css is not very pretty because it uses a 
+ * 'button' element wich comes with a lot of inappropriate 
+ * styling. Entypo is also a headache to center properly
+ * */
 
-.openerp div.oe_mail_wall_main {
-    float: left;
-    width: 560px;
-    margin: 8px;
-}
-
-.openerp div.oe_mail_wall_aside {
-    margin-left: 565px;
-    margin: 8px;
-}
-
-.openerp div.oe_mail_wall_action {
-    padding: 8px;
-    background: #eee;
-    border: 1px solid #ccc;
-}
-
-.openerp div.oe_mail_wall_action:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-.openerp div.oe_mail_wall_action .oe_mail_msg_content {
-    width: 484px;
-}
-
-.openerp div.oe_mail_wall_action textarea.oe_mail_compose_textarea,
-.openerp div.oe_mail_wall_action div.oe_mail_compose_message_body_text textarea {
-    width: 474px;
-    height: 60px;
-    padding: 4px;
-    margin-bottom: 2px;
-}
-
-.openerp ul.oe_mail_wall_threads {
-    margin-top: 8px;
-}
-
-/* Specific display of threads in the wall */
-/* ------------------------------------------------------------ */
-
-.openerp ul.oe_mail_wall_threads .oe_mail_msg_content textarea {
-    width: 434px;
-    height: 30px;
-    padding: 4px;
-}
-
-.openerp li.oe_mail_wall_thread:first .oe_mail_msg_notification {
-    border-top: 0;
-}
-
-.openerp div.oe_mail_thread_subthread img {
-    width: 28px;
-    height: 28px;
-}
-
-.openerp div.oe_mail_msg_content {
-    position: relative;
-    width: 486px;
-}
-
-.openerp div.oe_mail_msg_content > li {
-    float: left;
-    margin-right: 3px;
-}
-
-.openerp div.oe_mail_thread_subthread div.oe_mail_msg_content {
-    width: 440px;
-}
-
-.openerp div.oe_mail_wall_more {
-    text-align: center;
-    display: none;
-}
-
-
-/* ------------------------------------------------------------ */
-/* RecordThread
-/* ------------------------------------------------------------ */
-
-.openerp .oe_form div.oe_chatter {
-    overflow: auto;
-}
-
-.openerp div.oe_mail_recthread {
-    /*overflow: auto;*/
-}
-
-.openerp div.oe_mail_recthread_main {
-    float: left;
-    width: 560px;
-}
-
-.openerp div.oe_mail_recthread_aside {
-    float: right;
-    width: 250px;
-}
-
-.openerp div.oe_mail_recthread_actions {
-    margin-bottom: 8px;
-}
-
-.openerp div.oe_mail_recthread_actions button {
-    width: 120px;
-}
-
-.openerp button.oe_mail_button_followers {
-    display: inline;
-}
-
-.openerp button.oe_mail_button_mouseout {
-  color: white;
-  background-color: #8a89ba;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
-  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);
-}
-
-.openerp button.oe_mail_button_mouseover {
-  display: none;
-  color: white;
-  background-color: #dc5f59;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630));
-  background-image: -webkit-linear-gradient(top, #dc5f59, #b33630);
-  background-image: -moz-linear-gradient(top, #dc5f59, #b33630);
-  background-image: -ms-linear-gradient(top, #dc5f59, #b33630);
-  background-image: -o-linear-gradient(top, #dc5f59, #b33630);
-  background-image: linear-gradient(to bottom, #dc5f59, #b33630);
-}
-
-.openerp div.oe_mail_recthread_followers {
-    margin-bottom: 8px;
-}
-
-
-/* ------------------------------------------------------------ */
-/* Thread
-/* ------------------------------------------------------------ */
-
-.openerp div.oe_mail_thread_action {
-    display: none;
-    white-space: normal;
-    padding: 8px;
-    background: #eee;
-    border-top: 1px solid #ccc;
-}
-
-.openerp div.oe_mail_thread_action:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-/* default textarea (oe_mail_compose_textarea), and body_text textarea for compose form view */
-.openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea,
-.openerp .oe_mail_msg_content div.oe_mail_compose_message_body_text textarea {
-    width: 474px;
-    height: 60px;
-    padding: 4px;
-    font-size: 12px;
-    border: 1px solid #cccccc;
-}
-
-/* default textarea (oe_mail_compose_textarea), and body_text textarea for compose form view */
-.openerp .oe_mail_msg_content textarea.oe_mail_compose_textarea:focus,
-.openerp .oe_mail_msg_content div.oe_mail_compose_message_body_text textarea:focus {
-    outline: 0;
-    border-color: rgba(82, 168, 236, 0.8);
-    -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-    -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-    -box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-}
-
-.openerp div.oe_mail_thread_display {
-    white-space: normal;
-}
-
-.openerp div.oe_mail_thread_subthread {
-    margin-left: 66px;
-}
-
-.openerp div.oe_mail_thread_subthread li.oe_mail_thread_msg:last-child {
-    margin-bottom: 8px;
-}
-
-.openerp div.oe_mail_thread_more {
-    display: none;
-    border-bottom: 1px solid #D2D9E7;
-}
-
-.openerp li.oe_mail_thread_msg:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-.openerp li.oe_mail_thread_msg > div:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-.openerp div.oe_mail_msg {
-    padding: 0;
-    margin: 0 0 4px 0;
-}
-
-.openerp .oe_mail_msg_notification, 
-.openerp .oe_mail_msg_comment, 
-.openerp .oe_mail_msg_email {
-    padding: 8px;
-    background: white;
-    border-top: 1px solid #ccc;
-}
-
-.openerp div.oe_mail_thread_subthread .oe_mail_msg_comment {
-    background: #eee;
-}
-
-.openerp .oe_mail_msg_notification:after, 
-.openerp .oe_mail_msg_comment:after, 
-.openerp .oe_mail_msg_email:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-.openerp .oe_mail_msg_content {
-    float: left;
-}
-
-.openerp .oe_mail_msg_content:after {
-    content: "";
-    display: block;
-    clear: both; 
-}
-
-.openerp img.oe_mail_icon {
-    width: 50px;
-    height: 50px;
-}
-
-.openerp img.oe_mail_thumbnail {
-    width: 28px;
-    height: 28px;
-    margin: 4px;
-}
-
-.openerp img.oe_mail_frame {
-    text-align: center;
-    overflow: hidden;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    -o-border-radius: 3px;
-    -ms-border-radius: 3px;
-    border-radius: 3px;
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-    -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-    -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-    clip: rect(5px, 40px, 45px, 0px);
-}
-
-.openerp .oe_mail_invisible {
-    display: none;
-}
-
-/* ------------------------------------------------------------ */
-/* mail.compose.message form view & OpenERP hacks
-/* ------------------------------------------------------------ */
-
-/* form_view: delete white background */
-.openerp .oe_mail_msg_content div.oe_formview {
-    background-color: transparent;
-}
-
-.openerp .oe_mail_msg_content div.oe_form_nosheet {
-    margin: 0px;
-}
-
-.openerp .oe_mail_msg_content table.oe_form_group {
-    margin: 0px;
-}
-
-.openerp .oe_mail_msg_content table.oe_form_field,
-.openerp .oe_mail_msg_content div.oe_form_field {
+.openerp .oe_topbar_item.oe_topbar_compose_full_email{ 
     padding: 0px;
+    width: 32px;
+    height: 32px;
+}
+.openerp .oe_topbar_item.oe_topbar_compose_full_email button{
+    position: relative;
+    top: -3px;  /* centering entypo ... urgh */
+    box-sizing: border-box;
+    border: none;
+    box-shadow: none;
+    color: white;
+    background: none;
+    text-shadow: 0px 1px 2px black;
+    width: 32px;
+    height: 32px;
+    padding: 0px;
+    margin: 0px
+    border-radius: 0px;
 }
 
-.openerp .oe_mail_msg_content td.oe_form_group_cell {
-    vertical-align: bottom;
+/* ------------ MAIL WIDGET --------------- */
+.openerp .oe_mail, .openerp .oe_mail *{
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+}
+.openerp .oe_mail {
+    display: block;
+    position: relative;
+    margin: 0px;
+}
+.openerp .oe_mail .oe_thread{
+    margin-left: 32px;
+}
+.openerp .oe_mail > .oe_thread{
+    margin-left: 0px;
 }
 
-/* subject: change width */
-.openerp .oe_mail_msg_content .oe_form .oe_form_field input {
-    width: 472px;
+/* ---------------- MESSAGES ------------------ */
+
+.openerp .oe_mail .oe_msg{
+    position: relative;
+    background: #F4F5FA;
+    border-radius: 2px;
+    margin-bottom: 2px;
+    min-height: 42px;
+    border: solid 1px rgba(0,0,0,0.03);
+}
+.openerp .oe_mail .oe_msg .oe_msg_left{
+    position: absolute;
+    left:0; top: 0; bottom: 0; width: 40px;
+    overflow: hidden;
+}
+.openerp .oe_mail .oe_msg .oe_msg_icon{
+    width: 32px;
+    margin: 4px;
+    border-radius: 2px;
+}
+.openerp .oe_mail .oe_msg .oe_msg_center{
+    position: relative;
+    display: block;
+    margin-left: 40px;
+}
+.openerp .oe_mail .oe_msg .oe_msg_footer{
+    padding-left: 4px;
+    padding-top: 3px;
+    overflow: hidden;
+    margin-bottom: 4px;
+    font-size: 11px;
+}
+.openerp .oe_mail .oe_msg .oe_msg_content{
+    display: block;
+    overflow: hidden;
+    padding: 4px;
+    padding-bottom:1px;
+}
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_title{
+    font-size: 13px;
+    margin-bottom: 0px;
+    margin-top: 2px;
+}
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p:first-of-type {
+    margin-top: 0px;
 }
 
-/* body_html: cleditor */
-.openerp .oe_mail_msg_content div.cleditorMain {
-    border: 1px solid #cccccc;
+.openerp .oe_mail .oe_msg .oe_msg_content .oe_msg_body p {
+    margin-bottom: 0px;
 }
 
-/* destination_partner_ids */
-.openerp .oe_mail_msg_content div.text-core {
-    height: 22px !important;
-    width: 472px;
+/* a) Indented Messages */
+
+.openerp .oe_mail .oe_msg_indented{
+    background: #FFF;
+    border: none;
+    margin-bottom:0px;
+    min-height:38px;
+}
+.openerp .oe_mail .oe_msg.oe_msg_indented .oe_msg_icon{
+    width:32px;
+    margin:2px;
+    border-radius:2px;
+}
+.openerp .oe_mail .oe_msg .oe_subtle{
+    color: #B7B7D5;
+}
+.openerp .oe_mail .oe_msg_indented .oe_msg_center{
+    margin-left:34px;
+}
+.openerp .oe_mail .oe_msg.oe_msg_indented .oe_msg_content{
+    padding-top:2px;
+}
+.openerp .oe_mail .oe_msg.oe_msg_indented .oe_msg_footer{
+    margin-bottom: 5px;
 }
 
-/* buttons */
-.openerp .oe_mail_msg_content .oe_mail_compose_message_icons button.oe_form_button {
-    padding: 1px;
+/* b) Votes (likes) */
+
+.openerp .oe_mail .oe_mail_vote_count{
+    display: inline;
+    position: relative;
+    background: white;
+    box-shadow: 0px 0px 0px 1px rgba(124, 123, 173, 0.36) inset;
+    color: #7c7bad;
+    text-shadow: none;
+    border-radius: 3px;
+    margin: 0px;
+    padding-left: 3px;
+    padding-right: 15px;
+    margin-right: 5px;
+}
+.openerp .oe_mail .oe_mail_vote_count .oe_e{
+    position: absolute;
+    bottom: 1px;
+    right: 2px;
+    font-size: 26px;
 }
 
-/* ------------------------------------------------------------ */
-/* Messages layout
-/* ------------------------------------------------------------ */
+/* c) Message action icons */
 
-.openerp .oe_mail_msg .oe_mail_msg_title {
-    margin: 0;
-    font-size: 1.3em;
-    font-weight: bold;
+.openerp .oe_mail .oe_msg .oe_msg_icons{
+    float: right;
+    margin-top: 4px;
+    margin-right: 8px;
+    margin-left: 8px;
+    height: 24px;
+    -webkit-user-select: none;
+       -moz-user-select: none;
+        -ms-user-select: none;
+            user-select: none;
 }
-.openerp .oe_mail_msg .oe_mail_msg_title a:link,
-.openerp .oe_mail_msg .oe_mail_msg_title a:visited {
-    color: #4C4C4C;
+.openerp .oe_mail .oe_msg .oe_msg_icons span{
+    float:right;
+    width:24px;
+    height:24px;
+    line-height:24px;
+    text-align: center;
+}
+.openerp .oe_mail .oe_msg .oe_msg_icons a {
+    text-decoration: none;
+    color: #FFF;
+    text-shadow: 0px 1px #AAA,0px -1px #AAA, -1px 0px #AAA, 1px 0px #AAA, 0px 3px 3px rgba(0,0,0,0.1);
+    -webkit-transition: all 0.2s linear;
+       -moz-transition: all 0.2s linear;
+         -o-transition: all 0.2s linear;
+            transition: all 0.2s linear;
+}
+.openerp .oe_mail .oe_msg:hover .oe_msg_icons a{
+    opacity: 1;
+    -webkit-transition: all 0.1s linear;
+       -moz-transition: all 0.1s linear;
+         -o-transition: all 0.1s linear;
+            transition: all 0.1s linear;
+}
+.openerp .oe_mail .oe_msg .oe_msg_icons .oe_star:hover a{
+    color: #FFF6C0;
+    text-shadow: 0px 1px #FFA162,0px -1px #FFA162, -1px 0px #FFA162, 1px 0px #FFA162, 0px 3px 3px rgba(0,0,0,0.1);
+}
+.openerp .oe_mail .oe_msg .oe_msg_icons .oe_star.oe_starred a{
+    color: #FFE41F;
+    text-shadow: 0px 1px #DF6200,0px -1px #DF6200, -1px 0px #DF6200, 1px 0px #DF6200, 0px 3px 3px rgba(0,0,0,0.1);
+}
+.openerp .oe_mail .oe_msg .oe_msg_icons .oe_reply:hover a{
+    color: #1fc0ff;
+    text-shadow: 0px 1px #184fc5,0px -1px #184fc5, -1px 0px #184fc5, 1px 0px #184fc5, 0px 3px 3px rgba(0,0,0,0.1);
+}
+.openerp .oe_mail .oe_msg .oe_msg_icons .oe_read:hover a{
+    color: #bbbaff;
+    text-shadow: 0px 1px #7c7bad,0px -1px #7c7bad, -1px 0px #7c7bad, 1px 0px #7c7bad, 0px 3px 3px rgba(0,0,0,0.1);
+}
+.openerp .oe_mail .oe_msg .oe_msg_icons .oe_unread:hover a{
+    color: #c2ff00;
+    text-shadow: 0px 1px #009441,0px -1px #009441, -1px 0px #009441, 1px 0px #009441, 0px 3px 3px rgba(0,0,0,0.1);
+}
+.openerp .oe_mail .oe_msg .oe_msg_content textarea{
+    width: 100%;
+    height: 64px;
+    margin: 0px;
+    padding: 0px;
+    resize: vertical;
+    
+    padding: 4px;
+}
+.openerp .oe_mail .oe_msg.oe_msg_composer_compact, .openerp .oe_mail .oe_msg.oe_msg_expandable{
+    padding:4px;
+    min-height:0px;
+}
+.openerp .oe_mail .oe_msg.oe_msg_composer_compact textarea{
+    height: 24px;
+    width: 100%;
+}
+
+/* --------------------- ATTACHMENTS --------------------- */
+
+.openerp .oe_mail .oe_msg_attachment_list{
+    display: none;
+    margin-top: 12px;
+    margin-bottom: 12px;
+}
+.openerp .oe_mail .oe_msg_composer .oe_msg_attachment_list{
+    display: block;
+}
+.openerp .oe_mail .oe_attachment{
+    display: inline-block;
+    width: 100px;
+    margin: 2px;
+    min-height: 80px;
+    position: relative;
+    border-radius: 3px;
+    text-align: center;
+    vertical-align: top;
+}
+.openerp .oe_mail .oe_attachment .oe_name{
+    display: inline-block;
+    max-width: 100%;
+    padding: 1px 3px;
+    margin-top: 50px;
+    margin-bottom: 5px;
+    background: rgba(124, 123, 173, 0.13);
+    overflow: hidden;
+    color: #4c4c4c;
+    text-shadow: none;
+    border-radius: 3px;
+}
+
+.openerp .oe_mail .oe_attachment.oe_preview{
+    background: url( data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAJ0lEQVQYV2MsLS39z4AGLCws0IUYGIeCwrVr12J45sSJE5ieGQIKAbuZKf/EMCs7AAAAAElFTkSuQmCC );
+}
+.openerp .oe_mail .oe_attachment .oe_progress_bar{
+    display: none;
+    position: absolute;
+    top: 18px;
+    left: 16px;
+    right: 16px;
+    height: 17px;
+    line-height: 13px;
+    padding: 0px;
+    background: #4BBD00;
+    color: white;
+    text-align: center;
+    border-radius: 3px;
+    border: solid 1px rgba(0,0,0,0.2);
+    box-shadow: 0px 3px 10px rgba(0, 0, 0, 0.34);
+    -webkit-animation: oe_mail_attach_loading_anim 0.75s infinite linear;
+       -moz-animation: oe_mail_attach_loading_anim 0.75s infinite linear;
+         -o-animation: oe_mail_attach_loading_anim 0.75s infinite linear;
+            animation: oe_mail_attach_loading_anim 0.75s infinite linear;
+}
+.openerp .oe_mail .oe_attachment.oe_uploading .oe_progress_bar{
+    display: block;
+}
+@-webkit-keyframes oe_mail_attach_loading_anim{
+    0% { background: #4BBD00 }
+    50% { background: #009123 } 
+    100% { background: #4BBD00 }
+}
+@-moz-keyframes oe_mail_attach_loading_anim{
+    0% { background: #4BBD00 }
+    50% { background: #009123 } 
+    100% { background: #4BBD00 }
+}
+@-o-keyframes oe_mail_attach_loading_anim{
+    0% { background: #4BBD00 }
+    50% { background: #009123 } 
+    100% { background: #4BBD00 }
+}
+@keyframes oe_mail_attach_loading_anim{
+    0% { background: #4BBD00 }
+    50% { background: #009123 } 
+    100% { background: #4BBD00 }
+}
+.openerp .oe_mail .oe_attachment.oe_preview .oe_name{
+    position: absolute;
+    bottom: 0px;
+    margin: 0px;
+    left: 0px;
+    right: 0px;
+    max-height: 64px;
+    background: rgba(0,0,0,0.8); 
+    color: white;
+    border-top-left-radius: 0px;
+    border-top-right-radius: 0px;
+    opacity: 0;
+    -webkit-transition: opacity 0.2s linear; 
+       -moz-transition: opacity 0.2s linear; 
+         -o-transition: opacity 0.2s linear; 
+            transition: opacity 0.2s linear; 
+}
+.openerp .oe_mail .oe_attachment.oe_preview:hover .oe_name{
+    opacity: 1;
+    -webkit-transition: opacity 0.2s linear; 
+       -moz-transition: opacity 0.2s linear; 
+         -o-transition: opacity 0.2s linear; 
+            transition: opacity 0.2s linear; 
+}
+.openerp .oe_mail .oe_attachment img{
+    position: absolute;
+    width: 48px;
+    height: 48px;
+    top: 0px;
+    left: 50%;
+    margin-left: -24px;
+}
+.openerp .oe_mail .oe_attachment.oe_preview img{
+    display: block;
+    position: relative;
+    margin:0px;
+    width: 100px;
+    height: 100px;
+    border-radius: 3px;
+    margin-left: -50px;
+}
+.openerp .oe_mail .oe_attachment .oe_delete{
+    display: none;
+}
+.openerp .oe_mail .oe_msg_composer .oe_attachment .oe_delete{
+    display: block;
+    position: absolute;
+    top: -7px;
+    right: 0px;
+    color: black;
+    text-shadow: 1px 0px white, -1px 0px white, 0px 1px white, 0px -1px white;
+    cursor: pointer;
+    opacity: 0;
+    -webkit-transition: opacity 0.2s linear; 
+       -moz-transition: opacity 0.2s linear; 
+         -o-transition: opacity 0.2s linear; 
+            transition: opacity 0.2s linear; 
+}
+.openerp .oe_mail .oe_msg_composer .oe_attachment:hover .oe_delete{
+    opacity: 1;
+    -webkit-transition: opacity 0.2s linear; 
+       -moz-transition: opacity 0.2s linear; 
+         -o-transition: opacity 0.2s linear; 
+            transition: opacity 0.2s linear; 
+}
+/* ---------------- MESSAGE QUICK COMPOSER --------------- */
+
+.openerp .oe_mail .oe_msg_composer .oe_msg_footer{
+    padding-right:4px;
+    padding-top: 2px;
+    padding-bottom:6px;
+}
+.openerp .oe_mail .oe_msg_images {
+    display: block;
+}
+.openerp .oe_mail .oe_msg_footer button{
+    display: inline;
+    height: 24px;
+    font-size: 12px;
+    line-height: 12px;
+    vertical-align: middle;
+}
+.openerp .oe_mail .oe_msg_footer button.oe_attach{
+    width: 24px;
+    overflow: hidden;
+    filter:none;
+}
+.openerp .oe_mail .oe_msg_footer button.oe_attach .oe_e{
+    position: relative;
+    top: -1px;
+    left: -9px;
+    filter:none;
+}
+.openerp .oe_mail .oe_hidden_input_file, .openerp .oe_mail .oe_hidden_input_file form{
+    display:inline;
+}
+.openerp .oe_mail .oe_msg_footer button.oe_full{
+    width:24px;
+    overflow:hidden;
+    float: right;
+    filter:none;
+}
+.openerp .oe_mail .oe_msg_footer button.oe_full .oe_e{
+    position: relative;
+    top: -1px;
+    left: -9px;
+    filter:none;
+}
+.openerp .oe_mail button.oe_attach, .openerp .oe_mail button.oe_full{
+    background: transparent; 
+    color: #7C7BAD;
+    box-shadow: none;
+    border: none;
+    text-shadow: none;
+    filter:none;
+}
+.openerp .oe_mail .oe_attach_label{
+    color: #7C7BAD;
+    margin-left: -3px;
+}
+.openerp .oe_mail .oe_msg_footer .oe_attachment_file .oe_form_binary_file{
+    display: inline-block;
+    margin-left: -47px;
+    height: 28px;
+    width: 52px;
+    margin-top: -6px;
+    filter:none;
+}
+.openerp .oe_mail .oe_mail_list_recipients{
+    font-size: 12px;
+    margin-top: 4px;
+    margin-bottom: 4px;
+}
+
+/* ---------------- HIDDEN MESSAGES ------------------ */
+
+.openerp .oe_mail .oe_msg_content.oe_msg_more_message{
+    text-align: right;
+    cursor: pointer;
+}
+.openerp .oe_mail .oe_msg_content.oe_msg_more_message .oe_separator{
+    height: 0;
+    border-bottom: dashed 1px #e6e6e6;
+    margin-left: -4px;
+    margin-right: 8px;
+    margin-top: 6px;
+    margin-bottom: -9px;
+}
+.openerp .oe_mail .oe_msg_more_message .oe_msg_fetch_more {
+    background: white;
+    margin-right: 210px;
+    padding-left: 8px;
+    padding-right: 8px;
+    text-decoration: none;
+    color: #b4b4b4;
+}
+.openerp .oe_mail .oe_msg_more_message .oe_msg_fetch_more:hover{
     text-decoration: none;
 }
 
-.openerp .oe_mail_msg_subtitle {
-    margin: 0 0 .5em 0;
-}
-.openerp .oe_mail_msg_footer,
-.openerp .oe_mail_msg_subtitle {
-    color: #888;
+/* ---------------- FOLLOWERS ------------------ */
+
+.openerp .oe_followers{
+    position: relative;
+    display: inline-block;
+    padding-top: 5px;
+    width: 160px;
+    float: right;
+    margin-right: 16px;
 }
 
-.openerp .oe_mail_msg_footer li {
-  float: left;
-  margin-right: 3px;
+/*  a) THE FOLLOW BUTTON */
+
+.openerp .oe_followers button.oe_follower{
+    display: block;
+    text-align: center;
+    width:100%;
+}
+.openerp .oe_followers button.oe_follower.oe_following{
+    color: white;
+    background-color: #3465A4;
+    background-image: -webkit-linear-gradient(top, #729FCF, #3465A4);
+    background-image:    -moz-linear-gradient(top, #729FCF, #3465A4);
+    background-image:     -ms-linear-gradient(top, #729FCF, #3465A4);
+    background-image:      -o-linear-gradient(top, #729FCF, #3465A4);
+    background-image:         linear-gradient(to bottom, #729FCF, #3465A4);
+}
+.openerp .oe_followers button.oe_follower.oe_following:hover{
+    color: white;
+    filter:none;
+    background-color: #A21A1A;
+    background-image: -webkit-linear-gradient(top, #DF3F3F, #A21A1A);
+    background-image:    -moz-linear-gradient(top, #DF3F3F, #A21A1A);
+    background-image:     -ms-linear-gradient(top, #DF3F3F, #A21A1A);
+    background-image:      -o-linear-gradient(top, #DF3F3F, #A21A1A);
+    background-image:         linear-gradient(to bottom, #DF3F3F, #A21A1A);
 }
 
-.openerp .oe_mail_msg_body {
-    margin-bottom: .5em;
-    text-align: justify;
+.openerp .oe_followers button.oe_follower .oe_follow, 
+.openerp .oe_followers button.oe_follower .oe_unfollow, 
+.openerp .oe_followers button.oe_follower .oe_following{
+    display: none;
 }
-
-.openerp .oe_mail_msg_body span.oe_mail_msg_tail {
+/*  a.1) when following, show 'following' */
+.openerp .oe_followers button.oe_follower.oe_following .oe_following{
+    display: inline;
+}
+/*  a.2) when following and hovering, show 'unfollow' */
+.openerp .oe_followers button.oe_follower.oe_following:hover .oe_following{
+    display: none;
+}
+.openerp .oe_followers button.oe_follower.oe_following:hover .oe_unfollow{
+    display: inline;
+}
+/*  a.3) when not following  show 'follow' */
+.openerp .oe_followers button.oe_follower.oe_notfollow .oe_follow{
     display: inline;
 }
 
-.openerp .oe_mail_oe_bold {
-    font-weight: bold;
+.openerp .oe_followers .oe_subtype_list{
+    margin-top: 4px;
 }
 
-/* Read more/less link */
-.openerp .oe_mail_msg_content .oe_mail_reduce {
-    position: absolute;
-    right: 0;
+/*  b) THE FOLLOWERS */
+.openerp .oe_followers .oe_follower_title{
+    display: inline;
+}
+.openerp .oe_followers .oe_follower_title_box{
+    margin-top: 12px;
+    margin-bottom: 4px;
+}
+.openerp .oe_followers .oe_invite{
+    float: right;
+}
+.openerp .oe_followers .oe_partner {
+    height: 32px;
+    overflow: hidden;
+}
+.openerp .oe_followers .oe_partner img{
+    width: 32px;
+    margin-right:4px;
+    border-radius: 2px;
 }
 
-/* Dropdown menu */
-.openerp .oe_mail_msg_content .oe_dropdown_toggle {
-    position: absolute;
-    top: 0px;
-    right: 3px;
-}
-.openerp .oe_mail_msg_content .oe_dropdown_arrow:after {
-    border-top: 4px solid transparent;
-}
-.openerp .oe_mail_msg_content:hover .oe_dropdown_arrow:after {
-    border-top: 4px solid #404040;
+/* ---------------- MESSAGES BODY ------------------ */
+.openerp .oe_mail .oe_msg_content .oe_blockquote,
+.openerp .oe_mail .oe_msg_content blockquote {
+    padding: 4px;
+    border-radius: 2px;
+    border: solid 1px rgba(124,123,173,0.14);
 }
 
-.openerp .oe_mail_msg_footer li:after {
-    content: " · ";
+/* ----------- FORM INTEGRATION ------------ */
+
+.openerp .oe_record_thread{
+    display: block;
+    margin-left: 16px;
+    margin-right: 212px;
 }
 
-.openerp .oe_mail_msg_footer li:last-child:after {
-    content: "";
+/* ----------- INBOX INTEGRATION ----------- */
+
+.openerp .oe_mail_wall .oe_mail{
+    margin: 16px;
+    width: 600px;
 }
 
-/* Attachments list */
-.openerp ul.oe_mail_msg_attachments {
-    display: none;
-    width: 100%;
-    border-top: 1px solid #CCC;
-    margin: .5em 0 0 0;
-    padding: .5em 0;
-    list-style-position: inside;
-}
-.openerp ul.oe_mail_msg_attachments li {
-    float: none;
-    margin: 0;
-    padding: 0;
-    list-style-type: square;
+.openerp .oe_mail .oe_view_nocontent > p {
+    padding-left: 15px;
 }
diff --git a/addons/mail/static/src/css/mail_compose_message.css b/addons/mail/static/src/css/mail_compose_message.css
deleted file mode 100644
index 4cd1339ded4..00000000000
--- a/addons/mail/static/src/css/mail_compose_message.css
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ------------------------------ */
-/* Compose Message Wizard Form */
-/* ------------------------------ */
-
-.openerp tr td .oe_form_field.oe_mail_compose_message_invisible {
-    display: none;
-}
-
-.openerp .oe_mail_compose_message_icons {
-    text-align: right;
-}
-
-.openerp .oe_mail_compose_message_icons img {
-    width: 20px;
-    height: 20px;
-}
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index 8f4ca61d531..c1cefee9070 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -12,7 +12,6 @@
   min-height: 0px;
   max-height: none;
   padding: 0px 18px;
-  max-width: 80%;
 }
 
 /* Resize footer width */
@@ -45,20 +44,23 @@
   text-align: center;
   overflow: hidden;
   -moz-border-radius: 3px;
+  border-collapse: separate;
   -webkit-border-radius: 3px;
   -o-border-radius: 3px;
   -ms-border-radius: 3px;
   border-radius: 3px;
+  border-collapse: separate;
   -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
   -o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-  -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
 }
 
 .oe_group_photo {
   width: 100px;
   height: 100px;
   clip: rect(0px, 100px, 100px, 0px);
+  border:none;
 }
 
 .oe_group_details {
@@ -69,30 +71,31 @@
   min-height: 120px;
 }
 
-.oe_group_details a, .oe_group_details a:hover {
-  font-weight: bold;
-  color: #4c4c4c;
-}
-
 .oe_group_details h4 {
   margin: 0;
   font-size: 13px;
 }
 
-.oe_group_details h4 a {
-  color: #4c4c4c;
-}
-
-.oe_group_details h4 a:hover {
-  text-decoration: underline;
-}
-
 .oe_group_details ul {
   margin: 3px 0 5px;
   padding: 0;
   list-style: none;
 }
 
-.oe_group_details li {
+.openerp .oe_group_details li {
   margin: 2px 0;
 }
+
+.openerp .oe_group_button {
+    padding-top: 7px;
+}
+
+.openerp .oe_group_button .oe_group_join {
+    color: white;
+    background-color: #3465A4;
+    background-image: -webkit-linear-gradient(top, #729FCF, #3465A4);
+    background-image:    -moz-linear-gradient(top, #729FCF, #3465A4);
+    background-image:     -ms-linear-gradient(top, #729FCF, #3465A4);
+    background-image:      -o-linear-gradient(top, #729FCF, #3465A4);
+    background-image:         linear-gradient(to bottom, #729FCF, #3465A4);
+}
diff --git a/addons/mail/static/src/img/mimetypes/addresses.png b/addons/mail/static/src/img/mimetypes/addresses.png
new file mode 100644
index 00000000000..586f1257196
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/addresses.png differ
diff --git a/addons/mail/static/src/img/mimetypes/archive.png b/addons/mail/static/src/img/mimetypes/archive.png
new file mode 100644
index 00000000000..704d962d426
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/archive.png differ
diff --git a/addons/mail/static/src/img/mimetypes/audio.png b/addons/mail/static/src/img/mimetypes/audio.png
new file mode 100644
index 00000000000..6dd4c635fe7
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/audio.png differ
diff --git a/addons/mail/static/src/img/mimetypes/binary.png b/addons/mail/static/src/img/mimetypes/binary.png
new file mode 100644
index 00000000000..5708c9fc2a5
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/binary.png differ
diff --git a/addons/mail/static/src/img/mimetypes/calendar.png b/addons/mail/static/src/img/mimetypes/calendar.png
new file mode 100644
index 00000000000..81791af05e0
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/calendar.png differ
diff --git a/addons/mail/static/src/img/mimetypes/certificate.png b/addons/mail/static/src/img/mimetypes/certificate.png
new file mode 100644
index 00000000000..e48cb1de432
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/certificate.png differ
diff --git a/addons/mail/static/src/img/mimetypes/disk.png b/addons/mail/static/src/img/mimetypes/disk.png
new file mode 100644
index 00000000000..9c241cdf896
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/disk.png differ
diff --git a/addons/mail/static/src/img/mimetypes/document.png b/addons/mail/static/src/img/mimetypes/document.png
new file mode 100644
index 00000000000..fee2f1619b6
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/document.png differ
diff --git a/addons/mail/static/src/img/mimetypes/font.png b/addons/mail/static/src/img/mimetypes/font.png
new file mode 100644
index 00000000000..3b04787b9f9
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/font.png differ
diff --git a/addons/mail/static/src/img/mimetypes/html.png b/addons/mail/static/src/img/mimetypes/html.png
new file mode 100644
index 00000000000..440c5bc9972
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/html.png differ
diff --git a/addons/mail/static/src/img/mimetypes/image.png b/addons/mail/static/src/img/mimetypes/image.png
new file mode 100644
index 00000000000..ab2f84a1a54
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/image.png differ
diff --git a/addons/mail/static/src/img/mimetypes/presentation.png b/addons/mail/static/src/img/mimetypes/presentation.png
new file mode 100644
index 00000000000..8642a8e9298
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/presentation.png differ
diff --git a/addons/mail/static/src/img/mimetypes/print.png b/addons/mail/static/src/img/mimetypes/print.png
new file mode 100644
index 00000000000..fee2f1619b6
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/print.png differ
diff --git a/addons/mail/static/src/img/mimetypes/script.png b/addons/mail/static/src/img/mimetypes/script.png
new file mode 100644
index 00000000000..10c58c0bcc3
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/script.png differ
diff --git a/addons/mail/static/src/img/mimetypes/spreadsheet.png b/addons/mail/static/src/img/mimetypes/spreadsheet.png
new file mode 100644
index 00000000000..77a834697f1
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/spreadsheet.png differ
diff --git a/addons/mail/static/src/img/mimetypes/text.png b/addons/mail/static/src/img/mimetypes/text.png
new file mode 100644
index 00000000000..e65d2ec5a67
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/text.png differ
diff --git a/addons/mail/static/src/img/mimetypes/unknown.png b/addons/mail/static/src/img/mimetypes/unknown.png
new file mode 100644
index 00000000000..e65d2ec5a67
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/unknown.png differ
diff --git a/addons/mail/static/src/img/mimetypes/vector.png b/addons/mail/static/src/img/mimetypes/vector.png
new file mode 100644
index 00000000000..c4595ec1b24
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/vector.png differ
diff --git a/addons/mail/static/src/img/mimetypes/video.png b/addons/mail/static/src/img/mimetypes/video.png
new file mode 100644
index 00000000000..e3a87b5bde6
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/video.png differ
diff --git a/addons/mail/static/src/img/mimetypes/webimage.png b/addons/mail/static/src/img/mimetypes/webimage.png
new file mode 100644
index 00000000000..ab2f84a1a54
Binary files /dev/null and b/addons/mail/static/src/img/mimetypes/webimage.png differ
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 00242ecee38..dc265a343d5 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -1,10 +1,11 @@
-openerp.mail = function(session) {
+openerp.mail = function (session) {
     var _t = session.web._t,
        _lt = session.web._lt;
 
     var mail = session.mail = {};
 
     openerp_mail_followers(session, mail);        // import mail_followers.js
+    openerp_FieldMany2ManyTagsEmail(session);      // import manyy2many_tags_email.js
 
     /**
      * ------------------------------------------------------------
@@ -12,21 +13,29 @@ openerp.mail = function(session) {
      * ------------------------------------------------------------
      * 
      * Override of formview do_action method, to catch all return action about
-     * mail.compose.message. The purpose is to bind 'Send by e-mail' buttons
-     * and redirect them to the Chatter.
+     * mail.compose.message. The purpose is to bind 'Send by e-mail' buttons.
      */
 
     session.web.FormView = session.web.FormView.extend({
-        do_action: function(action, on_close) {
-            if (action.res_model == 'mail.compose.message' && this.fields && this.fields.message_ids && this.fields.message_ids.view.get("actual_mode") != 'create') {
-                var record_thread = this.fields.message_ids;
-                var thread = record_thread.thread;
-                thread.instantiate_composition_form('comment', true, false, 0, action.context);
-                return false;
-            }
-            else {
-                return this._super(action, on_close);
+        do_action: function (action) {
+            if (action.res_model == 'mail.compose.message') {
+                /* hack for stop context propagation of wrong value
+                 * delete this hack when a global method to clean context is create
+                 */
+                var context_keys = ['default_template_id', 'default_composition_mode', 
+                    'default_use_template', 'default_partner_ids', 'default_model',
+                    'default_res_id', 'default_content_subtype', 'default_subject',
+                    'default_body', 'active_id', 'lang', 'bin_raw', 'tz',
+                    'active_model', 'edi_web_url_view', 'active_ids', 
+                    'default_attachment_ids']
+                for (var key in action.context) {
+                    if (_.indexOf(context_keys, key) == -1) {
+                        action.context[key] = null;
+                    }
+                }
+                /* end hack */
             }
+            return this._super.apply(this, arguments);
         },
     });
 
@@ -36,183 +45,33 @@ openerp.mail = function(session) {
      * ChatterUtils
      * ------------------------------------------------------------
      * 
-     * This class holds a few tools method that will be used by
-     * the various Chatter widgets.
+     * This class holds a few tools method for Chatter.
+     * Some regular expressions not used anymore, kept because I want to
+     * - (^|\s)@((\w|@|\.)*): @login@log.log
+     * - (^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]: [ir.attachment,3|My Label],
+     *   for internal links
      */
 
     mail.ChatterUtils = {
 
-        /**
-        * mail_int_mapping: structure to keep a trace of internal links mapping
-        *      mail_int_mapping['model'] = {
-        *          'name_get': [[id,label], [id,label], ...]
-        *          'fetch_ids': [id, id, ...] } */
-        //var mail_int_mapping = {};
-        
-        /**
-        * mail_msg_struct: structure to orrganize chatter messages
-        */
-        //var mail_msg_struct = {}; // TODO: USE IT OR NOT :)
-
-        /* generic chatter events binding */
-        bind_events: function(widget) {
-            // event: click on an internal link to a document: model, login
-            widget.$element.delegate('a.oe_mail_internal_link', 'click', function (event) {
-                event.preventDefault();
-                // lazy implementation: fetch data and try to redirect
-                if (! event.srcElement.dataset.resModel) return false;
-                else var res_model = event.srcElement.dataset.resModel;
-                var res_login = event.srcElement.dataset.resLogin;
-                if (! res_login) return false;
-                var ds = new session.web.DataSet(widget, res_model);
-                var defer = ds.call('search', [[['login', '=', res_login]]]).pipe(function (records) {
-                    if (records[0]) {
-                        widget.do_action({ type: 'ir.actions.act_window', res_model: res_model, res_id: parseInt(records[0]), views: [[false, 'form']]});
-                    }
-                    else return false;
-                });
-            });
+        /* Get an image in /web/binary/image?... */
+        get_image: function (session, model, field, id, resize) {
+            var r = resize ? encodeURIComponent(resize) : '';
+            id = id || '';
+            return session.url('/web/binary/image', {model: model, field: field, id: id, resize: r});
         },
 
-        /** get an image in /web/binary/image?... */
-        get_image: function(session_prefix, session_id, model, field, id) {
-            return session_prefix + '/web/binary/image?session_id=' + session_id + '&model=' + model + '&field=' + field + '&id=' + (id || '');
-        },
-
-        /** checks if tue current user is the message author */
-        is_author: function (widget, message_user_id) {
-            return (widget.session && widget.session.uid != 0 && widget.session.uid == message_user_id);
-        },
-
-        /**
-        * Add records to comments_structure array
-        * @param {Array} records records from mail.message sorted by date desc
-        * @returns {Object} cs comments_structure: dict
-        *       cs.model_to_root_ids = {model: [root_ids], }
-        *       cs.new_root_ids = [new_root_ids]
-        *       cs.root_ids = [root_ids]
-        *       cs.msgs = {record.id: record,}
-        *       cs.tree_struct = {record.id: {
-        *           'level': record_level in hierarchy, 0 is root,
-        *           'msg_nbr': number of childs,
-        *           'direct_childs': [msg_ids],
-        *           'all_childs': [msg_ids],
-        *           'for_thread_msgs': [records],
-        *           'ancestors': [msg_ids], } }
-        */
-        records_struct_add_records: function(cs, records, parent_id) {
-            var cur_iter = 0; var max_iter = 10; var modif = true;
-            while ( modif && (cur_iter++) < max_iter) {
-                modif = false;
-                _(records).each(function (record) {
-                    // root and not yet recorded
-                    if ( (record.parent_id == false || record.parent_id[0] == parent_id) && ! cs['msgs'][record.id]) {
-                        // add to model -> root_list ids
-                        if (! cs['model_to_root_ids'][record.model]) cs['model_to_root_ids'][record.model] = [record.id];
-                        else cs['model_to_root_ids'][record.model].push(record.id);
-                        // add root data
-                        cs['new_root_ids'].push(record.id);
-                        // add record
-                        cs['tree_struct'][record.id] = {'level': 0, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [record], 'msg_nbr': -1, 'ancestors': []};
-                        cs['msgs'][record.id] = record;
-                        modif = true;
-                    }
-                    // not yet recorded, but parent is recorded
-                    else if (! cs['msgs'][record.id] && cs['msgs'][record.parent_id[0]]) {
-                        var parent_level = cs['tree_struct'][record.parent_id[0]]['level'];
-                        // update parent structure
-                        cs['tree_struct'][record.parent_id[0]]['direct_childs'].push(record.id);
-                        cs['tree_struct'][record.parent_id[0]]['for_thread_msgs'].push(record);
-                        // update ancestors structure
-                        for (ancestor_id in cs['tree_struct'][record.parent_id[0]]['ancestors']) {
-                            cs['tree_struct'][ancestor_id]['all_childs'].push(record.id);
-                        }
-                        // add record
-                        cs['tree_struct'][record.id] = {'level': parent_level+1, 'direct_childs': [], 'all_childs': [], 'for_thread_msgs': [], 'msg_nbr': -1, 'ancestors': []};
-                        cs['msgs'][record.id] = record;
-                        modif = true;
-                    }
-                });
-            }
-            return cs;
-        },
-
-        /* copy cs.new_root_ids into cs.root_ids */
-        records_struct_update_after_display: function(cs) {
-            // update TODO
-            cs['root_ids'] = _.union(cs['root_ids'], cs['new_root_ids']);
-            cs['new_root_ids'] = [];
-            return cs;
-        },
-
-        /**
-         *    CONTENT MANIPULATION
-         * 
-         * Regular expressions
-         * - (^|\s)@((\w|@|\.)*): @login@log.log, supports inner '@' for
-         *   logins that are emails
-         *      1. '(void)'
-         *      2. login@log.log
-         * - (^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]: [ir.attachment,3|My Label],
-         *   for internal links to model ir.attachment, id=3, and with
-         *   optional label 'My Label'. Note that having a '|Label' is not
-         *   mandatory, because the regex should still be correct.
-         *      1. '(void)'
-         *      2. 'ir'
-         *      3. 'attachment'
-         *      4. '3'
-         *      5. 'My Label'
-         */
-
-        /** Removes html tags, except b, em, br, ul, li */
-        do_text_remove_html_tags: function (string) {
-            var html = $('<div/>').text(string.replace(/\s+/g, ' ')).html().replace(new RegExp('&lt;(/)?(b|em|br|br /|ul|li|div)\\s*&gt;', 'gi'), '<$1$2>');
-            return html;
-        },
-        
-        /** Replaces line breaks by html line breaks (br) */
-        do_text_nl2br: function (str, is_xhtml) {   
-            var break_tag = (is_xhtml || typeof is_xhtml === 'undefined') ? '<br />' : '<br>';    
-            return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2');
-        },
-
-        /* Add a prefix before each new line of the original string */
-        do_text_quote: function (str, prefix) {
-            return str.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1'+ break_tag +'$2' + prefix || '> ');
+        /* Get the url of an attachment {'id': id} */
+        get_attachment_url: function (session, attachment) {
+            return session.url('/web/binary/saveas', {model: 'ir.attachment', field: 'datas', filename_field: 'datas_fname', id: attachment['id']});
         },
 
         /**
          * Replaces some expressions
-         * - @login - shorcut to link to a res.user, given its login
-         * - [ir.attachment,3|My Label] - shortcut to an internal
-         *   document
          * - :name - shortcut to an image
          */
         do_replace_expressions: function (string) {
-            var self = this;
             var icon_list = ['al', 'pinky']
-            /* shortcut to user: @login */
-            var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
-            var regex_res = regex_login.exec(string);
-            while (regex_res != null) {
-                var login = regex_res[2];
-                string = string.replace(regex_res[0], regex_res[1] + '<a href="#" class="oe_mail_internal_link" data-res-model="res.users" data-res-login = ' + login + '>@' + login + '</a>');
-                regex_res = regex_login.exec(string);
-            }
-            /* shortcut for internal document */
-            var regex_login = new RegExp(/(^|\s)\[(\w+).(\w+),(\d)\|*((\w|[@ .,])*)\]/g);
-            var regex_res = regex_login.exec(string);
-            while (regex_res != null) {
-                var res_model = regex_res[2] + '.' + regex_res[3];
-                var res_id = regex_res[4];
-                if (! regex_res[5]) {
-                    var label = res_model + ':' + res_id }
-                else {
-                    var label = regex_res[5];
-                }
-                string = string.replace(regex_res[0], regex_res[1] + '<a href="#model=' + res_model + '&id=' + res_id + '>' + label + '</a>');
-                regex_res = regex_login.exec(string);
-            }
             /* special shortcut: :name, try to find an icon if in list */
             var regex_login = new RegExp(/(^|\s):((\w)*)/g);
             var regex_res = regex_login.exec(string);
@@ -226,885 +85,1665 @@ openerp.mail = function(session) {
         },
 
         /**
-         * Checks a string to find an expression that will be replaced
-         * by an internal link and requiring a name_get to replace
-         * the expression.
-         * :param mapping: structure to keep a trace of internal links mapping
-         *                  mapping['model'] = {
-         *                      name_get': [[id,label], [id,label], ...]
-         *                      'to_fetch_ids': [id, id, ...]
-         *                  }
-         * CURRENTLY NOT IMPLEMENTED */
-        do_check_for_name_get_mapping: function(string, mapping) {
-            /* shortcut to user: @login */
-            //var regex_login = new RegExp(/(^|\s)@((\w|@|\.)*)/g);
-            //var regex_res = regex_login.exec(string);
-            //while (regex_res != null) {
-                //var login = regex_res[2];
-                //if (! ('res.users' in this.map_hash)) { this.map_hash['res.users']['name'] = []; }
-                //this.map_hash['res.users']['login'].push(login);
-                //regex_res = regex_login.exec(string);
-            //}
-            /* document link with name_get: [res.model,name] */
-            /* internal link with id: [res.model,id], or [res.model,id|display_name] */
-            //var regex_intlink = new RegExp(/(^|\s)#(\w*[a-zA-Z_]+\w*)\.(\w+[a-zA-Z_]+\w*),(\w+)/g);
-            //regex_res = regex_intlink.exec(string);
-            //while (regex_res != null) {
-                //var res_model = regex_res[2] + '.' + regex_res[3];
-                //var res_name = regex_res[4];
-                //if (! (res_model in this.map_hash)) { this.map_hash[res_model]['name'] = []; }
-                //this.map_hash[res_model]['name'].push(res_name);
-                //regex_res = regex_intlink.exec(string);
-            //}
+         * Replaces textarea text into html text (add <p>, <a>)
+         * TDE note : should be done server-side, in Python -> use mail.compose.message ?
+         */
+        get_text2html: function (text) {
+            return text
+                .replace(/[\n\r]/g,'<br/>')
+                .replace(/((?:https?|ftp):\/\/[\S]+)/g,'<a href="$1">$1</a> ')
         },
-        
-        /**
-         * Updates the mapping; check for to_fetch_ids for each recorded
-         * model, and perform a name_get to update the mapping.
-         * CURRENTLY NOT IMPLEMENTED */
-        do_update_name_get_mapping: function(mapping) {
+
+        /* Returns the complete domain with "&" 
+         * TDE note: please add some comments to explain how/why
+         */
+        expand_domain: function (domain) {
+            var new_domain = [];
+            var nb_and = -1;
+            // TDE note: smarted code maybe ?
+            for ( var k = domain.length-1; k >= 0 ; k-- ) {
+                if ( typeof domain[k] != 'array' && typeof domain[k] != 'object' ) {
+                    nb_and -= 2;
+                    continue;
+                }
+                nb_and += 1;
+            }
+
+            for (var k = 0; k < nb_and ; k++) {
+                domain.unshift('&');
+            }
+
+            return domain;
         },
+
+        // inserts zero width space between each letter of a string so that
+        // the word will correctly wrap in html boxes smaller than the text
+        breakword: function(str){
+            var out = '';
+            if (!str) {
+                return str;
+            }
+            for(var i = 0, len = str.length; i < len; i++){
+                out += _.str.escapeHTML(str[i]) + '&#8203;';
+            }
+            return out;
+        },
+
+        // returns the file type of a file based on its extension 
+        // As it only looks at the extension it is quite approximative. 
+        filetype: function(url){
+            url = url.filename || url;
+            var tokens = url.split('.');
+            if(tokens.length <= 1){
+                return 'unknown';
+            }
+            var extension = tokens[tokens.length -1];
+            if(extension.length === 0){
+                return 'unknown';
+            }else{
+                extension = extension.toLowerCase();
+            }
+            var filetypes = {
+                'webimage':     ['png','jpg','jpeg','jpe','gif'], // those have browser preview
+                'image':        ['tif','tiff','tga',
+                                 'bmp','xcf','psd','ppm','pbm','pgm','pnm','mng',
+                                 'xbm','ico','icon','exr','webp','psp','pgf','xcf',
+                                 'jp2','jpx','dng','djvu','dds'],
+                'vector':       ['ai','svg','eps','vml','cdr','xar','cgm','odg','sxd'],
+                'print':        ['dvi','pdf','ps'],
+                'document':     ['doc','docx','odm','odt'],
+                'presentation': ['key','keynote','odp','pps','ppt'],
+                'font':         ['otf','ttf','woff','eot'],
+                'archive':      ['zip','7z','ace','apk','bzip2','cab','deb','dmg','gzip','jar',
+                                 'rar','tar','gz','pak','pk3','pk4','lzip','lz','rpm'],
+                'certificate':  ['cer','key','pfx','p12','pem','crl','der','crt','csr'],
+                'audio':        ['aiff','wav','mp3','ogg','flac','wma','mp2','aac',
+                                 'm4a','ra','mid','midi'],
+                'video':        ['asf','avi','flv','mkv','m4v','mpeg','mpg','mpe','wmv','mp4','ogm'],
+                'text':         ['txt','rtf','ass'],
+                'html':         ['html','xhtml','xml','htm','css'],
+                'disk':         ['iso','nrg','img','ccd','sub','cdi','cue','mds','mdx'],
+                'script':       ['py','js','c','cc','cpp','cs','h','java','bat','sh',
+                                 'd','rb','pl','as','cmd','coffee','m','r','vbs','lisp'],
+                'spreadsheet':  ['123','csv','ods','numbers','sxc','xls','vc','xlsx'],
+                'binary':       ['exe','com','bin','app'],
+            };
+            for(filetype in filetypes){
+                var ext_list = filetypes[filetype];
+                for(var i = 0, len = ext_list.length; i < len; i++){
+                    if(extension === ext_list[i]){
+                        return filetype;
+                    }
+                }
+            }
+            return 'unknown';
+        },
+
     };
 
 
+    /**
+     * ------------------------------------------------------------
+     * MessageCommon
+     * ------------------------------------------------------------
+     * 
+     * Common base for expandables, chatter messages and composer. It manages
+     * the various variables common to those models.
+     */
+
+    mail.MessageCommon = session.web.Widget.extend({
+
+    /**
+     * ------------------------------------------------------------
+     * FIXME: this comment was moved as is from the ThreadMessage Init as
+     * part of a refactoring. Check that it is still correct
+     * ------------------------------------------------------------
+     * This widget handles the display of a messages in a thread. 
+     * Displays a record and performs some formatting on the record :
+     * - record.date: formatting according to the user timezone
+     * - record.timerelative: relative time givein by timeago lib
+     * - record.avatar: image url
+     * - record.attachment_ids[].url: url of each attachmentThe
+     * thread view :
+     * - root thread
+     * - - sub message (parent_id = root message)
+     * - - - sub thread
+     * - - - - sub sub message (parent id = sub thread)
+     * - - sub message (parent_id = root message)
+     * - - - sub thread
+     */
+        
+        init: function (parent, datasets, options) {
+            this._super(parent, options);
+
+            // record options
+            this.options = datasets.options || options || {};
+            // record domain and context
+            this.domain = datasets.domain || options.domain || [];
+            this.context = _.extend({
+                default_model: false,
+                default_res_id: 0,
+                default_parent_id: false }, options.context || {});
+
+            // data of this message
+            this.id = datasets.id ||  false,
+            this.last_id = this.id,
+            this.model = datasets.model || this.context.default_model || false,
+            this.res_id = datasets.res_id || this.context.default_res_id ||  false,
+            this.parent_id = datasets.parent_id ||  false,
+            this.type = datasets.type ||  false,
+            this.is_author = datasets.is_author ||  false,
+            this.is_private = datasets.is_private ||  false,
+            this.subject = datasets.subject ||  false,
+            this.name = datasets.name ||  false,
+            this.record_name = datasets.record_name ||  false,
+            this.body = datasets.body ||  false,
+            this.vote_nb = datasets.vote_nb || 0,
+            this.has_voted = datasets.has_voted ||  false,
+            this.is_favorite = datasets.is_favorite ||  false,
+            this.thread_level = datasets.thread_level ||  0,
+            this.to_read = datasets.to_read || false,
+            this.author_id = datasets.author_id || false,
+            this.attachment_ids = datasets.attachment_ids ||  [],
+            this.partner_ids = datasets.partner_ids || [];
+            this._date = datasets.date;
+
+            this.format_data();
+
+            // record options and data
+            this.show_record_name = this.record_name && !this.thread_level && this.model != 'res.partner';
+            this.options.show_read = false;
+            this.options.show_unread = false;
+            if (this.options.show_read_unread_button) {
+                if (this.options.read_action == 'read') this.options.show_read = true;
+                else if (this.options.read_action == 'unread') this.options.show_unread = true;
+                else {
+                    this.options.show_read = this.to_read;
+                    this.options.show_unread = !this.to_read;
+                    this.options.rerender = true;
+                    this.options.toggle_read = true;
+                }
+            }
+            this.parent_thread = parent.messages != undefined ? parent : this.options.root_thread;
+            this.thread = false;
+        },
+
+        /* Convert date, timerelative and avatar in displayable data. */
+        format_data: function () {
+
+            //formating and add some fields for render
+            if (this._date) {
+                this.date = session.web.format_value(this._date, {type:"datetime"});
+                this.timerelative = $.timeago(this.date);
+            } 
+            if (this.type == 'email' && (!this.author_id || !this.author_id[0])) {
+                this.avatar = ('/mail/static/src/img/email_icon.png');
+            } else if (this.author_id && this.template != 'mail.compose_message') {
+                this.avatar = mail.ChatterUtils.get_image(this.session, 'res.partner', 'image_small', this.author_id[0]);
+            } else {
+                this.avatar = mail.ChatterUtils.get_image(this.session, 'res.users', 'image_small', this.session.uid);
+            }
+
+        },
+
+
+        /* upload the file on the server, add in the attachments list and reload display
+         */
+        display_attachments: function () {
+            for (var l in this.attachment_ids) {
+                var attach = this.attachment_ids[l];
+                if (!attach.formating) {
+                    attach.url = mail.ChatterUtils.get_attachment_url(this.session, attach);
+                    attach.filetype = mail.ChatterUtils.filetype(attach.filename);
+                    attach.name = mail.ChatterUtils.breakword(attach.name || attach.filename);
+                    attach.formating = true;
+                }
+            }
+            this.$(".oe_msg_attachment_list").html( session.web.qweb.render('mail.thread.message.attachments', {'widget': this}) );
+        },
+
+        /* return the link to resized image
+         */
+        attachments_resize_image: function (id, resize) {
+            return mail.ChatterUtils.get_image(this.session, 'ir.attachment', 'datas', id, resize);
+        },
+
+        /* get all child message id linked.
+         * @return array of id
+        */
+        get_child_ids: function () {
+            return _.map(this.get_childs(), function (val) { return val.id; });
+        },
+
+        /* get all child message linked.
+         * @return array of message object
+        */
+        get_childs: function (nb_thread_level) {
+            var res=[];
+            if (arguments[1] && this.id) res.push(this);
+            if ((isNaN(nb_thread_level) || nb_thread_level>0) && this.thread) {
+                _(this.thread.messages).each(function (val, key) {
+                    res = res.concat( val.get_childs((isNaN(nb_thread_level) ? undefined : nb_thread_level-1), true) );
+                });
+            }
+            return res;
+        },
+
+        /**
+         * search a message in all thread and child thread.
+         * This method return an object message.
+         * @param {object}{int} option.id
+         * @param {object}{string} option.model
+         * @param {object}{boolean} option._go_thread_wall
+         *      private for check the top thread
+         * @return thread object
+         */
+        browse_message: function (options) {
+            // goto the wall thread for launch browse
+            if (!options._go_thread_wall) {
+                options._go_thread_wall = true;
+                for (var i in this.options.root_thread.messages) {
+                    var res=this.options.root_thread.messages[i].browse_message(options);
+                    if (res) return res;
+                }
+            }
+
+            if (this.id==options.id)
+                return this;
+
+            for (var i in this.thread.messages) {
+                if (this.thread.messages[i].thread) {
+                    var res=this.thread.messages[i].browse_message(options);
+                    if (res) return res;
+                }
+            }
+
+            return false;
+        },
+
+        /**
+         * call on_message_delete on his parent thread
+        */
+        destroy: function () {
+
+            this._super();
+            this.parent_thread.on_message_detroy(this);
+
+        }
+
+    });
+
     /**
      * ------------------------------------------------------------
      * ComposeMessage widget
      * ------------------------------------------------------------
      * 
      * This widget handles the display of a form to compose a new message.
-     * This form is an OpenERP form_view, build on a mail.compose.message
-     * wizard.
+     * This form is a mail.compose.message form_view.
+     * On first time : display a compact textarea that is not the compose form.
+     * When the user focuses the textarea, the compose message is instantiated.
      */
-
-    mail.ComposeMessage = session.web.Widget.extend({
+    
+    mail.ThreadComposeMessage = mail.MessageCommon.extend({
         template: 'mail.compose_message',
-        
-        /**
-         * @param {Object} parent parent
-         * @param {Object} [params]
-         * @param {String} [params.res_model] res_model of document [REQUIRED]
-         * @param {Number} [params.res_id] res_id of record [REQUIRED]
-         * @param {Number} [params.email_mode] true/false, tells whether
-         *      we are in email sending mode
-         * @param {Number} [params.formatting] true/false, tells whether
-         *      we are in advance formatting mode
-         * @param {String} [params.model] mail.compose.message.mode (see
-         *      composition wizard)
-         * @param {Number} [params.msg_id] id of a message in case we are in
-         *      reply mode
-         */
-        init: function(parent, params) {
-            var self = this;
-            this._super(parent);
-            // options
-            this.params = params || {};
-            this.params.context = params.context || {};
-            this.params.email_mode = params.email_mode || false;
-            this.params.formatting = params.formatting || false;
-            this.params.mode = params.mode || 'comment';
-            this.params.form_xml_id = params.form_xml_id || 'email_compose_message_wizard_form_chatter';
-            this.params.form_view_id = false;
-            if (this.params.mode == 'reply') {
-                this.params.active_id = this.params.msg_id;
-            } else {
-                this.params.active_id = this.params.res_id;
-            }
-            this.email_mode = false;
-            this.formatting = false;
-        },
-
-        /**
-         * Reinitialize the widget field values to the default values. The
-         * purpose is to avoid to destroy and re-build a form view. Default
-         * values are therefore given as for an onchange. */
-        reinit: function() {
-            var self = this;
-            if (! this.form_view) return;
-            var call_defer = this.ds_compose.call('default_get', [['subject', 'body_text', 'body_html', 'dest_partner_ids'], this.ds_compose.get_context()]).then(
-                function (result) {
-                    self.form_view.on_processed_onchange({'value': result}, []);
-                });
-            return call_defer;
-        },
-
-        /**
-         * Override-hack of do_action: clean the form */
-        do_action: function(action, on_close) {
-            // this.init_comments();
-            return this._super(action, on_close);
-        },
-
-        /**
-         * Widget start function
-         * - builds and initializes the form view */
-        start: function() {
-            var self = this;
-            this._super.apply(this, arguments);
-            // customize display: add avatar, clean previous content
-            var user_avatar = mail.ChatterUtils.get_image(this.session.prefix,
-                this.session.session_id, 'res.users', 'image_small', this.session.uid);
-            this.$element.find('img.oe_mail_icon').attr('src', user_avatar);
-            this.$element.find('div.oe_mail_msg_content').empty();
-            // create a context for the default_get of the compose form
-            var widget_context = {
-                'active_model': this.params.res_model,
-                'active_id': this.params.active_id,
-                'mail.compose.message.mode': this.params.mode,
-            };
-            var context = _.extend({}, this.params.context, widget_context);
-            this.ds_compose = new session.web.DataSetSearch(this, 'mail.compose.message', context);
-            // find the id of the view to display in the chatter form
-            var data_ds = new session.web.DataSetSearch(this, 'ir.model.data');
-            var deferred_form_id =data_ds.call('get_object_reference', ['mail', this.params.form_xml_id]).then( function (result) {
-                if (result) {
-                    self.params.form_view_id = result[1];
-                }
-            }).pipe(this.proxy('create_form_view'));
-            return deferred_form_id;
-        },
-
-        /**
-         * Create a FormView, then append it to the to widget DOM. */
-        create_form_view: function () {
-            var self = this;
-            // destroy previous form_view if any
-            if (this.form_view) { this.form_view.destroy(); }
-            // create the FormView
-            this.form_view = new session.web.FormView(this, this.ds_compose, this.params.form_view_id, {
-                action_buttons: false,
-                pager: false,
-                initial_mode: 'edit',
-                disable_autofocus: true,
-            });
-            // add the form, bind events, activate the form
-            var msg_node = this.$element.find('div.oe_mail_msg_content');
-            return $.when(this.form_view.appendTo(msg_node)).pipe(function() {
-                self.bind_events();
-                self.form_view.do_show();
-                if (self.params.email_mode) { self.toggle_email_mode(); }
-                if (self.params.formatting) { self.toggle_formatting_mode(); }
-            });
-        },
-
-        destroy: function() {
-            this._super.apply(this, arguments);
-        },
-
-        /**
-         * Bind events in the widget. Each event is slightly described
-         * in the function. */
-        bind_events: function() {
-            var self = this;
-            this.$element.find('button.oe_form_button').click(function (event) {
-                event.preventDefault();
-            });
-            // event: click on 'Send an Email' link that toggles the form for
-            // sending an email (partner_ids)
-            this.$element.find('a.oe_mail_compose_message_email').click(function (event) {
-                event.preventDefault();
-                self.toggle_email_mode();
-            });
-            // event: click on 'Formatting' icon-link that toggles the advanced
-            // formatting options for writing a message (subject, body_html)
-            this.$element.find('a.oe_mail_compose_message_formatting').click(function (event) {
-                event.preventDefault();
-                self.toggle_formatting_mode();
-            });
-            // event: click on 'Attachment' icon-link that opens the dialog to
-            // add an attachment.
-            this.$element.find('a.oe_mail_compose_message_attachment').click(function (event) {
-                event.preventDefault();
-                // not yet implemented
-                self.set_body_value('attachment', 'attachment');
-            });
-            // event: click on 'Checklist' icon-link that toggles the options
-            // for adding checklist.
-            this.$element.find('a.oe_mail_compose_message_checklist').click(function (event) {
-                event.preventDefault();
-                // not yet implemented
-                self.set_body_value('checklist', 'checklist');
-            });
-        },
-
-        /**
-         * Toggle the formatting mode. */
-        toggle_formatting_mode: function() {
-            var self = this;
-            this.formatting = ! this.formatting;
-            // calls onchange
-            var call_defer = this.ds_compose.call('onchange_formatting', [[], this.formatting, this.params.res_model, this.params.res_id]).then(
-                function (result) {
-                    self.form_view.on_processed_onchange(result, []);
-                });
-            // update context of datasetsearch
-            this.ds_compose.context.formatting = this.formatting;
-            // toggle display
-            this.$element.find('span.oe_mail_compose_message_subject').toggleClass('oe_mail_compose_message_invisible');
-            this.$element.find('div.oe_mail_compose_message_body_text').toggleClass('oe_mail_compose_message_invisible');
-            this.$element.find('div.oe_mail_compose_message_body_html').toggleClass('oe_mail_compose_message_invisible');
-        },
-
-        /**
-         * Toggle the email mode. */
-        toggle_email_mode: function() {
-            var self = this;
-            this.email_mode = ! this.email_mode;
-            // calls onchange
-            var call_defer = this.ds_compose.call('onchange_email_mode', [[], this.email_mode, this.params.res_model, this.params.res_id]).then(
-                function (result) {
-                    self.form_view.on_processed_onchange(result, []);
-                });
-            // update context of datasetsearch
-            this.ds_compose.context.email_mode = this.email_mode;
-            // update 'Post' button -> 'Send'
-            // update 'Send an Email' link -> 'Post a comment'
-            if (this.email_mode) {
-                this.$element.find('button.oe_mail_compose_message_button_send').html('<span>Send</span>');
-                this.$element.find('a.oe_mail_compose_message_email').html('Comment');
-            } else {
-                this.$element.find('button.oe_mail_compose_message_button_send').html('<span>Post</span>');
-                this.$element.find('a.oe_mail_compose_message_email').html('Send an Email');
-            }
-            // toggle display
-            this.$element.find('div.oe_mail_compose_message_partner_ids').toggleClass('oe_mail_compose_message_invisible');
-        },
-
-        /**
-         * Update the values of the composition form; with possible different
-         * values for body_text and body_html. */
-        set_body_value: function(body_text, body_html) {
-            this.form_view.fields.body_text.set_value(body_text);
-            this.form_view.fields.body_html.set_value(body_html);
-        },
-    }),
-
-    /** 
-     * ------------------------------------------------------------
-     * Thread Widget
-     * ------------------------------------------------------------
-     *
-     * This widget handles the display of a thread of messages. The
-     * [thread_level] parameter sets the thread level number:
-     * - root message
-     * - - sub message (parent_id = root message)
-     * - - - sub sub message (parent id = sub message)
-     * - - sub message (parent_id = root message)
-     * This widget has 2 ways of initialization, either you give records
-     * to be rendered, either it will fetch [limit] messages related to
-     * [res_model]:[res_id].
-     */
-
-    mail.Thread = session.web.Widget.extend({
-        template: 'mail.thread',
 
         /**
          * @param {Object} parent parent
-         * @param {Object} [params]
-         * @param {String} [params.res_model] res_model of document [REQUIRED]
-         * @param {Number} [params.res_id] res_id of record [REQUIRED]
-         * @param {Number} [params.uid] user id [REQUIRED]
-         * @param {Bool}   [params.parent_id=false] parent_id of message
-         * @param {Number} [params.thread_level=0] number of levels in the thread
-         *      (only 0 or 1 currently)
-         * @param {Bool}   [params.is_wall=false] thread is displayed in the wall
-         * @param {Number} [params.msg_more_limit=150] number of character to
-         *      display before having a "show more" link; note that the text
-         *      will not be truncated if it does not have 110% of the parameter
-         *      (ex: 110 characters needed to be truncated and be displayed as
-         *      a 100-characters message)
-         * @param {Number} [params.limit=100] maximum number of messages to fetch
-         * @param {Number} [params.offset=0] offset for fetching messages
-         * @param {Number} [params.records=null] records to show instead of fetching messages
+         * @param {Object} [options]
+         *      @param {Object} [context] context passed to the
+         *          mail.compose.message DataSetSearch. Please refer to this model
+         *          for more details about fields and default values.
          */
-        init: function(parent, params) {
-            this._super(parent);
-            // options
-            this.params = params;
-            this.params.parent_id = this.params.parent_id || false;
-            this.params.thread_level = this.params.thread_level || 0;
-            this.params.is_wall = this.params.is_wall || (this.params.records != undefined) || false;
-            this.params.msg_more_limit = this.params.msg_more_limit || 250;
-            this.params.limit = this.params.limit || 100;
-            // this.params.limit = 3; // tmp for testing
-            this.params.offset = this.params.offset || 0;
-            this.params.records = this.params.records || null;
-            // datasets and internal vars
-            this.ds = new session.web.DataSetSearch(this, this.params.res_model);
-            this.ds_users = new session.web.DataSetSearch(this, 'res.users');
-            this.ds_msg = new session.web.DataSetSearch(this, 'mail.message');
-            this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
-            // display customization vars
-            this.display = {};
-            this.display.show_post_comment = this.params.show_post_comment || false;
-            this.display.show_reply = (this.params.thread_level > 0 && this.params.is_wall);
-            this.display.show_delete = ! this.params.is_wall;
-            this.display.show_hide = this.params.is_wall;
-            this.display.show_reply_by_email = ! this.params.is_wall;
-            this.display.show_more = (this.params.thread_level == 0);
+
+        init: function (parent, datasets, options) {
+            this._super(parent, datasets, options);
+            this.show_compact_message = false;
+            this.show_delete_attachment = true;
         },
-        
-        start: function() {
+
+        start: function () {
             this._super.apply(this, arguments);
-            // add events
+
+            this.ds_attachment = new session.web.DataSetSearch(this, 'ir.attachment');
+            this.fileupload_id = _.uniqueId('oe_fileupload_temp');
+            $(window).on(this.fileupload_id, this.on_attachment_loaded);
+
+            this.display_attachments();
             this.bind_events();
-            // display user, fetch comments
-            this.display_current_user();
-            if (this.params.records) var display_done = this.display_comments_from_parameters(this.params.records);
-            else var display_done = this.init_comments();
-            // customize display
-            $.when(display_done).then(this.proxy('do_customize_display'));            
-            // add message composition form view
-            if (this.display.show_post_comment) {
-                var compose_done = this.instantiate_composition_form();
-            }
-            return display_done && compose_done;
         },
 
-        /**
-         * Override-hack of do_action: automatically reload the chatter.
-         * Normally it should be called only when clicking on 'Post/Send'
-         * in the composition form. */
-        do_action: function(action, on_close) {
-            this.init_comments();
-            if (this.compose_message_widget) {
-                this.compose_message_widget.reinit(); }
-            return this._super(action, on_close);
-        },
-
-        instantiate_composition_form: function(mode, email_mode, formatting, msg_id, context) {
-            if (this.compose_message_widget) {
-                this.compose_message_widget.destroy();
-            }
-            this.compose_message_widget = new mail.ComposeMessage(this, {
-                'extended_mode': false, 'uid': this.params.uid, 'res_model': this.params.res_model,
-                'res_id': this.params.res_id, 'mode': mode || 'comment', 'msg_id': msg_id,
-                'email_mode': email_mode || false, 'formatting': formatting || false,
-                'context': context || false } );
-            var composition_node = this.$element.find('div.oe_mail_thread_action');
-            composition_node.empty();
-            var compose_done = this.compose_message_widget.appendTo(composition_node);
-            return compose_done;
-        },
-
-        do_customize_display: function() {
-            if (this.display.show_post_comment) { this.$element.find('div.oe_mail_thread_action').eq(0).show(); }
-        },
-
-        /**
-         * Bind events in the widget. Each event is slightly described
-         * in the function. */
-        bind_events: function() {
+        /* when a user click on the upload button, send file read on_attachment_loaded
+        */
+        on_attachment_change: function (event) {
+            event.stopPropagation();
             var self = this;
-            // generic events from Chatter Mixin
-            mail.ChatterUtils.bind_events(this);
-            // event: click on 'more' at bottom of thread
-            this.$element.find('button.oe_mail_button_more').click(function () {
-                self.do_more();
-            });
-            // event: writing in basic textarea of composition form (quick reply)
-            this.$element.find('textarea.oe_mail_compose_textarea').keyup(function (event) {
-                var charCode = (event.which) ? event.which : window.event.keyCode;
-                if (event.shiftKey && charCode == 13) { this.value = this.value+"\n"; }
-                else if (charCode == 13) { return self.do_comment(); }
-            });
-            // event: click on 'Reply' in msg
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply', 'click', function (event) {
-                var act_dom = $(this).parents('div.oe_mail_thread_display').find('div.oe_mail_thread_action:first');
-                act_dom.toggle();
-                event.preventDefault();
-            });
-            // event: click on 'attachment(s)' in msg
-            this.$element.delegate('a.oe_mail_msg_view_attachments', 'click', function (event) {
-                var act_dom = $(this).parent().parent().parent().find('.oe_mail_msg_attachments');
-                act_dom.toggle();
-                event.preventDefault();
-            });
-            // event: click on 'Delete' in msg side menu
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_delete', 'click', function (event) {
-                if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
-                var msg_id = event.srcElement.dataset.id;
-                if (! msg_id) return false;
-                var call_defer = self.ds_msg.unlink([parseInt(msg_id)]);
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
-                if (self.params.thread_level > 0) {
-                    $(event.srcElement).parents('.oe_mail_thread').eq(0).hide();
-                }
-                event.preventDefault();
-                return call_defer;
-            });
-            // event: click on 'Hide' in msg side menu
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_hide', 'click', function (event) {
-                if (! confirm(_t("Do you really want to hide this thread ?"))) { return false; }
-                var msg_id = event.srcElement.dataset.id;
-                if (! msg_id) return false;
-                var call_defer = self.ds.call('message_remove_pushed_notifications', [[self.params.res_id], [parseInt(msg_id)], true]);
-                $(event.srcElement).parents('li.oe_mail_thread_msg').eq(0).hide();
-                if (self.params.thread_level > 0) {
-                    $(event.srcElement).parents('.oe_mail_thread').eq(0).hide();
-                }
-                event.preventDefault();
-                return call_defer;
-            });
-            // event: click on "Reply" in msg side menu (email style)
-            this.$element.find('div.oe_mail_thread_display').delegate('a.oe_mail_msg_reply_by_email', 'click', function (event) {
-                var msg_id = event.srcElement.dataset.msg_id;
-                var email_mode = (event.srcElement.dataset.type == 'email');
-                var formatting = (event.srcElement.dataset.formatting == 'html');
-                if (! msg_id) return false;
-                self.instantiate_composition_form('reply', email_mode, formatting, msg_id);
-                event.preventDefault();
-            });
-        },
-        
-        destroy: function () {
-            this._super.apply(this, arguments);
-        },
-        
-        init_comments: function() {
-            var self = this;
-            this.params.offset = 0;
-            this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
-            this.$element.find('div.oe_mail_thread_display').empty();
-            var domain = this.get_fetch_domain(this.comments_structure);
-            return this.fetch_comments(this.params.limit, this.params.offset, domain).then();
-        },
-        
-        fetch_comments: function (limit, offset, domain) {
-            var self = this;
-            var defer = this.ds.call('message_read', [[this.params.res_id], (this.params.thread_level > 0), (this.comments_structure['root_ids']),
-                                    (limit+1) || (this.params.limit+1), offset||this.params.offset, domain||undefined ]).then(function (records) {
-                if (records.length <= self.params.limit) self.display.show_more = false;
-                // else { self.display.show_more = true; records.pop(); }
-                // else { self.display.show_more = true; records.splice(0, 1); }
-                else { self.display.show_more = true; }
-                self.display_comments(records);
-                // TODO: move to customize display
-                if (self.display.show_more == true) self.$element.find('div.oe_mail_thread_more:last').show();
-                else  self.$element.find('div.oe_mail_thread_more:last').hide();
-            });
-            
-            return defer;
-        },
+            var $target = $(event.target);
+            if ($target.val() !== '') {
 
-        display_comments_from_parameters: function (records) {
-            if (records.length > 0 && records.length < (records[0].child_ids.length+1) ) this.display.show_more = true;
-            else this.display.show_more = false;
-            var defer = this.display_comments(records);
-            // TODO: move to customize display
-            if (this.display.show_more == true) $('div.oe_mail_thread_more').eq(-2).show();
-            else $('div.oe_mail_thread_more').eq(-2).hide();
-            return defer;
-        },
-        
-        display_comments: function (records) {
-            var self = this;
-            // sort the records
-            mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, this.params.parent_id);
-            //build attachments download urls and compute time-relative from dates
-            for (var k in records) {
-                records[k].timerelative = $.timeago(records[k].date);
-                if (records[k].attachments) {
-                    for (var l in records[k].attachments) {
-                        var url = self.session.origin + '/web/binary/saveas?session_id=' + self.session.session_id + '&model=ir.attachment&field=datas&filename_field=datas_fname&id='+records[k].attachments[l].id;
-                        records[k].attachments[l].url = url;
+                var filename = $target.val().replace(/.*[\\\/]/,'');
+
+                // if the files exits for this answer, delete the file before upload
+                var attachments=[];
+                for (var i in this.attachment_ids) {
+                    if ((this.attachment_ids[i].filename || this.attachment_ids[i].name) == filename) {
+                        if (this.attachment_ids[i].upload) {
+                            return false;
+                        }
+                        this.ds_attachment.unlink([this.attachment_ids[i].id]);
+                    } else {
+                        attachments.push(this.attachment_ids[i]);
                     }
                 }
+                this.attachment_ids = attachments;
+
+                // submit file
+                this.$('form.oe_form_binary_form').submit();
+
+                this.$(".oe_attachment_file").hide();
+
+                this.attachment_ids.push({
+                    'id': 0,
+                    'name': filename,
+                    'filename': filename,
+                    'url': '',
+                    'upload': true
+                });
+                this.display_attachments();
             }
-            _(records).each(function (record) {
-                var sub_msgs = [];
-                if ((record.parent_id == false || record.parent_id[0] == self.params.parent_id) && self.params.thread_level > 0 ) {
-                    var sub_list = self.comments_structure['tree_struct'][record.id]['direct_childs'];
-                    _(records).each(function (record) {
-                        //if (record.parent_id == false || record.parent_id[0] == self.params.parent_id) return;
-                        if (_.indexOf(sub_list, record.id) != -1) {
-                            sub_msgs.push(record);
-                        }
-                    });
-                    self.display_comment(record);
-                    self.thread = new mail.Thread(self, {'res_model': self.params.res_model, 'res_id': self.params.res_id, 'uid': self.params.uid,
-                                                            'records': sub_msgs, 'thread_level': (self.params.thread_level-1), 'parent_id': record.id,
-                                                            'is_wall': self.params.is_wall});
-                    self.$element.find('li.oe_mail_thread_msg:last').append('<div class="oe_mail_thread_subthread"/>');
-                    self.thread.appendTo(self.$element.find('div.oe_mail_thread_subthread:last'));
+        },
+        
+        /* when the file is uploaded 
+        */
+        on_attachment_loaded: function (event, result) {
+            for (var i in this.attachment_ids) {
+                if (this.attachment_ids[i].filename == result.filename && this.attachment_ids[i].upload) {
+                    this.attachment_ids[i]={
+                        'id': result.id,
+                        'name': result.name,
+                        'filename': result.filename,
+                        'url': mail.ChatterUtils.get_attachment_url(this.session, result)
+                    };
                 }
-                else if (self.params.thread_level == 0) {
-                    self.display_comment(record);
-                }
-            });
-            mail.ChatterUtils.records_struct_update_after_display(this.comments_structure);
-            // update offset for "More" buttons
-            if (this.params.thread_level == 0) this.params.offset += records.length;
+            }
+            this.display_attachments();
+
+            var $input = this.$('input.oe_form_binary_file');
+            $input.after($input.clone(true)).remove();
+            this.$(".oe_attachment_file").show();
         },
 
-        /** Displays a record, performs text/link formatting */
-        display_comment: function (record) {
-            record.body = mail.ChatterUtils.do_text_nl2br($.trim(record.body), true);
-            // if (record.type == 'email' && record.state == 'received') {
-            if (record.type == 'email') {
-                record.mini_url = ('/mail/static/src/img/email_icon.png');
+        /* unlink the file on the server and reload display
+         */
+        on_attachment_delete: function (event) {
+            event.stopPropagation();
+            var attachment_id=$(event.target).data("id");
+            if (attachment_id) {
+                var attachments=[];
+                for (var i in this.attachment_ids) {
+                    if (attachment_id!=this.attachment_ids[i].id) {
+                        attachments.push(this.attachment_ids[i]);
+                    }
+                    else {
+                        this.ds_attachment.unlink([attachment_id]);
+                    }
+                }
+                this.attachment_ids = attachments;
+                this.display_attachments();
+            }
+        },
+
+        bind_events: function () {
+            var self = this;
+
+            this.$('textarea.oe_compact').on('focus', _.bind( this.on_compose_expandable, this));
+
+            // set the function called when attachments are added
+            this.$('input.oe_form_binary_file').on('change', _.bind( this.on_attachment_change, this) );
+
+            this.$('.oe_cancel').on('click', _.bind( this.on_cancel, this) );
+            this.$('.oe_post').on('click', _.bind( this.on_message_post, this) );
+            this.$('.oe_full').on('click', _.bind( this.on_compose_fullmail, this, this.id ? 'reply' : 'comment') );
+
+            /* stack for don't close the compose form if the user click on a button */
+            this.$('.oe_msg_footer').on('mousedown', _.bind( function () { this.stay_open = true; }, this));
+            var ev_stay = {};
+            ev_stay.mouseup = ev_stay.keydown = ev_stay.focus = function () { self.stay_open = false; };
+            this.$('textarea:not(.oe_compact)').on(ev_stay);
+            this.$('textarea:not(.oe_compact)').autosize();
+
+            // auto close
+            this.$('textarea:not(.oe_compact)').on('blur', _.bind( this.on_compose_expandable, this));
+
+            // event: delete child attachments off the oe_msg_attachment_list box
+            this.$(".oe_msg_attachment_list").on('click', '.oe_delete', this.on_attachment_delete);
+        },
+
+        on_compose_fullmail: function (default_composition_mode) {
+            if (default_composition_mode == 'reply') {
+                var context = {
+                    'default_composition_mode': default_composition_mode,
+                    'default_parent_id': this.id,
+                    'default_body': mail.ChatterUtils.get_text2html(this.$el ? (this.$el.find('textarea:not(.oe_compact)').val() || '') : ''),
+                    'default_attachment_ids': this.attachment_ids,
+                };
             } else {
-                record.mini_url = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', record.user_id[0]);
+                var context = {
+                    'default_model': this.context.default_model,
+                    'default_res_id': this.context.default_res_id,
+                    'default_composition_mode': default_composition_mode,
+                    'default_parent_id': this.id,
+                    'default_body': mail.ChatterUtils.get_text2html(this.$el ? (this.$el.find('textarea:not(.oe_compact)').val() || '') : ''),
+                    'default_attachment_ids': this.attachment_ids,
+                };
             }
-            // body text manipulation
-            if (record.subtype == 'plain') {
-                record.body = mail.ChatterUtils.do_text_remove_html_tags(record.body);
+            var action = {
+                type: 'ir.actions.act_window',
+                res_model: 'mail.compose.message',
+                view_mode: 'form',
+                view_type: 'form',
+                action_from: 'mail.ThreadComposeMessage',
+                views: [[false, 'form']],
+                target: 'new',
+                context: context,
+            };
+
+            this.do_action(action);
+            this.on_cancel();
+        },
+
+        reinit: function() {
+            var $render = $( session.web.qweb.render('mail.compose_message', {'widget': this}) );
+
+            $render.insertAfter(this.$el.last());
+            this.$el.remove();
+            this.$el = $render;
+
+            this.display_attachments();
+            this.bind_events();
+        },
+
+        on_cancel: function (event) {
+            if (event) event.stopPropagation();
+            this.attachment_ids=[];
+            this.stay_open = false;
+            this.show_composer = false;
+            this.reinit();
+        },
+
+        /*post a message and fetch the message*/
+        on_message_post: function (event) {
+            var self = this;
+
+            var comment_node =  this.$('textarea');
+            var body = comment_node.val();
+            comment_node.val('');
+
+            var attachments=[];
+            for (var i in this.attachment_ids) {
+                if (this.attachment_ids[i].upload) {
+                    session.web.dialog($('<div>' + session.web.qweb.render('CrashManager.warning', {message: 'Please, wait while the file is uploading.'}) + '</div>'));
+                    return false;
+                }
+                attachments.push(this.attachment_ids[i].id);
             }
-            record.body = mail.ChatterUtils.do_replace_expressions(record.body);
-            // format date according to the user timezone
-            record.date = session.web.format_value(record.date, {type:"datetime"});
-            // is the user the author ?
-            record.is_author = mail.ChatterUtils.is_author(this, record.user_id[0]);
-            // render
-            var rendered = session.web.qweb.render('mail.thread.message', {'record': record, 'thread': this, 'params': this.params, 'display': this.display});
-            // expand feature
-            $(rendered).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
-            this.$element.find('div.oe_mail_msg_record_body').expander({
-                slicePoint: this.params.msg_more_limit,
+
+            if (body.match(/\S+/)) {
+                //session.web.blockUI();
+                this.parent_thread.ds_thread.call('message_post_user_api', [
+                        this.context.default_res_id, 
+                        mail.ChatterUtils.get_text2html(body), 
+                        false, 
+                        this.context.default_parent_id, 
+                        attachments,
+                        this.parent_thread.context
+                    ]).done(function (record) {
+                        var thread = self.parent_thread;
+                        if (self.options.display_indented_thread < self.thread_level && thread.parent_message) {
+                            var thread = thread.parent_message.parent_thread;
+                        }
+                        var root = thread == self.options.root_thread;
+                        // create object and attach to the thread object
+                        thread.message_fetch([['id', 'child_of', [self.id]]], false, [record], function (arg, data) {
+                            var message = thread.create_message_object( data[0] );
+                            // insert the message on dom
+                            thread.insert_message( message, root ? undefined : self.$el, root );
+                            if (thread.parent_message) {
+                                self.$el.remove();
+                                self.parent_thread.compose_message = null;
+                            } else {
+                                self.on_cancel();
+                            }
+                        });
+                        //session.web.unblockUI();
+                    });
+                return true;
+            }
+        },
+
+        /* convert the compact mode into the compose message
+        */
+        on_compose_expandable: function (event) {
+
+            if (!this.stay_open && (!this.show_composer || !this.$('textarea:not(.oe_compact)').val().match(/\S+/))) {
+                this.show_composer = !this.show_composer || this.stay_open;
+                this.reinit();
+            }
+            if (!this.stay_open && this.show_composer) {
+                this.$('textarea:not(.oe_compact):first').focus();
+            }
+            return true;
+        },
+
+        do_hide_compact: function () {
+            this.show_compact_message = false;
+            if (!this.show_composer) {
+                this.reinit();
+            }
+        },
+
+        do_show_compact: function () {
+            this.show_compact_message = true;
+            if (!this.show_composer) {
+                this.reinit();
+            }
+        }
+    });
+
+    /**
+     * ------------------------------------------------------------
+     * Thread Message Expandable Widget
+     * ------------------------------------------------------------
+     *
+     * This widget handles the display the expandable message in a thread.
+     * - thread
+     * - - visible message
+     * - - expandable
+     * - - visible message
+     * - - visible message
+     * - - expandable
+     */
+    mail.ThreadExpandable = mail.MessageCommon.extend({
+        template: 'mail.thread.expandable',
+
+        init: function (parent, datasets, options) {
+            this._super(parent, datasets, options);
+            this.type = 'expandable';
+            this.max_limit = datasets.max_limit;
+            this.nb_messages = datasets.nb_messages;
+            this.flag_used = false;
+        },
+        
+        start: function () {
+            this._super.apply(this, arguments);
+            this.bind_events();
+        },
+
+        reinit: function () {
+            var $render = $(session.web.qweb.render('mail.thread.expandable', {'widget': this}));
+            this.$el.replaceWith( $render );
+            this.$el = $render;
+            this.bind_events();
+        },
+
+        /**
+         * Bind events in the widget. Each event is slightly described
+         * in the function. */
+        bind_events: function () {
+            this.$('.oe_msg_more_message').on('click', this.on_expandable);
+        },
+
+        animated_destroy: function (fadeTime) {
+            var self=this;
+            this.$el.fadeOut(fadeTime, function () {
+                self.destroy();
+            });
+        },
+
+        /*The selected thread and all childs (messages/thread) became read
+        * @param {object} mouse envent
+        */
+        on_expandable: function (event) {
+            if (event)event.stopPropagation();
+            if (this.flag_used) {
+                return false
+            }
+            this.flag_used = true;
+
+            var self = this;
+
+            // read messages
+            self.parent_thread.message_fetch(this.domain, this.context, false, function (arg, data) {
+                // insert the message on dom after this message
+                self.id = false;
+                self.parent_thread.switch_new_message( data, self.$el );
+                self.animated_destroy(200);
+            });
+
+            return false;
+        },
+
+    });
+
+    mail.ThreadMessage = mail.MessageCommon.extend({
+        template: 'mail.thread.message',
+        
+        start: function () {
+            this._super.apply(this, arguments);
+            this.expender();
+            this.bind_events();
+            if(this.thread_level < this.options.display_indented_thread) {
+                this.create_thread();
+            }
+            this.$('.oe_msg_attachments, .oe_msg_images').addClass("oe_hidden");
+
+            this.ds_notification = new session.web.DataSetSearch(this, 'mail.notification');
+            this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
+        },
+
+        /**
+         * Bind events in the widget. Each event is slightly described
+         * in the function. */
+        bind_events: function () {
+            var self = this;
+            // header icons bindings
+            this.$('.oe_read').on('click', this.on_message_read);
+            this.$('.oe_unread').on('click', this.on_message_unread);
+            this.$('.oe_msg_delete').on('click', this.on_message_delete);
+            this.$('.oe_reply').on('click', this.on_message_reply);
+            this.$('.oe_star').on('click', this.on_star);
+            this.$('.oe_msg_vote').on('click', this.on_vote);
+            this.$('.oe_view_attachments').on('click', this.on_view_attachments);
+
+        },
+
+        /* Call the on_compose_message on the thread of this message. */
+        on_message_reply:function (event) {
+            event.stopPropagation();
+            this.create_thread();
+            this.thread.on_compose_message();
+            return false;
+        },
+
+        expender: function () {
+            this.$('.oe_msg_body:first').expander({
+                slicePoint: this.options.truncate_limit,
                 expandText: 'read more',
-                userCollapseText: '[^]',
-                detailClass: 'oe_mail_msg_tail',
+                userCollapseText: 'read less',
+                detailClass: 'oe_msg_tail',
                 moreClass: 'oe_mail_expand',
                 lessClass: 'oe_mail_reduce',
                 });
         },
 
-        display_current_user: function () {
-            var avatar = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'image_small', this.params.uid);
-            return this.$element.find('img.oe_mail_icon').attr('src', avatar);
-        },
-        
-        do_comment: function () {
-            var comment_node = this.$element.find('textarea');
-            var body_text = comment_node.val();
-            comment_node.val('');
-            return this.ds.call('message_append_note', [[this.params.res_id], '', body_text, this.params.parent_id, 'comment', 'plain']).then(
-                this.proxy('init_comments'));
+        /**
+         * Instantiate the thread object of this message.
+         * Each message have only one thread.
+         */
+        create_thread: function () {
+            if (this.thread) {
+                return false;
+            }
+            /*create thread*/
+            this.thread = new mail.Thread(this, this, {
+                    'domain': this.domain,
+                    'context':{
+                        'default_model': this.model,
+                        'default_res_id': this.res_id,
+                        'default_parent_id': this.id
+                    },
+                    'options': this.options
+                }
+            );
+            /*insert thread in parent message*/
+            this.thread.insertAfter(this.$el);
         },
         
         /**
-         * Create a domain to fetch new comments according to
-         * comment already present in comments_structure
-         * @param {Object} comments_structure (see chatter utils)
-         * @returns {Array} fetch_domain (OpenERP domain style)
+         * Fade out the message and his child thread.
+         * Then this object is destroyed.
          */
-        get_fetch_domain: function (comments_structure) {
-            var domain = [];
-            var ids = comments_structure.root_ids.slice();
-            var ids2 = [];
-            // must be child of current parent
-            if (this.params.parent_id) { domain.push(['id', 'child_of', this.params.parent_id]); }
-            _(comments_structure.root_ids).each(function (id) { // each record
-                ids.push(id);
-                ids2.push(id);
+        animated_destroy: function (fadeTime) {
+            var self=this;
+            this.$el.fadeOut(fadeTime, function () {
+                self.parent_thread.message_to_expandable(self);
             });
-            if (this.params.parent_id != false) {
-                ids2.push(this.params.parent_id);
+            if (this.thread) {
+                this.thread.$el.fadeOut(fadeTime);
             }
-            // must not be children of already fetched messages
-            if (ids.length > 0) {
-                domain.push('&');
-                domain.push('!');
-                domain.push(['id', 'child_of', ids]);
+        },
+
+        /* Call the on_compose_message on the thread of this message. */
+        on_view_attachments:function (event) {
+            event.stopPropagation();
+            var self = this;
+            if (!this.toggle_attachment) {
+                self.display_attachments();
+                this.toggle_attachment = true;
+            } 
+            this.$('.oe_msg_attachment_list').toggle(200);
+        },
+
+        /**
+         * Wait a confirmation for delete the message on the DB.
+         * Make an animate destroy
+         */
+        on_message_delete: function (event) {
+            event.stopPropagation();
+            if (! confirm(_t("Do you really want to delete this message?"))) { return false; }
+            
+            this.animated_destroy(150);
+            // delete this message and his childs
+            var ids = [this.id].concat( this.get_child_ids() );
+            this.ds_message.unlink(ids);
+            return false;
+        },
+
+        /* Check if the message must be destroy and detroy it or check for re render widget
+        * @param {callback} apply function
+        */
+        check_for_rerender: function () {
+            var self = this;
+
+            var messages = [this].concat(this.get_childs());
+            var message_ids = _.map(messages, function (msg) { return msg.id;});
+            var domain = mail.ChatterUtils.expand_domain( this.options.root_thread.domain )
+                .concat([["id", "in", message_ids ]]);
+
+            return this.parent_thread.ds_message.call('message_read', [undefined, domain, [], !!this.parent_thread.options.display_indented_thread, this.context, this.parent_thread.id])
+                .then( function (records) {
+                    // remove message not loaded
+                    _.map(messages, function (msg) {
+                        if(!_.find(records, function (record) { return record.id == msg.id; })) {
+                            msg.animated_destroy(150);
+                        } else {
+                            msg.renderElement();
+                            msg.start()
+                        }
+                    });
+
+                });
+        },
+
+        on_message_read: function (event) {
+            event.stopPropagation();
+            this.on_message_read_unread(true);
+            return false;
+        },
+
+        on_message_unread: function (event) {
+            event.stopPropagation();
+            this.on_message_read_unread(false);
+            return false;
+        },
+
+        /*The selected thread and all childs (messages/thread) became read
+        * @param {object} mouse envent
+        */
+        on_message_read_unread: function (read_value) {
+            var self = this;
+            var messages = [this].concat(this.get_childs());
+
+            // inside the inbox, when the user mark a message as read/done, don't apply this value
+            // for the stared/favorite message
+            if (this.options.view_inbox && read_value) {
+                var messages = _.filter(messages, function (val) { return !val.is_favorite && val.id; });
+                if (!messages.length) {
+                    this.check_for_rerender();
+                    return false;
+                }
             }
-            if (ids2.length > 0) {
-                domain.push(['id', 'not in', ids2]);
-            }
-            return domain;
+            var message_ids = _.map(messages, function (val) { return val.id; });
+
+            this.ds_notification.call('set_message_read', [message_ids, read_value, this.context])
+                .then(function () {
+                    // apply modification
+                    _.each(messages, function (msg) {
+                        msg.to_read = !read_value;
+                        if (msg.options.toggle_read) {
+                            msg.options.show_read = msg.to_read;
+                            msg.options.show_unread = !msg.to_read;
+                        }
+                    });
+                    // check if the message must be display, destroy or rerender
+                    self.check_for_rerender();
+                });
+            return false;
+        },
+
+        /**
+         * add or remove a vote for a message and display the result
+        */
+        on_vote: function (event) {
+            event.stopPropagation();
+            this.ds_message.call('vote_toggle', [[this.id]])
+                .then(
+                    _.bind(function (vote) {
+                        this.has_voted = vote;
+                        this.vote_nb += this.has_voted ? 1 : -1;
+                        this.display_vote();
+                    }, this));
+            return false;
+        },
+
+        /**
+         * Display the render of this message's vote
+        */
+        display_vote: function () {
+            var vote_element = session.web.qweb.render('mail.thread.message.vote', {'widget': this});
+            this.$(".oe_msg_footer:first .oe_mail_vote_count").remove();
+            this.$(".oe_msg_footer:first .oe_msg_vote").replaceWith(vote_element);
+            this.$('.oe_msg_vote').on('click', this.on_vote);
+        },
+
+        /**
+         * add or remove a favorite (or starred) for a message and change class on the DOM
+        */
+        on_star: function (event) {
+            event.stopPropagation();
+            var self=this;
+            var button = self.$('.oe_star:first');
+
+            this.ds_message.call('favorite_toggle', [[self.id]])
+                .then(function (star) {
+                    self.is_favorite=star;
+                    if (self.is_favorite) {
+                        button.addClass('oe_starred');
+                    } else {
+                        button.removeClass('oe_starred');
+                    }
+
+                    if (self.options.view_inbox && self.is_favorite) {
+                        self.on_message_read_unread(true);
+                    } else {
+                        self.check_for_rerender();
+                    }
+                });
+            return false;
+        },
+
+    });
+
+    /**
+     * ------------------------------------------------------------
+     * Thread Widget
+     * ------------------------------------------------------------
+     *
+     * This widget handles the display of a thread of messages. The
+     * thread view:
+     * - root thread
+     * - - sub message (parent_id = root message)
+     * - - - sub thread
+     * - - - - sub sub message (parent id = sub thread)
+     * - - sub message (parent_id = root message)
+     * - - - sub thread
+     */
+    mail.Thread = session.web.Widget.extend({
+        template: 'mail.thread',
+
+        /**
+         * @param {Object} parent parent
+         * @param {Array} [domain]
+         * @param {Object} [context] context of the thread. It should
+            contain at least default_model, default_res_id. Please refer to
+            the ComposeMessage widget for more information about it.
+         * @param {Object} [options]
+         *      @param {Object} [message] read about mail.ThreadMessage object
+         *      @param {Object} [thread]
+         *          @param {int} [display_indented_thread] number thread level to indented threads.
+         *              other are on flat mode
+         *          @param {Array} [parents] liked with the parents thread
+         *              use with browse, fetch... [O]= top parent
+         */
+        init: function (parent, datasets, options) {
+            this._super(parent, options);
+            this.domain = options.domain || [];
+            this.context = _.extend({
+                default_model: 'mail.thread',
+                default_res_id: 0,
+                default_parent_id: false }, options.context || {});
+
+            this.options = options.options;
+            this.options.root_thread = (options.options.root_thread != undefined ? options.options.root_thread : this);
+            this.options.show_compose_message = this.options.show_compose_message && (this.options.display_indented_thread >= this.thread_level || !this.thread_level);
+            
+            // record options and data
+            this.parent_message= parent.thread!= undefined ? parent : false ;
+
+            // data of this thread
+            this.id =  datasets.id || false,
+            this.last_id =  datasets.last_id || false,
+            this.parent_id =  datasets.parent_id || false,
+
+            this.is_private =  datasets.is_private || false,
+            this.author_id =  datasets.author_id || false,
+            this.thread_level =  (datasets.thread_level+1) || 0,
+            this.partner_ids =  _.filter(datasets.partner_ids, function (partner) { return partner[0]!=datasets.author_id[0]; } ) 
+            this.messages = [];
+
+            this.options.flat_mode = !!(this.options.display_indented_thread > this.thread_level ? this.options.display_indented_thread - this.thread_level : 0);
+
+            // object compose message
+            this.compose_message = false;
+
+            this.ds_thread = new session.web.DataSetSearch(this, this.context.default_model || 'mail.thread');
+            this.ds_message = new session.web.DataSetSearch(this, 'mail.message');
         },
         
-        do_more: function () {
-            domain = this.get_fetch_domain(this.comments_structure);
-            return this.fetch_comments(this.params.limit, this.params.offset, domain);
+        start: function () {
+            this._super.apply(this, arguments);
+            this.bind_events();
+        },
+
+        /* instantiate the compose message object and insert this on the DOM.
+        * The compose message is display in compact form.
+        */
+        instantiate_compose_message: function () {
+            // add message composition form view
+            if (!this.compose_message) {
+                this.compose_message = new mail.ThreadComposeMessage(this, this, {
+                    'context': this.context,
+                    'options': this.options,
+                });
+                if (!this.thread_level || this.thread_level > this.options.display_indented_thread) {
+                    this.compose_message.insertBefore(this.$el);
+                } else {
+                    this.compose_message.prependTo(this.$el);
+                }
+            }
+        },
+
+        /* When the expandable object is visible on screen (with scrolling)
+         * then the on_expandable function is launch
+        */
+        on_scroll: function () {
+            var expandables = 
+            _.each( _.filter(this.messages, function (val) {return val.max_limit && !val.parent_id;}), function (val) {
+                var pos = val.$el.position();
+                if (pos.top) {
+                    /* bottom of the screen */
+                    var bottom = $(window).scrollTop()+$(window).height()+200;
+                    if (bottom > pos.top) {
+                        val.on_expandable();
+                        // load only one time
+                        val.loading = true;
+                    }
+                }
+            });
+        },
+
+        /**
+         * Bind events in the widget. Each event is slightly described
+         * in the function. */
+        bind_events: function () {
+            var self = this;
+            self.$('.oe_mail_list_recipients .oe_more').on('click', self.on_show_recipients);
+            self.$('.oe_mail_compose_textarea .oe_more_hidden').on('click', self.on_hide_recipients);
+        },
+
+        /**
+         *show all the partner list of this parent message
+        */
+        on_show_recipients: function () {
+            var p=$(this).parent(); 
+            p.find('.oe_more_hidden, .oe_hidden').show(); 
+            p.find('.oe_more').hide(); 
+            return false;
+        },
+
+        /**
+         *hide a part of the partner list of this parent message
+        */
+        on_hide_recipients: function () {
+            var p=$(this).parent(); 
+            p.find('.oe_more_hidden, .oe_hidden').hide(); 
+            p.find('.oe_more').show(); 
+            return false;
+        },
+
+        /* get all child message/thread id linked.
+         * @return array of id
+        */
+        get_child_ids: function () {
+            return _.map(this.get_childs(), function (val) { return val.id; });
+        },
+
+        /* get all child message/thread linked.
+         * @param {int} nb_thread_level, number of traversed thread level for this search
+         * @return array of thread object
+        */
+        get_childs: function (nb_thread_level) {
+            var res=[];
+            if (arguments[1]) res.push(this);
+            if (isNaN(nb_thread_level) || nb_thread_level>0) {
+                _(this.messages).each(function (val, key) {
+                    if (val.thread) {
+                        res = res.concat( val.thread.get_childs((isNaN(nb_thread_level) ? undefined : nb_thread_level-1), true) );
+                    }
+                });
+            }
+            return res;
+        },
+
+        /**
+         *search a thread in all thread and child thread.
+         * This method return an object thread.
+         * @param {object}{int} option.id
+         * @param {object}{string} option.model
+         * @param {object}{boolean} option._go_thread_wall
+         *      private for check the top thread
+         * @param {object}{boolean} option.default_return_top_thread
+         *      return the top thread (wall) if no thread found
+         * @return thread object
+         */
+        browse_thread: function (options) {
+            // goto the wall thread for launch browse
+            if (!options._go_thread_wall) {
+                options._go_thread_wall = true;
+                return this.options.root_thread.browse_thread(options);
+            }
+
+            if (this.id == options.id) {
+                return this;
+            }
+
+            if (options.id) {
+                for (var i in this.messages) {
+                    if (this.messages[i].thread) {
+                        var res = this.messages[i].thread.browse_thread({'id':options.id, '_go_thread_wall':true});
+                        if (res) return res;
+                    }
+                }
+            }
+
+            //if option default_return_top_thread, return the top if no found thread
+            if (options.default_return_top_thread) {
+                return this;
+            }
+
+            return false;
+        },
+
+        /**
+         *search a message in all thread and child thread.
+         * This method return an object message.
+         * @param {object}{int} option.id
+         * @param {object}{string} option.model
+         * @param {object}{boolean} option._go_thread_wall
+         *      private for check the top thread
+         * @return message object
+         */
+        browse_message: function (options) {
+            if (this.options.root_thread.messages[0])
+                return this.options.root_thread.messages[0].browse_message(options);
+        },
+
+        /**
+         *If compose_message doesn't exist, instantiate the compose message.
+        * Call the on_compose_expandable method to allow the user to write his message.
+        * (Is call when a user click on "Reply" button)
+        */
+        on_compose_message: function () {
+            this.instantiate_compose_message();
+            this.compose_message.on_compose_expandable();
+            return false;
+        },
+
+        /**
+         *display the message "there are no message" on the thread
+        */
+        no_message: function () {
+            var no_message = $(session.web.qweb.render('mail.wall_no_message', {}));
+            if (this.options.help) {
+                no_message.html(this.options.help);
+            }
+            no_message.appendTo(this.$el);
+        },
+
+        /**
+         *make a request to read the message (calling RPC to "message_read").
+         * The result of this method is send to the switch message for sending ach message to
+         * his parented object thread.
+         * @param {Array} replace_domain: added to this.domain
+         * @param {Object} replace_context: added to this.context
+         * @param {Array} ids read (if the are some ids, the method don't use the domain)
+         */
+        message_fetch: function (replace_domain, replace_context, ids, callback) {
+            return this.ds_message.call('message_read', [
+                    // ids force to read
+                    ids == false ? undefined : ids, 
+                    // domain + additional
+                    (replace_domain ? replace_domain : this.domain), 
+                    // ids allready loaded
+                    (this.id ? [this.id].concat( this.get_child_ids() ) : this.get_child_ids()), 
+                    // option for sending in flat mode by server
+                    this.options.flat_mode, 
+                    // context + additional
+                    (replace_context ? replace_context : this.context), 
+                    // parent_id
+                    this.context.default_parent_id || undefined
+                ]).done(callback ? _.bind(callback, this, arguments) : this.proxy('switch_new_message'));
+        },
+
+        /**
+         *create the message object and attached on this thread.
+         * When the message object is create, this method call insert_message for,
+         * displaying this message on the DOM.
+         * @param : {object} data from calling RPC to "message_read"
+         */
+        create_message_object: function (data) {
+            var self = this;
+
+            var data = _.extend(data, {'thread_level': data.thread_level ? data.thread_level : self.thread_level});
+            data.options = _.extend(self.options, data.options);
+
+            if (data.type=='expandable') {
+                var message = new mail.ThreadExpandable(self, data, {'context':{
+                    'default_model': data.model || self.context.default_model,
+                    'default_res_id': data.res_id || self.context.default_res_id,
+                    'default_parent_id': self.id,
+                }});
+            } else {
+                var message = new mail.ThreadMessage(self, data, {'context':{
+                    'default_model': data.model,
+                    'default_res_id': data.res_id,
+                    'default_parent_id': data.id,
+                }});
+            }
+
+            // check if the message is already create
+            for (var i in self.messages) {
+                if (self.messages[i] && self.messages[i].id == message.id) {
+                    console.log('Reload message', message.id);
+                    self.messages[i].destroy();
+                }
+            }
+            self.messages.push( message );
+
+            return message;
+        },
+
+        /**
+         *insert the message on the DOM.
+         * All message (and expandable message) are sorted. The method get the
+         * older and newer message to insert the message (before, after).
+         * If there are no older or newer, the message is prepend or append to
+         * the thread (parent object or on root thread for flat view).
+         * The sort is define by the thread_level (O for newer on top).
+         * @param : {object} ThreadMessage object
+         */
+        insert_message: function (message, dom_insert_after, prepend) {
+            var self=this;
+            if (this.options.show_compact_message > this.thread_level) {
+                this.instantiate_compose_message();
+                this.compose_message.do_show_compact();
+            }
+
+            this.$('.oe_view_nocontent').remove();
+
+
+            if (dom_insert_after) {
+                message.insertAfter(dom_insert_after);
+            }if (prepend) {
+                message.prependTo(self.$el);
+            } else {
+                message.appendTo(self.$el);
+            }
+
+            return message
+        },
+        
+        /**
+         *get the parent thread of the messages.
+         * Each message is send to his parent object (or parent thread flat mode) for creating the object message.
+         * @param : {Array} datas from calling RPC to "message_read"
+         */
+        switch_new_message: function (records, dom_insert_after) {
+            var self=this;
+            _(records).each(function (record) {
+                var thread = self.browse_thread({
+                    'id': record.parent_id, 
+                    'default_return_top_thread':true
+                });
+                // create object and attach to the thread object
+                var message = thread.create_message_object( record );
+                // insert the message on dom
+                thread.insert_message( message, typeof dom_insert_after == 'object' ? dom_insert_after : false);
+            });
+        },
+
+        /**
+         * this method is call when the widget of a message or an expandable message is destroy
+         * in this thread. The this.messages array is filter to remove this message
+         */
+        on_message_detroy: function (message) {
+
+            this.messages = _.filter(this.messages, function (val) { return !val.isDestroyed(); });
+            if (this.options.root_thread == this && !this.messages.length) {
+                this.no_message();
+            }
+            return false;
+
+        },
+
+        /**
+         * Convert a destroyed message into a expandable message
+         */
+        message_to_expandable: function (message) {
+
+            if (!this.thread_level || message.isDestroyed()) {
+                message.destroy();
+                return false;
+            }
+
+            var messages = _.sortBy( this.messages, function (val) { return val.id; });
+            var it = _.indexOf( messages, message );
+
+            var msg_up = messages[it-1];
+            var msg_down = messages[it+1];
+
+            var message_dom = [ ["id", "=", message.id] ];
+
+            if ( msg_up && msg_up.type == "expandable" && msg_down && msg_down.type == "expandable") {
+                // concat two expandable message and add this message to this dom
+                msg_up.domain = mail.ChatterUtils.expand_domain( msg_up.domain );
+                msg_down.domain = mail.ChatterUtils.expand_domain( msg_down.domain );
+
+                msg_down.domain = ['|','|'].concat( msg_up.domain ).concat( message_dom ).concat( msg_down.domain );
+
+                if ( !msg_down.max_limit ) {
+                    msg_down.nb_messages += 1 + msg_up.nb_messages;
+                }
+
+                msg_up.$el.remove();
+                msg_up.destroy();
+
+                msg_down.reinit();
+
+            } else if ( msg_up && msg_up.type == "expandable") {
+                // concat preview expandable message and this message to this dom
+                msg_up.domain = mail.ChatterUtils.expand_domain( msg_up.domain );
+                msg_up.domain = ['|'].concat( msg_up.domain ).concat( message_dom );
+                
+                msg_up.nb_messages++;
+
+                msg_up.reinit();
+
+            } else if ( msg_down && msg_down.type == "expandable") {
+                // concat next expandable message and this message to this dom
+                msg_down.domain = mail.ChatterUtils.expand_domain( msg_down.domain );
+                msg_down.domain = ['|'].concat( msg_down.domain ).concat( message_dom );
+                
+                // it's maybe a message expandable for the max limit read message
+                if ( !msg_down.max_limit ) {
+                    msg_down.nb_messages++;
+                }
+                
+                msg_down.reinit();
+
+            } else {
+                // create a expandable message
+                var expandable = new mail.ThreadExpandable(this, {
+                    'model': message.model,
+                    'parent_id': message.parent_id,
+                    'nb_messages': 1,
+                    'thread_level': message.thread_level,
+                    'parent_id': message.parent_id,
+                    'domain': message_dom,
+                    'options': message.options,
+                    }, {
+                    'context':{
+                        'default_model': message.model || this.context.default_model,
+                        'default_res_id': message.res_id || this.context.default_res_id,
+                        'default_parent_id': this.id,
+                    }
+                });
+
+                // add object on array and DOM
+                this.messages.push(expandable);
+                expandable.insertAfter(message.$el);
+            }
+
+            // destroy message
+            message.destroy();
+
+            return true;
         },
     });
 
+    /**
+     * ------------------------------------------------------------
+     * mail : root Widget
+     * ------------------------------------------------------------
+     *
+     * This widget handles the display of messages with thread options. Its main
+     * use is to receive a context and a domain, and to delegate the message
+     * fetching and displaying to the Thread widget.
+     */
+    session.web.client_actions.add('mail.Widget', 'session.mail.Widget');
+    mail.Widget = session.web.Widget.extend({
+        template: 'mail.Root',
 
-    /** 
+        /**
+         * @param {Object} parent parent
+         * @param {Array} [domain]
+         * @param {Object} [context] context of the thread. It should
+         *   contain at least default_model, default_res_id. Please refer to
+         *   the compose_message widget for more information about it.
+         * @param {Object} [options]
+         *...  @param {Number} [truncate_limit=250] number of character to
+         *      display before having a "show more" link; note that the text
+         *      will not be truncated if it does not have 110% of the parameter
+         *...  @param {Boolean} [show_record_name] display the name and link for do action
+         *...  @param {boolean} [show_reply_button] display the reply button
+         *...  @param {boolean} [show_read_unread_button] display the read/unread button
+         *...  @param {int} [display_indented_thread] number thread level to indented threads.
+         *      other are on flat mode
+         *...  @param {Boolean} [show_compose_message] allow to display the composer
+         *...  @param {Boolean} [show_compact_message] display the compact message on the thread
+         *      when the user clic on this compact mode, the composer is open
+         *...  @param {Array} [message_ids] List of ids to fetch by the root thread.
+         *      When you use this option, the domain is not used for the fetch root.
+         *     @param {String} [no_message] Message to display when there are no message
+         */
+        init: function (parent, action) {
+            this._super(parent, action);
+            var self = this;
+            this.action = _.clone(action);
+            this.domain = this.action.domain || this.action.params.domain || [];
+            this.context = this.action.context || this.action.params.context || {};
+
+            this.action.params = _.extend({
+                'display_indented_thread' : -1,
+                'show_reply_button' : false,
+                'show_read_unread_button' : false,
+                'truncate_limit' : 250,
+                'show_record_name' : false,
+                'show_compose_message' : false,
+                'show_compact_message' : false,
+                'view_inbox': false,
+                'message_ids': undefined,
+            }, this.action.params);
+
+            this.action.params.help = this.action.help || false;
+        },
+
+        start: function (options) {
+            this._super.apply(this, arguments);
+            this.message_render();
+            this.bind_events();
+        },
+        
+        /**
+         *Create the root thread and display this object in the DOM.
+         * Call the no_message method then c all the message_fetch method 
+         * of this root thread to display the messages.
+         */
+        message_render: function (search) {
+
+            this.thread = new mail.Thread(this, {}, {
+                'domain' : this.domain,
+                'context' : this.context,
+                'options': this.action.params,
+            });
+
+            this.thread.appendTo( this.$el );
+            this.thread.no_message();
+
+            if (this.action.params.show_compose_message) {
+                this.thread.instantiate_compose_message();
+                this.thread.compose_message.do_show_compact();
+            }
+
+            this.thread.message_fetch(null, null, this.action.params.message_ids);
+
+        },
+
+        bind_events: function () {
+            $(document).scroll( _.bind(this.thread.on_scroll, this.thread) );
+            $(window).resize( _.bind(this.thread.on_scroll, this.thread) );
+            this.$el.resize( _.bind(this.thread.on_scroll, this.thread) );
+            window.setTimeout( _.bind(this.thread.on_scroll, this.thread), 500 );
+        }
+    });
+
+
+    /**
      * ------------------------------------------------------------
      * mail_thread Widget
      * ------------------------------------------------------------
      *
-     * This widget handles the display of the Chatter on documents.
+     * This widget handles the display of messages on a document. Its main
+     * use is to receive a context and a domain, and to delegate the message
+     * fetching and displaying to the Thread widget.
+     * Use Help on the field to display a custom "no message loaded"
      */
-
-    /* Add mail_thread widget to registry */
     session.web.form.widgets.add('mail_thread', 'openerp.mail.RecordThread');
-
-    /** mail_thread widget: thread of comments */
     mail.RecordThread = session.web.form.AbstractField.extend({
-        // QWeb template to use when rendering the object
         template: 'mail.record_thread',
 
-       init: function() {
+        init: function (parent, node) {
             this._super.apply(this, arguments);
-            this.params = this.options;
-            this.params.thread_level = this.params.thread_level || 0;
-            this.thread = null;
-            this.ds = new session.web.DataSet(this, this.view.model);
-            this.ds_users = new session.web.DataSet(this, 'res.users');
+            this.node = _.clone(node);
+
+            this.node.params = _.extend({
+                'display_indented_thread': -1,
+                'show_reply_button': false,
+                'show_read_unread_button': false,
+                'show_compact_message': 1,
+            }, this.node.params);
+
+            this.domain = this.node.params && this.node.params.domain || [];
         },
 
-        start: function() {
-            // NB: all the widget should be modified to check the actual_mode property on view, not use
-            // any other method to know if the view is in create mode anymore
+        start: function () {
+            this._super.apply(this, arguments);
+            // NB: check the actual_mode property on view to know if the view is in create mode anymore
             this.view.on("change:actual_mode", this, this._check_visibility);
             this._check_visibility();
-            mail.ChatterUtils.bind_events(this);
-            this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); });
-            if (! this.params.see_subscribers_options) {
-                this.$element.find('button.oe_mail_button_followers').hide(); }
-            this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); });
-            this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
-                .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
-                .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
         },
-        
-        _check_visibility: function() {
-            this.$element.toggle(this.view.get("actual_mode") !== "create");
+
+        _check_visibility: function () {
+            this.$el.toggle(this.view.get("actual_mode") !== "create");
         },
-        
-        destroy: function () {
-            this._super.apply(this, arguments);
-        },
-        
-        set_value: function() {
-            this._super.apply(this, arguments);
-            if (! this.view.datarecord.id ||
-                session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
-                this.$element.find('.oe_mail_thread').hide();
+
+        render_value: function () {
+            var self = this;
+
+            if (! this.view.datarecord.id || session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
+                this.$('oe_mail_thread').hide();
                 return;
             }
+
+            this.node.params = _.extend(this.node.params, {
+                'message_ids': this.get_value(),
+                'show_compose_message': this.view.is_action_enabled('edit'),
+            });
+            this.node.context = {
+                'default_res_id': this.view.datarecord.id || false,
+                'default_model': this.view.model || false,
+            };
+
+            if (this.root) {
+                $('<span class="oe_mail-placeholder"/>').insertAfter(this.root.$el);
+                this.root.destroy();
+            }
             // create and render Thread widget
-            this.$element.find('div.oe_mail_recthread_main').empty();
-            if (this.thread) this.thread.destroy();
-            this.thread = new mail.Thread(this, {'res_model': this.view.model, 'res_id': this.view.datarecord.id, 'uid': this.session.uid,
-                                                'thread_level': this.params.thread_level, 'show_post_comment': true, 'limit': 15});
-            var thread_done = this.thread.appendTo(this.$element.find('div.oe_mail_recthread_main'));
-            return thread_done;
+            this.root = new mail.Widget(this, _.extend(this.node, {
+                'domain' : (this.domain || []).concat([['model', '=', this.view.model], ['res_id', '=', this.view.datarecord.id]]),
+            }));
+
+            return this.root.replace(this.$('.oe_mail-placeholder'));
         },
     });
 
 
-    /** 
+    /**
      * ------------------------------------------------------------
-     * WallView Widget
+     * Wall Widget
      * ------------------------------------------------------------
      *
-     * This widget handles the display of the Chatter on the Wall.
+     * This widget handles the display of messages on a Wall. Its main
+     * use is to receive a context and a domain, and to delegate the message
+     * fetching and displaying to the Thread widget.
      */
 
-    /* Add WallView widget to registry */
     session.web.client_actions.add('mail.wall', 'session.mail.Wall');
-
-    /* WallView widget: a wall of messages */
     mail.Wall = session.web.Widget.extend({
         template: 'mail.wall',
 
         /**
          * @param {Object} parent parent
-         * @param {Object} [params]
-         * @param {Number} [params.limit=20] number of messages to show and fetch
-         * @param {Number} [params.search_view_id=false] search view id for messages
-         * @var {Array} comments_structure (see chatter utils)
+         * @param {Object} [options]
+         * @param {Array} [options.domain] domain on the Wall
+         * @param {Object} [options.context] context, is an object. It should
+         *      contain default_model, default_res_id, to give it to the threads.
          */
-        init: function (parent, params) {
-            this._super(parent);
-            this.params = {};
-            this.params.limit = params.limit || 25;
-            this.params.domain = params.domain || [];
-            this.params.context = params.context || {};
-            this.params.res_model = params.res_model || false;
-            this.params.res_id = params.res_id || false;
-            this.params.search_view_id = params.search_view_id || false;
-            this.params.thread_level = params.thread_level || 1;
-            this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
-            this.display_show_more = true;
-            this.thread_list = [];
-            this.search = {'domain': [], 'context': {}, 'groupby': {}}
-            this.search_results = {'domain': [], 'context': {}, 'groupby': {}}
-            // datasets
-            this.ds_msg = new session.web.DataSet(this, 'mail.message');
-            this.ds_thread = new session.web.DataSet(this, 'mail.thread');
-            this.ds_users = new session.web.DataSet(this, 'res.users');
+        init: function (parent, action) {
+            this._super(parent, action);
+
+            this.action = _.clone(action);
+            this.domain = this.action.params.domain || this.action.domain || [];
+            this.context = this.action.params.context || this.action.context || {};
+
+            this.defaults = {};
+            for (var key in this.context) {
+                if (key.match(/^search_default_/)) {
+                    this.defaults[key.replace(/^search_default_/, '')] = this.context[key];
+                }
+            }
+
+            this.action.params = _.extend({
+                'display_indented_thread': 1,
+                'show_reply_button': true,
+                'show_read_unread_button': true,
+                'show_compose_message': true,
+                'show_compact_message': this.action.params.view_mailbox ? false : 1,
+                'view_inbox': false,
+            }, this.action.params);
         },
 
         start: function () {
-            this._super.apply(this, arguments);
-            this.display_current_user();
-            // add events
-            this.add_event_handlers();
-            // load mail.message search view
-            var search_view_ready = this.load_search_view(this.params.search_view_id, {}, false);
-            // load composition form
-            var compose_done = this.instantiate_composition_form();
-            // fetch first threads
-            var comments_ready = this.init_and_fetch_comments(this.params.limit, 0);
-            return (search_view_ready && comments_ready && compose_done);
-        },
-
-        /**
-         * Override-hack of do_action: automatically reload the chatter.
-         * Normally it should be called only when clicking on 'Post/Send'
-         * in the composition form. */
-        do_action: function(action, on_close) {
-            this.init_and_fetch_comments();
-            if (this.compose_message_widget) {
-                this.compose_message_widget.reinit(); }
-            return this._super(action, on_close);
-        },
-
-        destroy: function () {
-            this._super.apply(this, arguments);
-        },
-
-        instantiate_composition_form: function(mode, msg_id) {
-            if (this.compose_message_widget) {
-                this.compose_message_widget.destroy();
+            this._super.apply(this);
+            this.bind_events();
+            var searchview_loaded = this.load_searchview(this.defaults);
+            if (! this.searchview.has_defaults) {
+                this.message_render();
             }
-            this.compose_message_widget = new mail.ComposeMessage(this, {
-                'extended_mode': false, 'uid': this.session.uid, 'res_model': this.params.res_model,
-                'res_id': this.params.res_id, 'mode': mode || 'comment', 'msg_id': msg_id });
-            var composition_node = this.$element.find('div.oe_mail_wall_action');
-            composition_node.empty();
-            var compose_done = this.compose_message_widget.appendTo(composition_node);
-            return compose_done;
-        },
-
-        /** Add events */
-        add_event_handlers: function () {
-            var self = this;
-            // display more threads
-            this.$element.find('button.oe_mail_wall_button_more').click(function () { return self.do_more(); });
+            
         },
 
         /**
-         * Loads the mail.message search view
-         * @param {Number} view_id id of the search view to load
+         * Load the mail.message search view
          * @param {Object} defaults ??
-         * @param {Boolean} hidden some kind of trick we do not care here
          */
-        load_search_view: function (view_id, defaults, hidden) {
+        load_searchview: function (defaults) {
             var self = this;
-            this.searchview = new session.web.SearchView(this, this.ds_msg, view_id || false, defaults || {}, hidden || false);
-            var search_view_loaded = this.searchview.appendTo(this.$element.find('.oe_view_manager_view_search'));
-            return $.when(search_view_loaded).then(function () {
-                self.searchview.on_search.add(self.do_searchview_search);
-            });
+            var ds_msg = new session.web.DataSetSearch(this, 'mail.message');
+            this.searchview = new session.web.SearchView(this, ds_msg, false, defaults || {}, false);
+            this.searchview.appendTo(this.$('.oe_view_manager_view_search'))
+                .then(function () { self.searchview.on('search_data', self, self.do_searchview_search); });
+            if (this.searchview.has_defaults) {
+                this.searchview.ready.then(this.searchview.do_search);
+            }
+            return this.searchview
         },
 
         /**
-         * Aggregate the domains, contexts and groupbys in parameter
-         * with those from search form, and then calls fetch_comments
-         * to actually fetch comments
+         * Get the domains, contexts and groupbys in parameter from search
+         * view, then render the filtered threads.
          * @param {Array} domains
          * @param {Array} contexts
          * @param {Array} groupbys
          */
-        do_searchview_search: function(domains, contexts, groupbys) {
+        do_searchview_search: function (domains, contexts, groupbys) {
             var self = this;
             this.rpc('/web/session/eval_domain_and_context', {
                 domains: domains || [],
                 contexts: contexts || [],
                 group_by_seq: groupbys || []
-            }, function (results) {
-                self.search_results['context'] = results.context;
-                self.search_results['domain'] = results.domain;
-                self.search_results['groupby'] = results.group_by;
-                return self.init_and_fetch_comments();
+            }).then(function (results) {
+                if(self.root) {
+                    $('<span class="oe_mail-placeholder"/>').insertAfter(self.root.$el);
+                    self.root.destroy();
+                }
+                return self.message_render(results);
             });
         },
 
-        display_current_user: function () {
-            //return this.$element.find('img.oe_mail_msg_image').attr('src', this.thread_get_avatar('res.users', 'avatar', this.session.uid));
-        }, 
-
         /**
-         * Initializes the wall and calls fetch_comments
-         * @param {Number} limit: number of notifications to fetch
-         * @param {Number} offset: offset in notifications search
-         * @param {Array} domain
-         * @param {Array} context
+         * Create the root thread widget and display this object in the DOM
          */
-        init_and_fetch_comments: function() {
-            this.search['domain'] = _.union(this.params.domain, this.search_results.domain);
-            this.search['context'] = _.extend(this.params.context, this.search_results.context);
-            this.display_show_more = true;
-            this.comments_structure = {'root_ids': [], 'new_root_ids': [], 'msgs': {}, 'tree_struct': {}, 'model_to_root_ids': {}};
-            this.$element.find('ul.oe_mail_wall_threads').empty();
-            return this.fetch_comments(this.params.limit, 0);
+        message_render: function (search) {
+            var domain = this.domain.concat(search && search['domain'] ? search['domain'] : []);
+            var context = _.extend(this.context, search && search['context'] ? search['context'] : {});
+
+            this.root = new mail.Widget(this, _.extend(this.action, {
+                'domain' : domain,
+                'context' : context,
+            }));
+            return this.root.replace(this.$('.oe_mail-placeholder'));
         },
 
-        /**
-         * Fetches wall messages
-         * @param {Number} limit: number of notifications to fetch
-         * @param {Number} offset: offset in notifications search
-         * @param {Array} domain
-         * @param {Array} context
-         */
-        fetch_comments: function (limit, offset, additional_domain, additional_context) {
-            var self = this;
-            if (additional_domain) var fetch_domain = this.search['domain'].concat(additional_domain);
-            else var fetch_domain = this.search['domain'];
-            if (additional_context) var fetch_context = _.extend(this.search['context'], additional_context);
-            else var fetch_context = this.search['context'];
-            return this.ds_thread.call('message_get_pushed_messages', 
-                [[this.session.uid], true, [], (limit || 0), (offset || 0), fetch_domain, fetch_context]).then(this.proxy('display_comments'));
-        },
-
-        /**
-         * @param {Array} records records to show in threads
-         */
-        display_comments: function (records) {
-            var self = this;
-            this.do_update_show_more(records.length >= self.params.limit);
-            mail.ChatterUtils.records_struct_add_records(this.comments_structure, records, false);
-            _(this.comments_structure['new_root_ids']).each(function (root_id) {
-                var records = self.comments_structure.tree_struct[root_id]['for_thread_msgs'];
-                var model_name = self.comments_structure.msgs[root_id]['model'];
-                var res_id = self.comments_structure.msgs[root_id]['res_id'];
-                var render_res = session.web.qweb.render('mail.wall_thread_container', {});
-                $('<li class="oe_mail_wall_thread">').html(render_res).appendTo(self.$element.find('ul.oe_mail_wall_threads'));
-                var thread = new mail.Thread(self, {
-                    'res_model': model_name, 'res_id': res_id, 'uid': self.session.uid, 'records': records,
-                    'parent_id': false, 'thread_level': self.params.thread_level, 'show_hide': true, 'is_wall': true}
-                    );
-                self.thread_list.push(thread);
-                return thread.appendTo(self.$element.find('li.oe_mail_wall_thread:last'));
+        bind_events: function () {
+            var self=this;
+            this.$(".oe_write_full").click(function (event) {
+                event.stopPropagation();
+                var action = {
+                    type: 'ir.actions.act_window',
+                    res_model: 'mail.compose.message',
+                    view_mode: 'form',
+                    view_type: 'form',
+                    action_from: 'mail.ThreadComposeMessage',
+                    views: [[false, 'form']],
+                    target: 'new',
+                    context: {
+                    },
+                };
+                session.client.action_manager.do_action(action);
             });
-            // update TODO
-            this.comments_structure['root_ids'] = _.union(this.comments_structure['root_ids'], this.comments_structure['new_root_ids']);
-            this.comments_structure['new_root_ids'] = [];
+            this.$(".oe_write_onwall").click(function(){ self.root.thread.on_compose_message(); });
+        }
+    });
+
+
+    /**
+     * ------------------------------------------------------------
+     * UserMenu
+     * ------------------------------------------------------------
+     * 
+     * Add a link on the top user bar for write a full mail
+     */
+    session.web.ComposeMessageTopButton = session.web.Widget.extend({
+        template:'mail.ComposeMessageTopButton',
+
+        start: function () {
+            this.$('button').on('click', this.on_compose_message );
+            this._super();
         },
 
-        /**
-         * Create a domain to fetch new comments according to
-         * comments already present in comments_structure
-         * - for each model:
-         * -- should not be child of already displayed ids
-         * @returns {Array} fetch_domain (OpenERP domain style)
-         */
-        get_fetch_domain: function () {
+        on_compose_message: function (event) {
+            event.stopPropagation();
+            var action = {
+                type: 'ir.actions.act_window',
+                res_model: 'mail.compose.message',
+                view_mode: 'form',
+                view_type: 'form',
+                views: [[false, 'form']],
+                target: 'new',
+                context: {},
+            };
+            session.client.action_manager.do_action(action);
+        },
+    });
+
+    session.web.UserMenu.include({
+        do_update: function(){
             var self = this;
-            var model_to_root = {};
-            var fetch_domain = [];
-            _(this.comments_structure['model_to_root_ids']).each(function (sc_model, model_name) {
-                fetch_domain.push('|', ['model', '!=', model_name], '!', ['id', 'child_of', sc_model]);
+            this._super.apply(this, arguments);
+            this.update_promise.then(function() {
+                var mail_button = new session.web.ComposeMessageTopButton();
+                mail_button.appendTo(session.webclient.$el.find('.oe_systray'));
             });
-            return fetch_domain;
-        },
-        
-        /** Display update: show more button */
-        do_update_show_more: function (new_value) {
-            if (new_value != undefined) this.display_show_more = new_value;
-            if (this.display_show_more) this.$element.find('div.oe_mail_wall_more:last').show();
-            else this.$element.find('div.oe_mail_wall_more:last').hide();
-        },
-        
-        /** Action: Shows more discussions */
-        do_more: function () {
-            var domain = this.get_fetch_domain();
-            return this.fetch_comments(this.params.limit, 0, domain);
         },
     });
 };
diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js
index 0e920f73041..7bb019cde4f 100644
--- a/addons/mail/static/src/js/mail_followers.js
+++ b/addons/mail/static/src/js/mail_followers.js
@@ -9,7 +9,7 @@ openerp_mail_followers = function(session, mail) {
      * mail_followers Widget
      * ------------------------------------------------------------
      *
-     * This widget handles the display of a list of records as a vetical
+     * This widget handles the display of a list of records as a vertical
      * list, with an image on the left. The widget itself is a floatting
      * right-sided box.
      * This widget is mainly used to display the followers of records
@@ -24,99 +24,213 @@ openerp_mail_followers = function(session, mail) {
 
         init: function() {
             this._super.apply(this, arguments);
-            this.params = {};
-            this.params.image = this.node.attrs.image || 'image_small';
-            this.params.title = this.node.attrs.title || 'Followers';
-            this.params.display_followers = true;
-            this.params.display_control = this.node.attrs.display_control || false;
-            this.params.display_actions = this.node.attrs.display_actions || false;
+            this.image = this.node.attrs.image || 'image_small';
+            this.comment = this.node.attrs.help || false;
+            this.displayed_nb = this.node.attrs.displayed_nb || 10;
             this.ds_model = new session.web.DataSetSearch(this, this.view.model);
             this.ds_follow = new session.web.DataSetSearch(this, this.field.relation);
+            this.ds_users = new session.web.DataSetSearch(this, 'res.users');
+
+            this.value = [];
         },
 
         start: function() {
-            var self = this;
-            // NB: all the widget should be modified to check the actual_mode property on view, not use
-            // any other method to know if the view is in create mode anymore
+            // use actual_mode property on view to know if the view is in create mode anymore
             this.view.on("change:actual_mode", this, this._check_visibility);
             this._check_visibility();
-            this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); });
-            if (! this.params.display_control) {
-                this.$element.find('button.oe_mail_button_followers').hide(); }
-            this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); })
-                .mouseover(function () { $(this).html('Follow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
-                .mouseleave(function () { $(this).html('Not following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
-            this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
-                .mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
-                .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
             this.reinit();
+            this.bind_events();
+            this._super();
+        },
+
+        set_value: function(_value) {
+            this.value = _value;
+            this._super(_value);
         },
 
         _check_visibility: function() {
-            this.$element.toggle(this.view.get("actual_mode") !== "create");
-        },
-
-        destroy: function () {
-            this._super.apply(this, arguments);
+            this.$el.toggle(this.view.get("actual_mode") !== "create");
         },
 
         reinit: function() {
-            this.params.display_followers = true;
-            this.params.display_control = this.node.attrs.display_control || false;
-            this.params.display_actions = this.node.attrs.display_actions || false;
-            this.$element.find('button.oe_mail_button_followers').html('Hide followers')
-            this.$element.find('button.oe_mail_button_follow').hide();
-            this.$element.find('button.oe_mail_button_unfollow').hide();
+            this.message_is_follower == undefined;
+            this.display_buttons();
         },
 
-        set_value: function(value_) {
-            this.reinit();
-            if (! this.view.datarecord.id ||
-                session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) {
-                this.$element.find('div.oe_mail_recthread_aside').hide();
-                return;
-            }
-            return this.fetch_subscribers(value_);
-        },
-
-        fetch_subscribers: function (value_) {
-            return this.ds_follow.call('read', [value_ || this.get_value(), ['name', this.params.image]]).then(this.proxy('display_subscribers'));
-        },
-
-        /**
-         * Display the followers.
-         * TODO: replace the is_subscriber check by fields read */
-        display_subscribers: function (records) {
+        bind_events: function() {
             var self = this;
-            this.is_subscriber = false;
-            var user_list = this.$element.find('ul.oe_mail_followers_display').empty();
-            this.$element.find('div.oe_mail_recthread_followers h4').html(this.params.title + ' (' + records.length + ')');
-            _(records).each(function (record) {
-                if (record.id == self.session.uid) { self.is_subscriber = true; }
-                record.avatar_url = mail.ChatterUtils.get_image(self.session.prefix, self.session.session_id, 'res.users', 'image_small', record.id);
-                $(session.web.qweb.render('mail.followers.partner', {'record': record})).appendTo(user_list);
+            // event: click on '(Un)Follow' button, that toggles the follow for uid
+            this.$('.oe_follower').on('click', function (event) {
+                if($(this).hasClass('oe_notfollow'))
+                    self.do_follow();
+                else
+                    self.do_unfollow();
             });
-            if (this.is_subscriber) {
-                this.$element.find('button.oe_mail_button_follow').hide();
-                this.$element.find('button.oe_mail_button_unfollow').show(); }
+            // event: click on a subtype, that (un)subscribe for this subtype
+            this.$el.on('click', '.oe_subtype_list input', self.do_update_subscription);
+            // event: click on 'invite' button, that opens the invite wizard
+            this.$('.oe_invite').on('click', function (event) {
+                action = {
+                    type: 'ir.actions.act_window',
+                    res_model: 'mail.wizard.invite',
+                    view_mode: 'form',
+                    view_type: 'form',
+                    views: [[false, 'form']],
+                    target: 'new',
+                    context: {
+                        'default_res_model': self.view.dataset.model,
+                        'default_res_id': self.view.datarecord.id,
+                    },
+                }
+                self.do_action(action, {
+                    on_close: function() {
+                        self.read_value();
+                    },
+                });
+            });
+        },
+
+        read_value: function () {
+            var self = this;
+            return this.ds_model.read_ids([this.view.datarecord.id], ['message_follower_ids']).then(function (results) {
+                self.value = results[0].message_follower_ids;
+                self.render_value();
+            });
+        },
+
+        render_value: function () {
+            this.reinit();
+            return this.fetch_followers(this.value);
+        },
+
+        fetch_followers: function (value_) {
+            this.value = value_ || {};
+            return this.ds_follow.call('read', [this.value, ['name', 'user_ids']])
+                .then(this.proxy('display_followers'), this.proxy('fetch_generic'))
+                .then(this.proxy('display_buttons'))
+                .then(this.proxy('fetch_subtypes'));
+        },
+
+        /** Read on res.partner failed: fall back on a generic case
+            - fetch current user partner_id (call because no other smart solution currently) FIXME
+            - then display a generic message about followers */
+        fetch_generic: function (error, event) {
+            var self = this;
+            event.preventDefault();
+            return this.ds_users.call('read', [this.session.uid, ['partner_id']]).then(function (results) {
+                var pid = results['partner_id'][0];
+                self.message_is_follower = (_.indexOf(self.value, pid) != -1);
+            }).then(self.proxy('display_generic'));
+        },
+        _format_followers: function(count){
+            // TDE note: why redefining _t ?
+            function _t(str) { return str; }
+            var str = '';
+            if(count <= 0){
+                str = _t('No followers');
+            }else if(count === 1){
+                str = _t('One follower');
+            }else{
+                str = ''+count+' '+_t('followers');
+            }
+            return str;
+        },
+        /* Display generic info about follower, for people not having access to res_partner */
+        display_generic: function () {
+            var self = this;
+            var node_user_list = this.$('.oe_follower_list').empty();
+            this.$('.oe_follower_title').html(this._format_followers(this.value.length));
+        },
+
+        /** Display the followers */
+        display_followers: function (records) {
+            var self = this;
+            records = records || [];
+            this.message_is_follower = this.set_is_follower(records);
+            // clean and display title
+            var node_user_list = this.$('.oe_follower_list').empty();
+            this.$('.oe_follower_title').html(this._format_followers(records.length));
+            // truncate number of displayed followers
+            truncated = records.splice(0, this.displayed_nb);
+            _(truncated).each(function (record) {
+                record.avatar_url = mail.ChatterUtils.get_image(self.session, 'res.partner', 'image_small', record.id);
+                $(session.web.qweb.render('mail.followers.partner', {'record': record})).appendTo(node_user_list);
+            });
+            // FVA note: be sure it is correctly translated
+            if (truncated.length < records.length) {
+                $('<div class="oe_partner">And ' + (records.length - truncated.length) + ' more.</div>').appendTo(node_user_list);
+            }
+        },
+
+        /** Computes whether the current user is in the followers */
+        set_is_follower: function (records) {
+            var user_ids = _.pluck(_.pluck(records, 'user_ids'), 0);
+            return _.indexOf(user_ids, this.session.uid) != -1;
+        },
+
+        display_buttons: function () {
+            if (this.message_is_follower) {
+                this.$('button.oe_follower').removeClass('oe_notfollow').addClass('oe_following');
+            }
             else {
-                this.$element.find('button.oe_mail_button_follow').show();
-                this.$element.find('button.oe_mail_button_unfollow').hide(); }
+                this.$('button.oe_follower').removeClass('oe_following').addClass('oe_notfollow');
+            }
+
+            if (this.view.is_action_enabled('edit'))
+                this.$('span.oe_mail_invite_wrapper').hide();
+            else
+                this.$('span.oe_mail_invite_wrapper').show();
+        },
+
+        /** Fetch subtypes, only if current user is follower */
+        fetch_subtypes: function () {
+            var subtype_list_ul = this.$('.oe_subtype_list').empty();
+            if (! this.message_is_follower) return;
+            var context = new session.web.CompoundContext(this.build_context(), {});
+            this.ds_model.call('message_get_subscription_data', [[this.view.datarecord.id], context]).then(this.proxy('display_subtypes'));
+        },
+
+        /** Display subtypes: {'name': default, followed} */
+        display_subtypes:function (data) {
+            var self = this;
+            var subtype_list_ul = this.$('.oe_subtype_list');
+            var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data;
+            _(records).each(function (record, record_name) {
+                record.name = record_name;
+                record.followed = record.followed || undefined;
+                $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo( self.$('.oe_subtype_list') );
+            });
         },
 
         do_follow: function () {
-            return this.ds_model.call('message_subscribe', [[this.view.datarecord.id]]).pipe(this.proxy('set_value'));
+            _(this.$('.oe_msg_subtype_check')).each(function (record) {
+                $(record).attr('checked', 'checked');
+            });
+            this.do_update_subscription();
         },
-
+        
         do_unfollow: function () {
-            return this.ds_model.call('message_unsubscribe', [[this.view.datarecord.id]]).pipe(this.proxy('set_value'));
+            _(this.$('.oe_msg_subtype_check')).each(function (record) {
+                $(record).attr('checked',false);
+            });
+            var context = new session.web.CompoundContext(this.build_context(), {});
+            return this.ds_model.call('message_unsubscribe_users', [[this.view.datarecord.id], [this.session.uid], context])
+                .then(this.proxy('read_value'));
         },
 
-        do_toggle_followers: function () {
-            this.params.see_subscribers = ! this.params.see_subscribers;
-            if (this.params.see_subscribers) { this.$element.find('button.oe_mail_button_followers').html('Hide followers'); }
-            else { this.$element.find('button.oe_mail_button_followers').html('Show followers'); }
-            this.$element.find('div.oe_mail_recthread_followers').toggle();
+        do_update_subscription: function (event) {
+            var self = this;
+
+            var checklist = new Array();
+            _(this.$('.oe_actions input[type="checkbox"]')).each(function (record) {
+                if ($(record).is(':checked')) {
+                    checklist.push(parseInt($(record).data('id')));
+                }
+            });
+
+            var context = new session.web.CompoundContext(this.build_context(), {});
+            return this.ds_model.call('message_subscribe_users', [[this.view.datarecord.id], [this.session.uid], this.message_is_follower ? checklist : undefined, context])
+                .then(this.proxy('read_value'));
         },
     });
 };
diff --git a/addons/mail/static/src/js/many2many_tags_email.js b/addons/mail/static/src/js/many2many_tags_email.js
new file mode 100644
index 00000000000..cc701e8a585
--- /dev/null
+++ b/addons/mail/static/src/js/many2many_tags_email.js
@@ -0,0 +1,88 @@
+openerp_FieldMany2ManyTagsEmail = function(instance) {
+var _t = instance.web._t;
+
+/**
+ * Extend of FieldMany2ManyTags widget method.
+ * When the user add a partner and the partner don't have an email, open a popup to purpose to add an email.
+ * The user can choose to add an email or cancel and close the popup.
+ */
+instance.web.form.FieldMany2ManyTagsEmail = instance.web.form.FieldMany2ManyTags.extend({
+
+    start: function() {
+        this.values = [];
+        this.values_checking = [];
+
+        this.on("change:value", this, this.on_change_value_check);
+        this.trigger("change:value");
+
+        this._super.apply(this, arguments);
+    },
+
+    on_change_value_check : function () {
+        this.values = _.uniq(this.values);
+
+        // filter for removed values
+        var values_removed = _.difference(this.values, this.get('value'));
+        if (values_removed.length) {
+            this.values = _.difference(this.values, values_removed);
+            this.set({'value': this.values});
+            return false;
+        }
+
+        // find not checked values that are not currently on checking
+        var not_checked = _.difference(this.get('value'), this.values, this.values_checking);
+        if (not_checked.length) {
+            // remember values on checking for cheked only one time
+            this.values_checking = this.values_checking.concat(not_checked);
+            // check values
+            this._check_email_popup(not_checked);
+        }
+    },
+
+    _check_email_popup: function (ids) {
+        var self = this;
+        new instance.web.Model('res.partner').call("search", [[
+                ["id", "in", ids], 
+                ["email", "=", false], 
+                ["notification_email_send", "in", ['all', 'comment']] ]], 
+                {context: this.build_context()})
+            .then(function (record_ids) {
+                // valid partner
+                var valid_partner = _.difference(ids, record_ids);
+                self.values = self.values.concat(valid_partner);
+                self.values_checking = _.difference(self.values_checking, valid_partner);
+
+                // unvalid partner
+                _.each(record_ids, function (id) {
+                    var pop = new instance.web.form.FormOpenPopup(self);
+                    pop.show_element(
+                        'res.partner',
+                        id,
+                        self.build_context(),
+                        {
+                            title: _t("Please complete partner's informations and Email"),
+                        }
+                    );
+                    pop.on('write_completed', self, function () {
+                        this.values.push(id);
+                        this.values_checking = _.without(this.values_checking, id);
+                        this.set({'value': this.values});
+                    });
+                    pop.on('closed', self, function () {
+                        this.values_checking = _.without(this.values_checking, id);
+                        this.set({'value': this.values});
+                    });
+                });
+            });
+    },
+});
+
+
+/**
+ * Registry of form fields
+ */
+instance.web.form.widgets = instance.web.form.widgets.extend({
+    'many2many_tags_email' : 'instance.web.form.FieldMany2ManyTagsEmail',
+});
+
+};
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index f67c4e8676f..89fbe45dc36 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -1,6 +1,118 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template>
 
+    <!--
+        mail.Widget template used to namespace the css -->
+    <t t-name="mail.Root">
+        <div class="oe_mail">
+        </div>
+    </t>
+
+    <!--
+        mail.compose_message template
+        This template holds the composition form to write a note or send
+        an e-mail. It contains by default a textarea, that will be replaced
+        by another composition form in the main wall composition form, or
+        for main thread composition form in document form view.
+
+        mail.compose_message.compact template
+        This template holds the composition form to write a message, this box is converted into
+        mail.compose_message when focus on textarea
+        -->
+    <t t-name="mail.compose_message">
+        <div t-if="widget.show_composer" t-attf-class="oe_msg oe_msg_composer #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
+            <div class="oe_msg_left">
+                <img class="oe_msg_icon" alt="User img" t-attf-src="#{widget.avatar}"/>
+            </div>
+            <div class="oe_msg_center">
+                <div class="oe_msg_content">
+                    <t t-call="mail.thread.list_recipients"/>
+                    <textarea class="field_text"></textarea>
+                </div>
+                <div class="oe_msg_footer">
+                    <div class="oe_msg_attachment_list"></div>
+                    <button class="oe_post">Post</button>
+                    <t t-call="mail.compose_message.add_attachment"/>
+                    <!--<a class="oe_cancel oe_e">X</a>-->
+                    <button class="oe_full"><span class='oe_e'>&amp;ograve</span></button>
+                </div>
+            </div>
+        </div>
+        <div t-if="widget.show_compact_message and !widget.show_composer" t-attf-class="oe_msg oe_msg_composer_compact #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
+            <textarea t-if="!widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write to the followers of this docmuent..."/>
+            <textarea t-if="widget.options.view_mailbox" class="field_text oe_compact" placeholder="Write to my followers..."/>
+        </div>
+        <span t-if="!(widget.show_compact_message and !widget.show_composer) and !widget.show_composer" class="oe_placeholder_compose"></span>
+    </t>
+
+    <!--
+        mail.compose_message.add_attachment template
+        Small template to be inserted in the composition for add attachments
+        -->
+    <t t-name="mail.compose_message.add_attachment">
+        <span class="oe_attachment_file">
+            <span class="oe_add">
+                <!-- uploader of file -->
+                <button class="oe_attach"><span class="oe_e">'</span></button> 
+                <span class='oe_attach_label'>File</span>
+                <t t-call="HiddenInputFile">
+                    <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
+                    <t t-set="fileupload_action">/web/binary/upload_attachment</t>
+                    <input type="hidden" name="model" value="mail.compose.message"/>
+                    <input type="hidden" name="id" value="0"/>
+                    <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
+                </t>
+            </span>
+        </span>
+    </t>
+
+    <!--
+        mail.thread.message.attachments template
+        Template used to display attachments in a mail.message
+        -->
+    <t t-name="mail.thread.message.attachments">
+        <t t-foreach='widget.attachment_ids' t-as='attachment'>
+            <t t-if="attachment.filetype !== 'webimage'">
+                <div t-attf-class="oe_attachment #{attachment.upload ? 'oe_uploading' : ''}">
+                    <a t-att-href='attachment.url'><img t-att-src="'/mail/static/src/img/mimetypes/' + attachment.filetype + '.png'"></img></a>
+                    <div class='oe_delete oe_e' title="Delete this attachment" t-attf-data-id="{attachment.id}">[</div>
+                    <div class='oe_name'><t t-raw='attachment.name' /></div>
+                    <div class='oe_progress_bar'>
+                        uploading
+                    </div>
+                </div>
+            </t>
+            <t t-if="attachment.filetype === 'webimage'">
+                <div t-attf-class="oe_attachment oe_preview #{attachment.upload ? 'oe_uploading' : ''}">
+                    <a t-att-href='attachment.url'><img t-att-src="widget.attachments_resize_image(attachment.id, [100,100])"></img></a>
+                    <div class='oe_delete oe_e'>[</div>
+                    <div class='oe_name'><t t-raw='attachment.name' /></div>
+                    <div class='oe_progress_bar'>
+                        uploading
+                    </div>
+                </div>
+            </t>
+        </t>
+    </t>
+
+    <!--
+        template to the recipients list
+        -->
+    <t t-name="mail.thread.list_recipients">
+        <div class="oe_mail_list_recipients">
+            To:
+            <span t-if="!widget.is_private" class="oe_all_follower">Followers <t t-raw="' of ' + (widget.parent_thread.parent_message.record_name ? '&quot;' + widget.parent_thread.parent_message.record_name + '&quot;' : 'this document')"/></span>
+            <t t-if="!widget.is_private and widget.partner_ids.length"> and </t>
+            <t t-set="inc" t-value="0"/>
+            <t t-if="widget.partner_ids.length" t-foreach="widget.partner_ids" t-as="partner"><span t-attf-class="oe_partner_follower #{inc>=3?'oe_hidden':''}"><t t-if="inc" t-raw="', '"/><a t-attf-href="#model=res.partner&amp;id=#{partner[0]}"><t t-raw="partner[1]"/></a></span><t t-set="inc" t-value="inc+1"/>
+            </t>
+            <t t-if="widget.partner_ids.length>=3">
+                <span class="oe_more">, <a><t t-raw="widget.partner_ids.length-3"/> others...</a></span>
+                <a class="oe_more_hidden">&lt;&lt;&lt;</a>
+            </t>
+        </div>
+    </t>
+
     <!-- 
         wall main template
         Template used to display the communication history in the wall.
@@ -17,38 +129,33 @@
                 <td colspan="2">
                     <h2 class="oe_view_title">
                         <span class="oe_view_title_text">
-                            <t t-if="! widget.params.res_model">News Feeds</t>
-                            <t t-if="widget.params.res_model" t-esc="widget.params.res_model"/>
+                            Email box
                         </span>
                     </h2>
                 </td>
                 <td><div class="oe_view_manager_view_search" t-opentag="true"/></td>
             </tr>
+            <tr class="oe_header_row" t-if="widget.action.params.view_inbox" >
+                <td colspan="2">
+                    <button type="button" class="oe_write_full oe_highlight">
+                        Compose a new message
+                    </button>
+                    <span class='oe_alternative'>
+                        or
+                        <a href='#'  class='oe_write_onwall oe_bold' help='Your followers can read this message'>Write to my followers</a>
+                    </span>
+                </td>
+            </tr>
           </tbody>
         </table>
-        <div class="oe_mail_wall_main">
-            <div class="oe_mail_wall_action">
-                <!-- call the composition form -->
-                <t t-call ="mail.compose_message"/>
-            </div>
-            <div class="oe_clear"/>
-            <ul class="oe_mail_wall_threads">
-                <!-- contains threads -->
-            </ul>
-            <div class="oe_mail_wall_more">
-                <button class="oe_mail_wall_button_more" type="button">See more...</button>
-            </div>
-        </div>
-        <div class="oe_mail_wall_aside">
-                <!-- contains currently nothing -->
-        </div>
+        <div class="oe_mail-placeholder"></div>
     </div>
 
     <!--
-        wall_thread_container template for the wall
-        Each discussion thread is contained inside this template
+        display message on the wall when there are no message
         -->
-    <t t-name="mail.wall_thread_container">
+    <t t-name="mail.wall_no_message">
+        <div class="oe_view_nocontent">No messages.</div>
     </t>
 
     <!--
@@ -56,121 +163,103 @@
         Template used to display the communication history in documents
         form view.
         -->
-    <div t-name="mail.record_thread" class="oe_mail_recthread">
-        <!-- <h4>History and Comments</h4> -->
-        <div class="oe_mail_recthread_main">
-            <!-- contains the document thread -->
-        </div>
-        <div class="oe_mail_recthread_aside">
-            <div class="oe_mail_recthread_actions">
-                <button type="button" class="oe_mail_button_follow">Follow</button>
-                <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
-                <button type="button" class="oe_mail_button_followers">Show followers</button>
-            </div>
-            <div class="oe_mail_recthread_followers">
-                <h4>Followers</h4>
-                <ul class="oe_mail_followers_display"></ul>
-            </div>
+    <div t-name="mail.record_thread" class="oe_record_thread">
+        <div class="oe_mail-placeholder">
         </div>
     </div>
 
-    <!--
-        mail.compose_message template
-        This template holds the composition form to write a note or send
-        an e-mail. It contains by default a textarea, that will be replaced
-        by another composition form in the main wall composition form, or
-        for main thread composition form in document form view.
-        -->
-    <t t-name="mail.compose_message">
-        <div>
-            <img class="oe_mail_icon oe_mail_frame oe_left" alt="User img"/>
-            <div class="oe_mail_msg_content">
-                <!-- contains the composition form -->
-                <!-- default content: old basic textarea -->
-                <textarea class="oe_mail_compose_textarea" placeholder="Add your comment here..." onfocus="this.value = '';"/>
+    <t t-name="mail.thread">
+        <div t-attf-class="oe_thread #{widget.root?'oe_root_thread':''}"/>
+    </t>
+
+    <!-- default layout -->
+    <t t-name="mail.thread.message">
+        <div t-attf-class="oe_msg #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''} oe_msg_#{widget.type}">
+
+            <div class='oe_msg_left'>
+                <a t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}" t-att-title="widget.author_id[1]">
+                    <img class="oe_msg_icon" t-att-src="widget.avatar"/>
+                </a>
+            </div>
+
+            <div class="oe_msg_center">
+                <div class='oe_msg_icons'>
+                    <span class='oe_read' t-if="widget.options.show_read"><a title="Done" class="oe_e">X</a></span>
+                    <span class='oe_unread' t-if="widget.is_favorite and widget.options.show_unread"><a title="Set back to Todo" class="oe_e">v</a></span>
+                    <span class='oe_unread' t-if="!widget.is_favorite and widget.options.show_unread"><a title="Set back to Inbox" class="oe_e">v</a></span>
+                    <span class='oe_reply' t-if="widget.options.show_reply_button"><a title="Reply" class="oe_e">(</a></span>
+                    <span t-attf-class="oe_star #{widget.is_favorite?'oe_starred':''}"><a title="Mark as Todo" class="oe_e">7</a></span>
+                </div>
+                <!-- message itself -->
+                <div class="oe_msg_content">
+                    <h1 t-if="widget.subject and !widget.thread_level" class="oe_msg_title">
+                        <t t-raw="widget.subject"/>
+                    </h1>
+                    <div class="oe_msg_body">
+                        <t t-if="widget.show_record_name">
+                            <a class="oe_mail_action_model" t-attf-href="#model=#{widget.model}&amp;id=#{widget.res_id}"><t t-raw="widget.record_name"/></a>
+                        </t>
+                        <t t-raw="widget.body"/>
+                    </div>
+                </div>
+                <div class="oe_msg_footer">
+                    <t t-if="widget.attachment_ids.length > 0">
+                        <div class="oe_msg_attachment_list"></div>
+                    </t>
+                    <a t-if="widget.author_id" t-attf-href="#model=res.partner&amp;id=#{widget.author_id[0]}"><t t-raw="widget.author_id[1]"/></a> 
+                    <span class='oe_subtle'>•</span>
+                    <span t-att-title="widget.date"><t t-raw="widget.timerelative"/></span>
+                    <t t-if='widget.attachment_ids.length > 0'>
+                        <span class='oe_subtle'>•</span>
+                        <a class="oe_view_attachments">
+                            <t t-if="widget.attachment_ids.length == 1">1 Attachment</t>
+                            <t t-if="widget.attachment_ids.length > 1"><t t-raw="widget.attachment_ids.length"/> Attachments</t>
+                        </a>
+                    </t>
+                    <span class='oe_subtle'>•</span>
+                    <t t-call="mail.thread.message.vote"/>
+                </div>
+            </div>
+        </div>
+    </t>
+
+    <!-- expandable message layout -->
+    <t t-name="mail.thread.expandable">
+        <div t-attf-class="oe_msg oe_msg_#{widget.type} #{widget.max_limit ? 'oe_max_limit' : ''} #{widget.thread_level and widget.options.display_indented_thread > -1 ? 'oe_msg_indented' : ''}">
+            <div class="oe_msg_content oe_msg_more_message">
+                <div class='oe_separator'></div>
+                <a t-if="widget.nb_messages &lt;= 0" class="oe_msg_fetch_more">show more message</a>
+                <a t-if="widget.nb_messages === 1" class="oe_msg_fetch_more">show one more message</a>
+                <a t-if="widget.nb_messages &gt; 1" class="oe_msg_fetch_more">show <t t-raw="widget.nb_messages" /> more messages</a>
             </div>
-            <div class="oe_clear"/>
         </div>
     </t>
 
     <!--
-        thread template
-        This template holds a thread of comments. It begins with an actions
-        container, holding the composition form. Then come the various
-        messages. Then comes the 'more' button.
+        mail.compose_message.button_top_bar
+        render of the button on the user bar for open wizard compose message
         -->
-    <ul t-name="mail.thread" class="oe_mail oe_mail_thread">
-        <div class="oe_mail_thread_action">
-            <!-- contains the composition box (form + image) -->
-            <t t-call="mail.compose_message"/>
+    <t t-name="mail.ComposeMessageTopButton">
+        <div title='Compose new Message' class="oe_topbar_item oe_topbar_compose_full_email">
+            <button class="oe_e">%</button>
         </div>
-        <div class="oe_mail_thread_display">
-            <!-- contains the threads -->
-        </div>
-        <div class="oe_mail_thread_more">
-            <button class="oe_mail_button_more" type="button">Load more messages</button>
-        </div>
-    </ul>
+    </t>
 
-    <!-- default layout -->
-    <li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
-        <div t-attf-class="oe_mail_msg_#{record.type}">
-            <img class="oe_mail_icon oe_mail_frame oe_left" t-att-src="record.mini_url"/>
-            <div class="oe_mail_msg_content">
-                <!-- dropdown menu with message options and actions -->
-                <span class="oe_dropdown_toggle oe_dropdown_arrow">
-                    <ul class="oe_dropdown_menu">
-                        <t t-if="display['show_delete']">
-                                <li t-if="record.is_author"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
-                        </t>
-                        <li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Hide</a></li>
-<!--                    Uncomment when adding subtype hiding
-                        <li t-if="display['show_hide']">
-                            <a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
-                        </li> -->
-                        <li><a href="#" t-attf-data-msg_id="{record.id}" t-attf-data-type="{record.type}" t-attf-data-formatting="{record.content_subtype}" class="oe_mail_msg_reply_by_email">Reply by email</a></li>
-                        <li t-if="record.type == 'email'"><a t-attf-href="#model=mail.message&amp;id=#{record.id}" class="oe_mail_msg_details">Details</a></li>
-                    </ul>
-                </span>
-                <!-- message itself -->
-                <div class="oe_mail_msg">
-                    <h1 t-if="record.subject" class="oe_mail_msg_title">
-                        <t t-raw="record.subject"/>
-                    </h1>
-                    <div class="oe_mail_msg_body">
-                        
-                        <div class="oe_mail_msg_record_body">
-                            <a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}" t-if="(params.thread_level > 0) &amp; (!record.subject)"><t t-raw="record.record_name"/></a>
-                            <t t-raw="record.body"/>
-                        </div>
-                    </div>
-                    <div class="oe_clear"/>
-                    <ul class="oe_mail_msg_footer">
-                      <li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a></li>
-                      <li><a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a></li>
-                      <li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
-                      <li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
-                      <!-- uncomment when merging vote
-                      <li><a href="#">Like</a></li>
-                      -->
-                      <li t-if="record.attachment_ids.length > 0">
-                          <a href="#" class="oe_mail_msg_view_attachments">
-                              <t t-if="record.attachment_ids.length == 1">1 Attachment</t>
-                              <t t-if="record.attachment_ids.length > 1"><t t-raw="record.attachment_ids.length"/> Attachments</t>
-                          </a>
-                      </li>
-                    </ul>
-                    <t t-if="record.attachment_ids.length > 0">
-                        <div class="oe_clear"></div>
-                        <ul class="oe_mail_msg_attachments">
-                            <t t-foreach="record.attachments" t-as="attachment">
-                                <li> <a t-att-href="attachment.url"><t t-raw="attachment.name"/></a> </li>
-                            </t>
-                        </ul>
-                    </t>
-                </div>
-            </div>
-        </div>
-    </li>
+    <!-- mail.thread.message.vote
+        Template used to display Like/Unlike in a mail.message
+    -->
+    <span t-name="mail.thread.message.vote">
+        <span class="oe_mail_vote_count" t-if='widget.vote_nb > 0'>
+            <t t-raw='widget.vote_nb' />
+            <span class='oe_e'>8</span>
+        </span>
+        <a href='#' class="oe_msg_vote">
+            <t t-if="!widget.has_voted">like</t>
+            <t t-if="widget.has_voted">unlike</t>
+        </a>
+    </span>
 
+    <!-- mail.thread.message.star
+        Template used to display stared/unstared message in a mail.message
+    -->
 </template>
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index 53c899b9569..3dec4ef1dd2 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -3,29 +3,47 @@
 
     <!--
         followers main template
-        Template used to display the followers and the actions in a record.
+        Template used to display the followers, the actions and the subtypes in a record.
         -->
-    <div t-name="mail.followers" class="oe_mail_recthread_aside">
-        <div class="oe_mail_recthread_actions">
-            <button type="button" class="oe_mail_button_follow oe_mail_button_mouseout">Not following</button>
-            <button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
-            <button type="button" class="oe_mail_button_followers">Show followers</button>
+    <div t-name="mail.followers" class="oe_followers">
+        <div class="oe_actions">
+            <button type="button" class="oe_follower oe_notfollow">
+                <span class="oe_follow">Follow</span>
+                <span class="oe_unfollow">Unfollow</span>
+                <span class="oe_following">Following</span>
+            </button>
+            <div class="oe_subtype_list"></div>
         </div>
-        <div class="oe_mail_recthread_followers">
-            <t t-if="widget.params.title">
-                <h4><t t-raw="widget.params.title"/></h4>
-            </t>
-            <ul class="oe_mail_followers_display"></ul>
+        <t t-if="widget.comment">
+            <h5 class="oe_comment"><t t-raw="widget.comment"/></h5>
+        </t>
+        <div class='oe_follower_title_box'>
+            <h4 class='oe_follower_title'>Followers</h4>
+            <a href='#' class="oe_invite">Invite others</a>
         </div>
+        <div class="oe_follower_list"></div>
     </div>
 
     <!--
         followers.partner template
         Template used to display a partner following the record
         -->
-    <li t-name="mail.followers.partner">
+    <div t-name="mail.followers.partner" class='oe_partner'>
         <img class="oe_mail_thumbnail oe_mail_frame" t-attf-src="{record.avatar_url}"/>
-        <a t-attf-href="#model=res.users&amp;id=#{record.id}"><t t-raw="record.name"/></a>
-    </li>
+        <a t-attf-href="#model=res.partner&amp;id=#{record.id}"><t t-raw="record.name"/></a>
+    </div>
+    
+    <!--
+        followers.subtype template
+        Template used to display message subtypes of a follower subscription
+    -->
+    <t t-name="mail.followers.subtype">
+        <table class='oe_subtype'>
+            <tr>
+                <td width="10%"><input type="checkbox" t-att-checked="record.followed" t-att-id="'input_mail_followers_subtype_'+record.id" t-att-data-id="record.id" t-att-name="record.name"  class="oe_msg_subtype_check"/></td>
+                <td><label t-att-for="'input_mail_followers_subtype_'+record.id"><t t-raw="record.name"/></label></td>
+            </tr>
+        </table>
+    </t>
 
 </template>
diff --git a/addons/mail/tests/__init__.py b/addons/mail/tests/__init__.py
index d63c5634cc3..3dcddf769e8 100644
--- a/addons/mail/tests/__init__.py
+++ b/addons/mail/tests/__init__.py
@@ -18,10 +18,12 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from . import test_mail
+
+from . import test_mail, test_mail_access_rights
 
 checks = [
     test_mail,
+    test_mail_access_rights,
 ]
 
-# 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/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 0940d72c490..99ccd41e1f7 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -19,7 +19,10 @@
 #
 ##############################################################################
 
-from openerp.tests import common
+import tools
+
+from openerp.addons.mail.tests import test_mail_mockup
+from openerp.tools.mail import html_sanitize
 
 MAIL_TEMPLATE = """Return-Path: <whatever-2a840@postmaster.twitter.com>
 To: {to}
@@ -28,7 +31,7 @@ Received: by mail1.openerp.com (Postfix, from userid 10002)
 From: Sylvie Lelitre <sylvie.lelitre@agrolait.com>
 Subject: {subject}
 MIME-Version: 1.0
-Content-Type: multipart/alternative; 
+Content-Type: multipart/alternative;
     boundary="----=_Part_4200734_24778174.1344608186754"
 Date: Fri, 10 Aug 2012 14:16:26 +0000
 Message-ID: <1198923581.41972151344608186760.JavaMail@agrolait.com>
@@ -51,9 +54,9 @@ Content-Transfer-Encoding: quoted-printable
   <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-8" />
  </head>=20
  <body style=3D"margin: 0; padding: 0; background: #ffffff;-webkit-text-size-adjust: 100%;">=20
-  
+
   <p>Please call me as soon as possible this afternoon!</p>
-  
+
   <p>--<br/>
      Sylvie
   <p>
@@ -62,51 +65,759 @@ Content-Transfer-Encoding: quoted-printable
 ------=_Part_4200734_24778174.1344608186754--
 """
 
+MAIL_TEMPLATE_PLAINTEXT = """Return-Path: <whatever-2a840@postmaster.twitter.com>
+To: {to}
+Received: by mail1.openerp.com (Postfix, from userid 10002)
+    id 5DF9ABFB2A; Fri, 10 Aug 2012 16:16:39 +0200 (CEST)
+From: Sylvie Lelitre <sylvie.lelitre@agrolait.com>
+Subject: {subject}
+MIME-Version: 1.0
+Content-Type: text/plain
+Date: Fri, 10 Aug 2012 14:16:26 +0000
+Message-ID: {msg_id}
+{extra}
 
-class test_mail(common.TransactionCase):
+Please call me as soon as possible this afternoon!
+
+--
+Sylvie
+"""
+
+
+class test_mail(test_mail_mockup.TestMailMockups):
+
+    def _mock_send_get_mail_body(self, *args, **kwargs):
+        # def _send_get_mail_body(self, cr, uid, mail, partner=None, context=None)
+        body = tools.append_content_to_html(args[2].body_html, kwargs.get('partner').name if kwargs.get('partner') else 'No specific partner', plaintext=False)
+        return body
 
     def setUp(self):
         super(test_mail, self).setUp()
+        cr, uid = self.cr, self.uid
         self.ir_model = self.registry('ir.model')
         self.mail_alias = self.registry('mail.alias')
         self.mail_thread = self.registry('mail.thread')
         self.mail_group = self.registry('mail.group')
+        self.mail_mail = self.registry('mail.mail')
+        self.mail_message = self.registry('mail.message')
+        self.mail_notification = self.registry('mail.notification')
+        self.mail_followers = self.registry('mail.followers')
+        self.mail_message_subtype = self.registry('mail.message.subtype')
         self.res_users = self.registry('res.users')
+        self.res_partner = self.registry('res.partner')
+
+        # Find Employee group
+        group_employee_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
+        group_employee_id = group_employee_ref and group_employee_ref[1] or False
+        # Test users
+        self.user_raoul_id = self.res_users.create(cr, uid,
+            {'name': 'Raoul Grosbedon', 'email': 'raoul@raoul.fr', 'login': 'raoul', 'groups_id': [(6, 0, [group_employee_id])]})
+        self.user_raoul = self.res_users.browse(cr, uid, self.user_raoul_id)
+        self.user_admin = self.res_users.browse(cr, uid, uid)
+
+        # Mock send_get_mail_body to test its functionality without other addons override
+        self._send_get_mail_body = self.registry('mail.mail').send_get_mail_body
+        self.registry('mail.mail').send_get_mail_body = self._mock_send_get_mail_body
 
         # groups@.. will cause the creation of new mail groups
-        self.mail_group_model_id = self.ir_model.search(self.cr, self.uid, [('model','=', 'mail.group')])[0]
-        self.mail_alias.create(self.cr, self.uid, {'alias_name': 'groups',
+        self.mail_group_model_id = self.ir_model.search(cr, uid, [('model', '=', 'mail.group')])[0]
+        self.mail_alias.create(cr, uid, {'alias_name': 'groups',
                                                    'alias_model_id': self.mail_group_model_id})
-        
-        # tech@... will append new messages to the 'tech' group 
-        self.group_tech_id = self.mail_group.create(self.cr, self.uid, {'name': 'tech'})
+        # create a 'pigs' group that will be used through the various tests
+        self.group_pigs_id = self.mail_group.create(cr, uid,
+            {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
+        self.group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
 
-    def test_message_process(self):
+    def tearDown(self):
+        # Remove mocks
+        self.registry('mail.mail').send_get_mail_body = self._send_get_mail_body
+        super(test_mail, self).tearDown()
+
+    def test_00_message_process(self):
+        """ Testing incoming emails processing. """
+        cr, uid, user_raoul = self.cr, self.uid, self.user_raoul
         # Incoming mail creates a new mail_group "frogs"
-        self.assertEqual(self.mail_group.search(self.cr, self.uid, [('name','=','frogs')]), [])
+        self.assertEqual(self.mail_group.search(cr, uid, [('name', '=', 'frogs')]), [])
         mail_frogs = MAIL_TEMPLATE.format(to='groups@example.com, other@gmail.com', subject='frogs', extra='')
-        self.mail_thread.message_process(self.cr, self.uid, None, mail_frogs)
-        frog_groups = self.mail_group.search(self.cr, self.uid, [('name','=','frogs')])
+        self.mail_thread.message_process(cr, uid, None, mail_frogs)
+        frog_groups = self.mail_group.search(cr, uid, [('name', '=', 'frogs')])
         self.assertTrue(len(frog_groups) == 1)
 
         # Previously-created group can be emailed now - it should have an implicit alias group+frogs@...
-        frog_group = self.mail_group.browse(self.cr, self.uid, frog_groups[0])
+        frog_group = self.mail_group.browse(cr, uid, frog_groups[0])
         group_messages = frog_group.message_ids
         self.assertTrue(len(group_messages) == 1, 'New group should only have the original message')
         mail_frog_news = MAIL_TEMPLATE.format(to='Friendly Frogs <group+frogs@example.com>', subject='news', extra='')
-        self.mail_thread.message_process(self.cr, self.uid, None, mail_frog_news)
+        self.mail_thread.message_process(cr, uid, None, mail_frog_news)
         frog_group.refresh()
         self.assertTrue(len(frog_group.message_ids) == 2, 'Group should contain 2 messages now')
 
         # Even with a wrong destination, a reply should end up in the correct thread
         mail_reply = MAIL_TEMPLATE.format(to='erroneous@example.com>', subject='Re: news',
-                                          extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n'%frog_group.id)
-        self.mail_thread.message_process(self.cr, self.uid, None, mail_reply)
+                                          extra='In-Reply-To: <12321321-openerp-%d-mail.group@example.com>\n' % frog_group.id)
+        self.mail_thread.message_process(cr, uid, None, mail_reply)
         frog_group.refresh()
         self.assertTrue(len(frog_group.message_ids) == 3, 'Group should contain 3 messages now')
-        
+
         # No model passed and no matching alias must raise
         mail_spam = MAIL_TEMPLATE.format(to='noone@example.com', subject='spam', extra='')
         self.assertRaises(Exception,
                           self.mail_thread.message_process,
-                          self.cr, self.uid, None, mail_spam)
+                          cr, uid, None, mail_spam)
+
+        # plain text content should be wrapped and stored as html
+        test_msg_id = '<deadcafe.1337@smtp.agrolait.com>'
+        mail_text = MAIL_TEMPLATE_PLAINTEXT.format(to='groups@example.com', subject='frogs', extra='', msg_id=test_msg_id)
+        self.mail_thread.message_process(cr, uid, None, mail_text)
+        new_mail = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [('message_id', '=', test_msg_id)])[0])
+        self.assertEqual(new_mail.body, '\n<pre>\nPlease call me as soon as possible this afternoon!\n\n--\nSylvie\n</pre>\n',
+                         'plaintext mail incorrectly parsed')
+
+        # Do: post a new message, with a known partner
+        test_msg_id = '<deadcafe.1337-2@smtp.agrolait.com>'
+        TEMPLATE_MOD = MAIL_TEMPLATE_PLAINTEXT.replace('Sylvie Lelitre <sylvie.lelitre@agrolait.com>', user_raoul.email)
+        mail_new = TEMPLATE_MOD.format(to='Friendly Frogs <group+frogs@example.com>', subject='extra news', extra='', msg_id=test_msg_id)
+        self.mail_thread.message_process(cr, uid, None, mail_new)
+        new_mail = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [('message_id', '=', test_msg_id)])[0])
+        # Test: author_id set, not email_from
+        self.assertEqual(new_mail.author_id, user_raoul.partner_id, 'message process wrong author found')
+        self.assertFalse(new_mail.email_from, 'message process should not set the email_from when an author is found')
+
+        # Do: post a new message, with a unknown partner
+        test_msg_id = '<deadcafe.1337-3@smtp.agrolait.com>'
+        TEMPLATE_MOD = MAIL_TEMPLATE_PLAINTEXT.replace('Sylvie Lelitre <sylvie.lelitre@agrolait.com>', '_abcd_')
+        mail_new = TEMPLATE_MOD.format(to='Friendly Frogs <group+frogs@example.com>', subject='super news', extra='', msg_id=test_msg_id)
+        self.mail_thread.message_process(cr, uid, None, mail_new)
+        new_mail = self.mail_message.browse(cr, uid, self.mail_message.search(cr, uid, [('message_id', '=', test_msg_id)])[0])
+        # Test: author_id set, not email_from
+        self.assertFalse(new_mail.author_id, 'message process shnould not have found a partner for _abcd_ email address')
+        self.assertIn('_abcd_', new_mail.email_from, 'message process should set en email_from when not finding a partner_id')
+
+    def test_10_followers_function_field(self):
+        """ Tests designed for the many2many function field 'follower_ids'.
+            We will test to perform writes using the many2many commands 0, 3, 4,
+            5 and 6. """
+        cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+
+        # Data: create partner Bert Poilu
+        partner_bert_id = self.res_partner.create(cr, uid, {'name': 'Bert Poilu'})
+        # Data: create 'disturbing' values in mail.followers: same res_id, other res_model; same res_model, other res_id
+        group_dummy_id = self.mail_group.create(cr, uid,
+            {'name': 'Dummy group'})
+        self.mail_followers.create(cr, uid,
+            {'res_model': 'mail.thread', 'res_id': self.group_pigs_id, 'partner_id': partner_bert_id})
+        self.mail_followers.create(cr, uid,
+            {'res_model': 'mail.group', 'res_id': group_dummy_id, 'partner_id': partner_bert_id})
+
+        # Pigs just created: should be only Admin as follower
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([user_admin.partner_id.id]), 'Admin should be the only Pigs fan')
+
+        # Subscribe Bert through a '4' command
+        group_pigs.write({'message_follower_ids': [(4, partner_bert_id)]})
+        group_pigs.refresh()
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([partner_bert_id, user_admin.partner_id.id]), 'Bert and Admin should be the only Pigs fans')
+
+        # Unsubscribe Bert through a '3' command
+        group_pigs.write({'message_follower_ids': [(3, partner_bert_id)]})
+        group_pigs.refresh()
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([user_admin.partner_id.id]), 'Admin should be the only Pigs fan')
+
+        # Set followers through a '6' command
+        group_pigs.write({'message_follower_ids': [(6, 0, [partner_bert_id])]})
+        group_pigs.refresh()
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([partner_bert_id]), 'Bert should be the only Pigs fan')
+
+        # Add a follower created on the fly through a '0' command
+        group_pigs.write({'message_follower_ids': [(0, 0, {'name': 'Patrick Fiori'})]})
+        partner_patrick_id = self.res_partner.search(cr, uid, [('name', '=', 'Patrick Fiori')])[0]
+        group_pigs.refresh()
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertEqual(follower_ids, set([partner_bert_id, partner_patrick_id]), 'Bert and Patrick should be the only Pigs fans')
+
+        # Finally, unlink through a '5' command
+        group_pigs.write({'message_follower_ids': [(5, 0)]})
+        group_pigs.refresh()
+        follower_ids = set([follower.id for follower in group_pigs.message_follower_ids])
+        self.assertFalse(follower_ids, 'Pigs group should not have fans anymore')
+
+        # Test dummy data has not been altered
+        fol_obj_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.thread'), ('res_id', '=', self.group_pigs_id)])
+        follower_ids = set([follower.partner_id.id for follower in self.mail_followers.browse(cr, uid, fol_obj_ids)])
+        self.assertEqual(follower_ids, set([partner_bert_id]), 'Bert should be the follower of dummy mail.thread data')
+        fol_obj_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', group_dummy_id)])
+        follower_ids = set([follower.partner_id.id for follower in self.mail_followers.browse(cr, uid, fol_obj_ids)])
+        self.assertEqual(follower_ids, set([partner_bert_id, user_admin.partner_id.id]), 'Bert and Admin should be the followers of dummy mail.group data')
+
+    def test_11_message_followers_and_subtypes(self):
+        """ Tests designed for the subscriber API as well as message subtypes """
+        cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+        # Data: user Raoul
+        user_raoul_id = self.user_raoul_id
+        user_raoul = self.res_users.browse(cr, uid, user_raoul_id)
+        # Data: message subtypes
+        self.mail_message_subtype.create(cr, uid, {'name': 'mt_mg_def', 'default': True, 'res_model': 'mail.group'})
+        self.mail_message_subtype.create(cr, uid, {'name': 'mt_other_def', 'default': True, 'res_model': 'crm.lead'})
+        self.mail_message_subtype.create(cr, uid, {'name': 'mt_all_def', 'default': True, 'res_model': False})
+        mt_mg_nodef = self.mail_message_subtype.create(cr, uid, {'name': 'mt_mg_nodef', 'default': False, 'res_model': 'mail.group'})
+        mt_all_nodef = self.mail_message_subtype.create(cr, uid, {'name': 'mt_all_nodef', 'default': False, 'res_model': False})
+        default_group_subtypes = self.mail_message_subtype.search(cr, uid, [('default', '=', True), '|', ('res_model', '=', 'mail.group'), ('res_model', '=', False)])
+
+        # ----------------------------------------
+        # CASE1: test subscriptions with subtypes
+        # ----------------------------------------
+
+        # Do: Subscribe Raoul three times (niak niak) through message_subscribe_users
+        group_pigs.message_subscribe_users([user_raoul_id, user_raoul_id])
+        group_pigs.message_subscribe_users([user_raoul_id])
+        group_pigs.refresh()
+        # Test: 2 followers (Admin and Raoul)
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertEqual(set(follower_ids), set([user_raoul.partner_id.id, user_admin.partner_id.id]), 'Admin and Raoul should be the only 2 Pigs fans')
+        # Test: Raoul follows default subtypes
+        fol_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id), ('partner_id', '=', user_raoul.partner_id.id)])
+        fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0]
+        fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids])
+        self.assertEqual(set(fol_subtype_ids), set(default_group_subtypes), 'subscription subtypes are incorrect')
+
+        # Do: Unsubscribe Raoul twice through message_unsubscribe_users
+        group_pigs.message_unsubscribe_users([user_raoul_id, user_raoul_id])
+        group_pigs.refresh()
+        # Test: 1 follower (Admin)
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertEqual(follower_ids, [user_admin.partner_id.id], 'Admin must be the only Pigs fan')
+
+        # Do: subscribe Admin with subtype_ids
+        group_pigs.message_subscribe_users([uid], [mt_mg_nodef, mt_all_nodef])
+        fol_ids = self.mail_followers.search(cr, uid, [('res_model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id), ('partner_id', '=', user_admin.partner_id.id)])
+        fol_obj = self.mail_followers.browse(cr, uid, fol_ids)[0]
+        fol_subtype_ids = set([subtype.id for subtype in fol_obj.subtype_ids])
+        self.assertEqual(set(fol_subtype_ids), set([mt_mg_nodef, mt_all_nodef]), 'subscription subtypes are incorrect')
+
+        # ----------------------------------------
+        # CASE2: test mail_thread fields
+        # ----------------------------------------
+
+        subtype_data = group_pigs._get_subscription_data(None, None)[group_pigs.id]['message_subtype_data']
+        self.assertEqual(set(subtype_data.keys()), set(['Discussions', 'mt_mg_def', 'mt_all_def', 'mt_mg_nodef', 'mt_all_nodef']), 'mail.group available subtypes incorrect')
+        self.assertFalse(subtype_data['Discussions']['followed'], 'Admin should not follow Discussions in pigs')
+        self.assertTrue(subtype_data['mt_mg_nodef']['followed'], 'Admin should follow mt_mg_nodef in pigs')
+        self.assertTrue(subtype_data['mt_all_nodef']['followed'], 'Admin should follow mt_all_nodef in pigs')
+
+    def test_20_message_quote_context(self):
+        """ Tests designed for message_post. """
+        cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+
+        msg1_id = self.mail_message.create(cr, uid, {'body': 'Thread header about Zap Brannigan', 'subject': 'My subject'})
+        msg2_id = self.mail_message.create(cr, uid, {'body': 'First answer, should not be displayed', 'subject': 'Re: My subject', 'parent_id': msg1_id})
+        msg3_id = self.mail_message.create(cr, uid, {'body': 'Second answer', 'subject': 'Re: My subject', 'parent_id': msg1_id})
+        msg4_id = self.mail_message.create(cr, uid, {'body': 'Third answer', 'subject': 'Re: My subject', 'parent_id': msg1_id})
+        msg_new_id = self.mail_message.create(cr, uid, {'body': 'My answer I am propagating', 'subject': 'Re: My subject', 'parent_id': msg1_id})
+
+        result = self.mail_message.message_quote_context(cr, uid, msg_new_id, limit=3)
+        self.assertIn('Thread header about Zap Brannigan', result, 'Thread header content should be in quote.')
+        self.assertIn('Second answer', result, 'Answer should be in quote.')
+        self.assertIn('Third answer', result, 'Answer should be in quote.')
+        self.assertIn('expandable', result, 'Expandable should be present.')
+        self.assertNotIn('First answer, should not be displayed', result, 'Old answer should not be in quote.')
+        self.assertNotIn('My answer I am propagating', result, 'Thread header content should be in quote.')
+
+    def test_21_message_post(self):
+        """ Tests designed for message_post. """
+        cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+        self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a'})
+        # 1 - Bert Tartopoils, with email, should receive emails for comments and emails
+        p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
+        # 2 - Carine Poilvache, with email, should never receive emails
+        p_c_id = self.res_partner.create(cr, uid, {'name': 'Carine Poilvache', 'email': 'c@c', 'notification_email_send': 'email'})
+        # 3 - Dédé Grosbedon, without email, to test email verification; should receive emails for every message
+        p_d_id = self.res_partner.create(cr, uid, {'name': 'Dédé Grosbedon', 'notification_email_send': 'all'})
+
+        # Subscribe #1, #2
+        group_pigs.message_subscribe([p_b_id, p_c_id])
+
+        # Mail data
+        _subject = 'Pigs'
+        _mail_subject = '%s posted on %s' % (user_admin.name, group_pigs.name)
+        _body1 = 'Pigs rules'
+        _mail_body1 = 'Pigs rules\n<div><p>Admin</p></div>\n'
+        _mail_bodyalt1 = 'Pigs rules\nAdmin\n'
+        _body2 = '<html>Pigs rules</html>'
+        _mail_body2 = html_sanitize('<html>Pigs rules\n<div><p>Admin</p></div>\n</html>')
+        _mail_bodyalt2 = 'Pigs rules\nAdmin'
+        _attachments = [('First', 'My first attachment'), ('Second', 'My second attachment')]
+
+        # ----------------------------------------
+        # CASE1: post comment, body and subject specified
+        # ----------------------------------------
+
+        # 1. Post a new comment on Pigs
+        self._init_mock_build_email()
+        msg_id = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body1, subject=_subject, type='comment', subtype='mt_comment')
+        message = self.mail_message.browse(cr, uid, msg_id)
+        sent_emails = self._build_email_kwargs_list
+        # Test: mail.mail notifications have been deleted
+        self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id', '=', msg_id)]), 'mail.mail notifications should have been auto-deleted!')
+        # Test: mail_message: subject is _subject, body is _body1 (no formatting done)
+        self.assertEqual(message.subject, _subject, 'mail.message subject incorrect')
+        self.assertEqual(message.body, _body1, 'mail.message body incorrect')
+        # Test: sent_email: email send by server: correct subject, body, body_alternative
+        for sent_email in sent_emails:
+            self.assertEqual(sent_email['subject'], _subject, 'sent_email subject incorrect')
+            self.assertEqual(sent_email['body'], _mail_body1 + '\nBert Tartopoils\n', 'sent_email body incorrect')
+            # the html2plaintext uses etree or beautiful soup, so the result may be slighly different
+            # depending if you have installed beautiful soup.
+            self.assertIn(sent_email['body_alternative'], _mail_bodyalt1 + '\nBert Tartopoils\n', 'sent_email body_alternative is incorrect')
+        # Test: mail_message: notified_partner_ids = group followers
+        message_pids = set([partner.id for partner in message.notified_partner_ids])
+        test_pids = set([p_b_id, p_c_id])
+        self.assertEqual(test_pids, message_pids, 'mail.message partners incorrect')
+        # Test: notification linked to this message = group followers = notified_partner_ids
+        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
+        notif_pids = set([notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)])
+        self.assertEqual(notif_pids, test_pids, 'mail.message notification partners incorrect')
+        # Test: sent_email: email_to should contain b@b, not c@c (pref email), not a@a (writer)
+        for sent_email in sent_emails:
+            self.assertEqual(sent_email['email_to'], ['b@b'], 'sent_email email_to is incorrect')
+
+        # ----------------------------------------
+        # CASE2: post an email with attachments, parent_id, partner_ids
+        # ----------------------------------------
+
+        # 1. Post a new email comment on Pigs
+        self._init_mock_build_email()
+        msg_id2 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body=_body2, type='email', subtype='mt_comment',
+            partner_ids=[(6, 0, [p_d_id])], parent_id=msg_id, attachments=_attachments)
+        message = self.mail_message.browse(cr, uid, msg_id2)
+        sent_emails = self._build_email_kwargs_list
+        self.assertFalse(self.mail_mail.search(cr, uid, [('mail_message_id', '=', msg_id2)]), 'mail.mail notifications should have been auto-deleted!')
+        # Test: mail_message: subject is False, body is _body2 (no formatting done), parent_id is msg_id
+        self.assertEqual(message.subject, False, 'mail.message subject incorrect')
+        self.assertEqual(message.body, html_sanitize(_body2), 'mail.message body incorrect')
+        self.assertEqual(message.parent_id.id, msg_id, 'mail.message parent_id incorrect')
+        # Test: sent_email: email send by server: correct automatic subject, body, body_alternative
+        self.assertEqual(len(sent_emails), 2, 'sent_email number of sent emails incorrect')
+        for sent_email in sent_emails:
+            self.assertEqual(sent_email['subject'], _mail_subject, 'sent_email subject incorrect')
+            self.assertIn(_mail_body2, sent_email['body'], 'sent_email body incorrect')
+            self.assertIn(_mail_bodyalt2, sent_email['body_alternative'], 'sent_email body_alternative incorrect')
+        # Test: mail_message: notified_partner_ids = group followers
+        message_pids = set([partner.id for partner in message.notified_partner_ids])
+        test_pids = set([p_b_id, p_c_id, p_d_id])
+        self.assertEqual(message_pids, test_pids, 'mail.message partners incorrect')
+        # Test: notifications linked to this message = group followers = notified_partner_ids
+        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
+        notif_pids = set([notif.partner_id.id for notif in self.mail_notification.browse(cr, uid, notif_ids)])
+        self.assertEqual(notif_pids, test_pids, 'mail.message notification partners incorrect')
+        # Test: sent_email: email_to should contain b@b, c@c, not a@a (writer)
+        for sent_email in sent_emails:
+            self.assertTrue(set(sent_email['email_to']).issubset(set(['b@b', 'c@c'])), 'sent_email email_to incorrect')
+        # Test: attachments
+        for attach in message.attachment_ids:
+            self.assertEqual(attach.res_model, 'mail.group', 'mail.message attachment res_model incorrect')
+            self.assertEqual(attach.res_id, self.group_pigs_id, 'mail.message attachment res_id incorrect')
+            self.assertIn((attach.name, attach.datas.decode('base64')), _attachments,
+                'mail.message attachment name / data incorrect')
+
+        # 3. Reply to the last message, check that its parent will be the first message
+        msg_id3 = self.mail_group.message_post(cr, uid, self.group_pigs_id, body='Test', parent_id=msg_id2)
+        message = self.mail_message.browse(cr, uid, msg_id3)
+        self.assertEqual(message.parent_id.id, msg_id, 'message_post did not flatten the thread structure')
+
+    def test_25_message_compose_wizard(self):
+        """ Tests designed for the mail.compose.message wizard. """
+        cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+        mail_compose = self.registry('mail.compose.message')
+        self.res_users.write(cr, uid, [uid], {'signature': 'Admin', 'email': 'a@a'})
+        group_bird_id = self.mail_group.create(cr, uid, {'name': 'Bird', 'description': 'Bird resistance'})
+        group_bird = self.mail_group.browse(cr, uid, group_bird_id)
+
+        # Mail data
+        _subject = 'Pigs'
+        _body_text = 'Pigs rules'
+        _msg_reply = 'Re: Pigs'
+        _msg_body = '<pre>Pigs rules</pre>'
+        _attachments = [
+            {'name': 'First', 'datas_fname': 'first.txt', 'datas': 'My first attachment'.encode('base64')},
+            {'name': 'Second', 'datas_fname': 'second.txt', 'datas': 'My second attachment'.encode('base64')}
+            ]
+        _attachments_test = [('first.txt', 'My first attachment'), ('second.txt', 'My second attachment')]
+
+        # 1 - Bert Tartopoils, with email, should receive emails for comments and emails
+        p_b_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
+        # 2 - Carine Poilvache, with email, should never receive emails
+        p_c_id = self.res_partner.create(cr, uid, {'name': 'Carine Poilvache', 'email': 'c@c', 'notification_email_send': 'email'})
+        # 3 - Dédé Grosbedon, without email, to test email verification; should receive emails for every message
+        p_d_id = self.res_partner.create(cr, uid, {'name': 'Dédé Grosbedon', 'notification_email_send': 'all'})
+
+        # Subscribe #1
+        group_pigs.message_subscribe([p_b_id])
+
+        # ----------------------------------------
+        # CASE1: comment on group_pigs
+        # ----------------------------------------
+
+        # 1. Comment group_pigs with body_text and subject
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': _subject, 'body_text': _body_text, 'partner_ids': [(4, p_c_id), (4, p_d_id)]},
+            {'default_composition_mode': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_pigs_id,
+                'default_content_subtype': 'plaintext'})
+        compose = mail_compose.browse(cr, uid, compose_id)
+        # Test: mail.compose.message: composition_mode, model, res_id
+        self.assertEqual(compose.composition_mode,  'comment', 'mail.compose.message incorrect composition_mode')
+        self.assertEqual(compose.model,  'mail.group', 'mail.compose.message incorrect model')
+        self.assertEqual(compose.res_id, self.group_pigs_id, 'mail.compose.message incorrect res_id')
+
+        # 2. Post the comment, get created message
+        mail_compose.send_mail(cr, uid, [compose_id])
+        group_pigs.refresh()
+        message = group_pigs.message_ids[0]
+        # Test: mail.message: subject, body inside pre
+        self.assertEqual(message.subject,  False, 'mail.message incorrect subject')
+        self.assertEqual(message.body, _msg_body, 'mail.message incorrect body')
+        # Test: mail.message: notified_partner_ids = entries in mail.notification: group_pigs fans (a, b) + mail.compose.message partner_ids (c, d)
+        msg_pids = [partner.id for partner in message.notified_partner_ids]
+        test_pids = [p_b_id, p_c_id, p_d_id]
+        notif_ids = self.mail_notification.search(cr, uid, [('message_id', '=', message.id)])
+        self.assertEqual(len(notif_ids), 3, 'mail.message: too much notifications created')
+        self.assertEqual(set(msg_pids), set(test_pids), 'mail.message notified_partner_ids incorrect')
+
+        # ----------------------------------------
+        # CASE2: reply to last comment with attachments
+        # ----------------------------------------
+
+        # 1. Update last comment subject, reply with attachments
+        message.write({'subject': _subject})
+        compose_id = mail_compose.create(cr, uid,
+            {'attachment_ids': [(0, 0, _attachments[0]), (0, 0, _attachments[1])]},
+            {'default_composition_mode': 'reply', 'default_model': 'mail.thread', 'default_res_id': self.group_pigs_id, 'default_parent_id': message.id})
+        compose = mail_compose.browse(cr, uid, compose_id)
+        # Test: model, res_id, parent_id, content_subtype
+        self.assertEqual(compose.model,  'mail.group', 'mail.compose.message incorrect model')
+        self.assertEqual(compose.res_id, self.group_pigs_id, 'mail.compose.message incorrect res_id')
+        self.assertEqual(compose.parent_id.id, message.id, 'mail.compose.message incorrect parent_id')
+        self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message incorrect content_subtype')
+        # Test: mail.message: subject as Re:.., body in html, parent_id
+        self.assertEqual(compose.subject, _msg_reply, 'mail.message incorrect subject')
+        # self.assertIn('Administrator wrote:<blockquote><pre>Pigs rules</pre></blockquote>', compose.body, 'mail.message body is incorrect')
+        self.assertEqual(compose.parent_id and compose.parent_id.id, message.id, 'mail.message parent_id incorrect')
+        # Test: mail.message: attachments
+        for attach in compose.attachment_ids:
+            self.assertIn((attach.datas_fname, attach.datas.decode('base64')), _attachments_test, 'mail.message attachment name / data incorrect')
+       
+        # ----------------------------------------
+        # CASE3: mass_mail on Pigs and Bird
+        # ----------------------------------------
+
+        # 1. mass_mail on pigs and bird
+        compose_id = mail_compose.create(cr, uid,
+            {'subject': _subject, 'body': '${object.description}'},
+            {'default_composition_mode': 'mass_mail', 'default_model': 'mail.group', 'default_res_id': False,
+                'active_ids': [self.group_pigs_id, group_bird_id]})
+        compose = mail_compose.browse(cr, uid, compose_id)
+        # Test: content_subtype is html
+        self.assertEqual(compose.content_subtype, 'html', 'mail.compose.message content_subtype incorrect')
+
+        # 2. Post the comment, get created message for each group
+        mail_compose.send_mail(cr, uid, [compose_id],
+            context={'default_res_id': -1, 'active_ids': [self.group_pigs_id, group_bird_id]})
+        group_pigs.refresh()
+        group_bird.refresh()
+        message1 = group_pigs.message_ids[0]
+        message2 = group_bird.message_ids[0]
+        # Test: Pigs and Bird did receive their message
+        test_msg_ids = self.mail_message.search(cr, uid, [], limit=2)
+        self.assertIn(message1.id, test_msg_ids, 'Pigs did not receive its mass mailing message')
+        self.assertIn(message2.id, test_msg_ids, 'Bird did not receive its mass mailing message')
+        # Test: mail.message: subject, body
+        self.assertEqual(message1.subject, _subject, 'mail.message subject incorrect')
+        self.assertEqual(message1.body, group_pigs.description, 'mail.message body incorrect')
+        self.assertEqual(message2.subject, _subject, 'mail.message subject incorrect')
+        self.assertEqual(message2.body, group_bird.description, 'mail.message body incorrect')
+
+    def test_30_message_read(self):
+        """ Tests for message_read and expandables. """
+        cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+        pigs_domain = [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)]
+
+        # Data: create a discussion in Pigs (3 threads, with respectively 0, 4 and 4 answers)
+        msg_id0 = self.group_pigs.message_post(body='0', subtype='mt_comment')
+        msg_id1 = self.group_pigs.message_post(body='1', subtype='mt_comment')
+        msg_id2 = self.group_pigs.message_post(body='2', subtype='mt_comment')
+        msg_id3 = self.group_pigs.message_post(body='1-1', subtype='mt_comment', parent_id=msg_id1)
+        msg_id4 = self.group_pigs.message_post(body='2-1', subtype='mt_comment', parent_id=msg_id2)
+        msg_id5 = self.group_pigs.message_post(body='1-2', subtype='mt_comment', parent_id=msg_id1)
+        msg_id6 = self.group_pigs.message_post(body='2-2', subtype='mt_comment', parent_id=msg_id2)
+        msg_id7 = self.group_pigs.message_post(body='1-1-1', subtype='mt_comment', parent_id=msg_id3)
+        msg_id8 = self.group_pigs.message_post(body='2-1-1', subtype='mt_comment', parent_id=msg_id4)
+        msg_id9 = self.group_pigs.message_post(body='1-1-1', subtype='mt_comment', parent_id=msg_id3)
+        msg_id10 = self.group_pigs.message_post(body='2-1-1', subtype='mt_comment', parent_id=msg_id4)
+        msg_ids = [msg_id10, msg_id9, msg_id8, msg_id7, msg_id6, msg_id5, msg_id4, msg_id3, msg_id2, msg_id1, msg_id0]
+        ordered_msg_ids = [msg_id2, msg_id4, msg_id6, msg_id8, msg_id10, msg_id1, msg_id3, msg_id5, msg_id7, msg_id9, msg_id0]
+
+        # Test: read some specific ids
+        read_msg_list = self.mail_message.message_read(cr, uid, ids=msg_ids[2:4], domain=[('body', 'like', 'dummy')])
+        read_msg_ids = [msg.get('id') for msg in read_msg_list]
+        self.assertEqual(msg_ids[2:4], read_msg_ids, 'message_read with direct ids should read only the requested ids')
+
+        # Test: read messages of Pigs through a domain, being thread or not threaded
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=pigs_domain, limit=200)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list]
+        self.assertEqual(msg_ids, read_msg_ids, 'message_read flat with domain on Pigs should equal all messages of Pigs')
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=pigs_domain, limit=200, thread_level=1)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list]
+        self.assertEqual(ordered_msg_ids, read_msg_ids,
+            'message_read threaded with domain on Pigs should equal all messages of Pigs, and sort them with newer thread first, last message last in thread')
+
+        # ----------------------------------------
+        # CASE1: message_read with domain, threaded
+        # We simulate an entire flow, using the expandables to test them
+        # ----------------------------------------
+
+        # Do: read last message, threaded
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=pigs_domain, limit=1, thread_level=1)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        # TDE TODO: test expandables order
+        type_list = map(lambda item: item.get('type'), read_msg_list)
+        # Test: structure content, ancestor is added to the read messages, ordered by id, ancestor is set, 2 expandables
+        self.assertEqual(len(read_msg_list), 4, 'message_read on last Pigs message should return 2 messages and 2 expandables')
+        self.assertEqual(set([msg_id2, msg_id10]), set(read_msg_ids), 'message_read on the last Pigs message should also get its parent')
+        self.assertEqual(read_msg_list[1].get('parent_id'), read_msg_list[0].get('id'), 'message_read should set the ancestor to the thread header')
+        # Data: get expandables
+        new_threads_exp, new_msg_exp = None, None
+        for msg in read_msg_list:
+            if msg.get('type') == 'expandable' and msg.get('nb_messages') == -1 and msg.get('max_limit'):
+                new_threads_exp = msg
+            elif msg.get('type') == 'expandable':
+                new_msg_exp = msg
+
+        # Do: fetch new messages in first thread, domain from expandable
+        self.assertIsNotNone(new_msg_exp, 'message_read on last Pigs message should have returned a new messages expandable')
+        domain = new_msg_exp.get('domain', [])
+        # Test: expandable, conditions in domain
+        self.assertIn(('id', 'child_of', msg_id2), domain, 'new messages expandable domain should contain a child_of condition')
+        self.assertIn(('id', '>=', msg_id4), domain, 'new messages expandable domain should contain an id greater than condition')
+        self.assertIn(('id', '<=', msg_id8), domain, 'new messages expandable domain should contain an id less than condition')
+        self.assertEqual(new_msg_exp.get('parent_id'), msg_id2, 'new messages expandable should have parent_id set to the thread header')
+        # Do: message_read with domain, thread_level=0, parent_id=msg_id2 (should be imposed by JS), 2 messages
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=2, thread_level=0, parent_id=msg_id2)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        new_msg_exp = [msg for msg in read_msg_list if msg.get('type') == 'expandable'][0]
+        # Test: structure content, 2 messages and 1 thread expandable
+        self.assertEqual(len(read_msg_list), 3, 'message_read in Pigs thread should return 2 messages and 1 expandables')
+        self.assertEqual(set([msg_id6, msg_id8]), set(read_msg_ids), 'message_read in Pigs thread should return 2 more previous messages in thread')
+        # Do: read the last message
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=new_msg_exp.get('domain'), limit=2, thread_level=0, parent_id=msg_id2)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        # Test: structure content, 1 message
+        self.assertEqual(len(read_msg_list), 1, 'message_read in Pigs thread should return 1 message')
+        self.assertEqual(set([msg_id4]), set(read_msg_ids), 'message_read in Pigs thread should return the last message in thread')
+
+        # Do: fetch a new thread, domain from expandable
+        self.assertIsNotNone(new_threads_exp, 'message_read on last Pigs message should have returned a new threads expandable')
+        domain = new_threads_exp.get('domain', [])
+        # Test: expandable, conditions in domain
+        for condition in pigs_domain:
+            self.assertIn(condition, domain, 'new threads expandable domain should contain the message_read domain parameter')
+        self.assertFalse(new_threads_exp.get('parent_id'), 'new threads expandable should not have an parent_id')
+        # Do: message_read with domain, thread_level=1 (should be imposed by JS)
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=1, thread_level=1)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        # Test: structure content, ancestor is added to the read messages, ordered by id, ancestor is set, 2 expandables
+        self.assertEqual(len(read_msg_list), 4, 'message_read on Pigs should return 2 messages and 2 expandables')
+        self.assertEqual(set([msg_id1, msg_id9]), set(read_msg_ids), 'message_read on a Pigs message should also get its parent')
+        self.assertEqual(read_msg_list[1].get('parent_id'), read_msg_list[0].get('id'), 'message_read should set the ancestor to the thread header')
+        # Data: get expandables
+        new_threads_exp, new_msg_exp = None, None
+        for msg in read_msg_list:
+            if msg.get('type') == 'expandable' and msg.get('nb_messages') == -1 and msg.get('max_limit'):
+                new_threads_exp = msg
+            elif msg.get('type') == 'expandable':
+                new_msg_exp = msg
+
+        # Do: fetch new messages in second thread, domain from expandable
+        self.assertIsNotNone(new_msg_exp, 'message_read on Pigs message should have returned a new messages expandable')
+        domain = new_msg_exp.get('domain', [])
+        # Test: expandable, conditions in domain
+        self.assertIn(('id', 'child_of', msg_id1), domain, 'new messages expandable domain should contain a child_of condition')
+        self.assertIn(('id', '>=', msg_id3), domain, 'new messages expandable domain should contain an id greater than condition')
+        self.assertIn(('id', '<=', msg_id7), domain, 'new messages expandable domain should contain an id less than condition')
+        self.assertEqual(new_msg_exp.get('parent_id'), msg_id1, 'new messages expandable should have ancestor_id set to the thread header')
+        # Do: message_read with domain, thread_level=0, parent_id=msg_id1 (should be imposed by JS)
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=200, thread_level=0, parent_id=msg_id1)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        # Test: other message in thread have been fetch
+        self.assertEqual(set([msg_id3, msg_id5, msg_id7]), set(read_msg_ids), 'message_read on the last Pigs message should also get its parent')
+
+        # Test: fetch a new thread, domain from expandable
+        self.assertIsNotNone(new_threads_exp, 'message_read should have returned a new threads expandable')
+        domain = new_threads_exp.get('domain', [])
+        # Test: expandable, conditions in domain
+        for condition in pigs_domain:
+            self.assertIn(condition, domain, 'general expandable domain should contain the message_read domain parameter')
+        # Do: message_read with domain, thread_level=1 (should be imposed by JS)
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=1, thread_level=1)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        # Test: structure content, ancestor is added to the read messages, ordered by id, ancestor is set, 2 expandables
+        self.assertEqual(len(read_msg_list), 1, 'message_read on Pigs should return 1 message because everything else has been fetched')
+        self.assertEqual([msg_id0], read_msg_ids, 'message_read after 2 More should return only 1 last message')
+
+        # ----------------------------------------
+        # CASE2: message_read with domain, flat
+        # ----------------------------------------
+
+        # Do: read 2 lasts message, flat
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=pigs_domain, limit=2, thread_level=0)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        # Test: structure content, ancestor is added to the read messages, ordered by id, ancestor is not set, 1 expandable
+        self.assertEqual(len(read_msg_list), 3, 'message_read on last Pigs message should return 2 messages and 1 expandable')
+        self.assertEqual(set([msg_id9, msg_id10]), set(read_msg_ids), 'message_read flat on Pigs last messages should only return those messages')
+        self.assertFalse(read_msg_list[0].get('parent_id'), 'message_read flat should set the ancestor as False')
+        self.assertFalse(read_msg_list[1].get('parent_id'), 'message_read flat should set the ancestor as False')
+        # Data: get expandables
+        new_threads_exp, new_msg_exp = None, None
+        for msg in read_msg_list:
+            if msg.get('type') == 'expandable' and msg.get('nb_messages') == -1 and msg.get('max_limit'):
+                new_threads_exp = msg
+
+        # Do: fetch new messages, domain from expandable
+        self.assertIsNotNone(new_threads_exp, 'message_read flat on the 2 last Pigs messages should have returns a new threads expandable')
+        domain = new_threads_exp.get('domain', [])
+        # Test: expandable, conditions in domain
+        for condition in pigs_domain:
+            self.assertIn(condition, domain, 'new threads expandable domain should contain the message_read domain parameter')
+        # Do: message_read with domain, thread_level=0 (should be imposed by JS)
+        read_msg_list = self.mail_message.message_read(cr, uid, domain=domain, limit=20, thread_level=0)
+        read_msg_ids = [msg.get('id') for msg in read_msg_list if msg.get('type') != 'expandable']
+        # Test: structure content, ancestor is added to the read messages, ordered by id, ancestor is set, 2 expandables
+        self.assertEqual(len(read_msg_list), 9, 'message_read on Pigs should return 9 messages and 0 expandable')
+        self.assertEqual([msg_id8, msg_id7, msg_id6, msg_id5, msg_id4, msg_id3, msg_id2, msg_id1, msg_id0], read_msg_ids,
+            'message_read, More on flat, should return all remaning messages')
+
+    def test_40_needaction(self):
+        """ Tests for mail.message needaction. """
+        cr, uid, user_admin, group_pigs = self.cr, self.uid, self.user_admin, self.group_pigs
+        user_raoul = self.res_users.browse(cr, uid, self.user_raoul_id)
+        group_pigs_demo = self.mail_group.browse(cr, self.user_raoul_id, self.group_pigs_id)
+        na_admin_base = self.mail_message._needaction_count(cr, uid, domain=[])
+        na_demo_base = self.mail_message._needaction_count(cr, user_raoul.id, domain=[])
+
+        # Test: number of unread notification = needaction on mail.message
+        notif_ids = self.mail_notification.search(cr, uid, [
+            ('partner_id', '=', user_admin.partner_id.id),
+            ('read', '=', False)
+            ])
+        na_count = self.mail_message._needaction_count(cr, uid, domain=[])
+        self.assertEqual(len(notif_ids), na_count, 'unread notifications count does not match needaction count')
+
+        # Do: post 2 message on group_pigs as admin, 3 messages as demo user
+        for dummy in range(2):
+            group_pigs.message_post(body='My Body', subtype='mt_comment')
+        for dummy in range(3):
+            group_pigs_demo.message_post(body='My Demo Body', subtype='mt_comment')
+
+        # Test: admin has 3 new notifications (from demo), and 3 new needaction
+        notif_ids = self.mail_notification.search(cr, uid, [
+            ('partner_id', '=', user_admin.partner_id.id),
+            ('read', '=', False)
+            ])
+        self.assertEqual(len(notif_ids), na_admin_base + 3, 'Admin should have 3 new unread notifications')
+        na_admin = self.mail_message._needaction_count(cr, uid, domain=[])
+        na_admin_group = self.mail_message._needaction_count(cr, uid, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
+        self.assertEqual(na_admin, na_admin_base + 3, 'Admin should have 3 new needaction')
+        self.assertEqual(na_admin_group, 3, 'Admin should have 3 needaction related to Pigs')
+        # Test: demo has 0 new notifications (not a follower, not receiving its own messages), and 0 new needaction
+        notif_ids = self.mail_notification.search(cr, uid, [
+            ('partner_id', '=', user_raoul.partner_id.id),
+            ('read', '=', False)
+            ])
+        self.assertEqual(len(notif_ids), na_demo_base + 0, 'Demo should have 0 new unread notifications')
+        na_demo = self.mail_message._needaction_count(cr, user_raoul.id, domain=[])
+        na_demo_group = self.mail_message._needaction_count(cr, user_raoul.id, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)])
+        self.assertEqual(na_demo, na_demo_base + 0, 'Demo should have 0 new needaction')
+        self.assertEqual(na_demo_group, 0, 'Demo should have 0 needaction related to Pigs')
+
+    def test_50_thread_parent_resolution(self):
+        """Verify parent/child relationships are correctly established when processing incoming mails"""
+        cr, uid = self.cr, self.uid
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        msg1 = group_pigs.message_post(body='My Body', subject='1')
+        msg2 = group_pigs.message_post(body='My Body', subject='2')
+        msg1, msg2 = self.mail_message.browse(cr, uid, [msg1, msg2])
+        self.assertTrue(msg1.message_id, "New message should have a proper message_id")
+
+        # Reply to msg1, make sure the reply is properly attached using the various reply identification mechanisms
+        # 1. In-Reply-To header
+        reply_msg = MAIL_TEMPLATE.format(to='Pretty Pigs <group+pigs@example.com>, other@gmail.com', subject='Re: 1',
+                                         extra='In-Reply-To: %s' % msg1.message_id)
+        self.mail_group.message_process(cr, uid, None, reply_msg)
+
+        # 2. References header
+        reply_msg2 = MAIL_TEMPLATE.format(to='Pretty Pigs <group+pigs@example.com>, other@gmail.com', subject='Re: Re: 1',
+                                         extra='References: <2233@a.com>\r\n\t<3edss_dsa@b.com> %s' % msg1.message_id)
+        self.mail_group.message_process(cr, uid, None, reply_msg2)
+
+        # 3. Subject contains [<ID>] + model passed to message+process -> only attached to group, not to mail
+        reply_msg3 = MAIL_TEMPLATE.format(to='Pretty Pigs <group+pigs@example.com>, other@gmail.com',
+                                          extra='', subject='Re: [%s] 1' % self.group_pigs_id)
+        self.mail_group.message_process(cr, uid, 'mail.group', reply_msg3)
+
+        group_pigs.refresh()
+        msg1.refresh()
+        self.assertEqual(5, len(group_pigs.message_ids), 'group should contain 5 messages')
+        # TDE note: python test + debug because of the random error we see with the next assert
+        if len(msg1.child_ids) != 2:
+            msg_ids = self.mail_message.search(cr, uid, [('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], limit=10)
+            for new_msg in self.mail_message.browse(cr, uid, msg_ids):
+                print new_msg.subject, '(id', new_msg.id, ')', 'parent_id:', new_msg.parent_id
+                print '\tchild_ids', [child.id for child in new_msg.child_ids]
+        self.assertEqual(2, len(msg1.child_ids), 'msg1 should have 2 children now')
+
+    def test_60_message_vote(self):
+        """ Test designed for the vote/unvote feature. """
+        cr, uid, user_admin, user_raoul, group_pigs = self.cr, self.uid, self.user_admin, self.user_raoul, self.group_pigs
+        # Data: post a message on Pigs
+        msg_id = group_pigs.message_post(body='My Body', subject='1')
+        msg = self.mail_message.browse(cr, uid, msg_id)
+
+        # Do: Admin vote for msg
+        self.mail_message.vote_toggle(cr, uid, [msg.id])
+        msg.refresh()
+        # Test: msg has Admin as voter
+        self.assertEqual(set(msg.vote_user_ids), set([user_admin]), 'mail_message vote: after voting, Admin should be in the voter')
+        # Do: Bert vote for msg
+        self.mail_message.vote_toggle(cr, user_raoul.id, [msg.id])
+        msg.refresh()
+        # Test: msg has Admin and Bert as voters
+        self.assertEqual(set(msg.vote_user_ids), set([user_admin, user_raoul]), 'mail_message vote: after voting, Admin and Bert should be in the voters')
+        # Do: Admin unvote for msg
+        self.mail_message.vote_toggle(cr, uid, [msg.id])
+        msg.refresh()
+        # Test: msg has Bert as voter
+        self.assertEqual(set(msg.vote_user_ids), set([user_raoul]), 'mail_message vote: after unvoting, Bert should be in the voter')
+
+    def test_70_message_favorite(self):
+        """ Tests for favorites. """
+        cr, uid, user_admin, user_raoul, group_pigs = self.cr, self.uid, self.user_admin, self.user_raoul, self.group_pigs
+        # Data: post a message on Pigs
+        msg_id = group_pigs.message_post(body='My Body', subject='1')
+        msg = self.mail_message.browse(cr, uid, msg_id)
+
+        # Do: Admin stars msg
+        self.mail_message.favorite_toggle(cr, uid, [msg.id])
+        msg.refresh()
+        # Test: msg starred by Admin
+        self.assertEqual(set(msg.favorite_user_ids), set([user_admin]), 'mail_message favorite: after starring, Admin should be in favorite_user_ids')
+        # Do: Bert stars msg
+        self.mail_message.favorite_toggle(cr, user_raoul.id, [msg.id])
+        msg.refresh()
+        # Test: msg starred by Admin and Raoul
+        self.assertEqual(set(msg.favorite_user_ids), set([user_admin, user_raoul]), 'mail_message favorite: after starring, Admin and Raoul should be in favorite_user_ids')
+        # Do: Admin unvote for msg
+        self.mail_message.favorite_toggle(cr, uid, [msg.id])
+        msg.refresh()
+        # Test: msg starred by Raoul
+        self.assertEqual(set(msg.favorite_user_ids), set([user_raoul]), 'mail_message favorite: after unstarring, Raoul should be in favorite_user_ids')
diff --git a/addons/mail/tests/test_mail_access_rights.py b/addons/mail/tests/test_mail_access_rights.py
new file mode 100644
index 00000000000..7594de87faf
--- /dev/null
+++ b/addons/mail/tests/test_mail_access_rights.py
@@ -0,0 +1,203 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.addons.mail.tests import test_mail_mockup
+from openerp.osv.orm import except_orm
+from openerp.tools.misc import mute_logger
+
+
+class test_mail_access_rights(test_mail_mockup.TestMailMockups):
+
+    def setUp(self):
+        super(test_mail_access_rights, self).setUp()
+        cr, uid = self.cr, self.uid
+        self.mail_group = self.registry('mail.group')
+        self.mail_message = self.registry('mail.message')
+        self.mail_notification = self.registry('mail.notification')
+        self.res_users = self.registry('res.users')
+        self.res_groups = self.registry('res.groups')
+        self.res_partner = self.registry('res.partner')
+
+        # create a 'pigs' group that will be used through the various tests
+        self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
+            {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
+
+        # Find Employee group
+        group_employee_ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
+        self.group_employee_id = group_employee_ref and group_employee_ref[1] or False
+
+        # Create Bert (without groups) and Raoul( employee)
+        self.user_bert_id = self.res_users.create(cr, uid, {'name': 'Bert Tartopoils', 'login': 'bert', 'groups_id': [(6, 0, [])]})
+        self.user_raoul_id = self.res_users.create(cr, uid, {'name': 'Raoul Grosbedon', 'login': 'raoul', 'groups_id': [(6, 0, [self.group_employee_id])]})
+        self.user_bert = self.res_users.browse(cr, uid, self.user_bert_id)
+        self.partner_bert_id = self.user_bert.partner_id.id
+        self.user_raoul = self.res_users.browse(cr, uid, self.user_raoul_id)
+        self.partner_raoul_id = self.user_raoul.partner_id.id
+
+    def test_00_mail_message_search_access_rights(self):
+        """ Test mail_message search override about access rights. """
+        cr, uid, group_pigs_id = self.cr, self.uid, self.group_pigs_id
+        partner_bert_id, partner_raoul_id = self.partner_bert_id, self.partner_raoul_id
+        user_bert_id, user_raoul_id = self.user_bert_id, self.user_raoul_id
+        # Data: comment subtype for mail.message creation
+        ref = self.registry('ir.model.data').get_object_reference(cr, uid, 'mail', 'mt_comment')
+        subtype_id = ref and ref[1] or False
+
+        # Data: Birds group, private
+        group_birds_id = self.mail_group.create(self.cr, self.uid, {'name': 'Birds', 'public': 'private'})
+        # Data: raoul is member of Pigs
+        self.mail_group.message_subscribe(cr, uid, [group_pigs_id], [partner_raoul_id])
+        # Data: various author_ids, partner_ids, documents
+        msg_id1 = self.mail_message.create(cr, uid, {'subject': '_Test', 'body': 'A', 'subtype_id': subtype_id})
+        msg_id2 = self.mail_message.create(cr, uid, {'subject': '_Test', 'body': 'A+B', 'partner_ids': [(6, 0, [partner_bert_id])], 'subtype_id': subtype_id})
+        msg_id3 = self.mail_message.create(cr, uid, {'subject': '_Test', 'body': 'A Pigs', 'model': 'mail.group', 'res_id': group_pigs_id, 'subtype_id': subtype_id})
+        msg_id4 = self.mail_message.create(cr, uid, {'subject': '_Test', 'body': 'A+B Pigs', 'model': 'mail.group', 'res_id': group_pigs_id, 'partner_ids': [(6, 0, [partner_bert_id])], 'subtype_id': subtype_id})
+        msg_id5 = self.mail_message.create(cr, uid, {'subject': '_Test', 'body': 'A+R Pigs', 'model': 'mail.group', 'res_id': group_pigs_id, 'partner_ids': [(6, 0, [partner_raoul_id])], 'subtype_id': subtype_id})
+        msg_id6 = self.mail_message.create(cr, uid, {'subject': '_Test', 'body': 'A Birds', 'model': 'mail.group', 'res_id': group_birds_id, 'subtype_id': subtype_id})
+        msg_id7 = self.mail_message.create(cr, user_bert_id, {'subject': '_Test', 'body': 'B', 'subtype_id': subtype_id})
+        msg_id8 = self.mail_message.create(cr, user_bert_id, {'subject': '_Test', 'body': 'B+R', 'partner_ids': [(6, 0, [partner_raoul_id])], 'subtype_id': subtype_id})
+
+        # Test: Bert: 2 messages that have Bert in partner_ids + 2 messages as author
+        msg_ids = self.mail_message.search(cr, user_bert_id, [('subject', 'like', '_Test')])
+        self.assertEqual(set([msg_id2, msg_id4, msg_id7, msg_id8]), set(msg_ids), 'mail_message search failed')
+        # Test: Raoul: 3 messages on Pigs Raoul can read (employee can read group with default values), 0 on Birds (private group)
+        msg_ids = self.mail_message.search(cr, user_raoul_id, [('subject', 'like', '_Test'), ('body', 'like', 'A')])
+        self.assertEqual(set([msg_id3, msg_id4, msg_id5]), set(msg_ids), 'mail_message search failed')
+        # Test: Admin: all messages
+        msg_ids = self.mail_message.search(cr, uid, [('subject', 'like', '_Test')])
+        self.assertEqual(set([msg_id1, msg_id2, msg_id3, msg_id4, msg_id5, msg_id6, msg_id7, msg_id8]), set(msg_ids), 'mail_message search failed')
+
+    @mute_logger('openerp.osv.orm')
+    def test_05_mail_message_read_access_rights(self):
+        """ Test basic mail_message read access rights. """
+        cr, uid = self.cr, self.uid
+        partner_bert_id, partner_raoul_id = self.partner_bert_id, self.partner_raoul_id
+        user_bert_id, user_raoul_id = self.user_bert_id, self.user_raoul_id
+
+        # Prepare groups: Pigs (employee), Jobs (public)
+        self.mail_group.message_post(cr, uid, self.group_pigs_id, body='Message')
+        self.group_jobs_id = self.mail_group.create(cr, uid, {'name': 'Jobs', 'public': 'public'})
+
+        # ----------------------------------------
+        # CASE1: Bert, basic mail.message read access
+        # ----------------------------------------
+
+        # Do: create a new mail.message
+        message_id = self.mail_message.create(cr, uid, {'body': 'My Body'})
+        # Test: Bert reads the message, crash because not notification/not in doc followers/not read on doc
+        self.assertRaises(except_orm, self.mail_message.read,
+            cr, user_bert_id, message_id)
+        # Do: message is pushed to Bert
+        notif_id = self.mail_notification.create(cr, uid, {'message_id': message_id, 'partner_id': partner_bert_id})
+        # Test: Bert reads the message, ok because notification pushed
+        self.mail_message.read(cr, user_bert_id, message_id)
+        # Do: remove notification
+        self.mail_notification.unlink(cr, uid, notif_id)
+        # Test: Bert reads the message, crash because not notification/not in doc followers/not read on doc
+        self.assertRaises(except_orm, self.mail_message.read,
+            cr, self.user_bert_id, message_id)
+        # Do: Bert is now the author
+        self.mail_message.write(cr, uid, [message_id], {'author_id': partner_bert_id})
+        # Test: Bert reads the message, ok because Bert is the author
+        self.mail_message.read(cr, user_bert_id, message_id)
+        # Do: Bert is not the author anymore
+        self.mail_message.write(cr, uid, [message_id], {'author_id': partner_raoul_id})
+        # Test: Bert reads the message, crash because not notification/not in doc followers/not read on doc
+        self.assertRaises(except_orm, self.mail_message.read,
+            cr, user_bert_id, message_id)
+        # Do: message is attached to a document Bert can read, Jobs
+        self.mail_message.write(cr, uid, [message_id], {'model': 'mail.group', 'res_id': self.group_jobs_id})
+        # Test: Bert reads the message, ok because linked to a doc he is allowed to read
+        self.mail_message.read(cr, user_bert_id, message_id)
+        # Do: message is attached to a document Bert cannot read, Pigs
+        self.mail_message.write(cr, uid, [message_id], {'model': 'mail.group', 'res_id': self.group_pigs_id})
+        # Test: Bert reads the message, crash because not notification/not in doc followers/not read on doc
+        self.assertRaises(except_orm, self.mail_message.read,
+            cr, user_bert_id, message_id)
+
+    @mute_logger('openerp.addons.base.ir.ir_model')
+    @mute_logger('openerp.osv.orm')
+    def test_10_mail_flow_access_rights(self):
+        """ Test a Chatter-looks alike flow. """
+        cr, uid = self.cr, self.uid
+        mail_compose = self.registry('mail.compose.message')
+        partner_bert_id, partner_raoul_id = self.partner_bert_id, self.partner_raoul_id
+        user_bert_id, user_raoul_id = self.user_bert_id, self.user_raoul_id
+
+        # Prepare groups: Pigs (employee), Jobs (public)
+        self.mail_group.message_post(cr, uid, self.group_pigs_id, body='Message')
+        self.group_jobs_id = self.mail_group.create(cr, uid, {'name': 'Jobs', 'public': 'public'})
+
+        # ----------------------------------------
+        # CASE1: Bert, without groups
+        # ----------------------------------------
+        # Do: Bert creates a group, should crash because perm_create only for employees
+        self.assertRaises(except_orm,
+                          self.mail_group.create,
+                          cr, user_bert_id, {'name': 'Bert\'s Group'})
+
+        # Do: Bert reads Jobs basic fields, ok because public = read access on the group
+        self.mail_group.read(cr, user_bert_id, self.group_jobs_id, ['name', 'description'])
+        # Do: Bert browse Pigs, ok (no direct browse of partners)
+        self.mail_group.browse(cr, user_bert_id, self.group_jobs_id)
+        # Do: Bert reads Jobs messages, ok because read access on the group => read access on its messages
+        jobs_message_ids = self.mail_group.read(cr, user_bert_id, self.group_jobs_id, ['message_ids'])['message_ids']
+        self.mail_message.read(cr, user_bert_id, jobs_message_ids)
+        # Do: Bert reads Jobs followers, ko because partner are accessible to employees or partner manager
+        jobs_followers_ids = self.mail_group.read(cr, user_bert_id, self.group_jobs_id, ['message_follower_ids'])['message_follower_ids']
+        self.assertRaises(except_orm,
+                          self.res_partner.read,
+                          cr, user_bert_id, jobs_followers_ids)
+        # Do: Bert comments Jobs, ko because no write access on the group and not in the followers
+        self.assertRaises(except_orm,
+                          self.mail_group.message_post,
+                          cr, user_bert_id, self.group_jobs_id, body='I love Pigs')
+        # Do: add Bert to jobs followers
+        self.mail_group.message_subscribe(cr, uid, [self.group_jobs_id], [partner_bert_id])
+        # Do: Bert comments Jobs, ok because he is now in the followers
+        self.mail_group.message_post(cr, user_bert_id, self.group_jobs_id, body='I love Pigs')
+
+        # Do: Bert reads Pigs, should crash because mail.group security=groups only for employee group
+        self.assertRaises(except_orm,
+                          self.mail_group.read,
+                          cr, user_bert_id, self.group_pigs_id)
+
+        # Do: Bert create a mail.compose.message record, because he uses the wizard
+        compose_id = mail_compose.create(cr, user_bert_id,
+            {'subject': 'Subject', 'body_text': 'Body text', 'partner_ids': []},
+            # {'subject': 'Subject', 'body_text': 'Body text', 'partner_ids': [(4, p_c_id), (4, p_d_id)]},
+            {'default_composition_mode': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_jobs_id})
+        mail_compose.send_mail(cr, user_bert_id, [compose_id])
+
+        self.user_demo_id = self.registry('ir.model.data').get_object_reference(self.cr, self.uid, 'base', 'user_demo')[1]
+        compose_id = mail_compose.create(cr, self.user_demo_id,
+            {'subject': 'Subject', 'body_text': 'Body text', 'partner_ids': []},
+            # {'subject': 'Subject', 'body_text': 'Body text', 'partner_ids': [(4, p_c_id), (4, p_d_id)]},
+            {'default_composition_mode': 'comment', 'default_model': 'mail.group', 'default_res_id': self.group_jobs_id})
+        mail_compose.send_mail(cr, self.user_demo_id, [compose_id])
+
+        # ----------------------------------------
+        # CASE2: Raoul, employee
+        # ----------------------------------------
+        # Do: Bert read Pigs, ok because public
+        self.mail_group.read(cr, user_raoul_id, self.group_pigs_id)
+        # Do: Bert read Jobs, ok because group_public_id = employee
+        self.mail_group.read(cr, user_raoul_id, self.group_jobs_id)
diff --git a/addons/mail/tests/test_mail_mockup.py b/addons/mail/tests/test_mail_mockup.py
new file mode 100644
index 00000000000..cba04a0c6b3
--- /dev/null
+++ b/addons/mail/tests/test_mail_mockup.py
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.tests import common
+
+
+class TestMailMockups(common.TransactionCase):
+
+    def _mock_smtp_gateway(self, *args, **kwargs):
+        return True
+
+    def _init_mock_build_email(self):
+        self._build_email_args_list = []
+        self._build_email_kwargs_list = []
+
+    def _mock_build_email(self, *args, **kwargs):
+        """ Mock build_email to be able to test its values. Store them into
+            some internal variable for latter processing. """
+        self._build_email_args_list.append(args)
+        self._build_email_kwargs_list.append(kwargs)
+        return self._build_email(*args, **kwargs)
+
+    def setUp(self):
+        super(TestMailMockups, self).setUp()
+        # Install mock SMTP gateway
+        self._init_mock_build_email()
+        self._build_email = self.registry('ir.mail_server').build_email
+        self.registry('ir.mail_server').build_email = self._mock_build_email
+        self._send_email = self.registry('ir.mail_server').send_email
+        self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
+
+    def tearDown(self):
+        # Remove mocks
+        self.registry('ir.mail_server').build_email = self._build_email
+        self.registry('ir.mail_server').send_email = self._send_email
+        super(TestMailMockups, self).tearDown()
diff --git a/addons/mail/update.py b/addons/mail/update.py
new file mode 100644
index 00000000000..f571a59440d
--- /dev/null
+++ b/addons/mail/update.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+import datetime
+import logging
+import sys
+import urllib
+import urllib2
+
+import pooler
+import release
+from osv import osv, fields
+from tools.translate import _
+from tools.safe_eval import safe_eval
+from tools.config import config
+from tools import misc
+
+_logger = logging.getLogger(__name__)
+
+"""
+Time interval that will be used to determine up to which date we will
+check the logs to see if a message we just received was already logged.
+@type: datetime.timedelta
+"""
+_PREVIOUS_LOG_CHECK = datetime.timedelta(days=365)
+
+def get_sys_logs(self, cr, uid):
+    """
+    Utility method to send a publisher warranty get logs messages.
+    """
+    pool = pooler.get_pool(cr.dbname)
+
+    dbuuid = pool.get('ir.config_parameter').get_param(cr, uid, 'database.uuid')
+    db_create_date = pool.get('ir.config_parameter').get_param(cr, uid, 'database.create_date')
+    limit_date = datetime.datetime.now()
+    limit_date = limit_date - datetime.timedelta(15)
+    limit_date_str = limit_date.strftime(misc.DEFAULT_SERVER_DATETIME_FORMAT)
+    nbr_users = pool.get("res.users").search(cr, uid, [], count=True)
+    nbr_active_users = pool.get("res.users").search(cr, uid, [("date", ">=", limit_date_str)], count=True)
+    nbr_share_users = False
+    nbr_active_share_users = False
+    if "share" in pool.get("res.users")._all_columns:
+        nbr_share_users = pool.get("res.users").search(cr, uid, [("share", "=", True)], count=True)
+        nbr_active_share_users = pool.get("res.users").search(cr, uid, [("share", "=", True), ("date", ">=", limit_date_str)], count=True)
+    user = pool.get("res.users").browse(cr, uid, uid)
+
+    web_base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', 'False')
+    msg = {
+        "dbuuid": dbuuid,
+        "nbr_users": nbr_users,
+        "nbr_active_users": nbr_active_users,
+        "nbr_share_users": nbr_share_users,
+        "nbr_active_share_users": nbr_active_share_users,
+        "dbname": cr.dbname,
+        "db_create_date": db_create_date,
+        "version": release.version,
+        "language": user.lang,
+        "web_base_url": web_base_url,
+    }
+    msg.update(pool.get("res.company").read(cr,uid,[1],["name","email","phone"])[0])
+
+    add_arg = {"timeout":30} if sys.version_info >= (2,6) else {}
+    arguments = {'arg0': msg, "action": "update",}
+    arguments_raw = urllib.urlencode(arguments)
+
+    url = config.get("publisher_warranty_url")
+
+    uo = urllib2.urlopen(url, arguments_raw, **add_arg)
+    result = {}
+    try:
+        submit_result = uo.read()
+        result = safe_eval(submit_result)
+    finally:
+        uo.close()
+    return result
+
+class publisher_warranty_contract(osv.osv):
+    _name = "publisher_warranty.contract"
+
+    def update_notification(self, cr, uid, ids, cron_mode=True, context=None):
+        """
+        Send a message to OpenERP's publisher warranty server to check the
+        validity of the contracts, get notifications, etc...
+
+        @param cron_mode: If true, catch all exceptions (appropriate for usage in a cron).
+        @type cron_mode: boolean
+        """
+        try:
+            try:
+                result = get_sys_logs(self, cr, uid)
+            except Exception, ex:
+                if cron_mode: # we don't want to see any stack trace in cron
+                    return False
+                _logger.debug("Exception while sending a get logs messages", exc_info=1)
+                raise osv.except_osv(_("Error"), _("Error during communication with the publisher warranty server."))
+            limit_date = (datetime.datetime.now() - _PREVIOUS_LOG_CHECK).strftime(misc.DEFAULT_SERVER_DATETIME_FORMAT)
+            # old behavior based on res.log; now on mail.message, that is not necessarily installed
+            proxy = self.pool.get('mail.message')
+
+            model, res_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'mail', 'group_all_employees')
+
+            for message in result["messages"]:
+                values = {
+                    'body' : message,
+                    'model' : 'mail.group',
+                    'res_id' : res_id,
+                    'user_id' : False,
+                }
+                proxy.create(cr, uid, values, context=context)
+        except Exception:
+            if cron_mode:
+                return False # we don't want to see any stack trace in cron
+            else:
+                raise
+        return True
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/mail/wizard/__init__.py b/addons/mail/wizard/__init__.py
index 88b9581f68e..39a2d843354 100644
--- a/addons/mail/wizard/__init__.py
+++ b/addons/mail/wizard/__init__.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import invite
 import mail_compose_message
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py
new file mode 100644
index 00000000000..50ecf9450da
--- /dev/null
+++ b/addons/mail/wizard/invite.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    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
+from osv import fields
+from tools.translate import _
+
+
+class invite_wizard(osv.osv_memory):
+    """ Wizard to invite partners and make them followers. """
+    _name = 'mail.wizard.invite'
+    _description = 'Invite wizard'
+
+    def default_get(self, cr, uid, fields, context=None):
+        result = super(invite_wizard, self).default_get(cr, uid, fields, context=context)
+        if 'message' in fields and result.get('res_model') and result.get('res_id'):
+            document_name = self.pool.get(result.get('res_model')).name_get(cr, uid, [result.get('res_id')], context=context)[0][1]
+            message = _('<div>You have been invited to follow %s.</div>' % document_name)
+            result['message'] = message
+        elif 'message' in fields:
+            result['message'] = _('<div>You have been invited to follow a new document.</div>')
+        return result
+
+    _columns = {
+        'res_model': fields.char('Related Document Model', size=128,
+                        required=True, select=1,
+                        help='Model of the followed resource'),
+        'res_id': fields.integer('Related Document ID', select=1,
+                        help='Id of the followed resource'),
+        'partner_ids': fields.many2many('res.partner', string='Partners'),
+        'message': fields.html('Message'),
+    }
+
+    def onchange_partner_ids(self, cr, uid, ids, value, context=None):
+        """ onchange_partner_ids (value format: [[6, 0, [3, 4]]]). The
+            basic purpose of this method is to check that destination partners
+            effectively have email addresses. Otherwise a warning is thrown.
+        """
+        res = {'value': {}}
+        if not value or not value[0] or not value[0][0] == 6:
+            return
+        res.update(self.pool.get('mail.message').check_partners_email(cr, uid, value[0][2], context=context))
+        return res
+
+    def add_followers(self, cr, uid, ids, context=None):
+        for wizard in self.browse(cr, uid, ids, context=context):
+            model_obj = self.pool.get(wizard.res_model)
+            document = model_obj.browse(cr, uid, wizard.res_id, context=context)
+
+            # filter partner_ids to get the new followers, to avoid sending email to already following partners
+            new_follower_ids = [p.id for p in wizard.partner_ids if p.id not in document.message_follower_ids]
+            model_obj.message_subscribe(cr, uid, [wizard.res_id], new_follower_ids, context=context)
+
+            # send an email
+            if wizard.message:
+                for follower_id in new_follower_ids:
+                    mail_mail = self.pool.get('mail.mail')
+                    mail_id = mail_mail.create(cr, uid, {
+                        'subject': 'Invitation to follow %s' % document.name_get()[0][1],
+                        'body_html': '%s' % wizard.message,
+                        'auto_delete': True,
+                        }, context=context)
+                    mail_mail.send(cr, uid, [mail_id], recipient_ids=[follower_id], context=context)
+        return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/mail/wizard/invite_view.xml b/addons/mail/wizard/invite_view.xml
new file mode 100644
index 00000000000..b932f96dfe7
--- /dev/null
+++ b/addons/mail/wizard/invite_view.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- wizard view -->
+        <record model="ir.ui.view" id="mail_wizard_invite_form">
+            <field name="name">Add Followers</field>
+            <field name="model">mail.wizard.invite</field>
+            <field name="arch" type="xml">
+                <form string="Add Followers" version="7.0">
+                    <group>
+                        <field name="res_model" invisible="1"/>
+                        <field name="res_id" invisible="1"/>
+                        <field name="partner_ids" widget="many2many_tags"
+                            on_change="onchange_partner_ids(partner_ids)" />
+                        <field name="message"/>
+                    </group>
+                    <footer>
+                        <button string="Add Followers"
+                            name="add_followers" type="object" class="oe_highlight"  />
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />    
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index fe87b7584e0..c409d4ab076 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -19,417 +19,260 @@
 #
 ##############################################################################
 
-import ast
+import base64
 import re
-
 import tools
+
 from osv import osv
 from osv import fields
 from tools.safe_eval import safe_eval as eval
 from tools.translate import _
 
-from ..mail_message import to_email
-
 # main mako-like expression pattern
 EXPRESSION_PATTERN = re.compile('(\$\{.+?\})')
 
+
 class mail_compose_message(osv.TransientModel):
-    """Generic Email composition wizard. This wizard is meant to be inherited
-       at model and view level to provide specific wizard features.
+    """ Generic message composition wizard. You may inherit from this wizard
+        at model and view levels to provide specific features.
 
-       The behavior of the wizard can be modified through the use of context
-       parameters, among which are:
-
-         * mail.compose.message.mode: if set to 'reply', the wizard is in 
-            reply to a previous message mode and pre-populated with the original
-            quote. If set to 'comment', it means you are writing a new message to
-            be attached to a document. If set to 'mass_mail', the wizard is in
-            mass mailing where the mail details can contain template placeholders
-            that will be merged with actual data before being sent to each
-            recipient.
-         * active_model: model name of the document to which the mail being
-                        composed is related
-         * active_id: id of the document to which the mail being composed is
-                      related, or id of the message to which user is replying,
-                      in case ``mail.compose.message.mode == 'reply'``
-         * active_ids: ids of the documents to which the mail being composed is
-                      related, in case ``mail.compose.message.mode == 'mass_mail'``.
+        The behavior of the wizard depends on the composition_mode field:
+        - 'reply': reply to a previous message. The wizard is pre-populated
+            via ``get_message_data``.
+        - 'comment': new post on a record. The wizard is pre-populated via
+            ``get_record_data``
+        - 'mass_mail': wizard in mass mailing mode where the mail details can
+            contain template placeholders that will be merged with actual data
+            before being sent to each recipient.
     """
     _name = 'mail.compose.message'
-    _inherit = 'mail.message.common'
+    _inherit = 'mail.message'
     _description = 'Email composition wizard'
+    _log_access = True
 
     def default_get(self, cr, uid, fields, context=None):
-        """ Overridden to provide specific defaults depending on the context
-            parameters.
-
-            Composition mode
-            - comment: default mode; active_model, active_id = model and ID of a
-            document we are commenting,
-            - reply: active_id = ID of a mail.message to which we are replying.
-            From this message we can find the related model and res_id,
-            - mass_mailing mode: active_model, active_id  = model and ID of a
-            document we are commenting,
-
-           :param dict context: several context values will modify the behavior
-                                of the wizard, cfr. the class description.
+        """ Handle composition mode. Some details about context keys:
+            - comment: default mode, model and ID of a record the user comments
+                - default_model or active_model
+                - default_res_id or active_id
+            - reply: active_id of a message the user replies to
+                - default_parent_id or message_id or active_id: ID of the
+                    mail.message we reply to
+                - message.res_model or default_model
+                - message.res_id or default_res_id
+            - mass_mail: model and IDs of records the user mass-mails
+                - active_ids: record IDs
+                - default_model or active_model
         """
         if context is None:
             context = {}
-        compose_mode = context.get('mail.compose.message.mode', 'comment')
-        active_model = context.get('active_model')
-        active_id = context.get('active_id')
         result = super(mail_compose_message, self).default_get(cr, uid, fields, context=context)
 
+        # get some important values from context
+        composition_mode = context.get('default_composition_mode', context.get('mail.compose.message.mode'))
+        model = context.get('default_model', context.get('active_model'))
+        res_id = context.get('default_res_id', context.get('active_id'))
+        message_id = context.get('default_parent_id', context.get('message_id', context.get('active_id')))
+        active_ids = context.get('active_ids')
+
         # get default values according to the composition mode
-        vals = {}
-        if compose_mode in ['reply']:
-            vals = self.get_message_data(cr, uid, int(context['active_id']), context=context)
-        elif compose_mode in ['comment', 'mass_mail'] and active_model and active_id:
-            vals = self.get_value(cr, uid, active_model, active_id, context)
+        if composition_mode == 'reply':
+            vals = self.get_message_data(cr, uid, message_id, context=context)
+        elif composition_mode == 'comment' and model and res_id:
+            vals = self.get_record_data(cr, uid, model, res_id, context=context)
+        elif composition_mode == 'mass_mail' and model and active_ids:
+            vals = {'model': model, 'res_id': res_id,  'content_subtype': 'html'}
+        else:
+            vals = {'model': model, 'res_id': res_id}
+        if composition_mode:
+            vals['composition_mode'] = composition_mode
+
         for field in vals:
             if field in fields:
                 result[field] = vals[field]
-
-        # link to model and record if not done yet
-        if not result.get('model') and active_model:
-            result['model'] = active_model
-        if not result.get('res_id') and active_id:
-            result['res_id'] = active_id
-
-        # Try to provide default email_from if not specified yet
-        if not result.get('email_from'):
-            current_user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            result['email_from'] = current_user.email or False
         return result
 
+    def _get_composition_mode_selection(self, cr, uid, context=None):
+        return [('comment', 'Comment a document'), ('reply', 'Reply to a message'), ('mass_mail', 'Mass mailing')]
+
     _columns = {
-        'dest_partner_ids': fields.many2many('res.partner',
-            'email_message_send_partner_rel',
-            'wizard_id', 'partner_id', 'Destination partners',
-            help="When sending emails through the social network composition wizard"\
-                 "you may choose to send a copy of the mail to partners."),
-        'attachment_ids': fields.many2many('ir.attachment','email_message_send_attachment_rel', 'wizard_id', 'attachment_id', 'Attachments'),
-        'auto_delete': fields.boolean('Auto Delete', help="Permanently delete emails after sending"),
+        'composition_mode': fields.selection(
+            lambda s, *a, **k: s._get_composition_mode_selection(*a, **k),
+            string='Composition mode'),
+        'partner_ids': fields.many2many('res.partner',
+            'mail_compose_message_res_partner_rel',
+            'wizard_id', 'partner_id', 'Additional contacts'),
+        'attachment_ids': fields.many2many('ir.attachment',
+            'mail_compose_message_ir_attachments_rel',
+            'wizard_id', 'attachment_id', 'Attachments'),
         'filter_id': fields.many2one('ir.filters', 'Filters'),
+        'body_text': fields.text('Plain-text Contents'),
+        'content_subtype': fields.char('Message content subtype', size=32, readonly=1,
+            help="Type of message, usually 'html' or 'plain', used to select "\
+                  "plain-text or rich-text contents accordingly"),
     }
 
-    def get_value(self, cr, uid, model, res_id, context=None):
+    _defaults = {
+        'composition_mode': 'comment',
+        'content_subtype': lambda self, cr, uid, ctx={}: 'html',
+        'body_text': lambda self, cr, uid, ctx={}: False,
+        'body': lambda self, cr, uid, ctx={}: '',
+        'subject': lambda self, cr, uid, ctx={}: False,
+        'partner_ids': lambda self, cr, uid, ctx={}: [],
+    }
+
+    def _notify(self, cr, uid, newid, context=None):
+        """ Override specific notify method of mail.message, because we do
+            not want that feature in the wizard. """
+        return
+
+    def get_record_data(self, cr, uid, model, res_id, context=None):
         """ Returns a defaults-like dict with initial values for the composition
             wizard when sending an email related to the document record
             identified by ``model`` and ``res_id``.
 
-            The default implementation returns an empty dictionary, and is meant
-            to be overridden by subclasses.
-
             :param str model: model name of the document record this mail is
                 related to.
-            :param int res_id: id of the document record this mail is related to.
-            :param dict context: several context values will modify the behavior
-                of the wizard, cfr. the class description.
+            :param int res_id: id of the document record this mail is related to
         """
-        result = {}
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-        result.update({
-            'model': model,
-            'res_id': res_id,
-            'email_from': user.email or tools.config.get('email_from', False),
-            'body_html': False,
-            'body_text': False,
-            'subject': False,
-            'dest_partner_ids': [],
-        })
-        return result
-
-    def onchange_email_mode(self, cr, uid, ids, value, model, res_id, context=None):
-        """ email_mode (values: True or False). This onchange on the email mode
-            allows to have some specific behavior when going in email mode, or
-            when going out of email mode.
-            Basically, dest_partner_ids is reset when going out of email
-            mode.
-            This method can be overridden for models that want to have their
-            specific behavior.
-            Note that currently, this onchange is used in mail.js and called
-            manually on the form instantiated in the Chatter.
-        """
-        if not value:
-            return {'value': {'dest_partner_ids': []}}
-        return {'value': {}}
-
-    def onchange_formatting(self, cr, uid, ids, value, model, res_id, context=None):
-        """ onchange_formatting (values: True or False). This onchange on the
-            formatting allows to have some specific behavior when going in 
-            formatting mode, or when going out of formatting.
-            Basically, subject is reset when going out of formatting mode.
-            This method can be overridden for models that want to have their
-            specific behavior.
-            Note that currently, this onchange is used in mail.js and called
-            manually on the form instantiated in the Chatter.
-        """
-        if not value:
-            return {'value': {'subject': False}}
-        return {'value': {}}
+        doc_name_get = self.pool.get(model).name_get(cr, uid, [res_id], context=context)
+        if doc_name_get:
+            record_name = doc_name_get[0][1]
+        else:
+            record_name = False
+        return {'model': model, 'res_id': res_id, 'record_name': record_name}
 
     def get_message_data(self, cr, uid, message_id, context=None):
         """ Returns a defaults-like dict with initial values for the composition
             wizard when replying to the given message (e.g. including the quote
-            of the initial message, and the correct recipient). It should not be
-            called unless ``context['mail.compose.message.mode'] == 'reply'``.
+            of the initial message, and the correct recipients).
 
             :param int message_id: id of the mail.message to which the user
                 is replying.
-            :param dict context: several context values will modify the behavior
-                of the wizard, cfr. the class description.
         """
+        if not message_id:
+            return {}
         if context is None:
             context = {}
-        result = {}
-        if not message_id:
-            return result
+        message_data = self.pool.get('mail.message').browse(cr, uid, message_id, context=context)
 
-        current_user = self.pool.get('res.users').browse(cr, uid, uid, context)
-        message_data = self.pool.get('mail.message').browse(cr, uid, message_id, context)
-        # Form the subject
-        re_prefix = _("Re:")
+        # create subject
+        re_prefix = _('Re:')
         reply_subject = tools.ustr(message_data.subject or '')
-        if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)):
+        if not (reply_subject.startswith('Re:') or reply_subject.startswith(re_prefix)) and message_data.subject:
             reply_subject = "%s %s" % (re_prefix, reply_subject)
-        # Form the bodies (text and html). We use the plain text version of the
-        # original mail, by default, as it is easier to quote than the HTML
-        # version. TODO: make it possible to switch to HTML on the fly
-        sent_date = _('On %(date)s, ') % {'date': message_data.date} if message_data.date else ''
-        sender = _('%(sender_name)s wrote:') % {'sender_name': tools.ustr(message_data.email_from or _('You'))}
-        body_text = message_data.body_text or ''
-        body_html = message_data.body_html or ''
-        quoted_body_text = '> %s' % tools.ustr(body_text.replace('\n', "\n> ") or '')
-        quoted_body_html = '<blockquote>%s</blockquote>' % (tools.ustr(body_html)),
-        reply_body_text = '\n%s%s\n%s\n%s' % (sent_date, sender, quoted_body_text, current_user.signature)
-        reply_body_html = '<br /><br />%s%s<br />%s<br />%s' % (sent_date, sender, quoted_body_html, current_user.signature)
-        # form dest_partner_ids
-        dest_partner_ids = [partner.id for partner in message_data.partner_ids]
-        # Update header and references
-        reply_headers = {}
-        reply_references = message_data.references and tools.ustr(message_data.references) or False
-        reply_message_id = message_data.message_id or False
-        if reply_message_id:
-            reply_references = (reply_references or '') + " " + message_data.message_id
-            reply_headers['In-Reply-To'] = message_data.message_id
+        # get partner_ids from original message
+        partner_ids = [partner.id for partner in message_data.partner_ids] if message_data.partner_ids else []
+
         # update the result
-        result.update({
-            'body_text': reply_body_text,
-            'body_html': reply_body_html,
+        result = {
+            'record_name': message_data.record_name,
+            'model': message_data.model,
+            'res_id': message_data.res_id,
+            'parent_id': message_data.id,
             'subject': reply_subject,
-            'attachment_ids': [],
-            'dest_partner_ids': dest_partner_ids,
-            'model': message_data.model or False,
-            'res_id': message_data.res_id or False,
-            'email_from': current_user.email or message_data.email_to or False,
-            'email_to': message_data.reply_to or message_data.email_from or False,
-            'email_cc': message_data.email_cc or False,
-            'user_id': uid,
-            # pass msg-id and references of mail we're replying to, to construct the
-            # new ones later when sending
-            'message_id': reply_message_id,
-            'references': reply_references,
-            'headers': reply_headers,
-        })
+            'partner_ids': partner_ids,
+            'content_subtype': 'html',
+        }
         return result
 
-    def send_mail(self, cr, uid, ids, context=None):
-        '''Process the wizard contents and proceed with sending the corresponding
-           email(s), rendering any template patterns on the fly if needed.
-           If the wizard is in mass-mail mode (context['mail.compose.message.mode'] is
-           set to ``'mass_mail'``), the resulting email(s) are scheduled for being
-           sent the next time the mail.message scheduler runs, or the next time
-           ``mail.message.process_email_queue`` is called.
-           Otherwise the new message is sent immediately.
+    def toggle_content_subtype(self, cr, uid, ids, context=None):
+        """ toggle content_subtype: calls onchange_formatting to emulate an
+            on_change, then writes the value to update the form. """
+        for record in self.browse(cr, uid, ids, context=context):
+            content_st_new_value = 'plain' if record.content_subtype == 'html' else 'html'
+            onchange_res = self.onchange_content_subtype(cr, uid, ids, content_st_new_value, record.model, record.res_id, context=context)
+            self.write(cr, uid, [record.id], onchange_res['value'], context=context)
+        return True
 
-           :param dict context: several context values will modify the behavior
-                                of the wizard, cfr. the class description.
-        '''
+    def onchange_content_subtype(self, cr, uid, ids, value, model, res_id, context=None):
+        """ This onchange allows to have some specific behavior when switching
+            between text or html mode. This method can be overridden.
+            :param values: 'plain' or 'html'
+        """
+        return {'value': {'content_subtype': value}}
+
+    def dummy(self, cr, uid, ids, context=None):
+        """ TDE: defined to have buttons that do basically nothing. It is
+            currently impossible to have buttons that do nothing special
+            in views (if type not specified, considered as 'object'). """
+        return True
+
+    #------------------------------------------------------
+    # Wizard validation and send
+    #------------------------------------------------------
+
+    def send_mail(self, cr, uid, ids, context=None):
+        """ Process the wizard content and proceed with sending the related
+            email(s), rendering any template patterns on the fly if needed. """
         if context is None:
             context = {}
-        # composition wizard options
-        email_mode = context.get('email_mode')
-        formatting = context.get('formatting')
-        mass_mail_mode = context.get('mail.compose.message.mode') == 'mass_mail'
+        active_ids = context.get('active_ids')
 
-        mail_message_obj = self.pool.get('mail.message')
-        for mail_wiz in self.browse(cr, uid, ids, context=context):
-            # attachments
-            attachment = {}
-            for attach in mail_wiz.attachment_ids:
-                attachment[attach.datas_fname] = attach.datas and attach.datas.decode('base64')
+        for wizard in self.browse(cr, uid, ids, context=context):
+            mass_mail_mode = wizard.composition_mode == 'mass_mail'
+            active_model_pool = self.pool.get(wizard.model if wizard.model else 'mail.thread')
 
-            # default values, according to the wizard options
-            subject = mail_wiz.subject if formatting else False
-            content_subtype = 'html' if formatting else 'plain'
-            type = 'email' if email_mode else 'comment'
-            state = 'outgoing' if email_mode else False
-            partner_ids = [partner.id for partner in mail_wiz.dest_partner_ids]
-            references = None
-            headers = {}
-            body = mail_wiz.body_html if content_subtype == 'html' else mail_wiz.body_text
+            # wizard works in batch mode: [res_id] or active_ids
+            res_ids = active_ids if mass_mail_mode and wizard.model and active_ids else [wizard.res_id]
+            for res_id in res_ids:
+                # default values, according to the wizard options
+                post_values = {
+                    'subject': wizard.subject if wizard.content_subtype == 'html' else False,
+                    'body': wizard.body if wizard.content_subtype == 'html' else '<pre>%s</pre>' % tools.ustr(wizard.body_text),
+                    'parent_id': wizard.parent_id and wizard.parent_id.id,
+                    'partner_ids': [(4, partner.id) for partner in wizard.partner_ids],
+                    'attachments': [(attach.datas_fname or attach.name, base64.b64decode(attach.datas)) for attach in wizard.attachment_ids],
+                }
+                # mass mailing: render and override default values
+                if mass_mail_mode and wizard.model:
+                    email_dict = self.render_message(cr, uid, wizard, res_id, context=context)
+                    new_partner_ids = email_dict.pop('partner_ids', [])
+                    post_values['partner_ids'] += [(4, partner_id) for partner_id in new_partner_ids]
+                    new_attachments = email_dict.pop('attachments', [])
+                    post_values['attachments'] += new_attachments
+                    post_values.update(email_dict)
+                # post the message
+                active_model_pool.message_post(cr, uid, [res_id], type='comment', subtype='mt_comment', context=context, **post_values)
 
-            # get model, active_ids, and check if model is openchatter-enabled
-            if mass_mail_mode and context.get('active_ids') and context.get('active_model'):
-                active_ids = context['active_ids']
-                active_model = context['active_model']
-            elif mass_mail_mode:
-                active_model = mail_wiz.model
-                active_model_pool = self.pool.get(active_model)
-                active_ids = active_model_pool.search(cr, uid, ast.literal_eval(mail_wiz.filter_id.domain), context=ast.literal_eval(mail_wiz.filter_id.context))
-            else:
-                active_model = mail_wiz.model
-                active_ids = [mail_wiz.res_id]
-            active_model_pool = self.pool.get(active_model)
-            mail_thread_enabled = hasattr(active_model_pool, 'message_append')
-
-            if context.get('mail.compose.message.mode') == 'mass_mail':
-                # Mass mailing: must render the template patterns
-                for active_id in active_ids:
-                    rendered_subject = self.render_template(cr, uid, subject, active_model, active_id)
-                    rendered_body_html = self.render_template(cr, uid, mail_wiz.body_html, active_model, active_id)
-                    rendered_body_text = self.render_template(cr, uid, mail_wiz.body_text, active_model, active_id)
-                    email_from = self.render_template(cr, uid, mail_wiz.email_from, active_model, active_id)
-                    email_to = self.render_template(cr, uid, mail_wiz.email_to, active_model, active_id)
-                    email_cc = self.render_template(cr, uid, mail_wiz.email_cc, active_model, active_id)
-                    email_bcc = self.render_template(cr, uid, mail_wiz.email_bcc, active_model, active_id)
-                    reply_to = self.render_template(cr, uid, mail_wiz.reply_to, active_model, active_id)
-
-                    # in mass-mailing mode we only schedule the mail for sending, it will be 
-                    # processed as soon as the mail scheduler runs.
-                    if mail_thread_enabled:
-                        active_model_pool.message_append(cr, uid, [active_id], rendered_subject, rendered_body_text, rendered_body_html,
-                            type=type, content_subtype=content_subtype, state=state, partner_ids=partner_ids,
-                            email_from=email_from, email_to=email_to, email_cc=email_cc, email_bcc=email_bcc,
-                            reply_to=reply_to, references=references, attachments=attachment, headers=headers, context=context)
-                    else:
-                        mail_message_obj.schedule_with_attach(cr, uid, email_from, to_email(email_to), subject, rendered_body_text,
-                            model=mail_wiz.model, email_cc=to_email(email_cc), email_bcc=to_email(email_bcc), reply_to=reply_to,
-                            attachments=attachment, references=references, res_id=active_id, partner_ids=partner_ids,
-                            content_subtype=mail_wiz.content_subtype, headers=headers, context=context)
-            else:
-                # normal mode - no mass-mailing
-                if mail_thread_enabled:
-                    msg_ids = active_model_pool.message_append(cr, uid, active_ids, subject, mail_wiz.body_text, mail_wiz.body_html,
-                        type=type, content_subtype=content_subtype, state=state, partner_ids=partner_ids,
-                        email_from=mail_wiz.email_from, email_to=mail_wiz.email_to, email_cc=mail_wiz.email_cc, email_bcc=mail_wiz.email_bcc,
-                        reply_to=mail_wiz.reply_to, references=references, attachments=attachment, headers=headers, context=context)
-                else:
-                    msg_ids = [mail_message_obj.schedule_with_attach(cr, uid, mail_wiz.email_from, to_email(mail_wiz.email_to), subject, mail_wiz.body_text,
-                        type=type, model=mail_wiz.model, email_cc=to_email(mail_wiz.email_cc), email_bcc=to_email(mail_wiz.email_bcc), reply_to=mail_wiz.reply_to,
-                        attachments=attachment, references=references, res_id=int(mail_wiz.res_id), partner_ids=partner_ids,
-                        content_subtype=mail_wiz.content_subtype, headers=headers, context=context)]
-                # in normal mode, we send the email immediately, as the user expects us to (delay should be sufficiently small)
-                if type == 'email':
-                    mail_message_obj.send(cr, uid, msg_ids, context=context)
+            # post process: update attachments, because id is not necessarily known when adding attachments in Chatter
+            # self.pool.get('ir.attachment').write(cr, uid, [attach.id for attach in wizard.attachment_ids], {
+            #     'res_id': wizard.id, 'res_model': wizard.model or False}, context=context)
 
         return {'type': 'ir.actions.act_window_close'}
 
+    def render_message(self, cr, uid, wizard, res_id, context=None):
+        """ Generate an email from the template for given (wizard.model, res_id)
+            pair. This method is meant to be inherited by email_template that
+            will produce a more complete dictionary. """
+        return {
+            'subject': self.render_template(cr, uid, wizard.subject, wizard.model, res_id, context),
+            'body': self.render_template(cr, uid, wizard.body, wizard.model, res_id, context),
+        }
+
     def render_template(self, cr, uid, template, model, res_id, context=None):
-        """Render the given template text, replace mako-like expressions ``${expr}``
-           with the result of evaluating these expressions with an evaluation context
-           containing:
+        """ Render the given template text, replace mako-like expressions ``${expr}``
+            with the result of evaluating these expressions with an evaluation context
+            containing:
 
                 * ``user``: browse_record of the current user
                 * ``object``: browse_record of the document record this mail is
                               related to
                 * ``context``: the context passed to the mail composition wizard
 
-           :param str template: the template text to render
-           :param str model: model name of the document record this mail is related to.
-           :param int res_id: id of the document record this mail is related to.
+            :param str template: the template text to render
+            :param str model: model name of the document record this mail is related to.
+            :param int res_id: id of the document record this mail is related to.
         """
         if context is None:
             context = {}
+
         def merge(match):
             exp = str(match.group()[2:-1]).strip()
-            result = eval(exp,
-                          {
-                            'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context),
-                            'object' : self.pool.get(model).browse(cr, uid, res_id, context=context),
-                            'context': dict(context), # copy context to prevent side-effects of eval
-                          })
-            if result in (None, False):
-                return ""
-            return tools.ustr(result)
+            result = eval(exp, {
+                'user': self.pool.get('res.users').browse(cr, uid, uid, context=context),
+                'object': self.pool.get(model).browse(cr, uid, res_id, context=context),
+                'context': dict(context), # copy context to prevent side-effects of eval
+                })
+            return result and tools.ustr(result) or ''
         return template and EXPRESSION_PATTERN.sub(merge, template)
-
-
-class mail_compose_message_extended(osv.TransientModel):
-    """ Extension of 'mail.compose.message' to support default field values related
-        to CRM-like models that follow the following conventions:
-
-        1. The model object must have an attribute '_mail_compose_message' equal to True.
-
-        2. The model should define the following fields:
-            - 'name' as subject of the message (required);
-            - 'email_from' as destination email address (required);
-            - 'email_cc' as cc email addresses (required);
-            - 'section_id.reply_to' as reply-to address (optional).
-    """
-    _inherit = 'mail.compose.message'
-
-    def get_value(self, cr, uid, model, res_id, context=None):
-        """ Overrides the default implementation to provide more default field values
-            related to the corresponding CRM case.
-        """
-        result = super(mail_compose_message_extended, self).get_value(cr, uid, model, res_id, context=context)
-        model_obj = self.pool.get(model)
-        if getattr(model_obj, '_mail_compose_message', False) and res_id:
-            data = model_obj.browse(cr, uid , res_id, context)
-            result.update({
-                'email_to': data.email_from or False,
-                'email_cc': tools.ustr(data.email_cc or ''),
-                'subject': data.name or False,
-            })
-            if hasattr(data, 'section_id'):
-                result['reply_to'] = data.section_id and data.section_id.reply_to or False
-        return result
-
-    def onchange_email_mode(self, cr, uid, ids, value, model, res_id, context=None):
-        """ Overrides the default implementation to provide default values for
-            dest_partner_ids. This method checks that a partner maching the
-            ``email_from`` of the record exists. It it does not exist, it
-            creates a new partner. The found or created partner is then added
-            in dest_partner_ids.
-            Partner check/creation valid inly if the value is True, and if 
-            the model has the ``_mail_compose_message`` attribute.
-        """
-        result = super(mail_compose_message_extended, self).onchange_email_mode(cr, uid, ids, value, model, res_id, context=context)
-        model_obj = self.pool.get(model)
-        if not value or not (getattr(model_obj, '_mail_compose_message', False) and res_id):
-            return result
-        data = model_obj.browse(cr, uid , res_id, context=context)
-        partner_obj = self.pool.get('res.partner')
-        partner_ids = partner_obj.search(cr, uid, [('email', '=', data.email_from)], context=context)
-        if partner_ids:
-            partner_id = partner_ids[0]
-        else:
-            partner_id = partner_obj.name_create(cr, uid, data.email_from, context=context)[0]
-        result['value'].update({
-            'dest_partner_ids': [partner_id],
-            'email_cc': tools.ustr(data.email_cc or ''),
-        })
-        if hasattr(data, 'section_id'):
-            result['value']['reply_to'] = data.section_id and data.section_id.reply_to or False
-        return result
-
-    def onchange_formatting(self, cr, uid, ids, value, model, res_id, context=None):
-        """ Overrides the default implementation to provide default values for
-            the subject.
-            Subject re-creation valid only if the value is True, and if the
-            model has the ``_mail_compose_message`` attribute.
-        """
-        result = super(mail_compose_message_extended, self).onchange_formatting(cr, uid, ids, value, model, res_id, context=context)
-        model_obj = self.pool.get(model)
-        if not value or not (getattr(model_obj, '_mail_compose_message', False) and res_id):
-            return result
-        data = model_obj.browse(cr, uid , res_id, context=context)
-        result['value'].update({
-            'subject': data.name or False,
-        })
-        return result
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 73fb03cdc28..01ceb770f49 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -7,28 +7,31 @@
             <field name="arch" type="xml">
                 <form string="Compose Email" version="7.0">
                     <group>
+                        <!-- truly invisible fields for control and options -->
+                        <field name="composition_mode" invisible="1"/>
                         <field name="model" invisible="1"/>
                         <field name="res_id" invisible="1"/>
-                        <field name='filter_id' invisible="context.get('active_model',False)"/>
-                        <field name="email_from" required="1"/>
-                        <field name="email_to" required="1"/>
-                        <field name="email_cc"/>
-                        <field name="email_bcc"/>
-                        <field name="reply_to"/>
-                        <field name="subject" widget="char" size="512"/>
-                        <field name="references"/>
-                        <field name="message_id"/>
+                        <field name="parent_id" invisible="1"/>
+                        <field name="content_subtype" invisible="1"/>
+                        <!-- visible wizard -->
+                        <label for="partner_ids" string="Recipients"/>
+                        <div>
+                            <span attrs="{'invisible':[('model', '=', False)]}">
+                                Followers of
+                                <field name="record_name" readonly="1" class="oe_inline"
+                                    attrs="{'invisible':[('model', '=', False)]}"/>
+                                and 
+                            </span>
+                            <field name="partner_ids" widget="many2many_tags_email" placeholder="Add contacts to notify..."
+                                context="{'force_email':True}" required="1"/>
+                        </div>
+                        <field name="subject" placeholder="Subject..."
+                            attrs="{'invisible':[('content_subtype', '=', 'plain')]}"/>
                     </group>
-                    <notebook colspan="4">
-                        <page string="Body">
-                            <field name="body_text" colspan="4" nolabel="1" height="300" width="300"/>
-                        </page>
-                        <page string="Attachments">
-                            <field name="attachment_ids" colspan="4" nolabel="1"/>
-                        </page>
-                    </notebook>
+                    <field name="body"/>
+                    <field name="attachment_ids" widget="many2many_binary"/>
                     <footer>
-                        <button name="send_mail" string="Send" type="object" class="oe_highlight"  />
+                        <button string="Send" name="send_mail" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>
@@ -36,49 +39,6 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="email_compose_message_wizard_form_chatter">
-            <field name="name">mail.compose.message.form</field>
-            <field name="model">mail.compose.message</field>
-            <field name="priority">18</field>
-            <field name="arch" type="xml">
-                <form string="Compose Email" version="7.0" >
-                    <group>
-                        <field name="subject" colspan="2" nolabel="1" placeholder="Subject..."
-                                class="oe_mail_compose_message_subject oe_mail_compose_message_invisible"/>
-                        <field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
-                                class="oe_mail_compose_message_body_text"/>
-                        <field name="body_html" colspan="2" nolabel="1" placeholder="What are you working on HTML ?"
-                                class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible"/>
-                        <field name="dest_partner_ids" colspan="2" nolabel="1" widget="many2many_tags"
-                                placeholder="Add contacts to notify..."
-                                class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
-                        <div>
-                            <button name="send_mail" string="Post" type="object"
-                                class="oe_mail_compose_message_button_send"/>
-                            or <a href="#" class="oe_mail_compose_message_email">Send an Email</a>
-                        </div>
-                        <div class='oe_mail_compose_message_icons'>
-<!--                             <button icon="../../../../../mail/static/src/img/checklist"
-                                type="object" name="checklist" string=""
-                                help="Add a checklist"/> -->
-                            <a href="#" class="oe_mail_compose_message_checklist">
-                                <img src='/mail/static/src/img/checklist.png/' alt='Checklist'
-                                    title='Add a checklist'/>
-                            </a>
-                            <a href="#" class="oe_mail_compose_message_attachment">
-                                <img src='/mail/static/src/img/attachment.png/' alt='Attachment'
-                                    title='Add an attachment'/>
-                            </a>
-                            <a href="#" class="oe_mail_compose_message_formatting">
-                                <img src='/mail/static/src/img/formatting.png/' alt='Formatting'
-                                    title='Switch to advanced formatting mode'/>
-                            </a>
-                        </div>
-                    </group>
-                </form>
-            </field>
-        </record>
-
         <record id="action_email_compose_message_wizard" model="ir.actions.act_window">
             <field name="name">Compose Email</field>
             <field name="res_model">mail.compose.message</field>
@@ -94,9 +54,10 @@
                 res_model="mail.compose.message"
                 src_model="res.partner"
                 view_mode="form"
+                multi="True"
                 target="new"
                 key2="client_action_multi"
                 id="base.action_partner_mass_mail"
-                context="{'mail.compose.message.mode':'mass_mail'}"/>
+                context="{'default_composition_mode': 'mass_mail'}"/>
     </data>
 </openerp>
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index 81751891e66..0c77fe59a86 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -21,29 +21,27 @@
 
 
 {
-    "name" : "Marketing",
-    "version" : "1.1",
-    "depends" : ["base", "base_setup"],
-    "author" : "OpenERP SA",
-    "category": 'Hidden/Dependency',
-    "description": """
+    'name': 'Marketing',
+    'version': '1.1',
+    'depends': ['base', 'base_setup'],
+    'author': 'OpenERP SA',
+    'category': 'Hidden/Dependency',
+    'description': """
 Menu for Marketing.
 ===================
 
 Contains the installer for marketing-related modules.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/marketing_security.xml',
         'security/ir.model.access.csv',
         'marketing_view.xml',
         'res_config_view.xml',
     ],
-    'demo_xml': ['marketing_demo.xml'],
+    'demo': ['marketing_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00598574977629228189',
     'images': ['images/config_marketing.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing/i18n/ar.po b/addons/marketing/i18n/ar.po
index 6f0c17676c7..d9ac11e363b 100644
--- a/addons/marketing/i18n/ar.po
+++ b/addons/marketing/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/bg.po b/addons/marketing/i18n/bg.po
index 79454f40dba..1369e37c374 100644
--- a/addons/marketing/i18n/bg.po
+++ b/addons/marketing/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/ca.po b/addons/marketing/i18n/ca.po
index 6bf75b0628e..b0f81cffba1 100644
--- a/addons/marketing/i18n/ca.po
+++ b/addons/marketing/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/cs.po b/addons/marketing/i18n/cs.po
index e74a70b8d4d..9d1493cd19a 100644
--- a/addons/marketing/i18n/cs.po
+++ b/addons/marketing/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/da.po b/addons/marketing/i18n/da.po
index bd99eda5e90..730a49dbebc 100644
--- a/addons/marketing/i18n/da.po
+++ b/addons/marketing/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/de.po b/addons/marketing/i18n/de.po
index cc74e0fabb9..b81b1c20b23 100644
--- a/addons/marketing/i18n/de.po
+++ b/addons/marketing/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/el.po b/addons/marketing/i18n/el.po
index 5ff21d2031f..71eed76727b 100644
--- a/addons/marketing/i18n/el.po
+++ b/addons/marketing/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/es.po b/addons/marketing/i18n/es.po
index 0077d3488cd..7d523ce6acf 100644
--- a/addons/marketing/i18n/es.po
+++ b/addons/marketing/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/es_CR.po b/addons/marketing/i18n/es_CR.po
index 1ec4c8e8af0..9cf96a584f6 100644
--- a/addons/marketing/i18n/es_CR.po
+++ b/addons/marketing/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: marketing
diff --git a/addons/marketing/i18n/fi.po b/addons/marketing/i18n/fi.po
index 746462145a6..ff8cd657deb 100644
--- a/addons/marketing/i18n/fi.po
+++ b/addons/marketing/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/fr.po b/addons/marketing/i18n/fr.po
index 7b055c7f0bc..ba5451f8cb4 100644
--- a/addons/marketing/i18n/fr.po
+++ b/addons/marketing/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/gl.po b/addons/marketing/i18n/gl.po
index c310756d0b8..7a0a00abc06 100644
--- a/addons/marketing/i18n/gl.po
+++ b/addons/marketing/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/hr.po b/addons/marketing/i18n/hr.po
index d6ee4328e74..9e3a443acc5 100644
--- a/addons/marketing/i18n/hr.po
+++ b/addons/marketing/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/hu.po b/addons/marketing/i18n/hu.po
index ce4f5dcb5ce..83cc98b1241 100644
--- a/addons/marketing/i18n/hu.po
+++ b/addons/marketing/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/id.po b/addons/marketing/i18n/id.po
index 87fc4cee4e3..debad8d5258 100644
--- a/addons/marketing/i18n/id.po
+++ b/addons/marketing/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/it.po b/addons/marketing/i18n/it.po
index b1b7e74ab44..0cf0c8f0046 100644
--- a/addons/marketing/i18n/it.po
+++ b/addons/marketing/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/ja.po b/addons/marketing/i18n/ja.po
index 761e4e54340..23facca661e 100644
--- a/addons/marketing/i18n/ja.po
+++ b/addons/marketing/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/crm_caldav/i18n/lt.po b/addons/marketing/i18n/lt.po
similarity index 52%
rename from addons/crm_caldav/i18n/lt.po
rename to addons/marketing/i18n/lt.po
index 70e99338be7..70b6c1645b3 100644
--- a/addons/crm_caldav/i18n/lt.po
+++ b/addons/marketing/i18n/lt.po
@@ -8,26 +8,21 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-07 19:23+0000\n"
+"PO-Revision-Date: 2012-11-15 13:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Lithuanian <lt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-11-16 04:36+0000\n"
+"X-Generator: Launchpad (build 16272)\n"
 
-#. module: crm_caldav
-#: model:ir.actions.act_window,name:crm_caldav.action_caldav_browse
-msgid "Caldav Browse"
-msgstr "Naršyti Caldav"
+#. module: marketing
+#: model:res.groups,name:marketing.group_marketing_manager
+msgid "Manager"
+msgstr ""
 
-#. module: crm_caldav
-#: model:ir.ui.menu,name:crm_caldav.menu_caldav_browse
-msgid "Synchronize This Calendar"
-msgstr "Sinchronizuoti šį kalendorių"
-
-#. module: crm_caldav
-#: model:ir.model,name:crm_caldav.model_crm_meeting
-msgid "Meeting"
-msgstr "Susitikimas"
+#. module: marketing
+#: model:res.groups,name:marketing.group_marketing_user
+msgid "User"
+msgstr ""
diff --git a/addons/marketing/i18n/lv.po b/addons/marketing/i18n/lv.po
index 28aeeacd059..a2d8115a843 100644
--- a/addons/marketing/i18n/lv.po
+++ b/addons/marketing/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/mn.po b/addons/marketing/i18n/mn.po
index 548d64d4060..c88d7135647 100644
--- a/addons/marketing/i18n/mn.po
+++ b/addons/marketing/i18n/mn.po
@@ -14,18 +14,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
 msgid "Manager"
-msgstr ""
+msgstr "Менежер"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_user
 msgid "User"
-msgstr ""
+msgstr "Хэрэглэгч"
 
 #~ msgid "Image"
 #~ msgstr "Зураг"
diff --git a/addons/marketing/i18n/nb.po b/addons/marketing/i18n/nb.po
index 7d3bfe51c2f..35f7299925b 100644
--- a/addons/marketing/i18n/nb.po
+++ b/addons/marketing/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/nl.po b/addons/marketing/i18n/nl.po
index 54d79b4ff5e..50ab5789b73 100644
--- a/addons/marketing/i18n/nl.po
+++ b/addons/marketing/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-01-18 20:28+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/pl.po b/addons/marketing/i18n/pl.po
index 5aaf86fcf06..a614b48d4be 100644
--- a/addons/marketing/i18n/pl.po
+++ b/addons/marketing/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/pt.po b/addons/marketing/i18n/pt.po
index a8b499b5769..905ac7adadc 100644
--- a/addons/marketing/i18n/pt.po
+++ b/addons/marketing/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/pt_BR.po b/addons/marketing/i18n/pt_BR.po
index c4f7e31a680..b4e8ab545a3 100644
--- a/addons/marketing/i18n/pt_BR.po
+++ b/addons/marketing/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/ro.po b/addons/marketing/i18n/ro.po
index 00b5a24ce90..4bbd2d02803 100644
--- a/addons/marketing/i18n/ro.po
+++ b/addons/marketing/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/ru.po b/addons/marketing/i18n/ru.po
index 934d1404828..029056c625a 100644
--- a/addons/marketing/i18n/ru.po
+++ b/addons/marketing/i18n/ru.po
@@ -14,18 +14,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
 msgid "Manager"
-msgstr ""
+msgstr "Менеджер"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_user
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #~ msgid "Marketing Campaigns"
 #~ msgstr "Маркетинговые кампании"
diff --git a/addons/marketing/i18n/sk.po b/addons/marketing/i18n/sk.po
index 2c4224f9e88..023196ffc3a 100644
--- a/addons/marketing/i18n/sk.po
+++ b/addons/marketing/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/sl.po b/addons/marketing/i18n/sl.po
index c70707c8790..d39652d9cf2 100644
--- a/addons/marketing/i18n/sl.po
+++ b/addons/marketing/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/sr.po b/addons/marketing/i18n/sr.po
index 5af5f1194ae..ab69652c489 100644
--- a/addons/marketing/i18n/sr.po
+++ b/addons/marketing/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/sr@latin.po b/addons/marketing/i18n/sr@latin.po
index 0497040739f..c8feabebfad 100644
--- a/addons/marketing/i18n/sr@latin.po
+++ b/addons/marketing/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/sv.po b/addons/marketing/i18n/sv.po
index 3216f36937e..e8c0cb5c813 100644
--- a/addons/marketing/i18n/sv.po
+++ b/addons/marketing/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/th.po b/addons/marketing/i18n/th.po
index d687242c933..1ad764f555c 100644
--- a/addons/marketing/i18n/th.po
+++ b/addons/marketing/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/tr.po b/addons/marketing/i18n/tr.po
index 1b6a8938c33..fd17dc6948b 100644
--- a/addons/marketing/i18n/tr.po
+++ b/addons/marketing/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/zh_CN.po b/addons/marketing/i18n/zh_CN.po
index 3ddc284ddb0..73bccfcd14d 100644
--- a/addons/marketing/i18n/zh_CN.po
+++ b/addons/marketing/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing
 #: model:res.groups,name:marketing.group_marketing_manager
diff --git a/addons/marketing/i18n/zh_TW.po b/addons/marketing/i18n/zh_TW.po
new file mode 100644
index 00000000000..447f5b870d7
--- /dev/null
+++ b/addons/marketing/i18n/zh_TW.po
@@ -0,0 +1,28 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-19 10:41+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: marketing
+#: model:res.groups,name:marketing.group_marketing_manager
+msgid "Manager"
+msgstr "主管"
+
+#. module: marketing
+#: model:res.groups,name:marketing.group_marketing_user
+msgid "User"
+msgstr "使用者"
diff --git a/addons/marketing/res_config.py b/addons/marketing/res_config.py
index 7584f00e6b0..7cedb65a373 100644
--- a/addons/marketing/res_config.py
+++ b/addons/marketing/res_config.py
@@ -25,14 +25,14 @@ class marketing_config_settings(osv.osv_memory):
     _name = 'marketing.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_marketing_campaign': fields.boolean('Marketing Campaigns',
+        'module_marketing_campaign': fields.boolean('Marketing campaigns',
             help="""Provides leads automation through marketing campaigns.
                 Campaigns can in fact be defined on any resource, not just CRM leads.
                 This installs the module marketing_campaign."""),
-        'module_marketing_campaign_crm_demo': fields.boolean('Demo Data for Marketing Campaigns',
+        'module_marketing_campaign_crm_demo': fields.boolean('Demo data for marketing campaigns',
             help="""Installs demo data like leads, campaigns and segments for Marketing Campaigns.
                 This installs the module marketing_campaign_crm_demo."""),
-        'module_crm_profiling': fields.boolean('Track Customer Profile to Focus your Campaigns',
+        'module_crm_profiling': fields.boolean('Track customer profile to focus your campaigns',
             help="""Allows users to perform segmentation within partners.
                 This installs the module crm_profiling."""),
     }
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index e0cf8b56439..a51347fd1bb 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -21,20 +21,21 @@
 
 
 {
-    "name" : "Marketing Campaigns",
-    "version" : "1.1",
-    "depends" : ["marketing",
-                 "document",
-                 "email_template",
-                 "decimal_precision"
-                ],
-    "author" : "OpenERP SA",
-    "category": 'Marketing',
-    "description": """
+    'name': 'Marketing Campaigns',
+    'version': '1.1',
+    'depends': ['marketing',
+                 'document',
+                 'email_template',
+                 'decimal_precision'
+    ],
+    'author': 'OpenERP SA',
+    'category': 'Marketing',
+    'description': """
 This module provides leads automation through marketing campaigns (campaigns can in fact be defined on any resource, not just CRM Leads).
 =========================================================================================================================================
 
 The campaigns are dynamic and multi-channels. The process is as follows:
+------------------------------------------------------------------------
     * Design marketing campaigns like workflows, including email templates to
       send, reports to print and send by email, custom actions
     * Define input segments that will select the items that should enter the
@@ -49,30 +50,24 @@ The campaigns are dynamic and multi-channels. The process is as follows:
 While the campaign runs you can of course continue to fine-tune the parameters,
 input segments, workflow.
 
-Note: If you need demo data, you can install the marketing_campaign_crm_demo
+**Note:** If you need demo data, you can install the marketing_campaign_crm_demo
       module, but this will also install the CRM application as it depends on
       CRM Leads.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'marketing_campaign_view.xml',
         'marketing_campaign_data.xml',
         'marketing_campaign_workflow.xml',
         'res_partner_view.xml',
         'report/campaign_analysis_view.xml',
-        "security/marketing_campaign_security.xml",
-        "security/ir.model.access.csv"
+        'security/marketing_campaign_security.xml',
+        'security/ir.model.access.csv'
     ],
-    'demo_xml': [
-        'marketing_campaign_demo.xml',
-    ],
-    'test': [
-        'test/marketing_campaign.yml',
-     ],
+    'demo': ['marketing_campaign_demo.xml'],
+    'test': ['test/marketing_campaign.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00421723279617928365',
     'images': ['images/campaign.png', 'images/campaigns.jpeg','images/email_account.jpeg','images/email_templates.jpeg','images/segments.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/i18n/ar.po b/addons/marketing_campaign/i18n/ar.po
index 6efa9bd005f..bc54f9c6985 100644
--- a/addons/marketing_campaign/i18n/ar.po
+++ b/addons/marketing_campaign/i18n/ar.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-01-12 05:49+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-10-08 15:06+0000\n"
+"Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Manual Mode"
-msgstr ""
+msgstr "النمط اليدوي"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,activity_from_id:0
@@ -31,12 +31,12 @@ msgstr "النشاط السابق"
 #: code:addons/marketing_campaign/marketing_campaign.py:818
 #, python-format
 msgid "The current step for this item has no email or report to preview."
-msgstr ""
+msgstr "الخطوة الحالية لهذا الصنف لا تملك بريد إلكتروني أو تقرير للمعاينة"
 
 #. module: marketing_campaign
 #: constraint:marketing.campaign.transition:0
 msgid "The To/From Activity of transition must be of the same Campaign "
-msgstr ""
+msgstr "الإنتقال من / إلى النشاط يجب أن يكون من نفس الحملة "
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,trigger:0
@@ -46,7 +46,7 @@ msgstr "الوقت"
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
 msgid "Custom Action"
-msgstr ""
+msgstr "تخصيص إجراء"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -63,11 +63,13 @@ msgid ""
 "reached this point has generated a certain revenue. You can get revenue "
 "statistics in the Reporting section"
 msgstr ""
+"تعيين الإيرادات المتوقعة إذا كنت ترى أن كل بند من بنود الحملة وصلت الى تلك "
+"النقطة وولدت عائد معين. يمكنك الحصول على إحصاءات الإيرادات في قسم التقارير"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,trigger:0
 msgid "Trigger"
-msgstr ""
+msgstr "زر"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
@@ -77,7 +79,7 @@ msgstr ""
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Campaign Editor"
-msgstr ""
+msgstr "محرر الحملة"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -106,13 +108,13 @@ msgstr "كائن"
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Sync mode: only records created after last sync"
-msgstr ""
+msgstr "نمط المزامنة: السجلات فقط التي تم إنشاؤها بعد آخر المزامنة"
 
 #. module: marketing_campaign
 #: model:email.template,body_text:marketing_campaign.email_template_2
 msgid ""
 "Hello, We are happy to announce that you now become our Silver Partner."
-msgstr ""
+msgstr "مرحبا، ونحن سعداء أن نعلن أنك أصبحت الآن شريكاً فضياً لدينا."
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -123,7 +125,7 @@ msgstr "حفظ كمسودة"
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,to_ids:0
 msgid "Next Activities"
-msgstr ""
+msgstr "النشاطات التالية"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
@@ -133,7 +135,7 @@ msgstr "مزامنة"
 #. module: marketing_campaign
 #: sql_constraint:marketing.campaign.transition:0
 msgid "The interval must be positive or zero"
-msgstr ""
+msgstr "الفترة يجب أن تكون إيجابية أو صفر"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:818
@@ -145,7 +147,7 @@ msgstr "لا معاينة"
 #: view:marketing.campaign.segment:0
 #: field:marketing.campaign.segment,date_run:0
 msgid "Launch Date"
-msgstr ""
+msgstr "تاريخ الإنشاء"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -156,7 +158,7 @@ msgstr "يوم"
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Outgoing Transitions"
-msgstr ""
+msgstr "التنقلات الصادرة"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
@@ -166,18 +168,18 @@ msgstr "إستعادة"
 #. module: marketing_campaign
 #: help:marketing.campaign,object_id:0
 msgid "Choose the resource on which you want this campaign to be run"
-msgstr ""
+msgstr "اختيار المورد الذي تريده ليتم تشغيله لهذه الحملة"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_last_date:0
 msgid "Last Synchronization"
-msgstr ""
+msgstr "التزامن الأخير"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:214
 #, python-format
 msgid "You can not duplicate a campaign, it's not supported yet."
-msgstr ""
+msgstr "لا يمكنك تكرار الحملة، انها غير مدعومة حتى الآن."
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
@@ -189,7 +191,7 @@ msgstr "سنة/سنين"
 msgid ""
 "Date on which this segment was synchronized last time (automatically or "
 "manually)"
-msgstr ""
+msgstr "التاريخ الذي تزامن هذا القطاع آخر مرة (آليا أو يدويا)"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,state:0
@@ -216,11 +218,19 @@ msgid ""
 "Normal - the campaign runs normally and automatically sends all emails and "
 "reports (be very careful with this mode, you're live!)"
 msgstr ""
+"اختبار - وهو يخلق ويعالج كافة الأنشطة مباشرة (دون انتظار تأخير على التحولات) "
+"ولكن لا يرسل رسائل البريد الإلكتروني أو يعد التقارير.\n"
+" اختبار في الوقت الحقيقي - وهو يخلق ويعالج جميع الأنشطة بشكل مباشر ولكن لا "
+"يرسل رسائل البريد الإلكتروني أو يعد التقارير.\n"
+" مع التأكيد اليدوي - يعمل الحملات عادة، ولكن المستخدم لديه للتحقق من صحة كل "
+"بنود العمل يدويا.\n"
+" طبيعي - يعمل الحملة بشكل طبيعي يرسل تلقائيا جميع رسائل البريد الإلكتروني "
+"والتقارير (نكون حذرين للغاية مع هذا الوضع، أنت على الهواء!)"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,date_run:0
 msgid "Initial start date of this segment."
-msgstr ""
+msgstr "تاريخ بدء الأولي لهذا القطاع."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -237,7 +247,7 @@ msgstr "حملة"
 #. module: marketing_campaign
 #: model:email.template,subject:marketing_campaign.email_template_3
 msgid "Congratulation! You become our Gold Partner."
-msgstr ""
+msgstr "تهنئة! لقد أصبحت شريكاً ذهبياً الآن."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -251,7 +261,7 @@ msgstr "قطعة"
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Cost / Revenue"
-msgstr ""
+msgstr "التكلفة/العائد"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,type:0
@@ -313,7 +323,7 @@ msgstr ""
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "Marketing Reports"
-msgstr ""
+msgstr "تقارير التسويق"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,state:0
@@ -342,7 +352,7 @@ msgstr ""
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_mode:0
 msgid "Synchronization mode"
-msgstr ""
+msgstr "نمط التزامن"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -353,7 +363,7 @@ msgstr ""
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,from_ids:0
 msgid "Previous Activities"
-msgstr ""
+msgstr "النشاطات السابقة"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,date_done:0
@@ -363,7 +373,7 @@ msgstr ""
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Marketing Campaign Activities"
-msgstr ""
+msgstr "نشاطات حملة التسويق"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
@@ -427,7 +437,7 @@ msgstr ""
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
 msgid "Campaign Segment"
-msgstr ""
+msgstr "حملة القطاع"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -456,7 +466,7 @@ msgstr ""
 #. module: marketing_campaign
 #: field:marketing.campaign,fixed_cost:0
 msgid "Fixed Cost"
-msgstr ""
+msgstr "التكلفة الثابتة"
 
 #. module: marketing_campaign
 #: model:email.template,subject:marketing_campaign.email_template_2
@@ -466,12 +476,12 @@ msgstr ""
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Newly Modified"
-msgstr ""
+msgstr "تم التعديل حديثاً"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,interval_nbr:0
 msgid "Interval Value"
-msgstr ""
+msgstr "قيمة الفترة"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,revenue:0
@@ -512,22 +522,22 @@ msgstr ""
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup
 msgid "Campaign Follow-up"
-msgstr ""
+msgstr "متابعة الحملة"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,email_template_id:0
 msgid "The e-mail to send when this activity is activated"
-msgstr ""
+msgstr "بريد إلكتروني للإرسال عندما يتم تنشيط المنشط"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Test Mode"
-msgstr ""
+msgstr "نمط الإختبار"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
 msgid "Only records modified after last sync (no duplicates)"
-msgstr ""
+msgstr "فقط السجلات المعدلة بعد آخر مزامنة (بدون تكرار)"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
diff --git a/addons/marketing_campaign/i18n/bg.po b/addons/marketing_campaign/i18n/bg.po
index 4d7fb9191c3..200fbe01ecc 100644
--- a/addons/marketing_campaign/i18n/bg.po
+++ b/addons/marketing_campaign/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/ca.po b/addons/marketing_campaign/i18n/ca.po
index 235727a15d0..ae2b2c51e05 100644
--- a/addons/marketing_campaign/i18n/ca.po
+++ b/addons/marketing_campaign/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/da.po b/addons/marketing_campaign/i18n/da.po
index b1f8c1e6fc2..fe42b8d77d6 100644
--- a/addons/marketing_campaign/i18n/da.po
+++ b/addons/marketing_campaign/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/de.po b/addons/marketing_campaign/i18n/de.po
index 1163e0f2746..9ef3a431f72 100644
--- a/addons/marketing_campaign/i18n/de.po
+++ b/addons/marketing_campaign/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -528,6 +528,10 @@ msgid ""
 "for reporting purposes, via the Campaign Analysis or Campaign Follow-up "
 "views."
 msgstr ""
+"Die erzeugten Werkzeuge werden dem Partner zugeordnet, auf den sich dieser "
+"Datensatz bezieht. Sollte dies der Partner selbst sein, so lassen Sie das "
+"Feld leer. Dies ist für Berichtszwecke in den Sichten zur Kampagnen-Analyse "
+"oder Kampagnen-Nachpflege sinnvoll."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -599,6 +603,12 @@ msgid ""
 "records which have the same value for the unique field as other records that "
 "already entered the campaign."
 msgstr ""
+"Legt für die Filter ein weiteres Kriterium fest nach dem Datensätze einer "
+"Kampagne hinzugefügt werden. \"Ohne Duplikate\" verhindert die Auswahl von "
+"Sätzen, die bereits zuvor der Kampagne zugefügt wurden. Wenn für die "
+"Kampagne ein Feld als \"Unikat\" gekennzeichnet ist, wird \"Ohne Duplikate\" "
+"auch verhindern, dass Sätze mit gleichem Inhalt im unikaten Feld wie bereits "
+"in die Kampagne eingetragene, nicht mehr ausgewählt werden."
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
@@ -965,6 +975,16 @@ msgid ""
 "campaign previously. Only easily comparable fields like textfields, "
 "integers, selections or single relationships may be used."
 msgstr ""
+"Wenn ausgewählt, hilft dies in Segmenten, die im \"ohne Duplikate\"-Modus "
+"genutzt werden, ähnliche Datensätze mehrfach auszuwählen. Ähnliche "
+"Datensätze sind solche, die in diesem einzelnen Feld den gleichen Wert "
+"enthalten. Zum Beispiel bei Auswahl des \"EMail von\"-Feldes in "
+"Kundenverwaltung-Leads würden Sie verhindern die gleiche Kampagne nochmals "
+"an die gleiche Adresse zu senden. Nicht ausgewählt wird das Segment \"ohne "
+"Duplikate\" nur die Auswahl des identischen Datensatzes verhindern, sofern "
+"dieser die Kampagne bereits zuvor zugefügt wurde. Nur leicht vergleichbare "
+"Felder, wie Text, Ganzzahlen, Auswahlen oder einfache Relationen (m:1), "
+"dürfen hier verwendet werden."
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:529
@@ -1110,7 +1130,9 @@ msgstr "Nur neu erstellte Daten"
 #. module: marketing_campaign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Error! Sie können keine rekursive assoziierte Mitglieder anlegen."
+msgstr ""
+"Fehler! Sie können keine rekursiv assoziierten (sich selbst einschließende) "
+"Mitglieder anlegen."
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,variable_cost:0
diff --git a/addons/marketing_campaign/i18n/el.po b/addons/marketing_campaign/i18n/el.po
index ddfd32685d0..599fba312ab 100644
--- a/addons/marketing_campaign/i18n/el.po
+++ b/addons/marketing_campaign/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/es.po b/addons/marketing_campaign/i18n/es.po
index 660b7c78421..b7f22b071ff 100644
--- a/addons/marketing_campaign/i18n/es.po
+++ b/addons/marketing_campaign/i18n/es.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-10 18:37+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/es_CR.po b/addons/marketing_campaign/i18n/es_CR.po
index 8a16a0987ea..baa43258511 100644
--- a/addons/marketing_campaign/i18n/es_CR.po
+++ b/addons/marketing_campaign/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: marketing_campaign
diff --git a/addons/marketing_campaign/i18n/fi.po b/addons/marketing_campaign/i18n/fi.po
index 5ecec5c4b41..c7a8b79d89d 100644
--- a/addons/marketing_campaign/i18n/fi.po
+++ b/addons/marketing_campaign/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/fr.po b/addons/marketing_campaign/i18n/fr.po
index 84da37fe7b1..32dc1666b28 100644
--- a/addons/marketing_campaign/i18n/fr.po
+++ b/addons/marketing_campaign/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/hi.po b/addons/marketing_campaign/i18n/hi.po
index e490c6bfef4..f44cc2104e1 100644
--- a/addons/marketing_campaign/i18n/hi.po
+++ b/addons/marketing_campaign/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/hr.po b/addons/marketing_campaign/i18n/hr.po
index 2ca106056ba..1e810d9152d 100644
--- a/addons/marketing_campaign/i18n/hr.po
+++ b/addons/marketing_campaign/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/hu.po b/addons/marketing_campaign/i18n/hu.po
index dd8eb2da3c4..051464d5a0a 100644
--- a/addons/marketing_campaign/i18n/hu.po
+++ b/addons/marketing_campaign/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/it.po b/addons/marketing_campaign/i18n/it.po
index 8c05c18a958..bbee9c0ff2d 100644
--- a/addons/marketing_campaign/i18n/it.po
+++ b/addons/marketing_campaign/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/ja.po b/addons/marketing_campaign/i18n/ja.po
index d28c9e1722f..7c0dea6789b 100644
--- a/addons/marketing_campaign/i18n/ja.po
+++ b/addons/marketing_campaign/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/lv.po b/addons/marketing_campaign/i18n/lv.po
index 3bbe5edb8ac..38566add2a8 100644
--- a/addons/marketing_campaign/i18n/lv.po
+++ b/addons/marketing_campaign/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/mn.po b/addons/marketing_campaign/i18n/mn.po
index 3d22e7b3cc7..29db41d8cdf 100644
--- a/addons/marketing_campaign/i18n/mn.po
+++ b/addons/marketing_campaign/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -479,7 +479,7 @@ msgstr "Үнэ тогтоох"
 #. module: marketing_campaign
 #: model:email.template,subject:marketing_campaign.email_template_2
 msgid "Congratulation! You become now our Silver Partner."
-msgstr ""
+msgstr "Баяр хүргэе! Та одоо манай мөнгөн түнш болсон."
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
@@ -489,7 +489,7 @@ msgstr "Шинэ засвар"
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,interval_nbr:0
 msgid "Interval Value"
-msgstr ""
+msgstr "Завсрын утга"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,revenue:0
@@ -545,7 +545,7 @@ msgstr "Тестийн арга"
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
 msgid "Only records modified after last sync (no duplicates)"
-msgstr ""
+msgstr "Зөвхөн бичлэгийг өөрчлөгдсөний дараа холбох(хуулбарлагдахгүй)"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
@@ -652,7 +652,7 @@ msgstr ""
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Sync mode: all records"
-msgstr ""
+msgstr "Холыох горим: бүх бичлэгүүд"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
@@ -814,7 +814,7 @@ msgstr "Дууссан"
 #: code:addons/marketing_campaign/marketing_campaign.py:214
 #, python-format
 msgid "Operation not supported"
-msgstr ""
+msgstr "Системийн дэмжлэггүй"
 
 #. module: marketing_campaign
 #: model:email.template,body_text:marketing_campaign.email_template_3
diff --git a/addons/marketing_campaign/i18n/nl.po b/addons/marketing_campaign/i18n/nl.po
index 5c2d645b0f9..19a51dd1ad5 100644
--- a/addons/marketing_campaign/i18n/nl.po
+++ b/addons/marketing_campaign/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-01-18 20:30+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -95,7 +95,7 @@ msgstr "Vandaag"
 #: view:marketing.campaign.segment:0
 #: selection:marketing.campaign.segment,state:0
 msgid "Running"
-msgstr "Loopt"
+msgstr "In behandeling"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
@@ -977,6 +977,16 @@ msgid ""
 "campaign previously. Only easily comparable fields like textfields, "
 "integers, selections or single relationships may be used."
 msgstr ""
+"Indien aangevinkt zal dit veld worden gebruikt om te voorkomen dat "
+"segmenten, gekenmerkt als \"niet dupliceren\" dubbel worden geselecteerd. "
+"Gelijksoortige regels zijn regels welke dezelfde waarde hebben voor dit "
+"unieke veld. Bijvoorbeeld, als het veld \"e-mail afzender\" wordt gekozen "
+"voor CRM leads, dan wordt voorkomen dat dezelfde campagne opnieuw wordt "
+"verzonden naar hetzelfde e-mail adres. Indien niet aangevinkt worden de "
+"segmenten, gekenmerkt als \"niet dupliceren\"alleen niet geselecteerd indien "
+"deze eerder in de campagne is opgenomen. Alleen eenvoudig te vergelijken "
+"velden, zoals tekstvelden, getallen , selecties of een enkele relatie tussen "
+"velden kunnen worden gebruikt."
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:529
diff --git a/addons/marketing_campaign/i18n/pl.po b/addons/marketing_campaign/i18n/pl.po
index 74f734daa38..444709b89c0 100644
--- a/addons/marketing_campaign/i18n/pl.po
+++ b/addons/marketing_campaign/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/pt.po b/addons/marketing_campaign/i18n/pt.po
index f4f0a401f08..095852be5ae 100644
--- a/addons/marketing_campaign/i18n/pt.po
+++ b/addons/marketing_campaign/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/pt_BR.po b/addons/marketing_campaign/i18n/pt_BR.po
index 1de9a57a8a6..149bc524ed1 100644
--- a/addons/marketing_campaign/i18n/pt_BR.po
+++ b/addons/marketing_campaign/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -32,11 +32,13 @@ msgstr "Atividade Anterior"
 #, python-format
 msgid "The current step for this item has no email or report to preview."
 msgstr ""
+"O passo atual para este item não tem nenhum email ou relatório para "
+"visualização"
 
 #. module: marketing_campaign
 #: constraint:marketing.campaign.transition:0
 msgid "The To/From Activity of transition must be of the same Campaign "
-msgstr ""
+msgstr "A transição da Atividade Para/De precisa pertencer a mesma Campanha "
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,trigger:0
@@ -63,6 +65,9 @@ msgid ""
 "reached this point has generated a certain revenue. You can get revenue "
 "statistics in the Reporting section"
 msgstr ""
+"Escolha a receita esperada, se você considerar que cada item da campanha de "
+"marketing que atingiu este ponto gerou uma certa receita, então você pode "
+"ter as estatísticas de receita na seção de Relatórios."
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,trigger:0
@@ -77,7 +82,7 @@ msgstr "# de Ações"
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Campaign Editor"
-msgstr ""
+msgstr "Editor de Campanhas"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -91,7 +96,7 @@ msgstr "Hoje"
 #: view:marketing.campaign.segment:0
 #: selection:marketing.campaign.segment,state:0
 msgid "Running"
-msgstr ""
+msgstr "Em Execução"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
@@ -106,13 +111,14 @@ msgstr "Objeto"
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Sync mode: only records created after last sync"
-msgstr ""
+msgstr "Sync mode: Apenas registros criados após a última sincronização"
 
 #. module: marketing_campaign
 #: model:email.template,body_text:marketing_campaign.email_template_2
 msgid ""
 "Hello, We are happy to announce that you now become our Silver Partner."
 msgstr ""
+"Olá, Nós temos o prazer de anunciar que agora você é um Parceiro Prata"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -161,7 +167,7 @@ msgstr "Transições de saída"
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Reset"
-msgstr ""
+msgstr "Reiniciar"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,object_id:0
@@ -177,7 +183,7 @@ msgstr "Última sincronização"
 #: code:addons/marketing_campaign/marketing_campaign.py:214
 #, python-format
 msgid "You can not duplicate a campaign, it's not supported yet."
-msgstr ""
+msgstr "Você não pode duplicar uma campanha, ainda não é suportado"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
@@ -190,6 +196,8 @@ msgid ""
 "Date on which this segment was synchronized last time (automatically or "
 "manually)"
 msgstr ""
+"Data em que este segmento foi sincronizado pela última vez (automaticamente "
+"ou manualmente)"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,state:0
@@ -216,6 +224,14 @@ msgid ""
 "Normal - the campaign runs normally and automatically sends all emails and "
 "reports (be very careful with this mode, you're live!)"
 msgstr ""
+"Teste - Ele cria e processa todas as atividades diretamente (sem esperar "
+"pela demora nas transições), mas não enviar e-mails ou produzir relatórios.\n"
+"Teste em Tempo Real - Cria e processa todas as atividades diretamente, mas "
+"não envia e-mails ou produz relatórios.\n"
+"Com a confirmação Manual - as campanhas funciona normalmente, mas o usuário "
+"tem que validar todos os itens de trabalho manualmente.\n"
+"Normal - A campanha decorre normalmente e envia automaticamente todos os e-"
+"mails e relatórios (ter muito cuidado com este modo, você está em produção!)"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,date_run:0
@@ -237,7 +253,7 @@ msgstr "Campanha"
 #. module: marketing_campaign
 #: model:email.template,subject:marketing_campaign.email_template_3
 msgid "Congratulation! You become our Gold Partner."
-msgstr ""
+msgstr "Parabéns! Você se tornou o nosso Gold Partner."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -264,11 +280,21 @@ msgid ""
 "of the resource record\n"
 "  "
 msgstr ""
+"O tipo de ação a ser executada quando um item entra nesta atividade, tais "
+"como:\n"
+"    - E-mail: envie um e-mail usando um modelo de e-mail pré-definido\n"
+"    - Relatório: imprimir um relatório existente definido no item recursos e "
+"salvá-lo em um diretório específico\n"
+"    - Ação Custom: executar uma ação pré-definida, por exemplo, para "
+"modificar os campos do registro de recurso\n"
+"  "
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,date_next_sync:0
 msgid "Next time the synchronization job is scheduled to run automatically"
 msgstr ""
+"Próxima hora em que o trabalho de sincronização está programado para rodar "
+"automaticamente."
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
@@ -291,12 +317,12 @@ msgstr "Transições"
 #. module: marketing_campaign
 #: model:ir.filters,name:marketing_campaign.filter0
 msgid "Partners"
-msgstr ""
+msgstr "Parceiros"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,keep_if_condition_not_met:0
 msgid "Don't delete workitems"
-msgstr ""
+msgstr "Não excluir itens de trabalho"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -308,7 +334,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,state:0
 msgid "State"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -319,7 +345,7 @@ msgstr "Relatórios de Marketing"
 #: selection:marketing.campaign,state:0
 #: selection:marketing.campaign.segment,state:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,type:0
@@ -358,7 +384,7 @@ msgstr "Atividades Anteriores"
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,date_done:0
 msgid "Date this segment was last closed or cancelled."
-msgstr ""
+msgstr "Data em que este segmento foi fechado ou cancelado pela última vez"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
@@ -388,7 +414,7 @@ msgstr "Unidade de Intervalo"
 #: code:addons/marketing_campaign/marketing_campaign.py:792
 #, python-format
 msgid "Email Preview"
-msgstr ""
+msgstr "Visualizar Email"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,report_id:0
@@ -413,6 +439,9 @@ msgid ""
 "reached this point has entailed a certain cost. You can get cost statistics "
 "in the Reporting section"
 msgstr ""
+"Defina uma variável de custo se você considerar que cada item da campanha "
+"atingiu este ponto gerou um certo custo, você pode verificar as informações "
+"nos relatórios."
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
@@ -422,7 +451,7 @@ msgstr "Hora(s)"
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mês-1    "
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
@@ -442,6 +471,9 @@ msgid ""
 "By activating this option, workitems that aren't executed because the "
 "condition is not met are marked as cancelled instead of being deleted."
 msgstr ""
+"Ao ativar esta opção, os itens de trabalho que não foram executados por que "
+"uma condição não foi atendida serão marcados como cancelados em vez de serem "
+"excluído."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -451,7 +483,7 @@ msgstr "Exceções"
 #. module: marketing_campaign
 #: field:res.partner,workitem_ids:0
 msgid "Workitems"
-msgstr ""
+msgstr "Itens de trabalho"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,fixed_cost:0
@@ -461,7 +493,7 @@ msgstr "Custo Fixo"
 #. module: marketing_campaign
 #: model:email.template,subject:marketing_campaign.email_template_2
 msgid "Congratulation! You become now our Silver Partner."
-msgstr ""
+msgstr "Parabéns! Você se tornou nosso Parceiro Prata"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
@@ -471,7 +503,7 @@ msgstr "Recém modificado"
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,interval_nbr:0
 msgid "Interval Value"
-msgstr ""
+msgstr "Valor de Intervalo"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,revenue:0
@@ -497,6 +529,10 @@ msgid ""
 "for reporting purposes, via the Campaign Analysis or Campaign Follow-up "
 "views."
 msgstr ""
+"Os itens de trabalho gerados serão ligados ao parceiro relacionado ao "
+"registro. Se o registro é o próprio parceiro parceiro deixar este campo em "
+"branco. Isso é útil para fins de relatório, através da Análise de Campanha "
+"ou Visualização de Follow Up de Campanhas."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -528,6 +564,7 @@ msgstr "Modo de Teste"
 #: selection:marketing.campaign.segment,sync_mode:0
 msgid "Only records modified after last sync (no duplicates)"
 msgstr ""
+"Apenas registros modificados após a última sincronização (sem duplicados)"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
@@ -542,7 +579,7 @@ msgstr "Estatísticas de Campanha"
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,server_action_id:0
 msgid "The action to perform when this activity is activated"
-msgstr ""
+msgstr "A Ação a ser executada quando esta atividade for ativada"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,partner_field_id:0
@@ -567,6 +604,12 @@ msgid ""
 "records which have the same value for the unique field as other records that "
 "already entered the campaign."
 msgstr ""
+"Determina um critério adicional para adicionar o filtro ao selecionar novos "
+"registros para injetar na campanha. \"Sem duplicados\" impede seleção de "
+"registros que já entraram na campanha anteriormente. Se a campanha tem um "
+"\"único campo\" defina \"Sem duplicados\" também vai impedir a seleção de "
+"registros que têm o mesmo valor para o campo único como outros registros que "
+"já entraram a campanha."
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
@@ -620,6 +663,8 @@ msgid ""
 "An activity with a signal can be called programmatically. Be careful, the "
 "workitem is always created when a signal is sent"
 msgstr ""
+"Uma atividade com um sinal pode ser chamado de programação. Tenha cuidado, o "
+"item de trabalho é sempre criado quando um sinal é enviado"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
@@ -629,12 +674,12 @@ msgstr "Junho"
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates"
-msgstr ""
+msgstr "Modelos de Email"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Sync mode: all records"
-msgstr ""
+msgstr "Modo de Sincronização: todos os registros"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
@@ -675,11 +720,13 @@ msgid ""
 "The campaign cannot be started: it doesn't have any starting activity. "
 "Modify campaign's activities to mark one as the starting point."
 msgstr ""
+"A campanha não pode ser iniciada: ele não tem qualquer atividade inicial. "
+"Modifique as atividades de campanha para marcar uma como o ponto de partida."
 
 #. module: marketing_campaign
 #: field:marketing.campaign,unique_field_id:0
 msgid "Unique Field"
-msgstr ""
+msgstr "Campo único"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,state:0
@@ -712,17 +759,17 @@ msgstr "Data de Execução"
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
 msgid "Campaign Workitem"
-msgstr ""
+msgstr "Item de Trabalho da Campanha"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
 msgid "Campaign Activity"
-msgstr ""
+msgstr "Atividade da Campanha"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,report_directory_id:0
 msgid "This folder is used to store the generated reports"
-msgstr ""
+msgstr "Este diretório é usado para armazenar os relatórios gerados"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:136
@@ -753,24 +800,24 @@ msgstr "Iniciar"
 #: view:marketing.campaign.segment:0
 #: view:res.partner:0
 msgid "History"
-msgstr "História"
+msgstr "Histórico"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Process"
-msgstr "Processo"
+msgstr "Processar"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:530
 #: selection:marketing.campaign.transition,trigger:0
 #, python-format
 msgid "Cosmetic"
-msgstr ""
+msgstr "Cosmético"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.transition,trigger:0
 msgid "How is the destination workitem triggered"
-msgstr ""
+msgstr "Como o item de trabalho é disparado"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
@@ -781,6 +828,11 @@ msgid ""
 "could be sending an email template that has previously been created in the "
 "system."
 msgstr ""
+"Uma campanha de marketing é um evento ou atividade que vai ajudar você a "
+"gerenciar e alcançar seus parceiros com mensagens específicas. A campanha "
+"pode ter muitas atividades que serão desencadeadas a partir de uma situação "
+"específica. Uma ação pode ser o envio de um modelo de email que tenha sido "
+"previamente criado no sistema."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -790,28 +842,29 @@ msgstr ""
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Done"
-msgstr ""
+msgstr "Concluído"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:214
 #, python-format
 msgid "Operation not supported"
-msgstr ""
+msgstr "Operação não suportada"
 
 #. module: marketing_campaign
 #: model:email.template,body_text:marketing_campaign.email_template_3
 msgid "Hello, We are happy to announce that you become our Gold Partner."
 msgstr ""
+"Olá, Estamos felizes em anunciar que você se tornou nosso parceiro Gold."
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Close"
-msgstr ""
+msgstr "Fechar"
 
 #. module: marketing_campaign
 #: constraint:marketing.campaign.segment:0
 msgid "Model of filter must be same as resource model of Campaign "
-msgstr ""
+msgstr "Modelo de filtro deve ser igual ao modelo de recursos de campanha "
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,condition:0
@@ -825,28 +878,37 @@ msgid ""
 "   - transitions: list of campaign transitions outgoing from this activity\n"
 "...- re: Python regular expression module"
 msgstr ""
+"Expressão Python para decidir se a atividade pode ser executada, caso "
+"contrário, ele será excluído ou cancelado. A expressão pode usar as "
+"seguintes variáveis:\n"
+"    - Atividade: a atividade de campanha\n"
+"    - Workitem: o item de trabalho da campanha\n"
+"    - Recurso: o objeto do recurso este item campanha representa\n"
+"    - Transições: lista de transições de campanha de saída a partir desta "
+"atividade\n"
+"... - Re: módulo de expressão regular Python"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Synchronize Manually"
-msgstr ""
+msgstr "sincronizar manualmente"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "ID do Recurso"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:136
 #, python-format
 msgid "The campaign cannot be started: there are no activities in it."
-msgstr ""
+msgstr "A campanha não pode ser iniciada: não há atividades na mesma."
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
 msgid "Campaign Transition"
-msgstr ""
+msgstr "Transição de campanha"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -854,50 +916,50 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "To Do"
-msgstr ""
+msgstr "Por Fazer"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Campaign Step"
-msgstr ""
+msgstr "Passo da Campanha"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form
 #: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
 #: view:marketing.campaign.segment:0
 msgid "Segments"
-msgstr ""
+msgstr "Segmentos"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
 msgid "All Segments"
-msgstr ""
+msgstr "Todos os Seguimentos"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Incoming Transitions"
-msgstr ""
+msgstr "Transições de Entrada"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Day(s)"
-msgstr ""
+msgstr "Dia(s)"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,activity_ids:0
 #: view:marketing.campaign.activity:0
 msgid "Activities"
-msgstr ""
+msgstr "Atividades"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "May"
-msgstr ""
+msgstr "Maio"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,unique_field_id:0
@@ -911,32 +973,41 @@ msgid ""
 "campaign previously. Only easily comparable fields like textfields, "
 "integers, selections or single relationships may be used."
 msgstr ""
+"Se definido, este campo vai ajudar segmentos que atuam em \"sem duplicados\" "
+"de modo a evitar a seleção de registros semelhantes duas vezes. Registros "
+"semelhantes são registros que têm o mesmo valor para esse campo único. Por "
+"exemplo, escolhendo o \"email_from\" do campo de Prospectos do CRM que "
+"impediria o envio da mesma campanha para o endereço de e-mail mesmo. Se não "
+"for definido, o \"não\" segmentos duplicados só evitar selecionar o mesmo "
+"registro novamente se ele entrou na campanha anteriormente. Campos só "
+"facilmente comparáveis ​​como textfields, inteiros, seleções ou "
+"relacionamentos simples podem ser utilizadas."
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:529
 #, python-format
 msgid "After %(interval_nbr)d %(interval_type)s"
-msgstr ""
+msgstr "Após %(interval_nbr)d %(interval_type)s"
 
 #. module: marketing_campaign
 #: model:email.template,subject:marketing_campaign.email_template_1
 msgid "Welcome in OpenERP Partner Channel!"
-msgstr ""
+msgstr "Bem-vindo ao Canal de Parceiros OpenERP!"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign
 msgid "Marketing Campaign"
-msgstr ""
+msgstr "Campanha de Marketing"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,date_done:0
 msgid "End Date"
-msgstr ""
+msgstr "Data Final"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "February"
-msgstr ""
+msgstr "Fevereiro"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -947,7 +1018,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,object_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Recurso"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,fixed_cost:0
@@ -956,11 +1027,16 @@ msgid ""
 "revenue on each campaign activity. Cost and Revenue statistics are included "
 "in Campaign Reporting."
 msgstr ""
+"Custo fixo para a execução desta campanha. Você também pode especificar o "
+"custo variável e receita em cada atividade de campanha. Estatísticas de "
+"custos e receitas estão incluídos no relatório da campanha."
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Sync mode: only records updated after last sync"
 msgstr ""
+"Modo de Sincronização: somente os registros atualizados após última "
+"sincronização"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,country_id:0
@@ -970,29 +1046,33 @@ msgstr "País"
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,signal:0
 msgid "Signal"
-msgstr ""
+msgstr "Sinal"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.workitem,date:0
 msgid "If date is not set, this workitem has to be run manually"
 msgstr ""
+"Se a data não está definida, este item de trabalho tem de ser executado "
+"manualmente"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:158
 #, python-format
 msgid "The campaign cannot be marked as done before all segments are closed."
 msgstr ""
+"A campanha não pode ser marcado como feito antes que todos os segmentos "
+"estejam fechados."
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: field:marketing.campaign,mode:0
 msgid "Mode"
-msgstr ""
+msgstr "Modo"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -1001,7 +1081,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,activity_id:0
 msgid "Activity"
-msgstr ""
+msgstr "Atividade"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,ir_filter_id:0
@@ -1011,66 +1091,71 @@ msgid ""
 "view of the Resource. If no filter is set, all records are selected without "
 "filtering. The synchronization mode may also add a criterion to the filter."
 msgstr ""
+"Filtro para selecionar os registros de recursos correspondentes que "
+"pertencem a este segmento. Novos filtros podem ser criados e salvos com a "
+"pesquisa avançada sobre a exibição de lista do recurso. Se nenhum filtro for "
+"definido, todos os registros são selecionados sem filtragem. O modo de "
+"sincronização pode também adicionar um critério para o filtro."
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
 #: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
 msgid "Campaign Followup"
-msgstr ""
+msgstr "Acompanhamento da Campanha"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,date_next_sync:0
 msgid "Next Synchronization"
-msgstr ""
+msgstr "Próxima Sincronização"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 #: field:marketing.campaign.segment,ir_filter_id:0
 msgid "Filter"
-msgstr ""
+msgstr "Filtro"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "All"
-msgstr ""
+msgstr "Todos"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
 msgid "Only records created after last sync"
-msgstr ""
+msgstr "Somente os registros criados após última sincronização"
 
 #. module: marketing_campaign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,variable_cost:0
 msgid "Variable Cost"
-msgstr ""
+msgstr "Custo Variável"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "With Manual Confirmation"
-msgstr ""
+msgstr "Com Confirmação Manual"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,total_cost:0
 #: view:marketing.campaign:0
 msgid "Cost"
-msgstr ""
+msgstr "Custo"
 
 #. module: marketing_campaign
 #: model:email.template,body_text:marketing_campaign.email_template_1
 msgid "Hello, We are very happy to send Welcome message."
-msgstr ""
+msgstr "Olá, Estamos muito felizes em enviar mensagem de boas vindas."
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,year:0
 msgid "Year"
-msgstr ""
+msgstr "Ano"
 
 #~ msgid "This Year"
 #~ msgstr "Este Ano"
diff --git a/addons/marketing_campaign/i18n/ro.po b/addons/marketing_campaign/i18n/ro.po
index 7ae3cba4286..fe35ebe929e 100644
--- a/addons/marketing_campaign/i18n/ro.po
+++ b/addons/marketing_campaign/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/ru.po b/addons/marketing_campaign/i18n/ru.po
index 0eb16667773..6300d4e890f 100644
--- a/addons/marketing_campaign/i18n/ru.po
+++ b/addons/marketing_campaign/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/sr@latin.po b/addons/marketing_campaign/i18n/sr@latin.po
index 08a6adfbd0d..0b37a27a11e 100644
--- a/addons/marketing_campaign/i18n/sr@latin.po
+++ b/addons/marketing_campaign/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/sv.po b/addons/marketing_campaign/i18n/sv.po
index e68e0ca2e48..d7d9d289016 100644
--- a/addons/marketing_campaign/i18n/sv.po
+++ b/addons/marketing_campaign/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/i18n/tr.po b/addons/marketing_campaign/i18n/tr.po
index 58a76b111eb..74f05e0e2b4 100644
--- a/addons/marketing_campaign/i18n/tr.po
+++ b/addons/marketing_campaign/i18n/tr.po
@@ -14,29 +14,29 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Manual Mode"
-msgstr ""
+msgstr "El Kipi"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,activity_from_id:0
 msgid "Previous Activity"
-msgstr ""
+msgstr "Önceki Etkinlik"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:818
 #, python-format
 msgid "The current step for this item has no email or report to preview."
-msgstr ""
+msgstr "Bu öğenin geçerli adımında önizlenecek eposta ve rapor yok."
 
 #. module: marketing_campaign
 #: constraint:marketing.campaign.transition:0
 msgid "The To/From Activity of transition must be of the same Campaign "
-msgstr ""
+msgstr "Geçişin Kime/Kimden Eylemi aynı Kampanyaya ait olmalı "
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,trigger:0
@@ -46,7 +46,7 @@ msgstr "Zaman"
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
 msgid "Custom Action"
-msgstr ""
+msgstr "Özel Etkinlik"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -72,18 +72,18 @@ msgstr "Tetik"
 #. module: marketing_campaign
 #: field:campaign.analysis,count:0
 msgid "# of Actions"
-msgstr ""
+msgstr "Etkinlik #"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Campaign Editor"
-msgstr ""
+msgstr "Kampanya Düzenleyici"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: view:marketing.campaign.workitem:0
 msgid "Today"
-msgstr ""
+msgstr "Bugün"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
@@ -91,17 +91,17 @@ msgstr ""
 #: view:marketing.campaign.segment:0
 #: selection:marketing.campaign.segment,state:0
 msgid "Running"
-msgstr ""
+msgstr "Çalışıyor"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "March"
-msgstr ""
+msgstr "Mart"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,object_id:0
 msgid "Object"
-msgstr ""
+msgstr "Nesne"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
@@ -112,77 +112,77 @@ msgstr ""
 #: model:email.template,body_text:marketing_campaign.email_template_2
 msgid ""
 "Hello, We are happy to announce that you now become our Silver Partner."
-msgstr ""
+msgstr "Merhaba, Gümüş Ortağımız olduğunuzu bildirmekten mutluluk duyuyoruz."
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Taslağa  Ayarla"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,to_ids:0
 msgid "Next Activities"
-msgstr ""
+msgstr "Sonraki Etkinlikler"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Synchronization"
-msgstr ""
+msgstr "Eşitleme"
 
 #. module: marketing_campaign
 #: sql_constraint:marketing.campaign.transition:0
 msgid "The interval must be positive or zero"
-msgstr ""
+msgstr "Aralık artı ya da sıfır değerde olmalı"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:818
 #, python-format
 msgid "No preview"
-msgstr ""
+msgstr "Önizleme yok"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 #: field:marketing.campaign.segment,date_run:0
 msgid "Launch Date"
-msgstr ""
+msgstr "Öğle Yemeği Tarihi"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 #: field:campaign.analysis,day:0
 msgid "Day"
-msgstr ""
+msgstr "Gün"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Outgoing Transitions"
-msgstr ""
+msgstr "Giden Geçişler"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Reset"
-msgstr ""
+msgstr "Sıfırla"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,object_id:0
 msgid "Choose the resource on which you want this campaign to be run"
-msgstr ""
+msgstr "Bu kampanyanı yürütmek istediğiniz kaynağı seçin"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_last_date:0
 msgid "Last Synchronization"
-msgstr ""
+msgstr "Son Eşleme"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:214
 #, python-format
 msgid "You can not duplicate a campaign, it's not supported yet."
-msgstr ""
+msgstr "Bir kampanyayı çiftleyemezsiniz, bu henüz desteklenmemektedir."
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Year(s)"
-msgstr ""
+msgstr "Yıl(lar)"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_last_date:0
@@ -197,12 +197,12 @@ msgstr ""
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Vazgeçildi"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,trigger:0
 msgid "Automatic"
-msgstr ""
+msgstr "Otomatik"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,mode:0
@@ -232,7 +232,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,campaign_id:0
 msgid "Campaign"
-msgstr ""
+msgstr "Kampanya"
 
 #. module: marketing_campaign
 #: model:email.template,subject:marketing_campaign.email_template_3
@@ -246,12 +246,12 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,segment_id:0
 msgid "Segment"
-msgstr ""
+msgstr "Bölüm"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Cost / Revenue"
-msgstr ""
+msgstr "Maliyet / Gelir"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,type:0
@@ -273,7 +273,7 @@ msgstr ""
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Month(s)"
-msgstr ""
+msgstr "Ay(lar)"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -281,17 +281,17 @@ msgstr ""
 #: model:ir.model,name:marketing_campaign.model_res_partner
 #: field:marketing.campaign.workitem,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Paydaş"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Transitions"
-msgstr ""
+msgstr "Geçişler"
 
 #. module: marketing_campaign
 #: model:ir.filters,name:marketing_campaign.filter0
 msgid "Partners"
-msgstr ""
+msgstr "Paydaşlar"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,keep_if_condition_not_met:0
@@ -308,23 +308,23 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,state:0
 msgid "State"
-msgstr ""
+msgstr "Durum"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "Marketing Reports"
-msgstr ""
+msgstr "Pazarlama Raporları"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,state:0
 #: selection:marketing.campaign.segment,state:0
 msgid "New"
-msgstr ""
+msgstr "Yeni"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tür"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,name:0
@@ -332,12 +332,12 @@ msgstr ""
 #: field:marketing.campaign.segment,name:0
 #: field:marketing.campaign.transition,name:0
 msgid "Name"
-msgstr ""
+msgstr "Adı"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.workitem,res_name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "Kaynak Adı"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,sync_mode:0
@@ -348,12 +348,12 @@ msgstr ""
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 msgid "Run"
-msgstr ""
+msgstr "Çalıştır"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,from_ids:0
 msgid "Previous Activities"
-msgstr ""
+msgstr "Önceki Etkinlikler"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,date_done:0
@@ -363,13 +363,13 @@ msgstr ""
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Marketing Campaign Activities"
-msgstr ""
+msgstr "Pazarlama Kampanyası Etkinlikleri"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,error_msg:0
 msgid "Error Message"
-msgstr ""
+msgstr "Hatâ İletisi"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
@@ -377,34 +377,34 @@ msgstr ""
 #: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
 #: view:marketing.campaign:0
 msgid "Campaigns"
-msgstr ""
+msgstr "Kampanyalar"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,interval_type:0
 msgid "Interval Unit"
-msgstr ""
+msgstr "Aralık Birimi"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:792
 #, python-format
 msgid "Email Preview"
-msgstr ""
+msgstr "Eposta Önizle"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,report_id:0
 #: selection:marketing.campaign.activity,type:0
 msgid "Report"
-msgstr ""
+msgstr "Rapor"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "July"
-msgstr ""
+msgstr "Temmuz"
 
 #. module: marketing_campaign
 #: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Yapılandırma"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,variable_cost:0
@@ -417,24 +417,24 @@ msgstr ""
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Hour(s)"
-msgstr ""
+msgstr "Saat(ler)"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Ay-1    "
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
 msgid "Campaign Segment"
-msgstr ""
+msgstr "Kampanya Bölümü"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 #: view:marketing.campaign.workitem:0
 msgid "Cancel"
-msgstr ""
+msgstr "Vazgeç"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,keep_if_condition_not_met:0
@@ -446,17 +446,17 @@ msgstr ""
 #. module: marketing_campaign
 #: view:campaign.analysis:0
 msgid "Exceptions"
-msgstr ""
+msgstr "İstisnalar"
 
 #. module: marketing_campaign
 #: field:res.partner,workitem_ids:0
 msgid "Workitems"
-msgstr ""
+msgstr "İşöğeleri"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,fixed_cost:0
 msgid "Fixed Cost"
-msgstr ""
+msgstr "Sabit Masraflar"
 
 #. module: marketing_campaign
 #: model:email.template,subject:marketing_campaign.email_template_2
@@ -477,17 +477,17 @@ msgstr ""
 #: field:campaign.analysis,revenue:0
 #: field:marketing.campaign.activity,revenue:0
 msgid "Revenue"
-msgstr ""
+msgstr "Gelir"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "September"
-msgstr ""
+msgstr "Eylül"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "December"
-msgstr ""
+msgstr "Aralık"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,partner_field_id:0
@@ -502,12 +502,12 @@ msgstr ""
 #: view:campaign.analysis:0
 #: field:campaign.analysis,month:0
 msgid "Month"
-msgstr ""
+msgstr "Ay"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,activity_to_id:0
 msgid "Next Activity"
-msgstr ""
+msgstr "Sonraki Etkinlik"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup
@@ -522,7 +522,7 @@ msgstr ""
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 msgid "Test Mode"
-msgstr ""
+msgstr "Test Modu"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
@@ -537,7 +537,7 @@ msgstr ""
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
 msgid "Campaign Statistics"
-msgstr ""
+msgstr "Kampanya İstatistikleri"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,server_action_id:0
@@ -547,7 +547,7 @@ msgstr ""
 #. module: marketing_campaign
 #: field:marketing.campaign,partner_field_id:0
 msgid "Partner Field"
-msgstr ""
+msgstr "Paydaş Alanı"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -555,7 +555,7 @@ msgstr ""
 #: model:ir.model,name:marketing_campaign.model_campaign_analysis
 #: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all
 msgid "Campaign Analysis"
-msgstr ""
+msgstr "Kampanya İncelemesi"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,sync_mode:0
@@ -571,28 +571,28 @@ msgstr ""
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test in Realtime"
-msgstr ""
+msgstr "Gerçekzamanlı Test"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Test Directly"
-msgstr ""
+msgstr "Doğrudan Test"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,report_directory_id:0
 msgid "Directory"
-msgstr ""
+msgstr "Dizin"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 msgid "Draft"
-msgstr ""
+msgstr "Taslak"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Preview"
-msgstr ""
+msgstr "Önizle"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
@@ -602,12 +602,12 @@ msgstr ""
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "August"
-msgstr ""
+msgstr "Ağustos"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,start:0
@@ -624,12 +624,12 @@ msgstr ""
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "June"
-msgstr ""
+msgstr "Haziran"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_email_template
 msgid "Email Templates"
-msgstr ""
+msgstr "Eposta Şablonları"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
@@ -644,24 +644,24 @@ msgstr ""
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Newly Created"
-msgstr ""
+msgstr "Yeni Oluşturuldu"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,date:0
 #: view:marketing.campaign.workitem:0
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "November"
-msgstr ""
+msgstr "Kasım"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 #: field:marketing.campaign.activity,condition:0
 msgid "Condition"
-msgstr ""
+msgstr "Koşul"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.activity,report_id:0
@@ -686,22 +686,22 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Exception"
-msgstr ""
+msgstr "İstisna"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "October"
-msgstr ""
+msgstr "Ekim"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,email_template_id:0
 msgid "Email Template"
-msgstr ""
+msgstr "Eposta Şablonu"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "January"
-msgstr ""
+msgstr "Ocak"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
@@ -730,13 +730,13 @@ msgstr ""
 #: code:addons/marketing_campaign/marketing_campaign.py:158
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Hata"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 #: field:marketing.campaign.activity,server_action_id:0
 msgid "Action"
-msgstr ""
+msgstr "Eylem"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:528
@@ -747,25 +747,25 @@ msgstr ""
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,start:0
 msgid "Start"
-msgstr ""
+msgstr "Başlat"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Geçmiş"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Process"
-msgstr ""
+msgstr "İşlem"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:530
 #: selection:marketing.campaign.transition,trigger:0
 #, python-format
 msgid "Cosmetic"
-msgstr ""
+msgstr "Kosmetik"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.transition,trigger:0
@@ -790,13 +790,13 @@ msgstr ""
 #: selection:marketing.campaign.segment,state:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "Done"
-msgstr ""
+msgstr "Yapıldı"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:214
 #, python-format
 msgid "Operation not supported"
-msgstr ""
+msgstr "İşlem desteklenmiyor"
 
 #. module: marketing_campaign
 #: model:email.template,body_text:marketing_campaign.email_template_3
@@ -806,7 +806,7 @@ msgstr ""
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Close"
-msgstr ""
+msgstr "Kapat"
 
 #. module: marketing_campaign
 #: constraint:marketing.campaign.segment:0
@@ -835,7 +835,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "Kaynak ID"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:136
@@ -854,7 +854,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "To Do"
-msgstr ""
+msgstr "Yapılacaklar"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
@@ -866,7 +866,7 @@ msgstr ""
 #: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
 #: view:marketing.campaign.segment:0
 msgid "Segments"
-msgstr ""
+msgstr "Parçalar"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
@@ -876,28 +876,28 @@ msgstr ""
 #. module: marketing_campaign
 #: view:marketing.campaign.activity:0
 msgid "Incoming Transitions"
-msgstr ""
+msgstr "Gelen Geçişler"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.activity,type:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-Posta"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
 msgid "Day(s)"
-msgstr ""
+msgstr "Gün(ler)"
 
 #. module: marketing_campaign
 #: field:marketing.campaign,activity_ids:0
 #: view:marketing.campaign.activity:0
 msgid "Activities"
-msgstr ""
+msgstr "Etkinlikler"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayıs"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,unique_field_id:0
@@ -931,12 +931,12 @@ msgstr ""
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,date_done:0
 msgid "End Date"
-msgstr ""
+msgstr "Bitiş Tarihi"
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "February"
-msgstr ""
+msgstr "Şubat"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -947,7 +947,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,object_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Kaynak"
 
 #. module: marketing_campaign
 #: help:marketing.campaign,fixed_cost:0
@@ -965,7 +965,7 @@ msgstr ""
 #. module: marketing_campaign
 #: field:campaign.analysis,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Ülke"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,signal:0
@@ -980,7 +980,7 @@ msgstr ""
 #. module: marketing_campaign
 #: selection:campaign.analysis,month:0
 msgid "April"
-msgstr ""
+msgstr "Nisan"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:158
@@ -992,7 +992,7 @@ msgstr ""
 #: view:marketing.campaign:0
 #: field:marketing.campaign,mode:0
 msgid "Mode"
-msgstr ""
+msgstr "Kip"
 
 #. module: marketing_campaign
 #: view:campaign.analysis:0
@@ -1001,7 +1001,7 @@ msgstr ""
 #: view:marketing.campaign.workitem:0
 #: field:marketing.campaign.workitem,activity_id:0
 msgid "Activity"
-msgstr ""
+msgstr "Etkinlik"
 
 #. module: marketing_campaign
 #: help:marketing.campaign.segment,ir_filter_id:0
@@ -1016,7 +1016,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
 #: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
 msgid "Campaign Followup"
-msgstr ""
+msgstr "Kampanya İzleme"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.segment,date_next_sync:0
@@ -1027,12 +1027,12 @@ msgstr ""
 #: view:marketing.campaign.segment:0
 #: field:marketing.campaign.segment,ir_filter_id:0
 msgid "Filter"
-msgstr ""
+msgstr "Süzgeç"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "All"
-msgstr ""
+msgstr "Hepsi"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.segment,sync_mode:0
@@ -1042,12 +1042,12 @@ msgstr ""
 #. module: marketing_campaign
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Hata ! Özyinelemeli ilişkili üyeler oluşturamazsınız."
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,variable_cost:0
 msgid "Variable Cost"
-msgstr ""
+msgstr "Değişken Maliyet"
 
 #. module: marketing_campaign
 #: selection:marketing.campaign,mode:0
diff --git a/addons/marketing_campaign/i18n/zh_CN.po b/addons/marketing_campaign/i18n/zh_CN.po
index bfaf302c956..7984a158d10 100644
--- a/addons/marketing_campaign/i18n/zh_CN.po
+++ b/addons/marketing_campaign/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign
 #: view:marketing.campaign:0
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
index 54897cd111a..92443fe987d 100644
--- a/addons/marketing_campaign/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -3,29 +3,29 @@
     <data>
         <!-- Email tempalte -->
         <record id="email_template_1" model="email.template">
-            <field name="name">Template for New Partner</field>
+            <field name="name">welcome new partner</field>
             <field name="email_from">info@openerp.com</field>
-            <field name="subject">Welcome in OpenERP Partner Channel!</field>
+            <field name="subject">Welcome to the OpenERP Partner Channel!</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body_text">Hello, We are very happy to send Welcome message.</field>
+            <field name="body_html">Hello, you will receive your welcome pack via email shortly.</field>
         </record>
         <record id="email_template_2" model="email.template">
-            <field name="name">Template for Silver Partner</field>
+            <field name="name">congrats silver partner</field>
             <field name="email_from">info@openerp.com</field>
-            <field name="subject">Congratulation! You become now our Silver Partner.</field>
+            <field name="subject">Congratulations! You are now a Silver Partner!</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body_text">Hello, We are happy to announce that you now become our Silver Partner.</field>
+            <field name="body_html">Hi, we are delighted to welcome you among our Silver Partners as of today!</field>
         </record>
 
         <record id="email_template_3" model="email.template">
-            <field name="name">Template for Gold Partner</field>
+            <field name="name">congrats gold partner</field>
             <field name="email_from">info@openerp.com</field>
-            <field name="subject">Congratulation! You become our Gold Partner.</field>
+            <field name="subject">Congratulations! You are now one of our Gold Partners!</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body_text">Hello, We are happy to announce that you become our Gold Partner.</field>
+            <field name="body_html">Hi, we are delighted to let you know that you have entered the select circle of our Gold Partners</field>
         </record>
 
 
@@ -64,7 +64,7 @@
         </record>
 
 
-    <!-- Tranisition -->
+    <!-- Transition -->
         <record id="marketing_campaign_transition_0" model="marketing.campaign.transition">
             <field model="marketing.campaign.activity" name="activity_from_id" ref = "marketing_campaign_activity_0"/>
             <field model="marketing.campaign.activity" name="activity_to_id" ref = "marketing_campaign_activity_1"/>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index 19b9536c432..ab45f802371 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -5,21 +5,36 @@
     <menuitem name="Configuration" id="menu_marketing_configuration" parent="base.marketing_menu" sequence="1"/>
 
     <!-- Marketing Campaign -->
-    <act_window name="All Segments"
-        res_model="marketing.campaign.segment"
-        src_model="marketing.campaign"
-        view_type="form"
-        view_mode="tree,form"
-        id="act_marketing_campaing_segment_opened"
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/>
+    
+    <record id="act_marketing_campaing_segment_opened" model="ir.actions.act_window">
+        <field name="res_model">marketing.campaign.segment</field>
+        <field name="view_type">form</field>
+        <field name="name">Segments</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}</field>
+    </record>
+    
+    <!-- Campaign Follow-ups -->
+        
+    <record id="act_marketing_campaing_followup" model="ir.actions.act_window">
+        <field name="res_model">marketing.campaign.workitem</field>
+        <field name="view_type">form</field>
+        <field name="name">Workitems</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}</field>
+    </record>
+    
+    <!-- Campaign Statistics -->
+    
+    <record id="act_marketing_campaing_stat" model="ir.actions.act_window" >
+        <field name="res_model">campaign.analysis</field>
+        <field name="view_type">form</field>
+        <field name="name">Campaign Follow-up</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}</field>
+    </record>
 
     <!-- Campaign Followups -->
-    <act_window
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
-        id="act_marketing_campaing_followup"
-        name="Campaign Follow-up" res_model="marketing.campaign.workitem"
-        src_model="marketing.campaign" view_mode="tree,form"
-        view_type="form"/>
 
     <record model="ir.ui.view" id="view_marketing_campaign_form">
         <field name="name">marketing.campaign.form</field>
@@ -35,12 +50,15 @@
             </header>
             <sheet string="Campaign">
                 <div class="oe_right oe_button_box" name="button_box">
-                        <button type="action"
+                    <button type="action"
+                        name="%(act_marketing_campaing_stat)d"
+                        string="Campaign Statistics"/>
+                    <button type="action"
+                        name="%(act_marketing_campaing_segment_opened)d"
+                        string="Segments"/>  
+                    <button type="action"
                         name="%(act_marketing_campaing_followup)d"
                         string="Follow-Up"/>
-                        <button type="action"
-                        name="%(act_marketing_campaing_segment_opened)d"
-                        string="Segments"/>
                 </div>
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
@@ -252,7 +270,7 @@
                         <field name="signal" groups="base.group_no_one"/>
                         <field name="start"/>
                         <field name="object_id" invisible="1"/>
-                        <field name="campaign_id" invisible="1"/>
+                        <field name="campaign_id" invisible="1" required="0"/>
                     </group>
                     <group>
                         <field name="variable_cost"/>
@@ -422,29 +440,5 @@
 
     <menuitem id="menu_action_marketing_campaign_workitem" parent="menu_marketing_campaign" action="action_marketing_campaign_workitem" sequence="10"/>
 
-    <act_window name="All Segments"
-        res_model="marketing.campaign.segment"
-        src_model="marketing.campaign"
-        view_type="form"
-        view_mode="tree,form"
-        id="act_marketing_campaing_segment_opened"
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/>
-
-    <!-- Campaign Follow-ups -->
-    <act_window
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
-        id="act_marketing_campaing_followup"
-        name="Campaign Follow-up" res_model="marketing.campaign.workitem"
-        src_model="marketing.campaign" view_mode="tree,form"
-        view_type="form"/>
-
-    <!-- Campaign Statistics -->
-    <act_window
-        context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"
-        id="act_marketing_campaing_stat"
-        name="Campaign Statistics" res_model="campaign.analysis"
-        src_model="marketing.campaign" view_mode="tree,form"
-        view_type="form"/>
-
     </data>
 </openerp>
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index db79ce44132..d3693497408 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -5,7 +5,7 @@
         <field name="name">campaign.analysis.tree</field>
         <field name="model">campaign.analysis</field>
         <field name="arch" type="xml">
-            <tree string="Marketing Reports">
+            <tree string="Marketing Reports" create="false">
                 <field name="year" invisible="1"/>
                 <field name="month" invisible="1"/>
                 <field name="day" invisible="1"/>
diff --git a/addons/marketing_campaign/res_partner.py b/addons/marketing_campaign/res_partner.py
index 98ac53b7b29..8ae1ab8645a 100644
--- a/addons/marketing_campaign/res_partner.py
+++ b/addons/marketing_campaign/res_partner.py
@@ -29,7 +29,13 @@ class res_partner(osv.osv):
                                         'partner_id', 'Workitems',
                                         readonly=True),
     }
-
+    
+    def copy(self, cr, uid, id, default={}, context=None):
+        default.update({
+            'workitem_ids': [],
+        })
+        return super(res_partner, self).copy(cr, uid, id, default=default, context=context)
+    
 res_partner()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign/res_partner_view.xml b/addons/marketing_campaign/res_partner_view.xml
index 5b959625086..63c65ccd97f 100644
--- a/addons/marketing_campaign/res_partner_view.xml
+++ b/addons/marketing_campaign/res_partner_view.xml
@@ -12,7 +12,7 @@
                    <attribute name="invisible">False</attribute>
                 </xpath>
                 <xpath expr="//page[@name='page_history']" position="inside">
-                    <group name="grp_campaign" string="Campaign">
+                    <group name="grp_campaign" string="Campaigns">
                         <field name="workitem_ids" colspan="4" nolabel="1"/>
                     </group>
                 </xpath>
diff --git a/addons/marketing_campaign/test/marketing_campaign.yml b/addons/marketing_campaign/test/marketing_campaign.yml
index 04063a6fbc1..3d540b4ccb7 100644
--- a/addons/marketing_campaign/test/marketing_campaign.yml
+++ b/addons/marketing_campaign/test/marketing_campaign.yml
@@ -42,7 +42,7 @@
     record = self.browse(cr, uid, ids[0])
     assert record.state == 'todo' or record.state == 'done' , 'Marketing Workitem shoud be in draft state.'
 -
-  I check follow-up detail of first activity.
+  I process follow-up of first activity.
 -
   !python {model: marketing.campaign.workitem}: |
     ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
@@ -50,12 +50,6 @@
     assert ids, 'Follow-up item is not created for first activity.'
     work_item_id = self.browse(cr ,uid ,ids[0] ,context)
     assert work_item_id.res_name, 'Resource Name is not defined.'
--
-  I process follow-up of first activity.
--
-  !python {model: marketing.campaign.workitem}: |
-    ids = self.search(cr, uid, [('segment_id', '=', ref('marketing_campaign_segment0')),
-    ('campaign_id', '=', ref('marketing_campaign_openerppartnerchannel')), ('activity_id', '=', ref('marketing_campaign_activity_0'))])
     self.process(cr, uid, ids)
     record = self.browse(cr, uid, ids)[0]
     assert record.state == "done", "Follow-up item should be closed after process."
diff --git a/addons/marketing_campaign_crm_demo/__openerp__.py b/addons/marketing_campaign_crm_demo/__openerp__.py
index 5a3c7bde1f7..9265561bd64 100644
--- a/addons/marketing_campaign_crm_demo/__openerp__.py
+++ b/addons/marketing_campaign_crm_demo/__openerp__.py
@@ -21,28 +21,24 @@
 
 
 {
-    "name" : "Marketing Campaign - Demo",
-    "version" : "1.0",
-    "depends" : ["marketing_campaign",
-                 "crm",
-                ],
-    "author" : "OpenERP SA",
-    "category": 'Marketing',
-    "description": """
+    'name': 'Marketing Campaign - Demo',
+    'version': '1.0',
+    'depends': ['marketing_campaign',
+                 'crm',
+    ],
+    'author': 'OpenERP SA',
+    'category': 'Marketing',
+    'description': """
 Demo data for the module marketing_campaign.
 ============================================
 
 Creates demo data like leads, campaigns and segments for the module marketing_campaign.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [],
-    'demo_xml': [
-        'marketing_campaign_demo.xml',
-    ],
+    'data': [],
+    'demo': ['marketing_campaign_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001005497972871352957',
     'images': ['images/campaigns.jpeg','images/email_templates.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/marketing_campaign_crm_demo/i18n/ar.po b/addons/marketing_campaign_crm_demo/i18n/ar.po
index 267eb1589af..fe583a7c237 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ar.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/bg.po b/addons/marketing_campaign_crm_demo/i18n/bg.po
index 0c1bc6f6631..f68f6798f41 100644
--- a/addons/marketing_campaign_crm_demo/i18n/bg.po
+++ b/addons/marketing_campaign_crm_demo/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/ca.po b/addons/marketing_campaign_crm_demo/i18n/ca.po
index 150efd9a1ee..95b1b0ba1e8 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ca.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/da.po b/addons/marketing_campaign_crm_demo/i18n/da.po
index 87814ad174e..6f6bb295d76 100644
--- a/addons/marketing_campaign_crm_demo/i18n/da.po
+++ b/addons/marketing_campaign_crm_demo/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/de.po b/addons/marketing_campaign_crm_demo/i18n/de.po
index 6f1307d95b9..b3fda0897fe 100644
--- a/addons/marketing_campaign_crm_demo/i18n/de.po
+++ b/addons/marketing_campaign_crm_demo/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/es.po b/addons/marketing_campaign_crm_demo/i18n/es.po
index 11a6ea7acb6..e1806d3e110 100644
--- a/addons/marketing_campaign_crm_demo/i18n/es.po
+++ b/addons/marketing_campaign_crm_demo/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/es_CR.po b/addons/marketing_campaign_crm_demo/i18n/es_CR.po
index a513aec0098..28e253a8263 100644
--- a/addons/marketing_campaign_crm_demo/i18n/es_CR.po
+++ b/addons/marketing_campaign_crm_demo/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: marketing_campaign_crm_demo
diff --git a/addons/marketing_campaign_crm_demo/i18n/fr.po b/addons/marketing_campaign_crm_demo/i18n/fr.po
index 5cec8cdc3cb..1a46ff07946 100644
--- a/addons/marketing_campaign_crm_demo/i18n/fr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/gl.po b/addons/marketing_campaign_crm_demo/i18n/gl.po
index 900c72199c8..5fc26f0a548 100644
--- a/addons/marketing_campaign_crm_demo/i18n/gl.po
+++ b/addons/marketing_campaign_crm_demo/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/hr.po b/addons/marketing_campaign_crm_demo/i18n/hr.po
index 6f03a88c348..a0f5a4e9b10 100644
--- a/addons/marketing_campaign_crm_demo/i18n/hr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/hu.po b/addons/marketing_campaign_crm_demo/i18n/hu.po
index b02d2ba6cd5..b576b45fde7 100644
--- a/addons/marketing_campaign_crm_demo/i18n/hu.po
+++ b/addons/marketing_campaign_crm_demo/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/it.po b/addons/marketing_campaign_crm_demo/i18n/it.po
index fc820e784ac..618bcd5b2ec 100644
--- a/addons/marketing_campaign_crm_demo/i18n/it.po
+++ b/addons/marketing_campaign_crm_demo/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/ja.po b/addons/marketing_campaign_crm_demo/i18n/ja.po
index 10e109a4956..273c2b8db1a 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ja.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/nb.po b/addons/marketing_campaign_crm_demo/i18n/nb.po
new file mode 100644
index 00000000000..26ea7312ef8
--- /dev/null
+++ b/addons/marketing_campaign_crm_demo/i18n/nb.po
@@ -0,0 +1,192 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
+msgid "Marketing campaign demo report"
+msgstr "Markedsføringskampanje demo rapport."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_1
+msgid ""
+"Hello,Thanks for generous interest you have shown in the "
+"openERP.Regards,OpenERP Team,"
+msgstr ""
+"Hei, Takk for sjenerøs interessen du har vist i openERP.Regards, OpenERP lag,"
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Company :"
+msgstr "Firma :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_4
+msgid "Thanks for buying the OpenERP book"
+msgstr "Takk for at du kjøpte OpenERP boken."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_6
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  paid technical training on "
+"june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hei, Vi har veldig godt tilbud som kan passe for deg.\n"
+"             For våre sølv partnere, Vi betalte teknisk trening på juni "
+"2010.\n"
+"             Hvis noen ytterligere opplysninger som kreves ber gå tilbake.\n"
+"             Jeg setter pris på ditt samarbeid om dette.\n"
+"             Hilsen OpenERP Team,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_5
+msgid "Propose a free technical training to Gold partners"
+msgstr "Foreslå en gratis teknisk opplæring til Gold partnere."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_3
+msgid "Thanks for subscribing to the OpenERP Discovery Day"
+msgstr "Takk for at du  abonnerte på OpenERP Discovery dag."
+
+#. module: marketing_campaign_crm_demo
+#: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
+msgid "Dummy Action"
+msgstr "Dummy handling."
+
+#. module: marketing_campaign_crm_demo
+#: report:crm.lead.demo:0
+msgid "Partner :"
+msgstr "Partner :"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_1
+msgid "Thanks for showing interest in OpenERP"
+msgstr "Takk for at du viser interesse for OpenERP."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_2
+msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
+msgstr "Foreslår å abonnere på OpenERP Discovery Day mai 2010."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_7
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our silver partners,We are  offering Gold partnership.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hei, Vi har veldig godt tilbud som kan passe for deg.\n"
+"             For våre sølv partnere, tilbyr vi Gold partnerskap.\n"
+"             Hvis noen ytterligere opplysninger som kreves ber gå tilbake.\n"
+"             Jeg setter pris på ditt samarbeid om dette.\n"
+"             Hilsen OpenERP Team,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_7
+msgid "Propose gold partnership to silver partners"
+msgstr "Foreslå gull partnerskap til sølv partnere."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_4
+msgid ""
+"Hello,Thanks for showing intrest and buying the OpenERP book.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hei, Takk for at du viser interesse og kjøpe OpenERP boken.\n"
+"             Hvis noen ytterligere opplysninger som kreves ber gå tilbake.\n"
+"             Jeg setter pris på ditt samarbeid om dette.\n"
+"             Hilsen OpenERP Team,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_5
+msgid ""
+"Hello, We have very good offer that might suit you.\n"
+"            For our gold partners,We are arranging free technical training "
+"on june,2010.\n"
+"            If any further information required kindly revert back.\n"
+"            I really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hei, Vi har veldig godt tilbud som kan passe for deg.\n"
+"             For våre gull partnere, Vi arrangerer gratis teknisk trening på "
+"juni 2010.\n"
+"             Hvis noen ytterligere opplysninger som kreves ber gå tilbake.\n"
+"             Jeg setter pris på ditt samarbeid om dette.\n"
+"             Hilsen OpenERP Team,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_3
+msgid ""
+"Hello,Thanks for showing intrest and for subscribing to the OpenERP "
+"Discovery Day.\n"
+"             If any further information required kindly revert back.\n"
+"             I really appreciate your co-operation on this.\n"
+"             Regards,OpenERP Team,"
+msgstr ""
+"Hei, Takk for at du viser interesse og for å abonnere på OpenERP Discovery "
+"Day.\n"
+"              Hvis noen ytterligere opplysninger som kreves ber gå tilbake.\n"
+"              Jeg setter pris på ditt samarbeid om dette.\n"
+"              Hilsen OpenERP Team,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_8
+msgid "Thanks for subscribing to technical training"
+msgstr "Takk for at du abonnerte på teknisk trening."
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_2
+msgid ""
+"Hello,We have very good offer that might suit you.\n"
+"            We propose you to subscribe to the OpenERP Discovery Day on May "
+"2010.\n"
+"            If any further information required kindly revert back.\n"
+"            We really appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hei, Vi har veldig godt tilbud som kan passe for deg.\n"
+"             Vi foreslår at du abonnere på OpenERP Discovery Day mai 2010.\n"
+"             Hvis noen ytterligere opplysninger som kreves ber gå tilbake.\n"
+"             Vi setter pris på din samarbeid om dette.\n"
+"             Hilsen OpenERP Team,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,body_text:marketing_campaign_crm_demo.email_template_8
+msgid ""
+"Hello, Thanks for showing intrest and for subscribing to technical "
+"training.If any further information required kindly revert back.I really "
+"appreciate your co-operation on this.\n"
+"            Regards,OpenERP Team,"
+msgstr ""
+"Hei, Takk for at du viser interesse og for å abonnere på teknisk training.If "
+"ytterligere informasjon som kreves ber tilbake tilbake.Jeg virkelig setter "
+"pris på din samarbeid om dette.\n"
+"             Hilsen OpenERP Team,"
+
+#. module: marketing_campaign_crm_demo
+#: model:email.template,subject:marketing_campaign_crm_demo.email_template_6
+msgid "Propose paid training to Silver partners"
+msgstr "Foreslå betalt opplæring til Silver partnere."
diff --git a/addons/marketing_campaign_crm_demo/i18n/nl.po b/addons/marketing_campaign_crm_demo/i18n/nl.po
index 919668b2323..396cb9e63e4 100644
--- a/addons/marketing_campaign_crm_demo/i18n/nl.po
+++ b/addons/marketing_campaign_crm_demo/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/pt.po b/addons/marketing_campaign_crm_demo/i18n/pt.po
index 707d41e96b4..23370be3edd 100644
--- a/addons/marketing_campaign_crm_demo/i18n/pt.po
+++ b/addons/marketing_campaign_crm_demo/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/pt_BR.po b/addons/marketing_campaign_crm_demo/i18n/pt_BR.po
index 8c02325a86b..2bacf0b55a4 100644
--- a/addons/marketing_campaign_crm_demo/i18n/pt_BR.po
+++ b/addons/marketing_campaign_crm_demo/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
@@ -51,11 +51,18 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Olá, Temos oferta muito boa que poderia servi-lo.\n"
+"             Para os nossos parceiros prata, Teremos um curso de formação "
+"técnica em junho de 2012.\n"
+"             Se qualquer for necessária qualquer informação adicional por "
+"favor consultar.\n"
+"             Eu realmente aprecio a sua cooperação sobre isso.\n"
+"             Atenciosamente, Equipe OpenERP,"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_5
 msgid "Propose a free technical training to Gold partners"
-msgstr ""
+msgstr "Propor um treinamento técnico gratuito para Parceiros Ouro"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_3
@@ -65,7 +72,7 @@ msgstr "Obrigado por se inscrever no OpenERP Discovery Day"
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.server,name:marketing_campaign_crm_demo.action_dummy
 msgid "Dummy Action"
-msgstr ""
+msgstr "Ação Exemplo"
 
 #. module: marketing_campaign_crm_demo
 #: report:crm.lead.demo:0
@@ -80,7 +87,7 @@ msgstr "Obrigado por demonstrar interesse no OpenERP"
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_2
 msgid "Propose to subscribe to the OpenERP Discovery Day on May 2010"
-msgstr ""
+msgstr "Propor inscrição para O OpenERP Discovery Day em Maio de 2010"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_text:marketing_campaign_crm_demo.email_template_7
@@ -91,11 +98,18 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Olá, Nós temos uma oferta muito boa que pode te interessar.\n"
+"                             Para nossos parceiros Prata, Nós estamos "
+"oferecendo uma Parceria Ouro.\n"
+"                             Se for necessário qualquer informação "
+"complementar, por favor, reverta a ação.\n"
+"                             Nós realmente apreciamos sua cooperação nisto.\n"
+"                             Atenciosamente, Equipe OpenErp"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_7
 msgid "Propose gold partnership to silver partners"
-msgstr ""
+msgstr "Propor Parceria Ouro para Parceiros Prata"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_text:marketing_campaign_crm_demo.email_template_4
@@ -105,6 +119,11 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Olá, Obrigado por mostrar interesse na compra do Livro do OpenERP.\n"
+"                             Se for necessário qualquer informação "
+"complementar, por favor, reverta a ação.\n"
+"                             Nós realmente apreciamos sua cooperação nisto.\n"
+"                             Atenciosamente, Equipe OpenErp"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_text:marketing_campaign_crm_demo.email_template_5
@@ -116,6 +135,13 @@ msgid ""
 "            I really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Olá, Temos oferta muito boa que poderia servi-lo.\n"
+"             Para os nossos parceiros ouro, estamos organizando um "
+"treinamento técnico gratuito em junho de 2012.\n"
+"             Se qualquer informação adicional necessária gentilmente "
+"voltar.\n"
+"             Eu realmente aprecio a sua cooperação sobre isso.\n"
+"             Atenciosamente, Equipe OpenERP,"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_text:marketing_campaign_crm_demo.email_template_3
@@ -126,6 +152,12 @@ msgid ""
 "             I really appreciate your co-operation on this.\n"
 "             Regards,OpenERP Team,"
 msgstr ""
+"Olá, Obrigado por mostrar interesse e para se cadastrar no Discovery Day "
+"OpenERP.\n"
+"              Se qualquer informação adicional necessária gentilmente "
+"voltar.\n"
+"              Eu realmente aprecio a sua cooperação sobre isso.\n"
+"              Atenciosamente, Equipe OpenERP,"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_8
@@ -142,6 +174,13 @@ msgid ""
 "            We really appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Olá, Temos oferta muito boa que poderia servi-lo.\n"
+"             Propomos-lhe para assinar o Discovery Day OpenERP em Maio de "
+"2010.\n"
+"             Se qualquer informação adicional necessária gentilmente "
+"voltar.\n"
+"             Nós realmente apreciamos sua cooperação sobre isso.\n"
+"             Atenciosamente, Equipe OpenERP,"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,body_text:marketing_campaign_crm_demo.email_template_8
@@ -151,11 +190,15 @@ msgid ""
 "appreciate your co-operation on this.\n"
 "            Regards,OpenERP Team,"
 msgstr ""
+"Olá, Obrigado por mostrar interesse e para a contratação de formação "
+"técnica. Se qualquer informação adicional necessária gentilmente voltar. Eu "
+"realmente aprecio a sua cooperação sobre isso.\n"
+"             Atenciosamente, Equipe OpenERP,"
 
 #. module: marketing_campaign_crm_demo
 #: model:email.template,subject:marketing_campaign_crm_demo.email_template_6
 msgid "Propose paid training to Silver partners"
-msgstr ""
+msgstr "Propor treinamento pago aos parceiros Prata"
 
 #~ msgid "Demo data for the module marketing_campaign."
 #~ msgstr "Dados demo para o módulo marketing_campaign."
diff --git a/addons/marketing_campaign_crm_demo/i18n/ro.po b/addons/marketing_campaign_crm_demo/i18n/ro.po
index 1030bc8d3cc..b836f2007d9 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ro.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/ru.po b/addons/marketing_campaign_crm_demo/i18n/ru.po
index b306eff4170..b4fed6ed815 100644
--- a/addons/marketing_campaign_crm_demo/i18n/ru.po
+++ b/addons/marketing_campaign_crm_demo/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/sr.po b/addons/marketing_campaign_crm_demo/i18n/sr.po
index 0c89dcfc252..6c063a917ec 100644
--- a/addons/marketing_campaign_crm_demo/i18n/sr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/sr@latin.po b/addons/marketing_campaign_crm_demo/i18n/sr@latin.po
index 0560a07b40e..595c21190d1 100644
--- a/addons/marketing_campaign_crm_demo/i18n/sr@latin.po
+++ b/addons/marketing_campaign_crm_demo/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/tr.po b/addons/marketing_campaign_crm_demo/i18n/tr.po
index b8ebaab5418..b8b7bdc5a55 100644
--- a/addons/marketing_campaign_crm_demo/i18n/tr.po
+++ b/addons/marketing_campaign_crm_demo/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/i18n/zh_CN.po b/addons/marketing_campaign_crm_demo/i18n/zh_CN.po
index c86282455b1..43bfc5abf38 100644
--- a/addons/marketing_campaign_crm_demo/i18n/zh_CN.po
+++ b/addons/marketing_campaign_crm_demo/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: marketing_campaign_crm_demo
 #: model:ir.actions.report.xml,name:marketing_campaign_crm_demo.mc_crm_lead_demo_report
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index 0946ff6e129..141981a21d6 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -40,7 +40,10 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello,Thanks for generous interest you have shown in the openERP.Regards,OpenERP Team,</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for the genuine interest you have shown in OpenERP.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP OnDemand Free Trial 2010</field>
         </record>
         <record id="email_template_2" model="email.template">
@@ -50,11 +53,11 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello,We have very good offer that might suit you.
-            We propose you to subscribe to the OpenERP Discovery Day on May 2010.
-            If any further information required kindly revert back.
-            We really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            We suggest you subscribe to the OpenERP Discovery Day on May 2010.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP Discovery Day on May 2010</field>
         </record>
 
@@ -65,10 +68,10 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello,Thanks for showing intrest and for subscribing to the OpenERP Discovery Day.
-             If any further information required kindly revert back.
-             I really appreciate your co-operation on this.
-             Regards,OpenERP Team,</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for showing interest and for subscribing to the OpenERP Discovery Day.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP Discovery Day</field>
         </record>
 
@@ -79,10 +82,10 @@
            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
              <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello,Thanks for showing intrest and buying the OpenERP book.
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for showing interest and buying the OpenERP book.</p>
             If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
+            <p>Regards,OpenERP Team,</p>]]></field>
             <field name="name">For OpenERP book</field>
         </record>
 
@@ -92,12 +95,12 @@
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello, We have very good offer that might suit you.
-            For our gold partners,We are arranging free technical training on june,2010.
-            If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For technical training to Gold partners</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            For our gold partners,We are arranging free technical training on june,2010.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">technical training to gold partners</field>
         </record>
 
           <record id="email_template_6" model="email.template">
@@ -107,12 +110,12 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello, We have very good offer that might suit you.
-            For our silver partners,We are  paid technical training on june,2010.
-            If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For training to Silver partners</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            For our silver partners,We are  paid technical training on june,2010.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">training to silver partners</field>
         </record>
 
         <record id="email_template_7" model="email.template">
@@ -122,12 +125,12 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello, We have very good offer that might suit you.
-            For our silver partners,We are  offering Gold partnership.
-            If any further information required kindly revert back.
-            I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For gold partnership to silver partners</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>We have very good offer that might suit you.
+            For our silver partners, we are  offering Gold partnership.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">gold partnership to silver partners</field>
         </record>
 
         <record id="email_template_8" model="email.template">
@@ -137,9 +140,12 @@
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field eval="0" name="user_signature"/>
-            <field name="body_text">Hello, Thanks for showing intrest and for subscribing to technical training.If any further information required kindly revert back.I really appreciate your co-operation on this.
-            Regards,OpenERP Team,</field>
-            <field name="name">For subscribing to technical training</field>
+            <field name="body_html"><![CDATA[<p>Hello,</p>
+            <p>Thanks for showing interest and for subscribing to technical training.</p>
+            If any further information required kindly revert back.I really appreciate your co-operation on this.</p>
+            <p>If any further information is required, do not hesitate to reply to this message.</p>
+            <p>Regards,OpenERP Team,</p>]]></field>
+            <field name="name">subscribing to technical training</field>
         </record>
         <!-- Report -->
 
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index a05240c08e7..4a0a80694b3 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -29,6 +29,7 @@ This module allows you to manage all operations for managing memberships.
 =========================================================================
 
 It supports different kind of members:
+--------------------------------------
     * Free member
     * Associated member (e.g.: a group subscribes to a membership for all subsidiaries)
     * Paid members
@@ -39,19 +40,17 @@ invoice and send propositions for membership renewal.
     """,
     'author': 'OpenERP SA',
     'depends': ['base', 'product', 'account', 'process'],
-    'init_xml': ['membership_data.xml'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'wizard/membership_invoice_view.xml',
         'membership_view.xml',
         'report/report_membership_view.xml',
-        'process/membership_process.xml'
+        'process/membership_process.xml',
     ],
-    'demo_xml': ['membership_demo.xml'],
+    'demo': ['membership_demo.xml'],
     'test': ['test/test_membership.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0042907796381',
     'images': ['images/members.jpeg','images/membership_list.jpeg', 'images/membership_products.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/membership/i18n/ar.po b/addons/membership/i18n/ar.po
index ea2aa8cb8d0..65e119eb8cd 100644
--- a/addons/membership/i18n/ar.po
+++ b/addons/membership/i18n/ar.po
@@ -13,25 +13,25 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
 msgid "invoice to associate"
-msgstr ""
+msgstr "فاتورة لربطها"
 
 #. module: membership
 #: model:process.process,name:membership.process_process_membershipprocess0
 msgid "Membership Process"
-msgstr ""
+msgstr "عملية العضوية"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Paid Member"
-msgstr ""
+msgstr "عضو دافع"
 
 #. module: membership
 #: view:report.membership:0
@@ -42,17 +42,17 @@ msgstr ""
 #. module: membership
 #: field:report.membership,num_paid:0
 msgid "# Paid"
-msgstr ""
+msgstr "# دفع"
 
 #. module: membership
 #: field:report.membership,tot_earned:0
 msgid "Earned Amount"
-msgstr ""
+msgstr "تحصيل المبلغ"
 
 #. module: membership
 #: model:ir.model,name:membership.model_report_membership
 msgid "Membership Analysis"
-msgstr ""
+msgstr "تحليل العضوية"
 
 #. module: membership
 #: selection:report.membership,month:0
@@ -67,7 +67,7 @@ msgstr ""
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetopaid0
 msgid "Invoice is be paid."
-msgstr ""
+msgstr "فاتورة تم دفعها"
 
 #. module: membership
 #: field:membership.membership_line,company_id:0
@@ -79,7 +79,7 @@ msgstr ""
 #. module: membership
 #: view:res.partner:0
 msgid "Ending Date Of Membership"
-msgstr ""
+msgstr "التاريخ النهائي للعضوية"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
@@ -89,12 +89,12 @@ msgstr ""
 #. module: membership
 #: model:process.transition,name:membership.process_transition_waitingtoinvoice0
 msgid "Waiting to invoice"
-msgstr ""
+msgstr "انتظار الفاتورة"
 
 #. module: membership
 #: view:report.membership:0
 msgid "This will display paid, old and total earned columns"
-msgstr ""
+msgstr "سيتم عرض الدفع، القديم ومجموع أعمدة التحصيل"
 
 #. module: membership
 #: view:res.partner:0
@@ -106,42 +106,42 @@ msgstr ""
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Non Member"
-msgstr ""
+msgstr "ليس عضو"
 
 #. module: membership
 #: model:product.template,name:membership.membership_2_product_template
 msgid "Basic Membership"
-msgstr ""
+msgstr "عضوية أساسية"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All Members"
-msgstr ""
+msgstr "كل الأعضاء"
 
 #. module: membership
 #: field:res.partner,membership_stop:0
 msgid "Stop membership date"
-msgstr ""
+msgstr "إيقاف تاريخ العضوية"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
-msgstr ""
+msgstr "المنتج لعضو"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Join Membership"
-msgstr ""
+msgstr "إنضمام للعضوية"
 
 #. module: membership
 #: field:res.partner,associate_member:0
 msgid "Associate member"
-msgstr ""
+msgstr "عضو منتسب"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_associatedmember0
 msgid "Member is associated."
-msgstr ""
+msgstr "العضو منتسب"
 
 #. module: membership
 #: view:report.membership:0
@@ -151,22 +151,22 @@ msgstr ""
 #. module: membership
 #: field:report.membership,tot_pending:0
 msgid "Pending Amount"
-msgstr ""
+msgstr "في انتظار المبلغ"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
 msgid "Associated partner."
-msgstr ""
+msgstr "شريك منتسب"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Supplier Partners"
-msgstr ""
+msgstr "الشركاء الموردون"
 
 #. module: membership
 #: field:report.membership,num_invoiced:0
 msgid "# Invoiced"
-msgstr ""
+msgstr "# فاتورة"
 
 #. module: membership
 #: constraint:account.invoice:0
@@ -177,12 +177,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:membership.action_report_membership_tree
 #: model:ir.ui.menu,name:membership.menu_report_membership
 msgid "Members Analysis"
-msgstr ""
+msgstr "تحليل الأعضاء"
 
 #. module: membership
 #: view:res.partner:0
 msgid "End Membership Date"
-msgstr ""
+msgstr "تاريخ انتهاء العضوية"
 
 #. module: membership
 #: field:product.product,membership_date_from:0
@@ -822,17 +822,17 @@ msgstr ""
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
 msgid "Cancel date"
-msgstr ""
+msgstr "تاريخ الإلغاء"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_waitingmember0
 msgid "Waiting member"
-msgstr ""
+msgstr "عضو منتظر"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_invoice_view
 msgid "Invoice Membership"
-msgstr ""
+msgstr "فاتورة عضوية"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
diff --git a/addons/membership/i18n/bg.po b/addons/membership/i18n/bg.po
index 77302212c51..8d158f21049 100644
--- a/addons/membership/i18n/bg.po
+++ b/addons/membership/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/bs.po b/addons/membership/i18n/bs.po
index 5643fc63fd0..7cb53a6bdef 100644
--- a/addons/membership/i18n/bs.po
+++ b/addons/membership/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/ca.po b/addons/membership/i18n/ca.po
index 4731836ce89..1230b484c0f 100644
--- a/addons/membership/i18n/ca.po
+++ b/addons/membership/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/cs.po b/addons/membership/i18n/cs.po
index 1182eb6da20..18f9460691d 100644
--- a/addons/membership/i18n/cs.po
+++ b/addons/membership/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/da.po b/addons/membership/i18n/da.po
index ae48cc9a04f..f25923ee21e 100644
--- a/addons/membership/i18n/da.po
+++ b/addons/membership/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/de.po b/addons/membership/i18n/de.po
index 0f67424ed77..f4bc7758e72 100644
--- a/addons/membership/i18n/de.po
+++ b/addons/membership/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/es.po b/addons/membership/i18n/es.po
index ea6dbb6f3d8..20ab259ed51 100644
--- a/addons/membership/i18n/es.po
+++ b/addons/membership/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/es_AR.po b/addons/membership/i18n/es_AR.po
index 82b50aeec96..3a0255c7e0d 100644
--- a/addons/membership/i18n/es_AR.po
+++ b/addons/membership/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/es_CR.po b/addons/membership/i18n/es_CR.po
index 53dd445a827..52cf19f4085 100644
--- a/addons/membership/i18n/es_CR.po
+++ b/addons/membership/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: membership
diff --git a/addons/membership/i18n/et.po b/addons/membership/i18n/et.po
index b16b604a39c..1281c9237a5 100644
--- a/addons/membership/i18n/et.po
+++ b/addons/membership/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/fi.po b/addons/membership/i18n/fi.po
index 1d42c6e99bb..967d5379850 100644
--- a/addons/membership/i18n/fi.po
+++ b/addons/membership/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/fr.po b/addons/membership/i18n/fr.po
index a5609cce1f5..a8673a9fd5b 100644
--- a/addons/membership/i18n/fr.po
+++ b/addons/membership/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -146,7 +146,7 @@ msgstr "Le membre est associé"
 #. module: membership
 #: view:report.membership:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mois   "
 
 #. module: membership
 #: field:report.membership,tot_pending:0
@@ -161,7 +161,7 @@ msgstr "Partenaire associé."
 #. module: membership
 #: view:res.partner:0
 msgid "Supplier Partners"
-msgstr ""
+msgstr "Partenaires fournisseurs"
 
 #. module: membership
 #: field:report.membership,num_invoiced:0
@@ -171,7 +171,7 @@ msgstr "# Facturés"
 #. module: membership
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Structure de communication BBA invalide !"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_report_membership_tree
@@ -209,7 +209,7 @@ msgstr "Facture à payer"
 #. module: membership
 #: view:res.partner:0
 msgid "Customer Partners"
-msgstr ""
+msgstr "Partenaires clients"
 
 #. module: membership
 #: view:res.partner:0
@@ -280,7 +280,7 @@ msgstr "Date de début d'adhésion"
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "Événements créés ce mois"
 
 #. module: membership
 #: view:report.membership:0
@@ -302,12 +302,12 @@ msgstr "Membre payé"
 #. module: membership
 #: view:report.membership:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mois -1    "
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in last month"
-msgstr ""
+msgstr "Événements créés le mois dernier"
 
 #. module: membership
 #: field:report.membership,num_waiting:0
@@ -317,7 +317,7 @@ msgstr "Nb. en attente"
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in current year"
-msgstr ""
+msgstr "Événements créés cette année"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
@@ -329,7 +329,7 @@ msgstr "Membres"
 #. module: membership
 #: view:res.partner:0
 msgid "Invoiced/Paid/Free"
-msgstr ""
+msgstr "Facturé/Payé/Gratuit"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_invoicedmember0
@@ -676,7 +676,7 @@ msgstr "Janvier"
 #. module: membership
 #: view:res.partner:0
 msgid "Membership Partners"
-msgstr ""
+msgstr "Adhésion"
 
 #. module: membership
 #: view:product.product:0
@@ -696,12 +696,12 @@ msgstr "Prix négocié par le partenaire"
 #. module: membership
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Le numéro de facture doit être unique par société !"
 
 #. module: membership
 #: view:res.partner:0
 msgid "None/Canceled/Old/Waiting"
-msgstr ""
+msgstr "Aucune/Annulée/Ancienne/En attente"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -840,7 +840,7 @@ msgstr "Avril"
 #. module: membership
 #: view:res.partner:0
 msgid "Starting Date Of Membership"
-msgstr ""
+msgstr "Date de début de l'adhésion"
 
 #. module: membership
 #: help:res.partner,membership_cancel:0
@@ -876,6 +876,7 @@ msgstr "Total pour l'adhésion"
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
 msgstr ""
+"Erreur ! Vous ne pouvez pas créer des membres associés de manière récursive."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
diff --git a/addons/membership/i18n/gl.po b/addons/membership/i18n/gl.po
index 8afe5ad35ef..fcefc9010fd 100644
--- a/addons/membership/i18n/gl.po
+++ b/addons/membership/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/hr.po b/addons/membership/i18n/hr.po
index 1c22710f5d2..6dc55943929 100644
--- a/addons/membership/i18n/hr.po
+++ b/addons/membership/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/hu.po b/addons/membership/i18n/hu.po
index 061ae2ddb9f..fc5fc6565d6 100644
--- a/addons/membership/i18n/hu.po
+++ b/addons/membership/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/id.po b/addons/membership/i18n/id.po
index 4df6504ce22..c5a73784486 100644
--- a/addons/membership/i18n/id.po
+++ b/addons/membership/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/it.po b/addons/membership/i18n/it.po
index ffc82bd56e3..ac77dc078d6 100644
--- a/addons/membership/i18n/it.po
+++ b/addons/membership/i18n/it.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
 msgid "invoice to associate"
-msgstr "fatture da associare"
+msgstr "fattura da associare"
 
 #. module: membership
 #: model:process.process,name:membership.process_process_membershipprocess0
@@ -67,7 +67,7 @@ msgstr ""
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetopaid0
 msgid "Invoice is be paid."
-msgstr "Fatture pagate"
+msgstr "La fattura deve essere pagata."
 
 #. module: membership
 #: field:membership.membership_line,company_id:0
@@ -79,7 +79,7 @@ msgstr "Azienda"
 #. module: membership
 #: view:res.partner:0
 msgid "Ending Date Of Membership"
-msgstr ""
+msgstr "Data di fine dell'iscrizione"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
@@ -146,7 +146,7 @@ msgstr "Membro associato"
 #. module: membership
 #: view:report.membership:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mese   "
 
 #. module: membership
 #: field:report.membership,tot_pending:0
@@ -156,7 +156,7 @@ msgstr "Importo in sospeso"
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
 msgid "Associated partner."
-msgstr "Partner associato"
+msgstr "Partner associato."
 
 #. module: membership
 #: view:res.partner:0
@@ -243,6 +243,18 @@ msgid ""
 "                    -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Indica lo stato di iscrizione.\n"
+"                    -Non Membro: Un membro che non ha richiesto alcuna "
+"iscrizione.\n"
+"                    -Membro Annullato: Un membro che ha annullato la sua "
+"iscrizione.\n"
+"                    -Ex-Membro: Un membro la cui iscrizione è scaduta.\n"
+"                    -Membro in Attesa: Un membro che ha richiesto "
+"l'iscrizione e la cui fattura deve ancora essere generata.\n"
+"                    -Membro Fatturato: Un membro per cui la fattura è stata "
+"generata.\n"
+"                    -Membro Pagato: Un membro che ha pagato l'importo "
+"dell'iscrizione."
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
@@ -268,7 +280,7 @@ msgstr "Data Inizio Iscrizione"
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "Eventi creati nel mese corrente"
 
 #. module: membership
 #: view:report.membership:0
@@ -285,27 +297,27 @@ msgstr "Errore !"
 #. module: membership
 #: model:process.node,name:membership.process_node_paidmember0
 msgid "Paid member"
-msgstr "Membri pagati"
+msgstr "Membro pagato"
 
 #. module: membership
 #: view:report.membership:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mese-1    "
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in last month"
-msgstr ""
+msgstr "Eventi creati il mese scorso"
 
 #. module: membership
 #: field:report.membership,num_waiting:0
 msgid "# Waiting"
-msgstr "# in attesa"
+msgstr "# In attesa"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in current year"
-msgstr ""
+msgstr "Eventi creati nell'anno corrente"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
@@ -317,7 +329,7 @@ msgstr "Membri"
 #. module: membership
 #: view:res.partner:0
 msgid "Invoiced/Paid/Free"
-msgstr ""
+msgstr "Fatturati/Pagati/Gratuiti"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_invoicedmember0
@@ -332,14 +344,14 @@ msgstr "Luglio"
 #. module: membership
 #: model:product.template,name:membership.membership_0_product_template
 msgid "Golden Membership"
-msgstr "Iscrizione golden"
+msgstr "Iscrizione Golden"
 
 #. module: membership
 #: help:res.partner,associate_member:0
 msgid ""
 "A member with whom you want to associate your membership.It will consider "
 "the membership state of the associated member."
-msgstr ""
+msgstr "Un membro a cui associare la tua iscrizione"
 
 #. module: membership
 #: field:membership.membership_line,membership_id:0
@@ -351,7 +363,7 @@ msgstr "Prodotto Iscrizione"
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
 msgid "Define product for membership."
-msgstr "Definisci prodotto per la qualifica di socio"
+msgstr "Definisci il prodotto per l'iscrizione"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetoassociate0
@@ -367,7 +379,7 @@ msgstr "Partecipa"
 #: help:product.product,membership_date_to:0
 #: help:res.partner,membership_stop:0
 msgid "Date until which membership remains active."
-msgstr ""
+msgstr "Date fino a cui l'iscrizione rimarrà attiva."
 
 #. module: membership
 #: field:res.partner,membership_cancel:0
@@ -382,7 +394,7 @@ msgstr "Data di iscrizione"
 #. module: membership
 #: help:res.partner,free_member:0
 msgid "Select if you want to give membership free of cost."
-msgstr "Seleziona se volete fornire iscrizioni libere da costi."
+msgstr "Seleziona se vuoi offrire iscrizioni gratuite."
 
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
@@ -492,7 +504,7 @@ msgstr "Fattura iscrizione"
 #: field:report.membership,user_id:0
 #: view:res.partner:0
 msgid "Salesman"
-msgstr "Commerciale"
+msgstr "Venditore"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
@@ -509,7 +521,7 @@ msgstr "Categoria"
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Free Member"
-msgstr "Iscrizioni Gratuite"
+msgstr "Membro Gratuito"
 
 #. module: membership
 #: model:product.pricelist.version,name:membership.ver1m
@@ -537,7 +549,7 @@ msgstr "Membro"
 #. module: membership
 #: view:product.product:0
 msgid "Date From"
-msgstr "Dalla data"
+msgstr "Data Iniziale"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
@@ -547,7 +559,7 @@ msgstr "Membro associato"
 #. module: membership
 #: view:product.product:0
 msgid "Accounting Info"
-msgstr ""
+msgstr "Informazioni Contabili"
 
 #. module: membership
 #: help:report.membership,date_to:0
@@ -604,7 +616,7 @@ msgstr ""
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Waiting Member"
-msgstr "Membri in attesa"
+msgstr "Membro in attesa"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_associationpartner0
@@ -655,7 +667,7 @@ msgstr ""
 #. module: membership
 #: view:product.product:0
 msgid "Membership Fee"
-msgstr "Iscrizione gratuita"
+msgstr "Quota d'iscrizione"
 
 #. module: membership
 #: field:res.partner,membership_amount:0
@@ -665,24 +677,24 @@ msgstr "Importo iscrizioni"
 #. module: membership
 #: help:res.partner,membership_amount:0
 msgid "The price negotiated by the partner"
-msgstr ""
+msgstr "Prezzo negoziato dal partner"
 
 #. module: membership
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Il numero fattura deve essere univoco per ogni azienda!"
 
 #. module: membership
 #: view:res.partner:0
 msgid "None/Canceled/Old/Waiting"
-msgstr ""
+msgstr "Non iscritti/Annullati/Scaduti/In attesa"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Old Member"
-msgstr "Vecchio Membro"
+msgstr "Iscrizione scaduta"
 
 #. module: membership
 #: field:membership.membership_line,date_to:0
@@ -745,7 +757,7 @@ msgstr "Categorizzazione"
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
 msgid "Draft invoice for membership."
-msgstr "Fatture bozza per iscrizione"
+msgstr "Fattura in bozza per l'iscrizione"
 
 #. module: membership
 #: field:membership.invoice,member_price:0
@@ -753,7 +765,7 @@ msgstr "Fatture bozza per iscrizione"
 #: model:product.price.type,name:membership.product_price_type_memberprice
 #: field:product.template,member_price:0
 msgid "Member Price"
-msgstr "Prezzo Membro"
+msgstr "Prezzo Iscrizione"
 
 #. module: membership
 #: view:product.product:0
@@ -773,7 +785,7 @@ msgstr "Descrizione"
 #. module: membership
 #: field:res.partner,free_member:0
 msgid "Free member"
-msgstr "Membro Gratuito"
+msgstr "Iscrizione gratuita"
 
 #. module: membership
 #: selection:report.membership,month:0
@@ -783,12 +795,12 @@ msgstr "Maggio"
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
 msgid "Silver Membership"
-msgstr "Iscrizione silver"
+msgstr "Iscrizione Silver"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr ""
+msgstr "Imposte su vendite"
 
 #. module: membership
 #: field:report.membership,date_to:0
@@ -804,7 +816,7 @@ msgstr "Febbraio"
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
 msgid "Invoiced member"
-msgstr ""
+msgstr "Iscrizione fatturata"
 
 #. module: membership
 #: selection:report.membership,month:0
@@ -814,7 +826,7 @@ msgstr "Aprile"
 #. module: membership
 #: view:res.partner:0
 msgid "Starting Date Of Membership"
-msgstr ""
+msgstr "Data di inizio dell'Iscrizione"
 
 #. module: membership
 #: help:res.partner,membership_cancel:0
@@ -824,17 +836,17 @@ msgstr "Data in cui l'iscrizione è stata annullata"
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
 msgid "Cancel date"
-msgstr "Annulla Data"
+msgstr "Data di annullamento"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_waitingmember0
 msgid "Waiting member"
-msgstr "Attendendo membro"
+msgstr "Iscrizione in attesa"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_invoice_view
 msgid "Invoice Membership"
-msgstr "Fatturazione Iscrizione"
+msgstr "Fattura l'iscrizione"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
@@ -844,7 +856,7 @@ msgstr "Prodotto Iscrizione"
 #. module: membership
 #: help:membership.membership_line,member_price:0
 msgid "Amount for the membership"
-msgstr "Importo per l'iscrizione"
+msgstr "Importo dell'Iscrizione"
 
 #. module: membership
 #: constraint:res.partner:0
@@ -856,7 +868,7 @@ msgstr ""
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Cancelled Member"
-msgstr ""
+msgstr "Iscrizione annullata"
 
 #. module: membership
 #: constraint:product.product:0
diff --git a/addons/membership/i18n/ja.po b/addons/membership/i18n/ja.po
index 14d79afa68c..7928fcdd453 100644
--- a/addons/membership/i18n/ja.po
+++ b/addons/membership/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/ko.po b/addons/membership/i18n/ko.po
index e3879d067a3..44e421e4a0b 100644
--- a/addons/membership/i18n/ko.po
+++ b/addons/membership/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/lt.po b/addons/membership/i18n/lt.po
index 0eb8e7ee1be..04b31314fdb 100644
--- a/addons/membership/i18n/lt.po
+++ b/addons/membership/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/mn.po b/addons/membership/i18n/mn.po
index 140663176a0..50fcad7cf6a 100644
--- a/addons/membership/i18n/mn.po
+++ b/addons/membership/i18n/mn.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
 msgid "invoice to associate"
-msgstr ""
+msgstr "холбох нэхэмжлэл"
 
 #. module: membership
 #: model:process.process,name:membership.process_process_membershipprocess0
@@ -38,54 +38,54 @@ msgstr "Төлсөн гишүүн"
 #: view:report.membership:0
 #: view:res.partner:0
 msgid "Group By..."
-msgstr ""
+msgstr "Бүлэглэх..."
 
 #. module: membership
 #: field:report.membership,num_paid:0
 msgid "# Paid"
-msgstr ""
+msgstr "# Төлөгдсөн"
 
 #. module: membership
 #: field:report.membership,tot_earned:0
 msgid "Earned Amount"
-msgstr ""
+msgstr "Хуримтлуулсан Дүн"
 
 #. module: membership
 #: model:ir.model,name:membership.model_report_membership
 msgid "Membership Analysis"
-msgstr ""
+msgstr "Гишүүнчлэлийн Шинжилгээ"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "March"
-msgstr ""
+msgstr "3-р сар"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_setassociation0
 msgid "Set an associate member of partner."
-msgstr ""
+msgstr "Харилцагчийн холбогдох гишүүнийг тохируулах"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetopaid0
 msgid "Invoice is be paid."
-msgstr ""
+msgstr "Төлөх нэхэмжлэлүүд"
 
 #. module: membership
 #: field:membership.membership_line,company_id:0
 #: view:report.membership:0
 #: field:report.membership,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Компани"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Ending Date Of Membership"
-msgstr ""
+msgstr "Гишүүнчлэлийн дуусах огноо"
 
 #. module: membership
 #: field:product.product,membership_date_to:0
 msgid "Date to"
-msgstr ""
+msgstr "Хүртэл огноо"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_waitingtoinvoice0
@@ -95,12 +95,12 @@ msgstr "Нэхэмжлэл хүлээж байгаа"
 #. module: membership
 #: view:report.membership:0
 msgid "This will display paid, old and total earned columns"
-msgstr ""
+msgstr "Энэ нь хуримталсан төлөгдсөн хуучин болон дүн багануудыг харуулна."
 
 #. module: membership
 #: view:res.partner:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Нийлүүлэгчид"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -112,12 +112,12 @@ msgstr "Гишүүн бус"
 #. module: membership
 #: model:product.template,name:membership.membership_2_product_template
 msgid "Basic Membership"
-msgstr ""
+msgstr "Энгийн гишүүнчлэл"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All Members"
-msgstr ""
+msgstr "Бүх гишүүд"
 
 #. module: membership
 #: field:res.partner,membership_stop:0
@@ -127,47 +127,47 @@ msgstr "Гишүүнчлэлийг зогсоох огноо"
 #. module: membership
 #: model:process.transition,name:membership.process_transition_producttomember0
 msgid "Product to member"
-msgstr ""
+msgstr "Гишүүнд бараа"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Join Membership"
-msgstr ""
+msgstr "Гишүүнчлэлийн холбоо"
 
 #. module: membership
 #: field:res.partner,associate_member:0
 msgid "Associate member"
-msgstr ""
+msgstr "Гишүүнийг холбох"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_associatedmember0
 msgid "Member is associated."
-msgstr ""
+msgstr "Гишүүн холбогдсон"
 
 #. module: membership
 #: view:report.membership:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Сар   "
 
 #. module: membership
 #: field:report.membership,tot_pending:0
 msgid "Pending Amount"
-msgstr ""
+msgstr "Хүлээгдэж байгаа дүн"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_associationpartner0
 msgid "Associated partner."
-msgstr ""
+msgstr "Холбогдсон харилцагч"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Supplier Partners"
-msgstr ""
+msgstr "Нийлүүлэгч Харилцагчид"
 
 #. module: membership
 #: field:report.membership,num_invoiced:0
 msgid "# Invoiced"
-msgstr ""
+msgstr "# нэхэмжлэгдсэн"
 
 #. module: membership
 #: constraint:account.invoice:0
@@ -178,23 +178,23 @@ msgstr ""
 #: model:ir.actions.act_window,name:membership.action_report_membership_tree
 #: model:ir.ui.menu,name:membership.menu_report_membership
 msgid "Members Analysis"
-msgstr ""
+msgstr "Гишүүдийн Шинжилгээ"
 
 #. module: membership
 #: view:res.partner:0
 msgid "End Membership Date"
-msgstr ""
+msgstr "Гишүүнчлэлийн дуусах огноо"
 
 #. module: membership
 #: field:product.product,membership_date_from:0
 msgid "Date from"
-msgstr ""
+msgstr "Эхлэх огноо"
 
 #. module: membership
 #: code:addons/membership/membership.py:414
 #, python-format
 msgid "Partner doesn't have an address to make the invoice."
-msgstr ""
+msgstr "Харилцагч нэхэмлжлэх хаяг байхгүй байна."
 
 #. module: membership
 #: model:ir.model,name:membership.model_res_partner
@@ -205,12 +205,12 @@ msgstr "Харилцагч"
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetopaid0
 msgid "Invoice to paid"
-msgstr ""
+msgstr "Төлөгдсөн нэхэмжлэл"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Customer Partners"
-msgstr ""
+msgstr "Захиалагч Харилцагчид"
 
 #. module: membership
 #: view:res.partner:0
@@ -220,7 +220,7 @@ msgstr "Харилцагч"
 #. module: membership
 #: field:membership.membership_line,date_from:0
 msgid "From"
-msgstr ""
+msgstr "Эхлэх"
 
 #. module: membership
 #: constraint:membership.membership_line:0
@@ -244,6 +244,15 @@ msgid ""
 "                    -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Энэ гишүүнчлэлийн төлөвийг илтгэдэг.\n"
+"\n"
+"-Гишүүн биш: Гишүүнчлэлд өргөдөл гаргаагүй гишүүн.\n"
+"-Цуцлагдсан гишүүн: Гишүүнчлэлээ цуцалсан гишүүн.\n"
+"-Хуучин гишүүн: Гишүүнчлэлийн хугацаа дууссан гишүүн.\n"
+"-Хүлээж буй гишүүн: Гишүүнчлэлийн өргөдлөө гаргасан нэхэмжлэл нь үүсэх гэж "
+"байгаа гишүүн.\n"
+"-Нэхэмжлэгдсэн гишүүн: Нэхэмжлэл нь үүссэн гишүүн.\n"
+"-Төлсөн гишүүн: Гишүүнчлэлийн төлбөрөө төлсөн гишүүн."
 
 #. module: membership
 #: model:process.transition.action,name:membership.process_transition_action_create0
@@ -253,12 +262,12 @@ msgstr "Үүсгэх"
 #. module: membership
 #: view:product.product:0
 msgid "Membership products"
-msgstr ""
+msgstr "Гишүүнчлэлийн бараа"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_membership_line
 msgid "Member line"
-msgstr ""
+msgstr "Гишүүний мөр"
 
 #. module: membership
 #: help:report.membership,date_from:0
@@ -269,19 +278,19 @@ msgstr "Гишүүнчлэл эхлэх огноо"
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in current month"
-msgstr ""
+msgstr "Энэ сард үүсгэгдсэн үйл явдал"
 
 #. module: membership
 #: view:report.membership:0
 msgid "This will display waiting, invoiced and total pending columns"
-msgstr ""
+msgstr "Энэ нь хүлээгдэж буй нэхэмжилсэн багануудыг харуулна."
 
 #. module: membership
 #: code:addons/membership/membership.py:410
 #: code:addons/membership/membership.py:413
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Алдаа !"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_paidmember0
@@ -291,22 +300,22 @@ msgstr "Төлсөн гишүүн"
 #. module: membership
 #: view:report.membership:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Сар-1    "
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in last month"
-msgstr ""
+msgstr "Сүүлийн сард үүсгэгдсэн үйл явдал"
 
 #. module: membership
 #: field:report.membership,num_waiting:0
 msgid "# Waiting"
-msgstr ""
+msgstr "# Хүлээж буй"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Events created in current year"
-msgstr ""
+msgstr "Энэ жил үүсгэгдсэн үйл явдал"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_members
@@ -318,7 +327,7 @@ msgstr "Гишүүд"
 #. module: membership
 #: view:res.partner:0
 msgid "Invoiced/Paid/Free"
-msgstr ""
+msgstr "Нэхэмжилсэн/Төлсөн/Үнэгүй"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_invoicedmember0
@@ -328,12 +337,12 @@ msgstr "Нэхэмжлэл нээх."
 #. module: membership
 #: selection:report.membership,month:0
 msgid "July"
-msgstr ""
+msgstr "7-р сар"
 
 #. module: membership
 #: model:product.template,name:membership.membership_0_product_template
 msgid "Golden Membership"
-msgstr ""
+msgstr "Алтан гишүүнчлэл"
 
 #. module: membership
 #: help:res.partner,associate_member:0
@@ -341,89 +350,91 @@ msgid ""
 "A member with whom you want to associate your membership.It will consider "
 "the membership state of the associated member."
 msgstr ""
+"Өөрийн гишүүнчлэлийг холбохыг хүсч буй гишүүн. Энэ нь холбогдсон гишүүний "
+"гишүүнчлэлийг тооцож үзнэ."
 
 #. module: membership
 #: field:membership.membership_line,membership_id:0
 #: view:report.membership:0
 #: field:report.membership,membership_id:0
 msgid "Membership Product"
-msgstr ""
+msgstr "Гишүүнчлэлийн бараа"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_producttomember0
 msgid "Define product for membership."
-msgstr ""
+msgstr "Гишүүнчлэлийн барааг тодорхойл"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_invoicetoassociate0
 msgid "Invoiced member may be Associated member."
-msgstr ""
+msgstr "Нэхэмжилсэн гишүүд нь Холбогдсон гишүүд байж болно."
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Join"
-msgstr ""
+msgstr "Холбогдох"
 
 #. module: membership
 #: help:product.product,membership_date_to:0
 #: help:res.partner,membership_stop:0
 msgid "Date until which membership remains active."
-msgstr ""
+msgstr "Гишүүнчлэл идэвхтэй байх эцсийн хугацаа."
 
 #. module: membership
 #: field:res.partner,membership_cancel:0
 msgid "Cancel membership date"
-msgstr ""
+msgstr "Гишүүнчлэлийг цуцласан огноо"
 
 #. module: membership
 #: field:membership.membership_line,date:0
 msgid "Join Date"
-msgstr ""
+msgstr "Холбогдсон огноо"
 
 #. module: membership
 #: help:res.partner,free_member:0
 msgid "Select if you want to give membership free of cost."
-msgstr ""
+msgstr "Гишүүнчлэлийг үнэгүй олгохоор бол сонгоно уу."
 
 #. module: membership
 #: model:process.node,name:membership.process_node_setassociation0
 msgid "Set association"
-msgstr ""
+msgstr "Холбоог тааруулах"
 
 #. module: membership
 #: view:res.partner:0
 msgid " Membership State"
-msgstr ""
+msgstr " Гишүүнчлэлийн Төлөв"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Memberships"
-msgstr ""
+msgstr "Гишүүнчлэлүүд"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_paidmember0
 msgid "Membership invoice paid."
-msgstr ""
+msgstr "Гишүүнчлэлийн нэхэмжлэл төлөгдсөн."
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Барааны үлгэр"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "September"
-msgstr ""
+msgstr "9-р сар"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "December"
-msgstr ""
+msgstr "12-р сар"
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Нэхэмжлэлийн мөр"
 
 #. module: membership
 #: help:membership.membership_line,state:0
@@ -442,68 +453,77 @@ msgid ""
 "                        -Paid Member: A member who has paid the membership "
 "amount."
 msgstr ""
+"Энэ гишүүнчлэлийн төлөвийг илтгэдэг.\n"
+"\n"
+"-Гишүүн биш: Гишүүнчлэлд өргөдөл гаргаагүй гишүүн.\n"
+"-Цуцлагдсан гишүүн: Гишүүнчлэлээ цуцалсан гишүүн.\n"
+"-Хуучин гишүүн: Гишүүнчлэлийн хугацаа дууссан гишүүн.\n"
+"-Хүлээж буй гишүүн: Гишүүнчлэлийн өргөдлөө гаргасан нэхэмжлэл нь үүсэх гэж "
+"байгаа гишүүн.\n"
+"-Нэхэмжлэгдсэн гишүүн: Нэхэмжлэл нь үүссэн гишүүн.\n"
+"-Төлсөн гишүүн: Гишүүнчлэлийн төлбөрөө төлсөн гишүүн."
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,month:0
 msgid "Month"
-msgstr ""
+msgstr "Сар"
 
 #. module: membership
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "Бүлэглэх..."
 
 #. module: membership
 #: code:addons/membership/membership.py:411
 #, python-format
 msgid "Partner is a free Member."
-msgstr ""
+msgstr "Харилцагч нь төлбөргүй гишүүн."
 
 #. module: membership
 #: model:product.pricelist,name:membership.list1m
 msgid "Member Sale Pricelist"
-msgstr ""
+msgstr "Гишүүний Хөнгөлөлтийн Үнийн жагсаалт"
 
 #. module: membership
 #: field:report.membership,associate_member_id:0
 #: view:res.partner:0
 msgid "Associate Member"
-msgstr ""
+msgstr "Гишүүнийг холбох"
 
 #. module: membership
 #: help:product.product,membership_date_from:0
 #: help:res.partner,membership_start:0
 msgid "Date from which membership becomes active."
-msgstr ""
+msgstr "Гишүүнчлэл идэвхтэй болох эхлэх хугацаа"
 
 #. module: membership
 #: view:report.membership:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Холбогдсон харилцагч"
 
 #. module: membership
 #: model:ir.model,name:membership.model_membership_invoice
 #: view:membership.invoice:0
 msgid "Membership Invoice"
-msgstr ""
+msgstr "Гишүүнчлэлийн нэхэмжлэл"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,user_id:0
 #: view:res.partner:0
 msgid "Salesman"
-msgstr ""
+msgstr "Борлуулагч"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_membershipproduct0
 msgid "Define membership product."
-msgstr ""
+msgstr "Гишүүнчлэлийн барааг тодорхойл"
 
 #. module: membership
 #: view:product.product:0
 msgid "Category"
-msgstr ""
+msgstr "Ангилал"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -515,7 +535,7 @@ msgstr "Чөлөөт гишүүн"
 #. module: membership
 #: model:product.pricelist.version,name:membership.ver1m
 msgid "Member Sale Pricelist Version"
-msgstr ""
+msgstr "Гишүүний хөнгөлөлтийн үнийн жагсаалтын хувилбар"
 
 #. module: membership
 #: constraint:product.template:0
@@ -527,42 +547,42 @@ msgstr ""
 #. module: membership
 #: view:report.membership:0
 msgid "Forecast"
-msgstr ""
+msgstr "Урьдчилсан таамаг"
 
 #. module: membership
 #: field:report.membership,partner_id:0
 msgid "Member"
-msgstr ""
+msgstr "Гишүүн"
 
 #. module: membership
 #: view:product.product:0
 msgid "Date From"
-msgstr ""
+msgstr "Эхлэх өдөр"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_associatedmember0
 msgid "Associated member"
-msgstr ""
+msgstr "Холбогдсон гишүүн"
 
 #. module: membership
 #: view:product.product:0
 msgid "Accounting Info"
-msgstr ""
+msgstr "Санхүүгийн мэдээлэл"
 
 #. module: membership
 #: help:report.membership,date_to:0
 msgid "End membership date"
-msgstr ""
+msgstr "Гишүүнчлэл дуусах огноо"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Customers"
-msgstr ""
+msgstr "Захиалагчид"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "August"
-msgstr ""
+msgstr "8-р сар"
 
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_products
@@ -574,7 +594,7 @@ msgstr "Гишүүнчлэлийн бараанууд"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "June"
-msgstr ""
+msgstr "6-р сар"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_membership
@@ -597,7 +617,7 @@ msgstr "Нэхэмжлэгдсэн гишүүн"
 #. module: membership
 #: help:membership.membership_line,date:0
 msgid "Date on which member has joined the membership"
-msgstr ""
+msgstr "Гишүүнийн гишүүнчлэлээр холбогдсон огноо"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -609,53 +629,53 @@ msgstr "Хүлээж байгаа гишүүн"
 #. module: membership
 #: model:process.transition,name:membership.process_transition_associationpartner0
 msgid "Association Partner"
-msgstr ""
+msgstr "Холбоо Харилцагч"
 
 #. module: membership
 #: field:report.membership,date_from:0
 #: view:res.partner:0
 msgid "Start Date"
-msgstr ""
+msgstr "Эхлэл огноо"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "November"
-msgstr ""
+msgstr "11-р сар"
 
 #. module: membership
 #: help:product.product,membership:0
 msgid "Select if a product is a membership product."
-msgstr ""
+msgstr "Хэрэв бараа нь гишүүнчлэл бараа бол сонгоно"
 
 #. module: membership
 #: field:membership.membership_line,state:0
 msgid "Membership State"
-msgstr ""
+msgstr "Гишүүнчлэлийн төлөв"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "October"
-msgstr ""
+msgstr "10-р сар"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Description"
-msgstr ""
+msgstr "Борлуулалтын тайлбар"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "January"
-msgstr ""
+msgstr "1-р сар"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Membership Partners"
-msgstr ""
+msgstr "Гишүүнчлэлийн Харилцагчид"
 
 #. module: membership
 #: view:product.product:0
 msgid "Membership Fee"
-msgstr ""
+msgstr "Үнэгүй Гишүүнчлэл"
 
 #. module: membership
 #: field:res.partner,membership_amount:0
@@ -665,17 +685,17 @@ msgstr "Гишүүнчлэлийн дүн"
 #. module: membership
 #: help:res.partner,membership_amount:0
 msgid "The price negotiated by the partner"
-msgstr ""
+msgstr "Үнийг харилагчтай тохиролцдог"
 
 #. module: membership
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Компаний хэмжээнд нэхэмжлэлийн дугаар үл давхцах ёстой!"
 
 #. module: membership
 #: view:res.partner:0
 msgid "None/Canceled/Old/Waiting"
-msgstr ""
+msgstr "Хоосон/Цуцалсан/Хуучин/Хүлээж буй"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
@@ -687,19 +707,19 @@ msgstr "Хуучин гишүүн"
 #. module: membership
 #: field:membership.membership_line,date_to:0
 msgid "To"
-msgstr ""
+msgstr "Хэнд"
 
 #. module: membership
 #: view:report.membership:0
 #: field:report.membership,membership_state:0
 #: field:res.partner,membership_state:0
 msgid "Current Membership State"
-msgstr ""
+msgstr "Одоогийн Гишүүнчлэлийн Төлөв"
 
 #. module: membership
 #: view:product.product:0
 msgid "General"
-msgstr ""
+msgstr "Ерөнхий"
 
 #. module: membership
 #: model:process.transition,note:membership.process_transition_waitingtoinvoice0
@@ -709,23 +729,23 @@ msgstr "Ноорог нэхэмжлэл нээгдлээ"
 #. module: membership
 #: view:product.product:0
 msgid "Inactive"
-msgstr ""
+msgstr "Идэвхгүй"
 
 #. module: membership
 #: model:ir.model,name:membership.model_account_invoice
 #: field:membership.membership_line,account_invoice_id:0
 msgid "Invoice"
-msgstr ""
+msgstr "Нэхэмжлэл"
 
 #. module: membership
 #: view:membership.invoice:0
 msgid "Close"
-msgstr ""
+msgstr "Хаах"
 
 #. module: membership
 #: view:res.partner:0
 msgid "All non Members"
-msgstr ""
+msgstr "Бүх гишүүн бишүүд"
 
 #. module: membership
 #: view:product.product:0
@@ -735,12 +755,12 @@ msgstr "Мэдээлэл"
 #. module: membership
 #: field:membership.membership_line,account_invoice_line:0
 msgid "Account Invoice line"
-msgstr ""
+msgstr "Санхүүгийн Нэхэмжлэлийн Мөр"
 
 #. module: membership
 #: view:product.product:0
 msgid "Categorization"
-msgstr ""
+msgstr "Ангилал"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
@@ -758,17 +778,17 @@ msgstr "Гишүүний үнэ"
 #. module: membership
 #: view:product.product:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "Худалдан авалтын тайлбар, тэмдэглэл"
 
 #. module: membership
 #: model:ir.model,name:membership.model_product_product
 msgid "Product"
-msgstr ""
+msgstr "Бараа"
 
 #. module: membership
 #: view:product.product:0
 msgid "Description"
-msgstr ""
+msgstr "Тайлбар"
 
 #. module: membership
 #: field:res.partner,free_member:0
@@ -778,48 +798,48 @@ msgstr "Чөлөөт гишүүн"
 #. module: membership
 #: selection:report.membership,month:0
 msgid "May"
-msgstr ""
+msgstr "5-р сар"
 
 #. module: membership
 #: model:product.template,name:membership.membership_1_product_template
 msgid "Silver Membership"
-msgstr ""
+msgstr "Мөнгөн гишүүнчлэл"
 
 #. module: membership
 #: view:product.product:0
 msgid "Sale Taxes"
-msgstr ""
+msgstr "Борлуулалтын татвар"
 
 #. module: membership
 #: field:report.membership,date_to:0
 #: view:res.partner:0
 msgid "End Date"
-msgstr ""
+msgstr "Дуусах огноо"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "February"
-msgstr ""
+msgstr "2-р сар"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_invoicedmember0
 msgid "Invoiced member"
-msgstr ""
+msgstr "Нэхэмжлэгдсэн гишүүд"
 
 #. module: membership
 #: selection:report.membership,month:0
 msgid "April"
-msgstr ""
+msgstr "4-р сар"
 
 #. module: membership
 #: view:res.partner:0
 msgid "Starting Date Of Membership"
-msgstr ""
+msgstr "Гишүүнчлэлийн эхлэл огноо"
 
 #. module: membership
 #: help:res.partner,membership_cancel:0
 msgid "Date on which membership has been cancelled"
-msgstr ""
+msgstr "Гишүүнчлэл цуцлагдсан огноо"
 
 #. module: membership
 #: field:membership.membership_line,date_cancel:0
@@ -834,7 +854,7 @@ msgstr "Хүлээж байгаа гишүүн"
 #. module: membership
 #: model:ir.actions.act_window,name:membership.action_membership_invoice_view
 msgid "Invoice Membership"
-msgstr ""
+msgstr "Гишүүнчлэлийн нэхэмжлэл"
 
 #. module: membership
 #: model:process.node,name:membership.process_node_membershipproduct0
@@ -844,19 +864,19 @@ msgstr "Гишүүнчлэлийн бараа"
 #. module: membership
 #: help:membership.membership_line,member_price:0
 msgid "Amount for the membership"
-msgstr ""
+msgstr "Гишүүнчлэлийн дүн"
 
 #. module: membership
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Алдаа ! Тойрч холбогдсон гишүүдийг үүсгэх боломжгүй."
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Cancelled Member"
-msgstr ""
+msgstr "Цуцлагдсан гишүүн"
 
 #. module: membership
 #: constraint:product.product:0
@@ -872,7 +892,7 @@ msgstr "Жил"
 #. module: membership
 #: view:report.membership:0
 msgid "Revenue Done"
-msgstr ""
+msgstr "Орлого хийгдсэн"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
diff --git a/addons/membership/i18n/nl.po b/addons/membership/i18n/nl.po
index 087a46aa1eb..a53519053a6 100644
--- a/addons/membership/i18n/nl.po
+++ b/addons/membership/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/nl_BE.po b/addons/membership/i18n/nl_BE.po
index 327a74b9c03..1a79b6e735d 100644
--- a/addons/membership/i18n/nl_BE.po
+++ b/addons/membership/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/pl.po b/addons/membership/i18n/pl.po
index 999da7daaa9..c0927fbfcc6 100644
--- a/addons/membership/i18n/pl.po
+++ b/addons/membership/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/pt.po b/addons/membership/i18n/pt.po
index 818c6affda2..fe889277887 100644
--- a/addons/membership/i18n/pt.po
+++ b/addons/membership/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/pt_BR.po b/addons/membership/i18n/pt_BR.po
index 62c6266eee6..95574bde0b6 100644
--- a/addons/membership/i18n/pt_BR.po
+++ b/addons/membership/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 19:37+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/ro.po b/addons/membership/i18n/ro.po
index 72d5edc3b4b..fd73cc683b1 100644
--- a/addons/membership/i18n/ro.po
+++ b/addons/membership/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/ru.po b/addons/membership/i18n/ru.po
index 0ec1ff0bbc4..8057093759f 100644
--- a/addons/membership/i18n/ru.po
+++ b/addons/membership/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/sk.po b/addons/membership/i18n/sk.po
index 471d79f2709..fe07841f0ae 100644
--- a/addons/membership/i18n/sk.po
+++ b/addons/membership/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/sl.po b/addons/membership/i18n/sl.po
index 26fb0c355bc..58178f0af6f 100644
--- a/addons/membership/i18n/sl.po
+++ b/addons/membership/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/sq.po b/addons/membership/i18n/sq.po
index fb45a523327..bc37efbb560 100644
--- a/addons/membership/i18n/sq.po
+++ b/addons/membership/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/sr@latin.po b/addons/membership/i18n/sr@latin.po
index 2225c8119be..681efc9ca61 100644
--- a/addons/membership/i18n/sr@latin.po
+++ b/addons/membership/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/sv.po b/addons/membership/i18n/sv.po
index 3e95939d9c4..dd225e4cb2e 100644
--- a/addons/membership/i18n/sv.po
+++ b/addons/membership/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/tlh.po b/addons/membership/i18n/tlh.po
index e99cc3f8f4e..7d18fdec4f4 100644
--- a/addons/membership/i18n/tlh.po
+++ b/addons/membership/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index 0ad6a88ca4c..92a46c8355e 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/uk.po b/addons/membership/i18n/uk.po
index 8839dc7ef79..a09703c2e0e 100644
--- a/addons/membership/i18n/uk.po
+++ b/addons/membership/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/vi.po b/addons/membership/i18n/vi.po
index 62fd013e0e2..c4b82cc82fa 100644
--- a/addons/membership/i18n/vi.po
+++ b/addons/membership/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/zh_CN.po b/addons/membership/i18n/zh_CN.po
index 39e057c060c..a1fabb2e83f 100644
--- a/addons/membership/i18n/zh_CN.po
+++ b/addons/membership/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
diff --git a/addons/membership/i18n/zh_TW.po b/addons/membership/i18n/zh_TW.po
index 171d4ccb0d6..7a06603dddd 100644
--- a/addons/membership/i18n/zh_TW.po
+++ b/addons/membership/i18n/zh_TW.po
@@ -7,31 +7,31 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2010-08-13 13:26+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-08-24 06:17+0000\n"
+"Last-Translator: Rossi Liu <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
 msgid "invoice to associate"
-msgstr ""
+msgstr "發票抬頭"
 
 #. module: membership
 #: model:process.process,name:membership.process_process_membershipprocess0
 msgid "Membership Process"
-msgstr ""
+msgstr "會員管理"
 
 #. module: membership
 #: selection:membership.membership_line,state:0
 #: selection:report.membership,membership_state:0
 #: selection:res.partner,membership_state:0
 msgid "Paid Member"
-msgstr ""
+msgstr "付費會員"
 
 #. module: membership
 #: view:report.membership:0
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 819ad3c9487..8851747d77f 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -146,15 +146,15 @@ class membership_line(osv.osv):
         'date_to': fields.date('To', readonly=True),
         'date_cancel': fields.date('Cancel date'),
         'date': fields.date('Join Date', help="Date on which member has joined the membership"),
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Product Price'), required=True, help='Amount for the membership'),
+        'member_price': fields.float('Membership Fee', digits_compute= dp.get_precision('Product Price'), required=True, help='Amount for the membership'),
         '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,
-                        string='Membership State', type='selection',
+                        string='Membership Status', type='selection',
                         selection=STATE, store = {
                         'account.invoice': (_get_membership_lines, ['state'], 10),
                         'res.partner': (_get_partners, ['membership_state'], 12),
-                        }, help="""It indicates the membership state.
+                        }, help="""It indicates the membership status.
                         -Non Member: A member who has not applied for any membership.
                         -Cancelled Member: A member who has cancelled his membership.
                         -Old Member: A member whose membership date has expired.
@@ -317,28 +317,28 @@ class Partner(osv.osv):
     _columns = {
         'associate_member': fields.many2one('res.partner', 'Associate Member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."),
         'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'),
-        'free_member': fields.boolean('Free Member', help = "Select if you want to give membership free of cost."),
+        'free_member': fields.boolean('Free Member', help = "Select if you want to give free membership."),
         'membership_amount': fields.float(
                     'Membership Amount', digits=(16, 2),
                     help = 'The price negotiated by the partner'),
         'membership_state': fields.function(
                     __get_membership_state,
-                    string = 'Current Membership State', type = 'selection',
+                    string = 'Current Membership Status', type = 'selection',
                     selection = STATE,
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
                         'res.partner': (_get_partners, ['free_member', 'membership_state', 'associate_member'], 10)
                     }, help="""It indicates the membership state.
-                    -Non Member: A member who has not applied for any membership.
+                    -Non Member: A partner who has not applied for any membership.
                     -Cancelled Member: A member who has cancelled his membership.
                     -Old Member: A member whose membership date has expired.
                     -Waiting Member: A member who has applied for the membership and whose invoice is going to be created.
                     -Invoiced Member: A member whose invoice has been created.
-                    -Paid Member: A member who has paid the membership amount."""),
+                    -Paying member: A member who has paid the membership fee."""),
         'membership_start': fields.function(
                     _membership_date, multi = 'membeship_start',
-                    string = 'Start Membership Date', type = 'date',
+                    string = 'Membership Start Date', type = 'date',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10, ),
@@ -346,7 +346,7 @@ class Partner(osv.osv):
                     }, help="Date from which membership becomes active."),
         'membership_stop': fields.function(
                     _membership_date,
-                    string = 'Stop Membership Date', type='date', multi='membership_stop',
+                    string = 'Membership End Date', type='date', multi='membership_stop',
                     store = {
                         'account.invoice': (_get_invoice_partner, ['state'], 10),
                         'membership.membership_line': (_get_partner_id, ['state'], 10),
@@ -444,14 +444,6 @@ class Partner(osv.osv):
 
 Partner()
 
-class product_template(osv.osv):
-    _inherit = 'product.template'
-    _columns = {
-        'member_price': fields.float('Member Price', digits_compute= dp.get_precision('Product Price')),
-    }
-
-product_template()
-
 class Product(osv.osv):
 
     def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
@@ -474,7 +466,7 @@ class Product(osv.osv):
     '''Product'''
     _inherit = 'product.product'
     _columns = {
-        'membership': fields.boolean('Membership', help='Select if a product is a membership product.'),
+        'membership': fields.boolean('Membership', help='Check if the product is eligible for membership.'),
         'membership_date_from': fields.date('Date from', help='Date from which membership becomes active.'),
         'membership_date_to': fields.date('Date to', help='Date until which membership remains active.'),
     }
diff --git a/addons/membership/membership_data.xml b/addons/membership/membership_data.xml
deleted file mode 100644
index 14fbb00f9a2..00000000000
--- a/addons/membership/membership_data.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data noupdate="1">
-
-    <!--
-    Price type
-    -->
-    <record model="product.price.type" id="product_price_type_memberprice" >
-        <field name="name">Member Price</field>
-        <field name="field">member_price</field>
-    </record>
-
-    <!--
-    Price list
-    -->
-    <record model="product.pricelist" id="list1m">
-        <field name="name">Member Sale Pricelist</field>
-        <field name="type">sale</field>
-    </record>
-    <record model="product.pricelist.version" id="ver1m">
-        <field name="pricelist_id" ref="list1m"/>
-        <field name="name">Member Sale Pricelist Version</field>
-    </record>
-    <record model="product.pricelist.item" id="item1m">
-        <field name="price_version_id" ref="ver1m"/>
-        <field name="base" ref="product_price_type_memberprice" />
-        <field name="name">Member Sale Pricelist Line</field>
-    </record>
-
-    </data>
-</openerp>
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index fb128585fd2..b47ceb97bed 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -88,11 +88,11 @@
             <field name="arch" type="xml">
                 <page string="Information" position="after">
                     <page string="Membership">
-                        <group>
+                        <group col="1">
                             <group>
                                 <field name="membership" readonly="0"/>
                             </group>
-                            <group>
+                            <group attrs="{'invisible':[('membership','=',False)]}">
                                 <field name="membership_date_from" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
                                 <field name="membership_date_to" readonly="0" attrs="{'required':[('membership','=',True)]}"/>
                             </group>
@@ -124,7 +124,7 @@
             <field name="act_window_id" ref="action_membership_products"/>
         </record>
 
-        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="9"/>
+        <menuitem name="Association" id="base.menu_association" icon="terp-calendar" sequence="10"/>
         <menuitem name="Members" id="menu_membership" sequence="0" parent="base.menu_association"/>
         <menuitem name="Configuration" id="base.menu_marketing_config_association"
             parent="base.menu_association" sequence="30"/>
@@ -270,17 +270,5 @@
         <!-- MEMBERSHIP/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>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <field name="list_price" position="after">
-                    <field name="member_price" groups="base.group_user"/>
-                </field>
-            </field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/membership/report/__init__.py b/addons/membership/report/__init__.py
index 05c893ae400..84dc92c63f0 100644
--- a/addons/membership/report/__init__.py
+++ b/addons/membership/report/__init__.py
@@ -20,4 +20,4 @@
 ##############################################################################
 
 import report_membership
-# 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/report/report_membership.py b/addons/membership/report/report_membership.py
index 9090c752686..273ec0db74f 100644
--- a/addons/membership/report/report_membership.py
+++ b/addons/membership/report/report_membership.py
@@ -141,4 +141,4 @@ class report_membership(osv.osv):
 
 report_membership()
 
-# 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/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 81e1a3db97c..99dcc73ceba 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -8,7 +8,7 @@
             <field name="name">report.membership.tree</field>
             <field name="model">report.membership</field>
             <field name="arch" type="xml">
-                <tree colors="blue:membership_state == 'draft';black:membership_state in ('open','free');gray:membership_state in ('done','cancel') " string="Membership">
+                <tree colors="blue:membership_state == 'draft';black:membership_state in ('open','free');gray:membership_state in ('done','cancel') " create="false" string="Membership">
                     <field name="partner_id"/>
                     <field name="membership_state"/>
                     <field name="associate_member_id" invisible="1"/>
diff --git a/addons/membership/wizard/__init__.py b/addons/membership/wizard/__init__.py
index 7ad7cc32008..a15a0a7329f 100644
--- a/addons/membership/wizard/__init__.py
+++ b/addons/membership/wizard/__init__.py
@@ -20,4 +20,4 @@
 ##############################################################################
 
 import membership_invoice
-# 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/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_view.xml
index bfb687d893c..c629f747b2f 100644
--- a/addons/membership/wizard/membership_invoice_view.xml
+++ b/addons/membership/wizard/membership_invoice_view.xml
@@ -32,7 +32,7 @@
         <act_window name="Invoice Membership"
             res_model="membership.invoice"
             src_model="res.partner"
-            multi="False"
+            multi="True"
             key2="client_action_multi"
             view_mode="form"
             id="action_membership_invoice_view"/>
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index be820de4856..66806c4f350 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -21,54 +21,39 @@
 
 
 {
-    "name" : "MRP",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "website" : "http://www.openerp.com",
-    "category" : "Manufacturing",
-    "sequence": 18,
-    "summary": "Manufacturing Orders, Bill of Materials, Routing",
-    "images" : ["images/bill_of_materials.jpeg", "images/manufacturing_order.jpeg", "images/planning_manufacturing_order.jpeg", "images/production_analysis.jpeg", "images/production_dashboard.jpeg","images/routings.jpeg","images/work_centers.jpeg"],
-    "depends" : ["procurement", "stock", "resource", "purchase", "product","process"],
-    "description": """
-This is the base module to manage the manufacturing process in OpenERP.
-=======================================================================
+    'name': 'MRP',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'category': 'Manufacturing',
+    'sequence': 18,
+    'summary': 'Manufacturing Orders, Bill of Materials, Routing',
+    'images': ['images/bill_of_materials.jpeg', 'images/manufacturing_order.jpeg', 'images/planning_manufacturing_order.jpeg', 'images/production_analysis.jpeg', 'images/production_dashboard.jpeg','images/routings.jpeg','images/work_centers.jpeg'],
+    'depends': ['product','procurement', 'stock', 'resource', 'purchase','process'],
+    'description': """
+Manage the Manufacturing process in OpenERP
+===========================================
 
-Features:
----------
-    * Make to Stock/Make to Order (by line)
-    * Multi-level BoMs, no limit
-    * Multi-level routing, no limit
-    * Routing and work center integrated with analytic accounting
-    * Scheduler computation periodically/Just In Time module
-    * Multi-pos, multi-warehouse
-    * Different reordering policies
-    * Cost method by product: standard price, average price
-    * Easy analysis of troubles or needs
-    * Very flexible
-    * Allows to browse Bill of Materials in complete structure that include child and phantom BoMs
+The manufacturing module allows you to cover planning, ordering, stocks and the manufacturing or assembly of products from raw materials and components. It handles the consumption and production of products according to a bill of materials and the necessary operations on machinery, tools or human resources according to routings.
 
-It supports complete integration and planification of stockable goods,
-consumable of services. Services are completely integrated with the rest
-of the software. For instance, you can set up a sub-contracting service
-in a BoM to automatically purchase on order the assembly of your production.
+It supports complete integration and planification of stockable goods, consumables or services. Services are completely integrated with the rest of the software. For instance, you can set up a sub-contracting service in a bill of materials to automatically purchase on order the assembly of your production.
 
-Reports provided by this module:
---------------------------------
-    * Bill of Material structure and components
-    * Load forecast on Work Centers
-    * Print a production order
-    * Stock forecasts
-    * Cost Structure
+Key Features
+------------
+* Make to Stock/Make to Order
+* Multi-level bill of materials, no limit
+* Multi-level routing, no limit
+* Routing and work center integrated with analytic accounting
+* Periodical scheduler computation 
+* Allows to browse bills of materials in a complete structure that includes child and phantom bills of materials
 
-Dashboard provided by this module:
-----------------------------------
-    * List of procurements in exception
-    * List of next production orders
-    * Graph of stock value variation
+Dashboard / Reports for MRP will include:
+-----------------------------------------
+* Procurements in Exception (Graph)
+* Stock Value Variation (Graph)
+* Work Order Analysis
     """,
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/mrp_security.xml',
         'security/ir.model.access.csv',
         'mrp_workflow.xml',
@@ -88,9 +73,7 @@ Dashboard provided by this module:
         'board_manufacturing_view.xml',
         'res_config_view.xml',
     ],
-    'demo_xml': [
-         'mrp_demo.xml',
-    ],
+    'demo': ['mrp_demo.xml'],
     #TODO: This yml tests are needed to be completely reviewed again because the product wood panel is removed in product demo as it does not suit for new demo context of computer and consultant company
     # so the ymls are too complex to change at this stage
     'test': [
@@ -101,6 +84,5 @@ Dashboard provided by this module:
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0032052481373',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index e7668517a70..6bd07c2648b 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -9,7 +9,6 @@
                     <board style="2-1">
                         <column>
                             <action name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/>
-                            <action name="%(mrp.mrp_production_action2)d" string="Next Production Orders" creatable="true"/>
                         </column>
                         <column>
                             <action name="%(mrp.action_report_in_out_picking_tree)d" string="Stock Value Variation"/>
@@ -31,7 +30,8 @@
                   icon="terp-graph"
                   id="menu_board_manufacturing"
                   parent="base.menu_reporting_dashboard"
-                  sequence="30"/>
+                  sequence="30"
+                  groups="group_mrp_manager"/>
 
     </data>
 </openerp>
diff --git a/addons/mrp/i18n/ar.po b/addons/mrp/i18n/ar.po
index 1a590a5c616..8680e9786da 100644
--- a/addons/mrp/i18n/ar.po
+++ b/addons/mrp/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -48,7 +48,7 @@ msgstr "إستعمال مراكز العمل"
 #. module: mrp
 #: model:product.template,name:mrp.product_sugar_product_template
 msgid "Sugar"
-msgstr ""
+msgstr "سكر"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -63,7 +63,7 @@ msgstr "عدد الدورات"
 #. module: mrp
 #: model:product.uom.categ,name:mrp.product_uom_categ_fluid
 msgid "Fluid"
-msgstr ""
+msgstr "سائل"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
@@ -145,7 +145,7 @@ msgstr "منتجات منتهية"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr ""
+msgstr "تصنيع الطلبيات التي هي حاليا في الإنتاج."
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
@@ -218,17 +218,14 @@ msgstr "امليء المنتج لتتعقب بسهولة تكاليف الان
 msgid "For purchased material"
 msgstr "للمواد المشتراه"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "مراجعة"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"إنشاء نموذج المنتج على كل شيء قمت بالشراءه أو بيعه. حدد المورد إذا كان من "
+"الممكن شراء المنتج."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.next_id_77
@@ -264,7 +261,7 @@ msgstr "معلومات عن القدرة"
 #. module: mrp
 #: field:mrp.production,move_created_ids2:0
 msgid "Produced Products"
-msgstr ""
+msgstr "إنتاج المنتجات"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -319,7 +316,7 @@ msgstr "انت تحاول تخصيص الكثير من ما هو دون المن
 #. module: mrp
 #: model:product.template,name:mrp.product_cloth_product_template
 msgid "Cloth"
-msgstr ""
+msgstr "ثوب"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
@@ -334,7 +331,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Work Center Usage"
-msgstr ""
+msgstr "استخدام عمل المركز"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
@@ -396,6 +393,11 @@ msgid ""
 "sales person creates a sales order, he can relate it to several properties "
 "and OpenERP will automatically select the BoM to use according the needs."
 msgstr ""
+"وتستخدم الخصائص في OpenERP لتحديد مواد المشروع المناسبة  لتصنيع منتج عندما "
+"يكون لديك طرق مختلفة لبناء نفس المنتج. يمكنك تعيين العديد من الخصائص على كل "
+"فاتورة مواد. عندما يقوم مندوب المبيعات بإنشاء طلبات مبيعات، وكما يمكنه ربطها "
+"بالعديد من الخصائص وOpenERP سوف تختار تلقائيا فاتورة المواد لاستخدامها وفقا "
+"للاحتياجات."
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -473,7 +475,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Work Center per cycle."
-msgstr ""
+msgstr "حدد تكلفة العمل المركزية دورة"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
@@ -485,11 +487,6 @@ msgstr "تعطب التصنيع"
 msgid "For Services."
 msgstr "للخدمات."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "تاريخ التعديل."
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -525,7 +522,7 @@ msgstr "خطأ: كود إين غير صالح"
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
 msgid "Products to Produce"
-msgstr ""
+msgstr "لإنتاج منتجات"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -541,18 +538,13 @@ msgstr "كمية التغيير"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_configure_workcenter
 msgid "Configure your work centers"
-msgstr ""
+msgstr "اضبط مراكز عملك"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Force Reservation"
 msgstr "فرض الحجز"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "المؤلف"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -669,7 +661,7 @@ msgstr "جاهز"
 #. module: mrp
 #: model:product.template,name:mrp.product_buttons_product_template
 msgid "Shirt Buttons"
-msgstr ""
+msgstr "أزرار القميص"
 
 #. module: mrp
 #: help:mrp.production,routing_id:0
@@ -806,7 +798,7 @@ msgstr "عاجل"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are waiting for raw materials."
-msgstr ""
+msgstr "تصنيع الطلبيات التي تنتظر المواد الخام."
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
@@ -839,11 +831,6 @@ msgstr "الدورات الكلية"
 msgid "Ready to Produce"
 msgstr "جاهز للانتاج"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "إسم التصنيف"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -903,7 +890,7 @@ msgstr "الحد الادنى من المخزون"
 #: code:addons/mrp/mrp.py:503
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'"
-msgstr ""
+msgstr "لا يمكن حذف نظام التصنيع في ولاية %s"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
@@ -915,7 +902,7 @@ msgstr "اللوحة الرئيسية"
 #: code:addons/mrp/report/price.py:211
 #, python-format
 msgid "Total Cost of %s %s"
-msgstr ""
+msgstr "التكلفة الكلية لـ%s %s"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -1423,11 +1410,6 @@ msgstr "شراء المنتجات"
 msgid "Work Center Loads"
 msgstr "تحميلات مركز العمل"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "فمراجعة فاتورة المواد"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1958,12 +1940,6 @@ msgstr "الوقت بالساعات للإعداد."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "فاتورة المواد"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1981,17 +1957,6 @@ msgstr "تخصيص من المخزون."
 msgid "Waiting Goods"
 msgstr "انتظار السلع"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "اخر مؤشر"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "مراجعات فاتورة المواد"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2179,19 +2144,6 @@ msgstr "غير الكمية"
 msgid "Change Product Qty"
 msgstr "غير كمية المنتج"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "الوصف"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2312,6 +2264,9 @@ msgstr "منتجات للاستهلاك"
 #~ msgid "Day"
 #~ msgstr "يوم"
 
+#~ msgid "Revision"
+#~ msgstr "مراجعة"
+
 #~ msgid "title"
 #~ msgstr "الاسم"
 
@@ -2324,6 +2279,9 @@ msgstr "منتجات للاستهلاك"
 #~ msgid "October"
 #~ msgstr "أكتوبر"
 
+#~ msgid "Author"
+#~ msgstr "المؤلف"
+
 #~ msgid "March"
 #~ msgstr "مارس"
 
@@ -2394,6 +2352,9 @@ msgstr "منتجات للاستهلاك"
 #~ "following addons."
 #~ msgstr "اضف وظائف اكثر لجوهر تطبيق الصناعة بالملحقات التالية."
 
+#~ msgid "Modification name"
+#~ msgstr "إسم التصنيف"
+
 #~ msgid ""
 #~ "Time in hours for this work center to achieve the operation of the specified "
 #~ "routing."
@@ -2497,6 +2458,15 @@ msgstr "منتجات للاستهلاك"
 #~ "performance."
 #~ msgstr "يسمح لك هذا التقرير بتحليل انشطة التصنيع الخاصة بك و الاداء."
 
+#~ msgid "BoM"
+#~ msgstr "فاتورة المواد"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "مراجعات فاتورة المواد"
+
+#~ msgid "last indice"
+#~ msgstr "اخر مؤشر"
+
 #~ msgid "Draft"
 #~ msgstr "مسوّدة"
 
@@ -2527,6 +2497,9 @@ msgstr "منتجات للاستهلاك"
 #~ msgid "Work Cost of "
 #~ msgstr "تكلفة العمل لـ "
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "فمراجعة فاتورة المواد"
+
 #~ msgid "Manufacturing Operations"
 #~ msgstr "عمليات التصنيع"
 
@@ -2535,6 +2508,9 @@ msgstr "منتجات للاستهلاك"
 #~ "this work center."
 #~ msgstr "وصف مركز العمل. يبين هنا ماهي الدورة وفقًا لمركز العمل هذا."
 
+#~ msgid "Description"
+#~ msgstr "الوصف"
+
 #~ msgid "May"
 #~ msgstr "مايو"
 
@@ -2644,3 +2620,6 @@ msgstr "منتجات للاستهلاك"
 #~ "الخصائص على كل فاتورة من المواد. عندما ينشأ البائع ترتيب مبيعات، يمكنه ربطها "
 #~ "بالعديد من الخصائص و ستحدد OpenERP تلقائيا فاتورة المواد لاستخدمها طبقًا "
 #~ "للاحتياجات."
+
+#~ msgid "Modification Date"
+#~ msgstr "تاريخ التعديل."
diff --git a/addons/mrp/i18n/bg.po b/addons/mrp/i18n/bg.po
index fe59c3db351..562b9b7ce7f 100644
--- a/addons/mrp/i18n/bg.po
+++ b/addons/mrp/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -223,11 +223,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "За закупени суровини"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Версия"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -494,11 +489,6 @@ msgstr "Разлагане на производство"
 msgid "For Services."
 msgstr "За услуги."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Дата на промяна"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -560,11 +550,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Мощност за резервация"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Автор"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -845,11 +830,6 @@ msgstr "Общо цикли"
 msgid "Ready to Produce"
 msgstr "Готов за производство"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Име на промяна"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1410,11 +1390,6 @@ msgstr "Снабдяване с продукти"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1918,12 +1893,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1941,17 +1910,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Чакащи стоки"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2137,19 +2095,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Описание"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2320,6 +2265,15 @@ msgstr ""
 #~ msgid "products"
 #~ msgstr "продукти"
 
+#~ msgid "Author"
+#~ msgstr "Автор"
+
+#~ msgid "Modification Date"
+#~ msgstr "Дата на промяна"
+
+#~ msgid "Modification name"
+#~ msgstr "Име на промяна"
+
 #~ msgid "Stockable Production Order"
 #~ msgstr "Скадируема поръчка за производство"
 
@@ -2332,6 +2286,9 @@ msgstr ""
 #~ msgid "Day"
 #~ msgstr "Ден"
 
+#~ msgid "Revision"
+#~ msgstr "Версия"
+
 #~ msgid "title"
 #~ msgstr "заглавие"
 
@@ -2435,6 +2392,9 @@ msgstr ""
 #~ msgid "January"
 #~ msgstr "Януари"
 
+#~ msgid "Description"
+#~ msgstr "Описание"
+
 #~ msgid "May"
 #~ msgstr "Май"
 
diff --git a/addons/mrp/i18n/bs.po b/addons/mrp/i18n/bs.po
index 919176726f5..1a8d78d509e 100644
--- a/addons/mrp/i18n/bs.po
+++ b/addons/mrp/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/ca.po b/addons/mrp/i18n/ca.po
index ffddcf4c8c6..7035939d66c 100644
--- a/addons/mrp/i18n/ca.po
+++ b/addons/mrp/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Per material comprat"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisió"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -499,11 +494,6 @@ msgstr "Descomposició fabricació"
 msgid "For Services."
 msgstr "Per serveis"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data modificació"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -565,11 +555,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Força reserves"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -862,11 +847,6 @@ msgstr "Total cicles"
 msgid "Ready to Produce"
 msgstr "Llest per produir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nom de modificació"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1460,11 +1440,6 @@ msgstr "Proveir products"
 msgid "Work Center Loads"
 msgstr "Càrregues centre de producció"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisió de la llista de materials"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2007,12 +1982,6 @@ msgstr "Temps en hores per la configuració."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Llista de materials (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2030,17 +1999,6 @@ msgstr "Assignació des d'estoc."
 msgid "Waiting Goods"
 msgstr "Esperant mercaderia"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Últim índex"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisions llista de materials"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2229,19 +2187,6 @@ msgstr "Canvia la quantitat"
 msgid "Change Product Qty"
 msgstr "Canvia Qtat. producte"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripció"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2378,6 +2323,9 @@ msgstr "Productes a consumir"
 #~ "virtual menor que 0. Probablement no hauria d'utilitzar aquesta opció, "
 #~ "suggerim utilitzar una configuració de MTO en productes."
 
+#~ msgid "Revision"
+#~ msgstr "Revisió"
+
 #~ msgid "Exceptions Procurements"
 #~ msgstr "Excepcions de proveïments"
 
@@ -2544,6 +2492,9 @@ msgstr "Productes a consumir"
 #~ msgid "Make Procurement"
 #~ msgstr "Realitza proveïment"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data modificació"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "Si mètode de proveïment és obtenir sota comanda i mètode de subministre és "
@@ -2552,6 +2503,9 @@ msgstr "Productes a consumir"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Termini de temps de compra"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Estoc de producte estocable"
 
@@ -2644,6 +2598,9 @@ msgstr "Productes a consumir"
 #~ msgid "Security Days"
 #~ msgstr "Dies de seguretat"
 
+#~ msgid "Modification name"
+#~ msgstr "Nom de modificació"
+
 #~ msgid "Exception"
 #~ msgstr "Excepció"
 
@@ -2995,6 +2952,9 @@ msgstr "Productes a consumir"
 #~ msgid "plus"
 #~ msgstr "més"
 
+#~ msgid "BoM"
+#~ msgstr "Llista de materials (LdM)"
+
 #~ msgid "Stockable Product Process"
 #~ msgstr "Procés producte estocable"
 
@@ -3004,6 +2964,12 @@ msgstr "Productes a consumir"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Una sol·licitud de pressupost és creada i enviada al proveïdor."
 
+#~ msgid "last indice"
+#~ msgstr "Últim índex"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisions llista de materials"
+
 #~ msgid "Retry"
 #~ msgstr "Torna a intentar"
 
@@ -3061,6 +3027,9 @@ msgstr "Productes a consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Moviment de tancament al final"
 
+#~ msgid "Description"
+#~ msgstr "Descripció"
+
 #~ msgid "Running"
 #~ msgstr "En procés"
 
@@ -3303,6 +3272,9 @@ msgstr "Productes a consumir"
 #~ msgid "Configure"
 #~ msgstr "Configura"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisió de la llista de materials"
+
 #~ msgid ""
 #~ "Routing indicates all the workcenters used, for how long and/or cycles.If "
 #~ "Routing is indicated then,the third tab of a production order (workcenters) "
diff --git a/addons/mrp/i18n/cs.po b/addons/mrp/i18n/cs.po
index 897fb245946..07a4b6b223a 100644
--- a/addons/mrp/i18n/cs.po
+++ b/addons/mrp/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: mrp
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Pro nakoupený materiál"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revize"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -477,11 +472,6 @@ msgstr "Rozložení výroby"
 msgid "For Services."
 msgstr "Pro služby."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Datum úpravy"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -539,11 +529,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Vynutit rezervaci"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -828,11 +813,6 @@ msgstr "Celkem cyklů"
 msgid "Ready to Produce"
 msgstr "Připraveno k výrobě"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Jméno úpravy"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1396,11 +1376,6 @@ msgstr "Pořídit výrobek"
 msgid "Work Center Loads"
 msgstr "Vytížení výrobních center"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revize Soupisky materiálu"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1912,12 +1887,6 @@ msgstr "Čas v hodinách na sestavení"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1935,17 +1904,6 @@ msgstr "Přiřazení ze skladu."
 msgid "Waiting Goods"
 msgstr "Čekající zboží"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "poslední ukazatel"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revize BoM"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2131,19 +2089,6 @@ msgstr "Změnit množství"
 msgid "Change Product Qty"
 msgstr "Změnit množ. výrobků"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Popis"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2298,6 +2243,9 @@ msgstr "Výrobků ke spotřebě"
 #~ msgid "Raw Material Location"
 #~ msgstr "Umístění surového materiálu"
 
+#~ msgid "Revision"
+#~ msgstr "Revize"
+
 #~ msgid "title"
 #~ msgstr "nadpis"
 
@@ -2323,6 +2271,12 @@ msgstr "Výrobků ke spotřebě"
 #~ msgid "Advanced Routes"
 #~ msgstr "Pokročilé trasy"
 
+#~ msgid "Modification Date"
+#~ msgstr "Datum úpravy"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "March"
 #~ msgstr "Březen"
 
@@ -2355,6 +2309,9 @@ msgstr "Výrobků ke spotřebě"
 #~ "Čas v hodinách pro toto pracovní centrum k dosažení operace zadaného "
 #~ "směrování."
 
+#~ msgid "Modification name"
+#~ msgstr "Jméno úpravy"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Rozšířené filtry..."
 
@@ -2433,6 +2390,15 @@ msgstr "Výrobků ke spotřebě"
 #~ msgid "Image"
 #~ msgstr "Obrázek"
 
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
+#~ msgid "last indice"
+#~ msgstr "poslední ukazatel"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revize BoM"
+
 #~ msgid "Draft"
 #~ msgstr "Koncept"
 
@@ -2451,6 +2417,9 @@ msgstr "Výrobků ke spotřebě"
 #~ "will be automatically pre-completed."
 #~ msgstr "poslední ukazatel"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revize Soupisky materiálu"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Cena práce "
@@ -2468,6 +2437,9 @@ msgstr "Výrobků ke spotřebě"
 #~ msgid "MRP Applications Configuration"
 #~ msgstr "Nastavení aplikace MRP"
 
+#~ msgid "Description"
+#~ msgstr "Popis"
+
 #~ msgid "May"
 #~ msgstr "Květen"
 
diff --git a/addons/mrp/i18n/da.po b/addons/mrp/i18n/da.po
index 4cda30f1690..d5766024504 100644
--- a/addons/mrp/i18n/da.po
+++ b/addons/mrp/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index 5a4fa18831b..72ca506ded1 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:49+0000\n"
-"PO-Revision-Date: 2012-02-22 07:45+0000\n"
+"PO-Revision-Date: 2012-10-12 23:20+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Für eingekauftes Material"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revision"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -509,11 +504,6 @@ msgstr "Fertigungsreste"
 msgid "For Services."
 msgstr "Für Dienstleistungsprodukte."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Änderung am"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -575,11 +565,6 @@ msgstr "Konfigurieren Sie Ihre Arbeitsplätze"
 msgid "Force Reservation"
 msgstr "Erzwinge Reservierung"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Mitarbeiter"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -880,11 +865,6 @@ msgstr "Gesamt Zyklen"
 msgid "Ready to Produce"
 msgstr "Startbereit für Fertigung"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Bezeichnung geändert"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -976,7 +956,7 @@ msgstr "Bezeichnung Arbeitsplatz"
 #. module: mrp
 #: field:mrp.routing,code:0
 msgid "Code"
-msgstr "Kurzbezeichnung"
+msgstr "Kurzbez."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -1483,11 +1463,6 @@ msgstr "Beschaffung Produkte"
 msgid "Work Center Loads"
 msgstr "Arbeitsplatz Auslastungen"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Stückliste Revision"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2032,12 +2007,6 @@ msgstr "Vorbereitungszeit"
 msgid "Orange Juice"
 msgstr "Orangensaft"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Stückliste"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2055,17 +2024,6 @@ msgstr "Zuweisung vom Lager."
 msgid "Waiting Goods"
 msgstr "Erwartet Material"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Letzter Index"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Stücklisten Revision"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2257,19 +2215,6 @@ msgstr "Ändere Anzahl"
 msgid "Change Product Qty"
 msgstr "Ändere Produkt Menge"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Beschreibung"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2409,6 +2354,9 @@ msgstr "Benötigte Produkte"
 #~ "virtuellem Lager unter \"0\". Idealerweise arbeitet man allerdings mit "
 #~ "Lagerbestandsregeln."
 
+#~ msgid "Revision"
+#~ msgstr "Revision"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Regelbasierte Beschaffungsvorschläge"
 
@@ -2582,6 +2530,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "Make Procurement"
 #~ msgstr "Erzeuge Beschaffung"
 
+#~ msgid "Modification Date"
+#~ msgstr "Änderung am"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "Falls Beschaffungsmethode 'aus Auftrag' und Einkaufsmethode 'Produktion'"
@@ -2684,6 +2635,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "Security Days"
 #~ msgstr "Sicherheitspuffer (Tage)"
 
+#~ msgid "Modification name"
+#~ msgstr "Bezeichnung geändert"
+
 #~ msgid "Exception"
 #~ msgstr "Fehlerliste"
 
@@ -3033,6 +2987,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "plus"
 #~ msgstr "Plus"
 
+#~ msgid "BoM"
+#~ msgstr "Stückliste"
+
 #~ msgid "Stockable Product Process"
 #~ msgstr "Lagerfähiges Produkt Prozess"
 
@@ -3042,6 +2999,12 @@ msgstr "Benötigte Produkte"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Eine Angebotsanfrage wurde erzeugt und an den Lieferanten versendet."
 
+#~ msgid "last indice"
+#~ msgstr "Letzter Index"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Stücklisten Revision"
+
 #~ msgid "Retry"
 #~ msgstr "Wiederhole"
 
@@ -3100,6 +3063,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "Close Move at end"
 #~ msgstr "Beende Warenfluss (Ende)"
 
+#~ msgid "Description"
+#~ msgstr "Beschreibung"
+
 #~ msgid "Running"
 #~ msgstr "In Weiterbearbeitung"
 
@@ -3238,6 +3204,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "January"
 #~ msgstr "Januar"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Stückliste Revision"
+
 #~ msgid "February"
 #~ msgstr "Februar"
 
@@ -3263,6 +3232,9 @@ msgstr "Benötigte Produkte"
 #~ msgid "Advanced Routes"
 #~ msgstr "Lieferketten"
 
+#~ msgid "Author"
+#~ msgstr "Mitarbeiter"
+
 #~ msgid "Workcenter Usage"
 #~ msgstr "Fertigungsstelle Auslastung"
 
diff --git a/addons/mrp/i18n/el.po b/addons/mrp/i18n/el.po
index 7ee9e1fbcd1..a91bf3d7d07 100644
--- a/addons/mrp/i18n/el.po
+++ b/addons/mrp/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -213,11 +213,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Αναθεώρηση"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -476,11 +471,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Ημερ/νία Τροποποίησης"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -540,11 +530,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Κράτηση Τώρα"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Δημιουργός"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -825,11 +810,6 @@ msgstr "Σύννολο Κύκλων"
 msgid "Ready to Produce"
 msgstr "Έτοιμο για Παραγωγή"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Όνομα τροποποίησης"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1390,11 +1370,6 @@ msgstr "Προμήθεια Προϊόντων"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1899,12 +1874,6 @@ msgstr "Χρόνος εγκατάστασης σε ώρες"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Κ.Υ."
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1922,17 +1891,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Σε αναμονή υλικών"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "last indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Αναθεωρήσεις ΚΥ"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2118,19 +2076,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr "Αλλαγή Ποσ. Προϊόντος"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Περιγραφή"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2296,6 +2241,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "Ημέρες Ασφαλείας"
 
+#~ msgid "Modification name"
+#~ msgstr "Όνομα τροποποίησης"
+
 #~ msgid "From minimum stock rules, it goes for procure product."
 #~ msgstr "From minimum stock rules, it goes for procure product."
 
@@ -2331,6 +2279,9 @@ msgstr ""
 #~ msgid "Manufacturing Resource Planning"
 #~ msgstr "Σχεδίαση Πηγών Βιομηχανικής Παραγωγής (MRP)"
 
+#~ msgid "Revision"
+#~ msgstr "Αναθεώρηση"
+
 #~ msgid "Routing Workcenters"
 #~ msgstr "Κέντρα Εργασίας Γραμμής Παραγωγής"
 
@@ -2468,12 +2419,18 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "Εκτύπωση τιμής Προϊόντος"
 
+#~ msgid "Modification Date"
+#~ msgstr "Ημερ/νία Τροποποίησης"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr "If Procure method is Make to order and supply method is produce"
 
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Χρόνος Παράδοσης Παραγγελίας"
 
+#~ msgid "Author"
+#~ msgstr "Δημιουργός"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Απόθεμα Αποθηκεύσιμου Προϊόντος"
 
@@ -2888,6 +2845,9 @@ msgstr ""
 #~ msgid "plus"
 #~ msgstr "plus"
 
+#~ msgid "BoM"
+#~ msgstr "Κ.Υ."
+
 #~ msgid ""
 #~ "The list of operations (list of workcenters) to produce the finished "
 #~ "product. The routing is mainly used to compute workcenter costs during "
@@ -2908,6 +2868,12 @@ msgstr ""
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Η Αίτηση για Προσφορά δημιουργήθηκε και εστάλει στον προμηθευτή."
 
+#~ msgid "last indice"
+#~ msgstr "last indice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Αναθεωρήσεις ΚΥ"
+
 #~ msgid "Retry"
 #~ msgstr "Νέα προσπάθεια"
 
@@ -2962,6 +2928,9 @@ msgstr ""
 #~ msgid "Close Move at end"
 #~ msgstr "Close Move at end"
 
+#~ msgid "Description"
+#~ msgstr "Περιγραφή"
+
 #~ msgid "Running"
 #~ msgstr "Σε εξέλιξη"
 
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index a53cbe5d40b..4860ba7833a 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -507,11 +502,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha de modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -573,11 +563,6 @@ msgstr "Configure sus centros de producción"
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -880,11 +865,6 @@ msgstr "Total ciclos"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1481,11 +1461,6 @@ msgstr "Abastecer productos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de producción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2032,12 +2007,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr "Zumo de naranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiales (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2055,17 +2024,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones lista de materiales"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2256,19 +2214,6 @@ msgstr "Cambiar cantidad"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctd. producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripción"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2405,6 +2350,9 @@ msgstr "Productos a consumir"
 #~ "stock virtual menor que 0. Probablemente no debería utilizar esta opción, "
 #~ "sugerimos utilizar una configuración de MTO en productos."
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Calcular sólo reglas de stock mínimo"
 
@@ -2591,6 +2539,9 @@ msgstr "Productos a consumir"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Plazo de tiempo de compra"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Stock de producto almacenable"
 
@@ -2688,6 +2639,9 @@ msgstr "Productos a consumir"
 #~ msgid "Security Days"
 #~ msgstr "Días de seguridad"
 
+#~ msgid "Modification name"
+#~ msgstr "Nombre de modificación"
+
 #~ msgid "Exception"
 #~ msgstr "Excepción"
 
@@ -3044,6 +2998,9 @@ msgstr "Productos a consumir"
 #~ msgid "plus"
 #~ msgstr "más"
 
+#~ msgid "BoM"
+#~ msgstr "Lista de materiales (LdM)"
+
 #~ msgid "Stockable Product Process"
 #~ msgstr "Proceso producto almacenable"
 
@@ -3053,6 +3010,12 @@ msgstr "Productos a consumir"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Una solicitud de presupuesto es creada y enviada al proveedor."
 
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones lista de materiales"
+
 #~ msgid "Retry"
 #~ msgstr "Volver a intentar"
 
@@ -3111,6 +3074,9 @@ msgstr "Productos a consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Movimiento de cierre al final"
 
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
 #~ msgid "Running"
 #~ msgstr "En proceso"
 
@@ -3239,6 +3205,9 @@ msgstr "Productos a consumir"
 #~ msgid "Image"
 #~ msgstr "Imagen"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
 #~ msgid "January"
 #~ msgstr "Enero"
 
@@ -3532,3 +3501,6 @@ msgstr "Productos a consumir"
 #~ "    *Gráfico de carga del centro de trabajo\n"
 #~ "    *Lista de órdenes de fabricación con excepciones\n"
 #~ "    "
+
+#~ msgid "Modification Date"
+#~ msgstr "Fecha de modificación"
diff --git a/addons/mrp/i18n/es_AR.po b/addons/mrp/i18n/es_AR.po
index a0c3d57ea76..80d728f4ec4 100644
--- a/addons/mrp/i18n/es_AR.po
+++ b/addons/mrp/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -497,11 +492,6 @@ msgstr "Descomposición de la fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha de Modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -561,11 +551,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -851,11 +836,6 @@ msgstr "Ciclos totales"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de la modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1431,11 +1411,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1955,12 +1930,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "LdM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1978,17 +1947,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercandería"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones de LdM"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2177,19 +2135,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2320,6 +2265,9 @@ msgstr ""
 #~ msgid "MRP Subproducts"
 #~ msgstr "Subproductos MRP"
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "title"
 #~ msgstr "título"
 
@@ -2349,6 +2297,12 @@ msgstr ""
 #~ "Activa garantía y gestión de reparaciones (y su impacto sobre stocks y "
 #~ "facturación)"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Modification Date"
+#~ msgstr "Fecha de Modificación"
+
 #~ msgid "March"
 #~ msgstr "Marzo"
 
@@ -2384,6 +2338,9 @@ msgstr ""
 #~ msgid "Extended Filters..."
 #~ msgstr "Filtros extendidos..."
 
+#~ msgid "Modification name"
+#~ msgstr "Nombre de la modificación"
+
 #~ msgid "Just In Time Scheduling"
 #~ msgstr "Planificación 'Just in Time'"
 
@@ -2478,6 +2435,9 @@ msgstr ""
 #~ "Estos informes le permiten analizar sus actividades productivas y "
 #~ "rendimiento."
 
+#~ msgid "BoM"
+#~ msgstr "LdM"
+
 #~ msgid "December"
 #~ msgstr "Diciembre"
 
@@ -2490,6 +2450,12 @@ msgstr ""
 #~ msgid "Configuration Progress"
 #~ msgstr "Progreso de la configuración"
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones de LdM"
+
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
 #~ msgid "Draft"
 #~ msgstr "Borrador"
 
@@ -2512,6 +2478,9 @@ msgstr ""
 #~ msgid "Manufacturing Operations"
 #~ msgstr "Operaciones de fabricación"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
 #~ msgid ""
 #~ "Description of the work center. Explain here what's a cycle according to "
 #~ "this work center."
diff --git a/addons/mrp/i18n/es_CL.po b/addons/mrp/i18n/es_CL.po
index 85baff2bc2d..060746ba4c3 100644
--- a/addons/mrp/i18n/es_CL.po
+++ b/addons/mrp/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -508,11 +503,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -574,11 +564,6 @@ msgstr "Configure sus centros de trabajo"
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -881,11 +866,6 @@ msgstr "Total ciclos"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1483,11 +1463,6 @@ msgstr "Abastecer productos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de producción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2034,12 +2009,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr "Jugo de Naranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiales (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2057,17 +2026,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones lista de materiales"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2258,19 +2216,6 @@ msgstr "Cambiar cantidad"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctd. producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripción"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2414,6 +2359,9 @@ msgstr "Productos a consumir"
 #~ msgid "MRP Subproducts"
 #~ msgstr "Subproductos MRP"
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "title"
 #~ msgstr "título"
 
@@ -2442,6 +2390,12 @@ msgstr "Productos a consumir"
 #~ "Activa la garantía y la gestión de reparaciones (y su impacto sobre stocks y "
 #~ "facturación)"
 
+#~ msgid "Modification Date"
+#~ msgstr "Fecha modificación"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "March"
 #~ msgstr "Marzo"
 
@@ -2481,6 +2435,9 @@ msgstr "Productos a consumir"
 #~ "Tiempo en horas para este centro de producción para realizar la operación de "
 #~ "la ruta indicada."
 
+#~ msgid "Modification name"
+#~ msgstr "Nombre de modificación"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Filtros extendidos..."
 
@@ -2620,6 +2577,15 @@ msgstr "Productos a consumir"
 #~ msgid "Image"
 #~ msgstr "Imagen"
 
+#~ msgid "BoM"
+#~ msgstr "Lista de materiales (LdM)"
+
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones lista de materiales"
+
 #~ msgid "Draft"
 #~ msgstr "Borrador"
 
@@ -2641,6 +2607,9 @@ msgstr "Productos a consumir"
 #~ "y/o ciclos. Si se indica la ruta, entonces la tercera pestaña de una orden "
 #~ "de producción (centros de producción) será automáticamente pre-completada."
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Coste trabajo de "
@@ -2673,6 +2642,9 @@ msgstr "Productos a consumir"
 #~ msgid "MRP Applications Configuration"
 #~ msgstr "Configuración de las aplicaciónes MRP"
 
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
 #~ msgid "May"
 #~ msgstr "Mayo"
 
diff --git a/addons/mrp/i18n/es_CR.po b/addons/mrp/i18n/es_CR.po
index 97ba5aa7bac..8a67575f32c 100644
--- a/addons/mrp/i18n/es_CR.po
+++ b/addons/mrp/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: mrp
@@ -226,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -508,11 +503,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha de modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -574,11 +564,6 @@ msgstr "Configure sus centros de producción"
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -880,11 +865,6 @@ msgstr "Total ciclos"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1481,11 +1461,6 @@ msgstr "Abastecer productos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de producción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2032,12 +2007,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr "Zumo de naranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiales (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2055,17 +2024,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones lista de materiales"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2256,19 +2214,6 @@ msgstr "Cambiar cantidad"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctd. producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripción"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2390,6 +2335,33 @@ msgstr ""
 msgid "Products to Consume"
 msgstr "Productos a consumir"
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
+#~ msgid "Modification Date"
+#~ msgstr "Fecha de modificación"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Modification name"
+#~ msgstr "Nombre de modificación"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
+#~ msgid "BoM"
+#~ msgstr "Lista de materiales (LdM)"
+
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones lista de materiales"
+
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
 #~ msgid "-"
 #~ msgstr "-"
 
diff --git a/addons/mrp/i18n/es_EC.po b/addons/mrp/i18n/es_EC.po
index a57d2449bb4..4636b2f546f 100644
--- a/addons/mrp/i18n/es_EC.po
+++ b/addons/mrp/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -497,11 +492,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servicios"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Fecha modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -563,11 +553,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -861,11 +846,6 @@ msgstr "Total ciclos"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nombre de modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1453,11 +1433,6 @@ msgstr "Abastecer productos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de producción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión de lista de materiales"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2000,12 +1975,6 @@ msgstr "Tiempo en horas para la configuración."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiales (LdM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2023,17 +1992,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisiones lista de materiales"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2222,19 +2180,6 @@ msgstr "Cambiar cantidad"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctd. producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descripción"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2374,6 +2319,9 @@ msgstr "Productos a consumir"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Calcular sólo reglas de stock mínimo"
 
@@ -2521,6 +2469,9 @@ msgstr "Productos a consumir"
 #~ msgid "Make Procurement"
 #~ msgstr "Realizar abastecimiento"
 
+#~ msgid "Modification Date"
+#~ msgstr "Fecha modificación"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "si método de abastecimiento es obtener bajo pedido y método de suministro es "
@@ -2529,6 +2480,9 @@ msgstr "Productos a consumir"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Plazo de tiempo de compra"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Stock de producto almacenable"
 
@@ -2620,6 +2574,9 @@ msgstr "Productos a consumir"
 #~ msgid "Security Days"
 #~ msgstr "Días de seguridad"
 
+#~ msgid "Modification name"
+#~ msgstr "Nombre de modificación"
+
 #~ msgid "Exception"
 #~ msgstr "Excepción"
 
@@ -2960,6 +2917,9 @@ msgstr "Productos a consumir"
 #~ msgid "plus"
 #~ msgstr "más"
 
+#~ msgid "BoM"
+#~ msgstr "Lista de materiales (LdM)"
+
 #~ msgid ""
 #~ "The list of operations (list of workcenters) to produce the finished "
 #~ "product. The routing is mainly used to compute workcenter costs during "
@@ -2981,6 +2941,12 @@ msgstr "Productos a consumir"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Una solicitud de presupuesto es creada y enviada al proveedor."
 
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisiones lista de materiales"
+
 #~ msgid "Retry"
 #~ msgstr "Volver a intentar"
 
@@ -3031,6 +2997,9 @@ msgstr "Productos a consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Movimiento de cierre al final"
 
+#~ msgid "Description"
+#~ msgstr "Descripción"
+
 #~ msgid "Running"
 #~ msgstr "En proceso"
 
@@ -3352,6 +3321,9 @@ msgstr "Productos a consumir"
 #~ msgid "Image"
 #~ msgstr "Imágen"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión de lista de materiales"
+
 #~ msgid ""
 #~ "Routing indicates all the workcenters used, for how long and/or cycles.If "
 #~ "Routing is indicated then,the third tab of a production order (workcenters) "
diff --git a/addons/mrp/i18n/et.po b/addons/mrp/i18n/et.po
index 3d0f120d08f..fc5349bec5d 100644
--- a/addons/mrp/i18n/et.po
+++ b/addons/mrp/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisjon"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Muutmise Kuupäev"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr "Kokku tsükkleid"
 msgid "Ready to Produce"
 msgstr "Valmis tootmiseks"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Modifikatsiooni nimi"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr "Hangi tooted"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2232,6 +2177,9 @@ msgstr ""
 #~ msgid "Moves Created"
 #~ msgstr "Liikumised loodud"
 
+#~ msgid "Revision"
+#~ msgstr "Revisjon"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Arvuta ainult lao miinimum reeglid"
 
@@ -2325,6 +2273,12 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "Prindi toote hind"
 
+#~ msgid "Modification Date"
+#~ msgstr "Muutmise Kuupäev"
+
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Latest error"
 #~ msgstr "Viimane viga"
 
@@ -2353,6 +2307,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "Turvalised Päevad"
 
+#~ msgid "Modification name"
+#~ msgstr "Modifikatsiooni nimi"
+
 #~ msgid "Exception"
 #~ msgstr "Erand"
 
diff --git a/addons/mrp/i18n/fi.po b/addons/mrp/i18n/fi.po
index c11311dfb32..567f3259246 100644
--- a/addons/mrp/i18n/fi.po
+++ b/addons/mrp/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -224,11 +224,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Ostettaville materiaaleille"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisio"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -496,11 +491,6 @@ msgstr "Valmistusrakenteen purkaminen"
 msgid "For Services."
 msgstr "Palveluille"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Muokkauspäivä"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -560,11 +550,6 @@ msgstr "Määrittele työpisteesi"
 msgid "Force Reservation"
 msgstr "Pakota varaus"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Tekijä"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -849,11 +834,6 @@ msgstr "Kierrot yhteensä"
 msgid "Ready to Produce"
 msgstr "Valmis tuotantoon"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Muutoksen nimi"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1428,11 +1408,6 @@ msgstr "Hanki tuotteita"
 msgid "Work Center Loads"
 msgstr "Työpisteen kuormitus"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Osaluettelon versio"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1947,12 +1922,6 @@ msgstr "Asetuksiin kuluva aika tunneissa."
 msgid "Orange Juice"
 msgstr "Appelssiinimehu"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Osaluettelo"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1970,17 +1939,6 @@ msgstr "Varastosta otto"
 msgid "Waiting Goods"
 msgstr "Odottaa tuotteita"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Viimeinen järjestys"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Osaluettelon revisiot"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2171,19 +2129,6 @@ msgstr "Muuta määrää"
 msgid "Change Product Qty"
 msgstr "Muuta tuotteen määrää"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Kuvaus"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2338,6 +2283,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Make Procurement"
 #~ msgstr "Tee hankinta"
 
+#~ msgid "Author"
+#~ msgstr "Tekijä"
+
 #~ msgid "Latest error"
 #~ msgstr "Viimeisin virhe"
 
@@ -2416,6 +2364,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Service Product"
 #~ msgstr "Palvelutuote"
 
+#~ msgid "Revision"
+#~ msgstr "Revisio"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
 
@@ -2554,6 +2505,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Oston läpimenoaika"
 
+#~ msgid "Modification Date"
+#~ msgstr "Muokkauspäivä"
+
 #~ msgid "Routing workcenter usage"
 #~ msgstr "Reititys työpisteiden käyttö"
 
@@ -2647,6 +2601,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Serivce Stockable Order"
 #~ msgstr "Huolto varastoitava tilaus"
 
+#~ msgid "Modification name"
+#~ msgstr "Muutoksen nimi"
+
 #~ msgid "Production done"
 #~ msgstr "Tuotanto valmis"
 
@@ -2884,9 +2841,15 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Canceled"
 #~ msgstr "Peruttu"
 
+#~ msgid "BoM"
+#~ msgstr "Osaluettelo"
+
 #~ msgid "New Production Order"
 #~ msgstr "Uusi tuotantotilaus"
 
+#~ msgid "last indice"
+#~ msgstr "Viimeinen järjestys"
+
 #~ msgid "plus"
 #~ msgstr "plus"
 
@@ -2912,6 +2875,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "The normal working time of the workcenter."
 #~ msgstr "Työpisteen normaali työaika."
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Osaluettelon revisiot"
+
 #~ msgid "Procurement Reason"
 #~ msgstr "Hankinnan syy"
 
@@ -2944,6 +2910,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "TOTAL"
 #~ msgstr "Yhteensä"
 
+#~ msgid "Description"
+#~ msgstr "Kuvaus"
+
 #~ msgid "Close Move at end"
 #~ msgstr "Sulje siirto lopussa"
 
@@ -3142,6 +3111,9 @@ msgstr "Käytettävät tuotteet"
 #~ msgid "Image"
 #~ msgstr "Kuva"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Osaluettelon versio"
+
 #~ msgid "Manufacturing Operations"
 #~ msgstr "Valmistuksen vaiheet"
 
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index becabf6f550..684e8dc8431 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
@@ -242,11 +242,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Pour un produit acheté"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Révision"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -523,11 +518,6 @@ msgstr "Décomposition de la fabrication"
 msgid "For Services."
 msgstr "Pour les services."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Date de modification"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -589,11 +579,6 @@ msgstr "Configurer les centres de travails"
 msgid "Force Reservation"
 msgstr "Forcer la réservation"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Auteur"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -864,6 +849,12 @@ msgid ""
 "resource leave are not taken into account in the time computation of the "
 "work center."
 msgstr ""
+"Les centres de travaux vous permettent de créer et de gérer des unités de "
+"production. Elles consistent en des opérateurs et/ou des machines, qui sont "
+"considérés comme des unités pour les prévisions de la capacité et de la "
+"planification. Rappelez-vous que le temps de travail et les congés des "
+"ressources ne sont pas prises en compte dans le calcul du temps du centre de "
+"travail."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
@@ -886,11 +877,6 @@ msgstr "Cycles Totaux"
 msgid "Ready to Produce"
 msgstr "Prêt à Produire"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nom de la Modification"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1486,11 +1472,6 @@ msgstr "Approvisionner les produits"
 msgid "Work Center Loads"
 msgstr "Occupation des postes de charge"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Révision des nomenclatures"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1623,7 +1604,7 @@ msgstr "Production à la demande"
 #: code:addons/mrp/mrp.py:358
 #, python-format
 msgid "Copy"
-msgstr "Copier"
+msgstr "Copie"
 
 #. module: mrp
 #: help:mrp.workcenter,note:0
@@ -1771,6 +1752,8 @@ msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
 "But you can only consume up to total %s quantities."
 msgstr ""
+"Vous allez consommer un total de %s \"%s\".\n"
+"Mais vous ne pouvez consommer qu'un maximum de %s."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -2028,12 +2011,6 @@ msgstr "Temps en Heures pour la mise en place"
 msgid "Orange Juice"
 msgstr "Jus d'orange"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Nomenclature"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2051,17 +2028,6 @@ msgstr "Affectation à partir du stock."
 msgid "Waiting Goods"
 msgstr "En attente de marchandises"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Dernier Indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Révisions des Nomenclatures"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2133,6 +2099,8 @@ msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
 "But you can only produce up to total %s quantities."
 msgstr ""
+"Vous allez produire un total de %s \"%s\".\n"
+"Mais vous ne pouvez produire qu'un maximum de %s."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
@@ -2250,19 +2218,6 @@ msgstr "Changer la quantité"
 msgid "Change Product Qty"
 msgstr "Changer la Qté de Produits"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Description"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2409,6 +2364,9 @@ msgstr "Produits à consommer"
 #~ msgid "Moves Created"
 #~ msgstr "Mouvements créés"
 
+#~ msgid "Revision"
+#~ msgstr "Révision"
+
 #~ msgid "Packing list"
 #~ msgstr "Liste des Colisages"
 
@@ -2457,6 +2415,12 @@ msgstr "Produits à consommer"
 #~ msgid "Print product price"
 #~ msgstr "Imprimer le prix du produit"
 
+#~ msgid "Modification Date"
+#~ msgstr "Date de modification"
+
+#~ msgid "Author"
+#~ msgstr "Auteur"
+
 #~ msgid "Latest error"
 #~ msgstr "Dernière Erreur"
 
@@ -2487,6 +2451,9 @@ msgstr "Produits à consommer"
 #~ msgid "Security Days"
 #~ msgstr "Jours de sécurité"
 
+#~ msgid "Modification name"
+#~ msgstr "Nom de la Modification"
+
 #~ msgid "Exception"
 #~ msgstr "Exception"
 
@@ -2601,9 +2568,18 @@ msgstr "Produits à consommer"
 #~ msgid "plus"
 #~ msgstr "plus"
 
+#~ msgid "BoM"
+#~ msgstr "Nomenclature"
+
 #~ msgid "New Production Order"
 #~ msgstr "Nouvel Ordre de Production"
 
+#~ msgid "last indice"
+#~ msgstr "Dernier Indice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Révisions des Nomenclatures"
+
 #~ msgid "Retry"
 #~ msgstr "Réessayez"
 
@@ -2616,6 +2592,9 @@ msgstr "Produits à consommer"
 #~ msgid "Warehouse"
 #~ msgstr "Entrepôt"
 
+#~ msgid "Description"
+#~ msgstr "Description"
+
 #~ msgid "Running"
 #~ msgstr "En cours"
 
@@ -3272,6 +3251,9 @@ msgstr "Produits à consommer"
 #~ msgid "Total Cost of "
 #~ msgstr "Coût total "
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Révision des nomenclatures"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Coût de fabrication de "
diff --git a/addons/mrp/i18n/gl.po b/addons/mrp/i18n/gl.po
index 3e33548acd0..00011faebfa 100644
--- a/addons/mrp/i18n/gl.po
+++ b/addons/mrp/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -226,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para material mercado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisión"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -498,11 +493,6 @@ msgstr "Descomposición fabricación"
 msgid "For Services."
 msgstr "Para servizos"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data de modificación"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -564,11 +554,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Forzar reservas"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -859,11 +844,6 @@ msgstr "Ciclos totais"
 msgid "Ready to Produce"
 msgstr "Listo para producir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nome da modificación"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1450,11 +1430,6 @@ msgstr "Abastecer produtos"
 msgid "Work Center Loads"
 msgstr "Cargas centro de produción"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisión da lista de materiais"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1990,12 +1965,6 @@ msgstr "Tempo en horas para a configuración."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de materiais"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2013,17 +1982,6 @@ msgstr "Asignación desde stock."
 msgid "Waiting Goods"
 msgstr "Esperando mercancía"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisións lista de materiais"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2212,19 +2170,6 @@ msgstr "Cambiar cantidade"
 msgid "Change Product Qty"
 msgstr "Cambiar Ctde producto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descrición"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2368,6 +2313,9 @@ msgstr "Produtos a consumir"
 #~ "Mellora as ordes de produción cos estados de preparación, así como a data de "
 #~ "inicio e final da execución da orde."
 
+#~ msgid "Revision"
+#~ msgstr "Revisión"
+
 #~ msgid "title"
 #~ msgstr "título"
 
@@ -2400,6 +2348,12 @@ msgstr "Produtos a consumir"
 #~ "Activa a garantía e a xestión das reparacións (e o seu impacto sobre os "
 #~ "stocks e a facturación)"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Modification Date"
+#~ msgstr "Data de modificación"
+
 #~ msgid "March"
 #~ msgstr "Marzo"
 
@@ -2442,6 +2396,9 @@ msgstr "Produtos a consumir"
 #~ msgid "Extended Filters..."
 #~ msgstr "Filtros extendidos..."
 
+#~ msgid "Modification name"
+#~ msgstr "Nome da modificación"
+
 #~ msgid "Just In Time Scheduling"
 #~ msgstr "Planificación 'Just in Time'"
 
@@ -2622,6 +2579,9 @@ msgstr "Produtos a consumir"
 #~ "Estes informes permítenlle analizar as súas actividades productivas e o seu "
 #~ "rendemento."
 
+#~ msgid "BoM"
+#~ msgstr "Lista de materiais"
+
 #~ msgid "December"
 #~ msgstr "Decembro"
 
@@ -2634,6 +2594,12 @@ msgstr "Produtos a consumir"
 #~ msgid "Configuration Progress"
 #~ msgstr "Progreso da configuración"
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisións lista de materiais"
+
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
 #~ msgid "Draft"
 #~ msgstr "Proxecto"
 
@@ -2652,6 +2618,9 @@ msgstr "Produtos a consumir"
 #~ msgid "January"
 #~ msgstr "Xaneiro"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisión da lista de materiais"
+
 #~ msgid "Manufacturing Operations"
 #~ msgstr "Operacións de produción"
 
@@ -2680,6 +2649,9 @@ msgstr "Produtos a consumir"
 #~ msgid "Work Cost of "
 #~ msgstr "Custo do traballo de "
 
+#~ msgid "Description"
+#~ msgstr "Descrición"
+
 #~ msgid "May"
 #~ msgstr "Maio"
 
diff --git a/addons/mrp/i18n/hi.po b/addons/mrp/i18n/hi.po
index 2ce7e5598b5..41d757865cc 100644
--- a/addons/mrp/i18n/hi.po
+++ b/addons/mrp/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "लेखक"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2284,6 +2229,9 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "प्रिंट उत्पाद मूल्य"
 
+#~ msgid "Author"
+#~ msgstr "लेखक"
+
 #~ msgid "Latest error"
 #~ msgstr "नवीनतम त्रुटि"
 
diff --git a/addons/mrp/i18n/hr.po b/addons/mrp/i18n/hr.po
index 7891c604a13..19c923a0c44 100644
--- a/addons/mrp/i18n/hr.po
+++ b/addons/mrp/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -223,11 +223,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Za nabavljeni materijal"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revizija"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -495,11 +490,6 @@ msgstr "Dekompozicija proizvodnje"
 msgid "For Services."
 msgstr "Za usluge."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Datum promjene"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -561,11 +551,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Force Reservation"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -856,11 +841,6 @@ msgstr "Ukupno ciklusa"
 msgid "Ready to Produce"
 msgstr "Spremno za proizvodnju"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Naziv promjene"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1446,11 +1426,6 @@ msgstr "Procure Products"
 msgid "Work Center Loads"
 msgstr "Opterećenje radnog centra"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revizija sastavnice"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1988,12 +1963,6 @@ msgstr "Vrijeme u satima za pripremu."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2011,17 +1980,6 @@ msgstr "Dodjela sa skladišta"
 msgid "Waiting Goods"
 msgstr "Waiting Goods"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "last indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "BoM Revisions"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2210,19 +2168,6 @@ msgstr "Promjeni količinu"
 msgid "Change Product Qty"
 msgstr "Promjeni kol. proizvoda"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Opis"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2363,6 +2308,9 @@ msgstr "Proizvodi za utrošiti"
 #~ msgid "Raw Material Location"
 #~ msgstr "Mjesto Sirovina"
 
+#~ msgid "Revision"
+#~ msgstr "Revizija"
+
 #~ msgid "June"
 #~ msgstr "Lipanj"
 
@@ -2378,6 +2326,9 @@ msgstr "Proizvodi za utrošiti"
 #~ msgid "October"
 #~ msgstr "Listopad"
 
+#~ msgid "Modification Date"
+#~ msgstr "Datum promjene"
+
 #~ msgid "March"
 #~ msgstr "Ožujak"
 
@@ -2415,6 +2366,24 @@ msgstr "Proizvodi za utrošiti"
 #~ msgid "Manufacturing Resource Planning"
 #~ msgstr "Planiranje resursa proizvodnje"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
+#~ msgid "Modification name"
+#~ msgstr "Naziv promjene"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revizija sastavnice"
+
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
+#~ msgid "last indice"
+#~ msgstr "last indice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "BoM Revisions"
+
 #~ msgid "Work Center Future Load"
 #~ msgstr "Buduće opterećenje radnog centra"
 
@@ -2431,6 +2400,9 @@ msgstr "Proizvodi za utrošiti"
 #~ "sales person creates a sales order, he can relate it to several properties "
 #~ "and OpenERP will automatically select the BoM to use according the the needs."
 
+#~ msgid "Description"
+#~ msgstr "Opis"
+
 #~ msgid ""
 #~ "Work Center Loads gives you a projection of work center loads over a "
 #~ "specified period. It is expressed in number of hours and machine related "
diff --git a/addons/mrp/i18n/hu.po b/addons/mrp/i18n/hu.po
index 18809e54855..3ee3613fc52 100644
--- a/addons/mrp/i18n/hu.po
+++ b/addons/mrp/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -226,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Vásárolt termékhez"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Felülvizsgálat"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -499,11 +494,6 @@ msgstr "Gyártás lebontása"
 msgid "For Services."
 msgstr "Szolgáltatásokhoz."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Módosítás dátuma"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -565,11 +555,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Foglalás erőltetése"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Szerző"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -862,11 +847,6 @@ msgstr "Összes ciklus"
 msgid "Ready to Produce"
 msgstr "Gyártásra kész"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Módosítás neve"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1453,11 +1433,6 @@ msgstr "Termékek beszerzése"
 msgid "Work Center Loads"
 msgstr "Munkaállomások terheltsége"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Anyagjegyzék felülvizsgálat"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1998,12 +1973,6 @@ msgstr "A beállításhoz szükséges idő órákban megadva."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Anyagjegyzék"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2021,17 +1990,6 @@ msgstr "Ellátás raktárból"
 msgid "Waiting Goods"
 msgstr "Várakozás az árura"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "utolsó jelzőszám"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Anyagjegyzék felülvizsgálatok"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2220,19 +2178,6 @@ msgstr "Mennyiség változtatása"
 msgid "Change Product Qty"
 msgstr "Mennyiség változtatása"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Leírás"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2366,6 +2311,12 @@ msgstr "Felhasználandó termékek"
 #~ msgid "October"
 #~ msgstr "Október"
 
+#~ msgid "Modification Date"
+#~ msgstr "Módosítás dátuma"
+
+#~ msgid "Author"
+#~ msgstr "Szerző"
+
 #~ msgid "March"
 #~ msgstr "Március"
 
@@ -2379,6 +2330,9 @@ msgstr "Felhasználandó termékek"
 #~ msgid "September"
 #~ msgstr "Szeptember"
 
+#~ msgid "Modification name"
+#~ msgstr "Módosítás neve"
+
 #~ msgid "Extended Filters..."
 #~ msgstr "Kiterjesztett szűrők…"
 
@@ -2403,6 +2357,9 @@ msgstr "Felhasználandó termékek"
 #~ msgid "January"
 #~ msgstr "Január"
 
+#~ msgid "Description"
+#~ msgstr "Leírás"
+
 #~ msgid "May"
 #~ msgstr "Május"
 
@@ -2461,6 +2418,9 @@ msgstr "Felhasználandó termékek"
 #~ msgid "MRP Subproducts"
 #~ msgstr "MRP altermékek modul"
 
+#~ msgid "Revision"
+#~ msgstr "Felülvizsgálat"
+
 #~ msgid "title"
 #~ msgstr "pozíció"
 
@@ -2682,6 +2642,15 @@ msgstr "Felhasználandó termékek"
 #~ msgid "Configure"
 #~ msgstr "Beállít"
 
+#~ msgid "BoM"
+#~ msgstr "Anyagjegyzék"
+
+#~ msgid "last indice"
+#~ msgstr "utolsó jelzőszám"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Anyagjegyzék felülvizsgálatok"
+
 #~ msgid ""
 #~ "Routing indicates all the workcenters used, for how long and/or cycles.If "
 #~ "Routing is indicated then,the third tab of a production order (workcenters) "
@@ -2691,6 +2660,9 @@ msgstr "Felhasználandó termékek"
 #~ "hány ciklusra van használatban. Ha a gyártási eljárás be van kapcsolva, a "
 #~ "gyártási rendelés 3. füle (munkaállomások) automatikusan kitöltésre kerül."
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Anyagjegyzék felülvizsgálat"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Munkaköltsége "
diff --git a/addons/mrp/i18n/id.po b/addons/mrp/i18n/id.po
index d4097c3c9f1..24bb695c5ac 100644
--- a/addons/mrp/i18n/id.po
+++ b/addons/mrp/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/it.po b/addons/mrp/i18n/it.po
index ee5d8ee37b7..31bedf17993 100644
--- a/addons/mrp/i18n/it.po
+++ b/addons/mrp/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -226,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Per materiali acquistati"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisione"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -501,11 +496,6 @@ msgstr "Scomposizione produzione"
 msgid "For Services."
 msgstr "Per Servizi."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data di Ultima Modifica"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -567,11 +557,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Forza Prenotazione"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Mittente"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -866,11 +851,6 @@ msgstr "Cicli totali"
 msgid "Ready to Produce"
 msgstr "Pronto per Entrare in Produzione"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nome Modifica"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1454,11 +1434,6 @@ msgstr "Approvvigiona i prodotti"
 msgid "Work Center Loads"
 msgstr "Carico Centri di Lavoro"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisione distinta base"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2002,12 +1977,6 @@ msgstr "Tempo in ore per il setup."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Distinta base"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2025,17 +1994,6 @@ msgstr "Assegnazione da stock."
 msgid "Waiting Goods"
 msgstr "In attesa del materiale"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Ultimo Indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisioni Distinta Base"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2224,19 +2182,6 @@ msgstr "Cambia quantità"
 msgid "Change Product Qty"
 msgstr "Cambia la quantità del prodotto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descrizione"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2355,6 +2300,9 @@ msgstr ""
 msgid "Products to Consume"
 msgstr "Prodotti da Utilizzare"
 
+#~ msgid "Revision"
+#~ msgstr "Revisione"
+
 #~ msgid "UoS Quantity"
 #~ msgstr "Quantità Unità di Vendita"
 
@@ -2412,6 +2360,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "Procurement Lines"
 #~ msgstr "Righe Approvvigionamento"
 
+#~ msgid "Modification name"
+#~ msgstr "Nome Modifica"
+
 #~ msgid "Exception"
 #~ msgstr "Eccezione"
 
@@ -2517,9 +2468,18 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "plus"
 #~ msgstr "più"
 
+#~ msgid "BoM"
+#~ msgstr "Distinta base"
+
 #~ msgid "New Production Order"
 #~ msgstr "Nuovo Ordine di Produzione"
 
+#~ msgid "last indice"
+#~ msgstr "Ultimo Indice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisioni Distinta Base"
+
 #~ msgid "Retry"
 #~ msgstr "Riprova"
 
@@ -2535,6 +2495,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "Close Move at end"
 #~ msgstr "Chiudi spostamento alla Fine"
 
+#~ msgid "Description"
+#~ msgstr "Descrizione"
+
 #~ msgid "Running"
 #~ msgstr "In esecuzione"
 
@@ -2715,6 +2678,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "Procurement Process"
 #~ msgstr "Procedura di approvvigionamento"
 
+#~ msgid "Author"
+#~ msgstr "Mittente"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr ""
 #~ "Se il tipo di approvvigionamento è \"Make to Order\" e il tipo di fornitura "
@@ -2723,6 +2689,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Lead Time di Acquisto"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data di Ultima Modifica"
+
 #~ msgid "Manufacturity Lead Time"
 #~ msgstr "Lead Time di Produzione"
 
@@ -3124,6 +3093,9 @@ msgstr "Prodotti da Utilizzare"
 #~ msgid "January"
 #~ msgstr "Gennaio"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisione distinta base"
+
 #~ msgid "February"
 #~ msgstr "Febbraio"
 
diff --git a/addons/mrp/i18n/ja.po b/addons/mrp/i18n/ja.po
index 529f023d803..342c650c6a8 100644
--- a/addons/mrp/i18n/ja.po
+++ b/addons/mrp/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -213,11 +213,6 @@ msgstr "分析会計の中で製造コストを簡単に追跡するため、こ
 msgid "For purchased material"
 msgstr "仕入済材料"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "改訂"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -477,11 +472,6 @@ msgstr "製造分解"
 msgid "For Services."
 msgstr "サービス用"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "修正日"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -539,11 +529,6 @@ msgstr "作業センタの設定"
 msgid "Force Reservation"
 msgstr "強制予約"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "著者"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -830,11 +815,6 @@ msgstr "合計サイクル"
 msgid "Ready to Produce"
 msgstr "生産準備完了"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "変更の名前"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1402,11 +1382,6 @@ msgstr "調達製品"
 msgid "Work Center Loads"
 msgstr "作業センタの負荷"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "部品表の改訂"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1926,12 +1901,6 @@ msgstr "設定のための時間（時）"
 msgid "Orange Juice"
 msgstr "オレンジジュース"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "部品表"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1949,17 +1918,6 @@ msgstr "在庫から割当"
 msgid "Waiting Goods"
 msgstr "待機商品"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "最終インデックス"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "部品表改訂"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2148,19 +2106,6 @@ msgstr "数量変更"
 msgid "Change Product Qty"
 msgstr "製品数量変更"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "説明"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2271,6 +2216,33 @@ msgstr "部品表のリストを表示する際には並び順を与えます。
 msgid "Products to Consume"
 msgstr "消費製品"
 
+#~ msgid "Revision"
+#~ msgstr "改訂"
+
+#~ msgid "Modification Date"
+#~ msgstr "修正日"
+
+#~ msgid "Author"
+#~ msgstr "著者"
+
+#~ msgid "Modification name"
+#~ msgstr "変更の名前"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "部品表の改訂"
+
+#~ msgid "BoM"
+#~ msgstr "部品表"
+
+#~ msgid "last indice"
+#~ msgstr "最終インデックス"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "部品表改訂"
+
+#~ msgid "Description"
+#~ msgstr "説明"
+
 #~ msgid ""
 #~ "Reference of the document that created this procurement.\n"
 #~ "This is automatically completed by Open ERP."
diff --git a/addons/mrp/i18n/ko.po b/addons/mrp/i18n/ko.po
index 3683bb43d14..f2f7d1f3f8c 100644
--- a/addons/mrp/i18n/ko.po
+++ b/addons/mrp/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "개정 번호"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -472,11 +467,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "수정 날짜"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -534,11 +524,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "예약하기"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "작성자"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -819,11 +804,6 @@ msgstr "총 사이클"
 msgid "Ready to Produce"
 msgstr "생산 준비"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "수정 이름"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1384,11 +1364,6 @@ msgstr "상품 조달"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1892,12 +1867,6 @@ msgstr "셋업 시간"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1915,17 +1884,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "대기 상품"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "마지막 인덱스"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "BoM 리비전"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2111,19 +2069,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr "상품 수량 변경"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "설명"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2359,6 +2304,12 @@ msgstr ""
 #~ msgid "Purchase Lead Time"
 #~ msgstr "구매 리드 타임"
 
+#~ msgid "Author"
+#~ msgstr "작성자"
+
+#~ msgid "Modification Date"
+#~ msgstr "수정 날짜"
+
 #~ msgid "Make Procurement"
 #~ msgstr "조달하기"
 
@@ -2426,6 +2377,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "안전 기간 (일)"
 
+#~ msgid "Modification name"
+#~ msgstr "수정 이름"
+
 #~ msgid "If Product type is service"
 #~ msgstr "상품 타입이 서비스일 경우"
 
@@ -2710,9 +2664,18 @@ msgstr ""
 #~ msgid "Canceled"
 #~ msgstr "취소됨"
 
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
 #~ msgid "New Production Order"
 #~ msgstr "새 생산 주문"
 
+#~ msgid "BoM Revisions"
+#~ msgstr "BoM 리비전"
+
+#~ msgid "last indice"
+#~ msgstr "마지막 인덱스"
+
 #~ msgid "plus"
 #~ msgstr "더하기"
 
@@ -2778,6 +2741,9 @@ msgstr ""
 #~ msgid "Bill of Material Structure"
 #~ msgstr "BoM 구조"
 
+#~ msgid "Description"
+#~ msgstr "설명"
+
 #~ msgid "Workcenter load"
 #~ msgstr "워크센터 부하"
 
@@ -2790,6 +2756,9 @@ msgstr ""
 #~ msgid "Procurement Details"
 #~ msgstr "조달 상세내용"
 
+#~ msgid "Revision"
+#~ msgstr "개정 번호"
+
 #~ msgid "Not used in computations, for information purpose only."
 #~ msgstr "계산용이 아닌 정보 용도"
 
diff --git a/addons/mrp/i18n/lt.po b/addons/mrp/i18n/lt.po
index c31eca24835..e02810b3986 100644
--- a/addons/mrp/i18n/lt.po
+++ b/addons/mrp/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: lt\n"
 
 #. module: mrp
@@ -212,11 +212,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revizija"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -474,11 +469,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Modifikavimo data"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -538,11 +528,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Priverstinai rezervuoti"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autorius"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -823,11 +808,6 @@ msgstr "Iš viso ciklų"
 msgid "Ready to Produce"
 msgstr "Paruošta gamybai"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Modifikavimo pavadinimas"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1388,11 +1368,6 @@ msgstr "Užsakyti produktus"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1897,12 +1872,6 @@ msgstr "Laikas valandomis pradėti gamybai"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "KS"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1920,17 +1889,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Laukiama žaliavų"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Pask. revizija"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "KS revizijos"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2116,19 +2074,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr "Pakeisti produkto kiekį"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Aprašymas"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2247,6 +2192,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Paleidžiamas automatiškai, kai virtualios atsargos pasidaro mažiau nulio."
 
+#~ msgid "Revision"
+#~ msgstr "Revizija"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Apskaičiuoti atsargų likučio taisykles"
 
@@ -2398,12 +2346,18 @@ msgstr ""
 #~ msgid "Make Procurement"
 #~ msgstr "Sukurti planinį užsakymą"
 
+#~ msgid "Modification Date"
+#~ msgstr "Modifikavimo data"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr "Jeigu gamybos metodas yra užsakyti ir tiekimo metodas yra gaminti"
 
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Gamybos trukmė"
 
+#~ msgid "Author"
+#~ msgstr "Autorius"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Produktai sandėlyje."
 
@@ -2491,6 +2445,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "Saugios dienos"
 
+#~ msgid "Modification name"
+#~ msgstr "Modifikavimo pavadinimas"
+
 #~ msgid "Exception"
 #~ msgstr "Išimtis"
 
@@ -2805,6 +2762,9 @@ msgstr ""
 #~ msgid "plus"
 #~ msgstr "plius"
 
+#~ msgid "BoM"
+#~ msgstr "KS"
+
 #~ msgid ""
 #~ "The list of operations (list of workcenters) to produce the finished "
 #~ "product. The routing is mainly used to compute workcenter costs during "
@@ -2824,6 +2784,12 @@ msgstr ""
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Užklausa yra sukurta ir išsiųsta tiekėjams."
 
+#~ msgid "last indice"
+#~ msgstr "Pask. revizija"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "KS revizijos"
+
 #~ msgid "Retry"
 #~ msgstr "Pakartoti"
 
@@ -2881,6 +2847,9 @@ msgstr ""
 #~ msgid "Close Move at end"
 #~ msgstr "Uždarymo perkėlimas pabaigoje"
 
+#~ msgid "Description"
+#~ msgstr "Aprašymas"
+
 #~ msgid "Running"
 #~ msgstr "Veikiantis"
 
diff --git a/addons/mrp/i18n/lv.po b/addons/mrp/i18n/lv.po
index de8d5b14744..c10f69e927c 100644
--- a/addons/mrp/i18n/lv.po
+++ b/addons/mrp/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/mn.po b/addons/mrp/i18n/mn.po
index 38ade2cd236..71f329e4843 100644
--- a/addons/mrp/i18n/mn.po
+++ b/addons/mrp/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -80,7 +80,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.production,picking_id:0
 msgid "Picking list"
-msgstr "Бэлтгэх Жагсаалт"
+msgstr "Бэлтгэх баримт"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -227,11 +227,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Худалдан авсан материалын хувьд"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Хувилбар"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -506,11 +501,6 @@ msgstr "Үйлдвэрлэлийн задаргаа"
 msgid "For Services."
 msgstr "Үйлчилгээнүүдэд."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Зассан огноо"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -570,11 +560,6 @@ msgstr "Дамжлагыг тохируулах"
 msgid "Force Reservation"
 msgstr "Нөөцлөхийг албадах"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Зохиогч"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -870,11 +855,6 @@ msgstr "Нийт циклүүд"
 msgid "Ready to Produce"
 msgstr "Үйлдвэрлэхэд бэлэн"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Өөрчлөлтийн нэр"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1463,11 +1443,6 @@ msgstr "Бараа татах"
 msgid "Work Center Loads"
 msgstr "Дамжлагын Ачаалал"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Жорын Шинэчилсэн хувилбар"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2001,12 +1976,6 @@ msgstr "Суурилуулах хугацаа цагаар"
 msgid "Orange Juice"
 msgstr "Жүржийн Шүүс"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Жор"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2024,17 +1993,6 @@ msgstr "Бараанаас хуваарилах"
 msgid "Waiting Goods"
 msgstr "Бараанууд Хүлээж буй"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "сүүлийн индекс"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Жорын өөрчлөлтүүд"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2225,19 +2183,6 @@ msgstr "Тоо хэмжээг өөрчлөх"
 msgid "Change Product Qty"
 msgstr "Барааны Тоо Хэмжээг Өөрчлөх"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Тайлбар"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2355,3 +2300,30 @@ msgstr "Жорын жагсаалтыг харуулах дэс дарааллы
 #: report:mrp.production.order:0
 msgid "Products to Consume"
 msgstr "Хангах Бараанууд"
+
+#~ msgid "Revision"
+#~ msgstr "Хувилбар"
+
+#~ msgid "Modification Date"
+#~ msgstr "Зассан огноо"
+
+#~ msgid "Author"
+#~ msgstr "Зохиогч"
+
+#~ msgid "Modification name"
+#~ msgstr "Өөрчлөлтийн нэр"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Жорын Шинэчилсэн хувилбар"
+
+#~ msgid "BoM"
+#~ msgstr "Жор"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Жорын өөрчлөлтүүд"
+
+#~ msgid "last indice"
+#~ msgstr "сүүлийн индекс"
+
+#~ msgid "Description"
+#~ msgstr "Тайлбар"
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 1223b21f55d..21c397bd1b0 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -196,11 +196,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid "Create a product form for everything you buy or sell. Specify a supplier if the product can be purchased."
@@ -435,11 +430,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -493,11 +483,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -761,11 +746,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1294,11 +1274,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid "Reference of the document that generated this production order request."
@@ -1772,12 +1747,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1795,17 +1764,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -1987,19 +1945,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/nb.po b/addons/mrp/i18n/nb.po
index 259c027d4f0..539e39cb390 100644
--- a/addons/mrp/i18n/nb.po
+++ b/addons/mrp/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -226,17 +226,14 @@ msgstr ""
 msgid "For purchased material"
 msgstr "For innkjøpt materiale"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisjon"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"Lag et produktskjema for alt du kjøper eller selger. Angi en leverandør hvis "
+"produktet kan bli kjøpt."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.next_id_77
@@ -337,7 +334,7 @@ msgstr "Produkt Produser"
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr ""
+msgstr "Feil! Du kan ikke lage en uendelig struktur!"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -406,6 +403,11 @@ msgid ""
 "sales person creates a sales order, he can relate it to several properties "
 "and OpenERP will automatically select the BoM to use according the needs."
 msgstr ""
+"Egenskapene i OpenERP benyttes for å velge riktig materialliste for "
+"produksjon av et produkt hvor det finnes ulike måter å bygge opp produktet. "
+"Du kan legge flere egenskaper på hver materialliste. Når en selger lager en "
+"salgsordre kan han knytte den til ulike egenskaper, og OpenERP vil "
+"automatisk velge riktig materialliste i henhold til behovene."
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -499,11 +501,6 @@ msgstr "Produksjon nedbryting"
 msgid "For Services."
 msgstr "For Tjenester."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Dato endret"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -564,11 +561,6 @@ msgstr "Konfigurer arbeidssenter"
 msgid "Force Reservation"
 msgstr "Tving Reservasjon"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Forfatter"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -595,6 +587,7 @@ msgstr "Leverandør Pris per enhet"
 msgid ""
 "Gives the sequence order when displaying a list of routing Work Centers."
 msgstr ""
+"Gir rekkefølgen av når du viser en liste over ruter av  arbeidsstasjoner."
 
 #. module: mrp
 #: constraint:stock.move:0
@@ -709,7 +702,7 @@ msgstr "Tid i timer for å utføre en syklus."
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
-msgstr ""
+msgstr "Bom linje produktet bør ikke være det samme som BOM produkt."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -837,6 +830,10 @@ msgid ""
 "resource leave are not taken into account in the time computation of the "
 "work center."
 msgstr ""
+"Arbeidsstasjoner kan du opprette og administrere produksjonsenheter. De "
+"består av arbeidstakerne og / eller maskiner, som anses som en enhet for "
+"kapasitet og planlegging prognose. Husk at arbeidstiden og ressurs permisjon "
+"ikke er tatt hensyn til i tiden beregning av arbeidet sentrum."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
@@ -859,11 +856,6 @@ msgstr "Totalt Sykluser"
 msgid "Ready to Produce"
 msgstr "Klar for produksjon"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Endring navn"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -912,6 +904,8 @@ msgid ""
 "You must first cancel related internal picking attached to this "
 "manufacturing order."
 msgstr ""
+"Du må først annullere tilhørende intern plukkliste knyttet til "
+"produksjonsordren."
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
@@ -1100,7 +1094,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.todo.category,name:mrp.category_mrp_config
 msgid "MRP Management"
-msgstr ""
+msgstr "MRP Ledelse"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
@@ -1113,6 +1107,8 @@ msgid ""
 "Number of operations this Work Center can do in parallel. If this Work "
 "Center represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
+"Antall operasjoner denne Work Center kan gjøre parallelt. Hvis dette Work "
+"Center representerer et lag av 5 arbeidere, er kapasiteten per syklus 5."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
@@ -1445,11 +1441,6 @@ msgstr "Anskaff Produkter"
 msgid "Work Center Loads"
 msgstr "Arbeidssenter Belastning"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Stykkliste revisjoner"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1969,12 +1960,6 @@ msgstr "Tid i timer for oppsett."
 msgid "Orange Juice"
 msgstr "Appelsinjuice"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Materialliste"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1992,17 +1977,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Materialliste revisjon"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2188,19 +2162,6 @@ msgstr "Endre antall"
 msgid "Change Product Qty"
 msgstr "Endre produkt mengde"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Beskrivelse"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2321,6 +2282,9 @@ msgstr "Produkter til forbruk"
 #~ msgid "Raw Material Location"
 #~ msgstr "Råmateriale Lokasjon"
 
+#~ msgid "Revision"
+#~ msgstr "Revisjon"
+
 #~ msgid "title"
 #~ msgstr "tittel"
 
@@ -2363,6 +2327,12 @@ msgstr "Produkter til forbruk"
 #~ "Muliggjør garanti og reparasjons håndtering (og deres påvirkning av lager og "
 #~ "fakturering)."
 
+#~ msgid "Author"
+#~ msgstr "Forfatter"
+
+#~ msgid "Modification Date"
+#~ msgstr "Dato endret"
+
 #~ msgid "March"
 #~ msgstr "Mars"
 
@@ -2405,6 +2375,9 @@ msgstr "Produkter til forbruk"
 #~ msgid "Extended Filters..."
 #~ msgstr "Utvidede filter..."
 
+#~ msgid "Modification name"
+#~ msgstr "Endring navn"
+
 #~ msgid "Just In Time Scheduling"
 #~ msgstr "Akkurat i Tide Planlegging"
 
@@ -2596,6 +2569,12 @@ msgstr "Produkter til forbruk"
 #~ msgid "January"
 #~ msgstr "Januar"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Stykkliste revisjoner"
+
+#~ msgid "Description"
+#~ msgstr "Beskrivelse"
+
 #~ msgid "April"
 #~ msgstr "April"
 
@@ -2607,3 +2586,9 @@ msgstr "Produkter til forbruk"
 
 #~ msgid "Year"
 #~ msgstr "År"
+
+#~ msgid "BoM"
+#~ msgstr "Materialliste"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Materialliste revisjon"
diff --git a/addons/mrp/i18n/nl.po b/addons/mrp/i18n/nl.po
index fefa80907c7..ebef3c3e52d 100644
--- a/addons/mrp/i18n/nl.po
+++ b/addons/mrp/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:49+0000\n"
 "PO-Revision-Date: 2012-02-18 14:43+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:49+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -95,13 +95,13 @@ msgstr "Kostprijs per eenheid"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Scrap Products"
-msgstr "Afval producten"
+msgstr "Producten afkeuren"
 
 #. 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 "Routes"
+msgstr "Productiestappen"
 
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
@@ -130,7 +130,7 @@ msgid ""
 "of the routing."
 msgstr ""
 "Aantal iteraties die deze werkplek heeft te doen in de specifieke verwerking "
-"van de routing."
+"van de productiestap."
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Voor ingekocht materiaal"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisie"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -507,11 +502,6 @@ msgstr "Productie afbraak"
 msgid "For Services."
 msgstr "Voor services"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Wijzigingsdatum"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -573,11 +563,6 @@ msgstr "Configureer uw werkplekken"
 msgid "Force Reservation"
 msgstr "Forceer reservering"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Auteur"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -605,7 +590,7 @@ msgid ""
 "Gives the sequence order when displaying a list of routing Work Centers."
 msgstr ""
 "Geeft de volgorde weer bij het weergeven van een lijst van werkplekken in "
-"een routing."
+"een productiestap."
 
 #. module: mrp
 #: constraint:stock.move:0
@@ -653,7 +638,7 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
-msgstr "Materiaal routing"
+msgstr "Materiaal productiestappen"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -882,11 +867,6 @@ msgstr "Totaal aantal cycli"
 msgid "Ready to Produce"
 msgstr "Gereed voor productie"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Naamswijziging"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1186,7 +1166,7 @@ msgid ""
 "routing."
 msgstr ""
 "Tijd in uren voor deze werkplek om de bewerking uit te voeren in de "
-"gespecificeerde routing."
+"gespecificeerde productiestap."
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
@@ -1213,10 +1193,10 @@ msgid ""
 "They are attached to bills of materials that will define the required raw "
 "materials."
 msgstr ""
-"Routings geven u de mogelijkheid om productie bewerkingen te maken en te "
-"beheren, welke moeten worden opgevolgt binnen uw werkplekken om een product "
-"te produceren. Ze zijn gekoppeld aan een materiaallijst, welke de benodigde "
-"materialen beschrijft."
+"Productiestappen geven u de mogelijkheid om productie bewerkingen te maken "
+"en te beheren, welke moeten worden opgevolgt binnen uw werkplekken om een "
+"product te produceren. Ze zijn gekoppeld aan een materiaallijst, welke de "
+"benodigde materialen beschrijft."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.product_form_config_action
@@ -1273,8 +1253,8 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (Work Centers) "
 "will be automatically pre-completed."
 msgstr ""
-"Routing geven alle gebruikte werkplekken weer, voor hoe lang en/of cycly. "
-"Indien een routing is aangegeven dan wordt het derde tabblad van een "
+"Productiestappen geven alle gebruikte werkplekken weer, voor hoe lang en/of "
+"cycly. Indien een routing is aangegeven dan wordt het derde tabblad van een "
 "productieorder (Werkplekken) automatisch van tevoren ingevuld."
 
 #. module: mrp
@@ -1483,11 +1463,6 @@ msgstr "Verwerf producten"
 msgid "Work Center Loads"
 msgstr "Werkplek belastingen"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Grondstoffenlijst revisie"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1555,7 +1530,7 @@ msgstr "Verantwoordelijke"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr "Porductieorers te starten"
+msgstr "Productieorders te starten"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
@@ -1679,9 +1654,9 @@ msgid ""
 "planning."
 msgstr ""
 "De lijst van bewerkingen (werkplekken) om een gereed product te produceren. "
-"De routing wordt voornamelijk gebruikt om werkplek kosten gedurende de "
-"bewerkingen en toekomstige werkbelasting van de werkplekken te berekenen "
-"gebaseerd op de planning."
+"De productiestappen worden voornamelijk gebruikt om werkplek kosten "
+"gedurende de bewerkingen en toekomstige werkbelasting van de werkplekken te "
+"berekenen gebaseerd op de planning."
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -1737,7 +1712,7 @@ msgstr ""
 "In de 'Alleen verbruiken' modus worden alleen producten met de geselecteerde "
 "hoeveelheid verbruikt.\n"
 "In de 'Verbruik & Produceer' modus worden producten verbruikt met de "
-"geselecteerde hoeveelheid en het zal de productieporder afronden wanneer de "
+"geselecteerde hoeveelheid en het zal de productieorder afronden wanneer de "
 "totaal bestelde hoeveelheid zijn geproduceerd."
 
 #. module: mrp
@@ -2023,7 +1998,7 @@ msgstr "Toewijzing van productie- of inkooporder."
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
 msgid "Parent Routing"
-msgstr "Hoofdrouting"
+msgstr "Bovenliggende productiestap"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
@@ -2035,12 +2010,6 @@ msgstr "Opzettijd in uren"
 msgid "Orange Juice"
 msgstr "Sinasappelsap"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Materiaallijst"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2058,17 +2027,6 @@ msgstr "Toegewezen van voorraad"
 msgid "Waiting Goods"
 msgstr "Wacht op materialen"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "laatste index"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Materiaallijst versies"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2205,7 +2163,7 @@ msgstr "Producties"
 #: view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
-msgstr "Routing"
+msgstr "Productiestappen"
 
 #. module: mrp
 #: field:mrp.production,date_planned:0
@@ -2259,19 +2217,6 @@ msgstr "Wijzig hoeveelheid"
 msgid "Change Product Qty"
 msgstr "Wijzig producthoeveelheid"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Beschrijving"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2420,6 +2365,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "Product Standard Price"
 #~ msgstr "Standaard productprijs"
 
+#~ msgid "Modification Date"
+#~ msgstr "Wijzigingsdatum"
+
 #~ msgid "For stockable and consumable"
 #~ msgstr "Voor voorraadartikel en verbruiksartikel"
 
@@ -2521,6 +2469,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "max"
 #~ msgstr "max"
 
+#~ msgid "Author"
+#~ msgstr "Auteur"
+
 #~ msgid "Latest error"
 #~ msgstr "Laatste fout"
 
@@ -2836,6 +2787,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "New Production Order"
 #~ msgstr "Nieuwe productieopdracht"
 
+#~ msgid "Description"
+#~ msgstr "Beschrijving"
+
 #~ msgid "Service Product"
 #~ msgstr "Dienstverleningsproduct"
 
@@ -3033,6 +2987,12 @@ msgstr "Producten te verbruiken"
 #~ msgid "Canceled"
 #~ msgstr "Geannuleerd"
 
+#~ msgid "BoM"
+#~ msgstr "Materiaallijst"
+
+#~ msgid "last indice"
+#~ msgstr "laatste index"
+
 #~ msgid "An entry is being made from billing material to routing."
 #~ msgstr ""
 #~ "Er wordt een boeking gemaakt van doorbelastbaar materiaal naar routering."
@@ -3111,6 +3071,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "UoS Quantity"
 #~ msgstr "VE aantal"
 
+#~ msgid "Revision"
+#~ msgstr "Revisie"
+
 #~ msgid "Routing Workcenters"
 #~ msgstr "Routing werkcentra"
 
@@ -3126,6 +3089,9 @@ msgstr "Producten te verbruiken"
 #~ msgid "Workcenter Operations"
 #~ msgstr "Werkcenter operaties"
 
+#~ msgid "Modification name"
+#~ msgstr "Naamswijziging"
+
 #~ msgid "alphabetical indices"
 #~ msgstr "Alfabetische index"
 
@@ -3185,3 +3151,9 @@ msgstr "Producten te verbruiken"
 
 #~ msgid "Repairs"
 #~ msgstr "Reparaties"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Grondstoffenlijst revisie"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Materiaallijst versies"
diff --git a/addons/mrp/i18n/nl_BE.po b/addons/mrp/i18n/nl_BE.po
index 60295606495..84c035b0e8a 100644
--- a/addons/mrp/i18n/nl_BE.po
+++ b/addons/mrp/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/pl.po b/addons/mrp/i18n/pl.po
index 5c056d49c51..717342a63e9 100644
--- a/addons/mrp/i18n/pl.po
+++ b/addons/mrp/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -222,11 +222,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Dla kupowanych materiałów"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Wersja"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -494,11 +489,6 @@ msgstr "Dekompozycja produkcji"
 msgid "For Services."
 msgstr "Do usług."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data modyfikacji"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -560,11 +550,6 @@ msgstr "Konfiguruj centra produkcyjne"
 msgid "Force Reservation"
 msgstr "Wymuś rezerwację"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -849,11 +834,6 @@ msgstr "Suma cykli"
 msgid "Ready to Produce"
 msgstr "Gotowe do produkcji"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nazwa modyfikacji"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1423,11 +1403,6 @@ msgstr "Zapotrzebowanie na produkty"
 msgid "Work Center Loads"
 msgstr "Obciążenie centrum roboczego"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Wersja zestawienia materiałowego"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1933,12 +1908,6 @@ msgstr "Czas dla tego kroku w godzinach"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Zest. Mat."
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1956,17 +1925,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Czeka na materiały"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Wersje Zest. Mat."
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2152,19 +2110,6 @@ msgstr "Zmień ilość"
 msgid "Change Product Qty"
 msgstr "Zmień ilość produktu"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Opis"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2310,6 +2255,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Details"
 #~ msgstr "Szczegóły"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data modyfikacji"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Oblicz tylko reguły minimalnych zapasów"
 
@@ -2381,6 +2329,9 @@ msgstr "Produkty do zużycia"
 #~ "Jeśli metoda nabycia jest 'Na zamówienie' i metoda zaopatrzenia jest "
 #~ "'Produkcja'"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Latest error"
 #~ msgstr "Ostatni błąd"
 
@@ -2409,6 +2360,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Security Days"
 #~ msgstr "Dni na wszelki wypadek"
 
+#~ msgid "Modification name"
+#~ msgstr "Nazwa modyfikacji"
+
 #~ msgid "If Product type is service"
 #~ msgstr "Jeśli typem produktu jest usługa"
 
@@ -2595,6 +2549,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Canceled"
 #~ msgstr "Anulowano"
 
+#~ msgid "BoM"
+#~ msgstr "Zest. Mat."
+
 #~ msgid "New Production Order"
 #~ msgstr "Nowe zamówienie produkcji"
 
@@ -2640,6 +2597,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Create minimum stock rules"
 #~ msgstr "Utwórz reguły zapasów minimalnych"
 
+#~ msgid "Description"
+#~ msgstr "Opis"
+
 #~ msgid "Bill of Material Structure"
 #~ msgstr "Struktura zestawień materiałowych"
 
@@ -2682,6 +2642,9 @@ msgstr "Produkty do zużycia"
 #~ "przechodzenia przez zamówienie produkcji. Zwykłe zestawienie materiałowe "
 #~ "będzie generowało jedno zamówienie produkcji na każdy poziom zestawienia."
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Wersje Zest. Mat."
+
 #~ msgid "Draft"
 #~ msgstr "Projekt"
 
@@ -2802,6 +2765,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "Service Product"
 #~ msgstr "Produkt - usługa"
 
+#~ msgid "Revision"
+#~ msgstr "Wersja"
+
 #~ msgid "Confirmed"
 #~ msgstr "Potwierdzone"
 
@@ -3200,6 +3166,9 @@ msgstr "Produkty do zużycia"
 #~ msgid "MRP Application Configuration"
 #~ msgstr "Konfiguracja aplikacji MRP"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Wersja zestawienia materiałowego"
+
 #~ msgid "MRP Applications Configuration"
 #~ msgstr "Konfiguracja aplikacji MRP"
 
diff --git a/addons/mrp/i18n/pt.po b/addons/mrp/i18n/pt.po
index 2ddb44d160a..307edd10dd3 100644
--- a/addons/mrp/i18n/pt.po
+++ b/addons/mrp/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +225,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para materiais comprados"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisão"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -506,11 +501,6 @@ msgstr "Decomposição da produção"
 msgid "For Services."
 msgstr "Para serviços"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data de modificação"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -572,11 +562,6 @@ msgstr "Configure os seus centros de trabalho"
 msgid "Force Reservation"
 msgstr "Forçar reserva"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -876,11 +861,6 @@ msgstr "Total de Ciclos"
 msgid "Ready to Produce"
 msgstr "Pronto para produzir"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nome de modificação"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1477,11 +1457,6 @@ msgstr "Adquirir artigos"
 msgid "Work Center Loads"
 msgstr "Cargas Centro de Trabalho"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Ficha técnica da revisão de material"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2024,12 +1999,6 @@ msgstr "Tempo em horas para a configuração."
 msgid "Orange Juice"
 msgstr "Sumo Laranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2047,17 +2016,6 @@ msgstr "Atribuição de stock."
 msgid "Waiting Goods"
 msgstr "Esperar bens"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último índice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revisões de BoM"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2248,19 +2206,6 @@ msgstr "Mudar a quantidade"
 msgid "Change Product Qty"
 msgstr "Alterar Quantidade do Artigo"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descrição"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2384,6 +2329,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Moves Created"
 #~ msgstr "Movimentos criados"
 
+#~ msgid "Revision"
+#~ msgstr "Revisão"
+
 #~ msgid "UoS Quantity"
 #~ msgstr "Quantidade UoS"
 
@@ -2444,6 +2392,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Print product price"
 #~ msgstr "Imprimir o preço do produto"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Latest error"
 #~ msgstr "Último erro"
 
@@ -2477,6 +2428,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Security Days"
 #~ msgstr "Dias de segurança"
 
+#~ msgid "Modification name"
+#~ msgstr "Nome de modificação"
+
 #~ msgid "Exception"
 #~ msgstr "Excepção"
 
@@ -2617,9 +2571,18 @@ msgstr "Artigos para consumir"
 #~ msgid "plus"
 #~ msgstr "mais"
 
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
 #~ msgid "New Production Order"
 #~ msgstr "Nova pedido de produção"
 
+#~ msgid "last indice"
+#~ msgstr "Último índice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revisões de BoM"
+
 #~ msgid "Retry"
 #~ msgstr "Tentar novamente"
 
@@ -2644,6 +2607,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Fechar movimento no fim"
 
+#~ msgid "Description"
+#~ msgstr "Descrição"
+
 #~ msgid "Running"
 #~ msgstr "Em execução"
 
@@ -3236,6 +3202,9 @@ msgstr "Artigos para consumir"
 #~ msgid "Repairs"
 #~ msgstr "Reparações"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data de modificação"
+
 #~ msgid "Raw Material Location"
 #~ msgstr "Localização do material em bruto"
 
@@ -3461,6 +3430,9 @@ msgstr "Artigos para consumir"
 #~ "aba da ordem de produção (centros de trabalho) será automaticamente pré-"
 #~ "preenchido."
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Ficha técnica da revisão de material"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "Custo de trabalho "
diff --git a/addons/mrp/i18n/pt_BR.po b/addons/mrp/i18n/pt_BR.po
index 702d360fa94..1e0f5e165c7 100644
--- a/addons/mrp/i18n/pt_BR.po
+++ b/addons/mrp/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:49+0000\n"
 "PO-Revision-Date: 2012-07-28 22:20+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -225,11 +226,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Para Material Comprado"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revisão"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -507,11 +503,6 @@ msgstr "Decomposição de Produção"
 msgid "For Services."
 msgstr "Para Serviços"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data de Modificação"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -573,11 +564,6 @@ msgstr "Configure seus centros de trabalho"
 msgid "Force Reservation"
 msgstr "Forçar reserva"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -877,11 +863,6 @@ msgstr "Total de Ciclos"
 msgid "Ready to Produce"
 msgstr "Pronto para Produção"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Modificação de Nome"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1477,11 +1458,6 @@ msgstr "Adquirir Proodutos"
 msgid "Work Center Loads"
 msgstr "Cargas dos Centros de Trabalho"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revisão da Lista de Materiais"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2025,12 +2001,6 @@ msgstr "Tempo em horas para a configuração."
 msgid "Orange Juice"
 msgstr "Suco de Laranja"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Lista de Material (BoM)"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2048,17 +2018,6 @@ msgstr "Atribuição pelo Estoque."
 msgid "Waiting Goods"
 msgstr "Aguardando mercadorias"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "Último Indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "BoM Revisões"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2249,19 +2208,6 @@ msgstr "Alterar Quantidade"
 msgid "Change Product Qty"
 msgstr "Alterar Qtd. Produto"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descrição"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2424,6 +2370,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Production scheduled products"
 #~ msgstr "Produção de produtos agendados"
 
+#~ msgid "Modification Date"
+#~ msgstr "Data de Modificação"
+
 #~ msgid "Latest error"
 #~ msgstr "Último erro"
 
@@ -2454,6 +2403,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Details"
 #~ msgstr "Detalhes"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Qty Multiple"
 #~ msgstr "Múltiplo de Qtd"
 
@@ -2671,6 +2623,9 @@ msgstr "Produtos para Consumir"
 #~ msgstr ""
 #~ "Fator que multiplica todos os momentos expressa no centro de trabalho."
 
+#~ msgid "Modification name"
+#~ msgstr "Modificação de Nome"
+
 #~ msgid "Workcenter Name"
 #~ msgstr "Nome Centro de Trabalho"
 
@@ -2799,6 +2754,12 @@ msgstr "Produtos para Consumir"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Um pedido de cotação é criado e enviado ao fornecedor."
 
+#~ msgid "BoM Revisions"
+#~ msgstr "BoM Revisões"
+
+#~ msgid "last indice"
+#~ msgstr "Último Indice"
+
 #~ msgid "Retry"
 #~ msgstr "Repetir"
 
@@ -2828,6 +2789,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Create minimum stock rules"
 #~ msgstr "Criar Regras minimas de Estoque."
 
+#~ msgid "Description"
+#~ msgstr "Descrição"
+
 #~ msgid "Service Product"
 #~ msgstr "Produto de Serviço"
 
@@ -2976,6 +2940,9 @@ msgstr "Produtos para Consumir"
 #~ msgstr ""
 #~ "Qualquer lançamento sendo feito da lista de materiais para roteamento"
 
+#~ msgid "BoM"
+#~ msgstr "Lista de Material (BoM)"
+
 #~ msgid "Procurement Reason"
 #~ msgstr "Motivo da Aquisição"
 
@@ -2991,6 +2958,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Close Move at end"
 #~ msgstr "Fechar Lançamento no final"
 
+#~ msgid "Revision"
+#~ msgstr "Revisão"
+
 #, python-format
 #~ msgid "Warning !"
 #~ msgstr "Atenção !"
@@ -3070,6 +3040,9 @@ msgstr "Produtos para Consumir"
 #~ msgid "Image"
 #~ msgstr "Imagem"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revisão da Lista de Materiais"
+
 #~ msgid "November"
 #~ msgstr "Novembro"
 
diff --git a/addons/mrp/i18n/ro.po b/addons/mrp/i18n/ro.po
index d8a7645f51d..7f8d7acaf1e 100644
--- a/addons/mrp/i18n/ro.po
+++ b/addons/mrp/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -223,11 +223,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Pentru materiale achizitionate"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revizie"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -504,11 +499,6 @@ msgstr "Descompunerea fabricatiei"
 msgid "For Services."
 msgstr "Pentru servicii."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Data Modificarii"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -570,11 +560,6 @@ msgstr "Configureaza centrele dumneavoastra de lucru"
 msgid "Force Reservation"
 msgstr "Impune Rezervarea"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Autor"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -878,11 +863,6 @@ msgstr "Total Cicluri"
 msgid "Ready to Produce"
 msgstr "Pregatit de productie"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Nume modificare"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1479,11 +1459,6 @@ msgstr "Necesar produse"
 msgid "Work Center Loads"
 msgstr "Sarcini Centru de lucru"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Revizuire Lista de materiale"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -2032,12 +2007,6 @@ msgstr "Timpul in ore pentru instalare."
 msgid "Orange Juice"
 msgstr "Suc de portocale"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "LdM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -2055,17 +2024,6 @@ msgstr "Repartizare din stoc."
 msgid "Waiting Goods"
 msgstr "Bunuri in asteptare"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "ultimul indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Revizuiri LdM"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2256,19 +2214,6 @@ msgstr "Schimba Cantitatea"
 msgid "Change Product Qty"
 msgstr "Schimba Cant Produsului"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Descriere"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2386,12 +2331,24 @@ msgstr "Da ordinea atunci cand afiseaza o lista cu listele de materiale."
 msgid "Products to Consume"
 msgstr "Produse de consumat"
 
+#~ msgid "Revision"
+#~ msgstr "Revizie"
+
 #~ msgid "BOM"
 #~ msgstr "LDM"
 
+#~ msgid "Author"
+#~ msgstr "Autor"
+
 #~ msgid "Draft"
 #~ msgstr "Ciornă"
 
+#~ msgid "Description"
+#~ msgstr "Descriere"
+
+#~ msgid "Modification name"
+#~ msgstr "Nume modificare"
+
 #~ msgid "Day"
 #~ msgstr "Zi"
 
@@ -2434,6 +2391,9 @@ msgstr "Produse de consumat"
 #~ msgid "Current"
 #~ msgstr "Curent"
 
+#~ msgid "BoM"
+#~ msgstr "LdM"
+
 #~ msgid "December"
 #~ msgstr "Decembrie"
 
@@ -2510,6 +2470,9 @@ msgstr "Produse de consumat"
 #~ msgid "mrp.installer"
 #~ msgstr "mrp.installer"
 
+#~ msgid "last indice"
+#~ msgstr "ultimul indice"
+
 #~ msgid "Order quantity cannot be negative or zero !"
 #~ msgstr "Cantitatea din comandă nu poate fi negativă sau zero !"
 
@@ -2762,3 +2725,12 @@ msgstr "Produse de consumat"
 #~ "Fișa tehnologică indică toate centrele de lucru folosite, pentru cât timp și "
 #~ "/ sau cicluri. Dacă fișa tehnologică este indicată, atunci al treilea tab al "
 #~ "unei comenzi de producție (centre de lucru) va fi pre-completat automat."
+
+#~ msgid "Modification Date"
+#~ msgstr "Data Modificarii"
+
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Revizuire Lista de materiale"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Revizuiri LdM"
diff --git a/addons/mrp/i18n/ru.po b/addons/mrp/i18n/ru.po
index 7ad382ef9d4..7da5d3e1409 100644
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:49+0000\n"
-"PO-Revision-Date: 2011-12-06 10:16+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-09-14 07:17+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -49,7 +49,7 @@ msgstr "Использование рабочих центров"
 #. module: mrp
 #: model:product.template,name:mrp.product_sugar_product_template
 msgid "Sugar"
-msgstr ""
+msgstr "Сахар"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -64,7 +64,7 @@ msgstr "Количество циклов"
 #. module: mrp
 #: model:product.uom.categ,name:mrp.product_uom_categ_fluid
 msgid "Fluid"
-msgstr ""
+msgstr "Жидкость"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
@@ -90,7 +90,7 @@ msgstr "Стоимость часа"
 #: code:addons/mrp/report/price.py:139
 #, python-format
 msgid "Cost Price per Uom"
-msgstr ""
+msgstr "Себестоимость на ед.изм."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -183,7 +183,7 @@ msgstr "Стоимость за час"
 #. module: mrp
 #: model:product.template,name:mrp.product_orange_product_template
 msgid "Orange"
-msgstr ""
+msgstr "Апельсин"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -217,11 +217,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr "Для приобретенного материала"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Ревизия"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -313,7 +308,7 @@ msgstr "Позиция на сборочном чертеже или схеме"
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr "Вы пытаетесь назначить экземпляр продукции другого типа"
+msgstr "Вы пытаетесь назначить партию состоящую из другой продукции"
 
 #. module: mrp
 #: model:product.template,name:mrp.product_cloth_product_template
@@ -489,11 +484,6 @@ msgstr "Декомпозиция производства"
 msgid "For Services."
 msgstr "Для услуг."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Дата изменения"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -553,11 +543,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Не ждать пополнения расходных"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Автор"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -846,11 +831,6 @@ msgstr "Всего циклов"
 msgid "Ready to Produce"
 msgstr "Готово к производству"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Название модификации"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1425,11 +1405,6 @@ msgstr "Снабжение товарами"
 msgid "Work Center Loads"
 msgstr "Загрузка Рабочего центра"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Пересмотр спецификации"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1936,12 +1911,6 @@ msgstr "Время наладки в часах"
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "Спецификация"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1959,17 +1928,6 @@ msgstr "Назначение со склада."
 msgid "Waiting Goods"
 msgstr "Ожидание товара"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "последний индекс"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Ревизии спецификации"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2155,19 +2113,6 @@ msgstr "Изменить количество"
 msgid "Change Product Qty"
 msgstr "Изменить кол-во"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Описание"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2323,6 +2268,12 @@ msgstr "Потребляемые продукты"
 #~ msgid "Print product price"
 #~ msgstr "Распечатать цену продукции"
 
+#~ msgid "Modification Date"
+#~ msgstr "Дата изменения"
+
+#~ msgid "Author"
+#~ msgstr "Автор"
+
 #~ msgid "Latest error"
 #~ msgstr "Последняя ошибка"
 
@@ -2344,6 +2295,9 @@ msgstr "Потребляемые продукты"
 #~ msgid "Procurement Lines"
 #~ msgstr "Позиции снабжения"
 
+#~ msgid "Modification name"
+#~ msgstr "Название модификации"
+
 #~ msgid "Exception"
 #~ msgstr "Исключение"
 
@@ -2440,9 +2394,15 @@ msgstr "Потребляемые продукты"
 #~ msgid "plus"
 #~ msgstr "плюс"
 
+#~ msgid "BoM"
+#~ msgstr "Спецификация"
+
 #~ msgid "New Production Order"
 #~ msgstr "Новый заказ на производство"
 
+#~ msgid "last indice"
+#~ msgstr "последний индекс"
+
 #~ msgid "Retry"
 #~ msgstr "Повторить"
 
@@ -2458,6 +2418,9 @@ msgstr "Потребляемые продукты"
 #~ msgid "Warehouse"
 #~ msgstr "Склад"
 
+#~ msgid "Description"
+#~ msgstr "Описание"
+
 #~ msgid "Running"
 #~ msgstr "Выполняется"
 
@@ -2473,6 +2436,9 @@ msgstr "Потребляемые продукты"
 #~ msgid "Bill of Materials Components"
 #~ msgstr "Компоненты спецификации"
 
+#~ msgid "Revision"
+#~ msgstr "Ревизия"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Правила вычисления минимального запаса"
 
@@ -2574,6 +2540,9 @@ msgstr "Потребляемые продукты"
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "Заявка выслана поставщику"
 
+#~ msgid "BoM Revisions"
+#~ msgstr "Ревизии спецификации"
+
 #~ msgid ""
 #~ "The list of operations (list of workcenters) to produce the finished "
 #~ "product. The routing is mainly used to compute workcenter costs during "
@@ -2965,6 +2934,9 @@ msgstr "Потребляемые продукты"
 #~ "Описание рабочего центра. Объясните здесь, каков цикл для этого рабочего "
 #~ "центра."
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Пересмотр спецификации"
+
 #~ msgid "Configure Your Manufacturing Resource Planning Application"
 #~ msgstr "Настройте модуль планирования ресурсов производства"
 
diff --git a/addons/mrp/i18n/sk.po b/addons/mrp/i18n/sk.po
index 96b3d198348..8d5e935568c 100644
--- a/addons/mrp/i18n/sk.po
+++ b/addons/mrp/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revízia"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2230,6 +2175,9 @@ msgstr ""
 msgid "Products to Consume"
 msgstr ""
 
+#~ msgid "Revision"
+#~ msgstr "Revízia"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neplatný názov modelu v akcii definície."
 
diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po
index 6bf62b9884c..c36878f4d1d 100644
--- a/addons/mrp/i18n/sl.po
+++ b/addons/mrp/i18n/sl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:49+0000\n"
-"PO-Revision-Date: 2011-01-12 15:34+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-11-07 23:15+0000\n"
+"Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-11-09 04:39+0000\n"
+"X-Generator: Launchpad (build 16250)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -34,7 +34,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.production,location_src_id:0
 msgid "Location where the system will look for components."
-msgstr "Lokacije, kjer bo sistem iskal komponente"
+msgstr "Lokacija za iskanje komponent"
 
 #. module: mrp
 #: field:mrp.production,workcenter_lines:0
@@ -59,7 +59,7 @@ msgstr "Število ciklov"
 #. module: mrp
 #: model:product.uom.categ,name:mrp.product_uom_categ_fluid
 msgid "Fluid"
-msgstr ""
+msgstr "Tekočina"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
@@ -67,11 +67,13 @@ msgid ""
 "The 'Minimum stock rule' allows the system to create procurement orders "
 "automatically as soon as the minimum stock is reached."
 msgstr ""
+"Pravilo \"Minimalna zaloga\" omogoča avtomatsko kreiranje naročil "
+"dobaviteljem."
 
 #. module: mrp
 #: field:mrp.production,picking_id:0
 msgid "Picking list"
-msgstr ""
+msgstr "Dobavnica"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -83,18 +85,18 @@ msgstr "Urna postavka"
 #: code:addons/mrp/report/price.py:139
 #, python-format
 msgid "Cost Price per Uom"
-msgstr ""
+msgstr "Stroškovna cena na enoto"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Scrap Products"
-msgstr ""
+msgstr "Odpis izdelkov"
 
 #. 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 "Delovni tok"
 
 #. module: mrp
 #: field:mrp.workcenter,product_id:0
@@ -139,7 +141,7 @@ msgstr "Dokončani proizvodi"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr ""
+msgstr "Delovni nalogi trenutno v proizvodnji"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
@@ -155,7 +157,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
-msgstr "Produkti za dokončanje"
+msgstr "Izdelki za dokončanje"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -166,7 +168,7 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,state:0
 msgid "State"
-msgstr "Stanje"
+msgstr "Status"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_hour:0
@@ -176,7 +178,7 @@ msgstr "Strošek na uro"
 #. module: mrp
 #: model:product.template,name:mrp.product_orange_product_template
 msgid "Orange"
-msgstr ""
+msgstr "Pomaranča"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -188,7 +190,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "UOM"
-msgstr "ME"
+msgstr "EM"
 
 #. module: mrp
 #: field:change.production.qty,product_qty:0
@@ -204,17 +206,13 @@ msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
 msgstr ""
+"Izpolnite ta izdelek , za spremljavo stroškov v analitičnem računovodstvu"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "For purchased material"
 msgstr "Za nabavljeni material"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revizija"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -246,17 +244,17 @@ msgstr "["
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
 msgid "Procurement of services"
-msgstr ""
+msgstr "Nabava storitev"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Capacity Information"
-msgstr ""
+msgstr "Informacije o kapacitetah"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids2:0
 msgid "Produced Products"
-msgstr ""
+msgstr "Končani izdelki"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -284,7 +282,7 @@ msgstr "Partnerjev sklic"
 #: field:mrp.production,origin:0
 #: report:mrp.production.order:0
 msgid "Source Document"
-msgstr ""
+msgstr "Izvorni dokument"
 
 #. module: mrp
 #: field:mrp.production,product_lines:0
@@ -299,7 +297,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
-msgstr ""
+msgstr "Referenca na pozicijo v drugem planu"
 
 #. module: mrp
 #: constraint:stock.move:0
@@ -314,12 +312,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr ""
+msgstr "Končani izdelki"
 
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr ""
+msgstr "Napaka ! (Rekurzivna kosovnica)"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -329,18 +327,18 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procurement of stockable Product"
-msgstr ""
+msgstr "Nabava izdelka , ki se skladišči"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Default UOM"
-msgstr ""
+msgstr "Privzeta EM"
 
 #. module: mrp
 #: sql_constraint:mrp.production:0
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referenca mora biti enoznačna"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -366,7 +364,7 @@ msgstr "Potrdi Proizvodnjo"
 msgid ""
 "The system creates an order (production or purchased) depending on the sold "
 "quantity and the products parameters."
-msgstr ""
+msgstr "Sistem kreira nalog(delovni ali nabavni), odvisno od parametrov"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_stockproduction0
@@ -391,7 +389,7 @@ msgstr ""
 msgid ""
 "This is the Internal Picking List that brings the finished product to the "
 "production plan"
-msgstr ""
+msgstr "To je interna dobavnica , ki prenese izdelke v plan proizvodnje"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
@@ -401,7 +399,7 @@ msgstr "Delovni čas"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
 msgid "Weekly Stock Value Variation"
-msgstr ""
+msgstr "Tedensko nihanje vrednosti zalog"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -431,7 +429,7 @@ msgstr ""
 #. module: mrp
 #: view:board.board:0
 msgid "Stock Value Variation"
-msgstr ""
+msgstr "Nihanje vrednosti zalog"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
@@ -441,12 +439,12 @@ msgstr "Struktura kosovnice"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct0
 msgid "Product type is service"
-msgstr ""
+msgstr "Vrsta izdelka je usluga"
 
 #. module: mrp
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Ime podjetja mora biti unikatno !"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
@@ -468,12 +466,7 @@ msgstr ""
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
 msgid "For Services."
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Datum spremembe"
+msgstr "Za storitve."
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
@@ -504,7 +497,7 @@ msgstr ""
 #. module: mrp
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Napaka: neveljavna EAN črtna koda"
 
 #. module: mrp
 #: field:mrp.production,move_created_ids:0
@@ -515,12 +508,12 @@ msgstr ""
 #: view:mrp.routing:0
 #: field:mrp.routing,location_id:0
 msgid "Production Location"
-msgstr ""
+msgstr "Lokacija proizvodnje"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Change Qty"
-msgstr ""
+msgstr "Spremeni količino"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_configure_workcenter
@@ -530,12 +523,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Force Reservation"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Avtor"
+msgstr "Vsili rezervacijo"
 
 #. module: mrp
 #: field:report.mrp.inout,value:0
@@ -579,7 +567,7 @@ msgstr ""
 #: field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 msgid "Product UOM"
-msgstr "ME proizvoda"
+msgstr "EM"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -594,7 +582,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
 msgid "Time before prod."
-msgstr ""
+msgstr "Čas pred proizvodnjo"
 
 #. module: mrp
 #: help:mrp.routing,active:0
@@ -606,14 +594,14 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
-msgstr ""
+msgstr "Tok materiala"
 
 #. module: mrp
 #: view:mrp.production:0
 #: field:mrp.production,move_lines2:0
 #: report:mrp.production.order:0
 msgid "Consumed Products"
-msgstr ""
+msgstr "Porabljeni izdelki"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
@@ -626,23 +614,23 @@ msgstr ""
 #: code:addons/mrp/procurement.py:43
 #, python-format
 msgid "No BoM defined for this product !"
-msgstr ""
+msgstr "Izdelek nima kosovnice"
 
 #. 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 Material Components"
-msgstr ""
+msgstr "Komponente sestavnice"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Prenos zaloge"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_planning
 msgid "Planning"
-msgstr ""
+msgstr "Načrtovanje"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -666,7 +654,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,time_cycle:0
 msgid "Time in hours for doing one cycle."
-msgstr ""
+msgstr "Čas za končanje cikla"
 
 #. module: mrp
 #: constraint:mrp.bom:0
@@ -681,7 +669,7 @@ msgstr "V proizvodnji"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_property
 msgid "Master Bill of Materials"
-msgstr ""
+msgstr "Glavna sastavnica"
 
 #. module: mrp
 #: help:mrp.bom,product_uos:0
@@ -710,7 +698,7 @@ msgstr ""
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
 msgid "Per month"
-msgstr ""
+msgstr "Mesečno"
 
 #. module: mrp
 #: code:addons/mrp/wizard/change_production_qty.py:78
@@ -722,13 +710,13 @@ msgstr ""
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
-msgstr ""
+msgstr "Ime Izdelka"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:503
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Nepravilno dejanje!"
 
 #. module: mrp
 #: help:mrp.bom,product_efficiency:0
@@ -740,7 +728,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:762
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Opozorilo!"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -756,17 +744,17 @@ msgstr ""
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
 msgid "Procurement rule"
-msgstr ""
+msgstr "Pravilo nabave"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Partial"
-msgstr ""
+msgstr "Delno"
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "WorkCenter"
-msgstr ""
+msgstr "Proizvodni center"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procureserviceproduct0
@@ -784,7 +772,7 @@ msgstr "Nujno"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are waiting for raw materials."
-msgstr ""
+msgstr "Delovni nalogi , ki čakajo na material"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_workcenter_action
@@ -795,16 +783,18 @@ msgid ""
 "resource leave are not taken into account in the time computation of the "
 "work center."
 msgstr ""
+"Delovno enoto sestavljajo delavci in/ali stroji , ki predstavljajo eno enoto "
+"za planiranje kapacitet."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Delovni nalog"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
 msgid "Procurement of raw material"
-msgstr ""
+msgstr "Nabava surovin"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -817,16 +807,11 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: mrp
 #: field:mrp.bom,type:0
@@ -843,7 +828,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.property:0
 msgid "Search"
-msgstr ""
+msgstr "Iskanje"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:626
@@ -904,7 +889,7 @@ msgstr "Možno dati v zalogo"
 #: code:addons/mrp/report/price.py:130
 #, python-format
 msgid "Work Center name"
-msgstr ""
+msgstr "Ime delovne eote"
 
 #. module: mrp
 #: field:mrp.routing,code:0
@@ -1054,7 +1039,7 @@ msgstr ""
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Work Center per hour."
-msgstr ""
+msgstr "Cena delovne enote na uro"
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
@@ -1115,7 +1100,7 @@ msgstr "Analitični dnevnik"
 #: model:ir.ui.menu,name:mrp.menu_view_resource_search_mrp
 #: field:mrp.routing,workcenter_lines:0
 msgid "Work Centers"
-msgstr ""
+msgstr "Delovne enote"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1130,6 +1115,8 @@ msgid ""
 "They are attached to bills of materials that will define the required raw "
 "materials."
 msgstr ""
+"Delovni tok opredeljuje zaporedje delovnih enot in operacij za izdelavo "
+"določenega izdelka."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.product_form_config_action
@@ -1172,7 +1159,7 @@ msgstr ""
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Center load"
-msgstr ""
+msgstr "Zasedenost delovnega centra"
 
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
@@ -1382,11 +1369,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1878,7 +1860,7 @@ msgstr ""
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
 msgid "Parent Routing"
-msgstr ""
+msgstr "Nadrejeni delovni tok"
 
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
@@ -1890,12 +1872,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1889,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2055,7 +2020,7 @@ msgstr ""
 #: view:mrp.routing:0
 #: model:process.node,name:mrp.process_node_routing0
 msgid "Routing"
-msgstr "Usmerjanje"
+msgstr "Delovni tok"
 
 #. module: mrp
 #: field:mrp.production,date_planned:0
@@ -2109,19 +2074,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Opis"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2238,6 +2190,9 @@ msgstr ""
 #~ msgstr ""
 #~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
+#~ msgid "Revision"
+#~ msgstr "Revizija"
+
 #, python-format
 #~ msgid "Product name"
 #~ msgstr "Ime proizvoda"
@@ -2283,6 +2238,12 @@ msgstr ""
 #~ msgid "Reservation"
 #~ msgstr "Rezervacija"
 
+#~ msgid "Modification Date"
+#~ msgstr "Datum spremembe"
+
+#~ msgid "Author"
+#~ msgstr "Avtor"
+
 #~ msgid "Waiting"
 #~ msgstr "Čakanje"
 
@@ -2351,6 +2312,9 @@ msgstr ""
 #~ msgid "Close"
 #~ msgstr "Zapri"
 
+#~ msgid "Description"
+#~ msgstr "Opis"
+
 #~ msgid "Warehouse"
 #~ msgstr "Skladišče"
 
diff --git a/addons/mrp/i18n/sq.po b/addons/mrp/i18n/sq.po
index 29d3023b322..59333c66165 100644
--- a/addons/mrp/i18n/sq.po
+++ b/addons/mrp/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/sr@latin.po b/addons/mrp/i18n/sr@latin.po
index 0ef68a9a6d5..2ee0cccc138 100644
--- a/addons/mrp/i18n/sr@latin.po
+++ b/addons/mrp/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index 7c6d626fcc5..db3dad41249 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revision"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -476,11 +471,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Ändringsdatum"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -540,11 +530,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Force Reservation"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Upphovsman"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -825,11 +810,6 @@ msgstr "Totalt antal cykler"
 msgid "Ready to Produce"
 msgstr "Klar att producera"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Ändring"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1393,11 +1373,6 @@ msgstr "Procure Products"
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1906,12 +1881,6 @@ msgstr "Time in hours for the setup."
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1929,17 +1898,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Väntande varor"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "last indice"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "BoM Revisions"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2125,19 +2083,6 @@ msgstr "Ändra kvantitet"
 msgid "Change Product Qty"
 msgstr "Ändra produktkvantitet"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Beskrivning"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2254,6 +2199,12 @@ msgstr ""
 #~ msgid "Reservation"
 #~ msgstr "Reservation"
 
+#~ msgid "Author"
+#~ msgstr "Upphovsman"
+
+#~ msgid "Modification name"
+#~ msgstr "Ändring"
+
 #~ msgid "Exception"
 #~ msgstr "Undantag"
 
@@ -2295,6 +2246,9 @@ msgstr ""
 #~ msgid "max"
 #~ msgstr "max"
 
+#~ msgid "Modification Date"
+#~ msgstr "Ändringsdatum"
+
 #~ msgid "Waiting"
 #~ msgstr "Väntar"
 
@@ -2322,6 +2276,9 @@ msgstr ""
 #~ msgid "Close"
 #~ msgstr "Stäng"
 
+#~ msgid "Description"
+#~ msgstr "Beskrivning"
+
 #~ msgid "Ask New Products"
 #~ msgstr "Be om nya produkter"
 
@@ -2340,6 +2297,9 @@ msgstr ""
 #~ msgid "Paid ?"
 #~ msgstr "Betald?"
 
+#~ msgid "Revision"
+#~ msgstr "Revision"
+
 #~ msgid "Compute Stock Minimum Rules Only"
 #~ msgstr "Beräkna minsta lagersaldo regler"
 
@@ -2911,6 +2871,9 @@ msgstr ""
 #~ msgid "Product quantity"
 #~ msgstr "Product quantity"
 
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
 #~ msgid ""
 #~ "The list of operations (list of workcenters) to produce the finished "
 #~ "product. The routing is mainly used to compute workcenter costs during "
@@ -2934,6 +2897,12 @@ msgstr ""
 #~ msgid "A Request for Quotation is created and sent to the supplier."
 #~ msgstr "A Request for Quotation is created and sent to the supplier."
 
+#~ msgid "last indice"
+#~ msgstr "last indice"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "BoM Revisions"
+
 #~ msgid "When any procuere products, it comes into the prpcurement orders"
 #~ msgstr "When any procuere products, it comes into the prpcurement orders"
 
diff --git a/addons/mrp/i18n/tlh.po b/addons/mrp/i18n/tlh.po
index e3807eedcaf..f4067ef703f 100644
--- a/addons/mrp/i18n/tlh.po
+++ b/addons/mrp/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index aec87da93e6..9c4f72d1f27 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -49,7 +49,7 @@ msgstr "İş Merkezi Kullanımı"
 #. module: mrp
 #: model:product.template,name:mrp.product_sugar_product_template
 msgid "Sugar"
-msgstr ""
+msgstr "Şeker"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -64,7 +64,7 @@ msgstr "Çevrim Sayısı"
 #. module: mrp
 #: model:product.uom.categ,name:mrp.product_uom_categ_fluid
 msgid "Fluid"
-msgstr ""
+msgstr "Sıvı"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_minimumstockprocure0
@@ -111,17 +111,17 @@ msgstr "İş Merkezi Ürünü"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Search Bill Of Material"
-msgstr "Ürün Ağacını Ara"
+msgstr "Ürün Ağacı Ara"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr "Stoklanabilir ürünler ve sarf malzemeleri"
+msgstr "Stoklanabilir ürünler ve sarf malzemeleri için"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "To Produce"
-msgstr "Üretim için"
+msgstr "Üretilir"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,cycle_nbr:0
@@ -138,7 +138,7 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,name:0
 msgid "Reference"
-msgstr "Referans"
+msgstr "Kaynak"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -148,13 +148,13 @@ msgstr "Bitmiş Ürünler"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr "Şu an Üretilen Üretim Emirleri"
+msgstr "Şu an üretimde olan Üretim Emirleri"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_servicerfq0
 #: model:process.transition,name:mrp.process_transition_stockrfq0
 msgid "To Buy"
-msgstr "Satın Almak için"
+msgstr "Satınalınır"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
@@ -170,7 +170,7 @@ msgstr "Bitirilecek Ürünler"
 #. module: mrp
 #: selection:mrp.bom,method:0
 msgid "Set / Pack"
-msgstr "Set / Paket"
+msgstr "Takım / Paket"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -186,7 +186,7 @@ msgstr "Saat Maliyeti"
 #. module: mrp
 #: model:product.template,name:mrp.product_orange_product_template
 msgid "Orange"
-msgstr ""
+msgstr "Portakal"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -200,7 +200,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "UOM"
-msgstr "Birim"
+msgstr "Ölçü Birimi"
 
 #. module: mrp
 #: field:change.production.qty,product_qty:0
@@ -216,19 +216,14 @@ msgid ""
 "Fill this product to track easily your production costs in the analytic "
 "accounting."
 msgstr ""
-"Üretim maliyetinizi analitik hesaplamada kolaylıkla takip etmek için bu "
-"ürünü doldurun."
+"Üretim maliyetinizi analiz muhasebesinde kolaylıklaizlemek için bu ürünü "
+"doldurun."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "For purchased material"
 msgstr "Satın alınan malzemeler için"
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Revizyon"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -277,7 +272,7 @@ msgstr "Üretilmiş Ürünler"
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Destination Location"
-msgstr "Hedef Lokasyon"
+msgstr "Varış Konumu"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom
@@ -290,13 +285,13 @@ msgid ""
 "The system waits for the products to be available in the stock. These "
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
-"Sistem ürünlerin stokta mevcut olmasını bekler. Bu ürünler normalde manuel "
-"olarak veya minimum stok kuralı aracılığıyla satın alınır."
+"Sistem ürünlerin stokta mevcut olmasını bekler. Bu ürünler normalde elle "
+"veya enaz stok kuralı aracılığıyla satın alınır."
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Partner Ref"
-msgstr "Cari Ref."
+msgstr "Paydaş Ref"
 
 #. module: mrp
 #: field:mrp.production,origin:0
@@ -312,32 +307,32 @@ msgstr "Planlanmış mallar"
 #. module: mrp
 #: selection:mrp.bom,type:0
 msgid "Sets / Phantom"
-msgstr "Setler / Hayalet"
+msgstr "Takımlar / Görüntü"
 
 #. module: mrp
 #: help:mrp.bom,position:0
 msgid "Reference to a position in an external plan."
-msgstr "Harici bir plandaki pozisyona referans."
+msgstr "Dış bir plandaki duruma gönderme."
 
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr "Aynı üründen olmayan bir lota atamaya çalışıyorsunuz."
+msgstr "Aynı üründen olmayan bir parti atamaya çalışıyorsunuz"
 
 #. module: mrp
 #: model:product.template,name:mrp.product_cloth_product_template
 msgid "Cloth"
-msgstr ""
+msgstr "Kumaş"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr "Ürün Üretimi"
+msgstr "Ürün Üret"
 
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr "Hata ! Kendini İçeren  BoM oluşturamazsınız."
+msgstr "Hata ! Yinelemeli Ürün Ağacı oluşturamazsınız."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@@ -352,13 +347,13 @@ msgstr "Stoklanabilir Ürün Satınalma"
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Default UOM"
-msgstr "Varsayılan Birim"
+msgstr "Varsayılan Ölçü Birimi"
 
 #. module: mrp
 #: sql_constraint:mrp.production:0
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr "Referans her şirket için tekil olmalı!"
+msgstr "Kaynak her firma için benzersiz olmalı!"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:139
@@ -406,13 +401,18 @@ msgid ""
 "sales person creates a sales order, he can relate it to several properties "
 "and OpenERP will automatically select the BoM to use according the needs."
 msgstr ""
+"Aynı ürünü farklı yöntemlerle yapma durumunuz varsa, OpenERP özellikleri bir "
+"ürünün üretimi için doğru ürün ağacını seçmek için kullanılır. Her Ürün "
+"Ağacına çeşitli özellikler atayabilirsiniz. Bir satış elemanı bir satış "
+"siparişi oluşturduğunda onu çeşitli özelliklerle ilişkilendirebilir ve "
+"OpenERP gereksinimlere göre kullanmak üzere otomatikman Ürün Ağacını seçer."
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
 msgid ""
 "This is the Internal Picking List that brings the finished product to the "
 "production plan"
-msgstr "Bu, bitmiş ürünü üretim planına getiren dahili toplama listesidir"
+msgstr "Bu, bitmiş ürünü üretim planına getiren İç Toplama Listesidir"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
@@ -448,9 +448,9 @@ 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 ""
-"Bitmiş ürünlerin gerekli olduğu lokasyonda üretim yapıyorsanız boş bırakın. "
-"Sabit bir lokasyonda üretim yapıyorsanız bir lokasyon belirleyin. Üretim "
-"işlemlerini bir alt yükleniciye devrederseniz bu ortak bir lokasyon olabilir."
+"Bitmiş ürünlerin gerekli olduğu konumda üretim yapıyorsanız boş bırakın. "
+"Sabit bir konumda üretim yapıyorsanız bir konum belirleyin. Üretim "
+"işlemlerini bir alt yükleniciye devrederseniz bu ortak bir konum olabilir."
 
 #. module: mrp
 #: view:board.board:0
@@ -470,7 +470,7 @@ msgstr "Ürün tipi hizmettir"
 #. module: mrp
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr "Şirket adı tekil olmalı !"
+msgstr "Firma adı benzersiz olmalı !"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_property_group_action
@@ -496,11 +496,6 @@ msgstr "Üretim ayrıştırma"
 msgid "For Services."
 msgstr "Hizmetler için."
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Değiştirme Tarihi"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -508,8 +503,8 @@ msgid ""
 "Complete this only if you want automatic analytic accounting entries on "
 "production orders."
 msgstr ""
-"Yalnızca üretim emirleri hakkında otomatik analitik hesaplama istiyorsanız "
-"bunu doldurun."
+"Üretim emirlerinde yalnızca otomatik analiz muhasebesi girişleri "
+"istiyorsanız bunu tamamlayın."
 
 #. module: mrp
 #: field:mrp.production.workcenter.line,cycle:0
@@ -560,11 +555,6 @@ msgstr "İş merkezlerinizi ayarlayın"
 msgid "Force Reservation"
 msgstr "Rezerve Et"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Yazar"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -573,7 +563,7 @@ msgstr "Stok Değeri"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
 msgid "Product BoM Structure"
-msgstr "Ürün BOM Yapısı"
+msgstr "Ürün Ürün Ağacı Yapısı"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -595,19 +585,19 @@ msgstr "Rota iş merkezlerinin listesini gösterirken sıra numarası verir"
 #. module: mrp
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr "view tipinde bir lokasyona ürün giriş çıkışı yapamazsınız."
+msgstr "Görünüm tipindeki bir konuma ürün giriş çıkışı yapamazsınız."
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr "Bom Hiyerarşisi"
+msgstr "Ürün Ağacı Sıradüzeni"
 
 #. module: mrp
 #: field:mrp.bom,product_uom:0
 #: field:mrp.production,product_uom:0
 #: field:mrp.production.product.line,product_uom:0
 msgid "Product UOM"
-msgstr "Birim"
+msgstr "Ürün Ölçü Birimi"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -617,7 +607,7 @@ msgstr "Toplama İstisnası"
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
 msgid "BoM Lines"
-msgstr "BoM Satırları"
+msgstr "Ürün Ağacı Satırları"
 
 #. module: mrp
 #: field:mrp.workcenter,time_start:0
@@ -630,7 +620,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the routing "
 "without removing it."
 msgstr ""
-"Aktif alan Yanlış olarak belirlenirse, kaldırmadan rotayı gizlemenize izin "
+"Etkin alan Yanlış olarak ayarlanırsa, kaldırmadan rotayı gizlemenize izin "
 "verecektir."
 
 #. module: mrp
@@ -643,7 +633,7 @@ msgstr "Malzeme Rotası"
 #: field:mrp.production,move_lines2:0
 #: report:mrp.production.order:0
 msgid "Consumed Products"
-msgstr "Sarfedilen Ürünler"
+msgstr "Tüketilen Ürünler"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
@@ -656,7 +646,7 @@ msgstr "İş Merkezi Yükü"
 #: code:addons/mrp/procurement.py:43
 #, python-format
 msgid "No BoM defined for this product !"
-msgstr "Bu ürün için herhangi bir BoM tanımlanmadı !"
+msgstr "Bu ürün için herhangi bir Ürün Ağacı tanımlanmadı !"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
@@ -682,7 +672,7 @@ msgstr "Hazır"
 #. module: mrp
 #: model:product.template,name:mrp.product_buttons_product_template
 msgid "Shirt Buttons"
-msgstr ""
+msgstr "Gömlek Düğmeleri"
 
 #. module: mrp
 #: help:mrp.production,routing_id:0
@@ -705,7 +695,7 @@ msgstr "Bir çevrimin tamamlanması için saat olarak süre."
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
-msgstr "BoM satırındaki ürün BoM ürünü ile aynı olamaz."
+msgstr "Ürün Ağacı satırındaki ürün Ürün Ağacı ürünü ile aynı olamaz."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -722,9 +712,7 @@ msgstr "Ana Ürün Ağacı"
 msgid ""
 "Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
 "promotion of stock."
-msgstr ""
-"Stok 2. Birim (Satış Birimi), faturalama ve stok artırımı için ölçüm "
-"birimidir."
+msgstr "Ürün UoS (Satış Birimi), fatura ve ürün arttırımı ölçü birimidir."
 
 #. module: mrp
 #: view:mrp.product_price:0
@@ -736,12 +724,12 @@ msgstr "Yazdır"
 #: view:mrp.bom:0
 #: view:mrp.workcenter:0
 msgid "Type"
-msgstr "Tipi"
+msgstr "Tür"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
-msgstr "'Minimum stok kuralı' tedarik yöntemine bağlıdır."
+msgstr "'Enaz stok kuralı' tedarik yöntemine bağlıdır."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -758,7 +746,7 @@ msgstr "Ürüne ait ürün ağacı bulunamadı"
 #. module: mrp
 #: report:bom.structure:0
 msgid "Product Name"
-msgstr "Stok Adı"
+msgstr "Ürün Adı"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:503
@@ -770,7 +758,7 @@ msgstr "Geçersiz eylem !"
 #: help:mrp.bom,product_efficiency:0
 msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
-"0,9'luk bir faktör üretim işleminde %10'luk bir kayıp anlamına gelir."
+"0,9 luk bir faktör üretim işleminde %10'luk bir kayıp anlamına gelir."
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:734
@@ -812,9 +800,9 @@ msgid ""
 "order creates a RFQ for a subcontracting purchase order or waits until the "
 "service is done (= the delivery of the products)."
 msgstr ""
-"Seçilen hizmet 'tedarik' yöntemine bağlı olarak, satınalma emri bir fason "
-"satınalma emri için Teklif İsteği oluşturur ya da hizmet sona erene kadar "
-"bekler (= ürünlerin teslimi)."
+"Hizmeti 'tedarik' için seçilen yönteme bağlı olarak, satınalma emri bir "
+"fason satınalma emri için Teklif  İsteği oluşturur ya da hizmet sona erene "
+"kadar bekler (= ürünlerin teslimi)."
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -861,11 +849,6 @@ msgstr "Toplam Çevrim"
 msgid "Ready to Produce"
 msgstr "Üretim için Hazır"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Değiştirme Adı"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -875,7 +858,7 @@ msgstr "Tarih"
 #. module: mrp
 #: field:mrp.bom,type:0
 msgid "BoM Type"
-msgstr "BoM Tipi"
+msgstr "Ürün Ağacı Tipi"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:45
@@ -883,7 +866,8 @@ msgstr "BoM Tipi"
 msgid ""
 "Procurement '%s' has an exception: 'No BoM defined for this product !'"
 msgstr ""
-"'%s' satınalmanın istisnası mevcuttur: 'Bu ürün için BoM tanımlanmamıştır !'"
+"'%s' satınalmanın istisnası mevcuttur: 'Bu ürün için Ürün Ağacı "
+"tanımlanmamıştır !'"
 
 #. module: mrp
 #: view:mrp.property:0
@@ -894,7 +878,7 @@ msgstr "Ara"
 #: code:addons/mrp/mrp.py:626
 #, python-format
 msgid "Could not cancel manufacturing order !"
-msgstr "Üretim Emrini iptal edilemiyor !"
+msgstr "Üretim Emri iptal edilemiyor !"
 
 #. module: mrp
 #: field:report.workcenter.load,cycle:0
@@ -904,7 +888,7 @@ msgstr "Çevrim Sayısı"
 #. module: mrp
 #: model:ir.model,name:mrp.model_res_company
 msgid "Companies"
-msgstr "Şirketler"
+msgstr "Firmalar"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:627
@@ -912,19 +896,20 @@ msgstr "Şirketler"
 msgid ""
 "You must first cancel related internal picking attached to this "
 "manufacturing order."
-msgstr "Önce bu üretim emri ne eklemiş iç alımları iptal etmelisiniz."
+msgstr ""
+"Önce bu üretim emrine eklenmiş ilişkili iç toplamaları iptal etmelisiniz."
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum Stock"
-msgstr "Minimum Stok"
+msgstr "Enaz Stok"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:503
 #, python-format
 msgid "Cannot delete a manufacturing order in state '%s'"
-msgstr "'%s' durumundaki üretim emirini silinemez."
+msgstr "'%s' durumundaki üretim emri silinemez."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
@@ -936,7 +921,7 @@ msgstr "Kontrol paneli"
 #: code:addons/mrp/report/price.py:211
 #, python-format
 msgid "Total Cost of %s %s"
-msgstr "Toplam maliyet %s %s"
+msgstr "%s %s in Toplam Maliyeti"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -981,7 +966,7 @@ msgstr "Üretim Planı."
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Inactive"
-msgstr "Etkin Olmayan"
+msgstr "Etkin Değil"
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -996,7 +981,7 @@ msgstr "İptal"
 #: code:addons/mrp/wizard/change_production_qty.py:63
 #, python-format
 msgid "Active Id is not found"
-msgstr "Aktif Kimlik bulunmadı"
+msgstr "Etkin Kimlik bulunmadı"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicerfq0
@@ -1015,7 +1000,7 @@ msgstr "Ürün Hareketi"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Late"
-msgstr "Geç"
+msgstr "Son"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
@@ -1025,7 +1010,7 @@ msgstr "Stoğa Üretim"
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Name"
-msgstr "BOM Adı"
+msgstr "Ürün Ağacı Adı"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1036,7 +1021,7 @@ msgstr "Üretimi Başlat"
 #: model:ir.actions.act_window,name:mrp.open_board_manufacturing
 #: model:ir.ui.menu,name:mrp.menu_board_manufacturing
 msgid "Production Dashboard"
-msgstr "Üretim Paneli"
+msgstr "Üretim Kontrol Paneli"
 
 #. module: mrp
 #: model:res.groups,name:mrp.group_mrp_manager
@@ -1046,17 +1031,17 @@ msgstr "Yönetici"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Source Loc."
-msgstr "Kaynak Lok."
+msgstr "Kaynak Kon."
 
 #. module: mrp
 #: field:mrp.bom,position:0
 msgid "Internal Reference"
-msgstr "Dahili Referans"
+msgstr "İç Kaynak"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
 msgid "Product's structure"
-msgstr "Ürün yapısı"
+msgstr "Ürünün yapısı"
 
 #. module: mrp
 #: field:mrp.bom,name:0
@@ -1070,7 +1055,7 @@ msgstr "Adı"
 #. module: mrp
 #: field:mrp.product.produce,mode:0
 msgid "Mode"
-msgstr "Kip"
+msgstr "Biçim"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1080,7 +1065,7 @@ msgstr "]"
 #. module: mrp
 #: field:mrp.workcenter.load,measure_unit:0
 msgid "Amount measuring unit"
-msgstr "Değer Ölçü Birimi"
+msgstr "Tutar Ölçü Birimi"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_production_action_planning
@@ -1121,7 +1106,7 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 msgid "Manufacturing Orders in Progress"
-msgstr "Ürün Emirleri Sürüyor"
+msgstr "Ürün Emirleri İşlemde"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1130,7 +1115,7 @@ msgstr "Ürün Emirleri Sürüyor"
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Group By..."
-msgstr "Grupla..."
+msgstr "Gruplandır..."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:130
@@ -1141,12 +1126,12 @@ msgstr "Çevrim Maliyeti"
 #. module: mrp
 #: selection:mrp.workcenter.load,measure_unit:0
 msgid "Amount in cycles"
-msgstr "Çevrim miktarı"
+msgstr "Çevrim tutarı"
 
 #. module: mrp
 #: field:mrp.production,location_dest_id:0
 msgid "Finished Products Location"
-msgstr "Bitmiş Ürün Lokasyonu"
+msgstr "Bitmiş Ürün Konumu"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_pm_resources_config
@@ -1158,13 +1143,12 @@ msgstr "Kaynaklar"
 msgid ""
 "Time in hours for this Work Center to achieve the operation of the specified "
 "routing."
-msgstr ""
-"Bu iş merkezinin belirlenen rotadaki operasyonu yapması için gereken saat"
+msgstr "Bu iş merkezinin belirlenen rotadaki iemi yapması için gereken saat"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_journal_id:0
 msgid "Analytic Journal"
-msgstr "Yevmiye Analizi"
+msgstr "Analiz Günlüğü"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_workcenter_action
@@ -1193,12 +1177,12 @@ msgstr ""
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.product_form_config_action
 msgid "Create or Import Products"
-msgstr "Ürünleri Oluştur ya da İçeri Aktar"
+msgstr "Ürünleri Oluştur ya da İçeaktar"
 
 #. module: mrp
 #: field:report.workcenter.load,hour:0
 msgid "Nbr of hour"
-msgstr "Saat"
+msgstr "Saat Sayısı"
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -1213,7 +1197,7 @@ msgstr "Notlar"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are ready to start production."
-msgstr "Üretime başlamaya hazır Üretim Emirleri"
+msgstr "Üretimi başlatmaya hazır Üretim Emirleri"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom
@@ -1226,7 +1210,7 @@ msgstr "Ürün Ağacı"
 #. module: mrp
 #: view:mrp.workcenter.load:0
 msgid "Select time unit"
-msgstr "Zaman Birimi Seç"
+msgstr "Zaman birimini seç"
 
 #. module: mrp
 #: view:report.workcenter.load:0
@@ -1236,7 +1220,7 @@ msgstr "İş Merkezi yükü"
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr "Sistemin bitmiş ürünleri stokladığı lokasyon."
+msgstr "Sistemin bitmiş ürünleri stokladığı konum."
 
 #. module: mrp
 #: help:mrp.routing.workcenter,routing_id:0
@@ -1256,29 +1240,29 @@ msgid ""
 "maxi quantity. It's available in the Inventory management menu and "
 "configured by product."
 msgstr ""
-"Minimum Stok Kuralı mini ve maksi miktarı temel alan otomatik bir satınalma "
+"Enaz Stok Kuralı enaz ve ençok miktarı temel alan otomatik bir satınalma "
 "kuralıdır. Envanter yönetim menüsündedir ve ürün tarafından yapılandırılır."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:187
 #, python-format
 msgid "Components Cost of %s %s"
-msgstr "%s %s Bileşen Maliyeti"
+msgstr "%s %s in Bileşen Maliyeti"
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
 msgid "Day by day"
-msgstr "Güne Gün"
+msgstr "Gün ve Gün"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Revisions"
-msgstr "Revizyonlar"
+msgstr "Düzeltmeler"
 
 #. module: mrp
 #: model:product.template,name:mrp.product_shirt_product_template
 msgid "Shirt"
-msgstr ""
+msgstr "Gömlek"
 
 #. module: mrp
 #: field:mrp.production,priority:0
@@ -1326,7 +1310,7 @@ msgstr "Her üretim işlemi için güvenli günler."
 #. module: mrp
 #: model:product.template,name:mrp.product_water_product_template
 msgid "Water"
-msgstr ""
+msgstr "Su"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1434,7 +1418,7 @@ msgstr "&Kalan Mesajları Gönder"
 #: code:addons/mrp/mrp.py:603
 #, python-format
 msgid "Couldn't find a bill of material for this product."
-msgstr ""
+msgstr "Bu ürün için gereç listesi bulunamıyor"
 
 #. module: mrp
 #: field:mrp.bom,active:0
@@ -1452,11 +1436,6 @@ msgstr "Ürün Satınal"
 msgid "Work Center Loads"
 msgstr "İş Merkezi Yükleri"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "Ürün Ağacı Revizyonu"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1739,6 +1718,8 @@ msgid ""
 "You are going to consume total %s quantities of \"%s\".\n"
 "But you can only consume up to total %s quantities."
 msgstr ""
+"%s te toplam \"%s\" kadar tüketeceksiniz.\n"
+"Ama ençok %s kadar tüketebilirsiniz."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_bom0
@@ -1988,13 +1969,7 @@ msgstr "Ayar için saat cinsinden süre."
 #. module: mrp
 #: model:product.template,name:mrp.product_orangejuice_product_template
 msgid "Orange Juice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "BoM"
+msgstr "Portakal Suyu"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
@@ -2013,17 +1988,6 @@ msgstr "Stoktan atama."
 msgid "Waiting Goods"
 msgstr "Malzeme Bekleniyor"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "son indis"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "BoM Revizyonları"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2086,7 +2050,7 @@ msgstr ""
 #. module: mrp
 #: model:product.uom,name:mrp.product_uom_litre
 msgid "Litre"
-msgstr ""
+msgstr "Litre"
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:762
@@ -2095,6 +2059,8 @@ msgid ""
 "You are going to produce total %s quantities of \"%s\".\n"
 "But you can only produce up to total %s quantities."
 msgstr ""
+"%s te  toplam \"%s\" kadar tüketeceksiniz.\n"
+"Ama ençok %s kadar üretebilirsiniz."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
@@ -2212,19 +2178,6 @@ msgstr "Miktar Değiştir"
 msgid "Change Product Qty"
 msgstr "Ürün Miktarını Değiştir"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Açıklama"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2438,9 +2391,15 @@ msgstr "Sarf Edilecek Ürünler"
 #~ msgid "Make Procurement"
 #~ msgstr "Satınalma Yap"
 
+#~ msgid "Modification Date"
+#~ msgstr "Değiştirme Tarihi"
+
 #~ msgid "Purchase Lead Time"
 #~ msgstr "Alış Tedarik Süresi"
 
+#~ msgid "Author"
+#~ msgstr "Yazar"
+
 #~ msgid "Stockable Product Stock"
 #~ msgstr "Stoklanabilir Ürün Stoğ"
 
@@ -2486,6 +2445,9 @@ msgstr "Sarf Edilecek Ürünler"
 #~ msgid "Security Days"
 #~ msgstr "Emniyet Günü"
 
+#~ msgid "Modification name"
+#~ msgstr "Değiştirme Adı"
+
 #~ msgid "Exception"
 #~ msgstr "İstisnai"
 
@@ -2679,6 +2641,9 @@ msgstr "Sarf Edilecek Ürünler"
 #~ msgid "New Production Order"
 #~ msgstr "Yeni Üretim Emri Oluştur"
 
+#~ msgid "BoM Revisions"
+#~ msgstr "BoM Revizyonları"
+
 #~ msgid "Retry"
 #~ msgstr "Tekrar Dene"
 
@@ -2712,6 +2677,9 @@ msgstr "Sarf Edilecek Ürünler"
 #~ msgid "Close Move at end"
 #~ msgstr "Son Hareketi Kapat"
 
+#~ msgid "Description"
+#~ msgstr "Açıklama"
+
 #~ msgid "Running"
 #~ msgstr "Çalışıyor"
 
@@ -3019,6 +2987,12 @@ msgstr "Sarf Edilecek Ürünler"
 #~ msgid "Image"
 #~ msgstr "Resim"
 
+#~ msgid "BoM"
+#~ msgstr "BoM"
+
+#~ msgid "last indice"
+#~ msgstr "son indis"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Kurulum Safhası"
 
@@ -3037,6 +3011,9 @@ msgstr "Sarf Edilecek Ürünler"
 #~ "ve/veya çevrimleri gösterir. Rota gösterilirse, ürün emrinin üçüncü sekmesi "
 #~ "(iş merkezleri) otomatik olarak önceden doldurulacaktır."
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "Ürün Ağacı Revizyonu"
+
 #, python-format
 #~ msgid "Work Cost of "
 #~ msgstr "İş Maliyeti "
@@ -3092,3 +3069,6 @@ msgstr "Sarf Edilecek Ürünler"
 
 #~ msgid "Moves Created"
 #~ msgstr "Oluşturulan Hareketler"
+
+#~ msgid "Revision"
+#~ msgstr "Düzeltme"
diff --git a/addons/mrp/i18n/uk.po b/addons/mrp/i18n/uk.po
index f0a007ddc51..a78e86d129d 100644
--- a/addons/mrp/i18n/uk.po
+++ b/addons/mrp/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "Ревізії"
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "Дата модифікації"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "Виконати резервування"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "Автор"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr "Готовий до виробництва"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "Назва модифікації"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "СВ"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr "Очікування вантажу"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "останній індекс"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "Ревізії СВ"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "Опис"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2232,6 +2177,9 @@ msgstr ""
 #~ msgid "Moves Created"
 #~ msgstr "Створені переміщення"
 
+#~ msgid "Revision"
+#~ msgstr "Ревізії"
+
 #~ msgid "Routing Workcenters"
 #~ msgstr "Робочі центри технологічних маршрутів"
 
@@ -2280,6 +2228,12 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "Друк ціни продукту"
 
+#~ msgid "Modification Date"
+#~ msgstr "Дата модифікації"
+
+#~ msgid "Author"
+#~ msgstr "Автор"
+
 #~ msgid "Latest error"
 #~ msgstr "Остання помилка"
 
@@ -2304,6 +2258,9 @@ msgstr ""
 #~ msgid "Procurement Lines"
 #~ msgstr "Радки постачання"
 
+#~ msgid "Modification name"
+#~ msgstr "Назва модифікації"
+
 #~ msgid "Exception"
 #~ msgstr "Вилучений"
 
@@ -2423,6 +2380,15 @@ msgstr ""
 #~ msgid "plus"
 #~ msgstr "plus"
 
+#~ msgid "BoM"
+#~ msgstr "СВ"
+
+#~ msgid "last indice"
+#~ msgstr "останній індекс"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "Ревізії СВ"
+
 #~ msgid "Retry"
 #~ msgstr "Повторити"
 
@@ -2441,6 +2407,9 @@ msgstr ""
 #~ msgid "Close Move at end"
 #~ msgstr "Дія закриття в кінці"
 
+#~ msgid "Description"
+#~ msgstr "Опис"
+
 #~ msgid "Running"
 #~ msgstr "Діючий"
 
diff --git a/addons/mrp/i18n/vi.po b/addons/mrp/i18n/vi.po
index 932fa991b85..1892959a948 100644
--- a/addons/mrp/i18n/vi.po
+++ b/addons/mrp/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -216,11 +216,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -475,11 +470,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -537,11 +527,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -822,11 +807,6 @@ msgstr ""
 msgid "Ready to Produce"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr ""
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1387,11 +1367,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1895,12 +1870,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1918,17 +1887,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2114,19 +2072,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po
index 34d740f2ba3..cc30ebdad16 100644
--- a/addons/mrp/i18n/zh_CN.po
+++ b/addons/mrp/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:49+0000\n"
-"PO-Revision-Date: 2012-02-13 09:52+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-10-25 17:08+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -89,7 +89,7 @@ msgstr "单位成本"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Scrap Products"
-msgstr "原料消耗"
+msgstr "报废原料"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_routing_action
@@ -135,7 +135,7 @@ msgstr "生产订单编号"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Finished Products"
-msgstr "已完工数量"
+msgstr "产成品"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -209,12 +209,7 @@ msgstr "输入一个费用产品用于跟踪辅助核算会计中的成本"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_purchaseprocure0
 msgid "For purchased material"
-msgstr "用于采购原料"
-
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr "版本"
+msgstr "用于外购的物料"
 
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
@@ -472,11 +467,6 @@ msgstr "产品数量结构分解"
 msgid "For Services."
 msgstr "用于服务。"
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "修改日期"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -534,11 +524,6 @@ msgstr "配置你的工作中心"
 msgid "Force Reservation"
 msgstr "强制预留"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr "作者"
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -820,11 +805,6 @@ msgstr "总周期"
 msgid "Ready to Produce"
 msgstr "准备生产"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "修改名称"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1308,7 +1288,7 @@ msgstr "如果产品的供应方法是外购，系统创建采购订单。"
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
 msgid "Procurement"
-msgstr "需求单"
+msgstr "需求"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_view_mrp_product_price_wizard
@@ -1389,11 +1369,6 @@ msgstr "生产产品"
 msgid "Work Center Loads"
 msgstr "工作中心负载"
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr "物料清单版本"
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1911,12 +1886,6 @@ msgstr "准备小时数"
 msgid "Orange Juice"
 msgstr "橙汁"
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr "物料清单"
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1934,17 +1903,6 @@ msgstr "按库存预留"
 msgid "Waiting Goods"
 msgstr "等待原料"
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr "最近指标"
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr "物料清单版本"
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2132,19 +2090,6 @@ msgstr "修改数量"
 msgid "Change Product Qty"
 msgstr "改变产品数量"
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr "说明"
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2304,6 +2249,9 @@ msgstr "未投料数量"
 #~ msgid "max"
 #~ msgstr "最大"
 
+#~ msgid "Author"
+#~ msgstr "作者"
+
 #~ msgid "Production orders"
 #~ msgstr "生产单"
 
@@ -2358,6 +2306,12 @@ msgstr "未投料数量"
 #~ msgid "Canceled"
 #~ msgstr "已取消"
 
+#~ msgid "BoM"
+#~ msgstr "物料清单"
+
+#~ msgid "BoM Revisions"
+#~ msgstr "物料清单版本"
+
 #~ msgid "Retry"
 #~ msgstr "重试"
 
@@ -2370,6 +2324,9 @@ msgstr "未投料数量"
 #~ msgid "Warehouse"
 #~ msgstr "仓库"
 
+#~ msgid "Description"
+#~ msgstr "说明"
+
 #~ msgid "Running"
 #~ msgstr "运行中"
 
@@ -2430,6 +2387,9 @@ msgstr "未投料数量"
 #~ msgid "Hours Cost"
 #~ msgstr "按小时计算的成本"
 
+#~ msgid "Modification name"
+#~ msgstr "修改名称"
+
 #, python-format
 #~ msgid "SUBTOTAL"
 #~ msgstr "小计"
@@ -2576,6 +2536,9 @@ msgstr "未投料数量"
 #~ msgid "You can see its bill of material which are used to make product"
 #~ msgstr "你可以看到生产产品使用的物料清单"
 
+#~ msgid "Revision"
+#~ msgstr "版本"
+
 #~ msgid "Routing Workcenters"
 #~ msgstr "工艺路线的工作中心"
 
@@ -2650,6 +2613,9 @@ msgstr "未投料数量"
 #~ msgid "Print product price"
 #~ msgstr "产品报价"
 
+#~ msgid "Modification Date"
+#~ msgstr "修改日期"
+
 #~ msgid "If Procure method is Make to order and supply method is produce"
 #~ msgstr "如果获得方式是来自订单并且供应方式是生产"
 
@@ -2893,6 +2859,9 @@ msgstr "未投料数量"
 #~ msgid "New Production Order"
 #~ msgstr "新的生产单"
 
+#~ msgid "last indice"
+#~ msgstr "最近指标"
+
 #~ msgid "When any procuere products, it comes into the prpcurement orders"
 #~ msgstr "当生产任何产品时它生成产品需求单"
 
@@ -3215,6 +3184,9 @@ msgstr "未投料数量"
 #~ msgid "January"
 #~ msgstr "一月"
 
+#~ msgid "Bill of Material Revision"
+#~ msgstr "物料清单版本"
+
 #~ msgid ""
 #~ "Routing indicates all the workcenters used, for how long and/or cycles.If "
 #~ "Routing is indicated then,the third tab of a production order (workcenters) "
diff --git a/addons/mrp/i18n/zh_HK.po b/addons/mrp/i18n/zh_HK.po
index 662988d2c10..fef4bdf14fb 100644
--- a/addons/mrp/i18n/zh_HK.po
+++ b/addons/mrp/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -211,11 +211,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -470,11 +465,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "修改日期"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -532,11 +522,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "強制預留"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -817,11 +802,6 @@ msgstr "週期總數"
 msgid "Ready to Produce"
 msgstr "就緒生產"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "修改名稱"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1382,11 +1362,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1890,12 +1865,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1913,17 +1882,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2109,19 +2067,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2374,6 +2319,9 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "打印貨品價格"
 
+#~ msgid "Modification Date"
+#~ msgstr "修改日期"
+
 #~ msgid "Make Procurement"
 #~ msgstr "生成採購計劃"
 
@@ -2454,6 +2402,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "保障天數"
 
+#~ msgid "Modification name"
+#~ msgstr "修改名稱"
+
 #~ msgid "Exception"
 #~ msgstr "例外"
 
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index ab524b705a6..bb4cec15583 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:50+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp
 #: view:mrp.routing.workcenter:0
@@ -210,11 +210,6 @@ msgstr ""
 msgid "For purchased material"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,indice:0
-msgid "Revision"
-msgstr ""
-
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.product_form_config_action
 msgid ""
@@ -469,11 +464,6 @@ msgstr ""
 msgid "For Services."
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,date:0
-msgid "Modification Date"
-msgstr "修改日期"
-
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle_account_id:0
 #: help:mrp.workcenter,costs_hour_account_id:0
@@ -531,11 +521,6 @@ msgstr ""
 msgid "Force Reservation"
 msgstr "強制預留"
 
-#. module: mrp
-#: field:mrp.bom.revision,author_id:0
-msgid "Author"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
@@ -816,11 +801,6 @@ msgstr "週期總數"
 msgid "Ready to Produce"
 msgstr "就緒生產"
 
-#. module: mrp
-#: field:mrp.bom.revision,name:0
-msgid "Modification name"
-msgstr "修改名稱"
-
 #. module: mrp
 #: view:mrp.bom:0
 #: view:mrp.production:0
@@ -1381,11 +1361,6 @@ msgstr ""
 msgid "Work Center Loads"
 msgstr ""
 
-#. module: mrp
-#: model:ir.model,name:mrp.model_mrp_bom_revision
-msgid "Bill of Material Revision"
-msgstr ""
-
 #. module: mrp
 #: help:mrp.production,origin:0
 msgid ""
@@ -1889,12 +1864,6 @@ msgstr ""
 msgid "Orange Juice"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,bom_id:0
-#: field:procurement.order,bom_id:0
-msgid "BoM"
-msgstr ""
-
 #. module: mrp
 #: model:ir.model,name:mrp.model_report_mrp_inout
 #: view:report.mrp.inout:0
@@ -1912,17 +1881,6 @@ msgstr ""
 msgid "Waiting Goods"
 msgstr ""
 
-#. module: mrp
-#: field:mrp.bom.revision,last_indice:0
-msgid "last indice"
-msgstr ""
-
-#. module: mrp
-#: field:mrp.bom,revision_ids:0
-#: view:mrp.bom.revision:0
-msgid "BoM Revisions"
-msgstr ""
-
 #. module: mrp
 #: field:report.mrp.inout,date:0
 #: field:report.workcenter.load,name:0
@@ -2108,19 +2066,6 @@ msgstr ""
 msgid "Change Product Qty"
 msgstr ""
 
-#. module: mrp
-#: view:mrp.bom.revision:0
-#: field:mrp.bom.revision,description:0
-#: view:mrp.property:0
-#: view:mrp.property.group:0
-#: field:mrp.routing,note:0
-#: view:mrp.routing.workcenter:0
-#: field:mrp.routing.workcenter,note:0
-#: view:mrp.workcenter:0
-#: field:mrp.workcenter,note:0
-msgid "Description"
-msgstr ""
-
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
@@ -2376,6 +2321,9 @@ msgstr ""
 #~ msgid "Print product price"
 #~ msgstr "打印貨品價格"
 
+#~ msgid "Modification Date"
+#~ msgstr "修改日期"
+
 #~ msgid "Production Procure Products"
 #~ msgstr "以生產獲得貨品"
 
@@ -2453,6 +2401,9 @@ msgstr ""
 #~ msgid "Security Days"
 #~ msgstr "保障天數"
 
+#~ msgid "Modification name"
+#~ msgstr "修改名稱"
+
 #~ msgid "If Product type is service"
 #~ msgstr "如果產品類型是服務型"
 
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index 7b8442b4c46..af1664b1f9e 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -47,13 +47,13 @@ class mrp_workcenter(osv.osv):
         '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', help="Specify Cost of Work Center per hour."),
-        'costs_hour_account_id': fields.many2one('account.analytic.account', 'Hour Account', domain=[('type','<>','view')],
+        'costs_hour_account_id': fields.many2one('account.analytic.account', 'Hour Account', domain=[('type','!=','view')],
             help="Fill this only if you want automatic analytic accounting entries on production orders."),
         'costs_cycle': fields.float('Cost per cycle', help="Specify Cost of Work Center per cycle."),
-        'costs_cycle_account_id': fields.many2one('account.analytic.account', 'Cycle Account', domain=[('type','<>','view')],
+        'costs_cycle_account_id': fields.many2one('account.analytic.account', 'Cycle Account', domain=[('type','!=','view')],
             help="Fill this only if you want automatic analytic accounting entries on production orders."),
         'costs_journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal'),
-        'costs_general_account_id': fields.many2one('account.account', 'General Account', domain=[('type','<>','view')]),
+        'costs_general_account_id': fields.many2one('account.account', 'General Account', domain=[('type','!=','view')]),
         'resource_id': fields.many2one('resource.resource','Resource', ondelete='cascade', required=True),
         'product_id': fields.many2one('product.product','Work Center Product', help="Fill this product to easily track your production costs in the analytic accounting."),
     }
@@ -106,6 +106,7 @@ class mrp_routing_workcenter(osv.osv):
     """
     _name = 'mrp.routing.workcenter'
     _description = 'Work Center Usage'
+    _order = 'sequence'
     _columns = {
         'workcenter_id': fields.many2one('mrp.workcenter', 'Work Center', required=True),
         'name': fields.char('Name', size=64, required=True),
@@ -191,12 +192,12 @@ class mrp_bom(osv.osv):
         return res
 
     _columns = {
-        'name': fields.char('Name', size=64, required=True),
+        'name': fields.char('Name', size=64),
         'code': fields.char('Reference', size=16),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the bills of material without removing it."),
         'type': fields.selection([('normal','Normal BoM'),('phantom','Sets / Phantom')], 'BoM Type', required=True,
-                                 help= "If a sub-product is used in several products, it can be useful to create its own BoM. "\
-                                 "Though if you don't want separated production orders for this sub-product, select Set/Phantom as BoM type. "\
+                                 help= "If a by-product is used in several products, it can be useful to create its own BoM. "\
+                                 "Though if you don't want separated production orders for this by-product, select Set/Phantom as BoM type. "\
                                  "If a Phantom BoM is used for a root product, it will be sold and shipped as a set of components, instead of being produced."),
         'method': fields.function(_compute_type, string='Method', type='selection', selection=[('',''),('stock','On Stock'),('order','On Order'),('set','Set / Pack')]),
         'date_start': fields.date('Valid From', help="Validity of this BoM or component. Keep empty if it's always valid."),
@@ -214,7 +215,6 @@ class mrp_bom(osv.osv):
         'bom_id': fields.many2one('mrp.bom', 'Parent BoM', ondelete='cascade', select=True),
         'routing_id': fields.many2one('mrp.routing', 'Routing', help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers 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'),
         'child_complete_ids': fields.function(_child_compute, relation='mrp.bom', string="BoM Hierarchy", type='many2many'),
         'company_id': fields.many2one('res.company','Company',required=True),
     }
@@ -227,9 +227,10 @@ class mrp_bom(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.bom', context=c),
     }
     _order = "sequence"
+    _parent_name = "bom_id"
     _sql_constraints = [
         ('bom_qty_zero', 'CHECK (product_qty>0)',  'All product quantities must be greater than 0.\n' \
-            'You should install the mrp_subproduct module if you want to manage extra products on BoMs !'),
+            'You should install the mrp_byproduct module if you want to manage extra products on BoMs !'),
     ]
 
     def _check_recursion(self, cr, uid, ids, context=None):
@@ -273,13 +274,26 @@ class mrp_bom(osv.osv):
             return {'value': {'name': prod.name, 'product_uom': prod.uom_id.id}}
         return {}
 
-    def _bom_find(self, cr, uid, product_id, product_uom, properties=[]):
+    def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
+        res = {'value':{}}
+        if not product_uom or not product_id:
+            return res
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        uom = self.pool.get('product.uom').browse(cr, uid, product_uom, context=context)
+        if uom.category_id.id != product.uom_id.category_id.id:
+            res['warning'] = {'title': _('Warning'), 'message': _('The Product Unit of Measure you chose has a different category than in the product form.')}
+            res['value'].update({'product_uom': product.uom_id.id})
+        return res
+
+    def _bom_find(self, cr, uid, product_id, product_uom, properties=None):
         """ Finds BoM for particular product and product uom.
         @param product_id: Selected product.
         @param product_uom: Unit of measure of a product.
         @param properties: List of related properties.
         @return: False or BoM id.
         """
+        if properties is None:
+            properties = []
         cr.execute('select id from mrp_bom where product_id=%s and bom_id is null order by sequence', (product_id,))
         ids = map(lambda x: x[0], cr.fetchall())
         max_prop = 0
@@ -294,7 +308,7 @@ class mrp_bom(osv.osv):
                 max_prop = prop
         return result
 
-    def _bom_explode(self, cr, uid, bom, factor, properties=[], addthis=False, level=0, routing_id=False):
+    def _bom_explode(self, cr, uid, bom, factor, properties=None, addthis=False, level=0, routing_id=False):
         """ Finds Products and Work Centers for related BoM for manufacturing order.
         @param bom: BoM of particular product.
         @param factor: Factor of product UoM.
@@ -357,7 +371,7 @@ class mrp_bom(osv.osv):
         if default is None:
             default = {}
         bom_data = self.read(cr, uid, id, [], context=context)
-        default.update({'name': bom_data['name'] + ' ' + _('Copy'), 'bom_id':False})
+        default.update(name=_("%s (copy)") % (bom_data['name']), bom_id=False)
         return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context)
 
     def create(self, cr, uid, vals, context=None):
@@ -369,31 +383,11 @@ class mrp_bom(osv.osv):
         prod_obj = self.pool.get('product.product')
         for obj in self.browse(cr, uid, ids, context=context):
             for prod in prod_obj.browse(cr, uid, [obj.product_id], context=context):
-                self.message_append_note(cr, uid, [obj.id], body=_("Bill of Material has been <b>created</b> for <em>%s</em> product.") % (prod.id.name_template), context=context)
+                self.message_post(cr, uid, [obj.id], body=_("Bill of Material has been <b>created</b> for <em>%s</em> product.") % (prod.id.name_template), context=context)
         return True
 
 mrp_bom()
 
-class mrp_bom_revision(osv.osv):
-    _name = 'mrp.bom.revision'
-    _description = 'Bill of Material Revision'
-    _columns = {
-        'name': fields.char('Modification name', size=64, required=True),
-        'description': fields.text('Description'),
-        'date': fields.date('Modification Date'),
-        'indice': fields.char('Revision', size=16),
-        'last_indice': fields.char('last indice', size=64),
-        'author_id': fields.many2one('res.users', 'Author'),
-        'bom_id': fields.many2one('mrp.bom', 'BoM', select=True),
-    }
-
-    _defaults = {
-        'author_id': lambda x, y, z, c: z,
-        'date': fields.date.context_today,
-    }
-
-mrp_bom_revision()
-
 def rounding(f, r):
     import math
     if not r:
@@ -407,7 +401,7 @@ class mrp_production(osv.osv):
     _name = 'mrp.production'
     _description = 'Manufacturing Order'
     _date_name  = 'date_planned'
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def _production_calc(self, cr, uid, ids, prop, unknow_none, context=None):
         """ Calculates total hours and total no. of cycles for a production order.
@@ -426,28 +420,6 @@ class mrp_production(osv.osv):
                 result[prod.id]['cycle_total'] += wc.cycle
         return result
 
-    def _production_date_end(self, cr, uid, ids, prop, unknow_none, context=None):
-        """ Finds production end date.
-        @param prop: Name of field.
-        @param unknow_none:
-        @return: Dictionary of values.
-        """
-        result = {}
-        for prod in self.browse(cr, uid, ids, context=context):
-            result[prod.id] = prod.date_planned
-        return result
-
-    def _production_date(self, cr, uid, ids, prop, unknow_none, context=None):
-        """ Finds production planned date.
-        @param prop: Name of field.
-        @param unknow_none:
-        @return: Dictionary of values.
-        """
-        result = {}
-        for prod in self.browse(cr, uid, ids, context=context):
-            result[prod.id] = prod.date_planned[:10]
-        return result
-
     def _src_id_default(self, cr, uid, ids, context=None):
         src_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context)
         return src_location_id.id
@@ -457,41 +429,56 @@ class mrp_production(osv.osv):
         return dest_location_id.id
 
     _columns = {
-        'name': fields.char('Reference', size=64, required=True),
-        'origin': fields.char('Source Document', size=64, help="Reference of the document that generated this production order request."),
-        'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority', select=True),
+        'name': fields.char('Reference', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'origin': fields.char('Source Document', size=64, readonly=True, states={'draft': [('readonly', False)]},
+            help="Reference of the document that generated this production order request."),
+        'priority': fields.selection([('0','Not urgent'),('1','Normal'),('2','Urgent'),('3','Very Urgent')], 'Priority',
+            select=True, readonly=True, states=dict.fromkeys(['draft', 'confirmed'], [('readonly', False)])),
 
-        'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uos_qty': fields.float('Product UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True),
-        'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'product_qty': fields.float('Product Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'product_uos_qty': fields.float('Product UoS Quantity', readonly=True, states={'draft': [('readonly', False)]}),
+        'product_uos': fields.many2one('product.uom', 'Product UoS', readonly=True, states={'draft': [('readonly', False)]}),
 
         'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', required=True,
-            readonly=True, states={'draft':[('readonly',False)]}, help="Location where the system will look for components."),
+            readonly=True, states={'draft':[('readonly',False)]},
+            help="Location where the system will look for components."),
         'location_dest_id': fields.many2one('stock.location', 'Finished Products Location', required=True,
-            readonly=True, states={'draft':[('readonly',False)]}, help="Location where the system will stock the finished products."),
-
-        'date_planned_end': fields.function(_production_date_end, type='date', string='Scheduled End Date'),
-        'date_planned_date': fields.function(_production_date, type='date', string='Scheduled Date'),
-        'date_planned': fields.datetime('Scheduled Date', required=True, select=1),
-        'date_start': fields.datetime('Start Date', select=True),
-        'date_finished': fields.datetime('End Date', select=True),
-
-        'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]}),
-        'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]}, help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
+            readonly=True, states={'draft':[('readonly',False)]},
+            help="Location where the system will stock the finished products."),
+        'date_planned': fields.datetime('Scheduled Date', required=True, select=1, readonly=True, states={'draft':[('readonly',False)]}),
+        'date_start': fields.datetime('Start Date', select=True, readonly=True),
+        'date_finished': fields.datetime('End Date', select=True, readonly=True),
+        'bom_id': fields.many2one('mrp.bom', 'Bill of Material', domain=[('bom_id','=',False)], readonly=True, states={'draft':[('readonly',False)]},
+            help="Bill of Materials allow you to define the list of required raw materials to make a finished product."),
+        'routing_id': fields.many2one('mrp.routing', string='Routing', on_delete='set null', readonly=True, states={'draft':[('readonly',False)]},
+            help="The list of operations (list of work centers) to produce the finished product. The routing is mainly used to compute work center costs during operations and to plan future loads on work centers based on production plannification."),
         'picking_id': fields.many2one('stock.picking', 'Picking List', readonly=True, ondelete="restrict",
             help="This is the Internal Picking List that brings the finished product to the production plan"),
         'move_prod_id': fields.many2one('stock.move', 'Product Move', readonly=True),
-        'move_lines': fields.many2many('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': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consumed Products', domain=[('state','in', ('done', 'cancel'))]),
-        'move_created_ids': fields.one2many('stock.move', 'production_id', 'Products to Produce', domain=[('state','not in', ('done', 'cancel'))], states={'done':[('readonly',True)]}),
-        'move_created_ids2': fields.one2many('stock.move', 'production_id', 'Produced Products', domain=[('state','in', ('done', 'cancel'))]),
-        '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','New'),('cancel','Cancelled'),('picking_except', 'Picking Exception'),('confirmed','Waiting Goods'),('ready','Ready to Produce'),('in_production','Production Started'),('done','Done')],'Status', 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 gets started then the state is set to \'In Production\'.\n When the production is over, the state is set to \'Done\'.'),
+        'move_lines': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Products to Consume',
+            domain=[('state','not in', ('done', 'cancel'))], readonly=True, states={'draft':[('readonly',False)]}),
+        'move_lines2': fields.many2many('stock.move', 'mrp_production_move_ids', 'production_id', 'move_id', 'Consumed Products',
+            domain=[('state','in', ('done', 'cancel'))], readonly=True, states={'draft':[('readonly',False)]}),
+        'move_created_ids': fields.one2many('stock.move', 'production_id', 'Products to Produce',
+            domain=[('state','not in', ('done', 'cancel'))], readonly=True, states={'draft':[('readonly',False)]}),
+        'move_created_ids2': fields.one2many('stock.move', 'production_id', 'Produced Products',
+            domain=[('state','in', ('done', 'cancel'))], readonly=True, states={'draft':[('readonly',False)]}),
+        'product_lines': fields.one2many('mrp.production.product.line', 'production_id', 'Scheduled goods',
+            readonly=True, states={'draft':[('readonly',False)]}),
+        'workcenter_lines': fields.one2many('mrp.production.workcenter.line', 'production_id', 'Work Centers Utilisation',
+            readonly=True, states={'draft':[('readonly',False)]}),
+        'state': fields.selection(
+            [('draft', 'New'), ('cancel', 'Cancelled'), ('picking_except', 'Picking Exception'), ('confirmed', 'Waiting Goods'),
+                ('ready', 'Ready to Produce'), ('in_production', 'Production Started'), ('done', 'Done')],
+            string='Status', readonly=True,
+            help="When the production order is created the status is set to 'Draft'.\n\
+                If the order is confirmed the status is set to 'Waiting Goods'.\n\
+                If any exceptions are there, the status is set to 'Picking Exception'.\n\
+                If the stock is available then the status is set to 'Ready to Produce'.\n\
+                When the production gets started then the status is set to 'In Production'.\n\
+                When the production is over, the status is set to 'Done'."),
         'hour_total': fields.function(_production_calc, type='float', string='Total Hours', multi='workorder', store=True),
         'cycle_total': fields.function(_production_calc, type='float', string='Total Cycles', multi='workorder', store=True),
         'user_id':fields.many2one('res.users', 'Responsible'),
@@ -502,6 +489,7 @@ class mrp_production(osv.osv):
         'state': lambda *a: 'draft',
         'date_planned': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'product_qty':  lambda *a: 1.0,
+        'user_id': lambda self, cr, uid, c: uid,
         'name': lambda x, y, z, c: x.pool.get('ir.sequence').get(y, z, 'mrp.production') or '/',
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'mrp.production', context=c),
         'location_src_id': _src_id_default,
@@ -609,11 +597,13 @@ class mrp_production(osv.osv):
         self.write(cr, uid, ids, {'state': 'picking_except'})
         return True
 
-    def action_compute(self, cr, uid, ids, properties=[], context=None):
+    def action_compute(self, cr, uid, ids, properties=None, context=None):
         """ Computes bills of material of a product.
         @param properties: List containing dictionaries of properties.
         @return: No. of products.
         """
+        if properties is None:
+            properties = []
         results = []
         bom_obj = self.pool.get('mrp.bom')
         uom_obj = self.pool.get('product.uom')
@@ -673,7 +663,7 @@ class mrp_production(osv.osv):
 
         for (production_id,name) in self.name_get(cr, uid, ids):
             production = self.browse(cr, uid, production_id)
-            if production.move_prod_id:
+            if production.move_prod_id and production.move_prod_id.location_id.id != production.location_dest_id.id:
                 move_obj.write(cr, uid, [production.move_prod_id.id],
                         {'location_id': production.location_dest_id.id})
             self.action_ready_send_note(cr, uid, [production_id], context)
@@ -728,7 +718,7 @@ class mrp_production(osv.osv):
 
         produced_qty = 0
         for produced_product in production.move_created_ids2:
-            if (produced_product.scrapped) or (produced_product.product_id.id <> production.product_id.id):
+            if (produced_product.scrapped) or (produced_product.product_id.id != production.product_id.id):
                 continue
             produced_qty += produced_product.product_qty
         if production_mode in ['consume','consume_produce']:
@@ -831,7 +821,8 @@ class mrp_production(osv.osv):
                         'ref': wc.code,
                         'product_id': wc.product_id.id,
                         'unit_amount': wc_line.hour,
-                        'product_uom_id': wc.product_id.uom_id.id
+                        'product_uom_id': wc.product_id.id and wc.product_id.uom_id.id or False
+
                     } )
             if wc.costs_journal_id and wc.costs_general_account_id:
                 value = wc_line.cycle * wc.costs_cycle
@@ -847,7 +838,8 @@ class mrp_production(osv.osv):
                         'ref': wc.code,
                         'product_id': wc.product_id.id,
                         'unit_amount': wc_line.cycle,
-                        'product_uom_id': wc.product_id.uom_id.id
+                        'product_uom_id': wc.product_id.id and wc.product_id.uom_id.id or False
+
                     } )
         return amount
 
@@ -904,12 +896,11 @@ class mrp_production(osv.osv):
         # Internal shipment is created for Stockable and Consumer Products
         if production_line.product_id.type not in ('product', 'consu'):
             return False
-        move_name = _('PROD: %s') % production.name
         source_location_id = production.location_src_id.id
         if not destination_location_id:
             destination_location_id = source_location_id
         return stock_move.create(cr, uid, {
-                        'name': move_name,
+                        'name': production.name,
                         'picking_id': shipment_id,
                         'product_id': production_line.product_id.id,
                         'product_qty': production_line.product_qty,
@@ -935,7 +926,7 @@ class mrp_production(osv.osv):
         # If usage of routing location is a internal, make outgoing shipment otherwise internal shipment
         if production.bom_id.routing_id and production.bom_id.routing_id.location_id:
             routing_loc = production.bom_id.routing_id.location_id
-            if routing_loc.usage <> 'internal':
+            if routing_loc.usage != 'internal':
                 pick_type = 'out'
             partner_id = routing_loc.partner_id and routing_loc.partner_id.id or False
 
@@ -959,9 +950,8 @@ class mrp_production(osv.osv):
         stock_move = self.pool.get('stock.move')
         source_location_id = production.product_id.product_tmpl_id.property_stock_production.id
         destination_location_id = production.location_dest_id.id
-        move_name = _('PROD: %s') + production.name
         data = {
-            'name': move_name,
+            'name': production.name,
             'date': production.date_planned,
             'product_id': production.product_id.id,
             'product_qty': production.product_qty,
@@ -984,12 +974,11 @@ class mrp_production(osv.osv):
         # Internal shipment is created for Stockable and Consumer Products
         if production_line.product_id.type not in ('product', 'consu'):
             return False
-        move_name = _('PROD: %s') % production.name
         destination_location_id = production.product_id.product_tmpl_id.property_stock_production.id
         if not source_location_id:
             source_location_id = production.location_src_id.id
         move_id = stock_move.create(cr, uid, {
-            'name': move_name,
+            'name': production.name,
             'date': production.date_planned,
             'product_id': production_line.product_id.id,
             'product_qty': production_line.product_qty,
@@ -1046,33 +1035,28 @@ class mrp_production(osv.osv):
     # OpenChatter methods and notifications
     # ---------------------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(mrp_production, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def create_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Manufacturing order has been <b>created</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Manufacturing order has been <b>created</b>."), context=context)
         return True
 
     def action_cancel_send_note(self, cr, uid, ids, context=None):
         message = _("Manufacturing order has been <b>canceled</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def action_ready_send_note(self, cr, uid, ids, context=None):
         message = _("Manufacturing order is <b>ready to produce</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def action_in_production_send_note(self, cr, uid, ids, context=None):
         message = _("Manufacturing order is <b>in production</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def action_done_send_note(self, cr, uid, ids, context=None):
         message = _("Manufacturing order has been <b>done</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def action_confirm_send_note(self, cr, uid, ids, context=None):
@@ -1082,7 +1066,7 @@ class mrp_production(osv.osv):
             obj_datetime = fields.DT.datetime.strptime(obj.date_planned, DEFAULT_SERVER_DATETIME_FORMAT)
             obj_date_str = fields.datetime.context_timestamp(cr, uid, obj_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
             message = _("Manufacturing order has been <b>confirmed</b> and is <b>scheduled</b> for the <em>%s</em>.") % (obj_date_str)
-            self.message_append_note(cr, uid, [obj.id], body=message, context=context)
+            self.message_post(cr, uid, [obj.id], body=message, context=context)
         return True
 
 
diff --git a/addons/mrp/mrp_data.xml b/addons/mrp/mrp_data.xml
index e5d5380f96a..a6b65b7c475 100644
--- a/addons/mrp/mrp_data.xml
+++ b/addons/mrp/mrp_data.xml
@@ -2,14 +2,16 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module MRP has been installed</value>
-            <value>Manage your manufacturing process in OpenERP by defining bill of materials (BoM), routings and work centers.  This module supports complete integration and planification of stockable goods, consumable, and services.
-
-From the Manufacturing Settings, you can choose to compute production schedules periodically or just-in-time.</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">MRP application installed!</field>
+            <field name="body"><![CDATA[<p>Manage your manufacturing process with OpenERP by defining your bills of materials (BoM), routings and work centers.</p><p>
+This application supports complete integration and production scheduling for stockable goods, consumables, and services.</p>
+<p>From the Manufacturing Settings, you can choose to compute production schedules periodically or just-in-time.</p>]]></field>
+        </record>
         
         <record id="sequence_mrp_prod_type" model="ir.sequence.type">
             <field name="name">Production order</field>
@@ -24,6 +26,6 @@ From the Manufacturing Settings, you can choose to compute production schedules
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/mrp/mrp_demo.xml b/addons/mrp/mrp_demo.xml
index d0f05a2aaff..952a5e0e3de 100644
--- a/addons/mrp/mrp_demo.xml
+++ b/addons/mrp/mrp_demo.xml
@@ -49,7 +49,7 @@
             <field name="costs_hour_account_id" ref="account_assembly_hours"/>
             <field name="costs_cycle">0.05</field>
             <field name="costs_cycle_account_id" ref="account_assembly_cycle"/>
-            <field name="costs_journal_id" ref="account.expenses_journal"/>
+            <field name="costs_journal_id" ref="account.exp"/>
             <field name="costs_general_account_id" ref="account.a_expense"/>
             <field name="costs_general_account_id" ref="account.a_expense"/>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index c394544574d..e4e28b6f07c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -13,7 +13,7 @@
             parent="base.menu_mrp_root"
             sequence="1"/>
 
-        <menuitem name="Master Data"
+        <menuitem name="Products"
             id="menu_mrp_bom"
             parent="base.menu_mrp_root"
             sequence="5"/>
@@ -345,24 +345,14 @@
             <field name="model">mrp.bom</field>
             <field name="arch" type="xml">
                 <form string="Bill of Material" version="7.0">
-                    <label for="product_id" string="Product and Quantity" class="oe_edit_only"/>
-                    <h1>
-                        <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>:
-                        <field name="product_qty" class="oe_inline"/>
-                        <field name="product_uom" class="oe_inline" groups="product.group_uom"/>
-                    </h1>
-                    <div groups="mrp.group_mrp_routings">
-                        <label for="routing_id" class="oe_edit_only"/>
-                        <h2><field name="routing_id" class="oe_inline"/></h2>
-                    </div>
                     <group>
                         <group>
-                            <field name="name"/>
-                            <field name="code" string="Reference"/>
-                        </group>
-                        <group>
-                            <field name="type"/>
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="product_id" on_change="onchange_product_id(product_id, name, context)" class="oe_inline"/>
+                            <label for="product_qty" string="Quantity"/>
+                            <div>
+                                <field name="product_qty" class="oe_inline"/>
+                                <field name="product_uom" class="oe_inline" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
+                            </div>
                             <label for="product_uos_qty" groups="product.group_uos"/>
                             <div groups="product.group_uos" >
                                 <field name="product_uos_qty"
@@ -370,6 +360,20 @@
                                 <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
                                 <field name="product_uos" class="oe_inline"/>
                             </div>
+                            <div groups="mrp.group_mrp_routings">
+                                <label for="routing_id" class="oe_edit_only"/>
+                                <h2><field name="routing_id" class="oe_inline"/></h2>
+                            </div>
+                        </group>
+                        <group>
+                            <field name="name" groups="base.group_no_one"/>
+                            <field name="code" string="Reference"/>
+                            <field name="type"/>
+                            <p colspan="2" class="oe_grey" attrs="{'invisible': [('type','=','normal')]}">
+                                When processing a sale order for this product, the delivery order
+                                will contain the raw materials, instead of the finished product.
+                            </p>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                         </group>
                     </group>
                     <notebook>
@@ -378,16 +382,13 @@
                                 <tree string="Components" editable="bottom">
                                     <field name="product_id" on_change="onchange_product_id(product_id, name)"/>
                                     <field name="product_qty"/>
-                                    <field name="product_uom" groups="product.group_uom"/>
+                                    <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
                                     <field name="name" invisible="1"/>
                                     <field name="date_start"/>
                                     <field name="date_stop"/>
                                 </tree>
                             </field>
                         </page>
-                        <page string="Revisions" attrs="{'invisible': [('bom_id','!=',False)]}">
-                            <field name="revision_ids"/>
-                        </page>
                         <page string="Properties" groups="product.group_mrp_properties">
                             <group>
                                 <group>
@@ -407,6 +408,10 @@
                             <field name="property_ids" widget="many2many_tags"/>
                         </page>
                     </notebook>
+                    <div class="oe_chatter">
+                         <field name="message_follower_ids" widget="mail_followers"/>
+                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -437,11 +442,11 @@
             <field name="arch" type="xml">
                 <tree string="Bill of Materials" colors="blue:method">
                     <field name="sequence" invisible="1"/>
-                    <field name="name"/>
-                    <field name="code"/>
+                    <field name="name" invisible="1"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom" groups="product.group_uom"/>
+                    <field name="code"/>
                     <field name="type"/>
                     <field name="method"/>
                     <field name="routing_id" groups="mrp.group_mrp_routings"/>
@@ -457,9 +462,9 @@
             <field name="arch" type="xml">
                 <tree string="BoM Structure" colors="blue:method">
                     <field name="sequence" invisible="1"/>
-                    <field name="name" string="Component Name"/>
+                    <field name="name" groups="base.group_no_one"/>
                     <field name="code"/>
-                    <field name="product_id" string="Component Product"/>
+                    <field name="product_id"/>
                     <field name="bom_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom" groups="product.group_uom"/>
@@ -497,18 +502,26 @@
             <field name="res_model">mrp.bom</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="mrp_bom_component_tree_view"/>
-            <field name="domain">[('bom_id','!=',False)]</field>
+            <field name="domain">[]</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to add a component to a bill of material.
               </p><p>
-                Bills of materials components are components and sub-products
+                Bills of materials components are components and by-products
                 used to create master bills of materials.  Use this menu to
                 search in which BoM a specific component is used.
               </p>
             </field>
         </record>
-
+        
+        <record id="product_supply_method_produce" model="ir.actions.act_window">
+            <field name="name">Products</field>
+            <field name="res_model">product.product</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">kanban,tree,form</field>
+            <field name="context">{'search_default_filter_supply_method_produce' : 1}</field>
+            <field name="search_view_id" ref="product.product_search_form_view"/>
+        </record>
         <!-- BOM menus -->
 
         <menuitem
@@ -516,19 +529,22 @@
             id="menu_mrp_bom_form_action"
             parent="menu_mrp_bom"
             sequence="10"/>
+       <menuitem name="Products" 
+            id="menu_mrp_product_form" 
+            action="product_supply_method_produce"
+            parent="menu_mrp_bom"/>
         <menuitem
             action="mrp_bom_form_action2"
             id="menu_mrp_bom_form_action2"
             parent="menu_mrp_configuration"
+            groups="base.group_no_one"
             sequence="20"/>
 
         <record id="action2" model="ir.actions.act_window">
             <field name="name">Bill of Materials Structure</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">mrp.bom</field>
-            <field name="domain">[('id','in',active_ids)]</field>
-            <field name="view_type">tree</field>
-            <field name="view_mode">tree</field>
+            <field name="domain">[('bom_id', '=',active_ids)]</field>
             <field name="view_id" ref="mrp_bom_tree_view"/>
         </record>
         <record id="ir_BOM_structure" model="ir.values">
@@ -538,35 +554,6 @@
             <field eval="'ir.actions.act_window,'+str(action2)" name="value"/>
         </record>
 
-        <record id="mrp_bom_revision_tree" model="ir.ui.view">
-            <field name="name">mrp.bom.revision</field>
-            <field name="model">mrp.bom.revision</field>
-            <field name="arch" type="xml">
-                <tree string="BoM Revisions">
-                    <field name="indice"/>
-                    <field name="author_id"/>
-                    <field name="date"/>
-                    <field colspan="4" name="name"/>
-                </tree>
-            </field>
-        </record>
-        <record id="mrp_bom_revision_form" model="ir.ui.view">
-            <field name="name">mrp.bom.revision</field>
-            <field name="model">mrp.bom.revision</field>
-            <field name="arch" type="xml">
-                <form string="BoM Revisions" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="indice"/>
-                        <field name="date"/>
-                        <field name="author_id" readonly="1"/>
-                    </group>
-                    <separator string="Description"/>
-                    <field name="description"/>
-                </form>
-            </field>
-        </record>
-
         <!--
         Production Management
         -->
@@ -574,8 +561,8 @@
             <field name="name">mrp.production.tree</field>
             <field name="model">mrp.production</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" 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="needaction_pending" invisible="1"/>
+                <tree fonts="bold:message_unread==True" 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="message_unread" invisible="1"/>
                     <field name="name"/>
                     <field name="date_planned"/>
                     <field name="product_id"/>
@@ -619,7 +606,7 @@
             <field name="model">mrp.production</field>
             <field name="arch" type="xml">
                 <graph string="Manufacturing Orders" type="bar">
-                    <field name="date_planned_date"/>
+                    <field name="date_planned"/>
                     <field name="hour_total" operator="+"/>
                     <field name="cycle_total" operator="+"/>
                 </graph>
@@ -633,68 +620,60 @@
                 <form string="Manufacturing Orders" version="7.0">
                 <header>
                     <button name="button_confirm" states="draft" string="Confirm Production" class="oe_highlight"/>
-                    <button name="button_produce" states="ready" string="Start Production" class="oe_highlight"/>
-                    <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" type="action" class="oe_highlight"/>
-                    <button name="force_production" states="confirmed" string="Force Reservation" type="object" class="oe_highlight"/>
+                    <button name="%(act_mrp_product_produce)d" states="confirmed,ready,in_production" string="Produce" type="action" class="oe_highlight"/>
+                    <button name="force_production" states="confirmed" string="Force Reservation" type="object"/>
                     <button name="force_production" states="picking_except" string="Force Reservation" type="object"/>
+                    <button name="button_produce" states="confirmed,ready" string="Mark as Started"/>
                     <button name="button_recreate" states="picking_except" string="Recreate Picking"/>
                     <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel"/>
                     <button name="action_cancel" type="object" states="confirmed" string="Cancel"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                 </header>
                 <sheet>
-                    <label for="product_id" class="oe_edit_only"/>
-                    <h1>
-                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','&lt;&gt;',False),('bom_ids.bom_id','=',False)]" class="oe_inline"/>
-                    </h1>
-                    <label for="product_qty" class="oe_edit_only"/>
-                    <h2>
-                        <field name="product_qty" class="oe_inline"/>
-                        <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
-                        <button type="action"
-                            icon="terp-accessories-archiver+"
-                            name="%(mrp.action_change_production_qty)d"
-                            string="Change Qty" states="ready,confirmed" class="oe_inline"/>
-                    </h2>
-                    <div groups="mrp.group_mrp_routings">
-                        <label for="routing_id" class="oe_edit_only"/>
-                        <h2><field name="routing_id" class="oe_inline"/></h2>
+                    <div class="oe_title">
+                        <h1>Manufacturing Order <field name="name" class="oe_inline"/></h1>
                     </div>
                     <group>
                         <group>
-                            <field name="name"/>
-                            <field name="date_planned"/>
-                            <field name="origin"/>
-                        </group>
-                        <group>
-                            <field name="user_id"/>
+                            <field name="product_id" on_change="product_id_change(product_id)" domain="[('bom_ids','!=',False),('bom_ids.bom_id','=',False)]" class="oe_inline" context='{"default_supply_method":"produce", "default_type": "product"}'/>
+                            <label for="product_qty"/>
+                            <div>
+                                <field name="product_qty" class="oe_inline"/>
+                                <field name="product_uom" groups="product.group_uom" class="oe_inline"/>
+                                <button type="action"
+                                    icon="terp-accessories-archiver+"
+                                    name="%(mrp.action_change_production_qty)d"
+                                    string="(Update)" states="confirmed" class="oe_edit_only oe_link"/>
+                            </div>
                             <label for="product_uos_qty" groups="product.group_uos"/>
                             <div groups="product.group_uos">
                                 <field name="product_uos_qty" class="oe_inline"/>
                                 <label string="-" attrs="{'invisible':[('product_uos','=',False)]}" class="oe_inline"/>
                                 <field name="product_uos" class="oe_inline"/>
                             </div>
+                            <field name="date_planned"/>
+                        </group>
+                        <group>
+                            <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)" required="1"/>
+                            <field name="routing_id" class="oe_inline" groups="mrp.group_mrp_routings"/>
+                            <field name="user_id"/>
+                            <field name="origin"/>
+                        </group>
+                        <group groups="stock.group_locations">
+                            <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
+                            <field name="location_dest_id" domain="[('usage','=','internal')]"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Consumed Products">
-                            <group groups="stock.group_locations">
-                                <group>
-                                    <field name="bom_id" domain="[('product_id','=',product_id)]" context="{'default_product_id': product_id}" on_change="bom_id_change(bom_id)"/>
-                                </group>
-                                <group>
-                                    <field name="location_src_id" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
-                                    <field name="location_dest_id" domain="[('usage','=','internal')]"/>
-                                </group>
-                            </group>
                             <group>
                                 <group string="Products to Consume">
-                                    <field name="move_lines" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
+                                    <field name="move_lines" nolabel="1" options="{'reload_on_button': true}">
                                         <tree colors="blue:state == '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="Quantity"/>
                                             <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                            <field name="location_id"  string="Source Loc." groups="stock.group_locations"/>
+                                            <field name="prodlot_id" groups="stock.group_production_lot" context="{'product_id': product_id}"/>
                                             <field name="state" invisible="1"/>
                                             <button name="%(stock.move_consume)d"
                                                 string="Consume Products" type="action"
@@ -704,7 +683,8 @@
                                                    name="%(stock.track_line)d"
                                                    string="Split in Serial Numbers"
                                                    type="action" icon="gtk-justify-fill"
-                                                   states="draft,waiting,confirmed,assigned"/>
+                                                   states="draft,waiting,confirmed,assigned" 
+                                                   groups="stock.group_production_lot"/>
                                             <button name="%(stock.move_scrap)d"
                                                 string="Scrap Products" type="action"
                                                 icon="gtk-convert" context="{'scrap': True}"
@@ -712,13 +692,13 @@
                                         </tree>
                                     </field>
                                 </group>
-                                <group string="Consumed Product">
-                                    <field name="move_lines2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
+                                <group string="Consumed Products">
+                                    <field name="move_lines2" nolabel="1">
                                        <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state == 'cancel' " string="Consumed Products" editable="bottom">
                                            <field name="product_id" readonly="1"/>
                                            <field name="product_qty" readonly="1"/>
                                            <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
-                                           <field name="prodlot_id" context="{'product_id': product_id}"/>
+                                           <field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_production_lot"/>
                                            <field name="state" invisible="1"/>
                                            <field name="scrapped" invisible="1"/>
                                            <button
@@ -734,7 +714,7 @@
                         <page string="Finished Products">
                             <group>
                                 <group string="Products to Produce">
-                                    <field name="move_created_ids" domain="[('state','&lt;&gt;', ('done', 'cancel'))]" nolabel="1">
+                                    <field name="move_created_ids" nolabel="1">
                                         <tree string="Products to Finish">
                                             <field name="product_id"/>
                                             <field name="product_qty"/>
@@ -752,13 +732,13 @@
                                     </field>
                                 </group>
                                 <group string="Produced Products">
-                                    <field name="move_created_ids2" domain="[('state','in', ('done', 'cancel'))]" nolabel="1">
+                                    <field name="move_created_ids2" nolabel="1">
                                         <tree colors="red:scrapped==True;blue:state == 'draft';black:state in('picking_except','confirmed','ready','in_production');gray:state in('cancel','done') " string="Finished Products">
                                             <field name="product_id" readonly="1"/>
                                             <field name="product_qty" readonly="1"/>
                                             <field name="product_uom" readonly="1" string="Unit of Measure" groups="product.group_uom"/>
                                             <field name="location_dest_id"  readonly="1" string="Destination Loc." widget="selection" groups="stock.group_locations"/>
-                                            <field name="prodlot_id" context="{'product_id': product_id}"/>
+                                            <field name="prodlot_id" context="{'product_id': product_id}" groups="stock.group_production_lot"/>
                                             <field name="scrapped" invisible="1"/>
                                             <field name="state" invisible="1"/>
                                             <button name="%(stock.track_line)d"
@@ -771,7 +751,7 @@
                                 </group>
                             </group>
                         </page>
-                        <page string="Work Orders">
+                        <page string="Work Orders" groups="mrp.group_mrp_routings">
                             <button name="action_compute" states="draft"
                                 string="Compute Data" type="object"
                                 icon="terp-stock_format-scientific"/>
@@ -817,8 +797,8 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
@@ -972,6 +952,7 @@
             <data>
                 <xpath expr="//field[@name='move_id']" position="before">
                     <field name="bom_id" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
+                    <field name="production_id" attrs="{'invisible': [('production_id','=',False)]}"/>
                 </xpath>
                 <xpath expr="//field[@name='close_move']" position="after">
                     <group colspan="4"  groups="product.group_mrp_properties">
@@ -981,33 +962,21 @@
                </data>
             </field>
         </record>
-
-        <record id="product_normal_form_view" model="ir.ui.view">
+        <record id="product_product_normal_form_supply_view" model="ir.ui.view">
             <field name="name">product.normal.form.mrp.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
             <field name="arch" type="xml">
-                <page string="Procurement &amp; Locations" position="inside">
-                    <separator string="Bill of Materials"/>
-                    <field name="bom_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
-                        <tree string="Bill of Materials">
-                            <field name="name" string="Component Name"/>
-                            <field name="bom_id"/>
-                            <field name="product_qty" string="Quantity of Product"/>
-                            <field name="type"/>
-                            <field name="date_start"/>
-                            <field name="date_stop"/>
-                        </tree>
-                        <form string="Bill of Material">
-                            <field name="name" string="Component Name"/>
-                            <field name="bom_id"/>
-                            <field name="product_qty" string="Quantity of Product"/>
-                            <field name="type"/>
-                            <field name="date_start"/>
-                            <field name="date_stop"/>
-                        </form>
-                    </field>
-                </page>
+                <xpath expr="//field[@name='supply_method']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <group name="procurement_help" position="inside">
+                    <p attrs="{'invisible': ['|','|',('type','=','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','produce')]}">
+                        When you sell this product, OpenERP will trigger <b>a manufacturing
+                        order</b> using the bill of materials assigned to this product.
+                        The delivery order will be ready once the production is done.
+                    </p>
+                </group>
             </field>
         </record>
 
@@ -1065,5 +1034,23 @@
                 id="menu_mrp_production_order_action" name="Orders Planning"
                 parent="menu_mrp_planning" sequence="1"/>
 
+
+        <record model="ir.actions.act_window" id="product_open_bom">
+            <field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
+            <field name="name">Bill of Materials</field>
+            <field name="domain">[('bom_id','=',False)]</field>
+            <field name="res_model">mrp.bom</field>
+        </record>
+
+        <record model="ir.ui.view" id="product_form_view_bom_button">
+            <field name="name">product.product.procurement</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button string="Bill of Materials" name="%(product_open_bom)d" type="action"/>
+                </xpath>
+            </field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 363f98e35d1..e2ba45ee230 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -31,9 +31,10 @@ class procurement_order(osv.osv):
     _columns = {
         'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True),
         'property_ids': fields.many2many('mrp.property', 'procurement_property_rel', 'procurement_id','property_id', 'Properties'),
+        'production_id': fields.many2one('mrp.production', 'Manufacturing Order'),
     }
     
-    def check_produce_product(self, cr, uid, procurement, context=[]):
+    def check_produce_product(self, cr, uid, procurement, context=None):
         """ Finds the bill of material for the product from procurement order.
         @return: True or False
         """
@@ -43,7 +44,7 @@ class procurement_order(osv.osv):
             cr.execute('update procurement_order set message=%s where id=%s', (_('No BoM defined for this product !'), procurement.id))
             for (id, name) in self.name_get(cr, uid, procurement.id):
                 message = _("Procurement '%s' has an exception: 'No BoM defined for this product !'") % name
-                self.message_append_note(cr, uid, [procurement.id], body=message, context=context)
+                self.message_post(cr, uid, [procurement.id], body=message, context=context)
             return False
         return True
     
@@ -95,16 +96,22 @@ class procurement_order(osv.osv):
                 'move_prod_id': res_id,
                 'company_id': procurement.company_id.id,
             })
+            
             res[procurement.id] = produce_id
-            self.write(cr, uid, [procurement.id], {'state': 'running'})
-            self.running_send_note(cr, uid, ids, context=context)
+            self.write(cr, uid, [procurement.id], {'state': 'running', 'production_id': produce_id})   
             bom_result = production_obj.action_compute(cr, uid,
                     [produce_id], properties=[x.id for x in procurement.property_ids])
             wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr)
             if res_id:
                 move_obj.write(cr, uid, [res_id],
                         {'location_id': procurement.location_id.id})
+        self.production_order_create_note(cr, uid, ids, context=context)
         return res
+
+    def production_order_create_note(self, cr, uid, ids, context=None):
+        for procurement in self.browse(cr, uid, ids, context=context):
+            body = _("Manufacturing Order <em>%s</em> created.") % ( procurement.production_id.name,)
+            self.message_post(cr, uid, [procurement.id], body=body, context=context)
     
 procurement_order()
 
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 1bc3bb749ce..1fa0f2c8a97 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -26,7 +26,7 @@ from tools.translate import _
 class product_product(osv.osv):
     _inherit = "product.product"    
     _columns = {
-        "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials'),
+        "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials', domain=[('bom_id','=',False)]),
     }
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
diff --git a/addons/mrp/report/bom_structure.py b/addons/mrp/report/bom_structure.py
index a5b43c19f01..458a0c19649 100644
--- a/addons/mrp/report/bom_structure.py
+++ b/addons/mrp/report/bom_structure.py
@@ -35,7 +35,7 @@ class bom_structure(report_sxw.rml_parse):
     def get_children(self, object, level=0):
         result = []
 
-        def _get_rec(object,level):
+        def _get_rec(object, level):
             for l in object:
                 res = {}
                 res['name'] = l.name
@@ -61,4 +61,4 @@ class bom_structure(report_sxw.rml_parse):
 report_sxw.report_sxw('report.bom.structure','mrp.bom','mrp/report/bom_structure.rml',parser=bom_structure,header='internal')
 
 
-# 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/mrp/report/price.py b/addons/mrp/report/price.py
index 527505d8ea5..b1e04749ab2 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -111,7 +111,7 @@ class report_custom(report_rml):
             <PageWidth>595.27</PageWidth>
             <PageHeight>841.88</PageHeight>
             <tableSize>55.00mm,58.00mm,29.00mm,29.00mm,29.00mm</tableSize>
-            """ % (user_pool.browse(cr, uid, uid).company_id.name)
+            """ % to_xml(user_pool.browse(cr, uid, uid).company_id.name)
         config_stop = """
             <report-footer>Generated by OpenERP</report-footer>
         </config>
diff --git a/addons/mrp/res_config.py b/addons/mrp/res_config.py
index 555010c2be1..ec3deb524a3 100644
--- a/addons/mrp/res_config.py
+++ b/addons/mrp/res_config.py
@@ -28,11 +28,7 @@ class mrp_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_stock_planning': fields.boolean('manage master production shedule',
-            help ="""This allows to create a manual procurement plan apart of the normal MRP scheduling,
-                which works automatically based on minimum stock rules.
-                This installs the module stock_planning."""),
-        'module_mrp_repair': fields.boolean("manage repairs of products ",
+        'module_mrp_repair': fields.boolean("Manage repairs of products ",
             help="""Allows to manage all product repairs.
                     * Add/remove products in the reparation
                     * Impact for stocks
@@ -41,34 +37,34 @@ class mrp_config_settings(osv.osv_memory):
                     * Repair quotation report
                     * Notes for the technician and for the final customer.
                 This installs the module mrp_repair."""),
-        'module_mrp_operations': fields.boolean("allow detailed planning of work order",
+        'module_mrp_operations': fields.boolean("Allow detailed planning of work order",
             help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
                 This installs the module mrp_operations."""),
-        'module_mrp_subproduct': fields.boolean("produce several products from one manufacturing order",
-            help="""You can configure sub-products in the bill of material.
+        'module_mrp_byproduct': fields.boolean("Produce several products from one manufacturing order",
+            help="""You can configure by-products in the bill of material.
                 Without this module: A + B + C -> D.
                 With this module: A + B + C -> D + E.
-                This installs the module mrp_subproduct."""),
-        'module_mrp_jit': fields.boolean("generate procurement in real time",
+                This installs the module mrp_byproduct."""),
+        'module_mrp_jit': fields.boolean("Generate procurement in real time",
             help="""This allows Just In Time computation of procurement orders.
                 All procurement orders will be processed immediately, which could in some
                 cases entail a small performance impact.
                 This installs the module mrp_jit."""),
-        'module_stock_no_autopicking': fields.boolean("manage manual picking to fulfill manufacturing orders ",
+        'module_stock_no_autopicking': fields.boolean("Manage manual picking to fulfill manufacturing orders ",
             help="""This module allows an intermediate picking process to provide raw materials to production orders.
                 For example to manage production made by your suppliers (sub-contracting).
                 To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking"
                 and put the location of the supplier in the routing of the assembly operation.
                 This installs the module stock_no_autopicking."""),
-        'group_mrp_routings': fields.boolean("manage routings and work orders ",
+        'group_mrp_routings': fields.boolean("Manage routings and work orders ",
             implied_group='mrp.group_mrp_routings',
             help="""Routings allow you to create and manage the manufacturing operations that should be followed
                 within your work centers in order to produce a product. They are attached to bills of materials
                 that will define the required raw materials."""),
-        'group_mrp_properties': fields.boolean("allow several bill of materials per products",
+        'group_mrp_properties': fields.boolean("Allow several bill of materials per products using properties",
             implied_group='product.group_mrp_properties',
             help="""The selection of the right Bill of Material to use will depend on the  properties specified on the sale order and the Bill of Material."""),
-        'module_product_manufacturer': fields.boolean("define manufacturers on products ",
+        'module_product_manufacturer': fields.boolean("Define manufacturers on products ",
             help="""This allows you to define the following for a product:
                     * Manufacturer
                     * Manufacturer Product Name
diff --git a/addons/mrp/res_config_view.xml b/addons/mrp/res_config_view.xml
index 4d94e611fdf..2c7047380a8 100644
--- a/addons/mrp/res_config_view.xml
+++ b/addons/mrp/res_config_view.xml
@@ -7,10 +7,9 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('base.menu_mrp_root')}"/>
         </record>
-        <record id="todo_open_mrp_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_mrp_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
         </record>
     </data>
     <data>
@@ -29,8 +28,8 @@
                         <label for="id" string="Order"/>
                         <div>
                             <div>
-                                <field name="module_mrp_subproduct" class="oe_inline"/>
-                                <label for="module_mrp_subproduct"/>
+                                <field name="module_mrp_byproduct" class="oe_inline"/>
+                                <label for="module_mrp_byproduct"/>
                             </div>
                             <div>
                                 <field name="module_mrp_repair" class="oe_inline"/>
@@ -57,10 +56,6 @@
                                 <field name="module_mrp_operations" class="oe_inline"/>
                                 <label for="module_mrp_operations" />
                             </div>
-                            <div>
-                                <field name="module_stock_planning" class="oe_inline"/>
-                                <label for="module_stock_planning"/>
-                            </div>
                         </div>
                     </group>
                     <separator string="Master Data"/>
diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv
index 5d254f86b4e..6ca9cb3d705 100644
--- a/addons/mrp/security/ir.model.access.csv
+++ b/addons/mrp/security/ir.model.access.csv
@@ -3,7 +3,6 @@ access_mrp_workcenter,mrp.workcenter,model_mrp_workcenter,mrp.group_mrp_user,1,0
 access_mrp_routing,mrp.routing,model_mrp_routing,mrp.group_mrp_user,1,0,0,0
 access_mrp_routing_workcenter,mrp.routing.workcenter,model_mrp_routing_workcenter,mrp.group_mrp_user,1,0,0,0
 access_mrp_bom,mrp.bom,model_mrp_bom,group_mrp_user,1,0,0,0
-access_mrp_bom_revision,mrp.bom.revision,model_mrp_bom_revision,group_mrp_user,1,0,0,0
 access_mrp_production,mrp.production user,model_mrp_production,mrp.group_mrp_user,1,1,1,1
 access_mrp_production_salesman,mrp.production salesman,model_mrp_production,base.group_sale_salesman,1,1,1,0
 access_mrp_production_product_line_salesman,mrp.production.product.line salesman,model_mrp_production_product_line,base.group_sale_salesman,1,0,1,0
@@ -16,7 +15,6 @@ access_mrp_workcenter_manager,mrp.workcenter.manager,model_mrp_workcenter,mrp.gr
 access_mrp_routing_manager,mrp.routing.manager,model_mrp_routing,mrp.group_mrp_manager,1,1,1,1
 access_mrp_routing_workcenter_manager,mrp.routing.workcenter.manager,model_mrp_routing_workcenter,mrp.group_mrp_manager,1,1,1,1
 access_mrp_bom_manager,mrp.bom.manager,model_mrp_bom,mrp.group_mrp_manager,1,1,1,1
-access_mrp_bom_revision_manager,mrp.bom.revision.manager,model_mrp_bom_revision,mrp.group_mrp_manager,1,1,1,1
 access_stock_location_mrp_worker,stock.location mrp_worker,stock.model_stock_location,mrp.group_mrp_user,1,0,0,0
 access_stock_move_mrp_worker,stock.move mrp_worker,stock.model_stock_move,mrp.group_mrp_user,1,1,1,0
 access_stock_picking_mrp_worker,stock.picking mrp_worker,stock.model_stock_picking,mrp.group_mrp_user,1,1,1,1
@@ -26,7 +24,6 @@ access_account_account,account.account mrp_worker,account.model_account_account,
 access_purchase_order_mrp_worker,purchase.order mrp_worker,purchase.model_purchase_order,mrp.group_mrp_user,1,0,0,0
 access_purchase_order_line_mrp_worker,purchase.order.line mrp_worker,purchase.model_purchase_order_line,mrp.group_mrp_user,1,0,0,0
 access_hr_timesheet_group_mrp_worker,resource.calendar mrp_manager,resource.model_resource_calendar,mrp.group_mrp_manager,1,1,1,1
-access_procurement_stock_worker,procurement.order stock_worker,model_procurement_order,stock.group_stock_user,1,1,1,1
 access_procurement_user,procurement.order.user,model_procurement_order,base.group_user,1,1,1,1
 access_mrp_production_stock_worker,mrp.production stock_worker,model_mrp_production,stock.group_stock_user,1,0,0,0
 access_report_workcenter_load,report.workcenter.load,model_report_workcenter_load,mrp.group_mrp_manager,1,1,1,1
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index d5ddc7f0280..fdfe09f35b4 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -102,7 +102,7 @@ class StockMove(osv.osv):
                     wf_service.trg_validate(uid, 'procurement.order', m, 'button_wait_done', cr)
         return processed_ids
     
-    def action_consume(self, cr, uid, ids, product_qty, location_id=False, context=None): 
+    def action_consume(self, cr, uid, ids, product_qty, location_id=False, context=None):
         """ Consumed product with specific quatity from specific source location.
         @param product_qty: Consumed product quantity
         @param location_id: Source location
diff --git a/addons/mrp/test/order_process.yml b/addons/mrp/test/order_process.yml
index f8a2ebfbf99..a714035a9cd 100644
--- a/addons/mrp/test/order_process.yml
+++ b/addons/mrp/test/order_process.yml
@@ -71,7 +71,7 @@
     partner_id = False
     if order.bom_id.routing_id and order.bom_id.routing_id.location_id:
         routing_loc = order.bom_id.routing_id.location_id
-        if routing_loc.usage <> 'internal':
+        if routing_loc.usage != 'internal':
             pick_type = 'out'
         partner_id = routing_loc.partner_id and routing_loc.partner_id.id or False
         routing_loc = routing_loc.id
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 6c021c069ab..9be34b6bd1e 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -68,12 +68,12 @@ class change_production_qty(osv.osv_memory):
         assert record_id, _('Active Id not found')
         prod_obj = self.pool.get('mrp.production')
         bom_obj = self.pool.get('mrp.bom')
+        move_obj = self.pool.get('stock.move')
         for wiz_qty in self.browse(cr, uid, ids, context=context):
             prod = prod_obj.browse(cr, uid, record_id, context=context)
             prod_obj.write(cr, uid, [prod.id], {'product_qty': wiz_qty.product_qty})
             prod_obj.action_compute(cr, uid, [prod.id])
 
-            move_lines_obj = self.pool.get('stock.move')
             for move in prod.move_lines:
                 bom_point = prod.bom_id
                 bom_id = prod.bom_id.id
@@ -88,12 +88,17 @@ class change_production_qty(osv.osv_memory):
                     raise osv.except_osv(_('Error!'), _("Cannot find bill of material for this product."))
 
                 factor = prod.product_qty * prod.product_uom.factor / bom_point.product_uom.factor
-                res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
-                for r in res[0]:
+                product_details, workcenter_details = \
+                    bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, [])
+                product_move = dict((mv.product_id.id, mv.id) for mv in prod.picking_id.move_lines)
+                for r in product_details:
                     if r['product_id'] == move.product_id.id:
-                        move_lines_obj.write(cr, uid, [move.id], {'product_qty' :  r['product_qty']})
+                        move_obj.write(cr, uid, [move.id], {'product_qty': r['product_qty']})
+                    if r['product_id'] in product_move:
+                        move_obj.write(cr, uid, [product_move[r['product_id']]], {'product_qty': r['product_qty']})
+            if prod.move_prod_id:
+                move_obj.write(cr, uid, [prod.move_prod_id.id], {'product_qty' :  wiz_qty.product_qty})
             self._update_product_to_produce(cr, uid, prod, wiz_qty.product_qty, context=context)
-
         return {}
 
 change_production_qty()
diff --git a/addons/mrp_subproduct/__init__.py b/addons/mrp_byproduct/__init__.py
similarity index 97%
rename from addons/mrp_subproduct/__init__.py
rename to addons/mrp_byproduct/__init__.py
index 5b48431ef16..7e507e0fe0a 100644
--- a/addons/mrp_subproduct/__init__.py
+++ b/addons/mrp_byproduct/__init__.py
@@ -18,5 +18,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-import mrp_subproduct
+import mrp_byproduct
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_subproduct/__openerp__.py b/addons/mrp_byproduct/__openerp__.py
similarity index 82%
rename from addons/mrp_subproduct/__openerp__.py
rename to addons/mrp_byproduct/__openerp__.py
index 793d0f104e0..58e7a194771 100644
--- a/addons/mrp_subproduct/__openerp__.py
+++ b/addons/mrp_byproduct/__openerp__.py
@@ -21,36 +21,34 @@
 
 
 {
-    'name': 'MRP Subproducts',
+    'name': 'MRP Byproducts',
     'version': '1.0',
     'category': 'Manufacturing',
     'description': """
 This module allows you to produce several products from one production order.
 =============================================================================
 
-You can configure sub-products in the bill of material.
+You can configure by-products in the bill of material.
 
 Without this module:
+--------------------
     A + B + C -> D
 
 With this module:
+-----------------
     A + B + C -> D + E
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'images': ['images/bom_subproduct.jpeg'],
+    'images': ['images/bom_byproduct.jpeg'],
     'depends': ['base', 'mrp'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
        'security/ir.model.access.csv',
-       'mrp_subproduct_view.xml'
+       'mrp_byproduct_view.xml'
     ],
-    'demo_xml': [],
-    'test': [
-             'test/mrp_subproduct.yml'
-             ],
+    'demo': [],
+    'test': ['test/mrp_byproduct.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0050060616733',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_byproduct/i18n/ab.po b/addons/mrp_byproduct/i18n/ab.po
new file mode 100644
index 00000000000..cb0507473b6
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/ab.po
@@ -0,0 +1,123 @@
+# Abkhazian 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: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2009-04-20 09:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Abkhazian <ab@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
diff --git a/addons/mrp_byproduct/i18n/ar.po b/addons/mrp_byproduct/i18n/ar.po
new file mode 100644
index 00000000000..31c1855cf84
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/ar.po
@@ -0,0 +1,157 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+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: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "المنتج"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "ثابت"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"يجب ان تكون كل كميات المنتج اكبر من 0.\n"
+"يجب انت تثبت نموذج المنتج الفرعي_لتخطيط مصدر التصنيع اذا كنت تريد ادارة "
+"المنتجات الزائده في التخطيط لمصدر التصنيع !"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "منتجات فرعية"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "امر التصنيع"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "منتجات فرعية"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "نوع الكمية"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "فاتورة المواد"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "كمية المنتج"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "وحدة قياس المنتج"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "فاتورة المواد"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "المرجع يجب أن يكون فريداً لكل شركة علي حدا!"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "منتجات_فرعية"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "متغير"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "منتج فرعي"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "كمية الطلب لا تكون أقل أو مساوية للصفر!"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr ""
+#~ "المنتج الفرعي لتخطيط مورد التصنيع - لانتاج منتجات متعددة من امر الانتاج "
+#~ "الواحد"
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "لا يمكن انت تكون كمية الامر سلبية او صفر !"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "خطأ ! لا يمكنك انشاء فاتورة للمواد رجعية."
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "تسمح لك هذه الوحدة بانتاج منتجات متعددة من امر انتاج واحد.\n"
+#~ "يمكنك ضبط المنتجات الفرعية في فاتورة المواد.\n"
+#~ "بدون هذه الوحدة:\n"
+#~ "A + B + C -> D\n"
+#~ "وبهذه الوحدة:\n"
+#~ "A + B + C -> D + E\n"
+#~ "    "
diff --git a/addons/mrp_byproduct/i18n/bg.po b/addons/mrp_byproduct/i18n/bg.po
new file mode 100644
index 00000000000..b193d7f1656
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/bg.po
@@ -0,0 +1,131 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+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: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Продукт"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "под продукти"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Под продукти"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "К-во продукт"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Продукт мер. ед."
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Променлив"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Невалиден XML за преглед на архитектурата"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
+#~ "символи!"
diff --git a/addons/mrp_byproduct/i18n/bs.po b/addons/mrp_byproduct/i18n/bs.po
new file mode 100644
index 00000000000..34f27c74b47
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/bs.po
@@ -0,0 +1,136 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2010-08-03 08:08+0000\n"
+"Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fiksno"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "poluproizvod"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Poluproizvodi"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Vrsta Količine"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Proizvod Kol."
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Proizvod UOM"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "BoM"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "polu_proizvodi"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Promjenljivo"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "MRP Poluproizvod"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv Objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Mrp Poluproizvod"
diff --git a/addons/mrp_byproduct/i18n/ca.po b/addons/mrp_byproduct/i18n/ca.po
new file mode 100644
index 00000000000..7a73bdbb4fc
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/ca.po
@@ -0,0 +1,174 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2010-08-03 08:08+0000\n"
+"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
+"<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: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Producte"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fixe"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Totes les quantitats de producte han de ser superiors a zero.\n"
+"Heu d'instal·lar el mòdul mrp_subproduct si voleu gestionar productes extra "
+"en les LdM!"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "sub productes"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Ordre de fabricació"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub productes"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tipus de quantitat"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Llista de material"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Quantitat producte"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producte"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Llista de materials (LdM)"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_productes"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sub producte"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "MRP subproducte"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invàlid per a la definició de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
+#~ "especial!"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Sub producte MRP"
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr ""
+#~ "MRP Sub producte - Per produir diversos productes des d'una ordre de "
+#~ "fabricació"
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "La quantitat ordenada no pot ser negativa o zero!"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "Error! No podeu crear llistes de material recursives."
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Aquest mòdul us permet produir diversos productes des d'una ordre de "
+#~ "producció.\n"
+#~ "Podeu configurar els sub-productes en la llista de materials.\n"
+#~ "Sense aquest mòdul:\n"
+#~ "    A + B + C -> D\n"
+#~ "Amb aquest mòdul:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
diff --git a/addons/mrp_byproduct/i18n/cs.po b/addons/mrp_byproduct/i18n/cs.po
new file mode 100644
index 00000000000..a55705d2f3d
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/cs.po
@@ -0,0 +1,136 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2009-11-17 07:16+0000\n"
+"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "podprodukty"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Podprodukty"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Produkt Qty"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Produkt UOM"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "BoM"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "pod_produkty"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalidní XML pro zobrazení architektury!"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Mrp podprodukt"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "MRP podprodukt"
diff --git a/addons/mrp_byproduct/i18n/da.po b/addons/mrp_byproduct/i18n/da.po
new file mode 100644
index 00000000000..e9528af8342
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/da.po
@@ -0,0 +1,123 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-01-27 09:07+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Danish <da@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
diff --git a/addons/mrp_byproduct/i18n/de.po b/addons/mrp_byproduct/i18n/de.po
new file mode 100644
index 00000000000..90cbe47afed
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/de.po
@@ -0,0 +1,178 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-02-08 09:39+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fixiert"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Alle Produktmengen müssen grösser als 0 sein !\n"
+"Sie sollten das Modul mrp_subproduct installieren, wenn Sie Kuppelprodukte "
+"über eine Stückliste definieren wollen."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "Kuppelprodukte"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Fertigungsauftrag"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+"Produkt in Stücklistenzeile darf nicht das zu produzierende Produkt sein"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Kuppelprodukte"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Mengen Typ"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Stückliste"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Anzahl"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "ME"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "BoM"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "Die Referenz muss je Firma eindeutig sein"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "Kuppelprodukte"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variabel"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Kuppelprodukt"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "Die Bestellmenge kann nicht negativ oder 0 sein"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+"Definition, wie die Kuppelprodukte dieser Stückliste produziert werden:\r\n"
+"'Fix': Die Menge der erzeugten Kuppelprodukte ist je Produktion konstant.\r\n"
+"'Variable': Die Menge des Kupelproduktes ist proportional zur Menge, die mit "
+"dieser Stückliste produziert werd."
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr "Fehler! Sie können keine rekursiven Stücklisten erstellen"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
+#~ "beinhalten"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Fertigung Subprodukt"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "MRP untergeordnetes Produkt"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "Fehler! Sie können keine rekursiven Stücklisten definieren."
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Dieses Modul ermöglicht die Fertigung mehrerer Produkte mit einem "
+#~ "Fertigungsauftrag (Kuppelprodukte).\n"
+#~ "YSie können Kuppelprodukte in der Stückliste definieren.\n"
+#~ "Ohne dieses Modul:\n"
+#~ "    A + B + C -> D\n"
+#~ "Mit diesem Modul:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr ""
+#~ "MRP Sub Product - Modul um Kuppelprodukte mit einem Fertigungsauftrag zu "
+#~ "fertigen"
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "Auftragsmengen können nicht nagativ oder 0 sein!"
diff --git a/addons/mrp_byproduct/i18n/es.po b/addons/mrp_byproduct/i18n/es.po
new file mode 100644
index 00000000000..b620686de2d
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/es.po
@@ -0,0 +1,173 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2010-12-28 08:01+0000\n"
+"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fijo"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Todas las cantidades de producto deben de ser superiores a cero.\n"
+"¡Debe instalar el módulo mrp_subproduct si quiere gestionar productos extra "
+"en las LdM!"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "sub productos"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Orden fabricación"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub productos"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tipo de cantidad"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Lista de material"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Cantidad producto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Lista de materiales (LdM)"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_productos"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sub producto"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Sub producto MRP"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "Subproducto MRP"
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr ""
+#~ "MRP Sub producto - Para producir varios productos desde una orden de "
+#~ "fabricación"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "¡Error! No puede crear Listas de Material recursivas."
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Este módulo le permite producir varios productos desde una orden de "
+#~ "producción.\n"
+#~ "Puede configurar los sub-productos en la lista de materiales.\n"
+#~ "Sin este módulo:\n"
+#~ "    A + B + C -> D\n"
+#~ "Con este módulo:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
diff --git a/addons/mrp_byproduct/i18n/es_AR.po b/addons/mrp_byproduct/i18n/es_AR.po
new file mode 100644
index 00000000000..44bda1db8aa
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/es_AR.po
@@ -0,0 +1,137 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2009-09-15 20:10+0000\n"
+"Last-Translator: Diego Cohen <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "sub productos"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub Producto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Cantidad producto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Lista de materiales (LdM)"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_productos"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para la definición de la vista!"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Sub producto MRP"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún caracter "
+#~ "especial!"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "MRP Sub producto"
diff --git a/addons/mrp_byproduct/i18n/es_CR.po b/addons/mrp_byproduct/i18n/es_CR.po
new file mode 100644
index 00000000000..397a1ed992e
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/es_CR.po
@@ -0,0 +1,184 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-02-17 20:45+0000\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@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: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+"Language: \n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fijo"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Todas las cantidades de producto deben de ser superiores a cero.\n"
+"¡Debe instalar el módulo mrp_subproduct si quiere gestionar productos extra "
+"en las LdM!"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "sub productos"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Orden fabricación"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+"Producto BoM línea no debe ser el mismo como producto lista de materiales."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub productos"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tipo de cantidad"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Lista de material"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Cantidad producto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Lista de materiales (LdM)"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "Referencia debe ser única por compañía!"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_productos"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sub producto"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "¡La cantidad de la orden no puede ser negativa o cero!"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+"Definir cómo la cantidad de subproductos se encuentra en las órdenes de "
+"producción que utilizan este lista de materiales. 'Fijo' representa una "
+"situación en la que la cantidad de subproducto creado es siempre igual a la "
+"cantidad de conjunto sobre la lista de materiales, independientemente de "
+"cuántos se crean en el orden de producción. Por oposición, \"variable\" "
+"significa que la cantidad se calcula como (la cantidad de subproducto "
+"establecido en la Lista de Materiales / cantidad de producto manufacturado, "
+"situado en la cantidad de * Lista de Materiales de producto manufacturado en "
+"el orden de producción). \""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr "¡Error! No puede crear una LdM recursiva"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Sub producto MRP"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "Subproducto MRP"
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr ""
+#~ "MRP Sub producto - Para producir varios productos desde una orden de "
+#~ "fabricación"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "¡Error! No puede crear Listas de Material recursivas."
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "¡La cantidad ordenada no puede ser negativa o cero!"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Este módulo le permite producir varios productos desde una orden de "
+#~ "producción.\n"
+#~ "Puede configurar los sub-productos en la lista de materiales.\n"
+#~ "Sin este módulo:\n"
+#~ "    A + B + C -> D\n"
+#~ "Con este módulo:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
diff --git a/addons/mrp_byproduct/i18n/es_EC.po b/addons/mrp_byproduct/i18n/es_EC.po
new file mode 100644
index 00000000000..b1726ea8837
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/es_EC.po
@@ -0,0 +1,173 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2010-09-19 00:06+0000\n"
+"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fijo"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Todas las cantidades de producto deben de ser superiores a cero.\n"
+"¡Debe instalar el módulo mrp_subproduct si quiere gestionar productos extra "
+"en las LdM!"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "sub productos"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Órden de producción"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub productos"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tipo de cantidad"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Lista de material"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Cantidad producto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "UdM del producto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Lista de materiales (LdM)"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_productos"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sub producto"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Sub producto MRP"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "Subproducto MRP"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Este módulo le permite producir varios productos desde una orden de "
+#~ "producción.\n"
+#~ "Puede configurar los sub-productos en la lista de materiales.\n"
+#~ "Sin este módulo:\n"
+#~ "    A + B + C -> D\n"
+#~ "Con este módulo:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr ""
+#~ "MRP Sub producto - Para producir varios productos desde una orden de "
+#~ "fabricación"
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "¡Cantidad ordenada no puede ser negativa o cero!"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "¡Error! No puede crear Listas de Material recursivas"
diff --git a/addons/mrp_subproduct/i18n/es_MX.po b/addons/mrp_byproduct/i18n/es_MX.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/es_MX.po
rename to addons/mrp_byproduct/i18n/es_MX.po
diff --git a/addons/mrp_subproduct/i18n/es_VE.po b/addons/mrp_byproduct/i18n/es_VE.po
similarity index 100%
rename from addons/mrp_subproduct/i18n/es_VE.po
rename to addons/mrp_byproduct/i18n/es_VE.po
diff --git a/addons/mrp_byproduct/i18n/et.po b/addons/mrp_byproduct/i18n/et.po
new file mode 100644
index 00000000000..ef99950da2b
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/et.po
@@ -0,0 +1,136 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2009-11-09 18:57+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Toode"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fikseeritud"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "alamtooted"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Alamtooted"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Koguse tüüp"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Toote kogus"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Toote MõÜ"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Materjaliandmik"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_products"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Muutuv"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "TVP alamtoode"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "TVP alamtoode"
diff --git a/addons/mrp_byproduct/i18n/fi.po b/addons/mrp_byproduct/i18n/fi.po
new file mode 100644
index 00000000000..ec18e259f19
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/fi.po
@@ -0,0 +1,138 @@
+# Finnish 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: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2010-08-03 08:08+0000\n"
+"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Tuote"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Ennalta määrätty"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Kaikkien määrien on oltava suurempia kuin 0.\n"
+"Asenna mrp_subproduct moduuli jos haluat hallita lisätuotteita tai  BoM:meja!"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "Alatason tuotteet"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Valmistustilaus"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr "BoM rivin tuotteen ei tulisi olla sama kun BoM tuote."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Alituotteet"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Määrän tyyppi"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Osaluettelo"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Tuotteen määrä"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Tuotteen mittayksikkö"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Osaluettelo"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "Viitteen tulee olla uniikki yrityskohtaisesti!"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Muuttuja"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Alatason tuote"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "Tilauksen määrä ei voi olla negatiivinen tai nolla!"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr "Virhe! Et voi luoda rekursiivista BoM:ia."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Objektin nimen tulee alkaa x_ ja se ei saa sisältää erikoismerkkejä!"
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "Tilattu määrä ei voi olle negatiivinen tai nolla !"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "Virhe! Et voi luoda itseään toistavaa osaluetteloa."
diff --git a/addons/mrp_byproduct/i18n/fr.po b/addons/mrp_byproduct/i18n/fr.po
new file mode 100644
index 00000000000..6d45d471c9d
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/fr.po
@@ -0,0 +1,165 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2011-01-13 02:28+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produit"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fixe"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Toutes les quantités de produit doivent être supérieures à 0.\n"
+"Vous devez installer le module mrp_subproduct si vous voulez gérer des "
+"produits supplémentaires sur les nomenclatures !"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "Sous-produits"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Ordre de fabrication"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sous-produit"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Type de quantité"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Nomenclature"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Qté de Produit"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "UdM du produit"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Nomenclature"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "Sous-produits"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sous-produit"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+#~ "spéciaux !"
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr ""
+#~ "Sous-produit dans le module MRP - pour pouvoir fabriquer plusieurs produits "
+#~ "à partir d'un seul ordre de fabrication"
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "La quantité à produire ne peut être ni négative ni nulle !"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "Erreur ! Vous ne pouvez pas créer de nomenclatures récursives."
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Ce module vous permet de produire divers produits à partir d'un seul ordre "
+#~ "de production.\n"
+#~ "Vous pouvez configurer des sous-produits dans la nomenclature.\n"
+#~ "Sans ce module :\n"
+#~ "    A + B + C -> D\n"
+#~ "Avec ce module :\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
diff --git a/addons/mrp_byproduct/i18n/gl.po b/addons/mrp_byproduct/i18n/gl.po
new file mode 100644
index 00000000000..864003eaf4d
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/gl.po
@@ -0,0 +1,153 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2011-03-22 18:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produto"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fixo"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Tódalas cantidades de produto deben ser superiores a cero. Debe instalar o "
+"módulo mrp_subproduct se desexa xestionar produtos extra nas LdM!"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "subprodutos"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Orde de fabricación"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Subprodutos"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tipo de cantidade"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Lista de material"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Cantidade produto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "UdM do produto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Lista de materiais"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_produtos"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variable"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Subproduto"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr ""
+#~ "MRP Subproduto - Para producir varios produtos desde unha orde de fabricación"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Este módulo permítelle producir varios produtos desde unha orde de "
+#~ "produción. Pode configurar os subprodutos na lista de materiais. Sen este "
+#~ "módulo: A + B + C -> D Con este módulo: A + B + C -> D + E\n"
+#~ "    "
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "A cantidade do pedido non pode ser negativa ou cero!"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "Erro! Non pode crear Listas de Material recorrentes."
diff --git a/addons/mrp_byproduct/i18n/hr.po b/addons/mrp_byproduct/i18n/hr.po
new file mode 100644
index 00000000000..e96230f6c73
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/hr.po
@@ -0,0 +1,172 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2011-12-12 10:52+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Artikl"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fiksno"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Sve količine artikala moraju biti veće od 0.\n"
+"Morate instalirati modul mrp_subproduct ako želite dodatne artikle na "
+"sastavnici !"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "podproizvodi"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Nalog za proizvodnju"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Podproizvodi"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tip količine"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Sastavnica"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Količina proizvoda"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "JM proizvoda"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Sastavnica"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_products"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Promjenljiva"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Podproizvod"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za arhitekturu prikaza!"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "MRP podproizvod"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "MRP podproizvod"
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr ""
+#~ "MRP podproizvod - ZA proizvodnju više proizvoda iz jednog naloga za "
+#~ "proizvodnju"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Ovaj modul omogućuje proizvodnju više proizvoda iz jednog naloga za "
+#~ "proizvodnju.\n"
+#~ "Možete konfigurirati podproizvode u sastavnici.\n"
+#~ "Bez ovog modula:\n"
+#~ "    A + B + C -> D\n"
+#~ "Sa ovim modulom:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "Količina na nalogu ne smije biti negativna ili nula!"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "Greška ! Ne možete kreirati rekurzivne sastavnice."
diff --git a/addons/mrp_byproduct/i18n/hu.po b/addons/mrp_byproduct/i18n/hu.po
new file mode 100644
index 00000000000..c878b309fd0
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/hu.po
@@ -0,0 +1,157 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#    * mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2011-02-02 12:30+0000\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
+"<openerp@novotrade.hu>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Termék"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Állandó"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Minden termékmennyiségnek pozitívnak kell lennie.\n"
+"Telepítse az altermékek modult, amennyiben több terméket is szeretne egy "
+"anyagjegyzékkel legyártani."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "altermékek"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Gyártási rendelés"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Altermékek"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Mennyiség típusa"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Anyagjegyzék"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Termékmennyiség"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Termék ME"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Anyagjegyzék"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "altermékek"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Változó"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Altermék"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr "MRP altermékek modul - Egy gyártási rendelésből több termék gyártása"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Ez a modul lehetővé teszi, hogy egy gyártási rendelésből több terméket is "
+#~ "gyártson.\n"
+#~ "Az anyagjegyzékben állíthatja be az altermékeket.\n"
+#~ "Ez a modul nélkül:\n"
+#~ "    A + B + C -> D\n"
+#~ "Ezzel a modullal:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "Hiba! Rekurzív anyagjegyzék nem hozható létre."
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "Rendelési mennyiség nem lehet negatív vagy nulla!"
diff --git a/addons/mrp_byproduct/i18n/id.po b/addons/mrp_byproduct/i18n/id.po
new file mode 100644
index 00000000000..48e444b6610
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/id.po
@@ -0,0 +1,122 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2009-11-09 13:52+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
diff --git a/addons/mrp_byproduct/i18n/it.po b/addons/mrp_byproduct/i18n/it.po
new file mode 100644
index 00000000000..a5b081e482a
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/it.po
@@ -0,0 +1,172 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2011-01-12 20:27+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Prodotto"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fissato"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Tutte le quantità prodotto devono essere maggiori di 0.\n"
+"Dovreste installare il modulo mrp_subproducts se volete gestire prodotti "
+"extra nelle distinte base!"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "Sotto Prodotti"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Ordini di Produzione"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sotto prodotti"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tipi di Quantità"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Distinta base"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Qtà Prodotto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Unità di Misura del Prodotto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Distinta base"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_products"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variabile"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sotto Prodotto"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
+#~ "speciali!"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "MRP Sotto Prodotti"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "MRP Sotto Prodotto"
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr ""
+#~ "MRP Sub Product - Produzione di n prodotti da un singolo ordine di produzione"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per l'Achitettura della Vista"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Questo modulo permette di produrre parecchi articoli da un ordine di "
+#~ "produzione.\n"
+#~ "E' possibile configurare sotto prodotti nella distinta base dei materiali.\n"
+#~ "Senza questo modulo:\n"
+#~ "    A + B + C -> D\n"
+#~ "Con questo modulo:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "La quantità ordinata non può essere negativa o zero !"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "Errore! Non è possibile creare distinte base ricorsive."
diff --git a/addons/mrp_byproduct/i18n/ja.po b/addons/mrp_byproduct/i18n/ja.po
new file mode 100644
index 00000000000..3745b1eb42f
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/ja.po
@@ -0,0 +1,128 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-31 06:38+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "製品"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "固定"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"全製品の数量は0より大きい必要があります。\n"
+"部品表上で追加の製品を管理したい場合は、mrp_subproductモジュールをインストールする必要があります。"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "サブ製品"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "製造オーダー"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr "部品表のライン製品は部品表製品と同じではいけません。"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "サブ製品"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "数量タイプ"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "部品表"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "製品数量"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "製品単位"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "部品表"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "参照は会社ごとに固有でなければいけません。"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "サブ製品"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "可変"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "サブ製品"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "オーダー数量は負または0にはできません。"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+"この部品表を使った生産オーダー上にセットされるサブ製品の数量をどのくらいにするかを定義して下さい。固定は、生産オーダーによってどのくらい作成されるのかに関"
+"係なく、作成されるサブ製品の数量は部品表上にセットする数量といつも一致します。反対に可変は、その数量は（部品表上のサブ製品設定の数量 / "
+"部品表情の製造製品設定の数量 * 生産オーダーの製造製品の数量）として計算されます。"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr "エラー。再帰的な部品表を作ることはできません。"
diff --git a/addons/mrp_byproduct/i18n/ko.po b/addons/mrp_byproduct/i18n/ko.po
new file mode 100644
index 00000000000..8c7789a6d7c
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/ko.po
@@ -0,0 +1,136 @@
+# 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: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2009-09-08 16:48+0000\n"
+"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
+"Language-Team: Korean <ko@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "상품"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "하위 상품들"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "하위 상품들"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "상품 수량"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "상품 UOM"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "BoM"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "하위 상품들 (s)"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "MRP 하위 상품"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "MRP  하위 상품"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "유효하지 않은 뷰 아키텍처를 위한 XML !"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자가 포함되면 안됩니다."
diff --git a/addons/mrp_byproduct/i18n/lt.po b/addons/mrp_byproduct/i18n/lt.po
new file mode 100644
index 00000000000..34a30101804
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/lt.po
@@ -0,0 +1,122 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+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: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
diff --git a/addons/mrp_byproduct/i18n/mn.po b/addons/mrp_byproduct/i18n/mn.po
new file mode 100644
index 00000000000..9296c108c55
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/mn.po
@@ -0,0 +1,147 @@
+# Mongolian 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: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2010-08-14 08:43+0000\n"
+"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Бараа"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Тогтсон"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Бүх барааны тоо хэмжээ нь 0-с их байх ёстой.\n"
+"Жорд нэмэлт барааг менеж хийхийг хүсвэл mrp_subproduct модулийн суулгана."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "дэд бараанууд"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Үйлдвэрлэлийн Захиалга"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr "Жорын мөр нь жорын бараатайгаа ижил байж болохгүй."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Дэд Бараанууд"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Тоолох төрөл"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Жор"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Барааны тоо"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Барааны Х.Нэгж"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Материалын тооцоо"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "Код компаний хэмжээнд үл давхцах байх ёстой!"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_products"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Хувьсах"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Дэд Бараа"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "Захиалгын тоо ширхэг нь хасах юмуу тэг байж болохгүй!"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+"Үйлдвэрлэлийн захиалгад жор ашиглан дэд барааны тоо нь хэрхэн тааруулагдахыг "
+"тодорхойлно. 'Тогтмол' гэдэг нь үүсгэгдсэн дэд барааны тоо хэмжээ нь байнга "
+"жорынхтой тэнцээ байхыг илэрхийлнэ. Энэ тохиолдолд үйлдвэрлэлийн захиалгад "
+"хэд гэж тодорхойлогдсон байх нь хамаагүй. Харин 'Хувьсах' гэдэг нь тоо "
+"хэмжээ нь тооцоологдоно. '(Жорын дэд барааны цогцын тоо/жор дахь "
+"үйлдвэрлэгдсэн дэд барааны цогцын тоо * үйлдвэрлэлийн захиалга дахь "
+"үйлдвэрлэгдсэн барааны тоо)'"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr "Алдаа ! Тойрог хамааралтай жор үүсгэж болохгүй."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+#~ "болохгүй!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Дэлгэцийн XML алдаатай!"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Хоёрдогч бүтээгдэхүүн"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "Хоёрдогч бүтээгдэхүүн"
diff --git a/addons/mrp_subproduct/i18n/mrp_subproduct.pot b/addons/mrp_byproduct/i18n/mrp_subproduct.pot
similarity index 100%
rename from addons/mrp_subproduct/i18n/mrp_subproduct.pot
rename to addons/mrp_byproduct/i18n/mrp_subproduct.pot
diff --git a/addons/mrp_byproduct/i18n/nb.po b/addons/mrp_byproduct/i18n/nb.po
new file mode 100644
index 00000000000..328b86235b2
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/nb.po
@@ -0,0 +1,132 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fast"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Alle produktantall må være større en 0.\n"
+"Du bør installere modulen mrp:subproduct hvis du vil håndtere ekstra "
+"produkter på Materiallister !"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "Sub produkter"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Produksjonsordre"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr "Bom linje produktet bør ikke være det samme som BOM produkt."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub produkter."
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Antall Type."
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Materialliste"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Produkt Ant"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Produkt Enhet"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Materialliste"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "Referanse må være unik pr firma!"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "Sub_produkter."
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variabel"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sub produkt."
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "Ordrekvantum kan ikke være negativt eller null!"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+"Definere hvordan mengden av delkomponenter vil bli satt på produksjonsordrer "
+"ved hjelp av denne BOM. 'Fast' beskriver en situasjon der mengden av laget "
+"subproduct er alltid lik mengde sett på BOM, uavhengig av hvor mange som er "
+"skapt i produksjonen rekkefølge. Av motstand, 'variabel' betyr at mengden "
+"vil bli beregnet som '(mengde subproduct satt på BOM / mengde produsert "
+"produkt satt på BOM * mengde produsert produkt i produksjonen rekkefølge.)'"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr "Feil! Du kan ikke lage en rekursive BoM."
diff --git a/addons/mrp_byproduct/i18n/nl.po b/addons/mrp_byproduct/i18n/nl.po
new file mode 100644
index 00000000000..b59764b925d
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/nl.po
@@ -0,0 +1,177 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-02-18 14:58+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Product"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Opgelost"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Alle product hoeveelheden moeten groter zijn dan 0.\n"
+"U kunt de module mrp_subproduct installeren als u gebruik wilt maken van "
+"extra eindproducten bij  een samengesteld product."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "Deel producten"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Productieorder"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+"Grondstoffenregel producten zouden niet hetzelfde moeten zijn als het "
+"samengestelde product"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Deel producten"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Hoeveelheid type"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Samengesteld product"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Aantal"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Product maateenheid"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Stuklijst"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "Referentie moet uniek zijn per bedrijf!"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "Deelproducten"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variabele"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Bijproduct"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "Order hoeveelheid mag niet negatief of nul zijn!"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+"Geef aan hoe de hoeveelheid deelproducten zal worden ingesteld op de "
+"productieorders met behulp van deze grondstoffenlijst. 'Vaste' geeft een "
+"situatie aan waarbij de hoeveelheid aangemaakt subproduct gelijk is aan de "
+"hoeveelheid set op de grondstoffenlijst, ongeacht hoeveel er gemaakt zijn in "
+"de productieorder. Tegenovergesteld is, 'Variabel'. Dit betekent dat de "
+"hoeveelheid wordt berekend als '(hoeveelheid subproduct ingesteld op de "
+"grondstoffenlijst/hoeveelheid van de vervaardigde producten ingesteld op de "
+"grondstoffenlijst* hoeveelheid vervaardigde product in de productieorder.)'"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+"Fout! het is niet toegestaan een recursieve grondstoffenlijst te maken"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor overzicht"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Mrp Deelproduct"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "MRP Subproduct"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Met deze module kunt u meerdere producten prouceren vanuit een "
+#~ "productieorder.\n"
+#~ "Je can bijproducten configureren in de materiaallijst.\n"
+#~ "Zonder deze module:\n"
+#~ "    A + B + C -> D\n"
+#~ "Met deze module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "Order aantal kan niet negatief of nul zijn !"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "Fout! Onmogelijk om een recursief samengesteldproduct aan te maken."
diff --git a/addons/mrp_byproduct/i18n/nl_BE.po b/addons/mrp_byproduct/i18n/nl_BE.po
new file mode 100644
index 00000000000..26073a1c465
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/nl_BE.po
@@ -0,0 +1,127 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2009-04-10 08:37+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
diff --git a/addons/mrp_byproduct/i18n/oc.po b/addons/mrp_byproduct/i18n/oc.po
new file mode 100644
index 00000000000..b56078ac176
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/oc.po
@@ -0,0 +1,129 @@
+# Occitan (post 1500) 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: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2010-08-03 08:11+0000\n"
+"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produch"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Nomenclatura"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variabla"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invalid per l'arquitectura de la vista"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Components per MRP"
diff --git a/addons/mrp_byproduct/i18n/pl.po b/addons/mrp_byproduct/i18n/pl.po
new file mode 100644
index 00000000000..15ade180f53
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/pl.po
@@ -0,0 +1,137 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2009-11-17 07:11+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "produkty uboczne"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Produkty uboczne"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Ilość produktu"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "JM produktu"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Zest. Mat."
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+#~ "specjalnych !"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Produkt uboczny MRP"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "Produkt uboczny MRP"
diff --git a/addons/mrp_byproduct/i18n/pt.po b/addons/mrp_byproduct/i18n/pt.po
new file mode 100644
index 00000000000..0c55abf9d8b
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/pt.po
@@ -0,0 +1,179 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2011-11-09 17:33+0000\n"
+"Last-Translator: Daniel Reis (SECURITAS SA) <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Artigo"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Corrigido"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Todas as quantidades do artigo devem ser maiores que 0. \n"
+"Deve instalar o módulo mrp_subproduct se quiser gerir artigos extra em BoMs!"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "sub artigos"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Ordem de produção"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr "Linha do artigo BoM não deve ser a mesma do artigo BoM."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub Artigos"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tipo de Quantidade"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Fatura do Material"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Quantidade do Artigo"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "UdM do Artigo"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "BoM"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "A referência deve ser única por empresa!"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_products"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variável"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sub Artigo"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "A quantidade da ordem não pode ser negativa nem zero!"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+"Definir como a quantidade de subartigos será definida nas ordens de produção "
+"que utilizam este BoM. 'Fixo' descreve uma situação em que a quantidade do "
+"sub artigo criado é sempre igual à quantidade definida na BoM, "
+"independentemente de quantas são criadas na ordem de produção. Por oposição, "
+"'Variável' significa que a quantidade será calculada como '(quantidade do "
+"sub artigo definida no BoM / quantidade do artigo fabricado para definir o "
+"BoM * quantidade do artigo fabricado na ordem de produção.)'"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr "Erro ! Não pode criar um BoM recursivo."
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Sub Produto MRP"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "Sub Produto MRP"
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr ""
+#~ "MRP Subproduto - Para criar diversos produtos a partir de uma só ordem de "
+#~ "produção"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML inválido para a arquitetura de vista"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do Objeto deve começar com x_ e não pode conter nenhum caracter "
+#~ "especial!"
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "A quantidade numa encomenda não pode ser igual ou inferior a zero!"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "Erro ! Você não pode criar um BoM."
diff --git a/addons/mrp_byproduct/i18n/pt_BR.po b/addons/mrp_byproduct/i18n/pt_BR.po
new file mode 100644
index 00000000000..9c080372bda
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/pt_BR.po
@@ -0,0 +1,148 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2011-01-24 12:36+0000\n"
+"Last-Translator: Adriano Prado <adrianojprado@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: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produto"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fixado"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Todas as quantidades de produto devem ser maiores que 0.\n"
+"Você deve instalar o módulo mrp_subproduct se você deseja gerenciar produtos "
+"extras nas LdMs."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "Subprodutos"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Ordem de Produção"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr "Produtos de linha BoM não devem ser os mesmo que produtos BoM"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub Produtos"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tipo de Quantidade"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Lista de Materiais"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Qtd do Produto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "UdM do Produto"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Lista de Material (BoM)"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "A referência deve ser única por empresa!"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_produtos"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variável"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sub Produto"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "A quantidade do pedido não pode ser negativa ou zero!"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+"Definir como a quantidade de subprodutos será definido em ordens de produção "
+"que utilizam este BoM. 'Fixo' retrata uma situação em caso de a quantidade "
+"de subproduto criado é sempre definido igual à quantidade no BOM, "
+"Independentemente de quantos são criados na ordem de saída. Por outro lado, "
+"'Variável' significa que essa será a quantidade calculada como \"(quantidade "
+"de conjunto subproduto no. BoM / quantidade de produto fabricado definido na "
+"quantidade de produto BoM * Fabricado na Ordem de Produção)\""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+"Erro! Você nao pode criar uma lista de materiais (BoM) recursivamente"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalido XML para Arquitetura da View"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
+#~ "especial!"
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "Quantidade da Ordem não pode ser negativa ou zero !"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "Erro! Você não pode criar uma lista de materiais recursiva"
diff --git a/addons/mrp_byproduct/i18n/ro.po b/addons/mrp_byproduct/i18n/ro.po
new file mode 100644
index 00000000000..5b4651e67a8
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/ro.po
@@ -0,0 +1,167 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2009-09-08 16:33+0000\n"
+"Last-Translator: filsys <office@filsystem.ro>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produs"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fix"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Toate cantitatile de produse trebuie sa fie mai mari decat 0.\n"
+"Trebuie sa instalati modulul mrp_subproduct daca doriti sa gestionati "
+"produse suplimentare in LdM!"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "subproduse"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Comanda de productie"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+"Linia produsului din LdM nu ar trebui sa fie la fel ca si cea din LdM produs."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub Produse"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tipul cantitatii"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Lista de Materiale"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Cantitate Produs"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "UdeM a Produsului"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "LdM"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "Referinta trebuie sa fie unica per Companie!"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_produse"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variabil(a)"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sub Produs"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "Cantitatea comandata nu poate fi negativa sau zero!"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+"Defineste modul in care cantitatea de subproduse va fi configurata in "
+"comenzile de productie folosind LdM. 'Fix' reprezinta o situatie in care "
+"cantitatea subprodusului creat este intotdeauna egala cu cantitatea "
+"configurata in LdM, indiferent de cat de multe sunt create in comanda de "
+"productie. In opozitie, 'Variabil' inseamna ca, cantitatea va fi calculata "
+"drept '(cantitatea subprodusului configurat in LdM / cantitatea produsului "
+"fabricat configurata in LdM * cantitatea produsului fabricat in comanda de "
+"productie.)'"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr "Eroare ! Nu puteti crea LdM recursive."
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Acest modul vă permite să produceti mai multe produse dintr-o singură "
+#~ "comandă de productie.\n"
+#~ "Puteti configura sub-produse in lista de materiale.\n"
+#~ "Fără acest modul:\n"
+#~ "    A + B + C -> D\n"
+#~ "Cu acest modul:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr ""
+#~ "Sub Product MRP - Pentru a produce mai multe produse dintr-o comandă de "
+#~ "productie"
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "Cantitatea comandată nu poate fi negativă sau zero !"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "Eroare ! Nu puteţi crea o LdM recursivă."
diff --git a/addons/mrp_byproduct/i18n/ru.po b/addons/mrp_byproduct/i18n/ru.po
new file mode 100644
index 00000000000..8643b2f11d1
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/ru.po
@@ -0,0 +1,137 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2011-04-06 06:04+0000\n"
+"Last-Translator: Viktor Prokopiev <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Продукция"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Фиксированный"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Производственный заказ"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Ведомость материалов"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Кол-во продукции"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Ед. изм. продукции"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_products"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Переменный"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильный XML для просмотра архитектуры!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
+#~ "символов !"
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "Кол-во в заказе не может быть отрицательным или нулевым !"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "Ошибка ! Невозможно создать рекурсивную спецификацию."
diff --git a/addons/mrp_byproduct/i18n/sk.po b/addons/mrp_byproduct/i18n/sk.po
new file mode 100644
index 00000000000..80316bb40e4
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/sk.po
@@ -0,0 +1,126 @@
+# Slovak 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: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2010-08-03 09:01+0000\n"
+"Last-Translator: Radoslav Sloboda <rado.sloboda@gmail.com>\n"
+"Language-Team: Slovak <sk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Pevný"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Množstvo produktov"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Premenná"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neplatná XML pre zobrazenie architektúry!"
diff --git a/addons/mrp_byproduct/i18n/sl.po b/addons/mrp_byproduct/i18n/sl.po
new file mode 100644
index 00000000000..1daae54756c
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/sl.po
@@ -0,0 +1,136 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2010-11-26 23:12+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Stalno"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "polproizvodi"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Naročilnica za proizvodnjo"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Polproizvod"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Vrsta količine"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Kosovnica"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Količina proizvodov"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "ME proizvoda"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "kosovnica"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "polproizvod"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Spremenljivka"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Del proizvoda"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Načrtovanje virov materiala za polproizvod"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "Načrtovanje virov materiala za polproizvod"
diff --git a/addons/mrp_byproduct/i18n/sq.po b/addons/mrp_byproduct/i18n/sq.po
new file mode 100644
index 00000000000..b6b0b4994b1
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/sq.po
@@ -0,0 +1,132 @@
+# Albanian 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: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2010-08-02 14:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Albanian <sq@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produkti"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "E rregulluar"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "nënproduktet"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Nënproduktet"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Lloji i kuantitetit"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Kuantiteti i produktit"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Të ndryshme"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Emri i objektit duhet të fillojë me x_ dhe nuk duhet të përmbajë shkronja të "
+#~ "veçanta."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Kodi XML është i pasaktë për të shfaqur arkitekturën ndërtuese"
diff --git a/addons/mrp_byproduct/i18n/sr.po b/addons/mrp_byproduct/i18n/sr.po
new file mode 100644
index 00000000000..0f490d35dcd
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/sr.po
@@ -0,0 +1,143 @@
+# Serbian 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: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2010-11-04 08:53+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fiksno"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "pod proizvodi"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Zahtev Proizvodnje"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Pod proizvodi"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tip Kolicine"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Racun Materijala"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Kol, Proizvoda"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "JM proizvoda"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "BoM"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "pod_proizvod"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Promjenljiva"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "SubProizvod"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za pregled arhitekture"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Mrp Pod Proizvod"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "MRP Pod Proizvod"
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr ""
+#~ "MRP SubProizvod- Za Proizvodnju nekoliko proizvoda iz jednog proizvodnog "
+#~ "zahteva"
diff --git a/addons/mrp_byproduct/i18n/sr@latin.po b/addons/mrp_byproduct/i18n/sr@latin.po
new file mode 100644
index 00000000000..ff29f099431
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/sr@latin.po
@@ -0,0 +1,143 @@
+# Serbian latin 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: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2010-12-23 15:56+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian latin <sr@latin@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fiksno"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "pod proizvodi"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Zahtev Proizvodnje"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Pod proizvodi"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Tip Kvantiteta"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Racun Materijala"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Kol, Proizvoda"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "JM proizvoda"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "BoM"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "pod_proizvod"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Promjenljiva"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "SubProizvod"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Nevažeći XML za pregled arhitekture"
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr ""
+#~ "MRP SubProizvod- Za Proizvodnju nekoliko proizvoda iz jednog proizvodnog "
+#~ "zahteva"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "Mrp Pod Proizvod"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "MRP Pod Proizvod"
diff --git a/addons/mrp_byproduct/i18n/sv.po b/addons/mrp_byproduct/i18n/sv.po
new file mode 100644
index 00000000000..23a980d1999
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/sv.po
@@ -0,0 +1,136 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.14\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2010-11-23 09:34+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Rättad"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Alla produktmängder måste vara större än 0.\n"
+"Du bör installera mrp_subproduct modulen om du vill hantera extra produkter "
+"på BoM:arna!"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "Produktstruktur"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Produktionsorder"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Produktstruktur"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Materiallista"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Produktkvantitet"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Produktenhet"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Materiallista"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "Referensen måste vara unik per bolag!"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "sub_products"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variabel"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Komponent"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "Orderkvantitet kan inte vara negativt eller noll!"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr "Fel ! Du kan inte skapa rekursiva materiallistor."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Felaktig XML för Vyarkitektur!"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "MRP Sub Product"
diff --git a/addons/mrp_byproduct/i18n/tlh.po b/addons/mrp_byproduct/i18n/tlh.po
new file mode 100644
index 00000000000..ed8b7e4818f
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/tlh.po
@@ -0,0 +1,122 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+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: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
diff --git a/addons/mrp_byproduct/i18n/tr.po b/addons/mrp_byproduct/i18n/tr.po
new file mode 100644
index 00000000000..eac7e3e5c98
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/tr.po
@@ -0,0 +1,168 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-01-23 22:32+0000\n"
+"Last-Translator: Ahmet Altınışık <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Ürün"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Sabitlendi"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Tüm ürün miktarları 0'dan büyük olmalıdır.\n"
+"BoM üzerinde ekstra ürünleri yönetmek istiyorsanız mrp_subproduct modülünü "
+"kurmanız gerekir!"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "Alt Ürünler"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Üretim Emri"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr "BoM satırındaki ürün BoM ürünü ile aynı olamaz."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Alt Ürünler"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Miktar Tipi"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Malzeme Faturası"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Ürün Mik."
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Birim"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "BoM (Malzeme Faturası)"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "Referans her şirket için tekil olmalı!"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "Alt_Ürünler"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Değişken"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Alt Ürün"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "Sipariş adedi negatif ya da sıfır olamaz!"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+"Yanürünlerin miktarının Gereç Listeleri ni kullanarak üretim emirlerinde "
+"nasıl ayarlanacağını tanımlayın. 'Sabit', oluşturulan yanürün miktarının, "
+"sipariş emrinde kaç tane oluşturulduğuna bakılmaksızın,  her zaman Gereç "
+"Listesinde ayarlanan miktara eşit olduğunu belirtir. Buna karşın, 'Değişken' "
+"ise miktarın şu şekilde hesaplanağı anlamına gelir '(Gereç Listesinde "
+"ayarlanan yanürün miktarı / Gereç Listesinde ayarlanan üretim miktarı * "
+"üretim emrindeki üretilen ürün miktarı.)'"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr "Hata ! Kendini İçeren  BoM oluşturamazsınız."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "MRP Alt Ürünü"
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr "MRP Alt Ürünü - Bir üretim emrinden birden fazla ürün üretimi için"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "Bu modül, bir üretim emrinden birden fazla ürün üretmenize olanak sağlar.\n"
+#~ "Malzeme faturasında alt-ürünleri yapılandırabilirsiniz.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "Bu modül ile:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "Hata! Yinelemeli BoM oluşturamazsınız."
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "Sipariş miktarı negatif veya sıfır olamaz!"
diff --git a/addons/mrp_byproduct/i18n/uk.po b/addons/mrp_byproduct/i18n/uk.po
new file mode 100644
index 00000000000..ae23206bb87
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/uk.po
@@ -0,0 +1,130 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2009-09-08 14:38+0000\n"
+"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Неправильний XML для Архітектури Вигляду!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
diff --git a/addons/mrp_byproduct/i18n/vi.po b/addons/mrp_byproduct/i18n/vi.po
new file mode 100644
index 00000000000..24eb28359b9
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/vi.po
@@ -0,0 +1,123 @@
+# 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: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2010-08-02 14:27+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
diff --git a/addons/mrp_byproduct/i18n/zh_CN.po b/addons/mrp_byproduct/i18n/zh_CN.po
new file mode 100644
index 00000000000..9a2adfa33c8
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/zh_CN.po
@@ -0,0 +1,169 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-06-14 05:53+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "产品"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "固定的"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"所有产品的数量必须大于0。\n"
+"如果需要管理带副产品的BOM请安装 mrp_subproduct 模块"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "副产品"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "生产单"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr "部件不应该是成品本身"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "副产品"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "数量类型"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "物料清单"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "产品数量"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "产品计量单位"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "物料清单"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "编号必须在公司内唯一！"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "副产品"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "可变的"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "副产品"
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "订单数量不能是负数或者0！"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+"定义使用这个BOM的生产订单上子产品的数量计算规则。”固定“意味着产出的子产品总是等于物料清单上的数量。相反的，”可变“意味着子产品的产出数量 =  "
+"物料清单上子产品的数量 / 物料清单上产成品的数量 * 生产订单上产成品的数量"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr "错误！你不能创建循环引用的物料清单。"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "无效XML视图结构!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "对象名必须要以X_开头并且不能含有特殊字符!"
+
+#~ msgid ""
+#~ "\n"
+#~ "This module allows you to produce several products from one production "
+#~ "order.\n"
+#~ "You can configure sub-products in the bill of material.\n"
+#~ "Without this module:\n"
+#~ "    A + B + C -> D\n"
+#~ "With this module:\n"
+#~ "    A + B + C -> D + E\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "这模块允许你在一个生产单有几个要生产的产品\n"
+#~ "    你能在物料清单中确认子产品.\n"
+#~ "    没有这模块:\n"
+#~ "\tA + B + C -> D\n"
+#~ "     有这模块:\n"
+#~ "\tA + B + C -> D + E\n"
+#~ "    "
+
+#~ msgid "Mrp Sub Product"
+#~ msgstr "物料需求计划子产品"
+
+#~ msgid "MRP Sub Product"
+#~ msgstr "物料需求计划子产品"
+
+#~ msgid ""
+#~ "MRP Sub Product - To produce several products from one production order"
+#~ msgstr "MRP副产品 - 一张生产单产出多种产品"
+
+#~ msgid "Order quantity cannot be negative or zero !"
+#~ msgstr "订单数量不能为0或者负数!"
+
+#~ msgid "Error ! You can not create recursive BoM."
+#~ msgstr "错误!你不能创建递归的物料清单"
diff --git a/addons/mrp_byproduct/i18n/zh_TW.po b/addons/mrp_byproduct/i18n/zh_TW.po
new file mode 100644
index 00000000000..d0df115fc17
--- /dev/null
+++ b/addons/mrp_byproduct/i18n/zh_TW.po
@@ -0,0 +1,122 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* mrp_subproduct
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.4\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2009-01-23 17:18+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-19 05:25+0000\n"
+"X-Generator: Launchpad (build 16165)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr ""
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr ""
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr ""
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr ""
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr ""
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr ""
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_byproduct/mrp_byproduct.py
similarity index 84%
rename from addons/mrp_subproduct/mrp_subproduct.py
rename to addons/mrp_byproduct/mrp_byproduct.py
index bacdeb2c675..9caf626834a 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_byproduct/mrp_byproduct.py
@@ -22,6 +22,7 @@
 from osv import fields
 from osv import osv
 import decimal_precision as dp
+from tools.translate import _
 
 class mrp_subproduct(osv.osv):
     _name = 'mrp.subproduct'
@@ -30,10 +31,10 @@ class mrp_subproduct(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'product_qty': fields.float('Product Qty', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
-        'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True, help="Define how the quantity of subproducts will be set on the production orders using this BoM.\
-  'Fixed' depicts a situation where the quantity of created subproduct is always equal to the quantity set on the BoM, regardless of how many are created in the production order.\
+        'subproduct_type': fields.selection([('fixed','Fixed'),('variable','Variable')], 'Quantity Type', required=True, help="Define how the quantity of byproducts will be set on the production orders using this BoM.\
+  'Fixed' depicts a situation where the quantity of created byproduct is always equal to the quantity set on the BoM, regardless of how many are created in the production order.\
   By opposition, 'Variable' means that the quantity will be computed as\
-    '(quantity of subproduct set on the BoM / quantity of manufactured product set on the BoM * quantity of manufactured product in the production order.)'"),
+    '(quantity of byproduct set on the BoM / quantity of manufactured product set on the BoM * quantity of manufactured product in the production order.)'"),
         'bom_id': fields.many2one('mrp.bom', 'BoM'),
     }
     _defaults={
@@ -51,6 +52,17 @@ class mrp_subproduct(osv.osv):
             return {'value': v}
         return {}
 
+    def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
+        res = {'value':{}}
+        if not product_uom or not product_id:
+            return res
+        product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+        uom = self.pool.get('product.uom').browse(cr, uid, product_uom, context=context)
+        if uom.category_id.id != product.uom_id.category_id.id:
+            res['warning'] = {'title': _('Warning'), 'message': _('The Product Unit of Measure you chose has a different category than in the product form.')}
+            res['value'].update({'product_uom': product.uom_id.id})
+        return res
+
 mrp_subproduct()
 
 class mrp_bom(osv.osv):
@@ -59,7 +71,7 @@ class mrp_bom(osv.osv):
     _inherit='mrp.bom'
 
     _columns={
-        'sub_products':fields.one2many('mrp.subproduct', 'bom_id', 'sub_products'),
+        'sub_products':fields.one2many('mrp.subproduct', 'bom_id', 'Byproducts'),
     }
 
 mrp_bom()
@@ -106,7 +118,7 @@ class mrp_production(osv.osv):
     def _get_subproduct_factor(self, cr, uid, production_id, move_id=None, context=None):
         """Compute the factor to compute the qty of procucts to produce for the given production_id. By default, 
             it's always equal to the quantity encoded in the production order or the production wizard, but with 
-            the module mrp_subproduct installed it can differ for subproducts having type 'variable'.
+            the module mrp_byproduct installed it can differ for byproducts having type 'variable'.
         :param production_id: ID of the mrp.order
         :param move_id: ID of the stock move that needs to be produced. Identify the product to produce.
         :return: The factor to apply to the quantity that we should produce for the given production order and stock move.
diff --git a/addons/mrp_subproduct/mrp_subproduct_view.xml b/addons/mrp_byproduct/mrp_byproduct_view.xml
similarity index 70%
rename from addons/mrp_subproduct/mrp_subproduct_view.xml
rename to addons/mrp_byproduct/mrp_byproduct_view.xml
index 94da87ef0de..32e8a696369 100644
--- a/addons/mrp_subproduct/mrp_subproduct_view.xml
+++ b/addons/mrp_byproduct/mrp_byproduct_view.xml
@@ -7,17 +7,17 @@
             <field name="inherit_id" ref="mrp.mrp_bom_form_view"/>
             <field name="arch" type="xml">
              <notebook position="inside">
-                 <page string="Sub Products" position="inside">
+                 <page string="Byproducts" position="inside">
                      <field name="sub_products">
-                         <tree string="sub products"  editable="top">
+                         <tree string="Byproducts"  editable="top">
                              <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                             <field name="product_uom" groups="product.group_uom"/>
+                             <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
                              <field name="product_qty"/>
                              <field name="subproduct_type"/>
                          </tree>
-                         <form string="Sub Products">
+                         <form string="Byproducts">
                              <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                             <field name="product_uom" groups="product.group_uom"/>
+                             <field name="product_uom" on_change="onchange_uom(product_id, product_uom)" groups="product.group_uom"/>
                              <field name="product_qty"/>
                              <field name="subproduct_type"/>
                          </form>
diff --git a/addons/mrp_subproduct/security/ir.model.access.csv b/addons/mrp_byproduct/security/ir.model.access.csv
similarity index 100%
rename from addons/mrp_subproduct/security/ir.model.access.csv
rename to addons/mrp_byproduct/security/ir.model.access.csv
diff --git a/addons/mrp_subproduct/test/mrp_subproduct.yml b/addons/mrp_byproduct/test/mrp_byproduct.yml
similarity index 91%
rename from addons/mrp_subproduct/test/mrp_subproduct.yml
rename to addons/mrp_byproduct/test/mrp_byproduct.yml
index 99da9f22baf..2b5fc68406e 100644
--- a/addons/mrp_subproduct/test/mrp_subproduct.yml
+++ b/addons/mrp_byproduct/test/mrp_byproduct.yml
@@ -1,6 +1,6 @@
 -
-  In order to test mrp_subproduct with OpenERP, I add subproduct in bill of material.
-  I make a production order, confirm it so stock moves for subproducts are generated.
+  In order to test mrp_byproduct with OpenERP, I add byproduct in bill of material.
+  I make a production order, confirm it so stock moves for byproducts are generated.
 -
   I add a sub product in Bill of material for product External Hard Disk.
 -
@@ -37,7 +37,7 @@
   !assert {model: mrp.production, id: mrp_production_mo0, severity: error, string: Production order should be in state confirmed}:
     - state == 'confirmed'
 -
-  Now I check the stock moves for the subproduct I created in the bill of material.
+  Now I check the stock moves for the byproduct I created in the bill of material.
   This move is created automatically when I confirmed the production order.
 -
   !python {model: stock.move}: |
diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py
index ee00ac703cb..9df8ab9908b 100644
--- a/addons/mrp_jit/__openerp__.py
+++ b/addons/mrp_jit/__openerp__.py
@@ -40,11 +40,10 @@ In that case, you can not use priorities any more on the different picking.
     """,
     'author': 'OpenERP SA',
     'depends': ['procurement'],
-    'update_xml': ['mrp_jit.xml'],
-    'demo_xml': [],
+    'data': ['mrp_jit.xml'],
+    'demo': [],
     'test': ['test/mrp_jit.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0086634760061',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_jit/i18n/ar.po b/addons/mrp_jit/i18n/ar.po
index 0c6682c9bc7..ac516f7f35b 100644
--- a/addons/mrp_jit/i18n/ar.po
+++ b/addons/mrp_jit/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/bg.po b/addons/mrp_jit/i18n/bg.po
index 3a87d759e3c..dea16c5393b 100644
--- a/addons/mrp_jit/i18n/bg.po
+++ b/addons/mrp_jit/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/bs.po b/addons/mrp_jit/i18n/bs.po
index faab11b32d5..3c16eabe3f8 100644
--- a/addons/mrp_jit/i18n/bs.po
+++ b/addons/mrp_jit/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/ca.po b/addons/mrp_jit/i18n/ca.po
index 467e46c9082..8c1f7e24a67 100644
--- a/addons/mrp_jit/i18n/ca.po
+++ b/addons/mrp_jit/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/cs.po b/addons/mrp_jit/i18n/cs.po
index f88805c6b72..77570594dff 100644
--- a/addons/mrp_jit/i18n/cs.po
+++ b/addons/mrp_jit/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/da.po b/addons/mrp_jit/i18n/da.po
index 5b00f155b5e..2d324da46e9 100644
--- a/addons/mrp_jit/i18n/da.po
+++ b/addons/mrp_jit/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/de.po b/addons/mrp_jit/i18n/de.po
index f7bb4b6607f..a16e6e1ec6b 100644
--- a/addons/mrp_jit/i18n/de.po
+++ b/addons/mrp_jit/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/el.po b/addons/mrp_jit/i18n/el.po
index 271fb8a3834..8c417168dd5 100644
--- a/addons/mrp_jit/i18n/el.po
+++ b/addons/mrp_jit/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/mrp_jit/i18n/es.po b/addons/mrp_jit/i18n/es.po
index addd50239a8..dd5becda64f 100644
--- a/addons/mrp_jit/i18n/es.po
+++ b/addons/mrp_jit/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/es_AR.po b/addons/mrp_jit/i18n/es_AR.po
index 2732765feea..b876ac5783d 100644
--- a/addons/mrp_jit/i18n/es_AR.po
+++ b/addons/mrp_jit/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/es_CR.po b/addons/mrp_jit/i18n/es_CR.po
index bbad1816919..b118d24c955 100644
--- a/addons/mrp_jit/i18n/es_CR.po
+++ b/addons/mrp_jit/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_jit/i18n/es_EC.po b/addons/mrp_jit/i18n/es_EC.po
index 3a502305280..9c945c523f8 100644
--- a/addons/mrp_jit/i18n/es_EC.po
+++ b/addons/mrp_jit/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/et.po b/addons/mrp_jit/i18n/et.po
index 9f309c74d58..bcfdb4720a6 100644
--- a/addons/mrp_jit/i18n/et.po
+++ b/addons/mrp_jit/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/fi.po b/addons/mrp_jit/i18n/fi.po
index bc4150abac7..1a2e0f7abb2 100644
--- a/addons/mrp_jit/i18n/fi.po
+++ b/addons/mrp_jit/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/fr.po b/addons/mrp_jit/i18n/fr.po
index e583884d23b..0d5f1017908 100644
--- a/addons/mrp_jit/i18n/fr.po
+++ b/addons/mrp_jit/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/gl.po b/addons/mrp_jit/i18n/gl.po
index 4d914d15abe..a37ad0ab481 100644
--- a/addons/mrp_jit/i18n/gl.po
+++ b/addons/mrp_jit/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/hr.po b/addons/mrp_jit/i18n/hr.po
index ad7efdaa535..93295356ebb 100644
--- a/addons/mrp_jit/i18n/hr.po
+++ b/addons/mrp_jit/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/hu.po b/addons/mrp_jit/i18n/hu.po
index c79f867beb1..1d9600226dc 100644
--- a/addons/mrp_jit/i18n/hu.po
+++ b/addons/mrp_jit/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/id.po b/addons/mrp_jit/i18n/id.po
index 2fd4478cf95..8a6a301d6ea 100644
--- a/addons/mrp_jit/i18n/id.po
+++ b/addons/mrp_jit/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/it.po b/addons/mrp_jit/i18n/it.po
index 1b36adc4d2b..fefa14629cf 100644
--- a/addons/mrp_jit/i18n/it.po
+++ b/addons/mrp_jit/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/ja.po b/addons/mrp_jit/i18n/ja.po
index 60c7037307a..a70a788e345 100644
--- a/addons/mrp_jit/i18n/ja.po
+++ b/addons/mrp_jit/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/kab.po b/addons/mrp_jit/i18n/kab.po
index 3908d1e4de6..5e4fbe8ba12 100644
--- a/addons/mrp_jit/i18n/kab.po
+++ b/addons/mrp_jit/i18n/kab.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/ko.po b/addons/mrp_jit/i18n/ko.po
index c92e58d6a1e..73b255e61dc 100644
--- a/addons/mrp_jit/i18n/ko.po
+++ b/addons/mrp_jit/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/lt.po b/addons/mrp_jit/i18n/lt.po
index eb2dd2abafe..df85a4ecf72 100644
--- a/addons/mrp_jit/i18n/lt.po
+++ b/addons/mrp_jit/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/ml.po b/addons/mrp_jit/i18n/ml.po
index 99dae32372b..5cc572565ec 100644
--- a/addons/mrp_jit/i18n/ml.po
+++ b/addons/mrp_jit/i18n/ml.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/mn.po b/addons/mrp_jit/i18n/mn.po
index 1c376af608a..96cc59a95ef 100644
--- a/addons/mrp_jit/i18n/mn.po
+++ b/addons/mrp_jit/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/nb.po b/addons/mrp_jit/i18n/nb.po
index 1503ab7fa3e..6c35ec576a4 100644
--- a/addons/mrp_jit/i18n/nb.po
+++ b/addons/mrp_jit/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/nl.po b/addons/mrp_jit/i18n/nl.po
index 14478c33041..ee469d64119 100644
--- a/addons/mrp_jit/i18n/nl.po
+++ b/addons/mrp_jit/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/nl_BE.po b/addons/mrp_jit/i18n/nl_BE.po
index 54dff44ba01..f5d6c561916 100644
--- a/addons/mrp_jit/i18n/nl_BE.po
+++ b/addons/mrp_jit/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/oc.po b/addons/mrp_jit/i18n/oc.po
index 508d97296e8..32e57e0eb73 100644
--- a/addons/mrp_jit/i18n/oc.po
+++ b/addons/mrp_jit/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/pl.po b/addons/mrp_jit/i18n/pl.po
index 190fa3dfe95..fd76bc32987 100644
--- a/addons/mrp_jit/i18n/pl.po
+++ b/addons/mrp_jit/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/pt.po b/addons/mrp_jit/i18n/pt.po
index d6782cbe7bc..b878e481bdd 100644
--- a/addons/mrp_jit/i18n/pt.po
+++ b/addons/mrp_jit/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/pt_BR.po b/addons/mrp_jit/i18n/pt_BR.po
index 5d17a0aad2c..18ac0e036ac 100644
--- a/addons/mrp_jit/i18n/pt_BR.po
+++ b/addons/mrp_jit/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/ro.po b/addons/mrp_jit/i18n/ro.po
index 8eb7de9d617..5a0a6523b74 100644
--- a/addons/mrp_jit/i18n/ro.po
+++ b/addons/mrp_jit/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/ru.po b/addons/mrp_jit/i18n/ru.po
index 13b445f1a5b..c4404a3b7c5 100644
--- a/addons/mrp_jit/i18n/ru.po
+++ b/addons/mrp_jit/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/sk.po b/addons/mrp_jit/i18n/sk.po
index b851a9eef29..211aa39381a 100644
--- a/addons/mrp_jit/i18n/sk.po
+++ b/addons/mrp_jit/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/sl.po b/addons/mrp_jit/i18n/sl.po
index 59e047adeb5..8527b96e315 100644
--- a/addons/mrp_jit/i18n/sl.po
+++ b/addons/mrp_jit/i18n/sl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-11-27 05:28+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-11-18 21:54+0000\n"
+"Last-Translator: Dusan Laznik <laznik@mentis.si>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-11-19 04:37+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
@@ -46,3 +46,24 @@ msgid ""
 "    \n"
 "    "
 msgstr ""
+"\n"
+"    This module allows Just In Time computation of procurement orders.\n"
+"\n"
+"    If you install this module, you will not have to run the regular "
+"procurement \n"
+"    scheduler anymore (but you still need to run the minimum order point "
+"rule \n"
+"    scheduler, or for example let it run daily.)\n"
+"    All procurement orders will be processed immediately, which could in "
+"some\n"
+"    cases entail a small performance impact.\n"
+"\n"
+"    It may also increase your stock size because products are reserved as "
+"soon\n"
+"    as possible and the scheduler time range is not taken into account "
+"anymore. \n"
+"    In that case, you can not use priorities any more on the different "
+"picking.\n"
+"    \n"
+"    \n"
+"    "
diff --git a/addons/mrp_jit/i18n/sq.po b/addons/mrp_jit/i18n/sq.po
index 0aa329d1ca1..7b7f3d74359 100644
--- a/addons/mrp_jit/i18n/sq.po
+++ b/addons/mrp_jit/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/sr.po b/addons/mrp_jit/i18n/sr.po
index 81b6622aaa3..6362d261ab2 100644
--- a/addons/mrp_jit/i18n/sr.po
+++ b/addons/mrp_jit/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/sr@latin.po b/addons/mrp_jit/i18n/sr@latin.po
index fb37b8574b8..0440603a7bb 100644
--- a/addons/mrp_jit/i18n/sr@latin.po
+++ b/addons/mrp_jit/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/sv.po b/addons/mrp_jit/i18n/sv.po
index c004b69400d..f05f4214912 100644
--- a/addons/mrp_jit/i18n/sv.po
+++ b/addons/mrp_jit/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/ta.po b/addons/mrp_jit/i18n/ta.po
index 427bfb1c3a8..d3440d97eab 100644
--- a/addons/mrp_jit/i18n/ta.po
+++ b/addons/mrp_jit/i18n/ta.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/tr.po b/addons/mrp_jit/i18n/tr.po
index dd2239fe4c9..c9c18abaf16 100644
--- a/addons/mrp_jit/i18n/tr.po
+++ b/addons/mrp_jit/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/uk.po b/addons/mrp_jit/i18n/uk.po
index 82f9dd9d966..156e5db5816 100644
--- a/addons/mrp_jit/i18n/uk.po
+++ b/addons/mrp_jit/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/vi.po b/addons/mrp_jit/i18n/vi.po
index 0e5c7d7c224..b4201d926cc 100644
--- a/addons/mrp_jit/i18n/vi.po
+++ b/addons/mrp_jit/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/zh_CN.po b/addons/mrp_jit/i18n/zh_CN.po
index 7804a7f8659..aaf220ba59c 100644
--- a/addons/mrp_jit/i18n/zh_CN.po
+++ b/addons/mrp_jit/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_jit/i18n/zh_TW.po b/addons/mrp_jit/i18n/zh_TW.po
index aac69710050..9cbff98eaa4 100644
--- a/addons/mrp_jit/i18n/zh_TW.po
+++ b/addons/mrp_jit/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py
index 25446456dec..7fedb426edd 100644
--- a/addons/mrp_operations/__openerp__.py
+++ b/addons/mrp_operations/__openerp__.py
@@ -25,7 +25,7 @@
     'version': '1.0',
     'category': 'Manufacturing',
     'description': """
-This module adds state, date_start, date_stop in manufacturing order operation lines (in the "Work Orders" tab).
+This module adds state, date_start, date_stop in manufacturing order operation lines (in the 'Work Orders' tab).
 ================================================================================================================
 
 Status: draft, confirm, done, cancel
@@ -33,17 +33,19 @@ When finishing/confirming, cancelling manufacturing orders set all state lines
 to the according state.
 
 Create menus:
-    Manufacturing > Manufacturing > Work Orders
+-------------
+    **Manufacturing** > **Manufacturing** > **Work Orders**
 
-Which is a view on "Work Orders" lines in manufacturing order.
+Which is a view on 'Work Orders' lines in manufacturing order.
 
 Add buttons in the form view of manufacturing order under workorders tab:
+-------------------------------------------------------------------------
     * start (set state to confirm), set date_start
     * done (set state to done), set date_stop
     * set to draft (set state to draft)
     * cancel set state to cancel
 
-When the manufacturing order becomes "ready to produce", operations must
+When the manufacturing order becomes 'ready to produce', operations must
 become 'confirmed'. When the manufacturing order is done, all operations
 must become done.
 
@@ -54,9 +56,9 @@ So, that we can compare the theoretic delay and real delay.
     'website': 'http://www.openerp.com',
     'images': ['images/work_order_analysis.jpeg','images/work_order_planning.jpeg','images/work_order.jpeg'],
     'depends': ['mrp'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
+        'mrp_operation_data.xml',
         'mrp_operations_workflow.xml',
         'mrp_operations_view.xml',
         'mrp_operations_report.xml',
@@ -64,13 +66,13 @@ So, that we can compare the theoretic delay and real delay.
         'process/mrp_operation_process.xml',
         'mrp_operations_workflow_instance.xml'
     ],
-    'demo_xml': ['mrp_operation_data.xml', 
-                 'mrp_operations_demo.yml'],
+    'demo': [ 
+             'mrp_operations_demo.yml'
+    ],
     'test': [ 
-#             'test/workcenter_operations.yml',
+#        'test/workcenter_operations.yml',
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0056233813133',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_operations/i18n/ar.po b/addons/mrp_operations/i18n/ar.po
index 0142583f8fd..7b79a2f229a 100644
--- a/addons/mrp_operations/i18n/ar.po
+++ b/addons/mrp_operations/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/bg.po b/addons/mrp_operations/i18n/bg.po
index 01e0ba59fdd..b817e740386 100644
--- a/addons/mrp_operations/i18n/bg.po
+++ b/addons/mrp_operations/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/bs.po b/addons/mrp_operations/i18n/bs.po
index b4676b00d6f..0b11d3be17e 100644
--- a/addons/mrp_operations/i18n/bs.po
+++ b/addons/mrp_operations/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/ca.po b/addons/mrp_operations/i18n/ca.po
index 01d4945364b..e53565c47b5 100644
--- a/addons/mrp_operations/i18n/ca.po
+++ b/addons/mrp_operations/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/cs.po b/addons/mrp_operations/i18n/cs.po
index f1201d398ad..4d680ef81ce 100644
--- a/addons/mrp_operations/i18n/cs.po
+++ b/addons/mrp_operations/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/da.po b/addons/mrp_operations/i18n/da.po
index 49e11f4644c..0c28796aedd 100644
--- a/addons/mrp_operations/i18n/da.po
+++ b/addons/mrp_operations/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/de.po b/addons/mrp_operations/i18n/de.po
index d05bd53da94..311480b3122 100644
--- a/addons/mrp_operations/i18n/de.po
+++ b/addons/mrp_operations/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/es.po b/addons/mrp_operations/i18n/es.po
index 647f7d35195..19d9f8c00e9 100644
--- a/addons/mrp_operations/i18n/es.po
+++ b/addons/mrp_operations/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/es_AR.po b/addons/mrp_operations/i18n/es_AR.po
index f9e733db292..2b19ce7a016 100644
--- a/addons/mrp_operations/i18n/es_AR.po
+++ b/addons/mrp_operations/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/es_CR.po b/addons/mrp_operations/i18n/es_CR.po
index 6ced4178ed3..d2e62c9cebf 100644
--- a/addons/mrp_operations/i18n/es_CR.po
+++ b/addons/mrp_operations/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_operations/i18n/es_EC.po b/addons/mrp_operations/i18n/es_EC.po
index 5f2ab1e949e..f59f4acc7a3 100644
--- a/addons/mrp_operations/i18n/es_EC.po
+++ b/addons/mrp_operations/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/et.po b/addons/mrp_operations/i18n/et.po
index 81d1537944f..bc724e2222c 100644
--- a/addons/mrp_operations/i18n/et.po
+++ b/addons/mrp_operations/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/fi.po b/addons/mrp_operations/i18n/fi.po
index 76fd30c0c7f..03cd8192d2e 100644
--- a/addons/mrp_operations/i18n/fi.po
+++ b/addons/mrp_operations/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/fr.po b/addons/mrp_operations/i18n/fr.po
index 4796958dda6..5b040b9badd 100644
--- a/addons/mrp_operations/i18n/fr.po
+++ b/addons/mrp_operations/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/hi.po b/addons/mrp_operations/i18n/hi.po
index c3e79cf3fa5..95d9ebae711 100644
--- a/addons/mrp_operations/i18n/hi.po
+++ b/addons/mrp_operations/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/hr.po b/addons/mrp_operations/i18n/hr.po
index 6432ceabe4a..d2d18f0a906 100644
--- a/addons/mrp_operations/i18n/hr.po
+++ b/addons/mrp_operations/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/hu.po b/addons/mrp_operations/i18n/hu.po
index 7c5ded1ec0f..77e4639a455 100644
--- a/addons/mrp_operations/i18n/hu.po
+++ b/addons/mrp_operations/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/id.po b/addons/mrp_operations/i18n/id.po
index 73becc507d0..96e169b35b0 100644
--- a/addons/mrp_operations/i18n/id.po
+++ b/addons/mrp_operations/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/it.po b/addons/mrp_operations/i18n/it.po
index b1e09f23e5c..6e309e56a8e 100644
--- a/addons/mrp_operations/i18n/it.po
+++ b/addons/mrp_operations/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/ja.po b/addons/mrp_operations/i18n/ja.po
index 19ee0fc0e86..ebc8644f765 100644
--- a/addons/mrp_operations/i18n/ja.po
+++ b/addons/mrp_operations/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/ko.po b/addons/mrp_operations/i18n/ko.po
index 98bd4323384..7e408384292 100644
--- a/addons/mrp_operations/i18n/ko.po
+++ b/addons/mrp_operations/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/lt.po b/addons/mrp_operations/i18n/lt.po
index b2639dca72b..b24c51d7bfd 100644
--- a/addons/mrp_operations/i18n/lt.po
+++ b/addons/mrp_operations/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/mn.po b/addons/mrp_operations/i18n/mn.po
index b34fcc577c3..7df2b4a4a98 100644
--- a/addons/mrp_operations/i18n/mn.po
+++ b/addons/mrp_operations/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/nl.po b/addons/mrp_operations/i18n/nl.po
index 72e007f774b..72154381dfa 100644
--- a/addons/mrp_operations/i18n/nl.po
+++ b/addons/mrp_operations/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -50,7 +50,7 @@ msgstr "Groepeer op..."
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Information from the routing definition."
-msgstr "Informatie van de route definitie"
+msgstr "Informatie van de productiestappen"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
diff --git a/addons/mrp_operations/i18n/nl_BE.po b/addons/mrp_operations/i18n/nl_BE.po
index 6b53a58811b..2e5e52c0b79 100644
--- a/addons/mrp_operations/i18n/nl_BE.po
+++ b/addons/mrp_operations/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/pl.po b/addons/mrp_operations/i18n/pl.po
index 58ecef07c85..d5fa86bb58c 100644
--- a/addons/mrp_operations/i18n/pl.po
+++ b/addons/mrp_operations/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/pt.po b/addons/mrp_operations/i18n/pt.po
index fc3b0b8ebf4..00a5a11e102 100644
--- a/addons/mrp_operations/i18n/pt.po
+++ b/addons/mrp_operations/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/pt_BR.po b/addons/mrp_operations/i18n/pt_BR.po
index e21f236c84a..99199506904 100644
--- a/addons/mrp_operations/i18n/pt_BR.po
+++ b/addons/mrp_operations/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -29,7 +29,7 @@ msgstr "Ordens de Serviço"
 #: code:addons/mrp_operations/mrp_operations.py:489
 #, python-format
 msgid "Operation is already finished!"
-msgstr ""
+msgstr "A Operação já está concluída!"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
@@ -39,7 +39,7 @@ msgstr "Cancelar a Operação"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
 msgid "mrp_operations.operation.code"
-msgstr ""
+msgstr "mrp_operations.operation.code"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -88,7 +88,7 @@ msgstr "Operação de Produção"
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Definir como Provisório"
 
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
@@ -114,7 +114,7 @@ msgstr "Dia"
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Cancelar Pedido"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
@@ -142,6 +142,17 @@ msgid ""
 "* When the user cancels the work order it will be set in 'Canceled' state.\n"
 "* When order is completely processed that time it is set in 'Finished' state."
 msgstr ""
+"* Quando uma ordem de produção é criada, a situação é definida como "
+"'Provisório'.\n"
+"* Quando o usuário inicia uma ordem de produção a situação muda para 'Em "
+"Progresso'.\n"
+"* Quando a ordem de produção está em executando, neste momento se o usuário "
+"desejar parar ou fazer alterações nesta ordem ele pode definir a situação "
+"como 'Pendente'.\n"
+"* Quando o usuário cancela uma ordem de trabalho, a situação muda para "
+"'Cancelada'.\n"
+"* Quando uma ordem é completamente concluída, a situação é definida como "
+"'Finalizada'."
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
@@ -169,13 +180,13 @@ msgstr "Cancelado"
 #: code:addons/mrp_operations/mrp_operations.py:486
 #, python-format
 msgid "There is no Operation to be cancelled!"
-msgstr ""
+msgstr "Não existe Operação para ser cancelada!"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is Already Cancelled!"
-msgstr ""
+msgstr "A Operação já está Cancelada!"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
@@ -194,6 +205,7 @@ msgstr "Mov. de Estoque"
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
 msgstr ""
+"Para poder Finalizar a operação, ela precisará estar em Início ou Continuar!"
 
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
@@ -204,7 +216,7 @@ msgstr "# de Linhas"
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Finish Order"
-msgstr ""
+msgstr "Finalizar Pedido"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_finished:0
@@ -263,6 +275,7 @@ msgstr "UdM"
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
 msgstr ""
+"Você não pode mover os produtos de/para um Local do tipo Visualização"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -279,7 +292,7 @@ msgstr "Qtd do Produto"
 #: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
-msgstr ""
+msgstr "Ordem de Produção não pode iniciar com a situação \"%s\"!"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -314,7 +327,7 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Planned Year"
-msgstr ""
+msgstr "Ano Planejado"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
@@ -329,12 +342,13 @@ msgstr "Ordens de Serviço Futuras"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Work orders during last month"
-msgstr ""
+msgstr "Ordens trabalhadas durante o mês passado"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
 msgid "The elapsed time between operation start and stop in this Work Center"
 msgstr ""
+"O tempo decorrido entre iniciar e parar a operação neste Centro de Trabalho"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
@@ -345,7 +359,7 @@ msgstr "Operação Cancelada"
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Pause Work Order"
-msgstr ""
+msgstr "Pausar Ordem de Trabalho"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -371,7 +385,7 @@ msgstr "Cancelada"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation
 msgid "mrp_operations.operation"
-msgstr ""
+msgstr "mrp_operations.operation"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_workorder
@@ -381,7 +395,7 @@ msgstr "Relatório Ordem de Serviço"
 #. module: mrp_operations
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "A quantidade do pedido não pode ser negativa ou zero!"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
@@ -398,7 +412,7 @@ msgstr "Aguardando Mercadorias"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Work orders made during current year"
-msgstr ""
+msgstr "Ordens de trabalho este ano"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,state:0
@@ -419,12 +433,14 @@ msgstr "Em Progresso"
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
 msgstr ""
+"Para Pausar uma operação, ela precisará estar definida como Início ou "
+"Reiniciar"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
-msgstr ""
+msgstr "Para Reiniciar uma operação, ela precisará estar em Pausa!"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -472,6 +488,7 @@ msgid ""
 "Operation has already started !Youcan either Pause/Finish/Cancel the "
 "operation"
 msgstr ""
+"Operação já está iniciada! Você pode Pausar/Finalizar/Cancelar a operação"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -486,12 +503,12 @@ msgstr "Iniciada"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production started late"
-msgstr ""
+msgstr "Produção iniciada com atraso"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Planned Day"
-msgstr ""
+msgstr "Dia Planejado"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -549,7 +566,7 @@ msgstr "Janeiro"
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Resume Work Order"
-msgstr ""
+msgstr "Continuar Ordem de Trabalho"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
@@ -570,7 +587,7 @@ msgstr "Informação da ordem de Produção."
 #. module: mrp_operations
 #: sql_constraint:mrp.production:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "A referência deve ser única por empresa!"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:459
@@ -732,7 +749,7 @@ msgstr ""
 #. module: mrp_operations
 #: report:mrp.code.barcode:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
@@ -760,7 +777,7 @@ msgstr "Horas Trabalhadas"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Planned Month"
-msgstr ""
+msgstr "Mês Planejado"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -770,7 +787,7 @@ msgstr "Fevereiro"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Work orders made during current month"
-msgstr ""
+msgstr "Ordens de Trabalho feitas este mÊs"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
@@ -801,7 +818,7 @@ msgstr "Linha Ordens"
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Start Working"
-msgstr ""
+msgstr "Iniciar o trabalho"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
diff --git a/addons/mrp_operations/i18n/ro.po b/addons/mrp_operations/i18n/ro.po
index 04bb4f160c4..f60b01f939a 100644
--- a/addons/mrp_operations/i18n/ro.po
+++ b/addons/mrp_operations/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/ru.po b/addons/mrp_operations/i18n/ru.po
index 66fe9afaf29..96eb69da5f5 100644
--- a/addons/mrp_operations/i18n/ru.po
+++ b/addons/mrp_operations/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/sl.po b/addons/mrp_operations/i18n/sl.po
index c385b5af159..fd55d3b1581 100644
--- a/addons/mrp_operations/i18n/sl.po
+++ b/addons/mrp_operations/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/sq.po b/addons/mrp_operations/i18n/sq.po
index f2b678ec976..8e20c4261c6 100644
--- a/addons/mrp_operations/i18n/sq.po
+++ b/addons/mrp_operations/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/sr.po b/addons/mrp_operations/i18n/sr.po
index 075637c8133..05b2996dee2 100644
--- a/addons/mrp_operations/i18n/sr.po
+++ b/addons/mrp_operations/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/sr@latin.po b/addons/mrp_operations/i18n/sr@latin.po
index 1d7cffcf953..8c9ee48c7b7 100644
--- a/addons/mrp_operations/i18n/sr@latin.po
+++ b/addons/mrp_operations/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/sv.po b/addons/mrp_operations/i18n/sv.po
index a1d119712b1..724a1bd0d57 100644
--- a/addons/mrp_operations/i18n/sv.po
+++ b/addons/mrp_operations/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/tlh.po b/addons/mrp_operations/i18n/tlh.po
index 4ab222857d2..c83e6aee554 100644
--- a/addons/mrp_operations/i18n/tlh.po
+++ b/addons/mrp_operations/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index f897f234e48..373ba595a71 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
@@ -29,7 +29,7 @@ msgstr "İş Emirleri"
 #: code:addons/mrp_operations/mrp_operations.py:489
 #, python-format
 msgid "Operation is already finished!"
-msgstr ""
+msgstr "İşlem neredeye bitti!"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
@@ -88,7 +88,7 @@ msgstr "Üretim Operasyonu"
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Taslağa  Ayarla"
 
 #. module: mrp_operations
 #: field:mrp.production,allow_reorder:0
@@ -114,7 +114,7 @@ msgstr "Gün"
 #. module: mrp_operations
 #: view:mrp.production:0
 msgid "Cancel Order"
-msgstr ""
+msgstr "Siparişi İptal Et"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
@@ -142,6 +142,13 @@ msgid ""
 "* When the user cancels the work order it will be set in 'Canceled' state.\n"
 "* When order is completely processed that time it is set in 'Finished' state."
 msgstr ""
+"* Bir iş emri oluşturulduğunda'Taslak' durumundadır.\n"
+"* Kullanıcı iş emrini başlama durumuna ayarlarsa o zaman 'İşlemde' durumuna "
+"ayarlanacaktır.\n"
+"* İş emri yürütüyor durumunda ise, bu süre içinde kullanıcı durdurmak "
+"isterse ya da değişiklikle yapmak isterse 'Bekliyor' durumuna alınmalıdır.\n"
+"* Kullanıcı iş emrini iptal ederse 'İptal edildi' durumuna ayarlanacaktır.\n"
+"* İş emri tamamen işlenmişse o zaman 'Bitti' durumuna ayarlanır."
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
@@ -169,13 +176,13 @@ msgstr "İptal edildi"
 #: code:addons/mrp_operations/mrp_operations.py:486
 #, python-format
 msgid "There is no Operation to be cancelled!"
-msgstr ""
+msgstr "İptal edilecek hiç İşlem yok!"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:482
 #, python-format
 msgid "Operation is Already Cancelled!"
-msgstr ""
+msgstr "İşlem Zaten İptal Edilmiş!"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_operation_action
@@ -193,7 +200,7 @@ msgstr "Stok Hareketi"
 #, python-format
 msgid ""
 "In order to Finish the operation, it must be in the Start or Resume state!"
-msgstr ""
+msgstr "İşlemi bitirmek için Başlama ya da Devam durumunda olmalı !"
 
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
@@ -204,7 +211,7 @@ msgstr "# / Satır"
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Finish Order"
-msgstr ""
+msgstr "Siparişi Bitir"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_finished:0
@@ -262,7 +269,7 @@ msgstr "Birim"
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Görünüm tipindeki bir konuma ürün giriş çıkışı yapamazsınız."
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -279,7 +286,7 @@ msgstr "Ürün Mik."
 #: code:addons/mrp_operations/mrp_operations.py:134
 #, python-format
 msgid "Manufacturing order cannot start in state \"%s\"!"
-msgstr ""
+msgstr "Üretim siparişi \"%s\" durumunda başlatılamaz!"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -314,7 +321,7 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Planned Year"
-msgstr ""
+msgstr "Planlanan Yıl"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,order_date:0
@@ -329,12 +336,12 @@ msgstr "Gelecekteki İş Emirleri"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Work orders during last month"
-msgstr ""
+msgstr "Geçen aydaki iş emirleri"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
 msgid "The elapsed time between operation start and stop in this Work Center"
-msgstr ""
+msgstr "Bu İş Merkezindeki işlemin başlangıç ve bitiş arasındaki geçen süre"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
@@ -345,7 +352,7 @@ msgstr "Operasyon İptal Edildi"
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Pause Work Order"
-msgstr ""
+msgstr "İş Emrini Duraklat"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -381,7 +388,7 @@ msgstr "İş Emri Raporu"
 #. module: mrp_operations
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "Sipariş adedi eksi ya da sıfır olamaz!"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
@@ -398,7 +405,7 @@ msgstr "Malzeme Bekleniyor"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Work orders made during current year"
-msgstr ""
+msgstr "Geçerli yıl içinde yapılan iş emirleri"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,state:0
@@ -418,13 +425,13 @@ msgstr "İşlemde"
 #, python-format
 msgid ""
 "In order to Pause the operation, it must be in the Start or Resume state!"
-msgstr ""
+msgstr "İşlemi duraklatmak için Başlama ya da Devam durumunda olmalı!"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:474
 #, python-format
 msgid "In order to Resume the operation, it must be in the Pause state!"
-msgstr ""
+msgstr "İşlemi Devam ettirmek için Duraklatma durumunda olmalı!"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -472,6 +479,8 @@ msgid ""
 "Operation has already started !Youcan either Pause/Finish/Cancel the "
 "operation"
 msgstr ""
+"İşlem zaten başlamış! İşleme Duraklat/Bitir/İptal işlemlerinden birini "
+"uygulayabilirsiniz"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -486,12 +495,12 @@ msgstr "Başlatıldı"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Production started late"
-msgstr ""
+msgstr "Üretim Geç Başladı"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Planned Day"
-msgstr ""
+msgstr "Planlanan Gün"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -549,7 +558,7 @@ msgstr "Ocak"
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Resume Work Order"
-msgstr ""
+msgstr "İş Emrini Sürdür"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
@@ -570,7 +579,7 @@ msgstr "Üretim emrinden bilgiler."
 #. module: mrp_operations
 #: sql_constraint:mrp.production:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referans her şirket için benzersiz olmalı!"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:459
@@ -760,7 +769,7 @@ msgstr "Çalışma Saati"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Planned Month"
-msgstr ""
+msgstr "Planlanan Ay"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
@@ -770,7 +779,7 @@ msgstr "Şubat"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Work orders made during current month"
-msgstr ""
+msgstr "Geçerli ayda yapılan iş emirleri"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
@@ -801,7 +810,7 @@ msgstr "#Line Emir"
 #: view:mrp.production:0
 #: view:mrp.production.workcenter.line:0
 msgid "Start Working"
-msgstr ""
+msgstr "Çalışmayı Başlat"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
diff --git a/addons/mrp_operations/i18n/uk.po b/addons/mrp_operations/i18n/uk.po
index c582822b451..ac491aba6aa 100644
--- a/addons/mrp_operations/i18n/uk.po
+++ b/addons/mrp_operations/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/vi.po b/addons/mrp_operations/i18n/vi.po
index 4d047e6b0af..3dd0c0b7493 100644
--- a/addons/mrp_operations/i18n/vi.po
+++ b/addons/mrp_operations/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/zh_CN.po b/addons/mrp_operations/i18n/zh_CN.po
index 04185f5fda5..222bc198439 100644
--- a/addons/mrp_operations/i18n/zh_CN.po
+++ b/addons/mrp_operations/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/i18n/zh_TW.po b/addons/mrp_operations/i18n/zh_TW.po
index cff9e646d42..b7dd7588544 100644
--- a/addons/mrp_operations/i18n/zh_TW.po
+++ b/addons/mrp_operations/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:53+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 8692dab5c87..4bca93d260f 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -50,17 +50,6 @@ class stock_move(osv.osv):
 stock_move()
 
 class mrp_production_workcenter_line(osv.osv):
-    def _get_date_date(self, cr, uid, ids, field_name, arg, context=None):
-        """ Finds starting date.
-        @return: Dictionary of values.
-        """
-        res={}
-        for op in self.browse(cr, uid, ids, context=context):
-            if op.date_start:
-                res[op.id] = op.date_start[:10]
-            else:
-                res[op.id]=False
-        return res
 
     def _get_date_end(self, cr, uid, ids, field_name, arg, context=None):
         """ Finds ending date.
@@ -87,12 +76,11 @@ class mrp_production_workcenter_line(osv.osv):
 
     _columns = {
        'state': fields.selection([('draft','Draft'),('cancel','Cancelled'),('pause','Pending'),('startworking', 'In Progress'),('done','Finished')],'Status', readonly=True,
-                                 help="* When a work order is created it is set in 'Draft' state.\n" \
-                                       "* When user sets work order in start mode that time it will be set in 'In Progress' state.\n" \
-                                       "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' state.\n" \
-                                       "* When the user cancels the work order it will be set in 'Canceled' state.\n" \
-                                       "* When order is completely processed that time it is set in 'Finished' state."),
-       'date_start_date': fields.function(_get_date_date, string='Start Date', type='date'),
+                                 help="* When a work order is created it is set in 'Draft' status.\n" \
+                                       "* When user sets work order in start mode that time it will be set in 'In Progress' status.\n" \
+                                       "* When work order is in running mode, during that time if user wants to stop or to make changes in order then can set in 'Pending' status.\n" \
+                                       "* When the user cancels the work order it will be set in 'Canceled' status.\n" \
+                                       "* When order is completely processed that time it is set in 'Finished' status."),
        'date_planned': fields.datetime('Scheduled Date', select=True),
        'date_planned_end': fields.function(_get_date_end, string='End Date', type='datetime'),
        'date_start': fields.datetime('Start Date'),
@@ -224,7 +212,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>created</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
     def action_start_send_note(self, cr, uid, ids, context=None):
@@ -232,7 +220,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>started</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
     def action_done_send_note(self, cr, uid, ids, context=None):
@@ -240,7 +228,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>done</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
     def action_pending_send_note(self, cr, uid, ids, context=None):
@@ -248,7 +236,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order is <b>pending</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
     def action_cancel_send_note(self, cr, uid, ids, context=None):
@@ -256,7 +244,7 @@ class mrp_production_workcenter_line(osv.osv):
         for workorder in self.browse(cr, uid, ids):
             for prod in prod_obj.browse(cr, uid, [workorder.production_id]):
                 message = _("Work order has been <b>cancelled</b> for production order <em>%s</em>.") % (prod.id.name)
-                self.message_append_note(cr, uid, [workorder.id], body=message, context=context)
+                self.message_post(cr, uid, [workorder.id], body=message, context=context)
         return True
 
 mrp_production_workcenter_line()
@@ -422,7 +410,7 @@ class mrp_production(osv.osv):
                 pass
         return result
 
-    def action_compute(self, cr, uid, ids, properties=[], context=None):
+    def action_compute(self, cr, uid, ids, properties=None, context=None):
         """ Computes bills of material of a product and planned date of work order.
         @param properties: List containing dictionaries of properties.
         @return: No. of products.
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 834f3000472..a16a9b23f0a 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -107,8 +107,8 @@
                 </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
             </form>
         </field>
@@ -328,7 +328,7 @@
             <field name="model">mrp.production.workcenter.line</field>
             <field name="arch" type="xml">
                 <graph string="Hours by Work Center" type="bar">
-                     <field name="date_start_date"/>
+                     <field name="date_start"/>
                      <field name="hour" operator="+"/>
                      <field name="workcenter_id" group="True"/>
                 </graph>
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index cca9a7e3b24..de486face78 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -9,7 +9,7 @@
             <field name="name">mrp.workorder.tree</field>
             <field name="model">mrp.workorder</field>
             <field name="arch" type="xml">
-               <tree string="Work Orders">
+               <tree string="Work Orders" create="false">
                       <field name="date" invisible="1"/>
                       <field name="product_id" invisible="1"/>
                       <field name="product_qty" sum="Product Qty"/>
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index c54a0c383ee..26480e975ce 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -29,6 +29,7 @@ The aim is to have a complete module to manage all products repairs.
 ====================================================================
 
 The following topics should be covered by this module:
+------------------------------------------------------
     * Add/remove products in the reparation
     * Impact for stocks
     * Invoicing (products and/or services)
@@ -39,9 +40,10 @@ The following topics should be covered by this module:
     'author': 'OpenERP SA',
     'images': ['images/repair_order.jpeg'],
     'depends': ['mrp', 'sale', 'account'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'security/mrp_repair_security.xml',
+        'mrp_repair_data.xml',
         'mrp_repair_sequence.xml',
         'wizard/mrp_repair_cancel_view.xml',
         'wizard/mrp_repair_make_invoice_view.xml',
@@ -49,14 +51,14 @@ The following topics should be covered by this module:
         'mrp_repair_workflow.xml',
         'mrp_repair_report.xml',
     ],
-    'demo_xml': ['mrp_repair_demo.yml'],
+    'demo': ['mrp_repair_demo.yml'],
     'test': ['test/test_mrp_repair_noneinv.yml',
              'test/test_mrp_repair_b4inv.yml',
              'test/test_mrp_repair_afterinv.yml',
              'test/test_mrp_repair_cancel.yml',
-             'test/mrp_repair_report.yml'],
+             'test/mrp_repair_report.yml'
+    ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0060814381277',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp_repair/i18n/ar.po b/addons/mrp_repair/i18n/ar.po
index ea1069c0334..3875b7c49f0 100644
--- a/addons/mrp_repair/i18n/ar.po
+++ b/addons/mrp_repair/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -514,7 +514,7 @@ msgstr "خط رسوم الاصلاح"
 #: code:addons/mrp_repair/mrp_repair.py:334
 #, python-format
 msgid "You cannot confirm a repair order which has no line."
-msgstr ""
+msgstr "لا يمكنك تأكيد أمر تصليح بلا سطور."
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
diff --git a/addons/mrp_repair/i18n/bg.po b/addons/mrp_repair/i18n/bg.po
index 5ea892f93c1..d4ad64fa101 100644
--- a/addons/mrp_repair/i18n/bg.po
+++ b/addons/mrp_repair/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/bs.po b/addons/mrp_repair/i18n/bs.po
index acef8856936..909b7a8c813 100644
--- a/addons/mrp_repair/i18n/bs.po
+++ b/addons/mrp_repair/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/ca.po b/addons/mrp_repair/i18n/ca.po
index f680a14ea30..612bab4c2fc 100644
--- a/addons/mrp_repair/i18n/ca.po
+++ b/addons/mrp_repair/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/cs.po b/addons/mrp_repair/i18n/cs.po
index 9a1d99b7d75..1bdf7b22387 100644
--- a/addons/mrp_repair/i18n/cs.po
+++ b/addons/mrp_repair/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/da.po b/addons/mrp_repair/i18n/da.po
index f4d8f1e908b..664190fda34 100644
--- a/addons/mrp_repair/i18n/da.po
+++ b/addons/mrp_repair/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/de.po b/addons/mrp_repair/i18n/de.po
index dca44ae5a7d..b4bae415962 100644
--- a/addons/mrp_repair/i18n/de.po
+++ b/addons/mrp_repair/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/es.po b/addons/mrp_repair/i18n/es.po
index b625aad4a20..4f2c20707e5 100644
--- a/addons/mrp_repair/i18n/es.po
+++ b/addons/mrp_repair/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/es_AR.po b/addons/mrp_repair/i18n/es_AR.po
index 38c2a2d09b5..810e3e35f3b 100644
--- a/addons/mrp_repair/i18n/es_AR.po
+++ b/addons/mrp_repair/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/es_CR.po b/addons/mrp_repair/i18n/es_CR.po
index d4e8fcfd61a..07e5efb902d 100644
--- a/addons/mrp_repair/i18n/es_CR.po
+++ b/addons/mrp_repair/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/es_EC.po b/addons/mrp_repair/i18n/es_EC.po
index 1ebd461d874..ff7deb5c757 100644
--- a/addons/mrp_repair/i18n/es_EC.po
+++ b/addons/mrp_repair/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/et.po b/addons/mrp_repair/i18n/et.po
index 0ffa5cf93ec..e65ca2a4cd2 100644
--- a/addons/mrp_repair/i18n/et.po
+++ b/addons/mrp_repair/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/fi.po b/addons/mrp_repair/i18n/fi.po
index e54b49b9e79..faaa8c36fbb 100644
--- a/addons/mrp_repair/i18n/fi.po
+++ b/addons/mrp_repair/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/fr.po b/addons/mrp_repair/i18n/fr.po
index d2f9b4be6f9..cd7e02c7aad 100644
--- a/addons/mrp_repair/i18n/fr.po
+++ b/addons/mrp_repair/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -124,7 +124,7 @@ msgstr "Aucun produit défini avec des frais !"
 #: view:mrp.repair:0
 #: field:mrp.repair,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Société"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -528,6 +528,7 @@ msgstr "Ligne des frais de réparation"
 #, python-format
 msgid "You cannot confirm a repair order which has no line."
 msgstr ""
+"Vous ne pouvez pas confirmer un ordre de réparation qui n'a pas de ligne."
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
diff --git a/addons/mrp_repair/i18n/hi.po b/addons/mrp_repair/i18n/hi.po
index 24251b2c61c..4ec016b2fc4 100644
--- a/addons/mrp_repair/i18n/hi.po
+++ b/addons/mrp_repair/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/hr.po b/addons/mrp_repair/i18n/hr.po
index bc396eb8e10..616e6e1fd99 100644
--- a/addons/mrp_repair/i18n/hr.po
+++ b/addons/mrp_repair/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/hu.po b/addons/mrp_repair/i18n/hu.po
index 6f4099dc925..28071612615 100644
--- a/addons/mrp_repair/i18n/hu.po
+++ b/addons/mrp_repair/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/id.po b/addons/mrp_repair/i18n/id.po
index e93e8001315..91621e8e663 100644
--- a/addons/mrp_repair/i18n/id.po
+++ b/addons/mrp_repair/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/it.po b/addons/mrp_repair/i18n/it.po
index edee45edbcf..0f35fe35f16 100644
--- a/addons/mrp_repair/i18n/it.po
+++ b/addons/mrp_repair/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/ja.po b/addons/mrp_repair/i18n/ja.po
index 187bf9f5586..cae0dd6a1e3 100644
--- a/addons/mrp_repair/i18n/ja.po
+++ b/addons/mrp_repair/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/ko.po b/addons/mrp_repair/i18n/ko.po
index ca96cd77574..d207fd38e24 100644
--- a/addons/mrp_repair/i18n/ko.po
+++ b/addons/mrp_repair/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/lt.po b/addons/mrp_repair/i18n/lt.po
index 997ea5a340c..b9c5ecd032b 100644
--- a/addons/mrp_repair/i18n/lt.po
+++ b/addons/mrp_repair/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/mn.po b/addons/mrp_repair/i18n/mn.po
index 1ace870b02f..c385b1835c5 100644
--- a/addons/mrp_repair/i18n/mn.po
+++ b/addons/mrp_repair/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/nl.po b/addons/mrp_repair/i18n/nl.po
index 5634a09e935..8887298f387 100644
--- a/addons/mrp_repair/i18n/nl.po
+++ b/addons/mrp_repair/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:14+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-08-26 14:03+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -88,7 +88,7 @@ msgid ""
 "view."
 msgstr ""
 "Vink dit aan als u de levering wilt beheren als het product is gerepareerd. "
-"Indien aangevinkt, wordt een picklijst gemaakt met het geselecteerde "
+"Indien aangevinkt, wordt een verzamellijst gemaakt met het geselecteerde "
 "product. Merk op dat u de locaties kunt selecteren in het tabblad Info als u "
 "de uitgebreide weergave heeft."
 
@@ -192,7 +192,7 @@ msgstr "Waarschuwing !"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Tax"
-msgstr ""
+msgstr "Belasting"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -272,7 +272,7 @@ msgstr "Reparatie order N°:"
 #: field:mrp.repair.line,prodlot_id:0
 #: report:repair.order:0
 msgid "Lot Number"
-msgstr "Lot Nummer"
+msgstr "Productie partijnummer"
 
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
@@ -499,7 +499,7 @@ msgstr "Onbekend"
 #: field:mrp.repair,product_id:0
 #: report:repair.order:0
 msgid "Product to Repair"
-msgstr "Te repareren produkt"
+msgstr "Te repareren product"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -594,7 +594,7 @@ msgstr "Aantal"
 #: field:mrp.repair.line,price_unit:0
 #: report:repair.order:0
 msgid "Unit Price"
-msgstr "Eenheidsprijs"
+msgstr "Prijs"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -689,7 +689,7 @@ msgstr "gefaktureerd"
 #: field:mrp.repair.fee,product_id:0
 #: field:mrp.repair.line,product_id:0
 msgid "Product"
-msgstr "Produkt"
+msgstr "Product"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -699,7 +699,7 @@ msgstr "Factuur gecorrigeerd"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Price"
-msgstr "Prijs"
+msgstr "Bedrag"
 
 #. module: mrp_repair
 #: field:mrp.repair,deliver_bool:0
@@ -720,7 +720,7 @@ msgstr "Belastingen:"
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
-msgstr "Picking"
+msgstr "Verzamelen"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/nl_BE.po b/addons/mrp_repair/i18n/nl_BE.po
index 9719d59c6e3..00fad85b71e 100644
--- a/addons/mrp_repair/i18n/nl_BE.po
+++ b/addons/mrp_repair/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/pl.po b/addons/mrp_repair/i18n/pl.po
index 78da67ad12f..20b0b1e4f9a 100644
--- a/addons/mrp_repair/i18n/pl.po
+++ b/addons/mrp_repair/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -54,7 +54,7 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupuj wg..."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -74,7 +74,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
 #: view:mrp.repair.cancel:0
 msgid "Cancel Repair Order"
-msgstr ""
+msgstr "Anuluj zamówienie naprawy"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,to_invoice:0
@@ -96,13 +96,13 @@ msgstr "Grupuj wg adresów partnera do faktur"
 #: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
-msgstr ""
+msgstr "Nie zdefiniowano produktu dla opłaty!"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -141,12 +141,12 @@ msgstr "Adres do faktury :"
 #: view:mrp.repair:0
 #: field:mrp.repair,guarantee_limit:0
 msgid "Guarantee limit"
-msgstr ""
+msgstr "Limit gwarancji"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Notes"
-msgstr ""
+msgstr "Notatki"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -165,7 +165,7 @@ msgstr "Suma netto :"
 #: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Ostrzeżenie !"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -186,7 +186,7 @@ msgstr "Przesunięcie"
 #: code:addons/mrp_repair/mrp_repair.py:370
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
-msgstr ""
+msgstr "Musisz wybrać adres fakturowy w formularzu zamówienia naprawy!"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
@@ -203,7 +203,7 @@ msgstr "Oferta / Zamówienie"
 #: code:addons/mrp_repair/mrp_repair.py:337
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Ostrzeżenie"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -214,7 +214,7 @@ msgstr "Dodatkowe informacje"
 #: field:mrp.repair.fee,repair_id:0
 #: field:mrp.repair.line,repair_id:0
 msgid "Repair Order Reference"
-msgstr ""
+msgstr "Odnośnik Zamówienia naprawy"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
@@ -225,7 +225,7 @@ msgstr "Projekt"
 #: code:addons/mrp_repair/mrp_repair.py:384
 #, python-format
 msgid "No account defined for partner \"%s\"."
-msgstr ""
+msgstr "Nie zdefiniowano konta dla partnera \"%s\"."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -283,7 +283,7 @@ msgstr "Adres do wysyłki :"
 #: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Błąd !"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,product_uom_qty:0
@@ -313,6 +313,8 @@ msgid ""
 "This operation will cancel the Repair process, but will not cancel it's "
 "Invoice. Do you want to continue?"
 msgstr ""
+"Ta operacja anuluje proces naprawy, ale nie anuluje faktury. Chcesz "
+"kontynuować?"
 
 #. module: mrp_repair
 #: field:mrp.repair,pricelist_id:0
@@ -329,17 +331,17 @@ msgstr "Uwagi oferty"
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Uwaga!"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Search Reair Orders"
-msgstr ""
+msgstr "Szukaj zamówienia naprawy"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Add)"
-msgstr ""
+msgstr "(Dodane)"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
@@ -378,7 +380,7 @@ msgstr "Anulowano"
 #: code:addons/mrp_repair/mrp_repair.py:337
 #, python-format
 msgid "Production lot is required for opration line with product '%s'"
-msgstr ""
+msgstr "Numer partii jest wymagany do operacji z produktem '%s'"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
@@ -415,7 +417,7 @@ msgstr "Utwórz faktury"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Remove)"
-msgstr ""
+msgstr "(Zdemontowane)"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
@@ -430,12 +432,12 @@ msgstr ""
 #. module: mrp_repair
 #: field:mrp.repair,name:0
 msgid "Repair Reference"
-msgstr ""
+msgstr "Odnośnik naprawy"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair
 msgid "Repair Order"
-msgstr ""
+msgstr "Zamówienia naprawy"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -445,7 +447,7 @@ msgstr "W trakcie naprawy"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Ready To Repair"
-msgstr ""
+msgstr "Gotowe do naprawy"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_untaxed:0
@@ -455,12 +457,12 @@ msgstr "Kwota bez podatku"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Guarantee Limit"
-msgstr ""
+msgstr "Limit gwarantowany"
 
 #. module: mrp_repair
 #: field:mrp.repair,default_address_id:0
 msgid "unknown"
-msgstr ""
+msgstr "nieznane"
 
 #. module: mrp_repair
 #: field:mrp.repair,product_id:0
@@ -481,18 +483,18 @@ msgstr "Cennik domyślnie jest pobierany z wybranego partnera"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees Line"
-msgstr ""
+msgstr "Pozycja opłaty za naprawę"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:334
 #, python-format
 msgid "You cannot confirm a repair order which has no line."
-msgstr ""
+msgstr "Nie mozna potwierdzać zamówienia naprawy bez pozycji."
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -524,12 +526,12 @@ msgstr "Koniec naprawy"
 #: code:addons/mrp_repair/mrp_repair.py:442
 #, python-format
 msgid "No account defined for product \"%s\"."
-msgstr ""
+msgstr "Produkt \"%s\" nie ma zdefinowanego konta."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Quotations"
-msgstr ""
+msgstr "Oferty"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom_qty:0
@@ -547,7 +549,7 @@ msgstr "Rozpocznij naprawę"
 #: field:mrp.repair,state:0
 #: field:mrp.repair.line,state:0
 msgid "State"
-msgstr ""
+msgstr "Stan"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -575,6 +577,10 @@ msgid ""
 "operation and fee you will add will be set as 'not to invoiced' by default. "
 "Note that you can change manually afterwards."
 msgstr ""
+"Limit gwarantowany jest liczony jako: ostatnia data przesunięcia + gwarancja "
+"zdefiniowana w produkcie. Jeśli bieżąca data jest mniejsza od limitu, to "
+"każda operacja zostanie dodana jako 'nie do fakturowania'. Możesz to ręcznie "
+"zmienić po dodaniu."
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
@@ -623,7 +629,7 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Utwórz fakturę"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
@@ -640,7 +646,7 @@ msgstr "Pozycje operacji"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "invoiced"
-msgstr ""
+msgstr "zafakturowano"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -678,7 +684,7 @@ msgstr "Podatki:"
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
-msgstr ""
+msgstr "Pobranie"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -689,13 +695,13 @@ msgstr "Kwota bez podatku"
 #: code:addons/mrp_repair/wizard/cancel_repair.py:41
 #, python-format
 msgid "Active ID is not Found"
-msgstr ""
+msgstr "Bieżące ID nie zostało znalezione"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:49
 #, python-format
 msgid "Repair order is not invoiced."
-msgstr ""
+msgstr "Zamówienie naprawy nie jest zafakturowane"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -710,7 +716,7 @@ msgstr "JM"
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
 msgid "Remove"
-msgstr "Usuń"
+msgstr "Demontaż"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom:0
@@ -868,3 +874,6 @@ msgstr "Brak partnera !"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
+#~ msgid "Do you really want to create the invoice(s) ?"
+#~ msgstr "Czy chcesz utworzyć fakturę(y) ?"
diff --git a/addons/mrp_repair/i18n/pt.po b/addons/mrp_repair/i18n/pt.po
index 439703a8f11..542d6242f13 100644
--- a/addons/mrp_repair/i18n/pt.po
+++ b/addons/mrp_repair/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/pt_BR.po b/addons/mrp_repair/i18n/pt_BR.po
index 14e1a53046b..04c009e6ad4 100644
--- a/addons/mrp_repair/i18n/pt_BR.po
+++ b/addons/mrp_repair/i18n/pt_BR.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:03+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"PO-Revision-Date: 2012-10-17 00:28+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@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: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Fees Line"
-msgstr ""
+msgstr "Linhas de Preço"
 
 #. module: mrp_repair
 #: help:mrp.repair,state:0
@@ -35,6 +35,15 @@ msgid ""
 "* The 'Done' state is set when repairing is completed.            \n"
 "* The 'Cancelled' state is used when user cancel repair order."
 msgstr ""
+" * 'Provisória' é usada quando um usuário está preparando uma nova ordem de "
+"reparo não confirmada.\n"
+"* 'Confirmada' é usado quando o usuário confirma a ordem de reparo.\n"
+"* 'Pronto para Reparo\" é usado para iniciar o reparo, o usuário pode "
+"começar a reparar somente após a confirmação da ordem de reparo.\n"
+"* 'Faturar' é usado para gerar a fatura antes ou após o reparo feito.\n"
+"* 'Concluído' é definido quando o reparo finalizar.\n"
+"* O 'Cancelado' estado é usado quando o usuário cancelar a ordem de "
+"reparação."
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
@@ -50,6 +59,11 @@ msgid ""
 "date on the production lot in order to know if whether the repair should be "
 "invoiced to the customer or not."
 msgstr ""
+"Pedidos de conserto permitem que você organize reparos de seus produtos. Em "
+"um pedido de conserto, você pode detalhar os componentes que você remover, "
+"adicionar ou substituir e registrar o tempo que você gastou em diferentes "
+"operações. O pedido usa o tempo da garantia de reparo no lote de produção, a "
+"fim de saber se se a reparação deverá ser cobrada do cliente ou não."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -69,6 +83,10 @@ msgid ""
 "that you can select the locations in the Info tab, if you have the extended "
 "view."
 msgstr ""
+"Marque esta caixa se você deseja gerenciar a entrega do produto assim que "
+"for reparado. Se selecionado, ele irá criar uma separação com o produto "
+"selecionado. Note que você pode selecionar os locais na aba Info, se você "
+"tem a visão extendida."
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
@@ -96,13 +114,13 @@ msgstr "Agrupar pelo Endereço de Faturamento do Parceiro"
 #: code:addons/mrp_repair/mrp_repair.py:435
 #, python-format
 msgid "No product defined on Fees!"
-msgstr ""
+msgstr "Nenhum produto definido no valor!"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 #: field:mrp.repair,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Empresa"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -170,7 +188,7 @@ msgstr "Atenção !"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Tax"
-msgstr ""
+msgstr "Imposto"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -205,7 +223,7 @@ msgstr "Cotação / Ordem"
 #: code:addons/mrp_repair/mrp_repair.py:337
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Alerta"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -256,7 +274,7 @@ msgstr "Número do Lote"
 #. module: mrp_repair
 #: field:mrp.repair,fees_lines:0
 msgid "Fees Lines"
-msgstr ""
+msgstr "Linhas de Valor"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,type:0
@@ -266,7 +284,7 @@ msgstr "Tipo"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Fees Line(s)"
-msgstr ""
+msgstr "Linhas de Valor(es)"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -303,6 +321,12 @@ msgid ""
 "                  \n"
 "* The 'Cancelled' state is set automatically when user cancel repair order."
 msgstr ""
+" * 'Provisório' é definido automaticamente, quando a ordem de reparo está em "
+"situação provisória.\n"
+"* 'Confirmado' é definido automaticamente quando a ordem for confirmada.\n"
+"* 'Concluído' é definido automaticamente quando o reparo estiver concluído.\n"
+"* 'Cancelado' é definido automaticamente quando o usuário cancelar a ordem "
+"de reparos."
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -383,6 +407,7 @@ msgstr "Cancelado"
 #, python-format
 msgid "Production lot is required for opration line with product '%s'"
 msgstr ""
+"O Lote de Produção é obrigatório para a linha de operação com o produto '%s'"
 
 #. module: mrp_repair
 #: selection:mrp.repair,invoice_method:0
@@ -490,13 +515,14 @@ msgstr "Data:"
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees Line"
-msgstr ""
+msgstr "Linhas de Valores do Conserto"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/mrp_repair.py:334
 #, python-format
 msgid "You cannot confirm a repair order which has no line."
 msgstr ""
+"Você não pode confirmar um Pedido de Conserto que não possui nenhuma linha."
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -579,6 +605,10 @@ msgid ""
 "operation and fee you will add will be set as 'not to invoiced' by default. "
 "Note that you can change manually afterwards."
 msgstr ""
+"O limite de garantia é calculado como: data de último movimento + garantia "
+"definida no produto selecionado. Se a data atual está abaixo do limite de "
+"garantia, cada operação e taxa que você acrescentar será definido como \"não "
+"faturado\" por padrão. Observe que você pode alterar manualmente mais tarde."
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
@@ -874,3 +904,6 @@ msgstr "Sem parceiro !"
 
 #~ msgid "Products Repairs Module - Manage All products Repairs"
 #~ msgstr "Modulo de Reparo de Produtos - Gerencie o Reparo dos Produtos"
+
+#~ msgid "VAT"
+#~ msgstr "Imposto"
diff --git a/addons/mrp_repair/i18n/ro.po b/addons/mrp_repair/i18n/ro.po
index 7f85531c33a..ba5a02beae8 100644
--- a/addons/mrp_repair/i18n/ro.po
+++ b/addons/mrp_repair/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/ru.po b/addons/mrp_repair/i18n/ru.po
index 1f118970748..1205f1fbe78 100644
--- a/addons/mrp_repair/i18n/ru.po
+++ b/addons/mrp_repair/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/sl.po b/addons/mrp_repair/i18n/sl.po
index 49a6895c806..411c7482062 100644
--- a/addons/mrp_repair/i18n/sl.po
+++ b/addons/mrp_repair/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/sq.po b/addons/mrp_repair/i18n/sq.po
index 067b4adbfb8..a5f4af45196 100644
--- a/addons/mrp_repair/i18n/sq.po
+++ b/addons/mrp_repair/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/sr.po b/addons/mrp_repair/i18n/sr.po
index 9ea353849c1..0faf2be3a30 100644
--- a/addons/mrp_repair/i18n/sr.po
+++ b/addons/mrp_repair/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/sr@latin.po b/addons/mrp_repair/i18n/sr@latin.po
index 876538f4adb..5927eead86b 100644
--- a/addons/mrp_repair/i18n/sr@latin.po
+++ b/addons/mrp_repair/i18n/sr@latin.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-05-10 17:22+0000\n"
-"Last-Translator: Maroje Delibasic <Unknown>\n"
+"Last-Translator: MD <Unknown>\n"
 "Language-Team: Serbian latin <sr@latin@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/sv.po b/addons/mrp_repair/i18n/sv.po
index 8ef9859cac4..20714d53a28 100644
--- a/addons/mrp_repair/i18n/sv.po
+++ b/addons/mrp_repair/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/tlh.po b/addons/mrp_repair/i18n/tlh.po
index 6104e89776c..ed5ad1f19b1 100644
--- a/addons/mrp_repair/i18n/tlh.po
+++ b/addons/mrp_repair/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 393468c9a6f..0fa9ed1a631 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/uk.po b/addons/mrp_repair/i18n/uk.po
index ab550c7eb94..3267a930bf0 100644
--- a/addons/mrp_repair/i18n/uk.po
+++ b/addons/mrp_repair/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/vi.po b/addons/mrp_repair/i18n/vi.po
index 6448c9e60da..e0ec9e813ce 100644
--- a/addons/mrp_repair/i18n/vi.po
+++ b/addons/mrp_repair/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/zh_CN.po b/addons/mrp_repair/i18n/zh_CN.po
index a3e13b920fc..3c7cf655920 100644
--- a/addons/mrp_repair/i18n/zh_CN.po
+++ b/addons/mrp_repair/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 17:43+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-10-25 16:34+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -178,7 +178,7 @@ msgstr "警告！"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "Tax"
-msgstr ""
+msgstr "税"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/i18n/zh_TW.po b/addons/mrp_repair/i18n/zh_TW.po
index 9990ea940b0..b94e0619774 100644
--- a/addons/mrp_repair/i18n/zh_TW.po
+++ b/addons/mrp_repair/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index f41abb58c08..d79620ce93c 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -131,16 +131,16 @@ class mrp_repair(osv.osv):
             ('invoice_except','Invoice Exception'),
             ('done','Repaired')
             ], 'Status', readonly=True,
-            help=' * The \'Draft\' state is used when a user is encoding a new and unconfirmed repair order. \
-            \n* The \'Confirmed\' state is used when a user confirms the repair order. \
-            \n* The \'Ready to Repair\' state is used to start to repairing, user can start repairing only after repair order is confirmed. \
-            \n* The \'To be Invoiced\' state is used to generate the invoice before or after repairing done. \
-            \n* The \'Done\' state is set when repairing is completed.\
-            \n* The \'Cancelled\' state is used when user cancel repair order.'),
+            help=' * The \'Draft\' status is used when a user is encoding a new and unconfirmed repair order. \
+            \n* The \'Confirmed\' status is used when a user confirms the repair order. \
+            \n* The \'Ready to Repair\' status is used to start to repairing, user can start repairing only after repair order is confirmed. \
+            \n* The \'To be Invoiced\' status is used to generate the invoice before or after repairing done. \
+            \n* The \'Done\' status is set when repairing is completed.\
+            \n* The \'Cancelled\' status is used when user cancel repair order.'),
         'location_id': fields.many2one('stock.location', 'Current Location', select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'location_dest_id': fields.many2one('stock.location', 'Delivery Location', readonly=True, states={'draft':[('readonly',False)]}),
         'move_id': fields.many2one('stock.move', 'Move',required=True, domain="[('product_id','=',product_id)]", readonly=True, states={'draft':[('readonly',False)]}),
-        'guarantee_limit': fields.date('Guarantee limit', help="The guarantee limit is computed as: last move date + warranty defined on selected product. If the current date is below the guarantee limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards."),
+        'guarantee_limit': fields.date('Warranty Expiration', help="The warranty expiration limit is computed as: last move date + warranty defined on selected product. If the current date is below the warranty expiration limit, each operation and fee you will add will be set as 'not to invoiced' by default. Note that you can change manually afterwards."),
         'operations' : fields.one2many('mrp.repair.line', 'repair_id', 'Operation Lines', readonly=True, states={'draft':[('readonly',False)]}),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', help='Pricelist of the selected partner.'),
         'partner_invoice_id':fields.many2one('res.partner', 'Invoicing Address'),
@@ -571,40 +571,40 @@ class mrp_repair(osv.osv):
     def create_send_note(self, cr, uid, ids, context=None):
         for repair in self.browse(cr, uid, ids, context):
             message = _("Repair Order for <em>%s</em> has been <b>created</b>." % (repair.product_id.name))
-            self.message_append_note(cr, uid, [repair.id], body=message, context=context)
+            self.message_post(cr, uid, [repair.id], body=message, context=context)
         return True
 
     def set_start_send_note(self, cr, uid, ids, context=None):
         for repair in self.browse(cr, uid, ids, context):
             message = _("Repair Order for <em>%s</em> has been <b>started</b>." % (repair.product_id.name))
-            self.message_append_note(cr, uid, [repair.id], body=message, context=context)
+            self.message_post(cr, uid, [repair.id], body=message, context=context)
         return True
 
     def set_toinvoiced_send_note(self, cr, uid, ids, context=None):
         for repair in self.browse(cr, uid, ids, context):
             message = _("Draft Invoice of %s %s <b>waiting for validation</b>.") % (repair.invoice_id.amount_total, repair.invoice_id.currency_id.symbol)
-            self.message_append_note(cr, uid, [repair.id], body=message, context=context)
+            self.message_post(cr, uid, [repair.id], body=message, context=context)
         return True
 
     def set_confirm_send_note(self, cr, uid, ids, context=None):
         for repair in self.browse(cr, uid, ids, context):
             message = _( "Repair Order for <em>%s</em> has been <b>accepted</b>." % (repair.product_id.name))
-            self.message_append_note(cr, uid, [repair.id], body=message, context=context)
+            self.message_post(cr, uid, [repair.id], body=message, context=context)
         return True
 
     def set_cancel_send_note(self, cr, uid, ids, context=None):
         message = _("Repair has been <b>cancelled</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def set_ready_send_note(self, cr, uid, ids, context=None):
         message = _("Repair Order is now <b>ready</b> to repair.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def set_done_send_note(self, cr, uid, ids, context=None):
         message = _("Repair Order is <b>closed</b>.")
-        self.message_append_note(cr, uid, ids, body=message, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
 mrp_repair()
@@ -690,7 +690,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         'repair_id': fields.many2one('mrp.repair', 'Repair Order Reference',ondelete='cascade', select=True),
         'type': fields.selection([('add','Add'),('remove','Remove')],'Type', required=True),
         'to_invoice': fields.boolean('To Invoice'),
-        'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok','=',True)], required=True),
+        'product_id': fields.many2one('product.product', 'Product', required=True),
         'invoiced': fields.boolean('Invoiced',readonly=True),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')),
         'price_subtotal': fields.function(_amount_line, string='Subtotal',digits_compute= dp.get_precision('Account')),
@@ -707,10 +707,10 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
                     ('confirmed','Confirmed'),
                     ('done','Done'),
                     ('cancel','Cancelled')], 'Status', required=True, readonly=True,
-                    help=' * The \'Draft\' state is set automatically as draft when repair order in draft state. \
-                        \n* The \'Confirmed\' state is set automatically as confirm when repair order in confirm state. \
-                        \n* The \'Done\' state is set automatically when repair order is completed.\
-                        \n* The \'Cancelled\' state is set automatically when user cancel repair order.'),
+                    help=' * The \'Draft\' status is set automatically as draft when repair order in draft status. \
+                        \n* The \'Confirmed\' status is set automatically as confirm when repair order in confirm status. \
+                        \n* The \'Done\' status is set automatically when repair order is completed.\
+                        \n* The \'Cancelled\' status is set automatically when user cancel repair order.'),
     }
     _defaults = {
      'state': lambda *a: 'draft',
diff --git a/addons/mrp_repair/mrp_repair_data.xml b/addons/mrp_repair/mrp_repair_data.xml
new file mode 100644
index 00000000000..cc8d30d080d
--- /dev/null
+++ b/addons/mrp_repair/mrp_repair_data.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+    </data>
+</openerp>
diff --git a/addons/mrp_repair/mrp_repair_demo.yml b/addons/mrp_repair/mrp_repair_demo.yml
index 5421b376348..1e296573876 100644
--- a/addons/mrp_repair/mrp_repair_demo.yml
+++ b/addons/mrp_repair/mrp_repair_demo.yml
@@ -5,7 +5,7 @@
     date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
     location_dest_id: stock.stock_location_14
     location_id: stock.stock_location_stock
-    name: '[PC1] Basic PC'
+    name: '[PCSC234] PC Assemble SC234'
     product_id: product.product_product_3
     product_qty: 1.0
     product_uom: product.product_uom_unit
@@ -23,7 +23,7 @@
     operations:
       - location_dest_id: stock.location_production
         location_id: stock.stock_location_stock
-        name: '[HDD1] HDD Seagate 7200.8 80GB'
+        name: '[M-Las] Mouse, Laser'
         price_unit: 50.0
         product_id: product.product_product_11
         product_uom: product.product_uom_unit
@@ -32,7 +32,7 @@
         to_invoice: 1
         type: add
     fees_lines:
-      - name: 'HDD1 Seagate repair fees'
+      - name: 'Mouse repair fees'
         product_id: product.product_product_11
         product_uom_qty: 1.0
         product_uom: product.product_uom_unit
@@ -46,7 +46,7 @@
     date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
     location_dest_id: stock.stock_location_14
     location_id: stock.stock_location_stock
-    name: '[PC3] Medium PC'
+    name: '[PC-DEM] PC on Demand'
     product_id: product.product_product_5
     product_qty: 1.0
     product_uom: product.product_uom_unit
@@ -64,7 +64,7 @@
     operations:
       - location_dest_id: stock.location_production
         location_id: stock.stock_location_stock
-        name: '[HDD2] HDD Seagate 7200.8 120GB'
+        name: '[M-Wir] Mouse, Wireless'
         price_unit: 50.0
         product_id: product.product_product_12
         product_uom: product.product_uom_unit
@@ -73,7 +73,7 @@
         to_invoice: 1
         type: add
     fees_lines:
-      - name: 'HDD2 Seagate repair fees'
+      - name: 'Mouse Seagate repair fees'
         product_id: product.product_product_12
         product_uom_qty: 1.0
         product_uom: product.product_uom_unit
@@ -87,7 +87,7 @@
     date_expected: !eval datetime.today().strftime("%Y-%m-%d %H:%M:%S")
     location_dest_id: stock.stock_location_14
     location_id: stock.stock_location_stock
-    name: '[PC4] Customizable PC'
+    name: '[LCD15] 15” LCD Monitor'
     product_id: product.product_product_6
     product_qty: 1.0
     product_uom: product.product_uom_unit
@@ -105,7 +105,7 @@
     operations:
       - location_dest_id: stock.location_production
         location_id: stock.stock_location_stock
-        name: '[HDD3] HDD Seagate 7200.8 160GB'
+        name: '[RAM-SR5] RAM DDR SR5'
         price_unit: 50.0
         product_id: product.product_product_13
         product_uom: product.product_uom_unit
@@ -114,7 +114,7 @@
         to_invoice: 1
         type: add
     fees_lines:
-      - name: 'HDD3 Seagate repair fees'
+      - name: 'RAM fees'
         product_id: product.product_product_13
         product_uom_qty: 1.0
         product_uom: product.product_uom_unit
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 55cbe49c75b..d3a55ab32c1 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -34,16 +34,11 @@
                    <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" class="oe_highlight"/>
                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
                    <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
-                   <button name="action_cancel" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="object" attrs="{'invisible':[('invoice_method','!=','none')]}"/>
-                   <button name="action_cancel" states="invoice_except" string="Cancel Repair" type="object" attrs="{'invisible':[('invoice_method','!=','none')]}"/>
+                   <button name="action_cancel" string="Cancel Repair" type="object" attrs="{'invisible':['|',('invoice_method','!=','none'), ('state', 'not in',('confirmed','2binvoiced','ready','under_repair', 'invoice_except'))]}"/>
                    <button name="cancel" states="draft" string="Cancel Repair"/>
                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done"/>
                </header>
                <sheet string="Repairs order">
-                    <label for="product_id" class="oe_edit_only"/>
-                    <h1>
-                    </h1>
-                    <label for="name" class="oe_edit_only"/>
                     <h1>
                         Repair Order <field name="name" class="oe_inline"/>
                     </h1>
@@ -189,8 +184,8 @@
                 </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
             </form>
         </field>
diff --git a/addons/mrp_repair/mrp_repair_workflow.xml b/addons/mrp_repair/mrp_repair_workflow.xml
index 51485597dc3..4cc592ce058 100644
--- a/addons/mrp_repair/mrp_repair_workflow.xml
+++ b/addons/mrp_repair/mrp_repair_workflow.xml
@@ -144,7 +144,7 @@
         <record id="trans_ready_repair_start" model="workflow.transition">
             <field name="act_from" ref="act_repair_ready"/>
             <field name="act_to" ref="act_repair_start"/>
-            <field name="signal">action_repair_start</field>
+            <field name="signal">repair_ready</field>
         </record>
 
        <record id="trans_repair_repair_end" model="workflow.transition">
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index be5737d4b85..202ed6e4684 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -312,7 +312,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line.price_unit) ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, currency_obj = o.pricelist_id.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -337,7 +337,7 @@
           <para style="terp_default_Right_9">[[ formatLang(fees.price_unit) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(fees.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(fees.price_subtotal, currency_obj = o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -353,7 +353,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="P26">[[ formatLang(o.amount_untaxed, dp='Sale Price')]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="P26">[[ formatLang(o.amount_untaxed, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
 
       </tr>
@@ -367,7 +367,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="P26">[[ formatLang(o.amount_tax, dp='Account')]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="P26">[[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -380,7 +380,7 @@
           <para style="terp_tblheader_Details">Total :</para>
         </td>
         <td>
-          <para style="terp_default_right_bold_9">[[ formatLang(total(o), dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_right_bold_9">[[ formatLang(total(o), dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/mrp_repair/test/test_mrp_repair_b4inv.yml b/addons/mrp_repair/test/test_mrp_repair_b4inv.yml
index 9ea28a9ecf4..47e301cd0bd 100644
--- a/addons/mrp_repair/test/test_mrp_repair_b4inv.yml
+++ b/addons/mrp_repair/test/test_mrp_repair_b4inv.yml
@@ -22,7 +22,7 @@
 -
   I start the Repairing process by clicking on "Start Repair" button.
 -
-  !workflow {model: mrp.repair, action: action_repair_start, ref: mrp_repair_rmrp2}
+  !workflow {model: mrp.repair, action: repair_ready, ref: mrp_repair_rmrp2}
 -
   Repairing process for this product is in Done state and I end this process by clicking on "End Repair" button for Invoice Method 'Before Repair'.
 -
diff --git a/addons/mrp_repair/test/test_mrp_repair_cancel.yml b/addons/mrp_repair/test/test_mrp_repair_cancel.yml
index 6a355f35b41..ee0e9c379e7 100644
--- a/addons/mrp_repair/test/test_mrp_repair_cancel.yml
+++ b/addons/mrp_repair/test/test_mrp_repair_cancel.yml
@@ -1,6 +1,6 @@
 -
   In order to test the cancel flow of mrp_repair module,
-  I start by creating new copy Repair order for "Basic PC" product.
+  I start by creating new copy Repair order for "PC Assemble SC234" product.
 -
   !python {model: mrp.repair}: |
     copy_id = self.copy(cr, uid, ref("mrp_repair_rmrp1"))
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index 431cf0d54b4..21d71064901 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -27,7 +27,8 @@
             view_mode="form"
             target="new"        
             key2="client_action_multi"    
-            id="act_mrp_repair_invoice"/>        
+            id="act_mrp_repair_invoice"
+            multi="True"/>        
         
     </data>
 </openerp>    
diff --git a/addons/mrp_subproduct/i18n/ab.po b/addons/mrp_subproduct/i18n/ab.po
index 08f531680cc..d68a7fc090d 100644
--- a/addons/mrp_subproduct/i18n/ab.po
+++ b/addons/mrp_subproduct/i18n/ab.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/ar.po b/addons/mrp_subproduct/i18n/ar.po
index 9c6188155e1..36c8c87678f 100644
--- a/addons/mrp_subproduct/i18n/ar.po
+++ b/addons/mrp_subproduct/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/bg.po b/addons/mrp_subproduct/i18n/bg.po
index 75cb71a1bb4..aa8bd4efc38 100644
--- a/addons/mrp_subproduct/i18n/bg.po
+++ b/addons/mrp_subproduct/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/bs.po b/addons/mrp_subproduct/i18n/bs.po
index f3cbb1aa6e2..031fe71cc38 100644
--- a/addons/mrp_subproduct/i18n/bs.po
+++ b/addons/mrp_subproduct/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/ca.po b/addons/mrp_subproduct/i18n/ca.po
index f2801496cad..ecf7b285bb1 100644
--- a/addons/mrp_subproduct/i18n/ca.po
+++ b/addons/mrp_subproduct/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/cs.po b/addons/mrp_subproduct/i18n/cs.po
index 6ff4a1b89e0..1bdd4711133 100644
--- a/addons/mrp_subproduct/i18n/cs.po
+++ b/addons/mrp_subproduct/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/da.po b/addons/mrp_subproduct/i18n/da.po
index 4f20e32f3f1..f508223550b 100644
--- a/addons/mrp_subproduct/i18n/da.po
+++ b/addons/mrp_subproduct/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/de.po b/addons/mrp_subproduct/i18n/de.po
index bd517814f94..8169df370a6 100644
--- a/addons/mrp_subproduct/i18n/de.po
+++ b/addons/mrp_subproduct/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/es.po b/addons/mrp_subproduct/i18n/es.po
index fc33fe80d7c..5e25605010d 100644
--- a/addons/mrp_subproduct/i18n/es.po
+++ b/addons/mrp_subproduct/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/es_AR.po b/addons/mrp_subproduct/i18n/es_AR.po
index c93ef9c1638..0b0dae163c1 100644
--- a/addons/mrp_subproduct/i18n/es_AR.po
+++ b/addons/mrp_subproduct/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/es_CR.po b/addons/mrp_subproduct/i18n/es_CR.po
index 86268bc1843..e961e6cf129 100644
--- a/addons/mrp_subproduct/i18n/es_CR.po
+++ b/addons/mrp_subproduct/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: mrp_subproduct
diff --git a/addons/mrp_subproduct/i18n/es_EC.po b/addons/mrp_subproduct/i18n/es_EC.po
index ab0ed28a640..439fdc6f29e 100644
--- a/addons/mrp_subproduct/i18n/es_EC.po
+++ b/addons/mrp_subproduct/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/et.po b/addons/mrp_subproduct/i18n/et.po
index dbe54005fb5..6de3d1c86b1 100644
--- a/addons/mrp_subproduct/i18n/et.po
+++ b/addons/mrp_subproduct/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/fi.po b/addons/mrp_subproduct/i18n/fi.po
index 7e9d86833ce..7638fe5be58 100644
--- a/addons/mrp_subproduct/i18n/fi.po
+++ b/addons/mrp_subproduct/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/fr.po b/addons/mrp_subproduct/i18n/fr.po
index 006cb507bc6..d964a4057cf 100644
--- a/addons/mrp_subproduct/i18n/fr.po
+++ b/addons/mrp_subproduct/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -52,6 +52,8 @@ msgstr "Ordre de fabrication"
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
 msgstr ""
+"Le produit de la ligne de la nomenclature ne devrait pas être le même "
+"produit que celui de la nomenclature."
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -86,7 +88,7 @@ msgstr "Nomenclature"
 #. module: mrp_subproduct
 #: sql_constraint:mrp.production:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "La référence doit être unique par société !"
 
 #. module: mrp_subproduct
 #: field:mrp.bom,sub_products:0
@@ -106,7 +108,7 @@ msgstr "Sous-produit"
 #. module: mrp_subproduct
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "La quantité commandée ne peut pas être nulle ou négative !"
 
 #. module: mrp_subproduct
 #: help:mrp.subproduct,subproduct_type:0
@@ -123,7 +125,7 @@ msgstr ""
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de nomenclature récursive."
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/mrp_subproduct/i18n/gl.po b/addons/mrp_subproduct/i18n/gl.po
index e020d6d764f..537f7e30849 100644
--- a/addons/mrp_subproduct/i18n/gl.po
+++ b/addons/mrp_subproduct/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/hr.po b/addons/mrp_subproduct/i18n/hr.po
index 4fc2349db48..335bce94df0 100644
--- a/addons/mrp_subproduct/i18n/hr.po
+++ b/addons/mrp_subproduct/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/hu.po b/addons/mrp_subproduct/i18n/hu.po
index e96c1d25e56..002afe9eee6 100644
--- a/addons/mrp_subproduct/i18n/hu.po
+++ b/addons/mrp_subproduct/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/id.po b/addons/mrp_subproduct/i18n/id.po
index e73364df8be..9eb793bb42b 100644
--- a/addons/mrp_subproduct/i18n/id.po
+++ b/addons/mrp_subproduct/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/it.po b/addons/mrp_subproduct/i18n/it.po
index be8a54ee73f..ba4a3aff6a2 100644
--- a/addons/mrp_subproduct/i18n/it.po
+++ b/addons/mrp_subproduct/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/ja.po b/addons/mrp_subproduct/i18n/ja.po
index 0c863129217..552c83e0600 100644
--- a/addons/mrp_subproduct/i18n/ja.po
+++ b/addons/mrp_subproduct/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/ko.po b/addons/mrp_subproduct/i18n/ko.po
index 9c9cad23b6b..aee80f59390 100644
--- a/addons/mrp_subproduct/i18n/ko.po
+++ b/addons/mrp_subproduct/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/lt.po b/addons/mrp_subproduct/i18n/lt.po
index fe33f25fabd..d6667cb6d60 100644
--- a/addons/mrp_subproduct/i18n/lt.po
+++ b/addons/mrp_subproduct/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/mn.po b/addons/mrp_subproduct/i18n/mn.po
index 8b573c20cd5..5b90b853008 100644
--- a/addons/mrp_subproduct/i18n/mn.po
+++ b/addons/mrp_subproduct/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/nb.po b/addons/mrp_subproduct/i18n/nb.po
new file mode 100644
index 00000000000..3b9bea7b91d
--- /dev/null
+++ b/addons/mrp_subproduct/i18n/nb.po
@@ -0,0 +1,132 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:49+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Fixed"
+msgstr "Fast"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.bom:0
+msgid ""
+"All product quantities must be greater than 0.\n"
+"You should install the mrp_subproduct module if you want to manage extra "
+"products on BoMs !"
+msgstr ""
+"Alle produktantall må være større en 0.\n"
+"Du bør installere modulen mrp:subproduct hvis du vil håndtere ekstra "
+"produkter på Materiallister !"
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "sub products"
+msgstr "Sub produkter"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Produksjonsordre"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "BoM line product should not be same as BoM product."
+msgstr "Bom linje produktet bør ikke være det samme som BOM produkt."
+
+#. module: mrp_subproduct
+#: view:mrp.bom:0
+msgid "Sub Products"
+msgstr "Sub produkter."
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,subproduct_type:0
+msgid "Quantity Type"
+msgstr "Antall Type."
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_bom
+msgid "Bill of Material"
+msgstr "Materialliste"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_qty:0
+msgid "Product Qty"
+msgstr "Produkt Ant"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,product_uom:0
+msgid "Product UOM"
+msgstr "Produkt Enhet"
+
+#. module: mrp_subproduct
+#: field:mrp.subproduct,bom_id:0
+msgid "BoM"
+msgstr "Materialliste"
+
+#. module: mrp_subproduct
+#: sql_constraint:mrp.production:0
+msgid "Reference must be unique per Company!"
+msgstr "Referanse må være unik pr firma!"
+
+#. module: mrp_subproduct
+#: field:mrp.bom,sub_products:0
+msgid "sub_products"
+msgstr "Sub_produkter."
+
+#. module: mrp_subproduct
+#: selection:mrp.subproduct,subproduct_type:0
+msgid "Variable"
+msgstr "Variabel"
+
+#. module: mrp_subproduct
+#: model:ir.model,name:mrp_subproduct.model_mrp_subproduct
+msgid "Sub Product"
+msgstr "Sub produkt."
+
+#. module: mrp_subproduct
+#: constraint:mrp.production:0
+msgid "Order quantity cannot be negative or zero!"
+msgstr "Ordrekvantum kan ikke være negativt eller null!"
+
+#. module: mrp_subproduct
+#: help:mrp.subproduct,subproduct_type:0
+msgid ""
+"Define how the quantity of subproducts will be set on the production orders "
+"using this BoM.  'Fixed' depicts a situation where the quantity of created "
+"subproduct is always equal to the quantity set on the BoM, regardless of how "
+"many are created in the production order.  By opposition, 'Variable' means "
+"that the quantity will be computed as    '(quantity of subproduct set on the "
+"BoM / quantity of manufactured product set on the BoM * quantity of "
+"manufactured product in the production order.)'"
+msgstr ""
+"Definere hvordan mengden av delkomponenter vil bli satt på produksjonsordrer "
+"ved hjelp av denne BOM. 'Fast' beskriver en situasjon der mengden av laget "
+"subproduct er alltid lik mengde sett på BOM, uavhengig av hvor mange som er "
+"skapt i produksjonen rekkefølge. Av motstand, 'variabel' betyr at mengden "
+"vil bli beregnet som '(mengde subproduct satt på BOM / mengde produsert "
+"produkt satt på BOM * mengde produsert produkt i produksjonen rekkefølge.)'"
+
+#. module: mrp_subproduct
+#: constraint:mrp.bom:0
+msgid "Error ! You cannot create recursive BoM."
+msgstr "Feil! Du kan ikke lage en rekursive BoM."
diff --git a/addons/mrp_subproduct/i18n/nl.po b/addons/mrp_subproduct/i18n/nl.po
index db84c2c5645..171c8842aaa 100644
--- a/addons/mrp_subproduct/i18n/nl.po
+++ b/addons/mrp_subproduct/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-18 14:58+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -40,7 +40,7 @@ msgstr ""
 #. module: mrp_subproduct
 #: view:mrp.bom:0
 msgid "sub products"
-msgstr "Deel producten"
+msgstr "Bijproducten"
 
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_production
@@ -51,13 +51,13 @@ msgstr "Productieorder"
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
 msgstr ""
-"Grondstoffenregel producten zouden niet hetzelfde moeten zijn als het "
+"Materiaallijstregels producten zouden niet hetzelfde moeten zijn als het "
 "samengestelde product"
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
 msgid "Sub Products"
-msgstr "Deel producten"
+msgstr "Bijproducten"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,subproduct_type:0
@@ -67,7 +67,7 @@ msgstr "Hoeveelheid type"
 #. module: mrp_subproduct
 #: model:ir.model,name:mrp_subproduct.model_mrp_bom
 msgid "Bill of Material"
-msgstr "Samengesteld product"
+msgstr "Materiaallijst"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_qty:0
@@ -82,7 +82,7 @@ msgstr "Product maateenheid"
 #. module: mrp_subproduct
 #: field:mrp.subproduct,bom_id:0
 msgid "BoM"
-msgstr "Stuklijst"
+msgstr "Materiaallijst"
 
 #. module: mrp_subproduct
 #: sql_constraint:mrp.production:0
@@ -92,7 +92,7 @@ msgstr "Referentie moet uniek zijn per bedrijf!"
 #. module: mrp_subproduct
 #: field:mrp.bom,sub_products:0
 msgid "sub_products"
-msgstr "Deelproducten"
+msgstr "Bijproducten"
 
 #. module: mrp_subproduct
 #: selection:mrp.subproduct,subproduct_type:0
@@ -121,19 +121,18 @@ msgid ""
 "manufactured product in the production order.)'"
 msgstr ""
 "Geef aan hoe de hoeveelheid deelproducten zal worden ingesteld op de "
-"productieorders met behulp van deze grondstoffenlijst. 'Vaste' geeft een "
-"situatie aan waarbij de hoeveelheid aangemaakt subproduct gelijk is aan de "
-"hoeveelheid set op de grondstoffenlijst, ongeacht hoeveel er gemaakt zijn in "
-"de productieorder. Tegenovergesteld is, 'Variabel'. Dit betekent dat de "
-"hoeveelheid wordt berekend als '(hoeveelheid subproduct ingesteld op de "
-"grondstoffenlijst/hoeveelheid van de vervaardigde producten ingesteld op de "
-"grondstoffenlijst* hoeveelheid vervaardigde product in de productieorder.)'"
+"productieorders met behulp van deze materiaallijst. 'Vaste' geeft een "
+"situatie aan waarbij de hoeveelheid aangemaakt bijproduct gelijk is aan de "
+"hoeveelheid set op de materiaallijst, ongeacht hoeveel er gemaakt zijn in de "
+"productieorder. Tegenovergesteld is, 'Variabel'. Dit betekent dat de "
+"hoeveelheid wordt berekend als '(hoeveelheid bijproduct ingesteld op de "
+"materiaallijst/hoeveelheid van de vervaardigde producten ingesteld op de "
+"materiaallijst* hoeveelheid vervaardigde product in de productieorder.)'"
 
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr ""
-"Fout! het is niet toegestaan een recursieve grondstoffenlijst te maken"
+msgstr "Fout! het is niet toegestaan een recursieve materiaallijst te maken"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Ongeldige XML voor overzicht"
diff --git a/addons/mrp_subproduct/i18n/nl_BE.po b/addons/mrp_subproduct/i18n/nl_BE.po
index 249ba1fcf01..aae95b32570 100644
--- a/addons/mrp_subproduct/i18n/nl_BE.po
+++ b/addons/mrp_subproduct/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/oc.po b/addons/mrp_subproduct/i18n/oc.po
index 7daa94d64b4..b389b79e943 100644
--- a/addons/mrp_subproduct/i18n/oc.po
+++ b/addons/mrp_subproduct/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/pl.po b/addons/mrp_subproduct/i18n/pl.po
index 42b23df9897..83db55c7f25 100644
--- a/addons/mrp_subproduct/i18n/pl.po
+++ b/addons/mrp_subproduct/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/pt.po b/addons/mrp_subproduct/i18n/pt.po
index d8cd66268c0..c2b361983cf 100644
--- a/addons/mrp_subproduct/i18n/pt.po
+++ b/addons/mrp_subproduct/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/pt_BR.po b/addons/mrp_subproduct/i18n/pt_BR.po
index 62c5b6baabb..52b19645950 100644
--- a/addons/mrp_subproduct/i18n/pt_BR.po
+++ b/addons/mrp_subproduct/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -50,7 +50,7 @@ msgstr "Ordem de Produção"
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
 msgid "BoM line product should not be same as BoM product."
-msgstr ""
+msgstr "Produtos de linha BoM não devem ser os mesmo que produtos BoM"
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -118,6 +118,13 @@ msgid ""
 "BoM / quantity of manufactured product set on the BoM * quantity of "
 "manufactured product in the production order.)'"
 msgstr ""
+"Definir como a quantidade de subprodutos será definido em ordens de produção "
+"que utilizam este BoM. 'Fixo' retrata uma situação em caso de a quantidade "
+"de subproduto criado é sempre definido igual à quantidade no BOM, "
+"Independentemente de quantos são criados na ordem de saída. Por outro lado, "
+"'Variável' significa que essa será a quantidade calculada como \"(quantidade "
+"de conjunto subproduto no. BoM / quantidade de produto fabricado definido na "
+"quantidade de produto BoM * Fabricado na Ordem de Produção)\""
 
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
diff --git a/addons/mrp_subproduct/i18n/ro.po b/addons/mrp_subproduct/i18n/ro.po
index 505cce3b657..66809acbb51 100644
--- a/addons/mrp_subproduct/i18n/ro.po
+++ b/addons/mrp_subproduct/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/ru.po b/addons/mrp_subproduct/i18n/ru.po
index 62637d8ec47..4b2bfd899f4 100644
--- a/addons/mrp_subproduct/i18n/ru.po
+++ b/addons/mrp_subproduct/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/sk.po b/addons/mrp_subproduct/i18n/sk.po
index 78990be5ab6..bc677b44c3a 100644
--- a/addons/mrp_subproduct/i18n/sk.po
+++ b/addons/mrp_subproduct/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/sl.po b/addons/mrp_subproduct/i18n/sl.po
index 770dc0187fc..5276100aced 100644
--- a/addons/mrp_subproduct/i18n/sl.po
+++ b/addons/mrp_subproduct/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/sq.po b/addons/mrp_subproduct/i18n/sq.po
index c3c52d5bbe5..61025f841c7 100644
--- a/addons/mrp_subproduct/i18n/sq.po
+++ b/addons/mrp_subproduct/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/sr.po b/addons/mrp_subproduct/i18n/sr.po
index 25ba5836ad2..f2d6883c3d8 100644
--- a/addons/mrp_subproduct/i18n/sr.po
+++ b/addons/mrp_subproduct/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/sr@latin.po b/addons/mrp_subproduct/i18n/sr@latin.po
index 49a7897f9b3..0eb88b043c4 100644
--- a/addons/mrp_subproduct/i18n/sr@latin.po
+++ b/addons/mrp_subproduct/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/sv.po b/addons/mrp_subproduct/i18n/sv.po
index 001e3927440..74c7c9ec079 100644
--- a/addons/mrp_subproduct/i18n/sv.po
+++ b/addons/mrp_subproduct/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/tlh.po b/addons/mrp_subproduct/i18n/tlh.po
index f06b88e382f..d261615fb3d 100644
--- a/addons/mrp_subproduct/i18n/tlh.po
+++ b/addons/mrp_subproduct/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_subproduct/i18n/tr.po
index 04b0b26e43f..d1eb0e7ac76 100644
--- a/addons/mrp_subproduct/i18n/tr.po
+++ b/addons/mrp_subproduct/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
@@ -118,6 +118,13 @@ msgid ""
 "BoM / quantity of manufactured product set on the BoM * quantity of "
 "manufactured product in the production order.)'"
 msgstr ""
+"Yanürünlerin miktarının Gereç Listeleri ni kullanarak üretim emirlerinde "
+"nasıl ayarlanacağını tanımlayın. 'Sabit', oluşturulan yanürün miktarının, "
+"sipariş emrinde kaç tane oluşturulduğuna bakılmaksızın,  her zaman Gereç "
+"Listesinde ayarlanan miktara eşit olduğunu belirtir. Buna karşın, 'Değişken' "
+"ise miktarın şu şekilde hesaplanağı anlamına gelir '(Gereç Listesinde "
+"ayarlanan yanürün miktarı / Gereç Listesinde ayarlanan üretim miktarı * "
+"üretim emrindeki üretilen ürün miktarı.)'"
 
 #. module: mrp_subproduct
 #: constraint:mrp.bom:0
diff --git a/addons/mrp_subproduct/i18n/uk.po b/addons/mrp_subproduct/i18n/uk.po
index 4012f41120e..458962d0196 100644
--- a/addons/mrp_subproduct/i18n/uk.po
+++ b/addons/mrp_subproduct/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/vi.po b/addons/mrp_subproduct/i18n/vi.po
index 0070a388064..98dd10883e1 100644
--- a/addons/mrp_subproduct/i18n/vi.po
+++ b/addons/mrp_subproduct/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/zh_CN.po b/addons/mrp_subproduct/i18n/zh_CN.po
index 32002ce7d3f..12808ef64c8 100644
--- a/addons/mrp_subproduct/i18n/zh_CN.po
+++ b/addons/mrp_subproduct/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/mrp_subproduct/i18n/zh_TW.po b/addons/mrp_subproduct/i18n/zh_TW.po
index 30d6072f785..f76aa36352e 100644
--- a/addons/mrp_subproduct/i18n/zh_TW.po
+++ b/addons/mrp_subproduct/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: mrp_subproduct
 #: field:mrp.subproduct,product_id:0
diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py
index c8e06b5cf2b..bbaa161ee57 100644
--- a/addons/multi_company/__openerp__.py
+++ b/addons/multi_company/__openerp__.py
@@ -34,19 +34,13 @@ This module is the base module for other multi-company modules.
     'website': 'http://www.openerp.com/',
     'depends': [
         'base',
-        'sale',
+        'sale_stock',
         'project',
     ],
-    'init_xml': [],
-    'update_xml': [
-        'res_company_view.xml'
-    ],
-    'demo_xml': [
-        'multi_company_demo.xml'
-    ],
+    'data': ['res_company_view.xml'],
+    'demo': ['multi_company_demo.xml'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001115526094673097933',
     'images': ['images/companies.jpeg','images/default_company_per_object_form.jpeg', 'images/default_company_per_object_list.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/multi_company/i18n/ar.po b/addons/multi_company/i18n/ar.po
index 81134c91186..8203e2eec0d 100644
--- a/addons/multi_company/i18n/ar.po
+++ b/addons/multi_company/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/bg.po b/addons/multi_company/i18n/bg.po
index 062718e18c9..2aad02d516a 100644
--- a/addons/multi_company/i18n/bg.po
+++ b/addons/multi_company/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/bs.po b/addons/multi_company/i18n/bs.po
index b92dc46bcf7..2c93d9062c6 100644
--- a/addons/multi_company/i18n/bs.po
+++ b/addons/multi_company/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/ca.po b/addons/multi_company/i18n/ca.po
index ee7d14a004d..460a5470541 100644
--- a/addons/multi_company/i18n/ca.po
+++ b/addons/multi_company/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/cs.po b/addons/multi_company/i18n/cs.po
index 5aeae4eb5b6..cf4fe22c991 100644
--- a/addons/multi_company/i18n/cs.po
+++ b/addons/multi_company/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/da.po b/addons/multi_company/i18n/da.po
index a5bd6b124fa..05324630687 100644
--- a/addons/multi_company/i18n/da.po
+++ b/addons/multi_company/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/de.po b/addons/multi_company/i18n/de.po
index 04d2c6fa088..36d70e9f3b3 100644
--- a/addons/multi_company/i18n/de.po
+++ b/addons/multi_company/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/es.po b/addons/multi_company/i18n/es.po
index fba66ed2567..abf1e00363a 100644
--- a/addons/multi_company/i18n/es.po
+++ b/addons/multi_company/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/es_CR.po b/addons/multi_company/i18n/es_CR.po
index 6dc260a577c..67d0f84f1a2 100644
--- a/addons/multi_company/i18n/es_CR.po
+++ b/addons/multi_company/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: multi_company
diff --git a/addons/multi_company/i18n/es_EC.po b/addons/multi_company/i18n/es_EC.po
index fe8948f727b..622633cf05c 100644
--- a/addons/multi_company/i18n/es_EC.po
+++ b/addons/multi_company/i18n/es_EC.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/et.po b/addons/multi_company/i18n/et.po
index 07ee60051b7..7a85702b9f5 100644
--- a/addons/multi_company/i18n/et.po
+++ b/addons/multi_company/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/fi.po b/addons/multi_company/i18n/fi.po
index 52147cadd57..820e8ec9a5f 100644
--- a/addons/multi_company/i18n/fi.po
+++ b/addons/multi_company/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/fr.po b/addons/multi_company/i18n/fr.po
index a7bb785f50c..0d6c314e822 100644
--- a/addons/multi_company/i18n/fr.po
+++ b/addons/multi_company/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/gl.po b/addons/multi_company/i18n/gl.po
index fc1456ac273..42c38c70b29 100644
--- a/addons/multi_company/i18n/gl.po
+++ b/addons/multi_company/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/hr.po b/addons/multi_company/i18n/hr.po
index 9dd2411dc90..7922614de83 100644
--- a/addons/multi_company/i18n/hr.po
+++ b/addons/multi_company/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/hu.po b/addons/multi_company/i18n/hu.po
index b4661c223f9..98f294b342c 100644
--- a/addons/multi_company/i18n/hu.po
+++ b/addons/multi_company/i18n/hu.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/id.po b/addons/multi_company/i18n/id.po
index 424dba5c066..7e5beb83b9b 100644
--- a/addons/multi_company/i18n/id.po
+++ b/addons/multi_company/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/it.po b/addons/multi_company/i18n/it.po
index 3a4dd3f3046..d84b219554e 100644
--- a/addons/multi_company/i18n/it.po
+++ b/addons/multi_company/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/ja.po b/addons/multi_company/i18n/ja.po
index 5e1a9826f35..358452e145f 100644
--- a/addons/multi_company/i18n/ja.po
+++ b/addons/multi_company/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/lo.po b/addons/multi_company/i18n/lo.po
new file mode 100644
index 00000000000..8a5fbecb7a7
--- /dev/null
+++ b/addons/multi_company/i18n/lo.po
@@ -0,0 +1,83 @@
+# Lao translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-20 18:49+0000\n"
+"Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
+"Language-Team: Lao <lo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: multi_company
+#: model:res.company,overdue_msg:multi_company.res_company_odoo
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_be
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_editor
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_in
+#: model:res.company,overdue_msg:multi_company.res_company_oerp_us
+msgid ""
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Dear %(partner_name)s,\n"
+"\n"
+"Please find in attachment a reminder of all your unpaid invoices, for a "
+"total amount due of:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Thanks,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
+msgstr ""
+
+#. module: multi_company
+#: model:product.category,name:multi_company.Odoo1
+msgid "Odoo Offers"
+msgstr ""
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Returning"
+msgstr "ສິນຄ້າກັບຄືນ"
+
+#. module: multi_company
+#: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
+msgid "Multi-Companies"
+msgstr "ໝູ່ບໍລິສັດ"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Multi Company"
+msgstr ""
+
+#. module: multi_company
+#: model:ir.actions.act_window,name:multi_company.action_inventory_form
+#: model:ir.ui.menu,name:multi_company.menu_action_inventory_form
+msgid "Default Company per Object"
+msgstr ""
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Matching"
+msgstr "ຕົງກັບ"
+
+#. module: multi_company
+#: view:multi_company.default:0
+msgid "Condition"
+msgstr "ຂໍ້ຜູກມັດ"
+
+#. module: multi_company
+#: model:product.template,name:multi_company.product_product_odoo1_product_template
+msgid "Odoo Offer"
+msgstr ""
diff --git a/addons/multi_company/i18n/lt.po b/addons/multi_company/i18n/lt.po
index 2a0cb5c352a..4703a3f5839 100644
--- a/addons/multi_company/i18n/lt.po
+++ b/addons/multi_company/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/lv.po b/addons/multi_company/i18n/lv.po
index d5676163304..f37d45f176a 100644
--- a/addons/multi_company/i18n/lv.po
+++ b/addons/multi_company/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/mn.po b/addons/multi_company/i18n/mn.po
index 5b68f6ebb3a..e7d9ea89893 100644
--- a/addons/multi_company/i18n/mn.po
+++ b/addons/multi_company/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/nb.po b/addons/multi_company/i18n/nb.po
index 032a6fb88da..e1813b9a502 100644
--- a/addons/multi_company/i18n/nb.po
+++ b/addons/multi_company/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -40,21 +40,36 @@ msgid ""
 "%(company_name)s\n"
 "        "
 msgstr ""
+"\n"
+"Dato:% (dato) s\n"
+"\n"
+"Kjære% (partner_navn) s,\n"
+"\n"
+"Vennligst finne i vedlegg en påminnelse om alle ubetalte fakturaer, for et "
+"samlet beløp på grunn av:\n"
+"\n"
+"% (followup_amount) .2 f% (selskapets valuta) s\n"
+"\n"
+"takk,\n"
+"-\n"
+"% (bruker_signatur) s\n"
+"% (firma_navn) s\n"
+"        "
 
 #. module: multi_company
 #: model:product.category,name:multi_company.Odoo1
 msgid "Odoo Offers"
-msgstr ""
+msgstr "Odoo Tilbud"
 
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Returning"
-msgstr ""
+msgstr "Retur"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
 msgid "Multi-Companies"
-msgstr ""
+msgstr "Fler-selskaper"
 
 #. module: multi_company
 #: view:multi_company.default:0
@@ -70,7 +85,7 @@ msgstr "Default firma pr. objekt"
 #. module: multi_company
 #: view:multi_company.default:0
 msgid "Matching"
-msgstr ""
+msgstr "Matchende"
 
 #. module: multi_company
 #: view:multi_company.default:0
@@ -80,4 +95,4 @@ msgstr "Betingelse"
 #. module: multi_company
 #: model:product.template,name:multi_company.product_product_odoo1_product_template
 msgid "Odoo Offer"
-msgstr ""
+msgstr "Odoo tilbud."
diff --git a/addons/multi_company/i18n/nl.po b/addons/multi_company/i18n/nl.po
index e091acb0cef..73dac5a3947 100644
--- a/addons/multi_company/i18n/nl.po
+++ b/addons/multi_company/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/oc.po b/addons/multi_company/i18n/oc.po
index d8ca8510844..2f43dd87e32 100644
--- a/addons/multi_company/i18n/oc.po
+++ b/addons/multi_company/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/pl.po b/addons/multi_company/i18n/pl.po
index a59dca7d029..78e0840ed50 100644
--- a/addons/multi_company/i18n/pl.po
+++ b/addons/multi_company/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/pt.po b/addons/multi_company/i18n/pt.po
index 1b4dc7fb73e..a622993a91a 100644
--- a/addons/multi_company/i18n/pt.po
+++ b/addons/multi_company/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/pt_BR.po b/addons/multi_company/i18n/pt_BR.po
index a5adb881bfb..f958dff12c6 100644
--- a/addons/multi_company/i18n/pt_BR.po
+++ b/addons/multi_company/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/ro.po b/addons/multi_company/i18n/ro.po
index 9dd70de28c5..413a0016790 100644
--- a/addons/multi_company/i18n/ro.po
+++ b/addons/multi_company/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\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 0d8003cbfae..4000b8b8c3e 100644
--- a/addons/multi_company/i18n/ru.po
+++ b/addons/multi_company/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-18 04:58+0000\n"
-"X-Generator: Launchpad (build 15810)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/sl.po b/addons/multi_company/i18n/sl.po
index 159cb8be659..41fe523a627 100644
--- a/addons/multi_company/i18n/sl.po
+++ b/addons/multi_company/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/sr.po b/addons/multi_company/i18n/sr.po
index 7bf61126074..1d69396b40b 100644
--- a/addons/multi_company/i18n/sr.po
+++ b/addons/multi_company/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/sr@latin.po b/addons/multi_company/i18n/sr@latin.po
index d2d455d0d40..3c2ccc2d150 100644
--- a/addons/multi_company/i18n/sr@latin.po
+++ b/addons/multi_company/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/sv.po b/addons/multi_company/i18n/sv.po
index c29adf1a645..c9f15381498 100644
--- a/addons/multi_company/i18n/sv.po
+++ b/addons/multi_company/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/tr.po b/addons/multi_company/i18n/tr.po
index 054b3e59f97..8a80588354a 100644
--- a/addons/multi_company/i18n/tr.po
+++ b/addons/multi_company/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/uk.po b/addons/multi_company/i18n/uk.po
index c72d2868ef2..a8838139ed6 100644
--- a/addons/multi_company/i18n/uk.po
+++ b/addons/multi_company/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/vi.po b/addons/multi_company/i18n/vi.po
index 8d12d7bcbdb..b85952ad57f 100644
--- a/addons/multi_company/i18n/vi.po
+++ b/addons/multi_company/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/zh_CN.po b/addons/multi_company/i18n/zh_CN.po
index 0b6079319e2..b6dc0e7ba5c 100644
--- a/addons/multi_company/i18n/zh_CN.po
+++ b/addons/multi_company/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/i18n/zh_TW.po b/addons/multi_company/i18n/zh_TW.po
index 7af4b289aa8..91270f9ab93 100644
--- a/addons/multi_company/i18n/zh_TW.po
+++ b/addons/multi_company/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 462a355e789..00c68186108 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -52,47 +52,12 @@
 
 <!--                      User                        -->
 
-        <record id="res_users_editor_demo" model="res.users">
-            <field name="password">editor_demo</field>
-            <field name="name">OpenERP Editor</field>
-            <field name="login">editor_demo</field>
-            <field name="company_id" ref="res_company_oerp_editor"/>
-            <field name="company_ids" eval="[(4, ref('res_company_oerp_editor'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
+        <record id="base.user_root" model="res.users">
+            <field name="company_ids" eval="[(4, ref('res_company_oerp_editor')),(4, ref('res_company_oerp_us')),(4, ref('res_company_oerp_be'))]"/>
         </record>
-        <record id="res_users_sales_demo_us" model="res.users">
-            <field name="password">sales_demo_us</field>
-            <field name="name">OpenERP Salesman US</field>
-            <field name="login">sales_demo_us</field>
-            <field name="company_id" ref="res_company_oerp_us"/>
-            <field name="company_ids" eval="[(4, ref('res_company_oerp_us'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
+        <record id="base.user_demo" model="res.users">
+            <field name="company_ids" eval="[(4, ref('res_company_oerp_us')),(4, ref('res_company_oerp_be')),(4, ref('res_company_odoo'))]"/>
         </record>
-        <record id="res_users_sales_demo_be" model="res.users">
-            <field name="password">sales_demo_be</field>
-            <field name="name">OpenERP Salesman BE</field>
-            <field name="login">sales_demo_be</field>
-            <field name="company_id" ref="res_company_oerp_be"/>
-            <field name="company_ids" eval="[(4, ref('res_company_oerp_be'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
-        </record>
-        <record id="res_users_sales_demo_in" model="res.users">
-            <field name="password">sales_demo_in</field>
-            <field name="name">OpenERP Salesman IN</field>
-            <field name="login">sales_demo_in</field>
-            <field name="company_id" ref="res_company_oerp_in"/>
-            <field name="company_ids" eval="[(4, ref('res_company_oerp_in'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
-        </record>
-        <record id="res_users_odoo_demo" model="res.users">
-            <field name="password">odoo_demo</field>
-            <field name="name">Odoo</field>
-            <field name="login">odoo_demo</field>
-            <field name="company_id" ref="res_company_odoo"/>
-            <field name="company_ids" eval="[(4, ref('res_company_odoo'))]"/>
-            <field name="groups_id" eval="[(6,0,[ref('base.group_user'),ref('base.group_sale_manager'),ref('project.group_project_user'),ref('account.group_account_invoice')])]"/>
-        </record>
-
 
         <!--
     Resource: product.product
@@ -216,7 +181,7 @@
         </record>
 
         <record id="sale.sale_order_5" model="sale.order">
-        <field name="company_id" ref="res_company_oerp_in"/>
+        <field name="company_id" ref="base.main_company"/>
         </record>
 
 
diff --git a/addons/import_sugarcrm/wizard/__init__.py b/addons/note/__init__.py
similarity index 91%
rename from addons/import_sugarcrm/wizard/__init__.py
rename to addons/note/__init__.py
index 08b611401b1..9bf064877b5 100644
--- a/addons/import_sugarcrm/wizard/__init__.py
+++ b/addons/note/__init__.py
@@ -19,6 +19,5 @@
 #
 ##############################################################################
 
-import import_message
+import note
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/note/__openerp__.py
similarity index 54%
rename from addons/import_sugarcrm/__openerp__.py
rename to addons/note/__openerp__.py
index f84b096e28a..797270637e2 100644
--- a/addons/import_sugarcrm/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -20,23 +20,46 @@
 ##############################################################################
 
 {
-    'name': 'SugarCRM Import',
+    'name': 'Notes',
     'version': '1.0',
-    'category': 'Customer Relationship Management',
+    'category': 'Tools',
     'description': """
-This Module Import SugarCRM Leads, Opportunities, Users, Accounts, Contacts, Employees,
-Meetings, Phonecalls, Emails, Project and Project Tasks Data into OpenERP Module.""",
+This module allows users to create their own notes inside OpenERP
+=================================================================
+
+Use notes to write meeting minutes, organize ideas, organize personnal todo
+lists, etc. Each user manages his own personnal Notes. Notes are available to
+their authors only, but they can share notes to others users so that several
+people can work on the same note in real time. It's very efficient to share
+meeting minutes.
+
+Notes can be found in the 'Home' menu.
+""",
     'author': 'OpenERP SA',
-    'website': 'http://www.openerp.com',
-    'depends': ['import_base','crm', 'document'],
-    'data': [
-        "wizard/import_message_view.xml",
-        "import_sugarcrm_view.xml",
-        "security/ir.model.access.csv",
+    'website': 'http://openerp.com',
+    'summary': 'Sticky notes, Collaborative, Memos',
+    'sequence': 9,
+    'depends': [
+        'mail',
+    ],
+    'data': [
+        'security/note_security.xml',
+        'security/ir.rule.xml',
+        'security/ir.model.access.csv',
+        'note_data.xml',
+        'note_view.xml',
+    ],
+    'demo': [
+        'note_demo.xml',
+    ],
+    'test': [
+    ],
+    'css': [
+        'static/src/css/note.css',
     ],
-    'demo': [],
-    'test': [],
     'installable': True,
+    'application': True,
     'auto_install': False,
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/note/i18n/nl.po b/addons/note/i18n/nl.po
new file mode 100644
index 00000000000..0e3baeee351
--- /dev/null
+++ b/addons/note/i18n/nl.po
@@ -0,0 +1,339 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-02 12:54+0000\n"
+"PO-Revision-Date: 2012-11-07 14:51+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-11-08 04:47+0000\n"
+"X-Generator: Launchpad (build 16232)\n"
+
+#. module: note
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "U kunt niet twee gebruikers hebben met dezelfde gebruikersnaam !"
+
+#. module: note
+#: field:note.note,memo:0
+msgid "Note Content"
+msgstr "Notitie inhoud"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stages of Notes"
+msgstr "Notitie fases"
+
+#. module: note
+#: model:ir.model,name:note.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: note
+#: model:ir.model,name:note.model_note_tag
+msgid "Note Tag"
+msgstr "Notitie label"
+
+#. module: note
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
+msgstr "Notitie / Luxe modus"
+
+#. module: note
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:0
+msgid "Note"
+msgstr "Notitie"
+
+#. module: note
+#: view:note.note:0
+msgid "Group By..."
+msgstr "Groepeer op..."
+
+#. module: note
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr "Samenvatting"
+
+#. module: note
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
+msgstr "Volgers"
+
+#. module: note
+#: model:ir.actions.act_window,help:note.action_note_note
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a personal note.\n"
+"          </p><p>\n"
+"            Use notes to organize personal tasks or notes. All\n"
+"            notes are private; no one else will be able to see them. "
+"However\n"
+"            you can share some notes with other people by inviting "
+"followers\n"
+"            on the note. (Useful for meeting minutes, especially if\n"
+"            you activate the pad feature for collaborative writings).\n"
+"          </p><p>\n"
+"            You can customize how you process your notes/tasks by adding,\n"
+"            removing or modifying columns.\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Klik om een persoonlijke notitie toe te voegen.\n"
+"          </p><p>\n"
+"            Gebruik notities om uw persoonlijke taken en notities te "
+"organiseren. Alle\n"
+"            notities zijn prive; niemand anders kan deze notities zien. "
+"Echter is het wel \n"
+"            mogenlijk om sommige notities te delen met andere gebruikers, "
+"door deze uit te nodigen\n"
+"            op een notitie. (Dit is handig voor bijvoorbeeld een "
+"gespreksverslag, en zeker als je\n"
+"            de pad mogelijkheid activeert voor het samenwerken)\n"
+"          </p><p>\n"
+"            U kunt het proces van notities en taken aanpassen door het "
+"toevoegen,\n"
+"            verwijderen of aanpassen van kolommen.\n"
+"          </p>\n"
+"        "
+
+#. module: note
+#: view:note.note:0
+msgid "kanban note"
+msgstr "kanban notitie"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_01
+#: model:note.stage,name:note.note_stage_01
+msgid "Today"
+msgstr "Vandaag"
+
+#. module: note
+#: model:ir.model,name:note.model_res_users
+msgid "Users"
+msgstr "Gebruikers"
+
+#. module: note
+#: view:note.note:0
+msgid "í"
+msgstr "í"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stage of Notes"
+msgstr "Notitie fases"
+
+#. module: note
+#: field:note.note,message_unread:0
+msgid "Unread Messages"
+msgstr "Ongelezen berichten"
+
+#. module: note
+#: field:note.note,current_partner_id:0
+msgid "unknown"
+msgstr "onbekend"
+
+#. module: note
+#: view:note.note:0
+msgid "By sticky note Category"
+msgstr "Notitie categorie"
+
+#. module: note
+#: help:note.note,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Indien aangevinkt zullen nieuwe berichten uw aandacht vragen."
+
+#. module: note
+#: field:note.stage,name:0
+msgid "Stage Name"
+msgstr "Naam fase"
+
+#. module: note
+#: field:note.note,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Is een volger"
+
+#. module: note
+#: view:note.note:0
+msgid "title"
+msgstr "titel"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_02
+#: model:note.stage,name:note.note_stage_02
+msgid "Tomorrow"
+msgstr "Morgen"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,open:0
+msgid "Active"
+msgstr "Actief"
+
+#. module: note
+#: help:note.stage,user_id:0
+msgid "Owner of the note stage."
+msgstr "Eigenaar van de berichten fase"
+
+#. module: note
+#: model:ir.ui.menu,name:note.menu_notes_stage
+msgid "Categories"
+msgstr "Categorieën"
+
+#. module: note
+#: field:note.note,message_comment_ids:0
+#: help:note.note,message_comment_ids:0
+msgid "Comments and emails"
+msgstr "Opmerkingen en e-mails."
+
+#. module: note
+#: field:note.tag,name:0
+msgid "Tag Name"
+msgstr "Label naam"
+
+#. module: note
+#: field:note.note,message_ids:0
+msgid "Messages"
+msgstr "Berichten"
+
+#. module: note
+#: view:base.config.settings:0
+#: model:ir.actions.act_window,name:note.action_note_note
+#: model:ir.ui.menu,name:note.menu_note_notes
+#: view:note.note:0
+#: model:note.stage,name:note.note_stage_04
+msgid "Notes"
+msgstr "Notities"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_03
+#: model:note.stage,name:note.note_stage_03
+msgid "Later"
+msgstr "Later"
+
+#. module: note
+#: model:ir.model,name:note.model_note_stage
+msgid "Note Stage"
+msgstr "Notitie fase"
+
+#. module: note
+#: view:note.note:0
+msgid "dropdown menu"
+msgstr "keuze menu"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+msgid "Morning"
+msgstr "Ochtend"
+
+#. module: note
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "Wordt gebruikt om de notitie fases te sorteren"
+
+#. module: note
+#: view:note.note:0
+msgid "W"
+msgstr "W"
+
+#. module: note
+#: field:note.note,stage_ids:0
+msgid "Stages of Users"
+msgstr "Gebrukers fases"
+
+#. module: note
+#: field:note.note,name:0
+msgid "Note Summary"
+msgstr "Notitie samenvatting"
+
+#. module: note
+#: model:ir.actions.act_window,name:note.action_note_stage
+#: view:note.note:0
+msgid "Stages"
+msgstr "Fases"
+
+#. module: note
+#: help:note.note,message_ids:0
+msgid "Messages and communication history"
+msgstr "Berichten en communicatie historie"
+
+#. module: note
+#: view:note.note:0
+msgid "Delete"
+msgstr "Verwijderen"
+
+#. module: note
+#: field:note.note,color:0
+msgid "Color Index"
+msgstr "Kleur index"
+
+#. module: note
+#: field:note.note,sequence:0
+#: field:note.stage,sequence:0
+msgid "Sequence"
+msgstr "Reeks"
+
+#. module: note
+#: field:note.note,tag_ids:0
+msgid "Tags"
+msgstr "Labels"
+
+#. module: note
+#: view:note.note:0
+msgid "Archive"
+msgstr "Archief"
+
+#. module: note
+#: field:base.config.settings,module_note_pad:0
+msgid "Use collaborative pads (etherpad)"
+msgstr "Gebruik collaboratieve pads (etherpad)"
+
+#. module: note
+#: help:note.note,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Bevat de samenvatting van de chatter (aantal berichten,...). Deze "
+"samenvatting is direct in html formaat om zo in de kanban weergave te worden "
+"ingevoegd."
+
+#. module: note
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
+msgstr "Gebruik luxe layouts voor notities"
+
+#. module: note
+#: field:note.stage,user_id:0
+msgid "Owner"
+msgstr "Eigenaar"
+
+#. module: note
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr "Het gekozen bedrijf is niet toegestaan voor deze gebruiker"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Fase"
+
+#. module: note
+#: field:note.note,date_done:0
+msgid "Date done"
+msgstr "Datum verwerkt"
+
+#. module: note
+#: field:note.stage,fold:0
+msgid "Folded by Default"
+msgstr "Standaard ingevouwen"
diff --git a/addons/note/i18n/note.pot b/addons/note/i18n/note.pot
new file mode 100644
index 00000000000..48aec03d61f
--- /dev/null
+++ b/addons/note/i18n/note.pot
@@ -0,0 +1,312 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* note
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-11-02 12:54+0000\n"
+"PO-Revision-Date: 2012-11-02 12:54+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: note
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: note
+#: field:note.note,memo:0
+msgid "Note Content"
+msgstr ""
+
+#. module: note
+#: view:note.stage:0
+msgid "Stages of Notes"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_base_config_settings
+msgid "base.config.settings"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_tag
+msgid "Note Tag"
+msgstr ""
+
+#. module: note
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:0
+msgid "Note"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "Group By..."
+msgstr ""
+
+#. module: note
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: note
+#: model:ir.actions.act_window,help:note.action_note_note
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a personal note.\n"
+"          </p><p>\n"
+"            Use notes to organize personal tasks or notes. All\n"
+"            notes are private; no one else will be able to see them. However\n"
+"            you can share some notes with other people by inviting followers\n"
+"            on the note. (Useful for meeting minutes, especially if\n"
+"            you activate the pad feature for collaborative writings).\n"
+"          </p><p>\n"
+"            You can customize how you process your notes/tasks by adding,\n"
+"            removing or modifying columns.\n"
+"          </p>\n"
+"        "
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "kanban note"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_01
+#: model:note.stage,name:note.note_stage_01
+msgid "Today"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_res_users
+msgid "Users"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "í"
+msgstr ""
+
+#. module: note
+#: view:note.stage:0
+msgid "Stage of Notes"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: note
+#: field:note.note,current_partner_id:0
+msgid "unknown"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "By sticky note Category"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: note
+#: field:note.stage,name:0
+msgid "Stage Name"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "title"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_02
+#: model:note.stage,name:note.note_stage_02
+msgid "Tomorrow"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,open:0
+msgid "Active"
+msgstr ""
+
+#. module: note
+#: help:note.stage,user_id:0
+msgid "Owner of the note stage."
+msgstr ""
+
+#. module: note
+#: model:ir.ui.menu,name:note.menu_notes_stage
+msgid "Categories"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_comment_ids:0
+#: help:note.note,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: note
+#: field:note.tag,name:0
+msgid "Tag Name"
+msgstr ""
+
+#. module: note
+#: field:note.note,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: note
+#: view:base.config.settings:0
+#: model:ir.actions.act_window,name:note.action_note_note
+#: model:ir.ui.menu,name:note.menu_note_notes
+#: view:note.note:0
+#: model:note.stage,name:note.note_stage_04
+msgid "Notes"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_03
+#: model:note.stage,name:note.note_stage_03
+msgid "Later"
+msgstr ""
+
+#. module: note
+#: model:ir.model,name:note.model_note_stage
+msgid "Note Stage"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "dropdown menu"
+msgstr ""
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+msgid "Morning"
+msgstr ""
+
+#. module: note
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "W"
+msgstr ""
+
+#. module: note
+#: field:note.note,stage_ids:0
+msgid "Stages of Users"
+msgstr ""
+
+#. module: note
+#: field:note.note,name:0
+msgid "Note Summary"
+msgstr ""
+
+#. module: note
+#: model:ir.actions.act_window,name:note.action_note_stage
+#: view:note.note:0
+msgid "Stages"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "Delete"
+msgstr ""
+
+#. module: note
+#: field:note.note,color:0
+msgid "Color Index"
+msgstr ""
+
+#. module: note
+#: field:note.note,sequence:0
+#: field:note.stage,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: note
+#: field:note.note,tag_ids:0
+msgid "Tags"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+msgid "Archive"
+msgstr ""
+
+#. module: note
+#: field:base.config.settings,module_note_pad:0
+msgid "Use collaborative pads (etherpad)"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_summary:0
+msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: note
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
+msgstr ""
+
+#. module: note
+#: field:note.stage,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: note
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: note
+#: field:note.note,date_done:0
+msgid "Date done"
+msgstr ""
+
+#. module: note
+#: field:note.stage,fold:0
+msgid "Folded by Default"
+msgstr ""
+
diff --git a/addons/note/i18n/pt_BR.po b/addons/note/i18n/pt_BR.po
new file mode 100644
index 00000000000..eea43f2275f
--- /dev/null
+++ b/addons/note/i18n/pt_BR.po
@@ -0,0 +1,334 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-02 12:54+0000\n"
+"PO-Revision-Date: 2012-11-14 04:29+0000\n"
+"Last-Translator: Guilherme R. Santos <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: 2012-11-15 04:42+0000\n"
+"X-Generator: Launchpad (build 16265)\n"
+
+#. module: note
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "Você não pode ter dois usuários com o mesmo login!"
+
+#. module: note
+#: field:note.note,memo:0
+msgid "Note Content"
+msgstr "Conteúdo da Nota"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stages of Notes"
+msgstr "Estágio das Notas"
+
+#. module: note
+#: model:ir.model,name:note.model_base_config_settings
+msgid "base.config.settings"
+msgstr "base.config.settings"
+
+#. module: note
+#: model:ir.model,name:note.model_note_tag
+msgid "Note Tag"
+msgstr "Tag da Nota"
+
+#. module: note
+#: model:res.groups,name:note.group_note_fancy
+msgid "Notes / Fancy mode"
+msgstr "Notas / Modo fantasia"
+
+#. module: note
+#: model:ir.model,name:note.model_note_note
+#: view:note.note:0
+msgid "Note"
+msgstr "Nota"
+
+#. module: note
+#: view:note.note:0
+msgid "Group By..."
+msgstr "Agrupar Por..."
+
+#. module: note
+#: field:note.note,message_summary:0
+msgid "Summary"
+msgstr "Resumo"
+
+#. module: note
+#: field:note.note,message_follower_ids:0
+msgid "Followers"
+msgstr "Seguidores"
+
+#. module: note
+#: model:ir.actions.act_window,help:note.action_note_note
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Click to add a personal note.\n"
+"          </p><p>\n"
+"            Use notes to organize personal tasks or notes. All\n"
+"            notes are private; no one else will be able to see them. "
+"However\n"
+"            you can share some notes with other people by inviting "
+"followers\n"
+"            on the note. (Useful for meeting minutes, especially if\n"
+"            you activate the pad feature for collaborative writings).\n"
+"          </p><p>\n"
+"            You can customize how you process your notes/tasks by adding,\n"
+"            removing or modifying columns.\n"
+"          </p>\n"
+"        "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para adicionar nota pessoal.\n"
+"          </p><p>\n"
+"            Use notas para organizar tarefas ou notas pessoais. Todas\n"
+"            notas são privadas; ninguém mais é capaz de vê-las. Contudo\n"
+"            você pode compartilhar algumas notas com outras pessoas "
+"convidando seguidores\n"
+"            na nota. (Útil para atas de reunião, especialmente se\n"
+"            você ativar o recurso \"PAD\" para textos colaborativos).\n"
+"          </p><p>\n"
+"            Você pode customizar a forma como você processa suas "
+"notas/tarefas adicionando,\n"
+"            removendo ou modificando colunas.\n"
+"          </p>\n"
+"        "
+
+#. module: note
+#: view:note.note:0
+msgid "kanban note"
+msgstr "nota kanban"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_01
+#: model:note.stage,name:note.note_stage_01
+msgid "Today"
+msgstr "Hoje"
+
+#. module: note
+#: model:ir.model,name:note.model_res_users
+msgid "Users"
+msgstr "Usuários"
+
+#. module: note
+#: view:note.note:0
+msgid "í"
+msgstr "í"
+
+#. module: note
+#: view:note.stage:0
+msgid "Stage of Notes"
+msgstr "Estágios das Notas"
+
+#. module: note
+#: field:note.note,message_unread:0
+msgid "Unread Messages"
+msgstr "Mensagens não lidas"
+
+#. module: note
+#: field:note.note,current_partner_id:0
+msgid "unknown"
+msgstr "desconhecido"
+
+#. module: note
+#: view:note.note:0
+msgid "By sticky note Category"
+msgstr ""
+
+#. module: note
+#: help:note.note,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Se marcado novas mensagens requerem sua atenção"
+
+#. module: note
+#: field:note.stage,name:0
+msgid "Stage Name"
+msgstr "Nome do Estágio"
+
+#. module: note
+#: field:note.note,message_is_follower:0
+msgid "Is a Follower"
+msgstr "É um seguidor"
+
+#. module: note
+#: view:note.note:0
+msgid "title"
+msgstr "título"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_02
+#: model:note.stage,name:note.note_stage_02
+msgid "Tomorrow"
+msgstr "Amanhã"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,open:0
+msgid "Active"
+msgstr "Ativo"
+
+#. module: note
+#: help:note.stage,user_id:0
+msgid "Owner of the note stage."
+msgstr "Proprietário do estágio da nota."
+
+#. module: note
+#: model:ir.ui.menu,name:note.menu_notes_stage
+msgid "Categories"
+msgstr "Categorias"
+
+#. module: note
+#: field:note.note,message_comment_ids:0
+#: help:note.note,message_comment_ids:0
+msgid "Comments and emails"
+msgstr "Comentários e emails"
+
+#. module: note
+#: field:note.tag,name:0
+msgid "Tag Name"
+msgstr "Nome da Tag"
+
+#. module: note
+#: field:note.note,message_ids:0
+msgid "Messages"
+msgstr "Mensagens"
+
+#. module: note
+#: view:base.config.settings:0
+#: model:ir.actions.act_window,name:note.action_note_note
+#: model:ir.ui.menu,name:note.menu_note_notes
+#: view:note.note:0
+#: model:note.stage,name:note.note_stage_04
+msgid "Notes"
+msgstr "Notas"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_03
+#: model:note.stage,name:note.note_stage_03
+msgid "Later"
+msgstr "Mais tarde"
+
+#. module: note
+#: model:ir.model,name:note.model_note_stage
+msgid "Note Stage"
+msgstr "Estágio da Nota"
+
+#. module: note
+#: view:note.note:0
+msgid "dropdown menu"
+msgstr "dropdown menu"
+
+#. module: note
+#: model:note.stage,name:note.demo_note_stage_04
+msgid "Morning"
+msgstr "Manhã"
+
+#. module: note
+#: help:note.stage,sequence:0
+msgid "Used to order the note stages"
+msgstr "Usado para ordenar os estágios das notas"
+
+#. module: note
+#: view:note.note:0
+msgid "W"
+msgstr "W"
+
+#. module: note
+#: field:note.note,stage_ids:0
+msgid "Stages of Users"
+msgstr "Estágios de Usuários"
+
+#. module: note
+#: field:note.note,name:0
+msgid "Note Summary"
+msgstr "Resumo da Nota"
+
+#. module: note
+#: model:ir.actions.act_window,name:note.action_note_stage
+#: view:note.note:0
+msgid "Stages"
+msgstr "Estágios"
+
+#. module: note
+#: help:note.note,message_ids:0
+msgid "Messages and communication history"
+msgstr "Histórico de mensagens e comunicação"
+
+#. module: note
+#: view:note.note:0
+msgid "Delete"
+msgstr "Excluir"
+
+#. module: note
+#: field:note.note,color:0
+msgid "Color Index"
+msgstr "Índice de Cores"
+
+#. module: note
+#: field:note.note,sequence:0
+#: field:note.stage,sequence:0
+msgid "Sequence"
+msgstr "Sequencia"
+
+#. module: note
+#: field:note.note,tag_ids:0
+msgid "Tags"
+msgstr "Tags"
+
+#. module: note
+#: view:note.note:0
+msgid "Archive"
+msgstr "Arquivo"
+
+#. module: note
+#: field:base.config.settings,module_note_pad:0
+msgid "Use collaborative pads (etherpad)"
+msgstr "Usar pads colaborativos (etherpad)"
+
+#. module: note
+#: help:note.note,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: note
+#: field:base.config.settings,group_note_fancy:0
+msgid "Use fancy layouts for notes"
+msgstr "Usar leiautes fantasia para notas"
+
+#. module: note
+#: field:note.stage,user_id:0
+msgid "Owner"
+msgstr "Proprietário"
+
+#. module: note
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"A empresa escolhida não está entre as empresas habilitadas para este usuário"
+
+#. module: note
+#: view:note.note:0
+#: field:note.note,stage_id:0
+msgid "Stage"
+msgstr "Estágio"
+
+#. module: note
+#: field:note.note,date_done:0
+msgid "Date done"
+msgstr "Data de conclusão"
+
+#. module: note
+#: field:note.stage,fold:0
+msgid "Folded by Default"
+msgstr "Dobrado por Padrão"
diff --git a/addons/note/note.py b/addons/note/note.py
new file mode 100644
index 00000000000..9e1a9187095
--- /dev/null
+++ b/addons/note/note.py
@@ -0,0 +1,204 @@
+# -*- 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 openerp.osv import osv, fields
+from openerp.tools import html2plaintext
+
+class note_stage(osv.osv):
+    """ Category of Note """
+    _name = "note.stage"
+    _description = "Note Stage"
+    _columns = {
+        'name': fields.char('Stage Name', translate=True, required=True),
+        'sequence': fields.integer('Sequence', help="Used to order the note stages"),
+        'user_id': fields.many2one('res.users', 'Owner', help="Owner of the note stage.", required=True),
+        'fold': fields.boolean('Folded by Default'),
+    }
+    _order = 'sequence asc'
+    _defaults = {
+        'fold': 0,
+        'user_id': lambda self, cr, uid, ctx: uid,
+        'sequence' : 1,
+    }
+
+class note_tag(osv.osv):
+    _name = "note.tag"
+    _description = "Note Tag"
+    _columns = {
+        'name' : fields.char('Tag Name', required=True),
+    }
+
+class note_note(osv.osv):
+    """ Note """
+    _name = 'note.note'
+    _inherit = ['mail.thread']
+    _description = "Note"
+
+    #writing method (no modification of values)
+    def name_create(self, cr, uid, name, context=None):
+        rec_id = self.create(cr, uid, {'memo': name}, context=context)
+        return self.name_get(cr, uid, [rec_id], context)[0]
+
+    #read the first line (convert hml into text)
+    def _get_note_first_line(self, cr, uid, ids, name="", args={}, context=None):
+        res = {}
+        for note in self.browse(cr, uid, ids, context=context):
+            res[note.id] = (note.memo and html2plaintext(note.memo) or "").strip().replace('*','').split("\n")[0]
+
+        return res
+
+    #unactivate a sticky note and record the date
+    def onclick_note_is_done(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, { 'open' : False, 'date_done' : fields.date.today() })
+        self.message_post(cr, uid, ids[0], body='Note is done.', subject=False, 
+            type='notification', parent_id=False, attachments=None, context=context)
+        return False
+
+    #activate a note
+    def onclick_note_not_done(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'open' : True})
+        self.message_post(cr, uid, ids[0], body='Note has been activated.', subject=False, 
+            type='notification', parent_id=False, attachments=None, context=context)
+        return False
+	
+    #used for undisplay the follower if it's the current user
+    def _get_my_current_partner(self, cr, uid, ids, name, args, context=None):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        pid = user.partner_id and user.partner_id.id or False
+        return dict.fromkeys(ids, pid)
+
+    #return the default stage for the uid user
+    def _get_default_stage_id(self,cr,uid,context=None):
+        ids = self.pool.get('note.stage').search(cr,uid,[('user_id','=',uid)], context=context)
+        return ids and ids[0] or False
+
+    def _set_stage_per_user(self, cr, uid, id, name, value, args=None, context=None):
+        note = self.browse(cr, uid, id, context=context)
+        if not value: return False
+        stage_ids = [value] + [stage.id for stage in note.stage_ids if stage.user_id.id != uid ]
+        return self.write(cr, uid, [id], {'stage_ids': [(6, 0, stage_ids)]}, context=context)
+
+    def _get_stage_per_user(self, cr, uid, ids, name, args, context=None):
+        result = dict.fromkeys(ids, False)
+        for record in self.browse(cr, uid, ids, context=context):
+            for stage in record.stage_ids:
+                if stage.user_id.id == uid:
+                    result[record.id] = stage.id
+        return result
+
+
+    _columns = {
+        'name': fields.function(_get_note_first_line, 
+            string='Note Summary', 
+            type='text', store=True),
+        'memo': fields.html('Note Content'),
+        'sequence': fields.integer('Sequence'),
+        'stage_id': fields.function(_get_stage_per_user, 
+            fnct_inv=_set_stage_per_user, 
+            string='Stage', 
+            type='many2one', 
+            relation='note.stage'),
+        'stage_ids': fields.many2many('note.stage','note_stage_rel','note_id','stage_id','Stages of Users'),
+        'open': fields.boolean('Active'),
+        'date_done': fields.date('Date done'),
+        'color': fields.integer('Color Index'),
+        'tag_ids' : fields.many2many('note.tag','note_tags_rel','note_id','tag_id','Tags'),
+        'current_partner_id' : fields.function(_get_my_current_partner),
+    }
+    _defaults = {
+        'open' : 1,
+        'stage_id' : _get_default_stage_id,
+    }
+    _order = 'sequence'
+
+    def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False):
+        if groupby and groupby[0]=="stage_id":
+
+            #search all stages
+            current_stage_ids = self.pool.get('note.stage').search(cr,uid,[('user_id','=',uid)], context=context)
+
+            if current_stage_ids: #if the user have some stages
+
+                #dict of stages: map les ids sur les noms
+                stage_name = dict(self.pool.get('note.stage').name_get(cr, uid, current_stage_ids, context=context))
+
+                result = [{ #notes by stage for stages user
+                        '__context': {'group_by': groupby[1:]},
+                        '__domain': domain + [('stage_ids.id', '=', current_stage_id)],
+                        'stage_id': (current_stage_id, stage_name[current_stage_id]),
+                        'stage_id_count': self.search(cr,uid, domain+[('stage_ids', '=', current_stage_id)], context=context, count=True)
+                    } for current_stage_id in current_stage_ids]
+
+                #note without user's stage
+                nb_notes_ws = self.search(cr,uid, domain+[('stage_ids', 'not in', current_stage_ids)], context=context, count=True)
+                if nb_notes_ws:
+                    result += [{ #notes for unknown stage and if stage_ids is not empty
+                        '__context': {'group_by': groupby[1:]},
+                        '__domain': domain + [('stage_ids', 'not in', current_stage_ids)],
+                        'stage_id': (0, 'Unknown'),
+                        'stage_id_count':nb_notes_ws
+                    }]
+
+            else: # if stage_ids is empty
+
+                #note without user's stage
+                nb_notes_ws = self.search(cr,uid, domain, context=context, count=True)
+                if nb_notes_ws:
+                    result = [{ #notes for unknown stage
+                        '__context': {'group_by': groupby[1:]},
+                        '__domain': domain,
+                        'stage_id': (0, 'Unknown'),
+                        'stage_id_count':nb_notes_ws
+                    }]
+                else:
+                    result = []
+            return result
+
+        else:
+            return super(note_note, self).read_group(self, cr, uid, domain, fields, groupby, 
+                offset=offset, limit=limit, context=context, orderby=orderby)
+
+
+#upgrade config setting page to configure pad, fancy and tags mode
+class note_base_config_settings(osv.osv_memory):
+    _inherit = 'base.config.settings'
+    _columns = {
+        'module_note_pad': fields.boolean('Use collaborative pads (etherpad)'),
+        'group_note_fancy': fields.boolean('Use fancy layouts for notes', implied_group='note.group_note_fancy'),
+    }
+
+class res_users(osv.Model):
+    _name = 'res.users'
+    _inherit = ['res.users']
+    def create(self, cr, uid, data, context=None):
+        user_id = super(res_users, self).create(cr, uid, data, context=context)
+        user = self.browse(cr, uid, uid, context=context)
+        note_obj = self.pool.get('note.stage')
+        data_obj = self.pool.get('ir.model.data')
+        model_id = data_obj.get_object_reference(cr, uid, 'base', 'group_user') #Employee Group
+        group_id = model_id and model_id[1] or False
+        if group_id in [x.id for x in user.groups_id]:
+            for note_xml_id in ['note_stage_01','note_stage_02','note_stage_03','note_stage_04']:
+                data_id = data_obj._get_id(cr, uid, 'note', note_xml_id)
+                stage_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
+                note_obj.copy(cr, uid, stage_id, default = { 
+                                        'user_id': user_id}, context=context)
+        return user_id
\ No newline at end of file
diff --git a/addons/note/note_data.xml b/addons/note/note_data.xml
new file mode 100644
index 00000000000..592292788b3
--- /dev/null
+++ b/addons/note/note_data.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+
+    <record model="note.stage" id="note_stage_01">
+      <field name="name">Today</field>
+      <field name="sequence">1</field>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.stage" id="note_stage_02">
+      <field name="name">This Week</field>
+      <field name="sequence">2</field>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.stage" id="note_stage_03">
+      <field name="name">Later</field>
+      <field name="sequence">3</field>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+    <record model="note.stage" id="note_stage_04">
+      <field name="name">Notes</field>
+      <field name="sequence">4</field>
+      <field name="user_id" eval="ref('base.user_root')"/>
+    </record>
+
+  </data>
+</openerp>
diff --git a/addons/note/note_demo.xml b/addons/note/note_demo.xml
new file mode 100644
index 00000000000..5da11e2e99a
--- /dev/null
+++ b/addons/note/note_demo.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<openerp>
+  <data noupdate="1">
+    <record model="note.stage" id="demo_note_stage_01">
+      <field name="name">Today</field>
+      <field name="sequence">1</field>
+      <field name="user_id" ref="base.user_demo"/>
+    </record>
+
+    <record model="note.stage" id="demo_note_stage_02">
+      <field name="name">Tomorrow</field>
+      <field name="sequence">2</field>
+      <field name="user_id" ref="base.user_demo"/>
+    </record>
+
+    <record model="note.stage" id="demo_note_stage_03">
+      <field name="name">Later</field>
+      <field name="sequence">3</field>
+      <field name="user_id" ref="base.user_demo"/>
+    </record>
+
+    <record model="note.stage" id="demo_note_stage_04">
+      <field name="name">This Week</field>
+      <field name="sequence">4</field>
+      <field name="user_id" ref="base.user_root"/>
+    </record>
+
+    <record id="note_1" model="note.note">
+      <field name="name">Customer report #349872</field>
+      <field name="memo"><![CDATA[<b>Customer report #349872</b>
+    <br/><br/>* Calendar app in Home
+    <br/>*  The base_calendar module should create a menu in Home, like described above.
+    <br/>*  This module should become a main application (in the first screen at installation)
+    <br/>*  We should use the term Calendar, not Meeting.
+     ]]>
+      </field>
+      <field name="stage_id" ref="demo_note_stage_01"/>
+      <field name="color">2</field>
+      <field name="message_follower_ids" eval="[(4, ref('base.group_user'))]"/>
+    </record>
+
+    <record id="note_2" model="note.note">
+      <field name="memo"><![CDATA[<b>Call Fabien</b>
+    <br/><br/>* Followed by the telephone conversation and mail about D.544.3
+    ]]>
+      </field>
+      <field name="stage_id" ref="demo_note_stage_01"/>
+    </record>
+
+    <record id="note_4" model="note.note">
+      <field name="memo"><![CDATA[<b>Project N.947.5</b>
+    <br/><br/>]]>
+      </field>
+      <field name="stage_id" ref="note_stage_02"/>
+    </record>
+
+    <record id="note_5" model="note.note">
+      <field name="memo"><![CDATA[<b>Shop for family dinner</b>
+    <br/>* stuffed turkey
+    <br/>* wine
+    ]]>
+      </field>
+      <field name="stage_id" ref="demo_note_stage_02"/>
+      <field name="message_follower_ids" eval="[(4, ref('base.group_user'))]"/>
+    </record>
+
+    <record id="note_6" model="note.note">
+      <field name="memo"><![CDATA[<b>Idea to develop</b>
+    <br/><br/>* Create a module note_pad
+    it transforms the html editable memo text field into widget='pad', similar to project_pad depends on 'memo' and 'pad' modules
+    ]]>
+      </field>
+      <field name="stage_id" ref="note_stage_02"/>
+    </record>
+
+    <record id="note_8" model="note.note">
+      <field name="memo"><![CDATA[<b>New computer specs</b>
+      <br/><br/>* Motherboard
+      according to processor
+      <br/>* Processor
+      need to decide
+      <br/>* Graphic card
+      with great performance for games !
+      <br/>* Hard drive
+      big, for lot of internet backups
+      <br/>* Tower
+      silent, better when watching films
+      <br/>* Blueray drive ?
+      is it interesting yet ?
+      <br/>* Screen
+      a big one, full of pixels, of course !
+      ]]>
+      </field>
+      <field name="stage_id" ref="note_stage_03"/>
+      <field name="color">3</field>
+      <field name="message_follower_ids" eval="[(4, ref('base.group_user'))]"/>
+    </record>
+
+    <record id="note_9" model="note.note">
+      <field name="memo"><![CDATA[<b>Read those books</b>
+      <br/><br/>* Open ERP: a modern approach to integrated business management
+      <br/>* Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="stage_id" ref="demo_note_stage_02"/>
+    </record>
+
+    <record id="note_12" model="note.note">
+      <field name="memo"><![CDATA[<b>Read some documentation about OpenERP before diving into the code</b>
+      <br/><br/>* Open ERP: a modern approach to integrated business management
+      <br/>* Open ERP for Retail and Industrial Management
+      ]]>
+      </field>
+      <field name="message_follower_ids" eval="[(4, ref('base.group_user'))]"/>
+      <field name="color">7</field>
+      <field name="stage_ids" eval="['note_stage_03','demo_note_stage_04']"/>
+    </record>
+
+  </data>
+</openerp>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
new file mode 100644
index 00000000000..5aae6204d86
--- /dev/null
+++ b/addons/note/note_view.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0"?>
+<openerp>
+  <data>
+    <!-- note Stage Form View -->
+    <record model="ir.ui.view" id="view_note_stage_form">
+      <field name="name">note.stage.form</field>
+      <field name="model">note.stage</field>
+      <field name="arch" type="xml">
+        <form string="Stage of Notes" version="7.0">
+          <group>
+            <field name="name"/>
+          </group>
+        </form>
+      </field>
+    </record>
+
+    <!-- note Stage Tree View -->
+    <record model="ir.ui.view" id="view_note_stage_tree">
+      <field name="name">note.stage.tree</field>
+      <field name="model">note.stage</field>
+      <field name="field_parent"></field>
+      <field name="arch" type="xml">
+        <tree string="Stages of Notes" editable="bottom">
+            <field name="sequence" widget="handle"/>
+            <field name="name"/>
+            <field name="fold"/>
+        </tree>
+      </field>
+    </record>
+
+    <!-- note Stage Action -->
+    <record model="ir.actions.act_window" id="action_note_stage">
+        <field name="name">Stages</field>
+        <field name="res_model">note.stage</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[('user_id','=',uid)]</field>
+    </record>
+
+    <!-- New note Kanban View -->
+    <record model="ir.ui.view" id="view_note_note_kanban">
+      <field name="name">note.note.kanban</field>
+      <field name="model">note.note</field>
+      <field name="arch" type="xml">
+        <kanban default_group_by="stage_id" class="oe_notes oe_kanban_quickcreate_textarea" version="7.0">
+          <field name="color"/>
+          <field name="sequence"/>
+          <field name="name"/>
+          <field name="stage_id"/>
+          <field name="open"/>
+          <field name="memo"/>
+          <field name="date_done"/>
+          <field name="current_partner_id"/>
+          <field name="message_follower_ids"/>
+          <field name="tag_ids"/>
+          <templates>
+            <t t-name="kanban-box">
+
+              <t t-set="record.group_fancy" t-value="1"  groups="note.group_note_fancy"/>
+
+              <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_global_click_edit oe_semantic_html_override oe_kanban_card #{record.group_fancy==1 ? 'oe_kanban_card_fancy' : ''}">
+                <div class="oe_dropdown_kanban">
+
+                  <!-- dropdown menu -->
+                  <span class="oe_dropdown_toggle">
+                    <span class="oe_e">í</span>
+                    <ul class="oe_dropdown_menu">
+                      <li><a type="delete">Delete</a></li>
+                      <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
+                    </ul>
+                  </span>
+                  <div style="display: inline">
+                    <a name="onclick_note_is_done" type="object" t-if="record.open.raw_value" class="oe_e">W</a>
+                    <a name="onclick_note_not_done" type="object" t-if="!record.open.raw_value" class="oe_e">W</a>
+                  </div>
+                </div>
+                <!-- kanban note -->
+                <div t-attf-class="oe_kanban_content #{record.open.raw_value ? '' : 'note_text_line_through'}">
+                  <!-- title -->
+                  <field name="name"/>
+                </div>
+                <div class="oe_clear"></div>
+                <field name="tag_ids"/>
+                <div class="oe_right">
+                  <t t-foreach="record.message_follower_ids.raw_value" t-as="follower">
+                    <img t-if="record.current_partner_id.raw_value!=follower" t-att-src="kanban_image('res.partner', 'image_small', follower)" width="24" height="24" class="oe_kanban_avatar" t-att-data-member_id="follower"/>
+                  </t>
+                </div>
+                <div class="oe_clear"></div>
+              </div>
+            </t>
+          </templates>
+        </kanban>
+      </field>
+    </record>
+
+    <!-- New note Form View -->
+    <record model="ir.ui.view" id="view_note_note_tree">
+      <field name="name">note.note.tree</field>
+      <field name="model">note.note</field>
+      <field name="arch" type="xml">
+        <tree string="Stages">
+          <field name="name"/>
+          <field name="open"/>
+          <field name="stage_id"/>
+          <field name="tag_ids" widget="many2many_tags"/>
+        </tree>
+      </field>
+    </record>
+
+    <!-- New note Form View -->
+    <record model="ir.ui.view" id="view_note_note_form">
+        <field name="name">note.note.form</field>
+        <field name="model">note.note</field>
+        <field name="arch" type="xml">
+            <form string="Note" version="7.0">
+                <header>
+                    <field name="tag_ids" widget="many2many_tags" class="oe_inline" placeholder="Tags"/>
+                    <field name="stage_id" domain="[('user_id','=',uid)]" widget="statusbar" clickable="1"/>
+                </header>
+                <field name="memo" widget="html" class="oe_memo" editor_height="450px" />
+                <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
+                </div>
+            </form>
+        </field>
+    </record>
+
+    <!-- Search note  -->
+    <record model="ir.ui.view" id="view_note_note_filter">
+      <field name="name">note.note.search</field>
+      <field name="model">note.note</field>
+      <field name="arch" type="xml">
+        <search string="Notes">
+          <field name="memo" string="Note"/>
+          <field name="tag_ids"/>
+          <filter name="open_true" string="Active" domain="['|',('open', '=', True),('date_done','=',time.strftime('%%Y-%%m-%%d'))]"/>
+          <filter name="open_false" string="Archive" domain="[('open', '=', False)]"/>
+          <group expand="0" string="Group By...">
+            <filter icon="terp-stock_symbol-selection" string="Stage" help="By sticky note Category" context="{'group_by':'stage_id'}"/>
+          </group>
+        </search>
+      </field>
+    </record>
+
+
+    <!-- general settings -->
+    <record model="ir.ui.view" id="view_general_settings_note_form">
+      <field name="name">note.view.general_settings.form</field>
+      <field name="model">base.config.settings</field>
+      <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+      <field name="arch" type="xml">
+        <xpath expr="//label[@string='Authentication']/.." position="after">
+          <group>
+              <label for="id" string="Notes"/>
+              <div name="note">
+                  <div>
+                      <field name="module_note_pad" class="oe_inline"/>
+                      <label for="module_note_pad"/>
+                  </div>
+                  <div>
+                      <field name="group_note_fancy" class="oe_inline"/>
+                      <label for="group_note_fancy"/>
+                  </div>
+              </div>
+          </group>
+        </xpath>
+      </field>
+    </record>
+
+    <!-- Action -->
+    <record model="ir.actions.act_window" id="action_note_note">
+      <field name="name">Notes</field>
+      <field name="res_model">note.note</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">kanban,tree,form</field>
+      <field name="search_view_id" ref="view_note_note_filter"/>
+      <field name="context">{'search_default_open_true':True}</field>
+      <field name="help" type="html">
+          <p class="oe_view_nocontent_create">
+            Click to add a personal note.
+          </p><p>
+            Use notes to organize personal tasks or notes. All
+            notes are private; no one else will be able to see them. However
+            you can share some notes with other people by inviting followers
+            on the note. (Useful for meeting minutes, especially if
+            you activate the pad feature for collaborative writings).
+          </p><p>
+            You can customize how you process your notes/tasks by adding,
+            removing or modifying columns.
+          </p>
+        </field>
+    </record>
+
+    <menuitem name="Notes" id="menu_note_notes" parent="mail.mail_my_stuff" sequence="20" action="note.action_note_note"/>
+    <menuitem name="Categories" id="menu_notes_stage" parent="mail.mail_my_stuff" action="note.action_note_stage" sequence="21" groups="base.group_no_one"/>
+
+  </data>
+</openerp>
diff --git a/addons/note/security/ir.model.access.csv b/addons/note/security/ir.model.access.csv
new file mode 100644
index 00000000000..cbe11cba94e
--- /dev/null
+++ b/addons/note/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_note_stage,note.stage,model_note_stage,base.group_user,1,1,1,1
+access_note_note,note.note,model_note_note,base.group_user,1,1,1,1
+access_note_tag,note.tag,model_note_tag,base.group_user,1,1,1,1
diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml
new file mode 100644
index 00000000000..b0c79561355
--- /dev/null
+++ b/addons/note/security/ir.rule.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+  <record id="note_note_rule_global" model="ir.rule">
+    <field name="name">Only followers can access a sticky notes</field>
+    <field model="ir.model" ref="model_note_note" name="model_id"/>
+    <field name="domain_force">[('message_follower_ids','=',user.partner_id.id)]</field>
+    <field eval="True" name="global"/>
+    <field eval="1" name="perm_unlink"/>
+    <field eval="0" name="perm_write"/>
+    <field eval="1" name="perm_read"/>
+    <field eval="0" name="perm_create"/>
+  </record>
+
+  <record id="note_stage_rule_global" model="ir.rule">
+    <field name="name">Each user have his stage name</field>
+    <field model="ir.model" ref="model_note_stage" name="model_id"/>
+    <field name="domain_force">['|',('user_id','=',False),('user_id','=',user.id)]</field>
+    <field eval="True" name="global"/>
+  </record>
+</data>
+</openerp>
+
diff --git a/addons/note/security/note_security.xml b/addons/note/security/note_security.xml
new file mode 100644
index 00000000000..8f6aa5b3d01
--- /dev/null
+++ b/addons/note/security/note_security.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <record id="group_note_fancy" model="res.groups">
+        <field name="name">Notes / Fancy mode</field>
+	<field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+
+    <record id="base.group_user" model="res.groups">
+	<field name="implied_ids" eval="[(4, ref('group_note_fancy'))]"/>
+    </record>
+
+</data>
+</openerp>
diff --git a/addons/note/static/src/css/Makefile b/addons/note/static/src/css/Makefile
new file mode 100644
index 00000000000..17bf009479e
--- /dev/null
+++ b/addons/note/static/src/css/Makefile
@@ -0,0 +1,3 @@
+note.css: note.sass
+	sass --trace -t expanded note.sass note.css
+
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
new file mode 100644
index 00000000000..16d71e28aa5
--- /dev/null
+++ b/addons/note/static/src/css/note.css
@@ -0,0 +1,115 @@
+@charset "utf-8";
+.oe_kanban_column .note_text_line_through {
+  text-decoration: line-through;
+}
+
+.openerp .oe_form .oe_form_field.oe_memo {
+  margin: 0 -16px 0 -16px;
+  padding: 0px;
+  width: 100%;
+  min-height: 200px;
+}
+.openerp .oe_form .oe_form_field.oe_memo .cleditorMain {
+  border: none;
+  padding: 0px;
+}
+.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_0 {
+  box-shadow: 0px 4px 9px rgba(48, 48, 48, 0.15);
+}
+.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_1 {
+  box-shadow: 0px 4px 9px rgba(0, 0, 0, 0.15);
+}
+.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_2 {
+  box-shadow: 0px 4px 9px rgba(48, 0, 0, 0.15);
+}
+.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_3 {
+  box-shadow: 0px 4px 9px rgba(97, 93, 0, 0.16);
+}
+.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_4 {
+  box-shadow: 0px 4px 9px rgba(77, 128, 0, 0.17);
+}
+.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_5 {
+  box-shadow: 0px 4px 9px rgba(0, 88, 11, 0.15);
+}
+.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_6 {
+  box-shadow: 0px 4px 9px rgba(0, 80, 95, 0.15);
+}
+.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_7 {
+  box-shadow: 0px 4px 9px rgba(3, 13, 133, 0.18);
+}
+.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_8 {
+  box-shadow: 0px 4px 9px rgba(56, 0, 128, 0.15);
+}
+.openerp .oe_kanban_view.oe_notes .oe_kanban_card_fancy.oe_kanban_color_9 {
+  box-shadow: 0px 4px 9px rgba(102, 0, 116, 0.15);
+}
+.openerp .oe_kanban_record .oe_kanban_card_fancy {
+  text-shadow: none;
+  border-radius: 2px;
+  padding: 8px;
+  margin-left: 3px;
+  margin-right: 3px;
+  padding-bottom: 8px;
+  margin-bottom: 10px;
+  -webkit-transform: rotate(-2deg);
+  -o-transform: rotate(-2deg);
+  -moz-transform: rotate(-2deg);
+  -webkit-transition: all 300ms cubic-bezier(0.5, 0, 0.5, 1);
+  -moz-transition: all 300ms cubic-bezier(0.5, 0, 0.5, 1);
+  -ms-transition: all 300ms cubic-bezier(0.5, 0, 0.5, 1);
+  transition: all 300ms cubic-bezier(0.5, 0, 0.5, 1);
+}
+.openerp .oe_kanban_record:nth-of-type(even) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(1deg);
+  -o-transform: rotate(1deg);
+  -moz-transform: rotate(1deg);
+}
+.openerp .oe_kanban_record:nth-of-type(3n) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(4deg);
+  -o-transform: rotate(4deg);
+  -moz-transform: rotate(4deg);
+}
+.openerp .oe_kanban_column:nth-of-type(even) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(2deg);
+  -o-transform: rotate(2deg);
+  -moz-transform: rotate(2deg);
+}
+.openerp .oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(even) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(-3deg);
+  -o-transform: rotate(-3deg);
+  -moz-transform: rotate(-3deg);
+}
+.openerp .oe_kanban_column:nth-of-type(even) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(1deg);
+  -o-transform: rotate(1deg);
+  -moz-transform: rotate(1deg);
+}
+.openerp .oe_kanban_column:nth-of-type(3n) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(-2deg);
+  -o-transform: rotate(-2deg);
+  -moz-transform: rotate(-2deg);
+}
+.openerp .oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(even) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(1deg);
+  -o-transform: rotate(1deg);
+  -moz-transform: rotate(1deg);
+}
+.openerp .oe_kanban_column:nth-of-type(3n) .oe_kanban_record:nth-of-type(3n) .oe_kanban_card_fancy {
+  -webkit-transform: rotate(-1deg);
+  -o-transform: rotate(-1deg);
+  -moz-transform: rotate(-1deg);
+}
+
+.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card_fancy:hover,
+.openerp .oe_kanban_column .oe_fold_column .oe_kanban_card_fancy:focus {
+  position: relative;
+  z-index: 5;
+  border-color: rgba(0, 0, 0, 0.4);
+  -webkit-transition: all 150ms cubic-bezier(0.5, 0, 0.5, 1);
+  -moz-transition: all 150ms cubic-bezier(0.5, 0, 0.5, 1);
+  -ms-transition: all 150ms cubic-bezier(0.5, 0, 0.5, 1);
+  transition: all 150ms cubic-bezier(0.5, 0, 0.5, 1);
+  -webkit-transform: rotate(0) !important;
+  -o-transform: rotate(0) !important;
+  -moz-transform: rotate(0) !important;
+}
diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass
new file mode 100644
index 00000000000..6f0c0883ae7
--- /dev/null
+++ b/addons/note/static/src/css/note.sass
@@ -0,0 +1,102 @@
+@charset "utf-8"
+
+@mixin rotate($a)
+  -webkit-transform: rotate($a) 
+  -o-transform: rotate($a) 
+  -moz-transform: rotate($a)
+
+@mixin transition($what:all,$duration:100ms)
+  -webkit-transition: $what $duration cubic-bezier(0.5,0,0.5,1)
+  -moz-transition: $what $duration cubic-bezier(0.5,0,0.5,1)
+  -ms-transition: $what $duration cubic-bezier(0.5,0,0.5,1)
+  transition: $what $duration cubic-bezier(0.5,0,0.5,1)
+
+.oe_kanban_column
+  .note_text_line_through
+    text-decoration: line-through
+
+.openerp
+  .oe_form
+    .oe_form_field.oe_memo
+      margin: 0 -16px 0 -16px
+      padding: 0px
+      width: 100%
+      min-height: 200px
+      .cleditorMain
+        border: none
+        padding: 0px
+  .oe_kanban_view.oe_notes
+    .oe_kanban_card_fancy.oe_kanban_color_0
+      box-shadow: 0px 4px 9px rgba(48,48,48,0.15)
+    .oe_kanban_card_fancy.oe_kanban_color_1
+      box-shadow: 0px 4px 9px rgba(0,0,0,0.15)
+    .oe_kanban_card_fancy.oe_kanban_color_2
+      box-shadow: 0px 4px 9px rgba(48,0,0,0.15)
+    .oe_kanban_card_fancy.oe_kanban_color_3
+      box-shadow: 0px 4px 9px rgba(97,93,0,0.16)
+    .oe_kanban_card_fancy.oe_kanban_color_4
+      box-shadow: 0px 4px 9px rgba(77,128,0,0.17)
+    .oe_kanban_card_fancy.oe_kanban_color_5
+      box-shadow: 0px 4px 9px rgba(0,88,11,0.15)
+    .oe_kanban_card_fancy.oe_kanban_color_6
+      box-shadow: 0px 4px 9px rgba(0,80,95,0.15)
+    .oe_kanban_card_fancy.oe_kanban_color_7
+      box-shadow: 0px 4px 9px rgba(3,13,133,0.18)
+    .oe_kanban_card_fancy.oe_kanban_color_8
+      box-shadow: 0px 4px 9px rgba(56,0,128,0.15)
+    .oe_kanban_card_fancy.oe_kanban_color_9
+      box-shadow: 0px 4px 9px rgba(102,0,116,0.15)
+  .oe_kanban_record
+    .oe_kanban_card_fancy
+      text-shadow: none
+      border-radius: 2px
+      padding: 8px
+      margin-left: 3px
+      margin-right: 3px
+      padding-bottom: 8px
+      margin-bottom: 10px
+      @include rotate(-2deg)
+      @include transition(all, 300ms)
+  .oe_kanban_record:nth-of-type(even)
+    .oe_kanban_card_fancy
+      @include rotate(1deg)
+  .oe_kanban_record:nth-of-type(3n)
+    .oe_kanban_card_fancy 
+      @include rotate(4deg)
+  .oe_kanban_column:nth-of-type(even)
+    .oe_kanban_card_fancy 
+      @include rotate(2deg)
+  .oe_kanban_column:nth-of-type(even)
+    .oe_kanban_record:nth-of-type(even)
+      .oe_kanban_card_fancy 
+        @include rotate(-3deg)
+  .oe_kanban_column:nth-of-type(even)
+    .oe_kanban_record:nth-of-type(3n)
+      .oe_kanban_card_fancy 
+        @include rotate(1deg)
+  .oe_kanban_column:nth-of-type(3n)
+    .oe_kanban_card_fancy 
+      @include rotate(-2deg)
+  .oe_kanban_column:nth-of-type(3n)
+    .oe_kanban_record:nth-of-type(even)
+      .oe_kanban_card_fancy 
+        @include rotate(1deg)
+  .oe_kanban_column:nth-of-type(3n)
+    .oe_kanban_record:nth-of-type(3n)
+      .oe_kanban_card_fancy 
+        @include rotate(-1deg)
+
+
+.openerp
+  .oe_kanban_column
+    .oe_fold_column
+      .oe_kanban_card_fancy:hover,
+      .oe_kanban_card_fancy:focus 
+        position: relative
+        z-index: 5
+        border-color: rgba(0,0,0,0.4)
+        @include transition(all, 150ms)
+        -webkit-transform: rotate(0) !important
+        -o-transform: rotate(0) !important
+        -moz-transform: rotate(0) !important
+        
diff --git a/addons/note/static/src/img/icon.png b/addons/note/static/src/img/icon.png
new file mode 100644
index 00000000000..b6ad0548a40
Binary files /dev/null and b/addons/note/static/src/img/icon.png differ
diff --git a/addons/project_mailgate/__init__.py b/addons/note_pad/__init__.py
similarity index 91%
rename from addons/project_mailgate/__init__.py
rename to addons/note_pad/__init__.py
index 0f82ebd1b41..44a484adac4 100644
--- a/addons/project_mailgate/__init__.py
+++ b/addons/note_pad/__init__.py
@@ -19,6 +19,5 @@
 #
 ##############################################################################
 
-import project_mailgate
+import note_pad
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event_project/__openerp__.py b/addons/note_pad/__openerp__.py
similarity index 71%
rename from addons/event_project/__openerp__.py
rename to addons/note_pad/__openerp__.py
index a843188de55..e1d4b96e3c6 100644
--- a/addons/event_project/__openerp__.py
+++ b/addons/note_pad/__openerp__.py
@@ -20,24 +20,30 @@
 ##############################################################################
 
 {
-    'name': 'Retro-Planning on Events',
+    'name': 'Memos pad',
     'version': '0.1',
     'category': 'Tools',
     'description': """
-Organization and management of events.
-======================================
+This module update memos inside OpenERP for using an external pad
+===================================================================
+
+Use for update your text memo in real time with the following user that you invite.
 
-This module allows you to create retro planning for managing your events.
 """,
     'author': 'OpenERP SA',
-    'images': ['images/event.jpeg'],
-    'depends': ['project_retro_planning', 'event'],
-    'init_xml': [],
-    'update_xml': ['wizard/event_project_retro_view.xml', 'event_project_view.xml'],
-    'demo_xml': [],
+    'website': 'http://openerp.com',
+    'summary': 'Sticky memos, Collaborative',
+    'depends': [
+        'mail',
+        'pad',
+        'note',
+    ],
+    'data': [
+        'note_pad_view.xml',
+    ],
     'installable': True,
+    'application': False,
     'auto_install': False,
-    'certificate': '0069726863885',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/import_google/partner.py b/addons/note_pad/note_pad.py
similarity index 77%
rename from addons/import_google/partner.py
rename to addons/note_pad/note_pad.py
index e7aa4dd8ca7..d0c18a9f986 100644
--- a/addons/import_google/partner.py
+++ b/addons/note_pad/note_pad.py
@@ -19,13 +19,17 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from openerp.osv import osv, fields
+from tools.translate import _
+
+class note_pad_note(osv.osv):
+    """ memo pad """
+
+    _name = 'note.note'
+    _inherit = ['pad.common','note.note']
+
+    _pad_fields = ['note_pad']
 
-class crm_meeting_type(osv.osv):
-    """ Meeting Types """
-    _inherit = "crm.meeting.type"
     _columns = {
-        'user_id': fields.many2one('res.users', 'User')
-    }
-
-# vim:expandtab:smartindent:toabstop=4:softtabstop=4:shiftwidth=4:
+        'note_pad_url': fields.char('Pad Url', pad_content_field='memo'),
+    }
\ No newline at end of file
diff --git a/addons/note_pad/note_pad_view.xml b/addons/note_pad/note_pad_view.xml
new file mode 100644
index 00000000000..9e45a3952f1
--- /dev/null
+++ b/addons/note_pad/note_pad_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<openerp>
+  <data>
+    <record model="ir.ui.view" id="view_note_note_pad_form">
+      <field name="name">note_pad.view.form</field>
+      <field name="model">note.note</field>
+      <field name="inherit_id" ref="note.view_note_note_form"/>
+      <field name="arch" type="xml">
+        <field name="memo" position="replace">
+           <field name="note_pad_url" widget="pad"/>
+        </field>
+      </field>
+    </record>
+  </data>
+</openerp>
diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index d433f51fc82..b99e6d828c9 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -2,7 +2,7 @@
 {
     'name': 'Collaborative Pads',
     'version': '2.0',
-    "category": "Project Management",
+    'category': 'Project Management',
     'description': """
 Adds enhanced support for (Ether)Pad attachments in the web client.
 ===================================================================
@@ -13,19 +13,15 @@ pads (by default, http://ietherpad.com/).
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['base'],
-    'data': [
-        'res_company.xml'
-    ],
+    'data': ['res_company.xml'],
+    'demo': ['pad_demo.xml'],
     'installable': True,
     'auto_install': False,
     'web': True,
-    'certificate' : '001183545978470526509',
     'js': ['static/src/js/pad.js'],
-    'qweb' : [
-        "static/src/xml/*.xml",
-    ],
+    'qweb' : ['static/src/xml/*.xml'],
     'images': ['static/src/img/pad_link_companies.jpeg'],
-    "css": ['static/src/css/etherpad.css',],
+    'css': ['static/src/css/etherpad.css',],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad/i18n/ar.po b/addons/pad/i18n/ar.po
index 2f5385822c1..af8e9699c76 100644
--- a/addons/pad/i18n/ar.po
+++ b/addons/pad/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/bg.po b/addons/pad/i18n/bg.po
index b8f1e7e41b2..bccf137fd6d 100644
--- a/addons/pad/i18n/bg.po
+++ b/addons/pad/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/ca.po b/addons/pad/i18n/ca.po
index 395d5aeee6c..b64d31e6704 100644
--- a/addons/pad/i18n/ca.po
+++ b/addons/pad/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/cs.po b/addons/pad/i18n/cs.po
index 071d4735251..928f24d2cb2 100644
--- a/addons/pad/i18n/cs.po
+++ b/addons/pad/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/da.po b/addons/pad/i18n/da.po
index 60967f8cf53..85037bf60d3 100644
--- a/addons/pad/i18n/da.po
+++ b/addons/pad/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/de.po b/addons/pad/i18n/de.po
index b775ff9c03d..aae25ebb33b 100644
--- a/addons/pad/i18n/de.po
+++ b/addons/pad/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/es.po b/addons/pad/i18n/es.po
index 34556563040..63b9659fe06 100644
--- a/addons/pad/i18n/es.po
+++ b/addons/pad/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/es_CR.po b/addons/pad/i18n/es_CR.po
index 74d4d8555a3..4b8c3c56ee4 100644
--- a/addons/pad/i18n/es_CR.po
+++ b/addons/pad/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: pad
diff --git a/addons/pad/i18n/fi.po b/addons/pad/i18n/fi.po
index ca2686d511c..ca355760eec 100644
--- a/addons/pad/i18n/fi.po
+++ b/addons/pad/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/fr.po b/addons/pad/i18n/fr.po
index ae7745ff46d..c533f12abf8 100644
--- a/addons/pad/i18n/fr.po
+++ b/addons/pad/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/gl.po b/addons/pad/i18n/gl.po
index 4383832343b..99bcf8c3fe3 100644
--- a/addons/pad/i18n/gl.po
+++ b/addons/pad/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/hr.po b/addons/pad/i18n/hr.po
index 2d9fa29da66..6fdb9e2e244 100644
--- a/addons/pad/i18n/hr.po
+++ b/addons/pad/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/hu.po b/addons/pad/i18n/hu.po
index dff32608465..75068399318 100644
--- a/addons/pad/i18n/hu.po
+++ b/addons/pad/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/it.po b/addons/pad/i18n/it.po
index 3fc8dbc3497..7c1b51d34bc 100644
--- a/addons/pad/i18n/it.po
+++ b/addons/pad/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/ja.po b/addons/pad/i18n/ja.po
index 210bae2a467..08f0712278b 100644
--- a/addons/pad/i18n/ja.po
+++ b/addons/pad/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/mn.po b/addons/pad/i18n/mn.po
index 2b2d0087b7c..f6b9e117cc2 100644
--- a/addons/pad/i18n/mn.po
+++ b/addons/pad/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/nb.po b/addons/pad/i18n/nb.po
new file mode 100644
index 00000000000..13ee6d2aa4d
--- /dev/null
+++ b/addons/pad/i18n/nb.po
@@ -0,0 +1,58 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-09-10 13:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: pad
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Firmanavn må være unikt !"
+
+#. module: pad
+#: help:res.company,pad_url_template:0
+msgid "Template used to generate pad URL."
+msgstr "Mal som brukes til å generere pad URL."
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Firmaer"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+
+#. module: pad
+#: model:ir.model,name:pad.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.vedlegg"
+
+#. module: pad
+#: view:res.company:0
+msgid "Pad"
+msgstr "Pad"
+
+#. module: pad
+#: field:res.company,pad_url_template:0
+msgid "Pad URL Template"
+msgstr "Pad URL Mal."
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/pad/static/src/xml/pad.xml:9
+msgid "Add Pad"
+msgstr "Legg til Pad."
diff --git a/addons/pad/i18n/nl.po b/addons/pad/i18n/nl.po
index 706b00b7c65..cadd3a7d4a3 100644
--- a/addons/pad/i18n/nl.po
+++ b/addons/pad/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-20 10:04+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/pt.po b/addons/pad/i18n/pt.po
index 9f0b88c0a87..526e6e6c16c 100644
--- a/addons/pad/i18n/pt.po
+++ b/addons/pad/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/pt_BR.po b/addons/pad/i18n/pt_BR.po
index a64d15703eb..ad2ccb27f04 100644
--- a/addons/pad/i18n/pt_BR.po
+++ b/addons/pad/i18n/pt_BR.po
@@ -14,18 +14,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "O nome da empresa deve ser exclusivo!"
 
 #. module: pad
 #: help:res.company,pad_url_template:0
 msgid "Template used to generate pad URL."
-msgstr ""
+msgstr "Modelo usado para gerar URL pad."
 
 #. module: pad
 #: model:ir.model,name:pad.model_res_company
@@ -35,27 +35,27 @@ msgstr "Empresas"
 #. module: pad
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erro! Você não pode criar empresas recursivas."
 
 #. module: pad
 #: model:ir.model,name:pad.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: pad
 #: view:res.company:0
 msgid "Pad"
-msgstr ""
+msgstr "Pad"
 
 #. module: pad
 #: field:res.company,pad_url_template:0
 msgid "Pad URL Template"
-msgstr ""
+msgstr "Modelo de Url de Pad"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/pad/static/src/xml/pad.xml:9
 msgid "Add Pad"
-msgstr ""
+msgstr "Adicionar Pads"
 
 #, python-format
 #~ msgid "Write"
diff --git a/addons/pad/i18n/ro.po b/addons/pad/i18n/ro.po
index e36fc1e1c61..80fd4d6c003 100644
--- a/addons/pad/i18n/ro.po
+++ b/addons/pad/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/ru.po b/addons/pad/i18n/ru.po
index f99048fd59e..fef9cb0d842 100644
--- a/addons/pad/i18n/ru.po
+++ b/addons/pad/i18n/ru.po
@@ -14,18 +14,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Название компании должно быть уникальным!"
 
 #. module: pad
 #: help:res.company,pad_url_template:0
 msgid "Template used to generate pad URL."
-msgstr ""
+msgstr "Шаблон используемый для создания адреса планшета."
 
 #. module: pad
 #: model:ir.model,name:pad.model_res_company
@@ -40,7 +40,7 @@ msgstr "Ошибка ! Нельзя создать рекурсивные ком
 #. module: pad
 #: model:ir.model,name:pad.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "ir.attachment"
 
 #. module: pad
 #: view:res.company:0
@@ -50,12 +50,12 @@ msgstr "Планшет"
 #. module: pad
 #: field:res.company,pad_url_template:0
 msgid "Pad URL Template"
-msgstr ""
+msgstr "Шаблон адреса планшета"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/pad/static/src/xml/pad.xml:9
 msgid "Add Pad"
-msgstr ""
+msgstr "Добавить планшет"
 
 #, python-format
 #~ msgid "Ok"
diff --git a/addons/pad/i18n/sl.po b/addons/pad/i18n/sl.po
index 20775bff5dc..59e3e594387 100644
--- a/addons/pad/i18n/sl.po
+++ b/addons/pad/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/sr@latin.po b/addons/pad/i18n/sr@latin.po
index b64ad954b87..21ebf0758e9 100644
--- a/addons/pad/i18n/sr@latin.po
+++ b/addons/pad/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/sv.po b/addons/pad/i18n/sv.po
index 7ec488e86ed..e57a4ad4690 100644
--- a/addons/pad/i18n/sv.po
+++ b/addons/pad/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/tr.po b/addons/pad/i18n/tr.po
index e3aeeaffed7..6715cc64d4f 100644
--- a/addons/pad/i18n/tr.po
+++ b/addons/pad/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/i18n/zh_CN.po b/addons/pad/i18n/zh_CN.po
index 836756d1443..830f5eb04f9 100644
--- a/addons/pad/i18n/zh_CN.po
+++ b/addons/pad/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad
 #: sql_constraint:res.company:0
diff --git a/addons/pad/pad.py b/addons/pad/pad.py
index 40569fcd589..8f9f79a78e0 100644
--- a/addons/pad/pad.py
+++ b/addons/pad/pad.py
@@ -1,30 +1,102 @@
 # -*- coding: utf-8 -*-
 from osv import fields, osv
 import random
+import re
 import string
 import urllib2
+import logging
 from tools.translate import _
+from openerp.tools import html2plaintext
+from py_etherpad import EtherpadLiteClient
+
+_logger = logging.getLogger(__name__)
 
 class pad_common(osv.osv_memory):
     _name = 'pad.common'
-    _pad_fields = []
+
     def pad_generate_url(self, cr, uid, context=None):
-        pad_url_template =  self.pool.get('res.users').browse(cr,uid, uid, context).company_id.pad_url_template
-        s = string.ascii_uppercase + string.digits
-        salt = ''.join([s[random.randint(0, len(s) - 1)] for i in range(8)])
-        template_vars = {
-            'db' : cr.dbname,
-            'model' : self._name,
-            'salt' : salt,
+        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id;
+
+        pad = {
+            "server" : company.pad_server,
+            "key" : company.pad_key,
         }
-        url = pad_url_template % template_vars
-        return url
+
+        # make sure pad server in the form of http://hostname
+        if not pad["server"]:
+            return ''
+        if not pad["server"].startswith('http'):
+            pad["server"] = 'http://' + pad["server"]
+        pad["server"] = pad["server"].rstrip('/')
+        # generate a salt
+        s = string.ascii_uppercase + string.digits
+        salt = ''.join([s[random.randint(0, len(s) - 1)] for i in range(10)])
+        #path
+        path = '%s-%s-%s' % (cr.dbname.replace('_','-'), self._name, salt)
+        # contruct the url
+        url = '%s/p/%s' % (pad["server"], path)
+
+        #if create with content
+        if "field_name" in context and "model" in context and "object_id" in context:
+            myPad = EtherpadLiteClient( pad["key"], pad["server"]+'/api')
+            myPad.createPad(path)
+
+            #get attr on the field model
+            model = self.pool.get(context["model"])
+            field = model._all_columns[context['field_name']]
+            real_field = field.column.pad_content_field
+
+            #get content of the real field
+            for record in model.browse(cr, uid, [context["object_id"]]):
+                if record[real_field]:
+                    myPad.setText(path, html2plaintext(record[real_field]))
+                    #Etherpad for html not functional
+                    #myPad.setHTML(path, record[real_field])
+
+        return {
+            "server": pad["server"],
+            "path": path,
+            "url": url,
+        }
+
+    def pad_get_content(self, cr, uid, url, context=None):
+        content = ''
+        if url:
+            try:
+                page = urllib2.urlopen('%s/export/html'%url).read()
+                mo = re.search('<body>(.*)</body>',page)
+                if mo:
+                    content = mo.group(1)
+            except:
+                _logger.warning("No url found '%s'.", url)
+        return content
+
+    # TODO
+    # reverse engineer protocol to be setHtml without using the api key
+
+    def write(self, cr, uid, ids, vals, context=None):
+        self._set_pad_value(cr, uid, vals, context)
+        return super(pad_common, self).write(cr, uid, ids, vals, context=context)
+
+    def create(self, cr, uid, vals, context=None):
+        self._set_pad_value(cr, uid, vals, context)
+        return super(pad_common, self).create(cr, uid, vals, context=context)
+
+    # Set the pad content in vals
+    def _set_pad_value(self, cr, uid, vals, context=None):
+        for k,v in vals.items():
+            field = self._all_columns[k].column
+            if hasattr(field,'pad_content_field'):
+                vals[field.pad_content_field] = self.pad_get_content(cr, uid, v, context=context)        
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
-        update = [(field,self.pad_generate_url(cr, uid, context)) for field in self._pad_fields]
-        default.update(update)
+        for k, v in self._all_columns.iteritems():
+            field = v.column
+            if hasattr(field,'pad_content_field'):
+                pad = self.pad_generate_url(cr, uid, context)
+                default[k] = pad['url']
         return super(pad_common, self).copy(cr, uid, id, default, context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/pad/pad_demo.xml b/addons/pad/pad_demo.xml
new file mode 100644
index 00000000000..99c4b38481c
--- /dev/null
+++ b/addons/pad/pad_demo.xml
@@ -0,0 +1,13 @@
+<openerp>
+  <data>
+
+    <record id="base.main_company" model="res.company">
+      <field name="pad_server">pad.openerp.com</field>
+    </record>
+    
+    <record id="base.main_company" model="res.company">
+      <field name="pad_key">4DxmsNIbnQUVQMW9S9tx2oLOSjFdrx1l</field>
+    </record>
+
+  </data>
+</openerp>
diff --git a/addons/pad/py_etherpad/__init__.py b/addons/pad/py_etherpad/__init__.py
new file mode 100644
index 00000000000..6af310b48aa
--- /dev/null
+++ b/addons/pad/py_etherpad/__init__.py
@@ -0,0 +1,253 @@
+#!/usr/bin/env python
+"""Module to talk to EtherpadLite API."""
+
+import json
+import urllib
+import urllib2
+
+
+class EtherpadLiteClient:
+    """Client to talk to EtherpadLite API."""
+    API_VERSION = 1  # TODO probably 1.1 sometime soon
+
+    CODE_OK = 0
+    CODE_INVALID_PARAMETERS = 1
+    CODE_INTERNAL_ERROR = 2
+    CODE_INVALID_FUNCTION = 3
+    CODE_INVALID_API_KEY = 4
+    TIMEOUT = 20
+
+    apiKey = ""
+    baseUrl = "http://localhost:9001/api"
+
+    def __init__(self, apiKey=None, baseUrl=None):
+        if apiKey:
+            self.apiKey = apiKey
+
+        if baseUrl:
+            self.baseUrl = baseUrl
+
+    def call(self, function, arguments=None):
+        """Create a dictionary of all parameters"""
+        url = '%s/%d/%s' % (self.baseUrl, self.API_VERSION, function)
+
+        params = arguments or {}
+        params.update({'apikey': self.apiKey})
+        data = urllib.urlencode(params, True)
+
+        try:
+            opener = urllib2.build_opener()
+            request = urllib2.Request(url=url, data=data)
+            response = opener.open(request, timeout=self.TIMEOUT)
+            result = response.read()
+            response.close()
+        except urllib2.HTTPError:
+            raise
+
+        result = json.loads(result)
+        if result is None:
+            raise ValueError("JSON response could not be decoded")
+
+        return self.handleResult(result)
+
+    def handleResult(self, result):
+        """Handle API call result"""
+        if 'code' not in result:
+            raise Exception("API response has no code")
+        if 'message' not in result:
+            raise Exception("API response has no message")
+
+        if 'data' not in result:
+            result['data'] = None
+
+        if result['code'] == self.CODE_OK:
+            return result['data']
+        elif result['code'] == self.CODE_INVALID_PARAMETERS or result['code'] == self.CODE_INVALID_API_KEY:
+            raise ValueError(result['message'])
+        elif result['code'] == self.CODE_INTERNAL_ERROR:
+            raise Exception(result['message'])
+        elif result['code'] == self.CODE_INVALID_FUNCTION:
+            raise Exception(result['message'])
+        else:
+            raise Exception("An unexpected error occurred whilst handling the response")
+
+    # GROUPS
+    # Pads can belong to a group. There will always be public pads that do not belong to a group (or we give this group the id 0)
+
+    def createGroup(self):
+        """creates a new group"""
+        return self.call("createGroup")
+
+    def createGroupIfNotExistsFor(self, groupMapper):
+        """this functions helps you to map your application group ids to etherpad lite group ids"""
+        return self.call("createGroupIfNotExistsFor", {
+            "groupMapper": groupMapper
+        })
+
+    def deleteGroup(self, groupID):
+        """deletes a group"""
+        return self.call("deleteGroup", {
+            "groupID": groupID
+        })
+
+    def listPads(self, groupID):
+        """returns all pads of this group"""
+        return self.call("listPads", {
+            "groupID": groupID
+        })
+
+    def createGroupPad(self, groupID, padName, text=''):
+        """creates a new pad in this group"""
+        params = {
+            "groupID": groupID,
+            "padName": padName,
+        }
+        if text:
+            params['text'] = text
+        return self.call("createGroupPad", params)
+
+    # AUTHORS
+    # Theses authors are bind to the attributes the users choose (color and name).
+
+    def createAuthor(self, name=''):
+        """creates a new author"""
+        params = {}
+        if name:
+            params['name'] = name
+        return self.call("createAuthor", params)
+
+    def createAuthorIfNotExistsFor(self, authorMapper, name=''):
+        """this functions helps you to map your application author ids to etherpad lite author ids"""
+        params = {
+            'authorMapper': authorMapper
+        }
+        if name:
+            params['name'] = name
+        return self.call("createAuthorIfNotExistsFor", params)
+
+    # SESSIONS
+    # Sessions can be created between a group and a author. This allows
+    # an author to access more than one group. The sessionID will be set as
+    # a cookie to the client and is valid until a certain date.
+
+    def createSession(self, groupID, authorID, validUntil):
+        """creates a new session"""
+        return self.call("createSession", {
+            "groupID": groupID,
+            "authorID": authorID,
+            "validUntil": validUntil
+        })
+
+    def deleteSession(self, sessionID):
+        """deletes a session"""
+        return self.call("deleteSession", {
+            "sessionID": sessionID
+        })
+
+    def getSessionInfo(self, sessionID):
+        """returns informations about a session"""
+        return self.call("getSessionInfo", {
+            "sessionID": sessionID
+        })
+
+    def listSessionsOfGroup(self, groupID):
+        """returns all sessions of a group"""
+        return self.call("listSessionsOfGroup", {
+            "groupID": groupID
+        })
+
+    def listSessionsOfAuthor(self, authorID):
+        """returns all sessions of an author"""
+        return self.call("listSessionsOfAuthor", {
+            "authorID": authorID
+        })
+
+    # PAD CONTENT
+    # Pad content can be updated and retrieved through the API
+
+    def getText(self, padID, rev=None):
+        """returns the text of a pad"""
+        params = {"padID": padID}
+        if rev is not None:
+            params['rev'] = rev
+        return self.call("getText", params)
+
+    # introduced with pull request merge
+    def getHtml(self, padID, rev=None):
+        """returns the html of a pad"""
+        params = {"padID": padID}
+        if rev is not None:
+            params['rev'] = rev
+        return self.call("getHTML", params)
+
+    def setText(self, padID, text):
+        """sets the text of a pad"""
+        return self.call("setText", {
+            "padID": padID,
+            "text": text
+        })
+
+    def setHtml(self, padID, html):
+        """sets the text of a pad from html"""
+        return self.call("setHTML", {
+            "padID": padID,
+            "html": html
+        })
+
+    # PAD
+    # Group pads are normal pads, but with the name schema
+    # GROUPID$PADNAME. A security manager controls access of them and its
+    # forbidden for normal pads to include a  in the name.
+
+    def createPad(self, padID, text=''):
+        """creates a new pad"""
+        params = {
+            "padID": padID,
+        }
+        if text:
+            params['text'] = text
+        return self.call("createPad", params)
+
+    def getRevisionsCount(self, padID):
+        """returns the number of revisions of this pad"""
+        return self.call("getRevisionsCount", {
+            "padID": padID
+        })
+
+    def deletePad(self, padID):
+        """deletes a pad"""
+        return self.call("deletePad", {
+            "padID": padID
+        })
+
+    def getReadOnlyID(self, padID):
+        """returns the read only link of a pad"""
+        return self.call("getReadOnlyID", {
+            "padID": padID
+        })
+
+    def setPublicStatus(self, padID, publicStatus):
+        """sets a boolean for the public status of a pad"""
+        return self.call("setPublicStatus", {
+            "padID": padID,
+            "publicStatus": publicStatus
+        })
+
+    def getPublicStatus(self, padID):
+        """return true of false"""
+        return self.call("getPublicStatus", {
+            "padID": padID
+        })
+
+    def setPassword(self, padID, password):
+        """returns ok or a error message"""
+        return self.call("setPassword", {
+            "padID": padID,
+            "password": password
+        })
+
+    def isPasswordProtected(self, padID):
+        """returns true or false"""
+        return self.call("isPasswordProtected", {
+            "padID": padID
+        })
diff --git a/addons/pad/res_company.py b/addons/pad/res_company.py
index bd955cd0481..fcf8bc97e91 100644
--- a/addons/pad/res_company.py
+++ b/addons/pad/res_company.py
@@ -1,15 +1,11 @@
 # -*- coding: utf-8 -*-
 from osv import fields, osv
 
-DEFAULT_PAD_TEMPLATE = 'http://beta.etherpad.org/p/%(db)s-%(model)s-%(salt)s'
-
 class company_pad(osv.osv):
     _inherit = 'res.company'
     _columns = {
-        'pad_url_template': fields.char('Pad URL Template', size=128, required=True, help="Template used to generate pad URL."),
-    }
-    _defaults = {
-        'pad_url_template': DEFAULT_PAD_TEMPLATE,
+        'pad_server': fields.char('Pad Server', help="Etherpad lite server. Example: beta.primarypad.com"),
+        'pad_key': fields.char('Pad Api Key', help="Etherpad lite api key."),
     }
 
 
diff --git a/addons/pad/res_company.xml b/addons/pad/res_company.xml
index 017561aaec3..1e2184c61a3 100644
--- a/addons/pad/res_company.xml
+++ b/addons/pad/res_company.xml
@@ -7,10 +7,12 @@
       <field name="arch" type="xml">
         <xpath expr="//group[@name='account_grp']" position="after">
             <group string="Pads">
-                <field name="pad_url_template" placeholder="e.g. http://beta.etherpad.org/p/%%(db)s-%%(model)s-%%(salt)s"/>
+                <field name="pad_server" placeholder="e.g. beta.primarypad.com"/>
+                <field name="pad_key"/>
             </group>
         </xpath>
       </field>
     </record>
+
   </data>
 </openerp>
diff --git a/addons/pad/static/src/css/etherpad.css b/addons/pad/static/src/css/etherpad.css
index a0240afcab7..6d27b527383 100644
--- a/addons/pad/static/src/css/etherpad.css
+++ b/addons/pad/static/src/css/etherpad.css
@@ -1,52 +1,92 @@
-.oe_etherpad_head{
-    width: 100%;
-    display: block;
-    padding-left:3px;
-    cursor:pointer;
+.oe_pad {
+    margin-top: 16px;
 }
-.oe_etherpad_fullscreen div.oe_etherpad_head .oe_normal {
-    display: none;
+
+.oe_pad_switch_positioner {
+    position: relative;
 }
-.oe_etherpad_normal div.oe_etherpad_head .oe_fullscreen {
-    display: none;
+
+.oe_pad_switch {
+    position: absolute;
+    top: 5px;
+    left: 383px;
+    width: 28px;
+    height: 28px;
+    background-image: -webkit-linear-gradient(top, white, #f0f0f0);
+    border: solid 1px #ccc;
+    border-radius:3px;
+    text-align: center;
+    line-height: 22px;
+    overflow: hidden;
+    -webkit-box-sizing: border-box;
+    color: #666666;
+    padding-top:-3px;
+    padding-left:-1px;
+    cursor: pointer;
 }
-.oe_etherpad_fullscreen {
+
+.oe_pad_switch:hover{
+    background-image: -webkit-linear-gradient(top, #f4f4f4, #e4e4e4);
+}
+
+.oe_pad_fullscreen .oe_pad_switch {
+    top:4px;
+}
+
+.oe_pad_fullscreen {
     position: fixed;
     top: 0px;
     left: 0px;
-    width: 100%;
-    height: 100%;
+    right: 0px;
+    bottom: 0px;
     background-color: white;
-    z-index:10001 !important;
-}
-.etherpad_default{  
-    width: 100%;
-    height: 450px;
-}
-.oe_etherpad_fullscreen .etherpad_default{  
-    height: 100%
+    margin:0;
+    padding:0;
+    border:none;
+    z-index: 1000;
 }
 
-.etherpad_body{
-    overflow:hidden;
+.oe_pad.oe_configured .oe_pad_content.oe_editing{
+    border: solid 1px #c4c4c4;
+    height:300px;
+    -webkit-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
+       -moz-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
+        -ms-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
+         -o-box-shadow: 0 5px 10px rgba(0,0,0,0.1);
+            box-shadow: 0 5px 10px rgba(0,0,0,0.1);
 }
 
-.etherpad_readonly{
-    width: 100%;
-    height: 450px;
-    overflow:auto;    
+.oe_pad.oe_configured.oe_pad_fullscreen .oe_pad_content {
+    height: 100%;
+    border: none;
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+        -ms-box-shadow: none;
+         -o-box-shadow: none;
+            box-shadow: none;
 }
-.etherpad_readonly ul,.etherpad_readonly ol{
-    -webkit-margin-before: 1em;
-    -webkit-margin-after: 1em;
-    -webkit-margin-start: 0px;
-    -webkit-margin-end: 0px;
-    -webkit-padding-start: 40px !important;
+
+.oe_pad.oe_unconfigured > p {
+    text-align: center;
+    opacity: 0.75;
 }
-.etherpad_readonly ul li{  
+
+.oe_pad_loading{
+    text-align: center;
+    opacity: 0.75;
+}
+
+.etherpad_readonly ul, .etherpad_readonly ol {
+    margin-before: 1em;
+    margin-after: 1em;
+    margin-start: 0px;
+    margin-end: 0px;
+    padding-start: 40px !important;
+}
+.etherpad_readonly ul li{
     list-style-type: disc;
 }
-.etherpad_readonly ol li{  
+.etherpad_readonly ol li{
     list-style-type: decimal;
 }
 .etherpad_readonly .indent li{
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index 6384eb72da8..929d62681c8 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -1,40 +1,60 @@
 openerp.pad = function(instance) {
-
-instance.web.form.FieldPad = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
-    template: 'FieldPad',
-    initialize_content: function() {
-        var self = this;
-        this.$textarea = undefined;
-        this.$element.find('div.oe_etherpad_head').click(function(ev) {
-            self.$element.toggleClass('oe_etherpad_fullscreen').toggleClass('oe_etherpad_normal');
-        });
-    },
-    set_value: function(value_) {
-        this._super(value_);
-        this.render_value();
-    },
-    render_value: function() {
-        var self = this;
-        var value = this.get('value');
-        if(value !== false) {
-            var url = value.split('\n')[0];
-            if (!this.get("effective_readonly")) {
-                var pad_username = this.session.username;
-                var code = '<iframe width="100%" height="100%" frameborder="0" src="'+url+'?showChat=false&userName='+pad_username+'"></iframe>';
-                this.$element.find('div.oe_etherpad_default').html(code);
-            } else {
-                $.get(url+'/export/html').success(function(data) {
-                    self.$element.html('<div class="etherpad_readonly">'+data+'</div>');
-                }).error(function() {
-                    self.$element.text('Unable to load pad');
+    
+    instance.web.form.FieldPad = instance.web.form.AbstractField.extend({
+        template: 'FieldPad',
+        configured: false,
+        content: "",
+        render_value: function() {
+            var self = this;
+            var _super = _.bind(this._super, this);
+            if (this.get("value") === false || this.get("value") === "") {
+                self.view.dataset.call('pad_generate_url',{context:{
+                        model: self.view.model,
+                        field_name: self.name,
+                        object_id: self.view.datarecord.id
+                    }}).done(function(data) {
+                    if(data&&data.url){
+                        self.set({value: data.url});
+                        _super(data.url);
+                        self.renderElement();
+                    }
                 });
+            } else {
+                self.renderElement();
             }
-        }
-    },
-});
-
-instance.web.form.widgets = instance.web.form.widgets.extend({
-    'pad': 'instance.web.form.FieldPad',
-});
+            this._dirty_flag = true;
+        },
+        renderElement: function(){
+            var self  = this;
+            var value = this.get('value');
+            if(!_.str.startsWith(value,'http')){
+                this.configured = false;
+                this.content = "";
+            }else{
+                this.configured = true;
+                if(!this.get('effective_readonly')){
+                    this.content = '<iframe width="100%" height="100%" frameborder="0" src="'+value+'?showChat=false&userName='+this.session.username+'"></iframe>';
+                }else{
+                    this.content = '<div class="oe_pad_loading">... Loading pad ...</div>';
+                    $.get(value+'/export/html').success(function(data){
+                        self.$('.oe_pad_content').html('<div class="oe_pad_readonly">'+data+'<div>');
+                    }).error(function(){
+                        self.$('.oe_pad_content').text('Unable to load pad');
+                    });
+                }
+            }
+            this._super();
+            this.$('.oe_pad_content').html(this.content);
+            this.$('.oe_pad_switch').click(function(){
+                self.$el.toggleClass('oe_pad_fullscreen');
+            });
+            this.on('change:effective_readonly',this,function(){
+                self.renderElement();
+            });
+        },
+    });
 
+    instance.web.form.widgets = instance.web.form.widgets.extend({
+        'pad': 'instance.web.form.FieldPad',
+    });
 };
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index e128fb183fb..eaa519dc04b 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -3,16 +3,34 @@
 -->
 <templates id="template" xml:space="preserve">
 
-<t t-name="FieldPad">
-    <t t-if="!widget.get('effective_readonly')">
-        <div class="oe_form_field_text oe_etherpad_normal">
-            <div class="oe_etherpad_head">
-                    <span class="oe_normal">Fullscreen</span>
-                    <span class="oe_fullscreen">Return to Record</span>
+    <t t-name="FieldPad">
+
+        <t t-if="!widget.configured">
+            <div class="oe_form_field_text oe_pad oe_unconfigured">
+                <p>
+                    You must configure the etherpad through the menu Setting > Companies > Companies, in the configuration tab of your company.
+                </p>
             </div>
-            <div class="oe_etherpad_default" ></div>
-        </div>
+        </t>
+
+        <t t-if="widget.configured">
+            <t t-if="widget.get('effective_readonly')">
+                <div class="oe_form_field_text oe_pad oe_configured">
+                    <div class="oe_pad_content etherpad_readonly">
+                    </div>
+                </div>
+            </t>
+
+            <t t-if="!widget.get('effective_readonly')">
+                <div class="oe_form_field_text oe_pad oe_configured">
+                    <div class="oe_pad_switch_positioner">
+                        <span class="oe_pad_switch oe_e">&amp;Ntilde;</span>
+                    </div>
+                    <div class="oe_pad_content oe_editing">
+                    </div>
+                </div>
+            </t>
+        </t>
     </t>
-</t>
 
 </templates>
diff --git a/addons/pad_project/__openerp__.py b/addons/pad_project/__openerp__.py
index 3f4a279800a..6093acebab0 100644
--- a/addons/pad_project/__openerp__.py
+++ b/addons/pad_project/__openerp__.py
@@ -22,16 +22,16 @@
 {
     'name': 'Pad on tasks',
     'version': '1.0',
-    "category": "Project Management",
+    'category': 'Project Management',
     'description': """
 This module adds a PAD in all project kanban views.
+===================================================
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['project', 'pad'],
-    'init_xml': [],
-    'update_xml': ['project_task.xml'],
-    'demo_xml': [],
+    'data': ['project_task.xml'],
+    'demo': [],
     'installable': True,
     'auto_install': True,
 }
diff --git a/addons/pad_project/i18n/ar.po b/addons/pad_project/i18n/ar.po
index 72643b5c400..57e390a3f3c 100644
--- a/addons/pad_project/i18n/ar.po
+++ b/addons/pad_project/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/cs.po b/addons/pad_project/i18n/cs.po
index 43863b02028..bdcbf889347 100644
--- a/addons/pad_project/i18n/cs.po
+++ b/addons/pad_project/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/de.po b/addons/pad_project/i18n/de.po
index c612372719c..5a312983654 100644
--- a/addons/pad_project/i18n/de.po
+++ b/addons/pad_project/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/es.po b/addons/pad_project/i18n/es.po
new file mode 100644
index 00000000000..f0dbb565158
--- /dev/null
+++ b/addons/pad_project/i18n/es.po
@@ -0,0 +1,39 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-11-08 12:44+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-09 04:39+0000\n"
+"X-Generator: Launchpad (build 16250)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"¡Error! La fecha final de la tarea debe ser mayor que la fecha de inicio"
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Tarea"
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr "Pad"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "¡Error! No se pueden crear tareas recursivas."
diff --git a/addons/pad_project/i18n/es_CR.po b/addons/pad_project/i18n/es_CR.po
index d38a5f1a83d..d02d52bc60f 100644
--- a/addons/pad_project/i18n/es_CR.po
+++ b/addons/pad_project/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/fi.po b/addons/pad_project/i18n/fi.po
index 5caf8070386..dd6f739745f 100644
--- a/addons/pad_project/i18n/fi.po
+++ b/addons/pad_project/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/fr.po b/addons/pad_project/i18n/fr.po
index da38c1ac637..9abc1975624 100644
--- a/addons/pad_project/i18n/fr.po
+++ b/addons/pad_project/i18n/fr.po
@@ -8,31 +8,32 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-06-22 08:03+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-09-03 22:22+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
 msgstr ""
+"Erreur ! la date de fin de la tâche doit être supérieure a celle de début"
 
 #. module: pad_project
 #: model:ir.model,name:pad_project.model_project_task
 msgid "Task"
-msgstr ""
+msgstr "Tâche"
 
 #. module: pad_project
 #: view:project.task:0
 msgid "Pad"
-msgstr ""
+msgstr "Pad"
 
 #. module: pad_project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de tâches récursives."
diff --git a/addons/pad_project/i18n/ja.po b/addons/pad_project/i18n/ja.po
index d0938b65112..57f9f1f361e 100644
--- a/addons/pad_project/i18n/ja.po
+++ b/addons/pad_project/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/mn.po b/addons/pad_project/i18n/mn.po
index 66355f65106..8c198f36668 100644
--- a/addons/pad_project/i18n/mn.po
+++ b/addons/pad_project/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/nb.po b/addons/pad_project/i18n/nb.po
new file mode 100644
index 00000000000..babfe9b0db9
--- /dev/null
+++ b/addons/pad_project/i18n/nb.po
@@ -0,0 +1,38 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Feil! Oppgave sluttdato må være større enn oppgave startdato"
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Oppgave"
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr "Pad"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Feil! Du kan ikke lage en rekursive oppgaver."
diff --git a/addons/pad_project/i18n/nl.po b/addons/pad_project/i18n/nl.po
index f4b5882ccd7..45f38751aa3 100644
--- a/addons/pad_project/i18n/nl.po
+++ b/addons/pad_project/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/pt.po b/addons/pad_project/i18n/pt.po
index 9d52054ef12..1b7b6bff067 100644
--- a/addons/pad_project/i18n/pt.po
+++ b/addons/pad_project/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/pt_BR.po b/addons/pad_project/i18n/pt_BR.po
index 8a16433e1f6..7ed92021355 100644
--- a/addons/pad_project/i18n/pt_BR.po
+++ b/addons/pad_project/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/ro.po b/addons/pad_project/i18n/ro.po
index 95bfe4fbf8f..dff760be3b2 100644
--- a/addons/pad_project/i18n/ro.po
+++ b/addons/pad_project/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/ru.po b/addons/pad_project/i18n/ru.po
new file mode 100644
index 00000000000..16e5a04ec1e
--- /dev/null
+++ b/addons/pad_project/i18n/ru.po
@@ -0,0 +1,39 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-14 07:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr ""
+"Ошибка! Дата завершения задачи должна быть позднее чем дата начала задачи"
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Задача"
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr "Планшет"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Ошибка! Вы не можете создавать рекурсивные задачи."
diff --git a/addons/pad_project/i18n/sl.po b/addons/pad_project/i18n/sl.po
index 1e53a4a84ea..84707368635 100644
--- a/addons/pad_project/i18n/sl.po
+++ b/addons/pad_project/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/sv.po b/addons/pad_project/i18n/sv.po
index b718d817234..0a3ba6e4103 100644
--- a/addons/pad_project/i18n/sv.po
+++ b/addons/pad_project/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/i18n/tr.po b/addons/pad_project/i18n/tr.po
new file mode 100644
index 00000000000..b0977e8e719
--- /dev/null
+++ b/addons/pad_project/i18n/tr.po
@@ -0,0 +1,38 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-07 20:06+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Turkish <tr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! Task end-date must be greater then task start-date"
+msgstr "Hata! görev bitiş tarihi başlangıç tarihinden sonra olmalı"
+
+#. module: pad_project
+#: model:ir.model,name:pad_project.model_project_task
+msgid "Task"
+msgstr "Görev"
+
+#. module: pad_project
+#: view:project.task:0
+msgid "Pad"
+msgstr "Pad"
+
+#. module: pad_project
+#: constraint:project.task:0
+msgid "Error ! You cannot create recursive tasks."
+msgstr "Hata ! Yinelenen görevler oluşturamazsınız."
diff --git a/addons/pad_project/i18n/zh_CN.po b/addons/pad_project/i18n/zh_CN.po
index 21f975afe23..52620175b52 100644
--- a/addons/pad_project/i18n/zh_CN.po
+++ b/addons/pad_project/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
diff --git a/addons/pad_project/project_task.py b/addons/pad_project/project_task.py
index 46c2c54cd46..6ebebae97fd 100644
--- a/addons/pad_project/project_task.py
+++ b/addons/pad_project/project_task.py
@@ -5,10 +5,6 @@ from osv import fields, osv
 class task(osv.osv):
     _name = "project.task"
     _inherit = ["project.task",'pad.common']
-    _pad_fields = ['description_pad']
     _columns = {
-        'description_pad': fields.char('Description PAD', size=250)
-    }
-    _defaults = {
-        'description_pad': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, context),
+        'description_pad': fields.char('Description PAD', pad_content_field='description')
     }
diff --git a/addons/plugin/__openerp__.py b/addons/plugin/__openerp__.py
index 801e0571c58..7af31450a87 100644
--- a/addons/plugin/__openerp__.py
+++ b/addons/plugin/__openerp__.py
@@ -26,12 +26,11 @@
     'category': 'Hidden/Dependency',
     'description': """
 The common interface for plug-in.
+=================================
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': [
-        'base',
-    ],
+    'depends': ['base'],
     'data': [],
     'demo': [],
     'test': [],
diff --git a/addons/plugin/i18n/ar.po b/addons/plugin/i18n/ar.po
index d84383a6e25..304fa4dbbf6 100644
--- a/addons/plugin/i18n/ar.po
+++ b/addons/plugin/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/cs.po b/addons/plugin/i18n/cs.po
index ccfa49bff6e..b11e9290cfd 100644
--- a/addons/plugin/i18n/cs.po
+++ b/addons/plugin/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/de.po b/addons/plugin/i18n/de.po
index 83b630139de..6cd44e9275c 100644
--- a/addons/plugin/i18n/de.po
+++ b/addons/plugin/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/es.po b/addons/plugin/i18n/es.po
new file mode 100644
index 00000000000..8111105ef1f
--- /dev/null
+++ b/addons/plugin/i18n/es.po
@@ -0,0 +1,23 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-11-08 11:25+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-09 04:39+0000\n"
+"X-Generator: Launchpad (build 16250)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "Manejador del plug-in"
diff --git a/addons/plugin/i18n/es_CR.po b/addons/plugin/i18n/es_CR.po
index 27af6678398..6a9384281d8 100644
--- a/addons/plugin/i18n/es_CR.po
+++ b/addons/plugin/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/fi.po b/addons/plugin/i18n/fi.po
index f474abe5cd2..0969989eab4 100644
--- a/addons/plugin/i18n/fi.po
+++ b/addons/plugin/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/fr.po b/addons/plugin/i18n/fr.po
index 31cb793f828..8ebc60f5970 100644
--- a/addons/plugin/i18n/fr.po
+++ b/addons/plugin/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/ja.po b/addons/plugin/i18n/ja.po
index 7c1222af5ae..8ed0ad42d8f 100644
--- a/addons/plugin/i18n/ja.po
+++ b/addons/plugin/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/mn.po b/addons/plugin/i18n/mn.po
new file mode 100644
index 00000000000..1eff97d6d67
--- /dev/null
+++ b/addons/plugin/i18n/mn.po
@@ -0,0 +1,23 @@
+# Mongolian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-24 06:21+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "plugin.handler"
diff --git a/addons/plugin/i18n/nb.po b/addons/plugin/i18n/nb.po
new file mode 100644
index 00000000000..b366a19e06a
--- /dev/null
+++ b/addons/plugin/i18n/nb.po
@@ -0,0 +1,23 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:40+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "Plugg.behandleren"
diff --git a/addons/plugin/i18n/nl.po b/addons/plugin/i18n/nl.po
index a287af98767..8eece4e9fb3 100644
--- a/addons/plugin/i18n/nl.po
+++ b/addons/plugin/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-02-14 13:02+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/pt.po b/addons/plugin/i18n/pt.po
index d158a29d97e..2570c0d83a4 100644
--- a/addons/plugin/i18n/pt.po
+++ b/addons/plugin/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/pt_BR.po b/addons/plugin/i18n/pt_BR.po
index b24131afbbb..f5f5733227f 100644
--- a/addons/plugin/i18n/pt_BR.po
+++ b/addons/plugin/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/ro.po b/addons/plugin/i18n/ro.po
index d5fc79dc164..0168cdc1395 100644
--- a/addons/plugin/i18n/ro.po
+++ b/addons/plugin/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/profile_tools/i18n/da.po b/addons/plugin/i18n/ru.po
similarity index 54%
rename from addons/profile_tools/i18n/da.po
rename to addons/plugin/i18n/ru.po
index 1229f315596..0bbdbe3e75c 100644
--- a/addons/profile_tools/i18n/da.po
+++ b/addons/plugin/i18n/ru.po
@@ -1,4 +1,4 @@
-# Danish translation for openobject-addons
+# Russian translation for openobject-addons
 # Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
@@ -7,14 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-27 06:26+0000\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-09-14 07:44+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@li.org>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "plugin.handler"
diff --git a/addons/plugin/i18n/sv.po b/addons/plugin/i18n/sv.po
index d76e39976ef..d53ce94d941 100644
--- a/addons/plugin/i18n/sv.po
+++ b/addons/plugin/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/profile_tools/i18n/tr.po b/addons/plugin/i18n/tr.po
similarity index 54%
rename from addons/profile_tools/i18n/tr.po
rename to addons/plugin/i18n/tr.po
index 3416a6229e8..67f7bb21571 100644
--- a/addons/profile_tools/i18n/tr.po
+++ b/addons/plugin/i18n/tr.po
@@ -7,21 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-25 17:29+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-21 19:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
-#~ msgid "Configure"
-#~ msgstr "Yapılandır"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Çeşitli Araçlar"
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Tekrarlanan Dökümanlar"
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "eklenti.işlemci"
diff --git a/addons/plugin/i18n/zh_CN.po b/addons/plugin/i18n/zh_CN.po
index 04944f01ff9..330427c0ba9 100644
--- a/addons/plugin/i18n/zh_CN.po
+++ b/addons/plugin/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:39+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin
 #: model:ir.model,name:plugin.model_plugin_handler
diff --git a/addons/plugin/i18n/zh_TW.po b/addons/plugin/i18n/zh_TW.po
new file mode 100644
index 00000000000..6a48ea718e8
--- /dev/null
+++ b/addons/plugin/i18n/zh_TW.po
@@ -0,0 +1,23 @@
+# Chinese (Traditional) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-21 06:38+0000\n"
+"Last-Translator: Eric Huang <eh@cenoq.com>\n"
+"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: plugin
+#: model:ir.model,name:plugin.model_plugin_handler
+msgid "plugin.handler"
+msgstr "plugin.handler"
diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py
index e497f902dc2..95fe80f3b29 100644
--- a/addons/plugin/plugin_handler.py
+++ b/addons/plugin/plugin_handler.py
@@ -6,7 +6,6 @@ Created on 18 oct. 2011
 
 from osv import osv, fields
 
-
 class plugin_handler(osv.osv_memory):
     _name = 'plugin.handler'
 
@@ -37,28 +36,30 @@ class plugin_handler(osv.osv_memory):
             @param email: email is a standard RFC2822 email message
             @return Dictionary which contain id and the model name of the document linked with the mail
                 if no document is found the id = 0
-                (model_name, res_id, url, name_get) 
+                (model_name, res_id, url, name_get)
         """
         mail_message_obj = self.pool.get('mail.message')
         model = ""
         res_id = 0
         url = ""
         name = ""
-        msg = mail_message_obj.parse_message(email)
-        references = [msg.get('message-id')]
-        refs =  msg.get('references',False)
-        if refs:
-            references.extend(refs.split())
-        msg_ids = mail_message_obj.search(cr, uid, [('message_id','in',references)])
-        if msg_ids:
-            msg = mail_message_obj.browse(cr, uid, msg_ids[0])
+        msg = self.pool.get('mail.thread').message_parse(cr, uid, email)
+        parent_id = msg.get('parent_id', False)
+        message_id = msg.get('message_id')
+        msg_id = False
+        if message_id:
+            msg_ids = mail_message_obj.search(cr, uid, [('message_id','=', message_id)])
+            msg_id = len(msg_ids) and msg_ids[0] or False
+        if not msg_id and parent_id:
+            msg_id = parent_id
+        if msg_id:
+            msg = mail_message_obj.browse(cr, uid, msg_id)
             res_id = msg.res_id
             model = msg.model
             url = self._make_url(cr, uid, res_id, model)
             name =  self.pool.get(model).name_get(cr, uid, [res_id])[0][1]
         return (model,res_id, url,name)
 
-
     def document_type(self, cr, uid, context=None):
         """
             Return the list of available model to push
@@ -71,69 +72,71 @@ class plugin_handler(osv.osv_memory):
         doc_dict['res.partner'] = "Partner"
         return doc_dict.items()
 
-    # Can be used where search record was used 
+    # Can be used where search record was used
     def list_document_get(self, cr, uid, model, name):
         """
             This function return the result of name_search on the object model
-            @param model: the name of the model 
+            @param model: the name of the model
             @param : the name of the document
-            @return : the result of name_search a list of tuple 
+            @return : the result of name_search a list of tuple
             [(id, 'name')]
         """
-        return self.pool.get(model).name_search(cr,uid,name)
+        return self.pool.get(model).name_search(cr, uid, name)
 
     def push_message(self, cr, uid, model, email, res_id=0):
         """
             @param email: email is a standard RFC2822 email message
             @param model: On which model the message is pushed
-            @param thread_id: on which document the message is pushed, if thread_id = 0 a new document is created 
+            @param thread_id: on which document the message is pushed, if thread_id = 0 a new document is created
             @return Dictionary which contain model , url and resource id.
         """
         mail_message = self.pool.get('mail.message')
         model_obj = self.pool.get(model)
-        msg = mail_message.parse_message(email)
+        msg = self.pool.get('mail.thread').message_parse(cr, uid, email)
         message_id = msg.get('message-id')
         mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
-        
+
         if message_id and mail_ids :
             mail_record = mail_message.browse(cr, uid, mail_ids)[0]
             res_id = mail_record.res_id
             notify = "Email already pushed"
         elif res_id == 0:
             if model == 'res.partner':
-                notify = 'User the button Partner to create a new partner'
+                notify = 'User the Partner button to create a new partner'
             else:
-                res_id = model_obj.message_new(cr, uid, msg)
-                notify = "Mail succefully pushed, a new %s has been created " % model
+                res_id = model_obj.message_process(cr, uid, model, email)
+                notify = "Mail successfully pushed, a new %s has been created " % model
         else:
-            if model == 'res.partner':
-                model_obj = self.pool.get('mail.thread')
-            res = self.pool.get(model).browse(cr, uid, [res_id])
-            model_obj.message_append_dict(cr, uid, res, msg)
-            notify = "Mail succefully pushed"
-            
+            model_obj.message_post(cr, uid, [res_id],
+                            body= msg.get('body'),
+                            subject= msg.get('subject'),
+                            type= 'email',
+                            parent_id= msg.get('parent_id'),
+                            attachments= msg.get('attachments'))
+            notify = "Mail successfully pushed"
         url = self._make_url(cr, uid, res_id, model)
         return (model, res_id, url, notify)
 
-    def contact_create(self, cr, uid, data, partner_id):
+    def contact_create(self, cr, uid, data, partner_id, context=None):
         """
             @param data : the data use to create the res.partner
                 [('field_name', value)], field name is required
-            @param partner_id : On which partner the address is attached 
+            @param partner_id : On which partner the address is attached
              if partner_id = 0 then create a new partner with the same name that the address
             @return : the partner_id sended or created, this allow the plugin to open the right partner page
         """
         partner_obj = self.pool.get('res.partner')
-        dictcreate = dict(data) 
-        if partner_id == 0:
-            partner_id =  partner_obj.create(cr, uid, {'name':dictcreate.get('name')})
-        dictcreate['partner_id'] = partner_id
-        self.pool.get('res.partner').create(cr, uid, dictcreate)
+        dictcreate = dict(data)
+        if partner_id:
+            is_company = partner_obj.browse(cr, uid, partner_id, context=context).is_company
+            if is_company:
+                dictcreate['parent_id'] = partner_id
+        partner_id = partner_obj.create(cr, uid, dictcreate)
         url = self._make_url(cr, uid, partner_id, 'res.partner')
         return ('res.partner', partner_id, url)
 
     # Specific to outlook rfc822 is not available so we split in arguments headerd,body,attachemnts
-    def push_message_outlook(self, cr, uid, model, headers,res_id=0 ,body_text=False, body_html=False, attachments=False):
+    def push_message_outlook(self, cr, uid, model, headers, res_id=0, body=False, body_html=False, attachments=False):
         # ----------------------------------------
         # solution 1
         # construct a fake rfc822 from the separated arguement
@@ -144,14 +147,14 @@ class plugin_handler(osv.osv_memory):
         # solution 2
         # use self.pushmessage only with header and body
         # add attachemnt yourself after
-        mail_message = self.pool.get('mail.message')        
+        mail_message = self.pool.get('mail.message')
         ir_attachment_obj = self.pool.get('ir.attachment')
         attach_ids = []
-        msg = mail_message.parse_message(headers)
-        message_id = msg.get('message-id')    
+        msg = self.pool.get('mail.thread').message_parse(cr, uid, headers)
+        message_id = msg.get('message-id')
         push_mail = self.push_message(cr, uid, model, headers, res_id)
         res_id = push_mail[1]
-        model =  push_mail[0]            
+        model =  push_mail[0]
         for name in attachments.keys():
             attachment_ids = ir_attachment_obj.search(cr, uid, [('res_model', '=', model), ('res_id', '=', res_id), ('datas_fname', '=', name)])
             if attachment_ids:
@@ -161,6 +164,6 @@ class plugin_handler(osv.osv_memory):
                 attach_ids.append(ir_attachment_obj.create(cr, uid, vals))
         mail_ids = mail_message.search(cr, uid, [('message_id','=',message_id),('res_id','=',res_id),('model','=',model)])
         if mail_ids:
-            ids =  mail_message.write(cr, uid,mail_ids[0],{ 'attachment_ids': [(6, 0, attach_ids)],'body_text':body_text,'body_html':body_html})
+            ids =  mail_message.write(cr, uid, mail_ids[0], { 'attachment_ids': [(6, 0, attach_ids)],'body':body,'body_html':body_html})
         url = self._make_url(cr, uid, res_id, model)
         return (model, res_id, url)
diff --git a/addons/plugin_outlook/__openerp__.py b/addons/plugin_outlook/__openerp__.py
index 077b0aa6746..98a1d70eb9f 100644
--- a/addons/plugin_outlook/__openerp__.py
+++ b/addons/plugin_outlook/__openerp__.py
@@ -27,7 +27,7 @@
     'website' : 'http://www.openerp.com/',
     'depends' : ['base', 'mail','plugin'],
     'category' : 'Customer Relationship Management',
-    'description': '''
+    'description': """
 This module provides the Outlook Plug-in.
 =========================================
 
@@ -35,13 +35,11 @@ Outlook plug-in allows you to select an object that you would like to add to
 your email and its attachments from MS Outlook. You can select a partner, a task,
 a project, an analytical account, or any other object and archive selected mail
 into mail.message with attachments.
-      ''',
-    'init_xml' : [],
-    'demo_xml' : [],
-    'update_xml' : ['plugin_outlook.xml'],
+      """,
+    'demo' : [],
+    'data' : ['plugin_outlook.xml'],
     'auto_install': False,
     'installable': True,
-    'certificate' : '001278773815818292125',
     'images': ['images/config_outlook.jpeg','images/outlook_config_openerp.jpeg','images/outlook_push.jpeg'],
 
 }
diff --git a/addons/plugin_outlook/i18n/ar.po b/addons/plugin_outlook/i18n/ar.po
index 3feaf50cb00..e7410afa526 100644
--- a/addons/plugin_outlook/i18n/ar.po
+++ b/addons/plugin_outlook/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/bg.po b/addons/plugin_outlook/i18n/bg.po
index 2cda4d0120a..68a5a8238e9 100644
--- a/addons/plugin_outlook/i18n/bg.po
+++ b/addons/plugin_outlook/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/ca.po b/addons/plugin_outlook/i18n/ca.po
index 2a41d8d975b..3a8bec46159 100644
--- a/addons/plugin_outlook/i18n/ca.po
+++ b/addons/plugin_outlook/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/da.po b/addons/plugin_outlook/i18n/da.po
index 714395a630f..660ead03f9e 100644
--- a/addons/plugin_outlook/i18n/da.po
+++ b/addons/plugin_outlook/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/de.po b/addons/plugin_outlook/i18n/de.po
index 1c37fa0e6e0..5d8e2ef95b3 100644
--- a/addons/plugin_outlook/i18n/de.po
+++ b/addons/plugin_outlook/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/el.po b/addons/plugin_outlook/i18n/el.po
index 4b0ec7a4dcc..f04a10fec8b 100644
--- a/addons/plugin_outlook/i18n/el.po
+++ b/addons/plugin_outlook/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/es.po b/addons/plugin_outlook/i18n/es.po
index 3b355db79e9..70ccda327a4 100644
--- a/addons/plugin_outlook/i18n/es.po
+++ b/addons/plugin_outlook/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/es_CR.po b/addons/plugin_outlook/i18n/es_CR.po
index 124b3341cd9..07fdb6eec1c 100644
--- a/addons/plugin_outlook/i18n/es_CR.po
+++ b/addons/plugin_outlook/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: plugin_outlook
diff --git a/addons/plugin_outlook/i18n/et.po b/addons/plugin_outlook/i18n/et.po
index 0c52188cd10..4fc5a9cdaf4 100644
--- a/addons/plugin_outlook/i18n/et.po
+++ b/addons/plugin_outlook/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/fi.po b/addons/plugin_outlook/i18n/fi.po
index c2ccf647cc6..fc4b8c20035 100644
--- a/addons/plugin_outlook/i18n/fi.po
+++ b/addons/plugin_outlook/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/fr.po b/addons/plugin_outlook/i18n/fr.po
index 04bd36fb695..a19ab8c4ba3 100644
--- a/addons/plugin_outlook/i18n/fr.po
+++ b/addons/plugin_outlook/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
@@ -24,6 +24,8 @@ msgid ""
 "This plug-in allows you to create and link outlook emails with openerp "
 "objects."
 msgstr ""
+"Cette extension vous permet de créer et de lier des courriels d'Outlook avec "
+"des objets d'OpenERP."
 
 #. module: plugin_outlook
 #: field:outlook.installer,name:0
@@ -36,7 +38,7 @@ msgstr "Extension pour Outlook"
 #: model:ir.ui.menu,name:plugin_outlook.menu_base_config_plugins_outlook
 #: view:outlook.installer:0
 msgid "Install Outlook Plug-In"
-msgstr ""
+msgstr "Installer l'extension pour Outlook"
 
 #. module: plugin_outlook
 #: field:outlook.installer,config_logo:0
diff --git a/addons/plugin_outlook/i18n/gl.po b/addons/plugin_outlook/i18n/gl.po
index 64b2abf2a41..163d5f0cfac 100644
--- a/addons/plugin_outlook/i18n/gl.po
+++ b/addons/plugin_outlook/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/hr.po b/addons/plugin_outlook/i18n/hr.po
index abb70d2ecb2..fa4a2045d78 100644
--- a/addons/plugin_outlook/i18n/hr.po
+++ b/addons/plugin_outlook/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/hu.po b/addons/plugin_outlook/i18n/hu.po
index d60398a0dd8..658c9207348 100644
--- a/addons/plugin_outlook/i18n/hu.po
+++ b/addons/plugin_outlook/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/id.po b/addons/plugin_outlook/i18n/id.po
index 4d6e3534997..2bc3ac4103c 100644
--- a/addons/plugin_outlook/i18n/id.po
+++ b/addons/plugin_outlook/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/it.po b/addons/plugin_outlook/i18n/it.po
index 031998173bc..1bad33981f4 100644
--- a/addons/plugin_outlook/i18n/it.po
+++ b/addons/plugin_outlook/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/ja.po b/addons/plugin_outlook/i18n/ja.po
index 26bbd90ecac..e28987fd360 100644
--- a/addons/plugin_outlook/i18n/ja.po
+++ b/addons/plugin_outlook/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/mn.po b/addons/plugin_outlook/i18n/mn.po
index 62855696813..38634978c76 100644
--- a/addons/plugin_outlook/i18n/mn.po
+++ b/addons/plugin_outlook/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
@@ -23,11 +23,13 @@ msgid ""
 "This plug-in allows you to create and link outlook emails with openerp "
 "objects."
 msgstr ""
+"Энэ залгаас нь outlook-н имэйлүүдийг openerp обьектуудтай холбох, үүсгэх "
+"боломжийг олгоно."
 
 #. module: plugin_outlook
 #: field:outlook.installer,name:0
 msgid "Outlook Plug-in"
-msgstr ""
+msgstr "Outlook залгаас"
 
 #. module: plugin_outlook
 #: model:ir.actions.act_window,name:plugin_outlook.action_outlook_installer
@@ -35,12 +37,12 @@ msgstr ""
 #: model:ir.ui.menu,name:plugin_outlook.menu_base_config_plugins_outlook
 #: view:outlook.installer:0
 msgid "Install Outlook Plug-In"
-msgstr ""
+msgstr "Outlook залгаасыг суулгах"
 
 #. module: plugin_outlook
 #: field:outlook.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Зураг"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
@@ -50,7 +52,7 @@ msgstr "гарчиг"
 #. module: plugin_outlook
 #: model:ir.model,name:plugin_outlook.model_outlook_installer
 msgid "outlook.installer"
-msgstr ""
+msgstr "outlook.installer"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
@@ -67,6 +69,8 @@ msgstr "Суулгацын ба Тохиргооны Алхамууд"
 msgid ""
 "outlook plug-in file. Save as this file and install this plug-in in outlook."
 msgstr ""
+"outlook залгаас файл. Үүнийг файл болгож хадгалаад outlook-д энэ залгаасыг "
+"суулгана."
 
 #. module: plugin_outlook
 #: field:outlook.installer,description:0
diff --git a/addons/plugin_outlook/i18n/nb.po b/addons/plugin_outlook/i18n/nb.po
new file mode 100644
index 00000000000..43180ef1cc7
--- /dev/null
+++ b/addons/plugin_outlook/i18n/nb.po
@@ -0,0 +1,78 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:42+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: plugin_outlook
+#: view:outlook.installer:0
+msgid ""
+"This plug-in allows you to create and link outlook emails with openerp "
+"objects."
+msgstr ""
+"Denne plug-in tillater deg å opprette og koble Outlook e-post med openerp "
+"objekter."
+
+#. module: plugin_outlook
+#: field:outlook.installer,name:0
+msgid "Outlook Plug-in"
+msgstr "Outlook Plugginn"
+
+#. module: plugin_outlook
+#: model:ir.actions.act_window,name:plugin_outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:plugin_outlook.action_outlook_wizard
+#: model:ir.ui.menu,name:plugin_outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
+msgid "Install Outlook Plug-In"
+msgstr "Installere Outlook Plugg-Inn."
+
+#. module: plugin_outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Bilde"
+
+#. module: plugin_outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr "tittel"
+
+#. module: plugin_outlook
+#: model:ir.model,name:plugin_outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr "outlook.installer"
+
+#. module: plugin_outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "_Lukk"
+
+#. module: plugin_outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Installasjon og Konfigurasjon trinn"
+
+#. module: plugin_outlook
+#: help:outlook.installer,name:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+"Outlook pluginn-filen. Lagre som denne filen og installere denne plugin-"
+"modulen i outlook."
+
+#. module: plugin_outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Beskrivelse:"
diff --git a/addons/plugin_outlook/i18n/nl.po b/addons/plugin_outlook/i18n/nl.po
index 7cef186e3c7..0977d08367a 100644
--- a/addons/plugin_outlook/i18n/nl.po
+++ b/addons/plugin_outlook/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2012-02-09 17:43+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/pl.po b/addons/plugin_outlook/i18n/pl.po
index c1d3e41cdc0..e02638698fe 100644
--- a/addons/plugin_outlook/i18n/pl.po
+++ b/addons/plugin_outlook/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/pt.po b/addons/plugin_outlook/i18n/pt.po
index 1fc33e22b71..c8458c8b292 100644
--- a/addons/plugin_outlook/i18n/pt.po
+++ b/addons/plugin_outlook/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/pt_BR.po b/addons/plugin_outlook/i18n/pt_BR.po
index ec89224aea2..d5fea95bab0 100644
--- a/addons/plugin_outlook/i18n/pt_BR.po
+++ b/addons/plugin_outlook/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 20:39+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/ro.po b/addons/plugin_outlook/i18n/ro.po
index 46bc204cfbc..f4fffa2e209 100644
--- a/addons/plugin_outlook/i18n/ro.po
+++ b/addons/plugin_outlook/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/ru.po b/addons/plugin_outlook/i18n/ru.po
index d9457d77b48..bed641467c5 100644
--- a/addons/plugin_outlook/i18n/ru.po
+++ b/addons/plugin_outlook/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/sl.po b/addons/plugin_outlook/i18n/sl.po
index 26227f9a1dc..ed564927bc8 100644
--- a/addons/plugin_outlook/i18n/sl.po
+++ b/addons/plugin_outlook/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/sr@latin.po b/addons/plugin_outlook/i18n/sr@latin.po
index 6d46de3a1a7..2c7dc94e5d9 100644
--- a/addons/plugin_outlook/i18n/sr@latin.po
+++ b/addons/plugin_outlook/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/sv.po b/addons/plugin_outlook/i18n/sv.po
index 0c986de40ae..3c2f3f9fed6 100644
--- a/addons/plugin_outlook/i18n/sv.po
+++ b/addons/plugin_outlook/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/tr.po b/addons/plugin_outlook/i18n/tr.po
index 168e8dcee36..576d79bcceb 100644
--- a/addons/plugin_outlook/i18n/tr.po
+++ b/addons/plugin_outlook/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/i18n/zh_CN.po b/addons/plugin_outlook/i18n/zh_CN.po
index 9139d590aa3..f14baf184de 100644
--- a/addons/plugin_outlook/i18n/zh_CN.po
+++ b/addons/plugin_outlook/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_outlook
 #: view:outlook.installer:0
diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml
index e99fbf72b6d..91c51e87ad9 100644
--- a/addons/plugin_outlook/plugin_outlook.xml
+++ b/addons/plugin_outlook/plugin_outlook.xml
@@ -10,7 +10,11 @@
                     <form position="attributes">
                         <attribute name="string">Install Outlook Plug-In</attribute>
                     </form>
-                    <xpath expr="//footer" position="replace"/>
+                    <xpath expr="//footer" position="replace">
+                    <footer>
+                        <button string="Close" special="Cancel" class="oe_highlight"/>
+                    </footer>
+                    </xpath>
                     <xpath expr="//separator[@string='title']" position="after" version="7.0">
                         <group>
                             <field name="plugin32" widget="url"/>
@@ -19,10 +23,10 @@
                         <separator string="Installation and Configuration Steps"/>
                         <p>Click on the link above to download the installer for either 32 or 64 bits, and execute it.</p>
                         <p>System requirements:</p>
-                        <ul>
-                            <li>1. MS Outlook 2005 or above.</li>
-                            <li>2. MS .Net Framework 3.5 or above.</li>
-                        </ul>
+                        <ol>
+                            <li> MS Outlook 2005 or above.</li>
+                            <li> MS .Net Framework 3.5 or above.</li>
+                        </ol>
                     </xpath>
                     <separator string="title" position="attributes">
                         <attribute name="string"></attribute>
@@ -51,7 +55,7 @@
                     <div>
                         <field name="module_plugin_outlook" class="oe_inline"/>
                         <label for="module_plugin_outlook"/>
-                        <button name="%(action_outlook_installer)d" type="action" string="Download and install the plugin" icon="gtk-execute"
+                        <button name="%(action_outlook_installer)d" type="action" string="Download and install the plug-in" icon="gtk-execute"
                             attrs="{'invisible': [('module_plugin_outlook','=',False)]}" class="oe_link"/>
                     </div>
                 </div>
diff --git a/addons/plugin_thunderbird/__openerp__.py b/addons/plugin_thunderbird/__openerp__.py
index c135491e398..56c9d47cd65 100644
--- a/addons/plugin_thunderbird/__openerp__.py
+++ b/addons/plugin_thunderbird/__openerp__.py
@@ -20,13 +20,13 @@
 #
 ##############################################################################
 {
-    "name" : "Thunderbird Plug-In",
-    "version" : "1.0",
-    "author" : ['OpenERP SA', 'Axelor'],
-    "website" : "http://www.openerp.com/",
-    "depends" : ["base","mail", "plugin"],
-    "category" : "Customer Relationship Management",
-    "description": """
+    'name' : 'Thunderbird Plug-In',
+    'version' : '1.0',
+    'author' : ['OpenERP SA', 'Axelor'],
+    'website' : 'http://www.openerp.com/',
+    'depends' : ['base','mail', 'plugin'],
+    'category' : 'Customer Relationship Management',
+    'description': """
 This module is required for the Thuderbird Plug-in to work properly.
 ====================================================================
 
@@ -36,11 +36,9 @@ account, or any other object and attach the selected mail as a .eml file in
 the attachment of a selected record. You can create documents for CRM Lead,
 HR Applicant and Project Issue from selected mails.
       """,
-    "init_xml" : [],
-    "demo_xml" : [],
-    "update_xml" : ['plugin_thunderbird.xml'],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00899858104035139949",
+    'demo' : [],
+    'data' : ['plugin_thunderbird.xml'],
+    'auto_install': False,
+    'installable': True,
     'images': ['images/config_thunderbird.jpeg','images/config_thunderbird_plugin.jpeg','images/thunderbird_document.jpeg'],
 }
diff --git a/addons/plugin_thunderbird/i18n/ar.po b/addons/plugin_thunderbird/i18n/ar.po
index 53870429088..a181b951fcd 100644
--- a/addons/plugin_thunderbird/i18n/ar.po
+++ b/addons/plugin_thunderbird/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/bg.po b/addons/plugin_thunderbird/i18n/bg.po
index bf6dc6a6172..3c77fa8e1b7 100644
--- a/addons/plugin_thunderbird/i18n/bg.po
+++ b/addons/plugin_thunderbird/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/ca.po b/addons/plugin_thunderbird/i18n/ca.po
index cfe12ccce59..60bc1393f16 100644
--- a/addons/plugin_thunderbird/i18n/ca.po
+++ b/addons/plugin_thunderbird/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/cs.po b/addons/plugin_thunderbird/i18n/cs.po
index 6eb7c0ce070..1757ac91a93 100644
--- a/addons/plugin_thunderbird/i18n/cs.po
+++ b/addons/plugin_thunderbird/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/da.po b/addons/plugin_thunderbird/i18n/da.po
index f05906a5197..3faa85c8ee5 100644
--- a/addons/plugin_thunderbird/i18n/da.po
+++ b/addons/plugin_thunderbird/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/de.po b/addons/plugin_thunderbird/i18n/de.po
index 8b5fa86ea51..4899cecf935 100644
--- a/addons/plugin_thunderbird/i18n/de.po
+++ b/addons/plugin_thunderbird/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -74,7 +74,7 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "_Close"
-msgstr "_Close"
+msgstr "_Schließen"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/en_GB.po b/addons/plugin_thunderbird/i18n/en_GB.po
index a4d49b2a2aa..9efb43cf014 100644
--- a/addons/plugin_thunderbird/i18n/en_GB.po
+++ b/addons/plugin_thunderbird/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/en_US.po b/addons/plugin_thunderbird/i18n/en_US.po
index e3857721c01..3df301dbc28 100644
--- a/addons/plugin_thunderbird/i18n/en_US.po
+++ b/addons/plugin_thunderbird/i18n/en_US.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/es.po b/addons/plugin_thunderbird/i18n/es.po
index b55c1a76610..6c6d7e792bf 100644
--- a/addons/plugin_thunderbird/i18n/es.po
+++ b/addons/plugin_thunderbird/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/es_CR.po b/addons/plugin_thunderbird/i18n/es_CR.po
index 783f4c0748c..16d9574866c 100644
--- a/addons/plugin_thunderbird/i18n/es_CR.po
+++ b/addons/plugin_thunderbird/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: plugin_thunderbird
diff --git a/addons/plugin_thunderbird/i18n/et.po b/addons/plugin_thunderbird/i18n/et.po
index 86a77652806..f2c92584caa 100644
--- a/addons/plugin_thunderbird/i18n/et.po
+++ b/addons/plugin_thunderbird/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/eu.po b/addons/plugin_thunderbird/i18n/eu.po
index f2c856cf082..b8594ab7287 100644
--- a/addons/plugin_thunderbird/i18n/eu.po
+++ b/addons/plugin_thunderbird/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/fi.po b/addons/plugin_thunderbird/i18n/fi.po
index 8f5f4b29dcc..a97962b4058 100644
--- a/addons/plugin_thunderbird/i18n/fi.po
+++ b/addons/plugin_thunderbird/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/fr.po b/addons/plugin_thunderbird/i18n/fr.po
index ff3993c9a37..ca6257d9036 100644
--- a/addons/plugin_thunderbird/i18n/fr.po
+++ b/addons/plugin_thunderbird/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -36,7 +36,7 @@ msgstr "titre"
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
 msgid "plugin_thunderbird.installer"
-msgstr ""
+msgstr "plugin_thunderbird.installer"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,config_logo:0
diff --git a/addons/plugin_thunderbird/i18n/gl.po b/addons/plugin_thunderbird/i18n/gl.po
index 7e02959b326..dc838cad4d4 100644
--- a/addons/plugin_thunderbird/i18n/gl.po
+++ b/addons/plugin_thunderbird/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/hr.po b/addons/plugin_thunderbird/i18n/hr.po
index fe44b1b04a3..1fbea551788 100644
--- a/addons/plugin_thunderbird/i18n/hr.po
+++ b/addons/plugin_thunderbird/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: plugin_thunderbird
diff --git a/addons/plugin_thunderbird/i18n/hu.po b/addons/plugin_thunderbird/i18n/hu.po
index 54b81c6efb4..50cb80aea12 100644
--- a/addons/plugin_thunderbird/i18n/hu.po
+++ b/addons/plugin_thunderbird/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/is.po b/addons/plugin_thunderbird/i18n/is.po
new file mode 100644
index 00000000000..ee23d38a4ac
--- /dev/null
+++ b/addons/plugin_thunderbird/i18n/is.po
@@ -0,0 +1,109 @@
+# Icelandic translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-09-19 10:08+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Icelandic <is@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,pdf_file:0
+msgid "Installation Manual"
+msgstr "Uppsetningarhandbók"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,description:0
+msgid "Description"
+msgstr "Lýsing"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "title"
+msgstr "titill"
+
+#. module: plugin_thunderbird
+#: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
+msgid "plugin_thunderbird.installer"
+msgstr "plugin_thunderbird.installer"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,config_logo:0
+msgid "Image"
+msgstr "Mynd"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,plugin_file:0
+#: field:plugin_thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
+msgstr "Thunderbird viðbót"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid ""
+"This plug-in allows you to link your email to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,thunderbird:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+"Gerir þér kleift að velja hlut sem þú vilt bæta við póstinn og viðhengi hans."
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,pdf_file:0
+msgid "The documentation file :- how to install Thunderbird Plug-in."
+msgstr "Handbókin :- hvernig á að setja inn Thunderbird viðbót."
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "_Close"
+msgstr "_Loka"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Installation and Configuration Steps"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,name:0
+#: field:plugin_thunderbird.installer,pdf_name:0
+msgid "File name"
+msgstr "Skrárheiti"
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,plugin_file:0
+msgid ""
+"Thunderbird plug-in file. Save as this file and install this plug-in in "
+"thunderbird."
+msgstr ""
+"Skrá með Thunderbird viðbót. Vistaðu skrána og settu viðbótina inn í "
+"Thunderbird."
+
+#. module: plugin_thunderbird
+#: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
+#: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Install Thunderbird Plug-In"
+msgstr "Setja inn Thunderbird viðbót"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Þessi viðbót gerir þér kleift að tengja tölvupóst við OpenERP skjöl. Þú "
+#~ "getur viðhengt póstinn við skjöl sem þegar eru til í OpenERP eða búið til "
+#~ "nýtt."
diff --git a/addons/plugin_thunderbird/i18n/it.po b/addons/plugin_thunderbird/i18n/it.po
index aaa7fccaeab..2db137743a8 100644
--- a/addons/plugin_thunderbird/i18n/it.po
+++ b/addons/plugin_thunderbird/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/ja.po b/addons/plugin_thunderbird/i18n/ja.po
index f3483a11fda..523ea3b3551 100644
--- a/addons/plugin_thunderbird/i18n/ja.po
+++ b/addons/plugin_thunderbird/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/mn.po b/addons/plugin_thunderbird/i18n/mn.po
index 8a427563732..c4b208422d0 100644
--- a/addons/plugin_thunderbird/i18n/mn.po
+++ b/addons/plugin_thunderbird/i18n/mn.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
 msgid "Installation Manual"
-msgstr ""
+msgstr "Суулгах Гарын авлага"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,description:0
@@ -30,23 +30,23 @@ msgstr "Тодорхойлолт"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "title"
-msgstr ""
+msgstr "гарчиг"
 
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
 msgid "plugin_thunderbird.installer"
-msgstr ""
+msgstr "plugin_thunderbird.installer"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Зураг"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,plugin_file:0
 #: field:plugin_thunderbird.installer,thunderbird:0
 msgid "Thunderbird Plug-in"
-msgstr ""
+msgstr "Thunderbird залгаас"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -61,27 +61,28 @@ msgid ""
 "Allows you to select an object that you would like to add to your email and "
 "its attachments."
 msgstr ""
+"Имэйлийг хавсралт байдлаар нэмэх обьектийг сонгох боломжоор хангадаг."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,pdf_file:0
 msgid "The documentation file :- how to install Thunderbird Plug-in."
-msgstr ""
+msgstr "Баримтжуулалтын файл :- Thunderbird залгаасыг хэрхэн суулгах."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "_Хаах"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "Суулгалтын болон Тохиргооны Алхамууд"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,name:0
 #: field:plugin_thunderbird.installer,pdf_name:0
 msgid "File name"
-msgstr ""
+msgstr "Файлын нэр"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,plugin_file:0
@@ -89,10 +90,20 @@ msgid ""
 "Thunderbird plug-in file. Save as this file and install this plug-in in "
 "thunderbird."
 msgstr ""
+"Thunderbird залгаас файл. Файл болгож хадгалаад thunderbird залгаас болгож "
+"суулгана."
 
 #. module: plugin_thunderbird
 #: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
 #: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
-msgstr ""
+msgstr "Thunderbird залгаас суулгах"
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Энэ залгаас нь OpenERP баримтуудад имэйлийг холбох боломжийг олгоно. Мөн "
+#~ "OpenERP-д байгаа янз бүрийн баримтуудад холбож өгч болно эсвэл шинээр үүсгэж "
+#~ "болно."
diff --git a/addons/plugin_thunderbird/i18n/nb.po b/addons/plugin_thunderbird/i18n/nb.po
new file mode 100644
index 00000000000..8d72cb4949a
--- /dev/null
+++ b/addons/plugin_thunderbird/i18n/nb.po
@@ -0,0 +1,108 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-09-10 13:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,pdf_file:0
+msgid "Installation Manual"
+msgstr "Installasjons håndbok."
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,description:0
+msgid "Description"
+msgstr "Beskrivelse:"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "title"
+msgstr "tittel"
+
+#. module: plugin_thunderbird
+#: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
+msgid "plugin_thunderbird.installer"
+msgstr "plugin_thunderbird.installer"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,config_logo:0
+msgid "Image"
+msgstr "Bilde"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,plugin_file:0
+#: field:plugin_thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
+msgstr "Thunderbird Plug-in"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid ""
+"This plug-in allows you to link your email to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,thunderbird:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr ""
+"Lar deg velge et objekt som du ønsker å legge til din e-post og vedlegg."
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,pdf_file:0
+msgid "The documentation file :- how to install Thunderbird Plug-in."
+msgstr "Dokumentasjonen fil: - hvordan du installerer Thunderbird Plug-in."
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "_Close"
+msgstr "_Lukk"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Installasjon og Konfigurasjon trinn"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,name:0
+#: field:plugin_thunderbird.installer,pdf_name:0
+msgid "File name"
+msgstr "Filnavn"
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,plugin_file:0
+msgid ""
+"Thunderbird plug-in file. Save as this file and install this plug-in in "
+"thunderbird."
+msgstr ""
+"Thunderbird plug-in-filen. Lagre som denne filen og installere denne plugin-"
+"modulen i thunderbird."
+
+#. module: plugin_thunderbird
+#: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
+#: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Install Thunderbird Plug-In"
+msgstr "Installer Thunderbird Plug-in."
+
+#~ msgid ""
+#~ "This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+#~ "attach it to any existing one in OpenERP or create a new one."
+#~ msgstr ""
+#~ "Denne plug-in tillater deg å koble din e-post til OpenERP er dokumenter. Du "
+#~ "kan feste den til enhver eksisterende i OpenERP eller opprette en ny."
diff --git a/addons/plugin_thunderbird/i18n/nl.po b/addons/plugin_thunderbird/i18n/nl.po
index d12b6c8624f..3204ea0b20a 100644
--- a/addons/plugin_thunderbird/i18n/nl.po
+++ b/addons/plugin_thunderbird/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2012-06-28 12:50+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/pl.po b/addons/plugin_thunderbird/i18n/pl.po
index 318266fcbd1..957c960a6a7 100644
--- a/addons/plugin_thunderbird/i18n/pl.po
+++ b/addons/plugin_thunderbird/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/pt.po b/addons/plugin_thunderbird/i18n/pt.po
index 9f2ae631826..d90528511ed 100644
--- a/addons/plugin_thunderbird/i18n/pt.po
+++ b/addons/plugin_thunderbird/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/pt_BR.po b/addons/plugin_thunderbird/i18n/pt_BR.po
index 81b2993b8a7..14492e7bb34 100644
--- a/addons/plugin_thunderbird/i18n/pt_BR.po
+++ b/addons/plugin_thunderbird/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 20:54+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/ro.po b/addons/plugin_thunderbird/i18n/ro.po
index 530bfd9d4d2..a1602e77f70 100644
--- a/addons/plugin_thunderbird/i18n/ro.po
+++ b/addons/plugin_thunderbird/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/ru.po b/addons/plugin_thunderbird/i18n/ru.po
index 297a59e9933..2aa7c7e2710 100644
--- a/addons/plugin_thunderbird/i18n/ru.po
+++ b/addons/plugin_thunderbird/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/sk.po b/addons/plugin_thunderbird/i18n/sk.po
index 14443183b35..733acd8af05 100644
--- a/addons/plugin_thunderbird/i18n/sk.po
+++ b/addons/plugin_thunderbird/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/sl.po b/addons/plugin_thunderbird/i18n/sl.po
index dab3f9e09d9..eae6c068472 100644
--- a/addons/plugin_thunderbird/i18n/sl.po
+++ b/addons/plugin_thunderbird/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/sr.po b/addons/plugin_thunderbird/i18n/sr.po
index a6dc1a9b3bf..4b5ddeb33e4 100644
--- a/addons/plugin_thunderbird/i18n/sr.po
+++ b/addons/plugin_thunderbird/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/sr@latin.po b/addons/plugin_thunderbird/i18n/sr@latin.po
index 127701835ad..355c08057d2 100644
--- a/addons/plugin_thunderbird/i18n/sr@latin.po
+++ b/addons/plugin_thunderbird/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/sv.po b/addons/plugin_thunderbird/i18n/sv.po
index 09353d67238..91ea8e617b7 100644
--- a/addons/plugin_thunderbird/i18n/sv.po
+++ b/addons/plugin_thunderbird/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/tr.po b/addons/plugin_thunderbird/i18n/tr.po
index 0337eef86da..22d547979c3 100644
--- a/addons/plugin_thunderbird/i18n/tr.po
+++ b/addons/plugin_thunderbird/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/i18n/zh_CN.po b/addons/plugin_thunderbird/i18n/zh_CN.po
index c8701eb5f8e..00bd9aa77b3 100644
--- a/addons/plugin_thunderbird/i18n/zh_CN.po
+++ b/addons/plugin_thunderbird/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py
index 6473758883d..923611b97a9 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.py
+++ b/addons/plugin_thunderbird/plugin_thunderbird.py
@@ -30,13 +30,11 @@ class plugin_thunderbird_installer(osv.osv_memory):
         'thunderbird': fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you would like to add to your email and its attachments."),
         'plugin_name': fields.char('File name', size=64),
         'plugin_file': fields.char('Thunderbird Plug-in', size=256, readonly=True, help="Thunderbird plug-in file. Save this file and install it in Thunderbird."),
-        'pdf_file': fields.char('Installation Manual', size=256, help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
     }
 
     _defaults = {
         'thunderbird': True,
         'plugin_name': 'openerp_plugin.xpi',
-        'pdf_file': 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html',
     }
 
     def default_get(self, cr, uid, fields, context=None):
@@ -45,4 +43,4 @@ class plugin_thunderbird_installer(osv.osv_memory):
         res['plugin_file'] = base_url + '/plugin_thunderbird/static/openerp_plugin.xpi'
         return res
 
-# 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/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index 5ea5fc38219..3774a369437 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -10,25 +10,28 @@
                     <form position="attributes">
                         <attribute name="string">Install Thunderbird Plug-In</attribute>
                     </form>
-                    <xpath expr="//footer" position="replace"/>
+                    <xpath expr="//footer" position="replace">
+                    <footer>
+                        <button string="Close" special="Cancel" class="oe_highlight"/>
+                    </footer>
+                    </xpath>
                     <xpath expr="//separator[@string='title']" position="after">
                         <group>
                             <field name="thunderbird" invisible="1"/>
                             <field name="plugin_name" invisible="1"/>
                             <field name="plugin_file" filename="plugin_name" widget="url"/>
-                            <field name="pdf_file" widget="url"/>
                         </group>
                         <separator string="Installation and Configuration Steps"/>
-                        <p>Thunderbird plugin installation:</p>
-                        <ul>
-                            <li>1. Save the Thunderbird plug-in.</li>
-                            <li>2. From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li>
-                            <li>3. Select the plug-in (the file named openerp_plugin.xpi).</li>
-                            <li>4. Click "Install Now".</li>
-                            <li>5. Restart Thunderbird.</li>
-                            <li>6. From the Thunderbird menubar: OpenERP -> Configuration.</li>
-                            <li>7. Configure your openerp server.</li>
-                        </ul>
+                        <p>Thunderbird plug-in installation:</p>
+                        <ol>
+                            <li> Save the Thunderbird plug-in.</li>
+                            <li> From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...</li>
+                            <li> Select the plug-in (the file named openerp_plugin.xpi).</li>
+                            <li> Click "Install Now".</li>
+                            <li> Restart Thunderbird.</li>
+                            <li> From the Thunderbird menubar: OpenERP -> Configuration.</li>
+                            <li> Configure your openerp server.</li>
+                        </ol>
                     </xpath>
                     <separator string="title" position="attributes">
                         <attribute name="string"></attribute>
@@ -57,7 +60,7 @@
                     <div>
                         <field name="module_plugin_thunderbird" class="oe_inline"/>
                         <label for="module_plugin_thunderbird"/>
-                        <button name="%(action_thunderbird_installer)d" type="action" string="Download and install the plugin" icon="gtk-execute"
+                        <button name="%(action_thunderbird_installer)d" type="action" string="Download and install the plug-in" icon="gtk-execute"
                             attrs="{'invisible': [('module_plugin_thunderbird','=',False)]}" class="oe_link"/>
                     </div>
                 </div>
diff --git a/addons/plugin_thunderbird/static/openerp_plugin.xpi b/addons/plugin_thunderbird/static/openerp_plugin.xpi
index f2800f6cae3..b1aeb6f9102 100644
Binary files a/addons/plugin_thunderbird/static/openerp_plugin.xpi and b/addons/plugin_thunderbird/static/openerp_plugin.xpi differ
diff --git a/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin.jar b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin.jar
index d6ff77f76e0..64b4e9e04fe 100644
Binary files a/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin.jar and b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin.jar differ
diff --git a/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/create.xul b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/create.xul
index cc47b895a3e..d20f54c1b95 100644
--- a/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/create.xul
+++ b/addons/plugin_thunderbird/static/thunderbird_plugin/chrome/openerp_plugin/content/create.xul
@@ -44,6 +44,6 @@
 	</groupbox>
 	<hbox align="right">
   		<button label="cancel" image="&imagecancel.value;" oncommand="close();" />
-  		<button label="create partner" image="&imageok.value;" oncommand="createContact();"/>
+  		<button label="create contact" image="&imageok.value;" oncommand="createContact();"/>
 	</hbox>
 </window>
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index e0722f12395..e9dd628243b 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -24,27 +24,33 @@
     'name': 'Point of Sale',
     'version': '1.0.1',
     'category': 'Point Of Sale',
-    "sequence": 6,
-    "summary": "Touchscreen Interface for Shops",
+    'sequence': 6,
+    'summary': 'Touchscreen Interface for Shops',
     'description': """
-This module provides a quick and easy sale process.
-===================================================
+Quick and Easy sale process
+============================
 
-Main features:
---------------
-    * Fast encoding of the sale
-    * Allow to choose one payment mode (the quick way) or to split the payment between several payment mode
-    * Computation of the amount of money to return
-    * Create and confirm picking list automatically
-    * Allow the user to create invoice automatically
-    * Allow to refund former sales
+This module allows you to manage your shop sales very easily with a fully web based touchscreen interface.
+It is compatible with all PC tablets and the iPad, offering multiple payment methods. 
+
+Product selection can be done in several ways: 
+
+* Using a barcode reader
+* Browsing through categories of products or via a text search.
+
+Main Features
+-------------
+* Fast encoding of the sale
+* Choose one payment method (the quick way) or split the payment between several payment methods
+* Computation of the amount of money to return
+* Create and confirm the picking list automatically
+* Allows the user to create an invoice automatically
+* Refund previous sales
     """,
     'author': 'OpenERP SA',
     'images': ['images/cash_registers.jpeg', 'images/pos_analysis.jpeg','images/register_analysis.jpeg','images/sale_order_pos.jpeg','images/product_pos.jpeg'],
-    'depends': ['sale'],
-    'init_xml': [],
-
-    'update_xml': [
+    'depends': ['sale_stock'],
+    'data': [
         'security/point_of_sale_security.xml',
         'security/ir.model.access.csv',
         'wizard/pos_details.xml',
@@ -69,7 +75,7 @@ Main features:
         'account_statement_report.xml',
         'res_users_view.xml',
     ],
-    'demo_xml': [
+    'demo': [
         'point_of_sale_demo.xml',
         'account_statement_demo.xml',
         'test/00_register_open.yml'
@@ -81,24 +87,25 @@ Main features:
     ],
     'installable': True,
     'application': True,
-    # Web client
     'js': [
-            'static/lib/mousewheel/jquery.mousewheel-3.0.6.js',
-            'static/src/js/db.js',
-            'static/src/js/models.js',
-            'static/src/js/widget_base.js',
-            'static/src/js/widget_keyboard.js',
-            'static/src/js/widget_scrollbar.js',
-            'static/src/js/widgets.js',
-            'static/src/js/devices.js',
-            'static/src/js/screens.js',
-            'static/src/js/main.js'
+        'static/lib/mousewheel/jquery.mousewheel-3.0.6.js',
+        'static/src/js/db.js',
+        'static/src/js/models.js',
+        'static/src/js/widget_base.js',
+        'static/src/js/widget_keyboard.js',
+        'static/src/js/widget_scrollbar.js',
+        'static/src/js/widgets.js',
+        'static/src/js/devices.js',
+        'static/src/js/screens.js',
+        'static/src/js/main.js',
     ],
     'css': [
-        'static/src/css/pos.css',
+        'static/src/css/pos.css', # this is the default css with hover effects
+        #'static/src/css/pos_nohover.css', # this css has no hover effects (for resistive touchscreens)
         'static/src/css/keyboard.css'
     ],
     'qweb': ['static/src/xml/pos.xml'],
     'auto_install': False,
 }
+
 # 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 eb7d791ebf9..06fe1d4a1f8 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -27,15 +27,10 @@ class account_journal(osv.osv):
     _columns = {
         'journal_user': fields.boolean('PoS Payment Method', help="Check this box if this journal define a payment method that can be used in point of sales."),
 
-        'opening_control': fields.boolean('Opening Control', help="If you want the journal should be control at opening, check this option"),
-        'closing_control': fields.boolean('Closing Control', help="If you want the journal should be control at closing, check this option"),
-
         'amount_authorized_diff' : fields.float('Amount Authorized Difference'),
         'self_checkout_payment_method' : fields.boolean('Self Checkout Payment Method'),
     }
     _defaults = {
-        'opening_control' : False,
-        'closing_control' : False,
         'self_checkout_payment_method' : False,
     }
 
@@ -46,6 +41,7 @@ class account_cash_statement(osv.osv):
     _columns = {
         'pos_session_id' : fields.many2one('pos.session'),
     }
+
 account_cash_statement()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/point_of_sale/account_statement_view.xml b/addons/point_of_sale/account_statement_view.xml
index d7f3be2a8d6..86fc8fec164 100644
--- a/addons/point_of_sale/account_statement_view.xml
+++ b/addons/point_of_sale/account_statement_view.xml
@@ -10,8 +10,6 @@
                     <page string="Point of Sale">
                         <group col="4" colspan="4">
                             <field name="journal_user"/>
-                            <field name="opening_control"/>
-                            <field name="closing_control"/>
                             <field name="amount_authorized_diff"/>
                             <field name="self_checkout_payment_method" />
                         </group>
@@ -113,37 +111,5 @@
             <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="Cash Register Management" parent="point_of_sale.menu_point_root"
-            id="menu_point_open_config" sequence="10"/>
-        <menuitem
-            name="Open Cash Registers" parent="menu_point_open_config"
-            string="Open Cash Registers"
-            action="action_pos_open_statement"
-            id="menu_open_statement" sequence="1" />
-
-        <menuitem
-            name="Close Cash Registers" parent="menu_point_open_config"
-            string="Close Cash Registers"
-            action="action_pos_close_statement"
-            id="menu_close_statement" sequence="2" />
-
-        <menuitem
-            parent="menu_point_open_config"
-            action="action_pos_confirm"
-            id="menu_wizard_pos_confirm" sequence="8" />
-
-
-        <menuitem
-            name="List of Cash Registers"
-            parent="menu_point_open_config"
-            action="action_new_bank_statement_all_tree"
-            id="menu_all_menu_all_register"
-            sequence="4"
-        />
-    -->
-
-
     </data>
 </openerp>
diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py
index 425a7e3d7f8..b189c8f204a 100644
--- a/addons/point_of_sale/controllers/main.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -4,16 +4,12 @@ import simplejson
 import os
 import openerp
 
-try:
-    import openerp.addons.web.common.http as openerpweb
-    from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
-except ImportError:
-    import web.common.http as openerpweb
+from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
 
-class PointOfSaleController(openerpweb.Controller):
+class PointOfSaleController(openerp.addons.web.http.Controller):
     _cp_path = '/pos'
 
-    @openerpweb.httprequest
+    @openerp.addons.web.http.httprequest
     def app(self, req, s_action=None, **kw):
         js = "\n        ".join('<script type="text/javascript" src="%s"></script>' % i for i in manifest_list(req, None, 'js'))
         css = "\n        ".join('<link rel="stylesheet" href="%s">' % i for i in manifest_list(req, None, 'css'))
@@ -29,7 +25,7 @@ class PointOfSaleController(openerpweb.Controller):
         }
         return r
 
-    @openerpweb.httprequest
+    @openerp.addons.web.http.httprequest
     def manifest(self, req, **kwargs):
         """ This generates a HTML5 cache manifest files that preloads the categories and products thumbnails 
             and other ressources necessary for the point of sale to work offline """
@@ -66,28 +62,28 @@ class PointOfSaleController(openerpweb.Controller):
 
         return m
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def dispatch(self, request, iface, **kwargs):
         method = 'iface_%s' % iface
         return getattr(self, method)(request, **kwargs)
 
-    @openerpweb.jsonrequest
-    def scan_item_success(self, request):
+    @openerp.addons.web.http.jsonrequest
+    def scan_item_success(self, request, ean):
         """
         A product has been scanned with success
         """
-        print 'scan_item_success'
+        print 'scan_item_success: ' + str(ean)
         return 
 
-    @openerpweb.jsonrequest
-    def scan_item_error_unrecognized(self, request):
+    @openerp.addons.web.http.jsonrequest
+    def scan_item_error_unrecognized(self, request, ean):
         """
         A product has been scanned without success
         """
-        print 'scan_item_error_unrecognized'
+        print 'scan_item_error_unrecognized: ' + str(ean)
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def help_needed(self, request):
         """
         The user wants an help (ex: light is on)
@@ -95,7 +91,7 @@ class PointOfSaleController(openerpweb.Controller):
         print "help_needed"
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def help_canceled(self, request):
         """
         The user stops the help request
@@ -103,67 +99,72 @@ class PointOfSaleController(openerpweb.Controller):
         print "help_canceled"
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def weighting_start(self, request):
         print "weighting_start"
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def weighting_read_kg(self, request):
         print "weighting_read_kg"
         return 0.0
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def weighting_end(self, request):
         print "weighting_end"
         return 
 
-    @openerpweb.jsonrequest
-    def payment_request(self, request, price, method, info):
+    @openerp.addons.web.http.jsonrequest
+    def payment_request(self, request, price):
         """
         The PoS will activate the method payment 
         """
-        print "payment_request: price:"+str(price)+" method:"+str(method)+" info:"+str(info)
+        print "payment_request: price:"+str(price)
+        return 'ok'
+
+    @openerp.addons.web.http.jsonrequest
+    def payment_status(self, request):
+        print "payment_status"
+        return { 'status':'waiting' } 
+
+    @openerp.addons.web.http.jsonrequest
+    def payment_cancel(self, request):
+        print "payment_cancel"
         return 
 
-    @openerpweb.jsonrequest
-    def is_payment_accepted(self, request):
-        print "is_payment_accepted"
-        return 'waiting_for_payment' 
-
-    @openerpweb.jsonrequest
-    def payment_canceled(self, request):
-        print "payment_canceled"
-        return 
-
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def transaction_start(self, request):
         print 'transaction_start'
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def transaction_end(self, request):
         print 'transaction_end'
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def cashier_mode_activated(self, request):
         print 'cashier_mode_activated'
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def cashier_mode_deactivated(self, request):
         print 'cashier_mode_deactivated'
         return 
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def open_cashbox(self, request):
         print 'open_cashbox'
         return
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def print_receipt(self, request, receipt):
         print 'print_receipt' + str(receipt)
         return
 
+    @openerp.addons.web.http.jsonrequest
+    def print_pdf_invoice(self, request, pdfinvoice):
+        print 'print_pdf_invoice' + str(pdfinvoice)
+        return
+
 
diff --git a/addons/point_of_sale/i18n/ar.po b/addons/point_of_sale/i18n/ar.po
index 4d2038463a8..cfbe811b33a 100644
--- a/addons/point_of_sale/i18n/ar.po
+++ b/addons/point_of_sale/i18n/ar.po
@@ -13,18 +13,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr ""
+msgstr "رقم المنتج"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
 msgid "Sales by day"
-msgstr ""
+msgstr "المبيعات باليوم"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:49
@@ -56,7 +56,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Post All Orders"
-msgstr ""
+msgstr "ترحيل كل الأوامر"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_2l_product_template
@@ -78,7 +78,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
 #: report:pos.details:0 report:pos.details_summary:0
 msgid "Details of Sales"
-msgstr ""
+msgstr "تفاصيل المبيعات"
 
 #. module: point_of_sale
 #: view:report.cash.register:0 field:report.cash.register,day:0
@@ -89,12 +89,12 @@ msgstr "يوم"
 #. module: point_of_sale
 #: view:pos.make.payment:0
 msgid "Add payment :"
-msgstr ""
+msgstr "إضافة دفع جديد"
 
 #. module: point_of_sale
 #: field:pos.box.out,name:0
 msgid "Description / Reason"
-msgstr ""
+msgstr "وصف / سبب"
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,product_name:0
@@ -105,7 +105,7 @@ msgstr "اسم المنتج"
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Month from Creation date of cash register"
-msgstr ""
+msgstr "شهر منذ يوم إنشاء صندوق الدفع"
 
 #. module: point_of_sale
 #: report:account.statement:0 field:pos.box.entries,amount:0
@@ -121,18 +121,20 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"خطأ في الإعدادات! يجب أن تكون العملة المختارة مشتركة للحسابات الإفتراضية "
+"أيضأً."
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.pos_category_action
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_category view:pos.category:0
 msgid "PoS Categories"
-msgstr ""
+msgstr "فئات نقاط البيع"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_out
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
 msgid "Take Money Out"
-msgstr ""
+msgstr "إخراج نقد"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -161,6 +163,7 @@ msgid ""
 "You do not have any open cash register. You must create a payment method or "
 "open a cash register."
 msgstr ""
+"ليس لديك اي صندوق دفع مفتوح. يجب ان تختار طريقة دفع او ان تقوم بفتح صندوق دفع"
 
 #. module: point_of_sale
 #: report:account.statement:0 field:report.pos.order,partner_id:0
@@ -195,7 +198,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "معلومات محاسبية"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_2l_product_template
@@ -210,13 +213,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.soda_orange
 msgid "Orange"
-msgstr ""
+msgstr "برتقالي"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
 #: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
 msgid "Sales by User"
-msgstr ""
+msgstr "المبيعات بالمستخدم"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -247,7 +250,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.beverage
 msgid "Beverages"
-msgstr ""
+msgstr "مشروبات"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.stella_50cl_product_template
@@ -262,7 +265,7 @@ msgstr "تواريخ"
 #. module: point_of_sale
 #: field:pos.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "الفئة الأم"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.lines:0 report:pos.payment.report.user:0
@@ -289,7 +292,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Total qty"
-msgstr ""
+msgstr "إجمالي الكمية"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
@@ -299,7 +302,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
 msgid "Sales by User Monthly"
-msgstr ""
+msgstr "مبيعات المستخدم الشهرية"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -314,13 +317,13 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
 msgid "Daily Operations"
-msgstr ""
+msgstr "العمليات اليومية"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:285
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "خطأ في الإعدادات!"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.sparkling_water
@@ -382,7 +385,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
 msgid "Closing Date"
-msgstr ""
+msgstr "تاريخ الاغلاق"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -414,7 +417,7 @@ msgstr "كمية"
 #. module: point_of_sale
 #: field:pos.order.line,name:0
 msgid "Line No"
-msgstr ""
+msgstr "السطر رقم"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -440,7 +443,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.details_summary:0
 msgid "Mode of Payment"
-msgstr ""
+msgstr "حالة الدفع"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_confirm
@@ -451,7 +454,7 @@ msgstr ""
 #: code:addons/point_of_sale/point_of_sale.py:408
 #, python-format
 msgid "Customer Invoice"
-msgstr ""
+msgstr "فاتورة العميل"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
@@ -467,7 +470,7 @@ msgstr ""
 #: view:pos.details:0 view:pos.payment.report:0 view:pos.payment.report.user:0
 #: view:pos.sale.user:0
 msgid "Print Report"
-msgstr ""
+msgstr "طباعة التقرير"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_bolognese_product_template
@@ -490,7 +493,7 @@ msgstr ""
 #: code:addons/point_of_sale/wizard/pos_return.py:240
 #, python-format
 msgid "Add Product"
-msgstr ""
+msgstr "أضف منتج"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_am:0
@@ -531,7 +534,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "رصيد ختامي"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_max_50cl_product_template
@@ -567,13 +570,13 @@ msgstr ""
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "خطأ: كود إين غير صالح"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
 #: view:pos.open.statement:0
 msgid "Open Statements"
-msgstr ""
+msgstr "بيانات الفتح"
 
 #. module: point_of_sale
 #: field:pos.details,date_end:0 field:pos.sale.user,date_end:0
@@ -619,7 +622,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Not Invoiced"
-msgstr ""
+msgstr "لم يتم عمل فاتروة لها"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -811,12 +814,12 @@ msgstr "قائمة الأسعار"
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
 msgid "Total invoiced"
-msgstr ""
+msgstr "الفواتير الكلية"
 
 #. module: point_of_sale
 #: view:report.pos.order:0 field:report.pos.order,product_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "# للكمية"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
@@ -851,12 +854,12 @@ msgstr "مسودة للفاتورة"
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "يجب ان تكون كمية الايصال نفس كمية الايصال في خط البيان"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "ملاحظة الوضع المالي :"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_2l_product_template
@@ -1055,7 +1058,7 @@ msgstr "المستخدمون"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.food
 msgid "Food"
-msgstr ""
+msgstr "الطعام"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -1164,7 +1167,7 @@ msgstr "كشف حساب بنك"
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "يجب ان يكون الاسم لليومية فريد لكل شركة!"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_light_naturel_170g_product_template
@@ -1194,7 +1197,7 @@ msgstr ""
 #: help:pos.category,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
-msgstr ""
+msgstr "يعطي ترتيب التسلسل عند عرض قائمة من فئات المنتجات"
 
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
@@ -1226,12 +1229,12 @@ msgstr ""
 #: code:addons/point_of_sale/point_of_sale.py:640
 #, python-format
 msgid "No Pricelist !"
-msgstr ""
+msgstr "لا يوجد قائمة اسعار !"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Update"
-msgstr ""
+msgstr "تحديث"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1241,7 +1244,7 @@ msgstr "الأساس"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.categ_others
 msgid "Others"
-msgstr ""
+msgstr "أخرى"
 
 #. module: point_of_sale
 #: view:product.product:0
@@ -1367,7 +1370,7 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.make.payment,journal:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "طريقة الدفع"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_paprika_45g_product_template
@@ -1389,14 +1392,14 @@ msgstr "الكمية"
 #. module: point_of_sale
 #: view:report.cash.register:0 view:report.pos.order:0
 msgid "Month -1"
-msgstr ""
+msgstr "شهر  - ١"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user
 #: model:ir.model,name:point_of_sale.model_pos_sale_user
 #: view:pos.payment.report.user:0
 msgid "Sale by User"
-msgstr ""
+msgstr "مبيعات بمستخدم"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_1l_product_template
@@ -1411,7 +1414,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.water
 msgid "Water"
-msgstr ""
+msgstr "مياه"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -1548,7 +1551,7 @@ msgstr "رصيد أول المدة"
 #. module: point_of_sale
 #: view:account.bank.statement:0 selection:report.pos.order,state:0
 msgid "Closed"
-msgstr ""
+msgstr "مغلق"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_vegetale_product_template
@@ -1578,7 +1581,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Discount"
-msgstr ""
+msgstr "الخصم"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -1606,7 +1609,7 @@ msgstr ""
 #. module: point_of_sale
 #: selection:report.cash.register,state:0
 msgid "Quotation"
-msgstr ""
+msgstr "التسعيرة"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.product_product_putmoneyforchange0_product_template
@@ -1709,7 +1712,7 @@ msgstr "فتح"
 #. module: point_of_sale
 #: field:pos.order,name:0 field:pos.order.line,order_id:0
 msgid "Order Ref"
-msgstr ""
+msgstr "مسلسل الأمر"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_geuze_37,5cl_product_template
@@ -1808,7 +1811,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0 selection:pos.order,state:0
 msgid "Posted"
-msgstr ""
+msgstr "مرحَلة"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
@@ -1861,7 +1864,7 @@ msgstr "المجموع الصافي"
 #. module: point_of_sale
 #: model:res.groups,name:point_of_sale.group_pos_manager
 msgid "Manager"
-msgstr ""
+msgstr "المدير"
 
 #. module: point_of_sale
 #: field:pos.details,date_start:0 field:pos.sale.user,date_start:0
@@ -1940,7 +1943,7 @@ msgstr "تاريخ الفاتورة"
 #. module: point_of_sale
 #: field:pos.box.entries,name:0
 msgid "Reason"
-msgstr ""
+msgstr "السبب"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orangina_33cl_product_template
@@ -2013,7 +2016,7 @@ msgstr ""
 #. module: point_of_sale
 #: selection:pos.order,state:0 selection:report.pos.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "ملغي"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
@@ -2028,12 +2031,12 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.order,picking_id:0
 msgid "Picking"
-msgstr ""
+msgstr "اختيار"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.ice_cream
 msgid "Ice Cream"
-msgstr ""
+msgstr "أيس كريم"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0 field:report.pos.order,shop_id:0
@@ -2043,7 +2046,7 @@ msgstr "المتجر"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "سطر كشف البنك"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.belle_vue_kriek_25cl_product_template
@@ -2085,7 +2088,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Generate Entries"
-msgstr ""
+msgstr "إنشاء قيود"
 
 #. module: point_of_sale
 #: field:pos.box.entries,product_id:0 field:pos.box.out,product_id:0
@@ -2137,13 +2140,13 @@ msgstr "فاتورة المورد"
 #. module: point_of_sale
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "يجب أن يكون اليومية و الفترة مرتبطين لشركة واحدة."
 
 #. module: point_of_sale
 #: view:pos.order:0 selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "New"
-msgstr ""
+msgstr "جديد"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:238
@@ -2179,7 +2182,7 @@ msgstr ""
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "يجب ان يكون الكود لليومية فريد لكل شركة !"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
@@ -2231,7 +2234,7 @@ msgstr ""
 #: code:addons/point_of_sale/point_of_sale.py:329 view:pos.order:0
 #, python-format
 msgid "Return Products"
-msgstr ""
+msgstr "منتجات"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.jupiler_33cl_product_template
@@ -2317,7 +2320,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "شكلي"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:358
@@ -2416,7 +2419,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Refund"
-msgstr ""
+msgstr "رد"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/report/pos_invoice.py:46
@@ -2445,7 +2448,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "General Information"
-msgstr ""
+msgstr "المعلومات العامة"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -2485,12 +2488,12 @@ msgstr ""
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
 msgid "Pyament Report"
-msgstr ""
+msgstr "تقرير الدفع"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,jl_id:0
 msgid "Cash Journals"
-msgstr ""
+msgstr "يومية النفدة"
 
 #. module: point_of_sale
 #: report:pos.sales.user.today:0
@@ -2500,7 +2503,7 @@ msgstr ""
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "رمز العميل"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_out.py:86
@@ -2526,7 +2529,7 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Yesterday"
-msgstr ""
+msgstr "أمس"
 
 #. module: point_of_sale
 #: field:pos.order,note:0
@@ -2563,7 +2566,7 @@ msgstr "فبراير"
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "    Today    "
-msgstr ""
+msgstr "    اليوم    "
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -2578,7 +2581,7 @@ msgstr "مدفوعات"
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Supplier Refund"
-msgstr ""
+msgstr "رد للمورد"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
@@ -2600,18 +2603,18 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.category,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "مسلسل"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:316 view:pos.make.payment:0
 #, python-format
 msgid "Make Payment"
-msgstr ""
+msgstr "القيام بالدفع"
 
 #. module: point_of_sale
 #: constraint:pos.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "خطأ ! لا يمكن إنشاء فئات متداخلة."
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today
@@ -2637,7 +2640,7 @@ msgstr "سنة"
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:31
 msgid "Disc (%)"
-msgstr ""
+msgstr "نسبة الخصم"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:41
@@ -2648,22 +2651,22 @@ msgstr ""
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:45
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:268
 msgid "Tax:"
-msgstr ""
+msgstr "الضريبة:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:64
 msgid "Disc"
-msgstr ""
+msgstr "قرص"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:71
 msgid "+/-"
-msgstr ""
+msgstr "+/-"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:105
 msgid "Paid:"
-msgstr ""
+msgstr "مدفوع:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:113
@@ -2679,12 +2682,12 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:127
 msgid "Validate"
-msgstr ""
+msgstr "تحقق"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:140
 msgid "pending orders"
-msgstr ""
+msgstr "أوامر معلقة"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:145
diff --git a/addons/point_of_sale/i18n/bg.po b/addons/point_of_sale/i18n/bg.po
index b532496f577..95c67c2610a 100644
--- a/addons/point_of_sale/i18n/bg.po
+++ b/addons/point_of_sale/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/bs.po b/addons/point_of_sale/i18n/bs.po
index 447c578a6fd..ead49dbdf87 100644
--- a/addons/point_of_sale/i18n/bs.po
+++ b/addons/point_of_sale/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/ca.po b/addons/point_of_sale/i18n/ca.po
index ade9af2d22e..57e70f86003 100644
--- a/addons/point_of_sale/i18n/ca.po
+++ b/addons/point_of_sale/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/cs.po b/addons/point_of_sale/i18n/cs.po
index e2a6a5bda95..1cde8fc6edd 100644
--- a/addons/point_of_sale/i18n/cs.po
+++ b/addons/point_of_sale/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/da.po b/addons/point_of_sale/i18n/da.po
index 6cc16d97ec8..71a95e4e8f7 100644
--- a/addons/point_of_sale/i18n/da.po
+++ b/addons/point_of_sale/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/de.po b/addons/point_of_sale/i18n/de.po
index 25f3620f8dd..113d062257f 100644
--- a/addons/point_of_sale/i18n/de.po
+++ b/addons/point_of_sale/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -52,7 +52,7 @@ msgstr "Heute"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.plain_water
 msgid "Plain Water"
-msgstr ""
+msgstr "Wasser (natur)"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -210,7 +210,7 @@ msgstr "Finanzbuchhaltung Info"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_2l_product_template
 msgid "Coca-Cola Regular 2L"
-msgstr ""
+msgstr "Coca-Cola (normal) 2L"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
@@ -294,7 +294,7 @@ msgstr "Rabatt (%)"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_speciale_product_template
 msgid "Dr. Oetker Ristorante Speciale"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Speciale"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
@@ -371,7 +371,7 @@ msgstr "POS Auftragsposition"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_50cl_product_template
 msgid "Fanta Orange 50cl"
-msgstr ""
+msgstr "Fanta Orange 50cl"
 
 #. module: point_of_sale
 #: field:pos.category,child_id:0
@@ -405,7 +405,7 @@ msgstr "Oktober"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_1l_product_template
 msgid "Coca-Cola Light 1L"
-msgstr ""
+msgstr "Coca-Cola Light 1L"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
@@ -485,7 +485,7 @@ msgstr "Drucke Report"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_bolognese_product_template
 msgid "Dr. Oetker Ristorante Bolognese"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Bolognese"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:105
@@ -496,7 +496,7 @@ msgstr "Bitte prüfen Sie, dass ein Ertragskonto zugewiesen wird für %s"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.pizza
 msgid "Pizza"
-msgstr ""
+msgstr "Pizza"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
@@ -549,7 +549,7 @@ msgstr "Endsaldo"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_max_50cl_product_template
 msgid "Pepsi Max 50cl"
-msgstr ""
+msgstr "Copy text \t Pepsi Max 50cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.san_pellegrino_1l_product_template
@@ -656,7 +656,7 @@ msgstr "Sie müssen noch eine Preisliste beim Verkaufsauftrag wählen !"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_2l_product_template
 msgid "Fanta Orange 2L"
-msgstr ""
+msgstr "Copy text \t Fanta Orange 2L"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_33cl_product_template
@@ -1112,7 +1112,7 @@ msgstr "Erzeugt am"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_33cl_product_template
 msgid "Coca-Cola Regular 33cl"
-msgstr ""
+msgstr "Coca-Cola (normal) 33cl"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:65
@@ -1228,7 +1228,7 @@ msgstr "Kassa Geld Ausgang"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.soda
 msgid "Soda"
-msgstr ""
+msgstr "Sprudelhaltiges"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0 view:pos.order:0 view:report.cash.register:0
@@ -2115,7 +2115,7 @@ msgstr "Um einen Verkauf zu löschen muss diese neu oder storniert sein."
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_50cl_product_template
 msgid "Coca-Cola Regular 50cl"
-msgstr ""
+msgstr "Coca-Cola (normal) 50cl"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
@@ -2333,7 +2333,7 @@ msgstr ""
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.special_beers
 msgid "Special Beers"
-msgstr ""
+msgstr "Besondere Biere"
 
 #. module: point_of_sale
 #: field:pos.order.line,notice:0
@@ -2369,7 +2369,7 @@ msgstr "Bitte Partner für Verkauf definieren"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.fruity_beers
 msgid "Fruity Beers"
-msgstr ""
+msgstr "Fruchtige Biere"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_dame_blanche_2,5l_product_template
@@ -2616,7 +2616,7 @@ msgstr "    Heute    "
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
 msgid "April"
-msgstr "April Mitteilungen"
+msgstr "April"
 
 #. module: point_of_sale
 #: field:pos.order,statement_ids:0
diff --git a/addons/point_of_sale/i18n/el.po b/addons/point_of_sale/i18n/el.po
index 32389b8561b..3600e430f12 100644
--- a/addons/point_of_sale/i18n/el.po
+++ b/addons/point_of_sale/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/es.po b/addons/point_of_sale/i18n/es.po
index 2fa206816d7..c9beec3af2e 100644
--- a/addons/point_of_sale/i18n/es.po
+++ b/addons/point_of_sale/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -57,17 +57,17 @@ msgstr "Agua corriente"
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Year from Creation date of cash register"
-msgstr ""
+msgstr "Año de la fecha de creación del registro de caja"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Post All Orders"
-msgstr ""
+msgstr "Enviar todos los pedidos"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_2l_product_template
 msgid "Spa Reine 2L"
-msgstr ""
+msgstr "Spa Reine 2L"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_out
@@ -111,7 +111,7 @@ msgstr "Nombre del Producto"
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Month from Creation date of cash register"
-msgstr ""
+msgstr "Mes de la fecha de creación del registro de caja"
 
 #. module: point_of_sale
 #: report:account.statement:0 field:pos.box.entries,amount:0
@@ -200,7 +200,7 @@ msgstr "Gestión de la Caja Registradora"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_naturel_45g_product_template
 msgid "Lays Naturel 45g"
-msgstr ""
+msgstr "Lays Naturel 45g"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -210,7 +210,7 @@ msgstr "Información contable"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_2l_product_template
 msgid "Coca-Cola Regular 2L"
-msgstr ""
+msgstr "Coca-Cola Regular 2L"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
@@ -246,7 +246,7 @@ msgstr "Precio total"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.leffe_brune_33cl_product_template
 msgid "Leffe Brune 33cl"
-msgstr ""
+msgstr "Leffe Brune 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
@@ -294,7 +294,7 @@ msgstr "Descuento (%)"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_speciale_product_template
 msgid "Dr. Oetker Ristorante Speciale"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Speciale"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
@@ -304,7 +304,7 @@ msgstr "Ctd. total"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
 msgid "Fanta Orange 33cl"
-msgstr ""
+msgstr "Fanta Orange 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
@@ -319,7 +319,7 @@ msgstr "Caja registradora cerrada hoy"
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Day from Creation date of cash register"
-msgstr ""
+msgstr "Día de la fecha de creación del registro de caja"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
@@ -335,7 +335,7 @@ msgstr "¡Error de configuración!"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.sparkling_water
 msgid "Sparkling Water"
-msgstr ""
+msgstr "Agua con gas"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
@@ -355,7 +355,7 @@ msgstr "Agosto"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_max_lemon_33cl_product_template
 msgid "Pepsi Max Cool Lemon 33cl"
-msgstr ""
+msgstr "Pepsi Max Cool Lemon 33cl"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -370,7 +370,7 @@ msgstr "Línea de venta TPV"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_50cl_product_template
 msgid "Fanta Orange 50cl"
-msgstr ""
+msgstr "Fanta Orange 50cl"
 
 #. module: point_of_sale
 #: field:pos.category,child_id:0
@@ -404,7 +404,7 @@ msgstr "Octubre"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_1l_product_template
 msgid "Coca-Cola Light 1L"
-msgstr ""
+msgstr "Coca-Cola Light 1L"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
@@ -414,7 +414,7 @@ msgstr "Resumen"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_50cl_product_template
 msgid "Chaudfontaine 50cl"
-msgstr ""
+msgstr "Chaudfontaine 50cl"
 
 #. module: point_of_sale
 #: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,qty:0
@@ -457,7 +457,7 @@ msgstr "Método de pago"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_confirm
 msgid "Post POS Journal Entries"
-msgstr ""
+msgstr "Publicar entradas TPV en los diarios"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:408
@@ -484,7 +484,7 @@ msgstr "Imprimir informe"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_bolognese_product_template
 msgid "Dr. Oetker Ristorante Bolognese"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Bolognese"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:105
@@ -495,7 +495,7 @@ msgstr "Compruebe que la cuenta de ingresos esté %s"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.pizza
 msgid "Pizza"
-msgstr ""
+msgstr "Pizza"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
@@ -512,7 +512,7 @@ msgstr "Importe factura"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.coke
 msgid "Coke"
-msgstr ""
+msgstr "Coke"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -538,7 +538,7 @@ msgstr "Pago"
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Cash Analysis created in current month"
-msgstr ""
+msgstr "Análisis de caja creados en este mes"
 
 #. module: point_of_sale
 #: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
@@ -548,22 +548,22 @@ msgstr "Saldo final"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_max_50cl_product_template
 msgid "Pepsi Max 50cl"
-msgstr ""
+msgstr "Pepsi Max 50cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.san_pellegrino_1l_product_template
 msgid "San Pellegrino 1L"
-msgstr ""
+msgstr "San Pellegrino 1L"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Post Entries"
-msgstr ""
+msgstr "Enviar entradas"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_1l_product_template
 msgid "Spa Reine 1L"
-msgstr ""
+msgstr "Spa Reine 1L"
 
 #. module: point_of_sale
 #: report:pos.details_summary:0
@@ -621,7 +621,7 @@ msgstr "Lista de cajas registradoras"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.maes_50cl_product_template
 msgid "Maes 50cl"
-msgstr ""
+msgstr "Maes 50cl"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
@@ -657,12 +657,12 @@ msgstr ""
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_2l_product_template
 msgid "Fanta Orange 2L"
-msgstr ""
+msgstr "Fanta Orange 2L"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_33cl_product_template
 msgid "Spa Reine 33cl"
-msgstr ""
+msgstr "Spa Reine 33cl"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_discount
@@ -677,18 +677,18 @@ msgstr "Subtotal"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_prosciutto_product_template
 msgid "Dr. Oetker Ristorante Prosciutto"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Prosciutto"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_light_paprika_170g_product_template
 #: model:product.template,name:point_of_sale.lays_paprika_170g_product_template
 msgid "Lays Light Paprika 170g"
-msgstr ""
+msgstr "Lays Light Paprika 170g"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_lemon_50cl_product_template
 msgid "Coca-Cola Light Lemon 50cl"
-msgstr ""
+msgstr "Coca-Cola Light Lemon 50cl"
 
 #. module: point_of_sale
 #: field:report.cash.register,balance_end_real:0
@@ -704,7 +704,7 @@ msgstr "Cerrar extractos"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.croky_naturel_45g_product_template
 msgid "Croky Naturel 45g"
-msgstr ""
+msgstr "Croky Naturel 45g"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.product_product_putmoneyforchange1_product_template
@@ -725,7 +725,7 @@ msgstr "Categoría TPV"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chimay_bleu_75cl_product_template
 msgid "Chimay Bleu 75cl"
-msgstr ""
+msgstr "Chimay Bleu 75cl"
 
 #. module: point_of_sale
 #: report:pos.payment.report.user:0
@@ -743,6 +743,8 @@ msgid ""
 "This field authorize Validation of Cashbox without controlling the closing "
 "balance."
 msgstr ""
+"Este campo autoriza la validación de la caja sin controlar el cierre de "
+"balance"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
@@ -753,7 +755,7 @@ msgstr "Detalles de ventas"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.pils
 msgid "Pils"
-msgstr ""
+msgstr "Pils"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
@@ -783,7 +785,7 @@ msgstr "Total transacción"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_petillante_50cl_product_template
 msgid "Chaudfontaine Petillante 50cl"
-msgstr ""
+msgstr "Chaudfontaine Petillante 50cl"
 
 #. module: point_of_sale
 #: field:pos.order.line,create_date:0
@@ -798,7 +800,7 @@ msgstr "Ventas de hoy"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_naturel_300g_product_template
 msgid "Lays Naturel XXL 300g"
-msgstr ""
+msgstr "Lays Naturel XXL 300g"
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
@@ -848,7 +850,7 @@ msgstr "Fecha pedido"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.stella_33cl_product_template
 msgid "Stella Artois 33cl"
-msgstr ""
+msgstr "Stella Artois 33cl"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -877,7 +879,7 @@ msgstr "Observación posición fiscal :"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_2l_product_template
 msgid "Evian 2L"
-msgstr ""
+msgstr "Evian 2L"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -897,12 +899,12 @@ msgstr "Impuestos :"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_2l_product_template
 msgid "Coca-Cola Light 2L"
-msgstr ""
+msgstr "Coca-Cola Light 2L"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_funghi_product_template
 msgid "Dr. Oetker Ristorante Funghi"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Funghi"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
@@ -912,12 +914,12 @@ msgstr "Desc."
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lindemans_kriek_37,5cl_product_template
 msgid "Lindemans Kriek 37.5cl"
-msgstr ""
+msgstr "Lindemans Kriek 37.5cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_zero_33cl_product_template
 msgid "Coca-Cola Zero 33cl"
-msgstr ""
+msgstr "Coca-Cola Zero 33cl"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -968,12 +970,12 @@ msgstr "Usuario"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_33cl_product_template
 msgid "Coca-Cola Light 33cl"
-msgstr ""
+msgstr "Coca-Cola Light 33cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.perrier_1l_product_template
 msgid "Perrier 1L"
-msgstr ""
+msgstr "Perrier 1L"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
@@ -988,7 +990,7 @@ msgstr "Entradas caja TPV"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.boon_framboise_37,5cl_product_template
 msgid "Boon Framboise 37.5cl"
-msgstr ""
+msgstr "Boon Framboise 37.5cl"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -1013,7 +1015,7 @@ msgstr "Diario"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_faro_37,5cl_product_template
 msgid "Timmermans Faro 37.5cl"
-msgstr ""
+msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0 view:pos.order:0 field:pos.order,state:0
@@ -1041,7 +1043,7 @@ msgstr "Ventas (resumen)"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template
 msgid "Timmermans Kriek 37.5cl"
-msgstr ""
+msgstr "Timmermans Kriek 37.5cl"
 
 #. module: point_of_sale
 #: field:account.journal,check_dtls:0
@@ -1071,7 +1073,7 @@ msgstr "Usuarios"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.food
 msgid "Food"
-msgstr ""
+msgstr "Comida"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -1086,7 +1088,7 @@ msgstr "Precio"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_stracciatella_2,5l_product_template
 msgid "ijsboerke Stracciatella 2.5L"
-msgstr ""
+msgstr "ijsboerke Stracciatella 2.5L"
 
 #. module: point_of_sale
 #: field:account.journal,journal_user:0
@@ -1110,7 +1112,7 @@ msgstr "Fecha creación"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_33cl_product_template
 msgid "Coca-Cola Regular 33cl"
-msgstr ""
+msgstr "Coca-Cola Regular 33cl"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:65
@@ -1121,7 +1123,7 @@ msgstr "No se puede eliminar!"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_paprika_oven_150g_product_template
 msgid "Lays Paprika Oven Baked 150g"
-msgstr ""
+msgstr "Lays Paprika Oven Baked 150g"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
@@ -1138,7 +1140,7 @@ msgstr "Nombre"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_gazeuse_33cl_product_template
 msgid "Spa Barisart 33cl"
-msgstr ""
+msgstr "Spa Barisart 33cl"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:284
@@ -1192,7 +1194,7 @@ msgstr "¡El nombre del diaro debe ser único por compañía!"
 #: model:product.template,name:point_of_sale.lays_light_naturel_170g_product_template
 #: model:product.template,name:point_of_sale.lays_naturel_170g_product_template
 msgid "Lays Light Naturel 170g"
-msgstr ""
+msgstr "Lays Light Naturel 170g"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0 report:pos.lines:0
@@ -1228,7 +1230,7 @@ msgstr "Retirar dinero de la TPV"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.soda
 msgid "Soda"
-msgstr ""
+msgstr "Refresco"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0 view:pos.order:0 view:report.cash.register:0
@@ -1275,7 +1277,7 @@ msgstr "Terminal Punto de Venta"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_50cl_product_template
 msgid "Evian 50cl"
-msgstr ""
+msgstr "Evian 50cl"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1290,7 +1292,7 @@ msgstr "Pedido de venta"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_lemon_2l_product_template
 msgid "Coca-Cola Light Lemon 2L"
-msgstr ""
+msgstr "Coca-Cola Light Lemon 2L"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.invoice:0 field:pos.order,amount_tax:0
@@ -1307,12 +1309,12 @@ msgstr "Línea de venta"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_naturel_oven_150g_product_template
 msgid "Lays Naturel Oven Baked 150g"
-msgstr ""
+msgstr "Lays Naturel Oven Baked 150g"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_decaf_33cl_product_template
 msgid "Coca-Cola Light Decaf 33cl"
-msgstr ""
+msgstr "Coca-Cola Light Decaf 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.product_normal_action
@@ -1324,12 +1326,12 @@ msgstr "Productos"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_4formaggi_product_template
 msgid "Dr. Oetker Ristorante Quattro Formaggi"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Quattro Formaggi"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_zero_1l_product_template
 msgid "Coca-Cola Zero 1L"
-msgstr ""
+msgstr "Coca-Cola Zero 1L"
 
 #. module: point_of_sale
 #: report:pos.sales.user:0 report:pos.sales.user.today:0
@@ -1348,12 +1350,12 @@ msgstr "TPV"
 #: model:ir.actions.act_window,name:point_of_sale.action_product_output
 #: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
 msgid "Products 'Put Money In'"
-msgstr ""
+msgstr "Productos 'Poner dinero'"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.croky_bolognaise_250g_product_template
 msgid "Croky Bolognaise 250g"
-msgstr ""
+msgstr "Croky Bolognaise 250g"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1398,7 +1400,7 @@ msgstr "Modo de pago"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_paprika_45g_product_template
 msgid "Lays Paprika 45g"
-msgstr ""
+msgstr "Lays Paprika 45g"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -1427,7 +1429,7 @@ msgstr "Ventas por usuario"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_1l_product_template
 msgid "Evian 1L"
-msgstr ""
+msgstr "Evian 1L"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_open_statement
@@ -1437,7 +1439,7 @@ msgstr "Abrir registros de caja"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.water
 msgid "Water"
-msgstr ""
+msgstr "Agua"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -1452,7 +1454,7 @@ msgstr "Julio"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_poivre_sel_oven_150g_product_template
 msgid "Lays Sel et Poivre Oven Baked 150g"
-msgstr ""
+msgstr "Lays Sel et Poivre Oven Baked 150g"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
@@ -1462,7 +1464,7 @@ msgstr "Ctd. producto"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chimay_rouge_33cl_product_template
 msgid "Chimay Rouge 33cl"
-msgstr ""
+msgstr "Chimay Rouge 33cl"
 
 #. module: point_of_sale
 #: field:report.pos.order,delay_validation:0
@@ -1482,12 +1484,12 @@ msgstr "Punto de venta. Pago"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_50cl_product_template
 msgid "Coca-Cola Light 50cl"
-msgstr ""
+msgstr "Coca-Cola Light 50cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.jupiler_50cl_product_template
 msgid "Jupiler 50cl"
-msgstr ""
+msgstr "Jupiler 50cl"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
@@ -1497,7 +1499,7 @@ msgstr "Periodo final"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_lemon_33cl_product_template
 msgid "Coca-Cola Light Lemon 33cl"
-msgstr ""
+msgstr "Coca-Cola Light Lemon 33cl"
 
 #. module: point_of_sale
 #: field:account.journal,auto_cash:0
@@ -1507,12 +1509,12 @@ msgstr "Apertura automática"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_ketchup_250g_product_template
 msgid "Lays Ketchup 250g"
-msgstr ""
+msgstr "Lays Ketchup 250g"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.perrier_50cl_product_template
 msgid "Perrier 50cl"
-msgstr ""
+msgstr "Perrier 50cl"
 
 #. module: point_of_sale
 #: selection:report.pos.order,state:0
@@ -1579,7 +1581,7 @@ msgstr "Cierre"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_vegetale_product_template
 msgid "Dr. Oetker Ristorante Vegetale"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Vegetale"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
@@ -1589,7 +1591,7 @@ msgstr "Pedido de TPV creados hoy"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_zero_2l_product_template
 msgid "Coca-Cola Zero 2L"
-msgstr ""
+msgstr "Coca-Cola Zero 2L"
 
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0 selection:pos.order,state:0
@@ -1614,7 +1616,7 @@ msgstr "Análisis de fondos creados en el último mes"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.beers
 msgid "Beers"
-msgstr ""
+msgstr "Cervezas"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
@@ -1623,11 +1625,14 @@ msgid ""
 "validation. He will also open all cash registers for which you have to "
 "control the ending belance before closing manually."
 msgstr ""
+"OpenERP cerrará todos los registros de caja que pueda cerrar automáticamente "
+"sin validación. Además abrirá todos los registros de caja a los que tienes "
+"que controlar el balance final antes de cerrarlos manualmente."
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Cash Analysis created by today"
-msgstr ""
+msgstr "Análisis de caja creados hoy"
 
 #. module: point_of_sale
 #: selection:report.cash.register,state:0
@@ -1637,7 +1642,7 @@ msgstr "Presupuesto"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.product_product_putmoneyforchange0_product_template
 msgid "Cash In"
-msgstr ""
+msgstr "Efectivo"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -1669,7 +1674,7 @@ msgstr "Líneas extracto"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.croky_paprika_45g_product_template
 msgid "Croky Paprika 45g"
-msgstr ""
+msgstr "Croky Paprika 45g"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1706,6 +1711,9 @@ msgid ""
 "payments. We suggest you to control the opening balance of each register, "
 "using their CashBox tab."
 msgstr ""
+"El sistema abrirá todos los registros de caja, por lo que puedes empezar a "
+"realizar pagos. Te sugerimos que controles el balance abierto de cada "
+"registro, usando su pestaña Caja."
 
 #. module: point_of_sale
 #: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,price_unit:0
@@ -1727,7 +1735,7 @@ msgstr "Factura"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.rochefort_8_33cl_product_template
 msgid "Rochefort \"8\" 33cl"
-msgstr ""
+msgstr "Rochefort \"8\" 33cl"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0 selection:report.cash.register,state:0
@@ -1742,12 +1750,12 @@ msgstr "Ref. venta"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_geuze_37,5cl_product_template
 msgid "Timmermans Geuze 37.5cl"
-msgstr ""
+msgstr "Timmermans Geuze 37.5cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_pickles_250g_product_template
 msgid "Lays Pickels 250g"
-msgstr ""
+msgstr "Lays Pickels 250g"
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,net_margin_per_qty:0
@@ -1763,7 +1771,7 @@ msgstr "Ventas mensuales por usuario"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
 msgid "Spa et Fruit Orange 50cl"
-msgstr ""
+msgstr "Spa et Fruit Orange 50cl"
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
@@ -1774,7 +1782,7 @@ msgstr "Ventas por margen usuario"
 #: code:addons/point_of_sale/wizard/pos_payment.py:59
 #, python-format
 msgid "Paiement"
-msgstr ""
+msgstr "Pago"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1784,7 +1792,7 @@ msgstr "Impuestos:"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_max_33cl_product_template
 msgid "Pepsi Max 33cl"
-msgstr ""
+msgstr "Pepsi Max 33cl"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_pos_order
@@ -1806,7 +1814,7 @@ msgstr "Producto"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_pollo_product_template
 msgid "Dr. Oetker Ristorante Pollo"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Pollo"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
@@ -1816,27 +1824,27 @@ msgstr "Líneas TPV"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.grisette_cerise_25cl_product_template
 msgid "Grisette Cerise 25cl"
-msgstr ""
+msgstr "Grisette Cerise 25cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_33cl_product_template
 msgid "Chaudfontaine 33cl"
-msgstr ""
+msgstr "Chaudfontaine 33cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_margherita_product_template
 msgid "Dr. Oetker La Margherita"
-msgstr ""
+msgstr "Dr. Oetker La Margherita"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "PoS Backend"
-msgstr ""
+msgstr "TPV estándar"
 
 #. module: point_of_sale
 #: view:pos.order:0 selection:pos.order,state:0
 msgid "Posted"
-msgstr ""
+msgstr "Contabilizado"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
@@ -1852,7 +1860,7 @@ msgstr "Líneas de ventas por usuarios"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_2l_product_template
 msgid "Pepsi 2L"
-msgstr ""
+msgstr "Pepsi 2L"
 
 #. module: point_of_sale
 #: report:pos.details:0
@@ -1869,12 +1877,12 @@ msgstr ""
 #. module: point_of_sale
 #: view:pos.details:0
 msgid "POS Details"
-msgstr ""
+msgstr "Detalles del TPV"
 
 #. module: point_of_sale
 #: field:pos.details,user_ids:0
 msgid "Salesmen"
-msgstr ""
+msgstr "Vendedores"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_cash_register
@@ -1890,7 +1898,7 @@ msgstr "Total neto :"
 #. module: point_of_sale
 #: model:res.groups,name:point_of_sale.group_pos_manager
 msgid "Manager"
-msgstr ""
+msgstr "Director"
 
 #. module: point_of_sale
 #: field:pos.details,date_start:0 field:pos.sale.user,date_start:0
@@ -1921,12 +1929,12 @@ msgstr "Abrir registro de caja"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lindemans_pecheresse_37,5cl_product_template
 msgid "Lindemans Pecheresse 37.5cl"
-msgstr ""
+msgstr "Lindemans Pecheresse 37.5cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_33cl_product_template
 msgid "Pepsi 33cl"
-msgstr ""
+msgstr "Pepsi 33cl"
 
 #. module: point_of_sale
 #: report:account.statement:0
@@ -1944,12 +1952,12 @@ msgstr "Informe pago"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_25cl_product_template
 msgid "Fanta Orange 25cl"
-msgstr ""
+msgstr "Fanta Orange 25cl"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Generate Journal Entries"
-msgstr ""
+msgstr "Generar entradas diarias"
 
 #. module: point_of_sale
 #: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
@@ -1969,39 +1977,39 @@ msgstr "Fecha factura"
 #. module: point_of_sale
 #: field:pos.box.entries,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Motivo"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orangina_33cl_product_template
 msgid "Orangina 33cl"
-msgstr ""
+msgstr "Orangina 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_product_input
 #: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
 msgid "Products 'Take Money Out'"
-msgstr ""
+msgstr "Productos 'Sacar dinero'"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chimay_bleu_33cl_product_template
 msgid "Chimay Bleu 33cl"
-msgstr ""
+msgstr "Chimay Bleu 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_account_journal_form
 #: model:ir.ui.menu,name:point_of_sale.menu_action_account_journal_form_open
 msgid "Payment Methods"
-msgstr ""
+msgstr "Formas de pago"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.chips
 msgid "Chips"
-msgstr ""
+msgstr "Patatas fritas"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_spinaci_product_template
 msgid "Dr. Oetker Ristorante Spinaci"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Spinaci"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:293
@@ -2020,7 +2028,7 @@ msgstr "Pagos de hoy por usuario"
 #: model:ir.actions.act_window,name:point_of_sale.action_box_entries
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
 msgid "Put Money In"
-msgstr ""
+msgstr "Poner dinero"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:238
@@ -2037,12 +2045,12 @@ msgstr "Núm. de artículos"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_vanille_2,5l_product_template
 msgid "ijsboerke Vanille 2.5L"
-msgstr ""
+msgstr "ijsboerke Vanille 2.5L"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0 selection:report.pos.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
@@ -2052,7 +2060,7 @@ msgstr "Fecha final"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orangina_1,5l_product_template
 msgid "Orangina 1.5L"
-msgstr ""
+msgstr "Orangina 1.5L"
 
 #. module: point_of_sale
 #: field:pos.order,picking_id:0
@@ -2062,7 +2070,7 @@ msgstr "Albarán"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.ice_cream
 msgid "Ice Cream"
-msgstr ""
+msgstr "Helado"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0 field:report.pos.order,shop_id:0
@@ -2077,12 +2085,12 @@ msgstr "Línea extracto bancario"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.belle_vue_kriek_25cl_product_template
 msgid "Belle-Vue Kriek 25cl"
-msgstr ""
+msgstr "Belle-Vue Kriek 25cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_petillante_1,5l_product_template
 msgid "Chaudfontaine Petillante 1.5l"
-msgstr ""
+msgstr "Chaudfontaine Petillante 1.5l"
 
 #. module: point_of_sale
 #: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
@@ -2093,7 +2101,7 @@ msgstr "Informe TPV"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_1,5l_product_template
 msgid "Chaudfontaine 1.5l"
-msgstr ""
+msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
@@ -2104,17 +2112,17 @@ msgstr "Cerrar registro de caja"
 #: code:addons/point_of_sale/point_of_sale.py:65
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
-msgstr ""
+msgstr "Para eliminar una venta, ésta debe ser nueva o cancelada"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_50cl_product_template
 msgid "Coca-Cola Regular 50cl"
-msgstr ""
+msgstr "Coca-Cola Regular 50cl"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Generate Entries"
-msgstr ""
+msgstr "Generar asientos"
 
 #. module: point_of_sale
 #: field:pos.box.entries,product_id:0 field:pos.box.out,product_id:0
@@ -2147,16 +2155,18 @@ msgid ""
 "This field authorize the automatic creation of the cashbox, without control "
 "of the initial balance."
 msgstr ""
+"Este campo autoriza la creación automática de la caja, sin controlar el "
+"balance inicial"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_zero_50cl_product_template
 msgid "Coca-Cola Zero 50cl"
-msgstr ""
+msgstr "Coca-Cola Zero 50cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_tonno_product_template
 msgid "Dr. Oetker Ristorante Tonno"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Tonno"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2167,28 +2177,30 @@ msgstr "Factura de proveedor"
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
 msgstr ""
+"El diario y periodo seleccionados tienen que pertenecer a la misma compañía"
 
 #. module: point_of_sale
 #: view:pos.order:0 selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "New"
-msgstr ""
+msgstr "Nuevo"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:238
 #, python-format
 msgid "In order to set to draft a sale, it must be cancelled."
 msgstr ""
+"Para cambiar una venta a estado borrador, priero debe de ser cancelada"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_zero_orange_33cl_product_template
 msgid "Fanta Zero Orange 33cl"
-msgstr ""
+msgstr "Fanta Zero Orange 33cl"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Day of order date"
-msgstr ""
+msgstr "Día del pedido"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_rep
@@ -2198,7 +2210,7 @@ msgstr "Informe"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.maes_33cl_product_template
 msgid "Maes 33cl"
-msgstr ""
+msgstr "Maes 33cl"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
@@ -2218,28 +2230,28 @@ msgstr "Configuración"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orval_33cl_product_template
 msgid "Orval 33cl"
-msgstr ""
+msgstr "Orval 33cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_1l_product_template
 msgid "Coca-Cola Regular 1L"
-msgstr ""
+msgstr "Coca-Cola Regular 1L"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:253
 #, python-format
 msgid "Unable to cancel the picking."
-msgstr ""
+msgstr "Imposible cancelar el albarán te entrada."
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "POS ordered created during current month"
-msgstr ""
+msgstr "Pedidos TPV creados durante el mes actual"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "POS ordered created last month"
-msgstr ""
+msgstr "Pedidos TPV creados durante el mes pasado"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
@@ -2254,23 +2266,23 @@ msgstr "Diciembre"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_gazeuse_1,5l_product_template
 msgid "Spa Barisart 1.5l"
-msgstr ""
+msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:329 view:pos.order:0
 #, python-format
 msgid "Return Products"
-msgstr ""
+msgstr "Devolución de productos"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.jupiler_33cl_product_template
 msgid "Jupiler 33cl"
-msgstr ""
+msgstr "Jupiler 33cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_chocolat_2,5l_product_template
 msgid "ijsboerke Chocolat 2.5L"
-msgstr ""
+msgstr "ijsboerke Chocolat 2.5L"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
@@ -2316,12 +2328,12 @@ msgstr "No"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_gazeuse_50cl_product_template
 msgid "Spa Barisart 50cl"
-msgstr ""
+msgstr "Spa Barisart 50cl"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.special_beers
 msgid "Special Beers"
-msgstr ""
+msgstr "Cervezas premium"
 
 #. module: point_of_sale
 #: field:pos.order.line,notice:0
@@ -2331,7 +2343,7 @@ msgstr "Nota de descuento"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Re-Print"
-msgstr ""
+msgstr "Reimprimir"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -2341,7 +2353,7 @@ msgstr "Borrador"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_zero_orange_1,5l_product_template
 msgid "Fanta Zero Orange 1.5L"
-msgstr ""
+msgstr "Fanta Zero Orange 1.5L"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2357,17 +2369,17 @@ msgstr "Por favor indique una empresa para la venta."
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.fruity_beers
 msgid "Fruity Beers"
-msgstr ""
+msgstr "Cervezas afrutadas"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_dame_blanche_2,5l_product_template
 msgid "ijsboerke Dame Blanche 2.5L"
-msgstr ""
+msgstr "ijsboerke Dame Blanche 2.5L"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
 msgid "ijsboerke Moka 2.5L"
-msgstr ""
+msgstr "ijsboerke Moka 2.5L"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -2380,6 +2392,8 @@ msgid ""
 "Payment methods are defined by accounting journals having the field Payment "
 "Method checked."
 msgstr ""
+"Los métodos de pago son definidos por diarios contables que tienen activado "
+"el campo Método de pago"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
@@ -2390,7 +2404,7 @@ msgstr "Ventas por usuario"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_hawaii_product_template
 msgid "Dr. Oetker Ristorante Hawaii"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Hawaii"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
@@ -2410,7 +2424,7 @@ msgstr "TPV Líneas pedido"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_petillante_33cl_product_template
 msgid "Chaudfontaine Petillante 33cl"
-msgstr ""
+msgstr "Chaudfontaine Petillante 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,help:point_of_sale.product_normal_action
@@ -2420,11 +2434,16 @@ msgid ""
 "contains detailed information about your products related to procurement "
 "logistics, sales price, product category, suppliers and so on."
 msgstr ""
+"Debe definir un Producto por cada artículo que compre o venda. Los productos "
+"pueden ser materias primas, productos almacenables, consumibles o servicios. "
+"El formulario de Producto contiene información detallada sobre sus productos "
+"en relación con la logística de abastecimiento, precio de venta, categoría "
+"de producto, proveedores, etc."
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_max_2l_product_template
 msgid "Pepsi Max 2L"
-msgstr ""
+msgstr "Pepsi Max 2L"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:358
@@ -2435,7 +2454,7 @@ msgstr "Error"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_paprika_300g_product_template
 msgid "Lays Paprika XXL 300g"
-msgstr ""
+msgstr "Lays Paprika XXL 300g"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
@@ -2456,7 +2475,7 @@ msgstr "Por favor, cree una factura para esta venta."
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_mozzarella_product_template
 msgid "Dr. Oetker Ristorante Mozzarella"
-msgstr ""
+msgstr "Dr. Oetker Ristorante Mozzarella"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:66
@@ -2474,7 +2493,7 @@ msgstr "Desc(%)"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "General Information"
-msgstr ""
+msgstr "Información general"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -2494,7 +2513,7 @@ msgstr "Líneas de venta"
 #. module: point_of_sale
 #: view:account.journal:0
 msgid "Extended Configuration"
-msgstr ""
+msgstr "Configuración extendida"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal:0
@@ -2504,12 +2523,12 @@ msgstr "Subtotal neto"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_50cl_product_template
 msgid "Spa Reine 50cl"
-msgstr ""
+msgstr "Spa Reine 50cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.leffe_blonde_33cl_product_template
 msgid "Leffe Blonde 33cl"
-msgstr ""
+msgstr "Leffe Blonde 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
@@ -2529,7 +2548,7 @@ msgstr "Ventas de hoy por usuario"
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "Código de cliente"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_out.py:86
@@ -2555,7 +2574,7 @@ msgstr "Líneas ventas"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Yesterday"
-msgstr ""
+msgstr "Ayer"
 
 #. module: point_of_sale
 #: field:pos.order,note:0
@@ -2565,12 +2584,12 @@ msgstr "Notas internas"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_zero_decaf_33cl_product_template
 msgid "Coca-Cola Zero Decaf 33cl"
-msgstr ""
+msgstr "Coca-Cola Zero Decaf 33cl"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Describe why you take money from the cash register:"
-msgstr ""
+msgstr "Indica por qué retiras dinero de la caja registradora:"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
@@ -2617,7 +2636,7 @@ msgstr "Ventas por margen mensual de usuario"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.leffe_9_33cl_product_template
 msgid "Leffe Brune \"9\" 33cl"
-msgstr ""
+msgstr "Leffe Brune \"9\" 33cl"
 
 #. module: point_of_sale
 #: help:account.journal,journal_user:0
@@ -2625,11 +2644,13 @@ msgid ""
 "Check this box if this journal define a payment method that can be used in "
 "point of sales."
 msgstr ""
+"Activa esta opción si el diario define un método de pago que pueda ser usado "
+"en el TPV"
 
 #. module: point_of_sale
 #: field:pos.category,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Secuencia"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:316 view:pos.make.payment:0
@@ -2640,7 +2661,7 @@ msgstr "Realizar pago"
 #. module: point_of_sale
 #: constraint:pos.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "¡Error! No puede crear categorías recursivas"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today
@@ -2650,12 +2671,12 @@ msgstr "Ventas usuario de hoy"
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Month of order date"
-msgstr ""
+msgstr "Mes del pedido"
 
 #. module: point_of_sale
 #: field:product.product,income_pdt:0
 msgid "PoS Cash Input"
-msgstr ""
+msgstr "Entrada de caja TPV"
 
 #. module: point_of_sale
 #: view:report.cash.register:0 field:report.cash.register,year:0
@@ -2666,18 +2687,18 @@ msgstr "Año"
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:31
 msgid "Disc (%)"
-msgstr ""
+msgstr "Desc (%)"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:41
 msgid "Subtotal:"
-msgstr ""
+msgstr "Subtotal:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:45
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:268
 msgid "Tax:"
-msgstr ""
+msgstr "IVA:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:64
@@ -2687,33 +2708,33 @@ msgstr "Desc."
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:71
 msgid "+/-"
-msgstr ""
+msgstr "+/-"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:105
 msgid "Paid:"
-msgstr ""
+msgstr "Pagado:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:113
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:288
 msgid "Change:"
-msgstr ""
+msgstr "Cambio:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:124
 msgid "Back to Products"
-msgstr ""
+msgstr "Volver a Productos"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:127
 msgid "Validate"
-msgstr ""
+msgstr "Validar"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:140
 msgid "pending orders"
-msgstr ""
+msgstr "Pedidos pendientes"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:145
@@ -2721,31 +2742,33 @@ msgid ""
 "There are pending operations that could not be saved into the database, are "
 "you sure you want to exit?"
 msgstr ""
+"Hay operaciones pendientes que podrían no ser almacenadas en la base de "
+"datos, ¿estás seguro de que quieres salir?"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:236
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:238
 msgid "Next Order"
-msgstr ""
+msgstr "Siguiente pedido"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:248
 msgid "Phone:"
-msgstr ""
+msgstr "Teléfono:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:249
 msgid "User:"
-msgstr ""
+msgstr "Usuario:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:250
 msgid "Shop:"
-msgstr ""
+msgstr "Tienda:"
 
 #~ msgid ","
 #~ msgstr ","
@@ -3393,3 +3416,6 @@ msgstr ""
 
 #~ msgid "Do you want to open cash registers ?"
 #~ msgstr "¿Quiere abrir las cajas registradoras?"
+
+#~ msgid "Do you want to close your cash registers ?"
+#~ msgstr "¿Quieres cerrar tus registros de caja?"
diff --git a/addons/point_of_sale/i18n/es_AR.po b/addons/point_of_sale/i18n/es_AR.po
index 36b25125a5f..485e6feb6a1 100644
--- a/addons/point_of_sale/i18n/es_AR.po
+++ b/addons/point_of_sale/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/es_CR.po b/addons/point_of_sale/i18n/es_CR.po
index e594d228907..0ab39c21a66 100644
--- a/addons/point_of_sale/i18n/es_CR.po
+++ b/addons/point_of_sale/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/es_EC.po b/addons/point_of_sale/i18n/es_EC.po
index 9ab292745c8..6fa661536db 100644
--- a/addons/point_of_sale/i18n/es_EC.po
+++ b/addons/point_of_sale/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/et.po b/addons/point_of_sale/i18n/et.po
index 01aa0b03d08..ba7f1c771d5 100644
--- a/addons/point_of_sale/i18n/et.po
+++ b/addons/point_of_sale/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #, python-format
 #~ msgid "Modify line failed !"
diff --git a/addons/point_of_sale/i18n/fi.po b/addons/point_of_sale/i18n/fi.po
index ea835f06a64..08de80ffa97 100644
--- a/addons/point_of_sale/i18n/fi.po
+++ b/addons/point_of_sale/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index db275923bcb..015e8cfb1f1 100644
--- a/addons/point_of_sale/i18n/fr.po
+++ b/addons/point_of_sale/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/hi.po b/addons/point_of_sale/i18n/hi.po
index fb912246326..95e8c5709e8 100644
--- a/addons/point_of_sale/i18n/hi.po
+++ b/addons/point_of_sale/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/hr.po b/addons/point_of_sale/i18n/hr.po
index 1c273a17c00..eea44bbbcbd 100644
--- a/addons/point_of_sale/i18n/hr.po
+++ b/addons/point_of_sale/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:27+0000\n"
-"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
+"PO-Revision-Date: 2012-10-31 09:46+0000\n"
+"Last-Translator: Krešimir Jeđud <kresimir.jedud@infokom.hr>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:03+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -916,7 +916,7 @@ msgstr "POS Order lines"
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Receipt :"
-msgstr "Receipt :"
+msgstr "Račun"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,pos_statement_id:0
@@ -1671,7 +1671,7 @@ msgstr "Račun br."
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:231
 msgid "Receipt"
-msgstr "Receipt"
+msgstr "Račun"
 
 #. module: point_of_sale
 #: view:pos.open.statement:0
@@ -2639,7 +2639,7 @@ msgstr "Godina"
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:31
 msgid "Disc (%)"
-msgstr ""
+msgstr "Popust(%)"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:41
@@ -2650,7 +2650,7 @@ msgstr ""
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:45
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:268
 msgid "Tax:"
-msgstr ""
+msgstr "Porez:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:64
@@ -2671,17 +2671,17 @@ msgstr ""
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:113
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:288
 msgid "Change:"
-msgstr ""
+msgstr "Za vratiti:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:124
 msgid "Back to Products"
-msgstr ""
+msgstr "Povratak"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:127
 msgid "Validate"
-msgstr ""
+msgstr "Potvrdi"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:140
@@ -2703,7 +2703,7 @@ msgstr ""
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:238
 msgid "Next Order"
-msgstr ""
+msgstr "Sljedeći račun"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:248
diff --git a/addons/point_of_sale/i18n/hu.po b/addons/point_of_sale/i18n/hu.po
index 173c7e3cd90..d0e84de56f8 100644
--- a/addons/point_of_sale/i18n/hu.po
+++ b/addons/point_of_sale/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/id.po b/addons/point_of_sale/i18n/id.po
index 816667d3f12..86fdd43b981 100644
--- a/addons/point_of_sale/i18n/id.po
+++ b/addons/point_of_sale/i18n/id.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2009-11-09 18:58+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-10-16 23:09+0000\n"
+"Last-Translator: BlueSeptin <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr ""
+msgstr "Catatan"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
@@ -37,11 +37,17 @@ msgid ""
 "new payment methods directly from menu \"PoS Backend > Configuration > "
 "Payment Methods\"."
 msgstr ""
+"Anda harus menentukan metode pembayaran yang digunakan pada pint of sale "
+"berdasarkan bank dan cash yang terdapat pada \"Acconting > Konfigurasi > "
+"Financial Akunting > Journals\". Pilih  salah satu journal dan centang pada "
+"field \"PoS Payment Method\" dari tab \"Point of Sale\". Anda juga bisa "
+"langsung membuat Metode Pembayaran secara langsung dari menu \"Pos Backend > "
+"Konfigurasi > Payment Methods\""
 
 #. module: point_of_sale
 #: view:pos.order:0 view:report.pos.order:0
 msgid "Today"
-msgstr "Hari Ini"
+msgstr "Hari ini"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.plain_water
@@ -51,12 +57,12 @@ msgstr ""
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Year from Creation date of cash register"
-msgstr ""
+msgstr "Tahun dari Tanggal Pembuatan Cash Register"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Post All Orders"
-msgstr ""
+msgstr "Posting Semua Transaksi"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_2l_product_template
@@ -89,12 +95,12 @@ msgstr "Hari"
 #. module: point_of_sale
 #: view:pos.make.payment:0
 msgid "Add payment :"
-msgstr ""
+msgstr "Masukkan Pembayaran"
 
 #. module: point_of_sale
 #: field:pos.box.out,name:0
 msgid "Description / Reason"
-msgstr ""
+msgstr "Keterangan"
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,product_name:0
@@ -105,7 +111,7 @@ msgstr "Nama Produk"
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Month from Creation date of cash register"
-msgstr ""
+msgstr "Bulan dari Tanggal Terbentuknya Cash Register"
 
 #. module: point_of_sale
 #: report:account.statement:0 field:pos.box.entries,amount:0
@@ -121,12 +127,14 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"Konfigurasi salah ! Mata uang yang dipilih harus sama dengan mata uang pada "
+"akun"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.pos_category_action
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_category view:pos.category:0
 msgid "PoS Categories"
-msgstr ""
+msgstr "Kategori PoS"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_out
@@ -161,6 +169,8 @@ msgid ""
 "You do not have any open cash register. You must create a payment method or "
 "open a cash register."
 msgstr ""
+"Anda tidak memiliki satupun Cash Register yang terbuka. Anda seharusnya "
+"membuat  Metode Pembayaran atau Open Cash Register terlebih dahulu"
 
 #. module: point_of_sale
 #: report:account.statement:0 field:report.pos.order,partner_id:0
@@ -180,7 +190,7 @@ msgstr "Harga Rata-rata"
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Disc. (%)"
-msgstr ""
+msgstr "Diskon"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
diff --git a/addons/point_of_sale/i18n/it.po b/addons/point_of_sale/i18n/it.po
index f360abce39f..718fefd20fd 100644
--- a/addons/point_of_sale/i18n/it.po
+++ b/addons/point_of_sale/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/ja.po b/addons/point_of_sale/i18n/ja.po
index efbf326b681..bf682c69b0d 100644
--- a/addons/point_of_sale/i18n/ja.po
+++ b/addons/point_of_sale/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/ko.po b/addons/point_of_sale/i18n/ko.po
index 490197910a0..a8ab6b7e02b 100644
--- a/addons/point_of_sale/i18n/ko.po
+++ b/addons/point_of_sale/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index 2caff15ab74..ed2d4ed366f 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/lv.po b/addons/point_of_sale/i18n/lv.po
new file mode 100644
index 00000000000..7ded9817cfe
--- /dev/null
+++ b/addons/point_of_sale/i18n/lv.po
@@ -0,0 +1,2720 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-10-16 16:13+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,product_nb:0
+msgid "Product Nb."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+msgid "Sales by day"
+msgstr "Pārdots pa dienām"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:49
+#, python-format
+msgid ""
+"You must define which payment method must be available through the point of "
+"sale by reusing existing bank and cash through \"Accounting > Configuration "
+"> Financial Accounting > Journals\". Select a journal and check the field "
+"\"PoS Payment Method\" from the \"Point of Sale\" tab. You can also create "
+"new payment methods directly from menu \"PoS Backend > Configuration > "
+"Payment Methods\"."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 view:report.pos.order:0
+msgid "Today"
+msgstr "Šodien"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.plain_water
+msgid "Plain Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Year from Creation date of cash register"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Post All Orders"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_2l_product_template
+msgid "Spa Reine 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_box_out
+msgid "Pos Box Out"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
+#: model:ir.ui.menu,name:point_of_sale.menu_report_cash_register_all
+msgid "Register Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Details of Sales"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 field:report.cash.register,day:0
+#: view:report.pos.order:0 field:report.pos.order,day:0
+msgid "Day"
+msgstr "Diena"
+
+#. module: point_of_sale
+#: view:pos.make.payment:0
+msgid "Add payment :"
+msgstr "Piev. maksājumu:"
+
+#. module: point_of_sale
+#: field:pos.box.out,name:0
+msgid "Description / Reason"
+msgstr "Apraksts / Iemesls"
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,product_name:0
+#: field:report.sales.by.margin.pos.month,product_name:0
+msgid "Product Name"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Month from Creation date of cash register"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0 report:pos.invoice:0
+#: field:pos.make.payment,amount:0 report:pos.user.product:0
+#: field:report.transaction.pos,amount:0
+msgid "Amount"
+msgstr "Summa"
+
+#. module: point_of_sale
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.pos_category_action
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_category view:pos.category:0
+msgid "PoS Categories"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_box_out
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
+msgid "Take Money Out"
+msgstr "Izņemt naudu"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "VAT"
+msgstr "PVN"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Origin"
+msgstr "Izcelsme"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tax"
+msgstr "Nodoklis"
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Starting Date"
+msgstr "Sākuma Datums"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:46
+#, python-format
+msgid ""
+"You do not have any open cash register. You must create a payment method or "
+"open a cash register."
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 field:report.pos.order,partner_id:0
+msgid "Partner"
+msgstr "Partneris"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total of the day"
+msgstr "Dienas kopsumma"
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,average_price:0
+msgid "Average Price"
+msgstr "Vidējā cena"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Disc. (%)"
+msgstr "Atl. (%)"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
+msgid "Cash Register Management"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_45g_product_template
+msgid "Lays Naturel 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Accounting Information"
+msgstr "Grāmatvedības Informācija"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_2l_product_template
+msgid "Coca-Cola Regular 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
+msgid "Sales by month"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.soda_orange
+msgid "Orange"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+msgid "Sales by User"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Disc.(%)"
+msgstr "Atl.(%)"
+
+#. module: point_of_sale
+#: field:pos.box.entries,ref:0
+msgid "Ref"
+msgstr "Ats."
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,price_total:0
+msgid "Total Price"
+msgstr "Cena Kopā"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_brune_33cl_product_template
+msgid "Leffe Brune 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
+#: report:pos.sales.user:0
+msgid "Sales Report"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.beverage
+msgid "Beverages"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.stella_50cl_product_template
+msgid "Stella Artois 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "Dates"
+msgstr "Datumi"
+
+#. module: point_of_sale
+#: field:pos.category,parent_id:0
+msgid "Parent Category"
+msgstr "Virskategorija"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.lines:0 report:pos.payment.report.user:0
+#: report:pos.user.product:0
+msgid "["
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,total:0
+#: field:report.sales.by.margin.pos.month,total:0
+msgid "Margin"
+msgstr "Peļņa"
+
+#. module: point_of_sale
+#: field:pos.discount,discount:0 field:pos.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Atlaide (%)"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_speciale_product_template
+msgid "Dr. Oetker Ristorante Speciale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Total qty"
+msgstr "Kopā daudz."
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
+msgid "Fanta Orange 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
+msgid "Sales by User Monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Today's Closed Cashbox"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Day from Creation date of cash register"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
+msgid "Daily Operations"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:285
+#, python-format
+msgid "Configuration Error !"
+msgstr "Konfigurācijas Kļūda !"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.sparkling_water
+msgid "Sparkling Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+msgid "Fill in this form if you put money in the cash register:"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Search Cash Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "August"
+msgstr "Augusts"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_lemon_33cl_product_template
+msgid "Pepsi Max Cool Lemon 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "June"
+msgstr "Jūnijs"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order line"
+msgstr "POS pasūtījuma rinda"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_50cl_product_template
+msgid "Fanta Orange 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.category,child_id:0
+msgid "Children Categories"
+msgstr "Apakškategorijas"
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_date:0
+msgid "Payment Date"
+msgstr "Apmaksas Datums"
+
+#. module: point_of_sale
+#: help:product.product,pos_categ_id:0
+msgid ""
+"If you want to sell this product through the point of sale, select the "
+"category it belongs to."
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Closing Date"
+msgstr "Beigu Datums"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "October"
+msgstr "Oktobris"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_1l_product_template
+msgid "Coca-Cola Light 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Summary"
+msgstr "Kopsavilkums"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_50cl_product_template
+msgid "Chaudfontaine 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
+msgid "Quantity"
+msgstr "Daudzums"
+
+#. module: point_of_sale
+#: field:pos.order.line,name:0
+msgid "Line No"
+msgstr "Rindas nr."
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Period"
+msgstr "Periods"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:49
+#, python-format
+msgid "No Cash Register Defined !"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Net Total:"
+msgstr "Neto Summa:"
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_name:0
+msgid "Payment Reference"
+msgstr "Maksājumu atsauce"
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Mode of Payment"
+msgstr "Maksājuma Režīms"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_confirm
+msgid "Post POS Journal Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:408
+#, python-format
+msgid "Customer Invoice"
+msgstr "Klienta Rēķins"
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,total_discount:0
+msgid "Total Discount"
+msgstr "Kopēja atlaide"
+
+#. module: point_of_sale
+#: view:pos.details:0 view:pos.payment.report:0 view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+msgid "Print Report"
+msgstr "Drukāt atskaiti"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_bolognese_product_template
+msgid "Dr. Oetker Ristorante Bolognese"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:105
+#, python-format
+msgid "Please check that income account is set to %s"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.pizza
+msgid "Pizza"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_return.py:85
+#: code:addons/point_of_sale/wizard/pos_return.py:240
+#, python-format
+msgid "Add Product"
+msgstr "Pievienot produktu"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_am:0
+msgid "Invoice Amount"
+msgstr "Rēķina summa"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.coke
+msgid "Coke"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tel. :"
+msgstr "Tālr.:"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_pos_confirm
+msgid "Create Sale Entries"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
+#: report:pos.details:0 view:pos.order:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:87
+msgid "Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created in current month"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Ending Balance"
+msgstr "Noslēdzošā Bilance"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_50cl_product_template
+msgid "Pepsi Max 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.san_pellegrino_1l_product_template
+msgid "San Pellegrino 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Post Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_1l_product_template
+msgid "Spa Reine 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Mode of Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:50
+#, python-format
+msgid "Cash registers are already closed."
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Kļūda: Nederīgs EAN kods"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_open_statement
+#: view:pos.open.statement:0
+msgid "Open Statements"
+msgstr "Atvērtie Pārskati"
+
+#. module: point_of_sale
+#: field:pos.details,date_end:0 field:pos.sale.user,date_end:0
+msgid "Date End"
+msgstr "Beigu Datums"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created during current year"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale view:pos.order:0
+msgid "PoS Orders"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Sales total(Revenue)"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total paid"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
+msgid "List of Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.maes_50cl_product_template
+msgid "Maes 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_transaction_pos
+msgid "transaction for the pos"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Not Invoiced"
+msgstr "Nav Izrakstīts Rēķins"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "March"
+msgstr "Marts"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
+#: report:pos.user.product:0
+msgid "User's Product"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:641
+#, python-format
+msgid ""
+"You have to select a pricelist in the sale form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_2l_product_template
+msgid "Fanta Orange 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_33cl_product_template
+msgid "Spa Reine 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_discount
+msgid "Add a Global Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Apakšsumma"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_prosciutto_product_template
+msgid "Dr. Oetker Ristorante Prosciutto"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_light_paprika_170g_product_template
+#: model:product.template,name:point_of_sale.lays_paprika_170g_product_template
+msgid "Lays Light Paprika 170g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_50cl_product_template
+msgid "Coca-Cola Light Lemon 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,balance_end_real:0
+msgid "Closing Balance"
+msgstr "Slēgšanas Bilance"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
+#: model:ir.model,name:point_of_sale.model_pos_close_statement
+msgid "Close Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_naturel_45g_product_template
+msgid "Croky Naturel 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.product_product_putmoneyforchange1_product_template
+msgid "Cash Out"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Starting Balance"
+msgstr "Sākuma Bilance"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_category
+#: field:product.product,pos_categ_id:0
+msgid "PoS Category"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_bleu_75cl_product_template
+msgid "Chimay Bleu 75cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.payment.report.user:0
+msgid "Payment By User"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,nbr:0
+msgid "# of Lines"
+msgstr "Rindu skaits"
+
+#. module: point_of_sale
+#: help:account.journal,check_dtls:0
+msgid ""
+"This field authorize Validation of Cashbox without controlling the closing "
+"balance."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_details
+msgid "Sale Details"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.pils
+msgid "Pils"
+msgstr ""
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "St.Name"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Sales total"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Sum of subtotals"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,lines:0
+msgid "Order Lines"
+msgstr "Pasūtījuma Rindas"
+
+#. module: point_of_sale
+#: view:report.transaction.pos:0
+msgid "Total Transaction"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_50cl_product_template
+msgid "Chaudfontaine Petillante 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,create_date:0
+msgid "Creation Date"
+msgstr "Izveidots"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
+msgid "Today's Sales"
+msgstr "Šodien pārdots"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_300g_product_template
+msgid "Lays Naturel XXL 300g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS "
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:pos.user.product:0
+msgid "Total :"
+msgstr "Kopā:"
+
+#. module: point_of_sale
+#: view:report.cash.register:0 view:report.pos.order:0
+msgid "My Sales"
+msgstr "Mana Pārdošana"
+
+#. module: point_of_sale
+#: field:pos.order,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cenu lapa"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total invoiced"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,product_qty:0
+msgid "# of Qty"
+msgstr "Daudz."
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
+msgid "Sales by margin monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 field:report.sales.by.margin.pos,date_order:0
+#: field:report.sales.by.margin.pos.month,date_order:0
+#: field:report.sales.by.user.pos,date_order:0
+#: field:report.sales.by.user.pos.month,date_order:0
+msgid "Order Date"
+msgstr "Pasūtījuma Datums"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.stella_33cl_product_template
+msgid "Stella Artois 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created during this year"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Draft Invoice"
+msgstr "Neapstiprināts Rēķins"
+
+#. module: point_of_sale
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr "Nodokļu Profila Piezīme:"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_2l_product_template
+msgid "Evian 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "September"
+msgstr "Septembris"
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Opening Date"
+msgstr "Atvēršanas datums"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Taxes :"
+msgstr "Nodokļi:"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_2l_product_template
+msgid "Coca-Cola Light 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_funghi_product_template
+msgid "Dr. Oetker Ristorante Funghi"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,disc:0
+msgid "Disc."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lindemans_kriek_37,5cl_product_template
+msgid "Lindemans Kriek 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_33cl_product_template
+msgid "Coca-Cola Zero 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "VAT :"
+msgstr "PVN :"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Receipt :"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.bank.statement.line,pos_statement_id:0
+#: field:pos.order,amount_return:0
+msgid "unknown"
+msgstr "nezināms"
+
+#. module: point_of_sale
+#: report:pos.details:0 field:report.transaction.pos,date_create:0
+msgid "Date"
+msgstr "Datums"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
+msgid "Apply Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0 report:pos.sales.user:0 report:pos.sales.user.today:0
+#: report:pos.user.product:0 view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
+#: field:report.transaction.pos,user_id:0
+#: model:res.groups,name:point_of_sale.group_pos_user
+msgid "User"
+msgstr "Lietotājs"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_33cl_product_template
+msgid "Coca-Cola Light 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.perrier_1l_product_template
+msgid "Perrier 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total discount"
+msgstr "Kopēja atlaide"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_box_entries
+msgid "Pos Box Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.boon_framboise_37,5cl_product_template
+msgid "Boon Framboise 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "November"
+msgstr "Novembris"
+
+#. module: point_of_sale
+#: field:pos.config.journal,code:0
+msgid "Code"
+msgstr "Kods"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
+#: field:pos.config.journal,journal_id:0 field:pos.order,sale_journal:0
+#: view:report.cash.register:0 field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
+msgid "Journal"
+msgstr "Žurnāls"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_faro_37,5cl_product_template
+msgid "Timmermans Faro 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 view:pos.order:0 field:pos.order,state:0
+#: report:pos.sales.user:0 report:pos.sales.user.today:0
+#: field:report.cash.register,state:0 field:report.pos.order,state:0
+msgid "State"
+msgstr "Stāvoklis"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,no_trans:0
+msgid "Number of Transaction"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.entries:0 view:pos.box.out:0 view:pos.confirm:0
+#: view:pos.make.payment:0 view:pos.open.statement:0 view:pos.receipt:0
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
+msgid "Sales (summary)"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template
+msgid "Timmermans Kriek 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,check_dtls:0
+msgid "Control Balance Before Closing"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_order_line
+msgid "Lines of Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 view:report.transaction.pos:0
+msgid "Amount total"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
+msgid "Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Users"
+msgstr "Lietotāji"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.food
+msgid "Food"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: report:pos.details:0 report:pos.invoice:0 report:pos.lines:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:30
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:69
+msgid "Price"
+msgstr "Cena"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_stracciatella_2,5l_product_template
+msgid "ijsboerke Stracciatella 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,journal_user:0
+msgid "PoS Payment Method"
+msgstr ""
+
+#. module: point_of_sale
+#: help:product.product,expense_pdt:0
+msgid ""
+"This is a product you can use to take cash from a statement for the point of "
+"sale backend, exemple: money lost, transfer to bank, etc."
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,date:0
+msgid "Create Date"
+msgstr "Izveides Datums"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_33cl_product_template
+msgid "Coca-Cola Regular 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:65
+#, python-format
+msgid "Unable to Delete !"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_oven_150g_product_template
+msgid "Lays Paprika Oven Baked 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Start Period"
+msgstr "Sākuma Periods"
+
+#. module: point_of_sale
+#: report:account.statement:0 field:pos.category,complete_name:0
+#: field:pos.category,name:0 report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+msgid "Name"
+msgstr "Nosaukums"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_33cl_product_template
+msgid "Spa Barisart 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:284
+#, python-format
+msgid ""
+"There is no receivable account defined to make payment for the partner: "
+"\"%s\" (id:%d)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid ""
+"Generate all sale journal entries for non invoiced orders linked to a closed "
+"cash register or statement."
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:293
+#: code:addons/point_of_sale/point_of_sale.py:472
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:100
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:105
+#: code:addons/point_of_sale/wizard/pos_box_out.py:86
+#: code:addons/point_of_sale/wizard/pos_box_out.py:88
+#, python-format
+msgid "Error !"
+msgstr "Kļūda!"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.lines:0 report:pos.payment.report.user:0
+#: report:pos.user.product:0
+msgid "]"
+msgstr "]"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement
+msgid "Bank Statement"
+msgstr "Bankas Konta Izraksts"
+
+#. module: point_of_sale
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Žurnāla nosaukumam katram uzņēmumam ir jābūt unikālam!"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_light_naturel_170g_product_template
+#: model:product.template,name:point_of_sale.lays_naturel_170g_product_template
+msgid "Lays Light Naturel 170g"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0 report:pos.lines:0
+#: report:pos.payment.report.user:0 report:pos.sales.user:0
+#: report:pos.sales.user.today:0 report:pos.user.product:0
+msgid "Print Date"
+msgstr "Drukāšanas Datums"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:282
+#, python-format
+msgid "There is no receivable account defined to make payment"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid "Do you want to open cash registers?"
+msgstr ""
+
+#. module: point_of_sale
+#: help:pos.category,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of product categories."
+msgstr ""
+
+#. module: point_of_sale
+#: field:product.product,expense_pdt:0
+msgid "PoS Cash Output"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.soda
+msgid "Soda"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 view:pos.order:0 view:report.cash.register:0
+#: view:report.pos.order:0
+msgid "Group By..."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "POS Orders"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
+msgid "All Closed CashBox"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:640
+#, python-format
+msgid "No Pricelist !"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Update"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Base"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.categ_others
+msgid "Others"
+msgstr ""
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Point-of-Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_50cl_product_template
+msgid "Evian 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Notes"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_2l_product_template
+msgid "Coca-Cola Light Lemon 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.invoice:0 field:pos.order,amount_tax:0
+msgid "Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
+msgid "Sale line"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_oven_150g_product_template
+msgid "Lays Naturel Oven Baked 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_decaf_33cl_product_template
+msgid "Coca-Cola Light Decaf 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.product_normal_action
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale_product
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_products
+msgid "Products"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_4formaggi_product_template
+msgid "Dr. Oetker Ristorante Quattro Formaggi"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_1l_product_template
+msgid "Coca-Cola Zero 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.sales.user:0 report:pos.sales.user.today:0
+#: field:report.pos.order,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_product_output
+#: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
+msgid "Products 'Put Money In'"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_bolognaise_250g_product_template
+msgid "Croky Bolognaise 250g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,user_id:0
+msgid "Connected Salesman"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_sale_all
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale_all
+msgid "All Sales Orders"
+msgstr ""
+
+#. module: point_of_sale
+#: help:product.product,income_pdt:0
+msgid ""
+"This is a product you can use to put cash into a statement for the point of "
+"sale backend."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print the Receipt of the Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.make.payment,journal:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_45g_product_template
+msgid "Lays Paprika 45g"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: report:pos.details:0 report:pos.payment.report.user:0
+#: report:pos.user.product:0 field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:32
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:59
+msgid "Qty"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 view:report.pos.order:0
+msgid "Month -1"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user
+#: model:ir.model,name:point_of_sale.model_pos_sale_user
+#: view:pos.payment.report.user:0
+msgid "Sale by User"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_1l_product_template
+msgid "Evian 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_open_statement
+msgid "Open Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.water
+msgid "Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "state"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "July"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_poivre_sel_oven_150g_product_template
+msgid "Lays Sel et Poivre Oven Baked 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Qty of product"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_rouge_33cl_product_template
+msgid "Chimay Rouge 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.pos.order,delay_validation:0
+msgid "Delay Validation"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,nb_print:0
+msgid "Number of Print"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_make_payment
+msgid "Point of Sale Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_50cl_product_template
+msgid "Coca-Cola Light 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.jupiler_50cl_product_template
+msgid "Jupiler 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "End Period"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_33cl_product_template
+msgid "Coca-Cola Light Lemon 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,auto_cash:0
+msgid "Automatic Opening"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_ketchup_250g_product_template
+msgid "Lays Ketchup 250g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.perrier_50cl_product_template
+msgid "Perrier 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.pos.order,state:0
+msgid "Synchronized"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 field:report.cash.register,month:0
+#: view:report.pos.order:0 field:report.pos.order,month:0
+msgid "Month"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+msgid "Statement Name"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Year of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
+#: field:pos.box.entries,journal_id:0 field:pos.box.out,journal_id:0
+msgid "Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "Yes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_receipt
+msgid "Point of sale receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
+msgid "Sales by User Daily margin"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid "Open Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,journal_id:0
+msgid "Sales Journal"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,balance_start:0
+msgid "Opening Balance"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 selection:report.pos.order,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_vegetale_product_template
+msgid "Dr. Oetker Ristorante Vegetale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created by today"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_2l_product_template
+msgid "Coca-Cola Zero 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,amount_paid:0 selection:pos.order,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
+msgid "All sales lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created in last month"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.beers
+msgid "Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid ""
+"OpenERP will close all cash registers he can close automatically without "
+"validation. He will also open all cash registers for which you have to "
+"control the ending belance before closing manually."
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created by today"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.product_product_putmoneyforchange0_product_template
+msgid "Cash In"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: report:all.closed.cashbox.of.the.day:0 report:pos.invoice:0
+#: report:pos.lines:0 report:pos.payment.report.user:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:49
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:93
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:271
+msgid "Total:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
+msgid "Sales by margin"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_config_journal
+msgid "Journal Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_paprika_45g_product_template
+msgid "Croky Paprika 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Reprint"
+msgstr ""
+
+#. module: point_of_sale
+#: help:pos.order,user_id:0
+msgid ""
+"Person who uses the the cash register. It could be a reliever, a student or "
+"an interim employee."
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_id:0
+msgid "Nbr Invoice"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:231
+msgid "Receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid ""
+"The system will open all cash registers, so that you can start recording "
+"payments. We suggest you to control the opening balance of each register, "
+"using their CashBox tab."
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,price_unit:0
+#: report:pos.payment.report.user:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Done"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
+#: report:pos.invoice:0 view:pos.order:0 field:pos.order,invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.rochefort_8_33cl_product_template
+msgid "Rochefort \"8\" 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 selection:report.cash.register,state:0
+msgid "Open"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,name:0 field:pos.order.line,order_id:0
+msgid "Order Ref"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_geuze_37,5cl_product_template
+msgid "Timmermans Geuze 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_pickles_250g_product_template
+msgid "Lays Pickels 250g"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,net_margin_per_qty:0
+#: field:report.sales.by.margin.pos.month,net_margin_per_qty:0
+msgid "Net margin per Qty"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
+msgid "Sales by user monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
+msgid "Spa et Fruit Orange 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
+msgid "Sales by User Margin"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_payment.py:59
+#, python-format
+msgid "Paiement"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_33cl_product_template
+msgid "Pepsi Max 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_pos_order
+msgid "Point of Sale Orders Statistics"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: model:ir.model,name:point_of_sale.model_product_product
+#: report:pos.details:0 field:pos.order.line,product_id:0
+#: report:pos.payment.report.user:0 report:pos.user.product:0
+#: view:report.pos.order:0 field:report.pos.order,product_id:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:29
+msgid "Product"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_pollo_product_template
+msgid "Dr. Oetker Ristorante Pollo"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
+msgid "Pos Lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.grisette_cerise_25cl_product_template
+msgid "Grisette Cerise 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_33cl_product_template
+msgid "Chaudfontaine 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_margherita_product_template
+msgid "Dr. Oetker La Margherita"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_root
+msgid "PoS Backend"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 selection:pos.order,state:0
+msgid "Posted"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,date_order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
+#: model:ir.model,name:point_of_sale.model_pos_payment_report_user
+msgid "Sales lines by Users"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_2l_product_template
+msgid "Pepsi 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Order"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:472
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "POS Details"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.details,user_ids:0
+msgid "Salesmen"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_cash_register
+#: view:report.cash.register:0
+msgid "Point of Sale Cash Register Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: point_of_sale
+#: model:res.groups,name:point_of_sale.group_pos_manager
+msgid "Manager"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.details,date_start:0 field:pos.sale.user,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: field:pos.order,amount_total:0 report:pos.payment.report.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:33
+msgid "Total"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.sale.user:0
+msgid "Sale By User"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
+msgid "Open Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lindemans_pecheresse_37,5cl_product_template
+msgid "Lindemans Pecheresse 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_33cl_product_template
+msgid "Pepsi 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: model:ir.actions.report.xml,name:point_of_sale.account_statement
+msgid "Statement"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
+#: model:ir.model,name:point_of_sale.model_pos_payment_report
+#: view:pos.payment.report:0
+msgid "Payment Report"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_25cl_product_template
+msgid "Fanta Orange 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Generate Journal Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0 report:pos.details_summary:0 report:pos.lines:0
+#: field:pos.order,company_id:0 field:pos.order.line,company_id:0
+#: report:pos.payment.report.user:0 report:pos.sales.user:0
+#: report:pos.sales.user.today:0 report:pos.user.product:0
+#: field:report.pos.order,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.entries,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orangina_33cl_product_template
+msgid "Orangina 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_product_input
+#: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
+msgid "Products 'Take Money Out'"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_bleu_33cl_product_template
+msgid "Chimay Bleu 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_account_journal_form
+#: model:ir.ui.menu,name:point_of_sale.menu_action_account_journal_form_open
+msgid "Payment Methods"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.chips
+msgid "Chips"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_spinaci_product_template
+msgid "Dr. Oetker Ristorante Spinaci"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:293
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:100
+#: code:addons/point_of_sale/wizard/pos_box_out.py:88
+#, python-format
+msgid "You have to open at least one cashbox"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
+msgid "Today's Payment By User"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_box_entries
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
+msgid "Put Money In"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:238
+#: code:addons/point_of_sale/point_of_sale.py:253
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "No. Of Articles"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_vanille_2,5l_product_template
+msgid "ijsboerke Vanille 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:pos.order,state:0 selection:report.pos.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orangina_1,5l_product_template
+msgid "Orangina 1.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,picking_id:0
+msgid "Picking"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.ice_cream
+msgid "Ice Cream"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,shop_id:0 field:report.pos.order,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.belle_vue_kriek_25cl_product_template
+msgid "Belle-Vue Kriek 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_1,5l_product_template
+msgid "Chaudfontaine Petillante 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS Report"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_1,5l_product_template
+msgid "Chaudfontaine 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
+msgid "Close Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:65
+#, python-format
+msgid "In order to delete a sale, it must be new or cancelled."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_50cl_product_template
+msgid "Coca-Cola Regular 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Generate Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.entries,product_id:0 field:pos.box.out,product_id:0
+msgid "Operation"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,account_move:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Confirm"
+msgstr ""
+
+#. module: point_of_sale
+#: help:account.journal,auto_cash:0
+msgid ""
+"This field authorize the automatic creation of the cashbox, without control "
+"of the initial balance."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_50cl_product_template
+msgid "Coca-Cola Zero 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_tonno_product_template
+msgid "Dr. Oetker Ristorante Tonno"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 selection:pos.order,state:0
+#: selection:report.pos.order,state:0
+msgid "New"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:238
+#, python-format
+msgid "In order to set to draft a sale, it must be cancelled."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_zero_orange_33cl_product_template
+msgid "Fanta Zero Orange 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Day of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_rep
+msgid "Reporting"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.maes_33cl_product_template
+msgid "Maes 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+msgid "Put Money"
+msgstr ""
+
+#. module: point_of_sale
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
+msgid "Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orval_33cl_product_template
+msgid "Orval 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_1l_product_template
+msgid "Coca-Cola Regular 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:253
+#, python-format
+msgid "Unable to cancel the picking."
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created during current month"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created last month"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
+msgid "Invoices"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "December"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_1,5l_product_template
+msgid "Spa Barisart 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:329 view:pos.order:0
+#, python-format
+msgid "Return Products"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.jupiler_33cl_product_template
+msgid "Jupiler 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_chocolat_2,5l_product_template
+msgid "ijsboerke Chocolat 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Take Money"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_details
+msgid "Sales Details"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:50
+#, python-format
+msgid "Message"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.journal:0 model:ir.model,name:point_of_sale.model_pos_order
+#: model:ir.ui.menu,name:point_of_sale.menu_point_root_touchscreen
+#: view:product.product:0
+msgid "Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0 field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0 field:report.pos.order,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 view:pos.order:0 selection:pos.order,state:0
+#: view:report.pos.order:0 selection:report.pos.order,state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "No"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_50cl_product_template
+msgid "Spa Barisart 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.special_beers
+msgid "Special Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,notice:0
+msgid "Discount Notice"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Re-Print"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Draft"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_zero_orange_1,5l_product_template
+msgid "Fanta Zero Orange 1.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:358
+#, python-format
+msgid "Please provide a partner for the sale."
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.fruity_beers
+msgid "Fruity Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_dame_blanche_2,5l_product_template
+msgid "ijsboerke Dame Blanche 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
+msgid "ijsboerke Moka 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,help:point_of_sale.action_account_journal_form
+msgid ""
+"Payment methods are defined by accounting journals having the field Payment "
+"Method checked."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
+msgid "Sales by user"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_hawaii_product_template
+msgid "Dr. Oetker Ristorante Hawaii"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print Receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "January"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Orders lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_33cl_product_template
+msgid "Chaudfontaine Petillante 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,help:point_of_sale.product_normal_action
+msgid ""
+"You must define a Product for everything you buy or sell. Products can be "
+"raw materials, stockable products, consumables or services. The Product form "
+"contains detailed information about your products related to procurement "
+"logistics, sales price, product category, suppliers and so on."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_2l_product_template
+msgid "Pepsi Max 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:358
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_300g_product_template
+msgid "Lays Paprika XXL 300g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "Do you want to close your cash registers?"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Refund"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#, python-format
+msgid "Please create an invoice for this sale."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_mozzarella_product_template
+msgid "Dr. Oetker Ristorante Mozzarella"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:66
+#: model:ir.ui.menu,name:point_of_sale.menu_close_statement
+#: view:pos.close.statement:0
+#, python-format
+msgid "Close Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.payment.report.user:0
+msgid "Disc(%)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "General Information"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: view:pos.details:0 view:pos.discount:0 view:pos.payment.report:0
+#: view:pos.payment.report.user:0 view:pos.sale.user:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:13
+msgid "Close"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Order lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.journal:0
+msgid "Extended Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,price_subtotal:0
+msgid "Subtotal w/o Tax"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_50cl_product_template
+msgid "Spa Reine 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_blonde_33cl_product_template
+msgid "Leffe Blonde 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
+msgid "Pyament Report"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,jl_id:0
+msgid "Cash Journals"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.sales.user.today:0
+msgid "Today's Sales By User"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Customer Code"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_out.py:86
+#, python-format
+msgid "please check that account is set to %s"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.config.journal,name:0 report:pos.invoice:0 report:pos.lines:0
+msgid "Description"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "May"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Sales lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Yesterday"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,note:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_decaf_33cl_product_template
+msgid "Coca-Cola Zero Decaf 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Describe why you take money from the cash register:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
+#: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all
+#: view:report.pos.order:0
+msgid "Point of Sale Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 field:pos.order,partner_id:0 view:report.pos.order:0
+msgid "Customer"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "February"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "    Today    "
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "April"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,statement_ids:0
+msgid "Payments"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
+msgid "Sales by User Monthly margin"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_9_33cl_product_template
+msgid "Leffe Brune \"9\" 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: help:account.journal,journal_user:0
+msgid ""
+"Check this box if this journal define a payment method that can be used in "
+"point of sales."
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.category,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_return.py:316 view:pos.make.payment:0
+#, python-format
+msgid "Make Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:pos.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_sales_user_today
+msgid "Sales User Today"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Month of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: field:product.product,income_pdt:0
+msgid "PoS Cash Input"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 field:report.cash.register,year:0
+#: view:report.pos.order:0 field:report.pos.order,year:0
+msgid "Year"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:31
+msgid "Disc (%)"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:41
+msgid "Subtotal:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:45
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:268
+msgid "Tax:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:64
+msgid "Disc"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:71
+msgid "+/-"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:105
+msgid "Paid:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:113
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:288
+msgid "Change:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:124
+msgid "Back to Products"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:127
+msgid "Validate"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:140
+msgid "pending orders"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:145
+msgid ""
+"There are pending operations that could not be saved into the database, are "
+"you sure you want to exit?"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:236
+msgid "Print"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:238
+msgid "Next Order"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:248
+msgid "Phone:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:249
+msgid "User:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:250
+msgid "Shop:"
+msgstr ""
diff --git a/addons/point_of_sale/i18n/mn.po b/addons/point_of_sale/i18n/mn.po
index 63f141b46e3..462b8095be6 100644
--- a/addons/point_of_sale/i18n/mn.po
+++ b/addons/point_of_sale/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -2212,7 +2212,7 @@ msgstr "Мөнгө хийх"
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr "Бүртгэлийн код компанийн хэмжээнд үл давтагдах байх ёстой !"
+msgstr "Журналын код компанийн хэмжээнд үл давтагдах байх ёстой !"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
diff --git a/addons/point_of_sale/i18n/nb.po b/addons/point_of_sale/i18n/nb.po
new file mode 100644
index 00000000000..4b90602b155
--- /dev/null
+++ b/addons/point_of_sale/i18n/nb.po
@@ -0,0 +1,2720 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-08-31 07:48+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,product_nb:0
+msgid "Product Nb."
+msgstr "Produkt Nb"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
+msgid "Sales by day"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:49
+#, python-format
+msgid ""
+"You must define which payment method must be available through the point of "
+"sale by reusing existing bank and cash through \"Accounting > Configuration "
+"> Financial Accounting > Journals\". Select a journal and check the field "
+"\"PoS Payment Method\" from the \"Point of Sale\" tab. You can also create "
+"new payment methods directly from menu \"PoS Backend > Configuration > "
+"Payment Methods\"."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 view:report.pos.order:0
+msgid "Today"
+msgstr "I dag"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.plain_water
+msgid "Plain Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Year from Creation date of cash register"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Post All Orders"
+msgstr "Poster Alle Ordre"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_2l_product_template
+msgid "Spa Reine 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_box_out
+msgid "Pos Box Out"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
+#: model:ir.ui.menu,name:point_of_sale.menu_report_cash_register_all
+msgid "Register Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Details of Sales"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 field:report.cash.register,day:0
+#: view:report.pos.order:0 field:report.pos.order,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: point_of_sale
+#: view:pos.make.payment:0
+msgid "Add payment :"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.out,name:0
+msgid "Description / Reason"
+msgstr "Beskrivelse / Årsak"
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,product_name:0
+#: field:report.sales.by.margin.pos.month,product_name:0
+msgid "Product Name"
+msgstr "Produktnavn"
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Month from Creation date of cash register"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 field:pos.box.entries,amount:0
+#: field:pos.box.out,amount:0 report:pos.invoice:0
+#: field:pos.make.payment,amount:0 report:pos.user.product:0
+#: field:report.transaction.pos,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr "Konfigurasjonsfeil ! Valgt valuta må settes opp i kontoplan"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.pos_category_action
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_category view:pos.category:0
+msgid "PoS Categories"
+msgstr "PoS Kategorier"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_box_out
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
+msgid "Take Money Out"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "VAT"
+msgstr "MVA"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Origin"
+msgstr "Opphav"
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tax"
+msgstr "MVA"
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Starting Date"
+msgstr "Startdato"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:46
+#, python-format
+msgid ""
+"You do not have any open cash register. You must create a payment method or "
+"open a cash register."
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 field:report.pos.order,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total of the day"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,average_price:0
+msgid "Average Price"
+msgstr "Gjennomsnittspris"
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Disc. (%)"
+msgstr "Rab. (%)"
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
+msgid "Cash Register Management"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_45g_product_template
+msgid "Lays Naturel 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Accounting Information"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_2l_product_template
+msgid "Coca-Cola Regular 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
+msgid "Sales by month"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.soda_orange
+msgid "Orange"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+msgid "Sales by User"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Disc.(%)"
+msgstr "Rab.(%)"
+
+#. module: point_of_sale
+#: field:pos.box.entries,ref:0
+msgid "Ref"
+msgstr "Ref"
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,price_total:0
+msgid "Total Price"
+msgstr "Totalpris"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_brune_33cl_product_template
+msgid "Leffe Brune 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
+#: report:pos.sales.user:0
+msgid "Sales Report"
+msgstr "Salgsrapport"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.beverage
+msgid "Beverages"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.stella_50cl_product_template
+msgid "Stella Artois 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "Dates"
+msgstr "Datoer"
+
+#. module: point_of_sale
+#: field:pos.category,parent_id:0
+msgid "Parent Category"
+msgstr "Overordnet kategori"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.lines:0 report:pos.payment.report.user:0
+#: report:pos.user.product:0
+msgid "["
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,total:0
+#: field:report.sales.by.margin.pos.month,total:0
+msgid "Margin"
+msgstr "Margin"
+
+#. module: point_of_sale
+#: field:pos.discount,discount:0 field:pos.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Rabatt (%)"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_speciale_product_template
+msgid "Dr. Oetker Ristorante Speciale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Total qty"
+msgstr "Total ant"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
+msgid "Fanta Orange 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
+msgid "Sales by User Monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "Today's Closed Cashbox"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Day from Creation date of cash register"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
+msgid "Daily Operations"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:285
+#, python-format
+msgid "Configuration Error !"
+msgstr "Konfigurasjonsfeil!"
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.sparkling_water
+msgid "Sparkling Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+msgid "Fill in this form if you put money in the cash register:"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Search Cash Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "August"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_lemon_33cl_product_template
+msgid "Pepsi Max Cool Lemon 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "June"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order line"
+msgstr "POS Ordre linje"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_50cl_product_template
+msgid "Fanta Orange 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.category,child_id:0
+msgid "Children Categories"
+msgstr "Underordnede Kategorier"
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_date:0
+msgid "Payment Date"
+msgstr "Betalingsdato"
+
+#. module: point_of_sale
+#: help:product.product,pos_categ_id:0
+msgid ""
+"If you want to sell this product through the point of sale, select the "
+"category it belongs to."
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Closing Date"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_1l_product_template
+msgid "Coca-Cola Light 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_50cl_product_template
+msgid "Chaudfontaine 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,qty:0
+#: field:report.sales.by.user.pos,qty:0
+#: field:report.sales.by.user.pos.month,qty:0
+msgid "Quantity"
+msgstr "Antall"
+
+#. module: point_of_sale
+#: field:pos.order.line,name:0
+msgid "Line No"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0
+msgid "Period"
+msgstr "Periode"
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_open_statement.py:49
+#, python-format
+msgid "No Cash Register Defined !"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Net Total:"
+msgstr "Netto total:"
+
+#. module: point_of_sale
+#: field:pos.make.payment,payment_name:0
+msgid "Payment Reference"
+msgstr "Betalingsreferanse"
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Mode of Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_confirm
+msgid "Post POS Journal Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:408
+#, python-format
+msgid "Customer Invoice"
+msgstr "Kundefaktura"
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Output Operation"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,total_discount:0
+msgid "Total Discount"
+msgstr "Rabatt totalt"
+
+#. module: point_of_sale
+#: view:pos.details:0 view:pos.payment.report:0 view:pos.payment.report.user:0
+#: view:pos.sale.user:0
+msgid "Print Report"
+msgstr "Skriv ut rapport"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_bolognese_product_template
+msgid "Dr. Oetker Ristorante Bolognese"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:105
+#, python-format
+msgid "Please check that income account is set to %s"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.pizza
+msgid "Pizza"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_return.py:85
+#: code:addons/point_of_sale/wizard/pos_return.py:240
+#, python-format
+msgid "Add Product"
+msgstr "Legg til produkt"
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_am:0
+msgid "Invoice Amount"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.coke
+msgid "Coke"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_pos_confirm
+msgid "Create Sale Entries"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment
+#: report:pos.details:0 view:pos.order:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:87
+msgid "Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created in current month"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Ending Balance"
+msgstr "Sluttbalanse"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_50cl_product_template
+msgid "Pepsi Max 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.san_pellegrino_1l_product_template
+msgid "San Pellegrino 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Post Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_1l_product_template
+msgid "Spa Reine 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Mode of Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:50
+#, python-format
+msgid "Cash registers are already closed."
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Feil: Ugyldig ean kode"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_open_statement
+#: view:pos.open.statement:0
+msgid "Open Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.details,date_end:0 field:pos.sale.user,date_end:0
+msgid "Date End"
+msgstr "Sluttdato"
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created during current year"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale view:pos.order:0
+msgid "PoS Orders"
+msgstr "POS Ordre"
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Sales total(Revenue)"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total paid"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
+msgid "List of Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.maes_50cl_product_template
+msgid "Maes 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_transaction_pos
+msgid "transaction for the pos"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Not Invoiced"
+msgstr "Ikke fakturert"
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
+#: report:pos.user.product:0
+msgid "User's Product"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:641
+#, python-format
+msgid ""
+"You have to select a pricelist in the sale form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_2l_product_template
+msgid "Fanta Orange 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_33cl_product_template
+msgid "Spa Reine 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_discount
+msgid "Add a Global Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_prosciutto_product_template
+msgid "Dr. Oetker Ristorante Prosciutto"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_light_paprika_170g_product_template
+#: model:product.template,name:point_of_sale.lays_paprika_170g_product_template
+msgid "Lays Light Paprika 170g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_50cl_product_template
+msgid "Coca-Cola Light Lemon 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,balance_end_real:0
+msgid "Closing Balance"
+msgstr "Sluttsaldo"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
+#: model:ir.model,name:point_of_sale.model_pos_close_statement
+msgid "Close Statements"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_naturel_45g_product_template
+msgid "Croky Naturel 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.product_product_putmoneyforchange1_product_template
+msgid "Cash Out"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Starting Balance"
+msgstr "Inngående saldo"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_category
+#: field:product.product,pos_categ_id:0
+msgid "PoS Category"
+msgstr "PoS Kategori"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_bleu_75cl_product_template
+msgid "Chimay Bleu 75cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.payment.report.user:0
+msgid "Payment By User"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,nbr:0
+msgid "# of Lines"
+msgstr "# linjer"
+
+#. module: point_of_sale
+#: help:account.journal,check_dtls:0
+msgid ""
+"This field authorize Validation of Cashbox without controlling the closing "
+"balance."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_details
+msgid "Sale Details"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.pils
+msgid "Pils"
+msgstr ""
+
+#. module: point_of_sale
+#: report:all.closed.cashbox.of.the.day:0
+msgid "St.Name"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details_summary:0
+msgid "Sales total"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "Sum of subtotals"
+msgstr "Sum av subtotaler"
+
+#. module: point_of_sale
+#: field:pos.order,lines:0
+msgid "Order Lines"
+msgstr "Ordrelinjer"
+
+#. module: point_of_sale
+#: view:report.transaction.pos:0
+msgid "Total Transaction"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_50cl_product_template
+msgid "Chaudfontaine Petillante 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,create_date:0
+msgid "Creation Date"
+msgstr "Opprettet, dato:"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
+msgid "Today's Sales"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_300g_product_template
+msgid "Lays Naturel XXL 300g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS "
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:pos.user.product:0
+msgid "Total :"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 view:report.pos.order:0
+msgid "My Sales"
+msgstr "Mine salg"
+
+#. module: point_of_sale
+#: field:pos.order,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prisliste"
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total invoiced"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0 field:report.pos.order,product_qty:0
+msgid "# of Qty"
+msgstr "# av Ant"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
+msgid "Sales by margin monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 field:report.sales.by.margin.pos,date_order:0
+#: field:report.sales.by.margin.pos.month,date_order:0
+#: field:report.sales.by.user.pos,date_order:0
+#: field:report.sales.by.user.pos.month,date_order:0
+msgid "Order Date"
+msgstr "Ordredato"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.stella_33cl_product_template
+msgid "Stella Artois 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created during this year"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Draft Invoice"
+msgstr "Fakturakladd"
+
+#. module: point_of_sale
+#: constraint:account.bank.statement.line:0
+msgid ""
+"The amount of the voucher must be the same amount as the one on the "
+"statement line"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fiscal Position Remark :"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_2l_product_template
+msgid "Evian 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "September"
+msgstr "September"
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+msgid "Opening Date"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Taxes :"
+msgstr "Mva"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_2l_product_template
+msgid "Coca-Cola Light 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_funghi_product_template
+msgid "Dr. Oetker Ristorante Funghi"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,disc:0
+msgid "Disc."
+msgstr "Rab."
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lindemans_kriek_37,5cl_product_template
+msgid "Lindemans Kriek 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_33cl_product_template
+msgid "Coca-Cola Zero 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "VAT :"
+msgstr "MVA:"
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Order lines"
+msgstr "POS Ordre linjer"
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Receipt :"
+msgstr "Kvittering"
+
+#. module: point_of_sale
+#: field:account.bank.statement.line,pos_statement_id:0
+#: field:pos.order,amount_return:0
+msgid "unknown"
+msgstr "ukjent"
+
+#. module: point_of_sale
+#: report:pos.details:0 field:report.transaction.pos,date_create:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
+#: view:pos.discount:0
+msgid "Apply Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+#: view:pos.details:0 report:pos.sales.user:0 report:pos.sales.user.today:0
+#: report:pos.user.product:0 view:report.cash.register:0
+#: field:report.cash.register,user_id:0
+#: field:report.sales.by.margin.pos,user_id:0
+#: field:report.sales.by.margin.pos.month,user_id:0
+#: field:report.sales.by.user.pos,user_id:0
+#: field:report.sales.by.user.pos.month,user_id:0
+#: field:report.transaction.pos,user_id:0
+#: model:res.groups,name:point_of_sale.group_pos_user
+msgid "User"
+msgstr "Bruker"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_33cl_product_template
+msgid "Coca-Cola Light 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.perrier_1l_product_template
+msgid "Perrier 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Total discount"
+msgstr "Total rabatt"
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_box_entries
+msgid "Pos Box Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.boon_framboise_37,5cl_product_template
+msgid "Boon Framboise 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "November"
+msgstr "November"
+
+#. module: point_of_sale
+#: field:pos.config.journal,code:0
+msgid "Code"
+msgstr "Engelsk"
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 report:account.statement:0
+#: report:all.closed.cashbox.of.the.day:0
+#: model:ir.model,name:point_of_sale.model_account_journal
+#: field:pos.config.journal,journal_id:0 field:pos.order,sale_journal:0
+#: view:report.cash.register:0 field:report.cash.register,journal_id:0
+#: field:report.pos.order,journal_id:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_faro_37,5cl_product_template
+msgid "Timmermans Faro 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 view:pos.order:0 field:pos.order,state:0
+#: report:pos.sales.user:0 report:pos.sales.user.today:0
+#: field:report.cash.register,state:0 field:report.pos.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,no_trans:0
+msgid "Number of Transaction"
+msgstr "Antall transaksjoner"
+
+#. module: point_of_sale
+#: view:pos.box.entries:0 view:pos.box.out:0 view:pos.confirm:0
+#: view:pos.make.payment:0 view:pos.open.statement:0 view:pos.receipt:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_details_summary
+msgid "Sales (summary)"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template
+msgid "Timmermans Kriek 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,check_dtls:0
+msgid "Control Balance Before Closing"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_order_line
+msgid "Lines of Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 view:report.transaction.pos:0
+msgid "Amount total"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_all_tree
+msgid "Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Users"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.food
+msgid "Food"
+msgstr "Mat"
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: report:pos.details:0 report:pos.invoice:0 report:pos.lines:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:30
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:69
+msgid "Price"
+msgstr "Pris"
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_stracciatella_2,5l_product_template
+msgid "ijsboerke Stracciatella 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,journal_user:0
+msgid "PoS Payment Method"
+msgstr ""
+
+#. module: point_of_sale
+#: help:product.product,expense_pdt:0
+msgid ""
+"This is a product you can use to take cash from a statement for the point of "
+"sale backend, exemple: money lost, transfer to bank, etc."
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_33cl_product_template
+msgid "Coca-Cola Regular 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:65
+#, python-format
+msgid "Unable to Delete !"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_oven_150g_product_template
+msgid "Lays Paprika Oven Baked 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Start Period"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 field:pos.category,complete_name:0
+#: field:pos.category,name:0 report:pos.sales.user:0
+#: report:pos.sales.user.today:0
+msgid "Name"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_33cl_product_template
+msgid "Spa Barisart 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:284
+#, python-format
+msgid ""
+"There is no receivable account defined to make payment for the partner: "
+"\"%s\" (id:%d)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid ""
+"Generate all sale journal entries for non invoiced orders linked to a closed "
+"cash register or statement."
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:293
+#: code:addons/point_of_sale/point_of_sale.py:472
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:46
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:100
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:105
+#: code:addons/point_of_sale/wizard/pos_box_out.py:86
+#: code:addons/point_of_sale/wizard/pos_box_out.py:88
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.lines:0 report:pos.payment.report.user:0
+#: report:pos.user.product:0
+msgid "]"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement
+msgid "Bank Statement"
+msgstr ""
+
+#. module: point_of_sale
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_light_naturel_170g_product_template
+#: model:product.template,name:point_of_sale.lays_naturel_170g_product_template
+msgid "Lays Light Naturel 170g"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0 report:pos.lines:0
+#: report:pos.payment.report.user:0 report:pos.sales.user:0
+#: report:pos.sales.user.today:0 report:pos.user.product:0
+msgid "Print Date"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:282
+#, python-format
+msgid "There is no receivable account defined to make payment"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid "Do you want to open cash registers?"
+msgstr ""
+
+#. module: point_of_sale
+#: help:pos.category,sequence:0
+msgid ""
+"Gives the sequence order when displaying a list of product categories."
+msgstr ""
+
+#. module: point_of_sale
+#: field:product.product,expense_pdt:0
+msgid "PoS Cash Output"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.soda
+msgid "Soda"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 view:pos.order:0 view:report.cash.register:0
+#: view:report.pos.order:0
+msgid "Group By..."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "POS Orders"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
+msgid "All Closed CashBox"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:640
+#, python-format
+msgid "No Pricelist !"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Update"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Base"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.categ_others
+msgid "Others"
+msgstr ""
+
+#. module: point_of_sale
+#: view:product.product:0
+msgid "Point-of-Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_50cl_product_template
+msgid "Evian 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Notes"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_2l_product_template
+msgid "Coca-Cola Light Lemon 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.invoice:0 field:pos.order,amount_tax:0
+msgid "Taxes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
+msgid "Sale line"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_naturel_oven_150g_product_template
+msgid "Lays Naturel Oven Baked 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_decaf_33cl_product_template
+msgid "Coca-Cola Light Decaf 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.product_normal_action
+#: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale_product
+#: model:ir.ui.menu,name:point_of_sale.menu_pos_products
+msgid "Products"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_4formaggi_product_template
+msgid "Dr. Oetker Ristorante Quattro Formaggi"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_1l_product_template
+msgid "Coca-Cola Zero 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.sales.user:0 report:pos.sales.user.today:0
+#: field:report.pos.order,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_product_output
+#: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
+msgid "Products 'Put Money In'"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_bolognaise_250g_product_template
+msgid "Croky Bolognaise 250g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Extra Info"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,user_id:0
+msgid "Connected Salesman"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_sale_all
+#: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale_all
+msgid "All Sales Orders"
+msgstr ""
+
+#. module: point_of_sale
+#: help:product.product,income_pdt:0
+msgid ""
+"This is a product you can use to put cash into a statement for the point of "
+"sale backend."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print the Receipt of the Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.make.payment,journal:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_45g_product_template
+msgid "Lays Paprika 45g"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: report:pos.details:0 report:pos.payment.report.user:0
+#: report:pos.user.product:0 field:report.sales.by.margin.pos,qty:0
+#: field:report.sales.by.margin.pos.month,qty:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:32
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:59
+msgid "Qty"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 view:report.pos.order:0
+msgid "Month -1"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_sale_user
+#: model:ir.model,name:point_of_sale.model_pos_sale_user
+#: view:pos.payment.report.user:0
+msgid "Sale by User"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.evian_1l_product_template
+msgid "Evian 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_open_statement
+msgid "Open Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.water
+msgid "Water"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "state"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "July"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_poivre_sel_oven_150g_product_template
+msgid "Lays Sel et Poivre Oven Baked 150g"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "Qty of product"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_rouge_33cl_product_template
+msgid "Chimay Rouge 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.pos.order,delay_validation:0
+msgid "Delay Validation"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,nb_print:0
+msgid "Number of Print"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_make_payment
+msgid "Point of Sale Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_50cl_product_template
+msgid "Coca-Cola Light 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.jupiler_50cl_product_template
+msgid "Jupiler 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.details_summary:0
+msgid "End Period"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_light_lemon_33cl_product_template
+msgid "Coca-Cola Light Lemon 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: field:account.journal,auto_cash:0
+msgid "Automatic Opening"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_ketchup_250g_product_template
+msgid "Lays Ketchup 250g"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.perrier_50cl_product_template
+msgid "Perrier 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.pos.order,state:0
+msgid "Synchronized"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 field:report.cash.register,month:0
+#: view:report.pos.order:0 field:report.pos.order,month:0
+msgid "Month"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+msgid "Statement Name"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Year of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
+#: field:pos.box.entries,journal_id:0 field:pos.box.out,journal_id:0
+msgid "Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "Yes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_receipt
+msgid "Point of sale receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
+msgid "Sales by User Daily margin"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid "Open Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,journal_id:0
+msgid "Sales Journal"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.cash.register,balance_start:0
+msgid "Opening Balance"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 selection:report.pos.order,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_vegetale_product_template
+msgid "Dr. Oetker Ristorante Vegetale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created by today"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_2l_product_template
+msgid "Coca-Cola Zero 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,amount_paid:0 selection:pos.order,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
+msgid "All sales lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Discount"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created in last month"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.beers
+msgid "Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid ""
+"OpenERP will close all cash registers he can close automatically without "
+"validation. He will also open all cash registers for which you have to "
+"control the ending belance before closing manually."
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Cash Analysis created by today"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.product_product_putmoneyforchange0_product_template
+msgid "Cash In"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: report:all.closed.cashbox.of.the.day:0 report:pos.invoice:0
+#: report:pos.lines:0 report:pos.payment.report.user:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:49
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:93
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:271
+msgid "Total:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
+msgid "Sales by margin"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_config_journal
+msgid "Journal Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Statement lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.croky_paprika_45g_product_template
+msgid "Croky Paprika 45g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Reprint"
+msgstr ""
+
+#. module: point_of_sale
+#: help:pos.order,user_id:0
+msgid ""
+"Person who uses the the cash register. It could be a reliever, a student or "
+"an interim employee."
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,invoice_id:0
+msgid "Nbr Invoice"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_receipt
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:231
+msgid "Receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.open.statement:0
+msgid ""
+"The system will open all cash registers, so that you can start recording "
+"payments. We suggest you to control the opening balance of each register, "
+"using their CashBox tab."
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,price_unit:0
+#: report:pos.payment.report.user:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Done"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_invoice_report
+#: report:pos.invoice:0 view:pos.order:0 field:pos.order,invoice_id:0
+msgid "Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.rochefort_8_33cl_product_template
+msgid "Rochefort \"8\" 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.bank.statement:0 selection:report.cash.register,state:0
+msgid "Open"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,name:0 field:pos.order.line,order_id:0
+msgid "Order Ref"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.timmermans_geuze_37,5cl_product_template
+msgid "Timmermans Geuze 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_pickles_250g_product_template
+msgid "Lays Pickels 250g"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.sales.by.margin.pos,net_margin_per_qty:0
+#: field:report.sales.by.margin.pos.month,net_margin_per_qty:0
+msgid "Net margin per Qty"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos_month
+msgid "Sales by user monthly"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
+msgid "Spa et Fruit Orange 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
+msgid "Sales by User Margin"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_payment.py:59
+#, python-format
+msgid "Paiement"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_33cl_product_template
+msgid "Pepsi Max 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_pos_order
+msgid "Point of Sale Orders Statistics"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: model:ir.model,name:point_of_sale.model_product_product
+#: report:pos.details:0 field:pos.order.line,product_id:0
+#: report:pos.payment.report.user:0 report:pos.user.product:0
+#: view:report.pos.order:0 field:report.pos.order,product_id:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:29
+msgid "Product"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_pollo_product_template
+msgid "Dr. Oetker Ristorante Pollo"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
+msgid "Pos Lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.grisette_cerise_25cl_product_template
+msgid "Grisette Cerise 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_33cl_product_template
+msgid "Chaudfontaine 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_margherita_product_template
+msgid "Dr. Oetker La Margherita"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_root
+msgid "PoS Backend"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 selection:pos.order,state:0
+msgid "Posted"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,date_order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
+#: model:ir.model,name:point_of_sale.model_pos_payment_report_user
+msgid "Sales lines by Users"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_2l_product_template
+msgid "Pepsi 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0
+msgid "Order"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:472
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.details:0
+msgid "POS Details"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.details,user_ids:0
+msgid "Salesmen"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_report_cash_register
+#: view:report.cash.register:0
+msgid "Point of Sale Cash Register Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: point_of_sale
+#: model:res.groups,name:point_of_sale.group_pos_manager
+msgid "Manager"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.details,date_start:0 field:pos.sale.user,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: field:pos.order,amount_total:0 report:pos.payment.report.user:0
+#: field:report.sales.by.user.pos,amount:0
+#: field:report.sales.by.user.pos.month,amount:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:33
+msgid "Total"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.sale.user:0
+msgid "Sale By User"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_open_statement
+msgid "Open Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lindemans_pecheresse_37,5cl_product_template
+msgid "Lindemans Pecheresse 37.5cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_33cl_product_template
+msgid "Pepsi 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0
+#: model:ir.actions.report.xml,name:point_of_sale.account_statement
+msgid "Statement"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
+#: model:ir.model,name:point_of_sale.model_pos_payment_report
+#: view:pos.payment.report:0
+msgid "Payment Report"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_orange_25cl_product_template
+msgid "Fanta Orange 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Generate Journal Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
+#: report:pos.details:0 report:pos.details_summary:0 report:pos.lines:0
+#: field:pos.order,company_id:0 field:pos.order.line,company_id:0
+#: report:pos.payment.report.user:0 report:pos.sales.user:0
+#: report:pos.sales.user.today:0 report:pos.user.product:0
+#: field:report.pos.order,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.entries,name:0
+msgid "Reason"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orangina_33cl_product_template
+msgid "Orangina 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_product_input
+#: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
+msgid "Products 'Take Money Out'"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chimay_bleu_33cl_product_template
+msgid "Chimay Bleu 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_account_journal_form
+#: model:ir.ui.menu,name:point_of_sale.menu_action_account_journal_form_open
+msgid "Payment Methods"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.chips
+msgid "Chips"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_spinaci_product_template
+msgid "Dr. Oetker Ristorante Spinaci"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:293
+#: code:addons/point_of_sale/wizard/pos_box_entries.py:100
+#: code:addons/point_of_sale/wizard/pos_box_out.py:88
+#, python-format
+msgid "You have to open at least one cashbox"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
+msgid "Today's Payment By User"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_box_entries
+#: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
+msgid "Put Money In"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:238
+#: code:addons/point_of_sale/point_of_sale.py:253
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "No. Of Articles"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_vanille_2,5l_product_template
+msgid "ijsboerke Vanille 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:pos.order,state:0 selection:report.pos.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.user.product:0
+msgid "Ending Date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orangina_1,5l_product_template
+msgid "Orangina 1.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,picking_id:0
+msgid "Picking"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.ice_cream
+msgid "Ice Cream"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,shop_id:0 field:report.pos.order,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.belle_vue_kriek_25cl_product_template
+msgid "Belle-Vue Kriek 25cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_1,5l_product_template
+msgid "Chaudfontaine Petillante 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
+#: view:report.transaction.pos:0
+msgid "POS Report"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_1,5l_product_template
+msgid "Chaudfontaine 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
+msgid "Close Cash Register"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:65
+#, python-format
+msgid "In order to delete a sale, it must be new or cancelled."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_50cl_product_template
+msgid "Coca-Cola Regular 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.confirm:0
+msgid "Generate Entries"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.box.entries,product_id:0 field:pos.box.out,product_id:0
+msgid "Operation"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,account_move:0
+msgid "Journal Entry"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Confirm"
+msgstr ""
+
+#. module: point_of_sale
+#: help:account.journal,auto_cash:0
+msgid ""
+"This field authorize the automatic creation of the cashbox, without control "
+"of the initial balance."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_50cl_product_template
+msgid "Coca-Cola Zero 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_tonno_product_template
+msgid "Dr. Oetker Ristorante Tonno"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 selection:pos.order,state:0
+#: selection:report.pos.order,state:0
+msgid "New"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:238
+#, python-format
+msgid "In order to set to draft a sale, it must be cancelled."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_zero_orange_33cl_product_template
+msgid "Fanta Zero Orange 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Day of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_rep
+msgid "Reporting"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.maes_33cl_product_template
+msgid "Maes 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.entries:0
+msgid "Put Money"
+msgstr ""
+
+#. module: point_of_sale
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.ui.menu,name:point_of_sale.menu_point_config_product
+msgid "Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.orval_33cl_product_template
+msgid "Orval 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_regular_1l_product_template
+msgid "Coca-Cola Regular 1L"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:253
+#, python-format
+msgid "Unable to cancel the picking."
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created during current month"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "POS ordered created last month"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
+msgid "Invoices"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "December"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_1,5l_product_template
+msgid "Spa Barisart 1.5l"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:329 view:pos.order:0
+#, python-format
+msgid "Return Products"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.jupiler_33cl_product_template
+msgid "Jupiler 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_chocolat_2,5l_product_template
+msgid "ijsboerke Chocolat 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Take Money"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_details
+msgid "Sales Details"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:50
+#, python-format
+msgid "Message"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.journal:0 model:ir.model,name:point_of_sale.model_pos_order
+#: model:ir.ui.menu,name:point_of_sale.menu_point_root_touchscreen
+#: view:product.product:0
+msgid "Point of Sale"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 field:pos.payment.report.user,user_id:0
+#: field:pos.sale.user,user_id:0 field:pos.sales.user.today,user_id:0
+#: view:report.pos.order:0 field:report.pos.order,user_id:0
+msgid "Salesman"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 view:pos.order:0 selection:pos.order,state:0
+#: view:report.pos.order:0 selection:report.pos.order,state:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "No"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_gazeuse_50cl_product_template
+msgid "Spa Barisart 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.special_beers
+msgid "Special Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,notice:0
+msgid "Discount Notice"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Re-Print"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "Draft"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.fanta_zero_orange_1,5l_product_template
+msgid "Fanta Zero Orange 1.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:358
+#, python-format
+msgid "Please provide a partner for the sale."
+msgstr ""
+
+#. module: point_of_sale
+#: model:pos.category,name:point_of_sale.fruity_beers
+msgid "Fruity Beers"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_dame_blanche_2,5l_product_template
+msgid "ijsboerke Dame Blanche 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
+msgid "ijsboerke Moka 2.5L"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,help:point_of_sale.action_account_journal_form
+msgid ""
+"Payment methods are defined by accounting journals having the field Payment "
+"Method checked."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
+#: model:ir.model,name:point_of_sale.model_report_sales_by_user_pos
+msgid "Sales by user"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_hawaii_product_template
+msgid "Dr. Oetker Ristorante Hawaii"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.receipt:0
+msgid "Print Receipt"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "January"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order.line:0
+msgid "POS Orders lines"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.chaudfontaine_petillante_33cl_product_template
+msgid "Chaudfontaine Petillante 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,help:point_of_sale.product_normal_action
+msgid ""
+"You must define a Product for everything you buy or sell. Products can be "
+"raw materials, stockable products, consumables or services. The Product form "
+"contains detailed information about your products related to procurement "
+"logistics, sales price, product category, suppliers and so on."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.pepsi_max_2l_product_template
+msgid "Pepsi Max 2L"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/point_of_sale.py:358
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.lays_paprika_300g_product_template
+msgid "Lays Paprika XXL 300g"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.close.statement:0
+msgid "Do you want to close your cash registers?"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Refund"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/report/pos_invoice.py:46
+#, python-format
+msgid "Please create an invoice for this sale."
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.oetker_mozzarella_product_template
+msgid "Dr. Oetker Ristorante Mozzarella"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_close_statement.py:66
+#: model:ir.ui.menu,name:point_of_sale.menu_close_statement
+#: view:pos.close.statement:0
+#, python-format
+msgid "Close Cash Registers"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.details:0 report:pos.payment.report.user:0
+msgid "Disc(%)"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "General Information"
+msgstr ""
+
+#. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
+#. module: point_of_sale
+#. #-#-#-#-#  point_of_sale.pot.web (PROJECT VERSION)  #-#-#-#-#
+#. openerp-web
+#: view:pos.details:0 view:pos.discount:0 view:pos.payment.report:0
+#: view:pos.payment.report.user:0 view:pos.sale.user:0
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:13
+msgid "Close"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Order lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:account.journal:0
+msgid "Extended Configuration"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order.line,price_subtotal:0
+msgid "Subtotal w/o Tax"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.spa_50cl_product_template
+msgid "Spa Reine 50cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_blonde_33cl_product_template
+msgid "Leffe Blonde 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
+msgid "Pyament Report"
+msgstr ""
+
+#. module: point_of_sale
+#: field:report.transaction.pos,jl_id:0
+msgid "Cash Journals"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.sales.user.today:0
+msgid "Today's Sales By User"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Customer Code"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_box_out.py:86
+#, python-format
+msgid "please check that account is set to %s"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.config.journal,name:0 report:pos.invoice:0 report:pos.lines:0
+msgid "Description"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "May"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.lines:0
+msgid "Sales lines"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0
+msgid "Yesterday"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,note:0
+msgid "Internal Notes"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.coca_zero_decaf_33cl_product_template
+msgid "Coca-Cola Zero Decaf 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.box.out:0
+msgid "Describe why you take money from the cash register:"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
+#: model:ir.ui.menu,name:point_of_sale.menu_report_pos_order_all
+#: view:report.pos.order:0
+msgid "Point of Sale Analysis"
+msgstr ""
+
+#. module: point_of_sale
+#: view:pos.order:0 field:pos.order,partner_id:0 view:report.pos.order:0
+msgid "Customer"
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "February"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0
+msgid "    Today    "
+msgstr ""
+
+#. module: point_of_sale
+#: selection:report.cash.register,month:0 selection:report.pos.order,month:0
+msgid "April"
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.order,statement_ids:0
+msgid "Payments"
+msgstr ""
+
+#. module: point_of_sale
+#: report:pos.invoice:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
+msgid "Sales by User Monthly margin"
+msgstr ""
+
+#. module: point_of_sale
+#: model:product.template,name:point_of_sale.leffe_9_33cl_product_template
+msgid "Leffe Brune \"9\" 33cl"
+msgstr ""
+
+#. module: point_of_sale
+#: help:account.journal,journal_user:0
+msgid ""
+"Check this box if this journal define a payment method that can be used in "
+"point of sales."
+msgstr ""
+
+#. module: point_of_sale
+#: field:pos.category,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: point_of_sale
+#: code:addons/point_of_sale/wizard/pos_return.py:316 view:pos.make.payment:0
+#, python-format
+msgid "Make Payment"
+msgstr ""
+
+#. module: point_of_sale
+#: constraint:pos.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: point_of_sale
+#: model:ir.model,name:point_of_sale.model_pos_sales_user_today
+msgid "Sales User Today"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.pos.order:0
+msgid "Month of order date"
+msgstr ""
+
+#. module: point_of_sale
+#: field:product.product,income_pdt:0
+msgid "PoS Cash Input"
+msgstr ""
+
+#. module: point_of_sale
+#: view:report.cash.register:0 field:report.cash.register,year:0
+#: view:report.pos.order:0 field:report.pos.order,year:0
+msgid "Year"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:31
+msgid "Disc (%)"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:41
+msgid "Subtotal:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:45
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:268
+msgid "Tax:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:64
+msgid "Disc"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:71
+msgid "+/-"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:105
+msgid "Paid:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:113
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:288
+msgid "Change:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:124
+msgid "Back to Products"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:127
+msgid "Validate"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:140
+msgid "pending orders"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:145
+msgid ""
+"There are pending operations that could not be saved into the database, are "
+"you sure you want to exit?"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:236
+msgid "Print"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:238
+msgid "Next Order"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:248
+msgid "Phone:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:249
+msgid "User:"
+msgstr ""
+
+#. openerp-web
+#: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:250
+msgid "Shop:"
+msgstr ""
diff --git a/addons/point_of_sale/i18n/nl.po b/addons/point_of_sale/i18n/nl.po
index b16141722dd..cb208b6d85f 100644
--- a/addons/point_of_sale/i18n/nl.po
+++ b/addons/point_of_sale/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-07-12 08:29+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -490,7 +490,7 @@ msgstr "Dr. Oetker Ristorante Bolognese"
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:105
 #, python-format
 msgid "Please check that income account is set to %s"
-msgstr "Controleer of de opbrengsten verkoop rekening is ingesteld op %s"
+msgstr "Controleer of de omzetrekening is ingesteld op %s"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.pizza
@@ -1082,7 +1082,7 @@ msgstr "Voeding"
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:30
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:69
 msgid "Price"
-msgstr "Prijs"
+msgstr "Bedrag"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_stracciatella_2,5l_product_template
@@ -1715,7 +1715,7 @@ msgstr ""
 #: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,price_unit:0
 #: report:pos.payment.report.user:0
 msgid "Unit Price"
-msgstr "Eenheidsprijs"
+msgstr "Prijs"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1868,7 +1868,7 @@ msgstr "Order"
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)"
 msgstr ""
-"Er is geen opbrengstrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
+"Er is geen omzetrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
 
 #. module: point_of_sale
 #: view:pos.details:0
diff --git a/addons/point_of_sale/i18n/nl_BE.po b/addons/point_of_sale/i18n/nl_BE.po
index 17e5fa1bf48..a1bff5467e1 100644
--- a/addons/point_of_sale/i18n/nl_BE.po
+++ b/addons/point_of_sale/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/pl.po b/addons/point_of_sale/i18n/pl.po
index f5db59d6f43..f3672d89c84 100644
--- a/addons/point_of_sale/i18n/pl.po
+++ b/addons/point_of_sale/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/pt.po b/addons/point_of_sale/i18n/pt.po
index 58137312272..5968906edfb 100644
--- a/addons/point_of_sale/i18n/pt.po
+++ b/addons/point_of_sale/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/pt_BR.po b/addons/point_of_sale/i18n/pt_BR.po
index 6eaf57b6b0c..2e5cf361b51 100644
--- a/addons/point_of_sale/i18n/pt_BR.po
+++ b/addons/point_of_sale/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-07-23 01:46+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-10-17 00:01+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@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: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -304,7 +304,7 @@ msgstr "Vendas Mensais por Usuário"
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Today's Closed Cashbox"
-msgstr ""
+msgstr "Fechamento de Caixa do dia"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -916,7 +916,7 @@ msgstr "Linhas da Ordem de Venda"
 #. module: point_of_sale
 #: view:pos.receipt:0
 msgid "Receipt :"
-msgstr ""
+msgstr "Recibo"
 
 #. module: point_of_sale
 #: field:account.bank.statement.line,pos_statement_id:0
@@ -1177,7 +1177,7 @@ msgstr ""
 #: report:pos.payment.report.user:0 report:pos.sales.user:0
 #: report:pos.sales.user.today:0 report:pos.user.product:0
 msgid "Print Date"
-msgstr ""
+msgstr "Data de Impressão"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:282
@@ -2323,7 +2323,7 @@ msgstr "PRO-FORMA"
 #: code:addons/point_of_sale/point_of_sale.py:358
 #, python-format
 msgid "Please provide a partner for the sale."
-msgstr ""
+msgstr "Por favor informe um parceiro para a venda"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.fruity_beers
@@ -2422,7 +2422,7 @@ msgstr "Reembolso"
 #: code:addons/point_of_sale/report/pos_invoice.py:46
 #, python-format
 msgid "Please create an invoice for this sale."
-msgstr ""
+msgstr "Por favor crie uma fatura para esta venda."
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_mozzarella_product_template
diff --git a/addons/point_of_sale/i18n/ro.po b/addons/point_of_sale/i18n/ro.po
index e254a6592e6..93f83805b36 100644
--- a/addons/point_of_sale/i18n/ro.po
+++ b/addons/point_of_sale/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/ru.po b/addons/point_of_sale/i18n/ru.po
index c1822a57afd..2caf975ae55 100644
--- a/addons/point_of_sale/i18n/ru.po
+++ b/addons/point_of_sale/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/sl.po b/addons/point_of_sale/i18n/sl.po
index bbf0e67adde..9e7302d13d5 100644
--- a/addons/point_of_sale/i18n/sl.po
+++ b/addons/point_of_sale/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/sq.po b/addons/point_of_sale/i18n/sq.po
index e9d0debc072..d322cc0034d 100644
--- a/addons/point_of_sale/i18n/sq.po
+++ b/addons/point_of_sale/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:56+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:53+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/sr.po b/addons/point_of_sale/i18n/sr.po
index 463f6b191b9..eb0ea9e6934 100644
--- a/addons/point_of_sale/i18n/sr.po
+++ b/addons/point_of_sale/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/sr@latin.po b/addons/point_of_sale/i18n/sr@latin.po
index 4ea7a176db3..6859d1b2114 100644
--- a/addons/point_of_sale/i18n/sr@latin.po
+++ b/addons/point_of_sale/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po
index cb78a2b85e3..ad6af6b5566 100644
--- a/addons/point_of_sale/i18n/sv.po
+++ b/addons/point_of_sale/i18n/sv.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
 msgid "Product Nb."
-msgstr "Produkt nr."
+msgstr "Produkt Nr."
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_today
@@ -37,6 +37,12 @@ msgid ""
 "new payment methods directly from menu \"PoS Backend > Configuration > "
 "Payment Methods\"."
 msgstr ""
+"Du måste definiera vilka betalningssätt som skall vara tillgängliga via "
+"Kassan genom att använda existerande bank- och kontantjournaler via "
+"\"Redovisning > Konfiguration > Redovisning > Journaler \". Välj en Journal "
+"och kontrollera fältet \"Kassa Betalningsmetod\" från \"Kassa\"-fliken. Du "
+"kan också skapa nya betalningsmetoder direkt från menyn \"Kassa "
+"admin.gränssnitt > Konfiguration > Betalningsmetoder\"."
 
 #. module: point_of_sale
 #: view:pos.order:0 view:report.pos.order:0
@@ -46,33 +52,33 @@ msgstr "Idag"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.plain_water
 msgid "Plain Water"
-msgstr ""
+msgstr "Vanligt vatten"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Year from Creation date of cash register"
-msgstr ""
+msgstr "År från Skapandedatum av kassaregister"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Post All Orders"
-msgstr ""
+msgstr "Posta alla beställningar"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_2l_product_template
 msgid "Spa Reine 2L"
-msgstr ""
+msgstr "Spa Reine 2L"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_out
 msgid "Pos Box Out"
-msgstr ""
+msgstr "Kassalåda ut"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_cash_register_all
 #: model:ir.ui.menu,name:point_of_sale.menu_report_cash_register_all
 msgid "Register Analysis"
-msgstr ""
+msgstr "Registeranalys"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_detail
@@ -94,7 +100,7 @@ msgstr "Lägg till betalning:"
 #. module: point_of_sale
 #: field:pos.box.out,name:0
 msgid "Description / Reason"
-msgstr ""
+msgstr "Beskrivning / orsak"
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,product_name:0
@@ -105,7 +111,7 @@ msgstr "Produktnamn"
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Month from Creation date of cash register"
-msgstr ""
+msgstr "Månad från Skapandedatum av kassaregister"
 
 #. module: point_of_sale
 #: report:account.statement:0 field:pos.box.entries,amount:0
@@ -121,18 +127,19 @@ msgid ""
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"Konfigurationsfel! Den valuta som valts bör delas med förvalda konton också."
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.pos_category_action
 #: model:ir.ui.menu,name:point_of_sale.menu_pos_category view:pos.category:0
 msgid "PoS Categories"
-msgstr ""
+msgstr "Kassa Kategorier"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_out
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl2
 msgid "Take Money Out"
-msgstr ""
+msgstr "Ta ut pengar"
 
 #. module: point_of_sale
 #: report:pos.lines:0
@@ -142,7 +149,7 @@ msgstr "Moms"
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Origin"
-msgstr ""
+msgstr "Ursprung"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -161,6 +168,8 @@ msgid ""
 "You do not have any open cash register. You must create a payment method or "
 "open a cash register."
 msgstr ""
+"Du har inte något öppet kassaregister. Du måste skapa en betalningsmetod "
+"eller öppna ett kassaregister."
 
 #. module: point_of_sale
 #: report:account.statement:0 field:report.pos.order,partner_id:0
@@ -185,22 +194,22 @@ msgstr "Rabatt (%)"
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_open_config
 msgid "Cash Register Management"
-msgstr ""
+msgstr "Kontantregisterhantering"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_naturel_45g_product_template
 msgid "Lays Naturel 45g"
-msgstr ""
+msgstr "Lays Naturel 45g"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Redovisningsinformation"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_2l_product_template
 msgid "Coca-Cola Regular 2L"
-msgstr ""
+msgstr "Coca-Cola Regular 2L"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree_month
@@ -210,7 +219,7 @@ msgstr "Månadsförsäljning"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.soda_orange
 msgid "Orange"
-msgstr ""
+msgstr "Orange"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_today
@@ -236,7 +245,7 @@ msgstr "Totalt pris"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.leffe_brune_33cl_product_template
 msgid "Leffe Brune 33cl"
-msgstr ""
+msgstr "Leffe Brune 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user
@@ -247,12 +256,12 @@ msgstr "Försäljningsrapport"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.beverage
 msgid "Beverages"
-msgstr ""
+msgstr "Drycker"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.stella_50cl_product_template
 msgid "Stella Artois 50cl"
-msgstr ""
+msgstr "Stella Artois 50cl"
 
 #. module: point_of_sale
 #: view:pos.details:0
@@ -262,7 +271,7 @@ msgstr "Datum"
 #. module: point_of_sale
 #: field:pos.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Överordnad kategori"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.lines:0 report:pos.payment.report.user:0
@@ -284,17 +293,17 @@ msgstr "Rabatt (%)"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_speciale_product_template
 msgid "Dr. Oetker Ristorante Speciale"
-msgstr ""
+msgstr "Dr Oetker Ristorante Speciale"
 
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "Total qty"
-msgstr "Totalt ant"
+msgstr "Totalt ant."
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_33cl_product_template
 msgid "Fanta Orange 33cl"
-msgstr ""
+msgstr "Fanta Orange 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_user_pos_month
@@ -304,38 +313,38 @@ msgstr "Månadsförsäljning per användare"
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "Today's Closed Cashbox"
-msgstr ""
+msgstr "Dagskassa"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Day from Creation date of cash register"
-msgstr ""
+msgstr "Dag från Skapandedatum av kassaregister"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_of_sale
 msgid "Daily Operations"
-msgstr ""
+msgstr "Daglig Verksamhet"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:285
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "Konfigurationsfel !"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.sparkling_water
 msgid "Sparkling Water"
-msgstr ""
+msgstr "Kolsyrat vatten"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
 msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Fyll i detta formulär om du sätter in pengar i kassan:"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
 msgid "Search Cash Statements"
-msgstr ""
+msgstr "Sök Kontant verifikat"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -345,7 +354,7 @@ msgstr "Augusti"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_max_lemon_33cl_product_template
 msgid "Pepsi Max Cool Lemon 33cl"
-msgstr ""
+msgstr "Pepsi Max Cool Lemon 33cl"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -355,17 +364,17 @@ msgstr "Juni"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order line"
-msgstr ""
+msgstr "Kassaorderrad"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_50cl_product_template
 msgid "Fanta Orange 50cl"
-msgstr ""
+msgstr "Fanta Orange 50cl"
 
 #. module: point_of_sale
 #: field:pos.category,child_id:0
 msgid "Children Categories"
-msgstr ""
+msgstr "Underordnade Kategorier"
 
 #. module: point_of_sale
 #: field:pos.make.payment,payment_date:0
@@ -378,6 +387,7 @@ msgid ""
 "If you want to sell this product through the point of sale, select the "
 "category it belongs to."
 msgstr ""
+"Om du vill sälja produkten genom kassan, välj den kategori den tillhör."
 
 #. module: point_of_sale
 #: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
@@ -392,7 +402,7 @@ msgstr "Oktober"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_1l_product_template
 msgid "Coca-Cola Light 1L"
-msgstr ""
+msgstr "Coca-Cola Light 1L"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
@@ -402,7 +412,7 @@ msgstr "Summering"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_50cl_product_template
 msgid "Chaudfontaine 50cl"
-msgstr ""
+msgstr "Chaudfontaine 50cl"
 
 #. module: point_of_sale
 #: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,qty:0
@@ -414,7 +424,7 @@ msgstr "Antal"
 #. module: point_of_sale
 #: field:pos.order.line,name:0
 msgid "Line No"
-msgstr ""
+msgstr "Radnummer."
 
 #. module: point_of_sale
 #: view:account.bank.statement:0
@@ -425,7 +435,7 @@ msgstr "Period"
 #: code:addons/point_of_sale/wizard/pos_open_statement.py:49
 #, python-format
 msgid "No Cash Register Defined !"
-msgstr ""
+msgstr "Ingen kassaregister Definierat!"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -435,7 +445,7 @@ msgstr "Nettototal:"
 #. module: point_of_sale
 #: field:pos.make.payment,payment_name:0
 msgid "Payment Reference"
-msgstr ""
+msgstr "Betalningsreferens"
 
 #. module: point_of_sale
 #: report:pos.details_summary:0
@@ -445,18 +455,18 @@ msgstr "Betalningssätt"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_confirm
 msgid "Post POS Journal Entries"
-msgstr ""
+msgstr "Skicka Kassajournalrader"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:408
 #, python-format
 msgid "Customer Invoice"
-msgstr ""
+msgstr "Kundfaktura"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Output Operation"
-msgstr ""
+msgstr "Utgång Funktion"
 
 #. module: point_of_sale
 #: view:report.pos.order:0 field:report.pos.order,total_discount:0
@@ -472,18 +482,18 @@ msgstr "Skriv ut rapport"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_bolognese_product_template
 msgid "Dr. Oetker Ristorante Bolognese"
-msgstr ""
+msgstr "Dr Oetker Ristorante Bolognese"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_entries.py:105
 #, python-format
 msgid "Please check that income account is set to %s"
-msgstr ""
+msgstr "Kontrollera att avkastningskonto är satt till %s"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.pizza
 msgid "Pizza"
-msgstr ""
+msgstr "Pizza"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:85
@@ -500,7 +510,7 @@ msgstr "Fakturabelopp"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.coke
 msgid "Coke"
-msgstr ""
+msgstr "Coke"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -511,7 +521,7 @@ msgstr "Tel. :"
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_confirm
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_pos_confirm
 msgid "Create Sale Entries"
-msgstr ""
+msgstr "Skapa försäljningsrad"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -526,7 +536,7 @@ msgstr "Betalning"
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Cash Analysis created in current month"
-msgstr ""
+msgstr "Kontant analys skapad i aktuell månad"
 
 #. module: point_of_sale
 #: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
@@ -536,44 +546,44 @@ msgstr "Utgående balans"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_max_50cl_product_template
 msgid "Pepsi Max 50cl"
-msgstr ""
+msgstr "Pepsi Max 50cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.san_pellegrino_1l_product_template
 msgid "San Pellegrino 1L"
-msgstr ""
+msgstr "San Pellegrino 1L"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Post Entries"
-msgstr ""
+msgstr "Skicka rader"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_1l_product_template
 msgid "Spa Reine 1L"
-msgstr ""
+msgstr "Spa Reine 1L"
 
 #. module: point_of_sale
 #: report:pos.details_summary:0
 msgid "Mode of Taxes"
-msgstr ""
+msgstr "Momsläge"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:50
 #, python-format
 msgid "Cash registers are already closed."
-msgstr ""
+msgstr "Kassaapparater redan stängda."
 
 #. module: point_of_sale
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Fel: felaktig ean kod"
+msgstr "Fel: Felaktig EAN kod"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_open_statement
 #: view:pos.open.statement:0
 msgid "Open Statements"
-msgstr ""
+msgstr "Öppna Rapporter"
 
 #. module: point_of_sale
 #: field:pos.details,date_end:0 field:pos.sale.user,date_end:0
@@ -583,43 +593,43 @@ msgstr "Slutdatum"
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "POS ordered created during current year"
-msgstr ""
+msgstr "Kassaorder skapade under innevarande år"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_pos_form
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale view:pos.order:0
 msgid "PoS Orders"
-msgstr ""
+msgstr "Kassaordrar"
 
 #. module: point_of_sale
 #: report:pos.details:0
 msgid "Sales total(Revenue)"
-msgstr ""
+msgstr "Försäljning totalt (Revenue)"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
 msgid "Total paid"
-msgstr ""
+msgstr "Totalt betalade"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_all_menu_all_register
 msgid "List of Cash Registers"
-msgstr ""
+msgstr "Lista kassaregister"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.maes_50cl_product_template
 msgid "Maes 50cl"
-msgstr ""
+msgstr "Maes 50cl"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_transaction_pos
 msgid "transaction for the pos"
-msgstr "Transaktioner för pos"
+msgstr "Transaktioner för kassan"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Not Invoiced"
-msgstr ""
+msgstr "Ej fakturerade"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -630,7 +640,7 @@ msgstr "Mars"
 #: model:ir.actions.report.xml,name:point_of_sale.pos_users_product_re
 #: report:pos.user.product:0
 msgid "User's Product"
-msgstr ""
+msgstr "Användarens Produkt"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:641
@@ -639,21 +649,23 @@ msgid ""
 "You have to select a pricelist in the sale form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"Du måste välja en prislista i försäljningsformuläret! \n"
+"Var vänlig ange en innan du väljer en produkt."
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_2l_product_template
 msgid "Fanta Orange 2L"
-msgstr ""
+msgstr "Fanta Orange 2L"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_33cl_product_template
 msgid "Spa Reine 33cl"
-msgstr ""
+msgstr "Spa Reine 33cl"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_discount
 msgid "Add a Global Discount"
-msgstr ""
+msgstr "Lägg till en global rabatt"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal_incl:0
@@ -663,18 +675,18 @@ msgstr "Deltotal"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_prosciutto_product_template
 msgid "Dr. Oetker Ristorante Prosciutto"
-msgstr ""
+msgstr "Dr Oetker Ristorante Prosciutto"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_light_paprika_170g_product_template
 #: model:product.template,name:point_of_sale.lays_paprika_170g_product_template
 msgid "Lays Light Paprika 170g"
-msgstr ""
+msgstr "Lays Ljus Paprika 170g"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_lemon_50cl_product_template
 msgid "Coca-Cola Light Lemon 50cl"
-msgstr ""
+msgstr "Coca-Cola Light Lemon 50cl"
 
 #. module: point_of_sale
 #: field:report.cash.register,balance_end_real:0
@@ -685,17 +697,17 @@ msgstr "Utgående balans"
 #: model:ir.actions.act_window,name:point_of_sale.act_pos_open_statement
 #: model:ir.model,name:point_of_sale.model_pos_close_statement
 msgid "Close Statements"
-msgstr ""
+msgstr "Stäng rapporter"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.croky_naturel_45g_product_template
 msgid "Croky Naturel 45g"
-msgstr ""
+msgstr "Croky Naturel 45g"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.product_product_putmoneyforchange1_product_template
 msgid "Cash Out"
-msgstr ""
+msgstr "Uttag"
 
 #. module: point_of_sale
 #: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
@@ -706,22 +718,22 @@ msgstr "Ingående balans"
 #: model:ir.model,name:point_of_sale.model_pos_category
 #: field:product.product,pos_categ_id:0
 msgid "PoS Category"
-msgstr ""
+msgstr "Kassakategori"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chimay_bleu_75cl_product_template
 msgid "Chimay Bleu 75cl"
-msgstr ""
+msgstr "Chimay Bleu 75cl"
 
 #. module: point_of_sale
 #: report:pos.payment.report.user:0
 msgid "Payment By User"
-msgstr ""
+msgstr "Betalning av användare"
 
 #. module: point_of_sale
 #: view:report.pos.order:0 field:report.pos.order,nbr:0
 msgid "# of Lines"
-msgstr "rader"
+msgstr "antal rader"
 
 #. module: point_of_sale
 #: help:account.journal,check_dtls:0
@@ -729,6 +741,8 @@ msgid ""
 "This field authorize Validation of Cashbox without controlling the closing "
 "balance."
 msgstr ""
+"Detta fält godkänner Validering av kassa utan att kontrollera den utgående "
+"balansen."
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_details
@@ -739,12 +753,12 @@ msgstr "Försäljningsdetaljer"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.pils
 msgid "Pils"
-msgstr ""
+msgstr "Pils"
 
 #. module: point_of_sale
 #: report:all.closed.cashbox.of.the.day:0
 msgid "St.Name"
-msgstr ""
+msgstr "St.Name"
 
 #. module: point_of_sale
 #: report:pos.details_summary:0
@@ -769,7 +783,7 @@ msgstr "Total transaktion"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_petillante_50cl_product_template
 msgid "Chaudfontaine Petillante 50cl"
-msgstr ""
+msgstr "Chaudfontaine Petillante 50cl"
 
 #. module: point_of_sale
 #: field:pos.order.line,create_date:0
@@ -779,19 +793,19 @@ msgstr "Skapad datum"
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_sales_user_today
 msgid "Today's Sales"
-msgstr "Dagens försäljning"
+msgstr "Dagsförsäljning"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_naturel_300g_product_template
 msgid "Lays Naturel XXL 300g"
-msgstr ""
+msgstr "Lays Naturel XXL 300g"
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
 #: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS "
-msgstr "POS "
+msgstr "Kassa "
 
 #. module: point_of_sale
 #: report:account.statement:0 report:pos.user.product:0
@@ -816,12 +830,12 @@ msgstr "Totalt fakturerat"
 #. module: point_of_sale
 #: view:report.pos.order:0 field:report.pos.order,product_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "antal"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos_month
 msgid "Sales by margin monthly"
-msgstr ""
+msgstr "Försäljning per månad marginal"
 
 #. module: point_of_sale
 #: view:pos.order:0 field:report.sales.by.margin.pos,date_order:0
@@ -834,34 +848,34 @@ msgstr "Orderdatum"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.stella_33cl_product_template
 msgid "Stella Artois 33cl"
-msgstr ""
+msgstr "Stella Artois 33cl"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Cash Analysis created during this year"
-msgstr ""
+msgstr "Kontantanalys skapad under detta år"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Draft Invoice"
-msgstr "Preliminär faktura"
+msgstr "Faktura-utkast"
 
 #. module: point_of_sale
 #: constraint:account.bank.statement.line:0
 msgid ""
 "The amount of the voucher must be the same amount as the one on the "
 "statement line"
-msgstr ""
+msgstr "Summan på kupongen måste vara samma belopp som verifikatraden"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Finansiell Anmärkning:"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_2l_product_template
 msgid "Evian 2L"
-msgstr ""
+msgstr "Evian 2L"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -871,22 +885,22 @@ msgstr "September"
 #. module: point_of_sale
 #: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
 msgid "Opening Date"
-msgstr ""
+msgstr "Öppningsdatum"
 
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Moms:"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_2l_product_template
 msgid "Coca-Cola Light 2L"
-msgstr ""
+msgstr "Coca-Cola Light 2L"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_funghi_product_template
 msgid "Dr. Oetker Ristorante Funghi"
-msgstr ""
+msgstr "Dr Oetker Ristorante Funghi"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,disc:0
@@ -896,12 +910,12 @@ msgstr "Rab."
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lindemans_kriek_37,5cl_product_template
 msgid "Lindemans Kriek 37.5cl"
-msgstr ""
+msgstr "Lindemans Kriek 37.5cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_zero_33cl_product_template
 msgid "Coca-Cola Zero 33cl"
-msgstr ""
+msgstr "Coca-Cola Zero 33cl"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -911,7 +925,7 @@ msgstr "Moms:"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Order lines"
-msgstr ""
+msgstr "Kassaorderrader"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
@@ -933,7 +947,7 @@ msgstr "Datum"
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_discount
 #: view:pos.discount:0
 msgid "Apply Discount"
-msgstr ""
+msgstr "Applicera rabatt"
 
 #. module: point_of_sale
 #: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
@@ -952,12 +966,12 @@ msgstr "Användare"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_33cl_product_template
 msgid "Coca-Cola Light 33cl"
-msgstr ""
+msgstr "Coca-Cola Light 33cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.perrier_1l_product_template
 msgid "Perrier 1L"
-msgstr ""
+msgstr "Perrier 1L"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
@@ -967,12 +981,12 @@ msgstr "Totala rabatter"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_box_entries
 msgid "Pos Box Entries"
-msgstr ""
+msgstr "Kassalådarader"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.boon_framboise_37,5cl_product_template
 msgid "Boon Framboise 37.5cl"
-msgstr ""
+msgstr "Boon Framboise 37.5cl"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -997,14 +1011,14 @@ msgstr "Journal"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_faro_37,5cl_product_template
 msgid "Timmermans Faro 37.5cl"
-msgstr ""
+msgstr "Timmermans Faro 37.5cl"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0 view:pos.order:0 field:pos.order,state:0
 #: report:pos.sales.user:0 report:pos.sales.user.today:0
 #: field:report.cash.register,state:0 field:report.pos.order,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,no_trans:0
@@ -1025,17 +1039,17 @@ msgstr "Försäljning (summering)"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_kriek_37,5cl_product_template
 msgid "Timmermans Kriek 37.5cl"
-msgstr ""
+msgstr "Timmermans Kriek 37.5cl"
 
 #. module: point_of_sale
 #: field:account.journal,check_dtls:0
 msgid "Control Balance Before Closing"
-msgstr ""
+msgstr "Kontrollera Balansen innan du stänger"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_order_line
 msgid "Lines of Point of Sale"
-msgstr ""
+msgstr "Kassarader"
 
 #. module: point_of_sale
 #: view:pos.order:0 view:report.transaction.pos:0
@@ -1055,7 +1069,7 @@ msgstr "Användare"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.food
 msgid "Food"
-msgstr ""
+msgstr "Livsmedel"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -1070,12 +1084,12 @@ msgstr "Pris"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_stracciatella_2,5l_product_template
 msgid "ijsboerke Stracciatella 2.5L"
-msgstr ""
+msgstr "ijsboerke Stracciatella 2.5L"
 
 #. module: point_of_sale
 #: field:account.journal,journal_user:0
 msgid "PoS Payment Method"
-msgstr ""
+msgstr "Betalningsmetod Kassa"
 
 #. module: point_of_sale
 #: help:product.product,expense_pdt:0
@@ -1083,6 +1097,9 @@ msgid ""
 "This is a product you can use to take cash from a statement for the point of "
 "sale backend, exemple: money lost, transfer to bank, etc."
 msgstr ""
+"Detta är en produkt som du kan använda för att ta pengar från ett verifikat "
+"via Kassans admin. gränssnitt, exempel: förlorade pengar, överföring till "
+"bank etc."
 
 #. module: point_of_sale
 #: field:report.cash.register,date:0
@@ -1092,18 +1109,18 @@ msgstr "Skapat datum"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_33cl_product_template
 msgid "Coca-Cola Regular 33cl"
-msgstr ""
+msgstr "Coca-Cola Regular 33cl"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:65
 #, python-format
 msgid "Unable to Delete !"
-msgstr ""
+msgstr "Kan ej tas bort!"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_paprika_oven_150g_product_template
 msgid "Lays Paprika Oven Baked 150g"
-msgstr ""
+msgstr "Lays Paprika Ugnsbakad 150g"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
@@ -1120,7 +1137,7 @@ msgstr "Namn"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_gazeuse_33cl_product_template
 msgid "Spa Barisart 33cl"
-msgstr ""
+msgstr "Spa Barisart 33cl"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:284
@@ -1129,6 +1146,8 @@ msgid ""
 "There is no receivable account defined to make payment for the partner: "
 "\"%s\" (id:%d)"
 msgstr ""
+"Det finns ingen mottagarkonto definierat för att kunna betala för denna "
+"partnern: \"%s\" (id:%d)"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
@@ -1136,6 +1155,8 @@ msgid ""
 "Generate all sale journal entries for non invoiced orders linked to a closed "
 "cash register or statement."
 msgstr ""
+"Generera alla försäljningsjournalsposter för icke fakturerade ordrar "
+"kopplade till en stängd kassaapparat eller verifikat."
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:293
@@ -1170,7 +1191,7 @@ msgstr "Journalnamnet måste vara unikt per företag!"
 #: model:product.template,name:point_of_sale.lays_light_naturel_170g_product_template
 #: model:product.template,name:point_of_sale.lays_naturel_170g_product_template
 msgid "Lays Light Naturel 170g"
-msgstr ""
+msgstr "Lays Ljus Naturel 170g"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0 report:pos.lines:0
@@ -1184,6 +1205,7 @@ msgstr "Utskriftsdatum"
 #, python-format
 msgid "There is no receivable account defined to make payment"
 msgstr ""
+"Det finns inget mottagarkonto definierat för att kunna göra en betalning"
 
 #. module: point_of_sale
 #: view:pos.open.statement:0
@@ -1194,17 +1216,17 @@ msgstr ""
 #: help:pos.category,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
-msgstr ""
+msgstr "Ger sekvensordningen när visning av en lista över produktkategorier."
 
 #. module: point_of_sale
 #: field:product.product,expense_pdt:0
 msgid "PoS Cash Output"
-msgstr ""
+msgstr "Kassa Kontant ut"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.soda
 msgid "Soda"
-msgstr ""
+msgstr "Läskedryck"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0 view:pos.order:0 view:report.cash.register:0
@@ -1215,12 +1237,12 @@ msgstr "Gruppera på..."
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "POS Orders"
-msgstr "POS order"
+msgstr "Kassaorder"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.all_closed_cashbox_of_the_day
 msgid "All Closed CashBox"
-msgstr ""
+msgstr "Alla Avslutade Dagskassor"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:640
@@ -1231,7 +1253,7 @@ msgstr "Ingen prislista !"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Update"
-msgstr ""
+msgstr "Updatera"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1241,17 +1263,17 @@ msgstr "Bas"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.categ_others
 msgid "Others"
-msgstr ""
+msgstr "Övrigt"
 
 #. module: point_of_sale
 #: view:product.product:0
 msgid "Point-of-Sale"
-msgstr ""
+msgstr "Kassa"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_50cl_product_template
 msgid "Evian 50cl"
-msgstr ""
+msgstr "Evian 50cl"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1266,7 +1288,7 @@ msgstr "Försäljningsorder"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_lemon_2l_product_template
 msgid "Coca-Cola Light Lemon 2L"
-msgstr ""
+msgstr "Coca-Cola Light Lemon 2L"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.invoice:0 field:pos.order,amount_tax:0
@@ -1278,17 +1300,17 @@ msgstr "Moms"
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_day
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_order_line_form
 msgid "Sale line"
-msgstr ""
+msgstr "Försäljning rad"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_naturel_oven_150g_product_template
 msgid "Lays Naturel Oven Baked 150g"
-msgstr ""
+msgstr "Lays Naturel Ugnsbakad 150g"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_decaf_33cl_product_template
 msgid "Coca-Cola Light Decaf 33cl"
-msgstr ""
+msgstr "Coca-Cola Light Decaf 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.product_normal_action
@@ -1300,12 +1322,12 @@ msgstr "Produkter"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_4formaggi_product_template
 msgid "Dr. Oetker Ristorante Quattro Formaggi"
-msgstr ""
+msgstr "Dr Oetker Ristorante Quattro Formaggi"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_zero_1l_product_template
 msgid "Coca-Cola Zero 1L"
-msgstr ""
+msgstr "Coca-Cola Zero 1L"
 
 #. module: point_of_sale
 #: report:pos.sales.user:0 report:pos.sales.user.today:0
@@ -1318,18 +1340,18 @@ msgstr "Orderdatum"
 #: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS"
-msgstr "POS"
+msgstr "Kassa"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_product_output
 #: model:ir.ui.menu,name:point_of_sale.products_for_output_operations
 msgid "Products 'Put Money In'"
-msgstr ""
+msgstr "Produkter 'insättning'"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.croky_bolognaise_250g_product_template
 msgid "Croky Bolognaise 250g"
-msgstr ""
+msgstr "Croky Bolognaise 250g"
 
 #. module: point_of_sale
 #: view:pos.order:0
@@ -1344,13 +1366,13 @@ msgstr "Fax :"
 #. module: point_of_sale
 #: field:pos.order,user_id:0
 msgid "Connected Salesman"
-msgstr ""
+msgstr "Ansluten Försäljare"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_sale_all
 #: model:ir.ui.menu,name:point_of_sale.menu_point_ofsale_all
 msgid "All Sales Orders"
-msgstr ""
+msgstr "Alla kundorder"
 
 #. module: point_of_sale
 #: help:product.product,income_pdt:0
@@ -1358,6 +1380,8 @@ msgid ""
 "This is a product you can use to put cash into a statement for the point of "
 "sale backend."
 msgstr ""
+"Detta är en produkt som du kan använda för att sätta in pengar i ett "
+"verifikat via Kassans admin. gränssnitt."
 
 #. module: point_of_sale
 #: view:pos.receipt:0
@@ -1367,12 +1391,12 @@ msgstr ""
 #. module: point_of_sale
 #: field:pos.make.payment,journal:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Betalningsläge"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_paprika_45g_product_template
 msgid "Lays Paprika 45g"
-msgstr ""
+msgstr "Lays Paprika 45g"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -1396,12 +1420,12 @@ msgstr "Månad  -1"
 #: model:ir.model,name:point_of_sale.model_pos_sale_user
 #: view:pos.payment.report.user:0
 msgid "Sale by User"
-msgstr ""
+msgstr "Försäljning av användare"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.evian_1l_product_template
 msgid "Evian 1L"
-msgstr ""
+msgstr "Evian 1L"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_open_statement
@@ -1411,12 +1435,12 @@ msgstr "Öppna kassaregister"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.water
 msgid "Water"
-msgstr ""
+msgstr "Vatten"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "state"
-msgstr ""
+msgstr "Status"
 
 #. module: point_of_sale
 #: selection:report.cash.register,month:0 selection:report.pos.order,month:0
@@ -1426,7 +1450,7 @@ msgstr "Juli"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_poivre_sel_oven_150g_product_template
 msgid "Lays Sel et Poivre Oven Baked 150g"
-msgstr ""
+msgstr "Lays Sel et Poivre ugnsbakad 150g"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
@@ -1436,12 +1460,12 @@ msgstr "Antal produkter"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chimay_rouge_33cl_product_template
 msgid "Chimay Rouge 33cl"
-msgstr ""
+msgstr "Chimay Rouge 33cl"
 
 #. module: point_of_sale
 #: field:report.pos.order,delay_validation:0
 msgid "Delay Validation"
-msgstr ""
+msgstr "Fördröj Validering"
 
 #. module: point_of_sale
 #: field:pos.order,nb_print:0
@@ -1451,27 +1475,27 @@ msgstr "Antal utskrifter"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_make_payment
 msgid "Point of Sale Payment"
-msgstr ""
+msgstr "Kassabetalning"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_50cl_product_template
 msgid "Coca-Cola Light 50cl"
-msgstr ""
+msgstr "Coca-Cola Light 50cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.jupiler_50cl_product_template
 msgid "Jupiler 50cl"
-msgstr ""
+msgstr "Jupiler 50cl"
 
 #. module: point_of_sale
 #: report:pos.details:0 report:pos.details_summary:0
 msgid "End Period"
-msgstr "Periodslut"
+msgstr "Avsluta period"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_light_lemon_33cl_product_template
 msgid "Coca-Cola Light Lemon 33cl"
-msgstr ""
+msgstr "Coca-Cola Light Lemon 33cl"
 
 #. module: point_of_sale
 #: field:account.journal,auto_cash:0
@@ -1481,17 +1505,17 @@ msgstr "Automatisk öppning"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_ketchup_250g_product_template
 msgid "Lays Ketchup 250g"
-msgstr ""
+msgstr "Lays Ketchup 250g"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.perrier_50cl_product_template
 msgid "Perrier 50cl"
-msgstr ""
+msgstr "Perrier 50cl"
 
 #. module: point_of_sale
 #: selection:report.pos.order,state:0
 msgid "Synchronized"
-msgstr ""
+msgstr "Synkroniserad"
 
 #. module: point_of_sale
 #: view:report.cash.register:0 field:report.cash.register,month:0
@@ -1502,12 +1526,12 @@ msgstr "Månad"
 #. module: point_of_sale
 #: report:account.statement:0
 msgid "Statement Name"
-msgstr ""
+msgstr "Verifikatnamn"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Year of order date"
-msgstr ""
+msgstr "År orderdatum"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_new_bank_statement_tree
@@ -1528,12 +1552,12 @@ msgstr "Kassakvitto"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_today
 msgid "Sales by User Daily margin"
-msgstr ""
+msgstr "Försäljning per användare Daglig marginal"
 
 #. module: point_of_sale
 #: view:pos.open.statement:0
 msgid "Open Registers"
-msgstr ""
+msgstr "Öppna register"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,journal_id:0
@@ -1548,22 +1572,22 @@ msgstr "Ingående saldo"
 #. module: point_of_sale
 #: view:account.bank.statement:0 selection:report.pos.order,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Stängd"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_vegetale_product_template
 msgid "Dr. Oetker Ristorante Vegetale"
-msgstr ""
+msgstr "Dr Oetker Ristorante vegetale"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "POS ordered created by today"
-msgstr ""
+msgstr "Kassaordrar skapade idag"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_zero_2l_product_template
 msgid "Coca-Cola Zero 2L"
-msgstr ""
+msgstr "Coca-Cola Zero 2L"
 
 #. module: point_of_sale
 #: field:pos.order,amount_paid:0 selection:pos.order,state:0
@@ -1573,22 +1597,22 @@ msgstr "Betald"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_all_sales_lines
 msgid "All sales lines"
-msgstr ""
+msgstr "Alla försäljningsrader"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Discount"
-msgstr ""
+msgstr "Rabatt"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Cash Analysis created in last month"
-msgstr ""
+msgstr "Kontantanalys skapade förra månaden"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.beers
 msgid "Beers"
-msgstr ""
+msgstr "Öl"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
@@ -1597,11 +1621,14 @@ msgid ""
 "validation. He will also open all cash registers for which you have to "
 "control the ending belance before closing manually."
 msgstr ""
+"OpenERP stänger alla kassaapparater som kan stängas automatiskt utan att "
+"godkänna. OpenERP kommer också att öppna alla kontantregister som du måste "
+"kontrollera utgående balansen på innan du stänger dom manuellt."
 
 #. module: point_of_sale
 #: view:report.cash.register:0
 msgid "Cash Analysis created by today"
-msgstr ""
+msgstr "Kontantanalys skapad idag"
 
 #. module: point_of_sale
 #: selection:report.cash.register,state:0
@@ -1611,7 +1638,7 @@ msgstr "Offert"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.product_product_putmoneyforchange0_product_template
 msgid "Cash In"
-msgstr ""
+msgstr "Kontant"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -1628,27 +1655,27 @@ msgstr "Totalt:"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_sales_by_margin_pos
 msgid "Sales by margin"
-msgstr ""
+msgstr "Försäljningsmarginal"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_config_journal
 msgid "Journal Configuration"
-msgstr ""
+msgstr "Journal konfiguration"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Verifikatrader"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.croky_paprika_45g_product_template
 msgid "Croky Paprika 45g"
-msgstr ""
+msgstr "Croky Paprika 45g"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Reprint"
-msgstr ""
+msgstr "Skriv ut igen"
 
 #. module: point_of_sale
 #: help:pos.order,user_id:0
@@ -1656,11 +1683,13 @@ msgid ""
 "Person who uses the the cash register. It could be a reliever, a student or "
 "an interim employee."
 msgstr ""
+"Person som använder kassaregistret. Det kan vara en avlastare, en student "
+"eller en tillfällig anställd."
 
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_id:0
 msgid "Nbr Invoice"
-msgstr ""
+msgstr "Nr Faktura"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -1678,6 +1707,9 @@ msgid ""
 "payments. We suggest you to control the opening balance of each register, "
 "using their CashBox tab."
 msgstr ""
+"Systemet öppnar alla kassaapparater, så att du kan börja spela in "
+"betalningar. Vi föreslår att du kontrollerar ingående balans för varje "
+"kassaregister via deras kassaflik."
 
 #. module: point_of_sale
 #: report:pos.invoice:0 report:pos.lines:0 field:pos.order.line,price_unit:0
@@ -1699,7 +1731,7 @@ msgstr "Faktura"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.rochefort_8_33cl_product_template
 msgid "Rochefort \"8\" 33cl"
-msgstr ""
+msgstr "Rochefort \"8\" 33cl"
 
 #. module: point_of_sale
 #: view:account.bank.statement:0 selection:report.cash.register,state:0
@@ -1714,12 +1746,12 @@ msgstr "Orderreferens"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.timmermans_geuze_37,5cl_product_template
 msgid "Timmermans Geuze 37.5cl"
-msgstr ""
+msgstr "Timmermans Geuze 37.5cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_pickles_250g_product_template
 msgid "Lays Pickels 250g"
-msgstr ""
+msgstr "Lays Pickels 250g"
 
 #. module: point_of_sale
 #: field:report.sales.by.margin.pos,net_margin_per_qty:0
@@ -1735,18 +1767,18 @@ msgstr "Månadsförsäljning per användare"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_et_fruit_50cl_product_template
 msgid "Spa et Fruit Orange 50cl"
-msgstr ""
+msgstr "Spa et Frukt Orange 50cl"
 
 #. module: point_of_sale
 #: view:report.sales.by.margin.pos:0 view:report.sales.by.margin.pos.month:0
 msgid "Sales by User Margin"
-msgstr ""
+msgstr "Försäljning per användare Marginal"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_payment.py:59
 #, python-format
 msgid "Paiement"
-msgstr ""
+msgstr "Paiement"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -1756,12 +1788,12 @@ msgstr "Moms:"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_max_33cl_product_template
 msgid "Pepsi Max 33cl"
-msgstr ""
+msgstr "Pepsi Max 33cl"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_pos_order
 msgid "Point of Sale Orders Statistics"
-msgstr "Försäljningsstatistik"
+msgstr "Försäljningsstatistik Kassa"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -1778,37 +1810,37 @@ msgstr "Produkt"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_pollo_product_template
 msgid "Dr. Oetker Ristorante Pollo"
-msgstr ""
+msgstr "Dr Oetker Ristorante Pollo"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_lines_report
 msgid "Pos Lines"
-msgstr ""
+msgstr "Kassarader"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.grisette_cerise_25cl_product_template
 msgid "Grisette Cerise 25cl"
-msgstr ""
+msgstr "Grisette Cerise 25cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_33cl_product_template
 msgid "Chaudfontaine 33cl"
-msgstr ""
+msgstr "Chaudfontaine 33cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_margherita_product_template
 msgid "Dr. Oetker La Margherita"
-msgstr ""
+msgstr "Dr Oetker La Margherita"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_root
 msgid "PoS Backend"
-msgstr ""
+msgstr "Admin. Kassa"
 
 #. module: point_of_sale
 #: view:pos.order:0 selection:pos.order,state:0
 msgid "Posted"
-msgstr ""
+msgstr "Publicerad"
 
 #. module: point_of_sale
 #: field:pos.order,date_order:0
@@ -1819,17 +1851,17 @@ msgstr "Orderdatum"
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment_report_user
 #: model:ir.model,name:point_of_sale.model_pos_payment_report_user
 msgid "Sales lines by Users"
-msgstr ""
+msgstr "Försäljningsrader per användare"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_2l_product_template
 msgid "Pepsi 2L"
-msgstr ""
+msgstr "Pepsi 2L"
 
 #. module: point_of_sale
 #: report:pos.details:0
 msgid "Order"
-msgstr ""
+msgstr "Order"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:472
@@ -1840,12 +1872,12 @@ msgstr "Det finns inget intäktskonto för denna produkt: \"%s\" (id:%d)"
 #. module: point_of_sale
 #: view:pos.details:0
 msgid "POS Details"
-msgstr ""
+msgstr "Kassa Detaljer"
 
 #. module: point_of_sale
 #: field:pos.details,user_ids:0
 msgid "Salesmen"
-msgstr ""
+msgstr "Säljare"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_report_cash_register
@@ -1856,12 +1888,12 @@ msgstr "Kassaanalys"
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Netto Totalt:"
 
 #. module: point_of_sale
 #: model:res.groups,name:point_of_sale.group_pos_manager
 msgid "Manager"
-msgstr ""
+msgstr "Chef"
 
 #. module: point_of_sale
 #: field:pos.details,date_start:0 field:pos.sale.user,date_start:0
@@ -1892,35 +1924,35 @@ msgstr "Öppna kassaregister"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lindemans_pecheresse_37,5cl_product_template
 msgid "Lindemans Pecheresse 37.5cl"
-msgstr ""
+msgstr "Lindemans Pecheresse 37.5cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_33cl_product_template
 msgid "Pepsi 33cl"
-msgstr ""
+msgstr "Pepsi 33cl"
 
 #. module: point_of_sale
 #: report:account.statement:0
 #: model:ir.actions.report.xml,name:point_of_sale.account_statement
 msgid "Statement"
-msgstr ""
+msgstr "Verfikat"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_payment_report
 #: model:ir.model,name:point_of_sale.model_pos_payment_report
 #: view:pos.payment.report:0
 msgid "Payment Report"
-msgstr ""
+msgstr "Betalningsrapport"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_orange_25cl_product_template
 msgid "Fanta Orange 25cl"
-msgstr ""
+msgstr "Fanta Orange 25cl"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Generate Journal Entries"
-msgstr ""
+msgstr "Generera journalrader"
 
 #. module: point_of_sale
 #: report:account.statement:0 report:all.closed.cashbox.of.the.day:0
@@ -1940,39 +1972,39 @@ msgstr "Fakturadatum"
 #. module: point_of_sale
 #: field:pos.box.entries,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Orsak"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orangina_33cl_product_template
 msgid "Orangina 33cl"
-msgstr ""
+msgstr "Orangina 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_product_input
 #: model:ir.ui.menu,name:point_of_sale.products_for_input_operations
 msgid "Products 'Take Money Out'"
-msgstr ""
+msgstr "Produkter 'Uttag'"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chimay_bleu_33cl_product_template
 msgid "Chimay Bleu 33cl"
-msgstr ""
+msgstr "Chimay Bleu 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_account_journal_form
 #: model:ir.ui.menu,name:point_of_sale.menu_action_account_journal_form_open
 msgid "Payment Methods"
-msgstr ""
+msgstr "Betalningsmetod"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.chips
 msgid "Chips"
-msgstr ""
+msgstr "Chips"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_spinaci_product_template
 msgid "Dr. Oetker Ristorante Spinaci"
-msgstr ""
+msgstr "Dr Oetker Ristorante Spinaci"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:293
@@ -1980,18 +2012,18 @@ msgstr ""
 #: code:addons/point_of_sale/wizard/pos_box_out.py:88
 #, python-format
 msgid "You have to open at least one cashbox"
-msgstr ""
+msgstr "Du måste öppna minst en kassa"
 
 #. module: point_of_sale
 #: model:ir.actions.report.xml,name:point_of_sale.pos_payment_report_user
 msgid "Today's Payment By User"
-msgstr ""
+msgstr "DagsBetalningar per användare"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_box_entries
 #: model:ir.ui.menu,name:point_of_sale.menu_wizard_enter_jrnl
 msgid "Put Money In"
-msgstr ""
+msgstr "Insättning"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:238
@@ -2003,17 +2035,17 @@ msgstr "Fel!"
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "No. Of Articles"
-msgstr ""
+msgstr "Antal artiklar"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_vanille_2,5l_product_template
 msgid "ijsboerke Vanille 2.5L"
-msgstr ""
+msgstr "ijsboerke Vanille 2.5L"
 
 #. module: point_of_sale
 #: selection:pos.order,state:0 selection:report.pos.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: point_of_sale
 #: report:pos.user.product:0
@@ -2023,7 +2055,7 @@ msgstr "Slutdatum"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orangina_1,5l_product_template
 msgid "Orangina 1.5L"
-msgstr ""
+msgstr "Orangina 1.5L"
 
 #. module: point_of_sale
 #: field:pos.order,picking_id:0
@@ -2033,7 +2065,7 @@ msgstr "Plockning"
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.ice_cream
 msgid "Ice Cream"
-msgstr ""
+msgstr "Glass"
 
 #. module: point_of_sale
 #: field:pos.order,shop_id:0 field:report.pos.order,shop_id:0
@@ -2043,28 +2075,28 @@ msgstr "Affär"
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Kontoutdragsrad Bank"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.belle_vue_kriek_25cl_product_template
 msgid "Belle-Vue Kriek 25cl"
-msgstr ""
+msgstr "Belle-Vue Kriek 25cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_petillante_1,5l_product_template
 msgid "Chaudfontaine Petillante 1.5l"
-msgstr ""
+msgstr "Chaudfontaine Petillante 1.5l"
 
 #. module: point_of_sale
 #: view:report.sales.by.user.pos:0 view:report.sales.by.user.pos.month:0
 #: view:report.transaction.pos:0
 msgid "POS Report"
-msgstr ""
+msgstr "Kassarapport"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_1,5l_product_template
 msgid "Chaudfontaine 1.5l"
-msgstr ""
+msgstr "Chaudfontaine 1.5l"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_close_statement
@@ -2075,27 +2107,27 @@ msgstr "Stäng kassaregister"
 #: code:addons/point_of_sale/point_of_sale.py:65
 #, python-format
 msgid "In order to delete a sale, it must be new or cancelled."
-msgstr ""
+msgstr "För att ta bort en försäljning måste den vara ny eller annulleras."
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_50cl_product_template
 msgid "Coca-Cola Regular 50cl"
-msgstr ""
+msgstr "Coca-Cola Regular 50cl"
 
 #. module: point_of_sale
 #: view:pos.confirm:0
 msgid "Generate Entries"
-msgstr ""
+msgstr "Generera rader"
 
 #. module: point_of_sale
 #: field:pos.box.entries,product_id:0 field:pos.box.out,product_id:0
 msgid "Operation"
-msgstr ""
+msgstr "Drift"
 
 #. module: point_of_sale
 #: field:pos.order,account_move:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Journalrad"
 
 #. module: point_of_sale
 #: selection:report.cash.register,state:0
@@ -2118,16 +2150,18 @@ msgid ""
 "This field authorize the automatic creation of the cashbox, without control "
 "of the initial balance."
 msgstr ""
+"Detta fält godkänner automatiskt skapandet av kassan, utan kontroll av den "
+"ursprungliga ingående balansen."
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_zero_50cl_product_template
 msgid "Coca-Cola Zero 50cl"
-msgstr ""
+msgstr "Coca-Cola Zero 50cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_tonno_product_template
 msgid "Dr. Oetker Ristorante Tonno"
-msgstr ""
+msgstr "Dr Oetker Ristorante Tonno"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2137,29 +2171,29 @@ msgstr "Leverantörsfaktura"
 #. module: point_of_sale
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "Vald journal och period valts måste tillhöra samma företag."
 
 #. module: point_of_sale
 #: view:pos.order:0 selection:pos.order,state:0
 #: selection:report.pos.order,state:0
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:238
 #, python-format
 msgid "In order to set to draft a sale, it must be cancelled."
-msgstr ""
+msgstr "För att kunna sättas som utkast, så måste den avbrytas."
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_zero_orange_33cl_product_template
 msgid "Fanta Zero Orange 33cl"
-msgstr ""
+msgstr "Fanta Zero Orange 33cl"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Day of order date"
-msgstr ""
+msgstr "Dag för orderdatum"
 
 #. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_rep
@@ -2169,12 +2203,12 @@ msgstr "Rapportering"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.maes_33cl_product_template
 msgid "Maes 33cl"
-msgstr ""
+msgstr "Maes 33cl"
 
 #. module: point_of_sale
 #: view:pos.box.entries:0
 msgid "Put Money"
-msgstr "Lägg i pengar"
+msgstr "Insättning"
 
 #. module: point_of_sale
 #: sql_constraint:account.journal:0
@@ -2189,28 +2223,28 @@ msgstr "Konfiguration"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.orval_33cl_product_template
 msgid "Orval 33cl"
-msgstr ""
+msgstr "Orval 33cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_regular_1l_product_template
 msgid "Coca-Cola Regular 1L"
-msgstr ""
+msgstr "Coca-Cola Regular 1L"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:253
 #, python-format
 msgid "Unable to cancel the picking."
-msgstr ""
+msgstr "Kan inte avbryta plockning."
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "POS ordered created during current month"
-msgstr ""
+msgstr "Kassaordern skapades under innevarande månad"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "POS ordered created last month"
-msgstr ""
+msgstr "Kassaordern skapades förra månaden"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_pos_invoice
@@ -2225,28 +2259,28 @@ msgstr "December"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_gazeuse_1,5l_product_template
 msgid "Spa Barisart 1.5l"
-msgstr ""
+msgstr "Spa Barisart 1.5l"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:329 view:pos.order:0
 #, python-format
 msgid "Return Products"
-msgstr ""
+msgstr "Returnera produkter"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.jupiler_33cl_product_template
 msgid "Jupiler 33cl"
-msgstr ""
+msgstr "Jupiler 33cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_chocolat_2,5l_product_template
 msgid "ijsboerke Chocolat 2.5L"
-msgstr ""
+msgstr "ijsboerke Chocolat 2.5L"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Take Money"
-msgstr "Ta pengar"
+msgstr "Ta ut pengar"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_details
@@ -2287,22 +2321,22 @@ msgstr "Nej"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_gazeuse_50cl_product_template
 msgid "Spa Barisart 50cl"
-msgstr ""
+msgstr "Spa Barisart 50cl"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.special_beers
 msgid "Special Beers"
-msgstr ""
+msgstr "Särskild öl"
 
 #. module: point_of_sale
 #: field:pos.order.line,notice:0
 msgid "Discount Notice"
-msgstr ""
+msgstr "Rabatt Meddelande"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Re-Print"
-msgstr ""
+msgstr "Skriv ut igen"
 
 #. module: point_of_sale
 #: view:report.cash.register:0
@@ -2312,7 +2346,7 @@ msgstr "Utkast"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.fanta_zero_orange_1,5l_product_template
 msgid "Fanta Zero Orange 1.5L"
-msgstr ""
+msgstr "Fanta Zero Orange 1.5L"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
@@ -2323,27 +2357,27 @@ msgstr "PRO-FORMA"
 #: code:addons/point_of_sale/point_of_sale.py:358
 #, python-format
 msgid "Please provide a partner for the sale."
-msgstr "Vänligen välj en kund för försäljningen"
+msgstr "Välj en kund för försäljningen"
 
 #. module: point_of_sale
 #: model:pos.category,name:point_of_sale.fruity_beers
 msgid "Fruity Beers"
-msgstr ""
+msgstr "Fruktiga Öl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_dame_blanche_2,5l_product_template
 msgid "ijsboerke Dame Blanche 2.5L"
-msgstr ""
+msgstr "ijsboerke Dame Blanche 2.5L"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.ijsboerke_moka_2,5l_product_template
 msgid "ijsboerke Moka 2.5L"
-msgstr ""
+msgstr "ijsboerke Moka 2.5L"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Sök kundorder"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,help:point_of_sale.action_account_journal_form
@@ -2351,6 +2385,8 @@ msgid ""
 "Payment methods are defined by accounting journals having the field Payment "
 "Method checked."
 msgstr ""
+"Betalningsmetoder definieras av redovisningsjournalerna genom att ha fältet "
+"Betalningsmetod ikryssad."
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_trans_pos_tree
@@ -2361,7 +2397,7 @@ msgstr "Försäljning per användare"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_hawaii_product_template
 msgid "Dr. Oetker Ristorante Hawaii"
-msgstr ""
+msgstr "Dr Oetker Ristorante Hawaii"
 
 #. module: point_of_sale
 #: view:pos.receipt:0
@@ -2376,12 +2412,12 @@ msgstr "Januari"
 #. module: point_of_sale
 #: view:pos.order.line:0
 msgid "POS Orders lines"
-msgstr ""
+msgstr "Kassabeställningar rader"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.chaudfontaine_petillante_33cl_product_template
 msgid "Chaudfontaine Petillante 33cl"
-msgstr ""
+msgstr "Chaudfontaine Petillante 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,help:point_of_sale.product_normal_action
@@ -2391,11 +2427,16 @@ msgid ""
 "contains detailed information about your products related to procurement "
 "logistics, sales price, product category, suppliers and so on."
 msgstr ""
+"Du måste definiera en produkt för allt du köper eller säljer. Produkter kan "
+"vara råvaror, lagerhållna produkter, förbrukningsvaror och tjänster. I "
+"Produktformuläret finns detaljerad information om produkterna relaterade "
+"till inköp, logistik, försäljningspris, produktkategori, leverantörer och så "
+"vidare."
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.pepsi_max_2l_product_template
 msgid "Pepsi Max 2L"
-msgstr ""
+msgstr "Pepsi Max 2L"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/point_of_sale.py:358
@@ -2406,7 +2447,7 @@ msgstr "Fel"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.lays_paprika_300g_product_template
 msgid "Lays Paprika XXL 300g"
-msgstr ""
+msgstr "Lays Paprika XXL 300g"
 
 #. module: point_of_sale
 #: view:pos.close.statement:0
@@ -2427,7 +2468,7 @@ msgstr "Vänligen skapa en faktura för denna försäljning"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.oetker_mozzarella_product_template
 msgid "Dr. Oetker Ristorante Mozzarella"
-msgstr ""
+msgstr "Dr Oetker Ristorante Mozzarella"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_close_statement.py:66
@@ -2445,7 +2486,7 @@ msgstr "Rab(%)"
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "General Information"
-msgstr ""
+msgstr "Allmän information"
 
 #. #-#-#-#-#  point_of_sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 #. module: point_of_sale
@@ -2465,22 +2506,22 @@ msgstr "Orderrad"
 #. module: point_of_sale
 #: view:account.journal:0
 msgid "Extended Configuration"
-msgstr ""
+msgstr "Utökad konfiguration"
 
 #. module: point_of_sale
 #: field:pos.order.line,price_subtotal:0
 msgid "Subtotal w/o Tax"
-msgstr ""
+msgstr "Delsumma w / o Skatt"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.spa_50cl_product_template
 msgid "Spa Reine 50cl"
-msgstr ""
+msgstr "Spa Reine 50cl"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.leffe_blonde_33cl_product_template
 msgid "Leffe Blonde 33cl"
-msgstr ""
+msgstr "Leffe Blond 33cl"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_payment
@@ -2495,18 +2536,18 @@ msgstr "Kassajournal"
 #. module: point_of_sale
 #: report:pos.sales.user.today:0
 msgid "Today's Sales By User"
-msgstr ""
+msgstr "Dagsförsäljning per användare"
 
 #. module: point_of_sale
 #: report:pos.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "Kundkod"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_box_out.py:86
 #, python-format
 msgid "please check that account is set to %s"
-msgstr ""
+msgstr "kontrollera att kontot är inställt på %s"
 
 #. module: point_of_sale
 #: field:pos.config.journal,name:0 report:pos.invoice:0 report:pos.lines:0
@@ -2521,12 +2562,12 @@ msgstr "Maj"
 #. module: point_of_sale
 #: report:pos.lines:0
 msgid "Sales lines"
-msgstr ""
+msgstr "Försäljningsrader"
 
 #. module: point_of_sale
 #: view:pos.order:0
 msgid "Yesterday"
-msgstr ""
+msgstr "I går"
 
 #. module: point_of_sale
 #: field:pos.order,note:0
@@ -2536,12 +2577,12 @@ msgstr "Interna anteckningar"
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.coca_zero_decaf_33cl_product_template
 msgid "Coca-Cola Zero Decaf 33cl"
-msgstr ""
+msgstr "Coca-Cola Zero Decaf 33cl"
 
 #. module: point_of_sale
 #: view:pos.box.out:0
 msgid "Describe why you take money from the cash register:"
-msgstr ""
+msgstr "Beskriv varför du tar pengar från kassan:"
 
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_pos_order_all
@@ -2583,12 +2624,12 @@ msgstr "Återbetalning till leverantör"
 #. module: point_of_sale
 #: model:ir.actions.act_window,name:point_of_sale.action_report_sales_by_margin_pos_month
 msgid "Sales by User Monthly margin"
-msgstr ""
+msgstr "Marginal - Försäljning per användare per månad"
 
 #. module: point_of_sale
 #: model:product.template,name:point_of_sale.leffe_9_33cl_product_template
 msgid "Leffe Brune \"9\" 33cl"
-msgstr ""
+msgstr "Leffe Brune \"9\" 33cl"
 
 #. module: point_of_sale
 #: help:account.journal,journal_user:0
@@ -2596,11 +2637,13 @@ msgid ""
 "Check this box if this journal define a payment method that can be used in "
 "point of sales."
 msgstr ""
+"Markera den här rutan om den här journalen definierar en betalningsmetod som "
+"kan användas i kassan."
 
 #. module: point_of_sale
 #: field:pos.category,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sekvens"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/wizard/pos_return.py:316 view:pos.make.payment:0
@@ -2611,22 +2654,22 @@ msgstr "Skapa betalning"
 #. module: point_of_sale
 #: constraint:pos.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva kategorier."
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_sales_user_today
 msgid "Sales User Today"
-msgstr ""
+msgstr "Försäljning Användare Idag"
 
 #. module: point_of_sale
 #: view:report.pos.order:0
 msgid "Month of order date"
-msgstr ""
+msgstr "Månad för orderdatum"
 
 #. module: point_of_sale
 #: field:product.product,income_pdt:0
 msgid "PoS Cash Input"
-msgstr ""
+msgstr "Kassa kontantinsättning"
 
 #. module: point_of_sale
 #: view:report.cash.register:0 field:report.cash.register,year:0
@@ -2637,54 +2680,54 @@ msgstr "År"
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:31
 msgid "Disc (%)"
-msgstr ""
+msgstr "Rabatt (%)"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:41
 msgid "Subtotal:"
-msgstr ""
+msgstr "Delsumma:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:45
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:268
 msgid "Tax:"
-msgstr ""
+msgstr "Moms:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:64
 msgid "Disc"
-msgstr ""
+msgstr "Rabatt"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:71
 msgid "+/-"
-msgstr ""
+msgstr "+ / -"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:105
 msgid "Paid:"
-msgstr ""
+msgstr "Betald:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:113
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:288
 msgid "Change:"
-msgstr ""
+msgstr "Växel:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:124
 msgid "Back to Products"
-msgstr ""
+msgstr "Tillbaka till produkter"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:127
 msgid "Validate"
-msgstr ""
+msgstr "Godkänn"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:140
 msgid "pending orders"
-msgstr ""
+msgstr "väntande order"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:145
@@ -2692,31 +2735,33 @@ msgid ""
 "There are pending operations that could not be saved into the database, are "
 "you sure you want to exit?"
 msgstr ""
+"Det finns pågående verksamhet som inte kunde sparas i databasen, är du säker "
+"på att du vill avsluta?"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:236
 msgid "Print"
-msgstr ""
+msgstr "Skriv ut"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:238
 msgid "Next Order"
-msgstr ""
+msgstr "Nästa Order"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:248
 msgid "Phone:"
-msgstr ""
+msgstr "Telefon:"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:249
 msgid "User:"
-msgstr ""
+msgstr "Användare"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/point_of_sale/static/src/xml/pos.xml:250
 msgid "Shop:"
-msgstr ""
+msgstr "Affär:"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -2936,3 +2981,12 @@ msgstr ""
 
 #~ msgid "User :"
 #~ msgstr "Användare:"
+
+#~ msgid "Do you want to open cash registers ?"
+#~ msgstr "Vill du öppna kassaapparater?"
+
+#~ msgid "Print the receipt of the sale"
+#~ msgstr "Skriv ut kvittot på försäljningen"
+
+#~ msgid "Do you want to close your cash registers ?"
+#~ msgstr "Vill du stänga dina kassaregister?"
diff --git a/addons/point_of_sale/i18n/tlh.po b/addons/point_of_sale/i18n/tlh.po
index 0c8daf3f2b8..b6d95d2bbdf 100644
--- a/addons/point_of_sale/i18n/tlh.po
+++ b/addons/point_of_sale/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index 41b45961e55..59c7fef7854 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
@@ -37,6 +37,12 @@ msgid ""
 "new payment methods directly from menu \"PoS Backend > Configuration > "
 "Payment Methods\"."
 msgstr ""
+"\"Muhasebe > Yapılandırma > Mali Muhasebe > Günlükler\" yoluyla mevcut banka "
+"ve kasayı yeniden kullanan satış noktası için hangi ödeme yönteminin geçerli "
+"olacağını tanımlamalısınız. Bir günlük seçin ve \"Satış Noktası\" "
+"sekmesinden \"PoS Odeme Yöntemi\" alanını işaretleyin. \"PoS Sunucu "
+"Uygulaması\" > Yapılandırma > Ödeme Yöntemi\" menüsünden doğrudan yeni ödeme "
+"yöntemi oluşturabilirsiniz."
 
 #. module: point_of_sale
 #: view:pos.order:0 view:report.pos.order:0
diff --git a/addons/point_of_sale/i18n/uk.po b/addons/point_of_sale/i18n/uk.po
index 6eaf003ece3..2f1a9239c7d 100644
--- a/addons/point_of_sale/i18n/uk.po
+++ b/addons/point_of_sale/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:54+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/vi.po b/addons/point_of_sale/i18n/vi.po
index 3fc540de804..f4e49c28245 100644
--- a/addons/point_of_sale/i18n/vi.po
+++ b/addons/point_of_sale/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/zh_CN.po b/addons/point_of_sale/i18n/zh_CN.po
index 57512251609..1363900b4a5 100644
--- a/addons/point_of_sale/i18n/zh_CN.po
+++ b/addons/point_of_sale/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/zh_HK.po b/addons/point_of_sale/i18n/zh_HK.po
index b11488f4b79..a77a8b506dc 100644
--- a/addons/point_of_sale/i18n/zh_HK.po
+++ b/addons/point_of_sale/i18n/zh_HK.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/i18n/zh_TW.po b/addons/point_of_sale/i18n/zh_TW.po
index d656fd763ba..7f86eb02475 100644
--- a/addons/point_of_sale/i18n/zh_TW.po
+++ b/addons/point_of_sale/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:57+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:55+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: point_of_sale
 #: field:report.transaction.pos,product_nb:0
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index f4d32985688..050b8f4cfe7 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -66,7 +66,7 @@ class pos_config(osv.osv):
         'iface_vkeyboard' : fields.boolean('Virtual KeyBoard Interface'),
         'iface_print_via_proxy' : fields.boolean('Print via Proxy'),
 
-        'state' : fields.selection(POS_CONFIG_STATE, 'State', required=True, readonly=True),
+        'state' : fields.selection(POS_CONFIG_STATE, 'Status', required=True, readonly=True),
         'sequence_id' : fields.many2one('ir.sequence', 'Order IDs Sequence', readonly=True,
             help="This sequence is automatically created by OpenERP but you can change it "\
                 "to customize the reference numbers of your orders."),
@@ -74,6 +74,26 @@ class pos_config(osv.osv):
         'group_by' : fields.boolean('Group Journal Items', help="Check this if you want to group the Journal Items by Product while closing a Session"),
     }
 
+    def _check_cash_control(self, cr, uid, ids, context=None):
+        return all(
+            (sum(int(journal.cash_control) for journal in record.journal_ids) <= 1)
+            for record in self.browse(cr, uid, ids, context=context)
+        )
+
+    _constraints = [
+        (_check_cash_control, "You cannot have two cash controls in one Point Of Sale !", ['journal_ids']),
+    ]
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        d = {
+            'sequence_id' : False,
+        }
+        d.update(default)
+        return super(pos_order, self).copy(cr, uid, id, d, context=context)
+
+
     def name_get(self, cr, uid, ids, context=None):
         result = []
         states = {
@@ -90,11 +110,6 @@ class pos_config(osv.osv):
             result.append((record.id, record.name + ' ('+session.user_id.name+')')) #, '+states[session.state]+')'))
         return result
 
-
-    def _default_payment_journal(self, cr, uid, context=None):
-        res = self.pool.get('account.journal').search(cr, uid, [('type', 'in', ('bank','cash'))], limit=2)
-        return res or []
-
     def _default_sale_journal(self, cr, uid, context=None):
         res = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale')], limit=1)
         return res and res[0] or False
@@ -107,7 +122,6 @@ class pos_config(osv.osv):
         'state' : POS_CONFIG_STATE[0][0],
         'shop_id': _default_shop,
         'journal_id': _default_sale_journal,
-        'journal_ids': _default_payment_journal,
         'group_by' : True,
     }
 
@@ -148,45 +162,20 @@ class pos_session(osv.osv):
         ('closed', 'Closed & Posted'),
     ]
 
-    def _compute_cash_journal_id(self, cr, uid, ids, fieldnames, args, context=None):
-        result = dict.fromkeys(ids, False)
-        for record in self.browse(cr, uid, ids, context=context):
-            for st in record.statement_ids:
-                if st.journal_id.type == 'cash':
-                    result[record.id] = st.journal_id.id
-                    break
-        return result
-
-    def _compute_cash_register_id(self, cr, uid, ids, fieldnames, args, context=None):
-        result = dict.fromkeys(ids, False)
-        for record in self.browse(cr, uid, ids, context=context):
-            for st in record.statement_ids:
-                if st.journal_id.type == 'cash':
-                    result[record.id] = st.id
-                    break
-        return result
-
-    def _compute_controls(self, cr, uid, ids, fieldnames, args, context=None):
-        result = {}
+    def _compute_cash_all(self, cr, uid, ids, fieldnames, args, context=None):
+        result = dict()
 
         for record in self.browse(cr, uid, ids, context=context):
-            has_opening_control = False
-            has_closing_control = False
-
-            for journal in record.config_id.journal_ids:
-                if journal.opening_control == True:
-                    has_opening_control = True
-                if journal.closing_control == True:
-                    has_closing_control = True
-
-                if has_opening_control and has_closing_control:
-                    break
-
-            values = {
-                'has_opening_control': has_opening_control,
-                'has_closing_control': has_closing_control,
+            result[record.id] = {
+                'cash_journal_id' : False,
+                'cash_register_id' : False,
+                'cash_control' : False,
             }
-            result[record.id] = values
+            for st in record.statement_ids:
+                if st.journal_id.cash_control == True:
+                    result[record.id]['cash_control'] = True
+                    result[record.id]['cash_journal_id'] = st.journal_id.id
+                    result[record.id]['cash_register_id'] = st.id
 
         return result
 
@@ -208,16 +197,21 @@ class pos_session(osv.osv):
         'start_at' : fields.datetime('Opening Date', readonly=True), 
         'stop_at' : fields.datetime('Closing Date', readonly=True),
 
-        'state' : fields.selection(POS_SESSION_STATE, 'State',
+        'state' : fields.selection(POS_SESSION_STATE, 'Status',
                 required=True, readonly=True,
                 select=1),
 
-        'cash_journal_id' : fields.function(_compute_cash_journal_id, method=True, 
-                type='many2one', relation='account.journal',
-                string='Cash Journal', store=True),
-        'cash_register_id' : fields.function(_compute_cash_register_id, method=True, 
-                type='many2one', relation='account.bank.statement',
-                string='Cash Register', store=True),
+        'cash_control' : fields.function(_compute_cash_all,
+                                         multi='cash',
+                                         type='boolean', string='Has Cash Control'),
+        'cash_journal_id' : fields.function(_compute_cash_all,
+                                            multi='cash',
+                                            type='many2one', relation='account.journal',
+                                            string='Cash Journal', store=True),
+        'cash_register_id' : fields.function(_compute_cash_all,
+                                             multi='cash',
+                                             type='many2one', relation='account.bank.statement',
+                                             string='Cash Register', store=True),
 
         'opening_details_ids' : fields.related('cash_register_id', 'opening_details_ids', 
                 type='one2many', relation='account.cashbox.line',
@@ -261,8 +255,6 @@ class pos_session(osv.osv):
         'order_ids' : fields.one2many('pos.order', 'session_id', 'Orders'),
 
         'statement_ids' : fields.one2many('account.bank.statement', 'pos_session_id', 'Bank Statement', readonly=True),
-        'has_opening_control' : fields.function(_compute_controls, string='Has Opening Control', multi='control', type='boolean'),
-        'has_closing_control' : fields.function(_compute_controls, string='Has Closing Control', multi='control', type='boolean'),
     }
 
     _defaults = {
@@ -304,46 +296,55 @@ class pos_session(osv.osv):
     ]
 
     def create(self, cr, uid, values, context=None):
-        config_id = values.get('config_id', False) or False
-        if config_id:
-            # journal_id is not required on the pos_config because it does not
-            # exists at the installation. If nothing is configured at the
-            # installation we do the minimal configuration. Impossible to do in
-            # the .xml files as the CoA is not yet installed.
-            jobj = self.pool.get('pos.config')
-            pos_config = jobj.browse(cr, uid, config_id, context=context)
-            if not pos_config.journal_id:
-                jid = jobj.default_get(cr, uid, ['journal_id'], context=context)['journal_id']
-                if jid:
-                    jobj.write(cr, uid, [pos_config.id], {'journal_id': jid}, context=context)
-                else:
-                    raise osv.except_osv( _('error!'),
-                        _("Unable to open the session. You have to assign a sale journal to your point of sale."))
+        context = context or {}
+        config_id = values.get('config_id', False) or context.get('default_config_id', False)
+        if not config_id:
+            raise osv.except_osv( _('Error!'),
+                _("You should assign a Point of Sale to your session."))
 
-            # define some cash journal if no payment method exists
-            if not pos_config.journal_ids:
-                cashids = self.pool.get('account.journal').search(cr, uid, [('journal_user','=',True)], context=context)
+        # journal_id is not required on the pos_config because it does not
+        # exists at the installation. If nothing is configured at the
+        # installation we do the minimal configuration. Impossible to do in
+        # the .xml files as the CoA is not yet installed.
+        jobj = self.pool.get('pos.config')
+        pos_config = jobj.browse(cr, uid, config_id, context=context)
+        context.update({'company_id': pos_config.shop_id.company_id.id})
+        if not pos_config.journal_id:
+            jid = jobj.default_get(cr, uid, ['journal_id'], context=context)['journal_id']
+            if jid:
+                jobj.write(cr, uid, [pos_config.id], {'journal_id': jid}, context=context)
+            else:
+                raise osv.except_osv( _('error!'),
+                    _("Unable to open the session. You have to assign a sale journal to your point of sale."))
+
+        # define some cash journal if no payment method exists
+        if not pos_config.journal_ids:
+            journal_proxy = self.pool.get('account.journal')
+            cashids = journal_proxy.search(cr, uid, [('journal_user', '=', True), ('type','=','cash')], context=context)
+            if not cashids:
+                cashids = journal_proxy.search(cr, uid, [('type', '=', 'cash')], context=context)
                 if not cashids:
-                    cashids = self.pool.get('account.journal').search(cr, uid, [('type','=','cash')], context=context)
-                    self.pool.get('account.journal').write(cr, uid, cashids, {'journal_user': True})
-                jobj.write(cr, uid, [pos_config.id], {'journal_ids': [(6,0, cashids)]})
+                    cashids = journal_proxy.search(cr, uid, [('journal_user','=',True)], context=context)
+
+            jobj.write(cr, uid, [pos_config.id], {'journal_ids': [(6,0, cashids)]})
 
 
-            pos_config = jobj.browse(cr, uid, config_id, context=context)
-            bank_statement_ids = []
-            for journal in pos_config.journal_ids:
-                bank_values = {
-                    'journal_id' : journal.id,
-                    'user_id' : uid,
-                }
-                statement_id = self.pool.get('account.bank.statement').create(cr, uid, bank_values, context=context)
-                bank_statement_ids.append(statement_id)
+        pos_config = jobj.browse(cr, uid, config_id, context=context)
+        bank_statement_ids = []
+        for journal in pos_config.journal_ids:
+            bank_values = {
+                'journal_id' : journal.id,
+                'user_id' : uid,
+                'company_id' : pos_config.shop_id.company_id.id
+            }
+            statement_id = self.pool.get('account.bank.statement').create(cr, uid, bank_values, context=context)
+            bank_statement_ids.append(statement_id)
 
-            values.update({
-                'name' : pos_config.sequence_id._next(),
-                'statement_ids' : [(6, 0, bank_statement_ids)],
-                'config_id': config_id
-            })
+        values.update({
+            'name' : pos_config.sequence_id._next(),
+            'statement_ids' : [(6, 0, bank_statement_ids)],
+            'config_id': config_id
+        })
 
         return super(pos_session, self).create(cr, uid, values, context=context)
 
@@ -353,6 +354,29 @@ class pos_session(osv.osv):
                 statement.unlink(context=context)
         return True
 
+
+    def open_cb(self, cr, uid, ids, context=None):
+        """
+        call the Point Of Sale interface and set the pos.session to 'opened' (in progress)
+        """
+        if context is None:
+            context = dict()
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        this_record = self.browse(cr, uid, ids[0], context=context)
+        this_record._workflow_signal('open')
+
+        context.update(active_id=this_record.id)
+
+        return {
+            'type' : 'ir.actions.client',
+            'name' : _('Start Point Of Sale'),
+            'tag' : 'pos.ui',
+            'context' : context,
+        }
+
     def wkf_action_open(self, cr, uid, ids, context=None):
         # second browse because we need to refetch the data from the DB for cash_register_id
         for record in self.browse(cr, uid, ids, context=context):
@@ -372,10 +396,8 @@ class pos_session(osv.osv):
     def wkf_action_closing_control(self, cr, uid, ids, context=None):
         for session in self.browse(cr, uid, ids, context=context):
             for statement in session.statement_ids:
-                if statement.id <> session.cash_register_id.id:
-                    if statement.balance_end<>statement.balance_end_real:
-                        self.pool.get('account.bank.statement').write(cr, uid,
-                            [statement.id], {'balance_end_real': statement.balance_end})
+                if (statement != session.cash_register_id) and (statement.balance_end != statement.balance_end_real):
+                    self.pool.get('account.bank.statement').write(cr, uid, [statement.id], {'balance_end_real': statement.balance_end})
         return self.write(cr, uid, ids, {'state' : 'closing_control', 'stop_at' : time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
 
     def wkf_action_close(self, cr, uid, ids, context=None):
@@ -388,7 +410,7 @@ class pos_session(osv.osv):
                     if not self.pool.get('ir.model.access').check_groups(cr, uid, "point_of_sale.group_pos_manager"):
                         raise osv.except_osv( _('Error!'),
                             _("Your ending balance is too different from the theorical cash closing (%.2f), the maximum allowed is: %.2f. You can contact your manager to force it.") % (st.difference, st.journal_id.amount_authorized_diff))
-                if st.difference:
+                if st.difference and st.journal_id.cash_control == True:
                     if st.difference > 0.0:
                         name= _('Point of Sale Profit')
                         account_id = st.journal_id.profit_account_id.id
@@ -406,6 +428,9 @@ class pos_session(osv.osv):
                         'account_id': account_id
                     }, context=context)
 
+                if st.journal_id.type == 'bank':
+                    st.write({'balance_end_real' : st.balance_end})
+
                 getattr(st, 'button_confirm_%s' % st.journal_id.type)(context=context)
         self._confirm_orders(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state' : 'closed'}, context=context)
@@ -429,7 +454,7 @@ class pos_session(osv.osv):
             self.pool.get('pos.order')._create_account_move_line(cr, uid, order_ids, session, move_id, context=context)
 
             for order in session.order_ids:
-                if order.state != 'paid':
+                if order.state not in ('paid', 'invoiced'):
                     raise osv.except_osv(
                         _('Error!'),
                         _("You cannot confirm all orders of this session, because they have not the 'paid' status"))
@@ -443,10 +468,10 @@ class pos_session(osv.osv):
             context = {}
         if not ids:
             return {}
-        context.update({'session_id' : ids[0]})
+        context.update({'active_id': ids[0]})
         return {
             'type' : 'ir.actions.client',
-            'name' : 'Start Point Of Sale',
+            'name' : _('Start Point Of Sale'),
             'tag' : 'pos.ui',
             'context' : context,
         }
@@ -465,7 +490,8 @@ class pos_order(osv.osv):
                 'name': order['name'],
                 'user_id': order['user_id'] or False,
                 'session_id': order['pos_session_id'],
-                'lines': order['lines']
+                'lines': order['lines'],
+                'pos_reference':order['name']
             }, context)
 
             for payments in order['statement_ids']:
@@ -473,17 +499,26 @@ class pos_order(osv.osv):
                 self.add_payment(cr, uid, order_id, {
                     'amount': payment['amount'] or 0.0,
                     'payment_date': payment['name'],
+                    'statement_id': payment['statement_id'],
                     'payment_name': payment.get('note', False),
                     'journal': payment['journal_id']
                 }, context=context)
 
             if order['amount_return']:
                 session = self.pool.get('pos.session').browse(cr, uid, order['pos_session_id'], context=context)
+                cash_journal = session.cash_journal_id
+                cash_statement = False
+                if not cash_journal:
+                    cash_journal_ids = filter(lambda st: st.journal_id.type=='cash', session.statement_ids)
+                    if not len(cash_journal_ids):
+                        raise osv.except_osv( _('error!'),
+                            _("No cash statement found for this session. Unable to record returned cash."))
+                    cash_journal = cash_journal_ids[0].journal_id
                 self.add_payment(cr, uid, order_id, {
                     'amount': -order['amount_return'],
                     'payment_date': time.strftime('%Y-%m-%d %H:%M:%S'),
                     'payment_name': _('return'),
-                    'journal': session.cash_journal_id.id
+                    'journal': cash_journal.id,
                 }, context=context)
             order_ids.append(order_id)
             wf_service = netsvc.LocalService("workflow")
@@ -573,7 +608,7 @@ class pos_order(osv.osv):
         'picking_id': fields.many2one('stock.picking', 'Picking', readonly=True),
         'note': fields.text('Internal Notes'),
         'nb_print': fields.integer('Number of Print', readonly=True),
-
+        'pos_reference': fields.char('Receipt Ref', size=64, readonly=True),
         'sale_journal': fields.related('session_id', 'config_id', 'journal_id', relation='account.journal', type='many2one', string='Sale Journal', store=True, readonly=True),
     }
 
@@ -683,21 +718,15 @@ class pos_order(osv.osv):
         """Create a new payment for the order"""
         if not context:
             context = {}
-        statement_obj = self.pool.get('account.bank.statement')
         statement_line_obj = self.pool.get('account.bank.statement.line')
-        prod_obj = self.pool.get('product.product')
         property_obj = self.pool.get('ir.property')
-        curr_c = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
-        curr_company = curr_c.id
         order = self.browse(cr, uid, order_id, context=context)
         args = {
             'amount': data['amount'],
+            'date': data.get('payment_date', time.strftime('%Y-%m-%d')),
+            'name': order.name + ': ' + (data.get('payment_name', '') or ''),
         }
-        if 'payment_date' in data:
-            args['date'] = data['payment_date']
-        args['name'] = order.name
-        if data.get('payment_name', False):
-            args['name'] = args['name'] + ': ' + data['payment_name']
+
         account_def = property_obj.get(cr, uid, 'property_account_receivable', 'res.partner', context=context)
         args['account_id'] = (order.partner_id and order.partner_id.property_account_receivable \
                              and order.partner_id.property_account_receivable.id) or (account_def and account_def.id) or False
@@ -712,14 +741,15 @@ class pos_order(osv.osv):
 
         context.pop('pos_session_id', False)
 
-        try:
-            journal_id = long(data['journal'])
-        except Exception:
-            journal_id = False
+        journal_id = data.get('journal', False)
+        statement_id = data.get('statement_id', False)
+        assert journal_id or statement_id, "No statement_id or journal_id passed to the method!"
 
-        statement_id = False
         for statement in order.session_id.statement_ids:
-            if statement.journal_id.id == journal_id:
+            if statement.id == statement_id:
+                journal_id = statement.journal_id.id
+                break
+            elif statement.journal_id.id == journal_id:
                 statement_id = statement.id
                 break
 
@@ -731,15 +761,11 @@ class pos_order(osv.osv):
             'pos_statement_id' : order_id,
             'journal_id' : journal_id,
             'type' : 'customer',
-            'ref' : order.name,
+            'ref' : order.session_id.name,
         })
 
         statement_line_obj.create(cr, uid, args, context=context)
 
-        wf_service = netsvc.LocalService("workflow")
-        wf_service.trg_validate(uid, 'pos.order', order_id, 'paid', cr)
-        wf_service.trg_write(uid, 'pos.order', order_id, cr)
-
         return statement_id
 
     def refund(self, cr, uid, ids, context=None):
@@ -1084,6 +1110,7 @@ class account_bank_statement_line(osv.osv):
     _columns= {
         'pos_statement_id': fields.many2one('pos.order', ondelete='cascade'),
     }
+
 account_bank_statement_line()
 
 class pos_order_line(osv.osv):
@@ -1217,29 +1244,27 @@ class pos_category(osv.osv):
         'child_id': fields.one2many('pos.category', 'parent_id', string='Children Categories'),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."),
         
-        # NOTE:  there is no 'default image', because by default we don't show thumbnails for categories. However if we have a thumbnail
+        # NOTE: there is no 'default image', because by default we don't show thumbnails for categories. However if we have a thumbnail
         # for at least one category, then we display a default image on the other, so that the buttons have consistent styling.
-        # In this case, the default image is set by the js code. 
-
+        # In this case, the default image is set by the js code.
+        # NOTE2: image: all image fields are base64 encoded and PIL-supported
         'image': fields.binary("Image",
-            help="This field holds the image used for the category. "\
-                 "The image is base64 encoded, and PIL-supported. "\
-                 "It is limited to a 1024x1024 px image."),
+            help="This field holds the image used as image for the cateogry, limited to 1024x1024px."),
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
             string="Medium-sized image", type="binary", multi="_get_image",
-            store = {
+            store={
                 'pos.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized image of the category. It is automatically "\
-                 "resized as a 180x180 px image, with aspect ratio preserved. "\
+                 "resized as a 128x128px image, with aspect ratio preserved. "\
                  "Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Smal-sized image", type="binary", multi="_get_image",
-            store = {
+            store={
                 'pos.category': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized image of the category. It is automatically "\
-                 "resized as a 50x50 px image, with aspect ratio preserved. "\
+                 "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
     }
 
@@ -1248,7 +1273,7 @@ import io, StringIO
 class ean_wizard(osv.osv_memory):
     _name = 'pos.ean_wizard'
     _columns = {
-        'ean13_pattern': fields.char('Ean13 Pattern', size=32, required=True, translate=True),
+        'ean13_pattern': fields.char('Reference', size=32, required=True, translate=True),
     }
     def sanitize_ean13(self, cr, uid, ids, context):
         for r in self.browse(cr,uid,ids):
@@ -1278,19 +1303,41 @@ class product_product(osv.osv):
     #    return result
 
     _columns = {
-        'income_pdt': fields.boolean('Point of Sale Cash In', help="This is a product you can use to put cash into a statement for the point of sale backend."),
-        'expense_pdt': fields.boolean('Point of Sale Cash Out', help="This is a product you can use to take cash from a statement for the point of sale backend, exemple: money lost, transfer to bank, etc."),
+        'income_pdt': fields.boolean('Point of Sale Cash In', help="Check if, this is a product you can use to put cash into a statement for the point of sale backend."),
+        'expense_pdt': fields.boolean('Point of Sale Cash Out', help="Check if, this is a product you can use to take cash from a statement for the point of sale backend, example: money lost, transfer to bank, etc."),
         'pos_categ_id': fields.many2one('pos.category','Point of Sale Category',
             help="If you want to sell this product through the point of sale, select the category it belongs to."),
-        'to_weight' : fields.boolean('To Weight', help="This category contains products that should be weighted, mainly used for the self-checkout interface"),
+        'to_weight' : fields.boolean('To Weigh', help="Check if the product should be weighted (mainly used with self check-out interface)."),
     }
+
+    def _default_pos_categ_id(self, cr, uid, context=None):
+        proxy = self.pool.get('ir.model.data')
+
+        try:
+            category_id = proxy.get_object_reference(cr, uid, 'point_of_sale', 'categ_others')[1]
+        except ValueError:
+            values = {
+                'name' : 'Others',
+            }
+            category_id = self.pool.get('pos.category').create(cr, uid, values, context=context)
+            values = {
+                'name' : 'categ_others',
+                'model' : 'pos.category',
+                'module' : 'point_of_sale',
+                'res_id' : category_id,
+            }
+            proxy.create(cr, uid, values, context=context)
+
+        return category_id
+
     _defaults = {
         'to_weight' : False,
+        'pos_categ_id' : _default_pos_categ_id,
     }
 
     def edit_ean(self, cr, uid, ids, context):
         return {
-            'name': "Edit Ean",
+            'name': _("Assign a Custom EAN"),
             'type': 'ir.actions.act_window',
             'view_type': 'form',
             'view_mode': 'form',
diff --git a/addons/point_of_sale/point_of_sale_data.xml b/addons/point_of_sale/point_of_sale_data.xml
index dda0b78e952..01d8dd9ff60 100644
--- a/addons/point_of_sale/point_of_sale_data.xml
+++ b/addons/point_of_sale/point_of_sale_data.xml
@@ -7,31 +7,24 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('menu_point_root')}"/>
         </record>
-        <record id="todo_open_pos_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_pos_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
         </record>
         <record model="pos.config" id="pos_config_main">
             <field name="name">Main</field>
         </record>
-    </data>
-    <data>
-        <record id="sale.todo_open_sale_menu" model="ir.actions.todo">
-            <field name="state">done</field>
-        </record>
-    </data>
 
-    <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Point of Sale has been installed</value>
-            <value>Encode sale orders, register payments, compute money to return, create invoices, and manage refunds of former sales through a specific, web-based, touch-screen user interface.
-
-If you install the PoS proxy, you will be able to interface OpenERP with retail materials; barcode scanners, printers, cash registers, weighing machine, credit card payments.</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Point of Sale application installed!</field>
+            <field name="body"><![CDATA[<p>Record sale orders, register payments, compute change to return, create invoices, and manage refunds through a specific web touch-screen interface.</p>
+<p>If you install the PoS proxy you will be able to interface OpenERP with retail hardware: barcode scanners, printers, cash registers, weighing machines, credit card payment terminals.</p>]]></field>
+        </record>
 
         <record id="unreferenced_product" model="product.product">
           <field name="list_price">1.00</field>
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index db8caaadf3b..faa3927a9c4 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -6,34 +6,22 @@
         </record>
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
-            <field name="ean13">0410200000005</field>
+            <field name="ean13">0420100000005</field>
         </record>
-    	  <record id="account.cash_journal" model="account.journal">
+        <record id="account.cash_journal" model="account.journal">
             <field eval="True" name="journal_user"/>
         </record>
-        <record id="base.user_jsmith" model="res.users">
-            <field name="name">John Smith (Cashier)</field>
-            <field name="login">jsmith</field>
-            <field name="ean13">0410300000004</field>
+        <record id="base.user_root" model="res.users">
+            <field name="ean13">0410100000006</field>
             <field name="groups_id" eval="[(4,ref('group_pos_manager'))]"/>
         </record>
-        <record id="base.user_jdoe" model="res.users">
-            <field name="name">John Doe (Cashier)</field>
-            <field name="login">jdoe</field>
-            <field name="ean13">0410400000003</field>
-            <field name="groups_id" eval="[(4,ref('group_pos_manager'))]"/>
-        </record>
-        <record id="base.user_jbloggs" model="res.users">
-            <field name="name">Joe Bloggs (Client)</field>
-            <field name="login">jbloggs</field>
+        <record id="base.user_demo" model="res.users">
             <field name="ean13">0420100000005</field>
-            <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
+            <field name="groups_id" eval="[(4,ref('group_pos_manager'))]"/>
         </record>
-        <record id="base.user_bsoap" model="res.users">
-            <field name="name">Bob Soap (Client)</field>
-            <field name="login">bsoap</field>
-            <field name="ean13">0420200000004</field>
-            <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
+
+        <record model="pos.config" id="pos_config_main">
+            <field name="journal_ids" eval="[(6, 0, [ref('account.cash_journal'), ref('account.bank_journal')])]" />
         </record>
 
         <!-- Resource: pos.category -->
@@ -201,6 +189,7 @@
         <record id="citron" model="product.product">
           <field name="list_price">1.98</field>
           <field name="name">Lemon</field>
+          <field name="ean13">2301000000006</field>
           <field name="to_weight">True</field>
           <field name="pos_categ_id" ref="autres_agrumes"/>
           <field name="uom_id" ref="product.product_uom_kgm" />
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 6487eebbe4f..9d58ee5c473 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -88,6 +88,7 @@
                                 <field name="user_id"/>
                                 <field name="pricelist_id" groups="product.group_sale_pricelist" domain="[('type','=','sale')]"/>
                                 <field name="picking_id" readonly="1"/>
+                                <field name="pos_reference"/>
                             </group>
                             <group string="Accounting Information">
                                 <field name="sale_journal" domain="[('type','=','sale')]"/>
@@ -126,11 +127,12 @@
             </field>
         </record>
         <record model="ir.ui.view" id="view_pos_order_tree">
-            <field name="name">Sales</field>
+            <field name="name">Orders</field>
             <field name="model">pos.order</field>
             <field name="arch" type="xml">
                 <tree string="POS Orders" colors="blue:state == 'draft';gray:state in ('done','cancel');black:state not in('done','cancel')">
                     <field name="name"/>
+                    <field name="pos_reference"/>
                     <field name="partner_id"/>
                     <field name="date_order"/>
                     <field name="user_id"/>
@@ -138,6 +140,7 @@
                     <field name="amount_total" sum="Amount total"/>
                     <field name="company_id" groups="base.group_multi_company"/>
                     <field name="state"/>
+                    <field name="session_id" />
                 </tree>
             </field>
         </record>
@@ -148,6 +151,7 @@
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order"/>
                     <field name="date_order"/>
+                    <field name="pos_reference"/>
                     <filter icon="terp-document-new" string="New" domain="[('state','=','draft')]"/>
                     <filter icon="gtk-apply" string="Done" domain="[('state','in',('paid','invoiced','done'))]"/>
                     <filter icon="terp-check" string="Invoiced" domain="[('state','=','invoiced')]"/>
@@ -607,35 +611,21 @@
             <field name="domain">[('date_order','like',time.strftime('%Y-%m'))]</field>
         </record>
 
-        <record id="product_normal_form_pos_view" model="ir.ui.view">
-            <field name="name">product.normal.pos.form.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                  <group name="status" position="after">
-                      <group name="pos" string="Point of Sale">
-                          <field name="pos_categ_id"/>
-                          <field name="to_weight" />
-                      </group>
-                  </group>
-            </field>
-        </record>
-
-
         <record id="product_normal_form_view" model="ir.ui.view">
             <field name="name">product.normal.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
-                <group name="misc" position="after">
-                    <group name="pos" colspan="2" col="2">
-                        <separator string="Point of Sale" colspan="2"/>
+                <group name="sale" position="inside">
+                    <group name="pos" string="Point of Sale">
+                        <field name="pos_categ_id"/>
+                        <field name="to_weight" />
                         <field name="income_pdt"/>
                         <field name="expense_pdt"/>
                     </group>
                 </group>
                 <field name="ean13" position="after">
-                    <button name="edit_ean" type="object" string="Edit" />
+                    <button name="edit_ean" type="object" string="Set a Custom EAN" class="oe_link oe_edit_only"/>
                 </field>
             </field>
         </record>
@@ -791,8 +781,7 @@
                                 <field name="code" />
                                 <field name="name" />
                                 <field name="type" />
-                                <field name="opening_control" />
-                                <field name="closing_control" />
+                                <field name="cash_control" />
                             </tree>
                         </field>
                         <group string="Material Interfaces" >
@@ -876,14 +865,19 @@
             <field name="arch" type="xml">
                 <form string="Point of Sale Session" version="7.0">
                     <header>
-                        <button name="open" type="workflow" string="Validate &amp; Open Session" states="opening_control" class="oe_highlight"/>
-                        <button name="cashbox_control" type="workflow" string="End of Session" states="opened"
+                        <button name="open_cb" type="object" string="Validate &amp; Open Session" states="opening_control" class="oe_highlight"/>
+                        <button name="open_frontend_cb" type="object" string="Continue Selling" states="opened"
                             class="oe_highlight"/>
+                        <button name="cashbox_control" type="workflow" string="End of Session"
+                            attrs="{'invisible' : ['|', ('cash_control', '=', False),('state', '!=', 'opened')]}" 
+                            class="oe_highlight" />
+                        <button name="close" type="workflow" string="Validate Closing &amp; Post Entries"
+                            attrs="{'invisible' : ['|', ('cash_control', '=', True),('state', '!=', 'opened')]}"
+                            class="oe_highlight" />
                         <button name="close" type="workflow" string="Validate Closing &amp; Post Entries" states="closing_control"
-                            class="oe_highlight"/>
-                        <button name="open_frontend_cb" type="object" string="Continue Selling" states="opened"/>
+                            class="oe_highlight" />
                         <div class="oe_right">
-                            <field name="state" widget="statusbar" statusbar_visible="opening_control,opened,closing_control,closed" nolabel="1"/>
+                            <field name="state" widget="statusbar" statusbar_visible="opening_control,opened,closing_control,closed" nolabel="1" />
                         </div>
                     </header>
                     <sheet>
@@ -895,46 +889,44 @@
                             Session:
                             <field name="name" attrs="{'invisible': [('name','=','/')]}" class="oe_inline"/>
                         </h1>
-                        <field name="has_opening_control" invisible="1" />
-                        <field name="has_closing_control" invisible="1" />
                         <group>
+                            <field name="cash_control" invisible="1" />
                             <group>
                                 <field name="user_id"/>
-                                <field name="config_id" attrs="{'invisible' : [('config_id', '&lt;&gt;', False)]}"/>
+                                <field name="config_id"/>
                             </group>
                             <group>
                                 <field name="start_at" attrs="{'invisible' : [('state', '=', 'opening_control')]}"/>
-                                <field name="stop_at" attrs="{'invisible' : [('state', '&lt;&gt;', 'closed')]}"/>
+                                <field name="stop_at" attrs="{'invisible' : [('state', '!=', 'closed')]}"/>
                             </group>
                             <newline/>
-
-                            <group string="Opening Cash Control">
+                            <group string="Opening Cash Control" attrs="{'invisible' : [('cash_control', '=', False)]}">
                                 <field name="opening_details_ids" nolabel="1" colspan="2" attrs="{'readonly' : [('state', 'not in', ('opening_control',))]}">
                                     <tree string="Opening Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
-                                        <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening)" />
+                                        <field name="number_opening" on_change="on_change_sub_opening(pieces, number_opening)" />
                                         <field name="subtotal_opening" string="Opening Subtotal" sum="Total"/>
                                     </tree>
                                 </field>
                             </group>
-                            <group string="Closing Cash Control" attrs="{'invisible': [('state', '=', 'opening_control')]}">
+                            <group string="Closing Cash Control" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'opening_control')]}">
                                 <field name="details_ids" nolabel="1" colspan="2">
                                     <tree string="Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
-                                        <field name="number_closing"/>
+                                        <field name="number_closing" />
                                         <field name="subtotal_closing"/>
                                     </tree>
                                 </field>
                             </group>
 
-                            <div>
+                            <div attrs="{'invisible' : [('cash_control', '=', False)]}">
                                 <group class="oe_subtotal_footer oe_right">
                                     <field name="cash_register_balance_start" readonly="1" string="Opening Balance" class="oe_subtotal_footer_separator"/>
                                     <field name="cash_register_total_entry_encoding"  attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="+ Transactions"/>
                                     <field name="cash_register_balance_end" attrs="{'invisible' : [('state', '=', 'opening_control')]}" string="= Theorical Balance"/>
                                 </group>
                                 <div class="oe_clear"/>
-                                <div attrs="{'invisible' : [('cash_journal_id', '=', False)]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">
+                                <div attrs="{'invisible' : ['|', ('cash_journal_id', '=', False), ('state', '!=', 'opening_control')]}" class="oe_view_nocontent" groups="point_of_sale.group_pos_manager">
                                     <p class="oe_view_nocontent_create">
                                     You can define another list of available currencies on the
                                     <i>Cash Registers</i> tab of the <b><field name="cash_journal_id" class="oe_inline"/></b>
@@ -944,7 +936,7 @@
                             </div>
 
 
-                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible' : [('state', '=', 'opening_control')]}">
+                            <group class="oe_subtotal_footer oe_right" attrs="{'invisible': ['|', ('cash_control', '=', False), ('state', '=', 'opening_control')]}">
                                 <field name="cash_register_balance_end_real" class="oe_subtotal_footer_separator"/>
                                 <field name="cash_register_difference"  class="oe_subtotal_footer_separator"/>
                             </group>
@@ -959,7 +951,7 @@
                                 <field name="total_entry_encoding" />
                                 <field name="balance_end_real" />
                                 <field name="difference" />
-                                <field name="currency" />
+                                <field name="currency" groups="base.group_multi_currency" />
                                 <field name="state" />
                             </tree>
                         </field>
@@ -1046,11 +1038,11 @@
                     <filter icon="gtk-convert" string="Posted" domain="[('state','=','done')]"/>
                     <field name="user_id"/>
                     <field name="session_id"/>
-                    <group expand="0" string="Group By..." groups="base.group_extended">
+                    <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Session" icon="terp-personal" domain="[]" context="{'group_by':'session_id'}"/>
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_order'}"/>
                     </group>
                 </search>
@@ -1064,12 +1056,19 @@
         <record model="ir.ui.view" id="pos_ean13_generator">
             <field name="name">pos.ean_wizard</field>
             <field name="model">pos.ean_wizard</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Ean13 Generator" version="7.0">  
-                    <field name="ean13_pattern"/>
+                    <p class="oe_grey">
+                        Enter a reference for this product, it will be converted
+                        automatically to a valid EAN number.
+                    </p>
+                    <group>
+                        <field name="ean13_pattern" class="oe_inline"/>
+                    </group>
                     <footer>
-                        <button name="sanitize_ean13" type="object" string="Apply"/>
+                        <button name="sanitize_ean13" type="object" string="Apply" class="oe_highlight"/> or 
+                         <button icon="gtk-stop" special="cancel"
+                            string="Cancel" class="oe_link"/>
                     </footer>
                 </form>
             </field>
diff --git a/addons/point_of_sale/point_of_sale_workflow.xml b/addons/point_of_sale/point_of_sale_workflow.xml
index 87deb7f18fb..ad7b149f6bc 100644
--- a/addons/point_of_sale/point_of_sale_workflow.xml
+++ b/addons/point_of_sale/point_of_sale_workflow.xml
@@ -126,14 +126,14 @@
       <field name="act_from" ref="act_start" />
       <field name="act_to" ref="act_opening_control" />
       <field name="signal" eval="False" /> <!-- >start_to_opening_control</field> -->
-      <field name="condition">has_opening_control == True</field>
+      <field name="condition">cash_control == True</field>
     </record>
 
     <record model="workflow.transition" id="trans_start_to_open">
       <field name="act_from" ref="act_start" />
       <field name="act_to" ref="act_open" />
       <field name="signal" eval="False" />
-      <field name="condition">has_opening_control == False</field>
+      <field name="condition">cash_control == False</field>
     </record>
     <!-- state:opening_control -> signal:open -> state:opened -> signal:cashbox_control -> state:closing_control -> signal:close -> state:close -->
 
@@ -147,14 +147,14 @@
       <field name="act_from" ref="act_open" />
       <field name="act_to" ref="act_closing_control" />
       <field name="signal">cashbox_control</field>
-      <field name="condition">has_closing_control == True</field>
+      <field name="condition">cash_control == True</field>
     </record>
 
     <record model="workflow.transition" id="trans_open_to_close">
       <field name="act_from" ref="act_open" />
-      <field name="act_to" ref="act_close" />
+      <field name="act_to" ref="act_closing_control" />
       <field name="signal">close</field>
-      <field name="condition">has_closing_control == False</field>
+      <field name="condition">cash_control == False</field>
     </record>
 
     <record model="workflow.transition" id="trans_closing_control_to_close">
@@ -163,5 +163,13 @@
       <field name="signal">close</field>
     </record>
 
+    <record model="workflow.transition" id="trans_closing_control_to_close_no_control">
+      <field name="act_from" ref="act_closing_control" />
+      <field name="act_to" ref="act_close" />
+      <field name="condition">cash_control == False</field>
+    </record>
+
+
+
   </data>
 </openerp>
diff --git a/addons/point_of_sale/report/account_statement.py b/addons/point_of_sale/report/account_statement.py
index be5d4b3a330..c1fc73a35d7 100644
--- a/addons/point_of_sale/report/account_statement.py
+++ b/addons/point_of_sale/report/account_statement.py
@@ -48,4 +48,4 @@ class account_statement(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.account.statement', 'account.bank.statement', 'addons/statement/report/account_statement.rml', parser=account_statement,header='internal')
 
-# 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/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index dc6e6c5e64c..0b633f3f7c4 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -214,10 +214,10 @@
           <para style="terp_default_Centre_8">[[ formatLang(statement.closing_date,date_time=True)]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, dp='Account') ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_start, dp='Account', currency_obj = company.currency_id) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, dp='Account') ]][[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(statement.balance_end_real, dp='Account', currency_obj = company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -250,7 +250,7 @@
               <para style="terp_default_9">[[ line_ids.partner_id.name ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(line_ids.amount, dp='Account') ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids.amount, dp='Account', currency_obj=company.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -267,7 +267,7 @@
           <para style="terp_tblheader_Details">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids), dp='Account') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement.line_ids), dp='Account', currency_obj = company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
index 4f342099a59..dc3b432728f 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -38,13 +38,13 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
                 'get_net_total_starting':self._get_net_total_starting,
         })
 
-    def _get_user(self,line_ids):
+    def _get_user(self, line_ids):
         sql = "select name from res_users where id = %d"%(line_ids['create_uid'])
         self.cr.execute(sql)
         user = self.cr.fetchone()
         return user[0]
 
-    def _get_data(self,user):
+    def _get_data(self, user):
         data = {}
         sql = """ SELECT abs.journal_id,abs.id,abs.date,abs.closing_date,abs.name as statement,aj.name as journal,ap.name as period,ru.name as user,rc.name as company,
                        abs.state,abs.balance_end_real FROM account_bank_statement as abs
@@ -57,7 +57,7 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
         data = self.cr.dictfetchall()
         return data
 
-    def _get_lines(self,statement):
+    def _get_lines(self, statement):
         data = {}
         sql = """ select absl.* from account_bank_statement_line as absl, account_bank_statement as abs
                            where absl.statement_id = abs.id and abs.id = %d"""%(statement['id'])
@@ -65,7 +65,7 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
         data = self.cr.dictfetchall()
         return data
 
-    def _get_bal(self,data):
+    def _get_bal(self, data):
         res = {}
         sql =""" select sum(pieces*number) as bal from account_cashbox_line where starting_id = %d """%(data['id'])
         self.cr.execute(sql)
@@ -73,9 +73,9 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
         if res:
             return res[0]['bal']
         else:
-            return False
+            return 0
 
-    def _get_sub_total(self,user,data,date):
+    def _get_sub_total(self, user, data, date):
         res={}
         self.cr.execute(""" select sum(absl.amount) from account_bank_statement as abs
                             LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
@@ -90,7 +90,7 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
         else:
             return False
 
-    def _get_partner(self,statement):
+    def _get_partner(self, statement):
         res = {}
         if statement['pos_statement_id']:
             sql =""" select rp.name  from account_bank_statement_line as absl,res_partner as rp
@@ -102,7 +102,7 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
         else:
             return 0.00
 
-    def _get_net_total_starting(self,user):
+    def _get_net_total_starting(self, user):
         lst = []
         res={}
         total_ending_bal = 0.0
@@ -124,7 +124,7 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
         lst.append(total_starting_bal)
         return lst
 
-    def _get_net_total(self,user):
+    def _get_net_total(self, user):
         res={}
         sql = """select sum(absl.amount) as net_total from account_bank_statement as abs
                     LEFT JOIN account_bank_statement_line as absl ON abs.id = absl.statement_id
@@ -137,4 +137,4 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.all.closed.cashbox.of.the.day', 'account.bank.statement', 'addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml', parser=all_closed_cashbox_of_the_day,header='internal')
 
-# 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/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
index bb58c5e823d..4f16031c8b3 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
@@ -183,10 +183,10 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]</u></para>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total_starting(user)[1], currency_obj = company.currency_id)]]</u></para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]</u></para>
+          <para style="terp_tblheader_General_Right"><u>[[ formatLang(get_net_total(user), currency_obj = company.currency_id)]]</u></para>
         </td>
       </tr>
     </blockTable>
@@ -207,10 +207,10 @@
             <para style="terp_default_Bold_8">[[ statement['closing_date'] ]]</para>
           </td>
           <td>
-            <para style="P1"><u>[[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]</u></para>
+            <para style="P1"><u>[[ formatLang(get_bal(statement), currency_obj = company.currency_id)]]</u></para>
           </td>
           <td>
-            <para style="P1"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]</u></para>
+            <para style="P1"><u>[[ formatLang(get_sub_total(user,statement['journal_id'],statement['date']), currency_obj = company.currency_id )]]</u></para>
           </td>
         </tr>
       </blockTable>
@@ -236,7 +236,7 @@
               </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(line_ids['amount']) ]] [[company.currency_id.symbol]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids['amount'], currency_obj = company.currency_id)]]</para>
             </td>
           </tr>
         </blockTable>
diff --git a/addons/point_of_sale/report/pos_details.py b/addons/point_of_sale/report/pos_details.py
index d13c127165e..293eeb722a3 100644
--- a/addons/point_of_sale/report/pos_details.py
+++ b/addons/point_of_sale/report/pos_details.py
@@ -24,7 +24,7 @@ from report import report_sxw
 
 class pos_details(report_sxw.rml_parse):
 
-    def _get_invoice(self,inv_id):
+    def _get_invoice(self, inv_id):
         res={}
         if inv_id:
             self.cr.execute("select number from account_invoice as ac where id = %s", (inv_id,))
@@ -37,7 +37,7 @@ class pos_details(report_sxw.rml_parse):
         user_obj = self.pool.get('res.users')
         return user_obj.search(self.cr, self.uid, [])
 
-    def _pos_sales_details(self,form):
+    def _pos_sales_details(self, form):
         pos_obj = self.pool.get('pos.order')
         user_obj = self.pool.get('res.users')
         data = []
@@ -74,7 +74,7 @@ class pos_details(report_sxw.rml_parse):
     def _get_sales_total_2(self):
         return self.total
 
-    def _get_sum_invoice_2(self,form):
+    def _get_sum_invoice_2(self, form):
         pos_obj = self.pool.get('pos.order')
         user_obj = self.pool.get('res.users')
         user_ids = form['user_ids'] or self._get_all_users()
@@ -91,16 +91,17 @@ class pos_details(report_sxw.rml_parse):
     def _get_sum_dis_2(self):
         return self.discount or 0.0
 
-    def _get_sum_discount(self, objects):
+    def _get_sum_discount(self, form):
         #code for the sum of discount value
-        return reduce(lambda acc, object:
-                                        acc + reduce(
-                                                lambda sum_dis, line:
-                                                        sum_dis + ((line.price_unit * line.qty) * (line.discount / 100)),
-                                                object.lines,
-                                                0.0),
-                                    objects,
-                                    0.0)
+        pos_obj = self.pool.get('pos.order')
+        user_obj = self.pool.get('res.users')
+        user_ids = form['user_ids'] or self._get_all_users()
+        company_id = user_obj.browse(self.cr, self.uid, self.uid).company_id.id
+        pos_ids = pos_obj.search(self.cr, self.uid, [('date_order','>=',form['date_start'] + ' 00:00:00'),('date_order','<=',form['date_end'] + ' 23:59:59'),('user_id','in',user_ids),('company_id','=',company_id)])
+        for pos in pos_obj.browse(self.cr, self.uid, pos_ids):
+            for pol in pos.lines:
+                self.total_discount += ((pol.price_unit * pol.qty) * (pol.discount / 100))
+        return self.total_discount or False
 
     def _get_payments(self, form):
         statement_line_obj = self.pool.get("account.bank.statement.line")
@@ -179,11 +180,12 @@ class pos_details(report_sxw.rml_parse):
         self.qty = 0.0
         self.total_invoiced = 0.0
         self.discount = 0.0
+        self.total_discount = 0.0
         self.localcontext.update({
             'time': time,
             'strip_name': self._strip_name,
             'getpayments': self._get_payments,
-            'getsumdisc': self._get_sum_dis_2,
+            'getsumdisc': self._get_sum_discount,
             'gettotalofthaday': self._total_of_the_day,
             'gettaxamount': self._get_tax_amount,
             'pos_sales_details':self._pos_sales_details,
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index b0019133009..6360dc25b12 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -252,7 +252,7 @@
             <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit'], dp='Sale Price', currency_obj = company.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_Centre_9">[[ formatLang(line_ids['qty']) ]] [[ line_ids['uom'] ]]</para>
@@ -289,7 +289,7 @@
             <para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(p['amount']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(p['amount'], currency_obj = company.currency_id) or removeParentNode('tr') ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -320,7 +320,7 @@
             <para style="terp_default_9">[[ p['name'] or removeParentNode('para') ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(p['sum'], dp='Account') or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(p['sum'], dp='Account', currency_obj = company.currency_id) or removeParentNode('tr') ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -349,7 +349,7 @@
           <para style="terp_default_Bold_9">Sales total(Revenue)</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(getsalestotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsalestotal2(), dp='Sale Price', currency_obj = company.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -365,7 +365,7 @@
           <para style="terp_default_Bold_9">Total invoiced</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(getsuminvoice2(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsuminvoice2(data['form']), dp='Sale Price', currency_obj = company.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -373,15 +373,15 @@
           <para style="terp_default_Bold_9">Total discount</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
-        </td>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(data['form']), dp='Sale Price', currency_obj =  company.currency_id) ]]</para>
+      </td>
       </tr>
       <tr>
         <td>
           <para style="terp_default_Bold_9">Total paid</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(getpaidtotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getpaidtotal2(), dp='Sale Price', currency_obj = company.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -389,7 +389,7 @@
           <para style="terp_default_Bold_9">Total of the day</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(gettotalofthaday(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(gettotalofthaday(data['form']), dp='Sale Price', currency_obj = company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_details_summary.py b/addons/point_of_sale/report/pos_details_summary.py
index a7009ea5972..a917ce99c06 100644
--- a/addons/point_of_sale/report/pos_details_summary.py
+++ b/addons/point_of_sale/report/pos_details_summary.py
@@ -42,7 +42,7 @@ class pos_details_summary(report_sxw.rml_parse):
             'getcompany':self.get_company
         })
 
-    def get_company(self,objects):
+    def get_company(self, objects):
         comp=[obj.company_id.name for obj in objects]
         return '%s' % (comp[0])
 
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index d12cdec2598..b1c71db7d40 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -204,7 +204,7 @@
             <para style="P1">[[ p[0] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ p[1] ]] [[company.currency_id.symbol]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(p[1], currency_obj=company.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -235,7 +235,7 @@
             <para style="P2">[[ t[0] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ '%.2f' % (t[1],) ]] [[company.currency_id.symbol]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(t[1], currency_obj=company.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -280,7 +280,7 @@
           <para style="terp_default_Bold_9">Total invoiced</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ '%.2f' % getsuminvoice(objects) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsuminvoice(objects), currency_obj=company.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -288,7 +288,7 @@
           <para style="terp_default_Bold_9">Total discount</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ '%.2f' % getsumdisc(objects) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getsumdisc(objects), currency_obj=company.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -296,7 +296,7 @@
           <para style="terp_default_Bold_9">Total paid</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ '%.2f' % getpaidtotal(objects) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(getpaidtotal(objects), currency_obj=company.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -304,7 +304,7 @@
           <para style="terp_default_Bold_9">Total of the day</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ '%.2f' % gettotalofthaday(objects) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(gettotalofthaday(objects), currency_obj=company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_lines.py b/addons/point_of_sale/report/pos_lines.py
index 66b52d6ce01..6c48d9e9733 100644
--- a/addons/point_of_sale/report/pos_lines.py
+++ b/addons/point_of_sale/report/pos_lines.py
@@ -41,7 +41,7 @@ class pos_lines(report_sxw.rml_parse):
         self.total = tot
         return self.total
 
-    def __taxes__(self,obj):
+    def __taxes__(self, obj):
         self.cr.execute ( " Select acct.name from pos_order as po " \
                               " LEFT JOIN pos_order_line as pol ON po.id = pol.order_id " \
                               " LEFT JOIN product_taxes_rel as ptr ON pol.product_id = ptr.prod_id " \
@@ -52,4 +52,4 @@ class pos_lines(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.pos.lines', 'pos.order', 'addons/point_of_sale/report/pos_lines.rml', parser=pos_lines,header='internal')
 
-# 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/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index be394ed4f16..1ed8e33eede 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -186,7 +186,7 @@
             <para style="terp_default_Centre_9">[[ formatLang(l.discount) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, currency_obj=o.pricelist_id.currency_id) ]]</para>
           </td>
         </tr>
       </blockTable>
@@ -202,7 +202,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_total, currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -215,7 +215,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -228,7 +228,7 @@
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total + o.amount_tax, currency_obj=o.pricelist_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_order_report.py b/addons/point_of_sale/report/pos_order_report.py
index 27086e08b26..914bef06bbf 100644
--- a/addons/point_of_sale/report/pos_order_report.py
+++ b/addons/point_of_sale/report/pos_order_report.py
@@ -60,7 +60,7 @@ class pos_order_report(osv.osv):
                     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.discount) as total_discount,
+                    sum((l.qty * l.price_unit) * (l.discount / 100)) 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_order) - date_trunc('day',s.create_date),'DD') as int)) as delay_validation,
                     to_char(s.date_order, 'YYYY') as year,
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index fee47312610..8d7bf84171a 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -5,7 +5,7 @@
             <field name="name">report.pos.order.tree</field>
             <field name="model">report.pos.order</field>
             <field name="arch" type="xml">
-                <tree string="Point of Sale Analysis">
+                <tree string="Point of Sale Analysis" create="false">
                     <field name="date" invisible="1"/>
                     <field name="user_id" invisible="1"/>
                     <field name="year" invisible="1"/>
diff --git a/addons/point_of_sale/report/pos_payment_report.py b/addons/point_of_sale/report/pos_payment_report.py
index beadd2d5cb6..1fed98a4852 100644
--- a/addons/point_of_sale/report/pos_payment_report.py
+++ b/addons/point_of_sale/report/pos_payment_report.py
@@ -33,7 +33,7 @@ class pos_payment_report(report_sxw.rml_parse):
             'pos_payment_total':self._pos_payment_total,
         })
 
-    def _pos_payment(self,obj):
+    def _pos_payment(self, obj):
         data={}
         sql = """ select id from pos_order where id = %d"""%(obj.id)
         self.cr.execute(sql)
@@ -56,9 +56,9 @@ class pos_payment_report(report_sxw.rml_parse):
             self.total += d['price_unit'] * d['qty']
         return data
 
-    def _pos_payment_total(self,o):
+    def _pos_payment_total(self, o):
         return self.total
 
 report_sxw.report_sxw('report.pos.payment.report', 'pos.order', 'addons/point_of_sale/report/pos_payment_report.rml', parser=pos_payment_report,header='internal')
 
-# 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/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index 757de687ee0..bcc4b9ec261 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -183,7 +183,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total'], currency_obj = company.currency_id) ]]</para>
           </td>
 
         </tr>
@@ -201,7 +201,7 @@
           <para style="terp_tblheader_Details">Net Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(pos_payment_total(o), currency_obj = company.currency_id) or removeParentNode('blockTable')]]</para>
         </td>
       </tr>
       </blockTable>
diff --git a/addons/point_of_sale/report/pos_payment_report_user.py b/addons/point_of_sale/report/pos_payment_report_user.py
index c90387e4f7a..b347c86da2a 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.py
+++ b/addons/point_of_sale/report/pos_payment_report_user.py
@@ -33,7 +33,7 @@ class pos_payment_report_user(report_sxw.rml_parse):
             'pos_payment_user_total':self.__pos_payment_user__total__,
         })
 
-    def __pos_payment_user__(self,form):
+    def __pos_payment_user__(self, form):
         data={}
         ids = form['user_id']
         sql = "select pt.name,pp.default_code as code,pol.qty,pu.name as uom,pol.discount,pol.price_unit, " \
@@ -61,4 +61,4 @@ class pos_payment_report_user(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.pos.payment.report.user', 'pos.order', 'addons/point_of_sale/report/pos_payment_report_user.rml', parser=pos_payment_report_user,header='internal')
 
-# 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/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
index 3105441aa0c..3671408b760 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -168,7 +168,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line_ids['price_unit']) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line_ids['total'], currency_obj = company.currency_id)]]</para>
           </td>
         </tr>
       </blockTable>
@@ -194,7 +194,7 @@
           <para style="terp_tblheader_General_Right">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(pos_payment_user_total(data['form']), currency_obj = company.currency_id) or removeParentNode('blockTable')]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_receipt.py b/addons/point_of_sale/report/pos_receipt.py
index 93604e755e0..58044c28c77 100644
--- a/addons/point_of_sale/report/pos_receipt.py
+++ b/addons/point_of_sale/report/pos_receipt.py
@@ -34,7 +34,7 @@ class order(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(order, self).__init__(cr, uid, name, context=context)
 
-        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid)
+        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, uid, context=context)
         partner = user.company_id.partner_id
 
         self.localcontext.update({
@@ -74,4 +74,4 @@ class order(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.pos.receipt', 'pos.order', 'addons/point_of_sale/report/pos_receipt.rml', parser=order, header=False)
 
-# 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/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 55873887210..0802114bb48 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -72,8 +72,7 @@
   <story>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
     <para style="terp_header_Centre">[[o.user_id.company_id.name]]</para>
-    <para style="terp_default_Centre_9">[[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]</para>
-    <para style="terp_default_Centre_9">[[ address and address.country_id.name ]]</para>
+    <para style="terp_default_Centre_9">[[ address and display_address(address)]]</para>
     <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
     <para style="terp_default_Centre_9">User : [[ o.user_id.name ]]</para>
     <para style="terp_default_Centre_9">Shop : [[ o.shop_id.name ]]</para>
@@ -104,12 +103,18 @@
         <td>
           <para style="P1">[[ repeatIn(o.lines,'line') ]]</para>
           <para style="terp_default_9b">[[ line.product_id.name ]]</para>
+          <para style="terp_default_Right_9">
+            <font face="Helvetica">With a [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.2f' % line.discount ]]) % discount.</font>
+          </para>
+          <para style="terp_default_9b">
+            <font color="white"> </font>
+          </para>
         </td>
         <td>
           <para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] [[company.currency_id.symbol]] <font face="Helvetica">[[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.2f' % line.discount ]]%) [[company.currency_id.symbol]]</font></para>
+          <para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][[ formatLang(net(line.id), currency_obj=company.currency_id) ]] <font face="Helvetica">[[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ formatLang(line.discount, currency_obj=company.currency_id) ]])</font></para>
         </td>
       </tr>
     </blockTable>
@@ -119,7 +124,7 @@
           <para style="P6a">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_tax]] [[company.currency_id.symbol]]</para>
+          <para style="terp_default_Right_9">[[o.state=='cancel' and o.statement_ids and '-' or '']][[formatLang(o.amount_tax, currency_obj=company.currency_id)]]</para>
         </td>
       </tr>
     </blockTable>
@@ -129,7 +134,7 @@
           <para style="P6">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Bold_9_Right2">[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total]] [[company.currency_id.symbol]]</para>
+          <para style="terp_default_Bold_9_Right2">[[o.state=='cancel' and o.statement_ids and '-' or '']][[formatLang(o.amount_total, currency_obj=company.currency_id)]]</para>
         </td>
       </tr>
     </blockTable>
@@ -158,7 +163,7 @@
           </para>
         </td>
         <td>
-          <para style="P8">[[ '%.2f' %(d['amt'] or 0) ]] [[company.currency_id.symbol]]</para>
+          <para style="P8">[[ formatLang(d['amt'] or 0, currency_obj=company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/report/pos_sales_user.py b/addons/point_of_sale/report/pos_sales_user.py
index 6ac2e1892c1..aa43592363f 100644
--- a/addons/point_of_sale/report/pos_sales_user.py
+++ b/addons/point_of_sale/report/pos_sales_user.py
@@ -33,7 +33,7 @@ class pos_sales_user(report_sxw.rml_parse):
 
         })
 
-    def _get_data(self,form):
+    def _get_data(self, form):
         dt1 = form['date_start'] + ' 00:00:00'
         dt2 = form['date_end'] + ' 23:59:59'
         data={}
diff --git a/addons/point_of_sale/report/pos_sales_user_today.py b/addons/point_of_sale/report/pos_sales_user_today.py
index 9696d036959..35bc61efea8 100644
--- a/addons/point_of_sale/report/pos_sales_user_today.py
+++ b/addons/point_of_sale/report/pos_sales_user_today.py
@@ -33,7 +33,7 @@ class pos_sales_user_today(report_sxw.rml_parse):
 
         })
 
-    def _get_data(self,form):
+    def _get_data(self, form):
         data={}
         ids = form['user_id']
 
@@ -47,4 +47,4 @@ class pos_sales_user_today(report_sxw.rml_parse):
 
 report_sxw.report_sxw('report.pos.sales.user.today', 'pos.order', 'addons/point_of_sale/report/pos_sales_user_today.rml', parser=pos_sales_user_today,header='internal')
 
-# 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/point_of_sale/report/pos_users_product.py b/addons/point_of_sale/report/pos_users_product.py
index 87cf306990a..032a25043e8 100644
--- a/addons/point_of_sale/report/pos_users_product.py
+++ b/addons/point_of_sale/report/pos_users_product.py
@@ -60,9 +60,9 @@ class pos_user_product(report_sxw.rml_parse):
             data = self.cr.fetchone()
             return data[0]
 
-    def _get_total(self,o):
+    def _get_total(self, o):
         return self.total
 
 report_sxw.report_sxw('report.pos.user.product', 'account.bank.statement', 'addons/statement/report/pos_users_product.rml', parser=pos_user_product,header='internal')
 
-# 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/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index f3a8cfd77e8..9758e924ada 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -191,7 +191,7 @@
               <para style="terp_default_Right_9">[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]</para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(line_ids['amt'], currency_obj = company.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -208,7 +208,7 @@
           <para style="terp_tblheader_General_Right">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement)) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(get_total(statement), currency_obj = company.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/point_of_sale/res_users_view.xml b/addons/point_of_sale/res_users_view.xml
index 2a510b1d575..89daeaa29a1 100644
--- a/addons/point_of_sale/res_users_view.xml
+++ b/addons/point_of_sale/res_users_view.xml
@@ -19,7 +19,7 @@
         <field name="inherit_id" ref="base.view_users_form" />
         <field name="arch" type="xml">
             <notebook position="inside">
-                <page string="Point Of Sale">
+                <page string="Point of Sale">
                     <group>
                         <field name="pos_config" />
                         <field name="ean13" />
diff --git a/addons/point_of_sale/static/src/css/keyboard.css b/addons/point_of_sale/static/src/css/keyboard.css
index 3a06970929f..d5ce468d7be 100644
--- a/addons/point_of_sale/static/src/css/keyboard.css
+++ b/addons/point_of_sale/static/src/css/keyboard.css
@@ -71,7 +71,7 @@
 	clear: left;
 }
 .point-of-sale .keyboard .lastitem {
-	margin-right: 0;
+	margin-right: 0 !important;
 }
 
 /* ---- full sized keyboard ---- */
@@ -79,13 +79,13 @@
 .point-of-sale .full_keyboard {
     list-style: none;
     font-size: 14px;
-    width: 680px;
+    width: 685px;
     height: 100%;
-    margin-left: auto;
-    margin-right: auto;
+    margin-left: auto !important;
+    margin-right: auto !important;
 }
 .point-of-sale .full_keyboard li{
-	margin: 0 5px 5px 0;
+	margin: 0 5px 5px 0 !important;
 	width: 40px;
 	height: 40px;
 	line-height: 40px;
@@ -115,22 +115,22 @@
 .point-of-sale .simple_keyboard {
     list-style: none;
     font-size: 16px;
-    width: 545px;
+    width: 555px;
     height: 220px;
-    margin-left: auto;
-    margin-right: auto;
+    margin-left: auto !important;
+    margin-right: auto !important;
 }
 .point-of-sale .simple_keyboard li{
-    margin: 0 5px 5px 0;
+    margin: 0 5px 5px 0 !important;
     width: 49px;
     height: 49px;
     line-height: 49px;
 }
 .point-of-sale .simple_keyboard .firstitem.row_asdf{
-    margin-left:25px;
+    margin-left:25px !important;
 }
 .point-of-sale .simple_keyboard .firstitem.row_zxcv{
-    margin-left:55px;
+    margin-left:55px !important;
 }
 .point-of-sale .simple_keyboard .delete{
     width: 103px;
@@ -139,7 +139,7 @@
     width: 103px;
 }
 .point-of-sale .simple_keyboard .space{
-    width:268px;
+    width:273px;
 }
 .point-of-sale .simple_keyboard .numlock{
     width:103px;
diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css
index a9baf041942..675b77345e7 100644
--- a/addons/point_of_sale/static/src/css/pos.css
+++ b/addons/point_of_sale/static/src/css/pos.css
@@ -20,6 +20,12 @@
             user-select: none;
 }
 
+.point-of-sale ul, .point-of-sale li  {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+}
+
 .point-of-sale .shadow-top{
     position: absolute;
     top:0;
@@ -96,6 +102,11 @@
     border: 1px solid #cecbcb;
     border-radius: 4px;
 }
+.point-of-sale .pos-disc-font {
+    font-size: 12px;
+    font-style:italic;
+    color: #808080;
+}
 
 /*  ********* The black header bar ********* */
 
@@ -105,12 +116,10 @@
     left:0;
     top:0;
     width: 100%;
-    height: 33px;
+    height: 34px;
     margin:0;
     padding:0;
     color: gray;
-    border-top: solid 1px #d3d3d3;
-    border-bottom: solid 1px black;
     background: #393939;
     background: -moz-linear-gradient(#7b7979, #393939);
     background: -webkit-gradient(linear, left top, left bottom, from(#7b7979), to(#393939));
@@ -247,7 +256,7 @@
 .point-of-sale #content {
     width: 100%;
     position: absolute;
-    top: 35px;
+    top: 34px;
     bottom: 0;
     background: #F0EEEE;
 }
@@ -286,22 +295,29 @@
     vertical-align: top;
 }
 .point-of-sale #paypad button {
-    height: 54px;
+    height: 50px;
     width: 208px;
-    margin: 0 -3px;
+    margin: 0px -6px 4px -2px;
     font-weight: bold;
     vertical-align: middle;
     color: #555555;
     border-top: 1px solid #efefef;
     font-size: 14px;
 }
-.point-of-sale #paypad button:hover {
+.point-of-sale #paypad button:hover, .point-of-sale #numpad button:hover, .point-of-sale #numpad .selected-mode, .point-of-sale .popup button:hover {
+    border: none;
     color: white;
     background: #7f82ac;
     background: -webkit-gradient(linear, left top, left bottom, from(#9d9fc5), to(#7f82ac));
     background: -moz-linear-gradient(#9d9fc5, #7f82ac);
     background:  -ms-linear-gradient(#9d9fc5, #7f82ac);
     background:      linear-gradient(#9d9fc5, #7f82ac);
+    text-shadow: 0px 0px 5px rgba(255,255,255,0.21);
+    -webkit-box-shadow:  0px 0px 2px rgba(0,0,0,0.3) inset, 0px 1px 2px rgba(0,0,0,0.1);
+       -moz-box-shadow:  0px 0px 2px rgba(0,0,0,0.3) inset, 0px 1px 2px rgba(0,0,0,0.1);
+        -ms-box-shadow:  0px 0px 2px rgba(0,0,0,0.3) inset, 0px 1px 2px rgba(0,0,0,0.1);
+         -o-box-shadow:  0px 0px 2px rgba(0,0,0,0.3) inset, 0px 1px 2px rgba(0,0,0,0.1);
+            box-shadow:  0px 0px 2px rgba(0,0,0,0.3) inset, 0px 1px 2px rgba(0,0,0,0.1);
 }
 
 /*  ********* The Numpad ********* */
@@ -312,30 +328,14 @@
     text-align: center;
 }
 .point-of-sale #numpad button {
-    height: 54px;
-    width: 54px;
-    margin: 0 -3px;
+    height: 50px;
+    width: 50px;
+    margin: 0px 0px 4px 0px;
     font-weight: bold;
     vertical-align: middle;
     color: #555555;
     border-top: 1px solid #efefef;
 }
-.point-of-sale #numpad button:hover {
-    color: white;
-    background: #7f82ac;
-    background: -webkit-gradient(linear, left top, left bottom, from(#9d9fc5), to(#7f82ac));
-    background: -moz-linear-gradient(#9d9fc5, #7f82ac);
-    background:  -ms-linear-gradient(#9d9fc5, #7f82ac);
-    background:      linear-gradient(#9d9fc5, #7f82ac);
-}
-.point-of-sale #numpad .selected-mode {
-    color: white;
-    background: #7f82ac;
-    background: -webkit-gradient(linear, left top, left bottom, from(#9d9fc5), to(#7f82ac));
-    background: -moz-linear-gradient(#9d9fc5, #7f82ac);
-    background:  -ms-linear-gradient(#9d9fc5, #7f82ac);
-    background:      linear-gradient(#9d9fc5, #7f82ac);
-}
 .point-of-sale .input-button {
     font-size: 24px;
 }
@@ -358,7 +358,7 @@
 .point-of-sale #rightpane header {
     padding: 0;
     height: 32px;
-    border-bottom: 1px solid #cecbcb;
+    border-bottom: 1px solid #c7c7c7;
     background: #d3d3d3;
     background: -moz-linear-gradient(white, #d3d3d3);
     background: -webkit-gradient(linear, left top, left bottom, from(white), to(#d3d3d3));
@@ -367,7 +367,7 @@
 /*  ********* The product list  ********* */
 
 .point-of-sale .product-list {
-    padding:10px;
+    padding:10px !important;
 }
 
 .point-of-sale .product-list-scroller{
@@ -385,7 +385,6 @@
     bottom:0px;
     left:0px;
     right:0px;
-    background: #eeedff;
 }
 
 /*  a) the product list navigation bar */
@@ -445,7 +444,7 @@
     /*background:#f0f0f0;*/
     position: relative;
     background-image: url('../img/bg.png');
-    border-bottom: 1px solid #cecbcb;
+    border-bottom: 2px solid #e0e0e0;
 }
 .point-of-sale #categories .white-gradient{
     position: absolute;
@@ -464,7 +463,7 @@
 }
 
 .point-of-sale .category-list{
-    padding:10px;
+    padding:10px !important;
 }
 /*  d) the category button */
 
@@ -473,15 +472,15 @@
     vertical-align: top;
     display: inline-block;
     font-size: 11px;
-    margin: 5px;
+    margin: 5px !important;
     width: 120px;
     height:120px;
     background:#fff;
     border: 1px solid #fff;
     border-radius: 3px;
-    -webkit-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
-       -moz-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
-            box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+    -webkit-box-shadow: 0px 2px 0px #E9E9E9, 0px 3px 8px rgba(0, 0, 0, 0.34);
+       -moz-box-shadow: 0px 2px 0px #E9E9E9, 0px 3px 8px rgba(0, 0, 0, 0.34);
+            box-shadow: 0px 2px 0px #E9E9E9, 0px 3px 8px rgba(0, 0, 0, 0.34);
     cursor: pointer;
 }
 
@@ -540,16 +539,18 @@
        -moz-box-sizing: border-box;
         -ms-box-sizing: border-box;
             box-sizing: border-box;
-    top:auto;
-    left: 2px;
-    right: 2px;
-    bottom: 2px;
-    background: #8a89ba; /*-webkit-linear-gradient(-90deg,rgba(138,137,186,0),rgba(138,137,186,1), rgba(138,137,186,1));*/
+    bottom: 0;
+    top: auto;
+    line-height: 14px;
+    width: 100%;
+    background: -webkit-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    background:    -moz-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    background:     -ms-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    background:         linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    /*background:#FFF;*/
     padding: 3px;
-    /*color:#8a89ba;*/
-    color: #FFF;
-    cursor: pointer;
-    border-radius: 3px;
+    padding-top: 15px;
+    color: #7C7BAD;
 }
 
 /*  e) the product */
@@ -560,15 +561,15 @@
     display: inline-block;
     line-height: 100px;
     font-size: 11px;
-    margin: 5px;
+    margin: 5px !important;
     width: 120px;
     height:120px;
     background:#fff;
     border: 1px solid #fff;
     border-radius: 3px;
-    -webkit-box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
-       -moz-box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
-            box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+    -webkit-box-shadow: 0px 2px 0px #dad8e4, 0px 1px 8px #636480; 
+       -moz-box-shadow: 0px 2px 0px #dad8e4, 0px 1px 8px #636480; 
+            box-shadow: 0px 2px 0px #dad8e4, 0px 1px 8px #636480; 
 }
 
 .point-of-sale .product .product-img {
@@ -590,10 +591,11 @@
     right: 2px;
     vertical-align: top;
     color: white;
-    line-height: 14px;
+    line-height: 13px;
     background: #7f82ac;
     padding: 2px 5px;
     border-radius: 3px;
+    box-shadow: 0px 1px 0px #9A9CC5, 0px 3px 0px #7E86AC, 0px 3px 3px rgba(12, 14, 68, 0.67);
 }
 
 .point-of-sale .product .product-name {
@@ -624,6 +626,8 @@
     top:0px;
     bottom:0px;
     width:100%;
+    background-image: -webkit-radial-gradient(rgba(255, 255, 255, 0),rgba(51, 17, 124, 0.25)), url('../img/grid.png');
+    box-shadow: 0px 36px 24px rgba(0, 0, 0, 0.14) inset;
 }
 .point-of-sale .screen header h2 {
     margin-top: 0px;
@@ -632,6 +636,22 @@
 .point-of-sale .screen p{
     font-size: 18px;
 }
+.point-of-sale .dialog{
+    width: 500px;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 50px;
+    padding: 40px;
+    background-color: #f8f8f8;
+    border-radius: 4px;
+    text-align: center;
+    box-shadow: 0px 1px 0px white,0px -1px 0px white, 0px 4px 0px #DFDFDF, 0px 10px 30px rgba(0, 0, 0, 0.21);
+}
+.point-of-sale .dialog p{
+    font-size: 25px;
+    margin-top: 10px;
+    color: #5a5a5a;
+}
 
 /* a) Layout for the Product Screen */
 
@@ -675,11 +695,32 @@
 }
 .point-of-sale .pos-step-container input{
     font-size: 1em;
+    outline: none;
+    border: none;
+    padding: 0px 8px;
+    padding-top: 8px;
+    margin-left: 16px;
+    border-radius: 5px;
+    background: white;
+    box-shadow: 0px -1px 0px #E2E2E2 inset,0px 1px 0px white inset, 0px 4px 0px #DDD inset, 0px 4px 8px rgba(0, 0, 0, 0.55) inset;
+    color: #4c4c4c; 
+    -webkit-animation: all 250ms linear;
+}
+
+.point-of-sale .pos-step-container input:focus{
+    box-shadow: 0px -1px 0px #C9CFFD inset,0px 1px 0px #B8C8FC inset, 0px 4px 0px #9FD5FF inset, 0px 4px 9px rgba(0, 31, 255, 0.55) inset;
+    color: #5d7ad6;
+    -webkit-animation: all 250ms linear;
 }
 
 .point-of-sale .pos-payment-container {
     text-align: left;
     min-width: 500px;
+    margin-top: 50px;
+    padding: 40px;
+    background-color: #f8f8f8;
+    border-radius: 4px;
+    box-shadow: 0px 1px 0px white,0px -1px 0px white, 0px 4px 0px #DFDFDF, 0px 10px 30px rgba(0, 0, 0, 0.21);
 }
 .point-of-sale .pos-payment-container .left-block{
     display: inline-block;
@@ -689,7 +730,7 @@
     text-align:left;
 }
 .point-of-sale .pos-payment-container .header{
-    margin-top: 50px;
+    margin-top: 0px;
     margin-bottom:20px;
     font-weight: bold;
 }
@@ -732,9 +773,8 @@
     padding-bottom:30px;
     display: inline-block;
     font-family: "Inconsolata";
-    -webkit-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
-       -moz-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
-            box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+    border-radius: 2px;
+    box-shadow: 0px 1px 0px white, 0px 3px 0px #C1B9D6, 0px 8px 16px rgba(0, 0, 0, 0.3);
 }
 .point-of-sale .pos-sale-ticket .emph{
     font-size: 20px;
@@ -768,6 +808,9 @@
     .pos-sale-ticket {
         margin: 0;
     }
+    .debug-widget{
+        display: none !important;
+    }
 }
 
 /* d) The Scale screen */
@@ -779,9 +822,14 @@
     margin-top: 100px;
     margin-left: auto;
     margin-right: auto;
+    padding: 40px;
+    background: #f1f1f1;
+    box-shadow: 0px 1px 0px white, 0px -1px 0px white, 0px 4px 0px #dfdfdf, 0px 10px 30px rgba(0,0,0,0.21);
+    border-radius: 4px;
 }
 
 .point-of-sale .scale-screen .product-picture {
+    position: relative;
     -webkit-box-sizing: border-box;
        -moz-box-sizing: border-box;
         -ms-box-sizing: border-box;
@@ -797,12 +845,12 @@
     background:#fff;
     border: 1px solid #fff;
     border-radius: 3px;
-    -webkit-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
-       -moz-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
-            box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+    box-shadow: 0px 2px 0px #e9e9e9, 0px 2px 8px rgba(0,0,0,0.2);
 }
 
 .point-of-sale .scale-screen .product-picture img{
+    max-width: 178px;
+    max-height:178px;
     vertical-align: middle;
     cursor:pointer;
 }
@@ -824,37 +872,47 @@
 .point-of-sale .scale-screen .product-name {
     position: absolute;
     left:0;
-    top:20px;
+    top:50px;
     height:50px;
     font-size:40px;
     line-height:50px;
     text-align:right;
-    right:225px;
+    right:275px;
+    color: #8d8d8d;
 }
 .point-of-sale .scale-screen .weight{
     position: absolute;
-    left:0;
-    height:90px;
-    bottom:15px;
-    right:220px;
-    padding:5px;
+    left: 40px;
+    height: 90px;
+    bottom: 55px;
+    right: 260px;
+    padding: 6px;
+    padding-right: 33px;
+    padding-top: 11px;
+    background: white;
+    border-radius: 3px;
+    box-shadow: 0px -1px #E2E2E2 inset,0px 1px white inset, 0px 4px #E6E4E4 inset, 0px 4px 8px rgba(0, 0, 0, 0.4) inset;
+
 }
 .point-of-sale .scale-screen .weight p{
     display: inline-block;
     text-align:right;
     line-height: 90px;
-    font-size: 80px;
-    width:100%;
-    height:100%;
-    margin:0;
+    font-size: 70px;
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    margin-right: 18px;
     font-family: "Inconsolata";
+    color: #6c6c6c;
+    text-shadow: 0px 3px 3px rgba(0,0,0, 0.2);
 }
 
 /* e) The Welcome Screen */
 .point-of-sale .goodbye-message{
     position: absolute;
     left:50%;
-    top:30%;
+    top:40%;
     width:500px;
     height:400px;
     margin-left: -250px;
@@ -901,9 +959,10 @@
     margin-top:16px;
     margin-bottom:16px;
     font-size:16px;
-    -webkit-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
-       -moz-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
-            box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+    border-radius: 2px;
+    -webkit-box-shadow: 0px 1px 0px white, 0px 3px 0px #DFDFDF, 0px 7px 16px rgba(0, 0, 0, 0.20);
+       -moz-box-shadow: 0px 1px 0px white, 0px 3px 0px #DFDFDF, 0px 7px 16px rgba(0, 0, 0, 0.20);
+            box-shadow: 0px 1px 0px white, 0px 3px 0px #DFDFDF, 0px 7px 16px rgba(0, 0, 0, 0.20);
 
 }
 
@@ -1072,12 +1131,14 @@
     -webkit-transition-timing-function: ease-out;
 }
 
-.point-of-sale .pos-actionbar .button.disabled{
-    color:#AAA;
+.point-of-sale .pos-actionbar .button.disabled *{
+    opacity: 0.5;
 }
 .point-of-sale .pos-actionbar .button.disabled:hover{
     border: 1px solid #cacaca;
     border-radius: 4px;
+    color: #555;
+    cursor: default;
 
     background: #e2e2e2;
     background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
@@ -1092,6 +1153,79 @@
 .point-of-sale .pos-actionbar .button.rightalign{
     float:right;
 }
+/*  ********* The Debug Widget  ********* */
+
+.point-of-sale .debug-widget{
+    z-index:100000;
+    position: absolute;
+    right: 10px;
+    top: 10px;
+    width: 200px;
+    font-size: 10px;
+    
+    background: rgba(0,0,0,0.82);
+    color: white;
+    text-shadow: none;
+    padding-bottom: 10px;
+    box-shadow: 0px 3px 20px rgba(0,0,0,0.3);
+    cursor:move;
+}
+.point-of-sale .debug-widget .toggle{
+    position: absolute;
+    font-size: 16px;
+    cursor:pointer;
+    top:0px;
+    right:0px;
+    padding:10px;
+    padding-right:15px;
+}
+.point-of-sale .debug-widget .content{
+    overflow: hidden;
+}
+.point-of-sale .debug-widget h1{
+    background:black;
+    padding-top: 10px;
+    padding-left: 10px;
+    margin-top:0;
+    margin-bottom:0;
+}
+.point-of-sale .debug-widget .category{
+    background: black;
+    padding-left: 10px;
+    margin: 0px;
+    font-weight: bold;
+    padding-top:3px;
+    padding-bottom:3px;
+}
+.point-of-sale .debug-widget .button{
+    padding: 5px;
+    padding-left: 15px;
+    display: block;
+    cursor:pointer;
+}
+.point-of-sale .debug-widget .button:hover{
+    background: rgba(96,21,177,0.45);
+}
+.point-of-sale .debug-widget input{
+    margin-left:10px;
+    margin-top:7px;
+}
+.point-of-sale .debug-widget .status{
+    padding: 5px;
+    padding-left: 15px;
+    display: block;
+    cursor:default;
+}
+.point-of-sale .debug-widget .status.on{
+    background-color: #6cd11d;
+}
+.point-of-sale .debug-widget .event{
+    padding: 5px;
+    padding-left: 15px;
+    display: block;
+    cursor:default;
+    background-color: #1E1E1E;
+}
 
 /*  ********* The PopupWidgets  ********* */
 
@@ -1118,10 +1252,8 @@
     font-size:20px;
     font-weight:bold;
     background-color: #F0EEEE;
-    border: 1px solid #E0DDDD;
-    -webkit-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
-       -moz-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
-        -ms-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+    border-radius: 4px;
+    box-shadow: 0px -1px white, 0px 1px white, 0px 4px #949494, 0px 10px 20px rgba(0, 0, 0, 0.3);
     z-index:1200;
 }
 .point-of-sale .popup .footer{
diff --git a/addons/point_of_sale/static/src/css/pos_nohover.css b/addons/point_of_sale/static/src/css/pos_nohover.css
new file mode 100644
index 00000000000..6f24abda53b
--- /dev/null
+++ b/addons/point_of_sale/static/src/css/pos_nohover.css
@@ -0,0 +1,1168 @@
+@font-face{
+    font-family: 'Inconsolata';
+    src: url(../fonts/Inconsolata.otf);
+}
+
+.point-of-sale {
+    padding: 0;
+    margin: 0;
+    background-color: #f0eeee;
+    font-family: "Lucida Grande", Helvetica, Verdana, Arial;
+    color: #555555;
+    font-size: 12px;
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    -webkit-user-select: none;
+       -moz-user-select: none;
+            user-select: none;
+}
+
+.point-of-sale .shadow-top{
+    position: absolute;
+    top:0;
+    left:0;
+    right:0;
+    height:10px;
+    background: -webkit-linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+    background:    -moz-linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+    background:     -ms-linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+    background:         linear-gradient(top,rgba(0,0,0,0.09),rgba(0,0,0,0));
+}
+
+.point-of-sale .darker-shadow-top{
+    position: absolute;
+    top:0;
+    left:0;
+    right:0;
+    height:10px;
+    background: -webkit-linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+    background:    -moz-linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+    background:     -ms-linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+    background:         linear-gradient(top,rgba(0,0,0,0.15),rgba(0,0,0,0));
+}
+
+/*  ********* The black loading screen ********* */
+
+.point-of-sale .loader{
+    background-color: #222;
+    position:absolute;
+    left:0px;
+    top:0px;
+    width:100%;
+    height:100%;
+    z-index: 999;
+    text-align: center;
+}
+.point-of-sale .loader img{
+    position:absolute;
+    top:50%;
+    left:50%;
+}
+
+/*  ********* Generic element styling  ********* */
+
+.point-of-sale a {
+    text-decoration: none;
+    color: #555555;
+}
+.point-of-sale button, .point-of-sale a.button {
+    display: inline-block;
+    cursor: pointer;
+    padding: 4px 10px;
+    font-size: 11px;
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+    background: #e2e2e2;
+    background: -webkit-gradient(linear, left top, left bottom, from(#f0f0f0), to(#e2e2e2));
+    background: -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:  -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:      linear-gradient(#f0f0f0, #e2e2e2);
+}
+.point-of-sale ul, .point-of-sale ol {
+    padding: 0;
+    margin: 0;
+}
+.point-of-sale li {
+    list-style-type: none;
+}
+.point-of-sale .pos-right-align {
+    text-align: right;
+}
+.point-of-sale .pos-right-align input {
+    text-align: right;
+    border: 1px solid #cecbcb;
+    border-radius: 4px;
+}
+
+/*  ********* The black header bar ********* */
+
+
+.point-of-sale #topheader {
+    position:absolute;
+    left:0;
+    top:0;
+    width: 100%;
+    height: 33px;
+    margin:0;
+    padding:0;
+    color: gray;
+    border-top: solid 1px #d3d3d3;
+    border-bottom: solid 1px black;
+    background: #393939;
+    background: -moz-linear-gradient(#7b7979, #393939);
+    background: -webkit-gradient(linear, left top, left bottom, from(#7b7979), to(#393939));
+}
+
+/*  a) The left part of the top-bar */
+
+.point-of-sale #branding{
+    position: absolute;
+    display: table-cell;
+    left:0;
+    top:0;
+    width:439px;
+    height:100%;
+    margin:0;
+    padding:0;
+    border-right: 1px solid #373737;
+    text-align:left;
+    line-height:100%;
+    vertical-align: middle;
+}
+.point-of-sale #branding img {
+    height: 32px;
+    width: 116px;
+    margin-left:5px;
+    vertical-align:middle;
+} 
+.point-of-sale #branding .username{
+    float:right;
+    color:#DDD;
+    font-size:16px;
+    margin-right:32px;
+    margin-top:10px;
+    font-style:italic;
+}
+
+/*  b) The right part of the top-bar */
+
+.point-of-sale #rightheader {
+    position: absolute;
+    left:440px;
+    right:0;
+    top:0;
+    height:100%;
+}
+
+.point-of-sale #rightheader button {
+    color: #273072;
+    height:27px;
+    margin:3px;
+    margin-right:0px;
+    border: 1px solid #353A7E;
+    background: #7f82ac;
+    background: -webkit-gradient(linear, left top, left bottom, from(#b2b3d7), to(#7f82ac));
+    background: -moz-linear-gradient(#b2b3d7, #7f82ac);
+    background:  -ms-linear-gradient(#b2b3d7, #7f82ac);
+    background:      linear-gradient(#b2b3d7, #7f82ac);
+}
+
+.point-of-sale #rightheader button.neworder-button {
+    width: 32px;
+    margin-left:4px;
+    margin-right:4px;
+}
+
+.point-of-sale div#order-selector {
+    display: inline;
+}
+.point-of-sale ol#orders {
+    display: inline;
+}
+.point-of-sale li.order-selector-button {
+    display: inline;
+}
+.point-of-sale li.selected-order button {
+    font-weight: 900;
+}
+
+/*  c) The session buttons */
+
+.point-of-sale #rightheader .header-button{
+    float:right;
+    height:32px;
+    padding-left:10px;
+    padding-right:10px;
+    border-right:  1px solid #3a3a3a;
+    border-left:  1px solid #3a3a3a;
+    color:#DDD;
+    line-height:32px;
+    text-align:center;
+    cursor: pointer;
+
+    -webkit-transition-property: background;
+    -webkit-transition-duration: 0.2s;
+    -webkit-transition-timing-function: ease-out;
+}
+.point-of-sale #rightheader .header-button:last-child{
+    border-left:  1px solid #3a3a3a;
+}
+
+/*  c) The notifications indicator */
+
+.point-of-sale .oe_pos_synch-notification{
+    float:right; 
+    color: rgba(255,255,255,0.4);
+    padding: 8px;
+    line-height:16px;
+    font-size:16px;
+    vertical-align:middle;
+    font-style: italic;
+    cursor:pointer;
+}
+
+.point-of-sale .oe_pos_synch-notification .oe_status_red{
+    display:inline-block;
+    cursor:pointer;
+    width:16px; height:16px;
+    background: url("../img/gtk-no.png") no-repeat ;
+}
+
+.point-of-sale .oe_pos_synch-notification .oe_status_green{
+    display:inline-block;
+    width:16px; height:16px;
+    background: url("../img/gtk-yes.png") no-repeat;
+}
+
+/*  ********* Contains everything below the  bar ********* */
+
+.point-of-sale #content {
+    width: 100%;
+    position: absolute;
+    top: 35px;
+    bottom: 0;
+    background: #F0EEEE;
+}
+
+/*  ********* The leftpane contains the order, numpad and paypad ********* */
+
+.point-of-sale #leftpane {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    position:absolute;
+    left:0;
+    width:440px;
+    top:0px;
+    /*bottom:105px;*/
+    bottom:0;
+    border-right: solid 1px #CECBCB;
+    background-color: white;
+}
+.point-of-sale #leftpane footer {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    background: #F0EEEE;
+    white-space: nowrap;
+}
+
+/*  ********* The paypad contains the payment buttons ********* */
+
+.point-of-sale #paypad {
+    padding: 8px 4px 8px 8px;
+    display: inline-block;
+    text-align: center;
+    vertical-align: top;
+}
+.point-of-sale #paypad button {
+    height: 54px;
+    width: 208px;
+    margin: 0 -3px;
+    font-weight: bold;
+    vertical-align: middle;
+    color: #555555;
+    border-top: 1px solid #efefef;
+    font-size: 14px;
+}
+
+/*  ********* The Numpad ********* */
+
+.point-of-sale #numpad {
+    padding: 8px 8px 8px 4px;
+    display: inline-block;
+    text-align: center;
+}
+.point-of-sale #numpad button {
+    height: 54px;
+    width: 54px;
+    margin: 0 -3px;
+    font-weight: bold;
+    vertical-align: middle;
+    color: #555555;
+    border-top: 1px solid #efefef;
+}
+.point-of-sale #numpad .selected-mode {
+    color: white;
+    background: #7f82ac;
+    background: -webkit-gradient(linear, left top, left bottom, from(#9d9fc5), to(#7f82ac));
+    background: -moz-linear-gradient(#9d9fc5, #7f82ac);
+    background:  -ms-linear-gradient(#9d9fc5, #7f82ac);
+    background:      linear-gradient(#9d9fc5, #7f82ac);
+}
+.point-of-sale .input-button {
+    font-size: 24px;
+}
+.point-of-sale .mode-button, .point-of-sale #numpad-delete, .point-of-sale #numpad-minus {
+    font-size: 14px;
+}
+
+/*  ********* The right pane contains the screens and headers ********* */
+
+.point-of-sale #rightpane {
+    position: absolute;
+    top: 0;
+    /*bottom: 105px;*/
+    bottom:0;
+    left: 440px;
+    right: 0;
+    vertical-align: top;
+}
+
+.point-of-sale #rightpane header {
+    padding: 0;
+    height: 32px;
+    border-bottom: 1px solid #cecbcb;
+    background: #d3d3d3;
+    background: -moz-linear-gradient(white, #d3d3d3);
+    background: -webkit-gradient(linear, left top, left bottom, from(white), to(#d3d3d3));
+}
+
+/*  ********* The product list  ********* */
+
+.point-of-sale .product-list {
+    padding:10px;
+}
+
+.point-of-sale .product-list-scroller{
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    width:100%;
+    height:100%;
+    overflow: hidden;
+}
+.point-of-sale .product-list-container {
+    position:absolute;
+    top:0px;
+    bottom:0px;
+    left:0px;
+    right:0px;
+    background: #eeedff;
+}
+
+/*  a) the product list navigation bar */
+
+.point-of-sale .breadcrumb li {
+    float: left;
+    line-height: 32px;
+    height: 32px;
+}
+.point-of-sale .breadcrumb li:last-child {
+    padding-right: 3px;
+    border-right: 1px solid #c5c5c5;
+}
+.point-of-sale .breadcrumb a {
+    display: inline-block;
+    padding: 0 9px;
+    vertical-align: top;
+    text-shadow: #f7f7f7 0 1px 1px;
+    color: #555555;
+    font-weight: bold;
+}
+.point-of-sale .bc-arrow {
+    height: 33px;
+}
+.point-of-sale .homeimg {
+    width: 19px;
+    height: 19px;
+    margin: 6px 0;
+}
+
+/*  b) the search box */
+
+.point-of-sale .searchbox {
+    position: absolute;
+    right: 2px;
+}
+.point-of-sale .searchbox input {
+    width: 130px;
+    border-radius: 11px;
+    border: 1px solid #cecbcb;
+    padding: 3px 19px;
+    margin: 6px;
+    background: url("../img/search.png") no-repeat 5px;
+    background-color: white;
+}
+.point-of-sale .search-clear {
+    position: absolute;
+    top: 11px;
+    right: 11px;
+    cursor: pointer;
+    display: none;
+}
+
+/*  c) the categories list */
+
+.point-of-sale #categories {
+    /*background:#f0f0f0;*/
+    position: relative;
+    background-image: url('../img/bg.png');
+    border-bottom: 1px solid #cecbcb;
+}
+.point-of-sale #categories .white-gradient{
+    position: absolute;
+    top:50%;
+    left:0;
+    right:0;
+    bottom:0;
+    background: -webkit-linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+    background:    -moz-linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+    background:     -ms-linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+    background:         linear-gradient(bottom,rgba(255,255,255,0.5),rgba(255,255,255,0));
+}
+.point-of-sale #categories h4 {
+    display: inline-block;
+    margin: 9px 5px;
+}
+
+.point-of-sale .category-list{
+    padding:10px;
+}
+/*  d) the category button */
+
+.point-of-sale .category-button {
+    position: relative;
+    vertical-align: top;
+    display: inline-block;
+    font-size: 11px;
+    margin: 5px;
+    width: 120px;
+    height:120px;
+    background:#fff;
+    border: 1px solid #fff;
+    border-radius: 3px;
+    -webkit-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+       -moz-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+            box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+    cursor: pointer;
+}
+
+.point-of-sale .category-simple-button{
+    position: relative;
+    display: inline-block;
+    font-size: 14px;
+    margin-right:10px;
+    padding:5px;
+
+    cursor: pointer;
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+
+    background: #e2e2e2;
+    background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+    background:    -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:     -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:         linear-gradient(#f0f0f0, #e2e2e2);
+    -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+       -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+            box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+}
+
+.point-of-sale .category-button .category-img {
+    position: relative;
+    width: 120px;
+    height: 100px;
+    text-align: center;
+    cursor: pointer;
+}
+
+.point-of-sale .category-button .category-img img {
+    max-height: 100px;
+    max-width:  120px;
+}
+
+.point-of-sale .category-button .category-name {
+    position: absolute;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    top:auto;
+    left: 2px;
+    right: 2px;
+    bottom: 2px;
+    background: #8a89ba; /*-webkit-linear-gradient(-90deg,rgba(138,137,186,0),rgba(138,137,186,1), rgba(138,137,186,1));*/
+    padding: 3px;
+    /*color:#8a89ba;*/
+    color: #FFF;
+    cursor: pointer;
+    border-radius: 3px;
+}
+
+/*  e) the product */
+
+.point-of-sale .product {
+    position:relative;
+    vertical-align: top;
+    display: inline-block;
+    line-height: 100px;
+    font-size: 11px;
+    margin: 5px;
+    width: 120px;
+    height:120px;
+    background:#fff;
+    border: 1px solid #fff;
+    border-radius: 3px;
+    -webkit-box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+       -moz-box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+            box-shadow: 0px 1px 8px rgba(127,130,172,0.4);
+}
+
+.point-of-sale .product .product-img {
+    position: relative;
+    width: 120px;
+    height: 100px;
+    background: white;
+    text-align: center;
+}
+
+.point-of-sale .product .product-img img {
+    max-height: 100px;
+    max-width:  120px;
+}
+
+.point-of-sale .product .price-tag {
+    position: absolute;
+    top: 2px;
+    right: 2px;
+    vertical-align: top;
+    color: white;
+    line-height: 14px;
+    background: #7f82ac;
+    padding: 2px 5px;
+    border-radius: 3px;
+}
+
+.point-of-sale .product .product-name {
+    position: absolute;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    bottom:0;
+    top:auto;
+    line-height: 14px;
+    width:100%;
+    background: -webkit-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    background:    -moz-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    background:     -ms-linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    background:         linear-gradient(-90deg,rgba(255,255,255,0),rgba(255,255,255,1), rgba(255,255,255,1));
+    /*background:#FFF;*/
+    padding: 3px;
+    padding-top:15px;
+}
+
+
+/*  ********* The Screens  ********* */
+
+.point-of-sale .screen {
+    position:absolute;
+    text-align: center;
+    top:0px;
+    bottom:0px;
+    width:100%;
+}
+.point-of-sale .screen header h2 {
+    margin-top: 0px;
+    padding-top: 7px;
+}
+.point-of-sale .screen p{
+    font-size: 18px;
+}
+
+/* a) Layout for the Product Screen */
+
+.point-of-sale .screen .layout-table {
+    border:none;
+    width:100%;
+    height:100%;
+}
+
+.point-of-sale .screen .header-row {
+    border:none;
+    width:100%;
+    height:0px;
+}
+
+.point-of-sale .screen .header-cell{
+    border:none;
+    width:100%;
+    height:0px;
+}
+.point-of-sale .screen .content-row {
+    width:100%;
+    height:100%;
+}
+.point-of-sale .screen .content-cell{
+    width:100%;
+}
+.point-of-sale .screen .content-cell .content-container{
+    height:100%;
+    position:relative;
+}
+
+/* b) The payment screen */
+
+.point-of-sale .pos-step-container {
+    display: inline-block;
+    font-size: 1.5em;
+}
+.point-of-sale .greyed-out{
+    color: #AAA;
+}
+.point-of-sale .pos-step-container input{
+    font-size: 1em;
+}
+
+.point-of-sale .pos-payment-container {
+    text-align: left;
+    min-width: 500px;
+}
+.point-of-sale .pos-payment-container .left-block{
+    display: inline-block;
+    width:49%;
+    margin:0;
+    padding:0;
+    text-align:left;
+}
+.point-of-sale .pos-payment-container .header{
+    margin-top: 50px;
+    margin-bottom:20px;
+    font-weight: bold;
+}
+.point-of-sale .pos-payment-container .infoline{
+    margin-top:5px;
+    margin-bottom:5px;
+}
+.point-of-sale .pos-payment-container .right-block{
+    display: inline-block;
+    width:49%;
+    margin:0;
+    padding:0;
+    text-align:right;
+}
+.point-of-sale .pos-payment-container table {
+    width: 100%;
+    margin-bottom: 20px;
+}
+.point-of-sale .pos-payment-container td {
+    vertical-align: middle;
+}
+.point-of-sale .pos-payment-container .paymentline-type {
+    font-size: 1em;
+    font-weight: bold;
+    margin-right:10px;
+}
+
+/* c) The receipt screen */
+
+.point-of-sale .pos-receipt-container {
+    font-size: 0.75em;
+}
+
+.point-of-sale .pos-sale-ticket {
+    text-align: left;
+    width: 300px;
+    background-color: white;
+    margin: 20px;
+    padding: 15px;
+    padding-bottom:30px;
+    display: inline-block;
+    font-family: "Inconsolata";
+    -webkit-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+            box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+}
+.point-of-sale .pos-sale-ticket .emph{
+    font-size: 20px;
+    margin:5px;
+}
+.point-of-sale .pos-sale-ticket table {
+    width: 100%;
+    border: 0;
+}
+.point-of-sale .pos-sale-ticket table td {
+    border: 0;
+}
+
+@media print {
+    .point-of-sale #topheader, .point-of-sale #leftpane {
+        display: none !important;
+    }
+    .point-of-sale #content {
+        top: 0px !important;
+    }
+    .point-of-sale #rightpane {
+        left: 0px !important;
+        background-color: white;
+    }
+    #receipt-screen header {
+        display: none !important;
+    }
+    #receipt-screen {
+        text-align: left;
+    }
+    .pos-sale-ticket {
+        margin: 0;
+    }
+}
+
+/* d) The Scale screen */
+
+.point-of-sale .scale-screen .display{
+    position:relative;
+    width:600px;
+    height:190px;
+    margin-top: 100px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.point-of-sale .scale-screen .product-picture {
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    display: float;
+    float: right;
+    margin: 5px;
+    width: 180px;
+    height:180px;
+    line-height:180px;
+    cursor:pointer;
+
+    background:#fff;
+    border: 1px solid #fff;
+    border-radius: 3px;
+    -webkit-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+       -moz-box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+            box-shadow: 0px 1px 8px rgba(0,0,0,0.2);
+}
+
+.point-of-sale .scale-screen .product-picture img{
+    vertical-align: middle;
+    cursor:pointer;
+}
+
+.point-of-sale .scale-screen .product-picture .product-price{
+    position: absolute;
+    top:8px;
+    right:8px;
+    width:auto;
+    height:auto;
+    line-height:1;
+    color:white;
+    background: #7f82ac;
+    padding: 2px 5px;
+    border-radius: 3px;
+    cursor:pointer;
+}
+
+.point-of-sale .scale-screen .product-name {
+    position: absolute;
+    left:0;
+    top:20px;
+    height:50px;
+    font-size:40px;
+    line-height:50px;
+    text-align:right;
+    right:225px;
+}
+.point-of-sale .scale-screen .weight{
+    position: absolute;
+    left:0;
+    height:90px;
+    bottom:15px;
+    right:220px;
+    padding:5px;
+}
+.point-of-sale .scale-screen .weight p{
+    display: inline-block;
+    text-align:right;
+    line-height: 90px;
+    font-size: 80px;
+    width:100%;
+    height:100%;
+    margin:0;
+    font-family: "Inconsolata";
+}
+
+/* e) The Welcome Screen */
+.point-of-sale .goodbye-message{
+    position: absolute;
+    left:50%;
+    top:30%;
+    width:500px;
+    height:400px;
+    margin-left: -250px;
+    margin-top: -200px;
+    padding:10px;
+    padding-top:20px;
+    text-align:center;
+    font-size:20px;
+    font-weight:bold;
+    background-color: #F0EEEE;
+    border: 1px solid #E0DDDD;
+    -webkit-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+        -ms-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+    z-index:1150;
+}
+
+/*  ********* The OrderWidget  ********* */
+
+.point-of-sale .order-container{
+    position: absolute;
+    top: 0px;
+    bottom: 232px;
+    width:100%;
+    background: #F0EEEE;
+}
+
+.point-of-sale .order-scroller{
+    width:100%;
+    height:100%;
+    overflow:hidden;
+}
+
+.point-of-sale .order{
+    background: #F00;
+    background: -webkit-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+    background:    -moz-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+    background:     -ms-linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+    background:         linear-gradient(0deg,rgba(245,245,245,1),rgba(255,255,255,1), rgba(245,245,245,1));
+    padding-bottom:15px;
+    padding-top:15px;
+    margin-left:16px;
+    margin-right:16px;
+    margin-top:16px;
+    margin-bottom:16px;
+    font-size:16px;
+    -webkit-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+            box-shadow: 0px 5px 16px rgba(0,0,0, 0.3);
+
+}
+
+.point-of-sale .order .empty{
+    text-align:center;
+    margin-top: 15px;
+    margin-bottom: 5px;
+    color:#999;
+    font-weight: normal;
+}
+
+.point-of-sale .order .summary{
+    width:100%;
+    text-align:right;
+    font-weight: bold;
+    margin-top:20px;
+    margin-bottom:10px;
+}
+.point-of-sale .order .summary .line{
+    margin-right:15px;
+    padding-top:5px;
+    border-top: solid 2px;
+    border-color:#777;
+}
+.point-of-sale .order .summary .line.empty{
+    border-color:#BBB;
+    color:#999;
+}
+
+/*  ********* The OrderLineWidget  ********* */
+
+.point-of-sale .order .orderline{
+    width:100%;
+    margin:0px;
+    padding-top:3px;
+    padding-bottom:10px;
+    padding-left:15px;
+    padding-right:15px;
+    cursor: pointer;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+        -ms-box-sizing: border-box;
+            box-sizing: border-box;
+    -webkit-transition: background 250ms ease-in-out;
+       -moz-transition: background 250ms ease-in-out;
+            transition: background 250ms ease-in-out;
+}
+
+.point-of-sale .order .orderline.selected{
+    background: rgba(140,143,183,0.2);
+    -webkit-transition: background 250ms ease-in-out;
+       -moz-transition: background 250ms ease-in-out;
+            transition: background 250ms ease-in-out;
+    cursor: default;
+}
+.point-of-sale .order .orderline .product-name{
+    padding:0;
+    display:inline-block;
+    font-weight: bold;
+    width:80%;
+    overflow:hidden;
+}
+.point-of-sale .order .orderline .price{
+    padding:0;
+    font-weight: bold;
+    float:right;
+}
+.point-of-sale .order .orderline .info-list{
+    color: #888;
+    margin-left:10px;
+}
+.point-of-sale .order .orderline .info-list em{
+    color: #777;
+    font-weight: bold;
+    font-style:normal;
+}
+
+/*  ********* The ActionBarWidget  ********* */
+
+.point-of-sale .pos-actionbar{
+    position:absolute;
+    left:    0;
+    bottom:  0px;
+    height: 105px;
+    width:  100%;
+    margin: 0;
+    background: #f5f5f5;    /*#ebebeb;*/
+    border-top: solid 1px #afafb6;
+    z-index:900;
+}
+
+.point-of-sale .pos-actionbar ul{
+    list-style:  none;
+}
+
+.point-of-sale .pos-actionbar-left-pane{
+    height: 100%;
+    width:  434px;
+    margin: 0px;
+    padding-left:3px;
+    padding-right:3px;
+    border-right: solid 1px #dfdfdf;
+    float:  left;
+}
+
+.point-of-sale .pos-actionbar-button-list{
+    height: 100%;
+    margin: 0px;
+    padding-left:3px;
+    padding-right:3px;
+    overflow:hidden;
+}
+
+.point-of-sale .pos-actionbar .button{
+    width: 90px;
+    height: 90px;
+    text-align:center;
+    margin:3px;
+    margin-top:6px;
+    float:left;
+
+    font-size:   14px;
+    font-weight: bold;
+
+    cursor: pointer;
+
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+
+    background: #e2e2e2;
+    background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+    background:    -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:     -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:         linear-gradient(#f0f0f0, #e2e2e2);
+    -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+       -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+            box-shadow: 0px 2px 2px rgba(0,0,0, 0.1);
+}
+.point-of-sale .pos-actionbar .button .label{
+    margin-top: 37px;
+}
+.point-of-sale .pos-actionbar .button .icon{
+    margin-top: 10px;
+}
+
+.point-of-sale .pos-actionbar .button.disabled *{
+    opacity: 0.5;
+}
+
+.point-of-sale .pos-actionbar .button.rightalign{
+    float:right;
+}
+
+/*  ********* The PopupWidgets  ********* */
+
+.point-of-sale .modal-dialog{
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height:100%;
+    background-color: rgba(0,0,0,0.5);
+    z-index:1000;
+}
+.point-of-sale .modal-dialog .popup{
+    position: absolute;
+    left:50%;
+    top:50%;
+    width:500px;
+    height:400px;
+    margin-left: -250px;
+    margin-top: -200px;
+    padding:10px;
+    padding-top:20px;
+    text-align:center;
+    font-size:20px;
+    font-weight:bold;
+    background-color: #F0EEEE;
+    border: 1px solid #E0DDDD;
+    -webkit-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+        -ms-box-shadow: 0px 10px 20px rgba(0,0,0, 0.3);
+    z-index:1200;
+}
+.point-of-sale .popup .footer{
+    position:absolute;
+    bottom:0;
+    left:0;
+    width:100%;
+    height:60px;
+    border-top: 1px solid #E0DDDD;
+}
+.point-of-sale .popup .button{
+    float:right;
+    width: 110px;
+    height: 40px;
+    line-height:40px;
+    text-align:center;
+    margin:3px;
+    margin-top:10px;
+    margin-right:10px;
+
+    font-size:   14px;
+    font-weight: bold;
+
+    cursor: pointer;
+
+    border: 1px solid #cacaca;
+    border-radius: 4px;
+
+    background: #e2e2e2;
+    background: -webkit-linear-gradient(#f0f0f0, #e2e2e2);
+    background:    -moz-linear-gradient(#f0f0f0, #e2e2e2);
+    background:     -ms-linear-gradient(#f0f0f0, #e2e2e2);
+    background:         linear-gradient(#f0f0f0, #e2e2e2);
+    -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+       -moz-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+            box-shadow: 0px 2px 2px rgba(0,0,0, 0.3);
+}
+
+.point-of-sale .popup .button.big-left{
+    position:absolute;
+    top: 120px;
+    left:40px;
+    width: 180px;
+    height: 180px;
+    line-height:180px;
+}
+
+.point-of-sale .popup .button.big-right{
+    position:absolute;
+    top: 120px;
+    right:40px;
+    width: 180px;
+    height: 180px;
+    line-height:180px;
+}
+
+/*  ********* The ScrollBarWidget  ********* */
+
+.point-of-sale .scrollbar{  
+    position:absolute;
+    top:7px;
+    right:7px;
+    width:48px;
+    bottom:7px;
+    background: rgba(0,0,0,0.1);
+
+}
+.point-of-sale .scrollbar .button{
+    width:100%;
+    height: 48px;
+    line-height: 38px;
+    text-align: center;
+    font-size:48px;
+    border-radius: 4px;
+    cursor: pointer;
+    -webkit-user-select: none;
+       -moz-user-select: none;
+        -ms-user-select: none;
+            user-select: none;
+    transition: all 250ms ease-in-out;
+}
+.point-of-sale .scrollbar .button{
+    color:white;
+    background: rgba(0,0,0,0.6);
+    -webkit-box-shadow: 0px 1px 4px rgba(0,0,0,0.01);
+       -moz-box-shadow: 0px 1px 4px rgba(0,0,0,0.01);
+            box-shadow: 0px 1px 4px rgba(0,0,0,0.01);
+    text-shadow: rgba(255,255,255,0.5) 0px 0px 10px;
+    -webkit-transition: all 250ms ease-in-out;
+       -moz-transition: all 250ms ease-in-out;
+            transition: all 250ms ease-in-out;
+}
+.point-of-sale .scrollbar .button.disabled{
+    background: rgba(0,0,0,0.3);
+    color:rgba(255,255,255,0.5);
+    -webkit-transition: all 250ms ease-in-out;
+       -moz-transition: all 250ms ease-in-out;
+            transition: all 250ms ease-in-out;
+}
+.point-of-sale .scrollbar .down-button{
+    position:absolute;
+    bottom:0px;
+}
+.point-of-sale .scrollbar .up-button{
+    position:absolute;
+    top:0px;
+}
+.point-of-sale .scrollbar .scroller{
+    position:absolute;
+    top:33%;
+    bottom:50%;
+    width:100%;
+    background: rgba(0,0,0,0.1);
+    border-radius: 4px;
+}
+
diff --git a/addons/point_of_sale/static/src/img/bancontact.png b/addons/point_of_sale/static/src/img/bancontact.png
index 5c34fefb0f9..bd4f63dbb5a 100644
Binary files a/addons/point_of_sale/static/src/img/bancontact.png and b/addons/point_of_sale/static/src/img/bancontact.png differ
diff --git a/addons/point_of_sale/static/src/img/grid-purple.png b/addons/point_of_sale/static/src/img/grid-purple.png
new file mode 100644
index 00000000000..2f0f4331e34
Binary files /dev/null and b/addons/point_of_sale/static/src/img/grid-purple.png differ
diff --git a/addons/point_of_sale/static/src/img/grid.png b/addons/point_of_sale/static/src/img/grid.png
new file mode 100644
index 00000000000..35dbab00913
Binary files /dev/null and b/addons/point_of_sale/static/src/img/grid.png differ
diff --git a/addons/point_of_sale/static/src/img/scan.png b/addons/point_of_sale/static/src/img/scan.png
index e5eafbe821d..c0bc93d7ca1 100644
Binary files a/addons/point_of_sale/static/src/img/scan.png and b/addons/point_of_sale/static/src/img/scan.png differ
diff --git a/addons/point_of_sale/static/src/js/TODO.txt b/addons/point_of_sale/static/src/js/TODO.txt
index edadbe188ea..1696f0b117d 100644
--- a/addons/point_of_sale/static/src/js/TODO.txt
+++ b/addons/point_of_sale/static/src/js/TODO.txt
@@ -47,11 +47,12 @@ TODO AUG 20
         v supprimer l'écran
         v bloquer sur l'impression
         v L'impression est foireuse
+        - description_sales
 
 * CLIENT
-    - create a new branch
+    v create a new branch
     - Self-checkout welcome screen
-        - removal of products for the root category
+        ~ removal of products for the root category
     - Terminal de payement
     - Code à barres
     - Vidanges
diff --git a/addons/point_of_sale/static/src/js/db.js b/addons/point_of_sale/static/src/js/db.js
index 77f7307b48f..c80c1958aae 100644
--- a/addons/point_of_sale/static/src/js/db.js
+++ b/addons/point_of_sale/static/src/js/db.js
@@ -21,6 +21,8 @@ function openerp_pos_db(instance, module){
             this.category_childs = {};
             this.category_parent    = {};
             this.category_search_string = {};
+            this.packagings_by_id = {};
+            this.packagings_by_product_id = {};
         },
         /* returns the category object from its id. If you pass a list of id as parameters, you get
          * a list of category objects. 
@@ -116,6 +118,10 @@ function openerp_pos_db(instance, module){
             if(product.ean13){
                 str += '|' + product.ean13;
             }
+            var packagings = this.packagings_by_product_id[product.id] || [];
+            for(var i = 0; i < packagings.length; i++){
+                str += '|' + packagings[i].ean;
+            }
             return str + '\n';
         },
         add_products: function(products){
@@ -158,6 +164,16 @@ function openerp_pos_db(instance, module){
             this.save('products',stored_products);
             this.save('categories',stored_categories);
         },
+        add_packagings: function(packagings){
+            for(var i = 0, len = packagings.length; i < len; i++){
+                var pack = packagings[i];
+                this.packagings_by_id[pack.id] = pack;
+                if(!this.packagings_by_product_id[pack.product_id[0]]){
+                    this.packagings_by_product_id[pack.product_id[0]] = [];
+                }
+                this.packagings_by_product_id[pack.product_id[0]].push(pack);
+            }
+        },
         /* removes all the data from the database. TODO : being able to selectively remove data */
         clear: function(stores){
             for(var i = 0, len = arguments.length; i < len; i++){
@@ -184,6 +200,12 @@ function openerp_pos_db(instance, module){
                     return products[i];
                 }
             }
+            for(var p in this.packagings_by_id){
+                var pack = this.packagings_by_id[p];
+                if( pack.ean === ean13){
+                    return products[pack.product_id[0]];
+                }
+            }
             return undefined;
         },
         get_product_by_category: function(category_id){
@@ -223,9 +245,12 @@ function openerp_pos_db(instance, module){
         },
         remove_order: function(order_id){
             var orders = this.load('orders',[]);
+            console.log('Remove order:',order_id);
+            console.log('Order count:',orders.length);
             orders = _.filter(orders, function(order){
                 return order.id !== order_id;
             });
+            console.log('Order count:',orders.length);
             this.save('orders',orders);
         },
         get_orders: function(){
diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index a6be16b3835..c5580ec8e46 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -1,26 +1,6 @@
 
 function openerp_pos_devices(instance,module){ //module is instance.point_of_sale
 
-     var debug_devices = new (instance.web.Class.extend({
-        active: false,
-        payment_status: 'waiting_for_payment',
-        weight: 0,
-        activate: function(){
-            this.active = true;
-        },
-        deactivate: function(){
-            this.active = false;
-        },
-        set_weight: function(weight){ this.activate(); this.weight = weight; },
-        accept_payment: function(){ this.activate(); this.payment_status = 'payment_accepted'; },
-        reject_payment: function(){ this.activate(); this.payment_status = 'payment_rejected'; },
-        delay_payment:  function(){ this.activate(); this.payment_status = 'waiting_for_payment'; },
-    }))();
-
-    if(jQuery.deparam(jQuery.param.querystring()).debug !== undefined){
-        window.debug_devices = debug_devices;
-    }
-
     // this object interfaces with the local proxy to communicate to the various hardware devices
     // connected to the Point of Sale. As the communication only goes from the POS to the proxy,
     // methods are used both to signal an event, and to fetch information. 
@@ -34,56 +14,76 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             this.weighting = false;
 
             this.paying = false;
-            this.payment_status = 'waiting_for_payment';
+            this.default_payment_status = {
+                status: 'waiting',
+                message: '',
+                payment_method: undefined,
+                receipt_client: undefined,
+                receipt_shop:   undefined,
+            };    
+            this.custom_payment_status = this.default_payment_status;
 
             this.connection = new instance.web.JsonRPC();
             this.connection.setup(url);
+
+            this.bypass_proxy = false;
+            this.notifications = {};
             
         },
-        message : function(name,params,success_callback, error_callback){
-            success_callback = success_callback || function(){}; 
-            error_callback   =  error_callback  || function(){};    
-
-            
-            if(jQuery.deparam(jQuery.param.querystring()).debug !== undefined){
-                console.log('PROXY:',name,params);
+        message : function(name,params){
+            var ret = new $.Deferred();
+            var callbacks = this.notifications[name] || [];
+            for(var i = 0; i < callbacks.length; i++){
+                callbacks[i](params);
             }
 
-            if(!(debug_devices && debug_devices.active)){
-                this.connection.rpc('/pos/'+name, params || {}, success_callback, error_callback);
+            this.connection.rpc('/pos/' + name, params || {}).done(function(result) {
+                ret.resolve(result);
+            }).fail(function(error) {
+                ret.reject(error);
+            });
+            return ret;
+        },
+
+        // this allows the client to be notified when a proxy call is made. The notification 
+        // callback will be executed with the same arguments as the proxy call
+        add_notification: function(name, callback){
+            if(!this.notifications[name]){
+                this.notifications[name] = [];
             }
+            this.notifications[name].push(callback);
         },
         
         //a product has been scanned and recognized with success
         // ean is a parsed ean object
         scan_item_success: function(ean){
-            this.message('scan_item_success',ean);
+            return this.message('scan_item_success',{ean: ean});
         },
 
         // a product has been scanned but not recognized
         // ean is a parsed ean object
         scan_item_error_unrecognized: function(ean){
-            this.message('scan_item_error_unrecognized',ean);
+            return this.message('scan_item_error_unrecognized',{ean: ean});
         },
 
         //the client is asking for help
         help_needed: function(){
-            this.message('help_needed');
+            return this.message('help_needed');
         },
 
         //the client does not need help anymore
         help_canceled: function(){
-            this.message('help_canceled');
+            return this.message('help_canceled');
         },
 
         //the client is starting to weight
         weighting_start: function(){
-            this.weight = 0;
-            if(debug_devices){
-                debug_devices.weigth = 0;
+            if(!this.weighting){
+                this.weight = 0;
+                this.weighting = true;
+                this.bypass_proxy = false;
+                return this.message('weighting_start');
             }
-            this.weighting = true;
-            this.message('weighting_start');
         },
 
         //returns the weight on the scale. 
@@ -91,84 +91,100 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
         // and a weighting_end()
         weighting_read_kg: function(){
             var self = this;
-            if(debug_devices && debug_devices.active){
-                return debug_devices.weight;
+            if(this.bypass_proxy){
+                return this.weight;
             }else{
-                this.message('weighting_read_kg',{},function(weight){
-                    if(self.weighting){
-                        self.weight = weight;
-                    }
-                });
-                return self.weight;
+                this.message('weighting_read_kg',{})
+                    .done(function(weight){
+                        if(self.weighting && !self.bypass_proxy){
+                            self.weight = weight;
+                        }
+                    });
+                return this.weight;
             }
         },
 
+        // sets a custom weight, ignoring the proxy returned value until the next weighting_end 
+        debug_set_weight: function(kg){
+            this.bypass_proxy = true;
+            this.weight = kg;
+        },
+
         // the client has finished weighting products
         weighting_end: function(){
             this.weight = 0;
             this.weighting = false;
-            this.message('weighting_end');
+            this.bypass_proxy = false;
+            return this.message('weighting_end');
         },
 
         // the pos asks the client to pay 'price' units
-        // method: 'mastercard' | 'cash' | ... ? TBD
-        // info:   'extra information to display on the payment terminal' ... ? TBD
-        payment_request: function(price, method, info){
+        payment_request: function(price){
+            var ret = new $.Deferred();
             this.paying = true;
-            this.payment_status = 'waiting_for_payment';
-            if(debug_devices){
-                debug_devices.payment_status = 'waiting_for_payment';
-            }
-            this.message('payment_request',{'price':price,'method':method,'info':info});
+            this.custom_payment_status = this.default_payment_status;
+            return this.message('payment_request',{'price':price});
         },
 
-        // is called at regular interval after a payment request to see if the client
-        // has paid the required money
-        // returns 'waiting_for_payment' | 'payment_accepted' | 'payment_rejected'
-        is_payment_accepted: function(){
-            var self = this;
-            if(debug_devices.active){
-                return debug_devices.payment_status;
+        payment_status: function(){
+            if(this.bypass_proxy){
+                this.bypass_proxy = false;
+                return (new $.Deferred()).resolve(this.custom_payment_status);
             }else{
-                this.message('is_payment_accepted', {}, function(payment_status){
-                    if(self.paying){
-                        self.payment_status = payment_status;
-                    }
-                });
-                return self.payment_status;
+                return this.message('payment_status');
             }
         },
+        
+        // override what the proxy says and accept the payment
+        debug_accept_payment: function(){
+            this.bypass_proxy = true;
+            this.custom_payment_status = {
+                status: 'paid',
+                message: 'Successfull Payment, have a nice day',
+                payment_method: 'AMEX',
+                receipt_client: '<xml>bla</xml>',
+                receipt_shop:   '<xml>bla</xml>',
+            };    
+        },
 
+        // override what the proxy says and reject the payment
+        debug_reject_payment: function(){
+            this.bypass_proxy = true;
+            this.custom_payment_status = {
+                status: 'error-rejected',
+                message: 'Sorry you don\'t have enough money :(',
+            };    
+        },
         // the client cancels his payment
-        payment_canceled: function(){
+        payment_cancel: function(){
             this.paying = false;
-            this.payment_status = 'waiting_for_payment';
-            this.message('payment_canceled');
+            this.custom_payment_status = 'waiting_for_payment';
+            return this.message('payment_cancel');
         },
 
         // called when the client logs in or starts to scan product
         transaction_start: function(){
-            this.message('transaction_start');
+            return this.message('transaction_start');
         },
 
         // called when the clients has finished his interaction with the machine
         transaction_end: function(){
-            this.message('transaction_end');
+            return this.message('transaction_end');
         },
 
         // called when the POS turns to cashier mode
         cashier_mode_activated: function(){
-            this.message('cashier_mode_activated');
+            return this.message('cashier_mode_activated');
         },
 
         // called when the POS turns to client mode
         cashier_mode_deactivated: function(){
-            this.message('cashier_mode_deactivated');
+            return this.message('cashier_mode_deactivated');
         },
         
         // ask for the cashbox (the physical box where you store the cash) to be opened
         open_cashbox: function(){
-            this.message('open_cashbox');
+            return this.message('open_cashbox');
         },
 
         /* ask the printer to print a receipt
@@ -184,6 +200,8 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
          *          price_with_tax:     (number) the price paid for this orderline, tax included
          *          price_without_tax:  (number) the price paid for this orderline, without taxes
          *          tax:                (number) the price paid in taxes on this orderline
+         *          product_description:         (string) generic description of the product
+         *          product_description_sale:    (string) sales related information of the product
          *     }
          *  - paymentlines : list of paymentlines :
          *     {
@@ -208,7 +226,12 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
          *    }
          */
         print_receipt: function(receipt){
-            this.message('print_receipt',{receipt: receipt});
+            return this.message('print_receipt',{receipt: receipt});
+        },
+
+        // asks the proxy to print an invoice in pdf form ( used to print invoices generated by the server ) 
+        print_pdf_invoice: function(pdfinvoice){
+            return this.message('print_pdf_invoice',{pdfinvoice: pdfinvoice});
         },
     });
 
@@ -235,6 +258,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             this.cashier_prefix_set  = attributes.cashier_prefix_set  ||  {'041':''};
             this.client_prefix_set   = attributes.client_prefix_set   ||  {'042':''};
         },
+
         save_callbacks: function(){
             var callbacks = {};
             for(name in this.action_callback){
@@ -242,6 +266,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             }
             this.action_callback_stack.push(callbacks);
         },
+
         restore_callbacks: function(){
             if(this.action_callback_stack.length){
                 var callbacks = this.action_callback_stack.pop();
@@ -335,7 +360,6 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
                 value: 0,
                 unit: 'none',
             };
-            console.log('ean',ean);
 
             function match_prefix(prefix_set, type){
                 for(prefix in prefix_set){
@@ -378,6 +402,23 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
             return parse_result;
         },
 
+        on_ean: function(ean){
+            var parse_result = this.parse_ean(ean);
+
+            if (parse_result.type === 'error') {    //most likely a checksum error, raise warning
+                console.warn('WARNING: barcode checksum error:',parse_result);
+            }else if(parse_result.type in {'unit':'', 'weight':'', 'price':''}){    //ean is associated to a product
+                if(this.action_callback['product']){
+                    this.action_callback['product'](parse_result);
+                }
+                //this.trigger("codebar",parse_result );
+            }else{
+                if(this.action_callback[parse_result.type]){
+                    this.action_callback[parse_result.type](parse_result);
+                }
+            }
+        },
+
         // starts catching keyboard events and tries to interpret codebar 
         // calling the callbacks when needed.
         connect: function(){
@@ -408,21 +449,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
                     lastTimeStamp = new Date().getTime();
                     if (codeNumbers.length == 13) {
                         //We have found what seems to be a valid codebar
-                        var parse_result = self.parse_ean(codeNumbers.join(''));
-
-                        if (parse_result.type === 'error') {    //most likely a checksum error, raise warning
-                            console.warn('WARNING: barcode checksum error:',parse_result);
-                        }else if(parse_result.type in {'unit':'', 'weight':'', 'price':''}){    //ean is associated to a product
-                            if(self.action_callback['product']){
-                                self.action_callback['product'](parse_result);
-                            }
-                            //this.trigger("codebar",parse_result );
-                        }else{
-                            if(self.action_callback[parse_result.type]){
-                                self.action_callback[parse_result.type](parse_result);
-                            }
-                        }
-
+                        self.on_ean(codeNumbers.join(''));
                         codeNumbers = [];
                     }
                 } else {
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index a1f6def6bf3..f1462424f1e 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -1,9 +1,6 @@
 function openerp_pos_models(instance, module){ //module is instance.point_of_sale
     var QWeb = instance.web.qweb;
 
-    var fetch = function(model, fields, domain, ctx){
-        return new instance.web.Model(model).query(fields).filter(domain).context(ctx).all()
-    };
     
     // The PosModel contains the Point Of Sale's representation of the backend.
     // Since the PoS must work in standalone ( Without connection to the server ) 
@@ -27,6 +24,8 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             this.proxy = new module.ProxyDevice();              // used to communicate to the hardware devices via a local proxy
             this.db = new module.PosLS();                       // a database used to store the products and categories
             this.db.clear('products','categories');
+            this.debug = jQuery.deparam(jQuery.param.querystring()).debug !== undefined;    //debug mode
+
 
             // default attributes values. If null, it will be loaded below.
             this.set({
@@ -51,19 +50,38 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 'units':            null,
                 'units_by_id':      null,
 
-                'selectedOrder':    undefined,
+                'selectedOrder':    null,
             });
 
             this.get('orders').bind('remove', function(){ self.on_removed_order(); });
             
             // We fetch the backend data on the server asynchronously. this is done only when the pos user interface is launched,
             // Any change on this data made on the server is thus not reflected on the point of sale until it is relaunched. 
+            // when all the data has loaded, we compute some stuff, and declare the Pos ready to be used. 
+            $.when(this.load_server_data())
+                .done(function(){
+                    //self.log_loaded_data(); //Uncomment if you want to log the data to the console for easier debugging
+                    self.ready.resolve();
+                }).fail(function(){
+                    //we failed to load some backend data, or the backend was badly configured.
+                    //the error messages will be displayed in PosWidget
+                    self.ready.reject();
+                });
+        },
 
-            var loaded = fetch('res.users',['name','company_id'],[['id','=',this.session.uid]]) 
-                .pipe(function(users){
+        // helper function to load data from the server
+        fetch: function(model, fields, domain, ctx){
+            return new instance.web.Model(model).query(fields).filter(domain).context(ctx).all()
+        },
+        // loads all the needed data on the sever. returns a deferred indicating when all the data has loaded. 
+        load_server_data: function(){
+            var self = this;
+
+            var loaded = self.fetch('res.users',['name','company_id'],[['id','=',this.session.uid]]) 
+                .then(function(users){
                     self.set('user',users[0]);
 
-                    return fetch('res.company',
+                    return self.fetch('res.company',
                     [
                         'currency_id',
                         'email',
@@ -75,19 +93,19 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                         'partner_id',
                     ],
                     [['id','=',users[0].company_id[0]]]);
-                }).pipe(function(companies){
+                }).then(function(companies){
                     self.set('company',companies[0]);
 
-                    return fetch('res.partner',['contact_address'],[['id','=',companies[0].partner_id[0]]]);
-                }).pipe(function(company_partners){
+                    return self.fetch('res.partner',['contact_address'],[['id','=',companies[0].partner_id[0]]]);
+                }).then(function(company_partners){
                     self.get('company').contact_address = company_partners[0].contact_address;
 
-                    return fetch('res.currency',['symbol','position'],[['id','=',self.get('company').currency_id[0]]]);
-                }).pipe(function(currencies){
+                    return self.fetch('res.currency',['symbol','position'],[['id','=',self.get('company').currency_id[0]]]);
+                }).then(function(currencies){
                     self.set('currency',currencies[0]);
 
-                    return fetch('product.uom', null, null);
-                }).pipe(function(units){
+                    return self.fetch('product.uom', null, null);
+                }).then(function(units){
                     self.set('units',units);
                     var units_by_id = {};
                     for(var i = 0, len = units.length; i < len; i++){
@@ -95,27 +113,27 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     }
                     self.set('units_by_id',units_by_id);
                     
-                    return fetch('product.packaging', null, null);
-                }).pipe(function(packagings){
+                    return self.fetch('product.packaging', null, null);
+                }).then(function(packagings){
                     self.set('product.packaging',packagings);
 
-                    return fetch('res.users', ['name','ean13'], [['ean13', '!=', false]]);
-                }).pipe(function(users){
+                    return self.fetch('res.users', ['name','ean13'], [['ean13', '!=', false]]);
+                }).then(function(users){
                     self.set('user_list',users);
 
-                    return fetch('account.tax', ['amount', 'price_include', 'type']);
-                }).pipe(function(taxes){
+                    return self.fetch('account.tax', ['amount', 'price_include', 'type']);
+                }).then(function(taxes){
                     self.set('taxes', taxes);
 
-                    return fetch(
+                    return self.fetch(
                         'pos.session', 
                         ['id', 'journal_ids','name','user_id','config_id','start_at','stop_at'],
                         [['state', '=', 'opened'], ['user_id', '=', self.session.uid]]
                     );
-                }).pipe(function(sessions){
+                }).then(function(sessions){
                     self.set('pos_session', sessions[0]);
 
-                    return fetch(
+                    return self.fetch(
                         'pos.config',
                         ['name','journal_ids','shop_id','journal_id',
                          'iface_self_checkout', 'iface_led', 'iface_cashdrawer',
@@ -123,7 +141,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                          'iface_print_via_proxy','iface_cashdrawer','state','sequence_id','session_ids'],
                         [['id','=', self.get('pos_session').config_id[0]]]
                     );
-                }).pipe(function(configs){
+                }).then(function(configs){
                     var pos_config = configs[0];
                     self.set('pos_config', pos_config);
                     self.iface_electronic_scale    =  !!pos_config.iface_electronic_scale;  
@@ -132,33 +150,41 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     self.iface_self_checkout       =  !!pos_config.iface_self_checkout;
                     self.iface_cashdrawer          =  !!pos_config.iface_cashdrawer;
 
-                    return fetch('sale.shop',[],[['id','=',pos_config.shop_id[0]]]);
-                }).pipe(function(shops){
+                    return self.fetch('sale.shop',[],[['id','=',pos_config.shop_id[0]]]);
+                }).then(function(shops){
                     self.set('shop',shops[0]);
 
-                    return fetch('pos.category', ['id','name','parent_id','child_id','image'])
-                }).pipe(function(categories){
+                    return self.fetch('product.packaging',['ean','product_id']);
+                }).then(function(packagings){
+                    self.db.add_packagings(packagings);
+
+                    return self.fetch('pos.category', ['id','name','parent_id','child_id','image'])
+                }).then(function(categories){
                     self.db.add_categories(categories);
 
-                    return fetch(
+                    return self.fetch(
                         'product.product', 
-                        ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type'],
-                        [['pos_categ_id','!=', false]],
+                        ['name', 'list_price','price','pos_categ_id', 'taxes_id', 'ean13', 
+                         'to_weight', 'uom_id', 'uos_id', 'uos_coeff', 'mes_type', 'description_sale', 'description'],
+                        [['pos_categ_id','!=', false],['sale_ok','=',true]],
                         {pricelist: self.get('shop').pricelist_id[0]} // context for price
                     );
-                }).pipe(function(products){
+                }).then(function(products){
                     self.db.add_products(products);
 
-                    return fetch(
+                    return self.fetch(
                         'account.bank.statement',
                         ['account_id','currency','journal_id','state','name','user_id','pos_session_id'],
                         [['state','=','open'],['pos_session_id', '=', self.get('pos_session').id]]
                     );
-                }).pipe(function(bank_statements){
+                }).then(function(bank_statements){
+                    var journals = new Array();
+                    _.each(bank_statements,function(statement) {
+                        journals.push(statement.journal_id[0])
+                    });
                     self.set('bank_statements', bank_statements);
-
-                    return fetch('account.journal', undefined, [['user_id','=', self.get('pos_session').user_id[0]]]);
-                }).pipe(function(journals){
+                    return self.fetch('account.journal', undefined, [['id','in', journals]]);
+                }).then(function(journals){
                     self.set('journals',journals);
 
                     // associate the bank statements with their journals. 
@@ -173,17 +199,8 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                     }
                     self.set({'cashRegisters' : new module.CashRegisterCollection(self.get('bank_statements'))});
                 });
-
-            // when all the data has loaded, we compute some stuff, and declare the Pos ready to be used. 
-            $.when(loaded)
-                .then(function(){ 
-                    //self.log_loaded_data(); //Uncomment if you want to log the data to the console for easier debugging
-                    self.ready.resolve();
-                },function(){
-                    //we failed to load some backend data, or the backend was badly configured.
-                    //the error messages will be displayed in PosWidget
-                    self.ready.reject();
-                });
+        
+            return loaded;
         },
 
         // logs the usefull posmodel data to the console for debug purposes
@@ -219,6 +236,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
 
         // saves the order locally and try to send it to the backend. 'record' is a bizzarely defined JSON version of the Order
         push_order: function(record) {
+            console.log('PUSHING NEW ORDER:',record);
             this.db.add_order(record);
             this.flush();
         },
@@ -234,10 +252,15 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         // and remove the successfully sent ones from the db once
         // it has been confirmed that they have been sent correctly.
         flush: function() {
+            //TODO make the mutex work 
+            console.log('FLUSH');
             //this makes sure only one _int_flush is called at the same time
+            /*
             return this.flush_mutex.exec(_.bind(function() {
                 return this._flush(0);
             }, this));
+            */
+            this._flush(0);
         },
         // attempts to send an order of index 'index' in the list of order to send. The index
         // is used to skip orders that failed. do not call this method outside the mutex provided
@@ -246,6 +269,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             var self = this;
             var orders = this.db.get_orders();
             self.set('nbr_pending_operations',orders.length);
+            console.log('TRYING TO FLUSH ORDER:',index,'Of',orders.length);
 
             var order  = orders[index];
             if(!order){
@@ -261,6 +285,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 })
                 .done(function(){
                     //remove from db if success
+                    console.log('Order successfully sent');
                     self.db.remove_order(order.id);
                     self._flush(index);
                 });
@@ -294,6 +319,9 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
     });
 
     module.Product = Backbone.Model.extend({
+        get_image_url: function(){
+            return instance.session.url('/web/binary/image', {model: 'product.product', field: 'image', id: this.get('id')});
+        },
     });
 
     module.ProductCollection = Backbone.Collection.extend({
@@ -323,7 +351,6 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         get_discount: function(){
             return this.discount;
         },
-        // FIXME
         get_product_type: function(){
             return this.type;
         },
@@ -417,6 +444,8 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 price_with_tax :    this.get_price_with_tax(),
                 price_without_tax:  this.get_price_without_tax(),
                 tax:                this.get_tax(),
+                product_description:      this.get_product().get('description'),
+                product_description_sale: this.get_product().get('description_sale'),
             };
         },
         get_price_without_tax: function(){
@@ -436,7 +465,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             
             var product_list = this.pos.get('product_list');
             var product =  this.get_product(); 
-            var taxes_ids = product.taxes_id;
+            var taxes_ids = product.get('taxes_id');;
             var taxes =  self.pos.get('taxes');
             var taxtotal = 0;
             _.each(taxes_ids, function(el) {
@@ -537,6 +566,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
             this.pos =     attributes.pos; 
             this.selected_orderline = undefined;
             this.screen_data = {};  // see ScreenSelector
+            this.receipt_type = 'receipt';  // 'receipt' || 'invoice'
             return this;
         },
         generateUniqueId: function() {
@@ -587,6 +617,11 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
                 return sum + orderLine.get_price_with_tax();
             }), 0);
         },
+        getDiscountTotal: function() {
+            return (this.get('orderLines')).reduce((function(sum, orderLine) {
+                return sum + (orderLine.get_list_price() * (orderLine.get_discount()/100) * orderLine.get_quantity());
+            }), 0);
+        },
         getTotalTaxExcluded: function() {
             return (this.get('orderLines')).reduce((function(sum, orderLine) {
                 return sum + orderLine.get_price_without_tax();
@@ -608,6 +643,13 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
         getDueLeft: function() {
             return this.getTotal() - this.getPaidTotal();
         },
+        // sets the type of receipt 'receipt'(default) or 'invoice'
+        set_receipt_type: function(type){
+            this.receipt_type = type;
+        },
+        get_receipt_type: function(){
+            return this.receipt_type;
+        },
         // the client related to the current order.
         set_client: function(client){
             this.set('client',client);
diff --git a/addons/point_of_sale/static/src/js/screens.js b/addons/point_of_sale/static/src/js/screens.js
index 738eadb08c5..0b8ab70a9c0 100644
--- a/addons/point_of_sale/static/src/js/screens.js
+++ b/addons/point_of_sale/static/src/js/screens.js
@@ -65,6 +65,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         },
         close_popup: function(){
             if(this.current_popup){
+                this.current_popup.close();
                 this.current_popup.hide();
                 this.current_popup = null;
             }
@@ -153,7 +154,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         },
 
         barcode_product_screen:         'products',     //if defined, this screen will be loaded when a product is scanned
-        barcode_product_error_popup:    'error',    //if defined, this popup will be loaded when there's an error in the popup
+        barcode_product_error_popup:    'error-product',    //if defined, this popup will be loaded when there's an error in the popup
 
         // what happens when a product is scanned : 
         // it will add the product to the order and go to barcode_product_screen. Or show barcode_product_error_popup if 
@@ -188,7 +189,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     return true;
                 }
             }
-            this.pos.proxy.scan_item_unrecognized(ean);
+            this.pos.proxy.scan_item_error_unrecognized(ean);
             return false;
         },
         
@@ -206,7 +207,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     return true;
                 }
             }
-            this.pos.proxy.scan_item_unrecognized(ean);
+            this.pos.proxy.scan_item_error_unrecognized(ean);
             return false;
             //TODO start the transaction
         },
@@ -225,13 +226,13 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         // with add_action_button()
         show_action_bar: function(){
             this.pos_widget.action_bar.show();
-            this.$element.css({'bottom':'105px'});
+            this.$el.css({'bottom':'105px'});
         },
 
         // hides the action bar. The actionbar is automatically hidden when it is empty
         hide_action_bar: function(){
             this.pos_widget.action_bar.hide();
-            this.$element.css({'bottom':'0px'});
+            this.$el.css({'bottom':'0px'});
         },
 
         // adds a new button to the action bar. The button definition takes three parameters, all optional :
@@ -250,8 +251,8 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             var self = this;
 
             this.hidden = false;
-            if(this.$element){
-                this.$element.show();
+            if(this.$el){
+                this.$el.show();
             }
 
             if(this.pos_widget.action_bar.get_button_count() > 0){
@@ -311,8 +312,8 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         // POS initialization.
         hide: function(){
             this.hidden = true;
-            if(this.$element){
-                this.$element.hide();
+            if(this.$el){
+                this.$el.hide();
             }
         },
 
@@ -323,8 +324,8 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         renderElement: function(){
             this._super();
             if(this.hidden){
-                if(this.$element){
-                    this.$element.hide();
+                if(this.$el){
+                    this.$el.hide();
                 }
             }
         },
@@ -332,13 +333,18 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
     module.PopUpWidget = module.PosBaseWidget.extend({
         show: function(){
-            if(this.$element){
-                this.$element.show();
+            if(this.$el){
+                this.$el.show();
             }
         },
+        /* called before hide, when a popup is closed */
+        close: function(){
+        },
+        /* hides the popup. keep in mind that this is called in the initialization pass of the 
+         * pos instantiation, so you don't want to do anything fancy in here */
         hide: function(){
-            if(this.$element){
-                this.$element.hide();
+            if(this.$el){
+                this.$el.hide();
             }
         },
     });
@@ -350,11 +356,42 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this.pos.proxy.help_needed();
             var self = this;
             
-            this.$element.find('.button').off('click').click(function(){
+            this.$el.find('.button').off('click').click(function(){
                 self.pos_widget.screen_selector.close_popup();
-                self.pos.proxy.help_canceled();
             });
         },
+        close:function(){
+            this.pos.proxy.help_canceled();
+        },
+    });
+
+    module.ChooseReceiptPopupWidget = module.PopUpWidget.extend({
+        template:'ChooseReceiptPopupWidget',
+        show: function(){
+            console.log('show');
+            this._super();
+            this.renderElement();
+            var self = this;
+            var currentOrder = self.pos.get('selectedOrder');
+            
+            this.$('.button.receipt').off('click').click(function(){
+                currentOrder.set_receipt_type('receipt');
+                self.pos_widget.screen_selector.set_current_screen('products');
+            });
+
+            this.$('.button.invoice').off('click').click(function(){
+                currentOrder.set_receipt_type('invoice');
+                self.pos_widget.screen_selector.set_current_screen('products');
+            });
+        },
+        get_client_name: function(){
+            var client = this.pos.get('selectedOrder').get_client();
+            if( client ){
+                return client.name;
+            }else{
+                return '';
+            }
+        },
     });
 
     module.ErrorPopupWidget = module.PopUpWidget.extend({
@@ -374,6 +411,9 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
                     self.pos_widget.screen_selector.set_user_mode('cashier');
                 },
             });
+            this.$('.footer .button').off('click').click(function(){
+                self.pos_widget.screen_selector.close_popup();
+            });
         },
         close:function(){
             this._super();
@@ -382,12 +422,12 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         },
     });
 
-    module.ErrorProductNotRecognizedPopupWidget = module.ErrorPopupWidget.extend({
-        template:'ErrorProductNotRecognizedPopupWidget',
+    module.ProductErrorPopupWidget = module.ErrorPopupWidget.extend({
+        template:'ProductErrorPopupWidget',
     });
 
-    module.ErrorNoSessionPopupWidget = module.ErrorPopupWidget.extend({
-        template:'ErrorNoSessionPopupWidget',
+    module.ErrorSessionPopupWidget = module.ErrorPopupWidget.extend({
+        template:'ErrorSessionPopupWidget',
     });
 
     module.ScaleInviteScreenWidget = module.ScreenWidget.extend({
@@ -492,10 +532,6 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             var product = this.get_product();
             return (product ? product.get('list_price') : 0) || 0;
         },
-        get_product_image: function(){
-            var product = this.get_product();
-            return product ? product.get('image') : undefined;
-        },
         get_product_weight: function(){
             return this.weight || 0;
         },
@@ -506,6 +542,60 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         },
     });
 
+    // the JobQueue schedules a sequence of 'jobs'. each job is
+    // a function returning a deferred. the queue waits for each job to finish 
+    // before launching the next. Each job can also be scheduled with a delay. 
+    // the queue jobqueue is used to prevent parallel requests to the payment terminal.
+
+    module.JobQueue = function(){
+        var queue = [];
+        var running = false;
+        var run = function(){
+            if(queue.length > 0){
+                running = true;
+                var job = queue.shift();
+                setTimeout(function(){
+                    var def = job.fun();
+                    if(def){
+                        def.done(run);
+                    }else{
+                        run();
+                    }
+                },job.delay || 0);
+            }else{
+                running = false;
+            }
+        };
+        
+        // adds a job to the schedule.
+        this.schedule  = function(fun, delay){
+            queue.push({fun:fun, delay:delay});
+            if(!running){
+                run();
+            }
+        }
+
+        // remove all jobs from the schedule
+        this.clear = function(){
+            queue = [];
+        };
+    };
+
+    /*
+    module.BasicPaymentScreen = module.ScreenWidget.extend({
+        queue: new JobQueue(),
+        start_payment_transaction: function(){
+        },
+        update_payment_transaction: function(){
+        },
+        cancel_payment_transaction: function(){
+        },
+        show: function(){
+            this._super();
+        },
+    });
+    */
+
     module.ClientPaymentScreenWidget =  module.ScreenWidget.extend({
         template:'ClientPaymentScreenWidget',
 
@@ -515,52 +605,102 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         show: function(){
             this._super();
             var self = this;
+           
+            this.queue = new module.JobQueue();
+            this.canceled = false;
+            this.paid     = false;
 
-            this.pos.proxy.payment_request(this.pos.get('selectedOrder').getDueLeft(),'card','info');    //TODO TOTAL
-
-            this.intervalID = setInterval(function(){
-                var payment = self.pos.proxy.is_payment_accepted();
-                if(payment === 'payment_accepted'){
-                    clearInterval(this.intervalID);
-
-                    var currentOrder = self.pos.get('selectedOrder');
-                    
-                    //we get the first cashregister marked as self-checkout
-                    var selfCheckoutRegisters = [];
-                    for(var i = 0; i < this.pos.get('cashRegisters').models.length; i++){
-                        var cashregister = this.pos.get('cashRegisters').models[i];
-                        if(cashregister.self_checkout_payment_method){
-                            selfCheckoutRegisters.push(cashregister);
+            // initiates the connection to the payment terminal and starts the update requests
+            this.start = function(){
+                var def = new $.Deferred();
+                console.log("START");
+                self.pos.proxy.payment_request(self.pos.get('selectedOrder').getDueLeft())
+                    .done(function(ack){
+                        if(ack === 'ok'){
+                            self.queue.schedule(self.update);
+                        }else if(ack.indexOf('error') === 0){
+                            console.error('cannot make payment. TODO');
+                        }else{
+                            console.error('unknown payment request return value:',ack);
                         }
-                    }
-
-                    var cashregister = selfCheckoutRegisters[0] || this.pos.get('cashRegisters').models[0];
-                    currentOrder.addPaymentLine(cashregister);
-
-                    self.pos.push_order(currentOrder.exportAsJSON()).then(function() {
-                        currentOrder.destroy();
-                        self.pos.proxy.transaction_end();
-                        self.pos_widget.screen_selector.set_current_screen(self.next_screen);
+                        console.log("START_END");
+                        def.resolve();
                     });
-                }else if(payment === 'payment_rejected'){
-                    clearInterval(this.intervalID);
-                    //TODO show a tryagain thingie ? 
+                return def;
+            };
+            
+            // gets updated status from the payment terminal and performs the appropriate consequences
+            this.update = function(){
+                console.log("UPDATE");
+                var def = new $.Deferred();
+                if(self.canceled){
+                    console.log("UPDATE_END");
+                    return def.resolve();
                 }
-            },500);
+                self.pos.proxy.payment_status()
+                    .done(function(status){
+                        if(status.status === 'paid'){
+
+                            var currentOrder = self.pos.get('selectedOrder');
+                            
+                            //we get the first cashregister marked as self-checkout
+                            var selfCheckoutRegisters = [];
+                            for(var i = 0; i < self.pos.get('cashRegisters').models.length; i++){
+                                var cashregister = self.pos.get('cashRegisters').models[i];
+                                if(cashregister.self_checkout_payment_method){
+                                    selfCheckoutRegisters.push(cashregister);
+                                }
+                            }
+
+                            var cashregister = selfCheckoutRegisters[0] || self.pos.get('cashRegisters').models[0];
+                            currentOrder.addPaymentLine(cashregister);
+                            self.pos.push_order(currentOrder.exportAsJSON())
+                            currentOrder.destroy();
+                            self.pos.proxy.transaction_end();
+                            self.pos_widget.screen_selector.set_current_screen(self.next_screen);
+                            self.paid = true;
+                        }else if(status.status.indexOf('error') === 0){
+                            console.error('error in payment request. TODO');
+                        }else if(status.status === 'waiting'){
+                            self.queue.schedule(self.update,200);
+                        }else{
+                            console.error('unknown status value:',status.status);
+                        }
+                        console.log("UPDATE_END");
+                        def.resolve();
+                    });
+                return def;
+            }
+            
+            // cancels a payment.
+            this.cancel = function(){
+                console.log("CANCEL");
+                if(!self.paid && !self.canceled){
+                    self.canceled = true;
+                    self.pos.proxy.payment_cancel();
+                    self.pos_widget.screen_selector.set_current_screen(self.previous_screen);
+                    self.queue.clear();
+                }
+                console.log("CANCEL_END");
+                return (new $.Deferred()).resolve();
+            }
+
+            this.queue.schedule(this.start);
 
             this.add_action_button({
                     label: 'back',
                     icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png',
                     click: function(){  
-                        clearInterval(this.intervalID);
-                        self.pos.proxy.payment_canceled();
-                        self.pos_widget.screen_selector.set_current_screen(self.previous_screen);
+                       self.queue.schedule(self.cancel);
                     }
                 });
         },
         close: function(){
+            if(this.queue){
+                this.queue.schedule(this.cancel);
+            }
+            //TODO CANCEL
             this._super();
-            clearInterval(this.intervalID);
         },
     });
 
@@ -571,19 +711,35 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
 
         show_numpad:     false,
         show_leftpane:   false,
+        barcode_product_action: function(ean){
+            this.pos.proxy.transaction_start();
+            this._super(ean);
+        },
 
         barcode_client_action: function(ean){
+            this.pos.proxy.transaction_start();
             this._super(ean);
-            this.pos_widget.screen_selector.set_current_screen(this.next_screen);
+            $('.goodbye-message').hide();
+            this.pos_widget.screen_selector.show_popup('choose-receipt');
         },
         
         show: function(){
             this._super();
             var self = this;
+
+            this.add_action_button({
+                    label: 'help',
+                    icon: '/point_of_sale/static/src/img/icons/png48/help.png',
+                    click: function(){ 
+                        $('.goodbye-message').css({opacity:1}).hide();
+                        self.help_button_action();
+                    },
+                });
+
             $('.goodbye-message').css({opacity:1}).show();
             setTimeout(function(){
                 $('.goodbye-message').animate({opacity:0},500,'swing',function(){$('.goodbye-message').hide();});
-            },3000);
+            },5000);
         },
     });
     
@@ -700,7 +856,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
         },
         refresh: function() {
             this.currentOrder = this.pos.get('selectedOrder');
-            $('.pos-receipt-container', this.$element).html(QWeb.render('PosTicket',{widget:this}));
+            $('.pos-receipt-container', this.$el).html(QWeb.render('PosTicket',{widget:this}));
         },
     });
 
@@ -735,11 +891,15 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             
             this.validate_button = this.add_action_button({
                     label: 'Validate',
+                    name: 'validation',
                     icon: '/point_of_sale/static/src/img/icons/png48/validate.png',
                     click: function(){
                         self.validateCurrentOrder();
                     },
                 });
+
+            this.updatePaymentSummary();
+            this.$('.paymentline-amout input').last().focus();
         },
         close: function(){
             this._super();
@@ -778,10 +938,13 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this.renderElement();
         },
         addPaymentLine: function(newPaymentLine) {
+            var self = this;
             var x = new module.PaymentlineWidget(null, {
                     payment_line: newPaymentLine
-                });
-            x.on_delete.add(_.bind(this.deleteLine, this, x));
+            });
+            x.on('delete_payment_line', self, function(r) {
+                self.deleteLine(r);
+            });
             x.appendTo(this.$('#paymentlines'));
         },
         renderElement: function() {
@@ -806,6 +969,12 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
             this.$('#payment-paid-total').html(paidTotal.toFixed(2));
             this.$('#payment-remaining').html(remaining.toFixed(2));
             this.$('#payment-change').html(change.toFixed(2));
+            if((currentOrder.selected_orderline == undefined))
+                remaining = 1
+                
+            if(this.pos_widget.action_bar){
+                this.pos_widget.action_bar.set_button_disabled('validation', remaining > 0);
+            }
         },
         set_numpad_state: function(numpadState) {
         	if (this.numpadState) {
@@ -824,7 +993,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
     		this.numpadState.set({mode: 'payment'});
     	},
         set_value: function(val) {
-        	this.currentPaymentLines.last().set({amount: val});
+        	this.currentPaymentLines.last().set_amount(val);
         },
     });
 
diff --git a/addons/point_of_sale/static/src/js/widget_base.js b/addons/point_of_sale/static/src/js/widget_base.js
index 62097f39db3..0aa0a44e7e7 100644
--- a/addons/point_of_sale/static/src/js/widget_base.js
+++ b/addons/point_of_sale/static/src/js/widget_base.js
@@ -35,10 +35,10 @@ function openerp_pos_basewidget(instance, module){ //module is instance.point_of
 
         },
         show: function(){
-            this.$element.show();
+            this.$el.show();
         },
         hide: function(){
-            this.$element.hide();
+            this.$el.hide();
         },
     });
 
diff --git a/addons/point_of_sale/static/src/js/widget_scrollbar.js b/addons/point_of_sale/static/src/js/widget_scrollbar.js
index 7c765028231..e4660a9c458 100644
--- a/addons/point_of_sale/static/src/js/widget_scrollbar.js
+++ b/addons/point_of_sale/static/src/js/widget_scrollbar.js
@@ -63,12 +63,12 @@ function openerp_pos_scrollbar(instance, module){ //module is instance.point_of_
             this.update_scroller_dimensions(false);
             this.update_button_status();
             this.auto_hide(false);
-            this.$element.bind('mousewheel',function(event,delta){
+            this.$el.bind('mousewheel',function(event,delta){
                 self.scroll(delta*self.wheel_step);
                 return false;
             });
-            this.$element.bind('click',function(event){
-                var vpos = event.pageY - self.$element.offset().top;
+            this.$el.bind('click',function(event){
+                var vpos = event.pageY - self.$el.offset().top;
                 var spos = self.scroller_dimensions();
                 if(vpos > spos.bar_pos && vpos < spos.pos){
                     self.page_up();
@@ -106,9 +106,9 @@ function openerp_pos_scrollbar(instance, module){ //module is instance.point_of_
         // shows the scrollbar. if animated is true, it will do it in an animated fashion
         show: function(animated){   //FIXME: animated show and hide don't work ... ? 
             if(animated){
-                this.$element.show().animate({'width':'48px'}, 500, 'swing');
+                this.$el.show().animate({'width':'48px'}, 500, 'swing');
             }else{
-                this.$element.show().css('width','48px');
+                this.$el.show().css('width','48px');
             }
             this.on_show(this);
         },
@@ -117,9 +117,9 @@ function openerp_pos_scrollbar(instance, module){ //module is instance.point_of_
         hide: function(animated){
             var self = this;
             if(animated){
-                this.$element.animate({'width':'0px'}, 500, 'swing', function(){ self.$element.hide();});
+                this.$el.animate({'width':'0px'}, 500, 'swing', function(){ self.$el.hide();});
             }else{
-                this.$element.hide().css('width','0px');
+                this.$el.hide().css('width','0px');
             }
             this.on_hide(this);
         },
@@ -136,7 +136,7 @@ function openerp_pos_scrollbar(instance, module){ //module is instance.point_of_
             var button_up_height = this.$('.up-button')[0].offsetHeight || 48;
             var button_down_height = this.$('.down-button')[0].offsetHeight || 48;
             
-            var bar_height = this.$element[0].offsetHeight || 96;
+            var bar_height = this.$el[0].offsetHeight || 96;
             var scrollbar_height = bar_height - button_up_height - button_down_height;
             
             scroller_pos = scroller_pos * scrollbar_height + button_up_height;
@@ -205,7 +205,7 @@ function openerp_pos_scrollbar(instance, module){ //module is instance.point_of_
                 if(this.target_selector){
                     return this.target_widget.$(this.target_selector);
                 }else{
-                    return this.target_widget.$element;
+                    return this.target_widget.$el;
                 }
             }else if(this.target_selector){
                 return $(this.target_selector);
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index c3bd73ca35a..4728c584b21 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -61,10 +61,10 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         start: function() {
             this.state.bind('change:mode', this.changedMode, this);
             this.changedMode();
-            this.$element.find('button#numpad-backspace').click(_.bind(this.clickDeleteLastChar, this));
-            this.$element.find('button#numpad-minus').click(_.bind(this.clickSwitchSign, this));
-            this.$element.find('button.number-char').click(_.bind(this.clickAppendNewChar, this));
-            this.$element.find('button.mode-button').click(_.bind(this.clickChangeMode, this));
+            this.$el.find('button#numpad-backspace').click(_.bind(this.clickDeleteLastChar, this));
+            this.$el.find('button#numpad-minus').click(_.bind(this.clickSwitchSign, this));
+            this.$el.find('button.number-char').click(_.bind(this.clickAppendNewChar, this));
+            this.$el.find('button.mode-button').click(_.bind(this.clickChangeMode, this));
         },
         clickDeleteLastChar: function() {
             return this.state.deleteLastChar();
@@ -84,7 +84,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         changedMode: function() {
             var mode = this.state.get('mode');
             $('.selected-mode').removeClass('selected-mode');
-            $(_.str.sprintf('.mode-button[data-mode="%s"]', mode), this.$element).addClass('selected-mode');
+            $(_.str.sprintf('.mode-button[data-mode="%s"]', mode), this.$el).addClass('selected-mode');
         },
     });
 
@@ -102,7 +102,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                     pos_widget : self.pos_widget,
                     cashRegister: cashRegister,
                 });
-                button.appendTo(self.$element);
+                button.appendTo(self.$el);
             });
         }
     });
@@ -117,7 +117,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             var self = this;
             this._super();
 
-            this.$element.click(function(){
+            this.$el.click(function(){
                 if (self.pos.get('selectedOrder').get('screen') === 'receipt'){  //TODO Why ?
                     console.warn('TODO should not get there...?');
                     return;
@@ -142,21 +142,19 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
         click_handler: function() {
             this.order.selectLine(this.model);
-            this.on_selected();
+            this.trigger('order_line_selected');
         },
         renderElement: function() {
             this._super();
-            this.$element.click(_.bind(this.click_handler, this));
+            this.$el.click(_.bind(this.click_handler, this));
             if(this.model.is_selected()){
-                this.$element.addClass('selected');
+                this.$el.addClass('selected');
             }
         },
         refresh: function(){
             this.renderElement();
-            this.on_refresh();
+            this.trigger('order_line_refreshed');
         },
-        on_selected: function() {},
-        on_refresh: function(){},
     });
     
     module.OrderWidget = module.PosBaseWidget.extend({
@@ -204,12 +202,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.currentOrderLines.bind('remove', this.renderElement, this);
         },
         update_numpad: function() {
-        	var reset = false;
-        	if (this.selected_line !== this.pos.get('selectedOrder').getSelectedLine()) {
-        		reset = true;
-        	}
         	this.selected_line = this.pos.get('selectedOrder').getSelectedLine();
-        	if (reset && this.numpadState)
+        	if (this.numpadState)
         		this.numpadState.reset();
         },
         renderElement: function() {
@@ -230,8 +224,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                         model: orderLine,
                         order: this.pos.get('selectedOrder'),
                 });
-            	line.on_selected.add(_.bind(this.update_numpad, this));
-                line.on_refresh.add(_.bind(this.update_summary, this));
+            	line.on('order_line_selected', self, self.update_numpad);
+                line.on('order_line_refreshed', self, self.update_summary);
                 line.appendTo($content);
             }, this));
             this.update_numpad();
@@ -284,14 +278,11 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.click_product_action = options.click_product_action; 
         },
         // returns the url of the product thumbnail
-        get_image_url: function() {
-            return '/web/binary/image?session_id='+instance.session.session_id+'&model=product.product&field=image&id='+this.model.get('id');
-        },
         renderElement: function() {
             this._super();
-            this.$('img').replaceWith(this.pos_widget.image_cache.get_image(this.get_image_url()));
+            this.$('img').replaceWith(this.pos_widget.image_cache.get_image(this.model.get_image_url()));
             var self = this;
-            $("a", this.$element).click(function(e){
+            $("a", this.$el).click(function(e){
                 if(self.click_product_action){
                     self.click_product_action(self.model);
                 }
@@ -306,7 +297,6 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.payment_line = options.payment_line;
             this.payment_line.bind('change', this.changedAmount, this);
         },
-        on_delete: function() {},
         changeAmount: function(event) {
             var newAmount;
             newAmount = event.currentTarget.value;
@@ -320,10 +310,13 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         		this.renderElement();
         },
         renderElement: function() {
+            var self = this;
             this.name =   this.payment_line.get_cashregister().get('journal_id')[1];
             this._super();
             this.$('input').keyup(_.bind(this.changeAmount, this));
-            this.$('.delete-payment-line').click(this.on_delete);
+            this.$('.delete-payment-line').click(function() {
+                self.trigger('delete_payment_line', self);
+            });
         },
     });
 
@@ -355,7 +348,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
         setButtonSelected: function() {
             $('.selected-order').removeClass('selected-order');
-            this.$element.addClass('selected-order');
+            this.$el.addClass('selected-order');
         },
         closeOrder: function(event) {
             this.order.destroy();
@@ -370,15 +363,22 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.label = options.label || 'button';
             this.rightalign = options.rightalign || false;
             this.click_action = options.click;
+            this.disabled = options.disabled || false;
             if(options.icon){
                 this.icon = options.icon;
                 this.template = this.icon_template;
             }
         },
+        set_disabled: function(disabled){
+            if(this.disabled != disabled){
+                this.disabled = !!disabled;
+                this.renderElement();
+            }
+        },
         renderElement: function(){
             this._super();
-            if(this.click_action){
-                this.$element.click(_.bind(this.click_action, this));
+            if(this.click_action && !this.disabled){
+                this.$el.click(_.bind(this.click_action, this));
             }
         },
     });
@@ -388,12 +388,12 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         init: function(parent, options){
             this._super(parent,options);
             this.button_list = [];
-            this.fake_buttons  = {};
+            this.buttons = {};
             this.visibility = {};
         },
         set_element_visible: function(element, visible, action){
             if(visible != this.visibility[element]){
-                this.visibility[element] = visible;
+                this.visibility[element] = !!visible;
                 if(visible){
                     this.$('.'+element).show();
                 }else{
@@ -401,14 +401,22 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 }
             }
             if(visible && action){
+                this.action[element] = action;
                 this.$('.'+element).off('click').click(action);
             }
         },
+        set_button_disabled: function(name, disabled){
+            var b = this.buttons[name];
+            if(b){
+                b.set_disabled(disabled);
+            }
+        },
         destroy_buttons:function(){
             for(var i = 0; i < this.button_list.length; i++){
                 this.button_list[i].destroy();
             }
             this.button_list = [];
+            this.buttons = {};
             return this;
         },
         get_button_count: function(){
@@ -417,14 +425,17 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         add_new_button: function(button_options){
             var button = new module.ActionButtonWidget(this,button_options);
             this.button_list.push(button);
+            if(button_options.name){
+                this.buttons[button_options.name] = button;
+            }
             button.appendTo(this.$('.pos-actionbar-button-list'));
             return button;
         },
         show:function(){
-            this.$element.show();
+            this.$el.show();
         },
         hide:function(){
-            this.$element.hide();
+            this.$el.hide();
         },
     });
 
@@ -463,7 +474,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
 
         get_image_url: function(category){
-            return '/web/binary/image?session_id='+instance.session.session_id+'&model=pos.category&field=image&id='+category.id;
+            return instance.session.url('/web/binary/image', {model: 'pos.category', field: 'image', id: category.id});
         },
 
         renderElement: function(){
@@ -644,14 +655,100 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             var self = this;
             this._super();
             if(this.action){
-                this.$element.click(function(){ self.action(); });
+                this.$el.click(function(){ self.action(); });
             }
         },
-        show: function(){ this.$element.show(); },
-        hide: function(){ this.$element.hide(); },
-
+        show: function(){ this.$el.show(); },
+        hide: function(){ this.$el.hide(); },
     });
 
+    // The debug widget lets the user control and monitor the hardware and software status
+    // without the use of the proxy
+    module.DebugWidget = module.PosBaseWidget.extend({
+        template: "DebugWidget",
+        eans:{
+            admin_badge:  '0410100000006',
+            client_badge: '0420100000005',
+            invalid_ean:  '1232456',
+            soda_33cl:    '5449000000996',
+            oranges_kg:   '2100002031410',
+            lemon_price:  '2301000001560',
+            unknown_product: '9900000000004',
+        },
+        events:[
+            'scan_item_success',
+            'scan_item_error_unrecognized',
+            'payment_request',
+            'open_cashbox',
+            'print_receipt',
+            'print_pdf_invoice',
+            'weighting_read_kg',
+            'payment_status',
+        ],
+        minimized: false,
+        start: function(){
+            var self = this;
+
+            this.$el.draggable();
+            this.$('.toggle').click(function(){
+                var content = self.$('.content');
+                var bg      = self.$el;
+                if(!self.minimized){
+                    content.animate({'height':'0'},200);
+                }else{
+                    content.css({'height':'auto'});
+                }
+                self.minimized = !self.minimized;
+            });
+            this.$('.button.accept_payment').click(function(){
+                self.pos.proxy.debug_accept_payment();
+            });
+            this.$('.button.reject_payment').click(function(){
+                self.pos.proxy.debug_reject_payment();
+            });
+            this.$('.button.set_weight').click(function(){
+                var kg = Number(self.$('input.weight').val());
+                if(!Number.isNaN(kg)){
+                    self.pos.proxy.debug_set_weight(kg);
+                }
+            });
+            this.$('.button.custom_ean').click(function(){
+                var ean = self.pos.barcode_reader.sanitize_ean(self.$('input.ean').val() || '0');
+                self.$('input.ean').val(ean);
+                self.pos.barcode_reader.on_ean(ean);
+            });
+            _.each(this.eans, function(ean, name){
+                self.$('.button.'+name).click(function(){
+                    self.$('input.ean').val(ean);
+                    self.pos.barcode_reader.on_ean(ean);
+                });
+            });
+            _.each(this.events, function(name){
+                self.pos.proxy.add_notification(name,function(){
+                    self.$('.event.'+name).stop().clearQueue().css({'background-color':'#6CD11D'}); 
+                    self.$('.event.'+name).animate({'background-color':'#1E1E1E'},2000);
+                });
+            });
+            self.pos.proxy.add_notification('help_needed',function(){
+                self.$('.status.help_needed').addClass('on');
+            });
+            self.pos.proxy.add_notification('help_canceled',function(){
+                self.$('.status.help_needed').removeClass('on');
+            });
+            self.pos.proxy.add_notification('transaction_start',function(){
+                self.$('.status.transaction').addClass('on');
+            });
+            self.pos.proxy.add_notification('transaction_end',function(){
+                self.$('.status.transaction').removeClass('on');
+            });
+            self.pos.proxy.add_notification('weighting_start',function(){
+                self.$('.status.weighting').addClass('on');
+            });
+            self.pos.proxy.add_notification('weighting_end',function(){
+                self.$('.status.weighting').removeClass('on');
+            });
+        },
+    });
 
 // ---------- Main Point of Sale Widget ----------
 
@@ -680,6 +777,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
     });
 
+
     // The PosWidget is the main widget that contains all other widgets in the PointOfSale.
     // It is mainly composed of :
     // - a header, containing the list of orders
@@ -704,19 +802,11 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.leftpane_width   = '440px';
             this.cashier_controls_visible = true;
             this.image_cache = new module.ImageCache(); // for faster products image display
-
-            /*
-             //Epileptic mode
-            setInterval(function(){ 
-                $('body').css({'-webkit-filter':'hue-rotate('+Math.random()*360+'deg)' });
-            },100);
-            */
-            
         },
       
         start: function() {
             var self = this;
-            return self.pos.ready.then(function() {
+            return self.pos.ready.done(function() {
                 self.build_currency_template();
                 self.renderElement();
                 
@@ -740,6 +830,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
 
                 self.screen_selector.set_default_screen();
 
+                window.screen_selector = self.screen_selector;
+
                 self.pos.barcode_reader.connect();
 
                 instance.webclient.set_content_full_screen(true);
@@ -753,12 +845,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                 self.$('.loader').animate({opacity:0},1500,'swing',function(){self.$('.loader').hide();});
                 self.$('.loader img').hide();
 
-                if(jQuery.deparam(jQuery.param.querystring()).debug !== undefined){
-                    window.pos = self.pos;
-                    window.pos_widget = self.pos_widget;
-                }
-
-            },function(){   // error when loading models data from the backend
+            }).fail(function(){   // error when loading models data from the backend
                 self.$('.loader img').hide();
                 return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_pos_session_opening']], ['res_id'])
                     .pipe( _.bind(function(res){
@@ -807,12 +894,15 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             this.error_popup = new module.ErrorPopupWidget(this, {});
             this.error_popup.appendTo($('.point-of-sale'));
 
-            this.error_product_popup = new module.ErrorProductNotRecognizedPopupWidget(this, {});
+            this.error_product_popup = new module.ProductErrorPopupWidget(this, {});
             this.error_product_popup.appendTo($('.point-of-sale'));
 
-            this.error_session_popup = new module.ErrorNoSessionPopupWidget(this, {});
+            this.error_session_popup = new module.ErrorSessionPopupWidget(this, {});
             this.error_session_popup.appendTo($('.point-of-sale'));
 
+            this.choose_receipt_popup = new module.ChooseReceiptPopupWidget(this, {});
+            this.choose_receipt_popup.appendTo($('.point-of-sale'));
+
             // --------  Misc ---------
 
             this.notification = new module.SynchNotificationWidget(this,{});
@@ -872,12 +962,17 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                     'error': this.error_popup,
                     'error-product': this.error_product_popup,
                     'error-session': this.error_session_popup,
+                    'choose-receipt': this.choose_receipt_popup,
                 },
                 default_client_screen: 'welcome',
                 default_cashier_screen: 'products',
                 default_mode: this.pos.iface_self_checkout ?  'client' : 'cashier',
             });
 
+            if(this.pos.debug){
+                this.debug_widget = new module.DebugWidget(this);
+                this.debug_widget.appendTo(this.$('#content'));
+            }
         },
 
         changed_pending_operations: function () {
@@ -947,9 +1042,9 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
         },
         try_close: function() {
             var self = this;
-            self.pos.flush().then(function() {
-                self.close();
-            });
+            //TODO : do the close after the flush...
+            self.pos.flush()
+            self.close();
         },
         close: function() {
             var self = this;
@@ -957,7 +1052,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
             return new instance.web.Model("ir.model.data").get_func("search_read")([['name', '=', 'action_client_pos_menu']], ['res_id']).pipe(
                     _.bind(function(res) {
                 return this.rpc('/web/action/load', {'action_id': res[0]['res_id']}).pipe(_.bind(function(result) {
-                    var action = result.result;
+                    var action = result;
                     action.context = _.extend(action.context || {}, {'cancel_action': {type: 'ir.actions.client', tag: 'reload'}});
                     //self.destroy();
                     this.do_action(action);
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 81f929d50e2..986921af1c5 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -185,8 +185,8 @@
                     <span class="product-price">
                         <t t-esc="widget.format_currency(widget.get_product_price()) + '/Kg'" />
                     </span> 
-                    <t t-if="widget.get_product_image()">
-                        <img t-att-src="'data:image/png;base64,'+ widget.get_product_image()" />
+                    <t t-if="widget.get_product()">
+                        <img t-att-src="widget.get_product().get_image_url()" />
                     </t>
                 </div>
             </div>
@@ -261,8 +261,10 @@
     <t t-name="WelcomeScreenWidget">
         <div class="welcome-screen screen">
             <header><h2>Welcome</h2></header>
+            <div class="dialog">
             <img src="/point_of_sale/static/src/img/scan.png" />
             <p> Please scan an item or your member card </p>
+            </div>
         </div>
         <div class="goodbye-message">
             <p>Thank you for shopping with us.</p>
@@ -280,9 +282,11 @@
     <t t-name="ClientPaymentScreenWidget">
         <div class="scan-product-screen screen">
             <header><h2>Payment</h2></header>
-            <img src="/point_of_sale/static/src/img/bancontact.png" />
-            <p>Please insert your card in the reader and follow the instructions to complete
+            <div class="dialog">
+                <img src="/point_of_sale/static/src/img/bancontact.png" />
+                <p>Please insert your card in the reader and follow the instructions to complete
             your purchase</p>
+            </div>
         </div>
     </t>
 
@@ -313,31 +317,34 @@
         </div>
     </t>
 
-    <t t-name="ReceiptPopupWidget">
+    <t t-name="ChooseReceiptPopupWidget">
         <div class="modal-dialog">
             <div class="popup popup-help">
-                <p class="message">Welcome Mr. John Smith <br /> Choose your type of receipt:</p>
+                <p class="message">Welcome <t t-esc="widget.get_client_name()" /><br /> Choose your type of receipt:</p>
                 <div class = "button big-left receipt">
                     Ticket
                 </div>
                 <div class = "button big-right invoice">
                     Invoice
                 </div>
-                <div class="footer">
-                </div>
             </div>
         </div>
     </t>
 
-    <t t-name="ErrorProductNotRecognizedPopupWidget">
+    <t t-name="ProductErrorPopupWidget">
         <div class="modal-dialog">
             <div class="popup popup-help">
                 <p class="message">The scanned product was not recognized<br /> Please wait, a cashier is on the way</p>
             </div>
         </div>
+        <div class="footer">
+            <div class="button">
+                Ok
+            </div>
+        </div>
     </t>
 
-    <t t-name="ErrorNoSessionPopupWidget">
+    <t t-name="ErrorSessionPopupWidget">
         <div class="modal-dialog">
             <div class="popup popup-help">
                 <p class="message">Sorry, we could not create a session for this user.</p>
@@ -348,7 +355,8 @@
     <t t-name="ErrorPopupWidget">
         <div class="modal-dialog">
             <div class="popup popup-help">
-                <p class="message"><t t-esc=" widget.message || 'Error.' " /></p>
+                <p class="message"><t t-esc=" widget.message || 'Error' " /></p>
+                <p class="comment"><t t-esc=" widget.comment || '' "/></p>
             </div>
         </div>
     </t>
@@ -415,6 +423,57 @@
         </div>
     </t>
 
+    <t t-name="DebugWidget">
+        <div class="debug-widget">
+            <h1>Debug Window</h1>
+            <div class="toggle">▾</div>
+            <div class="content">
+                <p class="category">Payment Terminal</p>
+
+                <ul>
+                    <li class="button accept_payment">Accept Payment</li>
+                    <li class="button reject_payment">Reject Payment</li>
+                </ul>
+                <p class="category">Electronic Scale</p>
+                <ul>
+                    <li><input type="text" class="weight"></input></li>
+                    <li class="button set_weight">Set Weight</li>
+                </ul>
+
+                <p class="category">Barcode Scanner</p>
+                <ul>
+                    <li><input type="text" class="ean"></input></li>
+                    <li class="button custom_ean">Custom Ean13</li>
+                    <li class="button admin_badge">Admin Badge</li>
+                    <li class="button client_badge">Client Badge</li>
+                    <li class="button soda_33cl">Soda 33cl</li>
+                    <li class="button oranges_kg">3.141Kg Oranges</li>
+                    <li class="button lemon_price">1.54€ Lemon</li>
+                    <li class="button unknown_product">Unknown Product</li>
+                    <li class="button invalid_ean">Invalid Ean</li>
+                </ul>
+
+                <p class="category">Hardware Status</p>
+                <ul>
+                    <li class="status help_needed">Help needed</li>
+                    <li class="status weighting">Weighting</li>
+                    <li class="status transaction">In Transaction</li>
+                </ul>
+                <p class="category">Hardware Events</p>
+                <ul>
+                    <li class="event scan_item_success">Scan Item Success</li>
+                    <li class="event scan_item_error_unrecognized">Scan Item Unrecognized</li>
+                    <li class="event payment_request">Payment Request</li>
+                    <li class="event payment_status">Payment Status</li>
+                    <li class="event open_cashbox">Open Cashbox</li>
+                    <li class="event print_receipt">Print Receipt</li>
+                    <li class="event print_pdf_invoice">Print Invoice</li>
+                    <li class="event weighting_read_kg">Read Weighting Scale</li>
+                </ul>
+            </div>
+        </div>
+    </t>
+
     <t t-name="OrderlineWidget">
         <li class="orderline">
             <span class="product-name">
@@ -482,8 +541,9 @@
 
     <t t-name="PosTicket">
         <div class="pos-sale-ticket">
+            
             <div class="pos-right-align"><t t-esc="new Date().toString(Date.CultureInfo.formatPatterns.shortDate + ' ' +
-                Date.CultureInfo.formatPatterns.longTime)"/></div>
+                Date.CultureInfo.formatPatterns.longTime)"/><t t-esc="widget.currentOrder.attributes.name"/></div>
             <br />
             <t t-esc="widget.company.name"/><br />
             Phone: <t t-esc="widget.company.phone || ''"/><br />
@@ -494,6 +554,11 @@
                 <tr t-foreach="widget.currentOrderLines.toArray()" t-as="order">
                     <td>
                         <t t-esc="order.get_product().get('name')"/>
+                         <t t-if="order.get_discount() > 0">
+                            <div class="pos-disc-font">
+                                With a <t t-esc="order.get_discount()"/>% discount
+                            </div>
+                        </t>
                     </td>
                     <td class="pos-right-align">
                         <t t-esc="order.get_quantity().toFixed(0)"/>
@@ -508,6 +573,9 @@
                 <tr><td>Tax:</td><td class="pos-right-align">
                     <t t-esc="widget.format_currency(widget.currentOrder.getTax().toFixed(2))"/>
                     </td></tr>
+                <tr><td>Discount:</td><td class="pos-right-align">
+                    <t t-esc="widget.format_currency(widget.currentOrder.getDiscountTotal().toFixed(2))"/>
+                    </td></tr>
                 <tr class="emph"><td>Total:</td><td class="pos-right-align">
                     <t t-esc="widget.format_currency(widget.currentOrder.getTotal().toFixed(2))"/>
                     </td></tr>
@@ -540,7 +608,7 @@
     </t>
 
     <t t-name="ActionButtonWidget">
-        <li t-att-class=" 'button '+ (widget.rightalign  ? 'rightalign ' : '')">
+        <li t-att-class=" 'button '+ (widget.rightalign  ? 'rightalign ' : '') + (widget.disabled ? 'disabled ' : '')">
             <div class='label'>
                 <t t-esc="widget.label" />
             </div>
@@ -548,7 +616,7 @@
     </t>
 
     <t t-name="ActionButtonWidgetWithIcon">
-        <li t-att-class=" 'button '+ (widget.rightalign  ? 'rightalign ' : '')">
+        <li t-att-class=" 'button '+ (widget.rightalign  ? 'rightalign ' : '') + (widget.disabled ? 'disabled ' : '')">
             <div class='icon'>
                 <img t-att-src="widget.icon" />
                 <div class='iconlabel'><t t-esc="widget.label" /></div>
diff --git a/addons/point_of_sale/test/01_order_to_payment.yml b/addons/point_of_sale/test/01_order_to_payment.yml
index 3265a4b133c..9534e79095f 100644
--- a/addons/point_of_sale/test/01_order_to_payment.yml
+++ b/addons/point_of_sale/test/01_order_to_payment.yml
@@ -12,7 +12,7 @@
     account_collected_id: account.iva
     price_include: 1
 -
-  I assign this 10 percent tax on the PC1 product as a sale tax
+  I assign this 10 percent tax on the [PCSC234] PC Assemble SC234 product as a sale tax
 -
   !record {model: product.product, id: product.product_product_3}:
     taxes_id: [account_tax_10_incl]
@@ -27,7 +27,7 @@
     account_collected_id: account.iva
     price_include: 0
 -
-  I assign this 5 percent tax on the PC2 product as a sale tax
+  I assign this 5 percent tax on the PCSC349 product as a sale tax
 -
   !record {model: product.product, id: product.product_product_4}:
     taxes_id: [account_tax_05_incl]
@@ -52,7 +52,7 @@
 - 
   !workflow {model: pos.session, action: open, ref: pos_order_session0}
 -
-  I create a PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PC2 at 300 EUR. (Tax Excl)
+  I create a PoS order with 2 units of PCSC234 at 450 EUR (Tax Incl) and 3 units of PCSC349 at 300 EUR. (Tax Excl)
 -
   !record {model: pos.order, id: pos_order_pos0}:
     company_id: base.main_company
diff --git a/addons/point_of_sale/test/02_order_to_invoice.yml b/addons/point_of_sale/test/02_order_to_invoice.yml
index 2280f15ca48..bd76eb08a9c 100644
--- a/addons/point_of_sale/test/02_order_to_invoice.yml
+++ b/addons/point_of_sale/test/02_order_to_invoice.yml
@@ -1,5 +1,5 @@
 -
-  I create a new PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PC2 at 300 EUR. (Tax Excl)
+  I create a new PoS order with 2 units of PC1 at 450 EUR (Tax Incl) and 3 units of PCSC349 at 300 EUR. (Tax Excl)
 -
   !record {model: pos.order, id: pos_order_pos1}:
     company_id: base.main_company
diff --git a/addons/point_of_sale/wizard/pos_box.py b/addons/point_of_sale/wizard/pos_box.py
index 8c3b0aa4607..2d1c1a8e0cf 100644
--- a/addons/point_of_sale/wizard/pos_box.py
+++ b/addons/point_of_sale/wizard/pos_box.py
@@ -15,8 +15,7 @@ class PosBox(CashBox):
         active_ids = context.get('active_ids', []) or []
 
         if active_model == 'pos.session':
-            records = self.pool.get(active_model).browse(cr, uid, context.get('active_ids', []) or [], context=context)
-
+            records = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)
             bank_statements = [record.cash_register_id for record in records if record.cash_register_id]
 
             if not bank_statements:
@@ -30,6 +29,30 @@ class PosBox(CashBox):
 class PosBoxIn(PosBox):
     _inherit = 'cash.box.in'
 
+    def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
+        values = super(PosBoxIn, self)._compute_values_for_statement_line(cr, uid, box, record, context=context)
+
+        active_model = context.get('active_model', False) or False
+        active_ids = context.get('active_ids', []) or []
+
+        if active_model == 'pos.session':
+            session = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)[0]
+            values['ref'] = session.name
+
+        return values
+
+
 class PosBoxOut(PosBox):
     _inherit = 'cash.box.out'
 
+    def _compute_values_for_statement_line(self, cr, uid, box, record, context=None):
+        values = super(PosBoxOut, self)._compute_values_for_statement_line(cr, uid, box, record, context=context)
+
+        active_model = context.get('active_model', False) or False
+        active_ids = context.get('active_ids', []) or []
+
+        if active_model == 'pos.session':
+            session = self.pool.get(active_model).browse(cr, uid, active_ids, context=context)[0]
+            values['ref'] = session.name
+
+        return values
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 572f6470c34..2219f711b93 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -65,7 +65,7 @@ class pos_open_statement(osv.osv_memory):
             statement_id = statement_obj.create(cr, uid, data, context=context)
             st_ids.append(int(statement_id))
 
-            if journal.opening_control:
+            if journal.cash_control:
                 statement_obj.button_open(cr, uid, [statement_id], context)
 
         tree_res = mod_obj.get_object_reference(cr, uid, 'point_of_sale', 'view_cash_statement_pos_tree')
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index ca9331012b7..70b88f35e33 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -43,8 +43,6 @@ class account_journal(osv.osv):
 
         return super(account_journal, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=count)
 
-account_journal()        
-
 class pos_make_payment(osv.osv_memory):
     _name = 'pos.make.payment'
     _description = 'Point of Sale Payment'
@@ -77,7 +75,7 @@ class pos_make_payment(osv.osv_memory):
 
     def launch_payment(self, cr, uid, ids, context=None):
         return {
-            'name': _('Paiement'),
+            'name': _('Payment'),
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'pos.make.payment',
@@ -85,6 +83,7 @@ class pos_make_payment(osv.osv_memory):
             'target': 'new',
             'views': False,
             'type': 'ir.actions.act_window',
+            'context': context,
         }
 
     def print_report(self, cr, uid, ids, context=None):
diff --git a/addons/point_of_sale/wizard/pos_session_opening.py b/addons/point_of_sale/wizard/pos_session_opening.py
index d3b6ea28b17..7c88986169e 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.py
+++ b/addons/point_of_sale/wizard/pos_session_opening.py
@@ -6,15 +6,23 @@ import netsvc
 
 from openerp.addons.point_of_sale.point_of_sale import pos_session
 
+
 class pos_session_opening(osv.osv_memory):
     _name = 'pos.session.opening'
 
     _columns = {
         'pos_config_id' : fields.many2one('pos.config', 'Point of Sale', required=True),
         'pos_session_id' : fields.many2one('pos.session', 'PoS Session'),
-        'pos_state' : fields.selection(pos_session.POS_SESSION_STATE,
-                                       'Session State', readonly=True),
+        'pos_state' : fields.related('pos_session_id', 'state',
+                                     type='selection',
+                                     selection=pos_session.POS_SESSION_STATE,
+                                     string='Session Status', readonly=True),
+        'pos_state_str' : fields.char('Status', 32, readonly=True),
         'show_config' : fields.boolean('Show Config', readonly=True),
+        'pos_session_name' : fields.related('pos_session_id', 'name',
+                                            type='char', size=64, readonly=True),
+        'pos_session_username' : fields.related('pos_session_id', 'user_id', 'name',
+                                                type='char', size=64, readonly=True)
     }
 
     def open_ui(self, cr, uid, ids, context=None):
@@ -44,6 +52,9 @@ class pos_session_opening(osv.osv_memory):
                 'config_id' : wizard.pos_config_id.id,
             }
             session_id = proxy.create(cr, uid, values, context=context)
+            s = proxy.browse(cr, uid, session_id, context=context)
+            if s.state=='opened':
+                return self.open_ui(cr, uid, ids, context=context)
             return self._open_session(session_id)
         return self._open_session(wizard.pos_session_id.id)
 
@@ -66,18 +77,26 @@ class pos_session_opening(osv.osv_memory):
     def on_change_config(self, cr, uid, ids, config_id, context=None):
         result = {
             'pos_session_id': False,
-            'pos_state': False
+            'pos_state': False,
+            'pos_state_str' : '',
+            'pos_session_username' : False,
+            'pos_session_name' : False,
         }
         if not config_id:
-            return {'value': result}
+            return {'value' : result}
         proxy = self.pool.get('pos.session')
         session_ids = proxy.search(cr, uid, [
-            ('state', '<>', 'closed'),
+            ('state', '!=', 'closed'),
             ('config_id', '=', config_id),
         ], context=context)
         if session_ids:
-            result['pos_state'] = proxy.browse(cr, uid, session_ids[0], context=context).state
-            result['pos_session_id'] = session_ids[0]
+            session = proxy.browse(cr, uid, session_ids[0], context=context)
+            result['pos_state'] = str(session.state)
+            result['pos_state_str'] = dict(pos_session.POS_SESSION_STATE).get(session.state, '')
+            result['pos_session_id'] = session.id
+            result['pos_session_name'] = session.name
+            result['pos_session_username'] = session.user_id.name
+
         return {'value' : result}
 
     def default_get(self, cr, uid, fieldnames, context=None):
diff --git a/addons/point_of_sale/wizard/pos_session_opening.xml b/addons/point_of_sale/wizard/pos_session_opening.xml
index 948f1db8c61..a7dbe43c962 100644
--- a/addons/point_of_sale/wizard/pos_session_opening.xml
+++ b/addons/point_of_sale/wizard/pos_session_opening.xml
@@ -12,7 +12,7 @@
                         <field name="pos_config_id" on_change="on_change_config(pos_config_id)"
                             widget="selection" domain="[('state','=','active')]"
                             class="oe_inline"/>
-                        <field name="pos_state" class="oe_inline" attrs="{'invisible' : [('pos_state', '=', False)]}" />
+                        <field name="pos_state" invisible="1" />
                     </group>
                     <field name="pos_session_id" invisible="1"/>
                     <button name="open_ui" type="object" string="Start Selling" 
@@ -39,9 +39,17 @@
                         <p class="oe_view_nocontent_create">
                           Click to start a session.
                         </p><p>
-                          You will first have to control your cash amount in your cash register.
-                          Then you will be able to open the session and start selling with the touchscreen
-                          interface.
+                          You may have to control your cash amount in your cash register, before
+                          being able to start selling through the touchscreen interface.
+                        </p>
+                    </div>
+                    <div attrs="{'invisible' : [('pos_state', '!=', 'opened')]}" class="oe_view_nocontent">
+                        <p class="oe_view_nocontent_create">
+                            Click to continue the session.
+                        </p>
+                        <p>
+                            The session <field name="pos_session_name" class="oe_inline" /> (<field name="pos_session_username" class="oe_inline" />) is "<b><field name="pos_state_str" class="oe_inline" /></b>".<br/>
+                            You can continue sales from the touchscreen interface by clicking on "Start Selling" or close the cash register session.
                         </p>
                     </div>
 
diff --git a/addons/portal/__init__.py b/addons/portal/__init__.py
index 9c6cc59be7d..2bfc6df0d96 100644
--- a/addons/portal/__init__.py
+++ b/addons/portal/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import portal
+import mail_mail
 import wizard
 
 
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 84091a54347..66a736c6048 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -21,18 +21,17 @@
 
 {
     'name' : 'Portal',
-    'version' : '1.0',
-    'depends' : [
+    'version': '1.0',
+    'depends': [
         'base',
         'share',
-        'auth_anonymous',
         'auth_signup',
     ],
-    'author' : 'OpenERP SA',
+    'author': 'OpenERP SA',
     'category': 'Portal',
     'description': """
 Customize access to your OpenERP database to external users by creating portals.
-
+================================================================================
 A portal defines a specific user menu and access rights for its members.  This
 menu can ben seen by portal members, anonymous users and any other user that
 have the access to technical features (e.g. the administrator).
@@ -51,9 +50,7 @@ very handy when used in combination with the module 'share'.
         'wizard/portal_wizard_view.xml',
         'wizard/share_wizard_view.xml',
     ],
-    'demo': [
-        'portal_demo.xml',
-    ],
+    'demo': ['portal_demo.xml'],
     'installable': True,
 }
 
diff --git a/addons/portal/i18n/ar.po b/addons/portal/i18n/ar.po
index b6bb24e04bb..a74cffeacc2 100644
--- a/addons/portal/i18n/ar.po
+++ b/addons/portal/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/bg.po b/addons/portal/i18n/bg.po
index 708914adc70..5dcfe7023f0 100644
--- a/addons/portal/i18n/bg.po
+++ b/addons/portal/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/bs.po b/addons/portal/i18n/bs.po
index 52ae8a5bdaf..9bb8f111f81 100644
--- a/addons/portal/i18n/bs.po
+++ b/addons/portal/i18n/bs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/ca.po b/addons/portal/i18n/ca.po
index 4613b5ef098..46a91c1d2f9 100644
--- a/addons/portal/i18n/ca.po
+++ b/addons/portal/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/cs.po b/addons/portal/i18n/cs.po
index c1eecbdee26..943ec7eb12b 100644
--- a/addons/portal/i18n/cs.po
+++ b/addons/portal/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: portal
diff --git a/addons/portal/i18n/da.po b/addons/portal/i18n/da.po
index cd85e4edf4c..611025d6c14 100644
--- a/addons/portal/i18n/da.po
+++ b/addons/portal/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/de.po b/addons/portal/i18n/de.po
index ea345ae0aad..c5dbf71794d 100644
--- a/addons/portal/i18n/de.po
+++ b/addons/portal/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/es.po b/addons/portal/i18n/es.po
index 00a2343909a..6fbdcca2efd 100644
--- a/addons/portal/i18n/es.po
+++ b/addons/portal/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/es_CR.po b/addons/portal/i18n/es_CR.po
index e62cb6316ff..52c5d44bdb1 100644
--- a/addons/portal/i18n/es_CR.po
+++ b/addons/portal/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: portal
diff --git a/addons/portal/i18n/et.po b/addons/portal/i18n/et.po
index fc780fe1d2f..064c748cefe 100644
--- a/addons/portal/i18n/et.po
+++ b/addons/portal/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/fi.po b/addons/portal/i18n/fi.po
index afbe45c4d81..8c04c85e48b 100644
--- a/addons/portal/i18n/fi.po
+++ b/addons/portal/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/fr.po b/addons/portal/i18n/fr.po
index 2dc5b896cc9..0191330b7df 100644
--- a/addons/portal/i18n/fr.po
+++ b/addons/portal/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/hr.po b/addons/portal/i18n/hr.po
index 9e3b3c867c0..4aa03c4e1fe 100644
--- a/addons/portal/i18n/hr.po
+++ b/addons/portal/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/hu.po b/addons/portal/i18n/hu.po
index 69020661ffe..aafc0c861f7 100644
--- a/addons/portal/i18n/hu.po
+++ b/addons/portal/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/id.po b/addons/portal/i18n/id.po
index 432abed753a..577ab0169dd 100644
--- a/addons/portal/i18n/id.po
+++ b/addons/portal/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/it.po b/addons/portal/i18n/it.po
index 8d3944cd13c..718ff522e8b 100644
--- a/addons/portal/i18n/it.po
+++ b/addons/portal/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/ja.po b/addons/portal/i18n/ja.po
index 7a3a1fe6896..ca3f5a3e21f 100644
--- a/addons/portal/i18n/ja.po
+++ b/addons/portal/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/lo.po b/addons/portal/i18n/lo.po
new file mode 100644
index 00000000000..6de56c89a51
--- /dev/null
+++ b/addons/portal/i18n/lo.po
@@ -0,0 +1,388 @@
+# Lao translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-08-20 18:55+0000\n"
+"Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
+"Language-Team: Lao <lo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:51
+#, python-format
+msgid "Please select at least one user to share with"
+msgstr "ກະລຸນາເລອືກຢ້າງນ້ອຍຄົນຜູ້ນຶ່ງເພື່ອແບ່ງປັນນກັບ"
+
+#. module: portal
+#: code:addons/portal/wizard/share_wizard.py:55
+#, python-format
+msgid "Please select at least one group to share with"
+msgstr "ກະລຸນາເລືອກຢ້າງນ້ອຍໝວດນຶ່ງເພື່ອແບ່ງປັນນກັບ"
+
+#. module: portal
+#: field:res.portal,group_id:0
+msgid "Group"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,group_ids:0
+msgid "Existing groups"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_wizard_user
+msgid "Portal User Config"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard.user:0
+msgid "Portal User"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_portal_manager
+msgid ""
+"Portal managers have access to the portal definitions, and can easily "
+"configure the users, access rights and menus of portal users."
+msgstr ""
+
+#. module: portal
+#: help:res.portal,override_menu:0
+msgid "Enable this option to override the Menu Action of portal users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,user_email:0
+msgid "Email"
+msgstr ""
+
+#. module: portal
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+#: field:res.portal,widget_ids:0
+msgid "Widgets"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "Send Invitations"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Widgets Assigned to Users"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,url:0
+msgid "The url where portal users can connect to the server"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,comment:portal.group_portal_officer
+msgid "Portal officers can create new portal users with the portal wizard."
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard,message:0
+msgid "This text is included in the welcome email sent to the users"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,menu_action_id:0
+msgid "If set, replaces the standard menu for the portal's users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Portal Name"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard.user:0
+msgid "Portal Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,override_menu:0
+msgid "Override Menu Action of Users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,menu_action_id:0
+msgid "Menu Action"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,name:0
+msgid "User Name"
+msgstr "ຊື່ຜູ້ໃຊ້"
+
+#. module: portal
+#: help:res.portal,group_id:0
+msgid "The group corresponding to this portal"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_widget
+msgid "Portal Widgets"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal
+#: model:ir.module.category,name:portal.module_category_portal
+#: view:res.portal:0
+#: field:res.portal.widget,portal_id:0
+#: field:res.portal.wizard,portal_id:0
+msgid "Portal"
+msgstr "ປະຕູ"
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:35
+#, python-format
+msgid "Your OpenERP account at %(company)s"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/portal.py:107
+#: code:addons/portal/portal.py:184
+#, python-format
+msgid "%s Menu"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard,portal_id:0
+msgid "The portal in which new users must be added"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_portal_wizard
+msgid "Portal Wizard"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,widget_ids:0
+msgid "Widgets assigned to portal users"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:163
+#, python-format
+msgid "(missing url)"
+msgstr ""
+
+#. module: portal
+#: view:share.wizard:0
+#: field:share.wizard,user_ids:0
+msgid "Existing users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,wizard_id:0
+msgid "Wizard"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,user_email:0
+msgid ""
+"Will be used as user login.  Also necessary to send the account information "
+"to new users"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,parent_menu_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: portal
+#: field:res.portal,url:0
+msgid "URL"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.widget,widget_id:0
+msgid "Widget"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,lang:0
+msgid "The language for the user's user interface"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid "Cancel"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Website"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Create Parent Menu"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+msgid ""
+"The following text will be included in the welcome email sent to users."
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:135
+#, python-format
+msgid "Email required"
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: portal
+#: constraint:res.portal.wizard.user:0
+msgid "Invalid email address"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:136
+#, python-format
+msgid ""
+"You must have an email address in your User Preferences to send emails."
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_ir_ui_menu
+msgid "ir.ui.menu"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.portal_list_action
+#: model:ir.ui.menu,name:portal.portal_list_menu
+#: model:ir.ui.menu,name:portal.portal_menu
+#: view:res.portal:0
+msgid "Portals"
+msgstr ""
+
+#. module: portal
+#: help:res.portal,parent_menu_id:0
+msgid "The menu action opens the submenus of this menu item"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.widget,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: portal
+#: field:res.users,partner_id:0
+msgid "Related Partner"
+msgstr ""
+
+#. module: portal
+#: view:res.portal:0
+msgid "Portal Menu"
+msgstr ""
+
+#. module: portal
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: portal
+#: view:res.portal.wizard:0
+#: field:res.portal.wizard,message:0
+msgid "Invitation message"
+msgstr ""
+
+#. module: portal
+#: code:addons/portal/wizard/portal_wizard.py:36
+#, python-format
+msgid ""
+"Dear %(name)s,\n"
+"\n"
+"You have been created an OpenERP account at %(url)s.\n"
+"\n"
+"Your login account data is:\n"
+"Database: %(db)s\n"
+"User:     %(login)s\n"
+"Password: %(password)s\n"
+"\n"
+"%(message)s\n"
+"\n"
+"--\n"
+"OpenERP - Open Source Business Applications\n"
+"http://www.openerp.com\n"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,name:portal.group_portal_manager
+msgid "Manager"
+msgstr ""
+
+#. module: portal
+#: help:res.portal.wizard.user,name:0
+msgid "The user's real name"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,name:portal.address_wizard_action
+#: model:ir.actions.act_window,name:portal.partner_wizard_action
+#: view:res.portal.wizard:0
+msgid "Add Portal Access"
+msgstr ""
+
+#. module: portal
+#: field:res.portal.wizard.user,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: portal
+#: model:ir.actions.act_window,help:portal.portal_list_action
+msgid ""
+"\n"
+"A portal helps defining specific views and rules for a group of users (the\n"
+"portal group).  A portal menu, widgets and specific groups may be assigned "
+"to\n"
+"the portal's users.\n"
+"            "
+msgstr ""
+
+#. module: portal
+#: model:ir.model,name:portal.model_share_wizard
+msgid "Share Wizard"
+msgstr ""
+
+#. module: portal
+#: model:res.groups,name:portal.group_portal_officer
+msgid "Officer"
+msgstr ""
diff --git a/addons/portal/i18n/lt.po b/addons/portal/i18n/lt.po
index 8f97153996e..9672dc09065 100644
--- a/addons/portal/i18n/lt.po
+++ b/addons/portal/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/nl.po b/addons/portal/i18n/nl.po
index e6c2239597c..31501e575db 100644
--- a/addons/portal/i18n/nl.po
+++ b/addons/portal/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-06-28 12:51+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/pl.po b/addons/portal/i18n/pl.po
index fea84cbc1db..c32986a6afb 100644
--- a/addons/portal/i18n/pl.po
+++ b/addons/portal/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/pt.po b/addons/portal/i18n/pt.po
index ccbeb45e2c6..9872b7e54ea 100644
--- a/addons/portal/i18n/pt.po
+++ b/addons/portal/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/pt_BR.po b/addons/portal/i18n/pt_BR.po
index 9977b146ba2..7b7fad7d433 100644
--- a/addons/portal/i18n/pt_BR.po
+++ b/addons/portal/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/ro.po b/addons/portal/i18n/ro.po
index e490934556d..23a44c9a400 100644
--- a/addons/portal/i18n/ro.po
+++ b/addons/portal/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/ru.po b/addons/portal/i18n/ru.po
index 14719d308d9..2540e48ae79 100644
--- a/addons/portal/i18n/ru.po
+++ b/addons/portal/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/sl.po b/addons/portal/i18n/sl.po
index c034d0694b3..3b4e198fe00 100644
--- a/addons/portal/i18n/sl.po
+++ b/addons/portal/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/sv.po b/addons/portal/i18n/sv.po
index f60fd5c350b..db3e0f96063 100644
--- a/addons/portal/i18n/sv.po
+++ b/addons/portal/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/tr.po b/addons/portal/i18n/tr.po
index cf82b1c067e..2488fc81069 100644
--- a/addons/portal/i18n/tr.po
+++ b/addons/portal/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
@@ -148,7 +148,7 @@ msgstr "Kullanıcı Adı"
 #. module: portal
 #: help:res.portal,group_id:0
 msgid "The group corresponding to this portal"
-msgstr ""
+msgstr "Bu portala uygun grup"
 
 #. module: portal
 #: model:ir.model,name:portal.model_res_portal_widget
diff --git a/addons/portal/i18n/uk.po b/addons/portal/i18n/uk.po
index 6b8a8a16418..9f36922be92 100644
--- a/addons/portal/i18n/uk.po
+++ b/addons/portal/i18n/uk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/zh_CN.po b/addons/portal/i18n/zh_CN.po
index 11432d0744f..0a2299a7f58 100644
--- a/addons/portal/i18n/zh_CN.po
+++ b/addons/portal/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/i18n/zh_TW.po b/addons/portal/i18n/zh_TW.po
index 912e3a3ce04..2d6bad2b855 100644
--- a/addons/portal/i18n/zh_TW.po
+++ b/addons/portal/i18n/zh_TW.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:38+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: portal
 #: code:addons/portal/wizard/share_wizard.py:51
diff --git a/addons/portal/mail_mail.py b/addons/portal/mail_mail.py
new file mode 100644
index 00000000000..0dc7348f2c8
--- /dev/null
+++ b/addons/portal/mail_mail.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv
+import tools
+
+class mail_mail(osv.Model):
+    """ Update of mail_mail class, to add the signin URL to notifications. """
+    _inherit = 'mail.mail'
+
+    def send_get_mail_body(self, cr, uid, mail, partner=None, context=None):
+        """ add a signin link inside the body of a mail.mail
+            :param mail: mail.mail browse_record
+            :param partner: browse_record of the specific recipient partner
+            :return: the resulting body_html
+        """
+        body = super(mail_mail, self).send_get_mail_body(cr, uid, mail, partner, context=context)
+        if partner:
+            context = dict(context or {}, signup_valid=True)
+            partner = self.pool.get('res.partner').browse(cr, uid, partner.id, context)
+            body = tools.append_content_to_html(body, ("<div><p>Log in our portal at: %s</p></div>" % partner.signup_url), plaintext=False)
+        return body
diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 2c8b2db587d..13cde80f849 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -20,196 +20,14 @@
 ##############################################################################
 
 from osv import osv, fields
-from tools.translate import _
-
 
 
 class portal(osv.osv):
+    """ A portal is simply a group of users with the flag 'is_portal' set to True.
+        The flag 'is_portal' makes a user group usable as a portal.
     """
-        A portal is a group of users with specific menu, widgets, and typically
-        restricted access rights.
-    """
-    _name = 'res.portal'
-    _description = 'Portal'
-    _inherits = {'res.groups': 'group_id'}
-
+    _inherit = 'res.groups'
     _columns = {
-        'group_id': fields.many2one('res.groups', required=True, ondelete='cascade',
-            string='Group',
-            help='The group corresponding to this portal'),
-        'url': fields.char('URL', size=64,
-            help="The url where portal users can connect to the server"),
-        'home_action_id': fields.many2one('ir.actions.actions',
-            string='Home Action',
-            help="if set, replaces the standard home action (first screen after loggin) for the portal's users"),
-        'menu_action_id': fields.many2one('ir.actions.act_window', readonly=True,
-            # ISSUE: 'ondelete' constraints do not seem effective on this field...
-            string='Menu Action',
-            help="If set, replaces the standard menu for the portal's users"),
-        'parent_menu_id': fields.many2one('ir.ui.menu', ondelete='restrict',
-            string='Parent Menu',
-            help='The menu action opens the submenus of this menu item'),
-        'widget_ids': fields.one2many('res.portal.widget', 'portal_id',
-            string='Widgets',
-            help='Widgets assigned to portal users'),
+        'is_portal': fields.boolean('Portal', help="If checked, this group is usable as a portal."),
     }
 
-    def copy(self, cr, uid, id, values, context=None):
-        """ override copy(): menu_action_id must be different """
-        values['menu_action_id'] = None
-        return super(portal, self).copy(cr, uid, id, values, context)
-
-    def create(self, cr, uid, values, context=None):
-        """ extend create() to assign the portal menu to users """
-        if context is None:
-            context = {}
-
-        # create portal (admin should not be included)
-        context['noadmin'] = True
-        portal_id = super(portal, self).create(cr, uid, values, context)
-
-        # assign menu action and widgets to users
-        if values.get('users') or values.get('menu_action_id'):
-            self._assign_menu(cr, uid, [portal_id], context)
-        if values.get('users') or values.get('widget_ids'):
-            self._assign_widgets(cr, uid, [portal_id], context)
-
-        return portal_id
-
-    def write(self, cr, uid, ids, values, context=None):
-        """ extend write() to reflect changes on users """
-        # first apply portal changes
-        super(portal, self).write(cr, uid, ids, values, context)
-
-        # assign menu action and widgets to users
-        if values.get('users') or values.get('menu_action_id'):
-            self._assign_menu(cr, uid, ids, context)
-        if values.get('users') or values.get('widget_ids'):
-            self._assign_widgets(cr, uid, ids, context)
-
-        # if parent_menu_id has changed, apply the change on menu_action_id
-        if 'parent_menu_id' in values:
-            act_window_obj = self.pool.get('ir.actions.act_window')
-            portals = self.browse(cr, uid, ids, context)
-            action_ids = [p.menu_action_id.id for p in portals if p.menu_action_id]
-            if action_ids:
-                action_values = {'domain': [('parent_id', '=', values['parent_menu_id'])]}
-                act_window_obj.write(cr, uid, action_ids, action_values, context)
-
-        return True
-
-    def _assign_menu(self, cr, uid, ids, context=None):
-        """ assign portal_menu_settings to users of portals (ids) """
-        user_obj = self.pool.get('res.users')
-        for p in self.browse(cr, uid, ids, context):
-            # user menu action = portal menu action if set in portal
-            if p.menu_action_id:
-                user_ids = [u.id for u in p.users if u.id != 1]
-                user_values = {'menu_id': p.menu_action_id.id}
-                user_obj.write(cr, uid, user_ids, user_values, context)
-
-    def _assign_widgets(self, cr, uid, ids, context=None):
-        """ assign portal widgets to users of portals (ids) """
-        widget_user_obj = self.pool.get('res.widget.user')
-        for p in self.browse(cr, uid, ids, context):
-            for w in p.widget_ids:
-                values = {'sequence': w.sequence, 'widget_id': w.widget_id.id}
-                for u in p.users:
-                    if u.id == 1: continue
-                    values['user_id'] = u.id
-                    widget_user_obj.create(cr, uid, values, context)
-
-    def _res_xml_id(self, cr, uid, module, xml_id):
-        """ return the resource id associated to the given xml_id """
-        data_obj = self.pool.get('ir.model.data')
-        data_id = data_obj._get_id(cr, uid, module, xml_id)
-        return data_obj.browse(cr, uid, data_id).res_id
-
-portal()
-
-
-
-class portal_override_menu(osv.osv):
-    """
-        Extend res.portal with a boolean field 'Override Users Menu', that
-        triggers the creation or removal of menu_action_id
-    """
-    _name = 'res.portal'
-    _inherit = 'res.portal'
-
-    def _get_override_menu(self, cr, uid, ids, field_name, arg, context=None):
-        assert field_name == 'override_menu'
-        result = {}
-        for p in self.browse(cr, uid, ids, context):
-            result[p.id] = bool(p.menu_action_id)
-        return result
-
-    def _set_override_menu(self, cr, uid, id, field_name, field_value, arg, context=None):
-        assert field_name == 'override_menu'
-        if field_value:
-            self.create_menu_action(cr, uid, id, context)
-        else:
-            self.write(cr, uid, [id], {'menu_action_id': False}, context)
-
-    def create_menu_action(self, cr, uid, id, context=None):
-        """ create, if necessary, a menu action that opens the menu items below
-            parent_menu_id """
-        p = self.browse(cr, uid, id, context)
-        if not p.menu_action_id:
-            actions_obj = self.pool.get('ir.actions.act_window')
-            parent_id = p.parent_menu_id.id if p.parent_menu_id else False
-            action_values = {
-                'name': _('%s Menu') % p.name,
-                'type': 'ir.actions.act_window',
-                'usage': 'menu',
-                'res_model': 'ir.ui.menu',
-                'view_type': 'tree',
-                'view_id': self._res_xml_id(cr, uid, 'base', 'view_menu'),
-                'domain': [('parent_id', '=', parent_id)],
-            }
-            action_id = actions_obj.create(cr, uid, action_values, context)
-            self.write(cr, uid, [id], {'menu_action_id': action_id}, context)
-
-    _columns = {
-        'override_menu': fields.function(
-            _get_override_menu, fnct_inv=_set_override_menu,
-            type='boolean', string='Override Menu Action of Users',
-            help='Enable this option to override the Menu Action of portal users'),
-    }
-
-portal_override_menu()
-
-
-
-class portal_widget(osv.osv):
-    """
-        Similar to res.widget.user (res_widget.py), but with a portal instead.
-        New users in a portal are assigned the portal's widgets.
-    """
-    _name='res.portal.widget'
-    _description = 'Portal Widgets'
-    _order = 'sequence'
-    _columns = {
-        'sequence': fields.integer('Sequence'),
-        'portal_id': fields.many2one('res.portal', select=1, ondelete='cascade',
-            string='Portal'),
-        'widget_id': fields.many2one('res.widget', required=True, ondelete='cascade',
-            string='Widget'),
-    }
-
-    def create(self, cr, uid, values, context=None):
-        domain = [('portal_id', '=', values.get('portal_id')),
-                  ('widget_id', '=', values.get('widget_id'))]
-        existing = self.search(cr, uid, domain, context=context)
-        if existing:
-            res = existing[0]
-        else:
-            res = super(portal_widget, self).create(cr, uid, values, context=context)
-        return res
-
-portal_widget()
-
-
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index ddfb4cc6729..90a570bc1d5 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -2,15 +2,10 @@
 <openerp>
     <data noupdate="1">
 
-        <record id="portal" model="res.portal">
-            <field name="name">Portal</field>
-            <field name="group_id" ref="group_portal_member"/>
-            <field name="override_menu" eval="False"/>
-        </record>
-
         <!-- Mail group for the company's news -->
         <record id="company_news_feed" model="mail.group">
             <field name="name">Company's news</field>
+            <field name="public">public</field>
         </record>
 
         <record id="action_news" model="ir.actions.act_window">
@@ -23,6 +18,7 @@
         <!-- Mail group for the company's jobs -->
         <record id="company_jobs" model="mail.group">
             <field name="name">Company's jobs</field>
+            <field name="public">public</field>
         </record>
 
         <record id="action_jobs" model="ir.actions.act_window">
diff --git a/addons/portal/portal_demo.xml b/addons/portal/portal_demo.xml
index ab2cf22ffb7..fc20bbccae7 100644
--- a/addons/portal/portal_demo.xml
+++ b/addons/portal/portal_demo.xml
@@ -1,59 +1,70 @@
 <?xml version="1.0"?>
 <openerp>
-    <data>
+    <data noupdate="1">
 
-        <!-- Create a portal member attached to a partner -->
-        <record id="demo_user0" model="res.users">
+        <!-- Create a partner, that is also a portal user -->
+        <record id="partner_demo_portal" model="res.partner">
             <field name="name">Demo Portal User</field>
+            <field name="email">demo@portal.example.com</field>
+            <field name="supplier" eval="False"/>
+            <field name="customer" eval="True"/>
+        </record>
+        <record id="demo_user0" model="res.users">
+            <field name="partner_id" ref="partner_demo_portal"/>
             <field name="login">portal</field>
             <field name="password">portal</field>
-            <field name="image">/9j/4AAQSkZJRgABAQEASABIAAD/4RJ/RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAABAAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAMAAAAcgEyAAIAAAAUAAAAfodpAAQAAAABAAAAkgAAANQAAABIAAAAAQAAAEgAAAABR0lNUCAyLjYuMTIAMjAxMjowNToyOSAxMjoxMjoyNgAABZAAAAcAAAAEMDIxMKAAAAcAAAAEMDEwMKABAAMAAAABAAEAAKACAAQAAAABAAAAlqADAAQAAAABAAAAlgAAAAAABgEDAAMAAAABAAYAAAEaAAUAAAABAAABIgEbAAUAAAABAAABKgEoAAMAAAABAAIAAAIBAAQAAAABAAABMgICAAQAAAABAAARRQAAAAAAAABIAAAAAQAAAEgAAAAB/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCACWAJYDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwCp9tT/AJ9lpftUROfs6j8BVEkggAZzXN+JtXeAmyiO3gGQ9zntXOlc2LGt+IlmLW2nW6LyQ85Ayf8Ad/xrlXTc5LyAtnLHr/OqjSlzy7Y9zShGznIxjuau1hXuXAQowkig46VXYgMffqaQDy17EnvinpGXDYXJCknHakMhDlicD6CnfcA+XFdf4I8Ow6v9rnm5WLau33OTn9K7FPCOnxEbYR05JwSaynWjF2ZrChKaujx7d6/qKsW975LLvBKKe3avUL/wRpV0rYjMbnowPINeda74futDuNkvzwv9yQdD7expwqxnognRlDUsrL55LLkgdqnsVR3PmDjNYum3fkvsY9Tge4rSSXYj4+8TV9TI2/Jsdy43deOa9fb7x+teH2ZJnijkkOXcAE9smvbyeTUTEx1A5pM8UqH+dZiJF4OPUUpOTmmKQGPrTu/FUgFD7Rk0UjEA4opiPNWU7cDrXmWsXZutSuJt2QznHbgcD9BXpsZDY9a8juQ3mtwSFJA/CtYFS2HpIoONuSenrU0Qd5ACAoHOAar26HfuatGBQASABVMSEK9T6Vu+GrQXtrrEITdL9iZ4/wDgDoxH5VkzQMtlFPg7ZHYfXGK3vB0hstQllP3fs8gI9cqT/wCy1nN+7oawXvJM3fhfOqrqsG4Bj5TAeo+YH+n5135IIryfwjLLpPipLeQECfMTD68j9cV6r0UCuOuvfudlB+5Yjk71ha5p8Wp2EtrKMBh8rd1bsa3D19ap3KrtLMwCjqT2rKLs7o2aurM8LuYZLO7khlXbJG5Vh7g1rQN5yCTHXk1d8b21t9tjvLSWORZQVl2MDhh0J+o/lWTo04dXtnbB/h969KL5o3PLnHlk0bVuUkvbQjAxKn8xXtp5NeJ2Vk5vrUZ585MD8RXtneokQHSlUkGk70Z54rMBwJ3/AI1JnmowpLufQZp8BBlwRnIqkDF6mik6Eiii4jzKKAQAnex57mvMb1JYr+eIRk7JXXdj0YivUQ28EVwWtJ5eq3Azwzlh+PNbR0LZkIkhPOEHp1JrVsbWS7mSCJSzMQOKzywBznjtXe+A7aPM1w4+ZRgE9hU1JcquVThzSsVNY09IoooI2UpasIgo/icqCx/M4/A1Qglm3tFZoSW6tnG5cFcD67sVcvrmO4SParOgLEKuSXdySf5kfifSq1lLdQaiLa2tzNqkpysZYBYxz1PT/JqVexo9zS1PQ9ditkvdtuZ4G879wDvXpx7gYHHtW9oPia+1Qobm3jVHHEiHv9Kxpp9Vt7j7OdRtnugceUqNjIbb97I/i4/XFR6FO8d0yiIx+ZIf3eOEkHVfy/lWdSL5feNac4uXunoEkyrGWrkdTs5NXuybq8ZLRTxEp6/h61015FI2lsU++FzXGXVrPdStGxdbZEEjYBxKcj5M/TNYUtzeo7Iq60fD/wDZk1haxQJOqbkZWBfcOefriuMsUJvAynBUhvwzg/zrtJrCO+09bRoofOWSNonhgK7MMdxyegK7eO5GfeuXubMad4jmtuQkb8f7pGR+hFdsbL3bnBNuS5mrG9pd3u1SzD9fPjA/76Fez5OTXjWnRRvfWDIMYuYz/wCPCvZCfmNKZkLSg9aTPNKCd341kMQkl8etTQ584D0qF1xJTlY7simIex+c+lFNH0opDPMGkYMF2nHrTP7I0a7ZJ7+zurmVkK4jkKoqg9cKQSev59KlfcnJGc1b0XUQI5/MhbfGjBffOP8A69VUbSujooKMpWkchr/hiws0S+0u5d7dn2tE5BK/Q/nwea29IhlstOKtuQHLNjqQKr6qklxeW8kwVUmcCOJVCgcjnjvyefet64yJDj7pI/LNQ5PlVzdU0puxqaHodlaWdu0kQN0EG5jztOOQPSlvtCtriYTwBobhekkZ2n86gS/IxzWhBeB8e9YOTvc2UFaxhtolyLnzZLqZzu3gAADd64A68DmtXTdNjtdrsgO05BPJz61qLIr9ajuJkiQbjtBIGfTNS6kpbgqcY7I0ktftNs0mAFx0J61zRtCs8kBxlTke4NT3viOxs0S2jnyOp3Nzj1+lUF1eK41a3jiy7tkNjnApuLWwJ9y4tiqDkAY9K4HxPbwp4tD4HMClj74I/kK9GupdqV5r4kIm18licCNRwf8Ae/xrXD35jHEq0CTSbmN9Y05BjBuoh7ffFeykZ+teGaQg/wCEh00g8fa4eP8AgYr3INk101EeeLjBNKx5FA5zTWrMBW+/7UJ1NIfvD3py9CaXUB2cDiikzkUUAeYfaVfKqckHnilhufKuFdecHnHpTBGquWHeo1i2E7epNatX0LTtqjodRnhvtEWGIxyygbgRCsbDBB28cZyo/wAmqihbiEOpyDyP8/XNZYfBwCQw9DSaJOzS3qu/76KXEgz95Typx69R/OsZ07I64VlJ2e5ohWjbB6VaglxiopMEgigDHIrBnQma8E+cc1adY54mjcAqwwQaxYZCD1ovdUmtYwILZ5XboR0B9z2FTy3ZbZof2XplnbsHZVD8FnPzH8aqltLsRAsU0auOQFOQM+9YMEV9qUplup4UPQB2yfoAOPzNPvtLaK28z7ZDkDBURk/1FacndjUFY2by7zEcnmvPNXJl1OZyTg42/gAP5g109pFJFpWZJvMOTgYxtHp1rm7ho5L5st8qELz9P8a1oqz0OLEO6sS6Rahdb0lhkFryEHJz/Gtez7gDzXkukyIdd0wZBP2uH/0MV6yRk1tM4iUdM0jE8e9N3HbQx4BrIY7kkU/imA8ZpwoEKSBRR+FFOwHkE9+QV8vBBFJb3U5yWUsp5zStarNHlOMcVPxCiRjGTWpRFHd+bKVC4amwyfYPEVrPnMd0PIk/3v4T/SrDR5dWAHFUNVEkkIjiBEoIeNh/Cw5Boeug07O5uzzeRLj+HtUkdyrjrTZFW9s4pwABLGrgD3Gf61jyLNbP8pyK5bJnbdo6FGyetXUClNvr1rl4dVMfDgj61q22sQtjLCpcWUpl+fS2uMYlMY9VHNVW0KBCGaaZyP7z5q8upQlcl1qtc6rbIjEyqPqaFcbaKGqSJaWrkH5QOlcSSHZmb7xOc+9aWsal9umCocRL09z61mooZhuPBrqpxsrnDVnzOyNLw4pOvaeQM4u4T/4+K9nA4rx/w5GU8R2WPu/aE/nXr6mie5kOOQOlHVaU9OPSmjmoYIcQOPenjtTCeQKdnmgBCeaKQmigDyzeiZ/hFJsVpA5bJxxSSoJDt6il8pQPfFalCs2DjNMYgEcZoTHJbrU1pZ3OoXIgtoy7n8h7k9hQxo0LOORNGtPNQo+04BOfl3HafxXB/GongE3bmtzVIVjkEcZOyMBFz6AYqjCnzc1xXu7nelZWMo6ej/KwqJ9AJOUcjNbhiHmdKkwR2p8zDlTMAaOIIy0ssjnoFDECoNStVi050RBk46dzmuglTc659azdRj8y3fjPNUpO+pLirHGOSX5BGPWmjcrDb09a65tCh1KNZA5ikIG5lGc/UVc0r4em+uzBFqkSu0bGISwkBmAztJBOOO/P0rojVi3bqck6Uopy6HPeHbrPiHTYyPma5jGf+BCvYwhzXnVr4Yv9D8Saabu0HltcLtljIdDzxyOnTvjpXpLxyQtskRkbGcMMGnNGN09hnPzfSkGSwNBPTHpSK1ZsaHMDuFO5yKQnLCn9xQAzoeaKG+9RTCx5foeh+IPEnm/2RYG4EJAkcyIgUnpyxGfwzXSXnwy1620yO5W7tZ71pNptI2wFHr5jEDPtj6EnivSbee301UhsbOK1tlYEpEgXPufU47mtOaJJUeMcpIv8+h/z7VdOUZp2Kqc0HqcbafDjSNN0qX+0S2pXzp/rA7RpGf8AZAIzzjk9cdBkiqkDW9pbmG1hjhjJyQgxk+/rXYtIzwBZDzjY31HBrg5sx3EqHgq7KcexqMXGyTQ8DUcpSjLcqagN7596oqNrc960ZkLjiqU0ZTtXKegNI5BNDcClAqGYkcChbldAbmoDF5sTjvVkL8nuabbr+9K+tAmNsEMfy4roNLU/2lbBTg78j8OazRb7GBArb0JN2pbv7iE/0qoLmqIxrS5aUn5DvEnmJoN9LG7I0a+ajKeQVYkVIklxdadoxEjbngVnJ5z8oz+pqPxnL9n8L3QBwZgsP4Hj+prVtbcLaWS4x5dqB+i/4V3T+I8qjpD5mbHKG+U8OGKke44qRfvGo71FTUbhB2bP5gH+tEe8dQSK4nWtJpnf7C8VKJYHIB9KUnBGKQEYyDxSZ5rVSTWhjKLjuBOTjvRQvPXrRTEW5L5mTY4zWppd01zZxNn5lZomz27j9QK5bzwWya2NDuA8E6j+CRWP5/8A1q58LJ89jqxcFyXNacATtg8OA4H6H+lcfq9uI9alx0kCyAemRj+Y/WutuOXRh1V2T8M5/oKwtdh23UFx/DsKN+B4/ma7qyvTZ5+Hly115lCK1BXpVbULddvFXEul7cVXuX83vXnHsIxmTbiqznmtKWHg1RK5JpovcauSAKt2kGZc4pkEG4Z960YFCGhiZKYBtrS0K32faZec8IP5/wBRWc0uK39HUDTw+fvuT/T+lb4ZXqHDjZWpNdznPHrf6BYxdnuufwVj/QV1Cj5EA/hgx/KuW8aAy3OmQry3mFgPc8f+zV1eMHA9Y1/8erpl8bOOC/dx+ZiXrA6tdEc/MB+goW4cDAqvdHGo3PP/AC0P86Fcd68ufxs9imvcXoiVpXDA9ifypJXkjw6DPqvr9KN4I6Ch/mWkm07ocoqSsyS3uY51LRtnHBU8FfqKKxLkSLLvjdo26bl64orpVZW1OSWHd9C990E1veF1ElnO2BzMB/Kiipw3xmmL/h/M0r5iiSEfwzx/kxUH+ZrP1UebpcmeoXdn6DP9KKK9H7LPJ2qRaOVSYt2p5cmiivMPcQMcrzUHlDIooqS0SRqEBAqYcAmiimSyJ3bBrq9OyulQ+uzP6UUV14X4mefj/hRzmoL9q8cafC33YlL/AFx0/lXYBQvPrIf0BH9BRRW32mc0fgj6fqzjJJN08sn952P607NFFeW9z2o7IlQ9BUmTj3ooqRlK5XkE/pRRRVok/9n/4Ql7aHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLwA8P3hwYWNrZXQgYmVnaW49J++7vycgaWQ9J1c1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCc/Pgo8eDp4bXBtZXRhIHhtbG5zOng9J2Fkb2JlOm5zOm1ldGEvJz4KPHJkZjpSREYgeG1sbnM6cmRmPSdodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjJz4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOnhtcD0naHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyc+CiAgPHhtcDpDcmVhdG9yVG9vbD5BZG9iZSBQaG90b3Nob3AgQ1M0IFdpbmRvd3M8L3htcDpDcmVhdG9yVG9vbD4KICA8eG1wOk1ldGFkYXRhRGF0ZT4yMDExLTA1LTExVDAxOjMxOjI1KzAyOjAwPC94bXA6TWV0YWRhdGFEYXRlPgogIDx4bXA6TW9kaWZ5RGF0ZT4yMDExLTA1LTExVDAxOjMxOjI1KzAyOjAwPC94bXA6TW9kaWZ5RGF0ZT4KICA8eG1wOkNyZWF0ZURhdGU+MjAxMS0wNC0yN1QwMTozNzo0OCswMjowMDwveG1wOkNyZWF0ZURhdGU+CiA8L3JkZjpEZXNjcmlwdGlvbj4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOnhtcE1NPSdodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vJz4KICA8eG1wTU06SW5zdGFuY2VJRD54bXAuaWlkOjlGNDk1OTlGNUQ3QkUwMTE4M0E2RkQ1MjM3ODdBREI1PC94bXBNTTpJbnN0YW5jZUlEPgogIDx4bXBNTTpEb2N1bWVudElEIHJkZjpyZXNvdXJjZT0neG1wLmRpZDoyMTUxMUFDRjU4NzBFMDExQjE4OEJBMDcwREM1NDg5MicgLz4KICA8eG1wTU06T3JpZ2luYWxEb2N1bWVudElEPnhtcC5kaWQ6MjE1MTFBQ0Y1ODcwRTAxMUIxODhCQTA3MERDNTQ4OTI8L3htcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD4KICA8eG1wTU06SGlzdG9yeT4KICAgPHJkZjpTZXE+CiAgIDwvcmRmOlNlcT4KICA8L3htcE1NOkhpc3Rvcnk+CiA8L3JkZjpEZXNjcmlwdGlvbj4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOmRjPSdodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyc+CiAgPGRjOmZvcm1hdD5pbWFnZS9qcGVnPC9kYzpmb3JtYXQ+CiA8L3JkZjpEZXNjcmlwdGlvbj4KCiA8cmRmOkRlc2NyaXB0aW9uIHhtbG5zOnBob3Rvc2hvcD0naHR0cDovL25zLmFkb2JlLmNvbS9waG90b3Nob3AvMS4wLyc+CiAgPHBob3Rvc2hvcDpDb2xvck1vZGU+MzwvcGhvdG9zaG9wOkNvbG9yTW9kZT4KICA8cGhvdG9zaG9wOklDQ1Byb2ZpbGU+c1JHQiBJRUM2MTk2Ni0yLjE8L3Bob3Rvc2hvcDpJQ0NQcm9maWxlPgogPC9yZGY6RGVzY3JpcHRpb24+CgogPHJkZjpEZXNjcmlwdGlvbiB4bWxuczp0aWZmPSdodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyc+CiAgPHRpZmY6T3JpZW50YXRpb24+MTwvdGlmZjpPcmllbnRhdGlvbj4KICA8dGlmZjpYUmVzb2x1dGlvbj43MjAwMDAvMTAwMDA8L3RpZmY6WFJlc29sdXRpb24+CiAgPHRpZmY6WVJlc29sdXRpb24+NzIwMDAwLzEwMDAwPC90aWZmOllSZXNvbHV0aW9uPgogIDx0aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgPHRpZmY6TmF0aXZlRGlnZXN0PjI1NiwyNTcsMjU4LDI1OSwyNjIsMjc0LDI3NywyODQsNTMwLDUzMSwyODIsMjgzLDI5NiwzMDEsMzE4LDMxOSw1MjksNTMyLDMwNiwyNzAsMjcxLDI3MiwzMDUsMzE1LDMzNDMyO0Q1MDVBNEM2MDlBQzIyNUVGMzcwM0UwMTE0NkQ4RTYzPC90aWZmOk5hdGl2ZURpZ2VzdD4KIDwvcmRmOkRlc2NyaXB0aW9uPgoKIDxyZGY6RGVzY3JpcHRpb24geG1sbnM6ZXhpZj0naHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8nPgogIDxleGlmOlBpeGVsWERpbWVuc2lvbj4yNTA8L2V4aWY6UGl4ZWxYRGltZW5zaW9uPgogIDxleGlmOlBpeGVsWURpbWVuc2lvbj4zNzA8L2V4aWY6UGl4ZWxZRGltZW5zaW9uPgogIDxleGlmOkNvbG9yU3BhY2U+MTwvZXhpZjpDb2xvclNwYWNlPgogIDxleGlmOk5hdGl2ZURpZ2VzdD4zNjg2NCw0MDk2MCw0MDk2MSwzNzEyMSwzNzEyMiw0MDk2Miw0MDk2MywzNzUxMCw0MDk2NCwzNjg2NywzNjg2OCwzMzQzNCwzMzQzNywzNDg1MCwzNDg1MiwzNDg1NSwzNDg1NiwzNzM3NywzNzM3OCwzNzM3OSwzNzM4MCwzNzM4MSwzNzM4MiwzNzM4MywzNzM4NCwzNzM4NSwzNzM4NiwzNzM5Niw0MTQ4Myw0MTQ4NCw0MTQ4Niw0MTQ4Nyw0MTQ4OCw0MTQ5Miw0MTQ5Myw0MTQ5NSw0MTcyOCw0MTcyOSw0MTczMCw0MTk4NSw0MTk4Niw0MTk4Nyw0MTk4OCw0MTk4OSw0MTk5MCw0MTk5MSw0MTk5Miw0MTk5Myw0MTk5NCw0MTk5NSw0MTk5Niw0MjAxNiwwLDIsNCw1LDYsNyw4LDksMTAsMTEsMTIsMTMsMTQsMTUsMTYsMTcsMTgsMjAsMjIsMjMsMjQsMjUsMjYsMjcsMjgsMzA7MTM3NUU3MDc1MjVBMTE0RjBBRkNBNzg4RTM2QzAyN0I8L2V4aWY6TmF0aXZlRGlnZXN0PgogPC9yZGY6RGVzY3JpcHRpb24+Cgo8L3JkZjpSREY+CjwveDp4bXBtZXRhPgo8P3hwYWNrZXQgZW5kPSdyJz8+Cv/iDFhJQ0NfUFJPRklMRQABAQAADEhMaW5vAhAAAG1udHJSR0IgWFlaIAfOAAIACQAGADEAAGFjc3BNU0ZUAAAAAElFQyBzUkdCAAAAAAAAAAAAAAABAAD21gABAAAAANMtSFAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEWNwcnQAAAFQAAAAM2Rlc2MAAAGEAAAAbHd0cHQAAAHwAAAAFGJrcHQAAAIEAAAAFHJYWVoAAAIYAAAAFGdYWVoAAAIsAAAAFGJYWVoAAAJAAAAAFGRtbmQAAAJUAAAAcGRtZGQAAALEAAAAiHZ1ZWQAAANMAAAAhnZpZXcAAAPUAAAAJGx1bWkAAAP4AAAAFG1lYXMAAAQMAAAAJHRlY2gAAAQwAAAADHJUUkMAAAQ8AAAIDGdUUkMAAAQ8AAAIDGJUUkMAAAQ8AAAIDHRleHQAAAAAQ29weXJpZ2h0IChjKSAxOTk4IEhld2xldHQtUGFja2FyZCBDb21wYW55AABkZXNjAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVogAAAAAAAA81EAAQAAAAEWzFhZWiAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAG+iAAA49QAAA5BYWVogAAAAAAAAYpkAALeFAAAY2lhZWiAAAAAAAAAkoAAAD4QAALbPZGVzYwAAAAAAAAAWSUVDIGh0dHA6Ly93d3cuaWVjLmNoAAAAAAAAAAAAAAAWSUVDIGh0dHA6Ly93d3cuaWVjLmNoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGRlc2MAAAAAAAAALklFQyA2MTk2Ni0yLjEgRGVmYXVsdCBSR0IgY29sb3VyIHNwYWNlIC0gc1JHQgAAAAAAAAAAAAAALklFQyA2MTk2Ni0yLjEgRGVmYXVsdCBSR0IgY29sb3VyIHNwYWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4gSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcgQ29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdmlldwAAAAAAE6T+ABRfLgAQzxQAA+3MAAQTCwADXJ4AAAABWFlaIAAAAAAATAlWAFAAAABXH+dtZWFzAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAACjwAAAAJzaWcgAAAAAENSVCBjdXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBAAEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8ApACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEHAQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMBiwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQImAi8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPHA9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0HTwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQKagqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwqDEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMOLg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBDEGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQSoxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUSFTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqeGsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkdwx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDwIRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0kfCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgNKD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9EsBSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjIOQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJyQrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tHwEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0CTUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxSx1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxevV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTpZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09rp2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJLcqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4CogQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASIaYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAGkG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CYTJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBpoNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSpN6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHWskuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRRxM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXONs62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4cziU+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23////bAEMAAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/bAEMBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/AABEIAJYAlgMBEQACEQEDEQH/xAAeAAAABwEBAQEAAAAAAAAAAAAEBQYHCAkKAwIBAP/EADQQAAICAgIBAwMCBQQBBQEAAAECAwQFEQYSIQcTMQAIIhRBCRUjMlEWQmFxMxgkQ1KRcv/EAB0BAAEFAQEBAQAAAAAAAAAAAAQCAwUGBwgBAAn/xABBEQACAgEDAwMCBQEGAgoBBQABAgMRIQQSMQAFQRMiUQZhBxQycYFCFSNSkaGxJMEIFjNDcoLR4fDxF1NiY5LC/9oADAMBAAIRAxEAPwBpl9TsR2bvwLGOQdkD9H8f481CAQD8gqCAAQRs/WYxwspJMrLigy3ZNk5ojNc8jxWB1cfTJ4d7yGJNcfJHnji/4rruOfcZndZX4LjYmQeGMGO2uyQ39QVYyqlWbZ+Co8ka6lbxSNe2Zq20TbfqJFHkkkDHFfvyHoQIwd6iTKkFzubBJxWcVkHkUOK6qt+6H7yqnIpLvAvQbhWBxMZnuY3kXqRbo0Hv30i92F6fDkhjCQY6K0Gn/n8xn/mnVDj6sGPLXsg/p9IFctOwdhwmZL+7bmLvQOEZgi1fIUdeVMXdo3YAfpQu6IgPjaBuYf8A7azglrUXVpksWbN2eTMZ+rdyT2ZbOSmlMeQmmsSS+/KblzIyzkTq7+57U0Lk+4ZC3bsjyvrSbBsjKjaQtAxjNIDSAchaCK1ZvLEkj+jGxAllQuLuzbcGxZY7BRAA2n25JWzQyvJDRRocbmsfFLHW96GvIa3eWLr2JWGSvai6KfasQTQJCyzFBAsccxkZDgmi6F1BBuyQprdW725NcEkjOFPRQZUG1WU4BsFTtHAJGWIBrgH7XmkDclrR27B7fjZlVrVjbIolRHjdKik/0WMS2JbE5Kyujg+51KIPmcsbHA27Q15DsCSSBxaoeAdoahYy06i2VRd1uNEKCcWoxtokbj/WBQBGSQx5Ge29ha0DP7T9akMatplEjpIxK/1CzddovZezL2UsAe3t0QCbJNudx/Tiqsg0psHyCR00ypYpSKW2YDz8Ei7wCbBqqySSFG9hj4o1FE1UkVA4EQrv7hHUDTOzAMxI0Z3CJvxINsPXDvncSSDjcNu0HAObo3uFih/UR5bt46XaqAk4yCxNY9wUk/IFk5q6HQZ75Ud5HVVIKqLFeNVkOiYxsO6skqA+04kQF42Idu3REKKwQWJDAjPtzkgUT480CTQvNPUQAKY7qLEMeBd1YH70t+POOnG4b6mf6bs41crBLNhqE6shrntPVjaEwqldhIq/pYCQ705w6x9A0AjYmGx4yh9yhqamC7r+OVNGifm75sdPRSRxMrbbAItTfg5zVC75F4s11J6lnRyeSfI45p7MVcL2ru0paBWjLxH5Oz0O4HClJWH4E6/EDZJF7JArYJBINXySKF8cA0P2s9PTOJpGkVnVMbUUgqATXPJqhubk4JF9Lj0tp4jJZC2mZhEleO52lYkJKo89lDkNIGUsRpf7SfP76+07KFkFqhJY0QMsQRd3WV5sg+AOmVBUMdoJuxuyciwQaI+9efGcdSZbjXo81uj7JvmSO1X/AE6tZufhJ+pUqV7b12dtEa6ks2jrx9LtixoKQENkDdkquQbFAV8gDnk30wu8Kd9CxbVf7Z+Pi7q6HGetfNpmFq5tgdWJGiI3sKrygkAb3+XXyCfG/C9SfqmSggMBgCgrEGsngkXm/jyM9COF9NqW/a33Fk1fzZsZqweLwD9DMPbGhox77H/b/wBgefyB/wCdA/OtD6YmP34LA/GCfP8Asfj4469W9qULO1RXzY/3H3xX369xI8nhdN2lEX5EAB2JIYjbaGnU/J1seP2P21pVtBuWyCfFryD/AKVzefg9KLBSL5yQD8j7WP8A4PFdKKoRDMsIZJGlgd5RH/8AE6SGEpJ4/tLAMmgRphrR+X9Mm1wNwIkU2AaIK82a8f8ApkdNMdoJ2mwwNnzZJIBv4O3jj7kV3klM0sku12ZCP2ABCxgBf30Pj4GwCfG/D5hKzKxIbe24gWCBgXzxYN5zwLo24JVeNlogKKB/8pqsk34+M/IrromQNGBJJEZ/dboo8AKUG32B5DsSHIOvnegCB9PRptdpFa9wrkggXYHH/wAsdBuqlI/UABAYE+WN2MYwoIW+bx9zmenmkrz14ooWmMx20oZeignsCw8b8DWgNEAjYB2Jv1AyHNAeCDk3VCqP8ngWPt1PutELf6lB3YzkA/H/ANY/et374/uKy3F5bHpJx+wMUDUqX+X5COXd3JVclE0lPB1IgCI6bQ+1ayPfubqPHSkgECyJcktBCJow5olnZUWiFpFJdm8+VFA8cDkhidzAdi3vIUe1SSFYhVO6z7hRsnAU5N56qSt5+1kpusuSyqQSnax3bEUkbrKGQbhhljgUExtGIUFgH30iEdlZX9uYVViBAWJn3ZMYqvF025ybPttqqhYZsxxMs5a3faGUBSyMGUn3WLAUfCi1W1sVZAyLHXGeSRZ6wgihCtLdsMIolYRf+3Cr+nqJcIfu0Sri0AliIVgS/wBCNN7tuWN4CCrK0dzMxsoKpKJasnbYUFxwgKzoy2KslmO2wFCqrWqvgWoERDEkiQOpJrBGuHrSdvalmmchpo4PbDl5Nn2xGGl/pf8Axjuzf+MhkH4qxM7SOM+1QQFB80DZoAFuf2BA6XGpQbkFSG1DbVFHybGCQCckHBObsA4xeHtZCHItXpvYmp4a9fuSQxFxUqxVlhaeaRR0jh/WWqsBXsFmtWoIQxmswoUuyxqm6gztsU58MAwJIrPIJ4AOKB6fVHclU3OES3YH9Cx5s5wAzRAgf4hi2PVrf8LX7M+K/cSPVbmHKyLlHhMnF+PrjovdhJt8rq5zISZYTJ2VZIjhkqRrI34w2ZkiCPJ3Wj/WX1DqOxnRQ6ZFMmrEkpkZlIQRvGFiAx+oSWWvFDjb1e/of6Z0ffDrdVrSPT0hhh9Mkr6jzRtI72owY9oU4IoE1ZN3F47+HT6GYGaP9FxaJlEPWzbtJj7d23MyQdy7W6U08WjBGIvYdFEZHho2YnLtb9c/UGoaRXcxoz2FS1VRHdEEPmuaOCQWYUca9pfof6fhRWj06KwH6XCylt65YTNGdrb/AAK24/TjpsvVz+Fp9tvPalw1cFa43lbMc4hzFCxL+tr2pVX+vLKHjjsVTMpmlpWIpYejlqa05x7jP9v/ABB7/pGVWkTWQqob03VUQg3agKBWCfd7R4KupHUd3D8POwa0SCOKWCVrYTQsQyObFbG3A0wYkFdpUGyMbs7P3YfZ56jfatydMRyJ487xHNy2Rxbl9CMw0sq1VBJLRuVS08uLzEdfdh6c8rR2KwmnpWLsVS5NDs3079S6H6h07SQJ6Oph2nU6WU3IoNKrRsKSSJmG0uCXVqEiR7k3Yx9TfSeu+mp0TVBZdJqCfyuvjsRykG2jZATsmRCpKWRglS21kRsPRP1Abjl8Yi5O7JPNHXhjSITmzRncRpFGYkDxtj53inEkolRKLWfaWtBC2prVRtt37Sa9wyfcKJXyP1hXUWRRU0LG3qrJasUN80aJoA+f4r+bNA9SOoZ446jlP0zOly3bf2wjlWiHaQs7SDY0rkDqpDMG2DpQwjNGqushdRtLk5HN2KPHBv7DH8FTyqmOLBFeLUAE+Bir+Meckuh6cSySci4rgM7mZhY5FyPA4+vPNHLYasMlmKVD3FjBUSGESvIE9yIya6e7GOzKWDt9UjaQFYKOP6ML8VfnN+OOht4UMXa/a3OeMgfH+1c11t3sSKZZ9nTvK6rttlSzsSdE/l4Y7Oxsk+R4Ip70yKCdqvgYPIyOMiyOfsfPQUTWKAoDcQOf6hQz58gmv44PcSgQsV05ITz41/YB8bO1AOyDs/JP+DHsCCQxuyT/AP2z8DBNkCvPSwbRCLFKAKObFnGLHNXef9xuNkYhDsa/UxiQt8jfVR5bwAfk9RrY+Tr6KgDpG4qtpJarsGgTxVCybyDZ8Z68BDFGJNqKWwSPGf8AXzwa+3RhVliisWvz9yyJrAdepVRC06iPTKx7EhCzeAFChhve/p2BlUPm2omgo9tsOKF2R+33+Ok6gURmwW+2KFGvizePOPjoWGBkb2lPtmU9A/zrQ0CNEfJXR1sAn4J39PMrOqykkOgpQpG0++9xr9RwBt/2oW1GwVjGopWJJYmmAAs8EAeDzRocV18uzRwOYHX3FVy2gFJDMAP3VlA0ujr/AIG9qR9PSggew7aNHxmv2/38V19FKJK3KCKJAK2VyMWT9/jIHjrNjaqyGoK8DssoZY45FYB104XYZtBd+fJHkbI0R4mwoDEgX5Px4N8f6ngjiupygwCsRQs8ZJAb+KyTyDiq89Zl/uR9QLXPfVnn/J/1vvV8vynIfy+WKSGtJBgsUThsCZJIo4JJHgwtCoPds+xKXkMa/qHkb3bNooBHDGpUKVX3XZBDDfWDfLVtUFjtsgEAdQutJDuSwO81SgBlVeLKkELhTZxXnhS0eOzVJHSstQyySv1gMTma9KCvSKOB5GUKHTfuRsKtEmazGwi9+NHekiclmDbbv3G1Cg5ANYBJ4YW4NAY3dJikiIAI3MSpWssRZahRBCj9RrYBRrbnersHHlslkq0EsUOOrQf+7eCpPAZUEP8A4YGZKbwyREv7jCNq8kbtOys7O7WGTGgT9YZqVS7Koo4BO1TuQggckgkbioLUCEeWRxCFCKTuYKwa6sqT7BuBBLXutAaUsoJZfz1Afcld+kdPu/ZNsiykxuWVgSGYBKyjqT1mVTJ19tl+o0g76IOLGD973H7/APM/x1Ioli/CigMEFic7avijYNUxwDyJ2/ZB6fQeqHDPvB4tWxYv8qP2v8t5VxFwSJza9NPUn0d5lnsRFF7qLI+TxUSUa6D3HtItmFF8NHLW+/ar8rP2OWVysA7zDBMSMbdZou4RRu1E/wDZvTXwNqtd1Vk+nNKNdF9QQogbUf2RLqIeN7DR6nt88kIBwTKoUrndsL8AkGyf+BDyylRqfdRw97cMWTmf0kz9eo7MTZo0j6i4nI2aoO+xqS28THb2Aq/zCiNhu4jpv4nesR2mVVJRjrYGIGA+3SlFLC6HtlZaDYVjjF3T8L2V37vAzAGIaKZaH/aCtQsj2RYCvs5A/WuB4vzlmjkjb8VLOrCPYCaBILAsDvrrqBs9htAuvxByJY5HUszVuLCrLBtqYIJC48/a8/HWwCQK4RaDKBu2mwQvkEZJPPFc+T0hsqocSKoUMpYq3VVXt2A7DqxDbIBYHRUvsaZvobZRIXIrJW7vNWDgA0aomzjHPRyVtsth7zuI5/pJxRx4JwDZABPUGfun9IuO+unppyn065JGsUOUqe7isrGim3gM/UVpcPmqo0W7Y+97TSQArHeom1Smf9NZkVrH9O9xn7RrtPrICxMbASxsxCzxMdsyMeRuSyCSwWQrIoRkVuoX6h7Rpu9dr1HbdVSpOKhmpS+n1KAnT6mPcTukjlAIVtqshaI7UZw+N7mvHc56dc1z3E+Q1P5dn+J567ictWV0lWC9jbrwSSQTOjxzV5vbjlo2xF+ns1GrzvDJHN0bp3Szw6zTQ6qBy8OoiWVG4LJIik7l4UrZQqf0FCopRXXKWt0s+h1M+l1KmPU6aaSGdCbUSROUbbhbj3AtGQtFCpAo0JacVsvyTHQ5pYvbW1Gt26ihQsLSdJHVFEk/SNzIrIGlmKowDOzhtALEYfVUsMyMVI5q6C+Dj5+P8umpCZmU0R6aWSCCtnO7gED4F3+4A6kLxGzjcz6h+lFqu0Vc1/UHhkSPINSOp5Hi9VyIwfx7MOgOgrnyT8lG0gOSQcFjXgC7/wBOLq8A1z0MwKq5JsU3+Xu44+Kz/HW2qQiSd2JBIcn/ALVZG3o/kN70x/c+BrXxVGCsqst0pK1QBrjOcVXH+XPSUSgwBreWu7vK7fOOcCwPNjx1+VghZGBI6NvyQPOwDoHqW6kg+PGwQ37/AEK4J9Q4ULZBzncB+rPH3F0QTnjr1K2Gh5JB5yDRvND3D+OOeu1SeRHKdSVIMh/zskdvAI1tlXXwSW/4P0yjsG9p85skXRXBxVkHwTwRz0tUG0AmhgC+OfOR5APnF3XBERzyfriWADtPLLKvx4ZI+qkA/BK9gCfx2Tskn6WrEMKNH2iqN4AGDX+V/ufull3Ag1VDHBOQcHA8Dn9/HR8kweQgEgBCw8gsG7DWuu/nZ2d/A89m+pUkb/TrlN1BhdhlGLPABujnA4IyCylaa6Iuvkc85ocfN/er69hQ8rMfLdFBLnY+WPgKNk7JO9n5/wAn6QrMHZFyReLF17aLWQLu6rgEfcBQ2hbYlWO3N/q/UDWOPaB444x1m+xNiK+0BZgJDIheNXLMV9wL11tSu9gg7UnYP/BsFMGYm9lDI45yQT4/evFWeJxWUD2glrItixBwTdXxgWABi+L6yR83r33zV9Pamlgx+SuUoImeR4oY8fZ/RLE7ydbLmOOsqbtEyAxBYWid2U3aN1HkAlFAJrmgxAu9lsSTt24oHgDqt6mKV9rHcw3MVU0UwSpsWDgirIxWB5AniOKl/WtkMiXZolk6RJG8E00axtI6yM8ZRYUCsf6sb+2qsW7xoIgJq5rTZHYBos5IIAurAByNxGQxskqAbPRei07bt8i+8AhVoIwXBDWQuBjFHkG8ZkDxapAkEtqOtFX7lE/JITYlWPse08yRrO5WaRykczzlAeiSSKfcEdliFdnIOVJ9qMSVACLhQBliwIySCQBXUpEFLDaKX2hmNbmBFk7iM2bN3kC8AZWvJOJX6XAOKcvWvKtDlHIeS0oZVVilifDnHRRLEGd2lKM90t10rWEaLyYwAIZ1m1UsO4B4Y4XcAV7ZFJFYGao/NUaINmQk0kseig1TB1jnknQNzRVkQEAeVJlNVTMCM7aE8v4a2atemPqlyfkEvYU19G/VPG5GsymSO1Hf4fkeUSR+yxMUryRenTooZBo168bvFELBep/WEY1Xb4oY2/vT3DRMGWgw26mLSlmyDROsWgvtIDVTAnq2/RLx6TuE0ri1/s/XKylmG4mGScqBYBv8kyryQwXcVWj0f/w7c9yD7ffvSwvCMzFPBB6kSXPT/LwIW/Ts2ary5XAETiNUnFTM1MajSxq0ErGYwBlkjsRDfWGmh7t9NPqlIP5StZDuw4VG9KTmipdHdtrLYJUV+non6Nnk7N9Trp3Ubdbu08gBsD1R6kXA2tucKq7aTawKWSCNUquIa0UZLR9/x6lfyIUAr8KejlWKgE68yHf7/WAuArOMlQWA8ZJraSxNHhas5oDPW+RbpXZgOTQbK5JJBN1zzQAJ+BjpM2dF2Vis0fypVtqjEtvZQHyAFDAoQey/jo+fVkIQIRRG7ahu6OOeTjGcHokxttySSMnaxoDxZwAACaz58WB0zvOatBa1m7cuVadGukn6uxZmSvBXjRmklaSaZ0jQJEG8kLvpryV39G6feXWOFGlYgCo1LnIFgDBP6vcLIArIWiG9QAsTPKRCgKsHkICjbe1y5KlVNFrLAVZJI9oy7fxSeE8Bb1D456remvJOO8mpcwpWsBzf/TmaxuTOJ5Xxz24sbfytarcnlqnkGHkiq1WhijrS2OM27Fpo7uSWW5vn4f6nXfkpe36/Tz6dtM6TaUamJ0EmnnILrAWC7hFKGLKw3KdQu1dkZA59/EjQ6P8AtHT9z0U0E6a6N4dU2nkWX0tTAQsMjqCSonipQRYYQOWKSyKzRS+2zk9bIVszwLJX2q2ZFeXDjYY2Krsnv04y4b86zr70ehuSEzNsrXIF018WypgoNim20QGGCaPjNePOCesxindVmTHu3CqH6M8YBIsGj8jGb6mp6X+mWTn9SPS2A2la4/qLwd6dZWSNJpf9T4o14w8oSNTNKEi3LJGiMS7uiKfqOLj05QRkxP4GBTXiquwASRjixd9elAVOWyjUDXGR8Eg/v+4zxtjIRZHVW0WYkkgn/wAjswBA+PwCLr5J2QfP1TJmKjaoxuZmNgUbBXnixVfPjNnpIxwDyT+xOSbPgE8eMAAY65a7O6+NsygHxvXjRA/yCG/Hx5bxvWw0ztgsPaSCwBGQBtI8ZIYmgQcXdZ68G1Vc0QBdCycmjQyfJOM/PFdfWkPvP7eixYxhdAdQBvR0OpBBI2Pgjx5I0Mw2yVdYXHyWRbJ+bs0eBWCOOlgExirznIugM+fg5zRJ6NYqsst/K2u+v0lWOx7YI3IoMcUhVdaJLSqAD4HVv7SDqTEStvkUC4o1lIz71AQGj4INg8V56b9QBYxXuZirEjJIJ8YrjkYOTVVZtxSWOfNx17URlWeCyF7BeitHDKwLdyTpG8L87OvnZ+vICZNQL5ZHo22CVYLVHkGseRkDA6bnX2WCqhaJ5o5o+DRzk0KAJ4oj2ziCaWJ9gxu0ZPbe2jPU6/bXjxrx438n6HjLrI1tWGFsMmmA81fHP+Xnr4xhvb5WsihisDybsk/z8V1mV49xSHiUNmdMpkLjSWFmeS1aknAQDbonukkKWAOt9T42Trza0LybwzMfYSMFbxjJ++fPk31NbFT9IGWsXWCDuoWattoUVm2PWZD1OxfJMH6mc54zBhprSYTn3NMWciabRpJJiOT5jGlY5NtKq94HaZDI0Zk6942VFP1bYnhMSyNKoLRpcd5Fopz5BF1jAJ+buG9aYOYooL9NnTc1KoCuyg15LgbmNgWSRnomxWNzssimz+kxFcSIJoIg9q1ZSORG/TyWWREqpIyqXKTSyKyKDE3iP6akeACqeVqtGchY1u13BAx3NVgAgA7snHSwmoYguY4l/VSe8vtP6aIG0E8nPFVZB6lT6VcAzvqJn8Jw/jdK5kL2ZyNPGqldYllY2ZtswaT2K6M7pI0KSSJG61zG/wCRXUPrtbDooJdTNIqLHGzKZCWHtF5Qe4gteALIFgc9WDtmgk108WnhjZi0iCkAG0PbWN1KLAcJeCV2miQDYh9x/pDjMFhuK8Nwt/H2cV6P5qhwSri6SRxwZfm2S4xjc/yzktq6A1228WfzsGEFedYocbDxnKWFMT2cs1mndm7lJqHk1U0bLJr1bV7pLLRwLM8cERGFUFIjKGvJmiTAWJRbO/aERRw6OFlMPbZE0Y/wSaiTTq+pmumdmjkcwKoLKiad6q5N7DcU5BylMhe476UYie1LknKXMrLYfGQ5njs+MyPDZcBiBHRsZG4/KpecWcQUo1hNcqtfSoYYqFrJ0Z2WKBohJrSxKANsFOY5d8eojllQlQEgOmMpDsFDiMk/3i7ofSTTLIyaUbTISrFbQyxGGTTCJSoLD8wmoZDtB3Bto2bWYSq9c/tY+8jAcTwvqwuP9N5ea+n2cn9S4k9N6uVXmWHkmGEtyYOi0cpx+QxXCocHQlxeJxqqlI4+5Fg3yKXBBbquj+ofp19TL29vzkel1sSaINrGjGlmAMyLISW3xPqjOQXcAvvRmCemSly7h9Od+/s+HusUmgk12inbXlNGs35qyVdooQy+lNHpY41KLEbLJUXqOwXqdv2mffF6w+uz4efn3B+NUcJmqc8lXk/HL0sNebJUzNBej/QSZC+8Xa5WlRopFrNERE0QnhsROaR9S/THbO1CRNHrdU08Mqo2m1CeoQsg3C5AiKQqEOpZySoNjcpHV/8Apj6h13dYIp9To4IIJoxs1OnkXa7Rkoysu9hXqBxiiTtI9rKTY3luR06WKs3ySAsUkqL5G9KW0FQbAJXwyqzbBBUD8hTFhJoFwWwQTW6waWuLAs4I8gmxzannZVBIpTmh/UBwTge0eaIBsDPVRHrj6dZr7h+cXLHqT6qX8P6TYy0j1eGYSxcmjs1UZ/bjOOjkSp/MbSyPWjtTRXbftGIsoZWi+tC7F3GPtcKw9v7dE/cHX+81sipYAw4MjsW2Dml2ogutxoCm980M/c39TW6todAsigaSLLMzfqcqhVSxKlbcu6ncCqgV1E77m5vsgPpFzL0W9N+O8EwPNsZgbOW43lMZmcNe5hHyfjdeTMxw5WdbM120+cXGPjMvDLLaeCvavFYY70MZq3Psy/Urdwg7rrNRqdRppHVNRG6TDTvFNtjLKrqEG0ESRuAEbYp3GNs0L6i/6vSdu1XbdANHHqY4mk04jdWnGoiUyWxDFt0u305AD/3jbaIs0x+leKkn51Uu1JRFNh7mDyrhpREz4x8xBh8j7Y0FeeNMtXtvHIR0pV7uttqF9K1Eh9HYQrb7jNg+2TYWNWTxtoWTnN+eshUb3Y4I2Rm+CQH2kgcm7TNnBOc31an6C+oC3PWL0fq5I9bMnqx6bVKzr5T+tzbAQRsux2Ll3XahW0GJAI+orUaYpFJIhsejISCcmgzMLFk+bJP7fAQzsQ+01SGgADi2NAn7Ch985xezQTye9Ku26l+utDQ6syrvwCP9p8j5HyfqkSkEAkbd1Ekj74v7jxya8fCYXJLEmwHoVXBFkUfFADHN4GCR10V8nyS2/kjzsDY1oDwNnWtb/wA62OzAE5BFNxxbIVGBYvIPPjBNGiEwWWuTZNjnjg3dgYxxfxjtC/UydkLOVX2yNjTb7ed72Py1rf8Ayf2+m4z7rYBjtoFhZNFfJrNCz+3npuUG9oJUbgbH3BBr4+L/AIvoJPZmsXUhUtHJYmjib8ugQF1U9ySoAIOwCSAQCQNb+nLZnIv9RIJAx+xr+mgCRXP+fXgXYoJs1lSQefkXxWbJoDPHHSw46sq52vAHUiBLMPudh1MixSAabR7Lrrt9bKjud7P0TpQxmVFKkjcAQALIwTu+ALaifF18NzMPRcsOaJFZrcAQB9754ujVY6DXJHa7KGIaI92jddsH1IQ5U/uoYnRHz2HkkfQ8jOGNreWAI/8AGxv9jyDQ/wBunRycVnOQf9gPFeBz831nBgt/zCOzGzMVjP8ASiD/AIsf2c7HkdlBADeBs6IKn6uwZTfqEAD2qfmzx4HAOc0M11Jkg0oyRxd3+pc5A48V8Y6ob+5zHphfWv1CrvIiRZHP2s9W9yRndq+cp18i0jNL2X2mtWbYRY2JiaFogsYQBS4GBiXYwIrZe0m9poDB5AA4s+bIz0I9xtltpzV3ZJJq6okHgXf2Gb6jhJaq15El96NY5PMMndAZO5ZkUEeJJD1aP20QKJAuvjsCArEFQGNCiADSkHddVyKOWHll+3XpkUhG3+4tgE0Lo0tGslgt1n7EXd8P8JjheCV+W85ykcaZTG1461S3dVD+go2YrLWp4llj61ppIddZEZ5FqkjavK6rlX1xqZZZoNKrXG7ElVzvdTe3Fltha9oDAE5XFdbN9AaCOLTza2VTvRUAJUbliIa2UkWjE5IsbkK83ZZP1X5nhuZ0sGaeOvZnE1r3IshXx2Ke7cyHJ+aepeby3JsxEYKEbW7c6RckyvFcdRrTQXP1WcykdeaJ+MWY4Z7RaeXQvIzssUhhiV5JCgWDS6OKOEMC5xR06zM7q22NF3KzTjqv6/URaqOMRo8sKtqGURMTJqNTrpnnlUhB6hJ9Y6eJFKvukkMZQ6ckNl6XZ71I4v6p1uBcB4TNzL7n+aW57mB4pPlKWFwXAsbBDkkaxfzFy7XxdA4nHS2Wec3MbRoJYzEVG3DcuxU70hPBpe4aUTTaiOLtEYWNpQheXXTO6FQoWt6u4QsshZ2CoWG3cBE6XUT9r1ex9M8vdnBdIWPpxaGKNGuWZ/cCQoJVVfYvvVASw9SXPJeUfcjw7kz8Hn9ePS7O+qEFwVDw3Ecb5O2PnuY3mTem15KvMbuYw8kVSL1Cg/kctyxiqeRGHf8A1fc4nRwX62ao7/1P7ZPom1ixTJG8Mmo9MvHlSjuoksP7xHuZFO42VRXVKDi//knXDuX5MgiFNQkP5jZQR1ZTSadJFkLqHAPpmO1J9qkbQnvtR5Tl8RzTIUYOO2ONrynmGZjfi4hQ1eHepeMUtyfiVdooQ0S5LGV2yGLx1qvUnrLhJqqCRLMcdagfU8EeqhGyUSz6OBI3ZgVln0ZkZIZpboBoZFaJypbc0wDi1DHU/pedtLKyzRelpe4udRptiMYItY0QkmijJSMhNTAvqwK4Qp6BUUqkC8T1H49m7PozlJ8axbNxYmWyIow3eV1hb3IQe4EW+pi7kH25QOyMAfrJ9NKkXcoBIzGJpFViwA9MWQWAvJJIIPG2ybrGnTRepoZWiSp44meNbYF9qmTaosgEgMBZySAMAjqmPnXBOY85zF7A5Gzm8b6dYLjVLl+VFKlfr0PUfJWstj5bHpw2cryVJMfFc4vHnJBaW3QhsZFcbisllsZVy0lyjsn01qOy6bVRtq5NPCWleFXkkAMSRAn1QpopI8jISzMCVUrGTKQwyr600v1BrO1yjtUM00voRyqkcahpjP6m4B2tJGjjRFWJVdQ8ymVDGrAt/wAn9JMB6qel2P8ATXI8b4SvLcVzX03y3BOQennphluPWeH1cFzDlKc6y65zOpPLiMVyDhX+k62Z4qJ4jyPlmJxvIrGOy1+lPyeO/d5+oe1aWMy6TXaeYR6bVIYI9RGyappIdsUbJA8irsb1ihZgUVkjIHtUZH9NfS/1PrNQ0Xde36zSxyaiB/U1ySpqYW9RJJXi9RVBIYDcsausqIjB2l9WNavec+msXoz913L/AE+RJoMTxXlVk0A25bEnE81STNYAKdAymTDZXGt3ZlkEaSe4zyBllJ7Zrz3LsOj1xYFp4BvYV7dRC5hnaxQJ9ZHBwBm1ChWHTH1B27+yO+a3t4Vh+X1BSLcBY071PAGJJJ3QyRuxBOWRbxRn/wCjPH8BkPUj0HyOLrPWEXrP6U5GJ37d5HHPONu/ul3f8HSJUP7IGcqOxIZTk/lnskkQyXtLEG4yaB3HBJJF48YA6hJAyK+7FALQUEihbXgmjeSTgKeKPWyGR2S1abwR3m/IhegJLgBSPx+PjW/+x8/VJ1JBxXNA+K9woVWCP/sdJhA38YDOOObCgAG81V4J/c569h2LoQQdRn8Qf/zeiQSfJAH/AD43r6DY5OPsTV/ypODxg/bxnotcbicC7sivn5rHQmCWVLCoyk+5NCkZ/ZC4VdAk78sPOv2Gtgb39tOAFs0bGbyfI8CiCDj9+OkOQRYJODkeR84+M+Obuq645Kq0WScjYZ5EdmA30f3HYr4GwV6r/wAAEEHX0okoHVgQwBrxkffHyf8Annr7fagZ+BWPb+1i/Pxj78jaludbayw7QgyAuF66DKwPx+531dtqNeGB87908hDq6NRUOAQCeQQ1eDznFg1RvhJCgVJQQ1f7A4r+RirsfvXQ6MlCXEbyAqoXxsKGAYhVIOvgdiPgjz8j6+c7ACd1YA2gsQAMA4PA8nJFXfJUQWO7FNlSSosXV5r7fH7DrMPbzFuC1XpLRuPATqSeKIlYw/ks/wCSAlSQGBI66IYg7+rhJMaArhlAIprvbbEe04Uk/qzgcZEhHGu9tzAE3V2ATfFjANA1uoE0MA30Sn7dvtS9RLmE5p60elXq76p8ryGAzeJaHiXL8hxrh/HeP4HOX7q37ON4flMHy/Ncpp1/5jK7T5iTDwYfIrFLg7N2rjrCUzu/1V3bRaqbtvbNRpNGIRDMxmgSfUOZowDZnhngj05YhWpBKTHuMiROwOufSf4f9r7p2mLvnd9LqdfHqZtRpI4E1kuk0aNC+1GYaaeCaXUSIxO5p/QEMiL6bsN3UCfu7+xf0V9OKGJ9Zfty55mcv6f5Lk82Jy3DOQ5DGZXJ4Oxcr2bdKvic9Djcbkr9fGT0sjHkMNn6t3P0Korm7lbklWeaSV+mPrDX90mm7X3bTRx6qOASx6mISIkqKVSRniZ2RGkBXZJCVgdlKhU3AmJ+r/oTtvZxH3btE7rp21O2Xt2pAMumnljaRUjlKRyukTxyhknVpREUcvIqnbNj7duM8k9MvSmepdfI4KKWG5n8q8KTQ5KzRoRQx2LTrGhyFWqIKMpo/wBOOeYmQ05Kth62Rq1rXamDVdwVqjlJZYow7exXkY0qkAW11vyFP/eArGF6u3btDqNH2plkDwRlDqJmp1leCMV6pA2Oiemr7Ar+rvBCMjMsy2n/AGs/az6TenfAeBX87xqnN6nVeOUGyuTv/prk/HsheoM2QweARVWniqtR7NinavU4f5hmZFlu5i/kb1iWdq33vvWs7jqNUsU8i6QyOUjjJVZFRj6c0ovc7MoRgrFkQqEVQE29S/Z/pvTdr02kkl06/mhCm9iqu2meVLmihKgLEELMnqRhZJWJkmZ2s9CfVX7UOActz0HNOHw5DhPPccqxVOV8PvWMJmpYmZ2apcv0Ja81uhMJO1ihY/UVJ5I0aaBnDdovtv1N3XtqNDHKDpgblhlVZIyAFb9DqaWwSFBI3BTftFF9y+me0dy2yanSqJRe3UIWil2Hd6iErbbXBojNAFlHurqNFz7W/UCvy08gz/qTzfMWmzcHJIYK8GAxWMkz1daMUPIp8dgcRjaX+pK0mLx9ityA0lzKXqdLJPaa7WisrZP/AMjd1n0p0qyxQx7WXEaNi922PehIB4cHBUFK9N3Q1eP8MfphNYdaNIdTO+12lmaQ7pFFIzlZQJDGATGWVQDTVY2iUvoh6I4TgbUsnkMPXtR42ylqG5kIY72RkyG5ZIshZs21muWLlexYmmivTvJMk09hxKvd2en6rukmonWQSyFyrlirMVZSu1kZQcoTTFBgMoauruvb9PHF6OxRt2FAUQhRGQV24HuQBgjAKQrMo9uerDqHAX5rxLIZ32qlPGiq+oZ50iayJYz2Zu3VCC5RVjjfszHRAbqWC1Hb9RPC/cUCwrEF80Gs7WZQQducgE+44A5p2DXxafUDQlpJGf2j2kqpN0CbJAK7hYuq8DArVsenlipyPOcMsJXWfHzTz1EL9obWEycrPDZhk6lZIXkSapMh7GGWpMqn2iGK11ojii1JJkST2OhGRMqqGsmrui+QFyABdUQIPSZ4iWwRJEOQ0T3tKXfH6SCQRRsAZKmo+ldLHQkyQV4Vi1LFHCiiId1b3XduquSzEr16uSGbbaA+vU1zSFTlVNgFtpvjwCRY+5GeD02dCilpVBLEgkAnx80c/bgeKOeqD/vp4lxfF/fFUyyVYT+s9KOPXMpO2o45MpDj+VYNLUuwEZxheN0aEfvtIQViljaOQRL9bn9BSzaj6fbT7iyx6vULGtkgIzQTMKzQMmodsX+og0K65/8AxPhhg+pF1LKFaTQaB5GANu5XUQhmzViHTRx1RJCfIs8ft65rgb/rv9vOHrew0Uvrx6M0mjKpJTkST1L4zH7EgYGKaOwCY3jkAR1JDABihuGpilTSzq0YG2CW6IAoRtlaB4xXOaH36zGWeJjIVZzuBAG2gLBFg/vVCs1jNdbK7MAn9xVCpISpI0AVaQEnZ1+Xg/J2O2/jQH1R5lZ1AFDJN8iqv4/evOL6+iYIctgkj5zTe7nN0LHAsGz16WuUkk00bCN1XqdgbdPx2dHfl/28j4GwNkPY6NHYHuINXYoGjYHnOMjGQfPTizLIpHuII5POBeQP445BrwB11tysJIHBKsr1mC615WdW2dEnf4sQANfkd60QHGba7MRtp8mvspFg+AATVi8fyhACmwjjdn9mdeL/AG/5ffxccjIqwBaNyJerbP8AUeMCbZ8eAO5UbGu2ydefpGpIDF6wRv8Ai2KqSP8AOwSARdYz0tB7VxVgWDyKFUf2FZ8/vfXzH9e8vQ6PuO2guiEBCsV+AN6B15BI8+QB9N6RgSCg2gszCuQKN1gDkjH3PxhLW6svwQM/amwfv/pzno2M6woBGP8A6hmHhmPX99Hz4Hn/AAdjZ19ETTIiAL7QGpmIIJYA2LBz/i/dj8W3savgMQQFoAWdoHjAPPOf+ecw+R/mOOPvSw/qFn2yiMNuMnRZToEbLAMVY67a/bX1awCWIr2FRijeMZoZx+5/e+pH1VYWqsSpAIFCxRs0M/Y+Pjx07X2y+slWtiebLneJZCPK8UwHLKeJi9r3K2WTkzYuCOU1HiikiNGjDmTMSskEhs0QLaz3Iqj5r9W9vfSd6XuRcPp+4dsfSItBfS1cDHBPDiXTs0gFoXEEigARlpOjPwu7zp+4/S2t+mQBHru2d1h7qbcMZtDrHihMqlY2eP8ALamNIZRTKF1EO0u8xGmg96+Y7N8t51wLNcrhoYzB845BSx3DuE4jF4vjeJoQ0c1jKVXL3YMZQoSz5mvHyO8cnlskt/K3ZcpXhtXJEjSIH9imhg02pjjb1ZdJo39TVE7zsMU8hhTaCFjLQBnUbN0imVt7MZFT9b9tdpO36jUu1avXPFp9Mx2sdkulX8y9gvvRNWFAmIKpqY40SJUYGd3Lmkr5ORqvtinet49fDExjHR36stuqyOyI8XsrYUo6gGMFGhZp5kapgqqq4fcypKbqgZGjcWCazbNkUd1HBwJ+KdpE2n27pId4AIuESIDGaokAK1q2NpyKBAfTF+rNiv7DpOw3pQkZJJVWU9fkxshJQDqdNoKQRsmFeJ2+w+3xXGMj+ceQOerAJYXYEgbjyWxk5o3zknNnn9rf7i3qVFfWIOwLSqF6jejoHx/tYODtSHJ6667VQdQ2rUrvKrShaYGgFBxuofyB7h87GN2+umSYKpO1gSRtxfnB/wAjtHP2sdPFTy1PIlRKsbN10H8HtvTEhv71KgjZDKfyOuygfQDLYCqQVFmr27qAsq2aIJAOMj4HTg0u00ABVAgDxnORRJz4sUP2BJzLkeJwVGD9dYOPrXL1HGtejjMyUhkbUVd7TRe9VE4qrMbCQNPD77r0E8OxIrmijkn1EUG4IHcKSQcKWouOS5ofpIzVX0maFBpppFCs6xyMochB7FP/AHlEICcGwa8DlSz/AKn/AHo+j/ptSxfAcFzR5qoWK/ebK5SF83+jaX2Y71ynUISri47KvCLc0MdOSZpYVld4mX6vOq0U+s07abt8M76QMP79wyeq6iwtlVUA3vCAlqIoCi3Vbgl02k1A1PcNRp0kACBIyHKLlWdgSXBNBWJobgfcxaumKp/cZx7mHrh6fYDjvu5zK5aPKY3KvXjnt16GEsyUnV7FuBBTSxXu162QjR2msw4uK9L/AEYbYd4V+0Saft+rl1LKgiMcyA0hlkW1O1GG4oyu4HklkBA27VPk7jBqdbpo9GDOWMkTsqnZESpZd7gEK5ZQSDyiMw/ViTvPM9+goMiMsewexAAYAEkgM3ldAlGPyDoft9Rel04cqVJYDN5oCwBdecWc4NnOD1J6i1R2O0EClUUKJ8/cg4oUOKByOs133sSQ8k+5mea9alStR4ZxeufZnCNIkI5s9mtMq9ZHDSZ6k6ElUUROpDCRfroT8P4/R7QzhQAdRqRZJ9pYaZENHFEadiP3BOeuaPxSZdV3hI2at2l0llQBiFtc5BINhidSoAJsov8Ak2P27Yyt/wCqT7bZq8/WnH9wfoaUgSbSmaP1U4s8bPoglAxBYabfQr47fV81b/8AB6o+2/y2oO8USB+XbAXyTX8nF4HWYHSkBqkG2rAPOLNeKsGryR1uLr2w8sgLbIMYbY/tZeoH5EjfwR5Otk+CT9ZzbMUBUBTu25ycgixVfcZNfvwgqBe0m9xrFDIxR++Fq+TddGcTrIbQXe2jJ1rZ2APG/wDIPn4+fGgQfoUyZDsgoEqDfABBujyPHOLsGjhaBvaCaCsCwGDk+c/GP3vovtsVBDEoyKiHsuwwHYggHQAIXt4O/HnwQPrzUKQoJ/qZmo+PHnnBx9j0SAGplohiar97o/Hz/nfXuwwNiFv7klVIkYEk9mKRkn/Hzs7O9/8A79Mzi1Cg1aE2b8ngnj5+Mf6oUkoVaw6EhvFbsgmj9h9hxY6G0QixzzFuoUSMoIGpHDhQuwSV6/mdtsH4PnWk6RVjX9VFVZlsXvYsBsNkVYLZHFXdZCWY+0rRyQfAqib5+Qo5zd8DoSr+5Ej6KF+rMh34PXQP7DwNft5B3+5+lsd1lVGTZyGF5BNn7beQDz46UpsfNDB+3xwKIxYOeswX+t8dlWlqUZTNLBZjitIIJo/bYoxRj2HVl/yV/EjW2Gh9W+N5Q4wDuBKnFgVYu7rjir+D8GwRKzkMwBYFiwsAUCaJxWRV2SMEdCuM81fBcox2Ux4/VCnbU5Ja8sUNl6Z2lmGKaaOxCtkxljUezVt1Enjha1TuVhNXkC7toU7tpX003sLrujdwCFdSCGZVolVZQrhWVjFJIgYb93Vj7D3ST6d7ppe5xKziEyetEHI9aCZBFJEWJKIzEI8AeNkTUxxyuG2mMzQ9Z+WcW9U/t2x/FeM2uMcx5XRrNmMdYg9OeJemfLMU+Gz2A5KvFJIePPPib2SyuW4fxrIyZS9bae41S1VpZTEQZm3NFm0aa3s2v9DWQLpoP+z3RxqIGil082l9dX06r+YgkSSVncK0ivIWeN5YNp3WTXab6l7Y2s0esl7hK+1gkkzGdJopYdYsW3VGQaHUAx6dXRTHG6RK0Z9ICTpracOP5lx+HMY6ytqvcijuVABYglhM7yw269mndgr36Fqjkq+Rx96hk6lS/TuULVWzUgtRywLCyo0XqQvlomKkmnsFQ6urI3plHRkZWjd43Vg6SOrBujopI5UjkQ7vXG9Gb+5aiSrRvG2145I5FkjkidQ8ToyMo2tSZgq3sRZeKR+8bsV0VIMTEb0GYaAJXqPOmb+/ZHYsgoVAuiBkZ9383isk1j9hjosyslbkohhRLVf2BY0aoZJXiiQR06vGM8IGhDv1aMaI02+3bt2LKxYDseo6HxsHYC6AU8KuCwI5prH6lNCs/wCEUcg5xwb6mNNqrUA2rKT7cWv8qSCCKzu4/kCRXE+Uo7Rkz/iOoC+SSQVKka2DvbL1Cg9iPAHxESpSkKmLsnFi7NVXgD+fgVmWTVeqqjcLAAo8GvnN5J4Ix+2Q6WTqYTlWHuYLMQwXaGRgapZrzBgrxTbVgWQxvGVPX25UaKSGRUlSRWRWViLekiSqGVozuRtpb3Kysp2lKIFGwdytZBsY6Dn1CR2CUvJwV2shwwIYMCCCc7WzmiL6a8ehX2++m3GLlXL5DE4uDNJJXtZLkWQglzuRlYSmlWmzduN8lJHA7yxVICzQ1oWD+07Rh1lpu5dw1bAKX3RlXKoGUoQBRAiIRd/6qAXfdG8nqK0uk1GsYw6DQyTIAyfoknG2QhZQ7yGmURhUJd94AUEmwobGxe+3b0rg4Jj+Ocr4xQy1N5rePoYu02Sq058hFPTjt2c1DF+jgs2I7tmCae3IosQXJGaR/wAiHHj7vrl1LSJqJlkG6feCjBlkDbQXILLSqwRB7Nm05Dbyouya3RR74tAUXT2Y4yBHILDAlNOzBw5tqbB2NICCXJ6LPUX1AWbDTvNJHJLJDIyyRspEjFwA8ZDeOxP5bOt9mGh5JWi0bxlA9UaJrgLgnJo2o/g3XPUfqO4LqY5PTDArQcPimyKIJtWBGR44rz1np+4qSzm/V7lmYnntmvdkxUeKVXZY5a+NxWPwVwjqQY1GbxeYrqgXbNAZNGGSOWXb/p6RtP2uCNAA4L+oRYILM8qbs5PoSRGyOGKWCCeucPrdjL3ydnBKskJiAND2RLFJVf8A88MwBJyQSKGOnC+3PgNep9w32l3q63K0mS+5T0Bq3TatT2yjXfVrhKGRYJnXSQB2f21ZVcHqCoBIn5ZpX0+pBK50soBC17WjYWebs5o0f4x1THRU3sATSGhusGuQN188jjmqvPWzhbccMxMiqpZo9ft2YSBlJ14+f7f3Ojrwx+qa52+1DZUGrFn55xX71WTd46ZVVNF0IJYYBPPivHR3XZxG0hUo7uSVV/IHwNsNLvyPnZ6+PGvoWQ0p93JsqQCb3WRYIx9vNGzd9LQAFmu7ayCLyD8X+5++Pt1yuyyMYg2mMz6bYAJVPIUeSVGhoHY8fJK/TbSM6kNftII8/qFmyaP+4vgi8uooKGsbSKzijmvvkDjjnr6jyPNCN/gsq6QrsFBIrFlGxolV323ogjXgbCCxYjccChj4/YWLAP7/ADfSX4bjcAc4N/uMcFvP7Ek2ejncSdkAVV/NQDosCx7n51obI35B3+RPU/TyrGHcIaQXtDkbh7qBvHF1xknxXQm59gG3PJIFCrONtkg4Hmh+nkiuck8cOlUglQqsC2tEA68aUf50fn5J8n681DGJIzXkqOAT5u2/jA+3O3pzTgybkF+33CqH6iSRk5AJ8HyBWMZgq+Jx9XI2LtZI1Flf6zKmhIUj0jk612QDqrDe1GwNjQuTooY7TYAFAUADd8ciqrFDOfvJDCg1tYijdEH55wL/AHvx89JungTintvUdDNemMrsys2gQSQSpUhioGifj/P+UQxyDcTIzG+SzHaMAAXZAwBihgfw8ZGNB/cAPaAABSgAYNi6sWPA8AV0Zx5H2XFeCzZrXYgHWWpPNBMjCPQYPGydlBbsEcMnuFWZS0asqtRp9JrIfy+rgXUKCSpcAFXYEEo9h0ZgArMpG4KFbcuOidF3HW9tmGo0Opl00m2m9M3HIi2VWWM+yRAT7Q4IRm3KN1WG+1vlNy5m/WSnmMmzcz4dzuzV5dTWzK0Oe4fmHtZXgHJnxszmpSyq1bGVxdjKYmOD+Z1aEUnI0u5RamUSgfVXbYNA+lXTw1pJYW9BgQxhlj2x6jTmR7eSE7oZESQkxM0iQbUFdaj9Hd8m7jHqm1MwOsjmInICRpLHKGfT6gRoEWGTeJYXeMKJliT1Q7kMJZ5Zq1iWOWuyOHVGOivbe/DfI2dEdhrY6lCWCFfqhvGyMQRRJsjJA+L55HxjJ4z1pSToyiSldiArgnJAsbhR+aJv3DGLz18giWNUljIViQrBiP7o/OgQ6lewYAHYHU9wd7AZku6Zdwwd10QDhsEePvfAoDjovST7FO0AENxzYZji+fcOeAbyfhdcZzFms6lZlO/mI6CqSQSOwLHt2A0T/neyfBE1CD3MVraVB2jJFHaa/pIF2Rk46PE6F9pXaTZu6FnwaHyPPijjr96m+uvKeC4urV4dwLOcuzWQ96GtPRhIwuPuNH2r2uQZlzDQw+Jg/J5bGRuU4H9p4EnjLMUM7XoF1s5iaaDTxqFYvqXETMPIj9VkRmIY3TBloFq9vTMum9UqXE0oZtoGniaZs+3a5jDkDiiRS/qA5uHfFsH6x+tebs8k9ReZ8FwNgR+xUr8kzwyGSEk/9GGjhOK8Wo5Xj1PH1kE5ydnLcqxmTf3K5goWJjZnguI0nbdFHQkZ2c7Aumi9VncFSA0shhQRFTQ/vJaKn01ANNcNAncIY4dPotLHpNLh5JJ5QHZCSxISH83JLNVXFK0OwGtwG4A69UvQq3x/ikedT1W4SbNWlHVt4SjwvK5mSaXu4Ye6/JcRHO7AqZ5Dj1hG29uGJihDMDRBlAilJYEsHmRCBQva3ourYsgBlwaK3dE6qLXVJNNMIo4VLFzpzs27fazP+YVwzE2RTKjDAO1SxP6d4HO8f9GBLneUvySU3Mg2OrS46apDhaiXLEq0BJLlcpNchdJhLBILAjEBigjCrAT9Nalope5MsUBiUIqkliVYEKNyhUjAFY2gEmj5I6yTuWoQGWaOdZjNPIzEIY7MZIJVTIxdWVgTJ7CxwwDbQK4OX2cNl/UfILavRvT49NQxSiZo/caSlj4RcaeYALJKuVnuPKwH/mMihEUCNdQ7Pp2Xt8bGMhphLMfaaIkZglWOCgQgfpraQTWOf/qXUrN3LUAMCkSxQKWK2CkQdtwIHuMhcWaOSpq6Mjvt5zOIf7k/tprGeC1LH9xHoS8aRyRTLHKvqrxNonR1JUOsgBB2OpVSda39SupZV001L7hp5iKB8I2CQD/AJrNAZA6rBDMWYuu1UKlQwybJugSeBRIFfbArWQ8a2JXJ2G6iSMjWw0fbr8bAPdN/Ojrx5+KbKbRWW9xdg1Vmw1EWQPI+OBYxXTKklmsgrYK5GCDVAE1jzVjnnoy/VyfpWbztAHIA0xX8l+d7DeFK9gCPAO/oeaNUY+4kVQv5wbq/4r5FnHK43tsgA77+zDdzeBRo3x58UevtyQ+1FKoACHRI12Hxrf8A0BoefxOiP3H0NkbgQctu4J280PJ84OPjzkkYBojlSfsAp+/+V/J+ehNaXUPvu7BtQRovwNOwQk/HySCdnXx/kkOoAUchbZCBkGua4oD7fcj9+mJAdygD2tZNg5o8fzR5Garz0bRlWUMfHbuCfx7EfABGvjw3cj51s9jr6UoX0lBwSaDeSwBoms0DYHNYPk9NSAgHixRGQAF9u5T9+CMYrJHPXpeoG2jQnZ/u3vRJAJ1+RJ6kknx8aHn6c2CYlZQGK0RtF+AD9h/Bv5AJPTYZkt4yRftIF+M/Y0Lxd4oXjrIXyj1blrPR/khisQy1+0sjufLhV2AFJDdC2mO18/IC+TcFjYglibGLIOcknBPjHxQ8c9S8hbDAEAADI8+QfuPHHPHXDhvOuYStNNfo2MrQlimnSzqM9B36hQVeHaLvoPhvHga12cQrGbBBPkH7V8Dnx5/bHTTb3A8gWLz5v4z/AKED96s1xXqCvIMzPRioCpdU9VaUMGSPYV/cCyMgJkBZQgYlR5PXY+m5Nhtw6m/dtByDxkD4BN3XxR8rQuPaY/aDhjheDjFkfPPjAz0Xccy6+kn3U+mPLxI82D9aMbZ9H+ZaeRfZ5E7xX/T/ACtivErw3JZsjUgwUbTIho4sZGVZSQIpIvv2kXW9l1IRiZ9EF1sQIJqNbGoTNbQImklr3EyLDYz7bD9L699B3vTh9wi1qnQyUWC7pTuixjPqBVBHup5PdVq0seWcjbiWYaBnIxkryNTZl2sCsxAru/Xa+0wCVztWNdUVmkKdmzaOBNUhI/VRvOW2ivHIHnkDrXpNU+mkUf0kA5HHH2vjxxYOfHSiw/OMfkIl1YRWAVt9gobsBsgMerbAAOgz6VSOjEfUbqNC6mkG8Ek0AAy+LPyOWNcHwej9L3IWCGCnhieME1g/Ask+CK810ucXbWd9pISjuAxVjo7PUNvfYOp6/uSAxHyQDGzxkVYYEACqrIPx/Lf6EVRBk4tSJaJbCkYBzZAN/wDm+fgWbz09eNr05aUdPS9LCoJhI3ue4zMy/ksi+Rt9a6/0xvQCsR9MJuR1YhrX9JyQtkEFRZCngk1nFiujhqZSpjRyoBBwSTd2LANXxisZAA6T3KPQW3zARPHyazxqsVLmfGVYZcgf6gLCu8zwwwzP3Co7JN0k0/VjH4kotZHFuZ9P+YkI4llZFteNxAJYCzV8AtXnoUv3YSg6XucmjUCiU2SsVoih6xZUNMaBJOTQ6a639qPDcdPBfyPKec5m3CHLDLclsZGF9kkI0EiGOHs/ZXWFkHWRge4AEZKd1I3JFotHGTRLrCN3NgAnPn7MQD5x0JqtLrJhI2p7z3OYLtWSKTUBYnDkk/3MaolncQ2DV4Oemq9es3ivT3h+YkikjjxlWCMw12ljh96dENStXTopCz2ysNaMIj9pnTqFVvM32vSy67UwRKoDzyUWANKCQzMRX6UCtIxvG0jJYdVPvWri7bpJpXbbDpoZH2s27eKFgXkOzhAoGXfgHqlGzPHkbOQv5FkfIXrE1uWb2gqz3LEjWLL9Y9KolmkdiuwqhyPGtjY4wsMaRKWVI0SOJSbKxKNgF/A4x9+QesGlf8xJPLIwMkrPI9WR6ju0jYUtQ3NgXgcGgepIfZXSmsfcv6BSx1vdNT7gfQ2zII0914q9f1O4xaszCNQ0ntV68Ek80gHWKGFnkZUQsGdYwEE43Nf5eYDGb9M18ACxxjis5HQ8aGMTM6/qjKjINj3/AMcfzZJ4odbOa8CuhcknSR68gdvhmI+QANDe/Gtn/unRtcQJr9TWQM+B/qSLOcDgnpkgs7LgsCAALABb3cHyCD81446EziREZfbATTkk+d+ToHfwdk6B8bGgfJJHk2mUG+HC/wDmIuzZND9ufjz0VkeoFFqRYNiq2qKs4AsePJzZ65t+dcqf96DQJ3ptKfG9AAHyexP0I4BLDGSc38jArFAcHH8eOiIxQDWa2gH5/UF+3j5/y8DvMkaGBAD/AFf06No7VWhaRnbfYDyUXYGuv+Na06ERYzQpigVuSAyNk3dm8eOfnpCsTITd0xOa4bwRd4vgEf79HcRYGL4JGwEJPwoJ34YAHRJ1v9/3BI+vqJI5tRQXIBHu2k2byCbuqsGhnoZiDvWiAaJYg/1FVIF+eD8fY56CSzf1XR2CgdXVvOyJOxC+PkADQ1vRUj9x9LkL+0ICrVbbTX+o5s2c/wD17GilbIBByPH2Njwf9fJyT1kYtcFocnxkc2KMdaSmZq0W9Kxeu5jZZFOwquyHTa11AI3sbt8cheypHv5JFmji65rxnjHF9Skgf+uhZBNEnJBOTnnnOb6XRavxyli8BAYv1k8aRRKSumZwBK5BG2jWVjskNtj534+kOWVqJBDXVVurGcZu/wDnnN9eoNynaMKPcaIv9yQL+R/oBx11s4d5b9C7XjrIsCf1WRFjdjtm+UTz2B8bI2PnQGx5sYkMKC3YrHGeMci7P+/HSWvFeOfjJAF/PPGTXiumN+4CHN5jAQ4HjMFqLkte5jeS8VzFMItnD8s47dXJcfvUZJlkhW5XvVoSPdieIQTTAr3IKO6ZY/d6pDRSb4ZVfcFeGVWSUMR7gDGSjAHdtJqvDju6GOSNikse2SOZctHJGd0bC8e1huo2DVEV1PTNUqXqfwLi/Ma9eKvDzbh/HeW1YIFZY4a/JMLSztaOD3JrD+3GLwii9yxZ8J1ad2DOuMs8nb9bqNOXLHT6qfTuL2srRTPGSxFL7wAwCkkAAMFsA79HGnctBp9YgAE+mg1A9xNLOiybVyWADMwXm1H6mANRDzVblfCr2qE5uVOzFYpCVY9fy69lDdHJOgrI6HZ7FFIH1OxNDqFAf2t7fepFEHBOcmj/AIQeDVeImSGWFq2k/a/GDdjBJ8Zxiz0sONevcuJKRZetYqdfw/rKwVZAw2yyqXjKMQSdv2HgnYDbHn7QJ2LRsrDm1wTVYYVdgj+DZqyKIi7g8RpgRWDdVS4Fbl8XWD9+SOpS8I+5DjFn9Otq5CrqUCsWQgFiSD22rD/cPB0f3GtAQs3aNQl0hNXgX98kkBTfxeRnHUlp+7LQJtGAydoK3Yqq+x5HjPPUlqXrfxZ6aSSZWiymIFZfeVWAYHsrgspI2SwB6+QVA0N/QLaDUO1GNrvgWBkWLoFTxxZPJo+Thr4VLOkgtlN025sZI2ZIWjVEEYvHHTd83+4DgOOoXZ7HIMZAI4XZmmtqkcSoNDtI/QKo/u2i+QECdW0Afpe1ap3WoXJODtQvbGgRgY93tpiNtmwKPQer7zpY4nLTRqALJLhVBX20WI9oABoYAIrAsimj7j/Wt/VXP16ONlki4rinszVUcSRy5G326DIzxFlKQsjsKVbrsIv6idDNMqQ6x9M9qj0Ss86VqnjvG1hCl2VBzbkYcqao0DeTiP1b3qbubbNPIV0qSZJBDTSbgtkA7Ag5Qb7N7if6TG3F0Yrlisb1jUM0rRhIwRIQqbIDDsBs9dEr42B1A2fqxSmmtqKhfaMg+fNHir83XJIHVXhjQA7F9MHBs7rarsV424sAfPkdTF+yzEy437r/AEXWL86A9W+Ae2zq3uH3ORUfZTbaLFANPpf7ip2p6kiapg8E9AioTtzyAGY5/wDDZ5yBRu669kXbG5bPtHGM+7P848cgDPHWvipMfyD7KCKNkHhSGUhTseN72PkbHTyBsbqKHcgQXasbyKPuBzz4o1nnOb6HclH9SxtcA1ROAc82QauvgDAJvo3sMzxhY1LBoEmkIBIADEb7ADXZh1+BvYHx5DboWkjCj9aqW8DdVE5rNqauz8cjpRcASj9RQ0MYojis8cWaAxY8AJEzSe2rkq/bWvgqGIGzvr878jXggEeDv6HmTaxwaxX3NA1zYx818HnouJjtyM7RjzmqPNfOPGLqr6GWJAs8Fdh1ZpCdjbdSEfuvYDYLAA6/5+PA16rqwIJPvayTYxfjFkHORdnJxfTe0qbq8Ys8gZ+f5zX/AC6HrIwkXQbyq6B15VANnfnz/k78+fkgfSnIVwTlGUAHItRQBxkHwAaJyDg315sR0NgDNmrobs1kYyeKzV4vAeWdFA2CzMexY/BGteNDWh4AGvH+f2+lMGkr0yQVsMQDZ3GwORigDzVk4568tVFWoHAFjFeL85s3x4HFDLIMjisWJielGKV2cu4VIjIT+RVW0PyYgnRG2860ARbA6oCy8nHjGbwKFfcknHAuupMI8mMrYs5BJAoeaF55qvsQa64Lj8fcytfJWLyy2o67LUUuoURsY3DKgYg/lo/2nsdH9vpaKs2Wcqy3WLwfgiv2oZ+fnposYVIJDKcmsWcY8/bz8/v12uWXjl9tJwhIIUKVZnJ8A/kCQRo/Gj/k+NfX1hPaylqI92aAonwwJyfjxZ5BCgu8WHZQx/TtBFih5OP3NnNH5BVbsRxPEzwNK0ZV1ZYhIFKeAA7LpT4A0Suzs7H7shj9yDftrNEm65GL8k1k5rL/ADXt3Hg2B/qOSD9jwT1K701w2dxvoB6UnkeMmw+VXC52KClZnjtSHjFfnHKq3Bbyy10EaQ5fg1XjeYq1zuajTyEFK1LPcrTSnI+/SxSd/wC6CF1aMalWZguBO2ngOrjDe7MWr9aMlrOLAqut3+lVm/6udrWVSsjaQbULbmbT/mNR+VaxyG0phdFAHpxuqGmFFM5DidfkIYGsPcA7AdQwLIFAEhKtpiNAMF/yxGz+IcWpaCVmLEoNygCgTfBviheRgbuOj5Iw5NgEk87Tuq8ge6rPGQReDi+kK/pDjMmzUL1dFb3Gj79W9xTs6KgR+NovjsSpI6jX7m/2k8QDxsCGr2ngAWODeKzzYP8Ahuile3xTBYirFtoQtS2LPk1QNYvacXjm0tlftIkkdpcXlJ4PefcTbeN0JP4qohaIdvj8+pOyTvQCkuDv4ohkDEGicVV82bH3K5J8YyI2f6fJJ2SNdEYLNkXml2/xhbA8E2Osf22QcVxc13knJuSZmzI5r0cNXzF6lVaRwRCj/pJUtHrIy9/atKhKhfyZmCuP315pBFBFBEB+uQxIxCDkgvYBIHkcVWemU7BCiNJPJLKFql3sq7qG26CsfduNFjir87kT608Gpcf9Ks3icZjayW5kpGRoYYxPZvDI0LQV7DIHdpJK6xxLM4VUCqZAF2pfZda03dYZppH9PcwUsxIRPRaNiExXtJJoUAP0nA6E7/oFj7HrUghT1WRaCqiu8iyLIiB6H6mQD3GrosfIrZyk8st0CSOxA0AMUqzArNDLGAkqTIVEkUiMjRyLIoZXVgfKsBp+lCWGU2rLvVrBVkYBlKkFhRBBw1fYCrxDUO7MyOjIUIUpIDvV1ABD3RLA3YKoQRRFjovjNupZgWmWaEbm94/kyyHyXAUqdHqpJ3pdEj5JWQEULoWJbcCPIyLAIuiKq8A2QKweo19TKrAbVAFhuQcXkDd7gaoH4AzzUxvs150Z/um+3HAzQFruR9bPTmr+sCMEIscrxnV5G2Q2lUjZ+SW2RsaC1MH/AA07Ajb6Mlhv/A9n73ur4FDByenTJvSm3bmUGqxX9JNC8E/IGBjrYzXxcqzEOQR7RKdfjQKly522z2IP4gAKGOvy39VHYqsdtAEfuePHj/fplzIaVlqyWWiCfuD9h44qsnHXdDKTfKtsJSKxA9d7ZijeBvfhi40CO66BB2QhY9rbgx8+2hVEkjNc5P8A7X16W/VgKf6hRzZHB+TjJFcdBoPdlsw2AP8AySRsRvXTbDY2RoADYOh+xG9kEizqS5FgAE1m7/Sv3N2eft8cPwMFVhkmkv4FgcC6x588+OBlqCT9VXJLMwl93sdkEfmreSd6A8gE62f7j514IHV0HtzQsAgCqIuzjx55+xy8JFYHHFi7wDxRwTkkcc/bHQ1lnLxdfIVZGBOwNFeut6352SDo+ASdFfpckcjER0GABKk0KG4fbnA8/eh0kMgVib920A0LuxfxmhXFV4vaOuZYQSdZFj2Y10CUJGmIbewT/wDXXhT5O9+Pr3TKRvFsDYBPK4sY8fA+RRx0POcgAA8nzYFkZ4x8ZPnrKrn6FXLTmkUE0IfcY/BSZQOw/JlGuvUAed7/AAIXevq1SpGXKKofzbHCuCRi74s5+PnkTEZZFDE0SDd0RRPAGTzk1xnm667jA46GFCzgTpCPbHu/kAigMqkAKSdDwTsjYC/RKRgJQb34AoAkfPOc/Jxz5Bth2LMBRoki8cmrwT4+Of8APAHGiMe7LkAFsI7JGoDABAx6lUJLeV69z5JJ860SUDY+71GBAYCywAIFgsDdUCQDR8mx56WCwVdpYWMkgKecfq20LBAOLqheLWHp76a899YOWRcN9PcDbzmZt9ELos5x+JhlL9s1yG/HDNHhcDTSKaa5kbSqgiqypWSxZMVeULW63t/bYDq9bKungQEqHJEkxBsR6eNyjTSm/wDs1HtB3SenGrODtDpdd3HULpdFE88zMoYC9kKuDUmocArFFSsQz5egsQeR0R7NPXbjdPCZOvgcJJO2D43j8ZxrCm0GaRsXg6UeOoh5Fb2/e/TVlLSKW9xnkP7s31g8EsszS6iYJvnkkmkKDaN8j73IRQF5ZRYFnLE2SOujoUXSQ6eCJCkcEK6dcKDti/ugSSA7EhLYt5NUoCgsnx3GA23SZEBIAMTAdfCkkEgEDQ0QQfOxonW/pxyDivdZzecC8k/azkijz0qTazKY8g0pajktgAX8Hmv3rwRljBQLlO5rxo6OVZU223OtOrOzL1Y68ADrrYHgfSWZglBsUDZ/pGbANH4/yHHHTkFqxCqNyge8g7gTYNDwaFG/jFeFN0kRUUxxkfOyGQjrGWHkuQSOzMNMNH4AB2fIRSKQb3MSbIwCSeD/ACR5GeiJ32OxJBHp7dwWzuwaJ422RZObtukZm6AtXcY8iA9Zy0ngyosYTuzKCejMrAHRKqS5UEDx9P7mXfRA3gKMc5F3/mftijmrDlVjFGR7l5CnGclj82L+3HFiuo4+s+IGW4xmFSs8v/uEJPkOkkcqSRMB0baJ1LnajrretMfqW7VIY54gWrFVixhgSAcWCxGSQR/pC9zVpNHIgXeGKmhe61O6xRB3Up22avJ46Qdr7T+KetOLpZytlrnFM9drVEzOSxlOpfr32r11q/qcniZnqM9xOkQS9BepSPB7guQ3pWryVZLTfVmv7I00DRRanTB2MUbu0UkQclgkU6hyIrJJidJBZsMp3boHW/R2h736er3yafUyrGZ3SOOSOQou1Xk08hiUy7ceojRg0N4ZiskTxfb/APwc5vVbnNzhnHfuP4ji81lOJ8kyPA6/O/TjOY7Hcg5Zh8dYy1XiOZyWB5NyKfA0MhjK1yWzyfH4rkt6u1Qw0eFZF5AhuX0j9XQfU3dD2eaE9v1csE82mB1DamDUPpY21EiA+lA8Tfl4ppQAs9rE1KSQRnv159LH6N7Q/wBRK/8Aa/btPqdHBro0g/K6vRQavUJBHME3zxTEamSDThTJCjST1viTaeiLgP2MetX2r/dr9uFr1Q9NIP5Bf9XeKNg+d8Ut0OY8Gt2f5nfXGSpmMaHs4Gzbt4q3NhqfLcZxvMXmx1izRoyNTmevde5aTU6TSzGVWZDGW9VCrIQfDHlCwwPUCNQ4FUc30Pfuz92haPRalROyqfy0qtDql3kLQVrikUNVtp3kjjG0XtKM+kvIYfN8dsPjc9iclh8gteC2amTpWKNyKtcrxWIZZa1uOKaNZa5jkUSRgqQ0bKsqMi02aN4GZJFZHJU7SjA0wJWweALo3QFVgggE+oH9wIKq7FgM04PpspIH+RBogkgkC+iGaVP6bRsQjVVkbW9sVMhKkkgaPXe9eSf+QCycA45OfsDyf/fi+Qc36wqqxuAahnNtX+RH+xroNSupsDye3Tw2wVHx5+NEsOx//ltkj4Af2udxZVLkjgUScqBkZ55INDoyOOlX/EQu/gUfH74P3/8AU4lcS265dm2ok0OoLFdflG37gMSNEDwCpGiR9P8AqM0kY2lR4s1djkCqyMgfF/z68dxvRwu3I+5Ygiro+xvnIrz0admV4SNP+OlXsCTsnQOz4IBAII2CB+2/p+q23RNgWLFk455q6weTXFdN3aEBqKgEtXNDNV45vkYxddF93v8AqiGLKFQqSSC4YMNKT+XgAtvwB4H02P7pmjYMCpuhfJsmqJwCSDnwDwR0oxmRVK7T+48fNWKs3g5/16y+fav9rH3u/ex/qdfte9GLvqJV4JdxMHLuSZDmPp1wLCYG3mEt2sfTkyvqRzPiEWYuyQU57NnGcXGbyeMrPTuZOlSq5DHy2rbD22actLBb1QO54kUEg37ncBiKJpbJUEcAnqR1XcNJotizyRxs9lFZWbeoFsSFUiMA2F3n3iyAACOrHvUr+Bf96fBvR7j/AKhY71M9JvUH1kzHL4MDd9COL51cJRxGGux1RHmh6zc/yvEOIW+R1b1l1vcQlwmNxj4yNLPGub8qz13HcXtPanSjSxwu86FpZo4jtdQqNIyxx75D7beRlQkA00iA4LuoEXdI9Tq30q6cgx6eXUKaLNIIkMzqIkRttQpJLZk3bVCCMSOim1P0/wD4K32ueiHopyoevE+T+6H1zzXHvbl5PT5Dzr0x4JwDKiq0taH07wHEOVYfJ5oUuRPjZMjyrnN3KT8lw2IWOrxjiOLzfI+N5Wxar6eEXaO6CBmfuz9v1f5OcFv7jWjSynSmNGtHqdUBM6SKLojZujagJ9fxyfUnZd6CPsY7t24dzjCi5e3vqIItcZXRUn2jTvNIRA0KEJ6mz1kjeNpuK3eCenvF7HFfTfi/HuG8fszrduwYCjXqG/bZEia5kpgps5S10jggFzKWLFpa0VeCKaKtGIRx7J3PUa2cTaqefWTMqrv1Ds7RRqv6IgT/AHSUxb01CqWO8ruJPXccHbINCno6TS6fSxKXYx6aMxB3sgs+za0j0oO9yxLKoO5Qo6iV6u1lyd2Swn5o9ydmIB0AzkhgD0D6LMNhG2QA7N3DGU07KEYAg8KDgbcC7xkkgElra7rAoe2SbPuJjSryTVg35o0LF/JABOWSq1lo2dyMCJh+DdgHjO/bPcgggsG6A6KhQmwFcsfWAJFfq2k/FNfgE2cEeMn/AFdSW2UsChF4IpSa22BihjdecljhcAdMgeeKSVVdQBHNJ2CqV2SrkbGip0p2CdFlAOyQO0gd3hJK5VjQzZZVI80KN8fJJ6MhJYlg21qyKwbRTYIu1O4qTgncM9dLpWCIdnHUd3Xbdz4Kgr7nhux7b8l/IPnSgEnTjfZClQaAB8ADJxY8Z4//ANH3VR7UULTAsbIyeAtNzQtc3R5wOekxb1MzsPhUmO10XUlSqnYKqVA0wCgHSk6b8SPSKbDbsljYsjFkVgg0DsGCSKoeESe1CtgbAqn4DVTMpsWCCRZugDVHhAzYAcgwuYgCh5w0yOpT82RgVkXX922ViAANuGYbP5aJikEcyMCaDBvOEv55Nj5OfkXRBlBeF0vkEDAoXnJsc5Gfmv2VHpJjpMIRSaNoxFMqyAkL3/Ng/wCIXQJ34B2eiMCTtth90YSbnWhdsCACAosK2R4AAxVk556Ro1KLtY7aBAF3Q9pBO4GwxrA81fjqwP0EqTN6uenFelK9S03I6tyCWJpQ8UWOgs5KYr7RR1Vq9KdH+V6djKDCsmy/w8hfU/XX0yqEho9ZJOze4MYtFotVrZ13KQR6kUEiN/QUZg4277p34rzpo/wx+s5ZVBR+2rpFsizqe463Rdv0zgNaF4tTqInj9pO9VEdSlGV3fvYOax/21+unJsLksngcjxnFj1E45k8PZnr2qWZ4jzjlfJuO2qtqtapWaAoWatuWKetZjnpCzWlpSt7SVn6n7qvr9s1sDi2l0rKA6oUKldY8ZZD7Tt2o0YIIUqDRBscJfSmofSfU3YdRGWVo+76BSYXMLbHniRwJ4yHVnWVlNEFtzk/razrG5jnHPPSv7N7UecvfzDkXpPw3LclmnkNxsnVn4JxkZGvaNmFkMjZTOVry2URZYjDKsVhfcnLZ5oIGn7b25NRI0rrooT6jAMWdkhUsZaGZGbJJIJLElsySbp3eWMfUf1GVQQwp3TXxJDD+hUj1U8aCiSKHpDa1gDfe1AdnXDFchgsgUrRSrl6mTyGIuVJOsQFrFWbWNnkrq09gNUsz12sUozPJN+nmr++onDqK6O7dvfXantv5qJdZppWhaCU+kzMGXYYy5p1kDrsKBmLH9Aptsoexd2h7fpu6nRySaHVaePUJqoNuojijeyfW9O3gMQDbzIgQMACQCpJ9T6fqrSuvhjEw8nSDtoAeSd91O/OvyK78eUS2Xeyf14vnBAz96ujzVDoeMDYhHlFJvk0oAP8Alz0pox7qVZmVQ8UZHuaH5FliZSRr9j5I878aA8/RUduwLH9DN9uBj/TH/wAoNk4fItwmBf8ASXFmjz7ibP8AkeuskrRSQPHvav3cE/iwUN8+NrvQ8b35H7efpySVoyrAD2sCR85Yf8hx8n+G1o71OABtAHm6JPzdX/F889AJ5VknMbMDIFMhDHQVC2lKnak9iTvZOyp8/wCGBI25rG58ELuyEYsQbya4AvOP3HToJVQAABYAN3wOCK5x8AfYX1O7iHKeC+itTEcY9G/SziHpP6d4nMVMnf43wbj2OwMd1I6dahdyeQkqQV2ymflw9etUsZ/MW8jlb0ECJbyEmhLFSuz/AIi6mL6g7edTIdL2qWT8trFcs8MUE6r/AMRJLbEHTyLDPK5YsYoyGIO4NpvfPoWHWfT/AHCLT1qO7rANRoVRRvfUwkSLCqYB9aL1dPHCVVBJKjja1bJLclwWJ5Dj81gY2eXE8nxMgWQEyKIsistrFZKJXkV4Z6sht1TPGnVYf5BF21GI16Imhj1ME2nZQKiZCGAZgkpCKCM/9i5ZWBH+FbslTzwNXOp0+t08xin08sbRFSpIkiKsjowH6kqNwQbpXYe6iWiuZXI5Pj1fH5mR/wBWtWzx3MN2lQvcxrtgchZiZo42c2LFdLtadUTaMsyARzAratBqnl00EkhBkSOP1KIBE8YO9lsblUMszEEWWCsCKW8l7xp44ddrYY4ysDTzpArHcywSPcKsSDuIidFd6ALgnKHd1Q5yET4fk/KcPKkcUuM5JnsTMK6fpq4/l2Xu0p1rQr+MNcmuRBCmhHEUjB6oCeMfqftMXa/qbvOhgRI4NP3HUnTwjCx6aZzqtGi+0Ui6aZFj4fYBa7q6/Rr6G71L9Q/Rn0v3XUy+tqtX2TQ/m5XIYy6/TxHR62WR8e99dpdQXoH3/Ng9ILkWOlyCF4kMi6YPvzpS2wybGoyx2Wbem+GLN1YMRuQjkH2iitjKmqII+A11jjOLrqwMhLhFUAn2kHCscmx4rn4o+Oma5LiLWPMZaFgHWMr2AJALaG9AFdEs3Yj8kI6kMNhcU4e0YKSikHmmJFUt88ZwBjyCenCjMEEh2sFJB8kUD4zYB4rkEfboFBGdqrqAvTQLsVUSdSSq7/E9gCVPkhgNuD1Ban2l0UEg4FqDfH7g1XJon9WOjtOhRGNXdBEJNDaoUhbFgWNxJ2n3YHSN5HZsRkwwCRmVnIj8jqo6u0aKFHVWZhqTfk/jsr1H1IaZlK+9iwwoKgFseTZFDyM3ef2H1LtuKu1gKSBdkF7sE4B+ME4NkDnoxjp6oDv5msESSglj27k7HbsQdKH6jxoKWIUMOo7uVY17huKJWQTVAeRXN83YAtj0+GJgJX43LZwQNoo1fAYFsAXQBJJov4bUdcxapMp1LI0etFgNv28b/IAsy/3Agg+dj5XLlVZaVh8giqAWift5zVYF8dCKVDVv9rBme6XBFqRRJyM8V4O3p4K/EWx1qGzHFoSOQzdPP4HsGJP77b5K+CPOtLsaRy6bFC2Rb5IARs0Lyb4Axmjm+hlZBIQpsWdtn4Hkea/iqsfHU2vtQxgt+rAtsxMeE4tmrpICuPckFLHq5kYERe21twAo7nRG+gIk0L8I9EifUur1J/Xpu0az0Rt9wl1Eumi2mxgHTvqAAvuZiWJWMNuwv/pCa51+h9DoVO4dx+odCmoBc0NPo9NrtcpVQ1EjVwaUncrKEb2qHqQDv4mec/0j9mvqlXhnapb5zS456boUZWknq8puUMZcjCMPb/pUeU5m04I2yQmbs3RBDuX1Pqxou0dzmIUyRaTUgGrVZRpV0kQo4J9dHagDZLKMkVzT+HXbm7r9c/SehIZkPd9HqZVAPuh0Uo7hMNwN+6HT5thSmjt34lPwTh1anwn0VqLGKycY9B8NTij200cKHE8GikcyMWDBBjjDGzf1HEkmm6Suz1PQQxppYIkz+X08sKnbsG1JCiijRDGOOIEEAl93tBUXf5tS2p1vctS9mTVdz1c7YFh5dVqJaoEf/qSCxwMhWACiOHqhjaOP9VeeYeIkvUzUNlyiBFMuUxWNyzr0LlgzNfJPUKQ/khewI5y+v1/L/V3e0QgAvoJSLwHm7Zop5LXNkmU3ZKkfAO0dT/hsX1P0L9OzSZBh7hHeLC6bvHcdJEAwC0iJp1XABUhh7iCT6w/8zhUvJXsz1mKAShTJKiIwb+5fyYeGbsvZlDaCFuy/QPbPq/u3bwFeQayGxceqLzFQtYWQsZVBBY1vaNWK2jFL6X3n6I7J3Il1QaLUkNU2kAh3M4oepBsMLhSBfsVyLAnQuSHASeN445I5F9ti0hGyCgKLpRGwjfQ8MSqa6jbBSev1ova/rHtPcZAry/2dIyp/dahxsZrt9sw9p22SDIsLG/avgZf3X6H712xTJHD/AGjAoJMmkBaVQuVaTTks5aslIWmVL22BTtyM6l+6Ojq+m7AghQwBVdgaJ/u6+T4K+daP1aiVkJZHDgqrrR3LTAjFfIurrABGDmlshUyIyMGDspVgUa0IVrDAEEHBBAINA56501VyzSJ7kxVSX1siIH+mhJPnqDvYOtkn99loe1iEBLEAknyB4oA5Fi8c3/KlW75Aux5Gef8A5/yrp2sx6r27ePOMycUcw9px7oHR2JU67FuyKpOhv2069SQCpIfnKbWyTIUlJYHcCyAAm6UUij3WWFbQw3tYFMQOpoO1JDLviLjdwu7eAVPIBN38C+L8V1KP0F5/e5rwPil0WCt3G5bkXp9lVsSEPWsRTSX8FZYh555FTJ0MTFAzkWJak0kj9JJnT66z+je8t336e7Nr2VxM2m/Ja0OQ3/Fw79NqZqse2ebSjVx+9nTT6pVJ3gg8lfWnYl7B9V987WQo07zpr9EEUBV0OuQamGLxTQRTtpZDSr62nLKu1lPSn5RHWr8jyArSloM7Ux/JK0DSN2FmzBXwuQMUbE+zWilqcdmswxrEq27k0sgE1iT3b/2uWMNqVYspdkmjA3EmgwlPtulVTHuv2f3j0DbgYx9S6crLpyEH6Hhks17i5MZsjO4llOSaQKSFx1T59xfEI8L9wfKv0wLVeWUeO8ygg/p+zXfKY9sHcjjKdvwtZLjlzJyOAS1nIWXXfbf1h/4taOOH6i0uujjRU1vboiSo2tLLpZZEcnAV29Bo4QWAKRxxKNoVb6i/6Pfc5p/o3uHbpJS57R3vUppod4b0tJ3CDT6rYgq1V9S2tlFkgySTEEHd13wXAobNaPtF2DKryhxoSPvr+TkaO+uwpJH7keNHL3JYbdtKKYDAxeb+a8X9gaHW6BvevJYkNuBr+LwAeOfPm+G29XeG0VqKYUBCdF9xvBQr+BTYGgob8TGxG2GiVdQPodCqDfHZsv5GHIJUfJFFa/fGepONTKTuxIKA+dpA9wHgAUSMg0COTUWb+N/SGMupKh2DFSR2XoSgjB3+Mb6Ib57bOjoEPEl7Y8qoAXyoOST8Ej45Hnx0XoyzHaws+47myTQPijlvOeRzzbc5Rz7zEg7ZdliD2Kx+4nzoEkdfkdgZCCVbWvo6IiOPIGSAMAnIxx+4JNYJ/cdCTwf3zYIBJZVuxiNS1mrouxJ+3HmjCiss8cEXzoaHkb+DH8EkBl0wZixX8gnk7P0MctliArMa4r2gis1zdm/t0+i0IgKUA1RBPtqgKAxdHdd+4EDOS6fp5xJZM2srw7dujbdCG2wBDDY/2p3J35Y+FACjbDSuzsN3sRjV37hjnOdw88+RV101KFFuy+5gFJINLjcQLPmxQAvi8UepQWOKV2runRRI0YHVepk0Ao91Nedr4B1pj/b5B+ko5oYrYcmzlR7aNGq3BjfNUPFmJkAVrU83QHCji9x4/wAs+R1I77UOINQX1F5CwlaUy47jlZCojSMVK8+QuuX7bd53v41de3H+nWBD3m/VkQ73+D+h3aTvevYgHVavQaCNSKUJpYtRPOd7GyXXWw7gtFBGKLB39PlX/pHdy/4z6V7YoUDT6Pu3dpWBJZvzMuk0mmGw0qhDodawayZfUYUgjHqxV/i33mb0z9EuNd3apyP1yRbq+3DKZYcLw/nmWjV9tHJsXcNihGigxyNX6SHRLC0fiDIkXYIhd/ntf2+BkGTs1OobUFWyCLN2xuwORRHVT/AnRif64k1YVTJ2X6e773GJjY96aeLQkjahAoasC7BBcYzfVodKADHYiKsU6Y70ulqq3URQq9l8dBUjC9wNk05I440JkZvxVgzAMOlbGIHtEZyBeDbqMg8qeMAkm7zbmkHqNI90GkEhVmAoe2RycVf96bxwSCKx1DH1PvVbHrb6nT1/6rJnaVaQiEqP1NHj2FrWUCqGI9u1FNECUPdoiwZ+oX65k/ERSfrPveRRft5ALE2f7H7dZGaNfpvjB89de/him36A+nAynK93YMTZpvqLvBLXki73ZO488VXSpy/LVo1jgZApXYCL0I/uIc9eshBGxoN4IBbvp/qnpIVAAsGypFqfnOfBPj5Pm76t8mnikJLpjcRZN84FE/sLIAIyKsjoiv57JV7dWw69qs9gxNKnbpXmKsV94KA5Q/0gRv8Ap9mZihIRlmRDtX9LYAtUsAHFEkZYkrfIHAArp6PTuRIEWwEsxkKS+BZHO4gkkBSKWibK31w5BlMziFjyeKhS1pVOQwzTGBLkagP7uNclhUyClkAZhJXsDvBYiMpimq2rsH1Rqe1SLDOzajSswR4mc3GCw90TEMY3AskgOrjBQtTpRvqb6O0He42m06pptcV9SPURqC0jZuPVKF9TUQnbYKt6qH3pJsV45FHw/nOE5TTmuYa2J3gk/TZDG2ENXLYeynxUy2ODPPSmKgtAxD1bUQM1OzZrhJW1vQ6+LWRDU6ZlkVxWbBUXYDgcP5OSCCCCRnrCO6dr1nadQ2l1cTQyAgh6LRTLRqSCQqoeNjYGQ6bdsiK4ZVTg5XFLZ92Ry7FZCVCBkDMA2t99+B0YMEBkbrrX5BucREu7cQbILWcAgZwBdkc5Nkiyc111oYhF+peFULTE4GDjFbuCb4JA4HUwPtX5bHk+O81pVwobCc04fyCf2w6IsiZSnahZNNE4mWOhIxCrJHIPZEnfcqN0h+FeoL/TLoTaaXvOpQli1FlXQavjAG71DuokbQAaZj1yx+MUH5f600jEkjWdkgnN1dq2s0oFmrW9MFpzuCoCoKgDqT3MH93IYfIxM6yY/P8ALeOlG7RKuNlvNyeEGNSEZkPF8YK8ZDLFBasRp1DSdtg0LFdbGR+p21UMhUn3JNAzFipWiQ8cYs+4bnAzg4B9SKHgdj+pfy7IxWyrP6e4lx7lVi5JAIBYqRfiCP3YcYalzDg3NkQLSGAyvG81KTG3V8TlK1zj8bKSQFEWSzahiz9S6bbtKHelfi1ovzHau1a4D26PWSaUsQuE7hpw7WSu5S0mk0ygmlJBT9W0nSf+jx3Q6b6h+oOzMQB3PtUOs9xJZp+zap4l2CwCh0/c5WYFR+kFsA7mjxvPaaKVjT2leIKPz2B7ZDP+BCKRpW2PhuqroAj6waSNBEx9wI9vtIrBya5HOfHg3kDrFcPk7rsndY4quCSK4+4sWBkN7zfKjPEp7ikM6gopBbuoPwp/FYyCHJ+D/d419DRq8pYN/hIyfKn2mhwduAfdZ5B56lIZNlUbJJJY4sUuMfcULNAAfNBgs3xztDKziNVTtJGVYNJ31shQDoofx7psq34eAOw+lxqVqwTtvcMWVogggkX42gHHkgEWdFLbB4wQ15s0psgWtk8WSccX+/TG2KBkeXv17EvtkA2SpJ+Ou/lifyZgA3wWOvpaahVWsFjQC/4RXNeCf6lwozk8dHhL95oUpOa91iqB5sHjyeMdK3inFzaQ2EOpI5wCpYgsi9mbTBCCEPYgAiPZUtsqOi69RCeFP6hQG4DcCq3zwOaG3J/UegZHWPagLGmJ3D3Mt5psYu/8WaJI6kVxOjHi5O/QhiiqApUaZOwLOe3YbIUADYLMCdAHQhjWiATZJBFDG26qiLAqhdEjNnoCeYEYK4BvcSTnFKKOQbrdRHnPS0vcheAIVbswDdkCFvwUuzMEBcn+wAj4PnSkeSSsarGSUF7QS1k1eQCp2gjNi6zk+OowM7OwNEe3buIAPPkizVf8scie3241a8fpbDk1kdzyDk2WyTh4+nSKu9LGhQQ8jlCcE8wkMSPuZkClfzl6X/DHRDT/AEjo9QxI/PavuGrAChdqwSTdvRQorcrHSlt7GyzOi2gEh4t/HTWDWfiFqtKoTb2rtXaO2vtcMS+oU95Ja6PqIO4iMohNIAWZf09VufxN45s/yz7Z+J49DZyEXK8xyCvVXZ9+1lLEHGaKqArRtZL8uheEFuz+5MAAm9D/AIiyGfTdm0kZAkk772tdpsWmkhKTEvdbQ9AAbizXjqV/AQpou9fWXcZnUafSfRHeFmfaKT81qINTH/S1bl0MxYlSoCgsCPabXTCYpDBGWcyT+m+KcRlEISXl9a1drtLGWYhMdaV5a7u3vVZUEp1NtvIkZonZuA8VgVR2UxqjZwwN4XIIogjoXReyKXeCCul1ZAOc/l2VQGIPutKUUTvrHA6rj51M8Xqp6jMs7SN/q/Myr2lDNr9dMpVdHQ9qNfbTqxZVVUdyE0eXfrRt/wBU98e/aurWMjDbPS08UIBwoxsAJUZzYs9di/h8gj+ivpqDaFb8i8hIJAIn1M+p3ZJORMCWwPNKOulHKQFVaXQIGvbeMMGV1c6OxplLsR0HgjRZQWANWVd0gwLQsFAJoBxS4IGCQAM0KyMHq3upJbYKOCaO0jaykkEcHkggH44PSgGSjkjVDHC4jIKRydHKGGNAjRq7MB/tePaM34ICyn8meKxgAZJFCqJAznhuB+3ij02sbx7gS49RSWIYhveSMlSAST+ogBWU1kYHzIk3K7gJr24igbqCCdhSwI1tiR1lRW6qg/ZfLKRAXLFroFwoAJVbUVtGDWSxJsfGCQLKAgOwMADi8UTYsci/NE8sfgkxH5xHmaOZOSwOYyPHcoBLQlyeLMcN6ehK6TPSnlkSYS13sVoZ1UjcbwgBvL7sHau4ajQMz6dyu6PYVu1BDAt7TYBtVogf4uL90N3Ps+h7rCkOtgGoWKX1FOQwfay4IKkCm93uIZiL/SOns7ipBZk/MhY5pG6v52schbQIA2WcDsfJUeQCBqsC7UXX9I8+dp+Bm/vXjPVsnYvYs0NqgYwCKP3vN3d9Tw+w6tHmOCc5tmOKNpvUXH1n7CQl460fHbTIxSRWVJA8oAVvxeRn8rpB0l+FunVfpg4B9Xueqle79wB0UZDXYvbEVAoqAQ1Bg27k78YXeT62hjZi35fsmijXdVEPJrZBwOA01m7JthYG2pKeqtuehjuR2YCpfF+rPppFCHB1DU5dkeCYHMJBo7WR6nKcvNESVUTz9WJi2DpiSGLUCRSw26mEkAi/eyXRrGCykUAwJJyT1ineNOH0rIxstoZZjgUTB+ZKggV5gAwKChCBuBPUfvX+Ns76NchawUE9LGJm45+oZ4ZsdSkzj/p+4kAa3LgzSn31L071rb95PBH1xok1n0t3mBiFOn07yxOFFxv22Ya1NpGT6iQrp3Jr+6eRc3u6G/CvuUvbPr/6Z1UVt+a17dt1CFiqyw92gn7cSwTbfoyTpq0S9nraeE1tDI1VuN5JYtKoWIBtFezNobUFe3VVPk+C2iASDoKST9cuEspokNZrjFMM/wDt8HPXe5Rbs88/Izng/ANfP+/RvZvzyNGe3VgHkPUnywPU6+NbJYgkE6Yjx+7SgIwIAtnF3nCtnzzmx4voyNCCwJBAsAUD5NeB/wDPB682pffqOZRv3G6b8bAYHZBI3/t0F31KgBtknQbzKsjHa3tZgKIBwCRn7ECvBzuvo+JRQIwSCcYo7iDQ4ojkVWLFHpEtx+uZIthSHLE7B2OpBGiQTtgT5/2nzp/oetzgbmAwxzZNsLB4vJHPI+PJ/rAK/tvaAfgEkAjAOAMfNm7B6UmHqw49J4Y12JSAN66poNpgpB2yjfUnQ8LseD9FiYEJGAckrk/povkHyT9xx+3QUg9Vkdgo2jc1DJJFUPFAChfyT9ulXWZoYZJezfB8g/ntELMx/ZifJ/bZ1saJ+kqCWXdXjgnPzeRz4qv456j9UqbjQIBonPgkivgeaoDx4wEzlMlb9qUBx1C9m2AG2RslSAP9vZepJUg+R/h9jmiWNyKh4UFbA4Gbo83d5u+mkhSwRdFbF/c1kGx48H+erWPRlpKPotw8hy8kfFmu+6dszTDGQTlishkUdpJS3UDooPVAoX8us/pWMaf6W7DAtEf2R26UkggltV6E75tjQknYrRXaCVFgAD88vxBnOr+ufq3UOKZvqHucSAUNq6OaXRxYAC36OmRSQATlj7iSa7PWCmOffxF/QHiV49aHDcVk+WqjuTFYkwj17eOiEaptiMjx2nNKHZUEMksQLeD9Vr6rhMnd/pqJtrJu12rKsLojVQIu1v1blEhok4smyaq5fhvIdN9GfiJqV/VrdX9L9jBBIZYJ5O4NqTfCiSI7bUFixpqVV6t5gow1FjsKCHu8syMkwDB+/wDKsXkMdXXsyqVT2uO0ZAmnEcgbRbZZiWi9mnBY/wB5MwJoWNrOErHACIp4wvz04D/wknn2rz5JeMEn/MnA+3HVNuYyzWeRckzZQu+Y5LyHIH3fylCz5CZ0jdux6lFZEAV2VQCpL9VY8md6dp+996mahv7p3EjFkomrlRd+4t7vaTg1njrtv6ahbR/TX0/AWDGHsXaA5AABdtDC8rLQX9UrOwJAOQcHAHfqGICITGH9sAjy2vgbIKkHTjyD/wBDwCYwQgAHg5JIAvIBJGOcGhYA8V4moJ2LBiMlWYVgUHqiDZJ4ySbz+3Soxzs7RwBmDRKXDkk/I2AB5+V7FgNKzHqV6kkN7d5bJAGCBV2DyCQebzVf7kvsWr1MHcaokijdiubq8XePmh0fLNK8Z0esnZlT8j7fRYkOioUBSAwIIDaYdRpPA9Ql+LUe0Br95JHmgALrJHxwfA0kYViCFIoXyTZz5ORis8DHHTN83oqs0M85UNI2u0IIJ3GHPZHPVfLFdIddUT53oHaMXvjBNpyWJPkjBBBzVm//AFJBmJ3ApjcLIOBdsCRXyAL+/X//2Q==</field>
+            <field name="signature">--
+Mr Demo Portal</field>
             <!-- Avoid auto-including this user in any default group -->
             <field name="groups_id" eval="[(5,)]"/>
-            <field name="partner_id" eval="ref('base.res_partner_1')"/>
         </record>
 
         <!-- Add the demo user to the portal (and therefore to the portal member group) -->
-        <record id="portal" model="res.portal">
+        <record id="group_portal" model="res.groups">
             <field name="users" eval="[(4,ref('demo_user0'))]"/>
         </record>
 
         <!-- Company news and comments -->
         <record id="message_company_news0" model="mail.message">
-            <field name="subject">Our first company's blogpost !</field>
+            <field name="subject">Our company's first blog-post !</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Hello, and welcome to our company's portal !
-
-Lorem ipsum <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus.
-Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi.
-
-Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur.
-
-Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]></field>
+            <field name="body"><![CDATA[<p>Hello, and welcome to our company's portal !</p>
+<p>It is a great pleasure to announce you the creation of our portal by writing this first news! As you may have seen, a new discussion group is now present under your 'My groups' menu: <b>Company's News</b>. We will post news about the company and its employees in this discussion group. Moreover, we will be able to communicate with our partners that are given the opportunity to join us in our portal.</p>
+<p>A new era of communication has begun! <b>Feel free to post your feelings about our portal by replying on this message!</b></p>]]></field>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="author_id" ref="base.partner_root"/>
         </record>
 
         <record id="message_company_news0_comment0" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Great first blogpost !  (first comment)]]></field>
+            <field name="body"><![CDATA[<p>As your first portal member, I am very pleased to be able to be able to communicate directly with you. Be sure I'll read all news carefully!</p>]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_demo"/>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="author_id" ref="partner_demo_portal"/>
         </record>
 
         <record id="message_company_news0_comment1" model="mail.message">
             <field name="model">mail.group</field>
             <field name="res_id" ref="company_news_feed"/>
-            <field name="content_subtype">html</field>
-            <field name="body_html"><![CDATA[Thanks !  (second comment)]]></field>
+            <field name="body"><![CDATA[<p>That's good news! As said by <i>Demo Portal User</i> in the previous post, I'm looking forward to hearing from you!</p>]]></field>
             <field name="parent_id" ref="message_company_news0"/>
             <field name="type">comment</field>
-            <field name="user_id" ref="base.user_root"/>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="author_id" ref="base.res_partner_1"/>
+        </record>
+
+        <record id="message_company_news0_comment2" model="mail.message">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="company_news_feed"/>
+            <field name="body"><![CDATA[<p>This feature is realy great! We will be able to communicate directly to our partners!</p>]]></field>
+            <field name="parent_id" ref="message_company_news0"/>
+            <field name="type">comment</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="author_id" ref="base.partner_demo"/>
         </record>
 
     </data>
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index dd720d448ef..5b39ea89525 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -5,7 +5,7 @@
         <!-- Top menu item -->
         <menuitem name="Portal"
             id="portal_menu"
-            groups="base.group_no_one,portal.group_portal_member,auth_anonymous.group_anonymous"
+            groups="base.group_no_one,portal.group_portal"
             sequence="20"/>
 
             <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
@@ -21,73 +21,31 @@
             <menuitem name="Projects" id="portal_projects" parent="portal_menu" sequence="40"/>
             <menuitem name="After Sale Services" id="portal_after_sales" parent="portal_menu" sequence="50"/>
 
-        <!-- portal tree view -->
-        <record id="portal_list_view" model="ir.ui.view">
-            <field name="name">Portal List</field>
-            <field name="model">res.portal</field>
+        <!-- extend res.groups search view -->
+        <record id="group_search_view" model="ir.ui.view">
+            <field name="name">Group Search</field>
+            <field name="model">res.groups</field>
+            <field name="inherit_id" ref="base.view_groups_search"/>
             <field name="arch" type="xml">
-                <tree string="Portals">
-                    <field name="name" string="Portal Name"/>
-                </tree>
+                <field name="name" position="after">
+                    <filter name="portal" string="Portal Groups" domain="[('is_portal','=',True)]"/>
+                    <filter name="no_portal" string="Non-Portal Groups" domain="[('is_portal','=',False)]"/>
+                    <separator orientation="vertical"/>
+                </field>
             </field>
         </record>
 
-        <!-- portal form view -->
-        <record id="portal_form_view" model="ir.ui.view">
+        <!-- extend res.groups form view -->
+        <record id="group_form_view" model="ir.ui.view">
             <field name="name">Portal Form</field>
-            <field name="model">res.portal</field>
+            <field name="model">res.groups</field>
             <field name="inherit_id" ref="base.view_groups_form"/>
             <field name="arch" type="xml">
-                <page string="Users" position="before">
-                    <page string="Portal">
-                        <group>
-                            <group>
-                                <field name="url" widget="url" string="Portal URL"/>
-                                <field name="home_action_id"/>
-                            </group>
-                            <group>
-                                <field name="override_menu"/>
-                                <field name="parent_menu_id"
-                                    context="{'ir.ui.menu.full_list': True}"/>
-                                <label for="partent_menu_id" colspan="1"/>
-                                <button name="do_create_menu" type="object"
-                                    string="Create Parent Menu"/>
-                            </group>
-                            <separator string="Widgets Assigned to Users" colspan="2"/>
-                            <field name="widget_ids" nolabel="1" colspan="2">
-                                <tree string="Widgets" editable="bottom">
-                                    <field name="sequence"/>
-                                    <field name="widget_id"/>
-                                </tree>
-                            </field>
-                        </group>
-                    </page>
-                </page>
+                <field name="name" position="after">
+                    <field name="is_portal"/>
+                </field>
             </field>
         </record>
 
-        <!-- action Administration/Portals/Portals -->
-        <record id="portal_list_action" model="ir.actions.act_window">
-            <field name="name">Portals</field>
-            <field name="res_model">res.portal</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <!-- a context is necessary to get the right portal form view -->
-            <field name="context">{'form_view_ref': 'portal.portal_form_view'}</field>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to create a new portal.
-              </p><p>
-                A portal helps defining specific views and rules for a group of
-                users (the portal group).  A portal menu, widgets and specific
-                groups may be assigned to the portal's users.
-              </p>
-            </field>
-        </record>
-
-        <!-- menu Administration/Portals/Portals -->
-        <menuitem name="Portals Settings" id="portal_menu_settings" parent="base.menu_administration" groups="group_portal_manager"/>
-            <menuitem name="Portals" id="portal_list_menu" parent="portal_menu_settings" action="portal_list_action"/>
-
     </data>
 </openerp>
diff --git a/addons/portal/security/ir.model.access.csv b/addons/portal/security/ir.model.access.csv
index 56b3ae5f269..9202c7f4087 100644
--- a/addons/portal/security/ir.model.access.csv
+++ b/addons/portal/security/ir.model.access.csv
@@ -1,12 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_all,access.portal.all,model_res_portal,,1,0,0,0
-access_widget_all,access.portal.widget.all,model_res_portal_widget,,1,0,0,0
-access_manager,access.portal.manager,model_res_portal,group_portal_manager,1,1,1,1
-access_widget_manager,access.portal.widget.manager,model_res_portal_widget,group_portal_manager,1,1,1,1
-access_mail_message,mail.message,mail.model_mail_message,group_portal_member,1,0,1,1
-access_mail_message_all,mail.message.all,mail.model_mail_message,group_portal_member,1,0,0,0
-access_mail_thread,mail.thread,mail.model_mail_thread,group_portal_member,1,0,0,0
-access_mail_followers,mail.followers,mail.model_mail_followers,group_portal_member,1,0,1,1
-access_mail_notification,mail.notification,mail.model_mail_notification,group_portal_member,1,0,1,0
-access_mail_group,mail.group,mail.model_mail_group,group_portal_member,1,0,0,0
-access_mail_alias,mail.alias,mail.model_mail_alias,group_portal_member,1,0,0,0
+access_mail_message_portal,mail.message.portal,mail.model_mail_message,group_portal,1,0,1,1
+access_res_partner,res.partner,base.model_res_partner,portal.group_portal,1,0,0,0
+access_res_partner_address,res.partner_address,base.model_res_partner_address,portal.group_portal,1,0,0,0
+access_res_partner_category,res.partner_category,base.model_res_partner_category,portal.group_portal,1,0,0,0
+access_res_partner_title,res.partner_title,base.model_res_partner_title,portal.group_portal,1,0,0,0
diff --git a/addons/portal/security/portal_security.xml b/addons/portal/security/portal_security.xml
index 4a493204d67..ee0af785599 100644
--- a/addons/portal/security/portal_security.xml
+++ b/addons/portal/security/portal_security.xml
@@ -2,31 +2,14 @@
 <openerp>
     <data noupdate="1">
 
-        <!-- Don't use any implied_ids here; this group's behavior is particular -->
-        <record id="group_portal_member" model="res.groups">
-            <field name="name">Portal Member</field>
-            <field name="comment">Portal members can access information through the portal menu.  Also, they are chrooted in this specific menu.</field>
-        </record>
-
-        <record id="module_category_portal" model="ir.module.category">
+        <!-- The portal group -->
+        <record id="group_portal" model="res.groups">
             <field name="name">Portal</field>
-            <field name="parent_id" ref="base.module_category_tools"/>
-            <field name="sequence">25</field>
-        </record>
-
-        <!-- No implied ids with 'member' since this group is highly restrictive (chrooted menu) -->
-        <record id="group_portal_officer" model="res.groups">
-            <field name="name">Officer</field>
-            <field name="comment">Portal officers can create new portal users with the portal wizard.</field>
-            <field name="category_id" ref="module_category_portal"/>
-        </record>
-
-        <record id="group_portal_manager" model="res.groups">
-            <field name="name">Manager</field>
-            <field name="comment">Portal managers have access to the portal definitions, and can easily configure the users, access rights and menus of portal users.</field>
-            <field name="category_id" ref="module_category_portal"/>
-            <field name="implied_ids" eval="[(4, ref('group_portal_officer'))]"/>
-            <field name="users" eval="[(4, ref('base.user_root'))]"/>
+            <field name="comment">Portal members have specific access rights (such as record rules and restricted menus).
+                They usually do not belong to the usual OpenERP groups.</field>
+            <field name="is_portal" eval="True"/>
+            <!-- Insert the template user from auth_signup in the portal members group -->
+            <field name="users" eval="[(4,ref('auth_signup.default_template_user'))]"/>
         </record>
 
     </data>
diff --git a/addons/portal/tests/__init__.py b/addons/portal/tests/__init__.py
new file mode 100644
index 00000000000..c4717f80ebf
--- /dev/null
+++ b/addons/portal/tests/__init__.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+from . import test_portal
+
+checks = [
+    test_portal,
+]
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
new file mode 100644
index 00000000000..0a2772c9cfe
--- /dev/null
+++ b/addons/portal/tests/test_portal.py
@@ -0,0 +1,122 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (c) 2012-TODAY OpenERP S.A. <http://openerp.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.addons.mail.tests import test_mail_mockup
+from openerp.osv.orm import except_orm
+from openerp.tools.misc import mute_logger
+
+
+class test_portal(test_mail_mockup.TestMailMockups):
+
+    def setUp(self):
+        super(test_portal, self).setUp()
+        cr, uid = self.cr, self.uid
+        self.ir_model = self.registry('ir.model')
+        self.mail_group = self.registry('mail.group')
+        self.mail_mail = self.registry('mail.mail')
+        self.mail_message = self.registry('mail.message')
+        self.mail_invite = self.registry('mail.wizard.invite')
+        self.res_users = self.registry('res.users')
+        self.res_partner = self.registry('res.partner')
+
+        # create a 'pigs' group that will be used through the various tests
+        self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
+            {'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})
+
+        # Find Portal group
+        group_portal = self.registry('ir.model.data').get_object(cr, uid, 'portal', 'group_portal')
+        self.group_portal_id = group_portal.id
+
+        # Create Chell (portal user)
+        self.user_chell_id = self.res_users.create(cr, uid, {'name': 'Chell Gladys', 'login': 'chell', 'groups_id': [(6, 0, [self.group_portal_id])]})
+        user_chell = self.res_users.browse(cr, uid, self.user_chell_id)
+        self.partner_chell_id = user_chell.partner_id.id
+
+        # Set an email address for the user running the tests, used as Sender for outgoing mails
+        self.res_users.write(cr, uid, uid, {'email': 'test@localhost'})
+
+    @mute_logger('openerp.addons.base.ir.ir_model')
+    def test_00_access_rights(self):
+        """ Test basic mail_message and mail_group access rights for portal users. """
+        cr, uid = self.cr, self.uid
+
+        # Prepare group: Pigs (portal)
+        self.mail_group.message_post(cr, uid, self.group_pigs_id, body='Message')
+        self.mail_group.write(cr, uid, [self.group_pigs_id], {'name': 'Jobs', 'public': 'groups', 'group_public_id': self.group_portal_id})
+
+        # ----------------------------------------
+        # CASE1: Chell will use the Chatter
+        # ----------------------------------------
+
+        # Do: Chell reads Pigs messages, ok because restricted to portal group
+        message_ids = self.mail_group.read(cr, self.user_chell_id, self.group_pigs_id, ['message_ids'])['message_ids']
+        self.mail_message.read(cr, self.user_chell_id, message_ids)
+
+        # Do: Chell posts a message on Pigs, crash because can not write on group or is not in the followers
+        with self.assertRaises(except_orm):
+            self.mail_group.message_post(cr, self.user_chell_id, self.group_pigs_id, body='Message')
+
+        # Do: Chell is added to Pigs followers
+        self.mail_group.message_subscribe(cr, uid, [self.group_pigs_id], [self.partner_chell_id])
+
+        # Test: Chell posts a message on Pigs, ok because in the followers
+        self.mail_group.message_post(cr, self.user_chell_id, self.group_pigs_id, body='Message')
+
+    def test_50_mail_invite(self):
+        cr, uid = self.cr, self.uid
+        user_admin = self.res_users.browse(cr, uid, uid)
+        base_url = self.registry('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='')
+        # 0 - Admin
+        partner_admin_id = user_admin.partner_id.id
+        # 1 - Bert Tartopoils, with email, should receive emails for comments and emails
+        partner_bert_id = self.res_partner.create(cr, uid, {'name': 'Bert Tartopoils', 'email': 'b@b'})
+
+        # ----------------------------------------
+        # CASE: invite Bert to follow Pigs
+        # ----------------------------------------
+
+        # Do: create a mail_wizard_invite, validate it
+        self._init_mock_build_email()
+        context = {'default_res_model': 'mail.group', 'default_res_id': self.group_pigs_id}
+        mail_invite_id = self.mail_invite.create(cr, uid, {'partner_ids': [(4, partner_bert_id)]}, context)
+        self.mail_invite.add_followers(cr, uid, [mail_invite_id])
+
+        # Test: Pigs followers should contain Admin and Bert
+        group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
+        follower_ids = [follower.id for follower in group_pigs.message_follower_ids]
+        self.assertEqual(set(follower_ids), set([partner_admin_id, partner_bert_id]), 'Pigs followers after invite is incorrect')
+
+        # Test: partner must have been prepared for signup
+        partner_bert = self.res_partner.browse(cr, uid, partner_bert_id)
+        self.assertTrue(partner_bert.signup_valid, 'partner has not been prepared for signup')
+        self.assertTrue(base_url in partner_bert.signup_url, 'signup url is incorrect')
+        self.assertTrue(cr.dbname in partner_bert.signup_url, 'signup url is incorrect')
+        self.assertTrue(partner_bert.signup_token in partner_bert.signup_url, 'signup url is incorrect')
+
+        # Test: (pretend to) send email and check subject, body
+        self.assertEqual(len(self._build_email_kwargs_list), 1, 'sent email number incorrect, should be only for Bert')
+        for sent_email in self._build_email_kwargs_list:
+            self.assertEqual(sent_email.get('subject'), 'Invitation to follow Pigs',
+                             'subject of invitation email is incorrect')
+            self.assertTrue('You have been invited to follow Pigs' in sent_email.get('body'),
+                            'body of invitation email is incorrect')
+            self.assertTrue(partner_bert.signup_url in sent_email.get('body'),
+                            'body of invitation email does not contain signup url')
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 0260ce338fc..bf8353c92c1 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -23,44 +23,37 @@ import logging
 import random
 
 from osv import osv, fields
-from tools.misc import email_re
 from tools.translate import _
+from tools import email_re
+from openerp import SUPERUSER_ID
 
-from base.res.res_partner import _lang_get
 _logger = logging.getLogger(__name__)
 
-
-# welcome email sent to new portal users (note that calling tools.translate._
-# has no effect except exporting those strings for translation)
+# welcome email sent to portal users
+# (note that calling '_' has no effect except exporting those strings for translation)
 WELCOME_EMAIL_SUBJECT = _("Your OpenERP account at %(company)s")
 WELCOME_EMAIL_BODY = _("""Dear %(name)s,
 
-You have been created an OpenERP account at %(url)s.
+You have been given access to %(portal)s.
 
 Your login account data is:
 Database: %(db)s
-User:     %(login)s
-Password: %(password)s
+Username: %(login)s
 
-%(message)s
+In order to complete the signin process, click on the following url:
+%(url)s
+
+%(welcome_message)s
 
 --
 OpenERP - Open Source Business Applications
 http://www.openerp.com
 """)
 
-ROOT_UID = 1
-
-# character sets for passwords, excluding 0, O, o, 1, I, l
-_PASSU = 'ABCDEFGHIJKLMNPQRSTUVWXYZ'
-_PASSL = 'abcdefghijkmnpqrstuvwxyz'
-_PASSD = '23456789'
-
 def random_password():
-    # get 3 uppercase letters, 3 lowercase letters, 2 digits, and shuffle them
-    chars = map(random.choice, [_PASSU] * 3 + [_PASSL] * 3 + [_PASSD] * 2)
-    random.shuffle(chars)
-    return ''.join(chars)
+    # temporary random stuff; user password is reset by signup process
+    chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
+    return ''.join(random.choice(chars) for i in xrange(12))
 
 def extract_email(email):
     """ extract the email address from a user-friendly email address """
@@ -71,167 +64,161 @@ def extract_email(email):
 
 class wizard(osv.osv_memory):
     """
-        A wizard to create portal users from instances of 'res.partner'. The purpose
-        is to provide an OpenERP database access to customers or suppliers.
+        A wizard to manage the creation/removal of portal users.
     """
-    _name = 'res.portal.wizard'
-    _description = 'Portal Wizard'
-    
+    _name = 'portal.wizard'
+    _description = 'Portal Access Management'
+
     _columns = {
-        'portal_id': fields.many2one('res.portal', required=True,
-            string='Portal',
-            help="The portal in which new users must be added"),
-        'user_ids': fields.one2many('res.portal.wizard.user', 'wizard_id',
-            string='Users'),
-        'message': fields.text(string='Invitation message',
-            help="This text is included in the welcome email sent to the users"),
+        'portal_id': fields.many2one('res.groups', domain=[('is_portal', '=', True)], required=True,
+            string='Portal', help="The portal that users can be added in or removed from."),
+        'user_ids': fields.one2many('portal.wizard.user', 'wizard_id', string='Users'),
+        'welcome_message': fields.text(string='Invitation Message',
+            help="This text is included in the email sent to new users of the portal."),
     }
 
-    def _default_user_ids(self, cr, uid, context):
-        """ determine default user_ids from the active records """
-        def create_user_from_address(address):
-            if isinstance(address, int):
-                res_partner_obj = self.pool.get('res.partner')
-                address = res_partner_obj.browse(cr, uid, address, context=context)
-                lang = address.id and address.lang or 'en_US'
-                partner_id = address.id
-                
-            else:
-                lang = address.parent_id and address.parent_id.lang or 'en_US'
-                partner_id = address.parent_id and address.parent_id.id
-            
-            return{
-                   'name': address.name,
-                   'email': extract_email(address.email),
-                   'lang': lang,
-                   'partner_id': partner_id,
-                   }
-        
-        user_ids = []
-        if context.get('active_model') == 'res.partner':
-            partner_obj = self.pool.get('res.partner')
-            partner_ids = context.get('active_ids', [])
-            partners = partner_obj.browse(cr, uid, partner_ids, context)
-            for p in partners:
-                # add one user per contact, or one user if no contact
-                if p.child_ids:
-                    user_ids.extend(map(create_user_from_address, p.child_ids))
-                elif p.is_company == False and p.customer == True:
-                    user_ids.extend(map(create_user_from_address, [p.id]))
-                else:
-                    user_ids.append({'lang': p.lang or 'en_US', 'parent_id': p.id})
-        
-        return user_ids
+    def _default_portal(self, cr, uid, context):
+        portal_ids = self.pool.get('res.groups').search(cr, uid, [('is_portal', '=', True)])
+        return portal_ids and portal_ids[0] or False
 
     _defaults = {
-        'user_ids': _default_user_ids
+        'portal_id': _default_portal,
     }
 
-    def action_create(self, cr, uid, ids, context=None):
-        """ create new users in portal(s), and notify them by email """
-        # we copy the context to change the language for translating emails
-        context0 = context or {}
-        context0['noshortcut'] = True           # prevent shortcut creation
-        context = context0.copy()
-        
-        user_obj = self.pool.get('res.users')
-        user = user_obj.browse(cr, ROOT_UID, uid, context0)
-        if not user.email:
-            raise osv.except_osv(_('Email required'),
-                _('You must have an email address in your User Preferences'
-                  ' to send emails.'))
-        
-        portal_obj = self.pool.get('res.portal')
-        for wiz in self.browse(cr, uid, ids, context):
-            # determine existing users
-            login_cond = [('login', 'in', [u.email for u in wiz.user_ids])]
-            existing_uids = user_obj.search(cr, ROOT_UID, login_cond)
-            existing_users = user_obj.browse(cr, ROOT_UID, existing_uids)
-            existing_logins = [u.login for u in existing_users]
-            
-            # create new users in portal (skip existing logins)
-            new_users_data = [ {
-                    'name': u.name,
-                    'login': u.email,
-                    'password': random_password(),
-                    'email': u.email,
-                    'lang': u.lang,
-                    'share': True,
-                    'action_id': wiz.portal_id.home_action_id and wiz.portal_id.home_action_id.id or False,
-                    'partner_id': u.partner_id and u.partner_id.id,
-                    'groups_id': [(6, 0, [])],
-                } for u in wiz.user_ids if u.email not in existing_logins ]
-            portal_obj.write(cr, ROOT_UID, [wiz.portal_id.id],
-                {'users': [(0, 0, data) for data in new_users_data]}, context0)
-            
-            # send email to all users (translated in their language)
-            data = {
-                'company': user.company_id.name,
-                'message': wiz.message or "",
-                'url': wiz.portal_id.url or _("(missing url)"),
-                'db': cr.dbname,
-            }
-            mail_message_obj = self.pool.get('mail.message')
-            dest_uids = user_obj.search(cr, ROOT_UID, login_cond)
-            dest_users = user_obj.browse(cr, ROOT_UID, dest_uids)
-            for dest_user in dest_users:
-                context['lang'] = dest_user.lang
-                data['login'] = dest_user.login
-                data['password'] = dest_user.password
-                data['name'] = dest_user.name
-                
-                email_from = user.email
-                email_to = dest_user.email
-                subject = _(WELCOME_EMAIL_SUBJECT) % data
-                body = _(WELCOME_EMAIL_BODY) % data
-                res = mail_message_obj.schedule_with_attach(cr, uid, email_from , [email_to], subject, body, context=context)
-                if not res:
-                    _logger.warning(
-                        'Failed to send email from %s to %s', email_from, email_to)
-        
+    def onchange_portal_id(self, cr, uid, ids, portal_id, context=None):
+        # for each partner, determine corresponding portal.wizard.user records
+        res_partner = self.pool.get('res.partner')
+        partner_ids = context and context.get('active_ids') or []
+        contact_ids = set()
+        user_changes = []
+        for partner in res_partner.browse(cr, SUPERUSER_ID, partner_ids, context):
+            for contact in (partner.child_ids or [partner]):
+                # make sure that each contact appears at most once in the list
+                if contact.id not in contact_ids:
+                    contact_ids.add(contact.id)
+                    in_portal = False
+                    if contact.user_ids:
+                        in_portal = portal_id in [g.id for g in contact.user_ids[0].groups_id]
+                    user_changes.append((0, 0, {
+                        'partner_id': contact.id,
+                        'email': contact.email,
+                        'in_portal': in_portal,
+                    }))
+        return {'value': {'user_ids': user_changes}}
+
+    def action_apply(self, cr, uid, ids, context=None):
+        wizard = self.browse(cr, uid, ids[0], context)
+        portal_user_ids = [user.id for user in wizard.user_ids]
+        self.pool.get('portal.wizard.user').action_apply(cr, uid, portal_user_ids, context)
         return {'type': 'ir.actions.act_window_close'}
 
-wizard()
-
-
-
 class wizard_user(osv.osv_memory):
     """
         A model to configure users in the portal wizard.
     """
-    _name = 'res.portal.wizard.user'
+    _name = 'portal.wizard.user'
     _description = 'Portal User Config'
 
     _columns = {
-        'wizard_id': fields.many2one('res.portal.wizard', required=True,
-            string='Wizard'),
-        'name': fields.char(size=64, required=True,
-            string='User Name',
-            help="The user's real name"),
-        'email': fields.char(size=64, required=True,
-            string='Email',
-            help="Will be used as user login.  "  
-                 "Also necessary to send the account information to new users"),
-        'lang': fields.selection(_lang_get, required=True,
-            string='Language',
-            help="The language for the user's user interface"),
-        'partner_id': fields.many2one('res.partner',
-            string='Partner'),
+        'wizard_id': fields.many2one('portal.wizard', string='Wizard', required=True),
+        'partner_id': fields.many2one('res.partner', string='Contact', required=True, readonly=True),
+        'email': fields.char(size=240, string='Email'),
+        'in_portal': fields.boolean('In Portal'),
     }
 
-    def _check_email(self, cr, uid, ids):
-        """ check syntax of email address """
-        for wuser in self.browse(cr, uid, ids):
-            if not email_re.match(wuser.email): return False
-        return True
+    def create(self, cr, uid, values, context=None):
+        """ overridden to update the partner's email (if necessary) """
+        id = super(wizard_user, self).create(cr, uid, values, context)
+        wuser = self.browse(cr, uid, id, context)
+        if wuser.partner_id.email != wuser.email:
+            wuser.partner_id.write({'email': wuser.email})
+        return id
 
-    _constraints = [
-        (_check_email, 'Invalid email address', ['email']),
-    ]
+    def action_apply(self, cr, uid, ids, context=None):
+        res_users = self.pool.get('res.users')
+        for wizard_user in self.browse(cr, SUPERUSER_ID, ids, context):
+            portal = wizard_user.wizard_id.portal_id
+            user = self._retrieve_user(cr, SUPERUSER_ID, wizard_user, context)
+            if wizard_user.in_portal:
+                # create a user if necessary, and make sure it is in the portal group
+                if not user:
+                    user = self._create_user(cr, SUPERUSER_ID, wizard_user, context)
+                if (not user.active) or (portal not in user.groups_id):
+                    user.write({'active': True, 'groups_id': [(4, portal.id)]})
+                    # prepare for the signup process
+                    user.partner_id.signup_prepare()
+                    wizard_user = self.browse(cr, SUPERUSER_ID, wizard_user.id, context)
+                    self._send_email(cr, uid, wizard_user, context)
+            else:
+                # remove the user (if it exists) from the portal group
+                if user and (portal in user.groups_id):
+                    # if user belongs to portal only, deactivate it
+                    if len(user.groups_id) <= 1:
+                        user.write({'groups_id': [(3, portal.id)], 'active': False})
+                    else:
+                        user.write({'groups_id': [(3, portal.id)]})
 
-wizard_user()
+    def _retrieve_user(self, cr, uid, wizard_user, context=None):
+        """ retrieve the (possibly inactive) user corresponding to wizard_user.partner_id
+            @param wizard_user: browse record of model portal.wizard.user
+            @return: browse record of model res.users
+        """
+        if wizard_user.partner_id.user_ids:
+            return wizard_user.partner_id.user_ids[0]
+        # the user may be inactive, search for it
+        res_users = self.pool.get('res.users')
+        domain = [('partner_id', '=', wizard_user.partner_id.id), ('active', '=', False)]
+        user_ids = res_users.search(cr, uid, domain)
+        return user_ids and res_users.browse(cr, uid, user_ids[0], context) or False
 
+    def _create_user(self, cr, uid, wizard_user, context=None):
+        """ create a new user for wizard_user.partner_id
+            @param wizard_user: browse record of model portal.wizard.user
+            @return: browse record of model res.users
+        """
+        res_users = self.pool.get('res.users')
+        create_context = dict(context or {}, noshortcut=True)       # to prevent shortcut creation
+        values = {
+            'login': extract_email(wizard_user.email),
+            'password': random_password(),
+            'partner_id': wizard_user.partner_id.id,
+            'groups_id': [(6, 0, [])],
+            'share': True,
+        }
+        user_id = res_users.create(cr, uid, values, context=create_context)
+        return res_users.browse(cr, uid, user_id, context)
 
+    def _send_email(self, cr, uid, wizard_user, context=None):
+        """ send notification email to a new portal user
+            @param wizard_user: browse record of model portal.wizard.user
+            @return: the id of the created mail.mail record
+        """
+        this_context = context
+        this_user = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context)
+        if not this_user.email:
+            raise osv.except_osv(_('Email required'),
+                _('You must have an email address in your User Preferences to send emails.'))
 
+        # determine subject and body in the portal user's language
+        user = self._retrieve_user(cr, SUPERUSER_ID, wizard_user, context)
+        context = dict(this_context or {}, lang=user.lang)
+        data = {
+            'company': this_user.company_id.name,
+            'portal': wizard_user.wizard_id.portal_id.name,
+            'welcome_message': wizard_user.wizard_id.welcome_message or "",
+            'db': cr.dbname,
+            'name': user.name,
+            'login': user.login,
+            'url': user.signup_url,
+        }
+        mail_mail = self.pool.get('mail.mail')
+        mail_values = {
+            'email_from': this_user.email,
+            'email_to': user.email,
+            'subject': _(WELCOME_EMAIL_SUBJECT) % data,
+            'body_html': '<pre>%s</pre>' % (_(WELCOME_EMAIL_BODY) % data),
+            'state': 'outgoing',
+        }
+        return mail_mail.create(cr, uid, mail_values, context=this_context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal/wizard/portal_wizard_view.xml b/addons/portal/wizard/portal_wizard_view.xml
index f3cd5c98bb4..373b4ad8e7a 100644
--- a/addons/portal/wizard/portal_wizard_view.xml
+++ b/addons/portal/wizard/portal_wizard_view.xml
@@ -3,28 +3,32 @@
     <data>
         <!-- wizard action on res.partner -->
         <act_window id="partner_wizard_action"
-            name="Add Portal Access"
+            name="Portal Access Management"
             src_model="res.partner"
-            res_model="res.portal.wizard"
+            res_model="portal.wizard"
             view_type="form" view_mode="form"
             key2="client_action_multi" target="new"
-            groups="group_portal_officer"/>
+            groups="base.group_partner_manager"/>
 
         <!-- wizard view -->
         <record id="wizard_view" model="ir.ui.view">
-            <field name="name">Add Portal Access</field>
-            <field name="model">res.portal.wizard</field>
+            <field name="name">Portal Access Management</field>
+            <field name="model">portal.wizard</field>
             <field name="arch" type="xml">
-                <form string="Add Portal Access" version="7.0">
-                    <group col="4">
-                        <field name="portal_id" widget="selection"/>
+                <form string="Portal Access Management" version="7.0">
+                    <group>
+                        <field name="portal_id" widget="selection" on_change="onchange_portal_id(portal_id, context)"/>
                     </group>
+                    <div>
+                        Select which contacts should belong to the portal in the list below.
+                        The email address of each selected contact must be valid and unique.
+                        If necessary, you can fix any contact's email address directly in the list.
+                    </div>
                     <field name="user_ids"/>
-                    <label string="The following text will be included in the welcome email sent to users."/>
-                    <field name="message"/>
+                    <field name="welcome_message"
+                        placeholder="This text is included in the email sent to new portal users."/>
                     <footer>
-                        <button string="Send Invitations"
-                            name="action_create" type="object" class="oe_highlight"  />
+                        <button string="Apply" name="action_apply" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />    
                     </footer>
@@ -35,32 +39,15 @@
         <!-- wizard user list view -->
         <record id="wizard_user_tree_view" model="ir.ui.view">
             <field name="name">Portal Users</field>
-            <field name="model">res.portal.wizard.user</field>
+            <field name="model">portal.wizard.user</field>
             <field name="arch" type="xml">
-                <!-- the attribute 'editable' is set below to make the elements
-                     editable in the web client 6.0 -->
-                <tree string="Portal Users" editable="bottom">
-                    <field name="name"/>
-                    <field name="email"/>
+                <!-- the contact list is editable, but one cannot add or delete rows -->
+                <tree string="Contacts" editable="bottom" create="false" delete="false">
                     <field name="partner_id"/>
+                    <field name="email"/>
+                    <field name="in_portal"/>
                 </tree>
             </field>
         </record>
-
-        <!-- wizard user form view -->
-        <record id="wizard_user_form_view" model="ir.ui.view">
-            <field name="name">Portal User</field>
-            <field name="model">res.portal.wizard.user</field>
-            <field name="arch" type="xml">
-                <form string="Portal User" version="7.0">
-                    <group colspan="2" col="2">
-                        <field name="name"/>
-                        <field name="email"/>
-                        <field name="lang"/>
-                        <field name="partner_id"/>
-                    </group>
-                </form>
-            </field>
-        </record>
     </data>
 </openerp>
diff --git a/addons/portal/wizard/share_wizard.py b/addons/portal/wizard/share_wizard.py
index ca950a61b08..51e5e59eb0e 100644
--- a/addons/portal/wizard/share_wizard.py
+++ b/addons/portal/wizard/share_wizard.py
@@ -35,8 +35,8 @@ class share_wizard_portal(osv.TransientModel):
 
     def _user_type_selection(self, cr, uid, context=None):
         selection = super(share_wizard_portal, self)._user_type_selection(cr, uid, context=context)
-        selection.extend([('existing','Users you already shared with'),
-                          ('groups','Existing Groups (e.g Portal Groups)')])
+        selection.extend([('existing',_('Users you already shared with')),
+                          ('groups',_('Existing Groups (e.g Portal Groups)'))])
         return selection
 
     _columns = {
@@ -44,9 +44,6 @@ class share_wizard_portal(osv.TransientModel):
         'group_ids': fields.many2many('res.groups', 'share_wizard_res_group_rel', 'share_id', 'group_id', 'Existing groups', domain=[('share', '=', False)]),
     }
 
-    def is_portal_manager(self, cr, uid, context=None):
-        return self.has_group(cr, uid, module='portal', group_xml_id='group_portal_manager', context=context)
-
     def _check_preconditions(self, cr, uid, wizard_data, context=None):
         if wizard_data.user_type == 'existing':
             self._assert(wizard_data.user_ids,
@@ -122,16 +119,14 @@ class share_wizard_portal(osv.TransientModel):
         # alter the rules of the groups so they can see the shared data
         if wizard_data.group_ids:
             # get the list of portals and the related groups to install their menus.
-            Portals = self.pool.get('res.portal')
-            all_portals = Portals.browse(cr, UID_ROOT, Portals.search(cr, UID_ROOT, [])) #no context!
-            all_portal_group_ids = [p.group_id.id for p in all_portals]
+            res_groups = self.pool.get('res.groups')
+            all_portal_group_ids = res_groups.search(cr, UID_ROOT, [('is_portal', '=', True)])
 
             # populate result lines with the users of each group and
             # setup the menu for portal groups
             for group in wizard_data.group_ids:
                 if group.id in all_portal_group_ids:
-                    portal = all_portals[all_portal_group_ids.index(group.id)]
-                    self._create_shared_data_menu(cr, uid, wizard_data, portal, context=context)
+                    self._create_shared_data_menu(cr, uid, wizard_data, group.id, context=context)
 
                 for user in group.users:
                     new_line = {'user_id': user.id,
diff --git a/addons/portal/wizard/share_wizard_view.xml b/addons/portal/wizard/share_wizard_view.xml
index 72ae857eaaf..065a7aa317e 100644
--- a/addons/portal/wizard/share_wizard_view.xml
+++ b/addons/portal/wizard/share_wizard_view.xml
@@ -36,12 +36,12 @@
             <field name="inherit_id" ref="share.share_step2_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='result_line_ids']//field[@name='login']" position="after">
-                    <field name="share_url" groups="portal.group_portal_manager"/>
+                    <field name="share_url" groups="base.group_no_one"/>
                 </xpath>
                 <xpath expr="//field[@name='result_line_ids']" position="after">
                     <newline/>
-                    <group string="Details">
-                        <field name="share_root_url" groups="portal.group_portal_manager"/>
+                    <group string="Details" groups="base.group_no_one">
+                        <field name="share_root_url"/>
                     </group>
                 </xpath>
             </field>
diff --git a/addons/portal_claim/__openerp__.py b/addons/portal_claim/__openerp__.py
index 197227cc45f..df9f7a65c96 100644
--- a/addons/portal_claim/__openerp__.py
+++ b/addons/portal_claim/__openerp__.py
@@ -24,10 +24,10 @@
     'name': 'Portal Claim',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
+    'complexity': 'easy',
     'description': """
-This module adds claim menu and features to your portal if claim and portal are
-installed.
+This module adds claim menu and features to your portal if claim and portal are installed.
+==========================================================================================
     """,
     'author': 'OpenERP SA',
     'depends': ['crm_claim','portal'],
@@ -37,7 +37,7 @@ installed.
         'security/portal_security.xml',
     ],
     'installable': True,
-    'auto_install':True,
-    'category':'Hidden',
+    'auto_install': True,
+    'category': 'Hidden',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_claim/portal_claim_view.xml b/addons/portal_claim/portal_claim_view.xml
index 86be0764d26..e08b39e476b 100644
--- a/addons/portal_claim/portal_claim_view.xml
+++ b/addons/portal_claim/portal_claim_view.xml
@@ -10,7 +10,14 @@
             <field name="view_id" ref="crm_claim.crm_case_claims_tree_view"/>
             <field name="context">{"search_default_user_id":'', "stage_type":'claim'}</field>
             <field name="search_view_id" ref="crm_claim.view_crm_case_claims_filter"/>
-            <field name="help">Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module.</field>
+            <field name="help"  type="html">
+              <p class="oe_view_nocontent_create">
+                Click to register a new claim. 
+              </p><p>
+                You can track your claims from this menu and the action we
+                will take.
+              </p>
+            </field>
         </record>
 
         <menuitem name="Claims" id="portal_after_sales_claims" parent="portal.portal_after_sales" 
diff --git a/addons/portal_claim/security/ir.model.access.csv b/addons/portal_claim/security/ir.model.access.csv
index 554c66cc998..ab2a2f66770 100644
--- a/addons/portal_claim/security/ir.model.access.csv
+++ b/addons/portal_claim/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_crm_claim,crm.claim,crm_claim.model_crm_claim,portal.group_portal_member,1,0,0,0
-access_crm_claim_stage,crm.claim.stage,crm_claim.model_crm_claim_stage,portal.group_portal_member,1,0,0,0
+access_crm_claim,crm.claim,crm_claim.model_crm_claim,portal.group_portal,1,0,0,0
+access_crm_claim_stage,crm.claim.stage,crm_claim.model_crm_claim_stage,portal.group_portal,1,0,0,0
diff --git a/addons/portal_claim/security/portal_security.xml b/addons/portal_claim/security/portal_security.xml
index e902bd043ad..3742765f795 100644
--- a/addons/portal_claim/security/portal_security.xml
+++ b/addons/portal_claim/security/portal_security.xml
@@ -5,8 +5,12 @@
         <record id="portal_stock_picking_user_rule" model="ir.rule">
             <field name="name">Portal Personal Claims</field>
             <field ref="crm_claim.model_crm_claim" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
+            <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
+            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
+            <field eval="1" name="perm_unlink"/>
+            <field eval="1" name="perm_write"/>
+            <field eval="1" name="perm_read"/>
+            <field eval="0" name="perm_create"/>
         </record>
 
     </data>
diff --git a/addons/portal_crm/__openerp__.py b/addons/portal_crm/__openerp__.py
index 4fe023ccb48..1516ab13961 100644
--- a/addons/portal_crm/__openerp__.py
+++ b/addons/portal_crm/__openerp__.py
@@ -24,22 +24,20 @@
     'name': 'Portal CRM',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
+    'complexity': 'easy',
     'description': """
-This module adds a contact page (with a contact form creating a lead when
-submitted) to your portal if crm and portal are installed.
+This module adds a contact page (with a contact form creating a lead when submitted) to your portal if crm and portal are installed.
+====================================================================================================================================
     """,
     'author': 'OpenERP SA',
     'depends': ['crm','portal'],
-    'data': [
-        'wizard/contact_view.xml',
+    'data': ['wizard/contact_view.xml'],
+    'test': [
+        'test/contact_form.yml',
     ],
-    'installable': True
-,    'auto_install':True,
-    'category':'Hidden',
-    'css': [
-        'static/src/css/portal_crm.css',
-    ],
-
+    'installable': True,
+    'auto_install': True,
+    'category': 'Hidden',
+    'css': ['static/src/css/portal_crm.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_crm/test/contact_form.yml b/addons/portal_crm/test/contact_form.yml
new file mode 100644
index 00000000000..7ba93a9e831
--- /dev/null
+++ b/addons/portal_crm/test/contact_form.yml
@@ -0,0 +1,38 @@
+-
+  Set the current user as portal user.
+-
+  !context
+    'uid': 'portal.demo_user0'
+-
+  As a portal user, I fill in the contact form and submit it.
+-
+  !record {model: portal_crm.crm_contact_us, id: contact_us_01}:
+    name: 'Need information about your contact form module'
+    partner_name: 'Mr. John Doe'
+    email_from: 'mister@john.doe'
+    phone: '+32 444 11 22 33'
+    description: 'Dear Sir or Madam, could you get back to me asap ?  Regards.'
+-
+  For security reasons, the wizard values is empty.
+-
+  !python {model: portal_crm.crm_contact_us}: |
+    obj = self.browse(cr, uid, ref("contact_us_01"))
+    assert not(obj.name or obj.partner_name or obj.email_from or obj.phone or obj.description), 'All the wizard\'s values are not empty'
+-
+  And a lead is created with the proper values.
+-
+  !python {model: crm.lead}: |
+    from openerp import SUPERUSER_ID
+
+    ids = self.search(cr, SUPERUSER_ID, [('name', '=', 'Need information about your contact form module')])
+    assert len(ids) == 1, 'There are more than one matching lead, while only one was expected'
+
+    obj = self.browse(cr, SUPERUSER_ID, ids[0])
+    expected_values = dict(
+        name='Need information about your contact form module',
+        partner_name='Mr. John Doe',
+        email_from='mister@john.doe',
+        phone='+32 444 11 22 33',
+        description='Dear Sir or Madam, could you get back to me asap ?  Regards.')
+    for k, v in expected_values.iteritems():
+        assert obj[k] == expected_values[k], 'Lead data mismatch: expected %s, got %s' % (expected_values[k], obj[k])
diff --git a/addons/portal_crm/wizard/contact.py b/addons/portal_crm/wizard/contact.py
index 036993e1720..a0f0d952a66 100644
--- a/addons/portal_crm/wizard/contact.py
+++ b/addons/portal_crm/wizard/contact.py
@@ -40,32 +40,51 @@ class crm_contact_us(osv.TransientModel):
         r = self.pool.get('res.company').search(cr, uid, [], context=context)
         return r
 
-    def _get_current_user_email(self, cr, uid, context=None):
+    def _get_user_name(self, cr, uid, context=None):
         """
-        If the user is logged in (i.e. not anonymous), get the user's email to
-        pre-fill the email_from field.
+        If the user is logged in (i.e. not anonymous), get the user's name to
+        pre-fill the partner_name field.
+        Same goes for the other _get_user_attr methods.
 
-        @return current user's email if the user isn't "anonymous", None otherwise
+        @return current user's name if the user isn't "anonymous", None otherwise
         """
-        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        user = self.pool.get('res.users').read(cr, uid, uid, ['login'], context)
 
-        if (user.login != 'anonymous'):
-            return user.email
+        if (user['login'] != 'anonymous'):
+            return self.pool.get('res.users').name_get(cr, uid, uid, context)[0][1]
+        else:
+            return None
+
+    def _get_user_email(self, cr, uid, context=None):
+        user = self.pool.get('res.users').read(cr, uid, uid, ['login', 'email'], context)
+
+        if (user['login'] != 'anonymous' and user['email']):
+            return user['email']
+        else:
+            return None
+
+    def _get_user_phone(self, cr, uid, context=None):
+        user = self.pool.get('res.users').read(cr, uid, uid, ['login', 'phone'], context)
+
+        if (user['login'] != 'anonymous' and user['phone']):
+            return user['phone']
         else:
             return None
 
     _defaults = {
-        'email_from' : _get_current_user_email,
-        'company_ids' : _get_companies,
+        'partner_name': _get_user_name,
+        'email_from': _get_user_email,
+        'phone': _get_user_phone,
+        'company_ids': _get_companies,
     }
 
     def create(self, cr, uid, values, context=None):
         """
-        Since they potentially sensitive, we don't want any user to be able to
-        read datas generated through this module.  That's why we'll write those
-        information in the crm.lead table and leave blank entries in the
-        portal_crm.crm_contact_us table.  This is why the create() method is
-        overwritten.
+        Since they are potentially sensitive, we don't want any user to be able
+        to read datas generated through this module.  Therefore we'll write
+        these information directly in the crm.lead table and leave blank
+        entries in the portal_crm.crm_contact_us table.
+        This is why the create() method is overwritten.
         """
         crm_lead = self.pool.get('crm.lead')
 
@@ -74,8 +93,7 @@ class crm_contact_us(osv.TransientModel):
         models implied (like mail.thread, among others, that performs a read
         when its create() method is called (in method message_get_subscribers()),
         it is quite complicated to set proper rights for this object.
-        Therefore, user SUPERUSER_ID will perform the creation until a better
-        workaround is figured out.
+        Therefore, user SUPERUSER_ID will perform the creation.
         """
         values['contact_name'] = values['name']
         crm_lead.create(cr, SUPERUSER_ID, dict(values,user_id=False), context)
@@ -84,15 +102,25 @@ class crm_contact_us(osv.TransientModel):
         Create an empty record in the portal_crm.crm_contact_us table.
         Since the 'name' field is mandatory, give an empty string to avoid an integrity error.
         """
-        return super(crm_contact_us, self).create(cr, uid, {'name': ' '})
+        empty_values = dict((k, False) if k != 'name' else (k, '') for k, v in values.iteritems())
+        return super(crm_contact_us, self).create(cr, uid, empty_values)
 
     def submit(self, cr, uid, ids, context=None):
         """ When the form is submitted, redirect the user to a "Thanks" message """
-        return {'type': 'ir.actions.act_window',
-                'view_mode': 'form',
-                'view_type': 'form',
-                'res_model': self._name,
-                'res_id': ids[0],
-                'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal_crm', 'wizard_contact_form_view_thanks')[1],
-                'target': 'inline'
-               }
+        return {
+            'type': 'ir.actions.act_window',
+            'view_mode': 'form',
+            'view_type': 'form',
+            'res_model': self._name,
+            'res_id': ids[0],
+            'view_id': self.pool.get('ir.model.data').get_object_reference(cr, uid, 'portal_crm', 'wizard_contact_form_view_thanks')[1],
+            'target': 'inline',
+        }
+
+    def _needaction_domain_get(self, cr, uid, context=None):
+        """
+        This model doesn't need the needactions mechanism inherited from
+        crm_lead, so simply override the method to return an empty domain
+        and, therefore, 0 needactions.
+        """
+        return False
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 1776632d7ab..778e7f9562e 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -35,8 +35,8 @@
                                             <field name="street2"/>
                                             <field name="zip"/>
                                             <field name="city"/>
-                                            <field name="country_id" options='{"no_open": true}'/>
-                                            <field name="state_id" options='{"no_open": true}'/>
+                                            <field name="country_id" options='{"no_open": True}'/>
+                                            <field name="state_id" options='{"no_open": True}'/>
                                             <templates>
                                                 <t t-name="kanban-box">
                                                     <h4><field name="name"/></h4>
diff --git a/addons/portal_event/__openerp__.py b/addons/portal_event/__openerp__.py
index 2f5220c9f36..f97ad81efd9 100644
--- a/addons/portal_event/__openerp__.py
+++ b/addons/portal_event/__openerp__.py
@@ -24,10 +24,10 @@
     'name': 'Portal Event',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
+    'complexity': 'easy',
     'description': """
-This module adds event menu and features to your portal if event and portal are
-installed.
+This module adds event menu and features to your portal if event and portal are installed.
+==========================================================================================
     """,
     'author': 'OpenERP SA',
     'depends': ['event','portal'],
@@ -38,7 +38,7 @@ installed.
         'security/ir.model.access.csv',
     ],
     'installable': True,
-    'auto_install':True,
-    'category':'Hidden',
+    'auto_install': True,
+    'category': 'Hidden',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_event/event_view.xml b/addons/portal_event/event_view.xml
index 1dd9fee7181..675bddbc42e 100644
--- a/addons/portal_event/event_view.xml
+++ b/addons/portal_event/event_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <!-- add visibility field to the event form view -->
-        <record id="view_employee_form" model="ir.ui.view">
+        <record id="view_event_form_portal" model="ir.ui.view">
             <field name="name">portal.event.form</field>
             <field name="model">event.event</field>
             <field name="inherit_id" ref="event.view_event_form"/>
@@ -17,6 +17,5 @@
                 </xpath>
             </field>
         </record>
-
     </data>
 </openerp>
diff --git a/addons/portal_event/portal_event_view.xml b/addons/portal_event/portal_event_view.xml
index 1e046bc9e7f..5d2397f6148 100755
--- a/addons/portal_event/portal_event_view.xml
+++ b/addons/portal_event/portal_event_view.xml
@@ -13,7 +13,7 @@
             <field name="view_mode">kanban,calendar,tree,form,graph</field>
             <field name="context">{"search_default_upcoming":1}</field>
             <field name="search_view_id" ref="event.view_event_search"/>
-            <field name="help">No public events.</field>
+            <field name="help">There are no public events.</field>
         </record>
 
         <menuitem name="Events" id="portal_company_events" parent="portal.portal_company"
diff --git a/addons/portal_event/security/ir.model.access.csv b/addons/portal_event/security/ir.model.access.csv
index b418acbb9c4..fc652f4bcd1 100644
--- a/addons/portal_event/security/ir.model.access.csv
+++ b/addons/portal_event/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_event,event,event.model_event_event,portal.group_portal_member,1,0,0,0
-access_registration,registration,event.model_event_registration,portal.group_portal_member,1,0,0,0
+access_event,event,event.model_event_event,portal.group_portal,1,0,0,0
+access_registration,registration,event.model_event_registration,portal.group_portal,1,1,1,1
diff --git a/addons/portal_event/security/portal_security.xml b/addons/portal_event/security/portal_security.xml
index 6a3ed0ac786..8f17808345b 100644
--- a/addons/portal_event/security/portal_security.xml
+++ b/addons/portal_event/security/portal_security.xml
@@ -6,14 +6,14 @@
             <field name="name">Portal Visible Events</field>
             <field ref="event.model_event_event" name="model_id"/>
             <field name="domain_force">[('visibility', '=', 'public')]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
+            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_registration_rule" model="ir.rule">
             <field name="name">Portal Personal Registrations</field>
             <field ref="event.model_event_registration" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
+            <field name="domain_force">[('user_id','=',user.id)]</field>
+            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
     </data>
diff --git a/addons/portal_hr_employees/__openerp__.py b/addons/portal_hr_employees/__openerp__.py
index ec883e78acf..7dacfa6688b 100644
--- a/addons/portal_hr_employees/__openerp__.py
+++ b/addons/portal_hr_employees/__openerp__.py
@@ -24,10 +24,10 @@
     'name': 'Portal HR employees',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
+    'complexity': 'easy',
     'description': """
-This module adds a list of employees to your portal's contact page if hr and
-portal_crm (which creates the contact page) are installed.
+This module adds a list of employees to your portal's contact page if hr and portal_crm (which creates the contact page) are installed.
+=======================================================================================================================================
     """,
     'author': 'OpenERP SA',
     'depends': ['hr','portal_crm'],
@@ -36,11 +36,8 @@ portal_crm (which creates the contact page) are installed.
         'security/ir.model.access.csv',
     ],
     'installable': True,
-    'auto_install':True,
-    'category':'Hidden',
-    'css': [
-        'static/src/css/portal_hr_employees.css',
-    ],
-
+    'auto_install': True,
+    'category': 'Hidden',
+    'css': ['static/src/css/portal_hr_employees.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_hr_employees/hr_employee_view.xml b/addons/portal_hr_employees/hr_employee_view.xml
index f36e2a4d2d8..4e133061da6 100644
--- a/addons/portal_hr_employees/hr_employee_view.xml
+++ b/addons/portal_hr_employees/hr_employee_view.xml
@@ -8,12 +8,8 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[last()]" position="after">
-                    <page string="Portal Settings">
-                        <group>
-                            <field name="visibility"/>
-                        </group>
-                    </page>
+                <xpath expr="//field[@name='active']" position="before">
+                    <field name="visibility"/>
                 </xpath>
             </field>
         </record>
@@ -38,7 +34,7 @@
                                         </div>
                                         <div class="oe_employee_details">
                                             <h4>
-                                                <a type="edit"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
+                                                <a type="open"><field name="name"/><t t-if="record.login.raw_value"> (<field name="login"/>)</t></a>
                                             </h4>
                                             <ul>
                                                 <li t-if="record.job_id.raw_value"><field name="job_id"/></li>
diff --git a/addons/portal_hr_employees/security/ir.model.access.csv b/addons/portal_hr_employees/security/ir.model.access.csv
index 6131f49d749..de204d43a09 100644
--- a/addons/portal_hr_employees/security/ir.model.access.csv
+++ b/addons/portal_hr_employees/security/ir.model.access.csv
@@ -1,6 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_hr_employee_user,hr.employee user,hr.model_hr_employee,portal.group_portal_member,1,0,0,0
-access_res_partner,res.partner,base.model_res_partner,portal.group_portal_member,1,0,0,0
-access_res_partner_address,res.partner_address,base.model_res_partner_address,portal.group_portal_member,1,0,0,0
-access_res_partner_category,res.partner_category,base.model_res_partner_category,portal.group_portal_member,1,0,0,0
-access_res_partner_title,res.partner_title,base.model_res_partner_title,portal.group_portal_member,1,0,0,0
+access_hr_employee_user,hr.employee user,hr.model_hr_employee,portal.group_portal,1,0,0,0
diff --git a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
index 351fd442f20..5fa658de8c1 100644
--- a/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
+++ b/addons/portal_hr_employees/static/src/css/portal_hr_employees.css
@@ -12,3 +12,9 @@
     width: 65px;
     height: 65px;
 }
+
+.openerp .oe_employee_vignette ul, .openerp .oe_employee_vignette li {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
diff --git a/addons/portal_project/__openerp__.py b/addons/portal_project/__openerp__.py
index 4f8774bf99e..d502d278c38 100644
--- a/addons/portal_project/__openerp__.py
+++ b/addons/portal_project/__openerp__.py
@@ -24,10 +24,10 @@
     'name': 'Portal Project',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
+    'complexity': 'easy',
     'description': """
-This module adds project menu and features (tasks) to your portal if project
-and portal are installed.
+This module adds project menu and features (tasks) to your portal if project and portal are installed.
+======================================================================================================
     """,
     'author': 'OpenERP SA',
     'depends': ['project','portal'],
@@ -37,7 +37,7 @@ and portal are installed.
         'portal_project_view.xml',
     ],
     'installable': True,
-    'auto_install':True,
-    'category':'Hidden',
+    'auto_install': True,
+    'category': 'Hidden',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_project/security/ir.model.access.csv b/addons/portal_project/security/ir.model.access.csv
index dceca5ba8bb..85463868ee1 100644
--- a/addons/portal_project/security/ir.model.access.csv
+++ b/addons/portal_project/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_task,tasks,project.model_project_task,portal.group_portal_member,1,0,0,0
-access_task_type,task_type,project.model_project_task_type,portal.group_portal_member,1,0,0,0
-access_task_work,task_work,project.model_project_task_work,portal.group_portal_member,1,0,0,0
-access_project_category,project_category,project.model_project_category,portal.group_portal_member,1,0,0,0
+access_task,tasks,project.model_project_task,portal.group_portal,1,0,0,0
+access_task_type,task_type,project.model_project_task_type,portal.group_portal,1,0,0,0
+access_task_work,task_work,project.model_project_task_work,portal.group_portal,1,0,0,0
+access_project_category,project_category,project.model_project_category,portal.group_portal,1,0,0,0
diff --git a/addons/portal_project/security/portal_security.xml b/addons/portal_project/security/portal_security.xml
index b995c79bbbc..ba686f72db4 100644
--- a/addons/portal_project/security/portal_security.xml
+++ b/addons/portal_project/security/portal_security.xml
@@ -5,8 +5,12 @@
         <record id="portal_task_rule" model="ir.rule">
             <field name="name">Portal Personal Task</field>
             <field ref="project.model_project_task" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
+            <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
+            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
+            <field eval="1" name="perm_unlink"/>
+            <field eval="1" name="perm_write"/>
+            <field eval="1" name="perm_read"/>
+            <field eval="0" name="perm_create"/>
         </record>
 
     </data>
diff --git a/addons/portal_project_issue/__openerp__.py b/addons/portal_project_issue/__openerp__.py
index 17ba4b0d5aa..cef01c52364 100644
--- a/addons/portal_project_issue/__openerp__.py
+++ b/addons/portal_project_issue/__openerp__.py
@@ -24,10 +24,10 @@
     'name': 'Portal Issue',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
+    'complexity': 'easy',
     'description': """
-This module adds issue menu and features to your portal if project_issue and
-portal are installed.
+This module adds issue menu and features to your portal if project_issue and portal are installed.
+==================================================================================================
     """,
     'author': 'OpenERP SA',
     'depends': ['project_issue','portal'],
@@ -37,10 +37,8 @@ portal are installed.
         'portal_project_issue_view.xml',
     ],
     'installable': True,
-    'auto_install':True,
-    'category':'Hidden',
-    'css': [
-        'static/src/css/portal_project_issue.css',
-    ],
+    'auto_install': True,
+    'category': 'Hidden',
+    'css': ['static/src/css/portal_project_issue.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_project_issue/portal_project_issue_view.xml b/addons/portal_project_issue/portal_project_issue_view.xml
index 14e944ab32e..6502d92b4dc 100644
--- a/addons/portal_project_issue/portal_project_issue_view.xml
+++ b/addons/portal_project_issue/portal_project_issue_view.xml
@@ -5,6 +5,7 @@
         <record id="portal_project_issue_kanban_view" model="ir.ui.view">
             <field name="name">Project Issue Kanban</field>
             <field name="model">project.issue</field>
+            <field name="priority">20</field>
             <field name="arch" type="xml">
                 <kanban version="7.0" class="oe_portal_project_issue">
                     <field name="priority"/>
@@ -18,7 +19,7 @@
                             <div class="oe_kanban_card oe_kanban_global_click">
                                 <div class="oe_kanban_content">
                                     <div>
-                                        <h1><a type="edit"><field name="name"/></a></h1>
+                                        <h1><a type="open"><field name="name"/></a></h1>
                                         <field name="partner_id"/> <br/>
                                         <field name="version_id"/>
                                     </div>
@@ -27,6 +28,7 @@
                                             <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
                                                 <span class="oe_tag" t-att-data-categ_id="categ_id"></span>
                                             </t>
+                                            <field name="categ_ids"/>
                                         </div>
                                         <div class="oe_right">
                                             Creation: <field name="create_date"/>
diff --git a/addons/portal_project_issue/security/ir.model.access.csv b/addons/portal_project_issue/security/ir.model.access.csv
index 5257f9b6d02..80a38366b51 100644
--- a/addons/portal_project_issue/security/ir.model.access.csv
+++ b/addons/portal_project_issue/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_issues,project_issue,project_issue.model_project_issue,portal.group_portal_member,1,0,0,0
-access_case_section,crm_case_section,crm.model_crm_case_section,portal.group_portal_member,1,0,0,0
+access_issues,project_issue,project_issue.model_project_issue,portal.group_portal,1,0,0,0
+access_case_section,crm_case_section,crm.model_crm_case_section,portal.group_portal,1,0,0,0
diff --git a/addons/portal_project_issue/security/portal_security.xml b/addons/portal_project_issue/security/portal_security.xml
index 4ef8da5e4b6..a121eeb593e 100644
--- a/addons/portal_project_issue/security/portal_security.xml
+++ b/addons/portal_project_issue/security/portal_security.xml
@@ -5,8 +5,12 @@
         <record id="portal_issue_rule" model="ir.rule">
             <field name="name">Portal Personal Issues</field>
             <field ref="project_issue.model_project_issue" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
+            <field name="domain_force">[('message_follower_ids','in', [user.partner_id.id])]</field>
+            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
+            <field eval="1" name="perm_unlink"/>
+            <field eval="1" name="perm_write"/>
+            <field eval="1" name="perm_read"/>
+            <field eval="0" name="perm_create"/>
         </record>
 
     </data>
diff --git a/addons/portal_sale/__openerp__.py b/addons/portal_sale/__openerp__.py
index f87bebd19fd..8d7cd8b3935 100644
--- a/addons/portal_sale/__openerp__.py
+++ b/addons/portal_sale/__openerp__.py
@@ -24,20 +24,20 @@
     'name': 'Portal Sale',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
+    'complexity': 'easy',
     'description': """
-This module adds sale menu and features to your portal if sale and portal are 
-installed.
+This module adds sale menu and features to your portal if sale and portal are installed.
+========================================================================================
     """,
     'author': 'OpenERP SA',
-    'depends': ['sale','portal'],
+    'depends': ['sale_stock','portal'],
     'data': [
         'security/portal_security.xml',
         'portal_sale_view.xml',
-        "security/ir.model.access.csv",
+        'security/ir.model.access.csv',
     ],
     'installable': True,
-    'auto_install':True,
-    'category':'Hidden',
+    'auto_install': True,
+    'category': 'Hidden',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml
index 5786fbc52ad..b46175f7feb 100644
--- a/addons/portal_sale/portal_sale_view.xml
+++ b/addons/portal_sale/portal_sale_view.xml
@@ -13,7 +13,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="context">{"search_default_draft":1}</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
-            <field name="help">You dont have any quotation.</field>
+            <field name="help">You don't have any quotation.</field>
         </record>
 
         <record id="action_order_form" model="ir.actions.act_window">
@@ -23,7 +23,7 @@
             <field name="view_mode">tree,form,calendar,graph</field>
             <field name="search_view_id" ref="sale.view_sales_order_filter"/>
             <field name="context">{"search_default_sales":1}</field>
-            <field name="help">You dont have any sale order.</field>
+            <field name="help">You don't have any sale order.</field>
         </record>
 
         <record id="action_picking_tree" model="ir.actions.act_window">
@@ -34,7 +34,7 @@
             <field name="domain">[('type','=','out')]</field>
             <field name="context">{'default_type': 'out', 'contact_display': 'partner_address'}</field>
             <field name="search_view_id" ref="stock.view_picking_out_search"/>
-            <field name="help">You dont have any delivery order.</field>
+            <field name="help">You don't have any delivery order.</field>
         </record>
 
         <record id="product_normal_action" model="ir.actions.act_window">
@@ -45,7 +45,7 @@
             <field name="view_mode">kanban,tree,form</field>
             <field name="view_id" ref="product.product_kanban_view"/>
             <field name="search_view_id" ref="product.product_search_form_view"/>
-            <field name="help">No public products.</field>
+            <field name="help">There are no public products.</field>
         </record>
 
         <record id="action_invoice_tree1" model="ir.actions.act_window">
@@ -55,7 +55,7 @@
             <field name="domain">[('type','=','out_invoice')]</field>
             <field name="context">{'default_type':'out_invoice', 'type':'out_invoice', 'journal_type': 'sale'}</field>
             <field name="search_view_id" ref="account.view_account_invoice_filter"/>
-            <field name="help">You dont have any invoice.</field>
+            <field name="help">You don't have any invoice.</field>
         </record>
 
         <record id="action_vendor_receipt" model="ir.actions.act_window">
@@ -65,7 +65,7 @@
             <field name="context">{'type':'receipt'}</field>
             <field name="search_view_id" ref="account_voucher.view_voucher_filter_customer_pay"/>
             <field name="target">current</field>
-            <field name="help">You dont have any payment.</field>
+            <field name="help">You don't have any refunds or payments.</field>
         </record>
 
         <menuitem name="Quotations" id="portal_quotations" parent="portal.portal_orders"
diff --git a/addons/portal_sale/security/ir.model.access.csv b/addons/portal_sale/security/ir.model.access.csv
index 32266499af7..751c0b9baff 100644
--- a/addons/portal_sale/security/ir.model.access.csv
+++ b/addons/portal_sale/security/ir.model.access.csv
@@ -1,33 +1,33 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_sale_order,sale.order,sale.model_sale_order,portal.group_portal_member,1,0,0,0
-access_sale_order_line,sale.order.line,sale.model_sale_order_line,portal.group_portal_member,1,0,0,0
-access_stock_picking,stock.picking,stock.model_stock_picking,portal.group_portal_member,1,0,0,0
-access_stock_picking.out,stock.picking.out,stock.model_stock_picking_out,portal.group_portal_member,1,0,0,0
-access_stock_move,stock.move,stock.model_stock_move,portal.group_portal_member,1,0,0,0
-access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,portal.group_portal_member,1,0,0,0
-access_account_invoice,account.invoice,account.model_account_invoice,portal.group_portal_member,1,0,0,0
-access_account_invoice_tax,account.invoice.tax,account.model_account_invoice_tax,portal.group_portal_member,1,0,0,0
-access_account_invoice_line,account.invoice.line,account.model_account_invoice_line,portal.group_portal_member,1,0,0,0
-access_account_journal,account.journal,account.model_account_journal,portal.group_portal_member,1,0,0,0
-access_account_voucher,account.voucher,account_voucher.model_account_voucher,portal.group_portal_member,1,0,0,0
-access_account_voucher_line,account.voucher.line,account_voucher.model_account_voucher_line,portal.group_portal_member,1,0,0,0
-access_account_move,account.move,account.model_account_move,portal.group_portal_member,1,0,0,0
-access_account_move_line,account.move.line,account.model_account_move_line,portal.group_portal_member,1,0,0,0
-access_account_move_reconcile,account.move.reconcile,account.model_account_move_reconcile,portal.group_portal_member,1,0,0,0
-access_account_fiscalyear,account.sequence.fiscalyear,account.model_account_sequence_fiscalyear,portal.group_portal_member,1,0,0,0
-access_sale_shop,sale.shop,sale.model_sale_shop,portal.group_portal_member,1,0,0,0
-access_product_list,product.pricelist,product.model_product_pricelist,portal.group_portal_member,1,0,0,0
-access_product,product.product,product.model_product_product,portal.group_portal_member,1,0,0,0
-access_res_partner,res.partner,base.model_res_partner,portal.group_portal_member,1,0,0,0
-access_product_uom,product.uom,product.model_product_uom,portal.group_portal_member,1,0,0,0
-access_account_tax,account.tax,account.model_account_tax,portal.group_portal_member,1,0,0,0
-access_mrp_property,mrp.property,procurement.model_mrp_property,portal.group_portal_member,1,0,0,0
-access_product_template,product.template,product.model_product_template,portal.group_portal_member,1,0,0,0
-access_stock_warehouse,stock.warehouse,stock.model_stock_warehouse,portal.group_portal_member,1,0,0,0
-access_stock_location,stock.location,stock.model_stock_location,portal.group_portal_member,1,0,0,0
-access_account_fiscalyear,account.fiscalyear,account.model_account_fiscalyear,portal.group_portal_member,1,0,0,0
-access_res_partner_category,res.partner.category,base.model_res_partner_category,portal.group_portal_member,1,0,0,0
-access_product_supplierinfo,product.supplierinfo,product.model_product_supplierinfo,portal.group_portal_member,1,0,0,0
-access_product_packaging,product.packaging,product.model_product_packaging,portal.group_portal_member,1,0,0,0
-access_account_period,account.period,account.model_account_period,portal.group_portal_member,1,0,0,0
-access_account_account,account.account,account.model_account_account,portal.group_portal_member,1,0,0,0
+access_sale_order,sale.order,sale.model_sale_order,portal.group_portal,1,0,0,0
+access_sale_order_line,sale.order.line,sale.model_sale_order_line,portal.group_portal,1,0,0,0
+access_stock_picking,stock.picking,stock.model_stock_picking,portal.group_portal,1,0,0,0
+access_stock_picking.out,stock.picking.out,stock.model_stock_picking_out,portal.group_portal,1,0,0,0
+access_stock_move,stock.move,stock.model_stock_move,portal.group_portal,1,0,0,0
+access_stock_warehouse_orderpoint,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,portal.group_portal,1,0,0,0
+access_account_invoice,account.invoice,account.model_account_invoice,portal.group_portal,1,0,0,0
+access_account_invoice_tax,account.invoice.tax,account.model_account_invoice_tax,portal.group_portal,1,0,0,0
+access_account_invoice_line,account.invoice.line,account.model_account_invoice_line,portal.group_portal,1,0,0,0
+access_account_journal,account.journal,account.model_account_journal,portal.group_portal,1,0,0,0
+access_account_voucher,account.voucher,account_voucher.model_account_voucher,portal.group_portal,1,0,0,0
+access_account_voucher_line,account.voucher.line,account_voucher.model_account_voucher_line,portal.group_portal,1,0,0,0
+access_account_move,account.move,account.model_account_move,portal.group_portal,1,0,0,0
+access_account_move_line,account.move.line,account.model_account_move_line,portal.group_portal,1,0,0,0
+access_account_move_reconcile,account.move.reconcile,account.model_account_move_reconcile,portal.group_portal,1,0,0,0
+access_account_fiscalyear,account.sequence.fiscalyear,account.model_account_sequence_fiscalyear,portal.group_portal,1,0,0,0
+access_sale_shop,sale.shop,sale.model_sale_shop,portal.group_portal,1,0,0,0
+access_product_list,product.pricelist,product.model_product_pricelist,portal.group_portal,1,0,0,0
+access_product,product.product,product.model_product_product,portal.group_portal,1,0,0,0
+access_res_partner,res.partner,base.model_res_partner,portal.group_portal,1,0,0,0
+access_product_uom,product.uom,product.model_product_uom,portal.group_portal,1,0,0,0
+access_account_tax,account.tax,account.model_account_tax,portal.group_portal,1,0,0,0
+access_mrp_property,mrp.property,procurement.model_mrp_property,portal.group_portal,1,0,0,0
+access_product_template,product.template,product.model_product_template,portal.group_portal,1,0,0,0
+access_stock_warehouse,stock.warehouse,stock.model_stock_warehouse,portal.group_portal,1,0,0,0
+access_stock_location,stock.location,stock.model_stock_location,portal.group_portal,1,0,0,0
+access_account_fiscalyear,account.fiscalyear,account.model_account_fiscalyear,portal.group_portal,1,0,0,0
+access_res_partner_category,res.partner.category,base.model_res_partner_category,portal.group_portal,1,0,0,0
+access_product_supplierinfo,product.supplierinfo,product.model_product_supplierinfo,portal.group_portal,1,0,0,0
+access_product_packaging,product.packaging,product.model_product_packaging,portal.group_portal,1,0,0,0
+access_account_period,account.period,account.model_account_period,portal.group_portal,1,0,0,0
+access_account_account,account.account,account.model_account_account,portal.group_portal,1,0,0,0
diff --git a/addons/portal_sale/security/portal_security.xml b/addons/portal_sale/security/portal_security.xml
index f69fd283db6..19d44947f03 100644
--- a/addons/portal_sale/security/portal_security.xml
+++ b/addons/portal_sale/security/portal_security.xml
@@ -5,44 +5,49 @@
         <!-- Sale Portal Access Rules -->
         <record id="portal_sale_order_user_rule" model="ir.rule">
             <field name="name">Portal Personal Quotations/Sales Orders</field>
-            <field ref="sale.model_sale_order" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
+            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
+            <field eval="1" name="perm_unlink"/>
+            <field eval="1" name="perm_write"/>
+            <field eval="1" name="perm_read"/>
+            <field eval="0" name="perm_create"/>
         </record>
 
         <record id="portal_stock_picking_user_rule" model="ir.rule">
             <field name="name">Portal Personal Delivery Orders</field>
-            <field ref="stock.model_stock_picking" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',[user.partner_id.id])]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
+            <field name="model_id" ref="stock.model_stock_picking"/>
+            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
+            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_stock_picking_user_rule" model="ir.rule">
             <field name="name">Portal Personal Delivery Orders Out</field>
-            <field ref="stock.model_stock_picking_out" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',[user.partner_id.id])]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
+            <field name="model_id" ref="stock.model_stock_picking_out"/>
+            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
+            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_account_invoice_user_rule" model="ir.rule">
             <field name="name">Portal Personal Account Invoices</field>
-            <field ref="account.model_account_invoice" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
+            <field name="model_id" ref="account.model_account_invoice"/>
+            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
+            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_personal_payment" model="ir.rule">
             <field name="name">Portal Personal Payments</field>
-            <field ref="account_voucher.model_account_voucher" name="model_id"/>
-            <field name="domain_force">[('partner_id','child_of',user.partner_id.id)]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
+            <field name="model_id" ref="account_voucher.model_account_voucher"/>
+            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
+            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
         <record id="portal_personal_contact" model="ir.rule">
             <field name="name">Portal Personal Contacts</field>
-            <field ref="base.model_res_partner" name="model_id"/>
-            <field name="domain_force">[('id','child_of',user.partner_id.id)]</field>
-            <field name="groups" eval="[(4, ref('portal.group_portal_member'))]"/>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="domain_force">[('message_follower_ids','in',[user.partner_id.id])]</field>
+            <field eval="0" name="perm_read"/>
+            <field name="groups" eval="[(4, ref('portal.group_portal'))]"/>
         </record>
 
     </data>
diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py
index 657aee868b2..c998288a614 100644
--- a/addons/process/__openerp__.py
+++ b/addons/process/__openerp__.py
@@ -28,22 +28,31 @@
 This module shows the basic processes involved in the selected modules and in the sequence they occur.
 ======================================================================================================
 
-Note: This applies to the modules containing modulename_process.xml.
-e.g product/process/product_process.xml.
+**Note:** This applies to the modules containing modulename_process.xml.
+
+**e.g.** product/process/product_process.xml.
 
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base'],
-    'init_xml': [],
-    'update_xml': [
-       'security/ir.model.access.csv',
-       'process_view.xml'
+    'depends': ['web'],
+    'data': [
+        'security/ir.model.access.csv',
+        'process_view.xml'
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0055447636669',
     'images': ['images/process_nodes.jpeg','images/process_transitions.jpeg', 'images/processes.jpeg'],
+    'js': [
+        'static/src/js/process.js'
+    ],
+    'css': [
+        'static/src/css/process.css'
+    ],
+    'qweb': [
+        'static/src/xml/*.xml'
+    ],
+    'auto_install': True
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/process/i18n/ar.po b/addons/process/i18n/ar.po
index e5134d74525..8a5f126e71d 100644
--- a/addons/process/i18n/ar.po
+++ b/addons/process/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/bg.po b/addons/process/i18n/bg.po
index 9e6f8f21bda..66c13322fa8 100644
--- a/addons/process/i18n/bg.po
+++ b/addons/process/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/bs.po b/addons/process/i18n/bs.po
index 6439f37092d..c10b5eec251 100644
--- a/addons/process/i18n/bs.po
+++ b/addons/process/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ca.po b/addons/process/i18n/ca.po
index a1019113dab..c9e1954edc7 100644
--- a/addons/process/i18n/ca.po
+++ b/addons/process/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/cs.po b/addons/process/i18n/cs.po
index 02537171919..d58bb06af4c 100644
--- a/addons/process/i18n/cs.po
+++ b/addons/process/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: process
diff --git a/addons/process/i18n/da.po b/addons/process/i18n/da.po
index 04fd54cc0ed..fad5eca1748 100644
--- a/addons/process/i18n/da.po
+++ b/addons/process/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/de.po b/addons/process/i18n/de.po
index 3fa40ce32a1..bdee54b7046 100644
--- a/addons/process/i18n/de.po
+++ b/addons/process/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/el.po b/addons/process/i18n/el.po
index 9b90b69d62f..e666c43ba4e 100644
--- a/addons/process/i18n/el.po
+++ b/addons/process/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/process/i18n/es.po b/addons/process/i18n/es.po
index 9cf7d6609fa..00a8ebf9cee 100644
--- a/addons/process/i18n/es.po
+++ b/addons/process/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/es_AR.po b/addons/process/i18n/es_AR.po
index 7eb543cb150..5cda4601671 100644
--- a/addons/process/i18n/es_AR.po
+++ b/addons/process/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/es_CL.po b/addons/process/i18n/es_CL.po
index 663b00ddbd1..5f064601063 100644
--- a/addons/process/i18n/es_CL.po
+++ b/addons/process/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/es_CR.po b/addons/process/i18n/es_CR.po
index 10264055135..661b67b25fe 100644
--- a/addons/process/i18n/es_CR.po
+++ b/addons/process/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: process
diff --git a/addons/process/i18n/et.po b/addons/process/i18n/et.po
index f6ee54d9661..a14a9235962 100644
--- a/addons/process/i18n/et.po
+++ b/addons/process/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/fi.po b/addons/process/i18n/fi.po
index a07415f418a..751d21f8eb5 100644
--- a/addons/process/i18n/fi.po
+++ b/addons/process/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/fr.po b/addons/process/i18n/fr.po
index 8e0fec604dd..4633ae18437 100644
--- a/addons/process/i18n/fr.po
+++ b/addons/process/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/gl.po b/addons/process/i18n/gl.po
index 14f15708157..811610889f8 100644
--- a/addons/process/i18n/gl.po
+++ b/addons/process/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/hi.po b/addons/process/i18n/hi.po
index 1537f6c998d..ed7527f27af 100644
--- a/addons/process/i18n/hi.po
+++ b/addons/process/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/hr.po b/addons/process/i18n/hr.po
index 43fb55ea5aa..a1878a44b27 100644
--- a/addons/process/i18n/hr.po
+++ b/addons/process/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: process
diff --git a/addons/process/i18n/hu.po b/addons/process/i18n/hu.po
index a1cbed92925..4a7782332f4 100644
--- a/addons/process/i18n/hu.po
+++ b/addons/process/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/id.po b/addons/process/i18n/id.po
index d66aa3321aa..9168119a01a 100644
--- a/addons/process/i18n/id.po
+++ b/addons/process/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/it.po b/addons/process/i18n/it.po
index 9d8fa80c621..d9288ea6620 100644
--- a/addons/process/i18n/it.po
+++ b/addons/process/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ja.po b/addons/process/i18n/ja.po
index 7580ef72dad..16d5c663b2d 100644
--- a/addons/process/i18n/ja.po
+++ b/addons/process/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ko.po b/addons/process/i18n/ko.po
index 6977dfef44d..f93a1267064 100644
--- a/addons/process/i18n/ko.po
+++ b/addons/process/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/lt.po b/addons/process/i18n/lt.po
index 3cf0cf45f22..dae1201cc66 100644
--- a/addons/process/i18n/lt.po
+++ b/addons/process/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/mn.po b/addons/process/i18n/mn.po
index 57c091066a3..95d5c094975 100644
--- a/addons/process/i18n/mn.po
+++ b/addons/process/i18n/mn.po
@@ -20,8 +20,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/nl.po b/addons/process/i18n/nl.po
index 2e9ef121465..ff201273ff3 100644
--- a/addons/process/i18n/nl.po
+++ b/addons/process/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
@@ -127,7 +127,7 @@ msgstr "Bron knooppunt"
 #: view:process.transition:0
 #: field:process.transition,transition_ids:0
 msgid "Workflow Transitions"
-msgstr "Werkschema transities"
+msgstr "Workflow transities"
 
 #. module: process
 #: field:process.transition.action,action:0
diff --git a/addons/process/i18n/nl_BE.po b/addons/process/i18n/nl_BE.po
index 950e905b553..7eee603d957 100644
--- a/addons/process/i18n/nl_BE.po
+++ b/addons/process/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/pl.po b/addons/process/i18n/pl.po
index eb555b337f3..e5229d875bb 100644
--- a/addons/process/i18n/pl.po
+++ b/addons/process/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/pt.po b/addons/process/i18n/pt.po
index b06ba6cdd9d..892994cceda 100644
--- a/addons/process/i18n/pt.po
+++ b/addons/process/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/pt_BR.po b/addons/process/i18n/pt_BR.po
index b810a37bc4a..0a6ec139087 100644
--- a/addons/process/i18n/pt_BR.po
+++ b/addons/process/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:36+0000\n"
 "PO-Revision-Date: 2012-07-28 19:10+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ro.po b/addons/process/i18n/ro.po
index 0afb72c73eb..e4c93f96d89 100644
--- a/addons/process/i18n/ro.po
+++ b/addons/process/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/ru.po b/addons/process/i18n/ru.po
index 82937f99254..c3995031662 100644
--- a/addons/process/i18n/ru.po
+++ b/addons/process/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sk.po b/addons/process/i18n/sk.po
index 04b090d5016..387d86ee963 100644
--- a/addons/process/i18n/sk.po
+++ b/addons/process/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sl.po b/addons/process/i18n/sl.po
index 1a589329811..82820e40e9b 100644
--- a/addons/process/i18n/sl.po
+++ b/addons/process/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sq.po b/addons/process/i18n/sq.po
index bbae821f8b3..2b2707d8bb8 100644
--- a/addons/process/i18n/sq.po
+++ b/addons/process/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sr.po b/addons/process/i18n/sr.po
index 7c0ab34f95a..519695a3e53 100644
--- a/addons/process/i18n/sr.po
+++ b/addons/process/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sr@latin.po b/addons/process/i18n/sr@latin.po
index 4a784c621ca..e5686d701e5 100644
--- a/addons/process/i18n/sr@latin.po
+++ b/addons/process/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/sv.po b/addons/process/i18n/sv.po
index 4f2c253edd2..675e4d0cae2 100644
--- a/addons/process/i18n/sv.po
+++ b/addons/process/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/tlh.po b/addons/process/i18n/tlh.po
index aba9dcc3307..0e79b53a768 100644
--- a/addons/process/i18n/tlh.po
+++ b/addons/process/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/tr.po b/addons/process/i18n/tr.po
index 8bd19a14eda..29837651ac8 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/uk.po b/addons/process/i18n/uk.po
index eec6a0a0608..283f385674a 100644
--- a/addons/process/i18n/uk.po
+++ b/addons/process/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/vi.po b/addons/process/i18n/vi.po
index 4ec121fac7d..07f7363f58a 100644
--- a/addons/process/i18n/vi.po
+++ b/addons/process/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/zh_CN.po b/addons/process/i18n/zh_CN.po
index c1b6faa96fd..12bd4509bf7 100644
--- a/addons/process/i18n/zh_CN.po
+++ b/addons/process/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/i18n/zh_TW.po b/addons/process/i18n/zh_TW.po
index 598fc6dd252..e2f6e3b3a9a 100644
--- a/addons/process/i18n/zh_TW.po
+++ b/addons/process/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:01+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: process
 #: model:ir.model,name:process.model_process_node
diff --git a/addons/process/process.py b/addons/process/process.py
index f9744608c50..fa7596287a3 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -195,8 +195,8 @@ class process_process(osv.osv):
             if nodes[nid].get('directory_id', False):
                 resource['directory'] = self.pool.get('document.directory').get_resource_path(cr, uid, nodes[nid]['directory_id'], ref_model, ref_id)
 
-            resource['name'] = refobj.name_get(context)[0][1]
-            resource['perm'] = pool.get(ref_model).perm_read(cr, uid, [ref_id], context)[0]
+            resource['name'] = pool.get(ref_model).name_get(cr, uid, [ref_id], context=context)[0][1]
+            resource['perm'] = pool.get(ref_model).perm_read(cr, uid, [ref_id], context=context)[0]
 
             for r in relatives:
                 node = nodes[r]
diff --git a/addons/process/static/src/css/process.css b/addons/process/static/src/css/process.css
new file mode 100644
index 00000000000..5f438622653
--- /dev/null
+++ b/addons/process/static/src/css/process.css
@@ -0,0 +1,70 @@
+
+a.cta-a {
+    float: left;
+    padding: 5px 10px;
+    border: 1px solid #ccc;
+    border-radius: 5px;
+    -moz-border-radius: 5px;
+    -webkit-border-radius: 5px;
+    background: #eeeded url(/process/static/src/img/cta-a.gif) repeat-x;
+    box-shadow: 0 1px 0 #fff;
+    -moz-box-shadow: 0 1px 0 #fff;
+    -webkit-box-shadow: 0 1px 0 #fff;
+    color: #8c8c8c;
+    font-size: 0.9em;
+    text-transform: uppercase;
+    font-weight: bold;
+    text-shadow: #fff 0 1px 0;
+    margin: 2px;
+}
+
+a.cta-a span {
+    float: left;
+    padding: 7px 0 5px 5px;
+    background-position: 0 50%;
+    background-repeat: no-repeat;
+    cursor: pointer;
+}
+
+a.cta-a strong {
+    display: block;
+    color: #393939;
+}
+.process-links {
+    padding: 5px 10px;
+    text-align: center;
+    display: table;
+    margin: auto;
+}
+.process-links a.cta-a {
+    display: table-cell;
+}
+.process_canvas{
+    border: 1px solid #aaa;
+    background-color:#FFF;
+}
+.process_canvas svg{
+    height:500px;
+    padding:15px;
+}
+.oe_process {
+    height: 20px;
+    margin-top:3px;
+    padding: 0;
+    width: 24px;
+    cursor: pointer;
+    display: block;
+    background: url(/web/static/src/img/iconset-a-help.png) no-repeat  center center;
+    float: left;
+}
+
+.process-help-text {
+    float: left;
+    padding:5px 10px;
+    min-height:56px;
+    font-size: 120%;
+}
+
+td.process_fields,button.toggle_fields span:last-child {
+    display: none;
+}
diff --git a/addons/process/static/src/img/button-a-a.png b/addons/process/static/src/img/button-a-a.png
new file mode 100644
index 00000000000..bd046bbbef7
Binary files /dev/null and b/addons/process/static/src/img/button-a-a.png differ
diff --git a/addons/process/static/src/img/cta-a.gif b/addons/process/static/src/img/cta-a.gif
new file mode 100644
index 00000000000..daa561e29f5
Binary files /dev/null and b/addons/process/static/src/img/cta-a.gif differ
diff --git a/addons/process/static/src/img/iconset-a-help.gif b/addons/process/static/src/img/iconset-a-help.gif
new file mode 100644
index 00000000000..5400acec57b
Binary files /dev/null and b/addons/process/static/src/img/iconset-a-help.gif differ
diff --git a/addons/process/static/src/img/node-current.png b/addons/process/static/src/img/node-current.png
new file mode 100644
index 00000000000..51f86b04c78
Binary files /dev/null and b/addons/process/static/src/img/node-current.png differ
diff --git a/addons/process/static/src/img/node-gray.png b/addons/process/static/src/img/node-gray.png
new file mode 100644
index 00000000000..972013540cf
Binary files /dev/null and b/addons/process/static/src/img/node-gray.png differ
diff --git a/addons/process/static/src/img/node-subflow-gray.png b/addons/process/static/src/img/node-subflow-gray.png
new file mode 100644
index 00000000000..ffafe1bd681
Binary files /dev/null and b/addons/process/static/src/img/node-subflow-gray.png differ
diff --git a/addons/process/static/src/img/node-subflow.png b/addons/process/static/src/img/node-subflow.png
new file mode 100644
index 00000000000..fd2a480204d
Binary files /dev/null and b/addons/process/static/src/img/node-subflow.png differ
diff --git a/addons/process/static/src/img/node.png b/addons/process/static/src/img/node.png
new file mode 100644
index 00000000000..853ac85cd56
Binary files /dev/null and b/addons/process/static/src/img/node.png differ
diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
new file mode 100644
index 00000000000..73ca4396ce6
--- /dev/null
+++ b/addons/process/static/src/js/process.js
@@ -0,0 +1,250 @@
+openerp.process = function (instance) {
+var QWeb = instance.web.qweb,
+      _t = instance.web._t;
+instance.web.ViewManager.include({
+    start: function() {
+        var self = this;
+        var _super = this._super();
+        this.process_help = this.action ? this.action.help : '';
+        if(this.action) {
+            this.process_model = this.action.res_model;
+        } else {
+            this.process_model = this.dataset.model;
+        }
+        this.$el.on('click', '.oe_process', function(ev) { self.initialize_process_view(ev);});
+        return _super;
+    },
+    initialize_process_view: function(ev) {
+        var self = this;
+        this.record_id = false;
+        if(this.active_view == 'form') {
+            this.record_id = this.views[this.active_view].controller.datarecord.id;
+        }
+        this.process_get_object().then(function(process) {
+            if(process && process.length) {
+                if(process.length > 1) {
+                    self.process_selection = process;
+                } else {
+                    self.process_id = process[0][0],
+                    self.process_title = process[0][1];
+                }
+            }
+            return $.Deferred().resolve();
+        }).then(function() {
+            var def = $.Deferred();
+            if(self.process_id) {
+                $.when(self.process_graph_get()).done(function(res) {
+                    self.process_notes = res.notes;
+                    self.process_title = res.name;
+                    self.process_subflows = _(res.nodes).chain()
+                          .filter(function (node) { return node['subflow'] !== false; })
+                          .uniq(false, function (node) { return node['subflow'][0]; }).value();
+                    self.process_related = res.related;
+                    def.resolve(res);
+                });
+            } else def.resolve();
+            return def.promise();
+        }).done(function(res) {
+            $.when(self.process_render_view()).done(function() {
+                if(res) {
+                    self.process_draw_graph(res);
+                }
+            });
+        });
+    },
+    process_graph_get: function() {
+        var self = this;
+        var def = $.Deferred();
+        this.process_id = parseInt(this.process_id, 10);
+        this.process_dataset
+        .call("graph_get",[self.process_id, self.model || self.dataset.model, self.record_id, [80,80,150,100], self.session.user_context])
+        .done(function(res) {
+            self.process_dataset
+                .call("search_by_model",[self.model || self.dataset.model, self.session.user_context])
+                .done(
+                function(r) {
+                    res['related'] = r;
+                    def.resolve(res);
+                });
+        });
+        return def.promise();
+    },
+    process_get_object : function() {
+        var self = this,
+            def = $.Deferred();
+        if(this.process_id)
+            return def.resolve().promise();
+        this.process_dataset = new instance.web.DataSet(self, "process.process", self.session.user_context);
+        this.process_dataset
+        .call("search_by_model", [self.process_model,self.session.user_context])
+        .done(function(res) {
+            if (!res.length) {
+                self.process_model = false;
+                self.process_get_object().done(def.resolve);
+            }
+            else {
+                def.resolve(res);
+            }
+        })
+        .fail(def.reject);
+        return def.promise();
+    },
+    process_render_view : function() {
+        var self = this;
+        this.$el.html(QWeb.render("process.ProcessView", this));
+        this.$el.addClass('oe_view_process').css({'background-color':'#F0EEEE'});
+        this.$el.find('#edit_process').click(function() {
+            self.process_edit_view();
+        });
+        var $parent = this.getParent().$el;
+        $parent.find('#change_process').click(function() {
+            self.process_selection = false,
+            self.process_id = $parent.find('#select_process').val(),
+            self.process_title = $.trim($parent.find('#select_process option:selected').text());
+            self.initialize_process_view();
+        });
+        this.$el.find(".process_subflow").click(function() {
+            self.process_id = this.id;
+            self.initialize_process_view();
+        });
+    },
+    process_draw_graph : function(result) {
+        var self = this;
+        var res_nodes = result['nodes'];
+        var res_edges = result['transitions'];
+        var id_to_node = {};
+        var canvas = $('div.process_canvas').empty().get(0);
+        var style = {
+            edge_color: "#A0A0A0",
+            edge_label_font_size: 10,
+            edge_width: 2,
+            edge_spacing: 40,
+            edge_loop_radius: 200,
+
+            node_label_color: "#333",
+            node_label_font_size: 12,
+            node_outline_color: "#333",
+            node_outline_width: 1,
+            node_outline_color: "#F5F5F5",
+            node_outline_width: 0,
+            node_selected_width: 0,
+            node_size_x: 150,
+            node_size_y: 100,
+
+            gray: "#DCDCDC",
+            white: "#FFF",
+            viewport_margin: 50
+        };
+        var r  = new Raphael(canvas,'100%','100%');
+        var graph  = new CuteGraph(r,style,canvas.parentNode);
+        var render_process = function(r,nodes){
+            //For Image 
+            var image_node = nodes.kind == "subflow" ? "node-subflow" : "node";
+            image_node = nodes.gray ? image_node + "-gray" : image_node;
+            image_node = nodes.active ? 'node-current': image_node;
+            var img_src = '/process/static/src/img/'+ image_node + '.png';
+            var image = r['image'](img_src, nodes.x-25, nodes.y,150, 100).attr({"cursor": "default"}) .mousedown(function() { return false; });
+            //For Node
+            var process_node = r['rect'](nodes.x, nodes.y, 150, 150).attr({stroke: "none"});
+            // Node text
+            if(nodes.name.length > 18){
+               var text = nodes.name.substr(0,16) + '...'
+            }
+            var node_text =  r.text(nodes.x+60, nodes.y+10,(text || nodes.name.substr(0,18))).attr({"fill": "#fff","font-weight": "bold", "cursor": "default","title":nodes.name});
+            //Node Description
+            var new_notes = nodes.notes;
+            if(nodes.notes.length > 25) {
+               var to;
+               var temp_str = new_notes = '';
+               var from = to = 0;
+               while (1) {
+                 from = 25;
+                 temp_str = nodes.notes.substr(to, 25);
+                 if (temp_str.lastIndexOf(" ") < 25 && temp_str.length >= 25) {
+                      from = temp_str.lastIndexOf(" ");
+                 }
+                 new_notes += "\n" + nodes.notes.substr(to, from);
+                 if (new_notes.length > 80){
+                     break;
+                 }
+                 to += from;
+              }
+            }
+            if(nodes.res)
+                 new_notes = nodes.res.name + '\n' + new_notes;
+            if(nodes.notes.length > 60){
+                var notes = new_notes.substring(0,60) +'..';
+            }
+            r.text(nodes.x+60, nodes.y+30, (notes || new_notes)).attr({"title":nodes.notes,"cursor": "default"});
+            r['image']('/web/static/src/img/icons/gtk-info.png', nodes.x, nodes.y+75, 16, 16)
+              .attr({"cursor": "pointer", "title": "Help"})
+              .click(function() {
+                   window.open(nodes.url || "http://doc.openerp.com/v6.1/index.php?model=" + nodes.model);
+              });
+            if(nodes.menu) {
+                 r['image']('/web/static/src/img/icons/gtk-jump-to.png', nodes.x+100, nodes.y+75, 16, 16)
+                    .attr({"cursor": "pointer", "title": nodes.menu.name})
+                    .click(function() {
+                        self.process_jump_to_view(nodes.res_model, nodes.menu.id);
+                 });
+            }
+            var process_set =r.set().push(process_node);
+            process_set.mousedown(function() {
+                    return false;
+            });
+            return process_set;
+        }
+        _.each(res_nodes, function(node,id) {
+            node['res_model'] = self.model,
+            node['res_id'] = false,
+            node['color'] = 'gray'
+            var n = new CuteNode(
+                graph,
+                node.x + 50,  //FIXME the +50 should be in the layout algorithm
+                node.y + 50,
+                CuteGraph.wordwrap("", 14));
+            n.id = id;
+            id_to_node[id] = n;
+            return render_process(r,node);
+        });
+        _.each(res_edges, function(edge) {
+            var e =  new CuteEdge(
+                graph,
+                CuteGraph.wordwrap(" ",0),
+                id_to_node[edge.source],
+                id_to_node[edge.target] || id_to_node[edge.source]);
+            e.id = edge.id;
+        });
+    },
+    process_jump_to_view: function(model,id) {
+        var self = this;
+        var dataset = new instance.web.DataSet(this, 'ir.values', this.session.user_context);
+        var action_manager = new instance.web.ActionManager(self);
+        dataset.call('get',
+            ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context]).done(function(res) {
+                var action = res[0][res[0].length - 1];
+                self.rpc("/web/action/load", {
+                    action_id: action.id,
+                    context: dataset.context
+                    }).done(function(result) {
+                        action_manager.replace(self.$el);
+                        action_manager.do_action(result.result);
+                    })
+            });
+    },
+    process_edit_view: function() {
+        var self = this;
+        var pop = new instance.web.form.FormOpenPopup(self);
+        pop.show_element(
+            self.process_dataset.model,
+            self.process_id,
+            self.context || self.dataset.context,
+            {
+                title: _t('Process')
+            });
+        var form_controller = pop.view_form;
+        pop.on('write_completed', self, self.initialize_process_view);
+    }
+});
+};
+// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:
diff --git a/addons/process/static/src/xml/process.xml b/addons/process/static/src/xml/process.xml
new file mode 100644
index 00000000000..d6229b686f3
--- /dev/null
+++ b/addons/process/static/src/xml/process.xml
@@ -0,0 +1,93 @@
+<template>
+<!-- vim:fdl=1:
+-->
+<t t-extend="ViewManagerAction">
+    <t t-jquery="h2.oe_view_title" t-operation="after">
+        <t t-if="widget.session.debug &amp;&amp; widget.flags.display_title !== false">
+            <a class="oe_process" title="Process View" href="javascript: void(0)"></a>
+        </t>
+    </t>
+</t>
+<t t-name="process.ProcessView">
+    <table class="view" border="0" width="auto" height="auto" cellpadding="0" cellspacing="0">
+        <tr>
+            <td width="70%" valign="top" class="fields collapsed">
+                <div class="oe_view_manager oe_view_manager_current">
+                   <div class="oe_view_manager_header" style="padding: 8px;">
+                       <div class="oe_header_row">
+                            <h2 class="oe_view_title">
+                                <span class="oe_view_title_text oe_breadcrumb_title"><t t-esc="action.name"/> (<a t-attf-href="http://doc.openerp.com/v6.1/index.php?model=#{action.res_model}"><t t-esc="action.res_model"/></a>)</span>
+                            </h2>
+                       </div>
+                    </div>
+                </div>
+            </td>
+        </tr>
+        <tr>
+            <td style="padding-left:10px;">
+                <p><t t-raw="process_help"/></p>
+            </td>
+        </tr>
+        <tr>
+            <td style="padding-left:10px;">
+                <h2> <t t-esc="process_title"/> Process </h2>
+                <t t-if="process_notes">
+                    <p>
+                        <strong>Notes:</strong> <t t-esc="process_notes"/>
+                    </p>
+                    <p>
+                        <strong>Last modified by:</strong> N/A
+                    </p>
+                    <t t-if="process_subflows.length">
+                        <strong>Subflows:</strong>
+                        <t t-foreach="process_subflows" t-as="subflow">
+                            <t t-if="subflow.subflow[0] != process_id">
+                                <p>
+                                    <a class="oe_bold process_subflow" t-att-id="subflow.subflow[0]" href="javascript: void(0)">
+                                        <t t-esc="subflow.subflow[1]"/>
+                                    </a>
+                                </p>
+                            </t>
+                        </t>
+                    </t>
+                    <t t-if="process_related.length and process_related[0][0] != process_id">
+                        <strong>Related:</strong>
+                        <p>
+                            <a class="oe_bold process_subflow" t-att-id="process_related[0][0]" href="javascript: void(0)">
+                                <t t-esc="process_related[0][1]"/>
+                            </a>
+                        </p>
+                    </t>
+                </t>
+            </td>
+        </tr>
+        <tr t-if="process_selection">
+            <td style="padding-left:10px;">
+                <fieldset>
+                    <legend>
+                        Select Process
+                        </legend>
+                    <select id="select_process">
+                        <t t-foreach="process_selection" t-as="prc">
+                            <option t-att-value="prc[0]">
+                                <t t-esc="prc[1]"/>
+                            </option>
+                        </t>
+                    </select>
+                    <button class="oe_button oe_highlight" id="change_process">Select</button>
+                </fieldset>
+            </td>
+        </tr>
+        <tr t-if="process_id">
+            <td>
+                <div class="process_canvas"></div>
+            </td>
+        </tr>
+        <tr t-if="process_id">
+            <td style="padding-left:10px;">
+                <button class="oe_button oe_highlight" id="edit_process">Edit Process</button>
+            </td>
+        </tr>
+    </table>
+</t>
+</template>
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index f401b42c596..48569fa76c4 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -21,13 +21,13 @@
 
 
 {
-    "name" : "Procurements",
-    "version" : "1.0",
-    "author" : "OpenERP SA",
-    "website" : "http://www.openerp.com",
-    "category" : "Hidden/Dependency",
-    "depends" : ["base","process", "product", "stock"],
-    "description": """
+    'name' : 'Procurements',
+    'version' : '1.0',
+    'author' : 'OpenERP SA',
+    'website' : 'http://www.openerp.com',
+    'category' : 'Hidden/Dependency',
+    'depends' : ['base','process', 'product', 'stock'],
+    'description': """
 This is the module for computing Procurements.
 ==============================================
 
@@ -43,8 +43,7 @@ for the product which needs replenishment. This procurement will start a
 task, either a purchase order form for the supplier, or a production order
 depending on the product's configuration.
     """,
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'security/procurement_security.xml',
         'procurement_data.xml',
@@ -55,14 +54,13 @@ depending on the product's configuration.
         'procurement_view.xml',
         'procurement_workflow.xml',
         'process/procurement_process.xml',
-        "company_view.xml",
+        'company_view.xml',
         'board_mrp_procurement_view.xml',
     ],
-    'demo_xml': ['stock_orderpoint.xml'],
+    'demo': ['stock_orderpoint.xml','procurement_demo.xml'],
     'test': ['test/procurement.yml'],
     'installable': True,
-    'auto_install': False,
-    'certificate': '00954248826881074509',
+    'auto_install': True,
     'images': ['images/compute_schedulers.jpeg','images/config_companies_sched.jpeg', 'images/minimum_stock_rules.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml
index a01ec168efa..bb1b5e62d82 100644
--- a/addons/procurement/board_mrp_procurement_view.xml
+++ b/addons/procurement/board_mrp_procurement_view.xml
@@ -15,9 +15,9 @@
             <field name="model">board.board</field>
             <field name="inherit_id" ref="stock.board_warehouse_form"/>
             <field name="arch" type="xml">
-              <xpath expr="/form/board/column/action[@string='Incoming Shipments']" position="before">
-                <action name="%(procurement_action_board)d" string="Procurements in Exception"/>
-            </xpath>
+                <xpath expr="//column" position="inside">
+                    <action name="%(procurement_action_board)d" string="Procurements in Exception"/>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/procurement/company.py b/addons/procurement/company.py
index d544181a6e8..9d064c0e649 100644
--- a/addons/procurement/company.py
+++ b/addons/procurement/company.py
@@ -30,9 +30,9 @@ class company(osv.osv):
             "today and today+range are skipped for future computation."),
     }
     _defaults = {
-        'schedule_range': 80.0,
+        'schedule_range': 730.0,
     }
 
 company()
 
-# 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/procurement/i18n/ar.po b/addons/procurement/i18n/ar.po
index 507978d09ed..c5b820dd824 100644
--- a/addons/procurement/i18n/ar.po
+++ b/addons/procurement/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/bg.po b/addons/procurement/i18n/bg.po
index 333fd211e61..a1f8fc79f48 100644
--- a/addons/procurement/i18n/bg.po
+++ b/addons/procurement/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/ca.po b/addons/procurement/i18n/ca.po
index 07c9ea2ad99..47a013c9052 100644
--- a/addons/procurement/i18n/ca.po
+++ b/addons/procurement/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/cs.po b/addons/procurement/i18n/cs.po
index 392a9468534..476e3b1cd56 100644
--- a/addons/procurement/i18n/cs.po
+++ b/addons/procurement/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/da.po b/addons/procurement/i18n/da.po
index c9b070c086f..bb58992366e 100644
--- a/addons/procurement/i18n/da.po
+++ b/addons/procurement/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/de.po b/addons/procurement/i18n/de.po
index 62855d475d1..62b933ebdb5 100644
--- a/addons/procurement/i18n/de.po
+++ b/addons/procurement/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index cc51723d9c7..f0a41a99b90 100644
--- a/addons/procurement/i18n/es.po
+++ b/addons/procurement/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/es_CL.po b/addons/procurement/i18n/es_CL.po
index 5c04fd1a7ef..2ab2cb1bde7 100644
--- a/addons/procurement/i18n/es_CL.po
+++ b/addons/procurement/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/es_CR.po b/addons/procurement/i18n/es_CR.po
index 71322acb17a..d5611dfe2d4 100644
--- a/addons/procurement/i18n/es_CR.po
+++ b/addons/procurement/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/es_EC.po b/addons/procurement/i18n/es_EC.po
index f786b1fd5d4..1b5a806cae3 100644
--- a/addons/procurement/i18n/es_EC.po
+++ b/addons/procurement/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/fi.po b/addons/procurement/i18n/fi.po
index cf331c1ca93..48163998595 100644
--- a/addons/procurement/i18n/fi.po
+++ b/addons/procurement/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/fr.po b/addons/procurement/i18n/fr.po
index 2999f85a49d..4e9359059fd 100644
--- a/addons/procurement/i18n/fr.po
+++ b/addons/procurement/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -313,7 +313,7 @@ msgstr "Meilleur Prix (pas encore actif!)"
 #: code:addons/procurement/schedulers.py:111
 #, python-format
 msgid "PROC %d: from stock - %3.2f %-5s - %s"
-msgstr ""
+msgstr "APPR %d: sur stock - %3.2f %-5s - %s"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -515,6 +515,8 @@ msgstr "plus"
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
 msgstr ""
+"Vous ne pouvez pas déplacer de produits depuis ou vers un emplacement de "
+"type \"vue\"."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,active:0
@@ -677,7 +679,7 @@ msgstr "Maximum à commander"
 #. module: procurement
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "La référence doit être unique par société !"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
@@ -920,7 +922,7 @@ msgstr ""
 #. module: procurement
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Le nom de la société doit être unique !"
 
 #. module: procurement
 #: field:mrp.property,name:0
@@ -1017,7 +1019,7 @@ msgstr "Détails de l'approvisionnement"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement started late"
-msgstr ""
+msgstr "L'approvisionnement a commencé en retard"
 
 #. module: procurement
 #: constraint:product.product:0
@@ -1034,7 +1036,7 @@ msgstr "PLANIFICATEUR"
 #: code:addons/procurement/schedulers.py:88
 #, python-format
 msgid "PROC %d: on order - %3.2f %-5s - %s"
-msgstr ""
+msgstr "APPR %d: sur commande - %3.2f %-5s - %s"
 
 #~ msgid "The procurement quantity will by rounded up to this multiple."
 #~ msgstr ""
diff --git a/addons/procurement/i18n/gl.po b/addons/procurement/i18n/gl.po
index 8f53c3327d4..38f9cd0e6b6 100644
--- a/addons/procurement/i18n/gl.po
+++ b/addons/procurement/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/hr.po b/addons/procurement/i18n/hr.po
index 38e767eb578..8b17f6c8aa4 100644
--- a/addons/procurement/i18n/hr.po
+++ b/addons/procurement/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/hu.po b/addons/procurement/i18n/hu.po
index eed50010ee7..6364595a7d8 100644
--- a/addons/procurement/i18n/hu.po
+++ b/addons/procurement/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/id.po b/addons/procurement/i18n/id.po
index 8e00f95b23f..3f67e574591 100644
--- a/addons/procurement/i18n/id.po
+++ b/addons/procurement/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/it.po b/addons/procurement/i18n/it.po
index 91c44b3ade4..44885c2a7ce 100644
--- a/addons/procurement/i18n/it.po
+++ b/addons/procurement/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/ja.po b/addons/procurement/i18n/ja.po
index 1a9b972920a..c69443dd0dd 100644
--- a/addons/procurement/i18n/ja.po
+++ b/addons/procurement/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index 48388307394..a24e21c11a5 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -24,7 +24,7 @@ msgstr "Шинэ бараа асуух"
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
 msgid "Schedulers"
-msgstr "Товлогчууд"
+msgstr "Төлөвлөгч"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_make_procurement
@@ -82,7 +82,7 @@ msgstr "Зохистой нөөцийн дүрмийг хангах"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Temporary Procurement Exceptions"
-msgstr "Түр зуурын татан авалтын сондгойролууд"
+msgstr "Татан авалтын түр саатал"
 
 #. module: procurement
 #: field:procurement.order,company_id:0
@@ -159,7 +159,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Permanent Procurement Exceptions"
-msgstr "Байнгын Татан авалтын Сондгойролууд"
+msgstr "Татан авалтын хугацаагүй саатал"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -213,14 +213,14 @@ msgid ""
 msgstr ""
 "Татан авалт товлолтын тайлан.\n"
 "\n"
-"        Эхлэлийн цаг: %s \n"
-"        Төгсгөлийн цаг: %s \n"
+"        Эхэлсэн цаг: %s \n"
+"        Дууссан цаг: %s \n"
 "        Боловсруулагдсан бүх татан авалт: %d \n"
-"        Сондгойрсон татан авалт: %d \n"
+"        Саатсан татан авалт: %d \n"
 "        Алгассан татан авалт (товлосон огноо нь товлогчийн хамрах хүрээнээс "
 "гадна) %d \n"
 "\n"
-"        Сондгойрол:\n"
+"        Саатал:\n"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -276,7 +276,7 @@ msgstr "Алдаа! Тойрог хамааралтай компани үүсг
 #: code:addons/procurement/procurement.py:386
 #, python-format
 msgid "Procurement '%s' is in exception: "
-msgstr "Татан авалт '%s'-н сондгойрол: "
+msgstr "Татан авалт '%s' саатав: "
 
 #. module: procurement
 #: field:procurement.order,priority:0
@@ -449,7 +449,7 @@ msgstr "Засах"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Exceptions"
-msgstr "Сондгойролууд"
+msgstr "Саатлууд"
 
 #. module: procurement
 #: model:process.node,note:procurement.process_node_serviceonorder0
@@ -613,7 +613,7 @@ msgstr "Товлосон огноо"
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Exception"
-msgstr "Сондгойрол"
+msgstr "Саатал"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:381
@@ -788,7 +788,7 @@ msgstr "Дэлгэрэнгүй"
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
 #: view:procurement.order:0
 msgid "Procurement Exceptions"
-msgstr "Татан авалтын Сондгойрол"
+msgstr "Татан авалтын саатал"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
@@ -970,9 +970,9 @@ msgstr ""
 "баримтууд). Татан авалтын тохиргоонуудаас хамааран татан авалтын систем нь "
 "барааг агуулахаас татах, нийлүүлэгчээс худалдаж авах, үйлдвэрлэлийн захиалга "
 "үүсгэх зэрэгээр хангахыг эрмэлздэг. Систем яаж хангах аргаа олохгүй "
-"тохиолдолд Татан авалтын сондгойрол үүсдэг. Зарим сондгойрол нь өөрөө аяндаа "
+"тохиолдолд Татан авалтын саатал үүсдэг. Зарим саатал нь өөрөө аяндаа "
 "шийдэгддэг, гэхдээ зарим нь гараар шийдвэрлэхийг шаарддаг (эдгээр нь тусгай "
-"алдааны мэдэгдлээр танигддаг)"
+"алдааны мэдэгдлээр ялгагдана)"
 
 #. module: procurement
 #: field:procurement.order,product_uom:0
diff --git a/addons/procurement/i18n/nb.po b/addons/procurement/i18n/nb.po
index 10c09e2c5a9..373979532a1 100644
--- a/addons/procurement/i18n/nb.po
+++ b/addons/procurement/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/nl.po b/addons/procurement/i18n/nl.po
index 460b289bede..29f24a6f8b8 100644
--- a/addons/procurement/i18n/nl.po
+++ b/addons/procurement/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-19 13:37+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:31+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -78,7 +78,7 @@ msgstr "Geen adres gedefinieerd voor de leverancier"
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
 msgid "Compute Stock Minimum Rules Only"
-msgstr "Alleen minimum voorraadregels berekenen"
+msgstr "Alleen minimale voorraadregels berekenen"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -152,7 +152,7 @@ msgstr ""
 "Nadat een verwerving is gemaakt is de status ingesteld op 'Concept'.\n"
 "Als de verwerving is bevestigd, gaat de status naar 'Bevestigd'.            "
 "\n"
-"Na bevestiging gaat de status naar 'Loopt'.\n"
+"Na bevestiging gaat de status naar 'In behandeling'.\n"
 "Als er een fout optreedt in de order gaat de status naar 'Fout'.\n"
 "Als de uitzondering is verwijderd gaat de status naar 'Gereed'.\n"
 "De status is 'Wachtend' als de verwerving wacht op het afronden van een "
@@ -196,7 +196,7 @@ msgstr "Gereed"
 #. module: procurement
 #: field:procurement.order.compute.all,automatic:0
 msgid "Automatic orderpoint"
-msgstr "Automatisch bestelpunt"
+msgstr "Minimale voorraadregel toepassen"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:123
@@ -279,7 +279,7 @@ msgstr "Fout! U kunt geen recursieve bedrijven aanmaken."
 #: code:addons/procurement/procurement.py:386
 #, python-format
 msgid "Procurement '%s' is in exception: "
-msgstr "Verwerving '%s' is in fout: "
+msgstr "Bij de verwerving van '%s' is een probleem ontstaan: "
 
 #. module: procurement
 #: field:procurement.order,priority:0
@@ -355,9 +355,9 @@ msgstr ""
 "Een verwervingsopdracht wordt gebruikt om een behoefte vast te leggen voor "
 "een specifiek product op een specifieke locatie. Een verwervingsopdracht "
 "wordt gewoonlijk automatisch gemaakt vanuit de verkooporders, een logistieke "
-"haalregel of minimum voorraadregels. Als de verwervingsopdracht is bevestigd "
-"maakt het automatisch de noodzakelijke bewerkingen om de behoefte te "
-"vervullen: inkoopvoorstel, productieorder, etc."
+"haalregel of minimale voorraadregels. Als de verwervingsopdracht is "
+"bevestigd maakt het automatisch de noodzakelijke bewerkingen om de behoefte "
+"te vervullen: inkoopvoorstel, productieorder, etc."
 
 #. module: procurement
 #: field:make.procurement,date_planned:0
@@ -379,7 +379,7 @@ msgstr "Aantal"
 #: code:addons/procurement/procurement.py:379
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
-msgstr "Onvoldoende voorraad en geen minimum bestelpunt gedefinieerd."
+msgstr "Onvoldoende voorraad en geen minimale voorraadregel gedefinieerd."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -396,7 +396,7 @@ msgstr "Referenties"
 #: view:product.product:0
 #: field:product.product,orderpoint_ids:0
 msgid "Minimum Stock Rule"
-msgstr "Minimum voorraadregel"
+msgstr "Minimale voorraadregel"
 
 #. module: procurement
 #: view:res.company:0
@@ -430,7 +430,7 @@ msgstr "Automatische verwervingen"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_max_qty:0
 msgid "Max Quantity"
-msgstr "Max hoeveelheid"
+msgstr "Max. hoeveelheid"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order
@@ -501,7 +501,7 @@ msgstr "Gekoppelde verwervingsopdrachten"
 msgid ""
 "Wizard checks all the stock minimum rules and generate procurement order."
 msgstr ""
-"Assistent controleert alle minimum voorraadregels en genereert "
+"Wizard controleert alle minimale voorraadregels en genereert "
 "verwervingsopdracht."
 
 #. module: procurement
@@ -532,15 +532,15 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
 msgstr ""
-"Als het actief veld uit staat, kunt u het bestelpunt verbergen zonder deze "
-"te verwijderen."
+"Als het actief veld uit staat, kunt u de minimale voorraadregel verbergen "
+"zonder deze te verwijderen."
 
 #. module: procurement
 #: help:procurement.orderpoint.compute,automatic:0
 msgid "If the stock of a product is under 0, it will act like an orderpoint"
 msgstr ""
 "Als de voorraad van een product negatief wordt, gedraagt het zich als een "
-"bestelpunt"
+"minimale voorraadregel."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -636,12 +636,12 @@ msgstr "Automatisch BP: %s"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr "Automatisch bestelpunt"
+msgstr "Minimale voorraadregel toepassen"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
 msgid "Minimum Inventory Rule"
-msgstr "Minimum voorraadregel"
+msgstr "Minimale voorraadregel"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
@@ -807,7 +807,7 @@ msgstr "Verwervingsfouten"
 #: view:product.product:0
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules"
-msgstr "Minimum voorraadregels"
+msgstr "Minimale  voorraadregels"
 
 #. module: procurement
 #: field:procurement.order,close_move:0
@@ -857,7 +857,7 @@ msgstr "Aantal regels"
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Running"
-msgstr "Loopt"
+msgstr "In behandeling"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_uom:0
@@ -889,10 +889,10 @@ msgid ""
 "will generate a procurement request to increase the stock up to the maximum "
 "quantity."
 msgstr ""
-"U kunt uw minimum voorraadregels definiëren zodat OpenERP automatisch "
+"U kunt uw minimale voorraadregels definiëren zodat OpenERP automatisch "
 "concept productieorders or inkoopoffertes maakt volgens het voorraad niveau. "
 "Zodra de virtuele voorraad van een product (= fysieke voorraad minus alle "
-"bevestigde orders en reserveringen) onder de minimum hoeveelheid komt, "
+"bevestigde orders en reserveringen) onder de minimale hoeveelheid komt, "
 "genereert OpenERP een verwervingsopdracht op de voorraad te verhogen naar de "
 "maximum hoeveelheid."
 
@@ -1017,7 +1017,7 @@ msgstr "Zeer urgent"
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr "Automatisch bestelpunt"
+msgstr "Minimale voorraadregel toepassen"
 
 #. module: procurement
 #: view:procurement.order:0
diff --git a/addons/procurement/i18n/pl.po b/addons/procurement/i18n/pl.po
index d9d5c277fe6..e46f291c6cd 100644
--- a/addons/procurement/i18n/pl.po
+++ b/addons/procurement/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/pt.po b/addons/procurement/i18n/pt.po
index 0eac1cb44a8..25724130dfc 100644
--- a/addons/procurement/i18n/pt.po
+++ b/addons/procurement/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/pt_BR.po b/addons/procurement/i18n/pt_BR.po
index 4c65ccd6dff..b9c1100c6f0 100644
--- a/addons/procurement/i18n/pt_BR.po
+++ b/addons/procurement/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -41,8 +41,8 @@ msgid ""
 msgstr ""
 "Inicia uma ordem de compra automática para todos os produtos que tem estoque "
 "virtual menor que 0 (zero). Provavelmente você não deve usar essa opção, "
-"sugerimos usar uma configuração MTO (make-to-order; produzir contra pedido) "
-"em todos os produtos."
+"sugerimos usar uma configuração MTO (make-to-order; adquirir sempre) em "
+"todos os produtos."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -63,7 +63,7 @@ msgstr "Nenhum fornecedor definido para este produto!"
 #. module: procurement
 #: field:make.procurement,uom_id:0
 msgid "Unit of Measure"
-msgstr "Unidade de Medida"
+msgstr "Unidade de Medida - UdM"
 
 #. module: procurement
 #: field:procurement.order,procure_method:0
@@ -84,7 +84,7 @@ msgstr "Somente calcula \"regras de estoque mínimo\""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Temporary Procurement Exceptions"
-msgstr ""
+msgstr "Exceções Temporárias de Aquisições"
 
 #. module: procurement
 #: field:procurement.order,company_id:0
@@ -106,7 +106,7 @@ msgstr "Motivo"
 #. module: procurement
 #: view:procurement.order.compute:0
 msgid "Compute Procurements"
-msgstr "Calcular Compras"
+msgstr "Calcular Aquisições"
 
 #. module: procurement
 #: field:procurement.order,message:0
@@ -151,18 +151,18 @@ msgid ""
 " It is in 'Waiting'. state when the procurement is waiting for another one "
 "to finish."
 msgstr ""
-"Quando uma aquisição é criada seu status será 'Provisório'.\n"
-" Se a aquisição for confirmada, o status será 'Confirmado'.            \n"
-"Após a confirmação o status será 'Processando'.\n"
-" Se algum problema ocorrer no pedido, entao o status será 'Excessão'.\n"
-" Se o problema for removido o status se torna 'Pronto'.\n"
-" O status será 'Aguardando' quando a aquisição estiver esperando outra "
+"Quando uma aquisição é criada sua situação será 'Provisório'.\n"
+" Se a aquisição for confirmada, a situação será 'Confirmado'.            \n"
+"Após a confirmação a situação será 'Processando'.\n"
+" Se algum problema ocorrer no pedido, então a situação será 'Excessão'.\n"
+" Se o problema for removido a situação se torna 'Pronto'.\n"
+" A situação será 'Aguardando' quando a aquisição estiver esperando outra "
 "finalizar."
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Permanent Procurement Exceptions"
-msgstr ""
+msgstr "Excessões Permanentes de Aquisições"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -214,6 +214,15 @@ msgid ""
 "\n"
 "        Exceptions:\n"
 msgstr ""
+"Aqui está o relatório de programação aquisições.\n"
+"\n"
+"        Data Inicial: %s \n"
+"        Data Final: %s \n"
+"        Total de aquisições processadas: %d \n"
+"        Aquisições com excessões: %d \n"
+"        Aquisições ignoradas (agendada fora do período programado) %d \n"
+"\n"
+"        Excessões:\n"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -232,6 +241,9 @@ msgid ""
 "procurement to bring the virtual stock to the Quantity specified as Max "
 "Quantity."
 msgstr ""
+"Quando o estoque virtual fica abaixo da quantidade mínima, O OpenERP gera "
+"uma aquisição para trazer o estoque virtual para a quantidade especificada "
+"como Quantidade máx."
 
 #. module: procurement
 #: view:procurement.order.compute:0
@@ -261,13 +273,13 @@ msgstr "Pedidos de Aquisição para Processar"
 #. module: procurement
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr "Erro! Você não pode criar empresas recursivas"
+msgstr "Erro! Você não pode criar empresas recursivas."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:386
 #, python-format
 msgid "Procurement '%s' is in exception: "
-msgstr ""
+msgstr "Aquisição '%s' possui uma excessão: "
 
 #. module: procurement
 #: field:procurement.order,priority:0
@@ -278,14 +290,14 @@ msgstr "Prioridade"
 #: view:procurement.order:0
 #: field:procurement.order,state:0
 msgid "State"
-msgstr "Estado"
+msgstr "Situação"
 
 #. module: procurement
 #: field:procurement.order,location_id:0
 #: view:stock.warehouse.orderpoint:0
 #: field:stock.warehouse.orderpoint,location_id:0
 msgid "Location"
-msgstr "Local"
+msgstr "Localização"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_picking
@@ -308,7 +320,7 @@ msgstr "Melhor preço (não disponível ainda!)"
 #: code:addons/procurement/schedulers.py:111
 #, python-format
 msgid "PROC %d: from stock - %3.2f %-5s - %s"
-msgstr ""
+msgstr "Aquisição %d: a partir do estoque - %3.2f %-5s - %s"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -323,7 +335,7 @@ msgstr "Processar Aquisição"
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
-msgstr "Compras"
+msgstr "Aquisições"
 
 #. module: procurement
 #: field:res.company,schedule_range:0
@@ -373,7 +385,7 @@ msgstr "Estoque insuficiente e sem mínimo definido para ponto de pedido."
 #: code:addons/procurement/procurement.py:137
 #, python-format
 msgid "Invalid action !"
-msgstr "Ação invalida !"
+msgstr "Ação inválida!"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -384,7 +396,7 @@ msgstr "Referências"
 #: view:product.product:0
 #: field:product.product,orderpoint_ids:0
 msgid "Minimum Stock Rule"
-msgstr ""
+msgstr "Regra Minima de Estoque"
 
 #. module: procurement
 #: view:res.company:0
@@ -398,6 +410,7 @@ msgid ""
 "Please check the quantity in procurement order(s), it should not be 0 or "
 "less!"
 msgstr ""
+"Verifique a quantidade na Ordem de Aquisição, não deve ser 0 ou menos!"
 
 #. module: procurement
 #: help:procurement.order,procure_method:0
@@ -468,6 +481,9 @@ msgid ""
 "OpenERP generates a procurement to bring the virtual stock to the Max "
 "Quantity."
 msgstr ""
+"Quando o estoque virtual de ficar abaixo da Quantidade Mínima especificada "
+"para este campo, O OpenERP gera uma aquisição para trazer o estoque virtual "
+"para a Quantidade Máxima."
 
 #. module: procurement
 #: model:process.process,name:procurement.process_process_serviceproductprocess0
@@ -484,7 +500,7 @@ msgstr "Pedidos de Aquisição Relacionados"
 msgid ""
 "Wizard checks all the stock minimum rules and generate procurement order."
 msgstr ""
-"O Wizard confere todas as regras de estoque mínimo e gera o Pedido de "
+"O assistente confere todas as regras de estoque mínimo e gera o Pedido de "
 "Aquisição."
 
 #. module: procurement
@@ -506,6 +522,7 @@ msgstr "mais"
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
 msgstr ""
+"Você não pode mover os produtos de/para um Local do tipo Visualização"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,active:0
@@ -538,12 +555,12 @@ msgid ""
 "background, you may have to wait for a few minutes until it has finished "
 "computing."
 msgstr ""
-"Este wizard permite que você processe todas as aquisições, produções e/ou "
-"pedidos de compra pendentes de processamento com base nas suas "
+"Este assistente permite que você processe todas as aquisições, produções "
+"e/ou pedidos de compra pendentes de processamento com base nas suas "
 "configurações. Por padrão, o agendamento é executado toda noite pelo "
 "OpenERP. Você pode usar este menu para forçar a execução agora. Repare que "
-"isto será executado em background, você deverá aguardar alguns minutos até o "
-"término do processamento."
+"isto será executado em segundo plano, você deverá aguardar alguns minutos "
+"até o término do processamento."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -564,7 +581,7 @@ msgstr "Este assistente agendará aquisições."
 #. module: procurement
 #: view:procurement.order:0
 msgid "Status"
-msgstr "Status"
+msgstr "Situação"
 
 #. module: procurement
 #: selection:procurement.order,priority:0
@@ -580,7 +597,7 @@ msgstr "Você tentou atribuir um lote que não é do mesmo produto"
 #: code:addons/procurement/procurement.py:383
 #, python-format
 msgid "Not enough stock."
-msgstr ""
+msgstr "Estoque insuficiente."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,active:0
@@ -590,7 +607,7 @@ msgstr "Ativo"
 #. module: procurement
 #: model:process.node,name:procurement.process_node_procureproducts0
 msgid "Procure Products"
-msgstr "Adquirir Proodutos"
+msgstr "Adquirir Produtos"
 
 #. module: procurement
 #: field:procurement.order,date_planned:0
@@ -606,7 +623,7 @@ msgstr "Exceção"
 #: code:addons/procurement/procurement.py:381
 #, python-format
 msgid "No minimum orderpoint rule defined."
-msgstr ""
+msgstr "Sem regra de ordem de aquisição mínima definida."
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:151
@@ -622,12 +639,12 @@ msgstr "Ponto de Pedido (PP) Automático"
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
 msgid "Minimum Inventory Rule"
-msgstr "Regra de Inventório Mínimo"
+msgstr "Regra de Estoque Mínimo"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will be rounded up to this multiple."
-msgstr ""
+msgstr "A quantidade de aquisição será arredondada para este múltiplo."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -637,7 +654,7 @@ msgstr "Empresas"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Extra Information"
-msgstr "Informação Extra"
+msgstr "Informações Adicionais"
 
 #. module: procurement
 #: help:procurement.order,name:0
@@ -667,12 +684,12 @@ msgstr "Pedir o Máximo"
 #. module: procurement
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "A referência deve ser única por empresa!"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
 msgid "Date Closed"
-msgstr "Data Fechada"
+msgstr "Data de Fechamento"
 
 #. module: procurement
 #: field:mrp.property,composition:0
@@ -751,7 +768,7 @@ msgstr "Não urgente"
 #: code:addons/procurement/procurement.py:297
 #, python-format
 msgid "No default supplier defined for this product"
-msgstr ""
+msgstr "Nenhum fornecedor padrão definido para este produto"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -872,7 +889,7 @@ msgstr ""
 "automaticamente irá criar pedidos de fabricação ou cotações de compra de "
 "acordo com o nível de estoque. Uma vez que o estoque virtual de um produto "
 "(= estoque disponível menos todos os pedidos confirmados e reservas) estiver "
-"abaixo da quantidade mínima, o OpenERP gera uma requisição de aquisição para "
+"abaixo da quantidade mínima, o OpenERP gera uma ordem de aquisição para "
 "elevar o estoque até a quantidade máxima."
 
 #. module: procurement
@@ -891,8 +908,8 @@ msgid ""
 "This wizard will plan the procurement for this product. This procurement may "
 "generate task, production orders or purchase orders."
 msgstr ""
-"Este wizard irá planejar a aquisição deste produto. A aquisição poderá gerar "
-"tarefas, pedidos de produção ou pedidos de compra."
+"Este assistente irá planejar a aquisição deste produto. A aquisição poderá "
+"gerar tarefas, pedidos de produção ou pedidos de compra."
 
 #. module: procurement
 #: view:res.company:0
@@ -904,11 +921,12 @@ msgstr "Agendador de MRP & Logística"
 #, python-format
 msgid "Cannot delete Procurement Order(s) which are in %s state!"
 msgstr ""
+"Não é possível excluir Ordem de Aquisição em que a situação seja %s !"
 
 #. module: procurement
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "O nome da empresa deve ser exclusivo!"
 
 #. module: procurement
 #: field:mrp.property,name:0
@@ -924,7 +942,7 @@ msgstr "máx"
 #. module: procurement
 #: field:procurement.order,product_uos:0
 msgid "Product UoS"
-msgstr "Unid. de Venda do Produto"
+msgstr "UdV do Produto"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:356
@@ -1004,12 +1022,12 @@ msgstr "Detalhes da Aquisição"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement started late"
-msgstr ""
+msgstr "Aquisição começou tarde"
 
 #. module: procurement
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erro: Código EAN inválido"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:152
@@ -1021,7 +1039,7 @@ msgstr "AGENDAMENTO"
 #: code:addons/procurement/schedulers.py:88
 #, python-format
 msgid "PROC %d: on order - %3.2f %-5s - %s"
-msgstr ""
+msgstr "Aquisição %d: no pedido - %3.2f %-5s - %s"
 
 #~ msgid ""
 #~ "\n"
diff --git a/addons/procurement/i18n/ro.po b/addons/procurement/i18n/ro.po
index 810ede588a6..a0e70a36c62 100644
--- a/addons/procurement/i18n/ro.po
+++ b/addons/procurement/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index ac902c7f29a..8ca2b94a051 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-03-16 07:09+0000\n"
+"PO-Revision-Date: 2012-10-24 16:47+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -30,7 +30,7 @@ msgstr "Планировщики"
 #. module: procurement
 #: model:ir.model,name:procurement.model_make_procurement
 msgid "Make Procurements"
-msgstr "Сделать закупки"
+msgstr "Сделать снабжения"
 
 #. module: procurement
 #: help:procurement.order.compute.all,automatic:0
@@ -39,6 +39,9 @@ msgid ""
 "under 0. You should probably not use this option, we suggest using a MTO "
 "configuration on products."
 msgstr ""
+"Запускает автоматическое снабжение для всех ТМЦ, которые имеют виртуальный "
+"запас меньше 0. Возможно вы не должны использовать этот параметр, мы "
+"предлагаем использование настройки MTO по продуктам."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -48,7 +51,7 @@ msgstr "Группировать по ..."
 #. module: procurement
 #: help:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Draft procurement of the product and location of that orderpoint"
-msgstr "Черновик закупки ТМЦ и положение точки заказа"
+msgstr "Черновик снабжения ТМЦ и положение точки заказа"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:291
@@ -80,7 +83,7 @@ msgstr "Правила вычисления минимального запас
 #. module: procurement
 #: view:procurement.order:0
 msgid "Temporary Procurement Exceptions"
-msgstr ""
+msgstr "Временные исключения снабжения"
 
 #. module: procurement
 #: field:procurement.order,company_id:0
@@ -91,7 +94,7 @@ msgstr "Компания"
 #. module: procurement
 #: field:procurement.order,product_uos_qty:0
 msgid "UoS Quantity"
-msgstr "Кол-во во второй ед. изм."
+msgstr "Количество в е.п."
 
 #. module: procurement
 #: view:procurement.order:0
@@ -117,7 +120,7 @@ msgstr "Не используется в расчётах, только для 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
 msgid "Latest procurement"
-msgstr "Последняя закупка"
+msgstr "Последнее снабжение"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -159,7 +162,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Permanent Procurement Exceptions"
-msgstr ""
+msgstr "Постоянные проблемы снабжения"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -211,6 +214,16 @@ msgid ""
 "\n"
 "        Exceptions:\n"
 msgstr ""
+"Это отчёт планирования снабжения.\n"
+"\n"
+"        Время начала: %s \n"
+"        Время окончания: %s\n"
+"        Всего обработанных снабжений: %d\n"
+"        Снабжения с проблемами: %d\n"
+"        Пропущенные снабжения (плановая дата вне диапазона планировщика) %d "
+"\n"
+"\n"
+"        Проблемы:\n"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -229,6 +242,9 @@ msgid ""
 "procurement to bring the virtual stock to the Quantity specified as Max "
 "Quantity."
 msgstr ""
+"Когда виртуальный остаток становится ниже мин. количества, OpenERP создаёт "
+"снабжение для возвращения виртуального остатка к количеству определённому "
+"как макс. количество."
 
 #. module: procurement
 #: view:procurement.order.compute:0
@@ -247,13 +263,13 @@ msgid ""
 "Reference of the document that created this Procurement.\n"
 "This is automatically completed by OpenERP."
 msgstr ""
-"Ссылка на документ, создавший этот запрос на снабжение.\n"
+"Ссылка на документ, создавший этот запрос снабжения.\n"
 "Выполнено OpenERP автоматически."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Procurement Orders to Process"
-msgstr "Заказы на снабжение для обработки"
+msgstr "Заказы снабжения для обработки"
 
 #. module: procurement
 #: constraint:res.company:0
@@ -305,12 +321,12 @@ msgstr "Лучшая цена (не активна!)"
 #: code:addons/procurement/schedulers.py:111
 #, python-format
 msgid "PROC %d: from stock - %3.2f %-5s - %s"
-msgstr ""
+msgstr "СНАБ %d: из запаса - %3.2f %-5s - %s"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Product & Location"
-msgstr "Продукция и местоположения"
+msgstr "Товар и место хранения"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute
@@ -337,6 +353,12 @@ msgid ""
 "operations to fullfil the need: purchase order proposition, manufacturing "
 "order, etc."
 msgstr ""
+"Заказ снабжения используется для записи потребности конкретного продукта в "
+"конкретном месте хранения. Заказ снабжения создаётся обычно автоматически из "
+"заказов продаж, правила выхода логистики или правил минимума запаса. Когда "
+"заказ снабжения подтверждён, он автоматически создаёт необходимые операции "
+"для удовлетворения потребности: предложение заказа закупки, заказ "
+"изготовления и т.п."
 
 #. module: procurement
 #: field:make.procurement,date_planned:0
@@ -358,8 +380,7 @@ msgstr "Количество"
 #: code:addons/procurement/procurement.py:379
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
-msgstr ""
-"Не достаточный запас и не определено правило минимальной точки заказа."
+msgstr "Не достаточен запас и нет правила минимума точки заказа."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -376,7 +397,7 @@ msgstr "Ссылки"
 #: view:product.product:0
 #: field:product.product,orderpoint_ids:0
 msgid "Minimum Stock Rule"
-msgstr ""
+msgstr "Правило минимальных запасов"
 
 #. module: procurement
 #: view:res.company:0
@@ -390,6 +411,8 @@ msgid ""
 "Please check the quantity in procurement order(s), it should not be 0 or "
 "less!"
 msgstr ""
+"Пожалуйста, проверьте количество в заказе снабжения, оно не должно быть "
+"нулевым или отрицательным!"
 
 #. module: procurement
 #: help:procurement.order,procure_method:0
@@ -397,7 +420,7 @@ msgid ""
 "If you encode manually a Procurement, you probably want to use a make to "
 "order method."
 msgstr ""
-"Если вы составляете запрос на снабжение вручную, вероятно вы хотите "
+"Если вы составляете запрос снабжения вручную, вероятно вы хотите "
 "использовать изготовление на заказ."
 
 #. module: procurement
@@ -420,7 +443,7 @@ msgstr "Снабжение"
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action
 msgid "Procurement Orders"
-msgstr "Заказы на снабжение"
+msgstr "Заказы снабжения"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -435,7 +458,7 @@ msgstr "Исключения"
 #. module: procurement
 #: model:process.node,note:procurement.process_node_serviceonorder0
 msgid "Assignment from Production or Purchase Order."
-msgstr "Выделение из заказа на производство или на закупку."
+msgstr "Назначение из заказа производства или закупки."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property
@@ -446,7 +469,7 @@ msgstr "Параметр"
 #: model:ir.actions.act_window,name:procurement.act_make_procurement
 #: view:make.procurement:0
 msgid "Procurement Request"
-msgstr "Заявка на снабжение"
+msgstr "Заявка снабжения"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
@@ -460,6 +483,9 @@ msgid ""
 "OpenERP generates a procurement to bring the virtual stock to the Max "
 "Quantity."
 msgstr ""
+"Когда виртуальный заказ становится меньше мин. количества заданного для "
+"этого поля, OpenERP создаёт заказ снабжения для возвращения виртуального "
+"запаса к макс. количеству."
 
 #. module: procurement
 #: model:process.process,name:procurement.process_process_serviceproductprocess0
@@ -469,14 +495,14 @@ msgstr "Сервис"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
-msgstr "Связанные заказы на снабжение"
+msgstr "Связанные заказы снабжения"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid ""
 "Wizard checks all the stock minimum rules and generate procurement order."
 msgstr ""
-"Мастер проверит все правила минимальных запасов и создаст заказ на снабжение."
+"Мастер проверит все правила минимальных запасов и создаст заказ снабжения."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -496,7 +522,7 @@ msgstr "плюс"
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Нельзя переместить ТМЦ в/из место хранения типа вид."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,active:0
@@ -527,8 +553,8 @@ msgid ""
 "background, you may have to wait for a few minutes until it has finished "
 "computing."
 msgstr ""
-"Этот мастер позволяет вам обработать все заказы на снабжение, производство "
-"и/или закупку, которые будут обработаны в соответствии с их настройками. По "
+"Этот мастер позволяет вам обработать все заказы снабжения, производства "
+"и/или закупки, которые будут обработаны в соответствии с их настройками. По "
 "умолчанию, планировщик запускается каждую ночь. Вы можете использовать это "
 "меню для его принудительного запуска. Помните, что он работает в фоновом "
 "режиме, вы должны подождать несколько минут до окончания обработки."
@@ -615,7 +641,7 @@ msgstr "Правило минимума ТМЦ"
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will be rounded up to this multiple."
-msgstr ""
+msgstr "Количество в заказе будет округляться до этого значения."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -630,7 +656,7 @@ msgstr "Доп. информация"
 #. module: procurement
 #: help:procurement.order,name:0
 msgid "Procurement name."
-msgstr "Название закупки."
+msgstr "Название снабжения."
 
 #. module: procurement
 #: constraint:stock.move:0
@@ -655,7 +681,7 @@ msgstr "Заказ по максимуму"
 #. module: procurement
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка должна быть уникальна для каждой компании!"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
@@ -688,7 +714,7 @@ msgstr "Прочее"
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Locations"
-msgstr "Местоположения"
+msgstr "Места хранения"
 
 #. module: procurement
 #: selection:procurement.order,procure_method:0
@@ -779,7 +805,7 @@ msgstr "Правила минимальных запасов"
 #. module: procurement
 #: field:procurement.order,close_move:0
 msgid "Close Move at end"
-msgstr ""
+msgstr "Закрыть перемещение в конце"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,qty_multiple:0
@@ -857,7 +883,7 @@ msgid ""
 "quantity."
 msgstr ""
 "Вы можете определить правило минимальных запасов так, что OpenERP будет "
-"автоматически создавать черновики заказов на производство или  закупку в "
+"автоматически создавать черновики заказов производства или  закупки в "
 "соответствии с количеством запасов. Если минимальное количество ТМЦ (= "
 "остаток на складе минус все подтвержденные заказы и зарезервированное) "
 "меньше минимального количества, OpenERP будет генерировать запрос на "
@@ -880,7 +906,7 @@ msgid ""
 "generate task, production orders or purchase orders."
 msgstr ""
 "Этот мастер будет планировать снабжение этой продукцией. Процесс снабжения "
-"может генерировать задачи, заказы на производство, заказы на закупку."
+"может генерировать задачи, заказы производства, заказы закупки."
 
 #. module: procurement
 #: view:res.company:0
@@ -891,12 +917,12 @@ msgstr "ПМР и Логистическое планирование"
 #: code:addons/procurement/procurement.py:138
 #, python-format
 msgid "Cannot delete Procurement Order(s) which are in %s state!"
-msgstr ""
+msgstr "Нельзя удалить заказ(ы) снабжения в состоянии %s!"
 
 #. module: procurement
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Название компании должно быть уникальным!"
 
 #. module: procurement
 #: field:mrp.property,name:0
@@ -912,7 +938,7 @@ msgstr "макс."
 #. module: procurement
 #: field:procurement.order,product_uos:0
 msgid "Product UoS"
-msgstr "Вторая ед. изм."
+msgstr "Ед.продажи товара"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:356
@@ -941,21 +967,20 @@ msgid ""
 "others require manual intervention (those are identified by a specific error "
 "message)."
 msgstr ""
-"Заказы на снабжение представляют собой необходимость определенного "
-"количества ТМЦ, в данный момент времени, в данном месте. Заказ на продажу "
-"это типичный источник для заказа на снабжение (но это различные документы). "
-"В зависимости от требуемых условий снабжения и свойств ТМЦ алгоритм "
-"снабжения будет резервировать ТМЦ на складе, заказывать ТМЦ у поставщика, "
-"передавать заказ на производство и т.д. Исключительная ситуация при "
-"снабжении случается когда системе не удается найти способ выполнить "
-"снабжение. Некоторые исключительные ситуации могут разрешиться сами собой "
-"автоматически, другие требуют вмешательства (определяется по конкретному "
-"сообщению об ошибке)."
+"Заказы снабжения представляют собой необходимость определенного количества "
+"ТМЦ, в данный момент времени, в данном месте. Заказ продаж это типичный "
+"источник для заказа снабжения (но это различные документы). В зависимости от "
+"требуемых условий снабжения и свойств ТМЦ алгоритм снабжения будет "
+"резервировать ТМЦ на складе, заказывать ТМЦ у поставщика, передавать заказ "
+"на производство и т.д. Исключительная ситуация при снабжении случается когда "
+"системе не удается найти способ выполнить снабжение. Некоторые "
+"исключительные ситуации могут разрешиться сами собой автоматически, другие "
+"требуют вмешательства (определяется по конкретному сообщению об ошибке)."
 
 #. module: procurement
 #: field:procurement.order,product_uom:0
 msgid "Product UoM"
-msgstr "Ед. изм. продукции"
+msgstr "Ед. изм. ТМЦ"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -975,7 +1000,7 @@ msgstr ""
 #. module: procurement
 #: selection:procurement.order,priority:0
 msgid "Very Urgent"
-msgstr "Весьма срочно"
+msgstr "Очень срочно"
 
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
@@ -990,12 +1015,12 @@ msgstr "Детали снабжения"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement started late"
-msgstr ""
+msgstr "Дата начала снабжения"
 
 #. module: procurement
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Ошибка: Неверный штрих-код"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:152
@@ -1007,7 +1032,7 @@ msgstr "ПЛАНИРОВЩИК"
 #: code:addons/procurement/schedulers.py:88
 #, python-format
 msgid "PROC %d: on order - %3.2f %-5s - %s"
-msgstr ""
+msgstr "СНАБ %d: по заказу - %3.2f %-5s - %s"
 
 #, python-format
 #~ msgid ""
diff --git a/addons/procurement/i18n/sr.po b/addons/procurement/i18n/sr.po
index b5e3d3140e8..a550c3c85bb 100644
--- a/addons/procurement/i18n/sr.po
+++ b/addons/procurement/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/sr@latin.po b/addons/procurement/i18n/sr@latin.po
index 779c6527bc1..e914891503e 100644
--- a/addons/procurement/i18n/sr@latin.po
+++ b/addons/procurement/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/sv.po b/addons/procurement/i18n/sv.po
index 1eaf13e40a7..166f8f821ed 100644
--- a/addons/procurement/i18n/sv.po
+++ b/addons/procurement/i18n/sv.po
@@ -14,18 +14,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
 msgid "Ask New Products"
-msgstr "Be om nya produkter"
+msgstr "Begär nya produkter"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
 msgid "Schedulers"
-msgstr "Schedulers"
+msgstr "Schemaläggare"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_make_procurement
@@ -74,7 +74,7 @@ msgstr "Anskaffningsmetod"
 #: code:addons/procurement/procurement.py:307
 #, python-format
 msgid "No address defined for the supplier"
-msgstr ""
+msgstr "Ingen adress definierad för leverantören"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_procurement_compute
@@ -84,7 +84,7 @@ msgstr "Beräkna endast minsta lagersaldoregel"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Temporary Procurement Exceptions"
-msgstr ""
+msgstr "Tillfälligt anskaffningsfel"
 
 #. module: procurement
 #: field:procurement.order,company_id:0
@@ -95,7 +95,7 @@ msgstr "Bolag"
 #. module: procurement
 #: field:procurement.order,product_uos_qty:0
 msgid "UoS Quantity"
-msgstr ""
+msgstr "Måttenhet Kvantitet"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -116,7 +116,7 @@ msgstr "Senaste fel"
 #. module: procurement
 #: help:mrp.property,composition:0
 msgid "Not used in computations, for information purpose only."
-msgstr ""
+msgstr "Används inte i beräkningar, endast avsedd som information."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_id:0
@@ -136,7 +136,7 @@ msgstr "beställt"
 #. module: procurement
 #: help:procurement.order,message:0
 msgid "Exception occurred while computing procurement orders."
-msgstr ""
+msgstr "Ett Undantag inträffade vid beräkning av anskaffningsorder."
 
 #. module: procurement
 #: help:procurement.order,state:0
@@ -150,11 +150,17 @@ msgid ""
 " It is in 'Waiting'. state when the procurement is waiting for another one "
 "to finish."
 msgstr ""
+"När en upphandling skapas sätts den först till 'Utkast'.\n"
+"Om upphandlingen bekräftas, sätts statusen till 'Bekräftad'.\n"
+"Efter att den bekräftats blir den satt till satt till 'Pågående'.\n"
+"Om något behöver åtgärdas i ordern ändras statusen till 'Undantag'.\n"
+"När åtgärden är utförd blir statusen 'Klar'.\n"
+"Statusen är 'Väntar' när upphandlingen väntar på åtgärd."
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Permanent Procurement Exceptions"
-msgstr ""
+msgstr "Permanenta upphandlingsfel"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -164,7 +170,7 @@ msgstr "Sökning på regler för minimilager"
 #. module: procurement
 #: view:procurement.order.compute.all:0
 msgid "Scheduler Parameters"
-msgstr ""
+msgstr "Parametrar Schemaläggare"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_move
@@ -174,22 +180,22 @@ msgstr "Lagertransaktion"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute_all
 msgid "Compute all schedulers"
-msgstr ""
+msgstr "Beräkna alla schemaläggare"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Planification"
-msgstr ""
+msgstr "Planering"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Ready"
-msgstr "Klar"
+msgstr "Färdig"
 
 #. module: procurement
 #: field:procurement.order.compute.all,automatic:0
 msgid "Automatic orderpoint"
-msgstr ""
+msgstr "Automatisk orderpunkt"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:123
@@ -206,6 +212,16 @@ msgid ""
 "\n"
 "        Exceptions:\n"
 msgstr ""
+"Detta är rapporten för upphandlingensschemaläggning  \n"
+"\n"
+" starttid:. %s \n"
+" Sluttid: %s  \n"
+" Totalt bearbetade upphandlingar: %d \n"
+" Upphandlingar med åtgärder: %d \n"
+" Överhoppade upphandling (planerade datumet utanför schemaläggaren intervall "
+") %d \n"
+"\n"
+" Undantag:\n"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -224,6 +240,9 @@ msgid ""
 "procurement to bring the virtual stock to the Quantity specified as Max "
 "Quantity."
 msgstr ""
+"När det virtuella lagret går under Min.Antal genererar OpenERP själv en "
+"upphandling för att få det virtuella lager till den kvantitet som anges som "
+"max antal."
 
 #. module: procurement
 #: view:procurement.order.compute:0
@@ -242,11 +261,13 @@ msgid ""
 "Reference of the document that created this Procurement.\n"
 "This is automatically completed by OpenERP."
 msgstr ""
+"Hänvisning till dokument som skapade denna upphandling. \n"
+" Detta sköts automatiskt av OpenERP."
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Procurement Orders to Process"
-msgstr ""
+msgstr "Upphandlingsorder att bearbeta"
 
 #. module: procurement
 #: constraint:res.company:0
@@ -257,7 +278,7 @@ msgstr "Fel! Du kan inte skapa rekursiva bolagsstrukturer."
 #: code:addons/procurement/procurement.py:386
 #, python-format
 msgid "Procurement '%s' is in exception: "
-msgstr ""
+msgstr "Upphandling '%s' behöver åtgärdas: "
 
 #. module: procurement
 #: field:procurement.order,priority:0
@@ -292,13 +313,13 @@ msgstr "Lager"
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Best price (not yet active!)"
-msgstr ""
+msgstr "Bästa pris (ännu ej aktiv!)"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:111
 #, python-format
 msgid "PROC %d: from stock - %3.2f %-5s - %s"
-msgstr ""
+msgstr "PROC %d: från lager - %3.2f%-5s -%s"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -308,17 +329,17 @@ msgstr "Produkt och lagerplats"
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order_compute
 msgid "Compute Procurement"
-msgstr ""
+msgstr "Beräkna Anskaffning"
 
 #. module: procurement
 #: field:stock.move,procurements:0
 msgid "Procurements"
-msgstr "Anskaffning"
+msgstr "Anskaffningar"
 
 #. module: procurement
 #: field:res.company,schedule_range:0
 msgid "Scheduler Range Days"
-msgstr ""
+msgstr "Schemaläggare antal dagar"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_action
@@ -330,6 +351,12 @@ msgid ""
 "operations to fullfil the need: purchase order proposition, manufacturing "
 "order, etc."
 msgstr ""
+"En anskaffningsorder används för att registrera ett behov av en specifik "
+"produkt på en viss plats. En anskaffningsbeställning är vanligtvis skapat "
+"automatiskt från en försäljningsorder, en Dra logistik regel eller "
+"minimiregler för lager. När anskaffningsbeställningen bekräftas skapas "
+"automatiskt de nödvändiga åtgärder för att tillfredsställa behovet: förslag "
+"till inköpsorder, tillverkningsorder, etc."
 
 #. module: procurement
 #: field:make.procurement,date_planned:0
@@ -351,7 +378,7 @@ msgstr "Antal"
 #: code:addons/procurement/procurement.py:379
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
-msgstr ""
+msgstr "Ej tillräckligt lager och regel för minsta lager saknas."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:137
@@ -368,7 +395,7 @@ msgstr "Referenser"
 #: view:product.product:0
 #: field:product.product,orderpoint_ids:0
 msgid "Minimum Stock Rule"
-msgstr ""
+msgstr "Regel för Minsta Lager"
 
 #. module: procurement
 #: view:res.company:0
@@ -382,6 +409,7 @@ msgid ""
 "Please check the quantity in procurement order(s), it should not be 0 or "
 "less!"
 msgstr ""
+"Kontrollera mängden i anskaffningsordern. Det bör inte vara 0 eller mindre!"
 
 #. module: procurement
 #: help:procurement.order,procure_method:0
@@ -389,6 +417,8 @@ msgid ""
 "If you encode manually a Procurement, you probably want to use a make to "
 "order method."
 msgstr ""
+"Om du manuellt gör en upphandling, vill du förmodligen använda metoden "
+"tillverka på order."
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement
@@ -398,7 +428,7 @@ msgstr "Automatiska anskaffningar"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_max_qty:0
 msgid "Max Quantity"
-msgstr ""
+msgstr "Max antal"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order
@@ -415,33 +445,33 @@ msgstr "Anskaffningsorders"
 #. module: procurement
 #: view:procurement.order:0
 msgid "To Fix"
-msgstr ""
+msgstr "Att fixa"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Exceptions"
-msgstr ""
+msgstr "Undantag"
 
 #. module: procurement
 #: model:process.node,note:procurement.process_node_serviceonorder0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Uppdrag från produktion eller inköpsorder."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property
 msgid "Property"
-msgstr ""
+msgstr "Fastighet"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.act_make_procurement
 #: view:make.procurement:0
 msgid "Procurement Request"
-msgstr ""
+msgstr "Inköpsförfrågan"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid "Compute Stock"
-msgstr ""
+msgstr "Beräkna Lager"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,product_min_qty:0
@@ -450,6 +480,9 @@ msgid ""
 "OpenERP generates a procurement to bring the virtual stock to the Max "
 "Quantity."
 msgstr ""
+"När den virtuella beståndet går under Min. mängd som anges i det här fältet "
+"genererar OpenERP automatiskt en anskaffning för att få den virtuella lagret "
+"till Max. antal."
 
 #. module: procurement
 #: model:process.process,name:procurement.process_process_serviceproductprocess0
@@ -459,13 +492,15 @@ msgstr "Tjänst"
 #. module: procurement
 #: field:stock.warehouse.orderpoint,procurement_draft_ids:0
 msgid "Related Procurement Orders"
-msgstr ""
+msgstr "Relaterade anskaffningsordrar"
 
 #. module: procurement
 #: view:procurement.orderpoint.compute:0
 msgid ""
 "Wizard checks all the stock minimum rules and generate procurement order."
 msgstr ""
+"Guiden kontrollerar alla regler för minsta lager och genererar "
+"anskaffningsordrarna."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
@@ -480,12 +515,12 @@ msgstr "Brådskande"
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "plus"
-msgstr ""
+msgstr "plus"
 
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Du kan inte flytta produkter från eller till en plats av typen vyn."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,active:0
@@ -493,6 +528,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "orderpoint without removing it."
 msgstr ""
+"Om det aktiva fältet är satt till Falskt, kommer du att kunna dölja "
+"orderpunkt utan att ta bort det."
 
 #. module: procurement
 #: help:procurement.orderpoint.compute,automatic:0
@@ -515,17 +552,23 @@ msgid ""
 "background, you may have to wait for a few minutes until it has finished "
 "computing."
 msgstr ""
+"Den här guiden ger dig möjlighet att köra alla inköp, produktion och / eller "
+"köp order som ska behandlas utifrån deras konfiguration. Som standard "
+"startas schemaläggaren automatiskt varje natt av OpenERP. Du kan använda "
+"denna meny för att tvinga den att köras nu. Observera att den körs i "
+"bakgrunden. Du kan behöva vänta några minuter tills den är klar med "
+"beräkningarna."
 
 #. module: procurement
 #: view:procurement.order:0
 #: field:procurement.order,note:0
 msgid "Note"
-msgstr ""
+msgstr "Anteckning"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Utkast"
 
 #. module: procurement
 #: view:procurement.order.compute:0
@@ -535,7 +578,7 @@ msgstr "Den här guiden kommer planlägga anskaffningar."
 #. module: procurement
 #: view:procurement.order:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: procurement
 #: selection:procurement.order,priority:0
@@ -551,7 +594,7 @@ msgstr "Du försöker tilldela ett parti som inte är från samma produkt."
 #: code:addons/procurement/procurement.py:383
 #, python-format
 msgid "Not enough stock."
-msgstr ""
+msgstr "Inte tillräckligt lager."
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,active:0
@@ -566,7 +609,7 @@ msgstr "Produktanskaffning"
 #. module: procurement
 #: field:procurement.order,date_planned:0
 msgid "Scheduled date"
-msgstr ""
+msgstr "Planerat datum"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -577,28 +620,29 @@ msgstr "Undantag"
 #: code:addons/procurement/procurement.py:381
 #, python-format
 msgid "No minimum orderpoint rule defined."
-msgstr ""
+msgstr "Ingen regel för minsta orderpunkt har definieras."
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:151
 #, python-format
 msgid "Automatic OP: %s"
-msgstr ""
+msgstr "Automatisk OP: %s"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
-msgstr ""
+msgstr "Automatisk orderpunkt"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
 msgid "Minimum Inventory Rule"
-msgstr ""
+msgstr "Minsta lager regel"
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will be rounded up to this multiple."
 msgstr ""
+"Upphandlingens kvantitet kommer att avrundas uppåt till denna multipel."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -613,7 +657,7 @@ msgstr "Extra Information"
 #. module: procurement
 #: help:procurement.order,name:0
 msgid "Procurement name."
-msgstr ""
+msgstr "Upphandling namn."
 
 #. module: procurement
 #: constraint:stock.move:0
@@ -628,70 +672,70 @@ msgstr "Anskaffningsorsak"
 #. module: procurement
 #: sql_constraint:stock.warehouse.orderpoint:0
 msgid "Qty Multiple must be greater than zero."
-msgstr ""
+msgstr "Antal multipel måste vara större än noll."
 
 #. module: procurement
 #: selection:stock.warehouse.orderpoint,logic:0
 msgid "Order to Max"
-msgstr ""
+msgstr "Order till Max"
 
 #. module: procurement
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referens måste vara unikt per företag!"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
 msgid "Date Closed"
-msgstr ""
+msgstr "Datum stängd"
 
 #. module: procurement
 #: field:mrp.property,composition:0
 msgid "Properties composition"
-msgstr ""
+msgstr "Egenskaper sammansättning"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:327
 #, python-format
 msgid "Data Insufficient !"
-msgstr ""
+msgstr "Otillräckliga data!"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_mrp_property_group
 #: field:mrp.property,group_id:0
 #: field:mrp.property.group,name:0
 msgid "Property Group"
-msgstr ""
+msgstr "Enhetsgrupp"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Misc"
-msgstr ""
+msgstr "Övrigt"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Locations"
-msgstr ""
+msgstr "Platser"
 
 #. module: procurement
 #: selection:procurement.order,procure_method:0
 msgid "from stock"
-msgstr ""
+msgstr "från lager"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "General Information"
-msgstr ""
+msgstr "Allmän information"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Run Procurement"
-msgstr ""
+msgstr "Kör upphandling"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Done"
-msgstr ""
+msgstr "Avslutad"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -701,33 +745,33 @@ msgstr ""
 #: view:procurement.order.compute.all:0
 #: view:procurement.orderpoint.compute:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,logic:0
 msgid "Reordering Mode"
-msgstr ""
+msgstr "Repitorderläge"
 
 #. module: procurement
 #: field:procurement.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Källdokument"
 
 #. module: procurement
 #: selection:procurement.order,priority:0
 msgid "Not urgent"
-msgstr ""
+msgstr "Inte brådskande"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:297
 #, python-format
 msgid "No default supplier defined for this product"
-msgstr ""
+msgstr "Ingen standard leverantör definierad för denna produkt"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Late"
-msgstr ""
+msgstr "Sen"
 
 #. module: procurement
 #: view:board.board:0
@@ -737,7 +781,7 @@ msgstr "Anskaffningar i undantag"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Details"
-msgstr ""
+msgstr "Detaljer"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.procurement_action5
@@ -746,7 +790,7 @@ msgstr ""
 #: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
 #: view:procurement.order:0
 msgid "Procurement Exceptions"
-msgstr ""
+msgstr "Anskaffningsundantag"
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
@@ -757,22 +801,22 @@ msgstr ""
 #: view:product.product:0
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules"
-msgstr ""
+msgstr "Regler för Minsta Lager"
 
 #. module: procurement
 #: field:procurement.order,close_move:0
 msgid "Close Move at end"
-msgstr ""
+msgstr "Stäng Flytta till slutet"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,qty_multiple:0
 msgid "Qty Multiple"
-msgstr ""
+msgstr "Antal Flera"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Planerat datum"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_product_product
@@ -786,28 +830,28 @@ msgstr "Produkt"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Temporary"
-msgstr ""
+msgstr "Tillfällig"
 
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
 msgid "Description"
-msgstr ""
+msgstr "Beskrivning"
 
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "min"
-msgstr ""
+msgstr "min"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
 msgid "Quantity Rules"
-msgstr ""
+msgstr "Antal Regler"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Running"
-msgstr ""
+msgstr "Pågående"
 
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_uom:0
@@ -817,17 +861,17 @@ msgstr "Produktenhet"
 #. module: procurement
 #: model:process.node,name:procurement.process_node_serviceonorder0
 msgid "Make to Order"
-msgstr ""
+msgstr "Anskaffa på order"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "UOM"
-msgstr ""
+msgstr "Måttenhet"
 
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Waiting"
-msgstr ""
+msgstr "Väntar"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.action_orderpoint_form
@@ -849,12 +893,12 @@ msgstr ""
 #. module: procurement
 #: field:procurement.order,move_id:0
 msgid "Reservation"
-msgstr ""
+msgstr "Reservation"
 
 #. module: procurement
 #: model:process.node,note:procurement.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "Vägen till anskaffning beror på produkttyp."
 
 #. module: procurement
 #: view:make.procurement:0
@@ -862,33 +906,35 @@ msgid ""
 "This wizard will plan the procurement for this product. This procurement may "
 "generate task, production orders or purchase orders."
 msgstr ""
+"Den här guiden kommer att planera upphandlingen för denna produkt. Denna "
+"upphandling kan generera uppgifter, produktionsorder eller anskaffningsorder."
 
 #. module: procurement
 #: view:res.company:0
 msgid "MRP & Logistics Scheduler"
-msgstr ""
+msgstr "MRP & Logistik Schemaläggare"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:138
 #, python-format
 msgid "Cannot delete Procurement Order(s) which are in %s state!"
-msgstr ""
+msgstr "Kan inte ta bort anskaffningsorder som är i status %s !"
 
 #. module: procurement
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Företagsnamnet måste vara unikt!"
 
 #. module: procurement
 #: field:mrp.property,name:0
 #: field:stock.warehouse.orderpoint,name:0
 msgid "Name"
-msgstr ""
+msgstr "Namn"
 
 #. module: procurement
 #: selection:mrp.property,composition:0
 msgid "max"
-msgstr ""
+msgstr "max"
 
 #. module: procurement
 #: field:procurement.order,product_uos:0
@@ -899,14 +945,14 @@ msgstr "Produkt försäljningsenhet"
 #: code:addons/procurement/procurement.py:356
 #, python-format
 msgid "from stock: products assigned."
-msgstr ""
+msgstr "från lager: Produkter tilldelade."
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_compute_schedulers
 #: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
 #: view:procurement.order.compute.all:0
 msgid "Compute Schedulers"
-msgstr ""
+msgstr "Beräkna schemaläggare"
 
 #. module: procurement
 #: model:ir.actions.act_window,help:procurement.procurement_exceptions
@@ -941,7 +987,7 @@ msgstr "Produktenhet"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Search Procurement"
-msgstr ""
+msgstr "Sök anskaffning"
 
 #. module: procurement
 #: help:res.company,schedule_range:0
@@ -950,40 +996,43 @@ msgid ""
 "procurements. All procurements that are not between today and today+range "
 "are skipped for future computation."
 msgstr ""
+"Detta är tidsramen analyserad av schemaläggaren vid beräkning av "
+"upphandlingarna. Alla upphandlingar som inte ligger mellan idag och "
+"today+range utesluts för att istället kunna göra framtida beräkning."
 
 #. module: procurement
 #: selection:procurement.order,priority:0
 msgid "Very Urgent"
-msgstr ""
+msgstr "Mycket brådskande"
 
 #. module: procurement
 #: field:procurement.orderpoint.compute,automatic:0
 msgid "Automatic Orderpoint"
-msgstr ""
+msgstr "Automatisk Orderpunkt"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement Details"
-msgstr ""
+msgstr "Upphandling Detaljer"
 
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement started late"
-msgstr ""
+msgstr "Upphandling startade sent"
 
 #. module: procurement
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fel: felaktig EAN kod"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:152
 #, python-format
 msgid "SCHEDULER"
-msgstr ""
+msgstr "SCHEMALÄGGARE"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:88
 #, python-format
 msgid "PROC %d: on order - %3.2f %-5s - %s"
-msgstr ""
+msgstr "PROC %d : på beställning -% 3.2f%-5s -% s"
diff --git a/addons/procurement/i18n/tr.po b/addons/procurement/i18n/tr.po
index 46320f8fea1..d904c40883b 100644
--- a/addons/procurement/i18n/tr.po
+++ b/addons/procurement/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
@@ -83,7 +83,7 @@ msgstr "Sadece Minimum Stok Kuralını Hesapla"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Temporary Procurement Exceptions"
-msgstr ""
+msgstr "Geçici Satınalma İstisnaları"
 
 #. module: procurement
 #: field:procurement.order,company_id:0
@@ -159,7 +159,7 @@ msgstr ""
 #. module: procurement
 #: view:procurement.order:0
 msgid "Permanent Procurement Exceptions"
-msgstr ""
+msgstr "Kalıcı Satınalma İstisnaları"
 
 #. module: procurement
 #: view:stock.warehouse.orderpoint:0
@@ -211,6 +211,16 @@ msgid ""
 "\n"
 "        Exceptions:\n"
 msgstr ""
+"Bu satınalma planlama raporudur.\n"
+"\n"
+"        Başlama Tarihi: %s \n"
+"        Bitiş Tarihi: %s \n"
+"        Toplam İşlenen Satınalmalar: %d \n"
+"        Satınalma İstisnaları: %d \n"
+"        Atlanan Satınalmalar (planlama alanı dışındaki planlanan tarih ) %d "
+"\n"
+"\n"
+"        İstisnalar:\n"
 
 #. module: procurement
 #: selection:procurement.order,state:0
@@ -229,6 +239,8 @@ msgid ""
 "procurement to bring the virtual stock to the Quantity specified as Max "
 "Quantity."
 msgstr ""
+"Sanal stok Enaz Miktarın altına düştüğünde, OpenERP sanal stoğu Ençok Miktar "
+"olarak belirlenen Stoğa getirmek için bir satınalma oluşturur."
 
 #. module: procurement
 #: view:procurement.order.compute:0
@@ -303,7 +315,7 @@ msgstr "En İyi Fiyat(Henüz aktif değil)"
 #: code:addons/procurement/schedulers.py:111
 #, python-format
 msgid "PROC %d: from stock - %3.2f %-5s - %s"
-msgstr ""
+msgstr "SATIN %d: stoktan - %3.2f %-5s - %s"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -379,7 +391,7 @@ msgstr "Referanslar"
 #: view:product.product:0
 #: field:product.product,orderpoint_ids:0
 msgid "Minimum Stock Rule"
-msgstr ""
+msgstr "Enaz Stok Kuralı"
 
 #. module: procurement
 #: view:res.company:0
@@ -393,6 +405,8 @@ msgid ""
 "Please check the quantity in procurement order(s), it should not be 0 or "
 "less!"
 msgstr ""
+"Lütfen Satınalma Sipariş(ler)indeki miktarı kontrol edin, 0 ya da daha az "
+"olmamalı!"
 
 #. module: procurement
 #: help:procurement.order,procure_method:0
@@ -463,6 +477,8 @@ msgid ""
 "OpenERP generates a procurement to bring the virtual stock to the Max "
 "Quantity."
 msgstr ""
+"Sanal stok bu alan için belirlenen Enaz Miktarın altına düşerse, OpenERP "
+"sanal stoğu Ençok Miktara getirmek için bir satınalma oluşturur."
 
 #. module: procurement
 #: model:process.process,name:procurement.process_process_serviceproductprocess0
@@ -500,7 +516,7 @@ msgstr "artı"
 #. module: procurement
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Görünüm tipindeki bir konuma ürün giriş çıkışı yapamazsınız."
 
 #. module: procurement
 #: help:stock.warehouse.orderpoint,active:0
@@ -621,7 +637,7 @@ msgstr "Minimum Envanter Kuralı"
 #. module: procurement
 #: help:stock.warehouse.orderpoint,qty_multiple:0
 msgid "The procurement quantity will be rounded up to this multiple."
-msgstr ""
+msgstr "Satınalma miktarı bu katsayıya yuvarlanır."
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_res_company
@@ -661,7 +677,7 @@ msgstr "Maks.'a Sipariş"
 #. module: procurement
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Referans her şirket için benzersiz olmalı!"
 
 #. module: procurement
 #: field:procurement.order,date_close:0
@@ -897,12 +913,12 @@ msgstr "MRP ve Lojistik Zamanlayıcı"
 #: code:addons/procurement/procurement.py:138
 #, python-format
 msgid "Cannot delete Procurement Order(s) which are in %s state!"
-msgstr ""
+msgstr "%s Durumundaki Satınalma Sipariş(ler)i silimemiyor!"
 
 #. module: procurement
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Firma adı benzersiz olmalı !"
 
 #. module: procurement
 #: field:mrp.property,name:0
@@ -997,12 +1013,12 @@ msgstr "Satınalma Detayları"
 #. module: procurement
 #: view:procurement.order:0
 msgid "Procurement started late"
-msgstr ""
+msgstr "Satınalma geç başladı"
 
 #. module: procurement
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Hata: Geçersiz ean kodu"
 
 #. module: procurement
 #: code:addons/procurement/schedulers.py:152
@@ -1014,7 +1030,7 @@ msgstr "ZAMANLAYICI"
 #: code:addons/procurement/schedulers.py:88
 #, python-format
 msgid "PROC %d: on order - %3.2f %-5s - %s"
-msgstr ""
+msgstr "SATIN %d: siparişte - %3.2f %-5s - %s"
 
 #~ msgid ""
 #~ "When the virtual stock goes belong the Min Quantity, OpenERP generates a "
diff --git a/addons/procurement/i18n/vi.po b/addons/procurement/i18n/vi.po
index 33f12aea044..2f71230cfbb 100644
--- a/addons/procurement/i18n/vi.po
+++ b/addons/procurement/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/i18n/zh_CN.po b/addons/procurement/i18n/zh_CN.po
index 381e77b2223..26bb4dd911a 100644
--- a/addons/procurement/i18n/zh_CN.po
+++ b/addons/procurement/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: procurement
 #: view:make.procurement:0
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index d1fb3f8a395..c166f79e524 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -80,7 +80,7 @@ class procurement_order(osv.osv):
     """
     _name = "procurement.order"
     _description = "Procurement"
-    _order = 'priority,date_planned desc'
+    _order = 'priority desc,date_planned'
     _inherit = ['mail.thread']
     _log_create = False
     _columns = {
@@ -97,12 +97,11 @@ class procurement_order(osv.osv):
         'product_uos_qty': fields.float('UoS Quantity', states={'draft':[('readonly',False)]}, readonly=True),
         'product_uos': fields.many2one('product.uom', 'Product UoS', states={'draft':[('readonly',False)]}, readonly=True),
         'move_id': fields.many2one('stock.move', 'Reservation', ondelete='set null'),
-        'close_move': fields.boolean('Close Move at end', required=True),
+        'close_move': fields.boolean('Close Move at end'),
         'location_id': fields.many2one('stock.location', 'Location', required=True, states={'draft':[('readonly',False)]}, readonly=True),
-        'procure_method': fields.selection([('make_to_stock','from stock'),('make_to_order','on order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
+        'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
             readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \
             " a make to order method."),
-
         'note': fields.text('Note'),
         'message': fields.char('Latest error', size=124, help="Exception occurred while computing procurement orders."),
         'state': fields.selection([
@@ -114,8 +113,8 @@ class procurement_order(osv.osv):
             ('ready','Ready'),
             ('done','Done'),
             ('waiting','Waiting')], 'Status', required=True,
-            help='When a procurement is created the state is set to \'Draft\'.\n If the procurement is confirmed, the state is set to \'Confirmed\'.\
-            \nAfter confirming the state is set to \'Running\'.\n If any exception arises in the order then the state is set to \'Exception\'.\n Once the exception is removed the state becomes \'Ready\'.\n It is in \'Waiting\'. state when the procurement is waiting for another one to finish.'),
+            help='When a procurement is created the status is set to \'Draft\'.\n If the procurement is confirmed, the status is set to \'Confirmed\'.\
+            \nAfter confirming the status is set to \'Running\'.\n If any exception arises in the order then the status is set to \'Exception\'.\n Once the exception is removed the status becomes \'Ready\'.\n It is in \'Waiting\'. status when the procurement is waiting for another one to finish.'),
         'note': fields.text('Note'),
         'company_id': fields.many2one('res.company','Company',required=True),
     }
@@ -289,14 +288,14 @@ class procurement_order(osv.osv):
                 return False
             if not procurement.product_id.seller_ids:
                 message = _('No supplier defined for this product !')
-                self.message_append_note(cr, uid, [procurement.id], body=message)
+                self.message_post(cr, uid, [procurement.id], body=message)
                 cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
                 return False
             partner = procurement.product_id.seller_id #Taken Main Supplier of Product of Procurement.
 
             if not partner:
                 message = _('No default supplier defined for this product')
-                self.message_append_note(cr, uid, [procurement.id], body=message)
+                self.message_post(cr, uid, [procurement.id], body=message)
                 cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
                 return False
             if user.company_id and user.company_id.partner_id:
@@ -306,7 +305,7 @@ class procurement_order(osv.osv):
             address_id = partner_obj.address_get(cr, uid, [partner.id], ['delivery'])['delivery']
             if not address_id:
                 message = _('No address defined for the supplier')
-                self.message_append_note(cr, uid, [procurement.id], body=message)
+                self.message_post(cr, uid, [procurement.id], body=message)
                 cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
                 return False
         return True
@@ -319,13 +318,13 @@ class procurement_order(osv.osv):
             if record.move_id and record.move_id.state == 'cancel':
                 return True
         return False
-    
+
     #Initialize get_phantom_bom_id method as it is raising an error from yml of mrp_jit
     #when one install first mrp and after that, mrp_jit. get_phantom_bom_id defined in mrp module
     #which is not dependent for mrp_jit.
     def get_phantom_bom_id(self, cr, uid, ids, context=None):
         return False
-    
+
     def action_confirm(self, cr, uid, ids, context=None):
         """ Confirms procurement and writes exception message if any.
         @return: True
@@ -333,8 +332,8 @@ class procurement_order(osv.osv):
         move_obj = self.pool.get('stock.move')
         for procurement in self.browse(cr, uid, ids, context=context):
             if procurement.product_qty <= 0.00:
-                raise osv.except_osv(_('Insufficient Data!'),
-                    _('Quantity in procurement order(s) must be greater than 0.'))
+                raise osv.except_osv(_('Data Insufficient !'),
+                    _('Please check the quantity in procurement order(s) for the product "%s", it should not be 0 or less!' % procurement.product_id.name))
             if procurement.product_id.type in ('product', 'consu'):
                 if not procurement.move_id:
                     source = procurement.location_id.id
@@ -362,11 +361,10 @@ class procurement_order(osv.osv):
         """ Changes procurement state to Running and writes message.
         @return: True
         """
-        message = _('From stock: products assigned.')
+        message = _('Products reserved from stock.')
         self.write(cr, uid, ids, {'state': 'running',
                 'message': message}, context=context)
-        self.message_append_note(cr, uid, ids, body=message, context=context)
-        self.running_send_note(cr, uid, ids, context=context)
+        self.message_post(cr, uid, ids, body=message, context=context)
         return True
 
     def _check_make_to_stock_service(self, cr, uid, procurement, context=None):
@@ -389,16 +387,14 @@ class procurement_order(osv.osv):
                 ok = ok and self.pool.get('stock.move').action_assign(cr, uid, [id])
                 order_point_id = self.pool.get('stock.warehouse.orderpoint').search(cr, uid, [('product_id', '=', procurement.product_id.id)], context=context)
                 if not order_point_id and not ok:
-                     message = _("Not enough stock and no minimum orderpoint rule defined.")
-                elif not order_point_id:
-                    message = _("No minimum orderpoint rule defined.")
+                    message = _("Not enough stock and no minimum orderpoint rule defined.")
                 elif not ok:
                     message = _("Not enough stock.")
 
                 if message:
                     message = _("Procurement '%s' is in exception: ") % (procurement.name) + message
                     cr.execute('update procurement_order set message=%s where id=%s', (message, procurement.id))
-                    self.message_append_note(cr, uid, [procurement.id], body=message, context=context)
+                    self.message_post(cr, uid, [procurement.id], body=message, context=context)
         return ok
 
     def action_produce_assign_service(self, cr, uid, ids, context=None):
@@ -407,7 +403,6 @@ class procurement_order(osv.osv):
         """
         for procurement in self.browse(cr, uid, ids, context=context):
             self.write(cr, uid, [procurement.id], {'state': 'running'})
-        self.running_send_note(cr, uid, ids, context=None)
         return True
 
     def action_produce_assign_product(self, cr, uid, ids, context=None):
@@ -423,24 +418,26 @@ class procurement_order(osv.osv):
         """
         return 0
 
+    # XXX action_cancel() should accept a context argument
     def action_cancel(self, cr, uid, ids):
-        """ Cancels procurement and writes move state to Assigned.
+        """Cancel Procurements and either cancel or assign the related Stock Moves, depending on the procurement configuration.
+        
         @return: True
         """
-        todo = []
-        todo2 = []
+        to_assign = []
+        to_cancel = []
         move_obj = self.pool.get('stock.move')
         for proc in self.browse(cr, uid, ids):
             if proc.close_move and proc.move_id:
                 if proc.move_id.state not in ('done', 'cancel'):
-                    todo2.append(proc.move_id.id)
+                    to_cancel.append(proc.move_id.id)
             else:
                 if proc.move_id and proc.move_id.state == 'waiting':
-                    todo.append(proc.move_id.id)
-        if len(todo2):
-            move_obj.action_cancel(cr, uid, todo2)
-        if len(todo):
-            move_obj.write(cr, uid, todo, {'state': 'assigned'})
+                    to_assign.append(proc.move_id.id)
+        if len(to_cancel):
+            move_obj.action_cancel(cr, uid, to_cancel)
+        if len(to_assign):
+            move_obj.write(cr, uid, to_assign, {'state': 'assigned'})
         self.write(cr, uid, ids, {'state': 'cancel'})
         self.cancel_send_note(cr, uid, ids, context=None)
         wf_service = netsvc.LocalService("workflow")
@@ -467,7 +464,6 @@ class procurement_order(osv.osv):
         @return: True
         """
         res = self.write(cr, uid, ids, {'state': 'ready'})
-        self.ready_send_note(cr, uid, ids, context=None)
         return res
 
     def action_done(self, cr, uid, ids):
@@ -496,22 +492,16 @@ class procurement_order(osv.osv):
         return obj_id
 
     def create_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been <b>created</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement <b>created</b>."), context=context)
 
     def confirm_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been <b>confirmed</b>."), context=context)
-
-    def running_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been set to <b>running</b>."), context=context)
-
-    def ready_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been set to <b>ready</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement <b>confirmed</b>."), context=context)
 
     def cancel_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been <b>cancelled</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement <b>cancelled</b>."), context=context)
 
     def done_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Procurement has been <b>done</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Procurement <b>done</b>."), context=context)
 
 procurement_order()
 
@@ -548,20 +538,33 @@ class stock_warehouse_orderpoint(osv.osv):
             result[orderpoint.id] = procurement_ids
         return result
 
+    def _check_product_uom(self, cr, uid, ids, context=None):
+        '''
+        Check if the UoM has the same category as the product standard UoM
+        '''
+        if not context:
+            context = {}
+            
+        for rule in self.browse(cr, uid, ids, context=context):
+            if rule.product_id.uom_id.category_id.id != rule.product_uom.category_id.id:
+                return False
+            
+        return True
+
     _columns = {
         'name': fields.char('Name', size=32, required=True),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the orderpoint without removing it."),
         'logic': fields.selection([('max','Order to Max'),('price','Best price (not yet active!)')], 'Reordering Mode', required=True),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True, ondelete="cascade"),
         'location_id': fields.many2one('stock.location', 'Location', required=True, ondelete="cascade"),
-        'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
+        'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','!=','service')]),
         'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True),
         'product_min_qty': fields.float('Minimum Quantity', required=True,
             help="When the virtual stock goes below the Min Quantity specified for this field, OpenERP generates "\
-            "a procurement to bring the virtual stock to the Max Quantity."),
+            "a procurement to bring the forecasted quantity to the Max Quantity."),
         'product_max_qty': fields.float('Maximum Quantity', required=True,
             help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
-            "a procurement to bring the virtual stock to the Quantity specified as Max Quantity."),
+            "a procurement to bring the forecasted quantity to the Quantity specified as Max Quantity."),
         'qty_multiple': fields.integer('Qty Multiple', required=True,
             help="The procurement quantity will be rounded up to this multiple."),
         'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),
@@ -580,6 +583,9 @@ class stock_warehouse_orderpoint(osv.osv):
     _sql_constraints = [
         ('qty_multiple_check', 'CHECK( qty_multiple > 0 )', 'Qty Multiple must be greater than zero.'),
     ]
+    _constraints = [
+        (_check_product_uom, 'You have to select a product unit of measure in the same category than the default unit of measure of the product', ['product_id', 'product_uom']),
+    ]
 
     def default_get(self, cr, uid, fields, context=None):
         res = super(stock_warehouse_orderpoint, self).default_get(cr, uid, fields, context)
@@ -610,9 +616,10 @@ class stock_warehouse_orderpoint(osv.osv):
         """
         if product_id:
             prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            d = {'product_uom': [('category_id', '=', prod.uom_id.category_id.id)]}
             v = {'product_uom': prod.uom_id.id}
-            return {'value': v}
-        return {}
+            return {'value': v, 'domain': d}
+        return {'domain': {'product_uom': []}}
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
@@ -622,7 +629,18 @@ class stock_warehouse_orderpoint(osv.osv):
         })
         return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context)
 
-stock_warehouse_orderpoint()
+class product_template(osv.osv):
+    _inherit="product.template"
+
+    _columns = {
+        'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable: Will not imply stock management for this product. \nStockable product: Will imply stock management for this product."),
+        '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, the product is taken from the stock or we wait for replenishment. \nMake to Order: When needed, the product is purchased or produced."),
+        'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Manufacture: When procuring the product, a manufacturing order or a task will be generated, depending on the product type. \nBuy: When procuring the product, a purchase order will be generated."),
+    }
+    _defaults = {
+        'procure_method': 'make_to_stock',
+        'supply_method': 'buy',
+    }
 
 class product_product(osv.osv):
     _inherit="product.product"
@@ -630,6 +648,6 @@ class product_product(osv.osv):
         'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
     }
 
-product_product()
+
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/procurement_demo.xml b/addons/procurement/procurement_demo.xml
new file mode 100644
index 00000000000..608eb56f3ba
--- /dev/null
+++ b/addons/procurement/procurement_demo.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="product.product_product_1" model="product.product">
+            <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
+        </record>
+
+        <record id="product.product_product_2" model="product.product">
+            <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
+        </record>
+
+        <record id="product.product_product_3" model="product.product">
+            <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
+        </record>
+
+        <record id="product.product_product_4" model="product.product">
+            <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
+
+        </record>
+        <record id="product.product_product_5" model="product.product">
+            <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
+        </record>
+
+        <record id="product.product_product_6" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_7" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_8" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_9" model="product.product">
+            <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
+        </record>
+
+        <record id="product.product_product_10" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_11" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_12" model="product.product">
+            <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
+        </record>
+
+        <record id="product.product_product_13" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_14" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_15" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_16" model="product.product">
+            <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
+        </record>
+
+        <record id="product.product_product_17" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_18" model="product.product">
+            <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
+        </record>
+
+        <record id="product.product_product_19" model="product.product">
+            <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
+        </record>
+
+        <record id="product.product_product_20" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_21" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_22" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_23" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_24" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_25" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_26" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_27" model="product.product">
+            <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
+        </record>
+
+        <record id="product.product_product_28" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_29" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_30" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_31" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_32" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_33" model="product.product">
+            <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
+        </record>
+
+        <record id="product.product_product_34" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_35" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_36" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_37" model="product.product">
+            <field name="type">product</field>
+            <field name="procure_method">make_to_order</field>
+        </record>
+
+        <record id="product.product_product_38" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_39" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_44" model="product.product">
+            <field name="procure_method">make_to_order</field>
+            <field name="supply_method">produce</field>
+        </record>
+
+        <record id="product.product_product_45" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_46" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_47" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_48" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+    </data>
+</openerp>
+    
\ No newline at end of file
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index dbdc65c6763..42179b17f92 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -103,8 +103,8 @@
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
@@ -166,7 +166,11 @@
             <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_perm_exceptions':1}</field>
             <field name="search_view_id" ref="view_procurement_filter"/>
-            <field name="help">Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sales Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the product configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message).</field>
+            <field name="help" type="html">
+                <p>
+                Procurement Orders represent the need for a certain quantity of products, at a given time, in a given location. Sales Orders are one typical source of Procurement Orders (but these are distinct documents). Depending on the procurement parameters and the product configuration, the procurement engine will attempt to satisfy the need by reserving products from stock, ordering products from a supplier, or passing a manufacturing order, etc. A Procurement Exception occurs when the system cannot find a way to fulfill a procurement. Some exceptions will resolve themselves automatically, but others require manual intervention (those are identified by a specific error message).
+                </p>
+            </field>
         </record>
 
         <record id="procurement_action5" model="ir.actions.act_window">
@@ -261,12 +265,12 @@
         </record>
 
         <act_window
-        context="{'search_default_warehouse_id': active_id, 'default_warehouse_id': active_id}"
-        id="act_stock_warehouse_2_stock_warehouse_orderpoint"
-        name="Reordering Rules"
-        res_model="stock.warehouse.orderpoint"
-        src_model="stock.warehouse"
-        groups="stock.group_stock_user"/>
+            context="{'search_default_warehouse_id': active_id, 'default_warehouse_id': active_id}"
+            id="act_stock_warehouse_2_stock_warehouse_orderpoint"
+            name="Reordering Rules"
+            res_model="stock.warehouse.orderpoint"
+            src_model="stock.warehouse"
+            groups="stock.group_stock_user"/>
 
         <act_window
             context="{'product_uom': locals().has_key('uom_id') and uom_id, 'default_procurement_id': active_id}"
@@ -283,22 +287,33 @@
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_configuration" sequence="5"/>
             <menuitem action="action_orderpoint_form" id="menu_stock_order_points" parent="stock.menu_stock_configuration" sequence="10"/>
 
-        <record id="product_normal_form_view" model="ir.ui.view">
-            <field name="name">product.normal.form.orderpoint.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+
+        <record model="ir.actions.act_window" id="product_open_orderpoint">
+            <field name="context">{'default_product_id': active_id, 'search_default_product_id': active_id}</field>
+            <field name="name">Orderpoints</field>
+            <field name="res_model">stock.warehouse.orderpoint</field>
+        </record>
+
+        <record model="ir.ui.view" id="product_template_form_view_procurement">
+            <field name="name">product.template.procurement</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
-                <page string="Procurement &amp; Locations" position="inside">
-                    <separator string="Minimum Stock Rules"/>
-                        <field name="orderpoint_ids" widget="one2many_list" mode="tree" context="{'default_product_id': active_id}">
-                            <tree string="Reordering Rules">
-                                <field name="name"/>
-                                <field name="warehouse_id"/>
-                                <field name="product_min_qty"/>
-                                <field name="product_max_qty"/>
-                            </tree>
-                        </field>
-                </page>
+                <xpath expr="//field[@name='type']" position="after">
+                    <field name="procure_method"/>
+                    <field name="supply_method"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="product_search_form_view_procurment" model="ir.ui.view">
+            <field name="name">product.search.procurment.form</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_search_form_view"/>
+            <field name="arch" type="xml">
+                <filter name="consumable" position="before">
+                   <filter string="Products" icon="terp-accessories-archiver" domain="[('type','=','product')]" help="Stockable products"/>
+                </filter>
             </field>
         </record>
 
@@ -307,10 +322,36 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='image_medium']" position="after">
-                    <div class='oe_right oe_button_box'>
-                        <button string="Procurement Request" name="%(act_make_procurement)d" type="action"/>
-                    </div>
+                <xpath expr="//div[@name='buttons']" position="inside">
+                    <button string="Request Procurement" name="%(act_make_procurement)d" type="action"/>
+                    <button string="Orderpoints" name="%(product_open_orderpoint)d" type="action"/>
+                </xpath>
+                <xpath expr="//field[@name='cost_method']" position="before">
+                    <field name="procure_method" groups="base.group_user"/>
+                    <field name="supply_method" groups="base.group_user"/> 
+                </xpath>
+                <xpath expr="//group[@name='general']" position="after" >
+                   <group name="procurement_help" class="oe_grey" col="1" groups="base.group_user">
+                       <p attrs="{'invisible': ['|','|',('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                           When you sell this service, nothing special will be triggered
+                           to deliver the customer, as you set the procurement method as
+                           'Make to Stock'.
+                       </p>
+                       <p attrs="{'invisible': ['|','|',('type','&lt;&gt;','product'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                           When you sell this product, OpenERP will <b>use the available
+                           inventory</b> for the delivery order.
+                           <br/><br/>
+                           If there are not enough quantities available, the delivery order
+                           will wait for new products. To fulfill the inventory, you should
+                           create others rules like orderpoints.
+                       </p>
+                       <p attrs="{'invisible': ['|','|',('type','&lt;&gt;','consu'),('procure_method','&lt;&gt;','make_to_stock')]}">
+                           When you sell this product, a delivery order will be created.
+                           OpenERP will consider that the <b>required quantities are always
+                           available</b> as it's a consumable (as a result of this, the quantity
+                           on hand may become negative).
+                       </p>
+                   </group>
                 </xpath>
             </field>
         </record>
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 7a87697f5c8..0c96bf1e689 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -54,7 +54,6 @@ class procurement_order(osv.osv):
         '''
         if context is None:
             context = {}
-
         try:
             if use_new_cursor:
                 cr = pooler.get_db(use_new_cursor).cursor()
@@ -119,19 +118,6 @@ class procurement_order(osv.osv):
                 offset += len(ids)
                 if not ids: break
             end_date = fields.datetime.now()
-            if uid:
-                # Chatter: old res.request is now a chatter on res.users, id=uid
-                summary = _("""Here is the procurement scheduling report.
-
-        Start Time: %s 
-        End Time: %s 
-        Total Procurements processed: %d 
-        Procurements with exceptions: %d 
-        Skipped Procurements (scheduled date outside of scheduler range) %d 
-
-        Exceptions:\n""") % (start_date, end_date, report_total, report_except, report_later)
-                summary += '\n'.join(report)
-                procurement_obj.message_append_note(cr, uid, ids, body=summary, context=context)
 
             if use_new_cursor:
                 cr.commit()
@@ -211,6 +197,12 @@ class procurement_order(osv.osv):
                 'location_id': orderpoint.location_id.id,
                 'procure_method': 'make_to_order',
                 'origin': orderpoint.name}
+        
+    def _product_virtual_get(self, cr, uid, order_point):
+        location_obj = self.pool.get('stock.location')
+        return location_obj._product_virtual_get(cr, uid,
+                order_point.location_id.id, [order_point.product_id.id],
+                {'uom': order_point.product_uom.id})[order_point.product_id.id]
 
     def _procure_orderpoint_confirm(self, cr, uid, automatic=False,\
             use_new_cursor=False, context=None, user_id=False):
@@ -231,7 +223,7 @@ class procurement_order(osv.osv):
         if use_new_cursor:
             cr = pooler.get_db(use_new_cursor).cursor()
         orderpoint_obj = self.pool.get('stock.warehouse.orderpoint')
-        location_obj = self.pool.get('stock.location')
+        
         procurement_obj = self.pool.get('procurement.order')
         wf_service = netsvc.LocalService("workflow")
         offset = 0
@@ -241,14 +233,9 @@ class procurement_order(osv.osv):
         while ids:
             ids = orderpoint_obj.search(cr, uid, [], offset=offset, limit=100)
             for op in orderpoint_obj.browse(cr, uid, ids, context=context):
-                if op.procurement_id.state != 'exception':
-                    if op.procurement_id and hasattr(op.procurement_id, 'purchase_id'):
-                        if op.procurement_id.purchase_id.state in ('draft', 'confirmed'):
-                            continue
-                prods = location_obj._product_virtual_get(cr, uid,
-                        op.location_id.id, [op.product_id.id],
-                        {'uom': op.product_uom.id})[op.product_id.id]
-
+                prods = self._product_virtual_get(cr, uid, op)
+                if prods is None:
+                    continue
                 if prods < op.product_min_qty:
                     qty = max(op.product_min_qty, op.product_max_qty)-prods
 
diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml
index 4d2e7553371..9228fcc323b 100644
--- a/addons/procurement/wizard/make_procurement_view.xml
+++ b/addons/procurement/wizard/make_procurement_view.xml
@@ -9,13 +9,21 @@
             <field name="model">make.procurement</field>
             <field name="arch" type="xml">
                 <form string="Procurement Request" version="7.0">
-                    <group col="4" string="This wizard will plan the procurement for this product. This procurement may generate task, production orders or purchase orders."/>
-                     <group>
-                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
-                        <field name="qty"/>
-                        <field name="uom_id" groups="product.group_uom"/>
-                        <field name="date_planned"/>
+                    <p class="oe_gray">
+                        Fill is this for to launch a procurement request for this
+                        product. According to the product configuration, this may
+                        trigger a draft purchase order, a manufacturing order or
+                        a new task.
+                    </p>
+                    <group>
                         <field name="warehouse_id" groups="stock.group_locations"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id)"/>
+                        <label for="qty"/>
+                        <div>
+                            <field name="qty" class="oe_inline"/>
+                            <field name="uom_id" groups="product.group_uom"/>
+                        </div>
+                        <field name="date_planned"/>
                     </group>
                     <footer>
                         <button name="make_procurement" string="Ask New Products" type="object"  class="oe_highlight"  />
@@ -26,13 +34,13 @@
             </field>
         </record>
 
-        <act_window name="Procurement Request"
-            res_model="make.procurement"
-            src_model="product.product"
-            view_mode="form"
-            target="new"
-            key2="client_action_multi"
-            id="act_make_procurement"/>
+        <record model="ir.actions.act_window" id="act_make_procurement">
+            <field name="name">Procurement Request</field>
+            <field name="res_model">make.procurement</field>
+            <field name="src_model">product.product</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
 
     </data>
 </openerp>
diff --git a/addons/procurement/wizard/schedulers_all_view.xml b/addons/procurement/wizard/schedulers_all_view.xml
index 2e72dfdbadc..321f05bb223 100644
--- a/addons/procurement/wizard/schedulers_all_view.xml
+++ b/addons/procurement/wizard/schedulers_all_view.xml
@@ -2,10 +2,10 @@
 <openerp>
     <data>
 
-        <!--  Compute Schedulers -->
+        <!--  Run Schedulers -->
 
         <record id="view_compute_schedulers_wizard" model="ir.ui.view">
-            <field name="name">Compute Schedulers</field>
+            <field name="name">Run Schedulers</field>
             <field name="model">procurement.order.compute.all</field>
             <field name="arch" type="xml">
                 <form string="Scheduler Parameters" version="7.0">
@@ -13,7 +13,7 @@
                         <field name="automatic"/>
                     </group>
                     <footer>
-                        <button name="procure_calculation" string="Compute Schedulers" type="object"  class="oe_highlight"  />
+                        <button name="procure_calculation" string="Run Schedulers" type="object"  class="oe_highlight"  />
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>
@@ -21,7 +21,7 @@
             </field>
         </record>
 
-         <act_window name="Compute Schedulers"
+         <act_window name="Run Schedulers"
             res_model="procurement.order.compute.all"
             src_model="procurement.order"
             view_mode="form"
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index 5ade1a1a66b..fdadda2e4d4 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -21,14 +21,13 @@
 
 
 {
-    "name" : "Products & Pricelists",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
+    'name': 'Products & Pricelists',
+    'version': '1.1',
+    'author': 'OpenERP SA',
     'category': 'Sales Management',
-    "depends" : ["base", "process", "decimal_precision", "mail"],
-    "init_xml" : [],
-    "demo_xml" : ["product_demo.xml", "product_image_demo.xml"],
-    "description": """
+    'depends': ['base', 'process', 'decimal_precision', 'mail'],
+    'demo': ['product_demo.xml', 'product_image_demo.xml'],
+    'description': """
 This is the base module for managing products and pricelists in OpenERP.
 ========================================================================
 
@@ -36,6 +35,7 @@ Products support variants, different pricing methods, suppliers information,
 make to stock/order, different unit of measures, packaging and properties.
 
 Pricelists support:
+-------------------
     * Multiple-level of discount (by product, category, quantities)
     * Compute price based on different criteria:
         * Other pricelist
@@ -47,7 +47,7 @@ Pricelists preferences by product and/or partners.
 
 Print product labels with barcode.
     """,
-    'update_xml': [
+    'data': [
         'security/product_security.xml',
         'security/ir.model.access.csv',
         'wizard/product_price_view.xml',
@@ -66,7 +66,6 @@ Print product labels with barcode.
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0068861431437',
     'images': ['images/product_uom.jpeg','images/product_pricelists.jpeg','images/products_categories.jpeg', 'images/products_form.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po
index f3638639691..d7c51da4993 100644
--- a/addons/product/i18n/ar.po
+++ b/addons/product/i18n/ar.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
 msgid "DDR 512MB PC400"
-msgstr ""
+msgstr "رام دي دي ار 512 ميقا بايت PC400"
 
 #. module: product
 #: field:product.packaging,rows:0
@@ -41,6 +41,8 @@ msgid ""
 "Set a template if this rule only apply to a template of product. Keep empty "
 "for all products"
 msgstr ""
+"تعيين قالب إذا كانت هذه القاعدة لا تنطبق إلا على قالب من المنتج. تبقى فارغة "
+"لجميع المنتجات"
 
 #. module: product
 #: help:product.product,virtual_available:0
@@ -96,7 +98,7 @@ msgstr "الوارد"
 msgid ""
 "This pricelist will be used, instead of the default one, for sales to the "
 "current partner"
-msgstr ""
+msgstr "قائمة الأسعار سوف تستخدم، بدلاً عن الافتراضية، للبيع للشريك الحالي"
 
 #. module: product
 #: field:product.template,seller_qty:0
@@ -178,12 +180,12 @@ msgstr "متوسط السعر"
 #. module: product
 #: help:product.pricelist.item,name:0
 msgid "Explicit rule name for this pricelist line."
-msgstr ""
+msgstr "توضيح اسم القاعدة لخط قائمة الأسعار."
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu1_product_template
 msgid "Processor AMD Athlon XP 1800+"
-msgstr ""
+msgstr "معالج AMD Athlon XP 1800+"
 
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
@@ -221,11 +223,13 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from a sale order line."
 msgstr ""
+"يحدد إذا كان المنتج يمكن أن تكون واضحة في قائمة المنتجات ضمن مجموعة مختارة "
+"من بيع خط النظام."
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
 msgid "Default Public Pricelist Version"
-msgstr ""
+msgstr "النسخة الافتراضية العامة للائحة الأسعار"
 
 #. module: product
 #: selection:product.template,cost_method:0
@@ -250,11 +254,13 @@ msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"إنشاء نموذج المنتج للحصول على كل الشراء أو البيع. حددالمورد إذا كان من "
+"الممكن شراء المنتج."
 
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  على سبيل المثال: 1 * (هذه الوحدة) = النسبة * (الوحدة المرجعية)"
 
 #. module: product
 #: code:addons/product/product.py:418
@@ -278,17 +284,17 @@ msgstr ""
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Supplier name, price, product code, ..."
-msgstr ""
+msgstr "ااسم المورد، السعر، كود المنتج"
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
 msgid "HDD Seagate 7200.8 160GB"
-msgstr ""
+msgstr "هاردسك سيقيت 7200.8 160GB"
 
 #. module: product
 #: field:product.product,ean13:0
 msgid "EAN13"
-msgstr ""
+msgstr "EAN13"
 
 #. module: product
 #: field:product.template,seller_id:0
@@ -316,26 +322,27 @@ msgstr "فئة"
 msgid ""
 "The rule only applies if the partner buys/sells more than this quantity."
 msgstr ""
+"والقاعدة لا تنطبق إلا إذا كان الشريك يشتري / يبيع أكثر من هذه الكمية."
 
 #. module: product
 #: model:product.template,name:product.product_product_woodmm0_product_template
 msgid "Wood 2mm"
-msgstr ""
+msgstr "خشب 2ملم"
 
 #. module: product
 #: field:product.price_list,qty1:0
 msgid "Quantity-1"
-msgstr ""
+msgstr "الكمية-1"
 
 #. module: product
 #: help:product.packaging,ul_qty:0
 msgid "The number of packages by layer"
-msgstr ""
+msgstr "وعدد الرزم من قبل الطبقة"
 
 #. module: product
 #: field:product.packaging,qty:0
 msgid "Quantity by Package"
-msgstr ""
+msgstr "الكمية لكل طبقة"
 
 #. module: product
 #: view:product.product:0
@@ -347,7 +354,7 @@ msgstr "الحالة"
 #. module: product
 #: help:product.template,categ_id:0
 msgid "Select category for the current product"
-msgstr ""
+msgstr "اختار تصنيف المنتج الحالي"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
@@ -357,38 +364,38 @@ msgstr "الصادر"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Reference UoM for this category"
-msgstr ""
+msgstr "المرجع وحدة القياس(UoM) لهذا الصنف"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
 #: field:product.product,lst_price:0
 msgid "Public Price"
-msgstr ""
+msgstr "السعر العام"
 
 #. module: product
 #: field:product.price_list,qty5:0
 msgid "Quantity-5"
-msgstr ""
+msgstr "الكمية - 5"
 
 #. module: product
 #: model:product.category,name:product.product_category_10
 msgid "IT components"
-msgstr ""
+msgstr "مكونات تقنية معلومات"
 
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
-msgstr ""
+msgstr "مدير الإنتاج"
 
 #. module: product
 #: field:product.supplierinfo,product_name:0
 msgid "Supplier Product Name"
-msgstr ""
+msgstr "اسم مورد المنتج"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc3_product_template
 msgid "Medium PC"
-msgstr ""
+msgstr "حاسوب متوسط"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action_puchased
@@ -398,6 +405,9 @@ msgid ""
 "information about your products related to procurement logistics, sales "
 "price, product category, suppliers and so on."
 msgstr ""
+"يمكن شراء المنتجات و / أو بيعها. يمكن أن تكون مواد الخام ،منتجات مخزنة، مواد "
+"الاستهلاكية، خدمات. شكل المنتج يحتوي على معلومات مفصلة عن المنتجات والخدمات "
+"اللوجستية المتعلقة بالمشتريات، سعر البيع، وتصنيف المنتج والموردين وهلم جرا."
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -412,39 +422,47 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
+"كمية المنتجات الحالية.\n"
+"  في سياق مع موقع واحد للسهم، وهذا يشمل البضائع المخزنة في هذا الموقع، أو أي "
+"من أبنائه.\n"
+"  في سياق واحد مع مستودع، وهذا يشمل السلع المخزنة في الموقع من أسهم هذه "
+"المستودعات، أو أي من أبنائه.\n"
+"  في سياق واحد مع متجر، وهذا يشمل السلع المخزنة في الموقع الأسهم من مستودع "
+"هذا المحل، أو أي من أبنائه.\n"
+"  خلاف ذلك، وهذا يشمل السلع المخزنة في أي مكان الأسهم كتبته باسم 'الداخلية'."
 
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price Search"
-msgstr ""
+msgstr "بحث عن سعر المنتجات"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,description_sale:0
 msgid "Sale Description"
-msgstr ""
+msgstr "وصف البيع"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Localisation"
-msgstr ""
+msgstr "محلية المخزون"
 
 #. module: product
 #: help:product.packaging,length:0
 msgid "The length of the package"
-msgstr ""
+msgstr "طول الحزمة"
 
 #. module: product
 #: help:product.template,weight_net:0
 msgid "The net weight in Kg."
-msgstr ""
+msgstr "الوزن الصافي بالكيلو جرام"
 
 #. module: product
 #: help:product.template,state:0
 msgid "Tells the user if he can use the product or not."
-msgstr ""
+msgstr "اخبر المستخدم إذا كان يمكن أن ييستخدم المنتج أو لا"
 
 #. module: product
 #: field:pricelist.partnerinfo,min_quantity:0
@@ -460,12 +478,12 @@ msgstr "الإرتفاع"
 #. module: product
 #: help:product.pricelist.version,date_end:0
 msgid "Ending date for this pricelist version to be valid."
-msgstr ""
+msgstr "إنهاء تاريخ اصدارة لائحة الأسعار لتكون صالحة."
 
 #. module: product
 #: model:product.category,name:product.product_category_0
 msgid "All products"
-msgstr ""
+msgstr "كل المنتجات"
 
 #. module: product
 #: model:ir.model,name:product.model_pricelist_partnerinfo
@@ -475,22 +493,22 @@ msgstr "pricelist.partnerinfo"
 #. module: product
 #: field:product.price_list,qty2:0
 msgid "Quantity-2"
-msgstr ""
+msgstr "الكمية-2"
 
 #. module: product
 #: field:product.price_list,qty3:0
 msgid "Quantity-3"
-msgstr ""
+msgstr "الكمية-3"
 
 #. module: product
 #: view:product.product:0
 msgid "Codes"
-msgstr ""
+msgstr "الرموز"
 
 #. module: product
 #: field:product.price_list,qty4:0
 msgid "Quantity-4"
-msgstr ""
+msgstr "الكمية-4"
 
 #. module: product
 #: view:res.partner:0
@@ -512,17 +530,21 @@ msgid ""
 "each version has several rules. Example: the customer price of a product "
 "category will be based on the supplier price multiplied by 1.80."
 msgstr ""
+"قائمة أسعار يحتوي على القواعد التي يتعين تقييمها من أجل حساب سعر الشراء أو "
+"البيع لجميع الشركاء الذين تم تعيينهم للائحة الاسعار. قوائم الأسعار لديها عدة "
+"إصدارات (2010، 2011، تعزيز فبراير 2010، الخ) وكل إصداره لديهاعدة قواعد. على "
+"سبيل المثال: سعر العميل لفئة المنتج على أساس سعر المورد مضروب في 180"
 
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
 msgid "Metal Cleats"
-msgstr ""
+msgstr "المرابط المعدنية"
 
 #. module: product
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Cannot change the category of existing UoM '%s'."
-msgstr ""
+msgstr "لا يمكن تغير فئة وحدة قياس موجودة '%s'"
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -532,7 +554,7 @@ msgstr ""
 #. module: product
 #: model:product.ul,name:product.product_ul_box
 msgid "Box 20x20x40"
-msgstr ""
+msgstr "صندوق 20×20×40"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -542,17 +564,17 @@ msgstr ""
 #. module: product
 #: model:res.groups,name:product.group_uos
 msgid "Product UoS View"
-msgstr ""
+msgstr "عرض وحدة قياس المنتج"
 
 #. module: product
 #: field:product.template,purchase_ok:0
 msgid "Can be Purchased"
-msgstr ""
+msgstr "يمكن أن تشترى"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu2_product_template
 msgid "High speed processor config"
-msgstr ""
+msgstr "إعداد معالج ذو سرعة عالية"
 
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
@@ -560,6 +582,7 @@ msgid ""
 "1 or several supplier(s) can be linked to a product. All information stands "
 "in the product form."
 msgstr ""
+"1 أو عدد من الموردين يمكن ربطهم بالمنتج. كل المعلومات تقف في شكل المنتج"
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -567,11 +590,13 @@ msgid ""
 "Quantity conversions may happen automatically between Units of Measure in "
 "the same category, according to their respective ratios."
 msgstr ""
+"كمية التحويلات قد تحدث تلقائيا بين وحدات القياس في نفس الفئة، وفقا لنسب كل "
+"منهما."
 
 #. module: product
 #: help:product.packaging,width:0
 msgid "The width of the package"
-msgstr ""
+msgstr "عرض الحزمة"
 
 #. module: product
 #: selection:product.category,type:0
@@ -581,7 +606,7 @@ msgstr "عرض"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_template_action_tree
 msgid "Product Templates"
-msgstr ""
+msgstr "قوالب المنتج"
 
 #. module: product
 #: field:product.category,parent_left:0
@@ -591,12 +616,12 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
 msgid "Restaurant Expenses"
-msgstr ""
+msgstr "مصروفات المطعم"
 
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by pallet or box."
-msgstr ""
+msgstr "إجمالي عدد المنتجات التي يمكن طرحها بالبليت أو المربع."
 
 #. module: product
 #: constraint:product.packaging:0
@@ -607,7 +632,7 @@ msgstr ""
 #. module: product
 #: field:product.pricelist.item,min_quantity:0
 msgid "Min. Quantity"
-msgstr ""
+msgstr "أقل. كمية"
 
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
@@ -641,7 +666,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
 msgid "Silent fan"
-msgstr ""
+msgstr "مروحة صامتة"
 
 #. module: product
 #: help:product.supplierinfo,name:0
@@ -655,11 +680,13 @@ msgid ""
 "not overlaps with original version. You should change the dates and "
 "reactivate the pricelist"
 msgstr ""
+"عندما تتكرر النسخة يتم تعيينها إلى غير نشطة، بحيث لا تتداخل التواريخ مع النص "
+"الأصلي. يجب عليك تغيير التواريخ وتنشيط ائحة الأسعار"
 
 #. module: product
 #: model:product.template,name:product.product_product_kitshelfofcm0_product_template
 msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "طقم رف  100 سم"
 
 #. module: product
 #: field:product.supplierinfo,name:0
@@ -669,22 +696,22 @@ msgstr "مورِّد"
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Quantity On Hand"
-msgstr ""
+msgstr "الكمية في متناول اليد"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
 msgid "Kit Keyboard + Mouse"
-msgstr ""
+msgstr "طقم لوحة مفاتيح + ماوس"
 
 #. module: product
 #: field:product.price.type,name:0
 msgid "Price Name"
-msgstr ""
+msgstr "اسم السعر"
 
 #. module: product
 #: model:product.template,name:product.product_product_arm_product_template
 msgid "Cabinet"
-msgstr ""
+msgstr "خزانة"
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -699,16 +726,24 @@ msgid ""
 "Otherwise, this includes goods arriving to any Stock Location typed as "
 "'internal'."
 msgstr ""
+"كمية المنتجات التي خطط لوصولها\n"
+" في سياق مع موقع واحد للتخزين، وهذا يشمل البضائع المخزنة في هذا الموقع، أو "
+"أي من أبنائه.\n"
+" في سياق واحد مع مستودع، وهذا يشمل السلع المخزنة في الموقع من أسهم هذه "
+"المستودعات، أو أي من أبنائه.\n"
+" في سياق واحد مع متجر، وهذا يشمل السلع المخزنة في الموقع الأسهم من مستودع "
+"هذا المحل، أو أي من أبنائه.\n"
+" خلاف ذلك، وهذا يشمل السلع المخزنة في أي موقع مخزن على ان تصنف 'داخلياً'"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodentable0_product_template
 msgid "Wooden Table"
-msgstr ""
+msgstr "طاولة خشبية"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
 msgid "Processor AMD Athlon XP 2200+"
-msgstr ""
+msgstr "معالج AMD Athlon XP 2200+"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -717,7 +752,7 @@ msgstr ""
 #: report:product.pricelist:0
 #: field:product.pricelist.version,pricelist_id:0
 msgid "Price List"
-msgstr ""
+msgstr "قائمة أسعار"
 
 #. module: product
 #: view:product.product:0
@@ -728,7 +763,7 @@ msgstr "المورّدون"
 #. module: product
 #: view:product.product:0
 msgid "To Purchase"
-msgstr ""
+msgstr "لشراء"
 
 #. module: product
 #: help:product.supplierinfo,min_qty:0
@@ -737,6 +772,8 @@ msgid ""
 "Product UoM if not empty, in the default unit of measure of the product "
 "otherwise."
 msgstr ""
+"أقل كمية لشراء من هذا المورد، التي أعرب عنها في وحدة قياس منتج المورد إن لم "
+"يكن فارغا، في وحدة القياس الافتراضية للمنتج خلاف ذلك."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -749,6 +786,8 @@ msgid ""
 "This price will be considered as a price for the supplier UoM if any or the "
 "default Unit of Measure of the product otherwise"
 msgstr ""
+"السعر سوف يعتبر كسعر وحدة القياس من المورد إذا كان أي من أو الوحدة "
+"الافتراضية للقياس المنتج طريقة أخرى"
 
 #. module: product
 #: model:product.category,name:product.product_category_5
@@ -772,11 +811,14 @@ msgid ""
 "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
 #: view:product.pricelist.item:0
 msgid "Min. Margin"
-msgstr ""
+msgstr "الحد الأدنى"
 
 #. module: product
 #: field:product.category,child_id:0
@@ -833,17 +875,19 @@ msgid ""
 "Set a product if this rule only apply to one product. Keep empty for all "
 "products"
 msgstr ""
+"تعيين المنتج إذا كانت القاعدة لا تنطبق إلا على منتج واحد. تبقي فارغة لجميع "
+"المنتجات"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement & Locations"
-msgstr ""
+msgstr "المشتروات والمواقع"
 
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
 msgid "Kitchen Design Project"
-msgstr ""
+msgstr "مشروع تصميم مطبخ"
 
 #. module: product
 #: model:product.uom,name:product.uom_hour
@@ -853,23 +897,23 @@ msgstr "ساعة"
 #. module: product
 #: selection:product.template,state:0
 msgid "In Development"
-msgstr ""
+msgstr "في التطوير"
 
 #. module: product
 #: code:addons/product/product.py:363
 #, python-format
 msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "عدم تطابق فئات وحدة قياس!"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
 msgid "Shelf of 200cm"
-msgstr ""
+msgstr "رف 200 سم"
 
 #. module: product
 #: view:product.uom:0
 msgid "Ratio & Precision"
-msgstr ""
+msgstr "النسبة والدقة"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_gram
@@ -879,7 +923,7 @@ msgstr ""
 #. module: product
 #: model:product.category,name:product.product_category_11
 msgid "IT components kits"
-msgstr ""
+msgstr "مجموعة قطع تقنية"
 
 #. module: product
 #: selection:product.category,type:0
@@ -891,7 +935,7 @@ msgstr "عادي"
 #: model:process.node,name:product.process_node_supplier0
 #: view:product.supplierinfo:0
 msgid "Supplier Information"
-msgstr ""
+msgstr "معلومات عن المورد"
 
 #. module: product
 #: field:product.price.type,currency_id:0
@@ -903,19 +947,19 @@ msgstr "العملة"
 #. module: product
 #: model:product.template,name:product.product_product_ram_product_template
 msgid "DDR 256MB PC400"
-msgstr ""
+msgstr "دي دي ار 256 ميقا بايت PC400"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
 #: view:product.category:0
 msgid "Product Categories"
-msgstr ""
+msgstr "تصنيف المنتج"
 
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr "  على سبيل المثال: 1*(الوحدة المرجعية)= النسبة* (الوحدة)"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -924,11 +968,13 @@ msgid ""
 "You can define a conversion rate between several Units of Measure within the "
 "same category."
 msgstr ""
+"إنشاء وإدارة وحدات القياس التي تريد استخدامها في النظام الخاص بك. يمكنك "
+"تعريف معدل التحويل بين عدة وحدات القياس في نفس الفئة."
 
 #. module: product
 #: field:product.packaging,weight:0
 msgid "Total Package Weight"
-msgstr ""
+msgstr "مجموع وزن الحزمة"
 
 #. module: product
 #: field:product.template,seller_info_id:0
@@ -938,7 +984,7 @@ msgstr ""
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
-msgstr ""
+msgstr "رمز تحويل الوحدة"
 
 #. module: product
 #: help:product.template,standard_price:0
@@ -946,38 +992,39 @@ msgid ""
 "Product's cost for accounting stock valuation. It is the base price for the "
 "supplier price."
 msgstr ""
+"تكلفة المنتج لقيمة المخزون المحاسبة. هذا هو السعر الأساسي لسعر المورد."
 
 #. module: product
 #: view:product.price.type:0
 msgid "Products Price Type"
-msgstr ""
+msgstr "نوع تسعير المنتجات"
 
 #. module: product
 #: field:product.product,price_extra:0
 msgid "Variant Price Extra"
-msgstr ""
+msgstr "بديل التكلفة الإضافية"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan_product_template
 msgid "Regular case fan 80mm"
-msgstr ""
+msgstr "كيس مروحة  عادية 80مم"
 
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
 msgid "Information about a product supplier"
-msgstr ""
+msgstr "معلومات عن مورد المنتج"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,description_purchase:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "وصف الشراء"
 
 #. module: product
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
+msgstr "لا يمكنك الحصول على 2 إصداراة لائحة أسعار تؤدي للتتداخل!"
 
 #. module: product
 #: help:product.supplierinfo,delay:0
@@ -994,6 +1041,9 @@ msgid ""
 "manage new versions of a price list. Some examples of versions: 2010, 2011, "
 "Summer Promotion, etc."
 msgstr ""
+"يمكن أن يكون هناك أكثر من إصدارة لقائمة الأسعار. هنا يمكنك إنشاء وإدارة "
+"الإصدارات الجديدة لقائمة الأسعار. بعد الأمثلة لإصدارات:2010,2011, الترويج "
+"الصيفي, إلى آخره"
 
 #. module: product
 #: selection:product.template,type:0
@@ -1018,12 +1068,12 @@ msgstr ""
 #. module: product
 #: model:ir.model,name:product.model_product_ul
 msgid "Shipping Unit"
-msgstr ""
+msgstr "وحدة الشحن"
 
 #. module: product
 #: field:pricelist.partnerinfo,suppinfo_id:0
 msgid "Partner Information"
-msgstr ""
+msgstr "معلومات عن الشريك"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1040,7 +1090,7 @@ msgstr "معلومات"
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Products Listprices Items"
-msgstr ""
+msgstr "قائمة الأسعار منتجات الأصناف"
 
 #. module: product
 #: view:product.packaging:0
@@ -1050,7 +1100,7 @@ msgstr "معلومات أخرى"
 #. module: product
 #: field:product.pricelist.version,items_id:0
 msgid "Price List Items"
-msgstr ""
+msgstr "سعر قطع القائمة"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_categ_form_action
@@ -1064,7 +1114,7 @@ msgstr ""
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "أعلى من وحدة القياس المرجعية"
 
 #. module: product
 #: field:product.category,parent_right:0
@@ -1074,7 +1124,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 msgid "To Sell"
-msgstr ""
+msgstr "للبيع"
 
 #. module: product
 #: help:product.product,outgoing_qty:0
@@ -1093,22 +1143,22 @@ msgstr ""
 #. module: product
 #: model:product.category,name:product.product_category_services0
 msgid "Marketable Services"
-msgstr ""
+msgstr "تسويق الخدمات"
 
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
-msgstr ""
+msgstr "رسوم السعر إضافية"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
 msgid "Mainboard ASUStek A7N8X"
-msgstr ""
+msgstr "لوحة الأم ASUStek A7N8X"
 
 #. module: product
 #: field:product.product,packaging:0
 msgid "Logistical Units"
-msgstr ""
+msgstr "وحدات لوجستية"
 
 #. module: product
 #: field:product.category,complete_name:0
@@ -1138,11 +1188,15 @@ msgid ""
 "contains detailed information about your products related to procurement "
 "logistics, sales price, product category, suppliers and so on."
 msgstr ""
+"يجب عليك تعريف المنتج لكل شئ قمت بشراءه أو بيعه. المنتجات يمكن أن تكون مواد "
+"الخام والمنتجات قابلة للتخزين والمواد الاستهلاكية أو الخدمات. شكل المنتج "
+"يحتوي على معلومات مفصلة حول المنتجات متعلقة باللوجستية والمشتريات، سعر "
+"البيع، وفئة المنتج، والموردين وهلم جرا."
 
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "kg"
-msgstr ""
+msgstr "كجم"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_meter
@@ -1166,12 +1220,14 @@ msgid ""
 "at the end of the year), Average Price: the cost price is recomputed at each "
 "reception of products."
 msgstr ""
+"السعر القياسي: يتم إصلاح سعر التكلفة وإعادة الحساب دورياً (عادة في نهاية "
+"السنة)، السعر متوسط: إعادة حساب سعر التكلفة لكل المنتجات المستلمة"
 
 #. module: product
 #: help:product.category,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
-msgstr ""
+msgstr "يعطي ترتيب التسلسل عند عرض قائمة من فئات المنتجات"
 
 #. module: product
 #: field:product.uom,factor:0
@@ -1185,6 +1241,8 @@ msgid ""
 "Determine if the product is visible in the list of products within a "
 "selection from a purchase order line."
 msgstr ""
+"تحديد ما إذا كان المنتج هو ظاهر في قائمة المنتجات ضمن مجموعة مختارة من شراء "
+"خط النظام."
 
 #. module: product
 #: field:product.template,weight_net:0
@@ -1199,7 +1257,7 @@ msgstr "العرض"
 #. module: product
 #: help:product.price.type,field:0
 msgid "Associated field in the product form."
-msgstr ""
+msgstr "الحقل المرتبط بشكل المنتج"
 
 #. module: product
 #: view:product.product:0
@@ -1219,7 +1277,7 @@ msgstr ""
 #. module: product
 #: field:product.template,uos_id:0
 msgid "Unit of Sale"
-msgstr ""
+msgstr "وحدة بيع"
 
 #. module: product
 #: help:product.template,seller_delay:0
@@ -1232,7 +1290,7 @@ msgstr ""
 #. module: product
 #: help:product.template,seller_id:0
 msgid "Main Supplier who has highest priority in Supplier List."
-msgstr ""
+msgstr "المورد الرئيسي الذي لديه أولوية قصوى في قائمة الموردين."
 
 #. module: product
 #: model:product.category,name:product.product_category_6
@@ -1243,12 +1301,12 @@ msgstr "الخدمات"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_form_config_action
 msgid "Create or Import Products"
-msgstr ""
+msgstr "إنشاء أو استيراد المنتجات"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
 msgid "If Other Pricelist"
-msgstr ""
+msgstr "إذا قائمة الأسعار أخرى"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_normal_action
@@ -1300,7 +1358,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Second UoM"
-msgstr ""
+msgstr "وحدة القياس الثانية"
 
 #. module: product
 #: code:addons/product/product.py:143
@@ -1319,7 +1377,7 @@ msgstr ""
 #. module: product
 #: field:product.supplierinfo,min_qty:0
 msgid "Minimal Quantity"
-msgstr ""
+msgstr "أقل كمية"
 
 #. module: product
 #: model:product.category,name:product.product_category_9
@@ -1332,21 +1390,23 @@ msgid ""
 "This supplier's product code will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"رمز مورد المنتج سوف يستخدم عند طباعة طلب عرض أسعار. يحفظ خالياً ليستخدم مرة "
+"داخلياً"
 
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Stock"
-msgstr ""
+msgstr "اضفه الى المخزون"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
 msgid "Price List Version"
-msgstr ""
+msgstr "إصدارة قائمة الأسعار"
 
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Quantity Available"
-msgstr ""
+msgstr "الكمية المتاحة"
 
 #. module: product
 #: help:product.pricelist.item,sequence:0
@@ -1355,6 +1415,8 @@ msgid ""
 "gives highest priority to lowest sequence and stops as soon as a matching "
 "item is found."
 msgstr ""
+"يعطي الترتيب الذي سيتم به التحقق من عناصر لائحة الأسعار. تقييم يعطي الأولوية "
+"القصوى إلى أدنى تسلسل ويتوقف بمجرد تم العثور على  مطابقة البند."
 
 #. module: product
 #: selection:product.template,type:0
@@ -1364,17 +1426,17 @@ msgstr ""
 #. module: product
 #: help:product.price.type,currency_id:0
 msgid "The currency the field is expressed in."
-msgstr ""
+msgstr "العملة ويعبر عنها في الحقل"
 
 #. module: product
 #: help:product.template,weight:0
 msgid "The gross weight in Kg."
-msgstr ""
+msgstr "الوزن الإجمالي بالكيلو جرام"
 
 #. module: product
 #: model:product.template,name:product.product_product_sidepanel0_product_template
 msgid "Side Panel"
-msgstr ""
+msgstr "لوحة جانبية"
 
 #. module: product
 #: view:product.product:0
@@ -1391,17 +1453,17 @@ msgstr "الأوزان"
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr ""
+msgstr "تصنيف وحدة القياس"
 
 #. module: product
 #: field:product.template,loc_rack:0
 msgid "Rack"
-msgstr ""
+msgstr "رف"
 
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase Unit of Measure"
-msgstr ""
+msgstr "قياس وحدة الشراء"
 
 #. module: product
 #: field:product.template,supply_method:0
@@ -1415,6 +1477,8 @@ msgid ""
 "category to get the list of all products linked to this category or to a "
 "child of this category."
 msgstr ""
+"وهنا لائحة من المنتجات الخاصة مصنفة حسب الفئة. يمكنك النقر فوق فئة للحصول "
+"على قائمة بجميع المنتجات المرتبطة بهذه الفئة أو لطفل من هذه الفئة."
 
 #. module: product
 #: view:product.product:0
@@ -1424,7 +1488,7 @@ msgstr "تجميع حسب..."
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
 msgid "Regular processor config"
-msgstr ""
+msgstr "ضبط المعالج المنتظم"
 
 #. module: product
 #: help:product.template,type:0
@@ -1432,6 +1496,8 @@ msgid ""
 "Will change the way procurements are processed. Consumable are product where "
 "you don't manage stock."
 msgstr ""
+"سوف تغير الطريقة التي يتم بها معالجة المشتريات. الاستهلاكية هي المنتج حيث لا "
+"تدار كمخزون."
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -1450,7 +1516,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
 msgid "Basic PC"
-msgstr ""
+msgstr "جهاز الحاسوب أساسي"
 
 #. module: product
 #: help:product.pricelist,active:0
@@ -1458,6 +1524,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the pricelist "
 "without removing it."
 msgstr ""
+"إذا تم اختيار الحقل النشط كخطأ، سوف تسمح لك بإخفاء قائمة الأسعار بدون حذفها"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
@@ -1467,7 +1534,7 @@ msgstr "سم"
 #. module: product
 #: model:ir.model,name:product.model_product_uom
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "وحدة قياس المنتج"
 
 #. module: product
 #: constraint:product.template:0
@@ -1480,17 +1547,17 @@ msgstr ""
 #. module: product
 #: field:product.uom,rounding:0
 msgid "Rounding Precision"
-msgstr ""
+msgstr "دقة التقريب"
 
 #. module: product
 #: view:product.uom:0
 msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "خصائص وحدة القياس"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf1_product_template
 msgid "Rack 200cm"
-msgstr ""
+msgstr "رف 200 سم"
 
 #. module: product
 #: selection:product.template,supply_method:0
@@ -1500,22 +1567,22 @@ msgstr "شراء"
 #. module: product
 #: view:product.uom.categ:0
 msgid "Units of Measure categories"
-msgstr ""
+msgstr "فئات وحدات القياس"
 
 #. module: product
 #: help:product.packaging,weight_ul:0
 msgid "The weight of the empty UL"
-msgstr ""
+msgstr "وزن الـUL الخالي"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodmm10_product_template
 msgid "Wood 10mm"
-msgstr ""
+msgstr "خشب 10 مم"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "أصغر من وحدة قياس المرجعية"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1529,7 +1596,7 @@ msgstr "نشط"
 #. module: product
 #: field:product.product,price_margin:0
 msgid "Variant Price Margin"
-msgstr ""
+msgstr "متغير هامش السعر"
 
 #. module: product
 #: sql_constraint:product.uom:0
@@ -1539,27 +1606,27 @@ msgstr ""
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
-msgstr ""
+msgstr "رمز UAN لوحدة الحزمة"
 
 #. module: product
 #: help:product.supplierinfo,product_uom:0
 msgid "This comes from the product form."
-msgstr ""
+msgstr "هذا يأتي من شكل المنتج."
 
 #. module: product
 #: field:product.packaging,weight_ul:0
 msgid "Empty Package Weight"
-msgstr ""
+msgstr "وزن الحزمة فارغة"
 
 #. module: product
 #: field:product.price.type,field:0
 msgid "Product Field"
-msgstr ""
+msgstr "حقل المنتج"
 
 #. module: product
 #: field:product.template,mes_type:0
 msgid "Measure Type"
-msgstr ""
+msgstr "نوع القياس"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -1567,17 +1634,19 @@ msgid ""
 "How many times this UoM is smaller than the reference UoM in this category:\n"
 "1 * (reference unit) = ratio * (this unit)"
 msgstr ""
+"كم مرة  وحدة قياس أصغر من وحدة قياس المرجعية في هذه الفئة:\n"
+"  1 * (وحدة المرجعية) = نسبة * (هذه الوحدة)"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
 #: model:ir.ui.menu,name:product.menu_product_price_type
 msgid "Price Types"
-msgstr ""
+msgstr "أنواع السعر"
 
 #. module: product
 #: help:product.template,uom_id:0
 msgid "Default Unit of Measure used for all stock operation."
-msgstr ""
+msgstr "وحدة القياس الافتراضية تستخدم لجميع العمليات المالية."
 
 #. module: product
 #: model:product.category,name:product.product_category_misc0
@@ -1587,7 +1656,7 @@ msgstr "متفرقات"
 #. module: product
 #: model:product.template,name:product.product_product_pc4_product_template
 msgid "Customizable PC"
-msgstr ""
+msgstr "جهاز حاسوب مخصص"
 
 #. module: product
 #: field:pricelist.partnerinfo,price:0
@@ -1603,17 +1672,17 @@ msgstr ""
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
-msgstr ""
+msgstr "قائمة أسعار عامة"
 
 #. module: product
 #: model:product.category,name:product.product_category_marketableproduct0
 msgid "Marketable Products"
-msgstr ""
+msgstr "تسويق المنتجات"
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Supplier Product Code"
-msgstr ""
+msgstr "رمز مورد المنتج"
 
 #. module: product
 #: view:product.product:0
@@ -1633,7 +1702,7 @@ msgstr ""
 #. module: product
 #: field:product.template,warranty:0
 msgid "Warranty (months)"
-msgstr ""
+msgstr "تحذير(شهور)"
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
@@ -1641,6 +1710,8 @@ msgid ""
 "Set a category of product if this rule only apply to products of a category "
 "and his children. Keep empty for all products"
 msgstr ""
+"تعيين فئة من المنتجات إذا كانت هذه القاعدة تنطبق فقط على المنتجات ضمن تصنيف "
+"وملحقاته. تبقي فارغة لجميع المنتجات"
 
 #. module: product
 #: model:ir.model,name:product.model_product_product
@@ -1657,7 +1728,7 @@ msgstr "المنتج"
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Produce"
-msgstr ""
+msgstr "إنتاج"
 
 #. module: product
 #: selection:product.template,procure_method:0
@@ -1670,11 +1741,13 @@ msgid ""
 "Produce will generate production order or tasks, according to the product "
 "type. Buy will trigger purchase orders when requested."
 msgstr ""
+"الإنتاج سوف  يولد أمر إنتاج أو مهام، وفقا لنوع المنتج. الشراء  سوف يؤدي إلى "
+"تحفيز أوامر الشراء عند الطلب."
 
 #. module: product
 #: field:product.product,variants:0
 msgid "Variants"
-msgstr ""
+msgstr "تنوعات"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action
@@ -1690,7 +1763,7 @@ msgstr ""
 #. module: product
 #: help:product.supplierinfo,sequence:0
 msgid "Assigns the priority to the list of product supplier."
-msgstr ""
+msgstr "يعين الأولوية لقائمة موردي المنتجات."
 
 #. module: product
 #: field:product.template,uom_id:0
@@ -1700,27 +1773,27 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
 msgid "ATX Mid-size Tower"
-msgstr ""
+msgstr "برج متوسطة الحجم ATX"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Rounding Method"
-msgstr ""
+msgstr "طريقة التقريب"
 
 #. module: product
 #: model:product.category,name:product.product_category_assembly
 msgid "Assembly Service"
-msgstr ""
+msgstr "خدمة التجميع"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
 msgid "Products Labels"
-msgstr ""
+msgstr "علامات المنتجات"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
 msgid "Box 30x40x60"
-msgstr ""
+msgstr "صندوق 30×40×60"
 
 #. module: product
 #: selection:product.template,type:0
@@ -1759,17 +1832,17 @@ msgstr ""
 #: code:addons/product/pricelist.py:376
 #, python-format
 msgid "Partner section of the product form"
-msgstr ""
+msgstr "قسم الشريك من شكل المنتج"
 
 #. module: product
 #: help:product.price.type,name:0
 msgid "Name of this kind of price."
-msgstr ""
+msgstr "اسم هذا النوع من الأسعار."
 
 #. module: product
 #: field:product.supplierinfo,product_uom:0
 msgid "Supplier UoM"
-msgstr ""
+msgstr "وحدة قياس المورد"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
@@ -1782,11 +1855,13 @@ msgid ""
 "Default Unit of Measure used for purchase orders. It must be in the same "
 "category than the default unit of measure."
 msgstr ""
+"وحدة القياس الافتراضية المستخدمة في أوامر الشراء. يجب أن يكون من نفس الفئة "
+"من وحدة القياس الافتراضية."
 
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
 msgid "This product is configured with example of push/pull flows"
-msgstr ""
+msgstr "هذا المنتج تم تكوين مع مثال على دفع / سحب التدفقات"
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1796,7 +1871,7 @@ msgstr "الطول"
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_length
 msgid "Length / Distance"
-msgstr ""
+msgstr "طول / المسافة"
 
 #. module: product
 #: model:product.template,name:product.product_product_0_product_template
@@ -1812,7 +1887,7 @@ msgstr "نوع قائمة الأسعار"
 #. module: product
 #: model:product.category,name:product.product_category_otherproducts0
 msgid "Other Products"
-msgstr ""
+msgstr "منتجات أخرى"
 
 #. module: product
 #: field:product.product,color:0
@@ -1822,12 +1897,12 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 msgid "Characteristics"
-msgstr ""
+msgstr "الخصائص"
 
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be Sold"
-msgstr ""
+msgstr "يمكن بيعها"
 
 #. module: product
 #: field:product.template,produce_delay:0
@@ -1837,7 +1912,7 @@ msgstr ""
 #. module: product
 #: field:product.supplierinfo,pricelist_ids:0
 msgid "Supplier Pricelist"
-msgstr ""
+msgstr "قائمة أسعار الموردين"
 
 #. module: product
 #: code:addons/product/product.py:175
@@ -1858,29 +1933,29 @@ msgstr ""
 #. module: product
 #: model:product.category,name:product.product_category_rawmaterial0
 msgid "Raw Materials"
-msgstr ""
+msgstr "مواد خام"
 
 #. module: product
 #: help:product.template,product_manager:0
 msgid "This is use as task responsible"
-msgstr ""
+msgstr "هذا هو الاستخدام كمسؤولية المهمة"
 
 #. module: product
 #: field:product.pricelist,name:0
 msgid "Pricelist Name"
-msgstr ""
+msgstr "اسم قائمة الأسعار"
 
 #. 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 "إصدارة قائمة الأسعار"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "* ( 1 + "
-msgstr ""
+msgstr "* ( 1 + "
 
 #. module: product
 #: help:product.packaging,weight:0
@@ -1890,7 +1965,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_hdd2_product_template
 msgid "HDD Seagate 7200.8 120GB"
-msgstr ""
+msgstr "هاردسك سيقيت 7200.8 جيجا بايت"
 
 #. module: product
 #: model:product.template,name:product.product_product_employee0_product_template
@@ -1900,7 +1975,7 @@ msgstr "موظف"
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm0_product_template
 msgid "Shelf of 100cm"
-msgstr ""
+msgstr "رف 100 سم"
 
 #. module: product
 #: model:ir.model,name:product.model_product_category
@@ -1911,7 +1986,7 @@ msgstr "فئة المنتج"
 #. module: product
 #: report:product.pricelist:0
 msgid "Price List Name"
-msgstr ""
+msgstr "اسم قائمة الأسعار"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
@@ -1923,13 +1998,13 @@ msgstr "الوقت اللازم للتسليم"
 msgid ""
 "By unchecking the active field you can disable a unit of measure without "
 "deleting it."
-msgstr ""
+msgstr "عن طريق إلغاء تحديد الحقل النشط يمكنك تعطيل وحدة القياس دون حذفه."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "فئات وحدة القياس"
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -1947,6 +2022,8 @@ msgid ""
 "Create and manage your packaging dimensions and types you want to be "
 "maintained in your system."
 msgstr ""
+"إنشاء وإدارة أبعاد التعبئة والتغليف الخاصة بك وأنواعها هل تريد أن تكون "
+"محفوظة في النظام الخاص بك."
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm1_product_template
@@ -1958,27 +2035,27 @@ msgstr ""
 msgid ""
 "Used in the code to select specific prices based on the context. Keep "
 "unchanged."
-msgstr ""
+msgstr "يستخدم في رمز لتحديد أسعار محددة استنادا إلى السياق. تبقي دون تغيير."
 
 #. module: product
 #: view:product.product:0
 msgid "Context..."
-msgstr ""
+msgstr "السياق..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
 msgid "HDD Seagate 7200.8 80GB"
-msgstr ""
+msgstr "هاردسك سيقيت 7200.8 80 جيجا بايت"
 
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid "This is a quantity which is converted into Default Uom."
-msgstr ""
+msgstr "هذا هو الكمية التي يتم تحويلها إلى وحدة القياس الافتراضية."
 
 #. module: product
 #: field:product.packaging,ul:0
 msgid "Type of Package"
-msgstr ""
+msgstr "نوع الحزمة"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1988,7 +2065,7 @@ msgstr "حزم"
 #. module: product
 #: model:product.category,name:product.product_category_4
 msgid "Dello Computer"
-msgstr ""
+msgstr "كمبيوتر ديلو"
 
 #. module: product
 #: model:product.uom.categ,name:product.product_uom_categ_kgm
@@ -1998,12 +2075,12 @@ msgstr "الوزن"
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
 msgid "Processor on demand"
-msgstr ""
+msgstr "معالج عند الطلب"
 
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Supplier of the product"
-msgstr ""
+msgstr "المورد للمنتج"
 
 #. module: product
 #: field:product.product,product_image:0
@@ -2013,7 +2090,7 @@ msgstr ""
 #. module: product
 #: field:product.uom,uom_type:0
 msgid "UoM Type"
-msgstr ""
+msgstr "نوع وحدة القياس"
 
 #. module: product
 #: help:product.product,active:0
@@ -2021,6 +2098,7 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the product "
 "without removing it."
 msgstr ""
+"إذا تم تعيين الحقل النشط إلى خطأ، وسوف تسمح لك لإخفاء المنتج دون إزالته."
 
 #. module: product
 #: help:product.uom,rounding:0
@@ -2033,7 +2111,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Descriptions"
-msgstr ""
+msgstr "أوصاف"
 
 #. module: product
 #: field:product.template,loc_row:0
@@ -2043,17 +2121,17 @@ msgstr "صف"
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm0_product_template
 msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "لوحة الخلفية SHE100"
 
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
 msgid "Complete PC With Peripherals"
-msgstr ""
+msgstr "كمبيوتر شخصي مع كامل ملحقاته"
 
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
-msgstr ""
+msgstr "مصاريف الفندق"
 
 #. module: product
 #: help:product.uom,factor_inv:0
@@ -2065,17 +2143,17 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
 msgid "Rack 100cm"
-msgstr ""
+msgstr "رف 100سم"
 
 #. module: product
 #: help:product.packaging,sequence:0
 msgid "Gives the sequence order when displaying a list of packaging."
-msgstr ""
+msgstr "يعطي النظام تسلسل عند عرض قائمة التعبئة والتغليف."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
 msgid "Price Rounding"
-msgstr ""
+msgstr "السعر بالتقريب"
 
 #. module: product
 #: code:addons/product/pricelist.py:178
@@ -2084,11 +2162,13 @@ msgid ""
 "At least one pricelist has no active version !\n"
 "Please create or activate one."
 msgstr ""
+"لائحة الأسعار واحدة على الأقل لا يوجد لديه نسخة نشطة!\n"
+" يرجى إنشاء أو تفعيل واحدة."
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
 msgid "Max. Price Margin"
-msgstr ""
+msgstr "أعلى هامش سعر"
 
 #. module: product
 #: help:product.supplierinfo,product_name:0
@@ -2096,6 +2176,8 @@ msgid ""
 "This supplier's product name will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"اسم منتج المورد سوف يستخدم عند طباعة طلب عرض أسعار. تبقي فارغة لاستخدام واحد "
+"داخلي."
 
 #. module: product
 #: selection:product.template,mes_type:0
@@ -2105,7 +2187,7 @@ msgstr "متغير"
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
-msgstr ""
+msgstr "ويمكن أن تؤجر"
 
 #. module: product
 #: model:product.price.type,name:product.standard_price
@@ -2116,7 +2198,7 @@ msgstr "سعر التكلفة"
 #. module: product
 #: field:product.pricelist.item,price_min_margin:0
 msgid "Min. Price Margin"
-msgstr ""
+msgstr "أقل هامش سعر"
 
 #. module: product
 #: field:product.template,weight:0
@@ -2126,17 +2208,17 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_assemblysection0_product_template
 msgid "Assembly Section"
-msgstr ""
+msgstr "قسم التجميع"
 
 #. module: product
 #: model:product.category,name:product.product_category_3
 msgid "Computer Stuff"
-msgstr ""
+msgstr "ملحقات كمبيوتر"
 
 #. module: product
 #: model:product.category,name:product.product_category_8
 msgid "Phone Help"
-msgstr ""
+msgstr "مساعدة هاتفية"
 
 #. module: product
 #: field:product.category,sequence:0
@@ -2149,7 +2231,7 @@ msgstr "مسلسل"
 #. module: product
 #: model:product.template,name:product.product_assembly_product_template
 msgid "Assembly Service Cost"
-msgstr ""
+msgstr "تكلفة خدمة التجميع"
 
 #. module: product
 #: view:product.price_list:0
@@ -2159,12 +2241,12 @@ msgstr "إغلاق"
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
 msgid "Pricelist item"
-msgstr ""
+msgstr "بنود لائحة الأسعار"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
 msgid "RAM on demand"
-msgstr ""
+msgstr "رام عند الطلب"
 
 #. module: product
 #: view:res.partner:0
@@ -2180,12 +2262,12 @@ msgstr "تأخيرات"
 #. module: product
 #: view:product.product:0
 msgid "Both stockable and consumable products"
-msgstr ""
+msgstr "كل المنتجات القابلة للتخزين و الاستهلاكية"
 
 #. module: product
 #: model:process.node,note:product.process_node_product0
 msgid "Creation of the product"
-msgstr ""
+msgstr "إنشاء المنتج"
 
 #. module: product
 #: field:pricelist.partnerinfo,name:0
@@ -2226,7 +2308,7 @@ msgstr "الحالة"
 #: view:product.product:0
 #: model:res.groups,name:product.group_product_variant
 msgid "Product Variant"
-msgstr ""
+msgstr "المنتج البديل"
 
 #. module: product
 #: model:product.category,name:product.product_category_shelves0
@@ -2237,7 +2319,7 @@ msgstr ""
 #: code:addons/product/pricelist.py:375
 #, python-format
 msgid "Other Pricelist"
-msgstr ""
+msgstr "قوائم أسعار أخرى"
 
 #. module: product
 #: model:ir.model,name:product.model_product_template
@@ -2250,7 +2332,7 @@ msgstr "قالب المنتج"
 #. module: product
 #: field:product.template,cost_method:0
 msgid "Costing Method"
-msgstr ""
+msgstr "طريقة حساب التكاليف"
 
 #. module: product
 #: view:product.packaging:0
@@ -2261,12 +2343,12 @@ msgstr ""
 #. module: product
 #: help:product.template,volume:0
 msgid "The volume in m3."
-msgstr ""
+msgstr "الحجم بالـ م3"
 
 #. module: product
 #: selection:product.template,state:0
 msgid "End of Lifecycle"
-msgstr ""
+msgstr "نهاية دورة الحياة"
 
 #. module: product
 #: help:product.product,packaging:0
@@ -2274,6 +2356,8 @@ msgid ""
 "Gives the different ways to package the same product. This has no impact on "
 "the picking order and is mainly used if you use the EDI module."
 msgstr ""
+"يعطي طرق مختلفة لحزم نفس المنتج. هذا ليس له أي تأثير على ترتيب واختيار وهي "
+"تستخدم أساسا إذا كنت تستخدم وحدة EDI."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action
@@ -2285,7 +2369,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_span100_product_template
 msgid "Shelf Panel"
-msgstr ""
+msgstr "لوحة الرف"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -2308,7 +2392,7 @@ msgstr ""
 #. module: product
 #: field:product.category,type:0
 msgid "Category Type"
-msgstr ""
+msgstr "نوع التصنيف"
 
 #. module: product
 #: model:product.category,name:product.product_category_2
@@ -2330,7 +2414,7 @@ msgstr ""
 #. module: product
 #: field:product.pricelist.item,price_discount:0
 msgid "Price Discount"
-msgstr ""
+msgstr "السعر بعد التخفيض"
 
 #~ msgid ""
 #~ "Quantities of products that are planned to arrive in selected locations or "
@@ -2392,3 +2476,15 @@ msgstr ""
 
 #~ msgid "tonne"
 #~ msgstr "طن"
+
+#~ msgid "Calculate Product Price per unit base on pricelist version."
+#~ msgstr "احسب سعر المنتج لكل وحده اعتماداً على اصدارة قائمة الأسعار"
+
+#~ msgid "Supply method"
+#~ msgstr "طريقة الإمدادات"
+
+#~ msgid "Default Unit Of Measure"
+#~ msgstr "وحدة القياس الأساسية"
+
+#~ msgid "Gross weight"
+#~ msgstr "الوزن الإجمالي"
diff --git a/addons/product/i18n/bg.po b/addons/product/i18n/bg.po
index 317e5e6849c..7e3adc5284b 100644
--- a/addons/product/i18n/bg.po
+++ b/addons/product/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/bs.po b/addons/product/i18n/bs.po
index bbd96fcd370..816570a583c 100644
--- a/addons/product/i18n/bs.po
+++ b/addons/product/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/ca.po b/addons/product/i18n/ca.po
index 8eb8ee9aec0..121bbacd228 100644
--- a/addons/product/i18n/ca.po
+++ b/addons/product/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po
index f4449e9a5b7..7fb172669d3 100644
--- a/addons/product/i18n/cs.po
+++ b/addons/product/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: product
diff --git a/addons/product/i18n/da.po b/addons/product/i18n/da.po
index 2183d47b9ee..97e70c69a97 100644
--- a/addons/product/i18n/da.po
+++ b/addons/product/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 3734aaf15c0..de5ed579d1e 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index 90ee73de604..dac769931a0 100644
--- a/addons/product/i18n/el.po
+++ b/addons/product/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index 4641ad40f6d..1fec1c922ef 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/es_AR.po b/addons/product/i18n/es_AR.po
index 01e4e9b1821..486848f1530 100644
--- a/addons/product/i18n/es_AR.po
+++ b/addons/product/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/es_CL.po b/addons/product/i18n/es_CL.po
index 8252e1cdbe8..72f416f1edd 100644
--- a/addons/product/i18n/es_CL.po
+++ b/addons/product/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/es_CR.po b/addons/product/i18n/es_CR.po
index ef7bc9c4450..74f21f546b4 100644
--- a/addons/product/i18n/es_CR.po
+++ b/addons/product/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: product
diff --git a/addons/product/i18n/es_EC.po b/addons/product/i18n/es_EC.po
index ea8937e84e9..3f57122a69f 100644
--- a/addons/product/i18n/es_EC.po
+++ b/addons/product/i18n/es_EC.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-11-07 01:34+0000\n"
+"PO-Revision-Date: 2012-10-19 00:49+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -57,6 +57,17 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Stock virtual (calculado como Stock Real - salidas + entradas)\n"
+"En un contexto con una única ubicación de almacén, el cálculo incluye los "
+"productos almacenados en esta ubicación, así como cualquiera de sus hijos.\n"
+"En un contexto de un único almacén, el cálculo  incluye los productos "
+"almacenados en la ubicación de este almacén, así como cualquiera de sus "
+"hijos.\n"
+"En un contexto con una única tienda, el cálculo incluye los productos "
+"almacenados en la ubicación del almacén de la tienda, así como cualquiera de "
+"sus hijos.\n"
+"En otros contexto, el cálculo incluye los productos almacenados en cualquier "
+"ubicación de tipo \"interna\""
 
 #. module: product
 #: model:product.category,name:product.product_category_1
@@ -433,6 +444,17 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Cantidad actual de productos\n"
+"En un contexto con una única ubicación de almacén, el cálculo incluye los "
+"productos almacenados en esta ubicación, así como cualquiera de sus hijos.\n"
+"En un contexto de un único almacén, el cálculo incluye los productos "
+"almacenados en la ubicación de este almacén, así como cualquiera de sus "
+"hijos.\n"
+"En un contexto con una única tienda, el cálculo incluye los productos "
+"almacenados en la ubicación del almacén de la tienda, así como cualquiera de "
+"sus hijos.\n"
+"En otros contexto, el cálculo incluye los productos almacenados en cualquier "
+"ubicación de tipo \"interna\""
 
 #. module: product
 #: view:product.pricelist:0
@@ -654,6 +676,10 @@ msgid ""
 "you need to change the unit of measure, you may desactivate this product "
 "from the 'Procurement & Locations' tab and create a new one."
 msgstr ""
+"La nueva UdM '%s' debe pertenecer a la misma categoría de UdM '%s' como la "
+"antigua UdM '%s'. Si necesita cambiar la unidad de medida, debe desactivar "
+"este producto desde la pestaña \"Abastecimiento y localizaciones\" y crear "
+"uno nuevo."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -704,7 +730,7 @@ msgstr "Proveedor"
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Quantity On Hand"
-msgstr ""
+msgstr "Cantidad Disponible"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -719,7 +745,7 @@ msgstr "Nombre precio"
 #. module: product
 #: model:product.template,name:product.product_product_arm_product_template
 msgid "Cabinet"
-msgstr ""
+msgstr "Gabinete"
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -734,11 +760,22 @@ msgid ""
 "Otherwise, this includes goods arriving to any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Cantidad de productos que se prevee que lleguen.\n"
+"En un contexto con una única ubicación de almacén, el cálculo incluye los "
+"productos almacenados en esta ubicación, así como cualquiera de sus hijos.\n"
+"En un contexto de un único almacén, el cálculo incluye los productos "
+"almacenados en la ubicación de este almacén, así como cualquiera de sus "
+"hijos.\n"
+"En un contexto con una única tienda, el cálculo incluye los productos "
+"almacenados en la ubicación del almacén de la tienda, así como cualquiera de "
+"sus hijos.\n"
+"En otros contexto, el cálculo incluye los productos almacenados en cualquier "
+"ubicación de tipo \"interna\""
 
 #. module: product
 #: model:product.template,name:product.product_product_woodentable0_product_template
 msgid "Wooden Table"
-msgstr ""
+msgstr "Mesa de madera"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
@@ -904,7 +941,7 @@ msgstr "En desarrollo"
 #: code:addons/product/product.py:363
 #, python-format
 msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "UoM categories Mismatch!"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
@@ -981,7 +1018,7 @@ msgstr "Total peso paquete"
 #. module: product
 #: field:product.template,seller_info_id:0
 msgid "unknown"
-msgstr ""
+msgstr "Desconocido"
 
 #. module: product
 #: help:product.packaging,code:0
@@ -1070,6 +1107,7 @@ msgstr "Seq"
 #: view:product.price_list:0
 msgid "Calculate Product Price per Unit Based on Pricelist Version."
 msgstr ""
+"Calcular los precios del producto según unidades para una versión de tarifa."
 
 #. module: product
 #: model:ir.model,name:product.model_product_ul
@@ -1129,7 +1167,7 @@ msgstr "Mayor que la UdM de referencia"
 #. module: product
 #: field:product.category,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "Padre derecho"
 
 #. module: product
 #: view:product.product:0
@@ -1149,6 +1187,17 @@ msgid ""
 "Otherwise, this includes goods leaving from any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Cantidad de productos que se prevee que salgan.\n"
+"En un contexto con una única ubicación de almacén, el cálculo incluye los "
+"productos almacenados en esta ubicación, así como cualquiera de sus hijos.\n"
+"En un contexto de un único almacén, el cálculo incluye los productos "
+"almacenados en la ubicación de este almacén, así como cualquiera de sus "
+"hijos.\n"
+"En un contexto con una única tienda, el cálculo incluye los productos "
+"almacenados en la ubicación del almacén de la tienda, así como cualquiera de "
+"sus hijos.\n"
+"En otros contexto, el cálculo incluye los productos almacenados en cualquier "
+"ubicación de tipo \"interna\""
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
@@ -1261,7 +1310,7 @@ msgstr ""
 #. module: product
 #: field:product.template,weight_net:0
 msgid "Net Weight"
-msgstr ""
+msgstr "Peso neto"
 
 #. module: product
 #: field:product.packaging,width:0
@@ -1321,7 +1370,7 @@ msgstr "Servicios"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_form_config_action
 msgid "Create or Import Products"
-msgstr ""
+msgstr "Crear o importar productos"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
@@ -1429,7 +1478,7 @@ msgstr "Versión de tarifa"
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Quantity Available"
-msgstr ""
+msgstr "Cantidad Disponible"
 
 #. module: product
 #: help:product.pricelist.item,sequence:0
@@ -1492,7 +1541,7 @@ msgstr "Unidad de medida compra"
 #. module: product
 #: field:product.template,supply_method:0
 msgid "Supply Method"
-msgstr ""
+msgstr "Método suministro"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_category_action
@@ -1521,6 +1570,8 @@ msgid ""
 "Will change the way procurements are processed. Consumable are product where "
 "you don't manage stock."
 msgstr ""
+"Cambiará el método de gestión de los abastecimientos. Los productos "
+"consumibles son aquellos donde no se gestiona el stock."
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -1604,7 +1655,7 @@ msgstr "El peso del UL vacío"
 #. module: product
 #: model:product.template,name:product.product_product_woodmm10_product_template
 msgid "Wood 10mm"
-msgstr ""
+msgstr "Madera 10mm"
 
 #. module: product
 #: selection:product.uom,uom_type:0
@@ -1638,7 +1689,7 @@ msgstr "El código EAN de la unidad del paquete."
 #. module: product
 #: help:product.supplierinfo,product_uom:0
 msgid "This comes from the product form."
-msgstr ""
+msgstr "Esto proviene del formulario del producto"
 
 #. module: product
 #: field:product.packaging,weight_ul:0
@@ -1771,6 +1822,8 @@ msgid ""
 "Produce will generate production order or tasks, according to the product "
 "type. Buy will trigger purchase orders when requested."
 msgstr ""
+"\"Fabricar\" generará las ordenes de fabricación o tareas, acorde al tipo de "
+"producto. \"Comprar\" generará ordenes de compra cuando sea requerido."
 
 #. module: product
 #: field:product.product,variants:0
@@ -1796,7 +1849,7 @@ msgstr "Asigna la prioridad a la lista de proveedor de producto."
 #. module: product
 #: field:product.template,uom_id:0
 msgid "Default Unit of Measure"
-msgstr ""
+msgstr "Unidad de medida por defecto"
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
@@ -1811,7 +1864,7 @@ msgstr "Método redondeo"
 #. module: product
 #: model:product.category,name:product.product_category_assembly
 msgid "Assembly Service"
-msgstr ""
+msgstr "Servicio de ensamblaje"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
@@ -1922,7 +1975,7 @@ msgstr "Otros productos"
 #. module: product
 #: field:product.product,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Índice de colores"
 
 #. module: product
 #: view:product.product:0
@@ -1948,7 +2001,7 @@ msgstr "Precio provedor"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Alerta"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -1958,7 +2011,7 @@ msgstr "Basado en"
 #. module: product
 #: model:product.uom,name:product.product_uom_ton
 msgid "t"
-msgstr ""
+msgstr "t"
 
 #. module: product
 #: model:product.category,name:product.product_category_rawmaterial0
@@ -2036,7 +2089,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "Categorías UdM"
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -2074,7 +2127,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 msgid "Context..."
-msgstr ""
+msgstr "Contexto..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
@@ -2119,7 +2172,7 @@ msgstr "Proveedor del producto"
 #. module: product
 #: field:product.product,product_image:0
 msgid "Image"
-msgstr ""
+msgstr "Imágen"
 
 #. module: product
 #: field:product.uom,uom_type:0
@@ -2202,6 +2255,8 @@ msgid ""
 "At least one pricelist has no active version !\n"
 "Please create or activate one."
 msgstr ""
+"¡Al menos una lista de precios no tiene una versión activa!\n"
+"Por favor, cree o active una."
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
@@ -2241,7 +2296,7 @@ msgstr "Margen precio mín."
 #. module: product
 #: field:product.template,weight:0
 msgid "Gross Weight"
-msgstr ""
+msgstr "Peso bruto"
 
 #. module: product
 #: model:product.template,name:product.product_product_assemblysection0_product_template
diff --git a/addons/product/i18n/es_PY.po b/addons/product/i18n/es_PY.po
index 9bd7140da3d..c79170dae6a 100644
--- a/addons/product/i18n/es_PY.po
+++ b/addons/product/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/et.po b/addons/product/i18n/et.po
index 3bfc41b2135..92653687332 100644
--- a/addons/product/i18n/et.po
+++ b/addons/product/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: code:addons/product/pricelist.py:178
diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po
index 12067767e7a..5e25b9a560d 100644
--- a/addons/product/i18n/eu.po
+++ b/addons/product/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po
index 2b529d4f432..5e2ed680717 100644
--- a/addons/product/i18n/fi.po
+++ b/addons/product/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index 4a281c0b62c..c0a2e256d1b 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: view:product.product:0
diff --git a/addons/product/i18n/gl.po b/addons/product/i18n/gl.po
index a82ca272886..690c2d3d8db 100644
--- a/addons/product/i18n/gl.po
+++ b/addons/product/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po
index f9cd6377049..60bb0fc69aa 100644
--- a/addons/product/i18n/hr.po
+++ b/addons/product/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index 6f9241f2716..0a844f1f078 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -176,7 +176,7 @@ msgstr ""
 #. module: product
 #: model:product.uom,name:product.product_uom_dozen
 msgid "Dozen"
-msgstr ""
+msgstr "Tucat"
 
 #. module: product
 #: selection:product.template,cost_method:0
@@ -615,7 +615,7 @@ msgstr "Terméksablonok"
 #. module: product
 #: field:product.category,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "Baloldali szülő"
 
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
@@ -666,7 +666,7 @@ msgstr "Alapár"
 #. module: product
 #: model:product.template,name:product.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr ""
+msgstr "Szolgáltatás munkaidő-kimutatás alapján"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
@@ -702,7 +702,7 @@ msgstr "Szállító"
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Quantity On Hand"
-msgstr ""
+msgstr "Aktuális mennyiség"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -980,7 +980,7 @@ msgstr "Csomagolás teljes súlya"
 #. module: product
 #: field:product.template,seller_info_id:0
 msgid "unknown"
-msgstr ""
+msgstr "Ismeretlen"
 
 #. module: product
 #: help:product.packaging,code:0
@@ -1127,7 +1127,7 @@ msgstr "Nagyobb, mint a hivatkozási mértékegység"
 #. module: product
 #: field:product.category,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "Jobb oldali szülő"
 
 #. module: product
 #: view:product.product:0
@@ -1423,7 +1423,7 @@ msgstr "Árlistaverzió"
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Quantity Available"
-msgstr ""
+msgstr "Rendelkezésre álló mennyiség"
 
 #. module: product
 #: help:product.pricelist.item,sequence:0
@@ -1942,7 +1942,7 @@ msgstr "Szállítói árlista"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Figyelmeztetés"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -2030,7 +2030,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "ME kategóriák"
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -2115,7 +2115,7 @@ msgstr "Termék szállítója"
 #. module: product
 #: field:product.product,product_image:0
 msgid "Image"
-msgstr ""
+msgstr "Kép"
 
 #. module: product
 #: field:product.uom,uom_type:0
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index 478075ac0c4..4f75c9fbe2d 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index 172cf1374f4..d335925c6c5 100644
--- a/addons/product/i18n/it.po
+++ b/addons/product/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -482,7 +482,7 @@ msgstr "Termine ultimo validità di questa versione del Listino"
 #. module: product
 #: model:product.category,name:product.product_category_0
 msgid "All products"
-msgstr "Tutti i prodotti."
+msgstr "Tutti i prodotti"
 
 #. module: product
 #: model:ir.model,name:product.model_pricelist_partnerinfo
@@ -1315,7 +1315,7 @@ msgstr "Servizi"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_form_config_action
 msgid "Create or Import Products"
-msgstr ""
+msgstr "Crea o importa prodotti"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
diff --git a/addons/product/i18n/ja.po b/addons/product/i18n/ja.po
index 13ecf2b02f1..105cbd5509d 100644
--- a/addons/product/i18n/ja.po
+++ b/addons/product/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po
index ff02facde07..c146fa1db37 100644
--- a/addons/product/i18n/ko.po
+++ b/addons/product/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index c72a3862b2c..aa3b70cdd0f 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: lt\n"
 
 #. module: product
diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po
index 622be8c58b8..43157574a17 100644
--- a/addons/product/i18n/lv.po
+++ b/addons/product/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index 4629527264a..3f8a5514c38 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -1078,7 +1078,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr "Хадгалж болох"
+msgstr "Хадгалах бараа"
 
 #. module: product
 #: field:product.packaging,code:0
@@ -1448,7 +1448,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Stock"
-msgstr "Агуулахад хийх"
+msgstr "Нөөцлүүлэх"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
@@ -1474,7 +1474,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,type:0
 msgid "Consumable"
-msgstr "Зарцуулж болох"
+msgstr "Хангамжийн"
 
 #. module: product
 #: help:product.price.type,currency_id:0
@@ -1792,7 +1792,7 @@ msgstr "Үйлдвэрлэх"
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Order"
-msgstr "Захиалга хийх"
+msgstr "Захиалуулах"
 
 #. module: product
 #: help:product.template,supply_method:0
@@ -1801,7 +1801,8 @@ msgid ""
 "type. Buy will trigger purchase orders when requested."
 msgstr ""
 "Үйлдвэрлэх гэдэг нь барааны төрөлөөс хамааруулан холбогдох үйлдвэрлэлийн "
-"захиалга юмуу даалгаврыг үүсгэдэг."
+"захиалга юмуу даалгаврыг үүсгэдэг. Худалдан авах гэдэг нь худалдан авах "
+"захиалга үүсгэдэг."
 
 #. module: product
 #: field:product.product,variants:0
@@ -2577,9 +2578,6 @@ msgstr "Үнийн хөнгөлөлт"
 #~ "Үнийн санал асуух үед хэвлэгдэх нийлүүлэгчийн барааны нэр. Хэрэв дотоод нэр "
 #~ "ашиглах бол хоосон орхино."
 
-#~ msgid "Supply method"
-#~ msgstr "Түгээх арга"
-
 #~ msgid "Suppliers of Product"
 #~ msgstr "Барааны нийлүүлэгчид"
 
@@ -2819,3 +2817,6 @@ msgstr "Үнийн хөнгөлөлт"
 #~ msgstr ""
 #~ "Уг дүрэм нь сонгосон ангилалын бараануудад үйлчилнэ. Хоосон орхивол бүх "
 #~ "бараанд үйлчилнэ."
+
+#~ msgid "Supply method"
+#~ msgstr "Нийлүүлэх арга"
diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po
index 7b4b2162133..7bd8b9d1aa8 100644
--- a/addons/product/i18n/nb.po
+++ b/addons/product/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -261,6 +261,8 @@ msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"Lag et produktskjema for alt du kjøper eller selger. Angi en leverandør hvis "
+"produktet kan bli kjøpt."
 
 #. module: product
 #: view:product.uom:0
@@ -526,17 +528,22 @@ msgid ""
 "each version has several rules. Example: the customer price of a product "
 "category will be based on the supplier price multiplied by 1.80."
 msgstr ""
+"En prisliste inneholder regler som skal vurderes for å beregne kjøp eller "
+"salgsprisen for alle parter som er tildelt en pris liste. Prislister har "
+"flere versjoner (2010, 2011, vinterkampanje 2010, osv.) og hver versjon har "
+"flere regler. Eksempel: kunde prisen på en produkt kategori vil være basert "
+"på leverandørens pris multiplisert med 1,80."
 
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
 msgid "Metal Cleats"
-msgstr ""
+msgstr "Metal Cleats"
 
 #. module: product
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Cannot change the category of existing UoM '%s'."
-msgstr ""
+msgstr "Kan ikke endre kategorien til enhet '%s'"
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -566,7 +573,7 @@ msgstr "Kan kjøpes inn"
 #. module: product
 #: model:product.template,name:product.product_product_cpu2_product_template
 msgid "High speed processor config"
-msgstr ""
+msgstr "High speed processor config"
 
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
@@ -574,6 +581,8 @@ msgid ""
 "1 or several supplier(s) can be linked to a product. All information stands "
 "in the product form."
 msgstr ""
+"En eller flere leverandør(er) kan bli forbundet til et produkt. All "
+"informasjon står i produktangivelsen."
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -602,7 +611,7 @@ msgstr "Produktmaler"
 #. module: product
 #: field:product.category,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "Venstre overordnet"
 
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
@@ -612,7 +621,7 @@ msgstr "Restaurantutgifter"
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by pallet or box."
-msgstr ""
+msgstr "Det totale antallet av produkter du kan sette på pall eller i boks"
 
 #. module: product
 #: constraint:product.packaging:0
@@ -638,6 +647,9 @@ msgid ""
 "you need to change the unit of measure, you may desactivate this product "
 "from the 'Procurement & Locations' tab and create a new one."
 msgstr ""
+"Ny enhet '%s' må høre til samme kategori '%s' som gammel enhet '%s'. Hvis du "
+"trenger å endre enhet, kan du deaktivere dette produktet på fanen "
+"'Anskaffelse & lokasjon'  og oppretter et nytt."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -671,6 +683,9 @@ msgid ""
 "not overlaps with original version. You should change the dates and "
 "reactivate the pricelist"
 msgstr ""
+"Når en versjon er duplisert er den satt til ikke aktiv, så datoen ikke "
+"overlapper den orginale versjonen. Du burde endre datoen og deaktivere "
+"prislisten."
 
 #. module: product
 #: model:product.template,name:product.product_product_kitshelfofcm0_product_template
@@ -753,6 +768,8 @@ msgid ""
 "Product UoM if not empty, in the default unit of measure of the product "
 "otherwise."
 msgstr ""
+"Minste mengde ved kjøp fra denne leverandøren, angitt i leverandørens enhet, "
+"dersom angitt, ellers i standard enhet for produktet."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -788,6 +805,10 @@ msgid ""
 "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 ""
+"Brukt av selskaper som benytter to enheter: En for fakturering og en annen "
+"for lagerstyring. I næringsmiddelindustri vil du f.eks. håndtere et lager av "
+"et antall skinker, men fakturere kundene i kg. La stå blank for å bruke "
+"standar enhet."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -877,7 +898,7 @@ msgstr "Under utvikling"
 #: code:addons/product/product.py:363
 #, python-format
 msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "Uoverstemmelse mellom enhetskategoriene!"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
@@ -887,7 +908,7 @@ msgstr "Shelf of 200cm"
 #. module: product
 #: view:product.uom:0
 msgid "Ratio & Precision"
-msgstr ""
+msgstr "Forhold og presisjon"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_gram
@@ -933,7 +954,7 @@ msgstr "Produktkategorier"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr "  f.eks.: 1 * (referanseenhet) = forhold * (denne enhet)"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -942,6 +963,9 @@ msgid ""
 "You can define a conversion rate between several Units of Measure within the "
 "same category."
 msgstr ""
+"Opprett og administrer enhetene du vil at skal bli brukt i systemet ditt. Du "
+"kan definere en konverteringsfaktor mellom forskjellige enheter innen samme "
+"kategori."
 
 #. module: product
 #: field:product.packaging,weight:0
@@ -956,7 +980,7 @@ msgstr "ukjent"
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
-msgstr ""
+msgstr "Koden til transportenheten."
 
 #. module: product
 #: help:product.template,standard_price:0
@@ -968,7 +992,7 @@ msgstr ""
 #. module: product
 #: view:product.price.type:0
 msgid "Products Price Type"
-msgstr ""
+msgstr "Produktenes pristype"
 
 #. module: product
 #: field:product.product,price_extra:0
@@ -1004,6 +1028,8 @@ msgid ""
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
 msgstr ""
+"Ledetid i dager mellom bekreftelse av innkjøpsordere og mottak av produkter "
+"på lager. Brukt av planleggeren for automatisk beregning av innkjøpsordren."
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action
@@ -1012,6 +1038,9 @@ msgid ""
 "manage new versions of a price list. Some examples of versions: 2010, 2011, "
 "Summer Promotion, etc."
 msgstr ""
+"Det kan være mer enn en versjon av en prisliste. Her kan du lage og "
+"administrere nye versjoner av en prisliste. Noen eksempler på versjoner: "
+"2010, 2011, Sommerkampanje, etc."
 
 #. module: product
 #: selection:product.template,type:0
@@ -1078,21 +1107,25 @@ msgid ""
 "be converted to each other. For example, in the unit of measure category "
 "\"Time\", you will have the following UoM: Hours, Days."
 msgstr ""
+"Opprett og administrer enhetskategoriene du vil at skal bli brukt i systemet "
+"ditt. Hvis flere enheter er i den same kategorien, kan de bli koblet sammen. "
+"For eksempel, i enhetskategorien \"Tid\", vil du ha de følgende enhetene: "
+"Timer, dager."
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "Større en referanseenheten"
 
 #. module: product
 #: field:product.category,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "Høyre overordnet"
 
 #. module: product
 #: view:product.product:0
 msgid "To Sell"
-msgstr ""
+msgstr "Å selge"
 
 #. module: product
 #: help:product.product,outgoing_qty:0
@@ -1107,16 +1140,23 @@ msgid ""
 "Otherwise, this includes goods leaving from any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Antall produkter som skal sendes.\n"
+"I sammenheng med hver enkelt varelokasjon, som inkluderer varer sendt fra "
+"dette lageret, eller fra noen av dets underordnede.\n"
+"I sammenheng med hvert enkelt lager, som inkluderer varer sendt fra "
+"varelokasjonen i lageret, eller fra noen av dets underordnede.\n"
+"I sammenheng med hver enkelt butikk, som inkluderer varer sendt fra "
+"varelokasjonen til lageret i butikken, eller fra noen av dens underordnede."
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
 msgid "Marketable Services"
-msgstr ""
+msgstr "Markedsførte tjenester"
 
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
-msgstr ""
+msgstr "Pristillegg"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
@@ -1126,7 +1166,7 @@ msgstr "Mainboard ASUStek A7N8X"
 #. module: product
 #: field:product.product,packaging:0
 msgid "Logistical Units"
-msgstr ""
+msgstr "Logistikkenheter"
 
 #. module: product
 #: field:product.category,complete_name:0
@@ -1156,6 +1196,10 @@ msgid ""
 "contains detailed information about your products related to procurement "
 "logistics, sales price, product category, suppliers and so on."
 msgstr ""
+"Du må angi et produkt for alt du kjøper eller selger. Produkter kan være "
+"råvarer, lagerført, forbruksmateriell eller tjenester. Produktformen "
+"inneholder detaljert informasjon om produktene dine relatert til "
+"innkjøpslogistikk, salgspriser, produktkategori, leverandører osv."
 
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
@@ -1192,7 +1236,7 @@ msgstr ""
 #: help:product.category,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
-msgstr ""
+msgstr "Gir sekvensen orden når det viser en liste over produktkategorier."
 
 #. module: product
 #: field:product.uom,factor:0
@@ -1269,7 +1313,7 @@ msgstr "Tjenester"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_form_config_action
 msgid "Create or Import Products"
-msgstr ""
+msgstr "Opprett eller importer produkter"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
@@ -1290,12 +1334,12 @@ msgstr "Produkter"
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layers on a pallet or box"
-msgstr ""
+msgstr "Antall lag på en pall eller i en boks"
 
 #. module: product
 #: help:product.pricelist.item,base:0
 msgid "The mode for computing the price for this rule."
-msgstr ""
+msgstr "Modusen for å beregne prisen til denne regelen"
 
 #. module: product
 #: view:product.packaging:0
@@ -1321,6 +1365,8 @@ msgid ""
 "order and the delivery of the finished products. It's the time you promise "
 "to your customers."
 msgstr ""
+"Dette er gjennomsnittet i dager mellom bekreftelse av kundeordre til "
+"levering av det ferdige produktet. Det er tiden du lover kundene dine."
 
 #. module: product
 #: view:product.product:0
@@ -1429,7 +1475,7 @@ msgstr "Hylle"
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase Unit of Measure"
-msgstr ""
+msgstr "Kjøpsenhet"
 
 #. module: product
 #: field:product.template,supply_method:0
@@ -1443,6 +1489,9 @@ msgid ""
 "category to get the list of all products linked to this category or to a "
 "child of this category."
 msgstr ""
+"Her er en liste over alle produktene dine organisert etter kategori. Du kan "
+"trykke på en kategori for å få en liste over alle produktene linket til "
+"denne eller til en underordnet av denne kategorien."
 
 #. module: product
 #: view:product.product:0
@@ -1452,7 +1501,7 @@ msgstr "Grupper etter..."
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
 msgid "Regular processor config"
-msgstr ""
+msgstr "Regular processor config"
 
 #. module: product
 #: help:product.template,type:0
@@ -1476,6 +1525,10 @@ msgid ""
 "the level of this product. Different lead times will be summed for all "
 "levels and purchase orders."
 msgstr ""
+"Gjennomsnittlig forsinkelse i dager du produserer produktet. Dette er bare "
+"for produksjonsordre, og, hvis det er en flernivået materialliste, er det "
+"bare for nivået på dette produktet. Forskjellige ledetider vil bli lagt "
+"sammen for alle nivåer og innkjøpsordre."
 
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
@@ -1488,6 +1541,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the pricelist "
 "without removing it."
 msgstr ""
+"Hvis det aktive feltet er satt til usant, vil det tillate deg å skjule "
+"prislisten uten å fjerne den."
 
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
@@ -1503,7 +1558,7 @@ msgstr "Produktenhet"
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr ""
+msgstr "Feil: Standardenheten og innkjøpsenheten må være i samme kategori."
 
 #. module: product
 #: field:product.uom,rounding:0
@@ -1513,12 +1568,12 @@ msgstr "Avrundingsfaktor"
 #. module: product
 #: view:product.uom:0
 msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "Egenskaper for enhet"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf1_product_template
 msgid "Rack 200cm"
-msgstr ""
+msgstr "Rack 200cm"
 
 #. module: product
 #: selection:product.template,supply_method:0
@@ -1533,17 +1588,17 @@ msgstr "Enhetskategorier"
 #. module: product
 #: help:product.packaging,weight_ul:0
 msgid "The weight of the empty UL"
-msgstr ""
+msgstr "Vekten av den tomme pakningen"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodmm10_product_template
 msgid "Wood 10mm"
-msgstr ""
+msgstr "Tre 10mm"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "Mindre enn referanseenheten"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1562,7 +1617,7 @@ msgstr "Variant prismargin"
 #. module: product
 #: sql_constraint:product.uom:0
 msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
+msgstr "Konverteringsfaktoren til en enhet kan ikke være 0!"
 
 #. module: product
 #: help:product.packaging,ean:0
@@ -1572,7 +1627,7 @@ msgstr "EAN-koden på pakningsenheten."
 #. module: product
 #: help:product.supplierinfo,product_uom:0
 msgid "This comes from the product form."
-msgstr ""
+msgstr "Dette kommer fra produktskjemaet"
 
 #. module: product
 #: field:product.packaging,weight_ul:0
@@ -1587,7 +1642,7 @@ msgstr "Prdoukt-felt"
 #. module: product
 #: field:product.template,mes_type:0
 msgid "Measure Type"
-msgstr ""
+msgstr "Måletype"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -1595,6 +1650,9 @@ msgid ""
 "How many times this UoM is smaller than the reference UoM in this category:\n"
 "1 * (reference unit) = ratio * (this unit)"
 msgstr ""
+"Hvor mange ganger mindre er denne enheten enn referanseenheten i "
+"kategorien:\n"
+"1 * (referanseenhet) = forhold * (denne enhet)"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
@@ -1605,7 +1663,7 @@ msgstr "Pristyper"
 #. module: product
 #: help:product.template,uom_id:0
 msgid "Default Unit of Measure used for all stock operation."
-msgstr ""
+msgstr "Standardenhet for all lagerdrift."
 
 #. module: product
 #: model:product.category,name:product.product_category_misc0
@@ -1626,7 +1684,7 @@ msgstr "Enhetspris"
 #: model:product.category,name:product.product_category_7
 #: model:product.template,name:product.product_product_1_product_template
 msgid "Onsite Intervention"
-msgstr ""
+msgstr "Inngrep hos kunden"
 
 #. module: product
 #: model:product.pricelist,name:product.list0
@@ -1636,12 +1694,12 @@ msgstr "Offentlig prisliste"
 #. module: product
 #: model:product.category,name:product.product_category_marketableproduct0
 msgid "Marketable Products"
-msgstr ""
+msgstr "Markedsførte produkter"
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Supplier Product Code"
-msgstr ""
+msgstr "Leverandørens produktkode"
 
 #. module: product
 #: view:product.product:0
@@ -1721,7 +1779,7 @@ msgstr ""
 #. module: product
 #: help:product.supplierinfo,sequence:0
 msgid "Assigns the priority to the list of product supplier."
-msgstr ""
+msgstr "Tildeler prioriteten til listen over produktleverandører."
 
 #. module: product
 #: field:product.template,uom_id:0
@@ -1741,7 +1799,7 @@ msgstr "Avrundingsmetode"
 #. module: product
 #: model:product.category,name:product.product_category_assembly
 msgid "Assembly Service"
-msgstr ""
+msgstr "Montasjeservice"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
@@ -1783,13 +1841,13 @@ msgstr "Firma"
 msgid ""
 "Base price for computing the customer price. Sometimes called the catalog "
 "price."
-msgstr ""
+msgstr "Basispris for beregning av kundeprisen."
 
 #. module: product
 #: code:addons/product/pricelist.py:376
 #, python-format
 msgid "Partner section of the product form"
-msgstr ""
+msgstr "Partnerdelen av produktskjemaet"
 
 #. module: product
 #: help:product.price.type,name:0
@@ -1799,7 +1857,7 @@ msgstr "Navn på denne type pris"
 #. module: product
 #: field:product.supplierinfo,product_uom:0
 msgid "Supplier UoM"
-msgstr ""
+msgstr "Leverandørenhet"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
@@ -1812,11 +1870,13 @@ msgid ""
 "Default Unit of Measure used for purchase orders. It must be in the same "
 "category than the default unit of measure."
 msgstr ""
+"Standard enhet for innkjøpesordre. Den må være i samme kategori som standard "
+"lagerenhet."
 
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
 msgid "This product is configured with example of push/pull flows"
-msgstr ""
+msgstr "Dette produktet er konfigurert med eksempel på push-/pullstrømmer"
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1831,7 +1891,7 @@ msgstr "Lengde / distanse"
 #. module: product
 #: model:product.template,name:product.product_product_0_product_template
 msgid "Onsite Senior Intervention"
-msgstr ""
+msgstr "Senior service hos kunde"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_type
@@ -1847,12 +1907,12 @@ msgstr "Andre produkter"
 #. module: product
 #: field:product.product,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Fargeindeks"
 
 #. module: product
 #: view:product.product:0
 msgid "Characteristics"
-msgstr ""
+msgstr "Egenskaper"
 
 #. module: product
 #: field:product.template,sale_ok:0
@@ -1930,7 +1990,7 @@ msgstr "Ansatt"
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm0_product_template
 msgid "Shelf of 100cm"
-msgstr ""
+msgstr "Hylle på 100cm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_category
@@ -1954,6 +2014,8 @@ msgid ""
 "By unchecking the active field you can disable a unit of measure without "
 "deleting it."
 msgstr ""
+"Ved å fjerne avkryssingen for 'Aktiv' kan du deaktivere en enhet uten å "
+"slette den."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
@@ -1977,11 +2039,13 @@ msgid ""
 "Create and manage your packaging dimensions and types you want to be "
 "maintained in your system."
 msgstr ""
+"Opprett og administrer emballasjedimensjoner og typer du vil opprettholde i "
+"systemet ditt."
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm1_product_template
 msgid "Rear Panel SHE200"
-msgstr ""
+msgstr "Rear Panel SHE200"
 
 #. module: product
 #: help:product.pricelist.type,key:0
@@ -1993,7 +2057,7 @@ msgstr "Benyttes i programkoden for å velge bestemte priser. Må ikke endres."
 #. module: product
 #: view:product.product:0
 msgid "Context..."
-msgstr ""
+msgstr "Kontekst..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
@@ -2003,7 +2067,7 @@ msgstr "HDD Seagate 7200.8 80GB"
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid "This is a quantity which is converted into Default Uom."
-msgstr ""
+msgstr "Dette er en mengde som er omdannet til standard enhet."
 
 #. module: product
 #: field:product.packaging,ul:0
@@ -2028,7 +2092,7 @@ msgstr "Vekt"
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
 msgid "Processor on demand"
-msgstr ""
+msgstr "Prosessor ved behov"
 
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
@@ -2043,7 +2107,7 @@ msgstr "Bilde"
 #. module: product
 #: field:product.uom,uom_type:0
 msgid "UoM Type"
-msgstr ""
+msgstr "Enhetstype"
 
 #. module: product
 #: help:product.product,active:0
@@ -2051,6 +2115,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the product "
 "without removing it."
 msgstr ""
+"Hvis det aktive feltet er satt til usant, vil det tillate deg å skjule "
+"produktet uten å fjerne det."
 
 #. module: product
 #: help:product.uom,rounding:0
@@ -2075,7 +2141,7 @@ msgstr "Rad"
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm0_product_template
 msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "Rear Panel SHE100"
 
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
@@ -2085,7 +2151,7 @@ msgstr "Komplett PC med tilbehør"
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
-msgstr ""
+msgstr "Hotellutgifter"
 
 #. module: product
 #: help:product.uom,factor_inv:0
@@ -2093,6 +2159,9 @@ msgid ""
 "How many times this UoM is bigger than the reference UoM in this category:\n"
 "1 * (this unit) = ratio * (reference unit)"
 msgstr ""
+"Hvor mange ganger denne enheten er større enn referanseenheten i denne "
+"kategorien:\n"
+"1 * (denne enhet) = forhold * (referanseenhet)"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
@@ -2116,6 +2185,8 @@ msgid ""
 "At least one pricelist has no active version !\n"
 "Please create or activate one."
 msgstr ""
+"Minst en prisliste har ikke en aktiv versjon!\n"
+"Vær snill å opprett eller aktiver en."
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
@@ -2160,12 +2231,12 @@ msgstr "Brutto vekt"
 #. module: product
 #: model:product.template,name:product.product_product_assemblysection0_product_template
 msgid "Assembly Section"
-msgstr ""
+msgstr "Monteringsseksjon"
 
 #. module: product
 #: model:product.category,name:product.product_category_3
 msgid "Computer Stuff"
-msgstr ""
+msgstr "Datatilbehør"
 
 #. module: product
 #: model:product.category,name:product.product_category_8
@@ -2183,7 +2254,7 @@ msgstr "Sekvens"
 #. module: product
 #: model:product.template,name:product.product_assembly_product_template
 msgid "Assembly Service Cost"
-msgstr ""
+msgstr "Kostnad monteringsservice"
 
 #. module: product
 #: view:product.price_list:0
@@ -2198,7 +2269,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
 msgid "RAM on demand"
-msgstr ""
+msgstr "RAM on demand"
 
 #. module: product
 #: view:res.partner:0
@@ -2214,7 +2285,7 @@ msgstr "Forsinkelser"
 #. module: product
 #: view:product.product:0
 msgid "Both stockable and consumable products"
-msgstr ""
+msgstr "Både lagerførte produkter og forbruksvarer"
 
 #. module: product
 #: model:process.node,note:product.process_node_product0
@@ -2265,7 +2336,7 @@ msgstr "Produktvariant"
 #. module: product
 #: model:product.category,name:product.product_category_shelves0
 msgid "Shelves"
-msgstr ""
+msgstr "Hyller"
 
 #. module: product
 #: code:addons/product/pricelist.py:375
@@ -2308,6 +2379,8 @@ msgid ""
 "Gives the different ways to package the same product. This has no impact on "
 "the picking order and is mainly used if you use the EDI module."
 msgstr ""
+"Gir de forskjellige måtene å pakke samme produkt på. Dette har ingen "
+"innvirkning på rangen og er for det i meste bruk hvis du bruker EDI modulen."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action
@@ -2319,7 +2392,7 @@ msgstr "Prislisteversjoner"
 #. module: product
 #: model:product.template,name:product.product_product_span100_product_template
 msgid "Shelf Panel"
-msgstr ""
+msgstr "Hyllepanel"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -2328,6 +2401,9 @@ msgid ""
 "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 ""
+"Setter prisen så den er multiplisert med denne verdien.\n"
+"Avrunding brukes etter rabatten og før avgift.\n"
+"For å ha priser som ender på 9.99, bruk runding 10, tilleggsavgift -0.01"
 
 #. module: product
 #: field:product.template,list_price:0
@@ -2337,7 +2413,7 @@ msgstr "Salgspris"
 #. module: product
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Feil! Du kan ikke lage uendelig struktur med kategorier."
 
 #. module: product
 #: field:product.category,type:0
@@ -2471,3 +2547,9 @@ msgstr "Prisrabatt"
 
 #~ msgid "Gross weight"
 #~ msgstr "Bruttovekt"
+
+#~ msgid "Calculate Product Price per unit base on pricelist version."
+#~ msgstr "Beregn produktprisen per enhet basert på  prislisteversjonen."
+
+#~ msgid "Default Unit Of Measure"
+#~ msgstr "Standard enhet"
diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po
index e6953754ebe..fcc4170e3d9 100644
--- a/addons/product/i18n/nl.po
+++ b/addons/product/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -735,7 +735,7 @@ msgstr "Aanwezige voorraad"
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
 msgid "Kit Keyboard + Mouse"
-msgstr "Kit Keyboard + Mouse"
+msgstr "Kit Toetsenbord + Muis"
 
 #. module: product
 #: field:product.price.type,name:0
@@ -1737,7 +1737,7 @@ msgstr "Maatwerk PC"
 #. module: product
 #: field:pricelist.partnerinfo,price:0
 msgid "Unit Price"
-msgstr "Prijs per eenheid"
+msgstr "Prijs"
 
 #. module: product
 #: model:product.category,name:product.product_category_7
diff --git a/addons/product/i18n/nl_BE.po b/addons/product/i18n/nl_BE.po
index b448ddb1b05..3297e561f35 100644
--- a/addons/product/i18n/nl_BE.po
+++ b/addons/product/i18n/nl_BE.po
@@ -2,30 +2,31 @@
 # 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.
-#
+# Els Van Vossel <evv@agaplan.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+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"
+"PO-Revision-Date: 2012-10-02 10:07+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
+"Language-Team: Els Van Vossel\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+"Language: nl\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
 msgid "DDR 512MB PC400"
-msgstr ""
+msgstr "DDR 512MB PC400"
 
 #. module: product
 #: field:product.packaging,rows:0
 msgid "Number of Layers"
-msgstr ""
+msgstr "Aantal lagen"
 
 #. module: product
 #: constraint:product.pricelist.item:0
@@ -33,6 +34,8 @@ msgid ""
 "Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList "
 "Item!"
 msgstr ""
+"U kunt de hoofdprijslijst niet toekennen als Andere prijslijst in een "
+"prijslijstlijn."
 
 #. module: product
 #: help:product.pricelist.item,product_tmpl_id:0
@@ -40,6 +43,8 @@ msgid ""
 "Set a template if this rule only apply to a template of product. Keep empty "
 "for all products"
 msgstr ""
+"Gebruik een sjabloon als deze regel enkel van toepassing is op een "
+"productsjabloon. Laat leeg als dit voor alle producten geldig is."
 
 #. module: product
 #: help:product.product,virtual_available:0
@@ -54,36 +59,47 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Virtuele hoeveelheid (berekend als Beschikbare hoeveelheid - Uitgaand + "
+"Inkomend)\n"
+"In het geval van een voorraadlocatie, omvat dit de goederen op deze locatie "
+"en alle onderliggende locaties.\n"
+"In het geval van een magazijn, omvat dit de goederen in de voorraadlocatie "
+"van dit magazijn of alle onderliggende locaties.\n"
+"In het geval van een verkooppunt, omvat dit de goederen in de "
+"voorraadlocatie van het magazijn van dit verkooppunt of alle onderliggende "
+"locaties.\n"
+"Anders omvat dit de goederen in alle voorraadlocaties van het type 'intern'."
 
 #. module: product
 #: model:product.category,name:product.product_category_1
 msgid "Sellable"
-msgstr ""
+msgstr "Verkoopbaar"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb2_product_template
 msgid "Mainboard ASUStek A7V8X-X"
-msgstr ""
+msgstr "Mainboard ASUStek A7V8X-X"
 
 #. module: product
 #: help:product.template,seller_qty:0
 msgid "This is minimum quantity to purchase from Main Supplier."
 msgstr ""
+"Dit is de minimumhoeveelheid die bij de hoofdleverancier moet worden gekocht."
 
 #. module: product
 #: model:product.uom,name:product.uom_day
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 #. module: product
 #: view:product.product:0
 msgid "UoM"
-msgstr ""
+msgstr "Eenh."
 
 #. module: product
 #: model:product.template,name:product.product_product_pc2_product_template
 msgid "Basic+ PC (assembly on order)"
-msgstr ""
+msgstr "Basis+ PC (montage op bestelling)"
 
 #. module: product
 #: field:product.product,incoming_qty:0
@@ -96,22 +112,24 @@ msgid ""
 "This pricelist will be used, instead of the default one, for sales to the "
 "current partner"
 msgstr ""
+"Deze prijslijst vervangt de standaardverkoopprijslijst van de huidige "
+"relatie."
 
 #. module: product
 #: field:product.template,seller_qty:0
 msgid "Supplier Quantity"
-msgstr ""
+msgstr "Bestelhoeveelheid"
 
 #. module: product
 #: selection:product.template,mes_type:0
 msgid "Fixed"
-msgstr ""
+msgstr "Vast"
 
 #. module: product
 #: code:addons/product/pricelist.py:178
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Waarschuwing"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
@@ -120,24 +138,24 @@ msgstr ""
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
-msgstr ""
+msgstr "Prijslijst"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Base Prices"
-msgstr ""
+msgstr "Basisprijzen"
 
 #. module: product
 #: field:product.pricelist.item,name:0
 msgid "Rule Name"
-msgstr ""
+msgstr "Regelnaam"
 
 #. module: product
 #: field:product.product,code:0
 #: field:product.product,default_code:0
 msgid "Reference"
-msgstr ""
+msgstr "Referentie"
 
 #. module: product
 #: help:pricelist.partnerinfo,min_quantity:0
@@ -145,16 +163,18 @@ msgid ""
 "The minimal quantity to trigger this rule, expressed in the supplier UoM if "
 "any or in the default UoM of the product otherrwise."
 msgstr ""
+"De minimale hoeveelheid om deze regel te laten gelden in de eenheid van de "
+"leverancier indien vermeld, of in de standaardeenheid van het product."
 
 #. module: product
 #: model:product.template,name:product.product_product_24_product_template
 msgid "Keyboard"
-msgstr ""
+msgstr "Toetsenbord"
 
 #. module: product
 #: model:ir.model,name:product.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #. module: product
 #: code:addons/product/product.py:143
@@ -163,56 +183,58 @@ msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
+"Conversie van producteenheid %s naar standaardeenheid %s is niet mogelijk, "
+"omdat de eenheden niet tot dezelfde categorie behoren."
 
 #. module: product
 #: model:product.uom,name:product.product_uom_dozen
 msgid "Dozen"
-msgstr ""
+msgstr "Dozijn"
 
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Average Price"
-msgstr ""
+msgstr "Gemiddelde prijs"
 
 #. module: product
 #: help:product.pricelist.item,name:0
 msgid "Explicit rule name for this pricelist line."
-msgstr ""
+msgstr "Regelnaam voor deze prijslijstlijn."
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu1_product_template
 msgid "Processor AMD Athlon XP 1800+"
-msgstr ""
+msgstr "Processor AMD Athlon XP 1800+"
 
 #. module: product
 #: model:product.template,name:product.product_product_20_product_template
 msgid "HDD on demand"
-msgstr ""
+msgstr "HDD op aanvraag"
 
 #. module: product
 #: field:product.price_list,price_list:0
 msgid "PriceList"
-msgstr ""
+msgstr "Prijslijst"
 
 #. module: product
 #: view:product.template:0
 msgid "UOM"
-msgstr ""
+msgstr "Eenh."
 
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
 msgid "PCE"
-msgstr ""
+msgstr "ST"
 
 #. module: product
 #: view:product.template:0
 msgid "Miscelleanous"
-msgstr ""
+msgstr "Diversen"
 
 #. module: product
 #: model:product.template,name:product.product_product_worker0_product_template
 msgid "Worker"
-msgstr ""
+msgstr "Arbeider"
 
 #. module: product
 #: help:product.template,sale_ok:0
@@ -220,28 +242,30 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from a sale order line."
 msgstr ""
+"Bepaalt of het product wordt getoond in de lijst van producten op een "
+"verkooporderlijn."
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
 msgid "Default Public Pricelist Version"
-msgstr ""
+msgstr "Standaard verkoopprijslijstversie"
 
 #. module: product
 #: selection:product.template,cost_method:0
 msgid "Standard Price"
-msgstr ""
+msgstr "Standaardprijs"
 
 #. module: product
 #: model:product.pricelist.type,name:product.pricelist_type_sale
 #: field:res.partner,property_product_pricelist:0
 msgid "Sale Pricelist"
-msgstr ""
+msgstr "Verkoopprijslijst"
 
 #. module: product
 #: view:product.template:0
 #: field:product.template,type:0
 msgid "Product Type"
-msgstr ""
+msgstr "Producttype"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_form_config_action
@@ -249,22 +273,24 @@ msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"Maak een product voor alles wat u aan- of verkoopt. Geef een leverancier op "
+"als het product kan worden gekocht."
 
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  vb.: 1 * (deze eenheid) = ratio * (referentie-eenheid)"
 
 #. module: product
 #: code:addons/product/product.py:418
 #, python-format
 msgid "Products: "
-msgstr ""
+msgstr "Producten: "
 
 #. module: product
 #: field:product.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Hoofdcategorie"
 
 #. module: product
 #: help:product.template,procure_method:0
@@ -273,26 +299,29 @@ msgid ""
 "supplying. 'Make to Order': When needed, purchase or produce for the "
 "procurement request."
 msgstr ""
+"'Maak op voorraad': indien nodig, haal uit voorraad of wacht op "
+"herbevoorrading. 'Maak op bestelling': indien nodig, koop of produceer de "
+"goederen van de herbevoorrading."
 
 #. module: product
 #: model:process.node,note:product.process_node_supplier0
 msgid "Supplier name, price, product code, ..."
-msgstr ""
+msgstr "Leveranciersnaam, prijs, productcode, ..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd3_product_template
 msgid "HDD Seagate 7200.8 160GB"
-msgstr ""
+msgstr "HDD Seagate 7200.8 160GB"
 
 #. module: product
 #: field:product.product,ean13:0
 msgid "EAN13"
-msgstr ""
+msgstr "EAN13"
 
 #. module: product
 #: field:product.template,seller_id:0
 msgid "Main Supplier"
-msgstr ""
+msgstr "Hoofdleverancier"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_ul_form_action
@@ -302,92 +331,94 @@ msgstr ""
 #: view:product.product:0
 #: view:product.ul:0
 msgid "Packaging"
-msgstr ""
+msgstr "Verpakking"
 
 #. module: product
 #: view:product.product:0
 #: field:product.template,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categorie"
 
 #. module: product
 #: help:product.pricelist.item,min_quantity:0
 msgid ""
 "The rule only applies if the partner buys/sells more than this quantity."
 msgstr ""
+"De regel wordt enkel toegepast als de relatie meer koopt/verkoopt dan deze "
+"hoeveelheid."
 
 #. module: product
 #: model:product.template,name:product.product_product_woodmm0_product_template
 msgid "Wood 2mm"
-msgstr ""
+msgstr "Hout 2mm"
 
 #. module: product
 #: field:product.price_list,qty1:0
 msgid "Quantity-1"
-msgstr ""
+msgstr "Hoeveelheid-1"
 
 #. module: product
 #: help:product.packaging,ul_qty:0
 msgid "The number of packages by layer"
-msgstr ""
+msgstr "Het aantal verpakkingen per laag"
 
 #. module: product
 #: field:product.packaging,qty:0
 msgid "Quantity by Package"
-msgstr ""
+msgstr "Hoeveelheid per verpakking"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: product
 #: help:product.template,categ_id:0
 msgid "Select category for the current product"
-msgstr ""
+msgstr "Kies de categorie voor dit product"
 
 #. module: product
 #: field:product.product,outgoing_qty:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Uitgaand"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Reference UoM for this category"
-msgstr ""
+msgstr "Referentie-eenheid voor deze categorie"
 
 #. module: product
 #: model:product.price.type,name:product.list_price
 #: field:product.product,lst_price:0
 msgid "Public Price"
-msgstr ""
+msgstr "Publieke prijs"
 
 #. module: product
 #: field:product.price_list,qty5:0
 msgid "Quantity-5"
-msgstr ""
+msgstr "Hoeveelheid-5"
 
 #. module: product
 #: model:product.category,name:product.product_category_10
 msgid "IT components"
-msgstr ""
+msgstr "IT-componenten"
 
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
-msgstr ""
+msgstr "Productmanager"
 
 #. module: product
 #: field:product.supplierinfo,product_name:0
 msgid "Supplier Product Name"
-msgstr ""
+msgstr "Productnaam leverancier"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc3_product_template
 msgid "Medium PC"
-msgstr ""
+msgstr "Medium-pc"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action_puchased
@@ -397,6 +428,10 @@ msgid ""
 "information about your products related to procurement logistics, sales "
 "price, product category, suppliers and so on."
 msgstr ""
+"Producten kunnen worden gekocht of verkocht. Producten kunnen grondstoffen "
+"zijn, voorraadartikelen, verbruiksartikelen of diensten. Het "
+"productformulier bevat detailinfo over bevoorradingslogistiek, verkoopprijs, "
+"productcategorie, leveranciers, enz."
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -411,95 +446,104 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Huidige hoeveelheid producten\n"
+"In het geval van een voorraadlocatie, omvat dit de goederen op deze locatie "
+"en alle onderliggende locaties.\n"
+"In het geval van een magazijn, omvat dit de goederen in de voorraadlocatie "
+"van dit magazijn of alle onderliggende locaties.\n"
+"In het geval van een verkooppunt, omvat dit de goederen in de "
+"voorraadlocatie van het magazijn van dit verkooppunt of alle onderliggende "
+"locaties.\n"
+"Anders omvat dit de goederen in alle voorraadlocaties van het type 'intern'."
 
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price Search"
-msgstr ""
+msgstr "Productprijzen zoeken"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,description_sale:0
 msgid "Sale Description"
-msgstr ""
+msgstr "Verkoopomschrijving"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Localisation"
-msgstr ""
+msgstr "Opslaglocalisering"
 
 #. module: product
 #: help:product.packaging,length:0
 msgid "The length of the package"
-msgstr ""
+msgstr "Lengte van verpakking"
 
 #. module: product
 #: help:product.template,weight_net:0
 msgid "The net weight in Kg."
-msgstr ""
+msgstr "Nettogewicht in kg"
 
 #. module: product
 #: help:product.template,state:0
 msgid "Tells the user if he can use the product or not."
-msgstr ""
+msgstr "Geeft aan of de gebruiker een product kan gebruiken of niet."
 
 #. module: product
 #: field:pricelist.partnerinfo,min_quantity:0
 #: field:product.supplierinfo,qty:0
 msgid "Quantity"
-msgstr ""
+msgstr "Hoeveelheid"
 
 #. module: product
 #: field:product.packaging,height:0
 msgid "Height"
-msgstr ""
+msgstr "Hoogte"
 
 #. module: product
 #: help:product.pricelist.version,date_end:0
 msgid "Ending date for this pricelist version to be valid."
-msgstr ""
+msgstr "Einddatum voor de geldigheid van de prijslijstversie."
 
 #. module: product
 #: model:product.category,name:product.product_category_0
 msgid "All products"
-msgstr ""
+msgstr "Alle producten"
 
 #. module: product
 #: model:ir.model,name:product.model_pricelist_partnerinfo
 msgid "pricelist.partnerinfo"
-msgstr ""
+msgstr "pricelist.partnerinfo"
 
 #. module: product
 #: field:product.price_list,qty2:0
 msgid "Quantity-2"
-msgstr ""
+msgstr "Hoeveelheid-2"
 
 #. module: product
 #: field:product.price_list,qty3:0
 msgid "Quantity-3"
-msgstr ""
+msgstr "Hoeveelheid-3"
 
 #. module: product
 #: view:product.product:0
 msgid "Codes"
-msgstr ""
+msgstr "Codes"
 
 #. module: product
 #: field:product.price_list,qty4:0
 msgid "Quantity-4"
-msgstr ""
+msgstr "Hoeveelheid-4"
 
 #. module: product
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr ""
+msgstr "Aankopen & verkopen"
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
 msgid "Working Time"
-msgstr ""
+msgstr "Werkuren"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action2
@@ -511,47 +555,52 @@ msgid ""
 "each version has several rules. Example: the customer price of a product "
 "category will be based on the supplier price multiplied by 1.80."
 msgstr ""
+"Een prijslijst bevat regels die worden geëvalueerd om de aankoop- of "
+"verkoopprijs te berekenen voor alle relaties van deze prijslijst. "
+"Prijslijsten kunnen verschillende versies hebben (2011, 2012, promotie "
+"februari 2012, enz.) met eigen regels. Voorbeeld: de verkooppprijs voor een "
+"productcategorie is gebaseerd op de aankoopprijs vermenigvuldigd met 1,80."
 
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
 msgid "Metal Cleats"
-msgstr ""
+msgstr "Metalen strip"
 
 #. module: product
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Cannot change the category of existing UoM '%s'."
-msgstr ""
+msgstr "Kan de categorie van de bestaande eenheid '%s' niet wijzigen."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
 msgid "Product uom categ"
-msgstr ""
+msgstr "Productmaateenheidcategorie"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
 msgid "Box 20x20x40"
-msgstr ""
+msgstr "Doos 20x20x40"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Price Computation"
-msgstr ""
+msgstr "Prijsberekening"
 
 #. module: product
 #: model:res.groups,name:product.group_uos
 msgid "Product UoS View"
-msgstr ""
+msgstr "Weergave productverkoopeenheid"
 
 #. module: product
 #: field:product.template,purchase_ok:0
 msgid "Can be Purchased"
-msgstr ""
+msgstr "Kan worden gekocht"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu2_product_template
 msgid "High speed processor config"
-msgstr ""
+msgstr "High speed processor configuratie"
 
 #. module: product
 #: model:process.transition,note:product.process_transition_supplierofproduct0
@@ -559,6 +608,8 @@ msgid ""
 "1 or several supplier(s) can be linked to a product. All information stands "
 "in the product form."
 msgstr ""
+"Aan een product kunnen 1 of meer leveranciers worden gekoppeld. Alle "
+"informatie bevindt zich in het productformulier."
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -566,52 +617,54 @@ msgid ""
 "Quantity conversions may happen automatically between Units of Measure in "
 "the same category, according to their respective ratios."
 msgstr ""
+"Conversie van hoeveelheden kan automatisch gebeuren tussen maateenheden in "
+"dezelfde categorie, volgens de ingestelde ratio's."
 
 #. module: product
 #: help:product.packaging,width:0
 msgid "The width of the package"
-msgstr ""
+msgstr "Breedte van verpakking"
 
 #. module: product
 #: selection:product.category,type:0
 msgid "View"
-msgstr ""
+msgstr "Weergave"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_template_action_tree
 msgid "Product Templates"
-msgstr ""
+msgstr "Productsjablonen"
 
 #. module: product
 #: field:product.category,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "Linkerhoofd"
 
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
 msgid "Restaurant Expenses"
-msgstr ""
+msgstr "Restaurantkosten"
 
 #. module: product
 #: help:product.packaging,qty:0
 msgid "The total number of products you can put by pallet or box."
-msgstr ""
+msgstr "Totaal aantal producten per pallet of doos."
 
 #. module: product
 #: constraint:product.packaging:0
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Fout: ongeldige EAN-code"
 
 #. module: product
 #: field:product.pricelist.item,min_quantity:0
 msgid "Min. Quantity"
-msgstr ""
+msgstr "Minimumhoeveelheid"
 
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
 msgid "Price Type"
-msgstr ""
+msgstr "Prijstype"
 
 #. module: product
 #: code:addons/product/product.py:363
@@ -621,31 +674,35 @@ msgid ""
 "you need to change the unit of measure, you may desactivate this product "
 "from the 'Procurement & Locations' tab and create a new one."
 msgstr ""
+"Nieuwe eenheid '%s' moet tot dezelfde categorie '%s' behoren als de oude "
+"eenheid '%s'. Als u de eenheid wilt veranderen, moet u dit product op niet-"
+"actief zetten via het tabblad 'Verwerving en locaties' en een nieuw product "
+"maken."
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Max. Margin"
-msgstr ""
+msgstr "Max. marge"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Base Price"
-msgstr ""
+msgstr "Basisprijs"
 
 #. module: product
 #: model:product.template,name:product.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr ""
+msgstr "Dienst op uurrooster"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
 msgid "Silent fan"
-msgstr ""
+msgstr "Stille ventilator"
 
 #. module: product
 #: help:product.supplierinfo,name:0
 msgid "Supplier of this product"
-msgstr ""
+msgstr "Leverancier van dit product"
 
 #. module: product
 #: help:product.pricelist.version,active:0
@@ -654,36 +711,39 @@ msgid ""
 "not overlaps with original version. You should change the dates and "
 "reactivate the pricelist"
 msgstr ""
+"Als een versie wordt gedupliceerd, wordt deze op niet-actief gezet, zodat de "
+"datums niet overlappen met de oorspronkelijke versie. Verander de datums en "
+"zet de prijslijst op Actief."
 
 #. module: product
 #: model:product.template,name:product.product_product_kitshelfofcm0_product_template
 msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "Set planken van 100cm"
 
 #. module: product
 #: field:product.supplierinfo,name:0
 msgid "Supplier"
-msgstr ""
+msgstr "Leverancier"
 
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Quantity On Hand"
-msgstr ""
+msgstr "Beschikbare voorraad"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
 msgid "Kit Keyboard + Mouse"
-msgstr ""
+msgstr "Set Toetsenbord + muis"
 
 #. module: product
 #: field:product.price.type,name:0
 msgid "Price Name"
-msgstr ""
+msgstr "Prijsnaam"
 
 #. module: product
 #: model:product.template,name:product.product_product_arm_product_template
 msgid "Cabinet"
-msgstr ""
+msgstr "Kast"
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -698,16 +758,25 @@ msgid ""
 "Otherwise, this includes goods arriving to any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Verwachte te ontvangen hoeveelheid producten\n"
+"In het geval van een voorraadlocatie, omvat dit de goederen die toekomen op "
+"deze locatie en alle onderliggende locaties.\n"
+"In het geval van een magazijn, omvat dit de goederen die toekomen op de "
+"voorraadlocatie van dit magazijn of alle onderliggende locaties.\n"
+"In het geval van een verkooppunt, omvat dit de goederen die toekomen op de "
+"voorraadlocatie van het magazijn van dit verkooppunt of alle onderliggende "
+"locaties.\n"
+"Anders omvat dit de goederen in alle voorraadlocaties van het type 'intern'."
 
 #. module: product
 #: model:product.template,name:product.product_product_woodentable0_product_template
 msgid "Wooden Table"
-msgstr ""
+msgstr "Houten tafel"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
 msgid "Processor AMD Athlon XP 2200+"
-msgstr ""
+msgstr "Processor AMD Athlon XP 2200+"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.action_product_price_list
@@ -716,18 +785,18 @@ msgstr ""
 #: report:product.pricelist:0
 #: field:product.pricelist.version,pricelist_id:0
 msgid "Price List"
-msgstr ""
+msgstr "Prijslijst"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Suppliers"
-msgstr ""
+msgstr "Leveranciers"
 
 #. module: product
 #: view:product.product:0
 msgid "To Purchase"
-msgstr ""
+msgstr "Aan te kopen"
 
 #. module: product
 #: help:product.supplierinfo,min_qty:0
@@ -736,11 +805,13 @@ msgid ""
 "Product UoM if not empty, in the default unit of measure of the product "
 "otherwise."
 msgstr ""
+"De minimale hoeveelheid te bestellen bij de leverancier, in de eenheid van "
+"de leverancier of in de standaardeenheid van het product."
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "New Price ="
-msgstr ""
+msgstr "Nieuwe prijs ="
 
 #. module: product
 #: help:pricelist.partnerinfo,price:0
@@ -748,21 +819,23 @@ msgid ""
 "This price will be considered as a price for the supplier UoM if any or the "
 "default Unit of Measure of the product otherwise"
 msgstr ""
+"Deze prijs wordt beschouwd als de prijs in de eenheid van de leverancier of "
+"in de standaardeenheid van dit product."
 
 #. module: product
 #: model:product.category,name:product.product_category_5
 msgid "Accessories"
-msgstr ""
+msgstr "Accessoires"
 
 #. module: product
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr ""
+msgstr "Doorlooptijd klant"
 
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
 msgid "Mouse"
-msgstr ""
+msgstr "Muis"
 
 #. module: product
 #: help:product.template,uos_id:0
@@ -771,32 +844,35 @@ msgid ""
 "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 ""
+"Gebruikt door bedrijven met twee maateenheden: facturatie en voorraadbeheer. "
+"Bijvoorbeeld in de voeding houdt u voorraad per ham, maar factureert u per "
+"kg. Laat leeg als u de standaardeenheid wilt gebruiken."
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Min. Margin"
-msgstr ""
+msgstr "Min. marge"
 
 #. module: product
 #: field:product.category,child_id:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Onderliggende categorieën"
 
 #. module: product
 #: field:product.pricelist.version,date_end:0
 msgid "End Date"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: product
 #: view:product.price_list:0
 msgid "Print"
-msgstr ""
+msgstr "Afdrukken"
 
 #. module: product
 #: view:product.product:0
 #: field:product.ul,type:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action2
@@ -804,27 +880,27 @@ msgstr ""
 #: model:ir.ui.menu,name:product.menu_product_pricelist_action2
 #: model:ir.ui.menu,name:product.menu_product_pricelist_main
 msgid "Pricelists"
-msgstr ""
+msgstr "Prijslijsten"
 
 #. module: product
 #: field:product.product,partner_ref:0
 msgid "Customer ref"
-msgstr ""
+msgstr "Klantenref."
 
 #. module: product
 #: view:product.product:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diversen"
 
 #. module: product
 #: field:product.pricelist.type,key:0
 msgid "Key"
-msgstr ""
+msgstr "Sleutel"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Rules Test Match"
-msgstr ""
+msgstr "Voldoen aan testregels"
 
 #. module: product
 #: help:product.pricelist.item,product_id:0
@@ -832,89 +908,91 @@ msgid ""
 "Set a product if this rule only apply to one product. Keep empty for all "
 "products"
 msgstr ""
+"Gebruik een product als deze regel enkel van toepassing is op een product. "
+"Laat leeg als dit voor alle producten geldig is."
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement & Locations"
-msgstr ""
+msgstr "Verwerving & locaties"
 
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
 msgid "Kitchen Design Project"
-msgstr ""
+msgstr "Keukenontwerp"
 
 #. module: product
 #: model:product.uom,name:product.uom_hour
 msgid "Hour"
-msgstr ""
+msgstr "Uur"
 
 #. module: product
 #: selection:product.template,state:0
 msgid "In Development"
-msgstr ""
+msgstr "In ontwikkeling"
 
 #. module: product
 #: code:addons/product/product.py:363
 #, python-format
 msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "Verkeerde maateenheidcategorie"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
 msgid "Shelf of 200cm"
-msgstr ""
+msgstr "Plank van 200cm"
 
 #. module: product
 #: view:product.uom:0
 msgid "Ratio & Precision"
-msgstr ""
+msgstr "Ratio & precisie"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_gram
 msgid "g"
-msgstr ""
+msgstr "g"
 
 #. module: product
 #: model:product.category,name:product.product_category_11
 msgid "IT components kits"
-msgstr ""
+msgstr "Set IT-componenten"
 
 #. module: product
 #: selection:product.category,type:0
 #: selection:product.template,state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normaal"
 
 #. module: product
 #: model:process.node,name:product.process_node_supplier0
 #: view:product.supplierinfo:0
 msgid "Supplier Information"
-msgstr ""
+msgstr "Leveranciersinformatie"
 
 #. module: product
 #: field:product.price.type,currency_id:0
 #: report:product.pricelist:0
 #: field:product.pricelist,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Munt"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram_product_template
 msgid "DDR 256MB PC400"
-msgstr ""
+msgstr "DDR 256MB PC400"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action_form
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
 #: view:product.category:0
 msgid "Product Categories"
-msgstr ""
+msgstr "Productcategorieën"
 
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr "  vb.: 1 * (referentie-eenheid) = ratio * (deze eenheid)"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -923,21 +1001,23 @@ msgid ""
 "You can define a conversion rate between several Units of Measure within the "
 "same category."
 msgstr ""
+"Maak en beheer maateenheden die u nodig heeft. U kunt een conversieratio "
+"instellen tussen meerdere maateenheden binnen een categorie."
 
 #. module: product
 #: field:product.packaging,weight:0
 msgid "Total Package Weight"
-msgstr ""
+msgstr "Totaalgewicht verpakking"
 
 #. module: product
 #: field:product.template,seller_info_id:0
 msgid "unknown"
-msgstr ""
+msgstr "onbekend"
 
 #. module: product
 #: help:product.packaging,code:0
 msgid "The code of the transport unit."
-msgstr ""
+msgstr "De code van de transporteenheid."
 
 #. module: product
 #: help:product.template,standard_price:0
@@ -945,38 +1025,39 @@ msgid ""
 "Product's cost for accounting stock valuation. It is the base price for the "
 "supplier price."
 msgstr ""
+"Productkost voor voorraadwaardering. De basisprijs voor de leveranciersprijs."
 
 #. module: product
 #: view:product.price.type:0
 msgid "Products Price Type"
-msgstr ""
+msgstr "Productprijstype"
 
 #. module: product
 #: field:product.product,price_extra:0
 msgid "Variant Price Extra"
-msgstr ""
+msgstr "Extra variantprijs"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan_product_template
 msgid "Regular case fan 80mm"
-msgstr ""
+msgstr "Kastventilator 80mm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_supplierinfo
 msgid "Information about a product supplier"
-msgstr ""
+msgstr "Informatie over een productleverancier"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,description_purchase:0
 msgid "Purchase Description"
-msgstr ""
+msgstr "Aankoopomschrijving"
 
 #. module: product
 #: constraint:product.pricelist.version:0
 msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
+msgstr "U kunt geen 2 overlappende prijslijstversies hebben."
 
 #. module: product
 #: help:product.supplierinfo,delay:0
@@ -985,6 +1066,9 @@ msgid ""
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
 msgstr ""
+"Doorlooptijd in dagen tussen de bevestiging van de aankooporder en de "
+"ontvangst van de producten in het magazijn. Dit wordt gebruikt door de "
+"planner voor het automatisch berekenen van de aankoopplanning."
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_pricelist_action
@@ -993,63 +1077,66 @@ msgid ""
 "manage new versions of a price list. Some examples of versions: 2010, 2011, "
 "Summer Promotion, etc."
 msgstr ""
+"Er kan meer dan een versie van een prijslijst worden ingesteld. Hier kunt u "
+"nieuwe versies van een prijslijst maken en beheren. Enkele voorbeelden van "
+"versies: 2011, 2012, zomerpromotie, enz."
 
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr ""
+msgstr "Voorraadartikel"
 
 #. module: product
 #: field:product.packaging,code:0
 msgid "Code"
-msgstr ""
+msgstr "Code"
 
 #. module: product
 #: view:product.supplierinfo:0
 msgid "Seq"
-msgstr ""
+msgstr "Volgnr."
 
 #. module: product
 #: view:product.price_list:0
 msgid "Calculate Product Price per Unit Based on Pricelist Version."
-msgstr ""
+msgstr "Bereken de productprijs per eenheid volgens de prijslijstversie."
 
 #. module: product
 #: model:ir.model,name:product.model_product_ul
 msgid "Shipping Unit"
-msgstr ""
+msgstr "Verzendeenheid"
 
 #. module: product
 #: field:pricelist.partnerinfo,suppinfo_id:0
 msgid "Partner Information"
-msgstr ""
+msgstr "Relatie-informatie"
 
 #. module: product
 #: selection:product.ul,type:0
 #: model:product.uom.categ,name:product.product_uom_categ_unit
 msgid "Unit"
-msgstr ""
+msgstr "Eenheid"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Information"
-msgstr ""
+msgstr "Informatie"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Products Listprices Items"
-msgstr ""
+msgstr "Productprijslijstitems"
 
 #. module: product
 #: view:product.packaging:0
 msgid "Other Info"
-msgstr ""
+msgstr "Andere info"
 
 #. module: product
 #: field:product.pricelist.version,items_id:0
 msgid "Price List Items"
-msgstr ""
+msgstr "Prijslijstitems"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_categ_form_action
@@ -1059,21 +1146,25 @@ msgid ""
 "be converted to each other. For example, in the unit of measure category "
 "\"Time\", you will have the following UoM: Hours, Days."
 msgstr ""
+"De maateenheden maken en beheren die worden gebruikt. Als enkele "
+"maateenheden in dezelfde categorie vallen, kunnen ze naar elkaar worden "
+"geconverteerd. Bijvoorbeeld, in de maateenheid categorie \"Werktijd\", heeft "
+"u de volgende maateenheden: Uren, Dagen."
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "Groter dan de referentie-eenheid"
 
 #. module: product
 #: field:product.category,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "Rechterhoofd"
 
 #. module: product
 #: view:product.product:0
 msgid "To Sell"
-msgstr ""
+msgstr "Verkoopbaar"
 
 #. module: product
 #: help:product.product,outgoing_qty:0
@@ -1088,26 +1179,35 @@ msgid ""
 "Otherwise, this includes goods leaving from any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Verwachte te verzenden hoeveelheid producten\n"
+"In het geval van een voorraadlocatie, omvat dit de goederen die vertrekken "
+"van deze locatie en alle onderliggende locaties.\n"
+"In het geval van een magazijn, omvat dit de goederen die vertrekken van de "
+"voorraadlocatie van dit magazijn of alle onderliggende locaties.\n"
+"In het geval van een verkooppunt, omvat dit de goederen die vertrekken van "
+"de voorraadlocatie van het magazijn van dit verkooppunt of alle "
+"onderliggende locaties.\n"
+"Anders omvat dit de goederen in alle voorraadlocaties van het type 'intern'."
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
 msgid "Marketable Services"
-msgstr ""
+msgstr "Te verkopen diensten"
 
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
 msgid "Price Surcharge"
-msgstr ""
+msgstr "Prijstoeslag"
 
 #. module: product
 #: model:product.template,name:product.product_product_mb1_product_template
 msgid "Mainboard ASUStek A7N8X"
-msgstr ""
+msgstr "Mainboard ASUStek A7N8X"
 
 #. module: product
 #: field:product.product,packaging:0
 msgid "Logistical Units"
-msgstr ""
+msgstr "Logistieke eenheden"
 
 #. module: product
 #: field:product.category,complete_name:0
@@ -1121,12 +1221,12 @@ msgstr ""
 #: field:product.uom,name:0
 #: field:product.uom.categ,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodlintelm0_product_template
 msgid "Wood Lintel 4m"
-msgstr ""
+msgstr "Houten latei 4m"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action
@@ -1137,26 +1237,30 @@ msgid ""
 "contains detailed information about your products related to procurement "
 "logistics, sales price, product category, suppliers and so on."
 msgstr ""
+"U moet een product maken voor alles wat u aan– of verkoopt. Producten kunnen "
+"grondstoffen zijn, voorraadartikelen, verbruiksartikelen of diensten. Het "
+"productformulier bevat detailinfo over bevoorradingslogistiek, verkoopprijs, "
+"productcategorie, leveranciers, enz."
 
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "kg"
-msgstr ""
+msgstr "kg"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_meter
 msgid "m"
-msgstr ""
+msgstr "m"
 
 #. module: product
 #: selection:product.template,state:0
 msgid "Obsolete"
-msgstr ""
+msgstr "Verouderd"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_km
 msgid "km"
-msgstr ""
+msgstr "km"
 
 #. module: product
 #: help:product.template,cost_method:0
@@ -1165,18 +1269,22 @@ msgid ""
 "at the end of the year), Average Price: the cost price is recomputed at each "
 "reception of products."
 msgstr ""
+"Standaardprijs: de kostprijs is vast en wordt periodiek herberekend (meestal "
+"aan het einde van het jaar). Gemiddelde prijs: de kostprijs wordt bij elke "
+"ontvangst van producten opnieuw berekend."
 
 #. module: product
 #: help:product.category,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of product categories."
 msgstr ""
+"Toont de volgorde bij het weergeven van een lijst van productcategorieën."
 
 #. module: product
 #: field:product.uom,factor:0
 #: field:product.uom,factor_inv:0
 msgid "Ratio"
-msgstr ""
+msgstr "Ratio"
 
 #. module: product
 #: help:product.template,purchase_ok:0
@@ -1184,41 +1292,43 @@ msgid ""
 "Determine if the product is visible in the list of products within a "
 "selection from a purchase order line."
 msgstr ""
+"Bepaalt of het product wordt getoond in de lijst van producten op een "
+"aankooporderlijn."
 
 #. module: product
 #: field:product.template,weight_net:0
 msgid "Net Weight"
-msgstr ""
+msgstr "Nettogewicht"
 
 #. module: product
 #: field:product.packaging,width:0
 msgid "Width"
-msgstr ""
+msgstr "Breedte"
 
 #. module: product
 #: help:product.price.type,field:0
 msgid "Associated field in the product form."
-msgstr ""
+msgstr "Gekoppeld veld in het productformulier."
 
 #. module: product
 #: view:product.product:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Maateenheid"
 
 #. module: product
 #: field:product.template,procure_method:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Verwervingswijze"
 
 #. module: product
 #: report:product.pricelist:0
 msgid "Printing Date"
-msgstr ""
+msgstr "Afdrukdatum"
 
 #. module: product
 #: field:product.template,uos_id:0
 msgid "Unit of Sale"
-msgstr ""
+msgstr "Verkoopeenheid"
 
 #. module: product
 #: help:product.template,seller_delay:0
@@ -1227,27 +1337,33 @@ msgid ""
 "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 ""
+"Dit is de gemiddelde vertraging in dagen tussen de bevestiging van de "
+"aankooporder en de ontvangst van goederen voor dit product en voor de "
+"standaardleverancier. Dit wordt gebruikt door de planner om "
+"bestelvoorstellen te sorteren op nabesteltijd."
 
 #. module: product
 #: help:product.template,seller_id:0
 msgid "Main Supplier who has highest priority in Supplier List."
 msgstr ""
+"Belangrijkste leverancier met de hoogste prioriteit in de lijst van "
+"leveranciers."
 
 #. module: product
 #: model:product.category,name:product.product_category_6
 #: view:product.product:0
 msgid "Services"
-msgstr ""
+msgstr "Diensten"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_form_config_action
 msgid "Create or Import Products"
-msgstr ""
+msgstr "Producten maken of importeren"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
 msgid "If Other Pricelist"
-msgstr ""
+msgstr "Als andere prijslijst"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_normal_action
@@ -1258,34 +1374,34 @@ msgstr ""
 #: model:ir.ui.menu,name:product.prod_config_main
 #: view:product.product:0
 msgid "Products"
-msgstr ""
+msgstr "Producten"
 
 #. module: product
 #: help:product.packaging,rows:0
 msgid "The number of layers on a pallet or box"
-msgstr ""
+msgstr "Het aantal lagen op een pallet of doos"
 
 #. module: product
 #: help:product.pricelist.item,base:0
 msgid "The mode for computing the price for this rule."
-msgstr ""
+msgstr "De wijze waarop de prijs in deze regel wordt berekend."
 
 #. module: product
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Pallet Dimension"
-msgstr ""
+msgstr "Palletafmetingen"
 
 #. module: product
 #: code:addons/product/product.py:668
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopie)"
 
 #. module: product
 #: field:product.template,seller_ids:0
 msgid "Partners"
-msgstr ""
+msgstr "Relaties"
 
 #. module: product
 #: help:product.template,sale_delay:0
@@ -1294,18 +1410,21 @@ msgid ""
 "order and the delivery of the finished products. It's the time you promise "
 "to your customers."
 msgstr ""
+"Dit is de gemiddelde termijn in dagen tussen de bevestiging van de "
+"verkooporder en de levering van de afgewerkte producten. Dit is de "
+"afgesproken levertijd aan de klanten."
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Second UoM"
-msgstr ""
+msgstr "Tweede eenheid"
 
 #. module: product
 #: code:addons/product/product.py:143
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Fout"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1313,17 +1432,17 @@ msgstr ""
 #: model:ir.ui.menu,name:product.next_id_16
 #: view:product.uom:0
 msgid "Units of Measure"
-msgstr ""
+msgstr "Maateenheden"
 
 #. module: product
 #: field:product.supplierinfo,min_qty:0
 msgid "Minimal Quantity"
-msgstr ""
+msgstr "Minimumhoeveelheid"
 
 #. module: product
 #: model:product.category,name:product.product_category_9
 msgid "PC"
-msgstr ""
+msgstr "Pc"
 
 #. module: product
 #: help:product.supplierinfo,product_code:0
@@ -1331,21 +1450,23 @@ msgid ""
 "This supplier's product code will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"Dit artikelnummer van de leverancier wordt afgedrukt op de bestelaanvraag. "
+"Laat dit veld leeg om de gewone code te gebruiken."
 
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Stock"
-msgstr ""
+msgstr "Op voorraad maken"
 
 #. module: product
 #: field:product.pricelist.item,price_version_id:0
 msgid "Price List Version"
-msgstr ""
+msgstr "Prijslijstversie"
 
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Quantity Available"
-msgstr ""
+msgstr "Beschikbare hoeveelheid"
 
 #. module: product
 #: help:product.pricelist.item,sequence:0
@@ -1354,58 +1475,61 @@ msgid ""
 "gives highest priority to lowest sequence and stops as soon as a matching "
 "item is found."
 msgstr ""
+"Bepaalt de volgorde waarin de prijslijstitems worden gecontroleerd. De "
+"evaluatie begint bij het laagste volgnummer en stopt zodra een passend item "
+"is gevonden."
 
 #. module: product
 #: selection:product.template,type:0
 msgid "Consumable"
-msgstr ""
+msgstr "Verbruiksartikel"
 
 #. module: product
 #: help:product.price.type,currency_id:0
 msgid "The currency the field is expressed in."
-msgstr ""
+msgstr "De munt waarin het veld is uitgedrukt."
 
 #. module: product
 #: help:product.template,weight:0
 msgid "The gross weight in Kg."
-msgstr ""
+msgstr "Het brutogewicht in kg."
 
 #. module: product
 #: model:product.template,name:product.product_product_sidepanel0_product_template
 msgid "Side Panel"
-msgstr ""
+msgstr "Zijpaneel"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement"
-msgstr ""
+msgstr "Verwerving"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Weights"
-msgstr ""
+msgstr "Gewichten"
 
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr ""
+msgstr "Maateenheidcategorie"
 
 #. module: product
 #: field:product.template,loc_rack:0
 msgid "Rack"
-msgstr ""
+msgstr "Rek"
 
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase Unit of Measure"
-msgstr ""
+msgstr "Aankoopmaateenheid"
 
 #. module: product
 #: field:product.template,supply_method:0
 msgid "Supply Method"
-msgstr ""
+msgstr "Bevoorradingsmethode"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_category_action
@@ -1414,16 +1538,19 @@ msgid ""
 "category to get the list of all products linked to this category or to a "
 "child of this category."
 msgstr ""
+"Dit is de lijst van alle producten per categorie. Klik op een categorie om "
+"de lijst van producten voor die categorie of onderliggende categorieën te "
+"krijgen."
 
 #. module: product
 #: view:product.product:0
 msgid "Group by..."
-msgstr ""
+msgstr "Groeperen op..."
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu_gen_product_template
 msgid "Regular processor config"
-msgstr ""
+msgstr "Normale processorconfiguratie"
 
 #. module: product
 #: help:product.template,type:0
@@ -1431,11 +1558,13 @@ msgid ""
 "Will change the way procurements are processed. Consumable are product where "
 "you don't manage stock."
 msgstr ""
+"Dit zal de manier veranderen waarop de verwerving wordt verwerkt. "
+"Verbruiksartikelen zijn producten waarvan geen voorraad wordt bijgehouden."
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Begindatum"
 
 #. module: product
 #: help:product.template,produce_delay:0
@@ -1445,11 +1574,15 @@ msgid ""
 "the level of this product. Different lead times will be summed for all "
 "levels and purchase orders."
 msgstr ""
+"Gemiddelde termijn in dagen om dit product te produceren. Dit geldt alleen "
+"voor de productieorder en als het een stuklijst is met meerdere niveaus, "
+"geldt deze alleen voor dit product. Verschillende doorlooptijden worden "
+"opgeteld voor alle niveaus en aankooporders."
 
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
 msgid "Basic PC"
-msgstr ""
+msgstr "Basispc"
 
 #. module: product
 #: help:product.pricelist,active:0
@@ -1457,62 +1590,66 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the pricelist "
 "without removing it."
 msgstr ""
+"Als het veld Actief is uitgeschakeld, kunt u de prijslijst verbergen zonder "
+"deze te verwijderen."
 
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
 msgid "cm"
-msgstr ""
+msgstr "cm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Maateenheid product"
 
 #. module: product
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Fout: de standaardmaateenheid en de aankoopmaateenheid moeten in dezelfde "
+"categorie zitten."
 
 #. module: product
 #: field:product.uom,rounding:0
 msgid "Rounding Precision"
-msgstr ""
+msgstr "Afronding"
 
 #. module: product
 #: view:product.uom:0
 msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "Maateenheideigenschappen"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf1_product_template
 msgid "Rack 200cm"
-msgstr ""
+msgstr "Rek 200cm"
 
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Buy"
-msgstr ""
+msgstr "Kopen"
 
 #. module: product
 #: view:product.uom.categ:0
 msgid "Units of Measure categories"
-msgstr ""
+msgstr "Maateenheidcategorieën"
 
 #. module: product
 #: help:product.packaging,weight_ul:0
 msgid "The weight of the empty UL"
-msgstr ""
+msgstr "Het gewicht van de lege verpakking"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodmm10_product_template
 msgid "Wood 10mm"
-msgstr ""
+msgstr "Hout 10mm"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "Kleiner dan de referentie-eenheid"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1521,42 +1658,42 @@ msgstr ""
 #: field:product.product,active:0
 #: field:product.uom,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actief"
 
 #. module: product
 #: field:product.product,price_margin:0
 msgid "Variant Price Margin"
-msgstr ""
+msgstr "Marge variantprijs"
 
 #. module: product
 #: sql_constraint:product.uom:0
 msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
+msgstr "De conversieratio voor een maateenheid mag niet 0 zijn."
 
 #. module: product
 #: help:product.packaging,ean:0
 msgid "The EAN code of the package unit."
-msgstr ""
+msgstr "De EAN-code van de verpakkingseenheid."
 
 #. module: product
 #: help:product.supplierinfo,product_uom:0
 msgid "This comes from the product form."
-msgstr ""
+msgstr "Dit komt van het productformulier."
 
 #. module: product
 #: field:product.packaging,weight_ul:0
 msgid "Empty Package Weight"
-msgstr ""
+msgstr "Gewicht lege verpakking"
 
 #. module: product
 #: field:product.price.type,field:0
 msgid "Product Field"
-msgstr ""
+msgstr "Productveld"
 
 #. module: product
 #: field:product.template,mes_type:0
 msgid "Measure Type"
-msgstr ""
+msgstr "Maattype"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -1564,73 +1701,76 @@ msgid ""
 "How many times this UoM is smaller than the reference UoM in this category:\n"
 "1 * (reference unit) = ratio * (this unit)"
 msgstr ""
+"Hoeveel keer is de eenheid kleiner dan de referentie-eenheid in deze "
+"categorie:\n"
+"1 * (referentie-eenheid) = ratio * (deze eenheid)"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
 #: model:ir.ui.menu,name:product.menu_product_price_type
 msgid "Price Types"
-msgstr ""
+msgstr "Prijstypen"
 
 #. module: product
 #: help:product.template,uom_id:0
 msgid "Default Unit of Measure used for all stock operation."
-msgstr ""
+msgstr "Standaard maateenheid voor alle voorraadbewegingen."
 
 #. module: product
 #: model:product.category,name:product.product_category_misc0
 msgid "Misc"
-msgstr ""
+msgstr "Diversen"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc4_product_template
 msgid "Customizable PC"
-msgstr ""
+msgstr "Maatwerkpc"
 
 #. module: product
 #: field:pricelist.partnerinfo,price:0
 msgid "Unit Price"
-msgstr ""
+msgstr "Eenheidsprijs"
 
 #. module: product
 #: model:product.category,name:product.product_category_7
 #: model:product.template,name:product.product_product_1_product_template
 msgid "Onsite Intervention"
-msgstr ""
+msgstr "Interventie ter plaatse"
 
 #. module: product
 #: model:product.pricelist,name:product.list0
 msgid "Public Pricelist"
-msgstr ""
+msgstr "Publieke prijslijst"
 
 #. module: product
 #: model:product.category,name:product.product_category_marketableproduct0
 msgid "Marketable Products"
-msgstr ""
+msgstr "Verkoopbare producten"
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Supplier Product Code"
-msgstr ""
+msgstr "Productcode leverancier"
 
 #. module: product
 #: view:product.product:0
 msgid "Default UOM"
-msgstr ""
+msgstr "Standaardeenheid"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pallet"
-msgstr ""
+msgstr "Pallet"
 
 #. module: product
 #: field:product.packaging,ul_qty:0
 msgid "Package by layer"
-msgstr ""
+msgstr "Verpakking per laag"
 
 #. module: product
 #: field:product.template,warranty:0
 msgid "Warranty (months)"
-msgstr ""
+msgstr "Garantie (maanden)"
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
@@ -1638,6 +1778,8 @@ msgid ""
 "Set a category of product if this rule only apply to products of a category "
 "and his children. Keep empty for all products"
 msgstr ""
+"Vul een productcategorie in als deze regel alleen geldt voor producten in de "
+"categorie en onderliggende. Laat leeg als de regel geldt voor alle producten."
 
 #. module: product
 #: model:ir.model,name:product.model_product_product
@@ -1649,17 +1791,17 @@ msgstr ""
 #: field:product.supplierinfo,product_id:0
 #: model:res.request.link,name:product.req_link_product
 msgid "Product"
-msgstr ""
+msgstr "Product"
 
 #. module: product
 #: selection:product.template,supply_method:0
 msgid "Produce"
-msgstr ""
+msgstr "Produceren"
 
 #. module: product
 #: selection:product.template,procure_method:0
 msgid "Make to Order"
-msgstr ""
+msgstr "Op bestelling maken"
 
 #. module: product
 #: help:product.template,supply_method:0
@@ -1667,72 +1809,74 @@ msgid ""
 "Produce will generate production order or tasks, according to the product "
 "type. Buy will trigger purchase orders when requested."
 msgstr ""
+"Produceren zal productieorders of taken genereren, volgens het ingestelde "
+"producttype. Kopen zal aankooporders genereren indien gevraagd."
 
 #. module: product
 #: field:product.product,variants:0
 msgid "Variants"
-msgstr ""
+msgstr "Varianten"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_products_category
 msgid "Products by Category"
-msgstr ""
+msgstr "Producten per categorie"
 
 #. module: product
 #: field:product.template,uos_coeff:0
 msgid "UOM -> UOS Coeff"
-msgstr ""
+msgstr "ME -> VE coëff."
 
 #. module: product
 #: help:product.supplierinfo,sequence:0
 msgid "Assigns the priority to the list of product supplier."
-msgstr ""
+msgstr "Kent de prioriteit toe in de lijst van productleveranciers."
 
 #. module: product
 #: field:product.template,uom_id:0
 msgid "Default Unit of Measure"
-msgstr ""
+msgstr "Standaardmaateenheid"
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
 msgid "ATX Mid-size Tower"
-msgstr ""
+msgstr "ATX Mid-size Tower"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Rounding Method"
-msgstr ""
+msgstr "Afrondingsmethode"
 
 #. module: product
 #: model:product.category,name:product.product_category_assembly
 msgid "Assembly Service"
-msgstr ""
+msgstr "Montagedienst"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
 msgid "Products Labels"
-msgstr ""
+msgstr "Productlabels"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
 msgid "Box 30x40x60"
-msgstr ""
+msgstr "Doos 30x40x60"
 
 #. module: product
 #: selection:product.template,type:0
 msgid "Service"
-msgstr ""
+msgstr "Dienst"
 
 #. module: product
 #: help:product.packaging,height:0
 msgid "The height of the package"
-msgstr ""
+msgstr "Hoogte van een verpakking"
 
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price List"
-msgstr ""
+msgstr "Productprijslijst"
 
 #. module: product
 #: field:product.pricelist,company_id:0
@@ -1742,7 +1886,7 @@ msgstr ""
 #: field:product.supplierinfo,company_id:0
 #: field:product.template,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: product
 #: help:product.template,list_price:0
@@ -1750,27 +1894,28 @@ msgid ""
 "Base price for computing the customer price. Sometimes called the catalog "
 "price."
 msgstr ""
+"Basisprijs voor berekening van klantprijs. Wordt ook catalogusprijs genoemd."
 
 #. module: product
 #: code:addons/product/pricelist.py:376
 #, python-format
 msgid "Partner section of the product form"
-msgstr ""
+msgstr "Relatiesectie van het productformulier"
 
 #. module: product
 #: help:product.price.type,name:0
 msgid "Name of this kind of price."
-msgstr ""
+msgstr "Naam voor deze prijssoort"
 
 #. module: product
 #: field:product.supplierinfo,product_uom:0
 msgid "Supplier UoM"
-msgstr ""
+msgstr "Leverancierseenheid"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
 msgid "Starting date for this pricelist version to be valid."
-msgstr ""
+msgstr "Begindatum voor de geldigheid van de prijslijstversie."
 
 #. module: product
 #: help:product.template,uom_po_id:0
@@ -1778,141 +1923,143 @@ msgid ""
 "Default Unit of Measure used for purchase orders. It must be in the same "
 "category than the default unit of measure."
 msgstr ""
+"Standaardmaateenheid voor aankooporders. Deze moet in dezelfde categorie "
+"liggen als de standaardmaateenheid."
 
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
 msgid "This product is configured with example of push/pull flows"
-msgstr ""
+msgstr "Dit product is als voorbeeld met push/pull geconfigureerd."
 
 #. module: product
 #: field:product.packaging,length:0
 msgid "Length"
-msgstr ""
+msgstr "Lengte"
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_length
 msgid "Length / Distance"
-msgstr ""
+msgstr "Lengte / afstand"
 
 #. module: product
 #: model:product.template,name:product.product_product_0_product_template
 msgid "Onsite Senior Intervention"
-msgstr ""
+msgstr "Interventie ter plaatse senior"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_type
 #: field:product.pricelist,type:0
 msgid "Pricelist Type"
-msgstr ""
+msgstr "Prijslijsttype"
 
 #. module: product
 #: model:product.category,name:product.product_category_otherproducts0
 msgid "Other Products"
-msgstr ""
+msgstr "Andere producten"
 
 #. module: product
 #: field:product.product,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Kleurindex"
 
 #. module: product
 #: view:product.product:0
 msgid "Characteristics"
-msgstr ""
+msgstr "Kenmerken"
 
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be Sold"
-msgstr ""
+msgstr "Verkoopbaar"
 
 #. module: product
 #: field:product.template,produce_delay:0
 msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "Productiedoorlooptijd"
 
 #. module: product
 #: field:product.supplierinfo,pricelist_ids:0
 msgid "Supplier Pricelist"
-msgstr ""
+msgstr "Aankoopprijslijst"
 
 #. module: product
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Waarschuwing"
 
 #. module: product
 #: field:product.pricelist.item,base:0
 msgid "Based on"
-msgstr ""
+msgstr "Op basis van"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_ton
 msgid "t"
-msgstr ""
+msgstr "t"
 
 #. module: product
 #: model:product.category,name:product.product_category_rawmaterial0
 msgid "Raw Materials"
-msgstr ""
+msgstr "Grondstoffen"
 
 #. module: product
 #: help:product.template,product_manager:0
 msgid "This is use as task responsible"
-msgstr ""
+msgstr "Wordt gebruikt als taakverantwoordelijke"
 
 #. module: product
 #: field:product.pricelist,name:0
 msgid "Pricelist Name"
-msgstr ""
+msgstr "Prijslijstnaam"
 
 #. 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 "Prijslijstversie"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "* ( 1 + "
-msgstr ""
+msgstr "* ( 1 + "
 
 #. module: product
 #: help:product.packaging,weight:0
 msgid "The weight of a full package, pallet or box."
-msgstr ""
+msgstr "Het gewicht van een volle verpakking, pallet of doos."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd2_product_template
 msgid "HDD Seagate 7200.8 120GB"
-msgstr ""
+msgstr "HDD Seagate 7200.8 120GB"
 
 #. module: product
 #: model:product.template,name:product.product_product_employee0_product_template
 msgid "Employee"
-msgstr ""
+msgstr "Werknemer"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm0_product_template
 msgid "Shelf of 100cm"
-msgstr ""
+msgstr "Plank van 100cm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_category
 #: field:product.pricelist.item,categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "Productcategorie"
 
 #. module: product
 #: report:product.pricelist:0
 msgid "Price List Name"
-msgstr ""
+msgstr "Prijslijstnaam"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Leveringstermijn"
 
 #. module: product
 #: help:product.uom,active:0
@@ -1920,22 +2067,24 @@ msgid ""
 "By unchecking the active field you can disable a unit of measure without "
 "deleting it."
 msgstr ""
+"Door het veld Actief uit te schakelen, kunt u een maateenheid verbergen "
+"zonder dat u deze verwijdert."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "Maateenheidcategorieën"
 
 #. module: product
 #: field:product.template,seller_delay:0
 msgid "Supplier Lead Time"
-msgstr ""
+msgstr "Levertijd"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Box"
-msgstr ""
+msgstr "Doos"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_ul_form_action
@@ -1943,11 +2092,12 @@ msgid ""
 "Create and manage your packaging dimensions and types you want to be "
 "maintained in your system."
 msgstr ""
+"De verpakkingsafmetingen en -typen maken en beheren die u nodig heeft."
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm1_product_template
 msgid "Rear Panel SHE200"
-msgstr ""
+msgstr "Achterpaneel SHE200"
 
 #. module: product
 #: help:product.pricelist.type,key:0
@@ -1955,61 +2105,63 @@ msgid ""
 "Used in the code to select specific prices based on the context. Keep "
 "unchanged."
 msgstr ""
+"Wordt gebruikt in de code om een specieke prijs te bepalen gebaseerd op de "
+"context. Niet wijzigen."
 
 #. module: product
 #: view:product.product:0
 msgid "Context..."
-msgstr ""
+msgstr "Context..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
 msgid "HDD Seagate 7200.8 80GB"
-msgstr ""
+msgstr "HDD Seagate 7200.8 80GB"
 
 #. module: product
 #: help:product.supplierinfo,qty:0
 msgid "This is a quantity which is converted into Default Uom."
-msgstr ""
+msgstr "Dit is een hoeveelheid die is omgezet naar de standaardeenheid."
 
 #. module: product
 #: field:product.packaging,ul:0
 msgid "Type of Package"
-msgstr ""
+msgstr "Soort verpakking"
 
 #. module: product
 #: selection:product.ul,type:0
 msgid "Pack"
-msgstr ""
+msgstr "Verpakking"
 
 #. module: product
 #: model:product.category,name:product.product_category_4
 msgid "Dello Computer"
-msgstr ""
+msgstr "Dello Computer"
 
 #. module: product
 #: model:product.uom.categ,name:product.product_uom_categ_kgm
 msgid "Weight"
-msgstr ""
+msgstr "Gewicht"
 
 #. module: product
 #: model:product.template,name:product.product_product_22_product_template
 msgid "Processor on demand"
-msgstr ""
+msgstr "Processor op aanvraag"
 
 #. module: product
 #: model:process.transition,name:product.process_transition_supplierofproduct0
 msgid "Supplier of the product"
-msgstr ""
+msgstr "Leverancier van het product"
 
 #. module: product
 #: field:product.product,product_image:0
 msgid "Image"
-msgstr ""
+msgstr "Afbeelding"
 
 #. module: product
 #: field:product.uom,uom_type:0
 msgid "UoM Type"
-msgstr ""
+msgstr "Maateenheidtype"
 
 #. module: product
 #: help:product.product,active:0
@@ -2017,6 +2169,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the product "
 "without removing it."
 msgstr ""
+"Als het veld Actief is uitgeschakeld, kunt u het product verbergen zonder "
+"het te verwijderen."
 
 #. module: product
 #: help:product.uom,rounding:0
@@ -2024,32 +2178,34 @@ msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for a UoM "
 "that cannot be further split, such as a piece."
 msgstr ""
+"De berekende hoeveelheid wordt een veelvoud van deze waarde. Gebruik 1,0 "
+"voor een eenheid die niet verder kan worden gesplitst, zoals een stuk."
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Descriptions"
-msgstr ""
+msgstr "Omschrijvingen"
 
 #. module: product
 #: field:product.template,loc_row:0
 msgid "Row"
-msgstr ""
+msgstr "Rij"
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm0_product_template
 msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "Achterpaneel SHE100"
 
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
 msgid "Complete PC With Peripherals"
-msgstr ""
+msgstr "Volledige pc met randapparatuur"
 
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
-msgstr ""
+msgstr "Hotelkosten"
 
 #. module: product
 #: help:product.uom,factor_inv:0
@@ -2057,21 +2213,25 @@ msgid ""
 "How many times this UoM is bigger than the reference UoM in this category:\n"
 "1 * (this unit) = ratio * (reference unit)"
 msgstr ""
+"Hoeveel keer is de eenheid groter dan de referentie-eenheid in deze "
+"categorie:\n"
+"1 * (referentie-eenheid) = ratio * (deze eenheid)"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
 msgid "Rack 100cm"
-msgstr ""
+msgstr "Rek 100cm"
 
 #. module: product
 #: help:product.packaging,sequence:0
 msgid "Gives the sequence order when displaying a list of packaging."
 msgstr ""
+"Bepaalt de volgorde bij het weergeven van een lijst van verpakkingen."
 
 #. module: product
 #: field:product.pricelist.item,price_round:0
 msgid "Price Rounding"
-msgstr ""
+msgstr "Prijsafronding"
 
 #. module: product
 #: code:addons/product/pricelist.py:178
@@ -2080,11 +2240,13 @@ msgid ""
 "At least one pricelist has no active version !\n"
 "Please create or activate one."
 msgstr ""
+"Tenminste een prijslijst heeft geen actieve versie.\n"
+"Gelieve er een te maken of te activeren."
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
 msgid "Max. Price Margin"
-msgstr ""
+msgstr "Max. prijsmarge"
 
 #. module: product
 #: help:product.supplierinfo,product_name:0
@@ -2092,47 +2254,49 @@ msgid ""
 "This supplier's product name will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"De artikelnaam van de leverancier wordt afgedrukt op de bestelaanvraag. Laat "
+"dit veld leeg om de gewone naam te gebruiken."
 
 #. module: product
 #: selection:product.template,mes_type:0
 msgid "Variable"
-msgstr ""
+msgstr "Variabel"
 
 #. module: product
 #: field:product.template,rental:0
 msgid "Can be Rent"
-msgstr ""
+msgstr "Kan worden gehuurd"
 
 #. module: product
 #: model:product.price.type,name:product.standard_price
 #: field:product.template,standard_price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "Kostprijs"
 
 #. module: product
 #: field:product.pricelist.item,price_min_margin:0
 msgid "Min. Price Margin"
-msgstr ""
+msgstr "Min. prijsmarge"
 
 #. module: product
 #: field:product.template,weight:0
 msgid "Gross Weight"
-msgstr ""
+msgstr "Brutogewicht"
 
 #. module: product
 #: model:product.template,name:product.product_product_assemblysection0_product_template
 msgid "Assembly Section"
-msgstr ""
+msgstr "Montageafdeling"
 
 #. module: product
 #: model:product.category,name:product.product_category_3
 msgid "Computer Stuff"
-msgstr ""
+msgstr "Computerspullen"
 
 #. module: product
 #: model:product.category,name:product.product_category_8
 msgid "Phone Help"
-msgstr ""
+msgstr "Telefonische ondersteuning"
 
 #. module: product
 #: field:product.category,sequence:0
@@ -2140,48 +2304,48 @@ msgstr ""
 #: field:product.pricelist.item,sequence:0
 #: field:product.supplierinfo,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Volgorde"
 
 #. module: product
 #: model:product.template,name:product.product_assembly_product_template
 msgid "Assembly Service Cost"
-msgstr ""
+msgstr "Montagekosten"
 
 #. module: product
 #: view:product.price_list:0
 msgid "Close"
-msgstr ""
+msgstr "Sluiten"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
 msgid "Pricelist item"
-msgstr ""
+msgstr "Prijslijstitem"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
 msgid "RAM on demand"
-msgstr ""
+msgstr "RAM op aanvraag"
 
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
-msgstr ""
+msgstr "Verkoopeigenschappen"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Delays"
-msgstr ""
+msgstr "Vertragingen"
 
 #. module: product
 #: view:product.product:0
 msgid "Both stockable and consumable products"
-msgstr ""
+msgstr "Zowel voorraad- als verbruiksartikelen"
 
 #. module: product
 #: model:process.node,note:product.process_node_product0
 msgid "Creation of the product"
-msgstr ""
+msgstr "Creatie van het product"
 
 #. module: product
 #: field:pricelist.partnerinfo,name:0
@@ -2191,49 +2355,49 @@ msgstr ""
 #: view:product.template:0
 #: field:product.template,description:0
 msgid "Description"
-msgstr ""
+msgstr "Omschrijving"
 
 #. module: product
 #: field:product.packaging,ean:0
 msgid "EAN"
-msgstr ""
+msgstr "EAN"
 
 #. module: product
 #: view:product.template:0
 msgid "Product Description"
-msgstr ""
+msgstr "Productomschrijving"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid " ) + "
-msgstr ""
+msgstr " ) + "
 
 #. module: product
 #: field:product.template,volume:0
 msgid "Volume"
-msgstr ""
+msgstr "Volume"
 
 #. module: product
 #: field:product.template,loc_case:0
 msgid "Case"
-msgstr ""
+msgstr "Schap"
 
 #. module: product
 #: view:product.product:0
 #: model:res.groups,name:product.group_product_variant
 msgid "Product Variant"
-msgstr ""
+msgstr "Productvariant"
 
 #. module: product
 #: model:product.category,name:product.product_category_shelves0
 msgid "Shelves"
-msgstr ""
+msgstr "Planken"
 
 #. module: product
 #: code:addons/product/pricelist.py:375
 #, python-format
 msgid "Other Pricelist"
-msgstr ""
+msgstr "Andere prijslijst"
 
 #. module: product
 #: model:ir.model,name:product.model_product_template
@@ -2241,28 +2405,28 @@ msgstr ""
 #: field:product.product,product_tmpl_id:0
 #: view:product.template:0
 msgid "Product Template"
-msgstr ""
+msgstr "Productsjabloon"
 
 #. module: product
 #: field:product.template,cost_method:0
 msgid "Costing Method"
-msgstr ""
+msgstr "Kostprijsbepaling"
 
 #. module: product
 #: view:product.packaging:0
 #: view:product.product:0
 msgid "Palletization"
-msgstr ""
+msgstr "Palletstapeling"
 
 #. module: product
 #: help:product.template,volume:0
 msgid "The volume in m3."
-msgstr ""
+msgstr "Het volume in m3."
 
 #. module: product
 #: selection:product.template,state:0
 msgid "End of Lifecycle"
-msgstr ""
+msgstr "Einde levensloop"
 
 #. module: product
 #: help:product.product,packaging:0
@@ -2270,18 +2434,21 @@ msgid ""
 "Gives the different ways to package the same product. This has no impact on "
 "the picking order and is mainly used if you use the EDI module."
 msgstr ""
+"Toont de verschillende manieren om hetzelfde product te verpakken. Dit heeft "
+"geen invloed op de zendnota. Het wordt hoofdzakelijk gebruikt in de EDI-"
+"module."
 
 #. 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 "Prijslijstversies"
 
 #. module: product
 #: model:product.template,name:product.product_product_span100_product_template
 msgid "Shelf Panel"
-msgstr ""
+msgstr "Kastplank"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -2290,26 +2457,30 @@ msgid ""
 "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 ""
+"Zet de prijs op een veelvoud van deze waarde.\n"
+"De afronding wordt toegepast na de korting en voor de toeslag.\n"
+"Als u uw prijzen wilt laten eindigen op 9,99, stelt u de afronding in op 10 "
+"en de toeslag op -0,01."
 
 #. module: product
 #: field:product.template,list_price:0
 msgid "Sale Price"
-msgstr ""
+msgstr "Verkoopprijs"
 
 #. module: product
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "U kunt niet dezelfde categorieën maken."
 
 #. module: product
 #: field:product.category,type:0
 msgid "Category Type"
-msgstr ""
+msgstr "Categorietype"
 
 #. module: product
 #: model:product.category,name:product.product_category_2
 msgid "Private"
-msgstr ""
+msgstr "Privé"
 
 #. module: product
 #: help:product.template,uos_coeff:0
@@ -2317,16 +2488,18 @@ msgid ""
 "Coefficient to convert UOM to UOS\n"
 " uos = uom * coeff"
 msgstr ""
+"Coëfficiënt voor omzetting maateenheid naar verkoopeenheid\n"
+" VKEH = ME * coëff"
 
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "U kunt niet dezelfde leden maken."
 
 #. module: product
 #: field:product.pricelist.item,price_discount:0
 msgid "Price Discount"
-msgstr ""
+msgstr "Korting"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index d5af6d76fe9..c3d6be82eb4 100644
--- a/addons/product/i18n/pl.po
+++ b/addons/product/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index 881a013046e..1a56ac1dc3a 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index 6d50128ee72..4c6fc9425ab 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -76,7 +76,7 @@ msgstr "Vendável"
 #. module: product
 #: model:product.template,name:product.product_product_mb2_product_template
 msgid "Mainboard ASUStek A7V8X-X"
-msgstr "Mainboard ASUStek A7V8X-X"
+msgstr "Placa Mãe ASUStek A7V8X-X"
 
 #. module: product
 #: help:product.template,seller_qty:0
@@ -91,7 +91,7 @@ msgstr "Dia"
 #. module: product
 #: view:product.product:0
 msgid "UoM"
-msgstr "Unidade de Medida"
+msgstr "UdM"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc2_product_template
@@ -126,7 +126,7 @@ msgstr "Fixo"
 #: code:addons/product/pricelist.py:178
 #, python-format
 msgid "Warning !"
-msgstr "Atenção !"
+msgstr "Aviso!"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_pricelist
@@ -216,7 +216,7 @@ msgstr "Lista de Preços"
 #. module: product
 #: view:product.template:0
 msgid "UOM"
-msgstr "Unidade"
+msgstr "UdM"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_unit
@@ -239,8 +239,8 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from a sale order line."
 msgstr ""
-"Determina se o produto pode ficar visível na lista de produtos do pedido de "
-"venda."
+"Determina se o produto pode ser visível na lista de produtos dentro de uma "
+"seleção a partir de uma linha de pedido de venda."
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
@@ -262,7 +262,7 @@ msgstr "Lista de Preços de Venda"
 #: view:product.template:0
 #: field:product.template,type:0
 msgid "Product Type"
-msgstr "Tipo do produto"
+msgstr "Tipo de Produto"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_form_config_action
@@ -341,7 +341,7 @@ msgstr "Categoria"
 msgid ""
 "The rule only applies if the partner buys/sells more than this quantity."
 msgstr ""
-"As regras somente se aplicam se o parceiro comprar/vender mais que esta "
+"As regras somente se aplicam se o parceiro comprar/vender mais do que esta "
 "quantidade."
 
 #. module: product
@@ -362,14 +362,14 @@ msgstr "Número de pacotes por camada"
 #. module: product
 #: field:product.packaging,qty:0
 msgid "Quantity by Package"
-msgstr "Quantidade por embalagem"
+msgstr "Quantidade por Embalagem"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 #: field:product.template,state:0
 msgid "Status"
-msgstr "Estado"
+msgstr "Situação"
 
 #. module: product
 #: help:product.template,categ_id:0
@@ -405,7 +405,7 @@ msgstr "Componentes de TI"
 #. module: product
 #: field:product.template,product_manager:0
 msgid "Product Manager"
-msgstr "Administração do produto"
+msgstr "Administração do Produto"
 
 #. module: product
 #: field:product.supplierinfo,product_name:0
@@ -443,6 +443,15 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Quantidade atual de produtos.\n"
+"Em um contexto de Estoque Único, inclui bens armazenados neste local, ou "
+"qualquer um dos seus filhos.\n"
+"Em um contexto de Armazém Único, inclui bens armazenados no local de estoque "
+"deste Armazém, ou qualquer um dos seus filhos.\n"
+"Em um contexto de Loja única, inclui bens armazenados no local de estoque do "
+"Armazém da loja, ou qualquer um dos seus filhos.\n"
+"Caso contrário, inclui mercadorias armazenadas em qualquer local do tipo "
+"'interno'."
 
 #. module: product
 #: view:product.pricelist:0
@@ -454,13 +463,13 @@ msgstr "Procurar Preços de Produtos"
 #: view:product.template:0
 #: field:product.template,description_sale:0
 msgid "Sale Description"
-msgstr "Descrição da venda"
+msgstr "Descrição da Venda"
 
 #. module: product
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Localisation"
-msgstr "Locação"
+msgstr "Localização do Armazenamento"
 
 #. module: product
 #: help:product.packaging,length:0
@@ -526,7 +535,7 @@ msgstr "Quantidade-4"
 #. module: product
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Compras e Vendas"
+msgstr "Compras & Vendas"
 
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
@@ -544,7 +553,7 @@ msgid ""
 "category will be based on the supplier price multiplied by 1.80."
 msgstr ""
 "Uma lista de preços contem regras que serão avaliadas para calcular o preço "
-"de compra ou venda de todos os parceiros definidos para esta lista. Listas "
+"de compra ou venda para todos os parceiros definidos para esta lista. Listas "
 "de preços podem ter várias versões (2010, 2011, Promoção de Fevereiro 2010, "
 "etc.) e cada versão tem várias regras. Exemplo: o preço para cliente de uma "
 "categoria de produto será baseado no preço do fornecedor multiplicado por "
@@ -564,7 +573,7 @@ msgstr "Não é possível alterar a categoria de uma UdM  '%s' existente."
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
 msgid "Product uom categ"
-msgstr "Categorias de unidades"
+msgstr "Categorias UdM de Produtos"
 
 #. module: product
 #: model:product.ul,name:product.product_ul_box
@@ -579,12 +588,12 @@ msgstr "Cálculo de Preços"
 #. module: product
 #: model:res.groups,name:product.group_uos
 msgid "Product UoS View"
-msgstr "Ver UoS de Produto"
+msgstr "Visualizar UdV do Produto"
 
 #. module: product
 #: field:product.template,purchase_ok:0
 msgid "Can be Purchased"
-msgstr "Pode ser comprado"
+msgstr "Pode ser Comprado"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu2_product_template
@@ -617,17 +626,17 @@ msgstr "A largura da embalagem"
 #. module: product
 #: selection:product.category,type:0
 msgid "View"
-msgstr "Exibir"
+msgstr "Visualizar"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_template_action_tree
 msgid "Product Templates"
-msgstr "Templates de Produtos"
+msgstr "Modelos de Produtos"
 
 #. module: product
 #: field:product.category,parent_left:0
 msgid "Left Parent"
-msgstr "Pai anterior"
+msgstr "Pai Esquerda"
 
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
@@ -648,7 +657,7 @@ msgstr "Error: código EAN invalido"
 #. module: product
 #: field:product.pricelist.item,min_quantity:0
 msgid "Min. Quantity"
-msgstr "Quantidade mínima"
+msgstr "Quantidade Mínima"
 
 #. module: product
 #: model:ir.model,name:product.model_product_price_type
@@ -663,19 +672,19 @@ msgid ""
 "you need to change the unit of measure, you may desactivate this product "
 "from the 'Procurement & Locations' tab and create a new one."
 msgstr ""
-"A nova UoM '%s' precisa pertencer a mesma categoria de UoM '%s' da antiga "
-"'%s'. Se você precisar alterar a Unidade de Medida, você pode desativar este "
-"produto na aba 'Compras & Locais' e criar um novo."
+"A nova UdM '%s' precisa pertencer a mesma categoria de UdM '%s' da antiga "
+"'%s'. Se você precisar alterar a Unidade de Medida (UdM), você pode "
+"desativar este produto na aba 'Aquisições & Locais' e criar um novo."
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Max. Margin"
-msgstr "Margem máxima"
+msgstr "Margem Mínima"
 
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Base Price"
-msgstr "Preço base"
+msgstr "Preço Base"
 
 #. module: product
 #: model:product.template,name:product.product_consultant_product_template
@@ -716,7 +725,7 @@ msgstr "Fornecedor"
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Quantity On Hand"
-msgstr "Quantidade na măo"
+msgstr "Quantidade na mãƒo"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -746,6 +755,15 @@ msgid ""
 "Otherwise, this includes goods arriving to any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Quantidade de produtos que estão previstos para chegar.\n"
+"Em um contexto de Estoque único, inclui mercadorias que chegam a este local, "
+"ou qualquer um dos seus filhos.\n"
+"Em um contexto de Armazém único, inclui mercadorias que chegam ao local de "
+"estoque do Armazém, ou qualquer um dos seus filhos.\n"
+"Em um contexto de Loja única, inclui mercadorias que chegam ao local de "
+"estoque do Armazém da loja, ou qualquer um dos seus filhos.\n"
+"Caso contrário, inclui mercadorias que chegam para qualquer local da escrita "
+"como 'interno'."
 
 #. module: product
 #: model:product.template,name:product.product_product_woodentable0_product_template
@@ -809,7 +827,7 @@ msgstr "Acessórios"
 #. module: product
 #: field:product.template,sale_delay:0
 msgid "Customer Lead Time"
-msgstr "Tempo para entrega ao cliente"
+msgstr "Prazo de Entrega ao Cliente"
 
 #. module: product
 #: model:product.template,name:product.product_product_25_product_template
@@ -831,7 +849,7 @@ msgstr ""
 #. module: product
 #: view:product.pricelist.item:0
 msgid "Min. Margin"
-msgstr "Margem mínima"
+msgstr "Margem Mínima"
 
 #. module: product
 #: field:product.category,child_id:0
@@ -895,7 +913,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Procurement & Locations"
-msgstr "Aquisições & Locações"
+msgstr "Aquisições & Locais"
 
 #. module: product
 #: model:product.template,name:product.product_product_kitchendesignproject0_product_template
@@ -910,7 +928,7 @@ msgstr "Hora"
 #. module: product
 #: selection:product.template,state:0
 msgid "In Development"
-msgstr "Em desevolvimento"
+msgstr "Em Desenvolvimento"
 
 #. module: product
 #: code:addons/product/product.py:363
@@ -948,7 +966,7 @@ msgstr "Normal"
 #: model:process.node,name:product.process_node_supplier0
 #: view:product.supplierinfo:0
 msgid "Supplier Information"
-msgstr "Supplier Information"
+msgstr "Informações de Fornecedores"
 
 #. module: product
 #: field:product.price.type,currency_id:0
@@ -967,7 +985,7 @@ msgstr "DDR 256MB PC400"
 #: model:ir.ui.menu,name:product.menu_product_category_action_form
 #: view:product.category:0
 msgid "Product Categories"
-msgstr "Categorias de produtos"
+msgstr "Categorias de Produtos"
 
 #. module: product
 #: view:product.uom:0
@@ -1012,7 +1030,7 @@ msgstr ""
 #. module: product
 #: view:product.price.type:0
 msgid "Products Price Type"
-msgstr "Tipo de preço de produtos"
+msgstr "Tipo de Preços de Produtos"
 
 #. module: product
 #: field:product.product,price_extra:0
@@ -1034,7 +1052,7 @@ msgstr "As informações sobre um fornecedor do produto"
 #: view:product.template:0
 #: field:product.template,description_purchase:0
 msgid "Purchase Description"
-msgstr "Descrição da compra"
+msgstr "Descrição da Compra"
 
 #. module: product
 #: constraint:product.pricelist.version:0
@@ -1066,7 +1084,7 @@ msgstr ""
 #. module: product
 #: selection:product.template,type:0
 msgid "Stockable Product"
-msgstr "Produto estocável"
+msgstr "Produto Estocável"
 
 #. module: product
 #: field:product.packaging,code:0
@@ -1087,12 +1105,12 @@ msgstr ""
 #. module: product
 #: model:ir.model,name:product.model_product_ul
 msgid "Shipping Unit"
-msgstr "Unidade de transporte"
+msgstr "Unidade de Envio"
 
 #. module: product
 #: field:pricelist.partnerinfo,suppinfo_id:0
 msgid "Partner Information"
-msgstr "Informação do parceiro"
+msgstr "Informação do Parceiro"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1163,6 +1181,15 @@ msgid ""
 "Otherwise, this includes goods leaving from any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Quantidade de produtos que estão previstos para sair.\n"
+"Em um contexto com uma única localidade de estoque, isso inclui mercadorias "
+"que saem a partir deste local, ou qualquer um de seus filhos.\n"
+"Em um contexto com um único armazém, isto inclui mercadorias que saem do "
+"local de estoque do Armazém, ou qualquer um dos seus filhos.\n"
+"Em um contexto com uma única loja, isso inclui mercadorias que saem do local "
+"de estoque do Armazém da loja, ou qualquer um dos seus filhos.\n"
+"Caso contrário, isso inclui mercadorias que saem a partir de qualquer local "
+"da escrita como 'interno'."
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
@@ -1182,7 +1209,7 @@ msgstr "Placa mãe ASUStek A7N8X"
 #. module: product
 #: field:product.product,packaging:0
 msgid "Logistical Units"
-msgstr "Unidades logísticas"
+msgstr "Unidades Logísticas"
 
 #. module: product
 #: field:product.category,complete_name:0
@@ -1334,7 +1361,7 @@ msgstr "Serviços"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_form_config_action
 msgid "Create or Import Products"
-msgstr "Cria ou Importa Produtos"
+msgstr "Crie ou Importe Produtos"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
@@ -1394,13 +1421,13 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Second UoM"
-msgstr "Segunda Unidade"
+msgstr "Segunda UdM"
 
 #. module: product
 #: code:addons/product/product.py:143
 #, python-format
 msgid "Error !"
-msgstr "Erro !"
+msgstr "Erro!"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1408,12 +1435,12 @@ msgstr "Erro !"
 #: model:ir.ui.menu,name:product.next_id_16
 #: view:product.uom:0
 msgid "Units of Measure"
-msgstr "Unidade de medida"
+msgstr "Unidades de Medida"
 
 #. module: product
 #: field:product.supplierinfo,min_qty:0
 msgid "Minimal Quantity"
-msgstr "Quantidade mínima"
+msgstr "Quantidade Mínima"
 
 #. module: product
 #: model:product.category,name:product.product_category_9
@@ -1451,7 +1478,7 @@ msgid ""
 "gives highest priority to lowest sequence and stops as soon as a matching "
 "item is found."
 msgstr ""
-"Define a ordem na qual que os itens da lista de preços serão checados. A "
+"Define a ordem em que os itens da lista de preços serão checados. A "
 "avaliação inicia com prioridade para a sequência mais baixa e é encerrada "
 "assim que o item é encontrado."
 
@@ -1490,7 +1517,7 @@ msgstr "Pesos"
 #. module: product
 #: field:product.uom,category_id:0
 msgid "UoM Category"
-msgstr "Categoria de Unidade"
+msgstr "Categoria UdM"
 
 #. module: product
 #: field:product.template,loc_rack:0
@@ -1500,7 +1527,7 @@ msgstr "Rack"
 #. module: product
 #: field:product.template,uom_po_id:0
 msgid "Purchase Unit of Measure"
-msgstr "Unid. de Medida de Compra"
+msgstr "Unidade de Medida de Compra"
 
 #. module: product
 #: field:product.template,supply_method:0
@@ -1534,8 +1561,8 @@ msgid ""
 "Will change the way procurements are processed. Consumable are product where "
 "you don't manage stock."
 msgstr ""
-"Irá mudar a forma como compras são processadas. Consumíveis são produtos que "
-"você não controla estoque"
+"Irá mudar a forma como aquisições são processadas. Consumíveis são produtos "
+"que você não controla estoque"
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -1577,14 +1604,14 @@ msgstr "cm"
 #. module: product
 #: model:ir.model,name:product.model_product_uom
 msgid "Product Unit of Measure"
-msgstr "Unidade do produto"
+msgstr "Unidade de Medida do Produto"
 
 #. module: product
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
-"Erro: A unidade padrão e a unidade de compra presisam ser da mesma categoria."
+"Erro: A UdM padrão e a UdM de compra precisam estar na mesma categoria."
 
 #. module: product
 #: field:product.uom,rounding:0
@@ -1594,7 +1621,7 @@ msgstr "Precisão do arredondamento"
 #. module: product
 #: view:product.uom:0
 msgid "Unit of Measure Properties"
-msgstr "Propriedades da Unid. de Medida"
+msgstr "Propriedades da Unidade de Medida"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf1_product_template
@@ -1658,7 +1685,7 @@ msgstr "Isto vem do formulário do produto"
 #. module: product
 #: field:product.packaging,weight_ul:0
 msgid "Empty Package Weight"
-msgstr "Peso da embalagem"
+msgstr "Peso da Embalagem Vazia"
 
 #. module: product
 #: field:product.price.type,field:0
@@ -1668,7 +1695,7 @@ msgstr "Campo Produto"
 #. module: product
 #: field:product.template,mes_type:0
 msgid "Measure Type"
-msgstr "Tipo de medida"
+msgstr "Tipo de Medida"
 
 #. module: product
 #: help:product.uom,factor:0
@@ -1688,7 +1715,7 @@ msgstr "Tipos de Preço"
 #. module: product
 #: help:product.template,uom_id:0
 msgid "Default Unit of Measure used for all stock operation."
-msgstr "Unidade padrão usada para todas as operações."
+msgstr "Unidade de Medida padrão usada para todas as operações de estoque."
 
 #. module: product
 #: model:product.category,name:product.product_category_misc0
@@ -1703,7 +1730,7 @@ msgstr "PC Customizável"
 #. module: product
 #: field:pricelist.partnerinfo,price:0
 msgid "Unit Price"
-msgstr "Preço unitário"
+msgstr "Preço Unitário"
 
 #. module: product
 #: model:product.category,name:product.product_category_7
@@ -1744,7 +1771,7 @@ msgstr "Embalagem por camada"
 #. module: product
 #: field:product.template,warranty:0
 msgid "Warranty (months)"
-msgstr "Garantia(meses)"
+msgstr "Garantia (meses)"
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
@@ -1796,12 +1823,12 @@ msgstr "Subtipos"
 #: model:ir.actions.act_window,name:product.product_category_action
 #: model:ir.ui.menu,name:product.menu_products_category
 msgid "Products by Category"
-msgstr "Produtos por categoria"
+msgstr "Produtos por Categoria"
 
 #. module: product
 #: field:product.template,uos_coeff:0
 msgid "UOM -> UOS Coeff"
-msgstr "Unidade de medida -> Coeficiente unidade de venda"
+msgstr "Coeficiente UdM -> UdV"
 
 #. module: product
 #: help:product.supplierinfo,sequence:0
@@ -1851,7 +1878,7 @@ msgstr "Altura da embalagem"
 #. module: product
 #: view:product.pricelist:0
 msgid "Products Price List"
-msgstr "Lista de preços"
+msgstr "Lista de Preços"
 
 #. module: product
 #: field:product.pricelist,company_id:0
@@ -1899,7 +1926,7 @@ msgid ""
 "Default Unit of Measure used for purchase orders. It must be in the same "
 "category than the default unit of measure."
 msgstr ""
-"Unidade de Medida default usada para pedidos de compra. Deve estar na mesma "
+"Unidade de Medida padrão usada para pedidos de compra. Deve estar na mesma "
 "categoria que a UdM Padrão."
 
 #. module: product
@@ -1951,7 +1978,7 @@ msgstr "Pode ser Vendido"
 #. module: product
 #: field:product.template,produce_delay:0
 msgid "Manufacturing Lead Time"
-msgstr "Tempo para produção"
+msgstr "Prazo de Fabricação"
 
 #. module: product
 #: field:product.supplierinfo,pricelist_ids:0
@@ -1962,7 +1989,7 @@ msgstr "Lista de Preços para Fornecedor"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Warning"
-msgstr "Alerta"
+msgstr "Aviso"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -2025,7 +2052,7 @@ msgstr "Estante de 100cm"
 #: model:ir.model,name:product.model_product_category
 #: field:product.pricelist.item,categ_id:0
 msgid "Product Category"
-msgstr "Categoria de produtos"
+msgstr "Categoria de Produtos"
 
 #. module: product
 #: report:product.pricelist:0
@@ -2049,7 +2076,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "UoM Categories"
-msgstr "Categorias UoM"
+msgstr "Categorias UdM"
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -2102,7 +2129,7 @@ msgstr "Esta é a quantidade que é convertida para UdM Padrão."
 #. module: product
 #: field:product.packaging,ul:0
 msgid "Type of Package"
-msgstr "Tipo de pacote"
+msgstr "Tipo de Embalagem"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -2137,7 +2164,7 @@ msgstr "Imagem"
 #. module: product
 #: field:product.uom,uom_type:0
 msgid "UoM Type"
-msgstr "Tipo de Unid. de Medida"
+msgstr "Tipo de UdM"
 
 #. module: product
 #: help:product.product,active:0
@@ -2154,8 +2181,8 @@ msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for a UoM "
 "that cannot be further split, such as a piece."
 msgstr ""
-"A quantidade calculada será multipla deste valor. Use 1.0 para Unid. de "
-"Medida que não pode ser dividida."
+"A quantidade calculada será multipla deste valor. Use 1.0 para UdM que não "
+"pode ser dividida, exemplo uma peça."
 
 #. module: product
 #: view:product.product:0
@@ -2166,7 +2193,7 @@ msgstr "Descrições"
 #. module: product
 #: field:product.template,loc_row:0
 msgid "Row"
-msgstr "Row"
+msgstr "Linha"
 
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm0_product_template
@@ -2176,7 +2203,7 @@ msgstr "Painel Traseiro SHE100"
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
 msgid "Complete PC With Peripherals"
-msgstr "PC Complet com periféricos"
+msgstr "PC Completo com periféricos"
 
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
@@ -2245,7 +2272,7 @@ msgstr "Pode ser Alugado"
 #: model:product.price.type,name:product.standard_price
 #: field:product.template,standard_price:0
 msgid "Cost Price"
-msgstr "Preço de custo"
+msgstr "Preço de Custo"
 
 #. module: product
 #: field:product.pricelist.item,price_min_margin:0
@@ -2270,7 +2297,7 @@ msgstr "Componentes de Computador"
 #. module: product
 #: model:product.category,name:product.product_category_8
 msgid "Phone Help"
-msgstr "Telefone de Ajuda"
+msgstr "Suporte Telefônico"
 
 #. module: product
 #: field:product.category,sequence:0
@@ -2293,7 +2320,7 @@ msgstr "Fechar"
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_item
 msgid "Pricelist item"
-msgstr "Item da lista"
+msgstr "Item da lista de preço"
 
 #. module: product
 #: model:product.template,name:product.product_product_21_product_template
@@ -2303,7 +2330,7 @@ msgstr "Memória RAM sob demanda"
 #. module: product
 #: view:res.partner:0
 msgid "Sales Properties"
-msgstr "Propriedades de vendas"
+msgstr "Propriedades da Venda"
 
 #. module: product
 #: view:product.product:0
@@ -2339,7 +2366,7 @@ msgstr "EAN"
 #. module: product
 #: view:product.template:0
 msgid "Product Description"
-msgstr "Descrição do produto"
+msgstr "Descrição do Produto"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -2379,7 +2406,7 @@ msgstr "Outra lista"
 #: field:product.product,product_tmpl_id:0
 #: view:product.template:0
 msgid "Product Template"
-msgstr "Template de Produto"
+msgstr "Modelo de Produto"
 
 #. module: product
 #: field:product.template,cost_method:0
@@ -2422,7 +2449,7 @@ msgstr "Versões da lista"
 #. module: product
 #: model:product.template,name:product.product_product_span100_product_template
 msgid "Shelf Panel"
-msgstr ""
+msgstr "Painel de Prateleira"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -2431,15 +2458,15 @@ msgid ""
 "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 ""
-"Define o preço, de modo a ser um múltiplo deste valor.\n"
-"Aplica-se o arredondamento após o desconto e antes da sobretaxa.\n"
-"Utilize arredondamento 10 e sobretaxa -0.01 para obter preços que terminam "
-"em 9,99"
+"Define o preço, de modo que é um múltiplo desse valor.\n"
+"O arredondamento é aplicado após o desconto e antes da sobretaxa.\n"
+"Os preços que terminam em 9,99, defina o arredondamento para 10, e -0,01 de "
+"sobretaxa"
 
 #. module: product
 #: field:product.template,list_price:0
 msgid "Sale Price"
-msgstr "Preço de venda"
+msgstr "Preço de Venda"
 
 #. module: product
 #: constraint:product.category:0
@@ -2462,13 +2489,14 @@ msgid ""
 "Coefficient to convert UOM to UOS\n"
 " uos = uom * coeff"
 msgstr ""
-"Coeficiente para converter UdM para UdM de Venda (UdM-V)\n"
-" UdM-V = UdM * Coeficiente"
+"Coeficiente para converter Unidade de Medida UdM para Unidade de Venda UdV "
+"de Venda\n"
+" UdV = UdM * Coeficiente"
 
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursivamente a membros associados."
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: product
 #: field:product.pricelist.item,price_discount:0
@@ -2742,9 +2770,6 @@ msgstr "Desconto"
 #~ msgid "Stockable"
 #~ msgstr "Estocável"
 
-#~ msgid "Default Unit Of Measure"
-#~ msgstr "Unid. de Medida Padrão"
-
 #~ msgid "Error ! You can not create recursive associated members."
 #~ msgstr "Erro ! Você não pode criar membros recursivos associados."
 
@@ -2838,3 +2863,6 @@ msgstr "Desconto"
 #~ "Irá mudar a forma que as aquisições são processadas. Consumíveis são "
 #~ "produtos estocáveis com estoque infinito, ou para ser usado quando mesmo "
 #~ "quando não há gerenciamento de inventário no sistema."
+
+#~ msgid "Default Unit Of Measure"
+#~ msgstr "Unidade de Medida Padrão"
diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po
index dc4d16a5d5a..8ef2f5284b1 100644
--- a/addons/product/i18n/ro.po
+++ b/addons/product/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 2cb0b0ba735..4c6c293dcb4 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-07-26 16:28+0000\n"
-"Last-Translator: Michael Otcheskih <otma@mail.ru>\n"
+"PO-Revision-Date: 2012-08-30 18:22+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -57,6 +57,16 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Прогнозируемое количество (подсчитанное как количество на руках - исходящее "
+"+ поступающее)\n"
+"В контексте единственного места хранения товара, это включает товары "
+"хранимые в этом месте или любом его дочернем.\n"
+"В контексте единственного склада, это включает товары хранимые в месте "
+"хранения товара на складе или любом его дочернем.\n"
+"В контексте единственного магазина, это включает товары хранимые в в месте "
+"хранения товара на складе этого магазина или любом его дочернем.\n"
+"Иначе, это включает товары хранимые в любом месте, обозначенном как "
+"'внутреннее'."
 
 #. module: product
 #: model:product.category,name:product.product_category_1
@@ -99,8 +109,8 @@ msgid ""
 "This pricelist will be used, instead of the default one, for sales to the "
 "current partner"
 msgstr ""
-"Для продаж текущему партнеру, вместо каталога по умолчанию, будет "
-"использоваться этот каталог"
+"Для продаж текущему партнеру, вместо прайс-листа по умолчанию, будет "
+"использоваться этот прайс-лист"
 
 #. module: product
 #: field:product.template,seller_qty:0
@@ -125,7 +135,7 @@ msgstr "Внимание !"
 #: field:product.product,pricelist_id:0
 #: view:product.supplierinfo:0
 msgid "Pricelist"
-msgstr "Каталог"
+msgstr "Прайс-лист"
 
 #. module: product
 #: view:product.product:0
@@ -170,11 +180,13 @@ msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
+"Преобразование ед.изм. товара %s в ед.изм. по умолчанию %s невозможно "
+"поскольку они принадлежат различным категориям!"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_dozen
 msgid "Dozen"
-msgstr ""
+msgstr "Дюжина"
 
 #. module: product
 #: selection:product.template,cost_method:0
@@ -184,7 +196,7 @@ msgstr "Средняя цена"
 #. module: product
 #: help:product.pricelist.item,name:0
 msgid "Explicit rule name for this pricelist line."
-msgstr "Название явного правила для позиции каталога."
+msgstr "Название явного правила для позиции прайс-листа."
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu1_product_template
@@ -256,6 +268,8 @@ msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"Создайте форму товара для всего, что вы покупаете или продаёте. Определите "
+"поставщика, если товар может быть закуплен."
 
 #. module: product
 #: view:product.uom:0
@@ -427,6 +441,15 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Текущее количество товаров.\n"
+"В контексте единственного места хранения товара, это включает товары "
+"хранимые в этом месте или любом его дочернем.\n"
+"В контексте единственного склада, это включает товары хранимые в месте "
+"хранения товара на складе или любом его дочернем.\n"
+"В контексте единственного магазина, это включает товары хранимые в в месте "
+"хранения товара на складе этого магазина или любом его дочернем.\n"
+"Иначе, это включает товары хранимые в любом месте, обозначенном как "
+"'внутреннее'."
 
 #. module: product
 #: view:product.pricelist:0
@@ -527,6 +550,11 @@ msgid ""
 "each version has several rules. Example: the customer price of a product "
 "category will be based on the supplier price multiplied by 1.80."
 msgstr ""
+"Прайс-лист содержит правила оценки в порядке подсчёта цены закупки или "
+"продаж для всех партнёров предназначенных прайс-листу. Прайс-листы имеют "
+"различные версии (2010, 2011, продвижение февраля 2010, и т.п.) и каждая "
+"версия имеет различные правила. Пример: покупательская цена категории товара "
+"будет основана на цене поставщика умноженной на 1,80."
 
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
@@ -537,7 +565,7 @@ msgstr "Металлические зажимы"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Cannot change the category of existing UoM '%s'."
-msgstr ""
+msgstr "Нельзя изменить категорию существующей ед.изм '%s'."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -557,7 +585,7 @@ msgstr "Расчет цены"
 #. module: product
 #: model:res.groups,name:product.group_uos
 msgid "Product UoS View"
-msgstr ""
+msgstr "Вид ед.прод. продукта"
 
 #. module: product
 #: field:product.template,purchase_ok:0
@@ -642,6 +670,10 @@ msgid ""
 "you need to change the unit of measure, you may desactivate this product "
 "from the 'Procurement & Locations' tab and create a new one."
 msgstr ""
+"Новая ед.изм. '%s' должна принадлежать той же катагории ед.изм. '%s', что и "
+"старая ед.изм. '%s'. Если вам нужно сменить единицу измерения, вы можете "
+"деактивировать этот продукт во вкладке 'Снабжение и места хранения' и "
+"создать новый."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -656,7 +688,7 @@ msgstr "Базовая цена"
 #. module: product
 #: model:product.template,name:product.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr ""
+msgstr "Услуга по табелю"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
@@ -692,7 +724,7 @@ msgstr "Поставщик"
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Quantity On Hand"
-msgstr ""
+msgstr "Количество на руках"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -707,7 +739,7 @@ msgstr "Название цены"
 #. module: product
 #: model:product.template,name:product.product_product_arm_product_template
 msgid "Cabinet"
-msgstr ""
+msgstr "Шкаф"
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -722,11 +754,20 @@ msgid ""
 "Otherwise, this includes goods arriving to any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Количество товаров запланированных к прибытию.\n"
+"В контексте единственного места хранения товара, это включает товары "
+"хранимые в этом месте или любом его дочернем.\n"
+"В контексте единственного склада, это включает товары хранимые в месте "
+"хранения товара на складе или любом его дочернем.\n"
+"В контексте единственного магазина, это включает товары хранимые в в месте "
+"хранения товара на складе этого магазина или любом его дочернем.\n"
+"Иначе, это включает товары хранимые в любом месте, обозначенном как "
+"'внутреннее'."
 
 #. module: product
 #: model:product.template,name:product.product_product_woodentable0_product_template
 msgid "Wooden Table"
-msgstr ""
+msgstr "Деревянный стол"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
@@ -968,7 +1009,7 @@ msgstr "Итоговый вес пакета"
 #. module: product
 #: field:product.template,seller_info_id:0
 msgid "unknown"
-msgstr ""
+msgstr "неизвесно"
 
 #. module: product
 #: help:product.packaging,code:0
@@ -990,7 +1031,7 @@ msgstr "Тип цены продукции"
 #. module: product
 #: field:product.product,price_extra:0
 msgid "Variant Price Extra"
-msgstr ""
+msgstr "Вариант наценки"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan_product_template
@@ -1021,7 +1062,7 @@ msgid ""
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
 msgstr ""
-"Запас по времени между подтверждением заказа на закупку и приходом ТМЦ на "
+"Запас по времени между подтверждением заказа закупки и приходом ТМЦ на "
 "склад. Используется планировщиком для автоматического планирования заказа на "
 "закупку."
 
@@ -1134,6 +1175,15 @@ msgid ""
 "Otherwise, this includes goods leaving from any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Количество товаров запланированное к уходу.\n"
+"В контексте единственного места хранения товара, это включает товары "
+"хранимые в этом месте или любом его дочернем.\n"
+"В контексте единственного склада, это включает товары хранимые в месте "
+"хранения товара на складе или любом его дочернем.\n"
+"В контексте единственного магазина, это включает товары хранимые в в месте "
+"хранения товара на складе этого магазина или любом его дочернем.\n"
+"Иначе, это включает товары хранимые в любом месте, обозначенном как "
+"'внутреннее'."
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
@@ -1172,7 +1222,7 @@ msgstr "Название"
 #. module: product
 #: model:product.template,name:product.product_product_woodlintelm0_product_template
 msgid "Wood Lintel 4m"
-msgstr ""
+msgstr "Деревянная балка 4м"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action
@@ -1300,7 +1350,7 @@ msgstr "Услуги"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_form_config_action
 msgid "Create or Import Products"
-msgstr ""
+msgstr "Создать или импортировать товары"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
@@ -1407,7 +1457,7 @@ msgstr "Версия каталога"
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Quantity Available"
-msgstr ""
+msgstr "Доступное количество"
 
 #. module: product
 #: help:product.pricelist.item,sequence:0
@@ -1498,6 +1548,8 @@ msgid ""
 "Will change the way procurements are processed. Consumable are product where "
 "you don't manage stock."
 msgstr ""
+"Изменение способа обработки снабжения. Потребляемым является товар, где вы "
+"не должны обслуживать запас."
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -1512,6 +1564,10 @@ msgid ""
 "the level of this product. Different lead times will be summed for all "
 "levels and purchase orders."
 msgstr ""
+"Средняя задержка в днях для производства этого товара. Это только для заказа "
+"производства и если есть многоуровневая спецификация материалов, то это "
+"только для уровня этого товара. Различные сроки суммируются для всех уровней "
+"и заказов закупок."
 
 #. module: product
 #: model:product.template,name:product.product_product_pc1_product_template
@@ -1573,12 +1629,12 @@ msgstr "Категории единиц измерения"
 #. module: product
 #: help:product.packaging,weight_ul:0
 msgid "The weight of the empty UL"
-msgstr ""
+msgstr "Вес пустой UL."
 
 #. module: product
 #: model:product.template,name:product.product_product_woodmm10_product_template
 msgid "Wood 10mm"
-msgstr ""
+msgstr "Доска 10мм"
 
 #. module: product
 #: selection:product.uom,uom_type:0
@@ -1613,7 +1669,7 @@ msgstr "Штрих-код EAN упаковки"
 #. module: product
 #: help:product.supplierinfo,product_uom:0
 msgid "This comes from the product form."
-msgstr ""
+msgstr "Это поступает из формы товара."
 
 #. module: product
 #: field:product.packaging,weight_ul:0
@@ -1744,6 +1800,8 @@ msgid ""
 "Produce will generate production order or tasks, according to the product "
 "type. Buy will trigger purchase orders when requested."
 msgstr ""
+"\"Произвести\" создаст заказ производства или задачи согласно типу товара. "
+"\"Покупка\" запустит заказы закупки по запросу."
 
 #. module: product
 #: field:product.product,variants:0
@@ -1784,7 +1842,7 @@ msgstr "Метод округления"
 #. module: product
 #: model:product.category,name:product.product_category_assembly
 msgid "Assembly Service"
-msgstr ""
+msgstr "Услуги сборки"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
@@ -1862,7 +1920,7 @@ msgstr ""
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
 msgid "This product is configured with example of push/pull flows"
-msgstr ""
+msgstr "Этот товар сконфигурирован с примером потоков положить/взять"
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1893,7 +1951,7 @@ msgstr "Другие ТМЦ"
 #. module: product
 #: field:product.product,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Цветовая палитра"
 
 #. module: product
 #: view:product.product:0
@@ -1919,7 +1977,7 @@ msgstr "Каталог поставщика"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Внимание"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -2007,7 +2065,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "Категории единиц"
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -2043,7 +2101,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 msgid "Context..."
-msgstr ""
+msgstr "Контекст ..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
@@ -2088,7 +2146,7 @@ msgstr "Поставщик ТМЦ"
 #. module: product
 #: field:product.product,product_image:0
 msgid "Image"
-msgstr ""
+msgstr "Изображение"
 
 #. module: product
 #: field:product.uom,uom_type:0
@@ -2170,6 +2228,8 @@ msgid ""
 "At least one pricelist has no active version !\n"
 "Please create or activate one."
 msgstr ""
+"По крайней мере один прайс-лист не имеет активной версии!\n"
+"Пожалуйста, создайте или активируйте его."
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
@@ -2237,7 +2297,7 @@ msgstr "Последовательность"
 #. module: product
 #: model:product.template,name:product.product_assembly_product_template
 msgid "Assembly Service Cost"
-msgstr ""
+msgstr "Цена услуги сборки"
 
 #. module: product
 #: view:product.price_list:0
@@ -2268,7 +2328,7 @@ msgstr "Задержки"
 #. module: product
 #: view:product.product:0
 msgid "Both stockable and consumable products"
-msgstr ""
+msgstr "Как запасаемые, так и потребляемые товары"
 
 #. module: product
 #: model:process.node,note:product.process_node_product0
@@ -2362,6 +2422,8 @@ msgid ""
 "Gives the different ways to package the same product. This has no impact on "
 "the picking order and is mainly used if you use the EDI module."
 msgstr ""
+"Даёт различные способы упаковки товара. Это не влияет на заказ "
+"комплектования и в основном применяется если вы используете модуль ЭОД (EDI)."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action
@@ -2373,7 +2435,7 @@ msgstr "Версии каталогов"
 #. module: product
 #: model:product.template,name:product.product_product_span100_product_template
 msgid "Shelf Panel"
-msgstr ""
+msgstr "Панель полки"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -2395,7 +2457,7 @@ msgstr "Цена продажи"
 #. module: product
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Ошибка ! Нельзя создавать рекурсивные категории."
 
 #. module: product
 #: field:product.category,type:0
@@ -2419,7 +2481,7 @@ msgstr ""
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: product
 #: field:product.pricelist.item,price_discount:0
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index 0e784836e1a..fa059c6bd11 100644
--- a/addons/product/i18n/sk.po
+++ b/addons/product/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po
index 9e83e3cdc01..daf133f53cc 100644
--- a/addons/product/i18n/sl.po
+++ b/addons/product/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sq.po b/addons/product/i18n/sq.po
index c2830068339..a86c77e9b62 100644
--- a/addons/product/i18n/sq.po
+++ b/addons/product/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:44+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index 895a3519292..3bdda90f4cc 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sr@latin.po b/addons/product/i18n/sr@latin.po
index 54873997260..85e99fd1745 100644
--- a/addons/product/i18n/sr@latin.po
+++ b/addons/product/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index fe3398817d0..e642e27f647 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -178,6 +178,8 @@ msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
+"Konvertering från produkt måttenheter %s till standard måttenheter %s är "
+"inte möjligt, eftersom båda tillhör annan kategori!."
 
 #. module: product
 #: model:product.uom,name:product.product_uom_dozen
@@ -272,7 +274,7 @@ msgstr ""
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  t ex: 1 * (den här enheten) = förhållande * (referens enhet)"
 
 #. module: product
 #: code:addons/product/product.py:418
@@ -437,6 +439,16 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Nuvarande kvantitet av produkter.\n"
+"I ett sammanhang med en enda lagerplats omfattar detta varor som lagras på "
+"den här platsen, eller någon av det som ligger därunder.\n"
+"I ett sammanhang med ett enda lager omfattar detta varor som lagrats på "
+"lagerplatsen för detta lager, eller någon av det som ligger därunder.\n"
+"I ett sammanhang med en enda butik, omfattar detta varor som lagrats i "
+"lagerplacering av lagret från det här kontoret, eller  någon av det som "
+"ligger därunder.\n"
+"Annars omfattar detta varor som lagras på någon lagerplats som som är "
+"\"intern\"."
 
 #. module: product
 #: view:product.pricelist:0
@@ -537,6 +549,12 @@ msgid ""
 "each version has several rules. Example: the customer price of a product "
 "category will be based on the supplier price multiplied by 1.80."
 msgstr ""
+"En prislista innehåller regler som skall utvärderas för att beräkna köp "
+"eller försäljningspriset för alla parter som tilldelats en prislista. "
+"Prislistor har flera versioner (2010, 2011, Erbjudanden i februari 2010, "
+"etc.) och varje version har flera regler. Exempel: Kundens pris på en "
+"produktkategori skall att baseras på leverantörspriset multiplicerat med "
+"1,80."
 
 #. module: product
 #: model:product.template,name:product.product_product_metalcleats0_product_template
@@ -547,7 +565,7 @@ msgstr "Metallkotsar"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Cannot change the category of existing UoM '%s'."
-msgstr ""
+msgstr "Det går inte att ändra kategori av befintliga måttenheter '% s'."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -651,6 +669,9 @@ msgid ""
 "you need to change the unit of measure, you may desactivate this product "
 "from the 'Procurement & Locations' tab and create a new one."
 msgstr ""
+"Nya måttenheter% s måste tillhöra samma måttenhetskategori '% s' som gamla "
+"måttenhet '% s'. Om du behöver ändra måttenhet kan du avaktivera denna "
+"produkt under \">Inköp & Platser\"-fliken och skapa en ny."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -691,7 +712,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_kitshelfofcm0_product_template
 msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "KIT Hylla 100 cm"
 
 #. module: product
 #: field:product.supplierinfo,name:0
@@ -731,6 +752,16 @@ msgid ""
 "Otherwise, this includes goods arriving to any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Kvantitet av produkter som planeras att levereras.\n"
+"I ett sammanhang med en enda lagerplats omfattar detta varor som anländer "
+"till denna plats, eller någon av det som ligger därunder.\n"
+"I ett sammanhang med en enda lager omfattar detta varor som anländer till "
+"lagerplatsen för detta lager, eller någon av det som ligger därunder.\n"
+"I ett sammanhang med en enda butik, omfattar detta varor som anländer till "
+"lagerplacering av lagret från det här butiken, eller någon av det som ligger "
+"därunder.\n"
+"Annars omfattar detta varor som anländer till en lagerplats som skrivs som "
+"\"intern\"."
 
 #. module: product
 #: model:product.template,name:product.product_product_woodentable0_product_template
@@ -769,6 +800,9 @@ msgid ""
 "Product UoM if not empty, in the default unit of measure of the product "
 "otherwise."
 msgstr ""
+"Minsta mängd som krävs för att köpa från denna leverantör, uttryckt i "
+"leverantörens måttenhet om den inte är inte tom, i standard måttenhet för "
+"produkten om den är tom."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -781,6 +815,8 @@ msgid ""
 "This price will be considered as a price for the supplier UoM if any or the "
 "default Unit of Measure of the product otherwise"
 msgstr ""
+"Detta pris kommer att betraktas som ett pris för leverantörens måttenhet, "
+"annars gäller standard måttenhet för produkten."
 
 #. module: product
 #: model:product.category,name:product.product_category_5
@@ -804,6 +840,10 @@ msgid ""
 "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 ""
+"Används av företag som hanterar två måttenheter: fakturering och "
+"lagerhantering. Till exempel i livsmedelsindustrin - du har ett lager av "
+"antal skinkor, men fakturerar i kg. Håll tomt för att använda standard "
+"enheten."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -893,7 +933,7 @@ msgstr "Under utveckling"
 #: code:addons/product/product.py:363
 #, python-format
 msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "Enhetskategorier Fel!"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
@@ -949,7 +989,7 @@ msgstr "Produktkategorier"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr "  t ex: 1 * (den här enheten) = förhållande * (referens enhet)"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -958,6 +998,8 @@ msgid ""
 "You can define a conversion rate between several Units of Measure within the "
 "same category."
 msgstr ""
+"Skapa och hantera måttenheter som du vill ska användas i systemet. Du kan "
+"definiera en konvertering mellan flera måttenheter inom samma kategori."
 
 #. module: product
 #: field:product.packaging,weight:0
@@ -1032,6 +1074,9 @@ msgid ""
 "manage new versions of a price list. Some examples of versions: 2010, 2011, "
 "Summer Promotion, etc."
 msgstr ""
+"Det kan finnas mer än en version av en prislista. Här kan du skapa och "
+"hantera nya versioner av en prislista. Några exempel på varianter: 2010, "
+"2011, Sommarerbjudande etc."
 
 #. module: product
 #: selection:product.template,type:0
@@ -1099,11 +1144,15 @@ msgid ""
 "be converted to each other. For example, in the unit of measure category "
 "\"Time\", you will have the following UoM: Hours, Days."
 msgstr ""
+"Skapa och hantera måttenheternas kategorier som du vill ska användas i "
+"systemet. Om flera måttenheter är i samma kategori, kan de omvandlas mellan "
+"varandra. Till exempel i måttenhetskategorin \"Tid\", kan du att ha följande "
+"storlek: minuter, timmar, dagar."
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "Större än referensmåttenheten"
 
 #. module: product
 #: field:product.category,parent_right:0
@@ -1128,6 +1177,16 @@ msgid ""
 "Otherwise, this includes goods leaving from any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Kvantitet produkter som planeras att lämna.\n"
+"I ett sammanhang med en enda lagerplats omfattar detta varor som förs ut "
+"från denna plats, eller något som ligger därunder.\n"
+"I ett sammanhang med ett enda lager omfattar detta varor som lämnar från "
+"lagerplatsen för detta lager, eller något som ligger därunder.\n"
+"I ett sammanhang med en enda butik, omfattar detta varor som lämnar "
+"lagerplatsen på lagret från det här kontoret,  eller något som ligger "
+"därunder.\n"
+"Annars omfattar detta varor som förs ut från alla lagerplatser som skrivs "
+"som \"intern\"."
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
@@ -1166,7 +1225,7 @@ msgstr "Namn"
 #. module: product
 #: model:product.template,name:product.product_product_woodlintelm0_product_template
 msgid "Wood Lintel 4m"
-msgstr ""
+msgstr "Trä Lintel 4m"
 
 #. module: product
 #: model:ir.actions.act_window,help:product.product_normal_action
@@ -1347,6 +1406,9 @@ msgid ""
 "order and the delivery of the finished products. It's the time you promise "
 "to your customers."
 msgstr ""
+"Detta är den genomsnittliga förseningen i dagar mellan bekräftelsen av "
+"kundens beställning och leverans av de färdiga produkterna. Det är den tid "
+"du lovar dina kunder."
 
 #. module: product
 #: view:product.product:0
@@ -1409,6 +1471,9 @@ msgid ""
 "gives highest priority to lowest sequence and stops as soon as a matching "
 "item is found."
 msgstr ""
+"Ger ordningen som prislistans punkter kommer att kontrolleras. Utvärderingen "
+"ger högsta prioritet till lägsta sekvens och stannar så snart en matchande "
+"post hittas."
 
 #. module: product
 #: selection:product.template,type:0
@@ -1469,6 +1534,9 @@ msgid ""
 "category to get the list of all products linked to this category or to a "
 "child of this category."
 msgstr ""
+"En lista över alla dina produkter indelade i kategorier. Du kan klicka på en "
+"kategori för att få en lista över alla produkter kopplade till denna "
+"kategori eller till något av denna kategori."
 
 #. module: product
 #: view:product.product:0
@@ -1486,6 +1554,8 @@ msgid ""
 "Will change the way procurements are processed. Consumable are product where "
 "you don't manage stock."
 msgstr ""
+"Kommer att förändra hur upphandlingar behandlas. Förbrukningsmaterial är "
+"produkter där man inte hanterar lager."
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -1547,7 +1617,7 @@ msgstr "Enhetsinställningar"
 #. module: product
 #: model:product.template,name:product.product_product_shelf1_product_template
 msgid "Rack 200cm"
-msgstr ""
+msgstr "Hylla 200cm"
 
 #. module: product
 #: selection:product.template,supply_method:0
@@ -1567,12 +1637,12 @@ msgstr "Tomvikt (UL)"
 #. module: product
 #: model:product.template,name:product.product_product_woodmm10_product_template
 msgid "Wood 10mm"
-msgstr ""
+msgstr "Trä 10 mm"
 
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "Mindre än referensmåttenhet"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1601,7 +1671,7 @@ msgstr "EAN-kod för förpackningsenhet"
 #. module: product
 #: help:product.supplierinfo,product_uom:0
 msgid "This comes from the product form."
-msgstr ""
+msgstr "Detta kommer från produktformuläret."
 
 #. module: product
 #: field:product.packaging,weight_ul:0
@@ -1624,12 +1694,15 @@ msgid ""
 "How many times this UoM is smaller than the reference UoM in this category:\n"
 "1 * (reference unit) = ratio * (this unit)"
 msgstr ""
+"Hur många gånger denna måttenhet är mindre än referensvärdets måttenhet i "
+"denna kategori:\n"
+"1 * (referensenhet) = förhållande * (denna enhet)"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_price_type_action
 #: model:ir.ui.menu,name:product.menu_product_price_type
 msgid "Price Types"
-msgstr ""
+msgstr "Pris typ"
 
 #. module: product
 #: help:product.template,uom_id:0
@@ -1698,6 +1771,8 @@ msgid ""
 "Set a category of product if this rule only apply to products of a category "
 "and his children. Keep empty for all products"
 msgstr ""
+"Sätt en produktkategori om denna regel endast gäller för produkter från en "
+"kategori och det därunder. Håll tom för alla produkter"
 
 #. module: product
 #: model:ir.model,name:product.model_product_product
@@ -1769,7 +1844,7 @@ msgstr "Avrundningsmetod"
 #. module: product
 #: model:product.category,name:product.product_category_assembly
 msgid "Assembly Service"
-msgstr ""
+msgstr "Monteringsservice"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
@@ -1827,7 +1902,7 @@ msgstr "Namn på denna pristyp"
 #. module: product
 #: field:product.supplierinfo,product_uom:0
 msgid "Supplier UoM"
-msgstr ""
+msgstr "Leverantörs måttenhet"
 
 #. module: product
 #: help:product.pricelist.version,date_start:0
@@ -1846,7 +1921,7 @@ msgstr ""
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
 msgid "This product is configured with example of push/pull flows"
-msgstr ""
+msgstr "Denna produkt är konfigurerad med exempel på Trycka / Dra flöden"
 
 #. module: product
 #: field:product.packaging,length:0
@@ -1923,7 +1998,7 @@ msgstr "Råmeterial"
 #. module: product
 #: help:product.template,product_manager:0
 msgid "This is use as task responsible"
-msgstr ""
+msgstr "Detta är används som ansvarig för uppgiften"
 
 #. module: product
 #: field:product.pricelist,name:0
@@ -1960,7 +2035,7 @@ msgstr "Anställd"
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm0_product_template
 msgid "Shelf of 100cm"
-msgstr ""
+msgstr "Hylla 100 cm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_category
@@ -1984,12 +2059,14 @@ msgid ""
 "By unchecking the active field you can disable a unit of measure without "
 "deleting it."
 msgstr ""
+"Genom att avmarkera det aktiva fältet kan du inaktivera en måttenhet utan "
+"att ta bort det."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "Enhetskategorier"
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -2013,7 +2090,7 @@ msgstr ""
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm1_product_template
 msgid "Rear Panel SHE200"
-msgstr ""
+msgstr "Bakre Panel SHE200"
 
 #. module: product
 #: help:product.pricelist.type,key:0
@@ -2094,6 +2171,9 @@ msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for a UoM "
 "that cannot be further split, such as a piece."
 msgstr ""
+"Den beräknade kvantiteten kommer att vara en multipel av detta värde. Använd "
+"1,0 för en produktenhet som inte kan delas upp ytterligare, till exempel en "
+"bit."
 
 #. module: product
 #: view:product.product:0
@@ -2109,7 +2189,7 @@ msgstr "Rad"
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm0_product_template
 msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "Bakre panel SHE100"
 
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
@@ -2127,11 +2207,14 @@ msgid ""
 "How many times this UoM is bigger than the reference UoM in this category:\n"
 "1 * (this unit) = ratio * (reference unit)"
 msgstr ""
+"Hur många gånger denna enhet är större än referensen enhet i denna "
+"kategori:\n"
+"1 * (den här enheten) = förhållande * (referens enhet)"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
 msgid "Rack 100cm"
-msgstr ""
+msgstr "Hylla 100cm"
 
 #. module: product
 #: help:product.packaging,sequence:0
@@ -2250,7 +2333,7 @@ msgstr "Ledtid"
 #. module: product
 #: view:product.product:0
 msgid "Both stockable and consumable products"
-msgstr ""
+msgstr "Både lagerhållna och förbrukningsvaror"
 
 #. module: product
 #: model:process.node,note:product.process_node_product0
@@ -2344,6 +2427,8 @@ msgid ""
 "Gives the different ways to package the same product. This has no impact on "
 "the picking order and is mainly used if you use the EDI module."
 msgstr ""
+"Ger de olika sätten att paketera samma produkt. Detta har ingen inverkan på "
+"plockordern och används främst om du använder EDI-modulen."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action
@@ -2355,7 +2440,7 @@ msgstr "Prislisteversioner"
 #. module: product
 #: model:product.template,name:product.product_product_span100_product_template
 msgid "Shelf Panel"
-msgstr ""
+msgstr "Hyllplan"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -2376,7 +2461,7 @@ msgstr "Säljpris"
 #. module: product
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Fel! Du kan inte skapa rekursiva kategorier"
 
 #. module: product
 #: field:product.category,type:0
@@ -2400,7 +2485,7 @@ msgstr ""
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Fel ! Du kan inte ansluta medlemmar rekursivt"
 
 #. module: product
 #: field:product.pricelist.item,price_discount:0
diff --git a/addons/product/i18n/th.po b/addons/product/i18n/th.po
index a2a7d9b5bd7..8ca1941b33b 100644
--- a/addons/product/i18n/th.po
+++ b/addons/product/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/tlh.po b/addons/product/i18n/tlh.po
index 8e0f2b053e4..63e9e716f64 100644
--- a/addons/product/i18n/tlh.po
+++ b/addons/product/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:10+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 10f0fb02810..5108741917c 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
@@ -57,6 +57,15 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Tahmin miktarı (Eldek Miktar olarak hesaplanan - Çıkan + Giren)\n"
+"Tek Stok Konumu ile bir bağlamda, bu malların depolandığı konumu içerir , ya "
+"da onun herhangi bir alt konumunu.\n"
+"Tek Depo ile bir bağlamda, bu Depoda malların depolandığı Stok Konumunu "
+"içerir, ya da onun herhangi bir alt konumunu.\n"
+"Tek Mağaza ile bir bağlamda, bu Mağazaya ait Depoda malların depolandığı "
+"Stok Konumunu içerir, ya da onun herhangi bir alt konumunu.\n"
+"Aksi durumda, malların depolandığı 'iç' tipli herhangi bir Stok Konumunu "
+"içerir."
 
 #. module: product
 #: model:product.category,name:product.product_category_1
@@ -170,11 +179,13 @@ msgid ""
 "Conversion from Product UoM %s to Default UoM %s is not possible as they "
 "both belong to different Category!."
 msgstr ""
+"Ürün Ölçü Birimin %s den Varsayılan Ölçü Birimi %s e dönüştürmek, eğer her "
+"ikisi de farklı kategorilere aitse, olası değildir."
 
 #. module: product
 #: model:product.uom,name:product.product_uom_dozen
 msgid "Dozen"
-msgstr ""
+msgstr "Düzine"
 
 #. module: product
 #: selection:product.template,cost_method:0
@@ -257,6 +268,8 @@ msgid ""
 "Create a product form for everything you buy or sell. Specify a supplier if "
 "the product can be purchased."
 msgstr ""
+"Satınaldığınız ya da sattığınız herşeyden bir ürün oluşturun. Satınalınır "
+"bir ürünse bir tedarikçi belirleyin."
 
 #. module: product
 #: view:product.uom:0
@@ -427,6 +440,15 @@ msgid ""
 "Otherwise, this includes goods stored in any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Ürünlerin mevcut miktarı.\n"
+"Tek Stok Konumu ile bir bağlamda, bu Konumda depolanan malları içerir, ya da "
+"herhangi bir altındakini.\n"
+"Tek Depoyla bir bağlamda, bu Depoya ait Stok Konumunda depolanan malları "
+"içerir, ya da herhangi bir altındakini.\n"
+"Tek Mağaza ile bir bağlamda, bu Mağazaya ait Deponun Stok Konumunda "
+"depolanan malları içerir, ya da herhangi bir altındakini.\n"
+"Aksi durumda, 'iç' tipli herhangi bir Stok Konumunda depolanan malları "
+"içerir."
 
 #. module: product
 #: view:product.pricelist:0
@@ -542,7 +564,7 @@ msgstr "Metal takoz"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Cannot change the category of existing UoM '%s'."
-msgstr ""
+msgstr "Mevcut Ölçü Biriminin '%s' kategorisi değiştirilemiyor."
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom_categ
@@ -562,7 +584,7 @@ msgstr "Fiyat Hesaplaması"
 #. module: product
 #: model:res.groups,name:product.group_uos
 msgid "Product UoS View"
-msgstr ""
+msgstr "Ürün Satış Birimi Görünümü"
 
 #. module: product
 #: field:product.template,purchase_ok:0
@@ -610,7 +632,7 @@ msgstr "Ürün Kartı Şablonu"
 #. module: product
 #: field:product.category,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "Sol Üst Öğe"
 
 #. module: product
 #: model:product.template,name:product.product_product_restaurantexpenses0_product_template
@@ -646,6 +668,10 @@ msgid ""
 "you need to change the unit of measure, you may desactivate this product "
 "from the 'Procurement & Locations' tab and create a new one."
 msgstr ""
+"'%s' Yeni Ölçü Birimi, eski '%s' Ölçü Biriminin '%s' Ölçü Birimi "
+"kategorisine ait olmalıdır. Ölçü birimini değiştirmek isterseniz, 'Satınalma "
+"& Konumlar' sekmesinden bu ürünün etkinliğini kaldırmanız ve yeni bir tane "
+"oluşturmanız gerekir ."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -660,7 +686,7 @@ msgstr "Taban Fiyatı"
 #. module: product
 #: model:product.template,name:product.product_consultant_product_template
 msgid "Service on Timesheet"
-msgstr ""
+msgstr "Zamançizlgesi Hizmeti"
 
 #. module: product
 #: model:product.template,name:product.product_product_fan2_product_template
@@ -696,7 +722,7 @@ msgstr "Tedarikçi"
 #. module: product
 #: field:product.product,qty_available:0
 msgid "Quantity On Hand"
-msgstr ""
+msgstr "Eldeki Miktar"
 
 #. module: product
 #: model:product.template,name:product.product_product_26_product_template
@@ -711,7 +737,7 @@ msgstr "Fiyat Adı"
 #. module: product
 #: model:product.template,name:product.product_product_arm_product_template
 msgid "Cabinet"
-msgstr ""
+msgstr "Dolap"
 
 #. module: product
 #: help:product.product,incoming_qty:0
@@ -726,11 +752,19 @@ msgid ""
 "Otherwise, this includes goods arriving to any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Gelmesi planlanan ürünlerin miktarı.\n"
+"Tek Stok Konumu ile bir bağlamda, bu Konuma gelecek malları içerir, ya da "
+"herhangi bir altındakini.\n"
+"Tek Depoyla bir bağlamda, bu Depoya ait Stok Konumuna gelecek malları "
+"içerir, ya da herhangi bir altındakini.\n"
+"Tek Mağaza ile bir bağlamda, bu Mağazaya ait Deponun Stok Konumuna gelecek "
+"malları içerir, ya da herhangi bir altındakini.\n"
+"Aksi durumda, 'iç' tipli herhangi bir Stok Konumuna gelecek malları içerir."
 
 #. module: product
 #: model:product.template,name:product.product_product_woodentable0_product_template
 msgid "Wooden Table"
-msgstr ""
+msgstr "Ahşap Masa"
 
 #. module: product
 #: model:product.template,name:product.product_product_cpu3_product_template
@@ -896,7 +930,7 @@ msgstr "Geliştirilmekte"
 #: code:addons/product/product.py:363
 #, python-format
 msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "Ölçü Birimi kategorileri uyuşmuyor!"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm1_product_template
@@ -973,7 +1007,7 @@ msgstr "Toplam Paket Ağırlığı"
 #. module: product
 #: field:product.template,seller_info_id:0
 msgid "unknown"
-msgstr ""
+msgstr "bilinmeyen"
 
 #. module: product
 #: help:product.packaging,code:0
@@ -1121,7 +1155,7 @@ msgstr "Referans Ölçü biriminden büyük"
 #. module: product
 #: field:product.category,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "Sağ Üst Öğe"
 
 #. module: product
 #: view:product.product:0
@@ -1141,6 +1175,14 @@ msgid ""
 "Otherwise, this includes goods leaving from any Stock Location typed as "
 "'internal'."
 msgstr ""
+"Gönderilmesi planlanan ürünlerin miktarı.\n"
+"Tek Stok Konumu ile bir bağlamda, bu Konumdan çıkacak malları içerir, ya da "
+"herhangi bir altındakini.\n"
+"Tek Depoyla bir bağlamda, bu Depoya ait Stok Konumundan çıkacak malları "
+"içerir, ya da herhangi bir altındakini.\n"
+"Tek Mağaza ile bir bağlamda, bu Mağazaya ait Deponun Stok Konumundan çıkacak "
+"malları içerir, ya da herhangi bir altındakini.\n"
+"Aksi durumda, 'iç' tipli herhangi bir Stok Konumundan çıkacak malları içerir."
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
@@ -1307,7 +1349,7 @@ msgstr "Hizmetler"
 #. module: product
 #: model:ir.actions.act_window,name:product.product_form_config_action
 msgid "Create or Import Products"
-msgstr ""
+msgstr "Ürünleri Oluştur ya da İçeaktar"
 
 #. module: product
 #: field:product.pricelist.item,base_pricelist_id:0
@@ -1415,7 +1457,7 @@ msgstr "Fiyat Listesi Versiyonu"
 #. module: product
 #: field:product.product,virtual_available:0
 msgid "Quantity Available"
-msgstr ""
+msgstr "Mevcut Miktar"
 
 #. module: product
 #: help:product.pricelist.item,sequence:0
@@ -1506,6 +1548,8 @@ msgid ""
 "Will change the way procurements are processed. Consumable are product where "
 "you don't manage stock."
 msgstr ""
+"Satınalımaların işlenme yolunu değiştirecektir. Tüketim malları stok olarak "
+"işleyeceğiniz mallar değildir."
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
@@ -1588,7 +1632,7 @@ msgstr "Boş UL nin ağırlığı"
 #. module: product
 #: model:product.template,name:product.product_product_woodmm10_product_template
 msgid "Wood 10mm"
-msgstr ""
+msgstr "10 mm Tahta"
 
 #. module: product
 #: selection:product.uom,uom_type:0
@@ -1622,7 +1666,7 @@ msgstr "Paketin EAN barkodu"
 #. module: product
 #: help:product.supplierinfo,product_uom:0
 msgid "This comes from the product form."
-msgstr ""
+msgstr "Bu, ürün formundan geliyor."
 
 #. module: product
 #: field:product.packaging,weight_ul:0
@@ -1752,6 +1796,8 @@ msgid ""
 "Produce will generate production order or tasks, according to the product "
 "type. Buy will trigger purchase orders when requested."
 msgstr ""
+"Üretim ürün türüne göre üretim emri ya da görevi oluşturacaktır. Talep "
+"oluştuğunda satınalma, satınalma siparişini tetikleyecektir."
 
 #. module: product
 #: field:product.product,variants:0
@@ -1792,7 +1838,7 @@ msgstr "Yuvarlama yöntemi"
 #. module: product
 #: model:product.category,name:product.product_category_assembly
 msgid "Assembly Service"
-msgstr ""
+msgstr "Montaj Hizmeti"
 
 #. module: product
 #: model:ir.actions.report.xml,name:product.report_product_label
@@ -1902,7 +1948,7 @@ msgstr "Diğer Ürünler"
 #. module: product
 #: field:product.product,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Renk Endeksi"
 
 #. module: product
 #: view:product.product:0
@@ -1928,7 +1974,7 @@ msgstr "Tedarikçi Fiyat Listesi"
 #: code:addons/product/product.py:175
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Uyarı"
 
 #. module: product
 #: field:product.pricelist.item,base:0
@@ -1938,7 +1984,7 @@ msgstr "Temelinde"
 #. module: product
 #: model:product.uom,name:product.product_uom_ton
 msgid "t"
-msgstr ""
+msgstr "t"
 
 #. module: product
 #: model:product.category,name:product.product_category_rawmaterial0
@@ -2016,7 +2062,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:product.product_uom_categ_form_action
 #: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "Ölçü Birimi Kategorileri"
 
 #. module: product
 #: field:product.template,seller_delay:0
@@ -2051,7 +2097,7 @@ msgstr ""
 #. module: product
 #: view:product.product:0
 msgid "Context..."
-msgstr ""
+msgstr "İçerik..."
 
 #. module: product
 #: model:product.template,name:product.product_product_hdd1_product_template
@@ -2096,7 +2142,7 @@ msgstr "Ürün Tedarikçisi"
 #. module: product
 #: field:product.product,product_image:0
 msgid "Image"
-msgstr ""
+msgstr "Görüntü"
 
 #. module: product
 #: field:product.uom,uom_type:0
@@ -2178,6 +2224,8 @@ msgid ""
 "At least one pricelist has no active version !\n"
 "Please create or activate one."
 msgstr ""
+"Enaz bir fiyat listesinin etkin sürümü yok!\n"
+"Lüten bir tane oluşturun ya da etkinleştirin."
 
 #. module: product
 #: field:product.pricelist.item,price_max_margin:0
@@ -2245,7 +2293,7 @@ msgstr "Sıra No"
 #. module: product
 #: model:product.template,name:product.product_assembly_product_template
 msgid "Assembly Service Cost"
-msgstr ""
+msgstr "Montaj Hizmeti Maliyeti"
 
 #. module: product
 #: view:product.price_list:0
@@ -2276,7 +2324,7 @@ msgstr "Gecikmeler"
 #. module: product
 #: view:product.product:0
 msgid "Both stockable and consumable products"
-msgstr ""
+msgstr "Hem stoklanabilir hem de tüketilebilir ürün"
 
 #. module: product
 #: model:process.node,note:product.process_node_product0
@@ -2383,7 +2431,7 @@ msgstr "Fiyat Listesi Versiyonları"
 #. module: product
 #: model:product.template,name:product.product_product_span100_product_template
 msgid "Shelf Panel"
-msgstr ""
+msgstr "Raf Paneli"
 
 #. module: product
 #: help:product.pricelist.item,price_round:0
@@ -2405,7 +2453,7 @@ msgstr "Satış Fiyatı"
 #. module: product
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Yinelenen kategoriler oluşturamazsınız."
 
 #. module: product
 #: field:product.category,type:0
@@ -2429,7 +2477,7 @@ msgstr ""
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Hata ! yinelenen ilişkili üyeler oluşturamazsınız."
 
 #. module: product
 #: field:product.pricelist.item,price_discount:0
diff --git a/addons/product/i18n/uk.po b/addons/product/i18n/uk.po
index c8df83efc50..b6c484109c6 100644
--- a/addons/product/i18n/uk.po
+++ b/addons/product/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index f547c2ed8bc..4e523d9cba8 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 01a320a2dd4..ba15b458a02 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/i18n/zh_TW.po b/addons/product/i18n/zh_TW.po
index a07ce3ea580..e342a3827df 100644
--- a/addons/product/i18n/zh_TW.po
+++ b/addons/product/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:11+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product
 #: model:product.template,name:product.product_product_ram512_product_template
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index c333000621a..60736323054 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -95,7 +95,7 @@ class product_pricelist(osv.osv):
     _description = "Pricelist"
     _columns = {
         'name': fields.char('Pricelist Name',size=64, required=True, translate=True),
-        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the pricelist without removing it."),
+        'active': fields.boolean('Active', help="If unchecked, it will allow you to hide the pricelist without removing it."),
         'type': fields.selection(_pricelist_type_get, 'Pricelist Type', required=True),
         'version_id': fields.one2many('product.pricelist.version', 'pricelist_id', 'Pricelist Versions'),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True),
@@ -203,7 +203,7 @@ class product_pricelist(osv.osv):
 
                 if partner:
                     partner_where = 'base <> -2 OR %s IN (SELECT name FROM product_supplierinfo WHERE product_id = %s) '
-                    partner_args = (partner, product_id)
+                    partner_args = (partner, tmpl_id)
                 else:
                     partner_where = 'base <> -2 '
                     partner_args = ()
@@ -319,8 +319,8 @@ class product_pricelist_version(osv.osv):
             "and reactivate the pricelist"),
         'items_id': fields.one2many('product.pricelist.item',
             'price_version_id', 'Price List Items', required=True),
-        'date_start': fields.date('Start Date', help="Starting date for this pricelist version to be valid."),
-        'date_end': fields.date('End Date', help="Ending date for this pricelist version to be valid."),
+        'date_start': fields.date('Start Date', help="First valid date for the version."),
+        'date_end': fields.date('End Date', help="Last valid date for the version."),
         'company_id': fields.related('pricelist_id','company_id',type='many2one',
             readonly=True, relation='res.company', string='Company', store=True)
     }
@@ -394,20 +394,26 @@ class product_pricelist_item(osv.osv):
                     return False
         return True
 
+    def _check_margin(self, cr, uid, ids, context=None):
+        for item in self.browse(cr, uid, ids, context=context):
+            if item.price_max_margin and item.price_min_margin and (item.price_min_margin > item.price_max_margin):
+                return False
+        return True
+
     _columns = {
         'name': fields.char('Rule Name', size=64, help="Explicit rule name for this pricelist line."),
         'price_version_id': fields.many2one('product.pricelist.version', 'Price List Version', required=True, select=True, ondelete='cascade'),
-        'product_tmpl_id': fields.many2one('product.template', 'Product Template', ondelete='cascade', help="Set a template if this rule only apply to a template of product. Keep empty for all products"),
-        'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="Set a product if this rule only apply to one product. Keep empty for all products"),
-        'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"),
+        'product_tmpl_id': fields.many2one('product.template', 'Product Template', ondelete='cascade', help="Specify a template if this rule only applies to one product template. Keep empty otherwise."),
+        'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="Specify a product if this rule only applies to one product. Keep empty otherwise."),
+        'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Specify a product category if this rule only applies to products belonging to this category or its children categories. Keep empty otherwise."),
 
-        'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells more than this quantity."),
+        'min_quantity': fields.integer('Min. Quantity', required=True, help="Specify the minimum quantity that needs to be bought/sold for the rule to apply."),
         'sequence': fields.integer('Sequence', required=True, help="Gives the order in which the pricelist items will be checked. The evaluation gives highest priority to lowest sequence and stops as soon as a matching item is found."),
-        'base': fields.selection(_price_field_get, 'Based on', required=True, size=-1, help="The mode for computing the price for this rule."),
-        'base_pricelist_id': fields.many2one('product.pricelist', 'If Other Pricelist'),
+        'base': fields.selection(_price_field_get, 'Based on', required=True, size=-1, help="Base price for computation."),
+        'base_pricelist_id': fields.many2one('product.pricelist', 'Other Pricelist'),
 
         'price_surcharge': fields.float('Price Surcharge',
-            digits_compute= dp.get_precision('Product Price')),
+            digits_compute= dp.get_precision('Product Price'), help='Specify the fixed amount to add or substract(if negative) to the amount calculated with the discount.'),
         'price_discount': fields.float('Price Discount', digits=(16,4)),
         'price_round': fields.float('Price Rounding',
             digits_compute= dp.get_precision('Product Price'),
@@ -416,15 +422,16 @@ class product_pricelist_item(osv.osv):
               "To have prices that end in 9.99, set rounding 10, surcharge -0.01" \
             ),
         'price_min_margin': fields.float('Min. Price Margin',
-            digits_compute= dp.get_precision('Product Price')),
+            digits_compute= dp.get_precision('Product Price'), help='Specify the minimum amount of margin over the base price.'),
         'price_max_margin': fields.float('Max. Price Margin',
-            digits_compute= dp.get_precision('Product Price')),
+            digits_compute= dp.get_precision('Product Price'), help='Specify the maximum amount of margin over the base price.'),
         'company_id': fields.related('price_version_id','company_id',type='many2one',
             readonly=True, relation='res.company', string='Company', store=True)
     }
 
     _constraints = [
-        (_check_recursion, 'Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!', ['base_pricelist_id'])
+        (_check_recursion, 'Error! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!', ['base_pricelist_id']),
+        (_check_margin, 'Error! The minimum margin should be lower than the maximum margin.', ['price_min_margin', 'price_max_margin'])
     ]
 
     def product_id_change(self, cr, uid, ids, product_id, context=None):
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index adefd9e5d3c..a1b996b891b 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -92,7 +92,7 @@
                     </group>
                     <group col="4" string="Price Computation">
                         <field name="base"/>
-                        <field name="base_pricelist_id" attrs="{'required': [('base','=', -1)], 'readonly': [('base','!=', -1)]}"/>
+                        <field name="base_pricelist_id" attrs="{'invisible':[('base', '!=', -1)],'required': [('base','=', -1)], 'readonly': [('base','!=', -1)]}"/>
                     </group>
                     <group col="6" colspan="5">
                         <label string="New Price ="/>
@@ -119,7 +119,7 @@
                     <field name="name" string="Products Price"/>
                     <field name="type"/>
                     <field name="active" />
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                 </search>
             </field>
         </record>
@@ -132,7 +132,7 @@
                 <tree string="Products Price List">
                     <field name="name"/>
                     <field name="type"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="active" />
                 </tree>
             </field>
@@ -149,7 +149,7 @@
                     <group col="4">
                         <field name="active"/>
                         <field name="type"/>
-                        <field name="currency_id"/>
+                        <field name="currency_id" groups="base.group_multi_currency"/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                     <field name="version_id">
@@ -219,7 +219,7 @@
         </record>
         <menuitem
             action="product_pricelist_action2" id="menu_product_pricelist_action2"
-            parent="base.menu_base_config" sequence="20" groups="product.group_sale_pricelist"/>
+            parent="product.menu_product_pricelist_main" sequence="1" groups="product.group_sale_pricelist"/>
 
         <record id="product_price_type_view" model="ir.ui.view">
             <field name="name">product.price.type.form</field>
@@ -230,7 +230,7 @@
                         <field name="name"/>
                         <field name="active"/>
                         <field name="field"/>
-                        <field name="currency_id"/>
+                        <field name="currency_id" groups="base.group_multi_currency"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/product/product.py b/addons/product/product.py
index 58f47f9adc3..27cd4249a60 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -109,11 +109,11 @@ class product_uom(osv.osv):
 
     _order = "name"
     _columns = {
-        'name': fields.char('Name', size=64, required=True, translate=True),
-        'category_id': fields.many2one('product.uom.categ', 'Unit of Measure Category', required=True, ondelete='cascade',
-            help="Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios."),
+        'name': fields.char('Unit of Measure', size=64, required=True, translate=True),
+        'category_id': fields.many2one('product.uom.categ', 'Category', required=True, ondelete='cascade',
+            help="Conversion between Units of Measure can only occur if they belong to the same category. The conversion will be made based on the ratios."),
         'factor': fields.float('Ratio', required=True,digits=(12, 12),
-            help='How many times this Unit of Measure is smaller than the reference Unit of Measure in this category:\n'\
+            help='How much bigger or smaller this unit is compared to the reference Unit of Measure for this category:\n'\
                     '1 * (reference unit) = ratio * (this unit)'),
         'factor_inv': fields.function(_factor_inv, digits=(12,12),
             fnct_inv=_factor_inv_write,
@@ -126,7 +126,7 @@ class product_uom(osv.osv):
         '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 Unit of Measure'),
                                       ('reference','Reference Unit of Measure for this category'),
-                                      ('smaller','Smaller than the reference Unit of Measure')],'Unit of Measure Type', required=1),
+                                      ('smaller','Smaller than the reference Unit of Measure')],'Type', required=1),
     }
 
     _defaults = {
@@ -233,7 +233,7 @@ class product_category(osv.osv):
         'parent_id': fields.many2one('product.category','Parent Category', select=True, ondelete='cascade'),
         'child_id': fields.one2many('product.category', 'parent_id', string='Child Categories'),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of product categories."),
-        'type': fields.selection([('view','View'), ('normal','Normal')], 'Category Type'),
+        'type': fields.selection([('view','View'), ('normal','Normal')], 'Category Type', help="A category of the view type is a virtual category that can be used as the parent of another category to create a hierarchical structure."),
         'parent_left': fields.integer('Left Parent', select=1),
         'parent_right': fields.integer('Right Parent', select=1),
     }
@@ -276,44 +276,37 @@ class product_template(osv.osv):
 
     _columns = {
         'name': fields.char('Name', size=128, required=True, translate=True, select=True),
-        'product_manager': fields.many2one('res.users','Product Manager',help="Responsible for product."),
+        'product_manager': fields.many2one('res.users','Product Manager'),
         'description': fields.text('Description',translate=True),
         'description_purchase': fields.text('Purchase Description',translate=True),
         '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. Consumable are product where you don't manage stock."),
-        'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
-        '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."),
+        'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),
+        'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. In the case of multi-level BOM, the manufacturing lead times of the components will be added."),
         '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"),
-        'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
-        'standard_price': fields.float('Cost Price', required=True, digits_compute=dp.get_precision('Product Price'), help="Product's cost for accounting stock valuation. It is the base price for the supplier price.", groups="base.group_user"),
+        'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price to compute the customer price. Sometimes called the catalog price."),
+        'standard_price': fields.float('Cost', digits_compute=dp.get_precision('Product Price'), help="Cost price of the product used for standard stock valuation in accounting and used as a base price on purchase orders.", groups="base.group_user"),
         'volume': fields.float('Volume', help="The volume in m3."),
         'weight': fields.float('Gross Weight', digits_compute=dp.get_precision('Stock Weight'), help="The gross weight in Kg."),
         'weight_net': fields.float('Net Weight', digits_compute=dp.get_precision('Stock Weight'), help="The net weight in Kg."),
         'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True,
-            help="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."),
-        'warranty': fields.float('Warranty (months)'),
-        'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
-        'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
+            help="Standard Price: The cost price is manually updated at the end of a specific period (usually every year). \nAverage Price: The cost price is recomputed at each incoming shipment."),
+        'warranty': fields.float('Warranty'),
+        'sale_ok': fields.boolean('Can be Sold', help="Specify if the product can be selected in a sales order line."),
         'state': fields.selection([('',''),
             ('draft', 'In Development'),
             ('sellable','Normal'),
             ('end','End of Lifecycle'),
-            ('obsolete','Obsolete')], 'Status', help="Tells the user if he can use the product or not."),
-        'uom_id': fields.many2one('product.uom', 'Default Unit of Measure', required=True, help="Default Unit of Measure used for all stock operation."),
+            ('obsolete','Obsolete')], 'Status'),
+        'uom_id': fields.many2one('product.uom', 'Unit of Measure', required=True, help="Default Unit of Measure used for all stock operation."),
         'uom_po_id': fields.many2one('product.uom', 'Purchase Unit of Measure', required=True, help="Default Unit of Measure used for purchase orders. It must be in the same category than the default unit of measure."),
         'uos_id' : fields.many2one('product.uom', 'Unit of Sale',
-            help='Used by companies that manage two units 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 Unit of Measure.'),
+            help='Sepcify a unit of measure here if invoicing is made in another unit of measure than inventory. Keep empty to use the default unit of measure.'),
         'uos_coeff': fields.float('Unit of Measure -> UOS Coeff', digits_compute= dp.get_precision('Product UoS'),
-            help='Coefficient to convert Unit of Measure to UOS\n'
+            help='Coefficient to convert default Unit of Measure to Unit of Sale\n'
             ' uos = uom * coeff'),
-        'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True),
+        'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type'),
         'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
-        'loc_rack': fields.char('Rack', size=16),
-        'loc_row': fields.char('Row', size=16),
-        'loc_case': fields.char('Case', size=16),
         'company_id': fields.many2one('res.company', 'Company', select=1),
     }
 
@@ -335,7 +328,7 @@ class product_template(osv.osv):
             res = False
         return res
 
-    def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
+    def onchange_uom(self, cursor, user, ids, uom_id, uom_po_id):
         if uom_id:
             return {'value': {'uom_po_id': uom_id}}
         return {}
@@ -346,26 +339,22 @@ class product_template(osv.osv):
             for product in self.browse(cr, uid, ids, context=context):
                 old_uom = product.uom_po_id
                 if old_uom.category_id.id != new_uom.category_id.id:
-                    raise osv.except_osv(_('Unit of Measure categories Mismatch!'), _("New Unit of Measure '%s' must belong to same Unit of Measure category '%s' as of old Unit of Measure '%s'. If you need to change the unit of measure, you may deactivate this product from the 'Procurement & Locations' tab and create a new one.") % (new_uom.name, old_uom.category_id.name, old_uom.name,))
+                    raise osv.except_osv(_('Unit of Measure categories Mismatch!'), _("New Unit of Measure '%s' must belong to same Unit of Measure category '%s' as of old Unit of Measure '%s'. If you need to change the unit of measure, you may deactivate this product from the 'Procurements' tab and create a new one.") % (new_uom.name, old_uom.category_id.name, old_uom.name,))
         return super(product_template, self).write(cr, uid, ids, vals, context=context)
 
     _defaults = {
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'product.template', context=c),
-        'list_price': lambda *a: 1,
-        'cost_method': lambda *a: 'standard',
-        'supply_method': lambda *a: 'buy',
-        'standard_price': lambda *a: 1,
-        'sale_ok': lambda *a: 1,
-        'sale_delay': lambda *a: 7,
-        'produce_delay': lambda *a: 1,
-        'purchase_ok': lambda *a: 1,
-        'procure_method': lambda *a: 'make_to_stock',
+        'list_price': 1,
+        'cost_method': 'standard',
+        'standard_price': 0.0,
+        'sale_ok': 1,
+        'produce_delay': 1,
         'uom_id': _get_uom_id,
         'uom_po_id': _get_uom_id,
-        'uos_coeff' : lambda *a: 1.0,
-        'mes_type' : lambda *a: 'fixed',
+        'uos_coeff' : 1.0,
+        'mes_type' : 'fixed',
         'categ_id' : _default_category,
-        'type' : lambda *a: 'consu',
+        'type' : 'consu',
     }
 
     def _check_uom(self, cursor, user, ids, context=None):
@@ -499,7 +488,7 @@ class product_product(osv.osv):
             main_supplier = self._get_main_product_supplier(cr, uid, product, context=context)
             result[product.id] = {
                 'seller_info_id': main_supplier and main_supplier.id or False,
-                'seller_delay': main_supplier and main_supplier.delay or 1,
+                'seller_delay': main_supplier.delay if main_supplier else 1,
                 'seller_qty': main_supplier and main_supplier.qty or 0.0,
                 'seller_id': main_supplier and main_supplier.name.id or False
             }
@@ -509,9 +498,9 @@ class product_product(osv.osv):
     def _get_image(self, cr, uid, ids, name, args, context=None):
         result = dict.fromkeys(ids, False)
         for obj in self.browse(cr, uid, ids, context=context):
-            result[obj.id] = tools.image_get_resized_images(obj.image)
+            result[obj.id] = tools.image_get_resized_images(obj.image, avoid_resize_medium=True)
         return result
-    
+
     def _set_image(self, cr, uid, id, name, value, args, context=None):
         return self.write(cr, uid, [id], {'image': tools.image_resize_image_big(value)}, context=context)
 
@@ -535,38 +524,37 @@ class product_product(osv.osv):
         'outgoing_qty': fields.function(_product_outgoing_qty, type='float', string='Outgoing'),
         'price': fields.function(_product_price, type='float', string='Pricelist', digits_compute=dp.get_precision('Product Price')),
         'lst_price' : fields.function(_product_lst_price, type='float', string='Public Price', digits_compute=dp.get_precision('Product Price')),
-        'code': fields.function(_product_code, type='char', string='Reference'),
+        'code': fields.function(_product_code, type='char', string='Internal Reference'),
         'partner_ref' : fields.function(_product_partner_ref, type='char', string='Customer ref'),
-        'default_code' : fields.char('Reference', size=64, select=True),
-        'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the product without removing it."),
+        'default_code' : fields.char('Internal Reference', size=64, select=True),
+        'active': fields.boolean('Active', help="If unchecked, it will allow you to hide the product without removing it."),
         'variants': fields.char('Variants', size=64),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"),
-        'ean13': fields.char('EAN13', size=13, help="The numbers encoded in EAN-13 bar codes are product identification numbers."),
+        'ean13': fields.char('EAN13 Barcode', size=13, help="International Article Number used for product identification."),
         'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
         'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Product Price')),
         'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Product Price')),
         'pricelist_id': fields.dummy(string='Pricelist', relation='product.pricelist', type='many2one'),
         'name_template': fields.related('product_tmpl_id', 'name', string="Name", type='char', size=128, store=True, select=True),
         'color': fields.integer('Color Index'),
+        # image: all image fields are base64 encoded and PIL-supported
         'image': fields.binary("Image",
-            help="This field holds the image used for the product. "\
-                 "The image is base64 encoded, and PIL-supported. "\
-                 "It is limited to a 1024x1024 px image."),
+            help="This field holds the image used as image for the product, limited to 1024x1024px."),
         'image_medium': fields.function(_get_image, fnct_inv=_set_image,
             string="Medium-sized image", type="binary", multi="_get_image",
-            store = {
+            store={
                 'product.product': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Medium-sized image of the product. It is automatically "\
-                 "resized as a 180x180 px image, with aspect ratio preserved. "\
-                 "Use this field in form views or some kanban views."),
+                 "resized as a 128x128px image, with aspect ratio preserved, "\
+                 "only when the image exceeds one of those sizes. Use this field in form views or some kanban views."),
         'image_small': fields.function(_get_image, fnct_inv=_set_image,
             string="Small-sized image", type="binary", multi="_get_image",
-            store = {
+            store={
                 'product.product': (lambda self, cr, uid, ids, c={}: ids, ['image'], 10),
             },
             help="Small-sized image of the product. It is automatically "\
-                 "resized as a 50x50 px image, with aspect ratio preserved. "\
+                 "resized as a 64x64px image, with aspect ratio preserved. "\
                  "Use this field anywhere a small image is required."),
         'seller_info_id': fields.function(_calc_seller, type='many2one', relation="product.supplierinfo", multi="seller_info"),
         'seller_delay': fields.function(_calc_seller, type='integer', string='Supplier Lead Time', multi="seller_info", 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."),
@@ -580,7 +568,7 @@ class product_product(osv.osv):
         return obj_id
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Product has been <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Product has been <b>created</b>."), context=context)
 
     def unlink(self, cr, uid, ids, context=None):
         unlink_ids = []
@@ -595,7 +583,7 @@ class product_product(osv.osv):
         self.pool.get('product.template').unlink(cr, uid, unlink_product_tmpl_ids, context=context)
         return super(product_product, self).unlink(cr, uid, unlink_ids, context=context)
 
-    def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id):
+    def onchange_uom(self, cursor, user, ids, uom_id, uom_po_id):
         if uom_id and uom_po_id:
             uom_obj=self.pool.get('product.uom')
             uom=uom_obj.browse(cursor,user,[uom_id])[0]
@@ -610,7 +598,7 @@ class product_product(osv.osv):
         return res
 
 
-    _constraints = [(_check_ean_key, 'Error: Invalid ean code', ['ean13'])]
+    _constraints = [(_check_ean_key, 'You provided an invalid "EAN13 Barcode" reference. You may use the "Internal Reference" field instead.', ['ean13'])]
 
     def on_order(self, cr, uid, ids, orderline, quantity):
         pass
@@ -669,9 +657,9 @@ class product_product(osv.osv):
                 # Performing a quick memory merge of ids in Python will give much better performance
                 ids = set()
                 ids.update(self.search(cr, user, args + [('default_code',operator,name)], limit=limit, context=context))
-                if len(ids) < limit:
+                if not limit or len(ids) < limit:
                     # we may underrun the limit because of dupes in the results, that's fine
-                    ids.update(self.search(cr, user, args + [('name',operator,name)], limit=(limit-len(ids)), context=context))
+                    ids.update(self.search(cr, user, args + [('name',operator,name)], limit=(limit and (limit-len(ids)) or False) , context=context))
                 ids = list(ids)
             if not ids:
                 ptrn = re.compile('(\[(.*?)\])')
@@ -728,7 +716,7 @@ class product_product(osv.osv):
         context_wo_lang.pop('lang', None)
         product = self.read(cr, uid, id, ['name'], context=context_wo_lang)
         default = default.copy()
-        default['name'] = product['name'] + ' (copy)'
+        default.update(name=_("%s (copy)") % (product['name']))
 
         if context.get('variant',False):
             fields = ['product_tmpl_id', 'active', 'variants', 'default_code',
@@ -744,6 +732,14 @@ class product_product(osv.osv):
         else:
             return super(product_product, self).copy(cr, uid, id, default=default,
                     context=context)
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None:
+            context = {}
+        if context and context.get('search_default_categ_id', False):
+            args.append((('categ_id', 'child_of', context['search_default_categ_id'])))
+        return super(product_product, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=False)
+
 product_product()
 
 class product_packaging(osv.osv):
@@ -767,8 +763,7 @@ class product_packaging(osv.osv):
             help="The code of the transport unit."),
         'weight': fields.float('Total Package Weight',
             help='The weight of a full package, pallet or box.'),
-        'weight_ul': fields.float('Empty Package Weight',
-            help='The weight of the empty UL'),
+        'weight_ul': fields.float('Empty Package Weight'),
         'height': fields.float('Height', help='The height of the package'),
         'width': fields.float('Width', help='The width of the package'),
         'length': fields.float('Length', help='The length of the package'),
@@ -898,4 +893,43 @@ class pricelist_partnerinfo(osv.osv):
     }
     _order = 'min_quantity asc'
 pricelist_partnerinfo()
+
+class res_currency(osv.osv):
+    _inherit = 'res.currency'
+
+    def _check_main_currency_rounding(self, cr, uid, ids, context=None):
+        cr.execute('SELECT digits FROM decimal_precision WHERE name like %s',('Account',))
+        digits = cr.fetchone()
+        if digits and len(digits):
+            digits = digits[0]
+            main_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id
+            for currency_id in ids:
+                if currency_id == main_currency.id:
+                    if main_currency.rounding < 10 ** -digits:
+                        return False
+        return True
+
+    _constraints = [
+        (_check_main_currency_rounding, 'Error! You cannot define a rounding factor for the company\'s main currency that is smaller than the decimal precision of \'Account\'.', ['rounding']),
+    ]
+
+class decimal_precision(osv.osv):
+    _inherit = 'decimal.precision'
+
+    def _check_main_currency_rounding(self, cr, uid, ids, context=None):
+        cr.execute('SELECT id, digits FROM decimal_precision WHERE name like %s',('Account',))
+        res = cr.fetchone()
+        if res and len(res):
+            account_precision_id, digits = res
+            main_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id
+            for decimal_precision in ids:
+                if decimal_precision == account_precision_id:
+                    if main_currency.rounding < 10 ** -digits:
+                        return False
+        return True
+
+    _constraints = [
+        (_check_main_currency_rounding, 'Error! You cannot define the decimal precision of \'Account\' as greater than the rounding factor of the company\'s main currency', ['digits']),
+    ]
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 80dbfac564d..8e5280d036a 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -7,7 +7,11 @@
         <record id="product_category_all" model="product.category">
             <field name="name">All products</field>
         </record>
-
+        <record id="product_category_1" model="product.category">
+            <field name="parent_id" ref="product_category_all"/>
+            <field name="name">Saleable</field>
+        </record>
+        
         <record id="product_uom_categ_unit" model="product.uom.categ">
             <field name="name">Unit</field>
         </record>
@@ -36,7 +40,7 @@
        <record id="product_uom_dozen" model="product.uom">
             <field name="category_id" ref="product.product_uom_categ_unit"/>
             <field name="name">Dozen</field>
-            <field name="factor" eval="0.083"/>
+            <field name="factor_inv" eval="12"/>
             <field name="uom_type">bigger</field>
         </record>
         <record id="product_uom_kgm" model="product.uom">
@@ -66,7 +70,7 @@
             <!-- 'tonne' is the most common spelling in english-speaking countries,
                  the alternative is 'metric ton' in the US, abbreviated as 'mt' -->
             <field name="name">t</field>
-            <field name="factor" eval="0.001"/>
+            <field name="factor_inv" eval="1000"/>
             <field name="uom_type">bigger</field>
         </record>
         <record id="product_uom_meter" model="product.uom">
@@ -77,7 +81,7 @@
         <record id="product_uom_km" model="product.uom">
             <field name="category_id" ref="uom_categ_length"/>
             <field name="name">km</field>
-            <field name="factor" eval="0.001"/>
+            <field name="factor_inv" eval="1000"/>
             <field name="uom_type">bigger</field>
         </record>
         <record id="product_uom_cm" model="product.uom">
@@ -190,10 +194,9 @@ parameter) will see those record just disappear.
             <field name="standard_price">30.0</field>
             <field name="uom_id" ref="product.product_uom_hour"/>
             <field name="uom_po_id" ref="product.product_uom_hour"/>
-            <field name="name">Service on Demand</field>
+            <field name="name">Service</field>
             <field name="categ_id" ref="product.product_category_all"/>
             <field name="type">service</field>
-            <field eval="False" name="purchase_ok"/>
         </record>
     </data>
 </openerp>
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 97d6e03205c..fead62f8521 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -9,11 +9,7 @@
         <!--
     Resource: product.category
     -->
-
-        <record id="product_category_1" model="product.category">
-            <field name="parent_id" ref="product.product_category_all"/>
-            <field name="name">Saleable</field>
-        </record>
+ 
         <record id="product_category_2" model="product.category">
             <field name="parent_id" ref="product.product_category_all"/>
             <field name="name">Internal</field>
@@ -23,27 +19,27 @@
             <field name="name">Other Products</field>
         </record>
         <record id="product_category_4" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Computers</field>
         </record>
         <record id="product_category_5" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Services</field>
         </record>
         <record id="product_category_6" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">External Devices</field>
         </record>
         <record id="product_category_7" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Accessories</field>
         </record>
         <record id="product_category_8" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Components</field>
         </record>
         <record id="product_category_9" model="product.category">
-            <field name="parent_id" ref="product_category_1"/>
+            <field name="parent_id" ref="product.product_category_1"/>
             <field name="name">Softwares</field>
         </record>
         <record id="product_category_10" model="product.category">
@@ -74,8 +70,6 @@
             <field name="standard_price">20.5</field>
             <field name="list_price">30.75</field>
             <field name="type">service</field>
-            <field name="procure_method">make_to_order</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_hour"/>
             <field name="uom_po_id" ref="product_uom_hour"/>
             <field name="description">This type of service include basic monitoring of products.</field>
@@ -88,8 +82,6 @@
             <field name="standard_price">25.5</field>
             <field name="list_price">38.25</field>
             <field name="type">service</field>
-            <field name="procure_method">make_to_order</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_hour"/>
             <field name="uom_po_id" ref="product_uom_hour"/>
             <field name="description">This type of service include assistance for security questions, system configuration requirements, implementation or special needs.</field>
@@ -101,12 +93,9 @@
             <field name="categ_id" ref="product_category_4"/>
             <field name="list_price">450.0</field>
             <field name="standard_price">300.0</field>
-            <field name="type">product</field>
-            <field name="procure_method">make_to_order</field>
-            <field name="supply_method">produce</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">4.0</field>
             <field name="description_sale">17" LCD Monitor
 Processor AMD 8-Core
 512MB RAM
@@ -119,12 +108,10 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">500.0</field>
             <field name="list_price">750.0</field>
-            <field name="type">product</field>
-            <field name="procure_method">make_to_order</field>
-            <field name="supply_method">produce</field>
+            <field name="type">consu</field>
+
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">4.0</field>
             <field name="description_sale">19" LCD Monitor
 Processor Core i5 2.70 Ghz
 2GB RAM
@@ -137,12 +124,9 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">600.0</field>
             <field name="list_price">900.0</field>
-            <field name="type">product</field>
-            <field name="procure_method">make_to_order</field>
-            <field name="supply_method">produce</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
-            <field name="sale_delay">7.0</field>
             <field name="description">Custom computer assembled on order based on customer's requirement.</field>
         </record>
 
@@ -152,7 +136,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">800.0</field>
             <field name="list_price">1200.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -162,7 +146,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">880.0</field>
             <field name="list_price">1350.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -172,7 +156,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">10.0</field>
             <field name="list_price">13.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -182,8 +166,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">10.0</field>
             <field name="list_price">13.0</field>
-            <field name="type">product</field>
-            <field name="procure_method">make_to_order</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -193,7 +176,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">12.50</field>
             <field name="list_price">14</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -203,7 +186,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">14</field>
             <field name="list_price">16.50</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -213,8 +196,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">18</field>
             <field name="list_price">12.50</field>
-            <field name="type">product</field>
-            <field name="procure_method">make_to_order</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -224,7 +206,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">78.0</field>
             <field name="list_price">85.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -234,7 +216,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">87.0</field>
             <field name="list_price">95.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -244,7 +226,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">80.0</field>
             <field name="list_price">85.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -254,9 +236,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">20.0</field>
             <field name="list_price">25.0</field>
-            <field name="type">product</field>
-            <field name="procure_method">make_to_order</field>
-            <field name="supply_method">produce</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -266,7 +246,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">860.0</field>
             <field name="list_price">975.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -276,9 +256,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1020.0</field>
             <field name="list_price">1150.0</field>
-            <field name="type">product</field>
-            <field name="procure_method">make_to_order</field>
-            <field name="supply_method">produce</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -288,9 +266,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1100.0</field>
             <field name="list_price">1250.0</field>
-            <field name="type">product</field>
-            <field name="procure_method">make_to_order</field>
-            <field name="supply_method">produce</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">On demand hard-disk having capacity based on requirement.</field>
@@ -301,7 +277,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1700.0</field>
             <field name="list_price">1950.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -311,7 +287,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1790.0</field>
             <field name="list_price">2000.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -321,7 +297,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">2010.0</field>
             <field name="list_price">2100.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -331,7 +307,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">1910.0</field>
             <field name="list_price">1980.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -341,7 +317,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_8"/>
             <field name="standard_price">876.0</field>
             <field name="list_price">885.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -351,7 +327,7 @@ HDD SH-1</field>
             <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">2870.0</field>
             <field name="list_price">2950.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">17" Monitor
@@ -365,7 +341,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">3000.0</field>
             <field name="list_price">3245.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">17" Monitor
@@ -379,9 +355,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_4"/>
             <field name="standard_price">3300.0</field>
             <field name="list_price">3645.0</field>
-            <field name="type">product</field>
-            <field name="procure_method">make_to_order</field>
-            <field name="supply_method">produce</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">Custom Laptop based on customer's requirement.</field>
@@ -392,7 +366,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">390.0</field>
             <field name="list_price">405.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -403,7 +377,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">90.0</field>
             <field name="list_price">100.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -414,7 +388,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">126.0</field>
             <field name="list_price">145.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -424,7 +398,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">134.0</field>
             <field name="list_price">150.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">.</field>
@@ -435,7 +409,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">57.0</field>
             <field name="list_price">62.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">Hands free headset for laptop PC with in-line microphone and headphone plug.</field>
@@ -446,8 +420,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">60.0</field>
             <field name="list_price">65.0</field>
-            <field name="type">product</field>
-            <field name="procure_method">make_to_order</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">Headset for laptop PC with USB connector.</field>
@@ -459,7 +432,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">38.0</field>
             <field name="list_price">45.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -470,7 +443,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">18.40</field>
             <field name="list_price">20.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_dozen"/>
             <field name="uom_po_id" ref="product_uom_dozen"/>
         </record>
@@ -481,7 +454,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_7"/>
             <field name="standard_price">21.60</field>
             <field name="list_price">24.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_dozen"/>
             <field name="uom_po_id" ref="product_uom_dozen"/>
         </record>
@@ -492,8 +465,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">4258.0</field>
             <field name="list_price">4410.0</field>
-            <field name="type">product</field>
-            <field name="procure_method">make_to_order</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description">All in one hi-speed printer with fax and scanner.</field>
@@ -505,7 +477,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">60.0</field>
             <field name="list_price">65.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -516,7 +488,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">66.0</field>
             <field name="list_price">70.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -573,8 +545,6 @@ QWERTY keyboard</field>
             <field name="standard_price">155.0</field>
             <field name="list_price">173.0</field>
             <field name="type">consu</field>
-            <field name="procure_method">make_to_order</field>
-            <field name="supply_method">produce</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
             <field name="description_sale">Full featured image editing software.</field>
@@ -586,7 +556,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">55.0</field>
             <field name="list_price">60.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -597,7 +567,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">35.0</field>
             <field name="list_price">40.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -608,7 +578,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">55.0</field>
             <field name="list_price">70.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
@@ -619,7 +589,7 @@ QWERTY keyboard</field>
             <field name="categ_id" ref="product_category_6"/>
             <field name="standard_price">13.0</field>
             <field name="list_price">18.0</field>
-            <field name="type">product</field>
+            <field name="type">consu</field>
             <field name="uom_id" ref="product_uom_unit"/>
             <field name="uom_po_id" ref="product_uom_unit"/>
         </record>
diff --git a/addons/product/product_pricelist_demo.yml b/addons/product/product_pricelist_demo.yml
index 39f6cfc16b2..efb812ad5e2 100644
--- a/addons/product/product_pricelist_demo.yml
+++ b/addons/product/product_pricelist_demo.yml
@@ -47,7 +47,7 @@
             - name: 20% Discount given by my supplier
               sequence: 1
               price_min_margin: 2
-              price_max_margin: -5
+              price_max_margin: 5
               product_id: product_product_6
               base: -2
 -
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 70651a0a795..7b4197305d4 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -10,14 +10,10 @@
                 <search string="Product">
                    <field name="name" string="Product" filter_domain="['|',('name','ilike',self),('default_code','ilike',self)]"/>
                    <filter string="Services" icon="terp-accessories-archiver" domain="[('type','=','service')]"/>
-                   <filter string="Products" icon="terp-accessories-archiver" domain="['|',('type','=','product'),('type','=','consu')]" help="Both stockable and consumable products"/>
+                   <filter string="Consumable" name="consumable" icon="terp-accessories-archiver" domain="[('type','=','consu')]" help="Consumable products"/>
                    <separator/>
-                   <filter string="To Sell" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
-                   <separator/>
-                   <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
                    <filter string="Can be Sold" name="filter_to_sell" icon="terp-accessories-archiver-minus" domain="[('sale_ok','=',1)]"/>
-                   <filter name="filter_to_purchase" string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
-                   <field name="categ_id" operator="child_of"/>
+                   <field name="categ_id"/>
                    <group expand="0" string="Context...">
                        <field name="pricelist_id" context="{'pricelist': self}" groups="product.group_sale_pricelist"/>
                        <field name="company_id" groups="base.group_multi_company"/>
@@ -41,6 +37,7 @@
                     <field name="default_code"/>
                     <field name="name"/>
                     <field name="categ_id" invisible="1"/>
+                    <field name="type" invisible="1"/>
                     <field name="variants" groups="product.group_product_variant"/>
                     <field name="uom_id" string="Unit of Measure" groups="product.group_uom"/>
                     <field name="qty_available"/>
@@ -61,7 +58,7 @@
             <field name="arch" type="xml">
                 <form string="Product" version="7.0">
                     <sheet>
-                        <field name="image_medium" widget="image" class="oe_avatar oe_right"/>
+                        <field name="image_medium" widget="image" class="oe_avatar oe_left"/>
                         <div class="oe_title">
                             <div class="oe_edit_only">
                                 <label for="name" string="Product Name"/>
@@ -71,85 +68,77 @@
                             </h1>
                             <label for="categ_id" class="oe_edit_only"/>
                             <h2><field name="categ_id"/></h2>
+                            <div name="options" groups="base.group_user">
+                                <field name="sale_ok"/>
+                                <label for="sale_ok"/>
+                            </div>
+                        </div>
+                        <div class="oe_right oe_button_box" name="buttons">
                         </div>
                         <notebook>
                             <page string="Information">
                                 <group>
                                     <group>
-                                        <field name="default_code"/>
-                                        <field name="ean13" placeholder="e.g. 5901234123457"/>
-                                        <field groups="product.group_product_variant" name="variants"/>
-                                    </group>
-                                    <group groups="base.group_user">
-                                        <field name="sale_ok"/>
-                                        <field name="purchase_ok"/>
-                                    </group>
-                                    <group string="Procurement">
                                         <field name="type"/>
-                                        <field name="procure_method" groups="base.group_user"/>
-                                        <field name="supply_method" groups="base.group_user"/>
-                                    </group>
-                                    <group string="Prices">
+                                        <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/>
                                         <field name="list_price"/>
-                                        <field name="cost_method" groups="base.group_user"/>
-                                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
+                                    </group>
+                                    <group>
+                                        <field name="default_code"/>
+                                        <label for="ean13"/>
+                                        <div name="ean">
+                                            <field name="ean13" placeholder="e.g. 5901234123457"/>
+                                        </div>
+                                    </group>
+                                    <group>
+                                        <field groups="product.group_product_variant" name="variants"/>
                                         <field name="price_margin" groups="product.group_product_variant"/>
                                         <field name="price_extra" groups="product.group_product_variant"/>
                                     </group>
-
-                                    <group groups="product.group_stock_packaging" string="Weights">
-                                        <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
-                                        <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
-                                        <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
+                                </group>
+                                <field name="description" placeholder="describe the product characteristics for internal use..."/>
+                            </page>
+                            <page string="Procurements" groups="base.group_user">
+                                <group name="procurement">
+                                    <group name="general">
+                                        <field name="cost_method" groups="product.group_costing_method"/>
+                                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}"/>
                                     </group>
-
-                                    <group name="uom" groups="product.group_uom" string="Unit of Measure">
-                                        <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)"/>
+                                    <group name="procurement_uom" groups="product.group_uom" string="Purchase">
                                         <field name="uom_po_id"/>
-                                        <field name="uos_id"/>
-                                        <field name="uos_coeff"/>
-                                        <field name="mes_type"/>
                                     </group>
-
+                                </group>
+                                <separator string="Description for Suppliers"/>
+                                <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
+                            </page>
+                            <page string="Inventory" groups="base.group_user">
+                                <group name="inventory">
                                     <group name="status" string="Status">
                                         <field name="state"/>
                                         <field name="product_manager"/>
                                     </group>
-
-                                </group>
-                            </page>
-                            <page string="Procurement &amp; Locations" groups="base.group_user">
-                                <group>
-                                    <group name="delay" string="Delays">
-                                        <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                        <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
-                                        <field name="warranty"/>
-                                    </group>
-                                    <group name="store" string="Storage Localisation">
-                                        <field name="loc_rack" attrs="{'readonly':[('type','=','service')]}"/>
-                                        <field name="loc_row" attrs="{'readonly':[('type','=','service')]}"/>
-                                        <field name="loc_case" attrs="{'readonly':[('type','=','service')]}"/>
-                                    </group>
-                                    <group name="misc" string="Miscellaneous">
-                                        <field name="active"/>
-                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <group name="Weights" groups="product.group_stock_packaging" string="Weights">
+                                        <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
+                                        <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
                                     </group>
                                 </group>
-
                             </page>
-                            <page string="Suppliers" groups="base.group_user">
-                                <field name="seller_ids" context="{'uom_id': uom_id}"/>
-                            </page>
-                            <page string="Descriptions" groups="base.group_user">
-                                <separator string="Description"/>
-                                <field name="description"/>
-                                <separator string="Sale Description"/>
-                                <field name="description_sale" placeholder="This note will be displayed on quotations..."/>
-                                <separator string="Purchase Description"/>
-                                <field name="description_purchase" placeholder="This note will be displayed on requests for quotation..."/>
-                            </page>
-                            <page groups="product.group_stock_packaging" string="Packaging">
-                                <field name="packaging">
+                            <page string="Sales" attrs="{'readonly':[('sale_ok','=',0)]}">
+                                <group name="sale">
+                                    <group string="Sale Conditions">
+                                        <label for="warranty"/>
+                                        <div>
+                                            <field name="warranty" class="oe_inline"/> months
+                                        </div>
+                                    </group>
+                                    <group groups="product.group_uos" string="Unit of Measure">
+                                        <field name="uos_id"/>
+                                        <field name="uos_coeff"/>
+                                        <field name="mes_type"/>
+                                    </group>
+                                </group>
+                                <field name="packaging" groups="product.group_stock_packaging">
                                     <form string="Packaging" version="7.0">
                                         <group col="4">
                                             <field name="ean"/>
@@ -171,54 +160,44 @@
                                         <field name="name"/>
                                     </form>
                                 </field>
+                                <separator string="Description for Quotations"/>
+                                <field name="description_sale" placeholder="note to be displayed on quotations..."/>
                             </page>
                         </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
         </record>
 
         <!-- Product Kanban View  -->
-        <record model="ir.ui.view" id="product_kanban_view">
+
+        <record model="ir.ui.view" id="product.product_kanban_view">
             <field name="name">Product Kanban</field>
             <field name="model">product.product</field>
             <field name="arch" type="xml">
                 <kanban>
                     <field name="color"/>
                     <field name="type"/>
-                    <field name="image_medium"/>
+                    <field name="image_small"/>
                     <field name="list_price"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <t t-if="record.type.raw_value!='service' and record.qty_available.raw_value lte 0" t-set="border">oe_kanban_color_red</t>
-                            <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}">
-                                <div class="oe_kanban_box oe_kanban_color_border">
-                                    <div class="oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle oe_kanban_title">
-                                        <field name="name"/>
-                                    </div>
-                                    <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger">
-                                        <img t-att-src="kanban_image('product.product', 'image_medium', record.id.value)" width="48" style="float: left; padding: 0 4px 4px 0"/>
-                                        Code: <field name="code"/>
-                                        <div t-if="record.type.raw_value == 'service'">No Stock</div>
-                                        <t t-if="record.type.raw_value != 'service'">
-                                            <div>Stock: <field name="qty_available"/> on hand, <field name="virtual_available"/> available</div>
-                                            <div t-if="record.list_price.raw_value != 0">Public Price: <field name="lst_price"/></div>
-                                            <!-- TODO would deserve to be hidden at the field level -->
-                                            <div groups="base.group_user">Cost : <field name="standard_price"/></div>
-                                        </t>
-                                        <div class="oe_kanban_clear"/>
-                                    </div>
-                                    <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick">
-                                        <div class="oe_kanban_left">
-                                            <a string="Edit" icon="gtk-edit" type="edit"/>
-                                            <a string="Change Color" icon="color-picker" type="color" name="color"/>
-                                        </div>
-                                        <div class="oe_kanban_clear"/>
-                                    </div>
+                            <div class="oe_kanban_vignette oe_semantic_html_override">
+                                <a type="open"><img t-att-src="kanban_image('product.product', 'image_small', record.id.value)" class="oe_kanban_image"/></a>
+                                <div class="oe_kanban_details">
+                                    <h4>
+                                        <a type="open">
+                                             <t t-if="record.code.raw_value">[<field name="code"/>]</t> <field name="name"/>
+                                        </a>
+                                    </h4>
+                                    <div name="tags"/>
+                                    <ul>
+                                        <li>Price: <field name="lst_price"></field></li>
+                                    </ul>
                                 </div>
                             </div>
                         </t>
@@ -240,7 +219,7 @@
                 Click to define a new product.
               </p><p>
                 You must define a product for everything you buy or sell,
-                wether it's a physical product, a consumable or service.
+                whether it's a physical product, a consumable or service.
               </p>
             </field>
         </record>
@@ -248,7 +227,7 @@
             <field name="name">Products</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.product</field>
-            <field name="view_mode">tree,form,kanban</field>
+            <field name="view_mode">kanban,tree,form</field>
             <field name="view_type">form</field>
             <field name="context">{"search_default_filter_to_sell":1}</field>
             <field name="view_id" ref="product_product_tree_view"/>
@@ -257,7 +236,7 @@
               <p class="oe_view_nocontent_create">
                 Click to define a new product.
               </p><p>
-                You must define a product for everything you sell, wether it's
+                You must define a product for everything you sell, whether it's
                 a physical product, a consumable or a service you offer to
                 customers.
               </p><p>
@@ -271,7 +250,7 @@
         <record id="open_view_product_tree1" model="ir.actions.act_window.view">
             <field name="sequence" eval="2"/>
             <field name="view_mode">tree</field>
-           <field name="view_id" ref="product_product_tree_view"/>
+            <field name="view_id" ref="product_product_tree_view"/>
             <field name="act_window_id" ref="product_normal_action_sell"/>
         </record>
 
@@ -285,8 +264,8 @@
         <record id="open_view_product_kanban1" model="ir.actions.act_window.view">
             <field name="sequence" eval="1"/>
             <field name="view_mode">kanban</field>
-           <field name="view_id" ref="product_kanban_view"/>
-            <field name="act_window_id" ref="product_normal_action"/>
+            <field name="view_id" ref="product_kanban_view"/>
+            <field name="act_window_id" ref="product_normal_action_sell"/>
         </record>
 
         <menuitem id="base.menu_product" name="Products" parent="base.menu_base_partner" sequence="9"/>
@@ -297,15 +276,15 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,kanban</field>
+            <field name="view_mode">kanban,tree,form</field>
             <field name="context">{"search_default_filter_to_purchase":1}</field>
-            <field name="view_id" ref="product_product_tree_view"/>
+            <field name="view_id" ref="product_kanban_view"/>
             <field name="search_view_id" ref="product_search_form_view"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to define a new product.
               </p><p>
-                You must define a product for everything you purchase, wheter
+                You must define a product for everything you purchase, whether
                 it's a physical product, a consumable or services you buy to
                 subcontractants.
               </p><p>
@@ -339,17 +318,11 @@
                             </h1>
                         </div>
                         <group>
-                            <group>
+                            <group name="parent" col="4">
                                 <field name="parent_id"/>
-                            </group>
-                            <group>
                                 <field name="type"/>
                             </group>
                         </group>
-                        <group name="basic">
-                            <group name="account_property" string="Account Properties"/>
-                            <group name="account_stock_property" string="Account Stock Properties"/>
-                        </group>
                     </sheet>
                 </form>
             </field>
@@ -433,7 +406,6 @@
                 <tree string="Units of Measure">
                     <field name="name"/>
                     <field name="category_id"/>
-                    <field name="factor"/>
                 </tree>
             </field>
         </record>
@@ -447,15 +419,22 @@
                         <group>
                             <field name="name"/>
                             <field name="category_id"/>
-                            <field name="active"/>
+                            <field name="uom_type" on_change="onchange_type(uom_type)"/>
+                            <label for="factor"/>
+                            <div>
+                                <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
+                                <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
+                                <p attrs="{'invisible':[('uom_type','!=','smaller')]}" class="oe_grey">
+                                    e.g: 1 * (reference unit) = ratio * (this unit)
+                                </p>
+                                <p attrs="{'invisible':[('uom_type','!=','bigger')]}" class="oe_grey">
+                                    e.g: 1 * (this unit) = ratio * (reference unit)
+                                </p>
+                            </div>
                         </group>
                         <group>
-                            <field name="uom_type" on_change="onchange_type(uom_type)"/>
+                            <field name="active"/>
                             <field name="rounding"/>
-                            <field name="factor" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
-                            <label string="  e.g: 1 * (reference unit) = ratio * (this unit)" attrs="{'invisible':[('uom_type','!=','smaller')]}"/>
-                            <field name="factor_inv" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
-                            <label string="  e.g: 1 * (this unit) = ratio * (reference unit)" attrs="{'invisible':[('uom_type','!=','bigger')]}"/>
                         </group>
                     </group>
                 </form>
@@ -555,7 +534,7 @@
             <field name="model">product.packaging</field>
             <field name="arch" type="xml">
                 <tree string="Packaging">
-                    <field name="sequence" invisible="1"/>
+                    <field name="sequence" widget="handle"/>
                     <field name="ean"/>
                     <field name="qty"/>
                     <field name="ul"/>
@@ -627,7 +606,7 @@
             <field name="model">product.supplierinfo</field>
             <field name="arch" type="xml">
                 <tree string="Supplier Information">
-                    <field name="sequence" string="Seq"/>
+                    <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="delay"/>
                     <field name="min_qty"/>
@@ -695,12 +674,9 @@
                         <group>
                             <group string="Product Type">
                                 <field name="sale_ok"/>
-                                <field name="purchase_ok"/>
                             </group>
                             <group string="Procurement">
                                 <field name="type"/>
-                                <field name="procure_method"/>
-                                <field name="supply_method"/>
                             </group>
 
                             <group string="Base Prices">
@@ -713,7 +689,7 @@
                                 <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field digits="(14, 3)" name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
-                            </group>
+                            </group> 
 
                             <group name="status" string="Status">
                                 <field name="categ_id"/>
@@ -736,15 +712,12 @@
                         <page string="Procurement &amp; Locations">
                             <group>
                                 <group name="delay" string="Delays">
-                                    <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                    <field name="produce_delay"/>
+                                    <label for="produce_delay"/>
+                                    <div>
+                                        <field name="produce_delay" class="oe_inline"/> days
+                                    </div>
                                     <field name="warranty"/>
                                 </group>
-                                <group name="store" string="Storage Localisation">
-                                    <field name="loc_rack"/>
-                                    <field name="loc_row"/>
-                                    <field name="loc_case"/>
-                                </group>
                             </group>
 
                         </page>
diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index c19c12c06d7..1f72dcd04b2 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -24,6 +24,7 @@ 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)
@@ -39,7 +40,7 @@ class product_pricelist(report_sxw.rml_parse):
             'get_titles': self._get_titles,
         })
 
-    def _get_titles(self,form):
+    def _get_titles(self, form):
         lst = []
         vals = {}
         qtys = 1
@@ -51,7 +52,7 @@ class product_pricelist(report_sxw.rml_parse):
         lst.append(vals)
         return lst
 
-    def _set_quantity(self,form):
+    def _set_quantity(self, form):
         for i in range(1,6):
             q = 'qty%d'%i
             if form[q] >0 and form[q] not in self.quantity:
@@ -76,7 +77,7 @@ class product_pricelist(report_sxw.rml_parse):
         symbol = pool.get('res.currency').read(self.cr, self.uid, [pricelist['currency_id'][0]], ['symbol'], context=self.localcontext)[0]
         return symbol['symbol'] or ''
 
-    def _get_categories(self, products,form):
+    def _get_categories(self, products, form):
         cat_ids=[]
         res=[]
         self.pricelist = form['price_list']
@@ -111,7 +112,7 @@ class product_pricelist(report_sxw.rml_parse):
             res.append({'name':cat[1],'products': products})
         return res
 
-    def _get_price(self,pricelist_id, product_id,qty):
+    def _get_price(self, pricelist_id, product_id, qty):
         sale_price_digits = self.get_digits(dp='Product Price')
         pool = pooler.get_pool(self.cr.dbname)
         price_dict = pool.get('product.pricelist').price_get(self.cr, self.uid, [pricelist_id], product_id, qty, context=self.localcontext)
@@ -123,5 +124,5 @@ class product_pricelist(report_sxw.rml_parse):
         return price
 
 report_sxw.report_sxw('report.product.pricelist','product.product','addons/product/report/product_pricelist.rml',parser=product_pricelist)
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 1d2c795083a..73ab6f8a3d5 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -23,7 +23,12 @@
         <field name="name">Purchase Pricelists</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
-
+	
+	<record id="group_costing_method" model="res.groups">
+        <field name="name">Costing Method</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+	
     <record id="group_uom" model="res.groups">
         <field name="name">Manage Multiple Units of Measure</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/product/test/product_pricelist.yml b/addons/product/test/product_pricelist.yml
index 85230261312..66e256d4cd1 100644
--- a/addons/product/test/product_pricelist.yml
+++ b/addons/product/test/product_pricelist.yml
@@ -49,14 +49,14 @@
   !python {model: product.product}: |
     context.update({'quantity':1, 'date': False, 'partner': ref('base.res_partner_4'), 'pricelist': ref("supplier_pricelist")})
     product = self.browse(cr, uid, ref("product_product_6"), context=context)
-    assert product.price == 785, "cost price is not correspond."
+    assert product.price == 792, "cost price is not correspond."
 -
   I check cost price of LCD Monitor if more than 3 Unit.
 -
   !python {model: product.product}: |
     context.update({'quantity':3})
     product = self.browse(cr, uid, ref("product_product_6"), context=context)
-    assert product.price == 780, "cost price is not correspond."
+    assert product.price == 787, "cost price is not correspond."
 
 -
  I print the sale prices report.
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index 29e30bf380d..ae65c9092b3 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -18,28 +18,27 @@
 #
 ##############################################################################
 {
-    "name" : "Products Expiry Date",
-    "version" : "1.0",
-    "author" : "OpenERP SA",
-    "category" : "Specific Industry Applications",
-    "depends" : ["stock"],
-    "init_xml" : [],
-    "demo_xml" : ["product_expiry_demo.xml"],
-    "description": '''
+    'name' : 'Products Expiry Date',
+    'version' : '1.0',
+    'author' : 'OpenERP SA',
+    'category' : 'Specific Industry Applications',
+    'depends' : ['stock'],
+    'demo' : ['product_expiry_demo.xml'],
+    'description': """
 Track different dates on products and production lots.
 ======================================================
 
 Following dates can be tracked:
+-------------------------------
     - end of life
     - best before date
     - removal date
     - alert date
 
-Used, for example, in food industries.''',
-    "update_xml" : ["product_expiry_view.xml"],
-    "auto_install": False,
-    "installable": True,
-    "certificate": "00421222123914960109",
+Used, for example, in food industries.""",
+    'data' : ['product_expiry_view.xml'],
+    'auto_install': False,
+    'installable': True,
     'images': ['images/production_lots_dates.jpeg','images/products_dates.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_expiry/i18n/ar.po b/addons/product_expiry/i18n/ar.po
index 6721711ed99..6e8d3d409bd 100644
--- a/addons/product_expiry/i18n/ar.po
+++ b/addons/product_expiry/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
@@ -30,23 +30,23 @@ msgstr "هام"
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_lait_product_template
 msgid "Cow milk"
-msgstr ""
+msgstr "حليب البقر"
 
 #. module: product_expiry
 #: field:product.product,life_time:0
 msgid "Product Life Time"
-msgstr ""
+msgstr "مدة حياة المنتج"
 
 #. module: product_expiry
 #: help:stock.production.lot,use_date:0
 msgid ""
 "The date on which the lot starts deteriorating without becoming dangerous."
-msgstr ""
+msgstr "عدد الأيام قبل بداية الكثير من المنتجات بالتدهور دون أن تصبح خطرة"
 
 #. module: product_expiry
 #: field:product.product,use_time:0
 msgid "Product Use Time"
-msgstr ""
+msgstr "زمن استخدام المنتج"
 
 #. module: product_expiry
 #: sql_constraint:stock.production.lot:0
@@ -57,7 +57,7 @@ msgstr "يجب ان يكون تركيبة رقم المسلسل و المرجع
 #. module: product_expiry
 #: help:stock.production.lot,removal_date:0
 msgid "The date on which the lot should be removed."
-msgstr ""
+msgstr "التاريخ الذي يجب فيه الكثير من الإزالة."
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_product_product
@@ -69,28 +69,28 @@ msgstr "المنتج"
 msgid ""
 "The number of days after which an alert should be notified about the "
 "production lot."
-msgstr ""
+msgstr "عدد الأيام بعد الذي ينبغي إشعار تنبيه فيه عن الكثير من الإنتاج."
 
 #. module: product_expiry
 #: field:product.product,removal_time:0
 msgid "Product Removal Time"
-msgstr ""
+msgstr "زمن إزالة المنتج"
 
 #. module: product_expiry
 #: field:stock.production.lot,removal_date:0
 msgid "Removal Date"
-msgstr ""
+msgstr "تاريخ الإزالة"
 
 #. module: product_expiry
 #: help:stock.production.lot,life_date:0
 msgid ""
 "The date on which the lot may become dangerous and should not be consumed."
-msgstr ""
+msgstr "عدد الأيام قبل بداية الكثير من المنتجات بالتدهور وينبغي أن تستهلك"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_pain_product_template
 msgid "Bread"
-msgstr ""
+msgstr "خبز"
 
 #. module: product_expiry
 #: model:product.uom,name:product_expiry.product_uom_ltr
@@ -107,34 +107,34 @@ msgstr "تواريخ"
 #. module: product_expiry
 #: field:stock.production.lot,life_date:0
 msgid "End of Life Date"
-msgstr ""
+msgstr "تاريخ نهاية الحياة"
 
 #. module: product_expiry
 #: field:stock.production.lot,use_date:0
 msgid "Best before Date"
-msgstr ""
+msgstr "الأفضل قبل التاريخ"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_jambon_product_template
 msgid "French cheese Camenbert"
-msgstr ""
+msgstr "جبنة كاممبير الفرنسية"
 
 #. module: product_expiry
 #: help:product.product,removal_time:0
 msgid "The number of days before a production lot should be removed."
-msgstr ""
+msgstr "عدد الأيام قبل أن يجب إزالة الكثير من الإنتاج."
 
 #. module: product_expiry
 #: field:stock.production.lot,alert_date:0
 msgid "Alert Date"
-msgstr ""
+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 ""
+msgstr "عدد الأيام قبل بداية الكثير من المنتجات بالتدهور دون أن تصبح خطرة"
 
 #. module: product_expiry
 #: constraint:product.product:0
@@ -146,15 +146,15 @@ msgstr "خطأ: كود إين غير صالح"
 msgid ""
 "The number of days before a production lot may become dangerous and should "
 "not be consumed."
-msgstr ""
+msgstr "عدد الأيام قبل بداية الكثير من المنتجات بالتدهور ولا ينبغي أن تستهلك"
 
 #. module: product_expiry
 #: help:stock.production.lot,alert_date:0
 msgid ""
 "The date on which an alert should be notified about the production lot."
-msgstr ""
+msgstr "التاريخ الذي يجب أن يتم إخطار تنبيه عن كثير الإنتاج"
 
 #. module: product_expiry
 #: field:product.product,alert_time:0
 msgid "Product Alert Time"
-msgstr ""
+msgstr "زمن التنبيه للمنتج"
diff --git a/addons/product_expiry/i18n/ca.po b/addons/product_expiry/i18n/ca.po
index f027b5fed61..6336fff2693 100644
--- a/addons/product_expiry/i18n/ca.po
+++ b/addons/product_expiry/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/da.po b/addons/product_expiry/i18n/da.po
index 16ef24cef51..d2ac5715824 100644
--- a/addons/product_expiry/i18n/da.po
+++ b/addons/product_expiry/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/de.po b/addons/product_expiry/i18n/de.po
index 88ffc1ded22..f7c8d206452 100644
--- a/addons/product_expiry/i18n/de.po
+++ b/addons/product_expiry/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/el.po b/addons/product_expiry/i18n/el.po
index 11379bd2a4b..285396a724b 100644
--- a/addons/product_expiry/i18n/el.po
+++ b/addons/product_expiry/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/es.po b/addons/product_expiry/i18n/es.po
index e262837b78e..3e9f0954027 100644
--- a/addons/product_expiry/i18n/es.po
+++ b/addons/product_expiry/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/es_CR.po b/addons/product_expiry/i18n/es_CR.po
index eddfde6ea25..ee21552ce0d 100644
--- a/addons/product_expiry/i18n/es_CR.po
+++ b/addons/product_expiry/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: product_expiry
diff --git a/addons/product_expiry/i18n/es_EC.po b/addons/product_expiry/i18n/es_EC.po
index 8c600992a65..70d203e9315 100644
--- a/addons/product_expiry/i18n/es_EC.po
+++ b/addons/product_expiry/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/et.po b/addons/product_expiry/i18n/et.po
index 0a60353068d..0316c808a6f 100644
--- a/addons/product_expiry/i18n/et.po
+++ b/addons/product_expiry/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/fi.po b/addons/product_expiry/i18n/fi.po
index 72550a48591..26560a45c59 100644
--- a/addons/product_expiry/i18n/fi.po
+++ b/addons/product_expiry/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/fr.po b/addons/product_expiry/i18n/fr.po
index 0fa59ccc80c..5925927d355 100644
--- a/addons/product_expiry/i18n/fr.po
+++ b/addons/product_expiry/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-13 03:34+0000\n"
-"Last-Translator: Aline (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-10-18 13:58+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: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/gl.po b/addons/product_expiry/i18n/gl.po
index bdfb8561450..4723083e008 100644
--- a/addons/product_expiry/i18n/gl.po
+++ b/addons/product_expiry/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/hr.po b/addons/product_expiry/i18n/hr.po
index 326658e31f3..742b8965c06 100644
--- a/addons/product_expiry/i18n/hr.po
+++ b/addons/product_expiry/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/hu.po b/addons/product_expiry/i18n/hu.po
index 0695927bcf3..dd1e5727306 100644
--- a/addons/product_expiry/i18n/hu.po
+++ b/addons/product_expiry/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/it.po b/addons/product_expiry/i18n/it.po
index c1d71398dc2..db0b298365a 100644
--- a/addons/product_expiry/i18n/it.po
+++ b/addons/product_expiry/i18n/it.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/ja.po b/addons/product_expiry/i18n/ja.po
index 6c604cc286f..d580df8979a 100644
--- a/addons/product_expiry/i18n/ja.po
+++ b/addons/product_expiry/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/mn.po b/addons/product_expiry/i18n/mn.po
index 083ac52f802..24e78bc793c 100644
--- a/addons/product_expiry/i18n/mn.po
+++ b/addons/product_expiry/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/nl.po b/addons/product_expiry/i18n/nl.po
index 91a079ec6ba..1d8e901d84c 100644
--- a/addons/product_expiry/i18n/nl.po
+++ b/addons/product_expiry/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/pl.po b/addons/product_expiry/i18n/pl.po
index b2d731eb162..0fd724ebdaa 100644
--- a/addons/product_expiry/i18n/pl.po
+++ b/addons/product_expiry/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:25+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/pt.po b/addons/product_expiry/i18n/pt.po
index a5c60ab18bb..30a66fc12cb 100644
--- a/addons/product_expiry/i18n/pt.po
+++ b/addons/product_expiry/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/pt_BR.po b/addons/product_expiry/i18n/pt_BR.po
index bd05b2b82cd..9c77f1ee9a9 100644
--- a/addons/product_expiry/i18n/pt_BR.po
+++ b/addons/product_expiry/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
@@ -25,7 +25,7 @@ msgstr "Lote de Produção"
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_from_product_template
 msgid "Ham"
-msgstr "Ham"
+msgstr "Presunto"
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_lait_product_template
@@ -52,7 +52,7 @@ msgstr "Hora de Uso do Produto"
 #: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
-msgstr "A combinação do serial e referência interna deve ser única !"
+msgstr "A combinação do número de serie e referência interna deve ser única!"
 
 #. module: product_expiry
 #: help:stock.production.lot,removal_date:0
@@ -87,7 +87,7 @@ msgstr "Data de Remoção"
 #: help:stock.production.lot,life_date:0
 msgid ""
 "The date on which the lot may become dangerous and should not be consumed."
-msgstr "Data em que o lote pode se tornar perigoso e nao deve ser consumido."
+msgstr "Data em que o lote pode se tornar perigoso e não deve ser consumido."
 
 #. module: product_expiry
 #: model:product.template,name:product_expiry.product_product_pain_product_template
@@ -137,7 +137,7 @@ msgid ""
 "The number of days before a production lot starts deteriorating without "
 "becoming dangerous."
 msgstr ""
-"Número de dias antes que o lote de produção inicie a deterioração sem se "
+"Número de dias antes que o lote de produção começa a  se deteriorar sem se "
 "tornar perigoso."
 
 #. module: product_expiry
diff --git a/addons/product_expiry/i18n/ro.po b/addons/product_expiry/i18n/ro.po
index 98cc5a4c95b..20c69be6d32 100644
--- a/addons/product_expiry/i18n/ro.po
+++ b/addons/product_expiry/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/ru.po b/addons/product_expiry/i18n/ru.po
index 710d81c4816..06345242134 100644
--- a/addons/product_expiry/i18n/ru.po
+++ b/addons/product_expiry/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-11-22 07:21+0000\n"
+"PO-Revision-Date: 2012-10-24 05:12+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
@@ -162,7 +162,7 @@ msgstr ""
 #. module: product_expiry
 #: field:product.product,alert_time:0
 msgid "Product Alert Time"
-msgstr ""
+msgstr "Время оповещения товара"
 
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
diff --git a/addons/product_expiry/i18n/sl.po b/addons/product_expiry/i18n/sl.po
index d2bf5f4bc43..7cf68aa098c 100644
--- a/addons/product_expiry/i18n/sl.po
+++ b/addons/product_expiry/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/sr.po b/addons/product_expiry/i18n/sr.po
index c8024d2b457..0114d34c802 100644
--- a/addons/product_expiry/i18n/sr.po
+++ b/addons/product_expiry/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/sr@latin.po b/addons/product_expiry/i18n/sr@latin.po
index 0d6fd710e09..b5a072eeba4 100644
--- a/addons/product_expiry/i18n/sr@latin.po
+++ b/addons/product_expiry/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/sv.po b/addons/product_expiry/i18n/sv.po
index 21b82a371d1..e8bd3695bec 100644
--- a/addons/product_expiry/i18n/sv.po
+++ b/addons/product_expiry/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/tr.po b/addons/product_expiry/i18n/tr.po
index 3f131cd2dff..211452280a7 100644
--- a/addons/product_expiry/i18n/tr.po
+++ b/addons/product_expiry/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/vi.po b/addons/product_expiry/i18n/vi.po
index d90d971b7d5..27a1a904c28 100644
--- a/addons/product_expiry/i18n/vi.po
+++ b/addons/product_expiry/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/i18n/zh_CN.po b/addons/product_expiry/i18n/zh_CN.po
index 71a2d830c67..9bf331c285d 100644
--- a/addons/product_expiry/i18n/zh_CN.po
+++ b/addons/product_expiry/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_expiry
 #: model:ir.model,name:product_expiry.model_stock_production_lot
diff --git a/addons/product_expiry/product_expiry.py b/addons/product_expiry/product_expiry.py
index c16ccc2b1ee..e4ed28db4e6 100644
--- a/addons/product_expiry/product_expiry.py
+++ b/addons/product_expiry/product_expiry.py
@@ -45,12 +45,13 @@ class stock_production_lot(osv.osv):
 
     _columns = {
         'life_date': fields.datetime('End of Life Date',
-            help='The date on which the lot may become dangerous and should not be consumed.'),
+            help='This is the date on which the goods with this Serial Number may become dangerous and must not be consumed.'),
         'use_date': fields.datetime('Best before Date',
-            help='The date on which the lot starts deteriorating without becoming dangerous.'),
+            help='This is the date on which the goods with this Serial Number start deteriorating, without being dangerous yet.'),
         'removal_date': fields.datetime('Removal Date',
-            help='The date on which the lot should be removed.'),
-        'alert_date': fields.datetime('Alert Date', help="The date on which an alert should be notified about the serial number."),
+            help='This is the date on which the goods with this Serial Number should be removed from the stock.'),
+        'alert_date': fields.datetime('Alert Date',
+            help="This is the date on which an alert should be notified about the goods with this Serial Number."),
     }
     # Assign dates according to products data
     def create(self, cr, uid, vals, context=None):
@@ -78,12 +79,13 @@ class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
         'life_time': fields.integer('Product Life Time',
-            help='The number of days before a serial number may become dangerous and should not be consumed.'),
+            help='When a new a Serial Number is issued, this is the number of days before the goods may become dangerous and must not be consumed.'),
         'use_time': fields.integer('Product Use Time',
-            help='The number of days before a serial number starts deteriorating without becoming dangerous.'),
+            help='When a new a Serial Number is issued, this is the number of days before the goods starts deteriorating, without being dangerous yet.'),
         'removal_time': fields.integer('Product Removal Time',
-            help='The number of days before a serial number should be removed.'),
-        'alert_time': fields.integer('Product Alert Time', help="The number of days after which an alert should be notified about the serial number."),
+            help='When a new a Serial Number is issued, this is the number of days before the goods should be removed from the stock.'),
+        'alert_time': fields.integer('Product Alert Time',
+            help='When a new a Serial Number is issued, this is the number of days before an alert should be notified.'),
     }
 product_product()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_expiry/product_expiry_view.xml b/addons/product_expiry/product_expiry_view.xml
index f883ca55fe0..d6dfb22b317 100644
--- a/addons/product_expiry/product_expiry_view.xml
+++ b/addons/product_expiry/product_expiry_view.xml
@@ -19,16 +19,16 @@
         <record model="ir.ui.view" id="view_product_form_expiry">
             <field name="name">product.normal.form</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view" />
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form" />
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Dates">
+                <group name="Weights" position="after">
+                    <group string="Dates">
                         <field name="life_time" />
                         <field name="use_time" />
                         <field name="removal_time" />
                         <field name="alert_time" />
-                    </page>
-                </notebook>
+                    </group>
+                </group>
             </field>
         </record>
     </data>
diff --git a/addons/product_manufacturer/__openerp__.py b/addons/product_manufacturer/__openerp__.py
index 98cf8d2d8de..f43ed923860 100644
--- a/addons/product_manufacturer/__openerp__.py
+++ b/addons/product_manufacturer/__openerp__.py
@@ -18,30 +18,29 @@
 #
 ##############################################################################
 {
-    "name" : "Products Manufacturers",
-    "version" : "1.0",
-    "author" : "OpenERP SA",
+    'name': 'Products Manufacturers',
+    'version': '1.0',
+    'author': 'OpenERP SA',
     'category': 'Purchase Management',
-    "depends" : ["stock"],
-    "init_xml" : [],
-    "demo_xml" : [],
-    "description": """
+    'depends': ['stock'],
+    'demo': [],
+    'description': """
 A module that adds manufacturers and attributes on the product form.
 ====================================================================
 
 You can now define the following for a product:
+-----------------------------------------------
     * Manufacturer
     * Manufacturer Product Name
     * Manufacturer Product Code
     * Product Attributes
     """,
-    "update_xml" : [
-        "security/ir.model.access.csv",
-        "product_manufacturer_view.xml"
+    'data': [
+        'security/ir.model.access.csv',
+        'product_manufacturer_view.xml'
     ],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00720153953662760781",
+    'auto_install': False,
+    'installable': True,
     'images': ['images/products_manufacturer.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_manufacturer/i18n/ar.po b/addons/product_manufacturer/i18n/ar.po
index 2313f81268c..7aaf0b23cfd 100644
--- a/addons/product_manufacturer/i18n/ar.po
+++ b/addons/product_manufacturer/i18n/ar.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
 msgid "Manufacturer Product Code"
-msgstr ""
+msgstr "كود تصنيع المنتج"
 
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_product
@@ -31,18 +31,18 @@ msgstr "المنتج"
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 msgid "Product Template Name"
-msgstr ""
+msgstr "اسم قالب المنتج"
 
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
-msgstr ""
+msgstr "سمات المنتج"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
 #: view:product.product:0
 msgid "Product Attributes"
-msgstr ""
+msgstr "سمات المنتج"
 
 #. module: product_manufacturer
 #: field:product.manufacturer.attribute,name:0
@@ -68,7 +68,7 @@ msgstr "صفات"
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pname:0
 msgid "Manufacturer Product Name"
-msgstr ""
+msgstr "اسم مصنع المنتج"
 
 #. module: product_manufacturer
 #: view:product.product:0
diff --git a/addons/product_manufacturer/i18n/bg.po b/addons/product_manufacturer/i18n/bg.po
index bc4a8096fb8..1aa27b070a5 100644
--- a/addons/product_manufacturer/i18n/bg.po
+++ b/addons/product_manufacturer/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/ca.po b/addons/product_manufacturer/i18n/ca.po
index e5cf1bd794f..7098f60a538 100644
--- a/addons/product_manufacturer/i18n/ca.po
+++ b/addons/product_manufacturer/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/da.po b/addons/product_manufacturer/i18n/da.po
index 3f499979e2f..160c03dfd56 100644
--- a/addons/product_manufacturer/i18n/da.po
+++ b/addons/product_manufacturer/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/de.po b/addons/product_manufacturer/i18n/de.po
index 50abf2a4fc4..f21e70ba1fa 100644
--- a/addons/product_manufacturer/i18n/de.po
+++ b/addons/product_manufacturer/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/el.po b/addons/product_manufacturer/i18n/el.po
index 9e49f542bcc..eb0d3bf83d6 100644
--- a/addons/product_manufacturer/i18n/el.po
+++ b/addons/product_manufacturer/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/es.po b/addons/product_manufacturer/i18n/es.po
index 1b5587ba74e..4799e93a4c2 100644
--- a/addons/product_manufacturer/i18n/es.po
+++ b/addons/product_manufacturer/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/es_CR.po b/addons/product_manufacturer/i18n/es_CR.po
index a981fb20cdd..e9276a8b31c 100644
--- a/addons/product_manufacturer/i18n/es_CR.po
+++ b/addons/product_manufacturer/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: product_manufacturer
diff --git a/addons/product_manufacturer/i18n/es_EC.po b/addons/product_manufacturer/i18n/es_EC.po
index 9280034b17a..bf012c57096 100644
--- a/addons/product_manufacturer/i18n/es_EC.po
+++ b/addons/product_manufacturer/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/et.po b/addons/product_manufacturer/i18n/et.po
index 760f9688b86..3f1742d3467 100644
--- a/addons/product_manufacturer/i18n/et.po
+++ b/addons/product_manufacturer/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/fi.po b/addons/product_manufacturer/i18n/fi.po
index d95c0f3f019..c07c289416a 100644
--- a/addons/product_manufacturer/i18n/fi.po
+++ b/addons/product_manufacturer/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/fr.po b/addons/product_manufacturer/i18n/fr.po
index 81aa2d262a6..ed76f006517 100644
--- a/addons/product_manufacturer/i18n/fr.po
+++ b/addons/product_manufacturer/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/gl.po b/addons/product_manufacturer/i18n/gl.po
index c89fd0802fc..2e2ede7f17f 100644
--- a/addons/product_manufacturer/i18n/gl.po
+++ b/addons/product_manufacturer/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/hr.po b/addons/product_manufacturer/i18n/hr.po
index 4d3ccf8a40f..01e2e095590 100644
--- a/addons/product_manufacturer/i18n/hr.po
+++ b/addons/product_manufacturer/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/hu.po b/addons/product_manufacturer/i18n/hu.po
index 9d37d907657..cba801d9e60 100644
--- a/addons/product_manufacturer/i18n/hu.po
+++ b/addons/product_manufacturer/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/it.po b/addons/product_manufacturer/i18n/it.po
index 861b8bcaee0..76760bc0074 100644
--- a/addons/product_manufacturer/i18n/it.po
+++ b/addons/product_manufacturer/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/ja.po b/addons/product_manufacturer/i18n/ja.po
index 31e998df9a7..2c8db704f00 100644
--- a/addons/product_manufacturer/i18n/ja.po
+++ b/addons/product_manufacturer/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/mn.po b/addons/product_manufacturer/i18n/mn.po
index 44dc56018a0..420eafbb137 100644
--- a/addons/product_manufacturer/i18n/mn.po
+++ b/addons/product_manufacturer/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/nb.po b/addons/product_manufacturer/i18n/nb.po
index 233ceb7bdcc..182d61ce056 100644
--- a/addons/product_manufacturer/i18n/nb.po
+++ b/addons/product_manufacturer/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/nl.po b/addons/product_manufacturer/i18n/nl.po
index a85f71bc7ec..0cc2c376632 100644
--- a/addons/product_manufacturer/i18n/nl.po
+++ b/addons/product_manufacturer/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
@@ -68,7 +68,7 @@ msgstr "Kenmerken"
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pname:0
 msgid "Manufacturer Product Name"
-msgstr "Artikelomnaam fabrikant"
+msgstr "Artikelomschrijving fabrikant"
 
 #. module: product_manufacturer
 #: view:product.product:0
diff --git a/addons/product_manufacturer/i18n/pl.po b/addons/product_manufacturer/i18n/pl.po
index 1b510e5f390..f798a0e846e 100644
--- a/addons/product_manufacturer/i18n/pl.po
+++ b/addons/product_manufacturer/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/pt.po b/addons/product_manufacturer/i18n/pt.po
index d035a8d2c40..af75e17db75 100644
--- a/addons/product_manufacturer/i18n/pt.po
+++ b/addons/product_manufacturer/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/pt_BR.po b/addons/product_manufacturer/i18n/pt_BR.po
index 54b5ccac8ab..1e4a37590d9 100644
--- a/addons/product_manufacturer/i18n/pt_BR.po
+++ b/addons/product_manufacturer/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
@@ -36,7 +36,7 @@ msgstr "Nome do Modelo de Produto"
 #. module: product_manufacturer
 #: model:ir.model,name:product_manufacturer.model_product_manufacturer_attribute
 msgid "Product attributes"
-msgstr "Atributos de Produto"
+msgstr "Atributos do produto"
 
 #. module: product_manufacturer
 #: view:product.manufacturer.attribute:0
diff --git a/addons/product_manufacturer/i18n/ro.po b/addons/product_manufacturer/i18n/ro.po
index 4fcadf4a4fb..ba15a6de605 100644
--- a/addons/product_manufacturer/i18n/ro.po
+++ b/addons/product_manufacturer/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/ru.po b/addons/product_manufacturer/i18n/ru.po
index a77c6a638df..d00c8ddff6a 100644
--- a/addons/product_manufacturer/i18n/ru.po
+++ b/addons/product_manufacturer/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/sl.po b/addons/product_manufacturer/i18n/sl.po
index 6b9faa26778..2b110f414dc 100644
--- a/addons/product_manufacturer/i18n/sl.po
+++ b/addons/product_manufacturer/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/sr.po b/addons/product_manufacturer/i18n/sr.po
index a8e056c6cd2..33cd73aabdb 100644
--- a/addons/product_manufacturer/i18n/sr.po
+++ b/addons/product_manufacturer/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/sr@latin.po b/addons/product_manufacturer/i18n/sr@latin.po
index fab847e4ef2..d042cc07bb4 100644
--- a/addons/product_manufacturer/i18n/sr@latin.po
+++ b/addons/product_manufacturer/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/sv.po b/addons/product_manufacturer/i18n/sv.po
index 3e4bd87de6e..b8afbf4fbd9 100644
--- a/addons/product_manufacturer/i18n/sv.po
+++ b/addons/product_manufacturer/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/tr.po b/addons/product_manufacturer/i18n/tr.po
index a4c295dcfe5..9cc5f4d32c5 100644
--- a/addons/product_manufacturer/i18n/tr.po
+++ b/addons/product_manufacturer/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/i18n/zh_CN.po b/addons/product_manufacturer/i18n/zh_CN.po
index 7b727476ea9..560a2d9f39c 100644
--- a/addons/product_manufacturer/i18n/zh_CN.po
+++ b/addons/product_manufacturer/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:28+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_manufacturer
 #: field:product.product,manufacturer_pref:0
diff --git a/addons/product_manufacturer/product_manufacturer.py b/addons/product_manufacturer/product_manufacturer.py
index 93f4a6f1a8e..1aeff8d4f78 100644
--- a/addons/product_manufacturer/product_manufacturer.py
+++ b/addons/product_manufacturer/product_manufacturer.py
@@ -40,4 +40,4 @@ class product_attribute(osv.osv):
     }
 product_attribute()
 
-# 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/product_manufacturer/product_manufacturer_view.xml b/addons/product_manufacturer/product_manufacturer_view.xml
index 5f620747d64..88f528693df 100644
--- a/addons/product_manufacturer/product_manufacturer_view.xml
+++ b/addons/product_manufacturer/product_manufacturer_view.xml
@@ -7,23 +7,21 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view" />
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Manufacturer">
-                        <group string="Manufacturer">
-                            <field name="manufacturer" />
-                            <field name="manufacturer_pname"/>
-                            <field name="manufacturer_pref"/>
-                        </group>
-                        <group string="Attributes">
-                            <field name="attribute_ids" colspan="4" nolabel="1">
-                                <tree string="Product Attributes" editable="bottom">
-                                    <field name="name"/>
-                                    <field name="value"/>
-                                </tree>
-                            </field>
-                        </group>
-                    </page>
-                </notebook>
+                <group name="procurement" position="inside">
+                    <group string="Manufacturer">
+                        <field name="manufacturer" />
+                        <field name="manufacturer_pname"/>
+                        <field name="manufacturer_pref"/>
+                    </group>
+                    <group string="Attributes">
+                        <field name="attribute_ids" colspan="4" nolabel="1">
+                            <tree string="Product Attributes" editable="bottom">
+                                <field name="name"/>
+                                <field name="value"/>
+                            </tree>
+                        </field>
+                    </group>
+                </group>
             </field>
         </record>
 
diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py
index e45734cde52..41c2a53474a 100644
--- a/addons/product_margin/__openerp__.py
+++ b/addons/product_margin/__openerp__.py
@@ -32,16 +32,15 @@ The wizard to launch the report has several options to help you get the data you
 """,
     'author': 'OpenERP SA',
     'depends': ['account'],
-    'update_xml': [
-                   'security/ir.model.access.csv',
-                   'wizard/product_margin_view.xml',
-                   'product_margin_view.xml'
+    'data': [
+        'security/ir.model.access.csv',
+        'wizard/product_margin_view.xml',
+        'product_margin_view.xml'
     ],
     'test':['test/product_margin.yml'],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0064392591773',
     'images': ['images/open_margins.jpeg','images/product_margins_form.jpeg', 'images/product_margins_list.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/product_margin/i18n/ar.po b/addons/product_margin/i18n/ar.po
index 68e8881bd37..4a74684bafa 100644
--- a/addons/product_margin/i18n/ar.po
+++ b/addons/product_margin/i18n/ar.po
@@ -13,19 +13,19 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
 #: field:product.product,turnover:0
 msgid "Turnover"
-msgstr ""
+msgstr "دورة رأس المال"
 
 #. module: product_margin
 #: field:product.product,expected_margin_rate:0
 msgid "Expected Margin (%)"
-msgstr ""
+msgstr "الهامش المتوقع (%)"
 
 #. module: product_margin
 #: field:product.margin,from_date:0
@@ -62,13 +62,13 @@ msgstr ""
 #: selection:product.margin,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Draft, Open and Paid"
-msgstr ""
+msgstr "مسودة أو فتح ومدفوعة"
 
 #. module: product_margin
 #: field:product.product,purchase_avg_price:0
 #: field:product.product,sale_avg_price:0
 msgid "Avg. Unit Price"
-msgstr ""
+msgstr "متوسط. سعر الوحدة"
 
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_product
@@ -78,7 +78,7 @@ msgstr "المنتج"
 #. module: product_margin
 #: view:product.product:0
 msgid "Catalog Price"
-msgstr ""
+msgstr "سعر الكاتلوج"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -89,12 +89,12 @@ msgstr "مدفوع"
 #. module: product_margin
 #: help:product.product,sales_gap:0
 msgid "Expected Sale - Turn Over"
-msgstr ""
+msgstr "من المتوقع بيع - تسليم"
 
 #. module: product_margin
 #: field:product.product,sale_expected:0
 msgid "Expected Sale"
-msgstr ""
+msgstr "البيع المتوقع"
 
 #. module: product_margin
 #: view:product.product:0
@@ -104,7 +104,7 @@ msgstr "السعر القياسي"
 #. module: product_margin
 #: help:product.product,purchase_num_invoiced:0
 msgid "Sum of Quantity in Supplier Invoices"
-msgstr ""
+msgstr "مجموع الوحدات في فواتير المورد"
 
 #. module: product_margin
 #: help:product.product,normal_cost:0
@@ -114,7 +114,7 @@ msgstr ""
 #. module: product_margin
 #: help:product.product,expected_margin:0
 msgid "Expected Sale - Normal Cost"
-msgstr ""
+msgstr "البيع المتوقع - التكلفة العادية"
 
 #. module: product_margin
 #: field:product.product,purchase_num_invoiced:0
@@ -131,12 +131,12 @@ msgstr ""
 #. module: product_margin
 #: field:product.product,expected_margin:0
 msgid "Expected Margin"
-msgstr ""
+msgstr "الهامش المتوقع"
 
 #. module: product_margin
 #: view:product.product:0
 msgid "#Purchased"
-msgstr ""
+msgstr "# شراء"
 
 #. module: product_margin
 #: help:product.product,turnover:0
@@ -147,12 +147,12 @@ msgstr ""
 #. module: product_margin
 #: help:product.product,expected_margin_rate:0
 msgid "Expected margin * 100 / Expected Sale"
-msgstr ""
+msgstr "الهامش المتوقع * 100 /البيع المتوقع"
 
 #. module: product_margin
 #: help:product.product,sale_avg_price:0
 msgid "Avg. Price in Customer Invoices)"
-msgstr ""
+msgstr "المتوسط. السعر في فاتورة العميل"
 
 #. module: product_margin
 #: help:product.product,total_cost:0
@@ -169,12 +169,12 @@ msgstr "حالة الفاتورة"
 #. module: product_margin
 #: help:product.product,purchase_gap:0
 msgid "Normal Cost - Total Cost"
-msgstr ""
+msgstr "السعر العادي - التكلفة الكلية"
 
 #. module: product_margin
 #: field:product.product,total_margin:0
 msgid "Total Margin"
-msgstr ""
+msgstr "مجموع الهامش"
 
 #. module: product_margin
 #: view:product.product:0
@@ -185,7 +185,7 @@ msgstr ""
 #. module: product_margin
 #: field:product.product,normal_cost:0
 msgid "Normal Cost"
-msgstr ""
+msgstr "التكلفة العادية"
 
 #. module: product_margin
 #: view:product.product:0
@@ -195,7 +195,7 @@ msgstr "المشتريات"
 #. module: product_margin
 #: help:product.product,purchase_avg_price:0
 msgid "Avg. Price in Supplier Invoices "
-msgstr ""
+msgstr "متوسط. السعر في فاتورة المورد "
 
 #. module: product_margin
 #: view:product.margin:0
@@ -216,7 +216,7 @@ msgstr ""
 #: selection:product.margin,invoice_state:0
 #: selection:product.product,invoice_state:0
 msgid "Open and Paid"
-msgstr ""
+msgstr "مفتوح و مدفوع"
 
 #. module: product_margin
 #: view:product.product:0
@@ -230,7 +230,7 @@ msgstr "المبيعات"
 #: view:product.product:0
 #, python-format
 msgid "Product Margins"
-msgstr ""
+msgstr "هامش المنتج"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -250,12 +250,12 @@ msgstr ""
 #. module: product_margin
 #: field:product.product,total_margin_rate:0
 msgid "Total Margin (%)"
-msgstr ""
+msgstr "مجموع الهامش (%)"
 
 #. module: product_margin
 #: view:product.margin:0
 msgid "Open Margins"
-msgstr ""
+msgstr "فتح الهوامش"
 
 #. module: product_margin
 #: view:product.margin:0
@@ -270,9 +270,9 @@ msgstr "هوامش"
 #. module: product_margin
 #: help:product.product,sale_num_invoiced:0
 msgid "Sum of Quantity in Customer Invoices"
-msgstr ""
+msgstr "مجموع الكمية في فواتير العملاء"
 
 #. module: product_margin
 #: model:ir.model,name:product_margin.model_product_margin
 msgid "Product Margin"
-msgstr ""
+msgstr "هامش المنتج"
diff --git a/addons/product_margin/i18n/bg.po b/addons/product_margin/i18n/bg.po
index 6d7237d0ad0..61b4b5dc665 100644
--- a/addons/product_margin/i18n/bg.po
+++ b/addons/product_margin/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/bs.po b/addons/product_margin/i18n/bs.po
index 81364d748a7..c55287fe485 100644
--- a/addons/product_margin/i18n/bs.po
+++ b/addons/product_margin/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/ca.po b/addons/product_margin/i18n/ca.po
index 5949557fe67..d3cfa69bfaf 100644
--- a/addons/product_margin/i18n/ca.po
+++ b/addons/product_margin/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/cs.po b/addons/product_margin/i18n/cs.po
index cd88eb90c6e..ce3de90f9bc 100644
--- a/addons/product_margin/i18n/cs.po
+++ b/addons/product_margin/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/da.po b/addons/product_margin/i18n/da.po
index dc26b79e2c3..c6cbbe2bd13 100644
--- a/addons/product_margin/i18n/da.po
+++ b/addons/product_margin/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/de.po b/addons/product_margin/i18n/de.po
index 1b2bd4f8a59..b1cea4f4098 100644
--- a/addons/product_margin/i18n/de.po
+++ b/addons/product_margin/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/el.po b/addons/product_margin/i18n/el.po
index 7d430ce55a4..2861e52db75 100644
--- a/addons/product_margin/i18n/el.po
+++ b/addons/product_margin/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/product_margin/i18n/es.po b/addons/product_margin/i18n/es.po
index 4a5c30c1beb..3f86a454986 100644
--- a/addons/product_margin/i18n/es.po
+++ b/addons/product_margin/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/es_AR.po b/addons/product_margin/i18n/es_AR.po
index 167c49b2ef3..972e3be2246 100644
--- a/addons/product_margin/i18n/es_AR.po
+++ b/addons/product_margin/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/es_CR.po b/addons/product_margin/i18n/es_CR.po
index 89df3ab4ccf..53e6fc7052d 100644
--- a/addons/product_margin/i18n/es_CR.po
+++ b/addons/product_margin/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: product_margin
diff --git a/addons/product_margin/i18n/es_EC.po b/addons/product_margin/i18n/es_EC.po
index abf219f0691..40f31368f62 100644
--- a/addons/product_margin/i18n/es_EC.po
+++ b/addons/product_margin/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/et.po b/addons/product_margin/i18n/et.po
index 1bc94e5f4fa..779ec678226 100644
--- a/addons/product_margin/i18n/et.po
+++ b/addons/product_margin/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/fi.po b/addons/product_margin/i18n/fi.po
index b26ef544599..440158900a2 100644
--- a/addons/product_margin/i18n/fi.po
+++ b/addons/product_margin/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/fr.po b/addons/product_margin/i18n/fr.po
index c17792fc365..aff39d74507 100644
--- a/addons/product_margin/i18n/fr.po
+++ b/addons/product_margin/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/gl.po b/addons/product_margin/i18n/gl.po
index 46b62a2e178..c576b0c0339 100644
--- a/addons/product_margin/i18n/gl.po
+++ b/addons/product_margin/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/gu.po b/addons/product_margin/i18n/gu.po
index b4d4bf2dc98..9a26b2fd705 100644
--- a/addons/product_margin/i18n/gu.po
+++ b/addons/product_margin/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/hr.po b/addons/product_margin/i18n/hr.po
index 93b49244397..9334b633041 100644
--- a/addons/product_margin/i18n/hr.po
+++ b/addons/product_margin/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/hu.po b/addons/product_margin/i18n/hu.po
index 36afa1da30a..4d3cc9539ec 100644
--- a/addons/product_margin/i18n/hu.po
+++ b/addons/product_margin/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/id.po b/addons/product_margin/i18n/id.po
index d50027281f6..e381a575224 100644
--- a/addons/product_margin/i18n/id.po
+++ b/addons/product_margin/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/it.po b/addons/product_margin/i18n/it.po
index 5e55b9b719f..d8632d174c8 100644
--- a/addons/product_margin/i18n/it.po
+++ b/addons/product_margin/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/ja.po b/addons/product_margin/i18n/ja.po
index c7f54681418..471939398dc 100644
--- a/addons/product_margin/i18n/ja.po
+++ b/addons/product_margin/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/ko.po b/addons/product_margin/i18n/ko.po
index 2460c101fe8..39cce3cd4b8 100644
--- a/addons/product_margin/i18n/ko.po
+++ b/addons/product_margin/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/lt.po b/addons/product_margin/i18n/lt.po
index b41ad5dd2ad..5016e5ef2cf 100644
--- a/addons/product_margin/i18n/lt.po
+++ b/addons/product_margin/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/nl.po b/addons/product_margin/i18n/nl.po
index 35d9d1f1624..2035f743598 100644
--- a/addons/product_margin/i18n/nl.po
+++ b/addons/product_margin/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -36,13 +36,12 @@ msgstr "Van"
 #: help:product.product,sale_expected:0
 msgid ""
 "Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
-msgstr ""
-"Som van product van verkoopcatalogusprijs en de hoeveelheid op klantfacturen."
+msgstr "Som van product van verkoopprijs en de hoeveelheid op klantfacturen."
 
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnorder - Standard price"
-msgstr "Omzet - standaard prijs"
+msgstr "Omzet - kostprijs"
 
 #. module: product_margin
 #: field:product.margin,to_date:0
@@ -79,7 +78,7 @@ msgstr "Product"
 #. module: product_margin
 #: view:product.product:0
 msgid "Catalog Price"
-msgstr "Catalogusprijs"
+msgstr "Verkoopprijs"
 
 #. module: product_margin
 #: selection:product.margin,invoice_state:0
@@ -100,7 +99,7 @@ msgstr "Verwachte verkoop"
 #. module: product_margin
 #: view:product.product:0
 msgid "Standard Price"
-msgstr "Standaardprijs"
+msgstr "Kostprijs"
 
 #. module: product_margin
 #: help:product.product,purchase_num_invoiced:0
diff --git a/addons/product_margin/i18n/nl_BE.po b/addons/product_margin/i18n/nl_BE.po
index ba7d78275c3..0c1a269127b 100644
--- a/addons/product_margin/i18n/nl_BE.po
+++ b/addons/product_margin/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/pl.po b/addons/product_margin/i18n/pl.po
index 45534e0deac..ae857f37dbc 100644
--- a/addons/product_margin/i18n/pl.po
+++ b/addons/product_margin/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/pt.po b/addons/product_margin/i18n/pt.po
index 17ef7a30bda..5dd0a6d5d9e 100644
--- a/addons/product_margin/i18n/pt.po
+++ b/addons/product_margin/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index 2bf2105ee69..7ff49153c57 100644
--- a/addons/product_margin/i18n/pt_BR.po
+++ b/addons/product_margin/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -170,7 +170,7 @@ msgstr ""
 #: field:product.margin,invoice_state:0
 #: field:product.product,invoice_state:0
 msgid "Invoice State"
-msgstr "Status da Fatura"
+msgstr "Situação da Fatura"
 
 #. module: product_margin
 #: help:product.product,purchase_gap:0
diff --git a/addons/product_margin/i18n/ro.po b/addons/product_margin/i18n/ro.po
index 0e92c7a0712..f16f8b43d6b 100644
--- a/addons/product_margin/i18n/ro.po
+++ b/addons/product_margin/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/ru.po b/addons/product_margin/i18n/ru.po
index 08384dab6ca..c3575804225 100644
--- a/addons/product_margin/i18n/ru.po
+++ b/addons/product_margin/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/sl.po b/addons/product_margin/i18n/sl.po
index 72bba12033d..caa0fcbd8b1 100644
--- a/addons/product_margin/i18n/sl.po
+++ b/addons/product_margin/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/sq.po b/addons/product_margin/i18n/sq.po
index 744cf91add8..775ef4a56cf 100644
--- a/addons/product_margin/i18n/sq.po
+++ b/addons/product_margin/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/sr.po b/addons/product_margin/i18n/sr.po
index 567c3b7fe20..768d81cea7f 100644
--- a/addons/product_margin/i18n/sr.po
+++ b/addons/product_margin/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/sr@latin.po b/addons/product_margin/i18n/sr@latin.po
index 4943e0fd9cf..bf3afbb257d 100644
--- a/addons/product_margin/i18n/sr@latin.po
+++ b/addons/product_margin/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/sv.po b/addons/product_margin/i18n/sv.po
index 4f34abff0a2..e18ae236f8c 100644
--- a/addons/product_margin/i18n/sv.po
+++ b/addons/product_margin/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/tlh.po b/addons/product_margin/i18n/tlh.po
index a1240e064cc..1f22459fd4d 100644
--- a/addons/product_margin/i18n/tlh.po
+++ b/addons/product_margin/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index b2458016334..50152d9bdf5 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
@@ -37,11 +37,12 @@ msgstr "Başlangıç"
 msgid ""
 "Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
 msgstr ""
+"Satış Katalog fiyatı ve Müşteri Faturaları miktarının çarpımının toplamı."
 
 #. module: product_margin
 #: help:product.product,total_margin:0
 msgid "Turnorder - Standard price"
-msgstr ""
+msgstr "Siparişsırası - Standart fiyat"
 
 #. module: product_margin
 #: field:product.margin,to_date:0
@@ -109,7 +110,7 @@ msgstr "Tedarikçi faturalarıdaki miktarların toplamı"
 #. module: product_margin
 #: help:product.product,normal_cost:0
 msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
-msgstr ""
+msgstr "Maliyet fiyatı ve Tedarikçi Faturaları miktarının Çarpımının Toplamı"
 
 #. module: product_margin
 #: help:product.product,expected_margin:0
@@ -142,7 +143,7 @@ msgstr "#Alış"
 #: help:product.product,turnover:0
 msgid ""
 "Sum of Multification of Invoice price and quantity of Customer Invoices"
-msgstr ""
+msgstr "Fatura fiyatı ve Müşteri Faturalarının Çarpımının Toplamı"
 
 #. module: product_margin
 #: help:product.product,expected_margin_rate:0
@@ -159,6 +160,7 @@ msgstr "Ort. Müşteri Fatura Fiyatı)"
 msgid ""
 "Sum of Multification of Invoice price and quantity of Supplier Invoices "
 msgstr ""
+"Fatura fiyatı ve Tedarikçi FAturalarının miktarının Çarpımının Toplamı "
 
 #. module: product_margin
 #: field:product.margin,invoice_state:0
diff --git a/addons/product_margin/i18n/uk.po b/addons/product_margin/i18n/uk.po
index b69f33044ec..b7426f9b9f5 100644
--- a/addons/product_margin/i18n/uk.po
+++ b/addons/product_margin/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/vi.po b/addons/product_margin/i18n/vi.po
index 1438d46e80a..293c5a79435 100644
--- a/addons/product_margin/i18n/vi.po
+++ b/addons/product_margin/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/zh_CN.po b/addons/product_margin/i18n/zh_CN.po
index d5950f84a8f..6f53930f2e7 100644
--- a/addons/product_margin/i18n/zh_CN.po
+++ b/addons/product_margin/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/i18n/zh_TW.po b/addons/product_margin/i18n/zh_TW.po
index 477bb82ea57..8c2f6a7f8cd 100644
--- a/addons/product_margin/i18n/zh_TW.po
+++ b/addons/product_margin/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:22+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_margin
 #: view:product.product:0
diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py
index 4c033a4a6ca..c06c4971474 100644
--- a/addons/product_margin/product_margin.py
+++ b/addons/product_margin/product_margin.py
@@ -56,11 +56,12 @@ class product_product(osv.osv):
                     sum(l.price_unit * l.quantity)/sum(l.quantity) as avg_unit_price,
                     sum(l.quantity) as num_qty,
                     sum(l.quantity * (l.price_subtotal/l.quantity)) as total,
-                    sum(l.quantity * product.list_price) as sale_expected,
-                    sum(l.quantity * product.standard_price) as normal_cost
+                    sum(l.quantity * pt.list_price) as sale_expected,
+                    sum(l.quantity * pt.standard_price) as normal_cost
                 from account_invoice_line l
                 left join account_invoice i on (l.invoice_id = i.id)
-                left join product_template product on (product.id=l.product_id)
+                left join product_product product on (product.id=l.product_id)
+                left join product_template pt on (pt.id=product.product_tmpl_id)
                 where l.product_id = %s and i.state in %s and i.type IN %s and (i.date_invoice IS NULL or (i.date_invoice>=%s and i.date_invoice<=%s))
                 """
             invoice_types = ('out_invoice', 'in_refund')
diff --git a/addons/product_margin/test/product_margin.yml b/addons/product_margin/test/product_margin.yml
index b1dee4a423d..9252fdd52b8 100644
--- a/addons/product_margin/test/product_margin.yml
+++ b/addons/product_margin/test/product_margin.yml
@@ -6,7 +6,7 @@
     to_date: !eval "'%s-12-31' %(datetime.now().year)"
     invoice_state: open_paid
 -
-  I open margin for PC3
+  I open margin for PC-DEM
 -
   !python {model: product.margin}: |
     self.action_open_window(cr, uid, [ref("product_margin_wiz0")], {"lang": 'en_US',
diff --git a/addons/product_visible_discount/__init__.py b/addons/product_visible_discount/__init__.py
index 4abaf54aa85..b1dda0c009e 100644
--- a/addons/product_visible_discount/__init__.py
+++ b/addons/product_visible_discount/__init__.py
@@ -20,4 +20,4 @@
 
 import product_visible_discount
 
-# 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/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py
index 0bba2cca4ac..81b99b8ac0a 100644
--- a/addons/product_visible_discount/__openerp__.py
+++ b/addons/product_visible_discount/__openerp__.py
@@ -18,29 +18,28 @@
 #
 ##############################################################################
 {
-    "name": "Prices Visible Discounts",
-    "version": "1.0",
-    "author": "OpenERP SA",
+    'name': 'Prices Visible Discounts',
+    'version': '1.0',
+    'author': 'OpenERP SA',
     'category': 'Sales Management',
-    "description": """
+    'description': """
 This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.
 ===============================================================================================================
 
-To this end, a new check box named "Visible Discount" is added to the pricelist form.
+To this end, a new check box named 'Visible Discount' is added to the pricelist form.
 
-Example:
+**Example:**
     For the product PC1 and the partner "Asustek": if listprice=450, and the price
     calculated using Asustek's pricelist is 225. If the check box is checked, we
     will have on the sale order line: Unit price=450, Discount=50,00, Net price=225.
     If the check box is unchecked, we will have on Sale Order and Invoice lines:
     Unit price=225, Discount=0,00, Net price=225.
     """,
-    "depends": ["sale"],
-    "demo_xml": [],
-    "update_xml": ['product_visible_discount_view.xml'],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "001144718884654279901",
+    'depends': ["sale","purchase"],
+    'demo': [],
+    'data': ['product_visible_discount_view.xml'],
+    'auto_install': False,
+    'installable': True,
     'images': ['images/pricelists_visible_discount.jpeg'],
 }
 
diff --git a/addons/product_visible_discount/i18n/ar.po b/addons/product_visible_discount/i18n/ar.po
index 9e213203151..b1f8554473f 100644
--- a/addons/product_visible_discount/i18n/ar.po
+++ b/addons/product_visible_discount/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/bg.po b/addons/product_visible_discount/i18n/bg.po
index 59f1f99124b..3d30e4c367e 100644
--- a/addons/product_visible_discount/i18n/bg.po
+++ b/addons/product_visible_discount/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/ca.po b/addons/product_visible_discount/i18n/ca.po
index d99d679fbbf..25aa5abd621 100644
--- a/addons/product_visible_discount/i18n/ca.po
+++ b/addons/product_visible_discount/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/da.po b/addons/product_visible_discount/i18n/da.po
index 24c863de5d7..c344c19cc89 100644
--- a/addons/product_visible_discount/i18n/da.po
+++ b/addons/product_visible_discount/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/de.po b/addons/product_visible_discount/i18n/de.po
index 5aeebfc95dc..91f34e9440d 100644
--- a/addons/product_visible_discount/i18n/de.po
+++ b/addons/product_visible_discount/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/el.po b/addons/product_visible_discount/i18n/el.po
index edcd0088a9f..eadb988b6ea 100644
--- a/addons/product_visible_discount/i18n/el.po
+++ b/addons/product_visible_discount/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/es.po b/addons/product_visible_discount/i18n/es.po
index 4e7f200c2b2..c6b3d166edf 100644
--- a/addons/product_visible_discount/i18n/es.po
+++ b/addons/product_visible_discount/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/es_CR.po b/addons/product_visible_discount/i18n/es_CR.po
index b3c01ac82b6..4bc729e82fe 100644
--- a/addons/product_visible_discount/i18n/es_CR.po
+++ b/addons/product_visible_discount/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: product_visible_discount
diff --git a/addons/product_visible_discount/i18n/es_EC.po b/addons/product_visible_discount/i18n/es_EC.po
index 809308bf9f6..d44fef60a65 100644
--- a/addons/product_visible_discount/i18n/es_EC.po
+++ b/addons/product_visible_discount/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/et.po b/addons/product_visible_discount/i18n/et.po
index 55d1761e65c..c9df0895bf7 100644
--- a/addons/product_visible_discount/i18n/et.po
+++ b/addons/product_visible_discount/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/fi.po b/addons/product_visible_discount/i18n/fi.po
index 822cf0e162f..bcbbf07dd82 100644
--- a/addons/product_visible_discount/i18n/fi.po
+++ b/addons/product_visible_discount/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/fr.po b/addons/product_visible_discount/i18n/fr.po
index 50d64099f3a..24baa2779a0 100644
--- a/addons/product_visible_discount/i18n/fr.po
+++ b/addons/product_visible_discount/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/gl.po b/addons/product_visible_discount/i18n/gl.po
index d3282f879b8..54173b00a3c 100644
--- a/addons/product_visible_discount/i18n/gl.po
+++ b/addons/product_visible_discount/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/hr.po b/addons/product_visible_discount/i18n/hr.po
index 5b63d4dd687..16e7e835382 100644
--- a/addons/product_visible_discount/i18n/hr.po
+++ b/addons/product_visible_discount/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/hu.po b/addons/product_visible_discount/i18n/hu.po
index 37b562c55b9..3dad25c0574 100644
--- a/addons/product_visible_discount/i18n/hu.po
+++ b/addons/product_visible_discount/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/it.po b/addons/product_visible_discount/i18n/it.po
index 1c0a9c43734..a50c837223e 100644
--- a/addons/product_visible_discount/i18n/it.po
+++ b/addons/product_visible_discount/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/ja.po b/addons/product_visible_discount/i18n/ja.po
index ca9a71d6a1c..2ef492f0b6b 100644
--- a/addons/product_visible_discount/i18n/ja.po
+++ b/addons/product_visible_discount/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/lt.po b/addons/product_visible_discount/i18n/lt.po
new file mode 100644
index 00000000000..da70b62c1dd
--- /dev/null
+++ b/addons/product_visible_discount/i18n/lt.po
@@ -0,0 +1,62 @@
+# Lithuanian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-11-15 13:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-16 04:36+0000\n"
+"X-Generator: Launchpad (build 16272)\n"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:153
+#, python-format
+msgid "No Sale Pricelist Found!"
+msgstr ""
+
+#. module: product_visible_discount
+#: field:product.pricelist,visible_discount:0
+msgid "Visible Discount"
+msgstr "Matoma Nuolaida"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:145
+#, python-format
+msgid "No Purchase Pricelist Found!"
+msgstr "Nerastas pirkimo kainoraštis !"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Sąskaitos eilutė"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_product_pricelist
+msgid "Pricelist"
+msgstr "Kainoraštis"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:145
+#, python-format
+msgid "You must first define a pricelist on the supplier form!"
+msgstr "Pirma turite aprašyti kainoraštį tiekėjo formoje !"
+
+#. module: product_visible_discount
+#: model:ir.model,name:product_visible_discount.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Pardavimo užsakymo eilutė"
+
+#. module: product_visible_discount
+#: code:addons/product_visible_discount/product_visible_discount.py:153
+#, python-format
+msgid "You must first define a pricelist on the customer form!"
+msgstr "Pirma turite aprašyti kainoraštį pirkėjo formoje !"
diff --git a/addons/product_visible_discount/i18n/mn.po b/addons/product_visible_discount/i18n/mn.po
index acba77d71b3..83f0326ad25 100644
--- a/addons/product_visible_discount/i18n/mn.po
+++ b/addons/product_visible_discount/i18n/mn.po
@@ -14,14 +14,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
 #, python-format
 msgid "No Sale Pricelist Found!"
-msgstr ""
+msgstr "Борлуулах Үнийн Жагсаалт олдсонгүй!"
 
 #. module: product_visible_discount
 #: field:product.pricelist,visible_discount:0
@@ -32,34 +32,35 @@ msgstr "Хөнгөлөлт харагдах"
 #: code:addons/product_visible_discount/product_visible_discount.py:145
 #, python-format
 msgid "No Purchase Pricelist Found!"
-msgstr ""
+msgstr "Худалдан Авах Үнийн Жагсаалт олдсонгүй!"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Нэхэмжлэлийн мөр"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_product_pricelist
 msgid "Pricelist"
-msgstr ""
+msgstr "Үнийн жагсаалт"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:145
 #, python-format
 msgid "You must first define a pricelist on the supplier form!"
 msgstr ""
+"Эхлээд та нийлүүлэгчийн маягт дээр үнийн жагсаалтыг тодорхойлох ёстой!"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_sale_order_line
 msgid "Sales Order Line"
-msgstr ""
+msgstr "Борлуулалтын Захиалгын Мөр"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
 #, python-format
 msgid "You must first define a pricelist on the customer form!"
-msgstr ""
+msgstr "Эхлээд захиалагчийн маягт дээр үнийн жагсаалтыг тодорхойлох ёстой!"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Дэлгэцийн XML алдаатай!"
diff --git a/addons/product_visible_discount/i18n/nl.po b/addons/product_visible_discount/i18n/nl.po
index a9261996baa..bd4dd84c005 100644
--- a/addons/product_visible_discount/i18n/nl.po
+++ b/addons/product_visible_discount/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-08 10:26+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/pl.po b/addons/product_visible_discount/i18n/pl.po
index 23f15198316..18a229b0b25 100644
--- a/addons/product_visible_discount/i18n/pl.po
+++ b/addons/product_visible_discount/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/pt.po b/addons/product_visible_discount/i18n/pt.po
index bb7a1c8e653..1f30e404337 100644
--- a/addons/product_visible_discount/i18n/pt.po
+++ b/addons/product_visible_discount/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/pt_BR.po b/addons/product_visible_discount/i18n/pt_BR.po
index 468db3b9ff0..e7b458e093d 100644
--- a/addons/product_visible_discount/i18n/pt_BR.po
+++ b/addons/product_visible_discount/i18n/pt_BR.po
@@ -9,19 +9,20 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 19:35+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
 #, python-format
 msgid "No Sale Pricelist Found!"
-msgstr "Nenhuma lista de Preços de Venda encontrada!"
+msgstr "Nenhuma Lista de Preços de Venda encontrada!"
 
 #. module: product_visible_discount
 #: field:product.pricelist,visible_discount:0
diff --git a/addons/product_visible_discount/i18n/ro.po b/addons/product_visible_discount/i18n/ro.po
index af2bb063280..4c5b92a50c2 100644
--- a/addons/product_visible_discount/i18n/ro.po
+++ b/addons/product_visible_discount/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/ru.po b/addons/product_visible_discount/i18n/ru.po
index 8e8917f9ab4..a812240bb3b 100644
--- a/addons/product_visible_discount/i18n/ru.po
+++ b/addons/product_visible_discount/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/sl.po b/addons/product_visible_discount/i18n/sl.po
index 8c9f086e7c5..67564ebbdf7 100644
--- a/addons/product_visible_discount/i18n/sl.po
+++ b/addons/product_visible_discount/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/sr.po b/addons/product_visible_discount/i18n/sr.po
index 5d0a609430e..23546ada2fa 100644
--- a/addons/product_visible_discount/i18n/sr.po
+++ b/addons/product_visible_discount/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/sr@latin.po b/addons/product_visible_discount/i18n/sr@latin.po
index a88c2cdab8c..27139d31833 100644
--- a/addons/product_visible_discount/i18n/sr@latin.po
+++ b/addons/product_visible_discount/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/sv.po b/addons/product_visible_discount/i18n/sv.po
index b2564b32e11..94127ee359d 100644
--- a/addons/product_visible_discount/i18n/sv.po
+++ b/addons/product_visible_discount/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
@@ -32,7 +32,7 @@ msgstr "Synlig rabatt"
 #: code:addons/product_visible_discount/product_visible_discount.py:145
 #, python-format
 msgid "No Purchase Pricelist Found!"
-msgstr ""
+msgstr "Inköpsprislista saknas!"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_account_invoice_line
@@ -48,7 +48,7 @@ msgstr "Prislista"
 #: code:addons/product_visible_discount/product_visible_discount.py:145
 #, python-format
 msgid "You must first define a pricelist on the supplier form!"
-msgstr ""
+msgstr "Du måste först definiera en prislista i leverantörsformuläret!"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_sale_order_line
@@ -59,4 +59,4 @@ msgstr "Orderrad"
 #: code:addons/product_visible_discount/product_visible_discount.py:153
 #, python-format
 msgid "You must first define a pricelist on the customer form!"
-msgstr ""
+msgstr "Du måste först definiera en prislista i kundformuläret!"
diff --git a/addons/product_visible_discount/i18n/tr.po b/addons/product_visible_discount/i18n/tr.po
index 0eb1fe43e66..dfe04a8c91b 100644
--- a/addons/product_visible_discount/i18n/tr.po
+++ b/addons/product_visible_discount/i18n/tr.po
@@ -14,14 +14,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
 #, python-format
 msgid "No Sale Pricelist Found!"
-msgstr ""
+msgstr "Hiç Satış Fiyat Listesi Bulunamadı!"
 
 #. module: product_visible_discount
 #: field:product.pricelist,visible_discount:0
@@ -32,7 +32,7 @@ msgstr "İndirimi Göster"
 #: code:addons/product_visible_discount/product_visible_discount.py:145
 #, python-format
 msgid "No Purchase Pricelist Found!"
-msgstr ""
+msgstr "Hiç Satınalma Fiyat Listesi Bulunamadı!"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_account_invoice_line
@@ -48,7 +48,7 @@ msgstr "Fiyat Listesi"
 #: code:addons/product_visible_discount/product_visible_discount.py:145
 #, python-format
 msgid "You must first define a pricelist on the supplier form!"
-msgstr ""
+msgstr "Tedarikçi formunda önce bir fiyat listesi tanımlamalısınız!"
 
 #. module: product_visible_discount
 #: model:ir.model,name:product_visible_discount.model_sale_order_line
@@ -59,7 +59,7 @@ msgstr "Satış Siparişi Kalemi"
 #: code:addons/product_visible_discount/product_visible_discount.py:153
 #, python-format
 msgid "You must first define a pricelist on the customer form!"
-msgstr ""
+msgstr "Müşteri formunda önce bir fiyat listesi tanımlamalısınız!"
 
 #, python-format
 #~ msgid "You must first define a pricelist for Supplier !"
diff --git a/addons/product_visible_discount/i18n/vi.po b/addons/product_visible_discount/i18n/vi.po
index e8e6588e126..bb76277cd58 100644
--- a/addons/product_visible_discount/i18n/vi.po
+++ b/addons/product_visible_discount/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/i18n/zh_CN.po b/addons/product_visible_discount/i18n/zh_CN.po
index 394f06f4296..549fc05e3dc 100644
--- a/addons/product_visible_discount/i18n/zh_CN.po
+++ b/addons/product_visible_discount/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: product_visible_discount
 #: code:addons/product_visible_discount/product_visible_discount.py:153
diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py
index 48e3c4a8283..008c1f313a6 100644
--- a/addons/product_visible_discount/product_visible_discount.py
+++ b/addons/product_visible_discount/product_visible_discount.py
@@ -111,9 +111,11 @@ class account_invoice_line(osv.osv):
 
             if res_dict.get('item_id',False) and res_dict['item_id'].get(pricelist,False):
                 item = res_dict['item_id'].get(pricelist,False)
-                item_base = item_obj.read(cr, uid, [item], ['base'])[0]['base']
-                if item_base > 0:
-                    field_name = price_type_obj.browse(cr, uid, item_base).field
+                item_read = item_obj.read(cr, uid, [item], ['base'])
+                if item_read:
+                    item_base = item_read[0]['base']
+                    if item_base > 0:
+                        field_name = price_type_obj.browse(cr, uid, item_base).field
 
             product = product_obj.browse(cr, uid, product_id, context)
             product_read = product_obj.read(cr, uid, product_id, [field_name], context=context)
diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py
deleted file mode 100644
index d1055c60318..00000000000
--- a/addons/profile_tools/__openerp__.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: 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/>.
-#
-##############################################################################
-
-
-{
-    "name" : "Miscellaneous Tools",
-    "version" : "1.0",
-    "depends" : ["base", "base_setup"],
-    "author" : "OpenERP SA",
-    "category" : "Hidden/Dependency",
-    "description": """
-Installer for extra Hidden like lunch, survey, idea, share.
-===========================================================
-
-Makes the Extra Hidden Configuration available from where you can install
-modules like share, lunch, pad, idea, survey and subscription.
-    """,
-    'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
-    ],
-    'demo_xml': [],
-    'installable': True,
-    'auto_install': False,
-    'certificate' : '00557100228403879621',
-    'images': ['images/config_extra_Hidden.jpeg'],
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/profile_tools/i18n/ar.po b/addons/profile_tools/i18n/ar.po
deleted file mode 100644
index 802a9ccc097..00000000000
--- a/addons/profile_tools/i18n/ar.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-12 22:03+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Configure"
-#~ msgstr "تهيئة"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "سير الإعدادات"
-
-#~ msgid "Image"
-#~ msgstr "صورة"
-
-#~ msgid "title"
-#~ msgstr "الاسم"
diff --git a/addons/profile_tools/i18n/bg.po b/addons/profile_tools/i18n/bg.po
deleted file mode 100644
index 9f1b4af6d34..00000000000
--- a/addons/profile_tools/i18n/bg.po
+++ /dev/null
@@ -1,65 +0,0 @@
-# Bulgarian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-03-28 21:26+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian <bg@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Configure"
-#~ msgstr "Настройване"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Прогрес на настройките"
-
-#~ msgid "Survey"
-#~ msgstr "Проучване"
-
-#~ msgid "Image"
-#~ msgstr "Изображение"
-
-#~ msgid "title"
-#~ msgstr "заглавие"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Разни инструменти"
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Повтарящи се документи"
-
-#~ msgid "Ideas Box"
-#~ msgstr "Кутия с идеи"
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Настройка на допълнителни инструменти"
-
-#~ msgid "Helps to generate automatically recurring documents."
-#~ msgstr "Помага за генериране на автоматично повтарящи се документи"
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Настройка на инструменти"
-
-#~ msgid "Lunch"
-#~ msgstr "Обяд"
-
-#~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
-#~ msgstr ""
-#~ "Промотиране идеите на служителите, гласуванията и дискусиите по най-добрите "
-#~ "идеи."
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "Помага за организиране на проучванията."
-
-#~ msgid "A simple module to help you to manage Lunch orders."
-#~ msgstr "Прост модул за спмагане управлението на поръчките за обяд."
diff --git a/addons/profile_tools/i18n/ca.po b/addons/profile_tools/i18n/ca.po
deleted file mode 100644
index c94bcdc819c..00000000000
--- a/addons/profile_tools/i18n/ca.po
+++ /dev/null
@@ -1,114 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-02-12 20:58+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan <ca@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Configure"
-#~ msgstr "Configura"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Eines vàries"
-
-#~ msgid ""
-#~ "Installs tools for lunch,survey,subscription and audittrail\n"
-#~ "    module\n"
-#~ "    "
-#~ msgstr ""
-#~ "Instal·la eines per a menjar, enquesta, subscripció i auditoria\n"
-#~ "    mòdul\n"
-#~ "    "
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Documents recurrents"
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "eines_vàries.instal·lador"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progrés de la configuració"
-
-#~ msgid "Ideas Box"
-#~ msgstr "Caixa d'idees"
-
-#~ msgid "Collaborative Note Pads"
-#~ msgstr "Blocs de notes col·laboratius"
-
-#~ msgid "Survey"
-#~ msgstr "Enquesta"
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Configuració d'eines extres"
-
-#~ msgid "Configure Extra Tools"
-#~ msgstr "Configuració d'eines extres"
-
-#~ msgid "Helps to generate automatically recurring documents."
-#~ msgstr "Ajuda a generar documents recurrents automàticament."
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Configuració d'eines"
-
-#~ msgid "Image"
-#~ msgstr "Imatge"
-
-#~ msgid "Web Share"
-#~ msgstr "Comparteix Web"
-
-#~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
-#~ msgstr ""
-#~ "Promou les idees dels treballadors, la votació i el debat de les millors "
-#~ "idees."
-
-#~ msgid ""
-#~ "Allows you to give restricted access to your OpenERP documents to external "
-#~ "users, such as customers, suppliers, or accountants. You can share any "
-#~ "OpenERP Menu such as your project tasks, support requests, invoices, etc."
-#~ msgstr ""
-#~ "Us permet donar accés restringit als documents OpenERP a usuaris externs, "
-#~ "com a clients, proveïdors, o comptables. Podeu compartir qualsevol menú "
-#~ "OpenERP com les tasques del projecte, les sol·licituds de suport, factures, "
-#~ "etc"
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "Us permet organitzar enquestes."
-
-#~ msgid ""
-#~ "Extra Tools are applications that can help you improve your organization "
-#~ "although they are not key for company management."
-#~ msgstr ""
-#~ "Les eines extra són aplicacions que us poden ajudar a millorar la vostra "
-#~ "organització encara que no són claus per a la gestió de l'empresa."
-
-#~ msgid ""
-#~ "This module creates a tighter integration between a Pad instance of your "
-#~ "choosing and your OpenERP Web Client by letting you easily link pads to "
-#~ "OpenERP objects via OpenERP attachments."
-#~ msgstr ""
-#~ "Aquest mòdul crea una integració més estreta entre una instància Pad "
-#~ "seleccionada i el vostre client web d'OpenERP que us permet enllaçar "
-#~ "fàcilment pads als objectes d'OpenERP a través de fitxers adjunts OpenERP."
-
-#~ msgid "title"
-#~ msgstr "títol"
-
-#~ msgid "A simple module to help you to manage Lunch orders."
-#~ msgstr ""
-#~ "Un mòdul simple que us permet gestionar les ordres de menjar (pizzes, menús, "
-#~ "...)."
-
-#~ msgid "Lunch"
-#~ msgstr "Menjar"
diff --git a/addons/profile_tools/i18n/de.po b/addons/profile_tools/i18n/de.po
deleted file mode 100644
index 24560b5e555..00000000000
--- a/addons/profile_tools/i18n/de.po
+++ /dev/null
@@ -1,112 +0,0 @@
-# German 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: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-01-13 18:24+0000\n"
-"Last-Translator: silas <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Ideas Box"
-#~ msgstr "Betriebliche Vorschläge"
-
-#~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
-#~ msgstr "Abstimmung über Mitarbeitervorschläge"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Abfolge Konfiguration"
-
-#~ msgid "Helps to generate automatically recurring documents."
-#~ msgstr "Hilft bei der Erstellung autom. wiederkehrender Dokumente"
-
-#~ msgid "Lunch"
-#~ msgstr "Mittagessen"
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Konfiguration Werkzeuge"
-
-#~ msgid "Image"
-#~ msgstr "Bild"
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Wiederkehrende Dokumente"
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "Ermöglicht Umfragen."
-
-#~ msgid "Survey"
-#~ msgstr "Umfrage"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Sonstige Werkzeuge"
-
-#~ msgid ""
-#~ "Installs tools for lunch,survey,subscription and audittrail\n"
-#~ "    module\n"
-#~ "    "
-#~ msgstr ""
-#~ "Installationstool für die Module lunch, \n"
-#~ " survey,subscription and audittrail\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Allows you to give restricted access to your OpenERP documents to external "
-#~ "users, such as customers, suppliers, or accountants. You can share any "
-#~ "OpenERP Menu such as your project tasks, support requests, invoices, etc."
-#~ msgstr ""
-#~ "Ermöglicht die Erteilung eines eingeschränkten Zugriff auf OpenERP "
-#~ "Dokumente, z.B. für externe Benutzer, Kunden, Lieferanten oder "
-#~ "Finanzbuchhalter. Sie können jegliches OpenERP Menü, wie z.B. Aufgaben, "
-#~ "Kundendienst, Rechnungen etc. freigeben"
-
-#~ msgid ""
-#~ "This module creates a tighter integration between a Pad instance of your "
-#~ "choosing and your OpenERP Web Client by letting you easily link pads to "
-#~ "OpenERP objects via OpenERP attachments."
-#~ msgstr ""
-#~ "Dieses Modul erzeugt eine Integration zwischen  einer Etherpad Instanz Ihrer "
-#~ "Wahl und dem OpenERP Webclient. Hierdurch können Sie auf einfachem Wege Pads "
-#~ "miteinander vernetzen."
-
-#~ msgid "Web Share"
-#~ msgstr "Gemeinsames Web"
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Konfiguration Extra Anwendungen"
-
-#~ msgid "Configure"
-#~ msgstr "Konfigurieren"
-
-#~ msgid "Configure Extra Tools"
-#~ msgstr "Konfiguration Extra Anwendungen"
-
-#~ msgid "A simple module to help you to manage Lunch orders."
-#~ msgstr ""
-#~ "Eine einfache Anwendung für die Verwaltung der täglichen "
-#~ "Mitarbeiterverpflegung."
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "misc_tools.installer"
-
-#~ msgid "title"
-#~ msgstr "Titel"
-
-#~ msgid ""
-#~ "Extra Tools are applications that can help you improve your organization "
-#~ "although they are not key for company management."
-#~ msgstr ""
-#~ "Extra Werkzeuge sind kleinere, möglicherweise hilfreiche Anwendungen für Ihr "
-#~ "Unternehmen. Es handelt sich dabei nicht um Kernanwendungen von OpenERP."
-
-#~ msgid "Collaborative Note Pads"
-#~ msgstr "Online Notizblock - Pad"
diff --git a/addons/profile_tools/i18n/es.po b/addons/profile_tools/i18n/es.po
deleted file mode 100644
index 97712196478..00000000000
--- a/addons/profile_tools/i18n/es.po
+++ /dev/null
@@ -1,113 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-01-13 19:37+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Ideas Box"
-#~ msgstr "Caja de ideas"
-
-#~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
-#~ msgstr ""
-#~ "Promueve las ideas de los empleados, y la votación y el debate de las "
-#~ "mejores ideas."
-
-#~ msgid "Helps to generate automatically recurring documents."
-#~ msgstr "Ayuda a generar documentos recurrentes automáticamente."
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Configuración de herramientas"
-
-#~ msgid "Lunch"
-#~ msgstr "Comida"
-
-#~ msgid "Image"
-#~ msgstr "Imagen"
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Documentos recurrentes"
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Survey"
-#~ msgstr "Encuesta"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Herramientas varias"
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "herramientas_varias.instalador"
-
-#~ msgid "Web Share"
-#~ msgstr "Compartir Web"
-
-#~ msgid ""
-#~ "This module creates a tighter integration between a Pad instance of your "
-#~ "choosing and your OpenERP Web Client by letting you easily link pads to "
-#~ "OpenERP objects via OpenERP attachments."
-#~ msgstr ""
-#~ "En este módulo crea una integración más estrecha entre una instancia Pad "
-#~ "seleccionada y su cliente web de OpenERP que le permite enlazar fácilmente "
-#~ "pads a los objetos de OpenERP a través de archivos adjuntos OpenERP."
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Configuración de herramientas extras"
-
-#~ msgid "Configure Extra Tools"
-#~ msgstr "Configuración de herramientas extras"
-
-#~ msgid "Configure"
-#~ msgstr "Configurar"
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "Le permite organizar encuestas."
-
-#~ msgid "A simple module to help you to manage Lunch orders."
-#~ msgstr ""
-#~ "Un módulo simple que le permite gestionar las órdenes de comida (pizzas, "
-#~ "menús, ...)."
-
-#~ msgid ""
-#~ "Extra Tools are applications that can help you improve your organization "
-#~ "although they are not key for company management."
-#~ msgstr ""
-#~ "Las herramientas extra son aplicaciones que pueden ayudarle a mejorar su "
-#~ "organización aunque no son claves para la gestión de la compañía."
-
-#~ msgid "Collaborative Note Pads"
-#~ msgstr "Blocs de notas colaborativos"
-
-#~ msgid ""
-#~ "Installs tools for lunch,survey,subscription and audittrail\n"
-#~ "    module\n"
-#~ "    "
-#~ msgstr ""
-#~ "Instala herramientas para comida, encuesta, suscripción y auditoría\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Allows you to give restricted access to your OpenERP documents to external "
-#~ "users, such as customers, suppliers, or accountants. You can share any "
-#~ "OpenERP Menu such as your project tasks, support requests, invoices, etc."
-#~ msgstr ""
-#~ "Le permite dar acceso restringido a los documentos OpenERP a usuarios "
-#~ "externos, como clientes, proveedores, o contables. Puede compartir cualquier "
-#~ "menú de OpenERP como las tareas del proyecto, las solicitudes de soporte, "
-#~ "facturas, etc."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso de la configuración"
diff --git a/addons/profile_tools/i18n/es_CR.po b/addons/profile_tools/i18n/es_CR.po
deleted file mode 100644
index 51ddfdabedb..00000000000
--- a/addons/profile_tools/i18n/es_CR.po
+++ /dev/null
@@ -1,115 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-17 00:27+0000\n"
-"Last-Translator: Carlos Vásquez (CLEARCORP) "
-"<carlos.vasquez@clearcorp.co.cr>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"Language: es\n"
-
-#~ msgid "Ideas Box"
-#~ msgstr "Caja de ideas"
-
-#~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
-#~ msgstr ""
-#~ "Promueve las ideas de los empleados, y la votación y el debate de las "
-#~ "mejores ideas."
-
-#~ msgid "Helps to generate automatically recurring documents."
-#~ msgstr "Ayuda a generar documentos recurrentes automáticamente."
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Configuración de herramientas"
-
-#~ msgid "Lunch"
-#~ msgstr "Comida"
-
-#~ msgid "Image"
-#~ msgstr "Imagen"
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Documentos recurrentes"
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Survey"
-#~ msgstr "Encuesta"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Herramientas varias"
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "herramientas_varias.instalador"
-
-#~ msgid "Web Share"
-#~ msgstr "Compartir Web"
-
-#~ msgid ""
-#~ "This module creates a tighter integration between a Pad instance of your "
-#~ "choosing and your OpenERP Web Client by letting you easily link pads to "
-#~ "OpenERP objects via OpenERP attachments."
-#~ msgstr ""
-#~ "En este módulo crea una integración más estrecha entre una instancia Pad "
-#~ "seleccionada y su cliente web de OpenERP que le permite enlazar fácilmente "
-#~ "pads a los objetos de OpenERP a través de archivos adjuntos OpenERP."
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Configuración de herramientas extras"
-
-#~ msgid "Configure Extra Tools"
-#~ msgstr "Configuración de herramientas extras"
-
-#~ msgid "Configure"
-#~ msgstr "Configurar"
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "Le permite organizar encuestas."
-
-#~ msgid "A simple module to help you to manage Lunch orders."
-#~ msgstr ""
-#~ "Un módulo simple que le permite gestionar las órdenes de comida (pizzas, "
-#~ "menús, ...)."
-
-#~ msgid ""
-#~ "Extra Tools are applications that can help you improve your organization "
-#~ "although they are not key for company management."
-#~ msgstr ""
-#~ "Las herramientas extra son aplicaciones que pueden ayudarle a mejorar su "
-#~ "organización aunque no son claves para la gestión de la compañía."
-
-#~ msgid "Collaborative Note Pads"
-#~ msgstr "Blocs de notas colaborativos"
-
-#~ msgid ""
-#~ "Installs tools for lunch,survey,subscription and audittrail\n"
-#~ "    module\n"
-#~ "    "
-#~ msgstr ""
-#~ "Instala herramientas para comida, encuesta, suscripción y auditoría\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Allows you to give restricted access to your OpenERP documents to external "
-#~ "users, such as customers, suppliers, or accountants. You can share any "
-#~ "OpenERP Menu such as your project tasks, support requests, invoices, etc."
-#~ msgstr ""
-#~ "Le permite dar acceso restringido a los documentos OpenERP a usuarios "
-#~ "externos, como clientes, proveedores, o contables. Puede compartir cualquier "
-#~ "menú de OpenERP como las tareas del proyecto, las solicitudes de soporte, "
-#~ "facturas, etc."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso de la configuración"
diff --git a/addons/profile_tools/i18n/es_MX.po b/addons/profile_tools/i18n/es_MX.po
deleted file mode 100644
index ec495f0d96e..00000000000
--- a/addons/profile_tools/i18n/es_MX.po
+++ /dev/null
@@ -1,159 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-13 19:37+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: profile_tools
-#: help:misc_tools.installer,idea:0
-msgid "Promote ideas of the employees, votes and discussion on best ideas."
-msgstr ""
-"Promueve las ideas de los empleados, y la votación y el debate de las "
-"mejores ideas."
-
-#. module: profile_tools
-#: help:misc_tools.installer,share:0
-msgid ""
-"Allows you to give restricted access to your OpenERP documents to external "
-"users, such as customers, suppliers, or accountants. You can share any "
-"OpenERP Menu such as your project tasks, support requests, invoices, etc."
-msgstr ""
-"Le permite dar acceso restringido a los documentos OpenERP a usuarios "
-"externos, como clientes, proveedores, o contables. Puede compartir cualquier "
-"menú de OpenERP como las tareas del proyecto, las solicitudes de soporte, "
-"facturas, etc."
-
-#. module: profile_tools
-#: help:misc_tools.installer,lunch:0
-msgid "A simple module to help you to manage Lunch orders."
-msgstr ""
-"Un módulo simple que le permite gestionar las órdenes de comida (pizzas, "
-"menús, ...)."
-
-#. module: profile_tools
-#: field:misc_tools.installer,subscription:0
-msgid "Recurring Documents"
-msgstr "Documentos recurrentes"
-
-#. module: profile_tools
-#: model:ir.model,name:profile_tools.model_misc_tools_installer
-msgid "misc_tools.installer"
-msgstr "herramientas_varias.instalador"
-
-#. module: profile_tools
-#: model:ir.module.module,description:profile_tools.module_meta_information
-msgid ""
-"Installs tools for lunch,survey,subscription and audittrail\n"
-"    module\n"
-"    "
-msgstr ""
-"Instala herramientas para comida, encuesta, suscripción y auditoría\n"
-"    "
-
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid ""
-"Extra Tools are applications that can help you improve your organization "
-"although they are not key for company management."
-msgstr ""
-"Las herramientas extra son aplicaciones que pueden ayudarle a mejorar su "
-"organización aunque no son claves para la gestión de la compañía."
-
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: profile_tools
-#: help:misc_tools.installer,survey:0
-msgid "Allows you to organize surveys."
-msgstr "Le permite organizar encuestas."
-
-#. module: profile_tools
-#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
-msgid "Miscellaneous Tools"
-msgstr "Herramientas varias"
-
-#. module: profile_tools
-#: help:misc_tools.installer,pad:0
-msgid ""
-"This module creates a tighter integration between a Pad instance of your "
-"choosing and your OpenERP Web Client by letting you easily link pads to "
-"OpenERP objects via OpenERP attachments."
-msgstr ""
-"En este módulo crea una integración más estrecha entre una instancia Pad "
-"seleccionada y su cliente web de OpenERP que le permite enlazar fácilmente "
-"pads a los objetos de OpenERP a través de archivos adjuntos OpenERP."
-
-#. module: profile_tools
-#: field:misc_tools.installer,lunch:0
-msgid "Lunch"
-msgstr "Comida"
-
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "Extra Tools Configuration"
-msgstr "Configuración de herramientas extras"
-
-#. module: profile_tools
-#: field:misc_tools.installer,idea:0
-msgid "Ideas Box"
-msgstr "Caja de ideas"
-
-#. module: profile_tools
-#: help:misc_tools.installer,subscription:0
-msgid "Helps to generate automatically recurring documents."
-msgstr "Ayuda a generar documentos recurrentes automáticamente."
-
-#. module: profile_tools
-#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
-msgid "Tools Configuration"
-msgstr "Configuración de herramientas"
-
-#. module: profile_tools
-#: field:misc_tools.installer,pad:0
-msgid "Collaborative Note Pads"
-msgstr "Blocs de notas colaborativos"
-
-#. module: profile_tools
-#: field:misc_tools.installer,survey:0
-msgid "Survey"
-msgstr "Encuesta"
-
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "Configure Extra Tools"
-msgstr "Configuración de herramientas extras"
-
-#. module: profile_tools
-#: field:misc_tools.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso de la configuración"
-
-#. module: profile_tools
-#: field:misc_tools.installer,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: profile_tools
-#: field:misc_tools.installer,share:0
-msgid "Web Share"
-msgstr "Compartir Web"
diff --git a/addons/profile_tools/i18n/es_VE.po b/addons/profile_tools/i18n/es_VE.po
deleted file mode 100644
index ec495f0d96e..00000000000
--- a/addons/profile_tools/i18n/es_VE.po
+++ /dev/null
@@ -1,159 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-13 19:37+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: profile_tools
-#: help:misc_tools.installer,idea:0
-msgid "Promote ideas of the employees, votes and discussion on best ideas."
-msgstr ""
-"Promueve las ideas de los empleados, y la votación y el debate de las "
-"mejores ideas."
-
-#. module: profile_tools
-#: help:misc_tools.installer,share:0
-msgid ""
-"Allows you to give restricted access to your OpenERP documents to external "
-"users, such as customers, suppliers, or accountants. You can share any "
-"OpenERP Menu such as your project tasks, support requests, invoices, etc."
-msgstr ""
-"Le permite dar acceso restringido a los documentos OpenERP a usuarios "
-"externos, como clientes, proveedores, o contables. Puede compartir cualquier "
-"menú de OpenERP como las tareas del proyecto, las solicitudes de soporte, "
-"facturas, etc."
-
-#. module: profile_tools
-#: help:misc_tools.installer,lunch:0
-msgid "A simple module to help you to manage Lunch orders."
-msgstr ""
-"Un módulo simple que le permite gestionar las órdenes de comida (pizzas, "
-"menús, ...)."
-
-#. module: profile_tools
-#: field:misc_tools.installer,subscription:0
-msgid "Recurring Documents"
-msgstr "Documentos recurrentes"
-
-#. module: profile_tools
-#: model:ir.model,name:profile_tools.model_misc_tools_installer
-msgid "misc_tools.installer"
-msgstr "herramientas_varias.instalador"
-
-#. module: profile_tools
-#: model:ir.module.module,description:profile_tools.module_meta_information
-msgid ""
-"Installs tools for lunch,survey,subscription and audittrail\n"
-"    module\n"
-"    "
-msgstr ""
-"Instala herramientas para comida, encuesta, suscripción y auditoría\n"
-"    "
-
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid ""
-"Extra Tools are applications that can help you improve your organization "
-"although they are not key for company management."
-msgstr ""
-"Las herramientas extra son aplicaciones que pueden ayudarle a mejorar su "
-"organización aunque no son claves para la gestión de la compañía."
-
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: profile_tools
-#: help:misc_tools.installer,survey:0
-msgid "Allows you to organize surveys."
-msgstr "Le permite organizar encuestas."
-
-#. module: profile_tools
-#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
-msgid "Miscellaneous Tools"
-msgstr "Herramientas varias"
-
-#. module: profile_tools
-#: help:misc_tools.installer,pad:0
-msgid ""
-"This module creates a tighter integration between a Pad instance of your "
-"choosing and your OpenERP Web Client by letting you easily link pads to "
-"OpenERP objects via OpenERP attachments."
-msgstr ""
-"En este módulo crea una integración más estrecha entre una instancia Pad "
-"seleccionada y su cliente web de OpenERP que le permite enlazar fácilmente "
-"pads a los objetos de OpenERP a través de archivos adjuntos OpenERP."
-
-#. module: profile_tools
-#: field:misc_tools.installer,lunch:0
-msgid "Lunch"
-msgstr "Comida"
-
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "Extra Tools Configuration"
-msgstr "Configuración de herramientas extras"
-
-#. module: profile_tools
-#: field:misc_tools.installer,idea:0
-msgid "Ideas Box"
-msgstr "Caja de ideas"
-
-#. module: profile_tools
-#: help:misc_tools.installer,subscription:0
-msgid "Helps to generate automatically recurring documents."
-msgstr "Ayuda a generar documentos recurrentes automáticamente."
-
-#. module: profile_tools
-#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
-msgid "Tools Configuration"
-msgstr "Configuración de herramientas"
-
-#. module: profile_tools
-#: field:misc_tools.installer,pad:0
-msgid "Collaborative Note Pads"
-msgstr "Blocs de notas colaborativos"
-
-#. module: profile_tools
-#: field:misc_tools.installer,survey:0
-msgid "Survey"
-msgstr "Encuesta"
-
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "Configure Extra Tools"
-msgstr "Configuración de herramientas extras"
-
-#. module: profile_tools
-#: field:misc_tools.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso de la configuración"
-
-#. module: profile_tools
-#: field:misc_tools.installer,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: profile_tools
-#: view:misc_tools.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: profile_tools
-#: field:misc_tools.installer,share:0
-msgid "Web Share"
-msgstr "Compartir Web"
diff --git a/addons/profile_tools/i18n/fi.po b/addons/profile_tools/i18n/fi.po
deleted file mode 100644
index 8d3829b15cc..00000000000
--- a/addons/profile_tools/i18n/fi.po
+++ /dev/null
@@ -1,73 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-06-22 09:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Sekalaiset työkalut"
-
-#~ msgid "A simple module to help you to manage Lunch orders."
-#~ msgstr "yksinkertainen moduuli lounastilausten hallintaan."
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "Mahdollistaa kyselyjen organisoinnin."
-
-#~ msgid "Configure"
-#~ msgstr "Konfiguroi"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Konfiguraation eteneminen"
-
-#~ msgid "Ideas Box"
-#~ msgstr "Idealaatikkoa"
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Ylimääräisten työkalujen konfiguaatio"
-
-#~ msgid "Configure Extra Tools"
-#~ msgstr "Konfiguroi ylimääräiset työkalut"
-
-#~ msgid "Lunch"
-#~ msgstr "Lunch"
-
-#~ msgid "Helps to generate automatically recurring documents."
-#~ msgstr "Auttaa luomaan toistuvia automaattisia dokumentteja."
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Työkalujen konfigurointi"
-
-#~ msgid "Collaborative Note Pads"
-#~ msgstr "Yhteiset muistiinpanot"
-
-#~ msgid "Survey"
-#~ msgstr "Kysely"
-
-#~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
-#~ msgstr ""
-#~ "Edistää työntekijöiden ideoita, äänestystä ja keskustelua parhaista ideoista."
-
-#~ msgid "Image"
-#~ msgstr "Kuva"
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Toistuvat dokumentit"
-
-#~ msgid "title"
-#~ msgstr "otsikko"
-
-#~ msgid "Web Share"
-#~ msgstr "Nettijako"
diff --git a/addons/profile_tools/i18n/fr.po b/addons/profile_tools/i18n/fr.po
deleted file mode 100644
index fd0842b43e4..00000000000
--- a/addons/profile_tools/i18n/fr.po
+++ /dev/null
@@ -1,114 +0,0 @@
-# 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: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-01-13 14:33+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Ideas Box"
-#~ msgstr "Boite à idées"
-
-#~ msgid "Helps to generate automatically recurring documents."
-#~ msgstr "Vous aide à générer automatiquement vos documents récurrents."
-
-#~ msgid "Image"
-#~ msgstr "Image"
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Configuration des outils"
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Documents récurrents"
-
-#~ msgid "title"
-#~ msgstr "Titre"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Avancement de la configuration"
-
-#~ msgid "Survey"
-#~ msgstr "Sondage"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Outils divers"
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "Vous permet d'organiser des sondages"
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "misc_tools.installer"
-
-#~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
-#~ msgstr ""
-#~ "Encouragez les idées de vos employés, votez et discutez autour des "
-#~ "meilleures idées."
-
-#~ msgid ""
-#~ "Allows you to give restricted access to your OpenERP documents to external "
-#~ "users, such as customers, suppliers, or accountants. You can share any "
-#~ "OpenERP Menu such as your project tasks, support requests, invoices, etc."
-#~ msgstr ""
-#~ "Vous permet de donner des accès restreints sur vos documents OpenERP à des "
-#~ "utilisateurs externes, comme des clients, des fournisseurs ou des "
-#~ "comptables. Vous pouvez partager n'importe quel menu d'OpenERP comme par "
-#~ "exemple vos tâches de projet, vos demandes d'intervention, vos factures, "
-#~ "etc..."
-
-#~ msgid "Collaborative Note Pads"
-#~ msgstr "Pads collaboratifs"
-
-#~ msgid ""
-#~ "Installs tools for lunch,survey,subscription and audittrail\n"
-#~ "    module\n"
-#~ "    "
-#~ msgstr ""
-#~ "Installe des outils pour les modules de repas, sondage, inscription\n"
-#~ "    et audit\n"
-#~ "    "
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Configuration des outils supplémentaires"
-
-#~ msgid "Configure"
-#~ msgstr "Configurer"
-
-#~ msgid "Configure Extra Tools"
-#~ msgstr "Configurez les outils supplémentaires"
-
-#~ msgid "Lunch"
-#~ msgstr "Repas"
-
-#~ msgid "A simple module to help you to manage Lunch orders."
-#~ msgstr "Un module simple pour vous aider à gérer les commandes de repas."
-
-#~ msgid ""
-#~ "This module creates a tighter integration between a Pad instance of your "
-#~ "choosing and your OpenERP Web Client by letting you easily link pads to "
-#~ "OpenERP objects via OpenERP attachments."
-#~ msgstr ""
-#~ "Ce module crée une plus forte intégration entre une instance de pad de votre "
-#~ "choix et votre client Web OpenERP en vous permettant d'associer facilement "
-#~ "des pads aux objets OpenERP avec les pièces jointes OpenERP."
-
-#~ msgid "Web Share"
-#~ msgstr "Partage web"
-
-#~ msgid ""
-#~ "Extra Tools are applications that can help you improve your organization "
-#~ "although they are not key for company management."
-#~ msgstr ""
-#~ "Applications qui peuvent vous aider à améliorer votre organisation même "
-#~ "s'ils ne sont pas importants pour la gestion de la société."
diff --git a/addons/profile_tools/i18n/gl.po b/addons/profile_tools/i18n/gl.po
deleted file mode 100644
index f551098af75..00000000000
--- a/addons/profile_tools/i18n/gl.po
+++ /dev/null
@@ -1,112 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-05-10 14:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Galician <gl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
-#~ msgstr ""
-#~ "Promove as ideas dos empregados, e a votación e o debate das mellores ideas."
-
-#~ msgid "Configure"
-#~ msgstr "Configurar"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Ferramentas varias"
-
-#~ msgid ""
-#~ "Installs tools for lunch,survey,subscription and audittrail\n"
-#~ "    module\n"
-#~ "    "
-#~ msgstr ""
-#~ "Instala ferramentas para comida, enquisa, suscrición e auditoría\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Allows you to give restricted access to your OpenERP documents to external "
-#~ "users, such as customers, suppliers, or accountants. You can share any "
-#~ "OpenERP Menu such as your project tasks, support requests, invoices, etc."
-#~ msgstr ""
-#~ "Permítelle dar acceso restrinxido ós documentos OpenERP a usuarios externos, "
-#~ "como clientes, provedores, ou contables. Pode compartir calquera menú de "
-#~ "OpenERP como as tarefas do proxecto, as solicitudes de soporte, facturas, "
-#~ "etc."
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "Permítelle organizar enquisas."
-
-#~ msgid ""
-#~ "Extra Tools are applications that can help you improve your organization "
-#~ "although they are not key for company management."
-#~ msgstr ""
-#~ "As ferramentas extra son aplicacións que lle poden axudar a mellorar a súa "
-#~ "organización aínda que non son clave para a xestión da compañía."
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Documentos recorrentes"
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "ferramentas_varias.instalador"
-
-#~ msgid "A simple module to help you to manage Lunch orders."
-#~ msgstr ""
-#~ "Un módulo simple que lle permite xestionar as ordes de comida (pizzas, "
-#~ "menús, ...)."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progreso da configuración"
-
-#~ msgid "Ideas Box"
-#~ msgstr "Caixa de ideas"
-
-#~ msgid "Collaborative Note Pads"
-#~ msgstr "Blocs de notas colaborativos"
-
-#~ msgid "Survey"
-#~ msgstr "Enquisa"
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Configuración de ferramentas extras"
-
-#~ msgid "Lunch"
-#~ msgstr "Xantar"
-
-#~ msgid "Helps to generate automatically recurring documents."
-#~ msgstr "Axuda a xerar documentos recorrentes automaticamente."
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Configuración de ferramentas"
-
-#~ msgid "Configure Extra Tools"
-#~ msgstr "Configuración de ferramentas extras"
-
-#~ msgid ""
-#~ "This module creates a tighter integration between a Pad instance of your "
-#~ "choosing and your OpenERP Web Client by letting you easily link pads to "
-#~ "OpenERP objects via OpenERP attachments."
-#~ msgstr ""
-#~ "Neste módulo crea unha integración máis estreita entre un exemplo Pad "
-#~ "seleccionado e o seu cliente web de OpenERP que lle permite enlazar "
-#~ "facilmente pads ós obxectos de OpenERP a través de arquivos adxuntos OpenERP."
-
-#~ msgid "Image"
-#~ msgstr "Imaxe"
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Web Share"
-#~ msgstr "Compartir Web"
diff --git a/addons/profile_tools/i18n/hr.po b/addons/profile_tools/i18n/hr.po
deleted file mode 100644
index 11acbc28cb6..00000000000
--- a/addons/profile_tools/i18n/hr.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-12-12 10:10+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
-"Language-Team: Croatian <hr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Razni alati"
-
-#~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
-#~ msgstr ""
-#~ "Promoviranje ideja zaposlenika, glasovanje i rasprava o najboljim idejama."
-
-#~ msgid "Configure"
-#~ msgstr "Podešavanje"
-
-#~ msgid ""
-#~ "Allows you to give restricted access to your OpenERP documents to external "
-#~ "users, such as customers, suppliers, or accountants. You can share any "
-#~ "OpenERP Menu such as your project tasks, support requests, invoices, etc."
-#~ msgstr ""
-#~ "Dopušta vam davanje ograničenog pristupa vašim OpenERP dokumentima vanjskim "
-#~ "korisnicima, poput kupaca, dobavljača ili računovođe. Možete podjeliti bilo "
-#~ "koji OpenERP izbornik poput zadatka projekta, zahtejvi za podrškom, računi, "
-#~ "itd."
-
-#~ msgid ""
-#~ "Extra Tools are applications that can help you improve your organization "
-#~ "although they are not key for company management."
-#~ msgstr ""
-#~ "Dodatni alati su aplikacije koje vam mogu pomoći u poboljšanju organizacije "
-#~ "iako nisu ključni za upravljanje društvom."
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Ponavljajući dokumenti"
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "misc_tools.installer"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Napredak konfiguracije"
-
-#~ msgid "Ideas Box"
-#~ msgstr "Kutija za ideje"
-
-#~ msgid "Survey"
-#~ msgstr "Upitnik"
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Podešavanje dodatnih alata"
-
-#~ msgid "Helps to generate automatically recurring documents."
-#~ msgstr "Pomaže u generiranju automatskih ponavljajućih dokumenata"
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Podešavanje alata"
-
-#~ msgid "Image"
-#~ msgstr "Slika"
-
-#~ msgid "title"
-#~ msgstr "naziv"
-
-#~ msgid "Web Share"
-#~ msgstr "Djeljenje na webu"
-
-#~ msgid ""
-#~ "Installs tools for lunch,survey,subscription and audittrail\n"
-#~ "    module\n"
-#~ "    "
-#~ msgstr ""
-#~ "Instaliraj alate za lansiranje, upitnike, pretplatu i audittrail modul\n"
-#~ "    "
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "Omogućuje organiziranje istraživanja"
diff --git a/addons/profile_tools/i18n/hu.po b/addons/profile_tools/i18n/hu.po
deleted file mode 100644
index 9da7a8e83df..00000000000
--- a/addons/profile_tools/i18n/hu.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * profile_tools
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-01-25 08:50+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Configure"
-#~ msgstr "Beállítás"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Vegyes eszközök"
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Ismétlődő dokumentumok"
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "misc_tools.installer"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Folyamat beállítása"
-
-#~ msgid "Ideas Box"
-#~ msgstr "Ötletdoboz"
-
-#~ msgid "Survey"
-#~ msgstr "Felmérés"
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Extra eszközök beállítása"
-
-#~ msgid "Lunch"
-#~ msgstr "Ebéd"
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Eszközök beállítása"
diff --git a/addons/profile_tools/i18n/it.po b/addons/profile_tools/i18n/it.po
deleted file mode 100644
index 647b346f92f..00000000000
--- a/addons/profile_tools/i18n/it.po
+++ /dev/null
@@ -1,70 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-01-13 23:07+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Configure"
-#~ msgstr "Configura"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Strumenti vari"
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "Permette di organizzare sondaggi."
-
-#~ msgid ""
-#~ "Extra Tools are applications that can help you improve your organization "
-#~ "although they are not key for company management."
-#~ msgstr ""
-#~ "Gli strumenti extra sono applicazioni che possono aiutare a migliorare "
-#~ "l'organizzazione, anche se non sono fondamentali per la gestione aziendale."
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "misc_tools.installer"
-
-#~ msgid "A simple module to help you to manage Lunch orders."
-#~ msgstr "Un semplice modulo che aiuta nella gestione ordini pasto."
-
-#~ msgid "Ideas Box"
-#~ msgstr "Cassetta idee"
-
-#~ msgid "Collaborative Note Pads"
-#~ msgstr "Blocco note collaborativo"
-
-#~ msgid "Survey"
-#~ msgstr "Sondaggio"
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Configurazione strumenti extra"
-
-#~ msgid "Configure Extra Tools"
-#~ msgstr "Configura strumenti extra"
-
-#~ msgid "Lunch"
-#~ msgstr "Pranzo"
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Configurazione strumenti"
-
-#~ msgid "Image"
-#~ msgstr "Immagine"
-
-#~ msgid "title"
-#~ msgstr "titolo"
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Documenti Ricorrenti"
diff --git a/addons/profile_tools/i18n/mn.po b/addons/profile_tools/i18n/mn.po
deleted file mode 100644
index d0ac9d24950..00000000000
--- a/addons/profile_tools/i18n/mn.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# Mongolian 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: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2010-12-21 13:52+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Тохиргооны Хэрэгслүүд"
-
-#~ msgid "title"
-#~ msgstr "гарчиг"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Тохиргооны явц"
-
-#~ msgid "Survey"
-#~ msgstr "Санал асуулга"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Төрөл бүрийн Хэрэгслүүд"
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "misc_tools.installer"
-
-#~ msgid "Web Share"
-#~ msgstr "Web Share"
diff --git a/addons/profile_tools/i18n/nl.po b/addons/profile_tools/i18n/nl.po
deleted file mode 100644
index 7b24710ef8a..00000000000
--- a/addons/profile_tools/i18n/nl.po
+++ /dev/null
@@ -1,111 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-01-27 16:05+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
-#~ msgstr ""
-#~ "Ideeën van medewerkers bevorderen, stemmen en discussiëren over de beste "
-#~ "ideeën."
-
-#~ msgid ""
-#~ "Extra Tools are applications that can help you improve your organization "
-#~ "although they are not key for company management."
-#~ msgstr ""
-#~ "Extra tools zijn applicaties die u kunnen helpen uw organisatie te "
-#~ "verbeteren al zijn ze niet wezenlijk voor het bedrijfsproces."
-
-#~ msgid "Configure"
-#~ msgstr "Configureren"
-
-#~ msgid ""
-#~ "Installs tools for lunch,survey,subscription and audittrail\n"
-#~ "    module\n"
-#~ "    "
-#~ msgstr ""
-#~ "Installeert tools voor lunch, enquête, abonnement en audittrail\n"
-#~ "    module\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Allows you to give restricted access to your OpenERP documents to external "
-#~ "users, such as customers, suppliers, or accountants. You can share any "
-#~ "OpenERP Menu such as your project tasks, support requests, invoices, etc."
-#~ msgstr ""
-#~ "Laat u beperkte toegang tot uw OpenERP documenten geven aan externe "
-#~ "gebruikers, zoals klanten, leveranciers of accountants. U kunt elk OpenERP "
-#~ "menu delen, zoals project taken, incidenten, facturen, etc."
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "Laat u enquêtes organiseren."
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Herhalende documenten"
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "misc_tools.installer"
-
-#~ msgid "A simple module to help you to manage Lunch orders."
-#~ msgstr "Een eenvoudige module voor het beheer van lunch opdrachten."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Configuratievoortgang"
-
-#~ msgid "Ideas Box"
-#~ msgstr "Ideënbus"
-
-#~ msgid "Collaborative Note Pads"
-#~ msgstr "Gemeenschappelijke notitie pads"
-
-#~ msgid "Survey"
-#~ msgstr "Enquête"
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Extra tools configuratie"
-
-#~ msgid "Configure Extra Tools"
-#~ msgstr "Extra tools configureren"
-
-#~ msgid "Lunch"
-#~ msgstr "Lunch"
-
-#~ msgid "Helps to generate automatically recurring documents."
-#~ msgstr "Helpt bij het genereren van automatisch  terugkerende documenten"
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Tools configuratie"
-
-#~ msgid ""
-#~ "This module creates a tighter integration between a Pad instance of your "
-#~ "choosing and your OpenERP Web Client by letting you easily link pads to "
-#~ "OpenERP objects via OpenERP attachments."
-#~ msgstr ""
-#~ "Deze module zorgt voor een verdere integratie tussen een Pad document en de "
-#~ "OpenERP web client door eenvoudig pads te koppelen met OpenERP objecten via "
-#~ "OpenERP bijlagen."
-
-#~ msgid "Image"
-#~ msgstr "Afbeelding"
-
-#~ msgid "title"
-#~ msgstr "titel"
-
-#~ msgid "Web Share"
-#~ msgstr "Web delen"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Diverse hulpmiddelen"
diff --git a/addons/profile_tools/i18n/profile_tools.pot b/addons/profile_tools/i18n/profile_tools.pot
deleted file mode 100644
index e4df33e91c0..00000000000
--- a/addons/profile_tools/i18n/profile_tools.pot
+++ /dev/null
@@ -1,19 +0,0 @@
-# Translations template for PROJECT.
-# Copyright (C) 2012 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
-
diff --git a/addons/profile_tools/i18n/pt.po b/addons/profile_tools/i18n/pt.po
deleted file mode 100644
index 43aad05c72c..00000000000
--- a/addons/profile_tools/i18n/pt.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2010-12-09 09:56+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Image"
-#~ msgstr "Imagem"
-
-#~ msgid "Lunch"
-#~ msgstr "Almoço"
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progresso da configuração"
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "misc_tools.installer"
diff --git a/addons/profile_tools/i18n/pt_BR.po b/addons/profile_tools/i18n/pt_BR.po
deleted file mode 100644
index 588f85bf3b1..00000000000
--- a/addons/profile_tools/i18n/pt_BR.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-03-08 21:01+0000\n"
-"Last-Translator: Emerson <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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Configure"
-#~ msgstr "Configurar"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Ferramentas Diversas"
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "misc_tools.installer"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progresso da Configuração"
-
-#~ msgid "Survey"
-#~ msgstr "Pesquisa"
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Configuração de Ferramentas Extras"
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Configuração de Ferramentas"
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "Permite que você organize pesquisas (questionários)."
-
-#~ msgid "Configure Extra Tools"
-#~ msgstr "Configurar Ferramentas Extras"
-
-#~ msgid "Image"
-#~ msgstr "Imagem"
-
-#~ msgid "title"
-#~ msgstr "título"
-
-#~ msgid "Helps to generate automatically recurring documents."
-#~ msgstr "Auxilia na geração automática de documentos recorrentes."
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Documentos Recorrentes"
diff --git a/addons/profile_tools/i18n/ro.po b/addons/profile_tools/i18n/ro.po
deleted file mode 100644
index 7cf2b62da23..00000000000
--- a/addons/profile_tools/i18n/ro.po
+++ /dev/null
@@ -1,112 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-11 21:57+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
-#~ msgstr ""
-#~ "Incurajează ideile angajatilor, voturi si discutii pe baza celor mai bune "
-#~ "idei."
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Unelte diverse"
-
-#~ msgid ""
-#~ "Installs tools for lunch,survey,subscription and audittrail\n"
-#~ "    module\n"
-#~ "    "
-#~ msgstr ""
-#~ "Instalează unelte pentru modulul pranz, sondaj, abonament si pistă de audit\n"
-#~ "    "
-
-#~ msgid ""
-#~ "Allows you to give restricted access to your OpenERP documents to external "
-#~ "users, such as customers, suppliers, or accountants. You can share any "
-#~ "OpenERP Menu such as your project tasks, support requests, invoices, etc."
-#~ msgstr ""
-#~ "Vă permite să acordati acces restrictionat utilizatorilor externi la "
-#~ "documentele dumneavoastră OpenERP, cum ar fi clienti, furnizori, sau "
-#~ "contabili. Puteti impărtăsi orice meniu OpenERP, precum sarcini de proiecte, "
-#~ "cereri de asistentă tehnică, facturi, etc."
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "Vă permite să organizati sondaje."
-
-#~ msgid "Configure"
-#~ msgstr "Configurează"
-
-#~ msgid ""
-#~ "Extra Tools are applications that can help you improve your organization "
-#~ "although they are not key for company management."
-#~ msgstr ""
-#~ "Extra Tools (Unelte suplimentare) sunt aplicatii care vă pot ajuta să vă "
-#~ "imbunătătiti organizarea, desi ele nu sunt foarte importante pentru "
-#~ "managementul companiei."
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Documente recurente"
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "misc_tools.installer (program de instalare.unelte_diverse)"
-
-#~ msgid "A simple module to help you to manage Lunch orders."
-#~ msgstr "Un modul simplu care să vă ajute la gestionarea comenzilor de pranz."
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Progres configurare"
-
-#~ msgid "Ideas Box"
-#~ msgstr "Casetă Idei"
-
-#~ msgid "Collaborative Note Pads"
-#~ msgstr "Notă pad colaborativă"
-
-#~ msgid "Survey"
-#~ msgstr "Sondaj"
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Configurare Unelte Suplimentare"
-
-#~ msgid "Configure Extra Tools"
-#~ msgstr "Configurează Uneltele Suplimentare"
-
-#~ msgid "Lunch"
-#~ msgstr "Prânz"
-
-#~ msgid "Helps to generate automatically recurring documents."
-#~ msgstr "Ajută la generarea automată de documente recurente."
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Configurare unelte"
-
-#~ msgid ""
-#~ "This module creates a tighter integration between a Pad instance of your "
-#~ "choosing and your OpenERP Web Client by letting you easily link pads to "
-#~ "OpenERP objects via OpenERP attachments."
-#~ msgstr ""
-#~ "Acest modul creează o integrare mai compactă intre o instantă Pad la alegere "
-#~ "si Clientul Web OpenERP permitandu-vă să legati cu usurintă pad-uri de "
-#~ "obiecte OpenERP prin atasamentele OpenERP."
-
-#~ msgid "Image"
-#~ msgstr "Imagine"
-
-#~ msgid "title"
-#~ msgstr "titlu"
-
-#~ msgid "Web Share"
-#~ msgstr "Partajare web"
diff --git a/addons/profile_tools/i18n/ru.po b/addons/profile_tools/i18n/ru.po
deleted file mode 100644
index a43a40ec333..00000000000
--- a/addons/profile_tools/i18n/ru.po
+++ /dev/null
@@ -1,91 +0,0 @@
-# Russian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-04-23 20:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Configure"
-#~ msgstr "Настройки"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "Разные инструменты"
-
-#~ msgid "Recurring Documents"
-#~ msgstr "Повторяющийся документ"
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "misc_tools.installer"
-
-#~ msgid "Survey"
-#~ msgstr "Опрос"
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "Дополнительные инструменты настройки"
-
-#~ msgid "Configure Extra Tools"
-#~ msgstr "Настроить дополнительные инструменты"
-
-#~ msgid "Tools Configuration"
-#~ msgstr "Средства настройки"
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "Позволяет организовать опросы."
-
-#~ msgid "Helps to generate automatically recurring documents."
-#~ msgstr "Помогает генерировать автоматически повторяющиеся документы."
-
-#~ msgid "Image"
-#~ msgstr "Изображение"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "Выполнение настройки"
-
-#~ msgid "Ideas Box"
-#~ msgstr "Копилка идей"
-
-#~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
-#~ msgstr ""
-#~ "Продвигайте идеи сотрудников, организуйте голосования и обсуждение лучших "
-#~ "идей."
-
-#~ msgid "Collaborative Note Pads"
-#~ msgstr "Заметки с общим доступом"
-
-#~ msgid ""
-#~ "Allows you to give restricted access to your OpenERP documents to external "
-#~ "users, such as customers, suppliers, or accountants. You can share any "
-#~ "OpenERP Menu such as your project tasks, support requests, invoices, etc."
-#~ msgstr ""
-#~ "Позволяет предоставить ограниченный доступ к документам из OpenERP для "
-#~ "сторонних пользователей, например заказчиков, поставщиков, или бухгалтеров. "
-#~ "Можно предоставить доступ к любому меню OpenERP: задачам проекта, запросам "
-#~ "поддержки, счетам и т.д."
-
-#~ msgid "A simple module to help you to manage Lunch orders."
-#~ msgstr "Простой модуль, помогающий управлять заказами на ланч."
-
-#~ msgid ""
-#~ "Extra Tools are applications that can help you improve your organization "
-#~ "although they are not key for company management."
-#~ msgstr ""
-#~ "Дополнительные инструменты - приложения, позволяющие улучшить работу, при "
-#~ "этом не являющиеся ключевыми для управления организацией."
-
-#~ msgid "Lunch"
-#~ msgstr "Ланч"
-
-#~ msgid "title"
-#~ msgstr "title"
diff --git a/addons/profile_tools/i18n/zh_CN.po b/addons/profile_tools/i18n/zh_CN.po
deleted file mode 100644
index 19f22e54715..00000000000
--- a/addons/profile_tools/i18n/zh_CN.po
+++ /dev/null
@@ -1,101 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-07-13 16:26+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#~ msgid "Miscellaneous Tools"
-#~ msgstr "各种工具"
-
-#~ msgid "Promote ideas of the employees, votes and discussion on best ideas."
-#~ msgstr "推广员工的创意，对最佳创意投票和讨论"
-
-#~ msgid "Configure"
-#~ msgstr "设置"
-
-#~ msgid ""
-#~ "Allows you to give restricted access to your OpenERP documents to external "
-#~ "users, such as customers, suppliers, or accountants. You can share any "
-#~ "OpenERP Menu such as your project tasks, support requests, invoices, etc."
-#~ msgstr ""
-#~ "允许你给外部用户如客户、供应商或会计师有限的权限访问OpenERP的对象。可以共享任何OpenERP菜单，比如你的项目任务，支持请求，发票等"
-
-#~ msgid "Allows you to organize surveys."
-#~ msgstr "允许组织调查问卷"
-
-#~ msgid ""
-#~ "Extra Tools are applications that can help you improve your organization "
-#~ "although they are not key for company management."
-#~ msgstr "这些工具不是公司管理必须的但可以帮你改善组织。"
-
-#~ msgid "Recurring Documents"
-#~ msgstr "周期性凭证"
-
-#~ msgid "misc_tools.installer"
-#~ msgstr "misc_tools.installer"
-
-#~ msgid "A simple module to help you to manage Lunch orders."
-#~ msgstr "一个简单的模块用于管理午饭订餐。"
-
-#~ msgid "Configuration Progress"
-#~ msgstr "设置进度"
-
-#~ msgid "Collaborative Note Pads"
-#~ msgstr "协作记事本"
-
-#~ msgid "Survey"
-#~ msgstr "问卷"
-
-#~ msgid "Lunch"
-#~ msgstr "午餐"
-
-#~ msgid "Helps to generate automatically recurring documents."
-#~ msgstr "帮助生成周期性凭证"
-
-#~ msgid ""
-#~ "This module creates a tighter integration between a Pad instance of your "
-#~ "choosing and your OpenERP Web Client by letting you easily link pads to "
-#~ "OpenERP objects via OpenERP attachments."
-#~ msgstr "此模块紧密集成了你选择的记事本和OpenERP的网页客户端。利用OpenERP的附件你可以轻松地把记事本和OpenERP的对象联系起来。"
-
-#~ msgid "Image"
-#~ msgstr "图片"
-
-#~ msgid "title"
-#~ msgstr "标题"
-
-#~ msgid ""
-#~ "Installs tools for lunch,survey,subscription and audittrail\n"
-#~ "    module\n"
-#~ "    "
-#~ msgstr ""
-#~ "安装一些工具类的模块，如午餐、调查问卷、周期性凭证和审计跟踪之类。\n"
-#~ "    "
-
-#~ msgid "Ideas Box"
-#~ msgstr "创意"
-
-#~ msgid "Extra Tools Configuration"
-#~ msgstr "附加工具设置"
-
-#~ msgid "Configure Extra Tools"
-#~ msgstr "设置附加的工具"
-
-#~ msgid "Tools Configuration"
-#~ msgstr "工具设置"
-
-#~ msgid "Web Share"
-#~ msgstr "共享"
diff --git a/addons/profile_tools/security/ir.model.access.csv b/addons/profile_tools/security/ir.model.access.csv
deleted file mode 100644
index 4a08a4aa60d..00000000000
--- a/addons/profile_tools/security/ir.model.access.csv
+++ /dev/null
@@ -1 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/profile_tools/static/src/img/icon.png b/addons/profile_tools/static/src/img/icon.png
deleted file mode 100644
index d6ba0866777..00000000000
Binary files a/addons/profile_tools/static/src/img/icon.png and /dev/null differ
diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py
index a65497c311e..85e33be777a 100644
--- a/addons/project/__openerp__.py
+++ b/addons/project/__openerp__.py
@@ -46,15 +46,19 @@
         'web_kanban'
     ],
     'description': """
-Project Management module tracks multi-level projects, tasks, work done on tasks.
-=================================================================================
+Track multi-level projects, tasks, work done on tasks
+=====================================================
 
-It is able to render planning, order tasks.
+This application allows an operational project management system to organize your activities into tasks and plan the work you need to get the tasks completed.
 
-Dashboard for project management that includes:
------------------------------------------------
-    * List of My Open Tasks
-    * Graph of My Remaining Hours by Project
+Gantt diagrams will give you a graphical representation of your project plans, as well as resources availability and workload.
+
+Dashboard / Reports for Project Management will include:
+--------------------------------------------------------
+* My Tasks
+* Open Tasks
+* Tasks Analysis
+* Cumulative Flow
     """,
     'data': [
         'security/project_security.xml',
@@ -70,10 +74,8 @@ Dashboard for project management that includes:
         'board_project_view.xml',
         'res_config_view.xml',
     ],
-    'demo': [
-        'project_demo.xml',
-    ],
-    'test':[
+    'demo': ['project_demo.xml'],
+    'test': [
         'test/project_demo.yml',
         'test/project_process.yml',
         'test/task_process.yml',
@@ -83,6 +85,5 @@ Dashboard for project management that includes:
     'application': True,
     'css': ['static/src/css/project.css'],
     'js': ['static/src/js/project.js'],
-    'certificate': '0075116868317',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 2023ba5a0b9..931c661d211 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -16,7 +16,7 @@
                     <field name="effective_hours" widget="float_time"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
+                    <field name="state" invisible="1"/>
                 </tree>
             </field>
         </record>
diff --git a/addons/project/i18n/ar.po b/addons/project/i18n/ar.po
index c34459215f4..ecf23d56050 100644
--- a/addons/project/i18n/ar.po
+++ b/addons/project/i18n/ar.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:46+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "New tasks"
-msgstr ""
+msgstr "مهام جديدة"
 
 #. module: project
 #: help:project.task.delegate,new_task_description:0
@@ -108,7 +108,7 @@ msgstr "ساعات التحقق من الصلاحية"
 #. module: project
 #: view:project.project:0
 msgid "Pending Projects"
-msgstr ""
+msgstr "مشاريع قيد الإنتظار"
 
 #. module: project
 #: help:project.task,remaining_hours:0
@@ -190,7 +190,7 @@ msgstr "شركة"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Pending tasks"
-msgstr ""
+msgstr "مهام قيد التنقيذ"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -257,7 +257,7 @@ msgstr "يوم"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "المشاريع و المراحل"
 
 #. module: project
 #: view:project.project:0
@@ -293,7 +293,7 @@ msgstr "فتح المهامات الخاصة بي"
 #, python-format
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
-msgstr ""
+msgstr "يرجى تحديد مدير المشروع أو عنوان البريد الإلكتروني لمدير المشروع."
 
 #. module: project
 #: view:project.task:0
@@ -361,7 +361,7 @@ msgstr "المتغيرات التلقائية للرؤوس والتذييل. ا
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "اظهار المهام فقط التي لها زمن نهائي"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -384,7 +384,7 @@ msgstr "رأس البريد"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "التغير للمرحلة القادمة"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -492,7 +492,7 @@ msgstr " (نسخ)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "مهام جديدة"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
@@ -557,13 +557,13 @@ msgstr "# من الايام"
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "فتح المشاريع"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "يجب تعيين أعضاء في المشروع '%s' !"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -641,7 +641,7 @@ msgstr "وسط"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "مهام قيد الإنتظار"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -682,7 +682,7 @@ msgstr "معلومات"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Unassigned Tasks"
-msgstr ""
+msgstr "مهام غير معينة"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -789,6 +789,7 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"لا يمكنك حذف المهام المحتواة في المشروع. انا اقترح لك جعلها غير نشطة."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -813,7 +814,7 @@ msgstr "ساعات تأخير"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "شديد الأهمية"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -834,6 +835,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"إذا قمت بتحديد هذا الحقل فإن مدير المشروع سوف يتلقى رسالة بريد إلكتروني في "
+"كل مرة يتم الانتهاء من المهمة لفريقه."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -867,7 +870,7 @@ msgstr "مراحل"
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "التغيير للمرحلة السابقة"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
@@ -910,7 +913,7 @@ msgstr "الرئيسي"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "تحدد كمحظورة"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -999,7 +1002,7 @@ msgstr "الساعات المخططة"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "استعراض مراحل المهمة"
 
 #. module: project
 #: view:project.project:0
@@ -1009,7 +1012,7 @@ msgstr "الحالات: %(الحالة)"
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "يعطي النظام تسلسل عند عرض قائمة المهام."
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1021,7 +1024,7 @@ msgstr "تاريخ البدء"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "على استعداد للسحب"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1034,7 +1037,7 @@ msgstr "المهام الاساسية"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "محظورة"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1042,6 +1045,8 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"إذا كانت المهمة لديها من التقدم 99.99٪ يجب إغلاق المهمة إذا تم الإنتهاء أو "
+"إعادة تقييم الوقت"
 
 #. module: project
 #: view:project.project:0
@@ -1070,7 +1075,7 @@ msgstr "عمليات الفواتير"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "لتغيير تفويض حالة"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1097,7 +1102,7 @@ msgstr "اعادة تقييم.المهمة.المشروع"
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "التحقق: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1152,7 +1157,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "تغير النوع"
 
 #. module: project
 #: help:project.project,members:0
@@ -1198,7 +1203,7 @@ msgstr "اسم المشروع"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "تاريخ المهام"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1212,7 +1217,7 @@ msgstr ""
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "يرجى تحديد العميل أو عنوان البريد الإلكتروني للعملاء."
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1265,7 +1270,7 @@ msgstr "نوفمبر"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "إنشاء أوليات مشاريعك"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1276,7 +1281,7 @@ msgstr "تم غلق المشروع ‘%s‘."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "المهام والتدفق التراكمي"
 
 #. module: project
 #: view:project.task:0
@@ -1291,7 +1296,7 @@ msgstr "أكتوبر"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "التحقق من صحة الوقت المخطط له والمهام المفتوحة"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1299,10 +1304,12 @@ msgid ""
 "Computed as difference between planned hours by the project manager and the "
 "total hours of the task."
 msgstr ""
+"تحسب الفرق بين الساعات المخطط لها من قبل مدير المشروع والساعات الإجمالية "
+"للمهمة."
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
@@ -1331,7 +1338,7 @@ msgstr "الشركات"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr ""
+msgstr "المشاريع التي أنا عضو."
 
 #. module: project
 #: view:project.project:0
@@ -1426,7 +1433,7 @@ msgstr "مرشحات مفصلة..."
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Please delete the project linked with this account first."
-msgstr ""
+msgstr "رجاء قم بحذف رابط المشروع مع هذا الحساب أولاً"
 
 #. module: project
 #: field:project.task,total_hours:0 field:project.vs.hours,total_hours:0
@@ -1527,7 +1534,7 @@ msgstr "قيد التقدم"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Task's Analysis"
-msgstr ""
+msgstr "تحليل المهمة"
 
 #. module: project
 #: code:addons/project/project.py:789
@@ -1536,11 +1543,13 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"المهمة الوليدة التي لا تزال مفتوحة .\n"
+"  يرجى إلغاء أو إكمال المهمة الوليدة أولاص."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "مشاريع مشتركة بين جميع المراحل"
 
 #. module: project
 #: constraint:project.task:0
@@ -1561,7 +1570,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a manager"
-msgstr ""
+msgstr "المشاريع التي أنا مديرها"
 
 #. module: project
 #: code:addons/project/project.py:959
@@ -1660,6 +1669,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each new "
 "project. It will not assign this stage to existing projects."
 msgstr ""
+"إذا قمت بتحديد هذا الحقل، سيتم اقترح هذه المرحلة بشكل افتراضي على كل مشروع "
+"جديد. وسوف يتم تعيين هذه المرحلة للمشاريع القائمة."
 
 #. module: project
 #: view:board.board:0
@@ -1720,7 +1731,7 @@ msgstr "مجموع الساعات الكلية لكل المهام المتعل
 #. module: project
 #: field:project.task.type,project_default:0
 msgid "Common to All Projects"
-msgstr ""
+msgstr "مشاريع مشتركة بين الجميع"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_opendonetask0
@@ -1773,7 +1784,7 @@ msgstr "ملخص العمل"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Month-2"
-msgstr ""
+msgstr "الشهر-2"
 
 #. module: project
 #: help:report.project.task.user,closing_days:0
@@ -1821,6 +1832,8 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"يمكن للمراحل تكون مشتركة بين جميع المشاريع أو محددة لمشروع واحد. كل مهمة سوف "
+"تتبع المراحل المختلفة من أجل أن تكون مغلقة."
 
 #. module: project
 #: help:project.project,sequence:0
@@ -1949,7 +1962,7 @@ msgstr "تم الغاء المهمة ‘%s‘."
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "للتغير إلى الحالة المفتوحة"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -1983,7 +1996,7 @@ msgstr "تذييل البريد"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "In Progress Tasks"
-msgstr ""
+msgstr "مهام في قيد التقدم"
 
 #~ msgid "Timesheets"
 #~ msgstr "الجداول الزمنية"
diff --git a/addons/project/i18n/bg.po b/addons/project/i18n/bg.po
index 9260304a4c7..18d96cc946f 100644
--- a/addons/project/i18n/bg.po
+++ b/addons/project/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1276,7 +1276,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/bs.po b/addons/project/i18n/bs.po
index 6ee1a9e60be..62eb01d4773 100644
--- a/addons/project/i18n/bs.po
+++ b/addons/project/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1275,7 +1275,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/ca.po b/addons/project/i18n/ca.po
index 4bcf4e10704..34e48e68fce 100644
--- a/addons/project/i18n/ca.po
+++ b/addons/project/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1322,7 +1322,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/cs.po b/addons/project/i18n/cs.po
index 861f82f0149..deb26b24d8e 100644
--- a/addons/project/i18n/cs.po
+++ b/addons/project/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: project
@@ -1298,7 +1298,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/da.po b/addons/project/i18n/da.po
index 6a1ba48142d..1ecd0e8c31e 100644
--- a/addons/project/i18n/da.po
+++ b/addons/project/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1276,7 +1276,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/de.po b/addons/project/i18n/de.po
index bd67b2784b3..656b41afc9b 100644
--- a/addons/project/i18n/de.po
+++ b/addons/project/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1336,8 +1336,8 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "Delegationsverlauf"
+msgid "Delegation"
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2573,3 +2573,6 @@ msgstr "Aufgaben in Bearbeitung"
 
 #~ msgid "E-mail composition wizard"
 #~ msgstr "Email-Zusammensetzung Assistent"
+
+#~ msgid "Delegations History"
+#~ msgstr "Delegationsverlauf"
diff --git a/addons/project/i18n/el.po b/addons/project/i18n/el.po
index f7d1e150254..b3b8e388edd 100644
--- a/addons/project/i18n/el.po
+++ b/addons/project/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -1287,7 +1287,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/es.po b/addons/project/i18n/es.po
index 41ca159f5ec..0a805c2ab0a 100644
--- a/addons/project/i18n/es.po
+++ b/addons/project/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-02-15 20:00+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1325,8 +1325,8 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "Histórico de delegaciones"
+msgid "Delegation"
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2568,3 +2568,6 @@ msgstr ""
 
 #~ msgid "E-mail composition wizard"
 #~ msgstr "Asistente de composición de e-mail"
+
+#~ msgid "Delegations History"
+#~ msgstr "Histórico de delegaciones"
diff --git a/addons/project/i18n/es_AR.po b/addons/project/i18n/es_AR.po
index 07244223140..2da2fefc492 100644
--- a/addons/project/i18n/es_AR.po
+++ b/addons/project/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1284,7 +1284,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/es_CR.po b/addons/project/i18n/es_CR.po
index 3bffbce0aa6..dceb43cc92a 100644
--- a/addons/project/i18n/es_CR.po
+++ b/addons/project/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: project
@@ -1333,8 +1333,8 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "Histórico de delegaciones"
+msgid "Delegation"
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2582,3 +2582,6 @@ msgstr "Tarea en progreso"
 
 #~ msgid "E-mail composition wizard"
 #~ msgstr "Asistente de composición de e-mail"
+
+#~ msgid "Delegations History"
+#~ msgstr "Histórico de delegaciones"
diff --git a/addons/project/i18n/es_EC.po b/addons/project/i18n/es_EC.po
index 44b438c6fea..abf0a25e1b9 100644
--- a/addons/project/i18n/es_EC.po
+++ b/addons/project/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1330,8 +1330,8 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "Histórico de delegaciones"
+msgid "Delegation"
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2568,3 +2568,6 @@ msgstr "Tareas en progreso"
 
 #~ msgid "E-mail composition wizard"
 #~ msgstr "Asistente de composición de e-mail"
+
+#~ msgid "Delegations History"
+#~ msgstr "Histórico de delegaciones"
diff --git a/addons/project/i18n/es_PY.po b/addons/project/i18n/es_PY.po
index a3aaff36a18..f96ed433c06 100644
--- a/addons/project/i18n/es_PY.po
+++ b/addons/project/i18n/es_PY.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1276,7 +1276,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/et.po b/addons/project/i18n/et.po
index a1652611d83..8ca48b5eb1e 100644
--- a/addons/project/i18n/et.po
+++ b/addons/project/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1282,7 +1282,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/eu.po b/addons/project/i18n/eu.po
index 9b23ed90a6b..cbd85e4a0bb 100644
--- a/addons/project/i18n/eu.po
+++ b/addons/project/i18n/eu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1280,7 +1280,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/fi.po b/addons/project/i18n/fi.po
index 92e74b98249..8cb5351056e 100644
--- a/addons/project/i18n/fi.po
+++ b/addons/project/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1299,8 +1299,8 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "Delegointien historia"
+msgid "Delegation"
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2338,3 +2338,6 @@ msgstr "Meneilläänolevat tehtävät"
 
 #~ msgid "E-mail composition wizard"
 #~ msgstr "Sähköpostin luonti velho"
+
+#~ msgid "Delegations History"
+#~ msgstr "Delegointien historia"
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 50499e44f4b..1130dd1394d 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1338,8 +1338,8 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "Historique des délégations"
+msgid "Delegation"
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2587,5 +2587,8 @@ msgstr "Tâches en cours"
 #~ msgid "Manager Email"
 #~ msgstr "Courriel du responsable"
 
+#~ msgid "Delegations History"
+#~ msgstr "Historique des délégations"
+
 #~ msgid "E-mail composition wizard"
 #~ msgstr "Assistant de composition de courriels"
diff --git a/addons/project/i18n/gl.po b/addons/project/i18n/gl.po
index 9dcfd56b9f3..0c67219dc13 100644
--- a/addons/project/i18n/gl.po
+++ b/addons/project/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1276,7 +1276,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/gu.po b/addons/project/i18n/gu.po
index cd646d9a8fd..d12cd7aef39 100644
--- a/addons/project/i18n/gu.po
+++ b/addons/project/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1276,7 +1276,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po
index 567c5531777..e1712e047c5 100644
--- a/addons/project/i18n/hr.po
+++ b/addons/project/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: project
@@ -1283,7 +1283,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/hu.po b/addons/project/i18n/hu.po
index 0ca2ec532d3..066c2dab59d 100644
--- a/addons/project/i18n/hu.po
+++ b/addons/project/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -79,7 +79,7 @@ msgstr "Nem engedélyezett művelet!"
 #: code:addons/project/wizard/project_task_delegate.py:78
 #, python-format
 msgid "CHECK: "
-msgstr ""
+msgstr "ELLENŐRIZNI: "
 
 #. module: project
 #: field:project.task,user_email:0
@@ -263,7 +263,7 @@ msgstr "Nap"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Projektek és Szakaszok"
 
 #. module: project
 #: view:project.project:0
@@ -485,7 +485,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Szín megváltoztatása"
 
 #. module: project
 #: constraint:account.analytic.account:0
@@ -920,7 +920,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Blokkoltnak jelölés"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -1047,7 +1047,7 @@ msgstr "Forrás feladatok"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Blokkolva"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1110,7 +1110,7 @@ msgstr "project.task.reevaluate"
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "ELLENŐRIZNI: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1320,7 +1320,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
@@ -1558,7 +1558,7 @@ msgstr ""
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Közös használatú szakaszok"
 
 #. module: project
 #: constraint:project.task:0
@@ -2222,3 +2222,6 @@ msgstr ""
 
 #~ msgid "Automatically synchronizes project tasks and crm cases."
 #~ msgstr "Automatikusan összehangolja a projektfeladatokat és a crm eseteket."
+
+#~ msgid "Delegations History"
+#~ msgstr "Átruházás történet"
diff --git a/addons/project/i18n/id.po b/addons/project/i18n/id.po
index 2eef5437086..ca2361c3adf 100644
--- a/addons/project/i18n/id.po
+++ b/addons/project/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1275,7 +1275,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po
index 57c72b24172..8d28c66e971 100644
--- a/addons/project/i18n/it.po
+++ b/addons/project/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1320,7 +1320,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/ja.po b/addons/project/i18n/ja.po
index 481957ce0c1..05589d27922 100644
--- a/addons/project/i18n/ja.po
+++ b/addons/project/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1294,8 +1294,8 @@ msgstr "プロジェクトマネジャによる計画時間数とタスクの合
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "委任の履歴"
+msgid "Delegation"
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1969,3 +1969,6 @@ msgstr "進行中タスク"
 
 #~ msgid "E-mail composition wizard"
 #~ msgstr "Eメール作成ウィザード"
+
+#~ msgid "Delegations History"
+#~ msgstr "委任の履歴"
diff --git a/addons/project/i18n/ko.po b/addons/project/i18n/ko.po
index 591b793ca42..d8a54e86ff3 100644
--- a/addons/project/i18n/ko.po
+++ b/addons/project/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1276,7 +1276,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index 5deed677ff8..e551e632d6a 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1285,7 +1285,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/lv.po b/addons/project/i18n/lv.po
index edd76e1868c..8a57148f789 100644
--- a/addons/project/i18n/lv.po
+++ b/addons/project/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1314,7 +1314,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/mn.po b/addons/project/i18n/mn.po
index 72422dee7f2..a483fe9135d 100644
--- a/addons/project/i18n/mn.po
+++ b/addons/project/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1323,8 +1323,8 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "Ацагласан Түүх"
+msgid "Delegation"
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2335,3 +2335,6 @@ msgstr "Боловсруулагдаж байгаа даалгаврууд"
 
 #~ msgid "E-mail composition wizard"
 #~ msgstr "И-мэйл үүсгэх харилцах цонх"
+
+#~ msgid "Delegations History"
+#~ msgstr "Ацагласан Түүх"
diff --git a/addons/project/i18n/nb.po b/addons/project/i18n/nb.po
index d83014763bd..dbe275bbc04 100644
--- a/addons/project/i18n/nb.po
+++ b/addons/project/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -37,6 +37,7 @@ msgstr "Oppgaven '%s' er tildelt til %s."
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
+"Det valgte firmaet er ikke i listen over tillatte firmaer for denne brukeren"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -81,7 +82,7 @@ msgstr "SJEKK: "
 #. module: project
 #: field:project.task,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "E-post for bruker"
 
 #. module: project
 #: field:project.task,work_ids:0
@@ -93,7 +94,7 @@ msgstr "Arbeid utført"
 #: code:addons/project/project.py:1148
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Advarsel !"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_delegate
@@ -121,7 +122,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Re-open project"
-msgstr ""
+msgstr "Gjenåpne prosjekt"
 
 #. module: project
 #: help:project.project,priority:0
@@ -131,7 +132,7 @@ msgstr ""
 #. module: project
 #: constraint:project.project:0
 msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
+msgstr "Feil! Startdato for prosjekt må være tidligere enn sluttdato."
 
 #. module: project
 #: view:project.task.reevaluate:0
@@ -180,7 +181,7 @@ msgstr "Mine oppgaver"
 #. module: project
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Feil! Du kan ikke lage en uendelig struktur av oppgaver."
 
 #. module: project
 #: field:project.task,company_id:0 field:project.task.work,company_id:0
@@ -201,7 +202,7 @@ msgstr "Din oppgavetittel"
 #. module: project
 #: field:project.task.type,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Fasenavn"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -211,7 +212,7 @@ msgstr ""
 #. module: project
 #: selection:project.task,priority:0
 msgid "Important"
-msgstr ""
+msgstr "Viktig"
 
 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@@ -221,7 +222,7 @@ msgstr "Definer krav og oppgi planlagte timer"
 #. module: project
 #: view:project.task:0
 msgid "Change Stage"
-msgstr ""
+msgstr "Endre fase"
 
 #. module: project
 #: view:project.project:0
@@ -258,7 +259,7 @@ msgstr "Dag"
 #. module: project
 #: model:ir.ui.menu,name:project.menu_project_config_project
 msgid "Projects and Stages"
-msgstr ""
+msgstr "Prosjekter og faser"
 
 #. module: project
 #: view:project.project:0
@@ -294,12 +295,12 @@ msgstr "Mine åpne oppgaver"
 #, python-format
 msgid ""
 "Please specify the Project Manager or email address of Project Manager."
-msgstr ""
+msgstr "Vennligst angi prosjektleder eller e-post-adresse for prosjektleder."
 
 #. module: project
 #: view:project.task:0
 msgid "For cancelling the task"
-msgstr ""
+msgstr "For å avbryte oppgaven"
 
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
@@ -361,7 +362,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Vis kun oppgaver med deadline"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -374,7 +375,7 @@ msgstr "Kansellert"
 #. module: project
 #: field:project.task,date_end:0 field:report.project.task.user,date_end:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Sluttdato"
 
 #. module: project
 #: view:project.project:0 field:project.project,warn_header:0
@@ -384,7 +385,7 @@ msgstr "E-post topptekst"
 #. module: project
 #: view:project.task:0
 msgid "Change to Next Stage"
-msgstr ""
+msgstr "Endre til neste fase"
 
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
@@ -394,7 +395,7 @@ msgstr "Fullførte oppgaver"
 #. module: project
 #: field:project.task,color:0
 msgid "Color Index"
-msgstr ""
+msgstr "Fargeindeks"
 
 #. module: project
 #: model:ir.ui.menu,name:project.menu_definitions view:res.company:0
@@ -404,7 +405,7 @@ msgstr "Konfigurasjon"
 #. module: project
 #: view:report.project.task.user:0
 msgid "Current Month"
-msgstr ""
+msgstr "Inneværende måned"
 
 #. module: project
 #: model:process.transition,note:project.process_transition_delegate0
@@ -414,7 +415,7 @@ msgstr "Delegerer oppgaver til den andre brukeren"
 #. module: project
 #: view:project.project:0 view:project.task:0 view:report.project.task.user:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupper etter ..."
 
 #. module: project
 #: field:project.task.work,user_id:0
@@ -433,7 +434,7 @@ msgstr ""
 #. module: project
 #: model:project.task.type,name:project.project_tt_testing
 msgid "Testing"
-msgstr ""
+msgstr "Tester"
 
 #. module: project
 #: code:addons/project/project.py:829
@@ -471,17 +472,17 @@ msgstr "_Avbryt"
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Ready"
-msgstr ""
+msgstr "Klar"
 
 #. module: project
 #: view:project.task:0
 msgid "Change Color"
-msgstr ""
+msgstr "Bytt farge"
 
 #. module: project
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette uendelig struktur med analytiske kontoer."
 
 #. module: project
 #: code:addons/project/project.py:264 code:addons/project/project.py:303
@@ -492,12 +493,12 @@ msgstr " (kopi)"
 #. module: project
 #: view:project.task:0
 msgid "New Tasks"
-msgstr ""
+msgstr "Ny oppgave"
 
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,nbr:0
 msgid "# of tasks"
-msgstr ""
+msgstr "Antall oppgaver"
 
 #. module: project
 #: view:project.task:0
@@ -517,7 +518,7 @@ msgstr ""
 #. module: project
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Du kan ikke ha to brukere med samme login!"
 
 #. module: project
 #: view:project.project:0
@@ -537,7 +538,7 @@ msgstr "Mine prosjekter"
 #. module: project
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Feil! Dukan ikke opprette uendelig struktur av firmaer."
 
 #. module: project
 #: view:project.task:0
@@ -552,23 +553,23 @@ msgstr "From draft state, it will come into the open state."
 #. module: project
 #: view:report.project.task.user:0 field:report.project.task.user,no_of_days:0
 msgid "# of Days"
-msgstr ""
+msgstr "Antall dager"
 
 #. module: project
 #: view:project.project:0
 msgid "Open Projects"
-msgstr ""
+msgstr "Åpne prosjekter"
 
 #. module: project
 #: code:addons/project/project.py:358
 #, python-format
 msgid "You must assign members on the project '%s' !"
-msgstr ""
+msgstr "Du må tilordne deltakere til prosjekt '%s'!"
 
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress tasks"
-msgstr ""
+msgstr "Oppgaver i arbeid"
 
 #. module: project
 #: help:project.project,progress_rate:0
@@ -592,7 +593,7 @@ msgstr "Prosjektoppgave"
 #: selection:project.task.history.cumulative,state:0
 #: view:report.project.task.user:0
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. module: project
 #: help:project.task,total_hours:0
@@ -625,7 +626,7 @@ msgstr ""
 #: code:addons/project/project.py:597
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopi)"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -641,7 +642,7 @@ msgstr "Medium"
 #. module: project
 #: view:project.task:0 view:project.task.history.cumulative:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Ventende oppgaver"
 
 #. module: project
 #: view:project.task:0 field:project.task,remaining_hours:0
@@ -659,13 +660,13 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Opprettelsesdato"
 
 #. module: project
 #: view:project.task:0 field:project.task.history,remaining_hours:0
 #: field:project.task.history.cumulative,remaining_hours:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Gjenstående tid"
 
 #. module: project
 #: field:project.project,planned_hours:0
@@ -755,7 +756,7 @@ msgstr "Prosjekter"
 #: field:project.task.history.cumulative,type_id:0
 #: view:report.project.task.user:0 field:report.project.task.user,type_id:0
 msgid "Stage"
-msgstr ""
+msgstr "Fase"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@@ -769,7 +770,7 @@ msgstr ""
 #: code:addons/project/project.py:903
 #, python-format
 msgid "The task '%s' is opened."
-msgstr ""
+msgstr "Oppgaven '%s' er åpnet."
 
 #. module: project
 #: view:project.task:0
@@ -788,6 +789,8 @@ msgid ""
 "You cannot delete a project containing tasks. I suggest you to desactivate "
 "it."
 msgstr ""
+"Du kan ikke slette et prosjekt som har oppgaver. Prosjektet kan evt. "
+"deaktiveres."
 
 #. module: project
 #: view:project.vs.hours:0
@@ -812,7 +815,7 @@ msgstr "Timer forsinket"
 #. module: project
 #: selection:project.task,priority:0
 msgid "Very important"
-msgstr ""
+msgstr "Veldig viktig"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_user_tree
@@ -833,6 +836,8 @@ msgid ""
 "If you check this field, the project manager will receive an email each time "
 "a task is completed by his team."
 msgstr ""
+"Ved avkryssing vil prosjektleder motta en e-post hver gang en oppgave blir "
+"fullført av hans team."
 
 #. module: project
 #: model:ir.model,name:project.model_project_project
@@ -861,12 +866,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.open_task_type_form
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Stages"
-msgstr ""
+msgstr "Faser"
 
 #. module: project
 #: view:project.task:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Endre til foregående fase"
 
 #. module: project
 #: model:ir.actions.todo.category,name:project.category_project_config
@@ -882,7 +887,7 @@ msgstr "Prosjekt time enhet"
 #. module: project
 #: view:report.project.task.user:0
 msgid "In progress"
-msgstr ""
+msgstr "I arbeid"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -909,7 +914,7 @@ msgstr "Overordnet"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr ""
+msgstr "Marker som blokkert"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -952,7 +957,7 @@ msgstr ""
 #. module: project
 #: view:project.task.reevaluate:0
 msgid "Reevaluate Task"
-msgstr ""
+msgstr "Evaluer oppgave på nytt"
 
 #. module: project
 #: view:project.task.history.cumulative:0 view:report.project.task.user:0
@@ -969,12 +974,12 @@ msgstr "Prosjektoppgaver"
 #: model:ir.model,name:project.model_project_task_type
 #: view:project.task.type:0
 msgid "Task Stage"
-msgstr ""
+msgstr "Oppgavefase"
 
 #. module: project
 #: model:project.task.type,name:project.project_tt_specification
 msgid "Design"
-msgstr ""
+msgstr "Utforming"
 
 #. module: project
 #: field:project.task,planned_hours:0
@@ -987,7 +992,7 @@ msgstr "Planlagte timer"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_review_task_stage
 msgid "Review Task Stages"
-msgstr ""
+msgstr "Gjennomgå oppgavefaser"
 
 #. module: project
 #: view:project.project:0
@@ -997,7 +1002,7 @@ msgstr ""
 #. module: project
 #: help:project.task,sequence:0
 msgid "Gives the sequence order when displaying a list of tasks."
-msgstr ""
+msgstr "Gir sorteringsrekkefølge ved listing av oppgaver"
 
 #. module: project
 #: view:project.project:0 view:project.task:0
@@ -1022,7 +1027,7 @@ msgstr "Overordnede oppgaver"
 #: view:project.task.history.cumulative:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Blocked"
-msgstr ""
+msgstr "Blokkert"
 
 #. module: project
 #: help:project.task,progress:0
@@ -1034,7 +1039,7 @@ msgstr ""
 #. module: project
 #: view:project.project:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Kontaktadresse"
 
 #. module: project
 #: help:project.task,kanban_state:0
@@ -1137,7 +1142,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Change Type"
-msgstr ""
+msgstr "Endre type"
 
 #. module: project
 #: help:project.project,members:0
@@ -1145,6 +1150,8 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Prosjektdeltakere er brukere som har tilgang til oppgavene som hører til "
+"prosjektet."
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
@@ -1154,12 +1161,12 @@ msgstr "Prosjektleder"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr ""
+msgstr "For å bytte til ferdig tilstand"
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
 msgid "Tasks by user and project"
-msgstr ""
+msgstr "Oppgaver pr. bruker og prosjekt"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1171,7 +1178,7 @@ msgstr "August"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: project
 #: view:project.project:0 field:project.project,complete_name:0
@@ -1182,7 +1189,7 @@ msgstr "Prosjektnavn"
 #: model:ir.model,name:project.model_project_task_history
 #: model:ir.model,name:project.model_project_task_history_cumulative
 msgid "History of Tasks"
-msgstr ""
+msgstr "Oppgavehistorikk"
 
 #. module: project
 #: help:project.task.delegate,state:0
@@ -1211,7 +1218,7 @@ msgstr "Totaltid"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,closing_days:0
 msgid "Days to Close"
-msgstr ""
+msgstr "Dager til lukking"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.open_board_project
@@ -1227,7 +1234,7 @@ msgstr ""
 #. module: project
 #: model:res.groups,name:project.group_project_user
 msgid "User"
-msgstr ""
+msgstr "Bruker"
 
 #. module: project
 #: field:project.project,active:0
@@ -1238,7 +1245,7 @@ msgstr "Aktiv"
 #: view:report.project.task.user:0
 #: field:report.project.task.user,opening_days:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dager til åpning"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1254,7 +1261,7 @@ msgstr ""
 #: code:addons/project/project.py:229
 #, python-format
 msgid "The project '%s' has been closed."
-msgstr ""
+msgstr "Prosjektet '%s' er lukket."
 
 #. module: project
 #: view:project.task.history.cumulative:0
@@ -1287,7 +1294,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
@@ -1301,6 +1308,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the project "
 "without removing it."
 msgstr ""
+"Ved å fjerne avkryssing for Aktiv vil prosjektet skjules uten å måtte "
+"slettes."
 
 #. module: project
 #: view:project.task:0
@@ -1326,7 +1335,7 @@ msgstr "Søk i prosjekt"
 #: code:addons/project/project.py:251
 #, python-format
 msgid "The project '%s' has been opened."
-msgstr ""
+msgstr "Prosjektet '%s' er åpnet."
 
 #. module: project
 #: field:project.task.history,date:0
@@ -1401,7 +1410,7 @@ msgstr ""
 #. module: project
 #: view:report.project.task.user:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utvidede filtre ..."
 
 #. module: project
 #: code:addons/project/project.py:1148
@@ -2191,3 +2200,9 @@ msgstr ""
 
 #~ msgid "Running projects"
 #~ msgstr "Løpende prosjekter"
+
+#~ msgid "Delegations History"
+#~ msgstr "Delegeringshistorikk"
+
+#~ msgid "E-mail composition wizard"
+#~ msgstr "Veiviser for opprettelse av e-post"
diff --git a/addons/project/i18n/nl.po b/addons/project/i18n/nl.po
index 3849f54ab53..a94e3ecf6a9 100644
--- a/addons/project/i18n/nl.po
+++ b/addons/project/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-28 12:50+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"PO-Revision-Date: 2012-09-29 14:57+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -920,7 +920,7 @@ msgstr "Bovenliggend"
 #. module: project
 #: view:project.task:0
 msgid "Mark as Blocked"
-msgstr "Maarkeer als geblokkeerd"
+msgstr "Markeer als geblokkeerd"
 
 #. module: project
 #: model:ir.actions.act_window,help:project.action_view_task
@@ -967,8 +967,8 @@ msgid ""
 "         \n"
 " If the task is over, the states is set to 'Done'."
 msgstr ""
-"Als de taak is gemaakt is de tstaus 'Concept'.\n"
-" Als de taak gestart is, wordt de status 'Loopt'.\n"
+"Als de taak is gemaakt is de status 'Concept'.\n"
+" Als de taak gestart is, wordt de status 'In behandeling'.\n"
 " Als controle nodig is, wordt de status 'Wachtend'.\n"
 " Als de taak klaar is, wordt de status 'Gereed'."
 
@@ -1325,8 +1325,8 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "Deligatiehistorie"
+msgid "Delegation"
+msgstr "Delegeren"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2566,3 +2566,6 @@ msgstr "Lopende taken"
 
 #~ msgid "E-mail composition wizard"
 #~ msgstr "E-mail opmaak wizard"
+
+#~ msgid "Delegations History"
+#~ msgstr "Deligatiehistorie"
diff --git a/addons/project/i18n/nl_BE.po b/addons/project/i18n/nl_BE.po
index 8fdcb4d8acb..0d44653bade 100644
--- a/addons/project/i18n/nl_BE.po
+++ b/addons/project/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1317,7 +1317,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/pl.po b/addons/project/i18n/pl.po
index b401d3195d9..beed6a0c606 100644
--- a/addons/project/i18n/pl.po
+++ b/addons/project/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1322,8 +1322,8 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "Historia przydziałów"
+msgid "Delegation"
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2529,3 +2529,6 @@ msgstr "Zadania w toku"
 
 #~ msgid "E-mail composition wizard"
 #~ msgstr "Kreator tworzenia wiadomości"
+
+#~ msgid "Delegations History"
+#~ msgstr "Historia przydziałów"
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 46cf1a9279a..4f364cc1e66 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -1293,7 +1293,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/pt.po b/addons/project/i18n/pt.po
index 20a39bcf27d..9943c4f7414 100644
--- a/addons/project/i18n/pt.po
+++ b/addons/project/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1328,8 +1328,8 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "Histórico das delegações"
+msgid "Delegation"
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2561,5 +2561,8 @@ msgstr "Tarefas em progresso"
 #~ msgid "Automatically synchronizes project tasks and crm cases."
 #~ msgstr "Sincroniza automaticamente as tarefas do projecto e os casos de crm."
 
+#~ msgid "Delegations History"
+#~ msgstr "Histórico das delegações"
+
 #~ msgid "E-mail composition wizard"
 #~ msgstr "Assistente de composição de email"
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index 90992262cf5..9f5237643df 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-20 19:37+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-10-17 00:02+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@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: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -369,7 +369,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Mostrar apenas tarefas que tem um prazo final"
 
 #. module: project
 #: selection:project.task,state:0 selection:project.task.history,state:0
@@ -663,7 +663,7 @@ msgstr "Horas Restantes"
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Assistente de composição de Email"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -742,7 +742,7 @@ msgstr "Julho"
 #. module: project
 #: view:project.task.history.burndown:0
 msgid "Burndown Chart of Tasks"
-msgstr ""
+msgstr "Gráficos de Tarefas Concluídas"
 
 #. module: project
 #: field:project.task,date_start:0 field:report.project.task.user,date_start:0
@@ -1039,7 +1039,7 @@ msgstr "Data inicial"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready To Pull"
-msgstr ""
+msgstr "Pronto para prosseguir"
 
 #. module: project
 #: view:project.task:0 field:project.task,parent_ids:0
@@ -1060,6 +1060,8 @@ msgid ""
 "If the task has a progress of 99.99% you should close the task if it's "
 "finished or reevaluate the time"
 msgstr ""
+"Se uma tarefa tem um progresso de 99.99% você deve fechar a tarefa se foi "
+"concluída, ou reavaliar o prazo"
 
 #. module: project
 #: view:project.project:0
@@ -1074,6 +1076,11 @@ msgid ""
 " * Blocked indicates something is preventing the progress of this task\n"
 " * Ready To Pull indicates the task is ready to be pulled to the next stage"
 msgstr ""
+"O Painel Kanban de tarefas indica uma situação especial a seguir:\n"
+" * Normal é a situação padrão\n"
+" * Bloqueada indica que algo está impedindo o progresso dessa tarefa\n"
+" * Pronto para prosseguir indica que a tarefa está pronta para seguir ao "
+"próximo estágio"
 
 #. module: project
 #: view:project.project:0
@@ -1088,7 +1095,7 @@ msgstr "Cobrança"
 #. module: project
 #: view:project.task:0
 msgid "For changing to delegate state"
-msgstr ""
+msgstr "Para mudar para Situação Delegada"
 
 #. module: project
 #: field:project.task,priority:0 field:report.project.task.user,priority:0
@@ -1115,7 +1122,7 @@ msgstr "project.task.reevaluate"
 #: code:addons/project/wizard/project_task_delegate.py:81
 #, python-format
 msgid "CHECK: %s"
-msgstr ""
+msgstr "VERIFICAR: %s"
 
 #. module: project
 #: view:project.project:0
@@ -1149,7 +1156,7 @@ msgstr "Baixo"
 #: field:project.task,kanban_state:0 field:project.task.history,kanban_state:0
 #: field:project.task.history.cumulative,kanban_state:0
 msgid "Kanban State"
-msgstr ""
+msgstr "Situação Kanban"
 
 #. module: project
 #: view:project.project:0
@@ -1178,6 +1185,8 @@ msgid ""
 "Project's members are users who can have an access to the tasks related to "
 "this project."
 msgstr ""
+"Membros do projeto são usuários que podem acessar as tarefas relacionadas a "
+"este projeto"
 
 #. module: project
 #: view:project.project:0 field:project.task,manager_id:0
@@ -1230,7 +1239,7 @@ msgstr ""
 #: code:addons/project/wizard/mail_compose_message.py:45
 #, python-format
 msgid "Please specify the Customer or email address of Customer."
-msgstr ""
+msgstr "Por favor especifique o Cliente ou o email de um Cliente"
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -1283,7 +1292,7 @@ msgstr "Novembro"
 #. module: project
 #: model:ir.actions.act_window,name:project.action_create_initial_projects_installer
 msgid "Create your Firsts Projects"
-msgstr ""
+msgstr "Crie seus Primeiros Projetos"
 
 #. module: project
 #: code:addons/project/project.py:229
@@ -1294,7 +1303,7 @@ msgstr "O Projeto '%s' foi concluído."
 #. module: project
 #: view:project.task.history.cumulative:0
 msgid "Tasks's Cumulative Flow"
-msgstr ""
+msgstr "Fluxo de Tarefas Acumuladas"
 
 #. module: project
 #: view:project.task:0
@@ -1309,7 +1318,7 @@ msgstr "Outubro"
 #. module: project
 #: view:project.task:0
 msgid "Validate planned time and open task"
-msgstr ""
+msgstr "Validar o tempo planejado e abrir tarefa"
 
 #. module: project
 #: help:project.task,delay_hours:0
@@ -1322,8 +1331,8 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "Histórico de Delegações"
+msgid "Delegation"
+msgstr "Delegar Responsabilidade"
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -1470,7 +1479,7 @@ msgstr "Estado"
 #: code:addons/project/project.py:925
 #, python-format
 msgid "Delegated User should be specified"
-msgstr ""
+msgstr "É necessário especificar o usuário delegado"
 
 #. module: project
 #: code:addons/project/project.py:862
@@ -1558,11 +1567,13 @@ msgid ""
 "Child task still open.\n"
 "Please cancel or complete child task first."
 msgstr ""
+"Tarefa filha ainda aberta.\n"
+"Por favor cancele ou finalize a tarefa filha primeiro."
 
 #. module: project
 #: view:project.task.type:0
 msgid "Stages common to all projects"
-msgstr ""
+msgstr "Estágios comuns para todos os projetos"
 
 #. module: project
 #: constraint:project.task:0
@@ -1683,6 +1694,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each new "
 "project. It will not assign this stage to existing projects."
 msgstr ""
+"Se você marcar este campo, este estágio será proposto por padrão em cada "
+"novo projeto. Isto não irá associar este estágio a projetos existentes."
 
 #. module: project
 #: view:board.board:0
@@ -1846,6 +1859,8 @@ msgid ""
 "The stages can be common to all project or specific to one project. Each "
 "task will follow the different stages in order to be closed."
 msgstr ""
+"Os estágios podem ser comuns a todos os projetos ou específico a um projeto. "
+"Cada tarefa seguirá os estágios diferentes para ser fechado."
 
 #. module: project
 #: help:project.project,sequence:0
@@ -1867,7 +1882,7 @@ msgstr "ID"
 #: model:ir.actions.act_window,name:project.action_view_task_history_burndown
 #: model:ir.ui.menu,name:project.menu_action_view_task_history_burndown
 msgid "Burndown Chart"
-msgstr ""
+msgstr "Gráfico de Burndown"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -1887,7 +1902,7 @@ msgstr "Ano Atual"
 #. module: project
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
 
 #. module: project
 #: field:project.project,priority:0 field:project.project,sequence:0
@@ -1976,7 +1991,7 @@ msgstr "A tarefa '%s' está cancelada."
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to open state"
-msgstr ""
+msgstr "Para alterar para Aberto"
 
 #. module: project
 #: model:ir.model,name:project.model_res_partner view:project.project:0
@@ -2544,3 +2559,6 @@ msgstr "Tarefas em Progresso"
 
 #~ msgid "E-mail composition wizard"
 #~ msgstr "Assistente de composição de E-mail."
+
+#~ msgid "Delegations History"
+#~ msgstr "Histórico de Delegações"
diff --git a/addons/project/i18n/ro.po b/addons/project/i18n/ro.po
index a54241ee4b6..d36d7246dd2 100644
--- a/addons/project/i18n/ro.po
+++ b/addons/project/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1338,8 +1338,8 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "Istoric Delegatii"
+msgid "Delegation"
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2286,3 +2286,6 @@ msgstr "Sarcini in desfasurare"
 
 #~ msgid "E-mail composition wizard"
 #~ msgstr "Asistent compunere e-mail"
+
+#~ msgid "Delegations History"
+#~ msgstr "Istoric Delegatii"
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index c2b93a6f66f..ea9adb8db00 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-08 20:35+0000\n"
-"Last-Translator: Denis Karataev <dskarataev@gmail.com>\n"
+"PO-Revision-Date: 2012-09-14 06:31+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1195,7 +1195,7 @@ msgstr "Руководитель проекта"
 #. module: project
 #: view:project.task:0 view:res.partner:0
 msgid "For changing to done state"
-msgstr "Для изменения в стадию готовности"
+msgstr "Для смены в состояние \"Сделано\""
 
 #. module: project
 #: model:ir.model,name:project.model_report_project_task_user
@@ -1330,8 +1330,8 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "История Делегирования"
+msgid "Delegation"
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2387,5 +2387,8 @@ msgstr "Задания в работе"
 #~ msgid "project.installer"
 #~ msgstr "project.installer"
 
+#~ msgid "Delegations History"
+#~ msgstr "История Делегирования"
+
 #~ msgid "E-mail composition wizard"
 #~ msgstr "Мастер создания электронной почты"
diff --git a/addons/project/i18n/sk.po b/addons/project/i18n/sk.po
index 826be10263a..d984c1a2999 100644
--- a/addons/project/i18n/sk.po
+++ b/addons/project/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1276,7 +1276,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/sl.po b/addons/project/i18n/sl.po
index fe5aa1204c0..75c17835dd0 100644
--- a/addons/project/i18n/sl.po
+++ b/addons/project/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1275,7 +1275,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/sq.po b/addons/project/i18n/sq.po
index 1dd1a31cce7..86dd79dee15 100644
--- a/addons/project/i18n/sq.po
+++ b/addons/project/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:46+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:44+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1276,7 +1276,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/sv.po b/addons/project/i18n/sv.po
index c4a94471782..2f02d5f9a05 100644
--- a/addons/project/i18n/sv.po
+++ b/addons/project/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1326,8 +1326,8 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "Delegeringshistorik"
+msgid "Delegation"
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2349,6 +2349,9 @@ msgstr "Pågående aktiviteter"
 #~ msgid "Planned"
 #~ msgstr "Planned"
 
+#~ msgid "Delegations History"
+#~ msgstr "Delegeringshistorik"
+
 #~ msgid "E-mail composition wizard"
 #~ msgstr "E-post editor"
 
diff --git a/addons/project/i18n/tlh.po b/addons/project/i18n/tlh.po
index 9e315e760f4..d0e499b5356 100644
--- a/addons/project/i18n/tlh.po
+++ b/addons/project/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1275,7 +1275,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index d2e659dd855..e8d106ffd69 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:47+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1283,7 +1283,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/uk.po b/addons/project/i18n/uk.po
index 77169f77915..ab877a0ce32 100644
--- a/addons/project/i18n/uk.po
+++ b/addons/project/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1275,7 +1275,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/vi.po b/addons/project/i18n/vi.po
index 9404189187a..72afa0cb45f 100644
--- a/addons/project/i18n/vi.po
+++ b/addons/project/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1276,7 +1276,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/i18n/zh_CN.po b/addons/project/i18n/zh_CN.po
index 4133d27d027..466590579e4 100644
--- a/addons/project/i18n/zh_CN.po
+++ b/addons/project/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-14 10:21+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-08-19 21:16+0000\n"
+"Last-Translator: Heling Yao <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -646,7 +646,7 @@ msgstr "剩余的小时数"
 #. module: project
 #: model:ir.model,name:project.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "电子邮件撰写向导"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1286,8 +1286,8 @@ msgstr "计算公式为：项目经理估算的时间和实际花费的时间的
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
-msgstr "委派历史"
+msgid "Delegation"
+msgstr ""
 
 #. module: project
 #: model:ir.model,name:project.model_res_users
@@ -2444,3 +2444,6 @@ msgstr "进行中的任务"
 
 #~ msgid "E-mail composition wizard"
 #~ msgstr "邮件合并向导"
+
+#~ msgid "Delegations History"
+#~ msgstr "委派历史"
diff --git a/addons/project/i18n/zh_TW.po b/addons/project/i18n/zh_TW.po
index b969a6e2e41..aa3e23f475a 100644
--- a/addons/project/i18n/zh_TW.po
+++ b/addons/project/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project
 #: view:report.project.task.user:0
@@ -1279,7 +1279,7 @@ msgstr ""
 
 #. module: project
 #: view:project.task:0
-msgid "Delegations History"
+msgid "Delegation"
 msgstr ""
 
 #. module: project
diff --git a/addons/project/project.py b/addons/project/project.py
index 1a8f8c8bfe5..9c28fadeab9 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -19,13 +19,16 @@
 #
 ##############################################################################
 
-from base_status.base_stage import base_stage
-from datetime import datetime, date
+import time
 from lxml import etree
+from datetime import datetime, date
+
+import tools
+from base_status.base_stage import base_stage
 from osv import fields, osv
 from openerp.addons.resource.faces import task as Task
-import time
 from tools.translate import _
+from openerp import SUPERUSER_ID
 
 _TASK_STATE = [('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')]
 
@@ -40,19 +43,20 @@ class project_task_type(osv.osv):
         'case_default': fields.boolean('Common to All Projects',
                         help="If you check this field, this stage will be proposed by default on each new project. It will not assign this stage to existing projects."),
         'project_ids': fields.many2many('project.project', 'project_task_type_rel', 'type_id', 'project_id', 'Projects'),
-        'state': fields.selection(_TASK_STATE, 'State', required=True,
-                        help="The related state for the stage. The state of your document will automatically change regarding the selected stage. Example, a stage is related to the state 'Close', when your document reach this stage, it will be automatically closed."),
+        'state': fields.selection(_TASK_STATE, 'Related Status', required=True,
+                        help="The status of your document is automatically changed regarding the selected stage. " \
+                            "For example, if a stage is related to the status 'Close', when your document reaches this stage, it is automatically closed."),
         'fold': fields.boolean('Hide in views if empty',
                         help="This stage is not visible, for example in status bar or kanban view, when there are no records in that stage to display."),
     }
     _defaults = {
         'sequence': 1,
-        'state': 'draft',
+        'state': 'open',
         'fold': False,
+        'case_default': True,
     }
     _order = 'sequence'
 
-
 def short_name(name):
         """Keep first word(s) of name to make it small enough
            but distinctive"""
@@ -66,7 +70,7 @@ class project(osv.osv):
     _description = "Project"
     _inherits = {'account.analytic.account': "analytic_account_id",
                  "mail.alias": "alias_id"}
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
         if user == 1:
@@ -162,19 +166,30 @@ class project(osv.osv):
                 res[id]['progress_rate'] = 0.0
         return res
 
-    def unlink(self, cr, uid, ids, *args, **kwargs):
+    def unlink(self, cr, uid, ids, context=None):
         alias_ids = []
         mail_alias = self.pool.get('mail.alias')
-        for proj in self.browse(cr, uid, ids):
+        for proj in self.browse(cr, uid, ids, context=context):
             if proj.tasks:
                 raise osv.except_osv(_('Invalid Action!'),
                                      _('You cannot delete a project containing tasks. You can either delete all the project\'s tasks and then delete the project or simply deactivate the project.'))
             elif proj.alias_id:
                 alias_ids.append(proj.alias_id.id)
-        res =  super(project, self).unlink(cr, uid, ids, *args, **kwargs)
-        mail_alias.unlink(cr, uid, alias_ids, *args, **kwargs)
+        res =  super(project, self).unlink(cr, uid, ids, context=context)
+        mail_alias.unlink(cr, uid, alias_ids, context=context)
         return res
-
+    
+    def _get_attached_docs(self, cr, uid, ids, field_name, arg, context):
+        res = {}
+        attachment = self.pool.get('ir.attachment')
+        task = self.pool.get('project.task')
+        for id in ids:
+            project_attachments = attachment.search(cr, uid, [('res_model', '=', 'project.project'), ('res_id', 'in', [id])], context=context, count=True)
+            task_ids = task.search(cr, uid, [('project_id', 'in', [id])], context=context)
+            task_attachments = attachment.search(cr, uid, [('res_model', '=', 'project.task'), ('res_id', 'in', task_ids)], context=context, count=True)
+            res[id] = project_attachments or 0 + task_attachments or 0
+        return res
+        
     def _task_count(self, cr, uid, ids, field_name, arg, context=None):
         res = dict.fromkeys(ids, 0)
         task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)])
@@ -185,32 +200,33 @@ class project(osv.osv):
     def _get_alias_models(self, cr, uid, context=None):
         """Overriden in project_issue to offer more options"""
         return [('project.task', "Tasks")]
-
-    def _get_followers(self, cr, uid, ids, name, arg, context=None):
-        '''
-        Functional field that computes the users that are 'following' a thread.
-        '''
-        res = {}
-        for project in self.browse(cr, uid, ids, context=context):
-            l = set()
-            for message in project.message_ids:
-                l.add(message.user_id and message.user_id.id or False)
-            res[project.id] = list(filter(None, l))
-        return res
-
-    def _search_followers(self, cr, uid, obj, name, args, context=None):
-        project_obj = self.pool.get('project.project')
-        project_ids = project_obj.search(cr, uid, [('message_ids.user_id.id', 'in', args[0][2])], context=context)
-        return [('id', 'in', project_ids)]
-
+    
+    def attachment_tree_view(self, cr, uid, ids, context):
+        task_ids = self.pool.get('project.task').search(cr, uid, [('project_id', 'in', ids)])
+        domain = [
+             '|', 
+             '&', ('res_model', '=', 'project.project'), ('res_id', 'in', ids),
+             '&', ('res_model', '=', 'project.task'), ('res_id', 'in', task_ids)
+		]
+        res_id = ids and ids[0] or False
+        return {
+            'name': _('Attachments'),
+            'domain': domain,
+            'res_model': 'ir.attachment',
+            'type': 'ir.actions.act_window',
+            'view_id': False,
+            'view_mode': 'tree,form',
+            'view_type': 'form',
+            'limit': 80,
+            'context': "{'default_res_model': '%s','default_res_id': %d}" % (self._name, res_id)
+        }
     # Lambda indirection method to avoid passing a copy of the overridable method when declaring the field
     _alias_models = lambda self, *args, **kwargs: self._get_alias_models(*args, **kwargs)
-
     _columns = {
         'complete_name': fields.function(_complete_name, string="Project Name", type='char', size=250),
         'active': fields.boolean('Active', help="If the active field is set to False, 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."),
-        '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.", ondelete="cascade", required=True),
+        'analytic_account_id': fields.many2one('account.analytic.account', 'Contract/Analytic', 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.", ondelete="cascade", required=True),
         'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"),
         'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members',
             help="Project's members are users who can have an access to the tasks related to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
@@ -246,13 +262,9 @@ class project(osv.osv):
                                         help="The kind of document created when an email is received on this project's email alias"),
         'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility', required=True),
         'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,),
-        'followers': fields.function(_get_followers, method=True, fnct_search=_search_followers,
-                        type='many2many', relation='res.users', string='Followers'),
+        'doc_count':fields.function(_get_attached_docs, string="Number of documents attached", type='int')
      }
 
-    def dummy(self, cr, uid, ids, context):
-        return True
-
     def _get_type_common(self, cr, uid, context):
         ids = self.pool.get('project.task.type').search(cr, uid, [('case_default','=',1)], context=context)
         return ids
@@ -330,11 +342,12 @@ class project(osv.osv):
         task_obj.duplicate_task(cr, uid, map_task_id, context=context)
         return True
 
-    def copy(self, cr, uid, id, default={}, context=None):
+    def copy(self, cr, uid, id, default=None, context=None):
         if context is None:
             context = {}
+        if default is None:
+            default = {}
 
-        default = default or {}
         context['active_test'] = False
         default['state'] = 'open'
         default['tasks'] = []
@@ -342,7 +355,7 @@ class project(osv.osv):
         default.pop('alias_id', None)
         proj = self.browse(cr, uid, id, context=context)
         if not default.get('name', False):
-            default['name'] = proj.name + _(' (copy)')
+            default.update(name=_("%s (copy)") % (proj.name))
         res = super(project, self).copy(cr, uid, id, default, context)
         self.map_tasks(cr,uid,id,res,context)
         return res
@@ -363,7 +376,7 @@ class project(osv.osv):
                 new_date_end = (datetime(*time.strptime(new_date_start,'%Y-%m-%d')[:3])+(end_date-start_date)).strftime('%Y-%m-%d')
             context.update({'copy':True})
             new_id = self.copy(cr, uid, proj.id, default = {
-                                    'name': proj.name +_(' (copy)'),
+                                    'name':_("%s (copy)") % (proj.name),
                                     'state':'open',
                                     'date_start':new_date_start,
                                     'date':new_date_end,
@@ -461,7 +474,7 @@ def Project():
     resource = %s
 """       % (
             project.id,
-            project.date_start, working_days,
+            project.date_start or time.strftime('%Y-%m-%d'), working_days,
             '|'.join(['User_'+str(x) for x in puids])
         )
         vacation = calendar_id and tuple(resource_pool.compute_vacation(cr, uid, calendar_id, context=context)) or False
@@ -514,11 +527,6 @@ def Project():
     # OpenChatter methods and notifications
     # ------------------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(project, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def create(self, cr, uid, vals, context=None):
         if context is None: context = {}
         # Prevent double project creation when 'use_tasks' is checked!
@@ -526,36 +534,33 @@ def Project():
         mail_alias = self.pool.get('mail.alias')
         if not vals.get('alias_id'):
             vals.pop('alias_name', None) # prevent errors during copy()
-            alias_id = mail_alias.create_unique_alias(cr, uid, 
+            alias_id = mail_alias.create_unique_alias(cr, uid,
                           # Using '+' allows using subaddressing for those who don't
                           # have a catchall domain setup.
                           {'alias_name': "project+"+short_name(vals['name'])},
                           model_name=vals.get('alias_model', 'project.task'),
                           context=context)
             vals['alias_id'] = alias_id
+        vals['type'] = 'contract'
         project_id = super(project, self).create(cr, uid, vals, context)
         mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'project_id': project_id} }, context)
         self.create_send_note(cr, uid, [project_id], context=context)
         return project_id
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Project has been <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Project has been <b>created</b>."), context=context)
 
     def set_open_send_note(self, cr, uid, ids, context=None):
-        message = _("Project has been <b>opened</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=_("Project has been <b>opened</b>."), context=context)
 
     def set_pending_send_note(self, cr, uid, ids, context=None):
-        message = _("Project is now <b>pending</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=_("Project is now <b>pending</b>."), context=context)
 
     def set_cancel_send_note(self, cr, uid, ids, context=None):
-        message = _("Project has been <b>cancelled</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=_("Project has been <b>canceled</b>."), context=context)
 
     def set_close_send_note(self, cr, uid, ids, context=None):
-        message = _("Project has been <b>closed</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        return self.message_post(cr, uid, ids, body=_("Project has been <b>closed</b>."), context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         # if alias_model has been changed, update alias_model_id accordingly
@@ -568,7 +573,7 @@ class task(base_stage, osv.osv):
     _name = "project.task"
     _description = "Task"
     _date_name = "date_start"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default section by checking if present in the context """
@@ -608,13 +613,17 @@ class task(base_stage, osv.osv):
         search_domain = []
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
-            search_domain += ['|', '&', ('project_ids', '=', project_id), ('fold', '=', False)]
-        search_domain += ['|', ('id', 'in', ids), '&', ('case_default', '=', True), ('fold', '=', False)]
+            search_domain += ['|', ('project_ids', '=', project_id)]
+        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
         result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
-        return result
+
+        fold = {}
+        for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):
+            fold[stage.id] = stage.fold or False
+        return result, fold
 
     def _read_group_user_id(self, cr, uid, ids, domain, read_group_order=None, access_rights_uid=None, context=None):
         res_users = self.pool.get('res.users')
@@ -631,7 +640,7 @@ class task(base_stage, osv.osv):
         result = res_users.name_get(cr, access_rights_uid, ids, context=context)
         # restore order of the search
         result.sort(lambda x,y: cmp(ids.index(x[0]), ids.index(y[0])))
-        return result
+        return result, {}
 
     _group_by_full = {
         'stage_id': _read_group_stage_ids,
@@ -668,12 +677,12 @@ class task(base_stage, osv.osv):
                 res[task.id]['progress'] = 100.0
         return res
 
-    def onchange_remaining(self, cr, uid, ids, remaining=0.0, planned = 0.0):
+    def onchange_remaining(self, cr, uid, ids, remaining=0.0, planned=0.0):
         if remaining and not planned:
             return {'value':{'planned_hours': remaining}}
         return {}
 
-    def onchange_planned(self, cr, uid, ids, planned = 0.0, effective = 0.0):
+    def onchange_planned(self, cr, uid, ids, planned=0.0, effective=0.0):
         return {'value':{'remaining_hours': planned - effective}}
 
     def onchange_project(self, cr, uid, id, project_id):
@@ -704,21 +713,21 @@ class task(base_stage, osv.osv):
             #FIXME why there is already the copy and the old one
             self.write(cr, uid, new, {'parent_ids':[(6,0,set(parent_ids))], 'child_ids':[(6,0, set(child_ids))]})
 
-    def copy_data(self, cr, uid, id, default={}, context=None):
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
         default = default or {}
         default.update({'work_ids':[], 'date_start': False, 'date_end': False, 'date_deadline': False})
         if not default.get('remaining_hours', False):
             default['remaining_hours'] = float(self.read(cr, uid, id, ['planned_hours'])['planned_hours'])
         default['active'] = True
-        default['stage_id'] = False
         if not default.get('name', False):
             default['name'] = self.browse(cr, uid, id, context=context).name or ''
             if not context.get('copy',False):
-                new_name = _("%s (copy)")%default.get('name','')
+                new_name = _("%s (copy)") % (default.get('name', ''))
                 default.update({'name':new_name})
         return super(task, self).copy_data(cr, uid, id, default, context)
 
-
     def _is_template(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         for task in self.browse(cr, uid, ids, context=context):
@@ -741,20 +750,20 @@ class task(base_stage, osv.osv):
         'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority', select=True),
         'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of tasks."),
         'stage_id': fields.many2one('project.task.type', 'Stage',
-                        domain="['|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=_TASK_STATE, string="State", readonly=True,
-                help='The state is set to \'Draft\', when a case is created.\
-                      If the case is in progress the state is set to \'Open\'.\
-                      When the case is over, the state is set to \'Done\'.\
-                      If the case needs to be reviewed then the state is \
+                selection=_TASK_STATE, string="Status", readonly=True,
+                help='The status is set to \'Draft\', when a case is created.\
+                      If the case is in progress the status is set to \'Open\'.\
+                      When the case is over, the status is set to \'Done\'.\
+                      If the case needs to be reviewed then the status is \
                       set to \'Pending\'.'),
-        'categ_ids': fields.many2many('project.category', string='Categories'),
-        'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State',
+        'categ_ids': fields.many2many('project.category', string='Tags'),
+        'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State',
                                          help="A task's kanban state indicates special situations affecting it:\n"
                                               " * Normal is the default situation\n"
                                               " * Blocked indicates something is preventing the progress of this task\n"
-                                              " * Ready To Pull indicates the task is ready to be pulled to the next stage",
+                                              " * Ready for next stage indicates the task is ready to be pulled to the next stage",
                                          readonly=True, required=False),
         'create_date': fields.datetime('Create Date', readonly=True,select=True),
         'date_start': fields.datetime('Starting Date',select=True),
@@ -788,7 +797,7 @@ class task(base_stage, osv.osv):
             }),
         'user_id': fields.many2one('res.users', 'Assigned to'),
         'delegated_user_id': fields.related('child_ids', 'user_id', type='many2one', relation='res.users', string='Delegated To'),
-        'partner_id': fields.many2one('res.partner', 'Contact'),
+        'partner_id': fields.many2one('res.partner', 'Customer'),
         'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
         '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'),
@@ -796,11 +805,9 @@ class task(base_stage, osv.osv):
         'color': fields.integer('Color Index'),
         'user_email': fields.related('user_id', 'email', type='char', string='User Email', readonly=True),
     }
-
     _defaults = {
         'stage_id': _get_default_stage_id,
         'project_id': _get_default_project_id,
-        'state': 'draft',
         'kanban_state': 'normal',
         'priority': '2',
         'progress': 0,
@@ -809,7 +816,6 @@ class task(base_stage, osv.osv):
         'user_id': lambda obj, cr, uid, context: uid,
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'project.task', context=c),
     }
-
     _order = "priority, sequence, date_start, name, id"
 
     def set_priority(self, cr, uid, ids, priority, *args):
@@ -817,6 +823,11 @@ class task(base_stage, osv.osv):
         """
         return self.write(cr, uid, ids, {'priority' : priority})
 
+    def set_very_high_priority(self, cr, uid, ids, *args):
+        """Set task priority to very high
+        """
+        return self.set_priority(cr, uid, ids, '0')
+    
     def set_high_priority(self, cr, uid, ids, *args):
         """Set task priority to high
         """
@@ -872,15 +883,14 @@ class task(base_stage, osv.osv):
         (_check_recursion, 'Error ! You cannot create recursive tasks.', ['parent_ids']),
         (_check_dates, 'Error ! Task end-date must be greater then task start-date', ['date_start','date_end'])
     ]
-    #
+
     # 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')
         if context is None: context = {}
         # read uom as admin to avoid access rights issues, e.g. for portal/share users,
         # this should be safe (no context passed to avoid side-effects)
-        obj_tm = users_obj.browse(cr, 1, uid, context=context).company_id.project_time_mode_id
+        obj_tm = users_obj.browse(cr, SUPERUSER_ID, uid, context=context).company_id.project_time_mode_id
         tm = obj_tm and obj_tm.name or 'Hours'
 
         res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
@@ -906,9 +916,9 @@ class task(base_stage, osv.osv):
                 res['fields'][f]['string'] = res['fields'][f]['string'].replace('Hours',tm)
         return res
 
-    # ****************************************
+    # ----------------------------------------
     # Case management
-    # ****************************************
+    # ----------------------------------------
 
     def stage_find(self, cr, uid, cases, section_id, domain=[], order='sequence', context=None):
         """ Override of the base.stage method
@@ -1040,10 +1050,12 @@ class task(base_stage, osv.osv):
             new_attachment_ids.append(attachment.copy(cr, uid, attachment_id, default={'res_id': delegated_task_id}, context=context))
         return new_attachment_ids
 
-    def do_delegate(self, cr, uid, ids, delegate_data={}, context=None):
+    def do_delegate(self, cr, uid, ids, delegate_data=None, context=None):
         """
         Delegate Task to another users.
         """
+        if delegate_data is None:
+            delegate_data = {}
         assert delegate_data['user_id'], _("Delegated User should be specified")
         delegated_tasks = {}
         for task in self.browse(cr, uid, ids, context=context):
@@ -1053,7 +1065,6 @@ class task(base_stage, osv.osv):
                 'user_id': delegate_data['user_id'] and delegate_data['user_id'][0] or False,
                 'planned_hours': delegate_data['planned_hours'] or 0.0,
                 'parent_ids': [(6, 0, [task.id])],
-                'state': 'draft',
                 'description': delegate_data['new_task_description'] or '',
                 'child_ids': [],
                 'work_ids': []
@@ -1118,8 +1129,36 @@ class task(base_stage, osv.osv):
             }, context=context)
         return True
 
+    def _subscribe_project_followers_to_task(self, cr, uid, task_id, context=None):
+        """ TDE note: not the best way to do this, we could override _get_followers
+            of task, and perform a better mapping of subtypes than a mapping
+            based on names.
+            However we will keep this implementation, maybe to be refactored
+            in 7.1 of future versions. """
+        # task followers are project followers, with matching subtypes
+        task_record = self.browse(cr, uid, task_id, context=context)
+        subtype_obj = self.pool.get('mail.message.subtype')
+        follower_obj = self.pool.get('mail.followers')
+        if task_record.project_id:
+            # create mapping
+            task_subtype_ids = subtype_obj.search(cr, uid, ['|', ('res_model', '=', False), ('res_model', '=', self._name)], context=context)
+            task_subtypes = subtype_obj.browse(cr, uid, task_subtype_ids, context=context)
+            # fetch subscriptions
+            follower_ids = follower_obj.search(cr, uid, [('res_model', '=', 'project.project'), ('res_id', '=', task_record.project_id.id)], context=context)
+            # copy followers
+            for follower in follower_obj.browse(cr, uid, follower_ids, context=context):
+                if not follower.subtype_ids:
+                    continue
+                project_subtype_names = [project_subtype.name for project_subtype in follower.subtype_ids]
+                task_subtype_ids = [task_subtype.id for task_subtype in task_subtypes if task_subtype.name in project_subtype_names]
+                self.message_subscribe(cr, uid, [task_id], [follower.partner_id.id],
+                    subtype_ids=task_subtype_ids, context=context)
+
     def create(self, cr, uid, vals, context=None):
         task_id = super(task, self).create(cr, uid, vals, context=context)
+        # subscribe project followers to the task
+        self._subscribe_project_followers_to_task(cr, uid, task_id, context=context)
+
         self._store_history(cr, uid, [task_id], context=context)
         self.create_send_note(cr, uid, [task_id], context=context)
         return task_id
@@ -1138,13 +1177,18 @@ class task(base_stage, osv.osv):
                 #if new_stage not in stages:
                     #raise osv.except_osv(_('Warning!'), _('Stage is not defined in the project.'))
                 write_vals = vals_reset_kstate if t.stage_id != new_stage else vals
-                super(task,self).write(cr, uid, [t.id], write_vals, context=context)
+                super(task, self).write(cr, uid, [t.id], write_vals, context=context)
                 self.stage_set_send_note(cr, uid, [t.id], new_stage, context=context)
             result = True
         else:
-            result = super(task,self).write(cr, uid, ids, vals, context=context)
+            result = super(task, self).write(cr, uid, ids, vals, context=context)
         if ('stage_id' in vals) or ('remaining_hours' in vals) or ('user_id' in vals) or ('state' in vals) or ('kanban_state' in vals):
             self._store_history(cr, uid, ids, context=context)
+
+        # subscribe new project followers to the task
+        if vals.get('project_id'):
+            for id in ids:
+                self._subscribe_project_followers_to_task(cr, uid, id, context=context)
         return result
 
     def unlink(self, cr, uid, ids, context=None):
@@ -1181,6 +1225,44 @@ class task(base_stage, osv.osv):
         result += "\n"
         return result
 
+    # ---------------------------------------------------
+    # Mail gateway
+    # ---------------------------------------------------
+
+    def message_new(self, cr, uid, msg, custom_values=None, context=None):
+        """ Override to updates the document according to the email. """
+        if custom_values is None: custom_values = {}
+        custom_values.update({
+            'name': msg.get('subject'),
+            'planned_hours': 0.0,
+        })
+        return super(task,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
+
+    def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
+        """ Override to update the task according to the email. """
+        if update_vals is None: update_vals = {}
+        act = False
+        maps = {
+            'cost':'planned_hours',
+        }
+        for line in msg['body'].split('\n'):
+            line = line.strip()
+            res = tools.misc.command_re.match(line)
+            if res:
+                match = res.group(1).lower()
+                field = maps.get(match)
+                if field:
+                    try:
+                        update_vals[field] = float(res.group(2).lower())
+                    except (ValueError, TypeError):
+                        pass
+                elif match.lower() == 'state' \
+                        and res.group(2).lower() in ['cancel','close','draft','open','pending']:
+                    act = 'do_%s' % res.group(2).lower()
+        if act:
+            getattr(self,act)(cr, uid, ids, context=context)
+        return super(task,self).message_update(cr, uid, msg, update_vals=update_vals, context=context)
+
     # ---------------------------------------------------
     # OpenChatter methods and notifications
     # ---------------------------------------------------
@@ -1209,21 +1291,31 @@ class task(base_stage, osv.osv):
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('project.task.type').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body=_("Stage changed to <b>%s</b>.") % (stage_name),
+            context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Task has been <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Task has been <b>created</b>."), context=context)
 
     def case_draft_send_note(self, cr, uid, ids, context=None):
-        msg = _('Task has been set as <b>draft</b>.')
-        return self.message_append_note(cr, uid, ids, body=msg, context=context)
+        return self.message_post(cr, uid, ids, body=_('Task has been set as <b>draft</b>.'), context=context)
 
     def do_delegation_send_note(self, cr, uid, ids, context=None):
         for task in self.browse(cr, uid, ids, context=context):
             msg = _('Task has been <b>delegated</b> to <em>%s</em>.') % (task.user_id.name)
-            self.message_append_note(cr, uid, [task.id], body=msg, context=context)
+            self.message_post(cr, uid, [task.id], body=msg, context=context)
         return True
-
+   
+    def project_task_reevaluate(self, cr, uid, ids, context=None):
+        if self.pool.get('res.users').has_group(cr, uid, 'project.group_time_work_estimation_tasks'):
+            return {
+                'view_type': 'form',
+                "view_mode": 'form',
+                'res_model': 'project.task.reevaluate',
+                'type': 'ir.actions.act_window',
+                'target': 'new',
+            }
+        return self.do_reopen(cr, uid, ids, context=context)
 
 class project_work(osv.osv):
     _name = "project.task.work"
@@ -1268,7 +1360,7 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_tasks': fields.boolean('Tasks Mgmt.',help="If check,this contract will be available in the project menu and you will be able to manage tasks or track issues"),
+        'use_tasks': fields.boolean('Tasks',help="If checked, this contract will be available in the project menu and you will be able to manage tasks or track issues"),
         'company_uom_id': fields.related('company_id', 'project_time_mode_id', type='many2one', relation='product.uom'),
     }
 
@@ -1330,16 +1422,15 @@ class project_project(osv.osv):
         'use_tasks': True
     }
 
-
-#
-# Tasks History, used for cumulative flow charts (Lean/Agile)
-#
-
 class project_task_history(osv.osv):
+    """
+    Tasks History, used for cumulative flow charts (Lean/Agile)
+    """
     _name = 'project.task.history'
     _description = 'History of Tasks'
     _rec_name = 'task_id'
     _log_access = False
+
     def _get_date(self, cr, uid, ids, name, arg, context=None):
         result = {}
         for history in self.browse(cr, uid, ids, context=context):
@@ -1378,7 +1469,7 @@ class project_task_history(osv.osv):
         'task_id': fields.many2one('project.task', 'Task', ondelete='cascade', required=True, select=True),
         'type_id': fields.many2one('project.task.type', 'Stage'),
         'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done')], 'Status'),
-        'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready To Pull')], 'Kanban State', required=False),
+        'kanban_state': fields.selection([('normal', 'Normal'),('blocked', 'Blocked'),('done', 'Ready for next stage')], 'Kanban State', required=False),
         'date': fields.date('Date', select=True),
         'end_date': fields.function(_get_date, string='End Date', type="date", store={
             'project.task.history': (_get_related_date, None, 20)
@@ -1391,35 +1482,40 @@ class project_task_history(osv.osv):
         'date': fields.date.context_today,
     }
 
-
 class project_task_history_cumulative(osv.osv):
     _name = 'project.task.history.cumulative'
     _table = 'project_task_history_cumulative'
     _inherit = 'project.task.history'
     _auto = False
+
     _columns = {
         'end_date': fields.date('End Date'),
-        'project_id': fields.related('task_id', 'project_id', string='Project', type='many2one', relation='project.project')
+        'project_id': fields.many2one('project.project', 'Project'),
     }
+
     def init(self, cr):
-        cr.execute(""" CREATE OR REPLACE VIEW project_task_history_cumulative AS (
+        tools.drop_view_if_exists(cr, 'project_task_history_cumulative')
+
+        cr.execute(""" CREATE VIEW project_task_history_cumulative AS (
             SELECT
-                history.date::varchar||'-'||history.history_id::varchar as id,
-                history.date as end_date,
+                history.date::varchar||'-'||history.history_id::varchar AS id,
+                history.date AS end_date,
                 *
             FROM (
                 SELECT
-                    id as history_id,
-                    date+generate_series(0, CAST((coalesce(end_date,DATE 'tomorrow')::date - date)AS integer)-1) as date,
-                    task_id, type_id, user_id, kanban_state, state,
-                    greatest(remaining_hours,1) as remaining_hours, greatest(planned_hours,1) as planned_hours
+                    h.id AS history_id,
+                    h.date+generate_series(0, CAST((coalesce(h.end_date, DATE 'tomorrow')::date - h.date) AS integer)-1) AS date,
+                    h.task_id, h.type_id, h.user_id, h.kanban_state, h.state,
+                    greatest(h.remaining_hours, 1) AS remaining_hours, greatest(h.planned_hours, 1) AS planned_hours,
+                    t.project_id
                 FROM
-                    project_task_history
-            ) as history
+                    project_task_history AS h
+                    JOIN project_task AS t ON (h.task_id = t.id)
+
+            ) AS history
         )
         """)
 
-
 class project_category(osv.osv):
     """ Category of project's task (or issue) """
     _name = "project.category"
diff --git a/addons/project/project_data.xml b/addons/project/project_data.xml
index c2d37f7943d..08981bd126a 100644
--- a/addons/project/project_data.xml
+++ b/addons/project/project_data.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
+    <data>
         <!-- This will set the unit of measure used in projects and tasks.-->
         <record id="base.main_company" model="res.company">
             <field name="project_time_mode_id" ref="product.product_uom_hour"></field>
@@ -72,7 +72,7 @@
         </record>
         <record id="project_tt_deployment" model="project.task.type">
             <field name="sequence">7</field>
-            <field name="name">Deployment</field>
+            <field name="name">Done</field>
             <field name="state">done</field>
             <field name="case_default" eval="True"/>
         </record>
@@ -84,14 +84,52 @@
             <field name="fold" eval="True"/>
         </record>
 
-        <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Project Management has been installed</value>
-            <value>Manage multi-level projects and tasks.  You can delegate tasks, track the work done on tasks, and review your planning based on the entered data.
+        <!-- mail: subtypes -->
+        <record id="mt_project_new" model="mail.message.subtype">
+            <field name="name">New</field>
+            <field name="res_model">project.project</field>
+            <field name="default" eval="False"/>
+        </record>
+        <record id="mt_project_closed" model="mail.message.subtype">
+            <field name="name">Closed</field>
+            <field name="res_model">project.project</field>
+        </record>
+        <record id="mt_project_canceled" model="mail.message.subtype">
+            <field name="name">Canceled</field>
+            <field name="res_model">project.project</field>
+        </record>
+        <record id="mt_project_stage" model="mail.message.subtype">
+            <field name="name">Stage Changed</field>
+            <field name="res_model">project.project</field>
+        </record>
 
-You can manage todo lists on tasks by installing the module "Todo Lists", which supports the methodology Getting Things Done (GTD).  You can also manage issues/bugs in projects by installing the module "Issues Tracker."</value>
-        </function>
+        <record id="mt_task_new" model="mail.message.subtype">
+            <field name="name">New</field>
+            <field name="res_model">project.task</field>
+        </record>
+        <record id="mt_task_closed" model="mail.message.subtype">
+            <field name="name">Closed</field>
+            <field name="res_model">project.task</field>
+        </record>
+        <record id="mt_task_canceled" model="mail.message.subtype">
+            <field name="name">Canceled</field>
+            <field name="res_model">project.task</field>
+        </record>
+        <record id="mt_task_change" model="mail.message.subtype">
+            <field name="name">Stage Changed</field>
+            <field name="res_model">project.task</field>
+        </record>
+
+        <!-- notify all employees of module installation -->
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Project Management application installed!</field>
+            <field name="body"><![CDATA[<p>Manage multi-level projects and tasks.  You can delegate tasks, track task work, and review your planning.</p>
+<p>You can manage todo lists on tasks by installing the <i>Todo Lists</i> application, supporting the Getting Things Done (GTD) methodology.</p>
+<p>You can also manage issues/bugs in projects by installing the "Issue Tracker" application.</p>]]></field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 0ead9f4443c..698a1a99627 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -7,49 +7,6 @@
             <field name="groups_id" eval="[(4, ref('base.group_sale_salesman')),(4, ref('group_project_user'))]"/>
         </record>
 
-        <record id="base.user_niv" model="res.users">
-            <field name="name">Nicolas</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]"/>
-            <field name="login">niv</field>
-            <field name="password">niv</field>
-        </record>
-        <record id="base.user_al" model="res.users">
-            <field name="name">Antony</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_manager')])]"/>
-            <field name="login">al</field>
-            <field name="password">al</field>
-        </record>
-        <record id="base.user_qdp" model="res.users">
-            <field name="name">Quentin</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
-            <field name="login">qdp</field>
-            <field name="password">qdp</field>
-        </record>
-        <record id="base.user_fpi" model="res.users">
-            <field name="name">Francois</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
-            <field name="login">fpi</field>
-            <field name="password">fpi</field>
-        </record>
-        <record id="base.user_jth" model="res.users">
-            <field name="name">Julien</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
-            <field name="login">jth</field>
-            <field name="password">jth</field>
-        </record>
-        <record id="base.user_mit" model="res.users">
-            <field name="name">Minh</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_user')])]"/>
-            <field name="login">mit</field>
-            <field name="password">mit</field>
-        </record>
-        <record id="base.user_vad" model="res.users">
-            <field name="name">Valérie</field>
-            <field name="groups_id" eval="[(6, 0, [ref('base.group_user')])]"/>
-            <field name="login">vad</field>
-            <field name="password">vad</field>
-        </record>
-
         <!-- Categories -->
         <record id="project_category_01" model="project.category">
             <field name="name">Contact's suggestion</field>
@@ -64,36 +21,19 @@
             <field name="name">Usability</field>
         </record>
 
-        <!-- Projects -->
-        <record id="project_project_internal" model="project.project">
-            <field name="name">Internal Projects</field>
-            <field name="parent_id" ref="all_projects_account"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
-        </record>
-
-        <record id="project_project_customer" model="project.project">
-            <field name="name">Customer Projects</field>
-            <field name="parent_id" ref="all_projects_account"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="alias_model">project.task</field>
-            <field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_negotiation'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
-        </record>
-
         <record id="project_project_1" model="project.project">
             <field name="date_start" eval="time.strftime('%Y-%m-01 10:00:00')"/>
             <field name="state">open</field>
             <field name="type">normal</field>
             <field name="name">The Jackson Group's Project</field>
+            <field name="color">3</field>
             <field name="partner_id" ref="base.res_partner_10"/>
             <field name="parent_id" ref="all_projects_account"/>
-            <field name="privacy_visibility">followers</field>
+            <field name="privacy_visibility">public</field>
             <field name="members" eval="[(6, 0, [
-                    ref('base.user_niv'),
-                    ref('base.user_al'),
-                    ref('base.user_qdp')])]"/>
-            <field name="user_id" ref="base.user_al"/>
+                    ref('base.user_root'),
+                    ref('base.user_demo')])]"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="description">Implement new website for Sale and Warehouse Management for a customer.</field>
             <field name="alias_model">project.task</field>
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_analysis'),ref('project_tt_specification'),ref('project_tt_negotiation'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_deployment')])]"/>
@@ -102,7 +42,8 @@
         <record id="project_project_2" model="project.project">
             <field name="name">Research &amp; Development</field>
             <field name="parent_id" ref="all_projects_account"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="privacy_visibility">public</field>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
         </record>
@@ -113,10 +54,10 @@
             <field name="name">E-Learning Integration</field>
             <field name="user_id" ref="base.user_demo"/>
             <field name="alias_model">project.task</field>
+            <field name="privacy_visibility">public</field>
             <field name="members" eval="[(6, 0, [
-                    ref('base.user_fpi'),
-                    ref('base.user_jth'),
-                    ref('base.user_mit')])]"/>
+                    ref('base.user_root'),
+                    ref('base.user_demo')])]"/>
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_specification'),ref('project_tt_development'),ref('project_tt_testing'),ref('project_tt_merge'),ref('project_tt_deployment')])]"/>
         </record>
 
@@ -128,8 +69,8 @@
             <field name="alias_model">project.task</field>
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_design'),ref('project_tt_development'),ref('project_tt_testing')])]"/>
             <field name="members" eval="[(6, 0, [
-                    ref('base.user_niv'),
-                    ref('base.user_mit')])]"/>
+                    ref('base.user_root'),
+                    ref('base.user_demo')])]"/>
         </record>
 
         <record id="project_project_5" model="project.project">
@@ -141,7 +82,7 @@
             <field name="type_ids" eval="[(6, 0, [ref('project_tt_development')])]"/>
             <field name="members" eval="[(6, 0, [
                     ref('base.user_root'),
-                    ref('base.user_qdp')])]"/>
+                    ref('base.user_demo')])]"/>
         </record>
 
 
@@ -149,7 +90,7 @@
         <record id="project_task_1" model="project.task">
             <field name="planned_hours" eval="40.0"/>
             <field name="remaining_hours" eval="40.0"/>
-            <field name="user_id" ref="base.user_niv"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Prepare Requirements Document</field>
@@ -159,7 +100,7 @@
         <record id="project_task_2" model="project.task">
             <field name="planned_hours" eval="32.0"/>
             <field name="remaining_hours" eval="32.0"/>
-            <field name="user_id" ref="base.user_niv"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Make SRS</field>
@@ -168,7 +109,7 @@
         <record id="project_task_3" model="project.task">
             <field name="planned_hours" eval="10.0"/>
             <field name="remaining_hours" eval="10.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Budget Planning</field>
@@ -179,7 +120,7 @@
         <record id="project_task_4" model="project.task">
             <field name="planned_hours" eval="60.0"/>
             <field name="remaining_hours" eval="60.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">4</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Develop module for Sale Management</field>
@@ -193,7 +134,7 @@
         <record id="project_task_5" model="project.task">
             <field name="planned_hours" eval="76.0"/>
             <field name="remaining_hours" eval="76.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Develop module for Warehouse</field>
@@ -207,7 +148,7 @@
         <record id="project_task_6" model="project.task">
             <field name="planned_hours" eval="24.0"/>
             <field name="remaining_hours" eval="24.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Integrate Modules</field>
@@ -216,7 +157,7 @@
         <record id="project_task_7" model="project.task">
             <field name="planned_hours" eval="15.0"/>
             <field name="remaining_hours" eval="5.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_1"/>
             <field name="name">Internal testing + Software Install</field>
@@ -225,7 +166,7 @@
         <record id="project_task_8" model="project.task">
             <field name="planned_hours" eval="22.0"/>
             <field name="remaining_hours" eval="22.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">New portal system</field>
@@ -237,7 +178,7 @@
         <record id="project_task_9" model="project.task">
             <field name="planned_hours" eval="18.0"/>
             <field name="remaining_hours" eval="18.0"/>
-            <field name="user_id" ref="base.user_al"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Document history management</field>
@@ -246,7 +187,7 @@
         <record id="project_task_10" model="project.task">
             <field name="planned_hours" eval="38.0"/>
             <field name="remaining_hours" eval="38.0"/>
-            <field name="user_id" ref="base.user_fpi"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Social network integration</field>
@@ -256,7 +197,7 @@
         <record id="project_task_11" model="project.task">
             <field name="planned_hours" eval="16.0"/>
             <field name="remaining_hours" eval="16.0"/>
-            <field name="user_id" ref="base.user_fpi"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">User interface improvements</field>
@@ -270,7 +211,7 @@
         <record id="project_task_12" model="project.task">
             <field name="planned_hours" eval="40.0"/>
             <field name="remaining_hours" eval="40.0"/>
-            <field name="user_id" ref="base.user_fpi"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_2"/>
             <field name="name">Improve+clean code and functionality</field>
@@ -282,7 +223,7 @@
         <record id="project_task_13" model="project.task">
             <field name="planned_hours" eval="12.0"/>
             <field name="remaining_hours" eval="12.0"/>
-            <field name="user_id" ref="base.user_mit"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Design Use Cases</field>
@@ -293,7 +234,7 @@
         <record id="project_task_14" model="project.task">
             <field name="planned_hours" eval="12.0"/>
             <field name="remaining_hours" eval="12.0"/>
-            <field name="user_id" ref="base.user_mit"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Dataflow Design</field>
@@ -302,7 +243,7 @@
         <record id="project_task_15" model="project.task">
             <field name="planned_hours" eval="55.0"/>
             <field name="remaining_hours" eval="55.0"/>
-            <field name="user_id" ref="base.user_fpi"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">User Interface design</field>
@@ -316,7 +257,7 @@
             <field name="sequence" eval="10"/>
             <field name="planned_hours" eval="80.0"/>
             <field name="remaining_hours" eval="80.0"/>
-            <field name="user_id" ref="base.user_mit"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Set target for all deparments</field>
@@ -327,7 +268,7 @@
         <record id="project_task_17" model="project.task">
             <field name="planned_hours" eval="34.0"/>
             <field name="remaining_hours" eval="34.0"/>
-            <field name="user_id" ref="base.user_niv"/>
+            <field name="user_id" ref="base.user_demo"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Integration of core components</field>
@@ -338,7 +279,7 @@
         <record id="project_task_18" model="project.task">
             <field name="planned_hours" eval="16.0"/>
             <field name="remaining_hours" eval="16.0"/>
-            <field name="user_id" ref="base.user_niv"/>
+            <field name="user_id" ref="base.user_root"/>
             <field name="priority">2</field>
             <field name="project_id" ref="project.project_project_3"/>
             <field name="name">Deploy and review on live system</field>
@@ -438,5 +379,34 @@
         <function model="project.project" name="schedule_tasks"
             eval="[ref('project_project_3'), ref('project_project_4'), ref('project_project_5')], {'install_mode': True}"/>
 
+        <record id="message_task_1" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_22"/>
+            <field name="body">Hello Demo,
+There is a change in customer requirement.
+Can you check the document from customer again.
+Thanks,</field>
+            <field name="type">comment</field>
+            <field name="author_id" ref="base.partner_root"/>
+        </record>
+        <record id="message_task_2" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_22"/>
+            <field name="parent_id" ref="message_task_1"/>
+            <field name="body">Ok, I have checked the mail,
+I will update the document and let you know.</field>
+            <field name="type">comment</field>
+            <field name="author_id" ref="base.partner_demo"/>
+        </record>
+        <record id="message_task_3" model="mail.message">
+            <field name="model">project.task</field>
+            <field name="res_id" ref="project_task_22"/>
+            <field name="parent_id" ref="message_task_2"/>
+            <field name="body">Fine!
+Send it ASAP, its urgent.</field>
+            <field name="type">comment</field>
+            <field name="author_id" ref="base.partner_root"/>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 6dbcaebd045..e7f12ff3797 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -11,14 +11,13 @@
         <menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
         <menuitem id="base.menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
 
-        <act_window
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"
-            id="act_project_project_2_project_task_all"
-            name="Tasks"
-            res_model="project.task"
-            src_model="project.project"
-            view_mode="kanban,tree,form,calendar,graph"
-            view_type="form"/>
+        <record id="act_project_project_2_project_task_all" model="ir.actions.act_window">
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="name">Tasks</field>
+            <field name="view_mode">kanban,tree,form,calendar,graph</field>
+            <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+        </record>
 
         <!-- Project Read/Unread actions -->
         <record id="actions_server_project_unread" model="ir.actions.server">
@@ -27,7 +26,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_project"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_project_unread" model="ir.values">
             <field name="name">action_project_unread</field>
@@ -45,7 +44,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_project"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_project_read" model="ir.values">
             <field name="name">action_project_read</field>
@@ -64,8 +63,8 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                 <header>
-                    <button name="set_done" string="Done" type="object" states="open,pending"/>
                     <button name="set_open" string="Re-open project" type="object" states="pending" class="oe_highlight"/>
+                    <button name="set_done" string="Close Project" type="object" states="open,pending"/>
                     <button name="set_open" string="Re-open project" type="object" states="cancelled,close"/>
                     <button name="set_pending" string="Pending" type="object" states="open"/>
                     <button name="set_template" string="Set as Template" type="object" states="open"/>
@@ -76,39 +75,37 @@
                 </header>
                 <sheet string="Project">
                     <field name="analytic_account_id" invisible="1" required="0"/>
-                    <label for="name" class="oe_edit_only" string="Project Name"/>
-                    <h1>
-                        <field name="name" string="Project Name"/>
-                    </h1>
-                    <div attrs="{'invisible': [('alias_domain', '=', False)]}">
-                        <field name="alias_id" invisible="1" required="0"/>
-                        <label for="alias_name" class="oe_edit_only "/>
-                        <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
+                    <div class="oe_title">
+                        <label for="name" class="oe_edit_only" string="Project Name"/>
+                        <h1>
+                            <field name="name" string="Project Name"/>
+                        </h1>
+                        <div name="options_active">
+                            <field name="use_tasks" class="oe_inline"/>
+                            <label for="use_tasks"/>
+                        </div>
+                    </div>
+                    <div class="oe_right oe_button_box" name="buttons">
+                        <button name="%(act_project_project_2_project_task_all)d" string="Tasks"
+                            type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/>
+                        <button name="attachment_tree_view" string="Documents" type="object"/>
                     </div>
                     <group>
                         <group>
-                            <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
-                            <field name="partner_id" string="Contact" on_change="onchange_partner_id(partner_id)"/>
                             <field name="privacy_visibility"/>
-                            <field name="analytic_account_id" invisible="1" required="0"/>
+                            <field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
                         </group>
                         <group>
-                            <table>
-                                <tr name="use_tasks_row">
-                                    <td><group><field name="use_tasks"/></group></td>
-                                    <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_task_all)d" string="Tasks" type="action" attrs="{'invisible':[('use_tasks','=', 0)]}"/></td>
-                                </tr>
-                                <tr name="use_attachment_row">
-                                    <td/>
-                                    <td><button icon="terp-gtk-go-back-rtl" class="oe_btn_width" name="%(base.action_attachment)d" string="Documents" type="action"/></td>
-                                </tr>
-                            </table>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
+                            <p colspan="2" attrs="{'invisible': [('analytic_account_id','=',False)]}">
+                                To invoice or setup invoicing and renewal options, go to the related contract: <field name="analytic_account_id" readonly="1" required="0" class="oe_inline"/>.
+                            </p>
                         </group>
                     </group>
                     <notebook>
                         <page string="Team" name="team">
                             <field colspan="4" name="members" widget="many2many_kanban">
-                                <kanban quick_create="true" create="false">
+                                <kanban quick_create="false" create="true">
                                     <field name="name"/>
                                     <templates>
                                         <t t-name="kanban-box">
@@ -127,40 +124,48 @@
                         </page>
                         <page string="Other Info">
                             <group>
-                                <group string="Administration">
+                                <group string="Email Interface" attrs="{'invisible': [('alias_domain', '=', False)]}">
+                                    <div>
+                                        <field name="alias_id" invisible="1" required="0"/>
+                                        <label for="alias_name" class="oe_edit_only "/>
+                                        <field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
+                                    </div>
+                                </group>
+                                <group string="Administration" groups="project.group_time_work_estimation_tasks">
                                     <field name="planned_hours" widget="float_time"/>
                                     <field name="effective_hours" widget="float_time"/>
                                     <field name="resource_calendar_id"/>
                                 </group>
                                 <group string="Miscellaneous" name="misc">
-                                    <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/>
-                                    <field name="priority"/>
+                                    <field name="date_start"/>
+                                    <field name="date" string="End Date"/>
+                                    <field name="priority" groups="base.group_no_one"/>
                                     <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/>
-                                    <field name="currency_id" groups="base.group_multi_company" required="1"/>
-                                    <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/>
+                                    <field name="currency_id" groups="base.group_multi_currency" required="1"/>
+                                    <field name="parent_id" string="Parent" help="Append this project to another one using analytic accounts hierarchy" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}" />
                                 </group>
                             </group>
                         </page>
-                        <page string="Tasks Stages">
+                        <page string="Tasks Stages" attrs="{'invisible': [('use_tasks', '=', False)]}">
                              <field name="type_ids"/>
                         </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
+                    <field name="message_follower_ids" widget="mail_followers" help="Follow this project to automatically follow all related tasks and issues."/>
                     <field name="message_ids" widget="mail_thread"/>
-                    <field name="message_follower_ids" widget="mail_followers"/>
                 </div>
                 </form>
             </field>
         </record>
 
-       <record id="view_project_project_filter" model="ir.ui.view">
+        <record id="view_project_project_filter" model="ir.ui.view">
             <field name="name">project.project.select</field>
             <field name="model">project.project</field>
             <field name="arch" type="xml">
                 <search string="Search Project">
-                    <field name="complete_name" string="Project Name"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <field name="name" string="Project Name"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-check" string="Open" name="Current" domain="[('state', '=','open')]" help="Open Projects"/>
                     <filter icon="gtk-media-pause" string="Pending" name="Pending" domain="[('state', '=','pending')]" help="Pending Projects"/>
@@ -185,9 +190,9 @@
             <field name="model">project.project</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="red:date and (date&lt;current_date) and (state == 'open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
+                <tree fonts="bold:message_unread==True" colors="red:date and (date&lt;current_date) and (state == 'open');blue:state in ('draft','pending');grey: state in ('close','cancelled')" string="Projects">
                     <field name="sequence" invisible="1"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                     <field name="date" invisible="1"/>
                     <field name="name" string="Project Name"/>
                     <field name="user_id" string="Project Manager"/>
@@ -202,20 +207,11 @@
             </field>
         </record>
 
-        <act_window
-            context="{'search_default_project_id': active_id, 'default_project_id': active_id}"
-            id="act_project_project_2_project_task_all"
-            name="Tasks"
-            res_model="project.task"
-            src_model="project.project"
-            view_mode="kanban,tree,form,calendar,graph"
-            view_type="form"/>
-
         <record model="ir.ui.view" id="view_project_kanban">
             <field name="name">project.project.kanban</field>
             <field name="model">project.project</field>
             <field name="arch" type="xml">
-                <kanban>
+                <kanban version="7.0" class="oe_background_grey">
                     <field name="effective_hours"/>
                     <field name="planned_hours"/>
                     <field name="name"/>
@@ -227,36 +223,39 @@
                     <field name="task_count"/>
                     <field name="alias_id"/>
                     <field name="alias_domain"/>
+                    <field name="doc_count"/>
                     <templates>
                         <t t-name="kanban-box">
                             <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">í</span>
                                     <ul class="oe_dropdown_menu">
-                                        <li><a type="edit">Edit...</a></li>
-                                        <li><a type="delete">Delete</a></li>
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Project Settings</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
                                 </div>
                                 <div class="oe_kanban_content">
-                                    <h3 class="oe_kanban_ellipsis"><field name="name"/></h3>
 
+                                    <h4><field name="name"/></h4>
                                     <div class="oe_kanban_project_list">
-                                        <a t-if="record.use_tasks.raw_value"
-                                            name="%(act_project_project_2_project_task_all)d" type="action">
-                                            Tasks(<field name="task_count"/>)</a>
+                                        <a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action" style="margin-right: 10px"> 
+                                            <span t-if="record.task_count.raw_value gt 1"><field name="task_count"/> Tasks</span>
+                                            <span t-if="record.task_count.raw_value lt 2"><field name="task_count"/> Task</span>
+                                        </a>
                                     </div>
-
-                                    <div class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">
-                                        <div>Deadline</div>
-                                        <div><field name="date"/></div>
+                                    <div class="oe_kanban_project_list">
+                                        <a t-if="record.doc_count.raw_value" name="attachment_tree_view" type="object" style="margin-right: 10px"> <field name="doc_count"/> Documents</a>
                                     </div>
-                                    <div class="oe_kanban_project_fields oe_kanban_project_progress">
-                                        <div>Progress</div>
-                                        <div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>
-                                    </div>
-                                    <div name="alias_box" t-if="record.alias_domain.raw_value" class="oe_kanban_ellipsis">
-                                        <a t-attf-href="mailto:#{record.alias_id.value}"><field name="alias_id"/></a>
+                                    <div class="oe_kanban_footer_left">
+                                        <span groups="project.group_time_work_estimation_tasks">
+                                            <span class="oe_e">R</span>
+                                            <t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/>
+                                        </span>
+                                        <span t-if="record.date.raw_value">
+                                            <span class="oe_e">N</span>
+                                            <field name="date"/>
+                                        </span>
                                     </div>
                                     <div class="oe_kanban_project_avatars">
                                         <t t-foreach="record.members.raw_value" t-as="member">
@@ -290,18 +289,16 @@
             <field name="search_view_id" ref="view_project_project_filter"/>
             <field name="context">{}</field>
             <field name="help" type="html">
-                <p class="oe_form_nocontent_create">
+                <p class="oe_view_nocontent_create">
                   Click to start a new project.
-                </p>
-                <p>
+                </p><p>
                   Projects are used to organize your activities; plan
                   tasks, track issues, invoice timesheets. You can define
                   internal projects (R&amp;D, Improve Sales Process),
                   private projects (My Todos) or customer ones.
-                </p>
-                <p>
-                    You will be able collaborate with internal users on
-                    projects or invite customers to share your activities.
+                </p><p>
+                  You will be able collaborate with internal users on
+                  projects or invite customers to share your activities.
                 </p>
             </field>
         </record>
@@ -323,7 +320,7 @@
                         <field colspan="4" name="name"/>
                         <field name="hours" widget="float_time"/>
                         <field name="date"/>
-                        <field name="user_id" options='{"no_open": true}'/>
+                        <field name="user_id" options='{"no_open": True}'/>
                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     </group>
                 </form>
@@ -352,7 +349,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_task"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_project_task_unread" model="ir.values">
             <field name="name">action_project_task_unread</field>
@@ -370,7 +367,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_task"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_project_task_read" model="ir.values">
             <field name="name">action_project_task_read</field>
@@ -389,22 +386,18 @@
             <field name="arch" type="xml">
                 <form string="Project" version="7.0">
                     <header>
-                        <span groups="base.group_user">
-                            <!--
-                            <button name="do_open" string="Start Task" type="object"
-                                    states="draft,pending" class="oe_highlight"/>
-                            <button name="do_draft" string="Draft" type="object"
-                                    states="cancel,done"/>
-                            -->
-                            <button name="%(action_project_task_reevaluate)d" string="Reactivate" type="action"
-                                    states="cancelled,done" context="{'button_reactivate':True}"/>
-                            <button name="action_close" string="Done" type="object"
-                                    states="draft,open,pending" class="oe_highlight"/>
-                            <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
-                                    states="pending,open,draft" groups="project.group_delegate_task"/>
-                            <button name="do_cancel" string="Cancel" type="object"
-                                    states="draft,open,pending"/>
-                        </span>
+                        <!--
+                        <button name="do_open" string="Start Task" type="object"
+                                states="draft,pending" class="oe_highlight"/>
+                        <button name="do_draft" string="Draft" type="object"
+                                states="cancel,done"/>
+                        -->
+                        <button name="project_task_reevaluate" string="Reactivate" type="object"
+                                states="cancelled,done" context="{'button_reactivate':True}" groups="base.group_user"/>
+                        <button name="action_close" string="Done" type="object"
+                                states="draft,open,pending" groups="base.group_user"/>
+                        <button name="do_cancel" string="Cancel Task" type="object"
+                                states="draft,open,pending" groups="base.group_user"/>
                         <field name="stage_id" widget="statusbar" clickable="True"/>
                     </header>
                     <sheet string="Task">
@@ -415,16 +408,17 @@
                     <group>
                         <group>
                             <field name="project_id"  on_change="onchange_project(project_id)" context="{'default_use_tasks':1}"/>
-                            <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" options='{"no_open": true}'/>
+                            <field name="user_id" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}" options='{"no_open": True}'/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                            <field name="planned_hours" widget="float_time"
+                                    groups="project.group_time_work_estimation_tasks"
+                                    on_change="onchange_planned(planned_hours, effective_hours)"/>
                         </group>
                         <group>
                             <field name="date_deadline" attrs="{'readonly':[('state','in',['done', 'cancelled'])]}"/>
-                            <field name="progress" widget="progressbar"
-                                groups="project.group_time_work_estimation_tasks"/>
-                        </group>
-                        <group>
                             <field name="categ_ids" widget="many2many_tags"/>
+                            <field name="progress" widget="progressbar"
+                                groups="project.group_time_work_estimation_tasks" attrs="{'invisible':[('state','=','cancelled')]}"/>
                         </group>
                     </group>
                     <notebook>
@@ -432,10 +426,10 @@
                             <field name="description" attrs="{'readonly':[('state','=','done')]}" placeholder="Add a Description..."/>
                             <field name="work_ids" groups="project.group_tasks_work_on_tasks">
                                 <tree string="Task Work" editable="top">
-                                    <field name="date"/>
                                     <field name="name"/>
-                                    <field name="user_id"/>
                                     <field name="hours" widget="float_time" sum="Spent Hours"/>
+                                    <field name="date"/>
+                                    <field name="user_id"/>
                                 </tree>
                             </field>
                             <group>
@@ -450,7 +444,9 @@
                             </group>
                             <div class="oe_clear"/>
                         </page>
-                        <page string="Delegations History" groups="project.group_delegate_task">
+                        <page string="Delegation" groups="project.group_delegate_task">
+                            <button name="%(action_project_task_delegate)d" string="Delegate" type="action"
+                                    states="pending,open,draft" groups="project.group_delegate_task"/>
                             <separator string="Parent Tasks"/>
                             <field name="parent_ids"/>
                             <separator string="Delegated tasks"/>
@@ -459,7 +455,7 @@
                                     <field name="name"/>
                                     <field name="user_id"/>
                                     <field name="stage_id"/>
-                                    <field name="state" groups="base.group_no_one"/>
+                                    <field name="state" invisible="1"/>
                                     <field name="effective_hours" widget="float_time"/>
                                     <field name="progress" widget="progressbar"/>
                                     <field name="remaining_hours" widget="float_time"/>
@@ -472,23 +468,20 @@
                                 <field name="priority" groups="base.group_user"/>
                                 <field name="sequence"/>
                                 <field name="partner_id"/>
-                                <field name="planned_hours" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}"
-                                    groups="project.group_time_work_estimation_tasks"
-                                    on_change="onchange_planned(planned_hours, effective_hours)"/>
-                                <field name="state" groups="base.group_no_one"/>
+                                <field name="state" invisible="1"/>
                             </group>
                         </page>
                     </notebook>
                     </sheet>
                     <div class="oe_chatter">
-                        <field name="message_ids" widget="mail_thread"/>
                         <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
                     </div>
                 </form>
             </field>
         </record>
 
-        <!-- Project Task Kanban View  -->
+        <!-- Project Task Kanban View -->
         <record model="ir.ui.view" id="view_task_kanban">
             <field name="name">project.task.kanban</field>
             <field name="model">project.task</field>
@@ -506,7 +499,7 @@
                     <field name="remaining_hours" sum="Remaining Time" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline"/>
                     <field name="message_summary"/>
-                    <field name="needaction_pending"/>
+                    <field name="message_unread"/>
                     <field name="categ_ids"/>
                     <templates>
                     <t t-name="kanban-box">
@@ -514,10 +507,10 @@
                             <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                 <span class="oe_e">í</span>
                                 <ul class="oe_dropdown_menu">
-                                    <li><a type="edit" >Edit...</a></li>
-                                    <li><a type="delete">Delete</a></li>
+                                    <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                    <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                     <li>
-                                      <ul class="oe_kanban_project_times">
+                                      <ul class="oe_kanban_project_times" groups="project.group_time_work_estimation_tasks">
                                         <li><a name="set_remaining_time_1" type="object" class="oe_kanban_button">1</a></li>
                                         <li><a name="set_remaining_time_2" type="object" class="oe_kanban_button">2</a></li>
                                         <li><a name="set_remaining_time_5" type="object" class="oe_kanban_button">5</a></li>
@@ -532,16 +525,18 @@
                             <div class="oe_kanban_content">
                                 <div><b><field name="name"/></b></div>
                                 <div>
-                                    <field name="project_id"/>
-                                    <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br/>
-                                    <i><field name="date_deadline"/></i>
+                                    <field name="project_id"/><br/>
+                                    <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/><br t-if="record.description.value"/>
+                                    <t t-if="record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
+                                    <span t-attf-class="#{red || ''}"><i><field name="date_deadline"/></i></span>
                                 </div>
                                 <div class="oe_kanban_bottom_right">
-                                    <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="Ready to Pull" name="set_kanban_state_done" class="oe_kanban_status"> </a>
-                                    <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready to Pull" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
+                                    <a t-if="record.kanban_state.raw_value === 'normal'" type="object" string="In Progress" name="set_kanban_state_done" class="oe_kanban_status"> </a>
+                                    <a t-if="record.kanban_state.raw_value === 'done'" type="object" string="Ready for next stage" name="set_kanban_state_blocked" class="oe_kanban_status oe_kanban_status_green"> </a>
                                     <a t-if="record.kanban_state.raw_value === 'blocked'" type="object" string="Blocked" name="set_kanban_state_normal" class="oe_kanban_status oe_kanban_status_red"> </a>
-                                    <a t-if="record.priority.raw_value == 1" type="object" string="Priority" name="set_normal_priority" class="oe_e oe_star_on">7</a>
-                                    <a t-if="record.priority.raw_value != 1" type="object" string="Priority" name="set_high_priority" class="oe_e oe_star_off">7</a>
+                                    <a t-if="record.priority.raw_value == 2" type="object" string="Important" name="set_very_high_priority" class="oe_e oe_star_on">7</a>
+                                    <a t-if="record.priority.raw_value == 1 or record.priority.raw_value == 3 or record.priority.raw_value == 4" type="object" string="Normal" name="set_normal_priority" class="oe_e oe_star_off">7</a>
+                                    <a t-if="record.priority.raw_value == 0" type="object" string="Very Important" name="set_high_priority" class="oe_e oe_star_very_high_priority">7</a>
                                     <img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" class="oe_kanban_avatar"/>
                                 </div>
                                 <div class="oe_kanban_footer_left">
@@ -571,8 +566,8 @@
             <field name="model">project.task</field>
             <field eval="2" name="priority"/>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree fonts="bold:message_unread==True" colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline&lt;current_date) and (state in ('draft','pending','open'))" string="Tasks">
+                    <field name="message_unread" invisible="1"/>
                     <field name="sequence" invisible="not context.get('seq_visible', False)"/>
                     <field name="name"/>
                     <field name="project_id" icon="gtk-indent" invisible="context.get('user_invisible', False)"/>
@@ -584,7 +579,7 @@
                     <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)" groups="project.group_time_work_estimation_tasks"/>
                     <field name="date_deadline" invisible="context.get('deadline_visible',True)"/>
                     <field name="stage_id" invisible="context.get('set_visible',False)"/>
-                    <field name="state" invisible="context.get('set_visible',False)" groups="base.group_no_one"/>
+                    <field name="state" invisible="1"/>
                     <field name="date_start" invisible="1" groups="base.group_no_one"/>
                     <field name="date_end" invisible="1" groups="base.group_no_one"/>
                     <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
@@ -632,7 +627,7 @@
             <field name="arch" type="xml">
                <search string="Tasks">
                     <field name="name" string="Tasks"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter name="draft" string="New" domain="[('state','=','draft')]" help="New Tasks" icon="terp-check"/>
                     <filter name="open" string="In Progress" domain="[('state','=','open')]" help="In Progress Tasks" icon="terp-camera_test"/>
@@ -651,7 +646,6 @@
                         <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-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Stage" name="group_stage_id" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Status" name="group_state" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Deadline" icon="terp-gnome-cpu-frequency-applet+" domain="[]" context="{'group_by':'date_deadline'}"/>
                         <filter string="Start Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_start'}" groups="base.group_no_one"/>
                         <filter string="End Date" icon="terp-go-month" domain="[]" context="{'group_by':'date_end'}" groups="base.group_no_one"/>
@@ -666,11 +660,9 @@
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                <xpath expr='//div[@name="project"]' position='inside'>
                     <field name="use_tasks"/>
+                    <label for="use_tasks"/>
                 </xpath>
             </field>
         </record>
@@ -728,7 +720,7 @@
         </record>
 
         <record id="ir_project_task_open" model="ir.values">
-            <field eval=" 'tree_but_open'" name="key2"/>
+            <field eval="'tree_but_open'" name="key2"/>
             <field eval="'project.project'" name="model"/>
             <field name="name">View project's tasks</field>
             <field eval="'ir.actions.act_window,'+str(dblc_proj)" name="value"/>
@@ -757,7 +749,7 @@
                             <field name="case_default"/>
                         </group>
                         <group>
-                            <field name="state" string="Related State"/>
+                            <field name="state"/>
                             <field name="sequence"/>
                             <field name="fold"/>
                         </group>
@@ -772,7 +764,7 @@
             <field name="model">project.task.type</field>
             <field name="arch" type="xml">
                 <tree string="Task Stage">
-                    <field name="sequence"/>
+                    <field name="sequence" widget="handle"/>
                     <field name="name"/>
                     <field name="state"/>
                 </tree>
@@ -798,12 +790,11 @@
 
         <menuitem id="menu_tasks_config" name="GTD" parent="base.menu_definitions" sequence="1"/>
 
-        <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1"/>
+        <menuitem id="base.menu_project_config_project" name="Stages" parent="base.menu_definitions" sequence="1" groups="base.group_no_one"/>
 
         <menuitem action="open_task_type_form" name="Task Stages" id="menu_task_types_view" parent="base.menu_project_config_project" sequence="2"/>
         <menuitem action="open_view_project_all" id="menu_projects" name="Projects" parent="menu_project_management" sequence="1"/>
 
-        <act_window context="{'search_default_user_id': active_id, 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 
          <record id="task_company" model="ir.ui.view">
             <field name="name">res.company.task.config</field>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 8fd9c3ee1b6..c30c91fe6c0 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -18,10 +18,12 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_task_history_graph" model="ir.ui.view">
             <field name="name">project.task.history.cumulative.graph</field>
             <field name="model">project.task.history.cumulative</field>
             <field name="arch" type="xml">
+                <!-- <field name="project_id"/> -->
                 <graph string="Project Tasks" type="bar">
                     <field name="date"/>
                     <field name="planned_hours" operator="+"/>
@@ -29,21 +31,6 @@
                 </graph>
             </field>
         </record>
-        
-        <!-- Where is this object in py file ? -->
-        
-        <!--<record id="view_task_history_burndown_graph" model="ir.ui.view">-->
-        <!--    <field name="name">project.task.history.burndown.graph</field>-->
-        <!--    <field name="model">project.task.history.burndown</field>-->
-        <!--    <field name="arch" type="xml">-->
-        <!--        <graph string="Burndown Chart of Tasks" type="bar">-->
-        <!--            <field name="date"/>-->
-        <!--            <field name="remaining_hours" operator="+"/>-->
-        <!--            <field name="type_id" group="True"/>-->
-        <!--        </graph>-->
-        <!--    </field>-->
-        <!--</record>-->
-
 
         <record id="view_task_history_search" model="ir.ui.view">
             <field name="name">project.task.history.cumulative.search</field>
@@ -51,18 +38,18 @@
             <field name="arch" type="xml">
                 <search string="Task's Analysis">
                     <field name="date"/>
-                    <filter name="open" string="In Progress" domain="[('state','in',('open','draft'))]" help="In Progress Tasks" icon="terp-camera_test"/>
-                    <filter string="Pending" domain="[('state','=','pending')]" context="{'show_delegated':False}" help="Pending Tasks" icon="terp-gtk-media-pause"/>
-                    <separator/>
-                    <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]" icon="terp-gtk-media-pause"/>
-                    <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]" icon="terp-camera_test"/>
-                    <separator/>
-                    <filter string="My Tasks" domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" />
-                    <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"  help="Unassigned Tasks" icon="terp-personal-" />
-                    <separator/>
-                    <filter string="My Projects" domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/>
                     <field name="project_id"/>
                     <field name="user_id"/>
+                    <filter name="open" string="In Progress Tasks" domain="[('state','in',('open','draft'))]"/>
+                    <filter string="Pending Tasks" domain="[('state','=','pending')]" context="{'show_delegated':False}"/>
+                    <separator/>
+                    <filter name="kanban_blocked" string="Blocked" domain="[('kanban_state','=','blocked')]"/>
+                    <filter name="kanban_ready" string="Ready" domain="[('kanban_state','=','done')]"/>
+                    <separator/>
+                    <filter string="My Tasks" domain="[('user_id','=',uid)]"/>
+                    <filter string="Unassigned Tasks" domain="[('user_id','=',False)]"/>
+                    <separator/>
+                    <filter string="My Projects" domain="[('project_id.user_id','=',uid)]"/>
                 </search>
             </field>
         </record>
@@ -73,27 +60,12 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
             <field name="view_id" ref="view_task_history_graph"/>
-            <field eval="False" name="filter"/>
+            <field name="filter" eval="False"/>
             <field name="context">{"search_default_open":1, "search_default_this_month": 1}</field>
         </record>
         <menuitem action="action_view_task_history_cumulative"
             id="menu_action_view_task_history_cumulative"
-            parent="base.menu_project_report" />
-
-
-        <!--<record id="action_view_task_history_burndown" model="ir.actions.act_window">-->
-        <!--    <field name="name">Burndown Chart</field>-->
-        <!--    <field name="res_model">project.task.history.cumulative</field>-->
-        <!--    <field name="view_type">form</field>-->
-        <!--    <field name="view_mode">graph,tree</field>-->
-        <!--    <field name="view_id" ref="view_task_history_burndown_graph"/>-->
-        <!--    <field eval="False" name="filter"/>-->
-        <!--    <field name="context">{"search_default_open":1, "search_default_this_month": 1, "search_default_project_id": project_id}</field>-->
-        <!--</record>-->
-        <!--<menuitem action="action_view_task_history_burndown"-->
-        <!--    id="menu_action_view_task_history_burndown"-->
-        <!--    parent="project_report_task" />-->
-
+            parent="base.menu_project_report"/>
 
     </data>
 </openerp>
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index 6c1f5443835..f3055727d5e 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -52,7 +52,7 @@ class report_project_task_user(osv.osv):
 ('0','Very urgent')], 'Priority', readonly=True),
         '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),
         'state': fields.selection([('draft', 'Draft'), ('open', 'In Progress'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')],'Status', readonly=True),
-        'company_id': fields.many2one('res.company', 'Company', readonly=True, groups="base.group_multi_company"),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Contact', readonly=True),
     }
     _order = 'name desc, project_id'
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index 5d6132b1b8f..10f3f4a8c7c 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -10,7 +10,7 @@
             <field name="name">report.project.task.user.tree</field>
             <field name="model">report.project.task.user</field>
             <field name="arch" type="xml">
-                <tree string="Tasks Analysis">
+                <tree string="Tasks Analysis" create="false">
                     <field name="name" invisible="1"/>
                     <field name="project_id" invisible="1"/>
                     <field name="user_id" invisible="1"/>
@@ -79,7 +79,6 @@
                         <filter string="Task" icon="terp-stock_align_left_24" context="{'group_by':'name'}" />
                         <filter string="Contact" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Assigned to" name="User" icon="terp-personal" context="{'group_by':'user_id'}" />
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <filter string="Company" icon="terp-go-home" context="{'group_by':'company_id'}"  groups="base.group_multi_company"/>
                         <filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Creation Date"/>
                         <filter string="Month" icon="terp-go-month" context="{'group_by':'month'}" help="Creation Date"/>
diff --git a/addons/project/res_config.py b/addons/project/res_config.py
index fcb3ecc9e21..85b4bd7001b 100644
--- a/addons/project/res_config.py
+++ b/addons/project/res_config.py
@@ -27,38 +27,38 @@ class project_configuration(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_project_mrp': fields.boolean('generate tasks from sale orders',
+        'module_project_mrp': fields.boolean('Generate tasks from sale orders',
             help ="""This feature automatically creates project tasks from service products in sale orders.
                 More precisely, tasks are created for procurement lines with product of type 'Service',
-                procurement method 'Make to Order', and supply method 'Produce'.
+                procurement method 'Make to Order', and supply method 'Manufacture'.
                 This installs the module project_mrp."""),
-        'module_pad': fields.boolean("use integrated collaborative note pads on task",
+        'module_pad': fields.boolean("Use integrated collaborative note pads on task",
             help="""Lets the company customize which Pad installation should be used to link to new pads
                 (by default, http://ietherpad.com/).
                 This installs the module pad."""),
-        'module_project_timesheet': fields.boolean("record timesheet lines per tasks",
+        'module_project_timesheet': fields.boolean("Record timesheet lines per tasks",
             help="""This allows you to transfer the entries under tasks defined for Project Management to
                 the timesheet line entries for particular date and user, with the effect of creating,
                 editing and deleting either ways.
                 This installs the module project_timesheet."""),
-        'module_project_long_term': fields.boolean("manage resources planning on gantt view",
+        'module_project_long_term': fields.boolean("Manage resources planning on gantt view",
             help="""A long term project management module that tracks planning, scheduling, and resource allocation.
                 This installs the module project_long_term."""),
-        'module_project_issue': fields.boolean("track issues and bugs",
+        'module_project_issue': fields.boolean("Track issues and bugs",
             help="""Provides management of issues/bugs in projects.
                 This installs the module project_issue."""),
         'time_unit': fields.many2one('product.uom', 'Working time unit', required=True,
             help="""This will set the unit of measure used in projects and tasks."""),
-        'module_project_issue_sheet': fields.boolean("invoice working time on issues",
+        'module_project_issue_sheet': fields.boolean("Invoice working time on issues",
             help="""Provides timesheet support for the issues/bugs management in project.
                 This installs the module project_issue_sheet."""),
-        'group_tasks_work_on_tasks': fields.boolean("compute work activities on tasks",
+        'group_tasks_work_on_tasks': fields.boolean("Log work activities on tasks",
             implied_group='project.group_tasks_work_on_tasks',
             help="Allows you to compute work on tasks."),
-        'group_time_work_estimation_tasks': fields.boolean("manage time estimation on tasks",
+        'group_time_work_estimation_tasks': fields.boolean("Manage time estimation on tasks",
             implied_group='project.group_time_work_estimation_tasks',
             help="Allows you to compute Time Estimation on tasks."),
-        'group_manage_delegation_task': fields.boolean("allow task delegation",
+        'group_manage_delegation_task': fields.boolean("Allow task delegation",
             implied_group='project.group_delegate_task',
             help="Allows you to delegate tasks to other users."),
     }
@@ -72,4 +72,9 @@ class project_configuration(osv.osv_memory):
         user = self.pool.get('res.users').browse(cr, uid, uid, context)
         user.company_id.write({'project_time_mode_id': config.time_unit.id})
 
+    def onchange_time_estimation_project_timesheet(self, cr, uid, ids, group_time_work_estimation_tasks, module_project_timesheet):
+        if group_time_work_estimation_tasks or module_project_timesheet:
+            return {'value': {'group_tasks_work_on_tasks': True}}
+        return {}
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project/res_config_view.xml b/addons/project/res_config_view.xml
index 821d7a58fd4..207f35da72e 100644
--- a/addons/project/res_config_view.xml
+++ b/addons/project/res_config_view.xml
@@ -7,10 +7,9 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('base.menu_main_pm')}"/>
         </record>
-        <record id="todo_open_project_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_project_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
         </record>
     </data>
     <data>
@@ -30,7 +29,7 @@
                         <label for="id" string="Task"/>
                         <div>
                             <div>
-                                <field name="module_project_timesheet" class="oe_inline"/>
+                                <field name="module_project_timesheet" on_change="onchange_time_estimation_project_timesheet(group_time_work_estimation_tasks, module_project_timesheet)" class="oe_inline"/>
                                 <label for="module_project_timesheet"/>
                             </div>
                             <div>
@@ -51,7 +50,7 @@
                         <label for="id" string="Planning"/>
                         <div>
                              <div>
-                                <field name="group_time_work_estimation_tasks" class="oe_inline"/>
+                                <field name="group_time_work_estimation_tasks" on_change="onchange_time_estimation_project_timesheet(group_time_work_estimation_tasks, module_project_timesheet)" class="oe_inline"/>
                                 <label for="group_time_work_estimation_tasks"/>
                             </div>
                             <div>
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index f867285138a..99cb3e8ae6c 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -42,10 +42,10 @@
     </record>
 
     <record model="ir.rule" id="project_public_members_rule">
-        <field name="name">public Members</field>
+        <field name="name">Public Members</field>
         <field name="model_id" ref="model_project_project"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|','|',('privacy_visibility','in',[False,'public']),('members','in',[user.id]),('followers','in',[user.id])]</field>
+        <field name="domain_force">['|',('privacy_visibility','in',[False,'public']),('message_follower_ids','in',[user.partner_id.id])]</field>
     </record>
 
     <record model="ir.rule" id="task_comp_rule">
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index ebab44e225a..5f7361e2ad7 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -1,23 +1,58 @@
+.oe_kanban_card {
+  margin: 2px;
+}
+
+.openerp .oe_kanban_view .oe_kanban_content .oe_star_very_high_priority {
+  color: #cccccc;
+  text-shadow: 0 0 2px black;
+  vertical-align: top;
+  position: relative;
+  top: -5px;
+}
+.openerp .oe_kanban_view .oe_kanban_content .oe_star_very_high_priority:hover {
+  text-decoration: none;
+}
+
+.openerp .oe_kanban_view .oe_kanban_content .oe_star_very_high_priority {
+  color: red;
+}
+
 .oe_kanban_project {
-    width: 300px;
+    width: 220px;
+    min-height: 160px;
 }
-.oe_kanban_project_list {
-    margin: 8px 0 8px 0;
+
+.oe_kanban_project_list > a > span:hover{
+    margin: 4px 0;
+    text-decoration: underline;
 }
-/*.oe_kanban_project_list a:not(:first-child):before {
-    content: ' - ';
-}*/
-.oe_kanban_project_fields div {
-    display: inline-block;
-    width: 49%;
-    box-sizing: border-box;
-    padding: 2px 0 2px 0;
+
+.openerp .oe_kanban_content h4 {
+    margin: 0 0 8px;
 }
+
+.oe_kanban_content > table {
+    width: 100%;
+}
+
+.oe_kanban_content > table > th {
+    padding: 0;
+    border-right: 1px solid #DDD;
+    vertical-align: top;
+    font-weight: normal;
+}
+
+.oe_kanban_content > table > td {
+    padding: 2px 0 2px 8px;
+    color: #888;
+}
+
 .oe_kanban_project_fields div:nth-child(odd) {
     border-right: 1px solid #dddddd;
     vertical-align: top;
     padding-right: 8px;
 }
+
 .oe_kanban_project_fields div:nth-child(even) {
     padding-left: 8px;
     color: #888888;
@@ -27,6 +62,7 @@
     padding-top: 1em;
     margin-top: 8px;
 }
+
 .oe_kanban_project_avatars img {
     width: 30px;
     height: 30px;
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index c8250edcafd..38578a6226e 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -10,16 +10,16 @@ openerp.project = function(openerp) {
             var members_ids = [];
 
             // Collect members ids
-            self.$element.find('img[data-member_id]').each(function() {
+            self.$el.find('img[data-member_id]').each(function() {
                 members_ids.push($(this).data('member_id'));
             });
 
             // Find their matching names
             var dataset = new openerp.web.DataSetSearch(self, 'res.users', self.session.context, [['id', 'in', _.uniq(members_ids)]]);
-            dataset.read_slice(['id', 'name']).then(function(result) {
+            dataset.read_slice(['id', 'name']).done(function(result) {
                 _.each(result, function(v, k) {
                     // Set the proper value in the DOM
-                    self.$element.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({
+                    self.$el.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({
                         offset: 10
                     });
                 });
@@ -35,16 +35,16 @@ openerp.project = function(openerp) {
             var categ_ids = [];
 
             // Collect categories ids
-            self.$element.find('span[data-categ_id]').each(function() {
+            self.$el.find('span[data-categ_id]').each(function() {
                 categ_ids.push($(this).data('categ_id'));
             });
 
             // Find their matching names
             var dataset = new openerp.web.DataSetSearch(self, 'project.category', self.session.context, [['id', 'in', _.uniq(categ_ids)]]);
-            dataset.read_slice(['id', 'name']).then(function(result) {
+            dataset.read_slice(['id', 'name']).done(function(result) {
                 _.each(result, function(v, k) {
                     // Set the proper value in the DOM and display the element
-                    self.$element.find('span[data-categ_id=' + v.id + ']').text(v.name);
+                    self.$el.find('span[data-categ_id=' + v.id + ']').text(v.name);
                 });
             });
         },
@@ -57,6 +57,12 @@ openerp.project = function(openerp) {
             } else if (self.dataset.model === 'project.task') {
                 self.project_display_categ_names();
             }
+        },
+        on_record_moved: function(record, old_group, old_index, new_group, new_index){
+            var self = this;
+            this._super.apply(this, arguments);
+            if(new_group.state.folded)
+                new_group.do_action_toggle_fold();
         }
     });
 
@@ -67,6 +73,10 @@ openerp.project = function(openerp) {
             } else {
                 this._super.apply(this, arguments);
             }
-        }
+        },
+        bind_events: function() {
+            this._super();
+            this.view.project_display_categ_names();
+        },
     });
 };
diff --git a/addons/project/test/task_process.yml b/addons/project/test/task_process.yml
index ad4bbe53bb3..e37b2116714 100644
--- a/addons/project/test/task_process.yml
+++ b/addons/project/test/task_process.yml
@@ -11,7 +11,7 @@
     - state == "pending"
 -
   !record {model: project.task.delegate, id: delegate_id}:
-    user_id: base.user_niv
+    user_id: base.user_demo
     planned_hours: 12.0
     planned_hours_me: 2.0
 -
diff --git a/addons/project/wizard/project_task_reevaluate.py b/addons/project/wizard/project_task_reevaluate.py
index 382c9d64361..b00c531717f 100644
--- a/addons/project/wizard/project_task_reevaluate.py
+++ b/addons/project/wizard/project_task_reevaluate.py
@@ -26,7 +26,7 @@ from tools.translate import _
 class project_task_reevaluate(osv.osv_memory):
     _name = 'project.task.reevaluate'
 
-    def _get_remaining(self,cr, uid, context=None):
+    def _get_remaining(self, cr, uid, context=None):
         if context is None:
             context = {}
         active_id = context.get('active_id', False)
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index c28bc6f732a..c99535f63fd 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -24,45 +24,34 @@
     'name': 'Todo Lists',
     'version': '1.0',
     'category': 'Project Management',
-    "sequence": 20,
-    "summary": "Personal Tasks",
+    'sequence': 100,
+    'summary': 'Personal Tasks, Contexts, Timeboxes',
     'description': """
-This module implements all concepts defined by the Getting Things Done methodology.
-===================================================================================
+Implement concepts of the "Getting Things Done" methodology 
+===========================================================
 
-This module implements a simple personnal Todo list based on tasks. It adds in
-the project application an editable list of tasks simplified to the minimum
-required fields.
+This module implements a simple personal to-do list based on tasks. It adds an editable list of tasks simplified to the minimum required fields in the project application.
 
-The todo list is based on the GTD methodology. This world-wide used methodology
-is used for personal time management improvement.
+The to-do list is based on the GTD methodology. This world-wide used methodology is used for personal time management improvement.
 
-Getting Things Done (commonly abbreviated as GTD) is an action management
-method created by David Allen, and described in a book of the same name.
+Getting Things Done (commonly abbreviated as GTD) is an action management method created by David Allen, and described in a book of the same name.
 
-GTD rests on the principle that a person needs to move tasks out of the mind by
-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.
+GTD rests on the principle that a person needs to move tasks out of the mind by 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': 'OpenERP SA',
     'images': ['images/project_gtd.jpeg'],
     'depends': ['project'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'project_gtd_data.xml',
         'project_gtd_view.xml',
         'security/ir.model.access.csv',
         'wizard/project_gtd_empty_view.xml',
         'wizard/project_gtd_fill_view.xml',
     ],
-    'demo_xml': ['project_gtd_demo.xml'],
-    'test':[
-         'test/task_timebox.yml'
-    ],
+    'demo': ['project_gtd_demo.xml'],
+    'test':['test/task_timebox.yml'],
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0043525236301',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_gtd/i18n/ar.po b/addons/project_gtd/i18n/ar.po
index 40bb73bf486..7960333c41f 100644
--- a/addons/project_gtd/i18n/ar.po
+++ b/addons/project_gtd/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/bg.po b/addons/project_gtd/i18n/bg.po
index b58dcd236ec..3ed055a6ae2 100644
--- a/addons/project_gtd/i18n/bg.po
+++ b/addons/project_gtd/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/bs.po b/addons/project_gtd/i18n/bs.po
index 9ec72e05741..ff71f835785 100644
--- a/addons/project_gtd/i18n/bs.po
+++ b/addons/project_gtd/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/ca.po b/addons/project_gtd/i18n/ca.po
index f3aa7ea9b6a..5c514a1827c 100644
--- a/addons/project_gtd/i18n/ca.po
+++ b/addons/project_gtd/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/cs.po b/addons/project_gtd/i18n/cs.po
index b235b119b19..25d1f464fe3 100644
--- a/addons/project_gtd/i18n/cs.po
+++ b/addons/project_gtd/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/da.po b/addons/project_gtd/i18n/da.po
index 6d7bbd77ac4..4a19df79f26 100644
--- a/addons/project_gtd/i18n/da.po
+++ b/addons/project_gtd/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/de.po b/addons/project_gtd/i18n/de.po
index 0de236a18f6..e405b63886d 100644
--- a/addons/project_gtd/i18n/de.po
+++ b/addons/project_gtd/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/el.po b/addons/project_gtd/i18n/el.po
index 3d7cd281983..462cee3fa71 100644
--- a/addons/project_gtd/i18n/el.po
+++ b/addons/project_gtd/i18n/el.po
@@ -12,8 +12,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/project_gtd/i18n/es.po b/addons/project_gtd/i18n/es.po
index 0a16b7c2fec..e51acf95425 100644
--- a/addons/project_gtd/i18n/es.po
+++ b/addons/project_gtd/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/es_AR.po b/addons/project_gtd/i18n/es_AR.po
index 6fe4871c9e3..6226b67d360 100644
--- a/addons/project_gtd/i18n/es_AR.po
+++ b/addons/project_gtd/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/es_CR.po b/addons/project_gtd/i18n/es_CR.po
index cfff8f7c2ad..d0cb5a6cfd1 100644
--- a/addons/project_gtd/i18n/es_CR.po
+++ b/addons/project_gtd/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/es_EC.po b/addons/project_gtd/i18n/es_EC.po
index b4975356a00..def73dc8c85 100644
--- a/addons/project_gtd/i18n/es_EC.po
+++ b/addons/project_gtd/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/et.po b/addons/project_gtd/i18n/et.po
index fe76aa87273..9b6a60830c5 100644
--- a/addons/project_gtd/i18n/et.po
+++ b/addons/project_gtd/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/fi.po b/addons/project_gtd/i18n/fi.po
index 95d5ff489a8..dbe9da76af0 100644
--- a/addons/project_gtd/i18n/fi.po
+++ b/addons/project_gtd/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/fr.po b/addons/project_gtd/i18n/fr.po
index 754574e5431..668d853e87a 100644
--- a/addons/project_gtd/i18n/fr.po
+++ b/addons/project_gtd/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/gl.po b/addons/project_gtd/i18n/gl.po
index f3bc5c976cd..abdd506ba4f 100644
--- a/addons/project_gtd/i18n/gl.po
+++ b/addons/project_gtd/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/hr.po b/addons/project_gtd/i18n/hr.po
index 93cd9718494..511e380d4fd 100644
--- a/addons/project_gtd/i18n/hr.po
+++ b/addons/project_gtd/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/i18n/hu.po b/addons/project_gtd/i18n/hu.po
index aa5fbe04be8..ff8d7fd13f5 100644
--- a/addons/project_gtd/i18n/hu.po
+++ b/addons/project_gtd/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/id.po b/addons/project_gtd/i18n/id.po
index c4bfb58d795..a8547172750 100644
--- a/addons/project_gtd/i18n/id.po
+++ b/addons/project_gtd/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/it.po b/addons/project_gtd/i18n/it.po
index ce06ba71974..b1718bae158 100644
--- a/addons/project_gtd/i18n/it.po
+++ b/addons/project_gtd/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/ja.po b/addons/project_gtd/i18n/ja.po
index e273b35579b..f25f08f49ab 100644
--- a/addons/project_gtd/i18n/ja.po
+++ b/addons/project_gtd/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/ko.po b/addons/project_gtd/i18n/ko.po
index 76461d012a4..3540d5e337a 100644
--- a/addons/project_gtd/i18n/ko.po
+++ b/addons/project_gtd/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/lt.po b/addons/project_gtd/i18n/lt.po
index ec48859235c..cef1ef20a81 100644
--- a/addons/project_gtd/i18n/lt.po
+++ b/addons/project_gtd/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/lv.po b/addons/project_gtd/i18n/lv.po
index cba015c75b4..9d4924d3de4 100644
--- a/addons/project_gtd/i18n/lv.po
+++ b/addons/project_gtd/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/mn.po b/addons/project_gtd/i18n/mn.po
index 1988e571e3b..8404f531e0c 100644
--- a/addons/project_gtd/i18n/mn.po
+++ b/addons/project_gtd/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/nl.po b/addons/project_gtd/i18n/nl.po
index 4d476f05cda..dca92c00a14 100644
--- a/addons/project_gtd/i18n/nl.po
+++ b/addons/project_gtd/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/nl_BE.po b/addons/project_gtd/i18n/nl_BE.po
index dbffa53127d..98bea1f99f4 100644
--- a/addons/project_gtd/i18n/nl_BE.po
+++ b/addons/project_gtd/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/pl.po b/addons/project_gtd/i18n/pl.po
index 4be219422de..52debb543ab 100644
--- a/addons/project_gtd/i18n/pl.po
+++ b/addons/project_gtd/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/pt.po b/addons/project_gtd/i18n/pt.po
index f694c7ae066..39878b23416 100644
--- a/addons/project_gtd/i18n/pt.po
+++ b/addons/project_gtd/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/pt_BR.po b/addons/project_gtd/i18n/pt_BR.po
index 14c4f3bcde8..def7d78d25d 100644
--- a/addons/project_gtd/i18n/pt_BR.po
+++ b/addons/project_gtd/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -24,7 +24,7 @@ msgstr "Em Progresso"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Show only tasks having a deadline"
-msgstr ""
+msgstr "Mostrar apenas tarefas que tem um prazo final"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -34,12 +34,12 @@ msgstr "Reativar"
 #. module: project_gtd
 #: help:project.task,timebox_id:0
 msgid "Time-laps during which task has to be treated"
-msgstr ""
+msgstr "Tempo em que cada tarefa deverá ser tratada"
 
 #. module: project_gtd
 #: help:project.gtd.timebox,sequence:0
 msgid "Gives the sequence order when displaying a list of timebox."
-msgstr ""
+msgstr "Mostra a sequência quando exibindo uma lista de Timebox"
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_travel
@@ -49,12 +49,12 @@ msgstr "Viagens"
 #. module: project_gtd
 #: view:project.timebox.empty:0
 msgid "Timebox Empty Process Completed Successfully."
-msgstr ""
+msgstr "Processo Vazio no Timebox concluído com sucesso"
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "Pending Tasks"
-msgstr ""
+msgstr "Tarefas Pendentes"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -68,6 +68,9 @@ msgid ""
 "defines a period of time in order to categorize your tasks: today, this "
 "week, this month, long term."
 msgstr ""
+"Timebox são definidos com a metodologia \"Getting Things Done\"  Faça "
+"Acontecer. Um timebox define um período de tempo para categorizar suas "
+"tarefas: hoje, esta semana, este mês, a longo prazo."
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_daily
@@ -82,7 +85,7 @@ msgstr "Longo Prazo"
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_timebox_empty
 msgid "Project Timebox Empty"
-msgstr ""
+msgstr "Timebox do Projeto Vazio"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -116,7 +119,7 @@ msgstr "Minhas Tarefas"
 #. module: project_gtd
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Erro! Você não pode criar tarefas recursivas."
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_weekly
@@ -137,7 +140,7 @@ msgstr "Período vazio"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Tasks having no timebox assigned yet"
-msgstr ""
+msgstr "Tarefas sem um timebox definido"
 
 #. module: project_gtd
 #: constraint:project.task:0
@@ -152,7 +155,7 @@ msgstr "Ícone"
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_timebox_fill_plan
 msgid "Project Timebox Fill"
-msgstr ""
+msgstr "Preencher o Timebox do Projeto"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_task
@@ -183,7 +186,7 @@ msgstr "Carro"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Show Context"
-msgstr ""
+msgstr "Mostrar Contexto"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.action_project_gtd_fill
@@ -206,7 +209,7 @@ msgstr "Período de tempo"
 #. module: project_gtd
 #: view:project.task:0
 msgid "In Progress and draft tasks"
-msgstr ""
+msgstr "Tarefas em Andamento e Provisórias"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_context
@@ -219,7 +222,7 @@ msgstr "Contexto"
 #: code:addons/project_gtd/wizard/project_gtd_empty.py:52
 #, python-format
 msgid "No timebox child of this one !"
-msgstr ""
+msgstr "Nenhum timebox filho deste aqui!"
 
 #. module: project_gtd
 #: view:project.timebox.empty:0
@@ -229,7 +232,7 @@ msgstr "_Ok"
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_office
 msgid "Office"
-msgstr ""
+msgstr "Escritório"
 
 #. module: project_gtd
 #: field:project.gtd.context,sequence:0 field:project.gtd.timebox,sequence:0
@@ -239,7 +242,7 @@ msgstr "Sequencia"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Show the context field"
-msgstr ""
+msgstr "Mostrar o campo de contexto"
 
 #. module: project_gtd
 #: help:project.gtd.context,sequence:0
@@ -249,7 +252,7 @@ msgstr "Fornece a sequencia de ordem quando exibe uma lista de contextos."
 #. module: project_gtd
 #: view:project.task:0
 msgid "Show Deadlines"
-msgstr ""
+msgstr "Mostrar Prazos Finais"
 
 #. module: project_gtd
 #: view:project.gtd.timebox:0
@@ -264,7 +267,7 @@ msgstr "Seleção de tarefas"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Inbox"
-msgstr ""
+msgstr "Caixa de Entrada"
 
 #. module: project_gtd
 #: field:project.timebox.fill.plan,timebox_id:0
@@ -274,7 +277,7 @@ msgstr "Pegando do período"
 #. module: project_gtd
 #: help:project.task,context_id:0
 msgid "The context place where user has to treat task"
-msgstr ""
+msgstr "Local aonde o usuário deve executar a tarefa"
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_home
@@ -288,11 +291,15 @@ msgid ""
 "you to categorize your tasks according to the context in which they have to "
 "be done: at the office, at home, when I take my car, etc."
 msgstr ""
+"Contextos são definidos na metodologia \"Getting Things Done\". Isto permite "
+"a você categorizar suas tarefas de acordo com o contexto em que eles "
+"necessitam ser feitos: no escritório, em casa, quando eu estiver no carro, "
+"etc."
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "For reopening the tasks"
-msgstr ""
+msgstr "Para reabrir as tarefas"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/ro.po b/addons/project_gtd/i18n/ro.po
index 79af7e000c8..80700510986 100644
--- a/addons/project_gtd/i18n/ro.po
+++ b/addons/project_gtd/i18n/ro.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
 msgid "In Progress"
-msgstr "In curs de desfasurare"
+msgstr "In desfasurare"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -59,7 +59,7 @@ msgstr "Sarcini in asteptare"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Next"
-msgstr "Urmatorul (urmatoarea)"
+msgstr "Urmatorul"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,help:project_gtd.open_gtd_timebox_tree
diff --git a/addons/project_gtd/i18n/ru.po b/addons/project_gtd/i18n/ru.po
index 061248c0ead..de306970548 100644
--- a/addons/project_gtd/i18n/ru.po
+++ b/addons/project_gtd/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/sl.po b/addons/project_gtd/i18n/sl.po
index a598daa25c1..64d3dc36d5e 100644
--- a/addons/project_gtd/i18n/sl.po
+++ b/addons/project_gtd/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/sq.po b/addons/project_gtd/i18n/sq.po
index 6fd7ff478bb..b029035a58a 100644
--- a/addons/project_gtd/i18n/sq.po
+++ b/addons/project_gtd/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/sv.po b/addons/project_gtd/i18n/sv.po
index 016395df4f1..2941865fdfd 100644
--- a/addons/project_gtd/i18n/sv.po
+++ b/addons/project_gtd/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/tlh.po b/addons/project_gtd/i18n/tlh.po
index 11b75ff88cd..7122b390463 100644
--- a/addons/project_gtd/i18n/tlh.po
+++ b/addons/project_gtd/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index c9056a1e98c..4547a429cca 100644
--- a/addons/project_gtd/i18n/tr.po
+++ b/addons/project_gtd/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/uk.po b/addons/project_gtd/i18n/uk.po
index 83f5fe0a5f1..1c810773f19 100644
--- a/addons/project_gtd/i18n/uk.po
+++ b/addons/project_gtd/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/vi.po b/addons/project_gtd/i18n/vi.po
index de1c8c394d7..3c9e691120b 100644
--- a/addons/project_gtd/i18n/vi.po
+++ b/addons/project_gtd/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/i18n/zh_CN.po b/addons/project_gtd/i18n/zh_CN.po
index d9d0c10d4b5..72b2d907266 100644
--- a/addons/project_gtd/i18n/zh_CN.po
+++ b/addons/project_gtd/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-14 10:09+0000\n"
-"Last-Translator: Jeff Wang <wjfonhand@hotmail.com>\n"
+"PO-Revision-Date: 2012-10-29 14:03+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -173,7 +173,7 @@ msgstr "名称"
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_context_tree
 #: model:ir.ui.menu,name:project_gtd.menu_open_gtd_time_contexts
 msgid "Contexts"
-msgstr "上下文"
+msgstr "情境"
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_car
diff --git a/addons/project_gtd/i18n/zh_TW.po b/addons/project_gtd/i18n/zh_TW.po
index 03a84f0d385..cf53578cdcb 100644
--- a/addons/project_gtd/i18n/zh_TW.po
+++ b/addons/project_gtd/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:17+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:15+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_gtd
 #: view:project.task:0
diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py
index c4e485876d8..4c48ae3db1f 100644
--- a/addons/project_gtd/project_gtd.py
+++ b/addons/project_gtd/project_gtd.py
@@ -67,7 +67,7 @@ class project_task(osv.osv):
         default['context_id'] = False
         return super(project_task,self).copy_data(cr, uid, id, default, context)
 
-    def _get_context(self,cr, uid, context=None):
+    def _get_context(self, cr, uid, context=None):
         ids = self.pool.get('project.gtd.context').search(cr, uid, [], context=context)
         return ids and ids[0] or False
 
diff --git a/addons/project_gtd/project_gtd_data.xml b/addons/project_gtd/project_gtd_data.xml
index dc1df93dc46..9d8c99f23ff 100644
--- a/addons/project_gtd/project_gtd_data.xml
+++ b/addons/project_gtd/project_gtd_data.xml
@@ -26,11 +26,15 @@
 
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Todo Lists has been installed</value>
-            <value>Add todo items on project tasks, to help you organize your work.  This module supports the methodology Getting Things Done (GTD), created by David Allen, and described in the book of the same name.</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Todo Lists application installed!</field>
+            <field name="body"><![CDATA[<p>Add todo items on project tasks, to help you organize your work.</p><p>
+This application supports the Getting Things Done (GTD) methodology, based on David Allen's book.</p>]]></field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index fdb8ae8495c..1467ce55fab 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -77,9 +77,7 @@
         <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" invisible=" not context.get('gtd', False)"/>
-                <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open" invisible=" not context.get('gtd',False)"/>
-                <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open" invisible=" not context.get('gtd',False)"/>
+                <field string="Timeframe" name="timebox_id" invisible=" not context.get('gtd', False)"/>
                 <field name="context_id" invisible="not context.get('context_show', False)" widget="selection"/>
                 <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>
@@ -92,8 +90,8 @@
         <field name="inherit_id" ref="project.view_task_form2" />
         <field name="arch" type="xml">
             <field name="progress" position="after">
-                <field name="context_id" widget="selection" options='{"no_open": true}'/>
-                <field name="timebox_id" widget="selection" options='{"no_open": true}'/>
+                <field name="context_id" widget="selection" options='{"no_open": True}'/>
+                <field name="timebox_id" widget="selection" options='{"no_open": True}'  string="Timeframe"/>
             </field>
         </field>
     </record>
@@ -123,7 +121,7 @@
         <field name="context">{'set_editable':True,'set_visible':True,'gtd':True,'user_invisible':True, "search_default_open": 1}</field>
         <field name="domain">[('user_id','=',uid)]</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree,form,calendar,gantt,graph,kanban</field>
+        <field name="view_mode">kanban,tree,form,calendar,gantt,graph</field>
     </record>
     <menuitem action="open_gtd_task" id="menu_open_gtd_timebox_tree" parent="project.menu_project_management" sequence="10"/>
 
diff --git a/addons/project_gtd/wizard/project_gtd_empty.py b/addons/project_gtd/wizard/project_gtd_empty.py
index 04c9689cc27..fe40db06f5f 100644
--- a/addons/project_gtd/wizard/project_gtd_empty.py
+++ b/addons/project_gtd/wizard/project_gtd_empty.py
@@ -30,7 +30,7 @@ class project_timebox_empty(osv.osv_memory):
         'name': fields.char('Name', size=32)
     }
 
-    def view_init(self, cr , uid , fields_list, context=None):
+    def view_init(self, cr, uid, fields_list, context=None):
         if context is None:
             context = {}
         self._empty(cr, uid, context=context)
diff --git a/addons/project_gtd/wizard/project_gtd_fill_view.xml b/addons/project_gtd/wizard/project_gtd_fill_view.xml
index 8807c00a76b..626dfb699b8 100644
--- a/addons/project_gtd/wizard/project_gtd_fill_view.xml
+++ b/addons/project_gtd/wizard/project_gtd_fill_view.xml
@@ -8,7 +8,7 @@
             <field name="arch" type="xml">
                 <form string="Plannify Timebox" version="7.0">
                       <group col="4">
-                          <field name="timebox_id" widget="selection" options='{"no_open": true}'/>
+                          <field name="timebox_id" widget="selection" options='{"no_open": True}'/>
                           <field name="timebox_to_id" widget="selection"/>
                       </group>
                       <field name="task_ids" domain="[('timebox_id','=',timebox_id),('state','=','open')]" />
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index 8aeecf2985e..b2e9197cefd 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -21,19 +21,17 @@
 ##############################################################################
 
 {
-    'name': 'Issues Tracker',
+    'name': 'Issue Tracker',
     'version': '1.0',
     'category': 'Project Management',
-    "sequence": 22,
-    "summary": "Support, Bug Traker, Helpdesk",
+    'sequence': 9,
+    'summary': 'Support, Bug Tracker, Helpdesk',
     'description': """
-This module provides Issues/Bugs Management in Project.
-=======================================================
+Track Issues/Bugs Management for Projects
+=========================================
+This application allows you to manage the issues you might face in a project like bugs in a system, client complaints or material breakdowns. 
 
-OpenERP allows you to manage the issues you might face in a project
-like bugs in a system, client complaints or material breakdowns. A
-list view allows the manager to quickly check the issues, assign them
-and decide on their status as they evolve.
+It allows the manager to quickly check the issues, assign them and decide on their status quickly as they evolve.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
@@ -43,32 +41,27 @@ and decide on their status as they evolve.
         'crm',
         'project',
     ],
-    'init_xml': [
-        'project_issue_data.xml'
-    ],
-    'update_xml': [
+    'data': [
         'project_issue_view.xml',
         'project_issue_menu.xml',
         'report/project_issue_report_view.xml',
         'security/project_issue_security.xml',
         'security/ir.model.access.csv',
-        "board_project_issue_view.xml",
-        "res_config_view.xml",
+        'board_project_issue_view.xml',
+        'res_config_view.xml',
+        'project_issue_data.xml'
      ],
-    'demo_xml': ['project_issue_demo.xml'],
+    'demo': ['project_issue_demo.xml'],
     'test': [
-      'test/subscribe_issue.yml',
-      'test/issue_process.yml',
-      'test/cancel_issue.yml',
-      'test/issue_demo.yml'
+        'test/subscribe_issue.yml',
+        'test/issue_process.yml',
+        'test/cancel_issue.yml',
+        'test/issue_demo.yml'
     ],
     'installable': True,
     'auto_install': False,
     'application': True,
-    'certificate' : '001236490750848623845',
-    'js': [
-        'static/src/js/project_issue.js',
-    ],
+    'js': ['static/src/js/project_issue.js'],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index 3b4fa57fc58..d7574042c37 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -16,7 +16,7 @@
                     <field name="version_id" widget="selection"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" groups="base.group_no_one"/>
+                    <field name="state" invisible="1"/>
                     <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
diff --git a/addons/project_issue/i18n/ar.po b/addons/project_issue/i18n/ar.po
index 7ced084c5d4..84ddd6986ba 100644
--- a/addons/project_issue/i18n/ar.po
+++ b/addons/project_issue/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/ca.po b/addons/project_issue/i18n/ca.po
index 17195087612..97a19c5f96e 100644
--- a/addons/project_issue/i18n/ca.po
+++ b/addons/project_issue/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/da.po b/addons/project_issue/i18n/da.po
index 14fc5ffa386..66c3f9a550f 100644
--- a/addons/project_issue/i18n/da.po
+++ b/addons/project_issue/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/de.po b/addons/project_issue/i18n/de.po
index 7eefcc906d1..ab6977da1b4 100644
--- a/addons/project_issue/i18n/de.po
+++ b/addons/project_issue/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/es.po b/addons/project_issue/i18n/es.po
index 3483309f942..96dbb3c763d 100644
--- a/addons/project_issue/i18n/es.po
+++ b/addons/project_issue/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/es_CR.po b/addons/project_issue/i18n/es_CR.po
index 3ab69a6b372..582cedd15ef 100644
--- a/addons/project_issue/i18n/es_CR.po
+++ b/addons/project_issue/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: project_issue
diff --git a/addons/project_issue/i18n/fi.po b/addons/project_issue/i18n/fi.po
index feaa865a5b9..28953795a92 100644
--- a/addons/project_issue/i18n/fi.po
+++ b/addons/project_issue/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/fr.po b/addons/project_issue/i18n/fr.po
index 50dd25b2d6d..9cc8a7e150e 100644
--- a/addons/project_issue/i18n/fr.po
+++ b/addons/project_issue/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/hr.po b/addons/project_issue/i18n/hr.po
index 7b7eb856f64..85ada5747a0 100644
--- a/addons/project_issue/i18n/hr.po
+++ b/addons/project_issue/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/hu.po b/addons/project_issue/i18n/hu.po
index 2e259ce801e..14379c03863 100644
--- a/addons/project_issue/i18n/hu.po
+++ b/addons/project_issue/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/it.po b/addons/project_issue/i18n/it.po
index 1fb9357c984..6580926c7d3 100644
--- a/addons/project_issue/i18n/it.po
+++ b/addons/project_issue/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/ja.po b/addons/project_issue/i18n/ja.po
index 67a8ee0fed3..78c0195e282 100644
--- a/addons/project_issue/i18n/ja.po
+++ b/addons/project_issue/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/lt.po b/addons/project_issue/i18n/lt.po
index 1b7c8aa4ff8..e776b4d5f3e 100644
--- a/addons/project_issue/i18n/lt.po
+++ b/addons/project_issue/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/lv.po b/addons/project_issue/i18n/lv.po
index 1a7673b88c3..52201361ac2 100644
--- a/addons/project_issue/i18n/lv.po
+++ b/addons/project_issue/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/mn.po b/addons/project_issue/i18n/mn.po
index 794d91198f0..8c72596903b 100644
--- a/addons/project_issue/i18n/mn.po
+++ b/addons/project_issue/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/nb.po b/addons/project_issue/i18n/nb.po
index 2dc1cfc3161..a3656055774 100644
--- a/addons/project_issue/i18n/nb.po
+++ b/addons/project_issue/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/nl.po b/addons/project_issue/i18n/nl.po
index b87c7966aa6..35bcec9daff 100644
--- a/addons/project_issue/i18n/nl.po
+++ b/addons/project_issue/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/nl_BE.po b/addons/project_issue/i18n/nl_BE.po
index 4fa410515b7..c12a4f7ccf5 100644
--- a/addons/project_issue/i18n/nl_BE.po
+++ b/addons/project_issue/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/pl.po b/addons/project_issue/i18n/pl.po
index 92559da0ea5..102f7bf830e 100644
--- a/addons/project_issue/i18n/pl.po
+++ b/addons/project_issue/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/pt.po b/addons/project_issue/i18n/pt.po
index fd1559f13e3..77f83935a36 100644
--- a/addons/project_issue/i18n/pt.po
+++ b/addons/project_issue/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/pt_BR.po b/addons/project_issue/i18n/pt_BR.po
index 22b85e90fd2..7511ae64f1d 100644
--- a/addons/project_issue/i18n/pt_BR.po
+++ b/addons/project_issue/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -25,7 +25,7 @@ msgstr "Mês Anterior"
 #. module: project_issue
 #: field:project.issue.report,delay_open:0
 msgid "Avg. Delay to Open"
-msgstr ""
+msgstr "Atraso Médio de Abertura"
 
 #. module: project_issue
 #: view:project.issue:0 view:project.issue.report:0
@@ -35,7 +35,7 @@ msgstr "Agrupar Por..."
 #. module: project_issue
 #: field:project.issue,working_hours_open:0
 msgid "Working Hours to Open the Issue"
-msgstr ""
+msgstr "Horas Trabalhadas para Abrir o Caso"
 
 #. module: project_issue
 #: constraint:project.project:0
@@ -82,7 +82,7 @@ msgstr "Emails dos Observadores"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Today's features"
-msgstr ""
+msgstr "Recursos de Hoje"
 
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_version
@@ -101,6 +101,8 @@ msgid ""
 "You cannot escalate this issue.\n"
 "The relevant Project has not configured the Escalation Project!"
 msgstr ""
+"Você não pode escalonar este caso.\n"
+"O Projeto em questão não foi configurado como Projeto Escalonado!"
 
 #. module: project_issue
 #: constraint:project.project:0
@@ -116,7 +118,7 @@ msgstr "Urgente"
 #. module: project_issue
 #: help:project.issue,inactivity_days:0
 msgid "Difference in days between last action and current date"
-msgstr ""
+msgstr "Diferença em dias entre a última ação e a data atual"
 
 #. module: project_issue
 #: view:project.issue.report:0 field:project.issue.report,day:0
@@ -126,7 +128,7 @@ msgstr "Dia"
 #. module: project_issue
 #: field:project.issue,days_since_creation:0
 msgid "Days since creation date"
-msgstr ""
+msgstr "Dias desde a data da criação"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -152,7 +154,7 @@ msgstr "Mensagens"
 #. module: project_issue
 #: field:project.issue,inactivity_days:0
 msgid "Days since last action"
-msgstr ""
+msgstr "Dias desde a última ação"
 
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_project
@@ -164,7 +166,7 @@ msgstr "Projeto"
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree
 msgid "My Open Project issues"
-msgstr ""
+msgstr "Meus Casos em Aberto do Projeto"
 
 #. module: project_issue
 #: selection:project.issue,state:0 selection:project.issue.report,state:0
@@ -184,7 +186,7 @@ msgstr "Data do Fechamento"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Search"
-msgstr ""
+msgstr "Rastreador de Problemas"
 
 #. module: project_issue
 #: field:project.issue,color:0
@@ -194,12 +196,12 @@ msgstr "Índice de Cores"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue / Partner"
-msgstr ""
+msgstr "Questão / Parceiro"
 
 #. module: project_issue
 #: field:project.issue.report,working_hours_open:0
 msgid "Avg. Working Hours to Open"
-msgstr ""
+msgstr "Média de Horas Trabalhadas para Abrir"
 
 #. module: project_issue
 #: field:project.issue,date_action_next:0
@@ -212,6 +214,8 @@ msgid ""
 "If any issue is escalated from the current Project, it will be listed under "
 "the project selected here."
 msgstr ""
+"Se esta questão for escalonada do Projeto atual, ela será listada abaixo do "
+"projeto selecionado aqui."
 
 #. module: project_issue
 #: view:project.issue:0
@@ -226,6 +230,10 @@ msgid ""
 "analyse the time required to open or close an issue, the number of email to "
 "exchange and the time spent on average by issues."
 msgstr ""
+"Este relatório nos casos do projeto te permitem analisar a qualidade do seu "
+"suporte ou do pós-venda. Você pode rastrear as questões por período. Você "
+"pode analisar o tempo necessário para abrir ou fechar uma questão, o número "
+"de emails trocados e o tempo gasto em média por questão."
 
 #. module: project_issue
 #: view:project.issue:0
@@ -269,7 +277,7 @@ msgstr "Manutenção"
 #: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
-msgstr ""
+msgstr "Análise de Questões"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -297,7 +305,7 @@ msgstr "Versão"
 #: view:project.issue:0 selection:project.issue,state:0
 #: view:project.issue.report:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.project_issue_categ_action
@@ -323,7 +331,7 @@ msgstr "Mais Baixa"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Unassigned Issues"
-msgstr ""
+msgstr "Questões não atribuídas"
 
 #. module: project_issue
 #: field:project.issue,create_date:0 view:project.issue.report:0
@@ -340,7 +348,7 @@ msgstr "Versões"
 #. module: project_issue
 #: view:project.issue:0
 msgid "To Do Issues"
-msgstr ""
+msgstr "Questões a Serem Feitas"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -356,7 +364,7 @@ msgstr "Hoje"
 #: model:ir.actions.act_window,name:project_issue.open_board_project_issue
 #: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue
 msgid "Project Issue Dashboard"
-msgstr ""
+msgstr "Painel de Questões do Projeto"
 
 #. module: project_issue
 #: view:project.issue:0 selection:project.issue,state:0
@@ -389,7 +397,7 @@ msgstr "Histórico"
 #: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree
 #: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree
 msgid "Project issues"
-msgstr ""
+msgstr "Questões do Projeto"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -399,12 +407,12 @@ msgstr "Comunicação & Histórico"
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "My Open Project Issue"
-msgstr ""
+msgstr "Minhas Questões do Projeto Abertas"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
 msgid "My Project Issues"
-msgstr ""
+msgstr "Minhas Questões do Projeto"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -425,7 +433,7 @@ msgstr "Meus Problemas"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Change to Previous Stage"
-msgstr ""
+msgstr "Mudar para o estágio anterior"
 
 #. module: project_issue
 #: model:ir.actions.act_window,help:project_issue.project_issue_version_action
@@ -434,6 +442,10 @@ msgid ""
 "development project, to handle claims in after-sales services, etc. Define "
 "here the different versions of your products on which you can work on issues."
 msgstr ""
+"Você pode usar o rastreador de questões no OpenErp para controlar os bugs em "
+"projetos de desenvolvimento de softwares, para controlar solicitações em pós-"
+"venda, etc. Defina aqui as diferentes versões de seus produtos em que você "
+"posse trabalhar em questões."
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:330
@@ -459,7 +471,7 @@ msgstr "Dezembro"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Tree"
-msgstr ""
+msgstr "Árvore de Rastreamento de Questões"
 
 #. module: project_issue
 #: view:project.issue:0 view:project.issue.report:0
@@ -470,7 +482,7 @@ msgstr "Mês"
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_report
 msgid "project.issue.report"
-msgstr ""
+msgstr "project.issue.report"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:408 view:project.issue:0
@@ -491,7 +503,7 @@ msgstr "Data de Atualização"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Open Features"
-msgstr ""
+msgstr "Recursos Abertos"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -507,22 +519,22 @@ msgstr "Categoria"
 #. module: project_issue
 #: field:project.issue,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "E-mail do Usuário"
 
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "#Number of Project Issues"
-msgstr ""
+msgstr "#Número de Questões de Projeto"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Reset to New"
-msgstr ""
+msgstr "Reiniciar como Novo"
 
 #. module: project_issue
 #: help:project.issue,channel_id:0
 msgid "Communication channel."
-msgstr ""
+msgstr "Canal de comunicação"
 
 #. module: project_issue
 #: help:project.issue,email_cc:0
@@ -531,6 +543,9 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Estes endereços de email serão adicionados para o campo CC de todas entradas "
+"e saídas de emails para este registro antes de ser enviado. Separe múltiplos "
+"endereços de email com vírgula."
 
 #. module: project_issue
 #: selection:project.issue.report,state:0
@@ -540,7 +555,7 @@ msgstr "Provisório"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Contact Information"
-msgstr ""
+msgstr "Informação de Contato"
 
 #. module: project_issue
 #: field:project.issue,date_closed:0 selection:project.issue.report,state:0
@@ -555,7 +570,7 @@ msgstr "Resposta"
 #. module: project_issue
 #: field:project.issue.report,delay_close:0
 msgid "Avg. Delay to Close"
-msgstr ""
+msgstr "Média de atraso para Conclusão"
 
 #. module: project_issue
 #: view:project.issue:0 selection:project.issue,state:0
@@ -571,7 +586,7 @@ msgstr "Status"
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "#Project Issues"
-msgstr ""
+msgstr "#Questões do Projeto"
 
 #. module: project_issue
 #: view:board.board:0
@@ -592,7 +607,7 @@ msgstr "Normal"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Global CC"
-msgstr ""
+msgstr "CC Global"
 
 #. module: project_issue
 #: view:project.issue:0 view:project.issue.report:0
@@ -607,7 +622,7 @@ msgstr "Junho"
 #. module: project_issue
 #: view:project.issue:0
 msgid "New Issues"
-msgstr ""
+msgstr "Novas Questões"
 
 #. module: project_issue
 #: field:project.issue,day_close:0
@@ -637,17 +652,17 @@ msgstr "Outubro"
 #. module: project_issue
 #: view:board.board:0
 msgid "Issues Dashboard"
-msgstr ""
+msgstr "Painel de Questões"
 
 #. module: project_issue
 #: view:project.issue:0 field:project.issue,type_id:0
 msgid "Stages"
-msgstr ""
+msgstr "Estágios"
 
 #. module: project_issue
 #: help:project.issue,days_since_creation:0
 msgid "Difference in days between creation date and current date"
-msgstr ""
+msgstr "Diferença em dias entre a data de criação e a data atual"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -657,7 +672,7 @@ msgstr "Janeiro"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature Tracker Tree"
-msgstr ""
+msgstr "Árvore de Recursos"
 
 #. module: project_issue
 #: help:project.issue,email_from:0
@@ -688,7 +703,7 @@ msgstr "Atribuído a"
 #. module: project_issue
 #: field:project.project,reply_to:0
 msgid "Reply-To Email Address"
-msgstr ""
+msgstr "Email de Responder Para"
 
 #. module: project_issue
 #: field:project.issue,partner_address_id:0
@@ -698,7 +713,7 @@ msgstr "Contato do Parceiro"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Form"
-msgstr ""
+msgstr "Formulário de Rastrear Questões"
 
 #. module: project_issue
 #: view:project.issue:0 field:project.issue,state:0
@@ -714,7 +729,7 @@ msgstr "Geral"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Current Features"
-msgstr ""
+msgstr "Recursos Atuais"
 
 #. module: project_issue
 #: view:project.issue.version:0
@@ -753,7 +768,7 @@ msgstr "Problemas"
 #. module: project_issue
 #: selection:project.issue,state:0
 msgid "In Progress"
-msgstr ""
+msgstr "Em Progresso"
 
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage
@@ -761,12 +776,12 @@ msgstr ""
 #: model:ir.model,name:project_issue.model_project_issue
 #: view:project.issue.report:0
 msgid "Project Issue"
-msgstr ""
+msgstr "Questões do Projeto"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Creation Month"
-msgstr ""
+msgstr "Mês de criação"
 
 #. module: project_issue
 #: help:project.issue,progress:0
@@ -781,6 +796,11 @@ msgid ""
 "issue (analysis, development, done). With the mailgateway module, issues can "
 "be integrated through an email address (example: support@mycompany.com)"
 msgstr ""
+"Questões como bugs no sistema, reclamações de clientes, e falhas de "
+"materiais são coletadas aqui.  Você pode definir os estágios associados "
+"quando for resolver as questões do projeto(análise, desenvolvimento, "
+"concluído). Com o módulo de email, as questões podem ser integradas através "
+"de um email (exemplo: suporte@minhaempresa.com.br)"
 
 #. module: project_issue
 #: view:board.board:0 view:project.issue:0
@@ -795,7 +815,7 @@ msgstr "Problema"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature Tracker Search"
-msgstr ""
+msgstr "Procurar Recurso"
 
 #. module: project_issue
 #: view:project.issue:0 field:project.issue,description:0
@@ -845,22 +865,22 @@ msgstr "Fevereiro"
 #: code:addons/project_issue/project_issue.py:70
 #, python-format
 msgid "Issue '%s' has been opened."
-msgstr ""
+msgstr "Questão '%s' foi aberta."
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature description"
-msgstr ""
+msgstr "Descrição do Recurso"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Edit"
-msgstr ""
+msgstr "Editar"
 
 #. module: project_issue
 #: field:project.project,project_escalation_id:0
 msgid "Project Escalation"
-msgstr ""
+msgstr "Escalação do Projeto"
 
 #. module: project_issue
 #: help:project.issue,section_id:0
@@ -868,6 +888,8 @@ msgid ""
 "Sales team to which Case belongs to.                             Define "
 "Responsible user and Email account for mail gateway."
 msgstr ""
+"Equipe de Vendas a que este caso pertence. Defina o usuário responsável e o "
+"endereço de email."
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -893,7 +915,7 @@ msgstr "Referências"
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
-msgstr ""
+msgstr "Horas de Trabalho para Concluir a Questão"
 
 #. module: project_issue
 #: field:project.issue,id:0
@@ -903,7 +925,7 @@ msgstr "ID"
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "Current Year"
-msgstr ""
+msgstr "Este Ano"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:415
@@ -915,7 +937,7 @@ msgstr "Sem Título"
 #: help:project.issue.report,delay_close:0
 #: help:project.issue.report,delay_open:0
 msgid "Number of Days to close the project issue"
-msgstr ""
+msgstr "Número de dias para fechar a questão do projeto."
 
 #. module: project_issue
 #: view:project.issue.report:0 field:project.issue.report,section_id:0
@@ -925,7 +947,7 @@ msgstr "Time de Vendas"
 #. module: project_issue
 #: field:project.issue.report,working_hours_close:0
 msgid "Avg. Working Hours to Close"
-msgstr ""
+msgstr "Média de Horas Trabalhadas para Fechar"
 
 #. module: project_issue
 #: selection:project.issue,priority:0
@@ -936,27 +958,27 @@ msgstr "Alta"
 #. module: project_issue
 #: field:project.issue,date_deadline:0
 msgid "Deadline"
-msgstr ""
+msgstr "Prazo Final"
 
 #. module: project_issue
 #: field:project.issue,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Última Ação"
 
 #. module: project_issue
 #: view:project.issue.report:0 field:project.issue.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Ano"
 
 #. module: project_issue
 #: field:project.issue,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Duração"
 
 #. module: project_issue
 #: view:board.board:0
 msgid "My Open Issues by Creation Date"
-msgstr ""
+msgstr "Minhas Questões em Aberto por Data de Criação"
 
 #~ msgid "Close Working hours"
 #~ msgstr "Fechar horas Trabalhadas"
diff --git a/addons/project_issue/i18n/ro.po b/addons/project_issue/i18n/ro.po
index 2c0eb37af11..ccc9ea5b998 100644
--- a/addons/project_issue/i18n/ro.po
+++ b/addons/project_issue/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/ru.po b/addons/project_issue/i18n/ru.po
index 6513f3c8950..f259487719b 100644
--- a/addons/project_issue/i18n/ru.po
+++ b/addons/project_issue/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/sv.po b/addons/project_issue/i18n/sv.po
index 2d49052d4da..787713eeb77 100644
--- a/addons/project_issue/i18n/sv.po
+++ b/addons/project_issue/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/tr.po b/addons/project_issue/i18n/tr.po
index 1f0beb1ab05..3992350b9d8 100644
--- a/addons/project_issue/i18n/tr.po
+++ b/addons/project_issue/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:30+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/i18n/zh_CN.po b/addons/project_issue/i18n/zh_CN.po
index e6e73fe468c..9d68c51b959 100644
--- a/addons/project_issue/i18n/zh_CN.po
+++ b/addons/project_issue/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:33+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:31+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue
 #: view:project.issue.report:0
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 5c440976b5c..90640363906 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -27,6 +27,7 @@ from tools.translate import _
 import binascii
 import time
 import tools
+from tools import html2plaintext
 
 class project_issue_version(osv.osv):
     _name = "project.issue.version"
@@ -46,8 +47,7 @@ class project_issue(base_stage, osv.osv):
     _name = "project.issue"
     _description = "Project Issue"
     _order = "priority, create_date desc"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
-    _mail_compose_message = True
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
 
     def _get_default_project_id(self, cr, uid, context=None):
         """ Gives default project by checking if present in the context """
@@ -88,14 +88,18 @@ class project_issue(base_stage, osv.osv):
         search_domain = []
         project_id = self._resolve_project_id_from_context(cr, uid, context=context)
         if project_id:
-            search_domain += ['|', '&', ('project_ids', '=', project_id), ('fold', '=', False)]
-        search_domain += ['|', ('id', 'in', ids), '&', ('case_default', '=', True), ('fold', '=', False)]
+            search_domain += ['|', ('project_ids', '=', project_id)]
+        search_domain += ['|', ('id', 'in', ids), ('case_default', '=', True)]
         # perform search
         stage_ids = stage_obj._search(cr, uid, search_domain, order=order, access_rights_uid=access_rights_uid, context=context)
         result = stage_obj.name_get(cr, access_rights_uid, stage_ids, context=context)
         # restore order of the search
         result.sort(lambda x,y: cmp(stage_ids.index(x[0]), stage_ids.index(y[0])))
-        return result
+
+        fold = {}
+        for stage in stage_obj.browse(cr, access_rights_uid, stage_ids, context=context):
+            fold[stage.id] = stage.fold or False
+        return result, fold
 
     def _compute_day(self, cr, uid, ids, fields, args, context=None):
         """
@@ -223,11 +227,11 @@ class project_issue(base_stage, osv.osv):
         'company_id': fields.many2one('res.company', 'Company'),
         'description': fields.text('Description'),
         'state': fields.related('stage_id', 'state', type="selection", store=True,
-                selection=_ISSUE_STATE, string="State", readonly=True,
-                help='The state is set to \'Draft\', when a case is created.\
-                      If the case is in progress the state is set to \'Open\'.\
-                      When the case is over, the state is set to \'Done\'.\
-                      If the case needs to be reviewed then the state is \
+                selection=_ISSUE_STATE, string="Status", readonly=True,
+                help='The status is set to \'Draft\', when a case is created.\
+                      If the case is in progress the status is set to \'Open\'.\
+                      When the case is over, the status is set to \'Done\'.\
+                      If the case needs to be reviewed then the status is \
                       set to \'Pending\'.'),
         'email_from': fields.char('Email', size=128, help="These people will receive email.", select=1),
         '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"),
@@ -236,11 +240,11 @@ class project_issue(base_stage, osv.osv):
         'date_closed': fields.datetime('Closed', readonly=True,select=True),
         'date': fields.datetime('Date'),
         'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."),
-        'categ_ids': fields.many2many('project.category', string='Categories'),
+        'categ_ids': fields.many2many('project.category', string='Tags'),
         'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True),
         'version_id': fields.many2one('project.issue.version', 'Version'),
         'stage_id': fields.many2one ('project.task.type', 'Stage',
-                        domain="['|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
+                        domain="['&', ('fold', '=', False), '|', ('project_ids', '=', project_id), ('case_default', '=', True)]"),
         'project_id':fields.many2one('project.project', 'Project'),
         'duration': fields.float('Duration'),
         'task_id': fields.many2one('project.task', 'Task', domain="[('project_id','=',project_id)]"),
@@ -271,12 +275,11 @@ class project_issue(base_stage, osv.osv):
         'active': 1,
         'partner_id': lambda s, cr, uid, c: s._get_default_partner(cr, uid, c),
         'email_from': lambda s, cr, uid, c: s._get_default_email(cr, uid, c),
-        'state': 'draft',
         'stage_id': lambda s, cr, uid, c: s._get_default_stage_id(cr, uid, c),
         'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c),
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c),
         'priority': crm.AVAILABLE_PRIORITIES[2][0],
-         }
+    }
 
     _group_by_full = {
         'stage_id': _read_group_stage_ids
@@ -328,7 +331,7 @@ class project_issue(base_stage, osv.osv):
             })
             vals = {
                 'task_id': new_task_id,
-                'state':'pending'
+                'stage_id': self.stage_find(cr, uid, [bug], bug.project_id.id, [('state', '=', 'pending')], context=context),
             }
             self.convert_to_task_send_note(cr, uid, [bug.id], context=context)
             case_obj.write(cr, uid, [bug.id], vals, context=context)
@@ -352,23 +355,53 @@ class project_issue(base_stage, osv.osv):
         if not default:
             default = {}
         default = default.copy()
-        default['name'] = issue['name'] + _(' (copy)')
+        default.update(name=_('%s (copy)') % (issue['name']))
         return super(project_issue, self).copy(cr, uid, id, default=default,
                 context=context)
 
+    def _subscribe_project_followers_to_issue(self, cr, uid, task_id, context=None):
+        """ TDE note: not the best way to do this, we could override _get_followers
+            of issue, and perform a better mapping of subtypes than a mapping
+            based on names.
+            However we will keep this implementation, maybe to be refactored
+            in 7.1 of future versions. """
+        # task followers are project followers, with matching subtypes
+        task_record = self.browse(cr, uid, task_id, context=context)
+        subtype_obj = self.pool.get('mail.message.subtype')
+        follower_obj = self.pool.get('mail.followers')
+        if task_record.project_id:
+            # create mapping
+            task_subtype_ids = subtype_obj.search(cr, uid, ['|', ('res_model', '=', False), ('res_model', '=', self._name)], context=context)
+            task_subtypes = subtype_obj.browse(cr, uid, task_subtype_ids, context=context)
+            # fetch subscriptions
+            follower_ids = follower_obj.search(cr, uid, [('res_model', '=', 'project.project'), ('res_id', '=', task_record.project_id.id)], context=context)
+            # copy followers
+            for follower in follower_obj.browse(cr, uid, follower_ids, context=context):
+                if not follower.subtype_ids:
+                    continue
+                project_subtype_names = [project_subtype.name for project_subtype in follower.subtype_ids]
+                task_subtype_ids = [task_subtype.id for task_subtype in task_subtypes if task_subtype.name in project_subtype_names]
+                self.message_subscribe(cr, uid, [task_id], [follower.partner_id.id],
+                    subtype_ids=task_subtype_ids, context=context)
+
     def write(self, cr, uid, ids, vals, context=None):
         #Update last action date every time the user change the stage, the state or send a new email
         logged_fields = ['stage_id', 'state', 'message_ids']
         if any([field in vals for field in logged_fields]):
             vals['date_action_last'] = time.strftime('%Y-%m-%d %H:%M:%S')
+
+        # subscribe new project followers to the issue
+        if vals.get('project_id'):
+            for id in ids:
+                self._subscribe_project_followers_to_issue(cr, uid, id, context=context)
+
         return super(project_issue, self).write(cr, uid, ids, vals, context)
 
     def onchange_task_id(self, cr, uid, ids, task_id, context=None):
-        result = {}
         if not task_id:
-            return {'value':{}}
+            return {'value': {}}
         task = self.pool.get('project.task').browse(cr, uid, task_id, context=context)
-        return {'value':{'user_id': task.user_id.id,}}
+        return {'value': {'user_id': task.user_id.id, }}
 
     def case_reset(self, cr, uid, ids, context=None):
         """Resets case as draft
@@ -379,7 +412,11 @@ class project_issue(base_stage, osv.osv):
 
     def create(self, cr, uid, vals, context=None):
         obj_id = super(project_issue, self).create(cr, uid, vals, context=context)
+
+        # subscribe project follower to the issue
+        self._subscribe_project_followers_to_issue(cr, uid, obj_id, context=context)
         self.create_send_note(cr, uid, [obj_id], context=context)
+
         return obj_id
 
     # -------------------------------------------------------
@@ -452,16 +489,17 @@ class project_issue(base_stage, osv.osv):
         if context is None: context = {}
         context['state_to'] = 'draft'
 
+        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
+
         custom_values.update({
             'name':  msg.get('subject') or _("No Subject"),
-            'description': msg.get('body_text'),
+            'description': desc,
             'email_from': msg.get('from'),
             'email_cc': msg.get('cc'),
             'user_id': False,
         })
         if  msg.get('priority'):
             custom_values['priority'] =  msg.get('priority')
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context))
 
         res_id = super(project_issue, self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
         # self.convert_to_bug(cr, uid, [res_id], context=context)
@@ -477,16 +515,15 @@ class project_issue(base_stage, osv.osv):
         if update_vals is None: update_vals = {}
 
         # Update doc values according to the message
-        update_vals['description'] = msg.get('body_text', '')
         if msg.get('priority'):
             update_vals['priority'] = msg.get('priority')
-        # Parse 'body_text' to find values to update
+        # Parse 'body' to find values to update
         maps = {
             'cost': 'planned_cost',
             'revenue': 'planned_revenue',
             'probability': 'probability',
         }
-        for line in msg.get('body_text', '').split('\n'):
+        for line in msg.get('body', '').split('\n'):
             line = line.strip()
             res = tools.misc.command_re.match(line)
             if res and maps.get(res.group(1).lower(), False):
@@ -499,36 +536,31 @@ class project_issue(base_stage, osv.osv):
     # OpenChatter methods and notifications
     # -------------------------------------------------------
 
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'user_id' to the monitored fields """
-        res = super(project_issue, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['user_id']
-
     def stage_set_send_note(self, cr, uid, ids, stage_id, context=None):
         """ Override of the (void) default notification method. """
         stage_name = self.pool.get('project.task.type').name_get(cr, uid, [stage_id], context=context)[0][1]
-        return self.message_append_note(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), context=context)
+        return self.message_post(cr, uid, ids, body= _("Stage changed to <b>%s</b>.") % (stage_name), subtype="mt_issue_new", context=context)
 
     def case_get_note_msg_prefix(self, cr, uid, id, context=None):
         """ Override of default prefix for notifications. """
         return 'Project issue'
 
     def convert_to_task_send_note(self, cr, uid, ids, context=None):
-        message = _("Project issue has been <b>converted</b> into task.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        message = _("Project issue <b>converted</b> to task.")
+        return self.message_post(cr, uid, ids, body=message, context=context)
 
     def create_send_note(self, cr, uid, ids, context=None):
-        message = _("Project issue has been <b>created</b>.")
-        return self.message_append_note(cr, uid, ids, body=message, context=context)
+        message = _("Project issue <b>created</b>.")
+        return self.message_post(cr, uid, ids, body=message, subtype="mt_issue_new", context=context)
 
     def case_escalate_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.project_id:
-                message = _("has been <b>escalated</b> to <em>'%s'</em>.") % (obj.project_id.name)
-                obj.message_append_note(body=message, context=context)
+                message = _("<b>escalated</b> to <em>'%s'</em>.") % (obj.project_id.name)
+                obj.message_post(body=message)
             else:
-                message = _("has been <b>escalated</b>.")
-                obj.message_append_note(body=message, context=context)
+                message = _("<b>escalated</b>.")
+                obj.message_post(body=message)
         return True
 
 project_issue()
@@ -538,7 +570,7 @@ class project(osv.osv):
 
     def _get_alias_models(self, cr, uid, context=None):
         return [('project.task', "Tasks"), ("project.issue", "Issues")]
-        
+
     def _issue_count(self, cr, uid, ids, field_name, arg, context=None):
         res = dict.fromkeys(ids, 0)
         issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)])
@@ -561,7 +593,7 @@ class project(osv.osv):
     _constraints = [
         (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id'])
     ]
-    
+
 project()
 
 class account_analytic_account(osv.osv):
@@ -569,7 +601,7 @@ class account_analytic_account(osv.osv):
     _description = 'Analytic Account'
 
     _columns = {
-        'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"),
+        'use_issues' : fields.boolean('Issues', help="Check this field if this project manages issues"),
     }
 
     def on_change_template(self, cr, uid, ids, template_id, context=None):
@@ -580,8 +612,9 @@ class account_analytic_account(osv.osv):
         return res
 
     def _trigger_project_creation(self, cr, uid, vals, context=None):
+        if context is None: context = {}
         res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context)
-        return res or vals.get('use_issues')
+        return res or (vals.get('use_issues') and not 'project_creation_in_progress' in context)
 
 account_analytic_account()
 
diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml
index a191cb4454f..c1460167097 100644
--- a/addons/project_issue/project_issue_data.xml
+++ b/addons/project_issue/project_issue_data.xml
@@ -32,13 +32,34 @@
         </record>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Issues Tracker has been installed.</value>
-            <value>Manage the issues you might face in a project, like bugs in a system, client complaints or material breakdowns.  You can record issues, assign them to some responsible person, and keep track of their status as they evolve over time.
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Issue Tracker application installed!</field>
+            <field name="body"><![CDATA[<p>Manage the issues you might face in a project, such as bugs in a system, client complaints or material breakdowns.</p><p>
+You can record issues, assign them to a responsible person, and keep track of their status as they evolve over time.</p><p>
+Access all issues from the top Project menu, and access the issues of a specific project via the projects gallery view.</p>]]></field>
+        </record>
+
+        <!-- Mail subtypes -->
+        <record id="mail.mt_issue_new" model="mail.message.subtype">
+            <field name="name">New</field>
+            <field name="res_model">project.issue</field>
+        </record>
+        <record id="mail.mt_issue_closed" model="mail.message.subtype">
+            <field name="name">Closed</field>
+            <field name="res_model">project.issue</field>
+        </record>
+        <record id="mail.mt_issue_canceled" model="mail.message.subtype">
+            <field name="name">Canceled</field>
+            <field name="res_model">project.issue</field>
+        </record>
+        <record id="mail.mt_issue_change" model="mail.message.subtype">
+            <field name="name">Stage Changed</field>
+            <field name="res_model">project.issue</field>
+        </record>
 
-You can access issues from the top menu Project, and access the issues of a specific project from the projects gallery view.</value>
-        </function>
     </data>
 </openerp>
diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml
index 0a4eee3067b..63fa37c84c3 100644
--- a/addons/project_issue/project_issue_demo.xml
+++ b/addons/project_issue/project_issue_demo.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0"?>
 <openerp>
+    <data>
+
+        <record id="project.project_project_1" model="project.project">
+            <field name="use_issues" eval="True"/>
+        </record>
+        <record id="project.project_project_2" model="project.project">
+            <field name="use_issues" eval="True"/>
+        </record>
+        <record id="project.project_project_3" model="project.project">
+            <field name="use_issues" eval="True"/>
+        </record>
+        <record id="project.project_project_4" model="project.project">
+            <field name="use_issues" eval="True"/>
+        </record>
+        <record id="project.project_project_5" model="project.project">
+            <field name="use_issues" eval="True"/>
+        </record>
+
+    </data>
     <data noupdate="1">
 
         <!-- Categories -->
@@ -31,7 +50,7 @@
         </record>
 
         <record id="crm_case_programnotgivingproperoutput0" model="project.issue">
-            <field eval="time.strftime('%Y-%m-15  12:50:00')" name="date"/>
+            <field eval="time.strftime('%Y-%m-15 12:50:00')" name="date"/>
             <field name="priority">3</field>
             <field name="user_id" ref="base.user_root"/>
             <field name="partner_id" ref="base.res_partner_1"/>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index b37cf40014e..e3105127c5d 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -11,7 +11,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_issue"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_project_issue_unread" model="ir.values">
             <field name="name">action_project_issue_unread</field>
@@ -29,7 +29,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_project_issue"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_project_issue_read" model="ir.values">
             <field name="name">action_project_issue_read</field>
@@ -95,16 +95,12 @@
             <field name="arch" type="xml">
                 <form string="Issue" version="7.0">
                 <header>
-                    <span groups="base.group_user">
-                        <button name="case_close" string="Done" type="object"
-                                states="open"/>
-                         <button name="case_close" string="Done" type="object"
-                                states="draft,pending"/>
-                        <button name="case_escalate" string="Escalate" type="object"
-                                states="draft,open,pending"/>
-                        <button name="case_cancel" string="Cancel" type="object"
-                                states="draft,open,pending"/>
-                    </span>
+                    <button name="case_close" string="Done" type="object" 
+                            states="open" groups="base.group_user"/>
+                    <button name="case_close" string="Done" type="object"
+                            states="draft,pending" groups="base.group_user"/>
+                    <button name="case_cancel" string="Cancel" type="object"
+                            states="draft,open,pending" groups="base.group_user"/>
                     <field name="stage_id" widget="statusbar" clickable="True"/>
                 </header>
                 <sheet string="Issue">
@@ -118,22 +114,22 @@
                         </group>
                         <group>
                             <field name="priority"/>
-                            <field name="project_id" required="True" on_change="on_change_project(project_id)" context="{'default_use_issues':1}"/>
+                            <label for="project_id"/>
+                            <div>
+                                <field name="project_id" required="True" on_change="on_change_project(project_id)" class="oe_inline" context="{'default_use_issues':1}"/>
+                                <button name="case_escalate" string="Escalate" type="object" states="draft,open,pending" class="oe_inline"/>
+                            </div>
                             <label for="task_id"/>
                             <div>
                                 <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline" context="{'default_project_id':project_id}"/>
                                 <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}" class="oe_inline"/>
                             </div>
                             <field name="categ_ids" widget="many2many_tags"/>
+                            <field name="version_id"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Description">
-                            <group>
-                                <group>
-                                    <field name="version_id" widget="selection"/>
-                                </group>
-                            </group>
                             <field name="description" placeholder="Add a description..."/>
                         </page>
                         <page string="Extra Info" groups="base.group_no_one">
@@ -151,7 +147,7 @@
                                 <field name="id"/>
                                 <field name="active"/>
                             </group>
-                            <group colspan="4" col="4">
+                            <group colspan="4" col="4" invisible="1">
                                 <separator string="Status" colspan="4"/>
                                 <field name="state" groups="base.group_no_one" string="Status"/>
                             </group>
@@ -159,8 +155,8 @@
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
@@ -170,8 +166,8 @@
             <field name="name">Project Issue Tracker Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Issue Tracker Tree" fonts="bold:needaction_pending==True" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree string="Issue Tracker Tree" fonts="bold:message_unread==True" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                    <field name="message_unread" invisible="1"/>
                     <field name="id"/>
                     <field name="create_date" groups="base.group_no_one"/>
                     <field name="name"/>
@@ -182,7 +178,7 @@
                     <field name="user_id"/>
                     <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
                     <field name="stage_id" widget="selection" readonly="1"/>
-                    <field name="state" groups="base.group_no_one"/>
+                    <field name="state" invisible="1"/>
                     <field name="categ_ids" invisible="1"/>
                     <field name="task_id" invisible="1"/>
                 </tree>
@@ -196,7 +192,7 @@
                 <search string="Issue Tracker Search">
                     <field name="name" string="Issue" filter_domain="['|', '|',('partner_id','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
                     <field name="id"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter string="New" icon="terp-document-new" domain="[('state','=','draft')]" help="New Issues"/>
                     <filter string="To Do" domain="[('state','=','open')]" help="To Do Issues" icon="terp-check"/>
@@ -212,7 +208,6 @@
                         <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
                         <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}"/>
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
                     </group>
                 </search>
@@ -253,12 +248,12 @@
                            </ul>
                         </t>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_global_click oe_semantic_html_override">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
-                                        <li><a type="edit" >Edit...</a></li>
-                                        <li><a type="delete">Delete</a></li>
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
                                 </div>
@@ -270,9 +265,7 @@
                                     </div>
                                     <div class="oe_kanban_footer_left">
                                         <div class="oe_left oe_tags">
-                                            <t t-foreach="record.categ_ids.raw_value" t-as="categ_id">
-                                                <span class="oe_tag" t-att-data-categ_id="categ_id"></span>
-                                            </t>
+                                            <field name="categ_ids"/>
                                         </div>
                                         <div class="oe_right">
                                             <span class="oe_kanban_highlight">
@@ -311,9 +304,9 @@
             <field name="name">Project Issue- Feature Tracker Tree</field>
             <field name="model">project.issue</field>
             <field name="arch" type="xml">
-                <tree string="Feature Tracker Tree" fonts="bold:needaction_pending==True" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
+                <tree string="Feature Tracker Tree" fonts="bold:message_unread==True" colors="red:state=='open';black:state in ('draft', 'cancel','done','pending')">
                     <field name="id"/>
-                    <field name="needaction_pending" invisible="1"/>
+                    <field name="message_unread" invisible="1"/>
                     <field name="name" string="Feature description"/>
                     <field name="partner_id"/>
                     <field name="priority" string="Priority"/>
@@ -341,13 +334,13 @@
             </field>
         </record>
 
-        <act_window id="act_project_project_2_project_issue_all"
-            name="Issues"
-            src_model="project.project"
-            res_model="project.issue"
-            view_type="form"
-            view_mode="kanban,tree,form,calendar,graph"
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
+        <record id="act_project_project_2_project_issue_all" model="ir.actions.act_window">
+            <field name="res_model">project.issue</field>
+            <field name="view_type">form</field>
+            <field name="name">Issues</field>
+            <field name="view_mode">kanban,tree,form,calendar,graph</field>
+            <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+        </record>
 
         <!-- Project -->
         <record id="view_project_form_inherited" model="ir.ui.view">
@@ -355,11 +348,12 @@
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr>
-                        <td><group><field name="use_issues"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/></td>
-                    </tr>
+                <xpath expr='//div[@name="options_active"]' position='inside'>
+                    <field name="use_issues" class="oe_inline"/>
+                    <label for="use_issues"/>
+                </xpath>
+                <xpath expr='//div[@name="buttons"]' position='inside'>
+                    <button name="%(act_project_project_2_project_issue_all)d" string="Issues" type="action" attrs="{'invisible':[('use_issues','=', 0)]}"/>
                 </xpath>
                 <field name="priority" position="before">
                     <field name="project_escalation_id"/>
@@ -380,9 +374,11 @@
                     <field name="issue_count" invisible="1"/>
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
-                    <a t-if="record.use_issues.raw_value"
+                    <a t-if="record.use_issues.raw_value" style="margin-right: 10px"
                         name="%(act_project_project_2_project_issue_all)d" type="action">
-                        Issues(<field name="issue_count"/>)</a>
+                        <span t-if="record.issue_count.raw_value gt 1"><field name="issue_count"/> Issues</span>
+                        <span t-if="record.issue_count.raw_value lt 2"><field name="issue_count"/> Issue</span>
+                    </a>
                 </xpath>
             </field>
         </record>
@@ -393,11 +389,9 @@
             <field name="inherit_id" ref="project.analytic_account_inherited_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator colspan="4" string="Project Management" name="project_sep"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                <xpath expr='//div[@name="project"]' position='inside'>
                     <field name="use_issues"/>
+                    <label for="use_issues"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index 625e6e64374..47ea91fad5f 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -6,7 +6,7 @@
             <field name="name">project.issue.report.tree</field>
             <field name="model">project.issue.report</field>
             <field name="arch" type="xml">
-                <tree string="Issues Analysis">
+                <tree string="Issues Analysis" create="false">
                     <field name="name" invisible="1"/>
                     <field name="month" invisible="1"/>
                     <field name="project_id" invisible="1"/>
@@ -63,11 +63,9 @@
                         <filter string="Sale Team" icon="terp-personal+" domain="[]" context="{'group_by':'section_id'}" />
                         <filter string="Project"  name="project" icon="terp-folder-violet" context="{'group_by':'project_id'}" />
                         <filter string="Task"  icon="terp-stock_align_left_24" domain="[]" context="{'group_by':'task_id'}"/>
-                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}" />
                         <filter string="Version"  icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'version_id'}"/>
                         <filter string="Priority"  icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}" />
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}" />
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
                         <filter string="Day" icon="terp-go-today" domain="[]" context="{'group_by':'day'}" help="Creation Date"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Creation Date"/>
diff --git a/addons/project_issue/res_config.py b/addons/project_issue/res_config.py
index 9fdbf502a62..f286f9cac25 100644
--- a/addons/project_issue/res_config.py
+++ b/addons/project_issue/res_config.py
@@ -26,7 +26,7 @@ class project_issue_settings(osv.osv_memory):
     _inherit = ['project.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_issue': fields.boolean("create issues from an incoming email account ", 
+        'fetchmail_issue': fields.boolean("Create issues from an incoming email account ", 
             fetchmail_model='project.issue', fetchmail_name='Incoming Issues',
             help="""Allows you to configure your incoming mail server, and create issues from incoming emails."""),
     }
diff --git a/addons/project_issue/res_config_view.xml b/addons/project_issue/res_config_view.xml
index a37b2ba0c3d..4763fa476b4 100644
--- a/addons/project_issue/res_config_view.xml
+++ b/addons/project_issue/res_config_view.xml
@@ -2,10 +2,9 @@
 <openerp>
     <data noupdate="1">
         <!-- After installation of the module, open the related menu -->
-        <record id="todo_open_project_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="project.action_client_project_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
         </record>
     </data>
     <data>
diff --git a/addons/project_issue/test/issue_process.yml b/addons/project_issue/test/issue_process.yml
index d5900bb1b4f..afb68a9b6c2 100644
--- a/addons/project_issue/test/issue_process.yml
+++ b/addons/project_issue/test/issue_process.yml
@@ -19,9 +19,9 @@
   !assert {model: project.issue, id: crm_case_buginaccountsmodule0, severity: error, string: Issue should be in pending state}:
     - state == 'pending'
 -
-  I send mail to get more details.
+  I send mail to get more details. TODO revert mail.mail to mail.compose.message (conversion to customer should be automatic).
 -
-  !python {model: mail.compose.message }: |
+  !python {model: mail.mail }: |
     ctx = context.copy()
     ctx.update({'active_model': 'project.issue', 'active_id': ref("crm_case_buginaccountsmodule0"), 'active_ids': [ref("crm_case_buginaccountsmodule0")]})
     vals = self.default_get(cr, uid , [], context=ctx)
diff --git a/addons/project_issue_sheet/__openerp__.py b/addons/project_issue_sheet/__openerp__.py
index cb47432c749..3eac04133d4 100644
--- a/addons/project_issue_sheet/__openerp__.py
+++ b/addons/project_issue_sheet/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Timesheet on Issues',
     'version': '1.0',
-    "category": "Project Management",
+    'category': 'Project Management',
     'description': """
 This module adds the Timesheet support for the Issues/Bugs Management in Project.
 =================================================================================
@@ -37,17 +37,13 @@ Worklogs can be maintained to signify number of hours spent by users to handle a
         'project_issue',
         'hr_timesheet_sheet',
     ],
-    'init_xml': [
-    ],
-    'update_xml': [
+    'data': [
         'project_issue_sheet_view.xml',
         'security/ir.model.access.csv',
     ],
-    'demo_xml': [
-    ],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00856032058128997037',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_issue_sheet/i18n/ar.po b/addons/project_issue_sheet/i18n/ar.po
index 4fc46aad966..5e6df718924 100644
--- a/addons/project_issue_sheet/i18n/ar.po
+++ b/addons/project_issue_sheet/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/ca.po b/addons/project_issue_sheet/i18n/ca.po
index b097db7704d..122ac9a2f74 100644
--- a/addons/project_issue_sheet/i18n/ca.po
+++ b/addons/project_issue_sheet/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/da.po b/addons/project_issue_sheet/i18n/da.po
index 66a6f98e27b..a331526e943 100644
--- a/addons/project_issue_sheet/i18n/da.po
+++ b/addons/project_issue_sheet/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/de.po b/addons/project_issue_sheet/i18n/de.po
index 9ba8bd9e586..1cefe670a35 100644
--- a/addons/project_issue_sheet/i18n/de.po
+++ b/addons/project_issue_sheet/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/es.po b/addons/project_issue_sheet/i18n/es.po
index ce496d1be9c..bc0e55bdb0b 100644
--- a/addons/project_issue_sheet/i18n/es.po
+++ b/addons/project_issue_sheet/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/es_CR.po b/addons/project_issue_sheet/i18n/es_CR.po
index fb70c2ddd68..5c7dc0762cd 100644
--- a/addons/project_issue_sheet/i18n/es_CR.po
+++ b/addons/project_issue_sheet/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: project_issue_sheet
diff --git a/addons/project_issue_sheet/i18n/fi.po b/addons/project_issue_sheet/i18n/fi.po
index c7b838aaea8..b3ff08bf903 100644
--- a/addons/project_issue_sheet/i18n/fi.po
+++ b/addons/project_issue_sheet/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/fr.po b/addons/project_issue_sheet/i18n/fr.po
index 2e94e94e24e..554b73b7d91 100644
--- a/addons/project_issue_sheet/i18n/fr.po
+++ b/addons/project_issue_sheet/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/gl.po b/addons/project_issue_sheet/i18n/gl.po
index 168ee37f6c3..f52d6cc6021 100644
--- a/addons/project_issue_sheet/i18n/gl.po
+++ b/addons/project_issue_sheet/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/hr.po b/addons/project_issue_sheet/i18n/hr.po
index 0599a90f39b..0188d357ac7 100644
--- a/addons/project_issue_sheet/i18n/hr.po
+++ b/addons/project_issue_sheet/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/hu.po b/addons/project_issue_sheet/i18n/hu.po
index a09750806ce..a1bb4eee771 100644
--- a/addons/project_issue_sheet/i18n/hu.po
+++ b/addons/project_issue_sheet/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/it.po b/addons/project_issue_sheet/i18n/it.po
index 45b7f6aaf62..78e7e35f48a 100644
--- a/addons/project_issue_sheet/i18n/it.po
+++ b/addons/project_issue_sheet/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/ja.po b/addons/project_issue_sheet/i18n/ja.po
index ed5f00a1df2..ac8352190ac 100644
--- a/addons/project_issue_sheet/i18n/ja.po
+++ b/addons/project_issue_sheet/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/lv.po b/addons/project_issue_sheet/i18n/lv.po
index 268a563fc78..293cf3c4d65 100644
--- a/addons/project_issue_sheet/i18n/lv.po
+++ b/addons/project_issue_sheet/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/mn.po b/addons/project_issue_sheet/i18n/mn.po
index b875ef0f156..eebb742aa79 100644
--- a/addons/project_issue_sheet/i18n/mn.po
+++ b/addons/project_issue_sheet/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/nl.po b/addons/project_issue_sheet/i18n/nl.po
index 2a98fe3527f..1f617dde5b2 100644
--- a/addons/project_issue_sheet/i18n/nl.po
+++ b/addons/project_issue_sheet/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-18 14:53+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/pl.po b/addons/project_issue_sheet/i18n/pl.po
index 0e442f23aa2..6428e7bcde7 100644
--- a/addons/project_issue_sheet/i18n/pl.po
+++ b/addons/project_issue_sheet/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/pt.po b/addons/project_issue_sheet/i18n/pt.po
index 150957d0021..9743ee9b781 100644
--- a/addons/project_issue_sheet/i18n/pt.po
+++ b/addons/project_issue_sheet/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/pt_BR.po b/addons/project_issue_sheet/i18n/pt_BR.po
index 582f81483c0..630cd0ef04d 100644
--- a/addons/project_issue_sheet/i18n/pt_BR.po
+++ b/addons/project_issue_sheet/i18n/pt_BR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-14 04:45+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/ro.po b/addons/project_issue_sheet/i18n/ro.po
index e09fecdedbb..44190f991c2 100644
--- a/addons/project_issue_sheet/i18n/ro.po
+++ b/addons/project_issue_sheet/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/ru.po b/addons/project_issue_sheet/i18n/ru.po
index b1419de6576..04b58028a46 100644
--- a/addons/project_issue_sheet/i18n/ru.po
+++ b/addons/project_issue_sheet/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/sv.po b/addons/project_issue_sheet/i18n/sv.po
index 2d5b6296064..eeaf70e5c08 100644
--- a/addons/project_issue_sheet/i18n/sv.po
+++ b/addons/project_issue_sheet/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/tr.po b/addons/project_issue_sheet/i18n/tr.po
index 4fb03440716..9cf5527aa8e 100644
--- a/addons/project_issue_sheet/i18n/tr.po
+++ b/addons/project_issue_sheet/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_issue_sheet/i18n/zh_CN.po b/addons/project_issue_sheet/i18n/zh_CN.po
index c2c9127662c..db04a150690 100644
--- a/addons/project_issue_sheet/i18n/zh_CN.po
+++ b/addons/project_issue_sheet/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:29+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py
index 3882eddbdb5..3a3307d2898 100644
--- a/addons/project_long_term/__openerp__.py
+++ b/addons/project_long_term/__openerp__.py
@@ -20,14 +20,14 @@
 ##############################################################################
 
 {
-    "name": "Long Term Projects",
-    "version": "1.1",
-    "author": "OpenERP SA",
-    "website": "http://www.openerp.com",
-    "category": "Project Management",
-    "images": ["images/project_phase_form.jpeg","images/project_phases.jpeg", "images/resources_allocation.jpeg"],
-    "depends": ["project"],
-    "description": """
+    'name': 'Long Term Projects',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'category': 'Project Management',
+    'images': ['images/project_phase_form.jpeg','images/project_phases.jpeg', 'images/resources_allocation.jpeg'],
+    'depends': ['project'],
+    'description': """
 Long Term Project management module that tracks planning, scheduling, resources allocation.
 ===========================================================================================
 
@@ -44,22 +44,20 @@ Features:
     * Schedule Tasks: All the tasks which are in draft, pending and open state
       are scheduled with taking the phase's start date.
     """,
-    "init_xml": [],
-    "demo_xml": ["project_long_term_demo.xml"],
-    "test": [
+    'demo': ['project_long_term_demo.xml'],
+    'test': [
           'test/phase_process.yml',
           'test/task_process.yml',
     ],
-    "update_xml": [
-        "security/ir.model.access.csv",
-        "project_long_term_view.xml",
-        "project_long_term_workflow.xml",
-        "wizard/project_compute_phases_view.xml",
-        "wizard/project_compute_tasks_view.xml",
+    'data': [
+        'security/ir.model.access.csv',
+        'project_long_term_view.xml',
+        'project_long_term_workflow.xml',
+        'wizard/project_compute_phases_view.xml',
+        'wizard/project_compute_tasks_view.xml',
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '001227470751077315069',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/i18n/ar.po b/addons/project_long_term/i18n/ar.po
index e4859c5f75b..28ece74411a 100644
--- a/addons/project_long_term/i18n/ar.po
+++ b/addons/project_long_term/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -128,7 +128,7 @@ msgstr "تكون وحدة القياس هي وحدة لقياس الفترة"
 #: view:project.phase:0
 #: view:project.user.allocation:0
 msgid "Planning of Users"
-msgstr ""
+msgstr "التخطيط للمستخدمين"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
diff --git a/addons/project_long_term/i18n/ca.po b/addons/project_long_term/i18n/ca.po
index afd8216df7d..30fb50785c1 100644
--- a/addons/project_long_term/i18n/ca.po
+++ b/addons/project_long_term/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/da.po b/addons/project_long_term/i18n/da.po
index 5b6ce585453..2353ea5bc69 100644
--- a/addons/project_long_term/i18n/da.po
+++ b/addons/project_long_term/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/de.po b/addons/project_long_term/i18n/de.po
index f53e34c0cb6..bd1bc4e9a50 100644
--- a/addons/project_long_term/i18n/de.po
+++ b/addons/project_long_term/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/es.po b/addons/project_long_term/i18n/es.po
index 82f0c276df8..4617914591c 100644
--- a/addons/project_long_term/i18n/es.po
+++ b/addons/project_long_term/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/es_CR.po b/addons/project_long_term/i18n/es_CR.po
index cd54b36536f..a8de1beef4c 100644
--- a/addons/project_long_term/i18n/es_CR.po
+++ b/addons/project_long_term/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: project_long_term
diff --git a/addons/project_long_term/i18n/es_EC.po b/addons/project_long_term/i18n/es_EC.po
index cec5a0f9a46..7bbd029bcad 100644
--- a/addons/project_long_term/i18n/es_EC.po
+++ b/addons/project_long_term/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/fi.po b/addons/project_long_term/i18n/fi.po
index e7209e67bde..b80e7a93b66 100644
--- a/addons/project_long_term/i18n/fi.po
+++ b/addons/project_long_term/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/fr.po b/addons/project_long_term/i18n/fr.po
index c55e3582939..63871a8c2dc 100644
--- a/addons/project_long_term/i18n/fr.po
+++ b/addons/project_long_term/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/hr.po b/addons/project_long_term/i18n/hr.po
index c634626e1ed..dc70560d097 100644
--- a/addons/project_long_term/i18n/hr.po
+++ b/addons/project_long_term/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/hu.po b/addons/project_long_term/i18n/hu.po
index a0721aa6bbf..80396ca4e01 100644
--- a/addons/project_long_term/i18n/hu.po
+++ b/addons/project_long_term/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/it.po b/addons/project_long_term/i18n/it.po
index 31cca39375b..046b3d1b7cb 100644
--- a/addons/project_long_term/i18n/it.po
+++ b/addons/project_long_term/i18n/it.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/ja.po b/addons/project_long_term/i18n/ja.po
index b6942982ae9..92aa26a0a81 100644
--- a/addons/project_long_term/i18n/ja.po
+++ b/addons/project_long_term/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/lv.po b/addons/project_long_term/i18n/lv.po
index 50c53125eef..c519ca3172e 100644
--- a/addons/project_long_term/i18n/lv.po
+++ b/addons/project_long_term/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/mn.po b/addons/project_long_term/i18n/mn.po
index 6a35bb779e4..1ca89e27bb4 100644
--- a/addons/project_long_term/i18n/mn.po
+++ b/addons/project_long_term/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/nl.po b/addons/project_long_term/i18n/nl.po
index 0e84060aaba..169042c7a81 100644
--- a/addons/project_long_term/i18n/nl.po
+++ b/addons/project_long_term/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:34+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -379,7 +379,7 @@ msgstr "Annuleren"
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "In Progress"
-msgstr "Loopt"
+msgstr "In behandeling"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -433,7 +433,7 @@ msgid ""
 " If the phase is over, the states is set to 'Done'."
 msgstr ""
 "Als de fase is gemaakt is de status 'Concept'.\n"
-" Als de fase is gestart, wordt de status 'Loopt'.\n"
+" Als de fase is gestart, wordt de status 'In behandeling'.\n"
 " Als opnieuw bekeken moet worden, wordt de fase status 'Wachtend'.           "
 "                       \n"
 " Als de fase voorbij is, wordt de status op 'Voltooid' gezet."
diff --git a/addons/project_long_term/i18n/pl.po b/addons/project_long_term/i18n/pl.po
index bec5bb71d3e..2e7d172517a 100644
--- a/addons/project_long_term/i18n/pl.po
+++ b/addons/project_long_term/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/pt.po b/addons/project_long_term/i18n/pt.po
index 7aca4caa234..f63a962e8c9 100644
--- a/addons/project_long_term/i18n/pt.po
+++ b/addons/project_long_term/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/pt_BR.po b/addons/project_long_term/i18n/pt_BR.po
index 344a22a99e4..50e4e716fd9 100644
--- a/addons/project_long_term/i18n/pt_BR.po
+++ b/addons/project_long_term/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-20 19:35+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-10-17 00:36+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
@@ -42,7 +42,7 @@ msgstr "Agrupar Por..."
 #. module: project_long_term
 #: field:project.phase,user_ids:0
 msgid "Assigned Users"
-msgstr ""
+msgstr "Usuários não Associados"
 
 #. module: project_long_term
 #: field:project.phase,progress:0
@@ -57,12 +57,12 @@ msgstr "Erro! A data inicial do projeto precisa ser menor que a data final."
 #. module: project_long_term
 #: view:project.phase:0
 msgid "In Progress Phases"
-msgstr ""
+msgstr "Fases em Progresso"
 
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Displaying Settings"
-msgstr ""
+msgstr "Exibindo Configurações"
 
 #. module: project_long_term
 #: field:project.compute.phases,target_project:0
@@ -88,7 +88,7 @@ msgstr "Dia"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_user_allocation
 msgid "Phase User Allocation"
-msgstr ""
+msgstr "Alocação de Usuário nas Fases"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_task
@@ -105,6 +105,12 @@ msgid ""
 "users, convert your phases into a series of tasks when you start working on "
 "the project."
 msgstr ""
+"Um projeto pode ser dividido em diferentes fases. Para cada fase, você pode "
+"definir a alocação de usuários, descrever diferentes tarefas e associar cada "
+"fase a uma fase anterior ou posterior, adicionar restrições de data para o "
+"agendamento automático. Use o planejamento a longo prazo para detalhar seus "
+"usuários disponíveis, converter suas fases em uma série de tarefas quando "
+"você começar a trabalhar no projeto."
 
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
@@ -128,7 +134,7 @@ msgstr "UdM (Unidade de Medida) é a unidade de medida para Duração"
 #: view:project.phase:0
 #: view:project.user.allocation:0
 msgid "Planning of Users"
-msgstr ""
+msgstr "Planejamento de Usuários"
 
 #. module: project_long_term
 #: help:project.phase,date_end:0
@@ -173,7 +179,7 @@ msgstr "Prazo Final"
 #. module: project_long_term
 #: selection:project.compute.phases,target_project:0
 msgid "Compute All My Projects"
-msgstr ""
+msgstr "Calcular Todos os Meus Projetos"
 
 #. module: project_long_term
 #: view:project.compute.phases:0
@@ -190,7 +196,7 @@ msgstr " (cópia)"
 #. module: project_long_term
 #: view:project.user.allocation:0
 msgid "Project User Allocation"
-msgstr ""
+msgstr "Alocação de Usuários no Projeto"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -202,18 +208,18 @@ msgstr "Status"
 #: view:project.compute.phases:0
 #: view:project.compute.tasks:0
 msgid "C_ompute"
-msgstr ""
+msgstr "C_alcular"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: selection:project.phase,state:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: project_long_term
 #: help:project.phase,progress:0
 msgid "Computed based on related tasks"
-msgstr ""
+msgstr "Calculada com base em tarefas relacionadas"
 
 #. module: project_long_term
 #: field:project.phase,product_uom:0
@@ -234,7 +240,7 @@ msgstr "Recursos"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "My Projects"
-msgstr ""
+msgstr "Meus Projetos"
 
 #. module: project_long_term
 #: help:project.user.allocation,date_start:0
@@ -249,13 +255,13 @@ msgstr "Tarefas Relacionadas"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "New Phases"
-msgstr ""
+msgstr "Novas Fases"
 
 #. module: project_long_term
 #: code:addons/project_long_term/wizard/project_compute_phases.py:48
 #, python-format
 msgid "Please specify a project to schedule."
-msgstr ""
+msgstr "Por favor especifique um projeto para agendar"
 
 #. module: project_long_term
 #: help:project.phase,constraint_date_start:0
@@ -289,7 +295,7 @@ msgstr "Data de Início da Fase deve ser inferior a data final de fase."
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Start Month"
-msgstr ""
+msgstr "Mês de Início"
 
 #. module: project_long_term
 #: field:project.phase,date_start:0
@@ -307,6 +313,8 @@ msgstr "forçar a fase para terminar antes dessa data"
 msgid ""
 "The ressources on the project can be computed automatically by the scheduler"
 msgstr ""
+"Os recursos neste projeto podem ser calculados automaticamente pelo "
+"agendador."
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -316,7 +324,7 @@ msgstr "Provisório"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Pending Phases"
-msgstr ""
+msgstr "Fases Pendentes"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -333,7 +341,7 @@ msgstr "Usuário"
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_tasks
 msgid "Project Compute Tasks"
-msgstr ""
+msgstr "Tarefas do Projeto Calculadas"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -343,7 +351,7 @@ msgstr "Restrições"
 #. module: project_long_term
 #: help:project.phase,sequence:0
 msgid "Gives the sequence order when displaying a list of phases."
-msgstr ""
+msgstr "Dá a ordem da seqüência ao exibir uma lista de fases."
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phase
@@ -380,7 +388,7 @@ msgstr "Horas Restantes"
 #. module: project_long_term
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Erro ! A data final deve ser maior do que a data inicial"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
@@ -392,7 +400,7 @@ msgstr "Tempo Trabalhado"
 #: model:ir.ui.menu,name:project_long_term.menu_compute_phase
 #: view:project.compute.phases:0
 msgid "Schedule Phases"
-msgstr ""
+msgstr "Planejar Fases"
 
 #. module: project_long_term
 #: view:project.phase:0
@@ -407,7 +415,7 @@ msgstr "Horas Totais"
 #. module: project_long_term
 #: view:project.user.allocation:0
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: project_long_term
 #: view:project.user.allocation:0
@@ -423,6 +431,10 @@ msgid ""
 "          \n"
 " If the phase is over, the states is set to 'Done'."
 msgstr ""
+"Se a fase for criada com a situação 'Provisória'.\n"
+" Se a fase for iniciada, a situação muda para 'Em Progresso'.\n"
+" Se for necessário uma revisão a fase ficará em 'Pendente'.\n"
+" Se a fase for concluída, a situação é alterada para 'Concluída'."
 
 #. module: project_long_term
 #: field:project.phase,date_end:0
@@ -448,7 +460,7 @@ msgstr "Duração"
 #. module: project_long_term
 #: view:project.phase:0
 msgid "Project Users"
-msgstr ""
+msgstr "Usuários do Projeto"
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_phase
@@ -466,16 +478,19 @@ msgid ""
 "view.\n"
 "               "
 msgstr ""
+"Para agendar fases de todos ou de um projeto específico. Então abrirá a "
+"visão em gantt.\n"
+"               "
 
 #. module: project_long_term
 #: model:ir.model,name:project_long_term.model_project_compute_phases
 msgid "Project Compute Phases"
-msgstr ""
+msgstr "Fases Calculadas do Projeto"
 
 #. module: project_long_term
 #: constraint:project.phase:0
 msgid "Loops in phases not allowed"
-msgstr ""
+msgstr "Loops em fases não é permitido"
 
 #. module: project_long_term
 #: field:project.phase,sequence:0
@@ -485,25 +500,25 @@ msgstr "Sequência"
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar_leaves
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Ausências de Recurso"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.action_project_compute_tasks
 #: model:ir.ui.menu,name:project_long_term.menu_compute_tasks
 #: view:project.compute.tasks:0
 msgid "Schedule Tasks"
-msgstr ""
+msgstr "Agenda de Tarefas"
 
 #. module: project_long_term
 #: help:project.phase,duration:0
 msgid "By default in days"
-msgstr ""
+msgstr "Por padrão em dias"
 
 #. module: project_long_term
 #: view:project.phase:0
 #: field:project.phase,user_force_ids:0
 msgid "Force Assigned Users"
-msgstr ""
+msgstr "Forçar Usuários Atribuídos"
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_phase_schedule
@@ -599,3 +614,6 @@ msgstr "Agendamento"
 
 #~ msgid "Message"
 #~ msgstr "Mensagem"
+
+#~ msgid "Displaying settings"
+#~ msgstr "Mostrando configurações"
diff --git a/addons/project_long_term/i18n/ro.po b/addons/project_long_term/i18n/ro.po
index cc92d00cbc6..e297bec57c8 100644
--- a/addons/project_long_term/i18n/ro.po
+++ b/addons/project_long_term/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/sv.po b/addons/project_long_term/i18n/sv.po
index 04a335c2a9a..2c843f44110 100644
--- a/addons/project_long_term/i18n/sv.po
+++ b/addons/project_long_term/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/tr.po b/addons/project_long_term/i18n/tr.po
index 3b286bfe63d..904c67b3674 100644
--- a/addons/project_long_term/i18n/tr.po
+++ b/addons/project_long_term/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/i18n/zh_CN.po b/addons/project_long_term/i18n/zh_CN.po
index 7f1c5ddf0d0..53e1364a57c 100644
--- a/addons/project_long_term/i18n/zh_CN.po
+++ b/addons/project_long_term/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_long_term
 #: model:ir.actions.act_window,name:project_long_term.act_project_phases
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index d5ac3868a5e..db6c532d503 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -116,8 +116,8 @@ class project_phase(osv.osv):
         'user_ids': fields.one2many('project.user.allocation', 'phase_id', "Assigned Users",states={'done':[('readonly',True)], 'cancelled':[('readonly',True)]},
             help="The resources on the project can be computed automatically by the scheduler."),
         'state': fields.selection([('draft', 'New'), ('cancelled', 'Cancelled'),('open', 'In Progress'), ('pending', 'Pending'), ('done', 'Done')], 'Status', 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\'.'),
+                                  help='If the phase is created the status \'Draft\'.\n If the phase is started, the status becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' status.\
+                                  \n If the phase is over, the status is set to \'Done\'.'),
         'progress': fields.function(_compute_progress, string='Progress', help="Computed based on related tasks"),
      }
     _defaults = {
@@ -138,7 +138,7 @@ class project_phase(osv.osv):
         if default is None:
             default = {}
         if not default.get('name', False):
-            default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)')
+            default.update(name=_('%s (copy)') % (self.browse(cr, uid, id, context=context).name))
         return super(project_phase, self).copy(cr, uid, id, default, context)
 
     def set_draft(self, cr, uid, ids, *args):
@@ -227,7 +227,7 @@ class project(osv.osv):
         'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"),
         'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"),
     }
-    
+
     def schedule_phases(self, cr, uid, ids, context=None):
         context = context or {}
         if type(ids) in (long, int,):
@@ -250,7 +250,7 @@ class project(osv.osv):
                 # Maybe it's better to update than unlink/create if it already exists ?
                 p = getattr(project_gantt, 'Phase_%d' % (phase.id,))
 
-                self.pool.get('project.user.allocation').unlink(cr, uid, 
+                self.pool.get('project.user.allocation').unlink(cr, uid,
                     [x.id for x in phase.user_ids],
                     context=context
                 )
@@ -273,9 +273,9 @@ class account_analytic_account(osv.osv):
     _inherit = 'account.analytic.account'
     _description = 'Analytic Account'
     _columns = {
-        'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"),
+        'use_phases': fields.boolean('Phases', help="Check this field if you plan to use phase-based scheduling"),
     }
-    
+
     def on_change_template(self, cr, uid, ids, template_id, context=None):
         res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context)
         if template_id and 'value' in res:
@@ -292,7 +292,7 @@ account_analytic_account()
 class project_task(osv.osv):
     _inherit = "project.task"
     _columns = {
-        'phase_id': fields.many2one('project.phase', 'Project Phase'),
+        'phase_id': fields.many2one('project.phase', 'Project Phase', domain="[('project_id', '=', project_id)]"),
     }
 project_task()
 
diff --git a/addons/project_long_term/project_long_term_demo.xml b/addons/project_long_term/project_long_term_demo.xml
index bca8231fdaa..fda481d5a11 100644
--- a/addons/project_long_term/project_long_term_demo.xml
+++ b/addons/project_long_term/project_long_term_demo.xml
@@ -7,6 +7,7 @@
 
         <record id="project.project_project_1" model="project.project">
             <field name="resource_calendar_id" ref="resource.timesheet_group1"/>
+            <field name="use_phases" eval="True"/>
         </record>
 
         <!-- Project Phases -->
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index b4b98e8fe4a..18e471ddd40 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -83,24 +83,28 @@
 
 
         <!-- Project Phase -->
-        <act_window id="act_project_phases"
-            name="Phases"
-            src_model="project.project"
-            res_model="project.phase"
-            view_type="form"
-            view_mode="tree,form"
-            context="{'search_default_project_id': [active_id], 'default_project_id': active_id}"/>
+
+        <record id="act_project_phases" model="ir.actions.act_window">
+            <field name="res_model">project.phase</field>
+            <field name="view_type">form</field>
+            <field name="name">Phases</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_project_id': [active_id], 'default_project_id': active_id}</field>
+        </record>
 
         <record id="project_phase_form" model="ir.ui.view">
             <field name="name">Inherit project form : Phase</field>
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <xpath expr='//tr[@name="use_tasks_row"]' position='after'>
-                    <tr>
-                        <td><group><field name="use_phases"/></group></td>
-                        <td><button icon="terp-gtk-go-back-rtl" name="%(act_project_phases)d" string="Phases" type="action" attrs="{'invisible':[('use_phases','=', 0)]}"/></td>
-                    </tr>
+                <xpath expr="//div[@name='options_active']" position='inside'>
+                       <field name="use_phases" class="oe_inline"/>
+                       <label for="use_phases"/>
+                </xpath>
+                <xpath expr="//div[@name='buttons']" position='inside'>
+                        <button name="%(act_project_phases)d"
+                                string="Phases" type="action"
+                                attrs="{'invisible':[('use_phases','=', 0)]}"/>
                 </xpath>
             </field>
         </record>
@@ -116,10 +120,21 @@
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
                     <a t-if="record.use_phases.raw_value"
-                        name="%(act_project_phases)d" type="action">Phases(<field name="phase_count"/>)</a>
+                        name="%(act_project_phases)d" type="action">
+                        <span t-if="record.phase_count.raw_value gt 1"><field name="phase_count"/> Phases</span>
+                        <span t-if="record.phase_count.raw_value lt 2"><field name="phase_count"/> Phase</span>
+                    </a>
                 </xpath>
             </field>
         </record>
+        
+        <record id="project_phase_task_list" model="ir.actions.act_window">
+            <field name="res_model">project.task</field>
+            <field name="view_type">form</field>
+            <field name="name">Tasks</field>
+            <field name="view_mode">tree,form</field>
+            <field name="context">{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}</field>
+        </record>
 
         <record id="view_project_phase_form" model="ir.ui.view">
             <field name="name">project.phase.form</field>
@@ -135,6 +150,7 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </header>
                 <sheet>
+                    <button name="%(project_phase_task_list)d" string="Related Tasks" type="action" class="oe_right"/>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name"/></h1>
@@ -333,25 +349,15 @@
             </field>
         </record>
 
-        <act_window
-            context="{'search_default_phase_id': [active_id], 'default_phase_id' : active_id}"
-            id="project_phase_task_list"
-            name="Related Tasks"
-            res_model="project.task"
-            src_model="project.phase"
-            view_mode="tree,form"/>
-
         <record id="analytic_account_inherited_phase_form" model="ir.ui.view">
             <field name="name">account.analytic.account.phase.form.inherit</field>
             <field name="model">account.analytic.account</field>
             <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
             <field eval="18" name="priority"/>
             <field name="arch" type="xml">
-                <xpath expr='//separator[@name="project_sep"]' position='replace'>
-                    <separator name="project_sep" string="Project Management" colspan="4"/> <!-- removal of invisible attribute -->
-                </xpath>
-                <xpath expr='//separator[@name="project_sep"]' position='after'>
+                <xpath expr='//div[@name="project"]' position='inside'>
                     <field name="use_phases"/>
+                    <label for="use_phases"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py
deleted file mode 100644
index 656a091d4e8..00000000000
--- a/addons/project_mailgate/__openerp__.py
+++ /dev/null
@@ -1,54 +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/>.
-#
-##############################################################################
-
-
-{
-    "name": "Tasks-Mail Integration",
-    "version": "1.1",
-    "author": "OpenERP SA",
-    "website": "http://www.openerp.com",
-    "category": "Project Management",
-    "images": ["images/project_mailgate_task.jpeg"],
-    "depends": ["project", "mail"],
-    "description": """
-This module can automatically create Project Tasks based on incoming emails.
-============================================================================
-
-Allows creating tasks based on new emails arriving at a given mailbox,
-similarly to what the CRM application has for Leads/Opportunities.
-
-There are two common alternatives to configure the mailbox integration:
-    * Install the ``fetchmail`` module and configure a new mailbox, then select
-      ``Project Tasks`` as the target for incoming emails.
-    * Set it up manually on your mail server based on the 'mail gateway' script
-      provided in the ``mail`` module - and connect it to the `project.task` model.
-    """,
-    "init_xml": [],
-    "update_xml": [
-    ],
-    'demo_xml': [
-    ],
-    'installable': True,
-    'auto_install': False,
-    'certificate': '001075048780413258261',
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mailgate/i18n/ar.po b/addons/project_mailgate/i18n/ar.po
deleted file mode 100644
index eec678816a3..00000000000
--- a/addons/project_mailgate/i18n/ar.po
+++ /dev/null
@@ -1,102 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-12 21:12+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "معلومات المحفوظات"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "مهمة"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "خطأ ! لا يمكنك انشاء مهام رجعية."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "الرسائل"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "مسودة"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "خطأ! يجب ان يكون تاريخ انتهاء المهمة اكبر من تاريخ البداية"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "إلغاء"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "تم"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "فتح"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "معلّق"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "محفوظات"
-
-#~ msgid "Attachments"
-#~ msgstr "مرفقات"
-
-#~ msgid "Details"
-#~ msgstr "تفاصيل"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "مدخل بريد المشروع"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "هذه الوحدة هي تفاعل التي تتزامن البريد مع مهام مشروع OpenERP .\n"
-#~ "وهي تسمح بإنشاء المهام في اقرب وقت كما يصل البريد الجديد في خادم البريد الذي "
-#~ "تم ضبطه.\n"
-#~ "علاوة على ذلك, تستمر في تعقب المزيد من كل الاتصالات وحالات المهمة.\n"
-#~ "    "
diff --git a/addons/project_mailgate/i18n/ca.po b/addons/project_mailgate/i18n/ca.po
deleted file mode 100644
index 790de65815b..00000000000
--- a/addons/project_mailgate/i18n/ca.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-02-06 21:57+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan <ca@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informació històrica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tasca"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Error! No podeu crear tasques recursives."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Missatges"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Esborrany"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Error ! La data final de la tasca ha de ser major que la data d'inici"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Canceŀla"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Realitzat"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Obre"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendent"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Històric"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ruta d'enllaç del projecte"
-
-#~ msgid "Attachments"
-#~ msgstr "Adjunts"
-
-#~ msgid "Details"
-#~ msgstr "Detalls"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Aquest mòdul proporciona una interfície per sincronitzar correus amb les "
-#~ "tasques de projectes d'OpenERP.\n"
-#~ "\n"
-#~ "Permet crear tasques tan aviat com arriba un nou correu en el nostre "
-#~ "servidor de correu prèviament configurat.\n"
-#~ "A més realitza un seguiment de totes les comunicacions addicionals i estats "
-#~ "de la tasca.\n"
-#~ "    "
diff --git a/addons/project_mailgate/i18n/cs.po b/addons/project_mailgate/i18n/cs.po
deleted file mode 100644
index 23417dc0330..00000000000
--- a/addons/project_mailgate/i18n/cs.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Czech translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-04-06 06:41+0000\n"
-"Last-Translator: Jiří Hajda <robie@centrum.cz>\n"
-"Language-Team: Czech <cs@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informace historie"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Úkol"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Chyba ! Nemůžete vytvořit rekurzivní úkoly."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Zprávy"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Koncept"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Chyba ! Datum ukončení úkolu musí být větší než počáteční datum"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Zrušit"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Dokončené"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Otevřené"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Čekající"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historie"
diff --git a/addons/project_mailgate/i18n/da.po b/addons/project_mailgate/i18n/da.po
deleted file mode 100644
index cceaf824221..00000000000
--- a/addons/project_mailgate/i18n/da.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-27 06:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr ""
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr ""
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr ""
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr ""
diff --git a/addons/project_mailgate/i18n/de.po b/addons/project_mailgate/i18n/de.po
deleted file mode 100644
index 18518c8faa6..00000000000
--- a/addons/project_mailgate/i18n/de.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# German 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-31 10:37+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Information Historie"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Aufgabe"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Nachrichten"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Entwurf"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Fehler! Aufgaben End-Datum muss größer als Aufgaben-Beginn sein"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Erledigt"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Offen"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Im Wartezustand"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historie"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projekte Mailgateway"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Dieses Modul ermöglicht die Synchronisation von Email mit openERP "
-#~ "Projektaufgaben.\n"
-#~ "\n"
-#~ "Es ermöglicht die Erstellung einer neuen Aufgabe sobald eine neue EMail von "
-#~ "Ihrem Mailserver empfangen wird.\n"
-#~ "Ausserdem können Sie dann alle weitere Korrespondenz und Kommunikation "
-#~ "rückverfolgen sowie den Status der Aufgabe überwachen.\n"
-#~ "    "
-
-#~ msgid "Details"
-#~ msgstr "Details"
-
-#~ msgid "Attachments"
-#~ msgstr "Anhänge"
diff --git a/addons/project_mailgate/i18n/es.po b/addons/project_mailgate/i18n/es.po
deleted file mode 100644
index a3c4717a3b9..00000000000
--- a/addons/project_mailgate/i18n/es.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-28 08:35+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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ruta de enlace del proyecto"
-
-#~ msgid "Details"
-#~ msgstr "Detalles"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo proporciona una interfaz para sincronizar correos con las tareas "
-#~ "de proyectos de OpenERP.\n"
-#~ "Permite crear tareas tan pronto como llega un nuevo correo en nuestro "
-#~ "servidor de correo previamente configurado.\n"
-#~ "Además realiza un seguimiento de todas las comunicaciones adicionales y "
-#~ "estados de la tarea.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Adjuntos"
diff --git a/addons/project_mailgate/i18n/es_CR.po b/addons/project_mailgate/i18n/es_CR.po
deleted file mode 100644
index 23cffe03abf..00000000000
--- a/addons/project_mailgate/i18n/es_CR.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-17 00:30+0000\n"
-"Last-Translator: Carlos Vásquez (CLEARCORP) "
-"<carlos.vasquez@clearcorp.co.cr>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"Language: es\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"¡ Error ! La fecha final de la tarea debe ser mayor que la fecha de inicio"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ruta de enlace del proyecto"
-
-#~ msgid "Details"
-#~ msgstr "Detalles"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo proporciona una interfaz para sincronizar correos con las tareas "
-#~ "de proyectos de OpenERP.\n"
-#~ "Permite crear tareas tan pronto como llega un nuevo correo en nuestro "
-#~ "servidor de correo previamente configurado.\n"
-#~ "Además realiza un seguimiento de todas las comunicaciones adicionales y "
-#~ "estados de la tarea.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Adjuntos"
diff --git a/addons/project_mailgate/i18n/es_MX.po b/addons/project_mailgate/i18n/es_MX.po
deleted file mode 100644
index 2736d2572ac..00000000000
--- a/addons/project_mailgate/i18n/es_MX.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-28 08:35+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: 2011-09-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_mailgate
-#: model:ir.module.module,description:project_mailgate.module_meta_information
-msgid ""
-"This module is an interface that synchronises mails with OpenERP Project "
-"Task.\n"
-"\n"
-"It allows creating tasks as soon as a new mail arrives in our configured "
-"mail server.\n"
-"Moreover, it keeps track of all further communications and task states.\n"
-"    "
-msgstr ""
-"Este módulo proporciona una interfaz para sincronizar correos con las tareas "
-"de proyectos de OpenERP.\n"
-"Permite crear tareas tan pronto como llega un nuevo correo en nuestro "
-"servidor de correo previamente configurado.\n"
-"Además realiza un seguimiento de todas las comunicaciones adicionales y "
-"estados de la tarea.\n"
-"    "
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "Attachments"
-msgstr "Adjuntos"
-
-#. module: project_mailgate
-#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
-msgid "Project MailGateWay"
-msgstr "Ruta de enlace del proyecto"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:123
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "Details"
-msgstr "Detalles"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:149
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:143
-#, python-format
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:129
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:135
-#, python-format
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
diff --git a/addons/project_mailgate/i18n/es_VE.po b/addons/project_mailgate/i18n/es_VE.po
deleted file mode 100644
index 2736d2572ac..00000000000
--- a/addons/project_mailgate/i18n/es_VE.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-28 08:35+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: 2011-09-05 05:56+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_mailgate
-#: model:ir.module.module,description:project_mailgate.module_meta_information
-msgid ""
-"This module is an interface that synchronises mails with OpenERP Project "
-"Task.\n"
-"\n"
-"It allows creating tasks as soon as a new mail arrives in our configured "
-"mail server.\n"
-"Moreover, it keeps track of all further communications and task states.\n"
-"    "
-msgstr ""
-"Este módulo proporciona una interfaz para sincronizar correos con las tareas "
-"de proyectos de OpenERP.\n"
-"Permite crear tareas tan pronto como llega un nuevo correo en nuestro "
-"servidor de correo previamente configurado.\n"
-"Además realiza un seguimiento de todas las comunicaciones adicionales y "
-"estados de la tarea.\n"
-"    "
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "Attachments"
-msgstr "Adjuntos"
-
-#. module: project_mailgate
-#: model:ir.module.module,shortdesc:project_mailgate.module_meta_information
-msgid "Project MailGateWay"
-msgstr "Ruta de enlace del proyecto"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No puede crear tareas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensajes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:123
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "Details"
-msgstr "Detalles"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:149
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:143
-#, python-format
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:129
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:135
-#, python-format
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
diff --git a/addons/project_mailgate/i18n/fi.po b/addons/project_mailgate/i18n/fi.po
deleted file mode 100644
index 1433a51d448..00000000000
--- a/addons/project_mailgate/i18n/fi.po
+++ /dev/null
@@ -1,88 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-06-22 10:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historiatiedot"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tehtävä"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Virhe ! Et voi luoda rekursiivisiä tehtäviä."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Viestit"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Luonnos"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Virhe! Tehtävän lopetuspäivän tulee olla myöhäisempi kuin aloituspäivä"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Peruuta"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Valmis"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Auki"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Odottava"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historia"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projektin sähköpostivälittäjä"
-
-#~ msgid "Attachments"
-#~ msgstr "Liitteet"
-
-#~ msgid "Details"
-#~ msgstr "Yksityiskohdat"
diff --git a/addons/project_mailgate/i18n/fr.po b/addons/project_mailgate/i18n/fr.po
deleted file mode 100644
index 3f3839a46c4..00000000000
--- a/addons/project_mailgate/i18n/fr.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-13 23:14+0000\n"
-"Last-Translator: lholivier <olivier.lenoir@free.fr>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historique"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tâche"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erreur ! Vous ne pouvez pas créer de tâches récursives."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Messages"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Brouillon"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Erreur ! La date de fin de la tâche doit être postérieure à la date de "
-"démarrage"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Terminé"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Ouvert"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "En attente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historique"
-
-#~ msgid "Attachments"
-#~ msgstr "Pièces jointes"
-
-#~ msgid "Details"
-#~ msgstr "Détails"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Messagerie de Projet"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ce module est un interface de synchronisation des emails avec la gestion de "
-#~ "projet d'OpenERP.\n"
-#~ "\n"
-#~ "Il permet la création de tâches sur l'arrivée de nouveaux emails dans le "
-#~ "serveur de messagerie configuré.\n"
-#~ "De plus, il conserve les échanges ultérieurs et l'état des tâches.\n"
-#~ "    "
diff --git a/addons/project_mailgate/i18n/gl.po b/addons/project_mailgate/i18n/gl.po
deleted file mode 100644
index 321e40cac17..00000000000
--- a/addons/project_mailgate/i18n/gl.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-05-10 08:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Galician <gl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Información histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarefa"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro! Non pode crear tarefas recorrentes."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensaxes"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Erro! A data de remate da tarefa debe ser posterior á data de inicio da "
-"tarefa"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Anular"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Feito"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historial"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ruta de enlace do proxecto"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo proporciona unha interface para sincronizar correos coas tarefas "
-#~ "de proxectos de OpenERP. Permite crear tarefas tan pronto como chegue un "
-#~ "novo correo no noso servidor de correo previamente configurado. Ademais "
-#~ "realiza un seguimento de tódalas comunicacións adicionais e dos estados da "
-#~ "tarefa.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Anexos"
-
-#~ msgid "Details"
-#~ msgstr "Detalles"
diff --git a/addons/project_mailgate/i18n/hr.po b/addons/project_mailgate/i18n/hr.po
deleted file mode 100644
index 570434b246e..00000000000
--- a/addons/project_mailgate/i18n/hr.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-12-12 08:56+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
-"Language-Team: Croatian <hr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informacije o povjesti"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Zadatak"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Poruke"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Nacrt"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Odustani"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Izvršeno"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Otvoreno"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Na čekanju"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Povijest"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "MailGateWay projekta"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ovaj modul je sučelje za sinhronizaciju poruka sa OpenERP projektnim "
-#~ "zadacima.\n"
-#~ "\n"
-#~ "Omogućava kreiranje zadataka čim stigne novi e-mail na naš konfigurirani "
-#~ "mail poslužitelj.\n"
-#~ "Štoviše, čuva zapise o svim kasnijim komunikacijama i statusima zadataka.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Privici"
-
-#~ msgid "Details"
-#~ msgstr "Pojedinosti"
diff --git a/addons/project_mailgate/i18n/hu.po b/addons/project_mailgate/i18n/hu.po
deleted file mode 100644
index 03232bb1a07..00000000000
--- a/addons/project_mailgate/i18n/hu.po
+++ /dev/null
@@ -1,84 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * project_mailgate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-25 13:21+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Előzmény"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Feladat"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Hiba! Nem hozhat létre rekurzív feladatokat."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Üzenetek"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Tervezet"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Mégsem"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Kész"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Nyitott"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Függőben lévő"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Előzmény"
-
-#~ msgid "Attachments"
-#~ msgstr "Mellékletek"
-
-#~ msgid "Details"
-#~ msgstr "Részletek"
diff --git a/addons/project_mailgate/i18n/it.po b/addons/project_mailgate/i18n/it.po
deleted file mode 100644
index a690d26ccea..00000000000
--- a/addons/project_mailgate/i18n/it.po
+++ /dev/null
@@ -1,106 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-04-22 09:54+0000\n"
-"Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Storico informazioni"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Attività"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Errore ! Non è possibile creare attività ricorsive."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Messaggi"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Bozza"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Errore ! La data finale della mansione deve essere  più vecchia di quella "
-"iniziale"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Annulla"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Completato"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Apri"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "In sospeso"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Storico"
-
-#~ msgid "Attachments"
-#~ msgstr "Allegati"
-
-#~ msgid "Details"
-#~ msgstr "Dettagli"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Questo modulo è una infertaccia che sincronizza mail con le attività di "
-#~ "progetto di OpenERP.\n"
-#~ "\n"
-#~ "Esso permette di creare attività non appena una nuova mail arriva nel mail "
-#~ "server configurato.\n"
-#~ "Inoltre, tiene traccia di tutte le comunicazioni e lo stato delle attività.\n"
-#~ "    "
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Ingresso Mail di Progetto"
diff --git a/addons/project_mailgate/i18n/ja.po b/addons/project_mailgate/i18n/ja.po
deleted file mode 100644
index 99aee84157e..00000000000
--- a/addons/project_mailgate/i18n/ja.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-10 03:13+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "履歴情報"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "タスク"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "エラー。再帰的なタスクを作成することはできません。"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "メッセージ"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "ドラフト"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "エラー。タスクの終了日は開始日以降の日付に設定しなければなりません。"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "キャンセル"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "完了"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "開く"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "保留中"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "履歴"
diff --git a/addons/project_mailgate/i18n/lv.po b/addons/project_mailgate/i18n/lv.po
deleted file mode 100644
index d4ad512adb8..00000000000
--- a/addons/project_mailgate/i18n/lv.po
+++ /dev/null
@@ -1,87 +0,0 @@
-# Latvian 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-31 10:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Latvian <lv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Vēstures informācija"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Uzdevums"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Kļūda! Nedrīkst veidot rekursīvus uzdevumus."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Ziņojumi"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Melnraksts"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Atcelt"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Pabeigts"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Atvērt"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Neizlemts"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Vēsture"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projekta MailGateWay"
-
-#~ msgid "Attachments"
-#~ msgstr "Piesaistnes"
-
-#~ msgid "Details"
-#~ msgstr "Sīkāka informācija"
diff --git a/addons/project_mailgate/i18n/mn.po b/addons/project_mailgate/i18n/mn.po
deleted file mode 100644
index 999da7fd06c..00000000000
--- a/addons/project_mailgate/i18n/mn.po
+++ /dev/null
@@ -1,85 +0,0 @@
-# Mongolian 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-21 13:53+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Түүх"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Ажил"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Алдаа ! Та рекурсив цэс үүсгэж болохгүй!"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Мессежүүд"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Ноорог"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Алдаа ! Даалгаврын дуусах хугацаа нь эхлэх хугацаанаасаа хойно байх ёстой"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Болих"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Хийсэн"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Нээх"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Хүлээгдэж буй"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Түүх"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "MailGateWay Төсөл"
-
-#~ msgid "Details"
-#~ msgstr "Нарийвчлал"
diff --git a/addons/project_mailgate/i18n/nl.po b/addons/project_mailgate/i18n/nl.po
deleted file mode 100644
index 61d3f593979..00000000000
--- a/addons/project_mailgate/i18n/nl.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-18 20:55+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historie informatie"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Taak"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Fout! U kunt geen recursieve taken aanmaken."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Berichten"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Concept"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Fout! Einddatum taak moet groter zijn dat begindatum taak"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Gereed"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Open"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Wachtend"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Geschiedenis"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Deze module is een interface dat mail synchroniseert met OpenERP Project "
-#~ "taak.\n"
-#~ "\n"
-#~ "Het maakt nieuwe taken aan zodra mail binnenkomt op de ingestelde "
-#~ "mailserver.\n"
-#~ "Daarbij houdt het alle verdere communicaties en taak statussen bij.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Bijlagen"
-
-#~ msgid "Details"
-#~ msgstr "Details"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Project MailGateWay"
diff --git a/addons/project_mailgate/i18n/nl_BE.po b/addons/project_mailgate/i18n/nl_BE.po
deleted file mode 100644
index 5e6f599f236..00000000000
--- a/addons/project_mailgate/i18n/nl_BE.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# Dutch (Belgium) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-03-01 15:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historiekinformatie"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Taak"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "U kunt niet dezelfde taken maken."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Berichten"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Voorlopig"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Let op: de einddatum van de taak moet na de begindatum van de taak liggen"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Gereed"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Open"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Wachtend"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historiek"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Deze module is een interface waarmee mails met OpenERP-projecttaken worden "
-#~ "gesynchroniseerd.\n"
-#~ "\n"
-#~ "Hiermee worden taken gemaakt zodra een nieuwe mail binnenkomt via de "
-#~ "ingestelde mailserver.\n"
-#~ "Bovendien worden alle communicatie en taakstatussen bijgehouden.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Bijlagen"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projectmailgateway"
-
-#~ msgid "Details"
-#~ msgstr "Details"
diff --git a/addons/project_mailgate/i18n/pl.po b/addons/project_mailgate/i18n/pl.po
deleted file mode 100644
index d7a2d878eac..00000000000
--- a/addons/project_mailgate/i18n/pl.po
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-11-28 12:29+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informacja o historii"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Zadanie"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Wiadomosći"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Projekt"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Anuluj"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Wykonano"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Otwórz"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Oczekujące"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historia"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "MailGateWay dla projektu"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Ten moduł jest interfejsem do synchronizacji poczty z zadaniami w projektach "
-#~ "OpenERP.\n"
-#~ "\n"
-#~ "Pozwala tworzyć projekty po otrzymaniu wiadomości przez odpowiednio "
-#~ "skonfigurowany\n"
-#~ "server pocztowy. Co więcej, utrzymuje on w jednym miejscu dalszą komunikację "
-#~ "i stany zadań.\n"
-#~ "    "
-
-#~ msgid "Details"
-#~ msgstr "Szczegóły"
diff --git a/addons/project_mailgate/i18n/project_mailgate.pot b/addons/project_mailgate/i18n/project_mailgate.pot
deleted file mode 100644
index acb1e4e981c..00000000000
--- a/addons/project_mailgate/i18n/project_mailgate.pot
+++ /dev/null
@@ -1,77 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_mailgate
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-08 00:37+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr ""
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr ""
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr ""
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr ""
-
diff --git a/addons/project_mailgate/i18n/pt.po b/addons/project_mailgate/i18n/pt.po
deleted file mode 100644
index bbc23852001..00000000000
--- a/addons/project_mailgate/i18n/pt.po
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-12 10:12+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informação do Histórico"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarefa"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro ! Não se pode criar tarefas recursivas"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensagens"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Rascunho"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Erro !Data final da tarefa dever ser posterior à data inicial"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Concluído"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Histórico"
-
-#~ msgid "Details"
-#~ msgstr "Detalhes"
-
-#~ msgid "Attachments"
-#~ msgstr "Anexos"
diff --git a/addons/project_mailgate/i18n/pt_BR.po b/addons/project_mailgate/i18n/pt_BR.po
deleted file mode 100644
index 0430c61420e..00000000000
--- a/addons/project_mailgate/i18n/pt_BR.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-17 11:53+0000\n"
-"Last-Translator: Emerson <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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Informação Histórica"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Tarefa"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro! Você não pode criar tarefas recursivas."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mensagens"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Provisório"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Concluído"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Histórico"
-
-#~ msgid "Details"
-#~ msgstr "Detalhes"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Este módulo é uma interface que sincroniza emails com as Tarefas de Projetos "
-#~ "OpenERP.\n"
-#~ "\n"
-#~ "Permite a criação de tarefas tão logo um novo email chegue no nosso servidor "
-#~ "de email configurado.\n"
-#~ "Além disso, mantém o controle de todas as demais comunicações e estados das "
-#~ "tarefas.\n"
-#~ "    "
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Projeto Gateway de Email"
-
-#~ msgid "Attachments"
-#~ msgstr "Anexos"
diff --git a/addons/project_mailgate/i18n/ro.po b/addons/project_mailgate/i18n/ro.po
deleted file mode 100644
index c5d715f3fe5..00000000000
--- a/addons/project_mailgate/i18n/ro.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-13 11:48+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Istoric Informatii"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Sarcina"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Eroare ! Nu puteti crea sarcini recursive."
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mesaje"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Ciorna"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-"Eroare ! Data de sfarsit a sarcinii trebuie sa fie mai mare decat data de "
-"inceput"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Anulati"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Efectuat"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Deschideti"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "In asteptare"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Istoric"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "MailGAteWay Proiect"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "Acest modul este o interfată care sincronizează email-urile cu Activitatea "
-#~ "de Proiect OpenERP.\n"
-#~ "\n"
-#~ "Permite crearea de sarcini de indată ce un nou email soseste in serverul de "
-#~ "mail configurat.\n"
-#~ "In plus, tine evidenta tuturor comunicatiilor viitoare si a stărilor "
-#~ "activitătilor.\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "Atașamente"
-
-#~ msgid "Details"
-#~ msgstr "Detalii"
diff --git a/addons/project_mailgate/i18n/sv.po b/addons/project_mailgate/i18n/sv.po
deleted file mode 100644
index 21d5c54d16b..00000000000
--- a/addons/project_mailgate/i18n/sv.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-18 23:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "Historikinformation"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Aktivitet"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Fel ! Du kan inte skapa rekursiva aktiviteter"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Meddelanden"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Preliminär"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Fel ! Aktivitetens slutdatum måste komma efter startdatumet"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "Avbryt"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Färdig"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Öppen"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Väntande"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "Historik"
diff --git a/addons/project_mailgate/i18n/tr.po b/addons/project_mailgate/i18n/tr.po
deleted file mode 100644
index 3d73a29ac80..00000000000
--- a/addons/project_mailgate/i18n/tr.po
+++ /dev/null
@@ -1,78 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-25 17:33+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr ""
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "Görev"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "Mesajlar"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "Taslak"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "İptal"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "Tamamlandı"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "Açık"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "Bekleyen"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr ""
diff --git a/addons/project_mailgate/i18n/zh_CN.po b/addons/project_mailgate/i18n/zh_CN.po
deleted file mode 100644
index 9e2c09990f2..00000000000
--- a/addons/project_mailgate/i18n/zh_CN.po
+++ /dev/null
@@ -1,101 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-06-28 16:25+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History Information"
-msgstr "日志信息"
-
-#. module: project_mailgate
-#: model:ir.model,name:project_mailgate.model_project_task
-msgid "Task"
-msgstr "任务"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "错误！不能创建循环引用的任务"
-
-#. module: project_mailgate
-#: field:project.task,message_ids:0
-msgid "Messages"
-msgstr "消息"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:90
-#, python-format
-msgid "Draft"
-msgstr "草稿"
-
-#. module: project_mailgate
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "错误！任务结束日期必须大于任务开始日期"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:116
-#, python-format
-msgid "Cancel"
-msgstr "取消"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:110
-#, python-format
-msgid "Done"
-msgstr "完成"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:96
-#, python-format
-msgid "Open"
-msgstr "未结"
-
-#. module: project_mailgate
-#: code:addons/project_mailgate/project_mailgate.py:102
-#, python-format
-msgid "Pending"
-msgstr "等待中"
-
-#. module: project_mailgate
-#: view:project.task:0
-msgid "History"
-msgstr "日志"
-
-#~ msgid "Project MailGateWay"
-#~ msgstr "Project MailGateWay"
-
-#~ msgid ""
-#~ "This module is an interface that synchronises mails with OpenERP Project "
-#~ "Task.\n"
-#~ "\n"
-#~ "It allows creating tasks as soon as a new mail arrives in our configured "
-#~ "mail server.\n"
-#~ "Moreover, it keeps track of all further communications and task states.\n"
-#~ "    "
-#~ msgstr ""
-#~ "此模块是邮件和任务的接口。\n"
-#~ "允许在特定邮件服务器收到邮件后马上创建任务。\n"
-#~ "还能跟踪进一步的沟通和任务阶段\n"
-#~ "    "
-
-#~ msgid "Attachments"
-#~ msgstr "附件"
-
-#~ msgid "Details"
-#~ msgstr "详细信息"
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
deleted file mode 100644
index ba3cd702760..00000000000
--- a/addons/project_mailgate/project_mailgate.py
+++ /dev/null
@@ -1,81 +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 binascii
-from osv import fields, osv
-from tools.translate import _
-import tools
-
-class project_tasks(osv.osv):
-    _inherit = 'project.task'
-
-    def message_new(self, cr, uid, msg, custom_values=None, context=None):
-        """ Overrides mail_thread message_new that is called by the mailgateway
-            through message_process.
-            This override updates the document according to the email.
-        """
-        if custom_values is None: custom_values = {}
-        custom_values.update({
-            'name': subject,
-            'planned_hours': 0.0,
-            'subject': msg.get('subject'),
-        })
-        custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from', False), context=context))
-        return super(project_tasks,self).message_new(cr, uid, msg, custom_values=custom_values, context=context)
-
-    def message_update(self, cr, uid, ids, msg, update_vals=None, context=None):
-        """ Overrides mail_thread message_update that is called by the mailgateway
-            through message_process.
-            This method updates the task according to the email.
-        """
-        if update_vals is None: update_vals = {}
-        act = False
-        maps = {
-            'cost':'planned_hours',
-        }
-        for line in msg['body_text'].split('\n'):
-            line = line.strip()
-            res = tools.misc.command_re.match(line)
-            if res:
-                match = res.group(1).lower()
-                field = maps.get(match)
-                if field:
-                    try:
-                        update_vals[field] = float(res.group(2).lower())
-                    except (ValueError, TypeError):
-                        pass
-                elif match.lower() == 'state' \
-                        and res.group(2).lower() in ['cancel','close','draft','open','pending']:
-                    act = 'do_%s' % res.group(2).lower()
-        if act:
-            getattr(self,act)(cr, uid, ids, context=context)
-        return super(project_tasks,self).message_update(cr, uid, msg, update_vals=update_vals, context=context)
-
-    def message_thread_followers(self, cr, uid, ids, context=None):
-        followers = super(project_tasks,self).message_thread_followers(cr, uid, ids, context=context)
-        for task in self.browse(cr, uid, followers.keys(), context=context):
-            task_followers = set(followers[task.id])
-            task_followers.add(task.user_id.email)
-            followers[task.id] = filter(None, task_followers)
-        return followers
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py
index 5c818a57e7a..91212b92c1d 100644
--- a/addons/project_mrp/__openerp__.py
+++ b/addons/project_mrp/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Create Tasks on SO',
     'version': '1.0',
-    "category": "Project Management",
+    'category': 'Project Management',
     'description': """
 Automatically creates project tasks from procurement lines.
 ===========================================================
@@ -50,12 +50,10 @@ task is completed.
     'website': 'http://www.openerp.com',
     'images': ['images/product.jpeg', 'images/task_from_SO.jpeg'],
     'depends': ['project', 'procurement', 'sale', 'mrp_jit'],
-    'init_xml': [],
-    'update_xml': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml', 'project_mrp_view.xml'],
-    'demo_xml': ['project_mrp_demo.xml'],
+    'data': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml', 'project_mrp_view.xml'],
+    'demo': ['project_mrp_demo.xml'],
     'test': ['test/project_task_procurement.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0031976495453',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/i18n/ar.po b/addons/project_mrp/i18n/ar.po
index dc0537a5152..2dca5cf8dc0 100644
--- a/addons/project_mrp/i18n/ar.po
+++ b/addons/project_mrp/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/bg.po b/addons/project_mrp/i18n/bg.po
index 1e8cd00aa42..97700ee6755 100644
--- a/addons/project_mrp/i18n/bg.po
+++ b/addons/project_mrp/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/bs.po b/addons/project_mrp/i18n/bs.po
index 767450788eb..c1a64ec62b6 100644
--- a/addons/project_mrp/i18n/bs.po
+++ b/addons/project_mrp/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/ca.po b/addons/project_mrp/i18n/ca.po
index 405482af0fc..8a81fe373fe 100644
--- a/addons/project_mrp/i18n/ca.po
+++ b/addons/project_mrp/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/cs.po b/addons/project_mrp/i18n/cs.po
index 597588e106b..8c4f07d20ba 100644
--- a/addons/project_mrp/i18n/cs.po
+++ b/addons/project_mrp/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/da.po b/addons/project_mrp/i18n/da.po
index 8c8061575cc..4ccf0724ca6 100644
--- a/addons/project_mrp/i18n/da.po
+++ b/addons/project_mrp/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/de.po b/addons/project_mrp/i18n/de.po
index 71e8c527f9f..34c0622bca5 100644
--- a/addons/project_mrp/i18n/de.po
+++ b/addons/project_mrp/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/el.po b/addons/project_mrp/i18n/el.po
index b55aae89db0..b36c18d791d 100644
--- a/addons/project_mrp/i18n/el.po
+++ b/addons/project_mrp/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/project_mrp/i18n/es.po b/addons/project_mrp/i18n/es.po
index e5786ab41e7..da597b09393 100644
--- a/addons/project_mrp/i18n/es.po
+++ b/addons/project_mrp/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-15 20:01+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/es_AR.po b/addons/project_mrp/i18n/es_AR.po
index ce5344cf8ea..74087876e0c 100644
--- a/addons/project_mrp/i18n/es_AR.po
+++ b/addons/project_mrp/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/es_CR.po b/addons/project_mrp/i18n/es_CR.po
index 1852b2ff4ed..acf53dde601 100644
--- a/addons/project_mrp/i18n/es_CR.po
+++ b/addons/project_mrp/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/es_EC.po b/addons/project_mrp/i18n/es_EC.po
index 4ec7d5450c8..5ed0e637cd1 100644
--- a/addons/project_mrp/i18n/es_EC.po
+++ b/addons/project_mrp/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/et.po b/addons/project_mrp/i18n/et.po
index 633d3a971a9..020da3ab87b 100644
--- a/addons/project_mrp/i18n/et.po
+++ b/addons/project_mrp/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/fi.po b/addons/project_mrp/i18n/fi.po
index c408a056a5f..ac18954040b 100644
--- a/addons/project_mrp/i18n/fi.po
+++ b/addons/project_mrp/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/fr.po b/addons/project_mrp/i18n/fr.po
index 0c2d32ec89d..c071b200545 100644
--- a/addons/project_mrp/i18n/fr.po
+++ b/addons/project_mrp/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/gl.po b/addons/project_mrp/i18n/gl.po
index daa8b92bc8d..4c42153d84d 100644
--- a/addons/project_mrp/i18n/gl.po
+++ b/addons/project_mrp/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/gu.po b/addons/project_mrp/i18n/gu.po
index d16d7e0851b..76894e3fc93 100644
--- a/addons/project_mrp/i18n/gu.po
+++ b/addons/project_mrp/i18n/gu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/hr.po b/addons/project_mrp/i18n/hr.po
index 09b1d047a62..3f2d766a680 100644
--- a/addons/project_mrp/i18n/hr.po
+++ b/addons/project_mrp/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/i18n/hu.po b/addons/project_mrp/i18n/hu.po
index 2232dca926d..6ced2cee347 100644
--- a/addons/project_mrp/i18n/hu.po
+++ b/addons/project_mrp/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/id.po b/addons/project_mrp/i18n/id.po
index 9866b23d458..6aa086d10bd 100644
--- a/addons/project_mrp/i18n/id.po
+++ b/addons/project_mrp/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/it.po b/addons/project_mrp/i18n/it.po
index 16bccd7c0d5..c13b38a6d1a 100644
--- a/addons/project_mrp/i18n/it.po
+++ b/addons/project_mrp/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/ja.po b/addons/project_mrp/i18n/ja.po
index 629082364ca..758bb8c3c2a 100644
--- a/addons/project_mrp/i18n/ja.po
+++ b/addons/project_mrp/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/ko.po b/addons/project_mrp/i18n/ko.po
index 0b4cf0d024d..e61cad08642 100644
--- a/addons/project_mrp/i18n/ko.po
+++ b/addons/project_mrp/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/lt.po b/addons/project_mrp/i18n/lt.po
index 7bd08666ba8..c1a64ec62b6 100644
--- a/addons/project_mrp/i18n/lt.po
+++ b/addons/project_mrp/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/lv.po b/addons/project_mrp/i18n/lv.po
index 773b32d7d1c..7632abf59c3 100644
--- a/addons/project_mrp/i18n/lv.po
+++ b/addons/project_mrp/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/mn.po b/addons/project_mrp/i18n/mn.po
index 5a9bfd3e97d..7e1e824cc9e 100644
--- a/addons/project_mrp/i18n/mn.po
+++ b/addons/project_mrp/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/nb.po b/addons/project_mrp/i18n/nb.po
index 294f813998b..f7f30eb9338 100644
--- a/addons/project_mrp/i18n/nb.po
+++ b/addons/project_mrp/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-13 05:25+0000\n"
-"X-Generator: Launchpad (build 15791)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/nl.po b/addons/project_mrp/i18n/nl.po
index b04001a41ee..2eb106e43b0 100644
--- a/addons/project_mrp/i18n/nl.po
+++ b/addons/project_mrp/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-18 14:52+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/nl_BE.po b/addons/project_mrp/i18n/nl_BE.po
index 1cd96626e62..17669a6be78 100644
--- a/addons/project_mrp/i18n/nl_BE.po
+++ b/addons/project_mrp/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/pl.po b/addons/project_mrp/i18n/pl.po
index 6f1de02aa68..3be7b4f0e53 100644
--- a/addons/project_mrp/i18n/pl.po
+++ b/addons/project_mrp/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/pt.po b/addons/project_mrp/i18n/pt.po
index 12793bec0b4..ea60dc6b353 100644
--- a/addons/project_mrp/i18n/pt.po
+++ b/addons/project_mrp/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/pt_BR.po b/addons/project_mrp/i18n/pt_BR.po
index 537e828f337..e5625d56856 100644
--- a/addons/project_mrp/i18n/pt_BR.po
+++ b/addons/project_mrp/i18n/pt_BR.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Referência de ordem deve ser única por empresa!"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -35,12 +35,12 @@ msgstr "Taréfa de Aquisição"
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de Venda"
 
 #. module: project_mrp
 #: field:procurement.order,sale_line_id:0
 msgid "Sale order line"
-msgstr ""
+msgstr "Linha do pedido de venda"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_createtask0
@@ -55,7 +55,7 @@ msgstr "Se o tipo de produto é 'serviço' então isto cria a tarefa"
 #. module: project_mrp
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Erro ! A data final deve ser maior do que a data inicial"
 
 #. module: project_mrp
 #: model:process.node,name:project_mrp.process_node_saleordertask0
@@ -126,7 +126,7 @@ msgstr "No caso de venda de serviços no Pedido de Venda"
 #. module: project_mrp
 #: field:project.task,sale_line_id:0
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Linha do Pedido de Venda"
 
 #~ msgid "Procurement and Project Management integration"
 #~ msgstr "Integração de Aquisição e Gerenciamento de Projeto"
diff --git a/addons/project_mrp/i18n/ro.po b/addons/project_mrp/i18n/ro.po
index 81bec283b8f..7fa8aa92217 100644
--- a/addons/project_mrp/i18n/ro.po
+++ b/addons/project_mrp/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/ru.po b/addons/project_mrp/i18n/ru.po
index 189b0d58f8a..8d76cc506a1 100644
--- a/addons/project_mrp/i18n/ru.po
+++ b/addons/project_mrp/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/sl.po b/addons/project_mrp/i18n/sl.po
index ed66fb3fb34..ed59352aaee 100644
--- a/addons/project_mrp/i18n/sl.po
+++ b/addons/project_mrp/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/sq.po b/addons/project_mrp/i18n/sq.po
index eed0dc7c6f3..cf4a0d1c4f9 100644
--- a/addons/project_mrp/i18n/sq.po
+++ b/addons/project_mrp/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/sv.po b/addons/project_mrp/i18n/sv.po
index 4dd67665fef..0c026e93ac8 100644
--- a/addons/project_mrp/i18n/sv.po
+++ b/addons/project_mrp/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/tlh.po b/addons/project_mrp/i18n/tlh.po
index 1d6550840e2..b9c04d542a0 100644
--- a/addons/project_mrp/i18n/tlh.po
+++ b/addons/project_mrp/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index 3c1bf8bce85..d6fa36f7e1f 100644
--- a/addons/project_mrp/i18n/tr.po
+++ b/addons/project_mrp/i18n/tr.po
@@ -13,48 +13,48 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Sipariş Kaynağı Her Şirket İçin Eşsiz Olmalı!"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
 msgid "For each product, on type service and on order"
-msgstr ""
+msgstr "Her bir ürün için, hizmet türü ve sipariş"
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_procuretask0
 msgid "Procurement Task"
-msgstr ""
+msgstr "Satınalma Görevi"
 
 #. module: project_mrp
 #: model:ir.model,name:project_mrp.model_sale_order
 msgid "Sales Order"
-msgstr ""
+msgstr "Satış Siparişi"
 
 #. module: project_mrp
 #: field:procurement.order,sale_line_id:0
 msgid "Sale order line"
-msgstr ""
+msgstr "Satış Siparişi Satırı"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_createtask0
 msgid "Product type is service, then its creates the task."
-msgstr ""
+msgstr "Ürün türü hizmettir, sonra görev oluşturur."
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
 msgid "if product type is 'service' then it creates the task."
-msgstr ""
+msgstr "Ürün türü 'hizmet' ise görevi oluşturur."
 
 #. module: project_mrp
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Hata! görev bitiş tarihi başlangıç tarihinden sonra olmalı"
 
 #. module: project_mrp
 #: model:process.node,name:project_mrp.process_node_saleordertask0
@@ -93,7 +93,7 @@ msgstr "Görev"
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_mrptask0
 msgid "A task is created to provide the service."
-msgstr ""
+msgstr "Hizmetin sağlanması için bir görev oluşturuldu."
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_ordertask0
@@ -103,7 +103,7 @@ msgstr "Sipariş Görevi"
 #. module: project_mrp
 #: constraint:project.task:0
 msgid "Error ! You cannot create recursive tasks."
-msgstr ""
+msgstr "Hata ! Yinelenen görevler oluşturamazsınız."
 
 #. module: project_mrp
 #: model:process.transition,name:project_mrp.process_transition_createtask0
@@ -113,17 +113,17 @@ msgstr "Görev Oluştur"
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
 msgid "If procurement method is Make to order and supply method is produce"
-msgstr ""
+msgstr "Eğer satınalma yöntemi sipariş etmek ve tedarik yöntemi üretmekse"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_saleordertask0
 msgid "In case you sell services on sale order"
-msgstr ""
+msgstr "Satış siparişi üzerine hizmet satılması durumunda"
 
 #. module: project_mrp
 #: field:project.task,sale_line_id:0
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Satış Sipariş Satırı"
 
 #~ msgid "Project Management - MRP and Sale Integration"
 #~ msgstr "Proje Yönetimi - MRP ve Satış Entegrasyonu"
diff --git a/addons/project_mrp/i18n/uk.po b/addons/project_mrp/i18n/uk.po
index 9456673aece..b0d3df887fa 100644
--- a/addons/project_mrp/i18n/uk.po
+++ b/addons/project_mrp/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/vi.po b/addons/project_mrp/i18n/vi.po
index 817f2857aeb..8eebaa2f2b8 100644
--- a/addons/project_mrp/i18n/vi.po
+++ b/addons/project_mrp/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/zh_CN.po b/addons/project_mrp/i18n/zh_CN.po
index 5cbe79bf5c9..6c51480cc1f 100644
--- a/addons/project_mrp/i18n/zh_CN.po
+++ b/addons/project_mrp/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/i18n/zh_TW.po b/addons/project_mrp/i18n/zh_TW.po
index 728f3b3d4f3..935949c61eb 100644
--- a/addons/project_mrp/i18n/zh_TW.po
+++ b/addons/project_mrp/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:16+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:14+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_mrp
 #: sql_constraint:sale.order:0
diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml
index 33d8698ce3d..729f107b755 100644
--- a/addons/project_mrp/process/project_mrp_process.xml
+++ b/addons/project_mrp/process/project_mrp_process.xml
@@ -51,7 +51,7 @@
             <field eval="&quot;&quot;&quot;Procurement Task&quot;&quot;&quot;" name="name"/>
             <field eval="&quot;&quot;&quot;if product type is 'service' then it creates the task.&quot;&quot;&quot;" name="note"/>
             <field model="process.node" name="target_node_id" ref="process_node_procuretasktask0"/>
-            <field model="process.node" name="source_node_id" ref="sale.process_node_saleprocurement0"/>
+            <field model="process.node" name="source_node_id" ref="sale_stock.process_node_saleprocurement0"/>
         </record>
 
         <record id="process_transition_createtask0" model="process.transition">
diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml
index ffceb33a611..be6bae8ca61 100644
--- a/addons/project_mrp/project_mrp_view.xml
+++ b/addons/project_mrp/project_mrp_view.xml
@@ -14,10 +14,10 @@
         <record id="view_product_task_form" model="ir.ui.view">
             <field name="name">product.form.view.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="stock.view_normal_procurement_locations_form"/>
             <field name="arch" type="xml">
-                <field name="active" position="after">
-                    <field name="project_id" attrs="{'readonly':[('type','!=','service')]}" />
+                <field name="type" position="after">
+                    <field name="project_id" attrs="{'invisible':[('type','!=','service')]}" />
                 </field>
             </field>
         </record>
@@ -31,6 +31,23 @@
                 </field>
             </field>
         </record>
+        <record id="product_product_normal_form_supply_view" model="ir.ui.view">
+            <field name="name">product.normal.form.project_mrp.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='supply_method']" position="attributes">
+                    <attribute name="invisible">False</attribute>
+                </xpath>
+                <group name="procurement_help" position="inside">
+                    <p attrs="{'invisible': ['|','|',('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','produce')]}">
+                        When you sell this service to a customer, <b>a task</b> will be 
+                        created to follow up the job to do. This task will appear
+                        in the project related to the contract of the sale order.
+                    </p>
+                </group>
+            </field>
+        </record>
     </data>
 </openerp>
 
diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index 299a74f52aa..6948f54ec09 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 from osv import fields, osv
+from tools.translate import _
 
 class procurement_order(osv.osv):
     _name = "procurement.order"
@@ -37,10 +38,12 @@ class procurement_order(osv.osv):
         """ Checks if task is done or not.
         @return: True or False.
         """
-        return all(proc.product_id.type != 'service' or (proc.task_id and proc.task_id.state in ('done', 'cancelled')) \
-                    for proc in self.browse(cr, uid, ids, context=context))
+        for p in self.browse(cr, uid, ids, context=context):
+            if (p.product_id.type=='service') and (p.procure_method=='make_to_order') and p.task_id and (p.task_id.state not in ('done', 'cancelled')):
+                return False
+        return True
 
-    def check_produce_service(self, cr, uid, procurement, context=None):    
+    def check_produce_service(self, cr, uid, procurement, context=None):
         return True
 
     def _convert_qty_company_hours(self, cr, uid, procurement, context=None):
@@ -73,6 +76,7 @@ class procurement_order(osv.osv):
                 'date_deadline': procurement.date_planned,
                 'planned_hours': planned_hours,
                 'remaining_hours': planned_hours,
+                'partner_id': procurement.sale_line_id and procurement.sale_line_id.order_id.partner_id.id or False,
                 'user_id': procurement.product_id.product_manager.id,
                 'notes': procurement.note,
                 'procurement_id': procurement.id,
@@ -80,10 +84,15 @@ class procurement_order(osv.osv):
                 'project_id':  project and project.id or False,
                 'company_id': procurement.company_id.id,
             },context=context)
-            self.write(cr, uid, [procurement.id], {'task_id': task_id, 'state': 'running'}, context=context)
-        self.running_send_note(cr, uid, ids, context=None)
+            self.write(cr, uid, [procurement.id], {'task_id': task_id, 'state': 'running', 'message':_('Task created.')}, context=context)            
+        self.project_task_create_note(cr, uid, ids, context=context)
         return task_id
 
+    def project_task_create_note(self, cr, uid, ids, context=None):
+        for procurement in self.browse(cr, uid, ids, context=context):
+            body = _("Task created")
+            self.message_post(cr, uid, [procurement.id], body=body, context=context)
+
 procurement_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_retro_planning/__init__.py b/addons/project_retro_planning/__init__.py
deleted file mode 100644
index 1cad9d6fd91..00000000000
--- a/addons/project_retro_planning/__init__.py
+++ /dev/null
@@ -1,22 +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 project_retro_planning
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py
deleted file mode 100644
index f5fa2d11d89..00000000000
--- a/addons/project_retro_planning/__openerp__.py
+++ /dev/null
@@ -1,45 +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/>.
-#
-##############################################################################
-
-{
-    'name': 'Project Retro-planning',
-    'version': '0.1',
-    'category': 'Project Management',
-    'description': """
-Changes dates according to change in project End Date.
-======================================================
-
-If end date of project is changed then the deadline date and start date for all
-the tasks will change accordingly.
-    """,
-    'author': 'OpenERP SA',
-    'depends': ['base', 'project'],
-    'init_xml': [],
-    'update_xml': [],
-    'demo_xml': [],
-    'test' : [
-              'test/deadline_change.yml'
-              ],
-    'installable': True,
-    'auto_install': False,
-    'certificate': '0057235475485',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_retro_planning/i18n/ar.po b/addons/project_retro_planning/i18n/ar.po
deleted file mode 100644
index 36bf34c46ba..00000000000
--- a/addons/project_retro_planning/i18n/ar.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+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: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "مشروع"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
diff --git a/addons/project_retro_planning/i18n/bg.po b/addons/project_retro_planning/i18n/bg.po
deleted file mode 100644
index 248a07614a1..00000000000
--- a/addons/project_retro_planning/i18n/bg.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-10-30 11:06+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Проект Ретро планиране"
diff --git a/addons/project_retro_planning/i18n/bs.po b/addons/project_retro_planning/i18n/bs.po
deleted file mode 100644
index 333f1e22d87..00000000000
--- a/addons/project_retro_planning/i18n/bs.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2009-11-17 10:19+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Projekat Retro Planiranja"
diff --git a/addons/project_retro_planning/i18n/ca.po b/addons/project_retro_planning/i18n/ca.po
deleted file mode 100644
index 0d6d5352846..00000000000
--- a/addons/project_retro_planning/i18n/ca.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-08-02 14:44+0000\n"
-"Last-Translator: Raimon Esteve (www.zikzakmedia.com) "
-"<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: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Projecte"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"Error! La data d'inici del projecte ha de ser anterior a la data final del "
-"projecte."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Error! No podeu assignar un escalat al mateix projecte."
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Retroplanificació per a projectes"
-
-#~ msgid ""
-#~ "\n"
-#~ "        - If end date of project is changed\n"
-#~ "          then the deadline date and start date for all the tasks will "
-#~ "change accordingly  "
-#~ msgstr ""
-#~ "\n"
-#~ "        - Si la data de finalització del projecte es canvia,\n"
-#~ "          la data límit i la data d'inici de totes les tasques es canviaran "
-#~ "en conseqüència  "
diff --git a/addons/project_retro_planning/i18n/cs.po b/addons/project_retro_planning/i18n/cs.po
deleted file mode 100644
index 3949bbf8f3f..00000000000
--- a/addons/project_retro_planning/i18n/cs.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-04-06 04:52+0000\n"
-"Last-Translator: Jiří Hajda <robie@centrum.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: 2012-04-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Chyba! Počáteční datum projektu musí být menší než datum ukončení."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Chyba! Nemůžete přiřadit stupňování ke stejnému projektu!"
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Projekt retro plánování"
diff --git a/addons/project_retro_planning/i18n/da.po b/addons/project_retro_planning/i18n/da.po
deleted file mode 100644
index ca9ad659301..00000000000
--- a/addons/project_retro_planning/i18n/da.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-11-08 11:48+0000\n"
-"Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
diff --git a/addons/project_retro_planning/i18n/de.po b/addons/project_retro_planning/i18n/de.po
deleted file mode 100644
index 74009de85cb..00000000000
--- a/addons/project_retro_planning/i18n/de.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-31 10:22+0000\n"
-"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
-"consulting.net>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Fehler ! Projekt Beginn muss vor dem Ende Datum liegen."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Fehler ! Sie können keine Eskalation in dasselbe Projekt vornehmen!"
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Projekt Retro Planung"
-
-#~ msgid ""
-#~ "\n"
-#~ "        - If end date of project is changed\n"
-#~ "          then the deadline date and start date for all the tasks will "
-#~ "change accordingly  "
-#~ msgstr ""
-#~ "\n"
-#~ "        - Wenn das Ende Datum eines Projekts geändert wird\n"
-#~ "              ändert sich automatisch auch die Frist und das Start Datum für "
-#~ "alle Aufgaben zum Projekt  "
diff --git a/addons/project_retro_planning/i18n/es.po b/addons/project_retro_planning/i18n/es.po
deleted file mode 100644
index e078df16f44..00000000000
--- a/addons/project_retro_planning/i18n/es.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-28 08:49+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: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
-"del proyecto."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Retroplanificación para proyectos"
-
-#~ msgid ""
-#~ "\n"
-#~ "        - If end date of project is changed\n"
-#~ "          then the deadline date and start date for all the tasks will "
-#~ "change accordingly  "
-#~ msgstr ""
-#~ "\n"
-#~ "        - Si la fecha de finalización del proyecto se cambia,\n"
-#~ "          la fecha límite y la fecha de inicio de todas las tares se "
-#~ "cambiarán en consecuencia  "
diff --git a/addons/project_retro_planning/i18n/es_AR.po b/addons/project_retro_planning/i18n/es_AR.po
deleted file mode 100644
index 7cbebb8adb3..00000000000
--- a/addons/project_retro_planning/i18n/es_AR.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2009-09-14 14:08+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: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Retroplanificación de proyectos"
diff --git a/addons/project_retro_planning/i18n/es_CR.po b/addons/project_retro_planning/i18n/es_CR.po
deleted file mode 100644
index 4f36c089bd8..00000000000
--- a/addons/project_retro_planning/i18n/es_CR.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-17 00:31+0000\n"
-"Last-Translator: Carlos Vásquez (CLEARCORP) "
-"<carlos.vasquez@clearcorp.co.cr>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-18 04:59+0000\n"
-"X-Generator: Launchpad (build 14814)\n"
-"Language: \n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
-"del proyecto."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Retroplanificación para proyectos"
-
-#~ msgid ""
-#~ "\n"
-#~ "        - If end date of project is changed\n"
-#~ "          then the deadline date and start date for all the tasks will "
-#~ "change accordingly  "
-#~ msgstr ""
-#~ "\n"
-#~ "        - Si la fecha de finalización del proyecto se cambia,\n"
-#~ "          la fecha límite y la fecha de inicio de todas las tares se "
-#~ "cambiarán en consecuencia  "
diff --git a/addons/project_retro_planning/i18n/es_EC.po b/addons/project_retro_planning/i18n/es_EC.po
deleted file mode 100644
index 3c7a0612d90..00000000000
--- a/addons/project_retro_planning/i18n/es_EC.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-09-19 00:12+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Retroplanificación para proyectos"
diff --git a/addons/project_retro_planning/i18n/es_MX.po b/addons/project_retro_planning/i18n/es_MX.po
deleted file mode 100644
index 96e736af7eb..00000000000
--- a/addons/project_retro_planning/i18n/es_MX.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-28 08:49+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: 2011-09-05 05:42+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: project_retro_planning
-#: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
-msgid "Project Retro planning"
-msgstr "Retroplanificación para proyectos"
-
-#. module: project_retro_planning
-#: model:ir.module.module,description:project_retro_planning.module_meta_information
-msgid ""
-"\n"
-"        - If end date of project is changed\n"
-"          then the deadline date and start date for all the tasks will "
-"change accordingly  "
-msgstr ""
-"\n"
-"        - Si la fecha de finalización del proyecto se cambia,\n"
-"          la fecha límite y la fecha de inicio de todas las tares se "
-"cambiarán en consecuencia  "
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
-"del proyecto."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
diff --git a/addons/project_retro_planning/i18n/es_VE.po b/addons/project_retro_planning/i18n/es_VE.po
deleted file mode 100644
index 96e736af7eb..00000000000
--- a/addons/project_retro_planning/i18n/es_VE.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-28 08:49+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: 2011-09-05 05:42+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: project_retro_planning
-#: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
-msgid "Project Retro planning"
-msgstr "Retroplanificación para proyectos"
-
-#. module: project_retro_planning
-#: model:ir.module.module,description:project_retro_planning.module_meta_information
-msgid ""
-"\n"
-"        - If end date of project is changed\n"
-"          then the deadline date and start date for all the tasks will "
-"change accordingly  "
-msgstr ""
-"\n"
-"        - Si la fecha de finalización del proyecto se cambia,\n"
-"          la fecha límite y la fecha de inicio de todas las tares se "
-"cambiarán en consecuencia  "
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
-"del proyecto."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
diff --git a/addons/project_retro_planning/i18n/et.po b/addons/project_retro_planning/i18n/et.po
deleted file mode 100644
index c60cfe705d7..00000000000
--- a/addons/project_retro_planning/i18n/et.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2009-09-22 11:39+0000\n"
-"Last-Translator: Ahti Hinnov <sipelgas@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Projekti retroplaneerimine"
diff --git a/addons/project_retro_planning/i18n/fi.po b/addons/project_retro_planning/i18n/fi.po
deleted file mode 100644
index b24968b7272..00000000000
--- a/addons/project_retro_planning/i18n/fi.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-06-09 10:46+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Projekti"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Virhe: projektin alkupäivä tulee olla aikaisempi kuin loppupäivä."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Virhe! Et voi asettaa eskalointia samalle projektille!"
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Projektien 'retro' suunnittelu"
diff --git a/addons/project_retro_planning/i18n/fr.po b/addons/project_retro_planning/i18n/fr.po
deleted file mode 100644
index 713194a4664..00000000000
--- a/addons/project_retro_planning/i18n/fr.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-13 02:27+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Projet"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"Erreur ! La date de début du projet doit être antérieure à la date de fin du "
-"projet."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-"Erreur ! Vous ne pouvez pas attribuer une escalade sur le même projet !"
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Rétro planification de projets"
-
-#~ msgid ""
-#~ "\n"
-#~ "        - If end date of project is changed\n"
-#~ "          then the deadline date and start date for all the tasks will "
-#~ "change accordingly  "
-#~ msgstr ""
-#~ "\n"
-#~ "        - Si la date de fin du projet est modifiée\n"
-#~ "          alors la date d'échéance et les dates de début de toutes les "
-#~ "tâches vont être modifiées en conséquence  "
diff --git a/addons/project_retro_planning/i18n/gl.po b/addons/project_retro_planning/i18n/gl.po
deleted file mode 100644
index 1e0a8d5fdb5..00000000000
--- a/addons/project_retro_planning/i18n/gl.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# translation of project-retro-planning-es.po to Galego
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: project-retro-planning-es\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2009-08-17 08:29+0000\n"
-"Last-Translator: Frco. Javier Rial <Unknown>\n"
-"Language-Team: Galego <g11n@mancomun.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Proxecto"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"¡Erro! A data de inicio do proxecto debe ser anterior á data final do "
-"proxecto."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "¡Erro! ¡Non pode asignar escalada ó mesmo proxecto!"
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Retroplanificación para proxectos"
-
-#~ msgid ""
-#~ "\n"
-#~ "        - If end date of project is changed\n"
-#~ "          then the deadline date and start date for all the tasks will "
-#~ "change accordingly  "
-#~ msgstr ""
-#~ "\n"
-#~ "        - Se a data de finalización do proxecto cambiou\n"
-#~ "          entón a data límite e a data de inicio para todas as tarefas "
-#~ "cambiará en consecuencia  "
diff --git a/addons/project_retro_planning/i18n/hr.po b/addons/project_retro_planning/i18n/hr.po
deleted file mode 100644
index 30c4c74e4a5..00000000000
--- a/addons/project_retro_planning/i18n/hr.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * project_retro_planning
-# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-12-12 08:13+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
-"Language-Team: Vinteh\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-"Language: hr\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"Greška! Početni datum projekta mora biti manji od završnog datuma projekta."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Retro-aktivno planiranje projekta"
-
-#~ msgid ""
-#~ "\n"
-#~ "        - If end date of project is changed\n"
-#~ "          then the deadline date and start date for all the tasks will "
-#~ "change accordingly  "
-#~ msgstr ""
-#~ "\n"
-#~ "        - Ako se promjenio datum završetka projekta\n"
-#~ "          tada će se promjeniti i kranji rok i datum početka za sve zadatke  "
diff --git a/addons/project_retro_planning/i18n/hu.po b/addons/project_retro_planning/i18n/hu.po
deleted file mode 100644
index c4780afa119..00000000000
--- a/addons/project_retro_planning/i18n/hu.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-02-07 20:10+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"Hiba! A projekt kezdő dátumának előbbinek kell lennie, mint a projekt "
-"befejező dátumának."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid ""
-#~ "\n"
-#~ "        - If end date of project is changed\n"
-#~ "          then the deadline date and start date for all the tasks will "
-#~ "change accordingly  "
-#~ msgstr ""
-#~ "\n"
-#~ "        - Ha a projekt befejező időpontja megváltozik,\n"
-#~ "          akkor a határidő és a feladatok kezdő időpontja is eszerint fog "
-#~ "változni.  "
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Projekt visszafelé irányuló tervezése"
diff --git a/addons/project_retro_planning/i18n/id.po b/addons/project_retro_planning/i18n/id.po
deleted file mode 100644
index d1844b3e1f3..00000000000
--- a/addons/project_retro_planning/i18n/id.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-08-02 14:48+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Perencanaan Proyek Retro"
diff --git a/addons/project_retro_planning/i18n/it.po b/addons/project_retro_planning/i18n/it.po
deleted file mode 100644
index 6eaaa619eda..00000000000
--- a/addons/project_retro_planning/i18n/it.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-13 16:14+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Progetto"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"Errore! La data inizio del progetto deve essere antecedente alla data fine."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Pianificazione Progetto Retro"
diff --git a/addons/project_retro_planning/i18n/ja.po b/addons/project_retro_planning/i18n/ja.po
deleted file mode 100644
index 070d1e1f7d0..00000000000
--- a/addons/project_retro_planning/i18n/ja.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-10 21:40+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-06-11 04:46+0000\n"
-"X-Generator: Launchpad (build 15376)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "プロジェクト"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "エラー。プロジェクトの開始日はプロジェクトの終了日より前である必要があります。"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "エラー。同じプロジェクトに拡大の割当はできません。"
diff --git a/addons/project_retro_planning/i18n/kab.po b/addons/project_retro_planning/i18n/kab.po
deleted file mode 100644
index aa51e30ed43..00000000000
--- a/addons/project_retro_planning/i18n/kab.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# Kabyle 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-10-09 14:25+0000\n"
-"Last-Translator: yugurten <yugurten1@hotmail.fr>\n"
-"Language-Team: Kabyle <kab@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Asenfar"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Taniwit ! azemz asenṭi n usenfar ilaq ad izwer azemz aneggaru."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Taniwit ! Ur tzemereḍ ara ad tefkeḍ timerniwt i usenfar agi"
-
-#~ msgid "Project Retro planning"
-#~ msgstr "A qanib d we Siqwas n we Senfar"
-
-#~ msgid ""
-#~ "\n"
-#~ "        - If end date of project is changed\n"
-#~ "          then the deadline date and start date for all the tasks will "
-#~ "change accordingly  "
-#~ msgstr ""
-#~ "\n"
-#~ "        - Ma tbeddel taggara n uzemz n usenfar\n"
-#~ "          ad beddelen akw izemzan n tiwura segs  "
diff --git a/addons/project_retro_planning/i18n/ko.po b/addons/project_retro_planning/i18n/ko.po
deleted file mode 100644
index cc055c1b969..00000000000
--- a/addons/project_retro_planning/i18n/ko.po
+++ /dev/null
@@ -1,36 +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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2009-09-08 13:52+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: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "프로젝트 리트로 플래닝"
diff --git a/addons/project_retro_planning/i18n/lt.po b/addons/project_retro_planning/i18n/lt.po
deleted file mode 100644
index ee227d7cb0d..00000000000
--- a/addons/project_retro_planning/i18n/lt.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+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: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
diff --git a/addons/project_retro_planning/i18n/mn.po b/addons/project_retro_planning/i18n/mn.po
deleted file mode 100644
index bd106a37ed5..00000000000
--- a/addons/project_retro_planning/i18n/mn.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Mongolian 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-03 09:13+0000\n"
-"Last-Translator: gobi <Unknown>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-04 04:48+0000\n"
-"X-Generator: Launchpad (build 15195)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Төсөл"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Алдаа! төслийн эхлэх огноо дуусах огноогоос бага байх ёстой."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Алдаа! Ижил төсөлд нэмэгдүүлэлтийг олгох боломжгүй."
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Төслийн Ретро төлөвлөгөө"
diff --git a/addons/project_retro_planning/i18n/nl.po b/addons/project_retro_planning/i18n/nl.po
deleted file mode 100644
index ab309349e0c..00000000000
--- a/addons/project_retro_planning/i18n/nl.po
+++ /dev/null
@@ -1,45 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-19 16:50+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Project"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Fout! Project startdatum moet liggen voor project einddatum."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Fout! U kunt geen escalatie toewijzen aan hetzelfde project!"
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Project terugwaards plannen"
-
-#~ msgid ""
-#~ "\n"
-#~ "        - If end date of project is changed\n"
-#~ "          then the deadline date and start date for all the tasks will "
-#~ "change accordingly  "
-#~ msgstr ""
-#~ "\n"
-#~ "        - Als de einddatum van het project is gewijzigd, dan worden de\n"
-#~ "          uiterste datum en startdatum overeenstemmend gewijzigd  "
diff --git a/addons/project_retro_planning/i18n/nl_BE.po b/addons/project_retro_planning/i18n/nl_BE.po
deleted file mode 100644
index 20fa7630f17..00000000000
--- a/addons/project_retro_planning/i18n/nl_BE.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2009-02-04 12:19+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
diff --git a/addons/project_retro_planning/i18n/oc.po b/addons/project_retro_planning/i18n/oc.po
deleted file mode 100644
index 30607c96d72..00000000000
--- a/addons/project_retro_planning/i18n/oc.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Occitan (post 1500) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-11-20 09:25+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Occitan (post 1500) <oc@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Projècte"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Retroplanificacion de projèctes"
diff --git a/addons/project_retro_planning/i18n/pl.po b/addons/project_retro_planning/i18n/pl.po
deleted file mode 100644
index c54a191db73..00000000000
--- a/addons/project_retro_planning/i18n/pl.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-08-02 14:47+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Wsteczne planowanie projektu"
diff --git a/addons/project_retro_planning/i18n/project_retro_planning.pot b/addons/project_retro_planning/i18n/project_retro_planning.pot
deleted file mode 100644
index 9cf5c97c030..00000000000
--- a/addons/project_retro_planning/i18n/project_retro_planning.pot
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-08 00:37+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
diff --git a/addons/project_retro_planning/i18n/pt.po b/addons/project_retro_planning/i18n/pt.po
deleted file mode 100644
index 33e3351a2de..00000000000
--- a/addons/project_retro_planning/i18n/pt.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-09 09:47+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Projecto"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Erro ! A data de início do projeto deve ser anterior à do seu fim"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Projecto Retro Planeamento"
diff --git a/addons/project_retro_planning/i18n/pt_BR.po b/addons/project_retro_planning/i18n/pt_BR.po
deleted file mode 100644
index a2f8223f3aa..00000000000
--- a/addons/project_retro_planning/i18n/pt_BR.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-25 13:49+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@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: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Projeto"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Erro! A data inicial do projeto precisar ser menor que a data final."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Erro! Você não pode atribuir escalas para o mesmo projeto!"
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Projeto Retro-Planejamento"
-
-#~ msgid ""
-#~ "\n"
-#~ "        - If end date of project is changed\n"
-#~ "          then the deadline date and start date for all the tasks will "
-#~ "change accordingly  "
-#~ msgstr ""
-#~ "\n"
-#~ "        - Se a Data Final do Projeto for alterada\n"
-#~ "          então a Data Inicial e Final para todas as Tarefas serão "
-#~ "conseqüentemente alteradas  "
diff --git a/addons/project_retro_planning/i18n/ro.po b/addons/project_retro_planning/i18n/ro.po
deleted file mode 100644
index cdbd3d3bf21..00000000000
--- a/addons/project_retro_planning/i18n/ro.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+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: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Proiect"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"Eroare! data de inceput a proiectului trebuie să fie sub data de sfarsit a "
-"proiectului."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Eroare! Nu puteti atribui intensificare aceluiasi proiect!"
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Planificare retro proiect"
-
-#~ msgid ""
-#~ "\n"
-#~ "        - If end date of project is changed\n"
-#~ "          then the deadline date and start date for all the tasks will "
-#~ "change accordingly  "
-#~ msgstr ""
-#~ "\n"
-#~ "        - Dacă data de terminare a proiectului esteschimbată\n"
-#~ "          atunci data scadentei si data de inceput pentru toate sarcinile "
-#~ "vor fi schimbate in consecintă  "
diff --git a/addons/project_retro_planning/i18n/ru.po b/addons/project_retro_planning/i18n/ru.po
deleted file mode 100644
index 3f58ac5105b..00000000000
--- a/addons/project_retro_planning/i18n/ru.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-11 13:36+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Проект"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"Ошибка! Дата начала проекта должна быть раньше даты окончания проекта."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Ошибка! Вы не можете назначить эскалацию на тот же проект!"
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Проект Ретро планирования"
diff --git a/addons/project_retro_planning/i18n/sl.po b/addons/project_retro_planning/i18n/sl.po
deleted file mode 100644
index 795b41f703f..00000000000
--- a/addons/project_retro_planning/i18n/sl.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-11-26 23:01+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Vzvratno projektno načrtovanje"
diff --git a/addons/project_retro_planning/i18n/sq.po b/addons/project_retro_planning/i18n/sq.po
deleted file mode 100644
index 6490a78fc90..00000000000
--- a/addons/project_retro_planning/i18n/sq.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# Albanian 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-08-02 15:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Albanian <sq@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
diff --git a/addons/project_retro_planning/i18n/sr.po b/addons/project_retro_planning/i18n/sr.po
deleted file mode 100644
index 55f5982cb0a..00000000000
--- a/addons/project_retro_planning/i18n/sr.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Serbian 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-11-04 08:57+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Serbian <sr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Projekat"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Projekat Retro Planiranja"
diff --git a/addons/project_retro_planning/i18n/sr@latin.po b/addons/project_retro_planning/i18n/sr@latin.po
deleted file mode 100644
index e0933f6ce47..00000000000
--- a/addons/project_retro_planning/i18n/sr@latin.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# Serbian 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-10-13 15:26+0000\n"
-"Last-Translator: Milan Milosevic <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: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Projekat"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Greška! datum početka projekta mora biti ispred datuma kraja."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Greška! Ne možete dodeliti eskalaciju jednom istom projektu!"
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Projekat Retro Planiranja"
-
-#~ msgid ""
-#~ "\n"
-#~ "        - If end date of project is changed\n"
-#~ "          then the deadline date and start date for all the tasks will "
-#~ "change accordingly  "
-#~ msgstr ""
-#~ "\n"
-#~ "        - Ako je datum kraja projekta izmenjen\n"
-#~ "          onda će datum krajnjeg roka i datum početka za sve zadatke biti "
-#~ "shodno tome izmenjeni  "
diff --git a/addons/project_retro_planning/i18n/sv.po b/addons/project_retro_planning/i18n/sv.po
deleted file mode 100644
index 48a21e8cd19..00000000000
--- a/addons/project_retro_planning/i18n/sv.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.14\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-11-22 20:18+0000\n"
-"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "Project Retro planning"
diff --git a/addons/project_retro_planning/i18n/tlh.po b/addons/project_retro_planning/i18n/tlh.po
deleted file mode 100644
index bda8e16f1c1..00000000000
--- a/addons/project_retro_planning/i18n/tlh.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+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: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po
deleted file mode 100644
index c846cd5b262..00000000000
--- a/addons/project_retro_planning/i18n/tr.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-25 00:12+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "Proje"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Hata! Proje başlangıç tarihi bitiş tarihinden sonra olamaz."
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Hata! Aynı projeye yükselme atayamazsınız!"
diff --git a/addons/project_retro_planning/i18n/uk.po b/addons/project_retro_planning/i18n/uk.po
deleted file mode 100644
index f2e1a2c264e..00000000000
--- a/addons/project_retro_planning/i18n/uk.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+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: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
diff --git a/addons/project_retro_planning/i18n/ur.po b/addons/project_retro_planning/i18n/ur.po
deleted file mode 100644
index 96fccb6b278..00000000000
--- a/addons/project_retro_planning/i18n/ur.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# Urdu 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2009-09-08 13:51+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: Urdu <ur@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "منصوبہ"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "پروجکٹ کي دوباره منصوبه بندي"
diff --git a/addons/project_retro_planning/i18n/ur_UR.po b/addons/project_retro_planning/i18n/ur_UR.po
deleted file mode 100644
index 8d7b622d49c..00000000000
--- a/addons/project_retro_planning/i18n/ur_UR.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# Urdu 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-05-19 14:36+0000\n"
-"PO-Revision-Date: 2009-07-10 00:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Urdu <ur@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-08-28 10:57+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: project_retro_planning
-#: model:ir.module.module,shortdesc:project_retro_planning.module_meta_information
-msgid "Project Retro planning"
-msgstr ""
diff --git a/addons/project_retro_planning/i18n/vi.po b/addons/project_retro_planning/i18n/vi.po
deleted file mode 100644
index 2457193616e..00000000000
--- a/addons/project_retro_planning/i18n/vi.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-08-02 15:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese <vi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
diff --git a/addons/project_retro_planning/i18n/zh_CN.po b/addons/project_retro_planning/i18n/zh_CN.po
deleted file mode 100644
index 979ac067bbb..00000000000
--- a/addons/project_retro_planning/i18n/zh_CN.po
+++ /dev/null
@@ -1,45 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-03-20 09:52+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@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: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr "项目"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "错误！项目的开始日期必须小于项目的结束日期"
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "不能升级到相同的项目"
-
-#~ msgid "Project Retro planning"
-#~ msgstr "项目计划反推"
-
-#~ msgid ""
-#~ "\n"
-#~ "        - If end date of project is changed\n"
-#~ "          then the deadline date and start date for all the tasks will "
-#~ "change accordingly  "
-#~ msgstr ""
-#~ "\n"
-#~ "        - 如果项目的结束日期发生了变化\n"
-#~ "          项目中所有任务的开始日期和结束日期也会自动变化  "
diff --git a/addons/project_retro_planning/i18n/zh_TW.po b/addons/project_retro_planning/i18n/zh_TW.po
deleted file mode 100644
index a45db7a0131..00000000000
--- a/addons/project_retro_planning/i18n/zh_TW.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_retro_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-08-03 09:33+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:51+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
-
-#. module: project_retro_planning
-#: model:ir.model,name:project_retro_planning.model_project_project
-msgid "Project"
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_retro_planning
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#~ msgid "Project Retro planning"
-#~ msgstr "舊有的規劃項目"
diff --git a/addons/project_retro_planning/project_retro_planning.py b/addons/project_retro_planning/project_retro_planning.py
deleted file mode 100644
index d5667145c3d..00000000000
--- a/addons/project_retro_planning/project_retro_planning.py
+++ /dev/null
@@ -1,56 +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 datetime import date, timedelta, datetime
-import time
-
-from osv import fields, osv
-
-class project_project(osv.osv):
-    _inherit = 'project.project'
-
-    def write(self, cr, uid, ids, vals, *args, **kwargs):
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        if vals.get('date', False):
-            data_project = self.browse(cr, uid, ids)
-            for prj in data_project:
-                if isinstance(vals['date'], datetime):
-                    new_end_date = vals['date'].date()
-                elif isinstance(vals['date'], date):
-                    new_end_date = vals['date']
-                else:
-                    new_end_date = date(*time.strptime(vals['date'],'%Y-%m-%d')[:3])
-                if prj.date:
-                    old_end_date = date(*time.strptime(prj.date,'%Y-%m-%d')[:3])
-                    for task in prj.tasks:
-                        if task.date_start:
-                            start_dt = (date(*time.strptime(str(task.date_start),'%Y-%m-%d  %H:%M:%S')[:3])+(new_end_date-old_end_date)).strftime('%Y-%m-%d %H:%M:%S')
-                            if task.date_deadline:
-                                deadline_dt = (datetime(*time.strptime(str(task.date_deadline),'%Y-%m-%d')[:3])+(new_end_date-old_end_date)).strftime('%Y-%m-%d')
-                                self.pool.get('project.task').write(cr, uid, [task.id], {'date_start':start_dt, 'date_deadline':deadline_dt})
-                            else:
-                                self.pool.get('project.task').write(cr, uid, [task.id], {'date_start':start_dt})
-        return super(project_project,self).write(cr, uid, ids, vals, *args, **kwargs)
-
-project_project()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_retro_planning/test/deadline_change.yml b/addons/project_retro_planning/test/deadline_change.yml
deleted file mode 100644
index e18a5ad71ee..00000000000
--- a/addons/project_retro_planning/test/deadline_change.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-- 
-  Create project 'Retro Planning'
-- 
-  !record {model: project.project, id: project_project_retroplanning0}:
-    company_id: base.main_company
-    date: !eval time.strftime('%Y-%m-%d')
-    name: Retro Planning
-    
-- 
-  Create task 'Plan all projects'
-- 
-  !record {model: project.task, id: project_task_planallprojects0}:
-    date_deadline: !eval "'%s-%s-%s' %(datetime.now().year,datetime.now().month,6)"
-    date_end: !eval "'%s-%s-%s %s:%s:%s' %(datetime.now().year,datetime.now().month,3,datetime.now().hour,datetime.now().minute,datetime.now().second)"
-    date_start: !eval time.strftime('%Y-%m-02 %H:%M:%S')
-    name: Plan all projects
-    planned_hours: 24.0
-    project_id: project_project_retroplanning0
-    remaining_hours: 24.0
-    state: draft
diff --git a/addons/project_scrum/i18n/ar.po b/addons/project_scrum/i18n/ar.po
deleted file mode 100644
index 1b5ea1e3277..00000000000
--- a/addons/project_scrum/i18n/ar.po
+++ /dev/null
@@ -1,1308 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:25+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "اسم المهمة الأسبوعية (Sprint)"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "مستوي التقدم"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum Master"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "هل تقديراتك دقيقة لسجل العدوات السريعة؟"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "أثر رجعي"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "عرض السجل التراكمي للمشروع"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "سجل تراكمي للمنتج"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "مشروع"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "تاريخ الانتهاء"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "روابط"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "محسوب باستخدام مجموع مهام الأعمال المنتهية."
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "الساعات المخططة"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "حالة"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "عرض المهام الأسبوعية (Sprint)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Scrum يومي"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "مهام اليوم"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "مهام منذ أمس"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "أُلغيت"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "عرض المهام للمشروع"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "تاريخ الإجتماع"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "المهام"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "حسابها كالتالي: الوقت المستغرق / الوقت الإجمالي."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "مهام أسبوعية للـ (Scrum Sprint)"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "قيد التقدم"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "مراجعه"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "المهام الأسبوعية بأثر رجعي (Sprint)"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "ملاحظة"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "سجل تراكمي دقيق"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "تم"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "إلغـاء"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "افتح"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "ساعات فعالة"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "الساعات المتبقية"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "السمات"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr "الساعات المخططة"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "تاريخ الإبتداء"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "مقابلات (Scrum Meeting)"
-
-#. 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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "لقاءات يومية"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "أيام المهام الأسبوعية (Sprint)"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "التقدم (0-100)"
-
-#. 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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "بيانات Scrum"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "تفاصيل المهام"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "مراجعة المهام الأسبوعية"
-
-#~ msgid "Template"
-#~ msgstr "قالب"
-
-#~ msgid "Project Members"
-#~ msgstr "أعضاء المشروع"
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "ماذا أنجزت منذ البارحة؟"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "مشاريع Scrum"
-
-#~ msgid "Subproject"
-#~ msgstr "مشروع فرعي"
-
-#~ msgid "Scrum Task"
-#~ msgstr "مهمة Scrum"
-
-#~ msgid "Importance"
-#~ msgstr "أهمية"
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "هل تقديراتك دقيقة لسجل العدوات السريعة؟"
-
-#~ msgid "Notes"
-#~ msgstr "ملاحظات"
-
-#~ msgid "Very urgent"
-#~ msgstr "عاجل جداً"
-
-#~ msgid "Deadline"
-#~ msgstr "الموعد النهائي"
-
-#~ msgid "Mail Header"
-#~ msgstr "رأس البريد"
-
-#~ msgid "Team Name"
-#~ msgstr "اسم الفريق"
-
-#~ msgid "Priority"
-#~ msgstr "أولوية"
-
-#~ msgid "Type"
-#~ msgstr "نوع"
-
-#~ msgid "Medium"
-#~ msgstr "متوسط"
-
-#~ msgid "Task Details"
-#~ msgstr "تفاصيل المهمة"
-
-#~ msgid "Contact"
-#~ msgstr "جهة الإتصال"
-
-#~ msgid "Scrum Product backlog"
-#~ msgstr "سجل تراكمي للمنتج بطريقة Scrum"
-
-#~ msgid "Delay Hours"
-#~ msgstr "ساعات تأخير"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "معلومات اختيارية"
-
-#~ msgid "Low"
-#~ msgstr "منخفض"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "هل هناك أي شيء يعيقك؟"
-
-#~ msgid "Status"
-#~ msgstr "الحالة"
-
-#~ msgid "Project Manager"
-#~ msgstr "مدير المشروع"
-
-#~ msgid "Timebox"
-#~ msgstr "الوقت الزمني"
-
-#~ msgid "Project Name"
-#~ msgstr "اسم المشروع"
-
-#~ msgid "Assigned to"
-#~ msgstr "مكلف إلى"
-
-#~ msgid "Date Closed"
-#~ msgstr "تاريخ الإغلاق"
-
-#~ msgid "Delegated To"
-#~ msgstr "مفوض إلى"
-
-#~ msgid "Working Time"
-#~ msgstr "ساعات العمل"
-
-#~ msgid "Task summary"
-#~ msgstr "ملخص المهمة"
-
-#~ msgid "Very Low"
-#~ msgstr "منخفض جداً"
-
-#~ msgid "Timetable working hours to adjust the gantt diagram report"
-#~ msgstr "الجدول الزمني لساعات العمل لتعديل تقرير الرسم البياني Gantt"
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "إدارة التطوير بطريقة الـ سكرم (Scrum) أو الـ آجيل (Agile)"
-
-#~ msgid ""
-#~ "Total remaining time, can be re-estimated periodically by the assignee of "
-#~ "the task."
-#~ msgstr ""
-#~ "إجمالي الوقت المتبقي، يمكن إعادة تقدير من خلال الشخص المحال إليه المهمة."
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "المهام المفوضة"
-
-#~ msgid "My tasks"
-#~ msgstr "مهامي"
-
-#~ msgid ""
-#~ "Header added at the beginning of the email for the warning message sent to "
-#~ "the customer when a task is closed."
-#~ msgstr ""
-#~ "يوضع تنبيه في أول البريد الإلكتروني كرسالة تحذير للعميل حين إنتهاء المهمة."
-
-#~ msgid ""
-#~ "Project's member. Not used in any computation, just for information purpose."
-#~ msgstr "أعضاء المشروع، غير مستخدمين لأي عمليات حسابية، فقط لأغراض معلوماتية."
-
-#~ msgid "My opened sprints (Product Owner)"
-#~ msgstr "المهام الأسبوعية المفتوحة (مالك المنتج)"
-
-#~ msgid ""
-#~ "If you check this field, the project manager will receive a request each "
-#~ "time a task is completed by his team."
-#~ msgstr ""
-#~ "اذا علمت هذا الحقل، سيستلم مدير المشروع طلب في كل مرة تكتمل فيها مهمة من قبل "
-#~ "أعضاء فريقه."
-
-#~ msgid ""
-#~ "Estimated time to do the task, usually set by the project manager when the "
-#~ "task is in draft state."
-#~ msgstr ""
-#~ "الوقت التقديري لإنجاز المهمة، يضعها في العادة مدير المشروع عندما تكون المهمة "
-#~ "في حالة المسودة."
-
-#~ msgid "All Tasks"
-#~ msgstr "جميع المهام"
-
-#~ msgid "Partner"
-#~ msgstr "شريك"
-
-#~ msgid "Total Time"
-#~ msgstr "إجمالي الوقت"
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "حسابها كالتالي: الوقت المستغرق + الوقت المتبقي"
-
-#~ msgid "Internal description of the project."
-#~ msgstr "وصف داخلي للمشروع."
-
-#~ msgid "Percent of tasks closed according to the total of tasks todo."
-#~ msgstr "نسبة المهام المغلقة وفقاً لمجموع المهام المطلوب تنفيذها."
-
-#~ msgid "Planned Time"
-#~ msgstr "الوقت المخطط"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "هناك خطأ في بيانات الـ XML للعرض!"
-
-#~ msgid "Projects"
-#~ msgstr "المشروعات"
-
-#~ msgid "Scrum Tasks"
-#~ msgstr "مهام Scrum"
-
-#~ msgid "Progress (%)"
-#~ msgstr "نسبة التقدم (%)"
-
-#~ msgid "Opened tasks"
-#~ msgstr "مهام المفتوحة"
-
-#~ msgid "Is Scrum"
-#~ msgstr "هل هو Scrum"
-
-#~ msgid "Create Tasks"
-#~ msgstr "إنشاء مهام"
-
-#~ msgid "My opened sprints (Scrum Master)"
-#~ msgstr "مهامي الأسبوعية المفتوحة (Scrum Master)"
-
-#~ msgid "My opened tasks"
-#~ msgstr "مهامي المفتوحة"
-
-#~ msgid "Sum of total hours of all tasks related to this project."
-#~ msgstr "المجموع الكلي للساعات لكل المهام المتعلقة بهذا المشروع."
-
-#~ msgid "Opened Sprints"
-#~ msgstr "مهام مفتوحة"
-
-#~ msgid "My Sprints (Scrum Master)"
-#~ msgstr "مهامي الأسبوعية (Scrum Master)"
-
-#~ msgid "Time Spent"
-#~ msgstr "الوقت المستغرق"
-
-#~ msgid "Work done"
-#~ msgstr "العمل إنتهي"
-
-#~ msgid "User"
-#~ msgstr "مستخدِم"
-
-#~ msgid "Draft Sprints"
-#~ msgstr "مسودة المهام الأسبوعية"
-
-#~ 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 ""
-#~ "حسابها كالتالي: الوقت الكلي - الوقت التقديري، يعطي الفرق بين الوقت المقدر من "
-#~ "مدير المشروع والوقت الحقيقي لإغلاق المهمة."
-
-#~ msgid "Warn Partner"
-#~ msgstr "أخبر شريك"
-
-#~ msgid "My Sprints (Product Owner)"
-#~ msgstr "مهامي الأسبوعية (مالك المنتج)"
-
-#~ msgid "Sum of spent hours of all tasks related to this project."
-#~ msgstr "مجموع الساعات المستهلكة لكل المهام المرتبطة بهذا المشروع."
-
-#~ msgid "Sum of planned hours of all tasks related to this project."
-#~ msgstr "مجموع الساعات المخططة لكل المهام المرتبطة بهذا المشروع."
-
-#~ msgid "Parent Task"
-#~ msgstr "المهمة الأم"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "اسم الكائن يجب أن يبدأ ب \"_x\" ولا يحتوي على رموز خاصة !"
-
-#~ msgid "Warn Manager"
-#~ msgstr "تحذير المدير"
-
-#~ msgid "Urgent"
-#~ msgstr "عاجل"
-
-#~ msgid "Sprints Done"
-#~ msgstr "المهام الأسبوعية المنتهية"
-
-#~ msgid "Description"
-#~ msgstr "وصف"
-
-#~ msgid "Edit Projects"
-#~ msgstr "تحرير المشروعات"
-
-#~ msgid "Analytic Account"
-#~ msgstr "حسابات تحليلية"
-
-#~ msgid "Hours Spent"
-#~ msgstr "الوقت المستغرق"
-
-#~ msgid "Running"
-#~ msgstr "قيد التنفيذ"
-
-#~ msgid "Scrum Project"
-#~ msgstr "مشروع Scrum"
-
-#~ msgid "Parent project"
-#~ msgstr "مشروع رئيسي"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "ماذا ستعمل اليوم؟"
-
-#~ msgid "Scrum Team"
-#~ msgstr "فريق Scrum"
diff --git a/addons/project_scrum/i18n/bg.po b/addons/project_scrum/i18n/bg.po
deleted file mode 100644
index bfd36eb06e4..00000000000
--- a/addons/project_scrum/i18n/bg.po
+++ /dev/null
@@ -1,1278 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-08-02 17:21+0000\n"
-"Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Напредък"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Проект"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Крайна дата"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Планирани часове"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Състояние"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Задачи за днес"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Задачи от вчера"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Отказани"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Прегледай задачите на проекта"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Дата на среща"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Задачи"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Изчислено по: Изтекло време / Общо време"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "Изпълнява се"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Преглед"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Бележка"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Последователност"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Готово"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Отказ"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "Отвoри"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Ефективни часове"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Оставащи часове"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Възможност"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr "Планирани часове"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Начална дата"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Ежедневни срещи"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Подробности за задачите"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Възложи на"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#~ msgid "All Tasks"
-#~ msgstr "Всички задачи"
-
-#~ msgid "Projects"
-#~ msgstr "Проекти"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Невалиден XML за преглед на архитектурата"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
-#~ "символи!"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Невалидно име на модел при задаването на действие."
-
-#~ msgid ""
-#~ "Total remaining time, can be re-estimated periodically by the assignee of "
-#~ "the task."
-#~ msgstr ""
-#~ "Общо оставащо време, може да бъре преоценявано периодично от пълномощника на "
-#~ "задачата."
-
-#~ msgid "Importance"
-#~ msgstr "Важност"
-
-#~ msgid "Project Members"
-#~ msgstr "Членове на проекта"
-
-#~ msgid ""
-#~ "Header added at the beginning of the email for the warning message sent to "
-#~ "the customer when a task is closed."
-#~ msgstr ""
-#~ "Хедер, който се добавя в началото на имейла с предупредително съобщение към "
-#~ "клиента, когато дадена задача е приключена."
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "Делегирани задачи"
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "Какво сте свършили от вчера до днес ?"
-
-#~ msgid "Subproject"
-#~ msgstr "Подпроект"
-
-#~ msgid "My tasks"
-#~ msgstr "Мои задачи"
-
-#~ msgid "Notes"
-#~ msgstr "Бележки"
-
-#~ msgid "Very urgent"
-#~ msgstr "Много спешно"
-
-#~ msgid ""
-#~ "If you check this field, the project manager will receive a request each "
-#~ "time a task is completed by his team."
-#~ msgstr ""
-#~ "Ако изберете това поле, ръководителят на проекта ще получава запитване при "
-#~ "всяко приключване на задача от неговия екип."
-
-#~ msgid ""
-#~ "Estimated time to do the task, usually set by the project manager when the "
-#~ "task is in draft state."
-#~ msgstr ""
-#~ "Очаквано време за приключване на задачата, обикновено се задава от "
-#~ "ръководителят на проекта когато задачата е в състояние на чернова."
-
-#~ msgid "Deadline"
-#~ msgstr "Краен срок"
-
-#~ msgid "Mail Header"
-#~ msgstr "Хедер на писмо"
-
-#~ msgid "Team Name"
-#~ msgstr "Име на екип"
-
-#~ msgid "Analytic Account"
-#~ msgstr "Аналитична сметка"
-
-#~ msgid "Priority"
-#~ msgstr "Важност"
-
-#~ msgid "Type"
-#~ msgstr "Вид"
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "Изчислено по: Изтекло време + Оставащо време."
-
-#~ msgid "Internal description of the project."
-#~ msgstr "Вътрешно описание на проекта."
-
-#~ msgid "Template"
-#~ msgstr "Шаблон"
-
-#~ msgid "Partner"
-#~ msgstr "Партньор"
-
-#~ msgid "Medium"
-#~ msgstr "Средно"
-
-#~ msgid "Total Time"
-#~ msgstr "Общо време"
-
-#~ msgid "Task Details"
-#~ msgstr "Подробности на задачата"
-
-#~ msgid "Planned Time"
-#~ msgstr "Планирано време"
-
-#~ msgid "Progress (%)"
-#~ msgstr "Напредък (%)"
-
-#~ msgid "Delay Hours"
-#~ msgstr "Часове забавяне"
-
-#~ msgid "Create Tasks"
-#~ msgstr "Създадени задачи"
-
-#~ msgid "Contact"
-#~ msgstr "Контакт"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "Незадължителна информация"
-
-#~ msgid "Opened tasks"
-#~ msgstr "Отворени задачи"
-
-#~ msgid "Sum of total hours of all tasks related to this project."
-#~ msgstr "Сбор на всички часове по всички задачи свързани с този проект."
-
-#~ msgid "Low"
-#~ msgstr "Нисък"
-
-#~ msgid "My opened tasks"
-#~ msgstr "Мои отворени задачи"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "Има ли нещо което да ви пречи ?"
-
-#~ msgid "Status"
-#~ msgstr "Състояние"
-
-#~ msgid "Time Spent"
-#~ msgstr "Отнето време"
-
-#~ msgid "Project Manager"
-#~ msgstr "Ръководител на проект"
-
-#~ msgid "Project Name"
-#~ msgstr "Име на проект"
-
-#~ msgid "User"
-#~ msgstr "Потребител"
-
-#~ msgid "Working Time"
-#~ msgstr "Работно време"
-
-#~ 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 ""
-#~ "Изчислено по: Общо време - Очаквано време. Това дава разликата между "
-#~ "очакваното време от ръководителят на проекта и реалното време за приключване "
-#~ "на задачата."
-
-#~ msgid "Assigned to"
-#~ msgstr "Назначено на"
-
-#~ msgid "Date Closed"
-#~ msgstr "Дата на приключване"
-
-#~ msgid "Work done"
-#~ msgstr "Работата завършена"
-
-#~ msgid "Warn Partner"
-#~ msgstr "Уведомяване на партньор"
-
-#~ msgid "Delegated To"
-#~ msgstr "Делегирано на"
-
-#~ msgid "Sum of spent hours of all tasks related to this project."
-#~ msgstr "Сума на отнетите часове по всички задачи свързани с този роект."
-
-#~ msgid "Sum of planned hours of all tasks related to this project."
-#~ msgstr "Сума на планираните часове по всички задачи свързани с този проект."
-
-#~ msgid "Task summary"
-#~ msgstr "Резюме на задача"
-
-#~ msgid "Warn Manager"
-#~ msgstr "Уведомяване на ръководител"
-
-#~ msgid "Very Low"
-#~ msgstr "Много ниско"
-
-#~ msgid "Edit Projects"
-#~ msgstr "Редактиране на проекти"
-
-#~ msgid "Parent Task"
-#~ msgstr "Родителска задача"
-
-#~ msgid "Description"
-#~ msgstr "Описание"
-
-#~ msgid "Urgent"
-#~ msgstr "Спешно"
-
-#~ msgid "Running"
-#~ msgstr "Изпълнява се"
-
-#~ msgid "Parent project"
-#~ msgstr "Родителски проект"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "Върху какво работите днес ?"
-
-#~ msgid "Context"
-#~ msgstr "Контекст"
-
-#~ msgid "Users"
-#~ msgstr "Потребители"
-
-#~ msgid "Hours Spent"
-#~ msgstr "Отнети часове"
-
-#~ msgid "Created tasks"
-#~ msgstr "Създадени задачи"
-
-#~ msgid "Total Hours"
-#~ msgstr "Общо часове"
-
-#~ msgid "Expected End"
-#~ msgstr "Очакван край"
-
-#~ msgid ""
-#~ "Project's member. Not used in any computation, just for information purpose."
-#~ msgstr ""
-#~ "Член на проекта. Не се използва в каквито и да е изчисления, а само с "
-#~ "информационна цел."
diff --git a/addons/project_scrum/i18n/bs.po b/addons/project_scrum/i18n/bs.po
deleted file mode 100644
index d797af71fdf..00000000000
--- a/addons/project_scrum/i18n/bs.po
+++ /dev/null
@@ -1,1167 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+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: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Napredak"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Projekat"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Završni Datum"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Planirani Sati"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Stanje"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Današnji zadaci"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Zadaci od jučer"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Poništeno"
-
-#. 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
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Zadaci"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "U Toku"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Pregled"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Zabilješka"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Skica"
-
-#. 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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Vlasnik Proizvoda"
-
-#. 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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-msgstr "Aktivan"
-
-#. 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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Sekvenca"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Preostali Sati"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr "Planirani sati"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Početni Datum"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Dnevni Sastanci"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Progres (0-100)"
-
-#. 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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Detalji Zadataka"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Dodijeli"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
-#~ msgid "My tasks"
-#~ msgstr "Moji zadaci"
-
-#~ msgid "Template"
-#~ msgstr "Šablon"
-
-#~ msgid "Importance"
-#~ msgstr "Važnost"
-
-#~ msgid "Project Members"
-#~ msgstr "Članovi Projekta"
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "Delegirani Zadaci"
-
-#~ msgid "Notes"
-#~ msgstr "Bilješke"
-
-#~ msgid "Very urgent"
-#~ msgstr "Vrlo hitno"
-
-#~ msgid "Deadline"
-#~ msgstr "Rok izvršenja"
-
-#~ msgid "All Tasks"
-#~ msgstr "Svi Zadaci"
-
-#~ msgid "Team Name"
-#~ msgstr "Naziv Tima"
-
-#~ msgid "Priority"
-#~ msgstr "Prioritet"
-
-#~ msgid "Type"
-#~ msgstr "Vrsta"
-
-#~ msgid "Internal description of the project."
-#~ msgstr "Interni opis projekta."
-
-#~ msgid "Partner"
-#~ msgstr "Partner"
-
-#~ msgid "Medium"
-#~ msgstr "Srednji"
-
-#~ msgid "Total Time"
-#~ msgstr "Ukupno Vrijeme"
-
-#~ msgid "Task Details"
-#~ msgstr "Detalji Zadataka"
-
-#~ msgid "Projects"
-#~ msgstr "Projekti"
-
-#~ msgid "Planned Time"
-#~ msgstr "Planirano Vrijeme"
-
-#~ msgid "Progress (%)"
-#~ msgstr "Napredak (%)"
-
-#~ msgid "Create Tasks"
-#~ msgstr "Kreiraj Zadatke"
-
-#~ msgid "Contact"
-#~ msgstr "Kontakt"
-
-#~ msgid "Opened tasks"
-#~ msgstr "Otvoreni zadaci"
-
-#~ msgid "Low"
-#~ msgstr "Nizak"
-
-#~ msgid "My opened tasks"
-#~ msgstr "Moji otvoreni zadaci"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Time Spent"
-#~ msgstr "Potrošeno Vrijeme"
-
-#~ msgid "Project Name"
-#~ msgstr "Naziv Projekta"
-
-#~ msgid "Working Time"
-#~ msgstr "Radno Vrijeme"
-
-#~ msgid "User"
-#~ msgstr "Korisnik"
-
-#~ msgid "Warn Partner"
-#~ msgstr "Upozori Partnera"
-
-#~ msgid "Assigned to"
-#~ msgstr "Dodijeljen"
-
-#~ msgid "Very Low"
-#~ msgstr "Vrlo Nisko"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv Objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
-
-#~ msgid "Description"
-#~ msgstr "Opis"
-
-#~ msgid "Urgent"
-#~ msgstr "Hitno"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "Na čemu radiš danas?"
-
-#~ msgid "Context"
-#~ msgstr "Kontekst"
-
-#~ msgid "Users"
-#~ msgstr "Korisnici"
-
-#~ msgid "Total Hours"
-#~ msgstr "Ukupno Sati"
-
-#~ msgid "Hours Spent"
-#~ msgstr "Potrošeni Sati"
-
-#~ msgid "Created tasks"
-#~ msgstr "Kreirani zadaci"
-
-#~ msgid "Expected End"
-#~ msgstr "Očekivani Kraj"
diff --git a/addons/project_scrum/i18n/ca.po b/addons/project_scrum/i18n/ca.po
deleted file mode 100644
index f756948a6f1..00000000000
--- a/addons/project_scrum/i18n/ca.po
+++ /dev/null
@@ -1,1401 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:34+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr "_Assigna"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Autor/a"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr "Que vareu fer des de l'última reunió"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-"La metodologia àgil scrum s'utilitza en projectes de desenvolupament de "
-"programari. En aquesta metodologia, un sprint és un curt període de temps "
-"(p. ex. un mes) durant el qual l'equip implementa un munt d'elements de la "
-"pila de producte. S'organitza la revisió del sprint quan l'equip presenta el "
-"seu treball al client i el propietari del producte."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Group By..."
-msgstr "Agrupa per..."
-
-#. 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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nom del sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Progrés"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum master"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr "El sprint '%s' ha estat obert."
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"Error! La data d'inici del projecte ha de ser anterior a la data final del "
-"projecte."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "És exacta la vostra estimació del sprint backlog?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "Retrospectiu"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "Envia Email"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Error! No podeu crear tasques recursives."
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-msgstr "Canvia a esborrany"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
-msgid "Merge Product Backlogs"
-msgstr "Fusiona elements de la pila del producte"
-
-#. 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 "Fusiona elements de la pila"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr "Reunió de Scrum: %s"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr "Pila"
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Error! No podeu assignar un escalat al mateix projecte."
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "Tasca"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr "Accepta"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr "Hores consumides"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-"La metodologia àgil scrum s'utilitza en el desenvolupament de projectes de "
-"programari. En aquesta metodologia, el responsable de scrum organitza una "
-"reunió diària amb el seu equip per detectar les dificultats al fet que "
-"s'enfronten/s'enfrontaran el seu equip."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Backlog del producte"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Projecte"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "Inicia tasca"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr "Sense"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr "Canvia etapa"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Data de fi"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "Enllaços"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr "Tasca per avui"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr "Obre pila"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr "Total hores consumides"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr "Punts de bloqueig trobats:"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "Planificació"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-msgstr "_Canceŀla"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,scrum_master_id:0
-msgid "The person who is maintains the processes for the product"
-msgstr "La persona que manté els processos per al producte"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Hores planejades"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr "Sprints"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr "Converteix a tasca"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr "Segur que desitgeu fusionar aquestes piles?"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr "Usuari responsable que pot treballar en la tasca"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Estat"
-
-#. 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
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Scrum diari"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr "C_onverteix"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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 "Piles del producte"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "Data creació"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr "Hi ha alguna cosa bloquejant-te?"
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Tasques per avui"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Tasques des d'ahir"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr "Atenció"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "Pendent"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-msgstr "Asigna sprint a piles"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,expected_hours:0
-msgid "Estimated time to do the task."
-msgstr "Temps estimat per realitzar la tasca"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,task_hours:0
-msgid "Task Hours"
-msgstr "Hores de tasca"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Dates"
-msgstr "Dates"
-
-#. module: project_scrum
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Cancel·lat"
-
-#. 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
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-"Hola,\n"
-"Li envio el seu Scrum Meeting: %s per al Sprint '%s' del projecte '%s'"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr "Diàriament"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Delegate"
-msgstr "Delegat"
-
-#. module: project_scrum
-#: view:board.board:0
-msgid "My Board"
-msgstr "El meu taulell"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr "El sprint '%s' ha estat tancat."
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr "Progrés de la tasca"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Data de reunió"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Tasques"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr "Seleccioneu el Sprint per assignar el backlog."
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculat com: Temps dedicat / Temps total."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-msgstr "Backlogs esborrany"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Bloqueigs trobats"
-
-#. 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 ""
-"Canvia l'estat de les piles de producte a obert si està en estat esborrador"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-msgstr "Hores planificades totals"
-
-#. 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 "La persona que és responsable del producte"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr "Què planegeu fer fins a la següent reunió?"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "En progrés"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr "Propietari del producte"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Revisió"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Sprint retrospectiu"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Esborrany"
-
-#. module: project_scrum
-#: help:project.task,product_backlog_id:0
-msgid ""
-"Related product backlog that contains this task. Used in SCRUM methodology"
-msgstr ""
-"Pila de producte relacionada que conté aquesta tasca. Utilitzat en la "
-"metodologia SCRUM"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr "Ajorna"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-msgstr "Informació opcional"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
-msgid "Create Tasks from Product Backlogs"
-msgstr "Crea tasques a partir de piles del producte"
-
-#. module: project_scrum
-#: help:project.project,sprint_size:0
-msgid "Number of days allocated for sprint"
-msgstr "Número de dies reservats per al sprint"
-
-#. module: project_scrum
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Responsable del producte"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,sequence:0
-msgid "Gives the sequence order when displaying a list of product backlog."
-msgstr "Definiu l'ordre quan es mostri una llista de backlog de producte."
-
-#. 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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-msgstr "Backlogs"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Create Task for Product Backlog"
-msgstr "Crea tasca per la pila del producte"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,active:0
-msgid "Active"
-msgstr "Actiu"
-
-#. 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 "Reunions scrum"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
-msgstr "Temps total estimat a causa del Backlog"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.merge,project_id:0
-msgid "Select project for the new product backlog"
-msgstr "Seleccioneu un projecte per a la nova pila de producte"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Merge"
-msgstr "Combina"
-
-#. 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Backlogs exactes"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr "Converteix a tasca"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Seqüència"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr "Progrés de la pila"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Realitzat"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr "Tanca"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "Obert"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Hores reals"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr "Informació"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr "Cartera de productes '% s' es converteix en tasca %d."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Hores restants"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Característica"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr "Les meves piles"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-"La metodologia àgil scrum s'utilitza en projectes de desenvolupament de "
-"programari. La Cartera/Pila de Producte és la llista de funcionalitats a "
-"implementar. Un element de la pila de producte pot ser planificada en un "
-"sprint de desenvolupament i es pot dividir en diverses tasques. La pila de "
-"producte és gestionada per el propietari del producte del projecte."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-msgstr ""
-
-#. 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.sprint:0
-msgid "Planned hours"
-msgstr "Hores planejades"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Data d'inici"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "Reunió scrum"
-
-#. 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 "Gràfic de Burndown"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Reunions diàries"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr "Hores esperades"
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Dies del sprint"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Progrés (0-100)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Info. del sprint"
-
-#. 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 ""
-"Si el camp actiu es desmarca, permet ocultar el backlog de producte sense "
-"eliminar-ho."
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,task_hours:0
-msgid "Estimated time of the total hours of the tasks"
-msgstr "Temps estimat de les hores totals de les tasques"
-
-#. module: project_scrum
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "Dades scrum"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr "És un projecte scrum"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr "Editeu"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Detalls de tasques"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-msgstr "posposa.assistent"
-
-#. 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 ""
-"Aquest assistent combina piles i crea una nova pila amb estat esborrany (les "
-"piles antigues s'esborraran). També fusiona les tasques antigues de les piles"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr "Postposar pila"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr "Seleccioneu el projecte per les piles fusionades"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-msgstr "El meu sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,effective_hours:0
-msgid "Spent Hours"
-msgstr "Hores dedicades"
-
-#. 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 ""
-"Calculat utilitzant la suma del temps consumit en cada tasca relacionada"
-
-#. 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 "Taulell de scrum"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_sprint
-msgid "Project Scrum Sprint"
-msgstr "Sprint del projecte scrum"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Feature Description"
-msgstr "Descripció característica"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr "Si us plau, seleccioneu qualsevol projecte."
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr "Gràcies,"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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 "Assignar sprint"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Assigna a"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr "Segur que desitgeu postposar la pila ?"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr "Si us plau, seleccioneu almenys dues piles de producte"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Revisió del sprint"
-
-#~ msgid "Scrum Product backlog"
-#~ msgstr "Scrum backlog del producte"
-
-#~ msgid "My tasks"
-#~ msgstr "Les meves tasques"
-
-#~ msgid "My opened sprints (Product Owner)"
-#~ msgstr "Els meus sprints oberts (responsable de producte)"
-
-#~ 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."
-
-#~ msgid "Subproject"
-#~ msgstr "Subprojecte"
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "Què heu aconseguit des d'ahir?"
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "És exacta la vostra estimació del sprint backlog?"
-
-#~ msgid "Project Members"
-#~ msgstr "Membres del projecte"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "Projectes scrum"
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "Tasques delegades"
-
-#~ 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."
-
-#~ msgid "Importance"
-#~ msgstr "Importància"
-
-#~ msgid "Scrum Task"
-#~ msgstr "Tasca scrum"
-
-#~ 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."
-
-#~ msgid "Very urgent"
-#~ msgstr "Molt urgent"
-
-#~ 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."
-
-#~ msgid "Notes"
-#~ msgstr "Notes"
-
-#~ 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."
-
-#~ msgid "Team Name"
-#~ msgstr "Nom d'equip"
-
-#~ msgid "Mail Header"
-#~ msgstr "Capçalera correu"
-
-#~ 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."
-
-#~ msgid "Analytic Account"
-#~ msgstr "Compte analític"
-
-#~ msgid "All Tasks"
-#~ msgstr "Totes les tasques"
-
-#~ msgid "Deadline"
-#~ msgstr "Data límit"
-
-#~ msgid "Partner"
-#~ msgstr "Empresa"
-
-#~ msgid "Template"
-#~ msgstr "Plantilla"
-
-#~ msgid "Priority"
-#~ msgstr "Prioritat (0=Molt urgent)"
-
-#~ msgid "Percent of tasks closed according to the total of tasks todo."
-#~ msgstr ""
-#~ "Percentatge de tasques tancades segons el total de tasques a realitzar."
-
-#~ msgid "Internal description of the project."
-#~ msgstr "Descripció interna del projecte."
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "Calculat com: Temps dedicat + Temps restant."
-
-#~ msgid "Type"
-#~ msgstr "Tipus"
-
-#~ msgid "Medium"
-#~ msgstr "Mitja"
-
-#~ msgid "Total Time"
-#~ msgstr "Temps total"
-
-#~ msgid "Planned Time"
-#~ msgstr "Temps previst"
-
-#~ msgid "Projects"
-#~ msgstr "Projectes"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML invàlid per a la definició de la vista!"
-
-#~ msgid "Task Details"
-#~ msgstr "Detalls de tasca"
-
-#~ msgid "Delay Hours"
-#~ msgstr "Retard hores"
-
-#~ msgid "Contact"
-#~ msgstr "Contacte"
-
-#~ msgid "Scrum Tasks"
-#~ msgstr "Tasques scrum"
-
-#~ msgid "Create Tasks"
-#~ msgstr "Crea tasques"
-
-#~ msgid "Progress (%)"
-#~ msgstr "Progrés (%)"
-
-#~ msgid "Is Scrum"
-#~ msgstr "És scrum"
-
-#~ msgid "Opened tasks"
-#~ msgstr "Tasques obertes"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "Info. opcional"
-
-#~ 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."
-
-#~ msgid "My opened sprints (Scrum Master)"
-#~ msgstr "Els meus sprints oberts (scrum master)"
-
-#~ msgid "Low"
-#~ msgstr "Baixa"
-
-#~ msgid "My opened tasks"
-#~ msgstr "Les meves tasques obertes"
-
-#~ msgid "Project Manager"
-#~ msgstr "Responsable de projecte"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "Hi ha alguna cosa que us bloquea?"
-
-#~ msgid "Status"
-#~ msgstr "Posició"
-
-#~ msgid "Opened Sprints"
-#~ msgstr "Sprints oberts"
-
-#~ msgid "Time Spent"
-#~ msgstr "Temps dedicat"
-
-#~ msgid "Project Name"
-#~ msgstr "Nom del projecte"
-
-#~ msgid "My Sprints (Scrum Master)"
-#~ msgstr "Els meus sprints (scrum master)"
-
-#~ msgid "User"
-#~ msgstr "Usuari"
-
-#~ 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."
-
-#~ msgid "Timebox"
-#~ msgstr "Període de temps"
-
-#~ msgid "Draft Sprints"
-#~ msgstr "Sprints esborrany"
-
-#~ msgid "Working Time"
-#~ msgstr "Temps treballat"
-
-#~ msgid "Work done"
-#~ msgstr "Treball realitzat"
-
-#~ msgid "Date Closed"
-#~ msgstr "Data de tancament"
-
-#~ msgid "Assigned to"
-#~ msgstr "Assignat a"
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Warn Partner"
-#~ msgstr "Avisa empresa"
-
-#~ msgid "My Sprints (Product Owner)"
-#~ msgstr "Els meus sprints (responsable de producte)"
-
-#~ msgid "Task summary"
-#~ msgstr "Resum de tasca"
-
-#~ msgid "Warn Manager"
-#~ msgstr "Avisa responsable"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
-#~ "especial!"
-
-#~ msgid "Parent Task"
-#~ msgstr "Tasca pare"
-
-#~ msgid "Very Low"
-#~ msgstr "Molt baixa"
-
-#~ 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"
-
-#~ msgid "Sprints Done"
-#~ msgstr "Sprints realitzats"
-
-#~ msgid "Edit Projects"
-#~ msgstr "Edita projectes"
-
-#~ msgid "Description"
-#~ msgstr "Descripció"
-
-#~ msgid "Urgent"
-#~ msgstr "Urgent"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "En què esteu treballant avui?"
-
-#~ msgid "Running"
-#~ msgstr "En procés"
-
-#~ msgid "Scrum Team"
-#~ msgstr "Equip scrum"
-
-#~ msgid "Scrum Project"
-#~ msgstr "Projecte scrum"
-
-#~ msgid "Parent project"
-#~ msgstr "Projecte pare"
-
-#~ msgid "Hours Spent"
-#~ msgstr "Hores dedicades"
-
-#~ msgid "Context"
-#~ msgstr "Context"
-
-#~ msgid "Total Hours"
-#~ msgstr "Total hores"
-
-#~ msgid "Users"
-#~ msgstr "Usuaris"
-
-#~ 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."
-
-#~ msgid "Opened Backlogs"
-#~ msgstr "Backlogs oberts"
-
-#~ msgid "Created tasks"
-#~ msgstr "Crea tasques"
-
-#~ msgid "Error ! You can not create recursive projects."
-#~ msgstr "Error! No podeu crear projectes recursius."
-
-#~ msgid "Expected End"
-#~ msgstr "Fi previst"
-
-#~ msgid "Mail Footer"
-#~ msgstr "Peu correu"
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "Scrum, mètode de desenvolupament àgil"
-
-#~ msgid "Delegated To"
-#~ msgstr "Delegat a"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nom de model no vàlid en la definició de l'acció."
-
-#~ msgid ""
-#~ "Link this project to an analytic account if you need financial management on "
-#~ "projects. It enables you to connect projects with budgets, planning, cost "
-#~ "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."
diff --git a/addons/project_scrum/i18n/cs.po b/addons/project_scrum/i18n/cs.po
deleted file mode 100644
index 361e599df1c..00000000000
--- a/addons/project_scrum/i18n/cs.po
+++ /dev/null
@@ -1,1033 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+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: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Storno"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
diff --git a/addons/project_scrum/i18n/da.po b/addons/project_scrum/i18n/da.po
deleted file mode 100644
index 25a7bbec9d3..00000000000
--- a/addons/project_scrum/i18n/da.po
+++ /dev/null
@@ -1,1034 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-04 14:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
diff --git a/addons/project_scrum/i18n/de.po b/addons/project_scrum/i18n/de.po
deleted file mode 100644
index e4c3407f6c4..00000000000
--- a/addons/project_scrum/i18n/de.po
+++ /dev/null
@@ -1,1398 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:57+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr "Zuweisen"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Verfasser"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr "Was erledigten Sie seit dem letzten Meeting?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr "Sprint Monat"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-"Die Scrum agile Development Methode wird eingesetzt in "
-"Softwareentwicklungsprojekten. Im Rahmen dieser Methodik, bildet ein Sprint "
-"ein kurzes Zeitintervall (z.B. ein Monat), in dem das Entwicklungsteam eine "
-"Liste mit bestimmten Produktanforderungen (Produkt Backlog) abbildet. Die "
-"Sprint Rückbetrachtung wird durchgeführt bei der Präsentation der "
-"entwickelten"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Group By..."
-msgstr "Gruppierung..."
-
-#. 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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Fortschritt"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum Master"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr "Der Sprint '%s' wurde eröffnet."
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Fehler! Der Projektstart mus vor dem Projektende liegen"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "Sind die Erwartungen Ihres Sprint Backlogs korrekt?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "Retrospektive"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "Sende Mail"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Fehler ! Sie können keine rekursiven Aufgaben definieren."
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr "Sprints in Bearbeitung"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr "Für Wechsel un Delegations Status"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr "Produkt Rückstand '%s' ist Sprint '%s' zugeteilt"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-msgstr "Setze auf Entwurf"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
-msgid "Merge Product Backlogs"
-msgstr "Zusammenfassen von Produkt Backlogs"
-
-#. 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 "Backlogs zusammenfassen"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr "Scrum Meeting: %s"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr "Backlog"
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Fehler ! Sie können keine Eskalation in dasselbe Projekt vornehmen!"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "Aufgabe"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr "OK"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr "Geleistete Stunden"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-"Die Scrum Methodik wird sehr oft in Softwareentwicklungsprojekten "
-"angewendet. Im Rahmen der Methodik wird eine tägliche\r\n"
-"Kurzbesprechung durch den Scrum Master mit den Mitarbeitern seines Teams "
-"veranstaltet, um zeitnah Probleme und Hindernisse\r\n"
-"in einem Projekt zu erkennen."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr "Aktuellen Sprints zugeordnete Rückstände"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr "Um eine Aufgabe abzubrechen"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Produkt Backlog"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "Starte Aufgabe"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr "Keine"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr "Status verändern"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Ende Datum"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "Links"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr "Heutige Aufgaben"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr "Eröffne Backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr "Gesamtstunden"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr "unerledigte Sprints"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr "Hindernisse für weitere Bearbeitung:"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr "Rückstände die keinen Sprints zugeordnet sind"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "Planung"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-msgstr "Abbrechen"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,scrum_master_id:0
-msgid "The person who is maintains the processes for the product"
-msgstr "Der Verwantwortliche für die Bearbeitungsschritte des Produkts"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "geplante Stunden"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr "Sprints"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr "Konvertiere zu Aufgabe"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr "Sollen diese Backlogs wirklich zusammengefasst werden?"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr "Verantwortl. Mitarbeiter für Aufgabe"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Status"
-
-#. 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
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr "Neu"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Daily Scrum"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr "Konvertiere"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending Backlogs"
-msgstr "unerledigte Rückstände"
-
-#. 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 "Product Backlogs"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Email-Zusammensetzung Assistent"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "Erzeugt am"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr "Gibt es Hindernisse zur Weiterbearbeitung?"
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Heutige Aufgaben"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Aufgaben seit Gestern"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr "Warnung"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "Im Wartezustand"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-msgstr "Zuordnen Sprint zu Backlog"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,expected_hours:0
-msgid "Estimated time to do the task."
-msgstr "Geschätzte Zeit für die Erledigung der Aufgabe"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,task_hours:0
-msgid "Task Hours"
-msgstr "Aufgabe Stunden"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Dates"
-msgstr "Daten"
-
-#. module: project_scrum
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Abgebrochen"
-
-#. 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
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-"Hallo  , \n"
-"Du bist eingeladen zum Scrum Meeting : %s für den Sprint  '%s' im Projekt "
-"'%s'"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr "Täglich"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint Backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Delegate"
-msgstr "Delegieren"
-
-#. module: project_scrum
-#: view:board.board:0
-msgid "My Board"
-msgstr "Meine Pinnwand"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr "Der Sprint '%s' wurde beendet."
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr "Aufgaben Fortschritt"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Datum Meeting"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Aufgaben"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr "Wähle Sprint zum Backlog"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Berechnet als:  Gearbeitete Zeit / Gesamtzeit"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr "Monat"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-msgstr "Entwurf Backlogs"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Hindernissliste"
-
-#. 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 ""
-"Verändere den Status des Produkt Backlogs auf offen, wenn dieser aktuell im "
-"Entwurf ist"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-msgstr "Gesamtdauer"
-
-#. 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 "Der Produktverantwortliche"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr "Was wollen Sie bis zum nächsten Treffen erledigen?"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum Sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "In Bearbeitung"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr "Product Owner"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Bewertung"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Sprint Rückbetrachtung"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Bemerkung"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Entwurf"
-
-#. module: project_scrum
-#: help:project.task,product_backlog_id:0
-msgid ""
-"Related product backlog that contains this task. Used in SCRUM methodology"
-msgstr ""
-"Product Backlog mit entsprechenden Aufgaben. Wird in Scrum Methodik "
-"verwendet."
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr "Verschieben"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr "Ändere Typ"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr "Um in Erledigt Status zu wechseln"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr "Neue Sprints"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-msgstr "Optionale Info"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
-msgid "Create Tasks from Product Backlogs"
-msgstr "Erzeuge Aufgabe vom Produkt Rückstand"
-
-#. module: project_scrum
-#: help:project.project,sprint_size:0
-msgid "Number of days allocated for sprint"
-msgstr "Anzahl der für Sprint zugeordneten Tage"
-
-#. module: project_scrum
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Product Owner"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,sequence:0
-msgid "Gives the sequence order when displaying a list of product backlog."
-msgstr "Sortierung für die Anzeige der Liste mit Product Backlogs"
-
-#. 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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-msgstr "Backlogs"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Create Task for Product Backlog"
-msgstr "Erzeuge Aufgabe für Product Backlog"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,active:0
-msgid "Active"
-msgstr "Aktiv"
-
-#. 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 "Scrum Meetings"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
-msgstr "Geschätze Barbeitungszeit für Backlog"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.merge,project_id:0
-msgid "Select project for the new product backlog"
-msgstr "Wähle Projekt für das neue Product Backlog"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Merge"
-msgstr "Zusammenfassen"
-
-#. 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Backlog Spezifizierung"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr "In Aufgabe konvertieren"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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 bislang noch kein Analytisches "
-"Konto für diese Projekt gibt"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Sequenz"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr "Fortschritt Backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Erledigt"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr "Beenden"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "Offen"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Effektive Stunden"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr "Information"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr "Produkt Rückstand '%s' ist in Aufgabe %d konvertiert worden."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Verbleibende Stunden"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Fehler! Aufgaben End-Datum muss größer als Aufgaben-Beginn sein"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr "Verantwortlich"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Funktion"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr "Meine Backlogs"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr "Rückstände in Bearbeitung"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr "Zeige Sprints"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-"Die Scrum agile Entwicklungsmethode wird eingesetzt "
-"Softwareentwicklungsprojekten. Das Produkt Backlog ist eine Liste mit den "
-"Funktionalitäten, die zu implementieren sind. Ein Produkt Backlog kann im "
-"Rahmen eines Entwicklungssprints geplant werden und auf verschiedene "
-"Aufgaben aufgeteilt werden. Das Produkt Backlog wird gemanagt vom Produkt "
-"Besitzer (Owner) des Besitzers. Der Produkt Owner ist üblicherweise ein "
-"Produktmanager oder der Kunde selbst."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-msgstr "Rückstand verschieben"
-
-#. 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.sprint:0
-msgid "Planned hours"
-msgstr "Geplante Stunden"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Start Datum:"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "Scrum Meeting"
-
-#. 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 "Burndown Chart"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Daily Meetings"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr "Erwartete Stunden"
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Sprint Tage"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Fortschritt (0-100)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Sprint Information"
-
-#. 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 ""
-"Durch Aktivierung dieser Option, kann die Ansicht dieses Backlogs verhindert "
-"werden ohne die Sektion zu löschen."
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,task_hours:0
-msgid "Estimated time of the total hours of the tasks"
-msgstr "Erwartete Dauer für die Aufgaben"
-
-#. module: project_scrum
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "Scrum Daten"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr "Das ist ein Scrum Projekt"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr "Bearbeite"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Aufgabendetails"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-msgstr "postpone.wizard"
-
-#. 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 ""
-"Der Assistent fasst einzelne Backlogs zu einem neuen Backlog im Status "
-"'Entwurf' zusammen (die alten Backlogs werden gelöscht). Die Aufgaben werden "
-"entsprechend auch zusammengefasst."
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr "Verschieben Backlog"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr "Wähle das Projekt für zusammengefasstes Backlog"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-msgstr "Meine Sprints"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,effective_hours:0
-msgid "Spent Hours"
-msgstr "verbrauchte Stunden"
-
-#. 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 "berechnet aufgrund der verbrauchten Zeit der verbundenen Aufgaben"
-
-#. 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 "Scrum Pinnwand"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_sprint
-msgid "Project Scrum Sprint"
-msgstr "Projekt Scrum Sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Feature Description"
-msgstr "Beschreibung der Merkmale"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr "Bitte wählen Sie ein Projekt."
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr "Vielen Dank."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-msgstr "aktuelle Sprints"
-
-#. 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 "Zuweisen Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Zuordnen zu"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr "Möchten Sie wirklich das Backlog verschieben?"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr "Für Wechsel in Offen Status"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr "Bitte wählen Sie mindestens zwei Product Backlogs"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Sprint Rückbetrachtung"
-
-#~ msgid "Scrum Product backlog"
-#~ msgstr "Scrum Produkt Backlog"
-
-#~ msgid "My tasks"
-#~ msgstr "Meine Aufgaben"
-
-#~ msgid "My opened sprints (Product Owner)"
-#~ msgstr "Meine offenen Sprints (Product Owner)"
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "Scrum, agile Entwicklungsmethode"
-
-#~ 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."
-
-#~ msgid "Subproject"
-#~ msgstr "Subprojekt"
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "Was haben Sie seit gestern erledigt?"
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "Sind die Erwartungen Ihres Sprint Backlogs korrekt?"
-
-#~ msgid "Project Members"
-#~ msgstr "Projekt Mitarbeiter"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "Scrum Projekte"
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "Delegierte Aufgaben"
-
-#~ 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)"
-
-#~ msgid "Importance"
-#~ msgstr "Wichtigkeit"
-
-#~ msgid "Scrum Task"
-#~ msgstr "Scrum Aufgabe"
-
-#~ 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."
-
-#~ msgid "Very urgent"
-#~ msgstr "Sehr dringend"
-
-#~ 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."
-
-#~ msgid "Notes"
-#~ msgstr "Bemerkungen"
-
-#~ 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."
-
-#~ msgid "Team Name"
-#~ msgstr "Name Team"
-
-#~ msgid "Mail Header"
-#~ msgstr "Mail Header"
-
-#~ 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."
-
-#~ msgid "Analytic Account"
-#~ msgstr "Analytisches Konto"
-
-#~ msgid "All Tasks"
-#~ msgstr "Alle Aufgaben"
-
-#~ msgid "Deadline"
-#~ msgstr "Deadline"
-
-#~ msgid "Partner"
-#~ msgstr "Partner"
-
-#~ msgid "Template"
-#~ msgstr "Vorlage"
-
-#~ msgid "Priority"
-#~ msgstr "Priorität"
-
-#~ msgid "Percent of tasks closed according to the total of tasks todo."
-#~ msgstr "Prozent erledigte Aufgaben zu Gesamtsumme der offenen Aufgaben."
-
-#~ msgid "Internal description of the project."
-#~ msgstr "Interne Projektbeschreibung"
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "Berechnet als: Zeitaufwand + Verbleibende Zeit"
-
-#~ msgid "Type"
-#~ msgstr "Typ"
-
-#~ msgid "Medium"
-#~ msgstr "Medium"
-
-#~ msgid "Total Time"
-#~ msgstr "Gesamtzeit"
-
-#~ msgid "Planned Time"
-#~ msgstr "Geplante Zeit"
-
-#~ msgid "Projects"
-#~ msgstr "Projekte"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#~ msgid "Task Details"
-#~ msgstr "Aufgabenliste"
-
-#~ msgid "Delay Hours"
-#~ msgstr "Verzögerung in Stunden"
-
-#~ msgid "Contact"
-#~ msgstr "Kontakt"
-
-#~ msgid "Scrum Tasks"
-#~ msgstr "Scrum Aufgaben"
-
-#~ msgid "Create Tasks"
-#~ msgstr "Erzeuge Aufgabe"
-
-#~ msgid "Progress (%)"
-#~ msgstr "Mein Aufgabenfortschritt"
-
-#~ msgid "Is Scrum"
-#~ msgstr "Ist Scrum"
-
-#~ msgid "Opened tasks"
-#~ msgstr "Offene Aufgaben"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "Optionale Information"
-
-#~ msgid "Sum of total hours of all tasks related to this project."
-#~ msgstr "Summe Stunden aller Aufgaben zu diesem Projekt."
-
-#~ msgid "My opened sprints (Scrum Master)"
-#~ msgstr "Meine offenen Sprints (Scrum Master)"
-
-#~ msgid "Low"
-#~ msgstr "Ausreichend"
-
-#~ msgid "My opened tasks"
-#~ msgstr "Meine offenen Aufgaben"
-
-#~ msgid "Project Manager"
-#~ msgstr "Projekt Manager"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "Gibt es Hindernisse?"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "Opened Sprints"
-#~ msgstr "Offene Sprints"
-
-#~ msgid "Time Spent"
-#~ msgstr "Zeitbedarf"
-
-#~ msgid "Project Name"
-#~ msgstr "Projekt Bezeichnung"
-
-#~ msgid "My Sprints (Scrum Master)"
-#~ msgstr "Meine Projekte (Scrum Master)"
-
-#~ msgid "User"
-#~ msgstr "Benutzer"
-
-#~ 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."
-
-#~ msgid "Timebox"
-#~ msgstr "Aufgabenliste"
-
-#~ msgid "Draft Sprints"
-#~ msgstr "Entwurf Sprint"
-
-#~ msgid "Working Time"
-#~ msgstr "Arbeitszeit"
-
-#~ msgid "Work done"
-#~ msgstr "Arbeit erledigt"
-
-#~ msgid "Date Closed"
-#~ msgstr "Datum Ende"
-
-#~ msgid "Assigned to"
-#~ msgstr "Zuweisung an"
-
-#~ msgid "Sum of spent hours of all tasks related to this project."
-#~ msgstr "Summe projektbezogene Stunden"
-
-#~ msgid "Sum of planned hours of all tasks related to this project."
-#~ msgstr "Summe geplanter Stunden über alle Aufgaben des Projektes."
-
-#~ msgid "Warn Partner"
-#~ msgstr "Warne Partner"
-
-#~ msgid "My Sprints (Product Owner)"
-#~ msgstr "Meine Sprints (Product Owner)"
-
-#~ msgid "Task summary"
-#~ msgstr "Bezeichnung Aufgabe"
-
-#~ 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."
-
-#~ msgid "Warn Manager"
-#~ msgstr "Warne Manager"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
-#~ "beinhalten"
-
-#~ msgid "Parent Task"
-#~ msgstr "(Ober-) Aufgabe"
-
-#~ msgid "Very Low"
-#~ msgstr "Sehr gering"
-
-#~ msgid "Timetable working hours to adjust the gantt diagram report"
-#~ msgstr "Zeiterfassung Arbeitsstunden für die Ausrichtung des Gantt Charts"
-
-#~ msgid "Sprints Done"
-#~ msgstr "Erledigte Sprints"
-
-#~ msgid "Edit Projects"
-#~ msgstr "Editiere Projekte"
-
-#~ msgid "Description"
-#~ msgstr "Beschreibung"
-
-#~ msgid "Urgent"
-#~ msgstr "Dringend"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "Was hast Du heute erledigt?"
-
-#~ msgid "Running"
-#~ msgstr "In Weiterbearbeitung"
-
-#~ msgid "Scrum Team"
-#~ msgstr "Scrum Team"
-
-#~ msgid "Scrum Project"
-#~ msgstr "Scrum Projekt"
-
-#~ msgid "Parent project"
-#~ msgstr "Hauptprojekt"
-
-#~ msgid "Hours Spent"
-#~ msgstr "geleistete Stunden"
-
-#~ msgid "Context"
-#~ msgstr "Kontext"
-
-#~ msgid "Total Hours"
-#~ msgstr "Gesamte Stunden"
-
-#~ msgid "Users"
-#~ msgstr "Benutzer"
-
-#~ 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."
-
-#~ msgid "Opened Backlogs"
-#~ msgstr "Offene Backlogs"
-
-#~ msgid "Created tasks"
-#~ msgstr "Erzeugte Aufgaben"
-
-#~ msgid "Error ! You can not create recursive projects."
-#~ msgstr "Fehler! Sie können keine rekursiven Projekte definieren."
-
-#~ msgid "Expected End"
-#~ msgstr "Erwartetes Ende"
-
-#~ msgid "Mail Footer"
-#~ msgstr "Mail Footer"
-
-#~ msgid "Delegated To"
-#~ msgstr "Delegiert an"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
diff --git a/addons/project_scrum/i18n/el.po b/addons/project_scrum/i18n/el.po
deleted file mode 100644
index 18dea3e2769..00000000000
--- a/addons/project_scrum/i18n/el.po
+++ /dev/null
@@ -1,1034 +0,0 @@
-# Greek 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-09 11:46+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Πρόοδος"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
diff --git a/addons/project_scrum/i18n/es.po b/addons/project_scrum/i18n/es.po
deleted file mode 100644
index 0973a9ffd0b..00000000000
--- a/addons/project_scrum/i18n/es.po
+++ /dev/null
@@ -1,1402 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:19+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr "_Asignar"
-
-#. 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 elemento de la pila crear tarea."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr "Que hizo desde la última reunión"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-"La metodología ágil scrum se usa en proyectos de desarrollo de software. En "
-"esta metodología, un sprint es un corto periodo de tiempo (p.ej. un mes) "
-"durante la cual el equipo implementa un montón de elementos de la pila de "
-"producto. Se organiza la revisión del sprint cuando el equipo presenta su "
-"trabajo al cliente y el dueño del producto."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: project_scrum
-#: model:process.node,note:project_scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr "Crear tarea desde elementos de la pila"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nombre del sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Progreso"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum master"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr "El sprint '%s' ha sido abierto."
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"¡Error! La fecha de inicio del proyecto debe ser anterior a la fecha final "
-"del proyecto."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "¿Son exactas sus estimaciones de la pila de sprint?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "Retrospectiva"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "Enviar correo"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "¡Error! No se pueden crear tareas recursivas."
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Ver pila del proyecto"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
-msgid "Merge Product Backlogs"
-msgstr "Fusionar elementos de pila de producto"
-
-#. 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 "Fusionar elementos de pila"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr "Reunión de Scrum: %s"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr "Pila"
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "¡Error! No puede asignar un escalado al mismo proyecto."
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "Tarea"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr "Aceptar"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr "Horas consumidas"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-"La metodología ágil scrum se utiliza en el desarrollo de proyectos de "
-"software. En esta metodología, el responsable de scrum organiza una reunión "
-"diaria con su equipo para detectar las dificultades a que se enfrentan/se "
-"enfrentarán su equipo."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Pila del producto"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "Iniciar tarea"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr "Ninguno"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr "Cambiar etapa"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Fecha de fin"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "Enlaces"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr "Tarea para hoy"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr "Abrir pila"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr "Total horas consumidas"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr "Puntos de bloqueo encontrados:"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "Planificación"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,scrum_master_id:0
-msgid "The person who is maintains the processes for the product"
-msgstr "La persona que mantiene los procesos para el producto"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Horas planeadas"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr "Sprints"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr "Convertir a tarea"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr "¿Seguro que desea fusionar estas pilas?"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr "Usuario responsable que puede trabajar en la tarea"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Estado"
-
-#. 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
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Scrum diario"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr "C_onvertir"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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 "Pilas de producto"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "Fecha de creación"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr "¿Hay algo bloqueandote?"
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Tareas para hoy"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Tareas desde ayer"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr "Aviso"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-msgstr "Asignar sprint a pilas"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,expected_hours:0
-msgid "Estimated time to do the task."
-msgstr "Tiempo estimado para realizar la tarea."
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,task_hours:0
-msgid "Task Hours"
-msgstr "Horas tarea"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Dates"
-msgstr "Fechas"
-
-#. module: project_scrum
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. 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
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-"Hola, \n"
-"Le envío su Scrum Meeting: %s para el Sprint '%s' del proyecto '%s'"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr "Diariamente"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Delegate"
-msgstr "Delegar"
-
-#. module: project_scrum
-#: view:board.board:0
-msgid "My Board"
-msgstr "Mi tablero"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr "El sprint '%s' ha sido cerrado."
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr "Progreso de la tarea"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Fecha de reunión"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Tareas"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr "Seleccione el Sprint para asignar el backlog."
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculado como: Tiempo dedicado / Tiempo total."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-msgstr "Backlogs borrador"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Bloqueos encontrados"
-
-#. 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 ""
-"Cambiar el estado de las pilas de producto a abierto si está en estado "
-"borrador"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-msgstr "Horas planeadas totales"
-
-#. 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 "La persona que es responsable del producto"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr "¿Qué planea hacer hasta la siguiente reunión?"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "En progreso"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr "Dueño del producto"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Revisión"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Sprint retrospectivo"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: project_scrum
-#: help:project.task,product_backlog_id:0
-msgid ""
-"Related product backlog that contains this task. Used in SCRUM methodology"
-msgstr ""
-"Pila de producto relacionada que contiene esta tarea. Usado en la "
-"metodología SCRUM"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr "Aplazar"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-msgstr "Información opcional"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
-msgid "Create Tasks from Product Backlogs"
-msgstr "Crear tareas a partir de pilas de producto"
-
-#. module: project_scrum
-#: help:project.project,sprint_size:0
-msgid "Number of days allocated for sprint"
-msgstr "Numero de días reservados para el sprint"
-
-#. module: project_scrum
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Responsable del producto"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,sequence:0
-msgid "Gives the sequence order when displaying a list of product backlog."
-msgstr "Define el orden cuando se muestre una lista de backlog de producto."
-
-#. 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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-msgstr "Backlogs"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Create Task for Product Backlog"
-msgstr "Crear tarea para la pila de producto"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. 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 "Reuniones scrum"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
-msgstr "Tiempo total estimado debido al BacklogG"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.merge,project_id:0
-msgid "Select project for the new product backlog"
-msgstr "Seleccione un proyecto para la nueva pila de producto"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Merge"
-msgstr "Fusionar"
-
-#. 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Exactitud de los backlogs"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr "Convertir a tarea"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr "Progreso pila"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "Abierto"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Horas reales"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr "Información"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Horas restantes"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Característica"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr "Mis pilas"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-"La metodología ágil scrum se usa en proyectos de desarrollo de software. La "
-"Cartera/Pila de Producto es la lista de funcionalidades a implementar. Un "
-"elemento de la pila de producto puede ser planificada en un sprint de "
-"desarrollo y se puede dividir en varias tareas. La pila de producto es "
-"gestionada por el dueño del producto del proyecto."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-msgstr ""
-
-#. 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.sprint:0
-msgid "Planned hours"
-msgstr "Horas planeadas"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Fecha de inicio"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "Reunión scrum"
-
-#. 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 "Grafico de Burndown"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Reuniones diarias"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr "Horas esperadas"
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Días del sprint"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Progreso (0-100)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Info. del sprint"
-
-#. 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 ""
-"Si el campo activo se desmarca, permite ocultar el backlog de producto sin "
-"eliminarlo."
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,task_hours:0
-msgid "Estimated time of the total hours of the tasks"
-msgstr "Tiempo estimado de las horas totales de las tareas"
-
-#. module: project_scrum
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "Datos scrum"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr "Es un proyecto scrum"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr "Editar"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Detalles de tareas"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-msgstr "postponer.asistente"
-
-#. 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 ""
-"Este asistente fusiona pilas y crea una nueva pila con estado borrador (las "
-"pilas antiguas se borrarán). También fusiona las tareas antiguas de las pilas"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr "Postponer pila"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr "Seleccione el proyecto para las pilas fusionadas"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-msgstr "Mi sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,effective_hours:0
-msgid "Spent Hours"
-msgstr "Horas consumidas"
-
-#. 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 ""
-"Calculado usando la suma del tiempo consumido en cada tarea relacionada"
-
-#. 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 "Cuadro de mandos de scrum"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_sprint
-msgid "Project Scrum Sprint"
-msgstr "Sprint de proyecto scrum"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Feature Description"
-msgstr "Descripción característica"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr "Por favor, seleccione cualquier proyecto."
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr "Gracias,"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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 "Asignar sprint"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Asignar a"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr "¿ Seguro que desea postponer la pila ?"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr "Por favor, seleccione al menos dos pilas de producto"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Revisión del sprint"
-
-#~ msgid "Scrum Product backlog"
-#~ msgstr "Scrum backlog del producto"
-
-#~ msgid "My tasks"
-#~ msgstr "Mis tareas"
-
-#~ msgid "My opened sprints (Product Owner)"
-#~ msgstr "Mis sprints abiertos (responsable de producto)"
-
-#~ 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."
-
-#~ msgid "Subproject"
-#~ msgstr "Subproyecto"
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "¿Qué ha conseguido desde ayer?"
-
-#~ msgid "Project Members"
-#~ msgstr "Miembros del proyecto"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "Proyectos scrum"
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "Tareas delegadas"
-
-#~ 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."
-
-#~ msgid "Importance"
-#~ msgstr "Importancia"
-
-#~ msgid "Scrum Task"
-#~ msgstr "Tarea scrum"
-
-#~ 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."
-
-#~ msgid "Very urgent"
-#~ msgstr "Muy urgente"
-
-#~ 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."
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
-#~ 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."
-
-#~ msgid "Team Name"
-#~ msgstr "Nombre del equipo"
-
-#~ msgid "Mail Header"
-#~ msgstr "Cabecera correo"
-
-#~ 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."
-
-#~ msgid "Analytic Account"
-#~ msgstr "Cuenta analítica"
-
-#~ msgid "All Tasks"
-#~ msgstr "Todas las tareas"
-
-#~ msgid "Deadline"
-#~ msgstr "Fecha límite"
-
-#~ msgid "Partner"
-#~ msgstr "Empresa"
-
-#~ msgid "Template"
-#~ msgstr "Plantilla"
-
-#~ msgid "Priority"
-#~ msgstr "Prioridad"
-
-#~ 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."
-
-#~ msgid "Internal description of the project."
-#~ msgstr "Descripción interna del proyecto."
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
-
-#~ msgid "Type"
-#~ msgstr "Tipo"
-
-#~ msgid "Medium"
-#~ msgstr "Media"
-
-#~ msgid "Total Time"
-#~ msgstr "Tiempo total"
-
-#~ msgid "Planned Time"
-#~ msgstr "Tiempo previsto"
-
-#~ msgid "Projects"
-#~ msgstr "Proyectos"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Task Details"
-#~ msgstr "Detalles de tarea"
-
-#~ msgid "Delay Hours"
-#~ msgstr "Retraso horas"
-
-#~ msgid "Contact"
-#~ msgstr "Contacto"
-
-#~ msgid "Scrum Tasks"
-#~ msgstr "Tareas scrum"
-
-#~ msgid "Create Tasks"
-#~ msgstr "Crear tareas"
-
-#~ msgid "Progress (%)"
-#~ msgstr "Progreso (%)"
-
-#~ msgid "Is Scrum"
-#~ msgstr "Es scrum"
-
-#~ msgid "Opened tasks"
-#~ msgstr "Tareas abiertas"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "Info. opcional"
-
-#~ 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."
-
-#~ msgid "My opened sprints (Scrum Master)"
-#~ msgstr "Mis sprints abiertos (scrum master)"
-
-#~ msgid "Low"
-#~ msgstr "Baja"
-
-#~ msgid "My opened tasks"
-#~ msgstr "Mis tareas abiertas"
-
-#~ msgid "Project Manager"
-#~ msgstr "Responsable de proyecto"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "¿Hay algo que le bloquea?"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Opened Sprints"
-#~ msgstr "Sprints abiertos"
-
-#~ msgid "Time Spent"
-#~ msgstr "Tiempo dedicado"
-
-#~ msgid "Project Name"
-#~ msgstr "Nombre del proyecto"
-
-#~ msgid "My Sprints (Scrum Master)"
-#~ msgstr "Mis sprints (scrum master)"
-
-#~ msgid "User"
-#~ msgstr "Usuario"
-
-#~ 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."
-
-#~ msgid "Timebox"
-#~ msgstr "Periodo de tiempo"
-
-#~ msgid "Draft Sprints"
-#~ msgstr "Sprints borrador"
-
-#~ msgid "Working Time"
-#~ msgstr "Tiempo trabajado"
-
-#~ msgid "Work done"
-#~ msgstr "Trabajo realizado"
-
-#~ msgid "Date Closed"
-#~ msgstr "Fecha de cierre"
-
-#~ msgid "Assigned to"
-#~ msgstr "Asignado a"
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Warn Partner"
-#~ msgstr "Avisar empresa"
-
-#~ msgid "My Sprints (Product Owner)"
-#~ msgstr "Mis sprints (responsable de producto)"
-
-#~ msgid "Task summary"
-#~ msgstr "Resumen de tarea"
-
-#~ msgid "Warn Manager"
-#~ msgstr "Avisar responsable"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Parent Task"
-#~ msgstr "Tarea padre"
-
-#~ msgid "Very Low"
-#~ msgstr "Muy baja"
-
-#~ msgid "Timetable working hours to adjust the gantt diagram report"
-#~ msgstr ""
-#~ "Horas de trabajo del horario para ajustar el informe del diagrama de Gantt"
-
-#~ msgid "Sprints Done"
-#~ msgstr "Sprints realizados"
-
-#~ msgid "Edit Projects"
-#~ msgstr "Editar proyectos"
-
-#~ msgid "Description"
-#~ msgstr "Descripción"
-
-#~ msgid "Urgent"
-#~ msgstr "Urgente"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "¿En qué está trabajando hoy?"
-
-#~ msgid "Running"
-#~ msgstr "En proceso"
-
-#~ msgid "Scrum Team"
-#~ msgstr "Equipo scrum"
-
-#~ msgid "Scrum Project"
-#~ msgstr "Proyecto scrum"
-
-#~ msgid "Parent project"
-#~ msgstr "Proyecto padre"
-
-#~ msgid "Hours Spent"
-#~ msgstr "Horas dedicadas"
-
-#~ msgid "Context"
-#~ msgstr "Contexto"
-
-#~ msgid "Total Hours"
-#~ msgstr "Total horas"
-
-#~ msgid "Users"
-#~ msgstr "Usuarios"
-
-#~ 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."
-
-#~ msgid "Opened Backlogs"
-#~ msgstr "Backlogs abiertos"
-
-#~ msgid "Created tasks"
-#~ msgstr "Crear tareas"
-
-#~ msgid "Error ! You can not create recursive projects."
-#~ msgstr "¡Error! No puede crear proyectos recursivos."
-
-#~ msgid "Expected End"
-#~ msgstr "Fin previsto"
-
-#~ msgid "Mail Footer"
-#~ msgstr "Pie correo"
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "Scrum, método de desarrollo ágil"
-
-#~ msgid "Delegated To"
-#~ msgstr "Delegado a"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
-
-#~ 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."
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "¿Son exactas sus estimaciones de la pila de sprint?"
diff --git a/addons/project_scrum/i18n/es_AR.po b/addons/project_scrum/i18n/es_AR.po
deleted file mode 100644
index 595d6ae4a9a..00000000000
--- a/addons/project_scrum/i18n/es_AR.po
+++ /dev/null
@@ -1,1372 +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: 2012-02-08 00:37+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: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr ""
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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 "Crear tarea desde backlogs"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nombre del sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Progreso"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum master"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "Retrospectivo"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Backlog del producto"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Proyecto"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Fecha finalización"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Horas planeadas"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Provincia"
-
-#. 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
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Scrum diario"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Tareas para hoy"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Tareas desde ayer"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "Pendiente"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. 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
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint backlog"
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Fecha de reunión"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Tareas"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculado como: Tiempo dedicado / Tiempo total."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-msgstr "Backlogs borrador"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Bloqueos encontrados"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Revisión"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Sprint retrospectivo"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. 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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Responsable del producto"
-
-#. 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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-msgstr "Backlogs"
-
-#. 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.product.backlog,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. 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
-#: 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 "Vista backlogs del sprint"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Exactitud de los backlogs"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "Abierto"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Horas reales"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Horas restantes"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Característica"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-msgstr ""
-
-#. 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.sprint:0
-msgid "Planned hours"
-msgstr "Horas planeadas"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Fecha de inicio"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "Reunión scrum"
-
-#. 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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Reuniones diarias"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Días del sprint"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Progreso (0-100)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Info. del sprint"
-
-#. 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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "Datos scrum"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Detalles de tareas"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Asignar a"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Revisión del sprint"
-
-#~ msgid "All Tasks"
-#~ msgstr "Todas las Tareas"
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "Scrum, método de desarrollo ágil"
-
-#~ 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."
-
-#~ msgid "My tasks"
-#~ msgstr "Mis tareas"
-
-#~ msgid "My opened sprints (Product Owner)"
-#~ msgstr "Mis sprints abiertos (responsable de producto)"
-
-#~ msgid "Importance"
-#~ msgstr "Importancia"
-
-#~ msgid "Project Members"
-#~ msgstr "Miembros del proyecto"
-
-#~ 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."
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "Tareas delegadas"
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "¿Qué ha conseguido desde ayer?"
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "¿Es exacta su estimación del sprint backlog?"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "Proyectos scrum"
-
-#~ msgid "Subproject"
-#~ msgstr "Sub-Proyecto"
-
-#~ msgid "Very urgent"
-#~ msgstr "Urgente"
-
-#~ 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."
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Deadline"
-#~ msgstr "Fecha límite"
-
-#~ msgid "Mail Header"
-#~ msgstr "Cabecera correo"
-
-#~ 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."
-
-#~ msgid "Team Name"
-#~ msgstr "Nombre del equipo"
-
-#~ msgid "Analytic Account"
-#~ msgstr "Cuenta Analítica"
-
-#~ msgid "Partner"
-#~ msgstr "Partner"
-
-#~ msgid "Priority"
-#~ msgstr "Prioridad"
-
-#~ msgid "Medium"
-#~ msgstr "Medio"
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "Calculado como: Tiempo dedicado + Tiempo restante."
-
-#~ msgid "Internal description of the project."
-#~ msgstr "Descripción interna del proyecto."
-
-#~ 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."
-
-#~ msgid "Total Time"
-#~ msgstr "Tiempo total"
-
-#~ msgid "Projects"
-#~ msgstr "Proyectos"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para la definición de la vista !"
-
-#~ msgid "Task Details"
-#~ msgstr "Detalles de tarea"
-
-#~ msgid "Planned Time"
-#~ msgstr "Tiempo previsto"
-
-#~ msgid "Is Scrum"
-#~ msgstr "Es scrum"
-
-#~ msgid "Delay Hours"
-#~ msgstr "Retraso horas"
-
-#~ msgid "Create Tasks"
-#~ msgstr "Crear tareas"
-
-#~ msgid "Scrum Tasks"
-#~ msgstr "Tareas scrum"
-
-#~ msgid "Contact"
-#~ msgstr "Contacto"
-
-#~ msgid "My opened sprints (Scrum Master)"
-#~ msgstr "Mis sprints abiertos (scrum master)"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "Info. opcional"
-
-#~ msgid "Opened tasks"
-#~ msgstr "Tareas abiertas"
-
-#~ 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."
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Low"
-#~ msgstr "Bajo"
-
-#~ msgid "Time Spent"
-#~ msgstr "Tiempo dedicado"
-
-#~ msgid "My opened tasks"
-#~ msgstr "Mis tareas abiertas"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "¿Hay algo que le bloquea?"
-
-#~ msgid "Opened Sprints"
-#~ msgstr "Sprints abiertos"
-
-#~ msgid "Project Manager"
-#~ msgstr "Responsable de proyecto"
-
-#~ msgid "Project Name"
-#~ msgstr "Nombre del proyecto"
-
-#~ msgid "User"
-#~ msgstr "Usuario"
-
-#~ msgid "Draft Sprints"
-#~ msgstr "Sprints borrador"
-
-#~ msgid "Timebox"
-#~ msgstr "Periodo de tiempo"
-
-#~ msgid "My Sprints (Scrum Master)"
-#~ msgstr "Mis sprints (scrum master)"
-
-#~ msgid "Working Time"
-#~ msgstr "Horario de trabajo"
-
-#~ 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."
-
-#~ msgid "Work done"
-#~ msgstr "Trabajo realizado"
-
-#~ msgid "Assigned to"
-#~ msgstr "Asignado a"
-
-#~ msgid "Date Closed"
-#~ msgstr "Fecha de cierre"
-
-#~ msgid "Warn Partner"
-#~ msgstr "Advertir al partner"
-
-#~ msgid "Delegated To"
-#~ msgstr "Delegado a"
-
-#~ 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."
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Task summary"
-#~ msgstr "Resumen de Tarea"
-
-#~ msgid "My Sprints (Product Owner)"
-#~ msgstr "Mis sprints (responsable de producto)"
-
-#~ msgid "Very Low"
-#~ msgstr "Muy baja"
-
-#~ msgid "Edit Projects"
-#~ msgstr "Editar proyectos"
-
-#~ msgid "Parent Task"
-#~ msgstr "Tarea padre"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Timetable working hours to adjust the gantt diagram report"
-#~ msgstr ""
-#~ "Horas de trabajo del horario para ajustar el informe del diagrama de Gantt"
-
-#~ msgid "Description"
-#~ msgstr "Descripción"
-
-#~ msgid "Urgent"
-#~ msgstr "Urgente"
-
-#~ msgid "Running"
-#~ msgstr "En ejecución"
-
-#~ msgid "Scrum Team"
-#~ msgstr "Equipo scrum"
-
-#~ msgid "Scrum Project"
-#~ msgstr "Proyecto scrum"
-
-#~ msgid "Parent project"
-#~ msgstr "Proyecto padre"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "¿En qué está trabajando hoy?"
-
-#~ msgid "Context"
-#~ msgstr "Contexto"
-
-#~ msgid "Users"
-#~ msgstr "Usuarios"
-
-#~ msgid "Opened Backlogs"
-#~ msgstr "Backlogs abiertos"
-
-#~ msgid "Total Hours"
-#~ msgstr "Total horas"
-
-#~ msgid "Hours Spent"
-#~ msgstr "Horas dedicadas"
-
-#~ 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."
-
-#~ msgid "Created tasks"
-#~ msgstr "Crear tareas"
-
-#~ msgid "Expected End"
-#~ msgstr "Fin previsto"
-
-#~ msgid "Mail Footer"
-#~ msgstr "Pie de correo"
-
-#~ msgid "Error ! You can not create recursive projects."
-#~ msgstr "¡Error! No puede crear proyectos recursivos."
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
-#~ msgid "Scrum Task"
-#~ msgstr "Tarea scrum"
-
-#~ msgid "Type"
-#~ msgstr "Tipo"
-
-#~ msgid "Scrum Product backlog"
-#~ msgstr "Scrum backlog del producto"
-
-#~ msgid "Sprints Done"
-#~ msgstr "Sprints realizados"
-
-#~ msgid "Progress (%)"
-#~ msgstr "Progreso (%)"
-
-#~ msgid "Template"
-#~ msgstr "Plantilla"
-
-#~ msgid "Warn Manager"
-#~ msgstr "Avisar responsable"
diff --git a/addons/project_scrum/i18n/et.po b/addons/project_scrum/i18n/et.po
deleted file mode 100644
index c4efe9af353..00000000000
--- a/addons/project_scrum/i18n/et.po
+++ /dev/null
@@ -1,1362 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:57+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr ""
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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 "Loo ülesanded backlogist"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Sprindi nimi"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Edenemine"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum meister"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "Kas Teie Sprint Backlog hinnang on täpne?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "Tagasiulatuv"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-msgstr "Sea mustandiks"
-
-#. 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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "Tegevus"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Toodete Backlog"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Lõppkuupäev"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "Arvutatud kasutades ülesandel tehtud töö summat."
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "Planeerimine"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Planeeritud tunnid"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Olek"
-
-#. 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
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Päevane scrum"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "Loomise kuupäev"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Tänased ülessanded"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Ülesanded alates eilsest"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "Lahtine"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-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 "Ülesande tunnid"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Dates"
-msgstr "Kuupäevad"
-
-#. module: project_scrum
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Tühistatud"
-
-#. 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
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr "Igapäevane"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint Backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Delegate"
-msgstr "Delegeeri"
-
-#. module: project_scrum
-#: view:board.board:0
-msgid "My Board"
-msgstr "Minu laud"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Koosoleku kuupäev"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Ülesanded"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Arvutuskäik: kulutatud aeg / aeg kokku."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-msgstr "Mustan backlogid"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Kohatud tõkked"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "Töös"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Ülevaade"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Tagasiulatuv sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Märkus"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Mustand"
-
-#. 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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Toote omanik"
-
-#. 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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-msgstr "Backlogid"
-
-#. 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.product.backlog,active:0
-msgid "Active"
-msgstr "Aktiivne"
-
-#. 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
-#: view:project.scrum.backlog.merge:0
-msgid "Merge"
-msgstr "Ühenda"
-
-#. 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Backlog täpne"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Jada"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Tehtud"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Loobu"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "Avatud"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Ehfektiivsed tunnid"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Järelejäänud tunnid"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Omadus"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-msgstr ""
-
-#. 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.sprint:0
-msgid "Planned hours"
-msgstr "Planeeritud tunnid"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Alguskuupäev"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "Scrum koosolek"
-
-#. 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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Koosolekute päevakava"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Sprindi päevad"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Käimas (0-100)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Sprindi info"
-
-#. 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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "Scrum andmed"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Ülesanded detailselt"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Kellele määratud"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Sprindi ülevaade"
-
-#~ msgid "My tasks"
-#~ msgstr "Minu ülesanded"
-
-#~ msgid "Subproject"
-#~ msgstr "Alamprojekt"
-
-#~ msgid "Project Members"
-#~ msgstr "Projekti liikmed"
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "Volitatud ülesanded"
-
-#~ msgid "Importance"
-#~ msgstr "Tähtsus"
-
-#~ msgid "Very urgent"
-#~ msgstr "Väga pakiline"
-
-#~ msgid "Notes"
-#~ msgstr "Märkused"
-
-#~ msgid "Team Name"
-#~ msgstr "Tiimi nimi"
-
-#~ msgid "Mail Header"
-#~ msgstr "Kirja päis"
-
-#~ msgid "All Tasks"
-#~ msgstr "Kõik ülesanded"
-
-#~ msgid "Deadline"
-#~ msgstr "Tähtaeg"
-
-#~ msgid "Partner"
-#~ msgstr "Partner"
-
-#~ msgid "Template"
-#~ msgstr "Mall"
-
-#~ msgid "Priority"
-#~ msgstr "Prioriteet"
-
-#~ msgid "Internal description of the project."
-#~ msgstr "Projekti sisemine kirjeldus"
-
-#~ msgid "Type"
-#~ msgstr "Liik"
-
-#~ msgid "Medium"
-#~ msgstr "Keskmine"
-
-#~ msgid "Total Time"
-#~ msgstr "Aeg kokku"
-
-#~ msgid "Planned Time"
-#~ msgstr "Planeeritud aeg"
-
-#~ msgid "Projects"
-#~ msgstr "Projektid"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Vigane XML vaate arhitektuurile!"
-
-#~ msgid "Task Details"
-#~ msgstr "Ülesande üksikasjad"
-
-#~ msgid "Delay Hours"
-#~ msgstr "Edasilükkumise tunnid"
-
-#~ msgid "Contact"
-#~ msgstr "Kontakt"
-
-#~ msgid "Create Tasks"
-#~ msgstr "Loo ülesandeid"
-
-#~ msgid "Progress (%)"
-#~ msgstr "Edenemine (%)"
-
-#~ msgid "Opened tasks"
-#~ msgstr "Avatud ülesanded"
-
-#~ msgid "Sum of total hours of all tasks related to this project."
-#~ msgstr "Selle projektiga seotud ülesannete kogusumma tundides."
-
-#~ msgid "Low"
-#~ msgstr "Madal"
-
-#~ msgid "My opened tasks"
-#~ msgstr "Minu avatud ülesanded"
-
-#~ msgid "Project Manager"
-#~ msgstr "Projektihaldur"
-
-#~ msgid "Status"
-#~ msgstr "Staatus"
-
-#~ msgid "Time Spent"
-#~ msgstr "Kulutatud aeg"
-
-#~ msgid "Project Name"
-#~ msgstr "Projekti nimi"
-
-#~ msgid "User"
-#~ msgstr "Kasutaja"
-
-#~ msgid "Working Time"
-#~ msgstr "Tööaeg"
-
-#~ msgid "Work done"
-#~ msgstr "Töö tehtud"
-
-#~ msgid "Date Closed"
-#~ msgstr "Sulgemise kuupäev"
-
-#~ msgid "Assigned to"
-#~ msgstr "Omistatud"
-
-#~ msgid "Warn Partner"
-#~ msgstr "Hoiata partnerit"
-
-#~ msgid "Task summary"
-#~ msgstr "Ülesande kokkuvõte"
-
-#~ msgid "Warn Manager"
-#~ msgstr "Hoiata haldajat"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
-
-#~ msgid "Parent Task"
-#~ msgstr "Ülemülesanne"
-
-#~ msgid "Very Low"
-#~ msgstr "Väga madal"
-
-#~ msgid "Timetable working hours to adjust the gantt diagram report"
-#~ msgstr "Ajatabeli töötunnid, et kohandada gantt diagrammaruannet"
-
-#~ msgid "Edit Projects"
-#~ msgstr "Muuda Projekte"
-
-#~ msgid "Description"
-#~ msgstr "Kirjeldus"
-
-#~ msgid "Urgent"
-#~ msgstr "Kiireloomuline"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "Millega sa töötad täna ?"
-
-#~ msgid "Parent project"
-#~ msgstr "Ülemprojekt"
-
-#~ msgid "Hours Spent"
-#~ msgstr "Kulutatud tunnid"
-
-#~ msgid "Total Hours"
-#~ msgstr "Tunnid kokku"
-
-#~ msgid "Users"
-#~ msgstr "Kasutajad"
-
-#~ msgid "Created tasks"
-#~ msgstr "Loodud ülesanded"
-
-#~ msgid "Error ! You can not create recursive projects."
-#~ msgstr "Viga! Sa ei saa luua rekursiivseid projekte."
-
-#~ msgid "Expected End"
-#~ msgstr "Eeldatav lõpp"
-
-#~ msgid "Mail Footer"
-#~ msgstr "Kirja jalus"
-
-#~ msgid "My opened sprints (Product Owner)"
-#~ msgstr "Minu avatud sprindid (toote omanik)"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "Scrum, nobe arendamise meetod"
-
-#~ msgid "Scrum Product backlog"
-#~ msgstr "Scrum toodete backlog"
-
-#~ 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."
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "Kas Teie Sprint Backlog hinnang on täpne?"
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "Mida sa oled saavutanud eilsest alates?"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "Scrum projektid"
-
-#~ 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."
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Scrum Task"
-#~ msgstr "Scrum ülesanne"
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Analytic Account"
-#~ msgstr "Analüütiline konto"
-
-#~ msgid "Percent of tasks closed according to the total of tasks todo."
-#~ msgstr ""
-#~ "Suletud ülesannete protsent kõigi tegemist vajavate ülesannete hulgast."
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "Arvutuskäik: kulutatud aeg + järelejäänud aeg"
-
-#~ msgid "My opened sprints (Scrum Master)"
-#~ msgstr "Minu avatud sprindid (Scrum meister)"
-
-#~ msgid "Scrum Tasks"
-#~ msgstr "Scrum ülesanded"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "Kas on midagi, mis sind blokeerib?"
-
-#~ msgid "Opened Sprints"
-#~ msgstr "Avatud sprindid"
-
-#~ msgid "Is Scrum"
-#~ msgstr "On scrum"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "Valikuline info"
-
-#~ msgid "My Sprints (Scrum Master)"
-#~ msgstr "Minu sprindid (Scrum valdaja)"
-
-#~ 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."
-
-#~ msgid "Timebox"
-#~ msgstr "Ajalahter"
-
-#~ msgid "Draft Sprints"
-#~ msgstr "Mustand sprindid"
-
-#~ msgid "Sum of spent hours of all tasks related to this project."
-#~ msgstr "Kõigi selle projektiga seotud ülesannetele kulunud aeg."
-
-#~ msgid "Sprints Done"
-#~ msgstr "Tehtud sprindid"
-
-#~ msgid "My Sprints (Product Owner)"
-#~ msgstr "Minu sprindid (Toote omanik)"
-
-#~ 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."
-
-#~ msgid "Scrum Team"
-#~ msgstr "Scrum meeskond"
-
-#~ msgid "Scrum Project"
-#~ msgstr "Scrum projekt"
-
-#~ msgid "Sum of planned hours of all tasks related to this project."
-#~ msgstr "Kõigi selle projektiga seotud ülesannetele planeeritud aeg."
-
-#~ msgid "Context"
-#~ msgstr "Kontekst"
-
-#~ 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."
-
-#~ msgid "Delegated To"
-#~ msgstr "Delegeeritud kellele:"
-
-#~ msgid "Running"
-#~ msgstr "Töös"
diff --git a/addons/project_scrum/i18n/fr.po b/addons/project_scrum/i18n/fr.po
deleted file mode 100644
index 67f80b97fa2..00000000000
--- a/addons/project_scrum/i18n/fr.po
+++ /dev/null
@@ -1,1357 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:42+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr "_Assigner"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Auteur"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr "Qu'avez-vous fait depuis la dernière réunion ?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-"La méthodologie agile SCRUM est utilisée dans des projets de développement "
-"logiciel. Avec cette méthodologie, un sprint est une période courte (e.g. un "
-"mois) pendant laquelle l'équipe implémente une liste de backlog de produit. "
-"La revue de sprint est organisée lorsque l'équipe présente son travail au "
-"client et au directeur de produit."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Group By..."
-msgstr "Regrouper par..."
-
-#. 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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nom du Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Progression"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum Master"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr "Le sprint '%s' a été ouvert."
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"Erreur! La date de début du projet doit être antérieure à la date de fin du "
-"projet."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "Est ce que les estimations du sprint backlog sont correctes ?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "Rétrospective"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "Envoyer un courriel"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erreur ! Vous ne pouvez pas créer de tâches récursives"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Vue des backlog du projet"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-msgstr "Mettre à l'état \"Brouillon\""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
-msgid "Merge Product Backlogs"
-msgstr "Fusionner les backlogs de produits"
-
-#. 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 "Fusionner les backlogs"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr "Réunion scrum : %s"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr "Backlog"
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-"Erreur ! Vous ne pouvez pas assigner une escalade sur le même projet !"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "Tâche"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr "Heures passées"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-"La méthodologie agile SCRUM est utilisée dans des projets de développement "
-"logiciel. Avec cette méthodologie, une réunion est organisée chaque jour par "
-"le scrum master avec son équipe afin de détecter les difficultés que "
-"l'équipe rencontre/va rencontrer."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Backlog de produit"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Projet"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "Démarrer la tâche"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr "Aucun"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr "Changer l'étape"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Date de fin"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "Liens"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr "Tâche pour aujourd'hui"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr "Backlog ouvert"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr "Total des heures passées"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr "Points bloquants rencontrés :"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "Planning"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-msgstr "_Annuler"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,scrum_master_id:0
-msgid "The person who is maintains the processes for the product"
-msgstr "La personne qui maintient les processus pour le produit"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Heures planifiés"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr "Sprints"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr "Convertir en tâche"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr "Êtes-vous sûr de vouloir fusionner ces backlogs ?"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr "La personne qui peut travailler sur une tâche."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "État"
-
-#. 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
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Scrum Journalier"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr "C_onvertir"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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 "Backlogs de produit"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "Date de création"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr "Y-a-t-il quelquechose qui vous bloque ?"
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Tâches pour aujourd'hui"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Tâches depuis hier"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr "Avertissement"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "En attente"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-msgstr "Assigner le sprint aux backlogs"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,expected_hours:0
-msgid "Estimated time to do the task."
-msgstr "Temps estimé pour accomplir la tâche."
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,task_hours:0
-msgid "Task Hours"
-msgstr "Heures de travail"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Dates"
-msgstr "Dates"
-
-#. module: project_scrum
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Annulé"
-
-#. 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
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-"Bonjour, \n"
-"Je vous envoie la réunion Scrum : %s pour le Sprint '%s' du projet '%s'"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr "Quotidien"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint Backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Delegate"
-msgstr "Déléguer"
-
-#. module: project_scrum
-#: view:board.board:0
-msgid "My Board"
-msgstr "Mon tableau de bord"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr "Le sprint \"%s\" a été fermé."
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr "Progression de la tâche"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Date du rendez-vous"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Tâches"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr "Sélectionner le sprint à assigner au backlog."
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculer comme: Temps passé / Temps total"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr "Mois"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-msgstr "Arriérés brouillons"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Blocages rencontrés"
-
-#. 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 ""
-"Change l'état des backlogs de produit à ouvrir s'ils sont en état brouillon"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-msgstr "Total des heures planifiées"
-
-#. 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 "La personne qui est responsable du produit"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr "Que planifiez vous de faire d'ici la prochaine réunion ?"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Sprint du scrum"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "En cours"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr "Directeur de produit"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Critique"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Retrospective du Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Note"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Brouillon"
-
-#. module: project_scrum
-#: help:project.task,product_backlog_id:0
-msgid ""
-"Related product backlog that contains this task. Used in SCRUM methodology"
-msgstr ""
-"Backlog de produit associé qui contient les tâches. Utilisé dans la "
-"méthodologie SCRUM."
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr "Différer"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-msgstr "Information optionnelle"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
-msgid "Create Tasks from Product Backlogs"
-msgstr "Créer des tâches à partir des backlogs de produit"
-
-#. module: project_scrum
-#: help:project.project,sprint_size:0
-msgid "Number of days allocated for sprint"
-msgstr "Nombre de jours alloué au sprint"
-
-#. module: project_scrum
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Directeur de Produit"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,sequence:0
-msgid "Gives the sequence order when displaying a list of product backlog."
-msgstr "Donne l'ordre d'affichage de la liste des backlogs de produits."
-
-#. module: project_scrum
-#: model:process.node,name:project_scrum.process_node_productbacklog0
-#: view:project.scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "Backlog de produit"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-msgstr "Backlogs"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Create Task for Product Backlog"
-msgstr "Créer une tâche pour le backlog de produit"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,active:0
-msgid "Active"
-msgstr "Actif"
-
-#. 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 "Réunions de Scrum"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
-msgstr "Temps total estimé pour faire le backlog"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.merge,project_id:0
-msgid "Select project for the new product backlog"
-msgstr "Sélectionnez le projet pour le nouveau backlog de produit"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Merge"
-msgstr "Fusionner"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr "Vue du sprint du backlog"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Backlog précis"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr "Convertir en tâche"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Séquence"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr "Progression du backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Terminé"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr "Fermer"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "Ouvert"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Heures effectives"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr "Informations"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr "L'arriéré sur le produit '%s' a été converti en la tâche %d."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Heures restantes"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Fonctionnalité"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr "Mes backlogs"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-"La méthodologie agile Scrum est utilisée dans les projets de développement "
-"logiciel. Le backlog de produit est une liste de fonctionnalités à "
-"implémenter. Un backlog de produit peut être planifié dans un sprint de "
-"développement et peut être découper en plusieurs tâches. Le backlog de "
-"produit est gérer par le directeur de produit du projet."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:process.transition,name:project_scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr "Tâche du backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Planned hours"
-msgstr "Heures planifiées"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Date de début"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "Rendez-vous Scrum"
-
-#. 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 "Graphe d'avancement"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Rendez-vous Journaliers"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr "Heures estimées"
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Jours du Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Avancement (0-100)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Info sur le Sprint"
-
-#. 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 ""
-"Cochez le champ \"Actif\" pour cacher le backlog du produit sans le "
-"supprimer."
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,task_hours:0
-msgid "Estimated time of the total hours of the tasks"
-msgstr "Estimation du nombre total d'heures pour les tâches"
-
-#. module: project_scrum
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "Données Scrum"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr "Est un projet Scrum"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr "Modifier"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Détails des Tâches"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-msgstr "postpone.wizard"
-
-#. 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 ""
-"Cet assistant fusionne les backlogs et crée un nouveau backlog avec un état "
-"'Brouillon' (Les anciens backlogs seront supprimés). Et il assemble aussi "
-"les anciennes tâches des backlogs."
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr "Différer le backlog"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr "Sélectionnez le projet pour les backlogs fusionnés"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-msgstr "Mon sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,effective_hours:0
-msgid "Spent Hours"
-msgstr "Heures consommées"
-
-#. 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 ""
-"Calculé en utilisant la somme du temps passé sur toutes les tâches associées"
-
-#. 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 "Tableau de bord Scrum"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_sprint
-msgid "Project Scrum Sprint"
-msgstr "Sprint du projet Scrum"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Feature Description"
-msgstr "Description de la fonctionnalité"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr "Veuillez sélectionner un projet"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr "Merci,"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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 "Assigner le sprint"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Attribué à"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr "Êtes-vous sûr de vouloir différer le backlog ?"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr "Veuillez sélectionner au moins deux backlogs de produit"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Revue de Sprint"
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "Scrum, méthode de développement agile"
-
-#~ 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."
-
-#~ msgid "Template"
-#~ msgstr "Modèle"
-
-#~ msgid "Project Members"
-#~ msgstr "Membres du projet"
-
-#~ msgid "Mail Header"
-#~ msgstr "En-tête de courrier"
-
-#~ msgid "Partner"
-#~ msgstr "Partenaire"
-
-#~ msgid "Is Scrum"
-#~ msgstr "Est Scrum"
-
-#~ msgid "Working Time"
-#~ msgstr "Temps de travail"
-
-#~ msgid "Progress (%)"
-#~ msgstr "Progression (%)"
-
-#~ msgid "Warn Partner"
-#~ msgstr "Avertir le partenaire"
-
-#~ msgid "Scrum Product backlog"
-#~ msgstr "Retard du Produit Scrum"
-
-#~ msgid "My tasks"
-#~ msgstr "Mes Tâches"
-
-#~ msgid "My opened sprints (Product Owner)"
-#~ msgstr "Mes Sprints Ouverts (Directeur de Produit)"
-
-#~ msgid "Subproject"
-#~ msgstr "Sous-projet"
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "Qu'avez vous accompli depuis hier ?"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "Projets Scrum"
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "Tâches déléguées"
-
-#~ msgid "Importance"
-#~ msgstr "Importance"
-
-#~ msgid "Scrum Task"
-#~ msgstr "Tâche Scrum"
-
-#~ msgid "Very urgent"
-#~ msgstr "Très urgent"
-
-#~ msgid "Notes"
-#~ msgstr "Notes"
-
-#~ msgid "Team Name"
-#~ msgstr "Nom de l'équipe"
-
-#~ msgid "Analytic Account"
-#~ msgstr "Compte analytique"
-
-#~ msgid "All Tasks"
-#~ msgstr "Toutes les tâches"
-
-#~ msgid "Deadline"
-#~ msgstr "Date limite"
-
-#~ msgid "Priority"
-#~ msgstr "Priorité"
-
-#~ msgid "Type"
-#~ msgstr "Type"
-
-#~ msgid "Medium"
-#~ msgstr "Moyenne"
-
-#~ msgid "Projects"
-#~ msgstr "Projets"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valide pour l'architecture de la vue"
-
-#~ msgid "Task Details"
-#~ msgstr "Détails de la tâche"
-
-#~ msgid "Contact"
-#~ msgstr "Contact"
-
-#~ msgid "Scrum Tasks"
-#~ msgstr "Tâches Scrum"
-
-#~ msgid "Create Tasks"
-#~ msgstr "Créer tâches"
-
-#~ msgid "Opened tasks"
-#~ msgstr "Tâches ouvertes"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "Info optionelle"
-
-#~ msgid "My opened sprints (Scrum Master)"
-#~ msgstr "Mes Sprints Ouverts (Maître Scrum)"
-
-#~ msgid "Low"
-#~ msgstr "Faible"
-
-#~ msgid "My opened tasks"
-#~ msgstr "Mes Tâches Ouvertes"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "Est-ce que quelque chose vous bloque ?"
-
-#~ msgid "Status"
-#~ msgstr "État"
-
-#~ msgid "Opened Sprints"
-#~ msgstr "Sprints Ouverts"
-
-#~ msgid "My Sprints (Scrum Master)"
-#~ msgstr "Mes Sprints (Maître Scrum)"
-
-#~ msgid "User"
-#~ msgstr "Utilisateur"
-
-#~ msgid "Draft Sprints"
-#~ msgstr "Sprints Brouillon"
-
-#~ msgid "Work done"
-#~ msgstr "Travail effectué"
-
-#~ msgid "Date Closed"
-#~ msgstr "Date de fin"
-
-#~ msgid "Assigned to"
-#~ msgstr "Assigné à"
-
-#~ msgid "My Sprints (Product Owner)"
-#~ msgstr "Mes Sprints (Directeur de Produit)"
-
-#~ msgid "Task summary"
-#~ msgstr "Résumé de la tâche"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-#~ "spéciaux !"
-
-#~ msgid "Parent Task"
-#~ msgstr "Tâche parente"
-
-#~ msgid "Very Low"
-#~ msgstr "Très basse"
-
-#~ msgid "Sprints Done"
-#~ msgstr "Sprints Terminés"
-
-#~ msgid "Edit Projects"
-#~ msgstr "Éditer les Projets"
-
-#~ msgid "Description"
-#~ msgstr "Description"
-
-#~ msgid "Urgent"
-#~ msgstr "Urgent"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "Sur quoi travaillez vous aujourd'hui ?"
-
-#~ msgid "Scrum Team"
-#~ msgstr "Équipe Scrum"
-
-#~ msgid "Scrum Project"
-#~ msgstr "Projet Scrum"
-
-#~ msgid "Parent project"
-#~ msgstr "Project Parent"
-
-#~ msgid "Context"
-#~ msgstr "Contexte"
-
-#~ msgid "Users"
-#~ msgstr "Utilisateurs"
-
-#~ msgid "Opened Backlogs"
-#~ msgstr "Retards Ouverts"
-
-#~ msgid "Created tasks"
-#~ msgstr "Tâches Créées"
-
-#~ msgid "Project Name"
-#~ msgstr "Nom du Projet"
-
-#~ 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é."
-
-#~ 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."
-
-#~ 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"
-
-#~ 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"
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "Calculer comme: Temps passé + Temps restant"
-
-#~ msgid "Internal description of the project."
-#~ msgstr "Description interne du projet"
-
-#~ 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."
-
-#~ msgid "Total Time"
-#~ msgstr "Temps Total"
-
-#~ 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."
-
-#~ msgid "Delay Hours"
-#~ msgstr "Delais en heures"
-
-#~ msgid "Time Spent"
-#~ msgstr "Temps écoulé"
-
-#~ 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."
-
-#~ msgid "Project Manager"
-#~ msgstr "Responsable du projet"
-
-#~ 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."
-
-#~ msgid "Delegated To"
-#~ msgstr "Déléguer à"
-
-#~ msgid "Warn Manager"
-#~ msgstr "Avertir le responsable"
-
-#~ 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"
-
-#~ 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."
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "Est ce que les estimations du sprint backlog sont correctes ?"
diff --git a/addons/project_scrum/i18n/gu.po b/addons/project_scrum/i18n/gu.po
deleted file mode 100644
index 1c738d822ab..00000000000
--- a/addons/project_scrum/i18n/gu.po
+++ /dev/null
@@ -1,1037 +0,0 @@
-# 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-08-02 15:36+0000\n"
-"Last-Translator: Mustufa Rangwala (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: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#~ msgid "My tasks"
-#~ msgstr "મારૂ કાર્ય"
diff --git a/addons/project_scrum/i18n/hr.po b/addons/project_scrum/i18n/hr.po
deleted file mode 100644
index 878bbb50416..00000000000
--- a/addons/project_scrum/i18n/hr.po
+++ /dev/null
@@ -1,1067 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:28+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr "_Dodjeli"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Naziv skupa"
-
-#. module: project_scrum
-#: model:process.transition,note:project_scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr "Kreiraj zadatak iz backloga"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr "Što ste radili od zadnjeg sastanka?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-"Scrum agilna metodologija se koristi u projektima razvoja softvera. U ovoj "
-"metodologiji sprint je kratki period vremena (npr. 1 mjesec) u kojem tim "
-"implementira listu backlogova (preostalih poslova) produkta. Pregled sprinta "
-"se organizira kad tim prezetira svoj rad klijentu i vlasniku produkta."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Group By..."
-msgstr "Grupiraj po..."
-
-#. module: project_scrum
-#: model:process.node,note:project_scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr "Kreiraj zadatak iz preostalih zadataka"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Ime sprinta"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Napredak"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum Master"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr "Sprint '%s' je otvoren."
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"Greška! Početni datum projekta mora biti manji od završnog datuma projekta."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "Pogled unazad"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "Pošalji e-mail"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Greška! Ne možete kreirati rekurzivne zadatke."
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Pogledaj preostale zadatke projekta"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-msgstr "Postavi kao nacrt"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
-msgid "Merge Product Backlogs"
-msgstr "Spoji preostale zadatke produkta"
-
-#. 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 "Spoji preostale zadatke"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr "Scrum sastanak: %s"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr "Preostali zadaci"
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Greška! Ne možete dodjeliti eskalaciju istom projektu!"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "Zadatak"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr "U redu"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr "Utrošeni sati"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face.\r\n"
-"Scrum agilna metodologija se koristi u projektima razvoja softvera. U ovoj "
-"metodologiji, Scrum master organizira dnevne sastanke sa svojim timom kako "
-"bi otkrio poteškoće s kojima se tim susreo ili će se susresti."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Preostali zadaci produkta"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "Započni zadatak"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr "Ništa"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Završni datum"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "Poveznice"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "Izračunato kao zbroj izvršenog rada na zadatku"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr "Zadaci za danas"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr "Otvori popis preostalih zadatka"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr "Ukupno utrošeno sati"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "Planiranje"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-msgstr "_Otkaži"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Planirani sati"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr "Sprintevi"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr "Pretvori u zadatak"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr "Jeste li sigurni da želite spojiti ove preostale zadatke"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr "Odgovorni korisnik koji može raditi na zadataku"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Status"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "Pogledaj zadatke sprinta"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Dnevni Scrum"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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 "Preostali zadaci produkta"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "Datum kreiranja"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr "Da li vas nešto blokira?"
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Današnji zadaci"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Zadaci od jučer"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr "Upozorenje"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "Na čekanju"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-msgstr "Dodjeli sprintove preostali zadacima"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,expected_hours:0
-msgid "Estimated time to do the task."
-msgstr "Procjenjeno potrebno vrijeme za dovršetak zadatka."
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,task_hours:0
-msgid "Task Hours"
-msgstr "Sati zadatka"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Dates"
-msgstr "Datumi"
-
-#. module: project_scrum
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Poništeno"
-
-#. 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
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-"Pozdrav,\n"
-"Šaljem vam Scrum sastanak. %s sprinta '%s' projekta '%s'"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr "Dnevno"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Preostali zadaci sprinta"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Delegate"
-msgstr "Delegiraj"
-
-#. module: project_scrum
-#: view:board.board:0
-msgid "My Board"
-msgstr "Moja ploča"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr "Sprint %s je zatvoren"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr "Napredak zadatka"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Datum sastanka"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Zadaci"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr "Odaberite sprint za dodjelu preostalih zadataka"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Izračunato kao: Utrošeno vrijeme/Ukupno vrijeme"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr "Mjesec"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Pronađene blokade"
-
-#. 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 ""
-"Promjeni status preostalih zahtjeva produkta radi otvaranja ako je u statusu "
-"nacrta."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-msgstr "Ukupno planirani sati"
-
-#. 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 "Osoba koja je odgovorna za produkt"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr "Što planirate raditi do sljedećeg sastanka?"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr "Vlasnik produkta"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Provjera"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Sprint pogled unazad"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Bilješka"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Nacrt"
-
-#. module: project_scrum
-#: help:project.task,product_backlog_id:0
-msgid ""
-"Related product backlog that contains this task. Used in SCRUM methodology"
-msgstr ""
-"Povezani preostali zadaci produkta koji sadrže zadatak. Korišteni u SCRUM "
-"metodologiji."
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr "Odgodi"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-msgstr "Dodatne informacije"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
-msgid "Create Tasks from Product Backlogs"
-msgstr "Kreiraj zadatke iz preostalih zadataka produkta"
-
-#. module: project_scrum
-#: help:project.project,sprint_size:0
-msgid "Number of days allocated for sprint"
-msgstr "Broj dana dodjeljnih sprintu"
-
-#. module: project_scrum
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Vlasnik produkta"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,sequence:0
-msgid "Gives the sequence order when displaying a list of product backlog."
-msgstr ""
-"Daje poredak sekvence prilikom prikaza liste preostalih zadataka produkta."
-
-#. module: project_scrum
-#: model:process.node,name:project_scrum.process_node_productbacklog0
-#: view:project.scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "Preostali zadaci produkta"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-msgstr "Preostali zadaci"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Create Task for Product Backlog"
-msgstr "Kreiraj zadatke za preostale zadatke produkta"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,active:0
-msgid "Active"
-msgstr "Aktivan"
-
-#. 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 "Scrum sastanci"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
-msgstr "Procjenjeno ukupno vrijeme za izvršenje preostalih zadataka"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.merge,project_id:0
-msgid "Select project for the new product backlog"
-msgstr "Odaberi projekt za novu listu preostalih zadataka produkta"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Merge"
-msgstr "Spoji"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr "Pogledaj preostale zadatke sprinta"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr "Pretvori u zadatak"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-"Ako imate (?) u imenu projekta, znači da nema analitičkog konta vezanog uz "
-"projekt."
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Sekvenca"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr "Napredak preostalih zadataka"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Izvršeno"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Odustani"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr "Zatvori"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "_"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Efektivni sati"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr "Informacija"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr "Preostali zadatak produkta '%s' je pretvoren u zadatak %d."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Preostali sati"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr "Odgovoran"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Značajka"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr "Moji presotali zadaci"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-"Scrum agilna metodologija se koristi u procesu razvoja softvera. Preostali "
-"zadaci produkta je lista značajki za implementaciju. Preostali zadaci "
-"produkta planiraju se u razvojnom sprintu (skupu) i mogu biti razdvojeni na "
-"više zadataka. Listom preostalih zadaka produkta upravlja vlasnik produkta "
-"na projektu."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:process.transition,name:project_scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr "Zadatak liste preostalih zadataka"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Planned hours"
-msgstr "Planirani sati"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Početni datum"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "Scrum sastanak"
-
-#. 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 "Burndown chart - prikaz preostalog posla"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Dnevni sastanci"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr "Očekivani sati"
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Dani sprinta"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Napredak (0-100)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Sprint info"
-
-#. 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 ""
-"Ako je aktivno polje postavljeno na DA, omogućit će vam skrivanje liste "
-"preostalih zadataka produkta bez uklanjanja."
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,task_hours:0
-msgid "Estimated time of the total hours of the tasks"
-msgstr "Procjenjeno  vrijeme ukupnih sati zadataka"
-
-#. module: project_scrum
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "Scrum podaci"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr "je Scrum projekt"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr "Uredi"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Detalji zadatka"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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 ""
-"Ovaj asistent spaja liste preostalih zadataka i kreira jednu novu listu u "
-"statusu Nacrt (stare liste preostalih zadataka će biti izbrisane). Također "
-"spaja stare zadatke iz liste preostalih zadataka."
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr "Odgodi preostale zadatke"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr "Odaberite projekt za spojene liste preostalih zadataka"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-msgstr "Moj sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,effective_hours:0
-msgid "Spent Hours"
-msgstr "Utrošeni sati"
-
-#. 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 ""
-"Izračunato korištenjem sume utrošenog vremena svakog povezanog zadatka"
-
-#. 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 "Scrum nadzorna ploča"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_sprint
-msgid "Project Scrum Sprint"
-msgstr "Scrum sprint projekta"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Feature Description"
-msgstr "Opis značajki"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr "Molim odaberite neki projekt"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr "Hvala"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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 "Dodjeli sprint"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Dodjeljen"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr "Jeste li sigurni da želite odgoditi listu preostalih zadataka"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr "Molim odaberite bar dvije liste preostalih zadataka produkta"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Pregled sprinta"
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "Scrum, agilna metoda razvoja"
diff --git a/addons/project_scrum/i18n/hu.po b/addons/project_scrum/i18n/hu.po
deleted file mode 100644
index 4645628487a..00000000000
--- a/addons/project_scrum/i18n/hu.po
+++ /dev/null
@@ -1,1042 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:37+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Megbeszélés megnevezése"
-
-#. module: project_scrum
-#: model:process.transition,note:project_scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr "Feladat létrehozása a hátralékból"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Szerző"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr "Mi történt a legutóbbi megbeszélés óta?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Group By..."
-msgstr "Csoportosítás..."
-
-#. module: project_scrum
-#: model:process.node,note:project_scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr "Feladat létrehozása a hátralékokból"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Sprint megnevezése"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Folyamat"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum Master"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"Hiba! A projekt kezdő dátumának előbbinek kell lennie, mint a projekt "
-"befejező dátumának."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "Pontos a Sprint elmaradás becslése?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "E-mail küldése"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Hiba! Nem hozhat létre rekurzív feladatokat."
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Projekt elmaradásainak nézete"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-msgstr "Beállítás tervezetnek"
-
-#. 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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr "Hátralékok egyesítése"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr "Scrum megbeszélés : %s"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr "Emaradás/Hátralék"
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "Feladat"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr "Eltöltött órák"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Termékhátralék"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "Feladat kezdete"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr "Semmi"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Befejező dátum"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "Hivatkozások"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr "Mai feladatok"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "Tervezés"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Tervezett órák"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr "Sprintek"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr "Biztos benne, hogy egyesíteni szeretné ezeket a hátralékokat?"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Állapot"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "Sprint feladatok nézete"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Napi scrum"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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 "Termékhátralékok"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "Létrehozás dátuma"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Mai feladatok"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Feladatok tegnap óta"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr "Figyelem"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "Függőben lévő"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-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 "Feladattal eltöltött órák száma"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Dates"
-msgstr "Dátumok"
-
-#. module: project_scrum
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Projekt feladatainak nézete"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr "Napi"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint hátralék"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Delegate"
-msgstr "Megbízott"
-
-#. module: project_scrum
-#: view:board.board:0
-msgid "My Board"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Megbeszélés időpontja"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Feladatok"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Kiszámítható: Eltöltött idő / Teljes idő"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr "Hónap"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-msgstr "Összes tervezett óra"
-
-#. 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 "A személy, aki ezért a termékért felelős"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr "Mit tervez a következő megbeszélésig?"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum Sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr "Terméktulajdonos"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Megjegyzés"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Tervezet"
-
-#. 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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr "Elhalasztás"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-msgstr "Opcionális információk"
-
-#. 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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Terméktulajdonos"
-
-#. 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:process.node,name:project_scrum.process_node_productbacklog0
-#: view:project.scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "Termékhátralák"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-msgstr "Elmaradások/hátralékok"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Create Task for Product Backlog"
-msgstr "Termékhátralékból létrehozott feladat"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,active:0
-msgid "Active"
-msgstr "Aktív"
-
-#. 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 "Scrum megbeszélések"
-
-#. 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
-#: 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 "Sprint hátralék nézet"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Sorszám"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Kész"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr "Információ"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Hátralévő idő"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr "Felelős"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr "Elmaradásaim"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr "Tervezett órák"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Indulás dátuma"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "Scrum megbeszélés"
-
-#. 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 "Burndown diagram"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Napi megbeszélések"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Sprint napok"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Folyamat (0-100)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Sprint információ"
-
-#. 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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "Scrum adat"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr "Szerkesztés"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Feladatok részletei"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-msgstr "postpone.wizard"
-
-#. 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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr "Elhalasztott elmaradások"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,effective_hours:0
-msgid "Spent Hours"
-msgstr "Eltöltött órák"
-
-#. 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 "Scrum vezérlőpult"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_sprint
-msgid "Project Scrum Sprint"
-msgstr "Projekt Scrum Sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Feature Description"
-msgstr "Jellemző leírása"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr "Kérjük, válassza ki a projektet."
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr "Köszönöm,"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "Scrum: Gyors feljesztési módszer"
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "Pontos a Sprint elmaradás becslése?"
diff --git a/addons/project_scrum/i18n/id.po b/addons/project_scrum/i18n/id.po
deleted file mode 100644
index 2315ac4c12d..00000000000
--- a/addons/project_scrum/i18n/id.po
+++ /dev/null
@@ -1,1033 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+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: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
diff --git a/addons/project_scrum/i18n/it.po b/addons/project_scrum/i18n/it.po
deleted file mode 100644
index 7e3edea2370..00000000000
--- a/addons/project_scrum/i18n/it.po
+++ /dev/null
@@ -1,1214 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:32+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr "_Assegna"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Autore"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Group By..."
-msgstr "Raggruppa per..."
-
-#. module: project_scrum
-#: model:process.node,note:project_scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nome Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Avanzamento"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Responsabile Scrum"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-"Errore! La data inizio del progetto deve essere antecedente alla data fine."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "Sono accurate le tue stime sugli Sprint arretrati ?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "Cronologia"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "Invia Email"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Errore ! Non è possibile creare attività ricorsive."
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-msgstr "Imposta a \"Bozza\""
-
-#. 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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "Attività"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Cronologia Prodotto"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Progetto"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "Inizia Attività"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr "Nessuno"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr "Cambia stadio"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Data Fine"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "Collegamenti"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-"Calcolato utilizzando la somma del lavoro eseguito all'interno dell'attività."
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr "Attività per oggi"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "Pianificazione"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-msgstr "_Annulla"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Ore pianificate"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr "Converti ad attività"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Stato"
-
-#. 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
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Scrum Giornaliero"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "Data creazione"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Attività di Oggi"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Attività da Ieri"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr "Attenzione"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "In attesa"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-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 "Ore attività"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Dates"
-msgstr "Date"
-
-#. module: project_scrum
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Annullato"
-
-#. 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
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr "Giornaliero"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint Arretrati"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Delegate"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-msgid "My Board"
-msgstr "La Mia Board"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Data Riunione"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Attività"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calcolato come: Tempo impiegato / Tempo totale."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr "Mese"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-msgstr "Bozza Arretrati"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Ostacoli incontrati"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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 "La persona che è responsabile per il prodotto"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Sprint Scrum"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr "Proprietario prodotto"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Revisione"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Cronologia Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Bozza"
-
-#. 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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr "Posticipa"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-msgstr "Info opzionali"
-
-#. 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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Titolare Prodotto"
-
-#. 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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-msgstr "Cronomogie"
-
-#. 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.product.backlog,active:0
-msgid "Active"
-msgstr "Attivo"
-
-#. 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
-#: view:project.scrum.backlog.merge:0
-msgid "Merge"
-msgstr "Unisci"
-
-#. 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Cronologia Accurata"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr "Converti ad attività"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-"Se hai [?] nel nome progetto, significa che non ci sono conti analitici "
-"collegati al progetto."
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Sequenza"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Completato"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Annulla"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "Aperto"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Ore Effettive"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr "Informazioni"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Ore Rimanenti"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr "Responsabile"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Caratteristica"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr "Ore Pianificate"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Data di inizio"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "Riunione Scrum"
-
-#. 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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Riunione Quotidiana"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Giorni Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Progresso (0-100)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Informazioni Sprint"
-
-#. 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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Dettagli Attività"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Assegna A"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Revisione Sprint"
-
-#~ msgid "Scrum Product backlog"
-#~ msgstr "Lavoro Arretrato"
-
-#~ msgid "My tasks"
-#~ msgstr "Le Mie Attività"
-
-#~ msgid "My opened sprints (Product Owner)"
-#~ msgstr "I Miei Sprint Aperti (Titolare Prodotto)"
-
-#~ msgid "Subproject"
-#~ msgstr "Sottoprogetto"
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "Cosa hai fatto da ieri ?"
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "Sono accurate le tue stime sugli Sprint arretrati ?"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "Progetti"
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "Attività delegate"
-
-#~ msgid "Importance"
-#~ msgstr "Importanza"
-
-#~ msgid "Scrum Task"
-#~ msgstr "Attività Scrum"
-
-#~ msgid "Very urgent"
-#~ msgstr "Molto Urgente"
-
-#~ msgid "Notes"
-#~ msgstr "Note"
-
-#~ msgid "Team Name"
-#~ msgstr "Nome Team"
-
-#~ msgid "Analytic Account"
-#~ msgstr "Contabilità Analitica"
-
-#~ msgid "All Tasks"
-#~ msgstr "Tutte le attività"
-
-#~ msgid "Deadline"
-#~ msgstr "Scadenza"
-
-#~ msgid "Priority"
-#~ msgstr "Priorità"
-
-#~ msgid "Type"
-#~ msgstr "Tipo"
-
-#~ msgid "Medium"
-#~ msgstr "Medio"
-
-#~ msgid "Projects"
-#~ msgstr "Progetti"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML non valido per Visualizzazione Architettura!"
-
-#~ msgid "Task Details"
-#~ msgstr "Dettagli Attività"
-
-#~ msgid "Contact"
-#~ msgstr "Contatto"
-
-#~ msgid "Scrum Tasks"
-#~ msgstr "Attività Scrum"
-
-#~ msgid "Create Tasks"
-#~ msgstr "Crea Attività"
-
-#~ msgid "Is Scrum"
-#~ msgstr "è Scrum"
-
-#~ msgid "Opened tasks"
-#~ msgstr "Attività Aperte"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "Informazioni Opzionali"
-
-#~ msgid "My opened sprints (Scrum Master)"
-#~ msgstr "I Miei Sprint Aperti (Responsabile Scrum)"
-
-#~ msgid "Low"
-#~ msgstr "Bassa"
-
-#~ msgid "My opened tasks"
-#~ msgstr "Le Mie Attività Aperte"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "Qualcosa di ostacola ?"
-
-#~ msgid "Status"
-#~ msgstr "Stato"
-
-#~ msgid "Opened Sprints"
-#~ msgstr "Sprint Aperti"
-
-#~ msgid "My Sprints (Scrum Master)"
-#~ msgstr "I Miei Sprint (Responsabile Scrum)"
-
-#~ msgid "User"
-#~ msgstr "Utente"
-
-#~ msgid "Timebox"
-#~ msgstr "Periodo Inderogabile"
-
-#~ msgid "Draft Sprints"
-#~ msgstr "Bozze Sprint"
-
-#~ msgid "Work done"
-#~ msgstr "Lavoro Eseguito"
-
-#~ msgid "Date Closed"
-#~ msgstr "Data di Fine"
-
-#~ msgid "Assigned to"
-#~ msgstr "Assegnato a"
-
-#~ msgid "My Sprints (Product Owner)"
-#~ msgstr "I Miei Sprint (Responsabile Prodotto)"
-
-#~ msgid "Task summary"
-#~ msgstr "Riassunto Attività"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
-#~ "speciali!"
-
-#~ msgid "Parent Task"
-#~ msgstr "Attività Superiore"
-
-#~ msgid "Very Low"
-#~ msgstr "Molto Bassa"
-
-#~ msgid "Sprints Done"
-#~ msgstr "Sprint Completato"
-
-#~ msgid "Edit Projects"
-#~ msgstr "Modifica Progetti"
-
-#~ msgid "Description"
-#~ msgstr "Descrizione"
-
-#~ msgid "Urgent"
-#~ msgstr "Urgente"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "Su cosa lavorerai oggi ?"
-
-#~ msgid "Scrum Team"
-#~ msgstr "Team Scrum"
-
-#~ msgid "Scrum Project"
-#~ msgstr "Progetto Scrum"
-
-#~ msgid "Parent project"
-#~ msgstr "Progetto Superiore"
-
-#~ msgid "Context"
-#~ msgstr "Contesto"
-
-#~ msgid "Users"
-#~ msgstr "Utenti"
-
-#~ msgid "Opened Backlogs"
-#~ msgstr "Cronologie Aperte"
-
-#~ msgid "Created tasks"
-#~ msgstr "Attività Create"
diff --git a/addons/project_scrum/i18n/ja.po b/addons/project_scrum/i18n/ja.po
deleted file mode 100644
index 928ba2ed0e8..00000000000
--- a/addons/project_scrum/i18n/ja.po
+++ /dev/null
@@ -1,1044 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-20 17:12+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "著者"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr "最終ミーティング以降、何を行いましたか？"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr "スプリント月"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-"スクラムのアジャイル方法論はソフトウェア開発プロジェクトで使用されます。この方法論では、スプリントはチームが製品バックログのリストを実装する短い期間（例え"
-"ば1ヶ月）です。チームが顧客と製品所有者にその作業を提示した時に、スプリントレビューは編成されます。"
-
-#. 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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "スプリント名"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "進捗"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "スクラムマスター"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr "スプリント %s は開かれました。"
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "エラー。プロジェクトの開始日はプロジェクトの終了日より前である必要があります。"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "スプリントバックログの見積は正確ですか？"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "ふりかえり"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "Eメール送信"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "エラー。再帰的なタスクを作成することはできません。"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr "スプリント進行中"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr "委任状態への変更"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr "製品バックログ %s はスプリント %s に割り当てられます。"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "製品のバックログを見る"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr "バックログの統合"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr "スクラムミーティング：%s"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr "バックログ"
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "エラー。同じプロジェクトに拡大の割当はできません。"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "タスク"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr "OK"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr "消費時間"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-"スクラムアジャイル方法論はソフトウェア開発プロジェクトで使用されます。この方法論は、チームが直面する困難さを検出するために、そのチームの日次ミーティングが"
-"スクラムマスターによって計画されます。"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr "バックログを現在のスプリントに割当"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr "タスクキャンセルのため"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "製品バックログ"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "プロジェクト"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "タスク開始"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr "None"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr "工程変更"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "終了日"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "リンク"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "タスク作業完了の合計を使用して計算されます。"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr "今日のタスク"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr "バックログを開く"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr "合計スプリント時間"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr "保留中スプリント"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr "ブロッキングポイントが発生："
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr "バックログがスプリントに未割当"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "計画"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "計画時間数"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr "スプリント"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr "タスクに変換"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr "本当にそれらのバックログを統合しますか？"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr "タスクで作業する責任ユーザ"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "状態"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "スプリントタスクを表示"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr "新規"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "毎日のスクラム"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr "変換"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Eメール作成ウィザード"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "作成日"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr "何か阻害要因はありますか？"
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "スクラム"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "本日のタスク"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "昨日からのタスク"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr "警告"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "キャンセル済"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "プロジェクトタスクの表示"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-"こんにちは、\n"
-"スクラムミーティングを送信しています：%s スプリント %s プロジェクト %s"
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr "スプリント %s は閉じられました。"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr "タスクの進捗"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "ミーティング日"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "タスク"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr "バックログ割当のためのスプリントを選択"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "計算式：消費時間 / 合計時間"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr "月"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr "次回ミーティングまでに何を行う予定ですか？"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "スクラムのスプリント"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "進行中"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr "製品所有者"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "レビュー"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "スプリントのふりかえり"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "注記"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr "延期"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr "タイプの変更"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr "完了状態への変更"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr "新規スプリント"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "正確なバックログ"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr "タスクに変換"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "順序"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr "バックログの進捗"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "完了"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "キャンセル"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr "閉じる"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "開く"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "有効な時間数"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr "情報"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr "製品バックログ %s はタスク %d に変換されます。"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "残り時間数"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "エラー。タスクの終了日は開始日以降の日付に設定しなければなりません。"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr "担当"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "機能"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr "私のバックログ"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr "進行中のバックログ"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr "スプリントの表示"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-"スクラムアジャイル方法論はソフトウェア開発プロジェクトで使用されます。製品バックログは実装される機能のリストです。製品バックログは開発のスプリントの中に計"
-"画され、複数のタスクに分割されるかもしれません。製品バックログはプロジェクトの製品所有者により管理されます。"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr "計画時間数"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "開始日"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "日次ミーティング"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr "予想時間数"
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "スプリント日数"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "進捗（0-100）"
-
-#. 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 "アクティブ項目をTrueにセットした場合、製品バックログを削除することなく非表示にできます。"
-
-#. 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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "スクラムデータ"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr "スクラムプロジェクト"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr "編集"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "タスク詳細"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr "バックログの延期"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr "バックログ統合のためのプロジェクトを選択"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr "プロジェクトを選択して下さい。"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr "ありがとうございます。"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "割当先"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr "本当にバックログの延期をしますか？"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr "開く状態に変更"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "スプリント"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr "少なくとも２つの製品バックログを選択して下さい。"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "スプリントのレビュー"
diff --git a/addons/project_scrum/i18n/ko.po b/addons/project_scrum/i18n/ko.po
deleted file mode 100644
index 7855477c329..00000000000
--- a/addons/project_scrum/i18n/ko.po
+++ /dev/null
@@ -1,1347 +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.
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:23+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: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "스프린트 이름"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "진행"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "스크럼 마스터"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "귀하의 '스프린트 백로그' 추정이 정확한가요?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "소급성"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "프로젝트 백로그 보기"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "상품 백로그"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "프로젝트"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "종료 날짜"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "완료된 과제 작업의 합으로 계산됨."
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "계획된 시간"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "상태"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "스프린트 과제 보기"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "일간 스크럼"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "스크럼"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "오늘 할 일"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "어제 이후 업무"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "취소됨"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "프로젝트 과제 보기"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "미팅 날짜"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "과제"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "계산: 소요 시간/ 총 시간"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "스크럼 스프린트"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "진행중"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "검토"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "스프린트 회고"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "노트"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "백로그 정확성"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "시퀀스"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "완료"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "취소"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "열기"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "효과적인 시간"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "남은 시간"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "특성"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr "계획된 시간"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "시작 날짜"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "일일 미팅"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "스프린트 데이"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "진행 (0-100)"
-
-#. 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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "스크럼 데이터"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "과제 상세 정보"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "할당받을 이"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "스프린트"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "스프린트 검토"
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "스크럼, 애자일 개발 방법"
-
-#~ msgid "Scrum Product backlog"
-#~ msgstr "상품 백로그 스크럼"
-
-#~ msgid ""
-#~ "Total remaining time, can be re-estimated periodically by the assignee of "
-#~ "the task."
-#~ msgstr "총 남은 시간은 과제 담당자에 의해 주기적으로 재평가될 수 있습니다."
-
-#~ msgid "Template"
-#~ msgstr "템플릿"
-
-#~ msgid "My tasks"
-#~ msgstr "내 과제"
-
-#~ msgid "My opened sprints (Product Owner)"
-#~ msgstr "내 오픈된 스프린트 (상품 소유자)"
-
-#~ msgid "Scrum Task"
-#~ msgstr "스크럼 과제"
-
-#~ msgid "Importance"
-#~ msgstr "중요성"
-
-#~ msgid "Project Members"
-#~ msgstr "프로젝트 멤버"
-
-#~ msgid ""
-#~ "Header added at the beginning of the email for the warning message sent to "
-#~ "the customer when a task is closed."
-#~ msgstr "과제가 마감될 때 고객에게 송달되는 알림 이메일의 앞부분에 추가되는 헤더"
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "위임된 과제"
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "어제 이후로 귀하가 성취한 것은 무엇인가요?"
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "귀하의 '스프린트 백로그' 추정이 정확한가요?"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "스크럼 프로젝트"
-
-#~ msgid "Subproject"
-#~ msgstr "하위 프로젝트"
-
-#~ msgid "Notes"
-#~ msgstr "노트"
-
-#~ msgid ""
-#~ "Project's member. Not used in any computation, just for information purpose."
-#~ msgstr "프로젝트 멤버. 계산 목적이 아니라 단지 정보 목적임."
-
-#~ msgid "Very urgent"
-#~ msgstr "매우 긴급"
-
-#~ msgid ""
-#~ "If you check this field, the project manager will receive a request each "
-#~ "time a task is completed by his team."
-#~ msgstr "이 필드를 체크하면, 팀 멤버에 의해 과제가 종료될 때 마다, 프로젝트 관리자가 요청을 접수하게 됩니다."
-
-#~ msgid ""
-#~ "Estimated time to do the task, usually set by the project manager when the "
-#~ "task is in draft state."
-#~ msgstr "과제에 소요될 추정 시간으로 보통 과제가 초안 상태일 때 프로젝트 관리자에 의해 설정됨."
-
-#~ msgid "Deadline"
-#~ msgstr "마감시한"
-
-#~ msgid "Mail Header"
-#~ msgstr "메일 헤더"
-
-#~ 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 "여기를 체크하면, 과제를 마감할 때마다 고객에게 이메일 전송을 제안하는 팝업 창이 뜹니다."
-
-#~ msgid "All Tasks"
-#~ msgstr "모든 과제"
-
-#~ msgid "Analytic Account"
-#~ msgstr "분석 계정"
-
-#~ msgid "Team Name"
-#~ msgstr "팀 이름"
-
-#~ msgid "Type"
-#~ msgstr "타입"
-
-#~ msgid "Priority"
-#~ msgstr "우선순위"
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "계산: 소요 시간 + 남은 시간"
-
-#~ msgid "Internal description of the project."
-#~ msgstr "프로젝트에 대한 내부 설명"
-
-#~ msgid "Percent of tasks closed according to the total of tasks todo."
-#~ msgstr "해야할 과제의 합계 대비 마감된 과제들의 비율"
-
-#~ msgid "Partner"
-#~ msgstr "파트너"
-
-#~ msgid "Total Time"
-#~ msgstr "총 시간"
-
-#~ msgid "Projects"
-#~ msgstr "프로젝트"
-
-#~ msgid "Task Details"
-#~ msgstr "과제 상세 내용"
-
-#~ msgid "Planned Time"
-#~ msgstr "계획된 시간"
-
-#~ msgid "Progress (%)"
-#~ msgstr "진행 (%)"
-
-#~ msgid "Create Tasks"
-#~ msgstr "과제 생성"
-
-#~ msgid "Delay Hours"
-#~ msgstr "지연 시간"
-
-#~ msgid "Scrum Tasks"
-#~ msgstr "스크럼 과제"
-
-#~ msgid "Contact"
-#~ msgstr "연락"
-
-#~ msgid "My opened sprints (Scrum Master)"
-#~ msgstr "내 오픈된 스프린트 (스크럼 마스터)"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "추가 정보"
-
-#~ msgid "Opened tasks"
-#~ msgstr "오픈된 과제들"
-
-#~ msgid "Is Scrum"
-#~ msgstr "은/는 스크럼입니다."
-
-#~ msgid "Sum of total hours of all tasks related to this project."
-#~ msgstr "이 프로젝트에 관련된 모든 과제들의 총 시간 합계"
-
-#~ msgid "Opened Sprints"
-#~ msgstr "오픈된 스프린트들"
-
-#~ msgid "Low"
-#~ msgstr "낮음"
-
-#~ msgid "Time Spent"
-#~ msgstr "소요 시간"
-
-#~ msgid "My opened tasks"
-#~ msgstr "내 오픈된 과제들"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "귀하를 방해하는 무엇이 있습니까?"
-
-#~ msgid "Status"
-#~ msgstr "상태"
-
-#~ msgid "Project Manager"
-#~ msgstr "프로젝트 매니저"
-
-#~ msgid "User"
-#~ msgstr "사용자"
-
-#~ msgid "Draft Sprints"
-#~ msgstr "스프린트 초안"
-
-#~ msgid "Timebox"
-#~ msgstr "타임박스"
-
-#~ msgid "My Sprints (Scrum Master)"
-#~ msgstr "내 스프린트 (스크럼 마스터)"
-
-#~ 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 "계산: 총 시간 - 추정 시간. 프로젝트 매니저가 추정한 소요 시간과 실제 과제 마감 시간 간의 차이"
-
-#~ msgid "Project Name"
-#~ msgstr "프로젝트 이름"
-
-#~ msgid "Work done"
-#~ msgstr "작업 완료"
-
-#~ msgid "Assigned to"
-#~ msgstr "할당받은 사람"
-
-#~ msgid "Date Closed"
-#~ msgstr "마감된 날짜"
-
-#~ msgid "Working Time"
-#~ msgstr "작업 시간"
-
-#~ msgid "Delegated To"
-#~ msgstr "위임받은 자"
-
-#~ msgid "Sum of spent hours of all tasks related to this project."
-#~ msgstr "이 프로젝트에 관련된 모든 과제에 소요된 시간 합계"
-
-#~ msgid "Sum of planned hours of all tasks related to this project."
-#~ msgstr "이 프로젝트에 관련된 모든 과제의 계획 시간 합계"
-
-#~ msgid "Sprints Done"
-#~ msgstr "완료된 스프린트"
-
-#~ msgid "Very Low"
-#~ msgstr "매우 낮음"
-
-#~ msgid "Parent Task"
-#~ msgstr "부모 과제"
-
-#~ msgid "Timetable working hours to adjust the gantt diagram report"
-#~ msgstr "가트 다이어그램 리포트를 조정하기 위한 작업 시간표"
-
-#~ msgid "Description"
-#~ msgstr "설명"
-
-#~ msgid "Edit Projects"
-#~ msgstr "프로젝트 편집"
-
-#~ msgid "Urgent"
-#~ msgstr "긴급"
-
-#~ msgid "Scrum Project"
-#~ msgstr "스크럼 프로젝트"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "오늘 어떤 일을 하셨습니까?"
-
-#~ msgid "Scrum Team"
-#~ msgstr "스크럼 팀"
-
-#~ msgid "Context"
-#~ msgstr "문맥"
-
-#~ msgid "Users"
-#~ msgstr "사용자"
-
-#~ msgid "Total Hours"
-#~ msgstr "총 시간"
-
-#~ msgid "Hours Spent"
-#~ msgstr "소요 시간"
-
-#~ msgid ""
-#~ "Footer added at the beginning of the email for the warning message sent to "
-#~ "the customer when a task is closed."
-#~ msgstr "과제가 마감될 때 고객에게 전송되는 알림 메일에 첨부되는 푸터"
-
-#~ msgid "Parent project"
-#~ msgstr "부모 프로젝트"
-
-#~ msgid "Opened Backlogs"
-#~ msgstr "오픈된 백로그들"
-
-#~ msgid "Created tasks"
-#~ msgstr "생성된 과제들"
-
-#~ msgid "Expected End"
-#~ msgstr "예상 마감일"
-
-#~ msgid "Mail Footer"
-#~ msgstr "메일 Footer"
-
-#~ msgid "Error ! You can not create recursive projects."
-#~ msgstr "에러! 자기 참조 프로젝트를 생성할 수는 없습니다."
-
-#~ 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 ""
-#~ "프로젝트에 대한 재무 관리가 필요하면 이 프로젝트를 분석 계정에 링크하십시오. 예산, 계획, 원가 및 수입 분석, 프로젝트 타임시트 등을 "
-#~ "수행할 수 있습니다."
-
-#~ msgid "Medium"
-#~ msgstr "중간"
-
-#~ msgid "Warn Partner"
-#~ msgstr "파트너에게 알림"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "액션 정의에서 유효하지 않은 모델 이름"
-
-#~ msgid "Task summary"
-#~ msgstr "과제 요약"
-
-#~ msgid "Running"
-#~ msgstr "실행 중"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
-
-#~ msgid "Warn Manager"
-#~ msgstr "매니저에게 알림"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "유효하지 않은 아키텍처를 위한 XML 보기!"
-
-#~ msgid "My Sprints (Product Owner)"
-#~ msgstr "나의 스프린트 (상품 소유자)"
diff --git a/addons/project_scrum/i18n/lt.po b/addons/project_scrum/i18n/lt.po
deleted file mode 100644
index af20260e598..00000000000
--- a/addons/project_scrum/i18n/lt.po
+++ /dev/null
@@ -1,1033 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+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: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
diff --git a/addons/project_scrum/i18n/nl.po b/addons/project_scrum/i18n/nl.po
deleted file mode 100644
index f4ff5f0128c..00000000000
--- a/addons/project_scrum/i18n/nl.po
+++ /dev/null
@@ -1,1390 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:48+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr "_Toewijzen"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Auteur"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr "Wat heb je gedaan sinds de laatste vergadering?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr "Sprint maand"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-"De scrum agile methode wordt gebruikt in software ontwikkel projecten. In "
-"deze methode is een sprint een korte periode (bijv. een maand) waarbinnen "
-"het team een lijst van product backlogs implementeert. De sprint review "
-"wordt georganiseerd als het team haar werk presenteert aan de klant en "
-"product owner."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Group By..."
-msgstr "Groepeer op..."
-
-#. 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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Naam sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Voortgang"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum Master"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr "De sprint '%s' is geopend."
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Fout! Project startdatum moet liggen voor project einddatum."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "Is uw sprint backlog inschatting nauwkeurig?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "Evaluatie"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "Email verzenden"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Fout! U kunt geen recursieve taken aanmaken."
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr "Lopende sprints"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr "Hiermee wijzigt u naar de delegeer status"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr "Product backlog '%s'is toegewezen aan %s"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-msgstr "Naar Concept"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
-msgid "Merge Product Backlogs"
-msgstr "Product Backlogs samenvoegen"
-
-#. 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 "Backlogs samenvoegen"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr "Scrum Meeting : %s"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr "Backlog"
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Fout! U kunt geen escalatie toewijzen aan hetzelfde project!"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "Taak"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr "Gewerkte uren"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-"De scrum agile methode wordt gebruikt in software ontwikkeling projecten. In "
-"deze methode wordt dagelijks een meeting georganiseerd door de scrum master "
-"met zijn team om de moeilijkheden te ontdekken die het team heeft/zal "
-"tegenkomen."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr "Backlogs toegewezen aan huidige sprints"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr "Hiermee annuleert u de taak"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Product backlog"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Project"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "Taak starten"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr "Geen"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr "Stadium wijzigen"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Einddatum"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "Links"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr "Taak voor vandaag"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr "Open Backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr "Totaal gewerkte uren"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr "Wachtende sprints"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr "Ontdekte blokkeerpunten:"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr "Backlogs niet toegewezen aan sprints"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "Planning"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-msgstr "_Annuleren"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,scrum_master_id:0
-msgid "The person who is maintains the processes for the product"
-msgstr "De persoon die de processen rond het product onderhoudt."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Geplande uren"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr "Sprints"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr "Omzetten naar taak"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr "Weet u zeker dat u deze Backlogs wilt samenvoegen?"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr "Verantwoordelijke gebruiker die aan deze taak kan werken"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Status"
-
-#. 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
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr "Nieuw"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Dagelijkse scrum"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr "C_onverteren"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending Backlogs"
-msgstr "Wachtende backlogs"
-
-#. 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 "Product Backlogs"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "E-mail opmaak wizard"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "Datum gemaakt"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr "Zijn er zaken die u blokkeren?"
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Taken voor vandaag"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Taken sinds gisteren"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "Wachtend"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-msgstr "Sprint aan backlogs toewijzen"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,expected_hours:0
-msgid "Estimated time to do the task."
-msgstr "Geschatte tijd om de taak uit te voeren."
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,task_hours:0
-msgid "Task Hours"
-msgstr "Uren taak"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Dates"
-msgstr "Data"
-
-#. module: project_scrum
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#. 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
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-"Hallo  , \n"
-"Ik stuur je Scrum Meeting : %s voor de Sprint  '%s' van Project '%s'"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr "Dagelijks"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Delegate"
-msgstr "Delegeren"
-
-#. module: project_scrum
-#: view:board.board:0
-msgid "My Board"
-msgstr "Mijn dashboard"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr "De sprint '%s' is gesloten."
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr "Voortgang van taak"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Vergaderdatum"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Taken"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr "Sprint selecteren om backlog toe te wijzen."
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Berekend als: Gebruikte tijd / totale tijd"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr "Maand"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-msgstr "Concept backlogs"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Ontdekte blokkades"
-
-#. 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 ""
-"De status van de backlogs in open veranderen als ze in concept status zijn"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-msgstr "Totaal geplande uren"
-
-#. 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 "De persoon die verantwoordelijk is voor het product"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr "Wat ben je van plan te doen tot de volgende vergadering?"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "In behandeling"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr "Product owner"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Evaluatie"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Sprint evaluatie"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Opmerking"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Concept"
-
-#. module: project_scrum
-#: help:project.task,product_backlog_id:0
-msgid ""
-"Related product backlog that contains this task. Used in SCRUM methodology"
-msgstr ""
-"Gerelateerde product backlog die deze taak bevat. Gebruikt in SCRUM methode"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr "Uitstellen"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr "Veraander type"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr "Hiermee wijzigt u naar de gereed status"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr "Nieuwe sprints"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-msgstr "Optionele info"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
-msgid "Create Tasks from Product Backlogs"
-msgstr "Taken maken van product backlogs"
-
-#. module: project_scrum
-#: help:project.project,sprint_size:0
-msgid "Number of days allocated for sprint"
-msgstr "Aantal toegewezen dagen voor sprint"
-
-#. module: project_scrum
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Producteigenaar"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,sequence:0
-msgid "Gives the sequence order when displaying a list of product backlog."
-msgstr ""
-"Bepaalt de volgorde bij het afbeelden van een lijst van product backlogs."
-
-#. 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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-msgstr "Backlogs"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Create Task for Product Backlog"
-msgstr "Taak maken voor product backlog"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,active:0
-msgid "Active"
-msgstr "Actief"
-
-#. 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 "Scrum vergaderingen"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
-msgstr "Geschatte totale tijd om de backlog te doen"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.merge,project_id:0
-msgid "Select project for the new product backlog"
-msgstr "Project selecteren voor de nieuwe backlog"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Merge"
-msgstr "Samenvoegen"
-
-#. 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Backlog nauwkeurig"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr "Naar taak omzetten"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Volgnummer"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr "Backlog voortgang"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Gereed"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr "Sluiten"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "Open"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Effectieve uren"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr "Informatie"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr "Product backlog '%s' is omgezet naar taak %d."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Resterende uren"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Fout! Einddatum van de taak moet voorbij de begindatum liggen"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr "Verantwoordelijke"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Functionaliteit"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr "Mijn backlogs"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr "Lopende Backlogs"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr "Bekijk sprints"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-"The scrum agile methode wordt gebruikt in software ontwikkel projecten. De "
-"product backlog is de lijst van te implementeren functionaliteiten. Een "
-"product backlog kan worden ingepland in een ontwikkel sprint en kan worden "
-"gesplitst in meer taken. De product backlog wordt beheerd door de product "
-"owner van het project."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-msgstr "Backlog uitstellen"
-
-#. 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.sprint:0
-msgid "Planned hours"
-msgstr "Geplande uren"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Begindatum"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "Scrum vergadering"
-
-#. 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 "Burndown grafiek"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Dagelijkse vergaderingen"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr "Verwachte uren"
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Sprint dagen"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Voortgang (0-100)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Sprint info"
-
-#. 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 ""
-"Als het actief veld uit staat, kunt u de product backlog verbergen zonder "
-"deze te verwijderen."
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,task_hours:0
-msgid "Estimated time of the total hours of the tasks"
-msgstr "Geschatte tijd van de totale uren van de taken"
-
-#. module: project_scrum
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "Scrum gegevens"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr "Is een scrum project"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr "Bewerken"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Details taak"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-msgstr "postpone.wizard"
-
-#. 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 ""
-"Deze assistent voegt backlogs samen en maakt een nieuwe backlog in concept "
-"status (oude backlogs worden verwijderd). En het voegt ook de oude taken van "
-"backlogs samen."
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr "Backlog uitstellen"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr "Het project voor samengevoegde backlogs selecteren"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-msgstr "Mijn sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,effective_hours:0
-msgid "Spent Hours"
-msgstr "Gewerkte uren"
-
-#. 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 "Berekend als de som van de gewerkte tijd aan alle gekoppelde taken"
-
-#. 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 "Scrum dashboard"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_sprint
-msgid "Project Scrum Sprint"
-msgstr "Project scrum sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Feature Description"
-msgstr "Functionaliteit omschrijving"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr "Selecteer aub een project."
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr "Dank u wel,"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-msgstr "Huidige sprints"
-
-#. 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 "Sprint toewijzen"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Toewijzen aan"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr "Weet u zeker dat u de backlog wilt uitstellen?"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr "Hiermee wijzigt u naar de open status"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr "Selecteer aub tenminste twee product backlogs"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Sprint evaluatie"
-
-#~ msgid "My tasks"
-#~ msgstr "Mijn taken"
-
-#~ msgid "Importance"
-#~ msgstr "Belang"
-
-#~ msgid "Progress (%)"
-#~ msgstr "Voortgang (%)"
-
-#~ msgid "Project Members"
-#~ msgstr "Projectleden"
-
-#~ msgid "Subproject"
-#~ msgstr "Deelproject"
-
-#~ msgid "Team Name"
-#~ msgstr "Teamnaam"
-
-#~ msgid "Priority"
-#~ msgstr "Prioriteit"
-
-#~ msgid "Total Time"
-#~ msgstr "Totale tijd"
-
-#~ msgid "Projects"
-#~ msgstr "Projecten"
-
-#~ msgid "Task Details"
-#~ msgstr "Taakdetails"
-
-#~ msgid "Planned Time"
-#~ msgstr "Geplande tijd"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "Optionele info"
-
-#~ msgid "Low"
-#~ msgstr "Laag"
-
-#~ msgid "Opened tasks"
-#~ msgstr "Geopende taken"
-
-#~ msgid "My opened tasks"
-#~ msgstr "Mijn geopende taken"
-
-#~ msgid "Status"
-#~ msgstr "Status"
-
-#~ msgid "User"
-#~ msgstr "Gebruiker"
-
-#~ msgid "Assigned to"
-#~ msgstr "Toegewezen aan"
-
-#~ msgid "All Tasks"
-#~ msgstr "Alle taken"
-
-#~ msgid "Working Time"
-#~ msgstr "Werktijd"
-
-#~ msgid "Warn Manager"
-#~ msgstr "Waarschuw manager"
-
-#~ msgid "Description"
-#~ msgstr "Omschrijving"
-
-#~ msgid "Users"
-#~ msgstr "Gebruikers"
-
-#~ msgid "Hours Spent"
-#~ msgstr "Gebruikte uren"
-
-#~ msgid "Expected End"
-#~ msgstr "Verwacht einde"
-
-#~ msgid "Delegated To"
-#~ msgstr "Gedelegeerd aan"
-
-#~ msgid "Delay Hours"
-#~ msgstr "Uren vertraging"
-
-#~ msgid "Sum of spent hours of all tasks related to this project."
-#~ msgstr "Totaal van gebruikte uren van alle taken gerelateerd aan dit project"
-
-#~ msgid "Sum of planned hours of all tasks related to this project."
-#~ msgstr "Totaal van geplande uren van alle taken gerelateerd aan dit project"
-
-#~ msgid "Very Low"
-#~ msgstr "Zeer laag"
-
-#~ msgid "Urgent"
-#~ msgstr "Urgent"
-
-#~ msgid "Template"
-#~ msgstr "Sjabloon"
-
-#~ msgid "My opened sprints (Product Owner)"
-#~ msgstr "Mijn geopende sprints (product-eigenaar)"
-
-#~ msgid "Scrum Task"
-#~ msgstr "Scrum taak"
-
-#~ 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."
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "Gedelegeerde taken"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "Scrum projecten"
-
-#~ msgid "Notes"
-#~ msgstr "Opmerkingen"
-
-#~ 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."
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "Deadline"
-#~ msgstr "Uiterste opleveringsdatum"
-
-#~ msgid "Type"
-#~ msgstr "Soort"
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "Berekend als: Gebruikte uren + resterende uren."
-
-#~ msgid "Internal description of the project."
-#~ msgstr "Interne omschrijving van het project."
-
-#~ msgid "Percent of tasks closed according to the total of tasks todo."
-#~ msgstr "Percentage afgesloten taken van het totaal aantal taken."
-
-#~ msgid "Partner"
-#~ msgstr "Relatie"
-
-#~ msgid "Medium"
-#~ msgstr "Gemiddeld"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Ongeldige XML voor weergave!"
-
-#~ msgid "Create Tasks"
-#~ msgstr "Maak taken"
-
-#~ msgid "Scrum Tasks"
-#~ msgstr "Scrum taken"
-
-#~ msgid "Contact"
-#~ msgstr "Contactpersoon"
-
-#~ msgid "My opened sprints (Scrum Master)"
-#~ msgstr "Mijn geopende sprints (Scrum meester)"
-
-#~ 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"
-
-#~ msgid "Opened Sprints"
-#~ msgstr "Geopende sprints"
-
-#~ msgid "Time Spent"
-#~ msgstr "Bestede tijd"
-
-#~ msgid "Project Manager"
-#~ msgstr "Projectleider"
-
-#~ msgid "Draft Sprints"
-#~ msgstr "Concept sprints"
-
-#~ msgid "My Sprints (Scrum Master)"
-#~ msgstr "Mijn sprints (Scrum meester)"
-
-#~ msgid "Work done"
-#~ msgstr "Afgeronde werkzaamheden"
-
-#~ msgid "My Sprints (Product Owner)"
-#~ msgstr "Mijn sprints"
-
-#~ msgid "Sprints Done"
-#~ msgstr "Sprints uitgevoerd"
-
-#~ msgid "Parent Task"
-#~ msgstr "Hoofdtaak"
-
-#~ msgid "Edit Projects"
-#~ msgstr "Wijzig projecten"
-
-#~ msgid "Scrum Project"
-#~ msgstr "Scrum project"
-
-#~ msgid "Scrum Team"
-#~ msgstr "Scrum team"
-
-#~ msgid "Context"
-#~ msgstr "Context"
-
-#~ msgid "Parent project"
-#~ msgstr "Hoofdproject"
-
-#~ msgid "Total Hours"
-#~ msgstr "Totale uren"
-
-#~ msgid "Opened Backlogs"
-#~ msgstr "Geopende backlogs"
-
-#~ msgid "Created tasks"
-#~ msgstr "Taken gemaakt"
-
-#~ msgid "Error ! You can not create recursive projects."
-#~ msgstr "Fout! U kunt geen recursieve projecten definiëren."
-
-#~ msgid "Scrum Product backlog"
-#~ msgstr "Scrum product backlog"
-
-#~ msgid "Analytic Account"
-#~ msgstr "Kostenplaats"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
-
-#~ msgid ""
-#~ "Total remaining time, can be re-estimated periodically by the assignee of "
-#~ "the task."
-#~ msgstr ""
-#~ "Totaal resterende tijd. Kan periodiek opnieuw worden geschat door de aan "
-#~ "deze taak toegewezen persoon."
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "Wat heeft u sinds gisteren gerealiseerd?"
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "Is uw sprint backlog inschatting nauwkeurig?"
-
-#~ msgid "Very urgent"
-#~ msgstr "Zeer urgent"
-
-#~ msgid ""
-#~ "Project's member. Not used in any computation, just for information purpose."
-#~ msgstr "Projectlid. Niet gebruikt in berekeningen, slechts ter informatie."
-
-#~ msgid "Mail Header"
-#~ msgstr "Kopregels mail"
-
-#~ msgid "Is Scrum"
-#~ msgstr "Is Scrum"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "Is er iets dat u blokkeert?"
-
-#~ msgid "Timebox"
-#~ msgstr "Timebox"
-
-#~ 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."
-
-#~ msgid "Project Name"
-#~ msgstr "Naam project"
-
-#~ msgid "Date Closed"
-#~ msgstr "Datum afgesloten"
-
-#~ 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."
-
-#~ msgid "Warn Partner"
-#~ msgstr "Waarschuw relatie"
-
-#~ msgid "Task summary"
-#~ msgstr "Taaksamenvatting"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
-
-#~ msgid "Timetable working hours to adjust the gantt diagram report"
-#~ msgstr "Tabel met werkuren om de GANTT overzichten correct weer te geven"
-
-#~ msgid "Running"
-#~ msgstr "In uitvoering"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "Waar werkt u vandaag aan?"
-
-#~ msgid "Mail Footer"
-#~ msgstr "Mail voetregels"
-
-#~ 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."
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "Scrum, agile development method"
diff --git a/addons/project_scrum/i18n/nl_BE.po b/addons/project_scrum/i18n/nl_BE.po
deleted file mode 100644
index eb4669fd6c4..00000000000
--- a/addons/project_scrum/i18n/nl_BE.po
+++ /dev/null
@@ -1,1038 +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: 2012-02-08 00:37+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: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
diff --git a/addons/project_scrum/i18n/pl.po b/addons/project_scrum/i18n/pl.po
deleted file mode 100644
index f55f32ee12b..00000000000
--- a/addons/project_scrum/i18n/pl.po
+++ /dev/null
@@ -1,1312 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:49+0000\n"
-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr "_Przydziel"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr "Co wykonałeś od ostatniego spotkania?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Group By..."
-msgstr "Grupuj wg..."
-
-#. module: project_scrum
-#: model:process.node,note:project_scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nazwa sprintu"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Postęp"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Mistrz młyna"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr "Sprint '%s' został otwarty."
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Błąd ! data początkowa projektu musi być mniejsza od daty końcowej."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "Retrospekcja"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "Wyślij E-mail"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych zadań."
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Przejrzyj zakres projektu"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-msgstr "Ustaw na projekt"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
-msgid "Merge Product Backlogs"
-msgstr "Połącz zakresy produktu"
-
-#. 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 "Połącz zakresy zadań"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr "Spotkanie młynowe : %s"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr "Zakres"
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Błąd! Nie możesz wiązać przydziału do tego samego projektu!"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "Zadanie"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr "Poświęcone godziny"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Zakres produktu"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "Rozpocznij zadanie"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr "Brak"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr "Zmień etap"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Data końcowa"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "Odnośniki"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "Obliczone według sum czasów wykonanych zadań."
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr "Zadanie na dziś"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr "Otwórz zakres"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr "Suma spędzonych godzin"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr "Stwierdzone przeszkody:"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "Planowanie"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-msgstr "_Anuluj"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,scrum_master_id:0
-msgid "The person who is maintains the processes for the product"
-msgstr "Osoba utrzymująca proces dla produktu"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Planowane godziny"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr "Sprinty"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr "Skonwertuj do zadania"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr "Jesteś pewien, że chcesz połączyć te zakresy?"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr "Użytkownik odpowiedzialny do pracy przy zadaniu"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Stan"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "Podgląd zadań sprintu"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Dzienny młyn"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr "K_onwertuj"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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 "Zakresy produktu"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "Data utworzenia"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr "Czy coś ci przeszkadza ?"
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Młyn"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Zadania na dzisiaj"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Zadania od wczoraj"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "Oczekujący"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-msgstr "Przypisz sprint do zakresów"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,expected_hours:0
-msgid "Estimated time to do the task."
-msgstr "Szacowany czas wykonania zadania."
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,task_hours:0
-msgid "Task Hours"
-msgstr "Godziny zadania"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Dates"
-msgstr "Daty"
-
-#. module: project_scrum
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Anulowano"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Widok zadań prjektu"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr "Codziennie"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Zakres sprintu"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Delegate"
-msgstr "Przydziel"
-
-#. module: project_scrum
-#: view:board.board:0
-msgid "My Board"
-msgstr "Moja konsola"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr "Sprint '%s' został zamknięty"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr "Postęp zadania"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Data spotkania"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Zadania"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr "Wybierz sprint do przypisania zakresu"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Obliczone jako: Czas przepracowany / Czas całkowity"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr "Miesiąc"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Stwierdzone przeszkody"
-
-#. 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 "Zmień stan zakresów produktu na otwarty, jeśli są w stanie projekt"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-msgstr "Suma planowanych godzin"
-
-#. 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 "Osoba odpowiedzialna za produkt"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr "Co planujesz wykonać do następego spotkania?"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Spotkanie sprintowe"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "W trakcie przetwarzania"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr "Właściciel produktu"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Przegląd"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Retrospekcja sprintu"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Notatka"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Projekt"
-
-#. 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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr "Przełóż"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-msgstr "Informacja opcjonalna"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
-msgid "Create Tasks from Product Backlogs"
-msgstr "Utwórz zadania z zakresu produktu"
-
-#. module: project_scrum
-#: help:project.project,sprint_size:0
-msgid "Number of days allocated for sprint"
-msgstr "Liczba dni przewidziana na sprint"
-
-#. module: project_scrum
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Właściciel produktu"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,sequence:0
-msgid "Gives the sequence order when displaying a list of product backlog."
-msgstr "Określa kolejność na listach zakresów produktu"
-
-#. module: project_scrum
-#: model:process.node,name:project_scrum.process_node_productbacklog0
-#: view:project.scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "Zakres produktu"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-msgstr "Zakresy"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Create Task for Product Backlog"
-msgstr "Utwórz zadanie dla zakresu produktu"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,active:0
-msgid "Active"
-msgstr "Aktywne"
-
-#. 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 "Spotkania młynowe"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
-msgstr "Szacunkowy czas wykonania zakresu"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.merge,project_id:0
-msgid "Select project for the new product backlog"
-msgstr "Wybierz projekt dla nowego zakresu produktu"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Merge"
-msgstr "Połącz"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr "Przejrzyj zakres sprintu"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr "Konwertuj do zadania"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-"Jeśli masz [?] w nazwie projektu, to znaczy, że do projektu nie przypisano "
-"konta analitycznego."
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Numeracja"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr "Postęp zakresu"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Wykonano"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Anuluj"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr "Zamknięte"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "Otwarte"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Godziny efektywne"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr "Informacja"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Pozostałe godziny"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr "Odpowiedzialny"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Cecha"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr "Moje zakresy"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:process.transition,name:project_scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr "Zadanie zakresu"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Planned hours"
-msgstr "Planowane godziny"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Data rozpoczęcia"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "Spotkanie młynowe"
-
-#. 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 "Wykres wykonania"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Spotkania dzienne"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr "Spodziewane godziny"
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Dni sprintu"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Postęp (0-100)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Informacja o sprincie"
-
-#. 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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "Dane młyna"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr "Jest projektem młynowym"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr "Edytuj"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Szczegóły zadania"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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 ""
-"Ten kreator łączy zakresy i tworzy nowy zakres w stanie projekt (poprzednie "
-"zakresy zostaną usunięte). Kreator połączy również zadania z poprzednich "
-"zakresów."
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr "Odłóż zakres"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr "Wybierz projekt dla łączonych zakresów"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-msgstr "Mój sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,effective_hours:0
-msgid "Spent Hours"
-msgstr "Spędzone godziny"
-
-#. 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 "Obliczone na podstawie sumy czasu spędzonego nad każdym zadaniem"
-
-#. 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 "Konsola Scrum"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_sprint
-msgid "Project Scrum Sprint"
-msgstr "Sprint projektu młynowego"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Feature Description"
-msgstr "Opis funkcji"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr "Wybierz projekt"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr "Dziękuję,"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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 "Przypisz sprint"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Przypisz do"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr "Jesteś pewien, że chcesz odłożyć zakres?"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr "Wybierz co najmniej dwa zakresy produktu"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Przegląd sprintu"
-
-#~ msgid "My tasks"
-#~ msgstr "Moje zadania"
-
-#~ msgid "Subproject"
-#~ msgstr "Podprojekt"
-
-#~ msgid "Importance"
-#~ msgstr "Ważność"
-
-#~ msgid "Scrum Task"
-#~ msgstr "Zadanie Scrum"
-
-#~ msgid "Very urgent"
-#~ msgstr "Bardzo pilne"
-
-#~ msgid "Notes"
-#~ msgstr "Uwagi"
-
-#~ msgid "Team Name"
-#~ msgstr "Nazwa Zespołu"
-
-#~ msgid "All Tasks"
-#~ msgstr "Wszystkie zadania"
-
-#~ msgid "Deadline"
-#~ msgstr "Ostateczny czas ukończenia:"
-
-#~ msgid "Priority"
-#~ msgstr "Priorytet"
-
-#~ msgid "Type"
-#~ msgstr "Typ"
-
-#~ msgid "Medium"
-#~ msgstr "Średni"
-
-#~ msgid "Projects"
-#~ msgstr "Projekty"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#~ msgid "Task Details"
-#~ msgstr "Szczegóły zadania"
-
-#~ msgid "Contact"
-#~ msgstr "Kontakt"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-#~ "specjalnych !"
-
-#~ msgid "Template"
-#~ msgstr "Szablon"
-
-#~ msgid "Project Members"
-#~ msgstr "Członkowie projektu"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "Projekty scrum"
-
-#~ msgid "Analytic Account"
-#~ msgstr "Konto analityczne"
-
-#~ msgid "Partner"
-#~ msgstr "Partner"
-
-#~ msgid "Total Time"
-#~ msgstr "Czas całkowity"
-
-#~ msgid "Planned Time"
-#~ msgstr "Czas planowany"
-
-#~ msgid "Progress (%)"
-#~ msgstr "Postęp (%)"
-
-#~ msgid "Create Tasks"
-#~ msgstr "Utwórz zadania"
-
-#~ msgid "Low"
-#~ msgstr "Niski"
-
-#~ msgid "My opened tasks"
-#~ msgstr "Moje otwarte zadania"
-
-#~ msgid "Status"
-#~ msgstr "Stan"
-
-#~ msgid "Project Manager"
-#~ msgstr "Menedżer projektu"
-
-#~ msgid "User"
-#~ msgstr "Użytkownik"
-
-#~ msgid "Project Name"
-#~ msgstr "Nazwa projektu"
-
-#~ msgid "Date Closed"
-#~ msgstr "Data zamknięcia"
-
-#~ msgid "Parent Task"
-#~ msgstr "Zadanie nadrzędne"
-
-#~ msgid "Description"
-#~ msgstr "Opis"
-
-#~ msgid "Running"
-#~ msgstr "Uruchomione"
-
-#~ msgid "Edit Projects"
-#~ msgstr "Edytuj projekty"
-
-#~ msgid "Urgent"
-#~ msgstr "Pilne"
-
-#~ msgid "Context"
-#~ msgstr "Kontekst"
-
-#~ msgid "Users"
-#~ msgstr "Użytkownicy"
-
-#~ msgid "Parent project"
-#~ msgstr "Projekt nadrzędny"
-
-#~ msgid "Created tasks"
-#~ msgstr "Utworzone zadania"
-
-#~ msgid "Error ! You can not create recursive projects."
-#~ msgstr "Błąd ! Nie możesz tworzyć rekurencyjnych projektów."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "Zadania przekazane"
-
-#~ msgid ""
-#~ "Project's member. Not used in any computation, just for information purpose."
-#~ msgstr "Członek projektu. Nie stosowane w obliczeniach, tylko do informacji."
-
-#~ 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."
-
-#~ msgid "Internal description of the project."
-#~ msgstr "Wewnętrzny opis projektu"
-
-#~ msgid "Time Spent"
-#~ msgstr "Spędzony czas"
-
-#~ 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."
-
-#~ msgid "Work done"
-#~ msgstr "Praca wykonana"
-
-#~ msgid "Assigned to"
-#~ msgstr "Przypisano do"
-
-#~ msgid "Delegated To"
-#~ msgstr "Przekazano"
-
-#~ msgid "Working Time"
-#~ msgstr "Czas pracy"
-
-#~ msgid "Sum of spent hours of all tasks related to this project."
-#~ msgstr ""
-#~ "Suma przepracowanych godzin we wszystkich zadaniach związanych z tym "
-#~ "projektem."
-
-#~ 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."
-
-#~ msgid "Warn Manager"
-#~ msgstr "Ostrzeż menedżera"
-
-#~ msgid "Very Low"
-#~ msgstr "Bardzo niski"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "Nad czym pracujesz dzisiaj ?"
-
-#~ msgid "Total Hours"
-#~ msgstr "Suma godzin"
-
-#~ msgid "Hours Spent"
-#~ msgstr "Przepracowane godziny"
-
-#~ msgid "Expected End"
-#~ msgstr "Spodziewany koniec"
-
-#~ msgid "Mail Footer"
-#~ msgstr "Stopka wiadomości"
-
-#~ msgid ""
-#~ "Total remaining time, can be re-estimated periodically by the assignee of "
-#~ "the task."
-#~ msgstr ""
-#~ "Czas pozostały. Może być okresowo przeszacowany przez osobę przypisaną do "
-#~ "zadania."
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "Co osiągnąłeś od wczoraj ?"
-
-#~ msgid "Mail Header"
-#~ msgstr "Magłówek wiadomości"
-
-#~ 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 ""
-#~ "Jeśli będzie zaznaczone, to użytkownik zobaczy okno przy zamykaniu zadania z "
-#~ "propozycję wysłania wiadomości do klienta."
-
-#~ msgid "Percent of tasks closed according to the total of tasks todo."
-#~ msgstr "Procent zadań zamkniętych do sumy zadań do wykonania."
-
-#~ msgid ""
-#~ "If you check this field, the project manager will receive a request each "
-#~ "time a task is completed by his team."
-#~ msgstr ""
-#~ "Jeśli zaznaczysz to pole, to menedżer projektu otrzyma zgłoszenie za każdym "
-#~ "razem, gdy zadanie zostanie wypełnione przez zespół."
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "Obliczone jako: Czas spędzony + Czas pozostały"
-
-#~ msgid "Delay Hours"
-#~ msgstr "Opóźnienie"
-
-#~ msgid "Opened tasks"
-#~ msgstr "Otwarte zadania"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "Informacja opcjonalna"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "Czy coś ci przeszkadza ?"
-
-#~ msgid "Sum of total hours of all tasks related to this project."
-#~ msgstr "Suma godzin wszystkich zadań związanych z tym projektem."
-
-#~ msgid "Warn Partner"
-#~ msgstr "Ostrzeż partnera"
-
-#~ msgid "Sum of planned hours of all tasks related to this project."
-#~ msgstr "Suma planowanych godzin dla wszystkich zadań projektu."
-
-#~ msgid "Task summary"
-#~ msgstr "Podsumowanie zadania"
-
-#~ msgid ""
-#~ "Footer added at the beginning of the email for the warning message sent to "
-#~ "the customer when a task is closed."
-#~ msgstr ""
-#~ "Nagłówek dodawany na początek wiadomości informującej klienta o zamknięciu "
-#~ "zadania."
diff --git a/addons/project_scrum/i18n/pt.po b/addons/project_scrum/i18n/pt.po
deleted file mode 100644
index 02ffe5d02af..00000000000
--- a/addons/project_scrum/i18n/pt.po
+++ /dev/null
@@ -1,1366 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:52+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr ""
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr "O que fez desde a última reunião?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: project_scrum
-#: model:process.node,note:project_scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr "Criar Tarefas de blocklogs"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nome do Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Progresso"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum Principal"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Erro! A data de início do projeto deve ser anterior à do seu fim"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "O sua estimativa Backlog Sprint está correcta ?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "Retrospectiva"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "Enviar mensagem"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro! Não se pode criar tarefas recursivamente."
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Ver backlog de projetos"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-msgstr "Definir como rascunho"
-
-#. 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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "Tarefa"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr "Horas gastas"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Producto Backlog"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Projecto"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "Iniciar tarefa"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Data Final"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "Ligações"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "Processado com base na soma das tarefas de trabalho concluídas."
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr "Tarefa de hoje"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr "Total de horas gastas"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "Planeamento"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Horas Planeadas"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr "Converter em tarefa"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Estado"
-
-#. 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
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Srum Diário"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "Data de criação"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Tarefas para hoje"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Tarefas desde ontem"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr "Aviso"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,expected_hours:0
-msgid "Estimated time to do the task."
-msgstr "Tempo esperado para completar a tarefa"
-
-#. 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 "Datas"
-
-#. module: project_scrum
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Ver tarefas de projectos"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr "Diariamente"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Sprint Backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Delegate"
-msgstr "Delegar"
-
-#. module: project_scrum
-#: view:board.board:0
-msgid "My Board"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr "Progresso da tarefa"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Data de Reunião"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Tarefas"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Processado como: Tempo Gasto/ Tempo Total."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr "Mês"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-msgstr "Rascunho Backlogs"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Blocos encontrados"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-msgstr "Total de horas planeadas"
-
-#. 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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum Sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "Em Progresso"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Revisão"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Retrospectiva do Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Nota"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Rascunho"
-
-#. 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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr "Adiar"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Dono do Producto"
-
-#. 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:process.node,name:project_scrum.process_node_productbacklog0
-#: view:project.scrum.product.backlog:0
-msgid "Product backlog"
-msgstr "Producto Backlog"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-msgstr "Backlogs"
-
-#. 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.product.backlog,active:0
-msgid "Active"
-msgstr "Activo"
-
-#. 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
-#: view:project.scrum.backlog.merge:0
-msgid "Merge"
-msgstr "Fundir"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
-msgid "View sprint backlog"
-msgstr "Ver sprint backlog"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Precisão do Backlog"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr "Converter em tarefa"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-"se tiver [?] no nome do projecto significa que não conta da analítica "
-"configurada neste projecto não tem conta da analitica"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Sequência"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Concluído"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr "Fechar"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "Aberto"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Horas efectivas"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr "Informação"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Horas Restante"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr "Responsável"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Característica"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:process.transition,name:project_scrum.process_transition_backlogtask0
-msgid "Backlog Task"
-msgstr "Tarefa Backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Planned hours"
-msgstr "Horas Planeadas"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Data de Início"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "Reunião Scrum"
-
-#. 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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Mensagens Diárias"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Dias de Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Progresso (0 - 100)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Informação de Sprint"
-
-#. 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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "Dado Scrum"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Detalhes das Tarefas"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-msgstr "postpone.wizard"
-
-#. 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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,effective_hours:0
-msgid "Spent Hours"
-msgstr "Horas gastas"
-
-#. 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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr "Por favor, selecione qualquer projeto."
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr "Obrigado,"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Designar para"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Rever Sprint"
-
-#~ msgid "Progress (%)"
-#~ msgstr "Progresso (%)"
-
-#~ msgid "My opened sprints (Product Owner)"
-#~ msgstr "Meus sprints abertos (Dono do producto)"
-
-#~ msgid "Subproject"
-#~ msgstr "Sub-projecto"
-
-#~ msgid "Importance"
-#~ msgstr "Importância"
-
-#~ msgid "Very urgent"
-#~ msgstr "Muito urgente"
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
-#~ msgid "Priority"
-#~ msgstr "Prioridade"
-
-#~ msgid "Type"
-#~ msgstr "Tipo"
-
-#~ msgid "Medium"
-#~ msgstr "Médio"
-
-#~ msgid "Projects"
-#~ msgstr "Projectos"
-
-#~ msgid "Contact"
-#~ msgstr "Contacto"
-
-#~ msgid "Low"
-#~ msgstr "Baixo"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "User"
-#~ msgstr "Utilizador"
-
-#~ msgid "Work done"
-#~ msgstr "Trabalho concluído"
-
-#~ msgid "Assigned to"
-#~ msgstr "Atribuído a"
-
-#~ msgid "Very Low"
-#~ msgstr "Muito Baixa"
-
-#~ msgid "Description"
-#~ msgstr "Descrição"
-
-#~ msgid "Urgent"
-#~ msgstr "Urgente"
-
-#~ msgid "Context"
-#~ msgstr "Contexto"
-
-#~ msgid "Users"
-#~ msgstr "Utilizadores"
-
-#~ msgid "Scrum Product backlog"
-#~ msgstr "Backlog do Produto Scrum"
-
-#~ msgid "My tasks"
-#~ msgstr "As Minhas tarefas"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome do modelo inválido para a definição da acção."
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "Scrum, Metodo de Desenvolvimento Ágil"
-
-#~ msgid ""
-#~ "Total remaining time, can be re-estimated periodically by the assignee of "
-#~ "the task."
-#~ msgstr ""
-#~ "Tempo restante Total, pode ser re-estimado periodicamente pelo administrador "
-#~ "da tarefa."
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "O que realizou desde ontem ?"
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "O sua estimativa Backlog Sprint está correcta ?"
-
-#~ msgid "Project Members"
-#~ msgstr "Membros do Projecto"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "Projectos Scrum"
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "Tarefas Delegadas"
-
-#~ 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 no inicio do email para a mensagem de aviso enviada "
-#~ "para o cliente quando uma tarefa é fechada."
-
-#~ msgid "Scrum Task"
-#~ msgstr "Tarefa Scrum"
-
-#~ msgid ""
-#~ "Project's member. Not used in any computation, just for information purpose."
-#~ msgstr "Membros do Projecto. Não utilizados em nenhuma computação"
-
-#~ msgid ""
-#~ "Estimated time to do the task, usually set by the project manager when the "
-#~ "task is in draft state."
-#~ msgstr ""
-#~ "Tempo estimado para fazer a tarefa, normalmente definido pelo gestor do "
-#~ "projeco quando a tarefa está no estado de rascunho."
-
-#~ msgid ""
-#~ "If you check this field, the project manager will receive a request each "
-#~ "time a task is completed by his team."
-#~ msgstr ""
-#~ "Se assinalou este campo, o gestor do projecto irá receber um pedido cada vez "
-#~ "que uma tarefa é completada pela sua equipa."
-
-#~ msgid "Team Name"
-#~ msgstr "Nome da Equipa"
-
-#~ msgid "Mail Header"
-#~ msgstr "Cabeçalho do Mail"
-
-#~ 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 assinalou aqui, o utilizador terá uma janela popup quando fechar a tarefa "
-#~ "que propõe enviar a mensagem para o cliente."
-
-#~ msgid "Analytic Account"
-#~ msgstr "Conta Analítica"
-
-#~ msgid "All Tasks"
-#~ msgstr "Todas as Tarefas"
-
-#~ msgid "Deadline"
-#~ msgstr "Prazo Limite"
-
-#~ msgid "Partner"
-#~ msgstr "Terceiro"
-
-#~ msgid "Template"
-#~ msgstr "Modelo"
-
-#~ msgid "Percent of tasks closed according to the total of tasks todo."
-#~ msgstr "Percentagem de tarefas fechadas de acordo com o total"
-
-#~ msgid "Internal description of the project."
-#~ msgstr "Descrição interna do projecto."
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "Processado como : Tempo Gasto + Tempo Restante."
-
-#~ msgid "Total Time"
-#~ msgstr "Tempo Total"
-
-#~ msgid "Planned Time"
-#~ msgstr "Tempo Planeado"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML Inválido para a Arquitectura de Vista !"
-
-#~ msgid "Task Details"
-#~ msgstr "Detalhes da Tarefa"
-
-#~ msgid "Delay Hours"
-#~ msgstr "Horas de Atraso"
-
-#~ msgid "Scrum Tasks"
-#~ msgstr "Tarefas Scrum"
-
-#~ msgid "Create Tasks"
-#~ msgstr "Criar Tarefas"
-
-#~ msgid "Is Scrum"
-#~ msgstr "É Scrum"
-
-#~ msgid "Opened tasks"
-#~ msgstr "Tarefas Abertas"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "Informação Opcional"
-
-#~ msgid "Sum of total hours of all tasks related to this project."
-#~ msgstr ""
-#~ "Soma do total de horas de todas as tarefas relacionadas para este projecto."
-
-#~ msgid "My opened sprints (Scrum Master)"
-#~ msgstr "Meus sprints abertos (Scrum Principal)"
-
-#~ msgid "My opened tasks"
-#~ msgstr "As Minhas tarefas abertas"
-
-#~ msgid "Project Manager"
-#~ msgstr "Gestor de Projectos"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "Existe algo que o impede ?"
-
-#~ msgid "Opened Sprints"
-#~ msgstr "Sprints Abertos"
-
-#~ msgid "Time Spent"
-#~ msgstr "Tempo Gasto"
-
-#~ msgid "Project Name"
-#~ msgstr "Nome do Projecto"
-
-#~ msgid "My Sprints (Scrum Master)"
-#~ msgstr "Os Meus Sprints (Scrum Principal)"
-
-#~ 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 ""
-#~ "Processado como: Tempo Total - Tempo Estimado. Ele fornece a diferença do "
-#~ "tempo estimado pelo gestor do projecto e o tempo real para fechar a tarefa."
-
-#~ msgid "Timebox"
-#~ msgstr "Período de Tempo"
-
-#~ msgid "Draft Sprints"
-#~ msgstr "Rascunho Sprints"
-
-#~ msgid "Working Time"
-#~ msgstr "Tempo de Trabalho"
-
-#~ msgid "Delegated To"
-#~ msgstr "Delegado a"
-
-#~ msgid "Date Closed"
-#~ msgstr "Data de Fecho"
-
-#~ msgid "Sum of spent hours of all tasks related to this project."
-#~ msgstr "Soma de horas gastas das tarefas relacionadas para este projecto."
-
-#~ msgid "Sum of planned hours of all tasks related to this project."
-#~ msgstr ""
-#~ "Soma das horas planeadas de todas as tarefas relacionadas para este projecto."
-
-#~ msgid "Warn Partner"
-#~ msgstr "Avisar o Terceiro"
-
-#~ msgid "My Sprints (Product Owner)"
-#~ msgstr "Os Meus Sprints (Dono do Produto)"
-
-#~ msgid "Task summary"
-#~ msgstr "Resumo da Tarefa"
-
-#~ 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 ""
-#~ "Ligue este projecto para uma conta analítica se precisar de um gestor "
-#~ "finaceiro nos projectos. Permite-lhe conectar os projectos com orçamentos "
-#~ "planeamentos, custo e análise de receitas,"
-
-#~ msgid "Warn Manager"
-#~ msgstr "Avisar o Gestor"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do Objecto deve começar com x_ e não pode conter nenhum carácter "
-#~ "especial !"
-
-#~ msgid "Parent Task"
-#~ msgstr "Tarefas Ascendente"
-
-#~ msgid "Timetable working hours to adjust the gantt diagram report"
-#~ msgstr "Tabela de horas de trabalho para ajustar o relatório de gantt"
-
-#~ msgid "Sprints Done"
-#~ msgstr "Sprints Concluído"
-
-#~ msgid "Edit Projects"
-#~ msgstr "Editar Projectos"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "No que está a trabalhar hoje ?"
-
-#~ msgid "Running"
-#~ msgstr "Em Progresso"
-
-#~ msgid "Scrum Team"
-#~ msgstr "Equipa Scrum"
-
-#~ msgid "Scrum Project"
-#~ msgstr "Projecto Scrum"
-
-#~ msgid "Parent project"
-#~ msgstr "Projecto Ascendente"
-
-#~ msgid "Hours Spent"
-#~ msgstr "Horas Gastas"
-
-#~ msgid "Total Hours"
-#~ msgstr "Total de Horas"
-
-#~ 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 inicio do email para a mensagem de aviso enviada para o "
-#~ "cliente quando uma tarefa é fechada."
-
-#~ msgid "Opened Backlogs"
-#~ msgstr "Abrir Backlogs"
-
-#~ msgid "Created tasks"
-#~ msgstr "Tarefas criadas"
-
-#~ msgid "Error ! You can not create recursive projects."
-#~ msgstr "Erro! Não pode criar projetos recursiva."
-
-#~ msgid "Expected End"
-#~ msgstr "Esperada para o final"
-
-#~ msgid "Mail Footer"
-#~ msgstr "Rodapé do Mail"
diff --git a/addons/project_scrum/i18n/pt_BR.po b/addons/project_scrum/i18n/pt_BR.po
deleted file mode 100644
index cf7762eda0c..00000000000
--- a/addons/project_scrum/i18n/pt_BR.po
+++ /dev/null
@@ -1,1396 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-07-28 20:36+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr "_Atribuir"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Autor"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr "O que você executou desde a última reunião?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr "Mês do Sprint"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-"A metodologia ágil Scrum é utilizada no desenvolvimento de projetos de "
-"software. Nesta metodologia, um Sprint é um período curto de tempo (ex. 1 "
-"mes) durante o qual o time implementa uma lista de Backlogs de Produto. A "
-"revisão do Sprint é organizada quando o time apresenta o seu trabalho para o "
-"Cliente e o Dono do Produto."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Group By..."
-msgstr "Agrupado Por..."
-
-#. 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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Nome do Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Progresso"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum Master"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr "O Sprint '%s' foi iniciado."
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "Erro! A data inicial do projeto precisa ser menor que a data final."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "A sua estimativa do Sprint Backlog está precisa?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "Retrospectiva"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "Enviar Email"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Erro! Você não pode criar tarefas recursivas."
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr "Sprints em Progresso"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr "Para mudar para Situação Delegada"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr "Backlog do produto '%s' está associado ao sprint %s"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-msgstr "Definir como Rascunho"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_merge
-msgid "Merge Product Backlogs"
-msgstr "Mesclar Backlog de Produtos"
-
-#. 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 "Mesclar Backlogs"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr "Reuniáo Scrum: %s"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr "Backlog"
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "Erro! Você não pode atribuir escalas para o mesmo projeto!"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "Tarefa"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr "Horas Gastas"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-"A metodologia ágil Scrum é usada em projetos de desenvolvimento de software. "
-"Nesta metodologia, uma reunião diária é organizada pelo Scrum Master com o "
-"time de forma a detectar as dificuldades as quais o time está ou irá "
-"encontrar."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr "Backlogs Atribuídos ao Sprint Atual"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr "Para cancelar a tarefa"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Backlog do Produto"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Projeto"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "Iniciar Tarefa"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr "Nenhum(a)"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr "Mudar Estágio"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Data Final"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "Ligações"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr "Tarefa de Hoje"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr "Abrir Backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr "Total de Horas Gastas"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr "Sprints Pendentes"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr "Pontos de bloqueio encontrados:"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr "Backlogs não atribuídos a Sprints"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "Planejamento"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-msgstr "_Cancelar"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,scrum_master_id:0
-msgid "The person who is maintains the processes for the product"
-msgstr "A pessoa que mantem os processos para o produto"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Horas planejadas"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr "Sprints"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr "Converter em Tarefa"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr "Tem certeza que deseja mesclar estes Backlogs?"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr "Usuário responsável que pode trabalhar na tarefa"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Estado"
-
-#. 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
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr "Novo"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Scrum Diário"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr "C_onverter"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending Backlogs"
-msgstr "Backlogs Pendentes"
-
-#. 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 "Backlogs de Produto"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr "Assistente de composição de E-mail."
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "Data de Criação"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr "Existe alguma coisa bloqueando você?"
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Tarefas para hoje"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Tarefas desde ontem"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr "Aviso"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "Pendente"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-msgstr "Atribuir Sprint para Backlogs"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,expected_hours:0
-msgid "Estimated time to do the task."
-msgstr "Tempo estimado para realizar a tarefa"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,task_hours:0
-msgid "Task Hours"
-msgstr "Horas da Tarefa"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Dates"
-msgstr "Datas"
-
-#. module: project_scrum
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Cancelada"
-
-#. 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
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-"Olá ,\n"
-"Estou enviando-lhe Reunião Scrum: %s para o Sprint '%s' do Projeto '%s'"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr "Diária"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Backlog do Sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Delegate"
-msgstr "Delegar"
-
-#. module: project_scrum
-#: view:board.board:0
-msgid "My Board"
-msgstr "Meu Painel"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr "O Sprint '%s' foi fechado."
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr "Progresso da Tarefa"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Data da Reunião"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Tarefas"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr "Selecione Sprint para atribuir Backlog"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Calculado como: Tempo Gasto / Tempo Total."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr "Mês"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-msgstr "Backlogs  Esboçados"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_blocks:0
-msgid "Blocks encountered"
-msgstr "Bloqueios encontrados"
-
-#. 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 ""
-"Alterar o estado do Backlog de Produto para Aberto se estiver em estado "
-"Rascunho"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-msgstr "Horas Totais Planejadas"
-
-#. 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 "A pesoa que é responsável pelo produto"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr "O que você planeja realizar até a próxima reuniáo"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum Sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "Em progresso"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr "Dono do Produto"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Rever"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Retrospectiva do Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Anotação"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Esboço"
-
-#. module: project_scrum
-#: help:project.task,product_backlog_id:0
-msgid ""
-"Related product backlog that contains this task. Used in SCRUM methodology"
-msgstr ""
-"Backlog de Produto relacionado que contém esta tarefa. Utilizado na "
-"Metodologia SCRUM"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr "Adiar"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr "Mudar o Tipo"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr "Para mudar o estado para feito"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr "Novos Sprints"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-msgstr "Informação Opcional"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_create_task
-msgid "Create Tasks from Product Backlogs"
-msgstr "Criar Tarefas a partir do Backlog de Produto"
-
-#. module: project_scrum
-#: help:project.project,sprint_size:0
-msgid "Number of days allocated for sprint"
-msgstr "Número de dias alocados para o Sprint"
-
-#. module: project_scrum
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-msgstr "Proprietário do Produto"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,sequence:0
-msgid "Gives the sequence order when displaying a list of product backlog."
-msgstr ""
-"Fornece a ordem de sequência quando mostrando uma lista de Backlog de Produto"
-
-#. 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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-msgstr "Backlogs"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Create Task for Product Backlog"
-msgstr "Criar Tarefa para o Backlog de Produto"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,active:0
-msgid "Active"
-msgstr "Ativo"
-
-#. 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 "Reuniões de Scrum"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,expected_hours:0
-msgid "Estimated total time to do the Backlog"
-msgstr "Tempo total estimado para realizar o Backlog"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.merge,project_id:0
-msgid "Select project for the new product backlog"
-msgstr "Selecione o projeto para o novo Backlog de Produto"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Merge"
-msgstr "Mesclar"
-
-#. 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Precisão do Backlog"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr "Converter para Tarefa"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Seqüência"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr "Progresso do Backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Concluído"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr "Fechar"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Horas efetivas"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr "Informação"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr "Backlog de Produto '%s' esta convertida na Tarefa %d."
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Horas Restantes"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Erro ! A data final deve ser maior do que a data inicial"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr "Responsável"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Característica"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr "Meus Backlogs"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr "Backlogs em Andamento"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr "Ver Sprints"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-"A metodologia ágil Scrum é usada em projetos de desenvolvimento de software. "
-" O Backlog de Produto é a lista de características a ser implementadas. Um "
-"Backlog de Produto pode ser planejado em um Sprint de desenvolvimento e pode "
-"ser quebrado em várias tarefas. O Backlog de Produto é gerenciado pelo Dono "
-"do Produto"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-msgstr "Adiar backlog"
-
-#. 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.sprint:0
-msgid "Planned hours"
-msgstr "Horas Planejadas"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Data de Início"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "Reunião de Scrum"
-
-#. 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 "Burndown Chart"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Reuniões Diárias"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr "Horas Esperadas"
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Dias do Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Progresso (0-100)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Informação do Sprint"
-
-#. 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 ""
-"Se o campo Ativo estiver ajustado para verdadeiro, permitirá esconder o "
-"Backlog de Produto sem removê-lo."
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,task_hours:0
-msgid "Estimated time of the total hours of the tasks"
-msgstr "Tempo estimado do total de horas das tarefas"
-
-#. module: project_scrum
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "Dados do Scrum"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr "É um Projeto Scrum"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr "Editar"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Detalhes das Tarefas"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-msgstr "postpone.wizard"
-
-#. 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 ""
-"Este assistente mescla Backlogs e cria um novo Backlog no estado Rascunho "
-"(Antigos Backlogs serão deletados). E isto também mescla antigas tarefas dos "
-"Backlogs."
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr "Adiar Backlog"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr "Selecione o projeto para Backlogs mesclados"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-msgstr "Meu Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,effective_hours:0
-msgid "Spent Hours"
-msgstr "Horas Gastas"
-
-#. 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 "Computado usando a soma do tempo gasto em cada tarefa relacionada"
-
-#. 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 "Painel Scrum"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_sprint
-msgid "Project Scrum Sprint"
-msgstr "Sprint do Projeto Scrum"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Feature Description"
-msgstr "Descrição da Característica"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr "Favor selecionar algum Projeto"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr "Obrigado"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-msgstr "Sprints Atuais"
-
-#. 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 "Atribuir Sprint"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Atribuir para"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr "Tem certeza de adiar Backlog"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr "Para alterar para Aberto"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr "Favor selecionar no mínimo dois Backlogs de Produto"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Revisão do Sprint"
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "Método de Desenvolvimento Ágil, Scrum"
-
-#~ msgid "Scrum Product backlog"
-#~ msgstr "Backlog de Produto do Scrum"
-
-#~ msgid "Template"
-#~ msgstr "Modelo"
-
-#~ msgid "My tasks"
-#~ msgstr "Minhas tarefas"
-
-#~ msgid "My opened sprints (Product Owner)"
-#~ msgstr "Meus Sprints abertos (Proprietário do Produto)"
-
-#~ 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"
-
-#~ msgid "Scrum Task"
-#~ msgstr "Tarefa Scrum"
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "Tarefas Delegadas"
-
-#~ msgid "Project Members"
-#~ msgstr "Membros do Projeto"
-
-#~ 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."
-
-#~ msgid "Importance"
-#~ msgstr "Importância"
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "O que você realizou desde ontem?"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "Projetos Scrum"
-
-#~ msgid "Subproject"
-#~ msgstr "Subprojeto"
-
-#~ msgid "Notes"
-#~ msgstr "Anotações"
-
-#~ msgid "Very urgent"
-#~ msgstr "Urgentíssimo"
-
-#~ 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"
-
-#~ 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"
-
-#~ msgid "Mail Header"
-#~ msgstr "Cabeçalho de Correspondência"
-
-#~ 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"
-
-#~ msgid "Deadline"
-#~ msgstr "Prazo limite"
-
-#~ msgid "All Tasks"
-#~ msgstr "Todas as Tarefas"
-
-#~ msgid "Analytic Account"
-#~ msgstr "Conta Analítica"
-
-#~ msgid "Priority"
-#~ msgstr "Prioridade"
-
-#~ msgid "Type"
-#~ msgstr "Tipo"
-
-#~ msgid "Internal description of the project."
-#~ msgstr "Descrição interna do projeto"
-
-#~ 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"
-
-#~ msgid "Partner"
-#~ msgstr "Parceiro"
-
-#~ msgid "Medium"
-#~ msgstr "Médio"
-
-#~ msgid "Total Time"
-#~ msgstr "Tempo Total"
-
-#~ msgid "Projects"
-#~ msgstr "Projetos"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "XML inválido para Arquitetura da View"
-
-#~ msgid "Planned Time"
-#~ msgstr "Tempo Planejado"
-
-#~ msgid "Progress (%)"
-#~ msgstr "Progresso (%)"
-
-#~ msgid "Delay Hours"
-#~ msgstr "Horas de Atraso"
-
-#~ msgid "Create Tasks"
-#~ msgstr "Criar Tarefas"
-
-#~ msgid "Scrum Tasks"
-#~ msgstr "Tarefas do Scrum"
-
-#~ msgid "Contact"
-#~ msgstr "Contato"
-
-#~ msgid "My opened sprints (Scrum Master)"
-#~ msgstr "Meus sprints abertos"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "Informação Opcional"
-
-#~ msgid "Opened tasks"
-#~ msgstr "Tarefas Abertas"
-
-#~ msgid "Is Scrum"
-#~ msgstr "É Scrum"
-
-#~ 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."
-
-#~ msgid "Low"
-#~ msgstr "Baixo"
-
-#~ msgid "My opened tasks"
-#~ msgstr "Minhas tarefas abertas"
-
-#~ msgid "Opened Sprints"
-#~ msgstr "Sprints Abertos"
-
-#~ msgid "Time Spent"
-#~ msgstr "Tempo Gasto"
-
-#~ msgid "Project Manager"
-#~ msgstr "Gerente do Projeto"
-
-#~ msgid "User"
-#~ msgstr "Usuário"
-
-#~ msgid "Draft Sprints"
-#~ msgstr "Esboço de Sprints"
-
-#~ msgid "Timebox"
-#~ msgstr "Janela de Tempo"
-
-#~ 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."
-
-#~ msgid "My Sprints (Scrum Master)"
-#~ msgstr "Meus Sprints"
-
-#~ msgid "Project Name"
-#~ msgstr "Nome do Projeto"
-
-#~ msgid "Assigned to"
-#~ msgstr "Atribuída para"
-
-#~ msgid "Date Closed"
-#~ msgstr "Data de Fechamento"
-
-#~ msgid "Work done"
-#~ msgstr "Trabalho concluído"
-
-#~ msgid "Delegated To"
-#~ msgstr "Delegado para"
-
-#~ msgid "Working Time"
-#~ msgstr "Tempo Trabalhado"
-
-#~ 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"
-
-#~ msgid "Sum of planned hours of all tasks related to this project."
-#~ msgstr ""
-#~ "Soma das horas planejadas para as tarefas relacionadas a este projeto"
-
-#~ 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."
-
-#~ msgid "Warn Partner"
-#~ msgstr "Alerte o Parceiro"
-
-#~ msgid "Warn Manager"
-#~ msgstr "Avisar o Gestor"
-
-#~ msgid "Task summary"
-#~ msgstr "Sumário da tarefa"
-
-#~ msgid "My Sprints (Product Owner)"
-#~ msgstr "Meus Sprints"
-
-#~ msgid "Sprints Done"
-#~ msgstr "Sprints Terminados"
-
-#~ msgid "Very Low"
-#~ msgstr "Muito Baixa"
-
-#~ msgid "Parent Task"
-#~ msgstr "Tarefa Pai"
-
-#~ msgid "Timetable working hours to adjust the gantt diagram report"
-#~ msgstr "Tabela de horas trabalhadas para ajustar o gráfico de Gantt"
-
-#~ msgid "Description"
-#~ msgstr "Descrição"
-
-#~ msgid "Edit Projects"
-#~ msgstr "Editar Projetos"
-
-#~ msgid "Urgent"
-#~ msgstr "Urgente"
-
-#~ msgid "Running"
-#~ msgstr "Em execução"
-
-#~ msgid "Scrum Project"
-#~ msgstr "Projeto Scrum"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "No que você está trabalhando hoje?"
-
-#~ msgid "Parent project"
-#~ msgstr "Projeto pai"
-
-#~ msgid "Context"
-#~ msgstr "Contexto"
-
-#~ msgid "Users"
-#~ msgstr "Usuários"
-
-#~ msgid "Total Hours"
-#~ msgstr "Total de Horas"
-
-#~ msgid "Hours Spent"
-#~ msgstr "Horas Gastas"
-
-#~ 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."
-
-#~ msgid "Opened Backlogs"
-#~ msgstr "Backlogs Abertos"
-
-#~ msgid "Created tasks"
-#~ msgstr "Tarefas Criadas"
-
-#~ msgid "Mail Footer"
-#~ msgstr "Rodapé de Correspondëncia"
-
-#~ msgid "Error ! You can not create recursive projects."
-#~ msgstr "Erro ! Você não pode criar projetos recursivos."
-
-#~ msgid "Expected End"
-#~ msgstr "Término Previsto"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nome de modelo inválido na definição da ação."
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "A sua estimativa do Sprint Backlog está precisa?"
-
-#~ 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."
-
-#~ msgid "Team Name"
-#~ msgstr "Nome da equipe"
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "Calculado como: Tempo Gasto + Tempo Restante"
-
-#~ msgid "Task Details"
-#~ msgstr "Detalhes da Tarefa"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "Existe algo lhe bloqueando?"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Scrum Team"
-#~ msgstr "Equipe do Scrum"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "O nome do objeto precisa iniciar com x_ e não pode conter nenhum caracter "
-#~ "especial!"
diff --git a/addons/project_scrum/i18n/ro.po b/addons/project_scrum/i18n/ro.po
deleted file mode 100644
index d0b888f8ed4..00000000000
--- a/addons/project_scrum/i18n/ro.po
+++ /dev/null
@@ -1,1033 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+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: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
diff --git a/addons/project_scrum/i18n/ru.po b/addons/project_scrum/i18n/ru.po
deleted file mode 100644
index be5082a2645..00000000000
--- a/addons/project_scrum/i18n/ru.po
+++ /dev/null
@@ -1,1375 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:13+0000\n"
-"Last-Translator: Raphael Collet (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: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Автор"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr "Что Вы делали с прошлой встречи?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "Название Sprint-а"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Выполнение"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Мастер Scrum"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "Являются ли оценки ваших задолженностей по Sprint точными?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "Ретроспектива"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "Отправить эл. письмо"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "Ошибка! Вы не можете создавать рекурсивные задачи."
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "Просмотреть задолженноси проекта"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr "Обьединить журналы"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "Задача"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr "Затрачено времени"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "Задолженности по продукту"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Проект"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "Запуск задания"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Дата окончания"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "Рассчитывается на основе объёма выполненных заданий."
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Запланированные часы"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Состояние"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "Просмотреть задания Sprint-а"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "Ежедневный Scrum"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Задания на сегодня"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "Задания со вчерашнего дня"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Отменено"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "Показать задания проекта"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,backlog_ids:0
-msgid "Sprint Backlog"
-msgstr "Задолженности по Sprint-у"
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "Дата встречи"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Задания"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Вычисляется по формуле: Затраченное время / Общее время."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "Scrum Sprint"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "В работе"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Просмотреть"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "Ретроспектива Sprint-а"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Примечание"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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 "Просмотреть задолженности по Sptint-у"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "Точность задолженности"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Последовательность"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Выполнено"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Отменить"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "Открыто"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "Эффективные часы"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Оставшиеся часы"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Особенность"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr "Запланированные часы"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Дата начала"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-msgstr "Встрача Scrum"
-
-#. 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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Ежедневные встречи"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "Дней в Sprint-е"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Выполнение (0-100)"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Info"
-msgstr "Информация Sprint-а"
-
-#. 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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "Описание заданий"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "Назначить на"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "Sprint"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "Обзор Sprint-а"
-
-#~ msgid "Scrum Product backlog"
-#~ msgstr "Задолженности по продуктам Scrum"
-
-#~ msgid "My tasks"
-#~ msgstr "Мои задания"
-
-#~ msgid "My opened sprints (Product Owner)"
-#~ msgstr "Мои открытые Sprint-ы (Владелец продукта)"
-
-#~ msgid "Subproject"
-#~ msgstr "Подпроект"
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "Что вы закончили со вчерашнего дня?"
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "Являются ли оценки ваших задолженностей по Sprint точными?"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "Проекты Scrum"
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "Делегированные задания"
-
-#~ msgid "Importance"
-#~ msgstr "Важность"
-
-#~ msgid "Scrum Task"
-#~ msgstr "Задание Scrum"
-
-#~ msgid "Very urgent"
-#~ msgstr "Весьма срочно"
-
-#~ msgid "Notes"
-#~ msgstr "Примечания"
-
-#~ msgid "Team Name"
-#~ msgstr "Название команды"
-
-#~ msgid "Analytic Account"
-#~ msgstr "Счет аналитики"
-
-#~ msgid "All Tasks"
-#~ msgstr "Все задания"
-
-#~ msgid "Deadline"
-#~ msgstr "Срок"
-
-#~ msgid "Priority"
-#~ msgstr "Приоритет"
-
-#~ msgid "Type"
-#~ msgstr "Тип"
-
-#~ msgid "Medium"
-#~ msgstr "Средний"
-
-#~ msgid "Projects"
-#~ msgstr "Проекты"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильный XML для просмотра архитектуры!"
-
-#~ msgid "Task Details"
-#~ msgstr "Описание задания"
-
-#~ msgid "Contact"
-#~ msgstr "Контакт"
-
-#~ msgid "Scrum Tasks"
-#~ msgstr "Задания Scrum"
-
-#~ msgid "Create Tasks"
-#~ msgstr "Создать задания"
-
-#~ msgid "Is Scrum"
-#~ msgstr "Является Scrum"
-
-#~ msgid "Opened tasks"
-#~ msgstr "Открытые задания"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "Необязательная информация"
-
-#~ msgid "My opened sprints (Scrum Master)"
-#~ msgstr "Мои открытые Sprint-ы (Мастер Scrum)"
-
-#~ msgid "Low"
-#~ msgstr "Низкий"
-
-#~ msgid "My opened tasks"
-#~ msgstr "Мои открытые задания"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "Вас блокирует что-либо?"
-
-#~ msgid "Status"
-#~ msgstr "Статус"
-
-#~ msgid "Opened Sprints"
-#~ msgstr "Открытые Sprint-ы"
-
-#~ msgid "My Sprints (Scrum Master)"
-#~ msgstr "Мои Sprint-ы (Мастер Scrum)"
-
-#~ msgid "User"
-#~ msgstr "Пользователь"
-
-#~ msgid "Draft Sprints"
-#~ msgstr "Черновики Sprint-ов"
-
-#~ msgid "Work done"
-#~ msgstr "Работа выполнена"
-
-#~ msgid "Date Closed"
-#~ msgstr "Дата закрытия"
-
-#~ msgid "Assigned to"
-#~ msgstr "Назначено на"
-
-#~ msgid "My Sprints (Product Owner)"
-#~ msgstr "Мои Sprint-ы (Владелец продукта)"
-
-#~ msgid "Task summary"
-#~ msgstr "Обзор задания"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Название объекта должно начинаться с x_  и не должно содержать специальных "
-#~ "символов !"
-
-#~ msgid "Parent Task"
-#~ msgstr "Задание-предок"
-
-#~ msgid "Very Low"
-#~ msgstr "Очень низкий"
-
-#~ msgid "Sprints Done"
-#~ msgstr "Выполненные Sprint-ы"
-
-#~ msgid "Edit Projects"
-#~ msgstr "Изменить проекты"
-
-#~ msgid "Description"
-#~ msgstr "Описание"
-
-#~ msgid "Urgent"
-#~ msgstr "Срочно"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "Над чем вы сегодня работаете?"
-
-#~ msgid "Scrum Team"
-#~ msgstr "Команда Scrum"
-
-#~ msgid "Scrum Project"
-#~ msgstr "Проект Scrum"
-
-#~ msgid "Parent project"
-#~ msgstr "Родительский проект"
-
-#~ msgid "Context"
-#~ msgstr "Контекст"
-
-#~ msgid "Users"
-#~ msgstr "Пользователи"
-
-#~ msgid "Opened Backlogs"
-#~ msgstr "Открытые задолженности"
-
-#~ msgid "Created tasks"
-#~ msgstr "Созданные задания"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid ""
-#~ "If you check this field, the project manager will receive a request each "
-#~ "time a task is completed by his team."
-#~ msgstr ""
-#~ "Если вы выберете эту опцию, руководитель проекта каждый раз при завершении "
-#~ "задания его командой будет получать запрос."
-
-#~ msgid ""
-#~ "Total remaining time, can be re-estimated periodically by the assignee of "
-#~ "the task."
-#~ msgstr ""
-#~ "Общее количество оставшегося времени может быть переодически переоценено "
-#~ "тем, кто отвечает за это задание."
-
-#~ msgid "Project Members"
-#~ msgstr "Участники проекта"
-
-#~ msgid ""
-#~ "Header added at the beginning of the email for the warning message sent to "
-#~ "the customer when a task is closed."
-#~ msgstr ""
-#~ "Заголовок, добавляемый в начало электронного письма для предупреждения, "
-#~ "отправляемого заказчику при закрытии задачи."
-
-#~ msgid ""
-#~ "Project's member. Not used in any computation, just for information purpose."
-#~ msgstr ""
-#~ "Участников проекта. Не использовать в расчетах, только в информационных "
-#~ "целях."
-
-#~ msgid ""
-#~ "Estimated time to do the task, usually set by the project manager when the "
-#~ "task is in draft state."
-#~ msgstr ""
-#~ "Предположительное время, необходимое для завершения задания. Обычно "
-#~ "устанавливается руководителем проекта, когда задание находится в статусе "
-#~ "\"Черновик\"."
-
-#~ msgid "Total Time"
-#~ msgstr "Всего времени"
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "Вычисляется по формуле: Затраченное время + Оставшееся время."
-
-#~ msgid "Mail Header"
-#~ msgstr "Заголовок письма"
-
-#~ msgid "Internal description of the project."
-#~ msgstr "Внутреннее описание проекта."
-
-#~ 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 ""
-#~ "Если вы выберете эту опцию, то при закрытии задания пользователь будет "
-#~ "получать сообщение с предложением послать клиенту письмо по электронной "
-#~ "почте."
-
-#~ msgid "Template"
-#~ msgstr "Шаблон"
-
-#~ msgid "Percent of tasks closed according to the total of tasks todo."
-#~ msgstr "Процент закрытых заданий в соответствии с общем количеством заданий."
-
-#~ msgid "Partner"
-#~ msgstr "Партнер"
-
-#~ msgid "Timebox"
-#~ msgstr "Период"
-
-#~ msgid "Progress (%)"
-#~ msgstr "Выполнение (%)"
-
-#~ msgid "Planned Time"
-#~ msgstr "Запланированное время"
-
-#~ msgid "Delay Hours"
-#~ msgstr "Время отсрочки"
-
-#~ msgid "Sum of total hours of all tasks related to this project."
-#~ msgstr "Общее время всех заданий, связанных с этим проектом."
-
-#~ msgid "Time Spent"
-#~ msgstr "Затрачено времени"
-
-#~ 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 ""
-#~ "Вычисляется по формуле: Общее время - Предположительное время. Позволяет "
-#~ "увидеть разницу между предположительной оценкой необходимого времени, "
-#~ "сделанной руководителем проекта, и реальным временем, затраченным на "
-#~ "завершение задания."
-
-#~ msgid "Project Manager"
-#~ msgstr "Руководитель проекта"
-
-#~ msgid "Project Name"
-#~ msgstr "Название проекта"
-
-#~ 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 ""
-#~ "Свяжите этот проект с аналитическим счетом, если Вы нуждаетесь в управлении "
-#~ "финансовой деятельностью на проектах. Это позволяет Вам соединить проект с "
-#~ "бюджетами, планированием, стоимостью и анализом дохода, табели на проектах, "
-#~ "и т.д."
-
-#~ msgid "Warn Partner"
-#~ msgstr "Предупредить Партнера"
-
-#~ msgid "Delegated To"
-#~ msgstr "Поручено"
-
-#~ msgid "Working Time"
-#~ msgstr "Время работы"
-
-#~ msgid "Sum of spent hours of all tasks related to this project."
-#~ msgstr ""
-#~ "Общее количество времени, затраченного на все задания, связанные с этим "
-#~ "проектом."
-
-#~ msgid "Warn Manager"
-#~ msgstr "Предупредить руководителя"
-
-#~ msgid "Sum of planned hours of all tasks related to this project."
-#~ msgstr ""
-#~ "Общее количество времени, запланированного для выполнения всех заданий, "
-#~ "связанных с этим проектом."
-
-#~ msgid "Total Hours"
-#~ msgstr "Всего часов"
-
-#~ msgid "Hours Spent"
-#~ msgstr "Затраченное время"
-
-#~ msgid "Mail Footer"
-#~ msgstr "Нижняя часть письма"
-
-#~ msgid ""
-#~ "Footer added at the beginning of the email for the warning message sent to "
-#~ "the customer when a task is closed."
-#~ msgstr ""
-#~ "В начало письма добавлена сноска, чтобы при завершении задания клиент "
-#~ "получал предупреждение."
-
-#~ msgid "Running"
-#~ msgstr "Выполняется"
-
-#~ msgid "Error ! You can not create recursive projects."
-#~ msgstr "Ошибка! Вы не можете  создать взаимное подчинение проектов!"
-
-#~ msgid "Timetable working hours to adjust the gantt diagram report"
-#~ msgstr "Расписание работы для настройки отчета диаграммы Ганта"
-
-#~ msgid "Expected End"
-#~ msgstr "Предположительное окончание"
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "Scrum, быстрый метод разработки"
diff --git a/addons/project_scrum/i18n/sl.po b/addons/project_scrum/i18n/sl.po
deleted file mode 100644
index 02f03511b46..00000000000
--- a/addons/project_scrum/i18n/sl.po
+++ /dev/null
@@ -1,1152 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-08-02 16:41+0000\n"
-"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Potek"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Končni datum"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Načrovane ure"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Stanje"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "Čakajoči"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Preklicano"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Opravila"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "V obdelavi"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Pregled"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Opomba"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Osnutek"
-
-#. 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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-msgstr "Aktivno"
-
-#. 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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "Zaporedje"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "Zaključeno"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "Prekliči"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "Odpri"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "Preostale ure"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "Možnost"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr "Načrtovane ure"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Začetni datum"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
-
-#~ msgid "Template"
-#~ msgstr "Predloga"
-
-#~ msgid "My tasks"
-#~ msgstr "Moje naloge"
-
-#~ msgid "Subproject"
-#~ msgstr "Podprojekt"
-
-#~ msgid "Notes"
-#~ msgstr "Opombe"
-
-#~ msgid "All Tasks"
-#~ msgstr "Vsa opravila"
-
-#~ msgid "Team Name"
-#~ msgstr "Ime ekipe"
-
-#~ msgid "Analytic Account"
-#~ msgstr "Analitični konto"
-
-#~ msgid "Priority"
-#~ msgstr "Prioriteta"
-
-#~ msgid "Type"
-#~ msgstr "Tip"
-
-#~ msgid "Partner"
-#~ msgstr "Partner"
-
-#~ msgid "Medium"
-#~ msgstr "Srednje"
-
-#~ msgid "Total Time"
-#~ msgstr "Skupni čas"
-
-#~ msgid "Projects"
-#~ msgstr "Projekti"
-
-#~ msgid "Task Details"
-#~ msgstr "Podrobnosti opravila"
-
-#~ msgid "Progress (%)"
-#~ msgstr "Potek (%)"
-
-#~ msgid "Low"
-#~ msgstr "Nizko"
-
-#~ msgid "Status"
-#~ msgstr "Stanje"
-
-#~ msgid "Project Manager"
-#~ msgstr "Vodja projekta"
-
-#~ msgid "Project Name"
-#~ msgstr "Ime projekta"
-
-#~ msgid "User"
-#~ msgstr "Uporabnik"
-
-#~ msgid "Assigned to"
-#~ msgstr "Dodeljeno"
-
-#~ msgid "Very Low"
-#~ msgstr "Zelo nizko"
-
-#~ msgid "Description"
-#~ msgstr "Opis"
-
-#~ msgid "Urgent"
-#~ msgstr "Nujno"
-
-#~ msgid "Running"
-#~ msgstr "V teku"
-
-#~ msgid "Users"
-#~ msgstr "Uporabniki"
-
-#~ msgid "Contact"
-#~ msgstr "Stik"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Napačno ime modela v definiciji dejanja."
-
-#~ msgid "Importance"
-#~ msgstr "Pomembnost"
-
-#~ msgid "Very urgent"
-#~ msgstr "Zelo nujno"
-
-#~ msgid "Deadline"
-#~ msgstr "Rok"
-
-#~ msgid "Delay Hours"
-#~ msgstr "Zamuda v urah"
-
-#~ msgid "Working Time"
-#~ msgstr "Delovni čas"
-
-#~ msgid "Time Spent"
-#~ msgstr "Porabljeni čas"
-
-#~ msgid "Date Closed"
-#~ msgstr "Datum zaključka"
-
-#~ msgid "Delegated To"
-#~ msgstr "Pooblaščen"
-
-#~ msgid "Task summary"
-#~ msgstr "Povzetek naloge"
diff --git a/addons/project_scrum/i18n/sq.po b/addons/project_scrum/i18n/sq.po
deleted file mode 100644
index 8745a10af15..00000000000
--- a/addons/project_scrum/i18n/sq.po
+++ /dev/null
@@ -1,1034 +0,0 @@
-# Albanian 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-08-02 15:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Albanian <sq@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:54+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
diff --git a/addons/project_scrum/i18n/sv.po b/addons/project_scrum/i18n/sv.po
deleted file mode 100644
index 9b9a3db0692..00000000000
--- a/addons/project_scrum/i18n/sv.po
+++ /dev/null
@@ -1,1068 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* project_scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-08-01 23:16+0000\n"
-"Last-Translator: Stefan Lind <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Författare"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr "Vad har du gjort sedan sista mötet?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Group By..."
-msgstr "Gruppera på..."
-
-#. module: project_scrum
-#: model:process.node,note:project_scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "Förlopp"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum Master"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "Skicka epost"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-msgstr "Sätt till preliminär"
-
-#. 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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "Uppgift"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr "Ok"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr "Förbrukade timmar"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "Projekt"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "Starta aktivitet"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr "Inga"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "Slutdatum"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "Länkar"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "Beräknad från summan av utfört arbete."
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr "Dagens uppgifter"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "Planering"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "Planerade timmar"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "Status"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "Skapad datum"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "Scrum"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "Dagens uppgifter"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr "Varning"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-msgstr "avvaktande"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_backlog_assign_sprint
-msgid "Assign sprint to backlogs"
-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 "Datum"
-
-#. module: project_scrum
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "Avbruten"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr "Dagligen"
-
-#. 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 "Delegera"
-
-#. module: project_scrum
-#: view:board.board:0
-msgid "My Board"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "Uppgifter"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "Beräknas som: nedlagd tid / total tid."
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr "Månad"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "Granska"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "Anteckning"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "Utkast"
-
-#. 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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr "Senarelägg"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-msgstr "Aktiv"
-
-#. 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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "Startdatum"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "Dagliga möten"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "Förlopp (0-100)"
-
-#. 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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#~ msgid "Notes"
-#~ msgstr "Anteckningar"
-
-#~ msgid "All Tasks"
-#~ msgstr "Alla uppgifter"
-
-#~ msgid "Priority"
-#~ msgstr "Prioritet"
-
-#~ msgid "Type"
-#~ msgstr "Typ"
-
-#~ msgid "Contact"
-#~ msgstr "Kontakt"
-
-#~ msgid "Low"
-#~ msgstr "Låg"
-
-#~ msgid "User"
-#~ msgstr "Användare"
-
-#~ msgid "Assigned to"
-#~ msgstr "Tilldelad till"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
-
-#~ msgid "Description"
-#~ msgstr "Beskrivning"
-
-#~ msgid "Users"
-#~ msgstr "Användare"
diff --git a/addons/project_scrum/i18n/tlh.po b/addons/project_scrum/i18n/tlh.po
deleted file mode 100644
index de562fb1e10..00000000000
--- a/addons/project_scrum/i18n/tlh.po
+++ /dev/null
@@ -1,1033 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+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: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
deleted file mode 100644
index 85a567adf65..00000000000
--- a/addons/project_scrum/i18n/tr.po
+++ /dev/null
@@ -1,1036 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-25 17:38+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,name:0
-msgid "Meeting Name"
-msgstr "Toplantı Adı"
-
-#. module: project_scrum
-#: model:process.transition,note:project_scrum.process_transition_backlogtask0
-msgid "From backlog create task."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "Yazar"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Group By..."
-msgstr "Grupla..."
-
-#. module: project_scrum
-#: model:process.node,note:project_scrum.process_node_productbacklog0
-msgid "Create task from backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Görüntüleme mimarisi için Geçersiz XML"
diff --git a/addons/project_scrum/i18n/uk.po b/addons/project_scrum/i18n/uk.po
deleted file mode 100644
index 595c48510d4..00000000000
--- a/addons/project_scrum/i18n/uk.po
+++ /dev/null
@@ -1,1047 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2009-02-04 06:32+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#~ msgid "All Tasks"
-#~ msgstr "Всі завдання"
-
-#~ msgid "Projects"
-#~ msgstr "Проекти"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Неправильний XML для Архітектури Вигляду!"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
diff --git a/addons/project_scrum/i18n/vi.po b/addons/project_scrum/i18n/vi.po
deleted file mode 100644
index 145c86a85c3..00000000000
--- a/addons/project_scrum/i18n/vi.po
+++ /dev/null
@@ -1,1034 +0,0 @@
-# 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: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-08-02 15:08+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese <vi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
diff --git a/addons/project_scrum/i18n/zh_CN.po b/addons/project_scrum/i18n/zh_CN.po
deleted file mode 100644
index 7b5d707917d..00000000000
--- a/addons/project_scrum/i18n/zh_CN.po
+++ /dev/null
@@ -1,1349 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:27+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@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: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-msgstr "指派(_A)"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr "建立者"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr "你昨天做了什么？"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-msgstr ""
-"叫做SCRUM的敏捷方法用于软件开发项目。在这个理论中，冲刺是一个固定长度的期间（比如一个月），在这个期间内开发团队完成产品的一部分功能。冲刺验收会议用于"
-"向客户和产品经理演示开发成果。"
-
-#. 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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr "冲刺名称"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr "进度"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr "Scrum主管"
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr "冲刺'%s' 已开始"
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr "错误！项目的开始日期必须小于项目的结束日期"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr "你的冲刺需求是否估计准确?"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr "回顾"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr "发送邮件"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr "错误！不能创建循环引用的任务"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr "项目需求视图"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr "合并需求"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr "早会: %s"
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr "需求"
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr "不能升级到相同的项目"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr "任务"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr "确定"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr "花费工时"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr "SCRUM敏捷方法用于软件开发项目。在这个方法中，Scrum主管组织所有项目成员参加早会以便发现团队正在或将要面临的问题。"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr "产品需求"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr "项目"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr "启动任务"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr "无"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr "修改阶段"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr "终止日期"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr "链接"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr "任务完成的工作时间合计"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr "今日任务"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr "待实现的需求"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr "累计工时"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr "估算点数"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr "正在计划"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr "计划时间"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr "冲刺"
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr "转为任务"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr "您确认要合并这些需求？"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr "任务的负责人"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr "状态"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr "查看冲刺任务列表"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr "每日Scrum"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr "转换(_O)"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr "创建日期"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr "有什么问题和困难么？"
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr "SCRUM"
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr "今天任务"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr "昨天到现在的任务"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr "警告"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr "取消"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "项目任务视图"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-"您好，\n"
-"现将 %s 的早会报告（'%s'项目的冲刺'%s'）发给你。"
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr "冲刺 '%s' 已结束"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr "任务进度"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr "会议日期"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr "任务"
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr "选择冲刺这个需求"
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr "计算方式：花费时间 / 总时间"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr "月份"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-msgstr "Backlogs草稿"
-
-#. 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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr "今天你计划做什么"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr "SCRUM冲刺"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr "进展"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr "产品负责人"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr "复审"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr "冲刺回顾"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr "备注"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-msgstr "草稿"
-
-#. module: project_scrum
-#: help:project.task,product_backlog_id:0
-msgid ""
-"Related product backlog that contains this task. Used in SCRUM methodology"
-msgstr "这个任务相关的产品需求。用于SCRUM方法"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr "推迟"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr "需求正确"
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr "转为任务"
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr "序列"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr "需求进展"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr "完成"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr "取消"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr "结束"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr "打开"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr "有效时间"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr "剩余时间"
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr "负责人"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr "特征"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr "我的需求列表"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-"SCRUM敏捷开发方法用于软件开发项目。产品需求是一个要实现的功能列表。一个需求会被划分给某个冲刺来实现，可能会被分成多个任务。需求列表由项目中的产品负责"
-"人统一维护。"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr "计划时间"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr "开始日期"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr "每日会议"
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr "预计工时"
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr "冲刺天数"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-msgstr "进度(0 - 100)"
-
-#. 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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr "Scrum数据"
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr "该项目使用SCRUM方法管理"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr "编辑"
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr "任务详情"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-msgstr "postpone.wizard"
-
-#. 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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr "需求延期"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr "选择合并后的需求所属的项目"
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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 "SCRUM控制台"
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_sprint
-msgid "Project Scrum Sprint"
-msgstr "项目SCRUM冲刺"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Feature Description"
-msgstr "功能描述"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr "请选择一个项目"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr "感谢您，"
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr "分配给"
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr "确实要推迟需求"
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr "冲刺"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr "请至少选择两个需求"
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr "冲刺复审"
-
-#~ msgid "All Tasks"
-#~ msgstr "所有任务"
-
-#~ msgid "Create Tasks"
-#~ msgstr "创建任务"
-
-#~ msgid "My tasks"
-#~ msgstr "我的任务"
-
-#~ msgid "Project Members"
-#~ msgstr "项目成员"
-
-#~ msgid "Notes"
-#~ msgstr "备注"
-
-#~ msgid "Very urgent"
-#~ msgstr "非常紧急"
-
-#~ msgid "Partner"
-#~ msgstr "业务伙伴"
-
-#~ msgid "Scrum Product backlog"
-#~ msgstr "Scrum 的 Product backlog"
-
-#~ msgid "My opened sprints (Product Owner)"
-#~ msgstr "我待处理的sprints(产品负责人)"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "在这动作定义中无效的模块名"
-
-#~ msgid "Scrum, Agile Development Method"
-#~ msgstr "Scrum敏捷开发方法"
-
-#~ msgid ""
-#~ "Total remaining time, can be re-estimated periodically by the assignee of "
-#~ "the task."
-#~ msgstr "总剩余时间,能重新估计任务接受者的周期"
-
-#~ msgid "Subproject"
-#~ msgstr "子计划"
-
-#~ msgid "What have you accomplished since yesterday ?"
-#~ msgstr "昨天你干出什么成绩?"
-
-#~ msgid "Scrum Projects"
-#~ msgstr "Scrum项目"
-
-#~ msgid "Delegated Tasks"
-#~ msgstr "委任任务"
-
-#~ msgid ""
-#~ "Header added at the beginning of the email for the warning message sent to "
-#~ "the customer when a task is closed."
-#~ msgstr "在任务结束时发送给客户的电子邮件开头增加的头"
-
-#~ msgid "Importance"
-#~ msgstr "重要"
-
-#~ msgid "Scrum Task"
-#~ msgstr "Scrum任务"
-
-#~ msgid ""
-#~ "Project's member. Not used in any computation, just for information purpose."
-#~ msgstr "项目成员不使用任何计算只是为了显示"
-
-#~ msgid ""
-#~ "Estimated time to do the task, usually set by the project manager when the "
-#~ "task is in draft state."
-#~ msgstr "任务估计时间通常由项目管理者在任务草稿状态下设定."
-
-#~ msgid ""
-#~ "If you check this field, the project manager will receive a request each "
-#~ "time a task is completed by his team."
-#~ msgstr "如果选这项,团队将收到项目管理者对每个任务完成时间的要求"
-
-#~ msgid "Team Name"
-#~ msgstr "团队名称"
-
-#~ msgid "Mail Header"
-#~ msgstr "电子邮件头"
-
-#~ 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 "如果选中,用户将在任务结束时向客户发送一建议信息的电子邮件"
-
-#~ msgid "Analytic Account"
-#~ msgstr "辅助核算项"
-
-#~ msgid "Deadline"
-#~ msgstr "截止期限"
-
-#~ msgid "Template"
-#~ msgstr "模板"
-
-#~ msgid "Priority"
-#~ msgstr "优先"
-
-#~ msgid "Percent of tasks closed according to the total of tasks todo."
-#~ msgstr "关闭任务和所有任务的百分比"
-
-#~ msgid "Internal description of the project."
-#~ msgstr "项目内部说明"
-
-#~ msgid "Computed as: Time Spent + Remaining Time."
-#~ msgstr "计算:花费的时间 + 剩余的时间"
-
-#~ msgid "Type"
-#~ msgstr "类型"
-
-#~ msgid "Medium"
-#~ msgstr "中"
-
-#~ msgid "Total Time"
-#~ msgstr "总时间"
-
-#~ msgid "Planned Time"
-#~ msgstr "计划时间"
-
-#~ msgid "Projects"
-#~ msgstr "项目"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "无效的视图结构xml文件"
-
-#~ msgid "Task Details"
-#~ msgstr "任务详情"
-
-#~ msgid "Delay Hours"
-#~ msgstr "延迟时间"
-
-#~ msgid "Contact"
-#~ msgstr "联系"
-
-#~ msgid "Scrum Tasks"
-#~ msgstr "Scrum任务"
-
-#~ msgid "Progress (%)"
-#~ msgstr "进度(%)"
-
-#~ msgid "Is Scrum"
-#~ msgstr "是Scrum"
-
-#~ msgid "Opened tasks"
-#~ msgstr "待处理任务"
-
-#~ msgid "Optionnal Info"
-#~ msgstr "选项信息"
-
-#~ msgid "Sum of total hours of all tasks related to this project."
-#~ msgstr "这项目所有相关任务的总时间合计"
-
-#~ msgid "My opened sprints (Scrum Master)"
-#~ msgstr "我待处理的Sprint(团队主管)"
-
-#~ msgid "Low"
-#~ msgstr "低"
-
-#~ msgid "My opened tasks"
-#~ msgstr "我待处理的任务"
-
-#~ msgid "Project Manager"
-#~ msgstr "项目主管"
-
-#~ msgid "Is there anything blocking you ?"
-#~ msgstr "有什么阻碍了你?"
-
-#~ msgid "Status"
-#~ msgstr "状态"
-
-#~ msgid "Opened Sprints"
-#~ msgstr "待处理的Sprints"
-
-#~ msgid "Time Spent"
-#~ msgstr "时间花费"
-
-#~ msgid "Project Name"
-#~ msgstr "项目名称"
-
-#~ msgid "My Sprints (Scrum Master)"
-#~ msgstr "我的Sprints(Scrum主管)"
-
-#~ msgid "User"
-#~ msgstr "用户"
-
-#~ 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 "计算:总时间 - 估计时间.它给项目管理者一个估计时间和实际时间的差异"
-
-#~ msgid "Timebox"
-#~ msgstr "时间箱"
-
-#~ msgid "Draft Sprints"
-#~ msgstr "Sprints草稿"
-
-#~ msgid "Working Time"
-#~ msgstr "工作时间"
-
-#~ msgid "Work done"
-#~ msgstr "工作完成"
-
-#~ msgid "Delegated To"
-#~ msgstr "委托给"
-
-#~ msgid "Date Closed"
-#~ msgstr "关闭日期"
-
-#~ msgid "Assigned to"
-#~ msgstr "分配给"
-
-#~ msgid "Sum of spent hours of all tasks related to this project."
-#~ msgstr "这项目所有相关任务花费时间的合计"
-
-#~ msgid "Sum of planned hours of all tasks related to this project."
-#~ msgstr "这项目所有相关任务计划时间的合计"
-
-#~ msgid "Warn Partner"
-#~ msgstr "警告业务伙伴"
-
-#~ msgid "My Sprints (Product Owner)"
-#~ msgstr "我的Sprints(产品负责人)"
-
-#~ msgid "Task summary"
-#~ msgstr "任务摘要"
-
-#~ 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 "如果你需要项目财务管理链接到项目辅助核算项.它能连接到项目的预算,计划,成本和收益分析,项目时间表等."
-
-#~ msgid "Warn Manager"
-#~ msgstr "警告消息"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr "对象名必须以x_开头并且不很含有特殊的字符"
-
-#~ msgid "Parent Task"
-#~ msgstr "上级任务"
-
-#~ msgid "Very Low"
-#~ msgstr "非常低"
-
-#~ msgid "Timetable working hours to adjust the gantt diagram report"
-#~ msgstr "时间表工作时间调整甘特图报表"
-
-#~ msgid "Sprints Done"
-#~ msgstr "Sprints完成"
-
-#~ msgid "Edit Projects"
-#~ msgstr "编辑项目"
-
-#~ msgid "Description"
-#~ msgstr "描述"
-
-#~ msgid "Urgent"
-#~ msgstr "紧急"
-
-#~ msgid "What are you working on today ?"
-#~ msgstr "今天你要干什么工作?"
-
-#~ msgid "Running"
-#~ msgstr "运行"
-
-#~ msgid "Scrum Team"
-#~ msgstr "Scrum团队"
-
-#~ msgid "Scrum Project"
-#~ msgstr "Scrum项目"
-
-#~ msgid "Parent project"
-#~ msgstr "上级项目"
-
-#~ msgid "Hours Spent"
-#~ msgstr "时间花费"
-
-#~ msgid "Context"
-#~ msgstr "上下文"
-
-#~ msgid "Total Hours"
-#~ msgstr "总时间"
-
-#~ msgid "Users"
-#~ msgstr "用户"
-
-#~ msgid ""
-#~ "Footer added at the beginning of the email for the warning message sent to "
-#~ "the customer when a task is closed."
-#~ msgstr "任务关闭时发送给客户警告电子邮件增加的页脚"
-
-#~ msgid "Opened Backlogs"
-#~ msgstr "待处理的Backlogs"
-
-#~ msgid "Created tasks"
-#~ msgstr "创建任务"
-
-#~ msgid "Error ! You can not create recursive projects."
-#~ msgstr "错误!你不能创建递归的项目"
-
-#~ msgid "Expected End"
-#~ msgstr "即将结束"
-
-#~ msgid "Mail Footer"
-#~ msgstr "电子邮件页脚"
-
-#~ msgid "Are your Sprint Backlog estimate accurate ?"
-#~ msgstr "你的冲刺需求是否估计准确?"
diff --git a/addons/project_scrum/i18n/zh_TW.po b/addons/project_scrum/i18n/zh_TW.po
deleted file mode 100644
index 01c60a76d0d..00000000000
--- a/addons/project_scrum/i18n/zh_TW.po
+++ /dev/null
@@ -1,1036 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* scrum
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2009-01-30 13:29+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:55+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-msgid "_Assign"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,user_id:0
-msgid "Author"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "What did you do since the last meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Sprint Month"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a sprint is a short period of time (e.g. one month) during "
-"which the team implements a list of product backlogs. The sprint review is "
-"organized when the team presents its work to the customer and product owner."
-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
-#: field:project.scrum.sprint,name:0
-msgid "Sprint Name"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,progress:0
-msgid "Progress"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,user_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,scrum_master_id:0
-msgid "Scrum Master"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/project_scrum.py:83
-#, python-format
-msgid "The sprint '%s' has been opened."
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! project start-date must be lower then project end-date."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are your sprint backlog estimate accurate ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Send Email"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! You cannot create recursive tasks."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "In Progress Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to delegate state"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
-#, python-format
-msgid "Product Backlog '%s' is assigned to sprint %s"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj
-msgid "View project's backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Set to Draft"
-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_scrum_backlog_merge
-#: view:project.scrum.backlog.merge:0
-msgid "Merge Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:54
-#: code:addons/project_scrum/wizard/project_scrum_email.py:53
-#, python-format
-msgid "Scrum Meeting : %s"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.project:0
-msgid "Error! You cannot assign escalation to the same project!"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_task
-msgid "Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Ok"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Spent hours"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_meeting_form
-msgid ""
-"The scrum agile methodology is used in software development projects. In "
-"this methodology, a daily meeting is organized by the scrum master with his "
-"team in order to detect the difficulties the team faced/will face."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Assigned To Current Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For cancelling the task"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
-#: view:project.scrum.product.backlog:0
-#: field:project.task,product_backlog_id:0
-msgid "Product Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_project
-#: field:project.scrum.backlog.merge,project_id:0
-#: field:project.scrum.meeting,project_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,project_id:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,project_id:0
-msgid "Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Start Task"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:91
-#: code:addons/project_scrum/wizard/project_scrum_email.py:94
-#: code:addons/project_scrum/wizard/project_scrum_email.py:97
-#, python-format
-msgid "None"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Stage"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_stop:0
-msgid "Ending Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Links"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,effective_hours:0
-msgid "Computed using the sum of the task work done."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:92
-#, python-format
-msgid "Task for Today"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,state_open:0
-msgid "Open Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Total Spent Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Pending Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:95
-#, python-format
-msgid "Blocking points encountered:"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Backlogs Not Assigned To Sprints."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Planning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.assign.sprint:0
-#: view:project.scrum.backlog.create.task:0
-msgid "_Cancel"
-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
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,expected_hours:0
-#: field:project.scrum.sprint,expected_hours:0
-msgid "Planned Hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_dashboard_tree
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_all_tree
-#: model:ir.ui.menu,name:project_scrum.menu_action_sprint_all_tree
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,convert_to_task:0
-msgid "Convert To Task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Are you sure you want to merge these backlogs?"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.create.task,user_id:0
-msgid "Responsible user who can work on task"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,state:0
-msgid "State"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_sprint_task_open
-msgid "View sprint Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,meeting_ids:0
-msgid "Daily Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.create.task:0
-msgid "C_onvert"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Pending 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.model,name:project_scrum.model_mail_compose_message
-msgid "E-mail composition wizard"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Are there anything blocking you?"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.ui.menu,name:project_scrum.menu_scrum
-msgid "Scrum"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.meeting,question_today:0
-msgid "Tasks for today"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:89
-#: field:project.scrum.meeting,question_yesterday:0
-#, python-format
-msgid "Tasks since yesterday"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Pending"
-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
-#: 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
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.dblc_proj2
-msgid "View project's tasks"
-msgstr "项目任务视图"
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/mail_compose_message.py:55
-#: code:addons/project_scrum/wizard/project_scrum_email.py:56
-#, python-format
-msgid ""
-"Hello  , \n"
-"I am sending you Scrum Meeting : %s for the Sprint  '%s' of Project '%s'"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-msgid "Daily"
-msgstr ""
-
-#. 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
-#: code:addons/project_scrum/project_scrum.py:90
-#, python-format
-msgid "The sprint '%s' has been closed."
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_task_progress_graph
-#: view:project.task:0
-msgid "Task Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,date:0
-msgid "Meeting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.act_scrum_sprint_2_project_task
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,task_ids:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Tasks"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.backlog.assign.sprint,sprint_id:0
-msgid "Select Sprint to assign backlog."
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.product.backlog,progress:0
-#: help:project.scrum.sprint,progress:0
-msgid "Computed as: Time Spent / Total Time."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Month"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Draft Backlogs"
-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
-#: view:project.scrum.product.backlog:0
-msgid "Total Planned Hours"
-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
-#: view:project.scrum.sprint:0
-msgid "What do you plan to do till the next meeting?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "In Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Product owner"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Review"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,retrospective:0
-msgid "Sprint Retrospective"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,note:0
-msgid "Note"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Draft"
-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
-#: model:ir.actions.act_window,name:project_scrum.action_postpone_wizard
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-msgid "Postpone"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Change Type"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to done state"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "New Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Optional Info"
-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
-#: field:project.project,product_owner_id:0
-#: field:project.scrum.sprint,product_owner_id:0
-msgid "Product Owner"
-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: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.act_scrum_sprint_2_product_backlog
-msgid "Backlogs"
-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.product.backlog,active:0
-msgid "Active"
-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
-#: 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.meeting,question_backlog:0
-msgid "Backlog Accurate"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_task
-#: view:project.scrum.backlog.create.task:0
-#: view:project.scrum.product.backlog:0
-msgid "Convert to Task"
-msgstr ""
-
-#. module: project_scrum
-#: help:project.scrum.sprint,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
-#: field:project.scrum.product.backlog,sequence:0
-msgid "Sequence"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_backlog_progress_graph
-#: view:project.scrum.product.backlog:0
-msgid "Backlog Progress"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: selection:project.scrum.sprint,state:0
-msgid "Done"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-#: view:project.scrum.product.backlog:0
-msgid "Cancel"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-#: view:project.scrum.product.backlog:0
-#: view:project.scrum.sprint:0
-msgid "Close"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-#: selection:project.scrum.product.backlog,state:0
-#: view:project.scrum.sprint:0
-#: selection:project.scrum.sprint,state:0
-msgid "Open"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-#: field:project.scrum.sprint,effective_hours:0
-msgid "Effective hours"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Information"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
-#, python-format
-msgid "Product Backlog '%s' is converted into Task %d."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Remaining Hours"
-msgstr ""
-
-#. module: project_scrum
-#: constraint:project.task:0
-msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Responsible"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,name:0
-msgid "Feature"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "My Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "In Progress Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.task:0
-msgid "View Sprints"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form
-msgid ""
-"The scrum agile methodology is used in software development projects. The "
-"Product Backlog is the list of features to be implemented. A product backlog "
-"can be planified in a development sprint and may be split into several "
-"tasks. The product backlog is managed by the product owner of the project."
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Postpone backlog"
-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.sprint:0
-msgid "Planned hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,date_start:0
-msgid "Starting Date"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_project_scrum_meeting
-#: view:project.scrum.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Scrum Meeting"
-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.meeting:0
-#: view:project.scrum.sprint:0
-msgid "Daily Meetings"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.sprint:0
-msgid "Expected hours"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,sprint_size:0
-msgid "Sprint Days"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,progress:0
-msgid "Progress (0-100)"
-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
-#: view:project.project:0
-msgid "Scrum Data"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.project,scrum:0
-msgid "Is a Scrum Project"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "Edit"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.product.backlog,tasks_id:0
-msgid "Tasks Details"
-msgstr ""
-
-#. module: project_scrum
-#: model:ir.model,name:project_scrum.model_postpone_wizard
-msgid "postpone.wizard"
-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:postpone.wizard:0
-msgid "Postpone Backlog"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.backlog.merge:0
-msgid "Select the project for merged backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: view:board.board:0
-#: model:ir.actions.act_window,name:project_scrum.action_view_my_scrum_sprint_tree
-msgid "My Sprint"
-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
-#: 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
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:71
-#, python-format
-msgid "Please select any Project."
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_email.py:98
-#, python-format
-msgid "Thank you,"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.meeting:0
-#: view:project.task:0
-msgid "Current Sprints"
-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
-#: field:project.scrum.backlog.create.task,user_id:0
-msgid "Assign To"
-msgstr ""
-
-#. module: project_scrum
-#: view:postpone.wizard:0
-msgid "Are you sure to postpone Backlog ?"
-msgstr ""
-
-#. module: project_scrum
-#: view:project.scrum.product.backlog:0
-msgid "For changing to open state"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.backlog.assign.sprint,sprint_id:0
-#: view:project.scrum.meeting:0
-#: field:project.scrum.meeting,sprint_id:0
-#: view:project.scrum.product.backlog:0
-#: field:project.scrum.product.backlog,sprint_id:0
-#: view:project.task:0
-#: field:project.task,sprint_id:0
-msgid "Sprint"
-msgstr ""
-
-#. module: project_scrum
-#: code:addons/project_scrum/wizard/project_scrum_backlog_merger.py:39
-#, python-format
-msgid "Please select at least two product Backlogs"
-msgstr ""
-
-#. module: project_scrum
-#: field:project.scrum.sprint,review:0
-msgid "Sprint Review"
-msgstr ""
-
-#~ msgid "All Tasks"
-#~ msgstr "所有任务"
diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py
index a55f67bda2c..0651d7b9ce4 100644
--- a/addons/project_timesheet/__openerp__.py
+++ b/addons/project_timesheet/__openerp__.py
@@ -35,21 +35,19 @@ with the effect of creating, editing and deleting either ways.
     'website': 'http://www.openerp.com',
     'images': ['images/invoice_task_work.jpeg', 'images/my_timesheet.jpeg', 'images/working_hour.jpeg'],
     'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice', 'account_analytic_analysis'],
-    'init_xml': ['project_timesheet_data.xml'],
-    'update_xml': [
-        "security/ir.model.access.csv",
-        "security/project_timesheet_security.xml",
-        "process/project_timesheet_process.xml", 
-        "report/task_report_view.xml", 
-        "project_timesheet_view.xml",
-        ],
-    'demo_xml': ["project_timesheet_demo.xml"],
+    'data': [
+        'security/ir.model.access.csv',
+        'security/project_timesheet_security.xml',
+        'process/project_timesheet_process.xml',
+        'report/task_report_view.xml',
+        'project_timesheet_view.xml',
+    ],
+    'demo': ['project_timesheet_demo.xml'],
     'test': [
         'test/worktask_entry_to_timesheetline_entry.yml',
         'test/work_timesheet.yml',
     ],
     'installable': True,
-    'auto_install': False,
-    'certificate': '0075123647453',
+    'auto_install': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_timesheet/i18n/ar.po b/addons/project_timesheet/i18n/ar.po
index 9118c010849..733ea3dc056 100644
--- a/addons/project_timesheet/i18n/ar.po
+++ b/addons/project_timesheet/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -49,12 +49,12 @@ msgstr "مهمة سجل الدوام"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "مجموعة بسنة من تاريخ"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task Hours in current month"
-msgstr ""
+msgstr "ساعات العمل في الشهر الحالي"
 
 #. module: project_timesheet
 #: constraint:project.task:0
@@ -83,6 +83,8 @@ msgid ""
 "You cannot delete a partner which is assigned to project, we suggest you to "
 "uncheck the active box!"
 msgstr ""
+"لا يمكنك حذف شريك الذي تم تعيينه إلى المشروع، نقترح عليك إزالة التحديد من "
+"المربع النشط!"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -114,7 +116,7 @@ msgstr "قابل للدفع"
 msgid ""
 "You will find here the contracts related to your customer projects in order "
 "to track the invoicing progress."
-msgstr ""
+msgstr "سوف تجد هنا العقود المتعلقة بمشاريع زبونك من أجل تتبع سير الفواتير."
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -140,7 +142,7 @@ msgstr "خطأ! يجب ان يكون تاريخ بدء المشروع اقل م
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue
 msgid "Customer Projects"
-msgstr ""
+msgstr "مشاريع الزبون"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_account_analytic_line
@@ -186,12 +188,12 @@ msgstr "إجراء خاطئ!"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable Project"
-msgstr ""
+msgstr "فوترة المشروع"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "عقود للتجديد"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
@@ -201,7 +203,7 @@ msgstr "تسجيل الدخول / تسجيل الخروج من المشروع"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "مجموعة بتاريخ من تاريخ"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
@@ -242,7 +244,7 @@ msgstr "أكمل سجل الدوام الخاص بك."
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task Hours in current year"
-msgstr ""
+msgstr "ساعات العمل في السنة الحالية"
 
 #. module: project_timesheet
 #: view:project.project:0
@@ -297,7 +299,7 @@ msgstr "نوفمبر"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task hours of last month"
-msgstr ""
+msgstr "ساعات العمل في الشهر الماضي"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -333,7 +335,7 @@ msgstr "شريك"
 #: code:addons/project_timesheet/project_timesheet.py:247
 #, python-format
 msgid "Invalid Analytic Account !"
-msgstr ""
+msgstr "حساب تحليل صالح!"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:59
@@ -369,7 +371,7 @@ msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متد
 #, python-format
 msgid ""
 "You cannot select a Analytic Account which is in Close or Cancelled state"
-msgstr ""
+msgstr "لا يمكنك اختيار حساب تحليلي والتي هي في حالة إغلاق أو إلغاء"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
diff --git a/addons/project_timesheet/i18n/bg.po b/addons/project_timesheet/i18n/bg.po
index d793f5fbf42..0bfd72ee7ff 100644
--- a/addons/project_timesheet/i18n/bg.po
+++ b/addons/project_timesheet/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/bs.po b/addons/project_timesheet/i18n/bs.po
index 400b1e7d956..78e4bba5854 100644
--- a/addons/project_timesheet/i18n/bs.po
+++ b/addons/project_timesheet/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/ca.po b/addons/project_timesheet/i18n/ca.po
index 372a9d5d99a..5b775c61723 100644
--- a/addons/project_timesheet/i18n/ca.po
+++ b/addons/project_timesheet/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/cs.po b/addons/project_timesheet/i18n/cs.po
index e0157b13d45..80e5e0445d2 100644
--- a/addons/project_timesheet/i18n/cs.po
+++ b/addons/project_timesheet/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/da.po b/addons/project_timesheet/i18n/da.po
index 0cdf25cb192..193a7fcea54 100644
--- a/addons/project_timesheet/i18n/da.po
+++ b/addons/project_timesheet/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/de.po b/addons/project_timesheet/i18n/de.po
index dfda3d91c68..df7ffa9a44c 100644
--- a/addons/project_timesheet/i18n/de.po
+++ b/addons/project_timesheet/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -65,7 +65,8 @@ msgstr "Arbeitsstunden im laufenden Monat"
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Fehler! Aufgaben End-Datum muss größer als Aufgaben-Beginn sein"
+msgstr ""
+"Fehler! Das Aufgaben-Enddatum muss nach dem des Aufgaben-Beginns liegen."
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
diff --git a/addons/project_timesheet/i18n/el.po b/addons/project_timesheet/i18n/el.po
index a1d4a99cdec..bee0a38deee 100644
--- a/addons/project_timesheet/i18n/el.po
+++ b/addons/project_timesheet/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/project_timesheet/i18n/es.po b/addons/project_timesheet/i18n/es.po
index c9dfc0635b0..1d9d144f8e9 100644
--- a/addons/project_timesheet/i18n/es.po
+++ b/addons/project_timesheet/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/es_AR.po b/addons/project_timesheet/i18n/es_AR.po
index fda58b5cf4a..e4bb43b5aef 100644
--- a/addons/project_timesheet/i18n/es_AR.po
+++ b/addons/project_timesheet/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/es_CR.po b/addons/project_timesheet/i18n/es_CR.po
index dca2e0a9aae..f693215875b 100644
--- a/addons/project_timesheet/i18n/es_CR.po
+++ b/addons/project_timesheet/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/et.po b/addons/project_timesheet/i18n/et.po
index b175bd7f9ef..e42acff8953 100644
--- a/addons/project_timesheet/i18n/et.po
+++ b/addons/project_timesheet/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/fi.po b/addons/project_timesheet/i18n/fi.po
index 915468d84ad..e5b1b7ccac3 100644
--- a/addons/project_timesheet/i18n/fi.po
+++ b/addons/project_timesheet/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/fr.po b/addons/project_timesheet/i18n/fr.po
index 15eba9c8f57..c6b36d489d6 100644
--- a/addons/project_timesheet/i18n/fr.po
+++ b/addons/project_timesheet/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/gl.po b/addons/project_timesheet/i18n/gl.po
index 05dddb18e62..1a36a23c758 100644
--- a/addons/project_timesheet/i18n/gl.po
+++ b/addons/project_timesheet/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/hr.po b/addons/project_timesheet/i18n/hr.po
index bc94b9730a4..e427ee85a5e 100644
--- a/addons/project_timesheet/i18n/hr.po
+++ b/addons/project_timesheet/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: project_timesheet
diff --git a/addons/project_timesheet/i18n/hu.po b/addons/project_timesheet/i18n/hu.po
index 34a214047ab..483e4d58fb1 100644
--- a/addons/project_timesheet/i18n/hu.po
+++ b/addons/project_timesheet/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/id.po b/addons/project_timesheet/i18n/id.po
index 7af7445fae8..741b061ff59 100644
--- a/addons/project_timesheet/i18n/id.po
+++ b/addons/project_timesheet/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/it.po b/addons/project_timesheet/i18n/it.po
index 9bc45907a00..1be814a3d42 100644
--- a/addons/project_timesheet/i18n/it.po
+++ b/addons/project_timesheet/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/ja.po b/addons/project_timesheet/i18n/ja.po
index ee5b73d265b..fb1317921a5 100644
--- a/addons/project_timesheet/i18n/ja.po
+++ b/addons/project_timesheet/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/ko.po b/addons/project_timesheet/i18n/ko.po
index 4c58046562b..0a10897d1ac 100644
--- a/addons/project_timesheet/i18n/ko.po
+++ b/addons/project_timesheet/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/lt.po b/addons/project_timesheet/i18n/lt.po
index 0179e91939b..af250a7437f 100644
--- a/addons/project_timesheet/i18n/lt.po
+++ b/addons/project_timesheet/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/lv.po b/addons/project_timesheet/i18n/lv.po
index 29e672c62c3..df7703c1e7a 100644
--- a/addons/project_timesheet/i18n/lv.po
+++ b/addons/project_timesheet/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/mn.po b/addons/project_timesheet/i18n/mn.po
index d993f49f79b..6222aec3e43 100644
--- a/addons/project_timesheet/i18n/mn.po
+++ b/addons/project_timesheet/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/nl.po b/addons/project_timesheet/i18n/nl.po
index a7c5891d397..9dbe72e2981 100644
--- a/addons/project_timesheet/i18n/nl.po
+++ b/addons/project_timesheet/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-13 07:57+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -206,7 +206,7 @@ msgstr "Te vernieuwen contracten"
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
 msgid "Sign in / Sign out by project"
-msgstr "Klok in / Klok uit per project"
+msgstr "Inklokken/Uitklokken per project"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
diff --git a/addons/project_timesheet/i18n/nl_BE.po b/addons/project_timesheet/i18n/nl_BE.po
index bb5b26244f4..fc3c5ee4fc0 100644
--- a/addons/project_timesheet/i18n/nl_BE.po
+++ b/addons/project_timesheet/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/pl.po b/addons/project_timesheet/i18n/pl.po
index 98176f31c36..c28f51c47cd 100644
--- a/addons/project_timesheet/i18n/pl.po
+++ b/addons/project_timesheet/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/pt.po b/addons/project_timesheet/i18n/pt.po
index beb36572453..6298e1af3ce 100644
--- a/addons/project_timesheet/i18n/pt.po
+++ b/addons/project_timesheet/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/pt_BR.po b/addons/project_timesheet/i18n/pt_BR.po
index 643b9e5ee27..3d8ad22d522 100644
--- a/addons/project_timesheet/i18n/pt_BR.po
+++ b/addons/project_timesheet/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
@@ -24,6 +24,10 @@ msgid ""
 "pricelist and the field 'Invoice Task Work' on the tab 'Billing' of\n"
 "the project form."
 msgstr ""
+"Você vai encontrar aqui todas as tarefas realizadas que você pode faturar.\n"
+"No pedido da fatura o tempo gasto em um projeto, você deve definir a lista "
+"de preços e 'Fatura Tarefa Realizada' o campo de \"faturamento\" na guia do "
+"formulário de projeto."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:55
@@ -38,7 +42,9 @@ msgstr ""
 msgid ""
 "No journal defined on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
-msgstr "Nenhum diário definido para o empregado relacionado."
+msgstr ""
+"Nenhum diário definido para o empregado relacionado.\n"
+"Preencha na guia folha de horas do formulário do funcionário."
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
@@ -48,17 +54,17 @@ msgstr "Tarefas de Planilhas de Tempo"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by year of date"
-msgstr ""
+msgstr "Agrupar por data do ano"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task Hours in current month"
-msgstr ""
+msgstr "Horas de tarefas no mês atual"
 
 #. module: project_timesheet
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr ""
+msgstr "Erro ! A data final deve ser maior do que a data inicial"
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
@@ -82,6 +88,8 @@ msgid ""
 "You cannot delete a partner which is assigned to project, we suggest you to "
 "uncheck the active box!"
 msgstr ""
+"Você não pode excluir um parceiro que está associado a um projeto, nós "
+"sugerimos que você desmarque a caixa de Ativo!"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -106,7 +114,7 @@ msgstr "Planilha de Horas/Relatório de Horas de Tarefas por Mês"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable"
-msgstr ""
+msgstr "Faturável"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_account_analytic_overdue
@@ -114,6 +122,8 @@ msgid ""
 "You will find here the contracts related to your customer projects in order "
 "to track the invoicing progress."
 msgstr ""
+"Você vai encontrar aqui os contratos relativos a projetos de seus clientes, "
+"a fim de acompanhar o progresso de faturamento."
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -139,12 +149,12 @@ msgstr "Erro! A data inicial do projeto precisa ser menor que a data final."
 #. module: project_timesheet
 #: model:ir.actions.act_window,name:project_timesheet.action_account_analytic_overdue
 msgid "Customer Projects"
-msgstr ""
+msgstr "Projetos de Clientes"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Linha Analítica"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -174,7 +184,7 @@ msgstr "Erro! Você não pode criar tarefas recursivas."
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_project_working_hours
 msgid "Timesheet Lines"
-msgstr ""
+msgstr "Itens da Planilha de Horas"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:231
@@ -185,12 +195,12 @@ msgstr "Ação Inválida!"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Billable Project"
-msgstr ""
+msgstr "Projeto Faturável"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_invoicing_contracts
 msgid "Contracts to Renew"
-msgstr ""
+msgstr "Contratos a Renovar"
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
@@ -200,7 +210,7 @@ msgstr "Entrada / Saída por projeto"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group by month of date"
-msgstr ""
+msgstr "Agrupar por mês da data"
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task
@@ -241,7 +251,7 @@ msgstr "Complete sua Planilha de Tempo"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task Hours in current year"
-msgstr ""
+msgstr "Horas de Tarefas este ano"
 
 #. module: project_timesheet
 #: view:project.project:0
@@ -296,7 +306,7 @@ msgstr "Novembro"
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Task hours of last month"
-msgstr ""
+msgstr "Horas de tarefas no último mês"
 
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
@@ -332,7 +342,7 @@ msgstr "Parceiro"
 #: code:addons/project_timesheet/project_timesheet.py:247
 #, python-format
 msgid "Invalid Analytic Account !"
-msgstr ""
+msgstr "Conta analítica inválida!"
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:59
@@ -361,7 +371,7 @@ msgstr "Faturamento"
 #. module: project_timesheet
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:247
@@ -369,6 +379,8 @@ msgstr ""
 msgid ""
 "You cannot select a Analytic Account which is in Close or Cancelled state"
 msgstr ""
+"Você não pode selecionar uma Conta Analítica que está como Fechado ou "
+"Cancelado"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -409,12 +421,12 @@ msgstr "Mês"
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_act_project_management_timesheet_sheet_form
 msgid "My Timesheet"
-msgstr ""
+msgstr "Minha Planilha de Horas"
 
 #. module: project_timesheet
 #: constraint:account.analytic.line:0
 msgid "You can not create analytic line on view account."
-msgstr ""
+msgstr "Você não pode criar uma linha analítica na conta de visualização"
 
 #. module: project_timesheet
 #: view:project.project:0
diff --git a/addons/project_timesheet/i18n/ro.po b/addons/project_timesheet/i18n/ro.po
index 403b7a6d990..024d3852988 100644
--- a/addons/project_timesheet/i18n/ro.po
+++ b/addons/project_timesheet/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/ru.po b/addons/project_timesheet/i18n/ru.po
index 0fd83f874b6..070b374eae2 100644
--- a/addons/project_timesheet/i18n/ru.po
+++ b/addons/project_timesheet/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/sl.po b/addons/project_timesheet/i18n/sl.po
index 4685b340d0e..ee84d2eb297 100644
--- a/addons/project_timesheet/i18n/sl.po
+++ b/addons/project_timesheet/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/sq.po b/addons/project_timesheet/i18n/sq.po
index 052e72a5a37..7af7b06fbb6 100644
--- a/addons/project_timesheet/i18n/sq.po
+++ b/addons/project_timesheet/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:16+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/sv.po b/addons/project_timesheet/i18n/sv.po
index f4ebd20077f..12e46faf560 100644
--- a/addons/project_timesheet/i18n/sv.po
+++ b/addons/project_timesheet/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/tlh.po b/addons/project_timesheet/i18n/tlh.po
index ead4dda2668..62b8f2b7346 100644
--- a/addons/project_timesheet/i18n/tlh.po
+++ b/addons/project_timesheet/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index 883b263b656..f069cbf6d7f 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/uk.po b/addons/project_timesheet/i18n/uk.po
index 3d247932943..07e26f60173 100644
--- a/addons/project_timesheet/i18n/uk.po
+++ b/addons/project_timesheet/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/vi.po b/addons/project_timesheet/i18n/vi.po
index 33cc1337532..986d36fce5a 100644
--- a/addons/project_timesheet/i18n/vi.po
+++ b/addons/project_timesheet/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/zh_CN.po b/addons/project_timesheet/i18n/zh_CN.po
index b82aee6822a..b9244d731c2 100644
--- a/addons/project_timesheet/i18n/zh_CN.po
+++ b/addons/project_timesheet/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/i18n/zh_TW.po b/addons/project_timesheet/i18n/zh_TW.po
index f92e4c18308..e70f92dc78f 100644
--- a/addons/project_timesheet/i18n/zh_TW.po
+++ b/addons/project_timesheet/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:52+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:17+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: project_timesheet
 #: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index e4374f096fd..439ff6d835d 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -29,32 +29,6 @@ from tools.translate import _
 class project_project(osv.osv):
     _inherit = 'project.project'
 
-    def _to_invoice(self, cr, uid, ids, field_name, arg, context=None):
-        account_analytic_line = self.pool.get("account.analytic.line")
-        res = {}
-        for project in self.browse(cr,uid,ids,context=context):
-            line_ids = account_analytic_line.search(cr, uid, [('account_id', '=', project.analytic_account_id.id), ('to_invoice','=',1), ('invoice_id','=',False)])
-            lines = account_analytic_line.browse(cr, uid, line_ids, context)
-            res[project.id] = {
-                'amount_to_invoice': sum(line.amount for line in lines),
-                'time_to_invoice': sum(line.unit_amount for line in lines),
-            }
-        return res
-
-    def _timesheet_count(self, cr, uid, ids, field_name, arg, context=None):
-        account_analytic_line = self.pool.get('account.analytic.line')
-        res = {}
-        for project in self.browse(cr, uid, ids, context):
-            line_ids = account_analytic_line.search(cr, uid, [('account_id', '=', project.analytic_account_id.id)])
-            res[project.id] = len(line_ids)
-        return res
-
-    _columns = {
-        'amount_to_invoice': fields.function(_to_invoice, string="Amount to Invoice", multi="sums"),
-        'time_to_invoice': fields.function(_to_invoice, string="Time to Invoice", multi="sums"),
-        'timesheet_count': fields.function(_timesheet_count, type='integer', string="Issue"),
-    }
-
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
         res = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context)
         if part and res and ('value' in res):
@@ -66,6 +40,36 @@ class project_project(osv.osv):
                 res['value'].update({'to_invoice': factor_id})
         return res
 
+    _defaults = {
+        'use_timesheets': True,
+    }
+
+    def open_timesheets(self, cr, uid, ids, context=None):
+        """ open Timesheets view """
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+
+        project = self.browse(cr, uid, ids[0], context)
+        view_context = {
+            'search_default_account_id': [project.analytic_account_id.id],
+            'default_account_id': project.analytic_account_id.id,
+        }
+        help = _("""<p class="oe_view_nocontent_create">Record your timesheets for the project '%s'.</p>""") % (project.name,)
+        try:
+            if project.to_invoice and project.partner_id:
+                help+= _("""<p>Timesheets on this project may be invoiced to %s, according to the terms defined in the contract.</p>""" ) % (project.partner_id.name,)
+        except:
+            # if the user do not have access rights on the partner
+            pass
+
+        res = mod_obj.get_object_reference(cr, uid, 'hr_timesheet', 'act_hr_timesheet_line_evry1_all_form')
+        id = res and res[1] or False
+        result = act_obj.read(cr, uid, [id], context=context)[0]
+        result['name'] = _('Timesheets')
+        result['context'] = view_context
+        result['help'] = help
+        return result
+
 project_project()
 
 class project_work(osv.osv):
@@ -79,53 +83,53 @@ class project_work(osv.osv):
             user_name = self.pool.get('res.users').read(cr, uid, [user_id], ['name'])[0]['name']
             raise osv.except_osv(_('Bad Configuration !'),
                  _('Please define employee for user "%s". You must create one.')% (user_name,))
-        emp = self.pool.get('hr.employee').browse(cr, uid, emp_id[0])
+        emp = emp_obj.browse(cr, uid, emp_id[0])
         if not emp.product_id:
             raise osv.except_osv(_('Bad Configuration !'),
-                 _('Please define product on the related employee.\nFill in the timesheet tab of the employee form.'))
+                 _('Please define product and product category property account on the related employee.\nFill in the HR Settings tab of the employee form.'))
 
         if not emp.journal_id:
             raise osv.except_osv(_('Bad Configuration !'),
                  _('Please define journal on the related employee.\nFill in the timesheet tab of the employee form.'))
 
-        a = emp.product_id.product_tmpl_id.property_account_expense.id
-        if not a:
-            a = emp.product_id.categ_id.property_account_expense_categ.id
-            if not a:
+        acc_id = emp.product_id.product_tmpl_id.property_account_expense.id
+        if not acc_id:
+            acc_id = emp.product_id.categ_id.property_account_expense_categ.id
+            if not acc_id:
                 raise osv.except_osv(_('Bad Configuration !'),
                         _('Please define product and product category property account on the related employee.\nFill in the timesheet tab of the employee form.'))
+
         res['product_id'] = emp.product_id.id
         res['journal_id'] = emp.journal_id.id
-        res['general_account_id'] = a
+        res['general_account_id'] = acc_id
         res['product_uom_id'] = emp.product_id.uom_id.id
         return res
 
     def create(self, cr, uid, vals, *args, **kwargs):
-        obj_timesheet = self.pool.get('hr.analytic.timesheet')
-        project_obj = self.pool.get('project.project')
+        timesheet_obj = self.pool.get('hr.analytic.timesheet')
         task_obj = self.pool.get('project.task')
         uom_obj = self.pool.get('product.uom')
 
         vals_line = {}
         context = kwargs.get('context', {})
         if not context.get('no_analytic_entry',False):
-            obj_task = task_obj.browse(cr, uid, vals['task_id'])
+            task_obj = 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 '/')
+            vals_line['name'] = '%s: %s' % (tools.ustr(task_obj.name), tools.ustr(vals['name'] or '/'))
             vals_line['user_id'] = vals['user_id']
             vals_line['product_id'] = result['product_id']
             vals_line['date'] = vals['date'][:10]
 
-            #calculate quantity based on employee's product's uom
+            # Calculate quantity based on employee's product's uom
             vals_line['unit_amount'] = vals['hours']
 
             default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
             if result['product_uom_id'] != default_uom:
                 vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
-            acc_id = obj_task.project_id and obj_task.project_id.analytic_account_id.id or False
+            acc_id = task_obj.project_id and task_obj.project_id.analytic_account_id.id or False
             if acc_id:
                 vals_line['account_id'] = acc_id
-                res = obj_timesheet.on_change_account_id(cr, uid, False, acc_id)
+                res = timesheet_obj.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']
@@ -135,27 +139,29 @@ class project_work(osv.osv):
                 amount = vals_line['unit_amount']
                 prod_id = vals_line['product_id']
                 unit = False
-                timeline_id = obj_timesheet.create(cr, uid, vals=vals_line, context=context)
+                timeline_id = timesheet_obj.create(cr, uid, vals=vals_line, context=context)
 
                 # Compute based on pricetype
-                amount_unit = obj_timesheet.on_change_unit_amount(cr, uid, timeline_id,
+                amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, timeline_id,
                     prod_id, amount, False, unit, vals_line['journal_id'], context=context)
                 if amount_unit and 'amount' in amount_unit.get('value',{}):
                     updv = { 'amount': amount_unit['value']['amount'] }
-                    obj_timesheet.write(cr, uid, [timeline_id], updv, context=context)
+                    timesheet_obj.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):
+        """
+        When a project task work gets updated, handle its hr analytic timesheet.
+        """
         if context is None:
             context = {}
         timesheet_obj = self.pool.get('hr.analytic.timesheet')
-        project_obj = self.pool.get('project.project')
         uom_obj = self.pool.get('product.uom')
         result = {}
 
         if isinstance(ids, (long, int)):
-            ids = [ids,]
+            ids = [ids]
 
         for task in self.browse(cr, uid, ids, context=context):
             line_id = task.hr_analytic_timesheet_id
@@ -163,25 +169,28 @@ class project_work(osv.osv):
                 # 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 '/')
+                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.get('user_id', task.user_id.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:
-                default_uom = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
                 vals_line['unit_amount'] = vals['hours']
                 prod_id = vals_line.get('product_id', line_id.product_id.id) # False may be set
 
-                if result.get('product_uom_id',False) and (not result['product_uom_id'] == default_uom):
-                    vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, default_uom, vals['hours'], result['product_uom_id'])
+                # Put user related details in analytic timesheet values
+                details = self.get_user_related_details(cr, uid, vals.get('user_id', task.user_id.id))
+                for field in ('product_id', 'general_account_id', 'journal_id', 'product_uom_id'):
+                    if details.get(field, False):
+                        vals_line[field] = details[field]
+
+                # Check if user's default UOM differs from product's UOM
+                user_default_uom_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.project_time_mode_id.id
+                if details.get('product_uom_id', False) and details['product_uom_id'] != user_default_uom_id:
+                    vals_line['unit_amount'] = uom_obj._compute_qty(cr, uid, user_default_uom_id, vals['hours'], details['product_uom_id'])
 
                 # Compute based on pricetype
                 amount_unit = timesheet_obj.on_change_unit_amount(cr, uid, line_id.id,
@@ -201,7 +210,7 @@ class project_work(osv.osv):
         for task in self.browse(cr, uid, ids):
             if task.hr_analytic_timesheet_id:
                 hat_ids.append(task.hr_analytic_timesheet_id.id)
-#            delete entry from timesheet too while deleting entry to task.
+        # Delete entry from timesheet too while deleting entry to task.
         if hat_ids:
             hat_obj.unlink(cr, uid, hat_ids, *args, **kwargs)
         return super(project_work,self).unlink(cr, uid, ids, *args, **kwargs)
@@ -223,18 +232,17 @@ class task(osv.osv):
 
         return super(task,self).unlink(cr, uid, ids, *args, **kwargs)
 
-    def write(self, cr, uid, ids,vals,context=None):
+    def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
         if vals.get('project_id',False) or vals.get('name',False):
             vals_line = {}
             hr_anlytic_timesheet = self.pool.get('hr.analytic.timesheet')
-            task_obj_l = self.browse(cr, uid, ids, context=context)
             if vals.get('project_id',False):
                 project_obj = self.pool.get('project.project').browse(cr, uid, vals['project_id'], context=context)
                 acc_id = project_obj.analytic_account_id.id
 
-            for task_obj in task_obj_l:
+            for task_obj in self.browse(cr, uid, ids, context=context):
                 if len(task_obj.work_ids):
                     for task_work in task_obj.work_ids:
                         if not task_work.hr_analytic_timesheet_id:
@@ -251,16 +259,29 @@ task()
 
 class res_partner(osv.osv):
     _inherit = 'res.partner'
+
     def unlink(self, cursor, user, ids, context=None):
         parnter_id=self.pool.get('project.project').search(cursor, user, [('partner_id', 'in', ids)])
         if parnter_id:
             raise osv.except_osv(_('Invalid Action!'), _('You cannot delete a partner which is assigned to project, but you can uncheck the active box.'))
         return super(res_partner,self).unlink(cursor, user, ids,
                 context=context)
+
 res_partner()
 
 class account_analytic_line(osv.osv):
    _inherit = "account.analytic.line"
+
+   def get_product(self, cr, uid, context=None):
+        emp_obj = self.pool.get('hr.employee')
+        emp_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
+        if emp_ids:
+            employee = emp_obj.browse(cr, uid, emp_ids, context=context)[0]
+            if employee.product_id:return employee.product_id.id
+        return False
+   
+   _defaults = {'product_id': get_product,}
+   
    def on_change_account_id(self, cr, uid, ids, account_id):
        res = {}
        if not account_id:
@@ -272,5 +293,7 @@ class account_analytic_line(osv.osv):
        if acc.state == 'close' or acc.state == 'cancelled':
            raise osv.except_osv(_('Invalid Analytic Account !'), _('You cannot select a Analytic Account which is in Close or Cancelled state.'))
        return res
+
 account_analytic_line()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_timesheet/project_timesheet_data.xml b/addons/project_timesheet/project_timesheet_data.xml
deleted file mode 100644
index ed87cb8c65f..00000000000
--- a/addons/project_timesheet/project_timesheet_data.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" ?>
-<openerp>
-    <data>
-
-      <!--   <record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
-            <field name="name">Time Tracking</field>
-            <field eval="5" name="sequence"/>
-            <field name="parent_id" ref="base.menu_main_pm"/>
-        </record>
-
-        <record id="menu_act_project_management_timesheet_sheet_form" model="ir.ui.menu">
-            <field name="name">My Timesheet</field>
-            <field eval="5" name="sequence"/>
-            <field name="parent_id" ref="base.menu_project_management_time_tracking"/>
-            <field name="icon">STOCK_JUSTIFY_FILL</field>
-            <field name="action" ref="hr_timesheet_sheet.ir_actions_server_timsheet_sheet"/>
-        </record> -->
-
-    </data>
-</openerp>
diff --git a/addons/project_timesheet/project_timesheet_demo.xml b/addons/project_timesheet/project_timesheet_demo.xml
index 6d3dfb23767..90873d2a418 100644
--- a/addons/project_timesheet/project_timesheet_demo.xml
+++ b/addons/project_timesheet/project_timesheet_demo.xml
@@ -3,13 +3,11 @@
     <data noupdate="1">
         <!-- Example employee -->
         <record id="hr.employee_qdp" model="hr.employee">
-            <field name="user_id" ref="base.user_qdp"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
 
         <record id="hr.employee_al" model="hr.employee">
-            <field name="user_id" ref="base.user_al"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
         </record>
@@ -17,7 +15,6 @@
         <record id="hr.employee_phu" model="hr.employee">
             <field name="name">Phuong</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="base.user_phu"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
@@ -26,7 +23,6 @@
         <record id="hr.employee_fpi" model="hr.employee">
             <field name="name">Francois</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="base.user_fpi"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
@@ -34,7 +30,6 @@
         <record id="hr.employee_jth" model="hr.employee">
             <field name="name">Julien</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="base.user_jth"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
@@ -42,7 +37,6 @@
         <record id="hr.employee7" model="hr.employee">
             <field name="name">Aline</field>
             <field name="calendar_id" ref="resource.timesheet_group1"/>
-            <field name="user_id" ref="base.user_apr"/>
             <field name="category_ids" eval="[(6, 0, [ref('hr.employee_category_4')])]"/>
             <field name="product_id" ref="product.product_product_consultant"/>
             <field name="journal_id" ref="hr_timesheet.analytic_journal"/>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index c47c411f6c9..b8f5675891c 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -9,33 +9,29 @@
             <field name="arch" type="xml">
                 <field name="use_tasks" position="after">
                     <field name="use_timesheets"/>
-                    <field name="timesheet_count"/>
+                    <field name="hours_quantity"/>
                     <field name="currency_id"/>
                     <field name="partner_id"/>
                 </field>
                 <xpath expr="//div[contains(@class, 'oe_kanban_project_list')]" position="inside">
-                    <a t-if="record.use_timesheets.raw_value"
-                        name="open_timesheets" type="object">Timesheets(<field name="timesheet_count"/>)</a>
-                </xpath>
-                <xpath expr="//div[contains(@class, 'oe_kanban_project_deadline')]" position="before">
-                    <div class="oe_kanban_project_fields oe_kanban_project_invoice" t-if="record.partner_id.raw_value">
-                        <div>Amount to invoice</div>
-                        <div><field name="amount_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/></div>
-                        <div>Time to Invoice</div>
-                        <div><field name="time_to_invoice"/> <field name="company_uom_id"/></div>
-                    </div>
+                    <a t-if="record.use_timesheets.raw_value" style="margin-right: 10px"
+                        name="open_timesheets" type="object"><field name="hours_quantity"/> Hours</a>
                 </xpath>
             </field>
         </record>
 
-        <record id="project_invoice_form_cutomer" model="ir.ui.view">
-            <field name="name">Inherit project form : Customer</field>
+        <record id="project_invoice_form" model="ir.ui.view">
+            <field name="name">Inherit project form : Invoicing Data</field>
             <field name="model">project.project</field>
-            <field name="inherit_id" ref="analytic_contract_project.project_invoice_form"/>
+            <field name="inherit_id" ref="project.edit_project"/>
             <field name="arch" type="xml">
-                <field name="partner_id" position="replace">
-                    <field name="partner_id" on_change="onchange_partner_id(partner_id)" string="Contact"  attrs="{'required':[('to_invoice','!=',False)]}"/>
-                </field>
+                <xpath expr='//div[@name="options_active"]' position='inside'>
+                    <field name="use_timesheets" class="oe_inline"/>
+                    <label for="use_timesheets"/>
+                </xpath>
+                <xpath expr='//div[@name="buttons"]' position="inside">
+                    <button name="open_timesheets" string="Timesheets" type="object" attrs="{'invisible':[('use_timesheets','=', 0)]}"/>
+                </xpath>
             </field>
         </record>
 
@@ -45,7 +41,6 @@
             <field name="inherit_id" ref="project.view_project_project_filter"/>
             <field name="arch" type="xml">
                 <xpath expr='//filter[@string="Project(s) Manager"]' position='after'>
-                    <separator/>
                     <filter icon="terp-camera_test" string="Billable" domain="[('to_invoice','!=', False)]" help="Billable Project"/>
                 </xpath>
             </field>
@@ -76,7 +71,7 @@
             <field name="inherit_id" ref="account.view_account_analytic_line_tree"/>
             <field name="arch" type="xml">
                 <field name="account_id"  position="replace">
-                    <field name="account_id" string="Analytic account/project"/>
+                    <field name="account_id" string="Analytic account/project" on_change="on_change_account_id(account_id)"/>
                 </field>
             </field>
         </record>
@@ -91,18 +86,16 @@
             <field name="context">{'search_default_to_invoice': 1}</field>
             <field name="view_id" ref="view_account_analytic_line_tree_inherit_account_id"/>
             <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to add a work to invoice.
-              </p><p>
-                You will find here all works made on tasks that you can
-                invoice.   
+              <p>
+                You will find here timesheets and purchases you did for contracts that can be reinvoiced to the customer.
+                If you want to record new jobs to invoice, you should use the timesheet menu instead.
               </p>
             </field>
         </record>
         <menuitem action="hr_timesheet.action_hr_timesheet_sign_in"
             id="menu_hr_timesheet_sign_in"
             parent="hr_attendance.menu_hr_attendance"
-            sequence="5" />
+            sequence="5" groups="base.group_hr_attendance" />
 
         <menuitem id="menu_project_billing" name="Invoicing"
                   parent="base.menu_main_pm" sequence="5"/>
diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py
index b32d852bc5f..89476b991b1 100644
--- a/addons/project_timesheet/report/task_report.py
+++ b/addons/project_timesheet/report/task_report.py
@@ -29,7 +29,7 @@ class report_timesheet_task_user(osv.osv):
     _auto = False
     _order = "name"
 
-    def get_hrs_timesheet(self, cr, uid, ids, name,args,context):
+    def get_hrs_timesheet(self, cr, uid, ids, name, args, context):
         result = {}
         for record in self.browse(cr, uid, ids, context):
             last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1)
diff --git a/addons/project_timesheet/test/work_timesheet.yml b/addons/project_timesheet/test/work_timesheet.yml
index 2f75f908735..4867f92b4b1 100644
--- a/addons/project_timesheet/test/work_timesheet.yml
+++ b/addons/project_timesheet/test/work_timesheet.yml
@@ -6,7 +6,7 @@
     name: Test Timesheet records
     task_id: project.project_task_10
     hours: 20.0
-    user_id: base.user_fpi
+    user_id: base.user_demo
     company_id: base.main_company
 -
   I check Timesheet line for employee in current Timesheet
@@ -16,6 +16,7 @@
     start = (datetime.date.today().strftime('%Y-%m-%d'))
     task_work = self.search(cr, uid, [("name","=","Social network integration: Test Timesheet records")],context)[0]
     task_ids = self.browse(cr, uid, task_work, context)
-    assert task_ids.user_id.id == ref("base.user_fpi"), 'Error, The User in Timesheet is not Correct'
+    assert task_ids.user_id.id == ref("base.user_demo"), 'Error, The User in Timesheet is not Correct'
     assert task_ids.date == start, 'Error, The Date in Timesheet is not ok'
     assert task_ids.product_uom_id.name == "Hour", 'Error, The Hour in Timesheet is not ok'
+
diff --git a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
index 497ec9e3597..3efd133ffb6 100644
--- a/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
+++ b/addons/project_timesheet/test/worktask_entry_to_timesheetline_entry.yml
@@ -45,7 +45,6 @@
   Create a timesheet sheet for HR manager
 -
   !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_sheetforhrmanager0}:
-    date_current: !eval time.strftime('%Y-05-%d')
     date_from: !eval "'%s-05-01' %(datetime.now().year)"
     date_to: !eval "'%s-05-31' %(datetime.now().year)"
     name: Sheet for hr manager
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index eb8df0ff77b..a7c66344f4a 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -24,18 +24,24 @@
     'name': 'Purchase Management',
     'version': '1.1',
     'category': 'Purchase Management',
-    "sequence": 19,
-    "summary": "RfQ, Purchase Orders, Delivery & Invoicing Control",
+    'sequence': 19,
+    'summary': 'Purchase Orders, Receptions, Supplier Invoices',
     'description': """
-Purchase Management module is for generating a purchase order for purchase of goods from a supplier.
-====================================================================================================
+Manage goods requirement by Purchase Orders easily
+==================================================
 
-A supplier invoice is created for the particular purchase order.
+Purchase management enables you to track your suppliers' price quotations and convert them into purchase orders if necessary.
+OpenERP has several methods of monitoring invoices and tracking the receipt of ordered goods. You can handle partial deliveries in OpenERP, so you can keep track of items that are still to be delivered in your orders, and you can issue reminders automatically.
 
-Dashboard for purchase management that includes:
-------------------------------------------------
-    * Request for Quotations
-    * Monthly Purchases by Category
+OpenERP’s replenishment management rules enable the system to generate draft purchase orders automatically, or you can configure it to run a lean process driven entirely by current production needs.
+
+Dashboard / Reports for Purchase Management will include:
+---------------------------------------------------------
+* Request for Quotations
+* Purchase Orders Waiting Approval 
+* Monthly Purchases by Category
+* Receptions Analysis
+* Purchase Analysis
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
@@ -78,7 +84,6 @@ Dashboard for purchase management that includes:
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0057234283549',
     'application': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 67c3981f383..d491985cf52 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -62,7 +62,7 @@
                 <form string="Purchase Dashboard" version="7.0">
                     <board style="2-1">
                         <column>
-                            <action name="%(purchase_draft)d" string="Request for Quotations" creatable="true"/>
+                            <action name="%(purchase_draft)d" string="Request for Quotations"/>
                         </column>
                         <column>
                             <action name="%(action_purchase_order_monthly_categ_graph)d" string="Monthly Purchases by Category"/>
@@ -85,7 +85,8 @@
                   icon="terp-graph"
                   id="menu_board_purchase"
                   parent="base.menu_reporting_dashboard"
-                  sequence="20"/>
+                  sequence="20"
+                  groups="purchase.group_purchase_user"/>
 
     </data>
 </openerp>
diff --git a/addons/purchase/edi/purchase_order_action_data.xml b/addons/purchase/edi/purchase_order_action_data.xml
index b97da91fa1d..fab7eeacf6c 100644
--- a/addons/purchase/edi/purchase_order_action_data.xml
+++ b/addons/purchase/edi/purchase_order_action_data.xml
@@ -40,7 +40,7 @@
             <field name="name">Automated Purchase Order Notification Mail</field>
             <field name="email_from">${object.validator.email or ''}</field>
             <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
-            <field name="email_to">${object.partner_id.email}</field>
+            <field name="email_recipients">${object.partner_id.id}</field>
             <field name="model_id" ref="purchase.model_purchase_order"/>
             <field name="auto_delete" eval="True"/>
             <field name="body_html"><![CDATA[
@@ -108,51 +108,6 @@
     </div>
 </div>
             ]]></field>
-            <field name="body_text"><![CDATA[
-Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
-
-Here is a ${object.state in ('draft', 'sent') and 'request for quotation' or 'purchase order confirmation'} from ${object.company_id.name}:
-       | Order number: *${object.name}*
-       | Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
-       | Order date: ${object.date_order}
-       % if object.origin:
-       | Order reference: ${object.origin}
-       % endif
-       % if object.partner_ref:
-       | Your reference: ${object.partner_ref}<br />
-       % endif
-       | Your contact: ${object.validator.name} ${object.validator.email and '<%s>'%(object.validator.email) or ''}
-
-You can view the ${object.state in ('draft', 'sent') and 'request for quotation' or 'order confirmation'} and download it using the following link:
-    ${ctx.get('edi_web_url_view') or 'n/a'}
-
-If you have any question, do not hesitate to contact us.
-
-Thank you!
-
-
---
-${object.validator.name} ${object.validator.email and '<%s>'%(object.validator.email) or ''}
-${object.company_id.name}
-% if object.company_id.street:
-${object.company_id.street or ''}
-% endif
-% if object.company_id.street2:
-${object.company_id.street2}
-% endif
-% if object.company_id.city or object.company_id.zip:
-${object.company_id.zip or ''} ${object.company_id.city or ''}
-% endif
-% if object.company_id.country_id:
-${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
-% endif
-% if object.company_id.phone:
-Phone: ${object.company_id.phone}
-% endif
-% if object.company_id.website:
-${object.company_id.website or ''}
-% endif
-            ]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po
index 2f0479f77dd..901c7e02841 100644
--- a/addons/purchase/i18n/ar.po
+++ b/addons/purchase/i18n/ar.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-08 02:55+0000\n"
+"PO-Revision-Date: 2012-10-08 16:00+0000\n"
 "Last-Translator: kifcaliph <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -45,7 +45,7 @@ msgstr "المقصد"
 #: code:addons/purchase/purchase.py:236
 #, python-format
 msgid "In order to delete a purchase order, it must be cancelled first!"
-msgstr ""
+msgstr "من أجل حذف أمر الشراء، يجب الإلغاء أولاً!"
 
 #. module: purchase
 #: help:purchase.report,date:0
@@ -87,7 +87,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase order"
-msgstr ""
+msgstr "الموافقة على أمر الشراء"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,partner_id:0
@@ -149,7 +149,7 @@ msgstr "لا يوجد قائمة اسعار !"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_config_wizard
 msgid "purchase.config.wizard"
-msgstr ""
+msgstr "شراء.ضبط.صندوق حوار"
 
 #. module: purchase
 #: view:board.board:0 model:ir.actions.act_window,name:purchase.purchase_draft
@@ -249,7 +249,7 @@ msgstr "يوم"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on generated draft invoice"
-msgstr ""
+msgstr "على أساس توليد مسودة فاتورة"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -259,7 +259,7 @@ msgstr "ترتيب اليوم"
 #. module: purchase
 #: view:board.board:0
 msgid "Monthly Purchases by Category"
-msgstr ""
+msgstr "مشتريات شهرية حسب الفئة"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
@@ -269,7 +269,7 @@ msgstr "المشتريات"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in draft state"
-msgstr ""
+msgstr "أمر الشراء التي هي في حالة مسودة"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -392,7 +392,7 @@ msgstr "حركة مخزن"
 #: code:addons/purchase/purchase.py:419
 #, python-format
 msgid "You must first cancel all invoices related to this purchase order."
-msgstr ""
+msgstr "يجب عليك أولا إلغاء جميع الفواتير المتعلقة بهذا أمر الشراء."
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
@@ -436,13 +436,13 @@ msgstr "تم التحقق من الصلاحية عن طريق"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in last month"
-msgstr ""
+msgstr "طلب في الشهر الماضي"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:412
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
-msgstr ""
+msgstr "يجب عليك أولا إلغاء جميع حفلات الاستقبال المتعلقة بهذا أمر الشراء."
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
@@ -467,7 +467,7 @@ msgstr "توضح انه قد تم عمل الاختيار"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in exception state"
-msgstr ""
+msgstr "أوامر الشراء التي هي في حالة الاستثناء"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.report,validator:0
@@ -506,7 +506,7 @@ msgstr "تأكيد"
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 #: selection:purchase.order,invoice_method:0
 msgid "Based on receptions"
-msgstr ""
+msgstr "استناداً على ما تم استقباله"
 
 #. module: purchase
 #: constraint:res.company:0
@@ -541,7 +541,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
-msgstr ""
+msgstr "أمر الشراء التي هي في حالة استثناء"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -597,7 +597,7 @@ msgstr "السعر الإجمالي"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_import_create_supplier_installer
 msgid "Create or Import Suppliers"
-msgstr ""
+msgstr "إنشاء أو استيراد الموردون"
 
 #. module: purchase
 #: view:stock.picking:0
@@ -662,7 +662,7 @@ msgstr ""
 #. module: purchase
 #: report:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr ""
+msgstr "تأكيد أمر الشراء ن°"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
@@ -748,7 +748,7 @@ msgstr "الاستقبالات"
 #: code:addons/purchase/purchase.py:285
 #, python-format
 msgid "You cannot confirm a purchase order without any lines."
-msgstr ""
+msgstr "لا يمكنك تأكيد أمر الشراء دون أية أسطر."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -784,7 +784,7 @@ msgstr "يناير"
 #. module: purchase
 #: model:ir.actions.server,name:purchase.ir_actions_server_edi_purchase
 msgid "Auto-email confirmed purchase orders"
-msgstr ""
+msgstr "البريد التلقائي لتأكيد طلبات الشراء"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
@@ -840,7 +840,7 @@ msgstr "دمج امر الشراء"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in  current month"
-msgstr ""
+msgstr "طلب في الشهر الحالي"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay_pass:0
@@ -881,7 +881,7 @@ msgstr "خطوط الاوامر الكلية للمستخدم لكل شهر"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase orders"
-msgstr ""
+msgstr "تأكيد أوامر الشراء"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,month:0
@@ -891,7 +891,7 @@ msgstr "شهر"
 #. module: purchase
 #: model:email.template,subject:purchase.email_template_edi_purchase
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} أمر (Ref ${object.name or 'n/a' })"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -932,7 +932,7 @@ msgstr "ـكون هذه القائمة المختارة التي تم جمعها
 #. module: purchase
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "طلب عودة"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
@@ -984,7 +984,7 @@ msgstr ""
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Pre-Generate Draft Invoices based on Purchase Orders"
-msgstr ""
+msgstr "قبل انشاء مسودة فاتورة على طلبات الشراء"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
@@ -1010,7 +1010,7 @@ msgstr "عرض النتيجة"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Purchase Order Lines"
-msgstr ""
+msgstr "اعتماداً على سطور طلب الشراء"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
@@ -1130,7 +1130,7 @@ msgstr "مرشحات مفصلة..."
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "Invoicing Control on Purchases"
-msgstr ""
+msgstr "التحكم في الفاتورة عند الشراء"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:48
@@ -1806,7 +1806,7 @@ msgstr ""
 "الرجاء تعيين واحداً قبل اختيار المنتج."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po
index f93a83b069c..8396a90273a 100644
--- a/addons/purchase/i18n/bg.po
+++ b/addons/purchase/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1768,7 +1768,7 @@ msgstr ""
 " Моля, изберете преди избора на продукт."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po
index 87942674b68..8b8fdf97085 100644
--- a/addons/purchase/i18n/bs.po
+++ b/addons/purchase/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1763,7 +1763,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po
index 09a8bf271d9..5c63e3f6440 100644
--- a/addons/purchase/i18n/ca.po
+++ b/addons/purchase/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1837,7 +1837,7 @@ msgstr ""
 "Indiqueu un abans de seleccionar un producte."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po
index a1bda3cdbab..195ac106c5a 100644
--- a/addons/purchase/i18n/cs.po
+++ b/addons/purchase/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: purchase
@@ -1777,7 +1777,7 @@ msgstr ""
 "Před výběrem výrobku prosíme nastavte jednoho."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/da.po b/addons/purchase/i18n/da.po
index f445d54e9d0..2e7e2694b56 100644
--- a/addons/purchase/i18n/da.po
+++ b/addons/purchase/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po
index 5a22481f822..72bda0798a5 100644
--- a/addons/purchase/i18n/de.po
+++ b/addons/purchase/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1880,7 +1880,7 @@ msgstr ""
 "Auftragspositionen wählen."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index 8ec1a85acf1..357f1f09e14 100644
--- a/addons/purchase/i18n/el.po
+++ b/addons/purchase/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -1770,7 +1770,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/en_GB.po b/addons/purchase/i18n/en_GB.po
index 5a7f7371b28..6a251c0ea0d 100644
--- a/addons/purchase/i18n/en_GB.po
+++ b/addons/purchase/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1818,7 +1818,7 @@ msgstr ""
 "Please set one before choosing a product."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po
index 06f2f0bdd47..9a84098349c 100644
--- a/addons/purchase/i18n/es.po
+++ b/addons/purchase/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1838,7 +1838,7 @@ msgstr ""
 "Indique uno antes de seleccionar un producto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po
index 3c946924ad3..ebfe18cccfc 100644
--- a/addons/purchase/i18n/es_AR.po
+++ b/addons/purchase/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1766,7 +1766,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es_CL.po b/addons/purchase/i18n/es_CL.po
index c8fddc20f3f..000bc567bb7 100644
--- a/addons/purchase/i18n/es_CL.po
+++ b/addons/purchase/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1838,7 +1838,7 @@ msgstr ""
 "Indique uno antes de seleccionar un producto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es_CR.po b/addons/purchase/i18n/es_CR.po
index 01f5df83bc9..27263e86eb8 100644
--- a/addons/purchase/i18n/es_CR.po
+++ b/addons/purchase/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: purchase
@@ -1863,7 +1863,7 @@ msgstr ""
 "Indique uno antes de seleccionar un producto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/es_EC.po b/addons/purchase/i18n/es_EC.po
index 46c6ae77960..fcdd66ad408 100644
--- a/addons/purchase/i18n/es_EC.po
+++ b/addons/purchase/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1865,7 +1865,7 @@ msgstr ""
 "Indique uno antes de seleccionar un producto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po
index d0f3b9144ed..96b80c2f467 100644
--- a/addons/purchase/i18n/et.po
+++ b/addons/purchase/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
@@ -1770,7 +1770,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po
index e945ee225a1..0d47c9c4bdf 100644
--- a/addons/purchase/i18n/fi.po
+++ b/addons/purchase/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1818,7 +1818,7 @@ msgstr ""
 "Ole hyvä ja valitse yksi ennenkuin valitset tuotteen."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po
index 3824a516662..c794c3696c5 100644
--- a/addons/purchase/i18n/fr.po
+++ b/addons/purchase/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1870,7 +1870,7 @@ msgstr ""
 "Veuillez en sélectionner un avant de choisir un produit."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/gl.po b/addons/purchase/i18n/gl.po
index fbfa5ac46c2..1a95aa6056a 100644
--- a/addons/purchase/i18n/gl.po
+++ b/addons/purchase/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po
index 7dc6dad6263..11a83e7cfa8 100644
--- a/addons/purchase/i18n/hr.po
+++ b/addons/purchase/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1820,7 +1820,7 @@ msgstr ""
 "naloga za nabavu."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po
index 21799497083..4101d822747 100644
--- a/addons/purchase/i18n/hu.po
+++ b/addons/purchase/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1842,7 +1842,7 @@ msgstr ""
 "Kérem, állítsa be, mielőtt kiválasztaná a terméket!"
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po
index a2c34dd8bb7..3d89c3e6862 100644
--- a/addons/purchase/i18n/id.po
+++ b/addons/purchase/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1808,7 +1808,7 @@ msgstr ""
 "Harap menetapkan satu sebelum memilih produk."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index 8dbffb30980..358b76d3967 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1825,7 +1825,7 @@ msgstr ""
 "Inserire quindi una di queste voci prima di scegliere il prodotto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/ja.po b/addons/purchase/i18n/ja.po
index 3b6c33c2829..f89740d67d4 100644
--- a/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1789,7 +1789,7 @@ msgstr ""
 "製品を選択する前にどちらかをセットして下さい。"
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po
index 3a44173d01c..1e88247e6f1 100644
--- a/addons/purchase/i18n/ko.po
+++ b/addons/purchase/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1752,7 +1752,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index 62a9269cb2f..f2e50f00955 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1754,7 +1754,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/lv.po b/addons/purchase/i18n/lv.po
index b8c585b4451..457379bb2f1 100644
--- a/addons/purchase/i18n/lv.po
+++ b/addons/purchase/i18n/lv.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-03-20 14:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-10-16 16:24+0000\n"
+"Last-Translator: Vladimirs Kuzmins <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1297,7 +1297,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Not Invoiced"
-msgstr ""
+msgstr "Nav Izrakstīts Rēķins"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order.line,price_unit:0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index e42ac03c37e..18d7e61381c 100644
--- a/addons/purchase/i18n/mn.po
+++ b/addons/purchase/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1855,7 +1855,7 @@ msgstr ""
 "Бараа сонгохоосоо өмнө аль нэгийг нь сонго."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/nb.po b/addons/purchase/i18n/nb.po
index 76d56cdc691..a31ab70887b 100644
--- a/addons/purchase/i18n/nb.po
+++ b/addons/purchase/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -23,16 +23,18 @@ msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
 msgstr ""
+"Kjøper må godkjenne forespørselen før den sendes leverandør. Forespørselen "
+"blir en bekreftet innkjøpsordre."
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
 msgid "Incoming products to control"
-msgstr "Inngående varer til kontroll"
+msgstr "Innkommende produkter til kontroll."
 
 #. module: purchase
 #: field:purchase.order,invoiced:0
 msgid "Invoiced & Paid"
-msgstr "Fakturert og betalt"
+msgstr "Fakturert & Betalt"
 
 #. module: purchase
 #: field:purchase.order,location_id:0 view:purchase.report:0
@@ -44,18 +46,18 @@ msgstr "Destinasjon"
 #: code:addons/purchase/purchase.py:236
 #, python-format
 msgid "In order to delete a purchase order, it must be cancelled first!"
-msgstr "for å kunne slette en innkjøpsordre, må den først kanselleres!"
+msgstr "For å slette en bestilling, må den bli kansellert først!"
 
 #. module: purchase
 #: help:purchase.report,date:0
 msgid "Date on which this document has been created"
-msgstr "Dato for når dokumentet ble laget"
+msgstr "Dato dette dokumentet er blitt opprettet"
 
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0 view:purchase.report:0
 #: view:stock.picking:0
 msgid "Group By..."
-msgstr "Grupper etter..."
+msgstr "Grupper etter ..."
 
 #. module: purchase
 #: field:purchase.order,create_uid:0 view:purchase.report:0
@@ -75,6 +77,14 @@ msgid ""
 "supplier invoices: based on the order, based on the receptions or manual "
 "encoding."
 msgstr ""
+"Du kan opprette en forespørsel om kostnadsoverslag når du ønsker å kjøpe "
+"produkter til en leverandør, men kjøpet er ikke bekreftet enda. Bruk også "
+"denne menyen til å gjennomgå anmodninger om tilbudet opprettes automatisk "
+"basert på dine logistiske regler (minimum lager, MTO, etc). Du kan "
+"konvertere forespørsel om kostnadsoverslag til et kjøp etter at ordren er "
+"bekreftet. Hvis du bruker den utvidede grensesnittet (fra brukerens "
+"preferanser), kan du velge måten å kontrollere dine leverandørfakturaer: "
+"basert på rekkefølgen, basert på mottakelser eller manuell koding."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -111,6 +121,9 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"Bruk denne menyen til å søke innenfor dine bestillinger av referanser, "
+"leverandør, produkter osv. For hver bestilling, kan du spore produktene "
+"mottatt, og kontrollere leverandørfakturaer."
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:145
@@ -138,7 +151,7 @@ msgstr "Ingen prisliste!"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_config_wizard
 msgid "purchase.config.wizard"
-msgstr ""
+msgstr "purchase.config.wizard"
 
 #. module: purchase
 #: view:board.board:0 model:ir.actions.act_window,name:purchase.purchase_draft
@@ -189,6 +202,8 @@ msgid ""
 "customer.In this case, it will remove the warehouse link and set the "
 "customer location."
 msgstr ""
+"Angi adresse dersom du ønsker å levere direkte fra leverandør til kunde. I "
+"så tilfelle vil kobling til lager fjernes og kundelokasjon bli angitt."
 
 #. module: purchase
 #: help:res.partner,property_product_pricelist_purchase:0
@@ -217,7 +232,7 @@ msgstr "Innstillinger for innkjøp"
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Veiviser for delplukking"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -242,7 +257,7 @@ msgstr "Basert på dannet fakturakladd"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Day"
-msgstr "Ordre fra dag"
+msgstr "Dagens ordre"
 
 #. module: purchase
 #: view:board.board:0
@@ -321,6 +336,8 @@ msgid ""
 "A Pick list generates an invoice. Depending on the Invoicing control of the "
 "sale order, the invoice is based on delivered or on ordered quantities."
 msgstr ""
+"En plukkliste danner faktura. Fakturaen baseres enten på levert eller "
+"bestilt antall avhengig av parameter for faktureringsregel på ordren."
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.order.line,state:0
@@ -378,12 +395,12 @@ msgstr "Lagerbevegelser"
 #: code:addons/purchase/purchase.py:419
 #, python-format
 msgid "You must first cancel all invoices related to this purchase order."
-msgstr ""
+msgstr "Du må først annullere alle fakturaer tilhørende innkjøpsordren."
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr ""
+msgstr "Mottakeradresse kontaktnavn"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -394,7 +411,7 @@ msgstr "TVA :"
 #: code:addons/purchase/purchase.py:326
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
-msgstr ""
+msgstr "Status for innkjøpsordre '%s' er satt til Utkast."
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
@@ -474,7 +491,7 @@ msgstr "Gjennomsnittspris"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "Innkommende leveranse er allerede behandlet"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -511,6 +528,8 @@ msgid ""
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
 msgstr ""
+"En plukkliste genererer en leverandør faktura. Avhengig Fakturering kontroll "
+"av bestillingen, blir fakturaen basert på mottatt eller bestilte mengder."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -521,6 +540,11 @@ msgid ""
 "supplier invoice, you can generate a draft supplier invoice based on the "
 "lines from this menu."
 msgstr ""
+"Hvis du setter Fakturering Kontroll på en bestilling som \"Basert på "
+"innkjøpsordrenumre linjer\", kan du spore alle innkjøpsordren linjer som du "
+"ennå ikke har mottatt leverandørfaktura. Når du er klar til å motta en "
+"leverandør faktura, kan du generere et utkast leverandør faktura basert på "
+"linjene fra denne menyen."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -533,6 +557,8 @@ msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
 msgstr ""
+"Mottak analyse kan du enkelt sjekke og analysere bedriftens bestiller "
+"mottakelser og resultatene til leverandør leveranser."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -621,6 +647,8 @@ msgid ""
 "You have to select a partner in the purchase form !\n"
 "Please set one partner before choosing a product."
 msgstr ""
+"Du må velge en partner i kjøp av skjemaet!\n"
+"Vennligst sett en partner før du velger et produkt."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:349
@@ -636,6 +664,9 @@ msgid ""
 "order is 'On picking'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Fakturaen opprettes automatisk hvis Faktura kontroll av innkjøpsordren er "
+"'på plukke'. Fakturaen kan også genereres manuelt av revisor (Faktura "
+"kontroll = Manuell)."
 
 #. module: purchase
 #: report:purchase.order:0
@@ -649,6 +680,9 @@ msgid ""
 "purchase history and performance. From this menu you can track your "
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
+"Oppkjøpsanalyse kan du enkelt sjekke og analysere bedriftens kjøp historie "
+"og ytelse. Fra denne menyen kan du spore din forhandling ytelse, levering "
+"ytelsen til leverandørene, etc."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_configuration_misc
@@ -664,7 +698,7 @@ msgstr "Den valgte leverandøren selger dette produktet bare som %s"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Reference UOM"
-msgstr ""
+msgstr "Referanse UOM"
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0 view:purchase.report:0
@@ -734,6 +768,10 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"Bruk denne menyen til å kontrollere fakturaene som skal mottas fra din "
+"leverandør. OpenERP pregenerates utkast fakturaer fra dine innkjøpsordrer "
+"eller mottagelser, i henhold til dine innstillinger. Når du mottar en "
+"leverandør faktura, kan du matche det med utkastet faktura og bekrefte det."
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
@@ -807,6 +845,8 @@ msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
 msgstr ""
+"Dette er beregnet som minimum planlagt dato for alle kjøp ordrelinjer "
+"produkter."
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
@@ -868,6 +908,7 @@ msgstr "Måned"
 #: model:email.template,subject:purchase.email_template_edi_purchase
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
 msgstr ""
+"$ {object.company_id.name} Bestill (Ref $ {object.name eller 'n / a'})"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -908,7 +949,7 @@ msgstr "Dette er plukklisten som er opprettet fra aktuell innkjøpsordren"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "Er en restordre"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_invoiceafterpacking0
@@ -945,7 +986,7 @@ msgstr "Status på innkjøpsordre"
 #. module: purchase
 #: field:purchase.order,dest_address_id:0
 msgid "Destination Address"
-msgstr ""
+msgstr "Bestemmelse adresse"
 
 #. module: purchase
 #: field:purchase.report,state:0
@@ -997,7 +1038,7 @@ msgstr "Beløpet uten avgift"
 #: code:addons/purchase/purchase.py:754
 #, python-format
 msgid "Selected UOM does not belong to the same category as the product UOM"
-msgstr ""
+msgstr "Valgt UOM hører ikke til samme kategori som produktet UOM"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:907
@@ -1012,6 +1053,9 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"En kjøpsordre genererer en leverandør faktura, så snart den er bekreftet av "
+"kjøperen. Avhengig Fakturering kontroll av bestillingen, blir fakturaen "
+"basert på mottatt eller bestilte mengder."
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -1060,6 +1104,9 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Fakturaen opprettes automatisk hvis Faktura kontroll av innkjøpsordren er "
+"«på bestilling». Fakturaen kan også genereres manuelt av revisor (Faktura "
+"kontroll = Manuell)."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_email_templates
@@ -1107,7 +1154,7 @@ msgstr "Fakturakontroll ved innkjøp"
 #: code:addons/purchase/wizard/purchase_order_group.py:48
 #, python-format
 msgid "Please select multiple order to merge in the list view."
-msgstr ""
+msgstr "Velg flere for å fusjonere i listevisningen."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_import_create_supplier_installer
@@ -1116,6 +1163,9 @@ msgid ""
 "can import your existing partners by CSV spreadsheet from \"Import Data\" "
 "wizard"
 msgstr ""
+"Opprette eller importere leverandører og deres kontakter manuelt fra dette "
+"skjemaet, eller du kan importere dine eksisterende partnere av CSV regneark "
+"fra \"Importer data\" wizard."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
@@ -1166,7 +1216,7 @@ msgstr "Kan ikke få kansellert innkjøpsordren!"
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr ""
+msgstr "En plukk liste er laget for å spore innkommende produkter"
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -1215,6 +1265,11 @@ msgid ""
 "Based on generated invoice: create a draft invoice you can validate later.\n"
 "Based on receptions: let you create an invoice when receptions are validated."
 msgstr ""
+"Basert på Kjøp Bestill linjer: plass enkelte linjer i \"Faktura Kontroll> "
+"Basert på PO linjer 'fra der du kan velge å opprette en faktura.\n"
+"Basert på genererte faktura: lage et utkast faktura som du kan validere "
+"senere.\n"
+"Basert på mottakelser: lar deg lage en faktura når mottakelser er validert."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
@@ -1235,7 +1290,7 @@ msgstr "Produktkategorier"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr ""
+msgstr "Dager som skal valideres"
 
 #. module: purchase
 #: help:purchase.order,origin:0
@@ -1257,6 +1312,12 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
+"Tilstanden til kjøpsordre eller sitatet forespørselen. Et sitat er en "
+"kjøpsordre på en 'kladd' tilstand. Da ordren må bekreftes av brukeren, til "
+"staten bryteren 'Bekreftet'. Da leverandøren må bekrefte ordren å endre "
+"tilstanden til \"Godkjent\". Når bestillingen er betalt og mottatt, blir "
+"staten Ferdig. Hvis en avbryt handling skjer i fakturaen eller i resepsjonen "
+"av varer, blir staten i unntaket."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1404,7 +1465,7 @@ msgstr "Tel.:"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Month"
-msgstr ""
+msgstr "Bestilling av Måned"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1459,6 +1520,8 @@ msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
 "purchase less."
 msgstr ""
+"Den valgte leverandøren har en minimum mengde satt til% s% s, bør du ikke "
+"kjøpe mindre."
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
@@ -1517,6 +1580,9 @@ msgid ""
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
 msgstr ""
+"Få tilgang til leverandørens poster og opprettholde et godt forhold til dine "
+"leverandører. Du kan spore alle dine interaksjoner med dem gjennom historia "
+"kategorien: e-post, ordre, møter etc."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1579,6 +1645,8 @@ msgid ""
 "This tool will help you to select the method you want to use to control "
 "supplier invoices."
 msgstr ""
+"Dette verktøyet vil hjelpe deg å velge den metoden du vil bruke til å "
+"kontrollere leverandørfakturaer."
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
@@ -1586,6 +1654,8 @@ msgid ""
 "In case there is no supplier for this product, the buyer can fill the form "
 "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
+"I tilfelle det er ingen leverandør for dette produktet, kan kjøperen fylle "
+"ut skjemaet manuelt og bekrefte det. RFQ blir en bekreftet bestilling."
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1622,6 +1692,9 @@ msgid ""
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
 msgstr ""
+"Hvis du setter Fakturering Kontroll på en bestilling som \"Basert på "
+"mottakelser\", kan du spore alle produktgruppene mottakelser og lage "
+"fakturaer for disse mottakelser."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1653,6 +1726,16 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" Vær oppmerksom på at:\n"
+"Bestillinger vil bare bli slått sammen dersom:\n"
+"* Innkjøps ordrer er i utkast.\n"
+"* Innkjøps ordrer tilhører samme leverandør.\n"
+"* Bestillingene har samme lager sted, samme prisliste.\n"
+"\n"
+"Linjene vil bare bli slått sammen dersom:\n"
+" Bestillings linjene er nøyaktig det samme, unntatt for produktet, mengde og "
+"enhet. \n"
+" "
 
 #. module: purchase
 #: field:purchase.report,negociation:0
@@ -1678,7 +1761,7 @@ msgstr "Fakturakontroll"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Tilbake Ordrene"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -1706,6 +1789,11 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" * 'Kladdens' stat settes automatisk når kjøpsordre i utkast.\n"
+"* 'Bekreftet' stat settes automatisk som bekrefter når kjøpsordre i Bekreft "
+"tilstand.\n"
+"* Ferdig \"stat settes automatisk når bestillingen er satt som gjøres.\n"
+"* 'Avlyst \"stat settes automatisk når brukeren avbryte bestillingen."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:426
@@ -1726,7 +1814,7 @@ msgstr "Prisliste versjoner"
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:359
@@ -1757,7 +1845,7 @@ msgstr ""
 "Vennligst velg en før du velger prosukt."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
@@ -1812,6 +1900,55 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Hei $ {object.partner_address_id.name og '' eller''} $ "
+"{object.partner_address_id.name eller''},\n"
+"Her er en kjøp ordrebekreftelse fra $ {object.company_id.name}:\n"
+"Bestillingsnummer: * $ {object.name} *\n"
+"Bestilling totalt: * $ {object.amount_total} $ "
+"{object.pricelist_id.currency_id.name} *\n"
+"Bestilling dato: $ {object.date orden}\n"
+"% Hvis object.origin\n"
+"Bestilling referanse: $ {object.origin\n"
+"Bestilling referanse: $ {object.origin}\n"
+" % endif\n"
+" % Hvis object.partner_ref:\n"
+"  Din referanse: $ {object.partner_ref} <br />\n"
+"  % endif\n"
+"  Din kontakt: $ {object.validator.name} $ {object.validator.user_email og "
+"'<% s>'% (object.validator.user_email) eller''}\n"
+"Du kan se ordrebekreftelsen og laste den ned ved hjelp av følgende link:\n"
+"  $ {ctx.get ('edi_web_url_view') eller 'n / a'}\n"
+"\n"
+"Hvis du har noen spørsmål, ikke nøl med å kontakte oss.\n"
+"\n"
+"Takk!\n"
+"\n"
+"\n"
+"-\n"
+"$ {object.validator.name} $ {object.validator.user_email og '<% s>'% "
+"(object.validator.user_email) eller''}\n"
+"$ {object.company_id.name}\n"
+"% Hvis object.company_id.street:\n"
+"$ {object.company_id.street eller''}\n"
+"% endif\n"
+"% Hvis object.company_id.street2:\n"
+"$ {object.company_id.street2}\n"
+"% endif\n"
+"% Hvis object.company_id.city eller object.company_id.zip:\n"
+"$ {object.company_id.zip eller''} $ {object.company_id.city eller''}\n"
+"% endif\n"
+"% Hvis object.company_id.country_id:\n"
+"$ {object.company_id.state_id og ('% s'% object.company_id.state_id.name) "
+"eller''} $ {object.company_id.country_id.name eller''}\n"
+"% endif\n"
+"% Hvis object.company_id.phone:\n"
+"Telefon: $ {object.company_id.phone}\n"
+"% endif\n"
+"% Hvis object.company_id.website:\n"
+"$ {object.company_id.website eller''}\n"
+"% endif\n"
+"            "
 
 #. module: purchase
 #: view:purchase.order:0
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index 6297d304322..787f4b15beb 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
 "PO-Revision-Date: 2012-06-01 08:41+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -472,7 +472,7 @@ msgstr "Orderregel"
 #. module: purchase
 #: help:purchase.order,shipped:0
 msgid "It indicates that a picking has been done"
-msgstr "Het geeft aan dat een picking is uitgevoerd"
+msgstr "Het geeft aan dat het order verzamelen is uitgevoerd"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1382,7 +1382,7 @@ msgstr "Niet gefactureerd"
 #. module: purchase
 #: report:purchase.order:0 field:purchase.order.line,price_unit:0
 msgid "Unit Price"
-msgstr "Eenheidsprijs"
+msgstr "Prijs"
 
 #. module: purchase
 #: view:purchase.order:0 selection:purchase.order,state:0
@@ -1756,7 +1756,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.report,negociation:0
 msgid "Purchase-Standard Price"
-msgstr "Inkoop-standaard prijs"
+msgstr "Inkoop-kostprijs"
 
 #. module: purchase
 #: field:purchase.config.wizard,default_method:0
@@ -1868,7 +1868,7 @@ msgstr ""
 "Stel er een in voordat u een product kiest."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po
index e88150ed436..a0f2bb1b3b9 100644
--- a/addons/purchase/i18n/nl_BE.po
+++ b/addons/purchase/i18n/nl_BE.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2009-04-10 09:33+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2012-10-01 11:28+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -111,7 +111,7 @@ msgstr "Te factureren"
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Do you want to generate the supplier invoices?"
-msgstr ""
+msgstr "Wilt u de aankoopfacturen maken?"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -1831,7 +1831,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order.group:0
 msgid "Are you sure you want to merge these orders?"
-msgstr ""
+msgstr "Weet u zeker dat u deze orders wilt samenvoegen?"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
@@ -1849,7 +1849,7 @@ msgstr ""
 "Gelieve dit te doen voordat u een product kiest."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po
index 21d6d57633d..5dbe86554fb 100644
--- a/addons/purchase/i18n/pl.po
+++ b/addons/purchase/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1838,7 +1838,7 @@ msgstr ""
 "Wybierz jedno z powyższych przed wybraniem produktu."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po
index 6939735a946..4caee142836 100644
--- a/addons/purchase/i18n/pt.po
+++ b/addons/purchase/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1858,7 +1858,7 @@ msgstr ""
 "Por favor, defina um antes de escolher um artigo."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index bd16bef29a2..7c8b0e3b983 100644
--- a/addons/purchase/i18n/pt_BR.po
+++ b/addons/purchase/i18n/pt_BR.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-21 16:16+0000\n"
-"Last-Translator: Luciano Schirmer (IG-Tech) <luciano@igtech.com.br>\n"
+"PO-Revision-Date: 2012-09-16 11:51+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -234,7 +235,7 @@ msgstr "Propriedades de Compras"
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Assistente de Separação Parcial"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1010,7 +1011,7 @@ msgstr "Categorias de Produtos"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Pre-Generate Draft Invoices based on Purchase Orders"
-msgstr ""
+msgstr "Gerar previamente Faturas Provisórias baseadas em Pedidos de Compra"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
@@ -1200,7 +1201,7 @@ msgstr "Calcular"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments Available"
-msgstr "Entregas Disponíveis"
+msgstr "Recebimentos Disponíveis"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat
@@ -1276,6 +1277,13 @@ msgid ""
 "Based on generated invoice: create a draft invoice you can validate later.\n"
 "Based on receptions: let you create an invoice when receptions are validated."
 msgstr ""
+"Baseada em Linhas da Ordem de Compra: Usa linhas individuais em 'Controle de "
+"Faturas > Baseadas em linhas de O.C' de onde você pode criar uma fatura "
+"seletivamente.\n"
+"Baseada em fatura gerada: cria uma fatura provisória que você pode validar "
+"depois.\n"
+"Baseada em recebimentos: permite que você crie uma fatura quando os "
+"recebimentos forem validados."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
@@ -1645,7 +1653,7 @@ msgstr "Valor sem Impostos"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Picking to Invoice"
-msgstr ""
+msgstr "Separação para Faturar"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
@@ -1653,6 +1661,8 @@ msgid ""
 "This tool will help you to select the method you want to use to control "
 "supplier invoices."
 msgstr ""
+"Esta ferramenta te ajuda a selecionar o método que você deseja para "
+"controlar as faturas de fornecedores."
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
@@ -1699,6 +1709,9 @@ msgid ""
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
 msgstr ""
+"Se você definir o Controle de Faturamento em ordem de compra como 'Baseado "
+"em recebimentos'. você pode rastrear aqui todos os recebimentos de produtos "
+"e criar faturas para estes recebimentos."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1750,7 +1763,7 @@ msgstr "Preço Padrão de Compra"
 #. module: purchase
 #: field:purchase.config.wizard,default_method:0
 msgid "Default Invoicing Control Method"
-msgstr ""
+msgstr "Método de Controle de Fatura Padrão"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
@@ -1766,7 +1779,7 @@ msgstr "Controle Faturamento"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Pedidos Devolvidos"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -1821,7 +1834,7 @@ msgstr "Versões da lista"
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar recursivamente a membros associados."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:359
@@ -1853,7 +1866,7 @@ msgstr ""
 "Por favor, selecione um antes de escolher um produto."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
@@ -1908,11 +1921,62 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Olá${object.partner_address_id.name and ' ' or "
+"''}${object.partner_address_id.name or ''},\n"
+"\n"
+"Esta é a confirmação do pedido de compra de ${object.company_id.name}:\n"
+"       | Número do Pedido: *${object.name}*\n"
+"       | Total do Pedido: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Data do Pedido: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Referência do Pedido: ${object.origin}\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       | Sua referência: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       | Seu contato: ${object.validator.name} ${object.validator.user_email "
+"and '<%s>'%(object.validator.user_email) or ''}\n"
+"\n"
+"Você pode ver a confirmação do pedido e fazer o download usando o seguinte "
+"link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"Se você tiver alguma dúvida por favor entre em contato conosco.\n"
+"\n"
+"Obrigado!\n"
+"\n"
+"\n"
+"--\n"
+"${object.validator.name} ${object.validator.user_email and "
+"'<%s>'%(object.validator.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Telefone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
-msgstr ""
+msgstr "Pedidos de Compra que estão como Provisórios"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1922,17 +1986,17 @@ msgstr "Maio"
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_manager
 msgid "Manager"
-msgstr ""
+msgstr "Gerente"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in current year"
-msgstr ""
+msgstr "Pedidos este ano"
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
@@ -1949,7 +2013,7 @@ msgstr "Ano"
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 #: selection:purchase.order,invoice_method:0
 msgid "Based on Purchase Order lines"
-msgstr ""
+msgstr "Baseada em Linhas de Pedido de Compra"
 
 #. module: purchase
 #: model:ir.actions.todo.category,name:purchase.category_purchase_config
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index 44355e26cea..a7fd4cfaab8 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -1767,7 +1767,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or ''}${object."
diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po
index 56cb34bd077..0aa5041f51d 100644
--- a/addons/purchase/i18n/ro.po
+++ b/addons/purchase/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -919,7 +919,7 @@ msgstr "Luna"
 #. module: purchase
 #: model:email.template,subject:purchase.email_template_edi_purchase
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${nume.obiect.id_companie} Comanda (Ref ${nume.obiect sau 'n/a'})"
+msgstr "${object.company_id.name} Comanda (Ref ${object.name or 'n/a' })"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1875,7 +1875,7 @@ msgstr ""
 "Va rugam sa setati una inainte de a alege un produs."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
@@ -1931,56 +1931,57 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"Hello${obiect.nume.id_adresa_partener si '  ' sau "
-"''}${obiect.nume.id_adresa_partener sau ''},\n"
-" \n"
-"Iata o confirmare a comenzii de achizitie de la ${nume.obiect.id_companie}:\n"
-"        | Numarul comenzii: *${obiect.nume}*\n"
-"        | Total comanda: *${obiect.total_suma} "
-"${obiect.id_lista_de_preturi.nume.id_valuta}*\n"
-"        | Data comenzii: ${obiect.data_comenzii}\n"
-"        % daca obiect.origine:\n"
-"        | Referinta comenzii: ${obiect.origine}\n"
-"        % endif\n"
-"        % daca object.referinta_partener:\n"
-"        | Referinta d-voastra: ${obiect.ref_partener}<br />\n"
-"        % endif\n"
-"        | Contactul d-voastra: ${obiect.nume.validator} "
-"${obiect.email_utilizator.validator si  "
-"'<%s>'%(obiect.email_utilizator.validator) sau ''}\n"
-" \n"
-"Puteti vizualiza confirmarea comenzii si sa o descarcati folosind "
-"urmatorul:\n"
-"     ${ctx.get('edi_web_url_view') sau 'n/a'}\n"
-" \n"
+"Buna ziua ${object.partner_address_id.name and ' ' or "
+"''}${object.partner_address_id.name or ''},\n"
+"\n"
+"O noua comanda de achizitie a fost generata de la  "
+"${object.company_id.name}:\n"
+"| Numar comanda: *${object.name}*\n"
+"| Total comanda: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"| Data comanda: ${object.date_order}\n"
+"% if object.origin:\n"
+"| Referinta comanda: ${object.origin}\n"
+"% endif\n"
+"% if object.partner_ref:\n"
+"| Referinta dumneavoastra: ${object.partner_ref}<br />\n"
+"% endif\n"
+"| Agentul dumneavoastra: ${object.validator.name} "
+"${object.validator.user_email and '<%s>'%(object.validator.user_email) or "
+"''}\n"
+"\n"
+"Puteti vizualiza confirmarea comenzii si sa o descarcati folosind urmatorul "
+"link:\n"
+"${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
 "Daca aveti intrebari, nu ezitati sa ne contactati.\n"
-" \n"
+"\n"
 "Va multumim!\n"
-" \n"
+"\n"
 "\n"
 "--\n"
-"${obiect.nume.validator.} ${obiect.email_utilizator.validator si "
-"'<%s>'%(obiect.email_utilizator.validator) sau ''}\n"
-" ${obiect.nume.id_companie}\n"
-" % daca obiect.strada.id_companie:\n"
-" ${obiect.strada.id_companie sau ''}\n"
-" % endif\n"
-" % daca obiect.strada2.id_companie:\n"
-" ${obiect.strada2.id_companie}\n"
-" % endif\n"
-" % daca obiect.oras.id_companie sau obiect.cod_postal.id_companie:\n"
-" ${obiect.cod_postal.id_companie sau ''} ${obiect.oras.id_companie sau ''}\n"
-" % endif\n"
-" % daca obiect.id_tara.id_companie:\n"
-" ${obiect.id_companie.id_tara si ('%s, ' % obiect.id_companie.nume.id_tara) "
-"sau ''} ${obiect.id_companie.nume.id_tara sau ''}\n"
-" % endif\n"
-" % daca obiect.telefon.id_companie:\n"
-" Telefon: ${obiect.telefon.id_companie}\n"
-" % endif\n"
-" % daca obiect.website.id_companie:\n"
-" ${obiect.website.id_companie sau ''}\n"
-" % endif\n"
+"${object.validator.name} ${object.validator.user_email and "
+"'<%s>'%(object.validator.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Telefon: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
 "            "
 
 #. module: purchase
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 5c26b06c64d..4e8e1a6ed61 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -23,7 +23,7 @@ msgid ""
 "becomes a confirmed Purchase Order."
 msgstr ""
 "Покупатель должен утвердить запрос до его передачи поставщику. Запрос "
-"становится подтвержденным заказом на закупку."
+"становится подтвержденным заказом закупки."
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
@@ -45,7 +45,7 @@ msgstr "Место назначения"
 #: code:addons/purchase/purchase.py:236
 #, python-format
 msgid "In order to delete a purchase order, it must be cancelled first!"
-msgstr ""
+msgstr "Для того, чтобы удалить заказ , сначала он должен быть отменен!"
 
 #. module: purchase
 #: help:purchase.report,date:0
@@ -56,7 +56,7 @@ msgstr "Дата на которую этот документ был созда
 #: view:purchase.order:0 view:purchase.order.line:0 view:purchase.report:0
 #: view:stock.picking:0
 msgid "Group By..."
-msgstr "Объединять по..."
+msgstr "Группировать по ..."
 
 #. module: purchase
 #: field:purchase.order,create_uid:0 view:purchase.report:0
@@ -76,11 +76,19 @@ msgid ""
 "supplier invoices: based on the order, based on the receptions or manual "
 "encoding."
 msgstr ""
+"Вы можете создать запрос цен, когда вы хотите купить товар у поставщика но "
+"закупка ещё не подтверждена. Используйте также это меню для пересмотра "
+"запросов цен, созданных автоматически на основе ваших правил логистики "
+"(минимум запаса, MTO и т.д.). Вы можете преобразовать запрос цен в заказ "
+"закупки сразу после подтверждения заказа. Если вы используете расширенный "
+"интерфейс (из предпочтений пользователя), вы можете выбрать путь управления "
+"вашими счетами поставщика: на основе заказа, на основе поступлений или "
+"ручном вводе данных."
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase order"
-msgstr ""
+msgstr "Утвержденный заказ закупки"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,partner_id:0
@@ -93,12 +101,12 @@ msgstr "Поставщик"
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action2_purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_config_pricelist
 msgid "Pricelists"
-msgstr "Каталоги"
+msgstr "Прайс-листы"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr ""
+msgstr "В счет"
 
 #. module: purchase
 #: view:purchase.order.line_invoice:0
@@ -112,7 +120,7 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
-"Это меню используется для поиска в ваших заказах на закупки ссылок, "
+"Это меню используется для поиска в ваших заказах закупки ссылок, "
 "поставщиков, ТМЦ и т.д. Для каждого заказа, вы можете отслеживать полученные "
 "ТМЦ, и контролировать счета поставщиков."
 
@@ -125,7 +133,7 @@ msgstr "Cчета поставщиков"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Purchase Orders Statistics"
-msgstr "Статистика заказов на закупку"
+msgstr "Статистика заказов закупки"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_packinginvoice0
@@ -137,12 +145,12 @@ msgstr "Из комплектовочного листа"
 #: code:addons/purchase/purchase.py:735
 #, python-format
 msgid "No Pricelist !"
-msgstr "Нет каталога !"
+msgstr "Нет прайс-листа !"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_config_wizard
 msgid "purchase.config.wizard"
-msgstr ""
+msgstr "purchase.config.wizard"
 
 #. module: purchase
 #: view:board.board:0 model:ir.actions.act_window,name:purchase.purchase_draft
@@ -152,7 +160,7 @@ msgstr "Запрос цен"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Receptions"
-msgstr ""
+msgstr "Основано на поступлениях"
 
 #. module: purchase
 #: field:purchase.order,company_id:0 field:purchase.order.line,company_id:0
@@ -163,7 +171,7 @@ msgstr "Компания"
 #. module: purchase
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr "Это время запаса для каждого заказа на закупку"
+msgstr "Это время запаса для каждого заказа закупки"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
@@ -184,7 +192,7 @@ msgstr "Исключительная ситуация счета"
 #. module: purchase
 #: model:product.pricelist,name:purchase.list0
 msgid "Default Purchase Pricelist"
-msgstr "Каталог по умолчанию для закупок"
+msgstr "Прайс-лист закупок по умолчанию"
 
 #. module: purchase
 #: help:purchase.order,dest_address_id:0
@@ -194,7 +202,7 @@ msgid ""
 "customer location."
 msgstr ""
 "Поместите адрес, если доставка будет напрямую от поставщика заказчику. В "
-"этом случае, ссылка на склад будет удалена и установлено местоположение "
+"этом случае, ссылка на склад будет удалена и установлено место хранения "
 "заказчика."
 
 #. module: purchase
@@ -203,8 +211,8 @@ msgid ""
 "This pricelist will be used, instead of the default one, for purchases from "
 "the current partner"
 msgstr ""
-"Для закупок у данного партнера вместо каталога по умолчанию будет "
-"применяться указанный каталог."
+"Для закупок у данного партнера вместо прайс-листа по умолчанию будет "
+"применяться указанный прайс-лист."
 
 #. module: purchase
 #: report:purchase.order:0
@@ -214,7 +222,7 @@ msgstr "Факс  :"
 #. module: purchase
 #: view:purchase.order:0
 msgid "To Approve"
-msgstr "Одобрить"
+msgstr "На утверждение"
 
 #. module: purchase
 #: view:res.partner:0
@@ -224,7 +232,7 @@ msgstr "Свойства закупок"
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Запуск мастера частичного комплектования"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -244,17 +252,17 @@ msgstr "День"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "Based on generated draft invoice"
-msgstr ""
+msgstr "На основе созданного черновика счета"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Day"
-msgstr ""
+msgstr "Заказ дня"
 
 #. module: purchase
 #: view:board.board:0
 msgid "Monthly Purchases by Category"
-msgstr ""
+msgstr "Месячные закупки по категории"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_line_product_tree
@@ -264,7 +272,7 @@ msgstr "Закупки"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in draft state"
-msgstr ""
+msgstr "Заказ закупки, который в состоянии \"Черновик\""
 
 #. module: purchase
 #: view:purchase.order:0
@@ -296,7 +304,7 @@ msgstr "Налоги"
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
 msgid "Purchase Order"
-msgstr "Заказ на закупку"
+msgstr "Заказ закупки"
 
 #. module: purchase
 #: field:purchase.order,name:0 view:purchase.order.line:0
@@ -329,7 +337,7 @@ msgid ""
 "sale order, the invoice is based on delivered or on ordered quantities."
 msgstr ""
 "Комплектовочный лист создает счет. В зависимости от метода выставления счета "
-"при заказе на продажу, счет основывается на отгруженном или на заказанном "
+"при заказе продаж, счет основывается на отгруженном или на заказанном "
 "количестве."
 
 #. module: purchase
@@ -341,12 +349,12 @@ msgstr "Отменено"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Convert to Purchase Order"
-msgstr "Преобразовать в заказ на закупку"
+msgstr "Преобразовать в заказ закупки"
 
 #. module: purchase
 #: field:purchase.order,pricelist_id:0 field:purchase.report,pricelist_id:0
 msgid "Pricelist"
-msgstr "Каталог"
+msgstr "Прайс-лист"
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.report,state:0
@@ -389,6 +397,8 @@ msgstr "Перемещение ТМЦ"
 #, python-format
 msgid "You must first cancel all invoices related to this purchase order."
 msgstr ""
+"Прежде всего, необходимо отменить все счета , связанные с этим заказом "
+"закупки."
 
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
@@ -404,7 +414,7 @@ msgstr "НДС :"
 #: code:addons/purchase/purchase.py:326
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
-msgstr "Заказ на закупку '%s' был установлен в состояние \"Черновик\"."
+msgstr "Заказ закупки '%s' был установлен в состояние \"Черновик\"."
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
@@ -432,13 +442,15 @@ msgstr "Утверждено"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in last month"
-msgstr ""
+msgstr "Заказ в прошлом месяце"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:412
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
+"Прежде всего, необходимо отменить все поступления , связанные с этим заказом "
+"закупки."
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
@@ -463,7 +475,7 @@ msgstr "Показывает, что комплектование выполне
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in exception state"
-msgstr ""
+msgstr "Заказы, которые находятся в состоянии \"Исключение\""
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.report,validator:0
@@ -484,7 +496,7 @@ msgstr "Средняя цена"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "Поступившие ТМЦ, которые уже обработаны"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -502,7 +514,7 @@ msgstr "Подтвердить"
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 #: selection:purchase.order,invoice_method:0
 msgid "Based on receptions"
-msgstr ""
+msgstr "На основе поступлений"
 
 #. module: purchase
 #: constraint:res.company:0
@@ -522,8 +534,8 @@ msgid ""
 "quantities."
 msgstr ""
 "Комплектовочный лист создает счет поставщика. В зависимости от метода "
-"выставления счета при заказе на закупку, счет основывается на принятом или "
-"на заказанном количестве."
+"выставления счета при заказе закупки, счет основывается на принятом или на "
+"заказанном количестве."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -534,11 +546,16 @@ msgid ""
 "supplier invoice, you can generate a draft supplier invoice based on the "
 "lines from this menu."
 msgstr ""
+"Если вы задали управление счётом по заказу закупки как 'На основе позиций "
+"заказа закупки', вы можете отслеживать здесь все позиции заказа закупки для "
+"которых вы ещё не получили счёт поставщика. При готовности получения счёта "
+"поставщика, вы можете создать черновик счёта поставщика на основе позиций из "
+"этого меню."
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
-msgstr ""
+msgstr "Запрос закупки, который находится в состоянии \"Исключение\""
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -546,7 +563,7 @@ msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
 msgstr ""
-"Анализ приходов позволяет вам проверять и анализировать приход заказанных "
+"Анализ поступлений позволяет вам проверять и анализировать приход заказанных "
 "ТМЦ и исполнение доставок от поставщика."
 
 #. module: purchase
@@ -568,7 +585,7 @@ msgstr "Печать"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_order_group
 msgid "Merge Purchase orders"
-msgstr "Объединить заказы на закупку"
+msgstr "Объединить заказы закупок"
 
 #. module: purchase
 #: field:purchase.order,order_line:0
@@ -594,12 +611,12 @@ msgstr "Итоговая цена"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_import_create_supplier_installer
 msgid "Create or Import Suppliers"
-msgstr ""
+msgstr "Создать или импортировать поставщиков"
 
 #. module: purchase
 #: view:stock.picking:0
 msgid "Available"
-msgstr ""
+msgstr "Доступно"
 
 #. module: purchase
 #: field:purchase.report,partner_address_id:0
@@ -609,12 +626,12 @@ msgstr "Адрес контакта"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Shipping address :"
-msgstr "Адрес поставки :"
+msgstr "Адрес доставки:"
 
 #. module: purchase
 #: help:purchase.order,invoice_ids:0
 msgid "Invoices generated for a purchase order"
-msgstr "Счета созданные для заказа на закупку"
+msgstr "Счета созданные для заказа закупки"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:285 code:addons/purchase/purchase.py:348
@@ -627,7 +644,7 @@ msgstr "Ошибка !"
 #. module: purchase
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Нельзя переместить ТМЦ в/из место хранения типа вид."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:737
@@ -636,7 +653,7 @@ msgid ""
 "You have to select a partner in the purchase form !\n"
 "Please set one partner before choosing a product."
 msgstr ""
-"Надо выбрать партнера при заполнении заказа на закупку !\n"
+"Надо выбрать партнера при заполнении заказа закупки !\n"
 "Пожалуйста, выберите партнера перед выбором товара."
 
 #. module: purchase
@@ -652,11 +669,14 @@ msgid ""
 "order is 'On picking'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Счёт создан автоматически, если управление счётом заказа закупки - 'По "
+"комплектованию'. Счёт может быть создан также вручную бухгалтером "
+"(управление счётом = ручное)."
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Purchase Order Confirmation N°"
-msgstr "Подтверждение заказа на закупку N°"
+msgstr "Подтверждение заказа закупки N°"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_purchase_order_report_all
@@ -665,11 +685,14 @@ msgid ""
 "purchase history and performance. From this menu you can track your "
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
+"Анализ закупок позволяет вам легко проверить и анализировать историю и "
+"выполнение закупок вашей компании. Из этого меню вы можете отследить "
+"успешность ваших переговоров, успешность поставки ваших поставщиков и т.д."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Прочее"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:769
@@ -680,7 +703,7 @@ msgstr "Выбранный поставщик продает ТМЦ только
 #. module: purchase
 #: view:purchase.report:0
 msgid "Reference UOM"
-msgstr "Базовая единица измерения"
+msgstr "Базовая ед.изм."
 
 #. module: purchase
 #: field:purchase.order.line,product_qty:0 view:purchase.report:0
@@ -702,7 +725,7 @@ msgstr "Единицы измерения"
 #. module: purchase
 #: field:purchase.order.line,move_dest_id:0
 msgid "Reservation Destination"
-msgstr ""
+msgstr "Заказанное место назначения"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:236
@@ -734,13 +757,13 @@ msgstr "Итоговая сумма"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
 msgid "Receptions"
-msgstr "Приходы"
+msgstr "Поступления"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:285
 #, python-format
 msgid "You cannot confirm a purchase order without any lines."
-msgstr ""
+msgstr "Вы не можете подтвердить заказ без позиций."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -750,6 +773,10 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"Используйте это меню для управления счетами полученными от вашего "
+"поставщика. OpenERP создаёт черновые счета из ваших заказов закупки или "
+"поступлений, согласно вашим настройкам. Получив счёт поставщика, вы должны "
+"сравнить его с черновиком счёта и подтвердить его."
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
@@ -761,7 +788,7 @@ msgstr "ЗЦ"
 #: code:addons/purchase/edi/purchase_order.py:139
 #, python-format
 msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "Прайс-лист ЕОД(EDI) (%s)"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -776,7 +803,7 @@ msgstr "Январь"
 #. module: purchase
 #: model:ir.actions.server,name:purchase.ir_actions_server_edi_purchase
 msgid "Auto-email confirmed purchase orders"
-msgstr ""
+msgstr "Авто-отправка по эл.почте  подтвержденных заказов закупок."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_approvingpurchaseorder0
@@ -815,7 +842,7 @@ msgstr "Кол-во"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Месяц-1"
 
 #. module: purchase
 #: help:purchase.order,minimum_planned_date:0
@@ -823,18 +850,17 @@ msgid ""
 "This is computed as the minimum scheduled date of all purchase order lines' "
 "products."
 msgstr ""
-"Вычислено, как ближайшая запланированная дата из всех позиций заказа на "
-"закупку"
+"Вычислено, как ближайшая запланированная дата из всех позиций заказа закупки"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
 msgid "Purchase Order Merge"
-msgstr "Объединить заказ на закупку"
+msgstr "Объединить заказы закупок"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in  current month"
-msgstr ""
+msgstr "Заказ в текущем месяце"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay_pass:0
@@ -875,7 +901,7 @@ msgstr "Итоговые позиции заказов по пользовате
 #. module: purchase
 #: view:purchase.order:0
 msgid "Approved purchase orders"
-msgstr ""
+msgstr "Утвержденные заказы закупки"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,month:0
@@ -885,17 +911,17 @@ msgstr "Месяц"
 #. module: purchase
 #: model:email.template,subject:purchase.email_template_edi_purchase
 msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} Заказ (Ссылка ${object.name or 'n/a' })"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Request for Quotation :"
-msgstr "Запрос цен :"
+msgstr "Запрос цен:"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.purchase_waiting
 msgid "Purchase Order Waiting Approval"
-msgstr "Заказ на закупку в ожидании утверждения"
+msgstr "Заказ закупки в ожидании утверждения"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -905,7 +931,7 @@ msgstr "Итого без налога"
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_user
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: purchase
 #: field:purchase.order,shipped:0 field:purchase.order,shipped_rate:0
@@ -948,7 +974,7 @@ msgstr "Налоги :"
 #. module: purchase
 #: field:purchase.order,invoiced_rate:0 field:purchase.order.line,invoiced:0
 msgid "Invoiced"
-msgstr "Счет"
+msgstr "Счет выставлен"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,category_id:0
@@ -974,12 +1000,13 @@ msgstr "Состояние заказа"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase
 msgid "Product Categories"
-msgstr ""
+msgstr "Категории ТМЦ"
 
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Pre-Generate Draft Invoices based on Purchase Orders"
 msgstr ""
+"Предварительное создание черновиков счетов основанных на заказах закупки"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
@@ -989,13 +1016,13 @@ msgstr "Создать счета"
 #. module: purchase
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Название компании должно быть уникальным!"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line
 #: view:purchase.order.line:0 field:stock.move,purchase_line_id:0
 msgid "Purchase Order Line"
-msgstr "Позиция заказа на закупку"
+msgstr "Позиция заказа закупки"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1005,7 +1032,7 @@ msgstr "Вид календаря"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Purchase Order Lines"
-msgstr ""
+msgstr "Основан на позициях заказа закупки"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
@@ -1017,12 +1044,13 @@ msgstr "Сумма без налогов"
 #, python-format
 msgid "Selected UOM does not belong to the same category as the product UOM"
 msgstr ""
+"Выбранная ед.изм. не принадлежит той же категории, что и ед.изм. товара"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:907
 #, python-format
 msgid "PO: %s"
-msgstr ""
+msgstr "ЗЗ: %s"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_purchaseinvoice0
@@ -1031,6 +1059,9 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"Заказ закупки создаёт счёт поставщика как только он подтверждается "
+"покупателем. В зависимости от управления счётом заказа закупки, счёт основан "
+"на полученных или заказанных количествах."
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
@@ -1079,7 +1110,7 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
-"Счет создается автоматически, если контроль счетов в заказе на закупку 'По "
+"Счет создается автоматически, если контроль счетов в заказе закупки 'По "
 "заказу'. Возможно создание счета вручную бухгалтером (контроль счетов = "
 "'Вручную')."
 
@@ -1087,12 +1118,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:purchase.action_email_templates
 #: model:ir.ui.menu,name:purchase.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "Шаблоны писем"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_report
 msgid "Purchases Orders"
-msgstr "Заказы на закупку"
+msgstr "Заказы закупки"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1108,7 +1139,7 @@ msgstr "Управление счетами"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "Категории ед.изм."
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1123,7 +1154,7 @@ msgstr "Расширенные фильтры..."
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "Invoicing Control on Purchases"
-msgstr ""
+msgstr "Управление счетами по закупкам"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:48
@@ -1138,6 +1169,9 @@ msgid ""
 "can import your existing partners by CSV spreadsheet from \"Import Data\" "
 "wizard"
 msgstr ""
+"Создайте или импортируйте из этой формы поставщиков и их контакты вручную "
+"или можете импортировать ваших существующих партнёров с помощью мастера CSV "
+"электронных таблиц 'Импорт данных'"
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
@@ -1162,12 +1196,12 @@ msgstr "Вычислить"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments Available"
-msgstr ""
+msgstr "Поступающие грузы, доступные к обработке"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat
 msgid "Address Book"
-msgstr ""
+msgstr "Адресная книга"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_res_company
@@ -1177,13 +1211,13 @@ msgstr "Компании"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Cancel Purchase Order"
-msgstr "Отмена заказа на закупку"
+msgstr "Отмена заказа закупки"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:411 code:addons/purchase/purchase.py:418
 #, python-format
 msgid "Unable to cancel this purchase order!"
-msgstr ""
+msgstr "Не удалось отменить это заказ закупки !"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
@@ -1196,7 +1230,7 @@ msgid ""
 "The pricelist sets the currency used for this purchase order. It also "
 "computes the supplier price for the selected products/quantities."
 msgstr ""
-"Валюта, используемая в заказе на закупку, определяется каталогом. Так же "
+"Валюта, используемая в заказе закупки, определяется прайс-листом. Так же "
 "рассчитывается цена поставщика для выбранной продукции / количества."
 
 #. module: purchase
@@ -1207,7 +1241,7 @@ msgstr "Инф. панель"
 #. module: purchase
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка должна быть уникальна для каждой компании!"
 
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_standard:0
@@ -1217,7 +1251,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
 msgid "Partner Categories"
-msgstr ""
+msgstr "Категории партнеров"
 
 #. module: purchase
 #: help:purchase.order,amount_tax:0
@@ -1237,6 +1271,13 @@ msgid ""
 "Based on generated invoice: create a draft invoice you can validate later.\n"
 "Based on receptions: let you create an invoice when receptions are validated."
 msgstr ""
+"Основан на позициях заказа закупки: разместите отдельные позиции в "
+"'Управление счётом > На основе позиций ЗЗ' из которого вы можете "
+"избирательно создать счёт.\n"
+"Основан на созданном счёте: создайте черновой счёт, который вы можете "
+"подтвердить позже.\n"
+"Основан на поступлениях: позволяет вам создать счёт, когда поступления "
+"подтверждены."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
@@ -1262,12 +1303,12 @@ msgstr "Дней на утверждение"
 #. module: purchase
 #: help:purchase.order,origin:0
 msgid "Reference of the document that generated this purchase order request."
-msgstr "Ссылка на документ из которого был создан этот заказ на закупку."
+msgstr "Ссылка на документ из которого был создан этот заказ закупки."
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "Заказы закупки , которые еще ​​не утверждены."
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1302,12 +1343,12 @@ msgstr "Склад"
 #: code:addons/purchase/purchase.py:289
 #, python-format
 msgid "Purchase order '%s' is confirmed."
-msgstr "Заказ на закупку '%s' подтвержден."
+msgstr "Заказ закупки '%s' подтвержден."
 
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr "Дата на которую заказ на закупку был утвержден"
+msgstr "Дата на которую заказ закупки был утвержден"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,state:0
@@ -1359,7 +1400,7 @@ msgstr "Счет"
 #. module: purchase
 #: model:process.node,note:purchase.process_node_purchaseorder0
 msgid "Confirmed purchase order to invoice"
-msgstr "Подтвержденный заказ на закупку в счет"
+msgstr "Подтвержденный заказ закупки в счет"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingcancelpurchaseorder0
@@ -1372,12 +1413,12 @@ msgstr "Отмена"
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0
 msgid "Purchase Order Lines"
-msgstr "Позиции заказа на закупку"
+msgstr "Позиции заказа закупки"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr "Продавец утвердил заказ на закупку"
+msgstr "Продавец утвердил заказ закупки"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:80
@@ -1387,12 +1428,12 @@ msgstr "Продавец утвердил заказ на закупку"
 #: view:purchase.report:0
 #, python-format
 msgid "Purchase Orders"
-msgstr "Заказы на закупку"
+msgstr "Заказы закупки"
 
 #. module: purchase
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
 
 #. module: purchase
 #: field:purchase.order,origin:0
@@ -1407,7 +1448,7 @@ msgstr "Объединить заказы"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
-msgstr "Позиция заказа на закупку - Создать счет"
+msgstr "Позиция заказа закупки - Создать счет"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
@@ -1433,7 +1474,7 @@ msgstr "Тел. :"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Month"
-msgstr ""
+msgstr "Заказ месяца"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -1443,12 +1484,12 @@ msgstr "Ссылка на наш заказ"
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0
 msgid "Search Purchase Order"
-msgstr "Искать заказ на закупку"
+msgstr "Искать заказ закупки"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_config
 msgid "Set the Default Invoicing Control Method"
-msgstr ""
+msgstr "Задать способ управления выставлением счёта по умолчанию"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
@@ -1474,7 +1515,7 @@ msgstr "Ожидание"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "Based on draft invoices"
-msgstr ""
+msgstr "Основан на черновиках счетов"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1488,6 +1529,8 @@ msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
 "purchase less."
 msgstr ""
+"Выбранный поставщик имеет минимальное заданное количество  %s %s, вы не "
+"можете закупить меньше."
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
@@ -1516,7 +1559,7 @@ msgstr "Описание"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order of Year"
-msgstr ""
+msgstr "Заказ года"
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -1526,7 +1569,7 @@ msgstr "Ожидаемый адрес доставки:"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Journal"
-msgstr ""
+msgstr "Журнал"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_stock_move_report_po
@@ -1546,6 +1589,9 @@ msgid ""
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
 msgstr ""
+"Доступ к записям вашего поставщика и поддержка хороших взаимоотношений с "
+"вашими поставщиками. Вы можете отследить все ваши операции с ними через "
+"вкладку истории: e-mail-ы, заказы, встречи и т.д."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1555,7 +1601,7 @@ msgstr "Доставка"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in done state."
-msgstr ""
+msgstr "Заказы закупок в состоянии \"Сделано\"."
 
 #. module: purchase
 #: field:purchase.order.line,product_uom:0
@@ -1590,7 +1636,7 @@ msgstr "Резервирование"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders that include lines not invoiced."
-msgstr ""
+msgstr "Заказы закупки, которые имеют позиции не указанные в счетах."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1600,7 +1646,7 @@ msgstr "Сумма до налогов"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Picking to Invoice"
-msgstr ""
+msgstr "Комплектование в Счёт"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
@@ -1608,6 +1654,7 @@ msgid ""
 "This tool will help you to select the method you want to use to control "
 "supplier invoices."
 msgstr ""
+"Этот инструмент поможет вам выбрать способ  управления счетами поставщика."
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
@@ -1616,8 +1663,8 @@ msgid ""
 "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
 "В случае отсутствия поставщика этого продукта, покупатель может заполнить и "
-"подтвердить форму вручную. Запрос цен становится подтвержденным заказом на "
-"закупку."
+"подтвердить форму вручную. Запрос цен становится подтвержденным заказом "
+"закупки."
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1654,6 +1701,11 @@ msgid ""
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
 msgstr ""
+"Если вы задали управление счётом по заказу закупки как 'На основе позиций "
+"заказа закупки', вы можете отслеживать здесь все позиции заказа закупки для "
+"которых вы ещё не получили счёт поставщика. При готовности получения счёта "
+"поставщика, вы можете создать черновик счёта поставщика на основе позиций из "
+"этого меню."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1685,6 +1737,16 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" Пожалуйста учтите, что: \n"
+" \n"
+" Заказы могут быть объединены если: \n"
+" * заказы закупок черновые \n"
+" * заказы закупок принадлежат одному поставщику \n"
+" * заказы закупок имеют одно место хранения, один прайс-лист \n"
+" \n"
+" Позиции будут объединены только если: \n"
+" * позиции заказа точно те же, включая товар, количества и единицы \n"
+" "
 
 #. module: purchase
 #: field:purchase.report,negociation:0
@@ -1694,13 +1756,13 @@ msgstr "Стандартная цена закупки"
 #. module: purchase
 #: field:purchase.config.wizard,default_method:0
 msgid "Default Invoicing Control Method"
-msgstr ""
+msgstr "Способ управления выставлением счёта по умолчанию"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
 #: field:res.partner,property_product_pricelist_purchase:0
 msgid "Purchase Pricelist"
-msgstr "Каталог закупок"
+msgstr "Закупочный прайс-лист"
 
 #. module: purchase
 #: field:purchase.order,invoice_method:0
@@ -1710,7 +1772,7 @@ msgstr "Контроль счетов"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Дозаказы"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_approvingpurchaseorder0
@@ -1720,7 +1782,7 @@ msgstr "Утвердить"
 #. module: purchase
 #: model:product.pricelist.version,name:purchase.ver0
 msgid "Default Purchase Pricelist Version"
-msgstr "Версия каталога закупок по умолчанию."
+msgstr "Версия прайс-листа закупок по умолчанию."
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1738,20 +1800,20 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
-" * Состояние 'Черновик' устанавливается автоматически, когда заказ на "
-"закупку в состоянии черновик.\n"
-"* Состояние 'Подтверждено' устанавливается автоматически, когда заказ на "
-"закупку в состоянии подтверждено.\n"
-"* Состояние 'Сделано' устанавливается автоматически, когда заказ на закупку "
-"в состоянии сделано.\n"
+" * Состояние 'Черновик' устанавливается автоматически, когда заказ закупки в "
+"состоянии черновик.\n"
+"* Состояние 'Подтверждено' устанавливается автоматически, когда заказ "
+"закупки в состоянии подтверждено.\n"
+"* Состояние 'Сделано' устанавливается автоматически, когда заказ закупки в "
+"состоянии сделано.\n"
 "* Состояние 'Отменено' устанавливается автоматически, при отмене "
-"пользователем заказа на закупку."
+"пользователем заказа закупки."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:426
 #, python-format
 msgid "Purchase order '%s' is cancelled."
-msgstr "Заказ на закупку '%s' отменен."
+msgstr "Заказ закупки '%s' отменен."
 
 #. module: purchase
 #: field:purchase.order,amount_total:0
@@ -1761,12 +1823,12 @@ msgstr "Всего"
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
 msgid "Pricelist Versions"
-msgstr "Версии каталогов"
+msgstr "Версии прайс-листов"
 
 #. module: purchase
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:359
@@ -1783,7 +1845,7 @@ msgstr ""
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "From a purchase order"
-msgstr "Из заказа на закупку"
+msgstr "Из заказа закупки"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
@@ -1792,11 +1854,11 @@ msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
 msgstr ""
-"Вы должны выбрать каталог или поставщика в форме ввода закупки !\n"
+"Вы должны выбрать прайс-лист или поставщика в форме ввода закупки !\n"
 "Пожалуйста выберите, перед выбором ТМЦ."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
@@ -1851,11 +1913,62 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Здравствуйте ${object.partner_address_id.name and ' ' or "
+"''}${object.partner_address_id.name or ''},\n"
+"\n"
+"Это подтверждение заказа закупки от ${object.company_id.name}:\n"
+"       | Номер заказа: *${object.name}*\n"
+"       | Сумма заказа: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Дата заказа: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Ссылка заказа: ${object.origin}\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       | Ваша ссылка: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       | Ваш контакт: ${object.validator.name} ${object.validator.user_email "
+"и '<%s>'%(object.validator.user_email) or ''}\n"
+"\n"
+"Вы можете можете видеть подтверждение заказа и загрузить его используя "
+"следующую ссылку:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"Если у вас есть вопросы, не стесняйтесь обратиться к нам.\n"
+"\n"
+"Спасибо!\n"
+"\n"
+"\n"
+"--\n"
+"${object.validator.name} ${object.validator.user_email and "
+"'<%s>'%(object.validator.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Телефон: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
-msgstr ""
+msgstr "Заказы закупки находящиеся в состоянии \"Черновик\""
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1865,17 +1978,17 @@ msgstr "Май"
 #. module: purchase
 #: model:res.groups,name:purchase.group_purchase_manager
 msgid "Manager"
-msgstr ""
+msgstr "Менеджер"
 
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contents"
 
 #. module: purchase
 #: view:purchase.report:0
 msgid "Order in current year"
-msgstr ""
+msgstr "Заказ в текущем году"
 
 #. module: purchase
 #: model:process.process,name:purchase.process_process_purchaseprocess0
@@ -1892,7 +2005,7 @@ msgstr "Год"
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 #: selection:purchase.order,invoice_method:0
 msgid "Based on Purchase Order lines"
-msgstr ""
+msgstr "Основан на позициях заказа закупки"
 
 #. module: purchase
 #: model:ir.actions.todo.category,name:purchase.category_purchase_config
@@ -1908,7 +2021,7 @@ msgstr "Движение ТМЦ"
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Select an Open Sale Order"
-msgstr "Выберите открытый заказ на продажу"
+msgstr "Выберите открытый заказ продажи"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1921,7 +2034,7 @@ msgid ""
 "unique number of the purchase order,computed automatically when the purchase "
 "order is created"
 msgstr ""
-"Уникальный номер заказа на закупку, вычисленный автоматически при создании "
+"Уникальный номер заказа закупки, вычисленный автоматически при создании "
 "заказа."
 
 #. module: purchase
@@ -1979,9 +2092,6 @@ msgstr "Панель закупок"
 #~ msgid "Date Ordered"
 #~ msgstr "Дата заказа"
 
-#~ msgid "Are you sure you want to merge these orders ?"
-#~ msgstr "Вы уверены, что хотите объединить данные заказы?"
-
 #~ msgid "Create invoice from product recept"
 #~ msgstr "Создать счет из принятого товара"
 
@@ -2296,3 +2406,9 @@ msgstr "Панель закупок"
 
 #~ msgid "Manages analytic distribution and purchase orders."
 #~ msgstr "Управление разнесением аналитики и заказами на закупку."
+
+#~ msgid "Not invoiced"
+#~ msgstr "Счет не выставлен"
+
+#~ msgid "Are you sure you want to merge these orders ?"
+#~ msgstr "Вы уверены, что хотите объединить эти заказы?"
diff --git a/addons/purchase/i18n/sk.po b/addons/purchase/i18n/sk.po
index 34f62fb40b6..81ee6af28e1 100644
--- a/addons/purchase/i18n/sk.po
+++ b/addons/purchase/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po
index 593f8046d4d..08db79243c4 100644
--- a/addons/purchase/i18n/sl.po
+++ b/addons/purchase/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1800,7 +1800,7 @@ msgstr ""
 "Prosim izberi en sklop, preden se izbere izdelek."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sq.po b/addons/purchase/i18n/sq.po
index a86abfbd826..140d217fc7b 100644
--- a/addons/purchase/i18n/sq.po
+++ b/addons/purchase/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:44+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:51+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sr.po b/addons/purchase/i18n/sr.po
index cff5a08ba3a..843bde7c36a 100644
--- a/addons/purchase/i18n/sr.po
+++ b/addons/purchase/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1764,7 +1764,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sr@latin.po b/addons/purchase/i18n/sr@latin.po
index 07a54d29b6c..f03e905b346 100644
--- a/addons/purchase/i18n/sr@latin.po
+++ b/addons/purchase/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1764,7 +1764,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po
index 6eb735a4c06..c7dcfeacb2f 100644
--- a/addons/purchase/i18n/sv.po
+++ b/addons/purchase/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -22,6 +22,8 @@ msgid ""
 "The buyer has to approve the RFQ before being sent to the supplier. The RFQ "
 "becomes a confirmed Purchase Order."
 msgstr ""
+"Köparen måste godkänna offertförfrågan innan den skickas till leverantören. "
+"Inköpsförfrågan blir då en bekräftad Inköpsorder."
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_productrecept0
@@ -43,7 +45,7 @@ msgstr "Destination"
 #: code:addons/purchase/purchase.py:236
 #, python-format
 msgid "In order to delete a purchase order, it must be cancelled first!"
-msgstr ""
+msgstr "För att ta bort en Inköpsorder, måste den avbrytas först!"
 
 #. module: purchase
 #: help:purchase.report,date:0
@@ -118,6 +120,9 @@ msgid ""
 "products, etc. For each purchase order, you can track the products received, "
 "and control the supplier invoices."
 msgstr ""
+"Använd den här menyn för att söka i dina Inköpsordrar genom referenser, "
+"leverantör, produkter etc. Du kan spåra produkter som mottagits, och styra "
+"leverantörsfakturor, för varje Inköpsorder."
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_line_invoice.py:145
@@ -166,7 +171,7 @@ msgstr "Företag"
 #. module: purchase
 #: help:res.company,po_lead:0
 msgid "This is the leads/security time for each purchase order."
-msgstr ""
+msgstr "Detta är ledtiden för varje beställning."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_monthly_categ_graph
@@ -289,7 +294,7 @@ msgstr "september"
 #: report:purchase.order:0 field:purchase.order,amount_tax:0
 #: view:purchase.order.line:0 field:purchase.order.line,taxes_id:0
 msgid "Taxes"
-msgstr "Taxes"
+msgstr "Moms"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -299,7 +304,7 @@ msgstr "Taxes"
 #: model:res.request.link,name:purchase.req_link_purchase_order
 #: field:stock.picking,purchase_id:0
 msgid "Purchase Order"
-msgstr "Purchase Order"
+msgstr "Inköpsorder"
 
 #. module: purchase
 #: field:purchase.order,name:0 view:purchase.order.line:0
@@ -323,7 +328,7 @@ msgstr "Produkter"
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr ""
+msgstr "Totalt Antal och belopp per månad"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
@@ -331,6 +336,8 @@ msgid ""
 "A Pick list generates an invoice. Depending on the Invoicing control of the "
 "sale order, the invoice is based on delivered or on ordered quantities."
 msgstr ""
+"En plocklista genererar en faktura. Beroende på faktureringskontrollen av "
+"försäljningen blir fakturan baserad på levererad eller beställda kvantiteter."
 
 #. module: purchase
 #: selection:purchase.order,state:0 selection:purchase.order.line,state:0
@@ -394,18 +401,18 @@ msgstr ""
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr ""
+msgstr "Dest. Adress Kontakt Namn"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "TVA :"
-msgstr "TVA :"
+msgstr "Moms"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:326
 #, python-format
 msgid "Purchase order '%s' has been set in draft state."
-msgstr "Inköpsorder '%s' har åter fått status utkast."
+msgstr "Inköpsorder '%s' har åter fått status Utkast."
 
 #. module: purchase
 #: field:purchase.order.line,account_analytic_id:0
@@ -440,6 +447,7 @@ msgstr "Ordrar under senaste månaden"
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
 msgstr ""
+"Du måste först avbryta alla inleveranser relaterade till denna Inköpsorder."
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
@@ -464,7 +472,7 @@ msgstr "Anger att plockningen är klar."
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in exception state"
-msgstr ""
+msgstr "Beställningar som befinner sig i undantag"
 
 #. module: purchase
 #: report:purchase.order:0 field:purchase.report,validator:0
@@ -485,12 +493,12 @@ msgstr "Snittpris"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "Inkommande leveranser som redan behandlats"
 
 #. module: purchase
 #: report:purchase.order:0
 msgid "Total :"
-msgstr "Total :"
+msgstr "Totalt:"
 
 #. module: purchase
 #: model:process.transition.action,name:purchase.process_transition_action_confirmpurchaseorder0
@@ -522,6 +530,9 @@ msgid ""
 "of the purchase order, the invoice is based on received or on ordered "
 "quantities."
 msgstr ""
+"En plocklista genererar en leverantörsfaktura. Beroende på "
+"faktureringskontroll över Inköpsordern blir fakturan baserad på mottagna "
+"eller beställda kvantiteter."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_line_form_action2
@@ -532,11 +543,16 @@ msgid ""
 "supplier invoice, you can generate a draft supplier invoice based on the "
 "lines from this menu."
 msgstr ""
+"Om du ställer in Faktureringskontrollen på en Inköpsorder som \"Baserat på "
+"rader i inköpsorder\", kan du spåra alla rader på Inköpsorder som du ännu "
+"inte har fått Leverantörsfaktura. När du är redo att ta emot en "
+"Leverantörsfaktura kan du då skapa ett utkast på leverantörsfaktura baserad "
+"på raderna från den här menyn."
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in the exception state"
-msgstr ""
+msgstr "Inköpsorder som befinner sig i undantag"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_stock_move_report_po
@@ -544,6 +560,8 @@ msgid ""
 "Reception Analysis allows you to easily check and analyse your company order "
 "receptions and the performance of your supplier's deliveries."
 msgstr ""
+"Mottagning Analys gör att du enkelt kan kontrollera och analysera företagets "
+"ordermottagningar och resultatet för dina leverantörens leveranser."
 
 #. module: purchase
 #: report:purchase.quotation:0
@@ -651,6 +669,9 @@ msgid ""
 "order is 'On picking'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Fakturan skapas  automatiskt om fakturakontroll av beställningen är \"Mot "
+"plockning\". Fakturan kan också genereras manuellt av den som bokför "
+"(Faktura kontroll = Manuell)."
 
 #. module: purchase
 #: report:purchase.order:0
@@ -664,6 +685,9 @@ msgid ""
 "purchase history and performance. From this menu you can track your "
 "negotiation performance, the delivery performance of your suppliers, etc."
 msgstr ""
+"Inköpsanalys gör att du kan analysera och enkelt kontrollera din köphistorik "
+"och företagets resultat. Från denna meny kan du spåra förhandlingsprestanda, "
+"leveranssäkerhet av dina leverantörer, osv."
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_configuration_misc
@@ -674,7 +698,7 @@ msgstr "Allmänt"
 #: code:addons/purchase/purchase.py:769
 #, python-format
 msgid "The selected supplier only sells this product by %s"
-msgstr ""
+msgstr "Den valda leverantören säljer endast denna produkt med %s"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -728,7 +752,7 @@ msgstr "Konfiguration"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Total amount"
-msgstr "Total amount"
+msgstr "Totalt belopp"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.act_purchase_order_2_stock_picking
@@ -739,7 +763,7 @@ msgstr "Inkommande leverans"
 #: code:addons/purchase/purchase.py:285
 #, python-format
 msgid "You cannot confirm a purchase order without any lines."
-msgstr ""
+msgstr "Du kan inte bekräfta en Inköpsorder utan några rader."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_invoice_pending
@@ -749,12 +773,16 @@ msgid ""
 "according to your settings. Once you receive a supplier invoice, you can "
 "match it with the draft invoice and validate it."
 msgstr ""
+"Använd den här menyn för att kontrollera inkommande leverantörsfakturor. "
+"OpenERP kan tillverka utkast till fakturor baserat dina beställningar eller "
+"mottagningar, beroende på dina inställningar. När du får en "
+"leverantörsfaktura kan du matcha den mot fakturautkastet och godkänna den."
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_draftpurchaseorder0
 #: model:process.node,name:purchase.process_node_draftpurchaseorder1
 msgid "RFQ"
-msgstr "RFQ"
+msgstr "Offertförfrågan"
 
 #. module: purchase
 #: code:addons/purchase/edi/purchase_order.py:139
@@ -828,7 +856,7 @@ msgstr ""
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_group
 msgid "Purchase Order Merge"
-msgstr "Inköpsorderradsammanslagning"
+msgstr "Sammanslagning av inköpsordrar"
 
 #. module: purchase
 #: view:purchase.report:0
@@ -869,7 +897,7 @@ msgstr "Bild"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Total Orders Lines by User per month"
-msgstr ""
+msgstr "Totalt orderrader per användare per månad"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -942,7 +970,7 @@ msgstr "Den totala summan"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Taxes :"
-msgstr "Taxes :"
+msgstr "Moms :"
 
 #. module: purchase
 #: field:purchase.order,invoiced_rate:0 field:purchase.order.line,invoiced:0
@@ -978,7 +1006,7 @@ msgstr "Produktkategorier"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Pre-Generate Draft Invoices based on Purchase Orders"
-msgstr ""
+msgstr "Tillverka utkast på fakturor baserade på inköpsorder"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_view_purchase_line_invoice
@@ -994,7 +1022,7 @@ msgstr "Bolagsnamnet måste vara unikt !"
 #: model:ir.model,name:purchase.model_purchase_order_line
 #: view:purchase.order.line:0 field:stock.move,purchase_line_id:0
 msgid "Purchase Order Line"
-msgstr "Purchase Order Line"
+msgstr "Inköpsorderrad"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1004,7 +1032,7 @@ msgstr "Calendar View"
 #. module: purchase
 #: selection:purchase.config.wizard,default_method:0
 msgid "Based on Purchase Order Lines"
-msgstr ""
+msgstr "Baserat på inköpsorderrader"
 
 #. module: purchase
 #: help:purchase.order,amount_untaxed:0
@@ -1015,7 +1043,7 @@ msgstr "Summa utan moms."
 #: code:addons/purchase/purchase.py:754
 #, python-format
 msgid "Selected UOM does not belong to the same category as the product UOM"
-msgstr ""
+msgstr "Vald enhet tillhör inte samma kategori som produktens enhet"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:907
@@ -1030,11 +1058,14 @@ msgid ""
 "the buyer. Depending on the Invoicing control of the purchase order, the "
 "invoice is based on received or on ordered quantities."
 msgstr ""
+"En inköpsorder genererar en leverantörsfaktura, så snart den bekräftas av "
+"köparen. Beroende på faktureringskontroll på beställningen blir fakturan "
+"baserad på mottagna eller beställda kvantiteter."
 
 #. module: purchase
 #: field:purchase.order,amount_untaxed:0
 msgid "Untaxed Amount"
-msgstr "Untaxed Amount"
+msgstr "Belopp ex. moms"
 
 #. module: purchase
 #: help:purchase.order,invoiced:0
@@ -1078,6 +1109,9 @@ msgid ""
 "order is 'On order'. The invoice can also be generated manually by the "
 "accountant (Invoice control = Manual)."
 msgstr ""
+"Fakturan skapas automatiskt om Fakturakontrollen på beställningen är \"Mot "
+"order\". Fakturan kan också genereras manuellt av den som bokför (Faktura "
+"kontroll = Manuell)."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_email_templates
@@ -1119,13 +1153,13 @@ msgstr "Utökade filter..."
 #. module: purchase
 #: view:purchase.config.wizard:0
 msgid "Invoicing Control on Purchases"
-msgstr ""
+msgstr "FaktureringsKontroll mot inköp"
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:48
 #, python-format
 msgid "Please select multiple order to merge in the list view."
-msgstr ""
+msgstr "Välj flera för att sammanfoga i listvyn."
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_import_create_supplier_installer
@@ -1176,18 +1210,18 @@ msgstr "Bolag"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Cancel Purchase Order"
-msgstr "Cancel Purchase Order"
+msgstr "Avbryt Inköpsorder"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:411 code:addons/purchase/purchase.py:418
 #, python-format
 msgid "Unable to cancel this purchase order!"
-msgstr ""
+msgstr "Kan inte avbryta inköpsorder!"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_createpackinglist0
 msgid "A pick list is generated to track the incoming products."
-msgstr ""
+msgstr "En plocklista genereras för att spåra inkommande produkter."
 
 #. module: purchase
 #: help:purchase.order,pricelist_id:0
@@ -1211,7 +1245,7 @@ msgstr "Referensen måste vara unik per bolag!"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,price_standard:0
 msgid "Products Value"
-msgstr ""
+msgstr "Varuvärde"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_partner_categories_in_form
@@ -1236,6 +1270,12 @@ msgid ""
 "Based on generated invoice: create a draft invoice you can validate later.\n"
 "Based on receptions: let you create an invoice when receptions are validated."
 msgstr ""
+"Baserat på rader i inköpsorder: placera enskilda rader i 'FakturaKontroll > "
+"Baserat på inköpsorderrader' från där du kan välja att skapa en faktura.\n"
+"Baserat på genererad faktura: skapar ett fakturautkast som du kan godkänna "
+"senare.\n"
+"Baserat på mottagningar: låter dig skapa en faktura när mottagningen "
+"godkänts."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
@@ -1256,7 +1296,7 @@ msgstr "Produkter per kategori"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,delay:0
 msgid "Days to Validate"
-msgstr ""
+msgstr "Dagar för att godkänna"
 
 #. module: purchase
 #: help:purchase.order,origin:0
@@ -1267,7 +1307,7 @@ msgstr ""
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are not approved yet."
-msgstr ""
+msgstr "Inköpsordrar som inte är godkända ännu."
 
 #. module: purchase
 #: help:purchase.order,state:0
@@ -1279,12 +1319,12 @@ msgid ""
 "received, the state becomes 'Done'. If a cancel action occurs in the invoice "
 "or in the reception of goods, the state becomes in exception."
 msgstr ""
-"The state of the purchase order or the quotation request. A quotation is a "
-"purchase order in a 'Draft' state. Then the order has to be confirmed by the "
-"user, the state switch to 'Confirmed'. Then the supplier must confirm the "
-"order to change the state to 'Approved'. When the purchase order is paid and "
-"received, the state becomes 'Done'. If a cancel action occurs in the invoice "
-"or in the reception of goods, the state becomes in exception."
+"Status för Inköpsorder eller Offertförfråga. En offert är en Inköpsorder i "
+"status \"Utkast\". Ordern måste därefter bekräftas av användaren och växlar "
+"då över till status \"Bekräftad\". Därefter måste leverantören bekräfta för "
+"att ändra statusen till \"Godkänd\". När beställningen är betald och "
+"mottagen, blir statusen \"Klar\". Om man Avbryter fakturan eller "
+"inleveransen blir statusen \"Undantag\"."
 
 #. module: purchase
 #: field:purchase.order.line,price_subtotal:0
@@ -1306,21 +1346,21 @@ msgstr "Inköpsorder '%s' är bekräftad."
 #. module: purchase
 #: help:purchase.order,date_approve:0
 msgid "Date on which purchase order has been approved"
-msgstr ""
+msgstr "Datum då inköpsorder har godkänts"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,state:0
 #: view:purchase.order.line:0 field:purchase.order.line,state:0
 #: view:purchase.report:0 view:stock.picking:0
 msgid "State"
-msgstr "Tillstånd"
+msgstr "Status"
 
 #. module: purchase
 #: model:process.node,name:purchase.process_node_approvepurchaseorder0
 #: view:purchase.order:0 selection:purchase.order,state:0
 #: selection:purchase.report,state:0
 msgid "Approved"
-msgstr "Approved"
+msgstr "Godkänd"
 
 #. module: purchase
 #: view:purchase.order.line:0
@@ -1371,12 +1411,12 @@ msgstr "Avbryt"
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0
 msgid "Purchase Order Lines"
-msgstr "Purchase Order Lines"
+msgstr "Inköpsorderrader"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0
 msgid "The supplier approves the Purchase Order."
-msgstr ""
+msgstr "Leverantören godkänner beställningen."
 
 #. module: purchase
 #: code:addons/purchase/wizard/purchase_order_group.py:80
@@ -1406,7 +1446,7 @@ msgstr "Merge orders"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_order_line_invoice
 msgid "Purchase Order Line Make Invoice"
-msgstr ""
+msgstr "Inköpsorderrader Tillverka Faktura"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4
@@ -1416,7 +1456,7 @@ msgstr "Inkommande leveranser"
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_by_user_all
 msgid "Total Orders by User per month"
-msgstr ""
+msgstr "Totalt order per användare per månad"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_quotation
@@ -1427,7 +1467,7 @@ msgstr "Offertförfrågan"
 #. module: purchase
 #: report:purchase.order:0
 msgid "Tél. :"
-msgstr "Tél. :"
+msgstr "Tel."
 
 #. module: purchase
 #: view:purchase.report:0
@@ -1442,12 +1482,12 @@ msgstr "Our Order Reference"
 #. module: purchase
 #: view:purchase.order:0 view:purchase.order.line:0
 msgid "Search Purchase Order"
-msgstr ""
+msgstr "Sök Inköpsorder"
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_config
 msgid "Set the Default Invoicing Control Method"
-msgstr ""
+msgstr "Sätt Standardmetod för FaktureringsKontroll"
 
 #. module: purchase
 #: model:process.node,note:purchase.process_node_draftpurchaseorder0
@@ -1468,12 +1508,12 @@ msgstr "Datum godkänd"
 #. module: purchase
 #: selection:purchase.report,state:0
 msgid "Waiting Supplier Ack"
-msgstr ""
+msgstr "Väntar på Leverantörsbekräftelse"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_pending_invoice
 msgid "Based on draft invoices"
-msgstr ""
+msgstr "Baserat på fakturautkast"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1487,6 +1527,8 @@ msgid ""
 "The selected supplier has a minimal quantity set to %s %s, you should not "
 "purchase less."
 msgstr ""
+"Den valda leverantören har en minimal mängd satt till %s %s, ska bör inte "
+"köpa mindre."
 
 #. module: purchase
 #: field:purchase.order.line,date_planned:0
@@ -1520,7 +1562,7 @@ msgstr "Ordrar i år"
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "Expected Delivery address:"
-msgstr "Expected Delivery address:"
+msgstr "Förväntad leveransadress:"
 
 #. module: purchase
 #: view:stock.picking:0
@@ -1545,6 +1587,9 @@ msgid ""
 "suppliers. You can track all your interactions with them through the History "
 "tab: emails, orders, meetings, etc."
 msgstr ""
+"Visar din leverantör och upprätthåller en god relation med din leverantör. "
+"Du kan spåra alla dina leverantörsaktiviteter genom fliken Historik: e-post, "
+"ordrar, möten mm"
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1589,12 +1634,12 @@ msgstr "Reservation"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders that include lines not invoiced."
-msgstr ""
+msgstr "Beställningar som inkluderar rader som inte är fakturerade."
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Untaxed amount"
-msgstr "Untaxed amount"
+msgstr "Belopp ex. moms"
 
 #. module: purchase
 #: view:stock.picking:0
@@ -1607,6 +1652,8 @@ msgid ""
 "This tool will help you to select the method you want to use to control "
 "supplier invoices."
 msgstr ""
+"Detta verktyg hjälper dig att välja den metod du vill använda för att "
+"kontrollera leverantörsfakturor."
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder1
@@ -1614,6 +1661,9 @@ msgid ""
 "In case there is no supplier for this product, the buyer can fill the form "
 "manually and confirm it. The RFQ becomes a confirmed Purchase Order."
 msgstr ""
+"Om det inte finns någon leverantör för denna produkt, kan köparen fylla i "
+"formuläret manuellt och bekräfta det. Offertförfrågan blir en bekräftad "
+"Inköpsorder."
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1636,12 +1686,12 @@ msgstr "Your Order Reference"
 #: report:purchase.quotation:0 field:purchase.report,expected_date:0
 #: view:stock.picking:0
 msgid "Expected Date"
-msgstr "Expected Date"
+msgstr "Förväntat datum"
 
 #. module: purchase
 #: report:purchase.quotation:0
 msgid "TVA:"
-msgstr "TVA:"
+msgstr "Moms:"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.action_picking_tree4_picking_to_invoice
@@ -1650,6 +1700,9 @@ msgid ""
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
 msgstr ""
+"Om du ställer in Faktureringskontroll på en beställning som \"Baserat på "
+"mottagningar\", kan du spåra alla mottagna produkter och skapa fakturor för "
+"dessa mottagningar."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1681,16 +1734,26 @@ msgid ""
 "\n"
 " "
 msgstr ""
+" Notera att:\n"
+" \n"
+"  Beställningar kommer endast att slås samman om:\n"
+"  * Inköpsorder är utkast\n"
+"  * Inköpsorder tillhör samma leverantör\n"
+"  * Inköpsorder är har samma lagerplats, samma prislista\n"
+" \n"
+"  Rader kommer endast att slås samman om:\n"
+"  * Order rader är exakt samma utom produkter, kvantitet och enhet \n"
+" "
 
 #. module: purchase
 #: field:purchase.report,negociation:0
 msgid "Purchase-Standard Price"
-msgstr ""
+msgstr "Standardpris Inköp"
 
 #. module: purchase
 #: field:purchase.config.wizard,default_method:0
 msgid "Default Invoicing Control Method"
-msgstr ""
+msgstr "Standard Faktureringskontrollmetod"
 
 #. module: purchase
 #: model:product.pricelist.type,name:purchase.pricelist_type_purchase
@@ -1734,6 +1797,13 @@ msgid ""
 "                                      \n"
 "* The 'Cancelled' state is set automatically when user cancel purchase order."
 msgstr ""
+" * Statusen \"Utkast\" ställs in automatiskt när inköpsorder är i utkast "
+"tillstånd.\n"
+"* Statusen \"Bekräftad\" ställs in automatiskt när bekräfta när inköpsorder "
+"är i bekräfta tillstånd.\n"
+"* Statusen \"Klar\" ställs in automatiskt när inköpsorder är klar.\n"
+"* Statusen \"Inställd\" ställs in automatiskt när användaren avbryter ett "
+"inköp."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:426
@@ -1744,7 +1814,7 @@ msgstr "Inköpsorder '%s' är avbruten."
 #. module: purchase
 #: field:purchase.order,amount_total:0
 msgid "Total"
-msgstr "Total"
+msgstr "Totalt"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_product_pricelist_action_purhase
@@ -1771,7 +1841,7 @@ msgstr ""
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
 msgid "From a purchase order"
-msgstr ""
+msgstr "Från en inköpsorder"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:735
@@ -1780,9 +1850,11 @@ msgid ""
 "You have to select a pricelist or a supplier in the purchase form !\n"
 "Please set one before choosing a product."
 msgstr ""
+"Du måste välja en prislista eller en leverantör i inköpsformuläret!\n"
+"Välj en innan du väljer produkt."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
@@ -1837,11 +1909,61 @@ msgid ""
 "% endif\n"
 "            "
 msgstr ""
+"\n"
+"Hej ${object.partner_address_id.name and ' ' or "
+"''}${object.partner_address_id.name or ''},\n"
+"\n"
+"Här är en inköpsorderbekräftelse från ${object.company_id.name}:\n"
+"       | Order number: *${object.name}*\n"
+"       | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Order datum: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Orderreferens: ${object.origin}\n"
+"       % endif\n"
+"       % if object.partner_ref:\n"
+"       | Er referens: ${object.partner_ref}<br />\n"
+"       % endif\n"
+"       | Er kontakt: ${object.validator.name} ${object.validator.user_email "
+"and '<%s>'%(object.validator.user_email) or ''}\n"
+"\n"
+"Du kan visa orderbekräftelsen och ladda ner det via följande länk:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"Om du har några frågor, tveka inte att kontakta oss.\n"
+"\n"
+"Tack!\n"
+"\n"
+"\n"
+"--\n"
+"${object.validator.name} ${object.validator.user_email and "
+"'<%s>'%(object.validator.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Telefon: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase orders which are in draft state"
-msgstr ""
+msgstr "Beställningar som har status Utkast"
 
 #. module: purchase
 #: selection:purchase.report,month:0
@@ -1878,7 +2000,7 @@ msgstr "År"
 #: model:ir.ui.menu,name:purchase.menu_purchase_line_order_draft
 #: selection:purchase.order,invoice_method:0
 msgid "Based on Purchase Order lines"
-msgstr ""
+msgstr "Baserat på inköpsorderrader"
 
 #. module: purchase
 #: model:ir.actions.todo.category,name:purchase.category_purchase_config
@@ -1906,7 +2028,7 @@ msgstr "Ordrar"
 msgid ""
 "unique number of the purchase order,computed automatically when the purchase "
 "order is created"
-msgstr ""
+msgstr "Unikt inköpsordernummer, sätts automatiskt när inköpsordern skapas"
 
 #. module: purchase
 #: view:board.board:0
diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po
index 0b37cff9ee6..23d8b564fc2 100644
--- a/addons/purchase/i18n/th.po
+++ b/addons/purchase/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1777,7 +1777,7 @@ msgstr ""
 "กรุณาเลือกก่อนที่จะเลือกสินค้า"
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po
index 0a594d707f5..1542a6ce1f9 100644
--- a/addons/purchase/i18n/tlh.po
+++ b/addons/purchase/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1748,7 +1748,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 6458e35a846..32d6b3b384c 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -272,12 +272,12 @@ msgstr "Satınalmalar"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Purchase order which are in draft state"
-msgstr "Taslak durumundaki Satınalma emirleri"
+msgstr "Taslak durumundaki Satınalma siparişleri"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Origin"
-msgstr "Menşei"
+msgstr "Kökenİ"
 
 #. module: purchase
 #: view:purchase.order:0 field:purchase.order,notes:0
@@ -294,7 +294,7 @@ msgstr "Eylül"
 #: report:purchase.order:0 field:purchase.order,amount_tax:0
 #: view:purchase.order.line:0 field:purchase.order.line,taxes_id:0
 msgid "Taxes"
-msgstr "Vergi"
+msgstr "Vergiler"
 
 #. module: purchase
 #: model:ir.actions.report.xml,name:purchase.report_purchase_order
@@ -310,7 +310,7 @@ msgstr "Satınalma Siparişi"
 #: field:purchase.order,name:0 view:purchase.order.line:0
 #: field:purchase.order.line,order_id:0
 msgid "Order Reference"
-msgstr "Sipariş Referansı"
+msgstr "Sipariş İlgisi"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -328,7 +328,7 @@ msgstr "Ürünler"
 #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
 #: view:purchase.report:0
 msgid "Total Qty and Amount by month"
-msgstr "Aylık Toplam Miktar ve Tutar"
+msgstr "Aylık Toplam Mik ve Tutar"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_packinginvoice0
@@ -379,12 +379,12 @@ msgstr "Giden Ürünler"
 #. module: purchase
 #: view:purchase.order:0
 msgid "Manually Corrected"
-msgstr "Manuel Olarak Düzeltildi"
+msgstr "Elle Düzeltildi"
 
 #. module: purchase
 #: view:purchase.order:0
 msgid "Reference"
-msgstr "Referans"
+msgstr "İlgi"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_stock_move
@@ -401,7 +401,7 @@ msgstr ""
 #. module: purchase
 #: field:purchase.report,dest_address_id:0
 msgid "Dest. Address Contact Name"
-msgstr "Varılacak Adres İlgili Kişi"
+msgstr "Varış Adresindeki İlgili Kişi"
 
 #. module: purchase
 #: report:purchase.order:0
@@ -422,7 +422,7 @@ msgstr "Analiz Hesabı"
 #. module: purchase
 #: view:purchase.report:0 field:purchase.report,nbr:0
 msgid "# of Lines"
-msgstr "# / Satır"
+msgstr "Satır sayısı"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:754 code:addons/purchase/purchase.py:769
@@ -542,6 +542,11 @@ msgid ""
 "supplier invoice, you can generate a draft supplier invoice based on the "
 "lines from this menu."
 msgstr ""
+"Bir satınalma siparişinin Fatura Kontrolünü \"Satınalma Siparişi Öğelerine "
+"Göre\" ayarlarsanız, henüz almadığınız tedarikçi faturalarının satınalma "
+"öğelerinintümünü buradan izleyebilirsiniz. Bir tedarikçi faturası alma "
+"durumuna gelmişseniz, bu menü öğelerine göre bir taslak tedarikçi faturası "
+"oluşturabilirsiniz."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1161,6 +1166,9 @@ msgid ""
 "can import your existing partners by CSV spreadsheet from \"Import Data\" "
 "wizard"
 msgstr ""
+"Bu formdan elle Tedarikçileri ve kişilerini oluşturabilir ya da "
+"içeaktarabilirsiniz veya \"Veri İçeaktarma\" sihirbazından CSV çalışma "
+"sayfası olarak varolan paydaşlarınızı içeaktarabilirsiniz."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_createpackinglist0
@@ -1261,6 +1269,12 @@ msgid ""
 "Based on generated invoice: create a draft invoice you can validate later.\n"
 "Based on receptions: let you create an invoice when receptions are validated."
 msgstr ""
+"Satınalma Sipariş satırlarına dayalı: seçerek fatura oluşturacağınız 'Fatura "
+"Kontrolü > S.S. satırlarına dayalı'nın içine tek satırları yerleştirin.\n"
+"Oluşturulan faturaya dayalı: daha sonra doğrulayabileceğiniz bir taslak "
+"fatura oluşturun.\n"
+"Kabullere dayanarak: kabuller doğrulandığında fatura oluşturmanıza izin "
+"verir."
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_supplier_address_form
@@ -1684,6 +1698,9 @@ msgid ""
 "receptions\", you can track here all the product receptions and create "
 "invoices for those receptions."
 msgstr ""
+"Satınalma siparişlerinin Fatura Kontrolünü \"Kabullere Dayanarak\" "
+"ayarlarsanız, burada tüm ürün kabullerini izleyebilir ve bu kabuller için "
+"faturalar oluşturabilirsiniz."
 
 #. module: purchase
 #: view:purchase.order:0
@@ -1838,7 +1855,7 @@ msgstr ""
 "Lütfen bir ürün seçmeden önce birini belirtin."
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po
index 77f31f76907..119ce5b63b3 100644
--- a/addons/purchase/i18n/uk.po
+++ b/addons/purchase/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1756,7 +1756,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po
index 582ab5d01e7..bd78d0a2fd4 100644
--- a/addons/purchase/i18n/vi.po
+++ b/addons/purchase/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:45+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1749,7 +1749,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index d5f82950f1f..12aa6c15e3c 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-10 14:47+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-10-25 17:44+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -103,7 +103,7 @@ msgstr "开票"
 #. module: purchase
 #: view:purchase.order.line_invoice:0
 msgid "Do you want to generate the supplier invoices?"
-msgstr ""
+msgstr "你是否要生成供应商发票？"
 
 #. module: purchase
 #: model:ir.actions.act_window,help:purchase.purchase_form_action
@@ -139,7 +139,7 @@ msgstr "没有价格表！"
 #. module: purchase
 #: model:ir.model,name:purchase.model_purchase_config_wizard
 msgid "purchase.config.wizard"
-msgstr ""
+msgstr "采购.配置.向导"
 
 #. module: purchase
 #: view:board.board:0 model:ir.actions.act_window,name:purchase.purchase_draft
@@ -427,7 +427,7 @@ msgstr "上月采购单"
 #: code:addons/purchase/purchase.py:412
 #, python-format
 msgid "You must first cancel all receptions related to this purchase order."
-msgstr ""
+msgstr "你必须首先这个采购订单相关的所有收货单。"
 
 #. module: purchase
 #: selection:purchase.order.line,state:0
@@ -491,7 +491,7 @@ msgstr "确认"
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree4_picking_to_invoice
 #: selection:purchase.order,invoice_method:0
 msgid "Based on receptions"
-msgstr ""
+msgstr "基于收货单"
 
 #. module: purchase
 #: constraint:res.company:0
@@ -746,7 +746,7 @@ msgstr "询价单"
 #: code:addons/purchase/edi/purchase_order.py:139
 #, python-format
 msgid "EDI Pricelist (%s)"
-msgstr ""
+msgstr "EDI 价格表 (%s)"
 
 #. module: purchase
 #: selection:purchase.order,state:0
@@ -998,7 +998,7 @@ msgstr "不含税金额"
 #: code:addons/purchase/purchase.py:754
 #, python-format
 msgid "Selected UOM does not belong to the same category as the product UOM"
-msgstr ""
+msgstr "选择的单位跟产品单位不是同一个类别"
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:907
@@ -1141,7 +1141,7 @@ msgstr "计算"
 #. module: purchase
 #: view:stock.picking:0
 msgid "Incoming Shipments Available"
-msgstr ""
+msgstr "可用的入库"
 
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_partner_cat
@@ -1772,7 +1772,7 @@ msgid ""
 msgstr "请在采购界面选择价格表或供应商！然后再选择产品。"
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po
index 1c0e6acc007..2e608a2d848 100644
--- a/addons/purchase/i18n/zh_TW.po
+++ b/addons/purchase/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:52+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase
 #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
@@ -1748,7 +1748,7 @@ msgid ""
 msgstr ""
 
 #. module: purchase
-#: model:email.template,body_text:purchase.email_template_edi_purchase
+#: model:email.template,body:purchase.email_template_edi_purchase
 msgid ""
 "\n"
 "Hello${object.partner_address_id.name and ' ' or "
diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index 2edcf5ec0d8..6649ebfea9d 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -26,9 +26,13 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
 
     def _purchase_order_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        for partner in self.browse(cr, uid, ids, context=context):
-            res[partner.id] = len(partner.purchase_order_ids)
+        res = dict(map(lambda x: (x,0), ids))
+        # this user may not have access to user rights
+        try:
+            for partner in self.browse(cr, uid, ids, context=context):
+                res[partner.id] = len(partner.purchase_order_ids)
+        except:
+            pass
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index da1f841ba9e..7b03861759a 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -20,12 +20,14 @@
             <field name="view_mode">tree,form,graph</field>
             <field name="context">{'search_default_partner_id': active_id}</field>
             <field name="groups_id" eval="[(4, ref('purchase.group_purchase_user'))]"/>
-            <field name="help">
-                This supplier has no RFQ or Purchase Order. Click here to create a new RFQ.
-                &lt;p&gt;
-                The "Quotation" is the first step of the Purchases flow. Manage your purchases from quotation to invoice.
-                &lt;p&gt;
-                You will be able to buy products (manage receptions) as well as services (create projects).
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    This supplier has no purchase order. Click to create a new RfQ.
+                </p><p>
+                    The request for quotation is the first step of the purchases flow. Once
+                    converted into a purchase order, you will be able to control the reception
+                    of the products and the supplier invoice.
+                </p>
             </field>
         </record>
 
@@ -53,12 +55,15 @@
             <field name="view_mode">tree,form,graph</field>
             <field name="domain">[('type','=','in_invoice')]</field>
             <field name="context">{'search_default_partner_id': active_id, 'default_type': 'in_invoice', 'type': 'in_invoice', 'journal_type': 'purchase'}</field>
-            <field name="help">
-                Click here to create Supplier invoice.
-                &lt;p&gt;
-                You can control the invoice from your supplier according to what you purchased or received.
-                &lt;p&gt;
-                OpenERP can also generate draft invoices automatically from purchase orders or receipts.
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    Click here to record a supplier invoice.
+                </p><p>
+                    Supplier invoices can be pre-generated based on purchase
+                    orders or receptions. This allows you to control invoices
+                    you receive from your supplier according to the draft
+                    document in OpenERP.
+                </p>
             </field>
         </record>
 
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 756016d39e2..5bb38316604 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -31,9 +31,6 @@ import decimal_precision as dp
 from osv.orm import browse_record, browse_null
 from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
 
-#
-# Model definition
-#
 class purchase_order(osv.osv):
 
     def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
@@ -49,7 +46,7 @@ class purchase_order(osv.osv):
             cur = order.pricelist_id.currency_id
             for line in order.order_line:
                val1 += line.price_subtotal
-               for c in self.pool.get('account.tax').compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, line.product_id.id, order.partner_id)['taxes']:
+               for c in self.pool.get('account.tax').compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, line.product_id, order.partner_id)['taxes']:
                     val += c.get('amount', 0.0)
             res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val)
             res[order.id]['amount_untaxed']=cur_obj.round(cr, uid, cur, val1)
@@ -140,6 +137,17 @@ class purchase_order(osv.osv):
                 invoiced = True
             res[purchase.id] = invoiced
         return res
+    
+    def _get_journal(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        company_id = context.get('company_id', user.company_id.id)
+        journal_obj = self.pool.get('account.journal')
+        res = journal_obj.search(cr, uid, [('type', '=', 'purchase'),
+                                            ('company_id', '=', company_id)],
+                                                limit=1)
+        return res and res[0] or False  
 
     STATE_SELECTION = [
         ('draft', 'Draft PO'),
@@ -155,9 +163,10 @@ class purchase_order(osv.osv):
     _columns = {
         'name': fields.char('Order Reference', size=64, required=True, select=True, help="Unique number of the purchase order, computed automatically when the purchase order is created."),
         'origin': fields.char('Source Document', size=64,
-            help="Reference of the document that generated this purchase order request."
+            help="Reference of the document that generated this purchase order request; a sale order or an internal procurement request."
         ),
-        'partner_ref': fields.char('Supplier Reference', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, size=64),
+        'partner_ref': fields.char('Supplier Reference', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, size=64,
+            help="Reference of the sale order or quotation sent by your supplier. It's mainly used to do the matching when you receive the products as this reference is usually written on the delivery order sent by your supplier."),
         'date_order':fields.date('Order Date', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, select=True, help="Date on which this document has been created."),
         'date_approve':fields.date('Date Approved', readonly=1, select=True, help="Date on which purchase order has been approved"),
         'partner_id':fields.many2one('res.partner', 'Supplier', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, change_default=True),
@@ -169,7 +178,8 @@ class purchase_order(osv.osv):
         'warehouse_id': fields.many2one('stock.warehouse', 'Destination Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
-        'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
+        'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", readonly=True, required=True),
+        'state': fields.selection(STATE_SELECTION, 'Status', readonly=True, help="The status of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' status. Then the order has to be confirmed by the user, the status switch to 'Confirmed'. Then the supplier must confirm the order to change the status to 'Approved'. When the purchase order is paid and received, the status becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the status becomes in exception.", select=True),
         'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
         'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
         'notes': fields.text('Terms and Conditions'),
@@ -179,7 +189,7 @@ class purchase_order(osv.osv):
         'shipped_rate': fields.function(_shipped_rate, string='Received', type='float'),
         'invoiced': fields.function(_invoiced, string='Invoice Received', type='boolean', help="It indicates that an invoice has been paid"),
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
-        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Bases on incoming shipments')], 'Invoicing Control', required=True,
+        'invoice_method': fields.selection([('manual','Based on Purchase Order lines'),('order','Based on generated draft invoice'),('picking','Based on incoming shipments')], 'Invoicing Control', required=True,
             help="Based on Purchase Order lines: place individual lines in 'Invoice Control > Based on P.O. lines' from where you can selectively create an invoice.\n" \
                 "Based on generated invoice: create a draft invoice you can validate later.\n" \
                 "Bases on incoming shipments: let you create an invoice when receptions are validated."
@@ -205,6 +215,7 @@ class purchase_order(osv.osv):
         'product_id': fields.related('order_line','product_id', type='many2one', relation='product.product', string='Product'),
         'create_uid':  fields.many2one('res.users', 'Responsible'),
         'company_id': fields.many2one('res.company','Company',required=True,select=1),
+        'journal_id': fields.many2one('account.journal', 'Journal'),
     }
     _defaults = {
         'date_order': fields.date.context_today,
@@ -215,12 +226,13 @@ class purchase_order(osv.osv):
         'invoiced': 0,
         'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist_purchase.id,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c),
+        'journal_id': _get_journal,
     }
     _sql_constraints = [
         ('name_uniq', 'unique(name, company_id)', 'Order Reference must be unique per Company!'),
     ]
     _name = "purchase.order"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
     _description = "Purchase Order"
     _order = "name desc"
 
@@ -239,7 +251,6 @@ class purchase_order(osv.osv):
             else:
                 raise osv.except_osv(_('Invalid Action!'), _('In order to delete a purchase order, you must cancel it first.'))
 
-        # TODO: temporary fix in 5.0, to remove in 5.2 when subflows support
         # automatically sending subflow.delete upon deletion
         wf_service = netsvc.LocalService("workflow")
         for id in unlink_ids:
@@ -250,6 +261,11 @@ class purchase_order(osv.osv):
     def button_dummy(self, cr, uid, ids, context=None):
         return True
 
+    def onchange_pricelist(self, cr, uid, ids, pricelist_id, context=None):
+        if not pricelist_id:
+            return {}
+        return {'value': {'currency_id': self.pool.get('product.pricelist').browse(cr, uid, pricelist_id, context=context).currency_id.id}}
+
     def onchange_dest_address_id(self, cr, uid, ids, address_id):
         if not address_id:
             return {}
@@ -277,6 +293,27 @@ class purchase_order(osv.osv):
         fiscal_position = supplier.property_account_position and supplier.property_account_position.id or False
         return {'value':{'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
 
+    def invoice_open(self, cr, uid, ids, context=None):
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_invoice_tree2')
+        id = result and result[1] or False
+        result = act_obj.read(cr, uid, [id], context=context)[0]
+        inv_ids = []
+        for po in self.browse(cr, uid, ids, context=context):
+            inv_ids+= [invoice.id for invoice in po.invoice_ids]
+        if not inv_ids:
+            raise osv.except_osv(_('Error!'), _('Please create Invoices.'))
+         #choose the view_mode accordingly
+        if len(inv_ids)>1:
+            result['domain'] = "[('id','in',["+','.join(map(str, inv_ids))+"])]"
+        else:
+            res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_supplier_form')
+            result['views'] = [(res and res[1] or False, 'form')]
+            result['res_id'] = inv_ids and inv_ids[0] or False
+        return result
+
     def view_invoice(self, cr, uid, ids, context=None):
         '''
         This function returns an action that display existing invoices of given sale order ids. It can either be a in a list or in a form view, if there is only one invoice to show.
@@ -318,21 +355,26 @@ class purchase_order(osv.osv):
         for po in self.browse(cr, uid, ids, context=context):
             pick_ids += [picking.id for picking in po.picking_ids]
 
-        res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')
-        res_id = res and res[1] or False
+        action_model, action_id = tuple(mod_obj.get_object_reference(cr, uid, 'stock', 'action_picking_tree4'))
+        action = self.pool.get(action_model).read(cr, uid, action_id, context=context)
+        ctx = eval(action['context'])
+        ctx.update({
+            'search_default_purchase_id': ids[0]
+        })
+        if pick_ids and len(pick_ids) == 1:
+            form_view_ids = [view_id for view_id, view in action['views'] if view == 'form']
+            view_id = form_view_ids and form_view_ids[0] or False
+            action.update({
+                'views': [],
+                'view_mode': 'form',
+                'view_id': view_id,
+                'res_id': pick_ids[0]
+            })
 
-        return {
-            'name': _('Receptions'),
-            'view_type': 'form',
-            'view_mode': 'form',
-            'view_id': [res_id],
-            'res_model': 'stock.picking',
-            'context': "{'contact_display': 'partner'}",
-            'type': 'ir.actions.act_window',
-            'nodestroy': True,
-            'target': 'current',
-            'res_id': pick_ids and pick_ids[0] or False,
-        }
+        action.update({
+            'context': ctx,
+        })
+        return action
 
     def wkf_approve_order(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)})
@@ -347,13 +389,19 @@ class purchase_order(osv.osv):
         template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
-        ctx = dict(context, active_model='purchase.order', active_id=ids[0])
-        ctx.update({'mail.compose.template_id': template_id})
+        ctx = dict(context)
+        ctx.update({
+            'default_model': 'purchase.order',
+            'default_res_id': ids[0],
+            'default_use_template': True,
+            'default_template_id': template_id,
+            'default_composition_mode': 'comment',
+            })
         return {
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'mail.compose.message',
-            'views': [(res_id,'form')],
+            'views': [(res_id, 'form')],
             'view_id': res_id,
             'type': 'ir.actions.act_window',
             'target': 'new',
@@ -370,7 +418,7 @@ class purchase_order(osv.osv):
             for line in po.order_line:
                 if line.state=='draft':
                     todo.append(line.id)
-#        current_name = self.name_get(cr, uid, ids)[0][1]
+
         self.pool.get('purchase.order.line').action_confirm(cr, uid, todo, context)
         for id in ids:
             self.write(cr, uid, [id], {'state' : 'confirmed', 'validator' : uid})
@@ -481,7 +529,7 @@ class purchase_order(osv.osv):
         self.invoice_done_send_note(cr, uid, ids, context=context)
         return True
 
-    def has_stockable_product(self,cr, uid, ids, *args):
+    def has_stockable_product(self, cr, uid, ids, *args):
         for order in self.browse(cr, uid, ids):
             for order_line in order.order_line:
                 if order_line.product_id and order_line.product_id.product_tmpl_id.type in ('product', 'consu'):
@@ -521,7 +569,6 @@ class purchase_order(osv.osv):
             'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
             'type': 'in',
             'partner_id': order.dest_address_id.id or order.partner_id.id,
-            'invoice_state': '2binvoiced' if order.invoice_method == 'picking' else 'none',
             'purchase_id': order.id,
             'company_id': order.company_id.id,
             'move_lines' : [],
@@ -543,6 +590,7 @@ class purchase_order(osv.osv):
             'partner_id': order.dest_address_id.id or order.partner_id.id,
             'move_dest_id': order_line.move_dest_id.id,
             'state': 'draft',
+            'type':'in',
             'purchase_line_id': order_line.id,
             'company_id': order.company_id.id,
             'price_unit': order_line.price_unit
@@ -585,7 +633,7 @@ class purchase_order(osv.osv):
         wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
         return [picking_id]
 
-    def action_picking_create(self,cr, uid, ids, context=None):
+    def action_picking_create(self, cr, uid, ids, context=None):
         picking_ids = []
         for order in self.browse(cr, uid, ids):
             picking_ids.extend(self._create_pickings(cr, uid, order, order.order_line, None, context=context))
@@ -654,7 +702,7 @@ class purchase_order(osv.osv):
             list_key.sort()
             return tuple(list_key)
 
-    # compute what the new orders should contain
+        # Compute what the new orders should contain
 
         new_orders = {}
 
@@ -731,24 +779,15 @@ class purchase_order(osv.osv):
     # OpenChatter methods and notifications
     # --------------------------------------
 
-    def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        result = super(purchase_order, self).get_needaction_user_ids(cr, uid, ids, context=context)
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.state == 'approved':
-                result[obj.id].append(obj.validator.id)
-        return result
-
-    def message_get_monitored_follower_fields(self, cr, uid, ids, context=None):
-        """ Add 'validator' to the monitored fields """
-        res = super(purchase_order, self).message_get_monitored_follower_fields(cr, uid, ids, context=context)
-        return res + ['validator']
+    def needaction_domain_get(self, cr, uid, ids, context=None):
+        return [('state', '=', 'draft')]
 
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Request for quotation <b>created</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Request for quotation <b>created</b>."), context=context)
 
     def confirm_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s.") % (obj.partner_id.name, obj.amount_total, obj.pricelist_id.currency_id.symbol), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> <b>converted</b> to a Purchase Order of %s %s.") % (obj.partner_id.name, obj.amount_total, obj.pricelist_id.currency_id.symbol), context=context)
 
     def shipment_send_note(self, cr, uid, ids, picking_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
@@ -757,25 +796,25 @@ class purchase_order(osv.osv):
                 # convert it to the user TZ and re-render it with %Z to add the timezone
                 picking_datetime = fields.DT.datetime.strptime(picking.min_date, DEFAULT_SERVER_DATETIME_FORMAT)
                 picking_date_str = fields.datetime.context_timestamp(cr, uid, picking_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
-                self.message_append_note(cr, uid, [order.id], body=_("Shipment <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
+                self.message_post(cr, uid, [order.id], body=_("Shipment <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
 
     def invoice_send_note(self, cr, uid, ids, invoice_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
             for invoice in (inv for inv in order.invoice_ids if inv.id == invoice_id):
-                self.message_append_note(cr, uid, [order.id], body=_("Draft Invoice of %s %s is <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
+                self.message_post(cr, uid, [order.id], body=_("Draft Invoice of %s %s is <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
 
     def shipment_done_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("""Shipment <b>received</b>."""), context=context)
+        self.message_post(cr, uid, ids, body=_("""Shipment <b>received</b>."""), context=context)
 
     def invoice_done_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Invoice <b>paid</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Invoice <b>paid</b>."), context=context)
 
     def draft_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Purchase Order has been set to <b>draft</b>."), context=context)
+        return self.message_post(cr, uid, ids, body=_("Purchase Order has been set to <b>draft</b>."), context=context)
 
     def cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Purchase Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Purchase Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), context=context)
 
 purchase_order()
 
@@ -785,19 +824,11 @@ class purchase_order_line(osv.osv):
         cur_obj=self.pool.get('res.currency')
         tax_obj = self.pool.get('account.tax')
         for line in self.browse(cr, uid, ids, context=context):
-            taxes = tax_obj.compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty)
+            taxes = tax_obj.compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, line.product_id, line.order_id.partner_id)
             cur = line.order_id.pricelist_id.currency_id
             res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
         return res
 
-    def _get_uom_id(self, cr, uid, context=None):
-        try:
-            proxy = self.pool.get('ir.model.data')
-            result = proxy.get_object_reference(cr, uid, 'product', 'product_uom_unit')
-            return result[1]
-        except Exception, ex:
-            return False
-
     _columns = {
         'name': fields.text('Description', required=True),
         'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True),
@@ -813,10 +844,10 @@ class purchase_order_line(osv.osv):
         'account_analytic_id':fields.many2one('account.analytic.account', 'Analytic Account',),
         'company_id': fields.related('order_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
         'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Status', required=True, readonly=True,
-                                  help=' * The \'Draft\' state is set automatically when purchase order in draft state. \
-                                       \n* The \'Confirmed\' state is set automatically as confirm when purchase order in confirm state. \
-                                       \n* The \'Done\' state is set automatically when purchase order is set as done. \
-                                       \n* The \'Cancelled\' state is set automatically when user cancel purchase order.'),
+                                  help=' * The \'Draft\' status is set automatically when purchase order in draft status. \
+                                       \n* The \'Confirmed\' status is set automatically as confirm when purchase order in confirm status. \
+                                       \n* The \'Done\' status is set automatically when purchase order is set as done. \
+                                       \n* The \'Cancelled\' status is set automatically when user cancel purchase order.'),
         'invoice_lines': fields.many2many('account.invoice.line', 'purchase_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'partner_id': fields.related('order_id','partner_id',string='Partner',readonly=True,type="many2one", relation="res.partner", store=True),
@@ -824,7 +855,6 @@ class purchase_order_line(osv.osv):
 
     }
     _defaults = {
-        'product_uom' : _get_uom_id,
         'product_qty': lambda *a: 1.0,
         'state': lambda *args: 'draft',
         'invoiced': lambda *a: 0,
@@ -866,6 +896,12 @@ class purchase_order_line(osv.osv):
         supplier_delay = int(supplier_info.delay) if supplier_info else 0
         return datetime.strptime(date_order_str, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=supplier_delay)
 
+    def _check_product_uom_group(self, cr, uid, context=None):
+        group_uom = self.pool.get('ir.model.data').get_object(cr, uid, 'product', 'group_uom')
+        res = [user for user in group_uom.users if user.id == uid]
+        return len(res) and True or False
+
+
     def onchange_product_id(self, cr, uid, ids, pricelist_id, product_id, qty, uom_id,
             partner_id, date_order=False, fiscal_position_id=False, date_planned=False,
             name=False, price_unit=False, context=None):
@@ -888,14 +924,16 @@ class purchase_order_line(osv.osv):
         account_tax = self.pool.get('account.tax')
 
         # - check for the presence of partner_id and pricelist_id
-        if not pricelist_id:
-            raise osv.except_osv(_('No Pricelist !'), _('Select a price list for a supplier in the purchase form to choose a product.'))
-        if not partner_id:
-            raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
+        #if not partner_id:
+        #    raise osv.except_osv(_('No Partner!'), _('Select a partner in purchase order to choose a product.'))
+        #if not pricelist_id:
+        #    raise osv.except_osv(_('No Pricelist !'), _('Select a price list in the purchase order form before choosing a product.'))
 
         # - determine name and notes based on product in partner lang.
-        lang = res_partner.browse(cr, uid, partner_id).lang
-        context_partner = {'lang': lang, 'partner_id': partner_id}
+        context_partner = context.copy()
+        if partner_id:
+            lang = res_partner.browse(cr, uid, partner_id).lang
+            context_partner.update( {'lang': lang, 'partner_id': partner_id} )
         product = product_product.browse(cr, uid, product_id, context=context_partner)
         name = product.name
         if product.description_purchase:
@@ -911,7 +949,8 @@ class purchase_order_line(osv.osv):
             uom_id = product_uom_po_id
 
         if product.uom_id.category_id.id != product_uom.browse(cr, uid, uom_id, context=context).category_id.id:
-            res['warning'] = {'title': _('Warning!'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure.')}
+            if self._check_product_uom_group(cr, uid, context=context):
+                res['warning'] = {'title': _('Warning!'), 'message': _('Selected Unit of Measure does not belong to the same category as the product Unit of Measure.')}
             uom_id = product_uom_po_id
 
         res['value'].update({'product_uom': uom_id})
@@ -923,7 +962,7 @@ class purchase_order_line(osv.osv):
         qty = qty or 1.0
         supplierinfo = False
         for supplier in product.seller_ids:
-            if supplier.name.id == partner_id:
+            if partner_id and (supplier.name.id == partner_id):
                 supplierinfo = supplier
                 if supplierinfo.product_uom.id != uom_id:
                     res['warning'] = {'title': _('Warning!'), 'message': _('The selected supplier only sells this product by %s') % supplierinfo.product_uom.name }
@@ -937,8 +976,11 @@ class purchase_order_line(osv.osv):
         res['value'].update({'date_planned': date_planned or dt, 'product_qty': qty})
 
         # - determine price_unit and taxes_id
-        price = product_pricelist.price_get(cr, uid, [pricelist_id],
-                    product.id, qty or 1.0, partner_id, {'uom': uom_id, 'date': date_order})[pricelist_id]
+        if pricelist_id:
+            price = product_pricelist.price_get(cr, uid, [pricelist_id],
+                    product.id, qty or 1.0, partner_id or False, {'uom': uom_id, 'date': date_order})[pricelist_id]
+        else:
+            price = product.standard_price
 
         taxes = account_tax.browse(cr, uid, map(lambda x: x.id, product.supplier_taxes_id))
         fpos = fiscal_position_id and account_fiscal_position.browse(cr, uid, fiscal_position_id, context=context) or False
@@ -1048,9 +1090,10 @@ class procurement_order(osv.osv):
             purchase_date = self._get_purchase_order_date(cr, uid, procurement, company, schedule_date, context=context)
 
             #Passing partner_id to context for purchase order line integrity of Line name
-            context.update({'lang': partner.lang, 'partner_id': partner_id})
+            new_context = context.copy()
+            new_context.update({'lang': partner.lang, 'partner_id': partner_id})
 
-            product = prod_obj.browse(cr, uid, procurement.product_id.id, context=context)
+            product = prod_obj.browse(cr, uid, procurement.product_id.id, context=new_context)
             taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
             taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
 
@@ -1079,22 +1122,46 @@ class procurement_order(osv.osv):
                 'company_id': procurement.company_id.id,
                 'fiscal_position': partner.property_account_position and partner.property_account_position.id or False
             }
-            res[procurement.id] = self.create_procurement_purchase_order(cr, uid, procurement, po_vals, line_vals, context=context)
+            res[procurement.id] = self.create_procurement_purchase_order(cr, uid, procurement, po_vals, line_vals, context=new_context)
             self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': res[procurement.id]})
-            self.running_send_note(cr, uid, [procurement.id], context=context)
+        self.purchase_order_create_note(cr, uid, ids, context=context)
         return res
+    
+    def _product_virtual_get(self, cr, uid, order_point):
+        procurement = order_point.procurement_id
+        if procurement and procurement.state != 'exception' and procurement.purchase_id and procurement.purchase_id.state in ('draft', 'confirmed'):
+            return None
+        return super(procurement_order, self)._product_virtual_get(cr, uid, order_point)
+
+    def purchase_order_create_note(self, cr, uid, ids, context=None):
+        for procurement in self.browse(cr, uid, ids, context=context):
+            body = _("Draft Purchase Order created")
+            self.message_post(cr, uid, [procurement.id], body=body, context=context)
 
 procurement_order()
 
-class mail_message(osv.osv):
-    _name = 'mail.message'
-    _inherit = 'mail.message'
+class mail_mail(osv.osv):
+    _name = 'mail.mail'
+    _inherit = 'mail.mail'
 
-    def _postprocess_sent_message(self, cr, uid, message, context=None):
-        if message.model == 'purchase.order':
+    def _postprocess_sent_message(self, cr, uid, mail, context=None):
+        if mail.model == 'purchase.order':
             wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'purchase.order', message.res_id, 'send_rfq', cr)
-        return super(mail_message, self)._postprocess_sent_message(cr, uid, message=message, context=context)
+            wf_service.trg_validate(uid, 'purchase.order', mail.res_id, 'send_rfq', cr)
+        return super(mail_mail, self)._postprocess_sent_message(cr, uid, mail=mail, context=context)
+
+mail_mail()
+
+class product_template(osv.osv):
+    _name = 'product.template'
+    _inherit = 'product.template'
+    _columns = {
+        'purchase_ok': fields.boolean('Can be Purchased', help="Specify if the product can be selected in a purchase order line."),
+    }
+    _defaults = {
+        'purchase_ok': 1,
+    }
+
+product_template()
 
-mail_message()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml
index 75074d4cedf..fa701c1f179 100644
--- a/addons/purchase/purchase_data.xml
+++ b/addons/purchase/purchase_data.xml
@@ -3,14 +3,15 @@
     <data noupdate="1">
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Purchase Management has been installed.</value>
-            <value>From the top menu Purchases, create purchase orders to buy products from your suppliers, encode supplier invoices and manage your payments.
-
-You can also manage purchase requisitions, see the Purchase Settings.</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Purchase Management application installed!</field>
+            <field name="body"><![CDATA[<p>From the top menu Purchases, create purchase orders to buy products from your suppliers, enter supplier invoices and manage payments.</p>
+<p>You can also manage purchase requisitions, see also the Purchase Settings.</p>]]></field>
+        </record>
 
         <record id="req_link_purchase_order" model="res.request.link">
             <field name="name">Purchase Order</field>
diff --git a/addons/purchase/purchase_demo.xml b/addons/purchase/purchase_demo.xml
index 17f51bb1004..c68ee8775bb 100644
--- a/addons/purchase/purchase_demo.xml
+++ b/addons/purchase/purchase_demo.xml
@@ -14,6 +14,9 @@
             <field eval="80.0" name="schedule_range"/>
         </record>
 
+        <record id="product.product_product_consultant" model="product.product">
+            <field eval="False" name="purchase_ok"/>
+        </record>
     </data>
 </openerp>
 
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index aec55bf93c2..db71a969fbe 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -14,19 +14,40 @@
         <menuitem id="menu_purchase_config_purchase" name="Configuration"
             groups="group_purchase_manager"
             parent="base.menu_purchase_root" sequence="100"/>
+        <menuitem
+            action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase"
+            parent="menu_purchase_config_purchase" sequence="10" groups="product.group_purchase_pricelist" />
 
+        <record id="purchase_pricelist_version_action" model="ir.actions.act_window">
+            <field name="name">Pricelist Versions</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">product.pricelist.version</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="product.product_pricelist_version_tree_view"/>
+            <field name="domain">[('pricelist_id.type','=','purchase')]</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to add a pricelist version.
+              </p><p>
+                There can be more than one version of a pricelist, each of
+                these must be valid during a certain period of time. Some
+                examples of versions: Main Prices, 2010, 2011, Summer Sales,
+                etc.
+              </p>
+            </field>
+        </record>
         <menuitem
             id="menu_purchase_config_pricelist" name="Pricelists"
             parent="menu_purchase_config_purchase" sequence="50" groups="product.group_purchase_pricelist"/>
 
         <menuitem
-            action="product.product_pricelist_action" id="menu_product_pricelist_action_purhase"
-            parent="menu_purchase_config_pricelist" sequence="20" groups="base.group_no_one"/>
+            action="purchase_pricelist_version_action" id="menu_purchase_pricelist_version_action"
+            parent="menu_purchase_config_pricelist" sequence="2" groups="product.group_purchase_pricelist"/>
 
+        
         <menuitem
-            action="product.product_pricelist_action_for_purchase" id="menu_product_pricelist_action2_purchase"
-            parent="menu_purchase_config_pricelist" sequence="10" />
-
+            action="product.product_price_type_action" id="menu_product_pricelist_action2_purchase_type"
+            parent="menu_purchase_config_pricelist" sequence="60" />
         <menuitem
             id="menu_product_in_config_purchase" name="Products"
             parent="menu_purchase_config_purchase" sequence="30" groups="base.group_no_one"/>
@@ -61,7 +82,7 @@
         action="base.action_partner_supplier_form" sequence="15"/>
 
       <!--Inventory control-->
-      <menuitem id="menu_procurement_management_inventory" name="Receive Products"
+      <menuitem id="menu_procurement_management_inventory" name="Incoming Products"
             parent="base.menu_purchase_root" sequence="4"/>
       <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_inventory"
             name="Incoming Shipments" sequence="9"/>
@@ -73,7 +94,7 @@
         parent="base.menu_purchase_root" sequence="6"/>
 
     <record id="action_invoice_pending" model="ir.actions.act_window">
-        <field name="name">Based on Draft Invoices</field>
+        <field name="name">On Draft Invoices</field>
         <field name="res_model">account.invoice</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,form,calendar,graph</field>
@@ -95,7 +116,7 @@
         </field>
     </record>
 
-     <menuitem name="Based on Draft Invoices"
+     <menuitem
           id="menu_procurement_management_pending_invoice"
           action="action_invoice_pending"
           parent="menu_procurement_management_invoice"
@@ -118,7 +139,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_purchase_order"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_purchase_order_unread" model="ir.values">
             <field name="name">action_purchase_order_unread</field>
@@ -136,7 +157,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_purchase_order"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_purchase_order_read" model="ir.values">
             <field name="name">action_purchase_order_read</field>
@@ -177,18 +198,19 @@
             <field name="arch" type="xml">
                 <form string="Purchase Order" version="7.0">
                 <header>
-                    <button name="purchase_confirm" states="draft,sent" string="Confirm Quotation" class="oe_highlight"/>
-                    <button name="wkf_send_rfq" states="draft" string="Send RFQ" type="object" context="{'send_rfq':True}"/>
+                    <button name="wkf_send_rfq" states="draft" string="Send Request for Quotation" type="object" context="{'send_rfq':True}" class="oe_highlight"/>
+                    <button name="purchase_confirm" states="draft" string="Confirm Order"/>
+                    <button name="purchase_confirm" states="sent" string="Confirm Order" class="oe_highlight"/>
                     <button name="wkf_send_rfq" states="confirmed" string="Resend Purchase Order" type="object" class="oe_highlight"/>
                     <button name="action_cancel" states="except_picking,except_invoice" string="Cancel" type="object" />
                     <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
                     <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
-                    <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight"/>
-                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
+                    <button name="purchase_approve" states="confirmed" string="Approve Order" class="oe_highlight" groups="purchase.group_purchase_manager"/>
                     <button name="view_picking" string="Receive Products" type="object" attrs="{'invisible': ['|', ('shipped','=',True), ('state','!=', 'approved')]}" class="oe_highlight"/>
+                    <button name="view_invoice" string="Receive Invoice" type="object" attrs="{'invisible': ['|', ('invoice_method','=','picking'), '|', ('state','!=', 'approved'), ('invoiced','=',True) ]}" class="oe_highlight"/>
                     <button name="action_cancel_draft" states="cancel,sent,confirmed" string="Set to Draft" type="object" />
                     <button name="purchase_cancel" states="draft,confirmed,sent" string="Cancel"/>
-                    <field name="state" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,sent,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue"}' readonly="1"/>
                 </header>
                 <sheet>
                     <div class="oe_title">
@@ -202,7 +224,9 @@
                         <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" context="{'search_default_supplier':1,'default_supplier':1,'default_customer':0}" domain="[('supplier','=',True)]"/>
                             <field name="partner_ref"/>
-                            <field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist"/>
+                            <field domain="[('type','=','purchase')]" name="pricelist_id" groups="product.group_purchase_pricelist" on_change="onchange_pricelist(pricelist_id, context)"/>
+                            <field name="currency_id" invisible='1'/>
+                            <field name="journal_id" invisible='1'/>
                         </group>
                         <group>
                             <field name="date_order"/>
@@ -214,33 +238,37 @@
                     <notebook>
                         <page string="Purchase Order">
                             <field name="order_line">
-                                <tree string="Purchase Order Lines">
-                                    <field name="date_planned"/>
+                                <tree string="Purchase Order Lines" editable="bottom">
+                                    <field name="product_id" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)"/>
                                     <field name="name"/>
-                                    <field name="product_qty"/>
-                                    <field name="product_uom" groups="product.group_uom"/>
+                                    <field name="date_planned"/>
+                                    <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                                    <field name="account_analytic_id" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]"/>
+                                    <field name="product_qty" on_change="onchange_product_id(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id,parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)"/>
+                                    <field name="product_uom" groups="product.group_uom" on_change="onchange_product_uom(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order,parent.fiscal_position,date_planned,name,price_unit,context)"/>
                                     <field name="price_unit"/>
+                                    <field name="taxes_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
                             <group class="oe_subtotal_footer oe_right">
-                                <field name="amount_untaxed"/>
-                                <field name="amount_tax"/>
+                                <field name="amount_untaxed" widget="monetary" options="{'currency_field': 'currency_id'}"/>
+                                <field name="amount_tax" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 <div class="oe_subtotal_footer_separator oe_inline">
                                     <label for="amount_total"/>
                                     <button name="button_dummy"
                                         states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
                                 </div>
-                                <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
+                                <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                             </group>
                             <div class="oe_clear"/>
                             <label for="notes"/>
-                            <field name="notes"/>
+                            <field name="notes" class="oe_inline"/>
                         </page>
-                        <page string="Delivery &amp; Invoicing">
+                        <page string="Incoming Shipments &amp; Invoices">
                             <group>
                                 <group>
-                                    <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)"/>
+                                    <field name="dest_address_id" string="Customer Address" on_change="onchange_dest_address_id(dest_address_id)" groups="stock.group_locations"/>
                                     <field name="minimum_planned_date"/>
                                     <field name="location_id" groups="stock.group_locations"/>
                                     <field name="shipped" groups="base.group_no_one"/>
@@ -254,14 +282,12 @@
                                     <field name="date_approve" groups="base.group_no_one"/>
                                 </group>
                             </group>
-                            <separator string="Invoices"/>
-                            <field name="invoice_ids" context="{'type':'in_invoice', 'journal_type':'purchase'}"/>
                         </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread"/>
                 </div>
                 </form>
             </field>
@@ -298,7 +324,7 @@
             <field name="arch" type="xml">
                 <search string="Search Purchase Order">
                     <field name="name" string="Reference"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-document-new" name="draft" string="Quotations" domain="[('state','=','draft')]" help="Purchase orders which are in draft state"/>
                     <filter icon="terp-check" name="approved" string="Purchase Orders" domain="[('state','not in',('draft','cancel'))]" help="Approved purchase orders"/>
@@ -323,15 +349,15 @@
             <field name="name">purchase.order.tree</field>
             <field name="model">purchase.order</field>
             <field name="arch" type="xml">
-                <tree fonts="bold:needaction_pending==True" colors="grey:state=='cancel';blue:state in ('confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
-                    <field name="needaction_pending" invisible="1"/>
+                <tree fonts="bold:message_unread==True" colors="grey:state=='cancel';blue:state in ('wait','confirmed');red:state in ('except_invoice','except_picking')" string="Purchase Order">
+                    <field name="message_unread" invisible="1"/>
                     <field name="name" string="Reference"/>
                     <field name="date_order" />
                     <field name="partner_id"/>
                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                     <field name="minimum_planned_date" invisible="context.get('quotation_only', False)"/>
                     <field name="origin"/>
-                    <field name="amount_untaxed" sum="Total Untaxed amount"/>
+                    <field name="amount_untaxed" sum="Total Untaxed amount" string="Untaxed"/>
                     <field name="amount_total" sum="Total amount"/>
                     <field name="state"/>
                 </tree>
@@ -342,7 +368,8 @@
             <field name="name">Quotations</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
-            <field name="context">{'search_default_draft': 1}</field>
+            <field name="context">{'search_default_draft': 1, 'search_default_to_approve': 1}</field>
+            <field name="domain">[('state','in',('draft','sent','confirmed'))]</field>
             <field name="view_mode">tree,form,graph,calendar</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help" type="html">
@@ -367,7 +394,8 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_mode">tree,form,graph,calendar</field>
-            <field name="context">{'search_default_approved': 1}</field>
+            <field name="context">{}</field>
+            <field name="domain">[('state','not in',('draft','sent','confirmed'))]</field>
             <field name="search_view_id" ref="view_purchase_order_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
@@ -422,7 +450,7 @@
             <field name="name">purchase.order.line.tree</field>
             <field name="model">purchase.order.line</field>
             <field name="arch" type="xml">
-                <tree string="Purchase Order Lines">
+                <tree string="Purchase Order Lines" create="false">
                     <field name="order_id"/>
                     <field name="name"/>
                     <field name="partner_id" string="Supplier" />
@@ -442,11 +470,11 @@
             <field name="model">purchase.order.line</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <form string="Purchase Order Line" version="7.0">
+                <form string="Purchase Order Line" version="7.0" create="false">
                     <sheet>
                         <label for="order_id" class="oe_edit_only"/>
                         <h1>
-                            <field name="order_id" class="oe_inline"/>
+                            <field name="order_id" class="oe_inline" domain="[('invoice_method','=','manual')]" />
                             <label string="," attrs="{'invisible':[('date_order','=',False)]}"/>
                             <field name="date_order" class="oe_inline"/>
                         </h1>
@@ -508,7 +536,7 @@
 
 
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
-            <field name="name">Based on Purchase Order Lines</field>
+            <field name="name">On Purchase Order Lines</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order.line</field>
             <field name="domain">[('order_id.invoice_method','&lt;&gt;','picking'), ('state','in',('confirmed','done')), ('invoiced', '=', False)]</field>
@@ -554,5 +582,85 @@
                 </xpath>
             </field>
         </record>
+        
+        <!-- Product Suppliers-->
+        
+        <record id="view_product_supplier_inherit" model="ir.ui.view">
+            <field name="name">product.normal.supplier.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <div name="options" position="inside">
+                    <field name="purchase_ok"/>
+                    <label for="purchase_ok"/>
+                </div>
+                <group name="procurement" position="after">
+                     <separator string="Suppliers"/>
+                     <field name="seller_ids" context="{'uom_id': uom_id}"/>
+                </group>
+            </field>
+        </record>
+
+        <record id="product_product_normal_form_procurement_help_view" model="ir.ui.view">
+            <field name="name">product.normal.form.procurement.help.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
+            <field name="arch" type="xml">
+                <group name="procurement_help" position="inside">
+                    <p attrs="{'invisible': ['|','|',('type','&lt;&gt;','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','buy')]}">
+                        When you sell this service to a customer, <b>a draft purchase order</b>
+                        will be created in order to subcontract the job 
+                        <i attrs="{'invisible': [('seller_id','=',False)]}">to 
+                        <field name="seller_id" class="oe_inline"/></i>.
+                    </p>
+                    <p attrs="{'invisible': ['|','|',('type','=','service'),('procure_method','&lt;&gt;','make_to_order'),('supply_method','&lt;&gt;','buy')]}">
+                        When you sell this product, OpenERP will trigger <b>a draft
+                        purchase order</b> to buy the required quantities to the supplier.
+                        The delivery order will be ready after having received the
+                        products.
+                    </p>
+                </group>
+            </field>
+        </record>
+
+        <record id="product_search_form_view_purchase" model="ir.ui.view">
+            <field name="name">product.search.purchase.form</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_search_form_view"/>
+            <field name="arch" type="xml">
+                <filter name="filter_to_sell" position="before">
+                    <filter name="filter_to_purchase" string="To Purchase" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
+                </filter>
+                <filter name="filter_to_sell" position="after">
+                   <filter name="filter_to_purchase" string="Can be Purchased" icon="terp-accessories-archiver+" domain="[('purchase_ok', '=', 1)]"/>
+                </filter>
+            </field>
+        </record>
+
+        <record id="view_template_purchase_ok_form" model="ir.ui.view">
+            <field name="name">product.template.purchase.ok.form.inherit</field>
+            <field name="model">product.template</field>
+            <field name="inherit_id" ref="product.product_template_form_view"/>
+            <field name="arch" type="xml">
+                <field name="sale_ok" position="after">
+                    <field name="purchase_ok"/>
+                </field>
+            </field>
+        </record>
+  
+        <record id="view_product_account_purchase_ok_form" model="ir.ui.view">
+            <field name="name">product.account.purchase.ok.form.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="account.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='property_account_expense']" position="replace" >
+                     <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
+                </xpath>
+                <xpath expr="//field[@name='supplier_taxes_id']" position="replace" >
+                     <field name="supplier_taxes_id" colspan="2" widget="many2many_tags" attrs="{'readonly':[('purchase_ok','=',0)]}"/>
+                </xpath>
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index 00fb5517568..212ce304e07 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -145,7 +145,7 @@
         <record id="trans_router_invoice_no_order" model="workflow.transition">
             <field name="act_from" ref="act_router"/>
             <field name="act_to" ref="act_invoice_end"/>
-            <field name="condition">invoice_method&lt;&gt;'order'</field>
+            <field name="condition">invoice_method&lt;&gt;'order' and invoiced</field>
         </record>
         <record id="trans_except_picking_picking_done" model="workflow.transition">
             <field name="act_from" ref="act_except_picking"/>
diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py
index 4ab6251c7a2..76ffddcb85f 100644
--- a/addons/purchase/report/purchase_report.py
+++ b/addons/purchase/report/purchase_report.py
@@ -40,7 +40,7 @@ class purchase_report(osv.osv):
                                       ('except_picking', 'Shipping Exception'),
                                       ('except_invoice', 'Invoice Exception'),
                                       ('done', 'Done'),
-                                      ('cancel', 'Cancelled')],'Order State', readonly=True),
+                                      ('cancel', 'Cancelled')],'Order Status', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', readonly=True),
         'location_id': fields.many2one('stock.location', 'Destination', readonly=True),
@@ -78,7 +78,7 @@ class purchase_report(osv.osv):
                     to_char(s.date_order, 'YYYY-MM-DD') as day,
                     s.state,
                     s.date_approve,
-                    date_trunc('day',s.minimum_planned_date) as expected_date,
+                    s.minimum_planned_date as expected_date,
                     s.dest_address_id,
                     s.pricelist_id,
                     s.validator,
@@ -117,7 +117,7 @@ class purchase_report(osv.osv):
                     s.date_approve,
                     l.date_planned,
                     l.product_uom,
-                    date_trunc('day',s.minimum_planned_date),
+                    s.minimum_planned_date,
                     s.pricelist_id,
                     s.validator,
                     s.dest_address_id,
@@ -129,7 +129,7 @@ class purchase_report(osv.osv):
                     to_char(s.date_order, 'YYYY-MM-DD'),
                     s.state,
                     s.warehouse_id,
-                    u.uom_type, 
+                    u.uom_type,
                     u.category_id,
                     t.uom_id,
                     u.id,
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index 842de65b68e..909663f43bb 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -16,7 +16,7 @@
             <field name="name">purchase.order.tree</field>
             <field name="model">purchase.report</field>
             <field name="arch" type="xml">
-                <tree string="Purchase Orders Statistics">
+                <tree string="Purchase Orders Statistics" create="false">
                     <field name="date" invisible="1"/>
                     <field name="date_approve" invisible="1"/>
                     <field name="expected_date" invisible="1"/>
@@ -72,7 +72,7 @@
                     <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
                     <filter string="Category" name="group_category_id" icon="terp-stock_symbol-selection" context="{'group_by':'category_id'}"/>
                     <filter string="Reference Unit of Measure" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
-                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}" groups="base.group_extended"/>
+                    <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Reference UOM" name="group_product_uom" icon="terp-mrp" context="{'group_by':'product_uom'}"/>
                     <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}"/>
                     <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml
index 9d23e97b385..66fd58060b8 100644
--- a/addons/purchase/report/request_quotation.rml
+++ b/addons/purchase/report/request_quotation.rml
@@ -2,7 +2,7 @@
 <document filename="Request for Quotation.pdf">
   <template title="Request for Quotation" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="23.0" y1="43.0" width="530" height="799"/>
+      <frame id="first" x1="18.0" y1="42.0" width="535" height="758"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -167,4 +167,4 @@
     <para style="terp_default_9">[[ user.signature or '' ]]</para>
   </pto>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 6beac5a4cd0..9e781d661f2 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -29,36 +29,40 @@ class purchase_config_settings(osv.osv_memory):
 
     _columns = {
         'default_invoice_method': fields.selection(
-            [('manual', 'Based on Purchase Order Lines'),
-             ('picking', 'Based on Receptions'),
-             ('order', 'Pre-Generate Draft Invoices based on Purchase Orders'),
-            ], 'default invoicing control method', required=True, default_model='purchase.order'),
-        'group_purchase_pricelist':fields.boolean("manage pricelist per supplier",
+            [('manual', 'Based on purchase order lines'),
+             ('picking', 'Based on receptions'),
+             ('order', 'Pre-generate draft invoices based on purchase orders'),
+            ], 'Default invoicing control method', required=True, default_model='purchase.order'),
+        'group_purchase_pricelist':fields.boolean("Manage pricelist per supplier",
             implied_group='product.group_purchase_pricelist',
             help="""Allows to manage different prices based on rules per category of Supplier.
                 Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
-        'group_uom':fields.boolean("manage different units of measure for products",
+        'group_uom':fields.boolean("Manage different units of measure for products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
-        'group_purchase_delivery_address': fields.boolean("allow a different address for incoming products and invoicings",
+        'group_costing_method':fields.boolean("Compute product cost price based on average cost",
+            implied_group='product.group_costing_method',
+            help="""Allows you to compute product cost price based on average cost."""),
+        'group_purchase_delivery_address': fields.boolean("Allow a different address for incoming products and invoicing",
             implied_group='purchase.group_delivery_invoice_address',
             help="Allows you to specify different delivery and invoice addresses on a purchase order."),
-        'module_purchase_analytic_plans': fields.boolean('allow using multiple analytic accounts on the same order',
-            help ="""Allows the user to maintain several analysis plans. These let you split
-                lines on a purchase order between several accounts and analytic plans.
-                This installs the module purchase_analytic_plans."""),
-        'module_warning': fields.boolean("alerts by products or supllier",
-            help="""Allow to configure warnings on products and trigger them when a user wants to purchase a given product or a given supplier.
-            Example: Product: this product is deprecated, do not purchase more than 5.
-                    Supplier: don't forget to ask for an express delivery."""),
-
-        'module_purchase_double_validation': fields.boolean("force two levels of approvals",
+        'module_warning': fields.boolean("Alerts by products or supplier",
+            help="""Allow to configure notification on products and trigger them when a user wants to purchase a given product or a given supplier.
+Example: Product: this product is deprecated, do not purchase more than 5.
+                Supplier: don't forget to ask for an express delivery."""),
+        'module_purchase_double_validation': fields.boolean("Force two levels of approvals",
             help="""Provide a double validation mechanism for purchases exceeding minimum amount.
                 This installs the module purchase_double_validation."""),
-        'module_purchase_requisition': fields.boolean("manage purchase requisitions",
+        'module_purchase_requisition': fields.boolean("Manage purchase requisitions",
             help="""Purchase Requisitions are used when you want to request quotations from several suppliers for a given set of products.
             You can configure per product if you directly do a Request for Quotation
             to one supplier or if you want a purchase requisition to negotiate with several suppliers."""),
+        'module_purchase_analytic_plans': fields.boolean('Use multiple analytic accounts on purchase orders',
+            help ="""Allows the user to maintain several analysis plans. These let you split lines on a purchase order between several accounts and analytic plans.
+                This installs the module purchase_analytic_plans."""),
+        'group_analytic_account_for_purchases': fields.boolean('Analytic accounting for purchases',
+            implied_group='purchase.group_analytic_accounting',
+            help="Allows you to specify an analytic account on purchase orders."),
     }
 
     _defaults = {
@@ -71,9 +75,10 @@ class purchase_config_settings(osv.osv_memory):
 class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
-        'module_purchase_analytic_plans': fields.boolean('use multiple analytic accounts on orders',
-            help="""This allows install module purchase_analytic_plans."""),
-        'group_analytic_account_for_purchases': fields.boolean('analytic accounting for purchases',
+        'module_purchase_analytic_plans': fields.boolean('Use multiple analytic accounts on orders',
+            help ="""Allows the user to maintain several analysis plans. These let you split lines on a purchase order between several accounts and analytic plans.
+                This installs the module purchase_analytic_plans."""),
+        'group_analytic_account_for_purchases': fields.boolean('Analytic accounting for purchases',
             implied_group='purchase.group_analytic_accounting',
             help="Allows you to specify an analytic account on purchase orders."),
     }
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 23d89f1a7f1..f659d7b437f 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -7,10 +7,9 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('base.menu_purchase_root')}"/>
         </record>
-        <record id="todo_open_purchase_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_purchase_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
         </record>
     </data>
     <data>
@@ -59,6 +58,10 @@
                                 <field name="group_purchase_delivery_address" class="oe_inline"/>
                                 <label for="group_purchase_delivery_address"/>
                             </div>
+                            <div>
+                                <field name="group_costing_method" class="oe_inline"/>
+                                <label for="group_costing_method"/>
+                            </div>
                             <div name="module_purchase_double_validation">
                                 <field name="module_purchase_double_validation" class="oe_inline"/>
                                 <label for="module_purchase_double_validation"/>
@@ -71,6 +74,10 @@
                                 <field name="module_purchase_analytic_plans" class="oe_inline"/>
                                 <label for="module_purchase_analytic_plans"/>
                             </div>
+                            <div>
+                                <field name="group_analytic_account_for_purchases" class="oe_inline"/>
+                                <label for="group_analytic_account_for_purchases"/>
+                            </div>
                         </div>
                     </group>
                 </form>
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index c45b8a9b070..3c8d072c536 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -6,7 +6,7 @@ access_purchase_order_line_manager,purchase.order.line manager,model_purchase_or
 access_stock_location_purchase_user,stock.location,stock.model_stock_location,group_purchase_user,1,0,0,0
 access_stock_warehouse_purchase_user,stock.warehouse,stock.model_stock_warehouse,group_purchase_user,1,0,0,0
 access_stock_picking_purchase_user,stock.picking,stock.model_stock_picking,group_purchase_user,1,1,1,1
-access_stock_move_purchase_user,stock.move,stock.model_stock_move,group_purchase_user,1,0,0,0
+access_stock_move_purchase_user,stock.move,stock.model_stock_move,group_purchase_user,1,1,1,0
 access_purchase_order_stock_worker,purchase.order,model_purchase_order,stock.group_stock_user,1,0,0,0
 access_purchase_order_line_stock_worker,purchase.order.line,model_purchase_order_line,stock.group_stock_user,1,0,0,0
 access_account_tax_purchase_user,account.tax,account.model_account_tax,group_purchase_user,1,0,0,0
@@ -19,7 +19,7 @@ access_stock_picking_purchase_user_manager,stock.picking,stock.model_stock_picki
 access_stock_move_purchase_user_manager,stock.move,stock.model_stock_move,group_purchase_manager,1,1,1,1
 access_account_tax_purchase_user_manager,account.tax,account.model_account_tax,group_purchase_manager,1,0,0,0
 access_product_product_purchase_user,product.product.purchase.user,product.model_product_product,group_purchase_user,1,0,0,0
-access_product_product_purchase_manager,product.product.purchase.manager,product.model_product_product,group_purchase_manager,1,0,0,0
+access_product_product_purchase_manager,product.product purchase_manager,product.model_product_product,purchase.group_purchase_manager,1,1,1,1
 access_product_template_purchase_user,product.template purchase_user,product.model_product_template,group_purchase_user,1,0,0,0
 access_product_template_purchase_manager,product.template purchase_manager,product.model_product_template,group_purchase_manager,1,0,0,0
 access_account_invoice_purchase,account_invoice purchase,account.model_account_invoice,group_purchase_user,1,1,1,1
@@ -49,7 +49,6 @@ access_product_uom_purchase_manager,product.uom purchase_manager,product.model_p
 access_product_ul_purchase_manager,product.ul purchase_manager,product.model_product_ul,purchase.group_purchase_manager,1,1,1,1
 access_product_category_purchase_manager,product.category purchase_manager,product.model_product_category,purchase.group_purchase_manager,1,1,1,1
 access_product_template_purchase_manager,product.template purchase_manager,product.model_product_template,purchase.group_purchase_manager,1,1,1,1
-access_product_product_purchase_manager,product.product purchase_manager,product.model_product_product,purchase.group_purchase_manager,1,1,1,1
 access_product_packaging_purchase_manager,product.packaging purchase_manager,product.model_product_packaging,purchase.group_purchase_manager,1,1,1,1
 access_product_supplierinfo_purchase_manager,product.supplierinfo purchase_manager,product.model_product_supplierinfo,purchase.group_purchase_manager,1,1,1,1
 access_pricelist_partnerinfo_purchase_manager,pricelist.partnerinfo purchase_manager,product.model_pricelist_partnerinfo,purchase.group_purchase_manager,1,1,1,1
@@ -65,3 +64,4 @@ access_account_journal_purchase_manager,account.journal purchase manager,account
 access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_stock_tracking,purchase.group_purchase_user,1,1,1,0
 access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0
 access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0
+access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,group_purchase_user,1,0,0,0
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index 26a4aa14f1c..637a1722c7e 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -4,6 +4,7 @@
 
     <record id="group_purchase_user" model="res.groups">
         <field name="name">User</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
         <field name="category_id" ref="base.module_category_purchase_management"/>
     </record>
 
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index ad1c26a84c1..188baeccd69 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -11,16 +11,6 @@
                 </xpath>
             </field>
         </record>
-        <record id="stock_picking_inherit_purchase" model="ir.ui.view">
-            <field name="name">Picking list</field>
-            <field name="model">stock.picking</field>
-            <field name="inherit_id" ref="stock.view_picking_form"/>
-            <field name="arch" type="xml">
-                <field name="auto_picking" position="after">
-                    <field name="purchase_id" invisible="1"/>
-                </field>
-            </field>
-        </record>
 
         <record id="stock_picking_in_inherit_purchase" model="ir.ui.view">
             <field name="name">Incoming Picking Inherited</field>
@@ -28,71 +18,26 @@
             <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='date']" position="before">
-                    <field name="purchase_id"/>
+                    <field name="purchase_id" domain="[('invoice_method','=','picking')]"  context="{'search_default_partner_id':partner_id,'default_partner_id':partner_id, 'default_invoice_method':'picking'}"/>
                 </xpath>
                 <xpath expr="//field[@name='company_id']" position="after">
-                    <field name="warehouse_id"/>
+                    <field name="warehouse_id" groups="stock.group_locations"/>
                 </xpath>
             </field>
         </record>
 
-        <!-- Picking to Invoice -->
-        <record id="view_picking_in_search_picking_to_invoice" model="ir.ui.view">
-            <field name="name">stock.picking.in.search</field>
+        <record id="view_picking_in_search_picking_inherit" model="ir.ui.view">
+            <field name="name">stock.picking.in.search.inherit</field>
             <field name="model">stock.picking.in</field>
+            <field name="inherit_id" ref="stock.view_picking_in_search"/>
             <field name="arch" type="xml">
-                <search string="Picking to Invoice">
-                    <field name="name" string="Picking to Invoice" filter_domain="['|',('name','ilike',self),('origin','ilike',self)]"/>
-                    <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Incoming Shipments Available"/>
-                    <filter icon="terp-dialog-close" name="done" string="Received" domain="[('state','=','done')]" help="Incoming Shipments already Received"/>
-                    <separator/>
-                    <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order"/>
-                    <separator/>
-                    <filter string="To Invoice" name="to_invoice" icon="terp-dolar" domain="[('invoice_state', '=', '2binvoiced')]"/>
-                    <field name="stock_journal_id"/>
-                    <field name="company_id" groups="base.group_multi_company"/>
-                    <field name="purchase_id" />
-                    <group expand="0" string="Group By..." colspan="4" col="8">
-                        <filter icon="terp-stock_effects-object-colorize" name="Status" string="Status" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
-                        <filter string="Scheduled Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
-                        <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'stock_journal_id'}"/>
-                    </group>
-                </search>
+                <xpath expr="//field[@name='product_id']" position="before">
+                    <field name="purchase_id"/>
+                </xpath>
             </field>
         </record>
-        <record id="act_purchase_order_2_stock_picking" model="ir.actions.act_window">
-            <field name="name">Incoming Shipments</field>
-            <field name="res_model">stock.picking.in</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,calendar</field>
-            <field name="domain">[('type','=','in')]</field>
-            <field name="context">{'search_default_purchase_id': active_id,'default_type': 'in'}</field>
-            <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
-        </record>
-        
-        <record id="act_purchase_order_2_stock_picking_tree" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="stock.view_picking_in_tree"/>
-            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
-        </record>
-        
-        <record id="act_purchase_order_2_stock_picking_form" model="ir.actions.act_window.view">
-            <field eval="2" name="sequence"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="stock.view_picking_in_form"/>
-            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
-        </record>
-        
-        <record id="act_purchase_order_2_stock_picking_calendar" model="ir.actions.act_window.view">
-            <field eval="3" name="sequence"/>
-            <field name="view_mode">calendar</field>
-            <field name="view_id" ref="stock.stock_picking_in_calendar"/>
-            <field name="act_window_id" ref="act_purchase_order_2_stock_picking"/>
-        </record>
 
+        <!-- is it need ? we have another method "Receive Products"-->
         <record id="purchase_order_2_stock_picking" model="ir.ui.view">
             <field name="name">Purchase Picking Inherited</field>
             <field name="model">purchase.order</field>
@@ -100,23 +45,25 @@
             <field name="arch" type="xml">
                  <xpath expr="//div[contains(@class, 'oe_title')]" position="before">
                     <div class="oe_right oe_button_box" name="buttons">
-                        <button type="action"
-                            name="%(act_purchase_order_2_stock_picking)d"
+                        <button type="object"
+                            name="view_picking"
                             string="Incoming Shipments" states="approved"/>
+                        <button type="object"  name="invoice_open"
+                            string="Invoices" attrs="{'invisible': [('state', '=', 'draft')]}"/> 
                     </div>
                 </xpath>
             </field>
         </record>
 
         <record id="action_picking_tree4_picking_to_invoice" model="ir.actions.act_window">
-            <field name="name">Based on Incoming Shipments</field>
-            <field name="res_model">stock.picking</field>
+            <field name="name">On Incoming Shipments</field>
+            <field name="res_model">stock.picking.in</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar</field>
-            <field name="domain">[('type','=','in')]</field>
+            <field name="domain">[('type','=','in'),('purchase_id.invoice_method','=','picking')]</field>
             <field name="context">{"default_type": "in", "contact_display": "partner_address", "search_default_done": 1, "search_default_to_invoice": 1}</field>
-            <field name="search_view_id" ref="view_picking_in_search_picking_to_invoice"/>
+            <field name="search_view_id" ref="stock.view_picking_in_search"/>
             <field name="help" type="html">
               <p>
                 Here you can track all the product receptions of purchase
diff --git a/addons/purchase/test/process/edi_purchase_order.yml b/addons/purchase/test/process/edi_purchase_order.yml
index 02756959848..d0e90f3788d 100644
--- a/addons/purchase/test/process/edi_purchase_order.yml
+++ b/addons/purchase/test/process/edi_purchase_order.yml
@@ -86,13 +86,13 @@
             "__model": "sale.order.line",
             "__import_module": "purchase", 
             "__import_model": "purchase.order.line", 
-            "name": "Basic PC", 
+            "name": "PC Assemble SC234", 
             "product_uom": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_uom_unit", "Unit"], 
             "product_qty": 1.0,
             "date_planned": "2011-09-30",
             "sequence": 10, 
             "price_unit": 150.0, 
-            "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_3", "[PC1] Basic PC"],
+            "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_3", "[PCSC234] PC Assemble SC234"],
         },
         {
             "__id": "sale:724f93ec-ddd0-11e0-88ec-701a04e25543.sale_order_line-LXEqeadasdad", 
@@ -100,13 +100,13 @@
             "__model": "sale.order.line",
             "__import_module": "purchase", 
             "__import_model": "purchase.order.line", 
-            "name": "Medium PC", 
+            "name": "PC on Demand", 
             "product_uom": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_uom_unit", "Unit"], 
             "product_qty": 10.0, 
             "sequence": 11, 
             "date_planned": "2011-09-15", 
             "price_unit": 20.0, 
-            "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_5", "[PC3] Medium PC"],
+            "product_id": ["product:724f93ec-ddd0-11e0-88ec-701a04e25543.product_product_5", "[PC-DEM] PC on Demand"],
         }], 
     }
     new_purchase_order_id = purchase_order_pool.edi_import(cr, uid, edi_document, context=context)
@@ -123,11 +123,11 @@
     assert order_new.amount_untaxed == 350, "untaxed amount is not same"
     assert len(order_new.order_line) == 2, "Purchase order lines number mismatch"
     for purchase_line in order_new.order_line:
-        if purchase_line.name == 'Basic PC':
+        if purchase_line.name == 'PC Assemble SC234':
             assert purchase_line.product_uom.name == "Unit" , "uom is not same"
             assert purchase_line.price_unit == 150 , "unit price is not same, got %s, expected 150"%(purchase_line.price_unit,)
             assert purchase_line.product_qty == 1 , "product qty is not same"
-        elif purchase_line.name == 'Medium PC':
+        elif purchase_line.name == 'PC on Demand':
             assert purchase_line.product_uom.name == "Unit" , "uom is not same"
             assert purchase_line.price_unit == 20 , "unit price is not same, got %s, expected 20"%(purchase_line.price_unit,)
             assert purchase_line.product_qty == 10 , "product qty is not same"
diff --git a/addons/purchase/test/ui/duplicate_order.yml b/addons/purchase/test/ui/duplicate_order.yml
index ff7f7d906c5..d49cec22d73 100644
--- a/addons/purchase/test/ui/duplicate_order.yml
+++ b/addons/purchase/test/ui/duplicate_order.yml
@@ -4,5 +4,4 @@
   I duplicate order.
 -
   !python {model: purchase.order}: |
-    context.update({'active_id':ref('purchase_order_1')})
     self.copy(cr, uid, ref('purchase_order_1'), context)
diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py
index 99ae11a7ba8..13bfb539861 100644
--- a/addons/purchase/wizard/purchase_order_group.py
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -88,4 +88,4 @@ class purchase_order_group(osv.osv_memory):
 
 purchase_order_group()
 
-# 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/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py
index 283923895d6..98a1ee2a704 100644
--- a/addons/purchase_analytic_plans/__openerp__.py
+++ b/addons/purchase_analytic_plans/__openerp__.py
@@ -33,13 +33,11 @@ on a supplier purchase order into several accounts and analytic plans.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'images' : ['images/purchase_analytic_distribution.jpeg'],
+    'images': ['images/purchase_analytic_distribution.jpeg'],
     'depends': ['purchase', 'account_analytic_plans'],
-    'init_xml': [],
-    'update_xml': ['purchase_analytic_plans_view.xml'],
-    'demo_xml': [],
+    'data': ['purchase_analytic_plans_view.xml'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0062176518909',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_analytic_plans/i18n/ar.po b/addons/purchase_analytic_plans/i18n/ar.po
index 8ade0860dfb..6c217de2b2b 100644
--- a/addons/purchase_analytic_plans/i18n/ar.po
+++ b/addons/purchase_analytic_plans/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/bg.po b/addons/purchase_analytic_plans/i18n/bg.po
index 4dc2b32524b..c22ce8038fd 100644
--- a/addons/purchase_analytic_plans/i18n/bg.po
+++ b/addons/purchase_analytic_plans/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/bs.po b/addons/purchase_analytic_plans/i18n/bs.po
index 8b92fdd76c8..50c9b28690b 100644
--- a/addons/purchase_analytic_plans/i18n/bs.po
+++ b/addons/purchase_analytic_plans/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ca.po b/addons/purchase_analytic_plans/i18n/ca.po
index d6f2667bb6b..5d7f7bfa9a9 100644
--- a/addons/purchase_analytic_plans/i18n/ca.po
+++ b/addons/purchase_analytic_plans/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/cs.po b/addons/purchase_analytic_plans/i18n/cs.po
index b0995a7565f..ce2532412fc 100644
--- a/addons/purchase_analytic_plans/i18n/cs.po
+++ b/addons/purchase_analytic_plans/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/da.po b/addons/purchase_analytic_plans/i18n/da.po
index 9c73d750135..971a89c924d 100644
--- a/addons/purchase_analytic_plans/i18n/da.po
+++ b/addons/purchase_analytic_plans/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/de.po b/addons/purchase_analytic_plans/i18n/de.po
index 7e55222f586..2392f38cae2 100644
--- a/addons/purchase_analytic_plans/i18n/de.po
+++ b/addons/purchase_analytic_plans/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/el.po b/addons/purchase_analytic_plans/i18n/el.po
index 2542a85485b..56ffae56aed 100644
--- a/addons/purchase_analytic_plans/i18n/el.po
+++ b/addons/purchase_analytic_plans/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/purchase_analytic_plans/i18n/es.po b/addons/purchase_analytic_plans/i18n/es.po
index 3605199efbb..d97e347f653 100644
--- a/addons/purchase_analytic_plans/i18n/es.po
+++ b/addons/purchase_analytic_plans/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2011-01-13 12:42+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/es_AR.po b/addons/purchase_analytic_plans/i18n/es_AR.po
index b3e15086790..4695861855e 100644
--- a/addons/purchase_analytic_plans/i18n/es_AR.po
+++ b/addons/purchase_analytic_plans/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/es_CR.po b/addons/purchase_analytic_plans/i18n/es_CR.po
index 394bb7ef461..c5a59c8db9e 100644
--- a/addons/purchase_analytic_plans/i18n/es_CR.po
+++ b/addons/purchase_analytic_plans/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: purchase_analytic_plans
diff --git a/addons/purchase_analytic_plans/i18n/et.po b/addons/purchase_analytic_plans/i18n/et.po
index 2627535351d..68b19fce8f7 100644
--- a/addons/purchase_analytic_plans/i18n/et.po
+++ b/addons/purchase_analytic_plans/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/fi.po b/addons/purchase_analytic_plans/i18n/fi.po
index 8b39ac7ed35..cb107d9c6c1 100644
--- a/addons/purchase_analytic_plans/i18n/fi.po
+++ b/addons/purchase_analytic_plans/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/fr.po b/addons/purchase_analytic_plans/i18n/fr.po
index 98ff6d30fd8..a94e2278c48 100644
--- a/addons/purchase_analytic_plans/i18n/fr.po
+++ b/addons/purchase_analytic_plans/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/gl.po b/addons/purchase_analytic_plans/i18n/gl.po
index cac6754f2cc..b832f57b638 100644
--- a/addons/purchase_analytic_plans/i18n/gl.po
+++ b/addons/purchase_analytic_plans/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/hr.po b/addons/purchase_analytic_plans/i18n/hr.po
index 1f677e10820..a5c31d70337 100644
--- a/addons/purchase_analytic_plans/i18n/hr.po
+++ b/addons/purchase_analytic_plans/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/hu.po b/addons/purchase_analytic_plans/i18n/hu.po
index 913f5d7c44f..885a5b207b0 100644
--- a/addons/purchase_analytic_plans/i18n/hu.po
+++ b/addons/purchase_analytic_plans/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/id.po b/addons/purchase_analytic_plans/i18n/id.po
index 162436a88b7..5a5e87a079a 100644
--- a/addons/purchase_analytic_plans/i18n/id.po
+++ b/addons/purchase_analytic_plans/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/it.po b/addons/purchase_analytic_plans/i18n/it.po
index 32ed415256c..082112fc479 100644
--- a/addons/purchase_analytic_plans/i18n/it.po
+++ b/addons/purchase_analytic_plans/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ja.po b/addons/purchase_analytic_plans/i18n/ja.po
index 36f7f468f92..6c6b32bc5ff 100644
--- a/addons/purchase_analytic_plans/i18n/ja.po
+++ b/addons/purchase_analytic_plans/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ko.po b/addons/purchase_analytic_plans/i18n/ko.po
index 54e01b4a8fa..048f0802979 100644
--- a/addons/purchase_analytic_plans/i18n/ko.po
+++ b/addons/purchase_analytic_plans/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/lt.po b/addons/purchase_analytic_plans/i18n/lt.po
index bec1a4eda1d..d9fe5061d41 100644
--- a/addons/purchase_analytic_plans/i18n/lt.po
+++ b/addons/purchase_analytic_plans/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/mn.po b/addons/purchase_analytic_plans/i18n/mn.po
index 6b270b0ee5d..544b867d123 100644
--- a/addons/purchase_analytic_plans/i18n/mn.po
+++ b/addons/purchase_analytic_plans/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/nl.po b/addons/purchase_analytic_plans/i18n/nl.po
index aefbb2f6dea..7b490d5d9a6 100644
--- a/addons/purchase_analytic_plans/i18n/nl.po
+++ b/addons/purchase_analytic_plans/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-01-28 13:55+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/nl_BE.po b/addons/purchase_analytic_plans/i18n/nl_BE.po
index 599ca0f3922..2327ea393a7 100644
--- a/addons/purchase_analytic_plans/i18n/nl_BE.po
+++ b/addons/purchase_analytic_plans/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/pl.po b/addons/purchase_analytic_plans/i18n/pl.po
index 208d15e79e7..8bcbf34c80e 100644
--- a/addons/purchase_analytic_plans/i18n/pl.po
+++ b/addons/purchase_analytic_plans/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/pt.po b/addons/purchase_analytic_plans/i18n/pt.po
index 5860ba359c1..57bd363ef2c 100644
--- a/addons/purchase_analytic_plans/i18n/pt.po
+++ b/addons/purchase_analytic_plans/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/pt_BR.po b/addons/purchase_analytic_plans/i18n/pt_BR.po
index 736c89f4d7a..a73bba2bb3a 100644
--- a/addons/purchase_analytic_plans/i18n/pt_BR.po
+++ b/addons/purchase_analytic_plans/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 20:58+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ro.po b/addons/purchase_analytic_plans/i18n/ro.po
index 5f5d581749d..e67ba63cbff 100644
--- a/addons/purchase_analytic_plans/i18n/ro.po
+++ b/addons/purchase_analytic_plans/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ru.po b/addons/purchase_analytic_plans/i18n/ru.po
index 4dc00e1792c..d8ff77847e9 100644
--- a/addons/purchase_analytic_plans/i18n/ru.po
+++ b/addons/purchase_analytic_plans/i18n/ru.po
@@ -13,28 +13,28 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr "Аналитическое распределение"
+msgstr "Разнесение аналитики"
 
 #. module: purchase_analytic_plans
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order_line
 msgid "Purchase Order Line"
-msgstr "Позиция заказа на закупку"
+msgstr "Позиция заказа закупки"
 
 #. module: purchase_analytic_plans
 #: model:ir.model,name:purchase_analytic_plans.model_purchase_order
 msgid "Purchase Order"
-msgstr "Заказ на закупку"
+msgstr "Заказ закупки"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Неправильный XML для просмотра архитектуры!"
diff --git a/addons/purchase_analytic_plans/i18n/sl.po b/addons/purchase_analytic_plans/i18n/sl.po
index a4e8b69d47b..ae20efee793 100644
--- a/addons/purchase_analytic_plans/i18n/sl.po
+++ b/addons/purchase_analytic_plans/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/sq.po b/addons/purchase_analytic_plans/i18n/sq.po
index eebdf2a8775..b7e9e12a83e 100644
--- a/addons/purchase_analytic_plans/i18n/sq.po
+++ b/addons/purchase_analytic_plans/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/sr.po b/addons/purchase_analytic_plans/i18n/sr.po
index 57f9b98cf51..69d7f146f25 100644
--- a/addons/purchase_analytic_plans/i18n/sr.po
+++ b/addons/purchase_analytic_plans/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/sr@latin.po b/addons/purchase_analytic_plans/i18n/sr@latin.po
index 9feadf6d282..a88068117b1 100644
--- a/addons/purchase_analytic_plans/i18n/sr@latin.po
+++ b/addons/purchase_analytic_plans/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/sv.po b/addons/purchase_analytic_plans/i18n/sv.po
index f9a1ce3e509..fdae15680c9 100644
--- a/addons/purchase_analytic_plans/i18n/sv.po
+++ b/addons/purchase_analytic_plans/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/tlh.po b/addons/purchase_analytic_plans/i18n/tlh.po
index 80bce85fd97..cb64d7949b4 100644
--- a/addons/purchase_analytic_plans/i18n/tlh.po
+++ b/addons/purchase_analytic_plans/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/tr.po b/addons/purchase_analytic_plans/i18n/tr.po
index 0beab3304e4..4ca09d14dd2 100644
--- a/addons/purchase_analytic_plans/i18n/tr.po
+++ b/addons/purchase_analytic_plans/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/uk.po b/addons/purchase_analytic_plans/i18n/uk.po
index e786f399edd..a0fd1a0a0a0 100644
--- a/addons/purchase_analytic_plans/i18n/uk.po
+++ b/addons/purchase_analytic_plans/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/ur.po b/addons/purchase_analytic_plans/i18n/ur.po
index 09ad8d9d204..32ff8681ec3 100644
--- a/addons/purchase_analytic_plans/i18n/ur.po
+++ b/addons/purchase_analytic_plans/i18n/ur.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/vi.po b/addons/purchase_analytic_plans/i18n/vi.po
index 5b3617b5e67..653c0ea1fda 100644
--- a/addons/purchase_analytic_plans/i18n/vi.po
+++ b/addons/purchase_analytic_plans/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/zh_CN.po b/addons/purchase_analytic_plans/i18n/zh_CN.po
index 63e94502138..54b9b5e49f8 100644
--- a/addons/purchase_analytic_plans/i18n/zh_CN.po
+++ b/addons/purchase_analytic_plans/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/i18n/zh_TW.po b/addons/purchase_analytic_plans/i18n/zh_TW.po
index 4be2d68631a..3e556b92544 100644
--- a/addons/purchase_analytic_plans/i18n/zh_TW.po
+++ b/addons/purchase_analytic_plans/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:48+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
index d224b9800f7..bcc67a2a215 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans_view.xml
@@ -8,10 +8,35 @@
         <field name="inherit_id" ref="purchase.purchase_order_line_form"/>
         <field name="arch" type="xml">
             <field name="account_analytic_id" position="replace">
-                <field name="analytics_id" domain="[('plan_id','&lt;&gt;',False)]"/>
+                <field name="analytics_id"  context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]"/>
             </field>
         </field>
     </record>
 
+    <record model="ir.ui.view" id="purchase_order_form_analytic_inherit">
+        <field name="name">purchase.order.form.analytic.inherit</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_form"/>
+        <field name="arch" type="xml">
+            <field name="account_analytic_id" position="replace">
+                <field name="analytics_id" context="{'journal_id':parent.journal_id}" domain="[('plan_id','&lt;&gt;',False)]"/>
+            </field>
+        </field>
+    </record>
+
+    <!-- inherited view to make the purchase order lines list in the form non-editable
+             for the members of some usability groups -->
+    <record id="view_purchase_order_form_editable_list" model="ir.ui.view">
+        <field name="name">purchase.order.form.editable.list</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_form"/>
+        <field name="groups_id" eval="[(6, 0, [ref('product.group_uom'), ref('purchase.group_analytic_accounting')])]"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='order_line']/tree" position="attributes">
+                <attribute name="editable"/>
+            </xpath>
+        </field>
+    </record>
+
 </data>
 </openerp>
diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py
index 970c85bc08c..8c56f2af9ed 100644
--- a/addons/purchase_double_validation/__openerp__.py
+++ b/addons/purchase_double_validation/__openerp__.py
@@ -20,13 +20,13 @@
 ##############################################################################
 
 {
-    "name" : "Double Validation on Purchases",
-    "version" : "1.1",
+    'name' : 'Double Validation on Purchases',
+    'version' : '1.1',
     'category': 'Purchase Management',
-    "images" : ["images/purchase_validation.jpeg"],
-    "depends" : ["base","purchase"],
-    "author" : 'OpenERP SA',
-    "description": """
+    'images' : ['images/purchase_validation.jpeg'],
+    'depends' : ['base','purchase'],
+    'author' : 'OpenERP SA',
+    'description': """
 Double-validation for purchases exceeding minimum amount.
 =========================================================
 
@@ -34,8 +34,7 @@ This module modifies the purchase workflow in order to validate purchases that
 exceeds minimum amount set by configuration wizard.
     """,
     'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'purchase_double_validation_workflow.xml',
         'purchase_double_validation_installer.xml',
         'purchase_double_validation_view.xml',
@@ -45,11 +44,9 @@ exceeds minimum amount set by configuration wizard.
         'test/purchase_double_validation_demo.yml',
         'test/purchase_double_validation_test.yml'
     ],
-    'demo_xml': [],
+    'demo': [],
     'installable': True,
-    'auto_install': False,
-    'certificate' : '00436592682510544157',
-
+    'auto_install': False
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/purchase_double_validation/board_purchase_view.xml b/addons/purchase_double_validation/board_purchase_view.xml
index 0557963fcb1..c2cc4df88b8 100644
--- a/addons/purchase_double_validation/board_purchase_view.xml
+++ b/addons/purchase_double_validation/board_purchase_view.xml
@@ -3,7 +3,7 @@
     <data>
  
         <record id="purchase_waiting" model="ir.actions.act_window">
-            <field name="name">Purchase Order Waiting Approval</field>
+            <field name="name">Purchase Orders Waiting Approval</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.order</field>
             <field name="view_type">form</field>
@@ -17,7 +17,7 @@
             <field name="inherit_id" ref="purchase.board_purchase_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/board/column/action[@string='Request for Quotations']" position="after">
-                    <action name="%(purchase_waiting)d" string="Purchase Order Waiting Approval"/>
+                    <action name="%(purchase_waiting)d" string="Purchase Orders Waiting Approval"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/purchase_double_validation/i18n/ar.po b/addons/purchase_double_validation/i18n/ar.po
index 5116cf4a0ce..31ee78254a0 100644
--- a/addons/purchase_double_validation/i18n/ar.po
+++ b/addons/purchase_double_validation/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/bg.po b/addons/purchase_double_validation/i18n/bg.po
index 8099983261d..f4456cec37c 100644
--- a/addons/purchase_double_validation/i18n/bg.po
+++ b/addons/purchase_double_validation/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/ca.po b/addons/purchase_double_validation/i18n/ca.po
index c26230fe472..1fc55442390 100644
--- a/addons/purchase_double_validation/i18n/ca.po
+++ b/addons/purchase_double_validation/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/da.po b/addons/purchase_double_validation/i18n/da.po
index 38a343bd939..de216098e25 100644
--- a/addons/purchase_double_validation/i18n/da.po
+++ b/addons/purchase_double_validation/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/de.po b/addons/purchase_double_validation/i18n/de.po
index aca3540fa1a..40e7bf6e065 100644
--- a/addons/purchase_double_validation/i18n/de.po
+++ b/addons/purchase_double_validation/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/es.po b/addons/purchase_double_validation/i18n/es.po
index ecc40131e79..1bf51f4eb18 100644
--- a/addons/purchase_double_validation/i18n/es.po
+++ b/addons/purchase_double_validation/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/es_CR.po b/addons/purchase_double_validation/i18n/es_CR.po
index 09cb15d7d20..8d5ae5124d4 100644
--- a/addons/purchase_double_validation/i18n/es_CR.po
+++ b/addons/purchase_double_validation/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: purchase_double_validation
diff --git a/addons/purchase_double_validation/i18n/es_EC.po b/addons/purchase_double_validation/i18n/es_EC.po
new file mode 100644
index 00000000000..d9ee58b872d
--- /dev/null
+++ b/addons/purchase_double_validation/i18n/es_EC.po
@@ -0,0 +1,72 @@
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:37+0000\n"
+"PO-Revision-Date: 2012-09-17 04:20+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Ecuador) <es_EC@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Purchase Application Configuration"
+msgstr "Configuración de la aplicación de compras"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "Define minimum amount after which puchase is needed to be validated."
+msgstr ""
+"Defina la mínima cantidad a partir de la cual la compra requiere ser "
+"validada."
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: purchase_double_validation
+#: model:ir.actions.act_window,name:purchase_double_validation.action_config_purchase_limit_amount
+#: view:purchase.double.validation.installer:0
+msgid "Configure Limit Amount for Purchase"
+msgstr "Configurar monto límite de compra"
+
+#. module: purchase_double_validation
+#: view:board.board:0
+#: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
+msgid "Purchase Order Waiting Approval"
+msgstr "Orden de compra esperando aprobación"
+
+#. module: purchase_double_validation
+#: view:purchase.double.validation.installer:0
+msgid "res_config_contents"
+msgstr "Configurar Contenidos"
+
+#. module: purchase_double_validation
+#: help:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum amount after which validation of purchase is required."
+msgstr "Importe maximo a partir del cual se requiere validar la compra."
+
+#. module: purchase_double_validation
+#: model:ir.model,name:purchase_double_validation.model_purchase_double_validation_installer
+msgid "purchase.double.validation.installer"
+msgstr "Instalador Componente Doble validación en Compra"
+
+#. module: purchase_double_validation
+#: field:purchase.double.validation.installer,limit_amount:0
+msgid "Maximum Purchase Amount"
+msgstr "Importe máximo de compra"
diff --git a/addons/purchase_double_validation/i18n/fi.po b/addons/purchase_double_validation/i18n/fi.po
index 72ed260b01e..554735ac408 100644
--- a/addons/purchase_double_validation/i18n/fi.po
+++ b/addons/purchase_double_validation/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/fr.po b/addons/purchase_double_validation/i18n/fr.po
index beedd672c5a..284e8fe5818 100644
--- a/addons/purchase_double_validation/i18n/fr.po
+++ b/addons/purchase_double_validation/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/gl.po b/addons/purchase_double_validation/i18n/gl.po
index b47b43a3ba7..bfc2ed5af3a 100644
--- a/addons/purchase_double_validation/i18n/gl.po
+++ b/addons/purchase_double_validation/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/hr.po b/addons/purchase_double_validation/i18n/hr.po
index cb16e93a820..47a4ecab161 100644
--- a/addons/purchase_double_validation/i18n/hr.po
+++ b/addons/purchase_double_validation/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/hu.po b/addons/purchase_double_validation/i18n/hu.po
index 6a15a070da2..16949496447 100644
--- a/addons/purchase_double_validation/i18n/hu.po
+++ b/addons/purchase_double_validation/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/it.po b/addons/purchase_double_validation/i18n/it.po
index b38d86f0cd2..60b4f093e06 100644
--- a/addons/purchase_double_validation/i18n/it.po
+++ b/addons/purchase_double_validation/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/ja.po b/addons/purchase_double_validation/i18n/ja.po
index a91f46164de..490dd378506 100644
--- a/addons/purchase_double_validation/i18n/ja.po
+++ b/addons/purchase_double_validation/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/nl.po b/addons/purchase_double_validation/i18n/nl.po
index 1b66b0a8617..c7ad2d72958 100644
--- a/addons/purchase_double_validation/i18n/nl.po
+++ b/addons/purchase_double_validation/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-01-28 13:55+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/pl.po b/addons/purchase_double_validation/i18n/pl.po
index ec5ecf80a62..5842efc7e95 100644
--- a/addons/purchase_double_validation/i18n/pl.po
+++ b/addons/purchase_double_validation/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/pt.po b/addons/purchase_double_validation/i18n/pt.po
index 1af40a3be42..4ba5123d006 100644
--- a/addons/purchase_double_validation/i18n/pt.po
+++ b/addons/purchase_double_validation/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/pt_BR.po b/addons/purchase_double_validation/i18n/pt_BR.po
index e38d58319fc..04b25658977 100644
--- a/addons/purchase_double_validation/i18n/pt_BR.po
+++ b/addons/purchase_double_validation/i18n/pt_BR.po
@@ -9,13 +9,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 21:05+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/ro.po b/addons/purchase_double_validation/i18n/ro.po
index 3c5e3be9980..48daff7bcc7 100644
--- a/addons/purchase_double_validation/i18n/ro.po
+++ b/addons/purchase_double_validation/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/ru.po b/addons/purchase_double_validation/i18n/ru.po
index 5ef25ecb42c..67e512dd53d 100644
--- a/addons/purchase_double_validation/i18n/ru.po
+++ b/addons/purchase_double_validation/i18n/ru.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
 msgid "Purchase Application Configuration"
-msgstr "Настройка программы закупок"
+msgstr "Настройка приложения закупок"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
@@ -31,7 +31,7 @@ msgstr ""
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
 msgid "title"
-msgstr ""
+msgstr "заглавие"
 
 #. module: purchase_double_validation
 #: field:purchase.double.validation.installer,config_logo:0
@@ -48,7 +48,7 @@ msgstr "Настроить предельную сумму для закупки
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
 msgid "Purchase Order Waiting Approval"
-msgstr ""
+msgstr "Заказ закупки в ожидании утверждения"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/sv.po b/addons/purchase_double_validation/i18n/sv.po
index 503b39217a6..5297f568b41 100644
--- a/addons/purchase_double_validation/i18n/sv.po
+++ b/addons/purchase_double_validation/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/tr.po b/addons/purchase_double_validation/i18n/tr.po
index 5681e095589..a4ff0279686 100644
--- a/addons/purchase_double_validation/i18n/tr.po
+++ b/addons/purchase_double_validation/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
diff --git a/addons/purchase_double_validation/i18n/zh_CN.po b/addons/purchase_double_validation/i18n/zh_CN.po
index 09f70149a7b..a2d74d09d5e 100644
--- a/addons/purchase_double_validation/i18n/zh_CN.po
+++ b/addons/purchase_double_validation/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-07-12 17:47+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-10-25 17:31+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:35+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
@@ -30,7 +30,7 @@ msgstr "定义限定金额后采购需要审核"
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
 msgid "title"
-msgstr "标题"
+msgstr "职位"
 
 #. module: purchase_double_validation
 #: field:purchase.double.validation.installer,config_logo:0
@@ -47,7 +47,7 @@ msgstr "设置采购的限定金额"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:purchase_double_validation.purchase_waiting
 msgid "Purchase Order Waiting Approval"
-msgstr ""
+msgstr "等待审批的采购订单"
 
 #. module: purchase_double_validation
 #: view:purchase.double.validation.installer:0
@@ -67,7 +67,7 @@ msgstr "purchase.double.validation.installer"
 #. module: purchase_double_validation
 #: field:purchase.double.validation.installer,limit_amount:0
 msgid "Maximum Purchase Amount"
-msgstr "限定的采购金额"
+msgstr "最大的采购金额"
 
 #~ msgid "purchase_double_validation"
 #~ msgstr "purchase_double_validation"
diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py
index 6824ef5d725..2ba0ad95e09 100644
--- a/addons/purchase_requisition/__openerp__.py
+++ b/addons/purchase_requisition/__openerp__.py
@@ -18,13 +18,13 @@
 #
 ##############################################################################
 {
-    "name" : "Purchase Requisitions",
-    "version" : "0.1",
-    "author" : "OpenERP SA",
-    "category" : "Purchase Management",
-    "images" : ['images/purchase_requisitions.jpeg'],
-    "website" : "http://www.openerp.com",
-    "description": """
+    'name': 'Purchase Requisitions',
+    'version': '0.1',
+    'author': 'OpenERP SA',
+    'category': 'Purchase Management',
+    'images': ['images/purchase_requisitions.jpeg'],
+    'website': 'http://www.openerp.com',
+    'description': """
 This module allows you to manage your Purchase Requisition.
 ===========================================================
 
@@ -32,24 +32,22 @@ When a purchase order is created, you now have the opportunity to save the
 related requisition. This new object will regroup and will allow you to easily
 keep track and order all your purchase orders.
 """,
-    "depends" : ["purchase","mrp"],
-    "init_xml" : [],
-    "demo_xml" : ['purchase_requisition_demo.xml'],
-    "update_xml" : ["security/purchase_tender.xml",
-                    "wizard/purchase_requisition_partner_view.xml",
-                    "purchase_requisition_data.xml",
-                    "purchase_requisition_view.xml",
-                    "purchase_requisition_report.xml",
-                    "security/ir.model.access.csv","purchase_requisition_sequence.xml"
+    'depends' : ['purchase'],
+    'demo': ['purchase_requisition_demo.xml'],
+    'data': ['security/purchase_tender.xml',
+              'wizard/purchase_requisition_partner_view.xml',
+              'purchase_requisition_data.xml',
+              'purchase_requisition_view.xml',
+              'purchase_requisition_report.xml',
+              'security/ir.model.access.csv','purchase_requisition_sequence.xml'
     ],
-    "auto_install": False,
-    "test":[
-            'test/purchase_requisition_demo.yml',
-            'test/purchase_requisition.yml',
-            'test/cancel_purchase_requisition.yml',
-            ],
-    "installable": True,
-    "certificate" : "001023264099823179629",
+    'auto_install': False,
+    'test': [
+        'test/purchase_requisition_demo.yml',
+        'test/purchase_requisition.yml',
+        'test/cancel_purchase_requisition.yml',
+    ],
+    'installable': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/purchase_requisition/i18n/ar.po b/addons/purchase_requisition/i18n/ar.po
index 781272e92de..eee4ebcf166 100644
--- a/addons/purchase_requisition/i18n/ar.po
+++ b/addons/purchase_requisition/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/bg.po b/addons/purchase_requisition/i18n/bg.po
index 5d3536ef29f..4d21ad87e27 100644
--- a/addons/purchase_requisition/i18n/bg.po
+++ b/addons/purchase_requisition/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:33+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/ca.po b/addons/purchase_requisition/i18n/ca.po
index 10d5e950d25..80e6b6d6977 100644
--- a/addons/purchase_requisition/i18n/ca.po
+++ b/addons/purchase_requisition/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/da.po b/addons/purchase_requisition/i18n/da.po
index 4a77f067d4f..c438167996f 100644
--- a/addons/purchase_requisition/i18n/da.po
+++ b/addons/purchase_requisition/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/de.po b/addons/purchase_requisition/i18n/de.po
index a947c48efff..5f0c536d173 100644
--- a/addons/purchase_requisition/i18n/de.po
+++ b/addons/purchase_requisition/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/es.po b/addons/purchase_requisition/i18n/es.po
index fb747fc0d16..fdb0a31b0ae 100644
--- a/addons/purchase_requisition/i18n/es.po
+++ b/addons/purchase_requisition/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/es_CR.po b/addons/purchase_requisition/i18n/es_CR.po
index 1d09fb33c8d..03a26b1d47a 100644
--- a/addons/purchase_requisition/i18n/es_CR.po
+++ b/addons/purchase_requisition/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: purchase_requisition
diff --git a/addons/purchase_requisition/i18n/fi.po b/addons/purchase_requisition/i18n/fi.po
index 1d80bd3210f..a9161c97efd 100644
--- a/addons/purchase_requisition/i18n/fi.po
+++ b/addons/purchase_requisition/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/fr.po b/addons/purchase_requisition/i18n/fr.po
index 4d2280564f2..89ec8895afa 100644
--- a/addons/purchase_requisition/i18n/fr.po
+++ b/addons/purchase_requisition/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/hr.po b/addons/purchase_requisition/i18n/hr.po
index bed6f4374d5..604919b0eac 100644
--- a/addons/purchase_requisition/i18n/hr.po
+++ b/addons/purchase_requisition/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/hu.po b/addons/purchase_requisition/i18n/hu.po
index dfa654a5105..2245945e355 100644
--- a/addons/purchase_requisition/i18n/hu.po
+++ b/addons/purchase_requisition/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/id.po b/addons/purchase_requisition/i18n/id.po
index 75d69f78ea9..1256487c7d8 100644
--- a/addons/purchase_requisition/i18n/id.po
+++ b/addons/purchase_requisition/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/it.po b/addons/purchase_requisition/i18n/it.po
index d24b608b2f2..f38a445e4fc 100644
--- a/addons/purchase_requisition/i18n/it.po
+++ b/addons/purchase_requisition/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/ja.po b/addons/purchase_requisition/i18n/ja.po
index d28191d4561..019e450164b 100644
--- a/addons/purchase_requisition/i18n/ja.po
+++ b/addons/purchase_requisition/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/nb.po b/addons/purchase_requisition/i18n/nb.po
index 6cea30b7125..8237c36964d 100644
--- a/addons/purchase_requisition/i18n/nb.po
+++ b/addons/purchase_requisition/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/nl.po b/addons/purchase_requisition/i18n/nl.po
index 95553309024..7e49cc93843 100644
--- a/addons/purchase_requisition/i18n/nl.po
+++ b/addons/purchase_requisition/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-13 07:36+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
@@ -26,7 +26,7 @@ msgstr "Orderreferentie moet uniek zijn per bedrijf!"
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "In Progress"
-msgstr "Loopt"
+msgstr "In behandeling"
 
 #. module: purchase_requisition
 #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:42
diff --git a/addons/purchase_requisition/i18n/pl.po b/addons/purchase_requisition/i18n/pl.po
index 89b97f02ec4..e4b47faa2e2 100644
--- a/addons/purchase_requisition/i18n/pl.po
+++ b/addons/purchase_requisition/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/pt.po b/addons/purchase_requisition/i18n/pt.po
index f2dd61ef821..2b3c9cfc56f 100644
--- a/addons/purchase_requisition/i18n/pt.po
+++ b/addons/purchase_requisition/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/pt_BR.po b/addons/purchase_requisition/i18n/pt_BR.po
index d88a5b1d07f..e9be6482fc2 100644
--- a/addons/purchase_requisition/i18n/pt_BR.po
+++ b/addons/purchase_requisition/i18n/pt_BR.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "A Referência do Pedido deve ser única por empresa!"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -64,7 +64,7 @@ msgstr "Status"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Purchase Requisition in negociation"
-msgstr ""
+msgstr "Solicitação de Compra em negociação"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -75,7 +75,7 @@ msgstr "Fornecedor"
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -109,7 +109,7 @@ msgstr "Linha de Requisição de Compra"
 #. module: purchase_requisition
 #: view:purchase.order:0
 msgid "Purchase Orders with requisition"
-msgstr ""
+msgstr "Pedidos de Compra com solicitações"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_product_product
@@ -141,7 +141,7 @@ msgstr ""
 #: code:addons/purchase_requisition/purchase_requisition.py:136
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Alerta"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -183,12 +183,12 @@ msgstr "Voltar para Provisório"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Current Purchase Requisition"
-msgstr ""
+msgstr "Solicitações de Compra Atuais"
 
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_user
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_address_id:0
@@ -223,7 +223,7 @@ msgstr "Quantidade"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Unassigned  Requisition"
-msgstr ""
+msgstr "Solicitação não atribuída"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
@@ -238,6 +238,8 @@ msgid ""
 "You have already one %s purchase order for this partner, you must cancel "
 "this purchase order to create a new quotation."
 msgstr ""
+"Você já tem um %s pedido de compra para este parceiro, você precisa cancelar "
+"este pedido para criar uma nova cotação."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -314,7 +316,7 @@ msgstr "Tipo de Requisição"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
-msgstr ""
+msgstr "Nova Solicitação de Compra"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -349,7 +351,7 @@ msgstr "Parceiros da Requisição de Compra"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Start"
-msgstr ""
+msgstr "Inicio"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -406,7 +408,7 @@ msgstr "Requisição de Compra (exclusiva)"
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
 msgid "Manager"
-msgstr ""
+msgstr "Gerente"
 
 #. module: purchase_requisition
 #: constraint:product.product:0
diff --git a/addons/purchase_requisition/i18n/ro.po b/addons/purchase_requisition/i18n/ro.po
index 0ef87b9b150..730bb54fc77 100644
--- a/addons/purchase_requisition/i18n/ro.po
+++ b/addons/purchase_requisition/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/ru.po b/addons/purchase_requisition/i18n/ru.po
index 8906020512d..84a2e6c37ba 100644
--- a/addons/purchase_requisition/i18n/ru.po
+++ b/addons/purchase_requisition/i18n/ru.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -64,7 +64,7 @@ msgstr "Состояние"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Purchase Requisition in negociation"
-msgstr ""
+msgstr "Запрос закупки в переговорах"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -75,7 +75,7 @@ msgstr "Поставщик"
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "New"
-msgstr ""
+msgstr "Создать"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -109,7 +109,7 @@ msgstr "Позиция запроса на закупку"
 #. module: purchase_requisition
 #: view:purchase.order:0
 msgid "Purchase Orders with requisition"
-msgstr ""
+msgstr "Заказы закупки с запросом"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_product_product
@@ -140,7 +140,7 @@ msgstr ""
 #: code:addons/purchase_requisition/purchase_requisition.py:136
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Предупреждение"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -182,12 +182,12 @@ msgstr "Установить в \"Черновик\""
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Current Purchase Requisition"
-msgstr ""
+msgstr "Текущий запрос закупки"
 
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_user
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_address_id:0
@@ -221,7 +221,7 @@ msgstr "Количество"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Unassigned  Requisition"
-msgstr ""
+msgstr "Нераспределенный запрос"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
@@ -236,6 +236,8 @@ msgid ""
 "You have already one %s purchase order for this partner, you must cancel "
 "this purchase order to create a new quotation."
 msgstr ""
+"У вас уже есть один %s заказ закупки для этого партнёра, вы должны отменить "
+"этот заказ закупки для создания нового запроса цен."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -282,10 +284,10 @@ msgid ""
 "orders.On confirmation of a purchase order it does not cancel the remaining "
 "orders"
 msgstr ""
-"Запрос на закупку (исключительный): при подтверждении заказа на закупку, "
+"Запрос на закупку (исключительный): при подтверждении заказа закупки, "
 "дополнительные заказы отменяются.\n"
-"Запрос на закупку (несколько): позволяет иметь несколько заказов на закупку. "
-"При подтверждении заказа на закупку, дополнительные заказы не отменяются."
+"Запрос на закупку (несколько): позволяет иметь несколько заказов закупки. "
+"При подтверждении заказа закупки, дополнительные заказы не отменяются."
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -296,7 +298,7 @@ msgstr "Отменить заказ на закупку"
 #: model:ir.model,name:purchase_requisition.model_purchase_order
 #: view:purchase.requisition:0
 msgid "Purchase Order"
-msgstr "Заказ на закупку"
+msgstr "Заказ закупки"
 
 #. module: purchase_requisition
 #: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:42
@@ -312,7 +314,7 @@ msgstr "Тип запроса"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
-msgstr ""
+msgstr "Новый запрос на закупку"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -347,7 +349,7 @@ msgstr "Партнер запроса на закупку"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Start"
-msgstr ""
+msgstr "Старт"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -362,7 +364,7 @@ msgstr "Закупка по запросам"
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order
 msgid "Purchase orders"
-msgstr "Заказы на закупку"
+msgstr "Заказы закупки"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -404,12 +406,12 @@ msgstr "Запрос на закупку (исключительный)"
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
 msgid "Manager"
-msgstr ""
+msgstr "Менеджер"
 
 #. module: purchase_requisition
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Ошибка: Неправильный штрих-код"
+msgstr "Ошибка: Неверный штрих-код"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -425,7 +427,7 @@ msgstr "_Отмена"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Confirm Purchase Order"
-msgstr "Подтвердить заказ на закупку"
+msgstr "Подтвердить заказ закупки"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -450,7 +452,7 @@ msgstr "Не назначенный"
 #. module: purchase_requisition
 #: field:purchase.requisition,purchase_ids:0
 msgid "Purchase Orders"
-msgstr "Заказы на закупку"
+msgstr "Заказы закупки"
 
 #~ msgid "Draft"
 #~ msgstr "Черновик"
diff --git a/addons/purchase_requisition/i18n/sv.po b/addons/purchase_requisition/i18n/sv.po
index bd93f247d86..fbeaed5367b 100644
--- a/addons/purchase_requisition/i18n/sv.po
+++ b/addons/purchase_requisition/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
diff --git a/addons/purchase_requisition/i18n/tr.po b/addons/purchase_requisition/i18n/tr.po
index 70cb915cd96..ac0525ef482 100644
--- a/addons/purchase_requisition/i18n/tr.po
+++ b/addons/purchase_requisition/i18n/tr.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Sipariş Kaynağı Her Firma için benzersiz olmalı!"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -64,7 +64,7 @@ msgstr "Durum"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Purchase Requisition in negociation"
-msgstr ""
+msgstr "Satınalma İsteiği Görüşülüyor"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -75,7 +75,7 @@ msgstr "Tedarikçi"
 #: view:purchase.requisition:0
 #: selection:purchase.requisition,state:0
 msgid "New"
-msgstr ""
+msgstr "Yeni"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -109,7 +109,7 @@ msgstr "Satınalma İsteği Kalemi"
 #. module: purchase_requisition
 #: view:purchase.order:0
 msgid "Purchase Orders with requisition"
-msgstr ""
+msgstr "İstenen Satınalma Siparişleri"
 
 #. module: purchase_requisition
 #: model:ir.model,name:purchase_requisition.model_product_product
@@ -141,7 +141,7 @@ msgstr ""
 #: code:addons/purchase_requisition/purchase_requisition.py:136
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Uyarı"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -183,12 +183,12 @@ msgstr "Taslağa Geri Dönüştür"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Current Purchase Requisition"
-msgstr ""
+msgstr "Geçerli Satınalma İsteği"
 
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_user
 msgid "User"
-msgstr ""
+msgstr "Kullanıcı"
 
 #. module: purchase_requisition
 #: field:purchase.requisition.partner,partner_address_id:0
@@ -222,7 +222,7 @@ msgstr "Miktar"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Unassigned  Requisition"
-msgstr ""
+msgstr "Atanmamış İstek"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
@@ -315,7 +315,7 @@ msgstr "İstek Türü"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
-msgstr ""
+msgstr "Yeni Satınalma İsteği"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -350,7 +350,7 @@ msgstr "Satınalma İsteği Paydaşı"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Start"
-msgstr ""
+msgstr "Baslat"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -407,7 +407,7 @@ msgstr "Satınlma İsteği (özel)"
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
 msgid "Manager"
-msgstr ""
+msgstr "Yönetici"
 
 #. module: purchase_requisition
 #: constraint:product.product:0
diff --git a/addons/purchase_requisition/i18n/zh_CN.po b/addons/purchase_requisition/i18n/zh_CN.po
index e491a3e4d66..48d941cbdef 100644
--- a/addons/purchase_requisition/i18n/zh_CN.po
+++ b/addons/purchase_requisition/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-15 13:20+0000\n"
-"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
+"PO-Revision-Date: 2012-10-25 17:29+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: purchase_requisition
 #: sql_constraint:purchase.order:0
@@ -139,7 +139,7 @@ msgstr "勾选选项，请购生成采购申请而不是直接生成询价单"
 #: code:addons/purchase_requisition/purchase_requisition.py:136
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "警告"
 
 #. module: purchase_requisition
 #: report:purchase.requisition:0
@@ -181,7 +181,7 @@ msgstr "重置为草稿"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Current Purchase Requisition"
-msgstr ""
+msgstr "当前的采购请求"
 
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_user
@@ -218,7 +218,7 @@ msgstr "数量"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "Unassigned  Requisition"
-msgstr ""
+msgstr "未指派的请购单"
 
 #. module: purchase_requisition
 #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition
@@ -307,7 +307,7 @@ msgstr "请购类型"
 #. module: purchase_requisition
 #: view:purchase.requisition:0
 msgid "New Purchase Requisition"
-msgstr ""
+msgstr "新的采购申请"
 
 #. module: purchase_requisition
 #: view:purchase.requisition:0
@@ -399,7 +399,7 @@ msgstr "采购申请(排它的)"
 #. module: purchase_requisition
 #: model:res.groups,name:purchase_requisition.group_purchase_requisition_manager
 msgid "Manager"
-msgstr ""
+msgstr "主管"
 
 #. module: purchase_requisition
 #: constraint:product.product:0
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index cf0294730a7..ea2346d3aab 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -31,10 +31,10 @@ import decimal_precision as dp
 class purchase_requisition(osv.osv):
     _name = "purchase.requisition"
     _description="Purchase Requisition"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
     _columns = {
         'name': fields.char('Requisition Reference', size=32,required=True),
-        'origin': fields.char('Source', size=32),
+        'origin': fields.char('Source Document', size=32),
         'date_start': fields.datetime('Requisition Date'),
         'date_end': fields.datetime('Requisition Deadline'),
         'user_id': fields.many2one('res.users', 'Responsible'),
@@ -91,16 +91,16 @@ class purchase_requisition(osv.osv):
         return True
 
     def in_progress_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Draft Requisition has been <b>sent to suppliers</b>."), context=context)
-    
+        self.message_post(cr, uid, ids, body=_("Draft Requisition has been <b>sent to suppliers</b>."), context=context)
+
     def reset_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been set to <b>draft</b>."), context=context)
-     
+        self.message_post(cr, uid, ids, body=_("Purchase Requisition has been set to <b>draft</b>."), context=context)
+
     def done_to_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>done</b>."), context=context)
-        
+        self.message_post(cr, uid, ids, body=_("Purchase Requisition has been <b>done</b>."), context=context)
+
     def cancel_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>cancelled</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Purchase Requisition has been <b>cancelled</b>."), context=context)
 
     def _planned_date(self, requisition, delay=0.0):
         company = requisition.company_id
@@ -177,14 +177,13 @@ class purchase_requisition(osv.osv):
                     'product_uom': default_uom_po_id,
                     'price_unit': seller_price,
                     'date_planned': date_planned,
-                    'notes': product.description_purchase,
                     'taxes_id': [(6, 0, taxes)],
                 }, context=context)
                 
         return res
     
     def create_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Purchase Requisition has been <b>created</b>."), context=context)  
+        return self.message_post(cr, uid, ids, body=_("Purchase Requisition has been <b>created</b>."), context=context)  
 
     def create(self, cr, uid, vals, context=None):
         requisition =  super(purchase_requisition, self).create(cr, uid, vals, context=context)
@@ -194,27 +193,6 @@ class purchase_requisition(osv.osv):
 
 purchase_requisition()
 
-class mail_message(osv.osv):
-    _inherit = 'mail.message'
-    
-    def schedule_with_attach(self, cr, uid, email_from, email_to, subject, body, model=False, email_cc=None,
-                             email_bcc=None, reply_to=False, attachments=None, message_id=False, references=False,
-                             res_id=False, content_subtype='plain', headers=None, mail_server_id=False, auto_delete=False,
-                             context=None):
-        result = super(mail_message, self).schedule_with_attach(cr, uid, email_from, email_to, subject, body, model=model, email_cc=email_cc,
-            email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
-            res_id=res_id, content_subtype=content_subtype, headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
-            context=context)
-        # check model is purchase.order
-        if model and model == 'purchase.order' and res_id:
-            requisition_id = self.pool.get('purchase.order').browse(cr, uid, res_id, context=context).requisition_id
-            if requisition_id:
-                result = self.schedule_with_attach(cr, uid, email_from, email_to, subject, body, model='purchase.requisition', email_cc=email_cc,
-                    email_bcc=email_bcc, reply_to=reply_to, attachments=attachments, message_id=message_id, references=references,
-                    res_id=requisition_id.id, content_subtype=content_subtype, headers=headers, mail_server_id=mail_server_id, auto_delete=auto_delete,
-                    context=context)
-        return result
-
 class purchase_requisition_line(osv.osv):
 
     _name = "purchase.requisition.line"
@@ -229,7 +207,7 @@ class purchase_requisition_line(osv.osv):
         'company_id': fields.related('requisition_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True),
     }
 
-    def onchange_product_id(self, cr, uid, ids, product_id,product_uom_id, context=None):
+    def onchange_product_id(self, cr, uid, ids, product_id, product_uom_id, context=None):
         """ Changes UoM and name if product_id changes.
         @param name: Name of the field
         @param product_id: Changed product_id
@@ -289,16 +267,13 @@ class procurement_order(osv.osv):
     }
     def make_po(self, cr, uid, ids, context=None):
         res = {}
-        sequence_obj = self.pool.get('ir.sequence')
         requisition_obj = self.pool.get('purchase.requisition')
         warehouse_obj = self.pool.get('stock.warehouse')
         procurement = self.browse(cr, uid, ids, context=context)[0]
         if procurement.product_id.purchase_requisition:
-             seq_name = sequence_obj.get(cr, uid, 'purchase.order.requisition')
              warehouse_id = warehouse_obj.search(cr, uid, [('company_id', '=', procurement.company_id.id or company.id)], context=context)
              res[procurement.id] = requisition_obj.create(cr, uid, 
                    {
-                    'name': seq_name,
                     'origin': procurement.origin,
                     'date_end': procurement.date_planned,
                     'warehouse_id':warehouse_id and warehouse_id[0] or False,
diff --git a/addons/purchase_requisition/purchase_requisition_data.xml b/addons/purchase_requisition/purchase_requisition_data.xml
index 98591535f91..4ccc45d1edc 100644
--- a/addons/purchase_requisition/purchase_requisition_data.xml
+++ b/addons/purchase_requisition/purchase_requisition_data.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-    <function
+        <function
             eval="('default',False,'warehouse_id', [('purchase.requisition', False)], ref('stock.warehouse0'), True, False, False, False, True)"
             id="purchase_default_set"
             model="ir.values"
diff --git a/addons/purchase_requisition/purchase_requisition_demo.xml b/addons/purchase_requisition/purchase_requisition_demo.xml
index 3d68a8b612f..21d348c2f0e 100644
--- a/addons/purchase_requisition/purchase_requisition_demo.xml
+++ b/addons/purchase_requisition/purchase_requisition_demo.xml
@@ -37,7 +37,7 @@
 
         <record id="rfq1_line" model="purchase.order.line">
             <field name="order_id" ref="rfq1"/>
-            <field name="name">[HDD3] HDD Seagate 7200.8 160GB</field>
+            <field name="name">[RAM-SR5] RAM DDR SR5</field>
             <field name="date_planned" eval="time.strftime('%Y/%m/10')"/>
             <field name="product_id" ref="product.product_product_13"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
@@ -54,7 +54,7 @@
 
         <record id="rfq2_line" model="purchase.order.line">
             <field name="order_id" ref="rfq2"/>
-            <field name="name">[HDD3] HDD Seagate 7200.8 160GB</field>
+            <field name="name">[RAM-SR5] RAM DDR SR5</field>
             <field name="date_planned" eval="time.strftime('%Y/%m/15')"/>
             <field name="product_id" ref="product.product_product_13"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index 188f81b6cbe..5ee0a007cc9 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -102,8 +102,8 @@
                 </notebook>
             </sheet>
             <div class="oe_chatter">
-                  <field name="message_ids" widget="mail_thread"/>
-                  <field name="message_follower_ids" widget="mail_followers"/>
+              <field name="message_follower_ids" widget="mail_followers"/>
+              <field name="message_ids" widget="mail_thread"/>
             </div> 
             </form>
         </field>
@@ -112,8 +112,8 @@
         <field name="name">purchase.requisition.tree</field>
         <field name="model">purchase.requisition</field>
         <field name="arch" type="xml">
-            <tree fonts="bold:needaction_pending==True" colors="grey:state == 'cancel';red:date_end and date_end&lt;current_date;black:date_end&gt;current_date;" string="Purchase Requisition">
-                <field name="needaction_pending" invisible="1"/>
+            <tree fonts="bold:message_unread==True" colors="grey:state == 'cancel';red:date_end and date_end&lt;current_date;black:date_end&gt;current_date;" string="Purchase Requisition">
+                <field name="message_unread" invisible="1"/>
                 <field name="name"/>
                 <field name="date_start"/>
                 <field name="user_id"/>
@@ -180,12 +180,10 @@
     <record model="ir.ui.view" id="product_normal_form_view_inherit">
         <field name="name">product.form.inherit</field>
         <field name="model">product.product</field>
-        <field name="inherit_id" ref="product.product_normal_form_view"/>
+        <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
         <field name="arch" type="xml">
-            <field name="supply_method" position="after">
-                <group colspan="2" col="2" attrs="{'invisible': [('supply_method','&lt;&gt;','buy')]}">
+            <field name="procure_method" position="before">
                 <field name="purchase_requisition"/>
-                </group>
             </field>
         </field>
     </record>
diff --git a/addons/report_designer/__init__.py b/addons/report_designer/__init__.py
deleted file mode 100644
index 9a3d6d2fbb6..00000000000
--- a/addons/report_designer/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- coding: 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/>.
-#
-##############################################################################
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py
deleted file mode 100644
index 8a8c6c3b7bb..00000000000
--- a/addons/report_designer/__openerp__.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: 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/>.
-#
-##############################################################################
-
-
-{
-    "name" : "Report Designer",
-    "version" : "1.0",
-    "depends" : ["base", "base_setup"],
-    "author" : "OpenERP SA",
-    "category": "Tools",
-    "description": """
-Installer for reporting Hidden.
-===============================
-
-Makes the Reporting Hidden Configuration available from where you can install
-modules like base_report_designer and base_report_creator.
-    """,
-    'website': 'http://www.openerp.com',
-    'init_xml': [],
-    'update_xml': [
-        'security/ir.model.access.csv',
-    ],
-    'demo_xml': [],
-    'installable': True,
-    'auto_install': False,
-    'certificate' : '00764037194670093149',
-    'images': ['images/config_reporting_Hidden.jpeg'],
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_designer/i18n/ar.po b/addons/report_designer/i18n/ar.po
deleted file mode 100644
index 5517cd056ca..00000000000
--- a/addons/report_designer/i18n/ar.po
+++ /dev/null
@@ -1,98 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2012-01-12 05:50+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "تهيئة"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "الاسم"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "صورة"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "مصمم تقارير اوبن اوفيس"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr ""
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "سير الإعدادات"
diff --git a/addons/report_designer/i18n/bg.po b/addons/report_designer/i18n/bg.po
deleted file mode 100644
index 93735a75ae7..00000000000
--- a/addons/report_designer/i18n/bg.po
+++ /dev/null
@@ -1,102 +0,0 @@
-# Bulgarian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-03-21 08:25+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian <bg@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Настройка на Инструмент за отчети"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Строител на заявки"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Настройване"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "заглавие"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Изображение"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Дизайнер на отчети за OpenOffice"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Интрументи за отчитане"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"Вградените възможности за изготване на отчети в OpenERP могат да бъдат "
-"подобрявани с някои от следните приложения"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Настройване на инструменти за отчети"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Инсталатор за избор на инструменти за отчети\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Прогрес на настройките"
diff --git a/addons/report_designer/i18n/ca.po b/addons/report_designer/i18n/ca.po
deleted file mode 100644
index 8d92a6b9921..00000000000
--- a/addons/report_designer/i18n/ca.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-06 00:48+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan <ca@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Configuració eines d'informes"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Constructor de consultes"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Configura"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "títol"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "dissenyador_informes.instal·lador"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Imatge"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Dissenyador d'informes OpenOffice"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Eines d'informes"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"Les capacitats de generació d'informes incorporades a OpenERP poden ser "
-"millorades encara més amb algunes de les següents aplicacions"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Configureu les eines d'informes"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Permet crear qualsevol informe estadístic sobre diversos objectes. És un "
-"generador de consultes SQL i un visualitzador per als usuaris finals."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Afegeix assistents per importar/exportar informes .SXW que podeu modificar "
-"amb OpenOffice. Una vegada l'heu modificat, podeu pujar l'informe amb el "
-"mateix assistent."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Instal·lador de diverses eines d'informes\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progrés de la configuració"
diff --git a/addons/report_designer/i18n/da.po b/addons/report_designer/i18n/da.po
deleted file mode 100644
index 7132998ff25..00000000000
--- a/addons/report_designer/i18n/da.po
+++ /dev/null
@@ -1,98 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2012-01-27 06:38+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr ""
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr ""
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr ""
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
diff --git a/addons/report_designer/i18n/de.po b/addons/report_designer/i18n/de.po
deleted file mode 100644
index 0ddb3baf445..00000000000
--- a/addons/report_designer/i18n/de.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# German 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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-13 16:55+0000\n"
-"Last-Translator: silas <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Konfiguration Reporting Tools"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Abfrage Generator"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Konfigurieren"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "Titel"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Bild"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "OpenOffice Report Designer"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Reporting Tools"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"Die bereits in OpenERP vorhandene Funktion für die Anpassung von Reports "
-"kann durch folgende Anwendungen erweitert bzw. verbessert werden."
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Konfiguration der Anwendungen für das Reportdesign"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Ermöglicht die Generierung beliebiger Auswertungen für diverse OpenERP "
-"Objekte. Es handelt sich bei diesem Modul um einen SQL Abfragegenerator "
-"sowie einen Datenbrowser für die Benutzer."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Ergänzt einen Assistenten für den Import/Export von .sxw Dateien, die Sie "
-"einfach über OpenOffice Writer anpassen können. Anschliessend können Sie die "
-"geänderte Datei einfach wieder hochladen und den angepassten Report benutzen."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Assistent zur Installation der Reporting Tools.\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Abfolge Konfiguration"
diff --git a/addons/report_designer/i18n/el.po b/addons/report_designer/i18n/el.po
deleted file mode 100644
index bd6f1f13a46..00000000000
--- a/addons/report_designer/i18n/el.po
+++ /dev/null
@@ -1,101 +0,0 @@
-# Greek 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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-08 19:48+0000\n"
-"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Παραμετροποίηση Εργαλείων Αναφορών"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Κατασκευαστής Ερωτημάτων"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Παραμετροποίησε"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "τίτλος"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Εικόνα"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Σχεδιαστής αναφορών OpenOffice"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Εργαλεία Αναφορών"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Παραμετροποίηση τα Εργαλεία Αναφορών"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Σας επιτρέπει να δημιουργήσετε τις στατιστικές αναφορές σχετικά με διάφορα "
-"αντικείμενα. Είναι ένας κατασκευαστής ερωτημάτων SQL και πρόγραμμα "
-"περιήγησης για τους τελικούς χρήστες."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Πρόοδος Ρυθμίσεων"
diff --git a/addons/report_designer/i18n/es.po b/addons/report_designer/i18n/es.po
deleted file mode 100644
index b3d4461fa59..00000000000
--- a/addons/report_designer/i18n/es.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-28 09:04+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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Configuración herramientas de informes"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Constructor de consultas"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "diseñador_informes.instalador"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Diseñador de informes OpenOffice"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Herramientas de informes"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"Las capacidades de generación de informes incorporadas en OpenERP pueden ser "
-"mejoradas aún más con algunas de las siguientes aplicaciones"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Configure las herramientas de informes"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Permite crear cualquier informe estadístico sobre varios objetos. Es un "
-"generador de consultas SQL y un visualizador para los usuarios finales."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Añade asistentes para importar/exportar informes .SXW que puede modificar en "
-"OpenOffice. Una vez que lo haya modificado, puede subir el informe con el "
-"mismo asistente."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Instalador de varias herramientas de informes\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
diff --git a/addons/report_designer/i18n/es_CR.po b/addons/report_designer/i18n/es_CR.po
deleted file mode 100644
index 9a78c79006e..00000000000
--- a/addons/report_designer/i18n/es_CR.po
+++ /dev/null
@@ -1,109 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2012-02-17 00:32+0000\n"
-"Last-Translator: Carlos Vásquez (CLEARCORP) "
-"<carlos.vasquez@clearcorp.co.cr>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"Language: es\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Configuración herramientas de informes"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Constructor de consultas"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "diseñador_informes.instalador"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Diseñador de informes OpenOffice"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Herramientas de informes"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"Las capacidades de generación de informes incorporadas en OpenERP pueden ser "
-"mejoradas aún más con algunas de las siguientes aplicaciones"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Configure las herramientas de informes"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Permite crear cualquier informe estadístico sobre varios objetos. Es un "
-"generador de consultas SQL y un visualizador para los usuarios finales."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Añade asistentes para importar/exportar informes .SXW que puede modificar en "
-"OpenOffice. Una vez que lo haya modificado, puede subir el informe con el "
-"mismo asistente."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Instalador de varias herramientas de informes\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
diff --git a/addons/report_designer/i18n/es_MX.po b/addons/report_designer/i18n/es_MX.po
deleted file mode 100644
index f6105aff7ce..00000000000
--- a/addons/report_designer/i18n/es_MX.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-28 09:04+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: 2011-09-05 05:57+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Configuración herramientas de informes"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Constructor de consultas"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "diseñador_informes.instalador"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Diseñador de informes OpenOffice"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Herramientas de informes"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"Las capacidades de generación de informes incorporadas en OpenERP pueden ser "
-"mejoradas aún más con algunas de las siguientes aplicaciones"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Configure las herramientas de informes"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Permite crear cualquier informe estadístico sobre varios objetos. Es un "
-"generador de consultas SQL y un visualizador para los usuarios finales."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Añade asistentes para importar/exportar informes .SXW que puede modificar en "
-"OpenOffice. Una vez que lo haya modificado, puede subir el informe con el "
-"mismo asistente."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Instalador de varias herramientas de informes\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
diff --git a/addons/report_designer/i18n/es_VE.po b/addons/report_designer/i18n/es_VE.po
deleted file mode 100644
index f6105aff7ce..00000000000
--- a/addons/report_designer/i18n/es_VE.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-28 09:04+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: 2011-09-05 05:57+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Configuración herramientas de informes"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Constructor de consultas"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "diseñador_informes.instalador"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Diseñador de informes OpenOffice"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Herramientas de informes"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"Las capacidades de generación de informes incorporadas en OpenERP pueden ser "
-"mejoradas aún más con algunas de las siguientes aplicaciones"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Configure las herramientas de informes"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Permite crear cualquier informe estadístico sobre varios objetos. Es un "
-"generador de consultas SQL y un visualizador para los usuarios finales."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Añade asistentes para importar/exportar informes .SXW que puede modificar en "
-"OpenOffice. Una vez que lo haya modificado, puede subir el informe con el "
-"mismo asistente."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Instalador de varias herramientas de informes\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso configuración"
diff --git a/addons/report_designer/i18n/fi.po b/addons/report_designer/i18n/fi.po
deleted file mode 100644
index 555731b685a..00000000000
--- a/addons/report_designer/i18n/fi.po
+++ /dev/null
@@ -1,100 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-06-14 09:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Raporttityökalujen konfiguraatio"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Kyselyn rakentaja"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Konfiguroi"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "otsikko"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Kuva"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "OpenOffice raporttisuunnittelija"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Raportointityökalut"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"OpenERP:in sisäänrakennettuja raportointimahdollisuuksia voidaan edelleen "
-"parantaa käyttämällä seuraavia ohjelmia"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Konfiguroi raportointyökalut"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Konfiguraation eteneminen"
diff --git a/addons/report_designer/i18n/fr.po b/addons/report_designer/i18n/fr.po
deleted file mode 100644
index b8a5e5dc9d0..00000000000
--- a/addons/report_designer/i18n/fr.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-18 16:43+0000\n"
-"Last-Translator: Quentin THEURET <Unknown>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Configuration des outils de rapports"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Constructeur de requête"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Configurer"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "titre"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Image"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Outil de conception des rapports d'OpenOffice"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Outils de reporting"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"Les capacités de reporting internes à OpenERP peuvent être améliorées avec "
-"quelques-unes des applications suivantes"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Configurer l'outil de rapport"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Vous permet de créer n'importe quel rapport statistique sur plusieurs "
-"objets. C'est un outil pour créer des requêtes SQL et un navigateur pour les "
-"utilisateurs finaux."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Ajoute un assistant pour importer/exporter des rapports .SXW que vous pouvez "
-"modifier avec OpenOffice. Une fois modifié, vous pouvez uploadez le rapport "
-"avec le même assistant."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Installeur pour la sélection des outils de reporting\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progression de la Configuration"
diff --git a/addons/report_designer/i18n/gl.po b/addons/report_designer/i18n/gl.po
deleted file mode 100644
index df6d23f578f..00000000000
--- a/addons/report_designer/i18n/gl.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-05-10 15:17+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Galician <gl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Configuración ferramentas de informes"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Construtor de Consulta"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "título"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "deseñador_informes.instalador"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Imaxe"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Deseñador de informes OpenOffice"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Ferramentas de informes"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"As capacidades de xeración de informes incorporadas en OpenERP pódense "
-"mellorar aínda máis con algunhas das seguintes aplicacións"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Configure as ferramentas de informes"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Permite crear calquera informe estatístico sobre varios obxectos. É un "
-"xerador de consultas SQL e un visualizador para os usuarios finais."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Engade asistentes para importar/exportar informes .SXW que pode modificar en "
-"OpenOffice. Despois de que o teña modificado, pode subir o informe co mesmo "
-"asistente."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Instalador de varias ferramentas de informes\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso da configuración"
diff --git a/addons/report_designer/i18n/hr.po b/addons/report_designer/i18n/hr.po
deleted file mode 100644
index a51c5b5e929..00000000000
--- a/addons/report_designer/i18n/hr.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-12-12 07:38+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
-"Language-Team: Croatian <hr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Konfiguracija alata za izvještavanje"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Kreiranje upita"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Postavke"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "naziv"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Slika"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Dizajner OpenOffice izvještaja"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Alati za izvještavanje"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"OpenERP ugrađene mogućnosti mogu se dodatno nadograditi sa sljedećim "
-"aplikacijama"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Konfiguriraj alate za izvještavanje"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Dozvoljava vam kreiranje statističkih izvješća na nekoliko objekata. Radi se "
-"o SQL kreatoru upita i pregledniku za kranje korisnike."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Dodaje asistenta za uvoz/izvoz .SXW izvještaja koje možete mijenjati u "
-"OpenOfficeu. Kada ga promjenite možete uploadati izvještaj koristeći isti "
-"asistent."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Instaler za odabir alata za izvještanje.\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Napredak konfiguracije"
diff --git a/addons/report_designer/i18n/hu.po b/addons/report_designer/i18n/hu.po
deleted file mode 100644
index 4487e86dbce..00000000000
--- a/addons/report_designer/i18n/hu.po
+++ /dev/null
@@ -1,103 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * report_designer
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-24 23:25+0000\n"
-"Last-Translator: Csaba TOTH <csaba.toth@i3rendszerhaz.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Jelentés Készítő Eszközök Beállításai"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Lekérdezés készítő"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Beállítás"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "cím"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Kép"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "OpenOffice.org Jelentés Tervező"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Jelentés készítő eszközök"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"OpenERP beépített jelentés készítő lehetőségei továbbfejleszthetőek az "
-"alábbi programokkal"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Jelentő eszközök beállítása"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Lehetőséget ad létrehozni bármilyen statikus jelentést többféle objektumon. "
-"Ez valójában egy SQL lekérdezés készítő és adat böngésző végfelhasználóknak."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Telepítő a jelentő eszközök választásaihoz\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Beállítási folyamat"
diff --git a/addons/report_designer/i18n/it.po b/addons/report_designer/i18n/it.po
deleted file mode 100644
index 553a4dbca93..00000000000
--- a/addons/report_designer/i18n/it.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Italian 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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-13 19:57+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Configurazione strumenti di reportistica"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Costruttore di Query"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Configura"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "titolo"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Immagine"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Report Designer di OpenOffice"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Strumenti di reportistica"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"Le capacità di reportistica incorporate in OpenERP possono essere migliorate "
-"ancora di più usando alcune delle seguenti applicazioni"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Configura gli strumenti di reportistica"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Permette di creare qualsiasi statistica su parecchi oggetti. E' un "
-"costruttore di Query ed un browser per utenti filnali."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Aggiunge wizard per importare / esportare report SXW che potete modificare "
-"in OpenOffice. Una volta che li avete modificati è possibile reimportarlo "
-"utilizzando lo stesso wizard."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Installatore per la selezione degli strumenti di reportistica\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Avanzamento configurazione"
diff --git a/addons/report_designer/i18n/ja.po b/addons/report_designer/i18n/ja.po
deleted file mode 100644
index 1864682043c..00000000000
--- a/addons/report_designer/i18n/ja.po
+++ /dev/null
@@ -1,103 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2012-06-15 22:44+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "レポートツールの設定"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "クエリビルダー"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "設定"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "タイトル"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "画像"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "OpenOfficeレポートデザイナ"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "レポートツール"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr "OpenERPの組み込みレポートの能力は次のアプリケーションの幾つかの機能をさらに改良します。"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "レポートツールの設定"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr "幾つかのオブジェクト上に任意の統計レポートを作成できます。それはエンドユーザのためのSQLクエリービルダーとブラウザです。"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-".SXWレポートのインポート / "
-"エクスポートするためのウィザードを追加します。これはOpenOfficeの変更を行うことができます。これを変更した後、同じウィザードを使ってレポートをアッ"
-"プロードできます。"
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"レポートツールを選択するためのインストーラ\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "設定の進行状況"
diff --git a/addons/report_designer/i18n/mn.po b/addons/report_designer/i18n/mn.po
deleted file mode 100644
index ea687af3b47..00000000000
--- a/addons/report_designer/i18n/mn.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Mongolian 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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-21 13:53+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Тайлангийн Хэрэгслийн Тохиргоо"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Асуулга Бүтээгч"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Тохируулах"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "гарчиг"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "OpenOffice Тайлан Дизайнер"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Тайлангийн Хэрэгслүүд"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"OpenERP-н салшгүй хэсэг болсон тайлангийн боломжууд нь дараах "
-"аппликэшнуудтай илүү сайжрах боломжтой."
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Тайлангийн Хэрэгслүүдийг Тохируулах"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Хэд хэдэн объект дээр аливаа статистик тайлан үүсгэх боломжийг хангана. Энэ "
-"нь эцсийн хэрэглэгчид зориулсан SQL асуулга үүсгэгч бөгөөд хөтөч юм."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Тайлангийн хэрэгсэлд зориулагдсан суулгац\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Тохиргооны явц"
diff --git a/addons/report_designer/i18n/nb.po b/addons/report_designer/i18n/nb.po
deleted file mode 100644
index 7588e22537c..00000000000
--- a/addons/report_designer/i18n/nb.po
+++ /dev/null
@@ -1,98 +0,0 @@
-# Norwegian Bokmal translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2012-07-24 20:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Norwegian Bokmal <nb@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Konfigurasjon rapportverktøy"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Avansert søk"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Konfigurer"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "tittel"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Bilde"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "OpenOffice Rapport Designer"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Rapport verktøy"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Konfigurer rapportverktøy"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Konfigurasjonsprosess"
diff --git a/addons/report_designer/i18n/nl.po b/addons/report_designer/i18n/nl.po
deleted file mode 100644
index 645d3db98c6..00000000000
--- a/addons/report_designer/i18n/nl.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-24 07:37+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Rapportage gereedschap configuratie"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Zoekopdracht bouwer"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Configureren"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "titel"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Afbeelding"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "OpenOffice overzicht ontwerper"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Rapportage gereedschappen"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"OpenERP's ingebouwde rapportage mogelijkheden kunnen verder worden verbeterd "
-"met sommige van de volgende applicaties"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Rapportage gereedschappen configureren"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Laat u elk statistisch overzicht maken van enkele objecten. Het is een SQL "
-"zoekopdracht bouwer en browser voor eindgebruikers."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Voegt assistenten toe voor Import/Export van .SXW overzichten die u kunt "
-"wijzigen in OpenOffice. Na wijziging kunt u de overzichten met dezelfde "
-"assistent weer uploaden."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Installatie van geselecteerde rapportage gereedschappen\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Configuratievoortgang"
diff --git a/addons/report_designer/i18n/pt.po b/addons/report_designer/i18n/pt.po
deleted file mode 100644
index e9ddc3f5c11..00000000000
--- a/addons/report_designer/i18n/pt.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-12-12 10:01+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Configuração das ferramentas para relatórios"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Construtor de pesquisas"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "Título"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Imagem"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Designer de Relatórios OpenOffice"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Ferramentas para Relatórios"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"As capacidades de relatórios do OpenERP pode ser melhoradas através das "
-"seguintes aplicações"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Configure as Ferramentas de Relatórios"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Permiti-lhe criar relatórios de estatística sobre diversos objectos. É um "
-"construtor de comandos SQL que permite a navegação na informação para "
-"utilizadores finais."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Adiciona configuradores ao relatório .SXW de Importação/Exportação que pode "
-"modificar no OpenOffice. Após tê-lo modificado, pode enviar o relatório "
-"utilizando o mesmo configurador."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Instalador para a selecção de ferramentas de relatórios\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progresso da Configuração"
diff --git a/addons/report_designer/i18n/pt_BR.po b/addons/report_designer/i18n/pt_BR.po
deleted file mode 100644
index caf79c7b74b..00000000000
--- a/addons/report_designer/i18n/pt_BR.po
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-16 18:04+0000\n"
-"Last-Translator: Emerson <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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Configuração das Ferramentas de Relatório"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Construtor de Consulta"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Configurar"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "Título"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Imagem"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Gerador de Relatórios OpenOffice"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Ferramentas de Relatório"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Configurar Ferramentas de Relatório"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Permite criar qualquer relatório de estatísticas em inúmeros objetos. Trata-"
-"se de um Navegador e Construtor de Consultas SQL para usuários finais."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Adiciona assistentes de Importação/Exportação de relatórios .SXW que você "
-"pode alterar no OpenOffice. Uma vez que você modificá-lo poderá fazer um "
-"upload do relatório usando este mesmo assistente."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Instalador para seleção de ferramentas de relatório\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Configuração em Progresso"
diff --git a/addons/report_designer/i18n/report_designer.pot b/addons/report_designer/i18n/report_designer.pot
deleted file mode 100644
index a02b6655dfd..00000000000
--- a/addons/report_designer/i18n/report_designer.pot
+++ /dev/null
@@ -1,89 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* report_designer
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:15:59+0000\n"
-"PO-Revision-Date: 2011-01-11 11:15:59+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: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr ""
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr ""
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "OpenERP's built-in reporting abilities can be improved even further with some of the following applications"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr ""
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid "Allows you to create any statistic reports  on several objects. It's a SQL query builder and browser for end users."
-msgstr ""
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid "Adds wizards to Import/Export .SXW report which you can modify in OpenOffice.Once you have modified it you can upload the report using the same wizard."
-msgstr ""
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid "Installer for reporting tools selection\n"
-"    "
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
diff --git a/addons/report_designer/i18n/ro.po b/addons/report_designer/i18n/ro.po
deleted file mode 100644
index 5f651f3f47a..00000000000
--- a/addons/report_designer/i18n/ro.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-02-21 11:17+0000\n"
-"Last-Translator: Dorin <dhongu@gmail.com>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Configurare Unelte Raportare"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Creator intrebari"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Configureaza"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "titlu"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer (program_de_instalare.proiectant_raport)"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Imagine"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Proiectant Raport OpenOffice"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Unelte raportare"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"Abilitătile de raportare integrate ale lui OpenERP pot fi imbunatatite si "
-"mai mult cu cateva dintre următoarele aplicatii"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Configurare unelte raportare"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Va permite să creati orice rapoarte statistice despre diverse obiecte. Este "
-"un creator de intrebari SQL si browser pentru utilizatorii finali."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Adauga asistenti pentru Importul/Exportul raportului .SXW pe care il puteti "
-"modifica in OpenOffice. Odată ce l-ati modificat, puteti incarca raportul "
-"folosind acelasi asistent."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Programul de instalare pentru raportarea selectiei uneltelor\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Progres configurare"
diff --git a/addons/report_designer/i18n/ru.po b/addons/report_designer/i18n/ru.po
deleted file mode 100644
index 8e3b51e6288..00000000000
--- a/addons/report_designer/i18n/ru.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Russian 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: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-01 12:53+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Настройка генератора отчетов"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Конструктор запроса"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Настройка"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "title"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Изображение"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "Конструктор отчетов OpenOffice"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Генератор отчетов"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"Встроенные в OpenERP возможности генерации отчётов могут быть улучшены с "
-"помощью одного из следующих приложений"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Настроить генератор отчётов"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Позволяет создавать любые статистический отчёты по множеству объектов. Это "
-"конструктор запросов и обозреватель SQL для конечных пользователей."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"Добавляет мастера Импорта и Экспорта отчётов .SXW, которые можно изменять с "
-"помощью OpenOffice. Единожды изменённый, отчёт может быть загружен обратно с "
-"помощью того же мастера."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Установщик инструментария отчётов\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Выполнение настройки"
diff --git a/addons/report_designer/i18n/sv.po b/addons/report_designer/i18n/sv.po
deleted file mode 100644
index 6b4b6cffb84..00000000000
--- a/addons/report_designer/i18n/sv.po
+++ /dev/null
@@ -1,98 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2010-11-27 14:41+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Rapportverktygskonfigurering"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Frågebyggare"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Inställningar"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "titel"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Avbildning"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "OpenOffice report designer"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Rapportverktyg"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr ""
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Konfigurationsförlopp"
diff --git a/addons/report_designer/i18n/th.po b/addons/report_designer/i18n/th.po
deleted file mode 100644
index 601df55d61c..00000000000
--- a/addons/report_designer/i18n/th.po
+++ /dev/null
@@ -1,98 +0,0 @@
-# Thai translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-11-17 07:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Thai <th@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr ""
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr ""
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr ""
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
diff --git a/addons/report_designer/i18n/tr.po b/addons/report_designer/i18n/tr.po
deleted file mode 100644
index 760b7f04538..00000000000
--- a/addons/report_designer/i18n/tr.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-06-09 19:02+0000\n"
-"Last-Translator: Ayhan KIZILTAN <Unknown>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "Raporlama Araçları Yapılandırması"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "Sorgu Oluşturucu"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "Yapılandır"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "unvan"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "rapor_tasarımcı.kurulum"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "Resim"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "OpenOffice Rapor Tasarımcısı"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "Rapormala Araçları"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr ""
-"OpenERP'nin içindeki raporlama becerileri aşağıdaki uygulamalarla "
-"geliştirilebilir"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "Raporlama Araçlarını Yapılandır"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr ""
-"Birçok nesne üstünde istatistiksel raporlar oluşturmanıza olanak sağlar. Son "
-"kullanıcı için yapılmış bir SQL sorgu üretici ve tarayıcısıdır."
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr ""
-"OpenOffice ile düzenleyebileceğiniz .SXW raporlarını sisteme yüklemek için "
-"bir sihirbaz ekler. OpenOffice içinden şablonları indirip düzenleyip tekrar "
-"sisteme yükleyebilirsiniz."
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"Raporlama araçları seçimi için yükleyici\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "Yapılandırma Gelişimi"
diff --git a/addons/report_designer/i18n/zh_CN.po b/addons/report_designer/i18n/zh_CN.po
deleted file mode 100644
index 23f97ed1e48..00000000000
--- a/addons/report_designer/i18n/zh_CN.po
+++ /dev/null
@@ -1,100 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-07-13 14:46+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_designer
-#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
-#: view:report_designer.installer:0
-msgid "Reporting Tools Configuration"
-msgstr "报告工具设置"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_creator:0
-msgid "Query Builder"
-msgstr "建立查询"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure"
-msgstr "设置"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "title"
-msgstr "标题"
-
-#. module: report_designer
-#: model:ir.model,name:report_designer.model_report_designer_installer
-msgid "report_designer.installer"
-msgstr "report_designer.installer"
-
-#. module: report_designer
-#: field:report_designer.installer,config_logo:0
-msgid "Image"
-msgstr "图像"
-
-#. module: report_designer
-#: field:report_designer.installer,base_report_designer:0
-msgid "OpenOffice Report Designer"
-msgstr "OpenOffice报表设计"
-
-#. module: report_designer
-#: model:ir.module.module,shortdesc:report_designer.module_meta_information
-msgid "Reporting Tools"
-msgstr "报告工具"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid ""
-"OpenERP's built-in reporting abilities can be improved even further with "
-"some of the following applications"
-msgstr "系统有内建报告能力可以在未来改善以下是一些应用"
-
-#. module: report_designer
-#: view:report_designer.installer:0
-msgid "Configure Reporting Tools"
-msgstr "设置报告工具"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_creator:0
-msgid ""
-"Allows you to create any statistic reports  on several objects. It's a SQL "
-"query builder and browser for end users."
-msgstr "允许您创建几个对象的统计报表。它是一个SQL查询生成器和给最终用户浏览。"
-
-#. module: report_designer
-#: help:report_designer.installer,base_report_designer:0
-msgid ""
-"Adds wizards to Import/Export .SXW report which you can modify in "
-"OpenOffice.Once you have modified it you can upload the report using the "
-"same wizard."
-msgstr "增加向导去导入/导出.SXW报表您也可以在OpenOffice里修改。一旦修改您也能使用该向导上传报表。"
-
-#. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid ""
-"Installer for reporting tools selection\n"
-"    "
-msgstr ""
-"安装选择的报告工具\n"
-"    "
-
-#. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
-msgstr "设置进度"
diff --git a/addons/report_designer/security/ir.model.access.csv b/addons/report_designer/security/ir.model.access.csv
deleted file mode 100644
index 4a08a4aa60d..00000000000
--- a/addons/report_designer/security/ir.model.access.csv
+++ /dev/null
@@ -1 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py
index 8d980c51f4f..0fa57977db1 100644
--- a/addons/report_intrastat/__openerp__.py
+++ b/addons/report_intrastat/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Intrastat Reporting',
     'version': '1.0',
-    "category": 'Accounting & Finance',
+    'category': 'Accounting & Finance',
     'description': """
 A module that adds intrastat reports.
 =====================================
@@ -33,17 +33,16 @@ European Union.""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['base', 'product', 'stock', 'sale', 'purchase'],
-    'init_xml': ['report_intrastat_data.xml'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'report_intrastat_view.xml',
-        'intrastat_report.xml'
+        'intrastat_report.xml',
+        'report_intrastat_data.xml'
     ],
-    'demo_xml': [],
+    'demo': [],
     'test': ['test/report_intrastat_report.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0056982189085',
     'images': ['images/country_intrastat_code.jpeg','images/intrastat_code.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_intrastat/i18n/ar.po b/addons/report_intrastat/i18n/ar.po
index 29c6c1038be..8f7ea82dca1 100644
--- a/addons/report_intrastat/i18n/ar.po
+++ b/addons/report_intrastat/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/bg.po b/addons/report_intrastat/i18n/bg.po
index 70a57e2450a..0c11e3d72a5 100644
--- a/addons/report_intrastat/i18n/bg.po
+++ b/addons/report_intrastat/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/bs.po b/addons/report_intrastat/i18n/bs.po
index 028b374a5d2..5b9612e65e2 100644
--- a/addons/report_intrastat/i18n/bs.po
+++ b/addons/report_intrastat/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/ca.po b/addons/report_intrastat/i18n/ca.po
index 9e5c0aaa177..e546d98c06d 100644
--- a/addons/report_intrastat/i18n/ca.po
+++ b/addons/report_intrastat/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/cs.po b/addons/report_intrastat/i18n/cs.po
index 2ebe93d3f29..df2534d8379 100644
--- a/addons/report_intrastat/i18n/cs.po
+++ b/addons/report_intrastat/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/da.po b/addons/report_intrastat/i18n/da.po
index bb91a6bc5b4..5fa7699db60 100644
--- a/addons/report_intrastat/i18n/da.po
+++ b/addons/report_intrastat/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/de.po b/addons/report_intrastat/i18n/de.po
index b5a627fc838..d43a4dfd971 100644
--- a/addons/report_intrastat/i18n/de.po
+++ b/addons/report_intrastat/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/es.po b/addons/report_intrastat/i18n/es.po
index 7385bc62ee9..ebdcad9cf5a 100644
--- a/addons/report_intrastat/i18n/es.po
+++ b/addons/report_intrastat/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/es_AR.po b/addons/report_intrastat/i18n/es_AR.po
index 902031309e4..92738a670f1 100644
--- a/addons/report_intrastat/i18n/es_AR.po
+++ b/addons/report_intrastat/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/es_CR.po b/addons/report_intrastat/i18n/es_CR.po
index 0ace3842141..f54e677e847 100644
--- a/addons/report_intrastat/i18n/es_CR.po
+++ b/addons/report_intrastat/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/et.po b/addons/report_intrastat/i18n/et.po
index 31884c296a0..415013c8bd4 100644
--- a/addons/report_intrastat/i18n/et.po
+++ b/addons/report_intrastat/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/fi.po b/addons/report_intrastat/i18n/fi.po
index 76cdddde287..82a589334d7 100644
--- a/addons/report_intrastat/i18n/fi.po
+++ b/addons/report_intrastat/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/fr.po b/addons/report_intrastat/i18n/fr.po
index 6bf5b5ad213..0460197bf32 100644
--- a/addons/report_intrastat/i18n/fr.po
+++ b/addons/report_intrastat/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/hr.po b/addons/report_intrastat/i18n/hr.po
index aa2b536eff7..2f05542abeb 100644
--- a/addons/report_intrastat/i18n/hr.po
+++ b/addons/report_intrastat/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/hu.po b/addons/report_intrastat/i18n/hu.po
index 4a9ebdfa790..0fcd1f8ee10 100644
--- a/addons/report_intrastat/i18n/hu.po
+++ b/addons/report_intrastat/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/id.po b/addons/report_intrastat/i18n/id.po
index f3758ae4ba7..a8a5d86fb9e 100644
--- a/addons/report_intrastat/i18n/id.po
+++ b/addons/report_intrastat/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/it.po b/addons/report_intrastat/i18n/it.po
index 6620eae866c..591a9069477 100644
--- a/addons/report_intrastat/i18n/it.po
+++ b/addons/report_intrastat/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/ja.po b/addons/report_intrastat/i18n/ja.po
index de1cb263ff4..d1fe007f783 100644
--- a/addons/report_intrastat/i18n/ja.po
+++ b/addons/report_intrastat/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/ko.po b/addons/report_intrastat/i18n/ko.po
index d3637700d02..19d771c401b 100644
--- a/addons/report_intrastat/i18n/ko.po
+++ b/addons/report_intrastat/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/lt.po b/addons/report_intrastat/i18n/lt.po
index 97357c9e61c..870936ebc8c 100644
--- a/addons/report_intrastat/i18n/lt.po
+++ b/addons/report_intrastat/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/nl.po b/addons/report_intrastat/i18n/nl.po
index ed57031156f..81815aaa38c 100644
--- a/addons/report_intrastat/i18n/nl.po
+++ b/addons/report_intrastat/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -44,7 +44,7 @@ msgstr "Inkoopfactuur"
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Unit Price"
-msgstr "Stuksprijs"
+msgstr "Prijs"
 
 #. module: report_intrastat
 #: constraint:product.template:0
@@ -237,7 +237,7 @@ msgstr "Concept factuur"
 #. module: report_intrastat
 #: field:report.intrastat,supply_units:0
 msgid "Supply Units"
-msgstr "Voedingseenheden"
+msgstr "Geleverde eenheden"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
@@ -309,7 +309,7 @@ msgstr "Valuta"
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
 msgid "Export"
-msgstr "Export"
+msgstr "Exporteren"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -334,7 +334,7 @@ msgstr "Totaal (excl. BTW):"
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Price"
-msgstr "Prijs"
+msgstr "Bedrag"
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
diff --git a/addons/report_intrastat/i18n/nl_BE.po b/addons/report_intrastat/i18n/nl_BE.po
index d102b69d879..ad2e1e0fc4f 100644
--- a/addons/report_intrastat/i18n/nl_BE.po
+++ b/addons/report_intrastat/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/pl.po b/addons/report_intrastat/i18n/pl.po
index ae5d42c6a3c..db8faae7361 100644
--- a/addons/report_intrastat/i18n/pl.po
+++ b/addons/report_intrastat/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/pt.po b/addons/report_intrastat/i18n/pt.po
index f39e7d4cd91..066192e6eab 100644
--- a/addons/report_intrastat/i18n/pt.po
+++ b/addons/report_intrastat/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/pt_BR.po b/addons/report_intrastat/i18n/pt_BR.po
index 57241485ea2..4f9a8d6f12e 100644
--- a/addons/report_intrastat/i18n/pt_BR.po
+++ b/addons/report_intrastat/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -164,7 +164,7 @@ msgstr "Ref. do Parceiro"
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
 msgid "Total (inclu. taxes):"
-msgstr ""
+msgstr "Total (com impostos):"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
diff --git a/addons/report_intrastat/i18n/ro.po b/addons/report_intrastat/i18n/ro.po
index da0eb6764b8..dbd285fc082 100644
--- a/addons/report_intrastat/i18n/ro.po
+++ b/addons/report_intrastat/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/ru.po b/addons/report_intrastat/i18n/ru.po
index 38240d1e7b0..f744689c713 100644
--- a/addons/report_intrastat/i18n/ru.po
+++ b/addons/report_intrastat/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -102,7 +102,7 @@ msgstr "Тип"
 #. module: report_intrastat
 #: model:ir.actions.report.xml,name:report_intrastat.invoice_intrastat_id
 msgid "Invoice Intrastat"
-msgstr ""
+msgstr "Счет интрастат"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -150,7 +150,7 @@ msgstr "Июль"
 #: field:report.intrastat,intrastat_id:0
 #: view:report.intrastat.code:0
 msgid "Intrastat code"
-msgstr ""
+msgstr "Код интрастат"
 
 #. module: report_intrastat
 #: view:report.intrastat:0
@@ -180,7 +180,7 @@ msgstr "Октябрь"
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat
 msgid "Intrastat report"
-msgstr ""
+msgstr "Отчет интрастат"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -215,7 +215,7 @@ msgstr "Количество"
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "Intrastat Data"
-msgstr ""
+msgstr "Данные интрастат"
 
 #. module: report_intrastat
 #: field:report.intrastat,value:0
@@ -227,7 +227,7 @@ msgstr "Значение"
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree_all
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_all
 msgid "Intrastat"
-msgstr ""
+msgstr "Интрастат"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -279,7 +279,7 @@ msgstr "Шаблон ТМЦ"
 #. module: report_intrastat
 #: field:res.country,intrastat:0
 msgid "Intrastat member"
-msgstr ""
+msgstr "Участник интрастат"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
@@ -341,7 +341,7 @@ msgstr "Цена"
 #: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
 #: field:report.intrastat.code,name:0
 msgid "Intrastat Code"
-msgstr ""
+msgstr "Код интрастат"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/report_intrastat/i18n/sl.po b/addons/report_intrastat/i18n/sl.po
index b6260a84930..092364d3db5 100644
--- a/addons/report_intrastat/i18n/sl.po
+++ b/addons/report_intrastat/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/sq.po b/addons/report_intrastat/i18n/sq.po
index fcb227cf700..67302ab0ff2 100644
--- a/addons/report_intrastat/i18n/sq.po
+++ b/addons/report_intrastat/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/sv.po b/addons/report_intrastat/i18n/sv.po
index a8732cbd75d..f3ea899f71a 100644
--- a/addons/report_intrastat/i18n/sv.po
+++ b/addons/report_intrastat/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/tlh.po b/addons/report_intrastat/i18n/tlh.po
index 92af79ca5f1..916823fb79d 100644
--- a/addons/report_intrastat/i18n/tlh.po
+++ b/addons/report_intrastat/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/tr.po b/addons/report_intrastat/i18n/tr.po
index 83dfc661d8e..429bed46572 100644
--- a/addons/report_intrastat/i18n/tr.po
+++ b/addons/report_intrastat/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/uk.po b/addons/report_intrastat/i18n/uk.po
index 8b9d67ec603..677aa867bfb 100644
--- a/addons/report_intrastat/i18n/uk.po
+++ b/addons/report_intrastat/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/vi.po b/addons/report_intrastat/i18n/vi.po
index bb5be346354..7c726c53326 100644
--- a/addons/report_intrastat/i18n/vi.po
+++ b/addons/report_intrastat/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/zh_CN.po b/addons/report_intrastat/i18n/zh_CN.po
index 019c2d7f79a..c5874339ffc 100644
--- a/addons/report_intrastat/i18n/zh_CN.po
+++ b/addons/report_intrastat/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/i18n/zh_TW.po b/addons/report_intrastat/i18n/zh_TW.po
index 7eda50dce8c..0c50faf5c60 100644
--- a/addons/report_intrastat/i18n/zh_TW.po
+++ b/addons/report_intrastat/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:10+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml
index c07bd06f402..fc410e04ce0 100644
--- a/addons/report_intrastat/report/invoice.rml
+++ b/addons/report_intrastat/report/invoice.rml
@@ -245,7 +245,7 @@
             <para style="terp_default_Centre_9">[[ l.discount and formatLang (l.discount) or '' ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(l.price_subtotal, currency_obj=o.currency_id) ]]</para>
           </td>
         </tr>
         <tr>
@@ -301,7 +301,7 @@
           <para style="terp_default_9">Total (excl. taxes):</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, currency_obj=o.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -314,7 +314,7 @@
           <para style="terp_default_9">Taxes:</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, currency_obj=o.currency_id) ]]</para>
         </td>
       </tr>
       <tr>
@@ -327,7 +327,7 @@
           <para style="terp_default_Bold_9">Total (inclu. taxes):</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount_total) ]] [[ o.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount_total, currency_obj=o.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -360,10 +360,10 @@
             <para style="terp_default_8">[[ t.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ formatLang(t.base, digits=get_digits(dp='Account'), currency_obj = o.currency_id) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account')) ]] [[ o.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_8">[[ (t.tax_code_id and t.tax_code_id.notprintable) and removeParentNode('blockTable') or '' ]] [[ formatLang(t.amount, digits=get_digits(dp='Account'), currency_obj=o.currency_id) ]]</para>
           </td>
           <td>
             <para style="terp_default_8">
diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml
index 4f02c8f8c75..bcbd19d8bd8 100644
--- a/addons/report_intrastat/report_intrastat_view.xml
+++ b/addons/report_intrastat/report_intrastat_view.xml
@@ -75,7 +75,7 @@
             <field name="name">report.intrastat.view</field>
             <field name="model">report.intrastat</field>
             <field name="arch" type="xml">
-                <tree string="Intrastat Data">
+                <tree string="Intrastat Data" create="false">
                     <field name="name" />
                     <field name="month"/>
                     <field name="code"/>
@@ -84,7 +84,7 @@
                     <field name="weight"/>
                     <field name="value"/>
                     <field name="supply_units"/>
-                    <field name="currency_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
                     <field name="type"/>
                 </tree>
             </field>
diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py
index 1021d129d39..5b88cb78eb4 100644
--- a/addons/report_webkit/__openerp__.py
+++ b/addons/report_webkit/__openerp__.py
@@ -30,14 +30,15 @@
 ##############################################################################
 
 {
-    "name": "Webkit Report Engine",
-    "description": """
+    'name': 'Webkit Report Engine',
+    'description': """
 This module adds a new Report Engine based on WebKit library (wkhtmltopdf) to support reports designed in HTML + CSS.
 =====================================================================================================================
 
 The module structure and some code is inspired by the report_openoffice module.
 
 The module allows:
+------------------
     - HTML report definition
     - Multi header support
     - Multi logo
@@ -56,7 +57,7 @@ For a sample report see also the webkit_report_sample module, and this video:
     http://files.me.com/nbessi/06n92k.mov
 
 Requirements and Installation:
------------------------------
+------------------------------
 This module requires the ``wkthtmltopdf`` library to render HTML documents as
 PDF. Version 0.9.9 or later is necessary, and can be found at
 http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows (32bits).
@@ -65,7 +66,7 @@ After installing the library on the OpenERP Server machine, you need to set the
 path to the ``wkthtmltopdf`` executable file on each Company.
 
 If you are experiencing missing header/footer problems on Linux, be sure to
-install a "static" version of the library. The default ``wkhtmltopdf`` on
+install a 'static' version of the library. The default ``wkhtmltopdf`` on
 Ubuntu is known to have this issue.
 
 
@@ -76,21 +77,20 @@ TODO:
     * Zip return for separated PDF
     * Web client WYSIWYG
 """,
-    "version": "0.9",
-    "depends": ["base"],
-    "author": "Camptocamp",
-    "category": "Reporting", # i.e a technical module, not shown in Application install menu
-    "url": "http://http://www.camptocamp.com/",
-    "data": [ "security/ir.model.access.csv",
-              "data.xml",
-              "wizard/report_webkit_actions_view.xml",
-              "company_view.xml",
-              "header_view.xml",
-              "ir_report_view.xml",
+    'version': '0.9',
+    'depends': ['base'],
+    'author': 'Camptocamp',
+    'category': 'Reporting', # i.e a technical module, not shown in Application install menu
+    'url': 'http://http://www.camptocamp.com/',
+    'data': [ 'security/ir.model.access.csv',
+              'data.xml',
+              'wizard/report_webkit_actions_view.xml',
+              'company_view.xml',
+              'header_view.xml',
+              'ir_report_view.xml',
     ],
-    "installable": True,
-    "auto_install": False,
-    "certificate": "001159699313338995949",
+    'installable': True,
+    'auto_install': False,
     'images': ['images/companies_webkit.jpeg','images/header_html.jpeg','images/header_img.jpeg'],
 }
 
diff --git a/addons/report_webkit/i18n/ar.po b/addons/report_webkit/i18n/ar.po
index bf50d042117..a2616ef4e79 100644
--- a/addons/report_webkit/i18n/ar.po
+++ b/addons/report_webkit/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/bg.po b/addons/report_webkit/i18n/bg.po
index 0266fc7e3db..a90f31a050e 100644
--- a/addons/report_webkit/i18n/bg.po
+++ b/addons/report_webkit/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/ca.po b/addons/report_webkit/i18n/ca.po
index d543334648a..dfe7c514203 100644
--- a/addons/report_webkit/i18n/ca.po
+++ b/addons/report_webkit/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/da.po b/addons/report_webkit/i18n/da.po
index 7fb855af9f4..8e0cf0b196e 100644
--- a/addons/report_webkit/i18n/da.po
+++ b/addons/report_webkit/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/de.po b/addons/report_webkit/i18n/de.po
index 45c4041d365..0244e689966 100644
--- a/addons/report_webkit/i18n/de.po
+++ b/addons/report_webkit/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/es.po b/addons/report_webkit/i18n/es.po
index df03faeea7f..062fb69f3cf 100644
--- a/addons/report_webkit/i18n/es.po
+++ b/addons/report_webkit/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/es_CR.po b/addons/report_webkit/i18n/es_CR.po
index 7f18948cef9..07c8104a294 100644
--- a/addons/report_webkit/i18n/es_CR.po
+++ b/addons/report_webkit/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: report_webkit
diff --git a/addons/report_webkit/i18n/fi.po b/addons/report_webkit/i18n/fi.po
index 3ac37adf842..dce4e62fa7b 100644
--- a/addons/report_webkit/i18n/fi.po
+++ b/addons/report_webkit/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/fr.po b/addons/report_webkit/i18n/fr.po
index 711d2582c6d..910cd43be3c 100644
--- a/addons/report_webkit/i18n/fr.po
+++ b/addons/report_webkit/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/hr.po b/addons/report_webkit/i18n/hr.po
index 4f7519406a3..47c63c054d5 100644
--- a/addons/report_webkit/i18n/hr.po
+++ b/addons/report_webkit/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/hu.po b/addons/report_webkit/i18n/hu.po
index adcf28359a0..4891a658a6a 100644
--- a/addons/report_webkit/i18n/hu.po
+++ b/addons/report_webkit/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/it.po b/addons/report_webkit/i18n/it.po
index e7ec991aa4b..78f86f77c22 100644
--- a/addons/report_webkit/i18n/it.po
+++ b/addons/report_webkit/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/ja.po b/addons/report_webkit/i18n/ja.po
index 2e817f835da..b9bf1179c35 100644
--- a/addons/report_webkit/i18n/ja.po
+++ b/addons/report_webkit/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/nl.po b/addons/report_webkit/i18n/nl.po
index ee27b7067c2..58b59bcebe1 100644
--- a/addons/report_webkit/i18n/nl.po
+++ b/addons/report_webkit/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-13 15:35+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/pl.po b/addons/report_webkit/i18n/pl.po
index da98c162d43..fd8c6c1d250 100644
--- a/addons/report_webkit/i18n/pl.po
+++ b/addons/report_webkit/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/pt.po b/addons/report_webkit/i18n/pt.po
index 32e5af25127..e29c1de949b 100644
--- a/addons/report_webkit/i18n/pt.po
+++ b/addons/report_webkit/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/pt_BR.po b/addons/report_webkit/i18n/pt_BR.po
index 08b336e3920..26ca7efd90d 100644
--- a/addons/report_webkit/i18n/pt_BR.po
+++ b/addons/report_webkit/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/ro.po b/addons/report_webkit/i18n/ro.po
index d8b2b82cc61..8c01a8724ec 100644
--- a/addons/report_webkit/i18n/ro.po
+++ b/addons/report_webkit/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/ru.po b/addons/report_webkit/i18n/ru.po
index 3dffe117f59..027d87e7f38 100644
--- a/addons/report_webkit/i18n/ru.po
+++ b/addons/report_webkit/i18n/ru.po
@@ -14,39 +14,39 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
 msgid "Webkit Template (used if Report File is not found)"
-msgstr ""
+msgstr "Шаблон Webkit (используется если файл отчёта не найден)"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Tabloid 29 279.4 x 431.8 mm"
-msgstr ""
+msgstr "Tabloid 29 279.4 x 431.8 мм"
 
 #. module: report_webkit
 #: field:res.company,lib_path:0
 msgid "Webkit Executable Path"
-msgstr ""
+msgstr "Путь к исполняемому файлу Webkit"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Ledger  28  431.8 x 279.4 mm"
-msgstr ""
+msgstr "Ledger  28  431.8 x 279.4 мм"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:223
 #, python-format
 msgid "No header defined for this Webkit report!"
-msgstr ""
+msgstr "Неопределен заголовок для этого отчёта Webkit!"
 
 #. module: report_webkit
 #: help:ir.header_img,type:0
 msgid "Image type(png,gif,jpeg)"
-msgstr ""
+msgstr "Тип изображения (png,gif,jpeg)"
 
 #. module: report_webkit
 #: help:ir.actions.report.xml,precise_mode:0
@@ -56,11 +56,14 @@ msgid ""
 "                                                         but memory and disk "
 "usage is wider"
 msgstr ""
+"Этот режим позволяет более точное позиционирование элемента, поскольку "
+"каждый объект печатается по отдельному HTML. но больше используется память и "
+"диск"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Executive 4   7.5 x 10 inches, 190.5 x 254 mm"
-msgstr ""
+msgstr "Executive 4 7.5 x 10 дюймов, 190.5 x 254 мм"
 
 #. module: report_webkit
 #: field:ir.header_img,company_id:0
@@ -72,22 +75,22 @@ msgstr "Компания"
 #: code:addons/report_webkit/webkit_report.py:100
 #, python-format
 msgid "path to Wkhtmltopdf is not absolute"
-msgstr ""
+msgstr "путь к Wkhtmltopdf не абсолютный"
 
 #. module: report_webkit
 #: view:ir.header_webkit:0
 msgid "Company and Page Setup"
-msgstr ""
+msgstr "Задание компании и страницы"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "DLE 26 110 x 220 mm"
-msgstr ""
+msgstr "DLE 26 110 x 220 мм"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B7  21  88 x 125 mm"
-msgstr ""
+msgstr "B7 21 88 x 125 мм"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:252
@@ -97,7 +100,7 @@ msgstr ""
 #: code:addons/report_webkit/webkit_report.py:296
 #, python-format
 msgid "Webkit render"
-msgstr ""
+msgstr "Исполнитель Webkit"
 
 #. module: report_webkit
 #: view:res.company:0
@@ -107,7 +110,7 @@ msgstr "Заголовки"
 #. module: report_webkit
 #: help:ir.header_img,name:0
 msgid "Name of Image"
-msgstr ""
+msgstr "Название изображения"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:94
@@ -117,23 +120,25 @@ msgid ""
 "                                'Given path is not executable or path is "
 "wrong"
 msgstr ""
+"Неверен путь к Wkhtmltopdf заданный в компании'+\n"
+"                                'Данный путь не исполняемый или путь не верен"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:167
 #, python-format
 msgid "Webkit raise an error"
-msgstr ""
+msgstr "Webkit вызвал ошибку"
 
 #. module: report_webkit
 #: model:ir.actions.act_window,name:report_webkit.action_header_webkit
 #: model:ir.ui.menu,name:report_webkit.menu_header_webkit
 msgid "Webkit Headers/Footers"
-msgstr ""
+msgstr "Верхние/нижние колонтитулы Webkit"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm"
-msgstr ""
+msgstr "Legal 3 8.5 x 14 дюймов, 215.9 x 355.6 мм"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_ir_header_webkit
@@ -143,7 +148,7 @@ msgstr "ir.header_webkit"
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A4  0   210 x 297 mm, 8.26 x 11.69 inches"
-msgstr ""
+msgstr "A4 0 210 x 297 мм, 8.26 x 11.69 дюймов"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:82
@@ -158,21 +163,29 @@ msgid ""
 "form.'+\n"
 "                             'Minimal version is 0.9.9"
 msgstr ""
+"Установите, пожалуйста, исполняемый файл в вашу систему'+\n"
+"                             ' (sudo apt-get install wkhtmltopdf) или "
+"загрузите его отсюда:'+\n"
+"                             ' "
+"http://code.google.com/p/wkhtmltopdf/downloads/list и задайте'+\n"
+"                             ' путь к исполняемому файлу в форме "
+"компании.'+\n"
+"                             'Минимальная версия - 0.9.9"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B6  20  125 x 176 mm"
-msgstr ""
+msgstr "B6 20 125 x 176 мм"
 
 #. module: report_webkit
 #: view:report.webkit.actions:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Отмена"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B2  17  500 x 707 mm"
-msgstr ""
+msgstr "B2 17 500 x 707 мм"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_ir_header_img
@@ -182,22 +195,22 @@ msgstr "ir.header_img"
 #. module: report_webkit
 #: field:ir.actions.report.xml,precise_mode:0
 msgid "Precise Mode"
-msgstr ""
+msgstr "Точный режим"
 
 #. module: report_webkit
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать рекурсивные компании."
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A0  5   841 x 1189 mm"
-msgstr ""
+msgstr "A0 5 841 x 1189 мм"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "C5E 24  163 x 229 mm"
-msgstr ""
+msgstr "C5E 24 163 x 229 мм"
 
 #. module: report_webkit
 #: field:ir.header_img,type:0
@@ -208,12 +221,12 @@ msgstr "Тип"
 #: code:addons/report_webkit/wizard/report_webkit_actions.py:137
 #, python-format
 msgid "Client Actions Connections"
-msgstr ""
+msgstr "Соединения действий клиентов"
 
 #. module: report_webkit
 #: field:res.company,header_image:0
 msgid "Available Images"
-msgstr ""
+msgstr "Доступные изображения"
 
 #. module: report_webkit
 #: field:ir.header_webkit,html:0
@@ -223,75 +236,75 @@ msgstr ""
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B1  15  707 x 1000 mm"
-msgstr ""
+msgstr "B1 15 707 x 1000 мм"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A1  6   594 x 841 mm"
-msgstr ""
+msgstr "A1 6 594 x 841 мм"
 
 #. module: report_webkit
 #: help:ir.actions.report.xml,webkit_header:0
 msgid "The header linked to the report"
-msgstr ""
+msgstr "Заголовок связанный с отчетом"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:81
 #, python-format
 msgid "Wkhtmltopdf library path is not set in company"
-msgstr ""
+msgstr "Путь к библиотеке Wkhtmltopdf в компании не задан"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
 #: view:res.company:0
 msgid "Webkit"
-msgstr ""
+msgstr "Webkit"
 
 #. module: report_webkit
 #: help:ir.header_webkit,format:0
 msgid "Select Proper Paper size"
-msgstr ""
+msgstr "Выберите подходящий размер бумаги"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B5  1   176 x 250 mm, 6.93 x 9.84 inches"
-msgstr ""
+msgstr "B5 1 176 x 250 мм, 6.93 x 9.84 дюймов"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A7  11  74 x 105 mm"
-msgstr ""
+msgstr "A7 11 74 x 105 мм"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A6  10  105 x 148 mm"
-msgstr ""
+msgstr "A6 10 105 x 148 мм"
 
 #. module: report_webkit
 #: help:ir.actions.report.xml,report_webkit_data:0
 msgid "This template will be used if the main report file is not found"
-msgstr ""
+msgstr "Если не найден главный файл отчёта, будет использован этот шаблон"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Folio 27  210 x 330 mm"
-msgstr ""
+msgstr "Folio 27 210 x 330 мм"
 
 #. module: report_webkit
 #: field:ir.header_webkit,margin_top:0
 msgid "Top Margin (mm)"
-msgstr ""
+msgstr "Верхнее поле (мм)"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:224
 #, python-format
 msgid "Please set a header in company settings"
-msgstr ""
+msgstr "Задайте, пожалуйста, шапку в настройках компании"
 
 #. module: report_webkit
 #: view:report.webkit.actions:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Ok"
 
 #. module: report_webkit
 #: help:report.webkit.actions,print_button:0
@@ -299,21 +312,23 @@ msgid ""
 "Check this to add a Print action for this Report in the sidebar of the "
 "corresponding document types"
 msgstr ""
+"Установите флажок для добавления на боковую панель действия печати для "
+"соответствующих типов документов"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B3  18  353 x 500 mm"
-msgstr ""
+msgstr "B3 18 353 x 500 мм"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_header:0
 msgid "Webkit Header"
-msgstr ""
+msgstr "Заголовок Webkit"
 
 #. module: report_webkit
 #: help:ir.actions.report.xml,webkit_debug:0
 msgid "Enable the webkit engine debugger"
-msgstr ""
+msgstr "Разрешить отладчик движка webkit"
 
 #. module: report_webkit
 #: field:ir.header_img,img:0
@@ -323,7 +338,7 @@ msgstr "Изображение"
 #. module: report_webkit
 #: field:res.company,header_webkit:0
 msgid "Available html"
-msgstr ""
+msgstr "Доступен html"
 
 #. module: report_webkit
 #: help:report.webkit.actions,open_action:0
@@ -331,6 +346,8 @@ msgid ""
 "Check this to view the newly added internal print action after creating it "
 "(technical view) "
 msgstr ""
+"Установите флажок для вида вновь добавленного внутреннего действия печати "
+"после его создания (технический вид) "
 
 #. module: report_webkit
 #: view:res.company:0
@@ -350,27 +367,27 @@ msgstr "Альбом"
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B8  22  62 x 88 mm"
-msgstr ""
+msgstr "B8 22 62 x 88 мм"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A2  7   420 x 594 mm"
-msgstr ""
+msgstr "A2 7 420 x 594 мм"
 
 #. module: report_webkit
 #: field:report.webkit.actions,print_button:0
 msgid "Add print button"
-msgstr ""
+msgstr "Добавить кнопку печати"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A9  13  37 x 52 mm"
-msgstr ""
+msgstr "A9 13 37 x 52 мм"
 
 #. module: report_webkit
 #: view:ir.header_webkit:0
 msgid "Footer"
-msgstr ""
+msgstr "Нижний колонтитул"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_res_company
@@ -380,22 +397,22 @@ msgstr "Компании"
 #. module: report_webkit
 #: field:ir.header_webkit,margin_bottom:0
 msgid "Bottom Margin (mm)"
-msgstr ""
+msgstr "Нижнее поле (мм)"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_report_webkit_actions
 msgid "Webkit Actions"
-msgstr ""
+msgstr "Действия Webkit"
 
 #. module: report_webkit
 #: field:report.webkit.actions,open_action:0
 msgid "Open added action"
-msgstr ""
+msgstr "Открыть добавленное действие"
 
 #. module: report_webkit
 #: field:ir.header_webkit,margin_right:0
 msgid "Right Margin (mm)"
-msgstr ""
+msgstr "Правое поле (мм)"
 
 #. module: report_webkit
 #: field:ir.header_webkit,orientation:0
@@ -409,11 +426,14 @@ msgid ""
 "Install a static version of the library if you experience missing "
 "header/footers on Linux."
 msgstr ""
+"Полный путь к исполняемому файлу wkhtmltopdf. Требуется версия 0.9.9. "
+"Установите статическую версию библиотеки, если вы обнаружили пропуск "
+"верхнего/нижнего колонтитула на Linux."
 
 #. module: report_webkit
 #: help:ir.header_webkit,html:0
 msgid "Set Webkit Report Header"
-msgstr ""
+msgstr "Задать шапку отчёта Webkit"
 
 #. module: report_webkit
 #: field:ir.header_webkit,format:0
@@ -423,43 +443,43 @@ msgstr "Размер бумаги"
 #. module: report_webkit
 #: view:ir.header_webkit:0
 msgid "Header"
-msgstr ""
+msgstr "Заголовок"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid ":B10    16  31 x 44 mm"
-msgstr ""
+msgstr ":B10 16 31 x 44 мм"
 
 #. module: report_webkit
 #: view:ir.header_webkit:0
 msgid "CSS Style"
-msgstr ""
+msgstr "CSS стиль"
 
 #. module: report_webkit
 #: field:ir.header_webkit,css:0
 msgid "Header CSS"
-msgstr ""
+msgstr "Заголовок CSS"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B4  19  250 x 353 mm"
-msgstr ""
+msgstr "B4 19 250 x 353 мм"
 
 #. module: report_webkit
 #: model:ir.actions.act_window,name:report_webkit.action_header_img
 #: model:ir.ui.menu,name:report_webkit.menu_header_img
 msgid "Webkit Logos"
-msgstr ""
+msgstr "Логотипы Webkit"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A3  8   297 x 420 mm"
-msgstr ""
+msgstr "A3 8 297 x 420 мм"
 
 #. module: report_webkit
 #: field:ir.actions.report.xml,report_webkit_data:0
 msgid "Webkit Template"
-msgstr ""
+msgstr "Шаблон Webkit"
 
 #. module: report_webkit
 #: field:ir.header_webkit,footer_html:0
@@ -469,22 +489,22 @@ msgstr ""
 #. module: report_webkit
 #: field:ir.actions.report.xml,webkit_debug:0
 msgid "Webkit debug"
-msgstr ""
+msgstr "Отладка Webkit"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm"
-msgstr ""
+msgstr "Letter 2 8.5 x 11 дюймов, 215.9 x 279.4 мм"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B0  14  1000 x 1414 mm"
-msgstr ""
+msgstr "B0 14 1000 x 1414 мм"
 
 #. module: report_webkit
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Название компании должно быть уникальным!"
 
 #. module: report_webkit
 #: field:ir.header_img,name:0
@@ -495,50 +515,50 @@ msgstr "Название"
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A5  9   148 x 210 mm"
-msgstr ""
+msgstr "A5 9 148 x 210 мм"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "A8  12  52 x 74 mm"
-msgstr ""
+msgstr "A8  12  52 x 74 мм"
 
 #. module: report_webkit
 #: model:ir.actions.act_window,name:report_webkit.wizard_ofdo_report_actions
 #: view:report.webkit.actions:0
 msgid "Add Print Buttons"
-msgstr ""
+msgstr "Добавить кнопки печати"
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "Comm10E 25  105 x 241 mm, U.S. Common 10 Envelope"
-msgstr ""
+msgstr "Comm10E 25  105 x 241 мм, 10 общих наклеек США"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:218
 #, python-format
 msgid "Webkit Report template not found !"
-msgstr ""
+msgstr "Шаблон отчёта Webkit не найден!"
 
 #. module: report_webkit
 #: field:ir.header_webkit,margin_left:0
 msgid "Left Margin (mm)"
-msgstr ""
+msgstr "Левое поле (мм)"
 
 #. module: report_webkit
 #: code:addons/report_webkit/webkit_report.py:218
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка!"
 
 #. module: report_webkit
 #: help:ir.header_webkit,footer_html:0
 msgid "Set Webkit Report Footer."
-msgstr ""
+msgstr "Задать нижний колонтитул отчёта Webkit."
 
 #. module: report_webkit
 #: selection:ir.header_webkit,format:0
 msgid "B9  23  33 x 62 mm"
-msgstr ""
+msgstr "B9 23 33 x 62 мм"
 
 #. module: report_webkit
 #: model:ir.model,name:report_webkit.model_ir_actions_report_xml
diff --git a/addons/report_webkit/i18n/sv.po b/addons/report_webkit/i18n/sv.po
index 0f8338e390d..635b89bcf75 100644
--- a/addons/report_webkit/i18n/sv.po
+++ b/addons/report_webkit/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/tr.po b/addons/report_webkit/i18n/tr.po
index ce407a876b7..0409c0b2a33 100644
--- a/addons/report_webkit/i18n/tr.po
+++ b/addons/report_webkit/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/i18n/zh_CN.po b/addons/report_webkit/i18n/zh_CN.po
index 36cfa87868a..c99ce337e13 100644
--- a/addons/report_webkit/i18n/zh_CN.po
+++ b/addons/report_webkit/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:59+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: report_webkit
 #: view:ir.actions.report.xml:0
diff --git a/addons/report_webkit/ir_report.py b/addons/report_webkit/ir_report.py
index d2709ea6fc2..68e129d021d 100644
--- a/addons/report_webkit/ir_report.py
+++ b/addons/report_webkit/ir_report.py
@@ -35,7 +35,7 @@ from webkit_report import WebKitParser
 from report.report_sxw import rml_parse
 
 def register_report(name, model, tmpl_path, parser=rml_parse):
-    "Register the report into the services"
+    """Register the report into the services"""
     name = 'report.%s' % name
     if netsvc.Service._services.get(name, False):
         service = netsvc.Service._services[name]
diff --git a/addons/report_webkit/report_helper.py b/addons/report_webkit/report_helper.py
index 12651f308dc..8d0a27998b0 100644
--- a/addons/report_webkit/report_helper.py
+++ b/addons/report_webkit/report_helper.py
@@ -75,7 +75,7 @@ class WebKitHelper(object):
         head = header_obj.browse(self.cursor, self.uid, header_img_id)
         return (head.img, head.type)
             
-    def embed_logo_by_name(self, name, width=0, height=0) :
+    def embed_logo_by_name(self, name, width=0, height=0):
         """Return HTML embedded logo by name"""
         img, type = self.get_logo_by_name(name)
         return self.embed_image(type, img, width, height)
diff --git a/addons/report_webkit/webkit_report.py b/addons/report_webkit/webkit_report.py
index e1ce5a38c6b..b03289c8748 100644
--- a/addons/report_webkit/webkit_report.py
+++ b/addons/report_webkit/webkit_report.py
@@ -107,7 +107,7 @@ class WebKitParser(report_sxw):
         tmp_dir = tempfile.gettempdir()
         out_filename = tempfile.mktemp(suffix=".pdf", prefix="webkit.tmp.")
         files = []
-        file_to_del = []
+        file_to_del = [out_filename]
         if comm_path:
             command = [comm_path]
         else:
@@ -160,22 +160,33 @@ class WebKitParser(report_sxw):
             file_to_del.append(html_file.name)
             command.append(html_file.name)
         command.append(out_filename)
+        stderr_fd, stderr_path = tempfile.mkstemp(text=True)
+        file_to_del.append(stderr_path)
         try:
-            status = subprocess.call(command, stderr=subprocess.PIPE) # ignore stderr
+            status = subprocess.call(command, stderr=stderr_fd)
+            os.close(stderr_fd) # ensure flush before reading
+            stderr_fd = None # avoid closing again in finally block
+            fobj = open(stderr_path, 'r')
+            error_message = fobj.read()
+            fobj.close()
+            if not error_message:
+                error_message = _('No diagnosis message was provided')
+            else:
+                error_message = _('The following diagnosis message was provided:\n') + error_message
             if status :
-                raise except_osv(
-                                _('Webkit raise an error!' ),
-                                status
-                            )
-        except Exception:
-            for f_to_del in file_to_del :
-                os.unlink(f_to_del)
-
-        pdf = file(out_filename, 'rb').read()
-        for f_to_del in file_to_del :
-            os.unlink(f_to_del)
-
-        os.unlink(out_filename)
+                raise except_osv(_('Webkit error' ),
+                                 _("The command 'wkhtmltopdf' failed with error code = %s. Message: %s") % (status, error_message))
+            pdf_file = open(out_filename, 'rb')
+            pdf = pdf_file.read()
+            pdf_file.close()
+        finally:
+            if stderr_fd is not None:
+                os.close(stderr_fd)
+            for f_to_del in file_to_del:
+                try:
+                    os.unlink(f_to_del)
+                except (OSError, IOError), exc:
+                    _logger.error('cannot remove file %s: %s', f_to_del, exc)
         return pdf
 
     def translate_call(self, src):
diff --git a/addons/report_webkit_sample/__init__.py b/addons/report_webkit_sample/__init__.py
deleted file mode 100644
index c1d68d587bf..00000000000
--- a/addons/report_webkit_sample/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Nicolas Bessi (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# 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 2
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-import wizard
-import report
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit_sample/__openerp__.py b/addons/report_webkit_sample/__openerp__.py
deleted file mode 100644
index 65b6a9d49e8..00000000000
--- a/addons/report_webkit_sample/__openerp__.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Nicolas Bessi (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# 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 2
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-{
-    "name": "Webkit Report Samples",
-    "description": """
-Samples for Webkit Report Engine (report_webkit module).
-========================================================
-
-A sample invoice report is included in this module, as well as a wizard to
-add Webkit Report entries on any Document in the system.
-
-You have to create the print buttons by calling the wizard. For more details see:
-    http://files.me.com/nbessi/06n92k.mov
-""",
-    "version": "0.9",
-    "depends": ["base", "account", "report_webkit"],
-    "category": "Reporting",
-    "author": "Camptocamp SA - NBessi",
-    "url": "http://www.camptocamp.com/",
-    "data": ["report_webkit_html_view.xml",
-
-                   ],
-    "installable": True,
-    "auto_install": False,
-    "certificate": "00436592682591421981",
-    'images': ['images/webkit_invoice_report.jpeg'],
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit_sample/i18n/ar.po b/addons/report_webkit_sample/i18n/ar.po
deleted file mode 100644
index 5a11e9c32c0..00000000000
--- a/addons/report_webkit_sample/i18n/ar.po
+++ /dev/null
@@ -1,126 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-12 05:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "رد"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "فاكس"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "نسبة الخصم (%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "تليفون"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "وصف"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "فاتورة المورد"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "فاتورة ويب"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "السعر"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "تاريخ الفاتورة"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "الضرائب"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "الكمية"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "المقدار"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "الأساس"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "فاتورة"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "رد للمورد"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "مستند"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "سعر الوحدة"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "مرجع الشريك"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "ضريبة القيمة المضافة"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "الإجمالي"
-
-#~ msgid "E-mail"
-#~ msgstr "البريد الإلكتروني"
diff --git a/addons/report_webkit_sample/i18n/bg.po b/addons/report_webkit_sample/i18n/bg.po
deleted file mode 100644
index 2a0cb75b795..00000000000
--- a/addons/report_webkit_sample/i18n/bg.po
+++ /dev/null
@@ -1,126 +0,0 @@
-# Bulgarian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-03-27 18:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian <bg@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Обезщетение"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Факс"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Отстъпка (%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Тел"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Описание"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Фактура към доставчик"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Цена"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Дата на фактура"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Данъци"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "КОЛ."
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Количество"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "База"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Фактура"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "Обезщетение на доставчик"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Документ"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Единична цена"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Отпратка към контрагент"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "ДДС"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Общо"
-
-#~ msgid "E-mail"
-#~ msgstr "Имейл"
diff --git a/addons/report_webkit_sample/i18n/ca.po b/addons/report_webkit_sample/i18n/ca.po
deleted file mode 100644
index 9024d0591f2..00000000000
--- a/addons/report_webkit_sample/i18n/ca.po
+++ /dev/null
@@ -1,153 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-02-05 23:55+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Catalan <ca@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Devolució"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Tel"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Descripció"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Factura de proveïdor"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "Factura Webkit"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Preu"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Data de la factura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Impostos"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "QTAT"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Quantitat"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "Base"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "Factura d'abonament de proveïdor"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Document"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Preu unitari"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Ref. empresa"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "IVA"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Total"
-
-#~ msgid "Webkit Report Samples"
-#~ msgstr "Informes Webkit d'exemple"
-
-#~ msgid "E-mail"
-#~ msgstr "Correu electrònic"
-
-#~ msgid ""
-#~ "Samples for Webkit Report Engine (report_webkit module).\n"
-#~ "\n"
-#~ "    A sample invoice report is included in this module, as well as a wizard "
-#~ "to\n"
-#~ "    add Webkit Report entries on any Document in the system.\n"
-#~ "      \n"
-#~ "    You have to create the print buttons by calling the wizard. For more "
-#~ "details see:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-#~ msgstr ""
-#~ "Exemples del motor d'informes Webkit (report_webkit_module)\n"
-#~ "\n"
-#~ "    Una factura d'exemple està inclosa en aquest mòdul, així com un "
-#~ "assistent per\n"
-#~ "    afegir entrades a un informe Webkit sobre qualsevol document del "
-#~ "sistema.\n"
-#~ "      \n"
-#~ "    Heu de crear els *botons d'imprimir cridant al assistent. Per a més "
-#~ "detalls vegi:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
diff --git a/addons/report_webkit_sample/i18n/da.po b/addons/report_webkit_sample/i18n/da.po
deleted file mode 100644
index 208458ec455..00000000000
--- a/addons/report_webkit_sample/i18n/da.po
+++ /dev/null
@@ -1,123 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-27 06:38+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr ""
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr ""
diff --git a/addons/report_webkit_sample/i18n/de.po b/addons/report_webkit_sample/i18n/de.po
deleted file mode 100644
index a7f4c6fd9fd..00000000000
--- a/addons/report_webkit_sample/i18n/de.po
+++ /dev/null
@@ -1,153 +0,0 @@
-# German 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-07-02 13:05+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Gutschrift"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Rabatt (%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Tel."
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Beschreibung"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Lieferanten Rechnung"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "Webkit Rechnung"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Preis"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Datum Rechnung"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Steuern"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "Anz."
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Betrag"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "Steuergrundbetrag"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Rechnung"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "Lieferanten Gutschrift"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Dokument"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Preis/ME"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Partner Ref."
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "UID"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Summe"
-
-#~ msgid ""
-#~ "Samples for Webkit Report Engine (report_webkit module).\n"
-#~ "\n"
-#~ "    A sample invoice report is included in this module, as well as a wizard "
-#~ "to\n"
-#~ "    add Webkit Report entries on any Document in the system.\n"
-#~ "      \n"
-#~ "    You have to create the print buttons by calling the wizard. For more "
-#~ "details see:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-#~ msgstr ""
-#~ "Beispiele für Webkit Report Engine (report_webkit module).\n"
-#~ "\n"
-#~ "\n"
-#~ "  Eine Beispielrechnung befindet sich in diesem Modul, außerdem auch ein "
-#~ "Assistent für die\n"
-#~ "   Erstellung von Webkit Reports zu jedem Dokument in OpenERP.\n"
-#~ "\n"
-#~ "Sie müssen die Druck Buttons für die Reports durch den Assistenten "
-#~ "erstellen, sehen Sie hierzu auch das folgende Video:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-
-#~ msgid "Webkit Report Samples"
-#~ msgstr "Beispiele Webkit Reports"
-
-#~ msgid "E-mail"
-#~ msgstr "E-Mail"
diff --git a/addons/report_webkit_sample/i18n/es.po b/addons/report_webkit_sample/i18n/es.po
deleted file mode 100644
index 0f88bf8b051..00000000000
--- a/addons/report_webkit_sample/i18n/es.po
+++ /dev/null
@@ -1,154 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-26 08:13+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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Reembolso"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Tel"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Descripción"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Factura de Proveedor"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "Factura Webkit"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Precio"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Fecha factura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "CTDAD"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Importe"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "Base"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "Factura rectificativa (abono) de proveedor"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Documento"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Precio unitario"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Ref. empresa"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "CIF/NIF"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Total"
-
-#~ msgid "Webkit Report Samples"
-#~ msgstr "Informes Webkit de ejemplo"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid ""
-#~ "Samples for Webkit Report Engine (report_webkit module).\n"
-#~ "\n"
-#~ "    A sample invoice report is included in this module, as well as a wizard "
-#~ "to\n"
-#~ "    add Webkit Report entries on any Document in the system.\n"
-#~ "      \n"
-#~ "    You have to create the print buttons by calling the wizard. For more "
-#~ "details see:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-#~ msgstr ""
-#~ "Ejemplos para el motor de informes Webkit (report_webkit_module)\n"
-#~ "\n"
-#~ "    Una factura de ejemplo está incluida en este módulo, así como un wizard "
-#~ "para\n"
-#~ "    añadir entradas a un informe Webkit sobre cualquier documento del "
-#~ "sistema.\n"
-#~ "      \n"
-#~ "    Tiene que crear los botonos de imprimir llamando al wizard. Para más "
-#~ "detalles vea:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
diff --git a/addons/report_webkit_sample/i18n/es_CR.po b/addons/report_webkit_sample/i18n/es_CR.po
deleted file mode 100644
index b7216ae4d1e..00000000000
--- a/addons/report_webkit_sample/i18n/es_CR.po
+++ /dev/null
@@ -1,155 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-17 00:32+0000\n"
-"Last-Translator: Carlos Vásquez (CLEARCORP) "
-"<carlos.vasquez@clearcorp.co.cr>\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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"Language: es\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Reembolso"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Tel"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Descripción"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Factura de Proveedor"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "Factura Webkit"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Precio"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Fecha factura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "CTDAD"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Importe"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "Base"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "Factura rectificativa (abono) de proveedor"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Documento"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Precio unitario"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Ref. empresa"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "CIF/NIF"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Total"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid "Webkit Report Samples"
-#~ msgstr "Informes Webkit de ejemplo"
-
-#~ msgid ""
-#~ "Samples for Webkit Report Engine (report_webkit module).\n"
-#~ "\n"
-#~ "    A sample invoice report is included in this module, as well as a wizard "
-#~ "to\n"
-#~ "    add Webkit Report entries on any Document in the system.\n"
-#~ "      \n"
-#~ "    You have to create the print buttons by calling the wizard. For more "
-#~ "details see:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-#~ msgstr ""
-#~ "Ejemplos para el motor de informes Webkit (report_webkit_module)\n"
-#~ "\n"
-#~ "    Una factura de ejemplo está incluida en este módulo, así como un wizard "
-#~ "para\n"
-#~ "    añadir entradas a un informe Webkit sobre cualquier documento del "
-#~ "sistema.\n"
-#~ "      \n"
-#~ "    Tiene que crear los botonos de imprimir llamando al wizard. Para más "
-#~ "detalles vea:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
diff --git a/addons/report_webkit_sample/i18n/es_MX.po b/addons/report_webkit_sample/i18n/es_MX.po
deleted file mode 100644
index 221c8a52662..00000000000
--- a/addons/report_webkit_sample/i18n/es_MX.po
+++ /dev/null
@@ -1,155 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-26 08:13+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: 2011-09-05 05:57+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "Factura Webkit"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:35
-msgid "Supplier Invoice"
-msgstr "Factura de Proveedor"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:49
-msgid "Unit Price"
-msgstr "Precio unitario"
-
-#. module: report_webkit_sample
-#: model:ir.module.module,description:report_webkit_sample.module_meta_information
-msgid ""
-"Samples for Webkit Report Engine (report_webkit module).\n"
-"\n"
-"    A sample invoice report is included in this module, as well as a wizard "
-"to\n"
-"    add Webkit Report entries on any Document in the system.\n"
-"      \n"
-"    You have to create the print buttons by calling the wizard. For more "
-"details see:\n"
-"        http://files.me.com/nbessi/06n92k.mov \n"
-"                    "
-msgstr ""
-"Ejemplos para el motor de informes Webkit (report_webkit_module)\n"
-"\n"
-"    Una factura de ejemplo está incluida en este módulo, así como un wizard "
-"para\n"
-"    añadir entradas a un informe Webkit sobre cualquier documento del "
-"sistema.\n"
-"      \n"
-"    Tiene que crear los botonos de imprimir llamando al wizard. Para más "
-"detalles vea:\n"
-"        http://files.me.com/nbessi/06n92k.mov \n"
-"                    "
-
-#. module: report_webkit_sample
-#: model:ir.module.module,shortdesc:report_webkit_sample.module_meta_information
-msgid "Webkit Report Samples"
-msgstr "Informes Webkit de ejemplo"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:49
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:44
-msgid "Document"
-msgstr "Documento"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:49
-msgid "Description"
-msgstr "Descripción"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:49
-msgid "Price"
-msgstr "Precio"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:44
-msgid "Invoice Date"
-msgstr "Fecha factura"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:49
-msgid "QTY"
-msgstr "CTDAD"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:64
-msgid "Base"
-msgstr "Base"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:44
-msgid "Partner Ref."
-msgstr "Ref. empresa"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:49
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:64
-msgid "Amount"
-msgstr "Importe"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:28
-msgid "VAT"
-msgstr "CIF/NIF"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:37
-msgid "Refund"
-msgstr "Reembolso"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:19
-msgid "Tel"
-msgstr "Tel"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:25
-msgid "E-mail"
-msgstr "E-mail"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:33
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:39
-msgid "Supplier Refund"
-msgstr "Factura rectificativa (abono) de proveedor"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:76
-msgid "Total"
-msgstr "Total"
diff --git a/addons/report_webkit_sample/i18n/es_VE.po b/addons/report_webkit_sample/i18n/es_VE.po
deleted file mode 100644
index 221c8a52662..00000000000
--- a/addons/report_webkit_sample/i18n/es_VE.po
+++ /dev/null
@@ -1,155 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2010-12-26 08:13+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: 2011-09-05 05:57+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "Factura Webkit"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:35
-msgid "Supplier Invoice"
-msgstr "Factura de Proveedor"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:49
-msgid "Unit Price"
-msgstr "Precio unitario"
-
-#. module: report_webkit_sample
-#: model:ir.module.module,description:report_webkit_sample.module_meta_information
-msgid ""
-"Samples for Webkit Report Engine (report_webkit module).\n"
-"\n"
-"    A sample invoice report is included in this module, as well as a wizard "
-"to\n"
-"    add Webkit Report entries on any Document in the system.\n"
-"      \n"
-"    You have to create the print buttons by calling the wizard. For more "
-"details see:\n"
-"        http://files.me.com/nbessi/06n92k.mov \n"
-"                    "
-msgstr ""
-"Ejemplos para el motor de informes Webkit (report_webkit_module)\n"
-"\n"
-"    Una factura de ejemplo está incluida en este módulo, así como un wizard "
-"para\n"
-"    añadir entradas a un informe Webkit sobre cualquier documento del "
-"sistema.\n"
-"      \n"
-"    Tiene que crear los botonos de imprimir llamando al wizard. Para más "
-"detalles vea:\n"
-"        http://files.me.com/nbessi/06n92k.mov \n"
-"                    "
-
-#. module: report_webkit_sample
-#: model:ir.module.module,shortdesc:report_webkit_sample.module_meta_information
-msgid "Webkit Report Samples"
-msgstr "Informes Webkit de ejemplo"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:49
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:44
-msgid "Document"
-msgstr "Documento"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:49
-msgid "Description"
-msgstr "Descripción"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:49
-msgid "Price"
-msgstr "Precio"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:44
-msgid "Invoice Date"
-msgstr "Fecha factura"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:49
-msgid "QTY"
-msgstr "CTDAD"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:64
-msgid "Base"
-msgstr "Base"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:44
-msgid "Partner Ref."
-msgstr "Ref. empresa"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:49
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:64
-msgid "Amount"
-msgstr "Importe"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:28
-msgid "VAT"
-msgstr "CIF/NIF"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:37
-msgid "Refund"
-msgstr "Reembolso"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:19
-msgid "Tel"
-msgstr "Tel"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:25
-msgid "E-mail"
-msgstr "E-mail"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:33
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:39
-msgid "Supplier Refund"
-msgstr "Factura rectificativa (abono) de proveedor"
-
-#. module: report_webkit_sample
-#: report:report.webkitaccount.invoice:76
-msgid "Total"
-msgstr "Total"
diff --git a/addons/report_webkit_sample/i18n/fi.po b/addons/report_webkit_sample/i18n/fi.po
deleted file mode 100644
index 886e876c73d..00000000000
--- a/addons/report_webkit_sample/i18n/fi.po
+++ /dev/null
@@ -1,129 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-08-01 06:15+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Palautus"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Faksi"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Alennus (%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Puh"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Kuvaus"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Toimittajan lasku"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "Webkit lasku"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Hinta"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Laskun päivämäärä"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Verot"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "Määrä"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Määrä"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "Pohja"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Lasku"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "Toimittajan hyvitys"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Dokumentti"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Yksikköhinta"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Kumppanin viite"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "ALV"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Kokonaismäärä"
-
-#~ msgid "Webkit Report Samples"
-#~ msgstr "Webkit esimerkkiraportit"
-
-#~ msgid "E-mail"
-#~ msgstr "Sähköposti"
diff --git a/addons/report_webkit_sample/i18n/fr.po b/addons/report_webkit_sample/i18n/fr.po
deleted file mode 100644
index cfebf1b2788..00000000000
--- a/addons/report_webkit_sample/i18n/fr.po
+++ /dev/null
@@ -1,152 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#   * report_webkit_sample
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-21 01:41+0000\n"
-"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
-"<maxime.chambreuil@savoirfairelinux.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Remboursement"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Disc.(%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Tél"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Description"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Facture fournisseur"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "facture WebKit"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Prix"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Date de la facture"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Impôts"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "QTÉ"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Montant"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "Base"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Facture"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "Remboursement fournisseur"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Ref. document"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Prix unitaire"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Réf. partenaire"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "TVA"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Total"
-
-#~ msgid "E-mail"
-#~ msgstr "Courriel"
-
-#~ msgid "Webkit Report Samples"
-#~ msgstr "Exemples de rapports Webkit"
-
-#~ msgid ""
-#~ "Samples for Webkit Report Engine (report_webkit module).\n"
-#~ "\n"
-#~ "    A sample invoice report is included in this module, as well as a wizard "
-#~ "to\n"
-#~ "    add Webkit Report entries on any Document in the system.\n"
-#~ "      \n"
-#~ "    You have to create the print buttons by calling the wizard. For more "
-#~ "details see:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-#~ msgstr ""
-#~ "Exemples pour le moteur de rapport Webkit (module report_webkit).\n"
-#~ "\n"
-#~ "    Un exemple de rapport de facture est inclus dans ce module, tout comme "
-#~ "un assistant pour\n"
-#~ "    ajouter une entrée de rapport Webkit sur tout document dans le système.\n"
-#~ "      \n"
-#~ "    Vous avez la possibilité de créer des boutons d'impression en appelant "
-#~ "l'assistant. Pour plus de détails, regardez:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
diff --git a/addons/report_webkit_sample/i18n/fr_FR.po b/addons/report_webkit_sample/i18n/fr_FR.po
deleted file mode 100644
index 5b46f9e56fc..00000000000
--- a/addons/report_webkit_sample/i18n/fr_FR.po
+++ /dev/null
@@ -1,241 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#   * report_webkit_sample
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-10-05 06:33:26+0000\n"
-"PO-Revision-Date: 2010-10-05 06:33: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: \n"
-"Plural-Forms: \n"
-
-#. module: report_webkit_sample
-#: wizard_view:ir.report_actions,exist:0
-msgid "Report Action already exist for this report."
-msgstr "Report Action already exist for this report."
-
-#. module: report_webkit_sample
-#: wizard_field:ir.report_actions,add,print_button:0
-msgid "Add print button"
-msgstr "Add print button"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "facture WebKit"
-
-#. module: report_webkit_sample
-#: model:ir.actions.wizard,name:report_webkit_sample.wizard_oo_report_actions
-#: wizard_view:ir.report_actions,add:0
-#: wizard_view:ir.report_actions,exist:0
-msgid "Add Print Buttons"
-msgstr "Ajouter des boutons d'impression"
-
-#. module: report_webkit_sample
-#: code:addons/report_webkit_sample/wizard/report_actions.py:0
-#, python-format
-msgid "Client Actions Connections"
-msgstr "Actions Client Connections"
-
-#. module: report_webkit_sample
-#: model:ir.module.module,description:report_webkit_sample.module_meta_information
-msgid "Report system base on WebKit engine (wkhtmltopd lib) that allows to do HTML2PDF reporting.\n"
-"The module structure and some is inspired of the report_openoffice module\n"
-"The module allows:\n"
-"    -HTML report definition\n"
-"    -Multi header support \n"
-"    -Multi logo\n"
-"    -Multi company support\n"
-"    -HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
-"    -JavaScript support \n"
-"    -Raw HTML debugger\n"
-"    -Book printing capabilities\n"
-"    -Margins definition \n"
-"    -Paper size definition\n"
-"and munch more\n"
-"\n"
-"Many header are defined per company\n"
-"Many logo are defined per company\n"
-"CSS style, header and footer body are defined in the company\n"
-"\n"
-"The mapper library can be found here\n"
-"http://code.google.com/p/wkhtmltopdf/\n"
-"The libraries are included for Linux, Mac OS X i386 and Windows 32.\n"
-"\n"
-"A sample invoice report is defined in the report. \n"
-"You have to create the print button by calling a wizard. For more details :\n"
-"    http://files.me.com/nbessi/06n92k.mov \n"
-"\n"
-"TODO :\n"
-"JavaScript support activation deactivation\n"
-"Collated and book format support\n"
-"Zip return for separated PDF\n"
-"Web client WYSIWYG\n"
-"                    "
-msgstr "Report system base on WebKit engine (wkhtmltopd lib) that allows to do HTML2PDF reporting.\n"
-"The module structure and some is inspired of the report_openoffice module\n"
-"The module allows:\n"
-"    -HTML report definition\n"
-"    -Multi header support \n"
-"    -Multi logo\n"
-"    -Multi company support\n"
-"    -HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
-"    -JavaScript support \n"
-"    -Raw HTML debugger\n"
-"    -Book printing capabilities\n"
-"    -Margins definition \n"
-"    -Paper size definition\n"
-"and munch more\n"
-"\n"
-"Many header are defined per company\n"
-"Many logo are defined per company\n"
-"CSS style, header and footer body are defined in the company\n"
-"\n"
-"The mapper library can be found here\n"
-"http://code.google.com/p/wkhtmltopdf/\n"
-"The libraries are included for Linux, Mac OS X i386 and Windows 32.\n"
-"\n"
-"A sample invoice report is defined in the report. \n"
-"You have to create the print button by calling a wizard. For more details :\n"
-"    http://files.me.com/nbessi/06n92k.mov \n"
-"\n"
-"TODO :\n"
-"JavaScript support activation deactivation\n"
-"Collated and book format support\n"
-"Zip return for separated PDF\n"
-"Web client WYSIWYG\n"
-"                    "
-
-#. module: report_webkit_sample
-#: help:ir.report_actions,add,print_button:0
-msgid "Add action to menu context in print button."
-msgstr "Ajouter à l'action du menu contextuel dans le bouton d'impression."
-
-#. module: report_webkit_sample
-#: wizard_button:ir.report_actions,add,end:0
-msgid "_Cancel"
-msgstr "_Cancel"
-
-#. module: report_webkit_sample
-#: model:ir.module.module,shortdesc:report_webkit_sample.module_meta_information
-msgid "webkit report"
-msgstr "rapport webkit"
-
-#. module: report_webkit_sample
-#: wizard_field:ir.report_actions,add,open_action:0
-msgid "Open added action"
-msgstr "Ouvrir ajouté action"
-
-#. module: report_webkit_sample
-#: wizard_button:ir.report_actions,add,process:0
-msgid "_Ok"
-msgstr "_Ok"
-
-#. module: report_webkit_sample
-#: wizard_button:ir.report_actions,exist,end:0
-msgid "_Close"
-msgstr "_Close"
-
-
-
-#. module: report_webkit_sample
-#: webkit:report.webkitaccount.invoice:0
-msgid "Invoice Date"
-msgstr "Date de la facture"
-
-#. module: report_webkit_sample
-#: webkit:report.webkitaccount.invoice:0
-msgid "QTY"
-msgstr "QTÉ"
-
-#. module: report_webkit_sample
-#: webkit:report.webkitaccount.invoice:0
-msgid "Unit Price"
-msgstr "Prix unitaire"
-
-#. module: report_webkit_sample
-#: field:report.webkitaccount.invoice:0
-msgid "Unit of Measure"
-msgstr "Unité de mesure"
-
-#. module: report_webkit_sample
-#: 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
-#: model:ir.ui.menu,name:account.next_id_27
-msgid "Taxes"
-msgstr "Impôts"
-
-#. module: report_webkit_sample
-#: webkit:report.webkitaccount.invoice:0
-msgid "Price"
-msgstr "Prix"
-
-#. module: report_webkit_sample
-#: webkit:report.webkitaccount.invoice:0
-msgid "Tax Lines"
-msgstr "Lignes de taxe"
-
-#. module: report_webkit_sample
-#: webkit:report.webkitaccount.invoice:0
-msgid "Amount"
-msgstr "Montant"
-
-#. module: report_webkit_sample
-#: webkit:report.webkitaccount.invoice,:0
-msgid "Partner Ref."
-msgstr "Réf. partenaire"
-
-#. module: report_webkit_sample
-#: webkit:report.webkitaccount.invoice:0
-msgid "Invoice Ref"
-msgstr "Réf. Facture"
-
-#. module: report_webkit_sample
-#: field:account.invoice,amount_tax:0
-msgid "Total"
-msgstr "Total"
-
-
-#. module: report_webkit_sample
-#: field:account.invoice,name:0
-#: field:account.invoice.line,name:0
-msgid "Description"
-msgstr "Description"
-
-#. module: report_webkit_sample
-#: view:account.invoice.line:0
-#: webkit:account.invoice.tax,invoice_id:0
-msgid "Invoice Line"
-msgstr "Ligne de facture"
-
-#. module: report_webkit_sample
-#: field:account.analytic.line,product_id:0
-#: field:account.invoice.line,product_id:0
-#: field:account.move.line,product_id:0
-msgid "Product"
-msgstr "Produit"
-
-#. module: report_webkit_sample
-#: field:account.invoice,name:0
-msgid "Document"
-msgstr "Ref. document"
-
-#. module: report_webkit_sample
-#: webkit:account.invoice.line,discount:0
-msgid "Disc.(%)"
-msgstr "Disc.(%)"
-
-#. module: report_webkit_sample
-#: model:account.account.type,name:account.account_type_tax
-#: field:account.invoice,amount_tax:0
-#: field:account.move.line,account_tax_id:0
-msgid "Tax"
-msgstr "Taxe"
diff --git a/addons/report_webkit_sample/i18n/gl.po b/addons/report_webkit_sample/i18n/gl.po
deleted file mode 100644
index 7cb8cd07b41..00000000000
--- a/addons/report_webkit_sample/i18n/gl.po
+++ /dev/null
@@ -1,148 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-05-10 15:25+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Galician <gl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Reembolso"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Tel."
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Descrición"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Factura de provedor"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "Factura Webkit"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Prezo"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Data da factura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Impostos"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "CANT."
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Cantidade"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "Base"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "Reembolso do provedor:"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Documento"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Prezo unidade"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Referencia socio"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "IVE"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Total"
-
-#~ msgid "Webkit Report Samples"
-#~ msgstr "Informes Webkit de exemplo"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
-
-#~ msgid ""
-#~ "Samples for Webkit Report Engine (report_webkit module).\n"
-#~ "\n"
-#~ "    A sample invoice report is included in this module, as well as a wizard "
-#~ "to\n"
-#~ "    add Webkit Report entries on any Document in the system.\n"
-#~ "      \n"
-#~ "    You have to create the print buttons by calling the wizard. For more "
-#~ "details see:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-#~ msgstr ""
-#~ "Exemplos para o motor de informes Webkit (report_webkit_module) Neste módulo "
-#~ "inclúese unha factura de exemplo, así como un asistente para engadir "
-#~ "entradas a un informe Webkit sobre calquera documento do sistema. Ten que "
-#~ "crear os botóns de imprimir utilizando o asistente. Para máis detalles, "
-#~ "consulte: http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
diff --git a/addons/report_webkit_sample/i18n/hr.po b/addons/report_webkit_sample/i18n/hr.po
deleted file mode 100644
index 12ac1021a97..00000000000
--- a/addons/report_webkit_sample/i18n/hr.po
+++ /dev/null
@@ -1,152 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-12-11 20:28+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
-"Language-Team: Croatian <hr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Povrat"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Popust (%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Tel"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Opis"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Ulazni račun"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "WebKit račun"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Cijena"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Datum računa"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Porezi"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "Kol."
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Iznos"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "Osnovica"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Račun"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "Odobrenje dobavljača"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Dokument"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Jedinična cijena"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Partnerova oznaka"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "PDV"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Ukupno"
-
-#~ msgid ""
-#~ "Samples for Webkit Report Engine (report_webkit module).\n"
-#~ "\n"
-#~ "    A sample invoice report is included in this module, as well as a wizard "
-#~ "to\n"
-#~ "    add Webkit Report entries on any Document in the system.\n"
-#~ "      \n"
-#~ "    You have to create the print buttons by calling the wizard. For more "
-#~ "details see:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-#~ msgstr ""
-#~ "Samples for Webkit Report Engine (report_webkit module).\n"
-#~ "Primjeri Webkit izvještajne platforme (report_webkit modul).\n"
-#~ "\n"
-#~ "    U modul je uključen primjer izvještaja računa, kao i asistent za \n"
-#~ "    dodavanje stavaka Webkit izvještaja na bilo koji dokument u sustavu.\n"
-#~ "\n"
-#~ "    Morate kreirati gumbe za ispis pozivajući asistenta. Za više detalja "
-#~ "pogledajte: \n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-
-#~ msgid "Webkit Report Samples"
-#~ msgstr "Primjeri Webkit izvještaja"
-
-#~ msgid "E-mail"
-#~ msgstr "E-pošta"
diff --git a/addons/report_webkit_sample/i18n/hu.po b/addons/report_webkit_sample/i18n/hu.po
deleted file mode 100644
index 563744ff4c4..00000000000
--- a/addons/report_webkit_sample/i18n/hu.po
+++ /dev/null
@@ -1,129 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * report_webkit_sample
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-02-04 15:22+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Jóváíró számla"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Eng. (%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Tel"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Leírás"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Bejövő számla"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "WebKit számla"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Nettó érték"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Számla kelte"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Adók"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "Db"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Adó összege"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "Adóalap"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Számla"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "Bejövő jóváíró számla"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Dokumentum"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Egységár"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Partner hiv."
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "ÁFA"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Bruttó érték"
-
-#~ msgid "Webkit Report Samples"
-#~ msgstr "WebKit jelentés minták"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
diff --git a/addons/report_webkit_sample/i18n/it.po b/addons/report_webkit_sample/i18n/it.po
deleted file mode 100644
index 2ef1f16ede4..00000000000
--- a/addons/report_webkit_sample/i18n/it.po
+++ /dev/null
@@ -1,126 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-13 23:02+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Rimborso"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Sconto (%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Tel."
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Descrizione"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Fattura Fornitore"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Prezzo"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Data fattura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Tasse"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "Q.ta"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Importo"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "Base"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Fattura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Documento"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Prezzo unitario"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Rif. Partner"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "IVA"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Totale"
-
-#~ msgid "E-mail"
-#~ msgstr "Email"
diff --git a/addons/report_webkit_sample/i18n/ja.po b/addons/report_webkit_sample/i18n/ja.po
deleted file mode 100644
index 6ddc02b5ebc..00000000000
--- a/addons/report_webkit_sample/i18n/ja.po
+++ /dev/null
@@ -1,126 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-15 23:12+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "返金"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "FAX"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "割引（%）"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "電話"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "説明"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "仕入先請求書"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "WebKit請求書"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "価格"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "請求日"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "税金"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "数量"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "金額"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "基本"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "請求書"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "仕入先返金"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "ドキュメント"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "単価"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "パートナの参照"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "消費税"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "合計"
-
-#~ msgid "E-mail"
-#~ msgstr "Eメール"
diff --git a/addons/report_webkit_sample/i18n/nl.po b/addons/report_webkit_sample/i18n/nl.po
deleted file mode 100644
index a82d44e5546..00000000000
--- a/addons/report_webkit_sample/i18n/nl.po
+++ /dev/null
@@ -1,153 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-28 12:51+0000\n"
-"Last-Translator: Erwin <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: 2012-08-07 05:36+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Creditering"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Krt. (%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Tel"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Omschrijving"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Inkoopfactuur"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "WebKit factuur"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Prijs"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Factuurdatum"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "BTW"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "AANT"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr "E-mail"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Bedrag"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "Basis"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Factuur"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "Creditfactuur inkoop"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Document"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Stuksprijs"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Relatie ref."
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "BTW"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Totaal"
-
-#~ msgid ""
-#~ "Samples for Webkit Report Engine (report_webkit module).\n"
-#~ "\n"
-#~ "    A sample invoice report is included in this module, as well as a wizard "
-#~ "to\n"
-#~ "    add Webkit Report entries on any Document in the system.\n"
-#~ "      \n"
-#~ "    You have to create the print buttons by calling the wizard. For more "
-#~ "details see:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-#~ msgstr ""
-#~ "Voorbeelden voor Webkit rapportgenerator (report_webkit module).\n"
-#~ "\n"
-#~ "    Een voorbeeld factuur overzicht is bijgevoegd in deze module, naast een "
-#~ "assistent om\n"
-#~ "    Webkit overzicht inschrijvingen toe te voegen op elk Document in het "
-#~ "systeem.\n"
-#~ "      \n"
-#~ "    U moet de afdrukknop maken door deze assistent aan te roepen. Voor meer "
-#~ "details zie:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-
-#~ msgid "Webkit Report Samples"
-#~ msgstr "Webkit overzicht voorbeelden"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
diff --git a/addons/report_webkit_sample/i18n/pt.po b/addons/report_webkit_sample/i18n/pt.po
deleted file mode 100644
index e0932c6d53f..00000000000
--- a/addons/report_webkit_sample/i18n/pt.po
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-12 09:57+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Reembolsar"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Tel"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Descrição"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Fatura do Fornecedor"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "Fatura WebKit"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Preço"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Data da Fatura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Impostos"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "QTD"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Montante"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "Base"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "Reembolso do Fornecedor"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Documento"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Preço Unitário"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Ref. do Parceiro"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "IVA"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Total"
-
-#~ msgid "E-mail"
-#~ msgstr "Email"
diff --git a/addons/report_webkit_sample/i18n/pt_BR.po b/addons/report_webkit_sample/i18n/pt_BR.po
deleted file mode 100644
index f9c95272560..00000000000
--- a/addons/report_webkit_sample/i18n/pt_BR.po
+++ /dev/null
@@ -1,123 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-03-17 01:44+0000\n"
-"Last-Translator: Emerson <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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Descrição"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Fatura de Fornecedor"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Preço"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Documento"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Preço Unitário"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr ""
diff --git a/addons/report_webkit_sample/i18n/report_webkit_sample.pot b/addons/report_webkit_sample/i18n/report_webkit_sample.pot
deleted file mode 100644
index 83a2b97cac0..00000000000
--- a/addons/report_webkit_sample/i18n/report_webkit_sample.pot
+++ /dev/null
@@ -1,122 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* report_webkit_sample
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-08 00:37+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr ""
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr ""
-
diff --git a/addons/report_webkit_sample/i18n/ro.po b/addons/report_webkit_sample/i18n/ro.po
deleted file mode 100644
index 62728797ce1..00000000000
--- a/addons/report_webkit_sample/i18n/ro.po
+++ /dev/null
@@ -1,152 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-11 19:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Rambursare"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Disc.(%) (Discount)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Tel"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Descriere"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Factura furnizor"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "Factura WebKit"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Pret"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Data facturii"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Taxe"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "Cantitate"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Suma"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "Baza"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "Restituire furnizor"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Document"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Pret unitar"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Ref. partener"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "TVA"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Total"
-
-#~ msgid ""
-#~ "Samples for Webkit Report Engine (report_webkit module).\n"
-#~ "\n"
-#~ "    A sample invoice report is included in this module, as well as a wizard "
-#~ "to\n"
-#~ "    add Webkit Report entries on any Document in the system.\n"
-#~ "      \n"
-#~ "    You have to create the print buttons by calling the wizard. For more "
-#~ "details see:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-#~ msgstr ""
-#~ "Mostre pentru Raportul motorului WebKit (raport_modul webkit).\n"
-#~ "\n"
-#~ "    Un raport al facturii mostră este inclus in acest modul, precum si un "
-#~ "wizard pentru\n"
-#~ "    a adăuga inregistrările Raportului Webkit in orice document din sistem.\n"
-#~ "      \n"
-#~ "    Trebuie să creati butoanele de tipărire folosind wizard-ul. Pentru mai "
-#~ "multe detalii vedeti:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-
-#~ msgid "Webkit Report Samples"
-#~ msgstr "Mostre Raport Webkit"
-
-#~ msgid "E-mail"
-#~ msgstr "E-mail"
diff --git a/addons/report_webkit_sample/i18n/sv.po b/addons/report_webkit_sample/i18n/sv.po
deleted file mode 100644
index 8a3ab62d075..00000000000
--- a/addons/report_webkit_sample/i18n/sv.po
+++ /dev/null
@@ -1,126 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-06-27 11:29+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "Återbetalning"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Fax"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "Rab.(%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Tel"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Beskrivning"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Leverantörsfaktura"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "WebKit-faktura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Pris"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Fakturadatum"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Skatter"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "Antal"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "Belopp"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "Bas"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "Återbetalning från leverantör"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "Dokument"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "Styckpris"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "Företagsreferense"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "Moms"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "Totalt"
-
-#~ msgid "E-mail"
-#~ msgstr "E-post"
diff --git a/addons/report_webkit_sample/i18n/tr.po b/addons/report_webkit_sample/i18n/tr.po
deleted file mode 100644
index 4493e6fb440..00000000000
--- a/addons/report_webkit_sample/i18n/tr.po
+++ /dev/null
@@ -1,123 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-25 17:36+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "İade"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "Faks"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "İnd.(%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "Tel"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "Açıklama"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "Tedarikçi Faturası"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "Fiyat"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "Fatura Tarihi"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "Vergiler"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr ""
diff --git a/addons/report_webkit_sample/i18n/zh_CN.po b/addons/report_webkit_sample/i18n/zh_CN.po
deleted file mode 100644
index c622b758c5f..00000000000
--- a/addons/report_webkit_sample/i18n/zh_CN.po
+++ /dev/null
@@ -1,147 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-07-12 19:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:37
-msgid "Refund"
-msgstr "红字发票"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:22
-msgid "Fax"
-msgstr "传真"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Disc.(%)"
-msgstr "折扣(%)"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:19
-msgid "Tel"
-msgstr "电话"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Description"
-msgstr "说明"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:35
-msgid "Supplier Invoice"
-msgstr "供应商发票"
-
-#. module: report_webkit_sample
-#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
-msgid "WebKit invoice"
-msgstr "WebKit 发票"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Price"
-msgstr "价格"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Invoice Date"
-msgstr "发票日期"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Taxes"
-msgstr "税"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "QTY"
-msgstr "数量"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:25
-msgid "Email"
-msgstr ""
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Amount"
-msgstr "金额"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:64
-msgid "Base"
-msgstr "税基"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:33
-msgid "Invoice"
-msgstr "发票"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:39
-msgid "Supplier Refund"
-msgstr "供应商红字发票"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Document"
-msgstr "单据"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:49
-msgid "Unit Price"
-msgstr "单价"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:44
-msgid "Partner Ref."
-msgstr "业务伙伴"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:28
-msgid "VAT"
-msgstr "增值税"
-
-#. module: report_webkit_sample
-#: report:addons/report_webkit_sample/report/report_webkit_html.mako:76
-msgid "Total"
-msgstr "总计"
-
-#~ msgid "E-mail"
-#~ msgstr "电子邮件"
-
-#~ msgid ""
-#~ "Samples for Webkit Report Engine (report_webkit module).\n"
-#~ "\n"
-#~ "    A sample invoice report is included in this module, as well as a wizard "
-#~ "to\n"
-#~ "    add Webkit Report entries on any Document in the system.\n"
-#~ "      \n"
-#~ "    You have to create the print buttons by calling the wizard. For more "
-#~ "details see:\n"
-#~ "        http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-#~ msgstr ""
-#~ "Webkit 报表引擎示例( Webkit 模块)\n"
-#~ "    在这模块里除包含一个发票报表例子还有一在系统任何文档里加入 Webkit 报表引擎的向导。\n"
-#~ "    \n"
-#~ "    您必须要调用向导创建打印按钮，如更详细的资料请看：http://files.me.com/nbessi/06n92k.mov \n"
-#~ "                    "
-
-#~ msgid "Webkit Report Samples"
-#~ msgstr "Webkit报表例子"
diff --git a/addons/report_webkit_sample/report/__init__.py b/addons/report_webkit_sample/report/__init__.py
deleted file mode 100644
index e8703f10d03..00000000000
--- a/addons/report_webkit_sample/report/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
- #-*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) 
-# All Right Reserved
-#
-# Author : Nicolas Bessi (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# 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 2
-# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-import report_webkit_html
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit_sample/report/report_webkit_html.mako b/addons/report_webkit_sample/report/report_webkit_html.mako
deleted file mode 100644
index 164a697f386..00000000000
--- a/addons/report_webkit_sample/report/report_webkit_html.mako
+++ /dev/null
@@ -1,83 +0,0 @@
-<html>
-<head>
-    <style type="text/css">
-        ${css}
-    </style>
-</head>
-<body>
-    %for inv in objects :
-    <% setLang(inv.partner_id.lang) %>
-    <table class="dest_address">
-        <tr><td ><b>${inv.partner_id.title or ''|entity}  ${inv.partner_id.name |entity}</b></td></tr>
-        <tr><td>${inv.address_invoice_id.street or ''|entity}</td></tr>
-        <tr><td>${inv.address_invoice_id.street2 or ''|entity}</td></tr>
-        <tr><td>${inv.address_invoice_id.zip or ''|entity} ${inv.address_invoice_id.city or ''|entity}</td></tr>
-        %if inv.address_invoice_id.country_id :
-        <tr><td>${inv.address_invoice_id.country_id.name or ''|entity} </td></tr>
-        %endif
-        %if inv.address_invoice_id.phone :
-        <tr><td>${_("Tel")}: ${inv.address_invoice_id.phone|entity}</td></tr>
-        %endif
-        %if inv.address_invoice_id.fax :
-        <tr><td>${_("Fax")}: ${inv.address_invoice_id.fax|entity}</td></tr>
-        %endif
-        %if inv.address_invoice_id.email :
-        <tr><td>${_("Email")}: ${inv.address_invoice_id.email|entity}</td></tr>
-        %endif
-        %if inv.partner_id.vat :
-        <tr><td>${_("VAT")}: ${inv.partner_id.vat|entity}</td></tr>
-        %endif
-    </table>
-    <br />
-    %if inv.type == 'out_invoice' :
-    <span class="title">${_("Invoice")} ${inv.number or ''|entity}</span>
-    %elif inv.type == 'in_invoice' :
-    <span class="title">${_("Supplier Invoice")} ${inv.number or ''|entity}</span>   
-    %elif inv.type == 'out_refund' :
-    <span class="title">${_("Refund")} ${inv.number or ''|entity}</span> 
-    %elif inv.type == 'in_refund' :
-    <span class="title">${_("Supplier Refund")} ${inv.number or ''|entity}</span> 
-    %endif
-    <br/>
-    <br/>
-    <table class="basic_table" width="90%">
-        <tr><td>${_("Document")}</td><td>${_("Invoice Date")}</td><td>${_("Partner Ref.")}</td></tr>
-        <tr><td>${inv.name}</td><td>${formatLang(inv.date_invoice, date=True)|entity}</td><td>&nbsp;</td></tr>
-    </table>
-    <h1><br /></h1>
-    <table class="list_table"  width="90%">
-        <thead><tr><th>${_("Description")}</th><th class>${_("Taxes")}</th><th class>${_("QTY")}</th><th>${_("Unit Price")}</th><th >${_("Disc.(%)")}</th><th>${_("Price")}</th></tr></thead>
-        %for line in inv.invoice_line :
-        <tbody>
-        <tr><td>${line.name|entity}</td><td>${ ', '.join([ tax.name or '' for tax in line.invoice_line_tax_id ])|entity}</td><td>${line.quantity}</td><td style="text-align:right;">${formatLang(line.price_unit)}</td><td  style="text-align:center;">${line.discount or 0.00}</td><td style="text-align:right;">${formatLang(line.price_subtotal)}</td></tr>
-        %if line.note :
-        <tr><td colspan="6" style="border-style:none"><pre style="font-family:Helvetica;padding-left:20px">${line.note |entity}</pre></td></tr>
-        %endif
-        %endfor
-        <tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>Net Total:</b></td><td style="border-top:2px solid;text-align:right">${formatLang(inv.amount_untaxed)}</td></tr>
-        <tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"><b>Taxes:</b></td><td style="text-align:right">${formatLang(inv.amount_tax)}</td></tr>
-        <tr><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-style:none"/><td style="border-top:2px solid"><b>Total:</b></td><td style="border-top:2px solid;text-align:right">${formatLang(inv.amount_total)}</td></tr>
-        </tbody>
-    </table>
-
-    <table class="list_table" width="40%">
-        <tr><th>Tax</th><th>${_("Base")}</th><th>${_("Amount")}</th></tr>
-       %if inv.tax_line :
-        %for t in inv.tax_line :
-        <tr>
-            <td>${ t.name|entity } </td>
-            <td>${ t.base|entity}</td>
-            <td>${ formatLang(t.amount) }</td>
-        </tr>
-        %endfor
-        %endif
-        <tr>
-            <td style="border-style:none"/>
-            <td style="border-top:2px solid"><b>${_("Total")}</b></td>
-            <td style="border-top:2px solid">${ formatLang(inv.amount_tax) }</td>
-        </tr>
-    </table>        
-    <p style="page-break-after:always"></p>
-    %endfor
-</body>
-</html>
\ No newline at end of file
diff --git a/addons/report_webkit_sample/report/report_webkit_html.py b/addons/report_webkit_sample/report/report_webkit_html.py
deleted file mode 100644
index 5da7f008569..00000000000
--- a/addons/report_webkit_sample/report/report_webkit_html.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import time
-from report import report_sxw
-from osv import osv
-
-class report_webkit_html(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(report_webkit_html, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update({
-            'time': time,
-            'cr':cr,
-            'uid': uid,
-        })
-        
-report_sxw.report_sxw('report.webkitaccount.invoice',
-                       'account.invoice', 
-                       'addons/report_webkit_sample/report/report_webkit_html.mako',
-                       parser=report_webkit_html)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit_sample/report_webkit_html_view.xml b/addons/report_webkit_sample/report_webkit_html_view.xml
deleted file mode 100644
index 4616c01e908..00000000000
--- a/addons/report_webkit_sample/report_webkit_html_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <report auto="False"
-                id="report_webkit_html"
-                model="account.invoice"
-                name="webkitaccount.invoice"
-                file="report_webkit_sample/report/report_webkit_html.mako"
-                string="WebKit invoice"
-                report_type="webkit"
-                webkit_header="report_webkit.ir_header_webkit_basesample0"/>
-    </data>
-</openerp>
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index 686207d8d9d..b8a9f57c910 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -20,12 +20,12 @@
 ##############################################################################
 
 {
-    "name" : "Resource",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "category" : "Hidden/Dependency",
-    "website" : "http://www.openerp.com",
-    "description": """
+    'name' : 'Resource',
+    'version' : '1.1',
+    'author' : 'OpenERP SA',
+    'category' : 'Hidden/Dependency',
+    'website' : 'http://www.openerp.com',
+    'description': """
 Module for resource management.
 ===============================
 
@@ -36,20 +36,17 @@ associated to every resource. It also manages the leaves of every resource.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['process'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'resource_view.xml',
     ],
-    'demo_xml': ['resource_demo.xml'
-    ],
+    'demo': ['resource_demo.xml'],
     'test': [
         'test/resource.yml',
         'test/duplicate_resource.yml',
     ],
     'installable': True,
     'auto_install': False,
-    'certificate': '00746371192190459469',
     'images': ['images/resource_leaves_calendar.jpeg','images/resource_leaves_form.jpeg'],
 }
 
diff --git a/addons/resource/faces/task.py b/addons/resource/faces/task.py
index 81379c67240..7516f41db2a 100644
--- a/addons/resource/faces/task.py
+++ b/addons/resource/faces/task.py
@@ -567,7 +567,8 @@ class _ValueWrapper(object):
         return result
     #@-node:_cmp
     #@+node:__getattr__
-    def __getattr__(self, name): return getattr(self._value, name)
+    def __getattr__(self, name):
+        return getattr(self._value, name)
     #@-node:__getattr__
     #@+node:__getitem__
     def __getitem__(self, slice):
diff --git a/addons/resource/i18n/ar.po b/addons/resource/i18n/ar.po
index e2a869784bc..d7d186f6a72 100644
--- a/addons/resource/i18n/ar.po
+++ b/addons/resource/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/bg.po b/addons/resource/i18n/bg.po
index f7fa2d13c28..740676f66ff 100644
--- a/addons/resource/i18n/bg.po
+++ b/addons/resource/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/ca.po b/addons/resource/i18n/ca.po
index 403c964c0a1..28e0d743dfe 100644
--- a/addons/resource/i18n/ca.po
+++ b/addons/resource/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/cs.po b/addons/resource/i18n/cs.po
index 628593bea0a..a5fc1ef927d 100644
--- a/addons/resource/i18n/cs.po
+++ b/addons/resource/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: resource
diff --git a/addons/resource/i18n/da.po b/addons/resource/i18n/da.po
index 208c2821f49..ef57811e88b 100644
--- a/addons/resource/i18n/da.po
+++ b/addons/resource/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index 9053bfe3d4c..f542ca84efc 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/es.po b/addons/resource/i18n/es.po
index 0bc3acee4c7..daded075927 100644
--- a/addons/resource/i18n/es.po
+++ b/addons/resource/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/es_CR.po b/addons/resource/i18n/es_CR.po
index e38e6b4285b..ba735e1a964 100644
--- a/addons/resource/i18n/es_CR.po
+++ b/addons/resource/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: resource
diff --git a/addons/resource/i18n/es_EC.po b/addons/resource/i18n/es_EC.po
index f0e1d246b5e..c10b0a5983c 100644
--- a/addons/resource/i18n/es_EC.po
+++ b/addons/resource/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/et.po b/addons/resource/i18n/et.po
index 6d03a14094b..4d4409f155a 100644
--- a/addons/resource/i18n/et.po
+++ b/addons/resource/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/fi.po b/addons/resource/i18n/fi.po
index d9ca8b48f39..ce1386bccb0 100644
--- a/addons/resource/i18n/fi.po
+++ b/addons/resource/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/fr.po b/addons/resource/i18n/fr.po
index bb683df0492..9f744f9aaad 100644
--- a/addons/resource/i18n/fr.po
+++ b/addons/resource/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/gl.po b/addons/resource/i18n/gl.po
index b0f11465f28..73545e0a827 100644
--- a/addons/resource/i18n/gl.po
+++ b/addons/resource/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/hr.po b/addons/resource/i18n/hr.po
index c8bed6a6de6..dbdeb674932 100644
--- a/addons/resource/i18n/hr.po
+++ b/addons/resource/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/hu.po b/addons/resource/i18n/hu.po
index ef790772d85..021f6bda3b6 100644
--- a/addons/resource/i18n/hu.po
+++ b/addons/resource/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/it.po b/addons/resource/i18n/it.po
index acaf3cb8d69..0c02847616f 100644
--- a/addons/resource/i18n/it.po
+++ b/addons/resource/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/ja.po b/addons/resource/i18n/ja.po
index e081695706a..f53e47e8e33 100644
--- a/addons/resource/i18n/ja.po
+++ b/addons/resource/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/lt.po b/addons/resource/i18n/lt.po
index 1f714291a87..3491166243a 100644
--- a/addons/resource/i18n/lt.po
+++ b/addons/resource/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/mn.po b/addons/resource/i18n/mn.po
index 077b8b0e61d..bf73f1d35ac 100644
--- a/addons/resource/i18n/mn.po
+++ b/addons/resource/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/nl.po b/addons/resource/i18n/nl.po
index 734858d07e8..65f23477611 100644
--- a/addons/resource/i18n/nl.po
+++ b/addons/resource/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/pl.po b/addons/resource/i18n/pl.po
index 05a71928a36..e7b60056180 100644
--- a/addons/resource/i18n/pl.po
+++ b/addons/resource/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/pt.po b/addons/resource/i18n/pt.po
index df71e9cbd93..13f3bba66ce 100644
--- a/addons/resource/i18n/pt.po
+++ b/addons/resource/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/pt_BR.po b/addons/resource/i18n/pt_BR.po
index 2db1bfcc5cf..de9525f9a66 100644
--- a/addons/resource/i18n/pt_BR.po
+++ b/addons/resource/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -23,6 +23,8 @@ msgid ""
 "If empty, this is a generic holiday for the company. If a resource is set, "
 "the holiday/leave is only for this resource"
 msgstr ""
+"Se estiver vazio, é um feriado comum para a empresa. Se o recurso for "
+"definido, o feriado/ausência é apenas para este recurso."
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
@@ -38,12 +40,12 @@ msgstr "Tipo de Recurso"
 #: model:ir.model,name:resource.model_resource_calendar_leaves
 #: view:resource.calendar.leaves:0
 msgid "Leave Detail"
-msgstr ""
+msgstr "Detalhes da Folga"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
 msgid "Resources Leaves"
-msgstr ""
+msgstr "Ausências dos Recursos"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
@@ -91,6 +93,8 @@ msgstr "Recursos"
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
+"Tenha certeza de que o tempo de trabalho está configurado com os dias da "
+"semana apropriados!"
 
 #. module: resource
 #: field:resource.calendar,manager:0
@@ -100,17 +104,17 @@ msgstr "Administrador do grupo de trabalho"
 #. module: resource
 #: help:resource.calendar.attendance,hour_from:0
 msgid "Working time will start from"
-msgstr ""
+msgstr "Horário de trabalho iniciará a partir"
 
 #. module: resource
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
-msgstr ""
+msgstr "Erro! A data de início da folga precisa vir antes da data final"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
 msgid "Resource Calendar"
-msgstr ""
+msgstr "Calendário de Recursos"
 
 #. module: resource
 #: field:resource.calendar,company_id:0
@@ -134,7 +138,7 @@ msgstr "Dia da semana"
 #. module: resource
 #: help:resource.calendar.attendance,hour_to:0
 msgid "Working time will end at"
-msgstr ""
+msgstr "Horário de trabalho terminará emr"
 
 #. module: resource
 #: field:resource.calendar.attendance,date_from:0
@@ -144,7 +148,7 @@ msgstr "Data inicial"
 #. module: resource
 #: view:resource.calendar:0
 msgid "Search Working Time"
-msgstr ""
+msgstr "Procurar Horário de Trabalho"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
@@ -165,7 +169,7 @@ msgstr "Data"
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Search Working Period Leaves"
-msgstr ""
+msgstr "Procurar Ausências em Período de Trabalho"
 
 #. module: resource
 #: field:resource.resource,time_efficiency:0
@@ -180,7 +184,7 @@ msgstr "Data Final"
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
 msgid "Closing Days"
-msgstr ""
+msgstr "Dias de Fechamento"
 
 #. module: resource
 #: model:ir.ui.menu,name:resource.menu_resource_config
@@ -208,12 +212,12 @@ msgstr "Quarta"
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 msgid "Working Period"
-msgstr ""
+msgstr "Horário de trabalho"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_resource
 msgid "Resource Detail"
-msgstr ""
+msgstr "Detalhes do Recurso"
 
 #. module: resource
 #: field:resource.resource,active:0
@@ -226,16 +230,18 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the resource "
 "record without removing it."
 msgstr ""
+"Se o campo ativo for definido como Falso, te permitirá esconder o registro "
+"do recurso sem removê-lo"
 
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
-msgstr ""
+msgstr "Calendário de Recursos"
 
 #. module: resource
 #: field:resource.calendar.attendance,hour_from:0
 msgid "Work from"
-msgstr ""
+msgstr "Trabalho de"
 
 #. module: resource
 #: model:ir.actions.act_window,help:resource.action_resource_calendar_form
@@ -243,21 +249,23 @@ msgid ""
 "Define working hours and time table that could be scheduled to your project "
 "members"
 msgstr ""
+"Definir horário de trabalhos e tabela de tempo que poderão ser agendadas aos "
+"seus membros do projeto."
 
 #. module: resource
 #: help:resource.resource,user_id:0
 msgid "Related user name for the resource to manage its access."
-msgstr ""
+msgstr "Usuário relacionado para o gerente controlar seus acessos"
 
 #. module: resource
 #: help:resource.resource,calendar_id:0
 msgid "Define the schedule of resource"
-msgstr ""
+msgstr "Definir a agenda do recurso"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Starting Date of Leave"
-msgstr ""
+msgstr "Data de Início da Folga"
 
 #. module: resource
 #: field:resource.resource,code:0
@@ -282,6 +290,11 @@ msgid ""
 "show a load of 100% for this phase by default, but if we put a efficency of "
 "200%, then his load will only be 50%."
 msgstr ""
+"Este campo representam a eficiência do recurso a tarefas completos. recurso, "
+"por exemplo um recurso único com uma fase de 5 dias com 5 tarefas "
+"atribuídas, mostrará uma carga de 100% para esta fase por padrão, se "
+"colocarmos uma meta de eficiência de 200%, então sua ocupação para esta "
+"história será de 50%."
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -291,13 +304,13 @@ msgstr "Terça"
 #. module: resource
 #: field:resource.calendar.leaves,calendar_id:0
 msgid "Working time"
-msgstr ""
+msgstr "Horário de Trabalho"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
 #: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Ausências de Recurso"
 
 #. module: resource
 #: model:ir.actions.act_window,help:resource.action_resource_resource_tree
@@ -306,6 +319,9 @@ msgid ""
 "in a specific project phase. You can also set their efficiency level and "
 "workload based on their weekly working hours."
 msgstr ""
+"Recursos te permitem criar e controlar recursos que estão envolvidos em uma "
+"fase específica do projeto. Você pode também definir seu nível de eficiência "
+"e sobrecarga baseado nas horas de trabalho da semana."
 
 #. module: resource
 #: view:resource.resource:0
@@ -316,13 +332,13 @@ msgstr "Inativa"
 #: code:addons/resource/faces/resource.py:340
 #, python-format
 msgid "(vacation)"
-msgstr ""
+msgstr "(férias)"
 
 #. module: resource
 #: code:addons/resource/resource.py:392
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Erro de Configuração!"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
@@ -332,7 +348,7 @@ msgstr "Humano"
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_attendance
 msgid "Work Detail"
-msgstr ""
+msgstr "Detalhes do Trabalho"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_from:0
@@ -358,3 +374,6 @@ msgstr "Sábado"
 
 #~ msgid "General Information"
 #~ msgstr "Informação Geral"
+
+#~ msgid "Efficiency factor"
+#~ msgstr "Fator de Eficiência"
diff --git a/addons/resource/i18n/ro.po b/addons/resource/i18n/ro.po
index 36388f3a9b2..9c479ee2bb4 100644
--- a/addons/resource/i18n/ro.po
+++ b/addons/resource/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/ru.po b/addons/resource/i18n/ru.po
index 9285df176ad..11aedae6ca0 100644
--- a/addons/resource/i18n/ru.po
+++ b/addons/resource/i18n/ru.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:26+0000\n"
+"PO-Revision-Date: 2012-10-23 18:55+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -107,7 +107,7 @@ msgstr "Рабочее время начнется с"
 #. module: resource
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
-msgstr ""
+msgstr "Ошибка! Дата начала отгула должна быть раньше даты завершения."
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
@@ -324,7 +324,7 @@ msgstr "(отпуск)"
 #: code:addons/resource/resource.py:392
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Ошибка конфигурации!"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
diff --git a/addons/resource/i18n/sl.po b/addons/resource/i18n/sl.po
index ab1822f2107..f01156a542b 100644
--- a/addons/resource/i18n/sl.po
+++ b/addons/resource/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/sv.po b/addons/resource/i18n/sv.po
index d7832481cfa..c2b900b3ba0 100644
--- a/addons/resource/i18n/sv.po
+++ b/addons/resource/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/tr.po b/addons/resource/i18n/tr.po
index 390186a43d5..978e64732fa 100644
--- a/addons/resource/i18n/tr.po
+++ b/addons/resource/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -23,6 +23,8 @@ msgid ""
 "If empty, this is a generic holiday for the company. If a resource is set, "
 "the holiday/leave is only for this resource"
 msgstr ""
+"Boşsa, bu firma için genel bir tatildir. Bir kaynak ayarlanmışsa, tatil/izin "
+"yalnızca bu kaynak içindir"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
@@ -38,12 +40,12 @@ msgstr "Kaynak Tipi"
 #: model:ir.model,name:resource.model_resource_calendar_leaves
 #: view:resource.calendar.leaves:0
 msgid "Leave Detail"
-msgstr ""
+msgstr "İzin Ayrıntısı"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves
 msgid "Resources Leaves"
-msgstr ""
+msgstr "İzin Kaynakları"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
@@ -73,7 +75,7 @@ msgstr "Pazar"
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
-msgstr ""
+msgstr "Arama Kaynağı"
 
 #. module: resource
 #: view:resource.resource:0
@@ -91,6 +93,7 @@ msgstr "Kaynaklar"
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
 msgstr ""
+"Çalışma süresinin haftanın doğru günleriyle yapılandırıldığından emin olun!"
 
 #. module: resource
 #: field:resource.calendar,manager:0
@@ -100,17 +103,17 @@ msgstr ""
 #. module: resource
 #: help:resource.calendar.attendance,hour_from:0
 msgid "Working time will start from"
-msgstr ""
+msgstr "İş süresinin başlama zamanı"
 
 #. module: resource
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
-msgstr ""
+msgstr "Hata! İzin başlangıç tarihi izin bitiş tarihinden önce olmalı."
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
 msgid "Resource Calendar"
-msgstr ""
+msgstr "Kaynak Takvim"
 
 #. module: resource
 #: field:resource.calendar,company_id:0
@@ -119,7 +122,7 @@ msgstr ""
 #: view:resource.resource:0
 #: field:resource.resource,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
@@ -134,38 +137,38 @@ msgstr ""
 #. module: resource
 #: help:resource.calendar.attendance,hour_to:0
 msgid "Working time will end at"
-msgstr ""
+msgstr "Çalışma süresinin bitiş zamanı"
 
 #. module: resource
 #: field:resource.calendar.attendance,date_from:0
 msgid "Starting date"
-msgstr ""
+msgstr "Başlangıç Tarihi"
 
 #. module: resource
 #: view:resource.calendar:0
 msgid "Search Working Time"
-msgstr ""
+msgstr "Çalışma Süresi Ara"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
-msgstr ""
+msgstr "Neden"
 
 #. module: resource
 #: view:resource.resource:0
 #: field:resource.resource,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Kullanıcı"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Search Working Period Leaves"
-msgstr ""
+msgstr "Çalışma Dönemi İzinleri Ara"
 
 #. module: resource
 #: field:resource.resource,time_efficiency:0
@@ -175,12 +178,12 @@ msgstr ""
 #. module: resource
 #: field:resource.calendar.leaves,date_to:0
 msgid "End Date"
-msgstr ""
+msgstr "Bitiş Tarihi"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.resource_calendar_closing_days
 msgid "Closing Days"
-msgstr ""
+msgstr "Kapanış Günleri"
 
 #. module: resource
 #: model:ir.ui.menu,name:resource.menu_resource_config
@@ -188,7 +191,7 @@ msgstr ""
 #: field:resource.calendar.leaves,resource_id:0
 #: view:resource.resource:0
 msgid "Resource"
-msgstr ""
+msgstr "Kaynak"
 
 #. module: resource
 #: view:resource.calendar:0
@@ -197,28 +200,28 @@ msgstr ""
 #: field:resource.calendar.leaves,name:0
 #: field:resource.resource,name:0
 msgid "Name"
-msgstr ""
+msgstr "Adı"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Wednesday"
-msgstr ""
+msgstr "Çarşamba"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 #: view:resource.resource:0
 msgid "Working Period"
-msgstr ""
+msgstr "Çalışma Aralığı"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_resource
 msgid "Resource Detail"
-msgstr ""
+msgstr "Kaynak Ayrıntısı"
 
 #. module: resource
 #: field:resource.resource,active:0
 msgid "Active"
-msgstr ""
+msgstr "Etkin"
 
 #. module: resource
 #: help:resource.resource,active:0
@@ -226,16 +229,18 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the resource "
 "record without removing it."
 msgstr ""
+"Etkin alan Yanlış olarak ayarlıysa, kaynak kaydını silmeden gizlemenizi "
+"sağlayacaktır."
 
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
-msgstr ""
+msgstr "Kaynağın Takvimi"
 
 #. module: resource
 #: field:resource.calendar.attendance,hour_from:0
 msgid "Work from"
-msgstr ""
+msgstr "Çalışma Başlangıcı"
 
 #. module: resource
 #: model:ir.actions.act_window,help:resource.action_resource_calendar_form
@@ -243,31 +248,32 @@ msgid ""
 "Define working hours and time table that could be scheduled to your project "
 "members"
 msgstr ""
+"Proje üyelerinize planlanacak çalışma saatleri ve zaman çizelgesi tanımla"
 
 #. module: resource
 #: help:resource.resource,user_id:0
 msgid "Related user name for the resource to manage its access."
-msgstr ""
+msgstr "Erişimini yönetmek için kaynak için ilgili kullanıcı adı."
 
 #. module: resource
 #: help:resource.resource,calendar_id:0
 msgid "Define the schedule of resource"
-msgstr ""
+msgstr "Kaynağın planlamasını tanımla"
 
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Starting Date of Leave"
-msgstr ""
+msgstr "İzin Başlangıç Tarihi"
 
 #. module: resource
 #: field:resource.resource,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Monday"
-msgstr ""
+msgstr "Pazartesi"
 
 #. module: resource
 #: field:resource.calendar.attendance,hour_to:0
@@ -286,18 +292,18 @@ msgstr ""
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Salı"
 
 #. module: resource
 #: field:resource.calendar.leaves,calendar_id:0
 msgid "Working time"
-msgstr ""
+msgstr "Çalışma zamanı"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
 #: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Kaynak İzinler"
 
 #. module: resource
 #: model:ir.actions.act_window,help:resource.action_resource_resource_tree
@@ -310,42 +316,51 @@ msgstr ""
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
-msgstr ""
+msgstr "Etkinsiz"
 
 #. module: resource
 #: code:addons/resource/faces/resource.py:340
 #, python-format
 msgid "(vacation)"
-msgstr ""
+msgstr "(tatil)"
 
 #. module: resource
 #: code:addons/resource/resource.py:392
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Yapılandırma Hatası!"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
 msgid "Human"
-msgstr ""
+msgstr "İnsan"
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar_attendance
 msgid "Work Detail"
-msgstr ""
+msgstr "Çalışma Ayrıntısı"
 
 #. module: resource
 #: field:resource.calendar.leaves,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Başlangıç Tarihi"
 
 #. module: resource
 #: code:addons/resource/resource.py:310
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (kopya)"
 
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Saturday"
-msgstr ""
+msgstr "Cumartesi"
+
+#~ msgid "Workgroup manager"
+#~ msgstr "İşgrubu Yöneticisi"
+
+#~ msgid "Day of week"
+#~ msgstr "Hafta Günü"
+
+#~ msgid "Efficiency factor"
+#~ msgstr "Verim faktörü"
diff --git a/addons/resource/i18n/vi.po b/addons/resource/i18n/vi.po
index 5c6c715bf83..dc88046d7d3 100644
--- a/addons/resource/i18n/vi.po
+++ b/addons/resource/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
diff --git a/addons/resource/i18n/zh_CN.po b/addons/resource/i18n/zh_CN.po
index 3c4f96cab2e..4e6a054ad3e 100644
--- a/addons/resource/i18n/zh_CN.po
+++ b/addons/resource/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: resource
 #: help:resource.calendar.leaves,resource_id:0
@@ -90,7 +90,7 @@ msgstr "资源"
 #: code:addons/resource/resource.py:392
 #, python-format
 msgid "Make sure the Working time has been configured with proper week days!"
-msgstr ""
+msgstr "请确保已经配置好适当的工作日的工作时间！"
 
 #. module: resource
 #: field:resource.calendar,manager:0
@@ -242,7 +242,7 @@ msgstr "工作从"
 msgid ""
 "Define working hours and time table that could be scheduled to your project "
 "members"
-msgstr ""
+msgstr "为你的项目成员定义工作时间和安排时间表"
 
 #. module: resource
 #: help:resource.resource,user_id:0
@@ -257,7 +257,7 @@ msgstr "定义资源调度"
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Starting Date of Leave"
-msgstr ""
+msgstr "假期开始日期"
 
 #. module: resource
 #: field:resource.resource,code:0
@@ -324,7 +324,7 @@ msgstr "（假期）"
 #: code:addons/resource/resource.py:392
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "设置错误!"
 
 #. module: resource
 #: selection:resource.resource,resource_type:0
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 354e9c5b27c..45fd9c20bc9 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -45,24 +45,24 @@ class resource_calendar(osv.osv):
     def working_hours_on_day(self, cr, uid, resource_calendar_id, day, context=None):
         """Calculates the  Working Total Hours based on Resource Calendar and
         given working day (datetime object).
-        
+
         @param resource_calendar_id: resource.calendar browse record
         @param day: datetime object
-        
+
         @return: returns the working hours (as float) men should work on the given day if is in the attendance_ids of the resource_calendar_id (i.e if that day is a working day), returns 0.0 otherwise
         """
         res = 0.0
         for working_day in resource_calendar_id.attendance_ids:
             if (int(working_day.dayofweek) + 1) == day.isoweekday():
                 res += working_day.hour_to - working_day.hour_from
-        return res 
+        return res
 
     def _get_leaves(self, cr, uid, id, resource):
-        """Private Method to Calculate resource Leaves days 
-        
+        """Private Method to Calculate resource Leaves days
+
         @param id: resource calendar id
-        @param resource: resource id for which leaves will ew calculated 
-        
+        @param resource: resource id for which leaves will ew calculated
+
         @return : returns the list of dates, where resource on leave in
                   resource.calendar.leaves object (e.g.['%Y-%m-%d', '%Y-%m-%d'])
         """
@@ -85,9 +85,9 @@ class resource_calendar(osv.osv):
         """
         Calculates the working Schedule from supplied from date to till hours
         will be satisfied  based or resource calendar id. If resource is also
-        given then it will consider the resource leave also and than will 
+        given then it will consider the resource leave also and than will
         calculates resource working schedule
-        
+
         @param dt_from: datetime object, start of working scheduled
         @param hours: float, total number working  hours needed scheduled from
                       start date
@@ -187,29 +187,29 @@ class resource_calendar(osv.osv):
 
     def interval_get(self, cr, uid, id, dt_from, hours, resource=False, byday=True):
         """Calculates Resource Working Internal Timing Based on Resource Calendar.
-        
+
         @param dt_from: start resource schedule calculation.
         @param hours : total number of working hours to be scheduled.
-        @param resource: optional resource id, If supplied it will take care of 
+        @param resource: optional resource id, If supplied it will take care of
                          resource leave while scheduling.
         @param byday: boolean flag bit enforce day wise scheduling
-        
+
         @return :  list of scheduled working timing  based on resource calendar.
         """
         res = self.interval_get_multi(cr, uid, [(dt_from.strftime('%Y-%m-%d %H:%M:%S'), hours, id)], resource, byday)[(dt_from.strftime('%Y-%m-%d %H:%M:%S'), hours, id)]
         return res
 
     def interval_hours_get(self, cr, uid, id, dt_from, dt_to, resource=False):
-        """ Calculates the Total Working hours based on given start_date to 
-        end_date, If resource id is supplied that it will consider the source 
+        """ Calculates the Total Working hours based on given start_date to
+        end_date, If resource id is supplied that it will consider the source
         leaves also in calculating the hours.
-        
+
         @param dt_from : date start to calculate hours
         @param dt_end : date end to calculate hours
         @param resource: optional resource id, If given resource leave will be
-                         considered. 
-        
-        @return : Total number of working hours based dt_from and dt_end and 
+                         considered.
+
+        @return : Total number of working hours based dt_from and dt_end and
                   resource if supplied.
         """
         if not id:
@@ -257,7 +257,7 @@ resource_calendar()
 class resource_calendar_attendance(osv.osv):
     _name = "resource.calendar.attendance"
     _description = "Work Detail"
-    
+
     _columns = {
         'name' : fields.char("Name", size=64, required=True),
         'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of Week', required=True, select=True),
@@ -266,9 +266,9 @@ class resource_calendar_attendance(osv.osv):
         'hour_to' : fields.float("Work to", required=True),
         'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True),
     }
-    
+
     _order = 'dayofweek, hour_from'
-    
+
     _defaults = {
         'dayofweek' : '0'
     }
@@ -302,12 +302,12 @@ class resource_resource(osv.osv):
         'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.resource', context=context)
     }
 
-    
+
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
         if not default.get('name', False):
-            default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)')
+            default.update(name=_('%s (copy)') % (self.browse(cr, uid, id, context=context).name))
         return super(resource_resource, self).copy(cr, uid, id, default, context)
 
     def generate_resources(self, cr, uid, user_ids, calendar_id, context=None):
@@ -368,7 +368,7 @@ class resource_resource(osv.osv):
         """
         if not calendar_id:
             # Calendar is not specified: working days: 24/7
-            return [('fri', '8:0-12:0','13:0-17:0'), ('thu', '8:0-12:0','13:0-17:0'), ('wed', '8:0-12:0','13:0-17:0'), 
+            return [('fri', '8:0-12:0','13:0-17:0'), ('thu', '8:0-12:0','13:0-17:0'), ('wed', '8:0-12:0','13:0-17:0'),
                    ('mon', '8:0-12:0','13:0-17:0'), ('tue', '8:0-12:0','13:0-17:0')]
         resource_attendance_pool = self.pool.get('resource.calendar.attendance')
         time_range = "8:00-8:00"
@@ -438,7 +438,7 @@ class resource_calendar_leaves(osv.osv):
         (check_dates, 'Error! leave start-date must be lower then leave end-date.', ['date_from', 'date_to'])
     ]
 
-    def onchange_resource(self,cr, uid, ids, resource, context=None):
+    def onchange_resource(self, cr, uid, ids, resource, context=None):
         result = {}
         if resource:
             resource_pool = self.pool.get('resource.resource')
diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py
index fe19b7fa609..5a7b4b499df 100644
--- a/addons/sale/__init__.py
+++ b/addons/sale/__init__.py
@@ -24,11 +24,9 @@
 #----------------------------------------------------------
 
 import sale
-import stock
 import res_partner
 import wizard
 import report
-import company
 import edi
 import res_config
 
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index b6be6f7b1e3..218f844c0e1 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -23,55 +23,49 @@
     'name': 'Sales Management',
     'version': '1.0',
     'category': 'Sales Management',
-    "sequence": 14,
-    "summary": "Quotations, Sale Orders, Invoicing",
+    'sequence': 14,
+    'summary': 'Quotations, Sale Orders, Invoicing',
     'description': """
-The base module to manage quotations and sales orders.
-======================================================
+Manage sales quotations and orders
+==================================
 
-Workflow with validation steps:
--------------------------------
-    * Quotation -> Sales order -> Invoice
+This application allows you to manage your sales goals in an effective and efficient manner by keeping track of all sales orders and history.
 
-Create Invoice:
----------------
-    * Invoice on Demand
-    * Invoice on Delivery Order
-    * Invoice Before Delivery
+It handles the full sales workflow:
 
-Partners preferences:
----------------------
-    * Incoterm
-    * Shipping
-    * Invoicing
+* **Quotation** -> **Sales order** -> **Invoice**
 
-Products stocks and prices:
---------------------------
+Preferences (only with Warehouse Management installed)
+------------------------------------------------------
 
-Delivery method:
------------------
-    * The Poste
-    * Free Delivery Charges
-    * Normal Delivery Charges
-    * Based on the Delivery Order(if not Add to sale order) 
+If you also installed the Warehouse Management, you can deal with the following preferences:
 
-Dashboard for Sales Manager that includes:
-------------------------------------------
-    * My Quotations
-    * Monthly Turnover (Graph)
+* Shipping: Choice of delivery at once or partial delivery
+* Invoicing: choose how invoices will be paid
+* Incoterms: International Commercial terms
+
+You can choose flexible invoicing methods:
+
+* *On Demand*: Invoices are created manually from Sales Orders when needed
+* *On Delivery Order*: Invoices are generated from picking (delivery)
+* *Before Delivery*: A Draft invoice is created and must be paid before delivery
+
+
+The Dashboard for the Sales Manager will include
+------------------------------------------------
+* My Quotations
+* Monthly Turnover (Graph)
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'images': ['images/deliveries_to_invoice.jpeg','images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'],
-    'depends': ['stock', 'procurement', 'board', 'account_voucher'],
-    'init_xml': [],
-    'update_xml': [
+    'images': ['images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'],
+    'depends': ['account_voucher'],
+    'data': [
         'wizard/sale_make_invoice_advance.xml',
         'wizard/sale_line_invoice.xml',
         'wizard/sale_make_invoice.xml',
         'security/sale_security.xml',
         'security/ir.model.access.csv',
-        'company_view.xml',
         'sale_workflow.xml',
         'sale_sequence.xml',
         'sale_report.xml',
@@ -79,18 +73,15 @@ Dashboard for Sales Manager that includes:
         'sale_view.xml',
         'res_partner_view.xml',
         'report/sale_report_view.xml',
-        'stock_view.xml',
         'process/sale_process.xml',
         'board_sale_view.xml',
         'edi/sale_order_action_data.xml',
         'res_config_view.xml',
     ],
-    'demo_xml': ['sale_demo.xml'],
+    'demo': ['sale_demo.xml'],
     'test': [
         'test/sale_order_demo.yml',
-        'test/picking_order_policy.yml',
         'test/manual_order_policy.yml',
-        'test/prepaid_order_policy.yml',
         'test/cancel_order.yml',
         'test/delete_order.yml',
         'test/edi_sale_order.yml',
@@ -98,6 +89,5 @@ Dashboard for Sales Manager that includes:
     'installable': True,
     'auto_install': False,
     'application': True,
-    'certificate': '0058103601429',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index 702bc0c61cc..4839744c6d2 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -51,7 +51,7 @@
                 <form string="Sales Dashboard" version="7.0">
                     <board style="2-1">
                         <column>
-                            <action name="%(action_quotation_for_sale)d" string="My Quotations" creatable="true"/>
+                            <action name="%(action_quotation_for_sale)d" string="My Quotations"/>
                         </column>
                         <column>
                             <action name="%(action_turnover_by_month)d" string="Monthly Turnover"/>
diff --git a/addons/sale/edi/sale_order.py b/addons/sale/edi/sale_order.py
index b850922cbb2..edec15a86ae 100644
--- a/addons/sale/edi/sale_order.py
+++ b/addons/sale/edi/sale_order.py
@@ -185,16 +185,9 @@ class sale_order(osv.osv, EDIMixin):
 
         order_lines = edi_document['order_line']
         for order_line in order_lines:
-            self._edi_requires_attributes(('date_planned', 'product_id', 'product_uom', 'product_qty', 'price_unit'), order_line)
+            self._edi_requires_attributes(( 'product_id', 'product_uom', 'product_qty', 'price_unit'), order_line)
             order_line['product_uom_qty'] = order_line['product_qty']
             del order_line['product_qty']
-            date_planned = order_line.pop('date_planned')
-            delay = 0
-            if date_order and date_planned:
-                # no security_days buffer, this is the promised date given by supplier
-                delay = (datetime.strptime(date_planned, DEFAULT_SERVER_DATE_FORMAT) - \
-                         datetime.strptime(date_order, DEFAULT_SERVER_DATE_FORMAT)).days
-            order_line['delay'] = delay
 
             # discard web preview fields, if present
             order_line.pop('price_subtotal', None)
@@ -216,11 +209,6 @@ class sale_order_line(osv.osv, EDIMixin):
                 edi_doc.update(product_uom=line.product_uos,
                                product_qty=line.product_uos_qty)
 
-            # company.security_days is for internal use, so customer should only
-            # see the expected date_planned based on line.delay
-            date_planned = datetime.strptime(line.order_id.date_order, DEFAULT_SERVER_DATE_FORMAT) + \
-                            relativedelta(days=line.delay or 0.0)
-            edi_doc['date_planned'] = date_planned.strftime(DEFAULT_SERVER_DATE_FORMAT)
             edi_doc_list.append(edi_doc)
         return edi_doc_list
 
diff --git a/addons/sale/edi/sale_order_action_data.xml b/addons/sale/edi/sale_order_action_data.xml
index 181bd8183d7..da1a1ceb393 100644
--- a/addons/sale/edi/sale_order_action_data.xml
+++ b/addons/sale/edi/sale_order_action_data.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" ?>
 <openerp>
     <data>
-        <!-- EDI Export + Send email Action  -->
-        <record id="ir_actions_server_edi_sale" model="ir.actions.server">
-            <field name="code">if not object.partner_id.opt_out: object.edi_export_and_email(template_ext_id='sale.email_template_edi_sale', context=context)</field>
-            <field name="state">code</field>
-            <field name="type">ir.actions.server</field>
-            <field name="model_id" ref="sale.model_sale_order"/>
-            <field name="condition">True</field>
-            <field name="name">Auto-email confirmed sale orders</field>
-        </record>
 
         <!-- EDI related Email Templates menu -->
         <record model="ir.actions.act_window" id="action_email_templates">
@@ -25,21 +16,16 @@
     </data>
 
 
-    <!-- Mail template and workflow bindings are done in a NOUPDATE block
+    <!-- Mail template is done in a NOUPDATE block
          so users can freely customize/delete them -->
     <data noupdate="1">
-         <!-- bind the mailing server action to sale.order confirmed activity -->
-        <record id="sale.act_wait_ship" model="workflow.activity">
-            <field name="action_id" ref="ir_actions_server_edi_sale"/>
-        </record>
-
 
         <!--Email template -->
         <record id="email_template_edi_sale" model="email.template">
             <field name="name">Automated Sale Order Notification Mail</field>
             <field name="email_from">${object.user_id.email or ''}</field>
             <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field>
-            <field name="email_to">${object.partner_invoice_id.email}</field>
+            <field name="email_recipients">${object.partner_invoice_id.id}</field>
             <field name="model_id" ref="sale.model_sale_order"/>
             <field name="auto_delete" eval="True"/>
             <field name="body_html"><![CDATA[
@@ -47,7 +33,7 @@
 
     <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>
     
-    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from {$object.company_id.name}: </p>
+    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}: </p>
 
     <p style="border-left: 1px solid #8e0000; margin-left: 30px;">
        &nbsp;&nbsp;<strong>REFERENCES</strong><br />
@@ -126,67 +112,6 @@
     </div>
 </div>
             ]]></field>
-            <field name="body_text"><![CDATA[
-Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},
-
-Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}:
-       | Order number: *${object.name}*
-       | Order total: *${object.amount_total} ${object.pricelist_id.currency_id.name}*
-       | Order date: ${object.date_order}
-       % if object.origin:
-       | Order reference: ${object.origin}
-       % endif
-       % if object.client_order_ref:
-       | Your reference: ${object.client_order_ref}<br />
-       % endif
-       | Your contact: ${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-
-You can view the ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'}, download it and even pay online using the following link:
-    ${ctx.get('edi_web_url_view') or 'n/a'}
-
-% if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account and object.state not in ('draft', 'sent'):
-<%
-comp_name = quote(object.company_id.name)
-order_name = quote(object.name)
-paypal_account = quote(object.company_id.paypal_account)
-order_amount = quote(str(object.amount_total))
-cur_name = quote(object.pricelist_id.currency_id.name)
-paypal_url = "https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amount=%s" \
-             "&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow_%s" % \
-             (paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_name)
-%>
-It is also possible to directly pay with Paypal:
-    ${paypal_url}
-% endif
-
-If you have any question, do not hesitate to contact us.
-
-
-Thank you for choosing ${object.company_id.name}!
-
-
---
-${object.user_id.name} ${object.user_id.email and '<%s>'%(object.user_id.email) or ''}
-${object.company_id.name}
-% if object.company_id.street:
-${object.company_id.street or ''}
-% endif
-% if object.company_id.street2:
-${object.company_id.street2}
-% endif
-% if object.company_id.city or object.company_id.zip:
-${object.company_id.zip or ''} ${object.company_id.city or ''}
-% endif
-% if object.company_id.country_id:
-${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}
-% endif
-% if object.company_id.phone:
-Phone: ${object.company_id.phone}
-% endif
-% if object.company_id.website:
-${object.company_id.website or ''}
-% endif
-            ]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/sale/i18n/ar.po b/addons/sale/i18n/ar.po
index c7219d236a4..7ec373e78e4 100644
--- a/addons/sale/i18n/ar.po
+++ b/addons/sale/i18n/ar.po
@@ -6,21 +6,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:46+0000\n"
 "Last-Translator: Raphael Collet (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: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "فاتورة الدفع المقدم"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "تأكيد التسعيرة"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "لوحة المبيعات"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "تاريخ التأكيد"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "تجميع حسب ..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -29,62 +177,345 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "مبيعات بواسطة مندوب المبيعات فى آخر 90 يوماً"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "حصة الشريك"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "حالة الأمر"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"إذا لم يكن المخزون كافياً لتسليم الكميات المطلوبة في وقت واحد، هل تقبل "
-"بالشحن الجزئي؟"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "في انتظار الفوترة"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "عنوان الشحن لطلب المبيعات الحالي"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "تاريخ تأكيد أمر المبيعات"
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "الكمية"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "التسعيرات"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "اليوم"
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "مارس/آذار"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "الشركة"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "تاريخ الفاتورة"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "السطور المستلمة غير المفوترة"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "المبلغ المفوتر مقدماً"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "خلل في الفاتورة"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "المبلغ الإجمالي"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "تحليل الحساب"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "المجموع"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "إلغاء الطلب"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "تم تحويل العرض المالي '%s' إلى طلب مبيعات"
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "الوزن"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "تحذير !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "سبتمبر/أيلول"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "الضرائب"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "المبلغ دون ضرائب"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "المجموع الصافي"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "ملغي"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "المجموع"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "المتجر"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "المبيعات ذات الخلل"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "عنوان الفاتورة"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "تاريخ إنشاء أمر المبيعات"
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "إعادة إنشاء الفاتورة"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "إنشاء الفواتير"
 
 #. module: sale
 #: report:sale.order:0
@@ -92,73 +523,645 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "يحدد أوامر التحصيل لكل سطر في أوامر المبيعات."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "تحليل الحساب"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"هذه قائمة بكل سطر من أوامر المبيعات المعدّة للفوترة. يمكنك فوترة أوامر "
-"المبيعات جزئياً، حسب سطور أوامر المبيعات. لست بحاجة لهذه القائمة إذا كنت "
-"تقوم بالفوترة حسب أوامر التسليم أو إذا كنت لا تستخدم الفوترة الجزئية."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "أمر تحصيل"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "شريك"
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "تأكيد التاريخ"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "عدد السطور"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# للكمية"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "الفاكس:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "أمر المبيعات"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "الكمية (وحدة البيع)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "مبلغ الدفع المقدم"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "مؤكد"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "أجل السداد الافتراضي"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "تأكيد"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "عنوان الشحن"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "دورة الشهر"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "السنة"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "سطر الأمر"
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
 msgstr ""
-"أوامر البيع تساعدك على إدارة الأسعار والأوامر من العملاء. OpenERP تشير إلى "
-"أن تبدأ من خلال انشاء تسعيره. مرة واحدة يتم تأكيد ذلك، سيتم تحويل الاسعار في "
-"امر المبيعات. يمكن OpenERP التعامل مع عدة أنواع من المنتجات  قد تؤدي ترتيب "
-"مبيعات  المهام، وأوامر التسليم، وأوامر التصنيع، والمشتريات، وهلم جرا. "
-"استنادا إلى تكوين النظام للمبيعات، سيتم إنشاء فاتورة المشروع بحيث يكون لديك "
-"فقط للتأكد من ذلك عندما ترغب في فاتورة العميل."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "ترتيب بالعدد"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "سطور الأوامر"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "نسبة الخصم (%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "مرجع الأمر"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "سطور الفواتير"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "السعر الإجمالي"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "التسعيرات السابقة"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "اختر لتجميع الفواتير حسب العميل"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "أصدر الفواتير"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "ساعة"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "تاريخ الإنشاء"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "بإنتظار الجدول"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "عنوان الفاتورة لأمر البيع الحالي"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "الكميات المطلوبة"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "الكمية"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "المجموع"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "مبيعاتي"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "لا يمكن إجراء هذه العملية!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "الوضع المالي"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "يوليو/تموز"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "تاريخ التسعيرة"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "تاريخ الأمر"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "شريك"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "تُنشأ المبيعات الفاتورة"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "الخصم (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"لا يمكن إنشاء فاتورة لسطر أمر المبيعات هذا لأحد السببين التاليين:\n"
+"1. سطر أمر المبيعات في حالة \"مسودة\" أو \"إلغاء\"!\n"
+"2. سطر أمر المبيعات مفوتر!"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "العروض الخاصة بي"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "ديسمبر/كانون الأول"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "تمّ الشحن"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "الشهر"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "غير مفوتر"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "فئة المنتج"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "اسم المتجر"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "الضرائب:"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "فاتورة الدفع المقدم للمبيعات"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "قيد التقدم"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "لا يوجد عملاء"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "إنشاء الفواتير"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -175,1198 +1178,9 @@ msgstr ""
 "والكميات التي يتم شحنها تعني الساعات التي تقضيها على المهام المرتبطة بها."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "أجل السداد الافتراضي"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "الحالة"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "نسبة الخصم (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "السعر الإجمالي"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "اختر لتجميع الفواتير حسب العميل"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "الكميات المطلوبة"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "المبيعات بواسطة مندوب المبيعات"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "نقل المخزون"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "مرجع الأمر"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "معلومات أخرى"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "التواريخ"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"يتم عمل الفاتورة تلقائيًا اذا كانت سياسة الشحن ‘فاتورة بالاختيار‘ او ‘فاتورة "
-"بعد تسليم البضاعة‘."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "تُنشأ المبيعات الفاتورة"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "الخصم (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "العروض الخاصة بي"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "لوحة معلومات مدير المبيعات"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "التعبئة"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "من أمر مبيعات"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "اسم المتجر"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "لا يوجد عملاء"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "المبيعات ذات الخلل"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "خطأ في الإعدادات!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "الشروط"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"لا يوجد حساب تصنيف للايراد محدد في الخصائص الافتراضية لتصنيف المنتج او لم "
-"يُحدد الوضع المالي !"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "أغسطس/آب"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "انت تحاول تخصيص الكثير من ما هو دون المنتج نفسه"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "الإسلوب غير صالح حالة الاختبار"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "يونيو/حزيران"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "لم يمكن إلغاء أمر البيع"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "إحصائيات أوامر البيع"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "الحساب التحليلي المتعلق بأمر بيع"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "أكتوبر/تشرين الأول"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "التسعيرات"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "قائمة الأسعار لأمر البيع الحالي"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr "عدد الأيام منذ تأكيد الطلب حتى شحن المنتج للعميل"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "تاريخ التسعيرة"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "الوضع المالي"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "وحدة القياس"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "عدد الطرود/عدد الحزم"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "قيد التقدم"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"مندوب المبيعات يؤكد التسعيرة. يحوّل حالة أمر المبيعات إلى 'قيد التفيذ' أو "
-"'قيد التنفيذ يدوياً'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr "يجب أولاً أن تلغي عمليات نقل المخزون المرتبطة بسطر أمر المبيعات هذا."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(غير ممكن)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"اختار منتج من نوع الخدمة التي تسمى ‘منتج مدفوع مقدما‘. قد تقوم بإنشائها "
-"ووضعها كقيمة افتراضية في هذا الحق."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "هاتف:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr "لا يمكنك الدفع مقدماً لأمر مبيعات معدّ لـ 'فوترة آلية بعد التسليم'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "ملاحظات"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "اسم الشركة يجب أن يكون فريداً !"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "عنوان الفاتورة لأمر البيع الحالي"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "شهر- ١"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "مفوتر"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "أمر التسليم"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "تاريخ التأكيد"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "مصطلحات تجارية مشتركة"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "حصة الشريك"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "مارس/آذار"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "المبلغ الإجمالي"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "المجموع"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "عنوان الفاتورة:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr "لكل سطر أمر مبيعات، يتمّ إنشاء أمر تحصيل يوفر المنتج المباع."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"تشير كلمة انكوترم لـ ‘مصطلحات تجارية دولية‘ وتتضمن مسلسلها من مصطلحات "
-"المبيعات المستخدمة في الصفقات التجارية."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "عنوان الفاتورة"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "ابحث السطور غير المفوترة"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "التسعيرة / الأمر"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "عدد السطور"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "فاتورة مبيعات غير مسددة"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "سطر أمر المبيعات"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "المخزن"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "ترتيب بالعدد"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "سطور الأوامر"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "المبلغ بدون ضرائب"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "السطور المعدّة للفوترة"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "الكمية (وحدة قياس)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "تاريخ الإنشاء"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "متفرقات"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "السطور المستلمة غير المفوترة"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "المجموع"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "مبيعاتي"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "لا يمكن إجراء هذه العملية!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "معلومات إضافية"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "قائمة الأسعار"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# للكمية"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "ساعة"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "تاريخ الأمر"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "تمّ الشحن"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "جميع التسعيرات"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "خيارات"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "سبتمبر/أيلول"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "فئة المنتج"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "الضرائب:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "تحركات المخزون"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "حالة الأمر"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "هل تريد فعلاً  إنشاء الفاتورة/الفواتبر؟"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "المبيعات حسب الشهر"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "لم يمكن إلغاء سطر أمر المبيعات!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "أيام الأمان"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "تحصيل المواد المباعة"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "إنشاء الفاتورة النهائية"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "عنوان الشحن"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"تمّ تسليم أمر المبيعات. لا يتمّ تحديث هذا الحقل إلا بعد تشغيل المجدوِل."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "التاريخ"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "مرشحات مفصلة..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "استثناء"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "الشركات"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "المحفوظات"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"هذه قائمة بالفواتير التي تمّ إنشاؤها لأمر المبيعات هذا. يمكن أن يكون هناك "
-"أكثر من فاتورة لأمر مبيعات واحد (حسب السطر مثلاً)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "مرجعك"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "اسم وعنوان جهة الاتصال التي طلبت الأمر أو التسعيرة"
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "الأيام المضافة لأسباب أمنية"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "الكمية"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "المراجع"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "إلغاء"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "إنشاء فاتورة"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "المجموع دون ضرائب"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "تمّ إنشاء الفاتورة بنجاح!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "المبيعات حسب الشريك"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "ممثل العميل"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "فاتورة غير مسددة"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "لا يوجد دفتر يومية مبيعات معرّف لهذه الشركة: \"%s\" (id: %d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "تخصيص نفاذ"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "تحت الطلب"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "بناءً على الكميات المشحونة أو المطلوبة"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "عمليات التقاط ذات علاقة"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "الاسم"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "عنوان الشحن"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "المبيعات لكل عميل خلال الـ 90 يوماً الماضية"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "مسودّة: حالة من حالات أمر المبيعات"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "إنشاء أمر تسليم"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "المجموع مع الضرائب"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "إنشاء قائمة الالتقاط"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "المبيعات حسب فئة المنتج"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "تأكيد التسعيرة"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "خطأ"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "تجميع حسب ..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "إعادة إنشاء الفاتورة"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "أوامر التسليم المعدّة للفوترة"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "بإنتظار الجدول"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "طريقة الشراء"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "قائمة الالتقاط"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "مسودّة"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "وثيقة الانتقال الى الخروج او اللى العميل."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "تحقق"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "تأكيد الأمر"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "إنشاء أمر تحصيل"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "الضرائب"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "تاريخ إنشاء أمر المبيعات"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "نقل مخزون"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "إنشاء الفواتير"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "الفاكس:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "مبلغ الدفع المقدم"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "الكميات المشحونة"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "أصدر الفواتير بناءً على أوامر المبيعات"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "قائمة الالتقاط"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "خطأ !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "لم يمكن إلغاء أمر المبيعات!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "يوليو/تموز"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "التحصيل"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "خلل شحن"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "تجميع الفواتير"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "بحاجة إلى مراجعة المحاسِب"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "وحدة القياس المرجعية"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
@@ -1375,14 +1189,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "ينشأ خط طلب البيع الفاتورة"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "خلل في الفاتورة"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "يحدد كلاً من التحصيل والفواتير"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "مسودّة"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1390,563 +1199,10 @@ msgid "Paid"
 msgstr "مدفوع"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "تحليل المبيعات"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "إعادة إنشاء التعبئة"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "الخصائص"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "التسعيرة"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"ينشأ البائع الفاتورة يدويا، إذا كان النظام لسياسة شحن المبيعات هي \"دليل "
-"والشحن في التقدم\". يتم إنشاء الفاتورة تلقائيا إذا كانت سياسة النقل البحري "
-"هو \"الدفع قبل التسليم\"."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr "يمكنك إنشاء الفواتير بناءً على أوامر المبيعات أو بناءً على الشحنات."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "فواتير العميل"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "المبيعات"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "سعر الوحدة"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "تمّ"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "الفاتورة"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"يجب أن تختار عميلاً في نموذج المبيعات!\n"
-"فضلاً حدّد عميلاً قبل اختيار المنتج."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "مستند المصدر"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "في انتظار التنفيذ"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "سياسة الالتقاط"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "وثيقة الانتقال إلى العميل."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "المبلغ دون ضرائب"
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr "يجب أولاً أن تلغي جميع الالتقاطات المرتبطة بأمر المبيعات هذا."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "فاتورة الدفع المقدم للمبيعات"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "الشهر"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "المنتج"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "إلغي التخصيص"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "المبيعات.تكوين.اختيار_سياسة"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "دورة الشهر"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "فاتورة لـ"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "تاريخ الأمر"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "وحدة البيع للمنتج"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "قيد التنفيذ يدوياً"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "وحدة القياس للمنتج"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "سوقية"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "أمر"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "لا يوجد حساب دخل معرّف لهذا المنتج: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "تجاهل الخلل"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"اعتمادا على مراقبة الفواتير من امر المبيعات، يمكن أن تستند على تسليم "
-"الفاتورة أو على الكميات المطلوبة. وبالتالي، يمكن أن تنشأ امر المبيعات فاتورة "
-"أو أمر تسليم حالما يتم تأكيده من قبل البائع."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"تريد بيع %.2f %s ولكن لديك %.2f %s فقط!\n"
-"المخزون الحقيقي: %.2f %s. (دون حجز)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "حالات"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "مرجع العميل"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "المجموع"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "السعر"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"بالاعتماد على تكوين مكان الصادر, تم عمل الانتقال بين المنطقة المصدرة والعميل "
-"عن طريق امر التسليم تلقائيًا او يدويًا."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "لوحة المبيعات"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "أصدر الفواتير"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "في انتظار الفوترة"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "تاريخ تأكيد أمر المبيعات"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "الشركة"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "تاريخ الفاتورة"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "المبلغ المفوتر مقدماً"
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "هذه قائمة الالتقاط الخاصة بأمر المبيعات هذا."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "إنشاء الفواتير"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "المجموع الصافي"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "ملغي"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "المتجر"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "تأكيد التاريخ"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "تحذير"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "المبيعات حسب الشهر"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "أمر المبيعات"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "الكمية (وحدة البيع)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"يتم إنشاء نموذج للقائمة المختارة حالما يتم تأكيد ترتيب المبيعات، في نفس "
-"الوقت من اجل الشراء. لأنها تمثل أجزاء مهمة من امر المبيعات. هناك قائمة "
-"اختيار 1 من قبل خط ترتيب المبيعات التي تتطور مع توافر قطع الغيار."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "مؤكد"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "تأكيد"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "المبيعات حسب فئة المنتج خلال الـ 90 يوماً الماضية"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "سطور الفواتير"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "سطور أوامر المبيعات"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "الوقت اللازم للتسليم"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "الإعدادات"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"لا يمكن إنشاء فاتورة لسطر أمر المبيعات هذا لأحد السببين التاليين:\n"
-"1. سطر أمر المبيعات في حالة \"مسودة\" أو \"إلغاء\"!\n"
-"2. سطر أمر المبيعات مفوتر!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "الوزن"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "الفواتير"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "ديسمبر/كانون الأول"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "الصورة"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"يتم تلقائيا إنشاء نظام الشراء في أقرب وقت لتأكيد ترتيب المبيعات أو كما يتم "
-"دفع الفاتورة. انه يقود عمليات الشراء وإنتاج المنتجات المتعلقة بالقواعد "
-"والمعايير لترتيب المبيعات. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "غير مفوتر"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "مندوب المبيعات"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "التسعيرات السابقة"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "المبلغ دون ضرائب"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "فاتورة الدفع المقدم"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "تمّ إلغاء أمر المبيعات '%s'"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "مسودّة"
-
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1968,6 +1224,18 @@ msgstr ""
 "* تم تعيين الحالة \"ملغاة\" عندما يقوم المستخدم بإلغاء ترتيب المبيعات ذات "
 "الصلة."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "أوامر المبيعات"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "تجميع الفواتير"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -1975,56 +1243,170 @@ msgstr "مبلغ الضرائب"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "الطرود"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "أغسطس/آب"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "يحدد كلاً من التحصيل والفواتير"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "يونيو/حزيران"
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "قوالب البريد الإلكتروني"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "أوامر المبيعات"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "أمر"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "متجر المبيعات"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "إحصائيات أوامر البيع"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "التاريخ"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "سطر أمر المبيعات"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "نوفمبر/تشرين الثاني"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "مرشحات مفصلة..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "منتج الدفع المقدم"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "احسب"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "استثناء"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr "يجب أولاً إلغاء جميع الفواتير المرتبطة بأمر المبيعات هذا."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "أكتوبر/تشرين الأول"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"ينشأ البائع الفاتورة يدويا، إذا كان النظام لسياسة شحن المبيعات هي \"دليل "
+"والشحن في التقدم\". يتم إنشاء الفاتورة تلقائيا إذا كانت سياسة النقل البحري "
+"هو \"الدفع قبل التسليم\"."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2036,93 +1418,328 @@ msgstr "يناير/كانون الثاني"
 msgid "Sales Order in Progress"
 msgstr "أمر المبيعات قيد التنفيذ"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"مندوب المبيعات يؤكد التسعيرة. يحوّل حالة أمر المبيعات إلى 'قيد التفيذ' أو "
+"'قيد التنفيذ يدوياً'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr "مرجع المستند الذي أصدر طلب أمر المبيعات هذا"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "تأخير في الالتزام"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr "أمر تحصيل واحد لكل سطر أمر مبيعات ولكل من المكوّنات."
+#: view:sale.order:0
+msgid "History"
+msgstr "المحفوظات"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "تعيين"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"هذه قائمة بالفواتير التي تمّ إنشاؤها لأمر المبيعات هذا. يمكن أن يكون هناك "
+"أكثر من فاتورة لأمر مبيعات واحد (حسب السطر مثلاً)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "مرجعك"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "ترتيب التواريخ"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "قائمة الأسعار"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "فواتير العميل"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "فوترة أمر المبيعات المؤكّد"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "سطور أوامر المبيعات"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "المبيعات"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "تمّ وضع أمر المبيعات '%s' في حالة \"مسودّة\"."
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "اليوم"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "من المخزون"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "الفواتير"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "إغلاق"
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "سعر الوحدة"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "تمّ"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "عنوان الفاتورة:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "الفاتورة"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "إلغاء"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "تمّ التسليم"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "التسعيرة"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "يجب تعيين دفعة إنتاج لهذا المنتج"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "ابحث السطور غير المفوترة"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "في انتظار التنفيذ"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "عنوان الشحن"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "تحليل المبيعات"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "قائمة الأسعار لأمر البيع الحالي"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "إنشاء فاتورة"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "المبلغ دون ضرائب"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
-"إذا كان لديك أكثر من متجر إعادة بيع منتجات الشركة الخاصة بك، يمكنك إنشاء "
-"وإدارة ذلك من هنا. كلما كنت سوف يسجل اقتباس جديد أو ترتيب المبيعات، وأنه لا "
-"بد من ربطها إلى متجر. المحل يعرف أيضا المستودع الذي سيتم تسليم المنتجات في "
-"كل مبيعات خاصة."
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2130,61 +1747,67 @@ msgid "It indicates that an invoice has been paid."
 msgstr "يشير إلى أنه تمّ تسديد الفاتورة."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "المنتج"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "الوصف"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "مايو/أيار"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "العميل"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "الدفع المقدم"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "فبراير/شباط"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "أبريل/نيسان"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "المحاسبة"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "ابحث في أمر المبيعات"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "طلب أمر مبيعات"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "أجل السداد"
+#: report:sale.order:0
+msgid "Price"
+msgstr "السعر"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2201,25 +1824,344 @@ msgstr ""
 "فواتير بعد.إذا كنت ترغب في تحليل دوران الخاص بك، يجب عليك استخدام تقرير "
 "تحليل الفاتورة في تطبيق المحاسبة."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "هاتف:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "هل تريد فعلاً  إنشاء الفاتورة/الفواتبر؟"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "معلومات أخرى"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "الكمية"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "بحاجة إلى مراجعة المحاسِب"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "عنوان الشحن لطلب المبيعات الحالي"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "التسعيرة / الأمر"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "العميل"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "الدفع المقدم"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "فبراير/شباط"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "فاتورة لـ"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "تاريخ الأمر"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "وحدة البيع للمنتج"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "مسودّة: حالة من حالات أمر المبيعات"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "مستند المصدر"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "أبريل/نيسان"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "قيد التنفيذ يدوياً"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "ابحث في أمر المبيعات"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "من أمر مبيعات"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "تجاهل الخلل"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"اعتمادا على مراقبة الفواتير من امر المبيعات، يمكن أن تستند على تسليم "
+"الفاتورة أو على الكميات المطلوبة. وبالتالي، يمكن أن تنشأ امر المبيعات فاتورة "
+"أو أمر تسليم حالما يتم تأكيده من قبل البائع."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "الحساب التحليلي المتعلق بأمر بيع"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "أجل السداد"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "اقتباس بالعدد"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "مرجع العميل"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "تمّ الالتقاط"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "السنة"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "أصدر الفواتير بناءً على التسليم"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "المجموع مع الضرائب"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "مفوتر"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
 
 #~ msgid "Recreate Procurement"
 #~ msgstr "إعادة الشراء"
@@ -2236,6 +2178,15 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ msgid "Automatic Declaration"
 #~ msgstr "اعلان تلقائى"
 
+#~ msgid "Validate"
+#~ msgstr "تحقق"
+
+#~ msgid "Notes"
+#~ msgstr "ملاحظات"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "نقل المخزون"
+
 #~ msgid "Make Invoice"
 #~ msgstr "عمل فاتوره"
 
@@ -2248,6 +2199,9 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ msgid "Reference"
 #~ msgstr "المرجع"
 
+#~ msgid "Extra Info"
+#~ msgstr "معلومات إضافية"
+
 #~ msgid "Net Price"
 #~ msgstr "السعر الصافي"
 
@@ -2260,24 +2214,61 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ msgid "Outgoing Products"
 #~ msgstr "المنتجات الصادرة"
 
+#~ msgid "Warehouse"
+#~ msgstr "المخزن"
+
 #~ msgid "Sale Shop"
 #~ msgstr "محل البيع"
 
 #~ msgid "All at Once"
 #~ msgstr "الجميع معاً"
 
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(غير ممكن)"
+
+#~ msgid "All Quotations"
+#~ msgstr "جميع التسعيرات"
+
+#~ msgid "Order Line"
+#~ msgstr "سطر الأمر"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "المبيعات بواسطة مندوب المبيعات"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "لوحة معلومات مدير المبيعات"
+
 #~ msgid "Configure"
 #~ msgstr "ضبط الإعدادات"
 
+#~ msgid "Set to Draft"
+#~ msgstr "مسودّة"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "أمر تسليم فقط"
 
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "لم يمكن إلغاء أمر البيع"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr "عدد الأيام منذ تأكيد الطلب حتى شحن المنتج للعميل"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "لا بدّ أن يكون مرجع الأمر فريداً"
 
+#~ msgid "Delivery Order"
+#~ msgstr "أمر التسليم"
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "إعداد سير عمل المبيعات والقيم الافتراضية"
 
+#~ msgid "Sales Open Invoice"
+#~ msgstr "فاتورة مبيعات غير مسددة"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "أصدر فاتورة الأمر بعد التسليم"
 
@@ -2287,9 +2278,29 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ msgid "  Year  "
 #~ msgstr "  السنة  "
 
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "لم يمكن إلغاء سطر أمر المبيعات!"
+
+#~ msgid "Sales By Month"
+#~ msgstr "المبيعات حسب الشهر"
+
+#~ msgid "Companies"
+#~ msgstr "الشركات"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "إنشاء الفاتورة النهائية"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "اسم وعنوان جهة الاتصال التي طلبت الأمر أو التسعيرة"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "تواريخ أوامر المبيعات"
 
+#~ msgid "References"
+#~ msgstr "المراجع"
+
 #~ msgid "Picking Default Policy"
 #~ msgstr "اختيار السياسة الافتراضية"
 
@@ -2297,15 +2308,48 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr "لا يمكنك إلغاء أمر مبيعات تمّت فوترته!"
 
+#~ msgid "Sales by Partner"
+#~ msgstr "المبيعات حسب الشريك"
+
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "هوامش أوامر المبيعات"
 
 #~ msgid "Sales Application Configuration"
 #~ msgstr "إعدادات تطبيق المبيعات"
 
+#~ msgid "Open Invoice"
+#~ msgstr "فاتورة غير مسددة"
+
+#~ msgid "Compute"
+#~ msgstr "احسب"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "المبيعات لكل عميل خلال الـ 90 يوماً الماضية"
+
+#~ msgid "Name"
+#~ msgstr "الاسم"
+
+#~ msgid "on order"
+#~ msgstr "تحت الطلب"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "بناءً على الكميات المشحونة أو المطلوبة"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "إنشاء أمر تسليم"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "تكاليف التسليم"
 
+#~ msgid "Procurement Method"
+#~ msgstr "طريقة الشراء"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "المبيعات حسب فئة المنتج"
+
+#~ msgid "Confirm Order"
+#~ msgstr "تأكيد الأمر"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "سياسة الشحن"
 
@@ -2315,6 +2359,24 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ msgid "title"
 #~ msgstr "العنوان"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "خطأ !"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "لم يمكن إلغاء أمر المبيعات!"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "أصدر الفواتير بناءً على أوامر المبيعات"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "الكميات المشحونة"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "تم تحويل العرض المالي '%s' إلى طلب مبيعات"
+
 #~ msgid "Invoice From The Picking"
 #~ msgstr "أصدر الفاتورة بناءً على الالتقاط"
 
@@ -2328,16 +2390,67 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ msgid "Sales Management"
 #~ msgstr "إدارة المبيعات"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "خلل شحن"
+
+#~ msgid "Reference UoM"
+#~ msgstr "وحدة القياس المرجعية"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr "يمكنك إنشاء الفواتير بناءً على أوامر المبيعات أو بناءً على الشحنات."
+
+#~ msgid "Properties"
+#~ msgstr "الخصائص"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "يجب أن تختار عميلاً في نموذج المبيعات!\n"
+#~ "فضلاً حدّد عميلاً قبل اختيار المنتج."
+
+#~ msgid "Picking Policy"
+#~ msgstr "سياسة الالتقاط"
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "قائمة الالتقاط وأمر التسليم"
 
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr "يجب أولاً أن تلغي جميع الالتقاطات المرتبطة بأمر المبيعات هذا."
+
 #~ msgid "Invoicing"
 #~ msgstr "الفواتير"
 
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr "لا يوجد حساب دخل معرّف لهذا المنتج: \"%s\" (id:%d)"
+
+#~ msgid "Product UoM"
+#~ msgstr "وحدة القياس للمنتج"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr "لا يوجد دفتر يومية مبيعات معرّف لهذه الشركة: \"%s\" (id: %d)"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "لا يمكن حذف سطر أمر المبيعات %s!"
 
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "تريد بيع %.2f %s ولكن لديك %.2f %s فقط!\n"
+#~ "المخزون الحقيقي: %.2f %s. (دون حجز)"
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "هذه قائمة الالتقاط الخاصة بأمر المبيعات هذا."
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -2346,9 +2459,38 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ msgid "   Month   "
 #~ msgstr "   الشهر   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "تحذير"
+
+#~ msgid "Sales by Month"
+#~ msgstr "المبيعات حسب الشهر"
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "المبيعات حسب فئة المنتج خلال الـ 90 يوماً الماضية"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "الوقت اللازم للتسليم"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)"
+
+#~ msgid "Configuration"
+#~ msgstr "الإعدادات"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "تسليم كامل"
 
+#~ msgid "Image"
+#~ msgstr "الصورة"
+
+#~ msgid "Salesman"
+#~ msgstr "مندوب المبيعات"
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "تمّ إلغاء أمر المبيعات '%s'"
+
 #~ msgid "Product sales"
 #~ msgstr "مبيعات المنتج"
 
@@ -2361,6 +2503,13 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ msgid "Invoicing journals"
 #~ msgstr "الدفاتر اليومية للفواتير"
 
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr "يجب أولاً إلغاء جميع الفواتير المرتبطة بأمر المبيعات هذا."
+
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "تمّ إنشاء الفاتورة بنجاح!"
+
 #~ msgid "Shipped Qty"
 #~ msgstr "الكمية المشحونة"
 
@@ -2370,10 +2519,32 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "تحسين تنسيق أوامر المبيعات"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "خطأ"
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr "أمر تحصيل واحد لكل سطر أمر مبيعات ولكل من المكوّنات."
+
+#~ msgid "from stock"
+#~ msgstr "من المخزون"
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "تمّ وضع أمر المبيعات '%s' في حالة \"مسودّة\"."
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "لا يمكن حذف أوامر المبيعات التي تمّ تأكيدها!"
 
+#~ msgid "Assign"
+#~ msgstr "تعيين"
+
+#~ msgid "Close"
+#~ msgstr "إغلاق"
+
 #~ msgid "Shipping Default Policy"
 #~ msgstr "سياسة الشحن الافتراضية"
 
@@ -2381,6 +2552,12 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ msgid "Not enough stock !"
 #~ msgstr "المخزون غير كافٍ!"
 
+#~ msgid "Delivered"
+#~ msgstr "تمّ التسليم"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "يجب تعيين دفعة إنتاج لهذا المنتج"
+
 #~ msgid "Adds commitment, requested and effective dates on Sales Orders."
 #~ msgstr "إضافة كل من الالتزام وتواريخ الطلب والتفعيل لأوامر المبيعات."
 
@@ -2391,37 +2568,219 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ "إضافة إمكانية تجميع وفوترة أوامر التسليم حسب عدد من أنواع الفوترة المختلفة: "
 #~ "يومياً، أسبوعياً، إلخ."
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "طلب أمر مبيعات"
+
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "خطوات تسليم أمر مبيعات"
 
+#~ msgid "Accounting"
+#~ msgstr "المحاسبة"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr "مزايا إضافية لتحسين تنسيق تقارير أوامر المبيعات."
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "أصدر الفواتير بناءً على التسليم"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "تحصيل المواد المباعة"
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr "لكل سطر أمر مبيعات، يتمّ إنشاء أمر تحصيل يوفر المنتج المباع."
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "إنشاء أمر تحصيل"
+
+#~ msgid "Procurement Order"
+#~ msgstr "أمر تحصيل"
+
+#~ msgid "Procurement"
+#~ msgstr "التحصيل"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "هذه قائمة بكل سطر من أوامر المبيعات المعدّة للفوترة. يمكنك فوترة أوامر "
+#~ "المبيعات جزئياً، حسب سطور أوامر المبيعات. لست بحاجة لهذه القائمة إذا كنت "
+#~ "تقوم بالفوترة حسب أوامر التسليم أو إذا كنت لا تستخدم الفوترة الجزئية."
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "إضافة إمكانية حساب تكاليف التسليم  في التسعيرات."
 
 #~ msgid "Payment Before Delivery"
 #~ msgstr "الدفع قبل التسليم"
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "إذا لم يكن المخزون كافياً لتسليم الكميات المطلوبة في وقت واحد، هل تقبل "
+#~ "بالشحن الجزئي؟"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "يحدد أوامر التحصيل لكل سطر في أوامر المبيعات."
+
+#~ msgid "Dates"
+#~ msgstr "التواريخ"
+
+#~ msgid "Recreate Packing"
+#~ msgstr "إعادة إنشاء التعبئة"
+
+#~ msgid "State"
+#~ msgstr "الحالة"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "إعدادات سياسة الالتقاط لأمر المبيعات"
 
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr "الأيام المضافة لأسباب أمنية"
+
+#~ msgid "UoM"
+#~ msgstr "وحدة القياس"
+
+#~ msgid "Packaging"
+#~ msgstr "التعبئة"
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr "تحسين تطبيق المبيعات بإمكانيات إضافية."
 
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr "يجب أولاً أن تلغي عمليات نقل المخزون المرتبطة بسطر أمر المبيعات هذا."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr "لا يمكنك الدفع مقدماً لأمر مبيعات معدّ لـ 'فوترة آلية بعد التسليم'."
+
+#~ msgid "Security Days"
+#~ msgstr "أيام الأمان"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "السطور المعدّة للفوترة"
+
+#~ msgid "Related Picking"
+#~ msgstr "عمليات التقاط ذات علاقة"
+
+#~ msgid "Total Tax Excluded"
+#~ msgstr "المجموع دون ضرائب"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "ممثل العميل"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "الكمية (وحدة قياس)"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "تمّ تسليم أمر المبيعات. لا يتمّ تحديث هذا الحقل إلا بعد تشغيل المجدوِل."
+
+#~ msgid "Pick List"
+#~ msgstr "قائمة الالتقاط"
+
+#~ msgid "Picking List"
+#~ msgstr "قائمة الالتقاط"
+
+#~ msgid "Create Pick List"
+#~ msgstr "إنشاء قائمة الالتقاط"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "أوامر التسليم المعدّة للفوترة"
+
+#~ msgid "Stock Moves"
+#~ msgstr "تحركات المخزون"
+
+#~ msgid "Stock Move"
+#~ msgstr "نقل مخزون"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "تقدم الإعدادات"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "تحذير !"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "مبيعات بواسطة مندوب المبيعات فى آخر 90 يوماً"
+
+#~ msgid "Conditions"
+#~ msgstr "الشروط"
+
 #~ msgid "VAT"
 #~ msgstr "ضريبة القيمة المضافة"
 
+#~ msgid "States"
+#~ msgstr "حالات"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    شهر- ١    "
 
+#~ msgid "Force Assignation"
+#~ msgstr "تخصيص نفاذ"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "قم بتكوين امر للمبيعات سوقية"
 
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "لا يوجد حساب تصنيف للايراد محدد في الخصائص الافتراضية لتصنيف المنتج او لم "
+#~ "يُحدد الوضع المالي !"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "يتم عمل الفاتورة تلقائيًا اذا كانت سياسة الشحن ‘فاتورة بالاختيار‘ او ‘فاتورة "
+#~ "بعد تسليم البضاعة‘."
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "وثيقة الانتقال الى الخروج او اللى العميل."
+
+#~ msgid "Number Packages"
+#~ msgstr "عدد الطرود/عدد الحزم"
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "تشير كلمة انكوترم لـ ‘مصطلحات تجارية دولية‘ وتتضمن مسلسلها من مصطلحات "
+#~ "المبيعات المستخدمة في الصفقات التجارية."
+
+#~ msgid "Untaxed amount"
+#~ msgstr "المبلغ بدون ضرائب"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "اختار منتج من نوع الخدمة التي تسمى ‘منتج مدفوع مقدما‘. قد تقوم بإنشائها "
+#~ "ووضعها كقيمة افتراضية في هذا الحق."
+
+#~ msgid "Cancel Assignation"
+#~ msgstr "إلغي التخصيص"
+
+#~ msgid "Incoterm"
+#~ msgstr "مصطلحات تجارية مشتركة"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "وثيقة الانتقال إلى العميل."
+
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "المبيعات.تكوين.اختيار_سياسة"
+
 #~ msgid "sale.installer"
 #~ msgstr "مثبت البيع"
 
@@ -2433,9 +2792,40 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ "تُستخدم سياسة الشحن في تكوين لكل امر اذا كنت تريد التسليم في اقرب وقت ممكن "
 #~ "عندما يكون المنتج الواحد متاح اما ان تناظر انت تكون كل المنتجات متاحة.."
 
+#~ msgid "Logistic"
+#~ msgstr "سوقية"
+
 #~ msgid "Layout Sequence"
 #~ msgstr "تسلسل التخطيط"
 
+#~ msgid "Packings"
+#~ msgstr "الطرود"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "بالاعتماد على تكوين مكان الصادر, تم عمل الانتقال بين المنطقة المصدرة والعميل "
+#~ "عن طريق امر التسليم تلقائيًا او يدويًا."
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "انت تحاول تخصيص الكثير من ما هو دون المنتج نفسه"
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "الإسلوب غير صالح حالة الاختبار"
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "يتم إنشاء نموذج للقائمة المختارة حالما يتم تأكيد ترتيب المبيعات، في نفس "
+#~ "الوقت من اجل الشراء. لأنها تمثل أجزاء مهمة من امر المبيعات. هناك قائمة "
+#~ "اختيار 1 من قبل خط ترتيب المبيعات التي تتطور مع توافر قطع الغيار."
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -2542,3 +2932,60 @@ msgstr "أصدر الفواتير بناءً على التسليم"
 #~ "المستودع الخاص بك والمواقع الشريكة. وهذا تكوين الأساليب الأكثر شيوعا وبسيطة "
 #~ "لتوصيل المنتجات إلى العملاء في واحد أو اثنين من العمليات التي تقوم بها "
 #~ "للعامل."
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "إذا كان لديك أكثر من متجر إعادة بيع منتجات الشركة الخاصة بك، يمكنك إنشاء "
+#~ "وإدارة ذلك من هنا. كلما كنت سوف يسجل اقتباس جديد أو ترتيب المبيعات، وأنه لا "
+#~ "بد من ربطها إلى متجر. المحل يعرف أيضا المستودع الذي سيتم تسليم المنتجات في "
+#~ "كل مبيعات خاصة."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "أوامر البيع تساعدك على إدارة الأسعار والأوامر من العملاء. OpenERP تشير إلى "
+#~ "أن تبدأ من خلال انشاء تسعيره. مرة واحدة يتم تأكيد ذلك، سيتم تحويل الاسعار في "
+#~ "امر المبيعات. يمكن OpenERP التعامل مع عدة أنواع من المنتجات  قد تؤدي ترتيب "
+#~ "مبيعات  المهام، وأوامر التسليم، وأوامر التصنيع، والمشتريات، وهلم جرا. "
+#~ "استنادا إلى تكوين النظام للمبيعات، سيتم إنشاء فاتورة المشروع بحيث يكون لديك "
+#~ "فقط للتأكد من ذلك عندما ترغب في فاتورة العميل."
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "يتم تلقائيا إنشاء نظام الشراء في أقرب وقت لتأكيد ترتيب المبيعات أو كما يتم "
+#~ "دفع الفاتورة. انه يقود عمليات الشراء وإنتاج المنتجات المتعلقة بالقواعد "
+#~ "والمعايير لترتيب المبيعات. "
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "اسم الشركة يجب أن يكون فريداً !"
+
+#~ msgid "Month-1"
+#~ msgstr "شهر- ١"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "خطأ في الإعدادات!"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "متفرقات"
+
+#~ msgid "Options"
+#~ msgstr "خيارات"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
diff --git a/addons/sale/i18n/bg.po b/addons/sale/i18n/bg.po
index 94187e931da..dda95a562a6 100644
--- a/addons/sale/i18n/bg.po
+++ b/addons/sale/i18n/bg.po
@@ -6,21 +6,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:21+0000\n"
 "Last-Translator: Dimitar Markov <dimitar.markov@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: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Фактура за предплащане"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Потвърждаване на оферта"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Дата на потвърждаване"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Групирай по"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -28,536 +176,145 @@ msgid ""
 "yet been invoiced"
 msgstr ""
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Продажби по търговец за последните 90 дни"
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-"Ако нямате достатъчно стока за доставка наведнъж приемате ли доставка на "
-"части?"
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Адрес за получаване текущата заявка"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Количество"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Ден"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Отказ на поръчка"
-
-#. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr "Предупреждение !"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Аналитична сметка"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Поръчки за доставка"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Контрагент"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Ред от поръчка"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Условия за плащане по подрабиране"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Област"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Отстъпка (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Крайна цена"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Слежете отметка за да групирате фактурите за едни и същи клиенти"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Поръчани количества"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Продажби по търговец"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Движения на наличност"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Отпратка към поръчка"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Друга информация"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Срещи"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Отстъпка (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Мои оферти"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Табло ПРОДАЖБИ"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Опаковане"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "От поръчка за продажба"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Име на магазин"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Не е определен клиент!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Продажби с грешки"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Условия"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Август"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Опитвате да свържете партида, която не е от същия продукт"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "невалиден режим за test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Юни"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Не можете да откажете това нареждане за продажба"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Статистика на нареждани за продажби"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Аналитичната сметкта свързана с нареждания за продажби"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Октомври"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Оферти"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Ценова листа за настоящото нарежданае за продажба"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "ДДС"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Брой дни между потвърждението на поръчката и изпращането на продуктите към "
-"клиента"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Дата на оферта"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Финансова позиция"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "Мер. единици"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Брой пакети"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Изпълнява се"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Търговецът потвърждава офертата. Състоянието на нареждането за продажба "
-"става \"В развитие\" или \"Ръчно\"."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "не е налично/и"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Тел. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Бележки"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Адрес за фактурата за настоящото нареждане за продажба."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Фактуриран"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Порчъка за доставка"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Дата на потвърждаване"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Инкотермс"
-
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
 msgstr "Партньор в разпределние"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Състояние на поръчка"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Оферти"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
 msgstr "Март"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Фирма"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Дата на фактура"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Редове с нефактурирани и доставени"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Грешка в фактура"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
@@ -565,70 +322,361 @@ msgstr ""
 msgid "The total amount."
 msgstr "Общата сума"
 
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Аналитична сметка"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Междинна сума"
 
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "Отказ на поръчка"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Тегло"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Поръчка за продажба"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Септември"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Данъци"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Необложена сума"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Адрес за фактура:"
+msgid "Net Total :"
+msgstr "Общо нето :"
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+#: help:sale.config.settings,module_analytic_user_function:0
 msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Отказан"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Общо"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Магазин"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Продажби с грешки"
+
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
 msgstr "Адрес за фактура"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Търси нефактурирани редове"
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Дата на създаваене на поръчка за продажба"
 
 #. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Оферта / Поръчка"
+#: view:res.partner:0
+msgid "False"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Създаване наново на фактура"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Създаване на фактури"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
 msgid "# of Lines"
 msgstr "# от редове"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Ред от нареждане за продажба"
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
 
 #. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Склад"
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# от кол."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Факс:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Нареждане за продажба"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Кол-во (бр. за продажба)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Потвърден"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Условия за плащане по подрабиране"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Потвърждение"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Адрес за доставка"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Година"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -636,25 +684,83 @@ msgid "Order N°"
 msgstr "Поръчка N°"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Редове от поръчка"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Сума без данъци"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Отстъпка (%)"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Редове за фактуриране"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Отпратка към поръчка"
 
 #. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Количество (Мер. Ед)"
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Редове на фактура"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Крайна цена"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Слежете отметка за да групирате фактурите за едни и същи клиенти"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Направи фактури"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
 
 #. module: sale
 #: field:sale.order,create_date:0
@@ -662,14 +768,42 @@ msgid "Creation Date"
 msgstr "Дата на създаване"
 
 #. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Очакване на планиране"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Адрес за фактурата за настоящото нареждане за продажба."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Поръчани количества"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Редове с нефактурирани и доставени"
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Количество"
 
 #. module: sale
 #: report:sale.order:0
@@ -682,78 +816,306 @@ msgid "My Sales"
 msgstr "Мои продажби"
 
 #. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
 #, python-format
 msgid "Invalid action !"
 msgstr "Невалидно действие !"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Допълнителна информация"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Финансова позиция"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Ценова листа"
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Юли"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# от кол."
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
 msgstr ""
 
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Дата на оферта"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
 msgstr "Дата на поръчка"
 
 #. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Изпратена"
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Всички оферти"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Контрагент"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Отстъпка (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Мои оферти"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
-msgid "September"
-msgstr "Септември"
+msgid "December"
+msgstr "Декември"
 
 #. module: sale
-#: code:addons/sale/sale.py:632
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Изпратена"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Месец"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Последователност"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1259
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Нефактуриран/и"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Категория на продукта"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
 #, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+msgid "Cannot cancel this sales order!"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Категория на продукта"
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Име на магазин"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -761,103 +1123,362 @@ msgid "Taxes :"
 msgstr "Данъци :"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Движения на стоки"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Състояние на поръчка"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Искате ли да създадете фактурата/ите"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Продажби по месец"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
+#: code:addons/sale/sale.py:658
 #, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Не може да бъде отказан ред от нареждане за продажба!"
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
 
 #. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Дни за сигурност"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Изпълнява се"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Не е определен клиент!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Създаване на фактури"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Проект"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Платен"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Поръчки за продажби"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Групиране на фактури"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Създаване на крайна фактура"
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Състояние"
 
 #. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Адрес за доставка"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Август"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Юни"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Ред"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Магазин"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Статистика на нареждани за продажби"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Ред от нареждане за продажба"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Ноември"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Разширени филтри"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Предварителен продукт"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Грешка"
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Фирми"
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Октомври"
 
 #. module: sale
-#: help:sale.order,state:0
+#: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Търговецът създава фактура ръчно ако if the sales order shipping policy is "
+"'Shipping and Manual in Progress'. The invoice is created automatically if "
+"the shipping policy is 'Payment before Delivery'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1272
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Януари"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Активни поръчки за продажба"
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Търговецът потвърждава офертата. Състоянието на нареждането за продажба "
+"става \"В развитие\" или \"Ръчно\"."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:958
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "History"
 msgstr "История"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
 
 #. module: sale
@@ -876,26 +1497,100 @@ msgid "Your Reference"
 msgstr "Ваш референтен номер"
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "Дните към обещанието Ви към клиентите - за сигурност"
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "По дата"
 
 #. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Ценова листа"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "ДДС"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Потвърдени нареждания за продажби за фактуриране."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "К-во"
+msgid "Sales Order Lines"
+msgstr "Редове от поръчка за продажба"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Продажби"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Ден"
 
 #. module: sale
 #: view:sale.order:0
-msgid "References"
-msgstr "Препратки"
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Фактури"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Единична цена"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Готов"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Адрес за фактура:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Фактура"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -904,635 +1599,316 @@ msgstr ""
 
 #. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "Отказ"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Оферта"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Търси нефактурирани редове"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Създаване на фактура"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Продажби по контрагент"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Контакт за поръчка"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Отворена фактура"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Принудително задаване"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "в поръчка"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Свързано товарене"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Име"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Адрес за доставка :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Продажби по клиент за последните 90 дни"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Поръчка за продажба в проект"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Продажби по продуктова категория"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Потвърждаване на оферта"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Грешка"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Групирай по"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Създаване наново на фактура"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Доставки за фактуриране"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Очакване на планиране"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Начин на снабдяване"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Пращане в проект"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Проверка"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Потвърждения на поръчка"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Данъци"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Дата на създаваене на поръчка за продажба"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Движение на наличности"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Създаване на фактури"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Факс:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Доставени количества"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Фактури върху поръчки за продажби"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Грешка!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Не може да бъде отказана поръчка за продажба!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Юли"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Снабдаване"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Грешка при доставка"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Групиране на фактури"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Грешка в фактура"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Платен"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Анализ на продажби"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Свойства"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Оферта"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Търговецът създава фактура ръчно ако if the sales order shipping policy is "
-"'Shipping and Manual in Progress'. The invoice is created automatically if "
-"the shipping policy is 'Payment before Delivery'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Продажби"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Единична цена"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Готов"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Фактура"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Изходен документ"
-
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
 msgstr "Трябва да се направи"
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Адрес за доставка :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Анализ на продажби"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Ценова листа за настоящото нарежданае за продажба"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Създаване на фактура"
+
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
 msgstr "Сумата без данък."
 
 #. module: sale
-#: code:addons/sale/sale.py:604
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Показва, че фактурата е платена"
+
+#. module: sale
+#: code:addons/sale/sale.py:822
 #, python-format
-msgid "You must first cancel all picking attached to this sales order."
+msgid "You cannot cancel a sale order line that has already been invoiced!"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Месец"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "Продукт"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Отказване на назначение"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+msgid "Description"
+msgstr "Описание"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Май"
+
+#. module: sale
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Цена"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Тел. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Искате ли да създадете фактурата/ите"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Друга информация"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "К-во"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Адрес за получаване текущата заявка"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Оферта / Поръчка"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Клиент"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Напред"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Февруари"
+
 #. module: sale
 #: field:sale.order,invoice_quantity:0
 msgid "Invoice on"
 msgstr "Фактура за"
 
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
@@ -1543,33 +1919,100 @@ msgstr "Дата на поръчка"
 msgid "Product UoS"
 msgstr "Прод. единици на продукт"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Поръчка за продажба в проект"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Изходен документ"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Април"
+
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Ръчно в развитие"
 
 #. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Мерни единици на продукт"
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "My Sale Orders"
 msgstr ""
 
 #. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Order"
-msgstr "Ред"
+msgid "Search Sales Order"
+msgstr "Търсене на нареждания за продажби"
 
 #. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
 msgstr ""
 
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "От поръчка за продажба"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Ignore Exception"
@@ -1585,566 +2028,55 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1251
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Състояния"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Общо"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Цена"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Направи фактури"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Фирма"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Дата на фактура"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Създаване на фактури"
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Аналитичната сметкта свързана с нареждания за продажби"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Net Total :"
-msgstr "Общо нето :"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Отказан"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Магазин"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Предупреждение"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Продажби по месец"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Нареждане за продажба"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Кол-во (бр. за продажба)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Потвърден"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Потвърждение"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Грешка! НЕ може да създавате рекурсивни фирми"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Продажби по категории продукти за последните 90 дни"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Редове на фактура"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Редове от поръчка за продажба"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr ""
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Настройки"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Тегло"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Фактури"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Декември"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Изображение"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Нефактуриран/и"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Търговец"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Необложена сума"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Фактура за предплащане"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "Нареждане за продажба '%s' е отменено."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Проект"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Поръчки за продажби"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Магазин"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Ноември"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Предварителен продукт"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Изчисляване"
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Януари"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Активни поръчки за продажба"
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Назначаване"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "По дата"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Потвърдени нареждания за продажби за фактуриране."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "от склад"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Затваряне"
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Доставен/а/и"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Показва, че фактурата е платена"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
-msgid "Description"
-msgstr "Описание"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Май"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Клиент"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Напред"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Февруари"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Април"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Счетоводство"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Търсене на нареждания за продажби"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
-#, python-format
-msgid "Not enough stock ! : "
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Условие за плащане"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2153,29 +2085,86 @@ msgid "Quotation N°"
 msgstr "Оферта №"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Натоварен"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Година"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Фактура базирана на доставки"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Фактуриран"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#~ msgid "from stock"
+#~ msgstr "от склад"
+
+#~ msgid "Notes"
+#~ msgstr "Бележки"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Движения на наличност"
 
 #~ msgid "Manual Designation"
 #~ msgstr "Ръчно обозначаване"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Фактура след доставка"
 
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Създаване на фактура след потвърждение на поръчка"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Пращане в проект"
+
 #~ msgid "Outgoing Products"
 #~ msgstr "Изходящи продукти"
 
@@ -2191,6 +2180,9 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "VAT"
 #~ msgstr "ДДС"
 
+#~ msgid "Extra Info"
+#~ msgstr "Допълнителна информация"
+
 #~ msgid ""
 #~ "The sale order will automatically create the invoice proposition (draft "
 #~ "invoice). Ordered and delivered quantities may not be the same. You have to "
@@ -2214,6 +2206,12 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "All Sales Order"
 #~ msgstr "Всички поръчки за продажба"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Доставени количества"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Принудително задаване"
+
 #~ msgid "Manual Description"
 #~ msgstr "Ръчно описание"
 
@@ -2232,6 +2230,13 @@ msgstr "Фактура базирана на доставки"
 #~ "Когато изберете Правила за доставка = 'Автоматично фактуриране след доствка' "
 #~ "ще бъде автоматично създадена след доставката"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Грешка!"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Сума без данъци"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Приключване на доставката"
 
@@ -2241,6 +2246,9 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Sale Order Procurement"
 #~ msgstr "Набавяне за поръчка за продажба"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Количество (Мер. Ед)"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Сметки за заплащене"
 
@@ -2253,21 +2261,36 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Sale Shop"
 #~ msgstr "Магазин за продажба"
 
+#~ msgid "Procurement"
+#~ msgstr "Снабдаване"
+
 #~ msgid "Sales orders"
 #~ msgstr "Поръчки за продажба"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Грешка при доставка"
+
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "Поръчки за продажба за фактуриране"
 
+#~ msgid "Order Line"
+#~ msgstr "Ред от поръчка"
+
 #~ msgid "Procurement for each line"
 #~ msgstr "Снабдяване за всеки ред"
 
+#~ msgid "Salesman"
+#~ msgstr "Търговец"
+
 #~ msgid "Order Ref"
 #~ msgstr "Отпратка към поръчка"
 
 #~ msgid "Manages the delivery and invoicing progress"
 #~ msgstr "Управлява прогреса на доставките и фактурите"
 
+#~ msgid "Packaging"
+#~ msgstr "Опаковане"
+
 #~ msgid "My sales in shipping exception"
 #~ msgstr "Моите продажби с грешка при доставка"
 
@@ -2290,17 +2313,15 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Sales Process"
 #~ msgstr "Процес на продажба"
 
-#~ msgid "Status"
-#~ msgstr "Състояние"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Политика на пакетиране"
 
 #~ msgid "One procurement for each product."
 #~ msgstr "Едно снабдяване за всеки продукт"
 
-#~ msgid "Sale Order"
-#~ msgstr "Поръчка за продажба"
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "невалиден режим за test_state"
 
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Прокет на фактура за клиент чакащ одобрение от счетоводител."
@@ -2317,6 +2338,9 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Direct Delivery"
 #~ msgstr "Директна доставка"
 
+#~ msgid "Properties"
+#~ msgstr "Свойства"
+
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "За продуктите от склад бе създадено пакетиране ОТ"
 
@@ -2348,30 +2372,49 @@ msgstr "Фактура базирана на доставки"
 #~ "При потвърждение списъка за пакетиране се премества в поръчката за доставка. "
 #~ "Това става като се натисне бутона 'Проверка'"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Грешка"
+
+#~ msgid "Assign"
+#~ msgstr "Назначаване"
+
 #~ msgid "Sale Invoice"
 #~ msgstr "Фактура за продажба"
 
+#~ msgid "Close"
+#~ msgstr "Затваряне"
+
 #~ msgid "Set Default"
 #~ msgstr "По подрабиране"
 
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Доставка и ръчно фактуриране"
 
+#~ msgid "UoM"
+#~ msgstr "Мер. единици"
+
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Отваряне на предварителна фактура"
 
+#~ msgid "Ordering Contact"
+#~ msgstr "Контакт за поръчка"
+
 #~ msgid "Deliver"
 #~ msgstr "Доставка"
 
-#~ msgid "Sequence"
-#~ msgstr "Последователност"
-
 #~ msgid "Sale Order Line"
 #~ msgstr "Ред от поръчка за продажба"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Отказване на назначение"
+
 #~ msgid "Make invoices"
 #~ msgstr "Създаване на фактури"
 
+#~ msgid "on order"
+#~ msgstr "в поръчка"
+
 #~ msgid "Sales order lines"
 #~ msgstr "Редове от поръчки за продажба"
 
@@ -2402,6 +2445,15 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Ценова листа на поръчка"
 
+#~ msgid "Name"
+#~ msgstr "Име"
+
+#~ msgid "Product UoM"
+#~ msgstr "Мерни единици на продукт"
+
+#~ msgid "States"
+#~ msgstr "Състояния"
+
 #~ msgid "Related invoices"
 #~ msgstr "Свързани поръчки"
 
@@ -2414,12 +2466,18 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Payment Terms"
 #~ msgstr "Условия за плащане"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Движения на стоки"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Моите поръчки за продажба"
 
 #~ msgid "Sale Order line"
 #~ msgstr "Ред от поръчка за продажба"
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Фактура базирана на доставки"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Грешка: Невалиден бар код"
 
@@ -2435,6 +2493,9 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Recreate Procurement"
 #~ msgstr "Създаване наново на снабдяване"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Порчъка за доставка"
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Стъпки за доставка на поръчка за продажба"
 
@@ -2451,12 +2512,18 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Доставка - от цеха до клиента"
 
+#~ msgid "Validate"
+#~ msgstr "Проверка"
+
 #~ msgid "Origin"
 #~ msgstr "Произход"
 
 #~ msgid "Packing"
 #~ msgstr "Опаковане"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Потвърждения на поръчка"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Невалиден XML за преглед на архитектурата"
 
@@ -2486,6 +2553,13 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Partial Delivery"
 #~ msgstr "Частична доставка"
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Ако нямате достатъчно стока за доставка наведнъж приемате ли доставка на "
+#~ "части?"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Невалидно име на модел при задаване на действие"
 
@@ -2508,6 +2582,9 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Related Packing"
 #~ msgstr "Свързано пакетиране"
 
+#~ msgid "Configuration"
+#~ msgstr "Настройки"
+
 #~ msgid ""
 #~ "In sale order , procuerement for each line and it comes into the procurement "
 #~ "order"
@@ -2524,6 +2601,12 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Create Advance Invoice"
 #~ msgstr "Създаване на предварителна фактура"
 
+#~ msgid "Compute"
+#~ msgstr "Изчисляване"
+
+#~ msgid "Number Packages"
+#~ msgstr "Брой пакети"
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sale order. The exception state is "
 #~ "automatically set when a cancel operation occurs in the invoice validation "
@@ -2538,6 +2621,9 @@ msgstr "Фактура базирана на доставки"
 #~ "задава когато фактурата е потвърдена но се изчавка планировчика да се "
 #~ "стартира на датата 'Дата на поръчката'"
 
+#~ msgid "Incoterm"
+#~ msgstr "Инкотермс"
+
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Фактура на базата на пакетиране"
 
@@ -2547,6 +2633,9 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Invoice Corrected"
 #~ msgstr "Фактурата е корегирана"
 
+#~ msgid "Accounting"
+#~ msgstr "Счетоводство"
+
 #~ msgid "New Quotation"
 #~ msgstr "Нова оферта"
 
@@ -2556,53 +2645,172 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Quotation (A sale order in draft state)"
 #~ msgstr "Оферта (поръчка за продажба в етап на проект)"
 
+#~ msgid "All Quotations"
+#~ msgstr "Всички оферти"
+
 #~ msgid "My sales order in progress"
 #~ msgstr "Мои активни поръчки за продажба"
 
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Мои поръчки за продажба, очакващи фактура"
 
+#~ msgid "Sales By Month"
+#~ msgstr "Продажби по месец"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Продажби по продуктова категория"
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Нареждане за продажба '%s' е отменено."
+
+#~ msgid "Sales by Month"
+#~ msgstr "Продажби по месец"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Позволява да се изчисли цена за доставка за quotations."
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Предупреждение !"
+
+#~ msgid "Dates"
+#~ msgstr "Срещи"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Продажби по търговец"
+
+#~ msgid "State"
+#~ msgstr "Област"
+
+#~ msgid "Conditions"
+#~ msgstr "Условия"
+
 #~ msgid "Configure"
 #~ msgstr "Настройване"
 
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "не е налично/и"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Искате ли да създадете фактурата/ите"
 
 #~ msgid "  Year  "
 #~ msgstr "  Година  "
 
+#~ msgid "Companies"
+#~ msgstr "Фирми"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Създаване на крайна фактура"
+
+#~ msgid "References"
+#~ msgstr "Препратки"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Отворена фактура"
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr "Не можете да откажете вече фактурирана поръчка!"
 
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Продажби по клиент за последните 90 дни"
+
+#~ msgid "Related Picking"
+#~ msgstr "Свързано товарене"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Доставки за фактуриране"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Цени за доставка"
 
 #~ msgid "title"
 #~ msgstr "заглавие"
 
+#~ msgid "Stock Move"
+#~ msgstr "Движение на наличности"
+
 #~ msgid "Order date"
 #~ msgstr "Дата на поръка"
 
+#~ msgid "Procurement Method"
+#~ msgstr "Начин на снабдяване"
+
 #~ msgid "Invoicing"
 #~ msgstr "Фактуриране"
 
 #~ msgid "   Month   "
 #~ msgstr "   Месец   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Предупреждение"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Грешка! НЕ може да създавате рекурсивни фирми"
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Продажби по категории продукти за последните 90 дни"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Месец-1    "
 
+#~ msgid "Image"
+#~ msgstr "Изображение"
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Няма достатъчна наличност"
 
+#~ msgid "Delivered"
+#~ msgstr "Доставен/а/и"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr "Дните към обещанието Ви към клиентите - за сигурност"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Табло ПРОДАЖБИ"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Продажби по търговец за последните 90 дни"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Поръчки за доставка"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Брой дни между потвърждението на поръчката и изпращането на продуктите към "
+#~ "клиента"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Не можете да откажете това нареждане за продажба"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Опитвате да свържете партида, която не е от същия продукт"
+
+#~ msgid "Security Days"
+#~ msgstr "Дни за сигурност"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Редове за фактуриране"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Фактура по поръчка след доставка"
 
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Не може да бъде отказан ред от нареждане за продажба!"
+
+#~ msgid "Warehouse"
+#~ msgstr "Склад"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Настройка на логистиката на продажби"
 
@@ -2613,6 +2821,9 @@ msgstr "Фактура базирана на доставки"
 #~ msgstr ""
 #~ "Разширяване на ядрото на приложение Продажби с допълнителни функционалностти."
 
+#~ msgid "Sales by Partner"
+#~ msgstr "Продажби по контрагент"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Дати на поръчки за продажби"
 
@@ -2622,6 +2833,13 @@ msgstr "Фактура базирана на доставки"
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Настройки на приложение продажби"
 
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Не може да бъде отказана поръчка за продажба!"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Фактури върху поръчки за продажби"
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Настройки на приложение Продажби"
 
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index f0a4a5f7c13..d6a457233fb 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/sale/i18n/bs.po
@@ -6,19 +6,167 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2010-12-15 20:56+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Predračun"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potvrdi Ponudu"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
@@ -29,61 +177,344 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Stanje Naloga"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Ako nemate dovoljno zaliha na stanju za cjelokupnu isporuku, da li "
-"prihvatate djelimičnu isporuku?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Količina"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Stavke koje su isporučene a nisu fakturisane."
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Fakture izuzeci"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analitičko konto"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Sub-ukupno"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
 msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Otkaži naruđbu"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Težina"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
+msgid "Quotation "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Prodajni nalog"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Porezi"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Neoporezovan iznos"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Neto ukupno:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Poništeno"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Ukupno"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Prodavnica"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Iznimka u prodaji"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adresa fakture (kupca)"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Ponovno kreiranje Fakturu"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
 msgstr ""
 
 #. module: sale
@@ -92,73 +523,100 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analitičko konto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_summary:0
 msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "Stavka Naloga"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+msgid "(update)"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Količina (JM)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
 msgstr ""
 
 #. module: sale
@@ -167,39 +625,157 @@ msgid "Default Payment Term"
 msgstr "Standardni uslovi plaćanja"
 
 #. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Potvrdi"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Adresa isporuke"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
 #: view:sale.report:0
-msgid "State"
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Nalog N°"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Stavke naloga"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Disc.(%)"
 msgstr "Popust (%)"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referenca naloga"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Stavka Fakture"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Raspored čekanja"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
 msgstr ""
 
 #. module: sale
@@ -209,463 +785,25 @@ msgstr "Naručena količina"
 
 #. module: sale
 #: view:sale.report:0
-msgid "Sales by Salesman"
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referenca naloga"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Popust (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Moje Ponude"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Pakovanje"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Naziv prodajnog mjesta"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Iznimka u prodaji"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
 msgstr ""
 
 #. module: sale
+#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiskalna pozicija"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "JM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Broj pakovanja"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "U toku"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Bilješke"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fakturisano"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Otpremnica"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Sub-ukupno"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adresa fakture (kupca):"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adresa fakture (kupca)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Ponuda / Nalog"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Skladište"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Nalog N°"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Stavke naloga"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Neoporezovan iznos"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
 #: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Količina (JM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Stavke koje su isporučene a nisu fakturisane."
+msgid "Quantity"
+msgstr "Količina"
 
 #. module: sale
 #: report:sale.order:0
@@ -678,32 +816,92 @@ msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
 #, python-format
 msgid "Invalid action !"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Dodatni podaci"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiskalna pozicija"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cjenovnik"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
+#: selection:sale.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1327
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
 #, python-format
-msgid "Hour"
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
 msgstr ""
 
 #. module: sale
@@ -712,101 +910,413 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Sve Ponude"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Popust (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moje Ponude"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
-msgid "September"
+msgid "December"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:632
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Slijed"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
 msgid "Category of Product"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Naziv prodajnog mjesta"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
 msgstr "Porezi"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Kretanje zaliha"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Stanje Naloga"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
+#: code:addons/sale/sale.py:658
 #, python-format
-msgid "Could not cancel sales order line!"
+msgid "Invoice has been <b>paid</b>."
 msgstr ""
 
 #. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "U toku"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Kreiraj Fakturu"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Draft"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Plaćeno"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Prodajni nalozi"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupiraj Fakture"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Adresa isporuke"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
 
 #. module: sale
-#: help:sale.order,shipped:0
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
 msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Nalog"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
 msgstr ""
 
 #. module: sale
@@ -814,46 +1324,156 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Proizvod"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Izuzetak"
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
+#: selection:sale.report,month:0
+msgid "October"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,state:0
+#: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1272
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Prodajni nalog u obradi"
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:958
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "History"
 msgstr "Historija"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
 
 #. module: sale
@@ -870,26 +1490,100 @@ msgid "Your Reference"
 msgstr "Tvoja Referenca"
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: field:sale.report,date:0
+msgid "Date Order"
 msgstr ""
 
 #. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cjenovnik"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "Količina"
+msgid "Sales Order Lines"
+msgstr "Stavke Prodajnog naloga"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Prodaja"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "References"
-msgstr ""
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Fakture"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Jedinična cijena"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Urađeno"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adresa fakture (kupca):"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Faktura"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -898,562 +1592,64 @@ msgstr ""
 
 #. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "Otkaži"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Ponuda"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Kreriaj Fakturu"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Kontakt pri naručivanju"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Prinudni prenos"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "u nalogu"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Naziv"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adresa isporuke"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potvrdi Ponudu"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Ponovno kreiranje Fakturu"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Raspored čekanja"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Postaviti kao draft"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Potvrdi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Potvrdi nalog"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Porezi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Isporučena količina"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Faktura kreirana na osnovu Prodajnog naloga"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Nabavka"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Izuzeci otpreme"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupiraj Fakture"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Fakture izuzeci"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Plaćeno"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Postavke"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Ponuda"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Prodaja"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Jedinična cijena"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Urađeno"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
 #. module: sale
@@ -1462,61 +1658,232 @@ msgid "To Do"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Adresa isporuke"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Kreriaj Fakturu"
+
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:604
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:822
 #, python-format
-msgid "You must first cancel all picking attached to this sales order."
+msgid "You cannot cancel a sale order line that has already been invoiced!"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
 msgstr ""
 
 #. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "Proizvod"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Otkazi prijenos"
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
+#: report:sale.order:0
+msgid "Description"
+msgstr "Opis"
 
 #. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cijena"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Količina"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Ponuda / Nalog"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Kupac"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: sale
@@ -1524,6 +1891,17 @@ msgstr ""
 msgid "Invoice on"
 msgstr "Faktura na"
 
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
@@ -1534,31 +1912,98 @@ msgstr "Datum naruđbe"
 msgid "Product UoS"
 msgstr "Proizvod JM"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "U toku"
 
 #. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Proizvod JM"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Nalog"
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
 msgstr ""
 
 #. module: sale
@@ -1576,566 +2021,55 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1251
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Status"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
 msgstr ""
 
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Ukupno"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Cijena"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Kreiraj Fakturu"
-
 #. module: sale
 #: report:sale.order:0
-msgid "Net Total :"
-msgstr "Neto ukupno:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Poništeno"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Prodavnica"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Količina (JM)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potvrđeno"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potvrdi"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Stavka Fakture"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Stavke Prodajnog naloga"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr ""
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Konfiguracija"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Težina"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Fakture"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Prodavač"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Neoporezovan iznos"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Predračun"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Draft"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Prodajni nalozi"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Proizvod"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Izračunaj"
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Prodajni nalog u obradi"
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Dodjeli"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "sa zaliha"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Zatvori"
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Kupac"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr ""
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Računovodstvo"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
-#, python-format
-msgid "Not enough stock ! : "
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Uslovi plaćanja"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2144,23 +2078,74 @@ msgid "Quotation N°"
 msgstr "Ponuda N°"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Izuzeto"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Račun sa referencom na isporuku"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturisano"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#~ msgid "Stock Moves"
+#~ msgstr "Kretanje zaliha"
 
 #~ msgid "Sale Order line"
 #~ msgstr "Stavka prodajnog naloga"
 
+#~ msgid "Accounting"
+#~ msgstr "Računovodstvo"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Račun sa referencom na isporuku"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Greška: nevažeći EAN kod"
 
@@ -2173,12 +2158,15 @@ msgstr "Račun sa referencom na isporuku"
 #~ msgid "Partial Delivery"
 #~ msgstr "Djelomična isporuka"
 
+#~ msgid "from stock"
+#~ msgstr "sa zaliha"
+
+#~ msgid "Delivery Order"
+#~ msgstr "Otpremnica"
+
 #~ msgid "Sale Order Line"
 #~ msgstr "Stavka prodajnog naloga"
 
-#~ msgid "Sale Order"
-#~ msgstr "Prodajni nalog"
-
 #~ msgid ""
 #~ "By default, Open ERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2203,6 +2191,12 @@ msgstr "Račun sa referencom na isporuku"
 #~ msgid "Shipping Policy"
 #~ msgstr "Način otpreme"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Izuzeci otpreme"
+
+#~ msgid "Extra Info"
+#~ msgstr "Dodatni podaci"
+
 #~ msgid "Net Price"
 #~ msgstr "Neto cijena"
 
@@ -2212,27 +2206,54 @@ msgstr "Račun sa referencom na isporuku"
 #~ msgid "All Sales Order"
 #~ msgstr "Svi Prodajni nalozi"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Isporučena količina"
+
+#~ msgid "Warehouse"
+#~ msgstr "Skladište"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Prodavnica"
 
+#~ msgid "Untaxed amount"
+#~ msgstr "Neoporezovan iznos"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Potpuna isporuka"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Potvrdi nalog"
+
 #~ msgid "Sale Order Procurement"
 #~ msgstr "Nabavka na osnovu Prodajnog naloga"
 
 #~ msgid "Packing"
 #~ msgstr "Pakovanje"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Količina (JM)"
+
 #~ msgid "Customer Ref"
 #~ msgstr "Ref kupca"
 
+#~ msgid "Procurement"
+#~ msgstr "Nabavka"
+
+#~ msgid "Close"
+#~ msgstr "Zatvori"
+
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "Prodajni nalozi spremni za fakturisanje."
 
 #~ msgid "Procurement for each line"
 #~ msgstr "Nabavka po svakoj stavci"
 
+#~ msgid "Order Line"
+#~ msgstr "Stavka Naloga"
+
+#~ msgid "Salesman"
+#~ msgstr "Prodavač"
+
 #~ msgid "Order Ref"
 #~ msgstr "Referenca naloga"
 
@@ -2245,6 +2266,9 @@ msgstr "Račun sa referencom na isporuku"
 #~ msgid "Packing Default Policy"
 #~ msgstr "Standardni način pakiranja"
 
+#~ msgid "Packaging"
+#~ msgstr "Pakovanje"
+
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
@@ -2259,12 +2283,12 @@ msgstr "Račun sa referencom na isporuku"
 #~ msgid "Procurement Corrected"
 #~ msgstr "Nabavka ispravljena"
 
+#~ msgid "on order"
+#~ msgstr "u nalogu"
+
 #~ msgid "Sale Procurement"
 #~ msgstr "Nabavka prodaje"
 
-#~ msgid "Status"
-#~ msgstr "Status"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Način pakiranja"
 
@@ -2286,18 +2310,24 @@ msgstr "Račun sa referencom na isporuku"
 #~ msgid "Our Salesman"
 #~ msgstr "Naš Prodavač"
 
+#~ msgid "Properties"
+#~ msgstr "Postavke"
+
+#~ msgid "Compute"
+#~ msgstr "Izračunaj"
+
 #~ msgid "VAT"
 #~ msgstr "PDV"
 
+#~ msgid "Assign"
+#~ msgstr "Dodjeli"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Samo isporuka"
 
 #~ msgid "Sales order lines"
 #~ msgstr "Stavke Prodajnog naloga"
 
-#~ msgid "Sequence"
-#~ msgstr "Slijed"
-
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -2306,6 +2336,12 @@ msgstr "Račun sa referencom na isporuku"
 #~ msgid "Advance Payment"
 #~ msgstr "Plaćanje unaprijed"
 
+#~ msgid "Number Packages"
+#~ msgstr "Broj pakovanja"
+
+#~ msgid "UoM"
+#~ msgstr "JM"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2325,24 +2361,46 @@ msgstr "Račun sa referencom na isporuku"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Otvoreni Predračuni"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Deliver"
 #~ msgstr "Isporuka"
 
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Nabavni cjenovnik"
 
+#~ msgid "States"
+#~ msgstr "Status"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Moj Prodajni nalog"
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravan naziv modela u definiciji zadatka."
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Ako nemate dovoljno zaliha na stanju za cjelokupnu isporuku, da li "
+#~ "prihvatate djelimičnu isporuku?"
+
 #~ msgid "Automatic Declaration"
 #~ msgstr "Automatska deklaracija"
 
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Isporuka, od skladišta do kupca."
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
+#~ msgid "Validate"
+#~ msgstr "Potvrdi"
+
+#~ msgid "Notes"
+#~ msgstr "Bilješke"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Račun po isporuci"
 
@@ -2356,6 +2414,9 @@ msgstr "Račun sa referencom na isporuku"
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Ovo je spisak izbornih lista koji su generisani za ovu Fakturu"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Postaviti kao draft"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Kreiraj Fakturu"
 
@@ -2383,6 +2444,12 @@ msgstr "Račun sa referencom na isporuku"
 #~ msgid "My sales order in progress"
 #~ msgstr "Moj Prodajni nalog u procesu"
 
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Faktura kreirana na osnovu Prodajnog naloga"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Prinudni prenos"
+
 #~ msgid "Manual Description"
 #~ msgstr "Opis"
 
@@ -2405,6 +2472,9 @@ msgstr "Račun sa referencom na isporuku"
 #~ msgid "Payment accounts"
 #~ msgstr "Računi plaćanja"
 
+#~ msgid "Configuration"
+#~ msgstr "Konfiguracija"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Faktura sa referencom na Prodajni nalog poslije otpreme"
 
@@ -2420,6 +2490,9 @@ msgstr "Račun sa referencom na isporuku"
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Draft fakture kupca će biti pregledane od strane  računovodsvta."
 
+#~ msgid "All Quotations"
+#~ msgstr "Sve Ponude"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "Faktura u pripremi"
 
@@ -2493,9 +2566,18 @@ msgstr "Račun sa referencom na isporuku"
 #~ msgid "Sale Invoice"
 #~ msgstr "Izlazna Faktura"
 
+#~ msgid "Ordering Contact"
+#~ msgstr "Kontakt pri naručivanju"
+
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Faktura sa referencom na pakovanje"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Otkazi prijenos"
+
+#~ msgid "Name"
+#~ msgstr "Naziv"
+
 #~ msgid ""
 #~ "The name and address of the contact that requested the order or quotation."
 #~ msgstr ""
@@ -2511,6 +2593,9 @@ msgstr "Račun sa referencom na isporuku"
 #~ msgid "New Quotation"
 #~ msgstr "Nova ponuda"
 
+#~ msgid "Product UoM"
+#~ msgstr "Proizvod JM"
+
 #~ msgid "Related invoices"
 #~ msgstr "Povezane Fakture"
 
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 9310eb1df24..16ce60ca7c2 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/i18n/ca.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 18:17+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,14 +14,162 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avança factura"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirma pressupost"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Data de confirmació"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Agrupa per..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -30,62 +178,345 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Vendes per comercial últims 90 dies"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicació empresa"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Estat de la comanda"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Si no disposeu de suficients existències per enviar-ho tot d'una vegada, "
-"accepteu enviaments parcials o no?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Per facturar"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Adreça d'enviament per a la comanda de venda actual."
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Data en la qual es confirma la comanda de venda."
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Quantitat"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Pressuposts"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Dia"
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Març"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Companyia"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Data factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Línies no facturades i lliuraments"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "L'import a facturar per endavant."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepció de factura"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "L'import total."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Compte analític"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancel·la comanda"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "El pressupost '%s'  s'ha convertit a una comanda de venda."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Pes"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Avís!"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Comanda de venda"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Setembre"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impostos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imposable"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total net :"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancel·lada"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tenda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Vendes en excepció"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adreça de factura"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Data en la qual es crea la comanda de venda."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Recrea factura"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crea factures"
 
 #. module: sale
 #: report:sale.order:0
@@ -93,76 +524,648 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Genera ordres de proveïment per a cada línia de comanda de venda."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Compte analític"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Aquesta és una llista de totes les línies de comandes de venda a facturar. "
-"Podeu facturar comandes de venda parcialment, per línies de comanda. No "
-"necessiteu aquesta llista si factureu des d'albarans de sortida o si "
-"factureu comandes de venda completes."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Ordre de proveïment"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Data de confirmació"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de línies"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Nº de qtat"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Comanda de venda"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Quantitat (UdV)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Import avançat"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Termini pagament per defecte"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Confirma"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Adreça d'enviament"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Any"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "Línia de la comanda"
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
 msgstr ""
-"Les comandes de vendes us ajuden a gestionar pressupostos i comandes dels "
-"vostres clients. OpenERP suggereix que comenceu per crear un pressupost. Una "
-"vegada estigui confirmat, el pressupost es convertirà en una comanda de "
-"venda. OpenERP pot gestionar diversos tipus de productes de manera que una "
-"comanda de venda pot generar tasques, ordres de lliurament, ordres de "
-"fabricació, compres, etc. Segons la configuració de la comanda de venda, es "
-"generarà una factura en esborrany de manera que només cal confirmar-la quan "
-"es vulgui facturar al seu client."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Comanda Nº"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Línies de la comanda"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referència comanda"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Línies de factura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Preu total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Pressupostos antics"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+"Marqueu aquesta opció per agrupar les factures dels mateixos clients."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Realitza factures"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Data creació"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperant data planificada"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Adreça de facturació per a la comanda de venda actual."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Quantitats demanades"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Quantitat"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Les meves vendes"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Acció no vàlida!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posició fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juliol"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Data pressupost"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Data comanda"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Vendes. Realitza factura"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descompte (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"No podeu crear la factura a partir d'aquesta línia de comanda de venda per "
+"les següents raons:\n"
+"1. L'estat d'aquesta línia de la comanda de venda està en estat "
+"\"esborrany\" o \"cancel·lada\".\n"
+"2. La línia de la comanda de venda està facturada."
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Els meus pressuposts"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Desembre"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviat"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Seqüència"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoria de producte"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nom tenda"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impostos :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Vendes. Bestreta pagament factura"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En procés"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "No s'ha definit un client!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crea factures"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -180,1213 +1183,9 @@ msgstr ""
 "són les hores dedicades a les tasques associades."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Termini pagament per defecte"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Estat"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Preu total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-"Marqueu aquesta opció per agrupar les factures dels mateixos clients."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Quantitats demanades"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Vendes per comercial"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Moviments d'inventari"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referència comanda"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Altra informació"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Dates"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"La factura es crea de forma automàtica si la política de facturació és "
-"\"Facturar des de l'albarà\" o \"Facturar comanda després de l'enviament\"."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Vendes. Realitza factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Descompte (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Els meus pressuposts"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Tablero responsable ventas"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Empaquetament"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Des d'una comanda de venda"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nom tenda"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "No s'ha definit un client!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Vendes en excepció"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Condicions"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"No hi ha cap compte de categoria d'ingressos definida en les propietats per "
-"defecte de la categoria del producte o la posició fiscal no està definida!"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agost"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Esteu intentant assignar un lot que no és del mateix producte"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "Mode no vàlit pe ra test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juny"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "No podeu cancel·lar aquesta comanda de venda!"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estadístiques comandes de venda"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "El compte analític relacionat amb una comanda de venda."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Pressuposts"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Tarifa per la comanda de venda actual."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Número de dies entre la confirmació de la comanda i l'enviament dels "
-"productes al client."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Data pressupost"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posició fiscal"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Número paquets"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En procés"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"El comercial confirma el pressupost. L'estat de la comanda de venda es "
-"converteix 'En procés' o 'Procés manual'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Heu de cancel·lar primer els moviments d'estoc associats a aquesta línia de "
-"comanda de venda."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Seleccioneu un producte del tipus de servei que es diu 'Producte avançat'. "
-"Pot ser que heu de crear-ho i configurar-ho com un valor per defecte per a "
-"aquest camp."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"No podeu realitzar una bestreta d'una comanda de venda que està definida com "
-"a 'Factura automàtica després d'enviament'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notes"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Adreça de facturació per a la comanda de venda actual."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturat"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Ordre d'enviament"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Data de confirmació"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Ubicació empresa"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Març"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "L'import total."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adreça de factura :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Per cada línia de comanda de venda, es crea una ordre de proveïment per a "
-"subministrar el producte venut."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm, que significa \"Termes de Comerç Internacional\", implica una "
-"sèrie de condicions de venda que s'utilitzen en la transacció comercial."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adreça de factura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Cerca línies no facturades"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Pressupost / Comanda"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de línies"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Vendes. Obra factura"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Línia comanda de venda"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magatzem"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Comanda Nº"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Línies de la comanda"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Base imposable"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Línies a facturar"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Quantitat (UdM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Data creació"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Línies no facturades i lliuraments"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Les meves vendes"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Acció no vàlida!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Informació extra"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Tarifa"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Nº de qtat"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Data comanda"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Enviat"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Tots els pressupostos"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Setembre"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Categoria de producte"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Impostos :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Moviments d'estoc"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Estat de la comanda"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Voleu crear la(es) factura(es)?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Vendes per mes"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "No podeu cancel·lar la línia de comanda de venda!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Dies de seguretat"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Proveïment de material venut"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Crea factura final"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Adreça d'enviament"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Indica que la comanda de venda ha estat lliurada. Aquest camp s'actualitza "
-"només després que el planificador(s) s'ha executat."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Filtres extensos..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepció"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Companyies"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Historial"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Aquesta és la llista de factures que han estat generades per a aquesta "
-"comanda de venda. La mateixa comanda de venda pot haver estat facturada "
-"diverses vegades (línia a línia, per exemple)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "La vostra referència"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-"El nom i l'adreça del contacte que ha sol·licitat la comanda o pressupost."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Aquests dies per raons de seguretat s'afegeixen als que prometeu als clients."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Qtat"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referències"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Crea factura"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Total sense impostos"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "La factura s'ha creat correctament!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Vendes per empresa"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Contacte de la comanda"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Obre factura"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"No s'ha definit un diari de vendes per a aquesta companyia: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Força assignació"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "sota comanda"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Basat en les quantitats enviades o comandades"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Albarà relacionat"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nom"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adreça d'enviament :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Vendes per client últims 90 dies"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Estat esborrany de la comanda de venda"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Crea ordre de lliurament"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total impostos inclosos"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Crea albarà"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Vendes per categoria de productes"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirma pressupost"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Agrupa per..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Recrea factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Albarans a facturar"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Esperant data planificada"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Mètode proveïment"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Albarà"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Canvia a esborrany"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Document del moviment a la sortida o al client."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Valida"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Confirma comanda"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Crea ordre proveïment"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impostos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Data en la qual es crea la comanda de venda."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Moviment d'estoc"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Crea factures"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Import avançat"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Quantitats enviades"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Factura basada en comandes de venda"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Albarà"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Error!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "No es pot cancel·lar la comanda de venda!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juliol"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Proveïment"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepció d'enviament"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupa les factures"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Per ser revisat pel comptable."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referència UdM"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
@@ -1395,14 +1194,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Venda Línia_comanda Realitzar_factura"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepció de factura"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Genera proveïment i facturació"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Esborrany"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1410,575 +1204,10 @@ msgid "Paid"
 msgstr "Pagat"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Anàlisi de vendes"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recrea albarà"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Propietats"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Pressupost"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"El comercial crea una factura manualment si la política de facturació de la "
-"comanda de venda és \"Enviament i Factura manual\". La factura es crea de "
-"forma automàtica si la política de facturació és 'Pagament abans de "
-"l'enviament'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Podeu generar factures basades en comandes de venda o basades en enviaments."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Vendes"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Preu un."
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Realitzada"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Heu de seleccionar un client en el formulari de vendes!\n"
-"Introduïu un client abans de seleccionar un producte."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Document d'origen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Per fer"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Política d'enviament"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Document del moviment al client."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "L'import sense impostos."
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Primer heu de cancel·lar tots els albarans relacionats amb aquesta comanda "
-"de venda."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Vendes. Bestreta pagament factura"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Producte"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Cancel·la assignació"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturar les"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Data ordenada"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV del producte"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual en procés"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "UdM del producte"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logística"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Comanda"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"No s'ha definit un compte d'ingressos per a aquest producte: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignora excepció"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"En funció del control de facturació de les comandes de venda, la factura pot "
-"estar basada en les quantitats enviades o venudes. Per tant, una comanda de "
-"venda pot generar una factura o un albarà tan aviat com sigui confirmada pel "
-"comercial."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Preveu vendre %.2f %s però només %.2f %s estan disponibles!\n"
-"L'estoc real és %.2f %s. (sense reserves)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Estats"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_continguts"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referència del client"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Preu"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Depenent de la configuració de la ubicació de sortida, el moviment entre la "
-"zona de sortida i el client es realitza a través de l'ordre de lliurament de "
-"forma manual o automàtica."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Realitza factures"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Per facturar"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Data en la qual es confirma la comanda de venda."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Companyia"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Data factura"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "L'import a facturar per endavant."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-"Aquesta és la llista d'albarans que han estat generats per a aquesta comanda "
-"de venda."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crea factures"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total net :"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancel·lada"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Tenda"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Data de confirmació"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Avís"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Vendes per mes"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Comanda de venda"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Quantitat (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"L'albarà es crea tan aviat com es confirma la comanda de venda, alhora que "
-"l'ordre de proveïment. Representa l'assignació dels components de la comanda "
-"de venda. Hi ha un albarà per línia de la comanda de venda que evoluciona "
-"amb la disponibilitat dels components."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmada"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirma"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Error! No podeu crear companyies recursives."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Vendes per categoria de producte últims 90 dies"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Línies de factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Línies de la comanda de venda"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Temps inicial d'entrega"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuració"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"No podeu crear la factura a partir d'aquesta línia de comanda de venda per "
-"les següents raons:\n"
-"1. L'estat d'aquesta línia de la comanda de venda està en estat "
-"\"esborrany\" o \"cancel·lada\".\n"
-"2. La línia de la comanda de venda està facturada."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Pes"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Factures"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Desembre"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Imatge"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Es crea automàticament una ordre de proveïment tan aviat com es confirma una "
-"comanda de venda o es paga la factura. Provoca la compra i la producció de "
-"productes segons les regles i els paràmetres de la comanda de venda. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "No facturada"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Comercial"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Pressupostos antics"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Base imposable"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avança factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "La comanda de venda '%s' ha estat cancel·lada."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Esborrany"
-
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -2003,6 +1232,18 @@ msgstr ""
 "* L'estat 'Cancel·lada' s'estableix quan un usuari cancel·la la comanda de "
 "venda."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Comandes de venda"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupa les factures"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2010,58 +1251,171 @@ msgstr "L'import dels impostos."
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Albarans"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estat"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agost"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
 msgstr ""
 
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera proveïment i facturació"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juny"
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Comandes de venda"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Comanda"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Tenda vendes"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadístiques comandes de venda"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línia comanda de venda"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Novembre"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtres extensos..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Producte avançat"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcula"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepció"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El comercial crea una factura manualment si la política de facturació de la "
+"comanda de venda és \"Enviament i Factura manual\". La factura es crea de "
+"forma automàtica si la política de facturació és 'Pagament abans de "
+"l'enviament'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Primer heu de cancel·lar totes les factures relacionades amb aquesta comanda "
-"de venda."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2073,6 +1427,41 @@ msgstr "Gener"
 msgid "Sales Order in Progress"
 msgstr "Comanda de venda en procés"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"El comercial confirma el pressupost. L'estat de la comanda de venda es "
+"converteix 'En procés' o 'Procés manual'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
@@ -2081,90 +1470,288 @@ msgstr ""
 "venda."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Retard realització"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
-"Una ordre de proveïment per a cada línia de la comanda de venda i per a "
-"cadascun dels components."
+"Aquesta és la llista de factures que han estat generades per a aquesta "
+"comanda de venda. La mateixa comanda de venda pot haver estat facturada "
+"diverses vegades (línia a línia, per exemple)."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Assigna"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "La vostra referència"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Data de comanda"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Comanda de venda confirmada a facturar"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Línies de la comanda de venda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Vendes"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "La comanda de venda '%s' ha estat canviada a estat esborrany."
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Dia"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "des d'estoc"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Factures"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Tanca"
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Preu un."
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Realitzada"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adreça de factura :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Lliurat"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Pressupost"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Heu d'assignar un lot de producció per a aquest producte"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Cerca línies no facturades"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Per fer"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Adreça d'enviament :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Anàlisi de vendes"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa per la comanda de venda actual."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crea factura"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "L'import sense impostos."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
-"Si teniu més d'una tenda on veneu els productes de la vostra companyia, "
-"podeu crear-les i gestionar-les des d'aquí. Cada vegada que codifiqueu un "
-"nou pressupost o comanda de venda, ha d'estar vinculat a una tenda. La tenda "
-"també defineix des de quin magatzem seran lliurats els productes per a cada "
-"venda."
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2172,61 +1759,67 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Indica que una factura ha estat pagada."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Producte"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Descripció"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Maig"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Client"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Bestreta"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Febrer"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Abril"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Comptabilitat"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Cerca comanda de venda"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Sol·licitud comanda de venda"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Termini de pagament"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Preu"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2244,25 +1837,348 @@ msgstr ""
 "encara no facturades. Si voleu analitzar els vostres ingressos, hauríeu "
 "d'utilitzar l'informe d'anàlisi de factures en l'aplicació de Comptabilitat."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Voleu crear la(es) factura(es)?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Altra informació"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Qtat"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Per ser revisat pel comptable."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Adreça d'enviament per a la comanda de venda actual."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Pressupost / Comanda"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Client"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Bestreta"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Febrer"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar les"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data ordenada"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producte"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estat esborrany de la comanda de venda"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Document d'origen"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en procés"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Cerca comanda de venda"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Des d'una comanda de venda"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignora excepció"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En funció del control de facturació de les comandes de venda, la factura pot "
+"estar basada en les quantitats enviades o venudes. Per tant, una comanda de "
+"venda pot generar una factura o un albarà tan aviat com sigui confirmada pel "
+"comercial."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "El compte analític relacionat amb una comanda de venda."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Termini de pagament"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Pressupost Nº"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referència del client"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Enviada"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Any"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Factura des d'albarans"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total impostos inclosos"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturat"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Factura des d'albarans"
 
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Configureu la logística de les comandes de venda"
@@ -2273,6 +2189,12 @@ msgstr "Factura des d'albarans"
 #~ msgid "Recreate Procurement"
 #~ msgstr "Recrea proveïment"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Ordre d'enviament"
+
+#~ msgid "from stock"
+#~ msgstr "des d'estoc"
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Passos per enviar una comanda de venda"
 
@@ -2282,6 +2204,9 @@ msgstr "Factura des d'albarans"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Declaració automàtica"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Canvia a esborrany"
+
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr ""
@@ -2290,6 +2215,9 @@ msgstr "Factura des d'albarans"
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Enviament, des de el magatzem fins el client."
 
+#~ msgid "Validate"
+#~ msgstr "Valida"
+
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Després de confirmar la comanda, crea la factura."
 
@@ -2300,12 +2228,21 @@ msgstr "Factura des d'albarans"
 #~ "Quan pressioneu el botó Confirmar, l'estat Esborrany canvia a Manual. es a "
 #~ "dir, el pressupost canvia a comanda de venda."
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Moviments d'inventari"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Designació manual"
 
+#~ msgid "Notes"
+#~ msgstr "Notes"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Factura després de l'enviament"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Excepció d'enviament"
+
 #~ msgid "Origin"
 #~ msgstr "Origen"
 
@@ -2324,6 +2261,9 @@ msgstr "Factura des d'albarans"
 #~ msgid "Procure Method"
 #~ msgstr "Mètode proveïment"
 
+#~ msgid "Extra Info"
+#~ msgstr "Informació extra"
+
 #~ msgid "Net Price"
 #~ msgstr "Preu net"
 
@@ -2353,9 +2293,24 @@ msgstr "Factura des d'albarans"
 #~ msgid "All Sales Order"
 #~ msgstr "Totes les comandes de venda"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Quantitats enviades"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Factura basada en comandes de venda"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Tenda de vendes"
 
+#~ msgid "Warehouse"
+#~ msgstr "Magatzem"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Força assignació"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Base imposable"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2373,12 +2328,19 @@ msgstr "Factura des d'albarans"
 #~ "Quan seleccioneu una política de enviament = 'Factura automàtica després de "
 #~ "l'enviament', la crearà automàticament després de l'enviament."
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Error!"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Enviament complet"
 
 #~ msgid "Manual Description"
 #~ msgstr "Descripció manual"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Quantitat (UdM)"
+
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
@@ -2391,6 +2353,12 @@ msgstr "Factura des d'albarans"
 #~ msgid "Packing"
 #~ msgstr "Paquet/Albarà"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Confirma comanda"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuració"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Factura comanda després de l'enviament"
 
@@ -2400,15 +2368,27 @@ msgstr "Factura des d'albarans"
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Error: La UdV ha d'estar en una categoria diferent que la UdM"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "Sales orders"
 #~ msgstr "Comandes de vendes"
 
+#~ msgid "Procurement"
+#~ msgstr "Proveïment"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Comptes de pagament"
 
+#~ msgid "Close"
+#~ msgstr "Tanca"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "Factura esborrany"
 
+#~ msgid "All Quotations"
+#~ msgstr "Tots els pressupostos"
+
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Factura de client esborrany, per ser revisada per un comptable."
 
@@ -2418,6 +2398,9 @@ msgstr "Factura des d'albarans"
 #~ msgid "Procurement for each line"
 #~ msgstr "Proveïment per a cada línia"
 
+#~ msgid "Order Line"
+#~ msgstr "Línia de la comanda"
+
 #~ msgid "Manages the delivery and invoicing progress"
 #~ msgstr "Gestiona el progrés d'enviament i facturació"
 
@@ -2425,12 +2408,18 @@ msgstr "Factura des d'albarans"
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "No podeu cancel·lar la comanda de venda!"
 
+#~ msgid "Packaging"
+#~ msgstr "Empaquetament"
+
 #~ msgid "Canceled"
 #~ msgstr "Cancel·lat"
 
 #~ msgid "Order Ref"
 #~ msgstr "Ref. comanda"
 
+#~ msgid "Salesman"
+#~ msgstr "Comercial"
+
 #~ msgid ""
 #~ "In sale order , procuerement for each line and it comes into the procurement "
 #~ "order"
@@ -2456,6 +2445,9 @@ msgstr "Factura des d'albarans"
 #~ msgid "Sales Configuration"
 #~ msgstr "Configuració de vendes"
 
+#~ msgid "on order"
+#~ msgstr "sota comanda"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "Proveïment corregit"
 
@@ -2468,6 +2460,10 @@ msgstr "Factura des d'albarans"
 #~ msgid "Product sales"
 #~ msgstr "Vendes de producte"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "Mode no vàlit pe ra test_state"
+
 #~ msgid "Our Salesman"
 #~ msgstr "El nostre comercial"
 
@@ -2477,15 +2473,15 @@ msgstr "Factura des d'albarans"
 #~ msgid "One procurement for each product."
 #~ msgstr "Un proveïment per cada producte."
 
-#~ msgid "Sale Order"
-#~ msgstr "Comanda de venda"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Tarifes de venda"
 
 #~ msgid "Direct Delivery"
 #~ msgstr "Enviament directe"
 
+#~ msgid "Properties"
+#~ msgstr "Propietats"
+
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
@@ -2494,9 +2490,19 @@ msgstr "Factura des d'albarans"
 #~ "la comanda de venda. Aquesta transacció converteix la comanda de venda a "
 #~ "factures."
 
+#~ msgid "Compute"
+#~ msgstr "Calcula"
+
 #~ msgid "VAT"
 #~ msgstr "IVA"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Assign"
+#~ msgstr "Assigna"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Crea factura"
 
@@ -2506,15 +2512,15 @@ msgstr "Factura des d'albarans"
 #~ msgid "Sales order lines"
 #~ msgstr "Línies de la comanda de venda"
 
-#~ msgid "Sequence"
-#~ msgstr "Seqüència"
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Es crea un albarà de sortida OUT per a productes estocables."
 
 #~ msgid "Other data"
 #~ msgstr "Altres dades"
 
+#~ msgid "UoM"
+#~ msgstr "UdM"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2558,6 +2564,9 @@ msgstr "Factura des d'albarans"
 #~ msgid "Sale Invoice"
 #~ msgstr "Factura de venda"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Obre avançament factura"
 
@@ -2571,6 +2580,9 @@ msgstr "Factura des d'albarans"
 #~ msgid "Sale Order Line"
 #~ msgstr "Línia comanda de venda"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Cancel·la assignació"
+
 #~ msgid "Make invoices"
 #~ msgstr "Realitza factures"
 
@@ -2586,12 +2598,18 @@ msgstr "Factura des d'albarans"
 #~ msgstr ""
 #~ "No es pot eliminar comanda(es) de venda que ja està(n) confirmada(es)!"
 
+#~ msgid "Name"
+#~ msgstr "Nom"
+
 #~ msgid "New Quotation"
 #~ msgstr "Nou pressupost"
 
 #~ msgid "Total amount"
 #~ msgstr "Import total"
 
+#~ msgid "Product UoM"
+#~ msgstr "UdM del producte"
+
 #~ msgid "Payment Terms"
 #~ msgstr "Terminis de pagament"
 
@@ -2616,9 +2634,15 @@ msgstr "Factura des d'albarans"
 #~ "venda. La mateixa comanda de venda es pot haver facturat en diverses vegades "
 #~ "(línia per línia per exemple)."
 
+#~ msgid "States"
+#~ msgstr "Estats"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Error: Codi EAN erroni"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Moviments d'estoc"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Les meves comandes de venda"
 
@@ -2654,6 +2678,13 @@ msgstr "Factura des d'albarans"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom de model no vàlid en la definició de l'acció."
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Si no disposeu de suficients existències per enviar-ho tot d'una vegada, "
+#~ "accepteu enviaments parcials o no?"
+
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Factura des de l'albarà"
 
@@ -2662,6 +2693,12 @@ msgstr "Factura des d'albarans"
 #~ msgstr ""
 #~ "No podeu cancel·lar una línia de comanda de venda que ja ha estat facturada!"
 
+#~ msgid "Number Packages"
+#~ msgstr "Número paquets"
+
+#~ msgid "Accounting"
+#~ msgstr "Comptabilitat"
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sale order. The exception state is "
 #~ "automatically set when a cancel operation occurs in the invoice validation "
@@ -2688,9 +2725,6 @@ msgstr "Factura des d'albarans"
 #~ msgid "Sales Management"
 #~ msgstr "Vendes"
 
-#~ msgid "Status"
-#~ msgstr "Estat"
-
 #~ msgid ""
 #~ "By default, Open ERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2734,57 +2768,214 @@ msgstr "Factura des d'albarans"
 #~ "   - L'opció 'Factura des de albarà' s'utilitza per crear una factura durant "
 #~ "el procés dels albarans."
 
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Vendes per comercial últims 90 dies"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Configura la logística de les comandes de venda"
 
+#~ msgid "Procurement Order"
+#~ msgstr "Ordre de proveïment"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Genera ordres de proveïment per a cada línia de comanda de venda."
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Avís!"
+
+#~ msgid "Dates"
+#~ msgstr "Dates"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Vendes per comercial"
+
+#~ msgid "State"
+#~ msgstr "Estat"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "La factura es crea de forma automàtica si la política de facturació és "
+#~ "\"Facturar des de l'albarà\" o \"Facturar comanda després de l'enviament\"."
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Configura la política enviament per a comandes de venda"
 
 #~ msgid "Configure"
 #~ msgstr "Configuració"
 
+#~ msgid "Conditions"
+#~ msgstr "Condicions"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Esteu intentant assignar un lot que no és del mateix producte"
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Recrea albarà"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "No hi ha cap compte de categoria d'ingressos definida en les propietats per "
+#~ "defecte de la categoria del producte o la posició fiscal no està definida!"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "No podeu cancel·lar aquesta comanda de venda!"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "La referència de la comanda ha de ser única!"
 
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/a)"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Heu de cancel·lar primer els moviments d'estoc associats a aquesta línia de "
+#~ "comanda de venda."
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Seleccioneu un producte del tipus de servei que es diu 'Producte avançat'. "
+#~ "Pot ser que heu de crear-ho i configurar-ho com un valor per defecte per a "
+#~ "aquest camp."
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Línies a facturar"
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Vendes. Obra factura"
+
+#~ msgid "Security Days"
+#~ msgstr "Dies de seguretat"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "No podeu cancel·lar la línia de comanda de venda!"
+
 #~ msgid "  Year  "
 #~ msgstr "  Any  "
 
+#~ msgid "Sales By Month"
+#~ msgstr "Vendes per mes"
+
+#~ msgid "Companies"
+#~ msgstr "Companyies"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Crea factura final"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Proveïment de material venut"
+
 #~ msgid "Picking Default Policy"
 #~ msgstr "Política d'empaquetat per defecte"
 
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr ""
+#~ "El nom i l'adreça del contacte que ha sol·licitat la comanda o pressupost."
+
+#~ msgid "References"
+#~ msgstr "Referències"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Dates en comandes de venda"
 
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Marges en comandes de venda"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Total sense impostos"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Configuració d'aplicacions de vendes"
 
+#~ msgid "Open Invoice"
+#~ msgstr "Obre factura"
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr ""
 #~ "No podeu cancel·lar una línia de comanda de venda que ja ha estat facturada!"
 
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Basat en les quantitats enviades o comandades"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Vendes per client últims 90 dies"
+
+#~ msgid "Related Picking"
+#~ msgstr "Albarà relacionat"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Vendes per categoria de productes"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Crea albarà"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Crea ordre de lliurament"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Costos d'enviament"
 
 #~ msgid "title"
 #~ msgstr "títol"
 
+#~ msgid "Stock Move"
+#~ msgstr "Moviment d'estoc"
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Document del moviment a la sortida o al client."
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Albarans a facturar"
+
+#~ msgid "Pick List"
+#~ msgstr "Albarà"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Crea ordre proveïment"
+
 #~ msgid "Order date"
 #~ msgstr "Data de comanda"
 
+#~ msgid "Procurement Method"
+#~ msgstr "Mètode proveïment"
+
+#~ msgid "Reference UoM"
+#~ msgstr "Referència UdM"
+
 #, python-format
 #~ msgid "Picking Information !"
 #~ msgstr "Informació d'albarà!"
 
+#~ msgid "Picking List"
+#~ msgstr "Albarà"
+
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Factura des de l'albarà"
 
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Albarà i Ordre de lliurament"
 
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Podeu generar factures basades en comandes de venda o basades en enviaments."
+
+#~ msgid "Picking Policy"
+#~ msgstr "Política d'enviament"
+
 #~ msgid "sale.installer"
 #~ msgstr "venda.instal·lador"
 
@@ -2804,13 +2995,61 @@ msgstr "Factura des d'albarans"
 #~ "però està esperant que el planificador l'activi en la data de \"Data "
 #~ "ordenada\"."
 
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Primer heu de cancel·lar tots els albarans relacionats amb aquesta comanda "
+#~ "de venda."
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Document del moviment al client."
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "No s'ha definit un compte d'ingressos per a aquest producte: \"%s\" (id:%d)"
+
+#~ msgid "Logistic"
+#~ msgstr "Logística"
+
 #~ msgid "Invoicing"
 #~ msgstr "Facturació"
 
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "No s'ha definit un diari de vendes per a aquesta companyia: \"%s\" (id:%d)"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "No es pot eliminar una línia de comanda de venda que està %s!"
 
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Depenent de la configuració de la ubicació de sortida, el moviment entre la "
+#~ "zona de sortida i el client es realitza a través de l'ordre de lliurament de "
+#~ "forma manual o automàtica."
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_continguts"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Preveu vendre %.2f %s però només %.2f %s estan disponibles!\n"
+#~ "L'estoc real és %.2f %s. (sense reserves)"
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr ""
+#~ "Aquesta és la llista d'albarans que han estat generats per a aquesta comanda "
+#~ "de venda."
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -2821,6 +3060,10 @@ msgstr "Factura des d'albarans"
 #~ msgid "   Month   "
 #~ msgstr "   Mes   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Avís"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -2835,21 +3078,70 @@ msgstr "Factura des d'albarans"
 #~ "\n"
 #~ "EAN: %s Quantitat: %s Tipus de ul: %s"
 
+#~ msgid "Sales by Month"
+#~ msgstr "Vendes per mes"
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Vendes per categoria de producte últims 90 dies"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Mes-1    "
 
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "L'albarà es crea tan aviat com es confirma la comanda de venda, alhora que "
+#~ "l'ordre de proveïment. Representa l'assignació dels components de la comanda "
+#~ "de venda. Hi ha un albarà per línia de la comanda de venda que evoluciona "
+#~ "amb la disponibilitat dels components."
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Temps inicial d'entrega"
+
+#~ msgid "Packings"
+#~ msgstr "Albarans"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Es crea automàticament una ordre de proveïment tan aviat com es confirma una "
+#~ "comanda de venda o es paga la factura. Provoca la compra i la producció de "
+#~ "productes segons les regles i els paràmetres de la comanda de venda. "
+
 #~ msgid "Ordered Date"
 #~ msgstr "Data ordenada"
 
 #~ msgid "Configuration Progress"
 #~ msgstr "Progrés de la configuració"
 
+#~ msgid "Image"
+#~ msgstr "Imatge"
+
 #~ msgid "Invoicing journals"
 #~ msgstr "Diaris de facturació"
 
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Millora plantilla comanda de venda"
 
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Primer heu de cancel·lar totes les factures relacionades amb aquesta comanda "
+#~ "de venda."
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Una ordre de proveïment per a cada línia de la comanda de venda i per a "
+#~ "cadascun dels components."
+
 #~ msgid "Shipped Qty"
 #~ msgstr "Qtat enviada"
 
@@ -2857,6 +3149,12 @@ msgstr "Factura des d'albarans"
 #~ msgid "Not enough stock !"
 #~ msgstr "No hi ha estoc suficient!"
 
+#~ msgid "Delivered"
+#~ msgstr "Lliurat"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Heu d'assignar un lot de producció per a aquest producte"
+
 #~ msgid "Layout Sequence"
 #~ msgstr "Seqüencia plantilla"
 
@@ -2874,9 +3172,36 @@ msgstr "Factura des d'albarans"
 #~ msgstr ""
 #~ "Afegeix dates de realització, sol·licitud i efectiu en comandes de venda."
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Sol·licitud comanda de venda"
+
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Passos per lliurar una comanda de venda"
 
+#~ msgid "Ordering Contact"
+#~ msgstr "Contacte de la comanda"
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm, que significa \"Termes de Comerç Internacional\", implica una "
+#~ "sèrie de condicions de venda que s'utilitzen en la transacció comercial."
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Aquesta és una llista de totes les línies de comandes de venda a facturar. "
+#~ "Podeu facturar comandes de venda parcialment, per línies de comanda. No "
+#~ "necessiteu aquesta llista si factureu des d'albarans de sortida o si "
+#~ "factureu comandes de venda completes."
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "La comanda de venda '%s' ha estat canviada a estat esborrany."
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -2902,13 +3227,69 @@ msgstr "Factura des d'albarans"
 #~ "  -L'opció 'Factura des d'albarà' s'utilitza per crear una factura durant el "
 #~ "procés de preparació de la comanda."
 
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "La comanda de venda '%s' ha estat cancel·lada."
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Us permet calcular els costos d'enviament als vostres pressupostos."
 
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "El pressupost '%s'  s'ha convertit a una comanda de venda."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Les comandes de vendes us ajuden a gestionar pressupostos i comandes dels "
+#~ "vostres clients. OpenERP suggereix que comenceu per crear un pressupost. Una "
+#~ "vegada estigui confirmat, el pressupost es convertirà en una comanda de "
+#~ "venda. OpenERP pot gestionar diversos tipus de productes de manera que una "
+#~ "comanda de venda pot generar tasques, ordres de lliurament, ordres de "
+#~ "fabricació, compres, etc. Segons la configuració de la comanda de venda, es "
+#~ "generarà una factura en esborrany de manera que només cal confirmar-la quan "
+#~ "es vulgui facturar al seu client."
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Aquests dies per raons de seguretat s'afegeixen als que prometeu als clients."
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Tablero responsable ventas"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Número de dies entre la confirmació de la comanda i l'enviament dels "
+#~ "productes al client."
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr ""
 #~ "Optimitza la vostra aplicació de vendes amb funcionalitats addicionals."
 
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Per cada línia de comanda de venda, es crea una ordre de proveïment per a "
+#~ "subministrar el producte venut."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "No podeu realitzar una bestreta d'una comanda de venda que està definida com "
+#~ "a 'Factura automàtica després d'enviament'."
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Configura el vostre flux de vendes i valors per defecte."
 
@@ -2918,6 +3299,13 @@ msgstr "Factura des d'albarans"
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Voleu crear la(es) factura(es)?"
 
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Indica que la comanda de venda ha estat lliurada. Aquest camp s'actualitza "
+#~ "només després que el planificador(s) s'ha executat."
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -2965,6 +3353,21 @@ msgstr "Factura des d'albarans"
 #~ "* Gràfic dels casos per mes\n"
 #~ "    "
 
+#~ msgid "Sales by Partner"
+#~ msgstr "Vendes per empresa"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "No es pot cancel·lar la comanda de venda!"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Heu de seleccionar un client en el formulari de vendes!\n"
+#~ "Introduïu un client abans de seleccionar un producte."
+
 #~ msgid ""
 #~ "By default, OpenERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2976,6 +3379,9 @@ msgstr "Factura des d'albarans"
 #~ "configurarà els mètodes més comuns i senzills per lliurar els productes al "
 #~ "client en una o dues operacions realitzades pel treballador."
 
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Error! No podeu crear companyies recursives."
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Configura la vostra aplicació de gestió de vendes"
 
@@ -2994,3 +3400,19 @@ msgstr "Factura des d'albarans"
 #~ "La política d'enviament s'utilitza per configurar la comanda si s'ha de "
 #~ "lliurar tan aviat com sigui possible quan un producte està disponible o heu "
 #~ "d'esperar a que tots els productes estiguin disponibles."
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Si teniu més d'una tenda on veneu els productes de la vostra companyia, "
+#~ "podeu crear-les i gestionar-les des d'aquí. Cada vegada que codifiqueu un "
+#~ "nou pressupost o comanda de venda, ha d'estar vinculat a una tenda. La tenda "
+#~ "també defineix des de quin magatzem seran lliurats els productes per a cada "
+#~ "venda."
+
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "La factura s'ha creat correctament!"
diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po
index 6c08ecf4413..e2b77dce896 100644
--- a/addons/sale/i18n/cs.po
+++ b/addons/sale/i18n/cs.po
@@ -6,22 +6,170 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:18+0000\n"
 "Last-Translator: Raphael Collet (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: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Faktura dopředu"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potvrdit ocenění"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Datum potvrzení"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Seskupit podle..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -29,534 +177,145 @@ msgid ""
 "yet been invoiced"
 msgstr ""
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Prodeje podle Prodejce v posledních 90 dnech"
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Dodací adresa aktuální prodejní objednávky."
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Množství"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Den"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Zrušit objednávku"
-
-#. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Ocenění '%s' bylo převedeno na prodejní objednávku."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr "Varování !"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Řídí příkazy zásobování pro každý řádek prodejní objednávky"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analytický účet"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Zásobovací příkaz"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Řádek objednávky"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Výchozí datum splatnosti"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Stav"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Slev.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Celková cena"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Zaškrtněte políčko pro seskupení faktůr pro stejného zákazníka"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Objednané množství"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Prodeje dle obchodníka"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Pohyby inventáře"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Odkaz objednávky"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Jiné informace"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Data"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Sleva (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Nástěnka řízení prodeje"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Balení"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Z prodejní objednávky"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Jméno obchodu"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Neurčen zákazník !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Prodeje ve výjimce"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Podmínky"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Srpen"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Snažíte se přiřadit dávku, která není ze stejného výrobku"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "neplatný režim pro test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Červen"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Nelze zrušit tuto prodejní objednávku !"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistiky prodejních objednávek"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Analytický účet vztažený k prodejní objednávce."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Říjen"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Cenové nabídky"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Ceník pro aktuální prodejní objednávku."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr "Počet dní mezi potvrzení objednávky a přepravou výrobků zákazníkovi"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Datum ocenění"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Finanční pozice"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "MJ"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Počet balíků"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "V běhu"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Obchodník potvrdí ocenění. Stav prodejního příkazu přejde na 'V běhu' nebo "
-"'Ručně v běhu'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Musíte nejdříve zrušit skladové pohyby připojené k tomuto řádku prodejního "
-"příkazu."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(nedost.)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Poznámky"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Fakturační adresa pro aktuální prodejní objednávku."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fakturováno"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Objednávka doručení"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Datum potvrzení"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
 msgstr "Podílový partner"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Stav objednávky"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "K fakturaci"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum, pro které prodejní objednávka potvrzena."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Cenové nabídky"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
 msgstr "Březen"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Společnost"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Datum faktury"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Nefakturované a doručené řádky"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Částka, která je fakturována dopředu."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Vyjímka faktury"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
@@ -564,72 +323,361 @@ msgstr ""
 msgid "The total amount."
 msgstr "Celkové množství"
 
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analytický účet"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Mezisoučet"
 
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "Zrušit objednávku"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Váha"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Září"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Daně"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Nezdaněná částka"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Fakturační adresa :"
+msgid "Net Total :"
+msgstr "Čistého celkem:"
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+#: help:sale.config.settings,module_analytic_user_function:0
 msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
 msgstr ""
-"Zásobovací příkaz je vytvořen pro každý řádek prodejní objednávky pro "
-"zásobování prodaného výrobku."
 
 #. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Zrušeno"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Celkem"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Obchod"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Prodeje ve výjimce"
+
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
 msgstr "Fakturační adresa"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Hledat nefakturované řádky"
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum, kdy je vytvořena prodejní objednávka."
 
 #. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Ocenění / Objednávka"
+#: view:res.partner:0
+msgid "False"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Znovu vytvořit fakturu"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Vytvořit faktury"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Datum potvrzení"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
 msgid "# of Lines"
 msgstr "# z řádek"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Otevřená faktura objednávky"
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Řádek prodejní objednávky"
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
 
 #. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Sklad"
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# z množ."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Prodejní objednávka"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Množství (PJ)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Částka dopředu"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potvrzeno"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Výchozí datum splatnosti"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Potvrdit"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Dodací adresa"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Rok"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -637,25 +685,83 @@ msgid "Order N°"
 msgstr "Objednávka N° :"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Řádky objednávky"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Nezdaněná částka"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Slev.(%)"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Řádky k fakturaci"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Odkaz objednávky"
 
 #. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Množství (MJ)"
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Řádky faktury"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Celková cena"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Staré ocenění"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Zaškrtněte políčko pro seskupení faktůr pro stejného zákazníka"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Vytvoření faktůr"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
 
 #. module: sale
 #: field:sale.order,create_date:0
@@ -663,14 +769,42 @@ msgid "Creation Date"
 msgstr "Datum vytvoření"
 
 #. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Čekací rozvrh"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Fakturační adresa pro aktuální prodejní objednávku."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Objednané množství"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Nefakturované a doručené řádky"
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Množství"
 
 #. module: sale
 #: report:sale.order:0
@@ -683,78 +817,306 @@ msgid "My Sales"
 msgstr "Moje prodeje"
 
 #. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
 #, python-format
 msgid "Invalid action !"
 msgstr "Neplatná akce !"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Rozšířené informace"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Finanční pozice"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Ceník"
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Červenec"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# z množ."
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
 msgstr ""
 
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Datum ocenění"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
 msgstr "Datum objednávky"
 
 #. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Odesláno"
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Včechny cenové nabídky"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Sleva (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
-msgid "September"
-msgstr "Září"
+msgid "December"
+msgstr "Prosinec"
 
 #. module: sale
-#: code:addons/sale/sale.py:632
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Odesláno"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Měsíc"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1259
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nefakturované"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Kategorie výrobku"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
 #, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+msgid "Cannot cancel this sales order!"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Kategorie výrobku"
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Jméno obchodu"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -762,103 +1124,363 @@ msgid "Taxes :"
 msgstr "Daně :"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Phyby zboží"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Stav objednávky"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Opravdu chcete vytvořit fakturu(y) ?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Prodeje podle měsíce"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
+#: code:addons/sale/sale.py:658
 #, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Nelze zrušit řádek prodejní objednávky!"
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
 
 #. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Bezpečnostní dny"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Pořízení prodaného materiálu"
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Prodejní platba faktury dopředu"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "V běhu"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Neurčen zákazník !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Vytvořit faktury"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Koncept"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Placeno"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Prodejní objednávky"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Seskupit faktury"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Částka daně"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Vytvořit konečnou fakturu"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Dodací adresa"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Srpen"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Řídí zásobování a fakturace"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Červen"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Objednávka"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Prodejní obchod"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistiky prodejních objednávek"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Řádek prodejní objednávky"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Listopad"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Rozšířené filtry..."
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Vyjímka"
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Společnosti"
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Říjen"
 
 #. module: sale
-#: help:sale.order,state:0
+#: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Obchodník vytváří fakturu ručně, pokud je přepravní politika prodejní "
+"objednávky 'P5eprava a Ručně v běhu'. Faktura je vytvořena automaticky, "
+"pokud přepravní politika je 'Zaplacení před doručením'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1272
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Leden"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Prodejní objednávky v běhu"
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Obchodník potvrdí ocenění. Stav prodejního příkazu přejde na 'V běhu' nebo "
+"'Ručně v běhu'."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Odkaz na dokument, který generoval tento požadavek na prodejní objednávku."
+
+#. module: sale
+#: code:addons/sale/sale.py:958
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Zpoždění závazku"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "History"
 msgstr "Historie"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
 
 #. module: sale
@@ -878,26 +1500,100 @@ msgid "Your Reference"
 msgstr "Váš odkaz"
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "Jméno a adresa kontaktu, který vyžádal objednávku nebo ocenění."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Datum objednávky"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Ceník"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Potvrzení prodejní objednávky k fakturaci."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "Množ."
+msgid "Sales Order Lines"
+msgstr "Řádky prodejní objednávky"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Prodej"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Den"
 
 #. module: sale
 #: view:sale.order:0
-msgid "References"
-msgstr "Odkazy"
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Faktury"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Cena za kus"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Dokončeno"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Fakturační adresa :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Faktura"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -906,585 +1602,123 @@ msgstr ""
 
 #. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "Zrušit"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Cenová nabídka"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Hledat nefakturované řádky"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Vytvořit fakturu"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Celkem nezahrnuté daně"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Vaše faktura byla úspěšně vytvořena!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Prodeje podle partnera"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Objednávací kontakt"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Otevřít fakturu"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "V této společnosti není definován prodejní deník: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Vynutit přiřazení"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "na objednávku"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Založeno přepraveném nebo objednaném množství."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Sousivející navádění"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Jméno"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Dodací adresa :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Prodeje podle zákazníka za posledních 90 dnů"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Návrh prodejní objednávky"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Vytvořit dodací příkaz"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Celkem zahrnutá daň"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Vytvořit seznam naskladnění"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Prodeje podle kategorie výrobků"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potvrdit ocenění"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Chyba"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Seskupit podle..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Znovu vytvořit fakturu"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Čekací rozvrh"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metoda zásobování"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Seznam naskladnění"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Nastavit na koncept"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Dokument přesunu na výstup nebo k zákazníkovi"
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Ověřit"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Potvrdit objednávku"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Vytvořit zásobovací příkaz"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Daně"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datum, kdy je vytvořena prodejní objednávka."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Přesun zásob"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Vytvořit faktury"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Částka dopředu"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Přepravované množství"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Faktura založená na Prodejních objednávkách"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Naváděcí seznam"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Chyba !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Nelze zrušit prodejní příkaz !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Červenec"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Zásobování"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Výjimka přepravy"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Seskupit faktury"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "K překontrolování účetním."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referenční MJ"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Vyjímka faktury"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Řídí zásobování a fakturace"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Placeno"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analýza prodeje"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Znovu vytvořit balení"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Vlastnosti"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Cenová nabídka"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Obchodník vytváří fakturu ručně, pokud je přepravní politika prodejní "
-"objednávky 'P5eprava a Ručně v běhu'. Faktura je vytvořena automaticky, "
-"pokud přepravní politika je 'Zaplacení před doručením'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Můžete generovat faktury založené na prodejních objednávkách nebo na "
-"přepravě."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Prodej"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Cena za kus"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Dokončeno"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"V prodejním formuláři musíte vybrat zákazníka !\n"
-"Před výběrem výrobku prosíme nastavte zákazníka."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Zdrojový dokument"
-
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
 msgstr "K provedení"
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Politika naskladnění"
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dodací adresa :"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokument přesunu k zákazníkovi."
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analýza prodeje"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Ceník pro aktuální prodejní objednávku."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Vytvořit fakturu"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
@@ -1492,54 +1726,192 @@ msgid "The amount without tax."
 msgstr "Množství bez daně."
 
 #. module: sale
-#: code:addons/sale/sale.py:604
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Indikuje, že faktura již byla zaplacena."
+
+#. module: sale
+#: code:addons/sale/sale.py:822
 #, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Nejdříve musíte zrušit všechna navádění připojené k této prodejní objednávce."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Prodejní platba faktury dopředu"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Měsíc"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgid "You cannot cancel a sale order line that has already been invoiced!"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "Výrobek"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Zrušit přiřazení"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+msgid "Description"
+msgstr "Popis"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Květen"
+
+#. module: sale
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cena"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Opravdu chcete vytvořit fakturu(y) ?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Jiné informace"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Množ."
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "K překontrolování účetním."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Dodací adresa aktuální prodejní objednávky."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Ocenění / Objednávka"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Zákazník"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Dopředu"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Únor"
+
 #. module: sale
 #: field:sale.order,invoice_quantity:0
 msgid "Invoice on"
 msgstr "Faktura pro"
 
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
@@ -1550,32 +1922,99 @@ msgstr "DAtum objednání"
 msgid "Product UoS"
 msgstr "UoS výrobku"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Návrh prodejní objednávky"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Zdrojový dokument"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Duben"
+
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Ruční v běhu"
 
 #. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "MJ výrobku"
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistika"
+msgid "My Sale Orders"
+msgstr ""
 
 #. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Order"
-msgstr "Objednávka"
+msgid "Search Sales Order"
+msgstr "Hledat prodejní objednávky"
 
 #. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "Pro tento výrobek není definován příjmový účet: \"%s\" (id: %d)"
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Z prodejní objednávky"
 
 #. module: sale
 #: view:sale.order:0
@@ -1592,569 +2031,55 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1251
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Stavy"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Odkaz zákazníka"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Celkem"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Vytvoření faktůr"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "K fakturaci"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datum, pro které prodejní objednávka potvrzena."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Společnost"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Datum faktury"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Částka, která je fakturována dopředu."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-"Toto je seznam navádění, který byl vygenerován pro tuto prodejní objednávku."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Vytvořit faktury"
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Analytický účet vztažený k prodejní objednávce."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Net Total :"
-msgstr "Čistého celkem:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Zrušeno"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Obchod"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Datum potvrzení"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Varování"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Prodeje podle měsíce"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Prodejní objednávka"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Množství (PJ)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potvrzeno"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potvrdit"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Chyba! Nemůžete vytvořit rekurzivní společnosti."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Prodeje podle kategorie výrobků za posledních 90 dnů"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Řádky faktury"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Řádky prodejní objednávky"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Dodací čekací lhůta"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Nastavení"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Váha"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Faktury"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Prosinec"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Obrázek"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nefakturované"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Obchodník"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Staré ocenění"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Nezdaněná částka"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Faktura dopředu"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "Prodejní objednávka '%s' byla zrušena."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Koncept"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Částka daně"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr "Balení"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Prodejní objednávky"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Prodejní obchod"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Listopad"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Spočítat"
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
-"Musíte nejdříve zrušit všechny faktury přiložené k této prodejní objednávce."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Leden"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Prodejní objednávky v běhu"
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Odkaz na dokument, který generoval tento požadavek na prodejní objednávku."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Zpoždění závazku"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Přiřadit k"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Datum objednávky"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Potvrzení prodejní objednávky k fakturaci."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "Prodejní objednávka '%s' byla nastavena do stavu koncept."
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "ze skladu"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Uzavřít"
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Doručené množ."
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Pro tento výrobek musíte přiřadit výrobní dávku."
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Indikuje, že faktura již byla zaplacena."
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
-msgid "Description"
-msgstr "Popis"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Květen"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Zákazník"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Dopředu"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Únor"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Duben"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Účetnictví"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Hledat prodejní objednávky"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Vyžádání Prodejní objednávky"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
-#, python-format
-msgid "Not enough stock ! : "
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Platební období"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2163,19 +2088,61 @@ msgid "Quotation N°"
 msgstr "Množství N°"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Odkaz zákazníka"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Naskladněno"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Rok"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Faktura založená na dodávce"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Celkem zahrnutá daň"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturováno"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
 
 #~ msgid "Do you really want to create the invoices ?"
 #~ msgstr ""
@@ -2184,88 +2151,316 @@ msgstr "Faktura založená na dodávce"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Špatný název modelu v definici akce"
 
+#~ msgid "Notes"
+#~ msgstr "Poznámky"
+
 #~ msgid "Origin"
 #~ msgstr "Původ"
 
 #~ msgid "Reference"
 #~ msgstr "Reference"
 
+#~ msgid "Extra Info"
+#~ msgstr "Rozšířené informace"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalidní XML pro zobrazení architektury!"
 
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Prodeje podle Prodejce v posledních 90 dnech"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Povolí vám spočítat cenu doručení při vašem ocenění."
 
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Nastavit logistiku prodejní objednávky"
 
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Ocenění '%s' bylo převedeno na prodejní objednávku."
+
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Platba před doručením"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Varování !"
+
 #~ msgid "VAT"
 #~ msgstr "DPH"
 
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Řídí příkazy zásobování pro každý řádek prodejní objednávky"
+
 #~ msgid "All at Once"
 #~ msgstr "Vše najednou"
 
+#~ msgid "Procurement Order"
+#~ msgstr "Zásobovací příkaz"
+
+#~ msgid "Order Line"
+#~ msgstr "Řádek objednávky"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Nastavit politiku navádění pro prodejní objednávku"
 
+#~ msgid "State"
+#~ msgstr "Stav"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Vynutit přiřazení"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Prodeje dle obchodníka"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Pohyby inventáře"
+
+#~ msgid "Dates"
+#~ msgstr "Data"
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Znovu vytvořit balení"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Nástěnka řízení prodeje"
+
+#~ msgid "Packaging"
+#~ msgstr "Balení"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Nastavit na koncept"
+
+#~ msgid "Conditions"
+#~ msgstr "Podmínky"
+
 #~ msgid "Configure"
 #~ msgstr "Nastavit"
 
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Snažíte se přiřadit dávku, která není ze stejného výrobku"
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "neplatný režim pro test_state"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Nelze zrušit tuto prodejní objednávku !"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Pouze doručovací příkaz"
 
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr "Počet dní mezi potvrzení objednávky a přepravou výrobků zákazníkovi"
+
+#~ msgid "UoM"
+#~ msgstr "MJ"
+
+#~ msgid "Number Packages"
+#~ msgstr "Počet balíků"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Musíte nejdříve zrušit skladové pohyby připojené k tomuto řádku prodejního "
+#~ "příkazu."
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(nedost.)"
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr "Rozšiřuje vaší základní Prodejní aplikaci o doplňující funkce."
 
+#~ msgid "Delivery Order"
+#~ msgstr "Objednávka doručení"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Odkaz objednávky musí být jedinečný !"
 
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Zásobovací příkaz je vytvořen pro každý řádek prodejní objednávky pro "
+#~ "zásobování prodaného výrobku."
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Otevřená faktura objednávky"
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Nastavení vašeho pracovního toku a výchozích hodnot prodeje."
 
+#~ msgid "Warehouse"
+#~ msgstr "Sklad"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Nezdaněná částka"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Řádky k fakturaci"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Množství (MJ)"
+
+#~ msgid "All Quotations"
+#~ msgstr "Včechny cenové nabídky"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Fakturovat při objednávce po doručení"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Phyby zboží"
+
 #~ msgid "  Year  "
 #~ msgstr "  Rok  "
 
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Opravdu chcete vytvořit fakturu(y) ?"
 
+#~ msgid "Sales By Month"
+#~ msgstr "Prodeje podle měsíce"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Nelze zrušit řádek prodejní objednávky!"
+
+#~ msgid "Security Days"
+#~ msgstr "Bezpečnostní dny"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Pořízení prodaného materiálu"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Vytvořit konečnou fakturu"
+
+#~ msgid "Companies"
+#~ msgstr "Společnosti"
+
 #~ msgid "Picking Default Policy"
 #~ msgstr "Výchozí politika naskladnění"
 
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Jméno a adresa kontaktu, který vyžádal objednávku nebo ocenění."
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr "Nemůžete zrušit prodejní objednávku, která už byla fakturována !"
 
+#~ msgid "References"
+#~ msgstr "Odkazy"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Data prodejních objednávek"
 
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Marže v prodejních objednávkách"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Celkem nezahrnuté daně"
+
+#~ msgid "Compute"
+#~ msgstr "Spočítat"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Prodeje podle partnera"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Objednávací kontakt"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Otevřít fakturu"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Nastavení prodejní aplikace"
 
+#~ msgid "on order"
+#~ msgstr "na objednávku"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Založeno přepraveném nebo objednaném množství."
+
+#~ msgid "Related Picking"
+#~ msgstr "Sousivející navádění"
+
+#~ msgid "Name"
+#~ msgstr "Jméno"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Prodeje podle zákazníka za posledních 90 dnů"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Vytvořit dodací příkaz"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Ceny dodání"
 
+#~ msgid "Create Pick List"
+#~ msgstr "Vytvořit seznam naskladnění"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Prodeje podle kategorie výrobků"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Částečné doručení"
 
+#~ msgid "Procurement Method"
+#~ msgstr "Metoda zásobování"
+
 #~ msgid "title"
 #~ msgstr "nadpis"
 
+#~ msgid "Pick List"
+#~ msgstr "Seznam naskladnění"
+
 #~ msgid "Order date"
 #~ msgstr "Datum objednávky"
 
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Dokument přesunu na výstup nebo k zákazníkovi"
+
+#~ msgid "Validate"
+#~ msgstr "Ověřit"
+
+#~ msgid "Confirm Order"
+#~ msgstr "Potvrdit objednávku"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Vytvořit zásobovací příkaz"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Přepravní politika"
 
+#~ msgid "Stock Move"
+#~ msgstr "Přesun zásob"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Přepravované množství"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Faktura založená na Prodejních objednávkách"
+
+#~ msgid "Picking List"
+#~ msgstr "Naváděcí seznam"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Chyba !"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Nelze zrušit prodejní příkaz !"
+
+#~ msgid "Procurement"
+#~ msgstr "Zásobování"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Výjimka přepravy"
+
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Přeprava & Ruční faktura"
 
@@ -2279,19 +2474,84 @@ msgstr "Faktura založená na dodávce"
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Faktura z naskladnění"
 
+#~ msgid "Reference UoM"
+#~ msgstr "Referenční MJ"
+
+#~ msgid "Properties"
+#~ msgstr "Vlastnosti"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Můžete generovat faktury založené na prodejních objednávkách nebo na "
+#~ "přepravě."
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "V prodejním formuláři musíte vybrat zákazníka !\n"
+#~ "Před výběrem výrobku prosíme nastavte zákazníka."
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Seznam naskladnění & Dodací příkaz"
 
+#~ msgid "Picking Policy"
+#~ msgstr "Politika naskladnění"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Dokument přesunu k zákazníkovi."
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Nejdříve musíte zrušit všechna navádění připojené k této prodejní objednávce."
+
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Invoicing"
 #~ msgstr "Fakturování"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Zrušit přiřazení"
+
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
+#~ msgid "Product UoM"
+#~ msgstr "MJ výrobku"
+
+#~ msgid "Logistic"
+#~ msgstr "Logistika"
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr "Pro tento výrobek není definován příjmový účet: \"%s\" (id: %d)"
+
+#~ msgid "States"
+#~ msgstr "Stavy"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr "V této společnosti není definován prodejní deník: \"%s\" (id:%d)"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Nelze odstranit řádek prodejní objednávky, který je %s !"
 
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr ""
+#~ "Toto je seznam navádění, který byl vygenerován pro tuto prodejní objednávku."
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -2302,12 +2562,44 @@ msgstr "Faktura založená na dodávce"
 #~ msgid "   Month   "
 #~ msgstr "   Měsíc   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Varování"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Prodeje podle měsíce"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Chyba! Nemůžete vytvořit rekurzivní společnosti."
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Prodeje podle kategorie výrobků za posledních 90 dnů"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Dodací čekací lhůta"
+
+#~ msgid "Configuration"
+#~ msgstr "Nastavení"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Úplné doručení"
 
 #~ msgid "    Month-1    "
 #~ msgstr "    Měsíc-1    "
 
+#~ msgid "Image"
+#~ msgstr "Obrázek"
+
+#~ msgid "Salesman"
+#~ msgstr "Obchodník"
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Prodejní objednávka '%s' byla zrušena."
+
+#~ msgid "Packings"
+#~ msgstr "Balení"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Průběh nastavení"
 
@@ -2326,31 +2618,71 @@ msgstr "Faktura založená na dodávce"
 #~ msgid "Shipped Qty"
 #~ msgstr "Přepravené množ."
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Vaše faktura byla úspěšně vytvořena!"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Musíte nejdříve zrušit všechny faktury přiložené k této prodejní objednávce."
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Nastavit vaše aplikaci Řízení prodeje"
 
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Vylepšení rozvržení prodejní objednávky"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Chyba"
+
+#~ msgid "Assign"
+#~ msgstr "Přiřadit k"
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr ""
 #~ "Potvrzené prodejní objednávky, které jsou již potvrzené nelze smazat."
 
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Prodejní objednávka '%s' byla nastavena do stavu koncept."
+
+#~ msgid "from stock"
+#~ msgstr "ze skladu"
+
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Výchozí přepravní politika"
 
+#~ msgid "Close"
+#~ msgstr "Uzavřít"
+
+#~ msgid "Delivered"
+#~ msgstr "Doručené množ."
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Nedostatek zásob !"
 
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Pro tento výrobek musíte přiřadit výrobní dávku."
+
 #~ msgid "Layout Sequence"
 #~ msgstr "Posloupnost rozvržení"
 
+#~ msgid "Accounting"
+#~ msgstr "Účetnictví"
+
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Kroky k dodání prodejní objednávky"
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Vyžádání Prodejní objednávky"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr ""
 #~ "Poskytuje některé funkce k vylepšení rozvržení výkazu prodejních objednávek."
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Faktura založená na dodávce"
diff --git a/addons/sale/i18n/da.po b/addons/sale/i18n/da.po
index 8b8131a35d2..956caeca4be 100644
--- a/addons/sale/i18n/da.po
+++ b/addons/sale/i18n/da.po
@@ -7,19 +7,167 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2011-11-08 17:59+0000\n"
 "Last-Translator: OpenERP Danmark / Mikhael Saxtorph <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
@@ -29,1635 +177,104 @@ msgid ""
 "yet been invoiced"
 msgstr ""
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Salg pr. sælger de sidste 90 dage"
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-"Hvis du ikke har nok på lager til at levere alt på en gang, vil du så lave "
-"dellevering?"
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Leveringsaddresse for den aktuelle salgsordre"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Antal"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Dag"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Annuller ordre"
-
-#. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Tilbuddets '%s' er konverteret til salgsordre."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr "Advarsel!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Indkøbsordre"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Kontakt"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Ordrelinie"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-"Salgsordre hjælper dig med at håndtere tilbud og ordre til dine kunder. Vi "
-"foreslår at du begynder med et tilbud....."
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Standard betalingsbetinelser"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Tilstand"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Rabat (%)."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Total pris"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Afkryds for at gruppere fakturaer pr. kunde."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Ordret antal"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Salg pr. sælger"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Lagerbevægelser"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Ordre referense"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Anden information"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Datoer"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"Fakturaen laves automatisk hvis leveringspolitiken er 'Fakturer på grundlag "
-"af plukliste' eller 'Fakturer på grundlag af ordre efter levering'."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Rabat (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Salgsstyring, overblik"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Butiksnavn"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Kunde mangler!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Betingelser"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juni"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Denne ordre kunne ikke annulléres"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Salgsordre statistik"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Tilbud"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Faktureret"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marts"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Faktura adresse:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Faktura adresse"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Lagersted"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Ordre linier"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Oprettelses dato"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
 #, python-format
-msgid "Invalid action !"
+msgid "Advance of %s %s"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
+#: view:sale.config.settings:0
+msgid "Contract Feature"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Prisliste"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Ordredato"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Afsendt"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Lagerflytning"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
+#: field:sale.report,state:0
 msgid "Order State"
 msgstr ""
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Salg pr. måned"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr ""
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Leveringsadresse"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Virksomheder"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Det er det antal dage som du lägger till det datum som du lovat kunden av "
-"säkerhetsskäl"
-
-#. module: sale
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "Antal"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Salg pr. kunde de sidste 90 dage"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Lager flytning"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Plukkeliste"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Fejl!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Indkøb"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Betalt"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Salg"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Enhedspris"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Udført!"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Måned"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Vare"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr ""
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Pris"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
 msgid "To Invoice"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Tilbud"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marts"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract/Analytic Account"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
 msgstr "Virksomhed"
@@ -1667,28 +284,154 @@ msgstr "Virksomhed"
 msgid "Invoice Date"
 msgstr "Faktura dato"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1269
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
 #, python-format
 msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_ids:0
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "Annuller ordre"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
 msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
 msgstr ""
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: sale
@@ -1697,7 +440,20 @@ msgid "Net Total :"
 msgstr "Netto total:"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
 msgstr ""
@@ -1707,36 +463,130 @@ msgstr ""
 msgid "Sales Order Lines related to a Sales Order of mine"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
 #. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
 msgid "Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Faktura adresse"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Salg pr. måned"
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
 
 #. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
 msgid "Sales Order"
 msgstr ""
 
@@ -1751,12 +601,8 @@ msgid "Sale Order Lines that are in 'done' state"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
 msgstr ""
 
 #. module: sale
@@ -1765,65 +611,400 @@ msgid "Confirmed"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Standard betalingsbetinelser"
+
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
 msgid "Confirm"
 msgstr ""
 
 #. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: view:sale.order:0
+msgid "Unread messages"
 msgstr ""
 
 #. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Leveringsadresse"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
 #: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Ordre linier"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Rabat (%)."
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Ordre referense"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Total pris"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
 msgstr ""
 
 #. module: sale
-#: view:res.company:0
-msgid "Configuration"
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Afkryds for at gruppere fakturaer pr. kunde."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/edi/sale_order.py:146
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Oprettelses dato"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Ordret antal"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Antal"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total:"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
 #, python-format
 msgid "EDI Pricelist (%s)"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
-msgid "Print Order"
+msgid "Order Date"
+msgstr "Ordredato"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
 
 #. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-msgid "Sales order created in current year"
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Kontakt"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Rabat (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1832,19 +1013,28 @@ msgid ""
 "2.The Sales Order Line is Invoiced!"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
 msgstr ""
 
 #. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
 #. module: sale
@@ -1853,17 +1043,35 @@ msgid "December"
 msgstr "December"
 
 #. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Billede"
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Afsendt"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
@@ -1872,34 +1080,106 @@ msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Sælger"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
+#: code:addons/sale/sale.py:557
 #, python-format
-msgid "Advance Invoice"
+msgid "Cannot cancel this sales order!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:624
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Butiksnavn"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
 #, python-format
-msgid "The sales order '%s' has been cancelled."
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Kunde mangler!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
@@ -1907,6 +1187,16 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Betalt"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1921,6 +1211,18 @@ msgid ""
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Salgsordrer"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -1928,55 +1230,166 @@ msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juni"
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Salgsordrer"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Salgsordre statistik"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "November"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
+#: selection:sale.order.line,state:0
+msgid "Exception"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
 
 #. module: sale
@@ -1989,31 +1402,97 @@ msgstr "Januar"
 msgid "Sales Order in Progress"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2021,56 +1500,225 @@ msgstr ""
 msgid "Date Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prisliste"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr ""
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Salg"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
 msgstr ""
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Enhedspris"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Udført!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Faktura adresse:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Leveret"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
@@ -2079,17 +1727,152 @@ msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Vare"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Maj"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Pris"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Anden information"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Antal"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Leveringsaddresse for den aktuelle salgsordre"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Kunde"
@@ -2104,45 +1887,190 @@ msgstr ""
 msgid "February"
 msgstr "Februar"
 
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "April"
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Search Sales Order"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1255
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "Not enough stock ! : "
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2151,38 +2079,155 @@ msgid "Quotation N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "År"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Faktureret"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "VAT"
 #~ msgstr "Moms"
 
+#~ msgid "Dates"
+#~ msgstr "Datoer"
+
+#~ msgid "Conditions"
+#~ msgstr "Betingelser"
+
+#~ msgid "Warehouse"
+#~ msgstr "Lagersted"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Salg pr. måned"
+
 #~ msgid "  Year  "
 #~ msgstr "  År  "
 
+#~ msgid "Companies"
+#~ msgstr "Virksomheder"
+
+#~ msgid "Procurement"
+#~ msgstr "Indkøb"
+
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Invoicing"
 #~ msgstr "Fakturering"
 
 #~ msgid "   Month   "
 #~ msgstr "   Måned   "
 
+#~ msgid "Sales by Month"
+#~ msgstr "Salg pr. måned"
+
+#~ msgid "Image"
+#~ msgstr "Billede"
+
+#~ msgid "Salesman"
+#~ msgstr "Sælger"
+
+#~ msgid "Delivered"
+#~ msgstr "Leveret"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Salg pr. sælger de sidste 90 dage"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Advarsel!"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Indkøbsordre"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Salg pr. sælger"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Lagerflytning"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Salg pr. kunde de sidste 90 dage"
+
+#~ msgid "Stock Move"
+#~ msgstr "Lager flytning"
+
+#~ msgid "Picking List"
+#~ msgstr "Plukkeliste"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Fejl!"
+
 #~ msgid "Sales Management"
 #~ msgstr "Salgs administration"
 
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Forudbetaling"
 
+#~ msgid "Order Line"
+#~ msgstr "Ordrelinie"
+
+#~ msgid "State"
+#~ msgstr "Tilstand"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Salgsstyring, overblik"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Denne ordre kunne ikke annulléres"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr ""
 #~ "Gir dig mulighed for at beregne leveringsomkostninger på dine tilbud."
@@ -2190,8 +2235,47 @@ msgstr ""
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Konfigurer kundeordrelogistik"
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Hvis du ikke har nok på lager til at levere alt på en gang, vil du så lave "
+#~ "dellevering?"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Tilbuddets '%s' er konverteret til salgsordre."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Salgsordre hjælper dig med at håndtere tilbud og ordre til dine kunder. Vi "
+#~ "foreslår at du begynder med et tilbud....."
+
 #~ msgid "All at Once"
 #~ msgstr "Alt på en gang"
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Lagerbevægelser"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Konfigurerer plukpolitik for salgsorder"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Fakturaen laves automatisk hvis leveringspolitiken er 'Fakturer på grundlag "
+#~ "af plukliste' eller 'Fakturer på grundlag af ordre efter levering'."
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Det er det antal dage som du lägger till det datum som du lovat kunden av "
+#~ "säkerhetsskäl"
diff --git a/addons/sale/i18n/de.po b/addons/sale/i18n/de.po
index 32fbad8a772..60c4b52fffc 100644
--- a/addons/sale/i18n/de.po
+++ b/addons/sale/i18n/de.po
@@ -7,20 +7,168 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:16+0000\n"
 "Last-Translator: Ferdinand-camptocamp <Unknown>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Basierend auf Zeitaufzeichnung"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Anzahlungsrechnung"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Bestätige Angebot"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Pinnwand Verkauf"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Datum Auftragsbestätigung"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Gruppierung..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -32,60 +180,345 @@ msgstr ""
 "sind, aber noch nicht verrechnet wurden"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Verkäufe pro Verkäufer der letzten 90 Tage"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Vertriebspartner"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr "Erlaube Teillieferung, wenn nicht genügend auf Lager liegt."
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Status Auftrag"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "VE"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Abzurechnen"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Lieferadresse für diesen Verkaufsauftrag."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Menge"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum der Auftragsbestätigung"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Tag"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Angebote"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "März"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Vertrag / Analyse Konto"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Unternehmen"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Rechnungsdatum"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Abzurechnende Auslieferungen"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Der Vorauszahlungsbetrag"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Abrechnungsfehler"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Gesamtsumme."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analytisches Konto"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Zwischensumme"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Auftrag stornieren"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Das Angebot '%s' wurde in einen Verkaufsauftrag konvertiert."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Gewicht"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Angebot drucken"
+msgid "Quotation "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Warnung !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Verkaufsauftrag"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Umsatzsteuer"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Nettobetrag"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Nettobetrag:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Abgebrochen"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Auftragspositionen meiner Verkaufsaufträge"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Bruttobetrag"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Vertriebsshop"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Verkaufsaufträge in Fehlerliste"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Rechnungsadresse"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum der Auftragserstellung"
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Wiederherstellung Rechnung"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Erzeuge Rechnungen"
 
 #. module: sale
 #: report:sale.order:0
@@ -93,85 +526,648 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-"Automatische Erstellung von Beschaffungsaufträgen für jede "
-"Verkaufsauftragsposition."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analytisches Konto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Dieses ist ein Liste mit zu fakturierenden Verkaufsauftragszeilen um "
-"Verkaufsaufträge zeilenweise zu fakturieren. Sie brauchen diese Liste nicht, "
-"wenn Sie auf grund von Auslieferungen oder gesamte Verkaufsaufträge "
-"fakturieren."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
-"Bevor Sie einen bestätigten Verkaufsauftrag löschen können, müssen Sie "
-"diesen stornieren und davor noch die zugehörigen Lieferscheine und "
-"Lieferaufträge."
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Beschaffungsauftrag"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Geplante Lieferung am"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# Positionen"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Menge"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Verkaufsauftrag"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Menge (Verkaufseinheit)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Unerledigte Auftragspositionen"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Anzahlung"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Bestätigt"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Standard Zahlungsbedingung"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Bestätigen"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Lieferadresse"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Verkaufsauftragspositionen zu fakturieren"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Monatlicher Umsatz"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Jahr"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Nicht bestätigte Verkaufsaufträge"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Bestellnummer"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Auftragszeilen"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Rabatt (%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referenz Bestellung"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Rechnungszeilen"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Gesamtumsatz"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Vorherige Angebote"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+"Aktivieren Sie diese Option, wenn die Rechnungen je Kunde gruppiert werden "
+"sollen"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Rechnungen erstellen"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Stunde"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Datum Auftragserstellung"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Warteliste"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Rechnungsadresse für diesen Verkaufsauftrag."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Beauftragte Menge"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Jahr des Verkaufsauftrages"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Menge"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Summe:"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Meine Verkäufe"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Fehlerhafte Aktion !"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Steuerzuordnung"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "VE"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "EDI Preisliste(%s)"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Datum Angebot"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Auftragsdatum"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Angebote und Verkäufe"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Rechnung auf Basis Auslieferung"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Auftragszeile"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
-"Verkaufsaufträge helfen Ihnen bei der Erstellung und Verwaltung von "
-"Angeboten an Ihre Kunden und bei der Auftragserfassung. OpenERP schlägt "
-"zunächst die Erstellung eines Angebots an Kunden vor. Durch die "
-"Kundenbestellung und Bestätigung des Auftrags wird das Angebot dann "
-"automatisch zum Auftrag. OpenERP kann verschiedene Produkttypen verwalten, "
-"insofern kann ein Verkaufsauftrag  je nach Konfiguration der Produkte "
-"automtisch die Erstellung von Aufgaben für das Projektmanagement, "
-"Lieferaufträge an Kunden, Angebotsanfragen für Bestellungen bei Lieferanten "
-"oder Fertigungsaufträge auslösen. Ebenso kann durch eine entsprechende "
-"Auftragskonfiguration bereits direkt eine Ausgangsrechnung im Zustand "
-"Entwurf vorgeschlagen werden, die dann für die Fakturierung nur noch "
-"aufzurufen und zu bestätigen ist."
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Verkauf erstellt Rechnung"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Rabatt (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Die Ausgangsrechnung kann für den Verkaufsauftrag aus folgendem Grund "
+"aktuell nicht erstellt werden:\n"
+"1. Der Status ist entweder \"In Entwurf\" oder \"Abgebrochen\"\n"
+"2. Der Verkaufsauftrag wurde bereits abgerechnet"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Erledigte Verkaufsauftragspositionen"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Meine Angebote"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Dezember"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Ausgeliefert"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Monat"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Auftrag (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sequenz"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "Sie können einen Verkaufsauftrag ohne Zeilen nicht bestätigen"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nicht abgerechnet"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Produktkategorie"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Bezeichnung Shop"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Steuern:"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Anzahlungsrechnung"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "In Bearbeitung"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Kein Kunde definiert !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Erzeuge Rechnungen"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -189,1246 +1185,20 @@ msgstr ""
 "Stunden,  die für die zugehörigen Aufgaben verbraucht wurden."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Standard Zahlungsbedingung"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Basierend auf Lieferaufträgen"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "Haupteinheit für Arbeitszeiten"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Status"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Rabatt (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Gesamtumsatz"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-"Aktivieren Sie diese Option, wenn die Rechnungen je Kunde gruppiert werden "
-"sollen"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Meine Verkaufsaufträge"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Beauftragte Menge"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Verkäufe pro Verkäufer"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Lieferaufträge"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referenz Bestellung"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Andere Informationen"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Daten"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"Die Rechnung wird für die Abrechnungsbedingungen \"Rechnung durch "
-"Lieferung\" und \" Rechnung durch Auftrag\"  automatisch erzeugt."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "Basierend auf der Arbeitszeit der Aufgaben"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Angebote und Verkäufe"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Verkauf erstellt Rechnung"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr "Preisliste Warnung!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Rabatt (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Meine Angebote"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Pinnwand Vertriebsleitung"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Produkte Verpackungen"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Durch einen Verkaufsauftrag"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Bezeichnung Shop"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
+msgid "Advance of %s %%"
 msgstr ""
 
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Kein Kunde definiert !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Verkaufsaufträge in Fehlerliste"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "Fehler Konfiguration !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Bedingungen"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Kein Erlöskonto für diese Produktkategorie oder eine beim Partner oder "
-"Auftrag zugewiesene Steuerzuordnung  definiert !"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-"Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "Fehlerhafter Modus für test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juni"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Kann diesen Verkaufsauftrag nicht abbrechen."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistik Verkaufsauftrag"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Das analytische Konto zu diesem Verkaufsauftrag."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "Die Referenz muss je Firma eindeutig sein"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Angebote"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Preisliste für diesen Verkaufsauftrag."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "USt.:"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Anzahl an Tagen zwischen Auftragserteilung und Auslieferung an Kunden"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Datum Angebot"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Steuerzuordnung"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "ME"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Anzahl der Packstücke"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "In Bearbeitung"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Der Verkäufer bestätigt den Verkaufsauftrag. Der Status des "
-"Verkaufsauftrages wechselt entweder auf  'In Bearbeitung' oder auf  'Manuell "
-"in Bearbeitung'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-"Sie können eine bereits verrechnete Auftragsposition nicht stornieren."
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Sie müssen zuerst alle Lieferungen für diese Verkaufsauftragsposition "
-"abbrechen."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/v)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Wählen Sie ein fiktives Produkt mit dem Namen 'Anzahlung'. Sie müssen "
-"gegebenenfalls das Produkt erstellen und es dann als Standardwert für dieses "
-"Feld deklarieren."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Sie können keine Anzahlung für Aufträge erfassen, wenn als "
-"Abrechnungsbedingung 'Rechnung durch Lieferung' hinterlegt wurde."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Bemerkungen"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Der Name der Firma darf nur einmal vorkommen!"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Rechnungsadresse für diesen Verkaufsauftrag."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Monat-1"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Bestellmonat des AUftrags"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Verkaufsaufträge mit verschiedenen Währungen können nicht für den selben "
-"Partner gruppiert werden."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Liefere jedes Produkt bei Verfügbarkeit"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Abgerechnet"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Lieferschein"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Datum Auftragsbestätigung"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Lieferbedingung"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Vertriebspartner"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "März"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-"Sie dürfen keine Sicht als Quelle oder Ziel einer Lagerbewegung angeben"
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Basierend auf Verkaufsauftrag"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Gesamtsumme."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Zwischensumme"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Rechnungsanschrift:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "Zeilen Sequenz"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Für jede Verkaufsauftragsposition, wird automatisch ein Beschaffungsauftrag "
-"für den Einkauf des Produkts erstellt."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Der Begriff Incoterm steht für  'International Commercial terms' und "
-"impliziert eine Reihe von Bedingungen für den Verkauf und die Lieferung im "
-"internationalen Handel."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Rechnungsadresse"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Suche nicht abgerechnete Auftragspositionen"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Angebot / Bestellung"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# Positionen"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Offene Ausgangsrechnungen"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Auftragsposition"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Zentrallager"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Bestellnummer"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Auftragszeilen"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Nettobetrag"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Rechnungserstellung von Lieferpositionen"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Menge (ME)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Datum Auftragserstellung"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Sonstiges"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Abzurechnende Auslieferungen"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Summe:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Meine Verkäufe"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Fehlerhafte Aktion !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Extra Information"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Preisliste"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Menge"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "Stunde"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Auftragsdatum"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Ausgeliefert"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Alle Angebote"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "Optionen"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Sie können einen Verkaufsauftrag ohne Zeilen nicht bestätigen"
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Sie müssen eine Preisliste oder einen Kunden im Verkaufsformular auswählen, "
-"bevor Sie ein Produkt auswählen."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Produktkategorie"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Steuern:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Bestandsbuchungen"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Status Auftrag"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Wollen Sie wirklich diese Rechnung erstellen?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Verkäufe nach Monaten"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Konnte Auftragsposition nicht stornieren!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Sicherheitspuffer (Tage)"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Beschaffung von verkauftem Material"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Erstelle Schlussrechnung"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Lieferadresse"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Hier wird angezeigt, ob der Auftrag bereits ausgeliefert wurde. Dieses Feld "
-"wird immer nach Durchführung des automatischen Beschaffungsvorschlags "
-"aktualisiert."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Datum"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Erweiterter Filter..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Fehlerliste"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Unternehmen"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Keine gültige Preisliste gefunden"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Historie"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Rechnung auf Basis Auftrag nach Lieferung"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Diese Liste beinhaltet alle Rechnungen für diesen Auftrag. Der gleiche "
-"Auftrag könnte mehrere Rechnungen verursacht haben, z.B. bei bereits "
-"erfolgter Abrechnung einzelner Positionen."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Ihre Referenz"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-"Name und Adresse der Kontaktperson, die den Verkaufsauftrag oder da Angebot "
-"erbeten hat."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Diese Tage werden aus Sicherheitsgründen addiert zur versprochenen "
-"Auslieferungszeit (an den Kunden)."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Anz."
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referenzen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Meine Verkaufsauftragspositionen"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Die Bestellreferenz muss je Firma eindeutig sein"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Erzeuge Rechnung"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Nettobetrag"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Auftrag Referenz"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Ihre Rechnung wurde erfolgreich generiert!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Verkäufe pro Partner"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Ansprechpartner Auftrag"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Offene Posten"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr "Bestätigte Verkaufsaufträge automatisch mit EMail versenden"
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Es wurde für das Unternehmen \"%s\" (id:%d) kein explizites Verkaufsjournal "
-"definiert."
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Erzwinge Zuweisung"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Beschaffe von Auftrag"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Basierend auf gelieferte oder bestellte Mengen"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Alle Produkte auf einmal Liefern"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Zugehöriger Lieferaufträge"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Bezeichnung"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Lieferanschrift:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Verkäufe der lezten 90 Tage je Kunde"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Entwurf Zustand des Verkaufsauftrags"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Erzeugt Lieferauftrag"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr "Kann Varkaufsauftragspositionen im Status %s nicht löschen."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "ME(VE)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Bruttobetrag"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Erzeuge Packauftrag"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Bestelldatum des Verkaufsauftrages"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Verkäufe je Produkt Kategorie"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Bestätige Angebot"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Fehler"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Gruppierung..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Wiederherstellung Rechnung"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Rechnungserstellung von Lieferaufträgen"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Warteliste"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Dispositionsmethode"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Kommissionsliste"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Setze auf Entwurf"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Beleg für Warenversand oder Auslieferung"
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Validieren"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Bestätige Auftrag"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Erzeuge Beschaffungsauftrag"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Umsatzsteuer"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Fakturierbare Verkaufsaufträge"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datum der Auftragserstellung"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Bestandsbuchung"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Erzeuge Rechnungen"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Verkaufsaufträge des aktuellen Monats"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Anzahlung"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "Verrechnen Sie Lieferkosten?"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Ausgelieferte Menge"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Rechnung durch Auftrag"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Wenn Sie die Preisliste diese Auftrags ändern (und ggf die Währung) werden "
-"sich die Preise der Zeilen nicht automatisch ändern!"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Lieferschein"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Fehler !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Verkaufsauftrag konnte nicht storniert werden"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "Menge (ME)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Jahr des Verkaufsauftrages"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Beschaffung"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Versand Fehlerliste"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "Lieferschein Info!: "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Gruppiere Rechnungen"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "Fakturierungsregel"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "Bestimmen Sie Ihre Fakturierungsmethode"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Vom Rechnungswesen zu überprüfen"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referenz ME"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-"Dieser Assistent wird für Sie die richtigen  Module zu konfigurieren, je "
-"nachdem welche Fakturierungsmethode ausgewählt wurde."
-
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
 msgstr "Verkaufsauftragszeile Erzeuge Rechnung"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Abrechnungsfehler"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Steuert Beschaffung und Rechnungsstellung"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Entwurf"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1436,579 +1206,10 @@ msgid "Paid"
 msgstr "Bezahlt"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Statistik Verkaufsaufträge"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Erneut Verpacken"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Eigenschaften"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Angebot"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Der Verkäufer erstellt die Rechnung per Hand, wenn die Abrechnungsbedingung  "
-"\" Lieferung & Manuelle Rechnung\" lautet. Die Rechnung wird automatisch "
-"erstellt, wenn die Regel \"Zahlung vor Lieferung\" ist."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Rechnungen können aufgrund von Verkaufsaufträgen oder von Lieferungen "
-"erstellt werden."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Bestätigte Auftragspositionen, noch nicht geliefert"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Kundenrechnungen"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Verkaufsaufträge"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Preis/ME"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Erledigt"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Rechnung"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Sie sollten eine Kunden im Verkaufsauftrag auswählen ! Bitte wählen Sie "
-"einen Kunden vor der Auswahl\n"
-"einzelner Produkte bei den Auftragspositionen aus."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Belegreferenz"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Zu erledigen"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Auslieferungsbedingung"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Beleg der Auslieferung an Kunden"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Nettobetrag"
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr "Zuerst müssen Sie alle Lieferungen zu diesem Auftrag stornieren."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Anzahlungsrechnung"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Monat"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Auftrag (Ref ${object.name or 'n/a' })"
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Abbruch Zuweisung"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Monatlicher Umsatz"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Abrechnungsumfang"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Auftragsdatum"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Produkt - Verkaufseinheit"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuell in Bearbeitung"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Produkt ME"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistik"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Auftrag"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"Es ist kein Erlöskonto für das folgende Produkt definiert:: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignoriere den Ausnahmefehler"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Abhängig vom Abrechnungsumfang eines Verkaufsauftrags, kann die Rechnung auf "
-"Basis der beauftragten Mengen oder der ausgelieferten Mengen erfolgen. "
-"Hierdurch kann die Rechnungserstellung schon bei der Auftragserteilung so "
-"gesteuert werden, dass eine frühestmögliche Abrechnung durch den Vertriebler "
-"optional vorgesehen werden kann."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Sie wollen %.2f %s verkaufen, aber nur %.2f %s sind verfügbar !\n"
-"Der Bestand beträgt %.2f %s. (ohne Reservierungen)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Status"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referenz des Kunden"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Bruttobetrag"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Verkaufspreis"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Je nach Definition des Ausliefungslagers wird die Lagerbewegung zwischen "
-"Auslieferungslager und dem Kunden durch einen Lieferauftrag entweder manuell "
-"oder automatisch erstellt"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Zahle vor Lieferung"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Pinnwand Verkauf"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Rechnungen erstellen"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Abzurechnen"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datum der Auftragsbestätigung"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "Vertrag / Analyse Konto"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Unternehmen"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Rechnungsdatum"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Der Vorauszahlungsbetrag"
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"Konnte keine Preisliste passend zu Produkt und Menge finden.\n"
-"\n"
-"Sie können nun entweder das Produkt, die Menge oder die Preisliste ändern."
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-"Diese Liste beinhaltet die Lieferaufträge für diesen Verkaufsauftrag."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Erzeuge Rechnungen"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Nettobetrag:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Abgebrochen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Auftragspositionen meiner Verkaufsaufträge"
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Vertriebsshop"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Geplante Lieferung am"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Warnung"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Verkäufe pro Monat"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Verkaufsauftrag"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Menge (Verkaufseinheit)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Unerledigte Auftragspositionen"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"Die Erstellung des Lieferauftrags erfolgt unmittelbar auf eine "
-"Auftragsbestätigung, zeitgleich mit der Erstellung des  "
-"Beschaffungsauftrags. Der Lieferauftrag repräsentiert die zum "
-"Verkaufsauftrag einzupackenden Artikel. Hierzu gibt es einen Packauftrag mit "
-"allen Auftragsposition für den Kunden. Der Zustand des Packauftrags kann "
-"sich je nach der Verfügbarkeit von Teilen verändern."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Bestätigt"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "Vorwiegende Methode basiert auf"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Bestätigen"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Verkäufe je Produkt Kategorie der letzten 90 Tage"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Rechnungszeilen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Verkaufsauftragpositionen"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Tage bis Auslieferung"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Konfiguration"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI Preisliste(%s)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr "Drucke Auftrag"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Verkaufsaufträge des aktuellen Jahres"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Die Ausgangsrechnung kann für den Verkaufsauftrag aus folgendem Grund "
-"aktuell nicht erstellt werden:\n"
-"1. Der Status ist entweder \"In Entwurf\" oder \"Abgebrochen\"\n"
-"2. Der Verkaufsauftrag wurde bereits abgerechnet"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Erledigte Verkaufsauftragspositionen"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Gewicht"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Alle Rechnungen"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Dezember"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Bild / Photo"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Ein Beschaffungsauftrag wird spätestens dann ausgelöst, wenn ein "
-"Verkaufsauftrag bestätigt wird oder eine Ausgangsrechnung bezahlt wird. "
-"Einkauf und die Fertigung sind dabei abhängig von den Einstellungen beim "
-"Verkaufsauftrag selbst. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nicht abgerechnet"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Verkäufer"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Vorherige Angebote"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Nettobetrag"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Anzahlungsrechnung"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "Der Auftrag '%s' wurde abgebrochen."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Entwurf"
-
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -2033,6 +1234,18 @@ msgstr ""
 "* Die 'Abbrechen ' Zustand wird gesetzt, wenn ein Benutzer versucht den "
 "Kundenauftrag und dessen Verbindung abbrechen will."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Verkaufsaufträge"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Gruppiere Rechnungen"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2040,58 +1253,170 @@ msgstr "Steuerbetrag"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Lieferscheine"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Verkaufsauftragspositionen zu fakturieren"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Verkaufsaufträge des letzen Monats"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Steuert Beschaffung und Rechnungsstellung"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juni"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "E-Mail Vorlagen"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Verkaufsaufträge"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Auftrag"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Preisliste Warnung!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Verkaufsshop"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistik Verkaufsauftrag"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Auftragsposition"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "November"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Erweiterter Filter..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Produkt für Anzahlung"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Berechne Umsatzsteuer"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Fehlerliste"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Der Verkäufer erstellt die Rechnung per Hand, wenn die Abrechnungsbedingung  "
+"\" Lieferung & Manuelle Rechnung\" lautet. Die Rechnung wird automatisch "
+"erstellt, wenn die Regel \"Zahlung vor Lieferung\" ist."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Zuerst sollten Sie alle existierenden Rechnungen zu diesem Verkaufsauftrag "
-"stornieren."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2103,96 +1428,334 @@ msgstr "Januar"
 msgid "Sales Order in Progress"
 msgstr "Auftrag in Bearbeitung"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Der Verkäufer bestätigt den Verkaufsauftrag. Der Status des "
+"Verkaufsauftrages wechselt entweder auf  'In Bearbeitung' oder auf  'Manuell "
+"in Bearbeitung'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr "Referenz zu Beleg, der den Verkaufsauftrag ausgelöst hat"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Keine gültige Preisliste gefunden"
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Tage bis Auftrag"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "Lieferung und Fakturierung nach Abruf"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Bestätigte Auftragspositionen, noch nicht geliefert"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+#: view:sale.order:0
+msgid "History"
+msgstr "Historie"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
-"Ein Beschaffungsauftrag je Verkaufsauftragsposition und jede "
-"Produktkomponente."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Annehmen"
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Diese Liste beinhaltet alle Rechnungen für diesen Auftrag. Der gleiche "
+"Auftrag könnte mehrere Rechnungen verursacht haben, z.B. bei bereits "
+"erfolgter Abrechnung einzelner Positionen."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Ihre Referenz"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Auftragsdatum"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Preisliste"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "USt.:"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Kundenrechnungen"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Bestätigte Verkaufsaufträge zur Abrechnung"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Nicht bestätigte Verkaufsaufträge"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Verkaufsauftragpositionen"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Verkaufsaufträge"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "Der Auftrag '%s' wurde in den Zustand Entwurf versetzt"
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Wenn Sie die Preisliste diese Auftrags ändern (und ggf die Währung) werden "
+"sich die Preise der Zeilen nicht automatisch ändern!"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Beschaffung an Lager"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Tag"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Fertig"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Alle Rechnungen"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Preis/ME"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Erledigt"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Rechnungsanschrift:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Rechnung"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Meine Verkaufsauftragspositionen"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "Keine Preisliste! "
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Ausgeliefert"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Angebot"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Suche nicht abgerechnete Auftragspositionen"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
-"Wenn Sie Ihre Produkte über verschiedene Verkaufsshops vertreiben, können "
-"Sie diese hier definieren und verwalten. Immer wenn Sie ein neues Angebot "
-"erstellen, müssen Sie zwingend einen Verkaufsshop angeben. Dieser "
-"Verkaufsshop steuert dann von welchem Zentrallager die Produktauslieferung "
-"an den Kunden erfolgen soll."
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Die Bestellreferenz muss je Firma eindeutig sein"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Zu erledigen"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Lieferanschrift:"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Verkaufsaufträge mit verschiedenen Währungen können nicht für den selben "
+"Partner gruppiert werden."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Statistik Verkaufsaufträge"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Preisliste für diesen Verkaufsauftrag."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Erzeuge Rechnung"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Nettobetrag"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Auftrag Referenz"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2200,61 +1763,68 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Hier wird angezeigt, ob eine Rechnung bezahlt wurde."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+"Sie können eine bereits verrechnete Auftragsposition nicht stornieren."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Beschreibung"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Mai"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Kunde"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Vorschuss"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Februar"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "April"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Finanzbuchhaltung"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Suche Verkaufsaufträge"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Anfrage Verkaufsauftrag"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
-msgstr "Nicht genug auf Lager! "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Zahlungsbedingung"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Verkaufspreis"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2272,25 +1842,348 @@ msgstr ""
 "analysieren. Wenn Sie Ihren Umsatz analysieren möchten, nutzen Sie bitte die "
 "Statistik für die Umsatzerlöse in der Finanzbuchhaltung."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel.:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Wollen Sie wirklich diese Rechnung erstellen?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Andere Informationen"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Anz."
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Vom Rechnungswesen zu überprüfen"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Lieferadresse für diesen Verkaufsauftrag."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Angebot / Bestellung"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Kunde"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Vorschuss"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Februar"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Abrechnungsumfang"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Auftragsdatum"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Produkt - Verkaufseinheit"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Entwurf Zustand des Verkaufsauftrags"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Belegreferenz"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "April"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuell in Bearbeitung"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Meine Verkaufsaufträge"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Suche Verkaufsaufträge"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Bestellmonat des AUftrags"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Sie müssen eine Preisliste oder einen Kunden im Verkaufsformular auswählen, "
+"bevor Sie ein Produkt auswählen."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Durch einen Verkaufsauftrag"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignoriere den Ausnahmefehler"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Abhängig vom Abrechnungsumfang eines Verkaufsauftrags, kann die Rechnung auf "
+"Basis der beauftragten Mengen oder der ausgelieferten Mengen erfolgen. "
+"Hierdurch kann die Rechnungserstellung schon bei der Auftragserteilung so "
+"gesteuert werden, dass eine frühestmögliche Abrechnung durch den Vertriebler "
+"optional vorgesehen werden kann."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Das analytische Konto zu diesem Verkaufsauftrag."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Zahlungsbedingung"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Fakturierbare Verkaufsaufträge"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Angebot Nr."
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referenz des Kunden"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Ausgeliefert"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Jahr"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Rechnung durch Lieferung"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Bruttobetrag"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Abgerechnet"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Bestelldatum des Verkaufsauftrages"
 
 #~ msgid "Manages the delivery and invoicing progress"
 #~ msgstr "Verwaltet den Liefer- und Fakturierungs- Fortschritt"
@@ -2298,12 +2191,18 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Recreate Procurement"
 #~ msgstr "Wiederherstellung Auftrag"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Lieferschein"
+
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Ihre Rechnung wurde erfolgreich generiert!"
 
 #~ msgid "Automatic Declaration"
 #~ msgstr "Automatischer Liefernachweis"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Setze auf Entwurf"
+
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Auslieferung aus dem Zentrallager zum Kunden."
 
@@ -2314,6 +2213,9 @@ msgstr "Rechnung durch Lieferung"
 #~ "Dieser Konfigurationsschritt wird angewendet für das Standard Vorgehen der "
 #~ "Versendung von Waren eines Verkaufsauftrags"
 
+#~ msgid "Validate"
+#~ msgstr "Validieren"
+
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Nach Bestätigung des Auftrags, Erzeuge Rechnung"
 
@@ -2328,9 +2230,15 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Manual Designation"
 #~ msgstr "Manuelle Rechnungshinweise"
 
+#~ msgid "Notes"
+#~ msgstr "Bemerkungen"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Rechnung nach Auslieferung"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Versand Fehlerliste"
+
 #~ msgid "Origin"
 #~ msgstr "Bezug"
 
@@ -2347,6 +2255,9 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Procure Method"
 #~ msgstr "Beschaffungsmethode"
 
+#~ msgid "Extra Info"
+#~ msgstr "Extra Information"
+
 #~ msgid "Net Price"
 #~ msgstr "Preis Netto"
 
@@ -2380,6 +2291,12 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Sale Shop"
 #~ msgstr "Verkaufsshop"
 
+#~ msgid "Warehouse"
+#~ msgstr "Zentrallager"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Erzwinge Zuweisung"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2398,6 +2315,10 @@ msgstr "Rechnung durch Lieferung"
 #~ "Wenn Sie die Auslieferungsregel = 'Automatische Rechnung nach Lieferung\" "
 #~ "auswählen, wird direkt nach Auslieferung die Rechnung erstellt."
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Fehler !"
+
 #~ msgid "Manual Description"
 #~ msgstr "Beschreibung"
 
@@ -2407,18 +2328,36 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Packing"
 #~ msgstr "Packliste"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Bestätige Auftrag"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfiguration"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Fehlerhafter xml Code für diese Ansicht!"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "Sales orders"
 #~ msgstr "Verkauf Aufträge"
 
+#~ msgid "Procurement"
+#~ msgstr "Beschaffung"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Konten Zahlungsabwicklung"
 
+#~ msgid "Close"
+#~ msgstr "Fertig"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "Entwurf Rechnung"
 
+#~ msgid "All Quotations"
+#~ msgstr "Alle Angebote"
+
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Ausgangsrechnung im Entwurf, durch einen Buchhalter zu prüfen."
 
@@ -2428,6 +2367,9 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Procurement for each line"
 #~ msgstr "Beschaffungsvorschlag für jede Position"
 
+#~ msgid "Order Line"
+#~ msgstr "Auftragszeile"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "Verpackung Standard"
 
@@ -2441,6 +2383,9 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Order Ref"
 #~ msgstr "Referenz Auftrag"
 
+#~ msgid "Salesman"
+#~ msgstr "Verkäufer"
+
 #~ msgid ""
 #~ "In sale order , procuerement for each line and it comes into the procurement "
 #~ "order"
@@ -2469,15 +2414,16 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Konfiguriere Packliste für Auftrag"
 
-#~ msgid "Status"
-#~ msgstr "Status"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Packregeln"
 
 #~ msgid "Product sales"
 #~ msgstr "Verkaufsaufträge"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "Fehlerhafter Modus für test_state"
+
 #~ msgid "Our Salesman"
 #~ msgstr "Unser Verkäufer"
 
@@ -2487,12 +2433,12 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "One procurement for each product."
 #~ msgstr "Ein Beschaffungsvorgang je Produkt"
 
-#~ msgid "Sale Order"
-#~ msgstr "Verkaufsauftrag"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Preisliste Verkauf"
 
+#~ msgid "Properties"
+#~ msgstr "Eigenschaften"
+
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
@@ -2504,6 +2450,13 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "VAT"
 #~ msgstr "USt."
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Fehler"
+
+#~ msgid "Assign"
+#~ msgstr "Annehmen"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Erzeuge Rechnung"
 
@@ -2513,9 +2466,6 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Sales order lines"
 #~ msgstr "Auftragspositionen"
 
-#~ msgid "Sequence"
-#~ msgstr "Sequenz"
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Warenausgang wurde für alle verfügbaren Produkte erzeugt"
 
@@ -2569,6 +2519,9 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Öffne Rechnung in Bearbeitung"
 
+#~ msgid "Ordering Contact"
+#~ msgstr "Ansprechpartner Auftrag"
+
 #~ msgid "Sales Management"
 #~ msgstr "Verkauf"
 
@@ -2578,6 +2531,9 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Sale Order Line"
 #~ msgstr "Auftragspositionen"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Abbruch Zuweisung"
+
 #~ msgid "Make invoices"
 #~ msgstr "Rechnungen buchen"
 
@@ -2592,6 +2548,9 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Kann keinen Verkaufsauftrag löschen der bereits bestätigt wurde!"
 
+#~ msgid "Name"
+#~ msgstr "Bezeichnung"
+
 #~ msgid "New Quotation"
 #~ msgstr "Neues Angebot"
 
@@ -2662,6 +2621,9 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "You cannot cancel a sale order line that has already been invoiced !"
 #~ msgstr "Eine bereits fakturierte Bestellzeile kann nicht storniert werden."
 
+#~ msgid "Accounting"
+#~ msgstr "Finanzbuchhaltung"
+
 #~ msgid "Payment Accounts"
 #~ msgstr "Zahlung Konten"
 
@@ -2699,48 +2661,141 @@ msgstr "Rechnung durch Lieferung"
 #~ "  - Die 'Rechnung vom Lieferschein' Regel erzeugt eine Rechnung aufgrund der "
 #~ "Lieferung."
 
+#~ msgid "UoM"
+#~ msgstr "ME"
+
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr ""
 #~ "Fehler: Die Verkaufseinheit sollte in einer anderen Kategorie sein als die "
 #~ "Mengeneinheit"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Menge (ME)"
+
+#~ msgid "Product UoM"
+#~ msgstr "Produkt ME"
+
+#~ msgid "Companies"
+#~ msgstr "Unternehmen"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Beschaffungsauftrag"
+
 #~ msgid "  Year  "
 #~ msgstr "  Jahr  "
 
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Erlaubt die Kalkulation von Lieferkosten für das Angebot"
 
+#~ msgid "State"
+#~ msgstr "Status"
+
+#~ msgid "Conditions"
+#~ msgstr "Bedingungen"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Wollen Sie wirklich diese Rechnung erstellen?"
 
+#~ msgid "Security Days"
+#~ msgstr "Sicherheitspuffer (Tage)"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Beschaffung von verkauftem Material"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Diese Tage werden aus Sicherheitsgründen addiert zur versprochenen "
+#~ "Auslieferungszeit (an den Kunden)."
+
+#~ msgid "References"
+#~ msgstr "Referenzen"
+
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Spannen im Verkaufsauftrag"
 
+#~ msgid "Open Invoice"
+#~ msgstr "Offene Posten"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Konfiguration des Verkaufs"
 
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Basierend auf gelieferte oder bestellte Mengen"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Erzeugt Lieferauftrag"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Sie wollen %.2f %s verkaufen, aber nur %.2f %s sind verfügbar !\n"
+#~ "Der Bestand beträgt %.2f %s. (ohne Reservierungen)"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Lieferkosten"
 
+#~ msgid "Sales by Product Category"
+#~ msgstr "Verkäufe je Produkt Kategorie"
+
 #~ msgid "title"
 #~ msgstr "Titel"
 
+#~ msgid "Pick List"
+#~ msgstr "Kommissionsliste"
+
 #~ msgid "Order date"
 #~ msgstr "Auftragsdatum"
 
+#~ msgid "Create Procurement Order"
+#~ msgstr "Erzeuge Beschaffungsauftrag"
+
+#~ msgid "Picking List"
+#~ msgstr "Lieferschein"
+
 #, python-format
 #~ msgid "Picking Information !"
 #~ msgstr "Lieferschein Information"
 
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Rechnungen können aufgrund von Verkaufsaufträgen oder von Lieferungen "
+#~ "erstellt werden."
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
+#~ msgid "Logistic"
+#~ msgstr "Logistik"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Je nach Definition des Ausliefungslagers wird die Lagerbewegung zwischen "
+#~ "Auslieferungslager und dem Kunden durch einen Lieferauftrag entweder manuell "
+#~ "oder automatisch erstellt"
+
 #~ msgid "   Month   "
 #~ msgstr "   Monat   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Warnung"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Monat -1    "
 
+#~ msgid "Image"
+#~ msgstr "Bild / Photo"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Konfiguration"
 
@@ -2750,6 +2805,12 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Shipped Qty"
 #~ msgstr "Gelieferte Menge"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Ihre Rechnung wurde erfolgreich generiert!"
+
+#~ msgid "Delivered"
+#~ msgstr "Ausgeliefert"
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Nicht genügend Lagerware!"
@@ -2757,12 +2818,65 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr "Erlaube Teillieferung, wenn nicht genügend auf Lager liegt."
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Warnung !"
+
+#~ msgid "Dates"
+#~ msgstr "Daten"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Wählen Sie ein fiktives Produkt mit dem Namen 'Anzahlung'. Sie müssen "
+#~ "gegebenenfalls das Produkt erstellen und es dann als Standardwert für dieses "
+#~ "Feld deklarieren."
+
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Nettobetrag"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Dispositionsmethode"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Tage bis Auslieferung"
+
 #~ msgid "All at Once"
 #~ msgstr "Nur Gesamtmenge liefern"
 
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Konfiguration der Lieferbedingungen für diesen Verkaufsauftrag"
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Lieferaufträge"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Die Rechnung wird für die Abrechnungsbedingungen \"Rechnung durch "
+#~ "Lieferung\" und \" Rechnung durch Auftrag\"  automatisch erzeugt."
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Pinnwand Vertriebsleitung"
+
+#~ msgid "Packaging"
+#~ msgstr "Produkte Verpackungen"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Kein Erlöskonto für diese Produktkategorie oder eine beim Partner oder "
+#~ "Auftrag zugewiesene Steuerzuordnung  definiert !"
+
 #, python-format
 #~ msgid ""
 #~ "You have to select a customer in the sale form !\n"
@@ -2771,29 +2885,74 @@ msgstr "Rechnung durch Lieferung"
 #~ "Bitte Kunden im Verkaufsauftragsformular auswählen !\n"
 #~ "Sie sollten diese Auswahl vor der Produktauswahl durchführen."
 
+#~ msgid "Number Packages"
+#~ msgstr "Anzahl der Packstücke"
+
 #, python-format
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Kann diesen Verkaufsauftrag nicht abbrechen !"
 
+#~ msgid "Untaxed amount"
+#~ msgstr "Nettobetrag"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Rechnungserstellung von Lieferpositionen"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr ""
 #~ "Erweiterung der Anwendung, wodurch es ermöglicht wird zu den "
 #~ "Verkaufsaufträgen zusätzliche Angaben zu erfassen und auszugeben."
 
+#~ msgid "Stock Moves"
+#~ msgstr "Bestandsbuchungen"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Verkäufe nach Monaten"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr ""
+#~ "Name und Adresse der Kontaktperson, die den Verkaufsauftrag oder da Angebot "
+#~ "erbeten hat."
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Auftragsdaten"
 
+#~ msgid "Compute"
+#~ msgstr "Berechne Umsatzsteuer"
+
+#~ msgid "Related Picking"
+#~ msgstr "Zugehöriger Lieferaufträge"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Erzeuge Packauftrag"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Lieferung von Teilmenge"
 
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Rechnungserstellung von Lieferaufträgen"
+
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Diese Lieferaufträge wurden für diese Rechnung erstellt"
 
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Beleg für Warenversand oder Auslieferung"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Abrechnungsbedingung"
 
+#~ msgid "Stock Move"
+#~ msgstr "Bestandsbuchung"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Ausgelieferte Menge"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Rechnung durch Auftrag"
+
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Lieferung & Manuelle Rechnung"
 
@@ -2816,12 +2975,24 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Lieferauftrag & Auslieferung"
 
+#~ msgid "Picking Policy"
+#~ msgstr "Auslieferungsbedingung"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Beleg der Auslieferung an Kunden"
+
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Standard für Abrechnung Lieferauftrag"
 
+#~ msgid "Incoterm"
+#~ msgstr "Lieferbedingung"
+
 #~ msgid "Invoicing"
 #~ msgstr "Ausgangsrechnungen"
 
+#~ msgid "States"
+#~ msgstr "Status"
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Schritte für Auslieferung eines Verkaufsauftrags"
 
@@ -2876,12 +3047,48 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Picking Default Policy"
 #~ msgstr "Standard für Ausführung Lieferauftrag"
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Rechnung durch Lieferung"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Erstelle Schlussrechnung"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Anzahl an Tagen zwischen Auftragserteilung und Auslieferung an Kunden"
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Erneut Verpacken"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Verkäufe pro Partner"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Verkäufe pro Verkäufer"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Verkäufe pro Monat"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Logistik für Verkaufsaufträge konfigurieren"
 
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Kann diesen Verkaufsauftrag nicht abbrechen."
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Das Angebot '%s' wurde in einen Verkaufsauftrag konvertiert."
+
 #~ msgid "Configure"
 #~ msgstr "Konfigurieren"
 
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr ""
+#~ "Sie versuchen eine Losnummer ohne Bezug zu diesem Produkt zuzuweisen."
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -2905,13 +3112,54 @@ msgstr "Rechnung durch Lieferung"
 #~ "  - Durch \"Rechnung durch Lieferung\" kann bei Abschluss einer Lieferung "
 #~ "die Rechnung gleich mit erstellt werden."
 
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr ""
+#~ "Automatische Erstellung von Beschaffungsaufträgen für jede "
+#~ "Verkaufsauftragsposition."
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr ""
 #~ "Erweitern Sie Ihre Anwendung für den Verkauf durch weitere Funktionen."
 
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Sie müssen zuerst alle Lieferungen für diese Verkaufsauftragsposition "
+#~ "abbrechen."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Sie können keine Anzahlung für Aufträge erfassen, wenn als "
+#~ "Abrechnungsbedingung 'Rechnung durch Lieferung' hinterlegt wurde."
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Verkaufsabfolge und Vorgabewerte einrichten"
 
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Offene Ausgangsrechnungen"
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Für jede Verkaufsauftragsposition, wird automatisch ein Beschaffungsauftrag "
+#~ "für den Einkauf des Produkts erstellt."
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Der Begriff Incoterm steht für  'International Commercial terms' und "
+#~ "impliziert eine Reihe von Bedingungen für den Verkauf und die Lieferung im "
+#~ "internationalen Handel."
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Konnte Auftragsposition nicht stornieren!"
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -2961,6 +3209,15 @@ msgstr "Rechnung durch Lieferung"
 #~ "     * Grafik der Vertriebsvorgänge des Monats\n"
 #~ "    "
 
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Sie sollten eine Kunden im Verkaufsauftrag auswählen ! Bitte wählen Sie "
+#~ "einen Kunden vor der Auswahl\n"
+#~ "einzelner Produkte bei den Auftragspositionen aus."
+
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Rechnung durch Lieferung"
 
@@ -2969,10 +3226,49 @@ msgstr "Rechnung durch Lieferung"
 #~ msgstr ""
 #~ "Sie können keinen Verkaufsauftrag stornieren, der bereits abgerechnet wurde."
 
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Verkaufsauftrag konnte nicht storniert werden"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Es wurde für das Unternehmen \"%s\" (id:%d) kein explizites Verkaufsjournal "
+#~ "definiert."
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr "Zuerst müssen Sie alle Lieferungen zu diesem Auftrag stornieren."
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Auftragspositionen, die %s sind, können nicht gelöscht werden!"
 
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Es ist kein Erlöskonto für das folgende Produkt definiert:: \"%s\" (id:%d)"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Der Auftrag '%s' wurde abgebrochen."
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "Die Erstellung des Lieferauftrags erfolgt unmittelbar auf eine "
+#~ "Auftragsbestätigung, zeitgleich mit der Erstellung des  "
+#~ "Beschaffungsauftrags. Der Lieferauftrag repräsentiert die zum "
+#~ "Verkaufsauftrag einzupackenden Artikel. Hierzu gibt es einen Packauftrag mit "
+#~ "allen Auftragsposition für den Kunden. Der Zustand des Packauftrags kann "
+#~ "sich je nach der Verfügbarkeit von Teilen verändern."
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -2989,22 +3285,136 @@ msgstr "Rechnung durch Lieferung"
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Konfigurieren Sie Ihre Anwendungen für den Verkauf"
 
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Zuerst sollten Sie alle existierenden Rechnungen zu diesem Verkaufsauftrag "
+#~ "stornieren."
+
 #~ msgid "Layout Sequence"
 #~ msgstr "Reihenfolge Auftragslayout"
 
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Sie müssen zwingend eine Losnummer für dieses Produkt angeben"
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Der Auftrag '%s' wurde in den Zustand Entwurf versetzt"
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "Bereits bestätigte Verkaufsaufträge können nicht gelöscht werden !"
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Anfrage Verkaufsauftrag"
+
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Abfolge für die Auslieferung"
 
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Rechnung durch Auftrag nach Lieferung"
 
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr ""
+#~ "Diese Liste beinhaltet die Lieferaufträge für diesen Verkaufsauftrag."
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Ein Beschaffungsauftrag wird spätestens dann ausgelöst, wenn ein "
+#~ "Verkaufsauftrag bestätigt wird oder eine Ausgangsrechnung bezahlt wird. "
+#~ "Einkauf und die Fertigung sind dabei abhängig von den Einstellungen beim "
+#~ "Verkaufsauftrag selbst. "
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Ein Beschaffungsauftrag je Verkaufsauftragsposition und jede "
+#~ "Produktkomponente."
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Verkäufe je Produkt Kategorie der letzten 90 Tage"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Verkäufe pro Verkäufer der letzten 90 Tage"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Dieses ist ein Liste mit zu fakturierenden Verkaufsauftragszeilen um "
+#~ "Verkaufsaufträge zeilenweise zu fakturieren. Sie brauchen diese Liste nicht, "
+#~ "wenn Sie auf grund von Auslieferungen oder gesamte Verkaufsaufträge "
+#~ "fakturieren."
+
+#~ msgid "Reference UoM"
+#~ msgstr "Referenz ME"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Die Referenz muss eindeutig sein!"
 
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Verkäufe der lezten 90 Tage je Kunde"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/v)"
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Wenn Sie Ihre Produkte über verschiedene Verkaufsshops vertreiben, können "
+#~ "Sie diese hier definieren und verwalten. Immer wenn Sie ein neues Angebot "
+#~ "erstellen, müssen Sie zwingend einen Verkaufsshop angeben. Dieser "
+#~ "Verkaufsshop steuert dann von welchem Zentrallager die Produktauslieferung "
+#~ "an den Kunden erfolgen soll."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Verkaufsaufträge helfen Ihnen bei der Erstellung und Verwaltung von "
+#~ "Angeboten an Ihre Kunden und bei der Auftragserfassung. OpenERP schlägt "
+#~ "zunächst die Erstellung eines Angebots an Kunden vor. Durch die "
+#~ "Kundenbestellung und Bestätigung des Auftrags wird das Angebot dann "
+#~ "automatisch zum Auftrag. OpenERP kann verschiedene Produkttypen verwalten, "
+#~ "insofern kann ein Verkaufsauftrag  je nach Konfiguration der Produkte "
+#~ "automtisch die Erstellung von Aufgaben für das Projektmanagement, "
+#~ "Lieferaufträge an Kunden, Angebotsanfragen für Bestellungen bei Lieferanten "
+#~ "oder Fertigungsaufträge auslösen. Ebenso kann durch eine entsprechende "
+#~ "Auftragskonfiguration bereits direkt eine Ausgangsrechnung im Zustand "
+#~ "Entwurf vorgeschlagen werden, die dann für die Fakturierung nur noch "
+#~ "aufzurufen und zu bestätigen ist."
+
+#~ msgid "on order"
+#~ msgstr "Beschaffe von Auftrag"
+
+#~ msgid "from stock"
+#~ msgstr "Beschaffung an Lager"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Hier wird angezeigt, ob der Auftrag bereits ausgeliefert wurde. Dieses Feld "
+#~ "wird immer nach Durchführung des automatischen Beschaffungsvorschlags "
+#~ "aktualisiert."
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sales order. \n"
 #~ "The exception state is automatically set when a cancel operation occurs in "
@@ -3023,3 +3433,351 @@ msgstr "Rechnung durch Lieferung"
 #~ "Der Wartezustand wird automatisch zugewiesen, wenn eine Rechnung bereits "
 #~ "bestätigt wurde, zunächst aber ein weiterer automatischer "
 #~ "Beschaffungsvorschlag für das Bestelldatum durchgeführt werden sollte."
+
+#~ msgid "Packings"
+#~ msgstr "Lieferscheine"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Basierend auf der Arbeitszeit der Aufgaben"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Haupteinheit für Arbeitszeiten"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Basierend auf Zeitaufzeichnung"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Rechnung auf Basis Auslieferung"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Basierend auf Lieferaufträgen"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Bevor Sie einen bestätigten Verkaufsauftrag löschen können, müssen Sie "
+#~ "diesen stornieren und davor noch die zugehörigen Lieferscheine und "
+#~ "Lieferaufträge."
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "Der Name der Firma darf nur einmal vorkommen!"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Die Referenz muss je Firma eindeutig sein"
+
+#~ msgid "Month-1"
+#~ msgstr "Monat-1"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Fehler Konfiguration !"
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr ""
+#~ "Sie dürfen keine Sicht als Quelle oder Ziel einer Lagerbewegung angeben"
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Basierend auf Verkaufsauftrag"
+
+#~ msgid "Line Sequence"
+#~ msgstr "Zeilen Sequenz"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Sonstiges"
+
+#~ msgid "Options"
+#~ msgstr "Optionen"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr "Kann Varkaufsauftragspositionen im Status %s nicht löschen."
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Alle Produkte auf einmal Liefern"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Rechnung auf Basis Auftrag nach Lieferung"
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Bestätigte Verkaufsaufträge automatisch mit EMail versenden"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "ME(VE)"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "Lieferschein Info!: "
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Verrechnen Sie Lieferkosten?"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Verkaufsaufträge des aktuellen Monats"
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Menge (ME)"
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Fakturierungsregel"
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr ""
+#~ "Dieser Assistent wird für Sie die richtigen  Module zu konfigurieren, je "
+#~ "nachdem welche Fakturierungsmethode ausgewählt wurde."
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Bestimmen Sie Ihre Fakturierungsmethode"
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Vorwiegende Methode basiert auf"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Verkaufsaufträge des aktuellen Jahres"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "Konnte keine Preisliste passend zu Produkt und Menge finden.\n"
+#~ "\n"
+#~ "Sie können nun entweder das Produkt, die Menge oder die Preisliste ändern."
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Verkaufsaufträge des letzen Monats"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Zahle vor Lieferung"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Liefere jedes Produkt bei Verfügbarkeit"
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "Nicht genug auf Lager! "
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Lieferung und Fakturierung nach Abruf"
+
+#~ msgid "Print Order"
+#~ msgstr "Drucke Auftrag"
+
+#~ msgid "Print Quotation"
+#~ msgstr "Angebot drucken"
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Die Regeln zur Rechnungserstellung stimmen Rechnungs- und "
+#~ "Lieferscheinerstellung ab.\n"
+#~ "  - \"Zahlung vor Auslieferung\" erstellt zuerst die Rechnung. Der "
+#~ "Lieferschein, und damit die Kommissionierung, erfolgen erst nach "
+#~ "Zahlungseingang.\n"
+#~ "  - \"Kommissionierung & Rechnung aus Abruf\" erstellt sofort einen "
+#~ "Lieferschein zur (Vor-)Kommissionierung. Danach wird auf den manuellen "
+#~ "Rechnungsentwurf gemäss Verkaufsauftrag oder Auftragspositionen gewartet.\n"
+#~ "  - Bei \"Rechnungserstellung nach Auslieferung\" erfolgt die "
+#~ "Rechnungsstellung erst nach erfolgreicher Auslieferung aller "
+#~ "Teillieferungen.\n"
+#~ "  - \"Rechnung bei Kommissionierung\" erstellt im Moment der "
+#~ "Kommissionierung eine zugehörige Rechnung."
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "Liefert den Status der Angebotsanfrage oder der Verkaufsauftrags.\n"
+#~ "Der Ausnahme-Status wird bei Abbruch eines Vorgangs automatisch gesetzt. Bei "
+#~ "Rechnungsprüfung wird einem Rechnungsabbruch folgend und bei "
+#~ "Kommissionierungsfehlern oder Auslieferungsfehlern der Lieferungsabbruch zu "
+#~ "dieser Ausnahme führen.\n"
+#~ "Der Zustand \"Warte auf Terminierung\" wird erreicht, wenn eine Rechnung "
+#~ "zwar erstellt und bestätigt wurde, aber die Auftrags-Terminierung diesen "
+#~ "Auftrag noch nicht abgearbeitet hat."
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "Wenn \"Auf Abruf\", so wird eine Beschaffung ausgelöst sobald der "
+#~ "Verkaufsauftrag bestätigt wurde. Somit wird eine Anforderung zum Einkauf "
+#~ "oder eine Fertigung erzeugt."
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Sie haben die Anzahl von %d Einheiten gewählt.\n"
+#~ "Dies ist mit der ausgewählten Verpackung nicht vereinbar.\n"
+#~ "Ein Vorschlag der Verpackung entsprechend wäre:\n"
+#~ "EAN: %s  Anzahl: %s  Art: %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+#~ msgstr ""
+#~ "\n"
+#~ "Guten Tag ${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Hiermit erhalten Sie Ihre Auftragsbestätigung für "
+#~ "${object.partner_id.name}:\n"
+#~ "| Auftragsnummer: *${object.name}*\n"
+#~ "| Auftragsgesamtbetrag: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "| Auftragsdatum: ${object.date_order}\n"
+#~ "% if object.origin:\n"
+#~ "| Auftragsbezug: ${object.origin}\n"
+#~ "% endif\n"
+#~ "% if object.client_order_ref:\n"
+#~ "| Ihre Referenz: ${object.client_order_ref}<br />\n"
+#~ "% endif\n"
+#~ "| Ihr Ansprechpartner: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "Sie können die Auftragsbestätigung mittels nachfolgendem Link einsehen, sie "
+#~ "herunterladen oder auch online bezahlen:\n"
+#~ "${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<%\n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "Die Möglichkeit direkt per Paypal zu bezahlen steht auch zur Verfügung:\n"
+#~ "${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "Im Falle von Fragen, zögern Sie bitte nicht mit uns Kontakt aufzunehmen.\n"
+#~ "\n"
+#~ "Danke, dass Sie ${object.company_id.name} Ihr Vertrauen schenken!\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Tel.: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index a7f11600fc1..3f781421cdc 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.po
@@ -7,21 +7,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 18:23+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Advance Invoice"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Επιβεβαίωση Πώλησης"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Ημερομηνία Επιβεβαίωσης"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Ομαδοποίηση Κατά..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -29,1641 +177,104 @@ msgid ""
 "yet been invoiced"
 msgstr ""
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Πωλήσεις ανά Πωλητή τις τελευταίες 90 μέρες"
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-"Αν δεν υπάρχει αρκετό απόθεμα για να παραδώσετε όλη την παραγγελία, "
-"αποδέχεστε μερικώς εκτελεσμένες αποστολές ή όχι;"
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Διέυθυνση αποστολής για την τρέχουσα παραγγελία πώλησης."
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Ποσότητα"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Ημέρα"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Ακύρωση Εντολής"
-
-#. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr "Προειδοποίηση!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Αναλυτικός Λογαριασμός"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Παραγγελία Προμήθειας"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Συνεργάτης"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Γραμμή Εντολής"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Προκαθορισμένος Όρος Πληρωμής"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Κατάσταση"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Εκπτ.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Συνολική Τιμή"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Τσέκαρε αυτό το κουτί για να ομαδοποιήσεις τα τιμολόγια ανά πελάτη"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Παραγγελθέντα Τεμάχια"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Πωλήσεις ανά Πωλητή"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Κινήσεις Αποθήκης"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Παραπομπή Εντολής"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Άλλες Πληροφορίες"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Ημερομηνίες"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"Το τιμολόγιο δημιουργείται αυτόματα εάν η πολιτική αποστολής είναι "
-"'Τιμολόγιο από παραλαβή' ή 'Τιμολόγιο με παραγγελία μετά την παραλαβή'."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Πωλήσεις Δημιουργία Τιμολογίου"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Έκπτωση (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Οι Προσφορές Μου"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Ταμπλό Διευθυντή Πώλήσεων"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Συσκευασία"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Από παραγγελία πώλησης"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Όνομα καταστήματος"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Δεν έχει Οριστεί Πελάτης!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Πωλήσεις σε Εξαίρεση"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Συνθήκες"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Αύγουστος"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "άκυρη κατάσταση για test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Ιούνιος"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Δεν μπορεί να κυρωθεί αυτή η παραγγελία πώλησης !"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Στατιστικά Πωλήσεων Παραγγελιών"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Ο αναλυτικός λογαριασμός που σχετίζεται με την παραγγελία πώλησης"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Οκτώβριος"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Προσφορές"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Τιμοκατάλογος για την τρέχουσα παραγγελία πώλησης."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Ημέρες μεταξύ της επιβεβαίωσης παραγγελίας και της παραλαβής των προϊόντων "
-"στον πελάτη"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Ημερομηνία Προσφοράς"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Λογιστική Θέση"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "1η ΜΜ"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Αριθμός συσκευασίας"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Σε Εξέλιξη"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Πρέπει πρώτα να ακυρώσετε τις κινήσεις στοκ που συνδέονται με αυτή τη γραμμή "
-"π΄΄ωλησης."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(δεν υπάρχει)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Επιλέξτε ένα προϊόν τύπου υπηρεσίας που ονομάζεται 'Προηγμένο Προϊόν'. "
-"Μπορεί να χρειαστεί να το δημιουργήσετε και να θέσετε προεπιλεγμένη τιμή για "
-"το πεδίο."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Τηλ:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Σημειώσεις"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Διέυθυνση Τιμολόγησης για την τρέχουσα παραγγελία πώλησης."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Τιμολογημένα"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Εντολή Παράδοσης"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Ημερομηνία Επιβεβαίωσης"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
 msgstr "Συνεργάτης Παροχής"
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Μάρτιος"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Το συνολικό ποσό."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Υποσύνολο"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Διεύθυνση τιμολογίου:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Διεύθυνση Τιμολογίου"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Αναζήτηση Ατιμολόγητων γραμμών"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Προσφορά / Εντολή"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# Γραμμών"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Τιμολόγιο Πώλησης Ανοιχτό"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Γραμμή Παραγγελίας Πώλησης"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Αποθήκη"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Αρ. Εντολής"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Γραμμές Εντολής"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Αφορολόγητο ποσό"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Γραμμές προς τιμολόγηση"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Ποσότητα (ΜΜ)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Ημερομηνία Δημιουργίας"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Μή τιμολογημένα και Απεσταλμένες Γραμμές"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Σύνολο:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Οι πωλήσεις μου"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
 #, python-format
-msgid "Invalid action !"
-msgstr "Άκυρη ενέργεια!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Επιπλέον Πληροφορία"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Τιμοκατάλογος"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# από Ποσ."
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
+msgid "Advance of %s %s"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Ημερομηνία Παραγγελίας"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Απεσταλμένο"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Όλες οι προσφορές"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
+#: view:sale.config.settings:0
+msgid "Contract Feature"
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Σεπτέμβριος"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Κατηγορία Προϊόντος"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Φόροι:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Κινήσεις Αποθεμάτων"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
+#: field:sale.report,state:0
 msgid "Order State"
 msgstr "Κατάσταση Εντολών"
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Είστε σιγουροι ότι θέλετε να δημιουργήσετε τιμολόγιο(α);"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Πωλήσεις ανά Μήνα"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr ""
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Ημέρες Ασφαλείας"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Δημιουργεία Τελικού Τιμολογίου"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Διεύθυνση Παράδοσης"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Εκτεταμένα Φίλτρα..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Εξαίρεση"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Εταιρίες"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Ιστορικό"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Ο αριθμός πρωτοκόλλου σας"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-"Το όνομα και οι διευθύνσεις της επαφής που ζήτησε παραγγελία ή προσφορά."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Αυτές είναι οι μέρες που προστέθηκαν σε αυτό που υποσχεθήκατε στους πελάτες "
-"για λόγους ασφαλείας."
-
-#. module: sale
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "Ποσότητα"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Παραπομπές"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Άκυρο"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Δημιουργία Τιμολογίου"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Συνολικός Φόρος που δεν εμπεριέχεται"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Το Τιμολόγιό σας δημιουργήθηκε επιτυχώς!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Πωλήσεις ανά Συνεργάτη"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Επαφή Τιμολογίου"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Άνοιχτο Τιμολογίου"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Δυναμική Ανάθεση"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Σε εντολή"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Σχετική Παραλαβή"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Όνομα"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Διεύθυνση παράδοσης:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Πρόχειρη κατάσταση των παραγγελιών πώλησης"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Δημιουργία Παραγγελία Παραλαβής"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Συνολικός Φόρος που εμπεριέχεται"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Δημιουργία Λίστας Παραλαβής"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Πωλήσεις κατά Κατηγορία Προϊόντος"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Επιβεβαίωση Πώλησης"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Σφάλμα"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Ομαδοποίηση Κατά..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Επαναδημιουργία Τιμολογίου"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Παραλαβές προς Τιμολόγιση"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Χρονοδιάγραμμα Αναμονής"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Μέθοδος Προμήθειας"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Ρύθμιση σε πρόχειρο"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Επιβεβαίωση"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Επιβεβαίωση Εντολής"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Φόροι"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Κίνηση Αποθέματος"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Δημιουργία τιμολογίων"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Παραδοθέντα Τεμάχια"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Τιμολόγια βάσει εντολών πώλησης"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Σφάλμα!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Ιούλιος"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Προμήθεια"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Εξαίρεση Παράδοσης"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Ομαδοποίηση τιμολογίων"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Εξαίρεση Τιμολογίου"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Πληρωμένα"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Ανάλυση Πωλήσεων"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Επαναδημιουργία Συσκευασίας"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Ιδιότητες"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Προσφορά"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Πωλήσεις"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Τιμή Μονάδας"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Εκπληρωμένο"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Τιμολόγιο"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Εκκρεμότητες"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Μήνας"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Προϊόν"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Ακύρωση Ανάθεσης"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Τιμολόγηση σε"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Ημερομηνία Εντολής"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "ΜοΠ Προϊόντος"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Χειροκίνητη σε εξέλιξη"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "1η ΜΜ Προϊόντος"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Εντολή"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Καταστάσεις"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Πρωτόκολλο πελάτη"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Σύνολο"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Τιμή"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
 msgid "To Invoice"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
 msgstr "Ημερομηνία στην οποία η παραγγελία πώλησης επιβεβαιώνεται."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Προσφορές"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Μάρτιος"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract/Analytic Account"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
 msgstr "Εταιρία"
@@ -1673,31 +284,155 @@ msgstr "Εταιρία"
 msgid "Invoice Date"
 msgstr "Ημερομηνία Τιμολογίου"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Μή τιμολογημένα και Απεσταλμένες Γραμμές"
+
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1269
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Εξαίρεση Τιμολογίου"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
 #, python-format
 msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_ids:0
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Το συνολικό ποσό."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Αναλυτικός Λογαριασμός"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Υποσύνολο"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "Ακύρωση Εντολής"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Βάρος"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
 msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
 msgstr ""
-"Αυτή είναι μια λίστα παραλαβών που δημιουργήθηκε γι' αυτήν την παραγγελία "
-"πώλησης."
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Δημιουργία τιμολογίων"
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Εντολή Πώλησης"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Σεπτέμβριος"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Φόροι"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Αφορολόγητο Ποσό"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -1705,7 +440,20 @@ msgid "Net Total :"
 msgstr "Καθαρό Σύνολο:"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
 msgstr "Ακυρώθηκε"
@@ -1715,36 +463,130 @@ msgstr "Ακυρώθηκε"
 msgid "Sales Order Lines related to a Sales Order of mine"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Σύνολο"
+
 #. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
 msgid "Shop"
 msgstr "Κατάστημα"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Πωλήσεις σε Εξαίρεση"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Διεύθυνση Τιμολογίου"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Επαναδημιουργία Τιμολογίου"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Δημιουργία τιμολογίων"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
 msgstr "Ημερομηνία Επιβεβαίωσης"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Προειδοποίηση"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# Γραμμών"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Πωλήσεις ανά Μήνα"
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
 
 #. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# από Ποσ."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
 msgid "Sales Order"
 msgstr "Παραγγελία Πώλησης"
 
@@ -1759,12 +601,8 @@ msgid "Sale Order Lines that are in 'done' state"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
 msgstr ""
 
 #. module: sale
@@ -1773,65 +611,400 @@ msgid "Confirmed"
 msgstr "Επιβεβαιωμένο"
 
 #. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Προκαθορισμένος Όρος Πληρωμής"
+
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
 msgid "Confirm"
 msgstr "Επιβεβαίωση"
 
 #. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: view:sale.order:0
+msgid "Unread messages"
 msgstr ""
 
 #. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Διεύθυνση Παράδοσης"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
 #: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Έτος"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Αρ. Εντολής"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Γραμμές Εντολής"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Εκπτ.(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Παραπομπή Εντολής"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Γραμμές Τιμολογίου"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Γραμμές Εντολών Πώλησης"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Συνολική Τιμή"
 
 #. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
 msgstr ""
 
 #. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Παραμετροποίηση"
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/edi/sale_order.py:146
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Τσέκαρε αυτό το κουτί για να ομαδοποιήσεις τα τιμολόγια ανά πελάτη"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Ημερομηνία Δημιουργίας"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Χρονοδιάγραμμα Αναμονής"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Διέυθυνση Τιμολόγησης για την τρέχουσα παραγγελία πώλησης."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Παραγγελθέντα Τεμάχια"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Ποσότητα"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Σύνολο:"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Οι πωλήσεις μου"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Άκυρη ενέργεια!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Λογιστική Θέση"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Ιούλιος"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
 #, python-format
 msgid "EDI Pricelist (%s)"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Ημερομηνία Προσφοράς"
+
 #. module: sale
 #: view:sale.order:0
-msgid "Print Order"
+msgid "Order Date"
+msgstr "Ημερομηνία Παραγγελίας"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
 
 #. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-msgid "Sales order created in current year"
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Συνεργάτης"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Πωλήσεις Δημιουργία Τιμολογίου"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Έκπτωση (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1840,20 +1013,29 @@ msgid ""
 "2.The Sales Order Line is Invoiced!"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Βάρος"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Οι Προσφορές Μου"
 
 #. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Τιμολόγια"
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1861,17 +1043,35 @@ msgid "December"
 msgstr "Δεκέμβριος"
 
 #. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Εικόνα"
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Απεσταλμένο"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Μήνας"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Αλληλουχία"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
@@ -1880,34 +1080,106 @@ msgid "Uninvoiced"
 msgstr "Ατιμολόγητα"
 
 #. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Πωλητής"
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Κατηγορία Προϊόντος"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Αφορολόγητο Ποσό"
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Advance Invoice"
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:624
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Όνομα καταστήματος"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
 #, python-format
-msgid "The sales order '%s' has been cancelled."
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Φόροι:"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Σε Εξέλιξη"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Δεν έχει Οριστεί Πελάτης!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Δημιουργία τιμολογίων"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
@@ -1915,6 +1187,16 @@ msgstr ""
 msgid "Draft"
 msgstr "Πρόχειρο"
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Πληρωμένα"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1929,6 +1211,18 @@ msgid ""
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Εντολές Πώλησης"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Ομαδοποίηση τιμολογίων"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -1936,58 +1230,167 @@ msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Κατάσταση"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Αύγουστος"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
 msgstr ""
 
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Ιούνιος"
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Εντολές Πώλησης"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Εντολή"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Κατάστημα Πώλησης"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Στατιστικά Πωλήσεων Παραγγελιών"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Γραμμή Παραγγελίας Πώλησης"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Νοέμβριος"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Εκτεταμένα Φίλτρα..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Advance Product"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Υπολογισμός"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Εξαίρεση"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Οκτώβριος"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Πρέπει πρώτα να ακυρώσεις όλα τα τιμολόγια που συνδέονται με αυτήν την "
-"παραγγελία πώλησης."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1999,88 +1402,323 @@ msgstr "Ιανουάριος"
 msgid "Sales Order in Progress"
 msgstr "Εντολές Πώλησης σε Εξέλιξη"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "Ιστορικό"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Ανάθεση"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Ο αριθμός πρωτοκόλλου σας"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Ημερομηνία Παραγγελίας"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Τιμοκατάλογος"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Επιβεβαιωμένη παραγγελία πώλησης για τιμολόγηση."
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Γραμμές Εντολών Πώλησης"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Πωλήσεις"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "Η παραγγελία πώλησης '%s' είναι σε κατάσταση πρόχειρη."
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Ημέρα"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Απο στόκ"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Τιμολόγια"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Κλείσιμο"
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Τιμή Μονάδας"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Εκπληρωμένο"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Διεύθυνση τιμολογίου:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Τιμολόγιο"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Άκυρο"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Παραδόθηκε"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Προσφορά"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Αναζήτηση Ατιμολόγητων γραμμών"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Εκκρεμότητες"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Διεύθυνση παράδοσης:"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Ανάλυση Πωλήσεων"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Τιμοκατάλογος για την τρέχουσα παραγγελία πώλησης."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Δημιουργία Τιμολογίου"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
@@ -2089,17 +1727,152 @@ msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Προϊόν"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Περιγραφή"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Μάιος"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Τιμή"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Τηλ:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Είστε σιγουροι ότι θέλετε να δημιουργήσετε τιμολόγιο(α);"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Άλλες Πληροφορίες"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Ποσότητα"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Διέυθυνση αποστολής για την τρέχουσα παραγγελία πώλησης."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Προσφορά / Εντολή"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Πελάτης"
@@ -2114,45 +1887,190 @@ msgstr ""
 msgid "February"
 msgstr "Φεβρουάριος"
 
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Τιμολόγηση σε"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Ημερομηνία Εντολής"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "ΜοΠ Προϊόντος"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Πρόχειρη κατάσταση των παραγγελιών πώλησης"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Απρίλιος"
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Λογιστική"
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Χειροκίνητη σε εξέλιξη"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Search Sales Order"
 msgstr "Αναζήτηση  Παραγγελίες Πωλήσεων"
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1255
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "Not enough stock ! : "
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Από παραγγελία πώλησης"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Ο αναλυτικός λογαριασμός που σχετίζεται με την παραγγελία πώλησης"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Όροι Πληρωμής"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2161,19 +2079,61 @@ msgid "Quotation N°"
 msgstr "Αρ. Προσφοράς"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Πρωτόκολλο πελάτη"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Picked"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Έτος"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Συνολικός Φόρος που εμπεριέχεται"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Τιμολογημένα"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
 
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Βήματα για την παράδοση μιάς εντολής πώλησης"
@@ -2184,6 +2144,12 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Partial Delivery"
 #~ msgstr "Μερική Παράδοση"
 
+#~ msgid "from stock"
+#~ msgstr "Απο στόκ"
+
+#~ msgid "Delivery Order"
+#~ msgstr "Εντολή Παράδοσης"
+
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Παράδοση, απο την αποθήκη στον πελάτη."
 
@@ -2199,6 +2165,12 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Αυτόματη Δήλωση"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Ρύθμιση σε πρόχειρο"
+
+#~ msgid "Validate"
+#~ msgstr "Επιβεβαίωση"
+
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Μετά την επιβεβαίωση της εντολής, δημιουργήστε το τιμολόγιο"
 
@@ -2209,6 +2181,12 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ "Όποτε το πλήκτρο επιβεβαίωσης πατιέται, η πρόχειρη κατάσταση μεταφέρεται σε "
 #~ "χειροκίνητη, δηλαδή η προσφορά μετατρέπεται σε εντολή πώλησης."
 
+#~ msgid "Notes"
+#~ msgstr "Σημειώσεις"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Κινήσεις Αποθήκης"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Χειροκίνητος Προσδιορισμός"
 
@@ -2233,6 +2211,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Procure Method"
 #~ msgstr "Μέθοδος Προμήθειας"
 
+#~ msgid "Extra Info"
+#~ msgstr "Επιπλέον Πληροφορία"
+
 #~ msgid ""
 #~ "The sale order will automatically create the invoice proposition (draft "
 #~ "invoice). Ordered and delivered quantities may not be the same. You have to "
@@ -2261,6 +2242,15 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "All Sales Order"
 #~ msgstr "Όλες οι Εντολές Πώλησης"
 
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Τιμολόγια βάσει εντολών πώλησης"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Παραδοθέντα Τεμάχια"
+
+#~ msgid "Warehouse"
+#~ msgstr "Αποθήκη"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2276,9 +2266,19 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ "Όταν επιλέγετε Πολιτική Παραδόσεων = 'Αυτόματη ΤΙμολόγηση μετά την "
 #~ "παράδοση', θα δημιουργήθεί αυτόματα μετά την παράδοση."
 
+#~ msgid "Untaxed amount"
+#~ msgstr "Αφορολόγητο ποσό"
+
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Οι εντολές πώλησης μου σε κατάσταση προς Τιμολόγηση"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Σφάλμα!"
+
+#~ msgid "Confirm Order"
+#~ msgstr "Επιβεβαίωση Εντολής"
+
 #~ msgid "Manual Description"
 #~ msgstr "Χειροκίνητη Περιγραφή"
 
@@ -2291,6 +2291,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ "Θα πρέπει πρώτα να ακυρώσετε τα επισυναπτόμενα τιμολόγια αυτής της εντολής "
 #~ "πώλησης."
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Ποσότητα (ΜΜ)"
+
 #~ msgid "Packing"
 #~ msgstr "Συσκευασία"
 
@@ -2300,6 +2303,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Total amount"
 #~ msgstr "Συνολικό ποσό"
 
+#~ msgid "Configuration"
+#~ msgstr "Παραμετροποίηση"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Τιμολόγηση στην εντολή μετά την παράδοση"
 
@@ -2317,15 +2323,27 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Sales orders"
 #~ msgstr "Εντολές πώλησης"
 
+#~ msgid "All Quotations"
+#~ msgstr "Όλες οι προσφορές"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Λογαριασμοί πληρωμών"
 
 #~ msgid "Draft Invoice"
 #~ msgstr "Πρόχειρο Τιμολόγιο"
 
+#~ msgid "Procurement"
+#~ msgstr "Προμήθεια"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Εξαίρεση Παράδοσης"
+
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "Εντολή Πώλησης Προς Τιμολόγηση"
 
+#~ msgid "Order Line"
+#~ msgstr "Γραμμή Εντολής"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "Προκαθορισμένη Πολιτική Συσκευασιών"
 
@@ -2352,12 +2370,18 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ "Στις εντολές πώλησης, οι προμήθειες γίνονται για κάθε γραμμή και δημιουργούν "
 #~ "εντολές προμήθειας"
 
+#~ msgid "Salesman"
+#~ msgstr "Πωλητής"
+
 #~ msgid "Order Ref"
 #~ msgstr "Σχετ. Εντολή"
 
 #~ msgid "Uninvoiced Lines"
 #~ msgstr "Μή Τιμολογημένες Γραμμές"
 
+#~ msgid "Packaging"
+#~ msgstr "Συσκευασία"
+
 #~ msgid "Sales Configuration"
 #~ msgstr "Παραμετροποίηση Πωλήσεων"
 
@@ -2383,24 +2407,22 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Procurement Corrected"
 #~ msgstr "Διόρθωση Προμήθειας"
 
-#~ msgid "Status"
-#~ msgstr "Κατάσταση"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Πολιτική Συσκευασιών"
 
 #~ msgid "Product sales"
 #~ msgstr "Πωλήσεις προϊόντος"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "άκυρη κατάσταση για test_state"
+
 #~ msgid "Our Salesman"
 #~ msgstr "Οι πωλητές μας"
 
 #~ msgid "Sale Procurement"
 #~ msgstr "Προμήθεια Πώλησης"
 
-#~ msgid "Sale Order"
-#~ msgstr "Εντολή Πώλησης"
-
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
@@ -2415,12 +2437,25 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Direct Delivery"
 #~ msgstr "Απευθείας Παράδοση"
 
+#~ msgid "Properties"
+#~ msgstr "Ιδιότητες"
+
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Πρόχειρο τιμολόγιο πελάτη, για έλεγχο απο λογιστή."
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Σφάλμα"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Δημιουργία Τιμολογίου"
 
+#~ msgid "Compute"
+#~ msgstr "Υπολογισμός"
+
+#~ msgid "Assign"
+#~ msgstr "Ανάθεση"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Μόνον Εντολή Παράδοσης"
 
@@ -2430,12 +2465,12 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Other data"
 #~ msgstr "Άλλες πληροφορίες"
 
-#~ msgid "Sequence"
-#~ msgstr "Αλληλουχία"
-
 #~ msgid "Confirm sale order and Create invoice."
 #~ msgstr "Επιβεβαίωση εντολής πώλησης και Δημιουργία τιμολογίου"
 
+#~ msgid "Close"
+#~ msgstr "Κλείσιμο"
+
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Παράδοση & Χειροκίνητη Τιμολόγηση"
 
@@ -2445,6 +2480,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ "Το όνομα του αντικειμένου θα πρέπει να αρχίζει απο x_ και να μην περιέχει "
 #~ "ειδικούς χαρακτήρες!"
 
+#~ msgid "UoM"
+#~ msgstr "1η ΜΜ"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2479,6 +2517,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Open Advance Invoice"
 
+#~ msgid "Ordering Contact"
+#~ msgstr "Επαφή Τιμολογίου"
+
 #~ msgid "Sales Management"
 #~ msgstr "Διαχείριση Πωλήσεων"
 
@@ -2488,6 +2529,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Sale Order Line"
 #~ msgstr "Γραμμή Εντολής Πώλησης"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Ακύρωση Ανάθεσης"
+
 #, python-format
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Αδύνατη η ακύρωση αυτής της εντολής πώλησης!"
@@ -2501,6 +2545,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Make invoices"
 #~ msgstr "Δημιουργία τιμολογίων"
 
+#~ msgid "on order"
+#~ msgstr "Σε εντολή"
+
 #~ msgid ""
 #~ "By default, Open ERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2515,6 +2562,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Τιμοκατάλογοι Αγορών"
 
+#~ msgid "Name"
+#~ msgstr "Όνομα"
+
 #~ msgid "Configure Picking Policy for Sale Order"
 #~ msgstr "Παραμετροποίηση Πολιτικής Συσκευασίας Εντολής Πώλησης"
 
@@ -2525,6 +2575,12 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Αδύνατη η διαγραφή Εντολής(λών) Πώλησης που έχουν ήδη επιβεβαιωθεί!"
 
+#~ msgid "Product UoM"
+#~ msgstr "1η ΜΜ Προϊόντος"
+
+#~ msgid "States"
+#~ msgstr "Καταστάσεις"
+
 #~ msgid "Related invoices"
 #~ msgstr "Σχετικά τιμολόγια"
 
@@ -2549,15 +2605,27 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Payment Terms"
 #~ msgstr "Όροι Πληρωμής"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Κινήσεις Αποθεμάτων"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Οι εντολές πωλήσεων μου"
 
 #~ msgid "Sale Order line"
 #~ msgstr "Γραμμή Εντολών Πώλησης"
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Σφάλμα: Άκυρος κώδικας ΕΑΝ"
 
+#~ msgid "Force Assignation"
+#~ msgstr "Δυναμική Ανάθεση"
+
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Configure Sale Order Logistic"
 
@@ -2578,6 +2646,9 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Advance Payment"
 #~ msgstr "Advance Payment"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Create Advance Invoice"
 #~ msgstr "Create Advance Invoice"
 
@@ -2587,9 +2658,22 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Related Packing"
 #~ msgstr "Σχετικές συσκευασίες"
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Αν δεν υπάρχει αρκετό απόθεμα για να παραδώσετε όλη την παραγγελία, "
+#~ "αποδέχεστε μερικώς εκτελεσμένες αποστολές ή όχι;"
+
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Τιμολόγηση απ' την συσκευασία"
 
+#~ msgid "Number Packages"
+#~ msgstr "Αριθμός συσκευασίας"
+
+#~ msgid "Accounting"
+#~ msgstr "Λογιστική"
+
 #~ msgid "Customer Ref"
 #~ msgstr "Παραπομπή Πελάτη"
 
@@ -2610,12 +2694,22 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "  Year  "
 #~ msgstr "  Έτος  "
 
+#~ msgid "Sales By Month"
+#~ msgstr "Πωλήσεις ανά Μήνα"
+
+#~ msgid "Companies"
+#~ msgstr "Εταιρίες"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Κόστος Μεταφορικών"
 
 #~ msgid "   Month   "
 #~ msgstr "   Μήνας   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Προειδοποίηση"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Μήνας-1    "
 
@@ -2623,9 +2717,31 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Not enough stock !"
 #~ msgstr "Δεν υπάρχει αρκετό απόθεμα !"
 
+#~ msgid "Delivered"
+#~ msgstr "Παραδόθηκε"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Προειδοποίηση!"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
 
+#~ msgid "State"
+#~ msgstr "Κατάσταση"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Παραγγελία Προμήθειας"
+
+#~ msgid "Dates"
+#~ msgstr "Ημερομηνίες"
+
+#~ msgid "Conditions"
+#~ msgstr "Συνθήκες"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Ταμπλό Διευθυντή Πώλήσεων"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr ""
@@ -2641,30 +2757,104 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ "Δεν μπορεί να γίνει ακύρωση μιας γραμμής παραγγελίας πώλησης η οποία έχει "
 #~ "τιμολογηθεί !"
 
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Ημέρες μεταξύ της επιβεβαίωσης παραγγελίας και της παραλαβής των προϊόντων "
+#~ "στον πελάτη"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Επιτρέπει τον υπολογισμό του κόστους μεταφοράς στις προσφορές σου"
 
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Επιλέξτε ένα προϊόν τύπου υπηρεσίας που ονομάζεται 'Προηγμένο Προϊόν'. "
+#~ "Μπορεί να χρειαστεί να το δημιουργήσετε και να θέσετε προεπιλεγμένη τιμή για "
+#~ "το πεδίο."
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Γραμμές προς τιμολόγηση"
+
+#~ msgid "Security Days"
+#~ msgstr "Ημέρες Ασφαλείας"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Είστε σιγουροι ότι θέλετε να δημιουργήσετε τιμολόγιο(α);"
 
+#~ msgid "Create Final Invoice"
+#~ msgstr "Δημιουργεία Τελικού Τιμολογίου"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Πωλήσεις ανά Πωλητή"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Πωλήσεις ανά Συνεργάτη"
+
+#~ msgid "Stock Move"
+#~ msgstr "Κίνηση Αποθέματος"
+
 #~ msgid "Order date"
 #~ msgstr "Ημερομηνία παραγγελίας"
 
 #~ msgid "Invoicing"
 #~ msgstr "Τιμολόγηση"
 
+#~ msgid "Sales by Month"
+#~ msgstr "Πωλήσεις ανά Μήνα"
+
+#~ msgid "Image"
+#~ msgstr "Εικόνα"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr ""
+#~ "Το όνομα και οι διευθύνσεις της επαφής που ζήτησε παραγγελία ή προσφορά."
+
+#~ msgid "References"
+#~ msgstr "Παραπομπές"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Ημερομηνίες Παραγγελιών Πώλησης"
 
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Περιθώρια στις Παραγγελίες Πωλήσεων"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Συνολικός Φόρος που δεν εμπεριέχεται"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Άνοιχτο Τιμολογίου"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Αυτές είναι οι μέρες που προστέθηκαν σε αυτό που υποσχεθήκατε στους πελάτες "
+#~ "για λόγους ασφαλείας."
+
+#~ msgid "Related Picking"
+#~ msgstr "Σχετική Παραλαβή"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Παραλαβές προς Τιμολόγιση"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Πωλήσεις κατά Κατηγορία Προϊόντος"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Δημιουργία Λίστας Παραλαβής"
+
 #~ msgid "Picking Default Policy"
 #~ msgstr "Προεπιλεγμένη Πολιτική Παραλαβής"
 
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Παραμετροποιήστε την Εφαρμογή Διαχείρισης Πωλήσεων"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Το Τιμολόγιό σας δημιουργήθηκε επιτυχώς!"
+
 #~ msgid "Shipped Qty"
 #~ msgstr "Παραδόμενη Ποσ."
 
@@ -2674,23 +2864,75 @@ msgstr "Τιμολόγηση Βασισμένη Σε Παραδόσεις"
 #~ msgid "Configuration Progress"
 #~ msgstr "Πρόοδος Παραμετροποίησης"
 
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr ""
+#~ "Αυτή είναι μια λίστα παραλαβών που δημιουργήθηκε γι' αυτήν την παραγγελία "
+#~ "πώλησης."
+
 #~ msgid "Invoicing journals"
 #~ msgstr "Ημερολόγια Τιμολόγησης"
 
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Πρέπει πρώτα να ακυρώσεις όλα τα τιμολόγια που συνδέονται με αυτήν την "
+#~ "παραγγελία πώλησης."
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Η παραγγελία πώλησης '%s' είναι σε κατάσταση πρόχειρη."
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Το τιμολόγιο δημιουργείται αυτόματα εάν η πολιτική αποστολής είναι "
+#~ "'Τιμολόγιο από παραλαβή' ή 'Τιμολόγιο με παραγγελία μετά την παραλαβή'."
+
 #~ msgid "Configure"
 #~ msgstr "Παραμετροποίηση"
 
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Δεν μπορεί να κυρωθεί αυτή η παραγγελία πώλησης !"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Πωλήσεις ανά Πωλητή τις τελευταίες 90 μέρες"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Δημιουργία Παραγγελία Παραλαβής"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Μέθοδος Προμήθειας"
+
 #~ msgid "title"
 #~ msgstr "τίτλος"
 
+#~ msgid "Recreate Packing"
+#~ msgstr "Επαναδημιουργία Συσκευασίας"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Η αναφορά Παραγγελίας πρέπει να είναι μοναδική"
 
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr "Εμπλουτίστε την βασική Εφαρμογή Πωλήσεων με επιπλέον λειτουργίες"
 
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(δεν υπάρχει)"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Διαμορφώστε την Εφοδιαστικ΄΄η των Παραγγελιών Πώλησης"
 
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Τιμολογήση σε Παραγγελία μετά την Παραλαβή"
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Τιμολόγιο Πώλησης Ανοιχτό"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Πρέπει πρώτα να ακυρώσετε τις κινήσεις στοκ που συνδέονται με αυτή τη γραμμή "
+#~ "π΄΄ωλησης."
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 23ba9ea96ef..e057608f43a 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:38+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
@@ -14,13 +14,161 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Basado en hoja de servicios"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanzar factura"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar presupuesto"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Tablero de ventas"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha confirmación"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -32,62 +180,345 @@ msgstr ""
 "estado de excepción aún no han sido facturadas"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Ventas por comercial últimos 90 días"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicación empresa"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Estado del pedido"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Si no dispone de suficientes existencias para enviarlo todo de una vez, "
-"¿acepta envíos parciales o no?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "UdV"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Para facturar"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Dirección de envío para el pedido de venta actual."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Cantidad"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Fecha en la que se confirma el pedido de venta."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Día"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Contrato / Cuenta analítica"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "El importe a facturar por adelantado."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "El importe total."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar pedido"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Imprimir presupuesto"
+msgid "Quotation "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "¡Aviso!"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección de factura"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Fecha en la que se crea el pedido de venta."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Volver a Crear factura"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
 
 #. module: sale
 #: report:sale.order:0
@@ -95,78 +526,647 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Esta es una lista de todas las líneas de pedidos de venta a facturar. Puede "
-"facturar pedidos de venta parcialmente, por líneas de pedido. No necesita "
-"esta lista si factura desde albaranes de salida o si factura pedidos de "
-"venta completos."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
-"Para eliminar un pedido confirmado, debe cancelarlo primero! Para "
-"cancelarlo, debe primero cancelar los albaranes relacionados"
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Orden de abastecimiento"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Fecha confirmación"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Nº de ctdad"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Pedidos de venta que están en estado 'Realizado'"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Importe avanzado"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Plazo de pago por defecto"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Dirección de envío"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Lineas del pedido de venta para ser facturadas"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Volumen mensual"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Pedidos de venta sin confirmar"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Pedido Nº"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas del pedido"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Presupuestos antiguos"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Realizar facturas"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Hora"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando fecha planificada"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Dirección de facturación para el pedido de venta actual."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades pedidas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mis ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UdV"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "Tarifa EDI (%s)"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Presupuestos y pedidos"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Facturar desde albaranes"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Línea del pedido"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
-"Los pedidos de ventas le ayudan a gestionar presupuestos y pedidos de sus "
-"clientes. OpenERP sugiere que comience por crear un presupuesto. Una vez "
-"esté confirmado, el presupuesto se convertirá en un pedido de venta. OpenERP "
-"puede gestionar varios tipos de productos de forma que un pedido de venta "
-"puede generar tareas, órdenes de entrega, órdenes de fabricación, compras, "
-"etc. Según la configuración del pedido de venta, se generará una factura en "
-"borrador de manera que sólo hay que confirmarla cuando se quiera facturar a "
-"su cliente."
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Ventas. Realizar factura"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"No se puede crear la factura a partir de esta línea de pedido de venta por "
+"las siguientes razones:\n"
+"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
+"\"cancelada\".\n"
+"2. La línea del pedido de venta está facturada."
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Lineas del pedido de venta realizadas"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "No puede confirmar un pedido de venta sin lineas."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoría de producto"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre tienda"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Ventas. Anticipo pago factura"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -184,1217 +1184,9 @@ msgstr ""
 "son las horas dedicadas a las tareas asociadas."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Plazo de pago por defecto"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Basado en albaranes de salida"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "Unidad de tiempo de trabajo principal"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Estado"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mis pedidos de venta"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Cantidades pedidas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Ventas por comercial"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Movimientos de inventario"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referencia del pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Otra información"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Fechas"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"La factura se crea de forma automática si la política de facturación es "
-"\"Facturar desde el albarán\" o \"Facturar pedido después del envío\"."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "Basado en tareas de trabajo"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Presupuestos y pedidos"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Ventas. Realizar factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr "¡Advertencia de la lista de precios!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Descuento (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mis presupuestos"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Tablero responsable ventas"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Empaquetado"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Desde un pedido de venta"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nombre tienda"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "¡No se ha definido un cliente!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Ventas en excepción"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "!Error de configuración¡"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Condiciones"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"¡No hay ninguna cuenta de categoría de ingresos definida en las propiedades "
-"por defecto de la categoría del producto o la posición fiscal no está "
-"definida!"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Está intentando asignar un lote que no es del mismo producto"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "Modo no válido para test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "¡No se puede cancelar este pedido de venta!"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estadísticas pedidos de venta"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "La cuenta analítica relacionada con un pedido de venta."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "¡La referencia debe ser única por compañía!"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Presupuestos"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Tarifa para el pedido de venta actual."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Número de días entre la confirmación del pedido y el envío de los productos "
-"al cliente."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Fecha presupuesto"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Número paquetes"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"El comercial confirma el presupuesto. El estado del pedido de venta se "
-"convierte 'En proceso' o 'Manual en proceso'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr "¡No puede cancelar una linea de pedido que ya está facturada!"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Debe cancelar primero los movimientos de stock asociados a esta línea de "
-"pedido de venta."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Seleccione un producto del tipo de servicio que se llama 'Producto "
-"avanzado'. Puede que tenga que crearlo y configurarlo como un valor por "
-"defecto para este campo."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"No puede realizar un anticipo de un pedido de venta que está definido como "
-"'Factura automática después envío'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "¡El nombre de la compañía debe ser único!"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Dirección de facturación para el pedido de venta actual."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Mes-1"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Entregar cada producto cuando esté disponible"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Orden de entrega"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Ubicación empresa"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr "No puede mover productos desde o hacia una ubicación de tipo vista."
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Basado en pedidos de venta"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "El importe total."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Dirección de factura :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "Secuencia de linea"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Para cada línea de pedido de venta, se crea una orden de abastecimiento para "
-"suministrar el producto vendido."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm, que significa 'Términos de Comercio Internacional', implica una "
-"serie de condiciones de venta que se utilizan en la transacción comercial."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Dirección de factura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Buscar líneas no facturadas"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Presupuesto / Pedido"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de líneas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Ventas. Abrir factura"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Pedido Nº"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Líneas del pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Base imponible"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Líneas a facturar"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Cantidad (UdM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Fecha creación"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Varios"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Líneas no facturadas y entregadas"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Mis ventas"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Información extra"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Tarifa"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Nº de ctdad"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "Hora"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Fecha pedido"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Enviado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Todos los presupuestos"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "Opciones"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "No puede confirmar un pedido de venta sin lineas."
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Tiene que seleccionar una lista de precios o un cliente en el formulario del "
-"pedido."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Categoría de producto"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Impuestos :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Estado del pedido"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "¿Desea crear la(s) factura(s)?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Ventas por mes"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "¡No se puede cancelar línea pedido de venta!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Días seguridad"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Abastecimiento de material vendido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Crear factura final"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Dirección de envío"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Indica que el pedido de venta ha sido entregado. Este campo se actualiza "
-"sólo después que el planificador(es) se ha ejecutado."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Fecha"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepción"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "¡No se ha encontrado una linea de tarifa valida!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Historial"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Esta es la lista de facturas que han sido generadas para este pedido de "
-"venta. El mismo pedido de venta puede haber sido facturado varias veces "
-"(línea a línea, por ejemplo)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Su referencia"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-"El nombre y la dirección del contacto que ha solicitado el pedido o "
-"presupuesto."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Estos días por razones de seguridad se añaden a los que promete a los "
-"clientes."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Ctdad"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referencias"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Mis lineas de pedidos de venta"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "¡La referencia del pedido debe ser única por compañía!"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Crear factura"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Total sin impuestos"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Referencia de pedido"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "¡La factura ha sido creada correctamente!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Ventas por empresa"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Contacto del pedido"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Abrir factura"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forzar asignación"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "bajo pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Basado en las cantidades enviadas o pedidas."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Entregar todos los productos a la vez"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Albarán relacionado"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Dirección de envío :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Ventas por cliente últimos 90 días"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Estado borrador del pedido de venta"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Crear orden de entrega"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr "¡No puede eliminar lineas de un pedido de venta con el estado '%s'!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "Cantidad (UdV)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total impuestos incluidos"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Crear albarán"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Ventas por categoría de producto"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar presupuesto"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Volver a Crear factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Albaranes a facturar"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Esperando fecha planificada"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Método abastecimiento"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Albarán"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Documento del movimiento a la salida o al cliente."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Validar"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Confirmar pedido"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Crear orden abastecimiento"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Pedidos preparados para ser facturados"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Fecha en la que se crea el pedido de venta."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Movimiento stock"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Pedidos de venta creados en el mes actual"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Importe avanzado"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Cantidades enviadas"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Factura basada en pedidos de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Albarán"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "¡No se puede cancelar el pedido de venta!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "Cantidad (UdM)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Abastecimiento"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepción de envío"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "¡Información del alabarán! "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar las facturas"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "Política de facturación"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "Configure su método de facturación"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Para ser revisado por el contable."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referencia UdM"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
@@ -1403,14 +1195,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Venta Línea_pedido Realizar_factura"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Genera abastecimiento y facturación"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1418,578 +1205,10 @@ msgid "Paid"
 msgstr "Pagado"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Análisis de ventas"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recrear albarán"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Propiedades"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Presupuesto"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"El comercial crea una factura manualmente si la política de facturación del "
-"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
-"automática si la política de facturación es 'Pago antes del envío'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Puede generar facturas basadas en pedidos de venta o basadas en envíos."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Facturas de cliente"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Ventas"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio unidad"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"¡Debe seleccionar un cliente en el formulario de ventas!\n"
-"Introduzca un cliente antes de seleccionar un producto."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Documento origen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Para hacer"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Política de envío"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documento del movimiento al cliente."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "El importe sin impuestos."
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Debe primero cancelar todos los albaranes relacionados con este pedido de "
-"venta."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Ventas. Anticipo pago factura"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Cancelar asignación"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Volumen mensual"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturar las"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Fecha de pedido"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV del producto"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual en proceso"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "UdM del producto"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logística"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Pedido"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorar excepción"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"En función del control de facturación de los pedidos de venta, la factura "
-"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
-"pedido de venta puede generar una factura o un albarán tan pronto como sea "
-"confirmado por el comercial."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"¡Prevé vender %.2f %s pero sólo %.2f %s están disponibles!\n"
-"El stock real es %.2f %s. (sin reservas)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Estados"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referencia cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Precio"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Dependiendo de la configuración de la ubicación de salida, el movimiento "
-"entre la zona de salida y el cliente se realiza a través de la orden de "
-"entrega de forma manual o automática."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Pagar antes de la entrega"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Tablero de ventas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Realizar facturas"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Para facturar"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Fecha en la que se confirma el pedido de venta."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "Contrato / Cuenta analítica"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fecha factura"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "El importe a facturar por adelantado."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"No se ha encontrado una línea de tarifa que concuerde con este producto y "
-"cantidad.\n"
-"Debe cambiar el producto, la cantidad o la tarifa."
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-"Esta es la lista de albaranes que han sido generados para este pedido de "
-"venta."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total neto :"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Tienda"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Aviso"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Ventas por mes"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Pedido de venta"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Cantidad (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Pedidos de venta que están en estado 'Realizado'"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"El albarán se crea tan pronto como se confirma el pedido de venta, a la vez "
-"que la orden de abastecimiento. Representa la asignación de los componentes "
-"del pedido de venta. Hay un albarán por línea del pedido de venta que "
-"evoluciona con la disponibilidad de los componentes."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Ventas por categoría de producto últimos 90 días"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Líneas de factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Líneas pedido de ventas"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Tiempo inicial entrega"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuración"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "Tarifa EDI (%s)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr "Imprimir pedido"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Pedidos de venta creados en el año actual"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"No se puede crear la factura a partir de esta línea de pedido de venta por "
-"las siguientes razones:\n"
-"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
-"\"cancelada\".\n"
-"2. La línea del pedido de venta está facturada."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Lineas del pedido de venta realizadas"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Se crea automáticamente una orden de abastecimiento tan pronto como se "
-"confirma un pedido de venta o se paga la factura. Provoca la compra y la "
-"producción de productos según las reglas y los parámetros del pedido de "
-"venta. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "No facturada"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Comercial"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Presupuestos antiguos"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Base imponible"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avanzar factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "El pedido de venta '%s' ha sido cancelado."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Borrador"
-
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -2013,6 +1232,18 @@ msgstr ""
 "* El estado 'Cancelado' se establece cuando un usuario cancela el pedido de "
 "venta."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de ventas"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2020,58 +1251,170 @@ msgstr "El importe de los impuestos."
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Albaranes"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Lineas del pedido de venta para ser facturadas"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estado"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Pedidos de venta creados en el último mes"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera abastecimiento y facturación"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "Plantillas email"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Pedidos de ventas"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pedido"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "¡Advertencia de la lista de precios!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Tienda ventas"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadísticas pedidos de venta"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Noviembre"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Producto avanzado"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El comercial crea una factura manualmente si la política de facturación del "
+"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
+"automática si la política de facturación es 'Pago antes del envío'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Primero debe cancelar todas las facturas relacionadas con este pedido de "
-"venta."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2083,6 +1426,41 @@ msgstr "Enero"
 msgid "Sales Order in Progress"
 msgstr "Pedidos de ventas en proceso"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"El comercial confirma el presupuesto. El estado del pedido de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
@@ -2090,90 +1468,288 @@ msgstr ""
 "Referencia del documento que ha generado esta solicitud de pedido de venta."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "¡No se ha encontrado una linea de tarifa valida!"
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Retraso realización"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
-"Una orden de abastecimiento para cada línea del pedido de venta y para cada "
-"uno de los componentes."
+"Esta es la lista de facturas que han sido generadas para este pedido de "
+"venta. El mismo pedido de venta puede haber sido facturado varias veces "
+"(línea a línea, por ejemplo)."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Asignar"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Fecha pedido"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Facturas de cliente"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Pedido de venta confirmado a factura."
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Pedidos de venta sin confirmar"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas pedido de ventas"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "desde stock"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Día"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Cerrar"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Dirección de factura :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Mis lineas de pedidos de venta"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Entregado"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Debe asignar un lote de producción para este producto"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
-"Si tiene más de una tienda donde vende los productos de su compañía, puede "
-"crearlas y gestionarlas desde aquí. Cada vez que codifique un nuevo "
-"presupuesto o pedido de venta, debe estar vinculado a una tienda. La tienda "
-"también define desde que almacén serán entregados los productos para cada "
-"venta."
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "¡La referencia del pedido debe ser única por compañía!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Para hacer"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análisis de ventas"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa para el pedido de venta actual."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "El importe sin impuestos."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Referencia de pedido"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2181,61 +1757,67 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Indica que una factura ha sido pagada."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr "¡No puede cancelar una linea de pedido que ya está facturada!"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Descripción"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Mayo"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Anticipo"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Febrero"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Abril"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Contabilidad"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Buscar pedido de venta"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Solicitud pedido de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Plazo de pago"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Precio"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2253,25 +1835,347 @@ msgstr ""
 "desea analizar sus ingresos, debería utilizar el informe de análisis de "
 "facturas en la aplicación de Contabilidad."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "¿Desea crear la(s) factura(s)?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Otra información"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Ctdad"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contable."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Dirección de envío para el pedido de venta actual."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Presupuesto / Pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Anticipo"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar las"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha de pedido"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estado borrador del pedido de venta"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Mis pedidos de venta"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Buscar pedido de venta"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Tiene que seleccionar una lista de precios o un cliente en el formulario del "
+"pedido."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Desde un pedido de venta"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función del control de facturación de los pedidos de venta, la factura "
+"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
+"pedido de venta puede generar una factura o un albarán tan pronto como sea "
+"confirmado por el comercial."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "La cuenta analítica relacionada con un pedido de venta."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Pedidos preparados para ser facturados"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Presupuesto Nº"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencia cliente"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Enviada"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Año"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Facturar desde albaranes"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total impuestos incluidos"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
 
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Configurar la logística de los pedidos de venta"
@@ -2282,6 +2186,12 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Recreate Procurement"
 #~ msgstr "Recrear abastecimiento"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Orden de entrega"
+
+#~ msgid "from stock"
+#~ msgstr "desde stock"
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Pasos para entregar un pedido de venta"
 
@@ -2291,6 +2201,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Declaración automática"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Cambiar a borrador"
+
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Ésta es la lista de albaranes que se han generado para esta factura"
@@ -2298,6 +2211,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Entrega, desde el almacén hasta el cliente."
 
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Después de confirmar el pedido, crear la factura."
 
@@ -2308,12 +2224,21 @@ msgstr "Facturar desde albaranes"
 #~ "Cuando presiona el botón Confirmar, el estado Borrador cambia a Manual. es "
 #~ "decir, el presupuesto cambia a pedido de venta."
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Movimientos de inventario"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Designación manual"
 
+#~ msgid "Notes"
+#~ msgstr "Notas"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Facturar después del envío"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Excepción de envío"
+
 #~ msgid "Origin"
 #~ msgstr "Origen"
 
@@ -2332,6 +2257,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Procure Method"
 #~ msgstr "Método abastecimiento"
 
+#~ msgid "Extra Info"
+#~ msgstr "Información extra"
+
 #~ msgid "Net Price"
 #~ msgstr "Precio neto"
 
@@ -2361,9 +2289,24 @@ msgstr "Facturar desde albaranes"
 #~ msgid "All Sales Order"
 #~ msgstr "Todos los pedidos de ventas"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Cantidades enviadas"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Factura basada en pedidos de venta"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Tienda de ventas"
 
+#~ msgid "Warehouse"
+#~ msgstr "Almacén"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Forzar asignación"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Base imponible"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2381,12 +2324,19 @@ msgstr "Facturar desde albaranes"
 #~ "Cuando selecciona una política de envío = 'Factura automática después del "
 #~ "envío', la creará automáticamente después del envío."
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡Error!"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Envío completo"
 
 #~ msgid "Manual Description"
 #~ msgstr "Descripción manual"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Cantidad (UdM)"
+
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
@@ -2398,6 +2348,12 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Packing"
 #~ msgstr "Empaquetado/Albarán"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Confirmar pedido"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Facturar pedido después del envío"
 
@@ -2407,15 +2363,27 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "Sales orders"
 #~ msgstr "Pedidos de ventas"
 
+#~ msgid "Procurement"
+#~ msgstr "Abastecimiento"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Cuentas de pago"
 
+#~ msgid "Close"
+#~ msgstr "Cerrar"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "Factura borrador"
 
+#~ msgid "All Quotations"
+#~ msgstr "Todos los presupuestos"
+
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Factura de cliente borrador, para ser revisada por un contable."
 
@@ -2425,6 +2393,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Procurement for each line"
 #~ msgstr "Abastecimiento para cada línea"
 
+#~ msgid "Order Line"
+#~ msgstr "Línea del pedido"
+
 #~ msgid "Manages the delivery and invoicing progress"
 #~ msgstr "Gestiona el progreso de envío y facturación"
 
@@ -2435,12 +2406,18 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "¡No puede cancelar el pedido de venta!"
 
+#~ msgid "Packaging"
+#~ msgstr "Empaquetado"
+
 #~ msgid "Canceled"
 #~ msgstr "Cancelado"
 
 #~ msgid "Order Ref"
 #~ msgstr "Ref. pedido"
 
+#~ msgid "Salesman"
+#~ msgstr "Comercial"
+
 #~ msgid ""
 #~ "In sale order , procuerement for each line and it comes into the procurement "
 #~ "order"
@@ -2466,6 +2443,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Sales Configuration"
 #~ msgstr "Configuración de ventas"
 
+#~ msgid "on order"
+#~ msgstr "bajo pedido"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "Abastecimiento corregido"
 
@@ -2475,12 +2455,13 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Sale Procurement"
 #~ msgstr "Abastecimiento de venta"
 
-#~ msgid "Status"
-#~ msgstr "Estado"
-
 #~ msgid "Product sales"
 #~ msgstr "Ventas de producto"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "Modo no válido para test_state"
+
 #~ msgid "Our Salesman"
 #~ msgstr "Nuestro comercial"
 
@@ -2490,15 +2471,15 @@ msgstr "Facturar desde albaranes"
 #~ msgid "One procurement for each product."
 #~ msgstr "Un abastecimiento por cada producto."
 
-#~ msgid "Sale Order"
-#~ msgstr "Pedido de venta"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Tarifas de venta"
 
 #~ msgid "Direct Delivery"
 #~ msgstr "Envío directo"
 
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
+
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
@@ -2507,6 +2488,16 @@ msgstr "Facturar desde albaranes"
 #~ "confirmado el pedido de venta. Esta transacción convierte el pedido de venta "
 #~ "a facturas."
 
+#~ msgid "Compute"
+#~ msgstr "Calcular"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Assign"
+#~ msgstr "Asignar"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Crear factura"
 
@@ -2516,15 +2507,15 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Sales order lines"
 #~ msgstr "Líneas del pedido de ventas"
 
-#~ msgid "Sequence"
-#~ msgstr "Secuencia"
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Se crea un albarán de salida OUT para productos almacenables."
 
 #~ msgid "Other data"
 #~ msgstr "Otros datos"
 
+#~ msgid "UoM"
+#~ msgstr "UdM"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2568,6 +2559,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Sale Invoice"
 #~ msgstr "Factura de venta"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Abrir anticipo factura"
 
@@ -2581,6 +2575,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Sale Order Line"
 #~ msgstr "Línea pedido de venta"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Cancelar asignación"
+
 #~ msgid "Make invoices"
 #~ msgstr "Realizar facturas"
 
@@ -2597,12 +2594,18 @@ msgstr "Facturar desde albaranes"
 #~ msgstr ""
 #~ "¡No se puede eliminar pedido(s) de venta que ya está(n) confirmado(s)!"
 
+#~ msgid "Name"
+#~ msgstr "Nombre"
+
 #~ msgid "New Quotation"
 #~ msgstr "Nuevo presupuesto"
 
 #~ msgid "Total amount"
 #~ msgstr "Importe total"
 
+#~ msgid "Product UoM"
+#~ msgstr "UdM del producto"
+
 #~ msgid "Configure Picking Policy for Sale Order"
 #~ msgstr "Configurar política de envío para el pedido de venta"
 
@@ -2630,9 +2633,18 @@ msgstr "Facturar desde albaranes"
 #~ "El mismo pedido puede haberse facturado varias veces (por ejemplo por cada "
 #~ "línea)."
 
+#~ msgid "States"
+#~ msgstr "Estados"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Error: Código EAN erróneo"
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Facturar desde albaranes"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Movimientos de stock"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Mis pedidos de ventas"
 
@@ -2654,11 +2666,24 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de acción."
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Si no dispone de suficientes existencias para enviarlo todo de una vez, "
+#~ "¿acepta envíos parciales o no?"
+
 #, python-format
 #~ msgid "You cannot cancel a sale order line that has already been invoiced !"
 #~ msgstr ""
 #~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
 
+#~ msgid "Number Packages"
+#~ msgstr "Número paquetes"
+
+#~ msgid "Accounting"
+#~ msgstr "Contabilidad"
+
 #, python-format
 #~ msgid "You must first cancel all packing attached to this sale order."
 #~ msgstr ""
@@ -2741,42 +2766,162 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Shipping Policy"
 #~ msgstr "Política de facturación"
 
+#~ msgid "Dates"
+#~ msgstr "Fechas"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Le permite calcular los costos de envío en sus presupuestos."
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "¡Aviso!"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Orden de abastecimiento"
+
+#~ msgid "Conditions"
+#~ msgstr "Condiciones"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "La factura se crea de forma automática si la política de facturación es "
+#~ "\"Facturar desde el albarán\" o \"Facturar pedido después del envío\"."
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Configurar la política envío para pedidos de venta"
 
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "¡No hay ninguna cuenta de categoría de ingresos definida en las propiedades "
+#~ "por defecto de la categoría del producto o la posición fiscal no está "
+#~ "definida!"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Tablero responsable ventas"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Seleccione un producto del tipo de servicio que se llama 'Producto "
+#~ "avanzado'. Puede que tenga que crearlo y configurarlo como un valor por "
+#~ "defecto para este campo."
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Líneas a facturar"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr ""
 #~ "Proporciona algunas funcionalidades para mejorar la plantilla de los "
 #~ "informes de pedidos de ventas."
 
+#~ msgid "Companies"
+#~ msgstr "Compañías"
+
+#~ msgid "Security Days"
+#~ msgstr "Días seguridad"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "¿Desea crear la(s) factura(s)?"
 
 #~ msgid "  Year  "
 #~ msgstr "  Año  "
 
+#~ msgid "Procurement of sold material"
+#~ msgstr "Abastecimiento de material vendido"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Ventas por mes"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr ""
+#~ "El nombre y la dirección del contacto que ha solicitado el pedido o "
+#~ "presupuesto."
+
+#~ msgid "References"
+#~ msgstr "Referencias"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Fechas en pedidos de venta"
 
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Márgenes en pedidos de venta"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Total sin impuestos"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Configuración aplicaciones de ventas"
 
+#~ msgid "Open Invoice"
+#~ msgstr "Abrir factura"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Estos días por razones de seguridad se añaden a los que promete a los "
+#~ "clientes."
+
+#~ msgid "Related Picking"
+#~ msgstr "Albarán relacionado"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Crear albarán"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Crear orden de entrega"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Costes de envío"
 
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "¡Prevé vender %.2f %s pero sólo %.2f %s están disponibles!\n"
+#~ "El stock real es %.2f %s. (sin reservas)"
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Documento del movimiento a la salida o al cliente."
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Albaranes a facturar"
+
+#~ msgid "Pick List"
+#~ msgstr "Albarán"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Crear orden abastecimiento"
+
 #~ msgid "Order date"
 #~ msgstr "Fecha pedido"
 
+#~ msgid "Procurement Method"
+#~ msgstr "Método abastecimiento"
+
 #~ msgid "title"
 #~ msgstr "título"
 
+#~ msgid "Sales by Product Category"
+#~ msgstr "Ventas por categoría de producto"
+
+#~ msgid "Stock Move"
+#~ msgstr "Movimiento stock"
+
+#~ msgid "Picking List"
+#~ msgstr "Albarán"
+
 #, python-format
 #~ msgid "Picking Information !"
 #~ msgstr "¡Información albarán!"
@@ -2792,15 +2937,41 @@ msgstr "Facturar desde albaranes"
 #~ "configurará los métodos más comunes y sencillos para entregar los productos "
 #~ "al cliente en una o dos operaciones realizadas por el trabajador."
 
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Documento del movimiento al cliente."
+
 #~ msgid "Invoicing"
 #~ msgstr "Facturación"
 
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Puede generar facturas basadas en pedidos de venta o basadas en envíos."
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Albarán y Orden de entrega"
 
+#~ msgid "Picking Policy"
+#~ msgstr "Política de envío"
+
 #~ msgid "sale.installer"
 #~ msgstr "venta.instalador"
 
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Dependiendo de la configuración de la ubicación de salida, el movimiento "
+#~ "entre la zona de salida y el cliente se realiza a través de la orden de "
+#~ "entrega de forma manual o automática."
+
+#~ msgid "Logistic"
+#~ msgstr "Logística"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contenidos"
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -2811,6 +2982,10 @@ msgstr "Facturar desde albaranes"
 #~ msgid "   Month   "
 #~ msgstr "   Mes   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Aviso"
+
 #~ msgid ""
 #~ "The Shipping Policy is used to configure per order if you want to deliver as "
 #~ "soon as possible when one product is available or you wait that all products "
@@ -2823,6 +2998,12 @@ msgstr "Facturar desde albaranes"
 #~ msgid "    Month-1    "
 #~ msgstr "    Mes-1    "
 
+#~ msgid "Image"
+#~ msgstr "Imagen"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Tiempo inicial entrega"
+
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Mejora plantilla pedido de venta"
 
@@ -2832,6 +3013,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Configuration Progress"
 #~ msgstr "Progreso configuración"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "¡La factura ha sido creada correctamente!"
+
 #~ msgid "Shipped Qty"
 #~ msgstr "Ctdad enviada"
 
@@ -2843,6 +3027,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Not enough stock !"
 #~ msgstr "¡No hay stock suficiente!"
 
+#~ msgid "Delivered"
+#~ msgstr "Entregado"
+
 #~ msgid ""
 #~ "Allows you to group and invoice your delivery orders according to different "
 #~ "invoicing types: daily, weekly, etc."
@@ -2853,6 +3040,46 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Picking Default Policy"
 #~ msgstr "Política de empaquetado por defecto"
 
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Crear factura final"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Número de días entre la confirmación del pedido y el envío de los productos "
+#~ "al cliente."
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Recrear albarán"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Ventas por empresa"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Ventas por comercial"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "¡Error! No puede crear compañías recursivas."
+
+#~ msgid "Sales by Month"
+#~ msgstr "Ventas por mes"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Debe asignar un lote de producción para este producto"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Está intentando asignar un lote que no es del mismo producto"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/a)"
+
 #~ msgid "Configure"
 #~ msgstr "Configurar"
 
@@ -2882,34 +3109,201 @@ msgstr "Facturar desde albaranes"
 #~ "\n"
 #~ "EAN: %s Cantidad: %s Tipo de ul: %s"
 
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "¡No se puede cancelar este pedido de venta!"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta."
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Facturar pedido después de envío"
 
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "¡No se puede cancelar línea pedido de venta!"
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Ventas. Abrir factura"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Debe cancelar primero los movimientos de stock asociados a esta línea de "
+#~ "pedido de venta."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "No puede realizar un anticipo de un pedido de venta que está definido como "
+#~ "'Factura automática después envío'."
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr ""
 #~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
 
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Para cada línea de pedido de venta, se crea una orden de abastecimiento para "
+#~ "suministrar el producto vendido."
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Indica que el pedido de venta ha sido entregado. Este campo se actualiza "
+#~ "sólo después que el planificador(es) se ha ejecutado."
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "¡Debe seleccionar un cliente en el formulario de ventas!\n"
+#~ "Introduzca un cliente antes de seleccionar un producto."
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Debe primero cancelar todos los albaranes relacionados con este pedido de "
+#~ "venta."
+
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Factura desde el albarán"
 
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "¡No se puede cancelar el pedido de venta!"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
 
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "El pedido de venta '%s' ha sido cancelado."
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr ""
+#~ "Esta es la lista de albaranes que han sido generados para este pedido de "
+#~ "venta."
+
+#~ msgid "Packings"
+#~ msgstr "Albaranes"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Primero debe cancelar todas las facturas relacionadas con este pedido de "
+#~ "venta."
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Una orden de abastecimiento para cada línea del pedido de venta y para cada "
+#~ "uno de los componentes."
+
 #~ msgid "Layout Sequence"
 #~ msgstr "Secuencia plantilla"
 
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "¡No se puede eliminar pedido(s) de venta que ya está confirmado!"
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Solicitud pedido de venta"
+
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Pasos para entregar un pedido de venta"
 
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "El albarán se crea tan pronto como se confirma el pedido de venta, a la vez "
+#~ "que la orden de abastecimiento. Representa la asignación de los componentes "
+#~ "del pedido de venta. Hay un albarán por línea del pedido de venta que "
+#~ "evoluciona con la disponibilidad de los componentes."
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Se crea automáticamente una orden de abastecimiento tan pronto como se "
+#~ "confirma un pedido de venta o se paga la factura. Provoca la compra y la "
+#~ "producción de productos según las reglas y los parámetros del pedido de "
+#~ "venta. "
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Ventas por categoría de producto últimos 90 días"
+
+#~ msgid "Reference UoM"
+#~ msgstr "Referencia UdM"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "¡La referencia del pedido debe ser única!"
 
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Ventas por cliente últimos 90 días"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Ventas por comercial últimos 90 días"
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Los pedidos de ventas le ayudan a gestionar presupuestos y pedidos de sus "
+#~ "clientes. OpenERP sugiere que comience por crear un presupuesto. Una vez "
+#~ "esté confirmado, el presupuesto se convertirá en un pedido de venta. OpenERP "
+#~ "puede gestionar varios tipos de productos de forma que un pedido de venta "
+#~ "puede generar tareas, órdenes de entrega, órdenes de fabricación, compras, "
+#~ "etc. Según la configuración del pedido de venta, se generará una factura en "
+#~ "borrador de manera que sólo hay que confirmarla cuando se quiera facturar a "
+#~ "su cliente."
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Si tiene más de una tienda donde vende los productos de su compañía, puede "
+#~ "crearlas y gestionarlas desde aquí. Cada vez que codifique un nuevo "
+#~ "presupuesto o pedido de venta, debe estar vinculado a una tienda. La tienda "
+#~ "también define desde que almacén serán entregados los productos para cada "
+#~ "venta."
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -2935,6 +3329,26 @@ msgstr "Facturar desde albaranes"
 #~ "  -La opción 'Facturar desde albarán' se utiliza para crear una factura "
 #~ "durante el proceso de preparación del pedido."
 
+#~ msgid "Ordering Contact"
+#~ msgstr "Contacto del pedido"
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm, que significa 'Términos de Comercio Internacional', implica una "
+#~ "serie de condiciones de venta que se utilizan en la transacción comercial."
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Esta es una lista de todas las líneas de pedidos de venta a facturar. Puede "
+#~ "facturar pedidos de venta parcialmente, por líneas de pedido. No necesita "
+#~ "esta lista si factura desde albaranes de salida o si factura pedidos de "
+#~ "venta completos."
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -3001,5 +3415,113 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Ordered Date"
 #~ msgstr "Fecha pedido"
 
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Basado en las cantidades enviadas o pedidas."
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Facturar desde albaranes"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Para eliminar un pedido confirmado, debe cancelarlo primero! Para "
+#~ "cancelarlo, debe primero cancelar los albaranes relacionados"
+
 #~ msgid "VAT"
 #~ msgstr "CIF/NIF"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Basado en albaranes de salida"
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Configure su método de facturación"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Basado en tareas de trabajo"
+
+#~ msgid "Print Quotation"
+#~ msgstr "Imprimir presupuesto"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Unidad de tiempo de trabajo principal"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Basado en hoja de servicios"
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "¡El nombre de la compañía debe ser único!"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "¡La referencia debe ser única por compañía!"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "!Error de configuración¡"
+
+#~ msgid "Month-1"
+#~ msgstr "Mes-1"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Entregar cada producto cuando esté disponible"
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr "No puede mover productos desde o hacia una ubicación de tipo vista."
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Basado en pedidos de venta"
+
+#~ msgid "Line Sequence"
+#~ msgstr "Secuencia de linea"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Varios"
+
+#~ msgid "Options"
+#~ msgstr "Opciones"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Cantidad (UdV)"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "¡Información del alabarán! "
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Pedidos de venta creados en el mes actual"
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Cantidad (UdM)"
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Política de facturación"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Pagar antes de la entrega"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "No se ha encontrado una línea de tarifa que concuerde con este producto y "
+#~ "cantidad.\n"
+#~ "Debe cambiar el producto, la cantidad o la tarifa."
+
+#~ msgid "Print Order"
+#~ msgstr "Imprimir pedido"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Pedidos de venta creados en el año actual"
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Pedidos de venta creados en el último mes"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Entregar todos los productos a la vez"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr "¡No puede eliminar lineas de un pedido de venta con el estado '%s'!"
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 3964c85e1e5..8afbce5a4cc 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_AR.po
@@ -6,19 +6,167 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2010-09-21 22:36+0000\n"
 "Last-Translator: Margarita Manterola <ubuntu@marga.com.ar>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanzar factura"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar cotización"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
@@ -29,61 +177,344 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Partner de Distribución"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_policy:0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Estado de Orden"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Si no tiene suficientes existencias para enviarlo todo de una vez, ¿acepta "
-"envíos parciales?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Cantidad"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
 msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar orden"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
+msgid "Quotation "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Orden de Venta"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Importe sin impuestos"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Sucursal"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Domicilio de Facturación"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Re-generar Factura"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
 msgstr ""
 
 #. module: sale
@@ -92,73 +523,100 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Cuenta Analítica"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
+
+#. module: sale
+#: help:sale.order,message_summary:0
 msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "Línea de la orden"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+msgid "(update)"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
 msgstr ""
 
 #. module: sale
@@ -167,39 +625,157 @@ msgid "Default Payment Term"
 msgstr "Término de pago predeterminado"
 
 #. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Domicilio de Envío"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
 #: view:sale.report:0
-msgid "State"
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Orden Nº"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas de la orden"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Disc.(%)"
 msgstr "Desc.(%)"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia de la orden"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de Facturación"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr "Precio total"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando programación"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
 msgstr ""
 
 #. module: sale
@@ -209,463 +785,25 @@ msgstr "Cantidades ordenadas"
 
 #. module: sale
 #: view:sale.report:0
-msgid "Sales by Salesman"
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Movimientos de Inventario"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referencia de la orden"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Descuento (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mis cotizaciones"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Empaquetado"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nombre de sucursal"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "¡No se ha definido un cliente!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Ventas en excepción"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "Modo no válido para test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
 msgstr ""
 
 #. module: sale
+#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Número de paquetes"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturada"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Orden de entrega"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Partner de Distribución"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Domicilio de facturación :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Domicilio de Facturación"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Cotización / Orden"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de líneas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Orden Nº"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Líneas de la orden"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Importe sin impuestos"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
 #: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Cantidad (UdM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Líneas no facturadas y entregadas"
+msgid "Quantity"
+msgstr "Cantidad"
 
 #. module: sale
 #: report:sale.order:0
@@ -678,32 +816,92 @@ msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
 #, python-format
 msgid "Invalid action !"
 msgstr "Acción no válida !"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Información extra"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Lista de Precios"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
+#: selection:sale.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1327
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
 #, python-format
-msgid "Hour"
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
 msgstr ""
 
 #. module: sale
@@ -712,101 +910,413 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Todos las cotizaciones"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis cotizaciones"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
-msgid "September"
+msgid "December"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:632
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
 msgid "Category of Product"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre de sucursal"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
 msgstr "Impuestos :"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Estado de Orden"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
+#: code:addons/sale/sale.py:658
 #, python-format
-msgid "Could not cancel sales order line!"
+msgid "Invoice has been <b>paid</b>."
 msgstr ""
 
 #. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear Facturas"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagada"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Órdenes de venta"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Domicilio de Envío"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
 
 #. module: sale
-#: help:sale.order,shipped:0
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
 msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Orden"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
 msgstr ""
 
 #. module: sale
@@ -814,46 +1324,156 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Anticipo de producto"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Excepción"
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
+#: selection:sale.report,month:0
+msgid "October"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,state:0
+#: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1272
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Órdenes de venta en proceso"
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:958
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "History"
 msgstr "Historial"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
 
 #. module: sale
@@ -870,26 +1490,100 @@ msgid "Your Reference"
 msgstr "Su referencia"
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: field:sale.report,date:0
+msgid "Date Order"
 msgstr ""
 
 #. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Lista de Precios"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "Ctd"
+msgid "Sales Order Lines"
+msgstr "Líneas en orden de venta"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "References"
-msgstr ""
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizada"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Domicilio de facturación :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Factura"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -898,562 +1592,64 @@ msgstr ""
 
 #. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "Cancelar"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Cotización"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Crear factura"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Contacto que realiza la orden"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forzar asignación"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "a pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Domicilio de envío :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar cotización"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Re-generar Factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Esperando programación"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Establecer como borrador"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Validar"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Confirmar Orden"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Cantidades enviadas"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Factura basada en órdenes de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Error !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Abastecimiento"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepción de Envío"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar las facturas"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Pagada"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Propiedades"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Cotización"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Ventas"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio unitario"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Realizada"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
 #. module: sale
@@ -1462,61 +1658,232 @@ msgid "To Do"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Domicilio de envío :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:604
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:822
 #, python-format
-msgid "You must first cancel all picking attached to this sales order."
+msgid "You cannot cancel a sale order line that has already been invoiced!"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "Producto"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Cancelar asignación"
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
+#: report:sale.order:0
+msgid "Description"
+msgstr "Descripción"
 
 #. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Ctd"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Cotización / Orden"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: sale
@@ -1524,6 +1891,17 @@ msgstr ""
 msgid "Invoice on"
 msgstr "Facturado en"
 
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
@@ -1534,31 +1912,98 @@ msgstr "Fecha ordenada"
 msgid "Product UoS"
 msgstr "UdV del producto"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Manual en proceso"
 
 #. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "UdM del producto"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Orden"
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
 msgstr ""
 
 #. module: sale
@@ -1576,566 +2021,55 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1251
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Estados"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
 msgstr ""
 
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Precio"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crear Facturas"
-
 #. module: sale
 #: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total neto :"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelada"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Sucursal"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Cantidad (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmada"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Líneas de Facturación"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Líneas en orden de venta"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr ""
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuración"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Vendedor"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Importe sin impuestos"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avanzar factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Órdenes de venta"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Anticipo de producto"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Órdenes de venta en proceso"
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Asignar"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "desde stock"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr ""
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Contabilidad"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
-#, python-format
-msgid "Not enough stock ! : "
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Término de pago"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2144,23 +2078,77 @@ msgid "Quotation N°"
 msgstr "Cotización Nº"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Entregada"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Facturar desde órdenes de entrega"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturada"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#~ msgid "from stock"
+#~ msgstr "desde stock"
+
+#~ msgid "Delivery Order"
+#~ msgstr "Orden de entrega"
 
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Entrega, desde el almacén hasta el cliente."
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Facturar después de la entrega"
 
@@ -2173,6 +2161,9 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "VAT"
 #~ msgstr "IVA"
 
+#~ msgid "Extra Info"
+#~ msgstr "Información extra"
+
 #~ msgid ""
 #~ "The sale order will automatically create the invoice proposition (draft "
 #~ "invoice). Ordered and delivered quantities may not be the same. You have to "
@@ -2205,6 +2196,12 @@ msgstr "Facturar desde órdenes de entrega"
 #~ "No puede hacer un anticipo en una orden de venta definido como 'Factura "
 #~ "automática después del envío'."
 
+#~ msgid "Warehouse"
+#~ msgstr "Almacén"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Forzar asignación"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2220,9 +2217,16 @@ msgstr "Facturar desde órdenes de entrega"
 #~ "Cuando selecciona una política de envío = 'Factura automática después del "
 #~ "envío', la creará automáticamente después del envío."
 
+#~ msgid "Untaxed amount"
+#~ msgstr "Importe sin impuestos"
+
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Mis órdenes de venta esperarando facturación"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Error !"
+
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
@@ -2231,9 +2235,15 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Sale Order Procurement"
 #~ msgstr "Abastecimiento de la orden de venta"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Cantidad (UdM)"
+
 #~ msgid "Total amount"
 #~ msgstr "Importe total"
 
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
 
@@ -2252,6 +2262,9 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "Órdenes de venta a facturar"
 
+#~ msgid "Order Line"
+#~ msgstr "Línea de la orden"
+
 #, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "No pudo cancelar la orden de venta !"
@@ -2269,6 +2282,9 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Uninvoiced Lines"
 #~ msgstr "Líneas no facturadas"
 
+#~ msgid "Packaging"
+#~ msgstr "Empaquetado"
+
 #~ msgid "Sales Configuration"
 #~ msgstr "Configuración de ventas"
 
@@ -2284,15 +2300,16 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "My sales in shipping exception"
 #~ msgstr "Mis ventas en excepción de envío"
 
-#~ msgid "Status"
-#~ msgstr "Estado"
-
 #~ msgid "Product sales"
 #~ msgstr "Ventas de producto"
 
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Configurar logística de orden de venta"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "Modo no válido para test_state"
+
 #~ msgid "Create Advance Invoice"
 #~ msgstr "Crear anticipo de factura"
 
@@ -2314,9 +2331,16 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Factura de cliente en borrador, para ser revisada por un contador"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Error"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Crear factura"
 
+#~ msgid "Assign"
+#~ msgstr "Asignar"
+
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Se crea un empaque de salida OUT para productos almacenables."
 
@@ -2332,12 +2356,18 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Confirm sale order and Create invoice."
 #~ msgstr "Confirmar orden de venta y crear factura."
 
+#~ msgid "Close"
+#~ msgstr "Cerrar"
+
 #~ msgid "Advance Payment"
 #~ msgstr "Pago anticipado"
 
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Envío & Factura manual"
 
+#~ msgid "UoM"
+#~ msgstr "UdM"
+
 #~ msgid "Sale Invoice"
 #~ msgstr "Factura de venta"
 
@@ -2356,12 +2386,21 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Abrir anticipo factura"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Contacto que realiza la orden"
+
 #~ msgid "Sales Management"
 #~ msgstr "Gestión de ventas"
 
 #~ msgid "Deliver"
 #~ msgstr "Entregar"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Cancelar asignación"
+
 #~ msgid "Sale Order Line"
 #~ msgstr "Línea de orden de venta"
 
@@ -2372,10 +2411,16 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Lista de precios de compra"
 
+#~ msgid "Name"
+#~ msgstr "Nombre"
+
 #, python-format
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "No se puede eliminar órdenes de venta confirmadas !"
 
+#~ msgid "Product UoM"
+#~ msgstr "UdM del producto"
+
 #~ msgid "Related invoices"
 #~ msgstr "Facturas relacionadas"
 
@@ -2397,6 +2442,9 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Payment Terms"
 #~ msgstr "Términos de pago"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Movimientos de stock"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Mis órdenes de venta"
 
@@ -2409,35 +2457,56 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Declaración automática"
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Movimientos de Inventario"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Designación manual"
 
+#~ msgid "Notes"
+#~ msgstr "Notas"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Política de Envío"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Excepción de Envío"
+
 #~ msgid "Origin"
 #~ msgstr "Origen"
 
 #~ msgid "Procure Method"
 #~ msgstr "Método de Abastecimiento"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Cantidades enviadas"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Sucursal de Venta"
 
 #~ msgid "Manual Description"
 #~ msgstr "Descripción manual"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Confirmar Orden"
+
+#~ msgid "Procurement"
+#~ msgstr "Abastecimiento"
+
 #~ msgid "Canceled"
 #~ msgstr "Cancelada"
 
+#~ msgid "Salesman"
+#~ msgstr "Vendedor"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "Abastecimiento corregido"
 
-#~ msgid "Sale Order"
-#~ msgstr "Orden de Venta"
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
 
-#~ msgid "Sequence"
-#~ msgstr "Secuencia"
+#~ msgid "Compute"
+#~ msgstr "Calcular"
 
 #~ msgid "Make invoices"
 #~ msgstr "Crear Facturas"
@@ -2445,6 +2514,9 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Invoice Corrected"
 #~ msgstr "Factura corregida"
 
+#~ msgid "States"
+#~ msgstr "Estados"
+
 #~ msgid "Customer Ref"
 #~ msgstr "Ref. Cliente"
 
@@ -2464,6 +2536,13 @@ msgstr "Facturar desde órdenes de entrega"
 #~ "¡Debe seleccionar un cliente en el formulario de venta!\n"
 #~ "Por favor, seleccione un cliente antes de elegir un producto."
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Si no tiene suficientes existencias para enviarlo todo de una vez, ¿acepta "
+#~ "envíos parciales?"
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay before delivery' choice will first generate the invoice and "
@@ -2494,6 +2573,12 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgstr ""
 #~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
 
+#~ msgid "Number Packages"
+#~ msgstr "Número de paquetes"
+
+#~ msgid "Accounting"
+#~ msgstr "Contabilidad"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Entrega parcial"
 
@@ -2509,6 +2594,9 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "¡Su factura ha sido creada satisfactoriamente!"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Establecer como borrador"
+
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Ésta es la lista de empaque que se ha generado para esta factura"
@@ -2523,6 +2611,9 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Procurement is created after confirmation of sale order."
 #~ msgstr "El abastecimiento es creado después de confirmar una orden de venta."
 
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Factura basada en órdenes de venta"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Entrega completa"
 
@@ -2538,6 +2629,9 @@ msgstr "Facturar desde órdenes de entrega"
 #~ msgid "Related Packing"
 #~ msgstr "Remito relacionado"
 
+#~ msgid "All Quotations"
+#~ msgstr "Todos las cotizaciones"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "Política de entrega predeterminada"
 
@@ -2554,6 +2648,9 @@ msgstr "Facturar desde órdenes de entrega"
 #~ "Este paso en la configuración fija la política predeterminada de entrega "
 #~ "cuando se crea una orden de venta"
 
+#~ msgid "on order"
+#~ msgstr "a pedido"
+
 #~ msgid "Packing Policy"
 #~ msgstr "Política de envío"
 
@@ -2627,3 +2724,6 @@ msgstr "Facturar desde órdenes de entrega"
 
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Después de confirmar la orden, crear la factura."
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Facturar desde órdenes de entrega"
diff --git a/addons/sale/i18n/es_CL.po b/addons/sale/i18n/es_CL.po
index b45af002e9e..db97e55a399 100644
--- a/addons/sale/i18n/es_CL.po
+++ b/addons/sale/i18n/es_CL.po
@@ -6,21 +6,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-02-21 07:26+0000\n"
 "Last-Translator: felipemolinam <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanzar factura"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar presupuesto"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Tablero de ventas"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha confirmación"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -29,62 +177,345 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Ventas por vendedor en los últimos 90 días"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicación empresa"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Estado del pedido"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Si no dispone de suficiente stock disponible para enviarlo todo a la vez, "
-"¿acepta envíos parciales?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Para facturar"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Dirección de envío para la orden de venta actual"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Fecha en la que se confirma el pedido de venta."
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Cantidad"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Presupuestos"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Día"
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "El importe a facturar por adelantado."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "El importe total."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar pedido"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "¡Aviso!"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección factura"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Fecha en que se crea el pedido de venta."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Volver a Crear factura"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
 
 #. module: sale
 #: report:sale.order:0
@@ -92,76 +523,647 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Genera órdenes de abastecimiento para cada línea de orden de venta."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Esta es una lista de todas las líneas de pedidos de venta a facturar. Puede "
-"facturar pedidos de venta parcialmente, por líneas de pedido. No necesita "
-"esta lista si factura desde despachos de salida o si factura pedidos de "
-"venta completos."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Orden de abastecimiento"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Fecha confirmación"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Nº de ctdad"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Importe avanzado"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Plazo de pago por defecto"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Dirección de envío"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "Línea del pedido"
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Pedidos de venta sin confirmar"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
 msgstr ""
-"Los pedidos de ventas le ayudan a gestionar presupuestos y pedidos de sus "
-"clientes. OpenERP sugiere que comience por crear un presupuesto. Una vez "
-"esté confirmado, el presupuesto se convertirá en un pedido de venta. OpenERP "
-"puede gestionar varios tipos de productos de forma que un pedido de venta "
-"puede generar tareas, órdenes de entrega, órdenes de fabricación, compras, "
-"etc. Según la configuración del pedido de venta, se generará una factura en "
-"borrador de manera que sólo hay que confirmarla cuando se quiera facturar a "
-"su cliente."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Pedido Nº"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas del pedido"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia de pedido"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Presupuestos antiguos"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Realizar facturas"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando fecha planificada"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Dirección de facturación para el pedido de venta actual."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades ordenadas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mis ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Presupuestos y pedidos"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Realizar facturas de Venta"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"No se puede crear la factura a partir de esta línea de pedido de venta por "
+"las siguientes razones:\n"
+"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
+"\"cancelada\".\n"
+"2. La línea del pedido de venta está facturada."
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoría de producto"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre tienda"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Ventas. Anticipo pago factura"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -179,1217 +1181,9 @@ msgstr ""
 "son las horas dedicadas a las tareas asociadas."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Plazo de pago por defecto"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Estado"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Cantidades ordenadas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Ventas por Vendedor"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Movimientos de inventario"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referencia de pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Otra información"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Fechas"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"La factura se crea de forma automática si la política de facturación es "
-"\"Facturar desde bodega\" o \"Facturar pedido después del envío\"."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Presupuestos y pedidos"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Realizar facturas de Venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Descuento (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mis presupuestos"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Tablero responsable ventas"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Empaquetado"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Desde Orden de Venta"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nombre tienda"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "¡No se ha definido un cliente!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Ventas en excepción"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Condiciones"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"¡No hay ninguna cuenta de categoría de ingresos definida en las propiedades "
-"por defecto de la categoría del producto o la posición fiscal no está "
-"definida!"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Está intentando asignar un lote que no es del mismo producto"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "Modo no válido para test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "¡No es posible cancelar esta orden de venta!"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estadísticas pedidos de venta"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "La cuenta analítica relacionada con un pedido de venta."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Presupuestos"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Tarifa para Orden de Venta actual"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Número de días entre la confirmación del pedido y el envío de los productos "
-"al cliente."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Fecha presupuesto"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Número paquetes"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"El vendedor confirma el presupuesto. El estado del pedido de venta se "
-"convierte 'En proceso' o 'Manual en proceso'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Debe cancelar primero los movimientos de stock asociados a esta línea de "
-"pedido de venta."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Seleccione un producto del tipo de servicio que se llama 'Producto "
-"avanzado'. Puede que tenga que crearlo y configurarlo como un valor por "
-"defecto para este campo."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"No puede realizar un anticipo de un pedido de venta que está definido como "
-"'Factura automática después envío'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Dirección de facturación para el pedido de venta actual."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Despachar cada producto cuando se encuentre disponible"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Orden de entrega"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Ubicación empresa"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Basado en pedidos de venta"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "El importe total."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Dirección de factura :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Para cada línea de pedido de venta, se crea una orden de abastecimiento para "
-"suministrar el producto vendido."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm, que significa 'Términos de Comercio Internacional', implica una "
-"serie de condiciones de venta que se utilizan en la transacción comercial."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Dirección factura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Buscar líneas no facturadas"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Presupuesto / Pedido"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de líneas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Abrir facturas de Ventas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Pedido Nº"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Líneas del pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Base imponible"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Líneas a facturar"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Cantidad (UdM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Fecha creación"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Líneas no facturadas y entregadas"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Mis ventas"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Información extra"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Tarifa"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Nº de ctdad"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Fecha pedido"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Enviado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Todos los presupuestos"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Tiene que seleccionar una lista de precios o un cliente en el formulario del "
-"pedido."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Categoría de producto"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Impuestos :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Estado del pedido"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Ventas por mes"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "¡No se puede cancelar línea pedido de venta!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Días seguridad"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Abastecimiento de material vendido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Crear factura final"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Dirección de envío"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Indica que el pedido de venta ha sido entregado. Este campo se actualiza "
-"sólo después que el planificador(es) se ha ejecutado."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Fecha"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepción"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Historial"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Facturar desde orden, después de despachar"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Esta es la lista de facturas que han sido generadas para este pedido de "
-"venta. El mismo pedido de venta puede haber sido facturado varias veces "
-"(línea a línea, por ejemplo)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Su referencia"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-"El nombre y la dirección del contacto que ha solicitado el pedido o "
-"presupuesto."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Estos días por razones de seguridad se añaden a los que promete a los "
-"clientes."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Ctdad"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referencias"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Mis lineas de pedidos de venta"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Crear factura"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Total sin impuestos"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "¡La factura ha sido creada correctamente!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Ventas por empresa"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Contacto que realiza el pedido"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Abrir factura"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forzar asignación"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "bajo pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Basado en las cantidades enviadas o ordenadas."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Despachar todos los productos juntos"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Guía de despacho relacionada"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Dirección de envío :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Ventas por cliente últimos 90 días"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Estado borrador del pedido de venta"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Crear orden de entrega"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total impuestos incluidos"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Crear guía de despacho"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Fecha de pedido de la orden de venta"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Ventas por categoría de producto"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar presupuesto"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Volver a Crear factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Guías de despacho a facturar"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Esperando fecha planificada"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Método abastecimiento"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Guía de despacho"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Documento del movimiento a la salida o al cliente."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Validar"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Confirmar pedido"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Crear orden abastecimiento"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Pedidos preparados para ser facturados"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Fecha en que se crea el pedido de venta."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Movimiento de stock"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Pedidos de venta creados en el mes actual"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Importe avanzado"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Cantidades enviadas"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Factura basada en pedidos de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "LIsta de guías de despacho"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "¡No se puede cancelar el pedido de venta!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Abastecimiento"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepción de envío"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar las facturas"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Para ser revisado por el contable."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referencia UdM"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
@@ -1398,14 +1192,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Venta Línea_pedido Realizar_factura"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Genera abastecimiento y facturación"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1413,575 +1202,10 @@ msgid "Paid"
 msgstr "Pagado"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Análisis de ventas"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Regenerar guía de despacho"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Propiedades"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Presupuesto"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"El vendedor crea una factura manualmente si la política de facturación del "
-"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
-"automática si la política de facturación es 'Pago antes del envío'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Puede generar facturas basadas en pedidos de venta o basadas en envíos."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Ventas"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio unidad"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"¡Debe seleccionar un cliente en el formulario de ventas!\n"
-"Introduzca un cliente antes de seleccionar un producto."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Documento origen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Para hacer"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Política de envío"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documento del movimiento al cliente."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "El importe sin impuestos."
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Debe primero cancelar todas las guías de despacho relacionadas con este "
-"pedido de venta."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Ventas. Anticipo pago factura"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Cancelar asignación"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturar las"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Fecha Pedido"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV del producto"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual en proceso"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "UdM del producto"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logística"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Pedido"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorar excepción"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"En función del control de facturación de los pedidos de venta, la factura "
-"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
-"pedido de venta puede generar una factura o una guía de despacho tan pronto "
-"como sea confirmado por el vendedor."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"¡Prevé vender %.2f %s pero sólo %.2f %s están disponibles!\n"
-"El stock real es %.2f %s. (sin reservas)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Estados"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referencia cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Precio"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Dependiendo de la configuración de la ubicación de salida, el movimiento "
-"entre la zona de salida y el cliente se realiza a través de la orden de "
-"entrega de forma manual o automática."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Pago antes de envío"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Tablero de ventas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Realizar facturas"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Para facturar"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Fecha en la que se confirma el pedido de venta."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fecha factura"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "El importe a facturar por adelantado."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-"Esta es la lista de guías de despacho que han sido generados para este "
-"pedido de venta."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total neto :"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Tienda"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Aviso"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Ventas por mes"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Pedido de venta"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Cantidad (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"La guía de despacho se crea tan pronto como se confirma el pedido de venta, "
-"a la vez que la orden de abastecimiento. Representa la asignación de los "
-"componentes del pedido de venta. Hay una guía de despacho por línea del "
-"pedido de venta que evoluciona con la disponibilidad de los componentes."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Ventas por categoría de producto últimos 90 días"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Líneas de factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Líneas pedido de ventas"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Tiempo inicial entrega"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuración"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Pedidos de venta creados en el año actual"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"No se puede crear la factura a partir de esta línea de pedido de venta por "
-"las siguientes razones:\n"
-"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
-"\"cancelada\".\n"
-"2. La línea del pedido de venta está facturada."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Se crea automáticamente una orden de abastecimiento tan pronto como se "
-"confirma un pedido de venta o se paga la factura. Provoca la compra y la "
-"producción de productos según las reglas y los parámetros del pedido de "
-"venta. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "No facturada"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Vendedor"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Presupuestos antiguos"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Base imponible"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avanzar factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "El pedido de venta '%s' ha sido cancelado."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Borrador"
-
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -2005,6 +1229,18 @@ msgstr ""
 "* El estado 'Cancelado' se establece cuando un usuario cancela el pedido de "
 "venta."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de ventas"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2012,58 +1248,170 @@ msgstr "El importe de los impuestos."
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Guías de despacho"
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estado"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Pedidos de venta creados en el último mes"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera abastecimiento y facturación"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Pedidos de ventas"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pedido"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Tiendas de venta"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadísticas pedidos de venta"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Noviembre"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Producto avanzado"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El vendedor crea una factura manualmente si la política de facturación del "
+"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
+"automática si la política de facturación es 'Pago antes del envío'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Primero debe cancelar todas las facturas relacionadas con este pedido de "
-"venta."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2075,6 +1423,41 @@ msgstr "Enero"
 msgid "Sales Order in Progress"
 msgstr "Pedidos de ventas en proceso"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"El vendedor confirma el presupuesto. El estado del pedido de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
@@ -2082,90 +1465,288 @@ msgstr ""
 "Referencia del documento que ha generado esta solicitud de pedido de venta."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Retraso realización"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "Despacho y facturación parcial"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
-"Una orden de abastecimiento para cada línea del pedido de venta y para cada "
-"uno de los componentes."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Asignar"
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Esta es la lista de facturas que han sido generadas para este pedido de "
+"venta. El mismo pedido de venta puede haber sido facturado varias veces "
+"(línea a línea, por ejemplo)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Fecha pedido"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Pedido de venta confirmado a factura."
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Pedidos de venta sin confirmar"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas pedido de ventas"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "desde stock"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Día"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Cerrar"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Dirección de factura :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Mis lineas de pedidos de venta"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Entregado"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Debe asignar un lote de producción para este producto"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Para hacer"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análisis de ventas"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa para Orden de Venta actual"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "El importe sin impuestos."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
-"Si tiene más de una tienda donde vende los productos de su compañía, puede "
-"crearlas y gestionarlas desde aquí. Cada vez que codifique un nuevo "
-"presupuesto o pedido de venta, debe estar vinculado a una tienda. La tienda "
-"también define desde que almacén serán entregados los productos para cada "
-"venta."
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2173,61 +1754,67 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Indica que una factura ha sido pagada."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Descripción"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Mayo"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Anticipo"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Febrero"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Abril"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Contabilidad"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Buscar pedido de venta"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Solicitud pedido de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Plazo de pago"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Precio"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2245,25 +1832,347 @@ msgstr ""
 "desea analizar sus ingresos, debería utilizar el informe de análisis de "
 "facturas en la aplicación de Contabilidad."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Otra información"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Ctdad"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contable."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Dirección de envío para la orden de venta actual"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Presupuesto / Pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Anticipo"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar las"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha Pedido"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estado borrador del pedido de venta"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Buscar pedido de venta"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Tiene que seleccionar una lista de precios o un cliente en el formulario del "
+"pedido."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Desde Orden de Venta"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función del control de facturación de los pedidos de venta, la factura "
+"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
+"pedido de venta puede generar una factura o una guía de despacho tan pronto "
+"como sea confirmado por el vendedor."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "La cuenta analítica relacionada con un pedido de venta."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Pedidos preparados para ser facturados"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Presupuesto Nº"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencia cliente"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Enviada"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Año"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Facturar desde guías de despacho"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total impuestos incluidos"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Fecha de pedido de la orden de venta"
 
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Le permite calcular los costos de envío en sus presupuestos."
@@ -2271,77 +2180,310 @@ msgstr "Facturar desde guías de despacho"
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Configurar logística pedidos de venta"
 
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
+
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Pago antes del envío"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "¡Aviso!"
+
 #~ msgid "VAT"
 #~ msgstr "IVA"
 
 #~ msgid "All at Once"
 #~ msgstr "Todo a la vez"
 
+#~ msgid "Procurement Order"
+#~ msgstr "Orden de abastecimiento"
+
+#~ msgid "Order Line"
+#~ msgstr "Línea del pedido"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Configurar la política envío para pedidos de venta"
 
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Forzar asignación"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Movimientos de inventario"
+
+#~ msgid "Dates"
+#~ msgstr "Fechas"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Estos días por razones de seguridad se añaden a los que promete a los "
+#~ "clientes."
+
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Política de envío por defecto"
 
+#~ msgid "Packaging"
+#~ msgstr "Empaquetado"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Cambiar a borrador"
+
+#~ msgid "Conditions"
+#~ msgstr "Condiciones"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "¡No hay ninguna cuenta de categoría de ingresos definida en las propiedades "
+#~ "por defecto de la categoría del producto o la posición fiscal no está "
+#~ "definida!"
+
 #~ msgid "Configure"
 #~ msgstr "Configurar"
 
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Está intentando asignar un lote que no es del mismo producto"
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "Modo no válido para test_state"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Sólo orden de entrega"
 
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Número de días entre la confirmación del pedido y el envío de los productos "
+#~ "al cliente."
+
+#~ msgid "UoM"
+#~ msgstr "UdM"
+
+#~ msgid "Number Packages"
+#~ msgstr "Número paquetes"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Debe cancelar primero los movimientos de stock asociados a esta línea de "
+#~ "pedido de venta."
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/a)"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Seleccione un producto del tipo de servicio que se llama 'Producto "
+#~ "avanzado'. Puede que tenga que crearlo y configurarlo como un valor por "
+#~ "defecto para este campo."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "No puede realizar un anticipo de un pedido de venta que está definido como "
+#~ "'Factura automática después envío'."
+
+#~ msgid "Notes"
+#~ msgstr "Notas"
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr "Optimizar su aplicación de ventas con funcionalidades adicionales."
 
+#~ msgid "Delivery Order"
+#~ msgstr "Orden de entrega"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "¡La referencia del pedido debe ser única!"
 
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Para cada línea de pedido de venta, se crea una orden de abastecimiento para "
+#~ "suministrar el producto vendido."
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Configurar su flujo de ventas y valores por defecto."
 
+#~ msgid "Warehouse"
+#~ msgstr "Almacén"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Base imponible"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Líneas a facturar"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Cantidad (UdM)"
+
+#~ msgid "All Quotations"
+#~ msgstr "Todos los presupuestos"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Facturar pedido después de envío"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Movimientos de stock"
+
 #~ msgid "  Year  "
 #~ msgstr "  Año  "
 
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "¿Desea crear la(s) factura(s)?"
 
+#~ msgid "Sales By Month"
+#~ msgstr "Ventas por mes"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "¡No se puede cancelar línea pedido de venta!"
+
+#~ msgid "Security Days"
+#~ msgstr "Días seguridad"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Abastecimiento de material vendido"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Crear factura final"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Indica que el pedido de venta ha sido entregado. Este campo se actualiza "
+#~ "sólo después que el planificador(es) se ha ejecutado."
+
+#~ msgid "Companies"
+#~ msgstr "Compañías"
+
 #~ msgid "Picking Default Policy"
 #~ msgstr "Política de empaquetado por defecto"
 
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr ""
+#~ "El nombre y la dirección del contacto que ha solicitado el pedido o "
+#~ "presupuesto."
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr ""
 #~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
 
+#~ msgid "References"
+#~ msgstr "Referencias"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Fechas en pedidos de venta"
 
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Márgenes en pedidos de venta"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Total sin impuestos"
+
+#~ msgid "Compute"
+#~ msgstr "Calcular"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Ventas por empresa"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Contacto que realiza el pedido"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Abrir factura"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Configuración aplicaciones de ventas"
 
+#~ msgid "on order"
+#~ msgstr "bajo pedido"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Basado en las cantidades enviadas o ordenadas."
+
+#~ msgid "Name"
+#~ msgstr "Nombre"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Ventas por cliente últimos 90 días"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Crear orden de entrega"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Costes de envío"
 
+#~ msgid "Sales by Product Category"
+#~ msgstr "Ventas por categoría de producto"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Envío parcial"
 
+#~ msgid "Procurement Method"
+#~ msgstr "Método abastecimiento"
+
 #~ msgid "title"
 #~ msgstr "título"
 
 #~ msgid "Order date"
 #~ msgstr "Fecha pedido"
 
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Documento del movimiento a la salida o al cliente."
+
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
+#~ msgid "Confirm Order"
+#~ msgstr "Confirmar pedido"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Crear orden abastecimiento"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Política de facturación"
 
+#~ msgid "Extra Info"
+#~ msgstr "Información extra"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Cantidades enviadas"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Factura basada en pedidos de venta"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡Error!"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "¡No se puede cancelar el pedido de venta!"
+
+#~ msgid "Procurement"
+#~ msgstr "Abastecimiento"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Excepción de envío"
+
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Enviar & Factura manual"
 
@@ -2355,6 +2497,9 @@ msgstr "Facturar desde guías de despacho"
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Factura desde el albarán"
 
+#~ msgid "Reference UoM"
+#~ msgstr "Referencia UdM"
+
 #~ msgid ""
 #~ "By default, OpenERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2366,12 +2511,82 @@ msgstr "Facturar desde guías de despacho"
 #~ "configurará los métodos más comunes y sencillos para entregar los productos "
 #~ "al cliente en una o dos operaciones realizadas por el trabajador."
 
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Puede generar facturas basadas en pedidos de venta o basadas en envíos."
+
 #~ msgid "sale.installer"
 #~ msgstr "venta.instalador"
 
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "¡Debe seleccionar un cliente en el formulario de ventas!\n"
+#~ "Introduzca un cliente antes de seleccionar un producto."
+
+#~ msgid "Picking Policy"
+#~ msgstr "Política de envío"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Documento del movimiento al cliente."
+
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Invoicing"
 #~ msgstr "Facturación"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Cancelar asignación"
+
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
+#~ msgid "Product UoM"
+#~ msgstr "UdM del producto"
+
+#~ msgid "Logistic"
+#~ msgstr "Logística"
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "¡Prevé vender %.2f %s pero sólo %.2f %s están disponibles!\n"
+#~ "El stock real es %.2f %s. (sin reservas)"
+
+#~ msgid "States"
+#~ msgstr "Estados"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contenidos"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Dependiendo de la configuración de la ubicación de salida, el movimiento "
+#~ "entre la zona de salida y el cliente se realiza a través de la orden de "
+#~ "entrega de forma manual o automática."
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
@@ -2386,6 +2601,13 @@ msgstr "Facturar desde guías de despacho"
 #~ msgid "   Month   "
 #~ msgstr "   Mes   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Aviso"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Ventas por mes"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -2400,6 +2622,18 @@ msgstr "Facturar desde guías de despacho"
 #~ "\n"
 #~ "EAN: %s Cantidad: %s Tipo de ul: %s"
 
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "¡Error! No puede crear compañías recursivas."
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Ventas por categoría de producto últimos 90 días"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Tiempo inicial entrega"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Envío completo"
 
@@ -2415,6 +2649,24 @@ msgstr "Facturar desde guías de despacho"
 #~ "tan pronto como sea posible cuando un producto está disponible o debe "
 #~ "esperar a que todos los productos están disponibles."
 
+#~ msgid "Image"
+#~ msgstr "Imagen"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Se crea automáticamente una orden de abastecimiento tan pronto como se "
+#~ "confirma un pedido de venta o se paga la factura. Provoca la compra y la "
+#~ "producción de productos según las reglas y los parámetros del pedido de "
+#~ "venta. "
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "El pedido de venta '%s' ha sido cancelado."
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Progreso configuración"
 
@@ -2433,20 +2685,59 @@ msgstr "Facturar desde guías de despacho"
 #~ msgid "Shipped Qty"
 #~ msgstr "Ctdad enviada"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "¡La factura ha sido creada correctamente!"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Primero debe cancelar todas las facturas relacionadas con este pedido de "
+#~ "venta."
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Configurar su aplicación de gestión de ventas"
 
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Mejora plantilla pedido de venta"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Una orden de abastecimiento para cada línea del pedido de venta y para cada "
+#~ "uno de los componentes."
+
+#~ msgid "Assign"
+#~ msgstr "Asignar"
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "¡No se puede eliminar pedido(s) de venta que ya está confirmado!"
 
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
+
+#~ msgid "from stock"
+#~ msgstr "desde stock"
+
+#~ msgid "Close"
+#~ msgstr "Cerrar"
+
+#~ msgid "Delivered"
+#~ msgstr "Entregado"
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "¡No hay stock suficiente!"
 
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Debe asignar un lote de producción para este producto"
+
 #~ msgid "Layout Sequence"
 #~ msgstr "Secuencia plantilla"
 
@@ -2461,9 +2752,15 @@ msgstr "Facturar desde guías de despacho"
 #~ "Permite agrupar y facturar sus albaranes de acuerdo a diferentes tipos de "
 #~ "facturación: diaria, semanal, etc."
 
+#~ msgid "Accounting"
+#~ msgstr "Contabilidad"
+
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Pasos para entregar un pedido de venta"
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Solicitud pedido de venta"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr ""
@@ -2657,9 +2954,6 @@ msgstr "Facturar desde guías de despacho"
 #~ msgid "Sale Procurement"
 #~ msgstr "Abastecimiento de venta"
 
-#~ msgid "Status"
-#~ msgstr "Estado"
-
 #~ msgid "Our Salesman"
 #~ msgstr "Nuestro comercial"
 
@@ -2669,9 +2963,6 @@ msgstr "Facturar desde guías de despacho"
 #~ msgid "One procurement for each product."
 #~ msgstr "Un abastecimiento por cada producto."
 
-#~ msgid "Sale Order"
-#~ msgstr "Pedido de venta"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Tarifas de venta"
 
@@ -2689,9 +2980,6 @@ msgstr "Facturar desde guías de despacho"
 #~ msgid "Sales order lines"
 #~ msgstr "Líneas del pedido de ventas"
 
-#~ msgid "Sequence"
-#~ msgstr "Secuencia"
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Se crea un albarán de salida OUT para productos almacenables."
 
@@ -2905,6 +3193,34 @@ msgstr "Facturar desde guías de despacho"
 #~ "  - La opción 'Factura desde albarán' se utiliza para crear una factura "
 #~ "durante el proceso de los albaranes."
 
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Tablero responsable ventas"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Si no dispone de suficiente stock disponible para enviarlo todo a la vez, "
+#~ "¿acepta envíos parciales?"
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Los pedidos de ventas le ayudan a gestionar presupuestos y pedidos de sus "
+#~ "clientes. OpenERP sugiere que comience por crear un presupuesto. Una vez "
+#~ "esté confirmado, el presupuesto se convertirá en un pedido de venta. OpenERP "
+#~ "puede gestionar varios tipos de productos de forma que un pedido de venta "
+#~ "puede generar tareas, órdenes de entrega, órdenes de fabricación, compras, "
+#~ "etc. Según la configuración del pedido de venta, se generará una factura en "
+#~ "borrador de manera que sólo hay que confirmarla cuando se quiera facturar a "
+#~ "su cliente."
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -2952,5 +3268,138 @@ msgstr "Facturar desde guías de despacho"
 #~ "    * Gráfico de los casos por mes\n"
 #~ "    "
 
+#~ msgid "Related Picking"
+#~ msgstr "Guía de despacho relacionada"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Guías de despacho a facturar"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Crear guía de despacho"
+
+#~ msgid "Pick List"
+#~ msgstr "Guía de despacho"
+
+#~ msgid "Stock Move"
+#~ msgstr "Movimiento de stock"
+
+#~ msgid "Picking List"
+#~ msgstr "LIsta de guías de despacho"
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Guía de despacho y Orden de entrega"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Debe primero cancelar todas las guías de despacho relacionadas con este "
+#~ "pedido de venta."
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr ""
+#~ "Esta es la lista de guías de despacho que han sido generados para este "
+#~ "pedido de venta."
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "La guía de despacho se crea tan pronto como se confirma el pedido de venta, "
+#~ "a la vez que la orden de abastecimiento. Representa la asignación de los "
+#~ "componentes del pedido de venta. Hay una guía de despacho por línea del "
+#~ "pedido de venta que evoluciona con la disponibilidad de los componentes."
+
+#~ msgid "Packings"
+#~ msgstr "Guías de despacho"
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Si tiene más de una tienda donde vende los productos de su compañía, puede "
+#~ "crearlas y gestionarlas desde aquí. Cada vez que codifique un nuevo "
+#~ "presupuesto o pedido de venta, debe estar vinculado a una tienda. La tienda "
+#~ "también define desde que almacén serán entregados los productos para cada "
+#~ "venta."
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Facturar desde guías de despacho"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Ventas por vendedor en los últimos 90 días"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Genera órdenes de abastecimiento para cada línea de orden de venta."
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Regenerar guía de despacho"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "La factura se crea de forma automática si la política de facturación es "
+#~ "\"Facturar desde bodega\" o \"Facturar pedido después del envío\"."
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "¡No es posible cancelar esta orden de venta!"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Despachar cada producto cuando se encuentre disponible"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Despachar todos los productos juntos"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Pago antes de envío"
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Despacho y facturación parcial"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Facturar desde orden, después de despachar"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Ventas por Vendedor"
+
+#~ msgid "Salesman"
+#~ msgstr "Vendedor"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Esta es una lista de todas las líneas de pedidos de venta a facturar. Puede "
+#~ "facturar pedidos de venta parcialmente, por líneas de pedido. No necesita "
+#~ "esta lista si factura desde despachos de salida o si factura pedidos de "
+#~ "venta completos."
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Abrir facturas de Ventas"
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm, que significa 'Términos de Comercio Internacional', implica una "
+#~ "serie de condiciones de venta que se utilizan en la transacción comercial."
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Basado en pedidos de venta"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Pedidos de venta creados en el mes actual"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Pedidos de venta creados en el año actual"
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Pedidos de venta creados en el último mes"
diff --git a/addons/sale/i18n/es_CR.po b/addons/sale/i18n/es_CR.po
index 6bf2f92f22e..0451651dcbe 100644
--- a/addons/sale/i18n/es_CR.po
+++ b/addons/sale/i18n/es_CR.po
@@ -6,21 +6,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-02-21 05:48+0000\n"
 "Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@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: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Basado en parte de horas"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanzar factura"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar presupuesto"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Tablero de ventas"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha confirmación"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -32,62 +180,346 @@ msgstr ""
 "aún no han sido facturados"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Ventas por comercial últimos 90 días"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicación empresa"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Estado del pedido"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Si no dispone de suficientes existencias para enviarlo todo de una vez, "
-"¿acepta envíos parciales o no?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Para facturar"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Dirección de envío para el pedido de venta actual."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Cantidad"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Fecha en la que se confirma el pedido de venta."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Día"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Contrato / Cuenta Analítica"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "El importe a facturar por adelantado."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "El importe total."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar pedido"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Imprimir Cotización (cita o citación)"
+msgid "Quotation "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "¡Aviso!"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+"Líneas de pedido de ventas relacionados con una orden de venta de la mina"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección de factura"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Fecha en la que se crea el pedido de venta."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Volver a Crear factura"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
 
 #. module: sale
 #: report:sale.order:0
@@ -95,79 +527,647 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Esta es una lista de todas las líneas de pedidos de venta a facturar. Puede "
-"facturar pedidos de venta parcialmente, por líneas de pedido. No necesita "
-"esta lista si factura desde albaranes de salida o si factura pedidos de "
-"venta completos."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
-"Con el fin de eliminar una orden de venta confirmada, debe cancelar antes! "
-"Para cancelar una orden de venta, primero debe cancelar la recolección o la "
-"relacionada con las órdenes de entrega."
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Orden de abastecimiento"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Fecha confirmación"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Nº de ctdad"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Líneas de venta por que están en 'hacer' estado"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Importe avanzado"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Plazo de pago por defecto"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Dirección de envío"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Líneas de venta pedido listo para ser facturado"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Volumen mensual"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Ordenes de venta que aún no han sido confirmados"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Pedido Nº"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas del pedido"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Presupuestos antiguos"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Realizar facturas"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Hora"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando fecha planificada"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Dirección de facturación para el pedido de venta actual."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades pedidas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Año Ordenado de la orden de venta"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mis ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UoS"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "Tarifa EDI (%s)"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Cotizaciones y Ventas"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "Empresa"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Facturar desde albaranes"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Línea del pedido"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
-"Los pedidos de ventas le ayudan a gestionar presupuestos y pedidos de sus "
-"clientes. OpenERP sugiere que comience por crear un presupuesto. Una vez "
-"esté confirmado, el presupuesto se convertirá en un pedido de venta. OpenERP "
-"puede gestionar varios tipos de productos de forma que un pedido de venta "
-"puede generar tareas, órdenes de entrega, órdenes de fabricación, compras, "
-"etc. Según la configuración del pedido de venta, se generará una factura en "
-"borrador de manera que sólo hay que confirmarla cuando se quiera facturar a "
-"su cliente."
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Ventas. Realizar factura"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"No se puede crear la factura a partir de esta línea de pedido de venta por "
+"las siguientes razones:\n"
+"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
+"\"cancelada\".\n"
+"2. La línea del pedido de venta está facturada."
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Las líneas de venta por hacer"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "No se puede confirmar una orden de venta que no tiene ninguna línea."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoría de producto"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre tienda"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Ventas. Anticipo pago factura"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -185,1321 +1185,10 @@ msgstr ""
 "son las horas dedicadas a las tareas asociadas."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Plazo de pago por defecto"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Basado en las ordenes de entrega"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "Trabajo principal de la unidad de tiempo"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Estado"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mis ordenes de venta"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Cantidades pedidas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Ventas por comercial"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Movimientos de inventario"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referencia del pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Otra información"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Fechas"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"La factura se crea de forma automática si la política de facturación es "
-"\"Facturar desde el albarán\" o \"Facturar pedido después del envío\"."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "Basado en tareas de trabajo"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Cotizaciones y Ventas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Ventas. Realizar factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr "¡Advertencia Lista de precios!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Descuento (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mis presupuestos"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Tablero responsable ventas"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Empaquetado"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Desde un pedido de venta"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nombre tienda"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
+msgid "Advance of %s %%"
 msgstr ""
-"La política de la factura se utiliza para sincronizar las operaciones de "
-"facturación y de entrega.\n"
-"   - El 'Pagar antes de la entrega \"primera opción va a generar la factura "
-"y luego generar la preparación de pedidos después del pago de esta factura.\n"
-"   - El 'Entregar factura y en la demanda \"va a crear la orden de recoger "
-"directamente y esperar a que el usuario haga clic manualmente sobre la' "
-"factura 'para generar la factura de proyecto basado en la orden de venta o "
-"de las líneas de pedido de venta.\n"
-"   - La factura de la orden después de la entrega \"elección va a generar la "
-"factura de proyecto basado en el orden de venta después de todas las listas "
-"de picking se han terminado.\n"
-"   - La factura de base de las entregas de la elección se utiliza para crear "
-"una factura durante la selección de proceso."
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "¡No se ha definido un cliente!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Ventas en excepción"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "¡Error de Configuración!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Condiciones"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"¡No hay ninguna cuenta de categoría de ingresos definida en las propiedades "
-"por defecto de la categoría del producto o la posición fiscal no está "
-"definida!"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Está intentando asignar un lote que no es del mismo producto"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "Modo no válido para test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "¡No se puede cancelar este pedido de venta!"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estadísticas pedidos de venta"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "La cuenta analítica relacionada con un pedido de venta."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "¡La referencia debe ser única por compañía!"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Presupuestos"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Tarifa para el pedido de venta actual."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Número de días entre la confirmación del pedido y el envío de los productos "
-"al cliente."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Fecha presupuesto"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Número paquetes"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"El comercial confirma el presupuesto. El estado del pedido de venta se "
-"convierte 'En proceso' o 'Manual en proceso'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-"¡No se puede cancelar una línea de orden de venta que ya ha sido facturado!"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Debe cancelar primero los movimientos de stock asociados a esta línea de "
-"pedido de venta."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Seleccione un producto del tipo de servicio que se llama 'Producto "
-"avanzado'. Puede que tenga que crearlo y configurarlo como un valor por "
-"defecto para este campo."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"No puede realizar un anticipo de un pedido de venta que está definido como "
-"'Factura automática después envío'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "¡El nombre de la compañía debe ser único!"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Dirección de facturación para el pedido de venta actual."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Mes-1"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Meses Ordenados por orden de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"No se puede tener las ventas del grupo de monedas diferentes para la misma "
-"pareja."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Entregar cada producto cuando esté disponible"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Orden de entrega"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Ubicación empresa"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr "No puede mover productos desde o hacia una ubicación de tipo vista."
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Basado en Ordenes de venta"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "El importe total."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Dirección de factura :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "Secuencia de linea"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Para cada línea de pedido de venta, se crea una orden de abastecimiento para "
-"suministrar el producto vendido."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm, que significa 'Términos de Comercio Internacional', implica una "
-"serie de condiciones de venta que se utilizan en la transacción comercial."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Dirección de factura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Buscar líneas no facturadas"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Presupuesto / Pedido"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de líneas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Ventas. Abrir factura"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Línea pedido de venta"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Pedido Nº"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Líneas del pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Base imponible"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Líneas a facturar"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Cantidad (UdM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Fecha creación"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Varios"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Líneas no facturadas y entregadas"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Mis ventas"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Información extra"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Tarifa"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Nº de ctdad"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "Hora"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Fecha pedido"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Enviado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Todos los presupuestos"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "Opciones"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "No se puede confirmar una orden de venta que no tiene ninguna línea."
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"¡Tienes que seleccionar una lista de precios o de un cliente en forma de "
-"ventas!\n"
-"Por favor, establece uno antes de elegir un producto."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Categoría de producto"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Impuestos :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Estado del pedido"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Ventas por mes"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "¡No se puede cancelar línea pedido de venta!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Días seguridad"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Abastecimiento de material vendido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Crear factura final"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Dirección de envío"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Indica que el pedido de venta ha sido entregado. Este campo se actualiza "
-"sólo después que el planificador(es) se ha ejecutado."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Fecha"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepción"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Compañías"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-"Da el estado de la oferta o la orden de venta.\n"
-"El estado de excepción se ajusta automáticamente cuando una operación de "
-"cancelación se produce en la validación de la factura (factura de excepción) "
-"o en el proceso de lista de picking (Excepción de envío).\n"
-"El estado de la \"Lista de espera\" se establece cuando la factura está "
-"confirmada, pero esperando que el planificador para ejecutarse en la fecha "
-"del pedido."
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "¡No válida línea de la lista de precios encontrado! :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Historial"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Factura en el orden después de la entrega"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Esta es la lista de facturas que han sido generadas para este pedido de "
-"venta. El mismo pedido de venta puede haber sido facturado varias veces "
-"(línea a línea, por ejemplo)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Su referencia"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-"El nombre y la dirección del contacto que ha solicitado el pedido o "
-"presupuesto."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Estos días por razones de seguridad se añaden a los que promete a los "
-"clientes."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Ctdad"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referencias"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Mis líneas de pedido de ventas"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "¡La referencia de la compra debe ser única por compañía!"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Crear factura"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Total sin impuestos"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Ordenes de referencia"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "¡La factura ha sido creada correctamente!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Ventas por empresa"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Contacto del pedido"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Abrir factura"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr "Correo electrónico automático confirmado de las órdenes de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forzar asignación"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "bajo pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Basado en las cantidades enviadas o pedidas."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Entrega de todos los productos a la vez"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Albarán relacionado"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Dirección de envío :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Ventas por cliente últimos 90 días"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Estado borrador del pedido de venta"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Crear orden de entrega"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-"¡No se puede eliminar una línea de órdenes de venta que se encuentra en '% "
-"s' estado!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "Qty(UoS)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total impuestos incluidos"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Crear albarán"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Ordenado de la fecha de la orden de venta"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Ventas por categoría de producto"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar presupuesto"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Volver a Crear factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Albaranes a facturar"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Esperando fecha planificada"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Método abastecimiento"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Albarán"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Documento del movimiento a la salida o al cliente."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-"\n"
-"Hola $ {object.partner_order_id.name y \"'o''} $ "
-"{object.partner_order_id.name o''},\n"
-"\n"
-"Aquí está la confirmación del pedido por $ {} object.partner_id.name:\n"
-"       | Número de orden: $ {*} * object.name\n"
-"       | Orden total: $ {*} $ {object.amount_total "
-"object.pricelist_id.currency_id.name} *\n"
-"       | Orden de la fecha: $ {} object.date_order\n"
-"       % Si object.origin:\n"
-"       | Orden de referencia: $ {} object.origin\n"
-"       % Endif\n"
-"       % Si object.client_order_ref:\n"
-"       | Su referencia: $ {} object.client_order_ref <br />\n"
-"       % Endif\n"
-"       | Su persona de contacto: $ {} $ {object.user_id.name "
-"object.user_id.user_email y '% <% s> \"(object.user_id.user_email) o''}\n"
-"\n"
-"Usted puede ver la confirmación del pedido, puede descargarlo e incluso "
-"pagar en línea usando el siguiente enlace:\n"
-"    $ {Ctx.get ('edi_web_url_view') o 'N / A'}\n"
-"\n"
-"% Si object.order_policy in ('prepago', 'manual') y "
-"object.company_id.paypal_account:\n"
-"<%\n"
-"comp_name = cotización (object.company_id.name)\n"
-"order_name = cotización (object.name)\n"
-"paypal_account = cotización (object.company_id.paypal_account)\n"
-"order_amount = cotización (str (object.amount_total))\n"
-"cur_name = cotización (object.pricelist_id.currency_id.name)\n"
-"paypal_url = \\\n"
-"             \"& Currency_code =% s + = button_subtype los servicios y "
-"no_note = 1 & bn =% s OpenERP_Order_PayNow_\" \\%\n"
-"             (Paypal_account, comp_name, order_name, order_name, "
-"order_amount, cur_name, cur_name)\n"
-"%>\n"
-"También es posible pagar directamente con PayPal:\n"
-"    $ {} Paypal_url\n"
-"% Endif\n"
-"\n"
-"Si usted tiene alguna pregunta, no dude en contactar con nosotros.\n"
-"\n"
-"\n"
-"Gracias por elegir $ {} object.company_id.name!\n"
-"\n"
-"\n"
-"-\n"
-"$ {} $ {Object.user_id.name '<% s> \"object.user_id.user_email y% "
-"(object.user_id.user_email) o''}\n"
-"$ {} Object.company_id.name\n"
-"% Si object.company_id.street:\n"
-"$ {Object.company_id.street o''}\n"
-"% Endif\n"
-"% Si object.company_id.street2:\n"
-"$ {} Object.company_id.street2\n"
-"% Endif\n"
-"% Si object.company_id.city o object.company_id.zip:\n"
-"$ {Object.company_id.zip o''} $ {object.company_id.city o''}\n"
-"% Endif\n"
-"% Si object.company_id.country_id:\n"
-"$ {Object.company_id.state_id y ('% s'% object.company_id.state_id.name) "
-"o''} $ {object.company_id.country_id.name o''}\n"
-"% Endif\n"
-"% Si object.company_id.phone:\n"
-"Teléfono: $ {} object.company_id.phone\n"
-"% Endif\n"
-"% Si object.company_id.website:\n"
-"$ {Object.company_id.website o''}\n"
-"% Endif\n"
-"            "
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Validar"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Confirmar pedido"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Crear orden abastecimiento"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Órdenes de venta listos para ser facturado"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Fecha en la que se crea el pedido de venta."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Movimiento stock"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Orden de venta creadas en el mes actual"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-"Si \"el orden\", se dispara una contratación pública, cuando la orden de "
-"venta se confirma la creación de una tarea, la orden de compra u orden de "
-"fabricación vinculado a esta línea para la venta."
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Importe avanzado"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "¿Debo pagar la entrega?"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Cantidades enviadas"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Factura basada en pedidos de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Si cambia la lista de precios de esta orden (y eventualmente la moneda), los "
-"precios de líneas de pedido existentes no será actualizado."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Albarán"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "¡No se puede cancelar el pedido de venta!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "Qty(UoM)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Año Ordenado de la orden de venta"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Abastecimiento"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepción de envío"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "¡Recogiendo la información! : "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar las facturas"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "Política de factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "Configure su sistema de facturación"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Para ser revisado por el contable."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referencia UdM"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-"Esta herramienta le ayudará a instalar el módulo de la derecha y configurar "
-"el sistema según el método que se utiliza para facturar a sus clientes."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
@@ -1507,14 +1196,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Venta Línea_pedido Realizar_factura"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Genera abastecimiento y facturación"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1522,582 +1206,9 @@ msgid "Paid"
 msgstr "Pagado"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Análisis de ventas"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
-"Ha seleccionado una cantidad de unidades de% d.\n"
-"Pero no es compatible con el paquete seleccionado.\n"
-"Aquí es una propuesta de las cantidades de acuerdo con el envase:\n"
-"EAN: Cantidad% s:% s Tipo de UL:% s"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recrear albarán"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Propiedades"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Presupuesto"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"El comercial crea una factura manualmente si la política de facturación del "
-"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
-"automática si la política de facturación es 'Pago antes del envío'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Puede generar facturas basadas en pedidos de venta o basadas en envíos."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Confirmadas las líneas de pedido de venta, aún no entregado"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Facturas de cliente"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Ventas"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio unidad"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"¡Debe seleccionar un cliente en el formulario de ventas!\n"
-"Introduzca un cliente antes de seleccionar un producto."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Documento origen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Para hacer"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Política de envío"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documento del movimiento al cliente."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "El importe sin impuestos."
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Debe primero cancelar todos los albaranes relacionados con este pedido de "
-"venta."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Ventas. Anticipo pago factura"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Cancelar asignación"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Volumen mensual"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturar las"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Fecha de pedido"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV del producto"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual en proceso"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "UdM del producto"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logística"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Pedido"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorar excepción"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"En función del control de facturación de los pedidos de venta, la factura "
-"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
-"pedido de venta puede generar una factura o un albarán tan pronto como sea "
-"confirmado por el comercial."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"¡Prevé vender %.2f %s pero sólo %.2f %s están disponibles!\n"
-"El stock real es %.2f %s. (sin reservas)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Estados"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contenidos"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referencia cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Precio"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Dependiendo de la configuración de la ubicación de salida, el movimiento "
-"entre la zona de salida y el cliente se realiza a través de la orden de "
-"entrega de forma manual o automática."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Pago antes de entrega"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Tablero de ventas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Realizar facturas"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Para facturar"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Fecha en la que se confirma el pedido de venta."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "Contrato / Cuenta Analítica"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fecha factura"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "El importe a facturar por adelantado."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"No se ha encontrado una línea de tarifa que concuerde con este producto y "
-"cantidad.\n"
-"Debe cambiar el producto, la cantidad o la tarifa."
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-"Esta es la lista de albaranes que han sido generados para este pedido de "
-"venta."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total neto :"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-"Líneas de pedido de ventas relacionados con una orden de venta de la mina"
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Tienda"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Fecha confirmación"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Aviso"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Ventas por mes"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Pedido de venta"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Cantidad (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Líneas de venta por que están en 'hacer' estado"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"El albarán se crea tan pronto como se confirma el pedido de venta, a la vez "
-"que la orden de abastecimiento. Representa la asignación de los componentes "
-"del pedido de venta. Hay un albarán por línea del pedido de venta que "
-"evoluciona con la disponibilidad de los componentes."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "Método principal basado en"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Ventas por categoría de producto últimos 90 días"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Líneas de factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Líneas pedido de ventas"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Tiempo inicial entrega"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuración"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "Tarifa EDI (%s)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr "Imprimir pedido"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Orden de venta creada en el año en curso"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"No se puede crear la factura a partir de esta línea de pedido de venta por "
-"las siguientes razones:\n"
-"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
-"\"cancelada\".\n"
-"2. La línea del pedido de venta está facturada."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Las líneas de venta por hacer"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Se crea automáticamente una orden de abastecimiento tan pronto como se "
-"confirma un pedido de venta o se paga la factura. Provoca la compra y la "
-"producción de productos según las reglas y los parámetros del pedido de "
-"venta. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "No facturada"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Comercial"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Presupuestos antiguos"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Base imponible"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avanzar factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "El pedido de venta '%s' ha sido cancelado."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Borrador"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -2122,6 +1233,18 @@ msgstr ""
 "* El estado 'Cancelado' se establece cuando un usuario cancela el pedido de "
 "venta."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de ventas"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2129,58 +1252,170 @@ msgstr "El importe de los impuestos."
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Albaranes"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Líneas de venta pedido listo para ser facturado"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estado"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Ordenes de ventas creadas en el último mes"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera abastecimiento y facturación"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "Plantillas de correo electrónico"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Pedidos de ventas"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pedido"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "¡Advertencia Lista de precios!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Tienda ventas"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadísticas pedidos de venta"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Noviembre"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Producto avanzado"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El comercial crea una factura manualmente si la política de facturación del "
+"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
+"automática si la política de facturación es 'Pago antes del envío'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Primero debe cancelar todas las facturas relacionadas con este pedido de "
-"venta."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2192,6 +1427,41 @@ msgstr "Enero"
 msgid "Sales Order in Progress"
 msgstr "Pedidos de ventas en proceso"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"El comercial confirma el presupuesto. El estado del pedido de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
@@ -2199,90 +1469,292 @@ msgstr ""
 "Referencia del documento que ha generado esta solicitud de pedido de venta."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "¡No válida línea de la lista de precios encontrado! :"
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Retraso realización"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "Entregar factura y en la demanda"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Confirmadas las líneas de pedido de venta, aún no entregado"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
-"Una orden de abastecimiento para cada línea del pedido de venta y para cada "
-"uno de los componentes."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Asignar"
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Esta es la lista de facturas que han sido generadas para este pedido de "
+"venta. El mismo pedido de venta puede haber sido facturado varias veces "
+"(línea a línea, por ejemplo)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Fecha pedido"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Facturas de cliente"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Pedido de venta confirmado a factura."
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Ordenes de venta que aún no han sido confirmados"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas pedido de ventas"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Si cambia la lista de precios de esta orden (y eventualmente la moneda), los "
+"precios de líneas de pedido existentes no será actualizado."
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "desde stock"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Día"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Cerrar"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Dirección de factura :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Mis líneas de pedido de ventas"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "¡No Lista de precios! : "
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Entregado"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Debe asignar un lote de producción para este producto"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
-"Si tiene más de una tienda donde vende los productos de su compañía, puede "
-"crearlas y gestionarlas desde aquí. Cada vez que codifique un nuevo "
-"presupuesto o pedido de venta, debe estar vinculado a una tienda. La tienda "
-"también define desde que almacén serán entregados los productos para cada "
-"venta."
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "¡La referencia de la compra debe ser única por compañía!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Para hacer"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"No se puede tener las ventas del grupo de monedas diferentes para la misma "
+"pareja."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análisis de ventas"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa para el pedido de venta actual."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "El importe sin impuestos."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Ordenes de referencia"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2290,61 +1762,68 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Indica que una factura ha sido pagada."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+"¡No se puede cancelar una línea de orden de venta que ya ha sido facturado!"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Descripción"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Mayo"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Anticipo"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Febrero"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Abril"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Contabilidad"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Buscar pedido de venta"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Solicitud pedido de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
-msgstr "¡No es suficiente stock! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Plazo de pago"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Precio"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2362,32 +1841,877 @@ msgstr ""
 "desea analizar sus ingresos, debería utilizar el informe de análisis de "
 "facturas en la aplicación de Contabilidad."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Otra información"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Ctdad"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contable."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Dirección de envío para el pedido de venta actual."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Presupuesto / Pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Anticipo"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar las"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha de pedido"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estado borrador del pedido de venta"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Mis ordenes de venta"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Buscar pedido de venta"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Meses Ordenados por orden de venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"¡Tienes que seleccionar una lista de precios o de un cliente en forma de "
+"ventas!\n"
+"Por favor, establece uno antes de elegir un producto."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Desde un pedido de venta"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función del control de facturación de los pedidos de venta, la factura "
+"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
+"pedido de venta puede generar una factura o un albarán tan pronto como sea "
+"confirmado por el comercial."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "La cuenta analítica relacionada con un pedido de venta."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Órdenes de venta listos para ser facturado"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Presupuesto Nº"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencia cliente"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Enviada"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Año"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Facturar desde albaranes"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total impuestos incluidos"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Ordenado de la fecha de la orden de venta"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Ventas por comercial últimos 90 días"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Si no dispone de suficientes existencias para enviarlo todo de una vez, "
+#~ "¿acepta envíos parciales o no?"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "¡Aviso!"
 
 #~ msgid "VAT"
 #~ msgstr "IVA"
 
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta."
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Esta es una lista de todas las líneas de pedidos de venta a facturar. Puede "
+#~ "facturar pedidos de venta parcialmente, por líneas de pedido. No necesita "
+#~ "esta lista si factura desde albaranes de salida o si factura pedidos de "
+#~ "venta completos."
+
+#~ msgid "Procurement Order"
+#~ msgstr "Orden de abastecimiento"
+
+#~ msgid "Order Line"
+#~ msgstr "Línea del pedido"
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Los pedidos de ventas le ayudan a gestionar presupuestos y pedidos de sus "
+#~ "clientes. OpenERP sugiere que comience por crear un presupuesto. Una vez "
+#~ "esté confirmado, el presupuesto se convertirá en un pedido de venta. OpenERP "
+#~ "puede gestionar varios tipos de productos de forma que un pedido de venta "
+#~ "puede generar tareas, órdenes de entrega, órdenes de fabricación, compras, "
+#~ "etc. Según la configuración del pedido de venta, se generará una factura en "
+#~ "borrador de manera que sólo hay que confirmarla cuando se quiera facturar a "
+#~ "su cliente."
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Ventas por comercial"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Movimientos de inventario"
+
+#~ msgid "Dates"
+#~ msgstr "Fechas"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "La factura se crea de forma automática si la política de facturación es "
+#~ "\"Facturar desde el albarán\" o \"Facturar pedido después del envío\"."
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Tablero responsable ventas"
+
+#~ msgid "Packaging"
+#~ msgstr "Empaquetado"
+
+#~ msgid "Conditions"
+#~ msgstr "Condiciones"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "¡No hay ninguna cuenta de categoría de ingresos definida en las propiedades "
+#~ "por defecto de la categoría del producto o la posición fiscal no está "
+#~ "definida!"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Está intentando asignar un lote que no es del mismo producto"
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "Modo no válido para test_state"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "¡No se puede cancelar este pedido de venta!"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Número de días entre la confirmación del pedido y el envío de los productos "
+#~ "al cliente."
+
+#~ msgid "UoM"
+#~ msgstr "UdM"
+
+#~ msgid "Number Packages"
+#~ msgstr "Número paquetes"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Debe cancelar primero los movimientos de stock asociados a esta línea de "
+#~ "pedido de venta."
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/a)"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Seleccione un producto del tipo de servicio que se llama 'Producto "
+#~ "avanzado'. Puede que tenga que crearlo y configurarlo como un valor por "
+#~ "defecto para este campo."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "No puede realizar un anticipo de un pedido de venta que está definido como "
+#~ "'Factura automática después envío'."
+
+#~ msgid "Notes"
+#~ msgstr "Notas"
+
+#~ msgid "Delivery Order"
+#~ msgstr "Orden de entrega"
+
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Para cada línea de pedido de venta, se crea una orden de abastecimiento para "
+#~ "suministrar el producto vendido."
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm, que significa 'Términos de Comercio Internacional', implica una "
+#~ "serie de condiciones de venta que se utilizan en la transacción comercial."
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Ventas. Abrir factura"
+
+#~ msgid "Warehouse"
+#~ msgstr "Almacén"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Base imponible"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Líneas a facturar"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Cantidad (UdM)"
+
+#~ msgid "Extra Info"
+#~ msgstr "Información extra"
+
+#~ msgid "All Quotations"
+#~ msgstr "Todos los presupuestos"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Movimientos de stock"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "¿Desea crear la(s) factura(s)?"
 
+#~ msgid "Sales By Month"
+#~ msgstr "Ventas por mes"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "¡No se puede cancelar línea pedido de venta!"
+
+#~ msgid "Security Days"
+#~ msgstr "Días seguridad"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Abastecimiento de material vendido"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Crear factura final"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Indica que el pedido de venta ha sido entregado. Este campo se actualiza "
+#~ "sólo después que el planificador(es) se ha ejecutado."
+
+#~ msgid "Companies"
+#~ msgstr "Compañías"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr ""
+#~ "El nombre y la dirección del contacto que ha solicitado el pedido o "
+#~ "presupuesto."
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Estos días por razones de seguridad se añaden a los que promete a los "
+#~ "clientes."
+
+#~ msgid "References"
+#~ msgstr "Referencias"
+
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Total sin impuestos"
+
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "¡La factura ha sido creada correctamente!"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Ventas por empresa"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Contacto del pedido"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Abrir factura"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Forzar asignación"
+
+#~ msgid "on order"
+#~ msgstr "bajo pedido"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Basado en las cantidades enviadas o pedidas."
+
+#~ msgid "Related Picking"
+#~ msgstr "Albarán relacionado"
+
+#~ msgid "Name"
+#~ msgstr "Nombre"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Ventas por cliente últimos 90 días"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Crear orden de entrega"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Crear albarán"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Ventas por categoría de producto"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Albaranes a facturar"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Método abastecimiento"
+
+#~ msgid "Pick List"
+#~ msgstr "Albarán"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Cambiar a borrador"
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Documento del movimiento a la salida o al cliente."
+
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
+#~ msgid "Confirm Order"
+#~ msgstr "Confirmar pedido"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Crear orden abastecimiento"
+
+#~ msgid "Stock Move"
+#~ msgstr "Movimiento stock"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Cantidades enviadas"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Factura basada en pedidos de venta"
+
+#~ msgid "Picking List"
+#~ msgstr "Albarán"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡Error!"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "¡No se puede cancelar el pedido de venta!"
+
+#~ msgid "Procurement"
+#~ msgstr "Abastecimiento"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Excepción de envío"
+
+#~ msgid "Reference UoM"
+#~ msgstr "Referencia UdM"
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Recrear albarán"
+
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Puede generar facturas basadas en pedidos de venta o basadas en envíos."
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "¡Debe seleccionar un cliente en el formulario de ventas!\n"
+#~ "Introduzca un cliente antes de seleccionar un producto."
+
+#~ msgid "Picking Policy"
+#~ msgstr "Política de envío"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Documento del movimiento al cliente."
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Debe primero cancelar todos los albaranes relacionados con este pedido de "
+#~ "venta."
+
+#~ msgid "Cancel Assignation"
+#~ msgstr "Cancelar asignación"
+
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
+#~ msgid "Product UoM"
+#~ msgstr "UdM del producto"
+
+#~ msgid "Logistic"
+#~ msgstr "Logística"
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "¡Prevé vender %.2f %s pero sólo %.2f %s están disponibles!\n"
+#~ "El stock real es %.2f %s. (sin reservas)"
+
+#~ msgid "States"
+#~ msgstr "Estados"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contenidos"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Dependiendo de la configuración de la ubicación de salida, el movimiento "
+#~ "entre la zona de salida y el cliente se realiza a través de la orden de "
+#~ "entrega de forma manual o automática."
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr ""
+#~ "Esta es la lista de albaranes que han sido generados para este pedido de "
+#~ "venta."
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Aviso"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Ventas por mes"
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "El albarán se crea tan pronto como se confirma el pedido de venta, a la vez "
+#~ "que la orden de abastecimiento. Representa la asignación de los componentes "
+#~ "del pedido de venta. Hay un albarán por línea del pedido de venta que "
+#~ "evoluciona con la disponibilidad de los componentes."
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "¡Error! No puede crear compañías recursivas."
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Ventas por categoría de producto últimos 90 días"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Tiempo inicial entrega"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
+#~ msgid "Image"
+#~ msgstr "Imagen"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Se crea automáticamente una orden de abastecimiento tan pronto como se "
+#~ "confirma un pedido de venta o se paga la factura. Provoca la compra y la "
+#~ "producción de productos según las reglas y los parámetros del pedido de "
+#~ "venta. "
+
+#~ msgid "Salesman"
+#~ msgstr "Comercial"
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "El pedido de venta '%s' ha sido cancelado."
+
+#~ msgid "Packings"
+#~ msgstr "Albaranes"
+
+#~ msgid "Compute"
+#~ msgstr "Calcular"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Primero debe cancelar todas las facturas relacionadas con este pedido de "
+#~ "venta."
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Una orden de abastecimiento para cada línea del pedido de venta y para cada "
+#~ "uno de los componentes."
+
+#~ msgid "Assign"
+#~ msgstr "Asignar"
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
+
+#~ msgid "from stock"
+#~ msgstr "desde stock"
+
+#~ msgid "Close"
+#~ msgstr "Cerrar"
+
+#~ msgid "Delivered"
+#~ msgstr "Entregado"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Debe asignar un lote de producción para este producto"
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Si tiene más de una tienda donde vende los productos de su compañía, puede "
+#~ "crearlas y gestionarlas desde aquí. Cada vez que codifique un nuevo "
+#~ "presupuesto o pedido de venta, debe estar vinculado a una tienda. La tienda "
+#~ "también define desde que almacén serán entregados los productos para cada "
+#~ "venta."
+
+#~ msgid "Accounting"
+#~ msgstr "Contabilidad"
+
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Solicitud pedido de venta"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Facturar desde albaranes"
+
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Configurar la logística de los pedidos de venta"
 
@@ -2590,9 +2914,6 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Sale Procurement"
 #~ msgstr "Abastecimiento de venta"
 
-#~ msgid "Status"
-#~ msgstr "Estado"
-
 #~ msgid "Product sales"
 #~ msgstr "Ventas de producto"
 
@@ -2605,9 +2926,6 @@ msgstr "Facturar desde albaranes"
 #~ msgid "One procurement for each product."
 #~ msgstr "Un abastecimiento por cada producto."
 
-#~ msgid "Sale Order"
-#~ msgstr "Pedido de venta"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Tarifas de venta"
 
@@ -2631,9 +2949,6 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Sales order lines"
 #~ msgstr "Líneas del pedido de ventas"
 
-#~ msgid "Sequence"
-#~ msgstr "Secuencia"
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Se crea un albarán de salida OUT para productos almacenables."
 
@@ -3112,3 +3427,347 @@ msgstr "Facturar desde albaranes"
 
 #~ msgid "Ordered Date"
 #~ msgstr "Fecha pedido"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Basado en tareas de trabajo"
+
+#~ msgid "Print Quotation"
+#~ msgstr "Imprimir Cotización (cita o citación)"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Trabajo principal de la unidad de tiempo"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Basado en parte de horas"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Facturar desde albaranes"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Basado en las ordenes de entrega"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Con el fin de eliminar una orden de venta confirmada, debe cancelar antes! "
+#~ "Para cancelar una orden de venta, primero debe cancelar la recolección o la "
+#~ "relacionada con las órdenes de entrega."
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "La política de la factura se utiliza para sincronizar las operaciones de "
+#~ "facturación y de entrega.\n"
+#~ "   - El 'Pagar antes de la entrega \"primera opción va a generar la factura "
+#~ "y luego generar la preparación de pedidos después del pago de esta factura.\n"
+#~ "   - El 'Entregar factura y en la demanda \"va a crear la orden de recoger "
+#~ "directamente y esperar a que el usuario haga clic manualmente sobre la' "
+#~ "factura 'para generar la factura de proyecto basado en la orden de venta o "
+#~ "de las líneas de pedido de venta.\n"
+#~ "   - La factura de la orden después de la entrega \"elección va a generar la "
+#~ "factura de proyecto basado en el orden de venta después de todas las listas "
+#~ "de picking se han terminado.\n"
+#~ "   - La factura de base de las entregas de la elección se utiliza para crear "
+#~ "una factura durante la selección de proceso."
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "¡El nombre de la compañía debe ser único!"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "¡La referencia debe ser única por compañía!"
+
+#~ msgid "Month-1"
+#~ msgstr "Mes-1"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "¡Error de Configuración!"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Entregar cada producto cuando esté disponible"
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr "No puede mover productos desde o hacia una ubicación de tipo vista."
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Basado en Ordenes de venta"
+
+#~ msgid "Line Sequence"
+#~ msgstr "Secuencia de linea"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Varios"
+
+#~ msgid "Options"
+#~ msgstr "Opciones"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr ""
+#~ "¡No se puede eliminar una línea de órdenes de venta que se encuentra en '% "
+#~ "s' estado!"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Entrega de todos los productos a la vez"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Factura en el orden después de la entrega"
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Correo electrónico automático confirmado de las órdenes de venta"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "Da el estado de la oferta o la orden de venta.\n"
+#~ "El estado de excepción se ajusta automáticamente cuando una operación de "
+#~ "cancelación se produce en la validación de la factura (factura de excepción) "
+#~ "o en el proceso de lista de picking (Excepción de envío).\n"
+#~ "El estado de la \"Lista de espera\" se establece cuando la factura está "
+#~ "confirmada, pero esperando que el planificador para ejecutarse en la fecha "
+#~ "del pedido."
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Qty(UoS)"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "¡Recogiendo la información! : "
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "¿Debo pagar la entrega?"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Orden de venta creadas en el mes actual"
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "Si \"el orden\", se dispara una contratación pública, cuando la orden de "
+#~ "venta se confirma la creación de una tarea, la orden de compra u orden de "
+#~ "fabricación vinculado a esta línea para la venta."
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+#~ msgstr ""
+#~ "\n"
+#~ "Hola $ {object.partner_order_id.name y \"'o''} $ "
+#~ "{object.partner_order_id.name o''},\n"
+#~ "\n"
+#~ "Aquí está la confirmación del pedido por $ {} object.partner_id.name:\n"
+#~ "       | Número de orden: $ {*} * object.name\n"
+#~ "       | Orden total: $ {*} $ {object.amount_total "
+#~ "object.pricelist_id.currency_id.name} *\n"
+#~ "       | Orden de la fecha: $ {} object.date_order\n"
+#~ "       % Si object.origin:\n"
+#~ "       | Orden de referencia: $ {} object.origin\n"
+#~ "       % Endif\n"
+#~ "       % Si object.client_order_ref:\n"
+#~ "       | Su referencia: $ {} object.client_order_ref <br />\n"
+#~ "       % Endif\n"
+#~ "       | Su persona de contacto: $ {} $ {object.user_id.name "
+#~ "object.user_id.user_email y '% <% s> \"(object.user_id.user_email) o''}\n"
+#~ "\n"
+#~ "Usted puede ver la confirmación del pedido, puede descargarlo e incluso "
+#~ "pagar en línea usando el siguiente enlace:\n"
+#~ "    $ {Ctx.get ('edi_web_url_view') o 'N / A'}\n"
+#~ "\n"
+#~ "% Si object.order_policy in ('prepago', 'manual') y "
+#~ "object.company_id.paypal_account:\n"
+#~ "<%\n"
+#~ "comp_name = cotización (object.company_id.name)\n"
+#~ "order_name = cotización (object.name)\n"
+#~ "paypal_account = cotización (object.company_id.paypal_account)\n"
+#~ "order_amount = cotización (str (object.amount_total))\n"
+#~ "cur_name = cotización (object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \\\n"
+#~ "             \"& Currency_code =% s + = button_subtype los servicios y "
+#~ "no_note = 1 & bn =% s OpenERP_Order_PayNow_\" \\%\n"
+#~ "             (Paypal_account, comp_name, order_name, order_name, "
+#~ "order_amount, cur_name, cur_name)\n"
+#~ "%>\n"
+#~ "También es posible pagar directamente con PayPal:\n"
+#~ "    $ {} Paypal_url\n"
+#~ "% Endif\n"
+#~ "\n"
+#~ "Si usted tiene alguna pregunta, no dude en contactar con nosotros.\n"
+#~ "\n"
+#~ "\n"
+#~ "Gracias por elegir $ {} object.company_id.name!\n"
+#~ "\n"
+#~ "\n"
+#~ "-\n"
+#~ "$ {} $ {Object.user_id.name '<% s> \"object.user_id.user_email y% "
+#~ "(object.user_id.user_email) o''}\n"
+#~ "$ {} Object.company_id.name\n"
+#~ "% Si object.company_id.street:\n"
+#~ "$ {Object.company_id.street o''}\n"
+#~ "% Endif\n"
+#~ "% Si object.company_id.street2:\n"
+#~ "$ {} Object.company_id.street2\n"
+#~ "% Endif\n"
+#~ "% Si object.company_id.city o object.company_id.zip:\n"
+#~ "$ {Object.company_id.zip o''} $ {object.company_id.city o''}\n"
+#~ "% Endif\n"
+#~ "% Si object.company_id.country_id:\n"
+#~ "$ {Object.company_id.state_id y ('% s'% object.company_id.state_id.name) "
+#~ "o''} $ {object.company_id.country_id.name o''}\n"
+#~ "% Endif\n"
+#~ "% Si object.company_id.phone:\n"
+#~ "Teléfono: $ {} object.company_id.phone\n"
+#~ "% Endif\n"
+#~ "% Si object.company_id.website:\n"
+#~ "$ {Object.company_id.website o''}\n"
+#~ "% Endif\n"
+#~ "            "
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Qty(UoM)"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Pago antes de entrega"
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Ha seleccionado una cantidad de unidades de% d.\n"
+#~ "Pero no es compatible con el paquete seleccionado.\n"
+#~ "Aquí es una propuesta de las cantidades de acuerdo con el envase:\n"
+#~ "EAN: Cantidad% s:% s Tipo de UL:% s"
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr ""
+#~ "Esta herramienta le ayudará a instalar el módulo de la derecha y configurar "
+#~ "el sistema según el método que se utiliza para facturar a sus clientes."
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Configure su sistema de facturación"
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Política de factura"
+
+#~ msgid "Print Order"
+#~ msgstr "Imprimir pedido"
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Método principal basado en"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Orden de venta creada en el año en curso"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "No se ha encontrado una línea de tarifa que concuerde con este producto y "
+#~ "cantidad.\n"
+#~ "Debe cambiar el producto, la cantidad o la tarifa."
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "¡No es suficiente stock! : "
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Ordenes de ventas creadas en el último mes"
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Entregar factura y en la demanda"
diff --git a/addons/sale/i18n/es_EC.po b/addons/sale/i18n/es_EC.po
index 5e00d1d5790..aea3cc6ef82 100644
--- a/addons/sale/i18n/es_EC.po
+++ b/addons/sale/i18n/es_EC.po
@@ -6,21 +6,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2010-12-21 04:49+0000\n"
 "Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Facturar por adelantado"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar petición"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha de confirmación"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Agroupar por ..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -29,62 +177,345 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicación empresa"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_policy:0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Estado del pedido"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Si no dispone de suficientes existencias para enviarlo todo de una vez, "
-"¿acepta envíos parciales o no?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "A facturar"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Cantidad"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Peticiones"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Día"
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Compañia"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha de facturación"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "El moto a ser facturado por adelantado."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar pedido"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
+msgid "Quotation "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "¡Advertencia!"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección factura"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Volver a Crear factura"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
 
 #. module: sale
 #: report:sale.order:0
@@ -92,65 +523,643 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Cuenta analítica"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Orden de Adquisición"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Empresa"
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Fecha de confirmación"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# of Qty"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Advance Amount"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Plazo de pago por defecto"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Dirección de envío"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "Línea de pedido"
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Orden N°"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas del pedido"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio Total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Peticiones anteriores"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Seleccione para agrupar las facturas del mismo cliente"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando fecha planificada"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades ordenadas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mis Pedidos"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción inválida!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha de petición"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Fecha de orden"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviada"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoría de producto"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre tienda"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impuestos:"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡Cliente no definido!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
 #. module: sale
 #: help:sale.order,invoice_quantity:0
 msgid ""
@@ -167,1195 +1176,9 @@ msgstr ""
 "dedicadas a las tareas asociadas."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Plazo de pago por defecto"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Estado"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Precio Total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Seleccione para agrupar las facturas del mismo cliente"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Cantidades ordenadas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Ventas por Vendedor"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Movimientos de inventario"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referencia del pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Información adicional"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Fechas"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"La factura es creada automáticamente si la politica de envio es 'Factura "
-"from pick' o 'Factura después de la entrega'"
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Descuento (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mis presupuestos"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Dashboard del Gerente de Ventas"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Empaquetado"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nombre tienda"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "¡Cliente no definido!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Ventas en excepción"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Condiciones"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"¡No hay ninguna cuenta de categoría de ingresos definidos por defecto en las "
-"Propiedades de la categoría de producto o la Posición Fiscal no está "
-"definida!"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Está intentando asignar un lote que no es del mismo producto"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "modo invalido para test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junio"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estadística de las ordenes de pedido"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octubre"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Peticiones"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Número de días entre la confirmación del pedido y el envío de los productos "
-"al cliente."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Fecha de petición"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Número paquetes"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En proceso"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Seleccione un producto de tipo servicio llamado 'Producto Avanzado'. Es "
-"posible que necesite crearlo y fijarlo como valor por defecto de este campo."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Orden de entrega"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Fecha de confirmación"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Ubicación empresa"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Dirección factura:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Dirección factura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Buscar líneas no facturadas"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Petición / Pedido"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de líneas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Orden N°"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Líneas del pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Base imponible"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Líneas a facturar"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Cantidad (UdM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Fecha de creación"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Líneas no facturadas y entregadas"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Mis Pedidos"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "¡Acción inválida!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Información extra"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Tarifa"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# of Qty"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Fecha de orden"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Enviada"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Todas las peticiones"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septiembre"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Categoría de producto"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Impuestos:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Movimientos de stock"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Estado del pedido"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Ventas Mensuales"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr ""
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Días de seguridad"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Abastecimiento de material sólido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Crear factura final"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Dirección de envío"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepción"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Compañias"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Historial"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Su referencia"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "El nombre y dirección del contacto que solicitó la orden o petición"
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Son los días agregados que garantiza a los clientes por razones de seguridad"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Ctdad"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referencias"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Crear factura"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Total de impuestos excluidos"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "¡La factura fue creada exitosamente!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Ventas por empresa"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Contacto que realiza el pedido"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Factura pendiente"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forzar asignación"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "bajo pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Basado en el envío o en las cantidades ordenadas."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Paquete relacionado"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Dirección de envío"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Crear orden de entrega"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total de impuestos incluidos"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Crear paquete de productos"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Ventas por categoría de producto"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar petición"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Agroupar por ..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Volver a Crear factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Entregas a facturar"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Esperando fecha planificada"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Método de abastecimiento"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Paquete de productos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Documento del movimiento de la salida o del cliente."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Validar"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Confirmar pedido"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Crear orden de abastecimiento"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impuestos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Movimiento de stock"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Advance Amount"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Cantidades enviadas"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Factura basada en pedidos de venta"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Paquete de productos"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "¡Error!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julio"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Abastecimiento"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepción de envío"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupo de facturas"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Para ser reviado por el cliente."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
@@ -1364,14 +1187,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Crear factura de la línea de pedido"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Excepción de factura"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Medios de abastecimiento y facturación"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1379,553 +1197,10 @@ msgid "Paid"
 msgstr "Pagado"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Análisis de ventas"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recrear Picking"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Propiedades"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Peticiones"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"El vendedor crea una factura manualmente, si la política de envío de las "
-"ordenes de pedido is 'Envío manual en proceso'. La factura es creada "
-"automáticamente si la política de envío es 'Pago antes de entrega'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Puede generar facturas en base a las ordenes de pedido o en base a los "
-"envíos."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Ventas"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Precio por unidad"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Realizado"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Por hacer"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Política para paquetes de productos"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documento del movimiento para el cliente."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mes"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Cancelar asignación"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturar las"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Fecha de pedido"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV del producto"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual en proceso"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "UdM del producto"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logística"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Orden"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorar excepción"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"¡Planea vender %.2f %s pero solo dispone de  %.2f %s!\n"
-"El stock real es %.2f %s. (sin reservaciones)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Estados"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referencia del cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Precio"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Dependiendo de la configuración de la salida, el movimiento entre el lugar "
-"de salida y el cliente es realizado através de la orden de entrega "
-"manualmente o automáticamente."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "A facturar"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Compañia"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fecha de facturación"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "El moto a ser facturado por adelantado."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crear facturas"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total neto:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelado"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Tienda"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Fecha de confirmación"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Advertencia"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Ventas por mes"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Pedido de venta"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Cantidad (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Líneas de factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Líneas de pedido"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Tiempo de entrega"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuración"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Diciembre"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Imagen"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "No facturada"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Vendedor"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Peticiones anteriores"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Base imponible"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Facturar por adelantado"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Borrador"
-
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1940,6 +1215,18 @@ msgid ""
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de ventas"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupo de facturas"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -1947,55 +1234,169 @@ msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estado"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
 msgstr ""
 
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Medios de abastecimiento y facturación"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Pedidos de ventas"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Orden"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadística de las ordenes de pedido"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Noviembre"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Producto avanzado"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El vendedor crea una factura manualmente, si la política de envío de las "
+"ordenes de pedido is 'Envío manual en proceso'. La factura es creada "
+"automáticamente si la política de envío es 'Pago antes de entrega'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
 
 #. module: sale
@@ -2008,88 +1409,323 @@ msgstr "Enero"
 msgid "Sales Order in Progress"
 msgstr "Pedidos de ventas en proceso"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Retraso de entrega"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Asignar"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Fecha de pedido"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr ""
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas de pedido"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "desde stock"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Día"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Cerrado"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio por unidad"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Dirección factura:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Entregado"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Peticiones"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Debe asignar un lote de producción para este producto"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Por hacer"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análisis de ventas"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
@@ -2098,17 +1734,152 @@ msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Descripción"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Mayo"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Información adicional"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Ctdad"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser reviado por el cliente."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Petición / Pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Cliente"
@@ -2123,45 +1894,190 @@ msgstr ""
 msgid "February"
 msgstr "Febrero"
 
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar las"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha de pedido"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Abril"
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Contabilidad"
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Search Sales Order"
 msgstr "Buscar pedidos de ventas"
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1255
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "Not enough stock ! : "
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Plazo de pago"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2170,19 +2086,61 @@ msgid "Quotation N°"
 msgstr "Petición N°"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencia del cliente"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Enviada"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Año"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Facturar desde albaranes"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total de impuestos incluidos"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
 
 #~ msgid "Partial Delivery"
 #~ msgstr "Envío parcial"
@@ -2190,6 +2148,19 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Recreate Procurement"
 #~ msgstr "Recrear abastecimiento"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Orden de entrega"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Si no dispone de suficientes existencias para enviarlo todo de una vez, "
+#~ "¿acepta envíos parciales o no?"
+
+#~ msgid "from stock"
+#~ msgstr "desde stock"
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Pasos para entregar un pedido de venta"
 
@@ -2199,9 +2170,18 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Declaración automática"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Cambiar a borrador"
+
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Entrega, desde el almacén hasta el cliente."
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Crear factura"
 
@@ -2212,15 +2192,24 @@ msgstr "Facturar desde albaranes"
 #~ "Cuando presiona el botón Confirmar, el estado Borrador cambia a Manual. es "
 #~ "decir, el presupuesto cambia a pedido de venta."
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Movimientos de inventario"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Designación manual"
 
+#~ msgid "Notes"
+#~ msgstr "Notas"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Facturar después del envío"
 
 #~ msgid "Shipping Policy"
 #~ msgstr "Política de facturación"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Excepción de envío"
+
 #~ msgid "Origin"
 #~ msgstr "Origen"
 
@@ -2239,6 +2228,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Procure Method"
 #~ msgstr "Método abastecimiento"
 
+#~ msgid "Extra Info"
+#~ msgstr "Información extra"
+
 #~ msgid "Net Price"
 #~ msgstr "Precio neto"
 
@@ -2260,9 +2252,24 @@ msgstr "Facturar desde albaranes"
 #~ msgid "All Sales Order"
 #~ msgstr "Todos los pedidos de ventas"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Cantidades enviadas"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Factura basada en pedidos de venta"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Tienda de ventas"
 
+#~ msgid "Warehouse"
+#~ msgstr "Almacén"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Forzar asignación"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Base imponible"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2286,12 +2293,21 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Manual Description"
 #~ msgstr "Descripción manual"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Cantidad (UdM)"
+
 #~ msgid "Sale Order Procurement"
 #~ msgstr "Abastecimiento pedido de venta"
 
 #~ msgid "Packing"
 #~ msgstr "Empaquetado/Albarán"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Confirmar pedido"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuración"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Facturar pedido después del envío"
 
@@ -2313,6 +2329,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Sales orders"
 #~ msgstr "Pedidos de ventas"
 
+#~ msgid "Procurement"
+#~ msgstr "Abastecimiento"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Cuentas de pago"
 
@@ -2337,6 +2356,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Política de envío por defecto"
 
+#~ msgid "Packaging"
+#~ msgstr "Empaquetado"
+
 #~ msgid "Sales Management"
 #~ msgstr "Ventas"
 
@@ -2375,6 +2397,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Sales Configuration"
 #~ msgstr "Configuración de ventas"
 
+#~ msgid "on order"
+#~ msgstr "bajo pedido"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "Abastecimiento corregido"
 
@@ -2387,9 +2412,6 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Configurar la logística de los pedidos de venta"
 
-#~ msgid "Status"
-#~ msgstr "Estado"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Forma de envío"
 
@@ -2408,6 +2430,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Direct Delivery"
 #~ msgstr "Envío directo"
 
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
+
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
@@ -2416,15 +2441,18 @@ msgstr "Facturar desde albaranes"
 #~ "confirmado el pedido de venta. Esta transacción convierte el pedido de venta "
 #~ "a facturas."
 
+#~ msgid "Compute"
+#~ msgstr "Calcular"
+
+#~ msgid "Assign"
+#~ msgstr "Asignar"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Sólo orden de entrega"
 
 #~ msgid "Sales order lines"
 #~ msgstr "Líneas del pedido de ventas"
 
-#~ msgid "Sequence"
-#~ msgstr "Secuencia"
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Se crea un albarán de salida OUT para productos almacenables."
 
@@ -2445,6 +2473,12 @@ msgstr "Facturar desde albaranes"
 #~ "establece cuando se confirma la factura pero se espera a que el planificador "
 #~ "procese el pedido en la fecha 'Fecha del pedido'."
 
+#~ msgid "UoM"
+#~ msgstr "UdM"
+
+#~ msgid "Number Packages"
+#~ msgstr "Número paquetes"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2488,12 +2522,21 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Sale Invoice"
 #~ msgstr "Factura de venta"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Abrir anticipo factura"
 
+#~ msgid "Ordering Contact"
+#~ msgstr "Contacto que realiza el pedido"
+
 #~ msgid "Deliver"
 #~ msgstr "Enviar"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Cancelar asignación"
+
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Facturar desde el albarán"
 
@@ -2508,8 +2551,8 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Tarifas de compra"
 
-#~ msgid "Sale Order"
-#~ msgstr "Pedido de venta"
+#~ msgid "Name"
+#~ msgstr "Nombre"
 
 #~ msgid "New Quotation"
 #~ msgstr "Nuevo presupuesto"
@@ -2517,6 +2560,9 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Total amount"
 #~ msgstr "Importe total"
 
+#~ msgid "Product UoM"
+#~ msgstr "UdM del producto"
+
 #~ msgid ""
 #~ "By default, Open ERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2552,12 +2598,24 @@ msgstr "Facturar desde albaranes"
 #~ "El mismo pedido puede haberse facturado varias veces (por ejemplo por cada "
 #~ "línea)."
 
+#~ msgid "States"
+#~ msgstr "Estados"
+
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Después de confirmar el pedido, crear la factura."
 
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Error: Código EAN erróneo"
 
+#~ msgid "Accounting"
+#~ msgstr "Contabilidad"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Facturar desde albaranes"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Movimientos de stock"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Mis pedidos de ventas"
 
@@ -2567,17 +2625,55 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nombre de modelo no válido en la definición de la acción."
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "¡Advertencia!"
+
 #~ msgid "VAT"
 #~ msgstr "VAT"
 
+#~ msgid "Procurement Order"
+#~ msgstr "Orden de Adquisición"
+
+#~ msgid "Order Line"
+#~ msgstr "Línea de pedido"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr ""
 #~ "Configurar la Politica de paquete de productos de los pedidos de ventas"
 
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Dates"
+#~ msgstr "Fechas"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "La factura es creada automáticamente si la politica de envio es 'Factura "
+#~ "from pick' o 'Factura después de la entrega'"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Dashboard del Gerente de Ventas"
+
 #, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "¡No se puede cancelar la orden de pedido!"
 
+#~ msgid "Conditions"
+#~ msgstr "Condiciones"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "¡No hay ninguna cuenta de categoría de ingresos definidos por defecto en las "
+#~ "Propiedades de la categoría de producto o la Posición Fiscal no está "
+#~ "definida!"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Permite calcular los costos de envío en las peticiones."
 
@@ -2596,6 +2692,13 @@ msgstr "Facturar desde albaranes"
 #~ msgid "You cannot cancel a sale order line that has already been invoiced !"
 #~ msgstr "¡No puede cancelar una línea de pedido que ya fue facturada!"
 
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Seleccione un producto de tipo servicio llamado 'Producto Avanzado'. Es "
+#~ "posible que necesite crearlo y fijarlo como valor por defecto de este campo."
+
 #, python-format
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "¡No es posible cancelar esta orden de pedido!"
@@ -2604,18 +2707,48 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "¡No es posible eliminar ordenes de pedidos que fueron confirmadas!"
 
+#~ msgid "Lines to Invoice"
+#~ msgstr "Líneas a facturar"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr ""
 #~ "Provee algunas características para mejorar los reportes de las ordenes de "
 #~ "pedido."
 
+#~ msgid "All Quotations"
+#~ msgstr "Todas las peticiones"
+
 #~ msgid "  Year  "
 #~ msgstr "  Año  "
 
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "¿Está seguro de crear la(s) factura(s)?"
 
+#~ msgid "Sales By Month"
+#~ msgstr "Ventas Mensuales"
+
+#~ msgid "Security Days"
+#~ msgstr "Días de seguridad"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Abastecimiento de material sólido"
+
+#~ msgid "Companies"
+#~ msgstr "Compañias"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "El nombre y dirección del contacto que solicitó la orden o petición"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Son los días agregados que garantiza a los clientes por razones de seguridad"
+
+#~ msgid "References"
+#~ msgstr "Referencias"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Fechas de las ordenes de pedido"
 
@@ -2625,15 +2758,57 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Márgenes en ordenes de pedido"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Total de impuestos excluidos"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Factura pendiente"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Aplicación de configuración de Ventas"
 
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Basado en el envío o en las cantidades ordenadas."
+
+#~ msgid "Related Picking"
+#~ msgstr "Paquete relacionado"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Crear orden de entrega"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "¡Planea vender %.2f %s pero solo dispone de  %.2f %s!\n"
+#~ "El stock real es %.2f %s. (sin reservaciones)"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Costos de entrega"
 
+#~ msgid "Create Pick List"
+#~ msgstr "Crear paquete de productos"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Ventas por categoría de producto"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Entregas a facturar"
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "modo invalido para test_state"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Método de abastecimiento"
+
 #~ msgid "title"
 #~ msgstr "título"
 
+#~ msgid "Pick List"
+#~ msgstr "Paquete de productos"
+
 #~ msgid "Order date"
 #~ msgstr "Fecha de pedido"
 
@@ -2643,6 +2818,22 @@ msgstr "Facturar desde albaranes"
 #~ "Ésta es la lista de paquete de productos que se han generado para esta "
 #~ "factura"
 
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Documento del movimiento de la salida o del cliente."
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Crear orden de abastecimiento"
+
+#~ msgid "Stock Move"
+#~ msgstr "Movimiento de stock"
+
+#~ msgid "Picking List"
+#~ msgstr "Paquete de productos"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "¡Error!"
+
 #, python-format
 #~ msgid "Picking Information !"
 #~ msgstr "¡Información de Paquete de productos!"
@@ -2658,15 +2849,42 @@ msgstr "Facturar desde albaranes"
 #~ "comunes métodos de entrega de productos al cliente en una o dos operaciones "
 #~ "del trabajador."
 
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Puede generar facturas en base a las ordenes de pedido o en base a los "
+#~ "envíos."
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Paquete de productos y Orden de entrega"
 
+#~ msgid "Picking Policy"
+#~ msgstr "Política para paquetes de productos"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Documento del movimiento para el cliente."
+
 #~ msgid "Invoicing"
 #~ msgstr "Facturación"
 
+#~ msgid "Logistic"
+#~ msgstr "Logística"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Dependiendo de la configuración de la salida, el movimiento entre el lugar "
+#~ "de salida y el cliente es realizado através de la orden de entrega "
+#~ "manualmente o automáticamente."
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -2681,6 +2899,13 @@ msgstr "Facturar desde albaranes"
 #~ msgid "   Month   "
 #~ msgstr "   Mes   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Advertencia"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Tiempo de entrega"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Mes-1    "
 
@@ -2693,6 +2918,12 @@ msgstr "Facturar desde albaranes"
 #~ "entregar lo antes posible cuando un producto está disponible o esperar que "
 #~ "todos los productos esten disponibles."
 
+#~ msgid "Image"
+#~ msgstr "Imagen"
+
+#~ msgid "Salesman"
+#~ msgstr "Vendedor"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Progreso de configuración"
 
@@ -2708,9 +2939,22 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Shipped Qty"
 #~ msgstr "Cantidad enviada"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "¡La factura fue creada exitosamente!"
+
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Diseño mejorado de pedido de venta"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Error"
+
+#~ msgid "Close"
+#~ msgstr "Cerrado"
+
+#~ msgid "Delivered"
+#~ msgstr "Entregado"
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "!Stock insuficiente!"
@@ -2738,8 +2982,48 @@ msgstr "Facturar desde albaranes"
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Configurar logística pedidos de venta"
 
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/a)"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Ventas por Vendedor"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Está intentando asignar un lote que no es del mismo producto"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Número de días entre la confirmación del pedido y el envío de los productos "
+#~ "al cliente."
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Recrear Picking"
+
 #~ msgid "Configure"
 #~ msgstr "Configurar"
 
+#~ msgid "Create Final Invoice"
+#~ msgstr "Crear factura final"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Ventas por empresa"
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "¡Error! No puede crear compañías recursivas."
+
+#~ msgid "Sales by Month"
+#~ msgstr "Ventas por mes"
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Configurar su aplicación de gestión de ventas"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Debe asignar un lote de producción para este producto"
diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po
index 198da08f9ed..d1f91a7c936 100644
--- a/addons/sale/i18n/et.po
+++ b/addons/sale/i18n/et.po
@@ -6,67 +6,52 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2011-10-11 18:12+0000\n"
 "Last-Translator: Aare Vesi <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Tarnetellimus"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Korralduse read"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Maksustamata summa"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Vigane tegevus !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Sea mustandiks"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Korraldus"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Staatused"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
 msgid "Untaxed Amount"
 msgstr "Maksustamata summa"
 
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Korralduse read"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Vigane tegevus !"
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Müügitellimused"
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Korraldus"
+
 #~ msgid "Sales orders"
 #~ msgstr "Müügitellimused"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Tarnetellimus"
+
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
@@ -80,12 +65,169 @@ msgstr "Müügitellimused"
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Seda müügitellimust ei saa tühistada !"
 
+#~ msgid "Untaxed amount"
+#~ msgstr "Maksustamata summa"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Sea mustandiks"
+
+#~ msgid "States"
+#~ msgstr "Staatused"
+
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Ostu hinnakirjad"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Ettemaksuarve"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Kinnita hinnapakkumine"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
@@ -96,62 +238,340 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Korralduse olek"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Kas sa aktsepteerid osalist tarnimist, kui sul pole piisavalt laovarusid, et "
-"tarnida kõik korraga."
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Kogus"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Arveldamata ja kohaletoimetatud read"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Arve erand"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analüütiline konto"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Vahesumma"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
 msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Tühista korraldus"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Kaal"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
+msgid "Quotation "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Hoiatus!"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Müügikorraldus"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Maksud"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Netosumma:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Kokku"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Pood"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Müügid erandis"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Arve aadress"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Loo arve uuesti"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -159,73 +579,100 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analüütiline konto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Ridade arv"
+
+#. module: sale
+#: help:sale.order,message_summary:0
 msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faks :"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "Korralduse rida"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+msgid "(update)"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Kogus (TÜ)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Kinnitatud"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
 msgstr ""
 
 #. module: sale
@@ -234,39 +681,151 @@ msgid "Default Payment Term"
 msgstr "Vaikimisi maksetähtaeg"
 
 #. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Kinnita"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Tarneaadress"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
 #: view:sale.report:0
-msgid "State"
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Korraldus Nr."
+
 #. module: sale
 #: report:sale.order:0
 msgid "Disc.(%)"
 msgstr "Allah. (%)"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Korralduse viide"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Arve read"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr "Hind kokku"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Ootegraafik"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
 msgstr ""
 
 #. module: sale
@@ -276,448 +835,25 @@ msgstr "Tellitud kogused"
 
 #. module: sale
 #: view:sale.report:0
-msgid "Sales by Salesman"
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Inventuuri liikumised"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Korralduse viide"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Kuupäevad"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Allahindlus (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Minu hinnapakkumised"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Pakendamine"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Poe nimi"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Klienti pole määratud!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Müügid erandis"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "vigane viis test_olekule"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
 msgstr ""
 
 #. module: sale
+#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-msgid "TVA :"
-msgstr "KM:"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Finantspositsioon"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "MÜ"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Pakkide arv"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Töös"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Märkmed"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Arveldatud"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Tarneklausel"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Vahesumma"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Arve aadress :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Arve aadress"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Hinnapakkumine / Korraldus"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Ridade arv"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Ladu"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Korraldus Nr."
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
 #: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Kogus (MÜ)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Arveldamata ja kohaletoimetatud read"
+msgid "Quantity"
+msgstr "Kogus"
 
 #. module: sale
 #: report:sale.order:0
@@ -730,25 +866,85 @@ msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Täiendav info"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Finantspositsioon"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Hinnakiri"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
+#: selection:sale.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1327
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
 #, python-format
-msgid "Hour"
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
 msgstr ""
 
 #. module: sale
@@ -757,101 +953,401 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Kõik hinnapakkumised"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Allahindlus (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Minu hinnapakkumised"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
-msgid "September"
+msgid "December"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:632
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Kuu"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Järjekord"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
 msgid "Category of Product"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Poe nimi"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
 msgstr "Maksud :"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Lao liikumised"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Korralduse olek"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
+#: code:addons/sale/sale.py:658
 #, python-format
-msgid "Could not cancel sales order line!"
+msgid "Invoice has been <b>paid</b>."
 msgstr ""
 
 #. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Töös"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Klienti pole määratud!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Loo arved"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Mustand"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Tasutud"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupeeri arved"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Staatus"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Tarneaadress"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
 
 #. module: sale
-#: help:sale.order,shipped:0
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
 msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
 msgstr ""
 
 #. module: sale
@@ -859,46 +1355,156 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Ettemaksu toode"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Erand"
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
+#: selection:sale.report,month:0
+msgid "October"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,state:0
+#: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1272
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Edenemisel müügikorraldused"
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:958
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "History"
 msgstr "Ajalugu"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
 
 #. module: sale
@@ -915,26 +1521,100 @@ msgid "Your Reference"
 msgstr "Teie viide"
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: field:sale.report,date:0
+msgid "Date Order"
 msgstr ""
 
 #. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Hinnakiri"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "KM:"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "Kogus"
+msgid "Sales Order Lines"
+msgstr "Müügikorralduste read"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Müügid"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "References"
-msgstr ""
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Arved"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Ühiku hind"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Arve aadress :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Arve"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -943,557 +1623,64 @@ msgstr ""
 
 #. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "Tühista"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Hinnapakkumine"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Loo arve"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Tellija kontakt"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Sunni omistamine"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "korraldusel"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nimi"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Tarneaadress :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Kinnita hinnapakkumine"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Viga"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Loo arve uuesti"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Ootegraafik"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Valideeri"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Kinnita korraldus"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Maksud"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faks :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Saadetud kogused"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Arve müügikorralduste põhjal"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Viga !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Hankimine"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Kohaletoimetamise erand"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupeeri arved"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Arve erand"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Tasutud"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Omadused"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Hinnapakkumine"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Müügid"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Ühiku hind"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Valmis"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Arve"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
 #. module: sale
@@ -1502,61 +1689,232 @@ msgid "To Do"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Tarneaadress :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Loo arve"
+
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:604
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:822
 #, python-format
-msgid "You must first cancel all picking attached to this sales order."
+msgid "You cannot cancel a sale order line that has already been invoiced!"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Kuu"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "Toode"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Tühista omistamine"
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
+#: report:sale.order:0
+msgid "Description"
+msgstr "Kirjeldus"
 
 #. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Hind"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Kogus"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Hinnapakkumine / Korraldus"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Klient"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: sale
@@ -1564,6 +1922,17 @@ msgstr ""
 msgid "Invoice on"
 msgstr "Arve alus"
 
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
@@ -1574,26 +1943,98 @@ msgstr "Tellimise kuupäev"
 msgid "Product UoS"
 msgstr "Toote TÜ"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Edenemisel käsitsi"
 
 #. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Toote MÜ"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#: code:addons/sale/sale.py:643
 #, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
 msgstr ""
 
 #. module: sale
@@ -1611,550 +2052,55 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1251
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
 msgstr ""
 
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Kokku"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Hind"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Loo arved"
-
 #. module: sale
 #: report:sale.order:0
-msgid "Net Total :"
-msgstr "Netosumma:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Pood"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Kogus (TÜ)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Kinnitatud"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Kinnita"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Arve read"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Müügikorralduste read"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr ""
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Seadistused"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Kaal"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Arved"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Müügimees"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Ettemaksuarve"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Mustand"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Ettemaksu toode"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Arvuta"
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Edenemisel müügikorraldused"
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Omista"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "laost"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Sulge"
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
-msgid "Description"
-msgstr "Kirjeldus"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Klient"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr ""
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Raamatupidamine"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
-#, python-format
-msgid "Not enough stock ! : "
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Maksetingimus"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2163,23 +2109,68 @@ msgid "Quotation N°"
 msgstr "Hinnapakkumine Nr"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Nopitud"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Arve kohaletoimetamiste põhjal"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Arveldatud"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
 
 #~ msgid "Sales Configuration"
 #~ msgstr "Müükide seadistused"
 
+#~ msgid "Configuration"
+#~ msgstr "Seadistused"
+
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Minu müügitellimused mis ootavad arvet"
 
@@ -2193,6 +2184,12 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "sinu arve on loodud !"
 
+#~ msgid "Validate"
+#~ msgstr "Valideeri"
+
+#~ msgid "Notes"
+#~ msgstr "Märkmed"
+
 #~ msgid "Origin"
 #~ msgstr "Päritolu"
 
@@ -2202,24 +2199,39 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Procure Method"
 #~ msgstr "Hankimise viis"
 
+#~ msgid "Extra Info"
+#~ msgstr "Täiendav info"
+
 #~ msgid "Net Price"
 #~ msgstr "Netohind"
 
+#~ msgid "Warehouse"
+#~ msgstr "Ladu"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Vigane XML vaate arhitektuurile!"
 
+#~ msgid "Procurement"
+#~ msgstr "Hankimine"
+
+#~ msgid "All Quotations"
+#~ msgstr "Kõik hinnapakkumised"
+
 #~ msgid "Canceled"
 #~ msgstr "Tühistatud"
 
+#~ msgid "Salesman"
+#~ msgstr "Müügimees"
+
 #~ msgid "Sale Procurement"
 #~ msgstr "Müügihange"
 
-#~ msgid "Status"
-#~ msgstr "Staatus"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Müügi Hinnakirjad"
 
+#~ msgid "Compute"
+#~ msgstr "Arvuta"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -2231,6 +2243,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Make invoices"
 #~ msgstr "Loo arved"
 
+#~ msgid "Name"
+#~ msgstr "Nimi"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Osaline kohaletoimetamine"
 
@@ -2243,6 +2258,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
 
+#~ msgid "from stock"
+#~ msgstr "laost"
+
 #~ msgid ""
 #~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
 #~ "is, quotation is moved to  sale order."
@@ -2254,6 +2272,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "See on nimekiri noppelehtedest, mis on genereeritud sellele arvele."
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Inventuuri liikumised"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Saatmispoliitika"
 
@@ -2283,12 +2304,24 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "All at Once"
 #~ msgstr "Kõik korraga"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Saadetud kogused"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Arve müügikorralduste põhjal"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Müügikauplus"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Kogus (MÜ)"
+
 #~ msgid "Manual Description"
 #~ msgstr "Manuaalne kirjeldus"
 
+#~ msgid "Force Assignation"
+#~ msgstr "Sunni omistamine"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2303,6 +2336,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ "Kui sa valid Tarnepoliitikaks 'Automaatne arve pärast tarnimist' siis arve "
 #~ "luuakse automaatselt pärast tarnimist."
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Viga: TÜ kategooria peab erinema MÜ kategooriast"
 
@@ -2312,6 +2348,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Payment accounts"
 #~ msgstr "Maksekontod"
 
+#~ msgid "Order Line"
+#~ msgstr "Korralduse rida"
+
 #~ msgid "Manages the delivery and invoicing progress"
 #~ msgstr "Haldab tarne ja arveldamise edenemist"
 
@@ -2327,12 +2366,18 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Draft Invoice"
 #~ msgstr "Arve mustand"
 
+#~ msgid "Close"
+#~ msgstr "Sulge"
+
 #~ msgid "Procurement for each line"
 #~ msgstr "Hankimine igale reale"
 
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Tarnimise vaikimisi poliitika"
 
+#~ msgid "Packaging"
+#~ msgstr "Pakendamine"
+
 #~ msgid "Sales Process"
 #~ msgstr "Müügiprotsess"
 
@@ -2354,6 +2399,10 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Procurement Corrected"
 #~ msgstr "Hange korrastatud"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "vigane viis test_olekule"
+
 #~ msgid "Product sales"
 #~ msgstr "Toote müügid"
 
@@ -2372,6 +2421,16 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Create Advance Invoice"
 #~ msgstr "Loo ettemaksuarve"
 
+#~ msgid "Assign"
+#~ msgstr "Omista"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Viga"
+
+#~ msgid "Properties"
+#~ msgstr "Omadused"
+
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
@@ -2382,15 +2441,15 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Direct Delivery"
 #~ msgstr "Otsetarne"
 
-#~ msgid "Sequence"
-#~ msgstr "Järjekord"
-
 #~ msgid "Make Invoice"
 #~ msgstr "Loo arve"
 
 #~ msgid "Other data"
 #~ msgstr "Muud andmed"
 
+#~ msgid "UoM"
+#~ msgstr "MÜ"
+
 #~ msgid "Do you really want to create the invoices ?"
 #~ msgstr "Kas soovid tõesti luua arved ?"
 
@@ -2406,6 +2465,15 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Quotation (A sale order in draft state)"
 #~ msgstr "Hinnapakkumine (Müügikorraldus mustandi olekus)"
 
+#~ msgid "Incoterm"
+#~ msgstr "Tarneklausel"
+
+#~ msgid "Cancel Assignation"
+#~ msgstr "Tühista omistamine"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Tellija kontakt"
+
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Ava ettemaksuarve"
 
@@ -2428,6 +2496,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Configure Picking Policy for Sale Order"
 #~ msgstr "Seadista noppepoliitika müügikorraldusele"
 
+#~ msgid "Product UoM"
+#~ msgstr "Toote MÜ"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Viga: Vigane EAN kood"
 
@@ -2445,6 +2516,12 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Related invoices"
 #~ msgstr "Seotud arved"
 
+#~ msgid "Accounting"
+#~ msgstr "Raamatupidamine"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Lao liikumised"
+
 #~ msgid "Customer Ref"
 #~ msgstr "Kliendi viide"
 
@@ -2467,6 +2544,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Related Packing"
 #~ msgstr "Seotud pakkimine"
 
+#~ msgid "Number Packages"
+#~ msgstr "Pakkide arv"
+
 #, python-format
 #~ msgid ""
 #~ "You have to select a customer in the sale form !\n"
@@ -2475,6 +2555,13 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ "Sa pead valima kliendi müügivormis!\n"
 #~ "Palun määra üks klient enne toote valimist."
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Kas sa aktsepteerid osalist tarnimist, kui sul pole piisavalt laovarusid, et "
+#~ "tarnida kõik korraga."
+
 #~ msgid "Sales Management"
 #~ msgstr "Müügihaldus"
 
@@ -2502,21 +2589,24 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Sale Order Procurement"
 #~ msgstr "Müügikorralduste hanked"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Kinnita korraldus"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Arve korraldusele pärast kohaletoimetamist"
 
 #~ msgid "Order Ref"
 #~ msgstr "Korralduse viide"
 
+#~ msgid "on order"
+#~ msgstr "korraldusel"
+
 #~ msgid "Confirm sale order and Create invoice."
 #~ msgstr "Kinnita müügikorraldus ja loo arve."
 
 #~ msgid "Sales order lines"
 #~ msgstr "Müügikorralduste read"
 
-#~ msgid "Sale Order"
-#~ msgstr "Müügikorraldus"
-
 #~ msgid "Sale Order Lines"
 #~ msgstr "Müügikorralduse read"
 
@@ -2536,6 +2626,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Invoice after delivery"
 #~ msgstr "Arvelda pärast kohaletoimetamist"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Kohaletoimetamise erand"
+
 #~ msgid "Deliver"
 #~ msgstr "Kohale toimetama"
 
@@ -2545,6 +2638,9 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgid "Packing List & Delivery Order"
 #~ msgstr "Pakkeleht ja kohaletoimetamise korraldus"
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Arve kohaletoimetamiste põhjal"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2569,3 +2665,14 @@ msgstr "Arve kohaletoimetamiste põhjal"
 #~ msgstr ""
 #~ "Seda seadistuse sammu kasutatakse seadmaks vaikimisi tarnimise reeglit, kui "
 #~ "luuakse müügikorraldus"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Viga !"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Hoiatus!"
+
+#~ msgid "Dates"
+#~ msgstr "Kuupäevad"
diff --git a/addons/sale/i18n/fi.po b/addons/sale/i18n/fi.po
index b04b35fdfc5..4986ff589af 100644
--- a/addons/sale/i18n/fi.po
+++ b/addons/sale/i18n/fi.po
@@ -7,20 +7,168 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:33+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Tuntilistan mukaan"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Ennakkolasku"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Vahvista tarjous"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Myynnin työpöytä"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Vahvistuspvm"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Ryhmittely.."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -32,62 +180,345 @@ msgstr ""
 "joita ei ole vielä laskutettu"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Myynnit Myyjittäin viimeisen 90 päivän ajalta"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Jakelukumppani"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Tilauksen vaihe"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Jos varastosaldo ei riitä kaikkien lähettämiseen kerrallaan, hyväksytkö "
-"osittaisen lähettämisen?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Laskutettavaa"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Toimitusosoite tälle tilaukselle"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Päivä jolloin myyntitilaus on vahvistettu"
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Määrä"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Tarjoukset"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Päivä"
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Maaliskuu"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Sopimus/Analyyttinen tili"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Yritys"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Laskun päivämäärä"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Laskuttamattomat ja toimitetut rivit"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Ennakkoon laskutettava määrä."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Poikkeus laskutuksessa"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Kokonaismäärä"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analyyttinen tili"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Välisumma"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Peruuta tilaus"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Tarjous '%s' on muutettu tilaukseksi."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Paino"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Tulosta Tarjous"
+msgid "Quotation "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Varoitus !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Myyntitilaus"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Syyskuu"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Verot"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Veroton määrä"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Yhteensä veroton"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Peruutettu"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Omiin myyntitilauksiin liittyvät myyntitilausrivit"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Yhteensä"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Myymälä"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Myydyt joissa poikkeus toimituksessa"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Laskutusosoite"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Päivä jolloin myyntitilaus on luotu"
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Laskun uudelleenluonti"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Luo laskuja"
 
 #. module: sale
 #: report:sale.order:0
@@ -95,87 +526,100 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Ohjaa hankintatilauksia jokaiselle myyntitilausriville"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analyyttinen tili"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Tässä on lista kaikista laskutettavista myyntitilausriveistä. Voit laskuttaa "
-"myyntitilaukset osittain, riveittäin tai myyntitilauksittain. Et tarvitse "
-"listaa, jos laskutat toimitusmääräyksistä tai jos laskutat myyntiä "
-"koontilaskuilla."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Vahvistus Päivämäärä"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Rivien lukumäärä"
+
+#. module: sale
+#: help:sale.order,message_summary:0
 msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-"Poistaaksesi vahvistetun myyntitilausken sinun pitää ensin peruuttaa se! "
-"Peruuttaaksesi myyntitilauksen, sinun pitää ensin peruuttaa tähän liittyvät "
-"keräily ja lähetysmääräykset."
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Kumppani"
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Toimituksiin perustuva lasku"
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Määrä"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faksi:"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "Tilausrivi"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+msgid "(update)"
 msgstr ""
-"Myyntitilaukset auttavat sinua hallitsemaan tarjouksia ja tilauksia "
-"asiakkailtasi. OpenERP suosittelee että aloitat luomalla tarjouksen. Kun "
-"tarjous on vahvistettu, tarjous muuttuu Tilaukseksi. OpenERP kykenee "
-"käsittelemään usean tyyppisiä tuotteita joten myyntitilaus saattaa "
-"käynnistää tehtäviä, toimituksia, tuotantotilauksia, hankitoja ja niin "
-"edelleen. Myyntitilauksen asetusten perusteella luodaan vedos laskusta, "
-"joten riittää että hyväksyt laskun kun haluat laskuttaa asiakastasi."
 
 #. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Myyntitilaus"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Määrä (myyntiyksikkö)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Myyntitilausrivit jotka ovat 'valmis' tilassa"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Etukäteismäärä"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Vahvistettu"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
 msgstr ""
 
 #. module: sale
@@ -184,20 +628,69 @@ msgid "Default Payment Term"
 msgstr "Oletusmaksuehto"
 
 #. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Perustuu toimitusmääräyksiin"
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Vahvista"
 
 #. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "Työn pääaikayksikkö"
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Toimitusosoite"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Myyntitilausrivit valmiina laskutettaviksi"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Kuukausittainen liikevaihto"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
 #: view:sale.report:0
-msgid "State"
-msgstr "Tila"
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Vuosi"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Myyntitilaus jota ei ole vielä vahvistettu"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Tilaus no."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Tilausrivit"
 
 #. module: sale
 #: report:sale.order:0
@@ -205,19 +698,88 @@ msgid "Disc.(%)"
 msgstr "Alennus (%)"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Tilauksen viite"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Laskurivit"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr "Hinta yhteensä"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Vanhat Tarjoukset"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr "Ruksi laatikko ryhmitelläksesi samalle asiakkaalle menevät laskut."
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Omat myyntitilaukset"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Luo Laskuja"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Tunti"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Luontipäivämäärä"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Odottaa aikataulua"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Laskutusosoite nykyiselle myyntitilaukselle"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -226,481 +788,25 @@ msgstr "Tilatut määrät"
 
 #. module: sale
 #: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Myyjän myynti"
+msgid "Ordered Year of the sales order"
+msgstr "Tilausvuosi myyntitilauksella"
 
 #. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Varastosiirrot"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Tilauksen viite"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Lisätiedot"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Päivämäärät"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"Lasku luodaan automaattisesti jos toimitusmäärityksenä on 'laskuta "
-"keräilystä' tai 'laskuta tilauksesta toimituksen jälkeen'."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "Perustuu tehtävän työhön"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Tarjoukset ja myynnit"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Myynti luo lasku"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Hinnaston varoitus"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Alennus (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Omat tarjoukset"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Myynnin Hallinnan Työtila"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Paketointi"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Myyntitilauksesta"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Myymälän nimi"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Asiakasta ei ole määritetty!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Myydyt joissa poikkeus toimituksessa"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "Konfiguraatio virhe !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Ehdot"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
 msgstr ""
-"Tulokategorian tiliä ei ole määritelty tuotekategorian oletusarvoissa tai "
-"taloudellista asemaa ei ole määritelty !"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Elokuu"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Erä ei ole samaa tuotetta"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "invalid mode for test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Kesäkuu"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Myyntitilausta ei voitu peruuttaa !"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Myyntitilausten Tilastot"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Myyntitilaukseen liitetty analyyttinen tili."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Lokakuu"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "Viitteen tulee olla uniikki yrityskohtaisesti!"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Tarjoukset"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Tilauksessa käytettävä hinnasto."
 
 #. module: sale
+#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-msgid "TVA :"
-msgstr "ALV:"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Päivien määrä tilausvahvistuksesta toimituksen lähettämiseen asiakkaalle."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Tarjouksen Päiväys"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Taloudellinen tilanne"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "Mittayksikkö"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Pakkauksien määrä"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Käynnissä"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Myyntimies vahvistaa tarjouksen. Myyntitilauksen tila muuttuu 'käynnissä' "
-"tai 'manuaalinen käynnissä'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr "Et voi peruuttaa myyntitilausriviä joka on jo laskutettu"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Sinun pitää ensin peruuttaa tähän myyntitilausriviin kiinnitetyt "
-"varastosiirrot."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(ei saatavilla)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Valitse palvelutyyppinen tuote jota kutsutaan 'esitutotteeksi'. Sinun pitää "
-"ehkä luoda se ja asettaa tämän kentän oletusarvoksi."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Puh.:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Et voi tehdä ennakkoa myyntitilaukselle joka on määritelty 'Automaattinen "
-"lasku toimituksen jälkeen'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Huomautukset"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Yrityksen nimen pitää olla uniikki!"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Laskutusosoite nykyiselle myyntitilaukselle"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Edellinen kuukausi"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Myyntitilauksen tilauskuukausi"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr "Et voi ryhmitellä saman kumppanin myyntejä joilla on eri valuuttoja."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Toimita jokainen tuote kun saaatavilla"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Laskutettu"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Toimitusmääräys"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Vahvistuspvm"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Jakelukumppani"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Maaliskuu"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr "Et voi siirtää tuotteita paikkaan tai paikasta tässä näkymässä."
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Perustuu myyntitilauksiin"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Kokonaismäärä"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Välisumma"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Laskutusosoite:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "Rivijärjestys"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Jokaiselle myyntitilausriville luodaan hankintatilaus myydyn tuotteen "
-"hankkimiseksi."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm tarkoittaa 'international commercial terms' kansainväliset "
-"toimitushedot, nämä määrittelevät sarjan myyntiehtoa joita käytetään "
-"kaupankäynnissä."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Laskutusosoite"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Etsi Laskuttamattomia Rivejä"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Tarjous / Tilaus"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Rivien lukumäärä"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Myynti Avaa lasku"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Myyntitilauksen Rivi"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Varasto"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Tilaus no."
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Tilausrivit"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Veroton määrä"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Laskutettavat Rivit"
-
-#. module: sale
 #: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Määrä (mittayksikköä)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Luontipäivämäärä"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Sekalaiset"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Laskuttamattomat ja toimitetut rivit"
+msgid "Quantity"
+msgstr "Määrä"
 
 #. module: sale
 #: report:sale.order:0
@@ -713,33 +819,93 @@ msgid "My Sales"
 msgstr "Omat Myynnit"
 
 #. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
 #, python-format
 msgid "Invalid action !"
 msgstr "Virheellinen toiminto!"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Lisätiedot"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Taloudellinen tilanne"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Hinnasto"
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Heinäkuu"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Määrä"
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1327
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
 #, python-format
-msgid "Hour"
-msgstr "Tunti"
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "EDI hinnasto (%s)"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Tarjouksen Päiväys"
 
 #. module: sale
 #: view:sale.order:0
@@ -747,153 +913,579 @@ msgid "Order Date"
 msgstr "Tilauksen päivämäärä"
 
 #. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Tarjoukset ja myynnit"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Kumppani"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Myynti luo lasku"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Alennus (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Laskua ei voi luoda tälle myyntitilausriville seuraavista syistä:\n"
+"1. Myyntitilausrivin tila on joko luonnos tai peruttu!\n"
+"2. Myyntitilausrivi on laskutettu!"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Myyntitilausrivit valmiit"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Omat tarjoukset"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Joulukuu"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
 msgid "Shipped"
 msgstr "Toimitettu"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Kaikki tarjoukset"
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Kuukausi"
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "Valinnat"
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Syyskuu"
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sarja"
 
 #. module: sale
-#: code:addons/sale/sale.py:632
+#: code:addons/sale/sale.py:591
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
 msgstr "Et voi vahvistaa myyntitilausta, jolla ei ole rivejä."
 
 #. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Sinun pitää valita hinnasto tai asiakas myyntilomakkeella!\n"
-"Ole hyvä ja valitse yksi ennenkuin valitset tuotteen."
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Laskuttamaton"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
 msgid "Category of Product"
 msgstr "Tuotteen Luokka"
 
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Myymälän nimi"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
 msgstr "Verot:"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Varastosiirrot"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Tilauksen vaihe"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Oletko varma, että haluat muodostaa laskun?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Myynnit Kuukausittain"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
+#: code:addons/sale/sale.py:658
 #, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Myyntitilauksen Riviä ei voitu peruuttaa!"
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
 
 #. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Varopäivät"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Myydyn materiaalin hankinta"
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Myynnin ennakkomaksulasku"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Käynnissä"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Asiakasta ei ole määritetty!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Luo laskut"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Myyntiilausrivi tee lasku"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Luonnos"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Maksettu"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Myyntitilaukset"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Yhdistä laskut"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Veron määrä"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Luo lopullinen lasku"
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Tila"
 
 #. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Toimitusosoite"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
-"Merkitsee että myyntitilaus on toimitettu. Tämä kenttä päivitetään vasta kun "
-"ajastimet on laukaistu."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Elokuu"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Ohjaa hankintaa ja laskutusta"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Kesäkuu"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Sähköpostin mallipohjat"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Tilaa"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Hinnaston varoitus"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Myymälä"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Myyntitilausten Tilastot"
 
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr "Päivämäärä"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Myyntitilauksen Rivi"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Marraskuu"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Laajennetut Suotimet..."
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Ennakkotuote"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Poikkeus"
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Yritykset"
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Lokakuu"
 
 #. module: sale
-#: help:sale.order,state:0
+#: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Myyjä luo laskun käsin, jos myyntitilauksen lähetyssäännöt ovat 'toimitus ja "
+"manuaalinen käynnissä'. Lasku luodaan automaattisesti jos lähetyssääntö on "
+"'maksu ennen toimitusta'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1272
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Tammikuu"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Myyntitilaukset käsittelyssä"
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Myyntimies vahvistaa tarjouksen. Myyntitilauksen tila muuttuu 'käynnissä' "
+"tai 'manuaalinen käynnissä'."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Viite dokumenttiin joka loi tämän myyntitilauspyynnön."
+
+#. module: sale
+#: code:addons/sale/sale.py:958
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "Ei löytynyt voimassaolevaa hinnaston riviä! :"
 
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Sitoutumisen viive"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Vahvistetut myyntitilausrivit, ei vielä toimitettu"
+
 #. module: sale
 #: view:sale.order:0
 msgid "History"
 msgstr "Historia"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Laskuta tilaukseta toimituksen jälkeen"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -911,27 +1503,100 @@ msgid "Your Reference"
 msgstr "Viitteenne"
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "Kontaktin nimi ja osoite, joka pyysi tilausta tai tarjousta"
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
-"Nämä päivät lisätään asiakkaalle luvattuun aikaan toimituksen takaamiseksi."
 
 #. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Tilauksen Päiväys"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Hinnasto"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "ALV:"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Asiakkaan laskut"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Laskutettavat vahvistetut myyntitilaukset."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "Määrä"
+msgid "Sales Order Lines"
+msgstr "Myyntitilauksen rivit"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Myynti"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Päivä"
 
 #. module: sale
 #: view:sale.order:0
-msgid "References"
-msgstr "Viitteet"
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Laskut"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Yksikköhinta"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Valmis"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Laskutusosoite:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Lasku"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -940,583 +1605,123 @@ msgstr "Omat myyntitilausrivit"
 
 #. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "Peruuta"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Ei hinnastoa ! : "
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Tarjous"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Etsi Laskuttamattomia Rivejä"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr "Tilausviitteen tulee olla uniikki yrityskohtaisesti!"
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Luo lasku"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Veroton Summa"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Tilausviite"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Lasku on luotu onnistuneesti!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Myynnit Kumppaneittain"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Tilauskontakti"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Avoin Lasku"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr "Lähetä automaattinen vahvistus myyntitilauksesta"
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "Myyntipäiväkirjaa ei ole määritelty tälle yritykselle \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Pakota luovutus"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "tilauksesta"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Perustu joko lähetettyihin tai tilattuihin määriin"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Toimita kaikki tuotteet kerralla"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Liittyvä keräily"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nimi"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Toimitusosoite:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Myynnit Asiakkaittain viimeisen 90 päivän ajalta"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Myyntitilauksen luonnostila"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Luo toimitusmääräin"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr "Ei voida poistaa myyntitilausriviä jonka tila on '%s'!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Verollinen Summa"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Luo Keräyslista"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Myyntitilauksen tilauspäivä"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Myynnit Tuoteluokittain"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Vahvista tarjous"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Virhe"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Ryhmittely.."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Laskun uudelleenluonti"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Laskutettavat toimitukset"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Odottaa aikataulua"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Hankintatapa"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Keräilylista"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Aseta luonnokseksi"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Dokumentti siirrosta kohdepaikkaan tai asiakkalle."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Vahvista"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Vahvista tilaus"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Luo hankintatilaus"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Verot"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Myyntitilaus on valmis laskutettavaksi"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Päivä jolloin myyntitilaus on luotu"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Varastosiirto"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Luo laskuja"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Myyntitilaukset jotka luotu kuluvan kuukauden aikana"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faksi:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Etukäteismäärä"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "Haluatko veloittaa toimituksesta?"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Toimitetut määrät"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Lasku perustuu myyntitilauksiin"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Keräilylista"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Virhe!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Ei voi peruuttaa myyntitilausta !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Tilausvuosi myyntitilauksella"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Heinäkuu"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Hankinta"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Poikkeus toimituksessa"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "Keräilytiedot ! : "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Yhdistä laskut"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "Läskutussäännöt"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "Aseta laskutustapa"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Kirjanpitäjän tarkistettavaksi"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Viitemittayksikkö"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Myyntiilausrivi tee lasku"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Poikkeus laskutuksessa"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Ohjaa hankintaa ja laskutusta"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Maksettu"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Myyntianalyysi"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Luo pakkaus uudelleen"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Ominaisuudet"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Tarjous"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Myyjä luo laskun käsin, jos myyntitilauksen lähetyssäännöt ovat 'toimitus ja "
-"manuaalinen käynnissä'. Lasku luodaan automaattisesti jos lähetyssääntö on "
-"'maksu ennen toimitusta'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr "Voit luoda laskuja myyntitilausten tai toimitusten pohjalta."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Vahvistetut myyntitilausrivit, ei vielä toimitettu"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Asiakkaan laskut"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Myynti"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Yksikköhinta"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Valmis"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Lasku"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Sinun pitää valita asiakas myyntilomakkeella !\n"
-"Ole hyvä ja valitse yksi asiakas enennkuin valitset tuotteen"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Lähdedokumentti"
-
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
 msgstr "Tehtävää"
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Keräilysäännöt"
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Toimitusosoite:"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokumentti siirrosta asiakkaalle"
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr "Et voi ryhmitellä saman kumppanin myyntejä joilla on eri valuuttoja."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Myyntianalyysi"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tilauksessa käytettävä hinnasto."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Luo lasku"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
@@ -1524,55 +1729,192 @@ msgid "The amount without tax."
 msgstr "Määrä ilman veroa."
 
 #. module: sale
-#: code:addons/sale/sale.py:604
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Tilausviite"
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Merkitsee että lasku on maksettu"
+
+#. module: sale
+#: code:addons/sale/sale.py:822
 #, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Sinun pitää ensin peruuttaa kaikki keräilyt jotka liittyvät tähän "
-"myyntitilaukseen."
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr "Et voi peruuttaa myyntitilausriviä joka on jo laskutettu"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Myynnin ennakkomaksulasku"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Kuukausi"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "Tuote"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Peruuta luovutus"
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
+#: report:sale.order:0
+msgid "Description"
+msgstr "Kuvaus"
 
 #. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Kuukausittainen liikevaihto"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Toukokuu"
+
+#. module: sale
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Hinta"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Puh.:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Oletko varma, että haluat muodostaa laskun?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Lisätiedot"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Määrä"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Kirjanpitäjän tarkistettavaksi"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Toimitusosoite tälle tilaukselle"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Tarjous / Tilaus"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Asiakas"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Ennakko"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Helmikuu"
 
 #. module: sale
 #: field:sale.order,invoice_quantity:0
 msgid "Invoice on"
 msgstr "Laskutetaan kun"
 
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
@@ -1583,32 +1925,101 @@ msgstr "Tilauspäivämäärä"
 msgid "Product UoS"
 msgstr "Tuotteen myyntiyksikkö"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Myyntitilauksen luonnostila"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Lähdedokumentti"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Huhtikuu"
+
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Manuaalisessa käsittelyssä"
 
 #. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Tuotteen mittayksikkö"
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistinen"
+msgid "My Sale Orders"
+msgstr "Omat myyntitilaukset"
 
 #. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Order"
-msgstr "Tilaa"
+msgid "Search Sales Order"
+msgstr "Hae myyntitilausta"
 
 #. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Myyntitilauksen tilauskuukausi"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "Tulotiliä ei ole määritelty tälle tuotteelle: \"%s\" (id:%d)"
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Sinun pitää valita hinnasto tai asiakas myyntilomakkeella!\n"
+"Ole hyvä ja valitse yksi ennenkuin valitset tuotteen."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Myyntitilauksesta"
 
 #. module: sale
 #: view:sale.order:0
@@ -1625,580 +2036,55 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1251
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Suunnitelet myyväsi %.2f %s mutta sinulla on vain %.2f %s saatavilla !\n"
-"Todellinen varasto on %.2f %s (ilman varauksia)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Tilat"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Asiakkaan Viite"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Yhteensä"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Hinta"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Riippuen paikan lähtöpisteen määrittelyista, siirto lähetysalueen ja "
-"asiakkaan välillä tehdään toimitusmääräimissä käsin tai automaattisest."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Maksu ennen toimitusta"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Myynnin työpöytä"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Luo Laskuja"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Laskutettavaa"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Päivä jolloin myyntitilaus on vahvistettu"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "Sopimus/Analyyttinen tili"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Yritys"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Laskun päivämäärä"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Ennakkoon laskutettava määrä."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "Tämä on keräilylista joka on luotu tälle myyntitilaukselle."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Luo laskut"
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Myyntitilaukseen liitetty analyyttinen tili."
 
 #. module: sale
 #: report:sale.order:0
-msgid "Net Total :"
-msgstr "Yhteensä veroton"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Peruutettu"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Omiin myyntitilauksiin liittyvät myyntitilausrivit"
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Myymälä"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Vahvistus Päivämäärä"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Varoitus"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Myynnit Kuukausittain"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Myyntitilaus"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Määrä (myyntiyksikkö)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Myyntitilausrivit jotka ovat 'valmis' tilassa"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Vahvistettu"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "Päämetodi perustuu"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Vahvista"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Virhe! Rekursiivisiä yrityksiä ei voi luoda."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Myynnit Tuoteluokittain viimeisen 90 päivän ajalta"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Laskurivit"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Myyntitilauksen rivit"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Toimitusviive"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Asetukset"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI hinnasto (%s)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr "Tulostusjärjestys"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Myyntitilaukset luotu kuluvana vuonna"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Laskua ei voi luoda tälle myyntitilausriville seuraavista syistä:\n"
-"1. Myyntitilausrivin tila on joko luonnos tai peruttu!\n"
-"2. Myyntitilausrivi on laskutettu!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Myyntitilausrivit valmiit"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Paino"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Laskut"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Joulukuu"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Kuva"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Hankintatilaus luodaan automaattisesti kun myyntitilaus on vahvistettu tai "
-"lasku maksettu. Se ohjaa hankintaa ja tuotantoa myyntitilausten parametrien "
-"ja sääntöjen mukaan. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Laskuttamaton"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Myyjä"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Vanhat Tarjoukset"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Veroton määrä"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Ennakkolasku"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "Myyntitilaus '%s' on peruttu."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Luonnos"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Veron määrä"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr "Pakkaukset"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Myyntitilausrivit valmiina laskutettaviksi"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Edellisen kuun luodut myyntitilaukset"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr "Sähköpostin mallipohjat"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Myyntitilaukset"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Myymälä"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Marraskuu"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Ennakkotuote"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Laske"
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
-"Sinun pitää ensin peruuttaa kaikki laskut jotka liittyvät tähän "
-"myyntitilaukseen."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Tammikuu"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Myyntitilaukset käsittelyssä"
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Viite dokumenttiin joka loi tämän myyntitilauspyynnön."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Sitoutumisen viive"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "Toimita ja laskuta pyydettäessä"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr ""
-"Yksi hankintatilaus jokaista myyntitilausriviä kohti ja jokaista komponettia "
-"kohti."
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Luovuta"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Tilauksen Päiväys"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Laskutettavat vahvistetut myyntitilaukset."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Myyntitilaus jota ei ole vielä vahvistettu"
-
-#. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "Myyntitilaus '%s' on asetettu vedokseksi."
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "varastosta"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Sulje"
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Ei hinnastoa ! : "
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Toimitettu"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Tälle tuotteelle pitää määrittää valmistuserä"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "Merkitsee että lasku on maksettu"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
-msgid "Description"
-msgstr "Kuvaus"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Toukokuu"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Asiakas"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Ennakko"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Helmikuu"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Huhtikuu"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Kirjanpito"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Hae myyntitilausta"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Myyntitilausehdotus"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
-#, python-format
-msgid "Not enough stock ! : "
-msgstr "Ei tarpeeksi varastoa ! : "
-
-#. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Maksuehto"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Myyntitilaus on valmis laskutettavaksi"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2207,19 +2093,61 @@ msgid "Quotation N°"
 msgstr "Tarjous no."
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Asiakkaan Viite"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Kerätty"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Vuosi"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Lasku perustuen toimitettuihin"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Verollinen Summa"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Laskutettu"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Myyntitilauksen tilauspäivä"
 
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Vaiheet myyntitilauksen toimittamiseksi"
@@ -2230,6 +2158,12 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Partial Delivery"
 #~ msgstr "Osittaistoimitus"
 
+#~ msgid "from stock"
+#~ msgstr "varastosta"
+
+#~ msgid "Delivery Order"
+#~ msgstr "Toimitusmääräys"
+
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Toimitus varastosta asiakkaalle"
 
@@ -2243,11 +2177,23 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Automaattinen ilmoitus"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Aseta luonnokseksi"
+
+#~ msgid "Validate"
+#~ msgstr "Vahvista"
+
 #~ msgid ""
 #~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
 #~ "is, quotation is moved to  sale order."
 #~ msgstr "Kun painetaan \"Vahvista\", tarjous siirretään myyntitilaukseksi."
 
+#~ msgid "Notes"
+#~ msgstr "Huomautukset"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Varastosiirrot"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Käsin syötetty nimike"
 
@@ -2272,6 +2218,9 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "VAT"
 #~ msgstr "ALV"
 
+#~ msgid "Extra Info"
+#~ msgstr "Lisätiedot"
+
 #~ msgid ""
 #~ "The sale order will automatically create the invoice proposition (draft "
 #~ "invoice). Ordered and delivered quantities may not be the same. You have to "
@@ -2298,6 +2247,9 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "All Sales Order"
 #~ msgstr "Kaikki myyntitilaukset"
 
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Lasku perustuu myyntitilauksiin"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot make an advance on a sale order that is defined as 'Automatic "
@@ -2306,6 +2258,15 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ "Ennakkoa ei voi tehdä myyntitilauksesta johon on määritelty \"Automaattinen "
 #~ "lasku toimituksen jälkeen\"."
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Toimitetut määrät"
+
+#~ msgid "Warehouse"
+#~ msgstr "Varasto"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Pakota luovutus"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2320,6 +2281,13 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ "Kun valitset toimituskäytännöksi \"Automaattinen lasku toimituksen "
 #~ "jälkeen\", lasku luodaan automaattisesti toimituksen jälkeen."
 
+#~ msgid "Untaxed amount"
+#~ msgstr "Veroton määrä"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Virhe!"
+
 #~ msgid "Canceled"
 #~ msgstr "Peruutettu"
 
@@ -2340,9 +2308,18 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Complete Delivery"
 #~ msgstr "Kokonaistoimitus"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Poikkeus toimituksessa"
+
+#~ msgid "Confirm Order"
+#~ msgstr "Vahvista tilaus"
+
 #~ msgid "Total amount"
 #~ msgstr "Yhteensä"
 
+#~ msgid "Configuration"
+#~ msgstr "Asetukset"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Lasku toimituksen jälkeen"
 
@@ -2352,18 +2329,27 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Sale Shop"
 #~ msgstr "Myymälä"
 
+#~ msgid "All Quotations"
+#~ msgstr "Kaikki tarjoukset"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Maksutilit"
 
 #~ msgid "Draft Invoice"
 #~ msgstr "Laskun luonnos"
 
+#~ msgid "Procurement"
+#~ msgstr "Hankinta"
+
 #~ msgid "Sales orders"
 #~ msgstr "Myyntitilaukset"
 
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Toimituksen oletuskäytäntö"
 
+#~ msgid "Order Line"
+#~ msgstr "Tilausrivi"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "Pakkauksen oletuskäytäntö"
 
@@ -2390,9 +2376,15 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ "Tämä asetuksien vaihe asettaa oletus keräilykäytännön myyntitilausta "
 #~ "tehtäessä"
 
+#~ msgid "Salesman"
+#~ msgstr "Myyjä"
+
 #~ msgid "Uninvoiced Lines"
 #~ msgstr "Laskuttamattomat rivit"
 
+#~ msgid "Packaging"
+#~ msgstr "Paketointi"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "Hankinta korjattu"
 
@@ -2411,9 +2403,6 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Sale Procurement"
 #~ msgstr "Myynnin hankinta"
 
-#~ msgid "Status"
-#~ msgstr "Tila"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Pakkauskäytäntö"
 
@@ -2439,29 +2428,39 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ "Lasku luodaan myyntitilauksen vahvistamisen jälkeen kun painetaan \"Luo "
 #~ "lasku\". Tämä toiminto siirtää myyntitilauksen laskutukseen."
 
-#~ msgid "Sale Order"
-#~ msgstr "Myyntitilaus"
-
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Luonnos asiakkaan laskusta tilinpitäjän tarkastettavaksi."
 
 #~ msgid "Sale Pricelists"
 #~ msgstr "Myynnin hinnastot"
 
+#~ msgid "Compute"
+#~ msgstr "Laske"
+
 #~ msgid "Direct Delivery"
 #~ msgstr "Suora toimitus"
 
+#~ msgid "Properties"
+#~ msgstr "Ominaisuudet"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Vain toimitusmääräys"
 
 #~ msgid "Make Invoice"
 #~ msgstr "Luo lasku"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Virhe"
+
 #~ msgid "Sales order lines"
 #~ msgstr "Myyntitilauksen rivit"
 
-#~ msgid "Sequence"
-#~ msgstr "Sarja"
+#~ msgid "Assign"
+#~ msgstr "Luovuta"
+
+#~ msgid "Close"
+#~ msgstr "Sulje"
 
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Pakkaus ULOS luodaan varastoitaville tuotteille."
@@ -2513,9 +2512,18 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Sales order"
 #~ msgstr "Myyntitilaus"
 
+#~ msgid "Ordering Contact"
+#~ msgstr "Tilauskontakti"
+
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Sale Order Line"
 #~ msgstr "Myyntitilausrivi"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Peruuta luovutus"
+
 #~ msgid "Sales Management"
 #~ msgstr "Myynninhallinta"
 
@@ -2525,6 +2533,9 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Ostohinnastot"
 
+#~ msgid "Name"
+#~ msgstr "Nimi"
+
 #~ msgid ""
 #~ "The name and address of the contact that requested the order or quotation."
 #~ msgstr "Tilauksen tai tarjouksen pyytäneen kontaktin nimi ja osoite."
@@ -2535,6 +2546,9 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Make invoices"
 #~ msgstr "Luo laskut"
 
+#~ msgid "on order"
+#~ msgstr "tilauksesta"
+
 #, python-format
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Vahvistettuja myyntitilauksia ei voi poistaa!"
@@ -2551,6 +2565,15 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Payment Terms"
 #~ msgstr "Maksuehdot"
 
+#~ msgid "States"
+#~ msgstr "Tilat"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Varastosiirrot"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Lasku perustuen toimitettuihin"
+
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Maksu ennen toimitusta"
 
@@ -2563,6 +2586,9 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Virhe: Myyntiyksikkö täytyy olla eri kategoriassa kuin mittayksikkö"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Määrä (mittayksikköä)"
+
 #~ msgid ""
 #~ "By default, Open ERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2574,10 +2600,17 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ "yksinkertaisimmille tavoille toimittaa tuotteet asiakkaalle yhdessä tai "
 #~ "kahdessa työvaiheessa."
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #, python-format
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Myyntitilausta ei voitu peruuttaa!"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "invalid mode for test_state"
+
 #~ msgid ""
 #~ "This is the list of invoices that have been generated for this sale order. "
 #~ "The same sale order may have been invoiced in several times (by line for "
@@ -2609,6 +2642,19 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "My sales order in progress"
 #~ msgstr "Omat myyntitilaukset käsittelyssä"
 
+#~ msgid "UoM"
+#~ msgstr "Mittayksikkö"
+
+#~ msgid "Product UoM"
+#~ msgstr "Tuotteen mittayksikkö"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Jos varastosaldo ei riitä kaikkien lähettämiseen kerrallaan, hyväksytkö "
+#~ "osittaisen lähettämisen?"
+
 #~ msgid "Customer Ref"
 #~ msgstr "Asiakkaan viite"
 
@@ -2618,6 +2664,9 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Virheellinen mallin nimi toimenpiteen määrittelyssä."
 
+#~ msgid "Accounting"
+#~ msgstr "Kirjanpito"
+
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Lasku pakkauksesta"
 
@@ -2633,6 +2682,9 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "You cannot cancel a sale order line that has already been invoiced !"
 #~ msgstr "Et vo perua myyntitilauksen riviä joka on jo laskutettu!"
 
+#~ msgid "Number Packages"
+#~ msgstr "Pakkauksien määrä"
+
 #, python-format
 #~ msgid ""
 #~ "You have to select a customer in the sale form !\n"
@@ -2679,96 +2731,369 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Other data"
 #~ msgstr "Muut tiedot"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Varoitus !"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Tarjous '%s' on muutettu tilaukseksi."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Myyntitilaukset auttavat sinua hallitsemaan tarjouksia ja tilauksia "
+#~ "asiakkailtasi. OpenERP suosittelee että aloitat luomalla tarjouksen. Kun "
+#~ "tarjous on vahvistettu, tarjous muuttuu Tilaukseksi. OpenERP kykenee "
+#~ "käsittelemään usean tyyppisiä tuotteita joten myyntitilaus saattaa "
+#~ "käynnistää tehtäviä, toimituksia, tuotantotilauksia, hankitoja ja niin "
+#~ "edelleen. Myyntitilauksen asetusten perusteella luodaan vedos laskusta, "
+#~ "joten riittää että hyväksyt laskun kun haluat laskuttaa asiakastasi."
+
+#~ msgid "Dates"
+#~ msgstr "Päivämäärät"
+
+#~ msgid "State"
+#~ msgstr "Tila"
+
+#~ msgid "Conditions"
+#~ msgstr "Ehdot"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Nämä päivät lisätään asiakkaalle luvattuun aikaan toimituksen takaamiseksi."
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Myynnin Hallinnan Työtila"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Myyntitilausta ei voitu peruuttaa !"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Laskutettavat Rivit"
+
+#~ msgid "Security Days"
+#~ msgstr "Varopäivät"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Laskutetaan Tilauksen Mukaisesti Toimitettaessa"
 
 #~ msgid "  Year  "
 #~ msgstr "  Vuosi  "
 
+#~ msgid "Sales By Month"
+#~ msgstr "Myynnit Kuukausittain"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Myyntitilauksen Riviä ei voitu peruuttaa!"
+
+#~ msgid "Companies"
+#~ msgstr "Yritykset"
+
 #~ msgid "Picking Default Policy"
 #~ msgstr "Keräyksen Oletuskäytäntö"
 
+#~ msgid "References"
+#~ msgstr "Viitteet"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Myynnit Kumppaneittain"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Myyntitilauksen Päiväykset"
 
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Myyntitilausten Marginaalit"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Veroton Summa"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Avoin Lasku"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Myynnit Asiakkaittain viimeisen 90 päivän ajalta"
+
+#~ msgid "Related Picking"
+#~ msgstr "Liittyvä keräily"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Luo Keräyslista"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Myynnit Tuoteluokittain"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Toimituskustannukset"
 
 #~ msgid "title"
 #~ msgstr "otsake"
 
+#~ msgid "Stock Move"
+#~ msgstr "Varastosiirto"
+
 #~ msgid "Order date"
 #~ msgstr "Tilauksen Päiväys"
 
+#~ msgid "Procurement Method"
+#~ msgstr "Hankintatapa"
+
+#~ msgid "Picking List"
+#~ msgstr "Keräilylista"
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
 #~ msgid "Invoicing"
 #~ msgstr "Laskutus"
 
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
 #~ msgid "   Month   "
 #~ msgstr "   Kuukausi   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Varoitus"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Myynnit Kuukausittain"
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Myynnit Tuoteluokittain viimeisen 90 päivän ajalta"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Kuukausi-1    "
 
+#~ msgid "Image"
+#~ msgstr "Kuva"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Virhe! Rekursiivisiä yrityksiä ei voi luoda."
+
 #~ msgid "Ordered Date"
 #~ msgstr "Tilauksen Päiväys"
 
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Myyntitilaus '%s' on peruttu."
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Määrityksen eteneminen"
 
 #~ msgid "Shipped Qty"
 #~ msgstr "Toimitettu Määrä"
 
+#~ msgid "Delivered"
+#~ msgstr "Toimitettu"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Tälle tuotteelle pitää määrittää valmistuserä"
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Myyntitilaus '%s' on asetettu vedokseksi."
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Myynnit Myyjittäin viimeisen 90 päivän ajalta"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Myyjän myynti"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Määritellään myyntitilauksen poimintasäännöt"
 
+#~ msgid "Recreate Packing"
+#~ msgstr "Luo pakkaus uudelleen"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Konfiguroi myyntitilauksen logistiikan"
 
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Mahdollistaa kuljetuskustannusten laskennan tarjouksellesi."
 
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Lasku luodaan automaattisesti jos toimitusmäärityksenä on 'laskuta "
+#~ "keräilystä' tai 'laskuta tilauksesta toimituksen jälkeen'."
+
 #~ msgid "Configure"
 #~ msgstr "Konfiguroi"
 
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Sinun pitää ensin peruuttaa tähän myyntitilausriviin kiinnitetyt "
+#~ "varastosiirrot."
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Erä ei ole samaa tuotetta"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Päivien määrä tilausvahvistuksesta toimituksen lähettämiseen asiakkaalle."
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Valitse palvelutyyppinen tuote jota kutsutaan 'esitutotteeksi'. Sinun pitää "
+#~ "ehkä luoda se ja asettaa tämän kentän oletusarvoksi."
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Tilauksen viite tulee olla yksilöllinen!"
 
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr "paranna perusmyyntiohjelmistoasi lisätoiminnoilla"
 
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Myynti Avaa lasku"
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Et voi tehdä ennakkoa myyntitilaukselle joka on määritelty 'Automaattinen "
+#~ "lasku toimituksen jälkeen'."
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Jokaiselle myyntitilausriville luodaan hankintatilaus myydyn tuotteen "
+#~ "hankkimiseksi."
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Aseta myynnin työkulu ja oletusarvot"
 
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Kontaktin nimi ja osoite, joka pyysi tilausta tai tarjousta"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Oletko varma, että haluat muodostaa laskun?"
 
+#~ msgid "Create Final Invoice"
+#~ msgstr "Luo lopullinen lasku"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Myydyn materiaalin hankinta"
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr "Et voi peruuttaa myyntitilausriviä joka on jo laskutettu!"
 
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Merkitsee että myyntitilaus on toimitettu. Tämä kenttä päivitetään vasta kun "
+#~ "ajastimet on laukaistu."
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Dokumentti siirrosta kohdepaikkaan tai asiakkalle."
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Perustu joko lähetettyihin tai tilattuihin määriin"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Laskutettavat toimitukset"
+
+#~ msgid "Pick List"
+#~ msgstr "Keräilylista"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Myyntiohjelmiston konfiguraatio"
 
+#~ msgid "Create Procurement Order"
+#~ msgstr "Luo hankintatilaus"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Luo toimitusmääräin"
+
+#~ msgid "Reference UoM"
+#~ msgstr "Viitemittayksikkö"
+
 #, python-format
 #~ msgid "Picking Information !"
 #~ msgstr "Keräilyn tiedot !"
 
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr "Voit luoda laskuja myyntitilausten tai toimitusten pohjalta."
+
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Laskutus keräilystä"
 
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Ei voi peruuttaa myyntitilausta !"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Sinun pitää valita asiakas myyntilomakkeella !\n"
+#~ "Ole hyvä ja valitse yksi asiakas enennkuin valitset tuotteen"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Sinun pitää ensin peruuttaa kaikki keräilyt jotka liittyvät tähän "
+#~ "myyntitilaukseen."
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr "Tulotiliä ei ole määritelty tälle tuotteelle: \"%s\" (id:%d)"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Dokumentti siirrosta asiakkaalle"
+
+#~ msgid "Logistic"
+#~ msgstr "Logistinen"
+
+#~ msgid "Picking Policy"
+#~ msgstr "Keräilysäännöt"
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Keräilylista ja toimitusmääräin"
 
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr "Myyntipäiväkirjaa ei ole määritelty tälle yritykselle \"%s\" (id:%d)"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Ei voi oistaa myyntitilausriviä joka on %s !"
 
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "Tämä on keräilylista joka on luotu tälle myyntitilaukselle."
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Riippuen paikan lähtöpisteen määrittelyista, siirto lähetysalueen ja "
+#~ "asiakkaan välillä tehdään toimitusmääräimissä käsin tai automaattisest."
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -2776,6 +3101,12 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ "Antaa voittomarginaalin laskemalla erotuksen yksikköhinnasta ja "
 #~ "kustannushinnasta."
 
+#~ msgid "Packings"
+#~ msgstr "Pakkaukset"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Toimitusviive"
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Konfiguroi myynninhallinta ohjelmistosi"
 
@@ -2785,10 +3116,26 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Myyntitilauksen asettelun parannukset"
 
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Sinun pitää ensin peruuttaa kaikki laskut jotka liittyvät tähän "
+#~ "myyntitilaukseen."
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Yksi hankintatilaus jokaista myyntitilausriviä kohti ja jokaista komponettia "
+#~ "kohti."
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Ei tarpeeksi varastoa !"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Lasku on luotu onnistuneesti!"
+
 #~ msgid "Layout Sequence"
 #~ msgstr "Asettelun järjestys"
 
@@ -2796,6 +3143,29 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "Ei voi poistaa myyntitilauksia jotka on jo vahvistettu !"
 
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Ohjaa hankintatilauksia jokaiselle myyntitilausriville"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(ei saatavilla)"
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm tarkoittaa 'international commercial terms' kansainväliset "
+#~ "toimitushedot, nämä määrittelevät sarjan myyntiehtoa joita käytetään "
+#~ "kaupankäynnissä."
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Tulokategorian tiliä ei ole määritelty tuotekategorian oletusarvoissa tai "
+#~ "taloudellista asemaa ei ole määritelty !"
+
 #~ msgid ""
 #~ "By default, OpenERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2808,6 +3178,16 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ "toimittamiseksi asiakkaalle yhdellä tai kahdella työntekijän tekemällä "
 #~ "operaatiolla."
 
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Hankintatilaus luodaan automaattisesti kun myyntitilaus on vahvistettu tai "
+#~ "lasku maksettu. Se ohjaa hankintaa ja tuotantoa myyntitilausten parametrien "
+#~ "ja sääntöjen mukaan. "
+
 #~ msgid ""
 #~ "The Shipping Policy is used to configure per order if you want to deliver as "
 #~ "soon as possible when one product is available or you wait that all products "
@@ -2831,6 +3211,14 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ "\n"
 #~ "EAN: %s määrä %s Tyyppi %s"
 
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Suunnitelet myyväsi %.2f %s mutta sinulla on vain %.2f %s saatavilla !\n"
+#~ "Todellinen varasto on %.2f %s (ilman varauksia)"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr "Lisää joitaikin ominaisuuksia myyntitilausraporttien asetteluun."
@@ -2845,5 +3233,128 @@ msgstr "Lasku perustuen toimitettuihin"
 #~ "Mahdollistaa toimitusten laskujen ryhmittelyn eri jaksoille: päivittäin, "
 #~ "viikottain jne."
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Myyntitilausehdotus"
+
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Vaiheet myyntitilauksen toimittamiseksi"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Tässä on lista kaikista laskutettavista myyntitilausriveistä. Voit laskuttaa "
+#~ "myyntitilaukset osittain, riveittäin tai myyntitilauksittain. Et tarvitse "
+#~ "listaa, jos laskutat toimitusmääräyksistä tai jos laskutat myyntiä "
+#~ "koontilaskuilla."
+
+#~ msgid "Print Quotation"
+#~ msgstr "Tulosta Tarjous"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Työn pääaikayksikkö"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Tuntilistan mukaan"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Toimituksiin perustuva lasku"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Perustuu toimitusmääräyksiin"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Poistaaksesi vahvistetun myyntitilausken sinun pitää ensin peruuttaa se! "
+#~ "Peruuttaaksesi myyntitilauksen, sinun pitää ensin peruuttaa tähän liittyvät "
+#~ "keräily ja lähetysmääräykset."
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Perustuu tehtävän työhön"
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "Yrityksen nimen pitää olla uniikki!"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Viitteen tulee olla uniikki yrityskohtaisesti!"
+
+#~ msgid "Month-1"
+#~ msgstr "Edellinen kuukausi"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Konfiguraatio virhe !"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Toimita jokainen tuote kun saaatavilla"
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr "Et voi siirtää tuotteita paikkaan tai paikasta tässä näkymässä."
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Perustuu myyntitilauksiin"
+
+#~ msgid "Line Sequence"
+#~ msgstr "Rivijärjestys"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Sekalaiset"
+
+#~ msgid "Options"
+#~ msgstr "Valinnat"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Toimita kaikki tuotteet kerralla"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Laskuta tilaukseta toimituksen jälkeen"
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Lähetä automaattinen vahvistus myyntitilauksesta"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr "Ei voida poistaa myyntitilausriviä jonka tila on '%s'!"
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Haluatko veloittaa toimituksesta?"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Myyntitilaukset jotka luotu kuluvan kuukauden aikana"
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Aseta laskutustapa"
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Läskutussäännöt"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "Keräilytiedot ! : "
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Maksu ennen toimitusta"
+
+#~ msgid "Print Order"
+#~ msgstr "Tulostusjärjestys"
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Päämetodi perustuu"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Myyntitilaukset luotu kuluvana vuonna"
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Edellisen kuun luodut myyntitilaukset"
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Toimita ja laskuta pyydettäessä"
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "Ei tarpeeksi varastoa ! : "
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index cca2f33654c..5a80bb85b25 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -6,26 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:37+0000\n"
 "Last-Translator: Raphael Collet (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: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "Mode incorrect pour test_state"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "UdM du produit"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #, python-format
 #~ msgid ""
@@ -39,6 +28,9 @@ msgstr "UdM du produit"
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Impossible de supprimer des commandes qui sont déjà confirmées !"
 
+#~ msgid "Product UoM"
+#~ msgstr "UdM du produit"
+
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Erreur : l'UdV doit appartenir à une autre catégorie que l'UdM"
 
@@ -51,15 +43,167 @@ msgstr "UdM du produit"
 #~ msgstr ""
 #~ "Vous devez d'abord annuler toutes les factures liée à cette commande."
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "Mode incorrect pour test_state"
+
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
 #~ "Erreur: l'UP par défaut et l'UP d'achat doivent être dans la même catégorie."
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Basée sur les feuilles de temps"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Facture Anticipée"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmer le devis"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Tableaux de bord des ventes"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Date de confirmation"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Regrouper par..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -71,62 +215,345 @@ msgstr ""
 "et qui n'ont pas encore été facturé."
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Ventes par vendeur ces 90 derniers jours"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Partenaire alloti"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "État de commande"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Si vous n'avez pas suffisamment de stock pour livrer en une seule fois, "
-"acceptez vous les livraisons partielles ?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "UdV"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "À facturer"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Adresse d'expédition pour le bon de commande actuel."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Quantité"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Date à laquelle le bon de commande est confirmé."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Jour"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Devis"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Contrat / compte analytique"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Société"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Date de facturation"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Lignes livrées et non-facturées"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Le montant à facturer par anticipation"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Incident de facturation"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Montant total"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Compte analytique"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Sous-total"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Annuler la commande"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Le devis '%s' a été transformé en bon de commande."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Poids brut"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Imprimer devis"
+msgid "Quotation "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Attention !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Commande client"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septembre"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Taxes"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Montant hors-taxe"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total Net :"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Annuler"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Lignes de commande liées à une de mes commandes"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Magasin"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Commandes avec incidents"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adresse de facturation"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Date à laquelle le bon de commande a été créé."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Recréer la Facture"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Créer les factures"
 
 #. module: sale
 #: report:sale.order:0
@@ -134,79 +561,647 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Génère des ordres d'approvisionnements pour chaque ligne de commande"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Compte analytique"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Ceci est  liste de toutes les lignes de bons de commande à facturer. Vous "
-"pouvez facturer les bons de commande partiellement, par lignes. Vous n'avez "
-"pas besoin de cette liste si vous facturez depuis les bons de livraison ou "
-"si vous facturez totalement la commande."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
-"Afin de supprimer un bon de commande confirmé, vous devez d'abord l'annuler. "
-"Pour annuler un bon de commande, vous devez d'abord annuler les bons de "
-"livraison ou de préparation."
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Odre d'approvisionnement"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Date de confirmation"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Nb. de lignes"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Nb. de qté."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Commande de ventes"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Quantité (UdV)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Lignes de commande en état \"terminé\""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Montant anticipé"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmée"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Condition de règlement par défaut"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Confirmer"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Adresse d'expédition"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Lignes de commande prêtes à facturer"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Chiffre d'affaires mensuel"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Année"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "N° de commande"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Lignes de la commande"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Rem.(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Référence commande"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Lignes de facture"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Prix total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Anciens devis"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Cochez cette case pour grouper les factures d'un même client"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Générer les factures"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Heure"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Date de création"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Attente de planification"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Adresse de facturation pour le bon de commandes actuel"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Quantités commandées"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Année de commande du bon de commande"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Quantité"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mes ventes"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Action invalide !"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Régime fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juillet"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UdV"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Date du devis"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Date de commande"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Devis et ventes"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "Partenaire"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Facturer sur livraison"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Ligne de commande"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
-"Les bons de commande vous aident à gérer les devis et les commandes de vos "
-"clients. OpenERP vous suggère de commencer par créer un devis. Lorsqu'il "
-"sera confirmé, le devis sera convertit en bon de commande. OpenERP peut "
-"prendre en charge plusieurs types de produits pour que les bons de commande "
-"déclenchent des tâches, des bons de livraison, des ordres de production, des "
-"achats, et d'autres choses. Basée sur la configuration des bons de commande, "
-"une facture à l'état \"Brouillon\" sera générée, vous n'aurez alors plus "
-"qu'à la confirmer pour facturer votre client."
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Vente : Facturer"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Remise (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Une facture ne peut pas être créée depuis une ligne de vente à cause d'une "
+"des raisons suivantes :\n"
+"1. L'état de cette ligne de vente est soit \"Brouillon\", soit \"Annulée\" "
+"!\n"
+"2. La ligne de vente est déjà facturée !"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Lignes de commande terminées"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mes devis"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Décembre"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Expédié"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mois"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Commande (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Séquence"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "Vous ne pouvez pas confirmer un bon de commande sans ligne"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Non-facturée"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Catégorie de produits"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nom du Magasin"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Taxes :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Facture de paiement d'avance"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En cours"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Aucun Client défini !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Créer les factures"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -225,1307 +1220,9 @@ msgstr ""
 "correspondantes."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Condition de règlement par défaut"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Basée sur les bons de livraisons"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "Unité de temps de travail principale"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "État"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Rem.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Prix total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Cochez cette case pour grouper les factures d'un même client"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mes bons de commande"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Quantités commandées"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Ventes par vendeur"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Mouvements de stock"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Référence commande"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Autre information"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Dates"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"La facture est créée automatiquement si la politique d'expédition est "
-"\"Facturer sur livraison\" ou \"Facturer sur commande après livraison\"."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "Basée sur les temps passés sur les tâches"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Devis et ventes"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Vente : Facturer"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr "Avertissement sur liste de prix!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Remise (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mes devis"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Tableau de bord du responsable des ventes"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Conditionnement"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "À partir d'un bon de commandes"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nom du Magasin"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"La politique de facturation sert à synchroniser la facturation avec les "
-"opérations de livraison :\n"
-"  - le choix \"Payer avant livraison\" génère d'abord la facture, puis "
-"génère l'expédition lorsque la facture est payée.\n"
-"  - le choix \"Livrer, puis facturer sur demande\" crée l'expédition "
-"directement et attend que l'utilisateur presse le bouton \"Facturer\" pour "
-"générer la facture brouillon en fonction de la commande ou des lignes de "
-"commande.\n"
-"  - le choix \"Facturer sur commande après livraison\" génère la facture en "
-"fonction du bon de commande lorsque toutes les expéditions sont terminées\n"
-"  - le choix \"Facturer sur livraison\" permet de créer la facture pendant "
-"le traitement des expéditions."
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Aucun Client défini !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Commandes avec incidents"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "Erreur de configuration !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Conditions"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Il n'a aucun compte de revenu définit dans les propriétés par défaut pour la "
-"catégorie de produit, ou bien le régime fiscal n'est pas définit !"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Août"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Vous essayez d'affecter un lot qui n'est pas pour ce produit."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juin"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Impossible d'annuler ce bon de commandes"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistiques sur les commandes de ventes"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Le compte analytique lié au bon de commandes"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octobre"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "La référence doit être unique par société !"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Devis"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "liste de prix du bon de commandes actuel"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Nombre de jours entre la confirmation de la commande et l'expédition des "
-"produits au client"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Date du devis"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Régime fiscal"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Nombre de colis"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "En cours"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Le vendeur confirme le devis. L'état du bon de commande devient \"En cours\" "
-"ou \"Manuel, en cours\""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-"Vous ne pouvez pas annuler une ligne d'un bon de commande qui a déjà été "
-"facturée !"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Annuler d'abord les mouvements de stock attachés à cette ligne de bon de "
-"commandes."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Sélectionner un produit de type service nommé \"règlement anticipé\". Il se "
-"peut que vous deviez le créer et le choisir comme valeur par défaut pour ce "
-"champ."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tél. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Vous ne pouvez pas faire une avance sur les bons de commande qui sont "
-"définis comme \"Facture automatique après la livraison\"."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notes"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Le nom de la société doit être unique !"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Adresse de facturation pour le bon de commandes actuel"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Mois -1"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Mois de commande du bon de commande"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Vous ne pouvez pas regrouper les bons de commande ayant des devises "
-"différentes pour un même partenaire."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Livrer chaque produit dès qu'il est disponible"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturé"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Bon de livraison"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Date de confirmation"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Partenaire alloti"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Mars"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-"Vous ne pouvez pas déplacer des produits depuis ou vers un emplacement de "
-"type \"vue\"."
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Basée sur les bons de commande"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Montant total"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Sous-total"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adresse de facturation :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "Séquence de la ligne"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Pour chaque ligne de commande, un ordre d'approvisionnement est créé pour "
-"fournir le produit vendu."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm qui est la contraction de \"International Commercial terms\" "
-"(Termes commerciaux internationaux) implique une série de termes de vente "
-"qui sont utilisés dans les transactions commerciales."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adresse de facturation"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Recherche des lignes non-facturées"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Devis / Commande"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Nb. de lignes"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Factures de vente ouvertes"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Ligne de commandes de vente"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Entrepôt"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "N° de commande"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Lignes de la commande"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Montant hors-taxe"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Lignes à facturer"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Quantité (UdM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Date de création"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Divers"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Lignes livrées et non-facturées"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Mes ventes"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Action invalide !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Info supplémentaires"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Liste de prix"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Nb. de qté."
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "Heure"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Date de commande"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Expédié"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Tous les devis"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septembre"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Vous ne pouvez pas confirmer un bon de commande sans ligne"
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Vous devez sélectionner une liste de prix ou un client dans le formulaire de "
-"vente !\n"
-"Sélectionnez-en un avant de choisir un produit."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Catégorie de produits"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Taxes :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Mouvements de stock"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "État de commande"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Voulez-vous réellement créer la(les) facture(s) ?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Ventes par mois"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Vous ne pouvez pas annuler une ligne de bon de commande !"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Jours de sécurité"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Approvisionnement des matériaux vendus"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Créer la facture finale"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Adresse d'expédition"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Cela indique que les bons de commande ont bien été livrés. Ce champ est mis "
-"à jour seulement après que l'ordonnanceur ait été lancé."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Date"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Filtres étendus..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Incident"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Sociétés"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Pas de ligne de liste de prix correcte trouvée ! :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Historique"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Facturer sur commande après la livraison"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Ceci est la liste des factures qui ont été générées pour les bons de "
-"commande. Le même bon de commande peut avoir été facturé en plusieurs temps "
-"(par ligne par exemple)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Votre Référence"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-"Le nom et l'adresse du contact qui a passé la commande ou demandé le devis."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"C'est le nombre de jours ajoutés à ce que vous avez promis au client par "
-"sécurité"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Qté"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Références"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Mes lignes de bons de commande"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "La référence de commande doit être unique par société!"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Créer facture"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Total hors-taxes"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Référence commande"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Votre facture a été créée avec succès !"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Ventes par partenaire"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Adresse de commande"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Ouvrir la facture"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-"Envoyer un courriel automatique à la confirmatin des bons de commande"
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Il n'y a pas de journal de vente définit pour cette société : \"%s\" "
-"(identifiant : %d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forcer l'assignation"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Sur commande"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Basé sur les quantités expédiées ou commandées"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Livraison de tous les produits en une fois"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Bon de livraison lié"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nom"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adresse de livraison :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Ventes par clients des 90 derniers jours"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "État \"Brouillon\" de la commande de vente"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Créer un bon de livraison"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-"Vous ne pouvez pas supprimer une ligne de bon de commande qui est dans "
-"l'état '%s' !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "Qté. (UdV)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total taxes incluses"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Créer un bon de transfert"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Date de commande du bon de commande"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Ventes par catégorie de produit"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmer le devis"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Erreur"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Regrouper par..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Recréer la Facture"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Livraisons à facturer"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Attente de planification"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Méthode d'approvisionnement"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Bon de transfert"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Mettre en brouillon"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Document du mouvement vers la sortie ou vers le client."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-"\n"
-"Bonjour ${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Voici la confirmation de votre commande ${object.partner_id.name}:\n"
-"       | Numéro de commande : *${object.name}*\n"
-"       | Montant total de la commande : *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | date de commande : ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Référence de la commande : ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Votre référence : ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Votre contact : ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"Vous pouvez voir la confirmation de la commande, la télécharger et même la "
-"payer en suivant le lien suivant :\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"Il est aussi possible de directement payer avec Paypal :\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"Si vous avez des questions, n'hésitez pas à nous contacter.\n"
-"\n"
-"\n"
-"Merci d'avoir choisi ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Téléphone : ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Valider"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Confirmer la commande"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Créer un ordre d'approvisionnement"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Taxes"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Bons de commande prêts à facturer"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Date à laquelle le bon de commande a été créé."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Mouvement de stock"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Créer les factures"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Bons de commande créés ce mois-ci"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Montant anticipé"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "Facturez-vous la livraison?"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Quantités livrées"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Facturation basée sur les commandes"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Bon de livraison"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Erreur !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Vous ne pouvez pas annuler le bon de commande !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "Qté. (UdM)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Année de commande du bon de commande"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juillet"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Approvisionnement"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Incident d'expédition"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grouper les factures"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "Politique de facturation"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "Paramétrez votre méthode de facturation"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "À vérifier par le comptable."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "UdM référence"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
@@ -1534,14 +1231,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Lignes de vente : Facturer"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Incident de facturation"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Pilote l'approvisionnement et la facturation"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Brouillon"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1549,575 +1241,10 @@ msgid "Paid"
 msgstr "Payé"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analyse des ventes"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Créer un autre bon de préparation"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Propriétés"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Devis"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Le vendeur crée une facture manuellement, si la politique d'expédition de la "
-"commande de ventes est 'Expédition et manuelle en cours'. La facture est "
-"crée automatiquement si la politique d'expédition est 'Paiement avant la "
-"livraison'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Vous pouvez créer des factures basées sur les commandes de vente ou les "
-"expéditions."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Lignes de commande confirmées, pas encore livrées"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Factures clients"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Ventes"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Prix unitaire"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Terminée"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Facture"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Vous devez sélectionner un client dans le formulaire de vente !\n"
-"Veuillez configurer un client avant de choisir un produit."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Document d'origine"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "À faire"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Politique de livraison"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Document du mouvement vers le client"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Le total hors-taxe"
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Vous devez d'abord annuler toutes les livraisons attachées à ce bon de "
-"commande."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Facture de paiement d'avance"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mois"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Commande (Ref ${object.name or 'n/a' })"
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Produit"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Annuler l'assignation"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Chiffre d'affaires mensuel"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facture sur"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Date de commande"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV du produit"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuelle en cours"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistique"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Commande"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"Il n'y a aucun compte de revenu définit pour ce produit : \"%s\" "
-"(identifiant : %d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ne pas traiter l'incident"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Dépendant du contrôle de la facturation des bons de commande, la facture "
-"peut être basée sur les quantités livrées ou les quantités commandées. Par "
-"conséquent, un bon de commande peut générer une facture ou un bon de "
-"livraison dès qu'il a été confirmé par le commercial."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Vous tentez de vendre %.2f %s mais vous avez seulement %.2f %s disponibles "
-"!\n"
-"Le stock réel est %.2f %s. (sans les réservations)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "États"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Référence client"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Prix"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Selon la configuration de l'emplacement de sortie, le mouvement entre l'aire "
-"de sortie et le client est effectué via le bon de livraison manuellement ou "
-"automatiquement."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Payer avant la livraison"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Tableaux de bord des ventes"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Générer les factures"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "À facturer"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Date à laquelle le bon de commande est confirmé."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "Contrat / compte analytique"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Société"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Date de facturation"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Le montant à facturer par anticipation"
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"Impossible de trouver une ligne de liste de prix qui correspond à ce produit "
-"et à la quantité.\n"
-"Vous devez soit changer le produit, la quantité ou la liste de prix."
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "Ceci est la liste des livraisons générées pour ce bon de commande."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Créer les factures"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total Net :"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Annuler"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Lignes de commande liées à une de mes commandes"
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Magasin"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Date de confirmation"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Attention"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Ventes par mois"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Commande de ventes"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Quantité (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Lignes de commande en état \"terminé\""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"Le formulaire de la liste de préparation est créé dès que le bon de commande "
-"est confirmé, en même temps que l'ordre d’approvisionnement. Cela représente "
-"l'attribution d'une partie du bon de commande. Il y a 1 liste de préparation "
-"par ligne de vente qui évolue avec la disponibilité des parties."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmée"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "Méthode principale basée sur"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmer"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Ventes par catégorie de produits dans les 90 derniers jours"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Lignes de facture"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Lignes de ventes"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Délai de livraison"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuration"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr "Imprimer la commande"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Bons de commande créés cette année"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Une facture ne peut pas être créée depuis une ligne de vente à cause d'une "
-"des raisons suivantes :\n"
-"1. L'état de cette ligne de vente est soit \"Brouillon\", soit \"Annulée\" "
-"!\n"
-"2. La ligne de vente est déjà facturée !"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Lignes de commande terminées"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Poids brut"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Factures"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Décembre"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Image"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Un ordre d'approvisionnement est automatiquement créé lors de la "
-"confirmation des bons de commande ou quand la facture est payé. Il dirige "
-"les achats et la production de produits en fonction des règles et des "
-"paramètres des bons de commande. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Non-facturée"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Vendeur"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Anciens devis"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Montant hors-taxe"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Facture Anticipée"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "Le bon de commande \"%sé a été annulé."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Brouillon"
-
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -2141,6 +1268,18 @@ msgstr ""
 "               \n"
 "* L'état \"Annulée\" est mis lorsque l'utilisateur annule la commande liée."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Bons de commande"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grouper les factures"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2148,58 +1287,171 @@ msgstr "Total des taxes."
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Colisages"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Lignes de commande prêtes à facturer"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "État"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Bons de commande du mois dernier"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Août"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Pilote l'approvisionnement et la facturation"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juin"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "Modèles de courriels"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Bons de commande"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Commande"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Avertissement sur liste de prix!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Magasin"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistiques sur les commandes de ventes"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Date"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Ligne de commandes de vente"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Novembre"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtres étendus..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Produit avancé"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calculer"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Incident"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octobre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Le vendeur crée une facture manuellement, si la politique d'expédition de la "
+"commande de ventes est 'Expédition et manuelle en cours'. La facture est "
+"crée automatiquement si la politique d'expédition est 'Paiement avant la "
+"livraison'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Vous devez d'abord annuler toutes les factures en rapport avec ce bon de "
-"commande."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2211,96 +1463,331 @@ msgstr "Janvier"
 msgid "Sales Order in Progress"
 msgstr "Bons de commande en cours"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Le vendeur confirme le devis. L'état du bon de commande devient \"En cours\" "
+"ou \"Manuel, en cours\""
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr "Référence du document qui a généré cette demande de commande."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Pas de ligne de liste de prix correcte trouvée ! :"
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Période d'engagement"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "Livraison et facturation sur demande"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Lignes de commande confirmées, pas encore livrées"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+#: view:sale.order:0
+msgid "History"
+msgstr "Historique"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
-"Un ordre d'approvisionnement pour chaque ligne de vente et pour chaque "
-"composant."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Assigner"
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Ceci est la liste des factures qui ont été générées pour les bons de "
+"commande. Le même bon de commande peut avoir été facturé en plusieurs temps "
+"(par ligne par exemple)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Votre Référence"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Date de commande"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Liste de prix"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Factures clients"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Bons de commande confirmé à facturer."
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Lignes de ventes"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventes"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "Le bon de commande \"%s\" a bien été mis à l'état \"Brouillon\"."
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Jour"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Depuis le stock"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Factures"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Fermer"
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Prix unitaire"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Terminée"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adresse de facturation :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Facture"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Mes lignes de bons de commande"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "Pas de liste de prix ! "
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Livré"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Devis"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Vous devez affecter un lot de fabrication à ce produit."
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Recherche des lignes non-facturées"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
-"Si vous avez plus d'un magasin vendant les produits de votre société, vous "
-"pouvez créer et gérer cela depuis ici. Dès que vous enregistrerez un nouveau "
-"devis ou bon de commande, il sera lié à ce magasin. Le magasin définit "
-"également l'entrepôt depuis lequel les produits seront livrés pour chaque "
-"vente."
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "La référence de commande doit être unique par société!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "À faire"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Adresse de livraison :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Vous ne pouvez pas regrouper les bons de commande ayant des devises "
+"différentes pour un même partenaire."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analyse des ventes"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "liste de prix du bon de commandes actuel"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Créer facture"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Le total hors-taxe"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Référence commande"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2308,61 +1795,69 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Cela indique que la facture a été payée."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+"Vous ne pouvez pas annuler une ligne d'un bon de commande qui a déjà été "
+"facturée !"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Produit"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Description"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Mai"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Client"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Avancé"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Février"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Avril"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Comptabilité"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Recherche de commandes de ventes"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Réquisition du bon de commande"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
-msgstr "Pas assez de stock ! "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Condition de règlement"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Prix"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2380,25 +1875,351 @@ msgstr ""
 "d'affaires, vous devriez utiliser le rapport \"Analyse des factures "
 "clients\" dans l'application comptabilité."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tél. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Voulez-vous réellement créer la(les) facture(s) ?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Autre information"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Qté"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "À vérifier par le comptable."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Adresse d'expédition pour le bon de commande actuel."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Devis / Commande"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Client"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Avancé"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Février"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facture sur"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Date de commande"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV du produit"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "État \"Brouillon\" de la commande de vente"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Document d'origine"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Avril"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuelle en cours"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Mes bons de commande"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Recherche de commandes de ventes"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Mois de commande du bon de commande"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Vous devez sélectionner une liste de prix ou un client dans le formulaire de "
+"vente !\n"
+"Sélectionnez-en un avant de choisir un produit."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "À partir d'un bon de commandes"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ne pas traiter l'incident"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Dépendant du contrôle de la facturation des bons de commande, la facture "
+"peut être basée sur les quantités livrées ou les quantités commandées. Par "
+"conséquent, un bon de commande peut générer une facture ou un bon de "
+"livraison dès qu'il a été confirmé par le commercial."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Le compte analytique lié au bon de commandes"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Condition de règlement"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Bons de commande prêts à facturer"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Devis N°"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Référence client"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Réceptionné"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Année"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Facturation basé sur les livraisons"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total taxes incluses"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturé"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Date de commande du bon de commande"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Mouvements de stock"
 
 #~ msgid "Make invoices"
 #~ msgstr "Créer les factures"
@@ -2437,6 +2258,9 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Procure Method"
 #~ msgstr "Méthode d'approvisionnement"
 
+#~ msgid "Warehouse"
+#~ msgstr "Entrepôt"
+
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Règlement avant livraison"
 
@@ -2446,6 +2270,9 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Packing Default Policy"
 #~ msgstr "Politique de colisage par défaut"
 
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Facturation basée sur les commandes"
+
 #~ msgid "Quotation (A sale order in draft state)"
 #~ msgstr "Devis (une commande en brouillon)"
 
@@ -2522,6 +2349,9 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Déclaration automatique"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Mettre en brouillon"
+
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Livraison, depuis l'entrepôt vers le client"
 
@@ -2532,9 +2362,18 @@ msgstr "Facturation basé sur les livraisons"
 #~ "Cette configuration utilise la politique de colisage par défaut quand vous "
 #~ "établissez une commande"
 
+#~ msgid "Validate"
+#~ msgstr "Valider"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Mouvements de stock"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Désignation manuelle"
 
+#~ msgid "Notes"
+#~ msgstr "Notes"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Facture après livraison"
 
@@ -2547,6 +2386,9 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "All at Once"
 #~ msgstr "Tout d'un coup"
 
+#~ msgid "Extra Info"
+#~ msgstr "Info supplémentaires"
+
 #~ msgid "Net Price"
 #~ msgstr "Prix net"
 
@@ -2556,12 +2398,22 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "All Sales Order"
 #~ msgstr "Toutes les commandes"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Quantités livrées"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Point de vente"
 
+#~ msgid "Force Assignation"
+#~ msgstr "Forcer l'assignation"
+
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Mes commandes en attente de facturation"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Erreur !"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Livraison complète"
 
@@ -2571,18 +2423,33 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Packing"
 #~ msgstr "Colis"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Confirmer la commande"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuration"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Facture basée sur la commande après livraison"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "Sales orders"
 #~ msgstr "Commandes"
 
+#~ msgid "Procurement"
+#~ msgstr "Approvisionnement"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Compte de paiement"
 
+#~ msgid "Close"
+#~ msgstr "Fermer"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "Facture brouillon"
 
@@ -2602,21 +2469,24 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Order Ref"
 #~ msgstr "Réf. Commande"
 
+#~ msgid "Salesman"
+#~ msgstr "Vendeur"
+
 #~ msgid "My sales in shipping exception"
 #~ msgstr "Mes commandes en exception de livraison"
 
 #~ msgid "Sales Configuration"
 #~ msgstr "Configuration des ventes"
 
+#~ msgid "on order"
+#~ msgstr "Sur commande"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "Approvisionnement corrigé"
 
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Livraison et facture manuelle"
 
-#~ msgid "Status"
-#~ msgstr "État"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Politique de Colisage"
 
@@ -2629,27 +2499,30 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Create Advance Invoice"
 #~ msgstr "Créer une facture anticipée"
 
-#~ msgid "Sale Order"
-#~ msgstr "Commande client"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Liste de prix de ventes"
 
 #~ msgid "Direct Delivery"
 #~ msgstr "Livraison directe"
 
+#~ msgid "Properties"
+#~ msgstr "Propriétés"
+
+#~ msgid "Compute"
+#~ msgstr "Calculer"
+
 #~ msgid "VAT"
 #~ msgstr "TVA"
 
+#~ msgid "Assign"
+#~ msgstr "Assigner"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Créer facture"
 
 #~ msgid "Sales order lines"
 #~ msgstr "Ligne de commande"
 
-#~ msgid "Sequence"
-#~ msgstr "Séquence"
-
 #~ msgid "Other data"
 #~ msgstr "Autres informations"
 
@@ -2686,6 +2559,12 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Sale Invoice"
 #~ msgstr "Facture de vente"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Adresse de commande"
+
 #~ msgid "Sales Management"
 #~ msgstr "Gestion des ventes"
 
@@ -2695,6 +2574,9 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Sale Order Line"
 #~ msgstr "Ligne de commande"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Annuler l'assignation"
+
 #~ msgid ""
 #~ "The name and address of the contact that requested the order or quotation."
 #~ msgstr "Le nom et l'adresse du contacte ayant demandé le devis."
@@ -2702,6 +2584,9 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Liste de prix d'achats"
 
+#~ msgid "Name"
+#~ msgstr "Nom"
+
 #~ msgid "New Quotation"
 #~ msgstr "Nouveau devis"
 
@@ -2717,6 +2602,9 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Delivery Delay"
 #~ msgstr "Délai de livraison"
 
+#~ msgid "States"
+#~ msgstr "États"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Erreur: code EAN invalide"
 
@@ -2726,6 +2614,9 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Sale Order line"
 #~ msgstr "Ligne de commande"
 
+#~ msgid "from stock"
+#~ msgstr "Depuis le stock"
+
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Votre facture a été créée avec succès !"
 
@@ -2749,6 +2640,13 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nom du Modèle non valide dans la définition de l'action."
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Si vous n'avez pas suffisamment de stock pour livrer en une seule fois, "
+#~ "acceptez vous les livraisons partielles ?"
+
 #~ msgid "Customer Ref"
 #~ msgstr "Réf. Client"
 
@@ -2786,9 +2684,16 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Facture basée sur le Colisage"
 
+#~ msgid "Accounting"
+#~ msgstr "Comptabilité"
+
 #~ msgid "One procurement for each product."
 #~ msgstr "Un approvisionnement pour chaque produit"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Erreur"
+
 #~ msgid "Sales Process"
 #~ msgstr "Processus de Vente"
 
@@ -2812,6 +2717,15 @@ msgstr "Facturation basé sur les livraisons"
 #~ "lorsque la facture est confirmée mais attend que le Planificateur soit lancé "
 #~ "à la Date de la Commande."
 
+#~ msgid "Number Packages"
+#~ msgstr "Nombre de colis"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Quantité (UdM)"
+
+#~ msgid "UoM"
+#~ msgstr "UdM"
+
 #~ msgid "Uninvoiced Lines"
 #~ msgstr "Lignes non facturées"
 
@@ -2830,24 +2744,81 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Related Packing"
 #~ msgstr "Colisage lié"
 
+#~ msgid "Untaxed amount"
+#~ msgstr "Montant hors-taxe"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Vous permet de calculer les frais de livraison sur vos devis."
 
+#~ msgid "Dates"
+#~ msgstr "Dates"
+
+#~ msgid "State"
+#~ msgstr "État"
+
+#~ msgid "Conditions"
+#~ msgstr "Conditions"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Lignes à facturer"
+
+#~ msgid "Security Days"
+#~ msgstr "Jours de sécurité"
+
 #~ msgid "  Year  "
 #~ msgstr "  Année  "
 
+#~ msgid "Procurement of sold material"
+#~ msgstr "Approvisionnement des matériaux vendus"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Ventes par mois"
+
+#~ msgid "Companies"
+#~ msgstr "Sociétés"
+
+#~ msgid "References"
+#~ msgstr "Références"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Dates de commande de ventes"
 
+#~ msgid "Create Delivery Order"
+#~ msgstr "Créer un bon de livraison"
+
 #~ msgid "title"
 #~ msgstr "titre"
 
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Livraisons à facturer"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Méthode d'approvisionnement"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Ventes par catégorie de produit"
+
+#~ msgid "Stock Move"
+#~ msgstr "Mouvement de stock"
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Document du mouvement vers la sortie ou vers le client."
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Créer un ordre d'approvisionnement"
+
 #~ msgid "Order date"
 #~ msgstr "Date de commande"
 
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Document du mouvement vers le client"
+
 #~ msgid "Invoicing"
 #~ msgstr "Facturation"
 
+#~ msgid "Logistic"
+#~ msgstr "Logistique"
+
 #~ msgid "   Month   "
 #~ msgstr "   Mois   "
 
@@ -2857,18 +2828,61 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Ordered Date"
 #~ msgstr "Date de commande"
 
+#~ msgid "Image"
+#~ msgstr "Image"
+
+#~ msgid "Delivered"
+#~ msgstr "Livré"
+
 #~ msgid "Shipped Qty"
 #~ msgstr "Qté expédiée"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Attention !"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Tableau de bord du responsable des ventes"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr ""
+#~ "Le nom et l'adresse du contact qui a passé la commande ou demandé le devis."
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "C'est le nombre de jours ajoutés à ce que vous avez promis au client par "
+#~ "sécurité"
+
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Total hors-taxes"
+
+#~ msgid "All Quotations"
+#~ msgstr "Tous les devis"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Configuration de l'application des ventes"
 
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Nombre de jours entre la confirmation de la commande et l'expédition des "
+#~ "produits au client"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr ""
 #~ "Fournit quelques fonctionnalités pour améliorer la disposition des rapports "
 #~ "de commandes de ventes."
 
+#~ msgid "Create Final Invoice"
+#~ msgstr "Créer la facture finale"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Basé sur les quantités expédiées ou commandées"
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
@@ -2876,15 +2890,47 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Not enough stock !"
 #~ msgstr "Pas assez de stock !"
 
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Il n'a aucun compte de revenu définit dans les propriétés par défaut pour la "
+#~ "catégorie de produit, ou bien le régime fiscal n'est pas définit !"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Sélectionner un produit de type service nommé \"règlement anticipé\". Il se "
+#~ "peut que vous deviez le créer et le choisir comme valeur par défaut pour ce "
+#~ "champ."
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Frais de port"
 
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Voulez-vous réellement créer la(les) facture(s) ?"
 
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Vous pouvez créer des factures basées sur les commandes de vente ou les "
+#~ "expéditions."
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Il n'y a aucun compte de revenu définit pour ce produit : \"%s\" "
+#~ "(identifiant : %d)"
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Étapes pour livrer un commande de vente"
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Attention"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Mois -1    "
 
@@ -2892,9 +2938,40 @@ msgstr "Facturation basé sur les livraisons"
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "C'est la liste des expéditions générées pour cette commande"
 
+#~ msgid "Procurement Order"
+#~ msgstr "Odre d'approvisionnement"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Incident d'expédition"
+
+#~ msgid "Order Line"
+#~ msgstr "Ligne de commande"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Ventes par vendeur"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Ventes par partenaire"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Ventes par mois"
+
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Votre facture a été créée avec succès !"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Progression de la Configuration"
 
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Le devis '%s' a été transformé en bon de commande."
+
+#~ msgid "Pick List"
+#~ msgstr "Bon de transfert"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Créer un bon de transfert"
+
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Amélioration de la disposition des bons de commande"
 
@@ -2936,9 +3013,32 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Configure"
 #~ msgstr "Configurer"
 
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Ventes par vendeur ces 90 derniers jours"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Impossible d'annuler ce bon de commandes"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "La référence de la commande doit être unique !"
 
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Annuler d'abord les mouvements de stock attachés à cette ligne de bon de "
+#~ "commandes."
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Le bon de commande \"%sé a été annulé."
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Vous devez d'abord annuler toutes les factures en rapport avec ce bon de "
+#~ "commande."
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr ""
 #~ "Complétez l'application \"Ventes\" avec de nouvelles fonctionnalités."
@@ -2946,9 +3046,22 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Paramétrez la logistique des ventes"
 
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/a)"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Vous essayez d'affecter un lot qui n'est pas pour ce produit."
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Génère des ordres d'approvisionnements pour chaque ligne de commande"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Facturation sur le bon de commande après la livraison"
 
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Factures de vente ouvertes"
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -2996,10 +3109,63 @@ msgstr "Facturation basé sur les livraisons"
 #~ "    * Graphe des cas du mois\n"
 #~ "    "
 
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Cela indique que les bons de commande ont bien été livrés. Ce champ est mis "
+#~ "à jour seulement après que l'ordonnanceur ait été lancé."
+
+#~ msgid "Reference UoM"
+#~ msgstr "UdM référence"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Vous devez sélectionner un client dans le formulaire de vente !\n"
+#~ "Veuillez configurer un client avant de choisir un produit."
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Ventes par catégorie de produits dans les 90 derniers jours"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Il n'y a pas de journal de vente définit pour cette société : \"%s\" "
+#~ "(identifiant : %d)"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Vous ne pouvez pas supprimer les lignes de vente qui est %s !"
 
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "Le formulaire de la liste de préparation est créé dès que le bon de commande "
+#~ "est confirmé, en même temps que l'ordre d’approvisionnement. Cela représente "
+#~ "l'attribution d'une partie du bon de commande. Il y a 1 liste de préparation "
+#~ "par ligne de vente qui évolue avec la disponibilité des parties."
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives."
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Vous tentez de vendre %.2f %s mais vous avez seulement %.2f %s disponibles "
+#~ "!\n"
+#~ "Le stock réel est %.2f %s. (sans les réservations)"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -3014,20 +3180,59 @@ msgstr "Facturation basé sur les livraisons"
 #~ "\n"
 #~ "EAN : %s - Quantité : %s - Type d'unité logistique : %s"
 
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Délai de livraison"
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Si vous avez plus d'un magasin vendant les produits de votre société, vous "
+#~ "pouvez créer et gérer cela depuis ici. Dès que vous enregistrerez un nouveau "
+#~ "devis ou bon de commande, il sera lié à ce magasin. Le magasin définit "
+#~ "également l'entrepôt depuis lequel les produits seront livrés pour chaque "
+#~ "vente."
+
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Étapes pour livrer les commandes"
 
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Vous devez affecter un lot de fabrication à ce produit."
+
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Réquisition du bon de commande"
+
 #~ msgid "Layout Sequence"
 #~ msgstr "Séquence de disposition"
 
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Ventes par clients des 90 derniers jours"
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr ""
 #~ "Vous ne pouvez pas annuler des lignes de vente qui ont déjà été facturées !"
 
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Un ordre d'approvisionnement est automatiquement créé lors de la "
+#~ "confirmation des bons de commande ou quand la facture est payé. Il dirige "
+#~ "les achats et la production de produits en fonction des règles et des "
+#~ "paramètres des bons de commande. "
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Configurez votre application de gestion des ventes"
 
+#~ msgid "Packings"
+#~ msgstr "Colisages"
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr ""
@@ -3036,12 +3241,99 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Configurez votre workflow de vente et vos valeurs par défaut."
 
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Vous ne pouvez pas annuler une ligne de bon de commande !"
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm qui est la contraction de \"International Commercial terms\" "
+#~ "(Termes commerciaux internationaux) implique une série de termes de vente "
+#~ "qui sont utilisés dans les transactions commerciales."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Vous ne pouvez pas faire une avance sur les bons de commande qui sont "
+#~ "définis comme \"Facture automatique après la livraison\"."
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Vous ne pouvez pas annuler le bon de commande !"
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Un ordre d'approvisionnement pour chaque ligne de vente et pour chaque "
+#~ "composant."
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Le bon de commande \"%s\" a bien été mis à l'état \"Brouillon\"."
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Ceci est  liste de toutes les lignes de bons de commande à facturer. Vous "
+#~ "pouvez facturer les bons de commande partiellement, par lignes. Vous n'avez "
+#~ "pas besoin de cette liste si vous facturez depuis les bons de livraison ou "
+#~ "si vous facturez totalement la commande."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Les bons de commande vous aident à gérer les devis et les commandes de vos "
+#~ "clients. OpenERP vous suggère de commencer par créer un devis. Lorsqu'il "
+#~ "sera confirmé, le devis sera convertit en bon de commande. OpenERP peut "
+#~ "prendre en charge plusieurs types de produits pour que les bons de commande "
+#~ "déclenchent des tâches, des bons de livraison, des ordres de production, des "
+#~ "achats, et d'autres choses. Basée sur la configuration des bons de commande, "
+#~ "une facture à l'état \"Brouillon\" sera générée, vous n'aurez alors plus "
+#~ "qu'à la confirmer pour facturer votre client."
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Bon de livraison seul"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Bon de livraison"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Selon la configuration de l'emplacement de sortie, le mouvement entre l'aire "
+#~ "de sortie et le client est effectué via le bon de livraison manuellement ou "
+#~ "automatiquement."
+
+#~ msgid "Related Picking"
+#~ msgstr "Bon de livraison lié"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Vous devez d'abord annuler toutes les livraisons attachées à ce bon de "
+#~ "commande."
+
 #~ msgid "Picking Default Policy"
 #~ msgstr "Politique de livraison par défaut"
 
+#~ msgid "Picking List"
+#~ msgstr "Bon de livraison"
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Bon de préparation + bon de livraison"
 
@@ -3055,6 +3347,13 @@ msgstr "Facturation basé sur les livraisons"
 #~ msgid "Picking Information !"
 #~ msgstr "Informations de livraison !"
 
+#~ msgid "Picking Policy"
+#~ msgstr "Politique de livraison"
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "Ceci est la liste des livraisons générées pour ce bon de commande."
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sales order. \n"
 #~ "The exception state is automatically set when a cancel operation occurs in "
@@ -3071,6 +3370,22 @@ msgstr "Facturation basé sur les livraisons"
 #~ "confirmée mais attend le lancement de l'ordonnanceur à la date 'Date de la "
 #~ "commande'."
 
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Pour chaque ligne de commande, un ordre d'approvisionnement est créé pour "
+#~ "fournir le produit vendu."
+
+#~ msgid "Packaging"
+#~ msgstr "Conditionnement"
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Créer un autre bon de préparation"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Ouvrir la facture"
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -3078,6 +3393,259 @@ msgstr "Facturation basé sur les livraisons"
 #~ "Donne la marge de rentabilité en calculant la différence entre le prix "
 #~ "unitaire et le prix de revient."
 
+#~ msgid "Print Quotation"
+#~ msgstr "Imprimer devis"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Unité de temps de travail principale"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Afin de supprimer un bon de commande confirmé, vous devez d'abord l'annuler. "
+#~ "Pour annuler un bon de commande, vous devez d'abord annuler les bons de "
+#~ "livraison ou de préparation."
+
+#~ msgid "Line Sequence"
+#~ msgstr "Séquence de la ligne"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Livraison de tous les produits en une fois"
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Facturez-vous la livraison?"
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+#~ msgstr ""
+#~ "\n"
+#~ "Bonjour ${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Voici la confirmation de votre commande ${object.partner_id.name}:\n"
+#~ "       | Numéro de commande : *${object.name}*\n"
+#~ "       | Montant total de la commande : *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | date de commande : ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Référence de la commande : ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Votre référence : ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Votre contact : ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "Vous pouvez voir la confirmation de la commande, la télécharger et même la "
+#~ "payer en suivant le lien suivant :\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "Il est aussi possible de directement payer avec Paypal :\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "Si vous avez des questions, n'hésitez pas à nous contacter.\n"
+#~ "\n"
+#~ "\n"
+#~ "Merci d'avoir choisi ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Téléphone : ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Politique de facturation"
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Paramétrez votre méthode de facturation"
+
+#~ msgid "Print Order"
+#~ msgstr "Imprimer la commande"
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Méthode principale basée sur"
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "Pas assez de stock ! "
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Basée sur les bons de livraisons"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Livrer chaque produit dès qu'il est disponible"
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Basée sur les bons de commande"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr ""
+#~ "Vous ne pouvez pas supprimer une ligne de bon de commande qui est dans "
+#~ "l'état '%s' !"
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr ""
+#~ "Envoyer un courriel automatique à la confirmatin des bons de commande"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Qté. (UdV)"
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Qté. (UdM)"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Basée sur les temps passés sur les tâches"
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "Le nom de la société doit être unique !"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "La référence doit être unique par société !"
+
+#~ msgid "Month-1"
+#~ msgstr "Mois -1"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Erreur de configuration !"
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr ""
+#~ "Vous ne pouvez pas déplacer des produits depuis ou vers un emplacement de "
+#~ "type \"vue\"."
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Divers"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Bons de commande créés cette année"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "Impossible de trouver une ligne de liste de prix qui correspond à ce produit "
+#~ "et à la quantité.\n"
+#~ "Vous devez soit changer le produit, la quantité ou la liste de prix."
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -3103,3 +3671,59 @@ msgstr "Facturation basé sur les livraisons"
 #~ "les listes de préparation seront terminées.\n"
 #~ "  - Le choix \"Facturation sur le bon de livraison\" est utilisé pour créer "
 #~ "des factures pendant le processus d'expédition."
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Basée sur les feuilles de temps"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Bons de commande créés ce mois-ci"
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Bons de commande du mois dernier"
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "La politique de facturation sert à synchroniser la facturation avec les "
+#~ "opérations de livraison :\n"
+#~ "  - le choix \"Payer avant livraison\" génère d'abord la facture, puis "
+#~ "génère l'expédition lorsque la facture est payée.\n"
+#~ "  - le choix \"Livrer, puis facturer sur demande\" crée l'expédition "
+#~ "directement et attend que l'utilisateur presse le bouton \"Facturer\" pour "
+#~ "générer la facture brouillon en fonction de la commande ou des lignes de "
+#~ "commande.\n"
+#~ "  - le choix \"Facturer sur commande après livraison\" génère la facture en "
+#~ "fonction du bon de commande lorsque toutes les expéditions sont terminées\n"
+#~ "  - le choix \"Facturer sur livraison\" permet de créer la facture pendant "
+#~ "le traitement des expéditions."
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "La facture est créée automatiquement si la politique d'expédition est "
+#~ "\"Facturer sur livraison\" ou \"Facturer sur commande après livraison\"."
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Facturer sur livraison"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Payer avant la livraison"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Facturer sur commande après la livraison"
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Livraison et facturation sur demande"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Facturation basé sur les livraisons"
diff --git a/addons/sale/i18n/gl.po b/addons/sale/i18n/gl.po
index bd806b684d3..36e8c137908 100644
--- a/addons/sale/i18n/gl.po
+++ b/addons/sale/i18n/gl.po
@@ -7,19 +7,167 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2011-04-19 14:52+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
@@ -30,59 +178,344 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_policy:0
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
 msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
+msgid "Quotation "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
 msgstr ""
 
 #. module: sale
@@ -91,63 +524,641 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_summary:0
 msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
+#: report:sale.order:0
+msgid "Fax :"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
+msgid "(update)"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
 msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades Pedidas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
 msgstr ""
 
 #. module: sale
@@ -166,181 +1177,74 @@ msgstr ""
 "dedicadas as tarefas asociadas."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
+#: selection:sale.order.line,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
 #: view:sale.report:0
-msgid "State"
+msgid "Status"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Cantidades Pedidas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
@@ -349,14 +1253,28 @@ msgid "August"
 msgstr ""
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
+#: view:sale.order:0
+msgid "Sale Order "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: sale
@@ -365,9 +1283,41 @@ msgid "June"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:617
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:647
 #, python-format
-msgid "Could not cancel this sales order !"
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
 msgstr ""
 
 #. module: sale
@@ -376,8 +1326,46 @@ msgid "Sales Orders Statistics"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
 msgstr ""
 
 #. module: sale
@@ -386,55 +1374,63 @@ msgid "October"
 msgstr ""
 
 #. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,delay:0
+#: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
+#: selection:sale.report,month:0
+msgid "January"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
 msgstr ""
 
 #. module: sale
@@ -445,409 +1441,35 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1079
+#: code:addons/sale/sale.py:958
 #, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
+msgid "No valid pricelist line found ! :"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
+#: help:sale.config.settings,module_warning:0
 msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
 msgstr ""
 
 #. module: sale
 #: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
 msgstr ""
 
 #. module: sale
 #: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr ""
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
@@ -856,8 +1478,8 @@ msgid "History"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
 
 #. module: sale
@@ -874,25 +1496,99 @@ msgid "Your Reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: field:sale.report,date:0
+msgid "Date Order"
 msgstr ""
 
 #. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Qty"
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "References"
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
 msgstr ""
 
 #. module: sale
@@ -902,562 +1598,64 @@ msgstr ""
 
 #. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Basado en nas cantidades enviadas ou pedidas."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
 #. module: sale
@@ -1466,13 +1664,56 @@ msgid "To Do"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
+#: report:sale.order:0
+msgid "Shipping address :"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
 msgstr ""
 
 #. module: sale
@@ -1481,46 +1722,174 @@ msgid "The amount without tax."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:604
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:822
 #, python-format
-msgid "You must first cancel all picking attached to this sales order."
+msgid "You cannot cancel a sale order line that has already been invoiced!"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
 msgstr ""
 
 #. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
+#: report:sale.order:0
+msgid "Description"
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: sale
@@ -1528,6 +1897,17 @@ msgstr ""
 msgid "Invoice on"
 msgstr ""
 
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
@@ -1538,31 +1918,98 @@ msgstr "Data Pedido"
 msgid "Product UoS"
 msgstr ""
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "My Sale Orders"
 msgstr ""
 
 #. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Order"
+msgid "Search Sales Order"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
 msgstr ""
 
 #. module: sale
@@ -1584,566 +2031,55 @@ msgstr ""
 "polo comercial."
 
 #. module: sale
-#: code:addons/sale/sale.py:1251
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Net Total :"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr ""
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr ""
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
-msgid "Description"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr ""
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr ""
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
-#, python-format
-msgid "Not enough stock ! : "
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2152,20 +2088,65 @@ msgid "Quotation N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Basado en nas cantidades enviadas ou pedidas."
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sales order. \n"
 #~ "The exception state is automatically set when a cancel operation occurs in "
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index 43011f01148..569f486e157 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -6,22 +6,170 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:19+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Vinteh <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Faktura predujma"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potvrdite ponudu"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Upravljačka ploča prodaje"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Datum potvrde"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "grupiraj po..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -32,62 +180,345 @@ msgstr ""
 "\"Iznimke\" i nisu još fakturirane"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Prodaja po prodavaču u zadnjih 90 dana"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Dodjeljeni partner"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Stanje narudžbe"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Prihvaćate li djelomičnu isporuku ako nemate na raspolaganju dovoljno robe "
-"na zalihi?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "JM"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Za fakturirati"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Adresa otpreme za prodajni nalog"
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Količina"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum potvrde prodajnog naloga"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Dan"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Ponude"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Ožujak"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Ugovorni / analitički konto"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Tvrtka"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Datum fakture"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Nefakturirane i dostavljene stavke"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Iznos za fakturiranje unaprijed."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Iznimka fakture"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Ukupan iznos."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analitički konto"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Međuzbroj"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Otkaži narudžbu"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Ponuda '%s' je pretvorena u prodajni nalog."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Težina"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Upozorenje !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Prodajna narudžba"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Rujan"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Porezi"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Iznos bez poreza"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Netto zbroj:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Ukupno"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Prodavaonica"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Prodaje u iznimci"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adresa fakture"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum kreiranja prodajnog naloga"
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Ponovno izradi fakturu"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Napravi fakture"
 
 #. module: sale
 #: report:sale.order:0
@@ -95,69 +526,647 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Izvršava nalog za nabavu za svaku stavku prodajnog naloga."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analitički konto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Prodajni nalog možete fakturirati po pojedinim stavkama s ovog popisa. "
-"Alternativno možete napraviti fakturu prema ponudi."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
-"Ako želite obrisati potvrđeni prodajni nalog, morate ga prvo otkazati! \r\n"
-"Da biste otkazali prodajni nalog, morate prvo otkazati sve vezane dokumente."
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Narudžba nabave"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Datum potvrde"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# linija"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# količine"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faks:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Prodajni nalog"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Količina (JP)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Stavke prodajnog naloga koje su u stanju \"zaključeno\""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Iznos predujma"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Standardan uvjet plaćanja"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Potvrdi"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Adresa otpreme"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Stavke prodajnog naloga spremne za fakturiranje"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Mjesečni obrtaj"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Godina"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Prodajni nalog koji nije potvrđen"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Narudžba broj"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Stavke narudžbe"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Popust (%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referenca narudžbe"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Stavke fakture"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Ukupna cijena"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Stare ponude"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Označite kućicu za grupiranje faktura istih kupaca"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Napravi fakture"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Sat"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Datum kreiranja"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Raspored čekanja"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Adresa fakture za trenutni prodajni nalog."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Naručene količine"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Godina prodajnog naloga"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Ukupno :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Moje prodaje"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Neispravna akcija !"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Porezna pozicija"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Srpanj"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "JM"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Datum ponude"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Datum narudžbe"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Ponude i prodaje"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Faktura temeljena na isporukama"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Stavka narudžbe"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Faktura obavljene prodaje"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Popust (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Faktura se ne može kreirati za ovu stavku prodajnog naloga zbog jednog od "
+"sljedećih razloga:\n"
+"1. Stanje ove stavke prodajnog naloga je \"Nacrt\" ili \"Otkazano\"!\n"
+"2. Stavka prodajnog naloga je već fakturirana!"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Zaključene stavke prodajnog naloga"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moje Ponude"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Prosinac"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Otpremljeno"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mjesec"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Redoslijed"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "Ne možete potvrditi prodajni nalog koji nema stavku."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nefakturirano"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Kategorija proizvoda"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Naziv prodavaonice"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Porezi :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Faktura za predujam"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "U tijeku"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nije definiran kupac !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Napravi fakture"
+
 #. module: sale
 #: help:sale.order,invoice_quantity:0
 msgid ""
@@ -173,1208 +1182,9 @@ msgstr ""
 "poslane količine označavaju sate utrošene na zajedničke zadatke."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Standardan uvjet plaćanja"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Stanje"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Popust (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Ukupna cijena"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Označite kućicu za grupiranje faktura istih kupaca"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Moji prodajni nalozi"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Naručene količine"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Prodaja po prodavaču"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Premještanje zaliha"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referenca narudžbe"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Ostali podaci"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Datumi"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"Faktura se kreira automatski ako je način dostave 'Faktura iz načina "
-"slaganja robe' ili 'Faktura na narudžbu nakon dostave'."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Ponude i prodaje"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Faktura obavljene prodaje"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Popust (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Moje Ponude"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Upravljačka ploča menadžera prodaje"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Pakiranje"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Prema prodajnom nalogu"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Naziv prodavaonice"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nije definiran kupac !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Prodaje u iznimci"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "Greška kod konfiguracije!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Uvjeti"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Nije definiran konto kategorije dohotka u standardnim značajkama za "
-"kategoriju proizvoda ili Fiskalna pozicija nije definirana !"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Kolovoz"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Pokušavate pridružiti lot koji nije iz istog proizvoda"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "Neispravan način za test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Lipanj"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Nije moguće otkazati ovaj prodajni nalog!"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistika prodajnih naloga"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Analitički konto povezan sa prodajnim nalogom."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Listopad"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "Vezna oznaka je već korištena."
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Ponude"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Cjenik za trenutni prodajni nalog"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "OIB:"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr "Broj dana između potvrde narudžbe i otpremanja proizvoda kupcu"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Datum ponude"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Porezna pozicija"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "JM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Broj paketa"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "U tijeku"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Prodavač potvrđuje ponudu. Stanje prodajnog naloga postaje 'U tijeku' ili "
-"'Ručni postupak u tijeku'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr "Ne možete otkazati stavku prodajnog naloga koja je fakturirana!"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Prvo morate otkazati sve skladišne dokumente vezane uz ovaj prodajni nalog."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Odaberite proizvod tipa usluga koji se zove 'Proizvod predujma'. Možda ćete "
-"ga morati kreirati i postaviti kao standardnu vrijednost na ovom polju."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Ne možete napraviti predujam prema prodajnom nalogu koji je definiran kao "
-"'Automatska faktura nakon dostave'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Bilješke"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Naziv organizacije mora biti jedinstven!"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Adresa fakture za trenutni prodajni nalog."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Mjesec-1"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Mjesec prodajnog naloga"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Ne može se grupirati prodaja ukoliko postoje različite valute za istog "
-"partnera"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Isporuči svaki proizvod kada je dostupan"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fakturirano"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Otpremnica"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Datum potvrde"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Dodjeljeni partner"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Ožujak"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Prema prodajnim nalozima"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Ukupan iznos."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Međuzbroj"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adresa fakture :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Za svaku stavku prodajnog naloga kreira se nalog za nabavu proizvoda koji se "
-"prodaje."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm (akronim za 'International Commercial terms') ukazuje da se radi o "
-"nizu komercijalnih izraza koji se koriste pri komercijalnim transakcijama."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adresa fakture"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Pretraži nefakturirane stavke"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Ponuda / Narudžba"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# linija"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Otvorena faktura"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Stavka prodajnog naloga"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Skladište"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Narudžba broj"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Stavke narudžbe"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Iznos bez poreza"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Stavke u fakturu"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Količina (JM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Datum kreiranja"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Razno"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Nefakturirane i dostavljene stavke"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Ukupno :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Moje prodaje"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Neispravna akcija !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Dodatne informacije"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cjenik"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# količine"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "Sat"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Datum narudžbe"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Otpremljeno"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Sve ponude"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "Postavke"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Rujan"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Ne možete potvrditi prodajni nalog koji nema stavku."
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr "Odaberite cjenik ili kupca prije odabira proizvoda!"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Kategorija proizvoda"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Porezi :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Premještaj zalihe"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Stanje narudžbe"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Želite li zaista kreirati fakturu(e)?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Prodaja po mjesecu"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Nije moguće otkazati stavku prodajnog naloga!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Sigurnosni dani"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Nabava prodanog materijala"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Napravi konačnu fakturu"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Adresa otpreme"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Pokazatelj da je prodajni nalog dostavljen. Ovo polje se ažurira samo nakon "
-"pokretanja planera."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Datum"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Prošireni filteri..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Iznimka"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Tvrtke"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Nije pronađena odgovarajuća stavka cjenika"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Povijest"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Fakturiraj prema narudžbi nakon isporuke"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Ovo je lista faktura koje su generirane za prodajni nalog. Isti prodajni "
-"nalog može biti fakturiran više puta (npr. prema stavkama)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Vaša referenca"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "Ime i adresa kontakta koji je zahtijevao narudžbu ili ponudu."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "Sigurnosni dani dodani na broj dana dogovorenih sa kupcima"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Količina"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Reference"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Moje stavke prodajnog naloga"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Odustani"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Poveznica narudžbe mora biti jedinstvena za Organizaciju!"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Napravi fakturu"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Ukupan izuzeti porez"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Poveznica narudžbe"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Vaša faktura je uspješno kreirana!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Prodaja po partneru"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Osoba za kontakt kod naručivanja"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Otvorena faktura"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "Ne postoji dnevnik prodaje definiran za ovu tvrtku: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Prisilno dodijeljivanje"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Po narudžbi"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Temeljeno na otpremljenim ili naručenim količinama."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Isporuči sve proizvode odjednom"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Pripadajući odabir"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Ime"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adresa otpreme"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Prodaja po kupcu u zadnjih 90 dana"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Prodajni nalog u stanju nacrta"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Napravi otpremnicu"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr "Ne može se obrisati stavka prodajnog naloga koji je u stanju '%s'!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "Količina (JM)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Ukupan uračunati porez"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Napravi listu odabira"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Datum prodajnog naloga"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Prodaja po kategoriji proizvoda"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potvrdite ponudu"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Pogreška"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "grupiraj po..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Ponovno izradi fakturu"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Otpremnice u fakturu"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Raspored čekanja"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metoda nabave"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Lista odabira"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Postavi na Nacrt"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Dokument premještaja na izlaz ili kod kupca."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Ovjeri"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Potvrdite narudžbu"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Napravi zahtjev za nabavom"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Porezi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Prodajni nalog spreman za fakturiranje"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datum kreiranja prodajnog naloga"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Premještaj zalihe"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Napravi fakture"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Prodajni nalog iz tekućeg mjeseca"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faks:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Iznos predujma"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "Da li se dostava naplaćuje?"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Otpremljene količine"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Faktura na temelju prodajnih naloga"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Ukoliko se promijeni cjenik za postojeću narudžbu (eventualno i valuta), "
-"cijene postojećih stavaka narudžbe neće biti osvježene."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Lista odabira"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Pogreška !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Nije moguće otkazati prodajni nalog!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "Količina (JM)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Godina prodajnog naloga"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Srpanj"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Nabava"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Izuzetak kod otpreme"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupiraj fakture"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Potreban pregled od strane računovođe."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referentna JM"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
@@ -1383,14 +1193,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Sale OrderLine Make_invoice"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Iznimka fakture"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Izvršava nabavu i fakturiranje"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Nacrt"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1398,565 +1203,10 @@ msgid "Paid"
 msgstr "Plaćeno"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analiza prodaje"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Ponovno izradi pakiranje"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Svojstva"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Ponuda"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Ako je pravilo otpremanja prodajnog naloga 'Otpremanje i ručni postupak u "
-"tijeku', prodavač kreira fakturu ručno. Faktura se kreira automatski ako je "
-"postavljeno pravilo otpremanja 'Plaćanje prije dostave'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr "Možete napraviti fakture prema ponudama ili otpremnicama."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Izlazni računi"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Prodaja"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Jedinična cijena"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Završeno"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr "Odaberite kupca prije izbora proizvoda!"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Izvorni dokument"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Za napraviti"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Pravila odabira"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokument premještaja kod kupca."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Iznos bez poreza."
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr "Morate prije otkazati sve odabire vezane uz ovaj prodajni nalog."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Faktura za predujam"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mjesec"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Otkaži dodjelu"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Mjesečni obrtaj"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Faktura za"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Datum narudžbe"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Proizvod - jedinica prodaje"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Ručni postupak u tijeku"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Proizvod JM"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistika"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Narudžba"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "Ne postoji konto dohotka definiran za ovaj proizvod: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Zanemari iznimku"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"U ovisnosti o kontroli fakturiranja, faktura može biti temeljena na "
-"dostavljenim ili na naručenim količinama. Tako, prodajni nalog može "
-"generirati fakturu ili otpremnicu onog trenutka kada je prodavač potvrdi."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Planirate prodati %.2f %s ali vam je raspoloživo samo %.2f %s !\n"
-"Prava zaliha je %.2f %s. (bez rezervacija)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Stanja"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referenca kupca"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Ukupno"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Cijena"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"U ovisnosti o postavkama izlazne lokacije, premještaj između izlaznog "
-"područja i kupca se izvršava preko otpremnice ručno ili automatski."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Platiti prije isporuke"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Upravljačka ploča prodaje"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Napravi fakture"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Za fakturirati"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datum potvrde prodajnog naloga"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "Ugovorni / analitički konto"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Tvrtka"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Datum fakture"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Iznos za fakturiranje unaprijed."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"Ne postoji odgovarajući cjenik za ovaj proizvod i količinu.\n"
-"Odaberite drugi proizvod, količinu ili cjenik."
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "Ovo je lista odabira generirana za prodajni nalog."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Napravi fakture"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Netto zbroj:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Otkazano"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Prodavaonica"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Datum potvrde"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Upozorenje"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Prodaja po mjesecu"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Prodajni nalog"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Količina (JP)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Stavke prodajnog naloga koje su u stanju \"zaključeno\""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"Kada se prodajni nalog potvrdi, otvara se forma sa listom za odabir i kreira "
-"se nalog za nabavu. Lista odabira dodjeljuje stavke prodajnom nalogu. "
-"Postoji jedna lista odabira za svaku stavku narudžbe koje se proširuje "
-"ovisno o dostupnosti dijelova."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potvrđeno"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potvrdi"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Pogreška! Ne možete kreirati rekurzivne tvrtke."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Prodaja po kategoriji proizvoda u zadnjih 90 dana"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Stavke fakture"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Stavke prodajnog naloga"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Glavno vrijeme dostave"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Konfiguracija"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Prodajni nalog iz tekuće godine"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Faktura se ne može kreirati za ovu stavku prodajnog naloga zbog jednog od "
-"sljedećih razloga:\n"
-"1. Stanje ove stavke prodajnog naloga je \"Nacrt\" ili \"Otkazano\"!\n"
-"2. Stavka prodajnog naloga je već fakturirana!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Zaključene stavke prodajnog naloga"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Težina"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Fakture"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Prosinac"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Slika"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Nalog za nabavu se automatski kreira čim je prodajni nalog potvrđen ili "
-"faktura plaćena. Nalog pokreće nabavu i proizvodnju prema pravilima i "
-"parametrima iz prodajnog naloga. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nefakturirano"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Prodavač"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Stare ponude"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Iznos bez poreza"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Faktura predujma"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "Prodajni nalog '%s' je otkazan."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Nacrt"
-
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1980,6 +1230,18 @@ msgstr ""
 "                  \n"
 "* Stanje 'Otkazano' se postavlja kada korisnik otkaže prodajni nalog."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Prodajni nalozi"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupiraj fakture"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -1987,56 +1249,170 @@ msgstr "Iznos poreza."
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Pakiranja"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Stavke prodajnog naloga spremne za fakturiranje"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Prodajni nalog otvoren u prošlom mjesecu"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Kolovoz"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Izvršava nabavu i fakturiranje"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Lipanj"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "Email predlošci"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Prodajni nalozi"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Narudžba"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Prodavaonica"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistika prodajnih naloga"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Stavka prodajnog naloga"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Studeni"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Prošireni filteri..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Proizvod predujma"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Izračunaj"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Iznimka"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr "Morate prije otkazati sve fakture vezane uz ovaj prodajni nalog."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Listopad"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Ako je pravilo otpremanja prodajnog naloga 'Otpremanje i ručni postupak u "
+"tijeku', prodavač kreira fakturu ručno. Faktura se kreira automatski ako je "
+"postavljeno pravilo otpremanja 'Plaćanje prije dostave'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2048,94 +1424,332 @@ msgstr "Siječanj"
 msgid "Sales Order in Progress"
 msgstr "Prodajni nalozi u tijeku"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Prodavač potvrđuje ponudu. Stanje prodajnog naloga postaje 'U tijeku' ili "
+"'Ručni postupak u tijeku'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr "Referenca na dokument koji je generirao ovaj prodajni nalog."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Nije pronađena odgovarajuća stavka cjenika"
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Odgoda obveze"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "Isporučiti i fakturirati na zahtjev"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
-"Jedan nalog za nabavu za svaku stavku prodajnog naloga i za svaku komponentu."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Dodijeli"
+#: view:sale.order:0
+msgid "History"
+msgstr "Povijest"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Ovo je lista faktura koje su generirane za prodajni nalog. Isti prodajni "
+"nalog može biti fakturiran više puta (npr. prema stavkama)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Vaša referenca"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Datum narudžbe"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cjenik"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "OIB:"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Izlazni računi"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Prodajni nalog potvrđen i pretvoren u fakturu."
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Prodajni nalog koji nije potvrđen"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Stavke prodajnog naloga"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Prodaja"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "Prodajni nalog '%s' je postavljen u stanje nacrta."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Ukoliko se promijeni cjenik za postojeću narudžbu (eventualno i valuta), "
+"cijene postojećih stavaka narudžbe neće biti osvježene."
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Iz zalihe"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Dan"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Zaključi"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Fakture"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Jedinična cijena"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Završeno"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adresa fakture :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Moje stavke prodajnog naloga"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Odustani"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "Nema cjenika! "
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Dostavljeno"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Ponuda"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Morate pridijeliti lot proizvodnje ovom proizvodu"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Pretraži nefakturirane stavke"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
-"Ovdje možete otvarati nove prodavaonice i upravljati sa njima. Svaka nova "
-"ponuda ili prodajni nalog moraju biti povezani sa prodavaonicom. "
-"Prodavaonica definira sa kojeg skladišta će biti dostavljen proizvod za "
-"svaku izvršenu prodaju."
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Poveznica narudžbe mora biti jedinstvena za Organizaciju!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Za napraviti"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Adresa otpreme"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Ne može se grupirati prodaja ukoliko postoje različite valute za istog "
+"partnera"
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analiza prodaje"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Cjenik za trenutni prodajni nalog"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Napravi fakturu"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Iznos bez poreza."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Poveznica narudžbe"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2143,61 +1757,67 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Pokazatelj da je faktura plaćena."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr "Ne možete otkazati stavku prodajnog naloga koja je fakturirana!"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Opis"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Svibanj"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Kupac"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Veljača"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Travanj"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Računovodstvo"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Pretraži prodajne naloge"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Zahtjev za prodajnim nalogom"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Uvjet plaćanja"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cijena"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2215,25 +1835,344 @@ msgstr ""
 "analizirati prihod, trebali bi koristiti Izvještaj analize faktura u "
 "računovodstvenoj aplikaciji."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Želite li zaista kreirati fakturu(e)?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Ostali podaci"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Količina"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Potreban pregled od strane računovođe."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Adresa otpreme za prodajni nalog"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Ponuda / Narudžba"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Kupac"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Veljača"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Faktura za"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Datum narudžbe"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Proizvod - jedinica prodaje"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Prodajni nalog u stanju nacrta"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Izvorni dokument"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Travanj"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Ručni postupak u tijeku"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Moji prodajni nalozi"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Pretraži prodajne naloge"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Mjesec prodajnog naloga"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr "Odaberite cjenik ili kupca prije odabira proizvoda!"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Prema prodajnom nalogu"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Zanemari iznimku"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"U ovisnosti o kontroli fakturiranja, faktura može biti temeljena na "
+"dostavljenim ili na naručenim količinama. Tako, prodajni nalog može "
+"generirati fakturu ili otpremnicu onog trenutka kada je prodavač potvrdi."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Analitički konto povezan sa prodajnim nalogom."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Uvjet plaćanja"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Prodajni nalog spreman za fakturiranje"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Ponuda broj"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referenca kupca"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Odabran"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Godina"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Faktura na temelju dostava"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Ukupan uračunati porez"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturirano"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Datum prodajnog naloga"
 
 #~ msgid "Partial Delivery"
 #~ msgstr "Djelomična isporuka"
@@ -2244,6 +2183,9 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nepravilno ime modela u definiciji radnje."
 
+#~ msgid "from stock"
+#~ msgstr "Iz zalihe"
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Koraci do isporuke Prodajne Narudžbe"
 
@@ -2253,6 +2195,9 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Automatska Deklaracija"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Postavi na Nacrt"
+
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Ovo je ispis liste odabira robe koja je generirana ovim računom"
@@ -2260,6 +2205,12 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Isporuka, sa skladišta kupcu."
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
+#~ msgid "Validate"
+#~ msgstr "Ovjeri"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Napravi račun"
 
@@ -2273,6 +2224,9 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Manual Designation"
 #~ msgstr "Ručno Doznačivanje"
 
+#~ msgid "Notes"
+#~ msgstr "Bilješke"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Račun nakon isporuke"
 
@@ -2297,6 +2251,9 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Procure Method"
 #~ msgstr "Metod Nabave"
 
+#~ msgid "Extra Info"
+#~ msgstr "Dodatne informacije"
+
 #~ msgid "Net Price"
 #~ msgstr "Netto cijena"
 
@@ -2320,6 +2277,12 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Sale Shop"
 #~ msgstr "Dućan prodaje"
 
+#~ msgid "Warehouse"
+#~ msgstr "Skladište"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Prisilno dodijeljivanje"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2346,6 +2309,9 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Packing"
 #~ msgstr "Pakiranje"
 
+#~ msgid "Configuration"
+#~ msgstr "Konfiguracija"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Račun po Naudžbi nakon Isporuke"
 
@@ -2367,9 +2333,15 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Sales orders"
 #~ msgstr "Prodajne Narudžbe"
 
+#~ msgid "Procurement"
+#~ msgstr "Nabava"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Računi Plaćanja"
 
+#~ msgid "Close"
+#~ msgstr "Zaključi"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "Nacrt računa"
 
@@ -2388,9 +2360,15 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Manages the delivery and invoicing progress"
 #~ msgstr "Upravlja napredovanjem postupka Isporučivanja i izdavanja Računa"
 
+#~ msgid "Packaging"
+#~ msgstr "Pakiranje"
+
 #~ msgid "Order Ref"
 #~ msgstr "Referenca Narudžbe"
 
+#~ msgid "Salesman"
+#~ msgstr "Prodavač"
+
 #~ msgid ""
 #~ "In sale order , procuerement for each line and it comes into the procurement "
 #~ "order"
@@ -2428,9 +2406,6 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Konfiguriraj logistiku Prodajne Narudžbe"
 
-#~ msgid "Status"
-#~ msgstr "Status"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Politika Pakiranja"
 
@@ -2446,6 +2421,9 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Sale Pricelists"
 #~ msgstr "Prodajni Cjenici"
 
+#~ msgid "Properties"
+#~ msgstr "Svojstva"
+
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
@@ -2453,15 +2431,18 @@ msgstr "Faktura na temelju dostava"
 #~ "Račun se kreira kada se klikne na 'Kriraj Račun' nakon potvrde Prodajne "
 #~ "Narudžbe. Ova transakcija prenosi podatke Prodajne Narudžbe u Račune."
 
+#~ msgid "Compute"
+#~ msgstr "Izračunaj"
+
 #~ msgid "VAT"
 #~ msgstr "PDV"
 
+#~ msgid "Assign"
+#~ msgstr "Dodijeli"
+
 #~ msgid "Sales order lines"
 #~ msgstr "Vezane Prodajne Narudžbe"
 
-#~ msgid "Sequence"
-#~ msgstr "Redoslijed"
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Pakiranje VAN kreira se za proizvode na zalihi."
 
@@ -2523,12 +2504,18 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Otvori Račun Predujma"
 
+#~ msgid "Ordering Contact"
+#~ msgstr "Osoba za kontakt kod naručivanja"
+
 #~ msgid "Deliver"
 #~ msgstr "Isporuči"
 
 #~ msgid "Sale Order Line"
 #~ msgstr "Vezana Zaključnica"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Otkaži dodjelu"
+
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Račun na osnovi pakiranja"
 
@@ -2542,8 +2529,8 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Kupovni cjenici"
 
-#~ msgid "Sale Order"
-#~ msgstr "Prodajna narudžba"
+#~ msgid "Name"
+#~ msgstr "Ime"
 
 #~ msgid "New Quotation"
 #~ msgstr "Nova Ponuda"
@@ -2588,12 +2575,18 @@ msgstr "Faktura na temelju dostava"
 #~ "jednoj Prodajnoj Narudžbi možda je bilo potrebno izdati više računa (Po "
 #~ "linijama, na primjer)"
 
+#~ msgid "States"
+#~ msgstr "Stanja"
+
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Po potvrdi Narudžbe, napravi"
 
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Greška: Nepravilan ean kod"
 
+#~ msgid "Accounting"
+#~ msgstr "Računovodstvo"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Moja Prodajna narudžba"
 
@@ -2606,12 +2599,55 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Dozvoljava izračun troškova dostave prema ponudama."
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Prihvaćate li djelomičnu isporuku ako nemate na raspolaganju dovoljno robe "
+#~ "na zalihi?"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Promijeni postavke narudžbi logistike"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Upozorenje !"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Narudžba nabave"
+
+#~ msgid "Order Line"
+#~ msgstr "Stavka narudžbe"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Promijeni pravila odabira za narudžbu"
 
+#~ msgid "State"
+#~ msgstr "Stanje"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Premještanje zaliha"
+
+#~ msgid "Dates"
+#~ msgstr "Datumi"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Faktura se kreira automatski ako je način dostave 'Faktura iz načina "
+#~ "slaganja robe' ili 'Faktura na narudžbu nakon dostave'."
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Ponovno izradi pakiranje"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr "Sigurnosni dani dodani na broj dana dogovorenih sa kupcima"
+
+#~ msgid "Conditions"
+#~ msgstr "Uvjeti"
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -2634,27 +2670,101 @@ msgstr "Faktura na temelju dostava"
 #~ "na narudžbi nakon što su sve liste odabira završene.\n"
 #~ "  - 'Faktura iz odabira' će kreirati fakturu za vrijeme postupka odabira."
 
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Nije definiran konto kategorije dohotka u standardnim značajkama za "
+#~ "kategoriju proizvoda ili Fiskalna pozicija nije definirana !"
+
 #~ msgid "Configure"
 #~ msgstr "Promijeni postavke"
 
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Pokušavate pridružiti lot koji nije iz istog proizvoda"
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "Neispravan način za test_state"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Samo otpremnica"
 
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr "Broj dana između potvrde narudžbe i otpremanja proizvoda kupcu"
+
+#~ msgid "UoM"
+#~ msgstr "JM"
+
+#~ msgid "Number Packages"
+#~ msgstr "Broj paketa"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/a)"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Odaberite proizvod tipa usluga koji se zove 'Proizvod predujma'. Možda ćete "
+#~ "ga morati kreirati i postaviti kao standardnu vrijednost na ovom polju."
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr "Poboljšajte aplikaciju za prodaju sa dodatnim funkcionalnostima."
 
+#~ msgid "Delivery Order"
+#~ msgstr "Otpremnica"
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm (akronim za 'International Commercial terms') ukazuje da se radi o "
+#~ "nizu komercijalnih izraza koji se koriste pri komercijalnim transakcijama."
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Otvorena faktura"
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Podesi radni slijed i standardne vrijednosti."
 
+#~ msgid "Untaxed amount"
+#~ msgstr "Iznos bez poreza"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Stavke u fakturu"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Količina (JM)"
+
+#~ msgid "All Quotations"
+#~ msgstr "Sve ponude"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Faktura na narudžbu nakon dostave"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Premještaj zalihe"
+
 #~ msgid "  Year  "
 #~ msgstr "  Godina  "
 
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Želite li zaista kreirati fakturu(e)?"
 
+#~ msgid "Security Days"
+#~ msgstr "Sigurnosni dani"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Nabava prodanog materijala"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Napravi konačnu fakturu"
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -2702,31 +2812,96 @@ msgstr "Faktura na temelju dostava"
 #~ "    * Graf kutija po mjesecu\n"
 #~ "    "
 
+#~ msgid "Companies"
+#~ msgstr "Tvrtke"
+
 #~ msgid "Picking Default Policy"
 #~ msgstr "Postavljena pravila odabira"
 
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Ime i adresa kontakta koji je zahtijevao narudžbu ili ponudu."
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr "Ne možete otkazati stavku narudžbe koja je već fakturirana !"
 
+#~ msgid "References"
+#~ msgstr "Reference"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Datumi naručivanja"
 
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Margine u narudžbama"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Ukupan izuzeti porez"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Otvorena faktura"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Konfiguracija aplikacije"
 
+#~ msgid "on order"
+#~ msgstr "Po narudžbi"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Temeljeno na otpremljenim ili naručenim količinama."
+
+#~ msgid "Related Picking"
+#~ msgstr "Pripadajući odabir"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Napravi otpremnicu"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Troškovi dostave"
 
+#~ msgid "Create Pick List"
+#~ msgstr "Napravi listu odabira"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Otpremnice u fakturu"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Metoda nabave"
+
 #~ msgid "title"
 #~ msgstr "naslov"
 
+#~ msgid "Pick List"
+#~ msgstr "Lista odabira"
+
 #~ msgid "Order date"
 #~ msgstr "Datum narudžbe"
 
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Dokument premještaja na izlaz ili kod kupca."
+
+#~ msgid "Confirm Order"
+#~ msgstr "Potvrdite narudžbu"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Napravi zahtjev za nabavom"
+
+#~ msgid "Stock Move"
+#~ msgstr "Premještaj zalihe"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Otpremljene količine"
+
+#~ msgid "Picking List"
+#~ msgstr "Lista odabira"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Pogreška !"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Izuzetak kod otpreme"
+
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Otprema i ručno napravljena faktura"
 
@@ -2757,6 +2932,15 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Lista odabira i otpremnice"
 
+#~ msgid "Picking Policy"
+#~ msgstr "Pravila odabira"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Dokument premještaja kod kupca."
+
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Invoicing"
 #~ msgstr "Fakturiranje"
 
@@ -2774,6 +2958,35 @@ msgstr "Faktura na temelju dostava"
 #~ "Stanje 'Čeka raspored' se postavlja kada je faktura potvrđena, ali čeka da "
 #~ "planer pokrene akciju na datum 'Datum naručivanja'"
 
+#~ msgid "Product UoM"
+#~ msgstr "Proizvod JM"
+
+#~ msgid "Logistic"
+#~ msgstr "Logistika"
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr "Ne postoji konto dohotka definiran za ovaj proizvod: \"%s\" (id:%d)"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Planirate prodati %.2f %s ali vam je raspoloživo samo %.2f %s !\n"
+#~ "Prava zaliha je %.2f %s. (bez rezervacija)"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "U ovisnosti o postavkama izlazne lokacije, premještaj između izlaznog "
+#~ "područja i kupca se izvršava preko otpremnice ručno ili automatski."
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Ne možete pobrisati stavku narudžbe koja je %s !"
@@ -2788,6 +3001,10 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "   Month   "
 #~ msgstr "   Mjesec   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Upozorenje"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -2802,6 +3019,12 @@ msgstr "Faktura na temelju dostava"
 #~ "\n"
 #~ "EAN: %s Količina: %s Vrsta ul: %s"
 
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Pogreška! Ne možete kreirati rekurzivne tvrtke."
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Glavno vrijeme dostave"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Zaključite isporuku"
 
@@ -2817,6 +3040,12 @@ msgstr "Faktura na temelju dostava"
 #~ "želite li da se roba dostavlja čim je jedan proizvod dostupan ili će se "
 #~ "čekati dostupnost svih proizvoda."
 
+#~ msgid "Image"
+#~ msgstr "Slika"
+
+#~ msgid "Packings"
+#~ msgstr "Pakiranja"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Tijek konfiguracije"
 
@@ -2835,12 +3064,19 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Shipped Qty"
 #~ msgstr "Otpremljena količina"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Vaša faktura je uspješno kreirana!"
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Promijeni postavke aplikacije za upravljanje prodajom"
 
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Poboljšanje redoslijeda rasporeda"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Pogreška"
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "Ne možete pobrisati narudžbe koje su već potvrđene !"
@@ -2848,10 +3084,16 @@ msgstr "Faktura na temelju dostava"
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Uobičajena pravila otpreme"
 
+#~ msgid "Delivered"
+#~ msgstr "Dostavljeno"
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Nema dovoljno robe na zalihi !"
 
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Morate pridijeliti lot proizvodnje ovom proizvodu"
+
 #~ msgid "Layout Sequence"
 #~ msgstr "Redoslijed rasporeda"
 
@@ -2871,3 +3113,248 @@ msgstr "Faktura na temelju dostava"
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr "Omogućuje svojstva za poboljšavanje rasporeda izvještaja narudžbi."
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Faktura na temelju dostava"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Prodajni nalog možete fakturirati po pojedinim stavkama s ovog popisa. "
+#~ "Alternativno možete napraviti fakturu prema ponudi."
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Prodaja po prodavaču"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Prodaja po prodavaču u zadnjih 90 dana"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Upravljačka ploča menadžera prodaje"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Izvršava nalog za nabavu za svaku stavku prodajnog naloga."
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Ponuda '%s' je pretvorena u prodajni nalog."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Ne možete napraviti predujam prema prodajnom nalogu koji je definiran kao "
+#~ "'Automatska faktura nakon dostave'."
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Prvo morate otkazati sve skladišne dokumente vezane uz ovaj prodajni nalog."
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Nije moguće otkazati ovaj prodajni nalog!"
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Za svaku stavku prodajnog naloga kreira se nalog za nabavu proizvoda koji se "
+#~ "prodaje."
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Prema prodajnim nalozima"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr "Ne postoji dnevnik prodaje definiran za ovu tvrtku: \"%s\" (id:%d)"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Prodaja po partneru"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Nije moguće otkazati stavku prodajnog naloga!"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Prodaja po mjesecu"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Pokazatelj da je prodajni nalog dostavljen. Ovo polje se ažurira samo nakon "
+#~ "pokretanja planera."
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Prodaja po kupcu u zadnjih 90 dana"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr "Ne može se obrisati stavka prodajnog naloga koji je u stanju '%s'!"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Prodajni nalog iz tekućeg mjeseca"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Nije moguće otkazati prodajni nalog!"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Faktura na temelju prodajnih naloga"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Prodaja po kategoriji proizvoda"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr "Odaberite kupca prije izbora proizvoda!"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr "Morate prije otkazati sve odabire vezane uz ovaj prodajni nalog."
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "Ovo je lista odabira generirana za prodajni nalog."
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr "Možete napraviti fakture prema ponudama ili otpremnicama."
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Prodaja po kategoriji proizvoda u zadnjih 90 dana"
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "Kada se prodajni nalog potvrdi, otvara se forma sa listom za odabir i kreira "
+#~ "se nalog za nabavu. Lista odabira dodjeljuje stavke prodajnom nalogu. "
+#~ "Postoji jedna lista odabira za svaku stavku narudžbe koje se proširuje "
+#~ "ovisno o dostupnosti dijelova."
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Prodajni nalog iz tekuće godine"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Prodaja po mjesecu"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Nalog za nabavu se automatski kreira čim je prodajni nalog potvrđen ili "
+#~ "faktura plaćena. Nalog pokreće nabavu i proizvodnju prema pravilima i "
+#~ "parametrima iz prodajnog naloga. "
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Prodajni nalog '%s' je otkazan."
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr "Morate prije otkazati sve fakture vezane uz ovaj prodajni nalog."
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Jedan nalog za nabavu za svaku stavku prodajnog naloga i za svaku komponentu."
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Prodajni nalog otvoren u prošlom mjesecu"
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Ovdje možete otvarati nove prodavaonice i upravljati sa njima. Svaka nova "
+#~ "ponuda ili prodajni nalog moraju biti povezani sa prodavaonicom. "
+#~ "Prodavaonica definira sa kojeg skladišta će biti dostavljen proizvod za "
+#~ "svaku izvršenu prodaju."
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Prodajni nalog '%s' je postavljen u stanje nacrta."
+
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Zahtjev za prodajnim nalogom"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Faktura temeljena na isporukama"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Ako želite obrisati potvrđeni prodajni nalog, morate ga prvo otkazati! \r\n"
+#~ "Da biste otkazali prodajni nalog, morate prvo otkazati sve vezane dokumente."
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "Naziv organizacije mora biti jedinstven!"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Vezna oznaka je već korištena."
+
+#~ msgid "Month-1"
+#~ msgstr "Mjesec-1"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Greška kod konfiguracije!"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Isporuči svaki proizvod kada je dostupan"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Fakturiraj prema narudžbi nakon isporuke"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Razno"
+
+#~ msgid "Options"
+#~ msgstr "Postavke"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Isporuči sve proizvode odjednom"
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Da li se dostava naplaćuje?"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Količina (JM)"
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Količina (JM)"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Platiti prije isporuke"
+
+#~ msgid "Reference UoM"
+#~ msgstr "Referentna JM"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "Ne postoji odgovarajući cjenik za ovaj proizvod i količinu.\n"
+#~ "Odaberite drugi proizvod, količinu ili cjenik."
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Isporučiti i fakturirati na zahtjev"
diff --git a/addons/sale/i18n/hu.po b/addons/sale/i18n/hu.po
index f1971a5bcbc..2d3e9c97aa3 100644
--- a/addons/sale/i18n/hu.po
+++ b/addons/sale/i18n/hu.po
@@ -6,22 +6,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:41+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
+"PO-Revision-Date: 2012-10-19 17:22+0000\n"
+"Last-Translator: Herczeg Péter <herczegp@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: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Előlegszámla"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Árajánlat megerősítése"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Megerősítés dátuma"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Csoportosítás..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -30,62 +177,345 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Az értékesítő eladásai az utolsó 90 napban"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Elosztási partner"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Megrendelés állapota"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Ha nincs elegendő áruja raktáron, hogy egyszerre leszállítson mindent, "
-"elfogadja a részleges szállításokat?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Számlázandó"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Szállítási cím a jelenlegi értékesítési megbízáshoz."
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Az értékesítési megbízás megerősítésének dátuma."
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Mennyiség"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Árajánlatok"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Nap"
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Március"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Vállalat"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Számla kelte"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Ki nem számlázott, de kiszállított tételek"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Az előlegszámla összege."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Számlázási hiba"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "A végösszeg."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analitikus számla"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Részösszeg"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Rendelés visszavonása"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "A %s árajánlat értékesítési megbízássá lett alakítva."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Súly"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Figyelem!"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Rendelés"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Üzenetek"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Szeptember"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Adók"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Nettó érték"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Nettó ár:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Visszavonva"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Összesen"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Üzlet"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Hiba az értékesítés során"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Számlázási cím"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Az értékesítési megbízás létrehozásának dátuma."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Számla újrakészítése"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Számlák létrehozása"
 
 #. module: sale
 #: report:sale.order:0
@@ -93,77 +523,648 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Beszerzési megbízást generál minden értékesítési megbízási sorhoz."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analitikus számla"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Ez egy lista az összes számlázandó értékesítési megbízási sorról. Az "
-"értékesítési megbízásokat részben is lehet számlázni, a megbízási sorok "
-"alapján. Nem szükséges ez a lista, ha a kiszállítási megbízásból számláz, "
-"vagy ha egyben számlázza a teljes értékesítést."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Beszerzési megbízás"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Megerősítés dátuma"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Sorok száma"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# mennyiség"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Értékesítési megbízás"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Mennyiség (EE)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Előleg"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Megerősítve"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Alapértelmezett fizetési feltétel"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Megerősítés"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr "Olvasatlan üzenetek"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Szállítási cím"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Év"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "Rendelési sor"
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Olvasatlan üzenetek"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
 msgstr ""
-"Az értékesítési megbízások segítik Önt az árajánlatok és az "
-"ügyfélmegrendelések kezelésében. Azt javasoljuk, hogy kezdje a folyamatot az "
-"árajánlat elkészítésével az OpenERP-ben. Ha az árajánlatot megerősítette, "
-"abból létrejön egy értékesítési megbízás. Az OpenERP több terméktípust is "
-"tud kezelni, úgy, hogy egy értékesítési megbízás feladatokat, kiszállítási "
-"megbízásokat, gyártási rendeléseket, szállítói megrendeléseket stb. indít "
-"el. Az értékesítési megbízás beállítása alapján automatikusan "
-"számlapiszkozatot hoz létre, amelyet Önnek csak jóvá kell hagynia, amikor "
-"számlát készít az ügyfele részére."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Megrendelés száma"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Megrendelési tételek"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Áreng. (%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Rendeléshivatkozás"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Számlasorok"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Teljes ár"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Régi árajánlatok"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+"Jelölje be a négyzetet az ugyanazon vevőhöz tartozó számlák "
+"csoportosításához."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Számlák készítése"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Létrehozás dátuma"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Ütemezésre vár"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Az aktuális értékesítési megbízás számlázási címe."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Rendelt mennyiségek"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Mennyiség"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Bruttó ár:"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Értékesítéseim"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Érvénytelen művelet!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "ÁFA pozíció"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Július"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Árajánlat dátuma"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Megrendelés dátuma"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Számla generálása értékesítésből"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Árengedmény (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Nem készíthet számlát ehhez az értékesítési megbízási sorhoz, az alábbi okok "
+"egyikének következtében:\n"
+"1. Az értékesítési megbízás sorának állapota: \"Tervezet\" vagy \"Mégsem\".\n"
+"2.  Az értékesítési megbízás sor már kiszámlázásra került."
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Árajánlataim"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "December"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Kiszállított"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Hónap"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sorszám"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nem számlázott"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Termékkaterógia"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr "Üzenet"
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Üzlet neve"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Adók:"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Értékesítési Fizetési számla"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Folyamatban"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nincs vevő megadva!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Számlák létrehozása"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -182,1215 +1183,9 @@ msgstr ""
 "amelyeket a kapcsolódó feladatok ellátásával töltöttünk el."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Alapértelmezett fizetési feltétel"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Állapot"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Áreng. (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Teljes ár"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-"Jelölje be a négyzetet az ugyanazon vevőhöz tartozó számlák "
-"csoportosításához."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Rendelt mennyiségek"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Az értékesítő eladásai"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Leltármozgás"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Rendeléshivatkozás"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Egyéb információ"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Dátumok"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"A számla automatikusan létrejön, ha a kiszállítási szabály: számlázás "
-"kiszedésből vagy számlázás kiszállítás után."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Számla generálása értékesítésből"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Árengedmény (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Árajánlataim"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Értékesítői vezérlőpult"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Csomagolás"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Értékesítési megbízásból"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Üzlet neve"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nincs vevő megadva!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Hiba az értékesítés során"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Feltételek"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Nem határozott meg bevételi számlát a termékkategória alapértelmezett "
-"tulajdonságai között vagy az ÁFA pozíció nincs meghatározva!"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Augusztus"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Termékeket próbál hozzárendelni a nem azonos termékből"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "érvénytelen mód a tesztállapotban"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Június"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Nem lehet visszavonni ezt az értékesítési megbízást!"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Értékesítési megbízási statisztikák"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Az értékesítési megbízáshoz kapcsolódó analitikus számla."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Október"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Árajánlatok"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "A jelenlegi értékesítési megbízás árlistája."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "ÁFA:"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"A megrendelés megerősítése és a termékek vevőnek történő kiszállítása között "
-"eltelt napok száma."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Árajánlat dátuma"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "ÁFA pozíció"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "ME"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Csomagok száma"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Folyamatban"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Az értékesítő megerősíti az árajánlatot, az értékesítési megbízás állapota a "
-"következőkre változik: \"Folyamatban\" vagy \"Manuális vezérléssel "
-"folyamatban\""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Először érvénytelenítenie kell az ehhez az értékesítési megbízási sorhoz "
-"tartozó készletmozgásokat."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(nem alkalmazható)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Válasszon egy szolgáltatási típusú terméket, amelyet \"Előlegterméknek\" "
-"nevezünk. Létrehozhatja és beállíthatja alapértelmezett értékként ebben a "
-"mezőben."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Nem haladhat tovább egy olyan értékesítési megbízással, amelyre a következő "
-"parancsot adta meg: \"Automatikus számlázás kiszállítás után\"."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Megjegyzések"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Az aktuális értékesítési megbízás számlázási címe."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Számlázott"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Kiszállítási megbízás"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Megerősítés dátuma"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Nemzetközi Kereskedelmi Feltételek"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Elosztási partner"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Március"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "A végösszeg."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Részösszeg"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Számlázási cím:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Minden értékesítési megbízási sorhoz létrejön egy beszerzési megbízás is az "
-"eladott termék előteremtésére."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Az INCOTERMS, amely azt jelenti, hogy \"Nemzetközi Kereskedelmi "
-"Feltételek\", a nemzetközi kereskedelmi tranzakciókban használatos "
-"szakkifejezéseket tartalmazza."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Számlázási cím"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Számlázatlan sorok keresése"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Árajánlat / Megrendelés"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Sorok száma"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Értékesítési gyűjtő számla"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Értékesítési megbízási sor"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Raktár"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Megrendelés száma"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Megrendelési tételek"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Nettó összeg"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Számla sorai"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Mennyiség (ME)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Létrehozás dátuma"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Ki nem számlázott, de kiszállított tételek"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Bruttó ár:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Értékesítéseim"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Érvénytelen művelet!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Extra információ"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Árlista"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# mennyiség"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Megrendelés dátuma"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Kiszállított"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Összes árajánlat"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Szeptember"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Termékkaterógia"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Adók:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Készletmozgások"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Megrendelés állapota"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Biztosan létre akarja hozni a számlá(ka)t?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Havi eladások"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Nem lehet visszavonni az értékesítési megbízási sort!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Biztonsági napok"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Az eladott anyagok beszerzése"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Számla létrehozása"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Szállítási cím"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Jelzi, hogy az értékesítési megbízás kiszállításra került. Ez a mező csak "
-"akkor frissül, ha az ütemező(k) elindult(ak)."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Kiterjesztett szűrők…"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Hiba"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Vállalatok"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Előzmények"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Ez egy olyan számlalista, amely ehhez az értékesítési megbízáshoz jött "
-"létre. Ugyanaz az értékesítési megbízás több alkalommal is számlázásra "
-"kerülhetett (például sorok alapján)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Az Ön hivatkozása"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "A megrendelést vagy árajánlatot igénylő kapcsolat neve és címe."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "A vevőknek ígért, biztonsági okokból hozzáadott napok száma."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Menny."
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Hivatkozások"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Mégsem"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Számla készítése"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Végösszeg adók nélkül"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "A számla sikeresen elkészült!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Partnerenkénti eladások"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Megrendelési kapcsolattartó"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Számla megnyitása"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Nem határozott meg értékesítési naplót a következő vállalat számára: \"%s\" "
-"(id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Hozzárendelés eröltetése"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Megendelésre"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "A kiszálított vagy a megrendelt mennyiség alapján."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Kapcsolódó kiszedések"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Név"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Szállítási cím:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Vevőnkénti eladások az utolsó 90 napban"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Az értékesítési megbízás tervezet állapota"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Kiszállítási megbízás létrehozása"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Végösszeg adókkal együtt"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Kiszedési lista létrehozása"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Termékkategóriánkénti eladások"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Árajánlat megerősítése"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Hiba"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Csoportosítás..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Számla újrakészítése"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Számlázandó kiszállítások"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Ütemezésre vár"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Beszerzési módszer"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Kiszedési lista"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Tervezet beállítása"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Dokumentum a gyártásnak vagy a vevőnek irányuló árumozgásról."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Érvényesítés"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Megrendelés megerősítése"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Beszerzési megbízás létrehozása"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Adók"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Az értékesítési megbízás létrehozásának dátuma."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Készletmozgás"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Számlák létrehozása"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Előleg"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Kiszállított mennyiség"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Számla az értékesítési megbízás alapján"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Kiszedési lista"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Hiba!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Nem lehet visszavonni az értékesítési megbízást!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Július"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Beszerzés"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Szállítási hiba"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Számlák csoportosítása"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Ellenőrizendő a könyvelő által."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Hivatkozási ME"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
@@ -1399,14 +1194,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Számla létrehozása az értékesítési megbízási sorból"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Számlázási hiba"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Irányítja a beszerzést és a számlázást"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Tervezet"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1414,574 +1204,10 @@ msgid "Paid"
 msgstr "Fizetve"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Értékesítési elemzés"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Csomagolás újrakészítése"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Tulajdonságok"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Árajánlat"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Az értékesítő manuálisan létrehoz egy számlát, hogy ha az értékesítési "
-"megbízás szállítási szabálya: \"Szállítás és manuális vezérléssel "
-"folyamatban\". A számla automatikusan létrejön , ha a szállítási szabály: "
-"\"Fizetés kiszállítás előtt\"."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Létrehozhat számlát értékesítési megbízások vagy kiszállítások alapján."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Értékesítés"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Egységár"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Kész"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Számla"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Válasszon ki egy vevőt az értékesítési űrlapon !\n"
-"Kérem válasszon ki egy vevőt, mielőtt terméket választ."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Forrás dokumentum"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Teendő"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Kiválasztási szabály"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokumentum a vevőnek történő mozgásról."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Összeg adó nélkül."
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Először vissza kell vonnia minden ehhez az értékesítési megbízáshoz csatolt "
-"kiválasztást."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Értékesítési Fizetési számla"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Hónap"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Termék"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Számla sztornó"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Számlázás alapja"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Rendelés dátuma"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Termék eladási egysége"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuális vezérléssel folyamatban"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Termék ME"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logisztika"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Megrendelés"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "Nem határozott meg bevételi számlát erre a termékre: %s (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Hiba figyelmen kívül hagyása"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Az értékesítési megbízás számlázási beállításaitól függően a számla "
-"alapulhat a kiszállítási vagy a megrendelési mennyiségen. A rendszer az "
-"értékesítési megbízásból létrehozhat egy számlát vagy egy kiszállítási "
-"megbízást, amint az értékesítő megerősíti azt."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"El szertné adni a következő mennyiséget: %.2f %s, de csak a következő "
-"mennyiség érhető el a raktáron: %.2f %s!\n"
-"A valós készlet: %.2f %s. (foglalások nélkül)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Állapotok"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Vevői hivatkozás"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Összesen"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Ár"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"A kiadási hely beállításától függően a kiadási terület és a vevő telephelye "
-"közötti árumozgás manuális vagy automatikus kiszállítási megbízással "
-"kezelhető."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Számlák készítése"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Számlázandó"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Az értékesítési megbízás megerősítésének dátuma."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Vállalat"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Számla kelte"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Az előlegszámla összege."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "Ez egy kiszedési lista ehhez az értékesítési megbízáshoz."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Számlák létrehozása"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Nettó ár:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Visszavonva"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Üzlet"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Megerősítés dátuma"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Figyelmeztetés"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Havi eladások"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Értékesítési megbízás"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Mennyiség (EE)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Megerősítve"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Megerősítés"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Hiba! Nem hozhat létre rekurzív vállalatokat."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Sales by Product's Category in last 90 days"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Számlasorok"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Értékesítési megbízási tételek"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Kiszállítás átfutási idő"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Beállítás"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Nem készíthet számlát ehhez az értékesítési megbízási sorhoz, az alábbi okok "
-"egyikének következtében:\n"
-"1. Az értékesítési megbízás sorának állapota: \"Tervezet\" vagy \"Mégsem\".\n"
-"2.  Az értékesítési megbízás sor már kiszámlázásra került."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Súly"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Számlák"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "December"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Kép"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"A rendszer automatikusan egy beszerzési megbízást hoz létre, amint "
-"megerősítettük az értékesítési megbízást, vagy a számlát kifizették. A "
-"rendszer az értékesítési megbízásokon keresztül irányítja a szállítói "
-"megrendeléseket és a termékek gyártását is a beállított szabályoknak és az "
-"értékesítési megbízás paramétereinek megfelelően. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nem számlázott"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Értékesítő"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Régi árajánlatok"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Nettó érték"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Előlegszámla"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "A következő értékesítési megbízás visszavonásra került: %s"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Tervezet"
-
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -2006,6 +1232,18 @@ msgstr ""
 "* A rendszer a \"Visszavonva\" állapotot állítja be, amikor a kapcsolódó "
 "értékesítési megbízást a felhasználó visszavonja."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Értékesítési megbízások"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Számlák csoportosítása"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2013,58 +1251,171 @@ msgstr "Az adó összege"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Csomagolások"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Állapot"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Augusztus"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
 msgstr ""
 
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Irányítja a beszerzést és a számlázást"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Június"
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Értékesítési megbízások"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Megrendelés"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr "követő"
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Értékesítési bolt"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Értékesítési megbízási statisztikák"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Értékesítési megbízási sor"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "November"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Kiterjesztett szűrők…"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Előlegtermék"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Számítás"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Hiba"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Október"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Az értékesítő manuálisan létrehoz egy számlát, hogy ha az értékesítési "
+"megbízás szállítási szabálya: \"Szállítás és manuális vezérléssel "
+"folyamatban\". A számla automatikusan létrejön , ha a szállítási szabály: "
+"\"Fizetés kiszállítás előtt\"."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Először sztornózza az összes számlát, amely ehhez az értékesítési "
-"megbízáshoz kapcsolódik."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2076,6 +1427,42 @@ msgstr "Január"
 msgid "Sales Order in Progress"
 msgstr "Értékesítési megbízás folyamatban"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Az értékesítő megerősíti az árajánlatot, az értékesítési megbízás állapota a "
+"következőkre változik: \"Folyamatban\" vagy \"Manuális vezérléssel "
+"folyamatban\""
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
@@ -2084,91 +1471,288 @@ msgstr ""
 "igényt."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Árajánlati kötöttség ideje"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "Előzmények"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
-"Egy beszerzési megbízás minden egyes értékesítési megbízási sorhoz és minden "
-"egyes alkotóelemhez."
+"Ez egy olyan számlalista, amely ehhez az értékesítési megbízáshoz jött "
+"létre. Ugyanaz az értékesítési megbízás több alkalommal is számlázásra "
+"kerülhetett (például sorok alapján)."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Hozzárendelés"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Az Ön hivatkozása"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Megrendelési dátum"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Árlista"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "ÁFA:"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "megerősített értékesítési megbízás, amely számlázható."
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Értékesítési megbízási tételek"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Értékesítés"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
-"A rendszer a következő értékesítési megbízást tervezet állapotba állított: %s"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "készletből"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Nap"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Zárás"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Számlák"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Egységár"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Kész"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Számlázási cím:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Számla"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Mégsem"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Követők"
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Kiszállított"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Árajánlat"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Rendeljen hozzá egy gyártási tételt ehhez a termékhez!"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Számlázatlan sorok keresése"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Teendő"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Szállítási cím:"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Értékesítési elemzés"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "A jelenlegi értékesítési megbízás árlistája."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Számla készítése"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Összeg adó nélkül."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
-"Ha egynél több üzletben árulja a vállalata termékeit, akkor azokat az "
-"üzleteket itt kezelheti. Amikor egy új árajánlatot vagy értékesítési "
-"megbízást vesz fel, azt kapcsolnia kell az üzlethez. Az üzlethez kapcsolnia "
-"kell egy raktárat is, ahonnan minden egyes üzletben történő értékesítés "
-"esetén kiszállítják a termékeket."
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2176,61 +1760,67 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Azt jelzi, hogy a számla ki van fizetve."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Termék"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Leírás"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Május"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Vevő"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Előleg"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Február"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Április"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Könyvelés"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Értékesítési megbízás keresése"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Értékesítési megbízás igénylés"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Fizetési feltétel"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Ár"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2248,25 +1838,345 @@ msgstr ""
 "számlázott értékesítéseiről. Ha a forgalmát szeretné elemezni, akkor "
 "használja a számla elemző jelentést a könyvelési modulban."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Biztosan létre akarja hozni a számlá(ka)t?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Egyéb információ"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Menny."
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Ellenőrizendő a könyvelő által."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Szállítási cím a jelenlegi értékesítési megbízáshoz."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Árajánlat / Megrendelés"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Vevő"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Előleg"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Február"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Számlázás alapja"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Rendelés dátuma"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Termék eladási egysége"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Az értékesítési megbízás tervezet állapota"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Forrás dokumentum"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Április"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuális vezérléssel folyamatban"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr "Üzenetek és kommunikáció történet"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Értékesítési megbízás keresése"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Értékesítési megbízásból"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Hiba figyelmen kívül hagyása"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Az értékesítési megbízás számlázási beállításaitól függően a számla "
+"alapulhat a kiszállítási vagy a megrendelési mennyiségen. A rendszer az "
+"értékesítési megbízásból létrehozhat egy számlát vagy egy kiszállítási "
+"megbízást, amint az értékesítő megerősíti azt."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Az értékesítési megbízáshoz kapcsolódó analitikus számla."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Fizetési feltétel"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Árajánlat száma"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Vevői hivatkozás"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Kiszedve"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Év"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Számlák kiszállítások alapján"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Végösszeg adókkal együtt"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Számlázott"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
 
 #~ msgid "Reference"
 #~ msgstr "Hivatkozás"
@@ -2274,24 +2184,58 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgid "VAT"
 #~ msgstr "ÁFA"
 
+#~ msgid "Extra Info"
+#~ msgstr "Extra információ"
+
 #~ msgid "Net Price"
 #~ msgstr "Nettó ár"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Kiszállított mennyiség"
+
+#~ msgid "Warehouse"
+#~ msgstr "Raktár"
+
+#~ msgid "Salesman"
+#~ msgstr "Értékesítő"
+
 #~ msgid "Order Ref"
 #~ msgstr "Rendelési hiv."
 
 #~ msgid "Sales Process"
 #~ msgstr "Értékesítési folyamat"
 
-#~ msgid "Sequence"
-#~ msgstr "Sorszám"
+#~ msgid "Properties"
+#~ msgstr "Tulajdonságok"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Hiba"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Készletmozgások"
+
+#~ msgid "Compute"
+#~ msgstr "Számítás"
 
 #~ msgid "Partial Delivery"
 #~ msgstr "Részleges kiszállítás"
 
+#~ msgid "UoM"
+#~ msgstr "ME"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Mennyiség (ME)"
+
+#~ msgid "Packaging"
+#~ msgstr "Csomagolás"
+
 #~ msgid "Procure Method"
 #~ msgstr "Ellátás módja"
 
+#~ msgid "from stock"
+#~ msgstr "készletből"
+
 #~ msgid "Recreate Procurement"
 #~ msgstr "Beszerzés készítése"
 
@@ -2439,9 +2383,15 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgid "Customer Ref"
 #~ msgstr "Vásárló Ref"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "Sales orders"
 #~ msgstr "Rendelések"
 
+#~ msgid "Procurement"
+#~ msgstr "Beszerzés"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Fizetési"
 
@@ -2494,9 +2444,6 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Rendelés ID %s hibás frissítés !"
 
-#~ msgid "Status"
-#~ msgstr "Állapot"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Csomagolás Politika"
 
@@ -2509,9 +2456,6 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgid "One procurement for each product."
 #~ msgstr "Egy beszerzés minden termékhez."
 
-#~ msgid "Sale Order"
-#~ msgstr "Rendelés"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Akciós árlista"
 
@@ -2532,6 +2476,9 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgid "Other data"
 #~ msgstr "Egyéb adat"
 
+#~ msgid "Number Packages"
+#~ msgstr "Csomagok száma"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2575,6 +2522,9 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgid "Sale Invoice"
 #~ msgstr "Számla sztornó"
 
+#~ msgid "Incoterm"
+#~ msgstr "Nemzetközi Kereskedelmi Feltételek"
+
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Előzetes számla megnyitása"
 
@@ -2591,6 +2541,9 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgid "Sale Order Line"
 #~ msgstr "Rendelési tétel"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Számla sztornó"
+
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Számla a csomagolási listából"
 
@@ -2610,12 +2563,18 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgstr ""
 #~ "Nem törölhető(k) az(ok) a megrendelés(ek), amelyik már vissza lett igazolva !"
 
+#~ msgid "Name"
+#~ msgstr "Név"
+
 #~ msgid "New Quotation"
 #~ msgstr "Új árajánlat"
 
 #~ msgid "Total amount"
 #~ msgstr "Teljes összeg"
 
+#~ msgid "Product UoM"
+#~ msgstr "Termék ME"
+
 #~ msgid ""
 #~ "By default, Open ERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2652,9 +2611,15 @@ msgstr "Számlák kiszállítások alapján"
 #~ "Lehet, hogy ugyanaz a megrendelés többször ki lett számlázva (a példa "
 #~ "szerint)."
 
+#~ msgid "States"
+#~ msgstr "Állapotok"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Hiba: Érvénytelen EAN kód"
 
+#~ msgid "Accounting"
+#~ msgstr "Könyvelés"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Megrendeléseim"
 
@@ -2664,24 +2629,73 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgid "All at Once"
 #~ msgstr "Egyszerre"
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Leltármozgás"
+
+#~ msgid "Dates"
+#~ msgstr "Dátumok"
+
+#~ msgid "Conditions"
+#~ msgstr "Feltételek"
+
+#~ msgid "Notes"
+#~ msgstr "Megjegyzések"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Számla sorai"
+
+#~ msgid "All Quotations"
+#~ msgstr "Összes árajánlat"
+
 #~ msgid "  Year  "
 #~ msgstr "  Év  "
 
+#~ msgid "Companies"
+#~ msgstr "Vállalatok"
+
+#~ msgid "References"
+#~ msgstr "Hivatkozások"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Számla megnyitása"
+
+#~ msgid "Related Picking"
+#~ msgstr "Kapcsolódó kiszedések"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Beszerzési módszer"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Szállítási szabályok"
 
+#~ msgid "Stock Move"
+#~ msgstr "Készletmozgás"
+
+#~ msgid "Picking List"
+#~ msgstr "Kiszedési lista"
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Kiszedési lista és Szállítás megrendelése"
 
 #~ msgid "Invoicing"
 #~ msgstr "Számlázás"
 
+#~ msgid "Logistic"
+#~ msgstr "Logisztika"
+
 #~ msgid "   Month   "
 #~ msgstr "   Hónap   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Figyelmeztetés"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Teljes szállítás"
 
+#~ msgid "Image"
+#~ msgstr "Kép"
+
 #~ msgid "Ordered Date"
 #~ msgstr "Megrendelés dátuma"
 
@@ -2691,25 +2705,131 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Alapértelmezett szállítási politika"
 
+#~ msgid "Close"
+#~ msgstr "Zárás"
+
+#~ msgid "State"
+#~ msgstr "Állapot"
+
 #~ msgid "Configure"
 #~ msgstr "Beállítás"
 
+#~ msgid "Reference UoM"
+#~ msgstr "Hivatkozási ME"
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "A számla sikeresen elkészült!"
+
+#~ msgid "Delivered"
+#~ msgstr "Kiszállított"
+
+#~ msgid "Security Days"
+#~ msgstr "Biztonsági napok"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Beállítás előrehaladása"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Megrendelés megerősítése"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Az értékesítő eladásai az utolsó 90 napban"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr ""
 #~ "Lehetővé teszi a kiszállítási költségek kiszámítását az árajánlataiban."
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Ha nincs elegendő áruja raktáron, hogy egyszerre leszállítson mindent, "
+#~ "elfogadja a részleges szállításokat?"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Értékesítési megbízás logisztikájának beállítása"
 
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "A %s árajánlat értékesítési megbízássá lett alakítva."
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Figyelem!"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Beszerzési megbízást generál minden értékesítési megbízási sorhoz."
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Ez egy lista az összes számlázandó értékesítési megbízási sorról. Az "
+#~ "értékesítési megbízásokat részben is lehet számlázni, a megbízási sorok "
+#~ "alapján. Nem szükséges ez a lista, ha a kiszállítási megbízásból számláz, "
+#~ "vagy ha egyben számlázza a teljes értékesítést."
+
+#~ msgid "Procurement Order"
+#~ msgstr "Beszerzési megbízás"
+
+#~ msgid "Order Line"
+#~ msgstr "Rendelési sor"
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Az értékesítési megbízások segítik Önt az árajánlatok és az "
+#~ "ügyfélmegrendelések kezelésében. Azt javasoljuk, hogy kezdje a folyamatot az "
+#~ "árajánlat elkészítésével az OpenERP-ben. Ha az árajánlatot megerősítette, "
+#~ "abból létrejön egy értékesítési megbízás. Az OpenERP több terméktípust is "
+#~ "tud kezelni, úgy, hogy egy értékesítési megbízás feladatokat, kiszállítási "
+#~ "megbízásokat, gyártási rendeléseket, szállítói megrendeléseket stb. indít "
+#~ "el. Az értékesítési megbízás beállítása alapján automatikusan "
+#~ "számlapiszkozatot hoz létre, amelyet Önnek csak jóvá kell hagynia, amikor "
+#~ "számlát készít az ügyfele részére."
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Kiszedési szabály beállítása értékesítési megbízáshoz"
 
+#~ msgid "Force Assignation"
+#~ msgstr "Hozzárendelés eröltetése"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Az értékesítő eladásai"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "A számla automatikusan létrejön, ha a kiszállítási szabály: számlázás "
+#~ "kiszedésből vagy számlázás kiszállítás után."
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Csomagolás újrakészítése"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr "A vevőknek ígért, biztonsági okokból hozzáadott napok száma."
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Értékesítői vezérlőpult"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Tervezet beállítása"
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -2737,25 +2857,121 @@ msgstr "Számlák kiszállítások alapján"
 #~ "  - A \"Számlázás kiszedés alapján\" parancs a számlát a kiszedési eljárás "
 #~ "alatt készíti el."
 
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Nem határozott meg bevételi számlát a termékkategória alapértelmezett "
+#~ "tulajdonságai között vagy az ÁFA pozíció nincs meghatározva!"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Termékeket próbál hozzárendelni a nem azonos termékből"
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "érvénytelen mód a tesztállapotban"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Nem lehet visszavonni ezt az értékesítési megbízást!"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Csak kiszállítási megbízás"
 
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "A megrendelés megerősítése és a termékek vevőnek történő kiszállítása között "
+#~ "eltelt napok száma."
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Először érvénytelenítenie kell az ehhez az értékesítési megbízási sorhoz "
+#~ "tartozó készletmozgásokat."
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(nem alkalmazható)"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Válasszon egy szolgáltatási típusú terméket, amelyet \"Előlegterméknek\" "
+#~ "nevezünk. Létrehozhatja és beállíthatja alapértelmezett értékként ebben a "
+#~ "mezőben."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Nem haladhat tovább egy olyan értékesítési megbízással, amelyre a következő "
+#~ "parancsot adta meg: \"Automatikus számlázás kiszállítás után\"."
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr "Egészítse ki az alap értékesítési alkalmazását további funkciókkal."
 
+#~ msgid "Delivery Order"
+#~ msgstr "Kiszállítási megbízás"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "A megbízási referenciának egyedinek kell lennie!"
 
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Minden értékesítési megbízási sorhoz létrejön egy beszerzési megbízás is az "
+#~ "eladott termék előteremtésére."
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Az INCOTERMS, amely azt jelenti, hogy \"Nemzetközi Kereskedelmi "
+#~ "Feltételek\", a nemzetközi kereskedelmi tranzakciókban használatos "
+#~ "szakkifejezéseket tartalmazza."
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Értékesítési gyűjtő számla"
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr ""
 #~ "Állítsa be az értékesítési munkafolyamatát és az alapértelmezett értékeket."
 
+#~ msgid "Untaxed amount"
+#~ msgstr "Nettó összeg"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Számlázás kiszállítás után"
 
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Biztosan létre akarja hozni a számlá(ka)t?"
 
+#~ msgid "Sales By Month"
+#~ msgstr "Havi eladások"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Nem lehet visszavonni az értékesítési megbízási sort!"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Az eladott anyagok beszerzése"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Számla létrehozása"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Jelzi, hogy az értékesítési megbízás kiszállításra került. Ez a mező csak "
+#~ "akkor frissül, ha az ütemező(k) elindult(ak)."
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -2807,6 +3023,10 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgid "Picking Default Policy"
 #~ msgstr "Alapértelmezett kiszedési szabály"
 
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "A megrendelést vagy árajánlatot igénylő kapcsolat neve és címe."
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr ""
@@ -2819,18 +3039,74 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Értékesítési megbízás árrései"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Végösszeg adók nélkül"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Partnerenkénti eladások"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Megrendelési kapcsolattartó"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Értékesítési alkalmazás beállítása"
 
+#~ msgid "on order"
+#~ msgstr "Megendelésre"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "A kiszálított vagy a megrendelt mennyiség alapján."
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Vevőnkénti eladások az utolsó 90 napban"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Kiszállítási megbízás létrehozása"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Kiszállítási költségek"
 
+#~ msgid "Create Pick List"
+#~ msgstr "Kiszedési lista létrehozása"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Termékkategóriánkénti eladások"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Számlázandó kiszállítások"
+
 #~ msgid "title"
 #~ msgstr "megszólítás"
 
+#~ msgid "Pick List"
+#~ msgstr "Kiszedési lista"
+
 #~ msgid "Order date"
 #~ msgstr "Megrendelési dátum"
 
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Dokumentum a gyártásnak vagy a vevőnek irányuló árumozgásról."
+
+#~ msgid "Validate"
+#~ msgstr "Érvényesítés"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Beszerzési megbízás létrehozása"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Számla az értékesítési megbízás alapján"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Hiba!"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Nem lehet visszavonni az értékesítési megbízást!"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Szállítási hiba"
+
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Szállítás és kézi számlázás"
 
@@ -2852,6 +3128,31 @@ msgstr "Számlák kiszállítások alapján"
 #~ "a leggyakoribb és legegyszerűbb módokat a termékek kiszállítására a vevőnek, "
 #~ "amely csak egy vagy két műveletet igényel a dolgozótól."
 
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Létrehozhat számlát értékesítési megbízások vagy kiszállítások alapján."
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Válasszon ki egy vevőt az értékesítési űrlapon !\n"
+#~ "Kérem válasszon ki egy vevőt, mielőtt terméket választ."
+
+#~ msgid "Picking Policy"
+#~ msgstr "Kiválasztási szabály"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Dokumentum a vevőnek történő mozgásról."
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Először vissza kell vonnia minden ehhez az értékesítési megbízáshoz csatolt "
+#~ "kiválasztást."
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sales order. \n"
 #~ "The exception state is automatically set when a cancel operation occurs in "
@@ -2867,10 +3168,42 @@ msgstr "Számlák kiszállítások alapján"
 #~ "Az \"Ütemezésre vár\" állapot kerül beállításra, ha a számla elfogadásra "
 #~ "került, de vár az ütemezőre, hogy lefusson a \"Rendelés dátuma\" dátumon."
 
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr "Nem határozott meg bevételi számlát erre a termékre: %s (id:%d)"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "El szertné adni a következő mennyiséget: %.2f %s, de csak a következő "
+#~ "mennyiség érhető el a raktáron: %.2f %s!\n"
+#~ "A valós készlet: %.2f %s. (foglalások nélkül)"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Nem határozott meg értékesítési naplót a következő vállalat számára: \"%s\" "
+#~ "(id:%d)"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "A kiadási hely beállításától függően a kiadási terület és a vevő telephelye "
+#~ "közötti árumozgás manuális vagy automatikus kiszállítási megbízással "
+#~ "kezelhető."
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Nem törölheti a következő értékesítési megbízási sort: %s !"
 
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "Ez egy kiszedési lista ehhez az értékesítési megbízáshoz."
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -2878,6 +3211,9 @@ msgstr "Számlák kiszállítások alapján"
 #~ "Megadja a nyereségi árrést az egységár és a bekerülési ár közötti különbség "
 #~ "kiszámításával."
 
+#~ msgid "Sales by Month"
+#~ msgstr "Havi eladások"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -2892,6 +3228,29 @@ msgstr "Számlák kiszállítások alapján"
 #~ "\n"
 #~ "Vonalkód: %s Mennyiség: %s Típus: %s"
 
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Hiba! Nem hozhat létre rekurzív vállalatokat."
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Sales by Product's Category in last 90 days"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Kiszállítás átfutási idő"
+
+#~ msgid "Configuration"
+#~ msgstr "Beállítás"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Hónap - 1    "
 
@@ -2904,6 +3263,25 @@ msgstr "Számlák kiszállítások alapján"
 #~ "azonnal szeretnénk-e szállítani, amint egy termék elkészül, vagy megvárjuk, "
 #~ "amíg az összes termék elkészül."
 
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "A rendszer automatikusan egy beszerzési megbízást hoz létre, amint "
+#~ "megerősítettük az értékesítési megbízást, vagy a számlát kifizették. A "
+#~ "rendszer az értékesítési megbízásokon keresztül irányítja a szállítói "
+#~ "megrendeléseket és a termékek gyártását is a beállított szabályoknak és az "
+#~ "értékesítési megbízás paramétereinek megfelelően. "
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "A következő értékesítési megbízás visszavonásra került: %s"
+
+#~ msgid "Packings"
+#~ msgstr "Csomagolások"
+
 #~ msgid "Product sales"
 #~ msgstr "Termékértékesítés"
 
@@ -2913,21 +3291,58 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgid "Invoicing journals"
 #~ msgstr "Számlanapló"
 
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Először sztornózza az összes számlát, amely ehhez az értékesítési "
+#~ "megbízáshoz kapcsolódik."
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Állítsa be az értékesítési menedzsment alkalmazását!"
 
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Értékesítési megbízás elrendezésének fejlesztése"
 
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Egy beszerzési megbízás minden egyes értékesítési megbízási sorhoz és minden "
+#~ "egyes alkotóelemhez."
+
+#~ msgid "Assign"
+#~ msgstr "Hozzárendelés"
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr ""
 #~ "Nem törölhet olyan értékesítési megbízás(ok)at, amelyeket már megerősített!"
 
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr ""
+#~ "A rendszer a következő értékesítési megbízást tervezet állapotba állított: %s"
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Nincs elég készlet!"
 
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Rendeljen hozzá egy gyártási tételt ehhez a termékhez!"
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Ha egynél több üzletben árulja a vállalata termékeit, akkor azokat az "
+#~ "üzleteket itt kezelheti. Amikor egy új árajánlatot vagy értékesítési "
+#~ "megbízást vesz fel, azt kapcsolnia kell az üzlethez. Az üzlethez kapcsolnia "
+#~ "kell egy raktárat is, ahonnan minden egyes üzletben történő értékesítés "
+#~ "esetén kiszállítják a termékeket."
+
 #~ msgid "Adds commitment, requested and effective dates on Sales Orders."
 #~ msgstr ""
 #~ "Ez a funkció árajánlati kötöttséget, igényelt és tényleges dátumokat ad "
@@ -2943,8 +3358,14 @@ msgstr "Számlák kiszállítások alapján"
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Lépések az értékesítési megbízás kiszállításához"
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Értékesítési megbízás igénylés"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr ""
 #~ "Biztosít néhány funkciót, amelyek fejlesztik értékesítési megbízási riportok "
 #~ "elrendezését."
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Számlák kiszállítások alapján"
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index 0989a3fbc5b..5e74fad2059 100644
--- a/addons/sale/i18n/id.po
+++ b/addons/sale/i18n/id.po
@@ -7,21 +7,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 18:27+0000\n"
 "Last-Translator: opix <inur.opix@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Faktur"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Konfirmasi Penawaran"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Tanggal Konfirmasi"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Dikelompokan berdasarkan ..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -30,62 +178,345 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Penjualan oleh Salesman dalam 90 hari terakhir"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Peruntukan rekanan"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Order Negara"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Jika anda tidak mempunya cukup stok yang akan dikirim, apakah anda setuju "
-"jika hanya dikirim sebagian?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Pada Faktur"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Alamat pengiriman untuk  sales order saat ini."
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Tanggal dimana order penjualan di konfirmasi"
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Kuantitas"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Penawaran"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Hari"
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Maret"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Perusahaan"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Tanggal Invoice"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Baris Order belum terfakturkan dan belum terkirim"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Jumlah harga yang di fakturkan"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Faktur pengecualian"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Jumlah total"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Akun Analisis"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Sub Total"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Batalkan order"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "quotation \"%s\" telah dikonversikan pada sales order"
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Berat"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Peringatan !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Pajak"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Jumlah sebelum kena pajak"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total bersih"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Dibatalkan"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Toko"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Sales dalam Pengecualian"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Alamat Faktur"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Tanggal pesanan penjualan dibuat"
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Buat faktur ulang"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Buat Faktur"
 
 #. module: sale
 #: report:sale.order:0
@@ -93,76 +524,647 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "meningkatkan order pengadaan pada setiap daftar order penjualan"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Akun Analisis"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Berikut adalah daftar pesanan penjualan  dikenakan tagihan. Anda dapat  "
-"membuat invoice penjualan secara parsial, oleh baris sales order. Anda tidak "
-"perlu daftar ini jika dari invoice pengiriman pesanan atau jika dari invoice "
-"total penjualan anda"
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Order procurement"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Rekanan"
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Tanggal konfirmasi"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "batas akhir daftar"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# of Qty"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Sales order"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Kwantitas (UoS)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Kenaikan jumlah"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Dikonfirmasi"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Default Term Pembayaran"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Konfirmasi"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Alamat Pengiriman"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Tahun"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "Daftar Pesanan"
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
 msgstr ""
-"Sales Order membantu Anda  mengelola  menentukan harga  dan pesanan dari "
-"pelanggan Anda. ERP menunjukkan  bahwa  Anda mulai dengan membuat quotation. "
-"Setelah dikonfirmasi, quotation akan dikonversi  menjadi  Sales Order. "
-"OpenERP dapat menangani  beberapa jenis produk  sehingga  pesanan  penjualan "
-" dapat  memicu  tugas, perintah pengiriman, manufaktur pesanan, pembelian "
-"dan sebagainya. Berdasarkan konfigurasi dari  pesanan penjualan,  draft "
-"invoice   akan dibuat sehingga Anda hanya perlu konfirmasi bila Anda ingin "
-"tagihan pelanggan Anda."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "No. Order"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Baris Order"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Potongan (%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referensi Order"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Detail Invoice"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Total Harga"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Quotations Lama"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "centang kotak untuk kelompok invoice untuk pelanggan yang sama"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Buat Faktur"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Tanggal Pembuatan"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Jadwal Tunggu"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Faktur alamat untuk order penjualan saat ini."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Order Kuantitas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Kuantitas"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Sales Saya"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Tindakan tidak valid !"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posisi Fiskal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Tanggal Penawaran"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Tanggal Order"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Rekanan"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Sales membuat invoice"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Potongan (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Faktur tidak dapat dibuat untuk Sales Order Line karena salah satu alasan "
+"berikut:\n"
+"1.The keadaan baris ini pesanan penjualan adalah baik \"draft\" atau "
+"\"cancel\"!\n"
+"2.Aktifitas Line Order Penjualan Faktur!"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Desember"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Dikirimkan"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Bulan"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Belum Difakturkan"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Produk Kategori"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nama toko"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Pajak"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Pembayaran faktur penjualan"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Dalam Proses"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nama konsumen tidak ditemukan"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Buat Faktur"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -180,1209 +1182,9 @@ msgstr ""
 "jumlah  jam yang dihabiskan pada tugas-tugas yang terkait."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Default Term Pembayaran"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Status"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Potongan (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Total Harga"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "centang kotak untuk kelompok invoice untuk pelanggan yang sama"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Order Kuantitas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Penjualan berdasarkan Salesman"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Perpindahan Barang"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referensi Order"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Informasi lainnya"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Tanggal"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"invoice dibuat secara otomatis jika kebijakan pengiriman adalah 'invoicedari "
-"penjemputan' atau 'invoice setelah pengiriman\""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Sales membuat invoice"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Potongan (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Panel utama sales manager"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Kemasan"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Dari Sales Order"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nama toko"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nama konsumen tidak ditemukan"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Sales dalam Pengecualian"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Kondisi"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Tidak ada kategori penghasilan akun didefinisikan  dalam  standar  "
-"Properties  untuk  Produk  Kategori  atau Fiskal Posisi tidak ditemukan!"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agustus"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-"Anda mencoba untuk menetapkan banyak yang tidak dari produk yang sama"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "mode tidak sah untuk test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juni"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Order penjualan ini tidak dapat dibatalkan"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistik order penjualan"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Akun  analitik yang terkait  dengan  order penjualan"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Penawaran"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Daftar  harga sales order untuk saat ini"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Jumlah hari antara konfirmasi pemesanan pengiriman produk kepada pelanggan"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Tanggal Penawaran"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posisi Fiskal"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "Satuan"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Nomor Kemasan"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Dalam Proses"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Salesman ini mengkonfirmasikan penawaran.status  penjualan menjadi 'Dalam "
-"proses \"atau\" Proses manual'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Anda harus terlebih dahulu membatalkan stock bergerak yang ada  pada daftar "
-"penjualan."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "tidak tersedia"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Pilih produk jenis layanan  yang disebut 'Advanced Produk'. Anda mungkin "
-"harus membuat  dan mengaturnya  sebagai  nilai  default  pada bagian ini"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "telepon"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Anda tidak dapat membuat  pesanan penjualan yang diartikan sebagai  'invoice "
-"Otomatis  setelah pengiriman'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Catatan"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Faktur alamat untuk order penjualan saat ini."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Terinvoice"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Pengiriman Order"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Tanggal Konfirmasi"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Peruntukan rekanan"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Maret"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Jumlah total"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Sub Total"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Alamat faktur"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Untuk setiap daftar pemesanan, a order pembelian dibuat untuk  persediaan  "
-"produk yang terjual."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterms yang merupakan singkatan dari  'istilah Komersial Internasional' "
-"menyiratkan seri istilah penjualan yang digunakan dalam transaksi komersial."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Alamat Faktur"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Pencarian daftar yang tidak terfakturkan"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "penawaran/permintaan"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "batas akhir daftar"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Buka Faktur Penjualan"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Daftar order penjualan"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Gudang"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "No. Order"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Baris Order"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Total sebelum pajak"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Daftar untuk faktur"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Kuantitas"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Tanggal Pembuatan"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Baris Order belum terfakturkan dan belum terkirim"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Sales Saya"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Tindakan tidak valid !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Penjelasan lebih lanjut"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Harga"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# of Qty"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Tanggal Order"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Dikirimkan"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Semua Penawaran"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Produk Kategori"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Pajak"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Stok Bergerak"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Order Negara"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Apakah anda benar-benar ingin membuat faktur ?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Penjualan berdasarkan Bulan"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Daftar penjualan tidak dapat di batalkan !"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Keamanan hari"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Pengadaan material yang dijual"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Buat Faktur Final"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Alamat Pengiriman"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Ini mengindikasikan bahwa order penjualan telah di kirim. Kolom ini di "
-"update hanya setelah penjadwalan telah di jalankan"
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Filter Tambahan"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Pengecualian"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Perusahaan"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Riwayat"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"ini adalah daftar invoice yang telah dibuat untuk  ini sales order. Atas "
-"penjualan yang sama mungkin telah ditagihkan beberapa kali"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Referensi Anda"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "Nama dan alamat kontak yang meminta order atau penawaran"
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Dimana anda menjanjikan kepada pelanggan masalah penambahan hari untuk "
-"keperluan keamanan"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Qty"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referensiya"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Batal"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Buat Faktur"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Jumlah total diluar pajak"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Faktur Anda telah berhasil dibuat !"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Penjualan bedasarkan Partner"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Kontak Pemesanan"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Buka Faktur"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "Tidak ditemukan jurnal penjualan untuk perusahaan :\"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Penetapan Tugas"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Dalam pemesanan"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Berdasarkan pengiriman atau dalam jumlah pemesanan"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Penjemputan terkait"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nama"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Alamat pengiriman :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Penjualan per klien dalam 90 hari terakhir"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "draft order penjualan"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Buat pesanan pengiriman"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Jumlah total termasuk pajak"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Buat daftar penjemputan"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Penjualan berdasarkan Produk Kategori"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Konfirmasi Penawaran"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Kesalahan"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Dikelompokan berdasarkan ..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Buat faktur ulang"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Pengiriman pada faktur"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Jadwal Tunggu"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metode Pengadaan"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Daftar Jemput"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Atur ke draft"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Dokumen pindah ke output atau kepada pelanggan"
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Validasi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "konnfirmasi Order"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Buat Order Pengadaan"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Pajak"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Tanggal pesanan penjualan dibuat"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Perpindahan Stok"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Buat Faktur"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Kenaikan jumlah"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Kwantitas Terkirim"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Tagihan/Invoice berdasakan pada Order Penjualan"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Daftar Jemput"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Ada Kesalahan !!!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Order Penjualan tidak dapat di batalkan !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Pengadaan"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Pengecualian dalam pengiriman"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Mengelompokan Faktur"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Untuk di review oleh akuntan"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referensi UoM"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
@@ -1391,14 +1193,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Penjualan Orderline Buat_invoice"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Faktur pengecualian"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "mendrive pengadaan dan faktur"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Rancangan"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1406,576 +1203,10 @@ msgid "Paid"
 msgstr "Dibayarkan"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analisa Penjualan"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Pengemasan ulang"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Properti"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Quotation"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Salesman akan membuat faktur secara manual, jika kebijakan pengiriman "
-"pesanan penjualan  adalah  'Pengiriman dan Manual dalam Penyelesaian'. "
-"Faktur dibuat 'Pembayaran sebelum Pengiriman' secara otomatis  jika "
-"kebijakan pelayaran."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Dapat menghasilkan tagihan berdasarkan pesanan penjualan atau berdasarkan  "
-"pengiriman."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Sales"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Harga Satuan"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Selesai"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Invoice"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Anda harus memilih pelanggan dalam formulir penjualan!\n"
-"Silakan set satu pelanggan sebelum memilih produk."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Sumber berkas"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Yang harus dilakukan .."
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Kebijakan pengambilan"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Berkas yang pindah pada rekanan"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Jumlah tanpa pajak"
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Anda harus membatalkan terlebih dahulu  semua pengambilan yang ada  pada "
-"order penjualan"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Pembayaran faktur penjualan"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Bulan"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Produk"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Pembatalan penugasan"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Faktur pada .."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Tanggal pemesanan"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Produk UoS"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Proses Manual sedang berlangsung"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Produk UoM"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistik"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Pesanan"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"Disini tidak ditemukan akun pemasukan untuk jenis produk :\"%s\"(id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Abaikan pengecualian"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Tergantung pada kontrol Faktur dari pesanan penjualan, faktur dapat "
-"didasarkan pada jumlah yang disampaikan  atau memerintahkan. Dengan "
-"demikian, perintah penjualan dapat menghasilkan  faktur  atau delivery order "
-" secepat  itu dikonfirmasi  oleh penjual"
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Anda berencana menjual %.2f %s tapi anda hanya mempunyai %.2f %s yang "
-"tersedia !\n"
-"Stok sebenarnya  %.2f %s. (tanpa pemesanan)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Status"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referensi Klien"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Harga"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Tergantung dari konfigurasi  lokasi output, perpindahan antara daerah output "
-"klien selesai melalui pemesanan pengiriman secara manual ataupun secara "
-"otomatis"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Buat Faktur"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Pada Faktur"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Tanggal dimana order penjualan di konfirmasi"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Perusahaan"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Tanggal Invoice"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Jumlah harga yang di fakturkan"
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-"Ini adalah daftar pengambilan yang di hasilkan untuk order penjualan saat ini"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Buat Faktur"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total bersih"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Dibatalkan"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Toko"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Tanggal konfirmasi"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Peringatan"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Penjualan berdasarkan penjualan"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Sales order"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Kwantitas (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"form dari daftar pengambilan dibuat begitu pesanan penjualan "
-"dikonfirmasikan, dalam waktu yang sama seperti  urutan  pengadaan. Ini "
-"merupakan  penugasan  bagian  untuk  urutan  penjualan. Ada 1 daftar "
-"pengambikab dengan  daftar sales order dengan ketersediaan  suku cadang."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Dikonfirmasi"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Konfirmasi"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Error! Anda tidak dapat membuat perusahaan secara berulang ulang"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Penjualan berdasarkan produk kategori dalam 90 hari terakhir"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Detail Invoice"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Baris Order Penjualan"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Lama Waktu Pengiriman"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Pengaturan"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Faktur tidak dapat dibuat untuk Sales Order Line karena salah satu alasan "
-"berikut:\n"
-"1.The keadaan baris ini pesanan penjualan adalah baik \"draft\" atau "
-"\"cancel\"!\n"
-"2.Aktifitas Line Order Penjualan Faktur!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Berat"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Invoices"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Desember"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Gambar"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Perintah pengadaan secara otomatis  dibuat  segera setelah order penjualan "
-"dikonfirmasi atau sebagai faktur dibayar. Ini membuat pembelian dan produksi "
-"produk sehubungan dengan  peraturan  dan parameter urutan's penjualan "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Belum Difakturkan"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Sales"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Quotations Lama"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Jumlah sebelum kena pajak"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Faktur"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "Order penjualan '%s' telah dibatalkan"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Rancangan"
-
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -2000,6 +1231,18 @@ msgstr ""
 "* Pada Status 'Dibatalkan' diatur ketika user membatalkan pesanan penjualan "
 "yang terkait."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Order Penjualan"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Mengelompokan Faktur"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2007,58 +1250,171 @@ msgstr "jumlah pajak"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "kemasan"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agustus"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "mendrive pengadaan dan faktur"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juni"
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Order Penjualan"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pesanan"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Toko Penjualan"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistik order penjualan"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Daftar order penjualan"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "November"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filter Tambahan"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Produk advance"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Hitung"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Pengecualian"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Salesman akan membuat faktur secara manual, jika kebijakan pengiriman "
+"pesanan penjualan  adalah  'Pengiriman dan Manual dalam Penyelesaian'. "
+"Faktur dibuat 'Pembayaran sebelum Pengiriman' secara otomatis  jika "
+"kebijakan pelayaran."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Anda harus terlebih dahulu membatalkan  semua  faktur  yang dilampirkan "
-"dalam sales order."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2070,6 +1426,41 @@ msgstr "Januari"
 msgid "Sales Order in Progress"
 msgstr "Order Penjualan dalam Penyelesaian"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Salesman ini mengkonfirmasikan penawaran.status  penjualan menjadi 'Dalam "
+"proses \"atau\" Proses manual'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
@@ -2077,90 +1468,287 @@ msgstr ""
 "Referensi dokumen yang dihasilkan dari permintaan  pesanan  penjualan."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Kesepakatan yang ditunda"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "Riwayat"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
-"Satu Pengadaan Agar setiap daftar pesanan penjualan dan untuk masing-masing  "
-"komponen."
+"ini adalah daftar invoice yang telah dibuat untuk  ini sales order. Atas "
+"penjualan yang sama mungkin telah ditagihkan beberapa kali"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Menetapkan"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Referensi Anda"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Tanggal Pemesanan"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Harga"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Sales order untuk invoice dikonfirmasi."
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Baris Order Penjualan"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Sales"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "'%s ' sales order telah diatur di  bagian  draf"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Hari"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "dari stok"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Invoices"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Harga Satuan"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
 msgstr "Selesai"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Alamat faktur"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Invoice"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Batal"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Sudah Terkirim"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Quotation"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Anda harus menetapkan lot produksi untuk produk  ini"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Pencarian daftar yang tidak terfakturkan"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Yang harus dilakukan .."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Alamat pengiriman :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analisa Penjualan"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Daftar  harga sales order untuk saat ini"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Buat Faktur"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Jumlah tanpa pajak"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
-"Jika Anda memiliki lebih dari satu toko menjual produk perusahaan Anda,  "
-"Anda dapat  membuat  dan mengelolanya  dari sini. Setiap kali Anda akan "
-"mencatat penawaran baru atau order penjualan, itu harus dikaitkan dengan "
-"toko yang bersangkutan. Toko ini juga mendefinisikan  gudang  dari mana "
-"produk tersebut akan dikirim untuk setiap penjualan tertentu"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2168,61 +1756,67 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Ini mengindikasikan bahwa faktur telah di bayar"
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Produk"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Gambaran"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Mei"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Customer"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Advance"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Februari"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "April"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Akunting"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Pencarian Order Penjualan"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Permintaan Order Penjualan"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Termin Pembayaran"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Harga"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2240,35 +1834,368 @@ msgstr ""
 "belum. Jika Anda ingin menganalisis  omset  Anda, Anda harus menggunakan  "
 "laporan  Analisis  Faktur  dalam  aplikasi  Akuntansi"
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "telepon"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Apakah anda benar-benar ingin membuat faktur ?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Informasi lainnya"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Qty"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Untuk di review oleh akuntan"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Alamat pengiriman untuk  sales order saat ini."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "penawaran/permintaan"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Customer"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Advance"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Februari"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Faktur pada .."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Tanggal pemesanan"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Produk UoS"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "draft order penjualan"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Sumber berkas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "April"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Proses Manual sedang berlangsung"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Pencarian Order Penjualan"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Dari Sales Order"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Abaikan pengecualian"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Tergantung pada kontrol Faktur dari pesanan penjualan, faktur dapat "
+"didasarkan pada jumlah yang disampaikan  atau memerintahkan. Dengan "
+"demikian, perintah penjualan dapat menghasilkan  faktur  atau delivery order "
+" secepat  itu dikonfirmasi  oleh penjual"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Akun  analitik yang terkait  dengan  order penjualan"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Termin Pembayaran"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Quotation N°"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referensi Klien"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Sudah Diambil"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Tahun"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Invoice berdasarkan pengiriman"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Jumlah total termasuk pajak"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Terinvoice"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
 
 #~ msgid "Recreate Procurement"
 #~ msgstr "Pengadaan kembali"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Pengiriman Order"
+
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Invoice berhasil dibuat"
 
 #~ msgid "Partial Delivery"
 #~ msgstr "Pengiriman Sebagian"
 
+#~ msgid "from stock"
+#~ msgstr "dari stok"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Jika anda tidak mempunya cukup stok yang akan dikirim, apakah anda setuju "
+#~ "jika hanya dikirim sebagian?"
+
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Pengiriman, dari gudang ke pelanggan"
 
@@ -2286,6 +2213,15 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ "Langkah konfigurasi ini digunakan untuk membuat standart pengepakan ketika "
 #~ "membuat order penjualan"
 
+#~ msgid "Validate"
+#~ msgstr "Validasi"
+
+#~ msgid "Notes"
+#~ msgstr "Catatan"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Perpindahan Barang"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Ditagihkan setelah pengiriman"
 
@@ -2307,6 +2243,9 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ msgid "Reference"
 #~ msgstr "Referensi"
 
+#~ msgid "Extra Info"
+#~ msgstr "Penjelasan lebih lanjut"
+
 #~ msgid ""
 #~ "The sale order will automatically create the invoice proposition (draft "
 #~ "invoice). Ordered and delivered quantities may not be the same. You have to "
@@ -2328,6 +2267,12 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ msgid "Procure Method"
 #~ msgstr "Metode Pengadaan"
 
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Tagihan/Invoice berdasakan pada Order Penjualan"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Kwantitas Terkirim"
+
 #, python-format
 #~ msgid ""
 #~ "You have to select a customer in the sale form !\n"
@@ -2345,6 +2290,12 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ "Pertama anda harus membatalkan semua kemasan sudah terlampir dalam penjualan "
 #~ "ini"
 
+#~ msgid "Warehouse"
+#~ msgstr "Gudang"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Total sebelum pajak"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Buat Invoice"
 
@@ -2354,6 +2305,9 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ msgid "Manual Description"
 #~ msgstr "Keterangan Manual"
 
+#~ msgid "Confirm Order"
+#~ msgstr "konnfirmasi Order"
+
 #~ msgid "Packing"
 #~ msgstr "Kemasan"
 
@@ -2366,21 +2320,116 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ msgid "Payment accounts"
 #~ msgstr "Akun Pembayaran"
 
+#~ msgid "Configuration"
+#~ msgstr "Pengaturan"
+
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Salah: UoS dan UoM harus berbeda kategori"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Salah dalam penyusunan format XML"
 
+#~ msgid "Procurement"
+#~ msgstr "Pengadaan"
+
+#~ msgid "Close"
+#~ msgstr "Selesai"
+
+#~ msgid "All Quotations"
+#~ msgstr "Semua Penawaran"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "Konsep Invoice"
 
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Pembayaran Sebelum Pengiriman"
 
+#~ msgid "Order Line"
+#~ msgstr "Daftar Pesanan"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Peringatan !"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Penetapan Tugas"
+
+#~ msgid "Dates"
+#~ msgstr "Tanggal"
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Pengemasan ulang"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Dimana anda menjanjikan kepada pelanggan masalah penambahan hari untuk "
+#~ "keperluan keamanan"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Panel utama sales manager"
+
+#~ msgid "Packaging"
+#~ msgstr "Kemasan"
+
+#~ msgid "Conditions"
+#~ msgstr "Kondisi"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr ""
+#~ "Anda mencoba untuk menetapkan banyak yang tidak dari produk yang sama"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Atur ke draft"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Tidak ada kategori penghasilan akun didefinisikan  dalam  standar  "
+#~ "Properties  untuk  Produk  Kategori  atau Fiskal Posisi tidak ditemukan!"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Hanya Order Pengiriman saja"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "mode tidak sah untuk test_state"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Order penjualan ini tidak dapat dibatalkan"
+
+#~ msgid "Number Packages"
+#~ msgstr "Nomor Kemasan"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Jumlah hari antara konfirmasi pemesanan pengiriman produk kepada pelanggan"
+
+#~ msgid "UoM"
+#~ msgstr "Satuan"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "tidak tersedia"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Anda harus terlebih dahulu membatalkan stock bergerak yang ada  pada daftar "
+#~ "penjualan."
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Pilih produk jenis layanan  yang disebut 'Advanced Produk'. Anda mungkin "
+#~ "harus membuat  dan mengaturnya  sebagai  nilai  default  pada bagian ini"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Referensi order harus unik !"
 
@@ -2388,18 +2437,74 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ msgstr ""
 #~ "Meningkatkan Aplikasi Penjualan anda dengan fungsionalitas  tambahan."
 
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Untuk setiap daftar pemesanan, a order pembelian dibuat untuk  persediaan  "
+#~ "produk yang terjual."
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterms yang merupakan singkatan dari  'istilah Komersial Internasional' "
+#~ "menyiratkan seri istilah penjualan yang digunakan dalam transaksi komersial."
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Set alur proses penjulan dan nilai dasar"
 
+#~ msgid "Lines to Invoice"
+#~ msgstr "Daftar untuk faktur"
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Buka Faktur Penjualan"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Kuantitas"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Faktur Pada Order Setelah Pengiriman"
 
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Apakah anda benar-benar ingin membuat faktur ?"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Stok Bergerak"
+
 #~ msgid "  Year  "
 #~ msgstr "  Tahun  "
 
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Daftar penjualan tidak dapat di batalkan !"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Penjualan berdasarkan Bulan"
+
+#~ msgid "Security Days"
+#~ msgstr "Keamanan hari"
+
+#~ msgid "Companies"
+#~ msgstr "Perusahaan"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Buat Faktur Final"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Pengadaan material yang dijual"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Ini mengindikasikan bahwa order penjualan telah di kirim. Kolom ini di "
+#~ "update hanya setelah penjadwalan telah di jalankan"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Nama dan alamat kontak yang meminta order atau penawaran"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Tanggal Order Penjualan"
 
@@ -2411,18 +2516,83 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ msgstr ""
 #~ "Anda tidak dapan membatalkan daftar penjualan yang telah difakturkan !"
 
+#~ msgid "Sales by Partner"
+#~ msgstr "Penjualan bedasarkan Partner"
+
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Margin Pesanan Penjualan"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Jumlah total diluar pajak"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Konfugurasi aplikasi penjualan"
 
+#~ msgid "Open Invoice"
+#~ msgstr "Buka Faktur"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Kontak Pemesanan"
+
+#~ msgid "Compute"
+#~ msgstr "Hitung"
+
+#~ msgid "on order"
+#~ msgstr "Dalam pemesanan"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Penjualan per klien dalam 90 hari terakhir"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Berdasarkan pengiriman atau dalam jumlah pemesanan"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Buat pesanan pengiriman"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Biaya Pengiriman"
 
+#~ msgid "Related Picking"
+#~ msgstr "Penjemputan terkait"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Pengiriman pada faktur"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Metode Pengadaan"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Penjualan berdasarkan Produk Kategori"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Buat daftar penjemputan"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Kebijakan dalam pengiriman"
 
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Dokumen pindah ke output atau kepada pelanggan"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Buat Order Pengadaan"
+
+#~ msgid "Pick List"
+#~ msgstr "Daftar Jemput"
+
+#~ msgid "Stock Move"
+#~ msgstr "Perpindahan Stok"
+
+#~ msgid "Picking List"
+#~ msgstr "Daftar Jemput"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Order Penjualan tidak dapat di batalkan !"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Ada Kesalahan !!!"
+
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Faktur pengiriman"
 
@@ -2436,6 +2606,18 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ msgid "Sales Management"
 #~ msgstr "Manajemen Penjualan"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Pengecualian dalam pengiriman"
+
+#~ msgid "Reference UoM"
+#~ msgstr "Referensi UoM"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Dapat menghasilkan tagihan berdasarkan pesanan penjualan atau berdasarkan  "
+#~ "pengiriman."
+
 #~ msgid ""
 #~ "By default, OpenERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2447,16 +2629,77 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ "yang paling umum dan sederhana untuk memberikan produk kepada pelanggan "
 #~ "dalam operasi salah satu atau dua oleh pekerja."
 
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Anda harus memilih pelanggan dalam formulir penjualan!\n"
+#~ "Silakan set satu pelanggan sebelum memilih produk."
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Daftar jemput dan pengiriman pesanan"
 
+#~ msgid "Picking Policy"
+#~ msgstr "Kebijakan pengambilan"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Anda harus membatalkan terlebih dahulu  semua pengambilan yang ada  pada "
+#~ "order penjualan"
+
+#~ msgid "Cancel Assignation"
+#~ msgstr "Pembatalan penugasan"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Berkas yang pindah pada rekanan"
+
 #~ msgid "Invoicing"
 #~ msgstr "Faktur"
 
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Disini tidak ditemukan akun pemasukan untuk jenis produk :\"%s\"(id:%d)"
+
+#~ msgid "Logistic"
+#~ msgstr "Logistik"
+
+#~ msgid "Product UoM"
+#~ msgstr "Produk UoM"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr "Tidak ditemukan jurnal penjualan untuk perusahaan :\"%s\" (id:%d)"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Tidak dapat menghapus daftar pesanan penjualan  yang% s!"
 
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Tergantung dari konfigurasi  lokasi output, perpindahan antara daerah output "
+#~ "klien selesai melalui pemesanan pengiriman secara manual ataupun secara "
+#~ "otomatis"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Anda berencana menjual %.2f %s tapi anda hanya mempunyai %.2f %s yang "
+#~ "tersedia !\n"
+#~ "Stok sebenarnya  %.2f %s. (tanpa pemesanan)"
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr ""
+#~ "Ini adalah daftar pengambilan yang di hasilkan untuk order penjualan saat ini"
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -2464,9 +2707,27 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ "Memberikan margin keuntungan berdasaran perhitungan dari perbedaan antara "
 #~ "harga unit dengan ongkos produksi"
 
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "form dari daftar pengambilan dibuat begitu pesanan penjualan "
+#~ "dikonfirmasikan, dalam waktu yang sama seperti  urutan  pengadaan. Ini "
+#~ "merupakan  penugasan  bagian  untuk  urutan  penjualan. Ada 1 daftar "
+#~ "pengambikab dengan  daftar sales order dengan ketersediaan  suku cadang."
+
 #~ msgid "   Month   "
 #~ msgstr "   Bulan   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Peringatan"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Penjualan berdasarkan penjualan"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -2490,15 +2751,44 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ "anda ingin menyampaikan sesegera mungkin ketika  satu produk  yang tersedia "
 #~ "atau Anda menunggu bahwa semua  produk  yang tersedia"
 
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Penjualan berdasarkan produk kategori dalam 90 hari terakhir"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Bulan - 1    "
 
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Lama Waktu Pengiriman"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Error! Anda tidak dapat membuat perusahaan secara berulang ulang"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Pengiriman Selesai"
 
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Perintah pengadaan secara otomatis  dibuat  segera setelah order penjualan "
+#~ "dikonfirmasi atau sebagai faktur dibayar. Ini membuat pembelian dan produksi "
+#~ "produk sehubungan dengan  peraturan  dan parameter urutan's penjualan "
+
+#~ msgid "Salesman"
+#~ msgstr "Sales"
+
 #~ msgid "Product sales"
 #~ msgstr "Produk penjualan"
 
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Order penjualan '%s' telah dibatalkan"
+
+#~ msgid "Packings"
+#~ msgstr "kemasan"
+
 #~ msgid "Ordered Date"
 #~ msgstr "Tanggal pemesanan"
 
@@ -2511,6 +2801,15 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ msgid "Invoicing journals"
 #~ msgstr "Faktur Jurnal"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Faktur Anda telah berhasil dibuat !"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Anda harus terlebih dahulu membatalkan  semua  faktur  yang dilampirkan "
+#~ "dalam sales order."
+
 #~ msgid "Shipped Qty"
 #~ msgstr "Kuantitas yang dikirim"
 
@@ -2520,10 +2819,34 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Order Penjualan Layout Peningkatan"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Kesalahan"
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Satu Pengadaan Agar setiap daftar pesanan penjualan dan untuk masing-masing  "
+#~ "komponen."
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "Tidak dapat menghapus Order Penjualan  yang sudah dikonfirmasi!"
 
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Jika Anda memiliki lebih dari satu toko menjual produk perusahaan Anda,  "
+#~ "Anda dapat  membuat  dan mengelolanya  dari sini. Setiap kali Anda akan "
+#~ "mencatat penawaran baru atau order penjualan, itu harus dikaitkan dengan "
+#~ "toko yang bersangkutan. Toko ini juga mendefinisikan  gudang  dari mana "
+#~ "produk tersebut akan dikirim untuk setiap penjualan tertentu"
+
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Kebijakan Dasar Pengiriman"
 
@@ -2531,9 +2854,18 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ msgid "Not enough stock !"
 #~ msgstr "Stok tidak mencukupi"
 
+#~ msgid "Delivered"
+#~ msgstr "Sudah Terkirim"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Anda harus menetapkan lot produksi untuk produk  ini"
+
 #~ msgid "Layout Sequence"
 #~ msgstr "Urutan rancangan"
 
+#~ msgid "Accounting"
+#~ msgstr "Akunting"
+
 #~ msgid "Adds commitment, requested and effective dates on Sales Orders."
 #~ msgstr ""
 #~ "Menambahkan komitmen, tanggal diminta dan efektif pada Permintaan Penjualan."
@@ -2545,6 +2877,15 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ "Memungkinkan Anda untuk mengelompokan  dan membuat faktur pengiriman pesanan "
 #~ " Anda sesuai dengan jenis faktur yang berbeda: harian, mingguan, dll"
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Permintaan Order Penjualan"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "meningkatkan order pengadaan pada setiap daftar order penjualan"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Penjualan oleh Salesman dalam 90 hari terakhir"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Konfigurasi Logistik Sales Order"
 
@@ -2552,9 +2893,54 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ msgstr ""
 #~ "Memungkinkan Anda untuk menghitung biaya pengiriman pada quotations Anda."
 
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "quotation \"%s\" telah dikonversikan pada sales order"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Berikut adalah daftar pesanan penjualan  dikenakan tagihan. Anda dapat  "
+#~ "membuat invoice penjualan secara parsial, oleh baris sales order. Anda tidak "
+#~ "perlu daftar ini jika dari invoice pengiriman pesanan atau jika dari invoice "
+#~ "total penjualan anda"
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Sales Order membantu Anda  mengelola  menentukan harga  dan pesanan dari "
+#~ "pelanggan Anda. ERP menunjukkan  bahwa  Anda mulai dengan membuat quotation. "
+#~ "Setelah dikonfirmasi, quotation akan dikonversi  menjadi  Sales Order. "
+#~ "OpenERP dapat menangani  beberapa jenis produk  sehingga  pesanan  penjualan "
+#~ " dapat  memicu  tugas, perintah pengiriman, manufaktur pesanan, pembelian "
+#~ "dan sebagainya. Berdasarkan konfigurasi dari  pesanan penjualan,  draft "
+#~ "invoice   akan dibuat sehingga Anda hanya perlu konfirmasi bila Anda ingin "
+#~ "tagihan pelanggan Anda."
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Penjualan berdasarkan Salesman"
+
+#~ msgid "State"
+#~ msgstr "Status"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Konfigurasi Pengambil Kebijakan untuk Sales Order"
 
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "invoice dibuat secara otomatis jika kebijakan pengiriman adalah 'invoicedari "
+#~ "penjemputan' atau 'invoice setelah pengiriman\""
+
 #~ msgid "Configure"
 #~ msgstr "Pengaturan"
 
@@ -2584,6 +2970,17 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ "- 'invoice Dari Picking' Pilihan ini digunakan untuk membuat invoice selama "
 #~ "proses pengambilan."
 
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Anda tidak dapat membuat  pesanan penjualan yang diartikan sebagai  'invoice "
+#~ "Otomatis  setelah pengiriman'."
+
+#~ msgid "Procurement Order"
+#~ msgstr "Order procurement"
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -2631,12 +3028,24 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ "     * Grafik kasus bulan ini.\n"
 #~ "    "
 
+#~ msgid "References"
+#~ msgstr "Referensiya"
+
 #~ msgid "title"
 #~ msgstr "Judul:"
 
+#~ msgid "Name"
+#~ msgstr "Nama"
+
 #~ msgid "Order date"
 #~ msgstr "Tanggal order"
 
+#~ msgid "Properties"
+#~ msgstr "Properti"
+
+#~ msgid "States"
+#~ msgstr "Status"
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sales order. \n"
 #~ "The exception state is automatically set when a cancel operation occurs in "
@@ -2652,17 +3061,39 @@ msgstr "Invoice berdasarkan pengiriman"
 #~ "Pada Status 'Waiting Schedule' ini mengatur kapan Invoice dikonfirmasi "
 #~ "tetapi menunggu scheduler yang akan dijalankan pada tanggal 'Tanggal Ordered'"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
+#~ msgid "Image"
+#~ msgstr "Gambar"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr ""
 #~ "Menyediakan beberapa fitur untuk meningkatkan  tata letak  laporan  Sales "
 #~ "Order."
 
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "'%s ' sales order telah diatur di  bagian  draf"
+
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Langkah-langkah untuk pengiriman sales order."
 
+#~ msgid "Assign"
+#~ msgstr "Menetapkan"
+
 #~ msgid "VAT"
 #~ msgstr "VAT"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Invoice berdasarkan pengiriman"
diff --git a/addons/sale/i18n/is.po b/addons/sale/i18n/is.po
index d873d86fe48..eb63c95d891 100644
--- a/addons/sale/i18n/is.po
+++ b/addons/sale/i18n/is.po
@@ -7,20 +7,168 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-29 17:26+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Icelandic <is@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Samkvæmt Tímaskjali"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Dags Staðfestingar"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr ""
 
 #. module: sale
 #: view:sale.order.line:0
@@ -30,62 +178,345 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Sala eftir sölumanni síðustu 90 daga"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Ef þú hefur ekki nægan lager til að afhenta allt í einu, villtu þá leyfa að "
-"senda hluta sendingar eða ekki?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Sendingar heimilisfang fyrir þessa sölupöntun."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Magn"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Dags. hvenær sölu pöntun er staðfest."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Dagur"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Dags. Reiknings"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Afpanta sölupöntun"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Tilboðið '%s' hefur verið breitt í sölupöntun"
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Prenta Tilboð"
+msgid "Quotation "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Aðvörun !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Dags. hvenær sölu pöntun er gerð."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -93,73 +524,642 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Dags. Staðfest"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_summary:0
 msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-"Til að eyða staðfestri sölupöntun, verður þú að af-panta hana fyrst ! Til að "
-"af-panta sölupöntun, verður þú fyrst að af-panta tengdar færslur einnig."
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Sjálfgefnir greiðslu skilmálar"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Afsl.(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Tilvísun í Pöntun"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Samtals Verð"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Hakið í boxið til að taka saman reikninga fyrir hvern viðskiptavin"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Búið til þann"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Pantað Magn"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Magn"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Dags Tilboðs"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Dags. Pöntunar"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Tilboð og Sölur"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "Viðskipta aðili"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Gera reikn út frá sendingum"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Sölu lína"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Sölur gera reikninga"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Afsláttur (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mín Tilboð"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nafn Verslunar"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Enginn viðskiptavinur skilgreindur !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
 msgstr ""
-"Sölu pantanir hjálpa við að halda utan um tilboð og pantanir frá "
-"viðskiptavinum. OpenERP mælir með því að þú byrjir á því að gera tilboð. "
-"Þegar það er staðfest, verður tilboðið að sölupöntun. OpenERP getur ráðið "
-"við nokkrar gerðir af vörum svo sölu pöntunin setur af stað  verk, "
-"vörusendingu, framleiðslu pöntun, innkaup o.s.fr. \r\n"
-"Byggt á hvernig sölupöntunin er gerð, verður til uppkast af reikning sem "
-"þarf að staðfesta þegar senda á reikning á viðskiptavininn."
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -176,1185 +1176,9 @@ msgstr ""
 "var í verk."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Sjálfgefnir greiðslu skilmálar"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Byggt á afhentu magni"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "Aðal einingar formið"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Staða"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Afsl.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Samtals Verð"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Hakið í boxið til að taka saman reikninga fyrir hvern viðskiptavin"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mínar sölupantanir"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Pantað Magn"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Sala eftir Sölumanni"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Lager færslur"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Tilvísun í Pöntun"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Aðrar upplýsingar"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Dagsetningar"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Tilboð og Sölur"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Sölur gera reikninga"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr "Viðvörun út frá verðlista!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Afsláttur (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mín Tilboð"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Mælaborð Sölustjóra"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Frá sölu pöntun"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nafn Verslunar"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Enginn viðskiptavinur skilgreindur !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Dags Tilboðs"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Dags Staðfestingar"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Búið til þann"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Dags. Pöntunar"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr ""
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Dags."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Sala á hvern Viðskiptavin síðustu 90 daga"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Pöntunar dags. sölupöntunar"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Staðfesta"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Dags. hvenær sölu pöntun er gerð."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
@@ -1363,13 +1187,8 @@ msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
+#: selection:sale.order.line,state:0
+msgid "Draft"
 msgstr ""
 
 #. module: sale
@@ -1378,540 +1197,8 @@ msgid "Paid"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Reikningar Viðskiptavinar"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr ""
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Dags Pantað"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Tilvísun viðskiptavinar"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Dags. hvenær sölu pöntun er staðfest."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Dags. Reiknings"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Dags. Staðfest"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr ""
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr ""
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Sölumaður"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
 #. module: sale
@@ -1928,6 +1215,18 @@ msgid ""
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -1935,55 +1234,166 @@ msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
+#: view:sale.order.line:0
+msgid "Order"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Viðvörun út frá verðlista!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Dags."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr ""
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
+#: selection:sale.order.line,state:0
+msgid "Exception"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
 
 #. module: sale
@@ -1996,31 +1406,97 @@ msgstr ""
 msgid "Sales Order in Progress"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2028,56 +1504,225 @@ msgstr ""
 msgid "Date Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Reikningar Viðskiptavinar"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr ""
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Dagur"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
 msgstr ""
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
@@ -2086,17 +1731,152 @@ msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Aðrar upplýsingar"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Sendingar heimilisfang fyrir þessa sölupöntun."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Viðskiptavinur"
@@ -2111,45 +1891,190 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Dags Pantað"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Mínar sölupantanir"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Search Sales Order"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1255
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "Not enough stock ! : "
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Frá sölu pöntun"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2158,19 +2083,147 @@ msgid "Quotation N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Tilvísun viðskiptavinar"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Pöntunar dags. sölupöntunar"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Sala eftir sölumanni síðustu 90 daga"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Samkvæmt Tímaskjali"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Ef þú hefur ekki nægan lager til að afhenta allt í einu, villtu þá leyfa að "
+#~ "senda hluta sendingar eða ekki?"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Tilboðið '%s' hefur verið breitt í sölupöntun"
+
+#~ msgid "Print Quotation"
+#~ msgstr "Prenta Tilboð"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Gera reikn út frá sendingum"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Til að eyða staðfestri sölupöntun, verður þú að af-panta hana fyrst ! Til að "
+#~ "af-panta sölupöntun, verður þú fyrst að af-panta tengdar færslur einnig."
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Aðvörun !"
+
 #~ msgid "VAT"
 #~ msgstr "VSK"
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Sölu pantanir hjálpa við að halda utan um tilboð og pantanir frá "
+#~ "viðskiptavinum. OpenERP mælir með því að þú byrjir á því að gera tilboð. "
+#~ "Þegar það er staðfest, verður tilboðið að sölupöntun. OpenERP getur ráðið "
+#~ "við nokkrar gerðir af vörum svo sölu pöntunin setur af stað  verk, "
+#~ "vörusendingu, framleiðslu pöntun, innkaup o.s.fr. \r\n"
+#~ "Byggt á hvernig sölupöntunin er gerð, verður til uppkast af reikning sem "
+#~ "þarf að staðfesta þegar senda á reikning á viðskiptavininn."
+
+#~ msgid "Order Line"
+#~ msgstr "Sölu lína"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Aðal einingar formið"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Byggt á afhentu magni"
+
+#~ msgid "State"
+#~ msgstr "Staða"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Lager færslur"
+
+#~ msgid "Dates"
+#~ msgstr "Dagsetningar"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Sala eftir Sölumanni"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Mælaborð Sölustjóra"
+
+#~ msgid "Validate"
+#~ msgstr "Staðfesta"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Sala á hvern Viðskiptavin síðustu 90 daga"
+
+#~ msgid "Salesman"
+#~ msgstr "Sölumaður"
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index 4bf25b9b9c9..9b544ae5f0b 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -6,21 +6,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 18:26+0000\n"
 "Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Fattura di acconto"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirm Quotation"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Data di conferma"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Raggruppa per..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -29,62 +177,345 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Vendite per commerciale negli ultimi 90 giorni"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ripartizione Partner"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Stato Ordine"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Se non si ha disponibile a magazzino tutto il materiale da consegnare in una "
-"sola volta, si accetta comunque la spedizione parziale oppure no?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Da fatturare"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Ordine di spedizione per l'ordine di vendita corrente"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Data nella quale l'ordine di vendita viene confermato."
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Quantità"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Preventivi"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Giorno"
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Azienda"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Data fattura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Righe Consegnate e Non Fatturate"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Il totale da fatturare in anticipo."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Eccezione Fattura"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Il prezzo totale"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Contabilità Analitica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotale"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Annulla Ordine"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Il preventivo '%s' è stato trasformato in un ordine di vendita"
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Attenzione!"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Ordine di Vendita"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Settembre"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Tasse"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Totale Imponibile"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Totale netto:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Annullato"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Totale"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Negozio"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Vendite in Eccezione"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Indirizzo Fatturazione"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Data nella quale l'ordine di vendita è creato"
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Ricrea Fattura"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crea fatture"
 
 #. module: sale
 #: report:sale.order:0
@@ -92,77 +523,647 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-"Imposta gli ordini di approvvigionamento per ogni linea d'ordine di vendita"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Contabilità Analitica"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Questa è la lista di tutte le linee da fatturare relative agli ordini di "
-"vendita. E' possibile fatturare parzialmente un ordine di vendita, per "
-"linea. Non è necessario usare questa funzionalità se si intende fatturare le "
-"spedizioni o effettuare fatture totali relative all'ordine di vendita."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Ordine di approvvigionamento"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Data conferma"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Numero Righe"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Q.tà"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Ordine di vendita"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Quantità (Unità di Vendita)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Importo di anticipo"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confermato"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Scadenza Pagamento Predefinita"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Conferma"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Indirizzo Spedizione"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Anno"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "Riga Ordine"
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
 msgstr ""
-"Gli ordini di vendita consentono di gestire preventivi e ordini dai vostri "
-"clienti. OpenERP ti suggerisce di iniziare con la creazione di un "
-"preventivo. Una volta confermato, il preventivo sarà convertito in un ordine "
-"di vendita. OpenERP è in grado di gestire diversi tipi di prodotti, in modo "
-"che un ordine di vendita può trasformarsi in ordini di consegna, ordini di "
-"fabbricazione, acquisti e così via. In base alla configurazione dell 'ordine "
-"di vendita, verrà generata un fattura tipo, in modo che devi solo confermare "
-"quando la si desidera inviare al cliente."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Ordine N°"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Righe Ordine"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Sconto (%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Rif. Ordine"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Righe Fattura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Prezzo Totale"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Vecchi preventivi"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+"Spuntare il box per raggruppare le fatture riferite agli stessi clienti"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Genera fatture"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Data creazione"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "In attesa di pianificazione"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Indirizzo di fatturazione per questo ordine di vendita."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Quantità Ordinate"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Quantità"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Totale :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Le mie vendite"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Azione non valida !"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posizione Fiscale"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Luglio"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Data preventivo"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Data dell'ordine"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Crea fattura di vendita"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Sconto (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"La fattura non può essere creata per questa linea d'ordine di vendita per "
+"una delle seguenti ragioni:\n"
+"1. La linea dell'ordine si trova nello stato \"bozza\" o \"cancellato\"!\n"
+"2. La linea dell'ordine di vendita è stata fatturata!"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "I Miei Preventivi"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Dicembre"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Spedite"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mese"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sequenza"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Non fatturata"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoria prodotto"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nome Negozio"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Tasse"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Anticipo su fattura di vendita"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "In corso"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nessun cliente definito!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crea fatture"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -180,1214 +1181,9 @@ msgstr ""
 "corrispondono alle ore impiegate nell'attività associata."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Scadenza Pagamento Predefinita"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Stato"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Sconto (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Prezzo Totale"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-"Spuntare il box per raggruppare le fatture riferite agli stessi clienti"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Quantità Ordinate"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Vendite per venditori"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Spostamenti Inventario"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Rif. Ordine"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Altre informazioni"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Date"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"La fattura viene creata automaticamente se il metodo di spedizione risulta "
-"'Fattura da prelievo' o 'Fattura su ordine dopo la consegna'."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Crea fattura di vendita"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Sconto (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "I Miei Preventivi"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Dashboard Gestione Vendite"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Confezionamento"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Da un ordine di vendita"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nome Negozio"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nessun cliente definito!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Vendite in Eccezione"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Condizioni"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Non è stato definito un conto di categoria ricavo nelle proprietà di default "
-"della categoria prodotti oppure non è stato definita una posizione fiscale!"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-"Si sta cercando di assegnare un lotto non legato allo stesso prodotto"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "stato invalido per test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Giugno"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Non è possibile cancellare questo ordine di vendita!"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistiche ordini di vendita"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Il conto analitico legato all'ordine di vendita."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Ottobre"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Preventivi"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Listino prezzi per l'ordine di vendita corrente."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Numero di giorni che intercorrono fra la conferma dell'ordine e la "
-"spedizione della merce al cliente"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Data preventivo"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posizione Fiscale"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "UoM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Numero di Packages (divisione spedizione)"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "In corso"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Il venditore conferma il preventivo. Lo stato dell'ordine di vendita diventa "
-"quindi 'In corso' o 'In corso manualmente'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"È necessario prima cancellare i movimenti di magazzino collegati a questa "
-"linea d'ordine."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/d)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Selezionare un prodotto di tipo serivizio chiamato 'Prodotto Avanzato'. "
-"Potrebbe essere necessario creare questo prodotto ed impostarlo come valore "
-"predefinito di questo campo."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Non è possibile far avanzare la pratica su un ordine di vendita a cui è "
-"stato impostata la modalità 'Fatturazione automatica dopo la consegna'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Note"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Indirizzo di fatturazione per questo ordine di vendita."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fatturato"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Ordine di consegna"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Data di conferma"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Ripartizione Partner"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzo"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Il prezzo totale"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotale"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Indirizzo di Fatturazione"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Per ogni linea d'ordine viene creato un ordine di approvvigionamento per "
-"permettere la fornitura del prodotto venduto."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterms, contrazione di 'International commercial terms', è una serie di "
-"termini di vendita utilizzati nelle transazioni commerciali fra stati."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Indirizzo Fatturazione"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Cerca linee non ancora fatturate"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Preventivo / Ordine"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Numero Righe"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "(?)Vendite fatture aperte"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Linea d'ordine di vendita"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazzino"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Ordine N°"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Righe Ordine"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Totale Imponibile"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Righe da fatturare"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Quantità (Unità di misura)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Data creazione"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Righe Consegnate e Non Fatturate"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Totale :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Le mie vendite"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Azione non valida !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Informazioni Aggiuntive"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Listino Prezzi"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Q.tà"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Data dell'ordine"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Spedite"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Tutti i Preventivi"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Settembre"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Categoria prodotto"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Tasse"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Spostamenti Stock"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Stato Ordine"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Si desidera veramente creare la(le) fattura(e)?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Vendite per mese"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Impossibile cancellare la linea dell'ordine di vendita!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Giorni di sicurezza"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Approviggionamento della merce venduta"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Creare la fattura finale"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Indirizzo Spedizione"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Indica che l'ordine di vendita è stato consegnato. Questo campo viene "
-"aggiornato solo dopo che lo (gli) scheduler sono partiti."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Filtri estesi..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Eccezione"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Aziende"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Cronologia"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Lista delle fatture generate per questo ordine di vendita. Lo stesso ordine "
-"di vendita infatti può essere scisso in diverse fatture (ad esempio per "
-"linea d'ordine)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Riferimento"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-"Il nome e l'indirizzo del contatto che ha richiesto l'ordine o il preventivo"
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"I giorni aggiunti per sicurezza al tempo di consegna promesso al cliente"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Qta'"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Riferimenti"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Annulla"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Crea fattura"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Totale non tassato"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "La fattura è stata generata correttamente!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Vendite per partner"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Contatto Ordinante"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Apri Fattura"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Non è stato definito un registro vendite per questa azienda: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forza Assegnazione"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "su Ordine"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Basato sulle quantità spedite o ordinate."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Prelievi correlati"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Indirizzo Spedizione:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Vendite per cliente negli ultimi 90 giorni"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Stato bozza dell'ordine di vendita"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Crea ordine di consegna"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Totale (tasse incluse)"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Crea lista di prelievo"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Vendite per categoria prodotto"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirm Quotation"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Errore"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Raggruppa per..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Ricrea Fattura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Consegne da fatturare"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "In attesa di pianificazione"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metodo di approvvigionamento"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Lista prelievo"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Imposta come Bozza"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Documento del movimento verso area di uscita o verso area cliente."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Convalida"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Conferma Ordine"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Crea l'ordine di approvvigionamento"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Tasse"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Data nella quale l'ordine di vendita è creato"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Movimento di magazzino"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Crea fatture"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Importo di anticipo"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Quantità Spedite"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Fattura basata su Ordini di Vendita"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Documento di trasporto"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Errore!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Non è possibile cancellare l'ordine di vendita!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Luglio"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Approvvigionamento"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Eccezione Spedizione"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Raggruppa Fatture"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Richiede una revisione del responsabile della contabilità."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "UoM di riferimento"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
@@ -1396,14 +1192,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Genera fattura - linea ordine di vendita"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Eccezione Fattura"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Regola approvigionamenti e fatturazione"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Bozza"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1411,577 +1202,10 @@ msgid "Paid"
 msgstr "Pagato"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analisi delle vendite"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Ricrea imballaggio"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Proprietà"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Preventivo"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Se il metodo di spedizione dell'ordine di vendita è 'Shipping and Manual in "
-"Progress' il venditore crea una fattura manualmente. La fattura viene invece "
-"creata automaticamente quando il metodo di spedizione è 'Pagamento prima "
-"della consegna'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"E' possibile generare fatture a partire dagli ordini di vendita o a partire "
-"dalle spedizioni."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Vendite"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Prezzo unitario"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Completato"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Fattura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"È necessario selezionare un cliente nel form di vendita!\n"
-"Selezionare quindi un cliente prima di scegliere un prodotto."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Documento sorgente"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Da fare"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Politica di prelievo"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documento del movimento per il cliente."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Totale senza la tassazione"
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"È necessario prima cancellare tutti i prelievi legati a questo ordine di "
-"vendita."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Anticipo su fattura di vendita"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mese"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Prodotto"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Annulla Assegnazione"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Fattura su"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Data ordine"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Unità di Vendita Prodotto"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuale in Progresso"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Unità di Misura Prodotto"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistica"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Ordine"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"Non è definito alcun conto di ricavo per questo prodotto:\"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignora eccezione"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"La fattura sarà riferita alla quantità consegnata o alla quantità ordinata "
-"in funzione del controllo dell'ordine di vendita della fattura stessa. "
-"Quindi un ordine di vendita può generare una fattura o un ordine di consegna "
-"non appena confermato da un venditore."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Si è pianificata la vendita di %.2f %s ma è disponibile solo la quantità  "
-"%.2f %s !\n"
-"Lo stock reale è pari a %.2f %s. (senza quantità riservate)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Stati"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Riferimento cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Totale"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Prezzo"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Il movimento merci fra l'area magazzino di uscita e il magazzino del cliente "
-"viene effettuato attraverso l'ordine di consegna, manualmente o "
-"automaticamente, in funzione della configurazione dell'area di magazzino in "
-"uscita."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Genera fatture"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Da fatturare"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Data nella quale l'ordine di vendita viene confermato."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Azienda"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Data fattura"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Il totale da fatturare in anticipo."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "Lista di prelievo generata per questo ordine di vendita."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Crea fatture"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Totale netto:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Annullato"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Negozio"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Data conferma"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Attenzione"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Vendite per Mese"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Ordine di vendita"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Quantità (Unità di Vendita)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"Il form della lista di prelievo viene creato non appena l'ordine di vendita "
-"viene confermato, nello stesso tempo dell'ordine di approvvigionamento. Esso "
-"rappresenta l'assegnamento di tutte le merci all'ordine di vendita. Ad ogni "
-"linea d'ordine viene associata una lista prelievo che evolverà in funzione "
-"della disponibilità delle merci."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confermato"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Conferma"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Errore! Non è possibile creare aziende ricorsive."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Vendite per prodotto negli ultimi 90 giorni"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Righe Fattura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Righe Ordine di Vendita"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Tempo di consegna"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configurazione"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"La fattura non può essere creata per questa linea d'ordine di vendita per "
-"una delle seguenti ragioni:\n"
-"1. La linea dell'ordine si trova nello stato \"bozza\" o \"cancellato\"!\n"
-"2. La linea dell'ordine di vendita è stata fatturata!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Fatture"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Dicembre"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Immagine"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Un ordine di approvvigionamento viene creato automaticamente non appena "
-"l'ordine di vendita viene confermato o la fattura viene pagata. Questo "
-"determina l'acquisto e la produzione delle merci in funzione delle regole e "
-"dei parametri dell'ordine di vendita. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Non fatturata"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Venditore"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Vecchi preventivi"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Totale Imponibile"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Fattura di acconto"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "L'ordine di vendita '%s' è stato cancellato."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Bozza"
-
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -2006,6 +1230,18 @@ msgstr ""
 "* Lo stato 'Cancellato' viene impostato quando un utente cancella l'ordine "
 "di vendita associato."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Ordini di Vendita"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Raggruppa Fatture"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2013,58 +1249,171 @@ msgstr "Totale tassa"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Imballaggi"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Stato"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
 msgstr ""
 
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Regola approvigionamenti e fatturazione"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Giugno"
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Ordini di Vendita"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Ordine"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Negozio"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistiche ordini di vendita"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Linea d'ordine di vendita"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Novembre"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtri estesi..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Acconto prodotto"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcola"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Eccezione"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Ottobre"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Se il metodo di spedizione dell'ordine di vendita è 'Shipping and Manual in "
+"Progress' il venditore crea una fattura manualmente. La fattura viene invece "
+"creata automaticamente quando il metodo di spedizione è 'Pagamento prima "
+"della consegna'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"È necessario prima cancellare tutte le fatture legate a questo ordine di "
-"vendita."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2076,96 +1425,329 @@ msgstr "Gennaio"
 msgid "Sales Order in Progress"
 msgstr "Ordini di Vendita in esecuzione"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Il venditore conferma il preventivo. Lo stato dell'ordine di vendita diventa "
+"quindi 'In corso' o 'In corso manualmente'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr "Riferimento del documento che ha creato questa richiesta d'ordine"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Ritardo"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "Cronologia"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
-"Un ordine di approvigionamento per ogni linea d'ordine di vendita e per "
-"ciascuno dei componenti."
+"Lista delle fatture generate per questo ordine di vendita. Lo stesso ordine "
+"di vendita infatti può essere scisso in diverse fatture (ad esempio per "
+"linea d'ordine)."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Assegna"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Riferimento"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Data ordine"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Listino Prezzi"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Ordine di vendita confermato da fatturare."
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Righe Ordine di Vendita"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Vendite"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "L'ordine di vendita '%s' è stato impostato nello stato bozza."
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Giorno"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "da Stock"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Fatture"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Chiudi"
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Prezzo unitario"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Completato"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Indirizzo di Fatturazione"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Fattura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Annulla"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Consegnato"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Preventivo"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "È necessario assegnare un lotto di produzione per questo prodotto"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Cerca linee non ancora fatturate"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Da fare"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Indirizzo Spedizione:"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analisi delle vendite"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Listino prezzi per l'ordine di vendita corrente."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crea fattura"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Totale senza la tassazione"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
-"Se avete più di un negozio per vendere i prodotti dell'azienda, è possibile "
-"creare e gestirli da qui. Ogni volta che registrate un nuovo preventivo o un "
-"ordine di vendita, esso deve essere collegato al negozio. Il negozio "
-"definisce inoltre il deposito da cui i prodotti verranno consegnati per ogni "
-"particolare vendita."
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2173,61 +1755,67 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Indica che una fattura è stata pagata."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Prodotto"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Descrizione"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Maggio"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Avanzamento"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Febbraio"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Aprile"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Contabilità"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Cerca ordine di vendita"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Richiesta ordine di vendita"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Termini di pagamento"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Prezzo"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2245,25 +1833,345 @@ msgstr ""
 "analizzare il proprio fatturato, è necessario utilizzare l'analisi sulle "
 "fatture nell'applicazione di contabilità."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Si desidera veramente creare la(le) fattura(e)?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Altre informazioni"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Qta'"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Richiede una revisione del responsabile della contabilità."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Ordine di spedizione per l'ordine di vendita corrente"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Preventivo / Ordine"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Avanzamento"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Febbraio"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Fattura su"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data ordine"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Unità di Vendita Prodotto"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Stato bozza dell'ordine di vendita"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento sorgente"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Aprile"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuale in Progresso"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Cerca ordine di vendita"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Da un ordine di vendita"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignora eccezione"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"La fattura sarà riferita alla quantità consegnata o alla quantità ordinata "
+"in funzione del controllo dell'ordine di vendita della fattura stessa. "
+"Quindi un ordine di vendita può generare una fattura o un ordine di consegna "
+"non appena confermato da un venditore."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Il conto analitico legato all'ordine di vendita."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Termini di pagamento"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Preventivo N°"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Riferimento cliente"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Prelevato"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Anno"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Fattura basata su Consegne"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Totale (tasse incluse)"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fatturato"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
 
 #~ msgid ""
 #~ "This Configuration step use to set default picking policy when make sale "
@@ -2292,6 +2200,12 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Recreate Procurement"
 #~ msgstr "Ricrea Approvvigionamento"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Ordine di consegna"
+
+#~ msgid "from stock"
+#~ msgstr "da Stock"
+
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "La tua fattura è stata creata con successo!"
 
@@ -2301,6 +2215,9 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Consegna, dal magazzino al cliente."
 
+#~ msgid "Validate"
+#~ msgstr "Convalida"
+
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Dopo aver confermato un ordine, crea una fattura."
 
@@ -2311,12 +2228,21 @@ msgstr "Fattura basata su Consegne"
 #~ "Ogni volta che il pulsante conferma viene cliccato, lo stato di bozza evolve "
 #~ "in manuale, cioè l'imputazione diventa ordine di vendita."
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Spostamenti Inventario"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Assegnazione Manuale"
 
+#~ msgid "Notes"
+#~ msgstr "Note"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Fattura a consegna avvenuta"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Eccezione Spedizione"
+
 #~ msgid "Origin"
 #~ msgstr "Origine"
 
@@ -2335,6 +2261,9 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Procure Method"
 #~ msgstr "Metodo Approvvigionamento"
 
+#~ msgid "Extra Info"
+#~ msgstr "Informazioni Aggiuntive"
+
 #~ msgid "Net Price"
 #~ msgstr "Prezzo Netto"
 
@@ -2364,9 +2293,24 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "All Sales Order"
 #~ msgstr "Tutti gli Ordini di Vendita"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Quantità Spedite"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Fattura basata su Ordini di Vendita"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Negozio di Vendita"
 
+#~ msgid "Warehouse"
+#~ msgstr "Magazzino"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Forza Assegnazione"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Totale Imponibile"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2385,9 +2329,16 @@ msgstr "Fattura basata su Consegne"
 #~ "Quando si seleziona la politica di spedizione = 'Fattura automatica a "
 #~ "consegna avvenuta', sarà creata in  automatico dopo la consegna."
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Errore!"
+
 #~ msgid "Manual Description"
 #~ msgstr "Descrizione Manuale"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Quantità (Unità di misura)"
+
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
@@ -2399,6 +2350,12 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Packing"
 #~ msgstr "Imballaggio"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Conferma Ordine"
+
+#~ msgid "Configuration"
+#~ msgstr "Configurazione"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Fattura su Ordine a consegna effettuata"
 
@@ -2410,21 +2367,36 @@ msgstr "Fattura basata su Consegne"
 #~ "Errore: L'Unità di Vendita deve essere in una categoria diversa da quella "
 #~ "dell'Unità di misura"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "Sales orders"
 #~ msgstr "Ordini di Vendita"
 
+#~ msgid "Procurement"
+#~ msgstr "Approvvigionamento"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Contabilità Pagamenti"
 
+#~ msgid "Close"
+#~ msgstr "Chiudi"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "Bozza Fattura"
 
+#~ msgid "All Quotations"
+#~ msgstr "Tutti i Preventivi"
+
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "Ordine di Vendita da Fatturare"
 
 #~ msgid "Procurement for each line"
 #~ msgstr "Approvvigionamento per ogni riga"
 
+#~ msgid "Order Line"
+#~ msgstr "Riga Ordine"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "Politica standard di ordine consegna"
 
@@ -2435,12 +2407,18 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Non è possibile cancellare un ordine di vendita !"
 
+#~ msgid "Packaging"
+#~ msgstr "Confezionamento"
+
 #~ msgid "Canceled"
 #~ msgstr "Annullato"
 
 #~ msgid "Order Ref"
 #~ msgstr "Rif. Ordine"
 
+#~ msgid "Salesman"
+#~ msgstr "Venditore"
+
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
@@ -2453,6 +2431,9 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Sales Configuration"
 #~ msgstr "Configurazione di vendite"
 
+#~ msgid "on order"
+#~ msgstr "su Ordine"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "Approvvigionamento corretto"
 
@@ -2465,9 +2446,6 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Configura la logistica di ordine di vendita"
 
-#~ msgid "Status"
-#~ msgstr "Stato"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Politiche Preparazione Merci"
 
@@ -2483,15 +2461,15 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "One procurement for each product."
 #~ msgstr "Un approvvigionamento per ciascun prodotto."
 
-#~ msgid "Sale Order"
-#~ msgstr "Ordine di Vendita"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Listino prezzo vendita"
 
 #~ msgid "Direct Delivery"
 #~ msgstr "Consegna Diretta"
 
+#~ msgid "Properties"
+#~ msgstr "Proprietà"
+
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
@@ -2500,18 +2478,25 @@ msgstr "Fattura basata su Consegne"
 #~ "l'ordine di vendita. Questa transazione crea una fattura sulla base "
 #~ "dell'ordine di vendita."
 
+#~ msgid "Compute"
+#~ msgstr "Calcola"
+
 #~ msgid "VAT"
 #~ msgstr "IVA"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Errore"
+
+#~ msgid "Assign"
+#~ msgstr "Assegna"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Crea fattura"
 
 #~ msgid "Sales order lines"
 #~ msgstr "Righe Ordine di Vendita"
 
-#~ msgid "Sequence"
-#~ msgstr "Sequenza"
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "L'ordine di consegna è creato per i prodotti a magazzino"
 
@@ -2558,9 +2543,15 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Sale Invoice"
 #~ msgstr "Fattura di vendita"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Apri la fattura appena creata dell'acconto"
 
+#~ msgid "Ordering Contact"
+#~ msgstr "Contatto Ordinante"
+
 #~ msgid "Deliver"
 #~ msgstr "Consegnare"
 
@@ -2571,6 +2562,9 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Sale Order Line"
 #~ msgstr "Riga Ordine di vendita"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Annulla Assegnazione"
+
 #~ msgid "Make invoices"
 #~ msgstr "Crea fatture"
 
@@ -2585,12 +2579,18 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Non è possibile cancellare Ordine(i) di vendita già confermato(i) !"
 
+#~ msgid "Name"
+#~ msgstr "Nome"
+
 #~ msgid "New Quotation"
 #~ msgstr "Nuovo preventivo"
 
 #~ msgid "Total amount"
 #~ msgstr "Importo Totale"
 
+#~ msgid "Product UoM"
+#~ msgstr "Unità di Misura Prodotto"
+
 #~ msgid "Configure Picking Policy for Sale Order"
 #~ msgstr ""
 #~ "Configura le Politiche di Preparazione Merci per gli Ordini di Vendita"
@@ -2619,9 +2619,18 @@ msgstr "Fattura basata su Consegne"
 #~ "stesso Ordine di Vendita potrebbe essere stato fatturato in momenti diversi "
 #~ "(Es: per righe)."
 
+#~ msgid "States"
+#~ msgstr "Stati"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Errore: codice EAN non valido"
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Fattura basata su Consegne"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Spostamenti Stock"
+
 #~ msgid "My Sales Order"
 #~ msgstr "I Miei Ordini di Vendita"
 
@@ -2646,6 +2655,9 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Invoice from the Packing"
 #~ msgstr "DDT"
 
+#~ msgid "Accounting"
+#~ msgstr "Contabilità"
+
 #~ msgid "Uninvoiced Lines"
 #~ msgstr "Righe non fatturate"
 
@@ -2655,9 +2667,18 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Payment Accounts"
 #~ msgstr "Conto per Pagamenti"
 
+#~ msgid "Number Packages"
+#~ msgstr "Numero di Packages (divisione spedizione)"
+
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Politica di spedizione di default"
 
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "E' possibile generare fatture a partire dagli ordini di vendita o a partire "
+#~ "dalle spedizioni."
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Procedura per consegnare un ordine di vendita"
 
@@ -2678,15 +2699,35 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Invoicing"
 #~ msgstr "Fatturazione"
 
+#~ msgid "Lines to Invoice"
+#~ msgstr "Righe da fatturare"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Consegne da fatturare"
+
 #~ msgid "Order date"
 #~ msgstr "Data dell'ordine"
 
 #~ msgid "Ordered Date"
 #~ msgstr "Data ordine"
 
+#~ msgid "Delivered"
+#~ msgstr "Consegnato"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr ""
+#~ "Il nome e l'indirizzo del contatto che ha richiesto l'ordine o il preventivo"
+
+#~ msgid "Picking Policy"
+#~ msgstr "Politica di prelievo"
+
 #~ msgid "Picking Default Policy"
 #~ msgstr "Politica di prelievo di default"
 
+#~ msgid "Picking List"
+#~ msgstr "Documento di trasporto"
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "DDT & Ordine di consegna"
 
@@ -2706,15 +2747,70 @@ msgstr "Fattura basata su Consegne"
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Questa è la lista di DDT generati per questa Fattura"
 
+#~ msgid "Conditions"
+#~ msgstr "Condizioni"
+
+#~ msgid "Dates"
+#~ msgstr "Date"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Attenzione!"
+
+#~ msgid "State"
+#~ msgstr "Stato"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Permette di calcolare i costi di consegna sul preventivo."
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Se non si ha disponibile a magazzino tutto il materiale da consegnare in una "
+#~ "sola volta, si accetta comunque la spedizione parziale oppure no?"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "(?)Configura la logistica dell'ordine di vendita"
 
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Il preventivo '%s' è stato trasformato in un ordine di vendita"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr ""
+#~ "Imposta gli ordini di approvvigionamento per ogni linea d'ordine di vendita"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Ordine di approvvigionamento"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Configura il metodo di approvvigionamento per l'ordine di vendita"
 
+#~ msgid "Sales by Salesman"
+#~ msgstr "Vendite per venditori"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "La fattura viene creata automaticamente se il metodo di spedizione risulta "
+#~ "'Fattura da prelievo' o 'Fattura su ordine dopo la consegna'."
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Ricrea imballaggio"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "I giorni aggiunti per sicurezza al tempo di consegna promesso al cliente"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Dashboard Gestione Vendite"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Imposta come Bozza"
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -2741,14 +2837,87 @@ msgstr "Fattura basata su Consegne"
 #~ "  - Selezionando infine 'Fattura da prelievo' è possibile creare una fattura "
 #~ "contestualmente al processo di prelievo delle merci."
 
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Non è stato definito un conto di categoria ricavo nelle proprietà di default "
+#~ "della categoria prodotti oppure non è stato definita una posizione fiscale!"
+
 #~ msgid "Configure"
 #~ msgstr "Configura"
 
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr ""
+#~ "Si sta cercando di assegnare un lotto non legato allo stesso prodotto"
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "stato invalido per test_state"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Non è possibile cancellare questo ordine di vendita!"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Numero di giorni che intercorrono fra la conferma dell'ordine e la "
+#~ "spedizione della merce al cliente"
+
+#~ msgid "UoM"
+#~ msgstr "UoM"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "È necessario prima cancellare i movimenti di magazzino collegati a questa "
+#~ "linea d'ordine."
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/d)"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Selezionare un prodotto di tipo serivizio chiamato 'Prodotto Avanzato'. "
+#~ "Potrebbe essere necessario creare questo prodotto ed impostarlo come valore "
+#~ "predefinito di questo campo."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Non è possibile far avanzare la pratica su un ordine di vendita a cui è "
+#~ "stato impostata la modalità 'Fatturazione automatica dopo la consegna'."
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr ""
 #~ "Migliora le funzionalità di base dell'applicazione di vendita con delle "
 #~ "funzionalità aggiuntive."
 
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Per ogni linea d'ordine viene creato un ordine di approvvigionamento per "
+#~ "permettere la fornitura del prodotto venduto."
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterms, contrazione di 'International commercial terms', è una serie di "
+#~ "termini di vendita utilizzati nelle transazioni commerciali fra stati."
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "(?)Vendite fatture aperte"
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Setup del workflow di vendita e dei valori di default."
 
@@ -2761,6 +2930,29 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Si desidera veramente creare la(le) fattura(e)?"
 
+#~ msgid "Sales By Month"
+#~ msgstr "Vendite per mese"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Impossibile cancellare la linea dell'ordine di vendita!"
+
+#~ msgid "Security Days"
+#~ msgstr "Giorni di sicurezza"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Approviggionamento della merce venduta"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Creare la fattura finale"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Indica che l'ordine di vendita è stato consegnato. Questo campo viene "
+#~ "aggiornato solo dopo che lo (gli) scheduler sono partiti."
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -2808,27 +3000,76 @@ msgstr "Fattura basata su Consegne"
 #~ "    * Grafici dei casi del mese\n"
 #~ "    "
 
+#~ msgid "Companies"
+#~ msgstr "Aziende"
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr ""
 #~ "Non è possibile cancellare una riga di ordine di vendita che è stata già "
 #~ "fatturata!"
 
+#~ msgid "References"
+#~ msgstr "Riferimenti"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Date ordine di vendita"
 
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Margini degli ordini di vendita"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Totale non tassato"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Vendite per partner"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Apri Fattura"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Configurazione applicazione di vendita"
 
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Basato sulle quantità spedite o ordinate."
+
+#~ msgid "Related Picking"
+#~ msgstr "Prelievi correlati"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Crea ordine di consegna"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Costi di consegna"
 
+#~ msgid "Create Pick List"
+#~ msgstr "Crea lista di prelievo"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Vendite per categoria prodotto"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Metodo di approvvigionamento"
+
 #~ msgid "title"
 #~ msgstr "titolo"
 
+#~ msgid "Pick List"
+#~ msgstr "Lista prelievo"
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Documento del movimento verso area di uscita o verso area cliente."
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Crea l'ordine di approvvigionamento"
+
+#~ msgid "Stock Move"
+#~ msgstr "Movimento di magazzino"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Non è possibile cancellare l'ordine di vendita!"
+
 #, python-format
 #~ msgid "Picking Information !"
 #~ msgstr "Informazioni prelievo!"
@@ -2839,6 +3080,23 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "È necessario selezionare un cliente nel form di vendita!\n"
+#~ "Selezionare quindi un cliente prima di scegliere un prodotto."
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Documento del movimento per il cliente."
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "È necessario prima cancellare tutti i prelievi legati a questo ordine di "
+#~ "vendita."
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sales order. \n"
 #~ "The exception state is automatically set when a cancel operation occurs in "
@@ -2854,10 +3112,49 @@ msgstr "Fattura basata su Consegne"
 #~ "Lo stato 'In attesa data programmazione' viene impostato quando la fattura "
 #~ "viene confermata ma è ancora in attesa della data programmata 'Data Ordine'."
 
+#~ msgid "Logistic"
+#~ msgstr "Logistica"
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Non è definito alcun conto di ricavo per questo prodotto:\"%s\" (id:%d)"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Si è pianificata la vendita di %.2f %s ma è disponibile solo la quantità  "
+#~ "%.2f %s !\n"
+#~ "Lo stock reale è pari a %.2f %s. (senza quantità riservate)"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Non è stato definito un registro vendite per questa azienda: \"%s\" (id:%d)"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Il movimento merci fra l'area magazzino di uscita e il magazzino del cliente "
+#~ "viene effettuato attraverso l'ordine di consegna, manualmente o "
+#~ "automaticamente, in funzione della configurazione dell'area di magazzino in "
+#~ "uscita."
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Non è possibile cancellare una linea di ordine di vendita che è %s!"
 
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "Lista di prelievo generata per questo ordine di vendita."
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -2868,6 +3165,13 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "   Month   "
 #~ msgstr "   Mese   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Attenzione"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Vendite per Mese"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -2883,9 +3187,45 @@ msgstr "Fattura basata su Consegne"
 #~ "\n"
 #~ "EAN: %s Quantità: %s Tipo di imballaggio: %s"
 
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "Il form della lista di prelievo viene creato non appena l'ordine di vendita "
+#~ "viene confermato, nello stesso tempo dell'ordine di approvvigionamento. Esso "
+#~ "rappresenta l'assegnamento di tutte le merci all'ordine di vendita. Ad ogni "
+#~ "linea d'ordine viene associata una lista prelievo che evolverà in funzione "
+#~ "della disponibilità delle merci."
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Tempo di consegna"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Mese-1    "
 
+#~ msgid "Image"
+#~ msgstr "Immagine"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Un ordine di approvvigionamento viene creato automaticamente non appena "
+#~ "l'ordine di vendita viene confermato o la fattura viene pagata. Questo "
+#~ "determina l'acquisto e la produzione delle merci in funzione delle regole e "
+#~ "dei parametri dell'ordine di vendita. "
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "L'ordine di vendita '%s' è stato cancellato."
+
+#~ msgid "Packings"
+#~ msgstr "Imballaggi"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Processo di configurazione"
 
@@ -2895,22 +3235,45 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Shipped Qty"
 #~ msgstr "Q.tà spedita"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "La fattura è stata generata correttamente!"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "È necessario prima cancellare tutte le fatture legate a questo ordine di "
+#~ "vendita."
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Configura la propria applicazione di gestione vendite"
 
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Miglioramento del layout dell'ordine di vendita"
 
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Un ordine di approvigionamento per ogni linea d'ordine di vendita e per "
+#~ "ciascuno dei componenti."
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr ""
 #~ "Non è possibile cancellare lo(gli) ordine(i) di vendita che sono già stati "
 #~ "confermati!"
 
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "L'ordine di vendita '%s' è stato impostato nello stato bozza."
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Sotto scorta!"
 
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "È necessario assegnare un lotto di produzione per questo prodotto"
+
 #~ msgid "Layout Sequence"
 #~ msgstr "Sequenza di layout"
 
@@ -2928,11 +3291,73 @@ msgstr "Fattura basata su Consegne"
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Passi per emettere un ordine di vendita"
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Richiesta ordine di vendita"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr ""
 #~ "Fornisce alcune funzionalità per migliorare il layout dei report degli "
 #~ "ordini di vendita"
 
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Errore! Non è possibile creare aziende ricorsive."
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Vendite per prodotto negli ultimi 90 giorni"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Vendite per commerciale negli ultimi 90 giorni"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Il riferimento ordine deve essere unico!"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Vendite per cliente negli ultimi 90 giorni"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Questa è la lista di tutte le linee da fatturare relative agli ordini di "
+#~ "vendita. E' possibile fatturare parzialmente un ordine di vendita, per "
+#~ "linea. Non è necessario usare questa funzionalità se si intende fatturare le "
+#~ "spedizioni o effettuare fatture totali relative all'ordine di vendita."
+
+#~ msgid "Reference UoM"
+#~ msgstr "UoM di riferimento"
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Se avete più di un negozio per vendere i prodotti dell'azienda, è possibile "
+#~ "creare e gestirli da qui. Ogni volta che registrate un nuovo preventivo o un "
+#~ "ordine di vendita, esso deve essere collegato al negozio. Il negozio "
+#~ "definisce inoltre il deposito da cui i prodotti verranno consegnati per ogni "
+#~ "particolare vendita."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Gli ordini di vendita consentono di gestire preventivi e ordini dai vostri "
+#~ "clienti. OpenERP ti suggerisce di iniziare con la creazione di un "
+#~ "preventivo. Una volta confermato, il preventivo sarà convertito in un ordine "
+#~ "di vendita. OpenERP è in grado di gestire diversi tipi di prodotti, in modo "
+#~ "che un ordine di vendita può trasformarsi in ordini di consegna, ordini di "
+#~ "fabbricazione, acquisti e così via. In base alla configurazione dell 'ordine "
+#~ "di vendita, verrà generata un fattura tipo, in modo che devi solo confermare "
+#~ "quando la si desidera inviare al cliente."
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Invia tutti i prodotti con una sola spedizione"
diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po
index 48ae3252c6e..4480c9f4d97 100644
--- a/addons/sale/i18n/ja.po
+++ b/addons/sale/i18n/ja.po
@@ -7,20 +7,168 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-06-19 22:22+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "勤務表を基本"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "前払請求書"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "見積の確認"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "受注ダッシュボード"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "確認日"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "グループ化…"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -29,1735 +177,104 @@ msgid ""
 "yet been invoiced"
 msgstr "受注オーダー行は確認済、完了、または例外状態であり、まだ請求されていません。"
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "過去90日間の販売員による販売"
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr "全てを一度に配達するための十分な在庫を持っていない場合、部分的な出荷を認めますか？"
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr "販売単位"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "現在の受注オーダーの送付先住所"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "数量"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "日"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "オーダーのキャンセル"
-
-#. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "見積 %s は受注オーダーに変換されました。"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr "見積の印刷"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr "警告"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "全ての受注オーダー行のために調達オーダーを駆動します。"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "分析アカウント"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"これは請求される各受注オーダー行のリストです。受注オーダー行の単位で部分的な受注オーダーの請求ができます。配達オーダーから請求する場合、または、受注合計で"
-"請求する場合は、このリストは必要ではありません。"
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-"確認済受注オーダーを削除するためには、先に次のものをキャンセルする必要があります。受注オーダーのキャンセルのためには、最初に関連する集荷あるいは配達オーダ"
-"ーをキャンセルせねばなりません。"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "調達オーダー"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "パートナ"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "配達基準の請求書"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "オーダー行"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-"受注オーダーは顧客からの見積とオーダーの管理と助けます。OpenERPは見積の作成から開始することを提案します。それが確認されると見積は受注オーダーに変換"
-"されます。受注オーダーはタスク、配達オーダー、製造オーダー、発注などを引き起こすようにOpenERPは製品の幾つかのタイプを取り扱うことができます。受注オ"
-"ーダーの設定を基本として、ドラフト請求書は顧客に請求したい時に、確認しなければならないように作成されます。"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-"受注オーダーは請求書案（ドラフト請求書）を自動的に作成します。オーダーされたものと、配達された数量は同じでは無いかもしれません。あなたはオーダー基準または"
-"出荷数量基準のどちらで請求するのかを決める必要があります。製品がサービスである場合は、出荷数量は関連したタスクに費やされた時間を意味します。"
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "デフォルト支払条件"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "配達オーダー基準"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "主作業時間単位"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "状態"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "割引（%）"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "合計価格"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "同じ顧客のために請求書をグループ化するにはこのボックスをチェックします。"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "私の受注オーダー"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "注文数量"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "販売員による受注"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "在庫移動"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "オーダー参照"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "その他情報"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "日付"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr "出荷方針が集荷時に請求または配達後に請求の場合は、請求書は自動的に作成されます。"
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "タスク作業基準"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "見積と受注"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "受注による請求書作成"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "価格リストの警告。"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "割引（%）"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "私の見積"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "受注管理ダッシュボード"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "梱包"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "受注オーダーから"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "店名"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"請求方針は請求書と配達処理を同期するために使用されます。\n"
-"  ・ \"配達前の支払\"の選択は、最初に請求書を生成し、そしてこの請求書の支払後に集荷オーダーを生成します。\n"
-"  ・ "
-"\"オンデマンドで配達と請求\"は、直接集荷オーダーを作成し、そしてユーザが受注オーダーまたは受注オーダー行基準のドラフト請求書を生成するための請求書ボタ"
-"ンを手動でクリックするのを待ちます。\n"
-"  ・ \"配達後請求\"の選択は、全ての集荷リストが終了した後に受注オーダー基準のドラフト請求書を生成します。\n"
-"  ・ \"配達基準の請求\"の選択は、集荷処理の途中で請求書を作成する時に使用されます。"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "顧客が定義されていません。"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "例外の受注"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "設定エラーです。"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "条件"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr "製品分類のためのデフォルト属性の中に収入分類のアカウントが無いか、または会計ポジションが定義されていません。"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "8月"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "違う製品のロットを割り当てることはできません。"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "テスト状態では不正なモード"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "6月"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "この受注オーダーのキャンセルはできません。"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "受注オーダーの統計値"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "受注オーダーに関連した分析アカウント"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "10月"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "参照は会社ごとに固有でなければいけません。"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "見積"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "現在の受注オーダーのための価格リスト"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr "オーダー確認から顧客に製品の出荷がなされるまでの日数"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "見積日"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "会計ポジション"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "単位"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "パッケージ数"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "進行中"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr "販売員は見積を確認します。受注オーダーの状態は進行中または手動進行中になります。"
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr "受注オーダー行は既に請求済であるためキャンセルできません。"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr "最初にこの受注オーダー行に付随する在庫移動をキャンセルする必要があります。"
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "（利用不可）"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr "先進製品と呼ばれるサービスタイプを選択すると、それを作成し、そしてこの項目にデフォルト値としてセットする必要があります。"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "TEL："
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr "配達後の自動請求として定義された受注オーダーを前もって作ることはできません。"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "注記"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "会社名は固有でなければいけません。"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "現在の受注オーダーのための請求書住所"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "月-1"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "受注オーダーのオーダー月"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr "同じパートナに対する異なった通貨を持つ受注はグループ化できません。"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "利用可能になった時に各製品を配達"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "請求済"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "配達オーダー"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "確認日"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "インコターム"
-
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
 msgstr "割当パートナ"
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "3月"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr "タイプビューの場所から、あるいは場所へは製品を動かすことはできません。"
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "受注オーダー基準"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "合計金額"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "小計"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "請求書住所："
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "行順序"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr "全ての受注オーダー行について、調達オーダーは販売された製品の供給を作成します。"
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
-"インコタームは国際商業規則（International Commercial terms）の略で、商業取引で使用される販売条件のシリーズを表します。"
 
 #. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "請求書住所"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "未請求行の検索"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "見積 / オーダー"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "行数"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "受注中の請求書"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "受注オーダー行"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "倉庫"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "オーダー番号"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "オーダー行"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "税抜金額"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "請求書の行"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "数量"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "作成日"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "その他"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "未請求かつ配達済行"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "合計："
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "私の受注"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "無効なアクションです。"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "追加情報"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "価格リスト"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "数量の数"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "時"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "オーダー日"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "出荷済"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "全見積"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "オプション"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "9月"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "行が無い受注オーダーの確認はできません。"
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
 msgstr ""
-"受注フォームで価格リストまたは顧客を選択する必要があります。\n"
-"製品を選択する前にどちらかをセットして下さい。"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "製品分類"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "税金："
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "在庫移動"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
+#: field:sale.report,state:0
 msgid "Order State"
 msgstr "オーダー状態"
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "本当に請求書を作成しますか？"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "月別受注"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "受注行はキャンセルできません。"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "安全日数"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "受注済材料の調達"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "最終請求書の作成"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "送付先住所"
-
-#. module: sale
-#: help:sale.order,shipped:0
+#: help:sale.config.settings,module_account_analytic_analysis:0
 msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr "これは受注オーダーが配達されたことを示します。この項目はスケジューラが起動された後にのみ更新されます。"
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "日付"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "拡張フィルタ…"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "例外"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "会社"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"見積または受注オーダーの状態を示します。 \n"
-"請求書の検証（請求書の例外）、または集荷リスト状態（出荷例外）でキャンセル操作が発生すると、例外状態が自動的にセットされます。 \n"
-"請求書が確認され、しかしオーダー日に実行されるスケジュールを待っている時は、スケジュール待ち状態にセットされます。"
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "適切な価格リスト行が見つかりません："
 
 #. module: sale
 #: view:sale.order:0
-msgid "History"
-msgstr "履歴"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "配達後のオーダーの請求書"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr "これは、この受注オーダーのために生成された請求書のリストです。同じ受注オーダーは何回も請求されるかもしれません（例えば、行毎に）。"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "あなたの参照"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "オーダーや見積は連絡先の名前と住所を要求します。"
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "これは安全目的のために顧客に約束するために加える日数です。"
-
-#. module: sale
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "数量"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "参照"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "私の受注オーダー行"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "キャンセル"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "請求書作成"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "税抜合計"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "オーダー参照"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "請求書は正常に作成されました。"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "パートナ別受注"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "オーダー連絡先"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "請求書を開く"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr "受注オーダーの自動Eメール確認"
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "この会社に定義された受注仕訳帳がありません：%s（ID：%d）"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "強制割当"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "オーダー中"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "出荷またはオーダー数量基準"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "全ての製品を一緒に配達"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "関連する集荷"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "名称"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "送付先住所："
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "最新90日間の顧客別受注"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "受注オーダーのドラフト状態"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "配達オーダーの作成"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr "受注オーダー行の状態は %s であるため、削除できません。"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "販売単位"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "税込合計"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "集荷リストの作成"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "受注オーダーのオーダー日"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "製品分類別受注"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "見積の確認"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "エラー"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "グループ化…"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "請求書再作成"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "請求書の配達"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "スケジュール待ち"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "調達方法"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "集荷リスト"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "ドラフトに設定"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "製造品へのあるいは顧客への移動のドキュメント"
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-"\n"
-"${object.partner_order_id.name and ' ' or ''}${object.partner_order_id.name "
-"or ''} 様、\n"
-"\n"
-"これは、お客様のご注文の確認です。 ${object.partner_id.name}：\n"
-"       | ご注文番号： *${object.name}*\n"
-"       | ご注文合計： *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | ご注文日： ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | ご注文の詳細： ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | お客様： ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | お客様の連絡先： ${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"次のリンクから、ご注文のご確認、ダウンロード、また、オンラインでのお支払いが可能です。\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account：\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"直接 Paypal を使ってお支払いいただくこともできます。\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"何かご質問等がございましたら、ご遠慮なくお問い合わせ下さい。\n"
-"\n"
-"\n"
-"弊社をご利用いただき、ありがとうございました。 ${object.company_id.name}\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "検証"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "オーダーの確認"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "調達オーダーの作成"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "税金"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "請求準備のできた受注オーダー"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "受注オーダーの作成日"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "在庫移動"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "請求書を作成"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "今月作成された受注オーダー"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "FAX："
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-"もし、オーダー時であれば、受注オーダーがタスクを作成するために確認された時、この受注オーダー行とリンクした発注オーダーまたは製造オーダーを調達するきっかけ"
-"となります。"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "前払金額"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "配達に課金しますか？"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "出荷数量"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "受注オーダー基準の請求書"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr "このオーダーの価格リストを変更した場合（通貨であっても）、既存オーダー行の価格は更新されません。"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "集荷リスト"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "エラー"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "受注オーダーはキャンセルできませんでした。"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "単位数量"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "受注オーダーのオーダー年"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "7月"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "調達"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "出荷例外"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "集荷情報： "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "請求書のグループ化"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "請求方針"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "請求方法のセットアップ"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "会計士によってレビューされます。"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "単位の参照"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr "このツールは、顧客に請求するために使用する方法にしたがって、正しいモジュールのインストールとシステムを設定するのに役立ちます。"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "受注オーダー行の請求書を作成"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "請求書の例外"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "調達と請求を実施"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "支払済"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "受注分析"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"あなたの選択した数量は %d です。\n"
-"しかし、それは選択した梱包と互換性がありません。\n"
-"これは、梱包による数量の提案です：\n"
-"EAN：%s　数量：%s　単位のタイプ：%s"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "梱包の再作成"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "属性"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "見積"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"受注オーダーの出荷方針が出荷は手動進行中の場合、販売員は請求書を手動で作成します。出荷方針が配達前に支払の場合、請求書は自動的に作成されます。"
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr "受注オーダー基準、または出荷基準の請求書を生成します。"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "未配達の確認済受注オーダー行"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "顧客請求書"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "受注"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "単価"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "完了"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "請求書"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"受注フォームの顧客を選択する必要があります。\n"
-"製品を選択する前に１顧客をセットして下さい。"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "元となるドキュメント"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "ToDo"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "集荷方針"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "顧客への移動のドキュメント"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "税抜金額"
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr "最初にこの受注オーダーに結び付けられた全集荷をキャンセルする必要があります。"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "受注前払請求書"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "月"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} オーダー(Ref ${object.name or 'n/a' })"
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "製品"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "割当のキャンセル"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr ""
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "月次売上高"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "請求対象"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "オーダー日"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "製品販売単位"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "手動進行中"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "製品単位"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "物流"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "オーダー"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "この製品のために定義された損益勘定がありません：%s（ID：%d）"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "例外を無視"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"受注オーダーの請求制御によって、請求書は配達、または受注数量基準とすることが可能です。したがって、受注オーダーは販売員によりそれが確認されるとすぐに、請求"
-"書、または配達オーダーを生成します。"
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"受注の計画量は %.2f %s。しかし %.2f %s のみ利用可能です。\n"
-"実在庫は %.2f %s です（予約を除く）。"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "状態"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "顧客参照"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "合計"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "価格"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr "製造品場所の設定によって、製造領域と顧客の間の移動は、手動または自動的な配達オーダーを通して実施されます。"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "配達前支払"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "受注ダッシュボード"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "請求書作成"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
 msgid "To Invoice"
 msgstr "請求対象"
 
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
 msgstr "受注オーダー確認日"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "見積"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract/Analytic Account"
 msgstr "契約 / 分析アカウント"
 
 #. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
 msgstr "会社"
@@ -1767,31 +284,155 @@ msgstr "会社"
 msgid "Invoice Date"
 msgstr "請求日"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "未請求かつ配達済行"
+
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
 msgstr "事前に請求される金額"
 
 #. module: sale
-#: code:addons/sale/sale.py:1269
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "請求書の例外"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
 #, python-format
 msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
 msgstr ""
-"この製品と数量に一致する価格リスト行を見つけることができません。\n"
-"製品、数量、価格リストの何れかを変更する必要があります。"
 
 #. module: sale
-#: help:sale.order,picking_ids:0
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "合計金額"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "分析アカウント"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "小計"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "オーダーのキャンセル"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
 msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "この集荷リストはこの受注オーダーによって生成されました。"
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "請求書作成"
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "税金"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "非課税金額"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -1799,7 +440,20 @@ msgid "Net Total :"
 msgstr "合計："
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
 msgstr "キャンセル済"
@@ -1809,36 +463,130 @@ msgstr "キャンセル済"
 msgid "Sales Order Lines related to a Sales Order of mine"
 msgstr "私の受注オーダーと関係する受注オーダー行"
 
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "合計"
+
 #. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
 msgid "Shop"
 msgstr "店"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "例外の受注"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "請求書住所"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "受注オーダーの作成日"
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "請求書再作成"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "請求書を作成"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
 msgstr "確認日"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "警告"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "行数"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "月別受注"
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
 
 #. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "数量の数"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "FAX："
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
 msgid "Sales Order"
 msgstr "受注オーダー"
 
@@ -1853,15 +601,9 @@ msgid "Sale Order Lines that are in 'done' state"
 msgstr "完了状態の受注オーダー行"
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"受注オーダーが確認されると同時に調達オーダーとしてすぐに、集荷リストフォームが作成されます。これは受注オーダー部品の割り当てを表しています。受注オーダー行"
-"による１つの集荷リストは部品の入手可能性とともに展開します。"
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "前払金額"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1869,65 +611,400 @@ msgid "Confirmed"
 msgstr "確認済"
 
 #. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "基本とする主な方法"
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "デフォルト支払条件"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
 msgid "Confirm"
 msgstr "確認"
 
 #. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
 
 #. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "送付先住所"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "請求準備ができた受注オーダー行"
+
+#. module: sale
+#: view:account.invoice.report:0
 #: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "最新90日間の製品分類別受注"
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "月次売上高"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "未確認状態の受注オーダー"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "オーダー番号"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "オーダー行"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "割引（%）"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "オーダー参照"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "請求書行"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "受注オーダー行"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "合計価格"
 
 #. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "配達リードタイム"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "古い見積"
 
 #. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "設定"
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/edi/sale_order.py:146
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "同じ顧客のために請求書をグループ化するにはこのボックスをチェックします。"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "請求書作成"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "時"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "作成日"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "スケジュール待ち"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "現在の受注オーダーのための請求書住所"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "注文数量"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "受注オーダーのオーダー年"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "合計："
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "私の受注"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "無効なアクションです。"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "会計ポジション"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "販売単位"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
 #, python-format
 msgid "EDI Pricelist (%s)"
 msgstr "EDIの価格リスト（%s）"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "見積日"
+
 #. module: sale
 #: view:sale.order:0
-msgid "Print Order"
-msgstr "印刷順序"
+msgid "Order Date"
+msgstr "オーダー日"
 
 #. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "見積と受注"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "今年作成された受注オーダー"
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "パートナ"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "受注による請求書作成"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "割引（%）"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1939,20 +1016,29 @@ msgstr ""
 "1. この受注オーダー行の状態はドラフトまたはキャンセルの何れかである。\n"
 "2. 受注オーダー行は請求されている。"
 
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
 msgstr "受注オーダー行の完了"
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "重量"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "私の見積"
 
 #. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "請求書"
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1960,20 +1046,36 @@ msgid "December"
 msgstr "12月"
 
 #. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "画像"
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "出荷済"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} オーダー(Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
 msgstr ""
-"調達オーダーは、受注オーダーが確認された、または請求書が支払われた時に自動的に作成されます。それは支払と製品の製造のルールと受注オーダーのパラメータに関し"
-"て制御します。 "
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "行が無い受注オーダーの確認はできません。"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1981,41 +1083,125 @@ msgid "Uninvoiced"
 msgstr "未請求"
 
 #. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "販売員"
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "製品分類"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "古い見積"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "非課税金額"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
+#: code:addons/sale/sale.py:557
 #, python-format
-msgid "Advance Invoice"
-msgstr "前払請求書"
+msgid "Cannot cancel this sales order!"
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:624
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "店名"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
 #, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "受注オーダー %s はキャンセルされました。"
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "税金："
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "受注前払請求書"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "顧客が定義されていません。"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "請求書作成"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"受注オーダーは請求書案（ドラフト請求書）を自動的に作成します。オーダーされたものと、配達された数量は同じでは無いかもしれません。あなたはオーダー基準または"
+"出荷数量基準のどちらで請求するのかを決める必要があります。製品がサービスである場合は、出荷数量は関連したタスクに費やされた時間を意味します。"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "受注オーダー行の請求書を作成"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Draft"
 msgstr "ドラフト"
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "支払済"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -2035,6 +1221,18 @@ msgstr ""
 "・ 完了状態は、受注オーダー行が集荷された時にセットされます。\n"
 "・ キャンセル済は、ユーザが受注オーダーに関してキャンセルした時にセットされます。"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "受注オーダー"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "請求書のグループ化"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2042,56 +1240,168 @@ msgstr "税金金額"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "梱包"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "請求準備ができた受注オーダー行"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "先月作成受注オーダー"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "調達と請求を実施"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "6月"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "Eメールテンプレート"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "受注オーダー"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "オーダー"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "価格リストの警告。"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "販売店"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "受注オーダーの統計値"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "日付"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "受注オーダー行"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "11月"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "拡張フィルタ…"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "前払製品"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "計算"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "例外"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr "最初にこの受注オーダーに関する全ての請求書をキャンセルする必要があります。"
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"受注オーダーの出荷方針が出荷は手動進行中の場合、販売員は請求書を手動で作成します。出荷方針が配達前に支払の場合、請求書は自動的に作成されます。"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2103,91 +1413,324 @@ msgstr "1月"
 msgid "Sales Order in Progress"
 msgstr "進行中の受注オーダー"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr "販売員は見積を確認します。受注オーダーの状態は進行中または手動進行中になります。"
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr "この受注オーダー要求を生成したドキュメントへの参照"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "適切な価格リスト行が見つかりません："
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "委任の遅延"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "オンデマンドの配達と請求"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "未配達の確認済受注オーダー行"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "履歴"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr "各受注オーダー行と各構成部品のための１つの調達オーダー"
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr "これは、この受注オーダーのために生成された請求書のリストです。同じ受注オーダーは何回も請求されるかもしれません（例えば、行毎に）。"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "割当"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "あなたの参照"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "日付順"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "価格リスト"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "顧客請求書"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "請求する確認済受注オーダー"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "未確認状態の受注オーダー"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "受注オーダー行"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "受注"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "受注オーダー %s はドラフト状態にセットされています。"
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr "このオーダーの価格リストを変更した場合（通貨であっても）、既存オーダー行の価格は更新されません。"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "在庫から"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "日"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "閉じる"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "請求書"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "単価"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "完了"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "請求書住所："
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "請求書"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "私の受注オーダー行"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "価格リストがありません： "
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "配達済"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "見積"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "この製品に製造ロットを割り当てる必要があります。"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "未請求行の検索"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
-"あなたの会社の製品を再販する複数の店がある場合は、ここから作成と管理ができます。新規の見積や受注オーダーを記録する際には、店にリンク付けする必要があります"
-"。店には各特定の受注のために製品が配達される倉庫を定義します。"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "ToDo"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "送付先住所："
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr "同じパートナに対する異なった通貨を持つ受注はグループ化できません。"
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "受注分析"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "現在の受注オーダーのための価格リスト"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "請求書作成"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "税抜金額"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "オーダー参照"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2195,61 +1738,67 @@ msgid "It indicates that an invoice has been paid."
 msgstr "請求書は支払済であることを示しています。"
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr "受注オーダー行は既に請求済であるためキャンセルできません。"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "製品"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "説明"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "5月"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "顧客"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "前払"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "2月"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "4月"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "会計"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "受注オーダーの検索"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "受注オーダー依頼"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
-msgstr "在庫不足です： "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "支払条件"
+#: report:sale.order:0
+msgid "Price"
+msgstr "価格"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2264,25 +1813,1138 @@ msgstr ""
 "れていない受注の分析を実行するためにこのレポートを使います。総売上高を分析したい場合は、会計アプリケーションの中の請求書分析レポートを使用する必要がありま"
 "す。"
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "TEL："
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "本当に請求書を作成しますか？"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "その他情報"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "数量"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "会計士によってレビューされます。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "現在の受注オーダーの送付先住所"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "見積 / オーダー"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "顧客"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "前払"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "2月"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "請求対象"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "オーダー日"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "製品販売単位"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "受注オーダーのドラフト状態"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "元となるドキュメント"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "4月"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "手動進行中"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "私の受注オーダー"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "受注オーダーの検索"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "受注オーダーのオーダー月"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"受注フォームで価格リストまたは顧客を選択する必要があります。\n"
+"製品を選択する前にどちらかをセットして下さい。"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "受注オーダーから"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "例外を無視"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"受注オーダーの請求制御によって、請求書は配達、または受注数量基準とすることが可能です。したがって、受注オーダーは販売員によりそれが確認されるとすぐに、請求"
+"書、または配達オーダーを生成します。"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "受注オーダーに関連した分析アカウント"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "支払条件"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "請求準備のできた受注オーダー"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "見積番号"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "顧客参照"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "集荷"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "年"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "配達基準の請求書"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "税込合計"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "請求済"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "受注オーダーのオーダー日"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "過去90日間の販売員による販売"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "勤務表を基本"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr "全てを一度に配達するための十分な在庫を持っていない場合、部分的な出荷を認めますか？"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "見積 %s は受注オーダーに変換されました。"
+
+#~ msgid "Print Quotation"
+#~ msgstr "見積の印刷"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "これは請求される各受注オーダー行のリストです。受注オーダー行の単位で部分的な受注オーダーの請求ができます。配達オーダーから請求する場合、または、受注合計で"
+#~ "請求する場合は、このリストは必要ではありません。"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "確認済受注オーダーを削除するためには、先に次のものをキャンセルする必要があります。受注オーダーのキャンセルのためには、最初に関連する集荷あるいは配達オーダ"
+#~ "ーをキャンセルせねばなりません。"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "配達基準の請求書"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "全ての受注オーダー行のために調達オーダーを駆動します。"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "警告"
+
+#~ msgid "Procurement Order"
+#~ msgstr "調達オーダー"
 
 #~ msgid "VAT"
 #~ msgstr "消費税"
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "受注オーダーは顧客からの見積とオーダーの管理と助けます。OpenERPは見積の作成から開始することを提案します。それが確認されると見積は受注オーダーに変換"
+#~ "されます。受注オーダーはタスク、配達オーダー、製造オーダー、発注などを引き起こすようにOpenERPは製品の幾つかのタイプを取り扱うことができます。受注オ"
+#~ "ーダーの設定を基本として、ドラフト請求書は顧客に請求したい時に、確認しなければならないように作成されます。"
+
+#~ msgid "Order Line"
+#~ msgstr "オーダー行"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "主作業時間単位"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "配達オーダー基準"
+
+#~ msgid "State"
+#~ msgstr "状態"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "タスク作業基準"
+
+#~ msgid "Dates"
+#~ msgstr "日付"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "在庫移動"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "販売員による受注"
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "請求方針は請求書と配達処理を同期するために使用されます。\n"
+#~ "  ・ \"配達前の支払\"の選択は、最初に請求書を生成し、そしてこの請求書の支払後に集荷オーダーを生成します。\n"
+#~ "  ・ "
+#~ "\"オンデマンドで配達と請求\"は、直接集荷オーダーを作成し、そしてユーザが受注オーダーまたは受注オーダー行基準のドラフト請求書を生成するための請求書ボタ"
+#~ "ンを手動でクリックするのを待ちます。\n"
+#~ "  ・ \"配達後請求\"の選択は、全ての集荷リストが終了した後に受注オーダー基準のドラフト請求書を生成します。\n"
+#~ "  ・ \"配達基準の請求\"の選択は、集荷処理の途中で請求書を作成する時に使用されます。"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "受注管理ダッシュボード"
+
+#~ msgid "Packaging"
+#~ msgstr "梱包"
+
+#~ msgid "Conditions"
+#~ msgstr "条件"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "設定エラーです。"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "違う製品のロットを割り当てることはできません。"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "この受注オーダーのキャンセルはできません。"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "参照は会社ごとに固有でなければいけません。"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr "オーダー確認から顧客に製品の出荷がなされるまでの日数"
+
+#~ msgid "UoM"
+#~ msgstr "単位"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr "製品分類のためのデフォルト属性の中に収入分類のアカウントが無いか、または会計ポジションが定義されていません。"
+
+#~ msgid "Notes"
+#~ msgstr "注記"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr "最初にこの受注オーダー行に付随する在庫移動をキャンセルする必要があります。"
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr "配達後の自動請求として定義された受注オーダーを前もって作ることはできません。"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "（利用不可）"
+
+#~ msgid "Number Packages"
+#~ msgstr "パッケージ数"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr "先進製品と呼ばれるサービスタイプを選択すると、それを作成し、そしてこの項目にデフォルト値としてセットする必要があります。"
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "会社名は固有でなければいけません。"
+
+#~ msgid "Month-1"
+#~ msgstr "月-1"
+
+#~ msgid "Incoterm"
+#~ msgstr "インコターム"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "利用可能になった時に各製品を配達"
+
+#~ msgid "Delivery Order"
+#~ msgstr "配達オーダー"
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr "全ての受注オーダー行について、調達オーダーは販売された製品の供給を作成します。"
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "インコタームは国際商業規則（International Commercial terms）の略で、商業取引で使用される販売条件のシリーズを表します。"
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr "タイプビューの場所から、あるいは場所へは製品を動かすことはできません。"
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "受注オーダー基準"
+
+#~ msgid "Line Sequence"
+#~ msgstr "行順序"
+
+#~ msgid "Warehouse"
+#~ msgstr "倉庫"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "税抜金額"
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "受注中の請求書"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "請求書の行"
+
+#~ msgid "Extra Info"
+#~ msgstr "追加情報"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "その他"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "数量"
+
+#~ msgid "All Quotations"
+#~ msgstr "全見積"
+
+#~ msgid "Options"
+#~ msgstr "オプション"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "見積または受注オーダーの状態を示します。 \n"
+#~ "請求書の検証（請求書の例外）、または集荷リスト状態（出荷例外）でキャンセル操作が発生すると、例外状態が自動的にセットされます。 \n"
+#~ "請求書が確認され、しかしオーダー日に実行されるスケジュールを待っている時は、スケジュール待ち状態にセットされます。"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr "出荷方針が集荷時に請求または配達後に請求の場合は、請求書は自動的に作成されます。"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "出荷例外"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "最終請求書の作成"
+
+#~ msgid "Stock Moves"
+#~ msgstr "在庫移動"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "受注行はキャンセルできません。"
+
+#~ msgid "Sales By Month"
+#~ msgstr "月別受注"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "受注済材料の調達"
+
+#~ msgid "Companies"
+#~ msgstr "会社"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "配達後のオーダーの請求書"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr "これは受注オーダーが配達されたことを示します。この項目はスケジューラが起動された後にのみ更新されます。"
+
+#~ msgid "Security Days"
+#~ msgstr "安全日数"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "オーダーや見積は連絡先の名前と住所を要求します。"
+
+#~ msgid "References"
+#~ msgstr "参照"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr "これは安全目的のために顧客に約束するために加える日数です。"
+
+#~ msgid "Total Tax Excluded"
+#~ msgstr "税抜合計"
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "受注オーダーの自動Eメール確認"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr "この会社に定義された受注仕訳帳がありません：%s（ID：%d）"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "パートナ別受注"
+
+#~ msgid "Open Invoice"
+#~ msgstr "請求書を開く"
+
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "請求書は正常に作成されました。"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "オーダー連絡先"
+
+#~ msgid "on order"
+#~ msgstr "オーダー中"
+
+#~ msgid "Force Assignation"
+#~ msgstr "強制割当"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "出荷またはオーダー数量基準"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr "受注オーダー行の状態は %s であるため、削除できません。"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "全ての製品を一緒に配達"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "最新90日間の顧客別受注"
+
+#~ msgid "Name"
+#~ msgstr "名称"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "販売単位"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "配達オーダーの作成"
+
+#~ msgid "Related Picking"
+#~ msgstr "関連する集荷"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "エラー"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "請求書の配達"
+
+#~ msgid "Procurement Method"
+#~ msgstr "調達方法"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "製品分類別受注"
+
+#~ msgid "Create Pick List"
+#~ msgstr "集荷リストの作成"
+
+#~ msgid "Confirm Order"
+#~ msgstr "オーダーの確認"
+
+#~ msgid "Pick List"
+#~ msgstr "集荷リスト"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "調達オーダーの作成"
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+#~ msgstr ""
+#~ "\n"
+#~ "${object.partner_order_id.name and ' ' or ''}${object.partner_order_id.name "
+#~ "or ''} 様、\n"
+#~ "\n"
+#~ "これは、お客様のご注文の確認です。 ${object.partner_id.name}：\n"
+#~ "       | ご注文番号： *${object.name}*\n"
+#~ "       | ご注文合計： *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | ご注文日： ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | ご注文の詳細： ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | お客様： ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | お客様の連絡先： ${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "次のリンクから、ご注文のご確認、ダウンロード、また、オンラインでのお支払いが可能です。\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account：\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "直接 Paypal を使ってお支払いいただくこともできます。\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "何かご質問等がございましたら、ご遠慮なくお問い合わせ下さい。\n"
+#~ "\n"
+#~ "\n"
+#~ "弊社をご利用いただき、ありがとうございました。 ${object.company_id.name}\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+
+#~ msgid "Set to Draft"
+#~ msgstr "ドラフトに設定"
+
+#~ msgid "Validate"
+#~ msgstr "検証"
+
+#~ msgid "Stock Move"
+#~ msgstr "在庫移動"
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "配達に課金しますか？"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "今月作成された受注オーダー"
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "もし、オーダー時であれば、受注オーダーがタスクを作成するために確認された時、この受注オーダー行とリンクした発注オーダーまたは製造オーダーを調達するきっかけ"
+#~ "となります。"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "受注オーダー基準の請求書"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "出荷数量"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "集荷情報： "
+
+#~ msgid "Picking List"
+#~ msgstr "集荷リスト"
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "単位数量"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "受注オーダーはキャンセルできませんでした。"
+
+#~ msgid "Procurement"
+#~ msgstr "調達"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "エラー"
+
+#~ msgid "Reference UoM"
+#~ msgstr "単位の参照"
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "請求方法のセットアップ"
+
+#~ msgid "Invoice Policy"
+#~ msgstr "請求方針"
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr "このツールは、顧客に請求するために使用する方法にしたがって、正しいモジュールのインストールとシステムを設定するのに役立ちます。"
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "あなたの選択した数量は %d です。\n"
+#~ "しかし、それは選択した梱包と互換性がありません。\n"
+#~ "これは、梱包による数量の提案です：\n"
+#~ "EAN：%s　数量：%s　単位のタイプ：%s"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr "受注オーダー基準、または出荷基準の請求書を生成します。"
+
+#~ msgid "Recreate Packing"
+#~ msgstr "梱包の再作成"
+
+#~ msgid "Properties"
+#~ msgstr "属性"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr "最初にこの受注オーダーに結び付けられた全集荷をキャンセルする必要があります。"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "顧客への移動のドキュメント"
+
+#~ msgid "Picking Policy"
+#~ msgstr "集荷方針"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "受注フォームの顧客を選択する必要があります。\n"
+#~ "製品を選択する前に１顧客をセットして下さい。"
+
+#~ msgid "Cancel Assignation"
+#~ msgstr "割当のキャンセル"
+
+#~ msgid "States"
+#~ msgstr "状態"
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr "この製品のために定義された損益勘定がありません：%s（ID：%d）"
+
+#~ msgid "Logistic"
+#~ msgstr "物流"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "受注の計画量は %.2f %s。しかし %.2f %s のみ利用可能です。\n"
+#~ "実在庫は %.2f %s です（予約を除く）。"
+
+#~ msgid "Product UoM"
+#~ msgstr "製品単位"
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "製造品へのあるいは顧客への移動のドキュメント"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "配達前支払"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr "製造品場所の設定によって、製造領域と顧客の間の移動は、手動または自動的な配達オーダーを通して実施されます。"
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "この集荷リストはこの受注オーダーによって生成されました。"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "この製品と数量に一致する価格リスト行を見つけることができません。\n"
+#~ "製品、数量、価格リストの何れかを変更する必要があります。"
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "受注オーダーが確認されると同時に調達オーダーとしてすぐに、集荷リストフォームが作成されます。これは受注オーダー部品の割り当てを表しています。受注オーダー行"
+#~ "による１つの集荷リストは部品の入手可能性とともに展開します。"
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "警告"
+
+#~ msgid "Main Method Based On"
+#~ msgstr "基本とする主な方法"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+
+#~ msgid "Sales by Month"
+#~ msgstr "月別受注"
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "最新90日間の製品分類別受注"
+
+#~ msgid "Print Order"
+#~ msgstr "印刷順序"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "今年作成された受注オーダー"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "配達リードタイム"
+
+#~ msgid "Configuration"
+#~ msgstr "設定"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "調達オーダーは、受注オーダーが確認された、または請求書が支払われた時に自動的に作成されます。それは支払と製品の製造のルールと受注オーダーのパラメータに関し"
+#~ "て制御します。 "
+
+#~ msgid "Image"
+#~ msgstr "画像"
+
+#~ msgid "Salesman"
+#~ msgstr "販売員"
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "受注オーダー %s はキャンセルされました。"
+
+#~ msgid "Packings"
+#~ msgstr "梱包"
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr "各受注オーダー行と各構成部品のための１つの調達オーダー"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr "最初にこの受注オーダーに関する全ての請求書をキャンセルする必要があります。"
+
+#~ msgid "Compute"
+#~ msgstr "計算"
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "オンデマンドの配達と請求"
+
+#~ msgid "Close"
+#~ msgstr "閉じる"
+
+#~ msgid "Delivered"
+#~ msgstr "配達済"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "この製品に製造ロットを割り当てる必要があります。"
+
+#~ msgid "from stock"
+#~ msgstr "在庫から"
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "受注オーダー %s はドラフト状態にセットされています。"
+
+#~ msgid "Assign"
+#~ msgstr "割当"
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "あなたの会社の製品を再販する複数の店がある場合は、ここから作成と管理ができます。新規の見積や受注オーダーを記録する際には、店にリンク付けする必要があります"
+#~ "。店には各特定の受注のために製品が配達される倉庫を定義します。"
+
+#~ msgid "Accounting"
+#~ msgstr "会計"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "配達基準の請求書"
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "在庫不足です： "
+
+#~ msgid "Sales Order Requisition"
+#~ msgstr "受注オーダー依頼"
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "テスト状態では不正なモード"
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "先月作成受注オーダー"
diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po
index 44066f90d4d..5c459304067 100644
--- a/addons/sale/i18n/ko.po
+++ b/addons/sale/i18n/ko.po
@@ -7,19 +7,167 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2010-12-15 21:56+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Advance Invoice"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "견적 확정"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
@@ -30,59 +178,344 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Allotment 파트너"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_policy:0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "주문 상태"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "수량"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "인보이스되지 않고 배송된 라인들"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "인보이스 예외"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "분석 계정"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "소계"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
 msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "주문 취소"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "중량"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
+msgid "Quotation "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "판매 주문"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "세금"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "과세되지 않은 금액"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "순 합계:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "합계"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "샵"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "예외적 판매"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "인보이스 주소"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "인보이스 다시 생성"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
 msgstr ""
 
 #. module: sale
@@ -91,73 +524,100 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "분석 계정"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_summary:0
 msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "팩스:"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "주문 라인"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+msgid "(update)"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "확정됨"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
 msgstr ""
 
 #. module: sale
@@ -166,39 +626,157 @@ msgid "Default Payment Term"
 msgstr "디폴트 결제 조건"
 
 #. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "확정"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "선적 주소"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
 #: view:sale.report:0
-msgid "State"
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "주문 N°"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "주문 라인"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Disc.(%)"
 msgstr "Disc.(%)"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "주문 참조"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "인보이스 라인"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "대기 스케줄"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
 msgstr ""
 
 #. module: sale
@@ -208,463 +786,25 @@ msgstr "주문된 수량"
 
 #. module: sale
 #: view:sale.report:0
-msgid "Sales by Salesman"
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "재고 이동"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "주문 참조"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "할인 (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "내 견적"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "포장"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "예외적 판매"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "test_state에 유효하지 않은 모드"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
 msgstr ""
 
 #. module: sale
+#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA:"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "회계 포지션"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "UoM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "전화:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "노트"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "인보이스됨"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "배송 주문"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "인코텀"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Allotment 파트너"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "소계"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "인보이스 주소:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "인보이스 주소"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "견적 / 주문"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "창고"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "주문 N°"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "주문 라인"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "과세되지 않은 금액"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
 #: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "수량 (UoM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "인보이스되지 않고 배송된 라인들"
+msgid "Quantity"
+msgstr "수량"
 
 #. module: sale
 #: report:sale.order:0
@@ -677,32 +817,92 @@ msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
 #, python-format
 msgid "Invalid action !"
 msgstr "유효하지 않은 액션 !"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "기타 정보"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "회계 포지션"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "가격리스트"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
+#: selection:sale.report,month:0
+msgid "July"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1327
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
 #, python-format
-msgid "Hour"
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
 msgstr ""
 
 #. module: sale
@@ -711,101 +911,413 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "모든 견적들"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "할인 (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "내 견적"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
-msgid "September"
+msgid "December"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:632
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "시퀀스"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
 msgid "Category of Product"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
 msgstr "세금:"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "스톡 이동"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "주문 상태"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
+#: code:addons/sale/sale.py:658
 #, python-format
-msgid "Could not cancel sales order line!"
+msgid "Invoice has been <b>paid</b>."
 msgstr ""
 
 #. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "인보이스 생성"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "초안"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "지불됨"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "판매 주문"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "인보이스 그룹화"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "상태"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "선적 주소"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
 
 #. module: sale
-#: help:sale.order,shipped:0
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
 msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "주문"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
 msgstr ""
 
 #. module: sale
@@ -813,46 +1325,156 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Advance Product"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "예외"
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
+#: selection:sale.report,month:0
+msgid "October"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,state:0
+#: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1272
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "진행 중인 판매 주문"
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:958
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "History"
 msgstr "히스토리"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
 
 #. module: sale
@@ -869,26 +1491,100 @@ msgid "Your Reference"
 msgstr "귀하의 참조"
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: field:sale.report,date:0
+msgid "Date Order"
 msgstr ""
 
 #. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "가격리스트"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA:"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "수량"
+msgid "Sales Order Lines"
+msgstr "판매 주문 라인"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "판매"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "References"
-msgstr ""
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "인보이스"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "유닛 가격"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "완료"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "인보이스 주소:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "인보이스"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -897,562 +1593,64 @@ msgstr ""
 
 #. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "취소"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "견적"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "인보이스 생성"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "주문 접촉"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "할당"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "주문 상"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "이름"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "선적 주소:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "견적 확정"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "에러"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "인보이스 다시 생성"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "대기 스케줄"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "초안으로 설정"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "검증"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "주문 확정"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "세금"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "팩스:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "선적 수량"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "판매 주문에 기초한 인보이스"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "에러 !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "조달"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "선적 예외"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "인보이스 그룹화"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "인보이스 예외"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "지불됨"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "속성"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "견적"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "판매"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "유닛 가격"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "완료"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "인보이스"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
 #. module: sale
@@ -1461,61 +1659,232 @@ msgid "To Do"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "선적 주소:"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "인보이스 생성"
+
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:604
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:822
 #, python-format
-msgid "You must first cancel all picking attached to this sales order."
+msgid "You cannot cancel a sale order line that has already been invoiced!"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
 msgstr ""
 
 #. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "상품"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "할당 취소"
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
+#: report:sale.order:0
+msgid "Description"
+msgstr "설명"
 
 #. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "가격"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "전화:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "수량"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "견적 / 주문"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "고객"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: sale
@@ -1523,6 +1892,17 @@ msgstr ""
 msgid "Invoice on"
 msgstr "인보이스 날짜"
 
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
@@ -1533,31 +1913,98 @@ msgstr "주문 날짜"
 msgid "Product UoS"
 msgstr ""
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "상품 UOM"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "주문"
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
 msgstr ""
 
 #. module: sale
@@ -1575,566 +2022,55 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1251
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "상태"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
 msgstr ""
 
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "합계"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "가격"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "인보이스 생성"
-
 #. module: sale
 #: report:sale.order:0
-msgid "Net Total :"
-msgstr "순 합계:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "샵"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "확정됨"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "확정"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "인보이스 라인"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "판매 주문 라인"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr ""
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "구성"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "중량"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "인보이스"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "판매사원"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "과세되지 않은 금액"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Advance Invoice"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "초안"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "판매 주문"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Advance Product"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "계산"
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "진행 중인 판매 주문"
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "할당"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "스톡으로부터"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "닫기"
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
-msgid "Description"
-msgstr "설명"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "고객"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr ""
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
-#, python-format
-msgid "Not enough stock ! : "
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "결제 조건"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2143,19 +2079,61 @@ msgid "Quotation N°"
 msgstr "견적 N°"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "인수됨"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "베송에 기초한 인보이스"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "인보이스됨"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
 
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "판매 주문 전달을 위한 단계들"
@@ -2166,12 +2144,21 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Partial Delivery"
 #~ msgstr "부분 배송"
 
+#~ msgid "from stock"
+#~ msgstr "스톡으로부터"
+
+#~ msgid "Delivery Order"
+#~ msgstr "배송 주문"
+
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "창고에서 고객에게 전달"
 
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "인보이스가 생성되었습니다 !"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "이 인보이스를 위해 생성된 피킹 리스트"
@@ -2179,11 +2166,23 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Automatic Declaration"
 #~ msgstr "자동 선언"
 
+#~ msgid "Set to Draft"
+#~ msgstr "초안으로 설정"
+
+#~ msgid "Validate"
+#~ msgstr "검증"
+
 #~ msgid ""
 #~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
 #~ "is, quotation is moved to  sale order."
 #~ msgstr "확정 버튼이 클릭될 때 마다, 초안 상태가 매뉴얼로 이동합니다. 즉, 견적이 판매 주문으로 이동합니다."
 
+#~ msgid "Notes"
+#~ msgstr "노트"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "재고 이동"
+
 #~ msgid "Manual Designation"
 #~ msgstr "매뉴얼 목적지"
 
@@ -2208,6 +2207,9 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "VAT"
 #~ msgstr "VAT"
 
+#~ msgid "Extra Info"
+#~ msgstr "기타 정보"
+
 #~ msgid ""
 #~ "The sale order will automatically create the invoice proposition (draft "
 #~ "invoice). Ordered and delivered quantities may not be the same. You have to "
@@ -2236,12 +2238,24 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "All Sales Order"
 #~ msgstr "모든 판매 주문"
 
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "판매 주문에 기초한 인보이스"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot make an advance on a sale order that is defined as 'Automatic "
 #~ "Invoice after delivery'."
 #~ msgstr "'배송 뒤 자동 인보이스'로 정의된 판매 주문에 대해 선급금을 처리할 수 없습니다."
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "선적 수량"
+
+#~ msgid "Warehouse"
+#~ msgstr "창고"
+
+#~ msgid "Force Assignation"
+#~ msgstr "할당"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2253,9 +2267,19 @@ msgstr "베송에 기초한 인보이스"
 #~ "will automatic create after delivery."
 #~ msgstr "선적 정책을 '배송 뒤 자동 인보이스'로 선택하면, 배송 뒤 인보이스를 자동 생성합니다."
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "에러 !"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "과세되지 않은 금액"
+
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "인보이스를 대기 중인 내 판매 주문"
 
+#~ msgid "Confirm Order"
+#~ msgstr "주문 확정"
+
 #~ msgid "Manual Description"
 #~ msgstr "매뉴얼 설명"
 
@@ -2272,9 +2296,15 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Complete Delivery"
 #~ msgstr "배송 완료"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "수량 (UoM)"
+
 #~ msgid "Total amount"
 #~ msgstr "총 금액"
 
+#~ msgid "Configuration"
+#~ msgstr "구성"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "배송 뒤 주문 인보이스"
 
@@ -2290,15 +2320,27 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Sales orders"
 #~ msgstr "판매 주문"
 
+#~ msgid "All Quotations"
+#~ msgstr "모든 견적들"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "인보이스 초안"
 
+#~ msgid "Procurement"
+#~ msgstr "조달"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "선적 예외"
+
 #~ msgid "Payment accounts"
 #~ msgstr "결제 계정"
 
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "인보이스가 발행될 판매 주문"
 
+#~ msgid "Order Line"
+#~ msgstr "주문 라인"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "포장 디폴트 정잭"
 
@@ -2323,12 +2365,18 @@ msgstr "베송에 기초한 인보이스"
 #~ "order"
 #~ msgstr "판매 주문에서 각 라인을 위한 조달이며, 조달 주문 속에 삽입됩니다."
 
+#~ msgid "Salesman"
+#~ msgstr "판매사원"
+
 #~ msgid "Order Ref"
 #~ msgstr "주문 참조"
 
 #~ msgid "Uninvoiced Lines"
 #~ msgstr "인보이스되지 않은 라인들"
 
+#~ msgid "Packaging"
+#~ msgstr "포장"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "교정된 조달"
 
@@ -2356,9 +2404,6 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Sale Procurement"
 #~ msgstr "판매 조달"
 
-#~ msgid "Sale Order"
-#~ msgstr "판매 주문"
-
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
@@ -2374,12 +2419,25 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Direct Delivery"
 #~ msgstr "직접 배송"
 
+#~ msgid "Properties"
+#~ msgstr "속성"
+
 #~ msgid "Make Invoice"
 #~ msgstr "인보이스 만들기"
 
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "회계사무원이 검토할 고객 인보이스 초안"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "에러"
+
+#~ msgid "Compute"
+#~ msgstr "계산"
+
+#~ msgid "Assign"
+#~ msgstr "할당"
+
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "스톡가능한 상품에 대해 포장 OUT이 생성됩니다."
 
@@ -2392,12 +2450,12 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Other data"
 #~ msgstr "기타 데이터"
 
-#~ msgid "Sequence"
-#~ msgstr "시퀀스"
-
 #~ msgid "Confirm sale order and Create invoice."
 #~ msgstr "판매 주문을 확정하고, 인보이스를 생성"
 
+#~ msgid "Close"
+#~ msgstr "닫기"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "오브젝트 이름은 x_로 시작해야 하며, 특수 문자를 포함하면 안 됩니다 !"
@@ -2408,6 +2466,9 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "선적 & 매뉴얼 인보이스"
 
+#~ msgid "UoM"
+#~ msgstr "UoM"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2440,6 +2501,12 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Advance 인보이스 오픈"
 
+#~ msgid "Incoterm"
+#~ msgstr "인코텀"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "주문 접촉"
+
 #~ msgid "Sales Management"
 #~ msgstr "판매 관리"
 
@@ -2449,6 +2516,9 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Sale Order Line"
 #~ msgstr "판매 주문 라인"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "할당 취소"
+
 #, python-format
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "이 판매 주문을 취소하지 못했습니다 !"
@@ -2460,6 +2530,9 @@ msgstr "베송에 기초한 인보이스"
 #~ "The name and address of the contact that requested the order or quotation."
 #~ msgstr "주문 또는 견적을 요청한 이의 이름과 주소"
 
+#~ msgid "on order"
+#~ msgstr "주문 상"
+
 #~ msgid ""
 #~ "By default, Open ERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2472,6 +2545,9 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Purchase Pricelists"
 #~ msgstr "구매 가격리스트"
 
+#~ msgid "Name"
+#~ msgstr "이름"
+
 #~ msgid "Configure Picking Policy for Sale Order"
 #~ msgstr "판매 주문을 위한 피킹 정책 구성"
 
@@ -2482,6 +2558,9 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "이미 확정된 판매 주문은 삭제할 수 없습니다 !"
 
+#~ msgid "Product UoM"
+#~ msgstr "상품 UOM"
+
 #~ msgid "Related invoices"
 #~ msgstr "관련된 인보이스들"
 
@@ -2504,24 +2583,34 @@ msgstr "베송에 기초한 인보이스"
 #~ msgid "Payment Terms"
 #~ msgstr "결제 조건"
 
+#~ msgid "States"
+#~ msgstr "상태"
+
+#~ msgid "Stock Moves"
+#~ msgstr "스톡 이동"
+
 #~ msgid "My Sales Order"
 #~ msgstr "내 판매 주문"
 
 #~ msgid "Sale Order line"
 #~ msgstr "판매 주문 라인"
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "베송에 기초한 인보이스"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "에러: 유효하지 않은 EAN 코드"
 
-#~ msgid "Status"
-#~ msgstr "상태"
-
 #~ msgid "Packing Policy"
 #~ msgstr "포장 정책"
 
 #~ msgid "Product sales"
 #~ msgstr "상품 판매"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "test_state에 유효하지 않은 모드"
+
 #~ msgid "Create Advance Invoice"
 #~ msgstr "Advance Invoice 생성"
 
diff --git a/addons/sale/i18n/lo.po b/addons/sale/i18n/lo.po
new file mode 100644
index 00000000000..9efbfcbdc43
--- /dev/null
+++ b/addons/sale/i18n/lo.po
@@ -0,0 +1,2136 @@
+# Lao translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
+"PO-Revision-Date: 2012-08-20 19:00+0000\n"
+"Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
+"Language-Team: Lao <lo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "ສລົບລ້າງສັ່ງຊື້"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr "ອາກອນ"
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "ຈຳນວນ"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Description"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "ທີ່ຢູ່ສຳລັບສົ່ງສິນຄ້າກຳລັງສັ່ງ"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
diff --git a/addons/sale/i18n/lt.po b/addons/sale/i18n/lt.po
index 4c6f9c408c6..521b511cecb 100644
--- a/addons/sale/i18n/lt.po
+++ b/addons/sale/i18n/lt.po
@@ -6,20 +6,168 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2010-12-14 21:49+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
+"PO-Revision-Date: 2012-10-22 17:52+0000\n"
+"Last-Translator: ignas <ignassladkevicius@yahoo.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Pagal darbo laiko apskaitos žiniaraštį"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanso sąskaita faktūra"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Patvirtinti pasiūlymą"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Patvirtinimo data"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Grupuoti pagal..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -31,61 +179,345 @@ msgstr ""
 "(išskirtinėje) būsenoje ir kurioms dar nebuvo išrašyta sąskaita"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Pardavėjo pardavimai per paskutinias 90 dienų"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Važtaraščio eil. adresas"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Užsakymo būsena"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Jeigu Jūs neturite pakankamai atsargų ar pritariate daliniam vežimui?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Pristatymo adresas einamiesiems pardavimams."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Kiekis"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Pasiūlymai"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Neužpajamuotos ir pristatymo eilutės"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Sąskaitos faktūros klaida"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Bendra suma."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analitinė sąskaita"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Tarpinė suma"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
 msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Atšaukti užsakymą"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Pasiūlymas '%s' buvo paverstas į pardavimo užsakymą."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Svoris"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Spausdinti pasiūlymą"
+msgid "Quotation "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Įspėjimas!"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Pardavimo užsakymas"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Mokesčiai"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Suma be mokesčių"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Neto iš viso:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Atšauktas"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Iš viso"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Parduotuvė"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Pardavimų išimtys"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Sąskaitos adresas"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Iš naujo sukurti sąskaitą faktūrą"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -93,78 +525,643 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analitinė sąskaita"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Čia yra užsakymų eilutės, kurioms bus išrašytos sąskaitos. Galite išrašyti "
-"užsakymų sąskaitas nepilnas, pagal eulutes arba užsakymus. Jums "
-"nereikalingas šis sąrašas, jei išrašote sąskaitas pagal pristatymo užsakymus "
-"ar išrašote pilnas sąskaitas."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_summary:0
 msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-"Norint ištrinti patvirtintą pardavimo užsakymą, turite atšaukti jį prieš "
-"tai! Norėdami atšaukti pardavimą, pirmiausia turite panaikinti susijusį "
-"prekių gavimo ar pristatymo užsakymus."
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faksas :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Kiekis (Mat. vnt.)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Patvirtinta"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Numatytasis mokėjimo terminas"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Patvirtinti"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Pristatymo adresas"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Mėnesinė apyvarta"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Užsakymo Nr."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Užsakymo eilutės"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Nuol. (%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Užsakymo nuoroda"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Sąskaitos eilutės"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Bendra kaina"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Seni pasiūlymai"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+"Pažymėkite žymės langelį, kad sugrupuoti tų pačių klientų sąskaitas faktūras"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Laukiantis"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Užsakyti kiekiai"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Kiekis"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Iš viso :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mano pardavimai"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Klaidingas veiksmas!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiskalinė pozicija"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Pasiūlymai ir pardavimai"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "Partneris"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Sąskaita paremta prisatymais"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Užsakymo eilutės"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
-"Pardavimų užsakymai jums padeda valdyti pasiūlymus ir užsakymus iš jūsų "
-"klientų. OpenERP siūlo jums pradėti nuo pasiūlymo sukūrimo. Kai tik "
-"pasiūlymas bus patvirtintas, jis bus pakeistas į užsakymą. OpenERP gali "
-"tvarkyti keletą produktų rūšių, taip kad pardavimo užsakymas gali iššaukti "
-"užduotis, pristatymo užsakymus, gamybos užsakymus, pirkimus ir pan. "
-"Remiantis pardavimo užsakymo konfigūracija, juodraštinė sąskaita bus "
-"sukurta, kad jūms užtektu tik patvirtinti, kai norėsite apmokestinti klientą."
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Nuolaida (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mano pasiūlymai"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Seka"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Parduotuvės pavadinimas"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Mokesčiai:"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Vykdomas"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nenurodytas klientas!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Sukurti sąskaitas faktūras"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -182,1186 +1179,9 @@ msgstr ""
 "valandas, praleistos susijusiai užduočiai atlikti."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Numatytasis mokėjimo terminas"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Remaintis pristatymo užsakimu"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Nuol. (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Bendra kaina"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-"Pažymėkite žymės langelį, kad sugrupuoti tų pačių klientų sąskaitas faktūras"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Užsakyti kiekiai"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Atsargų judėjimas"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Užsakymo nuoroda"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Pasiūlymai ir pardavimai"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr "Kainoraščio Įspėjimas!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Nuolaida (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mano pasiūlymai"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Pardavimų vadybininko monitoringas"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Pakavimas"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Iš paravimo užsakymo"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Parduotuvės pavadinimas"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nenurodytas klientas!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Pardavimų išimtys"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "Konfigūracijos klaida!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "Klaidingas modelis test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Nepavyko atšaukti šio pardavimo užsakymo!"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Pardavimų užsakymų statistika"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Pasiūlymai"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "PVM :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiskalinė pozicija"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "Mato vnt."
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Pakuočių skaičius"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Vykdomas"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Pastabos"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Išrašyta sąskaita faktūra"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Pristatymo užsakymas"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Važtaraščio eil. adresas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Tarpinė suma"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Sąskaitos adresas :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Sąskaitos adresas"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Pasiūlymas / Užsakymas"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Sandėlis"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Užsakymo Nr."
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Užsakymo eilutės"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Suma be mokesčių"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Kiekis (Mat. vnt.)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Neužpajamuotos ir pristatymo eilutės"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Iš viso :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Klaidingas veiksmas!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Papildoma informacija"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Kainoraštis"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Visi pasiūlymai"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Mokesčiai:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Atsargų judėjimas"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Užsakymo būsena"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr ""
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Pristatymo adresas"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Išimtis"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Istorija"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Nuoroda"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Kiekis"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Atšaukti"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Sukurti sąskaitą faktūrą"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Užsakymo kontaktas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Paskyrimas"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Užsakant"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Pavadinimas"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Pristatymo adresas :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Patvirtinti pasiūlymą"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Klaida"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Iš naujo sukurti sąskaitą faktūrą"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Laukiantis"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Padaryti juodraščiu"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Patvirtinti"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Patvirtinti užsakymą"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Mokesčiai"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faksas :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Pristatyti kiekiai"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Sąskaita faktūra sukurta iš pardavimų užsakymų"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Klaida!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Suplanuoti užsakymai"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Pristatymo klaida"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupuoti sąskaitas faktūras"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
@@ -1370,14 +1190,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Sąskaitos faktūros klaida"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Juodraštis"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1385,542 +1200,10 @@ msgid "Paid"
 msgstr "Apmokėta"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Ypatybės"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Pasiūlymas"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Pardavimai"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Vieneto kaina"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Atlikta"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Sąskaita faktūra"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Produktas"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Atšaukti paskyrimą"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "Važtaraščių taisyklės"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Užpajamuojama"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Užsakymo data"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Produktas"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Vykdomas"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Produkto mat. vnt."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Užsakymas"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Būsenos"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Iš viso"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Kaina"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Sukurti sąskaitas faktūras"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Neto iš viso:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Atšauktas"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Parduotuvė"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Kiekis (Mat. vnt.)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Patvirtinta"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Patvirtinti"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Sąskaitos eilutės"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Pardavimų užsakymų eilutės"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Pristatymo laikotarpis"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Nustatymai"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Svoris"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Sąskaitos faktūros"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Pardavėjas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Suma be mokesčių"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avanso sąskaita faktūra"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Juodraštis"
-
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1935,62 +1218,185 @@ msgid ""
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
 
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Pardavimų užsakymai"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupuoti sąskaitas faktūras"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Mokesčiai"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Būsena"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Rugpjūtis"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Birželis"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Užsakymas"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Kainoraščio Įspėjimas!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Pardavimų užsakymų statistika"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr ""
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Avansinės prekės"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Skaičiuoti"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Išimtis"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
 
 #. module: sale
@@ -2003,88 +1409,323 @@ msgstr ""
 msgid "Sales Order in Progress"
 msgstr "Vykdomi pardavimų užsakymai"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "Istorija"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Priskirti"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Nuoroda"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Kainoraštis"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "PVM :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr ""
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Pardavimų užsakymų eilutės"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Pardavimai"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Iš sandėlio"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Diena"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Uždaryta"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Sąskaitos faktūros"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Vieneto kaina"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Atlikta"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Sąskaitos adresas :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Sąskaita faktūra"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Atšaukti"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Pasiūlymas"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
 msgstr ""
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Pristatymo adresas :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Sukurti sąskaitą faktūrą"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
@@ -2093,17 +1734,152 @@ msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Produktas"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Aprašymas"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Kaina"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel.:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Kita informacija"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Kiekis"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Pristatymo adresas einamiesiems pardavimams."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Pasiūlymas / Užsakymas"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Klientas"
@@ -2118,45 +1894,190 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Užpajamuojama"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Užsakymo data"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Produktas"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Sąskaita"
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Vykdomas"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Search Sales Order"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1255
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "Not enough stock ! : "
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Iš paravimo užsakymo"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Mokėjimo terminas"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2165,23 +2086,71 @@ msgid "Quotation N°"
 msgstr "Pasiūlymo Nr."
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Pristatyta"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Sąskaita faktūra iš pristatymo užsakymo"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Išrašyta sąskaita faktūra"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#~ msgid "Configuration"
+#~ msgstr "Nustatymai"
 
 #~ msgid "Partial Delivery"
 #~ msgstr "Dalinis pristatymas"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Pristatymo užsakymas"
+
 #~ msgid "Origin"
 #~ msgstr "Kilmė"
 
@@ -2191,23 +2160,49 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Automatinis deklaravimas"
 
+#~ msgid "Notes"
+#~ msgstr "Pastabos"
+
+#~ msgid "Extra Info"
+#~ msgstr "Papildoma informacija"
+
 #~ msgid "Reference"
 #~ msgstr "Nuoroda"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Pristatyti kiekiai"
+
+#~ msgid "Warehouse"
+#~ msgstr "Sandėlis"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Klaida!"
+
+#~ msgid "Confirm Order"
+#~ msgstr "Patvirtinti užsakymą"
+
+#~ msgid "All Quotations"
+#~ msgstr "Visi pasiūlymai"
+
 #~ msgid "Sales orders"
 #~ msgstr "Pardavimų užsakymai"
 
 #~ msgid "Canceled"
 #~ msgstr "Atšaukta"
 
-#~ msgid "Status"
-#~ msgstr "Būsena"
+#~ msgid "Salesman"
+#~ msgstr "Pardavėjas"
 
 #~ msgid "Product sales"
 #~ msgstr "Produkto pardavimai"
 
-#~ msgid "Sequence"
-#~ msgstr "Seka"
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Klaida"
+
+#~ msgid "Assign"
+#~ msgstr "Priskirti"
 
 #~ msgid "Delivery Order Only"
 #~ msgstr "Tik pristatymo užsakymas"
@@ -2215,30 +2210,51 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "Other data"
 #~ msgstr "Kiti duomenys"
 
+#~ msgid "UoM"
+#~ msgstr "Mato vnt."
+
 #~ msgid "Sale Order Lines"
 #~ msgstr "Pardavimo užsakymo eilutės"
 
 #~ msgid "Sales order"
 #~ msgstr "Pardavimų užsakymas"
 
+#~ msgid "Ordering Contact"
+#~ msgstr "Užsakymo kontaktas"
+
 #~ msgid "Sales Management"
 #~ msgstr "Pardavimų valdymas"
 
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Klaida: Netinkamas EAN kodas"
 
+#~ msgid "Name"
+#~ msgstr "Pavadinimas"
+
 #~ msgid "New Quotation"
 #~ msgstr "Naujas pasiūlymas"
 
 #~ msgid "Recreate Procurement"
 #~ msgstr "Perkurti planinį užsakymą"
 
+#~ 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?"
+
+#~ msgid "from stock"
+#~ msgstr "Iš sandėlio"
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Žingsniai iki pardavimo užsakymo pristatymo"
 
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Jūsų sąskaita faktūra buvo sukurta!"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Padaryti juodraščiu"
+
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Tai yra sąrašas važtaraščių, sugeneruotų šiai sąskaitai faktūrai."
@@ -2253,9 +2269,15 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ "Šis konfigūracijos žingsnis yra naudojamas nustatyti neįvykdymo politiką, "
 #~ "kai vykdomi pardavimo užsakymai."
 
+#~ msgid "Validate"
+#~ msgstr "Patvirtinti"
+
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Patvirtinę užsakymą, sukurkite sąskaitą faktūrą."
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Atsargų judėjimas"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Rankinis deklaravimas"
 
@@ -2265,6 +2287,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "Shipping Policy"
 #~ msgstr "Dokumentų generavimo metodas"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Pristatymo klaida"
+
 #~ msgid "Outgoing Products"
 #~ msgstr "Siunčiamos prekės"
 
@@ -2311,9 +2336,15 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgstr ""
 #~ "Jūs turite atšaukti visus važtaraščius susijusius su šiuo pardavimo užsakymu."
 
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Sąskaita faktūra sukurta iš pardavimų užsakymų"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Parduotuvė"
 
+#~ msgid "Force Assignation"
+#~ msgstr "Paskyrimas"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2337,6 +2368,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "Manual Description"
 #~ msgstr "Rankinis deklaravimas"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Kiekis (Mat. vnt.)"
+
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
@@ -2368,9 +2402,18 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "Customer Ref"
 #~ msgstr "Kliento nuoroda"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "Važtaraščių taisyklės"
+
+#~ msgid "Procurement"
+#~ msgstr "Suplanuoti užsakymai"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Mokėjimo sąskaitos"
 
+#~ msgid "Close"
+#~ msgstr "Uždaryta"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "Sąskaitos faktūros juodraštis"
 
@@ -2385,6 +2428,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "Procurement for each line"
 #~ msgstr "Planiniai užsakymai eilutėms"
 
+#~ msgid "Order Line"
+#~ msgstr "Užsakymo eilutės"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "Važtaraščių numatytosios taisyklės"
 
@@ -2398,6 +2444,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Negalima atšaukti pardavimo užsakymo!"
 
+#~ msgid "Packaging"
+#~ msgstr "Pakavimas"
+
 #~ msgid "Order Ref"
 #~ msgstr "Užsakymo dok."
 
@@ -2448,6 +2497,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "Sales Configuration"
 #~ msgstr "Pardavimų konfigūracija"
 
+#~ msgid "on order"
+#~ msgstr "Užsakant"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "Planinių užsakymų ištaisymas"
 
@@ -2463,6 +2515,10 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "Packing Policy"
 #~ msgstr "Važtaraščių taisyklės"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "Klaidingas modelis test_state"
+
 #~ msgid "Our Salesman"
 #~ msgstr "Pardavėjas"
 
@@ -2472,15 +2528,15 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "One procurement for each product."
 #~ msgstr "Vienas užsakymas kiekvienam produktui."
 
-#~ msgid "Sale Order"
-#~ msgstr "Pardavimo užsakymas"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Pardavimų kainoraščiai"
 
 #~ msgid "Direct Delivery"
 #~ msgstr "Tiesioginis pristatymas"
 
+#~ msgid "Properties"
+#~ msgstr "Ypatybės"
+
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
@@ -2488,6 +2544,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ "Sąskaita faktūra yra sukuriama, paspaudus \"Sukurti sąskaitą faktūra\", kai "
 #~ "yra patvirtinamas pardavimo užsakymas."
 
+#~ msgid "Compute"
+#~ msgstr "Skaičiuoti"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Sukurti sąskaitą faktūrą"
 
@@ -2509,6 +2568,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ "užsakymo būsena nustatoma, kai sąskaita faktūra patvirtinama, bet laukiama, "
 #~ "kol data sutaps su galutine data (nurodyta pardavimo užsakyme)."
 
+#~ msgid "Number Packages"
+#~ msgstr "Pakuočių skaičius"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2536,6 +2598,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "Packing List & Delivery Order"
 #~ msgstr "Važtaraštis ir pristatymo užsakymas"
 
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Pristatymo laikotarpis"
+
 #~ msgid "Do you really want to create the invoices ?"
 #~ msgstr "Ar jūs tikrai norite sukurti sąskaitas faktūras?"
 
@@ -2561,6 +2626,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "Sale Order Line"
 #~ msgstr "Pardavimų užsakymo eilutės"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Atšaukti paskyrimą"
+
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Rankinis s/f generavimas iš važtaraščio"
 
@@ -2581,6 +2649,9 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ msgid "Total amount"
 #~ msgstr "Iš viso"
 
+#~ msgid "Product UoM"
+#~ msgstr "Produkto mat. vnt."
+
 #~ msgid ""
 #~ "By default, Open ERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2619,12 +2690,27 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 #~ "užsakymo. Tas pats pardavimo užsakymas gali būti pajamuojamas kelis kartus "
 #~ "(pvz. pagal eilutes)"
 
+#~ msgid "States"
+#~ msgstr "Būsenos"
+
+#~ msgid "Accounting"
+#~ msgstr "Sąskaita"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Atsargų judėjimas"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Mano pardavimų užsakymai"
 
 #~ msgid "Sale Order line"
 #~ msgstr "Pardavimo užsakymo eilutė"
 
+#~ msgid "Untaxed amount"
+#~ msgstr "Suma be mokesčių"
+
 #~ msgid ""
 #~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
 #~ "is, quotation is moved to  sale order."
@@ -2634,3 +2720,80 @@ msgstr "Sąskaita faktūra iš pristatymo užsakymo"
 
 #~ msgid "Quotation (A sale order in draft state)"
 #~ msgstr "Pasiūlymas (Pardavimo užsakymas juodraščio būsenoje)."
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Pardavėjo pardavimai per paskutinias 90 dienų"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Pagal darbo laiko apskaitos žiniaraštį"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Sąskaita paremta prisatymais"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Nepavyko atšaukti šio pardavimo užsakymo!"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Pardavimų vadybininko monitoringas"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Pasiūlymas '%s' buvo paverstas į pardavimo užsakymą."
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Čia yra užsakymų eilutės, kurioms bus išrašytos sąskaitos. Galite išrašyti "
+#~ "užsakymų sąskaitas nepilnas, pagal eulutes arba užsakymus. Jums "
+#~ "nereikalingas šis sąrašas, jei išrašote sąskaitas pagal pristatymo užsakymus "
+#~ "ar išrašote pilnas sąskaitas."
+
+#~ msgid "Print Quotation"
+#~ msgstr "Spausdinti pasiūlymą"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Norint ištrinti patvirtintą pardavimo užsakymą, turite atšaukti jį prieš "
+#~ "tai! Norėdami atšaukti pardavimą, pirmiausia turite panaikinti susijusį "
+#~ "prekių gavimo ar pristatymo užsakymus."
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Įspėjimas!"
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Pardavimų užsakymai jums padeda valdyti pasiūlymus ir užsakymus iš jūsų "
+#~ "klientų. OpenERP siūlo jums pradėti nuo pasiūlymo sukūrimo. Kai tik "
+#~ "pasiūlymas bus patvirtintas, jis bus pakeistas į užsakymą. OpenERP gali "
+#~ "tvarkyti keletą produktų rūšių, taip kad pardavimo užsakymas gali iššaukti "
+#~ "užduotis, pristatymo užsakymus, gamybos užsakymus, pirkimus ir pan. "
+#~ "Remiantis pardavimo užsakymo konfigūracija, juodraštinė sąskaita bus "
+#~ "sukurta, kad jūms užtektu tik patvirtinti, kai norėsite apmokestinti klientą."
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Konfigūracijos klaida!"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Remaintis pristatymo užsakimu"
+
+#~ msgid "Dates"
+#~ msgstr "Datos"
+
+#~ msgid "Conditions"
+#~ msgstr "Sąlygos"
diff --git a/addons/sale/i18n/lv.po b/addons/sale/i18n/lv.po
index c9159c0510d..a1b6b6a37c9 100644
--- a/addons/sale/i18n/lv.po
+++ b/addons/sale/i18n/lv.po
@@ -7,21 +7,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2009-09-08 12:39+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
+"PO-Revision-Date: 2012-11-16 12:35+0000\n"
+"Last-Translator: Normunds (Alistek) <Unknown>\n"
 "Language-Team: Latvian <lv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-11-17 04:36+0000\n"
+"X-Generator: Launchpad (build 16278)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Priekšapmaksas Rēķins"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Apstiprināt Pasūtījumu"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Apstiprināšanas Datums"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Grupēt Pēc..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -30,16 +178,682 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Daļas Partneris"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_policy:0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Pasūtījuma Statuss"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Piestādīt Rēķinu"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datums, kurā pasūtījums tika apstiprināts."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Tāmējumi"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marts"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Uzņēmums"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Rēķina Datums"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Priekšapmaksas rēķina summa."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Rēķina kļūda"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Summa"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analītiskais Konts"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Apakšsumma kopā"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "Atcelt Pasūtījumu"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Svars"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Tirdzniecības Pasūtījums"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septembris"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Nodokļi"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Summa bez nodokļiem"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Neto Summa:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Atcelts"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Kopā"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Veikals"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Veiktas Izmaiņas"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Rēķina Adrese"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datums, kurā izveidots pasūtījums."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Veidot Rēķinu"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Veidot Rēķinus"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Apstiprināšanas Datums"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Rindu skaits"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Daudz."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fakss:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Pasūtījums"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Daudzums (Pārdošanas mērvienība)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Priekšapmaksas Summa"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Apstiprināts"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Apmaksas termiņš pēc noklusējuma"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Apstiprināt"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Piegādes Adrese"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Gads"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Pasūtījuma Nr."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Pasūtījuma sastāvdaļas"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Atlaide %"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Atsauce uz Pasūtījumu"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Rēķina pozīcijas"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Cena Kopā"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Vecie Tāmējumi"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Veidot Rēķinus"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Izveides Datums"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Pasūtījuma rēķina adrese"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Pasūtītais Daudzums"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Skaits"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Kopā:"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mana Pārdošana"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Nederīga darbība!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Nodokļu Profils"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Jūlijs"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
 msgstr ""
 
 #. module: sale
@@ -48,108 +862,305 @@ msgid "UoS"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Skaits"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Atcelt Pasūtījumu"
-
-#. module: sale
-#: code:addons/sale/sale.py:638
+#: code:addons/sale/edi/sale_order.py:151
 #, python-format
-msgid "The quotation '%s' has been converted to a sales order."
+msgid "EDI Pricelist (%s)"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
 #. module: sale
 #: report:sale.order:0
-msgid "Tax"
-msgstr ""
+msgid "Quotation Date"
+msgstr "Tāmējuma Datums"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Pasūtījuma datums"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analītiskais Konts"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+#: help:sale.order,order_policy:0
 msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "Pasūtījuma pozīcija"
+msgid "Sales Order done"
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partneris"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Izrakstīt Rēķinu"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Atlaide %"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Decembris"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Piegādāts"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mēnesis"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secība"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nav piestādīts rēķins"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Produkta Kategorija"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Tirdzniecības Punkta Nosaukums"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Nodokļi:"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Priekšapmaksas Rēķins"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Apstrādē"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Klients nav Definēts!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Izveidot Rēķinus"
+
 #. module: sale
 #: help:sale.order,invoice_quantity:0
 msgid ""
@@ -161,1185 +1172,9 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Apmaksas termiņš pēc noklusējuma"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Atlaide %"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Pasūtītais Daudzums"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Kustība Noliktavā"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Atsauce uz Pasūtījumu"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Atlaide %"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Iepakojums"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "nepareizs režīms test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Cenrādis Pasūtījumam"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiskālā Pozīcija"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "mērv."
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Piezīmes"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Rēķins piestādīts"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Piegādes Pasūtījums"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Inkoterms"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Daļas Partneris"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Apakšsumma kopā"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Rēķina adrese:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Rēķina Adrese"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Cenas piedāvājums / Pasūtījums"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Noliktava"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Pasūtījuma Nr."
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Pasūtījuma sastāvdaļas"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Summa bez nodokļiem"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Daudzums (mērv.)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Kopā:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Nepareiza darbība!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Papildus Info"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cenrādis"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Nodokļi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Preču kustība Noliktavā"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Pasūtījuma statuss"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr ""
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Piegādes Adrese"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Kļūda"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Vēsture"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Jūsu Atsauce"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Sk."
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Atcelt"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Izveidot Rēķinu"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Pasūtījuma Kontaktpersona"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Piespiedu Nodošana"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nosaukums"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Piegādes adrese:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Apstiprināt Pasūtījumu"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Klūda"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Veidot Rēķinu"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Atzīmēt kā Melnrakstu"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Apstiprināt"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Apstiprināt Pasūtījumu"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Nodokļi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fakss:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Piegādātais Daudzums"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Rēķins pēc Tirdzniecības Pasūtījuma"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Kļūda!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Iepirkums"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Piegādes kļūda"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupēt rēķinus"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
@@ -1348,14 +1183,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Rēķina kļūda"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Melnraksts"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1363,542 +1193,10 @@ msgid "Paid"
 msgstr "Samaksāts"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Tirdzniecība"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Vienības cena"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Pabeigts"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Rēķins"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Produkts"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Atcelt preču nodošanu"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Datums, kad tika pasūtīts"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Preces mērv."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Pasūtījums"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Stāvokļi"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Kopā"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Izveidot Rēķinus"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Tīrais kopā:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Veikals"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Apstiprināts"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Apstiprināt"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Rēķina pozīcijas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Tirdzniecības Pasūtījuma pozīcijas"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr ""
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Konfigurācija"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Svars"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Rēķini"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Pārdošanas menedžeris"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Summa bez nodokļiem"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Priekšapmaksas Rēķins"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Melnraksts"
-
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1913,219 +1211,583 @@ msgid ""
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
 
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Tirdzniecības Pasūtījumi"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupēt rēķinus"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Nodokļa summa."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Statuss"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Augusts"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Nodrošina iepirkumu un rēķinu piestādīšanas procesu"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Jūnijs"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pasūtījums"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tirdzniecības Kanāls"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Pasūtījumu Statistika"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Pasūtījuma Rinda"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
+msgstr "Novembris"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Paplašinātie filtri..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
 msgstr ""
 
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
+msgstr "Priekšapmaksas Prece"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Kļūda"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktobris"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Aprēķināt"
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Janvāris"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
 msgstr "Tirdzniecības pasūtījuma progress"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "Vēsture"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Piešķirt"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Jūsu Atsauce"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cenrādis"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
+msgstr "Apstiprinātie pasūtījumi rēķina piestādīšanai."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Tirdzniecības Pasūtījuma pozīcijas"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Tirdzniecība"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Diena"
+
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Rēķini"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Vienības cena"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Pabeigts"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Rēķina adrese:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Rēķins"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "no noliktavā esošajām precēm"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Aizvērt"
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Tāme"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Meklēt Rindas, par kurām nav piestādīti Rēķini"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Veicamais"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Piegādes adrese:"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Pārdošanu Analīze"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Cenrādis Pasūtījumam"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Izveidot Rēķinu"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Summa bez nodokļiem."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
+msgstr "Norāda, ka rēķins ir apmaksāts."
+
+#. module: sale
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Produkts"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Apraksts"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maijs"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Klients"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr ""
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Apmaksas Noteikumi"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cena"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2137,25 +1799,341 @@ msgid ""
 "the Invoice Analysis report in the Accounting application."
 msgstr ""
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Cita Informācija"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Sk."
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Pārbaudīt Grāmatvedim."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Piegādes adrese pasūtījumam."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Cenas piedāvājums / Pasūtījums"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Klients"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Priekšapmaksa"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Februāris"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Rēķins pēc"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Datums, kad tika pasūtīts"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Produkta pārdošanas mērvienība"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Pasūtījuma melnraksta statuss"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Pamatojuma Dokuments"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Aprīlis"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuāls Progresā"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Meklēt Pasūtījumu"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "No pasūtījuma"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorēt Brīdinājumu"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Ar pasūtījumu saistītais analītiskais konts."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Apmaksas Noteikumi"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Cenas piedāvājuma Nr."
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Klienta Kods"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Pieņemts piegādei"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Rēķins pēc Piegādes"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Iekļauto Nodokļu Summa"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Rēķins piestādīts"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
 
 #~ msgid "Recreate Procurement"
 #~ msgstr "Veidot Iepirkumu no jauna"
@@ -2163,18 +2141,36 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Partial Delivery"
 #~ msgstr "Daļēja piegāde"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Piegādes Pasūtījums"
+
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Rēķins ir sekmīgi izveidots!"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Atzīmēt kā Melnrakstu"
+
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Piegāde no noliktavas klientam."
 
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Pēc pasūtījuma apstiprināšanas izveidojiet Rēķinu."
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Kustība Noliktavā"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Manuāls Norīkojums"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
+#~ msgid "Validate"
+#~ msgstr "Apstiprināt"
+
+#~ msgid "Notes"
+#~ msgstr "Piezīmes"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Piegādes noteikumi"
 
@@ -2187,6 +2183,9 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Outgoing Products"
 #~ msgstr "Izejošā Produkcija"
 
+#~ msgid "Extra Info"
+#~ msgstr "Papildus Info"
+
 #~ msgid "Procurement is created after confirmation of sale order."
 #~ msgstr "Iepirkums tiks izveidots pēc Pasūtījuma apstiprināšanas."
 
@@ -2208,12 +2207,34 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Net Price"
 #~ msgstr "Tīrā cena"
 
+#~ msgid "Force Assignation"
+#~ msgstr "Piespiedu Nodošana"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Rēķins pēc Tirdzniecības Pasūtījuma"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Piegādātais Daudzums"
+
+#~ msgid "Warehouse"
+#~ msgstr "Noliktava"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Summa bez nodokļiem"
+
+#~ msgid "from stock"
+#~ msgstr "no noliktavā esošajām precēm"
+
 #~ msgid "My sales order in progress"
 #~ msgstr "Mana pasūtījuma progress"
 
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Mans tirdzniecības pasūtījums (Tiek gaidīts Rēķins)"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Kļūda!"
+
 #~ msgid "Manual Description"
 #~ msgstr "Manuāls Apraksts"
 
@@ -2228,15 +2249,24 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgstr ""
 #~ "Vispirms ir jāatceļ visi tirdzniecības pasūtījumam pievienotie rēķini."
 
+#~ msgid "Confirm Order"
+#~ msgstr "Apstiprināt Pasūtījumu"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Pilna Piegāde"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Daudzums (mērv.)"
+
 #~ msgid "Total amount"
 #~ msgstr "Kopējais daudzums"
 
 #~ msgid "Sale Shop"
 #~ msgstr "Tirdzniecības Veikals"
 
+#~ msgid "Configuration"
+#~ msgstr "Konfigurācija"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Rēķins no Pasūtījuma pēc Piegādes"
 
@@ -2246,9 +2276,18 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Draft Invoice"
 #~ msgstr "Rēķins (Melnraksts)"
 
+#~ msgid "Procurement"
+#~ msgstr "Iepirkums"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Piegādes kļūda"
+
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "Tirdzniecības pasūtījums kuram jāpiestāda Rēķins"
 
+#~ msgid "Order Line"
+#~ msgstr "Pasūtījuma pozīcija"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "Standarta noteikumi iepakošanai"
 
@@ -2268,9 +2307,15 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Canceled"
 #~ msgstr "Atcelts"
 
+#~ msgid "Salesman"
+#~ msgstr "Pārdošanas menedžeris"
+
 #~ msgid "Uninvoiced Lines"
 #~ msgstr "Pozīcijas, par kurām nav piestādīti rēķini"
 
+#~ msgid "Packaging"
+#~ msgstr "Iepakojums"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "Iepirkums Izlabots"
 
@@ -2280,35 +2325,40 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Sales Process"
 #~ msgstr "Tirdzniecības Process"
 
-#~ msgid "Status"
-#~ msgstr "Statuss"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Iepakošanas Noteikumi"
 
 #~ msgid "Product sales"
 #~ msgstr "Preču tirdzniecība"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "nepareizs režīms test_state"
+
 #~ msgid "Our Salesman"
 #~ msgstr "Mūsu tirdzniecības menedžeris"
 
 #~ msgid "Create Advance Invoice"
 #~ msgstr "Izveidot Priekšapmaksas Rēķinu"
 
-#~ msgid "Sale Order"
-#~ msgstr "Tirdzniecības Pasūtījums"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Tirdzniecības Cenuzīmes"
 
 #~ msgid "Direct Delivery"
 #~ msgstr "Tiešā Piegāde"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Klūda"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Izveidot Rēķinu"
 
-#~ msgid "Delivery Order Only"
-#~ msgstr "Piegādes Pasūtījums Tikai"
+#~ msgid "Compute"
+#~ msgstr "Aprēķināt"
+
+#~ msgid "Assign"
+#~ msgstr "Piešķirt"
 
 #~ msgid "Sales order lines"
 #~ msgstr "Tirdzniecības pasūtījuma pozīcijas"
@@ -2316,12 +2366,12 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Other data"
 #~ msgstr "Citi dati"
 
-#~ msgid "Sequence"
-#~ msgstr "Secība"
-
 #~ msgid "Confirm sale order and Create invoice."
 #~ msgstr "Apstiprināt Tirdzniecības pasūtījumu un izveidot Rēķinu"
 
+#~ msgid "Close"
+#~ msgstr "Aizvērt"
+
 #~ msgid "Advance Payment"
 #~ msgstr "Priekšapmaksa"
 
@@ -2355,6 +2405,12 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Atvērt Priekšapmaksas rēķinu"
 
+#~ msgid "Incoterm"
+#~ msgstr "Inkoterms"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Pasūtījuma Kontaktpersona"
+
 #~ msgid "Sales Management"
 #~ msgstr "Tirdzniecības Vadība"
 
@@ -2364,6 +2420,9 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Sale Order Line"
 #~ msgstr "Tirdzniecības pasūtījuma pozīcija"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Atcelt preču nodošanu"
+
 #, python-format
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Nevar atcelt šo tirdzniecības pasūtījumu!"
@@ -2374,6 +2433,9 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Iepirkuma Cenrādis"
 
+#~ msgid "Name"
+#~ msgstr "Nosaukums"
+
 #~ msgid "New Quotation"
 #~ msgstr "Jauns Cenas piedāvājums"
 
@@ -2381,6 +2443,12 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Nevar dzēst Tirdzniecības pasūtījumus, kas jau ir apstiprināti!"
 
+#~ msgid "Product UoM"
+#~ msgstr "Preces mērv."
+
+#~ msgid "States"
+#~ msgstr "Stāvokļi"
+
 #~ msgid "Related invoices"
 #~ msgstr "Saistītie Rēķini"
 
@@ -2396,6 +2464,9 @@ msgstr "Rēķins pēc Piegādes"
 #~ msgid "Payment Terms"
 #~ msgstr "Apmaksas Noteikumi"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Preču kustība Noliktavā"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Mans Tirdzniecības pasūtījums"
 
@@ -2404,3 +2475,282 @@ msgstr "Rēķins pēc Piegādes"
 
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Kļūda: nepareizs EAN kods"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Rēķins pēc Piegādes"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Pārdošana pa Pārdevējiem pēdējās 90 dienās"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Konfigurēt Pasūtījuma Loģistiku"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Ļauj aprēķināt piegādes izmaksas."
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Vai piegādāt pasūtījumu pa daļām, ja noliktavā nav iespējams piegādāt visu "
+#~ "pasūtījumu vienlaicīgi?"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Tāmējums \"%s\" tika pārveidots par pasūtījumu."
+
+#~ msgid "Dates"
+#~ msgstr "Datumi"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Pārdošana pēc Pārdevējiem"
+
+#~ msgid "Conditions"
+#~ msgstr "Nosacījumi"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Pārdevēja Instrumentu Panelis"
+
+#~ msgid "Configure"
+#~ msgstr "Konfigurēt"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Nevar atcelt pasūtījumu!"
+
+#~ msgid "Number Packages"
+#~ msgstr "Iepakojumu Skaits"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(nav pieejams)"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "Pasūtījuma kodam ir jābūt unikālam!"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Rindas, par kurām piestādīt Rēķinu."
+
+#~ msgid "Do you really want to create the invoice(s) ?"
+#~ msgstr "Vai tiešām vēlaties piestādīt rēķinu(-s)?"
+
+#~ msgid "All Quotations"
+#~ msgstr "Visi Tāmējumi"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Nevar atcelt pasūtījuma rindu!"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Pārdošana Pa Mēnešiem"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Pārdoto preču piegāde"
+
+#~ msgid "  Year  "
+#~ msgstr "  Gads  "
+
+#~ msgid "Companies"
+#~ msgstr "Uzņēmumi"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Pasūtītāja vārds un adrese."
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Veidot Gala Rēķinu"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Pārdošana pa Partneriem"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Pasūtījumu Datumi"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Atvērt Rēķinu"
+
+#~ msgid "on order"
+#~ msgstr "pie pasūtījuma"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Piegādes Izmaksas"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Piegādes, par kurām piestādīt rēķinus"
+
+#~ msgid "Order date"
+#~ msgstr "Pasūtījuma datums"
+
+#~ msgid "Invoicing"
+#~ msgstr "Rēķinu izrakstīšana"
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Pasūtījums \"%s\" ir atcelts."
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Konfigurācijas Progress"
+
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Rēķins ir veiksmīgi izveidots!"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Piegādātais Daudz."
+
+#~ msgid "Delivered"
+#~ msgstr "Piegādāts"
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Pasūtījums \"%s\" ir atzīmēts kā melnraksts."
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Uzmanību!"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Iepirkuma Pasūtījums"
+
+#~ msgid "UoM"
+#~ msgstr "Mērv."
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr "Vispirms jāatceļ saistītie noliktavas grāmatojumi."
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Atvērt Rēķinu"
+
+#~ msgid "Security Days"
+#~ msgstr "Rezerves Dienas"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr "Nevar atcelt pasūtījuma rindu, par kuru jau ir piestādīts rēķins!"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Uzcenojumi Pasūtījumiem"
+
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Nodokļa Summa, kas nav Iekļauta"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Pārdošana pa Produktu Kategorijām"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Sagādes Veids"
+
+#~ msgid "Pick List"
+#~ msgstr "Komplektācijas Saraksts"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Pārdošana pa Klientiem pēdējās 90 dienās"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Veidot Rēķinu Pēc Komplektācijas"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Informācija par Komplektāciju"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Nevar atcelt pasūtījumu!"
+
+#~ msgid "Properties"
+#~ msgstr "Parametri"
+
+#~ msgid "Logistic"
+#~ msgstr "Loģistika"
+
+#~ msgid "   Month   "
+#~ msgstr "   Mēnesis   "
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Brīdinājums"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Pārdošana pa Mēnešiem"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Piegādes laiks"
+
+#~ msgid "Image"
+#~ msgstr "Attēls"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Kļūda! Jums nav tiesību veidot rekursīvus uzņēmumus."
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Rēķinu žurnāli"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Pasūtījuma Veikšanas Datums"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Konfigurēt Tirdzniecības Vadības Moduli"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Pasūtījuma Izkārtojuma Uzlabojums"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr "Vispirms jāatceļ visi rēķini, kas saistīti ar pasūtījumu."
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Nav pietiekošs skaits noliktavā!"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Izkārtojuma Secība"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Nevar izdzēst jau apstiprināto(-s) Pasūtījumu(-s)!"
+
+#~ msgid "Accounting"
+#~ msgstr "Grāmatvedība"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Šim produktam ir jāpiesaista produkcijas lots"
+
+#~ msgid "State"
+#~ msgstr "Statuss"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Veikt Tikai Piegādi"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Komplektācijas Noteikumi"
+
+#~ msgid "References"
+#~ msgstr "Kodi"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Balstīts uz piegādāto vai pasūtīto skaitu."
+
+#~ msgid "Related Picking"
+#~ msgstr "Saistītā Komplektēšana Noliktavā"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Veidot Komplektēšanas Sarakstu"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Veidot Piegādes Rīkojumu"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Veidot Piegādes Pasūtījumu"
+
+#~ msgid "Picking List"
+#~ msgstr "Komplektēšanas Saraksts"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr "Vispirms jāatceļ visa komplektācija, kas saistīta ar pasūtījumu."
+
+#~ msgid "Picking Policy"
+#~ msgstr "Komplektācijas Noteikumi"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Komplektācijas Saraksts un Piegādes Pasūtījums"
diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po
index 510ce319a32..66a320d9c72 100644
--- a/addons/sale/i18n/mn.po
+++ b/addons/sale/i18n/mn.po
@@ -7,20 +7,168 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-07-31 11:44+0000\n"
 "Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Цагийн хуваарь дээр суурилсан"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Урьдчилгаа нэхэмжлэл"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Үнийн саналыг батлах"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Борлуулалт хянах самбар"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Баталгаажсан огноо"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -32,62 +180,346 @@ msgstr ""
 "ялгагдсан төлөвтэй бөгөөд хараахан нэхэмжлэгдээгүй байна."
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Сүүлийн 90 хоногийн Борлуулалт Борлуулалтын Ажилтнаар"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Хоёрдогч хүргэх хаяг"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Захиалгын төлөв"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Хэрэв захиалгыг нэг дор бүгдийг нь хүргэхэд таны барааны нөөц хүрэлцэхгүй "
-"бол хэсэгчилсэн хүргэлтийг сонго"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "Б.Н"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Нэхэмжлэх"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Идэвхтэй борлуулалтын захиалгын хүргэх хаяг"
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Тоо ширхэг"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Борлуулалтын захиалга батлагдсан огноо"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Өдөр"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Үнийн санал"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "3 сар"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Гэрээ/Шинжилгээний Данс"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Компани"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Нэхэмжлэх огноо"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Нэхэмжлээгүй бөгөөд хүргэгдсэн захиалгууд"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Урьдчилгаа нэхэмжлэх дүн."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Нэхэмжлэлийн сондгойрол"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Бүх дүн."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Аналитик данс"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Дэд дүн"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Захиалга цуцлах"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "'%s' Үнийн санал борлуулалтын захиалга бол хөрвүүлэгдлээ."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Жин"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Үнийн санлалыг хэвлэх"
+msgid "Quotation "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Анхаар !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Борлуулах захиалга"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "9 сар"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Татвар"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Татваргүй дүн"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Цэвэр дүн :"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Цуцалсан"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+"Миний борлуулалтын захиалгад холбогдсон борлуулалтын захиалгын мөрүүд"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Нийт"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Дэлгүүр"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Саатаж буй захиалга"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Нэхэмжлэх хаяг"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Борлуулалтын захиалга үүсгэгдсэн огноо."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Дахин нэхэмжлэл үүсгэх"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Нэхэмжлэл үүсгэх"
 
 #. module: sale
 #: report:sale.order:0
@@ -95,77 +527,647 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Борлуулалтын захиалгын мөр бүрийн татан авалтын захиалгыг удирдана"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Аналитик данс"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Энд нэхэмжлэх ёстой борлуулалтын захиалгын бүх мөр байна. Борлуулалтын "
-"захиалгыг мөрөөр ялган хэсэгчилж нэхэмжлэх боломжтой. Хэрэв хүргэлтээс "
-"захиалах юмуу борлуулалтын захиалгыг бүхэлд нь нэхэмжлэхээр бол энэ хэрэггүй."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
-"Батлагдсан борлуулалтын захиалгыг устгахын тулд эхлээд цуцлах хэрэгтэй ! "
-"Борлуулалтын захиалгыг цуцлахын тулд эхлээд холбогдох бэлтгэх баримт болон "
-"хүргэлтийн баримтуудыг цуцлах ёстой."
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Нөхөн дүүргэлтийн захиалга"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Батлах огноо"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Мөрийн тоо"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Нийт тоо хэмжээ"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Факс:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Борлуулалтын захиалга"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Хоёрдогч тоо хэмжээ"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "'Дууссан' төлөвтэй Борлуулалтын Захиалгын Мөрүүд"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Урьдчилгаа дүн"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Батлагдсан"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Үндсэн төлбөрийн нөхцөл"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Батлах"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Хүргэх хаяг"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Борлуулалтын Захиалгын Мөрүүд нэхэмжлэхэд бэлэн"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Сарын эргэц"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Жил"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Хараахан батлагдаагүй Борлуулалтын Захиалга"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Захиалга №"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Захиалгын мөрүүд"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Хөнг.(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Захиалгын дугаар"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Нэхэмжлэлийн мөрүүд"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Нийт Үнэ"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Хуучин үнийн санал"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Ижил захиалагчийн захиалгыг бүлэглэж нэхэмжлэх бол сонго"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Нэхэмжлэл үүсгэх"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Цаг"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Үүсгэсэн огноо"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Хуваарь хүлээж байна"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Идэвхтэй борлуулалтын захиалгын нэхэмжлэх хаяг."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Захиалсан тоо хэмжээ"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Борлуулалтын захиалгын захиалсан он"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Тоо ширхэг"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Нийт :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Миний борлуулалт"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Хүчингүй үйлдэл !"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Санхүүгийн орлуулалт"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "7 сар"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "Б.Н"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "EDI Үнийн жагсаалт (%s)"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Үнэ зохиох өдөр"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Огноо"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Үнийн санал болон Борлуулалт"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "Харилцагч"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Хүргэлт дээр үндэслэж нэхэмжлэх"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Захиалгын мөр"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
-"Борлуулалтын захиалга нь захиалагчийн үнийн санал болох захиалгыг менеж "
-"хийхэд хэрэглэгддэг. OpenERP- нь үнийн санал үүсгэхээр борлуулалтыг эхлэхийг "
-"зөвлөдөг. OpenERP нь барааны олон төрлийг боловсруулдаг бөгөөд борлуулалтын "
-"захиалга нь даалгавар, хүргэх баримт, үйлдвэрлэлийн захиалга, худалдан авалт "
-"зэрэгийг үүсгэх боломжтой. Борлуулалтын захиалгын тохиргоо дээр үндэслэн "
-"ноорог нэхэмжлэх үүсгэгдэх бөгөөд захиалагчид тооцоо илгээхийн тулд "
-"нэхэмжлэхийг ердөө батлахад хангалттай."
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Борлуулалтаас Нэхэмжлэх"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Хөнгөлөлт (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Дараах шалтгаануудаас энэ Борлуулалтын Захиалгын Мөр дээр нэхэмжлэл "
+"үүсэхгүй:\n"
+"1. Энэ борлуулалтын захиалгын мөр нь \"ноорог\" эсвэл \"цуцлагдсан\" "
+"төлөлтэй байна!\n"
+"2. Борлуулалтын Захиалгын Мөр нэхэмжлэгдсэн!"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Борлуулалтын Захиалгын Мөрүүд Хийгдсэн."
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Миний ханш"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "12 сар"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Хүргэгдсэн"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Сар"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Захиалга (Код ${object.name or 'б/гүй' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Дараалал"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "Мөр байхгүй борлуулалтын захиалгыг батлах боломжгүй."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Нэхэмжлээгүй"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Барааны ангилал"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Дэлгүүрийн нэр"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Татвар :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Борлуулалтын Урьдчилгаа Төлбөрийн Нэхэмжлэл"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Хийгдэж байна"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Захиалагч тодорхойлогдоогүй байна !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Нэхэмжлэл үүсгэх"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -183,1305 +1185,10 @@ msgstr ""
 "үзүүлэхэд зарцуулсан цаг байх болно."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Үндсэн төлбөрийн нөхцөл"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Хүргэлтийн Баримт дээр Суурилсан"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "Үндсэн ажлын цагийн нэгж"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Төлөв"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Хөнг.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Нийт Үнэ"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Ижил захиалагчийн захиалгыг бүлэглэж нэхэмжлэх бол сонго"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Миний борлуулалтын захиалга"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Захиалсан тоо хэмжээ"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Борлуулалт Борлуулалтын Ажилтнаар"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Нөөцийн хөдөлгөөн"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Захиалгын дугаар"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Бусад мэдээлэл"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Огноо"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
 msgstr ""
-"Хэрэв захиалга гүйцэлтгэх арга нь 'Хүргэлтээс нэхэмжлэл үүсэх' эсвэл "
-"'Хүргэлтийн дараа захиалга дээр үндэслэн нэхэмжлэл үүсэх' бол нэхэмжлэл "
-"автоматаар үүснэ."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "Даалгаврын Ажил дээр суурилсан"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Үнийн санал болон Борлуулалт"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Борлуулалтаас Нэхэмжлэх"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Үнийн жагсаалтын Сануулга!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Хөнгөлөлт (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Миний ханш"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Борлуулалтын менежерийн хянах самбар"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Савалгаа"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Борлуулалтын захиалгаас"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Дэлгүүрийн нэр"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Нэхэмжлэх зарчим нь нэхэмжлэх, хүргэлтийг тулгахад хэрэглэгддэг. \n"
-"\n"
-"  - 'Хүргэлтээс өмнө төлөх' сонголт нь эхлээд нэхэмжлэхийг үүсгэдэг. Тэгээд "
-"нэхэмжлэх төлөгдсөн дараа бэлтгэх баримтыг үүсгэдэгэ.\n"
-"  - 'Хүргэлт ба Нэхэмжлэх шаардалтаар' нь шууд бэлтгэх баримтыг үүсгээд "
-"'Нэхэмжлэх' даруулыг дартал хүлээдэг. Ноорог нэхэмжлэх борлуулалтын захиалга "
-"дээр эсвэл борлуулалтын захиалгын мөрүүд дээр үндэслэн үүсдэг. \n"
-"  - 'Хүргэлтийн дараа нэхэмжлэх' сонголтын хувьд бэлтгэсэн дараа нэхэмжлэх "
-"үүсдэг. \n"
-"  - 'Хүргэлт үндэслэн нэхэмжлэх' сонголтын хувьд бэлтгэх явцад нэхэмжлэх "
-"үүсдэг."
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Захиалагч тодорхойлогдоогүй байна !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Саатаж буй захиалга"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "Тохиргооны алдаа !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Нөхцөлүүд"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Бараа ангилалын заяамал орлогын данс эсвэл санхүүгийн орлуулалт "
-"тодорхойлогдоогүй байна !"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Наймдугаар сар"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Ижил биш барааны цувралыг олгох гэж байна"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "тохирохгүй төлөв байна"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Зургадугаар сар"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Энэ борлуулалтын захиалга цуцлах боломжгүй !"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Борлуулалтын захиалгын шинжилгээ"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Борлуулалтын захиалгатай холбогдсон шинжилгээний данс."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "10 сар"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "Код компаний хувьд үл давхцах байх ёстой!"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Үнийн санал"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Идэвхтэй борлуулалтын захиалгын Үнийн Жагсаалт."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "НӨАТ :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr "Захиалагчид барааг хүргэх баталгаажуулалтын хоорондын өдөрийн тоо"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Үнэ зохиох өдөр"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Санхүүгийн орлуулалт"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "Х.н"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Савлагааны тоо"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Хийгдэж байна"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Борлуулалтын ажилтан үнийн саналыг батлана. Борлуулалтын захиалгын төлөв нь "
-"'Хийгдэж байна' эсвэл 'Гараар хийгдэж байна' төлөвтэй болдог."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr "Нэхэмжлэгдсэн борлуулалтын захиалгын мөрийг цуцлах боломжгүй!"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Борлуулалтын захиалгын энэ мөртэй холбогдсон барааны хөдөлгөөнийг эхлээд "
-"цуцлах хэрэгтэй."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(б/гүй)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"'Урьдчилгаа' нэртэй үйлчилгээ төрөлтэй бараа сонгоно. Та ийм бараа үүсгэж "
-"энэ талбарын заяамал утгаар тохируулах хэрэгтэй."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Утас:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"'Хүргэлтийн дараа автомат нэхэмжлэх' гэж тодорхойлогдсон борлуулалтын "
-"захиалгын хувьд урьдчилгаа үүсгэх боломжгүй."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Тэмдэглэл"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Компаний нэр үл давхцах байх ёстой !"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Идэвхтэй борлуулалтын захиалгын нэхэмжлэх хаяг."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Сар-1"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Борлуулалтын захиалгын захиалагдсан сар"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr "Ижил харилцагчийн бүлэг борлуулалт ялгаатай валюттай байж болохгүй."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Бараа байвал бүх барааг хүргэх"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Нэхэмжилсэн"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Хүргэлтийн захиалга"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Баталгаажсан огноо"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Худалдааны нөхцөл"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Хоёрдогч хүргэх хаяг"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "3 сар"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr "Харагдац төрөлтэй байрлалаас/байрлалруу шилжүүлж болохгүй."
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Борлуулалтын захиалга дээр суурилсан"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Бүх дүн."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Дэд дүн"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Нэхэмжлэх хаяг :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "Мөрийн Дараалал"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Борлуулалтын захиалгын мөр бүрт татан авалтын захиалга зарагдсан барааг "
-"татахаар үүсгэгдэнэ."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm нь 'International Commercial terms'-н товчлол. 'Олон Худалдааны "
-"Нөхцөл' нь худалдааны гүйлгээнд хэрэглэгддэг борлуулалтын нөхцөл юм."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Нэхэмжлэх хаяг"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Нэхэмжлээгүй захиалга хайх"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Үнийн санал / Захиалга"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Мөрийн тоо"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Борлуулалтын Нээлттэй Нэхэмжлэх"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Борлуулалтын Захиалгын Мөр"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Агуулах"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Захиалга №"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Захиалгын мөрүүд"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Татваргүй дүн"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Нэхэмжлэх гэж буй захиалга"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Тоо хэмжээ (х.н)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Үүсгэсэн огноо"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Бусад"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Нэхэмжлээгүй бөгөөд хүргэгдсэн захиалгууд"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Нийт :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Миний борлуулалт"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Хүчингүй үйлдэл !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Нэмэлт мэдээлэл"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Үнийн хүснэгт"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Нийт тоо хэмжээ"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "Цаг"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Огноо"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Хүргэгдсэн"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Бүх үнийн санал"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "Сонголт"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "9 сар"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Мөр байхгүй борлуулалтын захиалгыг батлах боломжгүй."
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Борлуулалтын формд үнийн жагсаалт эсвэл захиалагчийг сонгох ёстой ! \n"
-"Бараа сонгохын өмнө аль нэгийг нь сонго."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Барааны ангилал"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Татвар :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Барааны хөдөлгөөн"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Захиалгын төлөв"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Та үнэхээр нэхэмжлэл үүсгэхийг хүсч байна уу ?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Борлуулалт сараар"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Борлуулалтын захиалгын мөрийг цуцлаж чадсангүй!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Аюулгүй өдөр"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Зарагдсан материалын нөхөн дүүргэлт"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Бүтэн нэхэмжлэл үүсгэх"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Хүргэх хаяг"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Энэ нь борлуулалтын захиалга хүргэгдсэнийг илэрхийлнэ. Энэ талбар нь "
-"товлосон үйлдэл ажилласан дараа л шинэчлэгддэг."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Огноо"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Өргөтгөсөн хайлт..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Алдаа"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Компаниуд"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-"Үнийн санал эсвэл борлуулалтын захиалгын төлөвийг өгнө.\n"
-"Онцгой төлөв нь нэхэмжлэх шалгахад (Онцлог Нэхэмжлэх) тохиолдоход үүснэ. "
-"Эсвэл бэлтгэхэд (Онцлог Хүргэлт) тохиолдоход үүснэ.\n"
-"'Товыг Хүлээж байгаа' төлөв нь нэхэмжлэх батлагдсан боловч товлосон үйлдэл "
-"захиалгын огноо дээр ажиллахыг хүлээж байгаа төлөв юм."
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Тохирох үнийн жагсаалт олдсонгүй !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Түүх"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Хүргэлтийн нэхэмжлэх"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Энэ борлуулалтын захиалгаар үүсгэгдсэн нэхэмлэлийн жагсаалт. Ижил "
-"борлуулалтын захиалга нь хэд хэд дахиж нэхэмжлэгдсэн байж болно (жишээ нь "
-"мөр тус бүрээр)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Таны дугаар"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "Захиалга өгсөн хүний нэр, хаяг."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "Энэ бол захиалагчдаа амлахад нэмэгдэх нууц өдөрүүд юм."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Тоо хэмжээ"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Лавлагаа"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Миний Борлуулалтын Захиалгын Мөрүүд"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Цуцлах"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Захиалгын код компанид үл давхцах байх ёстой!"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Нэхэмжлэл үүсгэх"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Татваргүй нийлбэр"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Захиалгын код"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Таны нэхэмжлэл амжилттай үүслээ!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Борлуулалт Харилцагчаар"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Захиалгын хаяг"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Нэхэмжлэл нээх"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr "Автомат-имэйл борлуулалтын захиалгыг батласан"
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "Компанид журнал тодорхойлогдоогүй байна: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Хөдөлгөөн Төлөвлөлт"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Захиалга"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Хүргэгдсэн эсвэл захиалсан тоо хэмжээн дээр үндэслэнэ."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Бүх барааг нэгэн зэрэг хүргэх"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Холбогдох хүргэлт"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Нэр"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Хүргэх хаяг :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Сүүлийн 90 өдөрийн борлуулалт захиалагчаар"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Борлуулалтын захиалгын Ноорог төлөв"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Хүргэлтийн захиалга үүсгэх"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr "'%s' төлөвтэй борлуулалтын захиалгын мөрийг устгах боломжгүй!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "Тоо ширхэг(Б.Н)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Татвартай нийлбэр"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Хүргэлтийн баримт үүсгэх"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Борлуулалтын захиалгын захиалсан огноо"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Борлуулалт, барааны ангилалаар"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Үнийн саналыг батлах"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Алдаа"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Бүлэглэх..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Дахин нэхэмжлэл үүсгэх"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Нэхэмжлэх гэж буй хүргэлт"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Хуваарь хүлээж байна"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Нөхөн дүүргэх хэлбэр"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Хүргэлтийн баримт"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Ноороглох"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Гарах байрлал эсвэл захиалагч руу хөдөлгөөний баримт"
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-"\n"
-"Сайн байна уу${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Энэ таны захиалгын баталгаа ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"Дараах холбоосын захиалга харах, баталгаажуулах, төлбөр төлөх боломжтой:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"Мөн та шууд Paypal-р төлж болно:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"Танд асуулт байвал бидэнтэй холбогдоорой.\n"
-"\n"
-"\n"
-"${object.company_id.name}-ийг сонгосон танд баярлалаа!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Батлах"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Захиалга батлах"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Татан авалтын захиалга үүсгэх"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Татвар"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Нэхэмжлэхэд бэлэн Борлуулалтын Захиалга"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Борлуулалтын захиалга үүсгэгдсэн огноо."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Барааны хөдөлгөөн"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Нэхэмжлэл үүсгэх"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Энэ сард үүсгэгдсэн борлуулалтын захиалга"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Факс:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-"Хэрэв 'Захиалахад' байвал борлуулалтын захиалга батлагдахад татан авалт хийх "
-"даалгавар, худалдан авалтын захиалга, үйлдвэрлэлийн захиалгыг үүсгэдэг."
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Урьдчилгаа дүн"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "Хүргэлт төлбөртэй юу?"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Тээвэрлэсэн тоо"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Захиалга дээр үндэслэсэн нэхэмжлэл"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Энэ захиалгын үнийн жагсаалт (валют) -ыг өөрчилбөл одоо байгаа захиалгын "
-"мөрүүд шинэчлэгдэхгүй."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Агуулахын баримт"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Алдаа !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Борлуулалтын захиалгыг цуцлаж чадсангүй !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "Тоо ширхэг(Х.Н)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Борлуулалтын захиалгын захиалсан он"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "7 сар"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Татан авалт"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Хүргэлтийн саатал"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "Бэлтгэх Мэдээлэл ! : "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Нэхэмжлэлийг бүлэглэх"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "Нэхэмжлэх Зарчим"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "Нэхэмжлэх Аргыг Тохируулах"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Нягтлан бодогчоор хянагдана."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Х.Н-н код"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-"Энэ багаж нь захиалагчаас нэхэмжлэх аргатай холбогдох зөв модуль суулгаж "
-"тохируулахад туслана."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
@@ -1489,14 +1196,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Борлуулалт Захиалгын Мөр Нэхэмжлэх Үүсгэх"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Нэхэмжлэлийн сондгойрол"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Нөхөн дүүргэлт хийх болон нэхэмжлэх"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Ноорог"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1504,577 +1206,9 @@ msgid "Paid"
 msgstr "Төлсөн"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Борлуулалтын шинжилгээ"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
-"Та %d тооны нэгжийг сонгосон.\n"
-"Гэхдээ энэ нь сонгосон багцтай нийцтэй биш. \n"
-"Багцад санал болгох тоой ширхэг нь энд байна:\n"
-"EAN: %s Тоо ширхэг: %s Төрөл: %s"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Багцлалтыг Дахин Үүсгэх"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Шинж чанар"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Үнийн санал"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Хэрэв захиалга гүйцэтгэх арга нь 'Хүргэлтийн дараа нэхэмжлэлийг гараар "
-"үүсгэх' бол борлуулалтын ажилтан нэхэмжлэлийг гараар үүсгэнэ. Хэрэв захиалга "
-"гүйцэтгэх арга нь 'Хүргэлтийн өмнө төлбөр хийх' бол нэхэмжлэл нь автоматаар "
-"үүснэ."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Та нэхэмжлэлийг борлуулалтын захиалга эсвэл хүргэлт дээр үндэслэн үүсгэх "
-"боломжтой."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Батлагдсан боловч хараахан хүргэгдээгүй борлуулалтын мөр"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Захиалагчийн нэхэмжлэл"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Борлуулалт"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Нэгж үнэ"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Дууссан"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Нэхэмжлэл"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Борлуулалтын формд захиалагчийг сонгох ёстой ! \n"
-"Бараа сонгохынхоо өмнө захиалагчийг сонго."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Эх баримт"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Бэлтгэх"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Хүргэлтийн бодлого"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Захиалгачийн хөдөлгөөний баримт."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Татваргүй дүн."
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Борлуулалтын захиалгад холбогдох бэлтгэх баримтыг эхлээд бүгдийг цуцлах "
-"ёстой."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Борлуулалтын Урьдчилгаа Төлбөрийн Нэхэмжлэл"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Сар"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Захиалга (Код ${object.name or 'б/гүй' })"
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Бараа"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Эрх шилжүүлэхийг цуцлах"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Сарын эргэц"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Нэхэмжлэл нь"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Захиалсан огноо"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Хоёрдогч хэмжих нэгж"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Захиалгыг бэлтгэж байна"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Барааны хэмжих нэгж"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Логистик"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Захиалга"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "Энэ бараанд орлогын данс тодорхойлогдоогүй байна: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Онцгой тохиолдлыг үл хэрэгс"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Нэхэмжлэлийн хяналтаас шалтгаалан нэхэмжлэл нь хүргэгдсэн эсвэл захиалсан "
-"тоо ширхэг дээр үндэслэж болно. Тиймээс борлуулалтын ажилтан батлангуут "
-"хүргэх баримт эсвэл нэхэмжлэл үүсгэгдэнэ."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Та борлуулахаар төлөвлөж байгаа %.2f %s гэвч танд ердөө %.2f %s байна !\n"
-"Бодит байраа %.2f %s. (нөөцлөлт үгүйгээр)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Төлөв байдал"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Захиалагчийн дугаар"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Нийт"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Үнэ"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Гарах байрлалын тохиргооноос хамааран гарах байрлал, захиалагчийн байрлал "
-"руу шилжилх шилжилт нь  Хүргэх Захиалгаар автоматаар эсвэл гараар хийгддэг."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Хүргэхээ өмнө төлөх"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Борлуулалт хянах самбар"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Нэхэмжлэл үүсгэх"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Нэхэмжлэх"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Борлуулалтын захиалга батлагдсан огноо"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "Гэрээ/Шинжилгээний Данс"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Компани"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Нэхэмжлэх огноо"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Урьдчилгаа нэхэмжлэх дүн."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"Энэ бараа болон тоо ширхэгт тохирох үнийн жагсаалт олдсонгүй.\n"
-"Бараа, тоо ширхэг, үнийн жагсаалтын аль нэгийг өөрчлөх хэрэгтэй."
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "Энэ нь энэ борлуулалтын захиалгад үүссэн бэлтгэх жагсаалт."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Нэхэмжлэл үүсгэх"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Цэвэр дүн :"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Цуцалсан"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-"Миний борлуулалтын захиалгад холбогдсон борлуулалтын захиалгын мөрүүд"
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Дэлгүүр"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Батлах огноо"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Сануулга"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Борлуулалт Сараар"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Борлуулалтын захиалга"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Хоёрдогч тоо хэмжээ"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "'Дууссан' төлөвтэй Борлуулалтын Захиалгын Мөрүүд"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"Борлуулалтын захиалга батлагдмагц Бэлтгэх Жагсаалтын баримт үүсгэгдэхийн "
-"сацуу татан авалтын захиалга үүснэ. Энэ нь борлуулалтын захиалгын хэсэг "
-"болохыг илэрхийлнэ. Тэнд борлуулалтын захиалгын бэлтгэх 1 жагсаалт байх "
-"бөгөөд хэсгүүдийн байгаа эсэхтэй холбогддог."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Батлагдсан"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "Үндсэн Методийн Суурьлах нь"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Батлах"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Алдаа! Рекурсив компани үүсгэж болохгүй."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Сүүлийн 90 борлуулалт ангилалаар"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Нэхэмжлэлийн мөрүүд"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Захиалгын мөрүүд"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Хүргэлтийн урьтал хугацаа"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Тохиргоо"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI Үнийн жагсаалт (%s)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr "Захиалгыг Хэвлэх"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Энэ жил үүссэн борлуулалтын захиалга"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Дараах шалтгаануудаас энэ Борлуулалтын Захиалгын Мөр дээр нэхэмжлэл "
-"үүсэхгүй:\n"
-"1. Энэ борлуулалтын захиалгын мөр нь \"ноорог\" эсвэл \"цуцлагдсан\" "
-"төлөлтэй байна!\n"
-"2. Борлуулалтын Захиалгын Мөр нэхэмжлэгдсэн!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Борлуулалтын Захиалгын Мөрүүд Хийгдсэн."
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Жин"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Нэхэмжлэлүүд"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "12 сар"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Зураг"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Татан авах заиалга нь борлуулалтын захиалга батлагдмагц юмуу нэхэмлэл "
-"төлөгдмөгц үүснэ. Энэ нь худалдан авалт болон үйлдвэрлэлийг борлуулалтын "
-"захиалгын тохиргооны параметрээс шалтаалуулан эхлүүлнэ. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Нэхэмжлээгүй"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Борлуулагч"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Хуучин үнийн санал"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Татваргүй дүн"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Урьдчилгаа нэхэмжлэл"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "'%s' борлуулалтын захиалга цуцлагдсан."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Ноорог"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -2100,6 +1234,18 @@ msgstr ""
 "* 'Цуцлагдсан' төлөв нь холбогдох борлуулалтын захиалга Цуцлагдсан төлөвтэйг "
 "илэрхийлнэ."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Борлуулалтын захиалга"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Нэхэмжлэлийг бүлэглэх"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2107,58 +1253,171 @@ msgstr "Татварын дүн."
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Багцууд"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Борлуулалтын Захиалгын Мөрүүд нэхэмжлэхэд бэлэн"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Байдал"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Өнгөрсөн сард үүсгэгдсэн борлуулалтын захиалга"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Наймдугаар сар"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Нөхөн дүүргэлт хийх болон нэхэмжлэх"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Зургадугаар сар"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "Имэйл Үлгэрүүд"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Борлуулалтын захиалга"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Захиалга"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Үнийн жагсаалтын Сануулга!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Борлуулалтын Дэлгүүр"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Борлуулалтын захиалгын шинжилгээ"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Огноо"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Борлуулалтын Захиалгын Мөр"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Арван нэгдүгээр сар"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Өргөтгөсөн хайлт..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Урьдчилгаа"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Тооцоолох"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Алдаа"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "10 сар"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Хэрэв захиалга гүйцэтгэх арга нь 'Хүргэлтийн дараа нэхэмжлэлийг гараар "
+"үүсгэх' бол борлуулалтын ажилтан нэхэмжлэлийг гараар үүсгэнэ. Хэрэв захиалга "
+"гүйцэтгэх арга нь 'Хүргэлтийн өмнө төлбөр хийх' бол нэхэмжлэл нь автоматаар "
+"үүснэ."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Энэ борлуулалтын захиалгад холбогдсон бүх нэхэмжлэлийг эхлээд цуцлах "
-"шаардлагатай."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2170,96 +1429,331 @@ msgstr "1 сар"
 msgid "Sales Order in Progress"
 msgstr "Хийгдэж байгаа захиалга"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Борлуулалтын ажилтан үнийн саналыг батлана. Борлуулалтын захиалгын төлөв нь "
+"'Хийгдэж байна' эсвэл 'Гараар хийгдэж байна' төлөвтэй болдог."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr "Энэ борлуулалтын захиалгыг үүсгэсэн сурвалж баримт."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Тохирох үнийн жагсаалт олдсонгүй !"
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Баталгаажсан дундаж хугацаа"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "Хүргэлт болон Нэхэмлэлт шаардалтаар"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Батлагдсан боловч хараахан хүргэгдээгүй борлуулалтын мөр"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+#: view:sale.order:0
+msgid "History"
+msgstr "Түүх"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
-"Нэг татан авах захиалга нь борлуулалтын захиалгын мөр бүрээр болон нэгж "
-"бүрээр."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Хувиарлах"
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Энэ борлуулалтын захиалгаар үүсгэгдсэн нэхэмлэлийн жагсаалт. Ижил "
+"борлуулалтын захиалга нь хэд хэд дахиж нэхэмжлэгдсэн байж болно (жишээ нь "
+"мөр тус бүрээр)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Таны дугаар"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Захиалгын огноо"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Үнийн хүснэгт"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "НӨАТ :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Захиалагчийн нэхэмжлэл"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Нэхэмжлэх батлагдсан борлуулалтын захиалгууд."
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Хараахан батлагдаагүй Борлуулалтын Захиалга"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Захиалгын мөрүүд"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Борлуулалт"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "'%s' борлуулалтын захиалга ноорог төлөвтэй боллоо."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Энэ захиалгын үнийн жагсаалт (валют) -ыг өөрчилбөл одоо байгаа захиалгын "
+"мөрүүд шинэчлэгдэхгүй."
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Агуулахаас"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Өдөр"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Хаах"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Нэхэмжлэлүүд"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Нэгж үнэ"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Дууссан"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Нэхэмжлэх хаяг :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Нэхэмжлэл"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Миний Борлуулалтын Захиалгын Мөрүүд"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "Үнийн жагсаалт алга ! : "
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Хүргэгдсэн"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Үнийн санал"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Бараанд lot-г оноох ёстой."
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Нэхэмжлээгүй захиалга хайх"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
-"Танай барааг борлуулдаг нэгээс олон дэлгүүрүүд байгаа бол түүнийг эндээс "
-"үүсгэж менеж хийнэ. Хэзээд ямар нэг үнийн санал юмуу борлуулалтын захиалга "
-"үүсгэхэд заавал дэлгүүртэй холбогдсон байх ёстой. Дэлгүүр нь мөн агуулахыг "
-"тодорхойлох ёстой бөгөөд бараа борлуулах бүрт хаанаас болох нь холбогдох "
-"ёстой."
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Захиалгын код компанид үл давхцах байх ёстой!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Бэлтгэх"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Хүргэх хаяг :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr "Ижил харилцагчийн бүлэг борлуулалт ялгаатай валюттай байж болохгүй."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Борлуулалтын шинжилгээ"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Идэвхтэй борлуулалтын захиалгын Үнийн Жагсаалт."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Нэхэмжлэл үүсгэх"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Татваргүй дүн."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Захиалгын код"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2267,61 +1761,67 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Энэ нь нэхэмжлэл төлөгдсөн болохыг илэрхийлнэ."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr "Нэхэмжлэгдсэн борлуулалтын захиалгын мөрийг цуцлах боломжгүй!"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Бараа"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Тайлбар"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "5 сар"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Захиалагч"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Урьдчилгаа"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "2 сар"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "4 сар"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Данс бүртгэл"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Борлуулалтын захиалга хайх"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Борлуулалтын Захиалгын Шаардах"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
-msgstr "Бараа хүрэлцэхгүй байна ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Төлбөрийн нөхцөл"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Үнэ"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2339,31 +1839,373 @@ msgstr ""
 "боломжтой. Хэрэв эргэцийн шинжилгээ хийхийг хүсвэл Санхүүгийн хэсгийн "
 "нэхэмжлэл шинжилгээ тайланг ашиглаарай."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Утас:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Та үнэхээр нэхэмжлэл үүсгэхийг хүсч байна уу ?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Бусад мэдээлэл"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Тоо хэмжээ"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Нягтлан бодогчоор хянагдана."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Идэвхтэй борлуулалтын захиалгын хүргэх хаяг"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Үнийн санал / Захиалга"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Захиалагч"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Урьдчилгаа"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "2 сар"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Нэхэмжлэл нь"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Захиалсан огноо"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Хоёрдогч хэмжих нэгж"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Борлуулалтын захиалгын Ноорог төлөв"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Эх баримт"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "4 сар"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Захиалгыг бэлтгэж байна"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Миний борлуулалтын захиалга"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Борлуулалтын захиалга хайх"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Борлуулалтын захиалгын захиалагдсан сар"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Борлуулалтын формд үнийн жагсаалт эсвэл захиалагчийг сонгох ёстой ! \n"
+"Бараа сонгохын өмнө аль нэгийг нь сонго."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Борлуулалтын захиалгаас"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Онцгой тохиолдлыг үл хэрэгс"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Нэхэмжлэлийн хяналтаас шалтгаалан нэхэмжлэл нь хүргэгдсэн эсвэл захиалсан "
+"тоо ширхэг дээр үндэслэж болно. Тиймээс борлуулалтын ажилтан батлангуут "
+"хүргэх баримт эсвэл нэхэмжлэл үүсгэгдэнэ."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Борлуулалтын захиалгатай холбогдсон шинжилгээний данс."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Төлбөрийн нөхцөл"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Нэхэмжлэхэд бэлэн Борлуулалтын Захиалга"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Үнийн санал №"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Захиалагчийн дугаар"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Хүргэгдсэн"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Жил"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Татвартай нийлбэр"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Нэхэмжилсэн"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Борлуулалтын захиалгын захиалсан огноо"
+
+#~ msgid "Notes"
+#~ msgstr "Тэмдэглэл"
+
+#~ msgid "Extra Info"
+#~ msgstr "Нэмэлт мэдээлэл"
+
+#~ msgid "Warehouse"
+#~ msgstr "Агуулах"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Татваргүй дүн"
+
+#~ msgid "Procurement"
+#~ msgstr "Татан авалт"
+
+#~ msgid "Close"
+#~ msgstr "Хаах"
+
+#~ msgid "Salesman"
+#~ msgstr "Борлуулагч"
 
 #~ msgid "VAT"
 #~ msgstr "НӨАТ"
 
-#~ msgid "Sale Order"
-#~ msgstr "Борлуулах захиалга"
+#~ msgid "Name"
+#~ msgstr "Нэр"
 
 #~ msgid "Total amount"
 #~ msgstr "Нийт дүн"
@@ -2371,9 +2213,21 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "Payment Terms"
 #~ msgstr "Төлбөрийн нөхцөл"
 
+#~ msgid "Accounting"
+#~ msgstr "Данс бүртгэл"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Барааны хөдөлгөөн"
+
 #~ msgid "Recreate Procurement"
 #~ msgstr "Дахин нийлүүлэх"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Ноороглох"
+
+#~ msgid "Validate"
+#~ msgstr "Батлах"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Нэхэмжлэл бэлдэх"
 
@@ -2413,6 +2267,12 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "Packing"
 #~ msgstr "Савлагаа"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Захиалга батлах"
+
+#~ msgid "Configuration"
+#~ msgstr "Тохиргоо"
+
 #~ msgid "Related Packing"
 #~ msgstr "Холбоотой савлагаа"
 
@@ -2440,15 +2300,15 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "Sales Process"
 #~ msgstr "Борлуулах үйл явц"
 
+#~ msgid "on order"
+#~ msgstr "Захиалга"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "Засварласан нийлүүлэлт"
 
 #~ msgid "Sale Procurement"
 #~ msgstr "Борлуулалт нийлүүлэлт"
 
-#~ msgid "Status"
-#~ msgstr "Байдал"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Савлах бодлого"
 
@@ -2461,8 +2321,11 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "Sale Pricelists"
 #~ msgstr "Борлуулалтын үнийн хүснэгт"
 
-#~ msgid "Sequence"
-#~ msgstr "Дараалал"
+#~ msgid "Properties"
+#~ msgstr "Шинж чанар"
+
+#~ msgid "Compute"
+#~ msgstr "Тооцоолох"
 
 #~ msgid "Sales order"
 #~ msgstr "Борлуулалтын захиалга"
@@ -2479,6 +2342,9 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "Sale Order Line"
 #~ msgstr "Борлуулалтын захиалгын шугам"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Эрх шилжүүлэхийг цуцлах"
+
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Худалдан авалтын үнийн хүснэгт"
 
@@ -2506,12 +2372,24 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Борлуулалтын захиалга хүргэх алхам"
 
+#~ msgid "from stock"
+#~ msgstr "Агуулахаас"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Таны нэхэмжлэл амжилттай үүслээ !"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Захиалга дээр үндэслэсэн нэхэмжлэл"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Тээвэрлэсэн тоо"
+
 #~ msgid "Procurement is created after confirmation of sale order."
 #~ msgstr "Захиалга батлагдсаны дараа татан авалт үүснэ."
 
@@ -2557,6 +2435,9 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ "The name and address of the contact that requested the order or quotation."
 #~ msgstr "Захиалга өгсөн хүний нэр, хаяг."
 
+#~ msgid "Product UoM"
+#~ msgstr "Барааны хэмжих нэгж"
+
 #~ msgid "Automatic Declaration"
 #~ msgstr "Автомат мэдэгдэл"
 
@@ -2624,19 +2505,70 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "Make invoices"
 #~ msgstr "Нэхэмжлэл үүсгэх"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Анхаар !"
+
+#~ msgid "Dates"
+#~ msgstr "Огноо"
+
+#~ msgid "State"
+#~ msgstr "Төлөв"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Хэрэв захиалгыг нэг дор бүгдийг нь хүргэхэд таны барааны нөөц хүрэлцэхгүй "
+#~ "бол хэсэгчилсэн хүргэлтийг сонго"
+
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Хүргэлтээс өмнө төлбөр хийх"
 
 #~ msgid "All at Once"
 #~ msgstr "Бүтэн хүргэлт"
 
+#~ msgid "Procurement Order"
+#~ msgstr "Нөхөн дүүргэлтийн захиалга"
+
+#~ msgid "Order Line"
+#~ msgstr "Захиалгын мөр"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Борлуулалтын захиалгын түүврийн аргын тохиргоо"
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Нөөцийн хөдөлгөөн"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Хэрэв захиалга гүйцэлтгэх арга нь 'Хүргэлтээс нэхэмжлэл үүсэх' эсвэл "
+#~ "'Хүргэлтийн дараа захиалга дээр үндэслэн нэхэмжлэл үүсэх' бол нэхэмжлэл "
+#~ "автоматаар үүснэ."
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Борлуулалтын менежерийн хянах самбар"
+
 #, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Борлуулалтын захиалгыг цуцалж болохгүй !"
 
+#~ msgid "Packaging"
+#~ msgstr "Савалгаа"
+
+#~ msgid "Conditions"
+#~ msgstr "Нөхцөлүүд"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Бараа ангилалын заяамал орлогын данс эсвэл санхүүгийн орлуулалт "
+#~ "тодорхойлогдоогүй байна !"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr ""
 #~ "Танд үнийн санал дээр хүргэлтийн өртөгийг нэмж тооцоолох боломж олгоно."
@@ -2652,46 +2584,127 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ "Та захиалгын форм дээр үйлчлүүлэгчийг сонгох хэрэгтэй !\n"
 #~ "Бараа сонгохоос өмнө үйлчлүүлэгчийг сонгоно уу."
 
+#~ msgid "Number Packages"
+#~ msgstr "Савлагааны тоо"
+
 #, python-format
 #~ msgid "You cannot cancel a sale order line that has already been invoiced !"
 #~ msgstr "Та нэхэмжлэл үүсгэсэн борлуулалтын захиалгыг цуцлах боломжгүй !"
 
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "'Урьдчилгаа' нэртэй үйлчилгээ төрөлтэй бараа сонгоно. Та ийм бараа үүсгэж "
+#~ "энэ талбарын заяамал утгаар тохируулах хэрэгтэй."
+
 #, python-format
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Энэ захиалгыг цуцлах боломжгүй !"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Хүргэлтийн захиалга"
+
 #, python-format
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Батлагдсан төлөвтэй борлуулалтын захиалгыг устгах боломжгүй !"
 
+#~ msgid "Lines to Invoice"
+#~ msgstr "Нэхэмжлэх гэж буй захиалга"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr "Борлуулалтын захиалгын хуудас хэвлэлтэнд зарим боломжыг нэмэгдүүлнэ."
 
+#~ msgid "All Quotations"
+#~ msgstr "Бүх үнийн санал"
+
 #~ msgid "  Year  "
 #~ msgstr "  Жил  "
 
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Та үнэхээр нэхэмжлэл үүсгэхийг хүсч байна уу ?"
 
+#~ msgid "Sales By Month"
+#~ msgstr "Борлуулалт сараар"
+
+#~ msgid "Security Days"
+#~ msgstr "Аюулгүй өдөр"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Зарагдсан материалын нөхөн дүүргэлт"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Бүтэн нэхэмжлэл үүсгэх"
+
+#~ msgid "Companies"
+#~ msgstr "Компаниуд"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Захиалга өгсөн хүний нэр, хаяг."
+
+#~ msgid "References"
+#~ msgstr "Лавлагаа"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Борлуулалтын захиалгын огноо"
 
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Борлуулалтын захиалгын зөрүү"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Татваргүй нийлбэр"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Захиалгын хаяг"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Нэхэмжлэл нээх"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Борлуулалтын модулийн тохиргоо"
 
+#~ msgid "Force Assignation"
+#~ msgstr "Хөдөлгөөн Төлөвлөлт"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Хүргэгдсэн эсвэл захиалсан тоо хэмжээн дээр үндэслэнэ."
+
+#~ msgid "Related Picking"
+#~ msgstr "Холбогдох хүргэлт"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Хүргэлтийн захиалга үүсгэх"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Хүргэлтийн өртөг"
 
+#~ msgid "Create Pick List"
+#~ msgstr "Хүргэлтийн баримт үүсгэх"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Борлуулалт, барааны ангилалаар"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Хэсэгчилсэн хүргэлт"
 
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Нэхэмжлэх гэж буй хүргэлт"
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "тохирохгүй төлөв байна"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Нөхөн дүүргэх хэлбэр"
+
 #~ msgid "title"
 #~ msgstr "гарчиг"
 
+#~ msgid "Pick List"
+#~ msgstr "Хүргэлтийн баримт"
+
 #~ msgid "Order date"
 #~ msgstr "Захиалах огноо"
 
@@ -2701,9 +2714,25 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ "Энэ дэлгэц нь сонгосон нэхэмжлэлийн эх баримт бүхий агуулахын баримтын "
 #~ "жагсаалт юм"
 
+#~ msgid "Create Procurement Order"
+#~ msgstr "Татан авалтын захиалга үүсгэх"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Захиалга гүйцэтгэх арга"
 
+#~ msgid "Stock Move"
+#~ msgstr "Барааны хөдөлгөөн"
+
+#~ msgid "Picking List"
+#~ msgstr "Агуулахын баримт"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Алдаа !"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Хүргэлтийн саатал"
+
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Хүргэлтийн дараа нэхэмжлэлийг гараар үүсгэх"
 
@@ -2711,18 +2740,39 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "Picking Information !"
 #~ msgstr "Түүврийн мэдээлэл !"
 
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Та нэхэмжлэлийг борлуулалтын захиалга эсвэл хүргэлт дээр үндэслэн үүсгэх "
+#~ "боломжтой."
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Түүврийн жагсаалт ба Хүргэлтийн захиалга"
 
+#~ msgid "Picking Policy"
+#~ msgstr "Хүргэлтийн бодлого"
+
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Захиалга гүйцэтгэх үндсэн арга"
 
+#~ msgid "Incoterm"
+#~ msgstr "Худалдааны нөхцөл"
+
 #~ msgid "Invoicing"
 #~ msgstr "Нэхэмжлэл"
 
+#~ msgid "Logistic"
+#~ msgstr "Логистик"
+
+#~ msgid "States"
+#~ msgstr "Төлөв байдал"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr "Та эхлээд уг захиалгатай холбоотой нэхэмжлэлүүдийг цуцлах хэрэгтэй."
@@ -2730,6 +2780,13 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "   Month   "
 #~ msgstr "   Сар   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Сануулга"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Хүргэлтийн урьтал хугацаа"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Хүргэлтийн дараа захиалга дээр үндэслэн нэхэмжлэх"
 
@@ -2748,6 +2805,9 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ "хүргэлтийг хүлээлгэх, эсвэл хүлээлгүйгээр байгаа нөөцийг хүргэх зэргийг "
 #~ "тохируулна."
 
+#~ msgid "Image"
+#~ msgstr "Зураг"
+
 #~ msgid ""
 #~ "This is the list of invoices that have been generated for this sale order. "
 #~ "The same sale order may have been invoiced in several times (by line for "
@@ -2771,6 +2831,19 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 #~ msgid "Shipped Qty"
 #~ msgstr "Хүргэгдсэн тоо"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Таны нэхэмжлэл амжилттай үүслээ!"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Алдаа"
+
+#~ msgid "Assign"
+#~ msgstr "Хувиарлах"
+
+#~ msgid "Delivered"
+#~ msgstr "Хүргэгдсэн"
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Агуулах хангалтгүй !"
@@ -2783,3 +2856,589 @@ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
 
 #~ msgid "Picking Default Policy"
 #~ msgstr "Түүврийн үндсэн арга"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Хүргэлт дээр үндэслэн нэхэмжлэх"
+
+#~ msgid "UoM"
+#~ msgstr "Х.н"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Тоо хэмжээ (х.н)"
+
+#~ msgid "Print Quotation"
+#~ msgstr "Үнийн санлалыг хэвлэх"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Сүүлийн 90 хоногийн Борлуулалт Борлуулалтын Ажилтнаар"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Цагийн хуваарь дээр суурилсан"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Борлуулалтын захиалгын мөр бүрийн татан авалтын захиалгыг удирдана"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "'%s' Үнийн санал борлуулалтын захиалга бол хөрвүүлэгдлээ."
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Хүргэлт дээр үндэслэж нэхэмжлэх"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Тохиргооны алдаа !"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Даалгаврын Ажил дээр суурилсан"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Энд нэхэмжлэх ёстой борлуулалтын захиалгын бүх мөр байна. Борлуулалтын "
+#~ "захиалгыг мөрөөр ялган хэсэгчилж нэхэмжлэх боломжтой. Хэрэв хүргэлтээс "
+#~ "захиалах юмуу борлуулалтын захиалгыг бүхэлд нь нэхэмжлэхээр бол энэ хэрэггүй."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Борлуулалтын захиалга нь захиалагчийн үнийн санал болох захиалгыг менеж "
+#~ "хийхэд хэрэглэгддэг. OpenERP- нь үнийн санал үүсгэхээр борлуулалтыг эхлэхийг "
+#~ "зөвлөдөг. OpenERP нь барааны олон төрлийг боловсруулдаг бөгөөд борлуулалтын "
+#~ "захиалга нь даалгавар, хүргэх баримт, үйлдвэрлэлийн захиалга, худалдан авалт "
+#~ "зэрэгийг үүсгэх боломжтой. Борлуулалтын захиалгын тохиргоо дээр үндэслэн "
+#~ "ноорог нэхэмжлэх үүсгэгдэх бөгөөд захиалагчид тооцоо илгээхийн тулд "
+#~ "нэхэмжлэхийг ердөө батлахад хангалттай."
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Үндсэн ажлын цагийн нэгж"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Хүргэлтийн Баримт дээр Суурилсан"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Борлуулалт Борлуулалтын Ажилтнаар"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Батлагдсан борлуулалтын захиалгыг устгахын тулд эхлээд цуцлах хэрэгтэй ! "
+#~ "Борлуулалтын захиалгыг цуцлахын тулд эхлээд холбогдох бэлтгэх баримт болон "
+#~ "хүргэлтийн баримтуудыг цуцлах ёстой."
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Нэхэмжлэх зарчим нь нэхэмжлэх, хүргэлтийг тулгахад хэрэглэгддэг. \n"
+#~ "\n"
+#~ "  - 'Хүргэлтээс өмнө төлөх' сонголт нь эхлээд нэхэмжлэхийг үүсгэдэг. Тэгээд "
+#~ "нэхэмжлэх төлөгдсөн дараа бэлтгэх баримтыг үүсгэдэгэ.\n"
+#~ "  - 'Хүргэлт ба Нэхэмжлэх шаардалтаар' нь шууд бэлтгэх баримтыг үүсгээд "
+#~ "'Нэхэмжлэх' даруулыг дартал хүлээдэг. Ноорог нэхэмжлэх борлуулалтын захиалга "
+#~ "дээр эсвэл борлуулалтын захиалгын мөрүүд дээр үндэслэн үүсдэг. \n"
+#~ "  - 'Хүргэлтийн дараа нэхэмжлэх' сонголтын хувьд бэлтгэсэн дараа нэхэмжлэх "
+#~ "үүсдэг. \n"
+#~ "  - 'Хүргэлт үндэслэн нэхэмжлэх' сонголтын хувьд бэлтгэх явцад нэхэмжлэх "
+#~ "үүсдэг."
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Код компаний хувьд үл давхцах байх ёстой!"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Борлуулалтын захиалгын энэ мөртэй холбогдсон барааны хөдөлгөөнийг эхлээд "
+#~ "цуцлах хэрэгтэй."
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr "Захиалагчид барааг хүргэх баталгаажуулалтын хоорондын өдөрийн тоо"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Энэ борлуулалтын захиалга цуцлах боломжгүй !"
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "Компаний нэр үл давхцах байх ёстой !"
+
+#~ msgid "Month-1"
+#~ msgstr "Сар-1"
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "'Хүргэлтийн дараа автомат нэхэмжлэх' гэж тодорхойлогдсон борлуулалтын "
+#~ "захиалгын хувьд урьдчилгаа үүсгэх боломжгүй."
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(б/гүй)"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Бараа байвал бүх барааг хүргэх"
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr "Харагдац төрөлтэй байрлалаас/байрлалруу шилжүүлж болохгүй."
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Борлуулалтын захиалга дээр суурилсан"
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Борлуулалтын Нээлттэй Нэхэмжлэх"
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Борлуулалтын захиалгын мөр бүрт татан авалтын захиалга зарагдсан барааг "
+#~ "татахаар үүсгэгдэнэ."
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm нь 'International Commercial terms'-н товчлол. 'Олон Худалдааны "
+#~ "Нөхцөл' нь худалдааны гүйлгээнд хэрэглэгддэг борлуулалтын нөхцөл юм."
+
+#~ msgid "Line Sequence"
+#~ msgstr "Мөрийн Дараалал"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Бусад"
+
+#~ msgid "Options"
+#~ msgstr "Сонголт"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Хүргэлтийн нэхэмжлэх"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "Үнийн санал эсвэл борлуулалтын захиалгын төлөвийг өгнө.\n"
+#~ "Онцгой төлөв нь нэхэмжлэх шалгахад (Онцлог Нэхэмжлэх) тохиолдоход үүснэ. "
+#~ "Эсвэл бэлтгэхэд (Онцлог Хүргэлт) тохиолдоход үүснэ.\n"
+#~ "'Товыг Хүлээж байгаа' төлөв нь нэхэмжлэх батлагдсан боловч товлосон үйлдэл "
+#~ "захиалгын огноо дээр ажиллахыг хүлээж байгаа төлөв юм."
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Борлуулалтын захиалгын мөрийг цуцлаж чадсангүй!"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Энэ нь борлуулалтын захиалга хүргэгдсэнийг илэрхийлнэ. Энэ талбар нь "
+#~ "товлосон үйлдэл ажилласан дараа л шинэчлэгддэг."
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Бүх барааг нэгэн зэрэг хүргэх"
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Автомат-имэйл борлуулалтын захиалгыг батласан"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr "Компанид журнал тодорхойлогдоогүй байна: \"%s\" (id:%d)"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Борлуулалт Харилцагчаар"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Тоо ширхэг(Б.Н)"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Сүүлийн 90 өдөрийн борлуулалт захиалагчаар"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr "'%s' төлөвтэй борлуулалтын захиалгын мөрийг устгах боломжгүй!"
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Гарах байрлал эсвэл захиалагч руу хөдөлгөөний баримт"
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Хүргэлт төлбөртэй юу?"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Энэ сард үүсгэгдсэн борлуулалтын захиалга"
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "Хэрэв 'Захиалахад' байвал борлуулалтын захиалга батлагдахад татан авалт хийх "
+#~ "даалгавар, худалдан авалтын захиалга, үйлдвэрлэлийн захиалгыг үүсгэдэг."
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+#~ msgstr ""
+#~ "\n"
+#~ "Сайн байна уу${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Энэ таны захиалгын баталгаа ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "Дараах холбоосын захиалга харах, баталгаажуулах, төлбөр төлөх боломжтой:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "Мөн та шууд Paypal-р төлж болно:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "Танд асуулт байвал бидэнтэй холбогдоорой.\n"
+#~ "\n"
+#~ "\n"
+#~ "${object.company_id.name}-ийг сонгосон танд баярлалаа!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Тоо ширхэг(Х.Н)"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Борлуулалтын захиалгыг цуцлаж чадсангүй !"
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Та %d тооны нэгжийг сонгосон.\n"
+#~ "Гэхдээ энэ нь сонгосон багцтай нийцтэй биш. \n"
+#~ "Багцад санал болгох тоой ширхэг нь энд байна:\n"
+#~ "EAN: %s Тоо ширхэг: %s Төрөл: %s"
+
+#~ msgid "Reference UoM"
+#~ msgstr "Х.Н-н код"
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Нэхэмжлэх Аргыг Тохируулах"
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Нэхэмжлэх Зарчим"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "Бэлтгэх Мэдээлэл ! : "
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Багцлалтыг Дахин Үүсгэх"
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr ""
+#~ "Энэ багаж нь захиалагчаас нэхэмжлэх аргатай холбогдох зөв модуль суулгаж "
+#~ "тохируулахад туслана."
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Борлуулалтын формд захиалагчийг сонгох ёстой ! \n"
+#~ "Бараа сонгохынхоо өмнө захиалагчийг сонго."
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Борлуулалтын захиалгад холбогдох бэлтгэх баримтыг эхлээд бүгдийг цуцлах "
+#~ "ёстой."
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr "Энэ бараанд орлогын данс тодорхойлогдоогүй байна: \"%s\" (id:%d)"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Хүргэхээ өмнө төлөх"
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "Энэ нь энэ борлуулалтын захиалгад үүссэн бэлтгэх жагсаалт."
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Гарах байрлалын тохиргооноос хамааран гарах байрлал, захиалагчийн байрлал "
+#~ "руу шилжилх шилжилт нь  Хүргэх Захиалгаар автоматаар эсвэл гараар хийгддэг."
+
+#~ msgid "Sales by Month"
+#~ msgstr "Борлуулалт Сараар"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Та борлуулахаар төлөвлөж байгаа %.2f %s гэвч танд ердөө %.2f %s байна !\n"
+#~ "Бодит байраа %.2f %s. (нөөцлөлт үгүйгээр)"
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Сүүлийн 90 борлуулалт ангилалаар"
+
+#~ msgid "Print Order"
+#~ msgstr "Захиалгыг Хэвлэх"
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "Борлуулалтын захиалга батлагдмагц Бэлтгэх Жагсаалтын баримт үүсгэгдэхийн "
+#~ "сацуу татан авалтын захиалга үүснэ. Энэ нь борлуулалтын захиалгын хэсэг "
+#~ "болохыг илэрхийлнэ. Тэнд борлуулалтын захиалгын бэлтгэх 1 жагсаалт байх "
+#~ "бөгөөд хэсгүүдийн байгаа эсэхтэй холбогддог."
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Үндсэн Методийн Суурьлах нь"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Энэ жил үүссэн борлуулалтын захиалга"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Алдаа! Рекурсив компани үүсгэж болохгүй."
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Энэ борлуулалтын захиалгад холбогдсон бүх нэхэмжлэлийг эхлээд цуцлах "
+#~ "шаардлагатай."
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "'%s' борлуулалтын захиалга цуцлагдсан."
+
+#~ msgid "Packings"
+#~ msgstr "Багцууд"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Татан авах заиалга нь борлуулалтын захиалга батлагдмагц юмуу нэхэмлэл "
+#~ "төлөгдмөгц үүснэ. Энэ нь худалдан авалт болон үйлдвэрлэлийг борлуулалтын "
+#~ "захиалгын тохиргооны параметрээс шалтаалуулан эхлүүлнэ. "
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Өнгөрсөн сард үүсгэгдсэн борлуулалтын захиалга"
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Танай барааг борлуулдаг нэгээс олон дэлгүүрүүд байгаа бол түүнийг эндээс "
+#~ "үүсгэж менеж хийнэ. Хэзээд ямар нэг үнийн санал юмуу борлуулалтын захиалга "
+#~ "үүсгэхэд заавал дэлгүүртэй холбогдсон байх ёстой. Дэлгүүр нь мөн агуулахыг "
+#~ "тодорхойлох ёстой бөгөөд бараа борлуулах бүрт хаанаас болох нь холбогдох "
+#~ "ёстой."
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Нэг татан авах захиалга нь борлуулалтын захиалгын мөр бүрээр болон нэгж "
+#~ "бүрээр."
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Бараанд lot-г оноох ёстой."
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "'%s' борлуулалтын захиалга ноорог төлөвтэй боллоо."
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Хүргэлт болон Нэхэмлэлт шаардалтаар"
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "Бараа хүрэлцэхгүй байна ! : "
+
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Борлуулалтын Захиалгын Шаардах"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "Энэ бараа болон тоо ширхэгт тохирох үнийн жагсаалт олдсонгүй.\n"
+#~ "Бараа, тоо ширхэг, үнийн жагсаалтын аль нэгийг өөрчлөх хэрэгтэй."
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Ижил биш барааны цувралыг олгох гэж байна"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Захиалгачийн хөдөлгөөний баримт."
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr "Энэ бол захиалагчдаа амлахад нэмэгдэх нууц өдөрүүд юм."
diff --git a/addons/sale/i18n/nb.po b/addons/sale/i18n/nb.po
index ccd13a352f1..7b48addbb27 100644
--- a/addons/sale/i18n/nb.po
+++ b/addons/sale/i18n/nb.po
@@ -7,20 +7,168 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 18:23+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Basert på timeliste"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Forskuddsfaktura"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Bekreft tilbudet"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Salgskonsoll"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Bekreftet dato"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Grupper etter..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -32,62 +180,345 @@ msgstr ""
 "fakturert"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Salg pr. selger de siste 90 dager"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Delpartner"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Ordrestatus"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Dersom du ikke har nok på lager til å levere alt på en gang, kan du "
-"akseptere delleveringer eller ikke?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "Salgsenhet"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Å fakturere"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Leveringsadresse for aktuell salgsordre."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Antall"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Dato hvor salgsordre er bekreftet."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Dag"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Tilbud"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Kontrakt/analytisk konto"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fakturadato"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Ufakturerte og leverte linjer"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Beløp som skal forhåndsfaktureres."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Fakturaavvik"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Totalbeløp."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analytisk konto"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Kanseller ordre"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Tilbudet '%s' har blitt konvertert til en salgsordre."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Vekt"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Skriv ut tilbud"
+msgid "Quotation "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Advarsel !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Salgsordre"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Avgifter"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Ikke avgiftsberegnet beløp"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Netto total:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Kansellert"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Salgsordrelinjer knyttet til en av mine salgsordre"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Butikk"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Salgsordre med avvik"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Fakturaadresse"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Dato for når salgsordre blir opprettet"
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Gjenskap faktura"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Lag faktura"
 
 #. module: sale
 #: report:sale.order:0
@@ -95,78 +526,644 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Danner inkjøpsordre for hver salgsordrelinje."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analytisk konto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Her er en liste over salgsordrelinjer som skal faktureres. Du kan "
-"delfakturere salgsordre ved å fakturere enkeltlinjer. Du trenger ikke denne "
-"listen dersom du fakturerer på grunnlag av utleveringer eller hvis du "
-"fakturerer salgsordre samlet."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
-"For å slette en bekreftet salgsordre må du kansellere den først. For å "
-"kansellere en salgsordre må du først kansellere tilhørende plukk eller "
-"utleveringer."
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Innkjøpsordre"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Dato bekreftet"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# linjer"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Mengde"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Salgsordre"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Kvantum (salgsenhet)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Salgsordrelinjer som er i utført status"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Forskuddsbeløp"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Bekreftet"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Default betalingsbetingelse"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Bekreft"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Leveringsadresse"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Salgsordrelinjer klare for fakturering"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Månedlig omsetning"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Salgsordre som ennå ikke er bekreftet"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Ordrenr."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Ordrelinjer"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Rabatt(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Ordrereferanse"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Fakturalinjer"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Totalpris"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Gamle tilbud"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marker for å gruppere fakturaer for samme kunde"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Lag fakturaer"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Time"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Opprettet dato"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Avventer planlegging"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Fakturaadresse for gjeldende salgsordre."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Bestilt kvantum"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Ordreår for salgsordren"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Antall"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total:"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mine salg"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Ugyldig handling!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Skattemessig posisjon"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "Salgsenhet"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "EDI prisliste (%s)"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Tilbudsdato"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Ordredato"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Tilbud og salg"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Faktura basert på leveringer"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Ordrelinje"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
-"Salgsordre hjelper deg med å håndtere forespørsler og bestillinger fra dine "
-"kunder. OpenERP foreslår at du starter med å lage et tilbud. Når dette blir "
-"bekreftet vil det bli konvertert til en salgsordre. OpenERP kan håndtere "
-"ulike typer produkter slik at en salgsordre kan initere arbeidsoppgaver, "
-"utleveringer, produksjonsordre, bestillinger osv. Ut fra salgsordren vil det "
-"bli dannet et utkast til en faktura som du bare bekrefter når du ønsker å "
-"fakturere kunden."
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Salg oppretter faktura"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Rabatt (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Faktura for denne salgsordrelinjen kan ikke dannes da ordrelinjen enten "
+"allerede er fakturert eller har status \"Utkast\" eller \"Kansellert\"."
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Salgsordrelinjer ferdig"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mine tilbud"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Desember"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Sendt"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Måned"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "Du kan ikke bekrefte en salgsordre uten linjer."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Ikke fakturert"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Produktkategori"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Butikknavn"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Avgifter:"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Forskuddsfaktura"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "I arbeid"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Ingen kunde definert!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Lag faktura"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -184,1238 +1181,20 @@ msgstr ""
 "aktuelle oppgaven."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Default betalingsbetingelse"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Basert på utleveringer"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "Normal arbeidstidsenhet"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Status"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Rabatt(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Totalpris"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Marker for å gruppere fakturaer for samme kunde"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mine salgsordre"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Bestilt kvantum"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Salg pr. selger"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Lagerbevegelser"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Ordrereferanse"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Annen informasjon"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Datoer"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
 msgstr ""
-"Fakturaen blir dannet automatisk dersom grunnregelen er 'Fakturering etter "
-"plukk' eller 'Fakturering av ordre etter utlevering'."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "Basert på utført arbeid på oppgaver"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Tilbud og salg"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Salg oppretter faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Prisliste-advarsel!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Rabatt (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mine tilbud"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Salgsledelses-dashbord"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Forpakning"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Fra en salgsordre"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Butikknavn"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Prinsipp for fakturering benyttes for å samholde fakturering og "
-"utleveringer.\n"
-" - 'Betal før utlevering' vil først danne faktura, og siden danne plukkordre "
-"når fakturaen er betalt.\n"
-" - 'Utlever og fakturer på forespørsel' vil danne plukkordre ved godkjenning "
-"av salgsordre, og vente til brukeren klikker på knappen 'Fakturere' før det "
-"dannes utkast til faktura bsert på salgsordre / salgsordrelinjer.\n"
-" - 'Fakturer ordre etter utlevering' vil danne utkast til faktura basert på "
-"salgsordre når alle plukklister er avsluttet.\n"
-" - 'Fakturer basert på utleveringer' vil danne utkast til faktura basert på "
-"det som plukkes og utleveres."
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Ingen kunde definert!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Salgsordre med avvik"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "Konfigurasjonsfeil!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Vilkår"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Det er ikke definert noen inntektskonto-kategori  i standard egenskaper for "
-"produkt eller skattemessig behandling er ikke definert!"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Du forsøker å angi en lot som ikke tilhører samme produkt"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "Ugyldig form for test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juni"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Kunne ikke kansellere denne salgsordren!"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Salgsordrestatistikk"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Analytiske konto relatert til en salgsordre."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "Referanse må være unik pr firma!"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Tilbud"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Prisliste for aktuell salgsordre."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "MVA:"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Antall dager mellom ordrebekreftelse og forsendelse av produktene til kunden"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Tilbudsdato"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Skattemessig posisjon"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "Enhet"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Antall pakker"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "I arbeid"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Selgeren bekrefter tilbudet. Status for salgsordren blir 'I arbeid' eller 'I "
-"manuelt arbeid'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr "Du kan ikke kansellere en salgsordrelinje som allerede er fakturert!"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Du må først slette lagerbevegelser knyttet til denne salsgordrelinjen."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notater"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Firmanavn må være unikt !"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Fakturaadresse for gjeldende salgsordre."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Forrige måned"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Ordremåned for salgsordren"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Du kan ikke gruppere salg som har forskjellig valuta for samme partner."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Lever hvert produkt produkt når tilgjengelig"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fakturert"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Leveringsordre"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Bekreftet dato"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Delpartner"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Mars"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr "Kan ikke flytte produkter til eller fra en lokasjon av typen view."
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Basert på salgsordre"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Totalbeløp."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Fakturaadresse:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "Linjesekvens"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"For hver salgsordrelinje dannes en bestilling for å anskaffe det solgte "
-"produktet."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm, som står for 'International Commercial terms', er en rekke "
-"salgstermer som benyttes i komersielle transaksjoner."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Fakturaadresse"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Søk ikkefakturerte linjer"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Tilbud / ordre"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# linjer"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Salg åpen faktura"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Salgsordrelinje"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Lager"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Ordrenr."
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Ordrelinjer"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Ikke avgiftsbelagt beløp"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Ordrelinjer å fakturere"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Mengde (enhet)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Opprettet dato"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Diverse"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Ufakturerte og leverte linjer"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Mine salg"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Ugyldig handling!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Ekstrainformasjon"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Prisliste"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Mengde"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "Time"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Ordredato"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Sendt"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Alle tilbud"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "Alternativer"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Du kan ikke bekrefte en salgsordre uten linjer."
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Du må velge en prisliste eller en kunde i salgsbildet!\n"
-"Vennligst gjør dette før du velger produkt."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Produktkategori"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Avgifter:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Lagerbevegelser"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Ordrestatus"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Vil du virkerlig opprette faktura(ene) ?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Salg pr.  måned"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Kunne ikke kansellere salgsordrelinje!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Sikkerhetsdager"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Anskaffelse av solgt produkt"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Opprett endelig faktura"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Leveringsadresse"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Dato"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Utvidede filter..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Avvik"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Firmaer"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Inegn gyldig prisliste funnet!:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Forløp"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Fakturer ordre etter levering"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Dette er listen av faktuaer som har blitt laget for denne salgsordren. Den "
-"samme ordren kan ha blitt fakturert flere ganger (linje for linje eks.vis)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Deres referanse"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "Navn og adresse på kontakten som ba om ordre eller tilbud"
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Dette er antall dager som for sikkerhet legges til det som er lovet kunde"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Mengde"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referanse"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Mine salgsordrelinjer"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Kanseller"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Ordrereferanse må være unik pr. firma!"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Lag faktura"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Totalt eksl. avgift"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Ordrereferanse"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Din faktura er blitt opprettet!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Salg pr. partner"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Ordrekontakt"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Åpne faktura"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Det er ikke definert noen salgsjournal for dette firmaet: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Tvangsfordeling"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "i ordre"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Basert på sendt eller bestilt kvantum."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Utlever alle produkter på en gang"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Tilhørende plukking"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Navn"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Leveringsadresse:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Salg pr. kunde de siste 90 dager"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Utkast status  for salgordre"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Opprett leveringsordre"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr "Kan ikke slette salgsordrelinjer med status '%s'!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "Mengde (salgsenhet)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Totalt inkl. avg."
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Opprett plukkliste"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Ordredato for salgsordren"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Salg pr. produktkategori"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Bekreft tilbudet"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Feil"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Grupper etter..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Gjenskap faktura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Leveringer klare til fakturering"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Avventer planlegging"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Innkjøpsmetode"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Plukkliste"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Sett til forslag"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Valider"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Bekreft ordre"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Opprett innkjøpsordre"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Avgifter"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Salgsordre klare til fakturering"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Dato for når salgsordre blir opprettet"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Lagerbevegelse"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Lag faktura"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Salgsordre laget i inneværende måned"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-"Hvis 'Produsere på bestilling' initieres en anskaffelse når salgsordren "
-"bekreftes, slik at det opprettes en oppgave, bestilling eller "
-"produksjonsordre koblet til denne salgsordrelinjen."
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Forskuddsbeløp"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "Faktureres utleveringene?"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Levert kvantum"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Faktura basert på salgsordre"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Hvis du endrer prisliste for denne ordren (og evt. valutaen) vil prisene på "
-"eksisterende ordrelinjer ikke bli oppdatert."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Plukkliste"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Feil!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Kunne ikke kansellere salgsordre!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "Mengde (enhet)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Ordreår for salgsordren"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Innkjøp"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Forsendelsesavvik"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "Plukking informasjon "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Gruppering av fakturaer"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "Faktureringsregler"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "Sett opp faktureringsmetode"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "For gjennomgang av regnskap."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referanseenhet"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-"Dette verktøyet vil hjelpe deg å installere riktig modul og konfigurere "
-"systemet i henhold til hvordan du fakturerer kundene."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
-msgstr ""
+msgstr "Sale OrderLine Make_invoice"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Fakturaavvik"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Styrer anskaffelse og fakturering"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Utkast"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1423,563 +1202,9 @@ msgid "Paid"
 msgstr "Betalt"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Salgsanalyse"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
-"Du valgte en mengde på %d enheter.\n"
-"Dette passer ikke overens med valgt forpakning.\n"
-"Foreslår følgende mengde i henhold til forpakning:\n"
-"EAN: %s Mengde: %s Forpakningstype: %s"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Egenskaper"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Tilbud"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Selger oppretter faktura manuelt dersom faktureringsregel er 'Manuell "
-"utlevering og fakturering'. Faktura dannes automatisk dersom "
-"faktureringsregel er 'Forskuddsbetaling'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr "Du kan lage fakturaer basert enten på salgsordre eller leveranser."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Bekreftede salgsordrelinjer, ennå ikke levert"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Kundefaktura"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Salg"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Enhetspris"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Fullført"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Du må velge en kunde i salgsbildet!\n"
-"Vennligst velg kunde før du velger produkt."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Kildedokument"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Gjøremål"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Regler for plukking"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Beløp uten avgift"
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Du må først kansellere alle plukkinger knyttet til denne salgsordren."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Forskuddsfaktura"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Måned"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Kanseller avtale"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Månedlig omsetning"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Faktura på"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Ordredato"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Produkt salgsenhet"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuell i arbeid"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Produktenhet"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistisk"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Ordre"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"Det er ikke definert noen inntektskonto for dette produktet: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorer avvik"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Avhengig av faktureringsregelen på salgsordren kan faktura baseres på "
-"bestilt eller levert mengde. Slik kan en salgsordre danne faktura eller "
-"plikkordre når den bekreftes av selger."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Du planlegger å selge %.2f %s men du har bare %.2f %s tilgjengelig!\n"
-"Virkelig lagerbeholdning er %.2f %s (uten reservasjoner)."
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Bekrefter"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Kundereferanse"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Pris"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Avhengig av oppsettet av utgående lokasjon vil varebevegelsen fra utgående "
-"logistikk til kunde gjort gjennom en leveringsordre eller automatisk."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Forskuddsbetaling"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Salgskonsoll"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Lag fakturaer"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Å fakturere"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Dato hvor salgsordre er bekreftet."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "Kontrakt/analytisk konto"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Firma"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fakturadato"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Beløp som skal forhåndsfaktureres."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"Kan ikke finne en oppføring i prisliste som stemmer med produkt og mengde.\n"
-"Du må endre enten produkt, prisliste eller mengde."
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "Dette er plukklisten som har blitt laget for denne salgsordren."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Lag faktura"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Netto total:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Kansellert"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Salgsordrelinjer knyttet til en av mine salgsordre"
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Butikk"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Dato bekreftet"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Varsel"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Salg pr. måned"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Salgsordre"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Kvantum (salgsenhet)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Salgsordrelinjer som er i utført status"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Bekreftet"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "Hovedregel basert på"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Bekreft"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Feil ! Du kan ikke lage rekursive firmaer."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Salg pr. produktgruppe siste 90 dager"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Fakturalinjer"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Salgsordrelinjer"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Leveringstid"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Konfigurasjon"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI prisliste (%s)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr "Utskrift av ordre"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Salgsordre laget i inneværende år"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Faktura for denne salgsordrelinjen kan ikke dannes da ordrelinjen enten "
-"allerede er fakturert eller har status \"Utkast\" eller \"Kansellert\"."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Vekt"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Fakturaer"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Desember"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Bilde"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Ikke fakturert"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Selger"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Gamle tilbud"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Ikke avgiftsberegnet beløp"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Forskuddsfaktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "Salgsordren '%s' har blitt kansellert."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Utkast"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -2000,6 +1225,18 @@ msgstr ""
 "* Status 'Utført' settes når salgsordrelinjen er plukket.\n"
 "* Status 'Kansellert' settes når tilhørende salgsordre blir kansellert."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Salgsordre"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Gruppering av fakturaer"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2007,57 +1244,170 @@ msgstr "MVA beløp."
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Salgsordrelinjer klare for fakturering"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Salgsordre laget forrige måned"
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Styrer anskaffelse og fakturering"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juni"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "E-post maler"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Salgsordre"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Ordre"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Prisliste-advarsel!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Butikk"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Salgsordrestatistikk"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Dato"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Salgsordrelinje"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "November"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Utvidede filter..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
+msgstr "Forhåndsfakturert produkt"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Avvik"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Selger oppretter faktura manuelt dersom faktureringsregel er 'Manuell "
+"utlevering og fakturering'. Faktura dannes automatisk dersom "
+"faktureringsregel er 'Forskuddsbetaling'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Beregn"
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Du må først slette alle fakturaene som er koblet til denne salgsordren."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2069,107 +1419,490 @@ msgstr "Januar"
 msgid "Sales Order in Progress"
 msgstr "Salgsordre i arbeid"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Selgeren bekrefter tilbudet. Status for salgsordren blir 'I arbeid' eller 'I "
+"manuelt arbeid'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
+"Referanse til dokumentet som genererte denne salgsordreforespørselen."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Inegn gyldig prisliste funnet!:"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: help:sale.config.settings,module_warning:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Angi"
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Bekreftelsesforsinkelse"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Bekreftede salgsordrelinjer, ennå ikke levert"
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr "Forløp"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Dette er listen av faktuaer som har blitt laget for denne salgsordren. Den "
+"samme ordren kan ha blitt fakturert flere ganger (linje for linje eks.vis)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Deres referanse"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Ordredato"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prisliste"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "MVA:"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Kundefaktura"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Bekrefte salgsordre som skal faktureres"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Salgsordre som ennå ikke er bekreftet"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Salgsordrelinjer"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Salg"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "Status for salgsordre '%s' er satt til 'Utkast'."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Hvis du endrer prisliste for denne ordren (og evt. valutaen) vil prisene på "
+"eksisterende ordrelinjer ikke bli oppdatert."
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "fra lager"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Dag"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Lukke"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Fakturaer"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Enhetspris"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Fullført"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Fakturaadresse:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Mine salgsordrelinjer"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "Ingen prisliste!: "
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Levert"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Tilbud"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Du må velge en produksjonslot/batch for dette produktet"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Søk ikkefakturerte linjer"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
 
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Ordrereferanse må være unik pr. firma!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Gjøremål"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Leveringsadresse:"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Du kan ikke gruppere salg som har forskjellig valuta for samme partner."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Salgsanalyse"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Prisliste for aktuell salgsordre."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Lag faktura"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Beløp uten avgift"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Ordrereferanse"
+
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid."
 msgstr "dette indikerer at en faktura har blitt betalt."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr "Du kan ikke kansellere en salgsordrelinje som allerede er fakturert!"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Beskrivelse"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Mai"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Pris"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Denne rapporten analyserer dine sitater og salgsordrer. Analysen sjekker "
+"salgsinntekter og sorterer de ved annen gruppe kriterier (selger, partner, "
+"produkt, etc.) Bruk denne rapporten til å utføre analyser på salg du ikke "
+"har fakturert enda. Hvis du ønsker å analysere din omsetning, bør du bruke "
+"fakturaen analyserapporten i Regnskap søknaden."
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel.:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Vil du virkerlig opprette faktura(ene) ?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Annen informasjon"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Mengde"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "For gjennomgang av regnskap."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Leveringsadresse for aktuell salgsordre."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Tilbud / ordre"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Kunde"
@@ -2184,45 +1917,195 @@ msgstr "Forskudd"
 msgid "February"
 msgstr "Februar"
 
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Faktura på"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Ordredato"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Produkt salgsenhet"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Utkast status  for salgordre"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Kildedokument"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "April"
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Bokføring"
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuell i arbeid"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Mine salgsordre"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Search Sales Order"
 msgstr "Søk salgsordre"
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1255
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Ordremåned for salgsordren"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "Not enough stock ! : "
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Du må velge en prisliste eller en kunde i salgsbildet!\n"
+"Vennligst gjør dette før du velger produkt."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Fra en salgsordre"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorer avvik"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Avhengig av faktureringsregelen på salgsordren kan faktura baseres på "
+"bestilt eller levert mengde. Slik kan en salgsordre danne faktura eller "
+"plikkordre når den bekreftes av selger."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Analytiske konto relatert til en salgsordre."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Betalingsbetingelse"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Salgsordre klare til fakturering"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2231,35 +2114,125 @@ msgid "Quotation N°"
 msgstr "Tilbudsnr."
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Kundereferanse"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Plukket"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "År"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Faktura basert på leveringer"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Totalt inkl. avg."
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturert"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Ordredato for salgsordren"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Salg pr. selger de siste 90 dager"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Dersom du ikke har nok på lager til å levere alt på en gang, kan du "
+#~ "akseptere delleveringer eller ikke?"
 
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Konfigurer salgsordre logistikk"
 
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Tilbudet '%s' har blitt konvertert til en salgsordre."
+
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Betaling før levering"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Advarsel !"
+
 #~ msgid "VAT"
 #~ msgstr "MVA"
 
 #~ msgid "All at Once"
 #~ msgstr "Alt på en gang"
 
+#~ msgid "Procurement Order"
+#~ msgstr "Innkjøpsordre"
+
+#~ msgid "Order Line"
+#~ msgstr "Ordrelinje"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Konfigurer plukkerutine for salgsordre"
 
+#~ msgid "State"
+#~ msgstr "Status"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Tvangsfordeling"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Salg pr. selger"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Lagerbevegelser"
+
+#~ msgid "Dates"
+#~ msgstr "Datoer"
+
+#~ msgid "Packaging"
+#~ msgstr "Forpakning"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Sett til forslag"
+
+#~ msgid "Conditions"
+#~ msgstr "Vilkår"
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -2284,24 +2257,77 @@ msgstr "Faktura basert på leveringer"
 #~ " - Valget \"Faktura fra pakking\" blir benyttet til å lage en faktura under "
 #~ "pakkearbeidet."
 
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Det er ikke definert noen inntektskonto-kategori  i standard egenskaper for "
+#~ "produkt eller skattemessig behandling er ikke definert!"
+
 #~ msgid "Configure"
 #~ msgstr "Konfigurer"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "Ugyldig form for test_state"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Kunne ikke kansellere denne salgsordren!"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Kun leveringsordre"
 
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Antall dager mellom ordrebekreftelse og forsendelse av produktene til kunden"
+
+#~ msgid "Number Packages"
+#~ msgstr "Antall pakker"
+
+#~ msgid "Notes"
+#~ msgstr "Notater"
+
+#~ msgid "Delivery Order"
+#~ msgstr "Leveringsordre"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Ordrereferanse må være unik !"
 
+#~ msgid "Warehouse"
+#~ msgstr "Lager"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Ikke avgiftsbelagt beløp"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Ordrelinjer å fakturere"
+
+#~ msgid "All Quotations"
+#~ msgstr "Alle tilbud"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Faktura ved ordre etter levering"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Lagerbevegelser"
+
 #~ msgid "  Year  "
 #~ msgstr "  År  "
 
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Vil du virkerlig opprette faktura(ene) ?"
 
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Kunne ikke kansellere salgsordrelinje!"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Opprett endelig faktura"
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -2343,32 +2369,107 @@ msgstr "Faktura basert på leveringer"
 #~ "        - leveringskostnader\n"
 #~ "    "
 
+#~ msgid "Companies"
+#~ msgstr "Firmaer"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Navn og adresse på kontakten som ba om ordre eller tilbud"
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr ""
 #~ "Du kan ikke kansellere en salsgordrelinje som allerede har blitt fakturert!"
 
+#~ msgid "References"
+#~ msgstr "Referanse"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Salgsordredatoer"
 
+#~ msgid "Compute"
+#~ msgstr "Beregn"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Salg pr. partner"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Ordrekontakt"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Salgskonfigurering"
 
+#~ msgid "on order"
+#~ msgstr "i ordre"
+
+#~ msgid "Name"
+#~ msgstr "Navn"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Salg pr. kunde de siste 90 dager"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Opprett leveringsordre"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Leveringskostnader"
 
+#~ msgid "Create Pick List"
+#~ msgstr "Opprett plukkliste"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Dellevering"
 
+#~ msgid "Procurement Method"
+#~ msgstr "Innkjøpsmetode"
+
 #~ msgid "title"
 #~ msgstr "tittel"
 
+#~ msgid "Pick List"
+#~ msgstr "Plukkliste"
+
 #~ msgid "Order date"
 #~ msgstr "Ordredato"
 
+#~ msgid "Validate"
+#~ msgstr "Valider"
+
+#~ msgid "Confirm Order"
+#~ msgstr "Bekreft ordre"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Opprett innkjøpsordre"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Forsendelsesprinsipp"
 
+#~ msgid "Stock Move"
+#~ msgstr "Lagerbevegelse"
+
+#~ msgid "Extra Info"
+#~ msgstr "Ekstrainformasjon"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Levert kvantum"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Faktura basert på salgsordre"
+
+#~ msgid "Picking List"
+#~ msgstr "Plukkliste"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Feil!"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Kunne ikke kansellere salgsordre!"
+
+#~ msgid "Procurement"
+#~ msgstr "Innkjøp"
+
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Forsendelse og manuell faktura"
 
@@ -2393,12 +2494,24 @@ msgstr "Faktura basert på leveringer"
 #~ "den mest benyttede og enkleste måte å levere produkter til kunden på med et "
 #~ "fåtall av operasjoner."
 
+#~ msgid "Properties"
+#~ msgstr "Egenskaper"
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Invoicing"
 #~ msgstr "Fakturering"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Kanseller avtale"
+
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sales order. \n"
 #~ "The exception state is automatically set when a cancel operation occurs in "
@@ -2414,10 +2527,35 @@ msgstr "Faktura basert på leveringer"
 #~ "\"Ventestatus\" blir satt når fakturaen er bekreftet men avventer kjøring av "
 #~ "fordelingsjobben på dato for \"Dato bestilt\"."
 
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Det er ikke definert noen inntektskonto for dette produktet: \"%s\" (id:%d)"
+
+#~ msgid "States"
+#~ msgstr "Bekrefter"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Kan ikke slette en salgsordrelinje som er %s!"
 
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "Dette er plukklisten som har blitt laget for denne salgsordren."
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Varsel"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Salg pr. måned"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Leveringstid"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfigurasjon"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Komplett levering"
 
@@ -2430,20 +2568,50 @@ msgstr "Faktura basert på leveringer"
 #~ msgid "Invoicing journals"
 #~ msgstr "Fakturajournaler"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Din faktura er blitt opprettet!"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Du må først slette alle fakturaene som er koblet til denne salgsordren."
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Feil"
+
+#~ msgid "Assign"
+#~ msgstr "Angi"
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "Kan ikke slette salgsordre som allerede er bekreftet!"
 
+#~ msgid "from stock"
+#~ msgstr "fra lager"
+
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Standard forsendelsesprinsipp"
 
+#~ msgid "Close"
+#~ msgstr "Lukke"
+
+#~ msgid "Delivered"
+#~ msgstr "Levert"
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Ikke nok på lager !"
 
+#~ msgid "Accounting"
+#~ msgstr "Bokføring"
+
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Steg for å levere en salgsordre"
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Faktura basert på leveringer"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ugyldig modellnavn i aksjonsdefinisjonen."
 
@@ -2543,15 +2711,9 @@ msgstr "Faktura basert på leveringer"
 #~ msgid "Procurement Corrected"
 #~ msgstr "Endret innkjøp"
 
-#~ msgid "Status"
-#~ msgstr "Status"
-
 #~ msgid "Our Salesman"
 #~ msgstr "Vår salgsperson"
 
-#~ msgid "Sale Order"
-#~ msgstr "Salgsordre"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Salgsprisliste"
 
@@ -2617,3 +2779,454 @@ msgstr "Faktura basert på leveringer"
 
 #~ msgid "Sale Order line"
 #~ msgstr "Salgsordrelinje"
+
+#~ msgid "Print Quotation"
+#~ msgstr "Skriv ut tilbud"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Referanse må være unik pr firma!"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Konfigurasjonsfeil!"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/a)"
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "Firmanavn må være unikt !"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Diverse"
+
+#~ msgid "Options"
+#~ msgstr "Alternativer"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Utlever alle produkter på en gang"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Åpne faktura"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Basert på timeliste"
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Salgsordre hjelper deg med å håndtere forespørsler og bestillinger fra dine "
+#~ "kunder. OpenERP foreslår at du starter med å lage et tilbud. Når dette blir "
+#~ "bekreftet vil det bli konvertert til en salgsordre. OpenERP kan håndtere "
+#~ "ulike typer produkter slik at en salgsordre kan initere arbeidsoppgaver, "
+#~ "utleveringer, produksjonsordre, bestillinger osv. Ut fra salgsordren vil det "
+#~ "bli dannet et utkast til en faktura som du bare bekrefter når du ønsker å "
+#~ "fakturere kunden."
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Her er en liste over salgsordrelinjer som skal faktureres. Du kan "
+#~ "delfakturere salgsordre ved å fakturere enkeltlinjer. Du trenger ikke denne "
+#~ "listen dersom du fakturerer på grunnlag av utleveringer eller hvis du "
+#~ "fakturerer salgsordre samlet."
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Normal arbeidstidsenhet"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Fakturaen blir dannet automatisk dersom grunnregelen er 'Fakturering etter "
+#~ "plukk' eller 'Fakturering av ordre etter utlevering'."
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Basert på utleveringer"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "For å slette en bekreftet salgsordre må du kansellere den først. For å "
+#~ "kansellere en salgsordre må du først kansellere tilhørende plukk eller "
+#~ "utleveringer."
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Prinsipp for fakturering benyttes for å samholde fakturering og "
+#~ "utleveringer.\n"
+#~ " - 'Betal før utlevering' vil først danne faktura, og siden danne plukkordre "
+#~ "når fakturaen er betalt.\n"
+#~ " - 'Utlever og fakturer på forespørsel' vil danne plukkordre ved godkjenning "
+#~ "av salgsordre, og vente til brukeren klikker på knappen 'Fakturere' før det "
+#~ "dannes utkast til faktura bsert på salgsordre / salgsordrelinjer.\n"
+#~ " - 'Fakturer ordre etter utlevering' vil danne utkast til faktura basert på "
+#~ "salgsordre når alle plukklister er avsluttet.\n"
+#~ " - 'Fakturer basert på utleveringer' vil danne utkast til faktura basert på "
+#~ "det som plukkes og utleveres."
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Basert på utført arbeid på oppgaver"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Du forsøker å angi en lot som ikke tilhører samme produkt"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Salgsledelses-dashbord"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Faktura basert på leveringer"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Du må først slette lagerbevegelser knyttet til denne salsgordrelinjen."
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Lever hvert produkt produkt når tilgjengelig"
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr "Kan ikke flytte produkter til eller fra en lokasjon av typen view."
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Danner inkjøpsordre for hver salgsordrelinje."
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Salg åpen faktura"
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Basert på salgsordre"
+
+#~ msgid "Line Sequence"
+#~ msgstr "Linjesekvens"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Fakturer ordre etter levering"
+
+#~ msgid "Security Days"
+#~ msgstr "Sikkerhetsdager"
+
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Totalt eksl. avgift"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Det er ikke definert noen salgsjournal for dette firmaet: \"%s\" (id:%d)"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Salg pr. produktkategori"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Basert på sendt eller bestilt kvantum."
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Leveringer klare til fakturering"
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Sett opp faktureringsmetode"
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Faktureringsregler"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "Plukking informasjon "
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr "Du kan lage fakturaer basert enten på salgsordre eller leveranser."
+
+#~ msgid "Picking Policy"
+#~ msgstr "Regler for plukking"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Forskuddsbetaling"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Du må først kansellere alle plukkinger knyttet til denne salgsordren."
+
+#~ msgid "Logistic"
+#~ msgstr "Logistisk"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Salg pr. produktgruppe siste 90 dager"
+
+#~ msgid "Print Order"
+#~ msgstr "Utskrift av ordre"
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Hovedregel basert på"
+
+#~ msgid "Image"
+#~ msgstr "Bilde"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Salgsordren '%s' har blitt kansellert."
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Du må velge en produksjonslot/batch for dette produktet"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Anskaffelse av solgt produkt"
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "For hver salgsordrelinje dannes en bestilling for å anskaffe det solgte "
+#~ "produktet."
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm, som står for 'International Commercial terms', er en rekke "
+#~ "salgstermer som benyttes i komersielle transaksjoner."
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Dette er antall dager som for sikkerhet legges til det som er lovet kunde"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr "Kan ikke slette salgsordrelinjer med status '%s'!"
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr ""
+#~ "Dette verktøyet vil hjelpe deg å installere riktig modul og konfigurere "
+#~ "systemet i henhold til hvordan du fakturerer kundene."
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "Hvis 'Produsere på bestilling' initieres en anskaffelse når salgsordren "
+#~ "bekreftes, slik at det opprettes en oppgave, bestilling eller "
+#~ "produksjonsordre koblet til denne salgsordrelinjen."
+
+#~ msgid "Related Picking"
+#~ msgstr "Tilhørende plukking"
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Faktureres utleveringene?"
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Du valgte en mengde på %d enheter.\n"
+#~ "Dette passer ikke overens med valgt forpakning.\n"
+#~ "Foreslår følgende mengde i henhold til forpakning:\n"
+#~ "EAN: %s Mengde: %s Forpakningstype: %s"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Du må velge en kunde i salgsbildet!\n"
+#~ "Vennligst velg kunde før du velger produkt."
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Avhengig av oppsettet av utgående lokasjon vil varebevegelsen fra utgående "
+#~ "logistikk til kunde gjort gjennom en leveringsordre eller automatisk."
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Du planlegger å selge %.2f %s men du har bare %.2f %s tilgjengelig!\n"
+#~ "Virkelig lagerbeholdning er %.2f %s (uten reservasjoner)."
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "Kan ikke finne en oppføring i prisliste som stemmer med produkt og mengde.\n"
+#~ "Du må endre enten produkt, prisliste eller mengde."
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Status for salgsordre '%s' er satt til 'Utkast'."
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Forsendelsesavvik"
+
+#~ msgid "Reference UoM"
+#~ msgstr "Referanseenhet"
+
+#~ msgid "UoM"
+#~ msgstr "Enhet"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Mengde (enhet)"
+
+#~ msgid "Product UoM"
+#~ msgstr "Produktenhet"
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Mengde (enhet)"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Mengde (salgsenhet)"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Salgsordre laget i inneværende år"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Salgsordre laget i inneværende måned"
+
+#~ msgid "Month-1"
+#~ msgstr "Forrige måned"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Salg pr.  måned"
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Salgsordre laget forrige måned"
+
+#~ msgid "Salesman"
+#~ msgstr "Selger"
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Gjenskap pakking"
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "Ikke nok lager!: "
+
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Salgsordre rekvisisjon"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Den indikerer at salgsordren har blitt levert. Dette feltet blir oppdatert "
+#~ "kun etter at planleggeren(e) har blitt lansert."
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Velg et produkt av typen tjeneste som kalles 'Forhånsfakturert produkt'. Du "
+#~ "må kanskje opprette den og sette den som en standar verdi på dette feltet."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Du kan ikke lage et forskudd på en salgsordre som er definert som "
+#~ "'Automatisk faktura etter levering'."
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Hvis du har mer enn en butikk som selger selskapet ditt sine produkter, kan "
+#~ "du opprette og administrere det herfra. Når du vil lage et nytt tilbud eller "
+#~ "en ny salgsordre, må den bli knyttet til en butikk. Butikken definerer også "
+#~ "lageret fra hvilke produkter som vil bli levert for hvert eneste salg."
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Auto e-post bekreftede salgsordre"
+
+#~ msgid "Packings"
+#~ msgstr "Pakkinger"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Dokument av forsendelsen til kunden."
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Lever og fakturer på etterspørsel"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "Viser status for forespørsel eller salgsordre.\n"
+#~ "Statusen 'Unntak' settes automatisk når det skjer en avbrytelse ved "
+#~ "fakturering (faktureringsunntak) eller plukking (forsendelsesunntak).\n"
+#~ "Statusen 'Avventer planlegging' settes når faktura er bekreftet men ordren "
+#~ "venter på kjøring av planleggeren."
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "Plukklisten dannes umiddelbart når en salgsordre bekreftes, samtidig med "
+#~ "anskaffelsesordren. Den tilordner varer til salgsordren. Det dannes en "
+#~ "plukkliste til salgsordren som utvides løpende med tilgjengelige produkter."
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "En anskaffelsesordre dannes automatisk når en salgsordre bekreftes eller "
+#~ "faktura er betalt. Denne driver innkjøp og/eller produksjon av produktet i "
+#~ "henhold til anskaffelsesregler og parametere på salgsordren. "
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "En anskaffelsesordre for hver salgsordrelinje og for hver av komponentene."
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Dokumentering av bevegelse til utgående lokasjon eller kunde."
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index 11b49a91d61..b71e26f2391 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/i18n/nl.po
@@ -6,20 +6,168 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:57+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
+"PO-Revision-Date: 2012-11-02 18:41+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:04+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Gebaseerd op urenstaat"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Vooruitbetalen"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Bevestig offerte"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Verkoop dashboard"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr "Orderregels te factureren"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Datum bevestigd"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Groepeer op..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -31,19 +179,686 @@ msgstr ""
 "gefactureerd."
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Omzet per verkoper in de laatste 90 dagen"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Toewijzing relatie"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr "Factureer order"
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
 msgstr ""
-"Indien er onvoldoende voorraad is om alles in een zending te leveren, worden "
-"er dan deelleveringen geaccepteerd?"
+"Geeft u de mogelijkheid om afwijkende aflever- en factuuradressen te "
+"definiëren op een verkooporder"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr "Contract kenmerken"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Orderstatus"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Te factureren"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Maateenheid"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum waarop de verkooporder is bevestigd."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Offertes"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Maart"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+"Annuleer eerst alle facturen welke aan deze verkooporder zijn gekoppeld."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr "Factureer de gehele verkooporder"
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Contract/Kostenplaatst"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Factuurdatum"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Nog te factureren en geleverde regels"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Het bedrag dat vooruit gefactureerd wordt."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Fouten in facturatie"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr "0"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Concept offerte"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Het totaalbedrag."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Kostenplaatsen"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotaal"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr "Korting op verkoopovereenkomst toestaan"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "Annuleer order"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Gewicht"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "Magazijn mogelijkheden"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Offerte "
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Maateenheid "
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr "Foutieve gegevens"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr "De waarde van de vooruitbetaling moet positief zijn"
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Verkooporder"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Berichten"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Belastingen"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Netto bedrag"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "Project"
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr "Fout!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Netto totaal :"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Verkooporderregels gerelateerd aan een verkooporder van mijzelf"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Offerte verstuurt"
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Totaal"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Verkooppunten"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Verkooporders met uitgestelde levering"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Factuuradres"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum waarop de verkooporder is gemaakt."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr "Onwaar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Maak factuur opnieuw"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Maak facturen"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr "Belasting"
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr "Ongeldige actie!"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr "Maateenheid referentie"
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Datum bevestigd"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# Regels"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# Aantal"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "(update)"
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Verkooporder"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Aantal (UoS)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Verkooporderregels welke zich in de 'gereed' status bevinden."
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Bedrag vooruitbetaling"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Bevestigd"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "Voorwaarden"
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Std. betalingstermijn"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Bevestig"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr "Ongelezen berichten"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Verzendadres"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Verkooporderregels gereed om te worden gefactureerd"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Maandelijkse omzet"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Jaar"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr "Afwijkende maateenheid toestaan"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Verkooporders welke nog niet zijn bevestigd"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Ongelezen berichten"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr "Afdrukken"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Order nr."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Orderregels"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Krt. (%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Order referentie"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Factuurregels"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Totaalprijs"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Oude offertes"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Zet aan om de facturen voor dezelfde klanten te groeperen."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Maak facturen"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr "Markeer als gelezen"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Uur"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr "# verkooporders"
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Datum gemaakt"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Volgende planning"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Factuuradres van actuele verkooporder."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Bestelde hoeveelheden"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Besteld jaar van de verkooporders"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr "Verkoop en magazijnbeheer"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Aantal"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Totaal :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mijn verkopen"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Foutieve handeling!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiscale positie"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "Standaard opties"
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr "Configuratiefout!"
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr "Verkoop kostenplaatsen"
 
 #. module: sale
 #: view:sale.order:0
@@ -51,120 +866,308 @@ msgid "UoS"
 msgstr "UoS"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Afleveradres voor de huidige verkooporder."
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Aantal"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Dag"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Annuleer order"
-
-#. module: sale
-#: code:addons/sale/sale.py:638
+#: code:addons/sale/edi/sale_order.py:151
 #, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "De offerte '%s' is omgezet in een verkooporder."
+msgid "EDI Pricelist (%s)"
+msgstr "EDI Prijslijst (%s)"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Offerte afdrukken"
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr "Waarschuwing !"
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr "Factureer proces"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Tax"
-msgstr ""
+msgid "Quotation Date"
+msgstr "Offertedatum"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Stuurt verwervingsopdrachten aan voor elke verkooporderregel."
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Orderdatum"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Kostenplaatsen"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+#: help:sale.order,order_policy:0
 msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
-"Dit is een lijst van elke te factureren verkooporder. U kunt verkooporders "
-"deels factureren, per regel of per order. U heeft deze lijst niet nodig als "
-"u factureert vanaf leveringen of als u alle verkopen factureert."
 
 #. module: sale
-#: code:addons/sale/sale.py:295
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr "Verkooporder gereed"
+
+#. module: sale
+#: code:addons/sale/sale.py:320
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
 msgstr ""
-"Om een ​​bevestigde verkooporder te verwijderen, moet u deze eerst "
-"annuleren! Om een verkooporder te annuleren, moet u eerst de gerelateerde "
-"uitgaande levering annuleren."
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Verwervingsopdracht"
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Offertes en verkooporders"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "Relatie"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Factuur van leveringsopdracht"
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr "Maak en bekijk factuur"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Orderregel"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
 msgstr ""
-"Verkooporders helpen u bij het beheren van offertes en orders van uw "
-"klanten. OpenERP stelt voor dat u begint met het maken van een offerte. Als "
-"die is bevestigd, wordt de offerte omgezet in verkooporder. OpenERP kan "
-"verschillende soorten producten verwerken zodat een verkooporder taken, "
-"leveringen, productieopdrachten, inkooporders etc. kan aansturen. Gebaseerd "
-"op de configuratie van de verkooporder wordt een concept factuur gegenereerd "
-"zodat u die alleen hoeft te bevestigen als u de klant wilt factureren."
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Verkoopfactuur maken"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Korting (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Factuur kan niet worden gemaakt voor deze verkooporderregel vanwege een van "
+"de volgende redenen:\n"
+"1. De status van deze verkooporder is of \"offerte\" of \"geannuleerd\"!\n"
+"2. De verkooporderregel is al gefactureerd!"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Verkooporderregels gereed"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mijn offerte-aanvragen"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr "Factureer verkooporder"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "December"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Contractenbeheer"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Verzonden"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Maand"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Volgorde"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "Het is niet mogelijk een verkooporder zonder regels te bevestigen"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Niet-gefactureerd"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Productcategorie"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr "Het is niet mogelijk deze verkooprder te annuleren!"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr "Bericht"
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Naam verkooppunt"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Belastingen :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr "Factuur is  <b>betaald</b>."
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Verkoop vooruitbetaling factuur"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr "Open verkoop menu"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "In behandeling"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Geen klant opgegeven!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Maak facturen"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -182,197 +1185,84 @@ msgstr ""
 "de verbonden taken."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Std. betalingstermijn"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr "Vooruitbetaling van %s %%"
 
 #. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Gebaseerd op uitgaande leveringen"
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Verkooporderregel factuur maken"
 
 #. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "Hoofd werktijd maat"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Offerte"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Betaald"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+"* De status is 'Offerte' bij concept orders of offertes\n"
+"* De status is 'Bevestigd' als de betreffende verkooporder is bevestigd.     "
+"                \n"
+"* De status is 'Fout' status als de betreffende verkooporder in een fout "
+"situatie terecht komt.                     \n"
+"* De status is 'Gereed' als de verkooporderregel is verzameld.               "
+"      \n"
+"* De status is 'Geannuleerd' als een gebruiker de betreffende verkooporder "
+"annuleert."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Verkooporders"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Groepeer de facturen"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Bet BTW bedrag."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
 #: view:sale.report:0
-msgid "State"
+msgid "Status"
 msgstr "Status"
 
 #. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Krt. (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Totaalprijs"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Zet aan om de facturen voor dezelfde klanten te groeperen."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mijn verkooporders"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Bestelde hoeveelheden"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Omzet per verkoper"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Voorraadmutaties"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Order referentie"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Overige informatie"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Datums"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"De factuur wordt automatisch gemaakt als het leveringsbeleid 'Factuur van "
-"pakbon' of 'Factuur van order na levering' is."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "Gebaseerd op taken"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Offertes en verkooporders"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Verkoopfactuur maken"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Prijslijst waarschuwing"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Korting (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mijn offerte-aanvragen"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Verkoopmanager dashboard"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Verpakking"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Van een verkooporder"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Naam verkooppunt"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Het factureerbeleid wordt gebruikt om facturatie en uitgaande leveringen te "
-"synchroniseren.\n"
-"  - De 'Vooruitbetaling' keuze genereert eerst de factuur en genereert de "
-"uitgaande leveringen na betaling van de factuur.\n"
-"  - De 'Leveren & Handmatig factureren' keuze maakt de uitgaande leveringen "
-"direct en wacht met het genereren van een concept factuur totdat de "
-"gebruiker de 'Factureren' knop drukt.\n"
-"  - De 'Factuur van order na levering' keuze genereert de concept factuur "
-"gebaseerd op de verkooporder nadat alle verzamelijsten zijn verwerkt. \n"
-"  - De 'Factuur van uitgaande leveringen' keuze wordt gebruikt om een "
-"factuur te maken gedurende het verzamel proces."
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Geen klant opgegeven!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Verkooporders met uitgestelde levering"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "Configuratiefout !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Voorwaarden"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Er is geen categorie opbrengstrekening gedefinieerd in de standaard "
-"eigenschappen van de productcategorie of fiscale positie niet gedefinieerd !"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr "Op verzoek"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -380,16 +1270,29 @@ msgid "August"
 msgstr "Augustus"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-"U probeert een partij toe te wijzen die niet van hetzelfde product is."
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr "Verkooprder "
 
 #. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "invalid mode for test_state"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Stuurt verwerving en facturatie aan"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -397,10 +1300,42 @@ msgid "June"
 msgstr "Juni"
 
 #. module: sale
-#: code:addons/sale/sale.py:617
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Email-sjablonen"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Order"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
 #, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Kon deze verkooporder niet annuleren !"
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Prijslijst waarschuwing"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Verkoopfiliaal"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
@@ -408,520 +1343,167 @@ msgid "Sales Orders Statistics"
 msgstr "Verkooporder statistieken"
 
 #. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "De kostenplaatsrekening verbonden met een verkooporder."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "Referentie moet uniek zijn per bedrijf!"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Offertes"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Prijslijst voor actuele verkooporder"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "BTW :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Aantal dagen tussen de orderbevestiging en de verzending van de producten "
-"naar de klant"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Offertedatum"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiscale positie"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "Eenheid"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Aantal pakketten"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "In behandeling"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"De verkoper bevestigt de offerte. De status van de verkooporder wordt "
-"'Loopt' of 'Loopt handmatig'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-"Het is niet mogelijk een verkooporderregel te annuleren welke al is "
-"gefactureerd!"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"U moet eerst voorraadmutaties annuleren die zijn verbonden met deze "
-"verkooporderregel."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n.b.)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Selecteer een product van het soort service dat 'Voorschot product' heet. U "
-"moet het wellicht maken en instellen als standaard waarde op dit veld."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"U kunt geen vooruitbetaling doen bij een verkooporder die is gedefinieerd "
-"als 'Automatisch factuur na levering'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Opmerkingen"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "De naam van het bedrijf moet uniek zijn!"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Factuuradres van actuele verkooporder."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Maand-1"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Bestelde maand van de verkooporder"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Het is niet mogelijk om verkopen met verschillende valuta van dezelfde "
-"relatie samen te voegen."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Lever ieder product wanneer beschikbaar"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Gefactureerd"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Leveringsopdracht"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Datum bevestigd"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Leveringsvoorwaarden"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Toewijzing relatie"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Maart"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-"Het is niet mogelijk om producten te verplaatsen naar een locatie van het "
-"type 'aanzicht'."
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Gebaseerd op verkooporders"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Het totaalbedrag."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotaal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Factuuradres:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "Regel volgorde"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Bij elke verkooporderregel wordt een verwervingsopdracht gemaakt om in het "
-"verkochte product te voorzien."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Leveringsvoorwaarden of Incoterm wat staat voor 'International Commercial "
-"Terms', staat voor een reeks leveringsvoorwaarden die gebruikt worden in de "
-"commerciële transactie."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Factuuradres"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Niet-gefactureerde regels zoeken"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Offerte / Order"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# Regels"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Verkoop open factuur"
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Datum"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
 msgstr "Verkooporderregel"
 
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazijn"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Order nr."
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Orderregels"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Bedrag voor belastingen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Te factureren orderregels"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Hoeveelheid (eenheid)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Datum gemaakt"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Diversen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Nog te factureren en geleverde regels"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Totaal :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Mijn verkopen"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Foutieve handeling!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Extra info"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Prijslijst"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# Aantal"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "Uur"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Orderdatum"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Verzonden"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Offerte-aanvragen"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "Opties"
-
 #. module: sale
 #: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Het is niet mogelijk een verkooporder zonder regels te bevestigen"
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"U dient een prijslijst of een klant in het verkoopscherm te selecteren!\n"
-"Stel een prijslijst in voor het kiezen van een product."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Productcategorie"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Belastingen :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Goederenstromen"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Orderstatus"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Wilt u echt de facturen aanmaken?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Omzet per maand"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Kan verkooporderregel niet annuleren !"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Dagen veiligheidsmarge"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Verwerving van verkocht materiaal"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Definitieve factuur maken"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Verzendadres"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Dit geeft aan dat de verkooporder is geleverd. Dit veld wordt alleen "
-"bijgewerkt als de planning heeft loopt."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Datum"
+msgid "November"
+msgstr "November"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Uitgebreide filters..."
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr "Waarschuwing!"
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Product voor vooruitbetaling"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Fout"
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Bedrijven"
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
 
 #. module: sale
-#: help:sale.order,state:0
+#: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
 msgstr ""
-"Geeft de status van de offerte of verkooporder.\n"
-"De fout staat wordt automatisch ingesteld wanneer een annuleringsopdracht "
-"plaatsvindt bij de factuurvalidatie (Factureerfout) of in het pickinglijst "
-"proces (verzendingsfout).\n"
-"De 'Wacht op planner' staat wordt ingesteld wanneer de factuur is bevestigd, "
-"maar wacht deze op de planner, als deze start op de orderdatum."
+"De verkoper maakt een factuur handmatig, als verkooporder leveringsmethode "
+"op 'Levering en handmatige voortgang'. De factuur wordt automatisch gemaakt "
+"als de leveringsmethode 'Vooruitbetaling' is."
 
 #. module: sale
-#: code:addons/sale/sale.py:1272
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Januari"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Lopende verkooporders"
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Samenvatting"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr "Wat wilt u factureren?"
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"De verkoper bevestigt de offerte. De status van de verkooporder wordt 'In "
+"behandeling'."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referentie van het document dat deze verkooporder aanvraag genereerde."
+
+#. module: sale
+#: code:addons/sale/sale.py:958
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr "Geen geldige prijslijst gevonden!:"
 
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Toezegging vertraging"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Bevestigde verkooporderregels, nog niet geleverd"
+
 #. module: sale
 #: view:sale.order:0
 msgid "History"
 msgstr "Historie"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Factuur van order na levering"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr "Geef marge op verkooprder weer"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -940,474 +1522,57 @@ msgid "Your Reference"
 msgstr "Uw referentie"
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-"De naam en adres van de contactpersoon die de order of offerte aangevraagd "
-"heeft."
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr "Geef Te factureren regels weer"
 
 #. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Dit is het aantal dagen dat als veiligheidsmarge wordt toegevoegd aan de "
-"beloofde levertijd."
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Orderdatum"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Hvhd"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referenties"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Mijn verkooporderregels"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Annuleer"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Orderreferentie moet uniek zijn per bedrijf!"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Maak factuur"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Totaal excl. BTW"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Order referentie"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "De factuur is met succes gemaakt!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Omzet per relatie"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Orderadres"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Openstaande factuur"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr "Auto-e-mail bevestigde verkooporders"
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Er is geen verkoopdagboek gedefinieerd voor dit bedrijf: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forceer toewijzing"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Maak op bestelling"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Gebaseerd op de geleverde of bestelde hoeveelheden."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Lever alle producten tegelijk"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Gekoppelde picking"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Naam"
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prijslijst"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Afleveradres :"
+msgid "TVA :"
+msgstr "BTW :"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Omzet per klant in laatste 90 dagen"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Concept status van verkooporder"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Afleveropdracht maken"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/sale.py:401
 #, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-"Het si niet mogelijk een verkooporder te verwijderen, welke zich in staat "
-"'%s' bevindt."
+msgid "Customer Invoices"
+msgstr "Klantfacturen"
 
 #. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Bevestigde verkooporder naar factuur."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "Hvh(UoS)"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Verkooporderregels"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
 #: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Totaal incl. BTW"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Verzamellijst maken"
-
-#. module: sale
 #: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Besteldatum van de verkooporders"
+msgid "Sales"
+msgstr "Verkopen"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Omzet per productcategorie"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Bevestig offerte-aanvraag"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Fout"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Groepeer op..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Maak factuur opnieuw"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Te factureren uitgaande leveringen"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Volgende planning"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Verwervingswijze"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Verzamellijst"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Terug naar offerte-aanvraag"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Document van de mutatie naar de expeditie of naar de klant."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-"\n"
-"Hallo ${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Hier is uw orderbevestiging voor ${object.partner_id.name}:\n"
-"       | Order nummer: *${object.name}*\n"
-"       | Order totaal: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order datum: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order referentie: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Uw referentie: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Uw contactpersoon: ${object.user_id.name} "
-"${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"U kan uw orderbevestiging bekijken, downloaden en online betalen, door "
-"gebruik te maken van de volgende link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"Het is ook mogelijk te betalen met Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"Indien u nog vragen heeft, aarzel dan niet om ons te contacteren.\n"
-"\n"
-"\n"
-"Dank u voor het kiezen van  ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Bevestig"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Bevestig Order"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Verwervingsopdracht maken"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Belastingen"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Verkooporders, gereed om te worden gefactureerd"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datum waarop de verkooporder is gemaakt."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Voorraadmutatie"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Maak facturen"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Verkooporders aangemaakt in de huidige maand"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-"Bij 'maak op bestelling' wordt wanneer de verkooporder is bevestigd een "
-"verwerving gestart, om een taak, inkooporder of productie order te koppelen "
-"aan deze verkooporderregel."
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Voorschotbedrag"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "Berekend u de levering door?"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Verzonden hoeveelheden"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Factuur gebaseerd op verkooporders."
-
-#. module: sale
-#: code:addons/sale/sale.py:331
+#: code:addons/sale/sale.py:262
 #, python-format
 msgid ""
 "If you change the pricelist of this order (and eventually the currency), "
@@ -1417,214 +1582,109 @@ msgstr ""
 "de prijzen van bestaande orderregels niet worden bijgewerkt."
 
 #. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Verzamellijst"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Fout !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Kan verkooporder niet annuleren !"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Dag"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "Hoeveelheid"
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturen"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Besteld jaar van de verkooporders"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Levering"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Fouten in verzendingen"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "Orderverzamel informatie!: "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Groepeer de facturen"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "Factureerbeleid"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "Stel uw factureerbeleid in"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Te controleren door de boekhouder."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referentie eenheid"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-"Dit hulpmiddel zal u helpen de juiste module te installeren en het systeem "
-"te configureren volgens de methode die u gebruikt om uw klanten te "
-"factureren."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Verkooporderregel factuur maken"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Fouten in facturatie"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Stuurt verwerving en facturatie aan"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Betaald"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Verkoopanalyse"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"U heeft een hoeveelheid van %d geselecteerd.\n"
-"Maar het is niet in overeenstemming met de gekozen verpakking.\n"
-"Hier is een voorstel van de hoeveelheden, volgens de verpakking:\n"
-"EAN: %s Aantal: %s Type verpakking: %s"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Pakbon opnieuw maken"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Waarden"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Offerte-aanvraag"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"De verkoper maakt een factuur handmatig, als verkooporder leveringsmethode "
-"op 'Levering en handmatige voortgang'. De factuur wordt automatisch gemaakt "
-"als de leveringsmethode 'Vooruitbetaling' is."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"U kunt facturen genereren op basis van verkooporder of op basis van "
-"leveringen."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Bevestigde verkooporderregels, nog niet geleverd"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Klantfacturen"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Verkopen"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
 msgid "Unit Price"
-msgstr "Eenheidsprijs"
+msgstr "Prijs"
 
 #. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
 msgid "Done"
 msgstr "Gereed"
 
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Factuuradres:"
+
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+#: view:sale.order:0
 msgid "Invoice"
 msgstr "Factuur"
 
 #. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"U moet een klant in het verkooporder formulier selecteren !\n"
-"Kies eerst een klant voordat u een product kiest."
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Mijn verkooporderregels"
 
 #. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Bron document"
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Annuleer"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Volgers"
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Geen prijslijst! "
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Offerte"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Niet-gefactureerde regels zoeken"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Orderreferentie moet uniek zijn per bedrijf!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr "Product mogelijkheden"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1632,653 +1692,69 @@ msgid "To Do"
 msgstr "Te doen"
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Verzamelbeleid"
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Afleveradres :"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Document van de verplaatsing naar de klant."
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Het is niet mogelijk om verkopen met verschillende valuta van dezelfde "
+"relatie samen te voegen."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Verkoopanalyse"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Prijslijst voor actuele verkooporder"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Maak factuur"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
 msgstr "Het bedrag zonder BTW."
 
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"U moet eerst alle uitgaande leveringen bij deze verkooporder annuleren."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Verkoop vooruibetaling factuur"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Maand"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Product"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Annuleer toewijzing"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Maandelijkse omzet"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Factureer op"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Besteldatum"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Artikel UoS"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Handmatig in behandeling"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Product maateenheid"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistiek"
-
 #. module: sale
 #: view:sale.order.line:0
-msgid "Order"
-msgstr "Order"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"Er is geen opbrengstrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Fouten negeren"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Afhankelijk van de factuurinstelling van de verkooporder kan de factuur "
-"gebaseerd zijn op bestelde of geleverde aantallen. Dus, een verkooporder kan "
-"een factuur of leveringsopdracht genereren zodra deze bevestigd is door de "
-"verkoper."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"U wilt %.2f %s verkopen maar heeft slechts %.2f %s beschikbaar !\n"
-"De werkelijke voorraad is %.2f %s. (zonder reserveringen)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Statussen"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referentie klant"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Totaal"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Prijs"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Afhankelijk van de configuratie van de locatie Expeditie, wordt de "
-"verplaatsing tussen de expeditie en de klant gedaan via de afleveropdracht "
-"handmatig of automatisch."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Vooruitbetaling"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Verkoop dashboard"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Maak facturen"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Te factureren"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datum waarop de verkooporder is bevestigd."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "Contract/Kostenplaatst"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Bedrijf"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Factuurdatum"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Het bedrag dat vooruit gefactureerd wordt."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"Kon geen prijslijstregel, voor dit product en deze hoeveelheid, vinden welke "
-"voldoet.\n"
-"U dient ofwel het product, de hoeveelheid of de prijslijst te wijzigen."
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "Dit is de verzamellijst die door de verkooporder is gegenereerd."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Maak facturen"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Netto totaal :"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Verkooporderregels gerelateerd aan een verkooporder van mijzelf"
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Verkooppunten"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Datum bevestigd"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Omzet per maand"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Verkooporder"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Aantal (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Verkooporderregels welke zich in de 'gereed' status bevinden."
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"De verzamellijst wordt gemaakt zodra de verkooporder is bevestigd, op "
-"hetzelfde moment als de verwervingsopdracht. Het representeert de toekenning "
-"van onderdelen aan de verkooporder. Er is 1 verzamellijst per "
-"verkooporderregel die ontwikkelt met de beschikbaarheid van onderdelen."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Bevestigd"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "Hoofd methode gebaseerd op"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Bevestig"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Fout ! U kunt geen recursieve bedrijven maken."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Omzet per productcategorie in de laatste 90 dagen"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Factuurregels"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Verkooporderregels"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Leveringstermijn"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Instellingen"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI Prijslijst (%s)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr "Order afdrukken"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Verkooporder aangemaakt in huidige jaar"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Factuur kan niet worden gemaakt voor deze verkooporderregel vanwege een van "
-"de volgende redenen:\n"
-"1. de status van deze verkooporder is of \"concept\" of \"geannuleerd\"!\n"
-"2. de verkooporderregel is al gefactureerd!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Verkooporderregels gereed"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Gewicht"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturen"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "December"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Afbeelding"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Een verwervingsopdracht is automatisch gemaakt zodra de verkooporder is "
-"bevestigd of als de factuur is betaald. Het stuurt de inkoop en productie "
-"aan van producten volgens de regels en volgens de verkooporder parameters. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Niet-gefactureerd"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Verkoper"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Oude offertes"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Netto bedrag"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Vooruitbetalen"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "De verkooporder '%s' is geannuleerd."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Concept"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr ""
-"* De 'Concept' status is gezet als de betreffende verkooporder in concept "
-"is.                     \n"
-"* De 'Bevestigd' status is gezet als de betreffende verkooporder is "
-"bevestigd.                     \n"
-"* De 'Fout' status is gezet als de betreffende verkooporder in fout is.      "
-"               \n"
-"* De 'Gereed' status is gezet als de verkooporderregel is gepickt.           "
-"          \n"
-"* De 'geannuleerd' status is gezet als een gebruiker de betreffende "
-"verkooporder annuleert."
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Bet BTW bedrag."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr "Verpakkingen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Verkooporderregels gereed om te worden gefactureerd"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Verkooporder aangemaakt laatste maand"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr "Email-sjablonen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Verkooporders"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Verkoopfiliaal"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Voorlopig product"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Bereken"
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
-"U moet eerst alle facturen annuleren die verbonden zijn met deze "
-"verkooporder."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Januari"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Lopende verkooporders"
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-"Referentie van het document dat deze verkooporder aanvraag genereerde."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Toezegging vertraging"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "Leveren & Handmatig factureren"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr ""
-"Een verwervingsopdracht voor elke verkooporderregel en voor elk van de "
-"componenten."
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Toekennen"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Orderdatum"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Bevestigde verkooporder naar factuur."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Verkooporders welke nog niet zijn bevestigd"
-
-#. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "De verkooporder '%s' is in status concept gezet."
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Uit Voorraad"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Sluiten"
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
-#, python-format
-msgid "No Pricelist ! : "
-msgstr "Geen prijslijst! "
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Geleverd"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "U moet een productie partij toewijzen voor dit product"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
-msgstr ""
-"Als u meer dan één filiaal heeft die uw producten verkopen, kunt u ze vanaf "
-"hier maken en beheren. Steeds als u een nieuwe offerte of verkooporder "
-"vastlegt, moet die gekoppeld zijn aan een filiaal. Het filiaal definieert "
-"ook vanuit welk magazijn de producten worden geleverd voor bepaalde verkopen."
+msgid "Order reference"
+msgstr "Order referentie"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2286,61 +1762,69 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Het geeft aan dat een factuur is betaald."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+"Het is niet mogelijk een verkooporderregel te annuleren welke al is "
+"gefactureerd!"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr "Percentage"
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Verkoper"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Product"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr "%"
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Omschrijving"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Mei"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Klant"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Voorschot"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Februari"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "April"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Boekhouding"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Verkooporder zoeken"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Verkooporder aanvraag"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
-msgstr "Niet genoeg voorraad! "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Betalingsconditie"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Bedrag"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2358,24 +1842,346 @@ msgstr ""
 "analyse gebruiken in de financiële applicatie."
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation N°"
-msgstr "Offerte-aanvraag nr."
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel.:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Wilt u echt de facturen aanmaken?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Overige informatie"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr "sale.group_delivery_invoice_address"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Hvhd"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Te controleren door de boekhouder."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr "Verzonden per mail"
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Afleveradres voor de huidige verkooporder."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Offerte / Order"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr "Postvak IN"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Klant"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Vooruitbetaling"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Februari"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Factureer op"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Besteldatum"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Artikel UoS"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Offerte status van een verkooporder"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Bron document"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "April"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Handmatig in behandeling"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr "Markeer als ongelezen"
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Mijn verkooporders"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Verkooporder zoeken"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Bestelde maand van de verkooporder"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"U dient een prijslijst of een klant in het verkoopscherm te selecteren!\n"
+"Stel een prijslijst in voor het kiezen van een product."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Van een verkooporder"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Fouten negeren"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Afhankelijk van de factuurinstelling van de verkooporder kan de factuur "
+"gebaseerd zijn op bestelde of geleverde hoeveelheden. Dus, een verkooporder "
+"kan een factuur of uitgaande levering genereren zodra deze bevestigd is door "
+"de verkoper."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "De kostenplaatsrekening verbonden met een verkooporder."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Betalingsconditie"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Verkooporders, gereed om te worden gefactureerd"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr "of"
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr "Productomschrijving"
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "Offerte nr."
+
+#. module: sale
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "Korting op regels"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referentie klant"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Verzameld"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Jaar"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Factuur gebaseerd op leveringen"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Totaal incl. BTW"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Gefactureerd"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Besteldatum van de verkooporders"
 
 #~ msgid "Partial Delivery"
 #~ msgstr "Deellevering"
@@ -2383,6 +2189,9 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Recreate Procurement"
 #~ msgstr "Vraag opnieuw aan"
 
+#~ msgid "from stock"
+#~ msgstr "Uit Voorraad"
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Vervolgstappen om een order uit te leveren."
 
@@ -2406,6 +2215,9 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ "In deze stap  wordt de standaard picking policy ingesteld bij het maken van "
 #~ "een verkooporder"
 
+#~ msgid "Validate"
+#~ msgstr "Bevestig"
+
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Na akkoord order direct factureren"
 
@@ -2416,9 +2228,15 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ "Wanneer de 'bevestig' knop is ingedrukt, dan is de concept-status verplaatst "
 #~ "naar een verkooporder"
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Voorraadmutaties"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Handmatig Benoemen"
 
+#~ msgid "Notes"
+#~ msgstr "Opmerkingen"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Factureer na levering"
 
@@ -2437,6 +2255,9 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Procure Method"
 #~ msgstr "Bestelmethode"
 
+#~ msgid "Extra Info"
+#~ msgstr "Extra info"
+
 #~ msgid "Net Price"
 #~ msgstr "Netto-prijs"
 
@@ -2464,9 +2285,21 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "All Sales Order"
 #~ msgstr "Alle verkooporders"
 
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Factuur gebaseerd op verkooporders."
+
 #~ msgid "Sale Shop"
 #~ msgstr "Verkooppunt"
 
+#~ msgid "Warehouse"
+#~ msgstr "Magazijn"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Forceer toewijzing"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Bedrag voor belastingen"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2482,9 +2315,16 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ "Wanneer de instelling 'Automatisch factureren na levering' wordt aangeklikt "
 #~ "dat worden de facturen automatisch aangemaakt na levering."
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Fout !"
+
 #~ msgid "Manual Description"
 #~ msgstr "Handmatige omschrijving"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Hoeveelheid (eenheid)"
+
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
@@ -2497,6 +2337,12 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Packing"
 #~ msgstr "Inpakken"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Bevestig Order"
+
+#~ msgid "Configuration"
+#~ msgstr "Instellingen"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Factureren na levering"
 
@@ -2506,15 +2352,27 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Fout: UOS moet in een andere categorie staan dan de maateenheid"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "Sales orders"
 #~ msgstr "Verkooporders"
 
+#~ msgid "Procurement"
+#~ msgstr "Levering"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Betaalrekeningen"
 
+#~ msgid "Close"
+#~ msgstr "Sluiten"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "concept-factuur"
 
+#~ msgid "All Quotations"
+#~ msgstr "Offerte-aanvragen"
+
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Concept-verkoopfactuure, moet worden nagekeken door administratie"
 
@@ -2524,6 +2382,9 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Procurement for each line"
 #~ msgstr "Levering voor elke regel"
 
+#~ msgid "Order Line"
+#~ msgstr "Orderregel"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "Standaard verpakmethode"
 
@@ -2534,12 +2395,18 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Verkooporder kan niet geannuleerd worden!"
 
+#~ msgid "Packaging"
+#~ msgstr "Verpakking"
+
 #~ msgid "Canceled"
 #~ msgstr "Verwijderd"
 
 #~ msgid "Order Ref"
 #~ msgstr "Order Ref"
 
+#~ msgid "Salesman"
+#~ msgstr "Verkoper"
+
 #~ msgid "Uninvoiced Lines"
 #~ msgstr "Niet-gefactureerde regels"
 
@@ -2570,15 +2437,16 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Stel verkooplogistiek in"
 
-#~ msgid "Status"
-#~ msgstr "Status"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Pakbonnen instellingen"
 
 #~ msgid "Product sales"
 #~ msgstr "Productverkopen"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "invalid mode for test_state"
+
 #~ msgid "Our Salesman"
 #~ msgstr "Onze verkoper"
 
@@ -2588,12 +2456,12 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "One procurement for each product."
 #~ msgstr "Een aanschaffing voor elk product"
 
-#~ msgid "Sale Order"
-#~ msgstr "Verkooporder"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Verkoopprijslijsten"
 
+#~ msgid "Properties"
+#~ msgstr "Waarden"
+
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
@@ -2602,9 +2470,19 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ "geven verkooporder. Deze handeling verplaatst de verkooporder naar de "
 #~ "facturen."
 
+#~ msgid "Compute"
+#~ msgstr "Bereken"
+
 #~ msgid "VAT"
 #~ msgstr "BTW"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Fout"
+
+#~ msgid "Assign"
+#~ msgstr "Toekennen"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Maak factuur"
 
@@ -2614,15 +2492,15 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Sales order lines"
 #~ msgstr "Verkooporderregels"
 
-#~ msgid "Sequence"
-#~ msgstr "Volgorde"
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Uitgaande pakketten aangemaakt voor voorraadartikelen"
 
 #~ msgid "Other data"
 #~ msgstr "Andere data"
 
+#~ msgid "UoM"
+#~ msgstr "Eenheid"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2681,6 +2559,9 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Sale Order Line"
 #~ msgstr "Verkooporderregel"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Annuleer toewijzing"
+
 #~ msgid "Make invoices"
 #~ msgstr "Maak Facturen"
 
@@ -2696,6 +2577,9 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Je kun geen verkooporders verwijderen welke al bevestigd zijn!"
 
+#~ msgid "Name"
+#~ msgstr "Naam"
+
 #~ msgid "New Quotation"
 #~ msgstr "Nieuwe offerte"
 
@@ -2720,6 +2604,9 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Fout, ongeldige EAN-code"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Goederenstromen"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Mijn verkooporders"
 
@@ -2758,6 +2645,9 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ "In de verkooporder, de aanschaf voor elke verkoopregel komt in de "
 #~ "inkooporder."
 
+#~ msgid "Accounting"
+#~ msgstr "Boekhouding"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Ongeldige modelnaam in de actie-definitie."
 
@@ -2770,18 +2660,97 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Related Packing"
 #~ msgstr "Gerelateerde verzending"
 
+#~ msgid "Number Packages"
+#~ msgstr "Aantal pakketten"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Omzet per verkoper in de laatste 90 dagen"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Verkooporder logistiek configureren"
 
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Vooruitbetaling"
 
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "De offerte '%s' is omgezet in een verkooporder."
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Dit is een lijst van elke te factureren verkooporder. U kunt verkooporders "
+#~ "deels factureren, per regel of per order. U heeft deze lijst niet nodig als "
+#~ "u factureert vanaf leveringen of als u alle verkopen factureert."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Verkooporders helpen u bij het beheren van offertes en orders van uw "
+#~ "klanten. OpenERP stelt voor dat u begint met het maken van een offerte. Als "
+#~ "die is bevestigd, wordt de offerte omgezet in verkooporder. OpenERP kan "
+#~ "verschillende soorten producten verwerken zodat een verkooporder taken, "
+#~ "leveringen, productieopdrachten, inkooporders etc. kan aansturen. Gebaseerd "
+#~ "op de configuratie van de verkooporder wordt een concept factuur gegenereerd "
+#~ "zodat u die alleen hoeft te bevestigen als u de klant wilt factureren."
+
+#~ msgid "State"
+#~ msgstr "Status"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Waarschuwing !"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Verwervingsopdracht"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Verzamelbeleid voor verkooporder configureren."
 
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Stuurt verwervingsopdrachten aan voor elke verkooporderregel."
+
+#~ msgid "Conditions"
+#~ msgstr "Voorwaarden"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Omzet per verkoper"
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Pakbon opnieuw maken"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Dit is het aantal dagen dat als veiligheidsmarge wordt toegevoegd aan de "
+#~ "beloofde levertijd."
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "De factuur wordt automatisch gemaakt als het leveringsbeleid 'Factuur van "
+#~ "pakbon' of 'Factuur van order na levering' is."
+
 #~ msgid "Configure"
 #~ msgstr "Configureren"
 
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr ""
+#~ "U probeert een partij toe te wijzen die niet van hetzelfde product is."
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Kon deze verkooporder niet annuleren !"
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -2809,21 +2778,91 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr "De basis verkoop applicatie verbeteren met aanvullende functies."
 
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n.b.)"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "U moet eerst voorraadmutaties annuleren die zijn verbonden met deze "
+#~ "verkooporderregel."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "U kunt geen vooruitbetaling doen bij een verkooporder die is gedefinieerd "
+#~ "als 'Automatisch factuur na levering'."
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Aantal dagen tussen de orderbevestiging en de verzending van de producten "
+#~ "naar de klant"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Selecteer een product van het soort service dat 'Voorschot product' heet. U "
+#~ "moet het wellicht maken en instellen als standaard waarde op dit veld."
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Stel uw verkoop workflow en standaard waarden in."
 
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Orderreferentie moet uniek zijn!"
 
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Verkoop open factuur"
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Bij elke verkooporderregel wordt een verwervingsopdracht gemaakt om in het "
+#~ "verkochte product te voorzien."
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Factuur op order na levering"
 
 #~ msgid "  Year  "
 #~ msgstr "  Jaar  "
 
+#~ msgid "Security Days"
+#~ msgstr "Dagen veiligheidsmarge"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Wilt u echt de facturen aanmaken?"
 
+#~ msgid "Create Final Invoice"
+#~ msgstr "Definitieve factuur maken"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Kan verkooporderregel niet annuleren !"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Omzet per maand"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Verwerving van verkocht materiaal"
+
+#~ msgid "Companies"
+#~ msgstr "Bedrijven"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr ""
+#~ "De naam en adres van de contactpersoon die de order of offerte aangevraagd "
+#~ "heeft."
+
+#~ msgid "References"
+#~ msgstr "Referenties"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Verkooporder data"
 
@@ -2837,25 +2876,79 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr "U kunt geen verkooporderregel annuleren die al gefactureerd is!"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Totaal excl. BTW"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Omzet per klant in laatste 90 dagen"
+
+#~ msgid "Related Picking"
+#~ msgstr "Gekoppelde picking"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Omzet per relatie"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Openstaande factuur"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Verkoop applicatie configuratie"
 
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Gebaseerd op de geleverde of bestelde hoeveelheden."
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Afleveropdracht maken"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Afleveringskosten"
 
 #~ msgid "title"
 #~ msgstr "titel"
 
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Document van de mutatie naar de expeditie of naar de klant."
+
 #~ msgid "Order date"
 #~ msgstr "Orderdatum"
 
+#~ msgid "Procurement Method"
+#~ msgstr "Verwervingswijze"
+
+#~ msgid "Stock Move"
+#~ msgstr "Voorraadmutatie"
+
 #, python-format
 #~ msgid "Picking Information !"
 #~ msgstr "Picking informatie !"
 
+#~ msgid "Create Procurement Order"
+#~ msgstr "Verwervingsopdracht maken"
+
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Factuur van pakbon"
 
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Kan verkooporder niet annuleren !"
+
+#~ msgid "Reference UoM"
+#~ msgstr "Referentie eenheid"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "U moet een klant in het verkooporder formulier selecteren !\n"
+#~ "Kies eerst een klant voordat u een product kiest."
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "U kunt facturen genereren op basis van verkooporder of op basis van "
+#~ "leveringen."
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
@@ -2885,16 +2978,41 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ "De 'Wacht Planning' status wordt gezet als de factuur is bevestigd maar "
 #~ "wacht op de planning te lopen op de 'Bestelde datum'."
 
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Document van de verplaatsing naar de klant."
+
+#~ msgid "Picking Policy"
+#~ msgstr "Verzamelbeleid"
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Picklijst en afleveropdracht"
 
 #~ msgid "Invoicing"
 #~ msgstr "Facturatie"
 
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Er is geen verkoopdagboek gedefinieerd voor dit bedrijf: \"%s\" (id:%d)"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Kan geen verkooporderregel verwijderen die %s is !"
 
+#~ msgid "Logistic"
+#~ msgstr "Logistiek"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "U wilt %.2f %s verkopen maar heeft slechts %.2f %s beschikbaar !\n"
+#~ "De werkelijke voorraad is %.2f %s. (zonder reserveringen)"
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -2916,6 +3034,19 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "    Month-1    "
 #~ msgstr "    Maand-1    "
 
+#~ msgid "Sales by Month"
+#~ msgstr "Omzet per maand"
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Waarschuwing"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Leveringstermijn"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Fout ! U kunt geen recursieve bedrijven maken."
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -2930,28 +3061,70 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ "\n"
 #~ "EAN: %s Aantal: %s Soort: %s"
 
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "De verkooporder '%s' is geannuleerd."
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Een verwervingsopdracht is automatisch gemaakt zodra de verkooporder is "
+#~ "bevestigd of als de factuur is betaald. Het stuurt de inkoop en productie "
+#~ "aan van producten volgens de regels en volgens de verkooporder parameters. "
+
+#~ msgid "Image"
+#~ msgstr "Afbeelding"
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Uw verkoopbeheer applicatie configureren"
 
 #~ msgid "Invoicing journals"
 #~ msgstr "Facturatie dagboek"
 
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "U moet eerst alle facturen annuleren die verbonden zijn met deze "
+#~ "verkooporder."
+
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Verkooporder layout verbetering"
 
+#~ msgid "Packings"
+#~ msgstr "Verpakkingen"
+
 #~ msgid "Ordered Date"
 #~ msgstr "Datum besteld"
 
 #~ msgid "Configuration Progress"
 #~ msgstr "Configuratievoortgang"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "De factuur is met succes gemaakt!"
+
 #~ msgid "Shipped Qty"
 #~ msgstr "Geleverd aantal"
 
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Een verwervingsopdracht voor elke verkooporderregel en voor elk van de "
+#~ "componenten."
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Niet genoeg voorraad !"
 
+#~ msgid "Delivered"
+#~ msgstr "Geleverd"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "U moet een productie partij toewijzen voor dit product"
+
 #~ msgid "Layout Sequence"
 #~ msgstr "Layout volgorde"
 
@@ -2959,6 +3132,18 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "Kan geen verkooporder(s) verwijderen die al bevestigd zijn !"
 
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Als u meer dan één filiaal heeft die uw producten verkopen, kunt u ze vanaf "
+#~ "hier maken en beheren. Steeds als u een nieuwe offerte of verkooporder "
+#~ "vastlegt, moet die gekoppeld zijn aan een filiaal. Het filiaal definieert "
+#~ "ook vanuit welk magazijn de producten worden geleverd voor bepaalde verkopen."
+
 #~ msgid "Adds commitment, requested and effective dates on Sales Orders."
 #~ msgstr ""
 #~ "Voegt toegezegde, gevraagde en werkelijke data toe aan verkooporders."
@@ -2973,6 +3158,9 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Stappen om een verkooporder te leveren."
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Verkooporder aanvraag"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr ""
@@ -3035,8 +3223,481 @@ msgstr "Factuur gebaseerd op leveringen"
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Geeft de mogelijkheid om verzendkosten te berekenen op offertes"
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Indien er onvoldoende voorraad is om alles in een zending te leveren, worden "
+#~ "er dan deelleveringen geaccepteerd?"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Behandelwijze"
 
 #~ msgid "Complete Delivery"
 #~ msgstr "Complete zending"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Verzonden hoeveelheden"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Gebaseerd op taken"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Hoofd werktijd maat"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Gebaseerd op urenstaat"
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "De naam van het bedrijf moet uniek zijn!"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Referentie moet uniek zijn per bedrijf!"
+
+#~ msgid "Month-1"
+#~ msgstr "Maand-1"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Configuratiefout !"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Lever ieder product wanneer beschikbaar"
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Gebaseerd op verkooporders"
+
+#~ msgid "Line Sequence"
+#~ msgstr "Regel volgorde"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Diversen"
+
+#~ msgid "Options"
+#~ msgstr "Opties"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr ""
+#~ "Het si niet mogelijk een verkooporder te verwijderen, welke zich in staat "
+#~ "'%s' bevindt."
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Auto-e-mail bevestigde verkooporders"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Hvh(UoS)"
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Berekend u de levering door?"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Verkooporders aangemaakt in de huidige maand"
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Factureerbeleid"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Verkooporder aangemaakt in huidige jaar"
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Hoofd methode gebaseerd op"
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "Niet genoeg voorraad! "
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Verkooporder aangemaakt laatste maand"
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr ""
+#~ "Dit hulpmiddel zal u helpen de juiste module te installeren en het systeem "
+#~ "te configureren volgens de methode die u gebruikt om uw klanten te "
+#~ "factureren."
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+#~ msgstr ""
+#~ "\n"
+#~ "Hallo ${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Hier is uw orderbevestiging voor ${object.partner_id.name}:\n"
+#~ "       | Order nummer: *${object.name}*\n"
+#~ "       | Order totaal: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order datum: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order referentie: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Uw referentie: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Uw contactpersoon: ${object.user_id.name} "
+#~ "${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "U kan uw orderbevestiging bekijken, downloaden en online betalen, door "
+#~ "gebruik te maken van de volgende link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "Het is ook mogelijk te betalen met Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "Indien u nog vragen heeft, aarzel dan niet om ons te contacteren.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dank u voor het kiezen van  ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "Bij 'maak op bestelling' wordt wanneer de verkooporder is bevestigd een "
+#~ "verwerving gestart, om een taak, inkooporder of productie order te koppelen "
+#~ "aan deze verkooporderregel."
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr ""
+#~ "Het is niet mogelijk om producten te verplaatsen naar een locatie van het "
+#~ "type 'aanzicht'."
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Orderadres"
+
+#~ msgid "States"
+#~ msgstr "Statussen"
+
+#~ msgid "Dates"
+#~ msgstr "Datums"
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Omzet per productcategorie in de laatste 90 dagen"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Omzet per productcategorie"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Verkoopmanager dashboard"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Afhankelijk van de configuratie van de locatie Expeditie, wordt de "
+#~ "verplaatsing tussen de expeditie en de klant gedaan via de afleveropdracht "
+#~ "handmatig of automatisch."
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Stel uw factureerbeleid in"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Fouten in verzendingen"
+
+#~ msgid "Print Order"
+#~ msgstr "Order afdrukken"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "Kon geen prijslijstregel, voor dit product en deze hoeveelheid, vinden welke "
+#~ "voldoet.\n"
+#~ "U dient ofwel het product, de hoeveelheid of de prijslijst te wijzigen."
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "De verzamellijst wordt gemaakt zodra de verkooporder is bevestigd, op "
+#~ "hetzelfde moment als de verwervingsopdracht. Het representeert de toekenning "
+#~ "van onderdelen aan de verkooporder. Er is 1 verzamellijst per "
+#~ "verkooporderregel die ontwikkelt met de beschikbaarheid van onderdelen."
+
+#~ msgid "Create Pick List"
+#~ msgstr "Verzamellijst maken"
+
+#~ msgid "Picking List"
+#~ msgstr "Verzamellijst"
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "Dit is de verzamellijst die door de verkooporder is gegenereerd."
+
+#~ msgid "Pick List"
+#~ msgstr "Verzamellijst"
+
+#~ msgid "Print Quotation"
+#~ msgstr "Offerte afdrukken"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Vooruitbetaling"
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Leveren & Handmatig factureren"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Factuur gebaseerd op leveringen"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Factuur van order na levering"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Lever alle producten tegelijk"
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Hoeveelheid"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Te factureren orderregels"
+
+#~ msgid "on order"
+#~ msgstr "Maak op bestelling"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "Orderverzamel informatie!: "
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "U heeft een hoeveelheid van %d geselecteerd.\n"
+#~ "Maar het is niet in overeenstemming met de gekozen verpakking.\n"
+#~ "Hier is een voorstel van de hoeveelheden, volgens de verpakking:\n"
+#~ "EAN: %s Aantal: %s Type verpakking: %s"
+
+#~ msgid "Incoterm"
+#~ msgstr "Leveringsvoorwaarden"
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Leveringsvoorwaarden of Incoterm wat staat voor 'International Commercial "
+#~ "Terms', staat voor een reeks leveringsvoorwaarden die gebruikt worden in de "
+#~ "commerciële transactie."
+
+#~ msgid "Product UoM"
+#~ msgstr "Product maateenheid"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Er is geen categorie opbrengstrekening gedefinieerd in de standaard "
+#~ "eigenschappen van de productcategorie of fiscale positie niet gedefinieerd !"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "U moet eerst alle uitgaande leveringen bij deze verkooporder annuleren."
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Te factureren uitgaande leveringen"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Gebaseerd op uitgaande leveringen"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Om een ​​bevestigde verkooporder te verwijderen, moet u deze eerst "
+#~ "annuleren! Om een verkooporder te annuleren, moet u eerst de gerelateerde "
+#~ "uitgaande levering annuleren."
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Het factureerbeleid wordt gebruikt om facturatie en uitgaande leveringen te "
+#~ "synchroniseren.\n"
+#~ "  - De 'Vooruitbetaling' keuze genereert eerst de factuur en genereert de "
+#~ "uitgaande leveringen na betaling van de factuur.\n"
+#~ "  - De 'Leveren & Handmatig factureren' keuze maakt de uitgaande leveringen "
+#~ "direct en wacht met het genereren van een concept factuur totdat de "
+#~ "gebruiker de 'Factureren' knop drukt.\n"
+#~ "  - De 'Factuur van order na levering' keuze genereert de concept factuur "
+#~ "gebaseerd op de verkooporder nadat alle verzamelijsten zijn verwerkt. \n"
+#~ "  - De 'Factuur van uitgaande leveringen' keuze wordt gebruikt om een "
+#~ "factuur te maken gedurende het verzamel proces."
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "Geeft de status van de offerte of verkooporder.\n"
+#~ "De foutsituatie wordt automatisch ingesteld wanneer een annuleringsopdracht "
+#~ "plaatsvindt bij de factuurvalidatie (Factureerfout) of in het verzamelproces "
+#~ "(verzendingsfout).\n"
+#~ "De 'Wacht op planner' staat wordt ingesteld wanneer de factuur is bevestigd, "
+#~ "maar wacht deze op de planner, als deze start op de orderdatum."
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Factuur van uitgaande leveringen"
+
+#~ msgid "Delivery Order"
+#~ msgstr "Uitgaande levering"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Terug naar offerte"
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "De verkooporder '%s' is terug gezet in offerte status."
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Er is geen omzetrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Dit geeft aan dat de verkooporder is geleverd. Dit veld wordt alleen "
+#~ "bijgewerkt als de planner is gestart."
diff --git a/addons/sale/i18n/nl_BE.po b/addons/sale/i18n/nl_BE.po
index aa2d38bb69c..884486447e2 100644
--- a/addons/sale/i18n/nl_BE.po
+++ b/addons/sale/i18n/nl_BE.po
@@ -2,25 +2,289 @@
 # Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
+# Els Van Vossel <evv@agaplan.eu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-03-20 15:57+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
+"PO-Revision-Date: 2012-10-01 17:10+0000\n"
+"Last-Translator: Els Van Vossel (Agaplan) <Unknown>\n"
+"Language-Team: Els Van Vossel\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+"Language: nl\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Volgens uurroosters"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Voorschotfactuur"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Offerte bevestigen"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Verkoopdashboard"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hallo${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Hier is uw ${object.state in ('draft', 'sent') and 'offerte' or "
+"'orderbevestiging'} van ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENTIE</strong><br />\n"
+"       &nbsp;&nbsp;Nummer: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Totaal: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Datum: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Referentie: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Uw referentie: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Uw contactpersoon: <a "
+"href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    U kunt de ${object.state in ('draft', 'sent') and 'offerte' or "
+"'orderbevestiging'} bekijken, downloaden en on line betalen met de link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">Document "
+"bekijken</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>U kunt ook via Paypal betalen:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>Neem gerust contact met ons op als u vragen heeft.</p>\n"
+"    <p>Bedankt dat u kiest voor ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Tel.:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr "Te factureren lijnen"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Bevestigingsdatum"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Groeperen op..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -28,23 +292,726 @@ msgid ""
 "Sale Order Lines that are confirmed, done or in exception state and haven't "
 "yet been invoiced"
 msgstr ""
-"Verkooporderlijn in status bevestigd, gereed of uitzondering en die nog niet "
-"zijn gefactureerd"
+"Verkooporderlijnen in status bevestigd, gereed of uitzondering en die nog "
+"niet zijn gefactureerd"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Omzet per verkoper in de afgelopen 90 dagen"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Relatie rechtstr. levering"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr "Order factureren"
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
 msgstr ""
-"Indien er onvoldoende voorraad is om alles in een zending te leveren, worden "
-"er dan deelleveringen geaccepteerd?"
+"Hiermee kunt u aparte leverings- en factuuradressen ingeven op een "
+"verkooporder."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr "Voorschot van %s %s"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr "Contractoptie"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Orderstatus"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+"Hiermee kunt u de contractvoorwaarden van een klant instellen: "
+"factuurmethode\n"
+"            (vaste prijs, volgesn uurrooster, voorschotfactuur), de juiste "
+"prijs\n"
+"            (650€/dag voor een ontwikkelaar), de duur (supportcontract van "
+"een jaar).\n"
+"            U kunt de vooruitgang van het contract opvolgen en automatisch "
+"factureren.\n"
+"            Hiermee wordt de module account_analytic_analysis geïnstalleerd."
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Te factureren"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Meeteenheid"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum waarop verkooporder is bevestigd."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Offertes"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Maart"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr "U moet eerst alle facturen voor deze verkooporder annuleren."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr "Factureer de volledige verkooporder"
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Contract/Analytische rekening"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Factuurdatum"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Niet-gefactureerde en geleverde lijnen"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Het bedrag dat vooruit wordt gefactureerd."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Factuuruitzondering"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr "0"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Voorlopige offerte"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+"U kunt geen vooruitbetaling doen voor een verkooporder die is ingesteld als "
+"'Factuur na levering'."
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Het totale bedrag"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analytische rekening"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr "Facturatie in batch toelaten voor leveringsorders volgens journalen"
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotaal"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr "Mogelijkheid bieden om korting op verkooporderlijn in te stellen"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "Annuleer order"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Gewicht"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "Magazijnopties"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Offerte "
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Meeteenheid "
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr "Ongeldige gegevens"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr "De waarde van het voorschotbedrag moet positief zijn."
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+"Kies Alle om de eindfactuur te maken.\n"
+"                Kies Percentage als u een percentage van het totale bedrag "
+"wilt factureren.\n"
+"                Kies Vaste prijs als u een bepaald bedrag vooraf wilt "
+"factureren.\n"
+"                Kies Bepaalde orderlijnen als u een selectie van "
+"verkooporderlijnen wilt factureren."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Verkooporder"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Berichten"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Btw"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Bedrag excl. btw"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "Project"
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr "Fout"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Nettototaal:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+"Hiermee stelt u in wat de standaardfunctie van een gebruiker is voor een "
+"bepaalde rekening.\n"
+"                Doorgaans wordt dit toegepast bij het invoeren van "
+"uurroosters. De waarden worden automatisch in de juiste velden gezet.\n"
+"                Natuurlijk kunnen deze waarden nog worden aangepast.\n"
+"                Hiermee wordt de module analytic_user_function geïnstalleerd."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Verkooporderlijnen gekoppeld aan een van mijn verkooporders"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Verstuurde offerte"
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+"Als dit is ingeschakeld, zijn er nieuwe berichten die uw aandacht vragen."
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Totaal"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Verkooppunt"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Verkooporders in uitzonderingsstatus"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Factuuradres"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum waarop verkooporder is gemaakt."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr "Onwaar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Factuur opnieuw maken"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Facturen maken"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr "Btw"
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr "Ongeldige actie"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr "Referentiemeeteenheid"
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Bevestigingsdatum"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# lijnen"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+"Bevat de Chatsamenvatting (aantal berichten, ...). Deze samenvatting is in "
+"html-formaat, zodat ze in de kanbanweergave kan worden gebruikt."
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr "Een apart adres voor levering en facturatie toelaten "
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Hvh"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "(bijwerken)"
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr "Hiermee kunt u een korting per verkooporderlijn toepassen"
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Verkooporder"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Hoeveelheid (verk.eenh.)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Afgewerkte verkooporderlijnen"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Voorschotbedrag"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Bevestigd"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr "Een werknemer kan verschillende rollen per contract hebben."
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr "Verkoopvoorwaarden"
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Std. betalingstermijn"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Bevestigen"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr "Ongelezen berichten"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Verzendadres"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Te factureren verkooporderlijnen"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Maandelijkse omzet"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Jaar"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr "Verschillende meeteenheden toelaten"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Onbevestigde verkooporders"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Ongelezen berichten"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr "Afdrukken"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Ordernr."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Orderlijnen"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Korting(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Orderreferentie"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Factuurlijnen"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Totale prijs"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Oude offertes"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+"Hiermee kunt u verkopen en leveringen (ontvangsten) in verschillende "
+"journalen plaatsen,\n"
+"                en batchbewerkingen uitvoeren per journaal.\n"
+"                Hiermee wordt de module sale_journal geïnstalleerd."
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Schakel het vakje in om facturen per klant te groeperen."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Facturen maken"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr "Als gelezen markeren"
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Uur"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr "# verkooporders"
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+"Hiermee past u de analytische weergave aan zodat belangrijke gegevens worden "
+"getoond voor projectleiders van dienstverlenende bedrijven.\n"
+"                U kunt ook het rapport van de analytische rekening per "
+"gebruiker of per maand bekijken.\n"
+"                Hiermee wordt de module account_analytic_analysis "
+"geïnstalleerd."
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Creatiedatum"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Wacht op planner"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Factuuradres voor de huidige verkooporder."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Bestelde hoeveelheden"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Besteljaar van de verkooporder"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr "Beheer verkopen en magazijn"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Hoeveelheid"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Totaal:"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mijn verkopen"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Ongeldige actie"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiscale positie"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr "Meerdere analytische rekeningen voor verkopen"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "Standaardopties"
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr "Configuratiefout"
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr "Verkopen analytisch boeken"
 
 #. module: sale
 #: view:sale.order:0
@@ -52,120 +1019,356 @@ msgid "UoS"
 msgstr "VK-eenh."
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Leveringsadres voor de huidige verkooporder."
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+"Klik op 'Te factureren lijnen weergeven' en selecteer vervolgens de lijnen "
+"die u wilt factureren. Maak de factuur via het menu 'Extra'."
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Hoeveelheid"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Dag"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Annuleer order"
-
-#. module: sale
-#: code:addons/sale/sale.py:638
+#: code:addons/sale/edi/sale_order.py:151
 #, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "De offerte '%s' is omgezet in een verkooporder."
+msgid "EDI Pricelist (%s)"
+msgstr "EDI-prijslijst (%s)"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Offerte afdrukken"
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik als u een offerte of verkooporder voor deze klant wilt "
+"maken.\n"
+"              </p><p>\n"
+"                Met OpenERP handelt u de volledige verkoopflow efficiënt "
+"af:\n"
+"                offerte, order, levering, facturatie en\n"
+"                betaling.\n"
+"              </p><p>\n"
+"                Met de sociale opties kunt u discussies voeren op een order\n"
+"                en zo uw klant een zicht geven op de evolutie van de "
+"verkooporder.\n"
+"              </p>\n"
+"            "
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr "Waarschuwing"
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr "Facturatiewijze"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Tax"
-msgstr ""
+msgid "Quotation Date"
+msgstr "Offertedatum"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Stuurt verwervingsopdrachten aan voor elke verkooporderlijn."
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Besteldatum"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analytische rekening"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+#: help:sale.order,order_policy:0
 msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
-"Dit is een lijst van elke te factureren verkooporder. U kunt verkooporders "
-"deels factureren, per regel of per order. U heeft deze lijst niet nodig als "
-"u factureert vanaf leveringen of als u alle verkopen factureert."
+"Dit veld bepaalt hoe de factuur- en leveringsoperaties worden "
+"gesynchroniseerd.\n"
+"  - Met 'Voor levering' wordt een voorlopige factuur gemaakt die moet worden "
+"betaald voordat kan worden geleverd."
 
 #. module: sale
-#: code:addons/sale/sale.py:295
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr "Verkooporder afgewerkt."
+
+#. module: sale
+#: code:addons/sale/sale.py:320
 #, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr "Stel een verkoopdagboek in voor dit bedrijf: \"%s\" (id:%d)."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Offertes en verkopen"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
 msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+"Allows you to select and maintain different units of measure for products."
 msgstr ""
-"Als u een bevestigde verkooporder wilt verwijderen, moet u deze eerst "
-"annuleren. Om een verkooporder te kunnen annuleren, moeten eerst alle "
-"gekoppelde zendnota's of leveringsnota's worden geannuleerd."
+"Hiermee kunt u verschillende meeteenheden kiezen en instellen voor producten."
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Verwervingsopdracht"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "Relatie"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Factuur op basis van zendnota's"
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr "Factuur maken en bekijken"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Orderlijn"
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr "Verkooporder voor <em>%s</em> is <b>afgewerkt</b>"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
+#: model:ir.actions.act_window,help:sale.action_shop_form
 msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"Verkooporders helpen u bij het beheren van offertes en orders van uw "
-"klanten. OpenERP stelt voor dat u begint met het maken van een offerte. Als "
-"die is bevestigd, wordt de offerte omgezet in een verkooporder. OpenERP kan "
-"verschillende soorten producten verwerken zodat een verkooporder taken, "
-"leveringen, productieopdrachten, aankooporders enz. kan aansturen. Gebaseerd "
-"op de configuratie van de verkooporder wordt een conceptfactuur gegenereerd, "
-"die u alleen hoeft te bevestigen als u de klant wilt factureren."
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik als u een nieuw verkooppunt wilt instellen.\n"
+"              </p><p>\n"
+"                Elke offerte of verkooporder moet aan een verkooppunt worden "
+"gekoppeld. Het\n"
+"                verkooppunt bepaalt ook het magazijn van waaruit de "
+"producten worden geleverd.\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Verkoopfactuur maken"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik om een offerte te maken, de eerste stap naar een nieuwe "
+"verkoop.\n"
+"              </p><p>\n"
+"                Met OpenERP handelt u de volledige verkoopflow efficiënt "
+"af:\n"
+"                offerte, order, levering, facturatie en\n"
+"                betaling.\n"
+"              </p><p>\n"
+"                Met de sociale opties kunt u discussies voeren op een order\n"
+"                en zo uw klant een zicht geven op de evolutie van de "
+"verkooporder.\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Korting (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Factuur kan niet worden gemaakt voor deze verkooporderregel omdat:\\n\n"
+"1. de status van deze verkooporder \\\"concept\\\" is of \\\"geannuleerd\\"
+"\"\\n\n"
+"2. de verkooporderlijn al is gefactureerd."
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+"Er is geen fiscale positie ingesteld of er is geen opbrengstenrekening "
+"ingesteld voor de productcategorie."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Afgewerkte verkooporderlijnen"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mijn offertes"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr "Verkooporder factureren"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "December"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr "Contractbeheer"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Verzonden"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Maand"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Order (Ref. ${object.name or 'nvt' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Volgorde"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "Een verkooporder zonder orderlijnen kan niet worden bevestigd."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Niet gefactureerd"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Productcategorie"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr "Kan verkooporder niet annuleren"
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr "Geeft aan dat er voor de verkooporder tenminste een factuur bestaat."
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr "Bericht"
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr "Waarschuwingen instellen per klant of product"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Naam verkooppunt"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+"U kunt een bevestigde verkooporder pas verwijderen als u deze eerst "
+"annuleert."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Btw:"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr "Factuur is <b>betaald</b>."
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr "Verkopen analytisch boeken"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Voorschotfactuur"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr "Het verkoopmenu openen"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "In behandeling"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Geen klant gedefinieerd"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Facturen maken"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -183,1316 +1386,10 @@ msgstr ""
 "verbonden taken."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Std. betalingstermijn"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Volgens zendnota's"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "Hoofdeenheid werktijd"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Status"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Korting(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Totale prijs"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Schakel het vakje in om facturen per klant te groeperen."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mijn verkooporders"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Bestelde hoeveelheden"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Omzet per verkoper"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Voorraadbewegingen"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Orderreferentie"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Overige informatie"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Datums"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"De factuur wordt automatisch gemaakt als het leveringsbeleid 'Factuur van "
-"zendnota' of 'Factuur volgens order na levering' is."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "Volgens taakwerk"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Offertes en verkopen"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Verkoopfactuur maken"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr "Prijslijstwaarschuwing"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Korting (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mijn offertes"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Verkoopmanagerdashboard"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Verpakking"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Van een verkooporder"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Naam verkooppunt"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Het factuurbeleid wordt gebruikt om facturatie- en leveringsbewerkingen te "
-"synchroniseren.\\n\n"
-"  - De optie 'Vooruitbetaling' genereert eerst de factuur en de zendnota pas "
-"na betaling van de factuur.\\n\n"
-"  - De optie 'Leveren & Handmatig factureren' maakt de zendnota direct en "
-"wacht met het genereren van een conceptfactuur totdat de gebruiker op de "
-"knop 'Factureren' klikt.\\n\n"
-"  - De optie 'Factuur volgens order na levering' genereert de conceptfactuur "
-"gebaseerd op de verkooporder, nadat alle zendnota's gereed zijn.\\n\n"
-"  - De optie 'Factuur van zendnota' wordt gebruikt om een factuur te maken "
-"gedurende het verzamelproces."
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Geen klant gedefinieerd"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Verkooporders met uitgestelde levering"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "Configuratiefout"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Voorwaarden"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Er is geen opbrengstrekening gedefinieerd in de standaardeigenschappen van "
-"de productcategorie of de fiscale positie is niet ingesteld."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Augustus"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "U probeert een lot toe te kennen van een ander product."
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "invalid mode for test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juni"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Kan verkooporder niet annuleren"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Verkooporderstatistieken"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "De analytische rekening van een verkooporder."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "De referentie moet uniek zijn."
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Offertes"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Prijslijst voor deze verkooporder."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "Btw:"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Aantal dagen tussen de orderbevestiging en de verzending van de producten "
-"naar de klant."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Offertedatum"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiscale positie"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "Eenh."
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Aantal pakketten"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "In behandeling"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"De verkoper bevestigt de offerte. De status van de verkooporder wordt 'In "
-"behandeling' of 'Handmatig'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr "U kunt geen verkooporderlijn annuleren die al is gefactureerd."
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"U moet eerst voorraadbewegingen annuleren die zijn gekoppeld aan deze "
-"verkooporderlijn."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n.b.)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Selecteer een product van het type Dienst dat 'Voorschotproduct' heet. U "
-"moet dit product wellicht eerst maken en instellen als standaardwaarde voor "
-"dit veld."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"U kunt geen vooruitbetaling doen voor een verkooporder die is ingesteld als "
-"'Factuur na levering'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Opmerkingen"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "De firmanaam moet uniek zijn"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Factuuradres voor de huidige verkooporder."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Maand-1"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Bestelmaand van verkooporder"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"U kunt geen verkopen met verschillende munten groeperen voor een relatie."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Elk product leveren bij beschikbaarheid"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Gefactureerd"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Leveringsorder"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Bevestigingsdatum"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Relatie rechtstr. levering"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Maart"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr "U kunt producten niet van of naar een weergavelocatie verplaatsen."
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Volgens zendnota's"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Het totale bedrag"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotaal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Factuuradres:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "Lijnvolgorde"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Voor elke verkooporderlijn wordt een verwervingsopdracht gemaakt om het "
-"verkochte product te bestellen."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm ('International Commercial Terms') staat voor een reeks "
-"verkoopvoorwaarden die worden gebruikt in de commerciële transactie."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Factuuradres"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Niet-gefactureerde lijnen zoeken"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Offerte / Order"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# lijnen"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Openstaande verkoopfactuur"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Verkooporderlijn"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazijn"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Ordernr."
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Orderlijnen"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Bedrag excl. btw"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Te factureren lijnen"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Hoeveelheid (eenh.)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Creatiedatum"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Diversen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Niet-gefactureerde en geleverde lijnen"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Totaal:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Mijn verkopen"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Ongeldige actie"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Extra informatie"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Prijslijst"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Hvh"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "Uur"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Besteldatum"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Verzonden"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Alle offertes"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "Opties"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Een verkooporder zonder orderlijnen kan niet worden bevestigd."
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"U moet een prijslijst of een klant kiezen in het verkoopformulier.\n"
-"Gelieve dit te doen voordat u een product kiest."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Productcategorie"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Btw:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Voorraadbewegingen"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Orderstatus"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Verkopen per maand"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Kan verkooporderlijn niet annuleren"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Veiligheidsmarge"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Verwerving van verkochte goederen"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Definitieve factuur maken"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Verzendadres"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Dit geeft aan dat de verkooporder is geleverd. Dit veld wordt alleen "
-"bijgewerkt als de planner heeft gelopen."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Datum"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Uitgebreide filters..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Uitzondering"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Bedrijven"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-"Geeft de status van de offerte of verkooporder. \\n\n"
-"Status Uitzondering wordt automatisch ingesteld als er een fout optreedt "
-"voor een factuur(Factuuruitzondering) of een zendnota "
-"(Leveringsuitzondering). \\n\n"
-"De 'Wacht op Planner' status wordt ingesteld als de factuur is bevestigd, "
-"maar wacht op de planner die op de 'Bestelde datum' zal lopen."
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Geen geldige prijslijstlijn gevonden"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Historiek"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Factuur volgens order na levering"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Dit is de lijst van facturen die zijn gegenereerd voor deze verkooporder. "
-"Dezelfde verkooporder kan in meerdere keren zijn gefactureerd (bijvoorbeeld "
-"per lijn)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Uw referentie"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-"Naam en adres van de contactpersoon die de order of offerte heeft "
-"aangevraagd."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Dit is het aantal dagen dat als veiligheidsmarge wordt toegevoegd aan de "
-"beloofde levertijd."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Hvh"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referenties"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Mijn verkooporderlijnen"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Annuleren"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "De referentie moet uniek zijn."
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Factuur maken"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Totaal excl. btw"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Orderreferentie"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "De factuur is met succes gemaakt."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Verkopen per relatie"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Orderadres"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Openstaande factuur"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr "Automatisch via e-mail bevestigde verkooporders"
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Er is geen verkoopdagboek gedefinieerd voor deze firma: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Reservering afdwingen"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Op bestelling"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Volgens verzonden of bestelde aantallen."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Alle producten tegelijk leveren"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Gekoppelde zendnota"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Naam"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Verzendadres:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Omzet per klant in de afgelopen 90 dagen"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Conceptstatus van verkooporder"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Leveringsorder maken"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr "Een verkooporderlijn die %s is, kan niet worden verwijderd."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "Hvh (VK)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Totaal incl. btw"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Zendnota maken"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Besteldatum van verkooporder"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Verkopen per productcategorie"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Offerte bevestigen"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Fout"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Groeperen op..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Factuur opnieuw maken"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Te factureren leveringen"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Volgende planning"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Verwervingswijze"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Zendnota"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Terugzetten naar Voorlopig"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Document van de verplaatsing naar de verzendzone of naar de klant."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-"\n"
-"Hallo${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Hierbij vindt u uw orderbevestiging voor ${object.partner_id.name}:\n"
-"       | Ordernummer: *${object.name}*\n"
-"       | Ordertotaal: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Orderdatum: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Orderreferentie: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Uw referentie: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Uw contactpersoon: ${object.user_id.name} "
-"${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"U kunt de orderbevestiging bekijken of downloaden, of on line betalen via de "
-"volgende link:\n"
-"    ${ctx.get('edi_web_url_view') or 'nvt'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"U kunt ook onmiddellijk via Paypal betalen:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"Neem gerust contact met ons op als u vragen heeft.\n"
-"\n"
-"\n"
-"Bedankt dat u kiest voor ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Goedkeuren"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Order bevestigen"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Verwervingsopdracht maken"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Btw"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Te factureren verkooporders"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datum waarop verkooporder is gemaakt."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Voorraadbeweging"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Facturen maken"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Verkooporders gemaakt in deze maand"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-"Als 'op bestelling' worden gebruikt, wordt een herbevoorrading gestart bij "
-"bevestiging van het verkooporder: er wordt een taak, een aankooporder of een "
-"productiebon gemaakt voor de verkooporderlijn."
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Voorschotbedrag"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "Rekent u het transport aan?"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Verzonden hoeveelheden"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Factuur volgens verkooporder"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Als u de prijslijst van dit order (en eventueel de munt) wijzigt, worden de "
-"prijzen van de bestaande orderlijnen niet bijgewerkt."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Zendnota"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Fout"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Kan verkooporder niet annuleren"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "Hvh (eenh.)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Besteljaar van de verkooporder"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Bevoorrading"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Verzenduitzondering"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "Verzendinformatie "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Facturen groeperen"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "Factuurbeleid"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "Stel uw factuurmethode in"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Door de boekhouder te controleren."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referentie-eenheid"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-"Hiermee kiest u de juiste module en stelt u het systeem in volgens de "
-"methode die u gebruikt om uw klanten te factureren."
+msgid "Advance of %s %%"
+msgstr "Voorschot van %s %%"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
@@ -1500,14 +1397,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Factuur maken van verkooporderlijnen"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Factuuruitzondering"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Stuurt de verwervingen en facturatie"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Concept"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1515,574 +1407,10 @@ msgid "Paid"
 msgstr "Betaald"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Verkoopanalyse"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
-"U heeft een aantal van %d stuks geselecteerd.\\n\n"
-"Dat is echter niet verenigbaar met de geselecteerde verpakking.\\n\n"
-"Hier is een voorstel van aantallen volgens de verpakking:\n"
-"EAN: %s Aantal: %s Soort: %s"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Zendnota opnieuw maken"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Eigenschappen"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Offerte"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"De verkoper maakt zelf een factuur als verkooporder leveringsmethode "
-"'Levering en handmatige factuur' is. De factuur wordt automatisch gemaakt "
-"als de leveringsmethode 'Vooruitbetaling' is."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"U kunt facturen maken op basis van verkooporder of op basis van leveringen."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Bevestigde verkooporderlijnen, nog niet geleverd"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Verkoopfacturen"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Verkoop"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Eenheidsprijs"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Gereed"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Factuur"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"U moet een klant kiezen in het verkoopformulier.\n"
-"Gelieve dit te doen voordat u een product kiest."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Brondocument"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Nog te doen"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Verzendbeleid"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Document voor de verplaatsing naar de klant."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Bedrag zonder btw"
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr "U moet eerst alle zendnota's voor deze verkooporder annuleren."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Voorschotfactuur"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Maand"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Order (Ref. ${object.name or 'nvt' })"
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Product"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Reservering annuleren"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Maandelijkse omzet"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Factureer op"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Besteldatum"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Productverkoopeenheid"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Handmatig"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Producteenheid"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistiek"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Order"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"Er is geen opbrengstenrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Uitzondering negeren"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Afhankelijk van de facturatiemethode van de verkooporder kan de factuur "
-"gebaseerd zijn op bestelde of geleverde aantallen. Hierdoor kan een "
-"verkooporder een factuur of leveringsopdracht maken zodra de order wordt "
-"bevestigd door de verkoper."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"U wilt %.2f %s verkopen, maar er zijn slechts %.2f %s beschikbaar.\\n\n"
-"De werkelijke voorraad is %.2f %s (zonder reserveringen)."
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Statussen"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referentie klant"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Totaal"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Prijs"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Afhankelijk van de configuratie van de verzendlocatie (output), gebeurt de "
-"verplaatsing tussen de verzendlocatie en de klant via de zendnota manueel of "
-"automatisch."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Vooruitbetaling"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Verkoopdashboard"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Facturen maken"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Te factureren"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datum waarop verkooporder is bevestigd."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "Contract/Analytische rekening"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Bedrijf"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Factuurdatum"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Het bedrag dat vooruit wordt gefactureerd."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"Geen prijslijstlijn gevonden voor dit product en deze hoeveelheid.\n"
-"U moet het product, de hoeveelheid of de prijslijst veranderen."
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "Dit is de lijst van zendnota's die voor deze verkoop zijn gemaakt."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Facturen maken"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Nettototaal:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Geannuleerd"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Verkooporderlijnen gekoppeld aan een van mijn verkooporders"
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Verkooppunt"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Bevestigingsdatum"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Waarschuwing"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Verkopen per maand"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Verkooporder"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Hoeveelheid (verk.eenh.)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Afgewerkte verkooporderlijnen"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"De zendnota wordt gemaakt zodra de verkooporder is bevestigd, op hetzelfde "
-"moment als de verwervingsopdracht. Het representeert de toekenning van "
-"onderdelen aan de verkooporder. Er is 1 zendnota per verkooporderregel die "
-"ontwikkelt volgens de beschikbaarheid van onderdelen."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Bevestigd"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "Hoofdmethode volgens"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Bevestigen"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "U kunt niet dezelfde bedrijven maken."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Omzet per productcategorie in de afgelopen 90 dagen"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Factuurlijnen"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Verkooporderlijnen"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Leveringstermijn"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuratie"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI-prijslijst (%s)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr "Order afdrukken"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Verkooporders gemaakt in dit jaar"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Factuur kan niet worden gemaakt voor deze verkooporderregel omdat:\\n\n"
-"1. de status van deze verkooporder \\\"concept\\\" is of \\\"geannuleerd\\"
-"\"\\n\n"
-"2. de verkooporderregel al is gefactureerd."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Afgewerkte verkooporderlijnen"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Gewicht"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturen"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "December"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Afbeelding"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Een verwervingsopdracht is automatisch gemaakt zodra de verkooporder is "
-"bevestigd of als de factuur is betaald. Het stuurt de aankoop en productie "
-"aan van producten volgens de regels en volgens de verkooporderparameters. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Niet gefactureerd"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Verkoper"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Oude offertes"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Bedrag excl. btw"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Voorschotfactuur"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "Verkooporder '%s' is geannuleerd."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Concept"
+"Toont de volgorde bij het weergeven van een lijst van verkooporderlijnen."
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -2107,6 +1435,18 @@ msgstr ""
 "* De status 'Geannuleerd' betekent dat gebruiker de verkooporder heeft "
 "geannuleerd."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Verkooporders"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Facturen groeperen"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2114,56 +1454,185 @@ msgstr "Btw-bedrag"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Zendnota's"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Te factureren verkooporderlijnen"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Verkooporders gemaakt in de afgelopen maand"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr "Op verzoek"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Augustus"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr "Verkooporder "
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Stuurt de verwervingen en facturatie"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klik om een offerte te maken die kan worden omgezet in een "
+"verkooporder.\n"
+"              </p><p>\n"
+"                Met OpenERP handelt u de volledige verkoopflow efficiënt "
+"af:\n"
+"                offerte, order, levering, facturatie en betaling.\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juni"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "E-mailsjablonen"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Verkooporders"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Order"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr "Offerte voor <em>%s</em> <b>omgezet</b> naar verkooporder van %s %s."
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr "We moeten een configuratiewizard maken voor deze twee velden"
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Is een volger"
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Prijslijstwaarschuwing"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Verkooppunt"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Verkooporderstatistieken"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Verkooporderlijn"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "November"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Uitgebreide filters..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr "Waarschuwing"
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr "Commentaar en e-mails"
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Voorschotproduct"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Berekenen"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Uitzondering"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr "U moet eerst alle facturen voor deze verkooporder annuleren."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"De verkoper maakt zelf een factuur als verkooporder leveringsmethode "
+"'Levering en handmatige factuur' is. De factuur wordt automatisch gemaakt "
+"als de leveringsmethode 'Vooruitbetaling' is."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+"Hiermee maakt u een offerte, een verkooporder met verschillende bestelwijzen "
+"en voorraadopvolging.\n"
+"                    Hiermee wordt de module sale_stock geïnstalleerd."
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+"Selecteer een product van het type Dienst dat 'Voorschotproduct' heet.\n"
+"\t\t\t  U moet dit product wellicht eerst maken en instellen als "
+"standaardwaarde voor dit veld."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2175,6 +1644,41 @@ msgstr "Januari"
 msgid "Sales Order in Progress"
 msgstr "Lopende verkooporders"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr "Samenvatting"
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr "Facturen voorbereiden op basis van uurroosters"
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr "Verkooporder voor <em>%s</em> <b>geannuleerd</b>."
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr "Wat wilt u factureren?"
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr "Gebruik prijslijsten als u specifieke prijzen per klant wilt"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"De verkoper bevestigt de offerte. De status van de verkooporder wordt 'In "
+"behandeling' of 'Handmatig'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
@@ -2182,89 +1686,307 @@ msgstr ""
 "Referentie van het document op basis waarvan deze verkooporder is gemaakt."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Geen geldige prijslijstlijn gevonden"
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+"Hiermee kunt u waarschuwingen instellen voor producten en deze weergeven als "
+"een gebruiker een bepaald product aan een klant wilt verkopen.\n"
+"            Voorbeeld: Product: dit product is verouderd, gelieve er maximum "
+"5 te kopen.\n"
+"            Leverancier: vraag om een snelle levering."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Vertraging"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "Leveren & factureren op verzoek"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Bevestigde verkooporderlijnen, nog niet geleverd"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "Historiek"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr "Marges in verkooporder weergeven"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
-"Een verwervingsopdracht voor elke verkooporderlijn en voor elk van de "
-"componenten."
+"Dit is de lijst van facturen die zijn gegenereerd voor deze verkooporder. "
+"Dezelfde verkooporder kan in meerdere keren zijn gefactureerd (bijvoorbeeld "
+"per lijn)."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Toewijzen"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Uw referentie"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr "Te factureren lijnen weergeven"
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Besteldatum"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prijslijst"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "Btw:"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Verkoopfacturen"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Te factureren verkooporders"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Onbevestigde verkooporders"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Verkooporderlijnen"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Verkoop"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "Verkooporder '%s' bevindt zich in conceptstatus."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Als u de prijslijst van dit order (en eventueel de munt) wijzigt, worden de "
+"prijzen van de bestaande orderlijnen niet bijgewerkt."
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "uit voorraad"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Dag"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Sluiten"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturen"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Eenheidsprijs"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Gereed"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Factuuradres:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Factuur"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Mijn verkooporderlijnen"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Annuleren"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr "Volgers"
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "Geen prijslijst "
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Geleverd"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Offerte"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "U moet een productielot toekennen aan dit product"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Niet-gefactureerde lijnen zoeken"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr "account.config.settings"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "De referentie moet uniek zijn."
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"Als uw producten in meer dan een verkooppunt worden verkocht, kunt u hier "
-"verkooppunten maken en beheren. Elke nieuwe offerte of verkooporder moet "
-"zijn gekoppeld aan een verkooppunt. Het verkooppunt bepaalt ook vanuit welk "
-"magazijn de producten worden geleverd."
+"<p>\n"
+"                Hier is een lijst van alle te factureren verkooporderlijnen. "
+"U kunt\n"
+"                verkooporders gedeeltelijk factureren, per lijn. U heeft "
+"deze\n"
+"                lijst niet nodig als u factureert van zendnota of als u "
+"alles factureert.\n"
+"              </p>\n"
+"            "
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr "Productopties"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Nog te doen"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Verzendadres:"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"U kunt geen verkopen met verschillende munten groeperen voor een relatie."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr "Voorlopige factuur van %s %s <b>wacht op goedkeuring</b>."
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr "Gebruik contractbeheer"
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+"Geen prijslijstlijn gevonden voor dit product en deze hoeveelheid.\n"
+"U moet het product, de hoeveelheid of de prijslijst veranderen."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Verkoopanalyse"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Prijslijst voor deze verkooporder."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Factuur maken"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Bedrag zonder btw"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Orderreferentie"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2272,61 +1994,70 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Geeft aan dat de factuur is betaald."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr "U kunt geen verkooporderlijn annuleren die al is gefactureerd."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr "Percentage"
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr "Verkoper"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Product"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr "%"
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Omschrijving"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+"Er is geen opbrengstenrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Mei"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Klant"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Voorschot"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Februari"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "April"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Boekhouding"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Verkooporders zoeken"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Verkoopofferte"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
-msgstr "Onvoldoende voorraad "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+"Gelieve een opbrengstenrekening in te stellen voor dit product: \"%s\" "
+"(id:%d)."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Betalingstermijn"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Prijs"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2343,49 +2074,490 @@ msgstr ""
 "verkopen. Als u uw omzet wilt analyseren, moet u Factuuranalyse gebruiken in "
 "de boekhouding."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+"Geeft de status van de offerte of verkooporder. \\n\n"
+"Status Uitzondering wordt automatisch ingesteld als er een fout optreedt "
+"voor een factuur (Factuuruitzondering).\n"
+"De 'Wacht op Planner' status wordt ingesteld als de factuur is bevestigd, "
+"maar wacht op de planner die op de 'Bestelde datum' zal lopen."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel.:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Wilt u de factuur (facturen) maken?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Overige informatie"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr "sale.group_delivery_invoice_address"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Hvh"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Door de boekhouder te controleren."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr "Via e-mail versturen"
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr "Eigenschappen per lijn"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Leveringsadres voor de huidige verkooporder."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr "Te factureren verkopen"
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Offerte / Order"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr "Postvak IN"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Klant"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Voorschot"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Februari"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Factureer op"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr "Vaste prijs (aanbetaling)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr "Er is geen opbrengstenrekening ingesteld als een globaal kenmerk."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Besteldatum"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Productverkoopeenheid"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+"Hiermee kunt u een analytische rekening meegeven op een verkooporder."
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Conceptstatus van verkooporder"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Brondocument"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "April"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Handmatig"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr "Als ongelezen markeren"
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr "Offerte voor <em>%s</em> <b>is gemaakt</b>."
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr "Adressen in verkooporders"
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr "De standaardwerkeenheid voor diensten is"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Mijn verkooporders"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr "Factuur volgens verkooporderlijnen instellen"
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr "Berichten en communicatiehistoriek"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Verkooporders zoeken"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+"Gebruik contracten als u uw dienstverlening wilt opvolgen met\n"
+"                        meerdere facturen op hetzelfde contract met\n"
+"                        uw klant."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Bestelmaand van verkooporder"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"U moet een prijslijst of een klant kiezen in het verkoopformulier.\n"
+"Gelieve dit te doen voordat u een product kiest."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Van een verkooporder"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Uitzondering negeren"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Afhankelijk van de facturatiemethode van de verkooporder kan de factuur "
+"gebaseerd zijn op bestelde of geleverde aantallen. Hierdoor kan een "
+"verkooporder een factuur of leveringsopdracht maken zodra de order wordt "
+"bevestigd door de verkoper."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr "Enkele orderlijnen"
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr "Een verkooporderlijn die %s is, kan niet worden verwijderd."
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "De analytische rekening van een verkooporder."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Betalingstermijn"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Te factureren verkooporders"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr "Hiermee wordt de module sale_analytic_plans geïnstalleerd."
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr "Productomschrijving"
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+"Hiermee kunt u verschillende % fprijzen toepassen volgens regels per "
+"klantencategorie.\n"
+"                Voorbeeld: 10% voor kleinhandelaars, promotie van 5 EUR voor "
+"een product, enz."
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Offertenr."
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr "Korting per lijn"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referentie klant"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Geleverd"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Jaar"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
+"Hiermee wordt de 'Marge' toegevoegd per verkooporder.\n"
+"                Dit toont de winst op basis van het verschil tussen "
+"eenheidsprijs en kostprijs.\n"
+"                Hiermee wordt de module sale_margin geïnstalleerd."
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Factuur op basis van zendnota's"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+"Kies eerst een klant in het verkoopformulier,\n"
+" en dan pas een product."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Totaal incl. btw"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Gefactureerd"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+"Kies hoe u deze order wilt factureren. Er\n"
+"                        wordt een voorlopige factuur gemaakt die nog kan "
+"worden aangepast\n"
+"                        voor goedkeuring."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Besteldatum van verkooporder"
 
 #~ 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 "Sales by Salesman in last 90 days"
+#~ msgstr "Omzet per verkoper in de afgelopen 90 dagen"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Geeft de mogelijkheid om verzendkosten te berekenen op offertes"
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Indien er onvoldoende voorraad is om alles in een zending te leveren, worden "
+#~ "er dan deelleveringen geaccepteerd?"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Verkooporderlogistiek instellen"
 
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "De offerte '%s' is omgezet in een verkooporder."
+
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Vooruitbetaling"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Waarschuwing"
+
 #~ msgid "VAT"
 #~ msgstr "Btw"
 
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Stuurt verwervingsopdrachten aan voor elke verkooporderlijn."
+
 #~ msgid "All at Once"
 #~ msgstr "Complete leveringen"
 
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Dit is een lijst van elke te factureren verkooporder. U kunt verkooporders "
+#~ "deels factureren, per regel of per order. U heeft deze lijst niet nodig als "
+#~ "u factureert vanaf leveringen of als u alle verkopen factureert."
+
+#~ msgid "Procurement Order"
+#~ msgstr "Verwervingsopdracht"
+
+#~ msgid "Order Line"
+#~ msgstr "Orderlijn"
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Verkooporders helpen u bij het beheren van offertes en orders van uw "
+#~ "klanten. OpenERP stelt voor dat u begint met het maken van een offerte. Als "
+#~ "die is bevestigd, wordt de offerte omgezet in een verkooporder. OpenERP kan "
+#~ "verschillende soorten producten verwerken zodat een verkooporder taken, "
+#~ "leveringen, productieopdrachten, aankooporders enz. kan aansturen. Gebaseerd "
+#~ "op de configuratie van de verkooporder wordt een conceptfactuur gegenereerd, "
+#~ "die u alleen hoeft te bevestigen als u de klant wilt factureren."
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Verzendbeleid voor verkooporder configureren"
 
+#~ msgid "State"
+#~ msgstr "Status"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Reservering afdwingen"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Omzet per verkoper"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Voorraadbewegingen"
+
+#~ msgid "Dates"
+#~ msgstr "Datums"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "De factuur wordt automatisch gemaakt als het leveringsbeleid 'Factuur van "
+#~ "zendnota' of 'Factuur volgens order na levering' is."
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Zendnota opnieuw maken"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Dit is het aantal dagen dat als veiligheidsmarge wordt toegevoegd aan de "
+#~ "beloofde levertijd."
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Verkoopmanagerdashboard"
+
+#~ msgid "Packaging"
+#~ msgstr "Verpakking"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Terugzetten naar Voorlopig"
+
+#~ msgid "Conditions"
+#~ msgstr "Voorwaarden"
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -2410,30 +2582,152 @@ msgstr "Factuur op basis van zendnota's"
 #~ "  - De optie 'Factuur van zendnota' wordt gebruikt om een factuur te maken "
 #~ "gedurende het verzamelproces."
 
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Er is geen opbrengstrekening gedefinieerd in de standaardeigenschappen van "
+#~ "de productcategorie of de fiscale positie is niet ingesteld."
+
 #~ msgid "Configure"
 #~ msgstr "Instellen"
 
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "U probeert een lot toe te kennen van een ander product."
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "invalid mode for test_state"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Kan verkooporder niet annuleren"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Alleen leveringsopdracht"
 
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Aantal dagen tussen de orderbevestiging en de verzending van de producten "
+#~ "naar de klant."
+
+#~ msgid "UoM"
+#~ msgstr "Eenh."
+
+#~ msgid "Number Packages"
+#~ msgstr "Aantal pakketten"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "U moet eerst voorraadbewegingen annuleren die zijn gekoppeld aan deze "
+#~ "verkooporderlijn."
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n.b.)"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Selecteer een product van het type Dienst dat 'Voorschotproduct' heet. U "
+#~ "moet dit product wellicht eerst maken en instellen als standaardwaarde voor "
+#~ "dit veld."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "U kunt geen vooruitbetaling doen voor een verkooporder die is ingesteld als "
+#~ "'Factuur na levering'."
+
+#~ msgid "Notes"
+#~ msgstr "Opmerkingen"
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr "Voeg extra mogelijkheden toe aan uw verkoopbeheer."
 
+#~ msgid "Delivery Order"
+#~ msgstr "Leveringsorder"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "De orderreferentie moet uniek zijn."
 
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Voor elke verkooporderlijn wordt een verwervingsopdracht gemaakt om het "
+#~ "verkochte product te bestellen."
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm ('International Commercial Terms') staat voor een reeks "
+#~ "verkoopvoorwaarden die worden gebruikt in de commerciële transactie."
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Openstaande verkoopfactuur"
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Stel uw verkoopworkflow en standaardwaarden in."
 
+#~ msgid "Warehouse"
+#~ msgstr "Magazijn"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Bedrag excl. btw"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Te factureren lijnen"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Hoeveelheid (eenh.)"
+
+#~ msgid "All Quotations"
+#~ msgstr "Alle offertes"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Factuur volgens order na levering"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Voorraadbewegingen"
+
 #~ msgid "  Year  "
 #~ msgstr "  Jaar  "
 
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Wilt u de factuur (facturen) maken?"
 
+#~ msgid "Sales By Month"
+#~ msgstr "Verkopen per maand"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Kan verkooporderlijn niet annuleren"
+
+#~ msgid "Security Days"
+#~ msgstr "Veiligheidsmarge"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Verwerving van verkochte goederen"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Definitieve factuur maken"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Dit geeft aan dat de verkooporder is geleverd. Dit veld wordt alleen "
+#~ "bijgewerkt als de planner heeft gelopen."
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -2482,37 +2776,138 @@ msgstr "Factuur op basis van zendnota's"
 #~ "    * Grafiek van dossiers per maand\\n\"\n"
 #~ "    "
 
+#~ msgid "Companies"
+#~ msgstr "Bedrijven"
+
 #~ msgid "Picking Default Policy"
 #~ msgstr "Standaard verzendbeleid"
 
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr ""
+#~ "Naam en adres van de contactpersoon die de order of offerte heeft "
+#~ "aangevraagd."
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr "U kunt geen verkooporderlijn annuleren die al is gefactureerd."
 
+#~ msgid "References"
+#~ msgstr "Referenties"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Verkooporderdatums"
 
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Marges in verkooporders"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Totaal excl. btw"
+
+#~ msgid "Compute"
+#~ msgstr "Berekenen"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Verkopen per relatie"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Orderadres"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Openstaande factuur"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Verkoopbeheer instellen"
 
+#~ msgid "on order"
+#~ msgstr "Op bestelling"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Volgens verzonden of bestelde aantallen."
+
+#~ msgid "Related Picking"
+#~ msgstr "Gekoppelde zendnota"
+
+#~ msgid "Name"
+#~ msgstr "Naam"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Omzet per klant in de afgelopen 90 dagen"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Leveringsorder maken"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Verzendkosten"
 
+#~ msgid "Create Pick List"
+#~ msgstr "Zendnota maken"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Verkopen per productcategorie"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Gedeeltelijke levering"
 
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Te factureren leveringen"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Verwervingswijze"
+
 #~ msgid "title"
 #~ msgstr "Titel"
 
+#~ msgid "Pick List"
+#~ msgstr "Zendnota"
+
 #~ msgid "Order date"
 #~ msgstr "Besteldatum"
 
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Document van de verplaatsing naar de verzendzone of naar de klant."
+
+#~ msgid "Validate"
+#~ msgstr "Goedkeuren"
+
+#~ msgid "Confirm Order"
+#~ msgstr "Order bevestigen"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Verwervingsopdracht maken"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Verzendbeleid"
 
+#~ msgid "Stock Move"
+#~ msgstr "Voorraadbeweging"
+
+#~ msgid "Extra Info"
+#~ msgstr "Extra informatie"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Verzonden hoeveelheden"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Factuur volgens verkooporder"
+
+#~ msgid "Picking List"
+#~ msgstr "Zendnota"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Fout"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Kan verkooporder niet annuleren"
+
+#~ msgid "Procurement"
+#~ msgstr "Bevoorrading"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Verzenduitzondering"
+
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Verzending & manuele factuur"
 
@@ -2526,6 +2921,9 @@ msgstr "Factuur op basis van zendnota's"
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Factuur van zendnota"
 
+#~ msgid "Reference UoM"
+#~ msgstr "Referentie-eenheid"
+
 #~ msgid ""
 #~ "By default, OpenERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2537,15 +2935,50 @@ msgstr "Factuur op basis van zendnota's"
 #~ "eenvoudige wijze producten leveren aan klanten waarvoor één of twee "
 #~ "bewerkingen door de medewerker nodig zijn."
 
+#~ msgid "Properties"
+#~ msgstr "Eigenschappen"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "U kunt facturen maken op basis van verkooporder of op basis van leveringen."
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "U moet een klant kiezen in het verkoopformulier.\n"
+#~ "Gelieve dit te doen voordat u een product kiest."
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Zendnota & leveringsorder"
 
+#~ msgid "Picking Policy"
+#~ msgstr "Verzendbeleid"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Document voor de verplaatsing naar de klant."
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr "U moet eerst alle zendnota's voor deze verkooporder annuleren."
+
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Invoicing"
 #~ msgstr "Facturatie"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Reservering annuleren"
+
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sales order. \n"
 #~ "The exception state is automatically set when a cancel operation occurs in "
@@ -2561,10 +2994,53 @@ msgstr "Factuur op basis van zendnota's"
 #~ "De 'Wacht op Planner' status wordt ingesteld als de factuur is bevestigd, "
 #~ "maar wacht op de planner die op de 'Bestelde datum' zal lopen."
 
+#~ msgid "Product UoM"
+#~ msgstr "Producteenheid"
+
+#~ msgid "Logistic"
+#~ msgstr "Logistiek"
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Er is geen opbrengstenrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "U wilt %.2f %s verkopen, maar er zijn slechts %.2f %s beschikbaar.\\n\n"
+#~ "De werkelijke voorraad is %.2f %s (zonder reserveringen)."
+
+#~ msgid "States"
+#~ msgstr "Statussen"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Er is geen verkoopdagboek gedefinieerd voor deze firma: \"%s\" (id:%d)"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Afhankelijk van de configuratie van de verzendlocatie (output), gebeurt de "
+#~ "verplaatsing tussen de verzendlocatie en de klant via de zendnota manueel of "
+#~ "automatisch."
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Een verkooporderlijn die %s is, kan niet worden verwijderd."
 
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "Dit is de lijst van zendnota's die voor deze verkoop zijn gemaakt."
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -2575,6 +3051,13 @@ msgstr "Factuur op basis van zendnota's"
 #~ msgid "   Month   "
 #~ msgstr "   Maand   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Waarschuwing"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Verkopen per maand"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -2589,6 +3072,29 @@ msgstr "Factuur op basis van zendnota's"
 #~ "\\n\n"
 #~ "EAN: %s Aantal: %s Soort: %s"
 
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "De zendnota wordt gemaakt zodra de verkooporder is bevestigd, op hetzelfde "
+#~ "moment als de verwervingsopdracht. Het representeert de toekenning van "
+#~ "onderdelen aan de verkooporder. Er is 1 zendnota per verkooporderregel die "
+#~ "ontwikkelt volgens de beschikbaarheid van onderdelen."
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "U kunt niet dezelfde bedrijven maken."
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Omzet per productcategorie in de afgelopen 90 dagen"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Leveringstermijn"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuratie"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Volledige levering"
 
@@ -2604,6 +3110,29 @@ msgstr "Factuur op basis van zendnota's"
 #~ "mogelijk wordt geleverd of dat er wordt gewacht tot alle producten "
 #~ "beschikbaar zijn."
 
+#~ msgid "Image"
+#~ msgstr "Afbeelding"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Een verwervingsopdracht is automatisch gemaakt zodra de verkooporder is "
+#~ "bevestigd of als de factuur is betaald. Het stuurt de aankoop en productie "
+#~ "aan van producten volgens de regels en volgens de verkooporderparameters. "
+
+#~ msgid "Salesman"
+#~ msgstr "Verkoper"
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Verkooporder '%s' is geannuleerd."
+
+#~ msgid "Packings"
+#~ msgstr "Zendnota's"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Configuratievoortgang"
 
@@ -2622,26 +3151,75 @@ msgstr "Factuur op basis van zendnota's"
 #~ msgid "Shipped Qty"
 #~ msgstr "Verzonden hvh"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "De factuur is met succes gemaakt."
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr "U moet eerst alle facturen voor deze verkooporder annuleren."
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Stel uw toepassing voor verkoopbeheer in"
 
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Aangepaste lay-out verkooporder"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Fout"
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Een verwervingsopdracht voor elke verkooporderlijn en voor elk van de "
+#~ "componenten."
+
+#~ msgid "Assign"
+#~ msgstr "Toewijzen"
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "Bevestigde verkooporders kunnen niet worden verwijderd."
 
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Verkooporder '%s' bevindt zich in conceptstatus."
+
+#~ msgid "from stock"
+#~ msgstr "uit voorraad"
+
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Standaard verzendbeleid"
 
+#~ msgid "Close"
+#~ msgstr "Sluiten"
+
+#~ msgid "Delivered"
+#~ msgstr "Geleverd"
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Onvoldoende voorraad"
 
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "U moet een productielot toekennen aan dit product"
+
 #~ msgid "Layout Sequence"
 #~ msgstr "Volgorde lay-out"
 
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Als uw producten in meer dan een verkooppunt worden verkocht, kunt u hier "
+#~ "verkooppunten maken en beheren. Elke nieuwe offerte of verkooporder moet "
+#~ "zijn gekoppeld aan een verkooppunt. Het verkooppunt bepaalt ook vanuit welk "
+#~ "magazijn de producten worden geleverd."
+
 #~ msgid "Adds commitment, requested and effective dates on Sales Orders."
 #~ msgstr ""
 #~ "Voegt toegezegde, gevraagde en werkelijke datum toe aan verkooporders."
@@ -2653,9 +3231,360 @@ msgstr "Factuur op basis van zendnota's"
 #~ "Hiermee kunt u zendnota's groeperen en factureren volgens de verschillende "
 #~ "facturatiesoorten: dagelijks, wekelijks, enz."
 
+#~ msgid "Accounting"
+#~ msgstr "Boekhouding"
+
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Stappen om een verkooporder te leveren"
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Verkoopofferte"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr "Biedt extra mogelijkheden om de verkooporderlay-out te verbeteren."
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Factuur op basis van zendnota's"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Volgens uurroosters"
+
+#~ msgid "Print Quotation"
+#~ msgstr "Offerte afdrukken"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Als u een bevestigde verkooporder wilt verwijderen, moet u deze eerst "
+#~ "annuleren. Om een verkooporder te kunnen annuleren, moeten eerst alle "
+#~ "gekoppelde zendnota's of leveringsnota's worden geannuleerd."
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Factuur op basis van zendnota's"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Volgens zendnota's"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Hoofdeenheid werktijd"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Volgens taakwerk"
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Het factuurbeleid wordt gebruikt om facturatie- en leveringsbewerkingen te "
+#~ "synchroniseren.\\n\n"
+#~ "  - De optie 'Vooruitbetaling' genereert eerst de factuur en de zendnota pas "
+#~ "na betaling van de factuur.\\n\n"
+#~ "  - De optie 'Leveren & Handmatig factureren' maakt de zendnota direct en "
+#~ "wacht met het genereren van een conceptfactuur totdat de gebruiker op de "
+#~ "knop 'Factureren' klikt.\\n\n"
+#~ "  - De optie 'Factuur volgens order na levering' genereert de conceptfactuur "
+#~ "gebaseerd op de verkooporder, nadat alle zendnota's gereed zijn.\\n\n"
+#~ "  - De optie 'Factuur van zendnota' wordt gebruikt om een factuur te maken "
+#~ "gedurende het verzamelproces."
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Configuratiefout"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "De referentie moet uniek zijn."
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "De firmanaam moet uniek zijn"
+
+#~ msgid "Month-1"
+#~ msgstr "Maand-1"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Elk product leveren bij beschikbaarheid"
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr "U kunt producten niet van of naar een weergavelocatie verplaatsen."
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Volgens zendnota's"
+
+#~ msgid "Line Sequence"
+#~ msgstr "Lijnvolgorde"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Diversen"
+
+#~ msgid "Options"
+#~ msgstr "Opties"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "Geeft de status van de offerte of verkooporder. \\n\n"
+#~ "Status Uitzondering wordt automatisch ingesteld als er een fout optreedt "
+#~ "voor een factuur(Factuuruitzondering) of een zendnota "
+#~ "(Leveringsuitzondering). \\n\n"
+#~ "De 'Wacht op Planner' status wordt ingesteld als de factuur is bevestigd, "
+#~ "maar wacht op de planner die op de 'Bestelde datum' zal lopen."
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Factuur volgens order na levering"
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Automatisch via e-mail bevestigde verkooporders"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Alle producten tegelijk leveren"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr "Een verkooporderlijn die %s is, kan niet worden verwijderd."
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Hvh (VK)"
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+#~ msgstr ""
+#~ "\n"
+#~ "Hallo${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Hierbij vindt u uw orderbevestiging voor ${object.partner_id.name}:\n"
+#~ "       | Ordernummer: *${object.name}*\n"
+#~ "       | Ordertotaal: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Orderdatum: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Orderreferentie: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Uw referentie: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Uw contactpersoon: ${object.user_id.name} "
+#~ "${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "U kunt de orderbevestiging bekijken of downloaden, of on line betalen via de "
+#~ "volgende link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'nvt'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "U kunt ook onmiddellijk via Paypal betalen:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "Neem gerust contact met ons op als u vragen heeft.\n"
+#~ "\n"
+#~ "\n"
+#~ "Bedankt dat u kiest voor ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Verkooporders gemaakt in deze maand"
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "Als 'op bestelling' worden gebruikt, wordt een herbevoorrading gestart bij "
+#~ "bevestiging van het verkooporder: er wordt een taak, een aankooporder of een "
+#~ "productiebon gemaakt voor de verkooporderlijn."
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Rekent u het transport aan?"
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Hvh (eenh.)"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "Verzendinformatie "
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Factuurbeleid"
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Stel uw factuurmethode in"
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr ""
+#~ "Hiermee kiest u de juiste module en stelt u het systeem in volgens de "
+#~ "methode die u gebruikt om uw klanten te factureren."
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "U heeft een aantal van %d stuks geselecteerd.\\n\n"
+#~ "Dat is echter niet verenigbaar met de geselecteerde verpakking.\\n\n"
+#~ "Hier is een voorstel van aantallen volgens de verpakking:\n"
+#~ "EAN: %s Aantal: %s Soort: %s"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Vooruitbetaling"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "Geen prijslijstlijn gevonden voor dit product en deze hoeveelheid.\n"
+#~ "U moet het product, de hoeveelheid of de prijslijst veranderen."
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Hoofdmethode volgens"
+
+#~ msgid "Print Order"
+#~ msgstr "Order afdrukken"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Verkooporders gemaakt in dit jaar"
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Verkooporders gemaakt in de afgelopen maand"
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Leveren & factureren op verzoek"
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "Onvoldoende voorraad "
diff --git a/addons/sale/i18n/oc.po b/addons/sale/i18n/oc.po
index 216b9d3227c..8fc3d600afc 100644
--- a/addons/sale/i18n/oc.po
+++ b/addons/sale/i18n/oc.po
@@ -7,19 +7,167 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2011-11-20 09:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
@@ -29,1627 +177,104 @@ msgid ""
 "yet been invoiced"
 msgstr ""
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr ""
-
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "March"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
 #, python-format
-msgid "Invalid action !"
+msgid "Advance of %s %s"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
+#: view:sale.config.settings:0
+msgid "Contract Feature"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
+#: field:sale.report,state:0
 msgid "Order State"
 msgstr ""
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr ""
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-
-#. module: sale
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr ""
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
 msgid "To Invoice"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract/Analytic Account"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
 msgstr ""
@@ -1659,28 +284,154 @@ msgstr ""
 msgid "Invoice Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1269
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
 #, python-format
 msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_ids:0
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
 msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
 msgstr ""
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: sale
@@ -1689,7 +440,20 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
 msgstr ""
@@ -1699,36 +463,130 @@ msgstr ""
 msgid "Sales Order Lines related to a Sales Order of mine"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
 #. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
 msgid "Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
 msgid "Sales Order"
 msgstr ""
 
@@ -1743,12 +601,8 @@ msgid "Sale Order Lines that are in 'done' state"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
 msgstr ""
 
 #. module: sale
@@ -1757,65 +611,400 @@ msgid "Confirmed"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
 msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
 msgid "Confirm"
 msgstr ""
 
 #. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: view:sale.order:0
+msgid "Unread messages"
 msgstr ""
 
 #. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
 #: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Annada"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
 msgstr ""
 
 #. module: sale
-#: view:res.company:0
-msgid "Configuration"
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/edi/sale_order.py:146
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
 #, python-format
 msgid "EDI Pricelist (%s)"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
-msgid "Print Order"
+msgid "Order Date"
 msgstr ""
 
 #. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-msgid "Sales order created in current year"
+#: field:sale.report,partner_id:0
+msgid "Partner"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1824,19 +1013,28 @@ msgid ""
 "2.The Sales Order Line is Invoiced!"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
 msgstr ""
 
 #. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
 #. module: sale
@@ -1845,17 +1043,35 @@ msgid "December"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
+#: view:sale.config.settings:0
+msgid "Contracts Management"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
@@ -1864,34 +1080,106 @@ msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
+#: code:addons/sale/sale.py:557
 #, python-format
-msgid "Advance Invoice"
+msgid "Cannot cancel this sales order!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:624
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
 #, python-format
-msgid "The sales order '%s' has been cancelled."
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
@@ -1899,6 +1187,16 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1913,6 +1211,18 @@ msgid ""
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -1920,55 +1230,166 @@ msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
+#: view:sale.order.line:0
+msgid "Order"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr ""
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
+#: selection:sale.order.line,state:0
+msgid "Exception"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
 
 #. module: sale
@@ -1981,31 +1402,97 @@ msgstr ""
 msgid "Sales Order in Progress"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2013,56 +1500,225 @@ msgstr ""
 msgid "Date Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr ""
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
 msgstr ""
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
@@ -2071,17 +1727,152 @@ msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr ""
@@ -2096,45 +1887,190 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Search Sales Order"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1255
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "Not enough stock ! : "
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Relambi de pagament"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2143,16 +2079,61 @@ msgid "Quotation N°"
 msgstr "Devís N°"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Liurada"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Annada"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Factura basada sus las liurasons"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Factura basada sus las liurasons"
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index ba2123a2ff9..c4135cad591 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -6,20 +6,168 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 18:23+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Na podstawie karty czasu pracy"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Faktura zaliczkowa"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potwierdź ofertę"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Konsola sprzedaży"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Data potwierdzenia"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Grupuj wg"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -31,62 +179,345 @@ msgstr ""
 "które jeszcze nie były zafakturowane"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Sprzedaż wg sprzedawców w ostatnich 90 dniach"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Partner współpracujący"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Stan zamówienia"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Jeśli nie masz wystarczającego zapasu, aby dostarczyć wszystko od razu, to "
-"czy akceptujesz dostawę częściową?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "JS"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Do zafakturowania"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Adres wysyłki dla tego zamówienia sprzedaży."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Ilość"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Data potwierdzenia zamówienia sprzedaży."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Dzień"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Oferty"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzec"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Konto umowy/analityczne"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Data faktury"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Pozycje dostarczone i niezafakturowane"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Kwota do zafakturowania z góry."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Wyjątek faktury"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Suma kwot"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Konto analityczne"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Suma częściowa"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Anuluj zamówienie"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Oferta '%s' została skonwertowana do zamówienia sprzedaży."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Waga"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Drukuj Ofertę"
+msgid "Quotation "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Ostrzeżenie !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Zamówienie sprzedaży"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Wrzesień"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Podatki"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Kwota bez podatku"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Suma netto :"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Anulowano"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Pozycje zamówienia sprzedaży związane z moim zamówieniem"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Suma"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Sklep"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Sprzedaże w stanie wyjątku"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adres do faktury"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Data utworzenia zamówienia sprzedaży"
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Utwórz fakturę od nowa"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Utwórz faktury"
 
 #. module: sale
 #: report:sale.order:0
@@ -94,75 +525,646 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Sporządza zapotrzebowania dla każdej pozycji zamówienia sprzedaży."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Konto analityczne"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"To jest lista zamówień sprzedaży do zafakturowania. Możesz fakturować "
-"zamówienia częściowo, czyli po części pozycji. Nie potrzebujesz tej listy, "
-"jeśli fakturujesz wg wydań lub jeśli fakturujesz zbiorczo."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
-"Aby usunąć potwierdzone zamówienie sprzedaży,musisz je najpierw anulować ! "
-"Aby anulować zamówienie musisz anulować najpierw pobrania."
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Zapotrzebowanie"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Data potwierdzenia"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# pozycji"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# Ilości"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faks :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Zamówienie sprzedaży"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Ilość (JS)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Ppzycje zamówienia sprzedaży w stanie 'wykonano'"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Kwota zaliczki"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potwierdzone"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Domyślne warunki płatności"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Potwierdź"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Adres dla wysyłki"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Pozycje zamówienia sprzedaży do fakturowania"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Miesięczny obrót"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Rok"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Zamówienia sprzedaży jeszcze nie potwierdzone"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Nr zamówienia"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Pozycje zamówienia"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Up.(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Numer"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Pozycje faktury"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Pełna cena"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Poprzednie oferty"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Zaznacz tę opcję, aby grupować faktury dla tych samych klientów"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Utwórz faktury"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Godzina"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Data utworzenia"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Czeka na planowanie"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Adres do faktury dla tego zamówienia sprzedaży."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Zamówione ilości"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Rok zamówienia sprzedaży"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Ilość"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Suma :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Moja sprzedaż"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Niedozwolona akcja !"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Obszar podatkowy"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Lipiec"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "JS"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "Cennik EDI (%s)"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Data oferty"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Data zamówienia"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Oferty i zamówienia"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Faktura wg dostaw"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Pozycja zamówienia"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
-"Zamówienia sprzedaży są do organizowania ofert i zamówień od klientów. "
-"OpenERP sugeruje rozpocząć od oferty. Po  potwierdzeniu oferta zmieni się w "
-"zamówienie sprzedaży. OpenERP reaguje na różne typy produktów i zamówienie "
-"sprzedaży może wygenerować zadanie, zamówienie dostawy, zamówienie produkcji "
-"lub zamówienie zakupu. W konfiguracji zamówienia można ustawić, że po "
-"potwierdzeniu zamówienia zostanie wygenerowany projekt faktury dla klienta."
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Sprzedaż tworzy fakturę"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Upust (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Nie można utworzyć faktury do tej pozycji zamówienia sprzedaży ponieważ:\n"
+"1.Stan tej pozycji zamówienia jest 'Projekt' lub 'Anulowano'!\n"
+"albo\n"
+"2.Pozycja jest już zafakturowana!"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Wykonane pozycje zamówienia sprzedaży"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moje oferty"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Grudzień"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Wysłano"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Miesiąc"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Zamówienie (Odn ${object.name or 'n/a' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Numeracja"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "Nie możesz potwierdzać zamówienia sprzedaży bez pozycji."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Niezafakturowane"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Kategoria produktu"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nazwa sklepu"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Podatki :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Zaliczkowa faktura sprzedaży"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "W toku"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nie zdefiniowano żadnego klienta !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Utwórz faktury"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -180,1322 +1182,20 @@ msgstr ""
 "spędzone nad zadaniami."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Domyślne warunki płatności"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Na podstawie wydań"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
 msgstr ""
 
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Stan"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Up.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Pełna cena"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Zaznacz tę opcję, aby grupować faktury dla tych samych klientów"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Moje zamówienia sprzedaży"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Zamówione ilości"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Sprzedaż wg sprzedawców"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Przesunięcia zapasów"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Numer"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Inne informacje"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Daty"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"Faktura jest tworzona automatycznie, jeśli polityka wysyłki jest 'Faktura z "
-"pobrania' lub 'Faktura z zamówienia po wysyłce'."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "Na podstawie zadań"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Oferty i zamówienia"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Sprzedaż tworzy fakturę"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Ostrzeżenie cennika!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Upust (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Moje oferty"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Konsola Menedżera sprzedaży"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Pakowanie"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Z zamówienia sprzedaży"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nazwa sklepu"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Polityka fakturowania synchronizuje faktury z wydaniami.\n"
-"  - 'Płatność przed dostawą' generuje fakturę, a wydanie zostanie "
-"wygenerowane po zapłaceniu faktury.\n"
-"  - 'Wydanie i fakturowanie ręczne' utworzy pobranie od razu i użytkownik "
-"sam może wybrać moment tworzenia faktury z zamówienia lub pozycji "
-"zamówienia.\n"
-"  - 'Faktura zamówienia po wydaniu' wygeneruje fakturę według zamówienia ale "
-"po wykonaniu wszystkich wydań.\n"
-"  - 'Faktura z wydania' wygeneruje faktury w trakcie wykonywania wydań."
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nie zdefiniowano żadnego klienta !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Sprzedaże w stanie wyjątku"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "Błąd konfiguracji !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Warunki"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Nie zdefiniowano konta przychodu w Właściwościach dla kategorii produktu lub "
-"nie zdefiniowano Obszaru podatkowego !"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Sierpień"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Próbujesz powiązać z numerem partii z innego produktu"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Czerwiec"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Nie można anulowac tego zamówienia sprzedaży !"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statystyka zamówień sprzedaży"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Konto analityczne związane z zamówieniem sprzedaży."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Październik"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "Odnośnik musi być unikalny w firmie!"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Oferty"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Cennik dla tego zamówienia sprzedaży."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "NIP :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Liczba dni pomiędzy potwierdzeniem zamówienia a wysyłką produktów do klienta"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Data oferty"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Obszar podatkowy"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "JM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Liczba opakowań"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "W toku"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Sprzedawca potwierdza ofertę. Stan zamówienia sprzedaży zmieni się na 'W "
-"toku' lub 'Ręczne w toku'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-"Nie możesz anulować pozycji zamówienia sprzedaży, które już zostało "
-"zafakturowane!"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Musisz najpierw anulować przesunięcia zapasów związane z tą pozycją "
-"zamówienia sprzedaży."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(nd.)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Wybierz produkt typu usługa, który jest nazywany 'Produkt - zaliczka'. "
-"Możliwe, że musisz go utworzyć i ustawić go jako domyślną wartość w tym polu."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Nie możesz utworzyć faktury zaliczkowej do zamówienia sprzedaży "
-"zdefiniowanego jako 'Automatyczna faktura po wydaniu'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notatki"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Nazwa firmy musi być unikalna !"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Adres do faktury dla tego zamówienia sprzedaży."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Miesiąc-1"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Miesiąc zamówień sprzedaży"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Nie możesz grupować sprzedaży z różnymi walutami do tego samego partnera."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Wydaj produkty kiedy jest dostępny"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Zafakturowano"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Zamówienie dostawy"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Data potwierdzenia"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Partner współpracujący"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marzec"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr "Nie można przesuwac produktów do lub ze strefy typu widok."
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Na podstawie zamówień sprzedaży"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Suma kwot"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Suma częściowa"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adres do faktury :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "Numeracja pozycji"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Dla każdej pozycji zamówienia jest tworzone Zapotrzebowanie, aby nabyć "
-"(zakupić lub wyprodukować) produkt."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm jest skrótem od 'International Commercial terms' i jest zestawem "
-"warunków sprzedaży, które są skatalogowane do stosowania w międzynarodowych "
-"transakcjach."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adres do faktury"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Przeszukaj niezafakturowane pozycje"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Oferta / Zamówienie"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# pozycji"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Otwarte faktury sprzedaży"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Pozycja zamówienia sprzedaży"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazyn"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Nr zamówienia"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Pozycje zamówienia"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Kwota bez podatku"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Pozycje do zafakturowania"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Ilość (JM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Data utworzenia"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Inne"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Pozycje dostarczone i niezafakturowane"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Suma :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Moja sprzedaż"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Niedozwolona akcja !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Dodatkowe informacje"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cennik"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# Ilości"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "Godzina"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Data zamówienia"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Wysłano"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Wszystkie oferty"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "Opcje"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Wrzesień"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Nie możesz potwierdzać zamówienia sprzedaży bez pozycji."
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Musisz wybrać cennik lub klienta w zamówieniu !\n"
-"Wybierz przed wybraniem produktu."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Kategoria produktu"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Podatki :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Przesunięcia zapasów"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Stan zamówienia"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Czy chcesz utworzyć fakturę(y) ?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Sprzedaż wg miesięcy"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Nie mozna anulować pozycji zamówienia sprzedaży!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Dni bezpieczeństwa"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Zapotrzebowanie na sprzedane materiały"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Utwórz finalną fakturę"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Adres dla wysyłki"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"To oznacza, że zamówienie zostało wydane. To pole jest ustawiane tylko, "
-"jeśli jest stosowany planista."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Data"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Rozszerzone filtry..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Wyjątek"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Firmy"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-"Określa stan oferty lub zamówienia sprzedaży. \n"
-"Stan wyjątku jest ustawiany, jeśli jest coś anulowane w fakturze (wyjątek w "
-"fakturze) lub w wydaniu (wyjątek pobrania). \n"
-"Stan 'Oczekiwanie' jest ustawiany kiedy faktura jest potwierdzona, ale "
-"oczekuje na planistę i datę zamówienia."
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Nie znaleziono poprawnej pozycji cennika ! :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Historia"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Faktura z zamówienia po wydaniu"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"To jest lista faktur, które zostały wystawione do tego zamówienia sprzedaży. "
-"Zmaówienie mogło być fakturowane kilkukrotnie (np. po kilka pozycji)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Twój numer"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "Nazwisko i kontakt do osoby, która zamawiała lub poprosiła o ofertę."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"To są dni dodane do twojej obietnicy klientowi na wszelki wypadek (wysyłka "
-"nastąpi o tyle dni wcześniej)."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Il."
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Odnośniki"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Moje pozycje zamówień sprzedaży"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Anuluj"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Odnośnik zamowienia musi być unikalny w firmie!"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Utwórz fakturę"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Suma bez podatku"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Odnośnik zamówienia"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Faktura została utworzona"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Sprzedaż wg partnerów"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Kontakt do zamawiającego"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Otwórz fakturę"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr "Zamówienie sprzedaży automatycznie potwierdzone mailem"
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "Brak zdefiniowanego dziennika sprzedaży w tej firmie: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Wymuś przypisanie"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "na zamówienie"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Oparte o wysłane lub zamówione ilości"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Wydaj wszystkie produkty na raz"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Powiązane pobranie"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nazwa"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adres do wysyłki :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Sprzedaż wg klientów w ostatnich 90 dniach"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Stan projekt zamówienia sprzedaży"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Utwórz zamówienie dostawy"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-"Nie można usunąć pozycji zamówienia sprzedaży, które jest w stanie '%s'!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "Ilość(JS)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Zawiera sumę podatków"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Utwórz pobranie"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Data zamówienia sprzedaży"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Sprzedaż wg kategorii produktu"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potwierdź ofertę"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Błąd"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Grupuj wg"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Utwórz fakturę od nowa"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Wydania do zafakturowania"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Czeka na planowanie"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metoda zapotrzebowania"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Pobranie"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Ustaw na projekt"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Dokument przesunięcia do klienta."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-"\n"
-"Witamy ${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"To jest potwierdzenie twojego zamówienia ${object.partner_id.name}:\n"
-"       | Numer: *${object.name}*\n"
-"       | Kwota: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Data zamówienia: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Odnośnik zamówienia: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Twój odnośnik: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Twój kontakt: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"Możesz zobaczyć potwierdzenie, pobrać je a nawet zapłacić używając linku:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"Możliwe jest również płacenie przez Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"Jeśli masz pytania, to proszę się kontaktować z nami.\n"
-"\n"
-"\n"
-"Dziękujemy za wybranie ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Zatwierdź"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Potwierdź zamówienie"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Utwórz zapotrzebowanie"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Podatki"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Zamówienia sprzedaży gotowe do fakturowania"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Data utworzenia zamówienia sprzedaży"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Przesunięcie zapasów"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Utwórz faktury"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Zamówienia sprzedaży utworzone w tym miesiącu"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faks :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-"Jeśli 'na zamówienie', to po potwierdzeniu zamówienia zostanie uruchomione "
-"zapotrzebowanie na zadanie, zamówienie zakupu lub zamówienie produkcji "
-"związane z tą pozycją zamówienia sprzedaży."
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Kwota zaliczki"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "Chcesz fakturować koszty dostawy?"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Wysyłane ilości"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Faktura wg zamówień sprzedaży"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Jeśli zmieniasz cennik lub walutę, to ceny w zamówieniu się nie zmienią."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Pobranie"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Błąd !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Nie mozna anulować zamówienia sprzedaży !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "Ilość(JM)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Rok zamówienia sprzedaży"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Lipiec"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Zapotrzebowanie"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Wyjątek wysyłki"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "Informacja o pobraniu ! : "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupuj faktury"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "Polityka fakturowania"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "Ustaw metodę fakturowania"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Do sprawdzenia przez księgowego."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referencyjna JM"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr "To narzędzie pomaga ustawić metodę fakturowania klientów."
-
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Wyjątek faktury"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Steruje zapotrzebowaniami i fakturowaniem"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Projekt"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1503,573 +1203,9 @@ msgid "Paid"
 msgstr "Zapłacone"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analiza Sprzedaży"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
-"Wybrałeś ilość %d jednostek.\n"
-"Ale to jest niespójne z wybranym opakowaniem.\n"
-"Poniżej jest propozycja ilości dopasowana do opakowania:\n"
-"EAN: %s Ilość: %s Typ jl: %s"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Ponownie utwórz pobranie"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Właściwości"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Oferta"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Sprzedawca tworzy fakturę ręcznie, Jeśli zasady wysyłki są 'Wysyłka i ręczna "
-"faktura'. Faktura jest tworzona automatycznie, jeśli zasady wysyłki są "
-"'Płatność przed dostawą'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Możesz generować faktury na podstawie zamówień lub na podstawie wydań."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Potwierdzone pozycje zamówienia sprzedaży, jeszcze nie dostarczone"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Faktury dla klientów"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Sprzedaż"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Cena jednostkowa"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Wykonano"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Musisz najpierw wybrać klienta !\n"
-"Wybierz klienta przed wybraniem produktu."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Dokument źródłowy"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Do zrobienia"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Zasady pobrań"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokument przesunięcia do klienta"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Kwota bez podatku"
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Musisz najpierw anulować wszystkie pobrania związane z tym zamówieniem "
-"sprzedaży."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Zaliczkowa faktura sprzedaży"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Miesiąc"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Zamówienie (Odn ${object.name or 'n/a' })"
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Anuluj przypisanie"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr ""
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Miesięczny obrót"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Faktura na"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Data zamówienia"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "JS produktu"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Ręcznie w toku"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "JM produktu"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistyka"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Kolejność"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "Brak konta dochodu dla produktu: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignoruj wyjątek"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Zależnie od ustawień fakturowania zamówienia sprzedaży, faktura może być "
-"wygenerowana wg ilości pobranych lub zamówionych. W takim przypadku "
-"Zamówienie sprzedaży może wygenerować projekt faktury zaraz po zatwierdzeniu "
-"zamówienia."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Zaplanowałeś sprzedać %.2f %s ale dostępnych jest tylko %.2f %s  !\n"
-"Zapas rzeczywisty wynosi %.2f %s. (bez rezerwacji)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Stany"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Odnośnik klienta"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Suma"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Zależnie od ustawień strefy wydań przesunięcie produktów pomiędzy strefą "
-"wydań a klientem może być wykonane ręcznie lub automatycznie."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Płatność przed dostawą"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Konsola sprzedaży"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Utwórz faktury"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Do zafakturowania"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Data potwierdzenia zamówienia sprzedaży."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "Konto umowy/analityczne"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Firma"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Data faktury"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Kwota do zafakturowania z góry."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"Nie można znaleźć pozycji cennika odpowiadającej danej ilości produktu.\n"
-"Musisz zmienić produkt, ilość lub cennik."
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "To jest lista pobrań wygenerowana dla tego zamówienia sprzedaży."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Utwórz faktury"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Suma netto :"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Anulowano"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Pozycje zamówienia sprzedaży związane z moim zamówieniem"
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Sklep"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Data potwierdzenia"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Ostrzeżenie"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Sprzedaż wg miesięcy"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Zamówienie sprzedaży"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Ilość (JS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Ppzycje zamówienia sprzedaży w stanie 'wykonano'"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"Kiedy sprzedawca potwierdzi zamówienie sprzedaży to jest automatycznie "
-"tworzone Pobranie, jak również Zapotrzebowanie."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potwierdzone"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "Główna metoda na podstawie"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potwierdź"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Sprzedaż wg kategorii produktów w ostatnich 90 dniach"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Pozycje faktury"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Pozycje zamówienia sprzedaży"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Czas dostawy"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Konfiguracja"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "Cennik EDI (%s)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr "Kolejność drukowania"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Zamówienia sprzedaży utworzone w tym roku"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Nie można utworzyć faktury do tej pozycji zamówienia sprzedaży ponieważ:\n"
-"1.Stan tej pozycji zamówienia jest 'Projekt' lub 'Anulowano'!\n"
-"albo\n"
-"2.Pozycja jest już zafakturowana!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Wykonane pozycje zamówienia sprzedaży"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Waga"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Faktury"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Grudzień"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Obraz"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Zapotrzebowanie jest tworzone automatycznie po potwierdzeniu zamówienia "
-"sprzedaży lub po zapłaceniu faktury. Zapotrzebowanie generuje zamówienia "
-"zakupu lub produkcji na podstawie reguł w produkcie i w zamówieniu "
-"sprzedaży. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Niezafakturowane"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Sprzedawca"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Poprzednie oferty"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Kwota bez podatku"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Faktura zaliczkowa"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "Zamówienie sprzedaży '%s' zostało anulowane."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Projekt"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -2093,6 +1229,18 @@ msgstr ""
 "       \n"
 "* Stan 'Anulowano' pojawia sie po anulowaniu zamówienia.."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Zamówienia sprzedaży"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupuj faktury"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2100,56 +1248,170 @@ msgstr "Kwota podatku"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Pobrania"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Pozycje zamówienia sprzedaży do fakturowania"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Stan"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Zamówienia sprzedaży utworozne w ostatnim miesiącu"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Sierpień"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Steruje zapotrzebowaniami i fakturowaniem"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Czerwiec"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "Szablony wiadomości"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Zamówienia sprzedaży"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Kolejność"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Ostrzeżenie cennika!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Sklep sprzedaży"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statystyka zamówień sprzedaży"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Data"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Pozycja zamówienia sprzedaży"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Listopad"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Rozszerzone filtry..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Produkt - zaliczka"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Oblicz"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Wyjątek"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr "Musisz najpierw anulować wszystkie faktury do zamówienia."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Październik"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Sprzedawca tworzy fakturę ręcznie, Jeśli zasady wysyłki są 'Wysyłka i ręczna "
+"faktura'. Faktura jest tworzona automatycznie, jeśli zasady wysyłki są "
+"'Płatność przed dostawą'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2161,94 +1423,330 @@ msgstr "Styczeń"
 msgid "Sales Order in Progress"
 msgstr "Zam. sprzedaży w trakcie przetwarzania"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Sprzedawca potwierdza ofertę. Stan zamówienia sprzedaży zmieni się na 'W "
+"toku' lub 'Ręczne w toku'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr "Odnośnik do dokumentu, który wygenerował to zapytanie ofertowe."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Nie znaleziono poprawnej pozycji cennika ! :"
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Opóźnienie dostawy"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "Wydania i fakturowanie ręczne"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Potwierdzone pozycje zamówienia sprzedaży, jeszcze nie dostarczone"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+#: view:sale.order:0
+msgid "History"
+msgstr "Historia"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
-"Jedno Zapotrzebowanie dla każdej pozycji zamówienia sprzedaży i dla każdego "
-"komponentu."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Przypisz"
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"To jest lista faktur, które zostały wystawione do tego zamówienia sprzedaży. "
+"Zmaówienie mogło być fakturowane kilkukrotnie (np. po kilka pozycji)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Twój numer"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Data zamówienia"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cennik"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "NIP :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Faktury dla klientów"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Poztwierdzone zamówienia sprzedaży do fakturowania."
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Zamówienia sprzedaży jeszcze nie potwierdzone"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Pozycje zamówienia sprzedaży"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Sprzedaż"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "Zamówienie sprzedaży '%s' zostało ustawione na stan 'Projekt'."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Jeśli zmieniasz cennik lub walutę, to ceny w zamówieniu się nie zmienią."
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "z zapasu"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Dzień"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Zamknij"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Faktury"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Cena jednostkowa"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Wykonano"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adres do faktury :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Moje pozycje zamówień sprzedaży"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Anuluj"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "Brak cennika ! : "
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Dostarczone"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Oferta"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Musisz podać nr partii dla tego produktu"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Przeszukaj niezafakturowane pozycje"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
-"Jeśli masz wiele miejsc sprzedaży w firmie, to powinieneś zdefiniować "
-"sklepy. Każde zamówienie sprzedaży jest związane ze sklepem. W Sklepie "
-"możesz definiować magazyn sprzedaży i inne ustawienia."
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Odnośnik zamowienia musi być unikalny w firmie!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Do zrobienia"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Adres do wysyłki :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Nie możesz grupować sprzedaży z różnymi walutami do tego samego partnera."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analiza Sprzedaży"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Cennik dla tego zamówienia sprzedaży."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Utwórz fakturę"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Kwota bez podatku"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Odnośnik zamówienia"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2256,61 +1754,69 @@ msgid "It indicates that an invoice has been paid."
 msgstr "To oznacza, że faktura została zapłacona."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+"Nie możesz anulować pozycji zamówienia sprzedaży, które już zostało "
+"zafakturowane!"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Opis"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Maj"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Klient"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Zaliczka"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Luty"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Kwiecień"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Księgowość"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Przeszukaj zamówienia sprzedaży"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Zlecenie zamówienia sprzedaży"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
-msgstr "Brak zapasu ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Warunki płatności"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cena"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2326,25 +1832,347 @@ msgstr ""
 "raport do analizy sprzedaży niezafakturowanej. Jeśli chcesz analizować "
 "obroty, to powinieneś stosować analizę fakturową w aplikacji Księgowość."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Czy chcesz utworzyć fakturę(y) ?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Inne informacje"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Il."
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Do sprawdzenia przez księgowego."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Adres wysyłki dla tego zamówienia sprzedaży."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Oferta / Zamówienie"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Klient"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Zaliczka"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Luty"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Faktura na"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data zamówienia"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "JS produktu"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Stan projekt zamówienia sprzedaży"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Dokument źródłowy"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Kwiecień"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Ręcznie w toku"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Moje zamówienia sprzedaży"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Przeszukaj zamówienia sprzedaży"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Miesiąc zamówień sprzedaży"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Musisz wybrać cennik lub klienta w zamówieniu !\n"
+"Wybierz przed wybraniem produktu."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Z zamówienia sprzedaży"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignoruj wyjątek"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Zależnie od ustawień fakturowania zamówienia sprzedaży, faktura może być "
+"wygenerowana wg ilości pobranych lub zamówionych. W takim przypadku "
+"Zamówienie sprzedaży może wygenerować projekt faktury zaraz po zatwierdzeniu "
+"zamówienia."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Konto analityczne związane z zamówieniem sprzedaży."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Warunki płatności"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Zamówienia sprzedaży gotowe do fakturowania"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Nr oferty"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Odnośnik klienta"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Wydano"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Rok"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Faktura wg dostaw"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Zawiera sumę podatków"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Zafakturowano"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Data zamówienia sprzedaży"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
@@ -2355,39 +2183,62 @@ msgstr "Faktura wg dostaw"
 #~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
 #~ "specjalnych !"
 
+#~ msgid "Warehouse"
+#~ msgstr "Magazyn"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Błąd !"
+
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Moje zamówienia sprzedaży oczekujące na zafakturowanie"
 
+#~ msgid "Configuration"
+#~ msgstr "Konfiguracja"
+
 #~ msgid "Sales orders"
 #~ msgstr "Zamówienia sprzedaży"
 
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "Zamówienia sprzedaży do zafakturowania"
 
+#~ msgid "Order Line"
+#~ msgstr "Pozycja zamówienia"
+
+#~ msgid "Salesman"
+#~ msgstr "Sprzedawca"
+
 #~ msgid "Uninvoiced Lines"
 #~ msgstr "Pozycje niezafakturowane"
 
 #~ msgid "Sales Configuration"
 #~ msgstr "Konfiguracja sprzedaży"
 
-#~ msgid "Status"
-#~ msgstr "Stan"
-
 #~ msgid "Our Salesman"
 #~ msgstr "Nasz sprzedawca"
 
-#~ msgid "Sale Order"
-#~ msgstr "Zamówienie sprzedaży"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Cennik sprzedaży"
 
+#~ msgid "Properties"
+#~ msgstr "Właściwości"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Błąd"
+
 #~ msgid "Sales order lines"
 #~ msgstr "Pozycje zamówienia sprzedaży"
 
 #~ msgid "Other data"
 #~ msgstr "Inne dane"
 
+#~ msgid "Close"
+#~ msgstr "Zamknij"
+
+#~ msgid "UoM"
+#~ msgstr "JM"
+
 #~ msgid "Sale Invoice"
 #~ msgstr "Faktura sprzedaży"
 
@@ -2400,12 +2251,21 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Sales order"
 #~ msgstr "Zamówienie sprzedaży"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Sale Order Line"
 #~ msgstr "Pozycja zamówienia sprzedaży"
 
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Cennik zakupu"
 
+#~ msgid "Name"
+#~ msgstr "Nazwa"
+
+#~ msgid "Product UoM"
+#~ msgstr "JM produktu"
+
 #~ msgid "Payment Terms"
 #~ msgstr "Warunki płatności"
 
@@ -2436,6 +2296,9 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Shipping Policy"
 #~ msgstr "Zasady wysyłki"
 
+#~ msgid "Extra Info"
+#~ msgstr "Dodatkowe informacje"
+
 #~ msgid "Net Price"
 #~ msgstr "Cena netto"
 
@@ -2445,11 +2308,17 @@ msgstr "Faktura wg dostaw"
 #~ msgid "All Sales Order"
 #~ msgstr "Wszystkie zamówienia sprzedaży"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Wysyłane ilości"
+
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
 #~ "Musisz anulować wszystkie faktury związane z tym zamówieniem sprzedaży"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Ilość (JM)"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Dostawa kompletna"
 
@@ -2462,6 +2331,9 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Sale Shop"
 #~ msgstr "Sklep sprzedaży"
 
+#~ msgid "All Quotations"
+#~ msgstr "Wszystkie oferty"
+
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Domyślne zasady wysyłki"
 
@@ -2500,6 +2372,9 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Otwarte faktury płatne z góry"
 
+#~ msgid "Ordering Contact"
+#~ msgstr "Kontakt do zamawiającego"
+
 #~ msgid "Sales Management"
 #~ msgstr "Sprzedaż"
 
@@ -2510,6 +2385,9 @@ msgstr "Faktura wg dostaw"
 #~ "The name and address of the contact that requested the order or quotation."
 #~ msgstr "Nazwa i adres kontaktu proszącego o ofertę."
 
+#~ msgid "on order"
+#~ msgstr "na zamówienie"
+
 #~ msgid "New Quotation"
 #~ msgstr "Nowa oferta"
 
@@ -2524,6 +2402,9 @@ msgstr "Faktura wg dostaw"
 #~ "metody dostarczania produktów do klientów. Wymagające jednej lub dwóch "
 #~ "operacji pracownika."
 
+#~ msgid "States"
+#~ msgstr "Stany"
+
 #~ msgid ""
 #~ "This is the list of invoices that have been generated for this sale order. "
 #~ "The same sale order may have been invoiced in several times (by line for "
@@ -2542,6 +2423,9 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Delivery Delay"
 #~ msgstr "Czas dostawy"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Przesunięcia zapasów"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Błąd: Niedozwolony kod EAN"
 
@@ -2551,9 +2435,15 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Recreate Procurement"
 #~ msgstr "Utwórz nabycie od nowa"
 
+#~ msgid "from stock"
+#~ msgstr "z zapasu"
+
 #~ msgid "All at Once"
 #~ msgstr "Wszystko naraz"
 
+#~ msgid "Untaxed amount"
+#~ msgstr "Kwota bez podatku"
+
 #~ msgid "Manual Description"
 #~ msgstr "Opis ręczny"
 
@@ -2579,18 +2469,27 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Direct Delivery"
 #~ msgstr "Dostawa bezpośrednia"
 
+#~ msgid "Compute"
+#~ msgstr "Oblicz"
+
+#~ msgid "Assign"
+#~ msgstr "Przypisz"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Tylko zamówienia dostawy"
 
-#~ msgid "Sequence"
-#~ msgstr "Numeracja"
-
 #~ msgid "Set Default"
 #~ msgstr "Ustaw jako domyślną"
 
 #~ msgid "Deliver"
 #~ msgstr "Dostarcz"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Zamówienie dostawy"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Ustaw na projekt"
+
 #~ msgid "Outgoing Products"
 #~ msgstr "Wydawanie produktów"
 
@@ -2616,6 +2515,9 @@ msgstr "Faktura wg dostaw"
 #~ "Nie możesz utworzyć faktury zaliczkowej z zamówienia sprzedaży "
 #~ "zdefiniowanego jako 'Faktura automatyczna po dostawie'."
 
+#~ msgid "Force Assignation"
+#~ msgstr "Wymuś przypisanie"
+
 #~ msgid ""
 #~ "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
 #~ "will automatic create after delivery."
@@ -2626,9 +2528,15 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Draft Invoice"
 #~ msgstr "Projekt faktury"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Wyjątek wysyłki"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "Domyślne zasady wydawania"
 
+#~ msgid "Packaging"
+#~ msgstr "Pakowanie"
+
 #~ msgid "My sales in shipping exception"
 #~ msgstr "Moje sprzedaże w wyjątkach wysyłki"
 
@@ -2654,12 +2562,21 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Quotation (A sale order in draft state)"
 #~ msgstr "Oferta (zamówienie sprzedaży w stanie Projekt)"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Anuluj przypisanie"
+
 #~ msgid "Configure Picking Policy for Sale Order"
 #~ msgstr "Konfiguruj zasady wysyłki dla zamówienia sprzedaży"
 
 #~ msgid "Related invoices"
 #~ msgstr "Odnośne faktury"
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Faktura wg dostaw"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Faktura wg zamówień sprzedaży"
+
 #~ msgid ""
 #~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
 #~ "is, quotation is moved to  sale order."
@@ -2679,6 +2596,9 @@ msgstr "Faktura wg dostaw"
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Po potwierdzeniu zamówienia, utwórz fakturę"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Potwierdź zamówienie"
+
 #~ msgid "Confirm sale order and Create invoice."
 #~ msgstr "Potwierdź zamówienie i Utwórz fakturę"
 
@@ -2686,6 +2606,22 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Nie można usunąć zamówień sprzedaży, które są potwierdzone !"
 
+#~ msgid "Validate"
+#~ msgstr "Zatwierdź"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Jeśli nie masz wystarczającego zapasu, aby dostarczyć wszystko od razu, to "
+#~ "czy akceptujesz dostawę częściową?"
+
+#~ msgid "Notes"
+#~ msgstr "Notatki"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Przesunięcia zapasów"
+
 #~ msgid "Procurement is created after confirmation of sale order."
 #~ msgstr "Nabycie jest tworzone po potwierdzeniu zamówienia sprzedaży"
 
@@ -2721,6 +2657,9 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Nie można anulować tego zamówienia sprzedaży !"
 
+#~ msgid "Accounting"
+#~ msgstr "Księgowość"
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sale order. The exception state is "
 #~ "automatically set when a cancel operation occurs in the invoice validation "
@@ -2749,6 +2688,9 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Wydanie zewnętrzne jest tworzone dla produktów rejestrowanych."
 
+#~ msgid "Number Packages"
+#~ msgstr "Liczba opakowań"
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay before delivery' choice will first generate the invoice and "
@@ -2775,21 +2717,99 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Pozwala obliczyć koszt dostawy do oferty"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Ostrzeżenie !"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Zapotrzebowanie"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Konfiguruj politykę pobierania dla zamówień sprzedaży"
 
+#~ msgid "State"
+#~ msgstr "Stan"
+
+#~ msgid "Dates"
+#~ msgstr "Daty"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Konsola Menedżera sprzedaży"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Faktura jest tworzona automatycznie, jeśli polityka wysyłki jest 'Faktura z "
+#~ "pobrania' lub 'Faktura z zamówienia po wysyłce'."
+
+#~ msgid "Conditions"
+#~ msgstr "Warunki"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Nie zdefiniowano konta przychodu w Właściwościach dla kategorii produktu lub "
+#~ "nie zdefiniowano Obszaru podatkowego !"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Pozycje do zafakturowania"
+
 #~ msgid "  Year  "
 #~ msgstr "  Rok  "
 
+#~ msgid "Companies"
+#~ msgstr "Firmy"
+
+#~ msgid "Security Days"
+#~ msgstr "Dni bezpieczeństwa"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Sprzedaż wg miesięcy"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Daty zamówienia sprzedaży"
 
+#~ msgid "References"
+#~ msgstr "Odnośniki"
+
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Marże w zamówieniach sprzedaży"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Suma bez podatku"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Konfiguracja aplikacji sprzedażowej"
 
+#~ msgid "Open Invoice"
+#~ msgstr "Otwórz fakturę"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Oparte o wysłane lub zamówione ilości"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Utwórz zamówienie dostawy"
+
+#~ msgid "Related Picking"
+#~ msgstr "Powiązane pobranie"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Zaplanowałeś sprzedać %.2f %s ale dostępnych jest tylko %.2f %s  !\n"
+#~ "Zapas rzeczywisty wynosi %.2f %s. (bez rezerwacji)"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Sprzedaż wg kategorii produktu"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Utwórz pobranie"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Koszt dostawy"
 
@@ -2797,13 +2817,25 @@ msgstr "Faktura wg dostaw"
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "To pobranie zostało utworzone dla tej faktury"
 
+#~ msgid "Pick List"
+#~ msgstr "Pobranie"
+
 #~ msgid "Order date"
 #~ msgstr "Data zamówienia"
 
+#~ msgid "Stock Move"
+#~ msgstr "Przesunięcie zapasów"
+
+#~ msgid "Picking List"
+#~ msgstr "Pobranie"
+
 #, python-format
 #~ msgid "Picking Information !"
 #~ msgstr "Inofrmacja pobrania !"
 
+#~ msgid "Procurement"
+#~ msgstr "Zapotrzebowanie"
+
 #, python-format
 #~ msgid "You must first cancel all packing attached to this sale order."
 #~ msgstr ""
@@ -2842,13 +2874,68 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Czy chcesz utworzyć fakturę(y) ?"
 
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Liczba dni pomiędzy potwierdzeniem zamówienia a wysyłką produktów do klienta"
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Ponownie utwórz pobranie"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Zapotrzebowanie na sprzedane materiały"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Utwórz finalną fakturę"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "To są dni dodane do twojej obietnicy klientowi na wszelki wypadek (wysyłka "
+#~ "nastąpi o tyle dni wcześniej)."
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Wydania do zafakturowania"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Utwórz zapotrzebowanie"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Metoda zapotrzebowania"
+
 #~ msgid "Invoicing"
 #~ msgstr "Fakturowanie"
 
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr "Brak konta dochodu dla produktu: \"%s\" (id:%d)"
+
+#~ msgid "Logistic"
+#~ msgstr "Logistyka"
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Ostrzeżenie"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr "Umożliwia modyfikację układu Zamówienia sprzedaży"
 
+#~ msgid "Sales by Salesman"
+#~ msgstr "Sprzedaż wg sprzedawców"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Sprzedaż wg partnerów"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Możesz generować faktury na podstawie zamówień lub na podstawie wydań."
+
+#~ msgid "Sales by Month"
+#~ msgstr "Sprzedaż wg miesięcy"
+
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Modyfikacja układu zamówień sprzedaży"
 
@@ -2858,6 +2945,13 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Konfiguruj logistykę zamówień sprzedaży"
 
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Próbujesz powiązać z numerem partii z innego produktu"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Oferta '%s' została skonwertowana do zamówienia sprzedaży."
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -2881,13 +2975,48 @@ msgstr "Faktura wg dostaw"
 #~ "  - 'Faktura z pobrania' jest stosowana do generowania faktury w trakcie "
 #~ "pobrania."
 
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Sporządza zapotrzebowania dla każdej pozycji zamówienia sprzedaży."
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr ""
 #~ "Rozszerz swoją podstawową aplikację sprzedaży o dodatkowe funkcjonalności."
 
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(nd.)"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Musisz najpierw anulować przesunięcia zapasów związane z tą pozycją "
+#~ "zamówienia sprzedaży."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Nie możesz utworzyć faktury zaliczkowej do zamówienia sprzedaży "
+#~ "zdefiniowanego jako 'Automatyczna faktura po wydaniu'."
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Nie można anulowac tego zamówienia sprzedaży !"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Faktura wg zamówienia po wydaniu"
 
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Nie mozna anulować pozycji zamówienia sprzedaży!"
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Otwarte faktury sprzedaży"
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Dokument przesunięcia do klienta."
+
 #~ msgid "Picking Default Policy"
 #~ msgstr "Zasady pobrań"
 
@@ -2900,19 +3029,56 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Faktura z pobrania"
 
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Nie mozna anulować zamówienia sprzedaży !"
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Pobranie i zamówienie wysyłki"
 
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Dokument przesunięcia do klienta"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Musisz najpierw anulować wszystkie pobrania związane z tym zamówieniem "
+#~ "sprzedaży."
+
+#~ msgid "Picking Policy"
+#~ msgstr "Zasady pobrań"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr "Brak zdefiniowanego dziennika sprzedaży w tej firmie: \"%s\" (id:%d)"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Nie mozna usuwac pozycji zamówienia sprzedaży, które jest %s !"
 
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "To jest lista pobrań wygenerowana dla tego zamówienia sprzedaży."
+
 #~ msgid "   Month   "
 #~ msgstr "   Miesiąc   "
 
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Miesiąc-1    "
 
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Zamówienie sprzedaży '%s' zostało anulowane."
+
+#~ msgid "Image"
+#~ msgstr "Obraz"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Czas dostawy"
+
 #~ msgid "Invoicing journals"
 #~ msgstr "Dzienniki fakturowania"
 
@@ -2929,12 +3095,60 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Not enough stock !"
 #~ msgstr "Brak zapasu !"
 
+#~ msgid "Delivered"
+#~ msgstr "Dostarczone"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Musisz podać nr partii dla tego produktu"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Sprzedaż wg sprzedawców w ostatnich 90 dniach"
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Ustaw obieg sprzedaży i wartości domyślne."
 
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "To jest lista zamówień sprzedaży do zafakturowania. Możesz fakturować "
+#~ "zamówienia częściowo, czyli po części pozycji. Nie potrzebujesz tej listy, "
+#~ "jeśli fakturujesz wg wydań lub jeśli fakturujesz zbiorczo."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Zamówienia sprzedaży są do organizowania ofert i zamówień od klientów. "
+#~ "OpenERP sugeruje rozpocząć od oferty. Po  potwierdzeniu oferta zmieni się w "
+#~ "zamówienie sprzedaży. OpenERP reaguje na różne typy produktów i zamówienie "
+#~ "sprzedaży może wygenerować zadanie, zamówienie dostawy, zamówienie produkcji "
+#~ "lub zamówienie zakupu. W konfiguracji zamówienia można ustawić, że po "
+#~ "potwierdzeniu zamówienia zostanie wygenerowany projekt faktury dla klienta."
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Numer zamówienia musi być unikalny !"
 
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Dla każdej pozycji zamówienia jest tworzone Zapotrzebowanie, aby nabyć "
+#~ "(zakupić lub wyprodukować) produkt."
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "To oznacza, że zamówienie zostało wydane. To pole jest ustawiane tylko, "
+#~ "jeśli jest stosowany planista."
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -2982,6 +3196,29 @@ msgstr "Faktura wg dostaw"
 #~ "    * Wykres spraw\n"
 #~ "    "
 
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm jest skrótem od 'International Commercial terms' i jest zestawem "
+#~ "warunków sprzedaży, które są skatalogowane do stosowania w międzynarodowych "
+#~ "transakcjach."
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Musisz najpierw wybrać klienta !\n"
+#~ "Wybierz klienta przed wybraniem produktu."
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Nazwisko i kontakt do osoby, która zamawiała lub poprosiła o ofertę."
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Sprzedaż wg klientów w ostatnich 90 dniach"
+
 #~ msgid ""
 #~ "By default, OpenERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2992,6 +3229,26 @@ msgstr "Faktura wg dostaw"
 #~ "magazynach klientów. To jest konfiguracja najprostszej metody wydania "
 #~ "produktów w jednej lub dwóch operacjach."
 
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Sprzedaż wg kategorii produktów w ostatnich 90 dniach"
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "Kiedy sprzedawca potwierdzi zamówienie sprzedaży to jest automatycznie "
+#~ "tworzone Pobranie, jak również Zapotrzebowanie."
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Zależnie od ustawień strefy wydań przesunięcie produktów pomiędzy strefą "
+#~ "wydań a klientem może być wykonane ręcznie lub automatycznie."
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -3029,6 +3286,38 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Konfiguruj aplikację sprzedaży"
 
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Jedno Zapotrzebowanie dla każdej pozycji zamówienia sprzedaży i dla każdego "
+#~ "komponentu."
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Zapotrzebowanie jest tworzone automatycznie po potwierdzeniu zamówienia "
+#~ "sprzedaży lub po zapłaceniu faktury. Zapotrzebowanie generuje zamówienia "
+#~ "zakupu lub produkcji na podstawie reguł w produkcie i w zamówieniu "
+#~ "sprzedaży. "
+
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Faktura została utworzona"
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Jeśli masz wiele miejsc sprzedaży w firmie, to powinieneś zdefiniować "
+#~ "sklepy. Każde zamówienie sprzedaży jest związane ze sklepem. W Sklepie "
+#~ "możesz definiować magazyn sprzedaży i inne ustawienia."
+
 #~ msgid "Adds commitment, requested and effective dates on Sales Orders."
 #~ msgstr "Dodaje do zamówienia daty dostawy, spodziewaną i efektywną."
 
@@ -3042,6 +3331,10 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Layout Sequence"
 #~ msgstr "Porządek pozycji"
 
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Zamówienie sprzedaży '%s' zostało ustawione na stan 'Projekt'."
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "Nie można usunąć Zamówienia sprzedaży, ktore zostało potwierdzone !"
@@ -3049,6 +3342,9 @@ msgstr "Faktura wg dostaw"
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Kroki dostawy Zamówienia sprzedaży"
 
+#~ msgid "Reference UoM"
+#~ msgstr "Referencyjna JM"
+
 #~ msgid "title"
 #~ msgstr "tytuł"
 
@@ -3060,3 +3356,353 @@ msgstr "Faktura wg dostaw"
 #~ "Zasady wydań są stosowane do decydowania, czy chcesz wydawać produkty "
 #~ "natychmiast kiedy część ich jest dostępna, czy chcesz czekać, aż wszystkie "
 #~ "produkty z zamówienia będą dostępne."
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr "Musisz najpierw anulować wszystkie faktury do zamówienia."
+
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Zlecenie zamówienia sprzedaży"
+
+#~ msgid "Packings"
+#~ msgstr "Pobrania"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Wybierz produkt typu usługa, który jest nazywany 'Produkt - zaliczka'. "
+#~ "Możliwe, że musisz go utworzyć i ustawić go jako domyślną wartość w tym polu."
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Na podstawie karty czasu pracy"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Na podstawie zadań"
+
+#~ msgid "Print Quotation"
+#~ msgstr "Drukuj Ofertę"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Faktura wg dostaw"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Na podstawie wydań"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Aby usunąć potwierdzone zamówienie sprzedaży,musisz je najpierw anulować ! "
+#~ "Aby anulować zamówienie musisz anulować najpierw pobrania."
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "Nazwa firmy musi być unikalna !"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Odnośnik musi być unikalny w firmie!"
+
+#~ msgid "Month-1"
+#~ msgstr "Miesiąc-1"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Błąd konfiguracji !"
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr "Nie można przesuwac produktów do lub ze strefy typu widok."
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Na podstawie zamówień sprzedaży"
+
+#~ msgid "Line Sequence"
+#~ msgstr "Numeracja pozycji"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Inne"
+
+#~ msgid "Options"
+#~ msgstr "Opcje"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Ilość(JS)"
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Polityka fakturowania"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "Informacja o pobraniu ! : "
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Chcesz fakturować koszty dostawy?"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Zamówienia sprzedaży utworzone w tym miesiącu"
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "Jeśli 'na zamówienie', to po potwierdzeniu zamówienia zostanie uruchomione "
+#~ "zapotrzebowanie na zadanie, zamówienie zakupu lub zamówienie produkcji "
+#~ "związane z tą pozycją zamówienia sprzedaży."
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Ilość(JM)"
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Wybrałeś ilość %d jednostek.\n"
+#~ "Ale to jest niespójne z wybranym opakowaniem.\n"
+#~ "Poniżej jest propozycja ilości dopasowana do opakowania:\n"
+#~ "EAN: %s Ilość: %s Typ jl: %s"
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Ustaw metodę fakturowania"
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr "To narzędzie pomaga ustawić metodę fakturowania klientów."
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Płatność przed dostawą"
+
+#~ msgid "Print Order"
+#~ msgstr "Kolejność drukowania"
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Główna metoda na podstawie"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Zamówienia sprzedaży utworzone w tym roku"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "Nie można znaleźć pozycji cennika odpowiadającej danej ilości produktu.\n"
+#~ "Musisz zmienić produkt, ilość lub cennik."
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Polityka fakturowania synchronizuje faktury z wydaniami.\n"
+#~ "  - 'Płatność przed dostawą' generuje fakturę, a wydanie zostanie "
+#~ "wygenerowane po zapłaceniu faktury.\n"
+#~ "  - 'Wydanie i fakturowanie ręczne' utworzy pobranie od razu i użytkownik "
+#~ "sam może wybrać moment tworzenia faktury z zamówienia lub pozycji "
+#~ "zamówienia.\n"
+#~ "  - 'Faktura zamówienia po wydaniu' wygeneruje fakturę według zamówienia ale "
+#~ "po wykonaniu wszystkich wydań.\n"
+#~ "  - 'Faktura z wydania' wygeneruje faktury w trakcie wykonywania wydań."
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "Określa stan oferty lub zamówienia sprzedaży. \n"
+#~ "Stan wyjątku jest ustawiany, jeśli jest coś anulowane w fakturze (wyjątek w "
+#~ "fakturze) lub w wydaniu (wyjątek pobrania). \n"
+#~ "Stan 'Oczekiwanie' jest ustawiany kiedy faktura jest potwierdzona, ale "
+#~ "oczekuje na planistę i datę zamówienia."
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Wydaj produkty kiedy jest dostępny"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr ""
+#~ "Nie można usunąć pozycji zamówienia sprzedaży, które jest w stanie '%s'!"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Wydaj wszystkie produkty na raz"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Faktura z zamówienia po wydaniu"
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Zamówienie sprzedaży automatycznie potwierdzone mailem"
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+#~ msgstr ""
+#~ "\n"
+#~ "Witamy ${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "To jest potwierdzenie twojego zamówienia ${object.partner_id.name}:\n"
+#~ "       | Numer: *${object.name}*\n"
+#~ "       | Kwota: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Data zamówienia: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Odnośnik zamówienia: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Twój odnośnik: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Twój kontakt: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "Możesz zobaczyć potwierdzenie, pobrać je a nawet zapłacić używając linku:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "Możliwe jest również płacenie przez Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "Jeśli masz pytania, to proszę się kontaktować z nami.\n"
+#~ "\n"
+#~ "\n"
+#~ "Dziękujemy za wybranie ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "Brak zapasu ! : "
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Zamówienia sprzedaży utworozne w ostatnim miesiącu"
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Wydania i fakturowanie ręczne"
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index 474cf20ddae..82eee575515 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/i18n/pt.po
@@ -6,20 +6,168 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:19+0000\n"
 "Last-Translator: Raphael Collet (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: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Com base na folha de horas"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Adiantamento da Fatura"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar cotação"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Painel de controlo de vendas"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Data de confirmação"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -31,62 +179,345 @@ msgstr ""
 "exceção e ainda não foram faturados"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Vendas por vendedor nos últimos 90 dias"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Parceiro do lote"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Estado da Ordem"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Se não tiver stock sufeciente disponível para entregar de uma vez, aceita "
-"transferências parciais ou não?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Para Faturar"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Endereço de entrega para esta ordem de venda."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Quantidade"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Data em que ordem de venda é confirmada."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Dia"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Cotações"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Março"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Contrato / Conta Analítica"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Empresa"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Data da Fatura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Linhas não Faturadas e Entregues"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "O valor a ser faturado com antecedência."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Exceção da Fatura"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Montante total."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Conta Analítica"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar Ordem de Venda"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "A cotação '%s' foi convertida numa ordem de venda."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Imprimir Cotação"
+msgid "Quotation "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Aviso !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Ordem de Venda"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impostos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Montante sem imposto"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total Líquido :"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Linhas da ordem de vendas relacionadas com uma ordem de vendas minha"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Loja"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Excepção de Vendas"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Endereço da Fatura"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Data em que a ordem de venda é criada."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Recriar Fatura"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Criar Faturas"
 
 #. module: sale
 #: report:sale.order:0
@@ -94,78 +525,647 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Unidades de ordens de aquisição para cada linha de pedido de vendas."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Conta Analítica"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Aqui está uma lista de cada pedido de vendas a ser faturado. Pode faturar "
-"ordens de venda parcialmente, por linhas de pedido de vendas. Não precisa "
-"desta lista se faturar os pedidos de entrega ou se facturar a venda "
-"totalmente."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
-"Para excluir uma ordem de venda confirmada, deve cancelá-la antes! Para "
-"cancelar uma ordem de venda, primeiro deve cancelar picking relacionada para "
-"as ordens de entrega."
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Ordem de aquisição"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Confirmar Data"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de Linhas"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# de Qtd"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Ordem de venda"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Quantidade (UoS)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Linhas da ordem de vendas que estejam no estado 'Concluído'"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Adiantamento do Valor"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Termos de Pagamento Padrão"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Endereço para Envio"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Linhas da ordem de vendas prontas para serem faturadas"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Turnover Mensal"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Ano"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Ordem de Vendas que ainda não foram confirmadas"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Ordem Nº"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Linhas da Ordem"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Ordem de Referência"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Linhas da Fatura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Preço Total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Cotações antigas"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marque a caixa para agrupar as faturas para o mesmo cliente"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Criar faturas"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Hora"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Data da Criação"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "A Espera da Agenda"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Morada de faturação para esta ordem de venda."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Quantidades Pedidas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Ordenar por ano a ordem de venda"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Quantidade"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "As minhas vendas"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Ação Inválida!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posição Fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julho"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UoS"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "Lista Preços EDI (%s)"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Data da cotação"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Data da Ordem"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Cotações e Vendas"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "Parceiro"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Fatura baseada nas entregas"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Linha da ordem"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
-"Pedidos de Vendas ajudá-lo a gerir citações e ordens de seus clientes. "
-"OpenERP sugere que se comece a criar um orçamento. Uma vez confirmada, a "
-"cotação será convertida numa ordem de venda. O OpenERP pode gerir vários "
-"tipos de artigos, possibilitando que uma ordem de venda desencadeie tarefas, "
-"ordens de entrega, ordens de produção, compras e assim por diante. Com base "
-"na configuração da ordem de vendas, uma fatura projeto será gerada para que "
-"só tenha que confirmar isso quando quiser faturar o cliente."
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Vendas Gerar Fatura"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Desconto (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Fatura não pode ser criada para esta linha de Ordem de vendas devido a uma "
+"das seguintes razões:\n"
+"1.O estado desta linha ordem de vendas esteja como \"Projeto\" ou "
+"\"cancelada\"!\n"
+"2.A linha da ordem de vendas é faturada!"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Linhas da ordem de vendas concluídas"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Minhas Cotações"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Dezembro"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "Não pode confirmar uma ordem de venda que não tem nenhuma linha."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Por faturar"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoria do artigo"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nome da Loja"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impostos :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Fatura de Pagamento de Adiantamento das vendas"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Em Progresso"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nenhum Cliente Definido !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Criar Faturas"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -183,1316 +1183,10 @@ msgstr ""
 "horas passadas nas tarefas associadas."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Termos de Pagamento Padrão"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Baseado nas ordens de entrega"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "Unidade de tempo de trabalho principal"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Estado"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Preço Total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Marque a caixa para agrupar as faturas para o mesmo cliente"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Minhas Ordens de Venda"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Quantidades Pedidas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Vendas, por vendedor"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Movimentos do Inventário"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Ordem de Referência"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Outra informação"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Datas"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
 msgstr ""
-"A fatura é criada automaticamente se a política de transporte é 'fatura "
-"baseada na recolha' ou 'fatura baseada na ordem após entrega'."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "Baseada nas tarefas' Trabalho"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Cotações e Vendas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Vendas Gerar Fatura"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Aviso Lista de Preços!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Desconto (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Minhas Cotações"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Painel de controlo de gestão de vendas"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Embalagem"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "A partir de ordem de venda"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nome da Loja"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"A Política da fatura é usada para sincronizar a fatura e operações de "
-"entrega.\n"
-"  - A opção 'Pague antes da entrega \" irá gerar primeiro a fatura e, em "
-"seguida, gerar a ordem picking após o pagamento desta fatura.\n"
-"  - A opção \"Entrega & fatura a pedido ' vai criar a separação de pedidos "
-"diretamente e esperar que o utilizador clique manualmente no botão' fatura "
-"'para gerar o rascunho da fatura com base na ordem de venda ou as linhas da "
-"ordem de venda.\n"
-"  - A opção 'Fatura após Entrega' irá gerar o rascunho da fatura baseada na "
-"ordem de vendas depois de todas as listas de picking terem sido terminadas.\n"
-"  - A opção 'Fatura baseada nas entregas' é usada para criar uma fatura "
-"durante o processo de picking."
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nenhum Cliente Definido !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Excepção de Vendas"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "Erro Configuração !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Condições"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Não existe conta da categoria de rendimento definida nas propriedades padrão "
-"para a categoria de artigo ou a posição fiscal não está definida!"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Tentou atribuir um lote que não é do mesmo artigo"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "metodo inválido para test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junho"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Não foi possível cancelar esta ordem de venda!"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estatísticas de ordens de venda"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "A conta analítica relacionada com uma ordem de venda."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Outubro"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "A referência deve ser única por empresa!"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Cotações"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Lista de Preços para esta ordem de venda."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "IVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Número de dias entre a confirmação da ordem de venda e a expedição dos "
-"artigos ao cliente."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Data da cotação"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posição Fiscal"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Número de Embalagens"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Em Progresso"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"O Vendedor confirma a cotação. O estado da ordem de venda passa a 'em "
-"processamento' ou 'Em Processamento Manual'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr "Não pode cancelar uma linha da ordem de venda que já foi faturada!"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Deve primeiro cancelar as movimentações de stock anexadas a esta linha de "
-"ordem de venda."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/d)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Selecione um artigo de um tipo de serviço que é chamado de 'Artigo "
-"Avançado'. Pode ter que o criar e defini-lo como um valor por omissão neste "
-"campo."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Não pode é possível adiar uma ordem de venda                              "
-"que é definida como \"Fatura automática depois da entrega'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "O nome da empresa deve ser único!"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Morada de faturação para esta ordem de venda."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Mês-1"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Ordenado pelo mês da ordem de vendas"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Não pode agrupar vendas que tenham moedas diferentes para o mesmo parceiro."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Entregar cada artigo quando estiver disponível"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Faturado"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Ordem de Entrega"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Data de confirmação"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Parceiro do lote"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Março"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr "Não pode mover os artigos de ou para um local de tipo vista."
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Baseado na ordem de vendas"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Montante total."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Endereço da Fatura :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "Sequência da linha"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Para cada linha de pedido de vendas, uma ordem de aquisição é criada para "
-"fornecer o artigo vendido."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm que significa \"International Commercial Terms\" implica numa série "
-"de vendas de termos que são utilizados na transação comercial."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Endereço da Fatura"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Procurar linhas não faturadas"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Cotação / Ordem"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de Linhas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Vendas Abrir Fatura"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Linha da ordem de venda"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Armazém"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Ordem Nº"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Linhas da Ordem"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Montante sem Imposto"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Linhas para Faturar"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Quantidade (UdM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Data da Criação"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Diversos"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Linhas não Faturadas e Entregues"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "As minhas vendas"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Ação Inválida!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Informação Extra"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Lista de Preços"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# de Qtd"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "Hora"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Data da Ordem"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Enviado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Todas as cotações"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "Opções"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Setembro"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Não pode confirmar uma ordem de venda que não tem nenhuma linha."
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Tem que selecionar uma lista de preços ou um cliente no formulário da "
-"venda!\n"
-"Por favor defina um antes de escolher o artigo."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Categoria do artigo"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Impostos :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Movimentos de Stock"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Estado da Ordem"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Quer mesmo criar as faturas?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Vendas por mês"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Não foi possível cancelar a linha da ordem de venda."
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Dias de segurança"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Aprovisionamento do material vendido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Criar fatura final"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Endereço para Envio"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Ele indica que a ordem de venda foi entregue. Este campo é atualizado "
-"somente depois que o horário(s) foram lançados."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Data"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Filtros Avançados..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Excepção"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Empresas"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-"Dá o estado do orçamento ou ordem de venda. \n"
-"O estado de exceção é definido automaticamente quando uma operação de "
-"cancelamento ocorre na validação de fatura (Exceção Fatura) ou no processo "
-"da lista picking (Exceção Envio)."
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Nenhuma linha válida da lista de preços encontrada"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Histórico"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Fatura após a ordem de entrega"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Esta é a lista de faturas que foram geradas por esta ordem de venda. A mesma "
-"ordem de venda pode ter sido faturada várias vezes (por linha, por exemplo)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Sua Referência"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-"O nome e a morada do contato que fez uma encomenda ou pediu uma cotação"
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Estes são os dias adicionados aos que prometeu aos clientes para fins de "
-"segurança"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Qtd"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referências"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Minhas linhas da ordem de vendas"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Ordem de referência deve ser única por empresa!"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Criar Fatura"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Total sem impostos"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Referência da ordem"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "A sua fatura foi criada com êxito!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Vendas por parceiro"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Pedido de Contato"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Abrir fatura"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr "Email automático confirmando ordens de venda"
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Não há registos de vendas definidos para esta empresa: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forçar Atribuição"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "sob pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Baseado nas quantidades expedidas ou nas da ordem de venda."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Entregar todos os artigos de uma só vez"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Escolher recepção"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Endereço para envio :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Vendas por cliente nos últimos 90 dias"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Estado projeto de ordem de venda"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Criar ordem de entrega"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-"Não é possível excluir uma linha da ordem de vendas que esteja no estado "
-"'%s'!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "Qtde(UoS)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total com impostos"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Criar Lista de Pick"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Data do Pedido da ordem de vendas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Vendas por categoria de artigo"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar cotação"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Erro"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Recriar Fatura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Entregas a faturar"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "A Espera da Agenda"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Método de aquisição"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Escolha Lista"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Definir como Rascunho"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Documento do movimento para a saída ou para o cliente."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-"\n"
-"Olá${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Aqui está o seu pedido de confirmação para ${object.partner_id.name}:\n"
-"       | Número da ordem: *${object.name}*\n"
-"       | Total da ordem: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Data da ordem: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Referência da ordem: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | A sua referência: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | O seu contato: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"Pode ver a confirmação do pedido, fazer o download deste e até mesmo pagar "
-"on-line usando o link que se segue:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"Também pode pagar diretamente pela Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"Se tiver alguma questão, não hesite em contatar-nos.\n"
-"\n"
-"\n"
-"Obrigado por escolher ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Validar"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Confirmar Ordem"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Criar ordem de aquisição"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impostos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Ordem de vendas pronta a ser faturada"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Data em que a ordem de venda é criada."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Movimento do Stock"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Criar Faturas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Ordens de vendas criadas este mês"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-"Se 'em ordem', ele dispara um contrato de venda quando a ordem é confirmada "
-"para criar uma tarefa, a ordem de compra ou ordem de produção é ligada a "
-"esta linha de ordem de venda."
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Adiantamento do Valor"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "Cobram a entrega?"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Quantidades Enviadas"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Fatura Baseada nas Ordens de Vendas"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Se alterar a lista de preços desta ordem (e, eventualmente, a moeda), os "
-"preços das linhas de pedidos existentes não serão atualizados."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Lista Picking"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Erro !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Não foi possível cancelar a ordem de venda!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "Qtde (UdM)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Ordenar por ano a ordem de venda"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julho"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Aquisição"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Excepção de Expedição"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "Informação Picking! : "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar as faturas"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "Politica da fatura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "Configure o seu método de faturação"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "A ser revisto pelo contabilista"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referência UdM"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-"Esta ferramenta irá ajudá-lo a instalar o módulo correto e configurar o "
-"sistema de acordo com o método que é usado para faturar aos clientes."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
@@ -1500,14 +1194,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Sale OrderLine Make_invoice"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Exceção da Fatura"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Configura aquisições e faturação"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Rascunho"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1515,575 +1204,9 @@ msgid "Paid"
 msgstr "Pago"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Análise de vendas"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
-"Selecionou uma quantidade de Unidades %d.\n"
-"Mas não é compatível com a embalagem escolhida.\n"
-"Aqui está uma proposição de quantidades de acordo com a embalagem:\n"
-"EAN: %s Quantidade: %s Tipo de ul: %s"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recriar embalagem"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Propriedades"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Cotação"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"O vendedor cria uma fatura manualmente, se a política de entrega da ordem de "
-"vendas é 'Entrega Manual em Processamento'. A fatura é criada "
-"automaticamente se a política de entrega é 'Pagamento depois da Entrega'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr "Pode gerar faturas baseadas na ordens de venda ou de envios."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Linhas da ordem de vendas confirmadas, mas ainda não foram entregues"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Faturas de clientes"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Vendas"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Preço Unitário"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Concluído"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Terá que selecionar um cliente no formulário de vendas!\n"
-"Por favor escolha um cliente antes de escolher um artigo."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Documento de Origem"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "A Fazer"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Politica de Picking"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documento do movimento para o cliente."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Valor sem Imposto"
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Primeiro terá que cancelar todos as recolhas anexadas a esta ordem de venda."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Fatura de Pagamento de Adiantamento das vendas"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mês"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Artigo"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Cancelar Atribuição"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Turnover Mensal"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Fatura sobre"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Data Pedida"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UoS do artigo"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual em Progresso"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "UdM do artigo"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logística"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Ordem"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "Não há conta de despesas definida para este artigo:\"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorar Excepção"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Dependendo da ordem de vendas e controle das faturas, estas pode ser "
-"baseadas em entregas ou em quantidades encomendadas. Assim, uma ordem de "
-"venda pode gerar uma fatura ou uma ordem de entrega, assim que é confirmada "
-"pelo vendedor."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Pretende vender %.2f %s mas só tem %.2f %s disponível !\n"
-"O stock real é %.2f %s. (sem reservas)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Estados"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referência do cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Preço"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Dependendo da configuração da localização do Output, o movimento entre o "
-"Output e que o cliente é feito manualmente ou automaticamente através da "
-"Ordem de Entrega ."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Pagar antes da entrega"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Painel de controlo de vendas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Criar faturas"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Para Faturar"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Data em que ordem de venda é confirmada."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "Contrato / Conta Analítica"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Empresa"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Data da Fatura"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "O valor a ser faturado com antecedência."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"Não foi possível encontrar uma linha de lista de preços para este artigo e "
-"quantidade.\n"
-"Deve mudar o artigo, a quantidade ou a lista de preços."
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "Esta é a lista de picking que foi gerada por esta ordem de venda."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Criar Faturas"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total Líquido :"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelada"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Linhas da ordem de vendas relacionadas com uma ordem de vendas minha"
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Loja"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Confirmar Data"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Aviso!"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Vendas por mês"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Ordem de venda"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Quantidade (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Linhas da ordem de vendas que estejam no estado 'Concluído'"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"O formulário da Lista Pick é criado assim que a ordem de vendas é "
-"confirmada, ao mesmo tempo que a ordem de aquisição. Ele representa a "
-"atribuição de peças para a ordem de vendas. Há uma lista de seleção de linha "
-"da ordem de vendas que evolui com a disponibilidade das peças."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmado"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "Métodos principais baseados"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erro! Não pode criar empresas recursivas."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Vendas pela Categoria dos artigos nos últimos 90 dias."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Linhas da Fatura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Linhas da Ordem de Venda"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Prazo de entrega da lead"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuração"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "Lista Preços EDI (%s)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr "Ordem de Impressão"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Ordens de Vendas criadas este ano"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Fatura não pode ser criada para esta linha de Ordem de vendas devido a uma "
-"das seguintes razões:\n"
-"1.O estado desta linha ordem de vendas esteja como \"Projeto\" ou "
-"\"cancelada\"!\n"
-"2.A linha da ordem de vendas é faturada!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Linhas da ordem de vendas concluídas"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Faturas"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Dezembro"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Imagem"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"A ordem de aquisição é criada automaticamente, logo que uma ordem de vendas "
-"é confirmada ou a fatura é paga. Que impulsiona a compra e a produção de "
-"artigos em relação às regras e aos parâmetros da ordem de vendas. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Por faturar"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Vendedor"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Cotações antigas"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Montante sem imposto"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Adiantamento da Fatura"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "A ordem de vendas '%s' foi cancelada"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Rascunho"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -2109,6 +1232,18 @@ msgstr ""
 "* O estado 'Cancelado' é definido quando o utilizador cancela a ordem de "
 "vendar relacionada."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Ordens de Vendas"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar as faturas"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2116,57 +1251,170 @@ msgstr "O valor do imposto."
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Embalagens"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Linhas da ordem de vendas prontas para serem faturadas"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Estado"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Ordem de vendas criadas no mês passado"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Configura aquisições e faturação"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junho"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "Email Templates"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Ordens de Vendas"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Ordem"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Aviso Lista de Preços!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Loja"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estatísticas de ordens de venda"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Data"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Linha da ordem de venda"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Novembro"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtros Avançados..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Artigo \"Adiantamento\""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepção"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"O vendedor cria uma fatura manualmente, se a política de entrega da ordem de "
+"vendas é 'Entrega Manual em Processamento'. A fatura é criada "
+"automaticamente se a política de entrega é 'Pagamento depois da Entrega'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"É necessário cancelar todas as faturas ligadas a esta ordem de vendas."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2178,95 +1426,331 @@ msgstr "Janeiro"
 msgid "Sales Order in Progress"
 msgstr "Ordem de Venda em Progresso"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"O Vendedor confirma a cotação. O estado da ordem de venda passa a 'em "
+"processamento' ou 'Em Processamento Manual'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr "Da referência do documento que gerou a ordem do pedido de vendas."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Nenhuma linha válida da lista de preços encontrada"
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Atraso no Compromisso"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "Entrega & Fatura a pedido"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Linhas da ordem de vendas confirmadas, mas ainda não foram entregues"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+#: view:sale.order:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
-"Uma ordem de Aquisições para cada linha de pedido de vendas e para cada um "
-"dos componentes."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Atribuir"
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Esta é a lista de faturas que foram geradas por esta ordem de venda. A mesma "
+"ordem de venda pode ter sido faturada várias vezes (por linha, por exemplo)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Sua Referência"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Data da ordem"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Lista de Preços"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Faturas de clientes"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Confirmação da fatura da ordem de vendas."
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Ordem de Vendas que ainda não foram confirmadas"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Linhas da Ordem de Venda"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Vendas"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "A ordem de vendas '%s' foi definida com o estado rascunho."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Se alterar a lista de preços desta ordem (e, eventualmente, a moeda), os "
+"preços das linhas de pedidos existentes não serão atualizados."
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "do stock"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Dia"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Fechar"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Faturas"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Preço Unitário"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Concluído"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Endereço da Fatura :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Fatura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Minhas linhas da ordem de vendas"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "Sem Lista de Preços ! : "
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Entregue"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Cotação"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Tem de associar um lote de produção a este artigo"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Procurar linhas não faturadas"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
-"Se tiver mais que uma loja de revenda de artigos da empresa, pode criar e "
-"gerir a partir daqui. Sempre que for gravar uma nova cotação ou ordem de "
-"venda, tem que estar ligado a uma loja. A loja também define o armazém do "
-"qual os artigos serão entregues para cada venda particular."
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Ordem de referência deve ser única por empresa!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "A Fazer"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Endereço para envio :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Não pode agrupar vendas que tenham moedas diferentes para o mesmo parceiro."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análise de vendas"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Lista de Preços para esta ordem de venda."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Criar Fatura"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Valor sem Imposto"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Referência da ordem"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2274,61 +1758,67 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Isto indica que a fatura foi paga."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr "Não pode cancelar uma linha da ordem de venda que já foi faturada!"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Artigo"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Descrição"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Maio"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Avançar"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Fevereiro"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Abril"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Contabilidade"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Procurar ordens de venda"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Requisição da ordem de vendas"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
-msgstr "Sem stock suficiente ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Termo do Pagamento"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Preço"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2346,25 +1836,358 @@ msgstr ""
 "quiser analisar o volume dos negócios, deve usar o relatório de análise da "
 "fatura na aplicação da Contabilidade."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Quer mesmo criar as faturas?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Outra informação"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Qtd"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "A ser revisto pelo contabilista"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Endereço de entrega para esta ordem de venda."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Cotação / Ordem"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Avançar"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Fevereiro"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Fatura sobre"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data Pedida"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UoS do artigo"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estado projeto de ordem de venda"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento de Origem"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual em Progresso"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Minhas Ordens de Venda"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Procurar ordens de venda"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Ordenado pelo mês da ordem de vendas"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Tem que selecionar uma lista de preços ou um cliente no formulário da "
+"venda!\n"
+"Por favor defina um antes de escolher o artigo."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "A partir de ordem de venda"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar Excepção"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Dependendo da ordem de vendas e controle das faturas, estas pode ser "
+"baseadas em entregas ou em quantidades encomendadas. Assim, uma ordem de "
+"venda pode gerar uma fatura ou uma ordem de entrega, assim que é confirmada "
+"pelo vendedor."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "A conta analítica relacionada com uma ordem de venda."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Termo do Pagamento"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Ordem de vendas pronta a ser faturada"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Cotação nº"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referência do cliente"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Escolhido"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Ano"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Fatura Baseada em Entregas"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total com impostos"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Faturado"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Data do Pedido da ordem de vendas"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Quantidade (UdM)"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Erro"
+
+#~ msgid "Close"
+#~ msgstr "Fechar"
 
 #~ msgid "Deliver"
 #~ msgstr "Entrega"
@@ -2378,6 +2201,15 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Declaração Automática"
 
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Movimentos do Inventário"
+
+#~ msgid "Notes"
+#~ msgstr "Notas"
+
 #~ msgid "Origin"
 #~ msgstr "Origem"
 
@@ -2387,33 +2219,51 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Procure Method"
 #~ msgstr "Método de Aquisição"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Quantidades Enviadas"
+
 #~ msgid "Manual Description"
 #~ msgstr "Descrição do Manual"
 
+#~ msgid "Configuration"
+#~ msgstr "Configuração"
+
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Erro: UOS deve estar em uma categoria diferente do que o UOM"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
+#~ msgid "Procurement"
+#~ msgstr "Aquisição"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Contas de Pagamento"
 
 #~ msgid "Canceled"
 #~ msgstr "Cancelado"
 
+#~ msgid "Salesman"
+#~ msgstr "Vendedor"
+
 #~ msgid "My sales in shipping exception"
 #~ msgstr "Minhas vendas na excepção de envio"
 
-#~ msgid "Status"
-#~ msgstr "Estado"
+#~ msgid "on order"
+#~ msgstr "sob pedido"
 
-#~ msgid "Sale Order"
-#~ msgstr "Ordem de Venda"
+#~ msgid "Properties"
+#~ msgstr "Propriedades"
 
-#~ msgid "Sequence"
-#~ msgstr "Sequência"
+#~ msgid "Compute"
+#~ msgstr "Calcular"
 
 #~ msgid "Other data"
 #~ msgstr "Outros dados"
 
+#~ msgid "UoM"
+#~ msgstr "UdM"
+
 #~ msgid "Sales order"
 #~ msgstr "Ordem de Venda"
 
@@ -2423,6 +2273,9 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Make invoices"
 #~ msgstr "Criar Facturas"
 
+#~ msgid "Name"
+#~ msgstr "Nome"
+
 #~ msgid "Total amount"
 #~ msgstr "Montante Total"
 
@@ -2441,6 +2294,9 @@ msgstr "Fatura Baseada em Entregas"
 #~ "mesma ordem de venda pode ter sido facturado várias vezes (por exemplo por "
 #~ "linha)."
 
+#~ msgid "States"
+#~ msgstr "Estados"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Erro: Código ean inválido"
 
@@ -2450,6 +2306,10 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Sale Order line"
 #~ msgstr "Linha da Ordem de Venda"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Erro !"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome de modelo inválido na definição da acção"
 
@@ -2466,15 +2326,36 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Sales Configuration"
 #~ msgstr "Configuração das Vendas"
 
+#~ msgid "Assign"
+#~ msgstr "Atribuir"
+
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
+#~ msgid "Accounting"
+#~ msgstr "Contabilidade"
+
+#~ msgid "Product UoM"
+#~ msgstr "UdM do artigo"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Entrega Parcial"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Ordem de Entrega"
+
+#~ msgid "from stock"
+#~ msgstr "do stock"
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Etapas para Entregar uma Ordem de Venda"
 
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "A sua factura foi criada com sucesso !"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Definir como Rascunho"
+
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Entrega, do armazém para o cliente."
 
@@ -2501,12 +2382,18 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Invoice after delivery"
 #~ msgstr "Factura depois da entrea"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Excepção de Expedição"
+
 #~ msgid "Outgoing Products"
 #~ msgstr "Artigos de Saída"
 
 #~ msgid "Procurement is created after confirmation of sale order."
 #~ msgstr "A aquisição é criada depois da confirmação da ordem de venda."
 
+#~ msgid "Extra Info"
+#~ msgstr "Informação Extra"
+
 #~ msgid "Net Price"
 #~ msgstr "Preço Líquido"
 
@@ -2545,6 +2432,12 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Sale Shop"
 #~ msgstr "Loja de Venda"
 
+#~ msgid "Warehouse"
+#~ msgstr "Armazém"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Forçar Atribuição"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2575,6 +2468,9 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Packing"
 #~ msgstr "Embalgem"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Confirmar Ordem"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Factura em Ordem Depois da Entrega"
 
@@ -2615,6 +2511,9 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Não foi possível cancelar esta ordem de venda !"
 
+#~ msgid "Packaging"
+#~ msgstr "Embalagem"
+
 #~ msgid "Order Ref"
 #~ msgstr "Ref da Ordem"
 
@@ -2673,6 +2572,10 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Packing Policy"
 #~ msgstr "Política de Embalagem"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "metodo inválido para test_state"
+
 #~ msgid "Our Salesman"
 #~ msgstr "Nosso Vendedor"
 
@@ -2721,6 +2624,9 @@ msgstr "Fatura Baseada em Entregas"
 #~ "quando a factura é confirmada mas espere pelo programador para executar na "
 #~ "data 'Data Pedida'."
 
+#~ msgid "Number Packages"
+#~ msgstr "Número de Embalagens"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2775,6 +2681,9 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Sale Order Line"
 #~ msgstr "Linha de Ordem de Venda"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Cancelar Atribuição"
+
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Factura a partir da Embalagem"
 
@@ -2812,9 +2721,37 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Pagamento Antes da Entrega"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Movimentos de Stock"
+
+#~ msgid "Dates"
+#~ msgstr "Datas"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Vendas, por vendedor"
+
+#~ msgid "State"
+#~ msgstr "Estado"
+
+#~ msgid "Conditions"
+#~ msgstr "Condições"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/d)"
+
 #~ msgid "  Year  "
 #~ msgstr "  Ano  "
 
+#~ msgid "Companies"
+#~ msgstr "Empresas"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Criar fatura final"
+
+#~ msgid "References"
+#~ msgstr "Referências"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Custos de expedição"
 
@@ -2824,31 +2761,86 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
 #~ msgid "   Month   "
 #~ msgstr "   Mês   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Aviso!"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Progresso da configuração"
 
+#~ msgid "Image"
+#~ msgstr "Imagem"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Tem de associar um lote de produção a este artigo"
+
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Fusão de ordens de vendas"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "A sua fatura foi criada com êxito!"
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Stock insuficiente!"
 
+#~ msgid "All Quotations"
+#~ msgstr "Todas as cotações"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Configurar logística das ordens de venda"
 
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Configure a política de recolhas das ordens de venda"
 
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Número de dias entre a confirmação da ordem de venda e a expedição dos "
+#~ "artigos ao cliente."
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Recriar embalagem"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Não existe conta da categoria de rendimento definida nas propriedades padrão "
+#~ "para a categoria de artigo ou a posição fiscal não está definida!"
+
+#~ msgid "Security Days"
+#~ msgstr "Dias de segurança"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Aprovisionamento do material vendido"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Datas da Ordem de Vendas"
 
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Configuração da Aplicação de Vendas"
 
+#~ msgid "Open Invoice"
+#~ msgstr "Abrir fatura"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Estes são os dias adicionados aos que prometeu aos clientes para fins de "
+#~ "segurança"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Baseado nas quantidades expedidas ou nas da ordem de venda."
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Política de expedição"
 
@@ -2866,9 +2858,50 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Complete Delivery"
 #~ msgstr "Entrega total"
 
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "A fatura é criada automaticamente se a política de transporte é 'fatura "
+#~ "baseada na recolha' ou 'fatura baseada na ordem após entrega'."
+
 #~ msgid "Configure"
 #~ msgstr "Configurar"
 
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Vendas por vendedor nos últimos 90 dias"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "A cotação '%s' foi convertida numa ordem de venda."
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Deve primeiro cancelar as movimentações de stock anexadas a esta linha de "
+#~ "ordem de venda."
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Não foi possível cancelar esta ordem de venda!"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Não foi possível cancelar a linha da ordem de venda."
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Vendas por cliente nos últimos 90 dias"
+
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Total sem impostos"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Criar ordem de entrega"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Não foi possível cancelar a ordem de venda!"
+
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Expedição e Factura Manual"
 
@@ -2888,6 +2921,12 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Shipped Qty"
 #~ msgstr "Qtd Enviada"
 
+#~ msgid "Delivered"
+#~ msgstr "Entregue"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Unidades de ordens de aquisição para cada linha de pedido de vendas."
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -2912,6 +2951,9 @@ msgstr "Fatura Baseada em Entregas"
 #~ "  - A escolha 'Factura da Recolha' é usada para criar uma factura durante o "
 #~ "processo de recolha."
 
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Tentou atribuir um lote que não é do mesmo artigo"
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr ""
 #~ "Melhore o núcleo da Aplicação e Vendas com funcionalidades adicionais."
@@ -2919,6 +2961,13 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Ordem de Referência deve ser exclusiva !"
 
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Para cada linha de pedido de vendas, uma ordem de aquisição é criada para "
+#~ "fornecer o artigo vendido."
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Configure o fluxo de vendas e os valores pré-definidos."
 
@@ -2975,6 +3024,15 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Picking Default Policy"
 #~ msgstr "Escolher política por omissão"
 
+#~ msgid "Related Picking"
+#~ msgstr "Escolher recepção"
+
+#~ msgid "Pick List"
+#~ msgstr "Escolha Lista"
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Documento do movimento para a saída ou para o cliente."
+
 #, python-format
 #~ msgid "Picking Information !"
 #~ msgstr "Recolher Informação !"
@@ -2996,6 +3054,14 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Recolha de Lista & Ordem de Entrega"
 
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Documento do movimento para o cliente."
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Primeiro terá que cancelar todos as recolhas anexadas a esta ordem de venda."
+
 #~ msgid "Invoicing"
 #~ msgstr "Facturação"
 
@@ -3014,6 +3080,31 @@ msgstr "Fatura Baseada em Entregas"
 #~ "O \"Waiting Schedule\" estado que é atribuído quando a factura é confirmada, "
 #~ "mas espera que o sequênciador a tenha atribuído como \"Data do Pedido\" ."
 
+#~ msgid "Logistic"
+#~ msgstr "Logística"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Pretende vender %.2f %s mas só tem %.2f %s disponível !\n"
+#~ "O stock real é %.2f %s. (sem reservas)"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Não há registos de vendas definidos para esta empresa: \"%s\" (id:%d)"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Dependendo da configuração da localização do Output, o movimento entre o "
+#~ "Output e que o cliente é feito manualmente ou automaticamente através da "
+#~ "Ordem de Entrega ."
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Não é possível eliminar a linha da ordem de vendas que é %s !"
@@ -3039,6 +3130,12 @@ msgstr "Fatura Baseada em Entregas"
 #~ "\n"
 #~ "EAN: %s Quantidade: %s Tipo de ul: %s"
 
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Vendas pela Categoria dos artigos nos últimos 90 dias."
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Prazo de entrega da lead"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Mês-1    "
 
@@ -3051,6 +3148,13 @@ msgstr "Fatura Baseada em Entregas"
 #~ "entregar o mais cedo possível quando um artigo está disponível ou se espera "
 #~ "que todos os artigos estão disponíveis .."
 
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "A ordem de vendas '%s' foi cancelada"
+
+#~ msgid "Packings"
+#~ msgstr "Embalagens"
+
 #~ msgid "Invoicing journals"
 #~ msgstr "Facturas Diárias"
 
@@ -3060,11 +3164,34 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Melhoria do Layout da Ordem vendas"
 
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Uma ordem de Aquisições para cada linha de pedido de vendas e para cada um "
+#~ "dos componentes."
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr ""
 #~ "Não é possível eliminar a(s) ordem(s) de vendas que já foram confirmadas !"
 
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "A ordem de vendas '%s' foi definida com o estado rascunho."
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Se tiver mais que uma loja de revenda de artigos da empresa, pode criar e "
+#~ "gerir a partir daqui. Sempre que for gravar uma nova cotação ou ordem de "
+#~ "venda, tem que estar ligado a uma loja. A loja também define o armazém do "
+#~ "qual os artigos serão entregues para cada venda particular."
+
 #~ msgid "Adds commitment, requested and effective dates on Sales Orders."
 #~ msgstr "Adicionar compromisso, pede e define datas na ordem de vendas."
 
@@ -3078,14 +3205,546 @@ msgstr "Fatura Baseada em Entregas"
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Passos para entregar a ordem de vendas"
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Requisição da ordem de vendas"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr ""
 #~ "Fornece alguns recursos para melhorar a apresentação dos relatórios da Ordem "
 #~ "de vendas."
 
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Baseada nas tarefas' Trabalho"
+
+#~ msgid "Print Quotation"
+#~ msgstr "Imprimir Cotação"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Unidade de tempo de trabalho principal"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Com base na folha de horas"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Fatura baseada nas entregas"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Baseado nas ordens de entrega"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Para excluir uma ordem de venda confirmada, deve cancelá-la antes! Para "
+#~ "cancelar uma ordem de venda, primeiro deve cancelar picking relacionada para "
+#~ "as ordens de entrega."
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "A Política da fatura é usada para sincronizar a fatura e operações de "
+#~ "entrega.\n"
+#~ "  - A opção 'Pague antes da entrega \" irá gerar primeiro a fatura e, em "
+#~ "seguida, gerar a ordem picking após o pagamento desta fatura.\n"
+#~ "  - A opção \"Entrega & fatura a pedido ' vai criar a separação de pedidos "
+#~ "diretamente e esperar que o utilizador clique manualmente no botão' fatura "
+#~ "'para gerar o rascunho da fatura com base na ordem de venda ou as linhas da "
+#~ "ordem de venda.\n"
+#~ "  - A opção 'Fatura após Entrega' irá gerar o rascunho da fatura baseada na "
+#~ "ordem de vendas depois de todas as listas de picking terem sido terminadas.\n"
+#~ "  - A opção 'Fatura baseada nas entregas' é usada para criar uma fatura "
+#~ "durante o processo de picking."
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "O nome da empresa deve ser único!"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "A referência deve ser única por empresa!"
+
+#~ msgid "Month-1"
+#~ msgstr "Mês-1"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Erro Configuração !"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Entregar cada artigo quando estiver disponível"
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr "Não pode mover os artigos de ou para um local de tipo vista."
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Baseado na ordem de vendas"
+
+#~ msgid "Line Sequence"
+#~ msgstr "Sequência da linha"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Diversos"
+
+#~ msgid "Options"
+#~ msgstr "Opções"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Entregar todos os artigos de uma só vez"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Fatura após a ordem de entrega"
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Email automático confirmando ordens de venda"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "Dá o estado do orçamento ou ordem de venda. \n"
+#~ "O estado de exceção é definido automaticamente quando uma operação de "
+#~ "cancelamento ocorre na validação de fatura (Exceção Fatura) ou no processo "
+#~ "da lista picking (Exceção Envio)."
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Qtde(UoS)"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr ""
+#~ "Não é possível excluir uma linha da ordem de vendas que esteja no estado "
+#~ "'%s'!"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "Informação Picking! : "
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Cobram a entrega?"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Ordens de vendas criadas este mês"
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "Se 'em ordem', ele dispara um contrato de venda quando a ordem é confirmada "
+#~ "para criar uma tarefa, a ordem de compra ou ordem de produção é ligada a "
+#~ "esta linha de ordem de venda."
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Qtde (UdM)"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Pagar antes da entrega"
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Configure o seu método de faturação"
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Politica da fatura"
+
+#~ msgid "Print Order"
+#~ msgstr "Ordem de Impressão"
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Métodos principais baseados"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Ordens de Vendas criadas este ano"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "Não foi possível encontrar uma linha de lista de preços para este artigo e "
+#~ "quantidade.\n"
+#~ "Deve mudar o artigo, a quantidade ou a lista de preços."
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "Sem stock suficiente ! : "
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Ordem de vendas criadas no mês passado"
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Entrega & Fatura a pedido"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Se não tiver stock sufeciente disponível para entregar de uma vez, aceita "
+#~ "transferências parciais ou não?"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Aqui está uma lista de cada pedido de vendas a ser faturado. Pode faturar "
+#~ "ordens de venda parcialmente, por linhas de pedido de vendas. Não precisa "
+#~ "desta lista se faturar os pedidos de entrega ou se facturar a venda "
+#~ "totalmente."
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Aviso !"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Ordem de aquisição"
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Pedidos de Vendas ajudá-lo a gerir citações e ordens de seus clientes. "
+#~ "OpenERP sugere que se comece a criar um orçamento. Uma vez confirmada, a "
+#~ "cotação será convertida numa ordem de venda. O OpenERP pode gerir vários "
+#~ "tipos de artigos, possibilitando que uma ordem de venda desencadeie tarefas, "
+#~ "ordens de entrega, ordens de produção, compras e assim por diante. Com base "
+#~ "na configuração da ordem de vendas, uma fatura projeto será gerada para que "
+#~ "só tenha que confirmar isso quando quiser faturar o cliente."
+
+#~ msgid "Order Line"
+#~ msgstr "Linha da ordem"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Painel de controlo de gestão de vendas"
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Não pode é possível adiar uma ordem de venda                              "
+#~ "que é definida como \"Fatura automática depois da entrega'."
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Selecione um artigo de um tipo de serviço que é chamado de 'Artigo "
+#~ "Avançado'. Pode ter que o criar e defini-lo como um valor por omissão neste "
+#~ "campo."
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm que significa \"International Commercial Terms\" implica numa série "
+#~ "de vendas de termos que são utilizados na transação comercial."
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Vendas Abrir Fatura"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Montante sem Imposto"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Linhas para Faturar"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Deseja realmente criar a fatura(s) ?"
 
+#~ msgid "Sales By Month"
+#~ msgstr "Vendas por mês"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Ele indica que a ordem de venda foi entregue. Este campo é atualizado "
+#~ "somente depois que o horário(s) foram lançados."
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr ""
+#~ "O nome e a morada do contato que fez uma encomenda ou pediu uma cotação"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Vendas por parceiro"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Pedido de Contato"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Entregas a faturar"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Método de aquisição"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Vendas por categoria de artigo"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Criar Lista de Pick"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Criar ordem de aquisição"
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+#~ msgstr ""
+#~ "\n"
+#~ "Olá${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Aqui está o seu pedido de confirmação para ${object.partner_id.name}:\n"
+#~ "       | Número da ordem: *${object.name}*\n"
+#~ "       | Total da ordem: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Data da ordem: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Referência da ordem: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | A sua referência: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | O seu contato: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "Pode ver a confirmação do pedido, fazer o download deste e até mesmo pagar "
+#~ "on-line usando o link que se segue:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "Também pode pagar diretamente pela Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "Se tiver alguma questão, não hesite em contatar-nos.\n"
+#~ "\n"
+#~ "\n"
+#~ "Obrigado por escolher ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+
+#~ msgid "Stock Move"
+#~ msgstr "Movimento do Stock"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Fatura Baseada nas Ordens de Vendas"
+
+#~ msgid "Picking List"
+#~ msgstr "Lista Picking"
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr ""
+#~ "Esta ferramenta irá ajudá-lo a instalar o módulo correto e configurar o "
+#~ "sistema de acordo com o método que é usado para faturar aos clientes."
+
+#~ msgid "Reference UoM"
+#~ msgstr "Referência UdM"
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Selecionou uma quantidade de Unidades %d.\n"
+#~ "Mas não é compatível com a embalagem escolhida.\n"
+#~ "Aqui está uma proposição de quantidades de acordo com a embalagem:\n"
+#~ "EAN: %s Quantidade: %s Tipo de ul: %s"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr "Pode gerar faturas baseadas na ordens de venda ou de envios."
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Terá que selecionar um cliente no formulário de vendas!\n"
+#~ "Por favor escolha um cliente antes de escolher um artigo."
+
+#~ msgid "Picking Policy"
+#~ msgstr "Politica de Picking"
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr "Não há conta de despesas definida para este artigo:\"%s\" (id:%d)"
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "Esta é a lista de picking que foi gerada por esta ordem de venda."
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Erro! Não pode criar empresas recursivas."
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "O formulário da Lista Pick é criado assim que a ordem de vendas é "
+#~ "confirmada, ao mesmo tempo que a ordem de aquisição. Ele representa a "
+#~ "atribuição de peças para a ordem de vendas. Há uma lista de seleção de linha "
+#~ "da ordem de vendas que evolui com a disponibilidade das peças."
+
+#~ msgid "Sales by Month"
+#~ msgstr "Vendas por mês"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "A ordem de aquisição é criada automaticamente, logo que uma ordem de vendas "
+#~ "é confirmada ou a fatura é paga. Que impulsiona a compra e a produção de "
+#~ "artigos em relação às regras e aos parâmetros da ordem de vendas. "
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "É necessário cancelar todas as faturas ligadas a esta ordem de vendas."
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Fatura Baseada em Entregas"
+
 #~ msgid "VAT"
 #~ msgstr "NIF"
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index a0da9610357..eb8267d5126 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -7,20 +7,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-07-28 16:28+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Baseado na Planilha de Horas"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avançar Fatura"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar Cotação"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Painel de Vendas"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Data de Confirmação"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Agrupado Por..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -31,1804 +180,104 @@ msgstr ""
 "Linhas do Pedido de Venda que estão confirmadas, feitas ou em situação de "
 "excessão e não foram ainda faturadas."
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Vendas por Vendedor nos últimos 90 dias"
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-"Se não houver estoque disponível para entregar tudo de uma vez, você aceita "
-"embarques parciais?"
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr "UoS"
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Endereço de entrega para o pedido de venda atual."
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Quantidade"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Dia"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Cancelar Pedido"
-
-#. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "A cotação  '%s' foi convertida em um pedido de venda."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Imprimir Cotação"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr "Aviso !"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr "Imposto"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Comanda os pedidos de aquisição para cada linha do pedido de venda."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Centro de Custo"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Aqui está uma lista com cada linha do pedido de venda que deve ser faturada. "
-"Você pode faturar pedidos de venda parcialmente, por linhas do pedido. Você "
-"nao precisa desta lista se você faturar a partir da entrega ou se você "
-"fatura completamente as vendas."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-"Para excluir um pedido de venda confirmado, você precisa cancelar antes! "
-"Para cancelar um pedido de venda, você precisa primeiro cancelar as ordens "
-"de entrega ou de separação."
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Ordem de Compra"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Parceiro"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Faturamento baseado nas entregas"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Item da Ordem"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-"Pedidos de Venda ajudam você a gerenciar cotações e pedidos de seus "
-"clientes. O OpenERP sugere que você comece criando a cotação. Uma vez "
-"confirmada, a cotação será convertida em um Pedido de Venda. Podem ser "
-"manipulados vários tipos de produtos, assim o pedido pode disparar tarefas, "
-"ordem de entrega, ordem de fabricação, compras e assim por diante. Com base "
-"na configuração do pedido de vendas, uma fatura provisória será gerada. "
-"Desta forma você precisa apenas confirmar o pedido quando quiser cobrar seu "
-"cliente."
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-"A ordem de venda vai criar automaticamente a proposta de fatura (rascunho da "
-"fatura). As quantidades encomendadas e entregues podem não serem as mesmas. "
-"Você deve optar se quer sua fatura com base nas quantidades encomendadas ou "
-"embarcadas. Se o produto é um serviço, as quantidades de embarque são as "
-"horas gastas nas tarefas associadas."
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Condição de Pagamento Padrão"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Baseado nas Ordens de Entrega"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "Unidade de Tempo Principal"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Status"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Desc. (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Preço Total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Marque a caixa para agrupar as faturas do mesmo cliente"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Meus Pedidos de Venda"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Quantidades Pedidas"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Vendas por Vendedor"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Movimentação de Estoque"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referência da Ordem"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Outras Informações"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Datas"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"A fatura é criada automaticamente se a política de transport é 'Escolha de "
-"Fatura' ou 'Fatura na ordem após entrega'."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "Baseado no Trabalho da Tarefa"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Cotação e Vendas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Fatura de Vendas"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Atenção com a Lista de Preços"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Desconto (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Minhas Cotações"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Painel do Gerente de Vendas"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Empacotamento"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "A partir de pedido de venda"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Nome da Loja"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"A política de Fatura é usada para sincronizar operações de faturamento e "
-"entrega.\n"
-"  - 'Faturar antes da entrega' irá primeiro gerar a fatura e então gerar a "
-"ordem de separação depois do pagamento desta fatura.\n"
-"  - 'Entrega e Fatura na demanda' irá criar uma ordem de separação "
-"diretamente e esperar o usuário clicar no botão 'Fatura' para gerar uma "
-"fatura provisória baseada no pedido de venda ou em linhas do pedido de "
-"venda.\n"
-"  - 'Faturar depois da entrega' irá gerar uma fatura provisória baseada no "
-"pedido de venda depois que todos os itens forem entregues.\n"
-"  - 'Faturar  baseado em entregas' irá gerar uma fatura durante o processo "
-"de separação e entrega de cada item."
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Sem Cliente definido!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Vendas em Exceção"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "Erro de Configuração !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Condições"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Não existe conta de categoria de receita definida nas propriedades padrão "
-"para a Categoria de Produto ou a Posição Fiscal não está definida !"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Agosto"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Você tentou atribuir um lote que não é do mesmo produto"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "Modo inválido para test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junho"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Este pedido de venda não pode ser cancelado !"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Estatísticas de Pedidos de Venda"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Conta analítica relacionada ao pedido de venda."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Outubro"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "A referência deve ser única por empresa!"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Cotações"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Lista de preços para o pedido de venda atual."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "Imposto:"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Número de dias entre a confirmação do pedido e embarque dos produtos ao "
-"cliente."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Data da Cotação"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Posição Fiscal"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Número de Pacotes"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Em Progresso"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"O vendedor confirma a cotação. O status do pedido de vendas se torna 'em "
-"progresso' ou 'Manual em progresso'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-"Você não pode cancelar uma linha do  pedido de venda que já foi faturada!"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Primeiramente você precisa cancelar o movimento de estoque relacionado a "
-"esta linha de pedido de venda."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Selecione um produto do tipo serviço que é chamado 'Produto Avançado'. Você "
-"poderá precisar criá-lo e defini-lo com um valor padrão neste campo."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel."
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Você não pode fazer um adiantamento para um pedido de venda que estiver "
-"definido como 'Faturamento Automático após entrega'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Anotações"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "O nome da empresa deve ser único !"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Endereço de fatura para o pedido de venda atual."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Mês-1"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Mês de ordenação  do pedido de venda"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Você não pode agrupar vendas com moedas diferentes para o mesmo parceiro."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Entrega cada produto quando disponível"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Faturado"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Ordem de Entrega"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Data de Confirmação"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Forma de Entrega"
-
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
 msgstr "Parceiro designado"
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Março"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr "Você não pode mover os produtos de/para um Local do tipo Vista"
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Baseado nas Ordens de Venda"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Montante total."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Endereço de Faturamento :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "Sequência da Linha"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
 msgstr ""
-"Para cada linha do pedido de venda, um pedido de aquisição é criado para "
-"suprir o produto vendido."
 
 #. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
 msgstr ""
-"Inconterm, que significa 'Termos de Comércio Internacional' implica em uma "
-"série de termos para venda que são usados em transações comerciais."
 
 #. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Endereço de Faturamento"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Buscar itens não Faturados"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Cotação / Ordem"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de Linhas"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Fatura de Venda Aberta"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Linha de Pedido de Vendas"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Estoque"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Ordem N°"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Itens do Pedido"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Total de Mercadorias"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Itens para Faturar"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Quantidade (UdM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Data de Criação"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Diversos"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Itens Entregues e não Faturados."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Minhas Vendas"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Ação inválida !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Informações Adicionais"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Lista de Preços"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# de Qtd"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "Hora"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Data da Ordem"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Enviado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Todas as Cotações"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "Opções"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Setembro"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
+#: view:sale.config.settings:0
+msgid "Contract Feature"
 msgstr ""
-"Você não pode confirmar um pedido de venda que não tem nenhuma linha de "
-"pedido."
 
 #. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Você precisa escolher uma lista de preços ou um cliente no formulário de "
-"vendas!\n"
-"Por favor escolha um antes de escolher um produto."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Categoria de Produtos"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Impostos :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Movimentações de Estoque"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
+#: field:sale.report,state:0
 msgid "Order State"
-msgstr "Status"
+msgstr "Situação do Pedido"
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Deseja Criar Nota Fiscal ?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Vendas por Mês"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "A linha do pedido de venda não pode ser cancelada!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Dias de Segurança"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Compra de material vendido"
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Criar Fatura Final"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Endereço de Entrega"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Indica que o pedido de venda foi entregue. Este campo é atualizado assim que "
-"o agendamento for executado."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Data"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Filtros Extendidos..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Pendência"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Empresas"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-"Informa a Situação da cotação ou pedido de venda.\n"
-"A Situação de Excessão é automaticamente definida quando um Cancelamento "
-"ocorre na validação da fatura (Excessão de Fatura) ou no processo de "
-"separação (Excessão de Entrega).\n"
-"O 'Aguardando Agendamento' é definido quando a fatura está confirmada, mas "
-"está esperando o agendamento na data do pedido."
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Não foi encontrada uma linha de preço válida!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Histórico"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Faturar depois da entrega"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Esta é a lista de faturas que foram geradas para este pedido de venda. O "
-"mesmo pedido de venda pode ser faturado várias vezes (por linha por exemplo)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Sua Referência"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "O nome e endereço do contato que requisitou a ordem ou cotação."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Esta é a adição de dias aos que você promete para clientes, para fins de "
-"segurança."
-
-#. module: sale
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "Qtd"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referências"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Minhas linhas de Pedido de Venda"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Referência de ordem deve ser única por empresa!"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Criar Nota Fiscal"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Total de Impostos Excluídos"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Referência do Pedido"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Sua Nota Fiscal foi criada com sucesso!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Vendas por Parceiros"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Contato Comercial"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Nota Fiscal Aberta"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr "Email automático do Pedido de Vendas"
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Não há nenhum diário de vendas definido para esta empresa: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forçar Atribuição"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "no pedido"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Baseado no embarque ou nas quantidades pedidas."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Envia todos os produtos de um vez"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Separações Relacionadas"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Endereço de Embarque :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Vendas por Cliente nos últimos 90 dias"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Status provisório de pedidos de venda"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Criar Ordem de Entrega"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-"Não é possível excluir uma linha de pedido de vendas que possui situação "
-"'%s'!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "Quantidade(UoS)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Total de Imposto incluído"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Criar lista de Opções"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Pedidos de Venda ordenado por data"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Vendas por Categoria de Produto"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmar Cotação"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Erro"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Agrupado Por..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Recriar Fatura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Entregas da Nota Fiscal"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Aguardando Programação"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Método de Aquisição"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Lista de Seleção"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Definir como Rascunho"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Documento de movimento para a saída ou para o cliente."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-"\n"
-"Olá${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Aqui está a confirmação de seu pedido para ${object.partner_id.name}:\n"
-"       | Número do Pedido: *${object.name}*\n"
-"       | Valor Total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Data: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Referência: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Sua referência: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Seu contato: ${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"Você pode ver a confirmação do pedido, fazer o download e até efetuar o "
-"pagamento online através do link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"Também é possível pagar diretamente com Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"Se tiver alguma dúvida por favor entre em contato conosco.\n"
-"\n"
-"\n"
-"Obrigado por escolher ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Validar"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Confirmar Pedido"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Criar Ordem de Compra"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Impostos"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Pedido de Venda pronto para ser faturado"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Data em que foi criado o pedido de venda."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Movimentações de Estoque"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Criar Notas Fiscais"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Pedidos de venda criados neste mês"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-"Se 'No Pedido' ele aciona uma ação quando o pedido de venda for confirmado, "
-"para criar uma tarefa, pedido de compra, ou ordem de produção associado a "
-"esta linha de pedido."
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Montante de Adiantamento"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "Cobrar entrega?"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Quantidade Enbarcada"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Notas Fiscais Baseadas em Pedidos de Venda"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Se você desejar mudar a lista de preço para este pedido (e eventualmente a "
-"moeda), os preços da linha de pedido existente não serão atualizadas."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Lista de Separação"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Erro !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Pedido de venda nao pode ser cancelado !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "Quantidade(UoM)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Ano do pedido de venda"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julho"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Aquisição"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Pendência no Embarque"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "Informações de Separação ! : "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Agrupar Notas Fiscais"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "Politica de Faturamento"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "Configure o Método de Faturamento"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Aguardando revisão do contador."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "UdM Referencial"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-"Esta ferramenta irá ajudá-lo a instalar o módulo correto e configurar o "
-"sistema de acordo com o método usado para cobrar seus clientes."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Item de Pedido gerar Nota Fiscal"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Exceção de Faturamento"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Avançar Compras e Notas Fiscais"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Pago"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Análise de Vendas"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-"Você selecionou uma quantidade de %d unidades.\n"
-"Mas não é compatível com a embalagem escolhida.\n"
-"Aqui segue uma proposta de quantidades compatível com a embalagem:\n"
-"AN: %s Quantidade: %s Tipo de : %s"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recriar Embalagem"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Propriedades"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Cotação"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"O Representante cria uma Nota Fiscal manualmente se a política de embarque "
-"do pedido for \"Embarcando e Manual em Andamento'. A Nota Fiscal é criada "
-"automaticamente se a política de embarque for 'Pagamento antes da Entrega'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Você pode gerar Notas Fiscais baseadas nos pedidos de venda ou baseada nos "
-"embarques."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Linhas de pedido confirmadas e não entregues"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Faturas de Clientes"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Vendas"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Preço Unitário"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Concluído"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Você deve selecionar um cliente na tela de vendas !\n"
-"Por favor, selecione um cliente antes de escolher o produto."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Documento de Origem"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Por Fazer"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Politica de Separação"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documento de mudança para o cliente."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Montante sem impostos."
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Primeiramente você precisa cancelar todas as separações relacionadas a este "
-"pedido de venda."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Fatura de Vendas com Pagamento Antecipado"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mês"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Produto"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Cancelar Designação"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "vendas.config.politica_escolha"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Faturamento Mensal"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Faturar em"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Data da Ordem"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdS Produto"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual em Progresso"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Unidade de Medida do produto"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistica"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Pedido"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "Não há conta de entrada definida para este produto:\"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorar Excessão"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Dependendo do controle de faturamento de pedido de venda, a fatura pode ser "
-"baseada na entrega ou na quantidade pedida. Desta forma, o pedido de venda "
-"pode gerar uma fatura ou ordem de entrega assim que for confirmado pelo "
-"vendendor."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Você planeja vender %.2f %s mas tem somente %.2f %s disponível !\n"
-"O estoque real é %.2f %s. (sem reservas)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Status"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referência Cliente"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Preço"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Dependendo da configuração da localização de Saída, a mudança entre a área "
-"de saída e o cliente é feita através da Ordem de Entrega, manualmente ou "
-"automaticamente."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Pagar antes da entrega"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Painel de Vendas"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Gerar Nota Fiscal"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
 msgid "To Invoice"
 msgstr "Para Faturar"
 
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
 msgstr "Data na qual o pedido de venda é confirmado."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Cotações"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Março"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract/Analytic Account"
 msgstr "Conta de Contrato/Analítica"
 
 #. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
 msgstr "Empresa"
@@ -1836,7 +285,12 @@ msgstr "Empresa"
 #. module: sale
 #: field:sale.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr "Data de Faturamento"
+msgstr "Data da Fatura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Itens Entregues e não Faturados."
 
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
@@ -1844,27 +298,144 @@ msgid "The amount to be invoiced in advance."
 msgstr "O montante a ser faturado antecipadamente."
 
 #. module: sale
-#: code:addons/sale/sale.py:1269
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Exceção de Faturamento"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
 #, python-format
 msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
 msgstr ""
-"Não foi possível encontrar uma linha da lista de preços para este produto e "
-"quantidade.\n"
-"Você precisa alterar ou o produto, a quantidade ou a lista de preços."
 
 #. module: sale
-#: help:sale.order,picking_ids:0
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Valor total."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Centro de Custo"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "Cancelar Pedido"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
 msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
 msgstr ""
-"Esta é a lista de separação que foi gerada para este pedido de venda."
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Gerar faturas"
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Pedido de Venda"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Setembro"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impostos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Total de Mercadorias"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -1872,7 +443,20 @@ msgid "Net Total :"
 msgstr "Total Líquido"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
 msgstr "Cancelada"
@@ -1882,36 +466,130 @@ msgstr "Cancelada"
 msgid "Sales Order Lines related to a Sales Order of mine"
 msgstr "Linhas de Pedido de Venda relacionadas ao meu pedido"
 
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
 #. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
 msgid "Shop"
 msgstr "Estabelecimento"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Vendas em Exceção"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Endereço de Cobrança"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Data em que foi criado o pedido de venda."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Recriar Fatura"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Criar Notas Fiscais"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr "Imposto"
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
 msgstr "Data de Confirmação"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Aviso"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de Linhas"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Vendas por Mês"
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
 
 #. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# de Qtd"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
 msgid "Sales Order"
 msgstr "Pedido de Venda"
 
@@ -1926,17 +604,9 @@ msgid "Sale Order Lines that are in 'done' state"
 msgstr "Linhas do Pedido que estão 'Feitas'"
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"O formulário da Lista de Separação é criada assim que o pedido de venda é "
-"confirmado, no mesmo momento que o pedido de aquisição. Representa a "
-"atribuição de peças ao pedido. Existe uma lista de separação por linha de "
-"pedido de venda, a qual evolui com a disponibilidade das peças."
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Valor Antecipado"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1944,65 +614,400 @@ msgid "Confirmed"
 msgstr "Confirmada"
 
 #. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "Método principal baseado em"
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Condição de Pagamento Padrão"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
 msgid "Confirm"
 msgstr "Confirmar"
 
 #. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Erro! Você não pode criar empresas recursivas."
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
 
 #. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Endereço de Entrega"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Linhas de pedido prontas para faturar"
+
+#. module: sale
+#: view:account.invoice.report:0
 #: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Vendas por Categoria de Produtos nos últimos 90 dias"
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Faturamento Mensal"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Ano"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Pedidos de Venda que não foram confirmados"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Pedido N°"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Itens do Pedido"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc. (%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referência do Pedido"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Linhas da Nota Fiscal"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Linhas do Pedido de Venda"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Preço Total"
 
 #. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Prazo de Entrega"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Cotações Anteriores"
 
 #. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuração"
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/edi/sale_order.py:146
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marque a caixa para agrupar as faturas do mesmo cliente"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Gerar Nota Fiscal"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Hora"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Data de Criação"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Aguardando Programação"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Endereço de fatura para o pedido de venda atual."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Quantidades Pedidas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Ano do pedido de venda"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Quantidade"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Minhas Vendas"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Ação inválida !"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posição Fiscal"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julho"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UdV"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
 #, python-format
 msgid "EDI Pricelist (%s)"
 msgstr "EDI Lista de Preços (%s)"
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Data da Cotação"
+
 #. module: sale
 #: view:sale.order:0
-msgid "Print Order"
-msgstr "Imprimir Pedido"
+msgid "Order Date"
+msgstr "Data do Pedido"
 
 #. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Cotação e Vendas"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Pedidos de Venda criados este ano"
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Parceiro"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Fatura de Vendas"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Desconto (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -2015,20 +1020,29 @@ msgstr ""
 "1.O status desta linha de pedido é \"provisória\" ou \"cancelada\"!\n"
 "1.A Linha do Pedido de Venda está faturada!"
 
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
 msgstr "Linhas de pedido concluídas"
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Peso"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Minhas Cotações"
 
 #. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Notas Fiscais"
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2036,21 +1050,38 @@ msgid "December"
 msgstr "Dezembro"
 
 #. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Imagem"
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mês"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sequência"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
 msgstr ""
-"Um pedido de aquisição é criado automaticamente assim que o pedido de vendas "
-"é confirmado ou a fatura é paga. Isto direciona a compra e a produção de "
-"produtos de acordo com as regras e os parâmetros do pedido de venda. "
+"Você não pode confirmar um pedido de venda que não tem nenhuma linha de "
+"pedido."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -2058,40 +1089,127 @@ msgid "Uninvoiced"
 msgstr "Não faturado"
 
 #. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Representante"
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoria de Produtos"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Cotações Anteriores"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Total de Mercadorias"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
+#: code:addons/sale/sale.py:557
 #, python-format
-msgid "Advance Invoice"
-msgstr "Avançar Fatura"
+msgid "Cannot cancel this sales order!"
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:624
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nome da Loja"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
 #, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "O pedido de venda '%s' foi cancelado."
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impostos :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Fatura de Vendas com Pagamento Antecipado"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Em Progresso"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Sem Cliente definido!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Gerar faturas"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"A ordem de venda vai criar automaticamente a proposta de fatura (fatura "
+"provisória). As quantidades encomendadas e entregues podem não serem as "
+"mesmas. Você deve optar se quer sua fatura com base nas quantidades "
+"encomendadas ou enviadas. Se o produto é um serviço, as quantidades enviadas "
+"são as horas gastas nas tarefas associadas."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Item de Pedido gerar Nota Fiscal"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Draft"
-msgstr "Rascunho"
+msgstr "Provisório"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pago"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -2117,65 +1235,189 @@ msgstr ""
 "* O status é marcado como 'Cancelado' quando o usuário cancelar o referido "
 "pedido de venda."
 
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Montante de impostos."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr "Separação"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Linhas de pedido prontas para faturar"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Pedidos de venda criados mês passado"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr "Modelos de Email"
-
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Pedidos de Venda"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar Notas Fiscais"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Valor dos impostos."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Situação atual"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Avançar Compras e Notas Fiscais"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junho"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Modelos de Email"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pedido"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Atenção com a Lista de Preços"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Loja de Vendas"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estatísticas de Pedidos de Venda"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Data"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Linha de Pedido de Vendas"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Novembro"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtros Extendidos..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Avançar o Produto"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calcular"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Pendência"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Outubro"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"O Representante cria uma Nota Fiscal manualmente se a política de entrega do "
+"pedido for \"Entrega em Andamento Manual'. A Nota Fiscal é criada "
+"automaticamente se a política de embarque for 'Pagamento antes da Entrega'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Primeiramente você deve cancelar todas as faturas relacionadas a este pedido "
-"de venda."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2187,6 +1429,41 @@ msgstr "Janeiro"
 msgid "Sales Order in Progress"
 msgstr "Pedido de Venda em Processamento"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"O vendedor confirma a cotação. O status do pedido de vendas se torna 'em "
+"progresso' ou 'Manual em progresso'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
@@ -2194,33 +1471,84 @@ msgstr ""
 "Referência para o documento que gerou esta solicitação de pedido de venda."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Não foi encontrada uma linha de preço válida!"
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Compromisso Atrasado"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "Entrega e Fatura na demanda"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Linhas de pedido confirmadas e não entregues"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+#: view:sale.order:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
-"Um pedido de Aquisição para cada linha do pedido de venda e para cada um dos "
-"componentes."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Designar"
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Esta é a lista de faturas que foram geradas para este pedido de venda. O "
+"mesmo pedido de venda pode ser faturado várias vezes (por linha por exemplo)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Sua Referência"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
-msgstr "Data da Ordem"
+msgstr "Data do Pedido"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Lista de Preços"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "Imposto:"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Faturas de Clientes"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
@@ -2228,55 +1556,205 @@ msgid "Confirmed sales order to invoice."
 msgstr "Pedidos de venda confirmados para faturamento."
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Pedidos de Venda que não foram confirmados"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Linhas do Pedido de Venda"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Vendas"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "O pedido de venda '%s' foi colocado em status provisório."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Se você desejar mudar a lista de preço para este pedido (e eventualmente a "
+"moeda), os preços da linha de pedido existente não serão atualizadas."
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "do estoque"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Dia"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Encerrar"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Notas Fiscais"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Preço Unitário"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Concluído"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Endereço de Cobrança:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Fatura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Minhas linhas de Pedido de Venda"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "Nenhuma Lista de Preços ! : "
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Entregue"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Cotação"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Você deve atribuir um lote de produção para este produto."
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar itens não Faturados"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
-"Se você tem mais de uma loja revendendo seus produtos, poderá criar e "
-"gerenciar elas aqui. Sempre que você gravar uma nova cotação ou pedido de "
-"venda, deverá ser ligado à loja. A loja também define o armazém do qual os "
-"produtos deverão ser entregues para cada venda particular."
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "A Referência do Pedido deve ser única por empresa!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Por Fazer"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Endereço de Entrega:"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Você não pode agrupar vendas com moedas diferentes para o mesmo parceiro."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análise de Vendas"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Lista de preços para o pedido de venda atual."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Criar Nota Fiscal"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Valor sem impostos."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Referência do Pedido"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2284,61 +1762,68 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Indica que uma fatura foi paga."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+"Você não pode cancelar uma linha do  pedido de venda que já foi faturada!"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Produto"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Descrição"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Maio"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Cliente"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Avançar"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Fevereiro"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Abril"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Contabilidade"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Pesquisar Pedido de Venda"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Solicitação para Pedido de Venda"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
-msgstr "Sem Estoque Suficiente ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Forma de Pagamento"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Preço"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2355,35 +1840,370 @@ msgstr ""
 "que não foram faturadas ainda. Se você quiser analisar o volume de negócios, "
 "seria melhor usar o relatório de Análise de Faturamento no módulo Contas."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel."
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Deseja Criar Nota Fiscal ?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Outras Informações"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Qtd"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Aguardando revisão do contador."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Endereço de entrega para o pedido de venda atual."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Cotação / Pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Avançar"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Fevereiro"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Faturar em"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data do Pedido"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdS Produto"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Status provisório de pedidos de venda"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento de Origem"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Em Andamento Manual"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Meus Pedidos de Venda"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Procurar Pedido de Venda"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Mês do pedido de venda"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Você precisa escolher uma lista de preços ou um cliente no formulário de "
+"vendas!\n"
+"Por favor escolha um antes de escolher um produto."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "A partir de pedido de venda"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar Excessão"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Dependendo do controle de faturamento de pedido de venda, a fatura pode ser "
+"baseada na entrega ou na quantidade pedida. Desta forma, o pedido de venda "
+"pode gerar uma fatura ou ordem de entrega assim que for confirmado pelo "
+"vendendor."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Conta analítica relacionada ao pedido de venda."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Condições de Pagamento"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Pedido de Venda pronto para ser faturado"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Cotação N°"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referência do Cliente"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Separado"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Ano"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Notas Fiscais Baseadas nas Entregas"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total de Imposto incluído"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Faturado"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Data do Pedido de Venda"
 
 #~ msgid "Recreate Procurement"
 #~ msgstr "Recriar Aquisição"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Ordem de Entrega"
+
+#~ msgid "from stock"
+#~ msgstr "do estoque"
+
 #~ msgid "Automatic Declaration"
 #~ msgstr "Declaração Automática"
 
 #~ msgid "Shipping Policy"
 #~ msgstr "Política de Embarque"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Confirmar Pedido"
+
+#~ msgid "Configuration"
+#~ msgstr "Configuração"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Pagamentos de Contas"
 
@@ -2397,6 +2217,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Esta é a lista de separação que foi gerada para esta fatura"
 
+#~ msgid "Validate"
+#~ msgstr "Validar"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Faturar depois de entreguar"
 
@@ -2409,6 +2232,10 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Reference"
 #~ msgstr "Referência"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Erro !"
+
 #~ msgid "Packing"
 #~ msgstr "Separação"
 
@@ -2416,12 +2243,29 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Não posso cancelar a ordem de venda !"
 
-#~ msgid "Sequence"
-#~ msgstr "Sequência"
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "Modo inválido para test_state"
+
+#~ msgid "Properties"
+#~ msgstr "Propriedades"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Erro"
+
+#~ msgid "Assign"
+#~ msgstr "Atribuir"
 
 #~ msgid "Other data"
 #~ msgstr "Outros dados"
 
+#~ msgid "Close"
+#~ msgstr "Fechar"
+
+#~ msgid "Name"
+#~ msgstr "Nome"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Entrega Parcial"
 
@@ -2434,17 +2278,26 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Procure Method"
 #~ msgstr "Método de Aquisição"
 
+#~ msgid "Extra Info"
+#~ msgstr "Informações Adicionais"
+
 #~ msgid "Net Price"
 #~ msgstr "Preço Líquido"
 
 #~ msgid "All Sales Order"
 #~ msgstr "Todas as Ordens de Venda"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Quantidade (UdM)"
+
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
 #~ "Primeiro deve cancelar todas as faturas associadas a esta Ordem de Compra."
 
+#~ msgid "Procurement"
+#~ msgstr "Aquisição"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "Política Padrão de Empacotamento"
 
@@ -2471,6 +2324,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Não é possível cancelar esta ordem de venda!"
 
+#~ msgid "Product UoM"
+#~ msgstr "UdM do Produto"
+
 #~ msgid ""
 #~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
 #~ "is, quotation is moved to  sale order."
@@ -2489,9 +2345,15 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML inválido para Arquitetura da View"
 
+#~ msgid "All Quotations"
+#~ msgstr "Todas as Cotações"
+
 #~ msgid "Canceled"
 #~ msgstr "Cancelada"
 
+#~ msgid "Packaging"
+#~ msgstr "Empacotamento"
+
 #~ msgid "Do you really want to create the invoices ?"
 #~ msgstr "Você realmente deseja criar as faturas ?"
 
@@ -2500,6 +2362,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgstr ""
 #~ "Não é possível deletar Ordem(ns) de Venda que já está(ão) confirmada(s)!"
 
+#~ msgid "Accounting"
+#~ msgstr "Contabilidade"
+
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Pagamento Antes da Entrega"
 
@@ -2509,12 +2374,36 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Entregue, do depósito para o cliente"
 
+#~ msgid "Procurement Method"
+#~ msgstr "Método de Aquisição"
+
 #~ msgid "title"
 #~ msgstr "título"
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Movimentação de Estoque"
+
+#~ msgid "Stock Move"
+#~ msgstr "Movimentações de Estoque"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Vendas por Mês"
+
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Lista de Preço de Compras"
 
+#~ msgid "Picking List"
+#~ msgstr "Lista de Separação"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Total de Mercadorias"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Prazo de Entrega"
+
+#~ msgid "Dates"
+#~ msgstr "Datas"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Entrega Completa"
 
@@ -2524,6 +2413,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Configuration Progress"
 #~ msgstr "Configuração em Progresso"
 
+#~ msgid "Image"
+#~ msgstr "Imagem"
+
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Politica Padrão de Embarque"
 
@@ -2542,6 +2434,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Nome do modelo inválido na definição da ação."
 
+#~ msgid "Conditions"
+#~ msgstr "Condições"
+
 #~ msgid "Ordered Date"
 #~ msgstr "Data da Ordem"
 
@@ -2551,27 +2446,57 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Direct Delivery"
 #~ msgstr "Entrega Direta"
 
+#~ msgid "Compute"
+#~ msgstr "Calcular"
+
+#~ msgid "Companies"
+#~ msgstr "Empresas"
+
 #~ msgid "Sales order lines"
 #~ msgstr "Linhas da Ordem de Venda"
 
 #~ msgid "Sale Shop"
 #~ msgstr "Estabelecimento de Venda"
 
+#~ msgid "UoM"
+#~ msgstr "UdM"
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Lista de Separação & Ordem de Entrega"
 
+#~ msgid "Picking Policy"
+#~ msgstr "Politica de Separação"
+
 #~ msgid "Shipped Qty"
 #~ msgstr "Qtd Embarcada"
 
 #~ msgid "Sale Order Lines"
 #~ msgstr "Linhas da Ordem de Venda"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Sua Nota Fiscal foi criada com sucesso!"
+
 #~ msgid "Sales order"
 #~ msgstr "Ordem de Venda"
 
+#~ msgid "Incoterm"
+#~ msgstr "Forma de Entrega"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Contato Comercial"
+
+#~ msgid "Related Picking"
+#~ msgstr "Separações Relacionadas"
+
 #~ msgid "Total amount"
 #~ msgstr "Total Geral"
 
+#~ msgid "References"
+#~ msgstr "Referências"
+
+#~ msgid "Logistic"
+#~ msgstr "Logistica"
+
 #~ msgid "Configure Picking Policy for Sale Order"
 #~ msgstr "Configurar Politica de Separação para Ordem de Venda"
 
@@ -2581,6 +2506,12 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Picking Default Policy"
 #~ msgstr "Politica de Separação Padrão"
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Notas Fiscais Baseadas nas Entregas"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Movimentações de Estoque"
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Etapas para entrega de um pedido/ordem de venda"
 
@@ -2611,6 +2542,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "My sales order in progress"
 #~ msgstr "Meus pedidos em andamento"
 
+#~ msgid "Warehouse"
+#~ msgstr "Estoque"
+
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Meus pedidos aguardando emissão da Fatura"
 
@@ -2623,6 +2557,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "My sales in shipping exception"
 #~ msgstr "Minhas vendas sob status de exceção"
 
+#~ msgid "on order"
+#~ msgstr "no pedido"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "Processo de Aquisição Corrigido"
 
@@ -2657,6 +2594,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Abrir Fatura Avançada"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Cancelar Designação"
+
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Fatura gerada a partir do empacotamento"
 
@@ -2716,9 +2656,6 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Delivery Delay"
 #~ msgstr "Atraso de entrega"
 
-#~ msgid "Status"
-#~ msgstr "Situação atual"
-
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
@@ -2741,31 +2678,111 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Habilita você a calcular custos de entrega em suas cotações."
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Aviso !"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Se não houver estoque disponível para entregar tudo de uma vez, você aceita "
+#~ "embarques parciais?"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Painel do Gerente de Vendas"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Não existe conta de categoria de receita definida nas propriedades padrão "
+#~ "para a Categoria de Produto ou a Posição Fiscal não está definida !"
+
 #, python-format
 #~ msgid "You cannot cancel a sale order line that has already been invoiced !"
 #~ msgstr ""
 #~ "Você não pode cancelar um item de ordem de venda que já foi faturado!"
 
+#~ msgid "Number Packages"
+#~ msgstr "Número de Pacotes"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Selecione um produto do tipo serviço que é chamado 'Produto Avançado'. Você "
+#~ "poderá precisar criá-lo e defini-lo com um valor padrão neste campo."
+
 #, python-format
 #~ msgid ""
 #~ "You have to select a customer in the sale form !\n"
 #~ "Please set one customer before choosing a product."
 #~ msgstr "Você precisa selecionar um cliente no formulário de vendas !"
 
+#~ msgid "Lines to Invoice"
+#~ msgstr "Itens para Faturar"
+
 #~ msgid "  Year  "
 #~ msgstr "  Ano  "
 
+#~ msgid "Security Days"
+#~ msgstr "Dias de Segurança"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Compra de material vendido"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "O nome e endereço do contato que requisitou a ordem ou cotação."
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Esta é a adição de dias aos que você promete para clientes, para fins de "
+#~ "segurança."
+
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Total de Impostos Excluídos"
+
 #~ msgid "Sale Order Line"
 #~ msgstr "Itens de Pedidos"
 
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Configuração da Aplicação de Vendas"
 
+#~ msgid "Force Assignation"
+#~ msgstr "Forçar Atribuição"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Baseado no embarque ou nas quantidades pedidas."
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Criar Ordem de Entrega"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Custos de Entrega"
 
-#~ msgid "Sale Order"
-#~ msgstr "Pedido de Venda"
+#~ msgid "Sales by Product Category"
+#~ msgstr "Vendas por Categoria de Produto"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Criar lista de Opções"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Você planeja vender %.2f %s mas tem somente %.2f %s disponível !\n"
+#~ "O estoque real é %.2f %s. (sem reservas)"
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Documento de movimento para a saída ou para o cliente."
+
+#~ msgid "Pick List"
+#~ msgstr "Lista de Seleção"
 
 #, python-format
 #~ msgid "Picking Information !"
@@ -2774,9 +2791,16 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Invoicing"
 #~ msgstr "Faturamento"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "vendas.config.politica_escolha"
+
 #~ msgid "   Month   "
 #~ msgstr "   Mês   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Aviso"
+
 #~ msgid "sale.installer"
 #~ msgstr "vendas.instalador"
 
@@ -2787,6 +2811,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Not enough stock !"
 #~ msgstr "Sem estoque suficiente !"
 
+#~ msgid "Delivered"
+#~ msgstr "Entregue"
+
 #~ msgid "Invoicing journals"
 #~ msgstr "Diários de Faturamento"
 
@@ -2820,6 +2847,18 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ "Permite a você agrupar e faturar suas ordem de entrega de acordo com "
 #~ "diferentes tipos de faturamento: diário, semanal, etc."
 
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Dependendo da configuração da localização de Saída, a mudança entre a área "
+#~ "de saída e o cliente é feita através da Ordem de Entrega, manualmente ou "
+#~ "automaticamente."
+
 #~ msgid ""
 #~ "By default, OpenERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2831,6 +2870,23 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ "comum e simples de enviar produtos para os clientes em uma ou duas operações "
 #~ "pelo operador."
 
+#~ msgid "Create Final Invoice"
+#~ msgstr "Criar Fatura Final"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Número de dias entre a confirmação do pedido e embarque dos produtos ao "
+#~ "cliente."
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Recriar Embalagem"
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr "Não há conta de entrada definida para este produto:\"%s\" (id:%d)"
+
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
@@ -2840,9 +2896,24 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgstr ""
 #~ "Erro: Unidade de venda deve ser de categoria diferente da unidade de medida"
 
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "A cotação  '%s' foi convertida em um pedido de venda."
+
 #~ msgid "Configure"
 #~ msgstr "Configurar"
 
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/a)"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Você tentou atribuir um lote que não é do mesmo produto"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Este pedido de venda não pode ser cancelado !"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Referência de Pedido deve ser única !"
 
@@ -2850,17 +2921,59 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgstr ""
 #~ "Melhora o núcleo do Sistema de Vendas com funcionalidades adicionais."
 
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Vendas por Cliente nos últimos 90 dias"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Vendas por Parceiros"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "A linha do pedido de venda não pode ser cancelada!"
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr ""
 #~ "Você não pode cancelar linhas de pedido de venda que já foram faturadas!"
 
+#~ msgid "Reference UoM"
+#~ msgstr "UdM Referencial"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Primeiramente você precisa cancelar todas as separações relacionadas a este "
+#~ "pedido de venda."
+
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Faturar a partir da Separação"
 
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Erro! Você não pode criar empresas recursivas."
+
+#~ msgid "Sales by Month"
+#~ msgstr "Vendas por Mês"
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Vendas por Categoria de Produtos nos últimos 90 dias"
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "O pedido de venda '%s' foi cancelado."
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Você deve atribuir um lote de produção para este produto."
+
 #~ msgid "Layout Sequence"
 #~ msgstr "Sequência do Layout"
 
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "O pedido de venda '%s' foi colocado em status provisório."
+
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Solicitação para Pedido de Venda"
+
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Passos para a Entrega de um Pedido de Venda."
 
@@ -2870,6 +2983,22 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Faturamento no Pedido Após Entrega"
 
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Primeiramente você deve cancelar todas as faturas relacionadas a este pedido "
+#~ "de venda."
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Não há nenhum diário de vendas definido para esta empresa: \"%s\" (id:%d)"
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr ""
+#~ "Esta é a lista de separação que foi gerada para este pedido de venda."
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Configure seu Sistema de Gerenciamento de Vendas"
 
@@ -2877,10 +3006,53 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "Pedidos de Venda confirmados não podem ser cancelados !"
 
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Para cada linha do pedido de venda, um pedido de aquisição é criado para "
+#~ "suprir o produto vendido."
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Primeiramente você precisa cancelar o movimento de estoque relacionado a "
+#~ "esta linha de pedido de venda."
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Você deve selecionar um cliente na tela de vendas !\n"
+#~ "Por favor, selecione um cliente antes de escolher o produto."
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Indica que o pedido de venda foi entregue. Este campo é atualizado assim que "
+#~ "o agendamento for executado."
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Não se pode excluir uma linha de pedido de venda que estiver %s !"
 
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Um pedido de Aquisição para cada linha do pedido de venda e para cada um dos "
+#~ "componentes."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Você não pode fazer um adiantamento para um pedido de venda que estiver "
+#~ "definido como 'Faturamento Automático após entrega'."
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -2895,6 +3067,77 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ "\n"
 #~ "EAN: %s Quantidade: %s Tipo de ul: %s"
 
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "O formulário da Lista de Separação é criada assim que o pedido de venda é "
+#~ "confirmado, no mesmo momento que o pedido de aquisição. Representa a "
+#~ "atribuição de peças ao pedido. Existe uma lista de separação por linha de "
+#~ "pedido de venda, a qual evolui com a disponibilidade das peças."
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Inconterm, que significa 'Termos de Comércio Internacional' implica em uma "
+#~ "série de termos para venda que são usados em transações comerciais."
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Se você tem mais de uma loja revendendo seus produtos, poderá criar e "
+#~ "gerenciar elas aqui. Sempre que você gravar uma nova cotação ou pedido de "
+#~ "venda, deverá ser ligado à loja. A loja também define o armazém do qual os "
+#~ "produtos deverão ser entregues para cada venda particular."
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Um pedido de aquisição é criado automaticamente assim que o pedido de vendas "
+#~ "é confirmado ou a fatura é paga. Isto direciona a compra e a produção de "
+#~ "produtos de acordo com as regras e os parâmetros do pedido de venda. "
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Aqui está uma lista com cada linha do pedido de venda que deve ser faturada. "
+#~ "Você pode faturar pedidos de venda parcialmente, por linhas do pedido. Você "
+#~ "nao precisa desta lista se você faturar a partir da entrega ou se você "
+#~ "fatura completamente as vendas."
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Comanda os pedidos de aquisição para cada linha do pedido de venda."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Pedidos de Venda ajudam você a gerenciar cotações e pedidos de seus "
+#~ "clientes. O OpenERP sugere que você comece criando a cotação. Uma vez "
+#~ "confirmada, a cotação será convertida em um Pedido de Venda. Podem ser "
+#~ "manipulados vários tipos de produtos, assim o pedido pode disparar tarefas, "
+#~ "ordem de entrega, ordem de fabricação, compras e assim por diante. Com base "
+#~ "na configuração do pedido de vendas, uma fatura provisória será gerada. "
+#~ "Desta forma você precisa apenas confirmar o pedido quando quiser cobrar seu "
+#~ "cliente."
+
 #~ msgid ""
 #~ "\n"
 #~ "    The base module to manage quotations and sales orders.\n"
@@ -2967,6 +3210,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ "  - A opção 'Faturar a partir da Separação' é usada para criar uma fatura "
 #~ "durante o processo de separação."
 
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Fatura de Venda Aberta"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Configura a Logística dos Pedidos de Venda"
 
@@ -2979,6 +3225,9 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Margens em Pedidos de Venda"
 
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Notas Fiscais Baseadas em Pedidos de Venda"
+
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Aperfeiçoamento da Apresentação do Pedido de Venda"
 
@@ -2990,3 +3239,415 @@ msgstr "Notas Fiscais Baseadas nas Entregas"
 
 #~ msgid "Order date"
 #~ msgstr "Data do Pedido"
+
+#~ msgid "Salesman"
+#~ msgstr "Representante"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Unidade de Tempo Principal"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Baseado nas Ordens de Entrega"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Entrega cada produto quando disponível"
+
+#~ msgid "Options"
+#~ msgstr "Opções"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Envia todos os produtos de um vez"
+
+#~ msgid "Print Order"
+#~ msgstr "Imprimir Pedido"
+
+#~ msgid "Print Quotation"
+#~ msgstr "Imprimir Cotação"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Baseado na Planilha de Horas"
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "O nome da empresa deve ser único !"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "A referência deve ser única por empresa!"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Erro de Configuração !"
+
+#~ msgid "Month-1"
+#~ msgstr "Mês-1"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Diversos"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Quantidade(UoS)"
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "A política de Fatura é usada para sincronizar operações de faturamento e "
+#~ "entrega.\n"
+#~ "  - 'Faturar antes da entrega' irá primeiro gerar a fatura e então gerar a "
+#~ "ordem de separação depois do pagamento desta fatura.\n"
+#~ "  - 'Entrega e Fatura na demanda' irá criar uma ordem de separação "
+#~ "diretamente e esperar o usuário clicar no botão 'Fatura' para gerar uma "
+#~ "fatura provisória baseada no pedido de venda ou em linhas do pedido de "
+#~ "venda.\n"
+#~ "  - 'Faturar depois da entrega' irá gerar uma fatura provisória baseada no "
+#~ "pedido de venda depois que todos os itens forem entregues.\n"
+#~ "  - 'Faturar  baseado em entregas' irá gerar uma fatura durante o processo "
+#~ "de separação e entrega de cada item."
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Baseado no Trabalho da Tarefa"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Para excluir um pedido de venda confirmado, você precisa cancelar antes! "
+#~ "Para cancelar um pedido de venda, você precisa primeiro cancelar as ordens "
+#~ "de entrega ou de separação."
+
+#~ msgid "Line Sequence"
+#~ msgstr "Sequência da Linha"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr ""
+#~ "Não é possível excluir uma linha de pedido de vendas que possui situação "
+#~ "'%s'!"
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Email automático do Pedido de Vendas"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "Informa a Situação da cotação ou pedido de venda.\n"
+#~ "A Situação de Excessão é automaticamente definida quando um Cancelamento "
+#~ "ocorre na validação da fatura (Excessão de Fatura) ou no processo de "
+#~ "separação (Excessão de Entrega).\n"
+#~ "O 'Aguardando Agendamento' é definido quando a fatura está confirmada, mas "
+#~ "está esperando o agendamento na data do pedido."
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Faturar depois da entrega"
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Configure o Método de Faturamento"
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Politica de Faturamento"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "Informações de Separação ! : "
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Cobrar entrega?"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Pedidos de venda criados neste mês"
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "Se 'No Pedido' ele aciona uma ação quando o pedido de venda for confirmado, "
+#~ "para criar uma tarefa, pedido de compra, ou ordem de produção associado a "
+#~ "esta linha de pedido."
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Pagar antes da entrega"
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr ""
+#~ "Esta ferramenta irá ajudá-lo a instalar o módulo correto e configurar o "
+#~ "sistema de acordo com o método usado para cobrar seus clientes."
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Você selecionou uma quantidade de %d unidades.\n"
+#~ "Mas não é compatível com a embalagem escolhida.\n"
+#~ "Aqui segue uma proposta de quantidades compatível com a embalagem:\n"
+#~ "AN: %s Quantidade: %s Tipo de : %s"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "Não foi possível encontrar uma linha da lista de preços para este produto e "
+#~ "quantidade.\n"
+#~ "Você precisa alterar ou o produto, a quantidade ou a lista de preços."
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Pedidos de Venda criados este ano"
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Método principal baseado em"
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Pedidos de venda criados mês passado"
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "Sem Estoque Suficiente ! : "
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+#~ msgstr ""
+#~ "\n"
+#~ "Olá${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Aqui está a confirmação de seu pedido para ${object.partner_id.name}:\n"
+#~ "       | Número do Pedido: *${object.name}*\n"
+#~ "       | Valor Total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Data: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Referência: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Sua referência: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Seu contato: ${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "Você pode ver a confirmação do pedido, fazer o download e até efetuar o "
+#~ "pagamento online através do link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "Também é possível pagar diretamente com Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "Se tiver alguma dúvida por favor entre em contato conosco.\n"
+#~ "\n"
+#~ "\n"
+#~ "Obrigado por escolher ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Vendas por Representante nos últimos 90 dias"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Faturar baseado nas entregas"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Pedido de Compra"
+
+#~ msgid "Order Line"
+#~ msgstr "Linha do Pedido"
+
+#~ msgid "State"
+#~ msgstr "Situação"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "A fatura é criada automaticamente se a política de entrega for 'Faturar na "
+#~ "separação' ou 'Faturar após entrega'."
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr ""
+#~ "Você não pode mover os produtos de/para um Local do tipo Visualização"
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Baseado em Pedidos de Venda"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Abrir Fatura"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Entregas para Faturar"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Criar Pedido de Compra"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Definir como Provisório"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Quantidade Entregue"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Não é possível cancelar o pedido de vendas!"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Pendência na Entrega"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Você pode gerar Notas Fiscais baseadas nos pedidos de venda ou baseada nas "
+#~ "entregas."
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Documento de entrega para o cliente."
+
+#~ msgid "States"
+#~ msgstr "Situações"
+
+#~ msgid "Packings"
+#~ msgstr "Embalagens"
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Entrega e Fatura sob demanda"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Vendas por Representante"
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Quantidade (UdM)"
+
+#~ msgid "Notes"
+#~ msgstr "Observações"
diff --git a/addons/sale/i18n/ro.po b/addons/sale/i18n/ro.po
index f8cd4e82e01..ae645870ebb 100644
--- a/addons/sale/i18n/ro.po
+++ b/addons/sale/i18n/ro.po
@@ -6,20 +6,168 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:41+0000\n"
 "Last-Translator: Dorin <dhongu@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: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Bazat pe Fisa de pontaj"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Factura in avans"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmare Cotatie"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Tablou de bord Vanzari"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Data confirmarii"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Grupeaza dupa..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -31,62 +179,346 @@ msgstr ""
 "exceptie si nu au fost inca facturate"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Vanzari dupa Vanzator in ultimele 90 de zile"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Alocare partener"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Starea comenzii"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Daca nu aveai suficient stoc disponibil pentru a livra tot odata, acceptati "
-"expedierile partiale sau nu?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "UdV"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "De facturat"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Adresa de expediere pentru comanda de vanzare curenta."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Cantitate"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Data la care comanda de vanzare este confirmata."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Zi"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Cotatii (oferte)"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Martie"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Contract/Cont Analitic"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Companie"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Data facturii"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Linii Nefacturate si Livrate"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Suma care va fi facturata in avans."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Exceptie factura"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Suma totala."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cont analitic"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Anuleaza Comanda"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Cotația '%s' a fost schimbata intr-o comanda de vanzare."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Greutate"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Printeaza Cotatia"
+msgid "Quotation "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Avertizare !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Comadă vânzare"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septembrie"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Taxe"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Suma neimpozitata"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total Net:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Anulat(a)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+"Liniile Comenzii de vanzare asociate unei Comenzi de vanzare de-a mea"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Magazin"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Vanzari in Stare de exceptie"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adresa de facturare"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Data la care comanda de vanzare este creata."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Recreeaza factura"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Creeaza facturi"
 
 #. module: sale
 #: report:sale.order:0
@@ -94,81 +526,647 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-"Acţioneza ordinele de aprovizionare pentru fiecare linie a comenzii de "
-"vânzare."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Cont analitic"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Aici este o lista cu liniile din comenzile de vanzare care vor fi facturate. "
-"Puteti factura comenzile de vanzare partial, prin linii ale comenzii de "
-"vanzare. Nu aveti nevoie de aceasta lista daca facturati pe baza livrarilor "
-"sau daca facturati total vanzarile."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
-"Pentru a sterge o comanda de vanzare confirmata, trebuie sa o anulati mai "
-"intai ! Pentru a anula o comanda de vanzare, trebuie sa anulati mai intai "
-"comenzile de ridicare sau de livrare."
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Ordin de aprovizionare"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Confirmarea datei"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de Linii"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# a cantitătii"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Comanda de vanzare"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantitate (UdV)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Liniile Comenzii de vanzare care se afla in starea 'efectuat'"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Suma in avans"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmat(a)"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Termen de plata implicit"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Confirma"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Adresa de expediere"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Linii din comenzile de vanzare gata de facturat"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Cifra de afaceri lunara"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "An"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Comenzi de vanzare care nu au fost confirmate inca"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Nr Comanda"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Linii comanda"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Discount (%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referinta comanda"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Linii factura"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Pret total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Cotatii vechi"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Bifati casuta pentru a grupa facturile pentru aceiasi clienti"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Creeaza Facturi"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Ora"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Data Crearii"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Programul de asteptare"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Adresa de facturare pentru comanda curenta de vanzare."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantitatile comandate"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Anul comenzii de vanzare"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Cantitate"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Vanzarile mele"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Actiune invalida !"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Pozitie fiscala"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Iulie"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UdV"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "Lista de preturi EDI (%s)"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Data cotatiei"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Data comenzii"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Cotatii si Vanzari"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "Partener"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Factura bazata pe livrari"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Linie comanda"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
-"Comenzile de vanzare va ajuta sa gestionati cotatiile si comenzile de la "
-"clientii dumneavoastra. OpenERP sugereaza sa incepeti prin crearea unei "
-"cotatii. Odata ce este confirmata, cotatia va fi transformata intr-o Comanda "
-"de vanzare. OpenERP poate gestiona mai multe tipuri de produse, astfel incat "
-"o comanda de vanzari poate declansa sarcini, comenzi de livrare, comenzi de "
-"productie, achizitii si asa mai departe. Pe baza configuratiei comenzii de "
-"vanzari, va fi generata o factura ciorna, iar d-voastra trebuie doar sa o "
-"confirmati atunci cand doriti sa emiteti factura clientului."
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Vanzarile genereaza factura"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Reducere (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Factura nu poate fi creata pentru aceasta Linie a Comenzii de Vanzare "
+"datorita unuia dintre urmatoarele motive:\n"
+"1. Starea acestei linii a comenzii de vanzare este sau \"ciorna\" sau "
+"\"anulata\"!\n"
+"2. Linia Comenzii de Vanzare este facturata!"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Liniile efectuate ale comenzii de vanzare"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Cotatiile mele"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Decembrie"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Expediat"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Luna"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Comanda (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Secvenţă"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "Nu puteti confirma o comanda de vanzare care nu are nicio linie."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nefacturat"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoria Produsului"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Numele magazinului"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Taxe :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Factura Vanzare cu Plata in Avans"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "In desfasurare"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Niciun client definit !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Creeaza facturi"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -186,1323 +1184,10 @@ msgstr ""
 "inseamna orele efectuate pentru sarcinile aferente."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Termen de plata implicit"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Bazat pe Comenzile de livrare"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "Unitatea principala a Programului de lucru"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Stare"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Discount (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Pret total"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Bifati casuta pentru a grupa facturile pentru aceiasi clienti"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Comenzile mele de vanzare"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Cantitatile comandate"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Vanzari dupa Vanzator"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Miscari inventar"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Referinta comanda"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Alte informatii"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Date"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"Factura este creata in mod automat daca politica de expediere este \"Factura "
-"la ridicare\" sau \"Factura la comanda dupa livrare\"."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "Bazat pe sarcinile de lucru"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Cotatii si Vanzari"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Vanzarile genereaza factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr "Avertizare Lista de preturi!"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Reducere (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Cotatiile mele"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Tablou de bord Manager Vanzari"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Ambalare"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Dintr-o comanda de vanzare"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Numele magazinului"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
+msgid "Advance of %s %%"
 msgstr ""
-"Politica de facturare este folosita pentru a sincroniza operatiunile de "
-"facturare si de livrare.\n"
-"  - Alegerea 'Plata inainte de livrare' va genera mai intai factura, iar "
-"apoi va genera comanda de ridicare dupa plata acestei facturi.\n"
-"  - Alegerea 'Livrare si Facturare la cerere' va crea comanda de ridicare "
-"direct si va astepta ca utilizatorul sa faca click manual pe butonul "
-"'Factureaza' pentru a genera factura ciorna pe baza comenzii de vanzare sau "
-"a liniilor comenzii de vanzare.\n"
-"  - Alegerea 'Factureaza la comanda dupa livrare' va genera factura ciorna "
-"pe baza comenzii de vanzare dupa ce toate listele de ridicare au fost "
-"terminate.\n"
-"  - Alegerea 'Factureaza pe baza livrarilor' este folosita pentru a crea o "
-"factura in timpul procesului de ridicare."
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Niciun client definit !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Vanzari in Stare de exceptie"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "Eroare de Configurare !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Conditii"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Nu exista niciun cont al categoriei de venituri definit in mod implicit in "
-"Proprietati pentru Categoria de produse sau nu este definita Pozitia fiscala "
-"!"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Incercati sa atribuiti un lot care nu este din acelasi produs"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "mod invalid pentru test_stare"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Iunie"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Acest ordin de vanzare nu poate fi anulat !"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistici comenzi de vanzare"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Contul analitic asociat unei comenzi de vanzare."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Octombrie"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "Referinta trebuie sa fie unica per Companie!"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Cotatii (oferte)"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Lista de preturi pentru comanda curenta de vanzari."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Numarul de zile intre confirmarea comenzii si expedierea produselor la client"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Data cotatiei"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Pozitie fiscala"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "UdeM"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Numarul de pachete"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "In desfasurare"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Agentul de vanzari confirma cotatia. Starea comenzii de vanzare devine 'In "
-"curs' sau 'Manual în desfasurare'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-"Nu puteti anula o linie din comanda de vanzare care a fost deja facturata!"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Trebuie sa anulati mai intai miscarile de stoc atasate la această linie a "
-"comenzii de vanzare."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Selectati un produs de tip serviciu care se numeste 'Avans Produs'. Este "
-"posibil sa trebuiasca sa il creati si sa il setati drept valoare a acestui "
-"camp."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Nu puteti face un avans la o comanda de vanzare care este definita ca "
-"'Facturare automata după livrare'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Note"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Numele companiei trebuie să fie unic !"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Adresa de facturare pentru comanda curenta de vanzare."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Luna-1"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Luna comandata a comenzii de vanzare"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-"Nu puteti grupa vanzarile care au valute diferite pentru acelasi partener."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Livreaza fiecare produs atunci cand este disponibil"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Facturat"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Comanda de livrare"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Data confirmarii"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Alocare partener"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Martie"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-"Nu puteti muta produse dintr-o sau intr-o locatie de tipul vizualizare."
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Bazat pe Comenzile de vanzare"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Suma totala."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Subtotal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adresa de facturare:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "Secventa linie"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Pentru fiecare linie a comenzii de vanzare este creat un ordin de "
-"aprovizionare pentru a furniza produsul vandut."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm care este prescurtarea de la \"Termeni Comerciali Internationali\" "
-"implica o serie de termeni de vanzare care sunt folositi in tranzactiile "
-"comerciale."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adresa de facturare"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Cauta Linii Nefacturate"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Cotatie / Comanda"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# de Linii"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Factura vanzari deschisa"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Linie comanda de vanzare"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Depozit"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Nr Comanda"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Linii comanda"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Suma neimpozitata"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Linii de facturat"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Cantitate (UdM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Data Crearii"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Diverse"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Linii Nefacturate si Livrate"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Vanzarile mele"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Actiune invalida !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Informatii suplimentare"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Lista de preturi"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# a cantitătii"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "Ora"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Data comenzii"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Expediat"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Toate Cotatiile"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "Optiuni"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septembrie"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Nu puteti confirma o comanda de vanzare care nu are nicio linie."
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Trebuie sa selectati o lista de preturi sau un client in formularul de "
-"vanzare !\n"
-"Va rugam sa setati una/unul inainte de a alege un produs."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Categoria Produsului"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Taxe :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Miscari stoc"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Starea comenzii"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Chiar doriți să creați factura(ile)?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Vanzari dupa Luna"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Nu se poate anula linia comenzii de vanzare!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Zile de siguranta"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Aprovizionarea materialelor vandute"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Creeaza Factura Finala"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Adresa de expediere"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Indica livrarea comenzii de vanzare. Acest camp este actualizat numai dupa "
-"ce programatorul (le) a(u) fost lansat(e)."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Data"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Filtre Extinse..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Exceptie"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Companii"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-"Prezinta starea cotatiei sau a comenzii de vanzare. \n"
-"Starea exceptie este configurata automat atunci cand are loc o operatiune de "
-"anulare in validarea facturii (Exceptie Facturare) sau in procesul listei de "
-"ridicare (Exceptie Expediere). \n"
-"Starea 'In asteptarea programarii' este setata atunci cand factura este "
-"confirmata, dar asteapta ca programatorul sa ruleze data comenzii."
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Nu a fost gasita nicio linie valida a listei de preturi !:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Istoric"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Factureaza la comanda dupa livrare"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Aceasta este lista de facturi care au fost generate pentru acesta comanda de "
-"vanzare. Este posibil ca aceeasi comanda de vanzare sa fi fost facturata in "
-"mai multe randuri (dupa linie, de exemplu)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Referinta dumneavoastra"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "Numele si adresa contactului care a solicitat comanda sau cotatia."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Acestea sunt zilele adaugate la cele promise clientilor in scop de siguranta"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Cantitate"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referinte"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Liniile Comenzii mele de vanzare"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Anuleaza"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Referinta comenzii trebuie sa fie unica per Companie!"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Creeaza Factura"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Impozit total exclus"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Referinta comenzii"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Factura dumneavoastra a fost creata cu succes!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Vanzari dupa Partener"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Contact comanda"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Deschide Facturare"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr "Auto-email a confirmat comenzile de vanzare"
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Nu exista niciun jurnal de vanzari definit pentru aceasta companie: \"%s\" "
-"(id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Forteaza atribuirea"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "la comanda"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Bazat pe cantitatile expediate sau comandate."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Livreaza toate produsele odata"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Ridicari asociate"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Nume"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adresa de expediere:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Vanzari per Client in ultimele 90 de zile"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Starea ciorna a comenzii de vanzare"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Creeaza Comanda de livrare"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-"Nu se poate crea o linie a comenzii de vanzare care se afla in starea '%s'!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "Cant(UdV)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Taxe Totale Incluse"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Creeaza Lista de ridicare"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Data comandata a comenzii de vanzare"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Vanzari pe Categorii de Produse"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Confirmare Cotatie"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Eroare"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Grupeaza dupa..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Recreeaza factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Livrari de Facturat"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Programul de asteptare"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metoda de aprovizionare"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Lista de ridicare"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Seteaza ca ciorna"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Documentul miscarii catre iesire sau catre client."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-"\n"
-"Bună${obiect.nume.id_comanda_partener si ' ' sau "
-"''}${obiect.nume.id_comanda_partener sau ''},\n"
-"\n"
-"Aici este confirmarea comenzii pentru ${obiect.nume.id_partener}:\n"
-"       | Numar comanda: *${obiect.nume}*\n"
-"       | Total comanda: *${obiect.suma_totala} "
-"${obiect.nume.id_lista_de_preturi.id_valuta}*\n"
-"       | Data comenzii: ${obiect.data_comenzii}\n"
-"       % daca obiect.origine:\n"
-"       | Referinta comenzii: ${obiect.origine}\n"
-"       % endif\n"
-"       % daca obiect.ref_comanda_client:\n"
-"       | Referinta dumneavoastra: ${obiect.ref_comanda_client}<br />\n"
-"       % endif\n"
-"       | Contact: ${obiect.nume.id_utilizator} "
-"${obiect.id_utilizator.email_utilizator si "
-"'<%s>'%(obiect.id_utilizator.email_utilizator sau ''}\n"
-"\n"
-"Puteti sa vizualizati confirmarea comenzii, sa o descarcati si chiar sa "
-"platiti online folosind urmatorul link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% daca obiect.politica_comenzii in ('preplatit','manual') si "
-"obiect.id_companie.cont_paypal:\n"
-"<% \n"
-"nume_comp = cotare(obiect.nume.id_companie)\n"
-"nume_comanda = cotare(obiect.nume)\n"
-"cont_paypal = cotare(obiect.id_companie.cont_paypal)\n"
-"suma_comanda = cotare(str(obiect.suma_totala))\n"
-"nume_valuta = cotare(obiect.nume.id_lista_de_preturi.id_valuta)\n"
-"url_paypal = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&factura=%s&sum"
-"a=%s\" \\\n"
-"             "
-"\"&cod_valuta=%s&buton_subtip=servicii&no_note=1&bn=OpenERP_Order_PayNow_%s\""
-" % \\\n"
-"             "
-"(cont_paypal,nume_comp,nume_comanda,nume_comanda,suma_comanda,nume_valuta,num"
-"e_valuta)\n"
-"%>\n"
-"De asemenea este posibil sa platiti direct prin Paypal:\n"
-"    ${url_paypal}\n"
-"% endif\n"
-"\n"
-"Daca aveti intrebari, nu ezitati sa ne contactati.\n"
-"\n"
-"Va multumim pentru ca ati ales ${obiect.nume.id_companie}!\n"
-"\n"
-"\n"
-"--\n"
-"${obiect.nume.id_utilizator} ${obiect.id_utilizator.email.utilizator si "
-"'<%s>'%(obiect.id_utilizator.email.utilizator) sau ''}\n"
-"${obiect.nume.id_companie}\n"
-"% daca obiect.strada.id_companie:\n"
-"${obiect.strada.id_companie sau ''}\n"
-"% endif\n"
-"% daca obiect.strada2.id_companie:\n"
-"${obiect.strada2.id_companie}\n"
-"% endif\n"
-"% daca obiect.oras.id_companie sau obiect.cod_postal.id_companie:\n"
-"${obiect.cod_postal.id_companie sau ''} ${obiect.oras.id_companie sau ''}\n"
-"% endif\n"
-"% daca obiect.id_companie.id_tara:\n"
-"${obiect.id_companie.id_stat si ('%s, ' % obiect.nume.id_companie.id_stat) "
-"sau ''} ${obiect.nume.id_companie.id_tara sau ''}\n"
-"% endif\n"
-"% daca obiect.telefon.id_companie:\n"
-"Telefon: ${obiect.telefon.id_companie}\n"
-"% endif\n"
-"% daca obiect.website.id_companie:\n"
-"${obiect.website.id_companie sau ''}\n"
-"% endif\n"
-"            "
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Valideaza"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Confirma Comanda"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Creeaza Comanda de Aprovizionare"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Taxe"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Comanda de vanzare este gata de facturat"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Data la care comanda de vanzare este creata."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Miscare stoc"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Creeaza facturi"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Comenzi de vanzare create in luna curenta"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-"Daca este bifat 'la comanda', declanseaza o aprovizionare atunci cand "
-"comanda de vanzare este confirmata pentru a crea o sarcina, o comanda de "
-"achizitie sau o comanda de productie legata de aceasta linie a comenzii de "
-"vanzare."
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Suma in avans"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "Cat costa livrarea?"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Cantitati expediate"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Factura bazata pe Comenzile de vanzare"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Daca schimbati lista de preturi a acestei comenzi (si eventual moneda), "
-"preturile liniilor comenzii existente nu vor fi actualizate."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Lista de ridicare"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Eroare !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Comanda de vanzare nu poate fi anulata !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "Cant (UdM)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Anul comenzii de vanzare"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Iulie"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Aprovizionare"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Exceptie la expediere"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "Informatii la ridicare !: "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupeaza facturile"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "Politica de facturare"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "Configurarea Metodei d-voastra de Facturare"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Urmeaza a fi verificat(a) de catre contabil."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referinta UdM"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-"Acest instrument va va ajuta sa instalati modulul corect si sa configurati "
-"sistemul in functie de metoda pe care o folositi pentru a va factura "
-"clientii."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
@@ -1510,14 +1195,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Linie comanda de vanzare Creeaza_factura"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Exceptie factura"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Conduce aprovizionarea si facturarea"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Ciorna"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1525,582 +1205,9 @@ msgid "Paid"
 msgstr "Platit"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analiza vanzarilor"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
-"Ati selectat o cantitate de Unitati %d.\n"
-"Dar nu este compatibila cu ambalajul selectat.\n"
-"Iata o propunere de cantitati conforme cu ambalajul:\n"
-"EAN: %s Cantitate: %s Tip de ul: %s"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Recreeaza Ambalarea"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Proprietati"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Cotatie"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Agentul de vanzari creeaza manual o factura, dacă politica de expediere a "
-"comenzii de vanzare este 'Expediere și Facturare Manuala in desfasurare'. "
-"Factura este creata in mod automat daca politica de expediere este 'Plata "
-"inainte de Livrare'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Puteti genera facturi pe baza comenzilor de vanzare sau pe baza expedierilor."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Linii confirmate ale comenzii de vanzare, inca nelivrate"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Facturi client"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Vanzari"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Pret unitar"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Efectuat"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Trebuie sa selectati un client in formularul de vanzare!\n"
-"Va rugam sa setati un client inainte de a alege un produs."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Document sursa"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "De efectuat"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Politica de ridicare"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Documentul miscarii catre client."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Suma neimpozitata."
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Trebuie sa anulati mai intai toate ridicarile atasate acestei comenzi de "
-"vanzare."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Factura Vanzare cu Plata in Avans"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Luna"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${nume.obiect.id_companie} Comanda (Ref ${nume.obiect sau 'n/a'})"
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Produs"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Anulare Atribuire"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "vanzare.config.politica_de_ridicare"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Cifra de afaceri lunara"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Facturare pe"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Data comenzii"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "UdV produs"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manual in Desfasurare"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "UdeM produs"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistica"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Comanda"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"Nu exista nici un cont de venituri definit pentru acest produs: \"%s\" "
-"(id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignora exceptia"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"In functie de Controlul factuaării comenzii de aânzare, factura se poate "
-"baza pe cantitatile livrate sau comandate. Astfel, o comanda de vanzare "
-"poate genera o factura sau o comanda de livrare de indata ce este confirmata "
-"de catre agentul de vanzari."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Intentionati sa vindeti %.2f%s, dar aveti doar %.2f%s disponibil !\n"
-"Stocul real este %.2f%s. (fara rezerve)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Stari"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_continuturi"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referinta Client"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Pret"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"In functie de configuratia locatiei de iesire, miscarea intre zona de iesire "
-"si client se face manual sau automat prin Comanda de  Livrare."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Plata inaintea livrarii"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Tablou de bord Vanzari"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Creeaza Facturi"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "De facturat"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Data la care comanda de vanzare este confirmata."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "Contract/Cont Analitic"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Companie"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Data facturii"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Suma care va fi facturata in avans."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"Nu a putut fi gasita o linie a listei de preturi care sa se potriveasca cu "
-"acest produs si cu aceasta cantitate.\n"
-"Trebuie sa schimbati sau produsul, cantitatea sau lista de preturi."
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-"Aceasta este o lista de ridicare care a fost generata pentru aceasta comanda "
-"de vanzare."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Creeaza facturi"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Total Net:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Anulat(a)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-"Liniile Comenzii de vanzare asociate unei Comenzi de vanzare de-a mea"
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Magazin"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Confirmarea datei"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Atentionare"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Vanzari dupa Luna"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Comanda de vanzare"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Cantitate (UdV)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Liniile Comenzii de vanzare care se afla in starea 'efectuat'"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"Formularul Lista de Ridicare este creat de indata ce comanda de vanzare este "
-"confirmata in acelasi timp cu ordinul de aprovizionare. Reprezinta "
-"atribuirea de piese la comanda de vanzare. Exista o lista de ridicare per "
-"linie comanda de vanzare care evolueaza odata cu disponibilitatea pieselor."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Confirmat(a)"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "Metoda Principala Bazata pe"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirma"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Eroare! Nu puteti crea companii recursive."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Vanzari pe Categorii de produse in ultimele 90 de zile"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Linii factura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Linii comanda de vanzare"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Timp de livrare"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configurare"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "Lista de preturi EDI (%s)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr "Printeaza Comanda"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Comenzile de vanzare create in anul curent"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Factura nu poate fi creata pentru aceasta Linie a Comenzii de Vanzare "
-"datorita unuia dintre urmatoarele motive:\n"
-"1. Starea acestei linii a comenzii de vanzare este sau \"ciorna\" sau "
-"\"anulata\"!\n"
-"2. Linia Comenzii de Vanzare este facturata!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Liniile efectuate ale comenzii de vanzare"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Greutate"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Facturi"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Decembrie"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Imagine"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"O comanda de aprovizionare este creata automat de indata ce o comanda de "
-"vanzare este confirmata sau factura este platita. Ea conduce achizitionarea "
-"si productia produselor dupa norme si la parametrii comenzii de vanzare. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nefacturat"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Agent de vanzari"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Cotatii vechi"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Suma neimpozitata"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Factura in avans"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "Comanda de vanzare '%s'  a fost anulata."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Ciorna"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -2126,6 +1233,18 @@ msgstr ""
 "* Starea 'Anulata' este setata atunci cand un utilizator anuleaza comanda de "
 "vanzari asociata."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Comenzi de vanzare"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupeaza facturile"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2133,58 +1252,171 @@ msgstr "Valoarea taxei."
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Ambalaje"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Linii din comenzile de vanzare gata de facturat"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Stare"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Comenzi de vanzare create in ultima luna"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Conduce aprovizionarea si facturarea"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Iunie"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "Sabloane e-mail"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Comenzi de vanzare"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Comanda"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Avertizare Lista de preturi!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Magazin Vanzari"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistici comenzi de vanzare"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Data"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Linie comanda de vanzare"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Noiembrie"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtre Extinse..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Avans Produse"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Calculeaza"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Exceptie"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octombrie"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Agentul de vanzari creeaza manual o factura, dacă politica de expediere a "
+"comenzii de vanzare este 'Expediere și Facturare Manuala in desfasurare'. "
+"Factura este creata in mod automat daca politica de expediere este 'Plata "
+"inainte de Livrare'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Trebuie sa anulati mai intai toate facturile anexate la aceasta comanda de "
-"vanzare."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2196,6 +1428,41 @@ msgstr "Ianuarie"
 msgid "Sales Order in Progress"
 msgstr "Comanda de vanzare in desfasurare"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Agentul de vanzari confirma cotatia. Starea comenzii de vanzare devine 'In "
+"curs' sau 'Manual în desfasurare'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
@@ -2203,90 +1470,291 @@ msgstr ""
 "Referinta documentului care a generat aceasta cerere a comenzii de vanzare."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Nu a fost gasita nicio linie valida a listei de preturi !:"
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Angajament in cazul intarzierii"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "Livrare si facturare la cerere"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Linii confirmate ale comenzii de vanzare, inca nelivrate"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+#: view:sale.order:0
+msgid "History"
+msgstr "Istoric"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
-"O comanda de aprovizionare pentru fiecare linie a comenzii de vanzare si "
-"pentru fiecare dintre componente."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Atribuie"
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Aceasta este lista de facturi care au fost generate pentru acesta comanda de "
+"vanzare. Este posibil ca aceeasi comanda de vanzare sa fi fost facturata in "
+"mai multe randuri (dupa linie, de exemplu)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Referinta dumneavoastra"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Data comenzii"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Lista de preturi"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Facturi client"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Comanda de vanzare confirmata pentru facturare."
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Comenzi de vanzare care nu au fost confirmate inca"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Linii comanda de vanzare"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Vanzari"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "Comanda de vanzare '%s' a fost setata pe starea de ciorna."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Daca schimbati lista de preturi a acestei comenzi (si eventual moneda), "
+"preturile liniilor comenzii existente nu vor fi actualizate."
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "din stoc"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Zi"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Inchide"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturi"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Pret unitar"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Efectuat"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adresa de facturare:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Liniile Comenzii mele de vanzare"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Anuleaza"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "Nicio Lista de preturi ! : "
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Livrat"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Cotatie"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Trebuie sa atribuiti un lot de productie pentru acest produs"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Cauta Linii Nefacturate"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
-"Daca aveti mai mult de un magazin pentru a revinde produsele companiei "
-"dumneavoastra, le puteti crea si gestiona de aici. Ori de cate ori veti "
-"inregistra o cotatie sau o comanda de vanzare noua, aceasta trebuie sa fie "
-"asociata unui magazin. Magazinul defineste, de asemenea, depozitul de unde "
-"vor fi livrate produsele pentru fiecare vanzare specifica."
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Referinta comenzii trebuie sa fie unica per Companie!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "De efectuat"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Adresa de expediere:"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Nu puteti grupa vanzarile care au valute diferite pentru acelasi partener."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analiza vanzarilor"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Lista de preturi pentru comanda curenta de vanzari."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Creeaza Factura"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Suma neimpozitata."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Referinta comenzii"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2294,61 +1762,68 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Indica faptul ca o factura a fost platita."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+"Nu puteti anula o linie din comanda de vanzare care a fost deja facturata!"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Produs"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Descriere"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Mai"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Client"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Avans"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Februarie"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Aprilie"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Contabilitate"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Cauta comanda de vanzare"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Cerere Comanda de vanzare"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
-msgstr "Stoc insuficient ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Termen de plata"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Pret"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2367,59 +1842,390 @@ msgstr ""
 "trebuie sa utilizati raportul Analiza Facturilor din Aplicatia de "
 "contabilitate."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Chiar doriți să creați factura(ile)?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Alte informatii"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Cantitate"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Urmeaza a fi verificat(a) de catre contabil."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Adresa de expediere pentru comanda de vanzare curenta."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Cotatie / Comanda"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Client"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Avans"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Februarie"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturare pe"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Data comenzii"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV produs"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Starea ciorna a comenzii de vanzare"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Document sursa"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Aprilie"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual in Desfasurare"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Comenzile mele de vanzare"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Cauta comanda de vanzare"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Luna comandata a comenzii de vanzare"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Trebuie sa selectati o lista de preturi sau un client in formularul de "
+"vanzare !\n"
+"Va rugam sa setati una/unul inainte de a alege un produs."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Dintr-o comanda de vanzare"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignora exceptia"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"In functie de Controlul factuaării comenzii de aânzare, factura se poate "
+"baza pe cantitatile livrate sau comandate. Astfel, o comanda de vanzare "
+"poate genera o factura sau o comanda de livrare de indata ce este confirmata "
+"de catre agentul de vanzari."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Contul analitic asociat unei comenzi de vanzare."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Termen de plata"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Comanda de vanzare este gata de facturat"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Numar cotatie"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referinta Client"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Ridicat(a)"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "An"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Factura pe baza Livrarilor"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Taxe Totale Incluse"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturat"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Data comandata a comenzii de vanzare"
 
 #~ msgid "Partial Delivery"
 #~ msgstr "Livrare parţială"
 
+#~ msgid "from stock"
+#~ msgstr "din stoc"
+
 #~ msgid "Origin"
 #~ msgstr "Origine"
 
 #~ msgid "VAT"
 #~ msgstr "TVA"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Eroare !"
+
 #~ msgid "Packing"
 #~ msgstr "Împachetare"
 
 #~ msgid "Complete Delivery"
 #~ msgstr "Livrare completă"
 
+#~ msgid "Procurement"
+#~ msgstr "Aprovizionare"
+
+#~ msgid "Configuration"
+#~ msgstr "Configurare"
+
 #~ msgid "Sales orders"
 #~ msgstr "Comenzi vânzare"
 
 #~ msgid "Draft Invoice"
 #~ msgstr "Factură ciornă"
 
-#~ msgid "Status"
-#~ msgstr "Stare"
-
-#~ msgid "Sale Order"
-#~ msgstr "Comadă vânzare"
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Eroare"
 
 #~ msgid "Other data"
 #~ msgstr "Alte date"
 
-#~ msgid "Sequence"
-#~ msgstr "Secvenţă"
-
 #~ msgid "Sale Order Lines"
 #~ msgstr "Poziţii comenzi vânzare"
 
@@ -2432,6 +2238,9 @@ msgstr "Factura pe baza Livrarilor"
 #~ msgid "Sale Order Line"
 #~ msgstr "Poziţie comandă vânzare"
 
+#~ msgid "Name"
+#~ msgstr "Nume"
+
 #~ msgid "New Quotation"
 #~ msgstr "Ofertă nouă"
 
@@ -2459,9 +2268,15 @@ msgstr "Factura pe baza Livrarilor"
 #~ msgid "Outgoing Products"
 #~ msgstr "Produse ieşite"
 
+#~ msgid "Notes"
+#~ msgstr "Note"
+
 #~ msgid "Order Ref"
 #~ msgstr "Ref. Comanda"
 
+#~ msgid "Compute"
+#~ msgstr "Calculeaza"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Desemnare manuala"
 
@@ -2692,6 +2507,9 @@ msgstr "Factura pe baza Livrarilor"
 #~ msgid "All at Once"
 #~ msgstr "Toate deodată"
 
+#~ msgid "Warehouse"
+#~ msgstr "Depozit"
+
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Lista de preţuri aprovizionare"
 
@@ -2707,6 +2525,9 @@ msgstr "Factura pe baza Livrarilor"
 #~ "UOS (unitatea de masura la livrare) trebuie să fie într-o categorie diferită "
 #~ "de UOM (unitatea de măsură pe stoc)"
 
+#~ msgid "Packaging"
+#~ msgstr "Ambalare"
+
 #, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Nu am putut să anulez comanda de vânzare!"
@@ -2726,9 +2547,21 @@ msgstr "Factura pe baza Livrarilor"
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Paşi pentru livrarea unei comenzi de vânzare"
 
+#~ msgid "Procurement Order"
+#~ msgstr "Ordin de aprovizionare"
+
+#~ msgid "State"
+#~ msgstr "Stare"
+
+#~ msgid "Dates"
+#~ msgstr "Date"
+
 #~ msgid "Configure"
 #~ msgstr "Configurează"
 
+#~ msgid "Companies"
+#~ msgstr "Companii"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Costuri livrare"
 
@@ -2738,6 +2571,9 @@ msgstr "Factura pe baza Livrarilor"
 #~ msgid "title"
 #~ msgstr "titlu"
 
+#~ msgid "Validate"
+#~ msgstr "Valideaza"
+
 #~ msgid "Invoicing"
 #~ msgstr "Facturare"
 
@@ -2747,13 +2583,28 @@ msgstr "Factura pe baza Livrarilor"
 #~ msgid "    Month-1    "
 #~ msgstr "    Luna-1    "
 
+#~ msgid "Image"
+#~ msgstr "Imagine"
+
 #~ msgid "Shipped Qty"
 #~ msgstr "Cantitate expediată"
 
+#~ msgid "Assign"
+#~ msgstr "Atribuie"
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Stoc insuficient!"
 
+#~ msgid "Delivered"
+#~ msgstr "Livrat"
+
+#~ msgid "Accounting"
+#~ msgstr "Contabilitate"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Linii de facturat"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Facturează pe comandă după livrare"
 
@@ -2767,6 +2618,9 @@ msgstr "Factura pe baza Livrarilor"
 #~ msgid "Invoicing journals"
 #~ msgstr "Jurnale facturare"
 
+#~ msgid "Packings"
+#~ msgstr "Ambalaje"
+
 #~ msgid "Order date"
 #~ msgstr "Data comenzii"
 
@@ -2821,6 +2675,14 @@ msgstr "Factura pe baza Livrarilor"
 #~ "  - alegerea 'Factura la Ridicare' este folosită pentru a crea o factură în "
 #~ "timpul procesului de ridicare."
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "mod invalid pentru test_stare"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/a)"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Referinţa comenzii trebuie să fie unică!"
 
@@ -2831,6 +2693,9 @@ msgstr "Factura pe baza Livrarilor"
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Configurează fluxul de lucru al vânzărilor şi valorile implicite."
 
+#~ msgid "All Quotations"
+#~ msgstr "Toate Cotatiile"
+
 #~ msgid "  Year  "
 #~ msgstr "  An  "
 
@@ -2893,9 +2758,15 @@ msgstr "Factura pe baza Livrarilor"
 #~ msgstr ""
 #~ "Nu puteți anula o linie a comenzii de vânzare care a fost deja facturată!"
 
+#~ msgid "Pick List"
+#~ msgstr "Lista de ridicare"
+
 #~ msgid "Sales Management"
 #~ msgstr "Management vanzări"
 
+#~ msgid "Picking Policy"
+#~ msgstr "Politica de ridicare"
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sales order. \n"
 #~ "The exception state is automatically set when a cancel operation occurs in "
@@ -2911,6 +2782,12 @@ msgstr "Factura pe baza Livrarilor"
 #~ "Starea 'Program in aşteptare' este setată atunci când factura este "
 #~ "confirmată, dar aşteaptă ca programatorul să ruleze in data 'Data comenzii'."
 
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Nu exista nici un cont de venituri definit pentru acest produs: \"%s\" "
+#~ "(id:%d)"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Nu se poate şterge o linie a comenzii de vânzări, care este %s !"
@@ -2925,6 +2802,12 @@ msgstr "Factura pe baza Livrarilor"
 #~ "este disponibil, sau dacă doriti să aşteptaţi ca toate produsele să fie "
 #~ "disponibile."
 
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Timp de livrare"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Eroare! Nu puteti crea companii recursive."
+
 #~ msgid "Ordered Date"
 #~ msgstr "Data comenzii"
 
@@ -3012,9 +2895,634 @@ msgstr "Factura pe baza Livrarilor"
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Factură la livrare"
 
+#~ msgid "Invoice Policy"
+#~ msgstr "Politica de facturare"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Vanzari dupa Vanzator in ultimele 90 de zile"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Bazat pe Fisa de pontaj"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Daca nu aveai suficient stoc disponibil pentru a livra tot odata, acceptati "
+#~ "expedierile partiale sau nu?"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Cotația '%s' a fost schimbata intr-o comanda de vanzare."
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Aici este o lista cu liniile din comenzile de vanzare care vor fi facturate. "
+#~ "Puteti factura comenzile de vanzare partial, prin linii ale comenzii de "
+#~ "vanzare. Nu aveti nevoie de aceasta lista daca facturati pe baza livrarilor "
+#~ "sau daca facturati total vanzarile."
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Factura bazata pe livrari"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Pentru a sterge o comanda de vanzare confirmata, trebuie sa o anulati mai "
+#~ "intai ! Pentru a anula o comanda de vanzare, trebuie sa anulati mai intai "
+#~ "comenzile de ridicare sau de livrare."
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Avertizare !"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr ""
+#~ "Acţioneza ordinele de aprovizionare pentru fiecare linie a comenzii de "
+#~ "vânzare."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Comenzile de vanzare va ajuta sa gestionati cotatiile si comenzile de la "
+#~ "clientii dumneavoastra. OpenERP sugereaza sa incepeti prin crearea unei "
+#~ "cotatii. Odata ce este confirmata, cotatia va fi transformata intr-o Comanda "
+#~ "de vanzare. OpenERP poate gestiona mai multe tipuri de produse, astfel incat "
+#~ "o comanda de vanzari poate declansa sarcini, comenzi de livrare, comenzi de "
+#~ "productie, achizitii si asa mai departe. Pe baza configuratiei comenzii de "
+#~ "vanzari, va fi generata o factura ciorna, iar d-voastra trebuie doar sa o "
+#~ "confirmati atunci cand doriti sa emiteti factura clientului."
+
+#~ msgid "Order Line"
+#~ msgstr "Linie comanda"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Unitatea principala a Programului de lucru"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Bazat pe Comenzile de livrare"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Bazat pe sarcinile de lucru"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Factura este creata in mod automat daca politica de expediere este \"Factura "
+#~ "la ridicare\" sau \"Factura la comanda dupa livrare\"."
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Miscari inventar"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Vanzari dupa Vanzator"
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Politica de facturare este folosita pentru a sincroniza operatiunile de "
+#~ "facturare si de livrare.\n"
+#~ "  - Alegerea 'Plata inainte de livrare' va genera mai intai factura, iar "
+#~ "apoi va genera comanda de ridicare dupa plata acestei facturi.\n"
+#~ "  - Alegerea 'Livrare si Facturare la cerere' va crea comanda de ridicare "
+#~ "direct si va astepta ca utilizatorul sa faca click manual pe butonul "
+#~ "'Factureaza' pentru a genera factura ciorna pe baza comenzii de vanzare sau "
+#~ "a liniilor comenzii de vanzare.\n"
+#~ "  - Alegerea 'Factureaza la comanda dupa livrare' va genera factura ciorna "
+#~ "pe baza comenzii de vanzare dupa ce toate listele de ridicare au fost "
+#~ "terminate.\n"
+#~ "  - Alegerea 'Factureaza pe baza livrarilor' este folosita pentru a crea o "
+#~ "factura in timpul procesului de ridicare."
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Tablou de bord Manager Vanzari"
+
+#~ msgid "Conditions"
+#~ msgstr "Conditii"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Eroare de Configurare !"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Nu exista niciun cont al categoriei de venituri definit in mod implicit in "
+#~ "Proprietati pentru Categoria de produse sau nu este definita Pozitia fiscala "
+#~ "!"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Acest ordin de vanzare nu poate fi anulat !"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Incercati sa atribuiti un lot care nu este din acelasi produs"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Referinta trebuie sa fie unica per Companie!"
+
+#~ msgid "UoM"
+#~ msgstr "UdeM"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Numarul de zile intre confirmarea comenzii si expedierea produselor la client"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Trebuie sa anulati mai intai miscarile de stoc atasate la această linie a "
+#~ "comenzii de vanzare."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Nu puteti face un avans la o comanda de vanzare care este definita ca "
+#~ "'Facturare automata după livrare'."
+
+#~ msgid "Number Packages"
+#~ msgstr "Numarul de pachete"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Selectati un produs de tip serviciu care se numeste 'Avans Produs'. Este "
+#~ "posibil sa trebuiasca sa il creati si sa il setati drept valoare a acestui "
+#~ "camp."
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "Numele companiei trebuie să fie unic !"
+
+#~ msgid "Month-1"
+#~ msgstr "Luna-1"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Livreaza fiecare produs atunci cand este disponibil"
+
+#~ msgid "Delivery Order"
+#~ msgstr "Comanda de livrare"
+
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Pentru fiecare linie a comenzii de vanzare este creat un ordin de "
+#~ "aprovizionare pentru a furniza produsul vandut."
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm care este prescurtarea de la \"Termeni Comerciali Internationali\" "
+#~ "implica o serie de termeni de vanzare care sunt folositi in tranzactiile "
+#~ "comerciale."
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr ""
+#~ "Nu puteti muta produse dintr-o sau intr-o locatie de tipul vizualizare."
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Bazat pe Comenzile de vanzare"
+
+#~ msgid "Line Sequence"
+#~ msgstr "Secventa linie"
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Factura vanzari deschisa"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Suma neimpozitata"
+
+#~ msgid "Extra Info"
+#~ msgstr "Informatii suplimentare"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Diverse"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Cantitate (UdM)"
+
+#~ msgid "Options"
+#~ msgstr "Optiuni"
+
+#~ msgid "Security Days"
+#~ msgstr "Zile de siguranta"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Chiar doriti sa creati factura(ile)?"
 
+#~ msgid "Create Final Invoice"
+#~ msgstr "Creeaza Factura Finala"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Miscari stoc"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Nu se poate anula linia comenzii de vanzare!"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Vanzari dupa Luna"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Aprovizionarea materialelor vandute"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Factureaza la comanda dupa livrare"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "Prezinta starea cotatiei sau a comenzii de vanzare. \n"
+#~ "Starea exceptie este configurata automat atunci cand are loc o operatiune de "
+#~ "anulare in validarea facturii (Exceptie Facturare) sau in procesul listei de "
+#~ "ridicare (Exceptie Expediere). \n"
+#~ "Starea 'In asteptarea programarii' este setata atunci cand factura este "
+#~ "confirmata, dar asteapta ca programatorul sa ruleze data comenzii."
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Indica livrarea comenzii de vanzare. Acest camp este actualizat numai dupa "
+#~ "ce programatorul (le) a(u) fost lansat(e)."
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Numele si adresa contactului care a solicitat comanda sau cotatia."
+
+#~ msgid "References"
+#~ msgstr "Referinte"
+
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Impozit total exclus"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Acestea sunt zilele adaugate la cele promise clientilor in scop de siguranta"
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Auto-email a confirmat comenzile de vanzare"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Nu exista niciun jurnal de vanzari definit pentru aceasta companie: \"%s\" "
+#~ "(id:%d)"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Vanzari dupa Partener"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Deschide Facturare"
+
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Factura dumneavoastra a fost creata cu succes!"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Bazat pe cantitatile expediate sau comandate."
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Contact comanda"
+
+#~ msgid "on order"
+#~ msgstr "la comanda"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Forteaza atribuirea"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr ""
+#~ "Nu se poate crea o linie a comenzii de vanzare care se afla in starea '%s'!"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Livreaza toate produsele odata"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Vanzari per Client in ultimele 90 de zile"
+
+#~ msgid "Related Picking"
+#~ msgstr "Ridicari asociate"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Cant(UdV)"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Creeaza Comanda de livrare"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Livrari de Facturat"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Metoda de aprovizionare"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Vanzari pe Categorii de Produse"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Creeaza Lista de ridicare"
+
+#~ msgid "Confirm Order"
+#~ msgstr "Confirma Comanda"
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Documentul miscarii catre iesire sau catre client."
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Creeaza Comanda de Aprovizionare"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Seteaza ca ciorna"
+
+#~ msgid "Stock Move"
+#~ msgstr "Miscare stoc"
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Cat costa livrarea?"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Cantitati expediate"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Comenzi de vanzare create in luna curenta"
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "Daca este bifat 'la comanda', declanseaza o aprovizionare atunci cand "
+#~ "comanda de vanzare este confirmata pentru a crea o sarcina, o comanda de "
+#~ "achizitie sau o comanda de productie legata de aceasta linie a comenzii de "
+#~ "vanzare."
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Factura bazata pe Comenzile de vanzare"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "Informatii la ridicare !: "
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Cant (UdM)"
+
+#~ msgid "Picking List"
+#~ msgstr "Lista de ridicare"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Comanda de vanzare nu poate fi anulata !"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Exceptie la expediere"
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr ""
+#~ "Acest instrument va va ajuta sa instalati modulul corect si sa configurati "
+#~ "sistemul in functie de metoda pe care o folositi pentru a va factura "
+#~ "clientii."
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Configurarea Metodei d-voastra de Facturare"
+
+#~ msgid "Reference UoM"
+#~ msgstr "Referinta UdM"
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Ati selectat o cantitate de Unitati %d.\n"
+#~ "Dar nu este compatibila cu ambalajul selectat.\n"
+#~ "Iata o propunere de cantitati conforme cu ambalajul:\n"
+#~ "EAN: %s Cantitate: %s Tip de ul: %s"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Puteti genera facturi pe baza comenzilor de vanzare sau pe baza expedierilor."
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Recreeaza Ambalarea"
+
+#~ msgid "Properties"
+#~ msgstr "Proprietati"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Trebuie sa selectati un client in formularul de vanzare!\n"
+#~ "Va rugam sa setati un client inainte de a alege un produs."
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Trebuie sa anulati mai intai toate ridicarile atasate acestei comenzi de "
+#~ "vanzare."
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Documentul miscarii catre client."
+
+#~ msgid "Cancel Assignation"
+#~ msgstr "Anulare Atribuire"
+
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "vanzare.config.politica_de_ridicare"
+
+#~ msgid "States"
+#~ msgstr "Stari"
+
+#~ msgid "Logistic"
+#~ msgstr "Logistica"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_continuturi"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Intentionati sa vindeti %.2f%s, dar aveti doar %.2f%s disponibil !\n"
+#~ "Stocul real este %.2f%s. (fara rezerve)"
+
+#~ msgid "Product UoM"
+#~ msgstr "UdeM produs"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Plata inaintea livrarii"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "In functie de configuratia locatiei de iesire, miscarea intre zona de iesire "
+#~ "si client se face manual sau automat prin Comanda de  Livrare."
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr ""
+#~ "Aceasta este o lista de ridicare care a fost generata pentru aceasta comanda "
+#~ "de vanzare."
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "Nu a putut fi gasita o linie a listei de preturi care sa se potriveasca cu "
+#~ "acest produs si cu aceasta cantitate.\n"
+#~ "Trebuie sa schimbati sau produsul, cantitatea sau lista de preturi."
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "Formularul Lista de Ridicare este creat de indata ce comanda de vanzare este "
+#~ "confirmata in acelasi timp cu ordinul de aprovizionare. Reprezinta "
+#~ "atribuirea de piese la comanda de vanzare. Exista o lista de ridicare per "
+#~ "linie comanda de vanzare care evolueaza odata cu disponibilitatea pieselor."
+
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Atentionare"
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Metoda Principala Bazata pe"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Vanzari dupa Luna"
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Vanzari pe Categorii de produse in ultimele 90 de zile"
+
+#~ msgid "Print Order"
+#~ msgstr "Printeaza Comanda"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Comenzile de vanzare create in anul curent"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "O comanda de aprovizionare este creata automat de indata ce o comanda de "
+#~ "vanzare este confirmata sau factura este platita. Ea conduce achizitionarea "
+#~ "si productia produselor dupa norme si la parametrii comenzii de vanzare. "
+
+#~ msgid "Salesman"
+#~ msgstr "Agent de vanzari"
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Comanda de vanzare '%s'  a fost anulata."
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Comenzi de vanzare create in ultima luna"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Trebuie sa anulati mai intai toate facturile anexate la aceasta comanda de "
+#~ "vanzare."
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "O comanda de aprovizionare pentru fiecare linie a comenzii de vanzare si "
+#~ "pentru fiecare dintre componente."
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Livrare si facturare la cerere"
+
+#~ msgid "Close"
+#~ msgstr "Inchide"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Trebuie sa atribuiti un lot de productie pentru acest produs"
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Comanda de vanzare '%s' a fost setata pe starea de ciorna."
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Daca aveti mai mult de un magazin pentru a revinde produsele companiei "
+#~ "dumneavoastra, le puteti crea si gestiona de aici. Ori de cate ori veti "
+#~ "inregistra o cotatie sau o comanda de vanzare noua, aceasta trebuie sa fie "
+#~ "asociata unui magazin. Magazinul defineste, de asemenea, depozitul de unde "
+#~ "vor fi livrate produsele pentru fiecare vanzare specifica."
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Factura pe baza Livrarilor"
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "Stoc insuficient ! : "
+
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Cerere Comanda de vanzare"
+
+#~ msgid "Print Quotation"
+#~ msgstr "Tipareste oferta"
+
 #~ msgid "Sales Configuration"
 #~ msgstr "Configurare vanzari"
 
@@ -3053,3 +3561,152 @@ msgstr "Factura pe baza Livrarilor"
 #~ msgstr ""
 #~ "Împachetarea ”afară” este generată numai pentru produse ce pot fi stocate "
 #~ "prin suprapunere."
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+#~ msgstr ""
+#~ "\n"
+#~ "Buna ziua ${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "O noua comanda a fost generata pentru  ${object.partner_id.name}:\n"
+#~ "| Numar comanda: *${object.name}*\n"
+#~ "| Total comanda: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "| Data comanda: ${object.date_order}\n"
+#~ "% if object.origin:\n"
+#~ "| Referinta comanda: ${object.origin}\n"
+#~ "% endif\n"
+#~ "% if object.client_order_ref:\n"
+#~ "| Referinta dumneavoastra: ${object.client_order_ref}<br />\n"
+#~ "% endif\n"
+#~ "| Agentul dumneavoastra: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "Puteti sa vizualizati confirmarea comenzii, sa o descarcati si chiar sa "
+#~ "platiti online folosind urmatorul link:\n"
+#~ "${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<%\n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "De asemenea este posibil sa platiti direct prin Paypal:\n"
+#~ "${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "Daca aveti intrebari, nu ezitati sa ne contactati.\n"
+#~ "\n"
+#~ "\n"
+#~ "Va multumim pentru ca a-ti ales ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Telefon: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 8bbf5997a47..dd44aa794b3 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -6,586 +6,317 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:51+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
+"PO-Revision-Date: 2012-10-23 18:53+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr ""
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Счет на предоплату"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
-msgstr ""
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Подтвердить предложение"
 
 #. module: sale
 #: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Продажи по менеджеру за 90 дней"
+msgid "Sales Dashboard"
+msgstr "Панель продаж"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
+#: model:email.template,body_html:sale.email_template_edi_sale
 msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-"Если у вас недостаточно места на складе, чтобы доставить все за раз, примите "
-"ли вы частичную доставку?"
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Адрес доставки для текущего заказа на продажу."
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Количество"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "День"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Отменить заказа"
-
-#. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Запрос цен '%s'  был преобразован в заказ на продажу"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
 msgstr ""
 
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr "Внимание!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-"Управление заказами на снабжение для каждой позиции заказа на продажу."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Счет аналитики"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Это список позиций заказов на продажу на которые выставляются счета. Вы "
-"можете выставлять счета на отдельные позиции заказов на продажу. Вам не "
-"нужен этот список, если вы выставляете счета по заказам на доставку или если "
-"вы выставляете счета на весь заказ на продажу."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Заказ на закупку"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Контрагент"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Позиция заказа"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-"Заказы на продажу помогают вам управлять запросами/предложениями цен и "
-"заказами от клиентов. OpenERP предполагает, что вы начинаете с создания "
-"запроса/предложения цен. Как только это подтверждается, запрос/предложение "
-"цен будет преобразован в заказ на продажу. OpenERP может обрабатывать "
-"множество видов ТМЦ так, что заказ может вызвать выполнение задач, доставку "
-"заказов, заказы на производство, закупки и так далее. В зависимости от вида "
-"заказа на продажу, черновик счета будет создан и вы просто должны "
-"подтвердить его в случае выставления счета заказчику."
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-"Заказ на продажу будет автоматически создавать черновик счета. Заказанное и "
-"доставленное количество может не совпадать. Вы можете выбрать на основе чего "
-"будет счет, на основе заказанного количества или на основе доставленного. "
-"Если продукция это услуги, то доставленное количество это часы потраченные "
-"на выполнение услуг."
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Условия платежа по умолчанию"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Состояние"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Дисконт (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Итоговая цена"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Отметьте для группирования счетов по заказчикам"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Заказанное кол-во"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Продажи по менеджеру"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Движение запасов"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Описание заказа"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Прочая информация"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Даты"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"Счет создается автоматически если политика доставки \"Счет из "
-"комплектования\" или \"Счет на заказ после доставки\"."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Продажи - создать счет"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Скидка (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Мои предложения"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Панель менеджера продаж"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Упаковка"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Из заказа на продажу"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Название магазина"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Заказчик не определен !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Продажи в состоянии \"Исключение\""
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Условия"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Не определен счет входящих ТМЦ по умолчанию в настройках категории ТМЦ или "
-"не определена система налогообложения !"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Август"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Вы пытаетесь назначит партию состоящую из другой продукции"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "неверный режим для test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Июнь"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Нельзя отменить этот заказ на продажу !"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Статистика заказов на продажу"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Счет аналитики связанный с заказом на продажу."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Октябрь"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Предложения"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Каталог для текущего заказа на продажу."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "НДС"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Количество дней между подтверждением заказа и отгрузкой ТМЦ заказчику."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Дата предложения"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Налоговая позиция"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "Ед. изм."
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Количество упаковок"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Выполняется"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Продавец подтверждает запрос цен. Состояние заказа на продажу становится 'В "
-"процессе' или 'В процессе вручную'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Сначала вы должны отменить перемещения ТМЦ связанные с этой позицией заказа "
-"на продажу."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(нет)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Выберите значение с названием «Предварительное изделие» имеющий тип "
-"«Услуга». Возможно вам понадобится создать его и установить в качестве "
-"значения по-умолчанию для этого поля."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Тел. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Вы не можете сделать аванс по заказу на продажу, который определен как 'Счет "
-"автоматически после доставки'."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Примечания"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Адрес счета для текущего заказа на продажу."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Выставлен счет"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Заказ на доставку"
-
 #. module: sale
 #: field:sale.order,date_confirm:0
 msgid "Confirmation Date"
 msgstr "Дата подтверждения"
 
 #. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Инкотерм"
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Группировать по ..."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+"Позиции заказа продаж в состоянии \"Подтвержден\", \"Cделано\" или  "
+"\"Исключение\" и на которые не был выставлен счет"
 
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
 msgstr "Долевой участник"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Состояние заказа"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "В счет"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "Единицы измерения"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Дата подтверждения заказа продаж."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Предложения"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
 msgstr "Март"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr "Выставить счет на весь заказ продажи"
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Договор/аналитический счёт"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Компания"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Дата счёта"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Позиции, поставленные без выставления счета"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Сумма аванса в выставляемом счете."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Исключение счета"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr "0"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr "Черновик предложения"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
@@ -593,39 +324,174 @@ msgstr ""
 msgid "The total amount."
 msgstr "Общая сумма."
 
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Счет аналитики"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Подитог"
 
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "Отменить заказ"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Вес"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr "Особенности склада"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr "Предложение "
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr "Единица измерения "
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr "Неверные данные"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Заказ"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr "Сообщения"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Сентябрь"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Налоги"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Сумма до налогов"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr "Проект"
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr "Ошибка!"
+
 #. module: sale
 #: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Адрес счета:"
+msgid "Net Total :"
+msgstr "Чистый итог:"
 
 #. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+#: help:sale.config.settings,module_analytic_user_function:0
 msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
 msgstr ""
-"Для каждой позиции заказа на продажу создается заказ на снабжение для "
-"поставки проданных ТМЦ."
 
 #. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Отменено"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Позиции заказа продаж относящиеся к моим заказам"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr "Предложение отправлено"
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
 msgstr ""
-"Инкоте́рмс (англ. Incoterms, International commerce terms) — международные "
-"правила по толкованию наиболее широко используемых торговых терминов в "
-"области внешней торговли."
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Всего"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Магазин"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Продажи в состоянии \"Исключение\""
 
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
@@ -633,35 +499,186 @@ msgid "Invoice Address"
 msgstr "Адрес выставления счета"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Искать позиции без счетов"
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Дата на которую был создан заказ продаж."
 
 #. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Предложение / Заказ"
+#: view:res.partner:0
+msgid "False"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Воссоздать счет"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Создать счета"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr "Налог"
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr "Неверное действие!"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr "Базовая единица измерения"
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Дата подтверждения"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
 msgid "# of Lines"
 msgstr "Кол-во позиций"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Продажи - открыть счет"
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Позиция заказа на продажу"
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
 
 #. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Склад"
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Кол-во"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Факс :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr "(обновление)"
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Заказ продаж"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Количество (ед.прод.)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Позиции заказа продаж  в состоянии «Сделано»"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Сумма аванса"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Подтвержден"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Условия платежа по умолчанию"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Подтвердить"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr "Непрочитанные сообщения"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Адрес доставки"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Позиции заказа продаж готовы к выставлению счета"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Ежемесячный оборот"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Год"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Заказы продаж, которые еще не были подтверждены"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr "Непрочитанные сообщения"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr "Печать"
 
 #. module: sale
 #: report:sale.order:0
@@ -669,25 +686,83 @@ msgid "Order N°"
 msgstr "Заказ №"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Позиции заказа"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Сумма до налогов"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Дисконт (%)"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Позиции в счет"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Описание заказа"
 
 #. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Количество  (ед.изм.)"
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Позиции счета"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Итоговая цена"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Старые предложения"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Отметьте для группирования счетов по заказчикам"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Сформировать счета"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Час"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
 
 #. module: sale
 #: field:sale.order,create_date:0
@@ -695,14 +770,42 @@ msgid "Creation Date"
 msgstr "Дата создания"
 
 #. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Ожидание планировщика"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Позиции, поставленные без выставления счета"
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Адрес счета для текущего заказа продаж."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Заказанное кол-во"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Год заказа в заказе продаж"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr "Управление продажами и складом"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Количество"
 
 #. module: sale
 #: report:sale.order:0
@@ -715,620 +818,16 @@ msgid "My Sales"
 msgstr "Мои продажи"
 
 #. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
 #, python-format
 msgid "Invalid action !"
 msgstr "Неверное действие !"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Доп. информация"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Прайс-лист"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Кол-во"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Дата заказа"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Доставлено"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Все предложения"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Сентябрь"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Категория продукции"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Налоги :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Движение запасов"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Состояние заказа"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Вы уверены, что хотите создать счет(а) ?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Продажи по месяцу"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Нельзя отменить позицию заказа на продажу!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Запас по сроку (дней)"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Закупка проданного материала"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Создать итоговый счет"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Адрес доставки"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Показывает, что заказ на продажу был доставлен. Это поле обновляется только "
-"после запуска планировщика."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Расширенные фильтры..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Исключение"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Компании"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Журнал"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Это список счетов созданных по этому заказу на продажу. По одному заказу на "
-"продажу можно выставить несколько счетов (например: по позициям заказа)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Ваша ссылка"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "Имя и адрес контакта запросившего заказ или предложение."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "Это количество дней, добавляемых к обещанному сроку для надежности"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Кол-во"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Ссылки"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Отмена"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Создать счет"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Всего без налогов"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Ваш счет был успешно создан!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Продажи по контрагенту"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Контакт"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Открыть счет"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "Не определен журнал продаж для этой компании: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Назначить насильно"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "в заказе"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "На основании отгруженного или заказанного количества."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Связанное комплектование"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Название"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Адрес доставки :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Продажи по заказчику за 90 дней"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Черновик заказа на продажу"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Создать заказ на доставку"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Всего налог"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Создать комплектовочный лист"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Продажи по категориям продукции"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Подтвердить предложение цен"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Ошибка"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Объединять по..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Воссоздать счет"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Доставки в Счета"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "В ожидании расписания"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Метод снабжения"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Комплектовочный лист"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Установить в 'Черновик'"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Документ перемещения на выход или заказчику."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Утвердить"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Подтвердить заказ"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Создать заказ на снабжение"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Налоги"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Дата на которую был создан заказ на продажу."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Движение запасов"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Создать счета"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Факс :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Сумма аванса"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Отправленное количество"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Счет, основанный на заказе на продажу"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Комплектовочный лист"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Ошибка !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Нельзя отменить заказ на продажу !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Система налогообложения"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1336,550 +835,177 @@ msgid "July"
 msgstr "Июль"
 
 #. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Снабжение"
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Исключение при доставке"
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "Параметры по умолчанию"
 
 #. module: sale
-#: code:addons/sale/sale.py:1156
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
 #, python-format
-msgid "Picking Information ! : "
-msgstr ""
+msgid "Configuration Error!"
+msgstr "Ошибка конфигурации!"
 
 #. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Сгруппировать счета"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Будет проверено бухгалтером"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Базовая единица измерения"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Исключение счета"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Управлять снабжением и выставлением счетов"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Оплачено"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Анализ продаж"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr "Аналитический учет для продаж"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Восстановить упаковку"
+msgid "UoS"
+msgstr "Ед.прод."
 
 #. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Свойства"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Предложение"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
+#: view:sale.advance.payment.inv:0
 msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
 msgstr ""
-"Продавец создает счет вручную если политика доставки \"Доставка & счет "
-"вручную\". Счет создается автоматически если политика доставки \"Платеж "
-"перед доставкой\"."
 
 #. module: sale
-#: help:sale.config.picking_policy,order_policy:0
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "Прайс-лист ЕОД(EDI) (%s)"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
 msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Вы можете создать счет на основе заказов на продажу или на основе доставок."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
 msgstr ""
 
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Продажи"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Цена за ед."
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Сделано"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Счет"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Вы должны выбрать заказчика !\n"
-"Пожалуйста выберите заказчика перед выбором ТМЦ."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Документ-источник"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Сделать"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Политика комплектования"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Документ перемещения к заказчику."
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Сумма без налога."
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Сначала вы должны отменить все комплектования связанные с этим заказом на "
-"продажу."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Счет на авансовый платеж"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Месяц"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "ТМЦ"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Отменить назначение"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Счет на"
-
 #. module: sale
 #: report:sale.order:0
-msgid "Date Ordered"
+msgid "Quotation Date"
+msgstr "Дата предложения"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
 msgstr "Дата заказа"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Вторая ед. изм."
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "В процессе вручную"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Ед. изм. продукции"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Логистика"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Заказ"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "Не определен счет доходов для ТМЦ: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Игнорировать исключение"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
+#: help:sale.order,order_policy:0
 msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"В зависимости от метода выставления счетов по заказам на продажу, счет может "
-"основываться на доставляемом или заказанном количестве. Таким образом, заказ "
-"на продажу может создать счет или заказ на доставку, как только он будет "
-"подтвержден менеджером продаж."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Вы планируете продать %.2f %s но имеете только %.2f %s !\n"
-"Действительные запасы %.2f %s. (без резервов)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Cостояния"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Ссылка на клиента"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Всего"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Цена"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"В зависимости от настройки исходящего места хранения, перемещение между "
-"зоной отгрузки и заказчиком выполняется с помощью заказа на доставку вручную "
-"или автоматически."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Сформировать счета"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "В счет"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Дата подтверждения заказа на продажу."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Компания"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Дата выставления счета"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Сумма аванса в выставляемом счете."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "Это комплектовочный лист созданный для этого заказа на продажу."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Создать счета"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Чистый итог:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Отменено"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Магазин"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Дата подтверждения"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Внимание"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Продажи по месяцу"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Заказ на продажу"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Количество (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"Форма комплектовочного листа создастся как только заказ на продажу будет "
-"подтвержден, в одно время с заказом на снабжение. Он представляет собой "
-"определение комплектующих для заказа на продажу. Один комплектовочный лист "
-"на позицию заказа на продажу, который будет меняться в соответствии с "
-"наличием комплектующих."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Подтвержден"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Подтвердить"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Ошибка ! Нельзя создать рекурсивные компании."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Продажи по категориям ТМЦ за 90 дней"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Позиции счета"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Позиции заказа на продажу"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Время выполнения доставки"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Настройки"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Order"
+msgid "Sales Order done"
 msgstr ""
 
 #. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Предложения цен и продажи"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-msgid "Sales order created in current year"
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Партнёр"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Продажи - создать счет"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Скидка (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1887,46 +1013,70 @@ msgid ""
 "1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
 "2.The Sales Order Line is Invoiced!"
 msgstr ""
-"Нельзя создать счет для этой позиции заказа на продажу по одной из причин:\n"
-"1. Состояние позиции заказа на продажу \"Черновик\" или \"Отменен\"!\n"
-"2. Счет на эту позицию заказа на продажу уже выставлен!"
+"Нельзя создать счет для этой позиции заказа продаж по одной из причин:\n"
+"1. Состояние позиции заказа продаж \"Черновик\" или \"Отменен\"!\n"
+"2. Счет на эту позицию заказа продаж уже выставлен!"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
+msgstr "Позиции заказа продаж сделаны"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Мои предложения"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Вес"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Счета"
-
 #. module: sale
 #: selection:sale.report,month:0
 msgid "December"
 msgstr "Декабрь"
 
 #. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Изображение"
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Заказ на снабжение создастся автоматически как только заказ на продажу будет "
-"подтвержден или счет будет оплачен. Он определяет закупку и производство ТМЦ "
-"по правилам и параметрам заказа на продажу. "
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Доставлено"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Месяц"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Заказ (Ссылка ${object.name or 'n/a' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Последовательность"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "Нельзя подтвердить заказ продаж без товара"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1934,41 +1084,128 @@ msgid "Uninvoiced"
 msgstr "Счет не выставлен"
 
 #. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Менеджер продаж"
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Категория продукции"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Старые предложения"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Сумма до налогов"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
+#: code:addons/sale/sale.py:557
 #, python-format
-msgid "Advance Invoice"
-msgstr "Счет на предоплату"
+msgid "Cannot cancel this sales order!"
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:624
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Название магазина"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
 #, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "Заказ на продажу '%s' был отменен."
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Налоги :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Счет на авансовый платеж"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Выполняется"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Заказчик не определен !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Создать счета"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"Заказ продаж будет автоматически создавать черновик счета. Заказанное и "
+"доставленное количество может не совпадать. Вы можете выбрать на основе чего "
+"будет счет, на основе заказанного количества или на основе доставленного. "
+"Если продукция это услуги, то доставленное количество это часы потраченные "
+"на выполнение услуг."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Позиция заказа продажи Make_invoice"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Draft"
 msgstr "Черновик"
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Оплачено"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1982,13 +1219,24 @@ msgid ""
 "            \n"
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
-"* 'Черновик' - это черновик заказа на продажу.                     \n"
-"* 'Подтвержден' - заказа на продажу подтвержден.                     \n"
+"* 'Черновик' - это черновик заказа продаж.                     \n"
+"* 'Подтвержден' - заказа продаж подтвержден.                     \n"
 "* 'Исключение'  - заказ приостановлен из-за особой ситуации.                 "
 "    \n"
-"* 'Сделано' - позиция заказа на продажу скомплектована.                     "
-"\n"
-"* 'Отменен' - пользователь отменил соответствующий заказ на продажу."
+"* 'Сделано' - позиция заказа продаж скомплектована.                     \n"
+"* 'Отменен' - пользователь отменил соответствующий заказ продаж."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Заказы продаж"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Сгруппировать счета"
 
 #. module: sale
 #: help:sale.order,amount_tax:0
@@ -1997,57 +1245,170 @@ msgstr "Сумма налога."
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Упаковки"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Статус"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Август"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
 msgstr ""
 
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Управлять снабжением и выставлением счетов"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Июнь"
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
+msgstr "Шаблоны писем"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Заказ"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Заказы"
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Предупреждение по прайс листу!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Магазин"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Статистика заказов продаж"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Дата"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Позиция заказа продаж"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Ноябрь"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Расширенные фильтры..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Продвижение продукта"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Вычислить"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Исключение"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Октябрь"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Продавец создает счет вручную если политика доставки \"Доставка & счет "
+"вручную\". Счет создается автоматически если политика доставки \"Платеж "
+"перед доставкой\"."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Сначала вы должны отменить все счета связанные с этим заказом на продажу."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2060,94 +1421,330 @@ msgid "Sales Order in Progress"
 msgstr "Заказы в процессе выполнения"
 
 #. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Ссылка на документ который создал запрос на этот заказ на продажу."
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Продавец подтверждает запрос цен. Состояние заказа продаж становится "
+"'Выполняется' или 'Выполняется вручную'."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Ссылка на документ который создал запрос на этот заказ продаж."
+
+#. module: sale
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Нет верной позиции в прайс листе ! :"
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Задержка по обязательствам"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Не доставленные подтвержденные позиции заказа продаж"
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr "История"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
-"Один заказ на снабжение для каждой позиции заказа на продажу и для каждого "
-"компонента."
+"Это список счетов созданных по этому заказу продаж. По одному заказу продаж "
+"можно выставить несколько счетов (например: по позициям заказа)."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Назначить"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Ваша ссылка"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Дата заказа"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Прайс-лист"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "НДС"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Счета заказчику"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr "Подтвержденный заказ на продажу в счет"
+msgstr "Подтвержденный заказ продаж в счет"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Позиции заказа продаж"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Продажи"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Даже если вы измените прайс-лист этого заказа (и даже валюту), то цена "
+"позиции заказа не обновиться."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "День"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Счета"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Цена за ед."
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Сделано"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Адрес счета:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Счет"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Мои позиции заказов продаж"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Отмена"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "Заказ на продажу '%s' был установлен а состояние \"Черновик\"."
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "из запасов"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Закрыть"
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
+msgstr "Нет прайс-листа ! : "
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Предложение"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Искать позиции без счетов"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Доставлено"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Вы должны назначить партию изделий для данной ТМЦ"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"Если у вас больше одного магазина, то здесь вы можете создавать их и "
-"управлять ими. Всякий раз, когда вы вводите новый запрос цен или заказ на "
-"продажу он связывается с магазином. Магазин определяет склад с которого "
-"будет отгружен товар для каждой продажи."
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Сделать"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Адрес доставки :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Нельзя сгруппировать продажи в разных валютах для одного контрагента."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Анализ продаж"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Прайс-лист для текущего заказа продаж."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Создать счет"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Сумма без налога."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Ссылка на заказ"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2155,20 +1752,161 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Показывает, что счет был оплачен."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr "Нельзя отменить позицию заказа продаж, которая уже в счете!"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "ТМЦ"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Описание"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Май"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Цена"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Этот отчет проводит анализ предложений цен  и заказов продаж. Анализ "
+"учитывает доходы от продаж и сортирует их по различным группам критериев "
+"(ответственный, контрагент, ТМЦ и т.д.). Используйте этот отчет для "
+"проведения анализа по продажам без выставления счетов. Если вы хотите "
+"анализировать оборот, вы должны использовать отчет \"Анализ счетов\" в "
+"приложении \"Бухгалтерия\"."
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Тел. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Вы уверены, что хотите создать счет(а) ?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Прочая информация"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Кол-во"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Будет проверено бухгалтером."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Адрес доставки для текущего заказа продаж."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Предложение / Заказ"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
-msgstr "Клиент"
+msgstr "Заказчик"
 
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
@@ -2180,52 +1918,197 @@ msgstr ""
 msgid "February"
 msgstr "Февраль"
 
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Счет на"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Дата заказа"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Ед.продажи товара"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Черновик заказа продажи"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Документ-источник"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Апрель"
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Бухгалтерия"
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Выполняется вручную"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Искать заказ на продажу"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Запрос заказа на продажу"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
-#, python-format
-msgid "Not enough stock ! : "
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Мои заказы продаж"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Искать заказ продаж"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Месяц заказа в заказе продаж"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Перед выбором ТМЦ, \n"
+"вы должны выбрать прайс-лист или заказчика в форме ввода продаж !"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Из заказа продаж"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Игнорировать исключение"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"В зависимости от метода выставления счетов по заказам продаж, счет может "
+"основываться на доставляемом или заказанном количестве. Таким образом, заказ "
+"продаж может создать счет или заказ доставки, как только он будет "
+"подтвержден менеджером продаж."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Счет аналитики связанный с заказом продаж."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Условия оплаты"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Заказ продаж готов к выставлению счета"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
-"Этот отчет проводит анализ предложений цен  и заказов на продажу. Анализ "
-"учитывает доходы от продаж и сортирует их по различным группам критериев "
-"(ответственный, контрагент, ТМЦ и т.д.). Используйте этот отчет для "
-"проведения анализа по продажам без выставления счетов. Если вы хотите "
-"анализировать оборот, вы должны использовать отчет \"Анализ счетов\" в "
-"приложении \"Бухгалтерия\"."
 
 #. module: sale
 #: report:sale.order:0
@@ -2233,19 +2116,73 @@ msgid "Quotation N°"
 msgstr "Предложение №"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Ссылка на клиента"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Скомплектовано"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Год"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Счет основанный на доставках"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Всего налог"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Выставлен счет"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Дата заказа в заказе продаж"
+
+#~ msgid "Salesman"
+#~ msgstr "Продавец"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Установить в 'Черновик'"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Движение запасов"
+
+#~ msgid "Notes"
+#~ msgstr "Примечания"
 
 #~ msgid "Origin"
 #~ msgstr "Происхождение"
@@ -2256,12 +2193,36 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Procure Method"
 #~ msgstr "Метод закупки"
 
+#~ msgid "Extra Info"
+#~ msgstr "Доп. информация"
+
 #~ msgid "Net Price"
 #~ msgstr "Цена до налогов"
 
+#~ msgid "Warehouse"
+#~ msgstr "Склад"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Сумма до налогов"
+
+#~ msgid "Confirm Order"
+#~ msgstr "Подтвердить заказ"
+
+#~ msgid "Configuration"
+#~ msgstr "Настройки"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Неправильный XML для просмотра архитектуры!"
 
+#~ msgid "Procurement"
+#~ msgstr "Снабжение"
+
+#~ msgid "All Quotations"
+#~ msgstr "Все предложения"
+
+#~ msgid "Order Line"
+#~ msgstr "Позиция заказа"
+
 #~ msgid "Canceled"
 #~ msgstr "Отменено"
 
@@ -2271,17 +2232,17 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Procurement Corrected"
 #~ msgstr "Закупка скорректирована"
 
-#~ msgid "Status"
-#~ msgstr "Статус"
-
 #~ msgid "Product sales"
 #~ msgstr "Продажи продукции"
 
 #~ msgid "Our Salesman"
 #~ msgstr "Наш менеджер продаж"
 
-#~ msgid "Sale Order"
-#~ msgstr "Заказ"
+#~ msgid "Properties"
+#~ msgstr "Свойства"
+
+#~ msgid "Compute"
+#~ msgstr "Вычислить"
 
 #~ msgid "VAT"
 #~ msgstr "НДС"
@@ -2289,12 +2250,12 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Sales order lines"
 #~ msgstr "Позиции заказа"
 
-#~ msgid "Sequence"
-#~ msgstr "Последовательность"
-
 #~ msgid "Other data"
 #~ msgstr "Прочие данные"
 
+#~ msgid "UoM"
+#~ msgstr "Ед. изм."
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -2327,6 +2288,9 @@ msgstr "Счет основанный на доставках"
 #~ msgstr ""
 #~ "Имя и адрес контакта, разместившего заказ или запросившего предолжение."
 
+#~ msgid "Name"
+#~ msgstr "Название"
+
 #~ msgid "Total amount"
 #~ msgstr "Итоговая сумма"
 
@@ -2351,6 +2315,9 @@ msgstr "Счет основанный на доставках"
 #~ "заказу может быть выставлены несколько счетов (например, по отдельным "
 #~ "позициям)."
 
+#~ msgid "States"
+#~ msgstr "Cостояния"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Ошибка: Неправильный штрих-код"
 
@@ -2366,6 +2333,9 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Partial Delivery"
 #~ msgstr "Частичная доставка"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Счет после доставки"
 
@@ -2381,6 +2351,9 @@ msgstr "Счет основанный на доставках"
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "После подтверждения заказа, создать счет."
 
+#~ msgid "from stock"
+#~ msgstr "из запасов"
+
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Это список отборочных листов, созданных для этого счета"
@@ -2397,6 +2370,9 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Автоматическое объявление"
 
+#~ msgid "Validate"
+#~ msgstr "Утвердить"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Сделать счет"
 
@@ -2423,6 +2399,9 @@ msgstr "Счет основанный на доставках"
 #~ msgid "All Sales Order"
 #~ msgstr "Все заказы на продажу"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Отправленное количество"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Магазин"
 
@@ -2446,6 +2425,9 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Packing"
 #~ msgstr "Упаковка"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Количество  (ед.изм.)"
+
 #~ msgid "Payment Accounts"
 #~ msgstr "Бух. счета платежа"
 
@@ -2460,6 +2442,9 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Sales orders"
 #~ msgstr "Заказы на продажу"
 
+#~ msgid "Close"
+#~ msgstr "Закрыть"
+
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Черновик счета клиенту будет проверен бухгалтером."
 
@@ -2472,6 +2457,9 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Procurement for each line"
 #~ msgstr "Снабжение для каждой позиции"
 
+#~ msgid "Packaging"
+#~ msgstr "Упаковка"
+
 #~ msgid ""
 #~ "Error: The default UOM and the purchase UOM must be in the same category."
 #~ msgstr ""
@@ -2502,6 +2490,12 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Sale Pricelists"
 #~ msgstr "Каталоги продаж"
 
+#~ msgid "Assign"
+#~ msgstr "Назначить"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Контакт"
+
 #~ msgid "New Quotation"
 #~ msgstr "Новое предложение цен"
 
@@ -2543,22 +2537,47 @@ msgstr "Счет основанный на доставках"
 #~ "соответствии с различными критериями выставления счетов: ежедневно, "
 #~ "еженедельно и т.д."
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Внимание!"
+
+#~ msgid "Dates"
+#~ msgstr "Даты"
+
+#~ msgid "State"
+#~ msgstr "Состояние"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Позволяет рассчитать стоимость доставки по вашему предложению."
 
+#~ msgid "Related Picking"
+#~ msgstr "Связанное комплектование"
+
 #, python-format
 #~ msgid "Picking Information !"
 #~ msgstr "Комплектовочная информация !"
 
+#~ msgid "Picking List"
+#~ msgstr "Комплектовочный лист"
+
+#~ msgid "Picking Policy"
+#~ msgstr "Политика комплектования"
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Комплектовочный лист & Заказ на доставку"
 
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Настроить политику комплектования для заказа на продажу"
 
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Время выполнения доставки"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Счет на заказ после доставки"
 
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Документ перемещения на выход или заказчику."
+
 #, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Не удалось отменить заказ на продажу !"
@@ -2589,21 +2608,91 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Вы уверены, что хотите создать счет(а) ?"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Движение запасов"
+
 #~ msgid "  Year  "
 #~ msgstr "  Год  "
 
+#~ msgid "Procurement of sold material"
+#~ msgstr "Закупка проданного материала"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Продажи по месяцу"
+
+#~ msgid "Companies"
+#~ msgstr "Компании"
+
+#~ msgid "References"
+#~ msgstr "Ссылки"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Даты заказа на продажу"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Всего без налогов"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Открыть счет"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "На основании отгруженного или заказанного количества."
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Вы планируете продать %.2f %s но имеете только %.2f %s !\n"
+#~ "Действительные запасы %.2f %s. (без резервов)"
+
+#~ msgid "Pick List"
+#~ msgstr "Комплектовочный лист"
+
 #~ msgid "Order date"
 #~ msgstr "Дата заказа"
 
+#~ msgid "Procurement Method"
+#~ msgstr "Метод снабжения"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Продажи по категориям продукции"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Создать комплектовочный лист"
+
+#~ msgid "Stock Move"
+#~ msgstr "Движение запасов"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Ошибка !"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Документ перемещения к заказчику."
+
+#~ msgid "Incoterm"
+#~ msgstr "Инкотерм"
+
 #~ msgid "Invoicing"
 #~ msgstr "Выставление счетов"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Отменить назначение"
+
+#~ msgid "Logistic"
+#~ msgstr "Логистика"
+
+#~ msgid "Product UoM"
+#~ msgstr "Ед. изм. продукции"
+
 #~ msgid "   Month   "
 #~ msgstr "   Месяц   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Внимание"
+
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
@@ -2618,6 +2707,16 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Configuration Progress"
 #~ msgstr "Настройка выполняется"
 
+#~ msgid "Image"
+#~ msgstr "Изображение"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Ошибка"
+
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Ваш счет был успешно создан!"
+
 #~ msgid "Shipped Qty"
 #~ msgstr "Доставленное  кол-во"
 
@@ -2630,6 +2729,35 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Not enough stock !"
 #~ msgstr "Запасов не достаточно !"
 
+#~ msgid "Delivered"
+#~ msgstr "Доставлено"
+
+#~ msgid "Conditions"
+#~ msgstr "Условия"
+
+#~ msgid "Number Packages"
+#~ msgstr "Количество упаковок"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Позиции в счет"
+
+#~ msgid "Security Days"
+#~ msgstr "Запас по сроку (дней)"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Назначить насильно"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Имя и адрес контакта запросившего заказ или предложение."
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr "Это количество дней, добавляемых к обещанному сроку для надежности"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Доставки в Счета"
+
 #~ msgid "Invoicing journals"
 #~ msgstr "Журналы счетов"
 
@@ -2647,18 +2775,50 @@ msgstr "Счет основанный на доставках"
 #~ "Предоставляет некоторые возможности для улучшения шаблона отчета заказа на "
 #~ "продажу."
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "неверный режим для test_state"
+
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Улучшение шаблонов заказов на продажу"
 
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Настройка продаж"
 
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Счет основанный на доставках"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Создать итоговый счет"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Вы пытаетесь назначит партию состоящую из другой продукции"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Продажи по партнеру"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Ошибка ! Нельзя создать рекурсивные компании."
+
+#~ msgid "Sales by Month"
+#~ msgstr "Продажи по месяцу"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Вы должны назначить партию изделий для данной ТМЦ"
+
 #~ msgid "Configure"
 #~ msgstr "Настройка"
 
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(нет)"
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Настройте рабочий процесс продаж и значения по умолчанию."
 
@@ -2673,10 +2833,18 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Счет из комплектования"
 
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr "Не определен журнал продаж для этой компании: \"%s\" (id:%d)"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "Нельзя удалить позицию заказа на продажу: %s !"
 
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr "Не определен счет доходов для ТМЦ: \"%s\" (id:%d)"
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Настройка модуля управления продажами"
 
@@ -2690,12 +2858,35 @@ msgstr "Счет основанный на доставках"
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Настройка логистики заказа на продажу"
 
+#~ msgid "Recreate Packing"
+#~ msgstr "Восстановить упаковку"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Ссылка на заказ должна быть уникальной !"
 
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr "Расширяет модуль продаж дополнительными функциями."
 
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Продажи - открыть счет"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Продажи по заказчику за 90 дней"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Вы должны выбрать заказчика !\n"
+#~ "Пожалуйста выберите заказчика перед выбором ТМЦ."
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Продажи по категориям ТМЦ за 90 дней"
+
+#~ msgid "Packings"
+#~ msgstr "Упаковки"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -2710,12 +2901,45 @@ msgstr "Счет основанный на доставках"
 #~ "\n"
 #~ "Штрих-код: %s количество: %s Type of ul: %s"
 
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Количество дней между подтверждением заказа и отгрузкой ТМЦ заказчику."
+
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "Шаги по доставке заказа на продажу"
 
 #~ msgid "Picking Default Policy"
 #~ msgstr "Политика комплектования по умолчанию"
 
+#~ msgid "Accounting"
+#~ msgstr "Бухгалтерия"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Выберите значение с названием «Предварительное изделие» имеющий тип "
+#~ "«Услуга». Возможно вам понадобится создать его и установить в качестве "
+#~ "значения по-умолчанию для этого поля."
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Инкоте́рмс (англ. Incoterms, International commerce terms) — международные "
+#~ "правила по толкованию наиболее широко используемых торговых терминов в "
+#~ "области внешней торговли."
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Не определен счет входящих ТМЦ по умолчанию в настройках категории ТМЦ или "
+#~ "не определена система налогообложения !"
+
 #~ msgid ""
 #~ "Gives the state of the quotation or sales order. \n"
 #~ "The exception state is automatically set when a cancel operation occurs in "
@@ -2731,6 +2955,9 @@ msgstr "Счет основанный на доставках"
 #~ "Состояние \"Ожидание планировщика\" устанавливается при подтверждении счета "
 #~ "и ожидании запуска планировщика по дате \"Дата заказа\"."
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Исключение при доставке"
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -2754,6 +2981,9 @@ msgstr "Счет основанный на доставках"
 #~ "на продажу, после того, как все комплектовочные листы будут завершены.\n"
 #~ "  - \"Счет из комплектования\" - счет создается в процессе комплектования."
 
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Панель менеджера продаж"
+
 #~ msgid ""
 #~ "By default, OpenERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2813,3 +3043,542 @@ msgstr "Счет основанный на доставках"
 #~ "    * График продаж ТМЦ\n"
 #~ "    * График сделок месяца\n"
 #~ "    "
+
+#~ msgid "Print Quotation"
+#~ msgstr "Печать предложения цен"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Основано на затратах времени"
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "Название компании должно быть уникальным!"
+
+#~ msgid "Month-1"
+#~ msgstr "Месяц-1"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Ссылка должна быть уникальна для каждой компании!"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Ошибка конфигурации !"
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr "Нельзя переместить ТМЦ в/из место хранения типа вид."
+
+#~ msgid "Line Sequence"
+#~ msgstr "Последовательность"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Прочее"
+
+#~ msgid "Options"
+#~ msgstr "Настройки"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr "Нельзя удалить позицию заказа на продажу со статусом '%s'!"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "Информация по комплектованию ! : "
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Настройка способа выставления счета"
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Политика выставления счета"
+
+#~ msgid "Print Order"
+#~ msgstr "Печать заказа"
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "Не достаточно запасов ! : "
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Кол-во(Ед.изм)"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Основная единица рабочего времени"
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Основной метод основан на"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "Не удалось найти позицию в прайс-листе для этого товара и этого количества.\n"
+#~ "Вы должны изменить товар, количество или прайс-лист."
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr ""
+#~ "Этот инструмент поможет вам установить правильный модуль и настроить систему "
+#~ "в соответствии с методом который вы используете для выставления счетов своим "
+#~ "клиентам."
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Продажи по продавцу за 90 дней"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Если у вас недостаточно товара на складе, чтобы доставить все за раз, "
+#~ "примите ли вы частичную доставку?"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Запрос цен '%s'  был преобразован в заказ продаж"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Это список позиций заказов продаж на которые выставляются счета. Вы можете "
+#~ "выставлять счета на отдельные позиции заказов продаж. Вам не нужен этот "
+#~ "список, если вы выставляете счета по заказам доставки или если вы "
+#~ "выставляете счета на весь заказ продаж."
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Для удаления подтвержденного заказа продаж надо сначала его отменить ! Для "
+#~ "отмены заказа продаж надо отменить его комплектование или заказ доставки."
+
+#~ msgid "Procurement Order"
+#~ msgstr "Заказ снабжения"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Управление заказами снабжения для каждой позиции заказа продаж."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Заказы продаж помогают вам управлять запросами/предложениями цен и заказами "
+#~ "от клиентов. OpenERP предполагает, что вы начинаете с создания "
+#~ "запроса/предложения цен. Как только это подтверждается, запрос/предложение "
+#~ "цен будет преобразован в заказ продажи. OpenERP может обрабатывать множество "
+#~ "видов ТМЦ так, что заказ может вызвать выполнение задач, доставку заказов, "
+#~ "заказы на производство, закупки и так далее. В зависимости от вида заказа "
+#~ "продаж, черновик счета будет создан и вы просто должны подтвердить его в "
+#~ "случае выставления счета заказчику."
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Основанный на заказе доставки"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Основан на работе по задаче"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Продажи по продавцу"
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Доставка и счёт по заказу"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Оплата перед доставкой"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Счет по заказу после доставки"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Счет создается автоматически если политика доставки \"Счет из "
+#~ "комплектования\" или \"Счет по заказу после доставки\"."
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Счет основанный на доставках"
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Политика выставления счёта используется для синхронизации счёта и операций "
+#~ "доставки.\n"
+#~ "  - выбор 'Оплата перед доставкой' сначала создаст счёт и затем создаст "
+#~ "заказ комплектования после платежа по этому счёту.\n"
+#~ "  - 'Доставка и счёт по заказу' создаст непосредственно заказ комплектования "
+#~ "и ждёт ручного нажатия пользователем кнопки 'Выставить счёт' для создания "
+#~ "черновика счёта основанного на заказе продажи или позициях заказа продажи.\n"
+#~ "  - выбор 'Счёт по заказу после доставки' создаст черновик счёта основанный "
+#~ "на заказе продаж после завершения всех комплектовочных списков.\n"
+#~ "  - выбор 'Счёт основанный на доставках' используется для создания счёта в "
+#~ "течении процесса комплектования."
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Нельзя отменить этот заказ продаж !"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Сначала вы должны отменить перемещения ТМЦ связанные с этой позицией заказа "
+#~ "продаж."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Вы не можете сделать аванс по заказу продаж, который определен как 'Счет "
+#~ "автоматически после доставки'."
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Доставка каждого товара по готовности."
+
+#~ msgid "Delivery Order"
+#~ msgstr "Заказ доставки"
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Для каждой позиции заказа продаж создается заказ снабжения для поставки "
+#~ "проданных ТМЦ."
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Основан на заказах продаж"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Нельзя отменить позицию заказа продаж!"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "Даёт состояние предложения или заказа продаж. \n"
+#~ "Состояние \"Исключение\" автоматически устанавливается при отмене операции в "
+#~ "утверждении счёта (исключение счёта) или в обработке комплектовочного листа "
+#~ "(исключение  доставки). \n"
+#~ "Состояние 'Ожидание планировщика' устанавливается при подтверждении счёта, "
+#~ "но ожидании запуска планировщика по дате заказа."
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Показывает, что заказ продаж был доставлен. Это поле обновляется только "
+#~ "после запуска планировщика."
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Автоматическое e-mail подтвердившее заказы продаж"
+
+#~ msgid "on order"
+#~ msgstr "по заказу"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Доставка всех товаров за раз"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Создать заказ доставки"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Создать заказ снабжения"
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+#~ msgstr ""
+#~ "\n"
+#~ "Здравствуйте ${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Здесь подтверждение вашего заказа для ${object.partner_id.name}:\n"
+#~ "       | Номер заказа: *${object.name}*\n"
+#~ "       | Сумма заказа: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Дата заказа: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Ссылка заказа: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Ваша ссылка: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Ваш контакт: ${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "Вы можете видеть подтверждение заказа, загрузить его и даже оплатить онлайн "
+#~ "используя следующую ссылку:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \\\"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\\\" \\\\\n"
+#~ "             \\"
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\\\" % \\\\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "Возможна прямая оплата через Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "Если у вас есть какой-то вопрос, не стесняйтесь обратиться к нам.\n"
+#~ "\n"
+#~ "\n"
+#~ "Спасибо вам за выбор ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Телефон: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Вы поручаете доставку?"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Заказы продаж, созданные в этом месяце"
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "Если 'на заказ', то это запускает снабжение когда заказ продажи подтверждён "
+#~ "для создания задачи, заказ закупки или заказ производства связанный с этой "
+#~ "позицией заказа продажи."
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Счет, основанный на заказе продаж"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Кол-во (ед.прод.)"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Нельзя отменить заказ продаж !"
+
+#~ msgid "Reference UoM"
+#~ msgstr "Базовая ед. изм."
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Вы выбрали количество из %d единиц.\n"
+#~ "Но это не совместимо с выбранным комплектованием.\n"
+#~ "Вот предложение количеств в соответствии с комплектованием:\n"
+#~ "штрих-код: %s количество: %s тип ul: %s"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Вы можете создать счет на основе заказов продаж или на основе доставок."
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Сначала вы должны отменить все комплектования связанные с этим заказом "
+#~ "продаж."
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "В зависимости от настройки исходящего места хранения, перемещение между "
+#~ "зоной отгрузки и заказчиком выполняется с помощью заказа доставки вручную "
+#~ "или автоматически."
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "Это комплектовочный лист созданный для этого заказа продаж."
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "Форма комплектовочного листа создастся как только заказ продаж будет "
+#~ "подтвержден, в одно время с заказом снабжения. Он представляет собой "
+#~ "определение комплектующих для заказа продаж. Один комплектовочный лист на "
+#~ "позицию заказа продаж, который будет меняться в соответствии с наличием "
+#~ "комплектующих."
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Заказы продаж созданные в этом году"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Заказ снабжения создастся автоматически как только заказ продаж будет "
+#~ "подтвержден или счет будет оплачен. Он определяет закупку и производство ТМЦ "
+#~ "по правилам и параметрам заказа продаж. "
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Заказ продаж '%s' был отменен."
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Заказы продаж созданные в прошлом месяце"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Сначала вы должны отменить все счета связанные с этим заказом продаж."
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr ""
+#~ "Один заказ снабжения для каждой позиции заказа продаж и для каждого "
+#~ "компонента."
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Заказ продаж '%s' был установлен а состояние \"Черновик\"."
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Если у вас больше одного магазина, то здесь вы можете создавать их и "
+#~ "управлять ими. Всякий раз, когда вы вводите новый запрос цен или заказ "
+#~ "продаж он связывается с магазином. Магазин определяет склад с которого будет "
+#~ "отгружен товар для каждой продажи."
+
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Запрос заказа продаж"
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 2c477d1d7a0..53d2e09585b 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -1,1062 +1,24 @@
-# #-#-#-#-#  sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-# 	* sale
+#   * sale
 #
-# #-#-#-#-#  sale.pot.web (PROJECT VERSION)  #-#-#-#-#
-# Translations template for PROJECT.
-# Copyright (C) 2012 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  sale.pot (OpenERP Server 6.1rc1)  #-#-#-#-#\n"
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-08 00:35+0000\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
+"PO-Revision-Date: 2012-09-20 07:29+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"
-"#-#-#-#-#  sale.pot.web (PROJECT VERSION)  #-#-#-#-#\n"
-"Project-Id-Version: PROJECT VERSION\n"
-"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid ""
-"Sale Order Lines that are confirmed, done or in exception state and haven't "
-"yet been invoiced"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:638
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
 #, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr ""
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
+msgid "Advance Invoice"
 msgstr ""
 
 #. module: sale
@@ -1065,605 +27,213 @@ msgid "Confirm Quotation"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or ''}${object.partner_order_id."
-"name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} ${object.pricelist_id."
-"currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and object.company_id."
-"paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business="
-"%s&item_name=%s%%20Order%%20%s&invoice=%s&amount=%s\" \\\n"
-"             \"&currency_code="
-"%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow_%s\" % \\\n"
-"             (paypal_account,comp_name,order_name,order_name,order_amount,"
-"cur_name,cur_name)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and '<%s>'%(object."
-"user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid "You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr ""
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
+#: view:board.board:0
 msgid "Sales Dashboard"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid "\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, 255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} ${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or ''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or 'order confirmation'} document, download it and pay online using the following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       \"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       (paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_name)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: #FFF;\">\n"
+"            <strong style=\"text-transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: 16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) or ''} ${object.company_id.country_id.name or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are confirmed, done or in exception state and haven't yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid "Allows you to specify different delivery and invoice addresses on a sale order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid "Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact pricing\n"
+"            (650€/day for a developer), the duration (one year support contract).\n"
+"            You will be able to follow the progress of the contract and invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "To Invoice"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract/Analytic Account"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
 msgstr ""
@@ -1673,27 +243,150 @@ msgstr ""
 msgid "Invoice Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1269
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
 #, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+msgid "You cannot make an advance on a sales order                          that is defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_ids:0
-msgid "This is a list of picking that has been generated for this sales order."
+#: help:sale.order,amount_total:0
+msgid "The total amount."
 msgstr ""
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid "Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: sale
@@ -1702,7 +395,16 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid "Allows you to define what is the default function of a specific user on a given account.\n"
+"                This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
 msgstr ""
@@ -1712,36 +414,128 @@ msgstr ""
 msgid "Sales Order Lines related to a Sales Order of mine"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
 #. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
 msgid "Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
+#: help:sale.order,message_summary:0
+msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
 msgid "Sales Order"
 msgstr ""
 
@@ -1756,12 +550,8 @@ msgid "Sale Order Lines that are in 'done' state"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
 msgstr ""
 
 #. module: sale
@@ -1770,117 +560,105 @@ msgid "Confirmed"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
 msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
 msgid "Confirm"
 msgstr ""
 
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr ""
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
 #. module: sale
 #: view:sale.order:0
-msgid "Print Order"
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
 msgstr ""
 
 #. module: sale
 #: view:sale.report:0
-msgid "Sales order created in current year"
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
 msgstr ""
 
 #. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
+#: view:sale.order:0
+msgid "Print"
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "December"
+#: report:sale.order:0
+msgid "Order N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
+#: report:sale.order:0
+msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
 msgstr ""
 
 #. module: sale
@@ -1889,22 +667,437 @@ msgid "Old Quotations"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
+#: help:sale.config.settings,module_sale_journal:0
+msgid "Allows you to categorize your sales and deliveries (picking lists) between different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:624
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
 #, python-format
-msgid "The sales order '%s' has been cancelled."
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid "For modifying account analytic view to show important data to project manager of services companies.\n"
+"                You can also view the report of account analytic summary user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "After clicking 'Show Lines to Invoice', select lines to invoice and create the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each sale\n"
+"                order, and allow your customer to keep track of the evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid "This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid "Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each sale\n"
+"                order, and allow your customers to keep track of the evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid "Invoice cannot be created for this Sales Order Line due to one of the following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid "There is no Fiscal Position defined or Income category account defined for default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid "In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid "The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
@@ -1912,20 +1105,37 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft "
-"state.                     \n"
-"* The 'Confirmed' state is set when the related sales order is "
-"confirmed.                     \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been "
-"picked.                     \n"
+msgid "* The 'Draft' state is set when the related sales order in draft state.                     \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.                     \n"
+"* The 'Exception' state is set when the related sales order is set as exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.                     \n"
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -1933,55 +1143,156 @@ msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
+#: view:sale.order.line:0
+msgid "Order"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr ""
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
+#: selection:sale.order.line,state:0
+msgid "Exception"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid "The Salesman creates an invoice manually, if the sales order shipping policy is 'Shipping and Manual in Progress'. The invoice is created automatically if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid "Allows you to Make Quotation, Sale Order using different Order policy and Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid "Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on this field."
 msgstr ""
 
 #. module: sale
@@ -1994,31 +1305,89 @@ msgstr ""
 msgid "Sales Order in Progress"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid "The salesman confirms the quotation. The state of the sales order becomes 'In progress' or 'Manual in progress'."
+msgstr ""
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid "Allow to configure warnings on products and trigger them when a user wants to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+#: view:sale.order:0
+msgid "History"
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid "This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2026,56 +1395,217 @@ msgstr ""
 msgid "Date Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr ""
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
+msgid "If you change the pricelist of this order (and eventually the currency), prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
 msgstr ""
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid "<p>\n"
+"                Here is a list of each sales order line to be invoiced. You can\n"
+"                invoice sales orders partially, by lines of sales order. You do\n"
+"                not need this list if you invoice from the delivery orders or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid "You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid "Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
@@ -2084,17 +1614,144 @@ msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid "This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid "Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr ""
@@ -2109,45 +1766,181 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Search Sales Order"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
+#: view:sale.config.settings:0
+msgid "Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract with\n"
+"                        your customer."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1255
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "Not enough stock ! : "
+msgid "You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid "Depending on the Invoicing control of the sales order, the invoice can be based on delivered or on ordered quantities. Thus, a sales order can generates an invoice or a delivery order as soon as it is confirmed by the salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid "Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
 
 #. module: sale
@@ -2156,16 +1949,54 @@ msgid "Quotation N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid "This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
diff --git a/addons/sale/i18n/sk.po b/addons/sale/i18n/sk.po
index 6876c36f26f..85b0d143ca3 100644
--- a/addons/sale/i18n/sk.po
+++ b/addons/sale/i18n/sk.po
@@ -7,21 +7,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 18:08+0000\n"
 "Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Zálohová faktúra"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potvrdiť cenovú ponuku"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Dátum potvrdenia"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Zoskupiť podľa..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -29,1645 +177,104 @@ msgid ""
 "yet been invoiced"
 msgstr ""
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Predaj podľa obchodníka za posledných 90 dní"
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Dodacia adresa pre aktuálne objednávky predaja."
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Množstvo"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Deň"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Zrušiť objednávku"
-
-#. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Cenová ponuka  '%s'  bola prevedená na objednávku predaja."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr "Varovanie!"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analytický účet"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-"Objednávky predaja vám pomôžu spravovať cenové ponuky a objednávky od "
-"svojich zákazníkov. Začnete tým, že vytvoríte cenovú ponuku. Akonáhle je "
-"potvrdená, cenová ponuka bude prevedená na objednávku predaja. OpenERP "
-"zvládne niekoľko druhov produktov tak, aby objednávky predaja mohli vyvolať "
-"úlohy, dodacie listy, výrobné zákazky, nákupy a tak ďalej. Na základe "
-"nastavenia objednávok predaja, bude vygenerovaný návrh faktúry, ktorý stačí "
-"potvrdiť a zaúčtovať zákazníkovi."
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Predvolené platobné podmienky"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Stav"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Zľava(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Celková cena"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Objednané množstvo"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Predaj podľa obchodníka"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Odkaz na objednávku"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Ďalšie informácie"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Termíny"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Zľava (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Balenie"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Názov obchodu"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Nie je definovaný zákazník !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Podmienky"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "August"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "neplatný režim pre test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Jún"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Nemôžete zrušiť objednávku predaja !"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Štatistiky objednávok predaja"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Analytický účet v súvislosti s objednávkou predaja."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Október"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Cenové ponuky"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Cenník pre bežné objednávky predaja."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Počet dní medzi potvrdenou objednávkou a expedíciu produktov k zákazníkovi"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Dátum cenovej ponuky"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiškálna pozícia"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "Jednotka"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Počet balíkov"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "spracováva sa"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Poznámky"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Fakturačná adresa pre aktuálnu objednávku predaja."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fakturovanej"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Dátum potvrdenia"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr ""
-
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
 msgstr "Pridelenie partnera"
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Marec"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Celková suma."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Medzisúčet"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Fakturačná adresa:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Fakturačná adresa"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Cenová ponuka / Objednávka"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# riadky"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Položka objednávky"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Sklad"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Objednávka č."
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Riadky objednávky"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Nezdanená suma"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Položky na faktúre"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Množstvo (UoM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Dátum vytvorenia"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Nevyfakturované a dodané položky"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Celkom :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Môj predaj"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
 #, python-format
-msgid "Invalid action !"
-msgstr "Neplatná akcia!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Ďalšie informácie"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cenník"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# z množ."
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
+msgid "Advance of %s %s"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Dátum objednávky"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Dodané"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Všetky cenové ponuky"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
+#: view:sale.config.settings:0
+msgid "Contract Feature"
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Kategória produktu"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Dane :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
+#: field:sale.report,state:0
 msgid "Order State"
 msgstr "Stav objednávky"
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Naozaj chcete vytvoriť faktúru (y)?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Predaj za mesiac"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Nie je možné zrušiť položku na objednávke!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Vytvoriť konečnú faktúru"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Dodacia adresa"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Rozšírené filtre..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Výnimka"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Spoločnosti"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "História"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Váš odkaz"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-"Meno a adresa kontaktnej osoby, ktorá požiadala o objednávku alebo cenovú "
-"ponuku."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-
-#. module: sale
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "Množ."
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Odkazy"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Zrušené"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Vytvoriť faktúru"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Faktúra bola úspešne vytvorená !"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Predaj podľa partnera"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Kontakt objednávky"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Nie je stanovené žiadne účtovanie pre túto spoločnosť: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "podľa objednávky"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Na základe odoslaného alebo objednaného množstva."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Meno"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Dodacia adresa :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Predaj podľa zákazníkov za posledných 90 dní"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Spolu vrátane DPH"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Predaj podľa kategórie produktov"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potvrdiť cenovú ponuku"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Chyba"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Zoskupiť podľa..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Nastaviť ako návr"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Overenie"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Potvrdiť objednávku"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Dane"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Vytvorenie faktúr"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Záloha vo výške"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Dodané množstvo"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Fakturácia na základe objednávky predaja"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Chyba !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Nemôžem zrušiť objednávku predaja !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Júl"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Výnimka prepravy"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Skupina faktúr"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referencie MJ"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Platené"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analýza predaja"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Možnosti"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Cenová ponuka"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Môžete vytvárať faktúry na základe objednávok predaja alebo na základe "
-"dodania."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Predaj"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Jednotková cena"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Hotovo"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Faktúra"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Musíte zvoliť zákazníka vo formulári predaja!\n"
-"Prosím nastavte aspoň jedného zákazníka pred výberom produktu."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Zdrojový dokument"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Zostáva"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Suma bez dane."
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Zálohová faktúra predaja"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mesiac"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Faktúra podľa"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Dátum objednávky"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "manuálne spracovanie"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Jednotka produktu"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistika"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Poradie"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-"Neexistuje žiadny príjmový účet definovaný pre tento produkt: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Ignorovať výnimku"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Máte v pláne predať %.2f %s, ale máte len %.2f %s k dispozícii !\n"
-"Skutočný počet na sklade je %.2f %s. (bez rezervácií)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Stavy"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referencie zákazníkov"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Celkom"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
 msgid "To Invoice"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Cenové ponuky"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marec"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract/Analytic Account"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
 msgstr "Spoločnosť"
@@ -1677,29 +284,155 @@ msgstr "Spoločnosť"
 msgid "Invoice Date"
 msgstr "Dátum faktúry"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Nevyfakturované a dodané položky"
+
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
 msgstr "Suma, ktorá bude fakturovaná vopred."
 
 #. module: sale
-#: code:addons/sale/sale.py:1269
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
 #, python-format
 msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_ids:0
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Celková suma."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analytický účet"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Medzisúčet"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "Zrušiť objednávku"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Hmotnosť"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
 msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
 msgstr ""
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Vytvorené faktúry"
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Dane"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Suma bez DPH"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -1707,7 +440,20 @@ msgid "Net Total :"
 msgstr "Základ :"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
 msgstr "Zrušená"
@@ -1717,36 +463,130 @@ msgstr "Zrušená"
 msgid "Sales Order Lines related to a Sales Order of mine"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Celkom"
+
 #. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
 msgid "Shop"
 msgstr "Obchod"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Fakturačná adresa"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Vytvorenie faktúr"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
 msgstr "Dátum potvrdenia"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Upozornenie"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# riadky"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Predaj za mesiac"
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
 
 #. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# z množ."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
 msgid "Sales Order"
 msgstr "Objednávka predaja"
 
@@ -1761,13 +601,9 @@ msgid "Sale Order Lines that are in 'done' state"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Záloha vo výške"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1775,65 +611,400 @@ msgid "Confirmed"
 msgstr "Potvrdené"
 
 #. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Predvolené platobné podmienky"
+
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
 msgid "Confirm"
 msgstr "Potvrdiť"
 
 #. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Chyba! Nemôžte vytvárať rekurzívne spoločnosti."
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
 
 #. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Dodacia adresa"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
 #: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Predaj podľa kategórie produktu za posledných 90 dní"
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Rok"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Objednávka č."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Riadky objednávky"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Zľava(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Odkaz na objednávku"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Položky faktúry"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Položky objednávky"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Celková cena"
 
 #. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Staré ponuky"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
 msgstr ""
 
 #. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Konfigurácia"
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/edi/sale_order.py:146
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Dátum vytvorenia"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Fakturačná adresa pre aktuálnu objednávku predaja."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Objednané množstvo"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Množstvo"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Celkom :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Môj predaj"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Neplatná akcia!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiškálna pozícia"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Júl"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
 #, python-format
 msgid "EDI Pricelist (%s)"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Dátum cenovej ponuky"
+
 #. module: sale
 #: view:sale.order:0
-msgid "Print Order"
+msgid "Order Date"
+msgstr "Dátum objednávky"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
 
 #. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-msgid "Sales order created in current year"
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Zľava (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1846,20 +1017,29 @@ msgstr ""
 "1. Stav tohto riadku objednávky je buď v \"návrhu\" alebo je \"zrušená\"!\n"
 "2. Riadok v objednávke je účtovaný!"
 
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Hmotnosť"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr ""
 
 #. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Faktúry"
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1867,17 +1047,35 @@ msgid "December"
 msgstr "December"
 
 #. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Obrázok"
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Dodané"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mesiac"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
@@ -1886,41 +1084,123 @@ msgid "Uninvoiced"
 msgstr "Nevyfakturovaných"
 
 #. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Obchodník"
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Kategória produktu"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Staré ponuky"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Suma bez DPH"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
+#: code:addons/sale/sale.py:557
 #, python-format
-msgid "Advance Invoice"
-msgstr "Zálohová faktúra"
+msgid "Cannot cancel this sales order!"
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:624
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Názov obchodu"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
 #, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "'%s' objednávok predaja bolo zrušených."
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Dane :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Zálohová faktúra predaja"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "spracováva sa"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Nie je definovaný zákazník !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Vytvorené faktúry"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Draft"
 msgstr "Návrh"
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Platené"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1935,6 +1215,18 @@ msgid ""
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Objednávky predaja"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Skupina faktúr"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -1942,57 +1234,167 @@ msgstr "Výška dane."
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Balenia"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Stav"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "August"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
 msgstr ""
 
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Jún"
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Objednávky predaja"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Poradie"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Štatistiky objednávok predaja"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Položka objednávky"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "November"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Rozšírené filtre..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Vypočítať"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Výnimka"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Október"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Musíte najprv zrušiť všetky faktúry pripojené k tejto objednávke predaja."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2004,93 +1406,324 @@ msgstr "Január"
 msgid "Sales Order in Progress"
 msgstr "Objednávka v spracovaní"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "História"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Priradiť"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Váš odkaz"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Dátum objednávky"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cenník"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr ""
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Položky objednávky"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Predaj"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "zo skladu"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Deň"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Zatvoriť"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Faktúry"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Jednotková cena"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Hotovo"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Fakturačná adresa:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Faktúra"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Zrušené"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Dodané"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Cenová ponuka"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Zostáva"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dodacia adresa :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analýza predaja"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Cenník pre bežné objednávky predaja."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Vytvoriť faktúru"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Suma bez dane."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
-"Ak máte viac ako jednu predajňu vo Vašej firmy predávajúce produkty tu ich "
-"môžete vytvárať a spravovať. Každú ponuku alebo objednávku, ktorú nahrávate "
-"musíte spojiť s obchodom. V obchode tiež definujete sklad, z ktorého budú "
-"produkty dodané pre každý jednotlivý predaj."
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2098,61 +1731,67 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Znamená to, že faktúra bola zaplatená."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Opis"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Máj"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Zákazník"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Február"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Apríl"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Účtovníctvo"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Vyhľadávanie objednávky predaja"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Termín úhrady"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cena"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2169,35 +1808,366 @@ msgstr ""
 "zatiaľ fakturovaný. Ak chcete analyzovať svoj obrat, mali by ste použiť "
 "analýzu faktúr v module účtovníctvo."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Naozaj chcete vytvoriť faktúru (y)?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Ďalšie informácie"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Množ."
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Dodacia adresa pre aktuálne objednávky predaja."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Cenová ponuka / Objednávka"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Zákazník"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Február"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Faktúra podľa"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Dátum objednávky"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Zdrojový dokument"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Apríl"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "manuálne spracovanie"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Vyhľadávanie objednávky predaja"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorovať výnimku"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Analytický účet v súvislosti s objednávkou predaja."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Termín úhrady"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Cenová ponuka č."
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencie zákazníkov"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Rok"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Spolu vrátane DPH"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturovanej"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Partial Delivery"
 #~ msgstr "Čiastočné dodania"
 
+#~ msgid "from stock"
+#~ msgstr "zo skladu"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neplatný názov modelu v akcii definície."
 
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Vaša faktúra bola úspešne vytvorená!"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Nastaviť ako návr"
+
+#~ msgid "Validate"
+#~ msgstr "Overenie"
+
+#~ msgid "Notes"
+#~ msgstr "Poznámky"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Vytvoriť faktúru"
 
@@ -2210,27 +2180,51 @@ msgstr ""
 #~ msgid "All at Once"
 #~ msgstr "Všetky naraz"
 
+#~ msgid "Extra Info"
+#~ msgstr "Ďalšie informácie"
+
 #~ msgid "Procure Method"
 #~ msgstr "Metóda obstarania"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Dodané množstvo"
+
+#~ msgid "Warehouse"
+#~ msgstr "Sklad"
+
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Moje predajné objednávky čakajúce na faktúru"
 
 #~ msgid "Complete Delivery"
 #~ msgstr "Kompletná dodávka"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Potvrdiť objednávku"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Množstvo (UoM)"
+
 #~ msgid "Packing"
 #~ msgstr "Balenie"
 
 #~ msgid "Related Packing"
 #~ msgstr "Súvisiace balenie"
 
+#~ msgid "Configuration"
+#~ msgstr "Konfigurácia"
+
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Chyba: UOS musia byť v inej kategórii, ako UOM"
 
 #~ msgid "Draft Invoice"
 #~ msgstr "Návrh faktúry"
 
+#~ msgid "Close"
+#~ msgstr "Zatvoriť"
+
+#~ msgid "Salesman"
+#~ msgstr "Obchodník"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "Prednastavené podmienky balenia"
 
@@ -2240,89 +2234,319 @@ msgstr ""
 #~ msgid "Sales Management"
 #~ msgstr "Správa predaja"
 
+#~ msgid "Packaging"
+#~ msgstr "Balenie"
+
 #~ msgid "Sales Configuration"
 #~ msgstr "Konfigurácia predaja"
 
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Doprava a manuálna faktúra"
 
-#~ msgid "Status"
-#~ msgstr "Stav"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Podmienky balenia"
 
+#~ msgid "Properties"
+#~ msgstr "Možnosti"
+
 #~ msgid "VAT"
 #~ msgstr "DPH"
 
+#~ msgid "Assign"
+#~ msgstr "Priradiť"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neplatné XML pre zobrazenie architektúry!"
 
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Predaj podľa obchodníka za posledných 90 dní"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Nastavenie logistiky objednávok predaja"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Varovanie!"
+
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Platba pred dodaním"
 
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Cenová ponuka  '%s'  bola prevedená na objednávku predaja."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Objednávky predaja vám pomôžu spravovať cenové ponuky a objednávky od "
+#~ "svojich zákazníkov. Začnete tým, že vytvoríte cenovú ponuku. Akonáhle je "
+#~ "potvrdená, cenová ponuka bude prevedená na objednávku predaja. OpenERP "
+#~ "zvládne niekoľko druhov produktov tak, aby objednávky predaja mohli vyvolať "
+#~ "úlohy, dodacie listy, výrobné zákazky, nákupy a tak ďalej. Na základe "
+#~ "nastavenia objednávok predaja, bude vygenerovaný návrh faktúry, ktorý stačí "
+#~ "potvrdiť a zaúčtovať zákazníkovi."
+
+#~ msgid "State"
+#~ msgstr "Stav"
+
+#~ msgid "Dates"
+#~ msgstr "Termíny"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Predaj podľa obchodníka"
+
+#~ msgid "Conditions"
+#~ msgstr "Podmienky"
+
 #~ msgid "Configure"
 #~ msgstr "Nastaviť"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "neplatný režim pre test_state"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Nemôžete zrušiť objednávku predaja !"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Dodanie len podľa objednávky"
 
+#~ msgid "Number Packages"
+#~ msgstr "Počet balíkov"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Počet dní medzi potvrdenou objednávkou a expedíciu produktov k zákazníkovi"
+
+#~ msgid "UoM"
+#~ msgstr "Jednotka"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/a)"
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Nastaviť workflow predaja a predvolené hodnoty."
 
+#~ msgid "Untaxed amount"
+#~ msgstr "Nezdanená suma"
+
+#~ msgid "All Quotations"
+#~ msgstr "Všetky cenové ponuky"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Naozaj chcete vytvoriť faktúru (y)?"
 
+#~ msgid "Create Final Invoice"
+#~ msgstr "Vytvoriť konečnú faktúru"
+
 #~ msgid "  Year  "
 #~ msgstr "  Rok  "
 
+#~ msgid "Sales By Month"
+#~ msgstr "Predaj za mesiac"
+
+#~ msgid "Companies"
+#~ msgstr "Spoločnosti"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr ""
+#~ "Meno a adresa kontaktnej osoby, ktorá požiadala o objednávku alebo cenovú "
+#~ "ponuku."
+
+#~ msgid "References"
+#~ msgstr "Odkazy"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Termíny objednávok predaja"
 
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Marža v objednávke predaja"
 
+#~ msgid "Sales by Partner"
+#~ msgstr "Predaj podľa partnera"
+
+#~ msgid "Compute"
+#~ msgstr "Vypočítať"
+
+#~ msgid "on order"
+#~ msgstr "podľa objednávky"
+
+#~ msgid "Name"
+#~ msgstr "Meno"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Predaj podľa kategórie produktov"
+
 #~ msgid "title"
 #~ msgstr "titul"
 
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Nemôžem zrušiť objednávku predaja !"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Fakturácia na základe objednávky predaja"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Chyba !"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Výnimka prepravy"
+
+#~ msgid "Reference UoM"
+#~ msgstr "Referencie MJ"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Musíte zvoliť zákazníka vo formulári predaja!\n"
+#~ "Prosím nastavte aspoň jedného zákazníka pred výberom produktu."
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Môžete vytvárať faktúry na základe objednávok predaja alebo na základe "
+#~ "dodania."
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
 #~ msgid "Invoicing"
 #~ msgstr "Fakturácia"
 
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Neexistuje žiadny príjmový účet definovaný pre tento produkt: \"%s\" (id:%d)"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Nie je stanovené žiadne účtovanie pre túto spoločnosť: \"%s\" (id:%d)"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Máte v pláne predať %.2f %s, ale máte len %.2f %s k dispozícii !\n"
+#~ "Skutočný počet na sklade je %.2f %s. (bez rezervácií)"
+
+#~ msgid "States"
+#~ msgstr "Stavy"
+
 #~ msgid "   Month   "
 #~ msgstr "   Mesiac   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Upozornenie"
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Predaj podľa kategórie produktu za posledných 90 dní"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Chyba! Nemôžte vytvárať rekurzívne spoločnosti."
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Mesiac-1    "
 
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "'%s' objednávok predaja bolo zrušených."
+
+#~ msgid "Image"
+#~ msgstr "Obrázok"
+
 #~ msgid "Product sales"
 #~ msgstr "Predaj produktu"
 
+#~ msgid "Packings"
+#~ msgstr "Balenia"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Priebeh nastavenia"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Chyba"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Musíte najprv zrušiť všetky faktúry pripojené k tejto objednávke predaja."
+
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Faktúra bola úspešne vytvorená !"
+
 #~ msgid "Shipped Qty"
 #~ msgstr "Dodávané množ."
 
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Ak máte viac ako jednu predajňu vo Vašej firmy predávajúce produkty tu ich "
+#~ "môžete vytvárať a spravovať. Každú ponuku alebo objednávku, ktorú nahrávate "
+#~ "musíte spojiť s obchodom. V obchode tiež definujete sklad, z ktorého budú "
+#~ "produkty dodané pre každý jednotlivý predaj."
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Nie je dostatok zásob!"
 
+#~ msgid "Delivered"
+#~ msgstr "Dodané"
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "Nemôžete mazať objednávku(y), ktoré sú už potvrdené!"
 
+#~ msgid "Accounting"
+#~ msgstr "Účtovníctvo"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Nie je možné zrušiť položku na objednávke!"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Položky na faktúre"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Kontakt objednávky"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Na základe odoslaného alebo objednaného množstva."
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Náklady na doručenie"
 
 #~ msgid "Order date"
 #~ msgstr "Dátum objednávky"
 
+#~ msgid "Sales by Month"
+#~ msgstr "Predaj za mesiac"
+
 #~ msgid "Ordered Date"
 #~ msgstr "Dátum objednania"
 
@@ -2348,3 +2572,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Poskytuje niektoré funkcie pre zlepšenie rozloženia reportu pre objednávky "
 #~ "predaja."
+
+#~ msgid "Logistic"
+#~ msgstr "Logistika"
+
+#~ msgid "Product UoM"
+#~ msgstr "Jednotka produktu"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Predaj podľa zákazníkov za posledných 90 dní"
diff --git a/addons/sale/i18n/sl.po b/addons/sale/i18n/sl.po
index 234ef899e9f..61d28d8950e 100644
--- a/addons/sale/i18n/sl.po
+++ b/addons/sale/i18n/sl.po
@@ -6,21 +6,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:22+0000\n"
 "Last-Translator: ERP Basing <erp@basing.si>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avansni Račun"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potrdi Ponudbo"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Datum Potrditve"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Združi po ..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -28,542 +176,145 @@ msgid ""
 "yet been invoiced"
 msgstr ""
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Prodaja po prodajalec v zadnjih 90 dneh"
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-"Če nimate dovolj zalog na voljo za dostavo vsega naenkrat, se strinjate z "
-"delnimi pošiljkami ?"
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Naslov dostave za tekočo prodajo."
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Količina"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Dan"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Prekliči nalog"
-
-#. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Ponudba '%s' je bila pretvorjena v prodajni nalog"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr "Opozorilo !"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Pogoni naročil za vsako prodajo"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analitični konto"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Tukaj je seznam vseh prodajnih linij za fakturiranje. Faktura prodaje "
-"naročil je lahko delna, z linijo prpdaje. Ta seznam vam ni potreben, če "
-"imate fakturo z dobavnico ali če imate popolno fakturo prodaje."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Javna naročila"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Stranka"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Vrstni red"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Privzeti plačilni pogoji"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Država"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Pop. (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Skupna cena"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Označite polje za združitev računov za iste stranke"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Naročene količine"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Prodaja po prodajalcu"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Premiki inventarja"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Zaporednje Referenc"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Ostale Podrobnosti"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Datumi"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Prodaja Izdela Račun"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Popust (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Moje ponudbe"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Nadzorna plošča za prodajne vodje"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Pakiranje"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Iz prodajnega naročila"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Ime trgovine"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Ni določene stranke !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Prodaja v izjemah"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Pogoji"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "Neveljaven način za test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Junij"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Ni bilo mogoče preklicati prodaje!"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Statistika prodaje naročil"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Analitični račun, povezan z namenom prodaje"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Ponudbe"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Cenik za trenutno prodajo"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr "Število dni od potrditve naročila do odpreme artikla kupcu"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Datum Povpraševanja"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiskalna pozicija"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "ME"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Število paketov"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "V obdelavi"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Prodajalec potrjuje ponudbo. Stanje prodaje postane \"V napredku\" ali "
-"\"Ročno v teku\"."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr "Najprej morate preklicati premik zaloge priloženo k tej prodaji."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Izberite artikel z vrsto storitve, ki se imenuje \"Predhodni artikel\". "
-"Morda ga boste morali ustvariti in ga nastaviti, kot privzeto vrednost na "
-"tem področju."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Ne moreš narediti vnaprej za prodajo, ki je opredeljena kot \"Avtomatska "
-"faktura po dostavi\"."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Opombe"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Naslov računa za tekočo prodajo"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fakturirano"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Nalog za dostavo"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Datum Potrditve"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
 msgstr "Dodelitev partnerja"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Stanje naloga"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Na Račun"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum potrdila naročila."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Ponudbe"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
 msgstr "Marec"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Nezaračunane in dostavljene postavke"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Znesek, za Avansni Račun"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Izjema računa"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
@@ -571,70 +322,361 @@ msgstr ""
 msgid "The total amount."
 msgstr "Skupni znesek"
 
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analitični konto"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
 msgstr "Skupaj"
 
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "Prekliči nalog"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Teža"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Prodajni nalog"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Davki"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Neobdavčen znesek"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Naslov za račun:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
+msgid "Net Total :"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+#: help:sale.config.settings,module_analytic_user_function:0
 msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr "Pri vsaki prodaju ustvariti naročilo za dobavo prodajnih artiklov"
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
 
 #. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Skupaj"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Trgovina"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Prodaja v izjemah"
+
 #. module: sale
 #: field:sale.order,partner_invoice_id:0
 msgid "Invoice Address"
 msgstr "Naslov za račun"
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Iskanje Nefakturiranih Vrstic"
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum ko je prodajni dokument kreiran"
 
 #. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Povpraševanje / Naročilo"
+#: view:res.partner:0
+msgid "False"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Znova ustvari račun"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Izdelaj račune"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Potrditev Datuma"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
 msgid "# of Lines"
 msgstr "Število vrstic"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Odprti računi prodaje"
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Postavka prodajnega naročila"
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
 
 #. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Skladišče"
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# od Kos"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faks:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Količina (UoS)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Znesek Avansa"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potrjeno"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Privzeti plačilni pogoji"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Potrdi"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Naslov za dostavo"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -642,25 +684,83 @@ msgid "Order N°"
 msgstr "Naročilo št."
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Postavke naročila"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Neobdavčen znesek"
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Pop. (%)"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Vrstice za fakturiranje"
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Zaporednje Referenc"
 
 #. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Količina (ME)"
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Postavke računa"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Skupna cena"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Stare Ponudbe"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Označite polje za združitev računov za iste stranke"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Naredite Račun"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
 
 #. module: sale
 #: field:sale.order,create_date:0
@@ -668,14 +768,42 @@ msgid "Creation Date"
 msgstr "Datum izdelave"
 
 #. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Čaka na uvrstitev"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Naslov računa za tekočo prodajo"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Naročene količine"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Nezaračunane in dostavljene postavke"
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Količina"
 
 #. module: sale
 #: report:sale.order:0
@@ -688,78 +816,310 @@ msgid "My Sales"
 msgstr "Moja Prodaja"
 
 #. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
 #, python-format
 msgid "Invalid action !"
 msgstr "Nepravilno dejanje!"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Dodatne informacije"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiskalna pozicija"
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cenik"
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julij"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# od Kos"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
 msgstr ""
 
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Datum Povpraševanja"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
 msgstr "Datum naročila"
 
 #. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Poslano"
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Vse ponudbe"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Stranka"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Prodaja Izdela Račun"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Popust (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Fakture ni mogoče ustvariti za to prodajo, zaradi enega od naslednjih "
+"razlogov:\n"
+"1. Stanje te prodaje je bodisi \"osnutek\" ali \"Preklic\"!\n"
+"2. Prodaja je fakturirana!"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moje ponudbe"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
+msgid "December"
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:632
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Poslano"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Zaporedje"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1259
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nefakturirani"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Kategorija artiklov"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
 #, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+msgid "Cannot cancel this sales order!"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Kategorija artiklov"
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Ime trgovine"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -767,103 +1127,359 @@ msgid "Taxes :"
 msgstr "Davki :"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Premiki zaloge"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Stanje naloga"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Ali res želite ustvariti račun(e) ?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Prodaja po mesecih"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
+#: code:addons/sale/sale.py:658
 #, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Ni bilo mogoče preklicati prodaje!"
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
 
 #. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Varnostni Dnevi"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Nabava prodanega materiala"
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Prodaja Predplačilo Računa"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "V obdelavi"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Ni določene stranke !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Ustvari račune"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Prodaja Naročilne Linije Izdelaj_račun"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Osnutek"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Plačano"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Prodajni nalogi"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Združi račune"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Znesek davka"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Ustvari končno fakturo"
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Stanje"
 
 #. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Naslov za dostavo"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Poganja naročila in fakturiranje"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junij"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Vrstni red"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Prodajna Trgovina"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistika prodaje naročil"
+
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Postavka prodajnega naročila"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr "Razširjeni filtri..."
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Avans Produkta"
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "Izjema"
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Podjetja"
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
 
 #. module: sale
-#: help:sale.order,state:0
+#: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1272
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Prodajni nalogi v teku"
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Prodajalec potrjuje ponudbo. Stanje prodaje postane \"V napredku\" ali "
+"\"Ročno v teku\"."
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr "Sklic na dokument, ki je ustvaril zahtevo za naročilo."
+
+#. module: sale
+#: code:addons/sale/sale.py:958
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Prevzem z zamudo"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "History"
 msgstr "Zgodovina"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
 
 #. module: sale
@@ -882,26 +1498,100 @@ msgid "Your Reference"
 msgstr "Vaš sklic"
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "Ime in naslov kontaktne osebe, ki zahteva naročilo ali ponudbo."
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "Gre za dodajo dnevov, ki jih obljubim stranki zaradi varnosti"
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
 
 #. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cenik"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Potrjena naročilnica za račun"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "Kol."
+msgid "Sales Order Lines"
+msgstr "Postavke prodajnega naloga"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Prodaja"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Dan"
 
 #. module: sale
 #: view:sale.order:0
-msgid "References"
-msgstr "Reference"
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Cena enote"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Opravljeno"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Naslov za račun:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Račun"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -910,580 +1600,123 @@ msgstr ""
 
 #. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "Prekliči"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Ponudba"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Iskanje Nefakturiranih Vrstic"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Ustvari račun"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Davek ni vključen"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Vaš račun je bil uspešno ustvarjen!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Prodaja po Partnerju"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Stik za naročilo"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Odpri račun"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Sila dodelitev"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "na nalogu"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Na podlagi poslane ali naročene količine."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Povezano Izbiranje"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Naziv"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Naslov za odpremo:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Prodaja po stranki v zadnjih 90 dneh"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Osnutek naročila"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Ustvari nalog za dostavo"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Davek vključen"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Ustvari Prevzemni Seznam"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Prodaja po Produktnih Skupinah"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potrdi Ponudbo"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Združi po ..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Znova ustvari račun"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Dostava za fakturiranje."
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Čaka na uvrstitev"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metoda Naročnja"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Izberi seznam"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Preklopi v pripravo"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Dokument pemika za izhod ali za stranko"
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Potrdi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Potrdi nalog"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Ustvari vrstni red naročila."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Davki"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datum ko je prodajni dokument kreiran"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Prenos zaloge"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Izdelaj račune"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faks:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Znesek Avansa"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Odpremljene količine"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Račun na Podlagi Naročilnice"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Napaka !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Ni bilo mogoče preklicati prodajnega naročila!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Julij"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Nabava"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Izjema pri odpremi"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Združi račune"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Za pregledat s strani računovodstva."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Prodaja Naročilne Linije Izdelaj_račun"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Izjema računa"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Poganja naročila in fakturiranje"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Plačano"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Prodajne Analize"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Ponovno pakiranje"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Karakteristike"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Ponudba"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr "Lahko ustvarite račun, na podlagi prodaje ali dostave."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Prodaja"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Cena enote"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Opravljeno"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Račun"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Morate izbrati stranko v prodajnem nalogu !\n"
-"Prosim izberi stranko pred izbiro artikla."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Izvorni dokument"
-
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
 msgstr "Za narediti"
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Izbirna Polica"
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Naslov za odpremo:"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokument premika straniki"
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Prodajne Analize"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Cenik za trenutno prodajo"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Ustvari račun"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
@@ -1491,46 +1724,174 @@ msgid "The amount without tax."
 msgstr "Znesek brez davka."
 
 #. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr "Najprej prekličite vse Izbire povezane s tem naročilom"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Prodaja Predplačilo Računa"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mesec"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "To pomeni, da je bil račun plačan"
+
+#. module: sale
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "Proizvod"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Prekliči Dodelitev"
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
+#: report:sale.order:0
+msgid "Description"
+msgstr "Opis"
 
 #. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cena"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Ali res želite ustvariti račun(e) ?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Ostale Podrobnosti"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Kol."
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Za pregledat s strani računovodstva."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Naslov dostave za tekočo prodajo."
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Povpraševanje / Naročilo"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Kupec"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: sale
@@ -1538,6 +1899,17 @@ msgstr ""
 msgid "Invoice on"
 msgstr "Račun na"
 
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
@@ -1548,33 +1920,100 @@ msgstr "Datum naročila"
 msgid "Product UoS"
 msgstr ""
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Osnutek naročila"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Izvorni dokument"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Ročno v Delu"
 
 #. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistika"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Vrstni red"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgid "My Sale Orders"
 msgstr ""
 
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Iz prodajnega naročila"
+
 #. module: sale
 #: view:sale.order:0
 msgid "Ignore Exception"
@@ -1590,575 +2029,55 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1251
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Načrtujete prodajo s %.2f%s, vendar imate samo %.2f%s na voljo!\n"
-"Dejanska zaloga je %.2f%s. (Brez rezervacije)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Stanja"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Sklic stranke"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Skupaj"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Naredite Račun"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Na Račun"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datum potrdila naročila."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Znesek, za Avansni Račun"
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "To je seznam izbir, ki je bil ustvarjen za to naročilo"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Ustvari račune"
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Analitični račun, povezan z namenom prodaje"
 
 #. module: sale
 #: report:sale.order:0
-msgid "Net Total :"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Trgovina"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Potrditev Datuma"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Prodaja po Mesecih"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Količina (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potrjeno"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potrdi"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Prodaja po Kategorija Artiklov v zadnjih 90 dneh."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Postavke računa"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Postavke prodajnega naloga"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Čas do Dobave"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Konfiguracija"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Fakture ni mogoče ustvariti za to prodajo, zaradi enega od naslednjih "
-"razlogov:\n"
-"1. Stanje te prodaje je bodisi \"osnutek\" ali \"Preklic\"!\n"
-"2. Prodaja je fakturirana!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Teža"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Nabavno naročilo se ustvari samodejno, takoj ko je naročilnica potrjena ali "
-"ko je račun plačan. To požene nabavo in proizvodnjo artiklov glede na "
-"pravila in parametre iz naročilnice. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nefakturirani"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Prodajalec"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Stare Ponudbe"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Neobdavčen znesek"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avansni Račun"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "Naročilo '%s' je bilo preklicano"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Osnutek"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Znesek davka"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr "Embalaža"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Prodajni nalogi"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
-msgstr "Prodajna Trgovina"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "November"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Avans Produkta"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Izračunaj"
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr "Najprej morate preklicati vse račune priložene k tej naročilnici."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Prodajni nalogi v teku"
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr "Sklic na dokument, ki je ustvaril zahtevo za naročilo."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Prevzem z zamudo"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr "Eno Nabavno naročilo za vsako naročilnico in za vsak sestavni del"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr "Potrjena naročilnica za račun"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "Naročilo '%s' je bilo spremenjeno osnutek"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "iz zaloge"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Dostavljeno"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Morate določiti proizvodno serijo tega artikla"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr "To pomeni, da je bil račun plačan"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Kupec"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr ""
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
-#, python-format
-msgid "Not enough stock ! : "
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Plačilni pogoj"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2167,19 +2086,64 @@ msgid "Quotation N°"
 msgstr "Povpraševanje št."
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Sklic stranke"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Prevzeto"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Račun na Podlagi Dobav"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Davek vključen"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturirano"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Premiki inventarja"
 
 #~ msgid "Set Default"
 #~ msgstr "Nastavi privzeto"
@@ -2193,16 +2157,28 @@ msgstr "Račun na Podlagi Dobav"
 #~ msgid "Recreate Procurement"
 #~ msgstr "Znova ustvari nabavo"
 
+#~ msgid "from stock"
+#~ msgstr "iz zaloge"
+
 #~ msgid "Automatic Declaration"
 #~ msgstr "Samodejna napoved"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Preklopi v pripravo"
+
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "To je seznam prevzemnih listov, ki so bili narejeni za ta račun"
 
+#~ msgid "Notes"
+#~ msgstr "Opombe"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Pravilnik odpreme"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Izjema pri odpremi"
+
 #~ msgid "Origin"
 #~ msgstr "Izvor"
 
@@ -2212,6 +2188,9 @@ msgstr "Račun na Podlagi Dobav"
 #~ msgid "Procure Method"
 #~ msgstr "Metoda nabave"
 
+#~ msgid "Extra Info"
+#~ msgstr "Dodatne informacije"
+
 #~ msgid "Net Price"
 #~ msgstr "Neto cena"
 
@@ -2233,27 +2212,51 @@ msgstr "Račun na Podlagi Dobav"
 #~ msgid "All Sales Order"
 #~ msgstr "Vsi prodajni nalogi"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Odpremljene količine"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Trgovina"
 
+#~ msgid "Warehouse"
+#~ msgstr "Skladišče"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Neobdavčen znesek"
+
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Moji prodajni nalogi, čakajoči na račun"
 
 #~ msgid "Manual Description"
 #~ msgstr "Ročni opis"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Potrdi nalog"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfiguracija"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Neveljaven XML za arhitekturo pogleda."
 
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Napaka: Prodajna EM mora biti v drugi kategoriji, kot je EM"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "Sales orders"
 #~ msgstr "Prodajni nalogi"
 
+#~ msgid "Procurement"
+#~ msgstr "Nabava"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Konti plačil"
 
+#~ msgid "All Quotations"
+#~ msgstr "Vse ponudbe"
+
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "Prodajni nalog za zaračunat"
 
@@ -2263,6 +2266,9 @@ msgstr "Račun na Podlagi Dobav"
 #~ msgid "Order Ref"
 #~ msgstr "Sklic naloga"
 
+#~ msgid "Salesman"
+#~ msgstr "Prodajalec"
+
 #~ 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."
@@ -2270,15 +2276,15 @@ msgstr "Račun na Podlagi Dobav"
 #~ msgid "My sales in shipping exception"
 #~ msgstr "Moja prodaja z izjemami v odpremi"
 
+#~ msgid "on order"
+#~ msgstr "na nalogu"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "Nabava popravljena"
 
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Odprema in ročna izdaja računa"
 
-#~ msgid "Status"
-#~ msgstr "Stanje"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Pravilnik pakiranja"
 
@@ -2288,24 +2294,27 @@ msgstr "Račun na Podlagi Dobav"
 #~ msgid "Our Salesman"
 #~ msgstr "Naš prodajalec"
 
-#~ msgid "Sale Order"
-#~ msgstr "Prodajni nalog"
-
 #~ msgid "Direct Delivery"
 #~ msgstr "Direktna dostava"
 
+#~ msgid "Properties"
+#~ msgstr "Karakteristike"
+
+#~ msgid "Compute"
+#~ msgstr "Izračunaj"
+
 #~ msgid "VAT"
 #~ msgstr "DDV"
 
 #~ msgid "Sales order lines"
 #~ msgstr "Postavke prodajnega naloga"
 
-#~ msgid "Sequence"
-#~ msgstr "Zaporedje"
-
 #~ msgid "Other data"
 #~ msgstr "Ostali podatki"
 
+#~ msgid "UoM"
+#~ msgstr "ME"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -2320,6 +2329,12 @@ msgstr "Račun na Podlagi Dobav"
 #~ msgid "Sales order"
 #~ msgstr "Prodajni nalog"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Stik za naročilo"
+
 #~ msgid "Sale Order Line"
 #~ msgstr "Postavka prodajnega naloga"
 
@@ -2330,6 +2345,9 @@ msgstr "Račun na Podlagi Dobav"
 #~ "The name and address of the contact that requested the order or quotation."
 #~ msgstr "Naziv in naslov stika, ki je zahteval naročilo ali ponudbo."
 
+#~ msgid "Name"
+#~ msgstr "Naziv"
+
 #~ msgid "Total amount"
 #~ msgstr "Skupni znesek"
 
@@ -2356,9 +2374,15 @@ msgstr "Račun na Podlagi Dobav"
 #~ "To je seznam računov, ki so bili narejeni za ta prodajni nalog. Isti "
 #~ "prodajni nalog je lahko večkrat zaračunan (n.pr. po postavkah)."
 
+#~ msgid "States"
+#~ msgstr "Stanja"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Napaka: neveljavna EAN črtna koda"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Premiki zaloge"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Moji prodajni nalogi"
 
@@ -2371,65 +2395,262 @@ msgstr "Račun na Podlagi Dobav"
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Napačno ime modela v definiciji dejanja."
 
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Prodaja po prodajalec v zadnjih 90 dneh"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Če nimate dovolj zalog na voljo za dostavo vsega naenkrat, se strinjate z "
+#~ "delnimi pošiljkami ?"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Opozorilo !"
+
 #~ msgid "All at Once"
 #~ msgstr "Vse na enkrat"
 
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Plačilo pred dobavo"
 
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Ponudba '%s' je bila pretvorjena v prodajni nalog"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Tukaj je seznam vseh prodajnih linij za fakturiranje. Faktura prodaje "
+#~ "naročil je lahko delna, z linijo prpdaje. Ta seznam vam ni potreben, če "
+#~ "imate fakturo z dobavnico ali če imate popolno fakturo prodaje."
+
+#~ msgid "Order Line"
+#~ msgstr "Vrstni red"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Javna naročila"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Prodaja po prodajalcu"
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Ponovno pakiranje"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Nadzorna plošča za prodajne vodje"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Le nalog za dostavo"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "Neveljaven način za test_state"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Ni bilo mogoče preklicati prodaje!"
+
+#~ msgid "Number Packages"
+#~ msgstr "Število paketov"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr "Število dni od potrditve naročila do odpreme artikla kupcu"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Izberite artikel z vrsto storitve, ki se imenuje \"Predhodni artikel\". "
+#~ "Morda ga boste morali ustvariti in ga nastaviti, kot privzeto vrednost na "
+#~ "tem področju."
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr "Izboljšajte svojo jedro \"Prijava prodaje\" z dodatnimi funkcijami."
 
+#~ msgid "Delivery Order"
+#~ msgstr "Nalog za dostavo"
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr "Pri vsaki prodaju ustvariti naročilo za dobavo prodajnih artiklov"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Vrstice za fakturiranje"
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Odprti računi prodaje"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Količina (ME)"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Konfiguracija Logistike Prodajih Nalogov"
 
+#~ msgid "Dates"
+#~ msgstr "Datumi"
+
+#~ msgid "State"
+#~ msgstr "Država"
+
+#~ msgid "Conditions"
+#~ msgstr "Pogoji"
+
+#~ msgid "Packaging"
+#~ msgstr "Pakiranje"
+
 #~ msgid "Configure"
 #~ msgstr "Nastavitve"
 
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Omogoča vam izračunati stoške dostave ponudbe"
 
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Pogoni naročil za vsako prodajo"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr "Gre za dodajo dnevov, ki jih obljubim stranki zaradi varnosti"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Prodaja po mesecih"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Ustvari končno fakturo"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Ime in naslov kontaktne osebe, ki zahteva naročilo ali ponudbo."
+
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Marža pri prodaji"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Davek ni vključen"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Prodaja po stranki v zadnjih 90 dneh"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Na podlagi poslane ali naročene količine."
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Ustvari nalog za dostavo"
+
+#~ msgid "Security Days"
+#~ msgstr "Varnostni Dnevi"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Ali res želite ustvariti račun(e) ?"
 
 #~ msgid "  Year  "
 #~ msgstr "  Leto  "
 
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Ni bilo mogoče preklicati prodaje!"
+
+#~ msgid "Companies"
+#~ msgstr "Podjetja"
+
+#~ msgid "References"
+#~ msgstr "Reference"
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr "Ne morete preklicati prodaje, ki je že bila fakturirana !"
 
+#~ msgid "Sales by Partner"
+#~ msgstr "Prodaja po Partnerju"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Odpri račun"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Delna Dostava"
 
+#~ msgid "Sales by Product Category"
+#~ msgstr "Prodaja po Produktnih Skupinah"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Ustvari Prevzemni Seznam"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Stroški Dostave"
 
 #~ msgid "title"
 #~ msgstr "naslov"
 
+#~ msgid "Stock Move"
+#~ msgstr "Prenos zaloge"
+
 #~ msgid "Order date"
 #~ msgstr "Datum naročila"
 
+#~ msgid "Validate"
+#~ msgstr "Potrdi"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Ni bilo mogoče preklicati prodajnega naročila!"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Napaka !"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Morate izbrati stranko v prodajnem nalogu !\n"
+#~ "Prosim izberi stranko pred izbiro artikla."
+
 #~ msgid "sale.installer"
 #~ msgstr "prodaja.namestitev"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Prekliči Dodelitev"
+
 #~ msgid "Invoicing"
 #~ msgstr "Izdajanje računov"
 
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Dostava za fakturiranje."
+
+#~ msgid "Pick List"
+#~ msgstr "Izberi seznam"
+
 #, python-format
 #~ msgid "Picking Information !"
 #~ msgstr "Nabiranje informacij"
 
+#~ msgid "Logistic"
+#~ msgstr "Logistika"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Načrtujete prodajo s %.2f%s, vendar imate samo %.2f%s na voljo!\n"
+#~ "Dejanska zaloga je %.2f%s. (Brez rezervacije)"
+
+#~ msgid "Packings"
+#~ msgstr "Embalaža"
+
 #~ msgid "Ordered Date"
 #~ msgstr "Datum naročila"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Vaš račun je bil uspešno ustvarjen!"
+
 #~ msgid "Shipped Qty"
 #~ msgstr "Dobavljena količina"
 
@@ -2437,6 +2658,12 @@ msgstr "Račun na Podlagi Dobav"
 #~ msgid "Not enough stock !"
 #~ msgstr "Ni dovolj na zalogi!"
 
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Morate določiti proizvodno serijo tega artikla"
+
+#~ msgid "Delivered"
+#~ msgstr "Dostavljeno"
+
 #~ msgid ""
 #~ "Allows you to group and invoice your delivery orders according to different "
 #~ "invoicing types: daily, weekly, etc."
@@ -2449,9 +2676,24 @@ msgstr "Račun na Podlagi Dobav"
 #~ msgstr ""
 #~ "Ponuja nekatere funkcije za izboljšanje postavitve prodajnih poročil."
 
+#~ msgid "Force Assignation"
+#~ msgstr "Sila dodelitev"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Konfiguracija politike pobiranje za prodajo"
 
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr "Najprej morate preklicati premik zaloge priloženo k tej prodaji."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Ne moreš narediti vnaprej za prodajo, ki je opredeljena kot \"Avtomatska "
+#~ "faktura po dostavi\"."
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Sklic naročila mora biti enoličen!"
 
@@ -2461,18 +2703,50 @@ msgstr "Račun na Podlagi Dobav"
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Namestiti vaš potek prodaje in privzete vrednosti."
 
+#~ msgid "Related Picking"
+#~ msgstr "Povezano Izbiranje"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Datumi Naročil"
 
+#~ msgid "Procurement of sold material"
+#~ msgstr "Nabava prodanega materiala"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Konfiguracija Aplikacije Prodaje"
 
 #~ msgid "Picking Default Policy"
 #~ msgstr "Izbor Privzete Police"
 
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Dokument pemika za izhod ali za stranko"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Ustvari vrstni red naročila."
+
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Račun iz Izbiranja"
 
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Račun na Podlagi Naročilnice"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Metoda Naročnja"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr "Najprej prekličite vse Izbire povezane s tem naročilom"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Dokument premika straniki"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr "Lahko ustvarite račun, na podlagi prodaje ali dostave."
+
+#~ msgid "Picking Policy"
+#~ msgstr "Izbirna Polica"
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Seznam Izbir in Naročila Dobavnic"
 
@@ -2482,6 +2756,49 @@ msgstr "Račun na Podlagi Dobav"
 #~ msgid "Complete Delivery"
 #~ msgstr "Popolna Dostava"
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Račun na Podlagi Dobav"
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "To je seznam izbir, ki je bil ustvarjen za to naročilo"
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Prodaja po Kategorija Artiklov v zadnjih 90 dneh."
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Nabavno naročilo se ustvari samodejno, takoj ko je naročilnica potrjena ali "
+#~ "ko je račun plačan. To požene nabavo in proizvodnjo artiklov glede na "
+#~ "pravila in parametre iz naročilnice. "
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr "Najprej morate preklicati vse račune priložene k tej naročilnici."
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Naročilo '%s' je bilo preklicano"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Čas do Dobave"
+
+#~ msgid "Sales by Month"
+#~ msgstr "Prodaja po Mesecih"
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr "Eno Nabavno naročilo za vsako naročilnico in za vsak sestavni del"
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Naročilo '%s' je bilo spremenjeno osnutek"
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Konfiguracije Vaše Aplikacije za Urejanje Prodaje"
 
diff --git a/addons/sale/i18n/sq.po b/addons/sale/i18n/sq.po
index 0f8bb318d32..cbc6965c14a 100644
--- a/addons/sale/i18n/sq.po
+++ b/addons/sale/i18n/sq.po
@@ -7,19 +7,167 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2010-08-02 14:34+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:08+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
@@ -29,1627 +177,104 @@ msgid ""
 "yet been invoiced"
 msgstr ""
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr ""
-
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "March"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
 #, python-format
-msgid "Invalid action !"
+msgid "Advance of %s %s"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
+#: view:sale.config.settings:0
+msgid "Contract Feature"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
+#: field:sale.report,state:0
 msgid "Order State"
 msgstr ""
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr ""
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-
-#. module: sale
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr ""
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
 msgid "To Invoice"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract/Analytic Account"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
 msgstr ""
@@ -1659,28 +284,154 @@ msgstr ""
 msgid "Invoice Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1269
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
 #, python-format
 msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_ids:0
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
 msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
 msgstr ""
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: sale
@@ -1689,7 +440,20 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
 msgstr ""
@@ -1699,36 +463,130 @@ msgstr ""
 msgid "Sales Order Lines related to a Sales Order of mine"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
 #. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
 msgid "Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
 msgid "Sales Order"
 msgstr ""
 
@@ -1743,12 +601,8 @@ msgid "Sale Order Lines that are in 'done' state"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
 msgstr ""
 
 #. module: sale
@@ -1757,65 +611,400 @@ msgid "Confirmed"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
 msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
 msgid "Confirm"
 msgstr ""
 
 #. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: view:sale.order:0
+msgid "Unread messages"
 msgstr ""
 
 #. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
 #: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
 msgstr ""
 
 #. module: sale
-#: view:res.company:0
-msgid "Configuration"
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/edi/sale_order.py:146
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
 #, python-format
 msgid "EDI Pricelist (%s)"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
-msgid "Print Order"
+msgid "Order Date"
 msgstr ""
 
 #. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-msgid "Sales order created in current year"
+#: field:sale.report,partner_id:0
+msgid "Partner"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1824,19 +1013,28 @@ msgid ""
 "2.The Sales Order Line is Invoiced!"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
 msgstr ""
 
 #. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
 #. module: sale
@@ -1845,17 +1043,35 @@ msgid "December"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
+#: view:sale.config.settings:0
+msgid "Contracts Management"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
@@ -1864,34 +1080,106 @@ msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
+#: code:addons/sale/sale.py:557
 #, python-format
-msgid "Advance Invoice"
+msgid "Cannot cancel this sales order!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:624
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
 #, python-format
-msgid "The sales order '%s' has been cancelled."
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
@@ -1899,6 +1187,16 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1913,6 +1211,18 @@ msgid ""
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -1920,55 +1230,166 @@ msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
+#: view:sale.order.line:0
+msgid "Order"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr ""
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
+#: selection:sale.order.line,state:0
+msgid "Exception"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
 
 #. module: sale
@@ -1981,31 +1402,97 @@ msgstr ""
 msgid "Sales Order in Progress"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2013,56 +1500,225 @@ msgstr ""
 msgid "Date Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr ""
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
 msgstr ""
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
@@ -2071,17 +1727,152 @@ msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr ""
@@ -2096,45 +1887,190 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Search Sales Order"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1255
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "Not enough stock ! : "
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2143,16 +2079,58 @@ msgid "Quotation N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 71582ab9114..54ca8e28437 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -7,21 +7,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:57+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Račun unapred"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potvrđivanje ponude"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Datum Potvrde"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Grupisano po..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -30,62 +178,345 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Dodeljivanje partnera"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_policy:0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Stanje naloga"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Ako nemas dovoljno lagera dostupnog da sve isporuci odjednom, prihvatas li "
-"parcijalne isporuke ili ne?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Za Fakturu"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Količina"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Upiti"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Dan"
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Mart"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Preduzece"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Datum Fakture"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Stavke za koje ne postoji račun a isporučene su"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Iznos koji bi trebalo unapred fakturisati"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Računi izuzeci"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analitički nalog"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Ukupno"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Poništite nalog"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Težina"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
+msgid "Quotation "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Upozorenje !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Nalog za prodaju"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septembar"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Porezi"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Neoporezovani iznos"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Ukupno neto"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Ukupno"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Prodavnica"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Prodaje izuzeci"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adresa računa"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Osvežavanje računa"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Kreiraj Fakture"
 
 #. module: sale
 #: report:sale.order:0
@@ -93,65 +524,643 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analitički nalog"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Nalog za Nabavku"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Datum potvrdjivanja"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# Linija"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# Kol"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faks:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Prodajni Nalog"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Količina (UoS)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Napredni Iznos"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Podrazumevani uslovi plaćanja"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Potvrda"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Adresa isporuke"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Godina"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Nalog N°"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
 msgstr "Stavke naloga"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Popust (%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Reference Naloga"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Stavke računa"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Ukupna Cena"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Stari Upiti"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
 msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Cekiraj ovu kucicu da grupises fakture za iste klijente."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Napravi Fakture"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "datum Kreacije"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Raspored čekanja"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Narucene Kolicine"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Ukupno:"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Moje Prodaje"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Neispravna akcija!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiskalna pozicija"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Datum Upita"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Datum Naloga"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Popust (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moja ponuda"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Decembar"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Isporuceno"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nefakturisano"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Kategorija proizvoda"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Ime prodavnice"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Porezi:"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "U toku"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Kupac nije definisan!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Kreiranje računa"
+
 #. module: sale
 #: help:sale.order,invoice_quantity:0
 msgid ""
@@ -168,202 +1177,105 @@ msgstr ""
 "sate na asociranom poslu."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Podrazumevani uslovi plaćanja"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Prodajna linija naloga Napravi_fakturu"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Plaćeni"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Nalozi za prodaju"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupisanje računa"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
 #: view:sale.report:0
-msgid "State"
-msgstr "Stanje"
+msgid "Status"
+msgstr "Status"
 
 #. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Popust (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Ukupna Cena"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Cekiraj ovu kucicu da grupises fakture za iste klijente."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Narucene Kolicine"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Premeštanje inventara"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Reference Naloga"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "OStale Informacije"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Datumi"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"Ova se faktura generise automatski ako je politika Dostave 'Faktura od "
-"Izvora'  ili ' faktura na zahtev nakon isporuke'."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Popust (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Moja ponuda"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "UpravljackaTabla Menadzmenta Prodaje"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Pakovanje"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Ime prodavnice"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Kupac nije definisan!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Prodaje izuzeci"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Uslovi"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Nema ulazne kategorije naloga definisane u podrazumevanim osobinama za "
-"Kategoriju Proizvoda ili nije definisana Fiskalna Pozicija !"
-
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
 msgstr "Avgust"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
+#: view:sale.order:0
+msgid "Sale Order "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "pogrešan mod za test_state"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Pogoni nabavke i fakturiranja"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -371,9 +1283,41 @@ msgid "June"
 msgstr "Jun"
 
 #. module: sale
-#: code:addons/sale/sale.py:617
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Nalog"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
 #, python-format
-msgid "Could not cancel this sales order !"
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
 msgstr ""
 
 #. module: sale
@@ -382,66 +1326,115 @@ msgid "Sales Orders Statistics"
 msgstr "Statistika Prodajnih Naloga"
 
 #. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
+#: field:sale.order,date_order:0
+msgid "Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembar"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Prosireni Filteri"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Unapređeni proizvod"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Izuzetak"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
 msgstr "Oktobar"
 
 #. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Upiti"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA:"
-
-#. module: sale
-#: help:sale.order.line,delay:0
+#: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"prodavac kreira fakturu rucno, ako je politika  prodajnog naloga ' Isporuka "
+"i Rucno u progresu'. Faktura se kreira automatski akonje politika isporuke ' "
+"Plati pre isporuke' ."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Datum Upita"
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
 
 #. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiskalna pozicija"
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Januar"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "JM"
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Nalog za prodaju u toku"
 
 #. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Broj paketa"
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "U toku"
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -451,411 +1444,35 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1079
+#: code:addons/sale/sale.py:958
 #, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
+msgid "No valid pricelist line found ! :"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
+#: help:sale.config.settings,module_warning:0
 msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Selektuj proizvod za tip usluge zvanoj 'Napredni Proizvod'. Mozda zelis da "
-"ga kreiras i postavis kao podrazumevanu vrednost u tom polju."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Beleške"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
 msgstr ""
 
 #. module: sale
 #: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Račun"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Nalog za isporuku"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Datum Potvrde"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Dodeljivanje partnera"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Mart"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Ukupno"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adresa računa:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adresa računa"
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Kasnjenje Komitenta"
 
 #. module: sale
 #: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Pretrazi Nefakturisane linije"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Ponude / Nalozi"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# Linija"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Skladište"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Nalog N°"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Stavke naloga"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Neoporezovani iznos"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Linije za Fakturisanje"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Količina (UoM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "datum Kreacije"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Stavke za koje ne postoji račun a isporučene su"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Ukupno:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Moje Prodaje"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Neispravna akcija!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Dodatne informacije"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cenovnik"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# Kol"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Datum Naloga"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Isporuceno"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Sve ponude"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septembar"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Kategorija proizvoda"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Porezi:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "POmeranje Lagera"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Stanje naloga"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Da li stvarno zelis da kreiras fakturu(e) ?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Mesecna Prodaja"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr ""
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "dani Sigurnosti"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Nabavka Prodatog materijala"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Adresa isporuke"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Prosireni Filteri"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Izuzetak"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Preduzeca"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
@@ -864,8 +1481,8 @@ msgid "History"
 msgstr "Arhiva"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
 
 #. module: sale
@@ -882,27 +1499,100 @@ msgid "Your Reference"
 msgstr "Vaše veze"
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "Ime i aadresa kontakta koji je zatrazio upit ili Narudzbu."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
-"Ovo su dani dodati onome sto su obecao klijentima iz sigurnosnih razloga."
 
 #. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Naruceno Dana"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cenovnik"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA:"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "Kol"
+msgid "Sales Order Lines"
+msgstr "Stavke naloga za prodaju"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Prodaja"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Dan"
 
 #. module: sale
 #: view:sale.order:0
-msgid "References"
-msgstr "Reference"
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Računi"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Jedinica cene"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Urađeno"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adresa računa:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Račun"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -911,566 +1601,64 @@ msgstr ""
 
 #. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "Otkaži"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Ponuda"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Pretrazi Nefakturisane linije"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Kreiranje računa"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "ukupno iskljucenih poreza"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Vasa faktura je uspesno kreirana!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Kontakt pri naručivanju"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Ovori Fakturu"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Prinudni prenos"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "na nalog"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Bazirano na isporucenim ili narucenim kolicinama."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Relacioni Izbor"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Ime"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adresa isporuke:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Kreiraj Dostavni Nalog"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Ukupno Ukljucenih Poreza"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Kreiranje Izborne liste"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Prodaja po kategoriji Proizvoda"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potvrđivanje ponude"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Greška"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Grupisano po..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Osvežavanje računa"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Isporuke za fakture"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Raspored čekanja"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metod Nabavke"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Izborna Lista"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Postavi u Pripremu"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Dokumenat za pomeranje na izlaz ili za kupca."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Provera"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Potvrda naloga"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Kreiraj Nabavni Nalog"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Porezi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Pomeranje lagera"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Kreiraj Fakture"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faks:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Napredni Iznos"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Isporučene količine"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Račun kreiran na osnovu naloga za prodaju"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Izborna lista"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Greška!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Izvršavanje"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Izuzeci kod transporta"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupisanje računa"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Da bude pregledano od strane racunovodje."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Prodajna linija naloga Napravi_fakturu"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Računi izuzeci"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Pogoni nabavke i fakturiranja"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Plaćeni"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analiza prodaje"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Osobine"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Ponuda"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"prodavac kreira fakturu rucno, ako je politika  prodajnog naloga ' Isporuka "
-"i Rucno u progresu'. Faktura se kreira automatski akonje politika isporuke ' "
-"Plati pre isporuke' ."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Mozes kreirati fakture bazirane na prodajnim nalozima pri isporukama."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Prodaja"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Jedinica cene"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Urađeno"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Račun"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
 #. module: sale
@@ -1479,14 +1667,57 @@ msgid "To Do"
 msgstr "Za Uraditi"
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Izborna Politika"
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Adresa isporuke:"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokumenat za pomeriti ka klijentu."
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analiza prodaje"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Kreiranje računa"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
@@ -1494,53 +1725,192 @@ msgid "The amount without tax."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:604
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:822
 #, python-format
-msgid "You must first cancel all picking attached to this sales order."
+msgid "You cannot cancel a sale order line that has already been invoiced!"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mesec"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "Proizvod"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Otkazivanje prenosa"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: sale
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cena"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel.:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Da li stvarno zelis da kreiras fakturu(e) ?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "OStale Informacije"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Kol"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Da bude pregledano od strane racunovodje."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Ponude / Nalozi"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Kupac"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Februar"
+
 #. module: sale
 #: field:sale.order,invoice_quantity:0
 msgid "Invoice on"
 msgstr "Račun na"
 
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
@@ -1551,31 +1921,98 @@ msgstr "Datum naručivanja"
 msgid "Product UoS"
 msgstr "Proizvod UoS"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "April"
+
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "U toku"
 
 #. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Proizvod UoM"
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistika"
+msgid "My Sale Orders"
+msgstr ""
 
 #. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Order"
-msgstr "Nalog"
+msgid "Search Sales Order"
+msgstr "Pretrazi Prodajne Naloge"
 
 #. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
 msgstr ""
 
 #. module: sale
@@ -1593,570 +2030,55 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1251
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"PLanirao si da prodas %.2f %s ali imas samo %.2f %s dostupno !\n"
-"Stvarni lager je %.2f %s. ( Bez rezervacija)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Stanja"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referenca Potrosaca"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Ukupno"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Ovisno o konfiguraciji lokacije izlaza, pomeranje izmedju izlaznog dela i "
-"potrosaca je yradjena kroz Nalog Isporuke rucno ili automatski."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
 msgstr ""
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Napravi Fakture"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Za Fakturu"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Preduzece"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Datum Fakture"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Iznos koji bi trebalo unapred fakturisati"
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Kreiranje računa"
-
 #. module: sale
 #: report:sale.order:0
-msgid "Net Total :"
-msgstr "Ukupno neto"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Otkazano"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Prodavnica"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Datum potvrdjivanja"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Upozorenje"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Prodajni Nalog"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Količina (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potvrđeno"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potvrda"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Stavke računa"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Stavke naloga za prodaju"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Vreme trajanja Isporuke"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Konfiguracija"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Težina"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Računi"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Decembar"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Slika"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nefakturisano"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Prodavac"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Stari Upiti"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Neoporezovani iznos"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Račun unapred"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Nacrt"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Nalozi za prodaju"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembar"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Unapređeni proizvod"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Izračunavanje"
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Januar"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Nalog za prodaju u toku"
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Kasnjenje Komitenta"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Dodeljivanje"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Naruceno Dana"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "od akcije"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Zatvaranje"
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Isporuceno"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Maj"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Kupac"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Februar"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "April"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Računovodstvo"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Pretrazi Prodajne Naloge"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
-#, python-format
-msgid "Not enough stock ! : "
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Uslovi plaćanja"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2165,23 +2087,71 @@ msgid "Quotation N°"
 msgstr "Ponuda N°"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referenca Potrosaca"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Isabrani"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Godina"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Račun na osnovu isporuke"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Ukupno Ukljucenih Poreza"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Račun"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
 
 #~ msgid "Partial Delivery"
 #~ msgstr "Parcijalna isporuka"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Nalog za isporuku"
+
+#~ msgid "from stock"
+#~ msgstr "od akcije"
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Koraci za dostavu naloga za prodaju"
 
@@ -2205,6 +2175,9 @@ msgstr "Račun na osnovu isporuke"
 #~ "Ovaj korak pri konfiguraciji se koristi da bi se definisalo podrazumevana "
 #~ "opcija izbora u toku kreiranja naloga za prodaju"
 
+#~ msgid "Validate"
+#~ msgstr "Provera"
+
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Nakon potvrde naloga, kreirajte račun."
 
@@ -2215,15 +2188,24 @@ msgstr "Račun na osnovu isporuke"
 #~ "Kada se klikne dugme za potvrdu, režim nacrta postaje manuelni. Tako da je "
 #~ "ponuda premeštena u nalog za prodaju."
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Premeštanje inventara"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Manuelni ispis"
 
+#~ msgid "Notes"
+#~ msgstr "Beleške"
+
 #~ msgid "Invoice after delivery"
 #~ msgstr "Račun nakon isporuke"
 
 #~ msgid "Shipping Policy"
 #~ msgstr "Opcije transporta"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Izuzeci kod transporta"
+
 #~ msgid "Origin"
 #~ msgstr "Početak"
 
@@ -2242,6 +2224,9 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Procure Method"
 #~ msgstr "Matod nabavke"
 
+#~ msgid "Extra Info"
+#~ msgstr "Dodatne informacije"
+
 #~ msgid "Net Price"
 #~ msgstr "Neto cena"
 
@@ -2284,9 +2269,24 @@ msgstr "Račun na osnovu isporuke"
 #~ "Izaberite kupca u formi za prodaju !\n"
 #~ "Izaberite jednog kupca pre nego što izaberete proizvod."
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Isporučene količine"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Račun kreiran na osnovu naloga za prodaju"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Prodavnica"
 
+#~ msgid "Warehouse"
+#~ msgstr "Skladište"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Prinudni prenos"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Neoporezovani iznos"
+
 #~ msgid ""
 #~ "Packing list is created when 'Assign' is being clicked after confirming the "
 #~ "sale order. This transaction moves the sale order to packing list."
@@ -2304,12 +2304,19 @@ msgstr "Račun na osnovu isporuke"
 #~ "Kada izaberete pravilo dostave = 'Automatski račun nakon isporuke' , tada će "
 #~ "se automatski kreirati posle isporuke."
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Greška!"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Kompletna isporuka"
 
 #~ msgid "Manual Description"
 #~ msgstr "Opis"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Količina (UoM)"
+
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr "Poništite sve račune koji su vezani za ovaj nalog za prodaju."
@@ -2320,6 +2327,12 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Packing"
 #~ msgstr "Pakovanje"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Potvrda naloga"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfiguracija"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Račun na bazi Naloga posle isporuke"
 
@@ -2335,15 +2348,27 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Customer Ref"
 #~ msgstr "Veze kupca"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "Sales orders"
 #~ msgstr "Nalozi za prodaju"
 
+#~ msgid "Procurement"
+#~ msgstr "Izvršavanje"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Računi plaćanja"
 
+#~ msgid "Close"
+#~ msgstr "Zatvaranje"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "Nacrti računa"
 
+#~ msgid "All Quotations"
+#~ msgstr "Sve ponude"
+
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Nacrt računa kupca, treba da pregleda računovođa."
 
@@ -2353,6 +2378,9 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Procurement for each line"
 #~ msgstr "Izvršavanje za svaku stavku"
 
+#~ msgid "Order Line"
+#~ msgstr "Stavke naloga"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "Podrazumevane opcije za pakovanje"
 
@@ -2366,12 +2394,18 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Ne možete da otkažete nalog za prodaju!"
 
+#~ msgid "Packaging"
+#~ msgstr "Pakovanje"
+
 #~ msgid "Canceled"
 #~ msgstr "Otkazan"
 
 #~ msgid "Order Ref"
 #~ msgstr "Veze naloga"
 
+#~ msgid "Salesman"
+#~ msgstr "Prodavac"
+
 #~ msgid ""
 #~ "In sale order , procuerement for each line and it comes into the procurement "
 #~ "order"
@@ -2416,6 +2450,9 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Sales Configuration"
 #~ msgstr "Konfiguracija prodaje"
 
+#~ msgid "on order"
+#~ msgstr "na nalog"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "Ispravljene nabavke"
 
@@ -2425,15 +2462,16 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Konfigurisanje logistike naloga za prodaju"
 
-#~ msgid "Status"
-#~ msgstr "Status"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Opcije otpreme"
 
 #~ msgid "Product sales"
 #~ msgstr "Prodaja proizvoda"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "pogrešan mod za test_state"
+
 #~ msgid "Our Salesman"
 #~ msgstr "Naš prodavac"
 
@@ -2443,15 +2481,15 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "One procurement for each product."
 #~ msgstr "Jedna nabavka za svaki proizvod."
 
-#~ msgid "Sale Order"
-#~ msgstr "Nalog za prodaju"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Cenovnik prodaje"
 
 #~ msgid "Direct Delivery"
 #~ msgstr "Direktna isporuka"
 
+#~ msgid "Properties"
+#~ msgstr "Osobine"
+
 #~ msgid ""
 #~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
 #~ "the sale order. This transaction moves the sale order to invoices."
@@ -2459,18 +2497,25 @@ msgstr "Račun na osnovu isporuke"
 #~ "Račun je kreiran kada je kliknuto 'Kreiranje račun' nakon potvrde naloga za "
 #~ "prodaju. Ovaj proces prenosi nalog za prodaju do računa."
 
+#~ msgid "Compute"
+#~ msgstr "Izračunavanje"
+
 #~ msgid "VAT"
 #~ msgstr "PDV"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Greška"
+
+#~ msgid "Assign"
+#~ msgstr "Dodeljivanje"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Isključivo nalog za isporuku"
 
 #~ msgid "Sales order lines"
 #~ msgstr "Stavke naloga za prodaju"
 
-#~ msgid "Sequence"
-#~ msgstr "Sekvenca"
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Pakovanje NAPOLJU je napravljeno samo za uobičajene proizvode"
 
@@ -2490,6 +2535,9 @@ msgstr "Račun na osnovu isporuke"
 #~ "je 'Raspored na čekanju' kada je račun potvrđen ali se čeka na planer da bi "
 #~ "se prikazao 'Datum naloga'."
 
+#~ msgid "Number Packages"
+#~ msgstr "Broj paketa"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2537,9 +2585,15 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Sale Invoice"
 #~ msgstr "Računi prodaje"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Otvaranje računa unapred"
 
+#~ msgid "Ordering Contact"
+#~ msgstr "Kontakt pri naručivanju"
+
 #~ msgid "Sales Management"
 #~ msgstr "Menadžment prodaje"
 
@@ -2553,6 +2607,9 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Sale Order Line"
 #~ msgstr "Stavke naloga za prodaju"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Otkazivanje prenosa"
+
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Račun iz Otpreme"
 
@@ -2570,12 +2627,18 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Ne možete da obrišete nalog(e) za kupovinu koji su već potvrđeni!"
 
+#~ msgid "Name"
+#~ msgstr "Ime"
+
 #~ msgid "New Quotation"
 #~ msgstr "Nova ponuda"
 
 #~ msgid "Total amount"
 #~ msgstr "Ukupan iznos"
 
+#~ msgid "Product UoM"
+#~ msgstr "Proizvod UoM"
+
 #~ msgid ""
 #~ "By default, Open ERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2614,6 +2677,15 @@ msgstr "Račun na osnovu isporuke"
 #~ "je za jedan nalog za prodaju pravljeno više računa (za svaku stavku na "
 #~ "primer)."
 
+#~ msgid "States"
+#~ msgstr "Stanja"
+
+#~ msgid "Accounting"
+#~ msgstr "Računovodstvo"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Račun na osnovu isporuke"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Moji nalozi za pordaju"
 
@@ -2626,17 +2698,71 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Omogucava ti da izracunas troskove isporuke po tvojim upitima"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Upozorenje !"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravno ime modela u definiciji akcije."
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Ako nemas dovoljno lagera dostupnog da sve isporuci odjednom, prihvatas li "
+#~ "parcijalne isporuke ili ne?"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Nalog za Nabavku"
+
+#~ msgid "State"
+#~ msgstr "Stanje"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Konfigurisi Izbornu politiku za Prodajne Naloge"
 
+#~ msgid "Dates"
+#~ msgstr "Datumi"
+
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr ""
 #~ "Greska : JU (JedinicaUsluge) mora da bude u razlicitoj kategoriji od JM ( "
 #~ "Jedinica Mera )"
 
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "UpravljackaTabla Menadzmenta Prodaje"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Ova se faktura generise automatski ako je politika Dostave 'Faktura od "
+#~ "Izvora'  ili ' faktura na zahtev nakon isporuke'."
+
+#~ msgid "Conditions"
+#~ msgstr "Uslovi"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Postavi u Pripremu"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Nema ulazne kategorije naloga definisane u podrazumevanim osobinama za "
+#~ "Kategoriju Proizvoda ili nije definisana Fiskalna Pozicija !"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Selektuj proizvod za tip usluge zvanoj 'Napredni Proizvod'. Mozda zelis da "
+#~ "ga kreiras i postavis kao podrazumevanu vrednost u tom polju."
+
+#~ msgid "UoM"
+#~ msgstr "JM"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Greska: Neispravan EAN kod"
 
@@ -2645,33 +2771,107 @@ msgstr "Račun na osnovu isporuke"
 #~ msgstr ""
 #~ "Daje neke mogucnosti za unapredjenje izgleda Izvestaja Prodajnih Naloga"
 
+#~ msgid "Lines to Invoice"
+#~ msgstr "Linije za Fakturisanje"
+
+#~ msgid "Stock Moves"
+#~ msgstr "POmeranje Lagera"
+
 #~ msgid "  Year  "
 #~ msgstr "  Godina  "
 
+#~ msgid "Companies"
+#~ msgstr "Preduzeca"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Ime i aadresa kontakta koji je zatrazio upit ili Narudzbu."
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Da li stvarno zelis da kreiras fakturu(e) ?"
 
+#~ msgid "Procurement of sold material"
+#~ msgstr "Nabavka Prodatog materijala"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Mesecna Prodaja"
+
+#~ msgid "Security Days"
+#~ msgstr "dani Sigurnosti"
+
+#~ msgid "References"
+#~ msgstr "Reference"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Datumi Prodajnih Naloga"
 
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Marze u Prodajnim nalozima"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "ukupno iskljucenih poreza"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Ovori Fakturu"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Ovo su dani dodati onome sto su obecao klijentima iz sigurnosnih razloga."
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "POdesavanje Aplikacije Prodaje"
 
+#~ msgid "Related Picking"
+#~ msgstr "Relacioni Izbor"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Kreiranje Izborne liste"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Bazirano na isporucenim ili narucenim kolicinama."
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Kreiraj Dostavni Nalog"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Trosak Dostave"
 
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "PLanirao si da prodas %.2f %s ali imas samo %.2f %s dostupno !\n"
+#~ "Stvarni lager je %.2f %s. ( Bez rezervacija)"
+
 #~ msgid "Recreate Procurement"
 #~ msgstr "Ponovi Nabavku"
 
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Dokumenat za pomeranje na izlaz ili za kupca."
+
+#~ msgid "Pick List"
+#~ msgstr "Izborna Lista"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Isporuke za fakture"
+
 #~ msgid "Order date"
 #~ msgstr "Naruceno Dana"
 
+#~ msgid "Procurement Method"
+#~ msgstr "Metod Nabavke"
+
 #~ msgid "title"
 #~ msgstr "Naslov"
 
+#~ msgid "Sales by Product Category"
+#~ msgstr "Prodaja po kategoriji Proizvoda"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Kreiraj Nabavni Nalog"
+
 #, python-format
 #~ msgid "Picking Information !"
 #~ msgstr "Informacije Izbora"
@@ -2687,15 +2887,40 @@ msgstr "Račun na osnovu isporuke"
 #~ "proste metode za isporuku proizvoda klijentima u samo jednoj ili dve "
 #~ "operacije radnika."
 
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Mozes kreirati fakture bazirane na prodajnim nalozima pri isporukama."
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Izborna Lista & Nalog Dostave"
 
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Dokumenat za pomeriti ka klijentu."
+
 #~ msgid "Invoicing"
 #~ msgstr "Fakturisanje"
 
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Ovisno o konfiguraciji lokacije izlaza, pomeranje izmedju izlaznog dela i "
+#~ "potrosaca je yradjena kroz Nalog Isporuke rucno ili automatski."
+
+#~ msgid "Logistic"
+#~ msgstr "Logistika"
+
+#~ msgid "Picking Policy"
+#~ msgstr "Izborna Politika"
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -2718,6 +2943,19 @@ msgstr "Račun na osnovu isporuke"
 #~ "sto je pre moguce kolke god je proizvod dostupan ili ces sacekati dok svi "
 #~ "naruceni proizvodi budu dostupni. ( Na lageru)"
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Upozorenje"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Vreme trajanja Isporuke"
+
+#~ msgid "Stock Move"
+#~ msgstr "Pomeranje lagera"
+
+#~ msgid "Picking List"
+#~ msgstr "Izborna lista"
+
 #~ msgid "Invoicing journals"
 #~ msgstr "Dnevnici Faktura"
 
@@ -2727,6 +2965,12 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Configuration Progress"
 #~ msgstr "Konfiguracioni Progres"
 
+#~ msgid "Image"
+#~ msgstr "Slika"
+
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Vasa faktura je uspesno kreirana!"
+
 #~ msgid "Shipped Qty"
 #~ msgstr "Isporucena Kolicina"
 
@@ -2737,6 +2981,9 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Not enough stock !"
 #~ msgstr "Nema dovoljno mesta na lageru !"
 
+#~ msgid "Delivered"
+#~ msgstr "Isporuceno"
+
 #~ msgid "Adds commitment, requested and effective dates on Sales Orders."
 #~ msgstr "Dodaj komitenta, zahtevanog i efektivnog datuma Prodajnog Naloga."
 
diff --git a/addons/sale/i18n/sr@latin.po b/addons/sale/i18n/sr@latin.po
index d1b42d66fcd..26fc8ef5d34 100644
--- a/addons/sale/i18n/sr@latin.po
+++ b/addons/sale/i18n/sr@latin.po
@@ -7,21 +7,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:57+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Račun unapred"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Potvrđivanje ponude"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Datum Potvrde"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Grupisano po..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -30,62 +178,345 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Dodeljivanje partnera"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_policy:0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Stanje naloga"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Ako nemas dovoljno lagera dostupnog da sve isporuci odjednom, prihvatas li "
-"parcijalne isporuke ili ne?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Za Fakturu"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Količina"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Upiti"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Dan"
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Mart"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Preduzece"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Datum Fakture"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Stavke za koje ne postoji račun a isporučene su"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Iznos koji bi trebalo unapred fakturisati"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Računi izuzeci"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analitički nalog"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Ukupno"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Poništite nalog"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Težina"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
+msgid "Quotation "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Upozorenje !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Nalog za prodaju"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septembar"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Porezi"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Neoporezovani iznos"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Ukupno neto"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Ukupno"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Prodavnica"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Prodaje izuzeci"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Adresa računa"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Osvežavanje računa"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Kreiraj Fakture"
 
 #. module: sale
 #: report:sale.order:0
@@ -93,65 +524,643 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analitički nalog"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Nalog za Nabavku"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Partner"
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Datum potvrdjivanja"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# Linija"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# Kol"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faks:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Prodajni Nalog"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Količina (UoS)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Napredni Iznos"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Podrazumevani uslovi plaćanja"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Potvrda"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Adresa isporuke"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Godina"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Nalog N°"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
 msgstr "Stavke naloga"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Popust (%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Reference Naloga"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Stavke računa"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Ukupna Cena"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Stari Upiti"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
 msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
 msgstr ""
 
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Cekiraj ovu kucicu da grupises fakture za iste klijente."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Napravi Fakture"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "datum Kreacije"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Raspored čekanja"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Narucene Kolicine"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Ukupno:"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Moje Prodaje"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Neispravna akcija!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiskalna pozicija"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Datum Upita"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Datum Naloga"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Popust (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Moja ponuda"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Decembar"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Isporuceno"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mesec"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Nefakturisano"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Kategorija proizvoda"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Ime prodavnice"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Porezi:"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "U toku"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Kupac nije definisan!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Kreiranje računa"
+
 #. module: sale
 #: help:sale.order,invoice_quantity:0
 msgid ""
@@ -168,202 +1177,105 @@ msgstr ""
 "sate na asociranom poslu."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Podrazumevani uslovi plaćanja"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Prodajna linija naloga Napravi_fakturu"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Plaćeni"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Nalozi za prodaju"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupisanje računa"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
 #: view:sale.report:0
-msgid "State"
-msgstr "Stanje"
+msgid "Status"
+msgstr "Status"
 
 #. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Popust (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Ukupna Cena"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Cekiraj ovu kucicu da grupises fakture za iste klijente."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Narucene Kolicine"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Premeštanje inventara"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Reference Naloga"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "OStale Informacije"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Datumi"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"Ova se faktura generise automatski ako je politika Dostave 'Faktura od "
-"Izvora'  ili ' faktura na zahtev nakon isporuke'."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Popust (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Moja ponuda"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "UpravljackaTabla Menadzmenta Prodaje"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Pakovanje"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Ime prodavnice"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Kupac nije definisan!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Prodaje izuzeci"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Uslovi"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Nema ulazne kategorije naloga definisane u podrazumevanim osobinama za "
-"Kategoriju Proizvoda ili nije definisana Fiskalna Pozicija !"
-
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
 msgstr "Avgust"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
+#: view:sale.order:0
+msgid "Sale Order "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "pogrešan mod za test_state"
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Pogoni nabavke i fakturiranja"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -371,9 +1283,41 @@ msgid "June"
 msgstr "Jun"
 
 #. module: sale
-#: code:addons/sale/sale.py:617
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Nalog"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
 #, python-format
-msgid "Could not cancel this sales order !"
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
 msgstr ""
 
 #. module: sale
@@ -382,66 +1326,115 @@ msgid "Sales Orders Statistics"
 msgstr "Statistika Prodajnih Naloga"
 
 #. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
+#: field:sale.order,date_order:0
+msgid "Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Novembar"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Prosireni Filteri"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Unapređeni proizvod"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Izuzetak"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
 msgstr "Oktobar"
 
 #. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Upiti"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA:"
-
-#. module: sale
-#: help:sale.order.line,delay:0
+#: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"prodavac kreira fakturu rucno, ako je politika  prodajnog naloga ' Isporuka "
+"i Rucno u progresu'. Faktura se kreira automatski akonje politika isporuke ' "
+"Plati pre isporuke' ."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Datum Upita"
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
 
 #. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiskalna pozicija"
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Januar"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "JM"
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Nalog za prodaju u toku"
 
 #. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Broj paketa"
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "U toku"
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -451,411 +1444,35 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1079
+#: code:addons/sale/sale.py:958
 #, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
+msgid "No valid pricelist line found ! :"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
+#: help:sale.config.settings,module_warning:0
 msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Selektuj proizvod za tip usluge zvanoj 'Napredni Proizvod'. Mozda zelis da "
-"ga kreiras i postavis kao podrazumevanu vrednost u tom polju."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel.:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Beleške"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
 msgstr ""
 
 #. module: sale
 #: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Račun"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Nalog za isporuku"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Datum Potvrde"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Dodeljivanje partnera"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Mart"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Ukupno"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Adresa računa:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Adresa računa"
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Kasnjenje Komitenta"
 
 #. module: sale
 #: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Pretrazi Nefakturisane linije"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Ponude / Nalozi"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "# Linija"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Skladište"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Nalog N°"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Stavke naloga"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Neoporezovani iznos"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Linije za Fakturisanje"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Količina (UoM)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "datum Kreacije"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Stavke za koje ne postoji račun a isporučene su"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Ukupno:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Moje Prodaje"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Neispravna akcija!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Dodatne informacije"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Cenovnik"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "# Kol"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Datum Naloga"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Isporuceno"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Sve ponude"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Septembar"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Kategorija proizvoda"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Porezi:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "POmeranje Lagera"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Stanje naloga"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Da li stvarno zelis da kreiras fakturu(e) ?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Mesecna Prodaja"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr ""
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "dani Sigurnosti"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Nabavka Prodatog materijala"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Adresa isporuke"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Prosireni Filteri"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Izuzetak"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Preduzeca"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
@@ -864,8 +1481,8 @@ msgid "History"
 msgstr "Arhiva"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
 
 #. module: sale
@@ -882,27 +1499,100 @@ msgid "Your Reference"
 msgstr "Vaše veze"
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "Ime i aadresa kontakta koji je zatrazio upit ili Narudzbu."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
-"Ovo su dani dodati onome sto su obecao klijentima iz sigurnosnih razloga."
 
 #. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Naruceno Dana"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Cenovnik"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA:"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "Kol"
+msgid "Sales Order Lines"
+msgstr "Stavke naloga za prodaju"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Prodaja"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Dan"
 
 #. module: sale
 #: view:sale.order:0
-msgid "References"
-msgstr "Reference"
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Računi"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Jedinica cene"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Urađeno"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Adresa računa:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Račun"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -911,566 +1601,64 @@ msgstr ""
 
 #. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "Otkaži"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Ponuda"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Pretrazi Nefakturisane linije"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Kreiranje računa"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "ukupno iskljucenih poreza"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Vasa faktura je uspesno kreirana!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Kontakt pri naručivanju"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Ovori Fakturu"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Prinudni prenos"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "na nalog"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Bazirano na isporucenim ili narucenim kolicinama."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Relacioni Izbor"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Ime"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Adresa isporuke:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Kreiraj Dostavni Nalog"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Ukupno Ukljucenih Poreza"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Kreiranje Izborne liste"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Prodaja po kategoriji Proizvoda"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Potvrđivanje ponude"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Greška"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Grupisano po..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Osvežavanje računa"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Isporuke za fakture"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Raspored čekanja"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Metod Nabavke"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Izborna Lista"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Postavi u Pripremu"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Dokumenat za pomeranje na izlaz ili za kupca."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Provera"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Potvrda naloga"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Kreiraj Nabavni Nalog"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Porezi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Pomeranje lagera"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Kreiraj Fakture"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faks:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Napredni Iznos"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Isporučene količine"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Račun kreiran na osnovu naloga za prodaju"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Izborna lista"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Greška!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Izvršavanje"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Izuzeci kod transporta"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Grupisanje računa"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Da bude pregledano od strane racunovodje."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr "Prodajna linija naloga Napravi_fakturu"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Računi izuzeci"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Pogoni nabavke i fakturiranja"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Plaćeni"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Analiza prodaje"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Osobine"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Ponuda"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"prodavac kreira fakturu rucno, ako je politika  prodajnog naloga ' Isporuka "
-"i Rucno u progresu'. Faktura se kreira automatski akonje politika isporuke ' "
-"Plati pre isporuke' ."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Mozes kreirati fakture bazirane na prodajnim nalozima pri isporukama."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Prodaja"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Jedinica cene"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Urađeno"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Račun"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
 #. module: sale
@@ -1479,14 +1667,57 @@ msgid "To Do"
 msgstr "Za Uraditi"
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Izborna Politika"
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Adresa isporuke:"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokumenat za pomeriti ka klijentu."
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Analiza prodaje"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Kreiranje računa"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
@@ -1494,53 +1725,192 @@ msgid "The amount without tax."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:604
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:822
 #, python-format
-msgid "You must first cancel all picking attached to this sales order."
+msgid "You cannot cancel a sale order line that has already been invoiced!"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Mesec"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "Proizvod"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Otkazivanje prenosa"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Maj"
+
+#. module: sale
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Cena"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel.:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Da li stvarno zelis da kreiras fakturu(e) ?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "OStale Informacije"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Kol"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Da bude pregledano od strane racunovodje."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Ponude / Nalozi"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Kupac"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Februar"
+
 #. module: sale
 #: field:sale.order,invoice_quantity:0
 msgid "Invoice on"
 msgstr "Račun na"
 
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
@@ -1551,31 +1921,98 @@ msgstr "Datum naručivanja"
 msgid "Product UoS"
 msgstr "Proizvod UoS"
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "April"
+
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "U toku"
 
 #. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Proizvod UoM"
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistika"
+msgid "My Sale Orders"
+msgstr ""
 
 #. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Order"
-msgstr "Nalog"
+msgid "Search Sales Order"
+msgstr "Pretrazi Prodajne Naloge"
 
 #. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
 msgstr ""
 
 #. module: sale
@@ -1593,570 +2030,55 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1251
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"PLanirao si da prodas %.2f %s ali imas samo %.2f %s dostupno !\n"
-"Stvarni lager je %.2f %s. ( Bez rezervacija)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Stanja"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Referenca Potrosaca"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Ukupno"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Cena"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Ovisno o konfiguraciji lokacije izlaza, pomeranje izmedju izlaznog dela i "
-"potrosaca je yradjena kroz Nalog Isporuke rucno ili automatski."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
 msgstr ""
 
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Napravi Fakture"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Za Fakturu"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Preduzece"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Datum Fakture"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Iznos koji bi trebalo unapred fakturisati"
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Kreiranje računa"
-
 #. module: sale
 #: report:sale.order:0
-msgid "Net Total :"
-msgstr "Ukupno neto"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Otkazano"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Prodavnica"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Datum potvrdjivanja"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Upozorenje"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Prodajni Nalog"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Količina (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Potvrđeno"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Potvrda"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Stavke računa"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Stavke naloga za prodaju"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Vreme trajanja Isporuke"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Konfiguracija"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Težina"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Računi"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Decembar"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Slika"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Nefakturisano"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Prodavac"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Stari Upiti"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Neoporezovani iznos"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Račun unapred"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Nacrt"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Nalozi za prodaju"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr "Novembar"
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr "Unapređeni proizvod"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Izračunavanje"
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr "Januar"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Nalog za prodaju u toku"
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Kasnjenje Komitenta"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Dodeljivanje"
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr "Naruceno Dana"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "od akcije"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Zatvaranje"
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Isporuceno"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
-msgid "Description"
-msgstr "Opis"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr "Maj"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Kupac"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Februar"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "April"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Računovodstvo"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Pretrazi Prodajne Naloge"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
-#, python-format
-msgid "Not enough stock ! : "
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Uslovi plaćanja"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2165,44 +2087,139 @@ msgid "Quotation N°"
 msgstr "Ponuda N°"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referenca Potrosaca"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Isabrani"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Godina"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Račun na osnovu isporuke"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Ukupno Ukljucenih Poreza"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Račun"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravno ime modela u definiciji akcije."
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Ako nemas dovoljno lagera dostupnog da sve isporuci odjednom, prihvatas li "
+#~ "parcijalne isporuke ili ne?"
+
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Plaćanje pre isporuke"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Upozorenje !"
+
 #~ msgid "VAT"
 #~ msgstr "PDV"
 
 #~ msgid "All at Once"
 #~ msgstr "Sve odjednom"
 
+#~ msgid "Procurement Order"
+#~ msgstr "Nalog za Nabavku"
+
+#~ msgid "Order Line"
+#~ msgstr "Stavke naloga"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Konfigurisi Izbornu politiku za Prodajne Naloge"
 
+#~ msgid "State"
+#~ msgstr "Stanje"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Premeštanje inventara"
+
+#~ msgid "Dates"
+#~ msgstr "Datumi"
+
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr ""
 #~ "Greska : JU (JedinicaUsluge) mora da bude u razlicitoj kategoriji od JM ( "
 #~ "Jedinica Mera )"
 
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Ova se faktura generise automatski ako je politika Dostave 'Faktura od "
+#~ "Izvora'  ili ' faktura na zahtev nakon isporuke'."
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "UpravljackaTabla Menadzmenta Prodaje"
+
 #, python-format
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "Ne možete da otkažete nalog za prodaju!"
 
+#~ msgid "Packaging"
+#~ msgstr "Pakovanje"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Postavi u Pripremu"
+
+#~ msgid "Conditions"
+#~ msgstr "Uslovi"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Nema ulazne kategorije naloga definisane u podrazumevanim osobinama za "
+#~ "Kategoriju Proizvoda ili nije definisana Fiskalna Pozicija !"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Omogucava ti da izracunas troskove isporuke po tvojim upitima"
 
@@ -2212,25 +2229,59 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Delivery Order Only"
 #~ msgstr "Isključivo nalog za isporuku"
 
+#~ msgid "UoM"
+#~ msgstr "JM"
+
+#~ msgid "Number Packages"
+#~ msgstr "Broj paketa"
+
 #, python-format
 #~ msgid "You cannot cancel a sale order line that has already been invoiced !"
 #~ msgstr ""
 #~ "Ne možete da otkažete nalog za prodaju za koju je već napravljen račun!"
 
+#~ msgid "Accounting"
+#~ msgstr "Računovodstvo"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Selektuj proizvod za tip usluge zvanoj 'Napredni Proizvod'. Mozda zelis da "
+#~ "ga kreiras i postavis kao podrazumevanu vrednost u tom polju."
+
 #, python-format
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Ne možete da otkažete ovaj nalog za prodaju!"
 
+#~ msgid "Notes"
+#~ msgstr "Beleške"
+
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Kupovni cenovnik"
 
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Greska: Neispravan EAN kod"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Nalog za isporuku"
+
 #, python-format
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Ne možete da obrišete nalog(e) za kupovinu koji su već potvrđeni!"
 
+#~ msgid "Warehouse"
+#~ msgstr "Skladište"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Neoporezovani iznos"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Linije za Fakturisanje"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Količina (UoM)"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr ""
@@ -2239,12 +2290,42 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Nevažeći XML za pregled arhitekture"
 
+#~ msgid "All Quotations"
+#~ msgstr "Sve ponude"
+
+#~ msgid "Stock Moves"
+#~ msgstr "POmeranje Lagera"
+
 #~ msgid "  Year  "
 #~ msgstr "  Godina  "
 
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Da li stvarno zelis da kreiras fakturu(e) ?"
 
+#~ msgid "Sales By Month"
+#~ msgstr "Mesecna Prodaja"
+
+#~ msgid "Security Days"
+#~ msgstr "dani Sigurnosti"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Nabavka Prodatog materijala"
+
+#~ msgid "Companies"
+#~ msgstr "Preduzeca"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Ime i aadresa kontakta koji je zatrazio upit ili Narudzbu."
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Ovo su dani dodati onome sto su obecao klijentima iz sigurnosnih razloga."
+
+#~ msgid "References"
+#~ msgstr "Reference"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "Datumi Prodajnih Naloga"
 
@@ -2254,21 +2335,70 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Marze u Prodajnim nalozima"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "ukupno iskljucenih poreza"
+
+#~ msgid "Compute"
+#~ msgstr "Izračunavanje"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Kontakt pri naručivanju"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Ovori Fakturu"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "POdesavanje Aplikacije Prodaje"
 
+#~ msgid "Force Assignation"
+#~ msgstr "Prinudni prenos"
+
+#~ msgid "on order"
+#~ msgstr "na nalog"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Bazirano na isporucenim ili narucenim kolicinama."
+
+#~ msgid "Related Picking"
+#~ msgstr "Relacioni Izbor"
+
+#~ msgid "Name"
+#~ msgstr "Ime"
+
 #~ msgid "Sale Pricelists"
 #~ msgstr "Cenovnik prodaje"
 
+#~ msgid "Create Delivery Order"
+#~ msgstr "Kreiraj Dostavni Nalog"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Trosak Dostave"
 
+#~ msgid "Create Pick List"
+#~ msgstr "Kreiranje Izborne liste"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Prodaja po kategoriji Proizvoda"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "Parcijalna isporuka"
 
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Isporuke za fakture"
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "pogrešan mod za test_state"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Metod Nabavke"
+
 #~ msgid "title"
 #~ msgstr "Naslov"
 
+#~ msgid "Pick List"
+#~ msgstr "Izborna Lista"
+
 #~ msgid "Order date"
 #~ msgstr "Naruceno Dana"
 
@@ -2276,12 +2406,49 @@ msgstr "Račun na osnovu isporuke"
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Ovo je spisak izbornih lista koji su generisani za ovaj račun"
 
-#~ msgid "Sale Order"
-#~ msgstr "Nalog za prodaju"
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Dokumenat za pomeranje na izlaz ili za kupca."
+
+#~ msgid "Validate"
+#~ msgstr "Provera"
+
+#~ msgid "Confirm Order"
+#~ msgstr "Potvrda naloga"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Kreiraj Nabavni Nalog"
 
 #~ msgid "Shipping Policy"
 #~ msgstr "Opcije transporta"
 
+#~ msgid "Stock Move"
+#~ msgstr "Pomeranje lagera"
+
+#~ msgid "Extra Info"
+#~ msgstr "Dodatne informacije"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Isporučene količine"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Račun kreiran na osnovu naloga za prodaju"
+
+#~ msgid "Picking List"
+#~ msgstr "Izborna lista"
+
+#~ msgid "from stock"
+#~ msgstr "od akcije"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Greška!"
+
+#~ msgid "Procurement"
+#~ msgstr "Izvršavanje"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Izuzeci kod transporta"
+
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Isporuka & Račun"
 
@@ -2309,6 +2476,14 @@ msgstr "Račun na osnovu isporuke"
 #~ "proste metode za isporuku proizvoda klijentima u samo jednoj ili dve "
 #~ "operacije radnika."
 
+#~ msgid "Properties"
+#~ msgstr "Osobine"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Mozes kreirati fakture bazirane na prodajnim nalozima pri isporukama."
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
@@ -2320,12 +2495,52 @@ msgstr "Račun na osnovu isporuke"
 #~ msgstr ""
 #~ "Ime objekta mora da počinje sa x_ i ne sme da sadrži specijalne karaktere !"
 
+#~ msgid "Picking Policy"
+#~ msgstr "Izborna Politika"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Dokumenat za pomeriti ka klijentu."
+
 #~ msgid "Shipping Default Policy"
 #~ msgstr "Podrazumevane opcije za isporuku"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Invoicing"
 #~ msgstr "Fakturisanje"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Otkazivanje prenosa"
+
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
+#~ msgid "Product UoM"
+#~ msgstr "Proizvod UoM"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "PLanirao si da prodas %.2f %s ali imas samo %.2f %s dostupno !\n"
+#~ "Stvarni lager je %.2f %s. ( Bez rezervacija)"
+
+#~ msgid "States"
+#~ msgstr "Stanja"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Ovisno o konfiguraciji lokacije izlaza, pomeranje izmedju izlaznog dela i "
+#~ "potrosaca je yradjena kroz Nalog Isporuke rucno ili automatski."
+
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Koraci za dostavu naloga za prodaju"
 
@@ -2343,6 +2558,16 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "   Month   "
 #~ msgstr "   Mesec   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Upozorenje"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Vreme trajanja Isporuke"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfiguracija"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Račun na bazi Naloga posle isporuke"
 
@@ -2361,6 +2586,9 @@ msgstr "Račun na osnovu isporuke"
 #~ "sto je pre moguce kolke god je proizvod dostupan ili ces sacekati dok svi "
 #~ "naruceni proizvodi budu dostupni. ( Na lageru)"
 
+#~ msgid "Image"
+#~ msgstr "Slika"
+
 #, python-format
 #~ msgid ""
 #~ "You have to select a customer in the sale form !\n"
@@ -2369,6 +2597,9 @@ msgstr "Račun na osnovu isporuke"
 #~ "Izaberite kupca u formi za prodaju !\n"
 #~ "Izaberite jednog kupca pre nego što izaberete proizvod."
 
+#~ msgid "Salesman"
+#~ msgstr "Prodavac"
+
 #~ msgid ""
 #~ "This is the list of invoices that have been generated for this sale order. "
 #~ "The same sale order may have been invoiced in several times (by line for "
@@ -2399,12 +2630,28 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Shipped Qty"
 #~ msgstr "Isporucena Kolicina"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Vasa faktura je uspesno kreirana!"
+
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Unapredjenje izgleda Prodajnog naloga"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Greška"
+
+#~ msgid "Assign"
+#~ msgstr "Dodeljivanje"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Prodavnica"
 
+#~ msgid "Close"
+#~ msgstr "Zatvaranje"
+
+#~ msgid "Delivered"
+#~ msgstr "Isporuceno"
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "Nema dovoljno mesta na lageru !"
@@ -2425,6 +2672,9 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Picking Default Policy"
 #~ msgstr "Podrazumevana Izborna Politika"
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Račun na osnovu isporuke"
+
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Vaš račun je uspešno kreiran !"
 
@@ -2612,9 +2862,6 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Procurement Corrected"
 #~ msgstr "Ispravljene nabavke"
 
-#~ msgid "Status"
-#~ msgstr "Status"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Opcije otpreme"
 
@@ -2634,9 +2881,6 @@ msgstr "Račun na osnovu isporuke"
 #~ msgid "Sales order lines"
 #~ msgstr "Stavke naloga za prodaju"
 
-#~ msgid "Sequence"
-#~ msgstr "Sekvenca"
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Pakovanje NAPOLJU je napravljeno samo za uobičajene proizvode"
 
@@ -2746,3 +2990,6 @@ msgstr "Račun na osnovu isporuke"
 
 #~ msgid "Recreate Procurement"
 #~ msgstr "Ponovi Nabavku"
+
+#~ msgid "Logistic"
+#~ msgstr "Logistika"
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 2775773762e..8458022cba8 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -6,20 +6,168 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 18:04+0000\n"
 "Last-Translator: Raphael Collet (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: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "Med tidrapporter som grund"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avancerad faktura"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Godkänn offert"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Kundorder infopanel"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Bekräftat Datum"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Gruppera på..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -31,62 +179,345 @@ msgstr ""
 "fakturerade"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Försäljning per säljare senaste 90 dagar"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Andelsföretag"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Kundorderstatus"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Om ni inte har tillräckligt lager tillgängligt för att leverera allt på en "
-"gång, accepterar ni delleveranser?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "Försäljningsenhet"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Att fakturera"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Leveransadress för kundordern"
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Antal"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum när kundordern är bekräftad."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Dag"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Offerter"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Mars"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Avtal/Objektkonto"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Företag"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fakturadatum"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Ej fakturerade med levererade rader"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Det belopp som skall förskottsfaktureras."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Fakturaundantag"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Den totala summan."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Objekt"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Deltotal"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Avbryt order"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Offert '%s' har konverterats till en kundorder."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Vikt"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
-msgstr "Skriv ut offert"
+msgid "Quotation "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Varning !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Kundorder"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Moms"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Belopp ex. moms"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Netto total:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Orderrader med anknytning till mina kundorder"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Butik"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Kundorder med fel"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Fakturaadress"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum då kundordern skapades."
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Återskapa faktura"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Skapa fakturor"
 
 #. module: sale
 #: report:sale.order:0
@@ -94,77 +525,645 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Skapa anskaffningsorder för varje kundorderrad."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Objekt"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Här är en lista över varje orderrad som ska faktureras. Du kan fakturera "
-"kundorder bitvis, rad för rad av kundordern. Du behöver inte den här listan "
-"om du fakturerar från leveransorder eller om du fakturerar hela ordern på en "
-"gång."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
-"För att radera en bekräftad kundorder, måste du först avbryta den ! För att "
-"avbryta en kundorder, måste även relaterad plockning och leveranser avbrytas."
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Inköpsorder"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Bekräfta Datum"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "rader"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Antal"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Kundorder"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Antal"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Orderrader i klar-status"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Förskott Belopp"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Bekräftad"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Standard betalningsvillkor"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Bekräfta"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Leveransadress"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Kundorderrader färdiga för fakturering"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Månatlig omsättning"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "År"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Icke bekräftade kundorder"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Ordernummer"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Kundorderrader"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Rab.(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Orderreferens"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Fakturarader"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Totalt belopp"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Gamla offerters"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Markera checkboxen för att gruppera fakturorna per kund."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Skapa fakturor"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Timme"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Skapad datum"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Schemalagd väntan"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Fakturaadress för kundordern."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Beställt antal"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Kundorder innevarande år"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Antal"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Totalt:"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Min försäljning"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Invalid action !"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiscal Position"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "Försäljningsenhet"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "EDI-prislista (%s)"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Quotation Date"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Orderdatum"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Offerter och order"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "Partner"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "Fakturera utgående från leveranser"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Orderrad"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
-"Kundorder hjälper dig att hantera offerter och ordrar från dina kunder. "
-"Arbetsflödet för en kundorder inleds med en offert. Så snart denna är "
-"bekräftad, uppgraderas offerten till en order. OpenERP hanterar ett brett "
-"spektrum av produkttyper så att en order kan initiera ärenden, "
-"leveransorder, tillverkningsorder, inköp med mera. Beroende på hur "
-"kundordermodulen är konfigurerad så skapas ett utkast till en faktura som "
-"måste bekräftas när det är dags för fakturering."
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Skapa kundfaktura"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Rabatt (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Fakturan kunde inte skapad för denna kundorder av något av följande skäl::\n"
+"1. Någon orderrad är antingen fortfarande i utkast eller avbruten!\n"
+"2. Någon orderrad är redan fakturerad!"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Kundorderrader klara"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mina offerter"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "December"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Levererad"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Månad"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sekvens"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "Du kan inte bekräfta en kundorder utan försäljningsrader."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Ofakturerad"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Produktkategori"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Butiksnamn"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Moms :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Försäljning, avancerad fakturabetalning"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Pågår"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "No Customer Defined !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Skapa fakturor"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -181,1311 +1180,10 @@ msgstr ""
 "en tjänst, avses skickad mängd timmar på de utförda arbetet."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Standard betalningsvillkor"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "Baserad på leveranser"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "Huvudsaklig arbetstidsenhet"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Status"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Rab.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Totalt belopp"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Markera checkboxen för att gruppera fakturorna per kund."
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "Mina kundordrar"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Beställt antal"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Försäljning per säljare"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Lagertransaktioner"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Orderreferens"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Övrig information"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Datum"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
 msgstr ""
-"Fakturan skapas med automatik om plockpolicyn är 'fakturera från plock' "
-"eller 'fakturera från order efter leverans'."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "Baserad nedlagt arbete på ärendet"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "Offerter och order"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Skapa kundfaktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr "Prislistevarning"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Rabatt (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Mina offerter"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Försäljningschefens infopanel"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Paketering"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Från en kundorder"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Butiksnamn"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-"Fakturapolicy används för att synkronisera faktura och leverans.\n"
-"- Den \"Betala innan leverans '-valet kommer först generera fakturan och "
-"sedan generera plockningsorder efter betalningen av denna faktura.\n"
-"- Den \"Leverera och faktura vid behov\" kommer att skapa plockorder direkt "
-"och vänta på att användaren manuellt klicka på \"Faktura\" för att generera "
-"förslag till fakturan baseras på försäljning ordning eller försäljning "
-"linjer beställer.\n"
-"- Den \"faktura på order efter leverans 'Choice kommer att generera utkastet "
-"faktura baserad på försäljning ordning efter alla plocklistor har "
-"avslutats.\n"
-"- Den \"faktura baserat på leveranser val används för att skapa en faktura "
-"under plockprocessen."
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "No Customer Defined !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Kundorder med fel"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "Konfigurationsfel !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Villkor"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Augusti"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Du försöker tilldela ett parti som inte är från samma produkt."
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "invalid mode for test_state"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Juni"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Kunde inte avbryta kundordern !"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Kundorderstatistik"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Kundorderns objektkonton."
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Oktober"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "Referensen måste vara unik per bolag!"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Offerter"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Prislista till aktuell kundorder."
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "Moms :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Antal dagar mellan orderbekräftelse till leverans av produkter till kunden"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Quotation Date"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Fiscal Position"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "Enhet"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Number Packages"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Pågår"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Säljaren bekräftar offerten. Status på ordern går över i 'pågår' eller "
-"'manuell pågående'."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr "Du kan inte avbryta en orderrad som redan är fakturerad!"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Du måste först avsluta lagerförändring som hör ihop med denna orderrad."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"Välj en produkt av typen tjänst som kallas \"Avancerad produkt\". Du kanske "
-"måste skapa den och ställa in den som ett standardvärde på detta område."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel. :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"Du kan inte förskottsbetala en kundorder som definieras som \"automatisk "
-"fakturering efter leverans\"."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Anteckningar"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "Bolagsnamnet måste vara unikt !"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Fakturaadress för kundordern."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "Månad-1"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "Kundorderns månad"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr "Du kan inte gruppera försäljning med olika valutor på samma företag."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "Leverera varje produkt när den är tillgänglig"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Fakturerad"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Leveransorder"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Bekräftat Datum"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Andelsföretag"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Mars"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr "Du kan inte flytta produkter från eller till en lokal av typen visa."
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "Baserad på kundorder"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Den totala summan."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Deltotal"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Fakturaadress :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "Radnummer"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"För varje orderrad skapas en inköpsorder för att täcka upp för den sålda "
-"produkten."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm som står för \"International Commercial terms\" innebär att en "
-"serie av försäljningenstermer som används i den kommersiella handeln."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Fakturaadress"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Sök ej fakturerade rader"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Quotation / Order"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "rader"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Kundorder öppna fakturor"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Orderrad"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Lager"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Ordernummer"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Kundorderrader"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Belopp ex. moms"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Rader att fakturera"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Antal"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Skapad datum"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "Allmänt"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Ej fakturerade med levererade rader"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Totalt:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Min försäljning"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Invalid action !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Tilläggsinformation"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Prislista"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Antal"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "Timme"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Orderdatum"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Levererad"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Alla offerter"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "Alternativ"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "September"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "Du kan inte bekräfta en kundorder utan försäljningsrader."
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"Du måste välja en prislista eller en kund i försäljningsformuläret!\n"
-"Ställ in en innan du väljer en produkt."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Produktkategori"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Moms :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Lagertransaktioner"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Kundorderstatus"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Vill du verkligen skapa fakturan/fakturorna ?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Försäljning per månad"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Kunde inte avbryta orderraden!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Säkerhetsdagar"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Anskaffning av sålt material"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Skapa Faktura"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Leveransadress"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Anger att kundordern är levererad. Detta fält uppdateras efter alla "
-"schemalagda åtgärder är sjösatta."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "Datum"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Utökade filter..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Undantag"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Företag"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-"Beroende på status, offert eller kundorder.\n"
-"Ordern sätts i undantagsstatus automatiskt när en fakturering avbryts "
-"(fakturaundantag) eller i plockningsprocessen (leveransundantag).\n"
-"Den \"Väntar schemaläggning\"-status när fakturan bekräftats men väntar på "
-"att schemaläggaren för att köra på orderdatum."
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "Ingen korrekt prislista funnen!:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Historik"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "Fakturera på order efter leverans"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Detta är en lista över fakturor som har genererats för denna kundorder. "
-"Samma kundorder kan ha fakturerats flera gånger (rad för rad till exempel)."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Er referens"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-"Namet och adressen för den kontakt som begärde ordern eller offerten."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Det här är det antal dagar som du lägger till det datum som du lovat kunden "
-"av säkerhetsskäl"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Antal"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referenser"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "Mina kundorderrader"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Avbryt"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "Orderreferensen måste vara unik per bolag!"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Skapa faktura"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "Exklusive moms"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "Orderreferens"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Dina faktura har blivit skapad!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Försäljning per företag"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Inköpskontakt"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Öppen faktura"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr "Automatisk e-post bekräftar kundordern"
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-"Det finns ingen försäljningsjournal definierad för det hör företaget: \"%s\" "
-"(id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Force Assignation"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "beställt"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Baserat på levererade eller beställda antal."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "Leverera alla produkter vid samma tillfälle"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "Relaterad plockning"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Namn"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Leveransadress :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Försäljning per kund senaste 90 dagarna."
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Utkast status"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Skapa leveransorder"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr "Kan inte radera orderrader som är i status '%s'!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "Antal(FE)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "Inklusive moms"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Skapa plocklista"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "Datum för kundordern"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Försäljning per produktkategori"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Godkänn offert"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Error"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Gruppera på..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Återskapa faktura"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Leveranser att fakturera"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Schemalagd väntan"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Anskaffningsmetod"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Plocklista"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Sätt till preliminär"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-"Dokumentation av bokföringstransaktionen till utleveransen eller till kunden"
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-"\n"
-"Hej ${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Här är din orderbekräftelse för ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Er referense: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Er kontaktperson: ${object.user_id.name} "
-"${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"Du kan titta på orderbekräftelsen, ladda ned och till och med betala "
-"fakturan online med länken:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"Där är även möjligt att betala direkt med Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"Har du någon fråga, tveka inte att kontakta oss.\n"
-"\n"
-"Tack för ditt val av  ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Tel: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Validera"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Skapa kundorder"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Skapa anskaffningsorder"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Moms"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "Kundorder redo för fakturering"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Datum då kundordern skapades."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Lagertransaktion"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Skapa fakturor"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr "Kundordrar under senaste månaden"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-"Om \"på beställning\", utlöser det en anskaffning när kundordern bekräftas "
-"att skapa en aktivitet, inköpsorder eller tillverkningsorder kopplad till "
-"denna orderrad."
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Förskott Belopp"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "Debiterar du för frakt?"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Levererat antal"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Fakturera utgående från kundorder"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-"Om du ändrar prislistan för denna order (och så småningom valuta) kommer "
-"priserna på befintliga orderrader inte uppdateras."
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Plocklista"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Fel !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Kunde inte avbryta kundordern !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "Antal(enhet)"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "Kundorder innevarande år"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Juli"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Anskaffning"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Leveransundantag"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "Plockinformation!: "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Gruppera fakturorna"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "Faktureringspolicy"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "Ställ in din faktureringsmetod"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Skall granskas av revisorn."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Referens UOM"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-"Detta verktyg hjälper dig att installera rätt modul och konfigurera systemet "
-"enligt den metod du använder för att fakturera dina kunder."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
@@ -1493,14 +1191,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "Kundorderrad Skapa faktura"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Fakturaundantag"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Styr anskaffning och fakturering"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Utdrag"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1508,570 +1201,9 @@ msgid "Paid"
 msgstr "Betald"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Försäljningsanalys"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
-"Du har valt en mängd enheter %d.\n"
-"Men det är inte förenligt med den valda förpackningen.\n"
-"Här är ett förslag av mängder enligt förpackningen:\n"
-"EAN: %s Antal: %s Typ av UL: %s"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Återskapa plocklista"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Egenskaper"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Offert"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Säljaren skapar en faktura manuellt, om leveranspolicyn är  'Leverans och "
-"manuell pågående'. Fakturan skapas automatiskt och leveranspolicyn är "
-"'Betalning innan leverans'."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Du kan skapa fakturor baserat på kundorder eller baserat på leveranser."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "Icke levererade men bekräftade orderrader"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "Kundfakturor"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Kundorder"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Pris"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Klar"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Du måste välja en kund i försäljningsformuläret !\n"
-"Välj en kund innan du väljer en produkt."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Källdokument"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Att göra"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Plockpolicy"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Dokumentation av bokföringstransaktionen till kunden"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "Summa utan moms."
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr "Du måste först avbryta all plockning bifogad till denna kundorder."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Försäljning, avancerad fakturabetalning"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Månad"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Cancel Assignation"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "Månatlig omsättning"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Fakturera utgående från"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Orderdatum"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Produkt"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuell pågående"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Produkt"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Logistisk"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Order"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "Det finns inget intäktskonto för denna produkt: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "Bortse från undantag"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Beroende på faktureringskontroll av kundorder, kan fakturan baseras på "
-"levererade eller beställda kvantiteterna. Således kan en kundorder genererar "
-"en faktura eller ett leveransordern så snart den bekräftas av försäljaren."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"Du planerar att sälja %.2f %s men har endast %.2f %s tillhanda !\n"
-"Det verkliga lagret är %.2f %s. (utan reservationer)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Stater"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Kundreferens"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Total"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Pris"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-"Beroende på konfigurationen av utlastningen, flytten mellan utlastningen och "
-"kunden sker genom leveransordern manuellt eller automatiskt."
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "Betala före leverans"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "Kundorder infopanel"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Skapa fakturor"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Att fakturera"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Datum när kundordern är bekräftad."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "Avtal/Objektkonto"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Företag"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fakturadatum"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Det belopp som skall förskottsfaktureras."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"Kunde inte hitta en prislisterad matchande denna produkt och kvantitet.\n"
-"Du måste antingen ändra produkten, kvantitet eller prislistan."
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "Den här plocklistan är skapad för denna kundorder."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Skapa fakturor"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Netto total:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "Cancelled"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "Orderrader med anknytning till mina kundorder"
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Butik"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Bekräfta Datum"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Warning"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Försäljning per månad"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Kundorder"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Antal"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "Orderrader i klar-status"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"Plocklisteformuläret skapas så snart kundorder bekräftas i samtidigt som "
-"anskaffningsordern. Den representerar tilldelningen av delar till "
-"kundordern. Det är 1 plocklistan genom orderrad som utvecklas med tillgången "
-"till delar."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Bekräftad"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "Huvudmetod baserad på"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Bekräfta"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Fel! Du kan inte skapa rekursiva företag."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Senaste 90 dagarnas försäljning per produktkategori"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Fakturarader"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Kundorderrader"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Delivery Lead Time"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Konfiguration"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI-prislista (%s)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr "Skriv ut order"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "Kundorder innevarande år"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Fakturan kunde inte skapad för denna kundorder av något av följande skäl::\n"
-"1. Någon orderrad är antingen fortfarande i utkast eller avbruten!\n"
-"2. Någon orderrad är redan fakturerad!"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "Kundorderrader klara"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Vikt"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Fakturor"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "December"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Bild"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"En inköpsorder skapas så snart kundordern är bekräftad eller fakturan "
-"betald. Utifrån hur reglerna är satta för kundorderparametrarna så föds "
-"inköpsorder eller produktionsunderlag. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Ofakturerad"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Säljare"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Gamla offerters"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Belopp ex. moms"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Avancerad faktura"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "Kundordern '%s' har annullerats."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Utdrag"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -2094,6 +1226,18 @@ msgstr ""
 "* \"Klar\"-status sätts orderraden har plockats.\n"
 "* \"Avbruten\"-status  sätts när en användare avbryter kundordern."
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Kundorder"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Gruppera fakturorna"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -2101,57 +1245,170 @@ msgstr "Momsen."
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "Packning"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "Kundorderrader färdiga för fakturering"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Status"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "Kundordrar under senaste månaden"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Augusti"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Styr anskaffning och fakturering"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juni"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "E-postmallar"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Kundorder"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Order"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Prislistevarning"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Butik"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Kundorderstatistik"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Orderrad"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "November"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Utökade filter..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Avancerad produkt"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Beräkna"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Undantag"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Säljaren skapar en faktura manuellt, om leveranspolicyn är  'Leverans och "
+"manuell pågående'. Fakturan skapas automatiskt och leveranspolicyn är "
+"'Betalning innan leverans'."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Du måste först avbryta all fakturering med anknytning till denna kundorder"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2163,6 +1420,41 @@ msgstr "Januari"
 msgid "Sales Order in Progress"
 msgstr "Pågående kundorder"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Säljaren bekräftar offerten. Status på ordern går över i 'pågår' eller "
+"'manuell pågående'."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
@@ -2170,87 +1462,289 @@ msgstr ""
 "En hänvisning till det dokument som genererade denna försäljningsorder."
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Ingen korrekt prislista funnen!:"
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "Engagemangsfördröjning"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "Leverera och fakturera på begäran"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Icke levererade men bekräftade orderrader"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "Historik"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr "En anskaffningsorder för varje kundorderrad och för varje komponent."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Detta är en lista över fakturor som har genererats för denna kundorder. "
+"Samma kundorder kan ha fakturerats flera gånger (rad för rad till exempel)."
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Tilldela"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Er referens"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Orderdatum"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prislista"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "Moms :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Kundfakturor"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "Bekräftade kundorder att fakturera"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "Icke bekräftade kundorder"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Kundorderrader"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Kundorder"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "Kundorder '%s' har åter fått status utkast."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Om du ändrar prislistan för denna order (och så småningom valuta) kommer "
+"priserna på befintliga orderrader inte uppdateras."
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "från lager"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Dag"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Stäng"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Fakturor"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Pris"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Klar"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Fakturaadress :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Mina kundorderrader"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "Ingen prislista !: "
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Levererad"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Offert"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Du måste tilldela ett produktionsparti för denna produkt"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Sök ej fakturerade rader"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
-"Om du säljer dina produkter från mer än ett försäljningsställe eller butik, "
-"kan du skapa och administera dem här. Så snart någon offert eller order "
-"skapas kan den knytas till en butik. Butiken är i sin tur knuten till ett "
-"lager från vilket produkterna levereras."
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Orderreferensen måste vara unik per bolag!"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Att göra"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Leveransadress :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr "Du kan inte gruppera försäljning med olika valutor på samma företag."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Försäljningsanalys"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Prislista till aktuell kundorder."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Skapa faktura"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Summa utan moms."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Orderreferens"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2258,61 +1752,67 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Anger att en faktura är betald."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr "Du kan inte avbryta en orderrad som redan är fakturerad!"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Produkt"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Beskrivning"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Maj"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Kund"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Förskott"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Februari"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "April"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Redovisning"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Sök kundorder"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Rekvisition för kundorder"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
-msgstr "Ej tillräckligt i lager!: "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Betalningsvillkor"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Pris"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2329,34 +1829,370 @@ msgstr ""
 "försäljningen som ännu inte har fakturerats. Om du vill analysera din "
 "omsättning, bör du använda Fakturaanalysrapporten i Bokföringen."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Vill du verkligen skapa fakturan/fakturorna ?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Övrig information"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Antal"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Skall granskas av revisorn."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Leveransadress för kundordern"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Quotation / Order"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Kund"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Förskott"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Februari"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Fakturera utgående från"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Orderdatum"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Produkt"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Utkast status"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Källdokument"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "April"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuell pågående"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Mina kundordrar"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Sök kundorder"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Kundorderns månad"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Du måste välja en prislista eller en kund i försäljningsformuläret!\n"
+"Ställ in en innan du väljer en produkt."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Från en kundorder"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Bortse från undantag"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Beroende på faktureringskontroll av kundorder, kan fakturan baseras på "
+"levererade eller beställda kvantiteterna. Således kan en kundorder genererar "
+"en faktura eller ett leveransordern så snart den bekräftas av försäljaren."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Kundorderns objektkonton."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Betalningsvillkor"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Kundorder redo för fakturering"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
 msgstr "Offertnummer"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Kundreferens"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Plockad"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "År"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Fakturera utgående ifrån leveranser"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Inklusive moms"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Fakturerad"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Datum för kundordern"
 
 #~ msgid "Recreate Procurement"
 #~ msgstr "Återskapa inköp"
 
+#~ msgid "Notes"
+#~ msgstr "Anteckningar"
+
 #~ msgid "Origin"
 #~ msgstr "Ursprung"
 
-#~ msgid "Sequence"
-#~ msgstr "Sekvens"
+#~ msgid "Configuration"
+#~ msgstr "Konfiguration"
+
+#~ msgid "Order Line"
+#~ msgstr "Orderrad"
+
+#~ msgid "Salesman"
+#~ msgstr "Säljare"
+
+#~ msgid "Properties"
+#~ msgstr "Egenskaper"
+
+#~ msgid "Compute"
+#~ msgstr "Beräkna"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
@@ -2369,6 +2205,15 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Partial Delivery"
 #~ msgstr "Delleverans"
 
+#~ msgid "from stock"
+#~ msgstr "från lager"
+
+#~ msgid "Delivery Order"
+#~ msgstr "Leveransorder"
+
+#~ msgid "Validate"
+#~ msgstr "Validera"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Skapa faktura"
 
@@ -2387,12 +2232,30 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "All Sales Order"
 #~ msgstr "Alla kundorder"
 
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Fakturera utgående från kundorder"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "Levererat antal"
+
+#~ msgid "Warehouse"
+#~ msgstr "Lager"
+
 #~ msgid "Manual Description"
 #~ msgstr "Manuell beskrivning"
 
+#~ msgid "Untaxed amount"
+#~ msgstr "Belopp ex. moms"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "Komplett leverans"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Skapa kundorder"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Antal"
+
 #~ msgid "Customer Ref"
 #~ msgstr "Kundreferens"
 
@@ -2408,9 +2271,15 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Sales orders"
 #~ msgstr "Kundorder"
 
+#~ msgid "Close"
+#~ msgstr "Stäng"
+
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "Kundorder som skall faktureras"
 
+#~ msgid "All Quotations"
+#~ msgstr "Alla offerter"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "Preliminär faktura"
 
@@ -2426,9 +2295,6 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Our Salesman"
 #~ msgstr "Vår säljare"
 
-#~ msgid "Status"
-#~ msgstr "Status"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Kundorder prislista"
 
@@ -2438,6 +2304,15 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Sale Order line"
 #~ msgstr "Kundorderrad"
 
+#~ msgid "Accounting"
+#~ msgstr "Redovisning"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Fakturera utgående ifrån leveranser"
+
+#~ msgid "States"
+#~ msgstr "Stater"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Fel: felaktig ean kod"
 
@@ -2459,8 +2334,11 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Total amount"
 #~ msgstr "Totalt belopp"
 
-#~ msgid "Sale Order"
-#~ msgstr "Kundorder"
+#~ msgid "Product UoM"
+#~ msgstr "Produkt"
+
+#~ msgid "Name"
+#~ msgstr "Namn"
 
 #~ msgid "New Quotation"
 #~ msgstr "Ny offert"
@@ -2471,15 +2349,27 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Steg för att leverera en kundorder"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Sätt till preliminär"
+
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Leverans från lagret till kunden."
 
+#~ msgid "Extra Info"
+#~ msgstr "Tilläggsinformation"
+
 #~ msgid "Packing"
 #~ msgstr "Leverans"
 
 #~ msgid "Sales Process"
 #~ msgstr "Kundorderprocess"
 
+#~ msgid "on order"
+#~ msgstr "beställt"
+
+#~ msgid "Packaging"
+#~ msgstr "Paketering"
+
 #~ msgid "VAT"
 #~ msgstr "Moms"
 
@@ -2492,9 +2382,15 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Other data"
 #~ msgstr "Övrig data"
 
+#~ msgid "Assign"
+#~ msgstr "Tilldela"
+
 #~ msgid "Confirm sale order and Create invoice."
 #~ msgstr "Godkänn kundordern och skapa en faktura."
 
+#~ msgid "UoM"
+#~ msgstr "Enhet"
+
 #~ msgid "Quotation (A sale order in draft state)"
 #~ msgstr "Offert (en preliminär kundorder)"
 
@@ -2542,12 +2438,18 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Packing Policy"
 #~ msgstr "Packvillkor"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Lagertransaktioner"
+
 #~ msgid "Configure Picking Policy for Sale Order"
 #~ msgstr "Konfigurera plockmetod för kundorder"
 
 #~ msgid "Outgoing Products"
 #~ msgstr "Utleverans"
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Lagertransaktioner"
+
 #~ msgid "Procure Method"
 #~ msgstr "Anskaffningsmetod"
 
@@ -2566,6 +2468,9 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Manages the delivery and invoicing progress"
 #~ msgstr "Administrerar leveransen och faktureringen"
 
+#~ msgid "Procurement"
+#~ msgstr "Anskaffning"
+
 #~ msgid "Procurement for each line"
 #~ msgstr "Anskaffning för varje rad"
 
@@ -2602,9 +2507,15 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Detta är plocklistan som genererats för denna faktura"
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Manuell påskrift"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Leveransundantag"
+
 #~ msgid ""
 #~ "This Configuration step use to set default picking policy when make sale "
 #~ "order"
@@ -2635,6 +2546,10 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "My sales in shipping exception"
 #~ msgstr "Mina kundorder, misslyckad leverans"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Fel !"
+
 #~ msgid "Packing List & Delivery Order"
 #~ msgstr "Plocklista & Leveransorder"
 
@@ -2700,6 +2615,9 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Sale Shop"
 #~ msgstr "Sale Shop"
 
+#~ msgid "Force Assignation"
+#~ msgstr "Force Assignation"
+
 #~ msgid ""
 #~ "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
 #~ "will automatic create after delivery."
@@ -2707,6 +2625,9 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
 #~ "will automatic create after delivery."
 
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Delivery Lead Time"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalid XML for View Architecture!"
 
@@ -2727,6 +2648,22 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Vill du verkligen skapa fakturan/fakturorna ?"
 
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "invalid mode for test_state"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Error"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot make an advance on a sale order that is defined as 'Automatic "
@@ -2735,6 +2672,13 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ "You cannot make an advance on a sale order that is defined as 'Automatic "
 #~ "Invoice after delivery'."
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Warning"
+
+#~ msgid "Number Packages"
+#~ msgstr "Number Packages"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2753,6 +2697,9 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Could not cancel this sale order !"
 #~ msgstr "Could not cancel this sale order !"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Cancel Assignation"
+
 #~ msgid "Make invoices"
 #~ msgstr "Make invoices"
 
@@ -2775,27 +2722,118 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr "You must first cancel all invoices attached to this sale order."
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Varning !"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Inköpsorder"
+
+#~ msgid "Dates"
+#~ msgstr "Datum"
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Återskapa plocklista"
+
 #~ msgid "Error: UOS must be in a different category than the UOM"
 #~ msgstr "Fel: Säljenhet måste tillhöra en annan kategori än standardenhet"
 
+#~ msgid "Conditions"
+#~ msgstr "Villkor"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Försäljning per säljare"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Du försöker tilldela ett parti som inte är från samma produkt."
+
+#~ msgid "State"
+#~ msgstr "Status"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Konfigurerar plockpolicyn för försäljningsorder"
 
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Fakturan skapas med automatik om plockpolicyn är 'fakturera från plock' "
+#~ "eller 'fakturera från order efter leverans'."
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Konfigurera ditt försäljningsarbetsflöde och standard värden"
 
+#~ msgid "Lines to Invoice"
+#~ msgstr "Rader att fakturera"
+
+#~ msgid "Companies"
+#~ msgstr "Företag"
+
+#~ msgid "Security Days"
+#~ msgstr "Säkerhetsdagar"
+
 #~ msgid "  Year  "
 #~ msgstr "  År  "
 
+#~ msgid "Procurement of sold material"
+#~ msgstr "Anskaffning av sålt material"
+
+#~ msgid "Sales By Month"
+#~ msgstr "Försäljning per månad"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr ""
+#~ "Namet och adressen för den kontakt som begärde ordern eller offerten."
+
+#~ msgid "References"
+#~ msgstr "Referenser"
+
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Marginaler på kundordern"
 
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Det här är det antal dagar som du lägger till det datum som du lovat kunden "
+#~ "av säkerhetsskäl"
+
+#~ msgid "Related Picking"
+#~ msgstr "Relaterad plockning"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Skapa leveransorder"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Öppen faktura"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Baserat på levererade eller beställda antal."
+
 #~ msgid "title"
 #~ msgstr "titel"
 
+#~ msgid "Pick List"
+#~ msgstr "Plocklista"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Anskaffningsmetod"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Försäljning per produktkategori"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Skapa plocklista"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Leveranskostnad"
 
+#~ msgid "Stock Move"
+#~ msgstr "Lagertransaktion"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "Skapa anskaffningsorder"
+
 #~ msgid "Order date"
 #~ msgstr "Orderdaturm"
 
@@ -2803,18 +2841,55 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Picking Information !"
 #~ msgstr "Plockinformation !"
 
+#~ msgid "Picking List"
+#~ msgstr "Plocklista"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Du kan skapa fakturor baserat på kundorder eller baserat på leveranser."
+
+#~ msgid "Picking Policy"
+#~ msgstr "Plockpolicy"
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "Plocklista och leveransorder"
 
 #~ msgid "Invoicing"
 #~ msgstr "Fakturering"
 
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr "Det finns inget intäktskonto för denna produkt: \"%s\" (id:%d)"
+
+#~ msgid "Logistic"
+#~ msgstr "Logistisk"
+
 #~ msgid "   Month   "
 #~ msgstr "   Månad   "
 
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Leveranser att fakturera"
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr "En anskaffningsorder för varje kundorderrad och för varje komponent."
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Skapa Faktura"
+
 #~ msgid "Configure"
 #~ msgstr "Konfigurera"
 
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/a)"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Kunde inte avbryta kundordern !"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Orderreferensen måste vara unik !"
 
@@ -2822,24 +2897,73 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr "Du kan inte avbryta en orderrad som har blivit fakturerad !"
 
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Försäljning per kund senaste 90 dagarna."
+
+#~ msgid "Reference UoM"
+#~ msgstr "Referens UOM"
+
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Fakturera från plockningen"
 
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Kunde inte avbryta kundordern !"
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Du måste välja en kund i försäljningsformuläret !\n"
+#~ "Välj en kund innan du väljer en produkt."
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr "Du måste först avbryta all plockning bifogad till denna kundorder."
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr ""
+#~ "Det finns ingen försäljningsjournal definierad för det hör företaget: \"%s\" "
+#~ "(id:%d)"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Månad-1    "
 
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Fel! Du kan inte skapa rekursiva företag."
+
+#~ msgid "Sales by Month"
+#~ msgstr "Försäljning per månad"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Konfigurationsförlopp"
 
+#~ msgid "Image"
+#~ msgstr "Bild"
+
 #~ msgid "Invoicing journals"
 #~ msgstr "Fakturajournaler"
 
 #~ msgid "Ordered Date"
 #~ msgstr "Beställd datum"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Dina faktura har blivit skapad!"
+
+#~ msgid "Delivered"
+#~ msgstr "Levererad"
+
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr ""
 #~ "Förstärk den grundläggande försäljningsapplikationen med ytterligare "
@@ -2937,9 +3061,49 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Ger dig möjlighet att beräkna fraktkostnader på dina offerter."
 
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Anger att kundordern är levererad. Detta fält uppdateras efter alla "
+#~ "schemalagda åtgärder är sjösatta."
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Inköpskontakt"
+
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Om ni inte har tillräckligt lager tillgängligt för att leverera allt på en "
+#~ "gång, accepterar ni delleveranser?"
+
+#~ msgid "Total Tax Excluded"
+#~ msgstr "Exklusive moms"
+
 #~ msgid "Sales Application Configuration"
 #~ msgstr "Konfigurering av Försäljningsapplikationen"
 
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Antal dagar mellan orderbekräftelse till leverans av produkter till kunden"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "Välj en produkt av typen tjänst som kallas \"Avancerad produkt\". Du kanske "
+#~ "måste skapa den och ställa in den som ett standardvärde på detta område."
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm som står för \"International Commercial terms\" innebär att en "
+#~ "serie av försäljningenstermer som används i den kommersiella handeln."
+
 #~ msgid ""
 #~ "By default, OpenERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2951,5 +3115,500 @@ msgstr "Fakturera utgående ifrån leveranser"
 #~ "och enklaste metoderna att leverera produkter till kunden i en eller två "
 #~ "operationer."
 
+#~ msgid "Print Quotation"
+#~ msgstr "Skriv ut offert"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Med tidrapporter som grund"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Baserad på leveranser"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Fakturera på order efter leverans"
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Kundorder öppna fakturor"
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "För varje orderrad skapas en inköpsorder för att täcka upp för den sålda "
+#~ "produkten."
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Du måste först avsluta lagerförändring som hör ihop med denna orderrad."
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "Kundordern '%s' har annullerats."
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Baserad på kundorder"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Kunde inte avbryta orderraden!"
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Automatisk e-post bekräftar kundordern"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Försäljning per företag"
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "Den här plocklistan är skapad för denna kundorder."
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Kundorder innevarande år"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "En inköpsorder skapas så snart kundordern är bekräftad eller fakturan "
+#~ "betald. Utifrån hur reglerna är satta för kundorderparametrarna så föds "
+#~ "inköpsorder eller produktionsunderlag. "
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Du måste först avbryta all fakturering med anknytning till denna kundorder"
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Kundordrar under senaste månaden"
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Om du säljer dina produkter från mer än ett försäljningsställe eller butik, "
+#~ "kan du skapa och administera dem här. Så snart någon offert eller order "
+#~ "skapas kan den knytas till en butik. Butiken är i sin tur knuten till ett "
+#~ "lager från vilket produkterna levereras."
+
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "Kundorder '%s' har åter fått status utkast."
+
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Rekvisition för kundorder"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Fakturera utgående från leveranser"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Huvudsaklig arbetstidsenhet"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Baserad nedlagt arbete på ärendet"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Konfigurationsfel !"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Referensen måste vara unik per bolag!"
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "Bolagsnamnet måste vara unikt !"
+
+#~ msgid "Month-1"
+#~ msgstr "Månad-1"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Leverera varje produkt när den är tillgänglig"
+
+#~ msgid "Line Sequence"
+#~ msgstr "Radnummer"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Allmänt"
+
+#~ msgid "Options"
+#~ msgstr "Alternativ"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Fakturera på order efter leverans"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Leverera alla produkter vid samma tillfälle"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Antal(FE)"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Kundordrar under senaste månaden"
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Debiterar du för frakt?"
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Antal(enhet)"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "Plockinformation!: "
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Faktureringspolicy"
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Ställ in din faktureringsmetod"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Betala före leverans"
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Huvudmetod baserad på"
+
+#~ msgid "Print Order"
+#~ msgstr "Skriv ut order"
+
+#~ msgid "Packings"
+#~ msgstr "Packning"
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "Leverera och fakturera på begäran"
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "Ej tillräckligt i lager!: "
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Fakturapolicy används för att synkronisera faktura och leverans.\n"
+#~ "- Den \"Betala innan leverans '-valet kommer först generera fakturan och "
+#~ "sedan generera plockningsorder efter betalningen av denna faktura.\n"
+#~ "- Den \"Leverera och faktura vid behov\" kommer att skapa plockorder direkt "
+#~ "och vänta på att användaren manuellt klicka på \"Faktura\" för att generera "
+#~ "förslag till fakturan baseras på försäljning ordning eller försäljning "
+#~ "linjer beställer.\n"
+#~ "- Den \"faktura på order efter leverans 'Choice kommer att generera utkastet "
+#~ "faktura baserad på försäljning ordning efter alla plocklistor har "
+#~ "avslutats.\n"
+#~ "- Den \"faktura baserat på leveranser val används för att skapa en faktura "
+#~ "under plockprocessen."
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "För att radera en bekräftad kundorder, måste du först avbryta den ! För att "
+#~ "avbryta en kundorder, måste även relaterad plockning och leveranser avbrytas."
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "Beroende på status, offert eller kundorder.\n"
+#~ "Ordern sätts i undantagsstatus automatiskt när en fakturering avbryts "
+#~ "(fakturaundantag) eller i plockningsprocessen (leveransundantag).\n"
+#~ "Den \"Väntar schemaläggning\"-status när fakturan bekräftats men väntar på "
+#~ "att schemaläggaren för att köra på orderdatum."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "Du kan inte förskottsbetala en kundorder som definieras som \"automatisk "
+#~ "fakturering efter leverans\"."
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr "Du kan inte flytta produkter från eller till en lokal av typen visa."
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Senaste 90 dagarnas försäljning per produktkategori"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr "Kan inte radera orderrader som är i status '%s'!"
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+#~ msgstr ""
+#~ "\n"
+#~ "Hej ${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Här är din orderbekräftelse för ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Er referense: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Er kontaktperson: ${object.user_id.name} "
+#~ "${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "Du kan titta på orderbekräftelsen, ladda ned och till och med betala "
+#~ "fakturan online med länken:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "Där är även möjligt att betala direkt med Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "Har du någon fråga, tveka inte att kontakta oss.\n"
+#~ "\n"
+#~ "Tack för ditt val av  ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Tel: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Beroende på konfigurationen av utlastningen, flytten mellan utlastningen och "
+#~ "kunden sker genom leveransordern manuellt eller automatiskt."
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "Plocklisteformuläret skapas så snart kundorder bekräftas i samtidigt som "
+#~ "anskaffningsordern. Den representerar tilldelningen av delar till "
+#~ "kundordern. Det är 1 plocklistan genom orderrad som utvecklas med tillgången "
+#~ "till delar."
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "Kunde inte hitta en prislisterad matchande denna produkt och kvantitet.\n"
+#~ "Du måste antingen ändra produkten, kvantitet eller prislistan."
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Du har valt en mängd enheter %d.\n"
+#~ "Men det är inte förenligt med den valda förpackningen.\n"
+#~ "Här är ett förslag av mängder enligt förpackningen:\n"
+#~ "EAN: %s Antal: %s Typ av UL: %s"
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr ""
+#~ "Detta verktyg hjälper dig att installera rätt modul och konfigurera systemet "
+#~ "enligt den metod du använder för att fakturera dina kunder."
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "Om \"på beställning\", utlöser det en anskaffning när kundordern bekräftas "
+#~ "att skapa en aktivitet, inköpsorder eller tillverkningsorder kopplad till "
+#~ "denna orderrad."
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Dokumentation av bokföringstransaktionen till kunden"
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr ""
+#~ "Dokumentation av bokföringstransaktionen till utleveransen eller till kunden"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "Du planerar att sälja %.2f %s men har endast %.2f %s tillhanda !\n"
+#~ "Det verkliga lagret är %.2f %s. (utan reservationer)"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Du måste tilldela ett produktionsparti för denna produkt"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Här är en lista över varje orderrad som ska faktureras. Du kan fakturera "
+#~ "kundorder bitvis, rad för rad av kundordern. Du behöver inte den här listan "
+#~ "om du fakturerar från leveransorder eller om du fakturerar hela ordern på en "
+#~ "gång."
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Kundorder hjälper dig att hantera offerter och ordrar från dina kunder. "
+#~ "Arbetsflödet för en kundorder inleds med en offert. Så snart denna är "
+#~ "bekräftad, uppgraderas offerten till en order. OpenERP hanterar ett brett "
+#~ "spektrum av produkttyper så att en order kan initiera ärenden, "
+#~ "leveransorder, tillverkningsorder, inköp med mera. Beroende på hur "
+#~ "kundordermodulen är konfigurerad så skapas ett utkast till en faktura som "
+#~ "måste bekräftas när det är dags för fakturering."
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Försäljning per säljare senaste 90 dagar"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Försäljningschefens infopanel"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Skapa anskaffningsorder för varje kundorderrad."
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Offert '%s' har konverterats till en kundorder."
diff --git a/addons/sale/i18n/th.po b/addons/sale/i18n/th.po
index ccc722284b6..0305fcb50d2 100644
--- a/addons/sale/i18n/th.po
+++ b/addons/sale/i18n/th.po
@@ -7,21 +7,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:56+0000\n"
 "Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
 "Language-Team: Thai <th@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
 msgstr ""
 
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "ยืนยันใบเสนอราคา"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "วันที่ยืนยัน"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "จัดกลุ่มตาม..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -29,1627 +177,104 @@ msgid ""
 "yet been invoiced"
 msgstr ""
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "ขายโดยพนักงานขายใน 90 วันที่ผ่านมา"
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "ทีอยู่ในการจัดส่งสำหรับการสั่งซื้อครั้งนี้"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "จำนวน"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "วัน"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "ยกเลิกคำสั่งซื้อ"
-
-#. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr "คำเตือน !"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "วิเคราะห์บัญชี"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "ใบสั่งซื้อ"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "พาร์ตเนอร์"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "รายการสั่งสินค้า"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "เงื่อนไขการชำระเงินปรกติ"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "สถานะ"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "ส่วนลด (%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "ราคารวม"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "จำนวนที่สั่งซื้อ"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "ขายโดยพนักงานขาย"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "เคลื่อนย้ายสินค้า"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "ข้อมูลอ้างอิงใบสั่งซื้อ"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "ข้อมูลอื่นๆ"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "วันที่"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "ส่วนลด (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "การบรรจุหีบห่อ"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "จากใบสั่งขาย"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "ชื่อร้าน"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "ไม่ได้ระบุลูกค้า !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "ยกเว้นการขาย"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "เงื่อนไข"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "มิถุนายน"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "ไม่สามารถยกเลิกใบสั่งขายนี้ได้ !"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "สถิติใบสั่งขาย"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "ตุลาคม"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "ใบเสนอราคา"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "รายการราคาสำหรับใบขายนี้"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "วันที่เสนอราคา"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "หน่วยนับ"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "กำลังดำเนินการ"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "โทรศัพท์ :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "บันทึก"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "ที่อยู่ใบแจ้งหนี้สำหรับใบสั่งขายนี้"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "ส่งใบแจ้งหนี้แล้ว"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "ใบส่งสินค้า"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "วันที่ยืนยัน"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr ""
-
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "มีนาคม"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "รวมทั้งหมด"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "รวม"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "ที่อยู่ใบแจ้งหนี้ :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "ที่อยู่ใบแจ้งหนี้"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "ใบเสนอราคา / สั่งซื้อ"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "รายการใบสั่งขาย"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "คลังสินค้า"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "รายการสั่งสินค้า"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "จำนวน"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "วันที่สร้าง"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "รายการที่ยังไม่ได้จัดส่งและแจ้งหนี้"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "รวม :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "การขายของฉัน"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
 #, python-format
-msgid "Invalid action !"
+msgid "Advance of %s %s"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "ข้อมูลเพิ่มเติม"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "รายการราคา"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
+#: view:sale.config.settings:0
+msgid "Contract Feature"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "วันที่สั่งซื้อ"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "จัดส่งแล้ว"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "ใบเสนอราคาทั้งหมด"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "กันยายน"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "ประเภทของสินค้า"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "ภาษี :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "ย้ายสต๊อก"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
+#: field:sale.report,state:0
 msgid "Order State"
 msgstr "สถานะการสั่งซื้อ"
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "คุณต้องการสร้างใบแจ้งหนี้จริงหรือไม่ ?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "การขายรายเดือน"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "ไม่สามารถยกเลิกรายการรับคำสั่งซื้อ"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "ที่อยู่ในการจัดส่ง"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "ยกเว้น"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "บริษัท"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "ประวัติ"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-
-#. module: sale
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "ปริมาณ"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "ข้อมูลอ้างอิง"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "ยกเลิก"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "สร้างใบแจ้งหนี้"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "รวมทั้งหมด ไม่รวมภาษี"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "อยู่ระหว่างการสั่งซื้อ"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "ชื่อ"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "ที่อยู่ในการจัดส่ง :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "การขายต่อลูกค้าใน 90 วันที่ผ่านมา"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "สร้างใบส่งสินค้า"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "รวมทั้งหมด รวมภาษี"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "การขายตามประเภทสินค้า"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "ยืนยันใบเสนอราคา"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "จัดกลุ่มตาม..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "สร้างใบแจ้งหนี้ใหม่"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "วิธีการจัดซื้อ"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "กำหนดให้เป็นแบบร่าง"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "ตรวจสอบ"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "ยืนยันการสั่งซื้อ"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "ภาษี"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "โทรสาร :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "ใบรายการรับ/จ่ายสินค้า"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "ผิดพลาด !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "ไม่สามารถยกเลิกใบสั่งขายได้"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "กรกฎาคม"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "จัดซื้อ"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "หน่วยอ้างอิง"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "ชำระแล้ว"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "วิเคราะห์การขาย"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "คุณสมบัติ"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "ใบเสนอราคา"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "การขาย"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "ราคาต่อหน่วย"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "เสร็จแล้ว"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "ใบแจ้งหนี้"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "สิ่งที่จะทำ"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "เดือน"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr ""
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "ราคา"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
 msgid "To Invoice"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "ใบเสนอราคา"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "มีนาคม"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract/Analytic Account"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
 msgstr ""
@@ -1659,28 +284,154 @@ msgstr ""
 msgid "Invoice Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "รายการที่ยังไม่ได้จัดส่งและแจ้งหนี้"
+
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1269
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
 #, python-format
 msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_ids:0
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "รวมทั้งหมด"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "วิเคราะห์บัญชี"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "รวม"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "ยกเลิกคำสั่งซื้อ"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
 msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
 msgstr ""
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "กันยายน"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "ภาษี"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: sale
@@ -1689,7 +440,20 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
 msgstr ""
@@ -1699,36 +463,130 @@ msgstr ""
 msgid "Sales Order Lines related to a Sales Order of mine"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
 #. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
 msgid "Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "ยกเว้นการขาย"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "ที่อยู่ใบแจ้งหนี้"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "สร้างใบแจ้งหนี้ใหม่"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "โทรสาร :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
 msgid "Sales Order"
 msgstr ""
 
@@ -1743,12 +601,8 @@ msgid "Sale Order Lines that are in 'done' state"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
 msgstr ""
 
 #. module: sale
@@ -1757,65 +611,400 @@ msgid "Confirmed"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "เงื่อนไขการชำระเงินปรกติ"
+
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
 msgid "Confirm"
 msgstr ""
 
 #. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: view:sale.order:0
+msgid "Unread messages"
 msgstr ""
 
 #. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "ที่อยู่ในการจัดส่ง"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
 #: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "รายการสั่งสินค้า"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "ส่วนลด (%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "ข้อมูลอ้างอิงใบสั่งซื้อ"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "ราคารวม"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "ใบเสนอราคาเก่า"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
 msgstr ""
 
 #. module: sale
-#: view:res.company:0
-msgid "Configuration"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/edi/sale_order.py:146
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "วันที่สร้าง"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "ที่อยู่ใบแจ้งหนี้สำหรับใบสั่งขายนี้"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "จำนวนที่สั่งซื้อ"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "จำนวน"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "รวม :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "การขายของฉัน"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "กรกฎาคม"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
 #, python-format
 msgid "EDI Pricelist (%s)"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "วันที่เสนอราคา"
+
 #. module: sale
 #: view:sale.order:0
-msgid "Print Order"
+msgid "Order Date"
+msgstr "วันที่สั่งซื้อ"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
 
 #. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-msgid "Sales order created in current year"
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "พาร์ตเนอร์"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "ส่วนลด (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1824,19 +1013,28 @@ msgid ""
 "2.The Sales Order Line is Invoiced!"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
 msgstr ""
 
 #. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
 #. module: sale
@@ -1845,17 +1043,35 @@ msgid "December"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
+#: view:sale.config.settings:0
+msgid "Contracts Management"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "จัดส่งแล้ว"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "เดือน"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
@@ -1864,34 +1080,106 @@ msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr ""
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "ประเภทของสินค้า"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "ใบเสนอราคาเก่า"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
+#: code:addons/sale/sale.py:557
 #, python-format
-msgid "Advance Invoice"
+msgid "Cannot cancel this sales order!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:624
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "ชื่อร้าน"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
 #, python-format
-msgid "The sales order '%s' has been cancelled."
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "ภาษี :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "กำลังดำเนินการ"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "ไม่ได้ระบุลูกค้า !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
@@ -1899,6 +1187,16 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "ชำระแล้ว"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1913,6 +1211,18 @@ msgid ""
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -1920,55 +1230,166 @@ msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "มิถุนายน"
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
+#: view:sale.order.line:0
+msgid "Order"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "ร้าน"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "สถิติใบสั่งขาย"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "รายการใบสั่งขาย"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "พฤศจิกายน"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "คำนวณ"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "ยกเว้น"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "ตุลาคม"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
 
 #. module: sale
@@ -1981,31 +1402,97 @@ msgstr ""
 msgid "Sales Order in Progress"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "ประวัติ"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2013,56 +1500,225 @@ msgstr ""
 msgid "Date Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "รายการราคา"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr ""
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "การขาย"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "วัน"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
 msgstr ""
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "ราคาต่อหน่วย"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "เสร็จแล้ว"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "ที่อยู่ใบแจ้งหนี้ :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "ใบแจ้งหนี้"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "ใบเสนอราคา"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
 msgstr ""
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "สิ่งที่จะทำ"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "ที่อยู่ในการจัดส่ง :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "วิเคราะห์การขาย"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "รายการราคาสำหรับใบขายนี้"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "สร้างใบแจ้งหนี้"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
@@ -2071,17 +1727,152 @@ msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "ราคา"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "โทรศัพท์ :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "คุณต้องการสร้างใบแจ้งหนี้จริงหรือไม่ ?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "ข้อมูลอื่นๆ"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "ปริมาณ"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "ทีอยู่ในการจัดส่งสำหรับการสั่งซื้อครั้งนี้"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "ใบเสนอราคา / สั่งซื้อ"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr ""
@@ -2096,45 +1887,190 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Search Sales Order"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1255
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "Not enough stock ! : "
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "จากใบสั่งขาย"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2143,52 +2079,219 @@ msgid "Quotation N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
 msgstr ""
 
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "รวมทั้งหมด รวมภาษี"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "ส่งใบแจ้งหนี้แล้ว"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "ขายโดยพนักงานขายใน 90 วันที่ผ่านมา"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "อนุญาตให้คำนวณค่าจัดส่งในใบเสนอาราคา"
 
 #~ msgid "Payment Before Delivery"
 #~ msgstr "ชำระเงินก่อนจัดส่ง"
 
+#~ msgid "Order Line"
+#~ msgstr "รายการสั่งสินค้า"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "คำเตือน !"
+
 #~ msgid "All at Once"
 #~ msgstr "ทั้วหมดในครั้งเดียว"
 
 #~ msgid "VAT"
 #~ msgstr "ภาษีมูลค่าเพิ่ม (VAT)"
 
+#~ msgid "Inventory Moves"
+#~ msgstr "เคลื่อนย้ายสินค้า"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "ขายโดยพนักงานขาย"
+
+#~ msgid "State"
+#~ msgstr "สถานะ"
+
+#~ msgid "Dates"
+#~ msgstr "วันที่"
+
+#~ msgid "Packaging"
+#~ msgstr "การบรรจุหีบห่อ"
+
 #~ msgid "Configure"
 #~ msgstr "ตั้งค่า"
 
+#~ msgid "Conditions"
+#~ msgstr "เงื่อนไข"
+
+#~ msgid "Set to Draft"
+#~ msgstr "กำหนดให้เป็นแบบร่าง"
+
+#~ msgid "UoM"
+#~ msgstr "หน่วยนับ"
+
+#~ msgid "Delivery Order"
+#~ msgstr "ใบส่งสินค้า"
+
+#~ msgid "Notes"
+#~ msgstr "บันทึก"
+
+#~ msgid "Warehouse"
+#~ msgstr "คลังสินค้า"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "จำนวน"
+
+#~ msgid "All Quotations"
+#~ msgstr "ใบเสนอราคาทั้งหมด"
+
+#~ msgid "Sales By Month"
+#~ msgstr "การขายรายเดือน"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "คุณต้องการสร้างใบแจ้งหนี้จริงหรือไม่ ?"
 
+#~ msgid "Stock Moves"
+#~ msgstr "ย้ายสต๊อก"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "ไม่สามารถยกเลิกรายการรับคำสั่งซื้อ"
+
+#~ msgid "Companies"
+#~ msgstr "บริษัท"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "วันที่รับคำสั่งซื้อ"
 
+#~ msgid "Compute"
+#~ msgstr "คำนวณ"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "การขายต่อลูกค้าใน 90 วันที่ผ่านมา"
+
+#~ msgid "Name"
+#~ msgstr "ชื่อ"
+
+#~ msgid "on order"
+#~ msgstr "อยู่ระหว่างการสั่งซื้อ"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "สร้างใบส่งสินค้า"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "ค่าจัดส่ง"
 
 #~ msgid "Partial Delivery"
 #~ msgstr "จัดส่งบางส่วน"
 
+#~ msgid "Procurement Method"
+#~ msgstr "วิธีการจัดซื้อ"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "การขายตามประเภทสินค้า"
+
+#~ msgid "Procurement Order"
+#~ msgstr "ใบสั่งซื้อ"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "ไม่สามารถยกเลิกใบสั่งขายนี้ได้ !"
+
+#~ msgid "References"
+#~ msgstr "ข้อมูลอ้างอิง"
+
+#~ msgid "Total Tax Excluded"
+#~ msgstr "รวมทั้งหมด ไม่รวมภาษี"
+
+#~ msgid "Confirm Order"
+#~ msgstr "ยืนยันการสั่งซื้อ"
+
 #~ msgid "Order date"
 #~ msgstr "วันที่สั่งซื้อ"
 
 #~ msgid "title"
 #~ msgstr "คำนำหน้าชื่อ"
 
+#~ msgid "Validate"
+#~ msgstr "ตรวจสอบ"
+
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "ไม่สามารถยกเลิกใบสั่งขายได้"
+
+#~ msgid "Extra Info"
+#~ msgstr "ข้อมูลเพิ่มเติม"
+
+#~ msgid "Picking List"
+#~ msgstr "ใบรายการรับ/จ่ายสินค้า"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "ผิดพลาด !"
+
 #~ msgid "Sales Management"
 #~ msgstr "การบริหารการขาย"
+
+#~ msgid "Procurement"
+#~ msgstr "จัดซื้อ"
+
+#~ msgid "Reference UoM"
+#~ msgstr "หน่วยอ้างอิง"
+
+#~ msgid "Properties"
+#~ msgstr "คุณสมบัติ"
diff --git a/addons/sale/i18n/tlh.po b/addons/sale/i18n/tlh.po
index 3d26e3a4394..6fba6fc6ba3 100644
--- a/addons/sale/i18n/tlh.po
+++ b/addons/sale/i18n/tlh.po
@@ -6,19 +6,167 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+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: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
@@ -28,1627 +176,104 @@ msgid ""
 "yet been invoiced"
 msgstr ""
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr ""
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr ""
-
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
 msgstr ""
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "March"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
 #, python-format
-msgid "Invalid action !"
+msgid "Advance of %s %s"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
+#: view:sale.config.settings:0
+msgid "Contract Feature"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
+#: field:sale.report,state:0
 msgid "Order State"
 msgstr ""
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr ""
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-
-#. module: sale
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr ""
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr ""
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
 msgid "To Invoice"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract/Analytic Account"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
 msgstr ""
@@ -1658,28 +283,154 @@ msgstr ""
 msgid "Invoice Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr ""
+
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1269
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr ""
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
 #, python-format
 msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_ids:0
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
 msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
 msgstr ""
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
 msgstr ""
 
 #. module: sale
@@ -1688,7 +439,20 @@ msgid "Net Total :"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
 msgstr ""
@@ -1698,36 +462,130 @@ msgstr ""
 msgid "Sales Order Lines related to a Sales Order of mine"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr ""
+
 #. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
 msgid "Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
 msgid "Sales Order"
 msgstr ""
 
@@ -1742,12 +600,8 @@ msgid "Sale Order Lines that are in 'done' state"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
 msgstr ""
 
 #. module: sale
@@ -1756,65 +610,400 @@ msgid "Confirmed"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
 msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
 msgid "Confirm"
 msgstr ""
 
 #. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
+#: view:sale.order:0
+msgid "Unread messages"
 msgstr ""
 
 #. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
 #: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
 msgstr ""
 
 #. module: sale
-#: view:res.company:0
-msgid "Configuration"
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/edi/sale_order.py:146
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
 #, python-format
 msgid "EDI Pricelist (%s)"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
-msgid "Print Order"
+msgid "Order Date"
 msgstr ""
 
 #. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-msgid "Sales order created in current year"
+#: field:sale.report,partner_id:0
+msgid "Partner"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1823,19 +1012,28 @@ msgid ""
 "2.The Sales Order Line is Invoiced!"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
 msgstr ""
 
 #. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
 #. module: sale
@@ -1844,17 +1042,35 @@ msgid "December"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
+#: view:sale.config.settings:0
+msgid "Contracts Management"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
@@ -1863,34 +1079,106 @@ msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
+#: code:addons/sale/sale.py:557
 #, python-format
-msgid "Advance Invoice"
+msgid "Cannot cancel this sales order!"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:624
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
 #, python-format
-msgid "The sales order '%s' has been cancelled."
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
@@ -1898,6 +1186,16 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1912,6 +1210,18 @@ msgid ""
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -1919,55 +1229,166 @@ msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
 msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
+#: view:sale.order.line:0
+msgid "Order"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr ""
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
+#: selection:sale.order.line,state:0
+msgid "Exception"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
 
 #. module: sale
@@ -1980,31 +1401,97 @@ msgstr ""
 msgid "Sales Order in Progress"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
@@ -2012,56 +1499,225 @@ msgstr ""
 msgid "Date Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr ""
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
 msgstr ""
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
 msgstr ""
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
@@ -2070,17 +1726,152 @@ msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr ""
@@ -2095,45 +1886,190 @@ msgstr ""
 msgid "February"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr ""
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Search Sales Order"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1255
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "Not enough stock ! : "
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2142,16 +2078,58 @@ msgid "Quotation N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 6db99d8458e..30174f4410f 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -6,85 +6,518 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:46+0000\n"
 "Last-Translator: Raphael Collet (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: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Fatura Peşinatı"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Teklifi Onayla"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "Satış Kontrol Paneli"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Onaylama Tarihi"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Gruplandır..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
 "Sale Order Lines that are confirmed, done or in exception state and haven't "
 "yet been invoiced"
 msgstr ""
+"Onaylanmış, yapılmış ya da istisna durumundaki ve henüz faturalandırılmamış "
+"Satış Siparişi Satırı"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Satış elemanına göre son 90 gündeki satışlar"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Tahsisli Paydaş"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
+msgid ""
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Sipariş Durumu"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
-"Tek seferde teslimat için yeterli stok yoksa parçalı teslimat yapılmasını "
-"kabul eder misiniz ?"
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Faturalandırılacak"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Seçili satış siparişi için teslimat adresi"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Satış siparişinin onaylandığı tarih."
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Miktar"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Teklifler"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Gün"
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Mart"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Sözleşme/Analiz Hesabı"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Firma"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fatura Tarihi"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Faturalanmamış ve Teslim edilmiş Öğeler"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Önceden faturalanacak miktar."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Fatura İstisnası"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Toplam Miktar."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analiz Hesabı"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Ara Toplam"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Siparişi İptal Et"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "'%s' Teklifi satış siparişine çevrildi."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Ağırlık"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "Uyarı"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Satış Siparişi"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Eylül"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Vergiler"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Vergilendirilmemiş Tutar"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Net Toplam :"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "İptal edildi"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Benim Satış Siparişlerimle ilişkili Satış Siparişi Öğeleri"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Toplam"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Mağaza"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "İstisnai Satışlar"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Fatura Adresi"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Satış siparişinin oluşturulduğu tarih"
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Faturayı Yeniden Oluştur"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Faturaları Oluştur"
 
 #. module: sale
 #: report:sale.order:0
@@ -92,73 +525,647 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "Her Satış siparişi kalemi için üretim emirlerini sürer."
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Analiz Hesabı"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-"Bu listede faturalacak satış sipariş kalemleri bulunuyor. Sipariş "
-"kalemlerinin bir kısmını  faturalayabilirsiniz. Teslimatalara bağlı "
-"faturalama ya da tüm siparişi topluca faturalama yöntemlerini "
-"kullanıyorsanız bu listeye gereksiniminiz bulunmuyor."
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+msgid "Invalid Action!"
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Satınalma Siparişi"
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "İş ortağı"
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Onay Tarihi"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "Öğe #"
+
+#. module: sale
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Miktar #"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Faks:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "Satış Siparişi"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Miktar (Satış Birimi)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "'Yapıldı' durumundaki Satış Sipariş Öğeleri"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Peşinat Tutarı"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Onaylı"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Varsayılan Ödeme Şartı"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Onayla"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Sevkiyat Adresi"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Faturalandırılmaya hazır Satış Siparişi Satırları"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Aylık Gelir"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Yıl"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "Sipariş Kalemi"
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Henüz onaylanmamış Satış Siparişi"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
 msgstr ""
-"Satış siparişleri müşterilerinizin fiyat teklifleri ve siparişlerini "
-"yönetmenize yardımcı olur. OpenERP öncelikle fiyat teklifi oluşturarak "
-"başlamanızı öneriyor. Fiyat teklifi onaylandıktan sonra satış siparişine "
-"çevrilecektir. Satış siparişi sonrasında bir taslak fatura oluşturulacak ve "
-"müşteriye fatura edilmeden önce onaylanması gerekecektir."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Sipariş N°"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Sipariş Öğeleri"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "İnd.(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Sipariş Referansı"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Fatura Öğeleri"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Toplam Fiyat"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Eski Teklifleri"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Aynı müşteriye ait faturaları gruplamak için işaretleyin"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "Faturaları Yap"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "Saat"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Oluşturma Tarihi"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Bekleyen Planlama"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Şu anki sipariş için fatura adresi."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Sipariş edilen Miktarlar"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Satış siparişlerinin Veriliş Yılı"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Miktar"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Toplam :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Satışlarım"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Geçersiz İşlem !"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Mali Durum"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Temmuz"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "Satış Birimi"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "EDI Fiyat Listesi (%s)"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Teklif Tarihi"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Sipariş Tarihi"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "Teklifler ve Satışlar"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Paydaş"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Satış Fatura oluşturur"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "İndirim (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Aşağıdaki nedenlerden dolayı bu satış sipariş öğesi için fatura "
+"oluşturulamamaktadır:\n"
+"1.Satış sipariş öğesinin durumu \"taslak\" ya da \"iptal\" olarak "
+"belirlenmiştir.\n"
+"2.Satış sipariş öğesi zaten faturalanmıştır."
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Yapılan satış siparişi öğeleri"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Tekliflerim"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Aralık"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "Gönderildi"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Ay"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Satınalma (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Sıra No"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "Hiç öğesi olmayan bir satış siparişini onaylayamazsınız."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Faturalanmamış"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Ürün Kategorisi"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Mağaza Adı"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Vergiler :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Peşin Ödemeli Satış Faturası"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "İşlemde"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Tanımlı müşteri yok!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Faturaları Oluştur"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -176,1796 +1183,31 @@ msgstr ""
 "görev için geçirilen saat miktarı baz alınmalıdır."
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Öntanımlı Ödeme Şartı"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Durum"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "İnd.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Toplam Fiyat"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Aynı müşteriye ait faturaları gruplamak için işaretleyin"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Sipariş alınan miktar"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Satış elemanına göre satışlar"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Stok Hareketleri"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Sipariş Referansı"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Diğer Bilgiler"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Tarihler"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-"Teslimat politikası 'Paketlemeye göre faturalama' ya da 'Teslimat sonrası "
-"siparişten faturalama' ise faturalar otomatikman yaratılacak."
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Satış faturalarını oluştur"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "İndirim (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Tekliflerim (Bana Ait)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Satış Müdürü Kontrol Paneli"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Paketleme"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Bir Satış siparişinden"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Mağaza Adı"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Herhangi bir müşteri tanımlanmadı !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "İstisnai Satışlar"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Koşullar"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Varsayılan Ürün Kategori Özelliklerinde kategori gelir hesabı yok ya da Mali "
-"Konum  tanımlanmamış !"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Ağustos"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "Aynı üründen olmayan bir parti atamaya çalışıyorsunuz"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "test_durumu için geçersiz mod"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Haziran"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Bu sipariş iptal edilemiyor!"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Satış Siparişi İstatistikleri"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "Sipariş ile ilişkili döküm"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Ekim"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Teklifler"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Şu andaki sipariş için geçerli olan fiyat listesi"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Siparişin onaylanması ile ürünlerin müşteriye gönderilmesi arasında geçen "
-"gün sayısı"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Fiyat teklifinin verildiği gün"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Mali Durum"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "Ölçü Birimi"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Paketleri numarala"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "İşlemde"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Satıcı fiyat teklifini kabul etti. Siparişin durumu \"işlem devam ediyor\" "
-"olarak değiştirildi."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-"Öncelikle bu satış sipariş kalemine bağlı olan stok hareketlerini iptal "
-"etmelisiniz."
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "Uygulanabilir değil"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-"'Ön Ürün' olarak adlandırılmış servis türüne bir ürün seçin. Bir tane "
-"oluştun ve bu alan için varsayılan olarak ayarlayın."
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Tel :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-"\"Teslimat sonrası otomatik fatura\" olarak belirlenmiş sipariş ile ilgili "
-"bir değişiklik yapamazsınız."
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Notlar"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "Şu anki sipariş için fatura adresi."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Faturalandı"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Teslimat Emri"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Onaylanma Tarihi"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Teslim Sekli"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Tahsisli Paydaş"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Mart"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Toplam Miktar"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Ara Toplam"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Fatura Adresi:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-"Her satış siparişi sonrası, satılan ürünü temin edebilmek için "
-"tedarik/satınalma siparişi hazırlanır."
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-"Incoterm \"Uluslararası Ticari Terimler\"in kısaltması olup, teslim "
-"şekilleri ile ilgili terimleri içerir."
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Fatura Adresi"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "Faturalanmamış kalemlerde ara"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Teklif / Sipariş"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "Kalem Sayısı"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "Açık Faturalı Satışlar"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "Satış Siparişi Kalemi"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Depo"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Sipariş N°"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Sipariş Kalemleri"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Vergilendirilmemiş Miktar"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "Faturalanacak Kalemler"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Miktar (Ölçü Birimi)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Oluşturulma Tarihi"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Teslim edilmiş ve Faturalanmamış Kalemler"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Toplam :"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "Satışlarım"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "Geçersiz İşlem !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "İlave Bilgi"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Fiyat Listesi"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "Adet"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Sipariş Tarihi"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "Gönderildi"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Tüm Teklifler"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Eylül"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "Ürün Kategorisi"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Vergi :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Stok Hareketi"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Sipariş Durumu"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Gerçekten fatura(ları) oluşturmak istiyor musunuz?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Aylık Satışlar"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "Satış sipariş kalemleri iptal edilemiyor!"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "Emniyet Günleri"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "Satılan malzemenin tedarik edilmesi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Faturanın son halini oluştur"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Teslimat Adresi"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-"Satış siparişinin teslim edildiğini gösterir. Bu alan sadece iş düzenleyici "
-"başlatıldığı zaman güncellenir."
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Genişletilmiş Filtreler"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "İstisna"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Şirketler"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Geçmiş"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-"Bu liste satış siparişi için oluşturulmuş faturaların listesidir. Aynı satış "
-"siparişi birkaç kere faturalanmış olabilir (örneğin kaleme göre)"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Referansınız"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "Sipariş ya da fiyat teklifini isteyen kişinin isim ve adresi."
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-"Bu bölüm, güvenli olması için müşterilere söz verilecek teslimat süresine "
-"eklenecek gün sayısı."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "Mik."
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Referanslar"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "İptal"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Fatura Oluştur"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "KDV'siz Toplam"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "Faturanız başarıyla oluşturuldu!"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "Paydaşa göre Satış"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Sipariş veren Kişi"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "Açık Fatura"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "Bu şirket için satış belgesi bulunmuyor: \"%s\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Güç Tahsisi"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Sipariş"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "Gönderilen ya da sipariş edilen miktar esas alındı."
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "İlgili paketleme"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Ad"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Sevk Adresi :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "Son 90 gün için müşteri başına satış miktarı"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "Satış Siparişinin taslak hali"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "Nakliye Siparişi oluştur"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "KDV Dahil Toplam"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "Paketleme listesi oluştur"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "Ürün Kategorisine göre satışlar"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Teklifi Onayla"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Hata"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Grupla..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Faturayı Yeniden Oluştur"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "Faturalanacak Gönderiler"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Bekleme Takvimi"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Satınalma Yöntemi"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "Seçim Listesi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Taslağa  Ayarla"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "Çıkışa ya da müşteriyeyapılan hareket belgesi."
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Doğrula"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Siparişi Onayla"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "Satınalma Siparişi Oluştur"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Vergiler"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "Satış siparişinin oluşturulduğu gün"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "Stok Hareketi"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Faturaları Oluştur"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Faks:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "Peşin Miktar"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Gönderilen Miktar"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Satış Siparişleri Bağlı Fatura"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "Paketleme Listesi"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Hata !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "Satış siparişini iptal edemiyor !"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Temmuz"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Satınalma"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Hatalı Gönderim"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Faturaları Gruplandır"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Muhasebeci tarafından görülecek."
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "Kullanılan ölçü birimi"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
+msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
-msgstr "Satış SiparişSatırı Fatura_Kes"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Kuraldışı Fatura"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "Tedarik ve faturalamayı yönetir"
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Ödendi"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Satış Analizi"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "Paketlemeyi yeniden oluştur"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Özellikler"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Fiyat Teklifi"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-"Gönderi politikası \"Gönderi ve manüel fatura hazırlanıyor\" olarak "
-"seçilmişse, satış temsilcisi faturayı eliyle hazırlar. Eğer gönderi "
-"politikası \"Gönderimden önce Ödeme\" olarak seçilmişse, fatura otomatik "
-"olarak hazırlanır."
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-"Faturaları satış siparişlerine ya da gönderilenlere dayanarak "
-"oluşturabilirsiniz."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Satışlar"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Birim Fiyat"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Bitti"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Fatura"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"Satış formunda bir müşteri seçmelisiniz !\n"
-"Lütfen ürün seçmeden önce bir müşteri seçiniz."
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "Kaynak Belge"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Yapılacaklar"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "Paketleme Kuralı"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "Müşteriye işlenen hareket belgesi"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "KDV'siz tutar"
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-"Önce bu satış siparişine ait bütün paketleme işlemlerini iptal etmelisiniz."
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "Peşin Ödemeli Satış Faturası"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Ay"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Ürün"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Atamayı iptal et"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "satış.kurulum.paketleme_politikası"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Fatura Şekli"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Sipariş Tarihi"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Stok 2.Birim"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Manuel İşlem Devam Ediyor"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Ürün Ölçü Birimi"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Lojistik"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Sipariş"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "Bu ürün için tanımlanmış gelir hesabı bulunmuyor: \"%s\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "İstisnayı görmezden gel"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"Satış siparişinin faturalama kontrolüne bağlı olarak, fatura teslim edilen "
-"ya da sipariş edilen miktar esas alarak hazırlanmış olabilir. Böylelikle, "
-"bir satış siparişi satış temsilcisi onayladığı anda fatura ya da teslim fişi "
-"olarak hazırlanır."
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"%2f%s satmayı hedefliyorsunuz ama sadece %.2f%s var ! \n"
-"Asıl Stok %.2f%s. (rezervasyonlar hariç)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Durumlar"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Müşteri Sipariş Kodu"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Başlık:"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Fiyat"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "Faturaları hazırla"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "Faturalama"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "Satış siparişinin onaylandığı tarih."
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "Şirket"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "Fatura Tarihi"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "Önceden faturalanacak miktar."
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-"Bu liste, bu satış siparişi listesi için oluşturulan paketleme listesidir."
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Faturaları Oluştur"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "Net Toplam :"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "İptal edildi"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "İş Yeri"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "Tarih Onay"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Uyarı"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Aylık Satışlar"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "Satış Siparişi"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "Miktar (2.Br.)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-"Satış siparişi onaylanır onaylanmaz, tedarik siparişi ile eş zamanlı olarak "
-"paketleme listesi oluşturulur. Bu parçaların satış siparişine atanmasını "
-"temsil etmektedir. Satış sipariş kalemi içinde parçaların stokta "
-"bulunabilirliği ile bağlantılı olarak bir paketleme listesi vardır."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Onaylandı"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Onayla"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Hata! Yinelemeli şirketler oluşturamazsınız."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "Ürün kategorisine göre son 90 gündeki satışlar"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Fatura Kalemleri"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Satış Sipariş Kalemleri"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Teslimat Süresi"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Kurulum"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"Aşağıdaki nedenlerden dolayı bu satış sipariş kalemi için fatura "
-"oluşturulamamaktadır:\n"
-"1.Satış sipariş kaleminin durumu \"taslak\" ya da \"iptal\" olarak "
-"belirlenmiştir.\n"
-"2.Satış sipariş kalemi zaten faturalanmıştır."
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Ağırlık"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Faturalar"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "Aralık"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Resim"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-"Satış siparişi onaylandığı ya da fatura ödendiği anda tedarik siparişi "
-"otomatik olarak oluşturulur. Bu satış siparişi parametrelerini ve kuralları "
-"göz önünde bulundurarak satın alma ve ürünlerin üretimini yönetir. "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "Faturalanmamış"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Satış Temsilcisi"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Eski fiyat teklifleri"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Tutar"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "Fatura Peşinatı"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "'%s' satış siparişi iptal edilmiştir."
+msgstr "Satış SiparişÖğesi Fatura_Kes"
 
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Draft"
 msgstr "Taslak"
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Ödenmiş"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1990,64 +1232,190 @@ msgstr ""
 "* \"İptal\" seçeneği kullanıcı satış sipariş kalemini iptal ettiği zaman "
 "ayarlanır."
 
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr "Vergi miktarı."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr "Paketleme"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Satış Siparişleri"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Faturaları Gruplandır"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Vergi tutarı."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Durum"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Ağustos"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Satınalma ve faturalamayı yürütür"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Haziran"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr "Eposta Şablonları"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Sipariş"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Fiyat Listesi Uyarısı!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "Satış Mağazası"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Satış Siparişi İstatistikleri"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Tarih"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "Satış Siparişi Öğesi"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Kasım"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Genişletilmiş Süzgeçler..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "Gelişmiş Ürün"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Hesapla"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "İstisna"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Ekim"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"Gönderi politikası \"Gönderi ve manüel fatura hazırlanıyor\" olarak "
+"seçilmişse, satış temsilcisi faturayı eliyle hazırlar. Eğer gönderi "
+"politikası \"Gönderimden önce Ödeme\" olarak seçilmişse, fatura otomatik "
+"olarak hazırlanır."
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
-"Önce bu satış siparişine bağlı olan bütün faturaları iptal etmelisiniz."
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2059,91 +1427,331 @@ msgstr "Ocak"
 msgid "Sales Order in Progress"
 msgstr "İşlemdeki Satış Siparişleri"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Satış temsilcisi teklifi onaylıyor. Satış Siparişinin durumu \"İşlemde\" ya "
+"da \"Manuel ilemde\"olur."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr "Bu satış siparişi isteğini oluşturan belgenin referans numarası"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr "Teslimatta gecikme"
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Geçerli fiyat listesi öğesi bulunamadı!:"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: help:sale.config.settings,module_warning:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Ata"
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Taahhüt Gecikmesi"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Onaylı satış siparişi öğeleri, ancak henüz teslim edilmemiş"
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr "Geçmiş"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Bu liste satış siparişi için oluşturulmuş faturaların listesidir. Aynı satış "
+"siparişi birkaç kere faturalanmış olabilir (örneğin öğeye göre)"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Referansınız"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "Sipariş Tarihi"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Fiyat Listesi"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "Müşteri Faturaları"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
-msgstr "Faturalanacak onaylanmış satış siparişi"
+msgstr "Faturalanacak onaylı satış siparişi"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Satış Siparişi Öğeleri"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Satışlar"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Bu siparişin fiyat listesini değiştirirseniz (ve sonunda para birimini de), "
+"varolan sipariş öğeleri fiyatları güncellenmeyecektir."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Gün"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Faturalar"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Birim Fiyat"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Yapıldı"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Fatura adresi:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Fatura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Satış Siparişlerimin Öğeleri"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "İptal"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "'%s' satış siparişi taslak durumuna ayarlanmıştır."
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "Stoktan"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Kapat"
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
+msgstr "Fiyat Listesi yok ! : "
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Teklif"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Faturalanmamış Öğelerde Ara"
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Sevk edildi"
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Sipariş Referansı her Firma için benzersiz olmalı!"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "Bu ürün için üretim planı yapmalısınız"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
 msgstr ""
-"Eğer ürünlerinizi sattığınız birden fazla ofisiniz varsa, bunu buradan "
-"oluşturabilir ve yönetebilirsiniz."
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Yapılacaklar"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Sevk Adresi :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"Aynı paydaş için farklı para birimlerindeki satışları gruplandıramazsınız."
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Satış Analizi"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Geçerli satış siparişi için Fiyat listesi"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Fatura Oluştur"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "KDV hariç tutar"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Sipariş kaynağı"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2151,61 +1759,68 @@ msgid "It indicates that an invoice has been paid."
 msgstr "Faturanın ödendiğini gösterir."
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+"Halihazırda faturalandırılmış bir satış siparişi öğesini iptal edemezsiniz!"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Ürün"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Açıklama"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Mayıs"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Müşteri"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr "Gelişmiş"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr "Şubat"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr "Nisan"
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Muhasebe"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr "Satış siparişlerini ara"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "Satış Siparişi İsteği"
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
+#: code:addons/sale/sale.py:766
 #, python-format
-msgid "Not enough stock ! : "
+msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
-msgid "Payment Term"
-msgstr "Ödeme Vadesi"
+#: report:sale.order:0
+msgid "Price"
+msgstr "Fiyat"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_order_report_all
@@ -2223,32 +1838,363 @@ msgstr ""
 "analiz etmek istiyorsanız, muhasebe uygulamasındaki Fatura Analiz raporunu "
 "kullanmalısınız."
 
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Gerçekten fatura(ları) oluşturmak istiyor musunuz?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Diğer Bilgiler"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Mik"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Muhasebeci tarafından incelenecek."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Geçerli satış siparişi için teslimat adresi"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Teklif / Sipariş"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Müşteri"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Gelişmiş"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Şubat"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Fatura üzerine"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Sipariş Tarihi"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Ürün Sipariş Birimi"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Satış Siparişinin Taslak durumu"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Kaynak Belge"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Nisan"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manuel İşlem Devam Ediyor"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Satış Siparişlerim"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Satış siparişlerini ara"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Satış siparişlerinin verildiği ay"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Satış formunda bir fiyat listesi ya da müşteri seçmelisiniz!\n"
+"Ürünü seçmeden lütfen bir tane ayarlayın."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Bir Satış siparişinden"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "İstisnayı Görmezden gel"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Satış siparişinin faturalama kontrolüne bağlı olarak, fatura teslim edilen "
+"ya da sipariş edilen miktar esas alarak hazırlanmış olabilir. Böylelikle, "
+"bir satış siparişi satış temsilcisi onayladığı anda fatura ya da teslim fişi "
+"olarak hazırlanır."
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "Satış Siparişi ile ilişkili analiz hesabı"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Ödeme Şekli"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Faturalandırılmaya hazır Satış Siparişleri"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation N°"
-msgstr "Teklif No:"
+msgstr "Teklif N°"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Müşteri Referansı"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
-msgstr "Toplanma"
+msgstr "Toplanmış"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Yıl"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Teslimatlara Bağlı Fatura"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "KDV Dahil Toplam"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Faturalandı"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Satış siparişinin veriliş tarihi"
 
 #~ msgid "Partial Delivery"
 #~ msgstr "Kısmi Teslimat"
 
+#~ msgid "Delivery Order"
+#~ msgstr "Teslimat Emri"
+
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Fatura başarıyla oluşturuldu !"
 
+#~ msgid "Notes"
+#~ msgstr "Notlar"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "Stok Hareketleri"
+
 #~ msgid "Reference"
 #~ msgstr "Referans"
 
@@ -2267,12 +2213,22 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "All Sales Order"
 #~ msgstr "Tüm Satış Emirleri"
 
+#~ msgid "Warehouse"
+#~ msgstr "Depo"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Hata !"
+
 #~ msgid "Manual Description"
 #~ msgstr "Manuel Açıklama"
 
 #~ msgid "Total amount"
 #~ msgstr "Toplam Tutar"
 
+#~ msgid "Configuration"
+#~ msgstr "Yapılandırma"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Ödeme Hesapları"
 
@@ -2285,6 +2241,12 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Otomatik Bildiri"
 
+#~ msgid "Stock Moves"
+#~ msgstr "Stok Hareketleri"
+
+#~ msgid "Procurement"
+#~ msgstr "Satınalma"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "İşlem tanımlamasında geçersiz model adı."
 
@@ -2294,6 +2256,9 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Recreate Procurement"
 #~ msgstr "Yeniden Satınalma Oluştur"
 
+#~ msgid "Validate"
+#~ msgstr "Doğrula"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Elle Adlandırma"
 
@@ -2303,6 +2268,9 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Outgoing Products"
 #~ msgstr "Gönderilecek Ürünler"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Gönderilen Miktar"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Satış Mağazası"
 
@@ -2327,6 +2295,9 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Packing"
 #~ msgstr "Sevkiyat Paketlemesi"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Siparişi Onayla"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Sipariş Teslimatı Sonrası Fatura Çıkar"
 
@@ -2342,6 +2313,12 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Sales orders"
 #~ msgstr "Satış Siparişleri"
 
+#~ msgid "Close"
+#~ msgstr "Kapat"
+
+#~ msgid "All Quotations"
+#~ msgstr "Tüm Teklifler"
+
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Taslak Müşteri Faturası - Muhasebeci inceleyecek"
 
@@ -2363,6 +2340,9 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Order Ref"
 #~ msgstr "Sipariş Ref."
 
+#~ msgid "Salesman"
+#~ msgstr "Satış Temsilcisi"
+
 #~ msgid "Uninvoiced Lines"
 #~ msgstr "Faturalanmamış Kalemler"
 
@@ -2387,9 +2367,6 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Satış Sipariş Lojistiğini Ayarla"
 
-#~ msgid "Status"
-#~ msgstr "Durum"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Sevkiyat Paketleme Politikası"
 
@@ -2411,12 +2388,15 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Direct Delivery"
 #~ msgstr "Direk Teslimat"
 
+#~ msgid "Properties"
+#~ msgstr "Özellikler"
+
+#~ msgid "Compute"
+#~ msgstr "Hesapla"
+
 #~ msgid "Sales order lines"
 #~ msgstr "Satış Sipariş Kalemleri"
 
-#~ msgid "Sequence"
-#~ msgstr "Sıra No"
-
 #~ msgid "Other data"
 #~ msgstr "Diğer Bilgiler"
 
@@ -2462,8 +2442,8 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Purchase Pricelists"
 #~ msgstr "Alış Fiyat Listeleri"
 
-#~ msgid "Sale Order"
-#~ msgstr "Satış Siparişi"
+#~ msgid "Name"
+#~ msgstr "Adı"
 
 #~ msgid "New Quotation"
 #~ msgstr "Yeni Teklif"
@@ -2474,6 +2454,15 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Related invoices"
 #~ msgstr "Bağlı Faturalar"
 
+#~ msgid "States"
+#~ msgstr "Durumlar"
+
+#~ msgid "Accounting"
+#~ msgstr "Muhasebe"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Teslimatlara Bağlı Fatura"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Satış Siparişlerim (Bana Ait)"
 
@@ -2496,24 +2485,70 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr "Nesne adı x_ ile başlamalı ve özel karakterler içermemelidir!"
 
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Satış elemanına göre son 90 gündeki satışlar"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Uyarı !"
+
+#~ msgid "State"
+#~ msgstr "Durum"
+
 #~ msgid "Configure Picking Policy for Sales Order"
 #~ msgstr "Satış Siparişleri için Paketleme Politikasını Yapılandır"
 
+#~ msgid "Dates"
+#~ msgstr "Tarihler"
+
 #~ msgid "Configure"
 #~ msgstr "Yapılandır"
 
+#~ msgid "Conditions"
+#~ msgstr "Koşullar"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Siparişin onaylanması ile ürünlerin müşteriye gönderilmesi arasında geçen "
+#~ "gün sayısı"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "Sipariş numarasının referans no'su kendine özgü olmalı!"
 
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr "Temel Satış Uygulamasını ek işlevlerle geliştirin."
 
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr ""
+#~ "\"Teslimat sonrası otomatik fatura\" olarak belirlenmiş sipariş ile ilgili "
+#~ "bir değişiklik yapamazsınız."
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "Açık Faturalı Satışlar"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Gerçekten fatura(ları) oluşturmak istiyor musunuz?"
 
 #~ msgid "  Year  "
 #~ msgstr "  Yıl  "
 
+#~ msgid "Sales By Month"
+#~ msgstr "Aylık Satışlar"
+
+#~ msgid "Security Days"
+#~ msgstr "Emniyet Günleri"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "Satılan malzemenin tedarik edilmesi"
+
+#~ msgid "References"
+#~ msgstr "Referanslar"
+
 #~ msgid "Margins in Sales Orders"
 #~ msgstr "Satış sipariş sınırları"
 
@@ -2523,12 +2558,34 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "title"
 #~ msgstr "başlık"
 
+#~ msgid "Create Procurement Order"
+#~ msgstr "Satınalma Siparişi Oluştur"
+
 #~ msgid "Order date"
 #~ msgstr "Sipariş Tarihi"
 
+#~ msgid "Procurement Method"
+#~ msgstr "Satınalma Yöntemi"
+
+#~ msgid "Stock Move"
+#~ msgstr "Stok Hareketi"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Sadece Teslim Belgesi"
 
+#~ msgid "UoM"
+#~ msgstr "Ölçü Birimi"
+
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr ""
+#~ "Her satış siparişi sonrası, satılan ürünü temin edebilmek için "
+#~ "tedarik/satınalma siparişi hazırlanır."
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Miktar (Ölçü Birimi)"
+
 #~ msgid "Picking Default Policy"
 #~ msgstr "Öntanımlı Paketleme Politikası"
 
@@ -2536,6 +2593,9 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr "Faturalanmış olan satış sipariş kalemini iptal edemezsiniz !"
 
+#~ msgid "Number Packages"
+#~ msgstr "Paketleri numarala"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "Teslimat sonrası fatura"
 
@@ -2586,6 +2646,10 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ "    * Aya göre satışların grafiği\n"
 #~ "    "
 
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "Satış siparişini iptal edemiyor !"
+
 #, python-format
 #~ msgid "Picking Information !"
 #~ msgstr "Paketleme Bilgisi !"
@@ -2593,6 +2657,12 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Invoice From The Picking"
 #~ msgstr "Paketlenenden fatura"
 
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr ""
+#~ "Faturaları satış siparişlerine ya da gönderilenlere dayanarak "
+#~ "oluşturabilirsiniz."
+
 #~ msgid ""
 #~ "By default, OpenERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2603,12 +2673,44 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ "karmaşık konuları yönetebilmektedir. Bu da çalışanların ürünleri bir iki "
 #~ "basit işlem ve yöntemle müşteriye ulaştırabilmesine imkan sağlar."
 
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "Satış formunda bir müşteri seçmelisiniz !\n"
+#~ "Lütfen ürün seçmeden önce bir müşteri seçiniz."
+
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "satış.kurulum.paketleme_politikası"
+
 #~ msgid "Invoicing"
 #~ msgstr "Faturalama"
 
+#~ msgid "Logistic"
+#~ msgstr "Lojistik"
+
+#~ msgid "Product UoM"
+#~ msgstr "Ürün Ölçü Birimi"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "%2f%s satmayı hedefliyorsunuz ama sadece %.2f%s var ! \n"
+#~ "Asıl Stok %.2f%s. (rezervasyonlar hariç)"
+
 #~ msgid "   Month   "
 #~ msgstr "   Ay   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Uyarı"
+
 #~ msgid ""
 #~ "The Shipping Policy is used to configure per order if you want to deliver as "
 #~ "soon as possible when one product is available or you wait that all products "
@@ -2618,12 +2720,45 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ "ürünlerinin gönderimini bir an önce gerçekleştirmek istiyorsanız ya da bütün "
 #~ "ürünlerin hazır olmasını bekleyecekseniz.."
 
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "Ürün kategorisine göre son 90 gündeki satışlar"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Ay-1    "
 
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Teslimat Süresi"
+
 #~ msgid "Payment Before Delivery"
 #~ msgstr "Teslimat Öncesi Ödeme"
 
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Satış siparişleri müşterilerinizin fiyat teklifleri ve siparişlerini "
+#~ "yönetmenize yardımcı olur. OpenERP öncelikle fiyat teklifi oluşturarak "
+#~ "başlamanızı öneriyor. Fiyat teklifi onaylandıktan sonra satış siparişine "
+#~ "çevrilecektir. Satış siparişi sonrasında bir taslak fatura oluşturulacak ve "
+#~ "müşteriye fatura edilmeden önce onaylanması gerekecektir."
+
+#~ msgid "Recreate Packing"
+#~ msgstr "Paketlemeyi yeniden oluştur"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Satış Müdürü Kontrol Paneli"
+
+#~ msgid "Packaging"
+#~ msgstr "Paketleme"
+
+#~ msgid "Set to Draft"
+#~ msgstr "Taslağa  Ayarla"
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -2671,6 +2806,13 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ "Birim satış fiyatı ve maliyeti arasındaki farkı hesaplayarak kar marjını "
 #~ "verir."
 
+#~ msgid "Sales by Month"
+#~ msgstr "Aylık Satışlar"
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "'%s' satış siparişi iptal edilmiştir."
+
 #~ msgid "Ordered Date"
 #~ msgstr "Sipariş Edilen Tarih"
 
@@ -2683,6 +2825,21 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "Satış Yönetimi Uygulamasını Kurun"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Hata"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr ""
+#~ "Önce bu satış siparişine bağlı olan bütün faturaları iptal etmelisiniz."
+
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "Faturanız başarıyla oluşturuldu!"
+
+#~ msgid "Assign"
+#~ msgstr "Ata"
+
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "Satış Sipariş Planlama Geliştirme"
 
@@ -2690,10 +2847,32 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ msgid "Not enough stock !"
 #~ msgstr "Yeterli stok yok !"
 
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "'%s' satış siparişi taslak durumuna ayarlanmıştır."
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "Onaylanmış satış sipariş(ler)ini silemezsiniz!"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "test_durumu için geçersiz mod"
+
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr "Bu ürün için tanımlanmış gelir hesabı bulunmuyor: \"%s\" (id:%d)"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr ""
+#~ "Satış siparişi onaylandığı ya da fatura ödendiği anda tedarik siparişi "
+#~ "otomatik olarak oluşturulur. Bu satış siparişi parametrelerini ve kuralları "
+#~ "göz önünde bulundurarak satın alma ve ürünlerin üretimini yönetir. "
+
 #~ msgid ""
 #~ "Allows you to group and invoice your delivery orders according to different "
 #~ "invoicing types: daily, weekly, etc."
@@ -2710,18 +2889,41 @@ msgstr "Teslimatlara Bağlı Fatura"
 #~ "Satış siparişi raporlarının düzenlemesini geliştirmek için bazı özelikler "
 #~ "sağlar."
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "Satış Siparişi İsteği"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "Aynı üründen olmayan bir parti atamaya çalışıyorsunuz"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr ""
+#~ "'Ön Ürün' olarak adlandırılmış servis türüne bir ürün seçin. Bir tane "
+#~ "oluştun ve bu alan için varsayılan olarak ayarlayın."
+
 #~ msgid "Invoicing journals"
 #~ msgstr "Faturalama Yevmiyeleri"
 
 #~ msgid "Layout Sequence"
 #~ msgstr "Yerleşim Sırası"
 
+#~ msgid "Document of the move to the customer."
+#~ msgstr "Müşteriye işlenen hareket belgesi"
+
 #~ msgid "Configure Sales Order Logistics"
 #~ msgstr "Satış Siparişi Lojistiğini Yapılandır"
 
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Teklifinizdeki teslimat maliyetlerini hesaplamanızı sağlar."
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Tek seferde teslimat için yeterli stok yoksa parçalı teslimat yapılmasını "
+#~ "kabul eder misiniz ?"
+
 #~ msgid "Adds commitment, requested and effective dates on Sales Orders."
 #~ msgstr "Satış Siparişlerine taahhüt, istenen ve yürürlük tarihlerini ekler."
 
@@ -2736,3 +2938,578 @@ msgstr "Teslimatlara Bağlı Fatura"
 
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "Satış iş akışı ve varsayılan değerleri ayarla"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "Görevlerin İşine Bağlı"
+
+#~ msgid "Print Quotation"
+#~ msgstr "Teklifi Yazdır"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "Ana Çalışma Süresi Birimi"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "Zaman Çizelgesine Bağlı"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "Teslimatlara bağlı fatura"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "Teslimat Emirlerine Bağlı"
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "Şirket adı benzersiz olmalı !"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "Referans her şirket için benzersiz olmalı!"
+
+#~ msgid "Month-1"
+#~ msgstr "Ay-1"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "Yapılandırma Hatası!"
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "Satış Siparişlerine bağlı"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Çeşitli"
+
+#~ msgid "Options"
+#~ msgstr "Seçenekler"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "Her ürün hazır olduğunda teslim et"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr ""
+#~ "Onaylanmış bir satış siparişini silmek için önce onu iptal etmelisiniz! Bir "
+#~ "satış siparişini iptal etmek için önce ilgili toplama ve telimat emirlerini "
+#~ "iptal etmelisiniz."
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "Tüm ürünleri tek seferde teslim et"
+
+#~ msgid "Sales order created in current month"
+#~ msgstr "Geçerli ayda oluşturulan satış siparişleri"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "Teslimattan önce ödeme"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "Toplama Bilgisi ! : "
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "%d Biriminde miktar seçtiniz.\n"
+#~ "Ancak bu seçilen paketlemeyle uyumlu değil.\n"
+#~ "Burada paketlemeye uygun olarak önerilen miktarlar var:\n"
+#~ "EAN: %s Miktar: %s ul Türü: %s"
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr ""
+#~ "Bu araç, doğru modülü kurmanıza ve sistemi müşterilerinizi faturalandırmada "
+#~ "kullandığınız yönteme göre yapılandırmanıza yardım edecektir."
+
+#~ msgid "Print Order"
+#~ msgstr "Sipariş Yazdır"
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "İstek üzerine teslimat & fatura"
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Fatura Politikası fatura ve teslimat işlemlerini senkronize etmek için "
+#~ "kullanılır.\n"
+#~ "  - 'Teslimattan önce öde' seçimi önce faturayı oluşturur ve sonra faturanın "
+#~ "ödenmesi üzerine toplama emrini oluşturur.\n"
+#~ "  - 'Teslim et & istenirse Fatura kes' toplama emrini doğrudan oluşturacak "
+#~ "ve kullanıcının elle 'Fatura' düğmesini tıklayarak satış siparişine ve satış "
+#~ "siparişi satırlarına göre fatura oluşturmasını bekleyecek.\n"
+#~ "  - 'Sipariş tesliminde sonra Fatura' seçimi bütün toplama listeleri "
+#~ "tamamlandıktan sonra satış siparişine göre taslak fatura oluşturacaktır.\n"
+#~ "  - 'Teslimata dayalı fatura' seçimi toplama işlemi sırasında fatura "
+#~ "oluşturmak için kullanılır."
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "Teklifin ya da satış siparişinin durumunu verir. \n"
+#~ "İstisna durumu fatura doğrulamasında (Fatura İstisnası) iptal işlemi "
+#~ "oluşursa otomatikman ayarlanır ya da toplama listesi işleminde (Naklie "
+#~ "İstisnası). \n"
+#~ "'Bekleyen Program) durumu fatura onaylandığında ama programcının sipariş "
+#~ "tarihini çalıştırmasının beklendiğinde ayarlanır."
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "Yeterli stok yok !: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Hello${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Here is your order confirmation for ${object.partner_id.name}:\n"
+#~ "       | Order number: *${object.name}*\n"
+#~ "       | Order total: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Order date: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Order reference: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Your reference: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "You can view the order confirmation, download it and even pay online using "
+#~ "the following link:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "It is also possible to directly pay with Paypal:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "If you have any question, do not hesitate to contact us.\n"
+#~ "\n"
+#~ "\n"
+#~ "Thank you for choosing ${object.company_id.name}!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Phone: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+#~ msgstr ""
+#~ "\n"
+#~ "Merhaba${object.partner_order_id.name and ' ' or "
+#~ "''}${object.partner_order_id.name or ''},\n"
+#~ "\n"
+#~ "Bu siparişiniz için onay ${object.partner_id.name}:\n"
+#~ "       | Sipariş numarası: *${object.name}*\n"
+#~ "       | Sipariş toplamı: *${object.amount_total} "
+#~ "${object.pricelist_id.currency_id.name}*\n"
+#~ "       | Sipariş tarihi: ${object.date_order}\n"
+#~ "       % if object.origin:\n"
+#~ "       | Sipariş referansı: ${object.origin}\n"
+#~ "       % endif\n"
+#~ "       % if object.client_order_ref:\n"
+#~ "       | Referansınız: ${object.client_order_ref}<br />\n"
+#~ "       % endif\n"
+#~ "       | İlgili Kişiniz: ${object.user_id.name} ${object.user_id.user_email "
+#~ "and '<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "\n"
+#~ "Aşağıdaki linkten sipariş onayınızı izleyebilir, indirebilir ve hatta "
+#~ "çevrimiçi ödeme yapabilirsiniz:\n"
+#~ "    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+#~ "\n"
+#~ "% if object.order_policy in ('prepaid','manual') and "
+#~ "object.company_id.paypal_account:\n"
+#~ "<% \n"
+#~ "comp_name = quote(object.company_id.name)\n"
+#~ "order_name = quote(object.name)\n"
+#~ "paypal_account = quote(object.company_id.paypal_account)\n"
+#~ "order_amount = quote(str(object.amount_total))\n"
+#~ "cur_name = quote(object.pricelist_id.currency_id.name)\n"
+#~ "paypal_url = \"https://www.paypal.com/cgi-"
+#~ "bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+#~ "unt=%s\" \\\n"
+#~ "             "
+#~ "\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+#~ "_%s\" % \\\n"
+#~ "             "
+#~ "(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+#~ "e)\n"
+#~ "%>\n"
+#~ "Paypal ile doğrudan ödemeniz de olasıdır:\n"
+#~ "    ${paypal_url}\n"
+#~ "% endif\n"
+#~ "\n"
+#~ "Eğer bir sorunuz olursa bize danışmakta tereddüt etmeyin.\n"
+#~ "\n"
+#~ "\n"
+#~ "Firmamız ${object.company_id.name} seçtiğiniz için teşekkür ederiz!\n"
+#~ "\n"
+#~ "\n"
+#~ "--\n"
+#~ "${object.user_id.name} ${object.user_id.user_email and "
+#~ "'<%s>'%(object.user_id.user_email) or ''}\n"
+#~ "${object.company_id.name}\n"
+#~ "% if object.company_id.street:\n"
+#~ "${object.company_id.street or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.street2:\n"
+#~ "${object.company_id.street2}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.city or object.company_id.zip:\n"
+#~ "${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.country_id:\n"
+#~ "${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+#~ "or ''} ${object.company_id.country_id.name or ''}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.phone:\n"
+#~ "Telefon: ${object.company_id.phone}\n"
+#~ "% endif\n"
+#~ "% if object.company_id.website:\n"
+#~ "${object.company_id.website or ''}\n"
+#~ "% endif\n"
+#~ "            "
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr ""
+#~ "Çıkış konumunun yapılandırmasına bağlı olarak, müşteri ile çıkış konumu "
+#~ "arasındaki hareket Teslimat Emri yoluyla elle ya da otomatik olarak yapılır."
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr ""
+#~ "Eğer 'siparişte' ise, satış siparişi bir görev oluşturmak üzere onaylanırsa "
+#~ "bir satınalmayı başlatır, satınalma siparişi ya da üretim emri bu satış "
+#~ "siparişi öğesine bağlantılıdır."
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "Bu ürün ve miktarla eşleşen bir fiyat listesi bulunamadı.\n"
+#~ "Hem ürünü hem de miktarı ya da fiyat listesini değiştirmelisiniz."
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr "Her satış siparişi öğesi ve her bileşen için bir Satınalma İşlemi."
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "'%s' Teklifi satış siparişine dönüştürüldü."
+
+#~ msgid "Procurement Order"
+#~ msgstr "Satınalma Emri"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr ""
+#~ "Bu listede faturalanacak satış siparişi öğeleri bulunuyor. Sipariş "
+#~ "öğelerinin bir kısmını  faturalayabilirsiniz. Teslimatalara bağlı faturalama "
+#~ "ya da tüm siparişi topluca faturalama yöntemlerini kullanıyorsanız bu "
+#~ "listeye gereksiniminiz bulunmuyor."
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "Her Satış öğesi satırı için satınalma emirlerini yürütür."
+
+#~ msgid "Order Line"
+#~ msgstr "Sipariş Öğesi"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Satış temsilcisine göre satışlar"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr ""
+#~ "Teslimat politikası 'Toplamaya göre faturalama' ya da 'Teslimat sonrası "
+#~ "siparişe göre faturalama' ise faturalar otomatikman yaratılacak."
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Varsayılan Ürün Kategorisi Özelliklerinde kategori gelir hesabı yok ya da "
+#~ "Mali Durum tanımlanmamış !"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Bu satış siparişi iptal edilemiyor!"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "Uygulanamaz"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr ""
+#~ "Öncelikle bu satış siparişi öğesine bağlı olan stok hareketlerini iptal "
+#~ "etmelisiniz."
+
+#~ msgid "Incoterm"
+#~ msgstr "Uluslararası Teslim Biçimleri"
+
+#~ msgid "Line Sequence"
+#~ msgstr "Satır Sırası"
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr "Görünüm türündeki bir konuma ürün giriş çıkışı yapamazsınız."
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Vergisiz Tutar"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "Faturalanacak Öğeler"
+
+#~ msgid "Extra Info"
+#~ msgstr "Ek Bilgi"
+
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "Satış sipariş öğeleri iptal edilemiyor!"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Son Faturayı Oluştur"
+
+#~ msgid "Companies"
+#~ msgstr "Firmalar"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "Siparişin tesliminden sonra Faturala"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr ""
+#~ "Satış siparişinin teslim edildiğini gösterir. Bu alan sadece planlayıcı(lar) "
+#~ "başlatıldığı zaman güncellenir."
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "Sipariş ya da teklif isteyen kişinin adı ve adresi."
+
+#~ msgid "Total Tax Excluded"
+#~ msgstr "KDV hariç Toplam"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr ""
+#~ "Bu, emniyet açısından müşterilere söz verilen teslimat süresine eklenecek "
+#~ "gün sayısıdır."
+
+#~ msgid "on order"
+#~ msgstr "sipariş üzerine"
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "Oto-eposta onaylı satış siparişleri"
+
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr "Bu şirket için satış günlüğü bulunmuyor: \"%s\" (id:%d)"
+
+#~ msgid "Sales by Partner"
+#~ msgstr "Paydaşa göre Satışlar"
+
+#~ msgid "Open Invoice"
+#~ msgstr "Fatura Aç"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Sipariş İlgilisi"
+
+#~ msgid "Force Assignation"
+#~ msgstr "Tahsise Zorla"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "Gönderilen ya da sipariş edilen miktarlara bağlı."
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr "'%s' durumundaki bir satış siparişi öğesi silinemiyor!"
+
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "Son 90 gündeki Müşteri başına Satışlar"
+
+#~ msgid "Related Picking"
+#~ msgstr "İlgili Toplama"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "Mik (Satış Birimi)"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "Teslimat Emri Oluştur"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "Faturalanacak Teslimatlar"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "Ürün Kategorisine göre Satışlar"
+
+#~ msgid "Create Pick List"
+#~ msgstr "Toplama Listesi Oluştur"
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "Çıkışa ya da müşteriye yapılan hareketin belgesi."
+
+#~ msgid "Pick List"
+#~ msgstr "Toplama Listesi"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Satış Siparişlerine Bağlı Fatura"
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "Teslimatı hesaba ekliyor musunuz?"
+
+#~ msgid "Picking List"
+#~ msgstr "Toplama Listesi"
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "Mik(Ölçü Birimi)"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "Gönderim İstisnası"
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "Fatura Yönteminizi Ayarlayın"
+
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr ""
+#~ "Incoterm, 'Uluslararası Ticaret Terimleri' için kullanılır, ticari "
+#~ "işlemlerde kullanılan bir dizi satış terimlerini kapsar."
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "Eğer ürünlerinizi sattığınız birden fazla mağazanız varsa, bunu buradan "
+#~ "oluşturabilir ve yönetebilirsiniz. Ne zaman yenş bir teklif ve satış "
+#~ "siparişi kaydedecek olsanız, bu mağazaya bağlı olunmalıdır. Mağaza aynı "
+#~ "zamanda her belirli satış için ürünlerin hanfi depodan teslim edileceğini "
+#~ "tanımlar."
+
+#~ msgid "Delivered"
+#~ msgstr "Teslim edildi"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "Bu ürün için bir üretim partisi girmeniz gerekir"
+
+#~ msgid "from stock"
+#~ msgstr "stoktan"
+
+#~ msgid "Packings"
+#~ msgstr "Paketlemeler"
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "Son ayda oluşturulan satış siparişleri"
+
+#~ msgid "Image"
+#~ msgstr "Görüntü"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "Geçerli yıldaki satış siparişleri"
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr ""
+#~ "Satış siparişi onaylanır onaylanmaz, tedarik siparişi ile eş zamanlı olarak "
+#~ "paketleme listesi oluşturulur. Bu parçaların satış siparişine atanmasını "
+#~ "temsil etmektedir. Satış sipariş öğesi içinde parçaların stokta "
+#~ "bulunabilirliği ile bağlantılı olarak bir paketleme listesi vardır."
+
+#~ msgid "Main Method Based On"
+#~ msgstr "Ana Yöntemin Dayanağı"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Hata! Özyinelemeli şirketler oluşturamazsınız."
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr ""
+#~ "Bu liste, bu satış siparişi listesi için oluşturulan toplama listesidir."
+
+#~ msgid "Cancel Assignation"
+#~ msgstr "Atamayı İptal et"
+
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr ""
+#~ "Önce bu satış siparişine ait bütün toplama işlemlerini iptal etmelisiniz."
+
+#~ msgid "Picking Policy"
+#~ msgstr "Toplama Kuralı"
+
+#~ msgid "Reference UoM"
+#~ msgstr "Referans Ölçü Birimi"
+
+#~ msgid "Invoice Policy"
+#~ msgstr "Fatura Kuralı"
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index a5eda90ccd3..c67fbc20632 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -6,19 +6,167 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2010-12-15 20:52+0000\n"
-"Last-Translator: Jay Vora <Unknown>\n"
+"Last-Translator: Jay Vora (Serpent Consulting Services) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Підтвердити Пропозицію"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
@@ -29,59 +177,344 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Партнер у долі"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_policy:0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Стан заявки"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Кількість"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Незаінвойсовані і доставлені позиції"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Виключення з інвойса"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Аналітичний рахунок"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Попередня сума"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
 msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Скасувати заявку"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Вага"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
+msgid "Quotation "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Заявка на продаж"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Податки"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Неоподаткована сума"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Разом :"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Разом"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Торгова точка"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Адреса інвойса"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Перестворити інвойс"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
 msgstr ""
 
 #. module: sale
@@ -90,73 +523,100 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Аналітичний рахунок"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_summary:0
 msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
+#: report:sale.order:0
+msgid "Fax :"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "Рядок заявки"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+msgid "(update)"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Затверджено"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
 msgstr ""
 
 #. module: sale
@@ -165,39 +625,157 @@ msgid "Default Payment Term"
 msgstr "Типовий термін оплати"
 
 #. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "Підтвердити"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Адреса доставки"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
 #: view:sale.report:0
-msgid "State"
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Рядки заявки"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Disc.(%)"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Рядки інвойса"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Очікує плану дій"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
 msgstr ""
 
 #. module: sale
@@ -207,463 +785,25 @@ msgstr "Замовлена кількість"
 
 #. module: sale
 #: view:sale.report:0
-msgid "Sales by Salesman"
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Рух запасів"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Знижка (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Мої пропозиції"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
 msgstr ""
 
 #. module: sale
+#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-msgid "TVA :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "ОВ"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Примітки"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Заінвойсовано"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Доставити Замовлення"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "Партнер у долі"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Попередня сума"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Адреса інвойса:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Адреса інвойса"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Склад"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Рядки заявки"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Сума без податку"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
 #: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Незаінвойсовані і доставлені позиції"
+msgid "Quantity"
+msgstr "Кількість"
 
 #. module: sale
 #: report:sale.order:0
@@ -676,32 +816,92 @@ msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
 #, python-format
 msgid "Invalid action !"
 msgstr "Невірна дія !"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Додаткова інформація"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Прейскурант"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1327
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
 #, python-format
-msgid "Hour"
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
 msgstr ""
 
 #. module: sale
@@ -710,101 +910,413 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Всі пропозиції"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Знижка (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Мої пропозиції"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
-msgid "September"
+msgid "December"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:632
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Порядок"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
 msgid "Category of Product"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Складські Переміщення"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "Стан заявки"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
+#: code:addons/sale/sale.py:658
 #, python-format
-msgid "Could not cancel sales order line!"
+msgid "Invoice has been <b>paid</b>."
 msgstr ""
 
 #. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Створити інвойси"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Чорновик"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Оплачено"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Замовлення на Продаж"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Групувати інвойси"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Статус"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Адреса доставки"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
 
 #. module: sale
-#: help:sale.order,shipped:0
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
 msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
 msgstr ""
 
 #. module: sale
@@ -812,46 +1324,156 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
+#: selection:sale.report,month:0
+msgid "October"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,state:0
+#: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1272
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Замовлення на Продаж на Виконанні"
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:958
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "History"
 msgstr "Історія"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
 
 #. module: sale
@@ -868,27 +1490,101 @@ msgid "Your Reference"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: field:sale.report,date:0
+msgid "Date Order"
 msgstr ""
 
 #. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Прейскурант"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "К-сть"
+msgid "Sales Order Lines"
+msgstr "Рядки заявки на продаж"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Продажі"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "References"
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
 msgstr ""
 
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Ціна за од."
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Виконано"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Адреса інвойса:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Інвойс"
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "My Sales Order Lines"
@@ -896,562 +1592,64 @@ msgstr ""
 
 #. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "Скасувати"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Комерційна пропозиція"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Створити інвойс"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Контакти замовника"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "на заявку"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Назва"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Адреса доставки :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Підтвердити Пропозицію"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Перестворити інвойс"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Очікує плану дій"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Зробити чорновиком"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Підтвердити"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Підтвердити ордер"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Податки"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr ""
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Відвантажена кількість"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Постачання"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Виключення з доставки"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Групувати інвойси"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Виключення з інвойса"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Оплачено"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Властивості"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Комерційна пропозиція"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Продажі"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Ціна за од."
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Виконано"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Інвойс"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
 #. module: sale
@@ -1460,61 +1658,232 @@ msgid "To Do"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Адреса доставки :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Створити інвойс"
+
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:604
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:822
 #, python-format
-msgid "You must first cancel all picking attached to this sales order."
+msgid "You cannot cancel a sale order line that has already been invoiced!"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
 msgstr ""
 
 #. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "Продукт"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
+#: report:sale.order:0
+msgid "Description"
+msgstr "Опис"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Ціна"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "К-сть"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Клієнт"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: sale
@@ -1522,6 +1891,17 @@ msgstr ""
 msgid "Invoice on"
 msgstr "Інвойс на"
 
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
@@ -1532,31 +1912,98 @@ msgstr "Дата заявки"
 msgid "Product UoS"
 msgstr ""
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "My Sale Orders"
 msgstr ""
 
 #. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Order"
+msgid "Search Sales Order"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
 msgstr ""
 
 #. module: sale
@@ -1574,566 +2021,55 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1251
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Стани"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
 msgstr ""
 
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Разом"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Ціна"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Створити інвойси"
-
 #. module: sale
 #: report:sale.order:0
-msgid "Net Total :"
-msgstr "Разом :"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "Торгова точка"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "Затверджено"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Підтвердити"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "Рядки інвойса"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Рядки заявки на продаж"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr ""
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Налаштування"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Вага"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Продавець"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Неоподаткована сума"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "Чорновик"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Замовлення на Продаж"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Розрахувати"
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "Замовлення на Продаж на Виконанні"
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "зі складу"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
-msgid "Description"
-msgstr "Опис"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "Клієнт"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr ""
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
-#, python-format
-msgid "Not enough stock ! : "
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Термін Оплати"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2142,18 +2078,60 @@ msgid "Quotation N°"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Відвантажено"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Заінвойсовано"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
 msgstr ""
 
 #~ msgid "Delivery, from the warehouse to the customer."
@@ -2165,6 +2143,12 @@ msgstr ""
 #~ msgid "Steps To Deliver a Sale Order"
 #~ msgstr "Стадії Доставки Замовлення на Продаж"
 
+#~ msgid "Validate"
+#~ msgstr "Підтвердити"
+
+#~ msgid "Delivery Order"
+#~ msgstr "Доставити Замовлення"
+
 #~ msgid ""
 #~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
 #~ "is, quotation is moved to  sale order."
@@ -2184,19 +2168,34 @@ msgstr ""
 #~ msgid "Recreate Procurement"
 #~ msgstr "Перестворити постачання"
 
+#~ msgid "from stock"
+#~ msgstr "зі складу"
+
 #~ msgid "Automatic Declaration"
 #~ msgstr "Автоматичнй опис"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Зробити чорновиком"
+
 #~ msgid ""
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Список відбірних листів, згенерованих для цього інвойса"
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Рух запасів"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Ручне позначення"
 
+#~ msgid "Notes"
+#~ msgstr "Примітки"
+
 #~ msgid "Shipping Policy"
 #~ msgstr "Політика постачання"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Виключення з доставки"
+
 #~ msgid "Origin"
 #~ msgstr "Походження"
 
@@ -2209,6 +2208,9 @@ msgstr ""
 #~ msgid "Procure Method"
 #~ msgstr "Метод постачання"
 
+#~ msgid "Extra Info"
+#~ msgstr "Додаткова інформація"
+
 #~ msgid "Net Price"
 #~ msgstr "Внутрішня ціна"
 
@@ -2230,45 +2232,72 @@ msgstr ""
 #~ msgid "All Sales Order"
 #~ msgstr "Всі заявки на продаж"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Відвантажена кількість"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Відділ продажу"
 
+#~ msgid "Warehouse"
+#~ msgstr "Склад"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Сума без податку"
+
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Моя заявка на продаж в очікуванні інвойса"
 
 #~ msgid "Manual Description"
 #~ msgstr "Ручний опис"
 
+#~ msgid "Confirm Order"
+#~ msgstr "Підтвердити ордер"
+
+#~ msgid "Configuration"
+#~ msgstr "Налаштування"
+
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Неправильний XML для Архітектури Вигляду!"
 
 #~ msgid "Sales orders"
 #~ msgstr "Замовлення на продаж"
 
+#~ msgid "Procurement"
+#~ msgstr "Постачання"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Рахунки платежу"
 
+#~ msgid "All Quotations"
+#~ msgstr "Всі пропозиції"
+
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "Заявка на продаж для інвойсування"
 
+#~ msgid "Order Line"
+#~ msgstr "Рядок заявки"
+
 #~ msgid "Canceled"
 #~ msgstr "Скасовано"
 
 #~ msgid "Order Ref"
 #~ msgstr "Заявка"
 
+#~ msgid "Salesman"
+#~ msgstr "Продавець"
+
 #~ msgid "My sales in shipping exception"
 #~ msgstr "Моя заявка на продаж у виключеннях доставки"
 
+#~ msgid "on order"
+#~ msgstr "на заявку"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "Постачання відкориговано"
 
 #~ msgid "Shipping & Manual Invoice"
 #~ msgstr "Відвантаження і інвойс вручну"
 
-#~ msgid "Status"
-#~ msgstr "Статус"
-
 #~ msgid "Packing Policy"
 #~ msgstr "Політика пакування"
 
@@ -2278,12 +2307,15 @@ msgstr ""
 #~ msgid "Our Salesman"
 #~ msgstr "Наш Менеджер"
 
-#~ msgid "Sale Order"
-#~ msgstr "Заявка на продаж"
-
 #~ msgid "Direct Delivery"
 #~ msgstr "Пряма Доставка"
 
+#~ msgid "Properties"
+#~ msgstr "Властивості"
+
+#~ msgid "Compute"
+#~ msgstr "Розрахувати"
+
 #~ msgid "VAT"
 #~ msgstr "ПДВ"
 
@@ -2293,12 +2325,12 @@ msgstr ""
 #~ msgid "Sales order lines"
 #~ msgstr "Рядки Замовлення на продаж"
 
-#~ msgid "Sequence"
-#~ msgstr "Порядок"
-
 #~ msgid "Other data"
 #~ msgstr "Інші дані"
 
+#~ msgid "UoM"
+#~ msgstr "ОВ"
+
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
 #~ msgstr ""
@@ -2316,6 +2348,12 @@ msgstr ""
 #~ msgid "Sales order"
 #~ msgstr "Замовлення на продаж"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "Контакти замовника"
+
 #~ msgid "Sales Management"
 #~ msgstr "Продажі"
 
@@ -2329,6 +2367,9 @@ msgstr ""
 #~ "The name and address of the contact that requested the order or quotation."
 #~ msgstr "Назва та адреса контакту, які вимагає заявка чи пропозиція"
 
+#~ msgid "Name"
+#~ msgstr "Назва"
+
 #~ msgid "Total amount"
 #~ msgstr "Загальна сума"
 
@@ -2355,6 +2396,12 @@ msgstr ""
 #~ "Список інвойсів, згенерованих для цієї заявки на продаж. На цю ж саму заявку "
 #~ "можуть бути оформлені інвойси декілька разів (наприклад, на рядок)."
 
+#~ msgid "States"
+#~ msgstr "Стани"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Складські Переміщення"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Моя заявка на продаж"
 
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index 962cbe75926..5a726499cc1 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -7,21 +7,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2012-05-10 17:54+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <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: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "Hóa đơn ứng trước"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Xác nhận báo giá"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
 msgstr ""
 
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Ngày xác nhận"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Nhóm theo..."
+
 #. module: sale
 #: view:sale.order.line:0
 msgid ""
@@ -29,1641 +177,104 @@ msgid ""
 "yet been invoiced"
 msgstr ""
 
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "Đơn hàng xếp theo người bán"
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr ""
-"Nếu bạn không có đủ hàng để giao hàng toàn bộ một lần, bạn có chấp nhận giao "
-"hàng từng phần hay không?"
-
-#. module: sale
-#: view:sale.order:0
-msgid "UoS"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "Địa chỉ chuyển hàng cho đơn hàng hiện tại"
-
-#. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "Số lượng"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "Ngày"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
-msgid "Cancel Order"
-msgstr "Huỷ Đơn đặt hàng"
-
-#. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "Đơn chào hàng '%s' đã được chuyển thành Đơn đặt hàng"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Quotation"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
-#, python-format
-msgid "Warning !"
-msgstr "Cảnh báo !"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tax"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "Tài khoản KTQT"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
-#, python-format
-msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "Lệnh Mua sắm"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
-msgstr "Đối tác"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "Sản phẩm đặt hàng"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
-msgstr ""
-"Sales Orders help you manage quotations and orders from your customers. You "
-"are suggested to start by creating a quotation. Once it is confirmed, the "
-"quotation will be converted into a Sales Order. The System can handle "
-"several types of products so that a sales order may trigger tasks, delivery "
-"orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer"
-
-#. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "Điều khoản thanh toán mặc định"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "Trạng thái"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "Chiết khấu.(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "Giá tổng"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "Đánh dấu để nhóm hóa đơn theo khách hàng"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "Số lượng chào hàng"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "Doanh số theo nhân viên bán hàng"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "Di chuyển hàng tồn kho"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "Số tham chiếu đơn chào hàng"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "Thông tin khác"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "Ngày"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "Làm hóa đơn bán hàng"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "Chiết khấu (%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "Báo giá của tôi"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "Bản điều khiển quản lý bán hàng"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "Đóng gói"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "Từ một đơn hàng"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "Tên cửa hàng"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "Không có khách hàng được thiết lập!"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "Bán hàng thuộc ngoại lệ"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "Điều kiện"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-"Không có tài khoản loại thu nhập được định nghĩa trong các đặc tính mặc định "
-"cho loại sản phẩm hoặc chức vụ tài chính không được thiết lập!"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "Tháng Tám"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "hình thức không hợp lệ cho trạng thái kiểm tra"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "Tháng Sáu"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "Không thể hủy hóa đơn bán hàng này"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "Thống kê đơn bán hàng"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "Tháng Mười"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "Các báo giá"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "Bảng giá cho đơn hàng hiện tại"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "TVA :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-"Số ngày từ lúc xác nhận đặt hàng tới lúc vận chuyển sản phẩm tới khách hàng"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "Ngày báo giá"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "Chức vụ tài chính"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "Đơn vị đo"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "Số lượng gói hàng"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "Đang thực hiện"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-"Nhân viên bán hàng xác nhận báo giá. Tình trạng hóa đơn sẽ chuyển sang "
-"\"Đang tiến hành\" hoặc \"Tiến hàng thủ công\"."
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "Điện thoại:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "Ghi chú"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "Đã xuất hóa đơn"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "Yêu cầu Giao hàng"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "Ngày xác nhận"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "Incoterm"
-
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
 msgid "Allotment Partner"
 msgstr "Đối tác phân phối"
 
 #. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "Tháng Ba"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "Tổng số tiền."
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "Tổng số phụ"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "Địa chỉ hóa đơn:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "Địa chỉ hóa đơn"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "Báo giá / Đơn chào hàng"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "Kho hàng"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "Số Đơn đặt hàng"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "Sản phẩm chào hàng"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "Số tiền không chịu thuế"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "Số lượng (Đơn vị đo)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "Ngày tạo"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "Sản phẩm không xuất hóa đơn và đã giao hàng"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "Tổng số:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
 #, python-format
-msgid "Invalid action !"
-msgstr "Hành động không hợp lệ!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "Thông tin bổ sung"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "Bảng giá"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
+msgid "Advance of %s %s"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
+#: view:sale.config.settings:0
+msgid "Contract Feature"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "Ngày đặt hàng"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "Tất cả báo giá"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "Tháng Chín"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "Thuế :"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "Dịch chuyển hàng tồn kho"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
+#: field:sale.report,state:0
 msgid "Order State"
 msgstr "Trạng thái đơn chào hàng"
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "Bạn có thật sự muốn tạo hóa đơn?"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "Doanh số theo tháng"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr ""
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "Tạo Hoá đơn cuối cùng"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "Địa chỉ giao hàng"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "Bộ lọc mở rộng..."
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "Ngoại lệ"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "Các công ty"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "Lịch sử"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "Tham chiếu của bạn"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr ""
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr ""
-
-#. module: sale
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "Số lượng"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "Các tham chiếu"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr ""
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "Hủy"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "Tạo hóa đơn"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "Thông tin liên hệ của người đặt hàng"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "Buộc phải uỷ thác"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "theo chào hàng"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "Tên"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "Địa chỉ giao hàng:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "Xác nhận báo giá"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "Lỗi"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "Nhóm theo..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Tạo lại hóa đơn"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "Lịch chờ"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "Phương pháp mua hàng"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "Đặt thành dự thảo"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "Xác nhận"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "Xác nhận đơn chào hàng"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "Thuế"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "Tạo các hóa đơn"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "Fax :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "Số lượng vận chuyển"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "Hóa đơn dựa trên đơn chào hàng"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "Lỗi!"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "Tháng Bảy"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "Thu mua hàng"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "Vận chuyển ngoại lệ"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "Phân loại hóa đơn"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "Chờ kế toán viên xem xét"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "ĐVĐ Tham chiếu"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "Hóa đơn ngoại lệ"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "Đã thanh toán"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "Phân tích Bán hàng"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "Đặc tính"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "Báo giá"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "Bán hàng"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "Đơn giá"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "Hoàn thành"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "Hóa đơn"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "Cần thực hiện"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "Tháng"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "Sản phẩm"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "Hủy phân phối"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "Hóa đơn theo"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "Ngày chào hàng"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "Đơn vị bán của sản phẩm"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "Đang thực hiện thủ công"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "Đơn vị đo của sản phẩm"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "Giao nhận"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "Đơn đặt hàng"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "Trạng thái"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "Tham chiếu của Khách hàng"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "Tổng"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "Giá"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
 msgid "To Invoice"
 msgstr ""
 
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sales order is confirmed."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Các báo giá"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Tháng Ba"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,project_id:0
 msgid "Contract/Analytic Account"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
 msgstr "Công ty"
@@ -1673,29 +284,155 @@ msgstr "Công ty"
 msgid "Invoice Date"
 msgstr "Ngày Hóa đơn"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Sản phẩm không xuất hóa đơn và đã giao hàng"
+
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1269
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Hóa đơn ngoại lệ"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
 #, python-format
 msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_ids:0
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Tổng số tiền."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Tài khoản KTQT"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Tổng số phụ"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+msgid "Cancel Order"
+msgstr "Huỷ Đơn đặt hàng"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Khối lượng"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Quotation "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
+#, python-format
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
 msgid ""
-"This is a list of picking that has been generated for this sales order."
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
 msgstr ""
 
 #. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "Tạo hóa đơn"
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "Đơn chào hàng"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Tháng Chín"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Thuế"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Số tiền không chịu thuế"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
 
 #. module: sale
 #: report:sale.order:0
@@ -1703,7 +440,20 @@ msgid "Net Total :"
 msgstr "Tổng số thực:"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
 #: selection:sale.report,state:0
 msgid "Cancelled"
 msgstr "Hủy"
@@ -1713,36 +463,130 @@ msgstr "Hủy"
 msgid "Sales Order Lines related to a Sales Order of mine"
 msgstr ""
 
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Tổng"
+
 #. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
 msgid "Shop"
 msgstr "Cửa hàng"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Bán hàng thuộc ngoại lệ"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Địa chỉ hóa đơn"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Tạo lại hóa đơn"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Tạo các hóa đơn"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
 msgstr "Ngày xác nhận"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "Cảnh báo"
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "Doanh thu theo tháng"
+#: help:sale.order,message_summary:0
+msgid ""
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
 
 #. module: sale
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
 msgid "Sales Order"
 msgstr "Đơn hàng"
 
@@ -1757,12 +601,8 @@ msgid "Sale Order Lines that are in 'done' state"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
 msgstr ""
 
 #. module: sale
@@ -1771,65 +611,400 @@ msgid "Confirmed"
 msgstr "Đã xác nhận"
 
 #. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Điều khoản thanh toán mặc định"
+
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
 msgid "Confirm"
 msgstr "Xác nhận"
 
 #. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "Lỗi ! Bạn không thể tạo các công ty đệ quy."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
+#: view:sale.order:0
+msgid "Unread messages"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Địa chỉ giao hàng"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Năm"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Số Đơn đặt hàng"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Sản phẩm chào hàng"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Chiết khấu.(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Số tham chiếu đơn chào hàng"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Sản phẩm lập hóa đơn"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "Sản phẩm đơn chào hàng"
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Giá tổng"
 
 #. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "Thời gian giao hàng"
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Báo giá cũ"
 
 #. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Cấu hình"
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/edi/sale_order.py:146
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Đánh dấu để nhóm hóa đơn theo khách hàng"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Ngày tạo"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Lịch chờ"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Số lượng chào hàng"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "Số lượng"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Tổng số:"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "Hành động không hợp lệ!"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Chức vụ tài chính"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Tháng Bảy"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
 #, python-format
 msgid "EDI Pricelist (%s)"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Ngày báo giá"
+
 #. module: sale
 #: view:sale.order:0
-msgid "Print Order"
+msgid "Order Date"
+msgstr "Ngày đặt hàng"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
 
 #. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
-msgid "Sales order created in current year"
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Đối tác"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Làm hóa đơn bán hàng"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Chiết khấu (%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1838,20 +1013,29 @@ msgid ""
 "2.The Sales Order Line is Invoiced!"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
 #. module: sale
 #: view:sale.order.line:0
 msgid "Sale order lines done"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "Khối lượng"
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Báo giá của tôi"
 
 #. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "Hóa đơn"
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1859,17 +1043,35 @@ msgid "December"
 msgstr "Tháng Mười hai"
 
 #. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "Hình ảnh"
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
 
 #. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Tháng"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "Thứ tự"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
@@ -1878,34 +1080,106 @@ msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "Nhân viên bán hàng"
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "Báo giá cũ"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "Số tiền không chịu thuế"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
+#: code:addons/sale/sale.py:557
 #, python-format
-msgid "Advance Invoice"
-msgstr "Hóa đơn ứng trước"
+msgid "Cannot cancel this sales order!"
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:624
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Tên cửa hàng"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
 #, python-format
-msgid "The sales order '%s' has been cancelled."
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Thuế :"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "Đang thực hiện"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Không có khách hàng được thiết lập!"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Tạo hóa đơn"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
 msgstr ""
 
 #. module: sale
@@ -1913,6 +1187,16 @@ msgstr ""
 msgid "Draft"
 msgstr "Dự thảo"
 
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Đã thanh toán"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
 #. module: sale
 #: help:sale.order.line,state:0
 msgid ""
@@ -1927,6 +1211,18 @@ msgid ""
 "* The 'Cancelled' state is set when a user cancel the sales order related."
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Đơn chào hàng"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Phân loại hóa đơn"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -1934,55 +1230,166 @@ msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "Trạng thái"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Tháng Tám"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
 msgstr ""
 
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Tháng Sáu"
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "Đơn chào hàng"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Đơn đặt hàng"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Thống kê đơn bán hàng"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "Tháng Mười một"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Bộ lọc mở rộng..."
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "Tính"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Ngoại lệ"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Tháng Mười"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
 msgstr ""
 
 #. module: sale
@@ -1995,88 +1402,325 @@ msgstr "Tháng Một"
 msgid "Sales Order in Progress"
 msgstr "Đơn chào hàng đang được thực hiện"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"Nhân viên bán hàng xác nhận báo giá. Tình trạng hóa đơn sẽ chuyển sang "
+"\"Đang tiến hành\" hoặc \"Tiến hàng thủ công\"."
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "Lịch sử"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "Chỉ định"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Tham chiếu của bạn"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr ""
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Bảng giá"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr ""
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Sản phẩm đơn chào hàng"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Bán hàng"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
 msgstr ""
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "theo nhu cầu dự báo"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Ngày"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "Đóng"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Hóa đơn"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Đơn giá"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Hoàn thành"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Địa chỉ hóa đơn:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "Hóa đơn"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Hủy"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr ""
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "Đã giao hàng"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Báo giá"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Cần thực hiện"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Địa chỉ giao hàng:"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Phân tích Bán hàng"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Bảng giá cho đơn hàng hiện tại"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Tạo hóa đơn"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
 msgstr ""
 
 #. module: sale
@@ -2085,17 +1729,152 @@ msgid "It indicates that an invoice has been paid."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Sản phẩm"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "Mô tả"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "Tháng Năm"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "Giá"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Điện thoại:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "Bạn có thật sự muốn tạo hóa đơn?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Thông tin khác"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Số lượng"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Chờ kế toán viên xem xét"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Địa chỉ chuyển hàng cho đơn hàng hiện tại"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Báo giá / Đơn chào hàng"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "Khách hàng"
@@ -2110,45 +1889,190 @@ msgstr ""
 msgid "February"
 msgstr "Tháng Hai"
 
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Hóa đơn theo"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Ngày chào hàng"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Đơn vị bán của sản phẩm"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "Tháng Tư"
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "Kế toán"
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Đang thực hiện thủ công"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Search Sales Order"
 msgstr "Tìm kiếm Đơn hàng"
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1255
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "Not enough stock ! : "
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Từ một đơn hàng"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "Điều khoản thanh toán"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2157,19 +2081,61 @@ msgid "Quotation N°"
 msgstr "Báo giá Số"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Tham chiếu của Khách hàng"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "Chọn"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "Năm"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "Hóa đơn dựa theo việc giao hàng"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Đã xuất hóa đơn"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
 
 #~ msgid "Partial Delivery"
 #~ msgstr "Giao hàng từng phần"
@@ -2177,12 +2143,31 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Automatic Declaration"
 #~ msgstr "Khai báo tự động"
 
+#~ msgid "Validate"
+#~ msgstr "Xác nhận"
+
+#~ msgid "Notes"
+#~ msgstr "Ghi chú"
+
 #~ msgid "Packing"
 #~ msgstr "Đóng gói"
 
+#~ msgid "Configuration"
+#~ msgstr "Cấu hình"
+
+#~ msgid "All Quotations"
+#~ msgstr "Tất cả báo giá"
+
 #~ msgid "Payment accounts"
 #~ msgstr "Tài khoản thanh toán"
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr ""
+#~ "Nếu bạn không có đủ hàng để giao hàng toàn bộ một lần, bạn có chấp nhận giao "
+#~ "hàng từng phần hay không?"
+
 #~ msgid "Make Invoice"
 #~ msgstr "Lập hóa đơn"
 
@@ -2190,6 +2175,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ "This is the list of picking list that have been generated for this invoice"
 #~ msgstr "Đây là danh sách các sản phẩm đã chọn được tạo ra cho hóa đơn này"
 
+#~ msgid "from stock"
+#~ msgstr "theo nhu cầu dự báo"
+
 #~ msgid ""
 #~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
 #~ "is, quotation is moved to  sale order."
@@ -2227,6 +2215,12 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Procurement is created after confirmation of sale order."
 #~ msgstr "Việc thu mua hàng được tạo sau khi có xác nhận của đơn chào hàng."
 
+#~ msgid "Shipping Exception"
+#~ msgstr "Vận chuyển ngoại lệ"
+
+#~ msgid "Close"
+#~ msgstr "Đóng"
+
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "Hóa đơn khách hàng dự thảo, sẽ được kế toán xem xét lại."
 
@@ -2239,6 +2233,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Payment Accounts"
 #~ msgstr "Tài khoản thanh toán"
 
+#~ msgid "Packaging"
+#~ msgstr "Đóng gói"
+
 #~ msgid "Recreate Procurement"
 #~ msgstr "Tạo lại mua hàng"
 
@@ -2251,12 +2248,21 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "Hóa đơn của bạn đã được tạo thành công!"
 
+#~ msgid "Set to Draft"
+#~ msgstr "Đặt thành dự thảo"
+
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "Giao hàng, từ kho đến khách hàng."
 
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "Sau khi xác nhận yêu cầu, tạo hóa đơn."
 
+#~ msgid "Inventory Moves"
+#~ msgstr "Di chuyển hàng tồn kho"
+
 #~ msgid "Manual Designation"
 #~ msgstr "Lựa chọn thủ công"
 
@@ -2284,6 +2290,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Procure Method"
 #~ msgstr "Phương pháp thu mua hàng"
 
+#~ msgid "Extra Info"
+#~ msgstr "Thông tin bổ sung"
+
 #~ msgid "Net Price"
 #~ msgstr "Giá thực"
 
@@ -2306,18 +2315,43 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ "Bạn phải chọn một khách hàng trong mẫu bán hàng!\n"
 #~ " Vui lòng thiết lập một khách hàng trước khi chọn sản phẩm."
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "Số lượng vận chuyển"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "Hóa đơn dựa trên đơn chào hàng"
+
 #~ msgid "Sale Shop"
 #~ msgstr "Cửa hàng bán hàng"
 
+#~ msgid "Warehouse"
+#~ msgstr "Kho hàng"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "Số tiền không chịu thuế"
+
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "Đơn chào hàng của tôi đang chờ Hóa đơn"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "Lỗi!"
+
 #~ msgid "Sale Order Procurement"
 #~ msgstr "Thu mua hàng cho đơn chào hàng"
 
 #~ msgid "Manual Description"
 #~ msgstr "Mô tả thủ công"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "Số lượng (Đơn vị đo)"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "Thời gian giao hàng"
+
+#~ msgid "Confirm Order"
+#~ msgstr "Xác nhận đơn chào hàng"
+
 #~ msgid "Invoice on Order After Delivery"
 #~ msgstr "Lập hóa đơn theo đặt hàng sau khi giao hàng"
 
@@ -2336,9 +2370,15 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Sales orders"
 #~ msgstr "Đơn chào hàng"
 
+#~ msgid "Procurement"
+#~ msgstr "Thu mua hàng"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "Hóa đơn dự thảo"
 
+#~ msgid "Order Line"
+#~ msgstr "Sản phẩm đặt hàng"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "Chính sách đóng gói mặc định"
 
@@ -2358,6 +2398,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Order Ref"
 #~ msgstr "Số tham chiếu đặt hàng"
 
+#~ msgid "Salesman"
+#~ msgstr "Nhân viên bán hàng"
+
 #~ msgid ""
 #~ "In sale order , procuerement for each line and it comes into the procurement "
 #~ "order"
@@ -2384,6 +2427,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Sales Configuration"
 #~ msgstr "Cấu hình bán hàng"
 
+#~ msgid "on order"
+#~ msgstr "theo chào hàng"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "Bạn có thật sự muốn tạo hóa đơn?"
 
@@ -2399,8 +2445,13 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Configure Sale Order Logistic"
 #~ msgstr "Thiết lập hậu cần đơn chào hàng"
 
-#~ msgid "Status"
-#~ msgstr "Trạng thái"
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr ""
+#~ "Không có tài khoản loại thu nhập được định nghĩa trong các đặc tính mặc định "
+#~ "cho loại sản phẩm hoặc chức vụ tài chính không được thiết lập!"
 
 #~ msgid "Packing Policy"
 #~ msgstr "Chính sách đóng gói bao bì"
@@ -2408,21 +2459,32 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Product sales"
 #~ msgstr "Bán sản phẩm"
 
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "hình thức không hợp lệ cho trạng thái kiểm tra"
+
 #~ msgid "Our Salesman"
 #~ msgstr "Nhân viên bán hàng của chúng tôi"
 
 #~ msgid "Create Advance Invoice"
 #~ msgstr "Tạo hóa đơn ứng trước"
 
-#~ msgid "Sale Order"
-#~ msgstr "Đơn chào hàng"
-
 #~ msgid "Sale Pricelists"
 #~ msgstr "Bảng giá bán hàng"
 
 #~ msgid "Direct Delivery"
 #~ msgstr "Giao hàng trực tiếp"
 
+#~ msgid "Properties"
+#~ msgstr "Đặc tính"
+
+#~ msgid "Compute"
+#~ msgstr "Tính"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "Lỗi"
+
 #, python-format
 #~ msgid ""
 #~ "You cannot make an advance on a sale order that is defined as 'Automatic "
@@ -2431,15 +2493,15 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ "Bạn không thể thực hiện ứng trước đối với một đơn chào hàng đã được định "
 #~ "nghĩa là 'Lập hóa đơn tự động sau khi giao hàng'."
 
+#~ msgid "Assign"
+#~ msgstr "Chỉ định"
+
 #~ msgid "Delivery Order Only"
 #~ msgstr "Chỉ yêu cầu giao hàng"
 
 #~ msgid "Sales order lines"
 #~ msgstr "Sản phẩm đơn chào hàng"
 
-#~ msgid "Sequence"
-#~ msgstr "Thứ tự"
-
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "Đóng gói OUT được tạo cho các sản phẩm có thể lưu trữ."
 
@@ -2459,6 +2521,16 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ "Trạng thái 'Lịch chờ' được thiết lập khi hóa đơn được xác nhận nhưng đang "
 #~ "chờ người lập lịch trình xử lý ngày 'Ngày đặt hàng'."
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "Cảnh báo"
+
+#~ msgid "UoM"
+#~ msgstr "Đơn vị đo"
+
+#~ msgid "Number Packages"
+#~ msgstr "Số lượng gói hàng"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2509,9 +2581,15 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Sale Invoice"
 #~ msgstr "Hóa đơn bán hàng"
 
+#~ msgid "Incoterm"
+#~ msgstr "Incoterm"
+
 #~ msgid "Open Advance Invoice"
 #~ msgstr "Hóa đơn ứng trước mở"
 
+#~ msgid "Ordering Contact"
+#~ msgstr "Thông tin liên hệ của người đặt hàng"
+
 #~ msgid "Deliver"
 #~ msgstr "Giao hàng"
 
@@ -2522,6 +2600,9 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Sale Order Line"
 #~ msgstr "Sản phẩm đơn chào hàng"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "Hủy phân phối"
+
 #~ msgid "Invoice from the Packing"
 #~ msgstr "Hóa đơn theo đóng gói"
 
@@ -2539,12 +2620,18 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "Không thể hủy đơn chào hàng đã được xác nhận!"
 
+#~ msgid "Name"
+#~ msgstr "Tên"
+
 #~ msgid "New Quotation"
 #~ msgstr "Báo giá mới"
 
 #~ msgid "Total amount"
 #~ msgstr "Tổng số"
 
+#~ msgid "Product UoM"
+#~ msgstr "Đơn vị đo của sản phẩm"
+
 #~ msgid ""
 #~ "By default, Open ERP is able to manage complex routing and paths of products "
 #~ "in your warehouse and partner locations. This will configure the most common "
@@ -2579,52 +2666,166 @@ msgstr "Hóa đơn dựa theo việc giao hàng"
 #~ "Đây là danh sách các hóa đơn đã được tạo cho đơn chào hàng này. Cùng đơn "
 #~ "chào hàng có thể được lập hóa đơn nhiều lần (ví dụ như theo dòng)."
 
+#~ msgid "States"
+#~ msgstr "Trạng thái"
+
 #, python-format
 #~ msgid "You must first cancel all invoices attached to this sale order."
 #~ msgstr ""
 #~ "Đầu tiên bạn phải hủy tất cả các hóa đơn gắn liền với đơn chào hàng này."
 
+#~ msgid "Accounting"
+#~ msgstr "Kế toán"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "Hóa đơn dựa theo việc giao hàng"
+
+#~ msgid "Stock Moves"
+#~ msgstr "Dịch chuyển hàng tồn kho"
+
 #~ msgid "My Sales Order"
 #~ msgstr "Đơn chào hàng của tôi"
 
 #~ msgid "Sale Order line"
 #~ msgstr "Sản phẩm đơn chào hàng"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Cảnh báo !"
+
+#~ msgid "State"
+#~ msgstr "Trạng thái"
+
+#~ msgid "Dates"
+#~ msgstr "Ngày"
+
+#~ msgid "Conditions"
+#~ msgstr "Điều kiện"
+
+#~ msgid "Procurement Order"
+#~ msgstr "Lệnh Mua sắm"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "Doanh số theo nhân viên bán hàng"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "Lỗi: mã EAN không hợp lệ"
 
 #~ msgid "  Year  "
 #~ msgstr "  Năm  "
 
+#~ msgid "Sales By Month"
+#~ msgstr "Doanh số theo tháng"
+
 #~ msgid "   Month   "
 #~ msgstr "   Tháng   "
 
+#~ msgid "Sales by Month"
+#~ msgstr "Doanh thu theo tháng"
+
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "Lỗi ! Bạn không thể tạo các công ty đệ quy."
+
 #~ msgid "    Month-1    "
 #~ msgstr "    Tháng-1    "
 
+#~ msgid "Image"
+#~ msgstr "Hình ảnh"
+
+#~ msgid "Companies"
+#~ msgstr "Các công ty"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Phương pháp mua hàng"
+
 #~ msgid "Order date"
 #~ msgstr "Ngày đặt hàng"
 
 #~ msgid "Invoicing"
 #~ msgstr "Hóa đơn"
 
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "Đơn hàng xếp theo người bán"
+
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "Cho phép bạn tính toán chi phí giao hàng trên Đơn chào hàng của bạn"
 
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "Đơn chào hàng '%s' đã được chuyển thành Đơn đặt hàng"
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "Sales Orders help you manage quotations and orders from your customers. You "
+#~ "are suggested to start by creating a quotation. Once it is confirmed, the "
+#~ "quotation will be converted into a Sales Order. The System can handle "
+#~ "several types of products so that a sales order may trigger tasks, delivery "
+#~ "orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer"
+
 #~ msgid "VAT"
 #~ msgstr "Thuế GTGT"
 
+#~ msgid "Force Assignation"
+#~ msgstr "Buộc phải uỷ thác"
+
 #~ msgid "Configure"
 #~ msgstr "Cấu hình"
 
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "Bản điều khiển quản lý bán hàng"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/a)"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr ""
+#~ "Số ngày từ lúc xác nhận đặt hàng tới lúc vận chuyển sản phẩm tới khách hàng"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "Không thể hủy hóa đơn bán hàng này"
+
+#~ msgid "Create Final Invoice"
+#~ msgstr "Tạo Hoá đơn cuối cùng"
+
+#~ msgid "References"
+#~ msgstr "Các tham chiếu"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "Chi phí giao hàng"
 
+#~ msgid "Reference UoM"
+#~ msgstr "ĐVĐ Tham chiếu"
+
 #~ msgid "sale.installer"
 #~ msgstr "sale.installer"
 
+#~ msgid "Logistic"
+#~ msgstr "Giao nhận"
+
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
 #~ msgid "Ordered Date"
 #~ msgstr "Ngày Đặt hàng"
 
+#~ msgid "Delivered"
+#~ msgstr "Đã giao hàng"
+
 #~ msgid "Configuration Progress"
 #~ msgstr "Tiến trình Cấu hình"
+
+#~ msgid "Delivery Order"
+#~ msgstr "Yêu cầu Giao hàng"
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index 3a87ac3c1c1..f86d5aaaf21 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -6,20 +6,168 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-11 07:32+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
+"PO-Revision-Date: 2012-10-25 17:36+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
-msgstr "基于时间表"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "预付款发票"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "确认报价单"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr "销售控制台"
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "确认日期"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "分组..."
 
 #. module: sale
 #: view:sale.order.line:0
@@ -29,60 +177,345 @@ msgid ""
 msgstr "已完成或在异常状态和尚未开发票的销售订单明细将被确认。"
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
-msgstr "销售员最近 90 天销售情况"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "分配给业务伙伴"
 
 #. module: sale
-#: help:sale.order,picking_policy:0
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr "如果库存不够一次全部交货，你是否接受部分交货？"
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr "合同特性"
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "订单状态"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
-msgstr "销售单位"
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "待开票"
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
-msgstr "当前销售订单的送货地址。"
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
+msgstr "计量单位"
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "数量"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "销售订单的日期已确认。"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
-msgstr "天"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "报价单"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr "首先取消所有关联这个销售订单的发票。"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr "为整个销售单开票"
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "合并、分析科目"
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "公司"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "开票日期"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "未开票已送货明细"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "预付款发票金额"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "发票异常"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "总金额。"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "辅助核算项"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "小计"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
+msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "取消订单"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
-msgstr "报价单“%s”将转换为销售单。"
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
-msgstr "打印报价单"
+msgid "Quotation "
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
-msgstr "警告 !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "销售订单"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "税"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "不含税金额"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "净合计:"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "已取消"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "销售订单明细与我的销售订单"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "合计"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "商店"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "销售异常"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "发票地址"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "销售订单创建日期"
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "重新生成发票"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "创建发票"
 
 #. module: sale
 #: report:sale.order:0
@@ -90,68 +523,645 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr "由销售订单明细产生的采购订单。"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "辅助核算项"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr "要开票的销售订单明细列表。你可以按照销售订单明细分别开票。如果按送货单开票，或者按销售订单统一开票的话，你不需要这个列表。"
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "确认日期"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "明细#"
+
+#. module: sale
+#: help:sale.order,message_summary:0
 msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
-msgstr "在删除一个已确认的销售订单时，你必须小心！你必须要先取消其生成的装箱单或送货单。"
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
+msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
-msgstr "采购订单"
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "数量#"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "传真:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "(update)"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr "销售订单"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "数量(销售单位)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "“已完成”状态的销售订单明细"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "预付款总额"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "已确认"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "默认付款条件"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "确认"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "送货地址"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "准备开发票的销售订单明细"
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "月营业额"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "年"
+
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "销售订单尚未被确认"
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "单号"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "订单明细"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "折扣(%)"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "订单关联"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "发票明细"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "总价"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "旧的报价单"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "选择此项，发票将会按客户分组。"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr "生成发票"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr "小时"
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "创建日期"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "等待调度"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "当前销售订单的发票地址。"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "已订数量"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "今年的销售订单"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity"
+msgstr "数量"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "合计:"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "我的销售订单"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "Invalid action !"
+msgstr "无效动作！"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "财务结构"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "销售单位"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "EDI 价格表 (%s)"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "报价日期"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "订单日期"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr "报价单或销售订单"
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
 msgid "Partner"
 msgstr "业务伙伴"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr "根据送货单生成发票"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Line"
-msgstr "订单明细"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
 msgstr ""
-"销售订单管理能帮助你管理报价单和客户订单。\r\n"
-"系统建议你先创建报价单， 一旦报价单被确认后，系统会自动把报价单转换成销售订单。\r\n"
-"系统能处理多种类型产品使一个销售订单能触发任务，送货单，生产订单，采购等。\r\n"
-"根据销售订单的设置，将产生一张发票草稿以便当你需要向客户开票的时候，你只需要确认一下即可。"
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "销售订单生成发票"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "折扣(%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"由于以下原因不能为此销售订单明细生成发票：\n"
+"1. 销售订单明细的状态是“草稿”或者“取消”！\n"
+"2. 销售订单明细已经开票！"
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "销售订单明细已完成"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "我的报价单"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "12月"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr "已送货"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "序列"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "你不能确认没有明细的销售订单。"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "未开票"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "产品类别"
+
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "商店名"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "税:"
+
+#. module: sale
+#: code:addons/sale/sale.py:658
+#, python-format
+msgid "Invoice has been <b>paid</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "销售预付款发票"
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "处理中"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "客户没有定义 ！"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "创建发票"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -167,1196 +1177,10 @@ msgstr ""
 "如果产品是指服务，则交货数量是指在指定的任务上工作时数。"
 
 #. module: sale
-#: field:sale.shop,payment_default_id:0
-msgid "Default Payment Term"
-msgstr "默认付款条件"
-
-#. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
-msgstr "基于送货单"
-
-#. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
-msgstr "主要工作时间单位"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
-#: view:sale.report:0
-msgid "State"
-msgstr "状态"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Disc.(%)"
-msgstr "折扣(%)"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
-msgid "Total Price"
-msgstr "总价"
-
-#. module: sale
-#: help:sale.make.invoice,grouped:0
-msgid "Check the box to group the invoices for the same customers"
-msgstr "选择此项，发票将会按客户分组。"
-
-#. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
-msgstr "我的销售订单"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Ordered Quantities"
-msgstr "已订数量"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Salesman"
-msgstr "销售员销售情况"
-
-#. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "库存调拨"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "订单关联"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
-msgstr "其它信息"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr "日期"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr "如果运送方式是“发票来自装箱单” 或 “送货后开票”， 系统将会自己创建发票。"
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr "基于指派的工作"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr "报价单或销售订单"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr "销售订单生成发票"
-
-#. module: sale
-#: code:addons/sale/sale.py:330
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
 #, python-format
-msgid "Pricelist Warning!"
-msgstr "价格表警告！"
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "折扣(%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "我的报价单"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr "销售经理仪表盘"
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "打包装"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr "来自销售订单"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "商店名"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
+msgid "Advance of %s %%"
 msgstr ""
-"这开票规则是用于同步发票和送货操作。\n"
-"  - “送货前支付”先生成发票，再产生装箱单，然后按发票付款。\n"
-"  - “送货&等待发票” 将直接生成装箱单和等待用户手动点击“发票”按钮生成基于销售订单或其明细的发票草稿。\n"
-"  - “送货后生成发票”根据销售订单生成的所有装箱单都完成后才生成发票草稿。\n"
-"  - “根据送货单开发票”在处理装箱期间生成发票"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "客户没有定义 ！"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "销售异常"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr "设置错误!"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr "条款"
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr "没有为产品类别定义缺省的收入类科目，或者没有定义财务结构 ！"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr "8月"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr "您尝试为不同类的产品分配一个批次"
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr "test_state的模式无效"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr "6月"
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr "不能取消此销售订单 ！"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr "销售订单统计"
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr "销售订单相关的辅助核算项。"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr "10月"
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr "编号必须在公司内唯一！"
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr "报价单"
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
-msgstr "当前销售订单的价格表。"
-
-#. module: sale
-#: report:sale.order:0
-msgid "TVA :"
-msgstr "增值税:"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr "从订单确认到开始运送货物给客户之间的天数"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr "报价日期"
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr "财务结构"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "计量单位"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr "包装数"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "处理中"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr "业务员确认报价单。销售订单的状态变成‘处理中’或‘手动处理’。"
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr "你不能取消已开发票的销售订单明细！"
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr "你必须先取消所有属于此销售订单明细上的库存调拨。"
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr "(n/a)"
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr "选择一个‘预付产品’的服务类产品。你可能需要创建并把它设为此字段的缺省值。"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "电话:"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr "你不能对一个定义为‘发货后自动开票’的销售订单提前开票。"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "备注"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr "公司名必须唯一！"
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr "当前销售订单的发票地址。"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr "上月"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr "下单超一个月的销售订单"
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr "你不能对有不同货币结算的同一个业务伙伴的销售订单进行分组。"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr "可以分批交货"
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "已开票"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "送货单"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr "确认日期"
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "贸易术语"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr "分配给业务伙伴"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr "3月"
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr "您不能将产品移动到类型为视图的库位上。"
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr "根据销售订单"
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr "总金额。"
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "小计"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "发票地址:"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr "明细序列号"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr "对每个销售订单明细，将会创建对应的采购订单来供应销售的产品。"
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr "国际贸易术语包含一系列用于贸易事务的术语。"
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "发票地址"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr "查找未开票明细"
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "报价单/订单"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr "明细#"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr "未开票销售订单"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr "销售订单明细"
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "仓库"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "单号"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "订单明细"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "未完税金额"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr "待开票的销售订单明细"
-
-#. module: sale
-#: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "数量(计量单位)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr "创建日期"
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr "杂项"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "未开票已送货明细"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Total :"
-msgstr "合计:"
-
-#. module: sale
-#: view:sale.report:0
-msgid "My Sales"
-msgstr "我的销售订单"
-
-#. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Invalid action !"
-msgstr "无效动作！"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "附加信息"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "价格表"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
-msgstr "数量#"
-
-#. module: sale
-#: code:addons/sale/sale.py:1327
-#, python-format
-msgid "Hour"
-msgstr "小时"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Order Date"
-msgstr "订单日期"
-
-#. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
-msgstr "已送货"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "所有报价单"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
-msgstr "设置"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "September"
-msgstr "9月"
-
-#. module: sale
-#: code:addons/sale/sale.py:632
-#, python-format
-msgid "You cannot confirm a sale order which has no line."
-msgstr "你不能确认没有明细的销售订单。"
-
-#. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
-msgstr ""
-"你必须在销售界面选一个客户或价格表！\n"
-"请在选择产品前设置。"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
-msgid "Category of Product"
-msgstr "产品类别"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Taxes :"
-msgstr "税:"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "库存调拨"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "订单状态"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr "你真的要生成发票吗 ？"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr "月销售情况"
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
-#, python-format
-msgid "Could not cancel sales order line!"
-msgstr "不能取消销售明细！"
-
-#. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
-msgstr "安全天数"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
-msgstr "采购已下销售单的物料"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Create Final Invoice"
-msgstr "生成最终发票"
-
-#. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "送货地址"
-
-#. module: sale
-#: help:sale.order,shipped:0
-msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
-msgstr "它表示销售订单已经送货。只有运行调度程序（scheduler）后这个字段才会被修改。"
-
-#. module: sale
-#: field:sale.order,date_order:0
-msgid "Date"
-msgstr "日期"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Extended Filters..."
-msgstr "增加筛选条件"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Exception"
-msgstr "异常"
-
-#. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
-msgstr "公司"
-
-#. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
-msgstr ""
-"给出报价单或销售订单的状态。\n"
-"在发票确认（发票异常）或在装箱单处理中（运输异常），“异常”状态会自动设置一个取消操作。\n"
-"在“等待调度”状态设置发票等待在调度的日期里确认。"
-
-#. module: sale
-#: code:addons/sale/sale.py:1272
-#, python-format
-msgid "No valid pricelist line found ! :"
-msgstr "明细没有找到有效的价格表！"
-
-#. module: sale
-#: view:sale.order:0
-msgid "History"
-msgstr "日志"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
-msgstr "在订单送货后生成发票"
-
-#. module: sale
-#: help:sale.order,invoice_ids:0
-msgid ""
-"This is the list of invoices that have been generated for this sales order. "
-"The same sales order may have been invoiced in several times (by line for "
-"example)."
-msgstr "这是为此销售订单生成的发票列表。同一销售订单可能会多次开票（比如按销售明细）。"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Your Reference"
-msgstr "您的关联单号"
-
-#. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
-msgstr "订单或报价单联系人姓名和地址。"
-
-#. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
-msgstr "基于安全的目的在承诺客户的时间的基础上需要增加的天数"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Qty"
-msgstr "数量"
-
-#. module: sale
-#: view:sale.order:0
-msgid "References"
-msgstr "关联"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "My Sales Order Lines"
-msgstr "我的销售订单明细"
-
-#. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
-msgid "Cancel"
-msgstr "取消"
-
-#. module: sale
-#: sql_constraint:sale.order:0
-msgid "Order Reference must be unique per Company!"
-msgstr "订单号必须在一个公司范围内唯一"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "生成发票"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr "不含税总金额"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr "订单关联单号"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr "发票创建成功！"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr "业务伙伴的销售情况"
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "联系人的订购"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr "未结发票"
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr "销售订单确认的自动电子邮件"
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr "没有为此公司定义销售账簿： \\\"%s\\\" (id:%d)"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "强制指定"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "来自订单"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr "已运送或被已订购的数量。"
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr "一次性交货"
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr "关联的装箱单"
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "名称"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "运货地址:"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr "最近90天每个客户的销售情况"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr "销售订单草稿状态"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr "生成送货单"
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr "不能删除'%s'状态的销售订单明细！"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr "数量（销售单位）"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr "含税总金额"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr "生成装箱单"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr "销售订单的订购日期"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr "按产品类别的销售情况"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "确认报价单"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "错误"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr "分组..."
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "重新生成发票"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr "送货单待开票"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "等待调度"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr "引起需求的方式"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr "装箱单"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "设为报价单"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr "调拨出去或调拨给客户的单据"
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
-msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
-"            "
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "审核"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "确认订单"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr "创建采购订单"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "税"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr "待开票的销售订单"
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr "销售订单创建日期"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr "库存调拨"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr "创建发票"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "传真:"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr "如果是“来自订单”，当销售订单确认后它会触发一个需求，销售订单的明细会关联出采购订单或生产单。"
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr "预付款总额"
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr "你负责送货？"
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "已送货数量"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "基于销售订单开票"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr "如果你修改这订单的价格表（货币），现有订单明细的价格不会修改。"
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr "装箱单"
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "错误！"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr "不能取消销售订单 ！"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr "数量（计量单位）"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr "今年的销售订单"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr "7月"
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "需求"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "送货异常"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr "装箱信息！： "
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "发票组"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr "开票规则"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr "设置你开票的方法"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr "等待会计复核。"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr "相关计量单位"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr "该工具帮助你安装适合的模块并设置系统你对客户开发票的方法。"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
@@ -1364,14 +1188,9 @@ msgid "Sale OrderLine Make_invoice"
 msgstr "销售订单明细开票"
 
 #. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "发票异常"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr "驱动需求计算和开发票"
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "草稿"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1379,554 +1198,9 @@ msgid "Paid"
 msgstr "支付"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr "销售分析表"
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
 msgstr ""
-"你选择了 %d 单位的数量。但它不兼容选定的包装。\n"
-"这是对应该包装的建议数量：EAN: %s ，  数量: %s， 单位类型: %s"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr "重新打包装"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr "属性"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "报价单"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr "如果销售订单的送货方式是‘送货并手工开票’， 业务员需要手工生成发票。如果送货方式是‘先付款后送货’，发票将自动生成。"
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr "你可以根据销售订单或送货单生成发票。"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr "确认销售订单明细，尚未送货"
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr "客户发票"
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "销售"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "单价"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "已完成"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "发票"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-"你必须在销售表单中选择一个客户 ！\n"
-"请在选择产品之前设置客户。"
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
-msgstr "源单据"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "To Do"
-msgstr "待办事项"
-
-#. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
-msgstr "装箱方式"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
-msgstr "转移给客户的单据"
-
-#. module: sale
-#: help:sale.order,amount_untaxed:0
-msgid "The amount without tax."
-msgstr "除税后总额。"
-
-#. module: sale
-#: code:addons/sale/sale.py:604
-#, python-format
-msgid "You must first cancel all picking attached to this sales order."
-msgstr "你必须先取消销售订单上的所有装箱单。"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
-msgstr "销售预付款发票"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
-msgstr "月"
-
-#. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
-msgid "Product"
-msgstr "产品"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "取消分配"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
-
-#. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
-msgstr "月营业额"
-
-#. module: sale
-#: field:sale.order,invoice_quantity:0
-msgid "Invoice on"
-msgstr "开票依据"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Date Ordered"
-msgstr "下单日期"
-
-#. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UoS"
-msgstr "产品销售单位"
-
-#. module: sale
-#: selection:sale.report,state:0
-msgid "Manual In Progress"
-msgstr "手动处理"
-
-#. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
-msgstr "产品计量单位"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Logistic"
-msgstr "物流"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "订单"
-
-#. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
-#, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
-msgstr "没有为此产品定义收入类科目： \\\"%s\\\" (id:%d)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Ignore Exception"
-msgstr "忽略异常"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleinvoice0
-msgid ""
-"Depending on the Invoicing control of the sales order, the invoice can be "
-"based on delivered or on ordered quantities. Thus, a sales order can "
-"generates an invoice or a delivery order as soon as it is confirmed by the "
-"salesman."
-msgstr ""
-"根据销售订单的开票方式， 基于送货单或者订购数量生成发票。\r\n"
-"因此，一旦销售订单被业务员确认，就会为它生成发票或者送货单。"
-
-#. module: sale
-#: code:addons/sale/sale.py:1251
-#, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
-msgstr ""
-"你计划销售 %.2f %s 但是只要 %.2f %s 是有效的 ！\n"
-"实际库存有 %.2f %s。 （没有预订）"
-
-#. module: sale
-#: view:sale.order:0
-msgid "States"
-msgstr "状态"
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr "res_config_contents"
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr "客户关联单号"
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "合计"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "价格"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr "根据出库库位的设置，出库和客户之间的库存调拨是通过送货单手工或自动完成的。"
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr "送货前付款"
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr "销售控制台"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr "生成发票"
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr "待开票"
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr "销售订单的日期已确认。"
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr "合并、分析科目"
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr "公司"
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr "开票日期"
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr "预付款发票金额"
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-"找不到此产品和数量的价格表。\n"
-"你必须修改产品，或价格表的数量。"
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr "此销售订单的装箱单。"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "创建发票"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Net Total :"
-msgstr "净合计:"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr "已取消"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr "销售订单明细与我的销售订单"
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "商店"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr "确认日期"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr "警告"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr "月度销售订单"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr "销售订单"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "数量(销售单位)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr "“已完成”状态的销售订单明细"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr "一旦销售订单被确认，装箱单就会和需求单一起生成。表示销售订单所产生的需求。有效的销售订单明细会相应产生一张装箱单。"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "已确认"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr "主要方法"
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "确认"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr "错误！您不能创建递归公司."
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr "最近90天各产品类别的销售订单"
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "发票明细"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "销售订单明细"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr "送货提前期"
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "设置"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr "EDI 价格表 (%s)"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr "打印订单"
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr "本年创建的销售订单"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-"由于以下原因不能为此销售订单明细生成发票：\n"
-"1. 销售订单明细的状态是“草稿”或者“取消”！\n"
-"2. 销售订单明细已经开票！"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr "销售订单明细已完成"
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "重量"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "发票"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr "12月"
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr "图像"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr "需求会在销售订单确认或发票付款后自动生成。它是采购和生产则根据有关的规则和售订订单参数而得出的。 "
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr "未开票"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "业务员"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr "旧的报价单"
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "不含税金额"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "预付款发票"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr "销售订单'%s'已被取消。"
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "草稿"
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -1947,6 +1221,18 @@ msgstr ""
 "*当销售订单明细已经装箱时设置为'已完成'状态。                     \n"
 "*当用户取消相关销售订单时设置为'已取消'状态。"
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "销售订单"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "发票组"
+
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount."
@@ -1954,56 +1240,167 @@ msgstr "税额。"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Packings"
-msgstr "打包装"
-
-#. module: sale
+#: field:sale.order,state:0
 #: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr "准备开发票的销售订单明细"
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "状态"
 
 #. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr "上月创建的销售订单"
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "驱动需求计算和开发票"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "6月"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
 msgid "Email Templates"
 msgstr "电子邮件模板"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "销售订单"
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "订单"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "价格表警告！"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
 msgid "Sales Shop"
 msgstr "销售商店"
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "销售订单统计"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "日期"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr "销售订单明细"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
 msgstr "11月"
 
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "增加筛选条件"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
 #. module: sale
 #: field:sale.advance.payment.inv,product_id:0
 msgid "Advance Product"
 msgstr "预付款产品"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "计算"
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "异常"
 
 #. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr "你必须先取消销售订单的所有发票。"
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr "如果销售订单的送货方式是‘送货并手工开票’， 业务员需要手工生成发票。如果送货方式是‘先付款后送货’，发票将自动生成。"
+
+#. module: sale
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -2015,91 +1412,324 @@ msgstr "1月"
 msgid "Sales Order in Progress"
 msgstr "销售订单处理中"
 
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr "业务员确认报价单。销售订单的状态变成‘处理中’或‘手动处理’。"
+
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sales order request."
 msgstr "生成此销售订单相关的请求单据"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
+#: code:addons/sale/sale.py:958
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "明细没有找到有效的价格表！"
+
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
 msgid "Commitment Delay"
 msgstr "承诺延迟"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr "要求的送货单和发票"
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "确认销售订单明细，尚未送货"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
+#: view:sale.order:0
+msgid "History"
+msgstr "日志"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
 msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr "一个需求单对应一个销售订单明细里的组件"
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr "这是为此销售订单生成的发票列表。同一销售订单可能会多次开票（比如按销售明细）。"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr "指定"
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "您的关联单号"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
+msgstr ""
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
 msgstr "订单日期"
 
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "价格表"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "增值税:"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr "客户发票"
+
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sales order to invoice."
 msgstr "确认的销售订单开票。"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr "销售订单尚未被确认"
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "销售订单明细"
 
 #. module: sale
-#: code:addons/sale/sale.py:322
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "销售"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
 #, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr "销售订单'%s'已经被设为草稿状态。"
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr "如果你修改这订单的价格表（货币），现有订单明细的价格不会修改。"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "来自库存"
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "天"
 
 #. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "关闭"
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "发票"
 
 #. module: sale
-#: code:addons/sale/sale.py:1261
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "单价"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "已完成"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "发票地址:"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "发票"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "我的销售订单明细"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
 #, python-format
 msgid "No Pricelist ! : "
 msgstr "没价格表！： "
 
 #. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr "已送货"
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "报价单"
 
 #. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr "必须为此产品赋予一个生产批次"
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "查找未开票明细"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
 msgstr ""
-"如果有有超过一个商店转售你公司的产品，你可以在这里创建和管理它们。\r\n"
-"每当生成一个报价单或者销售订单都必须和一个商店关联起来。商店也会为各自的销售订单指定产品会从那个仓库发货。"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "订单号必须在一个公司范围内唯一"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Product Features"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "待办事项"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "运货地址:"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr "你不能对有不同货币结算的同一个业务伙伴的销售订单进行分组。"
+
+#. module: sale
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "销售分析表"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "当前销售订单的价格表。"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "生成发票"
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "除税后总额。"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "订单关联单号"
 
 #. module: sale
 #: help:sale.order,invoiced:0
@@ -2107,17 +1737,154 @@ msgid "It indicates that an invoice has been paid."
 msgstr "它表示发票已经支付。"
 
 #. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
+#: code:addons/sale/sale.py:822
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr "你不能取消已开发票的销售订单明细！"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "产品"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
 msgid "Description"
 msgstr "说明"
 
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
 msgstr "5月"
 
 #. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "价格"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"这个报表会对你的报价单和销售订单进行分析。分析检查你的销售收入，并且按照不同的标准分组（业务员，合作伙伴，产品等）。用这个报表对还没有开票的销售订单进行分"
+"析。 如果你想分析你的营业额，你应该用会计模块里的发票分析报表。"
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "电话:"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "你真的要生成发票吗 ？"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "其它信息"
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "数量"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "等待会计复核。"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "当前销售订单的送货地址。"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "报价单/订单"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
 #: field:sale.order.line,order_partner_id:0
 msgid "Customer"
 msgstr "客户"
@@ -2132,48 +1899,195 @@ msgstr "预付款"
 msgid "February"
 msgstr "2月"
 
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "开票依据"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "下单日期"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "产品销售单位"
+
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "销售订单草稿状态"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "源单据"
+
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
 msgstr "4月"
 
 #. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr "会计"
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "手动处理"
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "我的销售订单"
+
+#. module: sale
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
 msgid "Search Sales Order"
 msgstr "查找销售订单"
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr "销售订单申请"
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1255
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "下单超一个月的销售订单"
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "Not enough stock ! : "
-msgstr "没足够的库存！： "
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"你必须在销售界面选一个客户或价格表！\n"
+"请在选择产品前设置。"
 
 #. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "来自销售订单"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "忽略异常"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"根据销售订单的开票方式， 基于送货单或者订购数量生成发票。\r\n"
+"因此，一旦销售订单被业务员确认，就会为它生成发票或者送货单。"
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "销售订单相关的辅助核算项。"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "付款条款"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
-msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "待开票的销售订单"
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
+msgid ""
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
-"这个报表会对你的报价单和销售订单进行分析。分析检查你的销售收入，并且按照不同的标准分组（业务员，合作伙伴，产品等）。用这个报表对还没有开票的销售订单进行分"
-"析。 如果你想分析你的营业额，你应该用会计模块里的发票分析报表。"
 
 #. module: sale
 #: report:sale.order:0
@@ -2181,23 +2095,87 @@ msgid "Quotation N°"
 msgstr "报价单号"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "客户关联单号"
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "已装箱"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
-msgstr "年"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
+msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "发票基于送货单"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "含税总金额"
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "已开票"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "销售订单的订购日期"
+
+#~ msgid "sale.config.picking_policy"
+#~ msgstr "sale.config.picking_policy"
+
+#~ msgid "Validate"
+#~ msgstr "审核"
+
+#~ msgid "Notes"
+#~ msgstr "备注"
 
 #~ msgid "VAT"
 #~ msgstr "增值税"
 
+#~ msgid "Force Assignation"
+#~ msgstr "强制指定"
+
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "错误！"
+
+#~ msgid "Confirm Order"
+#~ msgstr "确认订单"
+
+#~ msgid "All Quotations"
+#~ msgstr "所有报价单"
+
 #~ msgid "Draft Invoice"
 #~ msgstr "发票草稿"
 
@@ -2217,18 +2195,39 @@ msgstr "发票基于送货单"
 #~ msgid "All Sales Order"
 #~ msgstr "所有销售订单"
 
+#~ msgid "Warehouse"
+#~ msgstr "仓库"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "未完税金额"
+
+#~ msgid "Configuration"
+#~ msgstr "设置"
+
 #~ msgid "Sales orders"
 #~ msgstr "销售订单"
 
+#~ msgid "Order Line"
+#~ msgstr "订单明细"
+
 #~ msgid "Canceled"
 #~ msgstr "已取消"
 
-#~ msgid "Sale Order"
-#~ msgstr "销售订单"
+#~ msgid "Salesman"
+#~ msgstr "业务员"
+
+#~ msgid "Properties"
+#~ msgstr "属性"
+
+#~ msgid "Compute"
+#~ msgstr "计算"
 
 #~ msgid "Sales order lines"
 #~ msgstr "销售订单明细"
 
+#~ msgid "UoM"
+#~ msgstr "计量单位"
+
 #~ msgid "Sale Order Lines"
 #~ msgstr "销售订单明细"
 
@@ -2238,6 +2237,9 @@ msgstr "发票基于送货单"
 #~ msgid "Sales order"
 #~ msgstr "销售订单"
 
+#~ msgid "Incoterm"
+#~ msgstr "贸易术语"
+
 #~ msgid "Sales Management"
 #~ msgstr "销售管理"
 
@@ -2250,9 +2252,21 @@ msgstr "发票基于送货单"
 #~ msgid "My Sales Order"
 #~ msgstr "我的销售订单"
 
+#~ msgid "from stock"
+#~ msgstr "来自库存"
+
+#~ msgid "Close"
+#~ msgstr "关闭"
+
 #~ msgid "Recreate Procurement"
 #~ msgstr "重建需求单"
 
+#~ msgid "Delivery Order"
+#~ msgstr "送货单"
+
+#~ msgid "Inventory Moves"
+#~ msgstr "库存调拨"
+
 #~ msgid "Manual Designation"
 #~ msgstr "手动指定"
 
@@ -2298,22 +2312,43 @@ msgstr "发票基于送货单"
 #~ msgid "Sale Invoice"
 #~ msgstr "销售发票"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "取消分配"
+
 #~ msgid ""
 #~ "The name and address of the contact that requested the order or quotation."
 #~ msgstr "联系订单或报价单的请求者名称和地址"
 
+#~ msgid "Product UoM"
+#~ msgstr "产品计量单位"
+
 #~ msgid "Invoice Corrected"
 #~ msgstr "已更正发票"
 
 #~ msgid "Payment Terms"
 #~ msgstr "付款条件"
 
-#~ msgid "Status"
+#~ msgid "States"
 #~ msgstr "状态"
 
+#~ msgid "Stock Moves"
+#~ msgstr "库存调拨"
+
+#~ msgid "Accounting"
+#~ msgstr "会计"
+
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "基于销售订单开票"
+
+#~ msgid "Shipping Exception"
+#~ msgstr "送货异常"
+
 #~ msgid "Automatic Declaration"
 #~ msgstr "一般信息"
 
+#~ msgid "Set to Draft"
+#~ msgstr "设为报价单"
+
 #~ msgid "Partial Delivery"
 #~ msgstr "部分交付"
 
@@ -2381,6 +2416,9 @@ msgstr "发票基于送货单"
 #~ msgid "Complete Delivery"
 #~ msgstr "完成送货"
 
+#~ msgid "Quantity (UoM)"
+#~ msgstr "数量(计量单位)"
+
 #~ msgid "Sale Order Procurement"
 #~ msgstr "销售单产品需求"
 
@@ -2434,6 +2472,9 @@ msgstr "发票基于送货单"
 #~ msgid "My sales in shipping exception"
 #~ msgstr "我销售的运输异常"
 
+#~ msgid "on order"
+#~ msgstr "来自订单"
+
 #~ msgid "Procurement Corrected"
 #~ msgstr "产品需求已修正"
 
@@ -2466,8 +2507,8 @@ msgstr "发票基于送货单"
 #~ "the sale order. This transaction moves the sale order to invoices."
 #~ msgstr "确认销售订单点击‘创建发票’创建发票.销售订单转为发票."
 
-#~ msgid "Sequence"
-#~ msgstr "序列"
+#~ msgid "Assign"
+#~ msgstr "指定"
 
 #~ msgid "Packing OUT is created for stockable products."
 #~ msgstr "可库存物产品发出包装"
@@ -2485,6 +2526,9 @@ msgstr "发票基于送货单"
 #~ "给出这报价单或销售订单的状态这异常状态是在发票确认(发票异常)或在包装单处理(送货异常)自动设定时取消操作发生的.这\"等待调度表\"状态是在发票已确认但"
 #~ "在等待在\"日期排序\"内运行调度."
 
+#~ msgid "Number Packages"
+#~ msgstr "包装数"
+
 #~ msgid ""
 #~ "Confirming the packing list moves them to delivery order. This can be done "
 #~ "by clicking on 'Validate' button."
@@ -2527,6 +2571,9 @@ msgstr "发票基于送货单"
 #~ msgid "Purchase Pricelists"
 #~ msgstr "采购价格表"
 
+#~ msgid "Name"
+#~ msgstr "名称"
+
 #~ msgid "New Quotation"
 #~ msgstr "新报价单"
 
@@ -2558,6 +2605,9 @@ msgstr "发票基于送货单"
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "错误:无效EAN编码"
 
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "发票基于送货单"
+
 #~ msgid "Sale Order line"
 #~ msgstr "销售订单明细"
 
@@ -2571,53 +2621,195 @@ msgstr "发票基于送货单"
 #~ msgid "Allows you to compute delivery costs on your quotations."
 #~ msgstr "允许你计算和报价相关的运费"
 
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "警告 !"
+
 #~ msgid "Payment Before Delivery"
 #~ msgstr "款到发货"
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr "如果库存不够一次全部交货，你是否接受部分交货？"
+
+#~ msgid "Procurement Order"
+#~ msgstr "采购订单"
+
+#~ msgid "Sales by Salesman in last 90 days"
+#~ msgstr "销售员最近 90 天销售情况"
+
+#~ msgid "Sales by Salesman"
+#~ msgstr "销售员销售情况"
+
+#, python-format
+#~ msgid "The quotation '%s' has been converted to a sales order."
+#~ msgstr "报价单“%s”将转换为销售单。"
+
 #~ msgid "Order Reference must be unique !"
 #~ msgstr "单号必须唯一！"
 
+#~ msgid "Dates"
+#~ msgstr "日期"
+
+#~ msgid ""
+#~ "This is the days added to what you promise to customers for security purpose"
+#~ msgstr "基于安全的目的在承诺客户的时间的基础上需要增加的天数"
+
+#~ msgid "Drives procurement orders for every sales order line."
+#~ msgstr "由销售订单明细产生的采购订单。"
+
+#~ msgid "Conditions"
+#~ msgstr "条款"
+
+#, python-format
+#~ msgid "invalid mode for test_state"
+#~ msgstr "test_state的模式无效"
+
+#, python-format
+#~ msgid ""
+#~ "There is no income category account defined in default Properties for "
+#~ "Product Category or Fiscal Position is not defined !"
+#~ msgstr "没有为产品类别定义缺省的收入类科目，或者没有定义财务结构 ！"
+
+#~ msgid "Sales Manager Dashboard"
+#~ msgstr "销售经理仪表盘"
+
+#~ msgid ""
+#~ "Number of days between the order confirmation the shipping of the products "
+#~ "to the customer"
+#~ msgstr "从订单确认到开始运送货物给客户之间的天数"
+
+#, python-format
+#~ msgid "Could not cancel this sales order !"
+#~ msgstr "不能取消此销售订单 ！"
+
 #~ msgid "Enhance your core Sales Application with additional functionalities."
 #~ msgstr "通过额外的功能增强你的核心销售应用程序。"
 
+#~ msgid ""
+#~ "For every sales order line, a procurement order is created to supply the "
+#~ "sold product."
+#~ msgstr "对每个销售订单明细，将会创建对应的采购订单来供应销售的产品。"
+
+#, python-format
+#~ msgid "(n/a)"
+#~ msgstr "(n/a)"
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sales order                              "
+#~ "that is defined as 'Automatic Invoice after delivery'."
+#~ msgstr "你不能对一个定义为‘发货后自动开票’的销售订单提前开票。"
+
+#~ msgid ""
+#~ "Select a product of type service which is called 'Advance Product'. You may "
+#~ "have to create it and set it as a default value on this field."
+#~ msgstr "选择一个‘预付产品’的服务类产品。你可能需要创建并把它设为此字段的缺省值。"
+
 #~ msgid "Setup your sales workflow and default values."
 #~ msgstr "设置你的销售流程和默认值。"
 
+#~ msgid "Security Days"
+#~ msgstr "安全天数"
+
 #~ msgid "Do you really want to create the invoice(s) ?"
 #~ msgstr "你真的要生成发票吗 ？"
 
+#~ msgid "Create Final Invoice"
+#~ msgstr "生成最终发票"
+
 #~ msgid "Invoice On Order After Delivery"
 #~ msgstr "发货后开票"
 
+#, python-format
+#~ msgid "Could not cancel sales order line!"
+#~ msgstr "不能取消销售明细！"
+
 #~ msgid "  Year  "
 #~ msgstr "  年  "
 
+#~ msgid "Sales By Month"
+#~ msgstr "月销售情况"
+
+#~ msgid "Companies"
+#~ msgstr "公司"
+
 #~ msgid "Picking Default Policy"
 #~ msgstr "默认分拣方式"
 
+#~ msgid "Sales by Partner"
+#~ msgstr "业务伙伴的销售情况"
+
 #~ msgid "Sales Order Dates"
 #~ msgstr "销售订单日期"
 
+#~ msgid "Total Tax Excluded"
+#~ msgstr "不含税总金额"
+
+#~ msgid "Open Invoice"
+#~ msgstr "未结发票"
+
 #, python-format
 #~ msgid "You cannot cancel a sales order line that has already been invoiced !"
 #~ msgstr "你不能取消已开票的销售订单 ！"
 
+#~ msgid "Sales per Customer in last 90 days"
+#~ msgstr "最近90天每个客户的销售情况"
+
+#~ msgid "Sales by Product Category"
+#~ msgstr "按产品类别的销售情况"
+
 #~ msgid "Delivery Costs"
 #~ msgstr "交货成本"
 
 #~ msgid "title"
 #~ msgstr "标题"
 
+#~ msgid "Stock Move"
+#~ msgstr "库存调拨"
+
+#~ msgid "Document of the move to the output or to the customer."
+#~ msgstr "调拨出去或调拨给客户的单据"
+
+#~ msgid "Create Procurement Order"
+#~ msgstr "创建采购订单"
+
 #~ msgid "Order date"
 #~ msgstr "订单日期"
 
+#, python-format
+#~ msgid "Could not cancel sales order !"
+#~ msgstr "不能取消销售订单 ！"
+
+#~ msgid "Document of the move to the customer."
+#~ msgstr "转移给客户的单据"
+
 #~ msgid "Invoicing"
 #~ msgstr "开发票"
 
+#, python-format
+#~ msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+#~ msgstr "没有为此产品定义收入类科目： \\\"%s\\\" (id:%d)"
+
+#~ msgid "Logistic"
+#~ msgstr "物流"
+
+#, python-format
+#~ msgid ""
+#~ "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+#~ "The real stock is %.2f %s. (without reservations)"
+#~ msgstr ""
+#~ "你计划销售 %.2f %s 但是只要 %.2f %s 是有效的 ！\n"
+#~ "实际库存有 %.2f %s。 （没有预订）"
+
 #, python-format
 #~ msgid "Cannot delete a sales order line which is %s !"
 #~ msgstr "不能删除 %s的销售订单明细 ！"
 
+#~ msgid "res_config_contents"
+#~ msgstr "res_config_contents"
+
 #~ msgid ""
 #~ "Gives the margin of profitability by calculating the difference between Unit "
 #~ "Price and Cost Price."
@@ -2626,22 +2818,51 @@ msgstr "发票基于送货单"
 #~ msgid "   Month   "
 #~ msgstr "   月   "
 
+#, python-format
+#~ msgid "Warning"
+#~ msgstr "警告"
+
 #~ msgid "    Month-1    "
 #~ msgstr "    上月    "
 
+#~ msgid "Error! You can not create recursive companies."
+#~ msgstr "错误！您不能创建递归公司."
+
+#, python-format
+#~ msgid "The sales order '%s' has been cancelled."
+#~ msgstr "销售订单'%s'已被取消。"
+
+#~ msgid "Image"
+#~ msgstr "图像"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sales order."
+#~ msgstr "你必须先取消销售订单的所有发票。"
+
 #~ msgid "Ordered Date"
 #~ msgstr "订购日期"
 
+#~ msgid "You invoice has been successfully created!"
+#~ msgstr "发票创建成功！"
+
 #~ msgid "Shipped Qty"
 #~ msgstr "交货数量"
 
 #~ msgid "Sales Order Layout Improvement"
 #~ msgstr "改善销售订单样式"
 
+#, python-format
+#~ msgid "Error"
+#~ msgstr "错误"
+
 #, python-format
 #~ msgid "Not enough stock !"
 #~ msgstr "库存不足 ！"
 
+#, python-format
+#~ msgid "The sales order '%s' has been set in draft state."
+#~ msgstr "销售订单'%s'已经被设为草稿状态。"
+
 #, python-format
 #~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
 #~ msgstr "不能删除已被确认的销售订单 !"
@@ -2655,6 +2876,9 @@ msgstr "发票基于送货单"
 #~ msgid "Steps To Deliver a Sales Order"
 #~ msgstr "销售订单发货步骤"
 
+#~ msgid "Sales Order Requisition"
+#~ msgstr "销售订单申请"
+
 #~ msgid ""
 #~ "Provides some features to improve the layout of the Sales Order reports."
 #~ msgstr "提供一些新的功能来改善销售订单报表的样式。"
@@ -2662,6 +2886,11 @@ msgstr "发票基于送货单"
 #~ msgid "Invoicing journals"
 #~ msgstr "开票日志"
 
+#~ msgid ""
+#~ "Incoterm which stands for 'International Commercial terms' implies its a "
+#~ "series of sales terms which are used in the commercial transaction."
+#~ msgstr "国际贸易术语包含一系列用于贸易事务的术语。"
+
 #, python-format
 #~ msgid ""
 #~ "You selected a quantity of %d Units.\n"
@@ -2684,6 +2913,10 @@ msgstr "发票基于送货单"
 #~ "invoicing types: daily, weekly, etc."
 #~ msgstr "允许你对你的发货单根据不同开票类型：每天，每周等，进行分组和开票。"
 
+#, python-format
+#~ msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+#~ msgstr "没有为此公司定义销售账簿： \\\"%s\\\" (id:%d)"
+
 #~ msgid ""
 #~ "The Shipping Policy is used to synchronise invoice and delivery operations.\n"
 #~ "  - The 'Pay Before delivery' choice will first generate the invoice and "
@@ -2762,6 +2995,24 @@ msgstr "发票基于送货单"
 #~ "当发票验证被取消（发票异常），或取消装箱单里的产品（运输异常）的时候，会被设置为异常状态。\n"
 #~ "当发票被确认但在“订单日期”那天正等待日程安排会被设置为‘等待日程安排’状态。"
 
+#, python-format
+#~ msgid "You must first cancel all picking attached to this sales order."
+#~ msgstr "你必须先取消销售订单上的所有装箱单。"
+
+#~ msgid ""
+#~ "This is a list of picking that has been generated for this sales order."
+#~ msgstr "此销售订单的装箱单。"
+
+#~ msgid ""
+#~ "If you have more than one shop reselling your company products, you can "
+#~ "create and manage that from here. Whenever you will record a new quotation "
+#~ "or sales order, it has to be linked to a shop. The shop also defines the "
+#~ "warehouse from which the products will be delivered for each particular "
+#~ "sales."
+#~ msgstr ""
+#~ "如果有有超过一个商店转售你公司的产品，你可以在这里创建和管理它们。\r\n"
+#~ "每当生成一个报价单或者销售订单都必须和一个商店关联起来。商店也会为各自的销售订单指定产品会从那个仓库发货。"
+
 #~ msgid "Configure Your Sales Management Application"
 #~ msgstr "设置销售管理应用程序"
 
@@ -2798,8 +3049,336 @@ msgstr "发票基于送货单"
 #~ msgid "Picking Information !"
 #~ msgstr "装箱单信息 ！"
 
+#~ msgid "Picking List"
+#~ msgstr "装箱单"
+
 #~ msgid "Invoice From The Picking"
 #~ msgstr "来自装箱单的发票"
 
+#~ msgid "Picking Policy"
+#~ msgstr "装箱方式"
+
 #~ msgid "Picking List & Delivery Order"
 #~ msgstr "装箱单 & 发货单"
+
+#~ msgid "State"
+#~ msgstr "状态"
+
+#~ msgid "Based on Timesheet"
+#~ msgstr "基于时间表"
+
+#~ msgid "Invoice based on deliveries"
+#~ msgstr "根据送货单生成发票"
+
+#, python-format
+#~ msgid ""
+#~ "In order to delete a confirmed sale order, you must cancel it before ! To "
+#~ "cancel a sale order, you must first cancel related picking or delivery "
+#~ "orders."
+#~ msgstr "在删除一个已确认的销售订单时，你必须小心！你必须要先取消其生成的装箱单或送货单。"
+
+#~ msgid "Print Quotation"
+#~ msgstr "打印报价单"
+
+#~ msgid "Main Working Time Unit"
+#~ msgstr "主要工作时间单位"
+
+#~ msgid "Based on Delivery Orders"
+#~ msgstr "基于送货单"
+
+#~ msgid "Based on Tasks' Work"
+#~ msgstr "基于指派的工作"
+
+#~ msgid ""
+#~ "The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+#~ "  - The 'Pay before delivery' choice will first generate the invoice and "
+#~ "then generate the picking order after the payment of this invoice.\n"
+#~ "  - The 'Deliver & Invoice on demand' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice based on the sale order or the sale order lines.\n"
+#~ "  - The 'Invoice on order after delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice based on deliveries' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "这开票规则是用于同步发票和送货操作。\n"
+#~ "  - “送货前支付”先生成发票，再产生装箱单，然后按发票付款。\n"
+#~ "  - “送货&等待发票” 将直接生成装箱单和等待用户手动点击“发票”按钮生成基于销售订单或其明细的发票草稿。\n"
+#~ "  - “送货后生成发票”根据销售订单生成的所有装箱单都完成后才生成发票草稿。\n"
+#~ "  - “根据送货单开发票”在处理装箱期间生成发票"
+
+#, python-format
+#~ msgid "Configuration Error !"
+#~ msgstr "设置错误!"
+
+#~ msgid "You try to assign a lot which is not from the same product"
+#~ msgstr "您尝试为不同类的产品分配一个批次"
+
+#~ msgid "Reference must be unique per Company!"
+#~ msgstr "编号必须在公司内唯一！"
+
+#, python-format
+#~ msgid "You must first cancel stock moves attached to this sales order line."
+#~ msgstr "你必须先取消所有属于此销售订单明细上的库存调拨。"
+
+#~ msgid "The company name must be unique !"
+#~ msgstr "公司名必须唯一！"
+
+#~ msgid "Month-1"
+#~ msgstr "上月"
+
+#~ msgid "You can not move products from or to a location of the type view."
+#~ msgstr "您不能将产品移动到类型为视图的库位上。"
+
+#~ msgid "Based on Sales Orders"
+#~ msgstr "根据销售订单"
+
+#~ msgid "Line Sequence"
+#~ msgstr "明细序列号"
+
+#~ msgid "Sales Open Invoice"
+#~ msgstr "未开票销售订单"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "杂项"
+
+#~ msgid "Options"
+#~ msgstr "设置"
+
+#~ msgid "Procurement of sold material"
+#~ msgstr "采购已下销售单的物料"
+
+#~ msgid "Invoice on order after delivery"
+#~ msgstr "在订单送货后生成发票"
+
+#~ msgid "References"
+#~ msgstr "关联"
+
+#~ msgid "Auto-email confirmed sale orders"
+#~ msgstr "销售订单确认的自动电子邮件"
+
+#~ msgid "Based on the shipped or on the ordered quantities."
+#~ msgstr "已运送或被已订购的数量。"
+
+#~ msgid ""
+#~ "The name and address of the contact who requested the order or quotation."
+#~ msgstr "订单或报价单联系人姓名和地址。"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is in state '%s'!"
+#~ msgstr "不能删除'%s'状态的销售订单明细！"
+
+#~ msgid "Deliver all products at once"
+#~ msgstr "一次性交货"
+
+#~ msgid "Related Picking"
+#~ msgstr "关联的装箱单"
+
+#~ msgid "Qty(UoS)"
+#~ msgstr "数量（销售单位）"
+
+#~ msgid "Create Delivery Order"
+#~ msgstr "生成送货单"
+
+#~ msgid "Procurement Method"
+#~ msgstr "引起需求的方式"
+
+#~ msgid "Create Pick List"
+#~ msgstr "生成装箱单"
+
+#~ msgid "Pick List"
+#~ msgstr "装箱单"
+
+#~ msgid ""
+#~ "Here is a list of each sales order line to be invoiced. You can invoice "
+#~ "sales orders partially, by lines of sales order. You do not need this list "
+#~ "if you invoice from the delivery orders or if you invoice sales totally."
+#~ msgstr "要开票的销售订单明细列表。你可以按照销售订单明细分别开票。如果按送货单开票，或者按销售订单统一开票的话，你不需要这个列表。"
+
+#~ msgid ""
+#~ "Sales Orders help you manage quotations and orders from your customers. "
+#~ "OpenERP suggests that you start by creating a quotation. Once it is "
+#~ "confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+#~ "handle several types of products so that a sales order may trigger tasks, "
+#~ "delivery orders, manufacturing orders, purchases and so on. Based on the "
+#~ "configuration of the sales order, a draft invoice will be generated so that "
+#~ "you just have to confirm it when you want to bill your customer."
+#~ msgstr ""
+#~ "销售订单管理能帮助你管理报价单和客户订单。\r\n"
+#~ "系统建议你先创建报价单， 一旦报价单被确认后，系统会自动把报价单转换成销售订单。\r\n"
+#~ "系统能处理多种类型产品使一个销售订单能触发任务，送货单，生产订单，采购等。\r\n"
+#~ "根据销售订单的设置，将产生一张发票草稿以便当你需要向客户开票的时候，你只需要确认一下即可。"
+
+#~ msgid ""
+#~ "The invoice is created automatically if the shipping policy is 'Invoice from "
+#~ "pick' or 'Invoice on order after delivery'."
+#~ msgstr "如果运送方式是“发票来自装箱单” 或 “送货后开票”， 系统将会自己创建发票。"
+
+#~ msgid "Deliver each product when available"
+#~ msgstr "可以分批交货"
+
+#~ msgid "Lines to Invoice"
+#~ msgstr "待开票的销售订单明细"
+
+#~ msgid "Extra Info"
+#~ msgstr "附加信息"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the order date."
+#~ msgstr ""
+#~ "给出报价单或销售订单的状态。\n"
+#~ "在发票确认（发票异常）或在装箱单处理中（运输异常），“异常”状态会自动设置一个取消操作。\n"
+#~ "在“等待调度”状态设置发票等待在调度的日期里确认。"
+
+#~ msgid ""
+#~ "It indicates that the sales order has been delivered. This field is updated "
+#~ "only after the scheduler(s) have been launched."
+#~ msgstr "它表示销售订单已经送货。只有运行调度程序（scheduler）后这个字段才会被修改。"
+
+#~ msgid "Ordering Contact"
+#~ msgstr "联系人的订购"
+
+#~ msgid "Deliveries to Invoice"
+#~ msgstr "送货单待开票"
+
+#~ msgid "Do you charge the delivery?"
+#~ msgstr "你负责送货？"
+
+#~ msgid ""
+#~ "If 'on order', it triggers a procurement when the sale order is confirmed to "
+#~ "create a task, purchase order or manufacturing order linked to this sale "
+#~ "order line."
+#~ msgstr "如果是“来自订单”，当销售订单确认后它会触发一个需求，销售订单的明细会关联出采购订单或生产单。"
+
+#~ msgid "Shipped Quantities"
+#~ msgstr "已送货数量"
+
+#, python-format
+#~ msgid "Picking Information ! : "
+#~ msgstr "装箱信息！： "
+
+#~ msgid "Qty(UoM)"
+#~ msgstr "数量（计量单位）"
+
+#~ msgid "Procurement"
+#~ msgstr "需求"
+
+#~ msgid ""
+#~ "This tool will help you to install the right module and configure the system "
+#~ "according to the method you use to invoice your customers."
+#~ msgstr "该工具帮助你安装适合的模块并设置系统你对客户开发票的方法。"
+
+#~ msgid "Setup your Invoicing Method"
+#~ msgstr "设置你开票的方法"
+
+#~ msgid "Invoice Policy"
+#~ msgstr "开票规则"
+
+#~ msgid "Reference UoM"
+#~ msgstr "相关计量单位"
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "你选择了 %d 单位的数量。但它不兼容选定的包装。\n"
+#~ "这是对应该包装的建议数量：EAN: %s ，  数量: %s， 单位类型: %s"
+
+#~ msgid ""
+#~ "You can generate invoices based on sales orders or based on shippings."
+#~ msgstr "你可以根据销售订单或送货单生成发票。"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sales form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "你必须在销售表单中选择一个客户 ！\n"
+#~ "请在选择产品之前设置客户。"
+
+#~ msgid "Pay before delivery"
+#~ msgstr "送货前付款"
+
+#~ msgid ""
+#~ "Depending on the configuration of the location Output, the move between the "
+#~ "output area and the customer is done through the Delivery Order manually or "
+#~ "automatically."
+#~ msgstr "根据出库库位的设置，出库和客户之间的库存调拨是通过送货单手工或自动完成的。"
+
+#, python-format
+#~ msgid ""
+#~ "Couldn't find a pricelist line matching this product and quantity.\n"
+#~ "You have to change either the product, the quantity or the pricelist."
+#~ msgstr ""
+#~ "找不到此产品和数量的价格表。\n"
+#~ "你必须修改产品，或价格表的数量。"
+
+#~ msgid ""
+#~ "The Pick List form is created as soon as the sales order is confirmed, in "
+#~ "the same time as the procurement order. It represents the assignment of "
+#~ "parts to the sales order. There is 1 pick list by sales order line which "
+#~ "evolves with the availability of parts."
+#~ msgstr "一旦销售订单被确认，装箱单就会和需求单一起生成。表示销售订单所产生的需求。有效的销售订单明细会相应产生一张装箱单。"
+
+#~ msgid "Main Method Based On"
+#~ msgstr "主要方法"
+
+#~ msgid "Sales by Month"
+#~ msgstr "月度销售订单"
+
+#~ msgid "Sales by Product's Category in last 90 days"
+#~ msgstr "最近90天各产品类别的销售订单"
+
+#~ msgid "Print Order"
+#~ msgstr "打印订单"
+
+#~ msgid "Sales order created in current year"
+#~ msgstr "本年创建的销售订单"
+
+#~ msgid "Delivery Lead Time"
+#~ msgstr "送货提前期"
+
+#~ msgid ""
+#~ "A procurement order is automatically created as soon as a sales order is "
+#~ "confirmed or as the invoice is paid. It drives the purchasing and the "
+#~ "production of products regarding to the rules and to the sales order's "
+#~ "parameters. "
+#~ msgstr "需求会在销售订单确认或发票付款后自动生成。它是采购和生产则根据有关的规则和售订订单参数而得出的。 "
+
+#~ msgid "Sales order created in last month"
+#~ msgstr "上月创建的销售订单"
+
+#~ msgid ""
+#~ "One Procurement order for each sales order line and for each of the "
+#~ "components."
+#~ msgstr "一个需求单对应一个销售订单明细里的组件"
+
+#~ msgid "Deliver & invoice on demand"
+#~ msgstr "要求的送货单和发票"
+
+#~ msgid "You must assign a production lot for this product"
+#~ msgstr "必须为此产品赋予一个生产批次"
+
+#~ msgid "Delivered"
+#~ msgstr "已送货"
+
+#, python-format
+#~ msgid "Not enough stock ! : "
+#~ msgstr "没足够的库存！： "
+
+#~ msgid "Packings"
+#~ msgstr "打包装"
+
+#~ msgid "Recreate Packing"
+#~ msgstr "重新打包装"
+
+#~ msgid "Packaging"
+#~ msgstr "打包装"
diff --git a/addons/sale/i18n/zh_TW.po b/addons/sale/i18n/zh_TW.po
index 5e8213b2fd8..3e6f2fe44de 100644
--- a/addons/sale/i18n/zh_TW.po
+++ b/addons/sale/i18n/zh_TW.po
@@ -6,19 +6,167 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"POT-Creation-Date: 2012-09-20 07:29+0000\n"
 "PO-Revision-Date: 2010-08-07 04:21+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:47+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:09+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale
-#: field:sale.config.picking_policy,timesheet:0
-msgid "Based on Timesheet"
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:215
+#, python-format
+msgid "Advance Invoice"
+msgstr "先開發票"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "確認報價"
+
+#. module: sale
+#: view:board.board:0
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:email.template,body_html:sale.email_template_edi_sale
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name "
+"or ''},</p>\n"
+"    \n"
+"    <p>Here is your ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} from ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Order number: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order total: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Order date: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"    </p>\n"
+"\n"
+"    <p>\n"
+"    You can view the ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} document, download it and pay online using the "
+"following link:\n"
+"    </p>\n"
+"            <a style=\"display:block; width: 150px; height:20px; margin-"
+"left: 120px; color: #FFF; font-family: 'Lucida Grande', Helvetica, Arial, "
+"sans-serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"               href=\"${ctx.get('edi_web_url_view') or ''}\">View Order</a>\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state not in ('draft', 'sent'):\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.amount_total))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Order Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
 msgstr ""
 
 #. module: sale
@@ -29,59 +177,344 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
-msgid "Sales by Salesman in last 90 days"
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,picking_policy:0
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+msgid "Invoice Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_delivery_address:0
 msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shipments or not?"
-msgstr "如庫存不足以一次過交貨，是否接受部份交貨?"
+"Allows you to specify different delivery and invoice addresses on a sale "
+"order."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:160
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:162
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Contract Feature"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "訂單狀態"
+
+#. module: sale
+#: help:sale.config.settings,module_account_analytic_analysis:0
+msgid ""
+"Allows to define your customer contracts conditions: invoicing\n"
+"            method (fixed price, on timesheet, advance invoice), the exact "
+"pricing\n"
+"            (650€/day for a developer), the duration (one year support "
+"contract).\n"
+"            You will be able to follow the progress of the contract and "
+"invoice automatically.\n"
+"            It installs the account_analytic_analysis module."
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "UoS"
+#: view:sale.order.line:0
+msgid "To Invoice"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,partner_shipping_id:0
-msgid "Shipping address for current sales order."
+#: view:sale.order.line:0
+#: field:sale.report,product_uom:0
+msgid "Unit of Measure"
 msgstr ""
 
 #. module: sale
-#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
-msgid "Quantity"
-msgstr "數量"
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,day:0
-msgid "Day"
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:558
+#, python-format
+msgid "First cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Invoice the whole sale order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "未開票運貨明細"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "發票異常情況"
+
+#. module: sale
+#: view:account.config.settings:0
+msgid "0"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Draft Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:124
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "分析科目"
+
+#. module: sale
+#: field:sale.config.settings,module_sale_journal:0
+msgid "Allow batch invoicing of delivery orders through journals"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "小計"
+
+#. module: sale
+#: field:sale.config.settings,group_discount_per_so_line:0
+msgid "Allow setting a discount on the sale order lines"
 msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
-#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "取消訂單"
 
 #. module: sale
-#: code:addons/sale/sale.py:638
-#, python-format
-msgid "The quotation '%s' has been converted to a sales order."
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "重量"
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Warehouse Features"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Print Quotation"
+msgid "Quotation "
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice.py:42
+#: field:sale.order.line,product_uom:0
+msgid "Unit of Measure "
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:148
 #, python-format
-msgid "Warning !"
+msgid "Incorrect Data"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:149
+#, python-format
+msgid "The value of Advance Amount must be positive."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,advance_payment_method:0
+msgid ""
+"Use All to create the final invoice.\n"
+"                Use Percentage to invoice a percentage of the total amount.\n"
+"                Use Fixed Price to invoice a specific amound in advance.\n"
+"                Use Some Order Lines to invoice a selection of the sale "
+"order lines."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale Order"
+msgstr "銷貨單"
+
+#. module: sale
+#: field:sale.order,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "稅"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "未完稅金額"
+
+#. module: sale
+#: field:sale.config.settings,module_project:0
+msgid "Project"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:319
+#: code:addons/sale/sale.py:459
+#: code:addons/sale/sale.py:591
+#: code:addons/sale/sale.py:765
+#: code:addons/sale/sale.py:782
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:123
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "淨計 :"
+
+#. module: sale
+#: help:sale.config.settings,module_analytic_user_function:0
+msgid ""
+"Allows you to define what is the default function of a specific user on a "
+"given account.\n"
+"                This is mostly used when a user encodes his timesheet. The "
+"values are retrieved and the fields are auto-filled.\n"
+"                But the possibility to change these values is still "
+"available.\n"
+"                This installs the module analytic_user_function."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Quotation Sent"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "總計"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: field:sale.order,shop_id:0
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "商店"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "銷售異常情況"
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "發票地址"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "False"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "重新開立發票"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
 msgstr ""
 
 #. module: sale
@@ -90,73 +523,100 @@ msgid "Tax"
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_saleorderprocurement0
-msgid "Drives procurement orders for every sales order line."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,analytic_account_id:0
-#: field:sale.shop,project_id:0
-msgid "Analytic Account"
-msgstr "分析科目"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_line_tree2
-msgid ""
-"Here is a list of each sales order line to be invoiced. You can invoice "
-"sales orders partially, by lines of sales order. You do not need this list "
-"if you invoice from the delivery orders or if you invoice sales totally."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:295
+#: code:addons/sale/sale.py:986
 #, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference Unit of Measure"
+msgstr ""
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,message_summary:0
 msgid ""
-"In order to delete a confirmed sale order, you must cancel it before ! To "
-"cancel a sale order, you must first cancel related picking or delivery "
-"orders."
+"Holds the Chatter summary (number of messages, ...). This summary is "
+"directly in html format in order to be inserted in kanban views."
 msgstr ""
 
 #. module: sale
-#: model:process.node,name:sale.process_node_saleprocurement0
-msgid "Procurement Order"
+#: field:sale.config.settings,group_sale_delivery_address:0
+msgid "Allow a different address for delivery and invoicing "
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,partner_id:0
-msgid "Partner"
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
 msgstr ""
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice based on deliveries"
-msgstr ""
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "傳真 :"
 
 #. module: sale
 #: view:sale.order:0
-msgid "Order Line"
-msgstr "訂單明細"
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_form
-msgid ""
-"Sales Orders help you manage quotations and orders from your customers. "
-"OpenERP suggests that you start by creating a quotation. Once it is "
-"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
-"handle several types of products so that a sales order may trigger tasks, "
-"delivery orders, manufacturing orders, purchases and so on. Based on the "
-"configuration of the sales order, a draft invoice will be generated so that "
-"you just have to confirm it when you want to bill your customer."
+msgid "(update)"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,invoice_quantity:0
-msgid ""
-"The sale order will automatically create the invoice proposition (draft "
-"invoice). Ordered and delivered quantities may not be the same. You have to "
-"choose if you want your invoice based on ordered or shipped quantities. If "
-"the product is a service, shipped quantities means hours spent on the "
-"associated tasks."
+#: help:sale.config.settings,group_discount_per_so_line:0
+msgid "Allows you to apply some discount per sale order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:578
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: field:res.partner,sale_order_ids:0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#, python-format
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "數量 (UoS)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "確認"
+
+#. module: sale
+#: field:sale.config.settings,module_analytic_user_function:0
+msgid "One employee can have different roles per contract"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,note:0
+msgid "Terms and conditions"
 msgstr ""
 
 #. module: sale
@@ -165,39 +625,157 @@ msgid "Default Payment Term"
 msgstr "標準付款條件"
 
 #. module: sale
-#: field:sale.config.picking_policy,deli_orders:0
-msgid "Based on Delivery Orders"
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+#: view:sale.order:0
+msgid "Confirm"
+msgstr "確認"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Unread messages"
 msgstr ""
 
 #. module: sale
-#: field:sale.config.picking_policy,time_unit:0
-msgid "Main Working Time Unit"
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "貨運地址"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:account.invoice.report:0
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
 #: view:sale.report:0
-msgid "State"
+#: field:sale.report,year:0
+msgid "Year"
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,group_uom:0
+msgid "Allow using different units of measures"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "單號"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "訂單行"
+
 #. module: sale
 #: report:sale.order:0
 msgid "Disc.(%)"
 msgstr "折扣(%)"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,price_total:0
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "訂單參考"
+
+#. module: sale
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "發票明細"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
 msgid "Total Price"
 msgstr ""
 
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,module_sale_journal:0
+msgid ""
+"Allows you to categorize your sales and deliveries (picking lists) between "
+"different journals,\n"
+"                and perform batch operations on journals.\n"
+"                This installs the module sale_journal."
+msgstr ""
+
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "My Sale Orders"
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.actions_server_sale_order_read
+msgid "Mark read"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/res_config.py:89
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: field:res.partner,sale_order_count:0
+msgid "# of Sales Order"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,timesheet:0
+msgid ""
+"For modifying account analytic view to show important data to project "
+"manager of services companies.\n"
+"                You can also view the report of account analytic summary "
+"user-wise as well as month wise.\n"
+"                This installs the module account_analytic_analysis."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "等待排程"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
 msgstr ""
 
 #. module: sale
@@ -207,463 +785,25 @@ msgstr "已訂數量"
 
 #. module: sale
 #: view:sale.report:0
-msgid "Sales by Salesman"
+msgid "Ordered Year of the sales order"
 msgstr ""
 
 #. module: sale
-#: field:sale.order.line,move_ids:0
-msgid "Inventory Moves"
-msgstr "存貨調動"
-
-#. module: sale
-#: field:sale.order,name:0 field:sale.order.line,order_id:0
-msgid "Order Reference"
-msgstr "訂單參考"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Other Information"
+#: field:sale.config.settings,module_sale_stock:0
+msgid "Sale and Warehouse Management"
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "Dates"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
-msgid ""
-"The invoice is created automatically if the shipping policy is 'Invoice from "
-"pick' or 'Invoice on order after delivery'."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,task_work:0
-msgid "Based on Tasks' Work"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
-msgid "Quotations and Sales"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_make_invoice
-msgid "Sales Make Invoice"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:330
-#, python-format
-msgid "Pricelist Warning!"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,discount:0
-msgid "Discount (%)"
-msgstr "折扣(%)"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
-msgid "My Quotations"
-msgstr "我的報價單"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.open_board_sales_manager
-#: model:ir.ui.menu,name:sale.menu_board_sales_manager
-msgid "Sales Manager Dashboard"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_packaging:0
-msgid "Packaging"
-msgstr "包裝"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleinvoice0
-msgid "From a sales order"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop Name"
-msgstr "商店名稱"
-
-#. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the picking order after the payment of this invoice.\n"
-"  - The 'Deliver & Invoice on demand' will create the picking order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice based on the sale order or the sale order lines.\n"
-"  - The 'Invoice on order after delivery' choice will generate the draft "
-"invoice based on sales order after all picking lists have been finished.\n"
-"  - The 'Invoice based on deliveries' choice is used to create an invoice "
-"during the picking process."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid "No Customer Defined !"
-msgstr "未定義客戶 !"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree2
-msgid "Sales in Exception"
-msgstr "銷售異常情況"
-
-#. module: sale
-#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
-#, python-format
-msgid "Configuration Error !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Conditions"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1034
-#, python-format
-msgid ""
-"There is no income category account defined in default Properties for "
-"Product Category or Fiscal Position is not defined !"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You try to assign a lot which is not from the same product"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:655
-#, python-format
-msgid "invalid mode for test_state"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:617
-#, python-format
-msgid "Could not cancel this sales order !"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_report
-msgid "Sales Orders Statistics"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,project_id:0
-msgid "The analytic account related to a sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: sale
-#: sql_constraint:stock.picking:0
-msgid "Reference must be unique per Company!"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 view:sale.order:0 view:sale.report:0
-msgid "Quotations"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,pricelist_id:0
-msgid "Pricelist for current sales order."
+#: model:ir.model,name:sale.model_sale_config_settings
+msgid "sale.config.settings"
 msgstr ""
 
 #. module: sale
+#: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-msgid "TVA :"
-msgstr "增值稅(TVA) :"
-
-#. module: sale
-#: help:sale.order.line,delay:0
-msgid ""
-"Number of days between the order confirmation the shipping of the products "
-"to the customer"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Quotation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,fiscal_position:0
-msgid "Fiscal Position"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
-msgid "UoM"
-msgstr "量度單位(UoM)"
-
-#. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number Packages"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "In Progress"
-msgstr "進行中"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_confirmquotation0
-msgid ""
-"The salesman confirms the quotation. The state of the sales order becomes "
-"'In progress' or 'Manual in progress'."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1074
-#, python-format
-msgid "You cannot cancel a sale order line that has already been invoiced!"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1079
-#, python-format
-msgid "You must first cancel stock moves attached to this sales order line."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1147
-#, python-format
-msgid "(n/a)"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,product_id:0
-msgid ""
-"Select a product of type service which is called 'Advance Product'. You may "
-"have to create it and set it as a default value on this field."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Tel. :"
-msgstr "電話 :"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
-#, python-format
-msgid ""
-"You cannot make an advance on a sales order                              "
-"that is defined as 'Automatic Invoice after delivery'."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
-#: field:sale.order.line,notes:0
-msgid "Notes"
-msgstr "備註"
-
-#. module: sale
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,partner_invoice_id:0
-msgid "Invoice address for current sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Month-1"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered month of the sales order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:504
-#, python-format
-msgid ""
-"You cannot group sales having different currencies for the same partner."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver each product when available"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
-msgid "Invoiced"
-msgstr "已開發票"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_deliveryorder0
-msgid "Delivery Order"
-msgstr "交貨單"
-
-#. module: sale
-#: field:sale.order,date_confirm:0
-msgid "Confirmation Date"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,incoterm:0
-msgid "Incoterm"
-msgstr "國際商業用語"
-
-#. module: sale
-#: field:sale.order.line,address_allotment_id:0
-msgid "Allotment Partner"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You can not move products from or to a location of the type view."
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,sale_orders:0
-msgid "Based on Sales Orders"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_total:0
-msgid "The total amount."
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,price_subtotal:0
-msgid "Subtotal"
-msgstr "小計"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Invoice address :"
-msgstr "發票地址 :"
-
-#. module: sale
-#: field:sale.order.line,sequence:0
-msgid "Line Sequence"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleorderprocurement0
-msgid ""
-"For every sales order line, a procurement order is created to supply the "
-"sold product."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,incoterm:0
-msgid ""
-"Incoterm which stands for 'International Commercial terms' implies its a "
-"series of sales terms which are used in the commercial transaction."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_invoice_id:0
-msgid "Invoice Address"
-msgstr "發票地址"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Search Uninvoiced Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.report.xml,name:sale.report_sale_order
-msgid "Quotation / Order"
-msgstr "報價單 / 訂單"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,nbr:0
-msgid "# of Lines"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_open_invoice
-msgid "Sales Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line
-#: field:stock.move,sale_line_id:0
-msgid "Sales Order Line"
-msgstr ""
-
-#. module: sale
-#: field:sale.shop,warehouse_id:0
-msgid "Warehouse"
-msgstr "倉庫"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Order N°"
-msgstr "單號"
-
-#. module: sale
-#: field:sale.order,order_line:0
-msgid "Order Lines"
-msgstr "訂單行"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Untaxed amount"
-msgstr "未完稅金額"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree2
-#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
-msgid "Lines to Invoice"
-msgstr ""
-
-#. module: sale
 #: field:sale.order.line,product_uom_qty:0
-msgid "Quantity (UoM)"
-msgstr "數量(計量單位)"
-
-#. module: sale
-#: field:sale.order,create_date:0
-msgid "Creation Date"
-msgstr ""
-
-#. module: sale
-#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
-msgid "Miscellaneous"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_tree3
-msgid "Uninvoiced and Delivered Lines"
-msgstr "未開票運貨明細"
+msgid "Quantity"
+msgstr "數量"
 
 #. module: sale
 #: report:sale.order:0
@@ -676,32 +816,92 @@ msgid "My Sales"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
-#: code:addons/sale/sale.py:1303
+#: code:addons/sale/sale.py:253
+#: code:addons/sale/sale.py:822
 #, python-format
 msgid "Invalid action !"
 msgstr "無效動作!"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Extra Info"
-msgstr "額外訊息"
-
-#. module: sale
-#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
-#: field:sale.shop,pricelist_id:0
-msgid "Pricelist"
-msgstr "價目表"
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,product_uom_qty:0
-msgid "# of Qty"
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1327
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,module_sale_analytic_plans:0
+msgid "Several analytic accounts on sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:963
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:138
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:142
 #, python-format
-msgid "Hour"
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale
+#: field:account.config.settings,group_analytic_account_for_sales:0
+msgid "Analytic accounting for sales"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"After clicking 'Show Lines to Invoice', select lines to invoice and create "
+"the invoice from the 'More' dropdown menu."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:151
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.act_res_partner_2_sale_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation or sale order for this "
+"customer.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sale "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and\n"
+"                payment.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customer to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid "Invoicing Process"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
 msgstr ""
 
 #. module: sale
@@ -710,101 +910,413 @@ msgid "Order Date"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
-#: field:sale.report,shipped_qty_1:0
-msgid "Shipped"
+#: help:sale.order,order_policy:0
+msgid ""
+"This field controls how invoice and delivery operations are synchronized.\n"
+"  - With 'Before Delivery', a draft invoice is created, and it must be paid "
+"before delivery."
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree5
-msgid "All Quotations"
-msgstr "所有報價單"
+#: view:sale.order:0
+msgid "Sales Order done"
+msgstr ""
 
 #. module: sale
-#: view:sale.config.picking_policy:0
-msgid "Options"
+#: code:addons/sale/sale.py:320
+#, python-format
+msgid "Please define sales journal for this company: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: view:res.partner:0
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_uom:0
+msgid ""
+"Allows you to select and maintain different units of measure for products."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_partner
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Create and View Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "Sale Order for <em>%s</em> has been <b>done</b>"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to define a new sale shop.\n"
+"              </p><p>\n"
+"                Each quotation or sale order must be linked to a shop. The\n"
+"                shop also defines the warehouse from which the products will "
+"be\n"
+"                delivered for each particular sales.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_tree5
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation, the first step of a new sale.\n"
+"              </p><p>\n"
+"                OpenERP will help you handle efficiently the complete sale "
+"flow:\n"
+"                from the quotation to the sale order, the\n"
+"                delivery, the invoicing and the payment collection.\n"
+"              </p><p>\n"
+"                The social feature helps you organize discussions on each "
+"sale\n"
+"                order, and allow your customers to keep track of the "
+"evolution\n"
+"                of the sale order.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "折扣(%)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:783
+#, python-format
+msgid ""
+"There is no Fiscal Position defined or Income category account defined for "
+"default properties of Product categories."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "我的報價單"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid "Invoice Sale Order"
 msgstr ""
 
 #. module: sale
 #: selection:sale.report,month:0
-msgid "September"
+msgid "December"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:632
+#: view:sale.config.settings:0
+msgid "Contracts Management"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Sequence"
+msgstr "次序"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
 #, python-format
 msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1259
-#, python-format
-msgid ""
-"You have to select a pricelist or a customer in the sales form !\n"
-"Please set one before choosing a product."
+#: view:sale.order.line:0
+msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,categ_id:0
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
 msgid "Category of Product"
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/sale.py:557
+#, python-format
+msgid "Cannot cancel this sales order!"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_exists:0
+msgid "It indicates that sale order has at least one invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_mail_message
+msgid "Message"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,module_warning:0
+msgid "Allow configuring alerts by customer or products"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "商店名稱"
+
+#. module: sale
+#: code:addons/sale/sale.py:253
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before !"
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Taxes :"
 msgstr "稅 :"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Stock Moves"
-msgstr "庫存調動"
-
-#. module: sale
-#: field:sale.order,state:0 field:sale.report,state:0
-msgid "Order State"
-msgstr "訂單狀態"
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Do you really want to create the invoice(s)?"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales By Month"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1078
+#: code:addons/sale/sale.py:658
 #, python-format
-msgid "Could not cancel sales order line!"
+msgid "Invoice has been <b>paid</b>."
 msgstr ""
 
 #. module: sale
-#: field:res.company,security_lead:0
-msgid "Security Days"
+#: model:res.groups,name:sale.group_analytic_accounting
+msgid "Analytic Accounting for Sales"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_saleorderprocurement0
-msgid "Procurement of sold material"
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.client,name:sale.action_client_sale_menu
+msgid "Open Sale Menu"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "進行中"
+
+#. module: sale
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid "No Customer Defined !"
+msgstr "未定義客戶 !"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "開立發票"
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:153
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "草稿"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "已付"
+
+#. module: sale
+#: help:sale.order.line,sequence:0
+msgid "Gives the sequence order when displaying a list of sales order lines."
+msgstr ""
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "銷貨單"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "發票分類"
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Create Final Invoice"
+#: field:sale.order,state:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "Status"
+msgstr "狀態"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "On Demand"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,partner_shipping_id:0
-msgid "Shipping Address"
-msgstr "貨運地址"
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
 
 #. module: sale
-#: help:sale.order,shipped:0
+#: view:sale.order:0
+msgid "Sale Order "
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
 msgid ""
-"It indicates that the sales order has been delivered. This field is updated "
-"only after the scheduler(s) have been launched."
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sale\n"
+"                order.\n"
+"              </p><p>\n"
+"                OpenERP will help you efficiently handle the complete sales "
+"flow:\n"
+"                quotation, sale order, delivery, invoicing and payment.\n"
+"              </p>\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "訂單"
+
+#. module: sale
+#: code:addons/sale/sale.py:647
+#, python-format
+msgid "Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "we should put a config wizard for these two fields"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:261
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
 msgstr ""
 
 #. module: sale
@@ -812,46 +1324,156 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
 msgstr ""
 
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,message_comment_ids:0
+#: help:sale.order,message_comment_ids:0
+msgid "Comments and emails"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order.line,state:0
 msgid "Exception"
 msgstr "異常情況"
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_company
-msgid "Companies"
+#: selection:sale.report,month:0
+msgid "October"
 msgstr ""
 
 #. module: sale
-#: help:sale.order,state:0
+#: model:process.transition,note:sale.process_transition_invoice0
 msgid ""
-"Gives the state of the quotation or sales order. \n"
-"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). \n"
-"The 'Waiting Schedule' state is set when the invoice is confirmed but "
-"waiting for the scheduler to run on the order date."
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1272
+#: help:sale.config.settings,module_sale_stock:0
+msgid ""
+"Allows you to Make Quotation, Sale Order using different Order policy and "
+"Manage Related Stock.\n"
+"                    This installs the module sale_stock."
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'.\n"
+"                You may have to create it and set it as a default value on "
+"this field."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "處理中的銷貨單"
+
+#. module: sale
+#: field:sale.order,message_summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,timesheet:0
+msgid "Prepare invoices based on timesheets"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:651
+#, python-format
+msgid "Sale Order for <em>%s</em> <b>cancelled</b>."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,advance_payment_method:0
+msgid "What do you want to invoice?"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,group_sale_pricelist:0
+msgid "Use pricelists to adapt your price per customers"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:958
 #, python-format
 msgid "No valid pricelist line found ! :"
 msgstr ""
 
+#. module: sale
+#: help:sale.config.settings,module_warning:0
+msgid ""
+"Allow to configure warnings on products and trigger them when a user wants "
+"to sale a given product or a given customer.\n"
+"            Example: Product: this product is deprecated, do not purchase "
+"more than 5.\n"
+"            Supplier: don't forget to ask for an express delivery."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
 #. module: sale
 #: view:sale.order:0
 msgid "History"
 msgstr "歷史記錄"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice on order after delivery"
+#: field:sale.config.settings,module_sale_margin:0
+msgid "Display margins on sales orders"
 msgstr ""
 
 #. module: sale
@@ -868,26 +1490,100 @@ msgid "Your Reference"
 msgstr "您的參考"
 
 #. module: sale
-#: help:sale.order,partner_order_id:0
-msgid ""
-"The name and address of the contact who requested the order or quotation."
+#: view:sale.advance.payment.inv:0
+msgid "Show Lines to Invoice"
 msgstr ""
 
 #. module: sale
-#: help:res.company,security_lead:0
-msgid ""
-"This is the days added to what you promise to customers for security purpose"
+#: field:sale.report,date:0
+msgid "Date Order"
 msgstr ""
 
 #. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "價目表"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "增值稅(TVA) :"
+
+#. module: sale
+#: code:addons/sale/sale.py:401
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0
 #: view:sale.order.line:0
-msgid "Qty"
-msgstr "數量"
+msgid "Sales Order Lines"
+msgstr "銷貨單明細"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.open_board_sales
+#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:res.partner:0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "銷售"
+
+#. module: sale
+#: code:addons/sale/sale.py:262
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "References"
-msgstr ""
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "發票"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "單價"
+
+#. module: sale
+#: view:sale.order:0
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "完成"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "發票地址 :"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: view:sale.order:0
+msgid "Invoice"
+msgstr "發票"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -896,562 +1592,64 @@ msgstr ""
 
 #. 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
-#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
-#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
 msgid "Cancel"
 msgstr "取消"
 
+#. module: sale
+#: field:sale.order,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:947
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "報價單"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_account_config_settings
+msgid "account.config.settings"
+msgstr ""
+
 #. module: sale
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0 view:sale.order.line:0
-msgid "Create Invoice"
-msgstr "開立發票"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Excluded"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Order reference"
-msgstr ""
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "You invoice has been successfully created!"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Partner"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,partner_order_id:0
-msgid "Ordering Contact"
-msgstr "訂單聯絡人"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
-#: view:sale.open.invoice:0
-msgid "Open Invoice"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
-msgid "Auto-email confirmed sale orders"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:413
-#, python-format
-msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
-msgid "Force Assignation"
-msgstr "強制指定"
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "按要求"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoiceafterdelivery0
-msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,picking_policy:0
-msgid "Deliver all products at once"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Picking"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,name:0
-msgid "Name"
-msgstr "名稱"
-
-#. module: sale
-#: report:sale.order:0
-msgid "Shipping address :"
-msgstr "貨運地址 :"
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_by_partner
-msgid "Sales per Customer in last 90 days"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_quotation0
-msgid "Draft state of sales order"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_deliver0
-msgid "Create Delivery Order"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1303
-#, python-format
-msgid "Cannot delete a sales order line which is in state '%s'!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoS)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Total Tax Included"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_packing0
-msgid "Create Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered date of the sales order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales by Product Category"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_confirmquotation0
-msgid "Confirm Quotation"
-msgstr "確認報價"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
-#, python-format
-msgid "Error"
-msgstr "錯誤"
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "重新開立發票"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
-#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
-msgid "Deliveries to Invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Waiting Schedule"
-msgstr "等待排程"
-
-#. module: sale
-#: field:sale.order.line,type:0
-msgid "Procurement Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_packinglist0
-msgid "Pick List"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Set to Draft"
-msgstr "設為草稿"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_packinglist0
-msgid "Document of the move to the output or to the customer."
-msgstr ""
-
-#. module: sale
-#: model:email.template,body_text:sale.email_template_edi_sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
 msgid ""
-"\n"
-"Hello${object.partner_order_id.name and ' ' or "
-"''}${object.partner_order_id.name or ''},\n"
-"\n"
-"Here is your order confirmation for ${object.partner_id.name}:\n"
-"       | Order number: *${object.name}*\n"
-"       | Order total: *${object.amount_total} "
-"${object.pricelist_id.currency_id.name}*\n"
-"       | Order date: ${object.date_order}\n"
-"       % if object.origin:\n"
-"       | Order reference: ${object.origin}\n"
-"       % endif\n"
-"       % if object.client_order_ref:\n"
-"       | Your reference: ${object.client_order_ref}<br />\n"
-"       % endif\n"
-"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
-"and '<%s>'%(object.user_id.user_email) or ''}\n"
-"\n"
-"You can view the order confirmation, download it and even pay online using "
-"the following link:\n"
-"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
-"\n"
-"% if object.order_policy in ('prepaid','manual') and "
-"object.company_id.paypal_account:\n"
-"<% \n"
-"comp_name = quote(object.company_id.name)\n"
-"order_name = quote(object.name)\n"
-"paypal_account = quote(object.company_id.paypal_account)\n"
-"order_amount = quote(str(object.amount_total))\n"
-"cur_name = quote(object.pricelist_id.currency_id.name)\n"
-"paypal_url = \"https://www.paypal.com/cgi-"
-"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
-"unt=%s\" \\\n"
-"             "
-"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
-"_%s\" % \\\n"
-"             "
-"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
-"e)\n"
-"%>\n"
-"It is also possible to directly pay with Paypal:\n"
-"    ${paypal_url}\n"
-"% endif\n"
-"\n"
-"If you have any question, do not hesitate to contact us.\n"
-"\n"
-"\n"
-"Thank you for choosing ${object.company_id.name}!\n"
-"\n"
-"\n"
-"--\n"
-"${object.user_id.name} ${object.user_id.user_email and "
-"'<%s>'%(object.user_id.user_email) or ''}\n"
-"${object.company_id.name}\n"
-"% if object.company_id.street:\n"
-"${object.company_id.street or ''}\n"
-"% endif\n"
-"% if object.company_id.street2:\n"
-"${object.company_id.street2}\n"
-"% endif\n"
-"% if object.company_id.city or object.company_id.zip:\n"
-"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
-"% endif\n"
-"% if object.company_id.country_id:\n"
-"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
-"or ''} ${object.company_id.country_id.name or ''}\n"
-"% endif\n"
-"% if object.company_id.phone:\n"
-"Phone: ${object.company_id.phone}\n"
-"% endif\n"
-"% if object.company_id.website:\n"
-"${object.company_id.website or ''}\n"
-"% endif\n"
+"<p>\n"
+"                Here is a list of each sales order line to be invoiced. You "
+"can\n"
+"                invoice sales orders partially, by lines of sales order. You "
+"do\n"
+"                not need this list if you invoice from the delivery orders "
+"or\n"
+"                if you invoice sales totally.\n"
+"              </p>\n"
 "            "
 msgstr ""
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_validate0
-msgid "Validate"
-msgstr "審核"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Confirm Order"
-msgstr "確認訂單"
-
-#. module: sale
-#: model:process.transition,name:sale.process_transition_saleprocurement0
-msgid "Create Procurement Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,amount_tax:0
-#: field:sale.order.line,tax_id:0
-msgid "Taxes"
-msgstr "稅"
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,create_date:0
-msgid "Date on which sales order is created."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_move
-msgid "Stock Move"
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current month"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0
-msgid "Fax :"
-msgstr "傳真 :"
-
-#. module: sale
-#: help:sale.order.line,type:0
-msgid ""
-"If 'on order', it triggers a procurement when the sale order is confirmed to "
-"create a task, purchase order or manufacturing order linked to this sale "
-"order line."
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,amount:0
-msgid "Advance Amount"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,charge_delivery:0
-msgid "Do you charge the delivery?"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,invoice_quantity:0
-msgid "Shipped Quantities"
-msgstr "已運送數量"
-
-#. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Sales Orders"
-msgstr "基於銷貨單的發票"
-
-#. module: sale
-#: code:addons/sale/sale.py:331
-#, python-format
-msgid ""
-"If you change the pricelist of this order (and eventually the currency), "
-"prices of existing order lines will not be updated."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_stock_picking
-msgid "Picking List"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
-#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
-#: code:addons/sale/sale.py:1033
-#, python-format
-msgid "Error !"
-msgstr "錯誤 !"
-
-#. module: sale
-#: code:addons/sale/sale.py:603
-#, python-format
-msgid "Could not cancel sales order !"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Qty(UoM)"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Ordered Year of the sales order"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,procurement_id:0
-msgid "Procurement"
-msgstr "採購"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Shipping Exception"
-msgstr "貨運異常情況"
-
-#. module: sale
-#: code:addons/sale/sale.py:1156
-#, python-format
-msgid "Picking Information ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,grouped:0
-msgid "Group the invoices"
-msgstr "發票分類"
-
-#. module: sale
-#: field:sale.order,order_policy:0
-msgid "Invoice Policy"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_config_picking_policy
-#: view:sale.config.picking_policy:0
-msgid "Setup your Invoicing Method"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "To be reviewed by the accountant."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Reference UoM"
-msgstr ""
-
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid ""
-"This tool will help you to install the right module and configure the system "
-"according to the method you use to invoice your customers."
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order_line_make_invoice
-msgid "Sale OrderLine Make_invoice"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Invoice Exception"
-msgstr "發票異常情況"
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleorder0
-msgid "Drives procurement and invoicing"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,invoiced:0
-msgid "Paid"
-msgstr "已付"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_report_all
-#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
-msgid "Sales Analysis"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1151
-#, python-format
-msgid ""
-"You selected a quantity of %d Units.\n"
-"But it's not compatible with the selected packaging.\n"
-"Here is a proposition of quantities according to the packaging:\n"
-"EAN: %s Quantity: %s Type of ul: %s"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Recreate Packing"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,property_ids:0
-msgid "Properties"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_quotation0
-#: selection:sale.order,state:0 selection:sale.report,state:0
-msgid "Quotation"
-msgstr "報價單"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_invoice0
-msgid ""
-"The Salesman creates an invoice manually, if the sales order shipping policy "
-"is 'Shipping and Manual in Progress'. The invoice is created automatically "
-"if the shipping policy is 'Payment before Delivery'."
-msgstr ""
-
-#. module: sale
-#: help:sale.config.picking_policy,order_policy:0
-msgid ""
-"You can generate invoices based on sales orders or based on shippings."
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Confirmed sale order lines, not yet delivered"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:473
-#, python-format
-msgid "Customer Invoices"
-msgstr ""
-
-#. module: sale
-#: model:process.process,name:sale.process_process_salesprocess0
-#: view:sale.order:0 view:sale.report:0
-msgid "Sales"
-msgstr "銷售"
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,price_unit:0
-msgid "Unit Price"
-msgstr "單價"
-
-#. module: sale
-#: selection:sale.order,state:0 view:sale.order.line:0
-#: selection:sale.order.line,state:0 selection:sale.report,state:0
-msgid "Done"
-msgstr "完成"
-
-#. module: sale
-#: model:process.node,name:sale.process_node_invoice0
-#: model:process.node,name:sale.process_node_invoiceafterdelivery0
-msgid "Invoice"
-msgstr "發票"
-
-#. module: sale
-#: code:addons/sale/sale.py:1171
-#, python-format
-msgid ""
-"You have to select a customer in the sales form !\n"
-"Please set one customer before choosing a product."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,origin:0
-msgid "Source Document"
+#: view:sale.config.settings:0
+msgid "Product Features"
 msgstr ""
 
 #. module: sale
@@ -1460,61 +1658,232 @@ msgid "To Do"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,picking_policy:0
-msgid "Picking Policy"
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "貨運地址 :"
+
+#. module: sale
+#: code:addons/sale/sale.py:460
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
 msgstr ""
 
 #. module: sale
-#: model:process.node,note:sale.process_node_deliveryorder0
-msgid "Document of the move to the customer."
+#: code:addons/sale/sale.py:663
+#, python-format
+msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
 msgstr ""
 
+#. module: sale
+#: field:sale.config.settings,module_account_analytic_analysis:0
+msgid "Use contracts management"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:955
+#, python-format
+msgid ""
+"Cannot find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#: field:sale.order,order_policy:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "開立發票"
+
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:604
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:822
 #, python-format
-msgid "You must first cancel all picking attached to this sales order."
+msgid "You cannot cancel a sale order line that has already been invoiced!"
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_advance_payment_inv
-msgid "Sales Advance Payment Invoice"
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Percentage"
 msgstr ""
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,month:0
-msgid "Month"
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesperson"
 msgstr ""
 
 #. module: sale
-#: model:email.template,subject:sale.email_template_edi_sale
-msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0 field:sale.order.line,product_id:0
-#: view:sale.report:0 field:sale.report,product_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
 msgid "Product"
 msgstr "產品"
 
 #. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
-msgid "Cancel Assignation"
-msgstr "取消指派"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+msgid "%"
 msgstr ""
 
 #. module: sale
-#: view:account.invoice.report:0 view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_turnover_by_month
-msgid "Monthly Turnover"
+#: report:sale.order:0
+msgid "Description"
+msgstr "說明"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:143
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:766
+#, python-format
+msgid "Please define income account for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Price"
+msgstr "價格"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"The exception state is automatically set when a cancel operation occurs in "
+"the invoice validation (Invoice Exception). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "電話 :"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:res.partner:0
+msgid "sale.group_delivery_invoice_address"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "數量"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Send by Mail"
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_mrp_properties
+msgid "Properties on lines"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Sale to Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "報價單 / 訂單"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Inbox"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "客戶"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
 msgstr ""
 
 #. module: sale
@@ -1522,6 +1891,17 @@ msgstr ""
 msgid "Invoice on"
 msgstr "根據以下之發票:"
 
+#. module: sale
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Fixed price (deposit)"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:139
+#, python-format
+msgid "There is no income account defined as global property."
+msgstr ""
+
 #. module: sale
 #: report:sale.order:0
 msgid "Date Ordered"
@@ -1532,31 +1912,98 @@ msgstr "訂單日期"
 msgid "Product UoS"
 msgstr ""
 
+#. module: sale
+#: help:account.config.settings,group_analytic_account_for_sales:0
+msgid "Allows you to specify an analytic account on sale orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
 #. module: sale
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "手動進行中"
 
 #. module: sale
-#: field:sale.order.line,product_uom:0
-msgid "Product UoM"
+#: model:ir.actions.server,name:sale.actions_server_sale_order_unread
+msgid "Mark unread"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:643
+#, python-format
+msgid "Quotation for <em>%s</em> <b>created</b>."
+msgstr ""
+
+#. module: sale
+#: model:res.groups,name:sale.group_delivery_invoice_address
+msgid "Addresses in Sale Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.settings,time_unit:0
+msgid "The default working time unit for services is"
 msgstr ""
 
 #. module: sale
 #: view:sale.order:0
-msgid "Logistic"
+msgid "My Sale Orders"
 msgstr ""
 
 #. module: sale
-#: view:sale.order.line:0
-msgid "Order"
-msgstr "訂單"
+#: model:res.groups,name:sale.group_invoice_so_lines
+msgid "Enable Invoicing Sale order lines"
+msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1017
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#: help:sale.order,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.settings:0
+msgid ""
+"Use contract to be able to manage your services with\n"
+"                        multiple invoicing as part of the same contract "
+"with\n"
+"                        your customer."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:945
 #, python-format
-msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
 msgstr ""
 
 #. module: sale
@@ -1574,566 +2021,55 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:1251
+#: selection:sale.advance.payment.inv,advance_payment_method:0
+msgid "Some order lines"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:986
 #, python-format
-msgid ""
-"You plan to sell %.2f %s but you only have %.2f %s available !\n"
-"The real stock is %.2f %s. (without reservations)"
+msgid "Cannot delete a sales order line which is in state '%s'."
 msgstr ""
 
 #. module: sale
-#: view:sale.order:0
-msgid "States"
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
 msgstr ""
 
-#. module: sale
-#: view:sale.config.picking_policy:0
-msgid "res_config_contents"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Reference"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_total:0 view:sale.order.line:0
-msgid "Total"
-msgstr "總計"
-
-#. module: sale
-#: report:sale.order:0 view:sale.order.line:0
-msgid "Price"
-msgstr "價格"
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_deliver0
-msgid ""
-"Depending on the configuration of the location Output, the move between the "
-"output area and the customer is done through the Delivery Order manually or "
-"automatically."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Pay before delivery"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
-msgid "Sales Dashboard"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
-#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
-#: view:sale.order:0
-msgid "Make Invoices"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
-msgid "To Invoice"
-msgstr ""
-
-#. module: sale
-#: help:sale.order,date_confirm:0
-msgid "Date on which sales order is confirmed."
-msgstr ""
-
-#. module: sale
-#: field:sale.order,project_id:0
-msgid "Contract/Analytic Account"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
-#: view:sale.report:0 field:sale.report,company_id:0
-#: field:sale.shop,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: sale
-#: field:sale.make.invoice,invoice_date:0
-msgid "Invoice Date"
-msgstr ""
-
-#. module: sale
-#: help:sale.advance.payment.inv,amount:0
-msgid "The amount to be invoiced in advance."
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1269
-#, python-format
-msgid ""
-"Couldn't find a pricelist line matching this product and quantity.\n"
-"You have to change either the product, the quantity or the pricelist."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,picking_ids:0
-msgid ""
-"This is a list of picking that has been generated for this sales order."
-msgstr ""
-
-#. module: sale
-#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
-msgid "Create invoices"
-msgstr "開立發票"
-
 #. module: sale
 #: report:sale.order:0
-msgid "Net Total :"
-msgstr "淨計 :"
-
-#. module: sale
-#: selection:sale.order,state:0 selection:sale.order.line,state:0
-#: selection:sale.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sales Order Lines related to a Sales Order of mine"
-msgstr ""
-
-#. 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
-#: view:sale.report:0 field:sale.report,shop_id:0
-msgid "Shop"
-msgstr "商店"
-
-#. module: sale
-#: field:sale.report,date_confirm:0
-msgid "Date Confirm"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid "Warning"
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
-msgid "Sales by Month"
-msgstr ""
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_order
-#: model:process.node,name:sale.process_node_order0
-#: model:process.node,name:sale.process_node_saleorder0
-#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
-#: field:stock.picking,sale_id:0
-msgid "Sales Order"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UoS)"
-msgstr "數量 (UoS)"
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines that are in 'done' state"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_packing0
-msgid ""
-"The Pick List form is created as soon as the sales order is confirmed, in "
-"the same time as the procurement order. It represents the assignment of "
-"parts to the sales order. There is 1 pick list by sales order line which "
-"evolves with the availability of parts."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Confirmed"
-msgstr "確認"
-
-#. module: sale
-#: field:sale.config.picking_policy,order_policy:0
-msgid "Main Method Based On"
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "確認"
-
-#. module: sale
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: sale
-#: view:board.board:0
-#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
-msgid "Sales by Product's Category in last 90 days"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order.line,invoice_lines:0
-msgid "Invoice Lines"
-msgstr "發票明細"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Sales Order Lines"
-msgstr "銷貨單明細"
-
-#. module: sale
-#: field:sale.order.line,delay:0
-msgid "Delivery Lead Time"
-msgstr ""
-
-#. module: sale
-#: view:res.company:0
-msgid "Configuration"
-msgstr "設定"
-
-#. module: sale
-#: code:addons/sale/edi/sale_order.py:146
-#, python-format
-msgid "EDI Pricelist (%s)"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Print Order"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in current year"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:113
-#, python-format
-msgid ""
-"Invoice cannot be created for this Sales Order Line due to one of the "
-"following reasons:\n"
-"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
-"2.The Sales Order Line is Invoiced!"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale order lines done"
-msgstr ""
-
-#. module: sale
-#: field:sale.order.line,th_weight:0
-msgid "Weight"
-msgstr "重量"
-
-#. module: sale
-#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
-msgid "Invoices"
-msgstr "發票"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: sale
-#: field:sale.config.picking_policy,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: sale
-#: model:process.transition,note:sale.process_transition_saleprocurement0
-msgid ""
-"A procurement order is automatically created as soon as a sales order is "
-"confirmed or as the invoice is paid. It drives the purchasing and the "
-"production of products regarding to the rules and to the sales order's "
-"parameters. "
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Uninvoiced"
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
-#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
-#: view:sale.report:0 field:sale.report,user_id:0
-msgid "Salesman"
-msgstr "業務員"
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree
-msgid "Old Quotations"
-msgstr ""
-
-#. module: sale
-#: field:sale.order,amount_untaxed:0
-msgid "Untaxed Amount"
-msgstr "未完稅金額"
-
-#. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
-#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
-#: view:sale.advance.payment.inv:0 view:sale.order:0
-#, python-format
-msgid "Advance Invoice"
-msgstr "先開發票"
-
-#. module: sale
-#: code:addons/sale/sale.py:624
-#, python-format
-msgid "The sales order '%s' has been cancelled."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,state:0
-msgid "Draft"
-msgstr "草稿"
-
-#. module: sale
-#: help:sale.order.line,state:0
-msgid ""
-"* The 'Draft' state is set when the related sales order in draft state.      "
-"               \n"
-"* The 'Confirmed' state is set when the related sales order is confirmed.    "
-"                 \n"
-"* The 'Exception' state is set when the related sales order is set as "
-"exception.                     \n"
-"* The 'Done' state is set when the sales order line has been picked.         "
-"            \n"
-"* The 'Cancelled' state is set when a user cancel the sales order related."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,amount_tax:0
-msgid "The tax amount."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Packings"
-msgstr ""
-
-#. module: sale
-#: view:sale.order.line:0
-msgid "Sale Order Lines ready to be invoiced"
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0
-msgid "Sales order created in last month"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_email_templates
-#: model:ir.ui.menu,name:sale.menu_email_templates
-msgid "Email Templates"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
-msgid "Sales Orders"
-msgstr "銷貨單"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
-msgid "Sales Shop"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: sale
-#: field:sale.advance.payment.inv,product_id:0
-msgid "Advance Product"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Compute"
-msgstr "計算"
-
-#. module: sale
-#: code:addons/sale/sale.py:618
-#, python-format
-msgid "You must first cancel all invoices attached to this sales order."
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_tree4
-msgid "Sales Order in Progress"
-msgstr "處理中的銷貨單"
-
-#. module: sale
-#: help:sale.order,origin:0
-msgid "Reference of the document that generated this sales order request."
-msgstr ""
-
-#. module: sale
-#: view:sale.report:0 field:sale.report,delay:0
-msgid "Commitment Delay"
-msgstr ""
-
-#. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Deliver & invoice on demand"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_saleprocurement0
-msgid ""
-"One Procurement order for each sales order line and for each of the "
-"components."
-msgstr ""
-
-#. module: sale
-#: model:process.transition.action,name:sale.process_transition_action_assign0
-msgid "Assign"
-msgstr ""
-
-#. module: sale
-#: field:sale.report,date:0
-msgid "Date Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,note:sale.process_node_order0
-msgid "Confirmed sales order to invoice."
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0
-msgid "Sales Order that haven't yet been confirmed"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:322
-#, python-format
-msgid "The sales order '%s' has been set in draft state."
-msgstr ""
-
-#. module: sale
-#: selection:sale.order.line,type:0
-msgid "from stock"
-msgstr "自庫存"
-
-#. module: sale
-#: view:sale.open.invoice:0
-msgid "Close"
-msgstr "關閉"
-
-#. module: sale
-#: code:addons/sale/sale.py:1261
-#, python-format
-msgid "No Pricelist ! : "
-msgstr ""
-
-#. module: sale
-#: field:sale.order,shipped:0
-msgid "Delivered"
-msgstr ""
-
-#. module: sale
-#: constraint:stock.move:0
-msgid "You must assign a production lot for this product"
-msgstr ""
-
-#. module: sale
-#: model:ir.actions.act_window,help:sale.action_shop_form
-msgid ""
-"If you have more than one shop reselling your company products, you can "
-"create and manage that from here. Whenever you will record a new quotation "
-"or sales order, it has to be linked to a shop. The shop also defines the "
-"warehouse from which the products will be delivered for each particular "
-"sales."
-msgstr ""
-
-#. module: sale
-#: help:sale.order,invoiced:0
-msgid "It indicates that an invoice has been paid."
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order.line,name:0
-msgid "Description"
-msgstr "說明"
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 field:sale.order,partner_id:0
-#: field:sale.order.line,order_partner_id:0
-msgid "Customer"
-msgstr "客戶"
-
-#. module: sale
-#: model:product.template,name:sale.advance_product_0_product_template
-msgid "Advance"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "February"
-msgstr ""
-
-#. module: sale
-#: selection:sale.report,month:0
-msgid "April"
-msgstr ""
-
-#. module: sale
-#: view:sale.shop:0
-msgid "Accounting"
-msgstr ""
-
-#. module: sale
-#: view:sale.order:0 view:sale.order.line:0
-msgid "Search Sales Order"
-msgstr ""
-
-#. module: sale
-#: model:process.node,name:sale.process_node_saleorderprocurement0
-msgid "Sales Order Requisition"
-msgstr ""
-
-#. module: sale
-#: code:addons/sale/sale.py:1255
-#, python-format
-msgid "Not enough stock ! : "
-msgstr ""
-
-#. module: sale
-#: report:sale.order:0 field:sale.order,payment_term:0
+#: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr "付款條件"
 
 #. module: sale
-#: model:ir.actions.act_window,help:sale.action_order_report_all
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:account.config.settings,module_sale_analytic_plans:0
+msgid "This allows install module sale_analytic_plans."
+msgstr ""
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "or"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,name:0
+msgid "Product Description"
+msgstr ""
+
+#. module: sale
+#: help:sale.config.settings,group_sale_pricelist:0
 msgid ""
-"This report performs analysis on your quotations and sales orders. Analysis "
-"check your sales revenues and sort it by different group criteria (salesman, "
-"partner, product, etc.) Use this report to perform analysis on sales not "
-"having invoiced yet. If you want to analyse your turnover, you should use "
-"the Invoice Analysis report in the Accounting application."
+"Allows to manage different prices based on rules per category of customers.\n"
+"                Example: 10% for retailers, promotion of 5 EUR on this "
+"product, etc."
 msgstr ""
 
 #. module: sale
@@ -2142,19 +2078,64 @@ msgid "Quotation N°"
 msgstr "報價單編號"
 
 #. module: sale
-#: field:sale.order,picked_rate:0 view:sale.report:0
+#: model:res.groups,name:sale.group_discount_per_so_line
+msgid "Discount on lines"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
 msgid "Picked"
 msgstr "已提貨"
 
 #. module: sale
-#: view:sale.report:0 field:sale.report,year:0
-msgid "Year"
+#: help:sale.config.settings,module_sale_margin:0
+msgid ""
+"This adds the 'Margin' on sales order.\n"
+"                This gives the profitability by calculating the difference "
+"between the Unit Price and Cost Price.\n"
+"                This installs the module sale_margin."
 msgstr ""
 
 #. module: sale
-#: selection:sale.config.picking_policy,order_policy:0
-msgid "Invoice Based on Deliveries"
-msgstr "根據交貨的發票"
+#: code:addons/sale/sale.py:867
+#, python-format
+msgid ""
+"Before choosing a product,\n"
+" select a customer in the sales form."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_exists:0
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "已開發票"
+
+#. module: sale
+#: view:sale.advance.payment.inv:0
+msgid ""
+"Select how you want to invoice this order. This\n"
+"                        will create a draft invoice that can be modified\n"
+"                        before validation."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#~ msgid "Delivery Order"
+#~ msgstr "交貨單"
 
 #~ msgid "You invoice has been successfully created !"
 #~ msgstr "您的發票已經開立成功！"
@@ -2162,6 +2143,9 @@ msgstr "根據交貨的發票"
 #~ msgid "Automatic Declaration"
 #~ msgstr "自動聲明"
 
+#~ msgid "Validate"
+#~ msgstr "審核"
+
 #~ msgid "Manual Designation"
 #~ msgstr "手動指定"
 
@@ -2174,27 +2158,60 @@ msgstr "根據交貨的發票"
 #~ msgid "Reference"
 #~ msgstr "參考"
 
+#~ msgid "Notes"
+#~ msgstr "備註"
+
+#~ msgid "Extra Info"
+#~ msgstr "額外訊息"
+
 #~ msgid "Net Price"
 #~ msgstr "淨價"
 
 #~ msgid "My sales order in progress"
 #~ msgstr "我的處理中訂單"
 
+#~ msgid "Shipped Quantities"
+#~ msgstr "已運送數量"
+
+#~ msgid "Warehouse"
+#~ msgstr "倉庫"
+
+#~ msgid "Force Assignation"
+#~ msgstr "強制指定"
+
+#~ msgid "Untaxed amount"
+#~ msgstr "未完稅金額"
+
 #~ msgid "My sales order waiting Invoice"
 #~ msgstr "我的待開發票訂單"
 
+#~ msgid "Confirm Order"
+#~ msgstr "確認訂單"
+
+#~ msgid "Quantity (UoM)"
+#~ msgstr "數量(計量單位)"
+
 #~ msgid "Total amount"
 #~ msgstr "總金額"
 
+#~ msgid "Configuration"
+#~ msgstr "設定"
+
 #~ msgid "Sale Shop"
 #~ msgstr "銷售點"
 
+#~ msgid "All Quotations"
+#~ msgstr "所有報價單"
+
 #~ msgid "Payment accounts"
 #~ msgstr "付款帳號"
 
 #~ msgid "Draft Invoice"
 #~ msgstr "發票草稿"
 
+#~ msgid "Order Line"
+#~ msgstr "訂單明細"
+
 #~ msgid "Packing Default Policy"
 #~ msgstr "標準包裝規則"
 
@@ -2207,18 +2224,36 @@ msgstr "根據交貨的發票"
 #~ msgid "Product sales"
 #~ msgstr "商品銷售"
 
+#~ msgid "Compute"
+#~ msgstr "計算"
+
+#, python-format
+#~ msgid "Error"
+#~ msgstr "錯誤"
+
 #~ msgid "Recreate Procurement"
 #~ msgstr "重新建立採購"
 
 #~ msgid "Partial Delivery"
 #~ msgstr "部份交貨"
 
+#~ msgid "from stock"
+#~ msgstr "自庫存"
+
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "動作定義之模型名稱無效。"
 
+#~ msgid ""
+#~ "If you don't have enough stock available to deliver all at once, do you "
+#~ "accept partial shipments or not?"
+#~ msgstr "如庫存不足以一次過交貨，是否接受部份交貨?"
+
 #~ msgid "Delivery, from the warehouse to the customer."
 #~ msgstr "發貨，從倉庫到客戶。"
 
+#~ msgid "Inventory Moves"
+#~ msgstr "存貨調動"
+
 #~ msgid "After confirming order, Create the invoice."
 #~ msgstr "確認訂單後開立發票。"
 
@@ -2241,6 +2276,10 @@ msgstr "根據交貨的發票"
 #~ msgid "Packing"
 #~ msgstr "包裝"
 
+#, python-format
+#~ msgid "Error !"
+#~ msgstr "錯誤 !"
+
 #~ msgid "Complete Delivery"
 #~ msgstr "已完成交貨"
 
@@ -2250,9 +2289,15 @@ msgstr "根據交貨的發票"
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "無效的XML檢視架構(Invalid XML for View Architecture)!"
 
+#~ msgid "Close"
+#~ msgstr "關閉"
+
 #~ msgid "Customer Ref"
 #~ msgstr "客戶參考"
 
+#~ msgid "Procurement"
+#~ msgstr "採購"
+
 #~ msgid "Payment Accounts"
 #~ msgstr "付款帳號"
 
@@ -2271,6 +2316,9 @@ msgstr "根據交貨的發票"
 #~ msgid "Draft customer invoice, to be reviewed by accountant."
 #~ msgstr "客戶發票草稿，要由會計師審閱。"
 
+#~ msgid "Set to Draft"
+#~ msgstr "設為草稿"
+
 #~ msgid "Sales Order To Be Invoiced"
 #~ msgstr "要開發票的銷貨單"
 
@@ -2300,6 +2348,9 @@ msgstr "根據交貨的發票"
 #~ msgid "All Sales Order"
 #~ msgstr "所有銷貨單"
 
+#~ msgid "Invoice Based on Sales Orders"
+#~ msgstr "基於銷貨單的發票"
+
 #~ msgid "Sale Order Procurement"
 #~ msgstr "銷貨單採購"
 
@@ -2310,9 +2361,6 @@ msgstr "根據交貨的發票"
 #~ msgid "Could not cancel sale order !"
 #~ msgstr "不能取消銷貨單 !"
 
-#~ msgid "Sale Order"
-#~ msgstr "銷貨單"
-
 #~ msgid "Delivery Order Only"
 #~ msgstr "只交貨單"
 
@@ -2322,6 +2370,9 @@ msgstr "根據交貨的發票"
 #~ msgid "Sales order lines"
 #~ msgstr "銷貨單明細"
 
+#~ msgid "on order"
+#~ msgstr "按要求"
+
 #~ msgid "Confirm sale order and Create invoice."
 #~ msgstr "確認銷貨單及開立發票"
 
@@ -2338,6 +2389,9 @@ msgstr "根據交貨的發票"
 #~ msgid "You cannot cancel a sale order line that has already been invoiced !"
 #~ msgstr "不能取消已開立發票的銷貨單明細 !"
 
+#~ msgid "Ordering Contact"
+#~ msgstr "訂單聯絡人"
+
 #~ msgid "Sale Order Line"
 #~ msgstr "銷貨單明細"
 
@@ -2355,15 +2409,18 @@ msgstr "根據交貨的發票"
 #~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
 #~ msgstr "無法刪除已確認的銷貨單 !"
 
+#~ msgid "Salesman"
+#~ msgstr "業務員"
+
 #~ msgid "Canceled"
 #~ msgstr "取消"
 
+#~ msgid "Packaging"
+#~ msgstr "包裝"
+
 #~ msgid "Sales Process"
 #~ msgstr "銷售進度"
 
-#~ msgid "Status"
-#~ msgstr "狀態"
-
 #~ msgid "Procurement Corrected"
 #~ msgstr "已修正採購"
 
@@ -2388,8 +2445,8 @@ msgstr "根據交貨的發票"
 #~ msgid "Other data"
 #~ msgstr "其他資料"
 
-#~ msgid "Sequence"
-#~ msgstr "次序"
+#~ msgid "UoM"
+#~ msgstr "量度單位(UoM)"
 
 #~ msgid "Invoice based on packing lists"
 #~ msgstr "根據包裝清單的發票"
@@ -2404,6 +2461,9 @@ msgstr "根據交貨的發票"
 #~ msgid "Set Default"
 #~ msgstr "設為預定"
 
+#~ msgid "Incoterm"
+#~ msgstr "國際商業用語"
+
 #~ msgid "Sale Invoice"
 #~ msgstr "銷售發票"
 
@@ -2413,6 +2473,9 @@ msgstr "根據交貨的發票"
 #~ msgid "Invoice from the Packing"
 #~ msgstr "根據包裝的發票"
 
+#~ msgid "Cancel Assignation"
+#~ msgstr "取消指派"
+
 #~ msgid ""
 #~ "The name and address of the contact that requested the order or quotation."
 #~ msgstr "訂貨或要求報價之聯絡名稱及地址。"
@@ -2426,6 +2489,9 @@ msgstr "根據交貨的發票"
 #~ msgid "Purchase Pricelists"
 #~ msgstr "購貨價目表"
 
+#~ msgid "Name"
+#~ msgstr "名稱"
+
 #~ msgid "New Quotation"
 #~ msgstr "新報價單"
 
@@ -2438,12 +2504,21 @@ msgstr "根據交貨的發票"
 #~ msgid "Invoice Corrected"
 #~ msgstr "已更正發票"
 
+#~ msgid "Stock Moves"
+#~ msgstr "庫存調動"
+
+#~ msgid "Invoice Based on Deliveries"
+#~ msgstr "根據交貨的發票"
+
 #~ msgid "Error: Invalid ean code"
 #~ msgstr "錯誤：ean 碼無效"
 
 #~ msgid "Sale Pricelists"
 #~ msgstr "銷售價目表"
 
+#~ msgid "Shipping Exception"
+#~ msgstr "貨運異常情況"
+
 #~ msgid ""
 #~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
 #~ "is, quotation is moved to  sale order."
diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml
index b688f2aeb7f..706d42913de 100644
--- a/addons/sale/process/sale_process.xml
+++ b/addons/sale/process/sale_process.xml
@@ -28,18 +28,6 @@
             <field eval="1" name="flow_start"/>
         </record>
 
-        <record id="process_node_saleorderprocurement0" model="process.node">
-            <field name="menu_id" ref="sale.menu_sale_order"/>
-            <field name="model_id" ref="sale.model_sale_order"/>
-            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Sales Order Requisition&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Drives procurement orders for every sales order line.&quot;&quot;&quot;" name="note"/>
-            <field name="subflow_id" ref="process_process_salesprocess0"/>
-            <field name="process_id" ref="procurement.process_process_procurementprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="1" name="flow_start"/>
-        </record>
-
         <record id="process_node_quotation0" model="process.node">
             <field name="menu_id" ref="sale.menu_sale_order"/>
             <field name="model_id" ref="sale.model_sale_order"/>
@@ -62,38 +50,6 @@
             <field eval="0" name="flow_start"/>
         </record>
 
-        <record id="process_node_saleprocurement0" model="process.node">
-            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
-            <field name="model_id" ref="procurement.model_procurement_order"/>
-            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Procurement Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;One Procurement order for each sales order line and for each of the components.&quot;&quot;&quot;" name="note"/>
-            <field name="subflow_id" ref="procurement.process_process_procurementprocess0"/>
-            <field name="process_id" ref="process_process_salesprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="1" name="flow_start"/>
-        </record>
-
-        <record id="process_node_packinglist0" model="process.node">
-            <field name="model_id" ref="stock.model_stock_picking"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Pick List&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Document of the move to the output or to the customer.&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="process_process_salesprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state in ('assigned', 'confirmed')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
-
-        <record id="process_node_deliveryorder0" model="process.node">
-            <field name="model_id" ref="stock.model_stock_picking"/>
-            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Delivery Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Document of the move to the customer.&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="process_process_salesprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state in ('done', 'assigned')&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
-
         <record id="process_node_invoice0" model="process.node">
             <field name="menu_id" ref="account.menu_action_invoice_tree1"/>
             <field name="model_id" ref="account.model_account_invoice"/>
@@ -106,29 +62,6 @@
             <field eval="0" name="flow_start"/>
         </record>
 
-        <record id="process_node_invoiceafterdelivery0" model="process.node">
-            <field name="menu_id" ref="account.menu_action_invoice_tree1"/>
-            <field name="model_id" ref="account.model_account_invoice"/>
-            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
-            <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Based on the shipped or on the ordered quantities.&quot;&quot;&quot;" name="note"/>
-            <field name="process_id" ref="process_process_salesprocess0"/>
-            <field name="subflow_id" ref="account.process_process_invoiceprocess0"/>
-            <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="0" name="flow_start"/>
-        </record>
-
-        <!--
-            Process Condition
-        -->
-
-        <record id="process_condition_conditionafterdelivery0" model="process.condition">
-            <field name="model_id" ref="sale.model_sale_order"/>
-            <field name="node_id" ref="process_node_invoiceafterdelivery0"/>
-            <field eval="&quot;&quot;&quot;object.order_policy=='postpaid'&quot;&quot;&quot;" name="model_states"/>
-            <field eval="&quot;&quot;&quot;condition_after_delivery&quot;&quot;&quot;" name="name"/>
-        </record>
-
         <!--
             Process Transition
         -->
@@ -142,29 +75,6 @@
             <field eval="[(6,0,[ref('sale.trans_draft_router')])]" name="transition_ids"/>
         </record>
 
-        <record id="process_transition_saleprocurement0" model="process.transition">
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Create Procurement Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;A procurement order is automatically created as soon as a sales order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sales order's parameters. &quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_saleorder0"/>
-        </record>
-
-        <record id="process_transition_packing0" model="process.transition">
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Create Pick List&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;The Pick List form is created as soon as the sales order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sales order. There is 1 pick list by sales order line which evolves with the availability of parts.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/>
-        </record>
-
-        <record id="process_transition_deliver0" model="process.transition">
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Create Delivery Order&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;Depending on the configuration of the location Output, the move between the output area and the customer is done through the Delivery Order manually or automatically.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_deliveryorder0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
-        </record>
 
         <record id="process_transition_invoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -175,21 +85,6 @@
             <field eval="[(6,0,[ref('sale.trans_wait_invoice_invoice_manual')])]" name="transition_ids"/>
         </record>
 
-        <record id="process_transition_invoiceafterdelivery0" model="process.transition">
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Create Invoice&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;The invoice is created automatically if the shipping policy is 'Invoice from pick' or 'Invoice on order after delivery'.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="process_node_invoiceafterdelivery0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
-        </record>
-
-        <record id="process_transition_saleorderprocurement0" model="process.transition">
-            <field eval="[(6,0,[])]" name="transition_ids"/>
-            <field eval="&quot;&quot;&quot;Procurement of sold material&quot;&quot;&quot;" name="name"/>
-            <field eval="&quot;&quot;&quot;For every sales order line, a procurement order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
-            <field model="process.node" name="target_node_id" ref="procurement.process_node_procureproducts0"/>
-            <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
-        </record>
 
         <record id="process_transition_saleinvoice0" model="process.transition">
             <field eval="[(6,0,[])]" name="transition_ids"/>
@@ -216,49 +111,7 @@
             <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
             <field name="transition_id" ref="process_transition_confirmquotation0"/>
         </record>
-
-        <record id="process_transition_action_assign0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;action_assign&quot;&quot;&quot;" name="action"/>
-            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;Assign&quot;&quot;&quot;" name="name"/>
-            <field name="transition_id" ref="process_transition_packing0"/>
-        </record>
-
-        <record id="process_transition_action_forceassignation0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;force_assign&quot;&quot;&quot;" name="action"/>
-            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;Force Assignation&quot;&quot;&quot;" name="name"/>
-            <field name="transition_id" ref="process_transition_packing0"/>
-        </record>
-
-        <record id="process_transition_action_cancel1" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;action_cancel&quot;&quot;&quot;" name="action"/>
-            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
-            <field name="transition_id" ref="process_transition_packing0"/>
-        </record>
-
-        <record id="process_transition_action_cancelassignation0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;cancel_assign&quot;&quot;&quot;" name="action"/>
-            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;Cancel Assignation&quot;&quot;&quot;" name="name"/>
-            <field name="transition_id" ref="process_transition_deliver0"/>
-        </record>
-
-        <record id="process_transition_action_validate0" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;test_finished&quot;&quot;&quot;" name="action"/>
-            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;Validate&quot;&quot;&quot;" name="name"/>
-            <field name="transition_id" ref="process_transition_deliver0"/>
-        </record>
-
-        <record id="process_transition_action_cancel2" model="process.transition.action">
-            <field eval="&quot;&quot;&quot;action_cancel&quot;&quot;&quot;" name="action"/>
-            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
-            <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
-            <field name="transition_id" ref="process_transition_deliver0"/>
-        </record>
-
+ 
         <record id="process_transition_action_createinvoice0" model="process.transition.action">
             <field eval="&quot;&quot;&quot;action_invoice_create&quot;&quot;&quot;" name="action"/>
             <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
diff --git a/addons/sale/report/__init__.py b/addons/sale/report/__init__.py
index 0248595f4da..6986639d942 100644
--- a/addons/sale/report/__init__.py
+++ b/addons/sale/report/__init__.py
@@ -22,4 +22,4 @@
 import sale_order
 import sale_report
 
-# 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/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 9f7ba06db95..32926cc0626 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -153,6 +153,12 @@
   </pto_header>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
     <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="265.0,51.0,225.0" style="Table1">
       <tr>
         <td>
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index 6beac7cfd38..f592a8fd66c 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -30,8 +30,6 @@ class sale_report(osv.osv):
     _columns = {
         'date': fields.date('Date Order', readonly=True),
         'date_confirm': fields.date('Date Confirm', readonly=True),
-        'shipped': fields.boolean('Shipped', readonly=True),
-        'shipped_qty_1': fields.integer('Shipped', 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'),
@@ -54,15 +52,15 @@ class sale_report(osv.osv):
             ('waiting_date', 'Waiting Schedule'),
             ('manual', 'Manual In Progress'),
             ('progress', 'In Progress'),
-            ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
             ('cancel', 'Cancelled')
-            ], 'Order State', readonly=True),
+            ], 'Order Status', readonly=True),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', readonly=True),
         'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True),
     }
     _order = 'date desc'
+
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'sale_report')
         cr.execute("""
@@ -86,8 +84,6 @@ class sale_report(osv.osv):
                     extract(epoch from avg(date_trunc('day',s.date_confirm)-date_trunc('day',s.create_date)))/(24*60*60)::decimal(16,2) as delay,
                     s.state,
                     t.categ_id as categ_id,
-                    s.shipped,
-                    s.shipped::integer as shipped_qty_1,
                     s.pricelist_id as pricelist_id,
                     s.project_id as analytic_account_id
                 from
@@ -97,6 +93,7 @@ class sale_report(osv.osv):
                             left join product_template t on (p.product_tmpl_id=t.id)
                     left join product_uom u on (u.id=l.product_uom)
                     left join product_uom u2 on (u2.id=t.uom_id)
+                where l.product_id is not null
                 group by
                     l.product_id,
                     l.product_uom_qty,
@@ -110,7 +107,6 @@ class sale_report(osv.osv):
                     s.shop_id,
                     s.company_id,
                     s.state,
-                    s.shipped,
                     s.pricelist_id,
                     s.project_id
             )
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index 2a60a9157dd..8f725a9eacb 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -7,7 +7,7 @@
         <field name="name">sale.report.tree</field>
         <field name="model">sale.report</field>
         <field name="arch" type="xml">
-            <tree string="Sales Analysis">
+            <tree string="Sales Analysis" create="false">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -20,7 +20,6 @@
                 <field name="categ_id" invisible="1"/>
                 <field name="nbr" sum="# of Lines"/>
                 <field name="product_uom_qty" sum="# of Qty"/>
-                <field name="shipped_qty_1" sum="Shipped"/>
                 <field name="product_uom" invisible="not context.get('set_visible',False)"/>
                 <field name="price_total" sum="Total Price"/>
                 <field name="delay" sum="Commitment Delay"/>
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 0a2e3a49f62..d8e9d0fef6f 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -27,84 +27,56 @@ class sale_configuration(osv.osv_memory):
     _inherit = 'sale.config.settings'
 
     _columns = {
-        'group_invoice_so_lines': fields.boolean('generate invoices based on the sale order',
+        'group_invoice_so_lines': fields.boolean('Generate invoices based on the sale order lines',
             implied_group='sale.group_invoice_so_lines',
             help="To allow your salesman to make invoices for sale order lines using the menu 'Lines to Invoice'."),
-        'group_invoice_deli_orders': fields.boolean('generate invoices after and based on delivery orders',
-            implied_group='sale.group_invoice_deli_orders',
-            help="To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."),
-        'task_work': fields.boolean("prepare invoices based on task's activities",
-            help="""Lets you transfer the entries under tasks defined for Project Management to
-                the Timesheet line entries for particular date and particular user  with the effect of creating, editing and deleting either ways
-                and to automatically creates project tasks from procurement lines.
-                This installs the modules project_timesheet and project_mrp."""),
-        'timesheet': fields.boolean('prepare invoices based on timesheets',
+        'timesheet': fields.boolean('Prepare invoices based on timesheets',
             help = """For modifying account analytic view to show important data to project manager of services companies.
                 You can also view the report of account analytic summary user-wise as well as month wise.
                 This installs the module account_analytic_analysis."""),
-        'module_account_analytic_analysis': fields.boolean('use contracts management',
+        'module_account_analytic_analysis': fields.boolean('Use contracts management',
             help = """Allows to define your customer contracts conditions: invoicing
             method (fixed price, on timesheet, advance invoice), the exact pricing
             (650€/day for a developer), the duration (one year support contract).
             You will be able to follow the progress of the contract and invoice automatically.
             It installs the account_analytic_analysis module."""),
-        'default_order_policy': fields.selection(
-            [('manual', 'Invoice Based on Sales Orders'), ('picking', 'Invoice Based on Deliveries')],
-            'The default invoicing method is', default_model='sale.order',
-            help="You can generate invoices based on sales orders or based on shippings."),
-        'module_delivery': fields.boolean('allow adding shipping costs',
-            help ="""Allows you to add delivery methods in sale orders and delivery orders.
-                You can define your own carrier and delivery grids for prices.
-                This installs the module delivery."""),
         'time_unit': fields.many2one('product.uom', 'The default working time unit for services is'),
-        'default_picking_policy' : fields.boolean("deliver all at once when all products are available.",
-            help = "Sales order by default will be configured to deliver all products at once instead of delivering each product when it is available. This may have an impact on the shipping price."),
-        'group_sale_pricelist':fields.boolean("use pricelists to adapt your price per customers",
+        'group_sale_pricelist':fields.boolean("Use pricelists to adapt your price per customers",
             implied_group='product.group_sale_pricelist',
             help="""Allows to manage different prices based on rules per category of customers.
-                Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
-        'group_uom':fields.boolean("allow using different units of measures",
+Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
+        'group_uom':fields.boolean("Allow using different units of measures",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
-        'group_sale_delivery_address': fields.boolean("allow a different address for delivery and invoicing ",
-            implied_group='sale.group_delivery_invoice_address',
-            help="Allows you to specify different delivery and invoice addresses on a sale order."),
-        'group_mrp_properties': fields.boolean('product properties on order lines',
-            implied_group='sale.group_mrp_properties',
-            help="Allows you to tag sale order lines with properties."),
-        'group_discount_per_so_line': fields.boolean("allow setting a discount on the sale order lines",
+        'group_discount_per_so_line': fields.boolean("Allow setting a discount on the sale order lines",
             implied_group='sale.group_discount_per_so_line',
             help="Allows you to apply some discount per sale order line."),
-        'group_multiple_shops': fields.boolean("manage multiple shops",
-            implied_group='stock.group_locations',
-            help="This allows to configure and use multiple shops."),
-        'module_warning': fields.boolean("allow configuring alerts by customer or products",
-            help="""Allow to configure warnings on products and trigger them when a user wants to sale a given product or a given customer.
-            Example: Product: this product is deprecated, do not purchase more than 5.
-            Supplier: don't forget to ask for an express delivery."""),
-        'module_sale_margin': fields.boolean("display margins on sales orders",
+        'module_warning': fields.boolean("Allow configuring alerts by customer or products",
+            help="""Allow to configure notification on products and trigger them when a user wants to sale a given product or a given customer.
+Example: Product: this product is deprecated, do not purchase more than 5.
+                Supplier: don't forget to ask for an express delivery."""),
+        'module_sale_margin': fields.boolean("Display margins on sales orders",
             help="""This adds the 'Margin' on sales order.
                 This gives the profitability by calculating the difference between the Unit Price and Cost Price.
                 This installs the module sale_margin."""),
-        'module_sale_journal': fields.boolean("allow batch invoicing of delivery orders through journals",
+        'module_sale_journal': fields.boolean("Allow batch invoicing of delivery orders through journals",
             help="""Allows you to categorize your sales and deliveries (picking lists) between different journals,
                 and perform batch operations on journals.
                 This installs the module sale_journal."""),
-        'module_analytic_user_function': fields.boolean("one employee can have different roles per contract",
+        'module_analytic_user_function': fields.boolean("One employee can have different roles per contract",
             help="""Allows you to define what is the default function of a specific user on a given account.
                 This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled.
                 But the possibility to change these values is still available.
                 This installs the module analytic_user_function."""),
-        'module_project_timesheet': fields.boolean("Project Timesheet"),
-        'module_project_mrp': fields.boolean("Project MRP"),
         'module_project': fields.boolean("Project"),
+        'module_sale_stock': fields.boolean("Trigger delivery orders automatically from sale orders",
+            help="""Allows you to Make Quotation, Sale Order using different Order policy and Manage Related Stock.
+                    This installs the module sale_stock."""),
     }
 
     def default_get(self, cr, uid, fields, context=None):
         ir_model_data = self.pool.get('ir.model.data')
         res = super(sale_configuration, self).default_get(cr, uid, fields, context)
-        # task_work, time_unit depend on other fields
-        res['task_work'] = res.get('module_project_mrp') and res.get('module_project_timesheet')
         if res.get('module_project'):
             user = self.pool.get('res.users').browse(cr, uid, uid, context)
             res['time_unit'] = user.company_id.project_time_mode_id.id
@@ -113,31 +85,18 @@ class sale_configuration(osv.osv_memory):
             res['time_unit'] = product.uom_id.id
         return res
 
-    def get_default_sale_config(self, cr, uid, ids, context=None):
-        ir_values = self.pool.get('ir.values')
-        default_picking_policy = ir_values.get_default(cr, uid, 'sale.order', 'picking_policy')
-        return {
-            'default_picking_policy': default_picking_policy == 'one',
-        }
-
     def _get_default_time_unit(self, cr, uid, context=None):
         ids = self.pool.get('product.uom').search(cr, uid, [('name', '=', _('Hour'))], context=context)
         return ids and ids[0] or False
 
     _defaults = {
-        'default_order_policy': 'manual',
         'time_unit': _get_default_time_unit,
     }
 
-
     def set_sale_defaults(self, cr, uid, ids, context=None):
-        ir_values = self.pool.get('ir.values')
         ir_model_data = self.pool.get('ir.model.data')
         wizard = self.browse(cr, uid, ids)[0]
 
-        default_picking_policy = 'one' if wizard.default_picking_policy else 'direct'
-        ir_values.set_default(cr, uid, 'sale.order', 'picking_policy', default_picking_policy)
-
         if wizard.time_unit:
             product = ir_model_data.get_object(cr, uid, 'product', 'product_product_consultant')
             product.write({'uom_id': wizard.time_unit.id, 'uom_po_id': wizard.time_unit.id})
@@ -145,14 +104,7 @@ class sale_configuration(osv.osv_memory):
         if wizard.module_project and wizard.time_unit:
             user = self.pool.get('res.users').browse(cr, uid, uid, context)
             user.company_id.write({'project_time_mode_id': wizard.time_unit.id})
-
-        return {}
-
-    def onchange_invoice_methods(self, cr, uid, ids, group_invoice_so_lines, group_invoice_deli_orders, context=None):
-        if not group_invoice_deli_orders:
-            return {'value': {'default_order_policy': 'manual'}}
-        if not group_invoice_so_lines:
-            return {'value': {'default_order_policy': 'picking'}}
+         
         return {}
 
     def onchange_task_work(self, cr, uid, ids, task_work, context=None):
@@ -167,14 +119,12 @@ class sale_configuration(osv.osv_memory):
             'module_account_analytic_analysis': timesheet,
         }}
 
-
-
 class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
-        'module_sale_analytic_plans': fields.boolean('several analytic accounts on sales',
+        'module_sale_analytic_plans': fields.boolean('Use multiple analytic accounts on sales',
             help="""This allows install module sale_analytic_plans."""),
-        'group_analytic_account_for_sales': fields.boolean('analytic accounting for sales',
+        'group_analytic_account_for_sales': fields.boolean('Analytic accounting for sales',
             implied_group='sale.group_analytic_accounting',
             help="Allows you to specify an analytic account on sale orders."),
     }
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index e07fcccedb2..daf396d302b 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -12,49 +12,27 @@
                     <group>
                         <label for="id" string="Invoicing Process"/>
                         <div>
-                            <div>
-                                <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
+                            <div name="group_invoice_so_lines">
+                                <field name="group_invoice_so_lines" class="oe_inline"/>
                                 <label for="group_invoice_so_lines"/>
                             </div>
-                            <div>
-                                <field name="group_invoice_deli_orders" class="oe_inline" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
-                                <label for="group_invoice_deli_orders"/>
-                            </div>
-                            <div>
-                                <field name="task_work" class="oe_inline" on_change="onchange_task_work(task_work)"/>
-                                <label for="task_work"/>
-                            </div>
-                            <div>
+                            <div name="timesheet">
                                 <field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
                                 <label for="timesheet"/>
                             </div>
                         </div>
                     </group>
-                    <group>
-                        <label for="id" string="Default Options" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False),('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False),('task_work','=',False), ('module_account_analytic_analysis','=',False)]}"/>
+                    <group name='default_options'>
+                        <label for="id" string="Default Options" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
                         <div>
-                            <div attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}">
-                                <label for="default_order_policy"/>
-                                <field name="default_order_policy" class="oe_inline"/>
-                            </div>
-                            <div attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}">
-                                <field name="module_delivery" class="oe_inline"/>
-                                <label for="module_delivery"/>
-                            </div>
-                            <div attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}">
+                            <div name='time_unit' attrs="{'invisible': [('module_account_analytic_analysis','=',False)],'required':[('module_account_analytic_analysis','=',True)]}">
                                 <label for="time_unit"/>
                                 <field name="time_unit" domain="[('category_id.name','=','Working Time')]" class="oe_inline"/>
                             </div>
                         </div>
                     </group>
-                    <field name="module_project_timesheet" invisible="1"/>
-                    <field name="module_project_mrp" invisible="1"/>
                 </div>
                 <div name="Customer Features" position="inside">
-                    <div>
-                        <field name="group_sale_delivery_address" class="oe_inline"/>
-                        <label for="group_sale_delivery_address"/>
-                    </div>
                     <div>
                         <field name="group_sale_pricelist" class="oe_inline"/>
                         <label for="group_sale_pricelist"/>
@@ -67,16 +45,12 @@
                 <group name="Sale" position="before">
                     <group>
                         <label for="id" string="Warehouse Features"/>
-                        <div>
-                            <div attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}">
-                                <field name="default_picking_policy" class="oe_inline"/>
-                                <label for="default_picking_policy"/>
+                        <div name="warehouse_features">
+                            <div name='module_sale_stock'>
+                                <field name="module_sale_stock" class="oe_inline"/>
+                                <label for="module_sale_stock"/>
                             </div>
-                            <div>
-                                <field name="group_mrp_properties" class="oe_inline"/>
-                                <label for="group_mrp_properties"/>
-                            </div>
-                            <div>
+                            <div name='module_sale_journal'>
                                 <field name="module_sale_journal" class="oe_inline"/>
                                 <label for="module_sale_journal"/>
                             </div>
@@ -99,10 +73,6 @@
                     </group>
                 </group>
                 <div name="Sale Features" position="inside">
-                    <div>
-                        <field name="group_multiple_shops" class="oe_inline"/>
-                        <label for="group_multiple_shops"/>
-                    </div>
                     <div name="module_sale_margin">
                         <field name="module_sale_margin" class="oe_inline"/>
                         <label for="module_sale_margin"/>
diff --git a/addons/sale/res_partner.py b/addons/sale/res_partner.py
index d7bcd5804ee..5e8d05b62c1 100644
--- a/addons/sale/res_partner.py
+++ b/addons/sale/res_partner.py
@@ -26,9 +26,13 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
 
     def _sale_order_count(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        for partner in self.browse(cr, uid, ids, context):
-            res[partner.id] = len(partner.sale_order_ids)
+        res = dict(map(lambda x: (x,0), ids))
+        # The current user may not have access rights for sale orders
+        try:
+            for partner in self.browse(cr, uid, ids, context):
+                res[partner.id] = len(partner.sale_order_ids)
+        except:
+            pass
         return res
 
     def copy(self, cr, uid, record_id, default=None, context=None):
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index f076bfda67c..58d337350ba 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -50,6 +50,7 @@
                 <xpath expr="//div[@name='buttons']" position="inside">
                     <button name="%(sale.act_res_partner_2_sale_order)d" type="action"
                         string="Quotations and Sales"
+                        attrs="{'invisible': [('customer', '=', False)]}"
                         groups="base.group_sale_salesman"/>
                 </xpath>
             </field>
@@ -58,7 +59,6 @@
         <record id="res_partner_address_type" model="ir.ui.view">
             <field name="name">res.partner.view.address_type</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">
                 <xpath expr="//label[@for='type']" position="attributes">
@@ -76,7 +76,6 @@
             </field>
         </record>
 
-
     </data>
 </openerp>
 
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index c525ba04df1..c1af024ad9c 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -35,7 +35,6 @@ class sale_shop(osv.osv):
     _columns = {
         'name': fields.char('Shop Name', size=64, required=True),
         'payment_default_id': fields.many2one('account.payment.term', 'Default Payment Term', required=True),
-        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist'),
         'project_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('parent_id', '!=', False)]),
         'company_id': fields.many2one('res.company', 'Company', required=False),
@@ -48,18 +47,25 @@ sale_shop()
 
 class sale_order(osv.osv):
     _name = "sale.order"
-    _inherit = ['ir.needaction_mixin', 'mail.thread']
+    _inherit = ['mail.thread', 'ir.needaction_mixin']
     _description = "Sales Order"
 
+    def onchange_shop_id(self, cr, uid, ids, shop_id, context=None):
+        v = {}
+        if shop_id:
+            shop = self.pool.get('sale.shop').browse(cr, uid, shop_id, context=context)
+            if shop.project_id.id:
+                v['project_id'] = shop.project_id.id
+            if shop.pricelist_id.id:
+                v['pricelist_id'] = shop.pricelist_id.id
+        return {'value': v}
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
         default.update({
             'state': 'draft',
-            'shipped': False,
             'invoice_ids': [],
-            'picking_ids': [],
             'date_confirm': False,
             'name': self.pool.get('ir.sequence').get(cr, uid, 'sale.order'),
         })
@@ -90,44 +96,6 @@ class sale_order(osv.osv):
             res[order.id]['amount_total'] = res[order.id]['amount_untaxed'] + res[order.id]['amount_tax']
         return res
 
-    # This is False
-    def _picked_rate(self, cr, uid, ids, name, arg, context=None):
-        if not ids:
-            return {}
-        res = {}
-        tmp = {}
-        for id in ids:
-            tmp[id] = {'picked': 0.0, 'total': 0.0}
-        cr.execute('''SELECT
-                p.sale_id as sale_order_id, sum(m.product_qty) as nbr, mp.state as procurement_state, m.state as move_state, p.type as picking_type
-            FROM
-                stock_move m
-            LEFT JOIN
-                stock_picking p on (p.id=m.picking_id)
-            LEFT JOIN
-                procurement_order mp on (mp.move_id=m.id)
-            WHERE
-                p.sale_id IN %s GROUP BY m.state, mp.state, p.sale_id, p.type''', (tuple(ids),))
-
-        for item in cr.dictfetchall():
-            if item['move_state'] == 'cancel':
-                continue
-
-            if item['picking_type'] == 'in':#this is a returned picking
-                tmp[item['sale_order_id']]['total'] -= item['nbr'] or 0.0 # Deducting the return picking qty
-                if item['procurement_state'] == 'done' or item['move_state'] == 'done':
-                    tmp[item['sale_order_id']]['picked'] -= item['nbr'] or 0.0
-            else:
-                tmp[item['sale_order_id']]['total'] += item['nbr'] or 0.0
-                if item['procurement_state'] == 'done' or item['move_state'] == 'done':
-                    tmp[item['sale_order_id']]['picked'] += item['nbr'] or 0.0
-
-        for order in self.browse(cr, uid, ids, context=context):
-            if order.shipped:
-                res[order.id] = 100.0
-            else:
-                res[order.id] = tmp[order.id]['total'] and (100.0 * tmp[order.id]['picked'] / tmp[order.id]['total']) or 0.0
-        return res
 
     def _invoiced_rate(self, cursor, user, ids, name, arg, context=None):
         res = {}
@@ -145,6 +113,14 @@ class sale_order(osv.osv):
                 res[sale.id] = 0.0
         return res
 
+    def _invoice_exists(self, cursor, user, ids, name, arg, context=None):
+        res = {}
+        for sale in self.browse(cursor, user, ids, context=context):
+            res[sale.id] = False
+            if sale.invoice_ids:
+                res[sale.id] = True
+        return res
+
     def _invoiced(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):
@@ -156,7 +132,7 @@ class sale_order(osv.osv):
                     if invoice.state != 'paid':
                         res[sale.id] = False
                         break
-            if not invoice_existence:
+            if not invoice_existence or sale.state == 'manual':
                 res[sale.id] = False
         return res
 
@@ -209,42 +185,32 @@ class sale_order(osv.osv):
             ('waiting_date', 'Waiting Schedule'),
             ('progress', 'Sale Order'),
             ('manual', 'Sale to Invoice'),
-            ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
-            ], 'Status', readonly=True, help="Gives the state of the quotation or sales 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 order date.", select=True),
+            ], 'Status', readonly=True, help="Gives the status of the quotation or sales order. \nThe exception status is automatically set when a cancel operation occurs in the processing of a document linked to the sale order. \nThe 'Waiting Schedule' status is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
         'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
         'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."),
         'user_id': fields.many2one('res.users', 'Salesperson', states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True),
         'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, required=True, change_default=True, select=True),
         'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Invoice address for current sales order."),
-        'partner_shipping_id': fields.many2one('res.partner', 'Shipping Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Shipping address for current sales order."),
-
-        'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."),
-        'picking_policy': fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')],
-            'Shipping Policy', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
-            help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"""),
+        'partner_shipping_id': fields.many2one('res.partner', 'Delivery Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Delivery address for current sales order."),
         'order_policy': fields.selection([
                 ('manual', 'On Demand'),
-                ('picking', 'On Delivery Order'),
-                ('prepaid', 'Before Delivery'),
             ], 'Create Invoice', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
             help="""This field controls how invoice and delivery operations are synchronized.
-  - With 'On Demand', the invoice is created manually when needed.
-  - With 'On Delivery Order', a draft invoice is generated after all pickings have been processed.
   - With 'Before Delivery', a draft invoice is created, and it must be paid before delivery."""),
         'pricelist_id': fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Pricelist for current sales order."),
-        'project_id': fields.many2one('account.analytic.account', 'Contract/Analytic Account', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="The analytic account related to a sales order."),
+        'currency_id': fields.related('pricelist_id', 'currency_id', type="many2one", relation="res.currency", readonly=True, required=True),
+        'project_id': fields.many2one('account.analytic.account', 'Contract / Analytic', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="The analytic account related to a sales order."),
 
         'order_line': fields.one2many('sale.order.line', 'order_id', 'Order Lines', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}),
         'invoice_ids': fields.many2many('account.invoice', 'sale_order_invoice_rel', 'order_id', 'invoice_id', 'Invoices', readonly=True, help="This is the list of invoices that have been generated for this sales order. The same sales order may have been invoiced in several times (by line for example)."),
-        'picking_ids': fields.one2many('stock.picking.out', 'sale_id', 'Related Picking', readonly=True, help="This is a list of delivery orders that has been generated for this sales order."),
-        'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."),
-        'picked_rate': fields.function(_picked_rate, string='Picked', type='float'),
         'invoiced_rate': fields.function(_invoiced_rate, string='Invoiced', type='float'),
         'invoiced': fields.function(_invoiced, string='Paid',
             fnct_search=_invoiced_search, type='boolean', help="It indicates that an invoice has been paid."),
+        'invoice_exists': fields.function(_invoice_exists, string='Invoiced',
+            fnct_search=_invoiced_search, type='boolean', help="It indicates that sale order has at least one invoice."),
         'note': fields.text('Terms and conditions'),
 
         'amount_untaxed': fields.function(_amount_all, digits_compute= dp.get_precision('Account'), string='Untaxed Amount',
@@ -266,13 +232,12 @@ class sale_order(osv.osv):
             },
             multi='sums', help="The total amount."),
 
-        'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice). Ordered and delivered quantities may not be the same. You have to choose if you want your invoice based on ordered or shipped quantities. If the product is a service, shipped quantities means hours spent on the associated tasks.", required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'invoice_quantity': fields.selection([('order', 'Ordered Quantities')], 'Invoice on', help="The sale order will automatically create the invoice proposition (draft invoice).", required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
         'company_id': fields.related('shop_id','company_id',type='many2one',relation='res.company',string='Company',store=True,readonly=True)
     }
     _defaults = {
-        'picking_policy': 'direct',
         'date_order': fields.date.context_today,
         'order_policy': 'manual',
         'state': 'draft',
@@ -295,53 +260,40 @@ class sale_order(osv.osv):
             if s['state'] in ['draft', 'cancel']:
                 unlink_ids.append(s['id'])
             else:
-                raise osv.except_osv(_('Invalid Action!'), _('In order to delete a confirmed sales order, you must cancel it.\nTo do so, you must first cancel related picking for delivery orders.'))
+                raise osv.except_osv(_('Invalid Action!'), _('In order to delete a confirmed sale order, you must cancel it before !'))
 
         return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
 
-    def onchange_shop_id(self, cr, uid, ids, shop_id):
-        v = {}
-        if shop_id:
-            shop = self.pool.get('sale.shop').browse(cr, uid, shop_id)
-            v['project_id'] = shop.project_id.id
-            # Que faire si le client a une pricelist a lui ?
-            if shop.pricelist_id.id:
-                v['pricelist_id'] = shop.pricelist_id.id
-        return {'value': v}
+    def copy_quotation(self, cr, uid, ids, context=None):
+        id = self.copy(cr, uid, ids[0], context=None)
+        view_ref = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'sale', 'view_order_form')
+        view_id = view_ref and view_ref[1] or False,
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Sales Order'),
+            'res_model': 'sale.order',
+            'res_id': id,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'view_id': view_id,
+            'target': 'current',
+            'nodestroy': True,
+        }
 
-    def action_cancel_draft(self, cr, uid, ids, context=None):
-        if not len(ids):
-            return False
-        cr.execute('select id from sale_order_line where order_id IN %s and state=%s', (tuple(ids), 'cancel'))
-        line_ids = map(lambda x: x[0], cr.fetchall())
-        self.write(cr, uid, ids, {'state': 'draft', 'invoice_ids': [], 'shipped': 0})
-        self.pool.get('sale.order.line').write(cr, uid, line_ids, {'invoiced': False, 'state': 'draft', 'invoice_lines': [(6, 0, [])]})
-        wf_service = netsvc.LocalService("workflow")
-        for inv_id in ids:
-            # Deleting the existing instance of workflow for SO
-            wf_service.trg_delete(uid, 'sale.order', inv_id, cr)
-            wf_service.trg_create(uid, 'sale.order', inv_id, cr)
-            self.action_cancel_draft_send_note(cr, uid, ids, context=context)
-        return True
-
-    def onchange_pricelist_id(self, cr, uid, ids, pricelist_id, order_lines, context={}):
-        if (not pricelist_id) or (not order_lines):
+    def onchange_pricelist_id(self, cr, uid, ids, pricelist_id, order_lines, context=None):
+        context = context or {}
+        if not pricelist_id:
             return {}
+        value = {
+            'currency_id': self.pool.get('product.pricelist').browse(cr, uid, pricelist_id, context=context).currency_id.id
+        }
+        if not order_lines:
+            return {'value': value}
         warning = {
             'title': _('Pricelist Warning!'),
             'message' : _('If you change the pricelist of this order (and eventually the currency), prices of existing order lines will not be updated.')
         }
-        return {'warning': warning}
-
-    def onchange_partner_order_id(self, cr, uid, ids, order_id, invoice_id=False, shipping_id=False, context={}):
-        if not order_id:
-            return {}
-        val = {}
-        if not invoice_id:
-            val['partner_invoice_id'] = order_id
-        if not shipping_id:
-            val['partner_shipping_id'] = order_id
-        return {'value': val}
+        return {'warning': warning, 'value': value}
 
     def onchange_partner_id(self, cr, uid, ids, part):
         if not part:
@@ -364,30 +316,7 @@ class sale_order(osv.osv):
             val['pricelist_id'] = pricelist
         return {'value': val}
 
-    def shipping_policy_change(self, cr, uid, ids, policy, context=None):
-        if not policy:
-            return {}
-        inv_qty = 'order'
-        if policy == 'prepaid':
-            inv_qty = 'order'
-        elif policy == 'picking':
-            inv_qty = 'procurement'
-        return {'value': {'invoice_quantity': inv_qty}}
-
-    def write(self, cr, uid, ids, vals, context=None):
-        if vals.get('order_policy', False):
-            if vals['order_policy'] == 'prepaid':
-                vals.update({'invoice_quantity': 'order'})
-            elif vals['order_policy'] == 'picking':
-                vals.update({'invoice_quantity': 'procurement'})
-        return super(sale_order, self).write(cr, uid, ids, vals, context=context)
-
     def create(self, cr, uid, vals, context=None):
-        if vals.get('order_policy', False):
-            if vals['order_policy'] == 'prepaid':
-                vals.update({'invoice_quantity': 'order'})
-            if vals['order_policy'] == 'picking':
-                vals.update({'invoice_quantity': 'procurement'})
         order =  super(sale_order, self).create(cr, uid, vals, context=context)
         if order:
             self.create_send_note(cr, uid, [order], context=context)
@@ -420,7 +349,6 @@ class sale_order(osv.osv):
         if not journal_ids:
             raise osv.except_osv(_('Error!'),
                 _('Please define sales journal for this company: "%s" (id:%d).') % (order.company_id.name, order.company_id.id))
-
         invoice_vals = {
             'name': order.client_order_ref or '',
             'origin': order.name,
@@ -441,7 +369,6 @@ class sale_order(osv.osv):
 
         # Care for deprecated _inv_get() hook - FIXME: to be removed after 6.1
         invoice_vals.update(self._inv_get(cr, uid, order, context=context))
-
         return invoice_vals
 
     def _make_invoice(self, cr, uid, order, lines, context=None):
@@ -518,75 +445,36 @@ class sale_order(osv.osv):
         This function returns an action that display existing invoices of given sale order ids. It can either be a in a list or in a form view, if there is only one invoice to show.
         '''
         mod_obj = self.pool.get('ir.model.data')
-        result = {
-            'name': _('Cutomer Invoice'),
-            'view_type': 'form',
-            'res_model': 'account.invoice',
-            'context': "{'type':'out_invoice', 'journal_type': 'sale'}",
-            'type': 'ir.actions.act_window',
-            'nodestroy': True,
-            'target': 'current',
-        }
+        act_obj = self.pool.get('ir.actions.act_window')
+
+        result = mod_obj.get_object_reference(cr, uid, 'account', 'action_invoice_tree1')
+        id = result and result[1] or False
+        result = act_obj.read(cr, uid, [id], context=context)[0]
         #compute the number of invoices to display
         inv_ids = []
         for so in self.browse(cr, uid, ids, context=context):
             inv_ids += [invoice.id for invoice in so.invoice_ids]
         #choose the view_mode accordingly
         if len(inv_ids)>1:
-            res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
-            result.update({
-                'view_mode': 'tree,form',
-                'res_id': inv_ids or False
-            })
+            result['domain'] = "[('id','in',["+','.join(map(str, inv_ids))+"])]"
         else:
             res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
-            result.update({
-                'view_mode': 'form',
-                'res_id': inv_ids and inv_ids[0] or False,
-            })
-        result.update(view_id = res and res[1] or False)
+            result['views'] = [(res and res[1] or False, 'form')]
+            result['res_id'] = inv_ids and inv_ids[0] or False
         return result
 
+    def test_no_product(self, cr, uid, order, context):
+        for line in order.order_line:
+            if line.product_id and (line.product_id.type<>'service'):
+                return False
+        return True
 
-    def action_view_delivery(self, cr, uid, ids, context=None):
-        '''
-        This function returns an action that display existing delivery orders of given sale order ids. It can either be a in a list or in a form view, if there is only one delivery order to show.
-        '''
-        mod_obj = self.pool.get('ir.model.data')
-        result = {
-            'name': _('Delivery Order'),
-            'view_type': 'form',
-            'res_model': 'stock.picking',
-            'context': "{'type':'out'}",
-            'type': 'ir.actions.act_window',
-            'nodestroy': True,
-            'target': 'current',
-        }
-        #compute the number of delivery orders to display
-        pick_ids = []
-        for so in self.browse(cr, uid, ids, context=context):
-            pick_ids += [picking.id for picking in so.picking_ids]
-        #choose the view_mode accordingly
-        if len(pick_ids) > 1:
-            res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_tree')
-            result.update({
-                'view_mode': 'tree,form',
-                'res_id': pick_ids or False
-            })
-        else:
-            res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
-            result.update({
-                'view_mode': 'form',
-                'res_id': pick_ids and pick_ids[0] or False,
-            })
-        result.update(view_id = res and res[1] or False)
-        return result
-
-    def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):
+    def action_invoice_create(self, cr, uid, ids, grouped=False, states=None, date_inv = False, context=None):
+        if states is None:
+            states = ['confirmed', 'done', 'exception']
         res = False
         invoices = {}
         invoice_ids = []
-        picking_obj = self.pool.get('stock.picking')
         invoice = self.pool.get('account.invoice')
         obj_sale_order_line = self.pool.get('sale.order.line')
         partner_currency = {}
@@ -625,8 +513,6 @@ class sale_order(osv.osv):
                 for o, l in val:
                     invoice_ref += o.name + '|'
                     self.write(cr, uid, [o.id], {'state': 'progress'})
-                    if o.order_policy == 'picking':
-                        picking_obj.write(cr, uid, map(lambda x: x.id, o.picking_ids), {'invoice_state': 'invoiced'})
                     cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (o.id, res))
                 invoice.write(cr, uid, [res], {'origin': invoice_ref, 'name': invoice_ref})
             else:
@@ -634,8 +520,6 @@ class sale_order(osv.osv):
                     res = self._make_invoice(cr, uid, order, il, context=context)
                     invoice_ids.append(res)
                     self.write(cr, uid, [order.id], {'state': 'progress'})
-                    if order.order_policy == 'picking':
-                        picking_obj.write(cr, uid, map(lambda x: x.id, order.picking_ids), {'invoice_state': 'invoiced'})
                     cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (order.id, res))
         if res:
             self.invoice_send_note(cr, uid, ids, res, context)
@@ -690,6 +574,7 @@ class sale_order(osv.osv):
             #
             if order.state == 'invoice_except':
                 self.write(cr, uid, [order.id], {'state': 'progress'}, context=context)
+            self.invoice_paid_send_note(cr, uid, [order.id], context=context)
         return True
 
     def action_cancel(self, cr, uid, ids, context=None):
@@ -697,22 +582,7 @@ class sale_order(osv.osv):
         if context is None:
             context = {}
         sale_order_line_obj = self.pool.get('sale.order.line')
-        proc_obj = self.pool.get('procurement.order')
         for sale in self.browse(cr, uid, ids, context=context):
-            for pick in sale.picking_ids:
-                if pick.state not in ('draft', 'cancel'):
-                    raise osv.except_osv(
-                        _('Cannot cancel sales order!'),
-                        _('You must first cancel all delivery order(s) attached to this sales order.'))
-                if pick.state == 'cancel':
-                    for mov in pick.move_lines:
-                        proc_ids = proc_obj.search(cr, uid, [('move_id', '=', mov.id)])
-                        if proc_ids:
-                            for proc in proc_ids:
-                                wf_service.trg_validate(uid, 'procurement.order', proc, 'button_check', cr)
-            for r in self.read(cr, uid, ids, ['picking_ids']):
-                for pick in r['picking_ids']:
-                    wf_service.trg_validate(uid, 'stock.picking', pick, 'button_cancel', cr)
             for inv in sale.invoice_ids:
                 if inv.state not in ('draft', 'cancel'):
                     raise osv.except_osv(
@@ -748,10 +618,12 @@ class sale_order(osv.osv):
         }
 
     def action_wait(self, cr, uid, ids, context=None):
+        context = context or {}
         for o in self.browse(cr, uid, ids):
             if not o.order_line:
                 raise osv.except_osv(_('Error!'),_('You cannot confirm a sale order which has no line.'))
-            if (o.order_policy == 'manual'):
+            noprod = self.test_no_product(cr, uid, o, context)
+            if (o.order_policy == 'manual') or noprod:
                 self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': fields.date.context_today(self, cr, uid, context=context)})
             else:
                 self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': fields.date.context_today(self, cr, uid, context=context)})
@@ -769,13 +641,20 @@ class sale_order(osv.osv):
         template_id = template and template[1] or False
         res = mod_obj.get_object_reference(cr, uid, 'mail', 'email_compose_message_wizard_form')
         res_id = res and res[1] or False
-        ctx = dict(context, active_model='sale.order', active_id=ids[0])
-        ctx.update({'mail.compose.template_id': template_id})
+        ctx = dict(context)
+        ctx.update({
+            'default_model': 'sale.order',
+            'default_res_id': ids[0],
+            'default_use_template': True,
+            'default_template_id': template_id,
+            'default_composition_mode': 'comment',
+            'mark_so_as_sent': True
+        })
         return {
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'mail.compose.message',
-            'views': [(res_id,'form')],
+            'views': [(res_id, 'form')],
             'view_id': res_id,
             'type': 'ir.actions.act_window',
             'target': 'new',
@@ -783,287 +662,40 @@ class sale_order(osv.osv):
             'nodestroy': True,
         }
 
-    def procurement_lines_get(self, cr, uid, ids, *args):
-        res = []
-        for order in self.browse(cr, uid, ids, context={}):
-            for line in order.order_line:
-                if line.procurement_id:
-                    res.append(line.procurement_id.id)
-        return res
-
-    # if mode == 'finished':
-    #   returns True if all lines are done, False otherwise
-    # if mode == 'canceled':
-    #   returns True if there is at least one canceled line, False otherwise
-    def test_state(self, cr, uid, ids, mode, *args):
-        assert mode in ('finished', 'canceled'), _("invalid mode for test_state")
-        finished = True
-        canceled = False
-        notcanceled = False
-        write_done_ids = []
-        write_cancel_ids = []
-        for order in self.browse(cr, uid, ids, context={}):
-            for line in order.order_line:
-                if (not line.procurement_id) or (line.procurement_id.state=='done'):
-                    if line.state != 'done':
-                        write_done_ids.append(line.id)
-                else:
-                    finished = False
-                if line.procurement_id:
-                    if (line.procurement_id.state == 'cancel'):
-                        canceled = True
-                        if line.state != 'exception':
-                            write_cancel_ids.append(line.id)
-                    else:
-                        notcanceled = True
-        if write_done_ids:
-            self.pool.get('sale.order.line').write(cr, uid, write_done_ids, {'state': 'done'})
-        if write_cancel_ids:
-            self.pool.get('sale.order.line').write(cr, uid, write_cancel_ids, {'state': 'exception'})
-
-        if mode == 'finished':
-            return finished
-        elif mode == 'canceled':
-            return canceled
-            if notcanceled:
-                return False
-            return canceled
-
-    def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
-        return {
-            'name': line.name.split('\n')[0],
-            'origin': order.name,
-            'date_planned': date_planned,
-            'product_id': line.product_id.id,
-            'product_qty': line.product_uom_qty,
-            'product_uom': line.product_uom.id,
-            'product_uos_qty': (line.product_uos and line.product_uos_qty)\
-                    or line.product_uom_qty,
-            'product_uos': (line.product_uos and line.product_uos.id)\
-                    or line.product_uom.id,
-            'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
-            'procure_method': line.type,
-            'move_id': move_id,
-            'company_id': order.company_id.id,
-            'note': '\n'.join(line.name.split('\n')[1:]),
-            'property_ids': [(6, 0, [x.id for x in line.property_ids])]
-        }
-
-    def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):
-        location_id = order.shop_id.warehouse_id.lot_stock_id.id
-        output_id = order.shop_id.warehouse_id.lot_output_id.id
-        return {
-            'name': line.name.split('\n')[0][:250],
-            'picking_id': picking_id,
-            'product_id': line.product_id.id,
-            'date': date_planned,
-            'date_expected': date_planned,
-            'product_qty': line.product_uom_qty,
-            'product_uom': line.product_uom.id,
-            'product_uos_qty': (line.product_uos and line.product_uos_qty) or line.product_uom_qty,
-            'product_uos': (line.product_uos and line.product_uos.id)\
-                    or line.product_uom.id,
-            'product_packaging': line.product_packaging.id,
-            'partner_id': line.address_allotment_id.id or order.partner_shipping_id.id,
-            'location_id': location_id,
-            'location_dest_id': output_id,
-            'sale_line_id': line.id,
-            'tracking_id': False,
-            'state': 'draft',
-            #'state': 'waiting',
-            'note': '\n'.join(line.name.split('\n')[1:]),
-            'company_id': order.company_id.id,
-            'price_unit': line.product_id.standard_price or 0.0
-        }
-
-    def _prepare_order_picking(self, cr, uid, order, context=None):
-        pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
-        return {
-            'name': pick_name,
-            'origin': order.name,
-            'date': order.date_order,
-            'type': 'out',
-            'state': 'auto',
-            'move_type': order.picking_policy,
-            'sale_id': order.id,
-            'partner_id': order.partner_shipping_id.id,
-            'note': order.note,
-            'invoice_state': (order.order_policy=='picking' and '2binvoiced') or 'none',
-            'company_id': order.company_id.id,
-        }
-
-    def ship_recreate(self, cr, uid, order, line, move_id, proc_id):
-        # FIXME: deals with potentially cancelled shipments, seems broken (specially if shipment has production lot)
-        """
-        Define ship_recreate for process after shipping exception
-        param order: sale order to which the order lines belong
-        param line: sale order line records to procure
-        param move_id: the ID of stock move
-        param proc_id: the ID of procurement
-        """
-        move_obj = self.pool.get('stock.move')
-        if order.state == 'shipping_except':
-            for pick in order.picking_ids:
-                for move in pick.move_lines:
-                    if move.state == 'cancel':
-                        mov_ids = move_obj.search(cr, uid, [('state', '=', 'cancel'),('sale_line_id', '=', line.id),('picking_id', '=', pick.id)])
-                        if mov_ids:
-                            for mov in move_obj.browse(cr, uid, mov_ids):
-                                # FIXME: the following seems broken: what if move_id doesn't exist? What if there are several mov_ids? Shouldn't that be a sum?
-                                move_obj.write(cr, uid, [move_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
-                                self.pool.get('procurement.order').write(cr, uid, [proc_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
-        return True
-
-    def _get_date_planned(self, cr, uid, order, line, start_date, context=None):
-        date_planned = datetime.strptime(start_date, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=line.delay or 0.0)
-        date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
-        return date_planned
-
-    def _create_pickings_and_procurements(self, cr, uid, order, order_lines, picking_id=False, context=None):
-        """Create the required procurements to supply sale order lines, also connecting
-        the procurements to appropriate stock moves in order to bring the goods to the
-        sale order's requested location.
-
-        If ``picking_id`` is provided, the stock moves will be added to it, otherwise
-        a standard outgoing picking will be created to wrap the stock moves, as returned
-        by :meth:`~._prepare_order_picking`.
-
-        Modules that wish to customize the procurements or partition the stock moves over
-        multiple stock pickings may override this method and call ``super()`` with
-        different subsets of ``order_lines`` and/or preset ``picking_id`` values.
-
-        :param browse_record order: sale order to which the order lines belong
-        :param list(browse_record) order_lines: sale order line records to procure
-        :param int picking_id: optional ID of a stock picking to which the created stock moves
-                               will be added. A new picking will be created if ommitted.
-        :return: True
-        """
-        move_obj = self.pool.get('stock.move')
-        picking_obj = self.pool.get('stock.picking')
-        procurement_obj = self.pool.get('procurement.order')
-        proc_ids = []
-
-        for line in order_lines:
-            if line.state == 'done':
-                continue
-
-            date_planned = self._get_date_planned(cr, uid, order, line, order.date_order, context=context)
-
-            if line.product_id:
-                if line.product_id.product_tmpl_id.type in ('product', 'consu'):
-                    if not picking_id:
-                        picking_id = picking_obj.create(cr, uid, self._prepare_order_picking(cr, uid, order, context=context))
-                    move_id = move_obj.create(cr, uid, self._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, context=context))
-                else:
-                    # a service has no stock move
-                    move_id = False
-
-                proc_id = procurement_obj.create(cr, uid, self._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, context=context))
-                proc_ids.append(proc_id)
-                line.write({'procurement_id': proc_id})
-                self.ship_recreate(cr, uid, order, line, move_id, proc_id)
-
-        wf_service = netsvc.LocalService("workflow")
-        if picking_id:
-            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
-            self.delivery_send_note(cr, uid, [order.id], picking_id, context)
-
-
-        for proc_id in proc_ids:
-            wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
-
-        val = {}
-        if order.state == 'shipping_except':
-            val['state'] = 'progress'
-            val['shipped'] = False
-
-            if (order.order_policy == 'manual'):
-                for line in order.order_line:
-                    if (not line.invoiced) and (line.state not in ('cancel', 'draft')):
-                        val['state'] = 'manual'
-                        break
-        order.write(val)
-        return True
-
-    def action_ship_create(self, cr, uid, ids, context=None):
-        for order in self.browse(cr, uid, ids, context=context):
-            self._create_pickings_and_procurements(cr, uid, order, order.order_line, None, context=context)
-        return True
-
-    def action_ship_end(self, cr, uid, ids, context=None):
-        for order in self.browse(cr, uid, ids, context=context):
-            val = {'shipped': True}
-            if order.state == 'shipping_except':
-                val['state'] = 'progress'
-                if (order.order_policy == 'manual'):
-                    for line in order.order_line:
-                        if (not line.invoiced) and (line.state not in ('cancel', 'draft')):
-                            val['state'] = 'manual'
-                            break
-            for line in order.order_line:
-                towrite = []
-                if line.state == 'exception':
-                    towrite.append(line.id)
-                if towrite:
-                    self.pool.get('sale.order.line').write(cr, uid, towrite, {'state': 'done'}, context=context)
-            res = self.write(cr, uid, [order.id], val)
-            if res:
-                self.delivery_end_send_note(cr, uid, [order.id], context=context)
-        return True
-
-    def has_stockable_products(self, cr, uid, ids, *args):
-        for order in self.browse(cr, uid, ids):
-            for order_line in order.order_line:
-                if order_line.product_id and order_line.product_id.product_tmpl_id.type in ('product', 'consu'):
-                    return True
-        return False
+    def action_done(self, cr, uid, ids, context=None):
+        self.done_send_note(cr, uid, ids, context=context)
+        return self.write(cr, uid, ids, {'state': 'done'}, context=context)
 
     # ------------------------------------------------
     # OpenChatter methods and notifications
     # ------------------------------------------------
 
-    def get_needaction_user_ids(self, cr, uid, ids, context=None):
-        result = super(sale_order, self).get_needaction_user_ids(cr, uid, ids, context=context)
-        for obj in self.browse(cr, uid, ids, context=context):
-            if (obj.state == 'manual' or obj.state == 'progress'):
-                result[obj.id].append(obj.user_id.id)
-        return result
+    def needaction_domain_get(self, cr, uid, ids, context=None):
+        return [('state', '=', 'draft'), ('user_id','=',uid)]
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> has been <b>created</b>.") % (obj.partner_id.name), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> <b>created</b>.") % (obj.partner_id.name), context=context)
 
     def confirm_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s.") % (obj.partner_id.name, obj.amount_total, obj.pricelist_id.currency_id.symbol), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Quotation for <em>%s</em> <b>converted</b> to Sale Order of %s %s.") % (obj.partner_id.name, obj.amount_total, obj.pricelist_id.currency_id.symbol), context=context)
 
     def cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Sale Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Sale Order for <em>%s</em> <b>cancelled</b>.") % (obj.partner_id.name), context=context)
 
-    def delivery_send_note(self, cr, uid, ids, picking_id, context=None):
-        for order in self.browse(cr, uid, ids, context=context):
-            for picking in (pck for pck in order.picking_ids if pck.id == picking_id):
-                # convert datetime field to a datetime, using server format, then
-                # convert it to the user TZ and re-render it with %Z to add the timezone
-                picking_datetime = fields.DT.datetime.strptime(picking.min_date, DEFAULT_SERVER_DATETIME_FORMAT)
-                picking_date_str = fields.datetime.context_timestamp(cr, uid, picking_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
-                self.message_append_note(cr, uid, [order.id], body=_("Delivery Order <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
-
-    def delivery_end_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Order <b>delivered</b>."), context=context)
+    def done_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_post(cr, uid, [obj.id], body=_("Sale Order for <em>%s</em> set to <b>Done</b>") % (obj.partner_id.name), context=context)
 
     def invoice_paid_send_note(self, cr, uid, ids, context=None):
-        self.message_append_note(cr, uid, ids, body=_("Invoice <b>paid</b>."), context=context)
+        self.message_post(cr, uid, ids, body=_("Invoice <b>paid</b>."), context=context)
 
     def invoice_send_note(self, cr, uid, ids, invoice_id, context=None):
         for order in self.browse(cr, uid, ids, context=context):
             for invoice in (inv for inv in order.invoice_ids if inv.id == invoice_id):
-                self.message_append_note(cr, uid, [order.id], body=_("Draft Invoice of %s %s <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
-
-    def action_cancel_draft_send_note(self, cr, uid, ids, context=None):
-        return self.message_append_note(cr, uid, ids, body='Sale order has been set in draft.', context=context)
-
+                self.message_post(cr, uid, [order.id], body=_("Draft Invoice of %s %s <b>waiting for validation</b>.") % (invoice.amount_total, invoice.currency_id.symbol), context=context)
 
 sale_order()
 
@@ -1085,15 +717,6 @@ class sale_order_line(osv.osv):
             res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
         return res
 
-    def _number_packages(self, cr, uid, ids, field_name, arg, context=None):
-        res = {}
-        for line in self.browse(cr, uid, ids, context=context):
-            try:
-                res[line.id] = int((line.product_uom_qty+line.product_packaging.qty-0.0001) / line.product_packaging.qty)
-            except:
-                res[line.id] = 1
-        return res
-
     def _get_uom_id(self, cr, uid, *args):
         try:
             proxy = self.pool.get('ir.model.data')
@@ -1106,35 +729,29 @@ class sale_order_line(osv.osv):
     _description = 'Sales Order Line'
     _columns = {
         'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}),
-        'name': fields.text('Product Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'name': fields.text('Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}),
         'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sales order lines."),
-        'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation the shipping of the products to the customer", readonly=True, states={'draft': [('readonly', False)]}),
         'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True),
         'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True),
         'invoiced': fields.boolean('Invoiced', readonly=True),
-        'procurement_id': fields.many2one('procurement.order', 'Procurement'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price'), 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)]},
+         help="From stock: When needed, the product is taken from the stock or we wait for replenishment.\nOn order: When needed, the product is purchased or produced."),
         'price_subtotal': fields.function(_amount_line, string='Subtotal', digits_compute= dp.get_precision('Account')),
         '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)]},
-            help="If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."),
-        'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
-        'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner'),
+        'address_allotment_id': fields.many2one('res.partner', 'Allotment Partner',help="A partner to whom the particular product needs to be allotted."),
         'product_uom_qty': fields.float('Quantity', digits_compute= dp.get_precision('Product UoS'), 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)' ,digits_compute= dp.get_precision('Product UoS'), readonly=True, states={'draft': [('readonly', False)]}),
         'product_uos': fields.many2one('product.uom', 'Product UoS'),
-        'product_packaging': fields.many2one('product.packaging', 'Packaging'),
-        'move_ids': fields.one2many('stock.move', 'sale_line_id', 'Inventory Moves', readonly=True),
         'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Discount'), readonly=True, states={'draft': [('readonly', False)]}),
-        'number_packages': fields.function(_number_packages, type='integer', string='Number Packages'),
         'th_weight': fields.float('Weight', readonly=True, states={'draft': [('readonly', False)]}),
         'state': fields.selection([('cancel', 'Cancelled'),('draft', 'Draft'),('confirmed', 'Confirmed'),('exception', 'Exception'),('done', 'Done')], 'Status', required=True, readonly=True,
-                help='* The \'Draft\' state is set when the related sales order in draft state. \
-                    \n* The \'Confirmed\' state is set when the related sales order is confirmed. \
-                    \n* The \'Exception\' state is set when the related sales order is set as exception. \
-                    \n* The \'Done\' state is set when the sales order line has been picked. \
-                    \n* The \'Cancelled\' state is set when a user cancel the sales order related.'),
+                help='* The \'Draft\' status is set when the related sales order in draft status. \
+                    \n* The \'Confirmed\' status is set when the related sales order is confirmed. \
+                    \n* The \'Exception\' status is set when the related sales order is set as exception. \
+                    \n* The \'Done\' status is set when the sales order line has been picked. \
+                    \n* The \'Cancelled\' status is set when a user cancel the sales order related.'),
         'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', store=True, string='Customer'),
         'salesman_id':fields.related('order_id', 'user_id', type='many2one', relation='res.users', store=True, string='Salesperson'),
         'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True),
@@ -1143,17 +760,27 @@ class sale_order_line(osv.osv):
     _defaults = {
         'product_uom' : _get_uom_id,
         'discount': 0.0,
-        'delay': 0.0,
         'product_uom_qty': 1,
         'product_uos_qty': 1,
         'sequence': 10,
         'invoiced': 0,
         'state': 'draft',
         'type': 'make_to_stock',
-        'product_packaging': False,
         'price_unit': 0.0,
     }
 
+    def _get_line_qty(self, cr, uid, line, context=None):
+        if (line.order_id.invoice_quantity=='order'):
+            if line.product_uos:
+                return line.product_uos_qty or 0.0
+        return line.product_uom_qty
+
+    def _get_line_uom(self, cr, uid, line, context=None):
+        if (line.order_id.invoice_quantity=='order'):
+            if line.product_uos:
+                return line.product_uos.id
+        return line.product_uom.id
+
     def _prepare_order_line_invoice_line(self, cr, uid, line, account_id=False, context=None):
         """Prepare the dict of values to create the new invoice line for a
            sale order line. This method may be overridden to implement custom
@@ -1165,25 +792,7 @@ class sale_order_line(osv.osv):
                (this is used for returning products including service)
            :return: dict of values to create() the invoice line
         """
-
-        def _get_line_qty(line):
-            if (line.order_id.invoice_quantity=='order') or not line.procurement_id:
-                if line.product_uos:
-                    return line.product_uos_qty or 0.0
-                return line.product_uom_qty
-            else:
-                return self.pool.get('procurement.order').quantity_get(cr, uid,
-                        line.procurement_id.id, context=context)
-
-        def _get_line_uom(line):
-            if (line.order_id.invoice_quantity=='order') or not line.procurement_id:
-                if line.product_uos:
-                    return line.product_uos.id
-                return line.product_uom.id
-            else:
-                return self.pool.get('procurement.order').uom_get(cr, uid,
-                        line.procurement_id.id, context=context)
-
+        res = {}
         if not line.invoiced:
             if not account_id:
                 if line.product_id:
@@ -1199,8 +808,8 @@ class sale_order_line(osv.osv):
                             'property_account_income_categ', 'product.category',
                             context=context)
                     account_id = prop and prop.id or False
-            uosqty = _get_line_qty(line)
-            uos_id = _get_line_uom(line)
+            uosqty = self._get_line_qty(cr, uid, line, context=context)
+            uos_id = self._get_line_uom(cr, uid, line, context=context)
             pu = 0.0
             if uosqty:
                 pu = round(line.price_unit * line.product_uom_qty / uosqty,
@@ -1210,8 +819,9 @@ class sale_order_line(osv.osv):
             if not account_id:
                 raise osv.except_osv(_('Error!'),
                             _('There is no Fiscal Position defined or Income category account defined for default properties of Product categories.'))
-            return {
+            res = {
                 'name': line.name,
+                'sequence': line.sequence,
                 'origin': line.order_id.name,
                 'account_id': account_id,
                 'price_unit': pu,
@@ -1223,7 +833,7 @@ class sale_order_line(osv.osv):
                 'account_analytic_id': line.order_id.project_id and line.order_id.project_id.id or False,
             }
 
-        return False
+        return res
 
     def invoice_line_create(self, cr, uid, ids, context=None):
         if context is None:
@@ -1249,11 +859,6 @@ 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.'))
-            for move_line in line.move_ids:
-                if move_line.state != 'cancel':
-                    raise osv.except_osv(
-                            _('Cannot cancel sales order line!'),
-                            _('You must first cancel stock moves attached to this sales order line.'))
         return self.write(cr, uid, ids, {'state': 'cancel'})
 
     def button_confirm(self, cr, uid, ids, context=None):
@@ -1289,56 +894,9 @@ class sale_order_line(osv.osv):
     def copy_data(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
-        default.update({'state': 'draft', 'move_ids': [], 'invoiced': False, 'invoice_lines': []})
+        default.update({'state': 'draft',  'invoiced': False, 'invoice_lines': []})
         return super(sale_order_line, self).copy_data(cr, uid, id, default, context=context)
 
-    def product_packaging_change(self, cr, uid, ids, pricelist, product, qty=0, uom=False,
-                                   partner_id=False, packaging=False, flag=False, context=None):
-        if not product:
-            return {'value': {'product_packaging': False}}
-        product_obj = self.pool.get('product.product')
-        product_uom_obj = self.pool.get('product.uom')
-        pack_obj = self.pool.get('product.packaging')
-        warning = {}
-        result = {}
-        warning_msgs = ''
-        if flag:
-            res = self.product_id_change(cr, uid, ids, pricelist=pricelist,
-                    product=product, qty=qty, uom=uom, partner_id=partner_id,
-                    packaging=packaging, flag=False, context=context)
-            warning_msgs = res.get('warning') and res['warning']['message']
-
-        products = product_obj.browse(cr, uid, product, context=context)
-        if not products.packaging:
-            packaging = result['product_packaging'] = False
-        elif not packaging and products.packaging and not flag:
-            packaging = products.packaging[0].id
-            result['product_packaging'] = packaging
-
-        if packaging:
-            default_uom = products.uom_id and products.uom_id.id
-            pack = pack_obj.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 or _('(n/a)')
-                qty_pack = pack.qty
-                type_ul = pack.ul
-                if not warning_msgs:
-                    warn_msg = _("You selected a quantity of %d Units.\n"
-                                "But it's not compatible with the selected packaging.\n"
-                                "Here is a proposition of quantities according to the packaging:\n"
-                                "EAN: %s Quantity: %s Type of ul: %s") % \
-                                    (qty, ean, qty_pack, type_ul.name)
-                    warning_msgs += _("Picking Information ! : ") + warn_msg + "\n\n"
-                warning = {
-                       'title': _('Configuration Error!'),
-                       'message': warning_msgs
-                }
-            result['product_uom_qty'] = qty
-
-        return {'value': result, 'warning': warning}
-
     def product_id_change(self, cr, uid, ids, pricelist, 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, context=None):
@@ -1356,16 +914,15 @@ class sale_order_line(osv.osv):
         context_partner = {'lang': lang, 'partner_id': partner_id}
 
         if not product:
-            return {'value': {'th_weight': 0, 'product_packaging': False,
+            return {'value': {'th_weight': 0,
                 'product_uos_qty': qty}, 'domain': {'product_uom': [],
                    'product_uos': []}}
         if not date_order:
             date_order = time.strftime(DEFAULT_SERVER_DATE_FORMAT)
 
-        res = self.product_packaging_change(cr, uid, ids, pricelist, product, qty, uom, partner_id, packaging, context=context)
-        result = res.get('value', {})
-        warning_msgs = res.get('warning') and res['warning']['message'] or ''
-        product_obj = product_obj.browse(cr, uid, product, context=context)
+        result = {}
+        warning_msgs = {}
+        product_obj = product_obj.browse(cr, uid, product, context=context_partner)
 
         uom2 = False
         if uom:
@@ -1381,9 +938,7 @@ class sale_order_line(osv.osv):
                 uos = False
         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)
             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_partner)[0][1]
@@ -1412,6 +967,7 @@ class sale_order_line(osv.osv):
         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)
+            result['product_uom'] = default_uom
             if product_obj.uos_id:
                 result['product_uos'] = product_obj.uos_id.id
                 result['product_uos_qty'] = qty * product_obj.uos_coeff
@@ -1422,14 +978,6 @@ class sale_order_line(osv.osv):
 
         if not uom2:
             uom2 = product_obj.uom_id
-        compare_qty = float_compare(product_obj.virtual_available * uom2.factor, qty * product_obj.uom_id.factor, precision_rounding=product_obj.uom_id.rounding)
-        if (product_obj.type=='product') and int(compare_qty) == -1 \
-          and (product_obj.procure_method=='make_to_stock'):
-            warn_msg = _('You plan to sell %.2f %s but you only have %.2f %s available !\nThe real stock is %.2f %s. (without reservations)') % \
-                    (qty, uom2 and uom2.name or product_obj.uom_id.name,
-                     max(0,product_obj.virtual_available), product_obj.uom_id.name,
-                     max(0,product_obj.qty_available), product_obj.uom_id.name)
-            warning_msgs += _("Not enough stock ! : ") + warn_msg + "\n\n"
         # get unit price
 
         if not pricelist:
@@ -1479,15 +1027,15 @@ class sale_order_line(osv.osv):
 
 sale_order_line()
 
-class mail_message(osv.osv):
-    _inherit = 'mail.message'
-
-    def _postprocess_sent_message(self, cr, uid, message, context=None):
-        if message.model == 'sale.order':
+class mail_compose_message(osv.osv):
+    _inherit = 'mail.compose.message'
+    def send_mail(self, cr, uid, ids, context=None):
+        context = context or {}
+        if context.get('mark_so_as_sent', False) and context.get('default_res_id', False):
             wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'sale.order', message.res_id, 'quotation_sent', cr)
-        return super(mail_message, self)._postprocess_sent_message(cr, uid, message=message, context=context)
+            wf_service.trg_validate(uid, 'sale.order', context.get('default_res_id', False), 'quotation_sent', cr)
+        return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context)
 
-mail_message()
+mail_compose_message()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/sale_data.xml b/addons/sale/sale_data.xml
index bbee9ca7455..3fe03966da2 100644
--- a/addons/sale/sale_data.xml
+++ b/addons/sale/sale_data.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        <record id="account_voucher.todo_open_invoice_menu" model="ir.actions.todo">
-            <field name="state">done</field>
-        </record>
-    </data>
     <data noupdate="1">
 
         <!-- After installation of the module, open the related menu -->
@@ -13,10 +8,9 @@
             <field name="tag">reload</field>
             <field name="params" eval="{'menu_id': ref('base.menu_base_partner')}"/>
         </record>
-        <record id="todo_open_sale_menu" model="ir.actions.todo">
+        <record id="base.open_menu" model="ir.actions.todo">
             <field name="action_id" ref="action_client_sale_menu"/>
-            <field name="type">automatic</field>
-            <field name="sequence">100</field>
+            <field name="state">open</field>
         </record>
 
         <!-- Requests Links -->
@@ -28,7 +22,6 @@
         <!-- Resource: sale.shop -->
         <record id="sale_shop_1" model="sale.shop">
             <field name="company_id" ref="base.main_company"/>
-            <field name="warehouse_id" ref="stock.warehouse0"/>
             <field name="payment_default_id" ref="account.account_payment_term"/>
             <field name="pricelist_id" ref="product.list0"/>
 
@@ -41,13 +34,14 @@
         <function eval="('default',False,'shop_id', [('sale.order', False)], sale_shop_1, True, False, False, False, True)" id="sale_default_set" model="ir.values" name="set"/>
 
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>The Sales Management application has been installed.</value>
-            <value>This modules allows you to create and send easily quotations and process your sales orders; from the delivery to the invoicing.
-
-If you need to manage your sales pipeline (leads, opportunities, phonecalls), you can install the module &lt;i&gt;CRM&lt;/i&gt; from the top menu Settings.</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Sales Management application installed!</field>
+            <field name="body"><![CDATA[<p>This application lets you create and send quotations and process your sales orders; from delivery to invoicing.</p>
+<p>If you need to manage your sales pipeline (leads, opportunities, phonecalls), the <i>CRM</i> application may be useful. Use the Settings menu to install it.</p>]]></field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index 813c7e9af03..428b586ffa8 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -9,7 +9,6 @@
             <field name="shop_id" ref="sale_shop_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="pricelist_id" ref="product.list0"/>
-            <field name="order_policy">prepaid</field>
         </record>
 
         <record id="sale_order_line_1" model="sale.order.line">
@@ -60,7 +59,6 @@
             <field name="product_uos_qty">24</field>
             <field name="product_uom" ref="product.product_uom_hour"/>
             <field name="price_unit">75.00</field>
-            <field name="type">make_to_order</field>
         </record>
 
         <record id="sale_order_line_5" model="sale.order.line">
@@ -71,7 +69,6 @@
             <field name="product_uos_qty">30</field>
             <field name="product_uom" ref="product.product_uom_hour"/>
             <field name="price_unit">38.25</field>
-            <field name="type">make_to_order</field>
         </record>
 
         <record id="sale_order_3" model="sale.order">
@@ -92,7 +89,6 @@
             <field name="product_uos_qty">10</field>
             <field name="product_uom" ref="product.product_uom_hour"/>
             <field name="price_unit">30.75</field>
-            <field name="type">make_to_order</field>
         </record>
 
         <record id="sale_order_line_7" model="sale.order.line">
@@ -112,7 +108,6 @@
             <field name="shop_id" ref="sale_shop_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="pricelist_id" ref="product.list0"/>
-            <field name="order_policy">prepaid</field>
         </record>
 
         <record id="sale_order_line_8" model="sale.order.line">
@@ -123,7 +118,6 @@
             <field name="product_uos_qty">16</field>
             <field name="product_uom" ref="product.product_uom_hour"/>
             <field name="price_unit">75.00</field>
-            <field name="type">make_to_order</field>
         </record>
 
         <record id="sale_order_line_9" model="sale.order.line">
@@ -163,7 +157,6 @@
             <field name="shop_id" ref="sale_shop_1"/>
             <field name="user_id" ref="base.user_demo"/>
             <field name="pricelist_id" ref="product.list0"/>
-            <field name="order_policy">picking</field>
         </record>
 
         <record id="sale_order_line_12" model="sale.order.line">
@@ -203,7 +196,6 @@
             <field name="shop_id" ref="sale_shop_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="pricelist_id" ref="product.list0"/>
-            <field name="order_policy">picking</field>
         </record>
 
         <record id="sale_order_line_15" model="sale.order.line">
@@ -220,7 +212,6 @@
             <field name="partner_id" ref="base.res_partner_11"/>
             <field name="partner_invoice_id" ref="base.res_partner_address_20"/>
             <field name="partner_shipping_id" ref="base.res_partner_address_20"/>
-            <field name="shop_id" ref="sale_shop_1"/>
             <field name="user_id" ref="base.user_root"/>
             <field name="pricelist_id" ref="product.list0"/>
             <field name="order_policy">manual</field>
@@ -297,10 +288,38 @@
         </record>
 
         <!-- Confirm some Sale Orders-->
-        <workflow action="order_confirm" model="sale.order" ref="sale_order_1"/>
-        <workflow action="order_confirm" model="sale.order" ref="sale_order_5"/>
         <workflow action="order_confirm" model="sale.order" ref="sale_order_7"/>
 
+        <record id="message_sale_1" model="mail.message">
+            <field name="model">sale.order</field>
+            <field name="res_id" ref="sale_order_2"/>
+            <field name="body">Hi,
+I have a question regarding services pricing: I heard of a possible discount for quantities exceeding 25 hours.
+Could you confirm, please?</field>
+            <field name="type">comment</field>
+            <field name="author_id" ref="base.partner_demo"/>
+        </record>
+
+        <record id="message_sale_2" model="mail.message">
+            <field name="model">sale.order</field>
+            <field name="res_id" ref="sale_order_2"/>
+            <field name="parent_id" ref="message_sale_1"/>
+            <field name="body">Hello, 
+Unfortunately that was a temporary discount that is not available anymore.
+Do you still plan to confirm the order based on the quoted prices?
+Thanks!</field>
+            <field name="type">comment</field>
+            <field name="author_id" ref="base.partner_root"/>
+        </record>
+
+        <record id="message_sale_3" model="mail.message">
+            <field name="model">sale.order</field>
+            <field name="res_id" ref="sale_order_2"/>
+            <field name="parent_id" ref="message_sale_2"/>
+            <field name="body">Alright, thanks for the clarification. I will confirm the order as soon as I get my manager's approval.</field>
+            <field name="type">comment</field>
+            <field name="author_id" ref="base.partner_demo"/>
+        </record>
         <!-- sale advance demo.. -->
         <!-- Demo Data for Product -->
 
@@ -310,7 +329,7 @@
             <field name="type">service</field>
             <field name="list_price">150.0</field>
             <field name="standard_price">100.0</field>
-            <field name="supply_method">produce</field>
+            <field name="supply_method">produce</field> <!-- TODO this is a procurement field, which is not a sale dependency -->
             <field name="uom_id" ref="product.product_uom_day"/>
             <field name="uom_po_id" ref="product.product_uom_day"/>
             <field name="company_id" eval="[]"/>
@@ -321,9 +340,5 @@
             <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
         </record>
 
-
-        <!-- Run all schedulers -->
-        <function model="procurement.order" name="run_scheduler"/>
-
     </data>
 </openerp>
diff --git a/addons/sale/sale_unit_test.xml b/addons/sale/sale_unit_test.xml
index e2a930146a7..18a59320d9c 100644
--- a/addons/sale/sale_unit_test.xml
+++ b/addons/sale/sale_unit_test.xml
@@ -13,7 +13,7 @@
         <!-- Resource: sale.order.line -->
         <record id="test_order_1_line_1" model="sale.order.line">
             <field name="order_id" ref="test_order_1"/>
-            <field name="name">[PC1] Basic PC</field>
+            <field name="name">[PCSC234] PC Assemble SC234</field>
             <field name="product_id" ref="product.product_product_3"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">450</field>
@@ -23,7 +23,7 @@
         </record>
         <record id="test_order_1_line_3" model="sale.order.line">
             <field name="order_id" ref="test_order_1"/>
-            <field name="name">[RAM512] DDR 512MB PC400</field>
+            <field name="name">[HDD-SH2] HDD SH-2</field>
             <field name="product_id" ref="product.product_product_18"/>
             <field name="product_uom" ref="product.product_uom_unit"/>
             <field name="price_unit">90</field>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c4edc162f08..9f385339173 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -21,9 +21,7 @@
                 <form string="Sales Shop" version="7.0">
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
-                    <label for="warehouse_id" class="oe_edit_only"/>
-                    <h2><field name="warehouse_id" required="1"/></h2>
-                    <group>
+                    <group name="shop">
                         <group>
                             <field name="payment_default_id"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist"/>
@@ -34,15 +32,15 @@
                         </group>
                     </group>
                 </form>
-            </field>
+           </field>
         </record>
+        
         <record id="view_shop_tree" model="ir.ui.view">
             <field name="name">sale.shop</field>
             <field name="model">sale.shop</field>
             <field name="arch" type="xml">
                 <tree string="Sales Shop">
                     <field name="name"/>
-                    <field name="warehouse_id"/>
                     <field name="pricelist_id" groups="product.group_sale_pricelist"/>
                     <field name="project_id" groups="analytic.group_analytic_accounting"/>
                 </tree>
@@ -67,8 +65,6 @@
             </field>
         </record>
 
-        <menuitem action="action_shop_form" id="menu_action_shop_form" parent="base.menu_base_config" sequence="35"
-            groups="stock.group_locations"/>
 
         <!-- Sale order Read/Unread actions -->
         <record id="actions_server_sale_order_unread" model="ir.actions.server">
@@ -77,7 +73,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_sale_order"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_unread(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_sale_order_unread" model="ir.values">
             <field name="name">action_sale_order_unread</field>
@@ -95,7 +91,7 @@
             <field name="type">ir.actions.server</field>
             <field name="model_id" ref="model_sale_order"/>
             <field name="state">code</field>
-            <field name="code">self.message_check_and_set_read(cr, uid, context.get('active_ids'), context=context)</field>
+            <field name="code">self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context)</field>
         </record>
         <record id="action_sale_order_read" model="ir.values">
             <field name="name">action_sale_order_read</field>
@@ -133,9 +129,26 @@
             <field name="model">sale.order</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <tree string="Sales Orders" fonts="bold:needaction_pending==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
-                    <field name="needaction_pending" invisible="1"/>
-                    <field name="name"/>
+                <tree string="Sales Orders" fonts="bold:message_unread==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
+                    <field name="message_unread" invisible="1"/>
+                    <field name="name" string="Order Number"/>
+                    <field name="date_order"/>
+                    <field name="partner_id"/>
+                    <field name="user_id"/>
+                    <field name="amount_total" sum="Total Tax Included"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="view_quotation_tree" model="ir.ui.view">
+            <field name="name">sale.order.tree</field>
+            <field name="model">sale.order</field>
+            <field name="priority">4</field>
+            <field name="arch" type="xml">
+                <tree string="Quotation" fonts="bold:message_unread==True" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
+                    <field name="message_unread" invisible="1"/>
+                    <field name="name" string="Quotation Number"/>
                     <field name="date_order"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
@@ -151,29 +164,23 @@
             <field name="arch" type="xml">
                 <form string="Sales Order" version="7.0">
                     <header>
-                        <span groups="base.group_user">
-                            <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
-                            <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
-                            <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
-                            <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
-                            <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight"/>
-                            <button name="action_quotation_send" string="Send by Mail" type="object" states="sent"/>
-                            <button name="print_quotation" string="Send by Post" type="object" states="draft" class="oe_highlight"/>
-                            <button name="print_quotation" string="Send by Post" type="object" states="sent"/>
-                            <button name="action_button_confirm" states="draft" string="Confirm" type="object"/>
-                            <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
-                            <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
-                              attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
-                            <button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
-                              attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
-                            <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
-                                type="action" states="manual" class="oe_highlight"/>
-                            <button name="cancel" states="draft,sent" string="Cancel"/>
-                            <button name="action_cancel" states="manual,progress" string="Cancel" type="object"/>
-                            <button name="ship_cancel" states="shipping_except" string="Cancel"/>
-                            <button name="invoice_cancel" states="invoice_except" string="Cancel"/>
-                        </span>
-                        <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
+                        <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" groups="base.group_user"/>
+                        <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" groups="base.group_user"/>
+                        <button name="action_quotation_send" string="Send by Mail" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
+                        <button name="action_quotation_send" string="Send by Mail" type="object" states="sent" groups="base.group_user"/>
+                        <button name="print_quotation" string="Print" type="object" states="draft" class="oe_highlight" groups="base.group_user"/>
+                        <button name="print_quotation" string="Print" type="object" states="sent" groups="base.group_user"/>
+                        <button name="action_button_confirm" states="draft" string="Confirm Sale" type="object" groups="base.group_user"/>
+                        <button name="action_button_confirm" states="sent" string="Confirm Sale" class="oe_highlight" type="object" groups="base.group_user"/>
+                        <button name="action_view_invoice" string="View Invoice" type="object" class="oe_highlight"
+                            attrs="{'invisible': [('invoice_exists', '=', False)]}" groups="base.group_user"/>
+                        <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
+                            type="action" states="manual" class="oe_highlight" groups="base.group_user"/>
+                        <button name="copy_quotation" states="cancel" string="New Copy of Quotation" type="object"/>
+                        <button name="cancel" states="draft,sent" string="Cancel" groups="base.group_user"/>
+                        <button name="action_cancel" states="manual,progress" string="Cancel" type="object" groups="base.group_user"/>
+                        <button name="invoice_cancel" states="invoice_except" string="Cancel" groups="base.group_user"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,sent,invoiced,done" statusbar_colors='{"invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
                 <sheet>
                     <h1>
@@ -183,16 +190,17 @@
                     </h1>
                     <group>
                         <group>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": true, "highlight_first_line": true}'/>
-                            <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address"/>
-                            <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address"/>
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1, 'show_address': 1}" options='{"always_reload": True}'/>
+                            <field name="partner_invoice_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'invoice'}"/>
+                            <field name="partner_shipping_id" groups="sale.group_delivery_invoice_address" context="{'default_type':'delivery'}"/>
                             <field name="project_id" context="{'partner_id':partner_id, 'pricelist_id':pricelist_id, 'default_name':name}" groups="sale.group_analytic_accounting" domain="[('type','in',['view','normal','contract'])]"/>
                         </group>
                         <group>
                             <field name="date_order"/>
-                            <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
+                            <field name="shop_id" groups="base.group_no_one" on_change="onchange_shop_id(shop_id, context)" widget="selection"/>
                             <field name="client_order_ref"/>
                             <field domain="[('type','=','sale')]" name="pricelist_id" groups="product.group_sale_pricelist" on_change="onchange_pricelist_id(pricelist_id,order_line)"/>
+                            <field name="currency_id" invisible="1"/>
                         </group>
                     </group>
                     <notebook>
@@ -209,20 +217,21 @@
                                             <field name="product_id"
                                                 context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                                 groups="base.group_user"
-                                                on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                                                on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, True, parent.date_order, False, parent.fiscal_position, False, context)"/>
                                             <label for="product_uom_qty"/>
                                             <div>
                                                 <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" class="oe_inline"
-                                                    on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
-                                                <field name="product_uom" groups="product.group_uom" options='{"no_open": true}' class="oe_inline"
+                                                    on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, False, parent.fiscal_position, True, context)"/>
+                                                <field name="product_uom" groups="product.group_uom" class="oe_inline oe_no_button"
+
                                                     on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/>
                                             </div>
                                             <label for="product_uos_qty" groups="product.group_uos"/>
                                             <div groups="product.group_uos">
                                                 <field name="product_uos_qty" class="oe_inline"/>
-                                                <field name="product_uos" options='{"no_open": true}' class="oe_inline"/>
+                                                <field name="product_uos" options='{"no_open": True}' class="oe_inline"/>
                                             </div>
                                             <field name="price_unit"/>
                                             <label for="discount" groups="sale.group_discount_per_so_line"/>
@@ -231,22 +240,11 @@
                                             </div>
                                         </group>
                                         <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_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)"
-                                                domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"
-                                                colspan="3"/>
                                             <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
-                                            <label for="delay"/>
-                                            <div>
-                                                <field name="delay" class="oe_inline"/> days
-                                            </div>
                                             <field name="type"/>
                                             <field name="th_weight"/>
-
                                             <!-- we should put a config wizard for these two fields -->
                                             <field name="address_allotment_id"/>
-                                            <field name="property_ids" widget="many2many_tags"
-                                                groups="sale.group_mrp_properties"/>
                                         </group>
                                     </group>
                                     <label for="name"/>
@@ -254,18 +252,12 @@
                                     <div groups="base.group_no_one">
                                         <label for="invoice_lines"/>
                                         <field name="invoice_lines"/>
-                                        <label for="move_ids"/>
-                                        <field name="move_ids" widget="many2many"/>
                                     </div>
                                 </form>
                                 <tree string="Sales Order Lines" editable="bottom">
+                                    <field name="sequence" widget="handle"/>
                                     <field name="state" invisible="1"/>
-                                    <field name="sequence" invisible="1"/>
-                                    <field name="delay" invisible="1"/>
-                                    <field name="tax_id" invisible="1"/>
-                                    <field name="type" invisible="1"/>
                                     <field name="th_weight" invisible="1"/>
-                                    <field name="product_packaging" invisible="1"/>
                                     <field name="product_id"
                                         context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
                                         groups="base.group_user" 
@@ -276,39 +268,31 @@
                                         on_change="product_id_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, product_uos_qty, product_uos, name, parent.partner_id, False, False, parent.date_order, False, parent.fiscal_position, True, context)"/>
                                     <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, False, False, parent.date_order, context)"
-                                        groups="product.group_uom" options='{"no_open": true}'/>
-                                    <field name="product_uos_qty" groups="product.group_uos"/>
-                                    <field name="product_uos" string="UoS" groups="product.group_uos"/>
-                                    <field name="discount" groups="sale.group_discount_per_so_line"/>
+                                        groups="product.group_uom" options='{"no_open": True}'/>
+                                    <field name="product_uos_qty" groups="product.group_uos" invisible="1"/>
+                                    <field name="product_uos" string="UoS" groups="product.group_uos" invisible="1"/>
+                                    <field name="tax_id" widget="many2many_tags" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                     <field name="price_unit"/>
+                                    <field name="discount" groups="sale.group_discount_per_so_line"/>
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
                             <group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
-                                <field name="amount_untaxed"/>
-                                <field name="amount_tax"/>
+                                <field name="amount_untaxed" widget='monetary' options="{'currency_field': 'currency_id'}"/>
+                                <field name="amount_tax" widget='monetary' options="{'currency_field': 'currency_id'}"/>
                                 <div class="oe_subtotal_footer_separator oe_inline">
                                     <label for="amount_total" />
                                     <button name="button_dummy"
                                         states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
                                 </div>
-                                <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
-                            </group>
-                            <group name="sale_margin_grp">
+                                <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator" widget='monetary' options="{'currency_field': 'currency_id'}"/>
                             </group>
                             <div class="oe_clear"/>
-                            <label for="note"/><br/>
-                            <field name="note" class="oe_inline"/>
+                            <field name="note" class="oe_inline" placeholder="Terms and conditions..."/>
                         </page>
                         <page string="Other Information" groups="base.group_user">
                             <group>
-                                <group name="logistics">
-                                    <field name="incoterm" widget="selection" groups="base.group_user"/>
-                                    <field name="picking_policy" required="True"/>
-                                    <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
-                                    <field name="invoice_quantity" invisible="True"/>
-                                </group>
-                                <group groups="base.group_user">
+                                <group name="sales_person" groups="base.group_user">
                                     <field name="user_id"/>
                                     <field groups="base.group_no_one" name="origin"/>
                                 </group>
@@ -319,51 +303,41 @@
                                 </group>
                                 <group>
                                     <field name="invoiced"/>
-                                    <field name="shipped"/>
+                                    <field name="invoice_exists" invisible="1"/>
                                 </group>
                             </group>
                         </page>
-                        <page string="History">
-                            <separator string="Invoices"/>
-                            <field name="invoice_ids" context="{'form_view_ref':'account.invoice_form'}">
-                                <tree string="Invoices" colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'">
-                                    <field name="date_invoice"/>
-                                    <field name="number"/>
-                                    <field name="partner_id" string="Customer"/>
-                                    <field name="user_id"/>
-                                    <field name="date_due"/>
-                                    <field name="amount_total"/>
-                                    <field name="state"/>
-                                </tree>
-                            </field>
-                            <separator string="Delivery Orders"/>
-                            <field name="picking_ids" context="{'default_type': 'out'}">
-                                <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
-                                    <field name="name"/>
-                                    <field name="partner_id" string="Customer"/>
-                                    <field name="min_date"/>
-                                    <field name="state"/>
-                                    <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" context="{'default_type': 'out'}"/>
-                                </tree>
-                            </field>
-                        </page>
                     </notebook>
                 </sheet>
                 <div class="oe_chatter">
-                    <field name="message_ids" widget="mail_thread"/>
                     <field name="message_follower_ids" widget="mail_followers"/>
+                    <field name="message_ids" widget="mail_thread" placeholder="Share a message..."/>
                 </div>
                 </form>
             </field>
         </record>
 
+        <!-- inherited view to make the order lines list in the form non-editable
+             for the members of some usability groups -->
+        <record id="view_order_form_editable_list" model="ir.ui.view">
+            <field name="name">sale.order.form.editable.list</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="groups_id" eval="[(6, 0, [ref('product.group_uos'), ref('product.group_stock_packaging'), ref('sale.group_mrp_properties')])]"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='order_line']/tree" position="attributes">
+                    <attribute name="editable"/>
+                </xpath>
+            </field>
+        </record>
+
         <record id="view_sales_order_filter" model="ir.ui.view">
             <field name="name">sale.order.list.select</field>
             <field name="model">sale.order</field>
             <field name="arch" type="xml">
                 <search string="Search Sales Order">
                     <field name="name" string="Sales Order" filter_domain="['|',('name','ilike',self),('client_order_ref','ilike',self)]"/>
-                    <filter icon="terp-mail-message-new" string="Inbox" help="Unread messages" name="needaction_pending" domain="[('needaction_pending','=',True)]"/>
+                    <filter icon="terp-mail-message-new" string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
                     <separator/>
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
@@ -373,6 +347,7 @@
                     <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
+                    <field name="project_id"/>
                     <group expand="0" string="Group By...">
                         <filter string="Customer" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Salesperson" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
@@ -384,13 +359,14 @@
         </record>
 
         <record id="action_order_form" model="ir.actions.act_window">
-            <field name="name">Sales Orders</field>
+            <field name="name">Sale Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <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="context">{"search_default_sales":1}</field>
+            <field name="context">{'show_address': 1}</field>
+            <field name="domain">[('state','not in',('draft','sent','cancel'))]</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to create a quotation that can be converted into a sale
@@ -430,8 +406,10 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
+            <field name="view_id" ref="view_quotation_tree"/>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="context">{"search_default_draft":1}</field>
+            <field name="context">{'show_address': 1}</field>
+            <field name="domain">[('state','in',('draft','sent','cancel'))]</field>
             <field name="search_view_id" ref="view_sales_order_filter"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
@@ -463,16 +441,6 @@
             <field name="search_view_id" ref="view_sales_order_filter"/>
         </record>
 
-        <record id="view_order_line_graph" model="ir.ui.view">
-            <field name="name">sale.order.line.graph</field>
-            <field name="model">sale.order.line</field>
-            <field name="arch" type="xml">
-                <graph string="Sales Order Lines">
-                    <field name="product_id"/>
-                    <field name="price_subtotal" operator="+"/>
-                </graph>
-            </field>
-        </record>
 
         <record id="view_order_line_tree" model="ir.ui.view">
             <field name="name">sale.order.line.tree</field>
@@ -497,21 +465,19 @@
             <field name="arch" type="xml">
                 <form string="Sales Order Lines" version="7.0">
                     <header>
-                        <span groups="base.group_user">
-                            <button name="button_cancel" string="Cancel" type="object" icon="gtk-cancel" states="confirmed,exception"/>
-                            <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" states="done" icon="gtk-go-forward" attrs="{'invisible': [('invoiced', '=', 1)]}" class="oe_highlight"/>
-                            <button name="button_done" string="Done" type="object" states="confirmed,exception" icon="gtk-go-forward" class="oe_highlight"/>
-                        </span>
+                        <button name="button_cancel" string="Cancel" type="object" states="confirmed,exception" groups="base.group_user"/>
+                        <button name="%(action_view_sale_order_line_make_invoice)d" string="Create Invoice" type="action" attrs="{'invisible': ['|',('invoiced', '=', 1), ('state', 'not in', ('confirmed', 'draft'))]}" class="oe_highlight" groups="base.group_user"/>
+                        <button name="button_done" string="Done" type="object"  attrs="{'invisible': ['|',('invoiced', '=', 0), ('state', 'not in', ('confirmed', 'exception'))]}" class="oe_highlight" groups="base.group_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
                     </header>
                     <sheet>
                     <label for="order_id" class="oe_edit_only"/>
-                    <h1><field name="order_id"/></h1>
+                    <h1><field name="order_id" domain="[('state','!=','done')]"/></h1>
                     <label for="order_partner_id" class="oe_edit_only"/>
                     <h2><field name="order_partner_id"/></h2>
                     <group>
                         <group>
-                            <field name="product_id" readonly="1"/>
+                            <field name="product_id"/>
                             <label for="product_uom_qty"/>
                             <div>
                                 <field name="product_uom_qty" readonly="1" class="oe_inline"/>
@@ -585,7 +551,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
+            <field name="view_mode">tree,form</field>
             <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"/>
@@ -604,7 +570,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order.line</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
+            <field name="view_mode">tree,form</field>
             <field name="domain">[('invoiced','&lt;&gt;', 1),('state','=','done')]</field>
             <field name="filter" eval="True"/>
         </record>
diff --git a/addons/sale/sale_workflow.xml b/addons/sale/sale_workflow.xml
index c18e271d480..53542c754bc 100644
--- a/addons/sale/sale_workflow.xml
+++ b/addons/sale/sale_workflow.xml
@@ -13,12 +13,14 @@
             <field name="flow_start">True</field>
             <field name="name">draft</field>
         </record>
+        
         <record id="act_sent" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">sent</field>
             <field name="kind">function</field>
             <field name="action">write({'state':'sent'})</field>
-        </record>        
+        </record>   
+     
         <record id="act_router" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">router</field>
@@ -26,23 +28,21 @@
             <field name="action">action_wait()</field>
             <field name="split_mode">OR</field>
         </record>
+        
         <record id="act_wait_invoice" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">wait_invoice</field>
         </record>
-        <record id="act_wait_ship" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_sale"/>
-            <field name="name">wait_ship</field>
-        </record>
 
         <record id="act_done" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">done</field>
             <field name="flow_stop">True</field>
             <field name="kind">function</field>
-            <field name="action">write({'state':'done'})</field>
+            <field name="action">action_done()</field>
             <field name="join_mode">AND</field>
         </record>
+
         <record id="act_cancel" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">cancel</field>
@@ -50,6 +50,7 @@
             <field name="kind">stopall</field>
             <field name="action">action_cancel()</field>
         </record>
+        
         <record id="act_cancel2" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">cancel2</field>
@@ -57,13 +58,7 @@
             <field name="kind">stopall</field>
             <field name="action">action_cancel()</field>
         </record>
-        <record id="act_cancel3" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_sale"/>
-            <field name="name">cancel3</field>
-            <field name="flow_stop">True</field>
-            <field name="kind">stopall</field>
-            <field name="action">action_cancel()</field>
-        </record>
+        
         <record id="act_invoice" model="workflow.activity">
             <field name="wkf_id" ref="wkf_sale"/>
             <field name="name">invoice</field>
@@ -90,121 +85,53 @@
             <field name="kind">stopall</field>
             <field name="action">action_cancel()</field>
         </record>
-        <record id="act_ship" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_sale"/>
-            <field name="name">ship</field>
-            <field name="kind">function</field>
-            <field name="action">action_ship_create()</field>
-        </record>
-        <record id="act_ship_except" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_sale"/>
-            <field name="name">ship_except</field>
-            <field name="kind">function</field>
-            <field name="action">write({'state':'shipping_except'})</field>
-        </record>
-        <record id="act_ship_end" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_sale"/>
-            <field name="name">ship_end</field>
-            <field name="kind">function</field>
-            <field name="action">action_ship_end()</field>
-        </record>
-        <record id="act_ship_cancel" model="workflow.activity">
-            <field name="wkf_id" ref="wkf_sale"/>
-            <field name="name">ship_cancel</field>
-            <field name="flow_stop">True</field>
-            <field name="kind">stopall</field>
-            <field name="action">action_cancel()</field>
-        </record>
 
         <!-- Transistion -->
 
-        <record id="trans_invoice_end_done" model="workflow.transition">
-            <field name="act_from" ref="act_invoice_end"/>
-            <field name="act_to" ref="act_done"/>
-        </record>
-
-        <record id="trans_draft_router" model="workflow.transition">
-            <field name="act_from" ref="act_draft"/>
-            <field name="act_to" ref="act_router"/>
-            <field name="signal">order_confirm</field>
-        </record>
-
         <record id="trans_draft_sent" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_sent"/>
             <field name="signal">quotation_sent</field>
         </record>
-
-        <record id="trans_sent_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_sent"/>
-            <field name="act_to" ref="act_cancel"/>
-            <field name="signal">cancel</field>
-        </record>
-        
-        <record id="trans_sent_router" model="workflow.transition">
-            <field name="act_from" ref="act_sent"/>
+        <record id="trans_draft_router" model="workflow.transition">
+            <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_router"/>
             <field name="signal">order_confirm</field>
         </record>
-
         <record id="trans_draft_cancel" model="workflow.transition">
             <field name="act_from" ref="act_draft"/>
             <field name="act_to" ref="act_cancel"/>
             <field name="signal">cancel</field>
         </record>
-
+        <record id="trans_sent_router" model="workflow.transition">
+            <field name="act_from" ref="act_sent"/>
+            <field name="act_to" ref="act_router"/>
+            <field name="signal">order_confirm</field>
+        </record>
+        <record id="trans_sent_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_sent"/>
+            <field name="act_to" ref="act_cancel"/>
+            <field name="signal">cancel</field>
+        </record>
+        <record id="trans_router_wait_invoice" model="workflow.transition">
+            <field name="act_from" ref="act_router"/>
+            <field name="act_to" ref="act_wait_invoice"/>
+        </record>
         <record id="trans_wait_invoice_all_lines_invoiced" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_invoice_end"/>
             <field name="signal">all_lines</field>
         </record>
-
-        <record id="trans_router_wait_invoice_shipping" model="workflow.transition">
-            <field name="act_from" ref="act_wait_invoice"/>
-            <field name="act_to" ref="act_invoice_end"/>
-            <field name="condition">(order_policy=='picking')</field>
-        </record>
-
-        <record id="trans_router_wait_invoice" model="workflow.transition">
-            <field name="act_from" ref="act_router"/>
-            <field name="act_to" ref="act_wait_invoice"/>
-        </record>
-
-        <record id="trans_router_wait_ship" model="workflow.transition">
-            <field name="act_from" ref="act_router"/>
-            <field name="act_to" ref="act_wait_ship"/>
-        </record>
-
         <record id="trans_wait_invoice_cancel2" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_cancel2"/>
             <field name="signal">cancel</field>
         </record>
-
-        <record id="trans_wait_ship_cancel3" model="workflow.transition">
-            <field name="act_from" ref="act_wait_ship"/>
-            <field name="act_to" ref="act_cancel3"/>
-            <field name="signal">cancel</field>
-        </record>
-
-        <record id="trans_wait_ship_ship" model="workflow.transition">
-            <field name="act_from" ref="act_wait_ship"/>
-            <field name="act_to" ref="act_ship"/>
-            <field name="condition">(order_policy!='prepaid') or invoiced</field>
-        </record>
-
-        <record id="trans_wait_invoice_invoice" model="workflow.transition">
-            <field name="act_from" ref="act_wait_invoice"/>
-            <field name="act_to" ref="act_invoice"/>
-            <field name="condition">(order_policy=='prepaid')</field>
-        </record>
-
         <record id="trans_wait_invoice_invoice_manual" model="workflow.transition">
             <field name="act_from" ref="act_wait_invoice"/>
             <field name="act_to" ref="act_invoice"/>
             <field name="signal">manual_invoice</field>
         </record>
-
         <record id="trans_invoice_invoice_end" model="workflow.transition">
             <field name="act_from" ref="act_invoice"/>
             <field name="act_to" ref="act_invoice_end"/>
@@ -230,38 +157,10 @@
             <field name="act_to" ref="act_invoice_cancel"/>
             <field name="signal">invoice_cancel</field>
         </record>
-        <record id="trans_ship_end_done" model="workflow.transition">
-            <field name="act_from" ref="act_ship_end"/>
+        <record id="trans_invoice_end_done" model="workflow.transition">
+            <field name="act_from" ref="act_invoice_end"/>
             <field name="act_to" ref="act_done"/>
         </record>
 
-        <record id="trans_ship_ship_end" model="workflow.transition">
-            <field name="act_from" ref="act_ship"/>
-            <field name="act_to" ref="act_ship_end"/>
-            <field name="trigger_model">procurement.order</field>
-            <field name="trigger_expr_id">procurement_lines_get()</field>
-            <field name="condition">test_state('finished')</field>
-        </record>
-        <record id="trans_ship_ship_except" model="workflow.transition">
-            <field name="act_from" ref="act_ship"/>
-            <field name="act_to" ref="act_ship_except"/>
-            <field name="condition">test_state('canceled')</field>
-        </record>
-        <record id="trans_ship_except_ship" model="workflow.transition">
-            <field name="act_from" ref="act_ship_except"/>
-            <field name="act_to" ref="act_ship"/>
-            <field name="signal">ship_recreate</field>
-        </record>
-        <record id="trans_ship_except_ship_end" model="workflow.transition">
-            <field name="act_from" ref="act_ship_except"/>
-            <field name="act_to" ref="act_ship_end"/>
-            <field name="signal">ship_corrected</field>
-        </record>
-        <record id="trans_ship_except_ship_cancel" model="workflow.transition">
-            <field name="act_from" ref="act_ship_except"/>
-            <field name="act_to" ref="act_ship_cancel"/>
-            <field name="signal">ship_cancel</field>
-        </record>
-
     </data>
 </openerp>
diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv
index 617678eccbe..670c863a022 100644
--- a/addons/sale/security/ir.model.access.csv
+++ b/addons/sale/security/ir.model.access.csv
@@ -1,4 +1,4 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sale_shop,sale.shop,model_sale_shop,base.group_user,1,0,0,0
 access_sale_order,sale.order,model_sale_order,base.group_sale_salesman,1,1,1,0
 access_sale_order_line,sale.order.line,model_sale_order_line,base.group_sale_salesman,1,1,1,1
@@ -9,13 +9,6 @@ access_account_invoice_manager,account_invoice manager,account.model_account_inv
 access_account_invoice_line_salesman,account_invoice.line salesman,account.model_account_invoice_line,base.group_sale_salesman,1,1,1,0
 access_account_payment_term_salesman,account_payment_term salesman,account.model_account_payment_term,base.group_sale_salesman,1,0,0,0
 access_account_analytic_account_salesman,account_analytic_account salesman,analytic.model_account_analytic_account,base.group_sale_salesman,1,1,1,0
-access_stock_picking_salesman,stock_picking salesman,stock.model_stock_picking,base.group_sale_salesman,1,1,1,0
-access_stock_move_salesman,stock_move salesman,stock.model_stock_move,base.group_sale_salesman,1,1,1,0
-access_stock_move_manager,stock_move manager,stock.model_stock_move,base.group_sale_manager,1,1,1,1
-access_procurement_salesman,procurement.order salesman,procurement.model_procurement_order,base.group_sale_salesman,1,1,1,0
-access_procurement_manager,procurement.order manager,procurement.model_procurement_order,base.group_sale_manager,1,1,1,1
-access_sale_order_stock_worker,sale.order stock worker,model_sale_order,stock.group_stock_user,1,1,0,0
-access_sale_order_line_stock_worker,sale.order.line stock worker,model_sale_order_line,stock.group_stock_user,1,1,0,0
 access_sale_order_manager,sale.order.manager,model_sale_order,base.group_sale_manager,1,1,1,1
 access_sale_order_accountant,sale.order.accountant,model_sale_order,account.group_account_user,1,1,0,0
 access_sale_report_salesman,sale.report,model_sale_report,base.group_sale_salesman,1,1,1,0
@@ -24,23 +17,16 @@ access_ir_property_sales,ir.property.sales,base.model_ir_property,base.group_sal
 access_sale_account_journal,account.journal sale order.user,account.model_account_journal,base.group_sale_salesman,1,0,0,0
 access_res_partner_sale_user,res.partner.sale.user,base.model_res_partner,base.group_sale_salesman,1,0,0,0
 access_res_partner_sale_manager,res.partner.sale.manager,base.model_res_partner,base.group_sale_manager,1,1,1,0
-access_report_stock_move_sales,report.stock.move.sale,stock.model_report_stock_move,base.group_sale_manager,1,1,1,1
-access_stock_picking_sales,stock.picking.sales,stock.model_stock_picking,base.group_sale_manager,1,1,1,1
 access_product_template_sale_user,product.template sale use,product.model_product_template,base.group_sale_salesman,1,0,0,0
 access_product_product_sale_user,product.product sale use,product.model_product_product,base.group_sale_salesman,1,0,0,0
 access_sale_shop_manager,account.journal sale order.user,model_sale_shop,base.group_sale_manager,1,1,1,1
 access_account_fiscalyear_user,account.fiscalyear.user,account.model_account_fiscalyear,base.group_sale_salesman,1,0,0,0
 access_account_tax_user,account.tax.user,account.model_account_tax,base.group_sale_salesman,1,0,0,0
-access_product_packaging_user,product.packaging.user,product.model_product_packaging,base.group_sale_salesman,1,1,1,0
 access_ir_attachment_sales,ir.attachment.sales,base.model_ir_attachment,base.group_sale_salesman,1,1,1,0
 access_ir_attachment_manager,ir.attachment.manager,base.model_ir_attachment,base.group_sale_manager,1,1,1,1
-access_product_packaging_manager,product.packaging.manager,product.model_product_packaging,base.group_sale_manager,1,0,0,0
-access_stock_warehouse_user,stock.warehouse.user,stock.model_stock_warehouse,base.group_sale_salesman,1,0,0,0
 access_res_partner_bank_type_user,res.partner.bank.type.user,base.model_res_partner_bank_type,base.group_sale_salesman,1,0,0,0
-access_stock_location_user,stock.location.user,stock.model_stock_location,base.group_sale_salesman,1,0,0,0
 access_res_partner_bank_type_field_user,res.partner.bank.type.field.user,base.model_res_partner_bank_type_field,base.group_sale_salesman,1,0,0,0
 access_product_uom_user,product.uom.user,product.model_product_uom,base.group_sale_salesman,1,0,0,0
-access_product_supplierinfo_user,product.supplierinfo.user,product.model_product_supplierinfo,base.group_sale_salesman,1,0,0,0
 access_product_pricelist_sale_user,product.pricelist.sale.user,product.model_product_pricelist,base.group_sale_salesman,1,0,0,0
 access_account_account_salesman,account_account salesman,account.model_account_account,base.group_sale_salesman,1,0,0,0
 access_sale_shop_sale_user,sale.shop.sale.user,model_sale_shop,base.group_sale_salesman,1,0,0,0
@@ -49,14 +35,13 @@ access_product_uom_categ_sale_manager,product.uom.categ salemanager,product.mode
 access_product_uom_sale_manager,product.uom salemanager,product.model_product_uom,base.group_sale_manager,1,1,1,1
 access_product_ul_sale_manager,product.ul salemanager,product.model_product_ul,base.group_sale_manager,1,1,1,1
 access_product_category_sale_manager,product.category salemanager,product.model_product_category,base.group_sale_manager,1,1,1,1
-access_product_packaging_sale_manager,product.packaging salemanager,product.model_product_packaging,base.group_sale_manager,1,1,1,1
+access_product_supplierinfo_user,product.supplierinfo.user,product.model_product_supplierinfo,base.group_sale_salesman,1,0,0,0
 access_product_supplierinfo_sale_manager,product.supplierinfo salemanager,product.model_product_supplierinfo,base.group_sale_manager,1,1,1,1
-access_pricelist_partnerinfo_sale_manager,pricelist.partnerinfo salemanager,product.model_pricelist_partnerinfo,base.group_sale_manager,1,1,1,1
+access_pricelist_partnerinfo_sale_manager,pricelist.partnerinfo salemanager,product.model_pricelist_partnerinfo,base.group_sale_manager,1,1,1,1
 access_product_price_type_sale_manager,product.price.type salemanager,product.model_product_price_type,base.group_sale_manager,1,1,1,1
 access_product_pricelist_type_sale_manager,product.pricelist.type salemanager,product.model_product_pricelist_type,base.group_sale_manager,1,1,1,1
 access_product_pricelist_sale_manager,product.pricelist salemanager,product.model_product_pricelist,base.group_sale_manager,1,1,1,1
 access_product_group_res_partner_sale_manager,res_partner group_sale_manager,base.model_res_partner,base.group_sale_manager,1,1,1,0
 access_product_pricelist_version_sale_manager,product.pricelist.version sale_manager,product.model_product_pricelist_version,base.group_sale_manager,1,1,1,1
 access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0
-access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
-access_account_move_line_salesman,account.move.line invoice,account.model_account_move_line,base.group_sale_salesman,1,0,0,0
+access_account_move_line_salesman,account.move.line invoice,account.model_account_move_line,base.group_sale_salesman,1,0,0,0
\ No newline at end of file
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 47a577e77c3..b3e6463c515 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -3,18 +3,22 @@
 <data noupdate="0">
 
     <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">User - Own Leads Only</field>
+        <field name="name">See Own Leads</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
+        <field name="comment">the user will have access to his own data in the sales application.</field>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
 
     <record id="base.group_sale_salesman_all_leads" model="res.groups">
-        <field name="name">User - All Leads</field>
+        <field name="name">See all Leads</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman'))]"/>
+        <field name="comment">the user will have access to all records of everyone in the sales application.</field>
     </record>
 
     <record id="base.group_sale_manager" model="res.groups">
         <field name="name">Manager</field>
+        <field name="comment">the user will have an access to the sales configuration as well as statistic reports.</field>
         <field name="category_id" ref="base.module_category_sales_management"/>
         <field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
@@ -25,11 +29,6 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
-    <record id="group_invoice_deli_orders" model="res.groups">
-        <field name="name">Enable Invoicing Delivery orders</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
     <record id="group_delivery_invoice_address" model="res.groups">
         <field name="name">Addresses in Sale Orders</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/sale/test/cancel_order.yml b/addons/sale/test/cancel_order.yml
index 2159e5ee8c1..6145964224a 100644
--- a/addons/sale/test/cancel_order.yml
+++ b/addons/sale/test/cancel_order.yml
@@ -1,88 +1,79 @@
 -
   In order to test the cancel sale order.
--
-  Now I cancel Quotation.
--
-  !python {model: sale.order}: |
-    self.action_cancel(cr, uid, [ref("sale_order_8")])
--
-  I check state of Quotation after cancelled.
--
-  !assert {model: sale.order, id: sale_order_8, string: sale order should be in cancel state}:
-    - state == 'cancel'
--
-  I set cancelled quotation to draft.
--
-  !python {model: sale.order}: |
-    self.action_cancel_draft(cr, uid, [ref("sale_order_8")])
--
-  I confirm order.
+  I confirm order (with at least 2 lines)
 -
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_8}
--
-  I send delivery in two shipments, so I am doing a partial delivery order.
--
-  !python {model: stock.picking}: |
-    delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale_order_8"))])
-    first_picking = self.browse(cr, uid, delivery_orders[0], context=context)
-    if first_picking.force_assign(cr, uid, first_picking):
-      first_move = first_picking.move_lines[0]
-      values = {'move%s'%(first_move.id): {'product_qty': 2, 'product_uom':ref('product.product_uom_unit')}}
-      first_picking.do_partial(values, context=context)
--
-  Now I cancel latest shipment.
--
-  !python {model: stock.picking}: |
-    import netsvc
-    delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale_order_8"))])
-    last_delivery_order_id = delivery_orders[0]
-    wf_service = netsvc.LocalService("workflow")
-    wf_service.trg_validate(uid, 'stock.picking', last_delivery_order_id, 'button_cancel', cr)
--
-  I run the scheduler.
--
-  !python {model: procurement.order}: |
 
-     self.run_scheduler(cr, uid)
 -
-  I check order status in "Ship Exception".
--
-  !assert {model: sale.order, id: sale_order_8, string: Sale order should be in shipping exception}:
-    - state == "shipping_except"
--
-  Now I regenerate shipment.
--
-  !workflow {model: sale.order, action: ship_recreate, ref: sale_order_8}
--
-  I check state of order in 'To Invoice'.
+  I check state of order in 'Sale Order'.
 -
   !assert {model: sale.order, id: sale_order_8, string: Sale order should be In Progress state}:
-    - state == 'manual'
+    - state == 'manual'  
 -
-  I make invoice for order.
+  I check that Invoice should not be created.
 -
-  !workflow {model: sale.order, action: manual_invoice, ref: sale_order_8}
+  !python {model: sale.order}: |
+    sale_order = self.browse(cr, uid, ref("sale_order_8"))
+    assert len(sale_order.invoice_ids) == False, "Invoice should not be created."
 -
-  To cancel the sale order from Invoice Exception, I have to cancel the invoice of sale order.
+  I create an invoice for the first line
+-
+   !python {model: sale.order.line.make.invoice}: |
+
+    ctx = context.copy()
+    ctx.update({"active_model": 'sale.order.line', "active_ids": [ref("sale_order_line_20")], "active_id":ref("sale_order_line_20")})
+    pay_id = self.create(cr, uid, {})
+    self.make_invoices(cr, uid, [pay_id], context=ctx)
+    invoice_ids = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_8")).invoice_ids
+-
+  I create an invoice for a fixed price (25% of the second line, thus 5)
+-
+   !python {model: sale.advance.payment.inv}: |
+    ctx = context.copy()
+    ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_8")], "active_id":ref("sale_order_8")})
+    pay_id = self.create(cr, uid, {'advance_payment_method': 'fixed', 'amount': 5})
+    self.create_invoices(cr, uid, [pay_id], context=ctx)
+    invoice_ids = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_8")).invoice_ids
+
+-
+  I create an invoice for the remaining and check the amount (should be the remaining amount of second line)
+-
+   !python {model: sale.advance.payment.inv}: |
+    ctx = context.copy()
+    ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_8")], "active_id":ref("sale_order_8")})
+    pay_id = self.create(cr, uid, {'advance_payment_method': 'all'})
+    self.create_invoices(cr, uid, [pay_id], context=ctx)
+    invoice_ids = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_8")).invoice_ids
+    assert len(invoice_ids) == 3, "All invoices are not created"
+    for invoice in invoice_ids:
+        assert invoice.amount_total in (7290,5,20), "Invoice total is not correct"
+-
+  I cancel all the invoices.
 -
   !python {model: sale.order}: |
     import netsvc
     invoice_ids = self.browse(cr, uid, ref("sale_order_8")).invoice_ids
     wf_service = netsvc.LocalService("workflow")
-    first_invoice_id = invoice_ids[0]
-    wf_service.trg_validate(uid, 'account.invoice', first_invoice_id.id, 'invoice_cancel', cr)
+    for invoice in invoice_ids:
+        wf_service.trg_validate(uid, 'account.invoice', invoice.id, 'invoice_cancel', cr)
 -
   I check order status in "Invoice Exception" and related invoice is in cancel state.
 -
   !assert {model: sale.order, id: sale_order_8, string: Sale order should be in Invoice Exception state}:
     - state == "invoice_except", "Order should be in Invoice Exception state after cancel Invoice"
+- 
+  I click recreate invoice.
 -
-  Then I click on the Ignore Exception button.
+  !workflow {model: sale.order, action: invoice_recreate, ref: sale_order_8}
+- 
+  I check that the invoice is correctly created with all lines.
 -
-  !workflow {model: sale.order, action: invoice_corrected, ref: sale_order_8}
+  !python {model: sale.order}: |
+    sale_order = self.browse(cr, uid, ref("sale_order_8"))
+    total_order_line = 0
+    assert len(sale_order.invoice_ids), "Invoice should be created."
+    for invoice in sale_order.invoice_ids:
+        if invoice.state != 'cancel':
+            total_order_line += len(invoice.invoice_line)
+    assert total_order_line == 2, "wrong number of invoice lines"
 
--
-  I check state of order in 'In Progress'.
--
-  !assert {model: sale.order, id: sale_order_8, string: Sale order should be In progress state}:
-    - state == 'progress'
diff --git a/addons/sale/test/delete_order.yml b/addons/sale/test/delete_order.yml
index 751505237b6..abc68cb3af3 100644
--- a/addons/sale/test/delete_order.yml
+++ b/addons/sale/test/delete_order.yml
@@ -3,12 +3,12 @@
 -
   !python {model: sale.order}: |
     try:
-        self.unlink(cr, uid, [ref("sale_order_1")])
+        self.unlink(cr, uid, [ref("sale_order_7")])
     except Exception,e:
         pass
 -
   I make duplicate order and delete.
 -
   !python {model: sale.order}: |
-    id = self.copy(cr, uid, ref('sale_order_1'))
+    id = self.copy(cr, uid, ref('sale_order_7'))
     self.unlink(cr, uid, [id])
diff --git a/addons/sale/test/edi_sale_order.yml b/addons/sale/test/edi_sale_order.yml
index 148eed4f18f..967aaa1337c 100644
--- a/addons/sale/test/edi_sale_order.yml
+++ b/addons/sale/test/edi_sale_order.yml
@@ -11,13 +11,13 @@
         product_uom_qty: 1.0
         product_uom: 1
         price_unit: 150.0
-        name: 'Basic pc'
+        name: 'PC Assemble SC234'
     order_line:
       - product_id: product.product_product_5
         product_uom_qty: 10.0
         product_uom: 1
         price_unit: 200.0
-        name: 'Medium pc'
+        name: 'PC Assemble + Custom (PC on Demand)'
 -
   I confirm the sale order
 -
@@ -72,10 +72,9 @@
                 "__model": "purchase.order.line",
                 "__import_module": "sale",
                 "__import_model": "sale.order.line",
-                "name": "Basic PC",
-                "date_planned": "2011-09-30",
+                "name": "PC Assemble SC234",
                 "price_unit": 150.0,
-                "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_3", "[PC1] Basic PC"],
+                "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_3", "[PCSC234] PC Assemble SC234"],
                 "product_qty": 1.0,
                 "product_uom": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_uom_unit", "Unit"],
         },
@@ -85,10 +84,9 @@
                 "__model": "purchase.order.line",
                 "__import_module": "sale",
                 "__import_model": "sale.order.line",
-                "name": "Medium PC",
-                "date_planned": "2011-09-15",
+                "name": "PC on Demand",
                 "price_unit": 100.0,
-                "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_5", "[PC3] Medium PC"],
+                "product_id": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_product_5", "[PC-DEM] PC on Demand"],
                 "product_qty": 2.0,
                 "product_uom": ["product:5af1272e-dd26-11e0-b65e-701a04e25543.product_uom_unit", "Unit"],
         }],
@@ -107,13 +105,11 @@
     assert order_new.amount_untaxed == 350, "Untaxed amount is wrong"
     assert len(order_new.order_line) == 2, "Sale order lines mismatch"
     for sale_line in order_new.order_line:
-        if sale_line.name == 'Basic PC':
-            assert sale_line.delay == 18 , "incorrect delay: got %s, expected 18"%(sale_line.delay,)
+        if sale_line.name == 'PC Assemble SC234':
             assert sale_line.product_uom.name == "Unit" , "uom is not same"
             assert sale_line.price_unit == 150 , "unit price is not same, got %s, expected 150"%(sale_line.price_unit,)
             assert sale_line.product_uom_qty == 1 , "product qty is not same"
-        elif sale_line.name == 'Medium PC':
-            assert sale_line.delay == 3 , "incorrect delay: got %s, expected 3"%(sale_line.delay,)
+        elif sale_line.name == 'PC on Demand':
             assert sale_line.product_uom.name == "Unit" , "uom is not same"
             assert sale_line.price_unit == 100 , "unit price is not same, got %s, expected 100"%(sale_line.price_unit,)
             assert sale_line.product_uom_qty == 2 , "product qty is not same"
diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index 3a8dcbd2f5b..5fe29950176 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -1,5 +1,5 @@
 -
-  I confirm the Quotation with "Deliver & invoice on demand".
+  I confirm the Quotation with "On Demand" order policy.
 -
   !workflow {model: sale.order, action: order_confirm, ref: sale_order_2}
 -
@@ -9,44 +9,34 @@
     sale_order = self.browse(cr, uid, ref("sale_order_2"))
     assert len(sale_order.invoice_ids) == False, "Invoice should not created."
 -
-  I create advance invoice.
+  I create advance invoice where type is 'Fixed Price'.
 -
   !python {model: sale.advance.payment.inv}: |
     ctx = context.copy()
     ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_2")], "active_id":ref("sale_order_2")})
     order_line = self.pool.get('sale.order.line').browse(cr, uid, ref("sale_order_line_4"), context=context)
-    pay_id = self.create(cr, uid, {'advance_payment_method': 'fixed', 'product_id': order_line.product_id.id, 'amount': order_line.price_subtotal, 'qtty': order_line.product_uom_qty})
+    pay_id = self.create(cr, uid, {'advance_payment_method': 'fixed', 'product_id': order_line.product_id.id, 'amount': order_line.price_unit})
     self.create_invoices(cr, uid, [pay_id], context=ctx)
 -
-  I check Invoice which made advance
+  I check Invoice which made advance.
 -
   !python {model: sale.order}: |
     order = self.browse(cr, uid, ref('sale_order_2'))
     assert order.invoice_ids, "Invoice should be created after make advance invoice."
 -
-  I create Invoice from sale order line.
+  I create advance invoice where type is 'Invoice all the Sale Order'.
 -
-  !python {model: sale.order.line.make.invoice}: |
+  !python {model: sale.advance.payment.inv}: |
     ctx = context.copy()
-    ctx.update({"active_model": 'sale.order.line', "active_ids": [ref("sale_order_line_5")], "active_id":ref("sale_order_line_5")})
-    self.make_invoices(cr, uid, [], context=ctx)
+    ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_2")], "active_id":ref("sale_order_2")})
+    pay_id = self.create(cr, uid, {'advance_payment_method': 'all'})
+    self.create_invoices(cr, uid, [pay_id], context=ctx)
 -
-  I check Invoice which made from sale order line.
+  I check Invoice which made advance where type is 'Invoice all the Sale Order'.
 -
-  !python {model: sale.order.line}: |
-    line = self.browse(cr, uid, ref('sale_order_line_5'))
-    assert line.invoiced, "Line is not invoiced."
-    assert line.invoice_lines, "Invoice line should be created."
--
-  I create manual Invoice for order.
--
-  !record {model: sale.make.invoice, id: sale_make_invoice_1}:
-    invoice_date: !eval time.strftime('%Y-%m-%d')
--
-  !python {model: sale.make.invoice}: |
-    ctx = context.copy()
-    ctx = ctx.update({"active_model": 'sale.order', "active_ids": [ref("sale_order_2")], "active_id":ref("sale_order_2")})
-    self.make_invoices(cr, uid, [ref("sale_make_invoice_1")], context)
+  !python {model: sale.order}: |
+    order = self.browse(cr, uid, ref('sale_order_2'))
+    assert order.invoice_ids, "Invoice should be created after make advance invoice where type is 'Invoice all the Sale Order'."
 -
   I open the Invoice.
 -
@@ -57,7 +47,7 @@
     for invoice in so.invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice', invoice.id, 'invoice_open', cr)
 -
-  I pay the invoice
+  I pay the invoice.
 -
   !python {model: account.invoice}: |
     sale_order = self.pool.get('sale.order')
@@ -75,14 +65,6 @@
   !python {model: sale.order}: |
     sale_order = self.browse(cr, uid, ref("sale_order_2"))
     assert sale_order.invoice_ids, "Invoice should be created."
-    assert sale_order.invoiced, "Order is not invoiced."
-    assert sale_order.state == 'manual', 'Order should be in Manual.'
-    
--
-  I set order policy "Deliver & invoice on demand" as default policy.
--
-  !record {model: sale.config.settings, id: sale_configuration_0}:
-    default_order_policy: 'manual'
--
-  !python {model: sale.config.settings}: |
-    self.execute(cr, uid, [ref("sale_configuration_0")], context=context)
+    assert sale_order.invoice_exists, "Order is not invoiced."
+    assert sale_order.invoiced, "Order is not paid."
+    assert sale_order.state == 'done', 'Order should be Done.'
diff --git a/addons/sale/test/sale_order_demo.yml b/addons/sale/test/sale_order_demo.yml
index 05109efbea2..7e5a223e8b0 100644
--- a/addons/sale/test/sale_order_demo.yml
+++ b/addons/sale/test/sale_order_demo.yml
@@ -5,10 +5,12 @@
     partner_id: base.res_partner_2
     note: Invoice after delivery
     payment_term: account.account_payment_term
+    order_line: 
+      - product_id: product.product_product_7
+        product_uom_qty: 8
 -
-  !record {model: sale.order.line, id: line}:
-    name : 'LCD Monitor'
-    order_id: sale_order_test1
-    product_id: product.product_product_7
-    price_unit: 190.50
-    product_uom_qty: 8
+  I verify that the onchange was correctly triggered
+-
+  !assert {model: sale.order, id: sale.sale_order_test1, string: The onchange function of product was not correctly triggered}:
+    - order_line[0].name == u'[LCD17] 17\u201d LCD Monitor'
+    - order_line[0].price_unit == 1350.0
diff --git a/addons/sale/wizard/__init__.py b/addons/sale/wizard/__init__.py
index 6cf076164d8..bfc8679de16 100644
--- a/addons/sale/wizard/__init__.py
+++ b/addons/sale/wizard/__init__.py
@@ -23,4 +23,4 @@ import sale_make_invoice
 import sale_line_invoice
 import sale_make_invoice_advance
 
-# 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/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 613b07039d5..f442cbe0a8e 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -104,7 +104,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
                     flag = False
                     break
             if flag:
-                wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'all_lines', cr)
+                wf_service.trg_validate(uid, 'sale.order', line.order_id.id, 'manual_invoice', cr)
                 sales_order_obj.write(cr, uid, [line.order_id.id], {'state': 'progress'})
 
         if not invoices:
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index a672c6b680a..9ea2215fe0f 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -28,9 +28,9 @@ class sale_advance_payment_inv(osv.osv_memory):
 
     _columns = {
         'advance_payment_method':fields.selection(
-            [('all', 'Invoice all the Sale Order'), ('percentage','Percentage'), ('fixed','Fixed Price'),
-                ('lines', 'Some Order Lines')],
-            'Type', required=True,
+            [('all', 'Invoice the whole sale order'), ('percentage','Percentage'), ('fixed','Fixed price (deposit)'),
+                ('lines', 'Some order lines')],
+            'What do you want to invoice?', required=True,
             help="""Use All to create the final invoice.
                 Use Percentage to invoice a percentage of the total amount.
                 Use Fixed Price to invoice a specific amound in advance.
@@ -65,54 +65,28 @@ class sale_advance_payment_inv(osv.osv_memory):
             return {'value': {'amount': product.list_price}}
         return {'value': {'amount': 0}}
 
-    def create_invoices(self, cr, uid, ids, context=None):
-        """ create invoices for the active sale orders """
+    def _prepare_advance_invoice_vals(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
+        sale_obj = self.pool.get('sale.order')
+        ir_property_obj = self.pool.get('ir.property')
+        fiscal_obj = self.pool.get('account.fiscal.position')
+        inv_line_obj = self.pool.get('account.invoice.line')
         wizard = self.browse(cr, uid, ids[0], context)
         sale_ids = context.get('active_ids', [])
 
-        if wizard.advance_payment_method == 'all':
-            # create the final invoices of the active sale orders
-            res = self.pool.get('sale.order').manual_invoice(cr, uid, sale_ids, context)
-            if context.get('open_invoices', False):
-                return res
-            return {'type': 'ir.actions.act_window_close'}
-
-        if wizard.advance_payment_method == 'lines':
-            # open the list view of sale order lines to invoice
-            act_window = self.pool.get('ir.actions.act_window')
-            res = act_window.for_xml_id(cr, uid, 'sale', 'action_order_line_tree2', context)
-            res['context'] = {
-                'search_default_uninvoiced': 1,
-                'search_default_order_id': sale_ids and sale_ids[0] or False,
-            }
-            return res
-
-        assert wizard.advance_payment_method in ('fixed', 'percentage')
-
-        sale_obj = self.pool.get('sale.order')
-        inv_obj = self.pool.get('account.invoice')
-        inv_line_obj = self.pool.get('account.invoice.line')
-        inv_ids = []
-
+        result = []
         for sale in sale_obj.browse(cr, uid, sale_ids, context=context):
-            if sale.order_policy == 'postpaid':
-                raise osv.except_osv(
-                    _('Error!'),
-                    _("You cannot make an advance on a sales order \
-                         that is defined as 'Automatic Invoice after delivery'."))
-
             val = inv_line_obj.product_id_change(cr, uid, [], wizard.product_id.id,
                     uom=False, partner_id=sale.partner_id.id, fposition_id=sale.fiscal_position.id)
             res = val['value']
 
             # determine and check income account
             if not wizard.product_id.id :
-                prop = self.pool.get('ir.property').get(cr, uid,
+                prop = ir_property_obj.get(cr, uid,
                             'property_account_income_categ', 'product.category', context=context)
                 prop_id = prop and prop.id or False
-                account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, sale.fiscal_position.id or False, prop_id)
+                account_id = fiscal_obj.map_account(cr, uid, sale.fiscal_position.id or False, prop_id)
                 if not account_id:
                     raise osv.except_osv(_('Configuration Error!'),
                             _('There is no income account defined as global property.'))
@@ -149,6 +123,7 @@ class sale_advance_payment_inv(osv.osv_memory):
             # create the invoice
             inv_line_values = {
                 'name': res.get('name'),
+                'origin': sale.name,
                 'account_id': res['account_id'],
                 'price_unit': inv_amount,
                 'quantity': wizard.qtty or 1.0,
@@ -171,29 +146,45 @@ class sale_advance_payment_inv(osv.osv_memory):
                 'payment_term': sale.payment_term.id,
                 'fiscal_position': sale.fiscal_position.id or sale.partner_id.property_account_position.id
             }
-            inv_id = inv_obj.create(cr, uid, inv_values, context=context)
-            inv_obj.button_reset_taxes(cr, uid, [inv_id], context=context)
-            inv_ids.append(inv_id)
+            result.append((sale.id, inv_values))
+        return result
 
-            # add the invoice to the sale order's invoices
-            sale.write({'invoice_ids': [(4, inv_id)]})
+    def _create_invoices(self, cr, uid, inv_values, sale_id, context=None):
+        inv_obj = self.pool.get('account.invoice')
+        sale_obj = self.pool.get('sale.order')
+        inv_id = inv_obj.create(cr, uid, inv_values, context=context)
+        inv_obj.button_reset_taxes(cr, uid, [inv_id], context=context)
+        # add the invoice to the sale order's invoices
+        sale_obj.write(cr, uid, sale_id, {'invoice_ids': [(4, inv_id)]}, context=context)
+        return inv_id
 
-            # If invoice on picking: add the cost on the SO
-            # If not, the advance will be deduced when generating the final invoice
-            if sale.order_policy == 'picking':
-                vals = {
-                    'order_id': sale.id,
-                    'name': res.get('name'),
-                    'price_unit': -inv_amount,
-                    'product_uom_qty': wizard.qtty or 1.0,
-                    'product_uos_qty': wizard.qtty or 1.0,
-                    'product_uos': res.get('uos_id', False),
-                    'product_uom': res.get('uom_id', False),
-                    'product_id': wizard.product_id.id or False,
-                    'discount': False,
-                    'tax_id': res.get('invoice_line_tax_id'),
-                }
-                self.pool.get('sale.order.line').create(cr, uid, vals, context=context)
+
+    def create_invoices(self, cr, uid, ids, context=None):
+        """ create invoices for the active sale orders """
+        sale_obj = self.pool.get('sale.order')
+        act_window = self.pool.get('ir.actions.act_window')
+        wizard = self.browse(cr, uid, ids[0], context)
+        sale_ids = context.get('active_ids', [])
+        if wizard.advance_payment_method == 'all':
+            # create the final invoices of the active sale orders
+            res = sale_obj.manual_invoice(cr, uid, sale_ids, context)
+            if context.get('open_invoices', False):
+                return res
+            return {'type': 'ir.actions.act_window_close'}
+
+        if wizard.advance_payment_method == 'lines':
+            # open the list view of sale order lines to invoice
+            res = act_window.for_xml_id(cr, uid, 'sale', 'action_order_line_tree2', context)
+            res['context'] = {
+                'search_default_uninvoiced': 1,
+                'search_default_order_id': sale_ids and sale_ids[0] or False,
+            }
+            return res
+        assert wizard.advance_payment_method in ('fixed', 'percentage')
+
+        inv_ids = []
+        for sale_id, inv_values in self._prepare_advance_invoice_vals(cr, uid, ids, context=context):
+            inv_ids.append(self._create_invoices(cr, uid, inv_values, sale_id, context=context))
 
         if context.get('open_invoices', False):
             return self.open_invoices( cr, uid, ids, inv_ids, context=context)
diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml
index 5bb7d231e94..17821f519a6 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance.xml
@@ -2,12 +2,17 @@
 <openerp>
     <data>
         <record id="view_sale_advance_payment_inv" model="ir.ui.view">
-            <field name="name">Advance Invoice</field>
+            <field name="name">Invoice Order</field>
             <field name="model">sale.advance.payment.inv</field>
             <field name="arch" type="xml">
-                <form string="Advance Invoice" version="7.0">
+                <form string="Invoice Sale Order" version="7.0">
+                    <p class="oe_grey">
+                        Select how you want to invoice this order. This
+                        will create a draft invoice that can be modified
+                        before validation.
+                    </p>
                     <group>
-                        <field name="advance_payment_method"
+                        <field name="advance_payment_method" class="oe_inline"
                             on_change="onchange_method(advance_payment_method, product_id)"/>
                         <field name="qtty" invisible="1"/>
                         <field name="product_id"
@@ -22,13 +27,16 @@
                                 attrs="{'invisible': [('advance_payment_method', '!=', 'percentage')]}"/>
                         </div>
                     </group>
+                    <div>
+                        <b><label string="After clicking 'Show Lines to Invoice', select lines to invoice and create the invoice from the 'More' dropdown menu." attrs="{'invisible': [('advance_payment_method', '!=', 'lines')]}"/></b>
+                    </div>
                     <footer>
+                        <button name="create_invoices" string="Create and View Invoice" type="object"
+                            context="{'open_invoices': True}" class="oe_highlight"
+                            attrs="{'invisible': [('advance_payment_method', '=', 'lines')]}"/>
                         <button name="create_invoices" string="Create Invoice" type="object"
                             class="oe_highlight"
                             attrs="{'invisible': [('advance_payment_method', '=', 'lines')]}"/>
-                        <button name="create_invoices" string="Create and view Invoice" type="object"
-                            context="{'open_invoices': True}" class="oe_highlight"
-                            attrs="{'invisible': [('advance_payment_method', '=', 'lines')]}"/>
                         <button name="create_invoices" string="Show Lines to Invoice" type="object"
                             class="oe_highlight"
                             attrs="{'invisible': [('advance_payment_method', '!=', 'lines')]}"/>
@@ -40,7 +48,7 @@
         </record>
 
         <record id="action_view_sale_advance_payment_inv" model="ir.actions.act_window">
-            <field name="name">Advance Invoice</field>
+            <field name="name">Invoice Order</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.advance.payment.inv</field>
             <field name="view_type">form</field>
diff --git a/addons/sale_analytic_plans/__openerp__.py b/addons/sale_analytic_plans/__openerp__.py
index 621d1e4876e..5f4d980a339 100644
--- a/addons/sale_analytic_plans/__openerp__.py
+++ b/addons/sale_analytic_plans/__openerp__.py
@@ -33,11 +33,9 @@ Using this module you will be able to link analytic accounts to sales orders.
     'website': 'http://www.openerp.com',
     'images': ['images/sale_order_analytic_account.jpeg', 'images/sales_order_line.jpeg'],
     'depends': ['sale', 'account_analytic_plans'],
-    'init_xml': [],
-    'update_xml': ['sale_analytic_plans_view.xml'],
-    'demo_xml': [],
+    'data': ['sale_analytic_plans_view.xml'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0066055860861',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_analytic_plans/i18n/ar.po b/addons/sale_analytic_plans/i18n/ar.po
index 7bafc5e44af..4229b3edd46 100644
--- a/addons/sale_analytic_plans/i18n/ar.po
+++ b/addons/sale_analytic_plans/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/bg.po b/addons/sale_analytic_plans/i18n/bg.po
index ec75bfeffba..76b5be3df5c 100644
--- a/addons/sale_analytic_plans/i18n/bg.po
+++ b/addons/sale_analytic_plans/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/bs.po b/addons/sale_analytic_plans/i18n/bs.po
index add4b84a157..5a35aa79427 100644
--- a/addons/sale_analytic_plans/i18n/bs.po
+++ b/addons/sale_analytic_plans/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/ca.po b/addons/sale_analytic_plans/i18n/ca.po
index 769fea472ba..c4d8b7b3e03 100644
--- a/addons/sale_analytic_plans/i18n/ca.po
+++ b/addons/sale_analytic_plans/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/cs.po b/addons/sale_analytic_plans/i18n/cs.po
index 4549b254ddb..6fe3a44ef94 100644
--- a/addons/sale_analytic_plans/i18n/cs.po
+++ b/addons/sale_analytic_plans/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/da.po b/addons/sale_analytic_plans/i18n/da.po
index ed725d81bf6..35952f0a043 100644
--- a/addons/sale_analytic_plans/i18n/da.po
+++ b/addons/sale_analytic_plans/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/de.po b/addons/sale_analytic_plans/i18n/de.po
index f8d64b54145..d2554b7d9ff 100644
--- a/addons/sale_analytic_plans/i18n/de.po
+++ b/addons/sale_analytic_plans/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/el.po b/addons/sale_analytic_plans/i18n/el.po
index c9ceb24783c..9283d4dbd5e 100644
--- a/addons/sale_analytic_plans/i18n/el.po
+++ b/addons/sale_analytic_plans/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/sale_analytic_plans/i18n/es.po b/addons/sale_analytic_plans/i18n/es.po
index 31b9815f7fb..cf90532222e 100644
--- a/addons/sale_analytic_plans/i18n/es.po
+++ b/addons/sale_analytic_plans/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/es_AR.po b/addons/sale_analytic_plans/i18n/es_AR.po
index 9924c89536e..eb3e1d5144e 100644
--- a/addons/sale_analytic_plans/i18n/es_AR.po
+++ b/addons/sale_analytic_plans/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/es_CL.po b/addons/sale_analytic_plans/i18n/es_CL.po
index a12b2ddf644..9c29cd0b4f8 100644
--- a/addons/sale_analytic_plans/i18n/es_CL.po
+++ b/addons/sale_analytic_plans/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/es_CR.po b/addons/sale_analytic_plans/i18n/es_CR.po
index 46fafca20ba..790f5f1db64 100644
--- a/addons/sale_analytic_plans/i18n/es_CR.po
+++ b/addons/sale_analytic_plans/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/et.po b/addons/sale_analytic_plans/i18n/et.po
index 8d833e49742..966c319beaf 100644
--- a/addons/sale_analytic_plans/i18n/et.po
+++ b/addons/sale_analytic_plans/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/fi.po b/addons/sale_analytic_plans/i18n/fi.po
index 4dcccbd9c7e..631a80ce463 100644
--- a/addons/sale_analytic_plans/i18n/fi.po
+++ b/addons/sale_analytic_plans/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/fr.po b/addons/sale_analytic_plans/i18n/fr.po
index a866b3e0530..9b0c85b8ad9 100644
--- a/addons/sale_analytic_plans/i18n/fr.po
+++ b/addons/sale_analytic_plans/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/gl.po b/addons/sale_analytic_plans/i18n/gl.po
index c91ac3cbafc..d7ea2190137 100644
--- a/addons/sale_analytic_plans/i18n/gl.po
+++ b/addons/sale_analytic_plans/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/hr.po b/addons/sale_analytic_plans/i18n/hr.po
index f76c7dc530b..3897b6347c0 100644
--- a/addons/sale_analytic_plans/i18n/hr.po
+++ b/addons/sale_analytic_plans/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: sale_analytic_plans
diff --git a/addons/sale_analytic_plans/i18n/hu.po b/addons/sale_analytic_plans/i18n/hu.po
index cef17989856..e48fd6b7418 100644
--- a/addons/sale_analytic_plans/i18n/hu.po
+++ b/addons/sale_analytic_plans/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/id.po b/addons/sale_analytic_plans/i18n/id.po
index 2a94fb10740..27eb1261aff 100644
--- a/addons/sale_analytic_plans/i18n/id.po
+++ b/addons/sale_analytic_plans/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/it.po b/addons/sale_analytic_plans/i18n/it.po
index 4f77ca16362..ce5810f889c 100644
--- a/addons/sale_analytic_plans/i18n/it.po
+++ b/addons/sale_analytic_plans/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/ja.po b/addons/sale_analytic_plans/i18n/ja.po
index e1395c40437..286a3a0cab3 100644
--- a/addons/sale_analytic_plans/i18n/ja.po
+++ b/addons/sale_analytic_plans/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/ko.po b/addons/sale_analytic_plans/i18n/ko.po
index 076b4d93f5a..ff49955ab60 100644
--- a/addons/sale_analytic_plans/i18n/ko.po
+++ b/addons/sale_analytic_plans/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/lt.po b/addons/sale_analytic_plans/i18n/lt.po
index cbb4f9d1347..efd8433528a 100644
--- a/addons/sale_analytic_plans/i18n/lt.po
+++ b/addons/sale_analytic_plans/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/mn.po b/addons/sale_analytic_plans/i18n/mn.po
index b5c7595cae9..0b94573c6a7 100644
--- a/addons/sale_analytic_plans/i18n/mn.po
+++ b/addons/sale_analytic_plans/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/nb.po b/addons/sale_analytic_plans/i18n/nb.po
index 03fa06c2317..a7c6ddc5b6b 100644
--- a/addons/sale_analytic_plans/i18n/nb.po
+++ b/addons/sale_analytic_plans/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/nl.po b/addons/sale_analytic_plans/i18n/nl.po
index 96f48032d34..e6d412a82a6 100644
--- a/addons/sale_analytic_plans/i18n/nl.po
+++ b/addons/sale_analytic_plans/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/nl_BE.po b/addons/sale_analytic_plans/i18n/nl_BE.po
index 0ddf17016db..9d50d0eab49 100644
--- a/addons/sale_analytic_plans/i18n/nl_BE.po
+++ b/addons/sale_analytic_plans/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/oc.po b/addons/sale_analytic_plans/i18n/oc.po
index 96667a9f57a..433b1703589 100644
--- a/addons/sale_analytic_plans/i18n/oc.po
+++ b/addons/sale_analytic_plans/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/pl.po b/addons/sale_analytic_plans/i18n/pl.po
index a8ca892b352..4af3f444637 100644
--- a/addons/sale_analytic_plans/i18n/pl.po
+++ b/addons/sale_analytic_plans/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/pt.po b/addons/sale_analytic_plans/i18n/pt.po
index 75a8ea51ae1..71dc77ca38d 100644
--- a/addons/sale_analytic_plans/i18n/pt.po
+++ b/addons/sale_analytic_plans/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/pt_BR.po b/addons/sale_analytic_plans/i18n/pt_BR.po
index a4d291d897b..216523ddbfc 100644
--- a/addons/sale_analytic_plans/i18n/pt_BR.po
+++ b/addons/sale_analytic_plans/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -24,7 +24,7 @@ msgstr "Distribuição Analítica"
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Linha de Pedido de Vendas"
+msgstr "Linha do Pedido de Vendas"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
diff --git a/addons/sale_analytic_plans/i18n/ro.po b/addons/sale_analytic_plans/i18n/ro.po
index 8953127f9aa..79ffee8db8c 100644
--- a/addons/sale_analytic_plans/i18n/ro.po
+++ b/addons/sale_analytic_plans/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/ru.po b/addons/sale_analytic_plans/i18n/ru.po
index 754c49a7e38..b90a183a233 100644
--- a/addons/sale_analytic_plans/i18n/ru.po
+++ b/addons/sale_analytic_plans/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
@@ -24,7 +24,7 @@ msgstr "Разнесение аналитики"
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Позиция заказа на продажу"
+msgstr "Позиция заказа продаж"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Неправильный XML для просмотра архитектуры!"
diff --git a/addons/sale_analytic_plans/i18n/sk.po b/addons/sale_analytic_plans/i18n/sk.po
index 72bc2e7435e..976c9042cd2 100644
--- a/addons/sale_analytic_plans/i18n/sk.po
+++ b/addons/sale_analytic_plans/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sl.po b/addons/sale_analytic_plans/i18n/sl.po
index 1a584719f56..485a8fa60d0 100644
--- a/addons/sale_analytic_plans/i18n/sl.po
+++ b/addons/sale_analytic_plans/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sq.po b/addons/sale_analytic_plans/i18n/sq.po
index 75297eca8b9..913cdfc6872 100644
--- a/addons/sale_analytic_plans/i18n/sq.po
+++ b/addons/sale_analytic_plans/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sr.po b/addons/sale_analytic_plans/i18n/sr.po
index 7735232eddb..58f927d963b 100644
--- a/addons/sale_analytic_plans/i18n/sr.po
+++ b/addons/sale_analytic_plans/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sr@latin.po b/addons/sale_analytic_plans/i18n/sr@latin.po
index ca0d347af78..637b60043b7 100644
--- a/addons/sale_analytic_plans/i18n/sr@latin.po
+++ b/addons/sale_analytic_plans/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/sv.po b/addons/sale_analytic_plans/i18n/sv.po
index ffbcd08fa5d..59f62e36b53 100644
--- a/addons/sale_analytic_plans/i18n/sv.po
+++ b/addons/sale_analytic_plans/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/tlh.po b/addons/sale_analytic_plans/i18n/tlh.po
index 8233fc24200..e62d1544e88 100644
--- a/addons/sale_analytic_plans/i18n/tlh.po
+++ b/addons/sale_analytic_plans/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/tr.po b/addons/sale_analytic_plans/i18n/tr.po
index 02973ed6c7f..ae4de263f72 100644
--- a/addons/sale_analytic_plans/i18n/tr.po
+++ b/addons/sale_analytic_plans/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/uk.po b/addons/sale_analytic_plans/i18n/uk.po
index 3b4d31a4067..47459816e8d 100644
--- a/addons/sale_analytic_plans/i18n/uk.po
+++ b/addons/sale_analytic_plans/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/vi.po b/addons/sale_analytic_plans/i18n/vi.po
index 575d706c342..1350c02d313 100644
--- a/addons/sale_analytic_plans/i18n/vi.po
+++ b/addons/sale_analytic_plans/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/zh_CN.po b/addons/sale_analytic_plans/i18n/zh_CN.po
index 6d22d64ebdb..fac76f9eff6 100644
--- a/addons/sale_analytic_plans/i18n/zh_CN.po
+++ b/addons/sale_analytic_plans/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/i18n/zh_TW.po b/addons/sale_analytic_plans/i18n/zh_TW.po
index 3f8fd2aef8c..9688a938522 100644
--- a/addons/sale_analytic_plans/i18n/zh_TW.po
+++ b/addons/sale_analytic_plans/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index b8ccc44079d..872e8b0bffc 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -39,4 +39,14 @@ class sale_order_line(osv.osv):
 
 sale_order_line()
 
+class sale_order(osv.osv):
+    _inherit = "sale.order"
+
+    def onchange_shop_id(self, cr, uid, ids, shop_id, context=None):
+        # Remove the project_id from the result of super() call, if any, as this field is not in the view anymore
+        res = super(sale_order, self).onchange_shop_id(cr, uid, ids, shop_id, context=context)
+        if res.get('value',{}).get('project_id'):
+            del(res['value']['project_id'])
+        return res
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_analytic_plans/sale_analytic_plans_view.xml b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
index 6701ede5ae5..6c788866520 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans_view.xml
+++ b/addons/sale_analytic_plans/sale_analytic_plans_view.xml
@@ -22,6 +22,11 @@
         </field>
     </record>
 
+    <!-- the presence of 'analytics_id' makes the order lines non-editable -->
+    <record id="sale.view_order_form_editable_list" model="ir.ui.view">
+        <field name="groups_id" eval="[(4, ref('analytic.group_analytic_accounting'))]"/>
+    </record>
+
     <record model="ir.ui.view" id="view_order_line_form2_inherit">
         <field name="name">sale.order.line.form2.inherit</field>
         <field name="model">sale.order.line</field>
diff --git a/addons/sale_crm/__init__.py b/addons/sale_crm/__init__.py
index f5db3f4333b..ac44586e7db 100644
--- a/addons/sale_crm/__init__.py
+++ b/addons/sale_crm/__init__.py
@@ -22,4 +22,4 @@
 import wizard
 import sale_crm
 
-# 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/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index b56d866f98b..82e267337f9 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -38,17 +38,16 @@ modules.
     'website': 'http://www.openerp.com',
     'images': ['images/crm_statistics_dashboard.jpeg', 'images/opportunity_to_quote.jpeg'],
     'depends': ['sale', 'crm'],
-    'init_xml': [],
-    'update_xml': ['wizard/crm_make_sale_view.xml',
-                   'sale_crm_view.xml',
-                   'process/sale_crm_process.xml',
-                   'security/sale_crm_security.xml',
-                   'security/ir.model.access.csv'
-                   ],
-    'demo_xml': [],
+    'data': [
+        'wizard/crm_make_sale_view.xml',
+        'sale_crm_view.xml',
+        'process/sale_crm_process.xml',
+        'security/sale_crm_security.xml',
+        'security/ir.model.access.csv'
+    ],
+    'demo': [],
     'test': ['test/sale_crm.yml'],
     'installable': True,
     'auto_install': True,
-    'certificate': '0064360130141',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/i18n/ar.po b/addons/sale_crm/i18n/ar.po
index ebb7cfc88d1..0f3f7f738aa 100644
--- a/addons/sale_crm/i18n/ar.po
+++ b/addons/sale_crm/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/bg.po b/addons/sale_crm/i18n/bg.po
index 12fcb833815..08e536628cd 100644
--- a/addons/sale_crm/i18n/bg.po
+++ b/addons/sale_crm/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/bs.po b/addons/sale_crm/i18n/bs.po
index d8f37ce308c..dc836deb209 100644
--- a/addons/sale_crm/i18n/bs.po
+++ b/addons/sale_crm/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/ca.po b/addons/sale_crm/i18n/ca.po
index 6ab0dfff14f..90f026f9d4f 100644
--- a/addons/sale_crm/i18n/ca.po
+++ b/addons/sale_crm/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/cs.po b/addons/sale_crm/i18n/cs.po
index 5aa0bcfb0c5..ad6e4749138 100644
--- a/addons/sale_crm/i18n/cs.po
+++ b/addons/sale_crm/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/da.po b/addons/sale_crm/i18n/da.po
index febe4d257b0..e1a4e7fa972 100644
--- a/addons/sale_crm/i18n/da.po
+++ b/addons/sale_crm/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/de.po b/addons/sale_crm/i18n/de.po
index 5204729c093..fcc6946da85 100644
--- a/addons/sale_crm/i18n/de.po
+++ b/addons/sale_crm/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/el.po b/addons/sale_crm/i18n/el.po
index 13c95cae389..fe0b7e4ad87 100644
--- a/addons/sale_crm/i18n/el.po
+++ b/addons/sale_crm/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/sale_crm/i18n/es.po b/addons/sale_crm/i18n/es.po
index 27c2e090448..2cdd76e9bf4 100644
--- a/addons/sale_crm/i18n/es.po
+++ b/addons/sale_crm/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/es_AR.po b/addons/sale_crm/i18n/es_AR.po
index f3116d53b11..4d53efa188c 100644
--- a/addons/sale_crm/i18n/es_AR.po
+++ b/addons/sale_crm/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/es_CL.po b/addons/sale_crm/i18n/es_CL.po
index 48fdc17bc90..a91511df271 100644
--- a/addons/sale_crm/i18n/es_CL.po
+++ b/addons/sale_crm/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/es_CR.po b/addons/sale_crm/i18n/es_CR.po
index 106965a58d0..cad7a6eade9 100644
--- a/addons/sale_crm/i18n/es_CR.po
+++ b/addons/sale_crm/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/et.po b/addons/sale_crm/i18n/et.po
index 6efcc05c472..f4894c37724 100644
--- a/addons/sale_crm/i18n/et.po
+++ b/addons/sale_crm/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/fi.po b/addons/sale_crm/i18n/fi.po
index 1562263ee20..348b9da69e7 100644
--- a/addons/sale_crm/i18n/fi.po
+++ b/addons/sale_crm/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/fr.po b/addons/sale_crm/i18n/fr.po
index 703d4063ddd..1cdc1fb7b70 100644
--- a/addons/sale_crm/i18n/fr.po
+++ b/addons/sale_crm/i18n/fr.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-11-25 14:51+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-09-03 22:25+0000\n"
+"Last-Translator: Nicolas JEUDY <njeudy@tuxservices.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Catégorie"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "La référence de commande doit être unique par société !"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:112
 #, python-format
 msgid "Converted to Sales Quotation(%s)."
-msgstr ""
+msgstr "Convertir en devis (%s)"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -62,7 +62,7 @@ msgstr "_Créer"
 #. module: sale_crm
 #: view:sale.order:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Mon (mes) équipe(s) de vente"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
@@ -75,7 +75,7 @@ msgstr ""
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "Mes opportunités"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -106,7 +106,7 @@ msgstr "Fermer l'opportunité"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Mes revenus planifiés par étape"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
@@ -133,7 +133,7 @@ msgstr "Annuler"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr "Commande de ventes"
+msgstr "Commande client"
 
 #~ msgid "Crm opportunity quotation"
 #~ msgstr "Chiffrage de l'opportunité"
diff --git a/addons/sale_crm/i18n/gl.po b/addons/sale_crm/i18n/gl.po
index a7d83cf68a1..53ed6620d93 100644
--- a/addons/sale_crm/i18n/gl.po
+++ b/addons/sale_crm/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/hr.po b/addons/sale_crm/i18n/hr.po
index a83f765c5ea..d7b2478abf0 100644
--- a/addons/sale_crm/i18n/hr.po
+++ b/addons/sale_crm/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: sale_crm
diff --git a/addons/sale_crm/i18n/hu.po b/addons/sale_crm/i18n/hu.po
index e4bf7daf445..926cd527ce8 100644
--- a/addons/sale_crm/i18n/hu.po
+++ b/addons/sale_crm/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/id.po b/addons/sale_crm/i18n/id.po
index a8cfc31792c..b141ca90ad9 100644
--- a/addons/sale_crm/i18n/id.po
+++ b/addons/sale_crm/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/it.po b/addons/sale_crm/i18n/it.po
index 062fc7e1647..834548a04c9 100644
--- a/addons/sale_crm/i18n/it.po
+++ b/addons/sale_crm/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/ja.po b/addons/sale_crm/i18n/ja.po
index 0b9e903120c..2395d44f08a 100644
--- a/addons/sale_crm/i18n/ja.po
+++ b/addons/sale_crm/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/ko.po b/addons/sale_crm/i18n/ko.po
index 4fbb5185dd7..d732adfd693 100644
--- a/addons/sale_crm/i18n/ko.po
+++ b/addons/sale_crm/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/lt.po b/addons/sale_crm/i18n/lt.po
index e56560e50ac..de4bf85728d 100644
--- a/addons/sale_crm/i18n/lt.po
+++ b/addons/sale_crm/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/lv.po b/addons/sale_crm/i18n/lv.po
index a5c1311b333..14d40616c61 100644
--- a/addons/sale_crm/i18n/lv.po
+++ b/addons/sale_crm/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/mn.po b/addons/sale_crm/i18n/mn.po
index 2f974753c58..8774b0e6b87 100644
--- a/addons/sale_crm/i18n/mn.po
+++ b/addons/sale_crm/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/nb.po b/addons/sale_crm/i18n/nb.po
index 77eb84ce625..7f11120a0a1 100644
--- a/addons/sale_crm/i18n/nb.po
+++ b/addons/sale_crm/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/nl.po b/addons/sale_crm/i18n/nl.po
index fef5820e4f9..5a5050dc11d 100644
--- a/addons/sale_crm/i18n/nl.po
+++ b/addons/sale_crm/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-14 15:56+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
@@ -69,7 +69,7 @@ msgstr "Mijn verkoop team(s)"
 msgid ""
 "Check this to close the opportunity after having created the sale order."
 msgstr ""
-"Zet dit aan om de verkoopkans te sluiten na het maken van de verkooporder."
+"Vink dit aan om de prospect af te sluiten na het maken van de verkooporder."
 
 #. module: sale_crm
 #: view:board.board:0
@@ -95,12 +95,12 @@ msgstr "Klant"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:92
 #, python-format
 msgid "Opportunity: %s"
-msgstr "Verkoopkans: %s"
+msgstr "Prospect: %s"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr "Verkoopkans sluiten"
+msgstr "Prospect sluiten"
 
 #. module: sale_crm
 #: view:board.board:0
diff --git a/addons/sale_crm/i18n/nl_BE.po b/addons/sale_crm/i18n/nl_BE.po
index 2a0fc40a3ff..67a26a7c266 100644
--- a/addons/sale_crm/i18n/nl_BE.po
+++ b/addons/sale_crm/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/pl.po b/addons/sale_crm/i18n/pl.po
index 7e74d439032..02247087cb4 100644
--- a/addons/sale_crm/i18n/pl.po
+++ b/addons/sale_crm/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/pt.po b/addons/sale_crm/i18n/pt.po
index 761719de6b0..86356888451 100644
--- a/addons/sale_crm/i18n/pt.po
+++ b/addons/sale_crm/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/pt_BR.po b/addons/sale_crm/i18n/pt_BR.po
index fc081ffee28..ce7625839f5 100644
--- a/addons/sale_crm/i18n/pt_BR.po
+++ b/addons/sale_crm/i18n/pt_BR.po
@@ -8,13 +8,14 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 19:41+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
@@ -24,7 +25,7 @@ msgstr "Categoria"
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr "Referência de ordem deve ser única por empresa!"
+msgstr "A Referência do Pedido deve ser única por Empresa!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:112
@@ -69,8 +70,8 @@ msgstr "Minha Equipe de Vendas"
 msgid ""
 "Check this to close the opportunity after having created the sale order."
 msgstr ""
-"Marque esta opção para fechar a oportunidade depois de ter criado a ordem de "
-"venda."
+"Marque esta opção para fechar a oportunidade depois de ter criado o pedido "
+"de venda."
 
 #. module: sale_crm
 #: view:board.board:0
@@ -85,7 +86,7 @@ msgstr "Converter para Cotação"
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
 msgid "Shop"
-msgstr "Loja"
+msgstr "Estabelecimento"
 
 #. module: sale_crm
 #: field:crm.make.sale,partner_id:0
@@ -112,13 +113,13 @@ msgstr "Minhas Receitas Planejadas por Estágio"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr "A Oportunidade '%s' foi convertida para uma cotação."
+msgstr "A Oportunidade '%s' foi convertida em Cotação."
 
 #. module: sale_crm
 #: view:sale.order:0
 #: field:sale.order,section_id:0
 msgid "Sales Team"
-msgstr "Time de Vendas"
+msgstr "Equipe de Vendas"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
diff --git a/addons/sale_crm/i18n/ro.po b/addons/sale_crm/i18n/ro.po
index 2fed1b8ca8d..084eb1a16df 100644
--- a/addons/sale_crm/i18n/ro.po
+++ b/addons/sale_crm/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po
index b15551d7594..f440720f99f 100644
--- a/addons/sale_crm/i18n/ru.po
+++ b/addons/sale_crm/i18n/ru.po
@@ -13,24 +13,24 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Категория"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:112
 #, python-format
 msgid "Converted to Sales Quotation(%s)."
-msgstr ""
+msgstr "Преобразовано в запрос цен(%s)."
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -62,18 +62,18 @@ msgstr "_Создать"
 #. module: sale_crm
 #: view:sale.order:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "Мои отделы продаж"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
 "Check this to close the opportunity after having created the sale order."
-msgstr "Отметьте для закрытия предложения после создания заказа на продажу."
+msgstr "Отметьте для закрытия предложения после создания заказа продаж."
 
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "Мои предложения"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -104,13 +104,13 @@ msgstr "Закрыть предложение"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "Моя запланированная выручка по этапам"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr "Gредложение '%s'  преобразовано в заказ на продажу."
+msgstr "Предложение '%s'  преобразовано в заказ продаж."
 
 #. module: sale_crm
 #: view:sale.order:0
@@ -131,7 +131,7 @@ msgstr "Отмена"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sales Order"
-msgstr "Заказ на продажу"
+msgstr "Заказ продаж"
 
 #~ msgid "Create"
 #~ msgstr "Создать"
diff --git a/addons/sale_crm/i18n/sk.po b/addons/sale_crm/i18n/sk.po
index 3d9d3c94fbb..013a653d03a 100644
--- a/addons/sale_crm/i18n/sk.po
+++ b/addons/sale_crm/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/sl.po b/addons/sale_crm/i18n/sl.po
index 80716cc09db..704fa3478ee 100644
--- a/addons/sale_crm/i18n/sl.po
+++ b/addons/sale_crm/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/sq.po b/addons/sale_crm/i18n/sq.po
index c0aa2f0cf58..257408a5a56 100644
--- a/addons/sale_crm/i18n/sq.po
+++ b/addons/sale_crm/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/sv.po b/addons/sale_crm/i18n/sv.po
index ae347c35d50..8fe86bb2a07 100644
--- a/addons/sale_crm/i18n/sv.po
+++ b/addons/sale_crm/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/tlh.po b/addons/sale_crm/i18n/tlh.po
index f17bb1b4203..07ff88339fb 100644
--- a/addons/sale_crm/i18n/tlh.po
+++ b/addons/sale_crm/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/tr.po b/addons/sale_crm/i18n/tr.po
index f30231bb343..24701db871a 100644
--- a/addons/sale_crm/i18n/tr.po
+++ b/addons/sale_crm/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
@@ -24,13 +24,13 @@ msgstr "Kategori"
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!"
+msgstr "Sipariş Referansı Her Firma için benzersiz olmalı!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:112
 #, python-format
 msgid "Converted to Sales Quotation(%s)."
-msgstr "Satış Teklifine (%s) cevirilmiş"
+msgstr "Satış Teklifine (%s) dönüştürülmüş"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -41,7 +41,7 @@ msgstr "Teklife Dönüştür"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
 #, python-format
 msgid "Data Insufficient!"
-msgstr "Yetersiz Veri"
+msgstr "Yetersiz Veri!"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:89
@@ -62,14 +62,14 @@ msgstr "_Oluştur"
 #. module: sale_crm
 #: view:sale.order:0
 msgid "My Sales Team(s)"
-msgstr "Satış Ekiplerim"
+msgstr "Satış Takım(lar)ım"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
 "Check this to close the opportunity after having created the sale order."
 msgstr ""
-"Satış siparişini oluşturduktan sonra seçeneği kapatmak için bunu tıklayın."
+"Satış siparişini oluşturduktan sonra fırsatı kapatmak için bunu tıklayın."
 
 #. module: sale_crm
 #: view:board.board:0
@@ -105,7 +105,7 @@ msgstr "Fırsatı Kapat"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr "Sahneye göre Planlanan Gelirlerim"
+msgstr "Aşamaya göre Planlanan Gelirlerim"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
diff --git a/addons/sale_crm/i18n/uk.po b/addons/sale_crm/i18n/uk.po
index 8542e48f170..e3e6904d7dd 100644
--- a/addons/sale_crm/i18n/uk.po
+++ b/addons/sale_crm/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/vi.po b/addons/sale_crm/i18n/vi.po
index 992eeebfb2b..ec69e691796 100644
--- a/addons/sale_crm/i18n/vi.po
+++ b/addons/sale_crm/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:57+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/i18n/zh_CN.po b/addons/sale_crm/i18n/zh_CN.po
index fde349ee41f..329be599400 100644
--- a/addons/sale_crm/i18n/zh_CN.po
+++ b/addons/sale_crm/i18n/zh_CN.po
@@ -7,30 +7,30 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-08-03 06:06+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-08-31 14:59+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "分类"
 
 #. module: sale_crm
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "订单号必须在一个公司范围内唯一"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:112
 #, python-format
 msgid "Converted to Sales Quotation(%s)."
-msgstr ""
+msgstr "转换为销售报价单(%s)。"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
@@ -62,7 +62,7 @@ msgstr "创建(_C)"
 #. module: sale_crm
 #: view:sale.order:0
 msgid "My Sales Team(s)"
-msgstr ""
+msgstr "我的销售团队"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
@@ -73,7 +73,7 @@ msgstr "在生成销售订单后检查是否关闭商机。"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Opportunities"
-msgstr ""
+msgstr "我的商机"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -104,13 +104,13 @@ msgstr "关闭商机"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Planned Revenues by Stage"
-msgstr ""
+msgstr "这阶段我的计划收入"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity  '%s' is converted to Quotation."
-msgstr ""
+msgstr "商机 '%s'  被转换为报价单"
 
 #. module: sale_crm
 #: view:sale.order:0
diff --git a/addons/sale_crm/i18n/zh_TW.po b/addons/sale_crm/i18n/zh_TW.po
index 661dfa863b9..45618097134 100644
--- a/addons/sale_crm/i18n/zh_TW.po
+++ b/addons/sale_crm/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:46+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:58+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_crm
 #: field:sale.order,categ_id:0
diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py
index b6d5ec25ce1..80e9f3b4f42 100644
--- a/addons/sale_crm/sale_crm.py
+++ b/addons/sale_crm/sale_crm.py
@@ -23,13 +23,27 @@ from osv import osv,fields
 
 class sale_order(osv.osv):
     _inherit = 'sale.order'
-
     _columns = {
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'categ_ids': fields.many2many('crm.case.categ', 'sale_order_category_rel', 'order_id', 'category_id', 'Categories', \
             domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]")
     }
 
+    def create(self, cr, uid, vals, context=None):
+        order =  super(sale_order, self).create(cr, uid, vals, context=context)
+        section_id = self.browse(cr, uid, order, context=context).section_id
+        if section_id:
+            followers = [follow.id for follow in section_id.message_follower_ids]
+            self.message_subscribe(cr, uid, [order], followers, context=context)
+        return order
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if vals.get('section_id'):
+            section_id = self.pool.get('crm.case.section').browse(cr, uid, vals.get('section_id'), context=context)
+            if section_id:
+                vals['message_follower_ids'] = [(4, follower.id) for follower in section_id.message_follower_ids]
+        return super(sale_order, self).write(cr, uid, ids, vals, context=context)
+
 sale_order()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index be871b87796..665474c22c0 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -9,8 +9,8 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/header/button[@name='case_mark_lost']" position="after">
-                        <button states="done" string="Convert to Quote" name="%(action_crm_make_sale)d" type="action" class="oe_highlight"/>
-                        <button states="draft,open,pending" string="Convert to Quote" name="%(action_crm_make_sale)d" type="action"/>
+                        <button states="done" string="Create Quotation" name="%(action_crm_make_sale)d" type="action"/>
+                        <button states="draft,open,pending" string="Convert to Quotation" name="%(action_crm_make_sale)d" type="action" class="oe_highlight"/>
                     </xpath>
                 </data>
             </field>
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 6ca9ac8230f..10225990229 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -64,7 +64,9 @@ class crm_make_sale(osv.osv_memory):
         """
         if context is None:
             context = {}
-
+        # update context: if come from phonecall, default state values can make the quote crash lp:1017353
+        context.pop('default_state', False)        
+        
         case_obj = self.pool.get('crm.lead')
         sale_obj = self.pool.get('sale.order')
         partner_obj = self.pool.get('res.partner')
@@ -106,7 +108,7 @@ class crm_make_sale(osv.osv_memory):
                 case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id})
                 new_ids.append(new_id)
                 message = _("Opportunity has been <b>converted</b> to the quotation <em>%s</em>.") % (sale_order.name)
-                case.message_append_note(body=message)
+                case.message_post(body=message)
             if make.close:
                 case_obj.case_close(cr, uid, data)
             if not new_ids:
diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index 11408161bf4..30a6a281c49 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -30,17 +30,19 @@ The sales journal modules allows you to categorise your sales and deliveries (pi
 This module is very helpful for bigger companies that works by departments.
 
 You can use journal for different purposes, some examples:
+----------------------------------------------------------
     * isolate sales of different departments
     * journals for deliveries by truck or by UPS
 
 Journals have a responsible and evolves between different status:
+-----------------------------------------------------------------
     * draft, open, cancel, done.
 
 Batch operations can be processed on the different journals to confirm all sales
 at once, to validate or invoice packing.
 
-It also supports batch invoicing methods that can be configured by partners and
-sales orders, examples:
+It also supports batch invoicing methods that can be configured by partners and sales orders, examples:
+-------------------------------------------------------------------------------------------------------
     * daily invoicing
     * monthly invoicing
 
@@ -50,15 +52,14 @@ Some statistics by journals are provided.
     'website': 'http://www.openerp.com',
     'images': ['images/invoice_type.jpeg'],
     'depends': ['sale'],
-    'init_xml': ['sale_journal_data.xml'],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
         'sale_journal_view.xml',
+        'sale_journal_data.xml'
     ],
-    'demo_xml': ['sale_journal_demo.xml'],
+    'demo': ['sale_journal_demo.xml'],
     'test': [ ],
     'installable': True,
     'auto_install': False,
-    'certificate': '0077661619085',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_journal/i18n/ar.po b/addons/sale_journal/i18n/ar.po
index 10c3410d603..50a951cc958 100644
--- a/addons/sale_journal/i18n/ar.po
+++ b/addons/sale_journal/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/bg.po b/addons/sale_journal/i18n/bg.po
index 3d9878502ab..4a3b850f4f5 100644
--- a/addons/sale_journal/i18n/bg.po
+++ b/addons/sale_journal/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/bs.po b/addons/sale_journal/i18n/bs.po
index 6cbd4ab8465..547d33e131b 100644
--- a/addons/sale_journal/i18n/bs.po
+++ b/addons/sale_journal/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/ca.po b/addons/sale_journal/i18n/ca.po
index fdf76a3774e..0c106c2df2c 100644
--- a/addons/sale_journal/i18n/ca.po
+++ b/addons/sale_journal/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/cs.po b/addons/sale_journal/i18n/cs.po
index 7ce8e8acc39..1a72cc06b46 100644
--- a/addons/sale_journal/i18n/cs.po
+++ b/addons/sale_journal/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/da.po b/addons/sale_journal/i18n/da.po
index 039b9f3fa78..f2caf535926 100644
--- a/addons/sale_journal/i18n/da.po
+++ b/addons/sale_journal/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/de.po b/addons/sale_journal/i18n/de.po
index 993cdec4ce9..aba5b136417 100644
--- a/addons/sale_journal/i18n/de.po
+++ b/addons/sale_journal/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/el.po b/addons/sale_journal/i18n/el.po
index b9740ba3326..dea621ed00f 100644
--- a/addons/sale_journal/i18n/el.po
+++ b/addons/sale_journal/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/es.po b/addons/sale_journal/i18n/es.po
index adebafed944..6bd7c7a5a08 100644
--- a/addons/sale_journal/i18n/es.po
+++ b/addons/sale_journal/i18n/es.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2011-01-13 09:28+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/es_AR.po b/addons/sale_journal/i18n/es_AR.po
index d10e1a08b57..6f5c0022be4 100644
--- a/addons/sale_journal/i18n/es_AR.po
+++ b/addons/sale_journal/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/es_CL.po b/addons/sale_journal/i18n/es_CL.po
index c3bc8fab26a..1f17e81292b 100644
--- a/addons/sale_journal/i18n/es_CL.po
+++ b/addons/sale_journal/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/es_CR.po b/addons/sale_journal/i18n/es_CR.po
index b7fcf534cc2..b8811fa5c68 100644
--- a/addons/sale_journal/i18n/es_CR.po
+++ b/addons/sale_journal/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/et.po b/addons/sale_journal/i18n/et.po
index b8b1228ec4c..91eb8bd96bc 100644
--- a/addons/sale_journal/i18n/et.po
+++ b/addons/sale_journal/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/fi.po b/addons/sale_journal/i18n/fi.po
index e912db6fb2c..7d942367f4b 100644
--- a/addons/sale_journal/i18n/fi.po
+++ b/addons/sale_journal/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/fr.po b/addons/sale_journal/i18n/fr.po
index ccb1dede897..73b2b922a10 100644
--- a/addons/sale_journal/i18n/fr.po
+++ b/addons/sale_journal/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
@@ -135,9 +135,36 @@ msgstr "Liste de préparation"
 msgid "Invoicing"
 msgstr "Facturation"
 
+#~ msgid "Cancel Packing"
+#~ msgstr "Annuler le colisage"
+
+#~ msgid "The type of journal used for sales and packing."
+#~ msgstr "Le type de journal utilisé pour les ventes et colisages"
+
+#~ msgid "Packing journals"
+#~ msgstr "Journaux de colisages"
+
+#~ msgid "Packing"
+#~ msgstr "Colisage"
+
 #~ msgid "Managing sales and deliveries by journal"
 #~ msgstr "Gestion des ventes et des livraisons par journal"
 
+#~ msgid "Packing Journals"
+#~ msgstr "Journaux de colisages"
+
+#~ msgid "Open journals"
+#~ msgstr "Ouvrir journaux"
+
+#~ msgid "Packing by journals"
+#~ msgstr "Colisages par journaux"
+
+#~ msgid "sale_journal.invoice.type.tree"
+#~ msgstr "sale_journal.invoice.type.tree"
+
+#~ msgid "Confirmed packing"
+#~ msgstr "Colisage confirmé"
+
 #~ msgid "Monthly sales"
 #~ msgstr "Ventes mensuelles"
 
@@ -395,3 +422,6 @@ msgstr "Facturation"
 #~ "\n"
 #~ "    Quelques statistiques par journal sont fournis.\n"
 #~ "    "
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de modèle invalide dans la définition de l'action."
diff --git a/addons/sale_journal/i18n/gl.po b/addons/sale_journal/i18n/gl.po
index 2ea43d6ba4f..9bfe073eec1 100644
--- a/addons/sale_journal/i18n/gl.po
+++ b/addons/sale_journal/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/hr.po b/addons/sale_journal/i18n/hr.po
index 7b09d417034..02ddf54a169 100644
--- a/addons/sale_journal/i18n/hr.po
+++ b/addons/sale_journal/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: sale_journal
diff --git a/addons/sale_journal/i18n/hu.po b/addons/sale_journal/i18n/hu.po
index f160e644555..77ae07bf5d0 100644
--- a/addons/sale_journal/i18n/hu.po
+++ b/addons/sale_journal/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/id.po b/addons/sale_journal/i18n/id.po
index 618d4911bca..7c6dc408df2 100644
--- a/addons/sale_journal/i18n/id.po
+++ b/addons/sale_journal/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/it.po b/addons/sale_journal/i18n/it.po
index 084b276aa7d..64cd035e0d3 100644
--- a/addons/sale_journal/i18n/it.po
+++ b/addons/sale_journal/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/ja.po b/addons/sale_journal/i18n/ja.po
index 33ab13020c6..3ccef933304 100644
--- a/addons/sale_journal/i18n/ja.po
+++ b/addons/sale_journal/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/ko.po b/addons/sale_journal/i18n/ko.po
index 7c9a8c7f2dc..e118af2963b 100644
--- a/addons/sale_journal/i18n/ko.po
+++ b/addons/sale_journal/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/lt.po b/addons/sale_journal/i18n/lt.po
index 7ce8e8acc39..1a72cc06b46 100644
--- a/addons/sale_journal/i18n/lt.po
+++ b/addons/sale_journal/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/lv.po b/addons/sale_journal/i18n/lv.po
index 4b95e105c1a..024836d5dd8 100644
--- a/addons/sale_journal/i18n/lv.po
+++ b/addons/sale_journal/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/mn.po b/addons/sale_journal/i18n/mn.po
index 8d690bb5c22..6567dd08270 100644
--- a/addons/sale_journal/i18n/mn.po
+++ b/addons/sale_journal/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/nb.po b/addons/sale_journal/i18n/nb.po
index f913257447f..a73f6040622 100644
--- a/addons/sale_journal/i18n/nb.po
+++ b/addons/sale_journal/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-11 05:45+0000\n"
-"X-Generator: Launchpad (build 15780)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/nl.po b/addons/sale_journal/i18n/nl.po
index dc54d648e4a..a945e3d3fff 100644
--- a/addons/sale_journal/i18n/nl.po
+++ b/addons/sale_journal/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-13 07:31+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/nl_BE.po b/addons/sale_journal/i18n/nl_BE.po
index 167b792687c..f96b1412969 100644
--- a/addons/sale_journal/i18n/nl_BE.po
+++ b/addons/sale_journal/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index 6d1f886e704..1dd87b59318 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/pt.po b/addons/sale_journal/i18n/pt.po
index 2ec265f9d07..1cb25def588 100644
--- a/addons/sale_journal/i18n/pt.po
+++ b/addons/sale_journal/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/pt_BR.po b/addons/sale_journal/i18n/pt_BR.po
index f0c4114ae53..66e5dd36626 100644
--- a/addons/sale_journal/i18n/pt_BR.po
+++ b/addons/sale_journal/i18n/pt_BR.po
@@ -8,23 +8,24 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 19:50+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr "Referência de ordem deve ser única por empresa!"
+msgstr "A Referência do Pedido deve ser única por Empresa!"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
 msgid "Note"
-msgstr "Nota"
+msgstr "Observação"
 
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
@@ -42,7 +43,7 @@ msgstr ""
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursivamente a membros associados."
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -61,7 +62,7 @@ msgstr ""
 #. module: sale_journal
 #: view:sale_journal.invoice.type:0
 msgid "Notes"
-msgstr "Notas"
+msgstr "Observações"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
diff --git a/addons/sale_journal/i18n/ro.po b/addons/sale_journal/i18n/ro.po
index 5205045ef5f..e3e3cf27b97 100644
--- a/addons/sale_journal/i18n/ro.po
+++ b/addons/sale_journal/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/ru.po b/addons/sale_journal/i18n/ru.po
index f1054309649..ef30017b50f 100644
--- a/addons/sale_journal/i18n/ru.po
+++ b/addons/sale_journal/i18n/ru.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -29,7 +29,7 @@ msgstr "Примечание"
 #. module: sale_journal
 #: field:res.partner,property_invoice_type:0
 msgid "Invoicing Type"
-msgstr ""
+msgstr "Способ выставления счета"
 
 #. module: sale_journal
 #: help:res.partner,property_invoice_type:0
@@ -37,11 +37,13 @@ msgid ""
 "This invoicing type will be used, by default, for invoicing the current "
 "partner."
 msgstr ""
+"Этот способ выставления счета будет использоваться по умолчанию при "
+"выставлении счета этому партнеру."
 
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -91,15 +93,15 @@ msgid ""
 "can create a specific invoicing journal to group your invoicing according to "
 "your customer's needs: daily, each Wednesday, monthly, etc."
 msgstr ""
-"Типы счетов используются для партнеров, заказов на продажу, заказов на "
-"доставку. Вы можете создать специальный журнал счетов для группировки счетов "
-"в соответствии с требованиями заказчиков ежедневно, каждую среду, ежемесячно "
-"и т.д."
+"Типы счетов используются для партнеров, заказов продаж, заказов доставки. Вы "
+"можете создать специальный журнал счетов для группировки счетов в "
+"соответствии с требованиями заказчиков ежедневно, каждую среду, ежемесячно и "
+"т.д."
 
 #. module: sale_journal
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка должна быть уникальна для каждой компании!"
 
 #. module: sale_journal
 #: field:sale.order,invoice_type_id:0
@@ -122,7 +124,7 @@ msgstr "Партнер"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_order
 msgid "Sales Order"
-msgstr "Заказ на продажу"
+msgstr "Заказ продаж"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking
diff --git a/addons/sale_journal/i18n/sk.po b/addons/sale_journal/i18n/sk.po
index a0b36198c32..1f4f74c0aed 100644
--- a/addons/sale_journal/i18n/sk.po
+++ b/addons/sale_journal/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/sl.po b/addons/sale_journal/i18n/sl.po
index 39823f7df0a..056f715ac41 100644
--- a/addons/sale_journal/i18n/sl.po
+++ b/addons/sale_journal/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/sq.po b/addons/sale_journal/i18n/sq.po
index 5cda1093c51..67268b3850f 100644
--- a/addons/sale_journal/i18n/sq.po
+++ b/addons/sale_journal/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/sv.po b/addons/sale_journal/i18n/sv.po
index cc432166d5a..0dbe886d7a5 100644
--- a/addons/sale_journal/i18n/sv.po
+++ b/addons/sale_journal/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/tlh.po b/addons/sale_journal/i18n/tlh.po
index b88634b024b..eea124bd82a 100644
--- a/addons/sale_journal/i18n/tlh.po
+++ b/addons/sale_journal/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index 1b01d7de9ee..1ab6a74c0e9 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/i18n/tr.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!"
+msgstr "Sipariş Referansı Her Firma için benzersiz olmalı!"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,note:0
@@ -43,12 +43,12 @@ msgstr ""
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Hata ! kendini çağıran ilişkili üyeler oluşturamazsınız."
+msgstr "Hata ! Özyinelemeli ilişkili üyeler oluşturamazsınız."
 
 #. module: sale_journal
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Alış & Satış Bilgileri"
+msgstr "Satışlar & Satınalmalar"
 
 #. module: sale_journal
 #: help:sale_journal.invoice.type,active:0
@@ -56,8 +56,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the invoice "
 "type without removing it."
 msgstr ""
-"Aktif alan Hatalı olarak ayarlanmışsa, fatura tipini kaldırmadan saklamanıza "
-"yardımcı olur."
+"Etrkin alan Hatalı olarak ayarlanmışsa, fatura tipini kaldırmadan "
+"saklamanıza yardımcı olur."
 
 #. module: sale_journal
 #: view:sale_journal.invoice.type:0
@@ -74,7 +74,7 @@ msgstr "Faturalama Yöntemi"
 #: model:ir.model,name:sale_journal.model_sale_journal_invoice_type
 #: model:ir.ui.menu,name:sale_journal.menu_definition_journal_invoice_type
 msgid "Invoice Types"
-msgstr "Fatura Tipleri"
+msgstr "Fatura Türleri"
 
 #. module: sale_journal
 #: selection:sale_journal.invoice.type,invoicing_method:0
@@ -93,14 +93,14 @@ msgid ""
 "can create a specific invoicing journal to group your invoicing according to "
 "your customer's needs: daily, each Wednesday, monthly, etc."
 msgstr ""
-"Fatura çeşitleri, iş ortakları, satış siparişleri ve teslim fişleri için "
-"kullanılır. Müşterinizin ihtiyacına uygun olarak faturalama yayınınızı "
-"gruplayabilirsiniz: günlük, her Çarşamba, aylık, vb."
+"Fatura çeşitleri, paydaşlar, satış siparişleri ve teslim fişleri için "
+"kullanılır. Müşterinizin ihtiyacına uygun olarak gruplandırmak özel "
+"faturalama günlüğü oluşturabilirsiniz: günlük, her Çarşamba, aylık, vb."
 
 #. module: sale_journal
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr "Referans her şirket için tekil olmalı!"
+msgstr "Referans her şirket için benzersiz olmalı!"
 
 #. module: sale_journal
 #: field:sale.order,invoice_type_id:0
@@ -108,17 +108,17 @@ msgstr "Referans her şirket için tekil olmalı!"
 #: field:sale_journal.invoice.type,name:0
 #: field:stock.picking,invoice_type_id:0
 msgid "Invoice Type"
-msgstr "Fatura Tipi"
+msgstr "Fatura Türü"
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,active:0
 msgid "Active"
-msgstr "Aktif"
+msgstr "Etkin"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_res_partner
 msgid "Partner"
-msgstr "İş ortağı"
+msgstr "Paydaş"
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_order
@@ -128,7 +128,7 @@ msgstr "Satış Siparişi"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking
 msgid "Picking List"
-msgstr "Paketleme Listesi"
+msgstr "Toplama Listesi"
 
 #. module: sale_journal
 #: view:res.partner:0
diff --git a/addons/sale_journal/i18n/uk.po b/addons/sale_journal/i18n/uk.po
index b26c0fe0387..51286735c7a 100644
--- a/addons/sale_journal/i18n/uk.po
+++ b/addons/sale_journal/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/vi.po b/addons/sale_journal/i18n/vi.po
index e6a3c008129..e626af4b99b 100644
--- a/addons/sale_journal/i18n/vi.po
+++ b/addons/sale_journal/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/zh_CN.po b/addons/sale_journal/i18n/zh_CN.po
index 327debed019..c8bca47a811 100644
--- a/addons/sale_journal/i18n/zh_CN.po
+++ b/addons/sale_journal/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/i18n/zh_TW.po b/addons/sale_journal/i18n/zh_TW.po
index ec7e1515f92..dae54ef0da2 100644
--- a/addons/sale_journal/i18n/zh_TW.po
+++ b/addons/sale_journal/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:15+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:13+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_journal
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_journal/sale_journal.py b/addons/sale_journal/sale_journal.py
index a5e922f3644..9951773f36a 100644
--- a/addons/sale_journal/sale_journal.py
+++ b/addons/sale_journal/sale_journal.py
@@ -50,7 +50,7 @@ class res_partner(osv.osv):
             string = "Invoicing Type",
             view_load = True,
             group_name = "Accounting Properties",
-            help = "This invoicing type will be used, by default, for invoicing the current partner."),
+            help = "This invoicing type will be used, by default, to invoice the current partner."),
     }
 res_partner()
 
@@ -61,10 +61,25 @@ class picking(osv.osv):
     }
 picking()
 
+class stock_picking_in(osv.osv):
+    _inherit = "stock.picking.in"
+    _columns = {
+        'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', readonly=True)
+    }
+stock_picking_in()
+
+class stock_picking_out(osv.osv):
+    _inherit = "stock.picking.out"
+    _columns = {
+        'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', readonly=True)
+    }
+stock_picking_out()
+
+
 class sale(osv.osv):
     _inherit = "sale.order"
     _columns = {
-        'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type')
+        'invoice_type_id': fields.many2one('sale_journal.invoice.type', 'Invoice Type', help="Generate invoice based on the selected option.")
     }
 
     def _prepare_order_picking(self, cr, uid, order, context=None):
diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml
index 98f2933d6f3..3dbef8aa9b3 100644
--- a/addons/sale_journal/sale_journal_view.xml
+++ b/addons/sale_journal/sale_journal_view.xml
@@ -42,7 +42,7 @@
         </record>
 
      <menuitem id="menu_definition_journal_invoice_type" sequence="15"
-        parent="base.menu_sales_configuration_misc" action="action_definition_journal_invoice_type" groups="base.group_no_one"/>
+        parent="base.menu_sales_configuration_misc" action="action_definition_journal_invoice_type"/>
 
     <!-- Inherit sales order form view -->
 
@@ -52,7 +52,7 @@
             <field name="inherit_id" ref="sale.view_order_form" />
             <field name="arch" type="xml">
                 <field name="origin" position="after">
-                    <field name="invoice_type_id" widget="selection"/>
+                    <field name="invoice_type_id"/>
                 </field>
             </field>
         </record>
@@ -64,8 +64,8 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_tree" />
             <field name="arch" type="xml">
-                <field name="state" position="after">
-                    <field name="invoice_type_id" widget="selection"/>
+                <field name="state" position="before">
+                    <field name="invoice_type_id"/>
                 </field>
             </field>
         </record>
@@ -77,8 +77,8 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_form" />
             <field name="arch" type="xml">
-                <field name="origin" position="after">
-                    <field name="invoice_type_id" widget="selection"/>
+                <field name="move_type" position="before">
+                    <field name="invoice_type_id"/>
                 </field>
             </field>
         </record>
@@ -90,7 +90,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.vpicktree" />
             <field name="arch" type="xml">
-                <field name="origin" position="after">
+                <field name="state" position="before">
                     <field name="invoice_type_id"/>
                 </field>
             </field>
@@ -98,10 +98,10 @@
 
         <record model="ir.ui.view" id="sale_journal_picking_order_in">
             <field name="name">stock.picking.journal.view.form</field>
-            <field name="model">stock.picking</field>
+            <field name="model">stock.picking.in</field>
             <field name="inherit_id" ref="stock.view_picking_in_form" />
             <field name="arch" type="xml">
-                <field name="origin" position="after">
+                <field name="move_type" position="before">
                     <field name="invoice_type_id"/>
                 </field>
             </field>
@@ -109,10 +109,10 @@
 
         <record model="ir.ui.view" id="sale_journal_picking_order_tree_in">
             <field name="name">stock.picking.journal.view.tree</field>
-            <field name="model">stock.picking</field>
+            <field name="model">stock.picking.in</field>
             <field name="inherit_id" ref="stock.view_picking_in_tree" />
             <field name="arch" type="xml">
-                <field name="origin" position="after">
+                <field name="state" position="before">
                     <field name="invoice_type_id"/>
                 </field>
             </field>
@@ -120,10 +120,10 @@
 
         <record model="ir.ui.view" id="sale_journal_picking_order_out">
             <field name="name">stock.picking.journal.view.form</field>
-            <field name="model">stock.picking</field>
+            <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="stock.view_picking_out_form" />
             <field name="arch" type="xml">
-                <field name="origin" position="after">
+                <field name="move_type" position="before">
                     <field name="invoice_type_id"/>
                 </field>
             </field>
@@ -131,10 +131,10 @@
 
         <record model="ir.ui.view" id="sale_journal_picking_order_tree_out">
             <field name="name">stock.picking.journal.view.tree</field>
-            <field name="model">stock.picking</field>
+            <field name="model">stock.picking.out</field>
             <field name="inherit_id" ref="stock.view_picking_out_tree" />
             <field name="arch" type="xml">
-                <field name="origin" position="after">
+                <field name="state" position="before">
                     <field name="invoice_type_id"/>
                 </field>
             </field>
@@ -148,11 +148,54 @@
                 <page string="Sales &amp; Purchases" position="inside">
                     <group colspan="2" col="2">
                         <separator string="Invoicing" colspan="2"/>
-                        <field name="property_invoice_type" widget="selection"/>
+                        <field name="property_invoice_type"/>
                     </group>
                 </page>
             </field>
         </record>
 
+        <record id="view_sales_order_search" model="ir.ui.view">
+            <field name="name">sale.order.search.inherit</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_sales_order_filter"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group/filter[@string='Customer']" position="after">
+                    <filter string="Invoice Type" domain="[]" context="{'group_by':'invoice_type_id'}"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_picking_internal_search" model="ir.ui.view">
+            <field name="name">stock.picking.internal.search.inherit</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_internal_search"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group/filter[@string='Journal']" position="after">
+                    <filter string="Invoice Type" domain="[]" context="{'group_by':'invoice_type_id'}"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_picking_out_search" model="ir.ui.view">
+            <field name="name">stock.picking.out.search.inherit</field>
+            <field name="model">stock.picking.out</field>
+            <field name="inherit_id" ref="stock.view_picking_out_search"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group/filter[@string='Journal']" position="after">
+                    <filter string="Invoice Type" domain="[]" context="{'group_by':'invoice_type_id'}"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_picking_in_search" model="ir.ui.view">
+            <field name="name">stock.picking.in.search.inherit</field>
+            <field name="model">stock.picking.in</field>
+            <field name="inherit_id" ref="stock.view_picking_in_search"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group/filter[@string='Journal']" position="after">
+                    <filter string="Invoice Type" domain="[]" context="{'group_by':'invoice_type_id'}"/>
+                </xpath>
+            </field>
+        </record>
    </data>
 </openerp>
diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py
index 936f5a6b350..badb87d3628 100644
--- a/addons/sale_margin/__openerp__.py
+++ b/addons/sale_margin/__openerp__.py
@@ -19,25 +19,24 @@
 ##############################################################################
 
 {
-    "name": "Margins in Sales Orders",
-    "version":"1.0",
-    "category" : "Sales Management",
-    "description": """
+    'name': 'Margins in Sales Orders',
+    'version':'1.0',
+    'category' : 'Sales Management',
+    'description': """
 This module adds the 'Margin' on sales order.
 =============================================
 
 This gives the profitability by calculating the difference between the Unit
 Price and Cost Price.
     """,
-    "author":"OpenERP SA",
-    "images":["images/sale_margin.jpeg"],
-    "depends":["sale"],
-    "demo_xml":[],
+    'author':'OpenERP SA',
+    'images':['images/sale_margin.jpeg'],
+    'depends':['sale'],
+    'demo':['sale_margin_demo.xml'],
     'test': ['test/sale_margin.yml'],
-    "update_xml":["security/ir.model.access.csv","sale_margin_view.xml"],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "001165700015525701661",
+    'data':['security/ir.model.access.csv','sale_margin_view.xml'],
+    'auto_install': False,
+    'installable': True,
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/sale_margin/i18n/ar.po b/addons/sale_margin/i18n/ar.po
index 8b80205514d..801146042e7 100644
--- a/addons/sale_margin/i18n/ar.po
+++ b/addons/sale_margin/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/bg.po b/addons/sale_margin/i18n/bg.po
index 8bf679e3f29..7bd614f3869 100644
--- a/addons/sale_margin/i18n/bg.po
+++ b/addons/sale_margin/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/ca.po b/addons/sale_margin/i18n/ca.po
index c2b5b9efd87..05617c47f54 100644
--- a/addons/sale_margin/i18n/ca.po
+++ b/addons/sale_margin/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/da.po b/addons/sale_margin/i18n/da.po
index 448dc07e860..133ac8717cf 100644
--- a/addons/sale_margin/i18n/da.po
+++ b/addons/sale_margin/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/de.po b/addons/sale_margin/i18n/de.po
index 79fb38a2b0a..2bfc7ac300a 100644
--- a/addons/sale_margin/i18n/de.po
+++ b/addons/sale_margin/i18n/de.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/el.po b/addons/sale_margin/i18n/el.po
index 25dd5d13041..c467e184a5b 100644
--- a/addons/sale_margin/i18n/el.po
+++ b/addons/sale_margin/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/es.po b/addons/sale_margin/i18n/es.po
index 895fd125eef..a073df54d14 100644
--- a/addons/sale_margin/i18n/es.po
+++ b/addons/sale_margin/i18n/es.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2011-01-13 20:47+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/es_CL.po b/addons/sale_margin/i18n/es_CL.po
index 34be7f49380..7ae4ffee49f 100644
--- a/addons/sale_margin/i18n/es_CL.po
+++ b/addons/sale_margin/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/es_CR.po b/addons/sale_margin/i18n/es_CR.po
index 4c72e1f85eb..46e342c7941 100644
--- a/addons/sale_margin/i18n/es_CR.po
+++ b/addons/sale_margin/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: sale_margin
diff --git a/addons/sale_margin/i18n/et.po b/addons/sale_margin/i18n/et.po
index 0ea4e861962..eecc1e47735 100644
--- a/addons/sale_margin/i18n/et.po
+++ b/addons/sale_margin/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/fi.po b/addons/sale_margin/i18n/fi.po
index 060dc20a483..52370f5b3ca 100644
--- a/addons/sale_margin/i18n/fi.po
+++ b/addons/sale_margin/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/fr.po b/addons/sale_margin/i18n/fr.po
index 8e074b7d7ec..bc184d45649 100644
--- a/addons/sale_margin/i18n/fr.po
+++ b/addons/sale_margin/i18n/fr.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/hr.po b/addons/sale_margin/i18n/hr.po
index c5d00f49054..2ec4ee12a70 100644
--- a/addons/sale_margin/i18n/hr.po
+++ b/addons/sale_margin/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/hu.po b/addons/sale_margin/i18n/hu.po
index ef670252d26..3c9d517723f 100644
--- a/addons/sale_margin/i18n/hu.po
+++ b/addons/sale_margin/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/it.po b/addons/sale_margin/i18n/it.po
index 4ef65019d4e..4f62de45bce 100644
--- a/addons/sale_margin/i18n/it.po
+++ b/addons/sale_margin/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/ja.po b/addons/sale_margin/i18n/ja.po
index 4b9b8e7452f..bd8e3d17718 100644
--- a/addons/sale_margin/i18n/ja.po
+++ b/addons/sale_margin/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/mn.po b/addons/sale_margin/i18n/mn.po
index afde8e42cb4..c3614e41d3e 100644
--- a/addons/sale_margin/i18n/mn.po
+++ b/addons/sale_margin/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/nb.po b/addons/sale_margin/i18n/nb.po
index da91e79ddbd..99f18d5364d 100644
--- a/addons/sale_margin/i18n/nb.po
+++ b/addons/sale_margin/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/nl.po b/addons/sale_margin/i18n/nl.po
index 917f76a5a44..b4f96406d50 100644
--- a/addons/sale_margin/i18n/nl.po
+++ b/addons/sale_margin/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-01-18 21:11+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:26+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
@@ -38,8 +38,8 @@ msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and Cost Price."
 msgstr ""
-"Het toont winstgevendheid door berekening van het verschil tussen stuksprijs "
-"en kostprijs."
+"Het toont winstgevendheid door berekening van het verschil tussen "
+"verkoopprijs en kostprijs."
 
 #. module: sale_margin
 #: field:sale.order,margin:0
diff --git a/addons/sale_margin/i18n/pl.po b/addons/sale_margin/i18n/pl.po
index f37d69f2b96..1e9bfc9dcfe 100644
--- a/addons/sale_margin/i18n/pl.po
+++ b/addons/sale_margin/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/pt.po b/addons/sale_margin/i18n/pt.po
index 70f21ac12cc..5414a3e34f1 100644
--- a/addons/sale_margin/i18n/pt.po
+++ b/addons/sale_margin/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/pt_BR.po b/addons/sale_margin/i18n/pt_BR.po
index 0ce36699148..9f11a31194f 100644
--- a/addons/sale_margin/i18n/pt_BR.po
+++ b/addons/sale_margin/i18n/pt_BR.po
@@ -9,18 +9,19 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 19:50+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr "Referência de ordem deve ser única por empresa!"
+msgstr "A Referência do Pedido deve ser única por Empresa!"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
diff --git a/addons/sale_margin/i18n/ro.po b/addons/sale_margin/i18n/ro.po
index a177ae330dc..2cf00f8b262 100644
--- a/addons/sale_margin/i18n/ro.po
+++ b/addons/sale_margin/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/ru.po b/addons/sale_margin/i18n/ru.po
index efee0e6a377..853f8ee1812 100644
--- a/addons/sale_margin/i18n/ru.po
+++ b/addons/sale_margin/i18n/ru.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
@@ -30,7 +30,7 @@ msgstr "Себестоимость"
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order
 msgid "Sales Order"
-msgstr "Заказ на продажу"
+msgstr "Заказ продаж"
 
 #. module: sale_margin
 #: help:sale.order,margin:0
@@ -49,7 +49,7 @@ msgstr "Наценка"
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Позиция заказа на продажу"
+msgstr "Позиция заказа продаж"
 
 #~ msgid "Customer Invoice"
 #~ msgstr "Счета клиентам"
diff --git a/addons/sale_margin/i18n/sk.po b/addons/sale_margin/i18n/sk.po
index f8977e5bf19..cb8cb729abd 100644
--- a/addons/sale_margin/i18n/sk.po
+++ b/addons/sale_margin/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/sl.po b/addons/sale_margin/i18n/sl.po
index 7cdfc4095a6..cf5d343f864 100644
--- a/addons/sale_margin/i18n/sl.po
+++ b/addons/sale_margin/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/i18n/sv.po b/addons/sale_margin/i18n/sv.po
index 033a1cd9ce9..4c5d9abbd57 100644
--- a/addons/sale_margin/i18n/sv.po
+++ b/addons/sale_margin/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
@@ -25,7 +25,7 @@ msgstr "Orderreferensen måste vara unik per bolag!"
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
 msgid "Cost Price"
-msgstr "Kostpris"
+msgstr "Självkostnad"
 
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order
@@ -38,6 +38,7 @@ msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and Cost Price."
 msgstr ""
+"Beräknar lönsamheten med skillnaden mellan enhetspris och självkostnaden."
 
 #. module: sale_margin
 #: field:sale.order,margin:0
diff --git a/addons/sale_margin/i18n/tr.po b/addons/sale_margin/i18n/tr.po
index d77c2c1e564..28f00399b5b 100644
--- a/addons/sale_margin/i18n/tr.po
+++ b/addons/sale_margin/i18n/tr.po
@@ -14,18 +14,18 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr "Sipariş Referansı Her Şirket İçin Tekil Olmalı!"
+msgstr "Sipariş Referansı her Firma için benzersiz olmalı!"
 
 #. module: sale_margin
 #: field:sale.order.line,purchase_price:0
 msgid "Cost Price"
-msgstr "Maliyet"
+msgstr "Maliyet Fiyatı"
 
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order
@@ -38,19 +38,18 @@ msgid ""
 "It gives profitability by calculating the difference between the Unit Price "
 "and Cost Price."
 msgstr ""
-"Maliyet ve birim satış fiyatı arasındaki farkı hesaplayarak kar miktarını "
-"verir."
+"Maliyet ve birim satış fiyatı arasındaki farkı hesaplayarak karlılığı verir."
 
 #. module: sale_margin
 #: field:sale.order,margin:0
 #: field:sale.order.line,margin:0
 msgid "Margin"
-msgstr "Marj"
+msgstr "Sınır"
 
 #. module: sale_margin
 #: model:ir.model,name:sale_margin.model_sale_order_line
 msgid "Sales Order Line"
-msgstr "Satış Siparişi Kalemi"
+msgstr "Satış Siparişi Satırı"
 
 #~ msgid "Paid"
 #~ msgstr "Ödendi"
diff --git a/addons/sale_margin/i18n/zh_CN.po b/addons/sale_margin/i18n/zh_CN.po
index 13347cf4059..f938b290f18 100644
--- a/addons/sale_margin/i18n/zh_CN.po
+++ b/addons/sale_margin/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_margin
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 82a7150b6d1..bbb2df673ff 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -70,10 +70,10 @@ class sale_order(osv.osv):
         return result
 
     def _get_order(self, cr, uid, ids, context=None):
-        return super(self,sale_order)._get_order(cr, uid, ids, context=context)
+        return super(sale_order, self)._get_order(cr, uid, ids, context=context)
 
     _columns = {
-        'margin': fields.function(_product_margin, string='Margin', help="It gives profitability by calculating the difference between the Unit Price and Cost Price.", store={
+        'margin': fields.function(_product_margin, string='Margin', help="It gives profitability by calculating the difference between the Unit Price and the cost price.", store={
                 'sale.order.line': (_get_order, ['margin'], 20),
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 20),
                 }),
diff --git a/addons/sale_margin/sale_margin_demo.xml b/addons/sale_margin/sale_margin_demo.xml
new file mode 100644
index 00000000000..a41f05304a4
--- /dev/null
+++ b/addons/sale_margin/sale_margin_demo.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="sale.sale_order_line_1" model="sale.order.line">
+            <field name="purchase_price">2870.00</field>
+        </record>
+
+        <record id="sale.sale_order_line_2" model="sale.order.line">
+            <field name="purchase_price">126.00</field>
+        </record>
+
+        <record id="sale.sale_order_line_3" model="sale.order.line">
+            <field name="purchase_price">60.00</field>
+        </record>
+
+        <record id="sale.sale_order_line_12" model="sale.order.line">
+            <field name="purchase_price">390.00</field>
+        </record>
+
+        <record id="sale.sale_order_line_13" model="sale.order.line">
+            <field name="purchase_price">21.60</field>
+        </record>
+
+        <record id="sale.sale_order_line_14" model="sale.order.line">
+            <field name="purchase_price">4258.00</field>
+        </record>
+
+        <record id="sale.sale_order_line_16" model="sale.order.line">
+            <field name="purchase_price">2870.00</field>
+        </record>
+
+        <record id="sale.sale_order_line_17" model="sale.order.line">
+            <field name="purchase_price">155.00</field>
+        </record>
+
+        <record id="sale.sale_order_line_18" model="sale.order.line">
+            <field name="purchase_price">35.00</field>
+        </record>
+
+        <record id="sale.sale_order_line_19" model="sale.order.line">
+            <field name="purchase_price">13.00</field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index 69f49bd48ea..88647ea3c46 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -7,12 +7,9 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='sale_margin_grp']" position="inside">
-                <group>
-                    <label for="margin"/>
-                    <div>
-                        <field name="margin"/>
-                    </div>
+            <xpath expr="//group[@name='sale_total']" position="after">
+                <group name="sale_margin_grp">
+                    <field name="margin" widget='monetary' options="{'currency_field': 'currency_id'}"/>
                 </group>
             </xpath>
         </field>
diff --git a/addons/sale_margin/test/sale_margin.yml b/addons/sale_margin/test/sale_margin.yml
index 17f71807074..1d6b295b3a1 100644
--- a/addons/sale_margin/test/sale_margin.yml
+++ b/addons/sale_margin/test/sale_margin.yml
@@ -9,12 +9,11 @@
     invoice_quantity: order
     name: Test_SO011
     order_line:
-      - name: '[KEYA] Keyboard - AZERTY'
+      - name: '[CARD] Graphics Card'
         price_unit: 7.0
         product_uom: product.product_uom_unit
         product_uom_qty: 100.0
         state: draft
-        delay: 7.0
         product_id: product.product_product_24
         product_uos_qty: 100.0
         th_weight: 0.0
@@ -23,7 +22,6 @@
     partner_id: base.res_partner_4
     partner_invoice_id: base.res_partner_address_7
     partner_shipping_id: base.res_partner_address_7
-    picking_policy: direct
     pricelist_id: product.list0
     shop_id: sale.sale_shop_1
 -
diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py
index d5b3d6b7849..bc9b84cd471 100644
--- a/addons/sale_mrp/__openerp__.py
+++ b/addons/sale_mrp/__openerp__.py
@@ -34,16 +34,14 @@ from sales order. It adds sales name and sales Reference on production order.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/SO_to_MO.jpeg'],
-    'depends': ['mrp', 'sale'],
-    'init_xml': [],
-    'update_xml': [
+    'depends': ['mrp', 'sale_stock'],
+    'data': [
         'security/ir.model.access.csv',
         'sale_mrp_view.xml',
     ],
-    'demo_xml': [],
+    'demo': [],
     'test':['test/sale_mrp.yml'],
     'installable': True,
     'auto_install': True,
-    'certificate': '00395598976683092013',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_mrp/i18n/ar.po b/addons/sale_mrp/i18n/ar.po
index 6a6a0ee630e..b53bdf169b7 100644
--- a/addons/sale_mrp/i18n/ar.po
+++ b/addons/sale_mrp/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/bg.po b/addons/sale_mrp/i18n/bg.po
index b259f6c7cae..07f8b9aaa2c 100644
--- a/addons/sale_mrp/i18n/bg.po
+++ b/addons/sale_mrp/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/ca.po b/addons/sale_mrp/i18n/ca.po
index 9d3b37fc20d..7c91b6b6249 100644
--- a/addons/sale_mrp/i18n/ca.po
+++ b/addons/sale_mrp/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/da.po b/addons/sale_mrp/i18n/da.po
index e46c9adfee0..a377bfa17a8 100644
--- a/addons/sale_mrp/i18n/da.po
+++ b/addons/sale_mrp/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/de.po b/addons/sale_mrp/i18n/de.po
index 97de84d9d9b..b21a191ac44 100644
--- a/addons/sale_mrp/i18n/de.po
+++ b/addons/sale_mrp/i18n/de.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
 msgid "Indicate the Customer Reference from sales order."
-msgstr "Anzeige der Kundenreferenz bei Verkaufsauftrag"
+msgstr "Anzeige der Kundenreferenz aus dem Verkaufsauftrag"
 
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
@@ -35,22 +35,22 @@ msgstr "Fertigungsauftrag"
 #. module: sale_mrp
 #: field:mrp.production,sale_name:0
 msgid "Sales Name"
-msgstr "Bezeichnung Verkaufsauftrag"
+msgstr "Bezeichnung des Verkaufsauftrags"
 
 #. module: sale_mrp
 #: sql_constraint:mrp.production:0
 msgid "Reference must be unique per Company!"
-msgstr "Die Referenz muss je Firma eindeutig sein"
+msgstr "Referenz muss je Unternehmen eindeutig sein"
 
 #. module: sale_mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr "Die Bestellmenge kann nicht negativ oder 0 sein"
+msgstr "Die Bestellmenge muss positiv sein!"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
-msgstr "Anzeige der Auftragsbezeichnung durch den Verkauf"
+msgstr "Anzeige der Verkaufs-Auftragsbezeichnung"
 
 #~ msgid "Sales and MRP Management"
 #~ msgstr "Verkauf und Fertigungsplanung"
diff --git a/addons/sale_mrp/i18n/es.po b/addons/sale_mrp/i18n/es.po
index 87e9f6072c4..9222f5ed51a 100644
--- a/addons/sale_mrp/i18n/es.po
+++ b/addons/sale_mrp/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/es_CL.po b/addons/sale_mrp/i18n/es_CL.po
index 80cb81e5408..948bf643d1b 100644
--- a/addons/sale_mrp/i18n/es_CL.po
+++ b/addons/sale_mrp/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/es_CR.po b/addons/sale_mrp/i18n/es_CR.po
index 679c078725c..4b6e7eb575b 100644
--- a/addons/sale_mrp/i18n/es_CR.po
+++ b/addons/sale_mrp/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: sale_mrp
diff --git a/addons/sale_mrp/i18n/et.po b/addons/sale_mrp/i18n/et.po
index 1821f1b5802..187fd3f85d1 100644
--- a/addons/sale_mrp/i18n/et.po
+++ b/addons/sale_mrp/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/fi.po b/addons/sale_mrp/i18n/fi.po
index 76b7f05f3f4..8a6a92c68b6 100644
--- a/addons/sale_mrp/i18n/fi.po
+++ b/addons/sale_mrp/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/fr.po b/addons/sale_mrp/i18n/fr.po
index 58390dea150..b30a7be488f 100644
--- a/addons/sale_mrp/i18n/fr.po
+++ b/addons/sale_mrp/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/gl.po b/addons/sale_mrp/i18n/gl.po
index a285bb1f153..3a015bdfe0a 100644
--- a/addons/sale_mrp/i18n/gl.po
+++ b/addons/sale_mrp/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/hr.po b/addons/sale_mrp/i18n/hr.po
index a0a94018a4a..a06b20885b7 100644
--- a/addons/sale_mrp/i18n/hr.po
+++ b/addons/sale_mrp/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/hu.po b/addons/sale_mrp/i18n/hu.po
index aff8fa161e0..5caa0f8499c 100644
--- a/addons/sale_mrp/i18n/hu.po
+++ b/addons/sale_mrp/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/it.po b/addons/sale_mrp/i18n/it.po
index 2bfc50c0d52..3787b6f9e85 100644
--- a/addons/sale_mrp/i18n/it.po
+++ b/addons/sale_mrp/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/ja.po b/addons/sale_mrp/i18n/ja.po
index 64977fe87d5..b342fa1e48c 100644
--- a/addons/sale_mrp/i18n/ja.po
+++ b/addons/sale_mrp/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/mn.po b/addons/sale_mrp/i18n/mn.po
index 10f99a64f3b..b4755fb8641 100644
--- a/addons/sale_mrp/i18n/mn.po
+++ b/addons/sale_mrp/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/nb.po b/addons/sale_mrp/i18n/nb.po
index d4bc99af576..95ceacd891c 100644
--- a/addons/sale_mrp/i18n/nb.po
+++ b/addons/sale_mrp/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/nl.po b/addons/sale_mrp/i18n/nl.po
index 8da760c2090..875ee239d72 100644
--- a/addons/sale_mrp/i18n/nl.po
+++ b/addons/sale_mrp/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-08 10:27+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/nl_BE.po b/addons/sale_mrp/i18n/nl_BE.po
index dabce60f5a8..750d3769c9b 100644
--- a/addons/sale_mrp/i18n/nl_BE.po
+++ b/addons/sale_mrp/i18n/nl_BE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/pl.po b/addons/sale_mrp/i18n/pl.po
index 9c1700b493a..d36b83ae45c 100644
--- a/addons/sale_mrp/i18n/pl.po
+++ b/addons/sale_mrp/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/pt.po b/addons/sale_mrp/i18n/pt.po
index c6c6afd1bfa..38726451042 100644
--- a/addons/sale_mrp/i18n/pt.po
+++ b/addons/sale_mrp/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/pt_BR.po b/addons/sale_mrp/i18n/pt_BR.po
index 62c0c4e2301..fb4ebb4a766 100644
--- a/addons/sale_mrp/i18n/pt_BR.po
+++ b/addons/sale_mrp/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/ro.po b/addons/sale_mrp/i18n/ro.po
index e7aa7eafd7a..a89d110ba23 100644
--- a/addons/sale_mrp/i18n/ro.po
+++ b/addons/sale_mrp/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/ru.po b/addons/sale_mrp/i18n/ru.po
index cdc86a5b56a..87059da5b4e 100644
--- a/addons/sale_mrp/i18n/ru.po
+++ b/addons/sale_mrp/i18n/ru.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
 msgid "Indicate the Customer Reference from sales order."
-msgstr "Указывает на заказчика из заказа на продажу."
+msgstr "Указывает на заказчика из заказа продаж."
 
 #. module: sale_mrp
 #: field:mrp.production,sale_ref:0
@@ -40,17 +40,17 @@ msgstr "Названия продаж"
 #. module: sale_mrp
 #: sql_constraint:mrp.production:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка должна быть уникальна для каждой компании!"
 
 #. module: sale_mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "Заказываемое количество должно быть положительным!"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_name:0
 msgid "Indicate the name of sales order."
-msgstr "Показывает название заказа на продажу"
+msgstr "Показывает название заказа продаж"
 
 #~ msgid "Sales and MRP Management"
 #~ msgstr "Управление продажами и план. произв. рес."
diff --git a/addons/sale_mrp/i18n/sl.po b/addons/sale_mrp/i18n/sl.po
index 88dc09d0865..90083dbec6b 100644
--- a/addons/sale_mrp/i18n/sl.po
+++ b/addons/sale_mrp/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/sr@latin.po b/addons/sale_mrp/i18n/sr@latin.po
index c10a0ae5091..07b9be02084 100644
--- a/addons/sale_mrp/i18n/sr@latin.po
+++ b/addons/sale_mrp/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/sv.po b/addons/sale_mrp/i18n/sv.po
index 4ac25dd7e32..04b379de3f0 100644
--- a/addons/sale_mrp/i18n/sv.po
+++ b/addons/sale_mrp/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/tr.po b/addons/sale_mrp/i18n/tr.po
index bfbae6d8395..5f55cd22e38 100644
--- a/addons/sale_mrp/i18n/tr.po
+++ b/addons/sale_mrp/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
diff --git a/addons/sale_mrp/i18n/zh_CN.po b/addons/sale_mrp/i18n/zh_CN.po
index 327a6368818..9cb3a231e70 100644
--- a/addons/sale_mrp/i18n/zh_CN.po
+++ b/addons/sale_mrp/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-06-28 05:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-08-31 14:59+0000\n"
+"Last-Translator: ccdos <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:29+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_ref:0
@@ -40,12 +40,12 @@ msgstr "销售名称"
 #. module: sale_mrp
 #: sql_constraint:mrp.production:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "编号必须在公司内唯一！"
 
 #. module: sale_mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "订单数量不能是负数或者0！"
 
 #. module: sale_mrp
 #: help:mrp.production,sale_name:0
diff --git a/addons/sale_mrp/security/ir.model.access.csv b/addons/sale_mrp/security/ir.model.access.csv
index 4f0f0f8072c..a0f117b61e5 100644
--- a/addons/sale_mrp/security/ir.model.access.csv
+++ b/addons/sale_mrp/security/ir.model.access.csv
@@ -2,4 +2,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_mrp_bom_user,mrp.bom,mrp.model_mrp_bom,base.group_sale_salesman,1,0,0,0
 access_sale_order_manufacturing_user,sale.order manufacturing.user,sale.model_sale_order,mrp.group_mrp_user,1,1,0,0
 access_sale_order_line_manufacturing_user,sale.order.line manufacturing.user,sale.model_sale_order_line,mrp.group_mrp_user,1,1,0,0
-access_mrp_bom_revision_salesman,mrp.bom.revision,mrp.model_mrp_bom_revision,base.group_sale_salesman,1,0,0,0
diff --git a/addons/sale_mrp/test/sale_mrp.yml b/addons/sale_mrp/test/sale_mrp.yml
index 0962e1fa1ff..6fd64301af2 100644
--- a/addons/sale_mrp/test/sale_mrp.yml
+++ b/addons/sale_mrp/test/sale_mrp.yml
@@ -117,26 +117,13 @@
     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 manufacturing order has been generated
+  I verify that a manufacturing order has been generated, and that its name and reference are correct
 -
   !python {model: sale.order}: |
+    mnf_obj = self.pool.get('mrp.production')
     so = self.browse(cr, uid, ref("sale_order_so0"))
-    mnf_obj=self.pool.get('mrp.production')
-    mnf_id=mnf_obj.search(cr, uid, [('origin','=',so.name)])
+    mnf_id = mnf_obj.search(cr, uid, [('origin','=',so.name)])
     assert mnf_id, _('Manufacturing order has not been generated')
--
-  I verify that a 'Sale Name' field of Manufacturing order gets bind with the value
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    mnf_obj=self.pool.get('mrp.production')
-    mnf_id=mnf_obj.search(cr, uid, [('sale_name','=',so.name)])
-    assert mnf_id, _('Sale Name is not bind with the value')
--
-  I verify that a 'Sale Reference' field of Manufacturing order gets bind with the value
--
-  !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so0"))
-    mnf_obj=self.pool.get('mrp.production')
-    mnf_id=mnf_obj.search(cr, uid, [('sale_ref','=',so.client_order_ref)])
-    assert mnf_id, _('Sale Reference is not bind with the value')
+    mo = mnf_obj.browse(cr, uid, mnf_id)[0]
+    assert mo.sale_name == so.name, 'Wrong Name for the Manufacturing Order. Expected %s, Got %s' % (so.name, mo.name)
+    assert mo.sale_ref == so.client_order_ref, 'Wrong Sale Reference for the Manufacturing Order'
diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py
index f5ccef7ffe5..6db8f2b27d9 100644
--- a/addons/sale_order_dates/__openerp__.py
+++ b/addons/sale_order_dates/__openerp__.py
@@ -29,26 +29,20 @@ Add additional date information to the sales order.
 ===================================================
 
 You can add the following additional dates to a sale order:
+-----------------------------------------------------------
     * Requested Date
     * Commitment Date
     * Effective Date
 """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'images': ["images/sale_order_dates.jpeg"],
-    'depends': ["sale"],
-    'init_xml': [
-    ],
-
-    'update_xml': [
-        'sale_order_dates_view.xml',
-    ],
-    'demo_xml': [
-    ],
+    'images': ['images/sale_order_dates.jpeg'],
+    'depends': ['sale_stock'],
+    'data': ['sale_order_dates_view.xml'],
+    'demo': [],
     'test': [],
     'installable': True,
     'auto_install': False,
-    'certificate' : '00867497685972962845',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_order_dates/i18n/ar.po b/addons/sale_order_dates/i18n/ar.po
index af1f71b9a08..f681f5635f1 100644
--- a/addons/sale_order_dates/i18n/ar.po
+++ b/addons/sale_order_dates/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/bg.po b/addons/sale_order_dates/i18n/bg.po
index 6fbde9ee6a9..4a3ba860aea 100644
--- a/addons/sale_order_dates/i18n/bg.po
+++ b/addons/sale_order_dates/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/ca.po b/addons/sale_order_dates/i18n/ca.po
index a0a452e2966..07d76f6fd55 100644
--- a/addons/sale_order_dates/i18n/ca.po
+++ b/addons/sale_order_dates/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/da.po b/addons/sale_order_dates/i18n/da.po
index 37f9ad7c3cc..9a28e94bfd8 100644
--- a/addons/sale_order_dates/i18n/da.po
+++ b/addons/sale_order_dates/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/de.po b/addons/sale_order_dates/i18n/de.po
index a5abf95643c..11560462996 100644
--- a/addons/sale_order_dates/i18n/de.po
+++ b/addons/sale_order_dates/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/el.po b/addons/sale_order_dates/i18n/el.po
index 5c0c2a1294d..9f015643494 100644
--- a/addons/sale_order_dates/i18n/el.po
+++ b/addons/sale_order_dates/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/es.po b/addons/sale_order_dates/i18n/es.po
index 5cac0e911f8..9785e804f67 100644
--- a/addons/sale_order_dates/i18n/es.po
+++ b/addons/sale_order_dates/i18n/es.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2011-01-13 10:05+0000\n"
-"Last-Translator: Carlos @ smile-iberia <Unknown>\n"
+"Last-Translator: Carlos Ch. <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/es_CL.po b/addons/sale_order_dates/i18n/es_CL.po
index c8e3f622073..f663afcd256 100644
--- a/addons/sale_order_dates/i18n/es_CL.po
+++ b/addons/sale_order_dates/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/es_CR.po b/addons/sale_order_dates/i18n/es_CR.po
index fb0d9a9f13e..6210b9afc22 100644
--- a/addons/sale_order_dates/i18n/es_CR.po
+++ b/addons/sale_order_dates/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: sale_order_dates
diff --git a/addons/sale_order_dates/i18n/fi.po b/addons/sale_order_dates/i18n/fi.po
index 8a77d3aef31..773327aadc3 100644
--- a/addons/sale_order_dates/i18n/fi.po
+++ b/addons/sale_order_dates/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/fr.po b/addons/sale_order_dates/i18n/fr.po
index 6297817d891..6eebde5f6f6 100644
--- a/addons/sale_order_dates/i18n/fr.po
+++ b/addons/sale_order_dates/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/gl.po b/addons/sale_order_dates/i18n/gl.po
index 949a3c486f4..01c6e050bfe 100644
--- a/addons/sale_order_dates/i18n/gl.po
+++ b/addons/sale_order_dates/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/hr.po b/addons/sale_order_dates/i18n/hr.po
index 937df56fdc0..3ebd93b6b5f 100644
--- a/addons/sale_order_dates/i18n/hr.po
+++ b/addons/sale_order_dates/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/hu.po b/addons/sale_order_dates/i18n/hu.po
index bd43061f5ca..b8de4bdf61c 100644
--- a/addons/sale_order_dates/i18n/hu.po
+++ b/addons/sale_order_dates/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/id.po b/addons/sale_order_dates/i18n/id.po
index ca452df9bd1..0d5e266897b 100644
--- a/addons/sale_order_dates/i18n/id.po
+++ b/addons/sale_order_dates/i18n/id.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/it.po b/addons/sale_order_dates/i18n/it.po
index af479bc2af9..df886bdc1c1 100644
--- a/addons/sale_order_dates/i18n/it.po
+++ b/addons/sale_order_dates/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/ja.po b/addons/sale_order_dates/i18n/ja.po
index 2afb7076552..c0731f4d7ab 100644
--- a/addons/sale_order_dates/i18n/ja.po
+++ b/addons/sale_order_dates/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/mn.po b/addons/sale_order_dates/i18n/mn.po
index cc917468f59..ccbabc22cf9 100644
--- a/addons/sale_order_dates/i18n/mn.po
+++ b/addons/sale_order_dates/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/nb.po b/addons/sale_order_dates/i18n/nb.po
index 20f6ad533dd..6d3270a6d09 100644
--- a/addons/sale_order_dates/i18n/nb.po
+++ b/addons/sale_order_dates/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/nl.po b/addons/sale_order_dates/i18n/nl.po
index f9ec91c9049..88cf74442dd 100644
--- a/addons/sale_order_dates/i18n/nl.po
+++ b/addons/sale_order_dates/i18n/nl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-01-15 12:45+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/pl.po b/addons/sale_order_dates/i18n/pl.po
index 3b51442c3e6..8c6313fd6bc 100644
--- a/addons/sale_order_dates/i18n/pl.po
+++ b/addons/sale_order_dates/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/pt.po b/addons/sale_order_dates/i18n/pt.po
index 0314e5b03ff..506d0a03d07 100644
--- a/addons/sale_order_dates/i18n/pt.po
+++ b/addons/sale_order_dates/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/pt_BR.po b/addons/sale_order_dates/i18n/pt_BR.po
index b550dd0fd93..b0f9f0bb257 100644
--- a/addons/sale_order_dates/i18n/pt_BR.po
+++ b/addons/sale_order_dates/i18n/pt_BR.po
@@ -9,18 +9,19 @@ msgstr ""
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-07-28 19:51+0000\n"
-"Last-Translator: Fábio Martinelli <webmaster@guaru.net>\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr "Referência de ordem deve ser única por empresa!"
+msgstr "A Referência do Pedido deve ser única por Empresa!"
 
 #. module: sale_order_dates
 #: help:sale.order,requested_date:0
diff --git a/addons/sale_order_dates/i18n/ro.po b/addons/sale_order_dates/i18n/ro.po
index 58d07f776db..39852bf96dd 100644
--- a/addons/sale_order_dates/i18n/ro.po
+++ b/addons/sale_order_dates/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/ru.po b/addons/sale_order_dates/i18n/ru.po
index be7749f99b9..9d7dff3328f 100644
--- a/addons/sale_order_dates/i18n/ru.po
+++ b/addons/sale_order_dates/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
@@ -50,7 +50,7 @@ msgstr "Требуемая дата"
 #. module: sale_order_dates
 #: model:ir.model,name:sale_order_dates.model_sale_order
 msgid "Sales Order"
-msgstr "Заказ на продажу"
+msgstr "Заказ продаж"
 
 #. module: sale_order_dates
 #: help:sale.order,commitment_date:0
diff --git a/addons/sale_order_dates/i18n/sk.po b/addons/sale_order_dates/i18n/sk.po
index c9ae55940e3..90929f49947 100644
--- a/addons/sale_order_dates/i18n/sk.po
+++ b/addons/sale_order_dates/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/sl.po b/addons/sale_order_dates/i18n/sl.po
index ea3ce46e618..c5d1369f327 100644
--- a/addons/sale_order_dates/i18n/sl.po
+++ b/addons/sale_order_dates/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/sr@latin.po b/addons/sale_order_dates/i18n/sr@latin.po
index 5b813fb1e0b..7f554d81f70 100644
--- a/addons/sale_order_dates/i18n/sr@latin.po
+++ b/addons/sale_order_dates/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/sv.po b/addons/sale_order_dates/i18n/sv.po
index 1c4f9e203d2..f2d8b449ca9 100644
--- a/addons/sale_order_dates/i18n/sv.po
+++ b/addons/sale_order_dates/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/tr.po b/addons/sale_order_dates/i18n/tr.po
index 43b90655af5..2ac6a62f177 100644
--- a/addons/sale_order_dates/i18n/tr.po
+++ b/addons/sale_order_dates/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/i18n/zh_CN.po b/addons/sale_order_dates/i18n/zh_CN.po
index 9db898902ff..1a32eabb950 100644
--- a/addons/sale_order_dates/i18n/zh_CN.po
+++ b/addons/sale_order_dates/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:35+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:32+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: sale_order_dates
 #: sql_constraint:sale.order:0
diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py
index ceb6d48755c..49e10eab787 100644
--- a/addons/sale_order_dates/sale_order_dates.py
+++ b/addons/sale_order_dates/sale_order_dates.py
@@ -54,11 +54,11 @@ class sale_order_dates(osv.osv):
         return res
 
     _columns = {
-        'commitment_date': fields.function(_get_commitment_date, store=True, type='date', string='Commitment Date', help="Date on which delivery of products is to be made."),
-        'requested_date': fields.date('Requested Date', help="Date on which customer has requested for sales."),
+        'commitment_date': fields.function(_get_commitment_date, store=True, type='date', string='Commitment Date', help="Committed date for delivery."),
+        'requested_date': fields.date('Requested Date', help="Date requested by the customer for the sale."),
         'effective_date': fields.function(_get_effective_date, type='date', store=True, string='Effective Date',help="Date on which picking is created."),
     }
 
 sale_order_dates()
 
-# 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/import_sugarcrm/__init__.py b/addons/sale_stock/__init__.py
similarity index 92%
rename from addons/import_sugarcrm/__init__.py
rename to addons/sale_stock/__init__.py
index 8fdd9aec302..b5899113530 100644
--- a/addons/import_sugarcrm/__init__.py
+++ b/addons/sale_stock/__init__.py
@@ -19,9 +19,10 @@
 #
 ##############################################################################
 
-import import_sugarcrm
-import sugar
-import wizard
+import sale_stock
+import stock
+import report
+import company
+import res_config
 
-
-# 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/sale_stock/__openerp__.py b/addons/sale_stock/__openerp__.py
new file mode 100644
index 00000000000..10773b44a3f
--- /dev/null
+++ b/addons/sale_stock/__openerp__.py
@@ -0,0 +1,70 @@
+# -*- 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/>.
+#
+##############################################################################
+
+{
+    'name': 'Sales and Warehouse Management',
+    'version': '1.0',
+    'category': 'Hidden',
+    'summary': 'Quotation, Sale Orders, Delivery & Invoicing Control',
+    'description': """
+Manage sales quotations and orders
+==================================
+
+This module makes the link between the sales and warehouses management applications.
+
+Preferences
+-----------
+* Shipping: Choice of delivery at once or partial delivery
+* Invoicing: choose how invoices will be paid
+* Incoterms: International Commercial terms
+
+You can choose flexible invoicing methods:
+
+* *On Demand*: Invoices are created manually from Sales Orders when needed
+* *On Delivery Order*: Invoices are generated from picking (delivery)
+* *Before Delivery*: A Draft invoice is created and must be paid before delivery
+""",
+    'author': 'OpenERP SA',
+    'website': 'http://www.openerp.com',
+    'images': ['images/deliveries_to_invoice.jpeg'],
+    'depends': ['sale', 'stock', 'procurement'],
+    'init_xml': [],
+    'update_xml': ['security/sale_stock_security.xml',
+                   'security/ir.model.access.csv',
+                   'company_view.xml',
+                   'sale_stock_view.xml',
+                   'sale_stock_workflow.xml',
+                   'res_config_view.xml',
+                   'report/sale_report_view.xml',
+                   'process/sale_stock_process.xml',
+                   ],
+   'data': ['sale_stock_data.xml'],
+   'demo_xml': ['sale_stock_demo.xml'],
+    'test': ['test/cancel_order_sale_stock.yml',
+             'test/picking_order_policy.yml',
+             'test/prepaid_order_policy.yml',
+             'test/sale_order_onchange.yml',
+             ],
+    'installable': True,
+    'auto_install': True,
+    
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale/company.py b/addons/sale_stock/company.py
similarity index 100%
rename from addons/sale/company.py
rename to addons/sale_stock/company.py
diff --git a/addons/sale/company_view.xml b/addons/sale_stock/company_view.xml
similarity index 100%
rename from addons/sale/company_view.xml
rename to addons/sale_stock/company_view.xml
diff --git a/addons/sale_stock/i18n/ar.po b/addons/sale_stock/i18n/ar.po
new file mode 100644
index 00000000000..9ed6481b7f8
--- /dev/null
+++ b/addons/sale_stock/i18n/ar.po
@@ -0,0 +1,718 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 13:59+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "أمر التسليم"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"إذا لم يكن المخزون كافياً لتسليم الكميات المطلوبة في وقت واحد، هل تقبل "
+"بالشحن الجزئي؟"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "طريقة الشراء"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "قائمة الالتقاط"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "وثيقة الانتقال الى الخروج او اللى العميل."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "تحقق"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "المتجر"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "إنشاء أمر تحصيل"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr "لكل سطر أمر مبيعات، يتمّ إنشاء أمر تحصيل يوفر المنتج المباع."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "سياسة الشحن"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"تشير كلمة انكوترم لـ ‘مصطلحات تجارية دولية‘ وتتضمن مسلسلها من مصطلحات "
+"المبيعات المستخدمة في الصفقات التجارية."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "يحدد أوامر التحصيل لكل سطر في أوامر المبيعات."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "نقل مخزون"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "أمر تحصيل"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "أمر المبيعات"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "سطر أمر المبيعات"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"يتم إنشاء نموذج للقائمة المختارة حالما يتم تأكيد ترتيب المبيعات، في نفس "
+"الوقت من اجل الشراء. لأنها تمثل أجزاء مهمة من امر المبيعات. هناك قائمة "
+"اختيار 1 من قبل خط ترتيب المبيعات التي تتطور مع توافر قطع الغيار."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "العميل"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "خطأ! لا يمكنك إنشاء شركات متداخلة (شركات تستخدم نفسها)"
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "الأيام المضافة لأسباب أمنية"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "قائمة الالتقاط"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "المخزن"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "تخصيص نفاذ"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "لم يمكن إلغاء أمر المبيعات!"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "الوقت اللازم للتسليم"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "وثيقة الانتقال إلى العميل."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "نقل المخزون"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"يتم عمل الفاتورة تلقائيًا اذا كانت سياسة الشحن ‘فاتورة بالاختيار‘ او ‘فاتورة "
+"بعد تسليم البضاعة‘."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "التحصيل"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "تمّ الشحن"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "الإسلوب غير صالح حالة الاختبار"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"يتم تلقائيا إنشاء نظام الشراء في أقرب وقت لتأكيد ترتيب المبيعات أو كما يتم "
+"دفع الفاتورة. انه يقود عمليات الشراء وإنتاج المنتجات المتعلقة بالقواعد "
+"والمعايير لترتيب المبيعات. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "التعبئة"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "خطأ في الإعدادات!"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "أيام الأمان"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "تحصيل المواد المباعة"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "متجر المبيعات"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"تمّ تسليم أمر المبيعات. لا يتمّ تحديث هذا الحقل إلا بعد تشغيل المجدوِل."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "الخصائص"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr "يمكنك إنشاء الفواتير بناءً على أوامر المبيعات أو بناءً على الشحنات."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "إحصائيات أوامر البيع"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "الشركات"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr "أمر تحصيل واحد لكل سطر أمر مبيعات ولكل من المكوّنات."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "تعيين"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr "عدد الأيام منذ تأكيد الطلب حتى شحن المنتج للعميل"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "من المخزون"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "الفاتورة"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "إلغاء"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "عدد الطرود/عدد الحزم"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "تمّ التسليم"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr "يجب أولاً أن تلغي جميع الالتقاطات المرتبطة بأمر المبيعات هذا."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "إنشاء فاتورة"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "فاتورة الدفع المقدم للمبيعات"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr "يجب أولاً أن تلغي عمليات نقل المخزون المرتبطة بسطر أمر المبيعات هذا."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(غير ممكن)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "مصطلحات تجارية مشتركة"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "إلغي التخصيص"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "تحت الطلب"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "بناءً على الكميات المشحونة أو المطلوبة"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "عمليات التقاط ذات علاقة"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "اسم الشركة يجب أن يكون فريداً !"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "طلب أمر مبيعات"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "إنشاء أمر تسليم"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "تجاهل الخلل"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"تريد بيع %.2f %s ولكن لديك %.2f %s فقط!\n"
+"المخزون الحقيقي: %.2f %s. (دون حجز)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "تمّ الالتقاط"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "إنشاء قائمة الالتقاط"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"بالاعتماد على تكوين مكان الصادر, تم عمل الانتقال بين المنطقة المصدرة والعميل "
+"عن طريق امر التسليم تلقائيًا او يدويًا."
diff --git a/addons/sale_stock/i18n/bg.po b/addons/sale_stock/i18n/bg.po
new file mode 100644
index 00000000000..aa68ffbcb30
--- /dev/null
+++ b/addons/sale_stock/i18n/bg.po
@@ -0,0 +1,705 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:26+0000\n"
+"Last-Translator: Dimitar Markov <dimitar.markov@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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Порчъка за доставка"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Ако нямате достатъчно стока за доставка наведнъж приемате ли доставка на "
+"части?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Начин на снабдяване"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Проверка"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Магазин"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Поръчка за продажба"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Политика на доставки"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Движение на наличности"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Поръчки за доставка"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Нареждане за продажба"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Ред от нареждане за продажба"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Клиент"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Грешка! НЕ може да създавате рекурсивни фирми"
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "Дните към обещанието Ви към клиентите - за сигурност"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Склад"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Принудително задаване"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Не може да бъде отказана поръчка за продажба!"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Движения на наличност"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Снабдаване"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Изпратена"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "невалиден режим за test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Опаковане"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Дни за сигурност"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Магазин"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Свойства"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Статистика на нареждани за продажби"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Фирми"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Назначаване"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Брой дни между потвърждението на поръчката и изпращането на продуктите към "
+"клиента"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "от склад"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Фактура"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Отказ"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Брой пакети"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Доставен/а/и"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Създаване на фактура"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "не е налично/и"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Инкотермс"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Доставка"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Отказване на назначение"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "в поръчка"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Свързано товарене"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Игнорирай грешка"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Натоварен"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/bs.po b/addons/sale_stock/i18n/bs.po
new file mode 100644
index 00000000000..76954ffb09b
--- /dev/null
+++ b/addons/sale_stock/i18n/bs.po
@@ -0,0 +1,703 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:16+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Otpremnica"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Ako nemate dovoljno zaliha na stanju za cjelokupnu isporuku, da li "
+"prihvatate djelimičnu isporuku?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Potvrdi"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Prodavnica"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Prodajni nalog"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Način otpreme"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Kupac"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladište"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Prinudni prenos"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Nabavka"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Pakovanje"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Postavke"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Dodjeli"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "sa zaliha"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Broj pakovanja"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Kreriaj Fakturu"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Isporuka"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Otkazi prijenos"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "u nalogu"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Izuzeto"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/ca.po b/addons/sale_stock/i18n/ca.po
new file mode 100644
index 00000000000..8bdca40266a
--- /dev/null
+++ b/addons/sale_stock/i18n/ca.po
@@ -0,0 +1,734 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:21+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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Ordre d'enviament"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Si no disposeu de suficients existències per enviar-ho tot d'una vegada, "
+"accepteu enviaments parcials o no?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Mètode proveïment"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Albarà"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Document del moviment a la sortida o al client."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Valida"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Tenda"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Crea ordre proveïment"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Comanda de venda"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Per cada línia de comanda de venda, es crea una ordre de proveïment per a "
+"subministrar el producte venut."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Política de facturació"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm, que significa \"Termes de Comerç Internacional\", implica una "
+"sèrie de condicions de venda que s'utilitzen en la transacció comercial."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Genera ordres de proveïment per a cada línia de comanda de venda."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Moviment d'estoc"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Ordre de proveïment"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Comanda de venda"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Línia comanda de venda"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"L'albarà es crea tan aviat com es confirma la comanda de venda, alhora que "
+"l'ordre de proveïment. Representa l'assignació dels components de la comanda "
+"de venda. Hi ha un albarà per línia de la comanda de venda que evoluciona "
+"amb la disponibilitat dels components."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Client"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Error! No podeu crear companyies recursives."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Aquests dies per raons de seguretat s'afegeixen als que prometeu als clients."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Albarà"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magatzem"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Força assignació"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "No es pot cancel·lar la comanda de venda!"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Temps inicial d'entrega"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Document del moviment al client."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Moviments d'inventari"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"La factura es crea de forma automàtica si la política de facturació és "
+"\"Facturar des de l'albarà\" o \"Facturar comanda després de l'enviament\"."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Proveïment"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Enviat"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "Mode no vàlit pe ra test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Es crea automàticament una ordre de proveïment tan aviat com es confirma una "
+"comanda de venda o es paga la factura. Provoca la compra i la producció de "
+"productes segons les regles i els paràmetres de la comanda de venda. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Empaquetament"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Dies de seguretat"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Proveïment de material venut"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Tenda vendes"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Indica que la comanda de venda ha estat lliurada. Aquest camp s'actualitza "
+"només després que el planificador(s) s'ha executat."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Propietats"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Podeu generar factures basades en comandes de venda o basades en enviaments."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadístiques comandes de venda"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Companyies"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Una ordre de proveïment per a cada línia de la comanda de venda i per a "
+"cadascun dels components."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Assigna"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Número de dies entre la confirmació de la comanda i l'enviament dels "
+"productes al client."
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "des d'estoc"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Número paquets"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Lliurat"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Primer heu de cancel·lar tots els albarans relacionats amb aquesta comanda "
+"de venda."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Crea factura"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Vendes. Bestreta pagament factura"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Heu de cancel·lar primer els moviments d'estoc associats a aquesta línia de "
+"comanda de venda."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Enviament"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Cancel·la assignació"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "sota comanda"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basat en les quantitats enviades o comandades"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Albarà relacionat"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Sol·licitud comanda de venda"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Crea ordre de lliurament"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignora excepció"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Preveu vendre %.2f %s però només %.2f %s estan disponibles!\n"
+"L'estoc real és %.2f %s. (sense reserves)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Enviada"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Crea albarà"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Depenent de la configuració de la ubicació de sortida, el moviment entre la "
+"zona de sortida i el client es realitza a través de l'ordre de lliurament de "
+"forma manual o automàtica."
diff --git a/addons/sale_stock/i18n/cs.po b/addons/sale_stock/i18n/cs.po
new file mode 100644
index 00000000000..336d1db06f1
--- /dev/null
+++ b/addons/sale_stock/i18n/cs.po
@@ -0,0 +1,709 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:02+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+"X-Poedit-Language: Czech\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Objednávka doručení"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metoda zásobování"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Seznam naskladnění"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Dokument přesunu na výstup nebo k zákazníkovi"
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Ověřit"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Obchod"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Vytvořit zásobovací příkaz"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Zásobovací příkaz je vytvořen pro každý řádek prodejní objednávky pro "
+"zásobování prodaného výrobku."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Přepravní politika"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Řídí příkazy zásobování pro každý řádek prodejní objednávky"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Přesun zásob"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Zásobovací příkaz"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Prodejní objednávka"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Řádek prodejní objednávky"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Zákazník"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Chyba! Nemůžete vytvořit rekurzivní společnosti."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Naváděcí seznam"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Sklad"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Vynutit přiřazení"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Nelze zrušit prodejní příkaz !"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Dodací čekací lhůta"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokument přesunu k zákazníkovi."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Pohyby inventáře"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Zásobování"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Odesláno"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "neplatný režim pro test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Balení"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Bezpečnostní dny"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Pořízení prodaného materiálu"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Prodejní obchod"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Vlastnosti"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Můžete generovat faktury založené na prodejních objednávkách nebo na "
+"přepravě."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistiky prodejních objednávek"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Společnosti"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Přiřadit k"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr "Počet dní mezi potvrzení objednávky a přepravou výrobků zákazníkovi"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "ze skladu"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Zrušit"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Počet balíků"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Doručené množ."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Nejdříve musíte zrušit všechna navádění připojené k této prodejní objednávce."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Vytvořit fakturu"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Prodejní platba faktury dopředu"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Musíte nejdříve zrušit skladové pohyby připojené k tomuto řádku prodejního "
+"příkazu."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(nedost.)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Zrušit přiřazení"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "na objednávku"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Založeno přepraveném nebo objednaném množství."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Sousivející navádění"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Vyžádání Prodejní objednávky"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Vytvořit dodací příkaz"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignoravat výjimku"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Naskladněno"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Vytvořit seznam naskladnění"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/da.po b/addons/sale_stock/i18n/da.po
new file mode 100644
index 00000000000..1d58d5c45e3
--- /dev/null
+++ b/addons/sale_stock/i18n/da.po
@@ -0,0 +1,708 @@
+# Danish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:06+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Danish <da@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Hvis du ikke har nok på lager til at levere alt på en gang, vil du så lave "
+"dellevering?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Lager flytning"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Indkøbsordre"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Kunde"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Det er det antal dage som du lägger till det datum som du lovat kunden av "
+"säkerhetsskäl"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Plukkeliste"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Lagersted"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Lagerbevægelser"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Fakturaen laves automatisk hvis leveringspolitiken er 'Fakturer på grundlag "
+"af plukliste' eller 'Fakturer på grundlag af ordre efter levering'."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Indkøb"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Afsendt"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Salgsordre statistik"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Virksomheder"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Leveret"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/de.po b/addons/sale_stock/i18n/de.po
new file mode 100644
index 00000000000..87924a819aa
--- /dev/null
+++ b/addons/sale_stock/i18n/de.po
@@ -0,0 +1,745 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+# Ferdinand Gassauer <f.gassauer@chricar.at>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:17+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: German <kde-i18n-doc@kde.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Lieferschein"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr "Erlaube Teillieferung, wenn nicht genügend auf Lager liegt."
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Dispositionsmethode"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "Lieferschein Info!: "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Kommissionsliste"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"Sie haben die Anzahl von %d Einheiten gewählt.\n"
+"Dies ist mit der ausgewählten Verpackung nicht vereinbar.\n"
+"Ein Vorschlag der Verpackung entsprechend wäre:\n"
+"EAN: %s  Anzahl: %s  Art: %s"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Beleg für Warenversand oder Auslieferung"
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Validieren"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Vertriebsshop"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Erzeuge Beschaffungsauftrag"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Verkaufsauftrag"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Für jede Verkaufsauftragsposition, wird automatisch ein Beschaffungsauftrag "
+"für den Einkauf des Produkts erstellt."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Abrechnungsbedingung"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Der Begriff Incoterm steht für  'International Commercial terms' und "
+"impliziert eine Reihe von Bedingungen für den Verkauf und die Lieferung im "
+"internationalen Handel."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+"Automatische Erstellung von Beschaffungsaufträgen für jede "
+"Verkaufsauftragsposition."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Bestandsbuchung"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Beschaffungsauftrag"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Rechnung auf Basis Auslieferung"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Verkaufsauftrag"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Auftragsposition"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"Die Erstellung des Lieferauftrags erfolgt unmittelbar auf eine "
+"Auftragsbestätigung, zeitgleich mit der Erstellung des  "
+"Beschaffungsauftrags. Der Lieferauftrag repräsentiert die zum "
+"Verkaufsauftrag einzupackenden Artikel. Hierzu gibt es einen Packauftrag mit "
+"allen Auftragsposition für den Kunden. Der Zustand des Packauftrags kann "
+"sich je nach der Verfügbarkeit von Teilen verändern."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Kunde"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Diese Tage werden aus Sicherheitsgründen addiert zur versprochenen "
+"Auslieferungszeit (an den Kunden)."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Lieferschein"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Zentrallager"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Erzwinge Zuweisung"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Verkaufsauftrag konnte nicht storniert werden"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Tage bis Auslieferung"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Beleg der Auslieferung an Kunden"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Lieferaufträge"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+"Wenn \"Auf Abruf\", so wird eine Beschaffung ausgelöst sobald der "
+"Verkaufsauftrag bestätigt wurde. Somit wird eine Anforderung zum Einkauf "
+"oder eine Fertigung erzeugt."
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Die Rechnung wird für die Abrechnungsbedingungen \"Rechnung durch "
+"Lieferung\" und \" Rechnung durch Auftrag\"  automatisch erzeugt."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Beschaffung"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Ausgeliefert"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "Fehlerhafter Modus für test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Ein Beschaffungsauftrag wird spätestens dann ausgelöst, wenn ein "
+"Verkaufsauftrag bestätigt wird oder eine Ausgangsrechnung bezahlt wird. "
+"Einkauf und die Fertigung sind dabei abhängig von den Einstellungen beim "
+"Verkaufsauftrag selbst. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Produkte Verpackungen"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Fehler Konfiguration !"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Sicherheitspuffer (Tage)"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Beschaffung von verkauftem Material"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Verkaufsshop"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Hier wird angezeigt, ob der Auftrag bereits ausgeliefert wurde. Dieses Feld "
+"wird immer nach Durchführung des automatischen Beschaffungsvorschlags "
+"aktualisiert."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Eigenschaften"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Rechnungen können aufgrund von Verkaufsaufträgen oder von Lieferungen "
+"erstellt werden."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistik Verkaufsauftrag"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Unternehmen"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "Die Referenz muss je Firma eindeutig sein"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Ein Beschaffungsauftrag je Verkaufsauftragsposition und jede "
+"Produktkomponente."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Annehmen"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Nicht genug auf Lager! "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Anzahl an Tagen zwischen Auftragserteilung und Auslieferung an Kunden"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Beschaffung an Lager"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Rechnung"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Anzahl der Packstücke"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Die Bestellreferenz muss je Firma eindeutig sein"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Ausgeliefert"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr "Zuerst müssen Sie alle Lieferungen zu diesem Auftrag stornieren."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Erzeuge Rechnung"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Anzahlungsrechnung"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Sie müssen zuerst alle Lieferungen für diese Verkaufsauftragsposition "
+"abbrechen."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n/v)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Lieferbedingung"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Auslieferung"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Abbruch Zuweisung"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Beschaffe von Auftrag"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basierend auf gelieferte oder bestellte Mengen"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Alle Produkte auf einmal Liefern"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Zugehöriger Lieferaufträge"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Der Name der Firma darf nur einmal vorkommen!"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Anfrage Verkaufsauftrag"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Erzeugt Lieferauftrag"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignoriere den Ausnahmefehler"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Sie wollen %.2f %s verkaufen, aber nur %.2f %s sind verfügbar !\n"
+"Der Bestand beträgt %.2f %s. (ohne Reservierungen)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Ausgeliefert"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Liefere jedes Produkt bei Verfügbarkeit"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Erzeuge Packauftrag"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Je nach Definition des Ausliefungslagers wird die Lagerbewegung zwischen "
+"Auslieferungslager und dem Kunden durch einen Lieferauftrag entweder manuell "
+"oder automatisch erstellt"
diff --git a/addons/sale_stock/i18n/el.po b/addons/sale_stock/i18n/el.po
new file mode 100644
index 00000000000..59f401bba72
--- /dev/null
+++ b/addons/sale_stock/i18n/el.po
@@ -0,0 +1,712 @@
+# Greek 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: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:18+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
+"Language-Team: Greek <el@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Εντολή Παράδοσης"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Αν δεν υπάρχει αρκετό απόθεμα για να παραδώσετε όλη την παραγγελία, "
+"αποδέχεστε μερικώς εκτελεσμένες αποστολές ή όχι;"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Μέθοδος Προμήθειας"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Επιβεβαίωση"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Κατάστημα"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Εντολή Πώλησης"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Πολτική Μεταφορών"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Κίνηση Αποθέματος"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Παραγγελία Προμήθειας"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Παραγγελία Πώλησης"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Γραμμή Παραγγελίας Πώλησης"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Πελάτης"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Αυτές είναι οι μέρες που προστέθηκαν σε αυτό που υποσχεθήκατε στους πελάτες "
+"για λόγους ασφαλείας."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Αποθήκη"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Δυναμική Ανάθεση"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Κινήσεις Αποθήκης"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Το τιμολόγιο δημιουργείται αυτόματα εάν η πολιτική αποστολής είναι "
+"'Τιμολόγιο από παραλαβή' ή 'Τιμολόγιο με παραγγελία μετά την παραλαβή'."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Προμήθεια"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Απεσταλμένο"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "άκυρη κατάσταση για test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Συσκευασία"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Ημέρες Ασφαλείας"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Κατάστημα Πώλησης"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Ιδιότητες"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Στατιστικά Πωλήσεων Παραγγελιών"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Εταιρίες"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Ανάθεση"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Ημέρες μεταξύ της επιβεβαίωσης παραγγελίας και της παραλαβής των προϊόντων "
+"στον πελάτη"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Απο στόκ"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Τιμολόγιο"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Άκυρο"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Αριθμός συσκευασίας"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Παραδόθηκε"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Δημιουργία Τιμολογίου"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Πρέπει πρώτα να ακυρώσετε τις κινήσεις στοκ που συνδέονται με αυτή τη γραμμή "
+"π΄΄ωλησης."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(δεν υπάρχει)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Μεταφορά"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Ακύρωση Ανάθεσης"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Σε εντολή"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Σχετική Παραλαβή"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Δημιουργία Παραγγελία Παραλαβής"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Picked"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Δημιουργία Λίστας Παραλαβής"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/es.po b/addons/sale_stock/i18n/es.po
new file mode 100644
index 00000000000..34424d67650
--- /dev/null
+++ b/addons/sale_stock/i18n/es.po
@@ -0,0 +1,736 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:11+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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Orden de entrega"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Si no dispone de suficientes existencias para enviarlo todo de una vez, "
+"¿acepta envíos parciales o no?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método abastecimiento"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "¡Información del alabarán! "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Albarán"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Documento del movimiento a la salida o al cliente."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Crear orden abastecimiento"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Pedido de venta"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Para cada línea de pedido de venta, se crea una orden de abastecimiento para "
+"suministrar el producto vendido."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Política de facturación"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm, que significa 'Términos de Comercio Internacional', implica una "
+"serie de condiciones de venta que se utilizan en la transacción comercial."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento stock"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Orden de abastecimiento"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Facturar desde albaranes"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"El albarán se crea tan pronto como se confirma el pedido de venta, a la vez "
+"que la orden de abastecimiento. Representa la asignación de los componentes "
+"del pedido de venta. Hay un albarán por línea del pedido de venta que "
+"evoluciona con la disponibilidad de los componentes."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Estos días por razones de seguridad se añaden a los que promete a los "
+"clientes."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forzar asignación"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "¡No se puede cancelar el pedido de venta!"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Tiempo inicial entrega"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documento del movimiento al cliente."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Movimientos de inventario"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"La factura se crea de forma automática si la política de facturación es "
+"\"Facturar desde el albarán\" o \"Facturar pedido después del envío\"."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "Modo no válido para test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Se crea automáticamente una orden de abastecimiento tan pronto como se "
+"confirma un pedido de venta o se paga la factura. Provoca la compra y la "
+"producción de productos según las reglas y los parámetros del pedido de "
+"venta. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Empaquetado"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "!Error de configuración¡"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Días seguridad"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Abastecimiento de material vendido"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Tienda ventas"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Indica que el pedido de venta ha sido entregado. Este campo se actualiza "
+"sólo después que el planificador(es) se ha ejecutado."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Puede generar facturas basadas en pedidos de venta o basadas en envíos."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadísticas pedidos de venta"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "¡La referencia debe ser única por compañía!"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Una orden de abastecimiento para cada línea del pedido de venta y para cada "
+"uno de los componentes."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Asignar"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Número de días entre la confirmación del pedido y el envío de los productos "
+"al cliente."
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Número paquetes"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "¡La referencia del pedido debe ser única por compañía!"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Entregado"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Debe primero cancelar todos los albaranes relacionados con este pedido de "
+"venta."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Ventas. Anticipo pago factura"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Debe cancelar primero los movimientos de stock asociados a esta línea de "
+"pedido de venta."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Enviar"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Cancelar asignación"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "bajo pedido"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basado en las cantidades enviadas o pedidas."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Entregar todos los productos a la vez"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Albarán relacionado"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "¡El nombre de la compañía debe ser único!"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Solicitud pedido de venta"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Crear orden de entrega"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"¡Prevé vender %.2f %s pero sólo %.2f %s están disponibles!\n"
+"El stock real es %.2f %s. (sin reservas)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Enviada"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Entregar cada producto cuando esté disponible"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Crear albarán"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Dependiendo de la configuración de la ubicación de salida, el movimiento "
+"entre la zona de salida y el cliente se realiza a través de la orden de "
+"entrega de forma manual o automática."
diff --git a/addons/sale_stock/i18n/es_AR.po b/addons/sale_stock/i18n/es_AR.po
new file mode 100644
index 00000000000..79290addc6c
--- /dev/null
+++ b/addons/sale_stock/i18n/es_AR.po
@@ -0,0 +1,2629 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2010-09-21 22:36+0000\n"
+"Last-Translator: Margarita Manterola <ubuntu@marga.com.ar>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Si no tiene suficientes existencias para enviarlo todo de una vez, ¿acepta "
+"envíos parciales?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr "Cancelar orden"
+
+#. module: sale
+#: code:addons/sale/sale.py:638
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta Analítica"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"Here is a list of each sales order line to be invoiced. You can invoice "
+"sales orders partially, by lines of sales order. You do not need this list "
+"if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Línea de la orden"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"Sales Orders help you manage quotations and orders from your customers. "
+"OpenERP suggests that you start by creating a quotation. Once it is "
+"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+"handle several types of products so that a sales order may trigger tasks, "
+"delivery orders, manufacturing orders, purchases and so on. Based on the "
+"configuration of the sales order, a draft invoice will be generated so that "
+"you just have to confirm it when you want to bill your customer."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Término de pago predeterminado"
+
+#. module: sale
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades ordenadas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Movimientos de Inventario"
+
+#. module: sale
+#: field:sale.order,name:0 field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia de la orden"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis cotizaciones"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Empaquetado"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre de sucursal"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+"  - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1034
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "Modo no válido para test_state"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:617
+#, python-format
+msgid "Could not cancel this sales order !"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0 view:sale.order:0 view:sale.report:0
+msgid "Quotations"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Número de paquetes"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1074
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1079
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1147
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                              "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturada"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Orden de entrega"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Partner de Distribución"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Domicilio de facturación :"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Domicilio de Facturación"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Cotización / Orden"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Orden Nº"
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas de la orden"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr "Importe sin impuestos"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "Cantidad (UdM)"
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Invalid action !"
+msgstr "Acción no válida !"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Lista de Precios"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1327
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr "Todos las cotizaciones"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
+
+#. module: sale
+#: field:sale.order,state:0 field:sale.report,state:0
+msgid "Order State"
+msgstr "Estado de Orden"
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1078
+#, python-format
+msgid "Could not cancel sales order line!"
+msgstr ""
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Create Final Invoice"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Domicilio de Envío"
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"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). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1272
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr ""
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Ctd"
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. 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
+#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
+#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0 view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr "Contacto que realiza la orden"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forzar asignación"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "a pedido"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Domicilio de envío :"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar cotización"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
+msgid "Group By..."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Re-generar Factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando programación"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr "Establecer como borrador"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale
+#: model:email.template,body:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+"       | Order number: *${object.name}*\n"
+"       | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Order date: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       | Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr "Confirmar Orden"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Cantidades enviadas"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr "Factura basada en órdenes de venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
+#: code:addons/sale/sale.py:1033
+#, python-format
+msgid "Error !"
+msgstr "Error !"
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de Envío"
+
+#. module: sale
+#: code:addons/sale/sale.py:1156
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagada"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
+msgid "Sales Analysis"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1151
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Cotización"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+
+#. module: sale
+#: help:sale.config.picking_policy,order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0 view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unitario"
+
+#. module: sale
+#: selection:sale.order,state:0 view:sale.order.line:0
+#: selection:sale.order.line,state:0 selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizada"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid ""
+"You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:604
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0 field:sale.order.line,product_id:0
+#: view:sale.report:0 field:sale.report,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Cancelar asignación"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr "sale.config.picking_policy"
+
+#. module: sale
+#: view:account.invoice.report:0 view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturado en"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha ordenada"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Product UoM"
+msgstr "UdM del producto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Logistic"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Orden"
+
+#. module: sale
+#: code:addons/sale/sale.py:1017
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1251
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "States"
+msgstr "Estados"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_total:0 view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: report:sale.order:0 view:sale.order.line:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
+msgid "To Invoice"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
+#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1269
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear Facturas"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. 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
+#: view:sale.report:0 field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Sucursal"
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmada"
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de Facturación"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas en orden de venta"
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current year"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
+#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
+#: view:sale.report:0 field:sale.report,user_id:0
+msgid "Salesman"
+msgstr "Vendedor"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Importe sin impuestos"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0 view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanzar factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:624
+#, python-format
+msgid "The sales order '%s' has been cancelled."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Packings"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
+msgid "Sales Orders"
+msgstr "Órdenes de venta"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Anticipo de producto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: sale
+#: code:addons/sale/sale.py:618
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Órdenes de venta en proceso"
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr "Asignar"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:322
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: sale
+#: code:addons/sale/sale.py:1261
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"If you have more than one shop reselling your company products, you can "
+"create and manage that from here. Whenever you will record a new quotation "
+"or sales order, it has to be linked to a shop. The shop also defines the "
+"warehouse from which the products will be delivered for each particular "
+"sales."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1255
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Término de pago"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "Cotización Nº"
+
+#. module: sale
+#: field:sale.order,picked_rate:0 view:sale.report:0
+msgid "Picked"
+msgstr "Entregada"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr "Facturar desde órdenes de entrega"
+
+#~ msgid "Delivery, from the warehouse to the customer."
+#~ msgstr "Entrega, desde el almacén hasta el cliente."
+
+#~ msgid "Invoice after delivery"
+#~ msgstr "Facturar después de la entrega"
+
+#~ msgid "Outgoing Products"
+#~ msgstr "Productos salientes"
+
+#~ msgid "Reference"
+#~ msgstr "Referencia"
+
+#~ msgid "VAT"
+#~ msgstr "IVA"
+
+#~ msgid ""
+#~ "The sale order will automatically create the invoice proposition (draft "
+#~ "invoice). Ordered and delivered quantities may not be the same. You have to "
+#~ "choose if you invoice based on ordered or shipped quantities. If the product "
+#~ "is a service, shipped quantities means hours spent on the associated tasks."
+#~ msgstr ""
+#~ "La orden de venta creará automáticamente la propuesta de factura (factura "
+#~ "borrador). Las cantidades pedidas y las cantidades enviadas pueden no ser "
+#~ "las mismas. Tiene que decidir si factura se basa en cantidades pedidas o "
+#~ "enviadas. Si el producto es un servicio, las cantidades enviadas significa "
+#~ "horas dedicadas a las tareas asociadas."
+
+#~ msgid "Net Price"
+#~ msgstr "Precio neto"
+
+#~ msgid "All at Once"
+#~ msgstr "Todo a la vez"
+
+#~ msgid "My sales order in progress"
+#~ msgstr "Mis órdenes de venta en proceso"
+
+#~ msgid "All Sales Order"
+#~ msgstr "Todas las órdenes de ventas"
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sale order that is defined as 'Automatic "
+#~ "Invoice after delivery'."
+#~ msgstr ""
+#~ "No puede hacer un anticipo en una orden de venta definido como 'Factura "
+#~ "automática después del envío'."
+
+#~ 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 ""
+#~ "Se crea una lista de empaque al presionar 'Asignar' después de haber "
+#~ "confirmado la orden de venta. Esta transacción convierte la orden de venta a "
+#~ "empaque."
+
+#~ msgid ""
+#~ "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
+#~ "will automatic create after delivery."
+#~ msgstr ""
+#~ "Cuando selecciona una política de envío = 'Factura automática después del "
+#~ "envío', la creará automáticamente después del envío."
+
+#~ msgid "My sales order waiting Invoice"
+#~ msgstr "Mis órdenes de venta esperarando facturación"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sale order."
+#~ msgstr ""
+#~ "Primero debe cancelar todas las facturas asociadas a esta orden de venta."
+
+#~ msgid "Sale Order Procurement"
+#~ msgstr "Abastecimiento de la orden de venta"
+
+#~ msgid "Total amount"
+#~ msgstr "Importe total"
+
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
+
+#~ msgid "Sales orders"
+#~ msgstr "Órdenes de venta"
+
+#~ msgid "Payment accounts"
+#~ msgstr "Cuentas de pago"
+
+#~ msgid "Draft Invoice"
+#~ msgstr "Factura borrador"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Política de envío predeterminada"
+
+#~ msgid "Sales Order To Be Invoiced"
+#~ msgstr "Órdenes de venta a facturar"
+
+#, python-format
+#~ msgid "Could not cancel sale order !"
+#~ msgstr "No pudo cancelar la orden de venta !"
+
+#~ msgid "Procurement for each line"
+#~ msgstr "Abastecimiento para cada línea"
+
+#~ msgid ""
+#~ "In sale order , procuerement for each line and it comes into the procurement "
+#~ "order"
+#~ msgstr ""
+#~ "En una orden de venta, abastecer para cada línea y se convierte en la orden "
+#~ "de abastecimiento"
+
+#~ msgid "Uninvoiced Lines"
+#~ msgstr "Líneas no facturadas"
+
+#~ msgid "Sales Configuration"
+#~ msgstr "Configuración de ventas"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+#~ "categoría."
+
+#~ msgid "Sales Process"
+#~ msgstr "Proceso de venta"
+
+#~ msgid "My sales in shipping exception"
+#~ msgstr "Mis ventas en excepción de envío"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Product sales"
+#~ msgstr "Ventas de producto"
+
+#~ msgid "Configure Sale Order Logistic"
+#~ msgstr "Configurar logística de orden de venta"
+
+#~ msgid "Create Advance Invoice"
+#~ msgstr "Crear anticipo de factura"
+
+#~ msgid "Our Salesman"
+#~ msgstr "Nuestro vendedor"
+
+#~ msgid "Sale Procurement"
+#~ msgstr "Abastecimiento de venta"
+
+#~ msgid "One procurement for each product."
+#~ msgstr "Un abastecimiento por cada producto."
+
+#~ msgid "Sale Pricelists"
+#~ msgstr "Lista de precios de venta"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Entrega directa"
+
+#~ msgid "Draft customer invoice, to be reviewed by accountant."
+#~ msgstr "Factura de cliente en borrador, para ser revisada por un contador"
+
+#~ msgid "Make Invoice"
+#~ msgstr "Crear factura"
+
+#~ msgid "Packing OUT is created for stockable products."
+#~ msgstr "Se crea un empaque de salida OUT para productos almacenables."
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Sólo orden de entrega"
+
+#~ msgid "Sales order lines"
+#~ msgstr "Líneas de la orden de venta"
+
+#~ msgid "Other data"
+#~ msgstr "Otros datos"
+
+#~ msgid "Confirm sale order and Create invoice."
+#~ msgstr "Confirmar orden de venta y crear factura."
+
+#~ msgid "Advance Payment"
+#~ msgstr "Pago anticipado"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Envío & Factura manual"
+
+#~ msgid "Sale Invoice"
+#~ msgstr "Factura de venta"
+
+#~ msgid "Sale Order Lines"
+#~ msgstr "Líneas de la orden de venta"
+
+#~ msgid "Do you really want to create the invoices ?"
+#~ msgstr "¿Realmente desea crear las facturas?"
+
+#~ msgid "Set Default"
+#~ msgstr "Establecer predeterminado"
+
+#~ msgid "Sales order"
+#~ msgstr "Orden de venta"
+
+#~ msgid "Open Advance Invoice"
+#~ msgstr "Abrir anticipo factura"
+
+#~ msgid "Sales Management"
+#~ msgstr "Gestión de ventas"
+
+#~ msgid "Deliver"
+#~ msgstr "Entregar"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Línea de orden de venta"
+
+#, python-format
+#~ msgid "Could not cancel this sale order !"
+#~ msgstr "¡No se puede cancelar esta orden de venta !"
+
+#~ msgid "Purchase Pricelists"
+#~ msgstr "Lista de precios de compra"
+
+#, python-format
+#~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
+#~ msgstr "No se puede eliminar órdenes de venta confirmadas !"
+
+#~ msgid "Related invoices"
+#~ msgstr "Facturas relacionadas"
+
+#~ msgid ""
+#~ "This is the list of invoices that have been generated for this sale order. "
+#~ "The same sale order may have been invoiced in several times (by line for "
+#~ "example)."
+#~ msgstr ""
+#~ "Ésta es la lista de facturas que se han generado para esta orden de venta. "
+#~ "La misma orden puede haberse facturado en varias partes (por ejemplo por "
+#~ "cada línea)."
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Pago antes de la entrega"
+
+#~ msgid "Delivery Delay"
+#~ msgstr "Demora de entrega"
+
+#~ msgid "Payment Terms"
+#~ msgstr "Términos de pago"
+
+#~ msgid "My Sales Order"
+#~ msgstr "Mis órdenes de venta"
+
+#~ msgid "Sale Order line"
+#~ msgstr "Línea de orden de venta"
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid "Automatic Declaration"
+#~ msgstr "Declaración automática"
+
+#~ msgid "Manual Designation"
+#~ msgstr "Designación manual"
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Política de Envío"
+
+#~ msgid "Origin"
+#~ msgstr "Origen"
+
+#~ msgid "Procure Method"
+#~ msgstr "Método de Abastecimiento"
+
+#~ msgid "Sale Shop"
+#~ msgstr "Sucursal de Venta"
+
+#~ msgid "Manual Description"
+#~ msgstr "Descripción manual"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelada"
+
+#~ msgid "Procurement Corrected"
+#~ msgstr "Abastecimiento corregido"
+
+#~ msgid "Sale Order"
+#~ msgstr "Orden de Venta"
+
+#~ msgid "Sequence"
+#~ msgstr "Secuencia"
+
+#~ msgid "Make invoices"
+#~ msgstr "Crear Facturas"
+
+#~ msgid "Invoice Corrected"
+#~ msgstr "Factura corregida"
+
+#~ msgid "Customer Ref"
+#~ msgstr "Ref. Cliente"
+
+#, python-format
+#~ msgid "You must first cancel all packing attached to this sale order."
+#~ msgstr ""
+#~ "Debe primero cancelar todos los packings asociados a este pedido de venta."
+
+#~ msgid "Payment Accounts"
+#~ msgstr "Cuentas de pago"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sale form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "¡Debe seleccionar un cliente en el formulario de venta!\n"
+#~ "Por favor, seleccione un cliente antes de elegir un producto."
+
+#~ 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 ""
+#~ "La política de envío se utiliza para sincronizar la factura y las "
+#~ "operaciones de envío.\n"
+#~ "  - La opción 'Pago antes del envío' primero genera la factura y luego "
+#~ "genera el remito después del pago de esta factura.\n"
+#~ "  - La opción 'Envío '& Factura manual' creará el remito directamente y "
+#~ "esperará a que el usuario haga clic manualmente en el botón 'Factura' para "
+#~ "generar la factura borrador.\n"
+#~ "  - La opción 'Factura según pedido después envío' generará la factura "
+#~ "borrador basada en el pedido de venta después de que todos los remitos se "
+#~ "hayan procesado.\n"
+#~ "  - La opción 'Factura desde packing' se utiliza para crear una factura "
+#~ "durante el proceso de packing."
+
+#, python-format
+#~ msgid "You cannot cancel a sale order line that has already been invoiced !"
+#~ msgstr ""
+#~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Entrega parcial"
+
+#~ msgid "Recreate Procurement"
+#~ msgstr "Re-generar abastecimiento"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#~ msgid "Steps To Deliver a Sale Order"
+#~ msgstr "Pasos para entregar una orden de venta"
+
+#~ msgid "You invoice has been successfully created !"
+#~ msgstr "¡Su factura ha sido creada satisfactoriamente!"
+
+#~ msgid ""
+#~ "This is the list of picking list that have been generated for this invoice"
+#~ msgstr "Ésta es la lista de empaque que se ha generado para esta factura"
+
+#~ msgid ""
+#~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
+#~ "is, quotation is moved to  sale order."
+#~ msgstr ""
+#~ "Cuando presiona el botón Confirmar, el estado Borrador cambia a Manual. es "
+#~ "decir, la cotización cambia a orden de venta."
+
+#~ msgid "Procurement is created after confirmation of sale order."
+#~ msgstr "El abastecimiento es creado después de confirmar una orden de venta."
+
+#~ msgid "Complete Delivery"
+#~ msgstr "Entrega completa"
+
+#~ msgid "Packing"
+#~ msgstr "Remito"
+
+#~ msgid "Invoice on Order After Delivery"
+#~ msgstr "Facturar orden después de la entrega"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Related Packing"
+#~ msgstr "Remito relacionado"
+
+#~ msgid "Packing Default Policy"
+#~ msgstr "Política de entrega predeterminada"
+
+#~ msgid "Manages the delivery and invoicing progress"
+#~ msgstr "Gestiona el progreso de entrega y facturación"
+
+#~ msgid "Order Ref"
+#~ msgstr "Ref. Orden"
+
+#~ msgid ""
+#~ "This Configuration step use to set default picking policy when make sale "
+#~ "order"
+#~ msgstr ""
+#~ "Este paso en la configuración fija la política predeterminada de entrega "
+#~ "cuando se crea una orden de venta"
+
+#~ msgid "Packing Policy"
+#~ msgstr "Política de envío"
+
+#~ msgid ""
+#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
+#~ "the sale order. This transaction moves the sale order to invoices."
+#~ msgstr ""
+#~ "Se crea la factura al presionar 'Crear factura' después de haber confirmado "
+#~ "la orden de venta. Esta transacción convierte la orden de venta a facturas."
+
+#~ msgid ""
+#~ "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 packing 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 'Date Ordered'."
+#~ msgstr ""
+#~ "Indica el estado de la cotización u orden de venta. El estado de excepción "
+#~ "se establece automáticamente cuando se produce una cancelación en la "
+#~ "validación de la factura (Excepción de factura) o en la preparación del "
+#~ "remito (Excepción de envío). El estado 'Esperando programación' se establece "
+#~ "cuando se confirma la factura pero se espera a que el planificador procese "
+#~ "el pedido en la fecha 'Fecha del pedido'."
+
+#~ msgid ""
+#~ "Confirming the packing list moves them to delivery order. This can be done "
+#~ "by clicking on 'Validate' button."
+#~ msgstr ""
+#~ "Al confirmar la lista de empaque se convierte en una orden de entrega "
+#~ "(remito). Esto se puede realizar haciendo clic en el botón 'Validar'."
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Packing List & Delivery Order"
+#~ msgstr "Lista de empaque & Orden de entrega"
+
+#~ msgid "Invoice based on packing lists"
+#~ msgstr "Factura basada en listas de empaque"
+
+#~ msgid "Quotation (A sale order in draft state)"
+#~ msgstr "Cotización (Orden de venta en borrador)"
+
+#~ msgid "Invoice from the Packing"
+#~ msgstr "Factura desde remito"
+
+#~ msgid ""
+#~ "The name and address of the contact that requested the order or quotation."
+#~ msgstr ""
+#~ "El nombre y la dirección del contacto que solicita la orden o cotización."
+
+#~ msgid "New Quotation"
+#~ msgstr "Nueva Cotización"
+
+#~ msgid ""
+#~ "By default, Open ERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Por omisión, OpenERP puede gestionar rutas complejas y rutas de productos en "
+#~ "su almacén y en las ubicaciones de empresas. Ésto configurará los métodos "
+#~ "más comunes y sencillos para entregar productos al cliente en una o dos "
+#~ "operaciones hechas por el trabajador."
+
+#~ msgid "Configure Picking Policy for Sale Order"
+#~ msgstr "Configurar política de empaque para la orden de venta"
+
+#~ msgid "After confirming order, Create the invoice."
+#~ msgstr "Después de confirmar la orden, crear la factura."
diff --git a/addons/sale_stock/i18n/es_CL.po b/addons/sale_stock/i18n/es_CL.po
new file mode 100644
index 00000000000..ef73d4445ad
--- /dev/null
+++ b/addons/sale_stock/i18n/es_CL.po
@@ -0,0 +1,2956 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-02-21 07:26+0000\n"
+"Last-Translator: felipemolinam <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr "Ventas por vendedor en los últimos 90 días"
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Si no dispone de suficiente stock disponible para enviarlo todo a la vez, "
+"¿acepta envíos parciales?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Dirección de envío para la orden de venta actual"
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr "Cancelar pedido"
+
+#. module: sale
+#: code:addons/sale/sale.py:638
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Genera órdenes de abastecimiento para cada línea de orden de venta."
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"Here is a list of each sales order line to be invoiced. You can invoice "
+"sales orders partially, by lines of sales order. You do not need this list "
+"if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+"Esta es una lista de todas las líneas de pedidos de venta a facturar. Puede "
+"facturar pedidos de venta parcialmente, por líneas de pedido. No necesita "
+"esta lista si factura desde despachos de salida o si factura pedidos de "
+"venta completos."
+
+#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Orden de abastecimiento"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Línea del pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"Sales Orders help you manage quotations and orders from your customers. "
+"OpenERP suggests that you start by creating a quotation. Once it is "
+"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+"handle several types of products so that a sales order may trigger tasks, "
+"delivery orders, manufacturing orders, purchases and so on. Based on the "
+"configuration of the sales order, a draft invoice will be generated so that "
+"you just have to confirm it when you want to bill your customer."
+msgstr ""
+"Los pedidos de ventas le ayudan a gestionar presupuestos y pedidos de sus "
+"clientes. OpenERP sugiere que comience por crear un presupuesto. Una vez "
+"esté confirmado, el presupuesto se convertirá en un pedido de venta. OpenERP "
+"puede gestionar varios tipos de productos de forma que un pedido de venta "
+"puede generar tareas, órdenes de entrega, órdenes de fabricación, compras, "
+"etc. Según la configuración del pedido de venta, se generará una factura en "
+"borrador de manera que sólo hay que confirmarla cuando se quiera facturar a "
+"su cliente."
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"El pedido de venta creará automáticamente la proposición de la factura "
+"(factura borrador). Las cantidades pedidas y entregadas pueden no ser las "
+"mismas. Debe elegir si desea que su factura se base en las cantidades "
+"pedidas o entregadas. Si el producto es un servicio, las cantidades enviadas "
+"son las horas dedicadas a las tareas asociadas."
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Plazo de pago por defecto"
+
+#. module: sale
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr "Estado"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades ordenadas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr "Ventas por Vendedor"
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Movimientos de inventario"
+
+#. module: sale
+#: field:sale.order,name:0 field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia de pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Otra información"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"La factura se crea de forma automática si la política de facturación es "
+"\"Facturar desde bodega\" o \"Facturar pedido después del envío\"."
+
+#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr "Presupuestos y pedidos"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Realizar facturas de Venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr "Tablero responsable ventas"
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Empaquetado"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Desde Orden de Venta"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre tienda"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+"  - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: sale
+#: code:addons/sale/sale.py:1034
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+"¡No hay ninguna cuenta de categoría de ingresos definida en las propiedades "
+"por defecto de la categoría del producto o la posición fiscal no está "
+"definida!"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Está intentando asignar un lote que no es del mismo producto"
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "Modo no válido para test_state"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale
+#: code:addons/sale/sale.py:617
+#, python-format
+msgid "Could not cancel this sales order !"
+msgstr "¡No es posible cancelar esta orden de venta!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadísticas pedidos de venta"
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "La cuenta analítica relacionada con un pedido de venta."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0 view:sale.order:0 view:sale.report:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa para Orden de Venta actual"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Número de días entre la confirmación del pedido y el envío de los productos "
+"al cliente."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Número paquetes"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"El vendedor confirma el presupuesto. El estado del pedido de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
+
+#. module: sale
+#: code:addons/sale/sale.py:1074
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1079
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Debe cancelar primero los movimientos de stock asociados a esta línea de "
+"pedido de venta."
+
+#. module: sale
+#: code:addons/sale/sale.py:1147
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+"Seleccione un producto del tipo de servicio que se llama 'Producto "
+"avanzado'. Puede que tenga que crearlo y configurarlo como un valor por "
+"defecto para este campo."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                              "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+"No puede realizar un anticipo de un pedido de venta que está definido como "
+"'Factura automática después envío'."
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Dirección de facturación para el pedido de venta actual."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Despachar cada producto cuando se encuentre disponible"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Orden de entrega"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha confirmación"
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicación empresa"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr "Basado en pedidos de venta"
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "El importe total."
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Dirección de factura :"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Para cada línea de pedido de venta, se crea una orden de abastecimiento para "
+"suministrar el producto vendido."
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm, que significa 'Términos de Comercio Internacional', implica una "
+"serie de condiciones de venta que se utilizan en la transacción comercial."
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección factura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Presupuesto / Pedido"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
+msgstr "Abrir facturas de Ventas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Pedido Nº"
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas del pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr "Líneas a facturar"
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "Cantidad (UdM)"
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mis ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Nº de ctdad"
+
+#. module: sale
+#: code:addons/sale/sale.py:1327
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr "Todos los presupuestos"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"Tiene que seleccionar una lista de precios o un cliente en el formulario del "
+"pedido."
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoría de producto"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
+
+#. module: sale
+#: field:sale.order,state:0 field:sale.report,state:0
+msgid "Order State"
+msgstr "Estado del pedido"
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr "Ventas por mes"
+
+#. module: sale
+#: code:addons/sale/sale.py:1078
+#, python-format
+msgid "Could not cancel sales order line!"
+msgstr "¡No se puede cancelar línea pedido de venta!"
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Días seguridad"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Abastecimiento de material vendido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Create Final Invoice"
+msgstr "Crear factura final"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Dirección de envío"
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Indica que el pedido de venta ha sido entregado. Este campo se actualiza "
+"sólo después que el planificador(es) se ha ejecutado."
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"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). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1272
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr "Facturar desde orden, después de despachar"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Esta es la lista de facturas que han sido generadas para este pedido de "
+"venta. El mismo pedido de venta puede haber sido facturado varias veces "
+"(línea a línea, por ejemplo)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr ""
+"El nombre y la dirección del contacto que ha solicitado el pedido o "
+"presupuesto."
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Estos días por razones de seguridad se añaden a los que promete a los "
+"clientes."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Ctdad"
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Mis lineas de pedidos de venta"
+
+#. 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
+#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
+#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0 view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr "Total sin impuestos"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "¡La factura ha sido creada correctamente!"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr "Ventas por empresa"
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr "Contacto que realiza el pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr "Abrir factura"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forzar asignación"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "bajo pedido"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basado en las cantidades enviadas o ordenadas."
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Despachar todos los productos juntos"
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Guía de despacho relacionada"
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr "Ventas por cliente últimos 90 días"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estado borrador del pedido de venta"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Crear orden de entrega"
+
+#. module: sale
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total impuestos incluidos"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Crear guía de despacho"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Fecha de pedido de la orden de venta"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Ventas por categoría de producto"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar presupuesto"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Volver a Crear factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr "Guías de despacho a facturar"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando fecha planificada"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método abastecimiento"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr "Guía de despacho"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Documento del movimiento a la salida o al cliente."
+
+#. module: sale
+#: model:email.template,body:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+"       | Order number: *${object.name}*\n"
+"       | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Order date: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       | Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr "Confirmar pedido"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Crear orden abastecimiento"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Pedidos preparados para ser facturados"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Fecha en que se crea el pedido de venta."
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de stock"
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr "Pedidos de venta creados en el mes actual"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Importe avanzado"
+
+#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Cantidades enviadas"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr "Factura basada en pedidos de venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr "LIsta de guías de despacho"
+
+#. module: sale
+#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
+#: code:addons/sale/sale.py:1033
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "¡No se puede cancelar el pedido de venta!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: sale
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: sale
+#: code:addons/sale/sale.py:1156
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contable."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference UoM"
+msgstr "Referencia UdM"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Venta Línea_pedido Realizar_factura"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera abastecimiento y facturación"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análisis de ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:1151
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Regenerar guía de despacho"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El vendedor crea una factura manualmente si la política de facturación del "
+"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
+"automática si la política de facturación es 'Pago antes del envío'."
+
+#. module: sale
+#: help:sale.config.picking_policy,order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Puede generar facturas basadas en pedidos de venta o basadas en envíos."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0 view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: sale
+#: selection:sale.order,state:0 view:sale.order.line:0
+#: selection:sale.order.line,state:0 selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid ""
+"You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+"¡Debe seleccionar un cliente en el formulario de ventas!\n"
+"Introduzca un cliente antes de seleccionar un producto."
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Para hacer"
+
+#. module: sale
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr "Política de envío"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documento del movimiento al cliente."
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "El importe sin impuestos."
+
+#. module: sale
+#: code:addons/sale/sale.py:604
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Debe primero cancelar todas las guías de despacho relacionadas con este "
+"pedido de venta."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Ventas. Anticipo pago factura"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0 field:sale.order.line,product_id:0
+#: view:sale.report:0 field:sale.report,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Cancelar asignación"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr "sale.config.picking_policy"
+
+#. module: sale
+#: view:account.invoice.report:0 view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar las"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha Pedido"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Product UoM"
+msgstr "UdM del producto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Logistic"
+msgstr "Logística"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pedido"
+
+#. module: sale
+#: code:addons/sale/sale.py:1017
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función del control de facturación de los pedidos de venta, la factura "
+"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
+"pedido de venta puede generar una factura o una guía de despacho tan pronto "
+"como sea confirmado por el vendedor."
+
+#. module: sale
+#: code:addons/sale/sale.py:1251
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"¡Prevé vender %.2f %s pero sólo %.2f %s están disponibles!\n"
+"El stock real es %.2f %s. (sin reservas)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "States"
+msgstr "Estados"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencia cliente"
+
+#. module: sale
+#: field:sale.order,amount_total:0 view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: report:sale.order:0 view:sale.order.line:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Dependiendo de la configuración de la ubicación de salida, el movimiento "
+"entre la zona de salida y el cliente se realiza a través de la orden de "
+"entrega de forma manual o automática."
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr "Pago antes de envío"
+
+#. module: sale
+#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr "Tablero de ventas"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr "Realizar facturas"
+
+#. module: sale
+#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Para facturar"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Fecha en la que se confirma el pedido de venta."
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
+#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "El importe a facturar por adelantado."
+
+#. module: sale
+#: code:addons/sale/sale.py:1269
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr ""
+"Esta es la lista de guías de despacho que han sido generados para este "
+"pedido de venta."
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. 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
+#: view:sale.report:0 field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Fecha confirmación"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr "Ventas por mes"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"La guía de despacho se crea tan pronto como se confirma el pedido de venta, "
+"a la vez que la orden de abastecimiento. Representa la asignación de los "
+"componentes del pedido de venta. Hay una guía de despacho por línea del "
+"pedido de venta que evoluciona con la disponibilidad de los componentes."
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr "Ventas por categoría de producto últimos 90 días"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas pedido de ventas"
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Tiempo inicial entrega"
+
+#. module: sale
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current year"
+msgstr "Pedidos de venta creados en el año actual"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"No se puede crear la factura a partir de esta línea de pedido de venta por "
+"las siguientes razones:\n"
+"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
+"\"cancelada\".\n"
+"2. La línea del pedido de venta está facturada."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Se crea automáticamente una orden de abastecimiento tan pronto como se "
+"confirma un pedido de venta o se paga la factura. Provoca la compra y la "
+"producción de productos según las reglas y los parámetros del pedido de "
+"venta. "
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
+
+#. module: sale
+#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
+#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
+#: view:sale.report:0 field:sale.report,user_id:0
+msgid "Salesman"
+msgstr "Vendedor"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Presupuestos antiguos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0 view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanzar factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:624
+#, python-format
+msgid "The sales order '%s' has been cancelled."
+msgstr "El pedido de venta '%s' ha sido cancelado."
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+"* El estado 'Borrador' se establece cuando se crea el pedido de venta.\n"
+"* El estado 'Confirmado' se establece cuando se confirma el pedido de "
+"venta.\n"
+"* El estado 'Excepción' se establece cuando el pedido de venta tiene una "
+"excepción.\n"
+"* El estado 'Realizado' se establece cuando las líneas del pedido de venta "
+"se han enviado.\n"
+"* El estado 'Cancelado' se establece cuando un usuario cancela el pedido de "
+"venta."
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "El importe de los impuestos."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Packings"
+msgstr "Guías de despacho"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr "Pedidos de venta creados en el último mes"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de ventas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tiendas de venta"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Producto avanzado"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: sale
+#: code:addons/sale/sale.py:618
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
+msgstr ""
+"Primero debe cancelar todas las facturas relacionadas con este pedido de "
+"venta."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Pedidos de ventas en proceso"
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referencia del documento que ha generado esta solicitud de pedido de venta."
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Retraso realización"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr "Despacho y facturación parcial"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Una orden de abastecimiento para cada línea del pedido de venta y para cada "
+"uno de los componentes."
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr "Asignar"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Pedido de venta confirmado a factura."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Pedidos de venta sin confirmar"
+
+#. module: sale
+#: code:addons/sale/sale.py:322
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
+msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: sale
+#: code:addons/sale/sale.py:1261
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Entregado"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Debe asignar un lote de producción para este producto"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"If you have more than one shop reselling your company products, you can "
+"create and manage that from here. Whenever you will record a new quotation "
+"or sales order, it has to be linked to a shop. The shop also defines the "
+"warehouse from which the products will be delivered for each particular "
+"sales."
+msgstr ""
+"Si tiene más de una tienda donde vende los productos de su compañía, puede "
+"crearlas y gestionarlas desde aquí. Cada vez que codifique un nuevo "
+"presupuesto o pedido de venta, debe estar vinculado a una tienda. La tienda "
+"también define desde que almacén serán entregados los productos para cada "
+"venta."
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Indica que una factura ha sido pagada."
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Anticipo"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Buscar pedido de venta"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Solicitud pedido de venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:1255
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Este informe realiza un análisis de sus presupuestos y pedidos de venta. El "
+"análisis verifica los ingresos de sus ventas y los ordena por diferentes "
+"grupos de criterios (comercial, empresa, producto, etc.). Utilice este "
+"informe para realizar un análisis sobre sus ventas todavía no facturadas. Si "
+"desea analizar sus ingresos, debería utilizar el informe de análisis de "
+"facturas en la aplicación de Contabilidad."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "Presupuesto Nº"
+
+#. module: sale
+#: field:sale.order,picked_rate:0 view:sale.report:0
+msgid "Picked"
+msgstr "Enviada"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr "Facturar desde guías de despacho"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Le permite calcular los costos de envío en sus presupuestos."
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Configurar logística pedidos de venta"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Pago antes del envío"
+
+#~ msgid "VAT"
+#~ msgstr "IVA"
+
+#~ msgid "All at Once"
+#~ msgstr "Todo a la vez"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Configurar la política envío para pedidos de venta"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Política de envío por defecto"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Sólo orden de entrega"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "Optimizar su aplicación de ventas con funcionalidades adicionales."
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "¡La referencia del pedido debe ser única!"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Configurar su flujo de ventas y valores por defecto."
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Facturar pedido después de envío"
+
+#~ msgid "  Year  "
+#~ msgstr "  Año  "
+
+#~ msgid "Do you really want to create the invoice(s) ?"
+#~ msgstr "¿Desea crear la(s) factura(s)?"
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Política de empaquetado por defecto"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Fechas en pedidos de venta"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Márgenes en pedidos de venta"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Configuración aplicaciones de ventas"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Costes de envío"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Envío parcial"
+
+#~ msgid "title"
+#~ msgstr "título"
+
+#~ msgid "Order date"
+#~ msgstr "Fecha pedido"
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Política de facturación"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Enviar & Factura manual"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "¡Información albarán!"
+
+#~ msgid "Sales Management"
+#~ msgstr "Ventas"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Factura desde el albarán"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Por defecto, OpenERP es capaz de gestionar complejas rutas y caminos de los "
+#~ "productos en su almacén y en las ubicaciones de otras empresas. Esto "
+#~ "configurará los métodos más comunes y sencillos para entregar los productos "
+#~ "al cliente en una o dos operaciones realizadas por el trabajador."
+
+#~ msgid "sale.installer"
+#~ msgstr "venta.instalador"
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturación"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Indica el margen de rentabilidad mediante el cálculo de la diferencia entre "
+#~ "el precio unitario y el precio de coste."
+
+#~ msgid "   Month   "
+#~ msgstr "   Mes   "
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Ha seleccionado una cantidad de %d unidades.\n"
+#~ "Pero no es compatible con el embalaje seleccionado.\n"
+#~ "Aquí tiene una propuesta de cantidades acordes con este embalaje:\n"
+#~ "\n"
+#~ "EAN: %s Cantidad: %s Tipo de ul: %s"
+
+#~ msgid "Complete Delivery"
+#~ msgstr "Envío completo"
+
+#~ msgid "    Month-1    "
+#~ msgstr "    Mes-1    "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "La política de envío se utiliza para configurar el pedido si debe entregarse "
+#~ "tan pronto como sea posible cuando un producto está disponible o debe "
+#~ "esperar a que todos los productos están disponibles."
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Progreso configuración"
+
+#~ msgid "Product sales"
+#~ msgstr "Ventas de producto"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Fecha ordenada"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Envío directo"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Diarios de facturación"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Ctdad enviada"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Configurar su aplicación de gestión de ventas"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Mejora plantilla pedido de venta"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "¡No se puede eliminar pedido(s) de venta que ya está confirmado!"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "¡No hay stock suficiente!"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Secuencia plantilla"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Añade fechas de realización, solicitud y efectivo en pedidos de venta."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Permite agrupar y facturar sus albaranes de acuerdo a diferentes tipos de "
+#~ "facturación: diaria, semanal, etc."
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Pasos para entregar un pedido de venta"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Proporciona algunas funcionalidades para mejorar la plantilla de los "
+#~ "informes de pedidos de ventas."
+
+#~ msgid "Configure Sale Order Logistic"
+#~ msgstr "Configurar la logística de los pedidos de venta"
+
+#~ msgid "Recreate Procurement"
+#~ msgstr "Recrear abastecimiento"
+
+#~ msgid "Steps To Deliver a Sale Order"
+#~ msgstr "Pasos para entregar un pedido de venta"
+
+#~ msgid "You invoice has been successfully created !"
+#~ msgstr "¡Su factura ha sido creada correctamente!"
+
+#~ msgid "Automatic Declaration"
+#~ msgstr "Declaración automática"
+
+#~ msgid ""
+#~ "This is the list of picking list that have been generated for this invoice"
+#~ msgstr "Ésta es la lista de albaranes que se han generado para esta factura"
+
+#~ msgid "Delivery, from the warehouse to the customer."
+#~ msgstr "Entrega, desde el almacén hasta el cliente."
+
+#~ msgid "After confirming order, Create the invoice."
+#~ msgstr "Después de confirmar el pedido, crear la factura."
+
+#~ msgid ""
+#~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
+#~ "is, quotation is moved to  sale order."
+#~ msgstr ""
+#~ "Cuando presiona el botón Confirmar, el estado Borrador cambia a Manual. es "
+#~ "decir, el presupuesto cambia a pedido de venta."
+
+#~ msgid "Manual Designation"
+#~ msgstr "Designación manual"
+
+#~ msgid "Invoice after delivery"
+#~ msgstr "Facturar después del envío"
+
+#~ msgid "Origin"
+#~ msgstr "Origen"
+
+#~ msgid "Outgoing Products"
+#~ msgstr "Productos salientes"
+
+#~ msgid "Reference"
+#~ msgstr "Referencia"
+
+#~ msgid "Procurement is created after confirmation of sale order."
+#~ msgstr "El abastecimiento es creado después de confirmar un pedido de venta."
+
+#~ msgid "Procure Method"
+#~ msgstr "Método abastecimiento"
+
+#~ msgid "Net Price"
+#~ msgstr "Precio neto"
+
+#~ msgid "My sales order in progress"
+#~ msgstr "Mis pedidos de ventas en proceso"
+
+#~ msgid ""
+#~ "The sale order will automatically create the invoice proposition (draft "
+#~ "invoice). Ordered and delivered quantities may not be the same. You have to "
+#~ "choose if you invoice based on ordered or shipped quantities. If the product "
+#~ "is a service, shipped quantities means hours spent on the associated tasks."
+#~ msgstr ""
+#~ "El pedido de venta creará automáticamente la propuesta de factura (factura "
+#~ "borrador). Las cantidades pedidas y las cantidades enviadas pueden no ser "
+#~ "las mismas. Tiene que decidir si factura basado en cantidades pedidas o "
+#~ "enviadas. Si el producto es un servicio, cantidades enviadas significa horas "
+#~ "dedicadas a las tareas asociadas."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sale order that is defined as 'Automatic "
+#~ "Invoice after delivery'."
+#~ msgstr ""
+#~ "No puede hacer un anticipo en un pedido de venta definido como 'Factura "
+#~ "automática después del envío'."
+
+#~ msgid "All Sales Order"
+#~ msgstr "Todos los pedidos de ventas"
+
+#~ msgid "Sale Shop"
+#~ msgstr "Tienda de ventas"
+
+#~ 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 ""
+#~ "Se crea un albarán cuando presione 'Asigna' después de haber confirmado el "
+#~ "pedido de venta. Esta transacción convierte el pedido de venta a albarán."
+
+#~ msgid "My sales order waiting Invoice"
+#~ msgstr "Mis pedidos de ventas esperarando facturación"
+
+#~ msgid ""
+#~ "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
+#~ "will automatic create after delivery."
+#~ msgstr ""
+#~ "Cuando selecciona una política de envío = 'Factura automática después del "
+#~ "envío', la creará automáticamente después del envío."
+
+#~ msgid "Manual Description"
+#~ msgstr "Descripción manual"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sale order."
+#~ msgstr ""
+#~ "Primero debe cancelar todas las facturas asociadas a este pedido de venta."
+
+#~ msgid "Sale Order Procurement"
+#~ msgstr "Abastecimiento pedido de venta"
+
+#~ msgid "Packing"
+#~ msgstr "Empaquetado/Albarán"
+
+#~ msgid "Invoice on Order After Delivery"
+#~ msgstr "Facturar pedido después del envío"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
+
+#~ msgid "Sales orders"
+#~ msgstr "Pedidos de ventas"
+
+#~ msgid "Payment accounts"
+#~ msgstr "Cuentas de pago"
+
+#~ msgid "Draft Invoice"
+#~ msgstr "Factura borrador"
+
+#~ msgid "Draft customer invoice, to be reviewed by accountant."
+#~ msgstr "Factura de cliente borrador, para ser revisada por un contable."
+
+#~ msgid "Sales Order To Be Invoiced"
+#~ msgstr "Pedidos de ventas a facturar"
+
+#~ msgid "Procurement for each line"
+#~ msgstr "Abastecimiento para cada línea"
+
+#~ msgid "Manages the delivery and invoicing progress"
+#~ msgstr "Gestiona el progreso de envío y facturación"
+
+#, python-format
+#~ msgid "Could not cancel sale order !"
+#~ msgstr "¡No puede cancelar el pedido de venta!"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelado"
+
+#~ msgid "Order Ref"
+#~ msgstr "Ref. pedido"
+
+#~ msgid ""
+#~ "In sale order , procuerement for each line and it comes into the procurement "
+#~ "order"
+#~ msgstr ""
+#~ "En un pedido de venta, abastecer para cada línea y se convierte en la orden "
+#~ "de abastecimiento"
+
+#~ msgid "Uninvoiced Lines"
+#~ msgstr "Líneas no facturadas"
+
+#~ msgid "Sales Process"
+#~ msgstr "Proceso de ventas"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+#~ "categoría."
+
+#~ msgid "My sales in shipping exception"
+#~ msgstr "Mis ventas en excepción de envío"
+
+#~ msgid "Sales Configuration"
+#~ msgstr "Configuración de ventas"
+
+#~ msgid "Procurement Corrected"
+#~ msgstr "Abastecimiento corregido"
+
+#~ msgid "Sale Procurement"
+#~ msgstr "Abastecimiento de venta"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Our Salesman"
+#~ msgstr "Nuestro comercial"
+
+#~ msgid "Create Advance Invoice"
+#~ msgstr "Crear anticipo factura"
+
+#~ msgid "One procurement for each product."
+#~ msgstr "Un abastecimiento por cada producto."
+
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venta"
+
+#~ msgid "Sale Pricelists"
+#~ msgstr "Tarifas de venta"
+
+#~ msgid ""
+#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
+#~ "the sale order. This transaction moves the sale order to invoices."
+#~ msgstr ""
+#~ "Se crea la factura cuando presione 'Crear factura' después de haber "
+#~ "confirmado el pedido de venta. Esta transacción convierte el pedido de venta "
+#~ "a facturas."
+
+#~ msgid "Make Invoice"
+#~ msgstr "Crear factura"
+
+#~ msgid "Sales order lines"
+#~ msgstr "Líneas del pedido de ventas"
+
+#~ msgid "Sequence"
+#~ msgstr "Secuencia"
+
+#~ msgid "Packing OUT is created for stockable products."
+#~ msgstr "Se crea un albarán de salida OUT para productos almacenables."
+
+#~ msgid "Other data"
+#~ msgstr "Otros datos"
+
+#~ msgid ""
+#~ "Confirming the packing list moves them to delivery order. This can be done "
+#~ "by clicking on 'Validate' button."
+#~ msgstr ""
+#~ "Al confirmar el albarán se convierte en una orden de entrega. Esto se puede "
+#~ "realizar haciendo clic en el botón 'Validar'."
+
+#~ msgid "Advance Payment"
+#~ msgstr "Pago anticipado"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Confirm sale order and Create invoice."
+#~ msgstr "Confirmar pedido de venta y crear factura."
+
+#~ msgid "Packing List & Delivery Order"
+#~ msgstr "Albarán & Orden de entrega"
+
+#~ msgid "Sale Order Lines"
+#~ msgstr "Líneas del pedido de venta"
+
+#~ msgid "Do you really want to create the invoices ?"
+#~ msgstr "¿Realmente desea crear las facturas?"
+
+#~ msgid "Invoice based on packing lists"
+#~ msgstr "Factura basada en albaranes"
+
+#~ msgid "Set Default"
+#~ msgstr "Establecer por defecto"
+
+#~ msgid "Sales order"
+#~ msgstr "Pedido de venta"
+
+#~ msgid "Quotation (A sale order in draft state)"
+#~ msgstr "Presupuesto (un pedido de venta en estado borrador)"
+
+#~ msgid "Sale Invoice"
+#~ msgstr "Factura de venta"
+
+#~ msgid "Open Advance Invoice"
+#~ msgstr "Abrir anticipo factura"
+
+#~ msgid "Deliver"
+#~ msgstr "Enviar"
+
+#, python-format
+#~ msgid "Could not cancel this sale order !"
+#~ msgstr "¡No se puede cancelar este pedido de venta!"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Línea pedido de venta"
+
+#~ msgid "Make invoices"
+#~ msgstr "Realizar facturas"
+
+#~ msgid ""
+#~ "The name and address of the contact that requested the order or quotation."
+#~ msgstr ""
+#~ "El nombre y la dirección del contacto que solicita el pedido o presupuesto."
+
+#~ msgid "Purchase Pricelists"
+#~ msgstr "Tarifas de compra"
+
+#, python-format
+#~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
+#~ msgstr ""
+#~ "¡No se puede eliminar pedido(s) de venta que ya está(n) confirmado(s)!"
+
+#~ msgid "New Quotation"
+#~ msgstr "Nuevo presupuesto"
+
+#~ msgid "Total amount"
+#~ msgstr "Importe total"
+
+#~ msgid "Configure Picking Policy for Sale Order"
+#~ msgstr "Configurar política de envío para el pedido de venta"
+
+#~ msgid "Payment Terms"
+#~ msgstr "Plazos de pago"
+
+#~ msgid "Invoice Corrected"
+#~ msgstr "Factura corregida"
+
+#~ msgid "Delivery Delay"
+#~ msgstr "Demora de entrega"
+
+#~ msgid "Related invoices"
+#~ msgstr "Facturas relacionadas"
+
+#~ msgid ""
+#~ "This is the list of invoices that have been generated for this sale order. "
+#~ "The same sale order may have been invoiced in several times (by line for "
+#~ "example)."
+#~ msgstr ""
+#~ "Ésta es la lista de facturas que se han generado para este pedido de venta. "
+#~ "El mismo pedido puede haberse facturado varias veces (por ejemplo por cada "
+#~ "línea)."
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid "My Sales Order"
+#~ msgstr "Mis pedidos de ventas"
+
+#~ msgid "Sale Order line"
+#~ msgstr "Línea pedido de venta"
+
+#~ msgid "Packing Default Policy"
+#~ msgstr "Forma de envío por defecto"
+
+#~ msgid "Packing Policy"
+#~ msgstr "Forma de envío"
+
+#~ msgid "Payment Accounts"
+#~ msgstr "Cuentas de pago"
+
+#~ msgid "Related Packing"
+#~ msgstr "Albarán relacionado"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#, python-format
+#~ msgid "You cannot cancel a sale order line that has already been invoiced !"
+#~ msgstr ""
+#~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
+
+#, python-format
+#~ msgid "You must first cancel all packing attached to this sale order."
+#~ msgstr ""
+#~ "Debe primero cancelar todos los albaranes asociados a este pedido de venta."
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sale form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "¡Debe seleccionar un cliente en el formulario de venta!\n"
+#~ "Por favor, seleccione un cliente antes de elegir un producto."
+
+#~ msgid "Invoice from the Packing"
+#~ msgstr "Facturar desde el albarán"
+
+#~ msgid "Customer Ref"
+#~ msgstr "Ref. cliente"
+
+#~ msgid ""
+#~ "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 packing 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 'Date Ordered'."
+#~ msgstr ""
+#~ "Indica el estado del presupuesto o pedido de venta. El estado de excepción "
+#~ "se establece automáticamente cuando se produce una cancelación en la "
+#~ "validación de la factura (Excepción de factura) o en el procesado del "
+#~ "albarán (Excepción de envío). El estado 'Esperando planificación' se "
+#~ "establece cuando se confirma la factura pero se espera a que el planificador "
+#~ "procese el pedido en la fecha 'Fecha del pedido'."
+
+#~ msgid ""
+#~ "By default, Open ERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Por defecto, OpenERP puede gestionar rutas complejas y rutas de productos en "
+#~ "su almacén y en las ubicaciones de empresas. Esta opción le configurará los "
+#~ "métodos más comunes y sencillos para enviar productos al cliente en una o "
+#~ "dos operaciones hechas por el trabajador."
+
+#~ msgid ""
+#~ "This Configuration step use to set default picking policy when make sale "
+#~ "order"
+#~ msgstr ""
+#~ "Este paso fija la política de empaquetado por defecto cuando se crea un "
+#~ "pedido de venta"
+
+#~ 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 ""
+#~ "La política de facturación se utiliza para sincronizar la factura y las "
+#~ "operaciones de envío.\n"
+#~ "  - La opción 'Pago antes del envío' primero genera la factura y luego "
+#~ "genera el albarán después del pago de esta factura.\n"
+#~ "  - La opción 'Envío '& Factura manual' creará el albarán directamente y "
+#~ "esperará a que el usuario haga clic manualmente en el botón 'Factura' para "
+#~ "generar la factura borrador.\n"
+#~ "  - La opción 'Factura según pedido después envío' generará la factura "
+#~ "borrador basada en el pedido de venta después de que todos los albaranes se "
+#~ "hayan procesado.\n"
+#~ "  - La opción 'Factura desde albarán' se utiliza para crear una factura "
+#~ "durante el proceso de los albaranes."
+
+#~ msgid ""
+#~ "\n"
+#~ "    The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ "    * Workflow with validation steps:\n"
+#~ "        - Quotation -> Sales order -> Invoice\n"
+#~ "    * Invoicing methods:\n"
+#~ "        - Invoice on order (before or after shipping)\n"
+#~ "        - Invoice on delivery\n"
+#~ "        - Invoice on timesheets\n"
+#~ "        - Advance invoice\n"
+#~ "    * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ "    * Products stocks and prices\n"
+#~ "    * Delivery methods:\n"
+#~ "        - all at once, multi-parcel\n"
+#~ "        - delivery costs\n"
+#~ "    * Dashboard for salesman that includes:\n"
+#~ "    * Your open quotations\n"
+#~ "    * Top 10 sales of the month\n"
+#~ "    * Cases statistics\n"
+#~ "    * Graph of sales by product\n"
+#~ "    * Graph of cases of the month\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    El módulo base para gestionar presupuestos y pedidos de venta.\n"
+#~ "\n"
+#~ "    * Flujo de trabajo con etapas de validación:\n"
+#~ "        - Presupuesto -> Pedido de venta -> Factura\n"
+#~ "    * Métodos de facturación:\n"
+#~ "        - Factura del pedido (antes o después del envío)\n"
+#~ "        - Factura del albarán\n"
+#~ "        - Factura de la hoja de servicios\n"
+#~ "        - Avanzar factura\n"
+#~ "    * Preferencias de los clientes (envío, facturación, incoterm, ...)\n"
+#~ "    * Existencias de los productos y precios\n"
+#~ "    * Formas de envío:\n"
+#~ "        - Todo a la vez, En varios paquetes\n"
+#~ "        - Gastos de envío\n"
+#~ "    * El tablero para el comercial incluye:\n"
+#~ "    * Sus presupuestos abiertos\n"
+#~ "    * Las 10 mejores ventas del mes\n"
+#~ "    * Estadísticas de casos\n"
+#~ "    * Gráfico de las ventas por producto\n"
+#~ "    * Gráfico de los casos por mes\n"
+#~ "    "
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Guía de despacho y Orden de entrega"
diff --git a/addons/sale_stock/i18n/es_CR.po b/addons/sale_stock/i18n/es_CR.po
new file mode 100644
index 00000000000..c50f084e181
--- /dev/null
+++ b/addons/sale_stock/i18n/es_CR.po
@@ -0,0 +1,3114 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-02-21 05:48+0000\n"
+"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@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: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+"Language: \n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr "Basado en parte de horas"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+"Líneas de venta que se han confirmado, hecho o en el estado de excepción y "
+"aún no han sido facturados"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr "Ventas por comercial últimos 90 días"
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Si no dispone de suficientes existencias para enviarlo todo de una vez, "
+"¿acepta envíos parciales o no?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "UoS"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Dirección de envío para el pedido de venta actual."
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr "Cancelar pedido"
+
+#. module: sale
+#: code:addons/sale/sale.py:638
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Quotation"
+msgstr "Imprimir Cotización (cita o citación)"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta."
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"Here is a list of each sales order line to be invoiced. You can invoice "
+"sales orders partially, by lines of sales order. You do not need this list "
+"if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+"Esta es una lista de todas las líneas de pedidos de venta a facturar. Puede "
+"facturar pedidos de venta parcialmente, por líneas de pedido. No necesita "
+"esta lista si factura desde albaranes de salida o si factura pedidos de "
+"venta completos."
+
+#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+"Con el fin de eliminar una orden de venta confirmada, debe cancelar antes! "
+"Para cancelar una orden de venta, primero debe cancelar la recolección o la "
+"relacionada con las órdenes de entrega."
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Orden de abastecimiento"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Facturar desde albaranes"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Línea del pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"Sales Orders help you manage quotations and orders from your customers. "
+"OpenERP suggests that you start by creating a quotation. Once it is "
+"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+"handle several types of products so that a sales order may trigger tasks, "
+"delivery orders, manufacturing orders, purchases and so on. Based on the "
+"configuration of the sales order, a draft invoice will be generated so that "
+"you just have to confirm it when you want to bill your customer."
+msgstr ""
+"Los pedidos de ventas le ayudan a gestionar presupuestos y pedidos de sus "
+"clientes. OpenERP sugiere que comience por crear un presupuesto. Una vez "
+"esté confirmado, el presupuesto se convertirá en un pedido de venta. OpenERP "
+"puede gestionar varios tipos de productos de forma que un pedido de venta "
+"puede generar tareas, órdenes de entrega, órdenes de fabricación, compras, "
+"etc. Según la configuración del pedido de venta, se generará una factura en "
+"borrador de manera que sólo hay que confirmarla cuando se quiera facturar a "
+"su cliente."
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"El pedido de venta creará automáticamente la proposición de la factura "
+"(factura borrador). Las cantidades pedidas y entregadas pueden no ser las "
+"mismas. Debe elegir si desea que su factura se base en las cantidades "
+"pedidas o entregadas. Si el producto es un servicio, las cantidades enviadas "
+"son las horas dedicadas a las tareas asociadas."
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Plazo de pago por defecto"
+
+#. module: sale
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr "Basado en las ordenes de entrega"
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr "Trabajo principal de la unidad de tiempo"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr "Estado"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Mis ordenes de venta"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades pedidas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr "Ventas por comercial"
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Movimientos de inventario"
+
+#. module: sale
+#: field:sale.order,name:0 field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Otra información"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"La factura se crea de forma automática si la política de facturación es "
+"\"Facturar desde el albarán\" o \"Facturar pedido después del envío\"."
+
+#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr "Basado en tareas de trabajo"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr "Cotizaciones y Ventas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Ventas. Realizar factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "¡Advertencia Lista de precios!"
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr "Tablero responsable ventas"
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Empaquetado"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Desde un pedido de venta"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre tienda"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+"  - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+"La política de la factura se utiliza para sincronizar las operaciones de "
+"facturación y de entrega.\n"
+"   - El 'Pagar antes de la entrega \"primera opción va a generar la factura "
+"y luego generar la preparación de pedidos después del pago de esta factura.\n"
+"   - El 'Entregar factura y en la demanda \"va a crear la orden de recoger "
+"directamente y esperar a que el usuario haga clic manualmente sobre la' "
+"factura 'para generar la factura de proyecto basado en la orden de venta o "
+"de las líneas de pedido de venta.\n"
+"   - La factura de la orden después de la entrega \"elección va a generar la "
+"factura de proyecto basado en el orden de venta después de todas las listas "
+"de picking se han terminado.\n"
+"   - La factura de base de las entregas de la elección se utiliza para crear "
+"una factura durante la selección de proceso."
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr "¡Error de Configuración!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: sale
+#: code:addons/sale/sale.py:1034
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+"¡No hay ninguna cuenta de categoría de ingresos definida en las propiedades "
+"por defecto de la categoría del producto o la posición fiscal no está "
+"definida!"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Está intentando asignar un lote que no es del mismo producto"
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "Modo no válido para test_state"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale
+#: code:addons/sale/sale.py:617
+#, python-format
+msgid "Could not cancel this sales order !"
+msgstr "¡No se puede cancelar este pedido de venta!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadísticas pedidos de venta"
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "La cuenta analítica relacionada con un pedido de venta."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "¡La referencia debe ser única por compañía!"
+
+#. module: sale
+#: view:board.board:0 view:sale.order:0 view:sale.report:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa para el pedido de venta actual."
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Número de días entre la confirmación del pedido y el envío de los productos "
+"al cliente."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Número paquetes"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"El comercial confirma el presupuesto. El estado del pedido de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
+
+#. module: sale
+#: code:addons/sale/sale.py:1074
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+"¡No se puede cancelar una línea de orden de venta que ya ha sido facturado!"
+
+#. module: sale
+#: code:addons/sale/sale.py:1079
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Debe cancelar primero los movimientos de stock asociados a esta línea de "
+"pedido de venta."
+
+#. module: sale
+#: code:addons/sale/sale.py:1147
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+"Seleccione un producto del tipo de servicio que se llama 'Producto "
+"avanzado'. Puede que tenga que crearlo y configurarlo como un valor por "
+"defecto para este campo."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                              "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+"No puede realizar un anticipo de un pedido de venta que está definido como "
+"'Factura automática después envío'."
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "¡El nombre de la compañía debe ser único!"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Dirección de facturación para el pedido de venta actual."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Month-1"
+msgstr "Mes-1"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Meses Ordenados por orden de venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"No se puede tener las ventas del grupo de monedas diferentes para la misma "
+"pareja."
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Entregar cada producto cuando esté disponible"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Orden de entrega"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha confirmación"
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicación empresa"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr "No puede mover productos desde o hacia una ubicación de tipo vista."
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr "Basado en Ordenes de venta"
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "El importe total."
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Dirección de factura :"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr "Secuencia de linea"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Para cada línea de pedido de venta, se crea una orden de abastecimiento para "
+"suministrar el producto vendido."
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm, que significa 'Términos de Comercio Internacional', implica una "
+"serie de condiciones de venta que se utilizan en la transacción comercial."
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección de factura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Presupuesto / Pedido"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
+msgstr "Ventas. Abrir factura"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Pedido Nº"
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas del pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr "Líneas a facturar"
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "Cantidad (UdM)"
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mis ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Nº de ctdad"
+
+#. module: sale
+#: code:addons/sale/sale.py:1327
+#, python-format
+msgid "Hour"
+msgstr "Hora"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr "Todos los presupuestos"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr "Opciones"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "No se puede confirmar una orden de venta que no tiene ninguna línea."
+
+#. module: sale
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"¡Tienes que seleccionar una lista de precios o de un cliente en forma de "
+"ventas!\n"
+"Por favor, establece uno antes de elegir un producto."
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoría de producto"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
+
+#. module: sale
+#: field:sale.order,state:0 field:sale.report,state:0
+msgid "Order State"
+msgstr "Estado del pedido"
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr "Ventas por mes"
+
+#. module: sale
+#: code:addons/sale/sale.py:1078
+#, python-format
+msgid "Could not cancel sales order line!"
+msgstr "¡No se puede cancelar línea pedido de venta!"
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Días seguridad"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Abastecimiento de material vendido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Create Final Invoice"
+msgstr "Crear factura final"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Dirección de envío"
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Indica que el pedido de venta ha sido entregado. Este campo se actualiza "
+"sólo después que el planificador(es) se ha ejecutado."
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"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). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+"Da el estado de la oferta o la orden de venta.\n"
+"El estado de excepción se ajusta automáticamente cuando una operación de "
+"cancelación se produce en la validación de la factura (factura de excepción) "
+"o en el proceso de lista de picking (Excepción de envío).\n"
+"El estado de la \"Lista de espera\" se establece cuando la factura está "
+"confirmada, pero esperando que el planificador para ejecutarse en la fecha "
+"del pedido."
+
+#. module: sale
+#: code:addons/sale/sale.py:1272
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "¡No válida línea de la lista de precios encontrado! :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr "Factura en el orden después de la entrega"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Esta es la lista de facturas que han sido generadas para este pedido de "
+"venta. El mismo pedido de venta puede haber sido facturado varias veces "
+"(línea a línea, por ejemplo)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr ""
+"El nombre y la dirección del contacto que ha solicitado el pedido o "
+"presupuesto."
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Estos días por razones de seguridad se añaden a los que promete a los "
+"clientes."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Ctdad"
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Mis líneas de pedido de ventas"
+
+#. 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
+#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
+#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "¡La referencia de la compra debe ser única por compañía!"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0 view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr "Total sin impuestos"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Ordenes de referencia"
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "¡La factura ha sido creada correctamente!"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr "Ventas por empresa"
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr "Contacto del pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr "Abrir factura"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr "Correo electrónico automático confirmado de las órdenes de venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forzar asignación"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "bajo pedido"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basado en las cantidades enviadas o pedidas."
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Entrega de todos los productos a la vez"
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Albarán relacionado"
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr "Ventas por cliente últimos 90 días"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estado borrador del pedido de venta"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Crear orden de entrega"
+
+#. module: sale
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+"¡No se puede eliminar una línea de órdenes de venta que se encuentra en '% "
+"s' estado!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr "Qty(UoS)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total impuestos incluidos"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Crear albarán"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Ordenado de la fecha de la orden de venta"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Ventas por categoría de producto"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar presupuesto"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Volver a Crear factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr "Albaranes a facturar"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando fecha planificada"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método abastecimiento"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr "Albarán"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Documento del movimiento a la salida o al cliente."
+
+#. module: sale
+#: model:email.template,body:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+"       | Order number: *${object.name}*\n"
+"       | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Order date: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       | Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
+msgstr ""
+"\n"
+"Hola $ {object.partner_order_id.name y \"'o''} $ "
+"{object.partner_order_id.name o''},\n"
+"\n"
+"Aquí está la confirmación del pedido por $ {} object.partner_id.name:\n"
+"       | Número de orden: $ {*} * object.name\n"
+"       | Orden total: $ {*} $ {object.amount_total "
+"object.pricelist_id.currency_id.name} *\n"
+"       | Orden de la fecha: $ {} object.date_order\n"
+"       % Si object.origin:\n"
+"       | Orden de referencia: $ {} object.origin\n"
+"       % Endif\n"
+"       % Si object.client_order_ref:\n"
+"       | Su referencia: $ {} object.client_order_ref <br />\n"
+"       % Endif\n"
+"       | Su persona de contacto: $ {} $ {object.user_id.name "
+"object.user_id.user_email y '% <% s> \"(object.user_id.user_email) o''}\n"
+"\n"
+"Usted puede ver la confirmación del pedido, puede descargarlo e incluso "
+"pagar en línea usando el siguiente enlace:\n"
+"    $ {Ctx.get ('edi_web_url_view') o 'N / A'}\n"
+"\n"
+"% Si object.order_policy in ('prepago', 'manual') y "
+"object.company_id.paypal_account:\n"
+"<%\n"
+"comp_name = cotización (object.company_id.name)\n"
+"order_name = cotización (object.name)\n"
+"paypal_account = cotización (object.company_id.paypal_account)\n"
+"order_amount = cotización (str (object.amount_total))\n"
+"cur_name = cotización (object.pricelist_id.currency_id.name)\n"
+"paypal_url = \\\n"
+"             \"& Currency_code =% s + = button_subtype los servicios y "
+"no_note = 1 & bn =% s OpenERP_Order_PayNow_\" \\%\n"
+"             (Paypal_account, comp_name, order_name, order_name, "
+"order_amount, cur_name, cur_name)\n"
+"%>\n"
+"También es posible pagar directamente con PayPal:\n"
+"    $ {} Paypal_url\n"
+"% Endif\n"
+"\n"
+"Si usted tiene alguna pregunta, no dude en contactar con nosotros.\n"
+"\n"
+"\n"
+"Gracias por elegir $ {} object.company_id.name!\n"
+"\n"
+"\n"
+"-\n"
+"$ {} $ {Object.user_id.name '<% s> \"object.user_id.user_email y% "
+"(object.user_id.user_email) o''}\n"
+"$ {} Object.company_id.name\n"
+"% Si object.company_id.street:\n"
+"$ {Object.company_id.street o''}\n"
+"% Endif\n"
+"% Si object.company_id.street2:\n"
+"$ {} Object.company_id.street2\n"
+"% Endif\n"
+"% Si object.company_id.city o object.company_id.zip:\n"
+"$ {Object.company_id.zip o''} $ {object.company_id.city o''}\n"
+"% Endif\n"
+"% Si object.company_id.country_id:\n"
+"$ {Object.company_id.state_id y ('% s'% object.company_id.state_id.name) "
+"o''} $ {object.company_id.country_id.name o''}\n"
+"% Endif\n"
+"% Si object.company_id.phone:\n"
+"Teléfono: $ {} object.company_id.phone\n"
+"% Endif\n"
+"% Si object.company_id.website:\n"
+"$ {Object.company_id.website o''}\n"
+"% Endif\n"
+"            "
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr "Confirmar pedido"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Crear orden abastecimiento"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Órdenes de venta listos para ser facturado"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Fecha en la que se crea el pedido de venta."
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento stock"
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr "Orden de venta creadas en el mes actual"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+"Si \"el orden\", se dispara una contratación pública, cuando la orden de "
+"venta se confirma la creación de una tarea, la orden de compra u orden de "
+"fabricación vinculado a esta línea para la venta."
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Importe avanzado"
+
+#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr "¿Debo pagar la entrega?"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Cantidades enviadas"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr "Factura basada en pedidos de venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Si cambia la lista de precios de esta orden (y eventualmente la moneda), los "
+"precios de líneas de pedido existentes no será actualizado."
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: sale
+#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
+#: code:addons/sale/sale.py:1033
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "¡No se puede cancelar el pedido de venta!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr "Qty(UoM)"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Año Ordenado de la orden de venta"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: sale
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: sale
+#: code:addons/sale/sale.py:1156
+#, python-format
+msgid "Picking Information ! : "
+msgstr "¡Recogiendo la información! : "
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr "Política de factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr "Configure su sistema de facturación"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contable."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference UoM"
+msgstr "Referencia UdM"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+"Esta herramienta le ayudará a instalar el módulo de la derecha y configurar "
+"el sistema según el método que se utiliza para facturar a sus clientes."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Venta Línea_pedido Realizar_factura"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera abastecimiento y facturación"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análisis de ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:1151
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"Ha seleccionado una cantidad de unidades de% d.\n"
+"Pero no es compatible con el paquete seleccionado.\n"
+"Aquí es una propuesta de las cantidades de acuerdo con el envase:\n"
+"EAN: Cantidad% s:% s Tipo de UL:% s"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Recrear albarán"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El comercial crea una factura manualmente si la política de facturación del "
+"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
+"automática si la política de facturación es 'Pago antes del envío'."
+
+#. module: sale
+#: help:sale.config.picking_policy,order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Puede generar facturas basadas en pedidos de venta o basadas en envíos."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Confirmadas las líneas de pedido de venta, aún no entregado"
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr "Facturas de cliente"
+
+#. module: sale
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0 view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: sale
+#: selection:sale.order,state:0 view:sale.order.line:0
+#: selection:sale.order.line,state:0 selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid ""
+"You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+"¡Debe seleccionar un cliente en el formulario de ventas!\n"
+"Introduzca un cliente antes de seleccionar un producto."
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Para hacer"
+
+#. module: sale
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr "Política de envío"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documento del movimiento al cliente."
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "El importe sin impuestos."
+
+#. module: sale
+#: code:addons/sale/sale.py:604
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Debe primero cancelar todos los albaranes relacionados con este pedido de "
+"venta."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Ventas. Anticipo pago factura"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Pedido (Ref ${object.name or 'n/a' })"
+
+#. module: sale
+#: view:sale.order.line:0 field:sale.order.line,product_id:0
+#: view:sale.report:0 field:sale.report,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Cancelar asignación"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr "sale.config.picking_policy"
+
+#. module: sale
+#: view:account.invoice.report:0 view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Volumen mensual"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar las"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha de pedido"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Product UoM"
+msgstr "UdM del producto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Logistic"
+msgstr "Logística"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pedido"
+
+#. module: sale
+#: code:addons/sale/sale.py:1017
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función del control de facturación de los pedidos de venta, la factura "
+"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
+"pedido de venta puede generar una factura o un albarán tan pronto como sea "
+"confirmado por el comercial."
+
+#. module: sale
+#: code:addons/sale/sale.py:1251
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"¡Prevé vender %.2f %s pero sólo %.2f %s están disponibles!\n"
+"El stock real es %.2f %s. (sin reservas)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "States"
+msgstr "Estados"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencia cliente"
+
+#. module: sale
+#: field:sale.order,amount_total:0 view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: report:sale.order:0 view:sale.order.line:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Dependiendo de la configuración de la ubicación de salida, el movimiento "
+"entre la zona de salida y el cliente se realiza a través de la orden de "
+"entrega de forma manual o automática."
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr "Pago antes de entrega"
+
+#. module: sale
+#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr "Tablero de ventas"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr "Realizar facturas"
+
+#. module: sale
+#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Para facturar"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Fecha en la que se confirma el pedido de venta."
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Contrato / Cuenta Analítica"
+
+#. module: sale
+#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
+#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "El importe a facturar por adelantado."
+
+#. module: sale
+#: code:addons/sale/sale.py:1269
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+"No se ha encontrado una línea de tarifa que concuerde con este producto y "
+"cantidad.\n"
+"Debe cambiar el producto, la cantidad o la tarifa."
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr ""
+"Esta es la lista de albaranes que han sido generados para este pedido de "
+"venta."
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+"Líneas de pedido de ventas relacionados con una orden de venta de la mina"
+
+#. 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
+#: view:sale.report:0 field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Fecha confirmación"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr "Ventas por mes"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Líneas de venta por que están en 'hacer' estado"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"El albarán se crea tan pronto como se confirma el pedido de venta, a la vez "
+"que la orden de abastecimiento. Representa la asignación de los componentes "
+"del pedido de venta. Hay un albarán por línea del pedido de venta que "
+"evoluciona con la disponibilidad de los componentes."
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr "Método principal basado en"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr "Ventas por categoría de producto últimos 90 días"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas pedido de ventas"
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Tiempo inicial entrega"
+
+#. module: sale
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "Tarifa EDI (%s)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Order"
+msgstr "Imprimir pedido"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current year"
+msgstr "Orden de venta creada en el año en curso"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"No se puede crear la factura a partir de esta línea de pedido de venta por "
+"las siguientes razones:\n"
+"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
+"\"cancelada\".\n"
+"2. La línea del pedido de venta está facturada."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Las líneas de venta por hacer"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Se crea automáticamente una orden de abastecimiento tan pronto como se "
+"confirma un pedido de venta o se paga la factura. Provoca la compra y la "
+"producción de productos según las reglas y los parámetros del pedido de "
+"venta. "
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
+
+#. module: sale
+#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
+#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
+#: view:sale.report:0 field:sale.report,user_id:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Presupuestos antiguos"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0 view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanzar factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:624
+#, python-format
+msgid "The sales order '%s' has been cancelled."
+msgstr "El pedido de venta '%s' ha sido cancelado."
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+"* El estado 'Borrador' se establece cuando se crea el pedido de venta.\n"
+"* El estado 'Confirmado' se establece cuando se confirma el pedido de "
+"venta.\n"
+"* El estado 'Excepción' se establece cuando el pedido de venta tiene una "
+"excepción.\n"
+"* El estado 'Realizado' se establece cuando las líneas del pedido de venta "
+"se han enviado.\n"
+"* El estado 'Cancelado' se establece cuando un usuario cancela el pedido de "
+"venta."
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "El importe de los impuestos."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Packings"
+msgstr "Albaranes"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Líneas de venta pedido listo para ser facturado"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr "Ordenes de ventas creadas en el último mes"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr "Plantillas de correo electrónico"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de ventas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tienda ventas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Producto avanzado"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: sale
+#: code:addons/sale/sale.py:618
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
+msgstr ""
+"Primero debe cancelar todas las facturas relacionadas con este pedido de "
+"venta."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Pedidos de ventas en proceso"
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referencia del documento que ha generado esta solicitud de pedido de venta."
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Retraso realización"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr "Entregar factura y en la demanda"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Una orden de abastecimiento para cada línea del pedido de venta y para cada "
+"uno de los componentes."
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr "Asignar"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Pedido de venta confirmado a factura."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Ordenes de venta que aún no han sido confirmados"
+
+#. module: sale
+#: code:addons/sale/sale.py:322
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
+msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: sale
+#: code:addons/sale/sale.py:1261
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "¡No Lista de precios! : "
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Entregado"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Debe asignar un lote de producción para este producto"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"If you have more than one shop reselling your company products, you can "
+"create and manage that from here. Whenever you will record a new quotation "
+"or sales order, it has to be linked to a shop. The shop also defines the "
+"warehouse from which the products will be delivered for each particular "
+"sales."
+msgstr ""
+"Si tiene más de una tienda donde vende los productos de su compañía, puede "
+"crearlas y gestionarlas desde aquí. Cada vez que codifique un nuevo "
+"presupuesto o pedido de venta, debe estar vinculado a una tienda. La tienda "
+"también define desde que almacén serán entregados los productos para cada "
+"venta."
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Indica que una factura ha sido pagada."
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Anticipo"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Buscar pedido de venta"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Solicitud pedido de venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:1255
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "¡No es suficiente stock! : "
+
+#. module: sale
+#: report:sale.order:0 field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Este informe realiza un análisis de sus presupuestos y pedidos de venta. El "
+"análisis verifica los ingresos de sus ventas y las ordena por diferentes "
+"grupos de criterios (comercial, empresa, producto, etc.). Utilice este "
+"informe para realizar un análisis sobre sus ventas todavía no facturadas. Si "
+"desea analizar sus ingresos, debería utilizar el informe de análisis de "
+"facturas en la aplicación de Contabilidad."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "Presupuesto Nº"
+
+#. module: sale
+#: field:sale.order,picked_rate:0 view:sale.report:0
+msgid "Picked"
+msgstr "Enviada"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr "Facturar desde albaranes"
+
+#~ msgid "VAT"
+#~ msgstr "IVA"
+
+#~ msgid "Do you really want to create the invoice(s) ?"
+#~ msgstr "¿Desea crear la(s) factura(s)?"
+
+#~ msgid "Configure Sale Order Logistic"
+#~ msgstr "Configurar la logística de los pedidos de venta"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Envío parcial"
+
+#~ msgid "Recreate Procurement"
+#~ msgstr "Recrear abastecimiento"
+
+#~ msgid "Steps To Deliver a Sale Order"
+#~ msgstr "Pasos para entregar un pedido de venta"
+
+#~ msgid "You invoice has been successfully created !"
+#~ msgstr "¡Su factura ha sido creada correctamente!"
+
+#~ msgid "Automatic Declaration"
+#~ msgstr "Declaración automática"
+
+#~ msgid ""
+#~ "This is the list of picking list that have been generated for this invoice"
+#~ msgstr "Ésta es la lista de albaranes que se han generado para esta factura"
+
+#~ msgid "Delivery, from the warehouse to the customer."
+#~ msgstr "Entrega, desde el almacén hasta el cliente."
+
+#~ msgid "After confirming order, Create the invoice."
+#~ msgstr "Después de confirmar el pedido, crear la factura."
+
+#~ msgid ""
+#~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
+#~ "is, quotation is moved to  sale order."
+#~ msgstr ""
+#~ "Cuando presiona el botón Confirmar, el estado Borrador cambia a Manual. es "
+#~ "decir, el presupuesto cambia a pedido de venta."
+
+#~ msgid "Manual Designation"
+#~ msgstr "Designación manual"
+
+#~ msgid "Invoice after delivery"
+#~ msgstr "Facturar después del envío"
+
+#~ msgid "Origin"
+#~ msgstr "Origen"
+
+#~ msgid "Outgoing Products"
+#~ msgstr "Productos salientes"
+
+#~ msgid "Reference"
+#~ msgstr "Referencia"
+
+#~ msgid "All at Once"
+#~ msgstr "Todo a la vez"
+
+#~ msgid "Procurement is created after confirmation of sale order."
+#~ msgstr "El abastecimiento es creado después de confirmar un pedido de venta."
+
+#~ msgid "Procure Method"
+#~ msgstr "Método abastecimiento"
+
+#~ msgid "Net Price"
+#~ msgstr "Precio neto"
+
+#~ msgid "My sales order in progress"
+#~ msgstr "Mis pedidos de ventas en proceso"
+
+#~ msgid ""
+#~ "The sale order will automatically create the invoice proposition (draft "
+#~ "invoice). Ordered and delivered quantities may not be the same. You have to "
+#~ "choose if you invoice based on ordered or shipped quantities. If the product "
+#~ "is a service, shipped quantities means hours spent on the associated tasks."
+#~ msgstr ""
+#~ "El pedido de venta creará automáticamente la propuesta de factura (factura "
+#~ "borrador). Las cantidades pedidas y las cantidades enviadas pueden no ser "
+#~ "las mismas. Tiene que decidir si factura basado en cantidades pedidas o "
+#~ "enviadas. Si el producto es un servicio, cantidades enviadas significa horas "
+#~ "dedicadas a las tareas asociadas."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sale order that is defined as 'Automatic "
+#~ "Invoice after delivery'."
+#~ msgstr ""
+#~ "No puede hacer un anticipo en un pedido de venta definido como 'Factura "
+#~ "automática después del envío'."
+
+#~ msgid "All Sales Order"
+#~ msgstr "Todos los pedidos de ventas"
+
+#~ msgid "Sale Shop"
+#~ msgstr "Tienda de ventas"
+
+#~ 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 ""
+#~ "Se crea un albarán cuando presione 'Asigna' después de haber confirmado el "
+#~ "pedido de venta. Esta transacción convierte el pedido de venta a albarán."
+
+#~ msgid "My sales order waiting Invoice"
+#~ msgstr "Mis pedidos de ventas esperarando facturación"
+
+#~ msgid ""
+#~ "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
+#~ "will automatic create after delivery."
+#~ msgstr ""
+#~ "Cuando selecciona una política de envío = 'Factura automática después del "
+#~ "envío', la creará automáticamente después del envío."
+
+#~ msgid "Complete Delivery"
+#~ msgstr "Envío completo"
+
+#~ msgid "Manual Description"
+#~ msgstr "Descripción manual"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sale order."
+#~ msgstr ""
+#~ "Primero debe cancelar todas las facturas asociadas a este pedido de venta."
+
+#~ msgid "Sale Order Procurement"
+#~ msgstr "Abastecimiento pedido de venta"
+
+#~ msgid "Packing"
+#~ msgstr "Empaquetado/Albarán"
+
+#~ msgid "Invoice on Order After Delivery"
+#~ msgstr "Facturar pedido después del envío"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
+
+#~ msgid "Sales orders"
+#~ msgstr "Pedidos de ventas"
+
+#~ msgid "Payment accounts"
+#~ msgstr "Cuentas de pago"
+
+#~ msgid "Draft Invoice"
+#~ msgstr "Factura borrador"
+
+#~ msgid "Draft customer invoice, to be reviewed by accountant."
+#~ msgstr "Factura de cliente borrador, para ser revisada por un contable."
+
+#~ msgid "Sales Order To Be Invoiced"
+#~ msgstr "Pedidos de ventas a facturar"
+
+#~ msgid "Procurement for each line"
+#~ msgstr "Abastecimiento para cada línea"
+
+#~ msgid "Manages the delivery and invoicing progress"
+#~ msgstr "Gestiona el progreso de envío y facturación"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Política de envío por defecto"
+
+#, python-format
+#~ msgid "Could not cancel sale order !"
+#~ msgstr "¡No puede cancelar el pedido de venta!"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelado"
+
+#~ msgid "Order Ref"
+#~ msgstr "Ref. pedido"
+
+#~ msgid ""
+#~ "In sale order , procuerement for each line and it comes into the procurement "
+#~ "order"
+#~ msgstr ""
+#~ "En un pedido de venta, abastecer para cada línea y se convierte en la orden "
+#~ "de abastecimiento"
+
+#~ msgid "Uninvoiced Lines"
+#~ msgstr "Líneas no facturadas"
+
+#~ msgid "Sales Process"
+#~ msgstr "Proceso de ventas"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+#~ "categoría."
+
+#~ msgid "My sales in shipping exception"
+#~ msgstr "Mis ventas en excepción de envío"
+
+#~ msgid "Sales Configuration"
+#~ msgstr "Configuración de ventas"
+
+#~ msgid "Procurement Corrected"
+#~ msgstr "Abastecimiento corregido"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Enviar & Factura manual"
+
+#~ msgid "Sale Procurement"
+#~ msgstr "Abastecimiento de venta"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Product sales"
+#~ msgstr "Ventas de producto"
+
+#~ msgid "Our Salesman"
+#~ msgstr "Nuestro comercial"
+
+#~ msgid "Create Advance Invoice"
+#~ msgstr "Crear anticipo factura"
+
+#~ msgid "One procurement for each product."
+#~ msgstr "Un abastecimiento por cada producto."
+
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venta"
+
+#~ msgid "Sale Pricelists"
+#~ msgstr "Tarifas de venta"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Envío directo"
+
+#~ msgid ""
+#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
+#~ "the sale order. This transaction moves the sale order to invoices."
+#~ msgstr ""
+#~ "Se crea la factura cuando presione 'Crear factura' después de haber "
+#~ "confirmado el pedido de venta. Esta transacción convierte el pedido de venta "
+#~ "a facturas."
+
+#~ msgid "Make Invoice"
+#~ msgstr "Crear factura"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Sólo orden de entrega"
+
+#~ msgid "Sales order lines"
+#~ msgstr "Líneas del pedido de ventas"
+
+#~ msgid "Sequence"
+#~ msgstr "Secuencia"
+
+#~ msgid "Packing OUT is created for stockable products."
+#~ msgstr "Se crea un albarán de salida OUT para productos almacenables."
+
+#~ msgid "Other data"
+#~ msgstr "Otros datos"
+
+#~ msgid ""
+#~ "Confirming the packing list moves them to delivery order. This can be done "
+#~ "by clicking on 'Validate' button."
+#~ msgstr ""
+#~ "Al confirmar el albarán se convierte en una orden de entrega. Esto se puede "
+#~ "realizar haciendo clic en el botón 'Validar'."
+
+#~ msgid "Advance Payment"
+#~ msgstr "Pago anticipado"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Confirm sale order and Create invoice."
+#~ msgstr "Confirmar pedido de venta y crear factura."
+
+#~ msgid "Packing List & Delivery Order"
+#~ msgstr "Albarán & Orden de entrega"
+
+#~ msgid "Sale Order Lines"
+#~ msgstr "Líneas del pedido de venta"
+
+#~ msgid "Do you really want to create the invoices ?"
+#~ msgstr "¿Realmente desea crear las facturas?"
+
+#~ msgid "Invoice based on packing lists"
+#~ msgstr "Factura basada en albaranes"
+
+#~ msgid "Set Default"
+#~ msgstr "Establecer por defecto"
+
+#~ msgid "Sales order"
+#~ msgstr "Pedido de venta"
+
+#~ msgid "Quotation (A sale order in draft state)"
+#~ msgstr "Presupuesto (un pedido de venta en estado borrador)"
+
+#~ msgid "Sale Invoice"
+#~ msgstr "Factura de venta"
+
+#~ msgid "Open Advance Invoice"
+#~ msgstr "Abrir anticipo factura"
+
+#~ msgid "Deliver"
+#~ msgstr "Enviar"
+
+#, python-format
+#~ msgid "Could not cancel this sale order !"
+#~ msgstr "¡No se puede cancelar este pedido de venta!"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Línea pedido de venta"
+
+#~ msgid "Make invoices"
+#~ msgstr "Realizar facturas"
+
+#~ msgid ""
+#~ "The name and address of the contact that requested the order or quotation."
+#~ msgstr ""
+#~ "El nombre y la dirección del contacto que solicita el pedido o presupuesto."
+
+#~ msgid "Purchase Pricelists"
+#~ msgstr "Tarifas de compra"
+
+#, python-format
+#~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
+#~ msgstr ""
+#~ "¡No se puede eliminar pedido(s) de venta que ya está(n) confirmado(s)!"
+
+#~ msgid "New Quotation"
+#~ msgstr "Nuevo presupuesto"
+
+#~ msgid "Total amount"
+#~ msgstr "Importe total"
+
+#~ msgid "Configure Picking Policy for Sale Order"
+#~ msgstr "Configurar política de envío para el pedido de venta"
+
+#~ msgid "Payment Terms"
+#~ msgstr "Plazos de pago"
+
+#~ msgid "Invoice Corrected"
+#~ msgstr "Factura corregida"
+
+#~ msgid "Delivery Delay"
+#~ msgstr "Demora de entrega"
+
+#~ msgid "Related invoices"
+#~ msgstr "Facturas relacionadas"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Pago antes del envío"
+
+#~ msgid ""
+#~ "This is the list of invoices that have been generated for this sale order. "
+#~ "The same sale order may have been invoiced in several times (by line for "
+#~ "example)."
+#~ msgstr ""
+#~ "Ésta es la lista de facturas que se han generado para este pedido de venta. "
+#~ "El mismo pedido puede haberse facturado varias veces (por ejemplo por cada "
+#~ "línea)."
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid "My Sales Order"
+#~ msgstr "Mis pedidos de ventas"
+
+#~ msgid "Sale Order line"
+#~ msgstr "Línea pedido de venta"
+
+#~ msgid "Packing Default Policy"
+#~ msgstr "Forma de envío por defecto"
+
+#~ msgid "Packing Policy"
+#~ msgstr "Forma de envío"
+
+#~ msgid "Payment Accounts"
+#~ msgstr "Cuentas de pago"
+
+#~ msgid "Related Packing"
+#~ msgstr "Albarán relacionado"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#, python-format
+#~ msgid "You cannot cancel a sale order line that has already been invoiced !"
+#~ msgstr ""
+#~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
+
+#, python-format
+#~ msgid "You must first cancel all packing attached to this sale order."
+#~ msgstr ""
+#~ "Debe primero cancelar todos los albaranes asociados a este pedido de venta."
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sale form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "¡Debe seleccionar un cliente en el formulario de venta!\n"
+#~ "Por favor, seleccione un cliente antes de elegir un producto."
+
+#~ msgid "Invoice from the Packing"
+#~ msgstr "Facturar desde el albarán"
+
+#~ msgid "Customer Ref"
+#~ msgstr "Ref. cliente"
+
+#~ msgid ""
+#~ "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 packing 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 'Date Ordered'."
+#~ msgstr ""
+#~ "Indica el estado del presupuesto o pedido de venta. El estado de excepción "
+#~ "se establece automáticamente cuando se produce una cancelación en la "
+#~ "validación de la factura (Excepción de factura) o en el procesado del "
+#~ "albarán (Excepción de envío). El estado 'Esperando planificación' se "
+#~ "establece cuando se confirma la factura pero se espera a que el planificador "
+#~ "procese el pedido en la fecha 'Fecha del pedido'."
+
+#~ msgid "Sales Management"
+#~ msgstr "Ventas"
+
+#~ msgid ""
+#~ "By default, Open ERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Por defecto, OpenERP puede gestionar rutas complejas y rutas de productos en "
+#~ "su almacén y en las ubicaciones de empresas. Esta opción le configurará los "
+#~ "métodos más comunes y sencillos para enviar productos al cliente en una o "
+#~ "dos operaciones hechas por el trabajador."
+
+#~ msgid ""
+#~ "This Configuration step use to set default picking policy when make sale "
+#~ "order"
+#~ msgstr ""
+#~ "Este paso fija la política de empaquetado por defecto cuando se crea un "
+#~ "pedido de venta"
+
+#~ 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 ""
+#~ "La política de facturación se utiliza para sincronizar la factura y las "
+#~ "operaciones de envío.\n"
+#~ "  - La opción 'Pago antes del envío' primero genera la factura y luego "
+#~ "genera el albarán después del pago de esta factura.\n"
+#~ "  - La opción 'Envío '& Factura manual' creará el albarán directamente y "
+#~ "esperará a que el usuario haga clic manualmente en el botón 'Factura' para "
+#~ "generar la factura borrador.\n"
+#~ "  - La opción 'Factura según pedido después envío' generará la factura "
+#~ "borrador basada en el pedido de venta después de que todos los albaranes se "
+#~ "hayan procesado.\n"
+#~ "  - La opción 'Factura desde albarán' se utiliza para crear una factura "
+#~ "durante el proceso de los albaranes."
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Política de facturación"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Le permite calcular los costos de envío en sus presupuestos."
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Configurar la política envío para pedidos de venta"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Proporciona algunas funcionalidades para mejorar la plantilla de los "
+#~ "informes de pedidos de ventas."
+
+#~ msgid "  Year  "
+#~ msgstr "  Año  "
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Fechas en pedidos de venta"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Márgenes en pedidos de venta"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Configuración aplicaciones de ventas"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Costes de envío"
+
+#~ msgid "Order date"
+#~ msgstr "Fecha pedido"
+
+#~ msgid "title"
+#~ msgstr "título"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "¡Información albarán!"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Por defecto, OpenERP es capaz de gestionar complejas rutas y caminos de los "
+#~ "productos en su almacén y en las ubicaciones de otras empresas. Esto "
+#~ "configurará los métodos más comunes y sencillos para entregar los productos "
+#~ "al cliente en una o dos operaciones realizadas por el trabajador."
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturación"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Albarán y Orden de entrega"
+
+#~ msgid "sale.installer"
+#~ msgstr "venta.instalador"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Indica el margen de rentabilidad mediante el cálculo de la diferencia entre "
+#~ "el precio unitario y el precio de coste."
+
+#~ msgid "   Month   "
+#~ msgstr "   Mes   "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "La política de envío se utiliza para configurar el pedido si debe entregarse "
+#~ "tan pronto como sea posible cuando un producto está disponible o debe "
+#~ "esperar a que todos los productos están disponibles."
+
+#~ msgid "    Month-1    "
+#~ msgstr "    Mes-1    "
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Mejora plantilla pedido de venta"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Diarios de facturación"
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Progreso configuración"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Ctdad enviada"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Añade fechas de realización, solicitud y efectivo en pedidos de venta."
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "¡No hay stock suficiente!"
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Permite agrupar y facturar sus albaranes de acuerdo a diferentes tipos de "
+#~ "facturación: diaria, semanal, etc."
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Política de empaquetado por defecto"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "Optimizar su aplicación de ventas con funcionalidades adicionales."
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Configurar logística pedidos de venta"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Configurar su aplicación de gestión de ventas"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Configurar su flujo de ventas y valores por defecto."
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "Ha seleccionado una cantidad de %d unidades.\n"
+#~ "Pero no es compatible con el embalaje seleccionado.\n"
+#~ "Aquí tiene una propuesta de cantidades acordes con este embalaje:\n"
+#~ "\n"
+#~ "EAN: %s Cantidad: %s Tipo de ul: %s"
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Facturar pedido después de envío"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr ""
+#~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Factura desde el albarán"
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Secuencia plantilla"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "¡No se puede eliminar pedido(s) de venta que ya está confirmado!"
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Pasos para entregar un pedido de venta"
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "¡La referencia del pedido debe ser única!"
+
+#~ 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 picking order after the payment of this invoice.\n"
+#~ "  - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ "  - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "La política de envío se utiliza para sincronizar las operaciones de envío y "
+#~ "facturación.\n"
+#~ "  -La opción 'Pagar antes del envío' primero generará la factura y más tarde "
+#~ "el albarán después del pago de dicha factura.\n"
+#~ "  -La opción 'Envío y factura manual' creará el albarán directamente y "
+#~ "esperará a que un usuario haga clic manualemente sobre el botón 'Facturar' "
+#~ "para generar la factura en el estado borrador.\n"
+#~ "  -La opción 'Facturar pedido después del envío' generará la factura en "
+#~ "estado borrador basándose en el pedido de venta después de que todas los "
+#~ "albaranes hayan sido realizados.\n"
+#~ "  -La opción 'Facturar desde albarán' se utiliza para crear una factura "
+#~ "durante el proceso de preparación del pedido."
+
+#~ msgid ""
+#~ "\n"
+#~ "    The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ "    * Workflow with validation steps:\n"
+#~ "        - Quotation -> Sales order -> Invoice\n"
+#~ "    * Invoicing methods:\n"
+#~ "        - Invoice on order (before or after shipping)\n"
+#~ "        - Invoice on delivery\n"
+#~ "        - Invoice on timesheets\n"
+#~ "        - Advance invoice\n"
+#~ "    * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ "    * Products stocks and prices\n"
+#~ "    * Delivery methods:\n"
+#~ "        - all at once, multi-parcel\n"
+#~ "        - delivery costs\n"
+#~ "    * Dashboard for salesman that includes:\n"
+#~ "    * Your open quotations\n"
+#~ "    * Top 10 sales of the month\n"
+#~ "    * Cases statistics\n"
+#~ "    * Graph of sales by product\n"
+#~ "    * Graph of cases of the month\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    El módulo base para gestionar presupuestos y pedidos de venta.\n"
+#~ "\n"
+#~ "    * Flujo de trabajo con etapas de validación:\n"
+#~ "        - Presupuesto -> Pedido de venta -> Factura\n"
+#~ "    * Métodos de facturación:\n"
+#~ "        - Factura del pedido (antes o después del envío)\n"
+#~ "        - Factura del albarán\n"
+#~ "        - Factura de la hoja de servicios\n"
+#~ "        - Avanzar factura\n"
+#~ "    * Preferencias de los clientes (envío, facturación, incoterm, ...)\n"
+#~ "    * Existencias de los productos y precios\n"
+#~ "    * Formas de envío:\n"
+#~ "        - Todo a la vez, En varios paquetes\n"
+#~ "        - Gastos de envío\n"
+#~ "    * El tablero para el comercial incluye:\n"
+#~ "    * Sus presupuestos abiertos\n"
+#~ "    * Las 10 mejores ventas del mes\n"
+#~ "    * Estadísticas de casos\n"
+#~ "    * Gráfico de las ventas por producto\n"
+#~ "    * Gráfico de los casos por mes\n"
+#~ "    "
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Indica el estado del presupuesto o pedido de venta. \n"
+#~ "El estado de excepción se establece automáticamente cuando se produce una "
+#~ "operación de cancelación en la validación de factura (excepción de factura) "
+#~ "o en el procesado del albarán (excepción de envío). \n"
+#~ "El estado 'Esperando planificación' se establece cuando se confirma la "
+#~ "factura, pero está esperando que el planificador la active en la fecha de "
+#~ "\"Fecha pedido\"."
+
+#~ msgid "Ordered Date"
+#~ msgstr "Fecha pedido"
diff --git a/addons/sale_stock/i18n/es_EC.po b/addons/sale_stock/i18n/es_EC.po
new file mode 100644
index 00000000000..836615b8649
--- /dev/null
+++ b/addons/sale_stock/i18n/es_EC.po
@@ -0,0 +1,2745 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2010-12-21 04:49+0000\n"
+"Last-Translator: Cristian Salamea (Gnuthink) <ovnicraft@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Si no dispone de suficientes existencias para enviarlo todo de una vez, "
+"¿acepta envíos parciales o no?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr "Cancelar pedido"
+
+#. module: sale
+#: code:addons/sale/sale.py:638
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Quotation"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr "¡Advertencia!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"Here is a list of each sales order line to be invoiced. You can invoice "
+"sales orders partially, by lines of sales order. You do not need this list "
+"if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Orden de Adquisición"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Línea de pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"Sales Orders help you manage quotations and orders from your customers. "
+"OpenERP suggests that you start by creating a quotation. Once it is "
+"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+"handle several types of products so that a sales order may trigger tasks, "
+"delivery orders, manufacturing orders, purchases and so on. Based on the "
+"configuration of the sales order, a draft invoice will be generated so that "
+"you just have to confirm it when you want to bill your customer."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"La orden de pedido creará automáticamente la factura (factura borrador). Las "
+"cantidades pedidas y entregadas pueden no ser las mismas. Tiene que elegir "
+"si desea que su factura se base en cantidades ordenadas o expedidas. Si el "
+"producto es un servicio, las cantidades enviadas significan las horas "
+"dedicadas a las tareas asociadas."
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Plazo de pago por defecto"
+
+#. module: sale
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr "Estado"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio Total"
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Seleccione para agrupar las facturas del mismo cliente"
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades ordenadas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr "Ventas por Vendedor"
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Movimientos de inventario"
+
+#. module: sale
+#: field:sale.order,name:0 field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Información adicional"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"La factura es creada automáticamente si la politica de envio es 'Factura "
+"from pick' o 'Factura después de la entrega'"
+
+#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mis presupuestos"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr "Dashboard del Gerente de Ventas"
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Empaquetado"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre tienda"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+"  - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡Cliente no definido!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: sale
+#: code:addons/sale/sale.py:1034
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+"¡No hay ninguna cuenta de categoría de ingresos definidos por defecto en las "
+"Propiedades de la categoría de producto o la Posición Fiscal no está "
+"definida!"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Está intentando asignar un lote que no es del mismo producto"
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "modo invalido para test_state"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale
+#: code:addons/sale/sale.py:617
+#, python-format
+msgid "Could not cancel this sales order !"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadística de las ordenes de pedido"
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0 view:sale.order:0 view:sale.report:0
+msgid "Quotations"
+msgstr "Peticiones"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "TVA :"
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Número de días entre la confirmación del pedido y el envío de los productos "
+"al cliente."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha de petición"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Número paquetes"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1074
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1079
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1147
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+"Seleccione un producto de tipo servicio llamado 'Producto Avanzado'. Es "
+"posible que necesite crearlo y fijarlo como valor por defecto de este campo."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                              "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Month-1"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Orden de entrega"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha de confirmación"
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicación empresa"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Dirección factura:"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección factura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Petición / Pedido"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Orden N°"
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas del pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr "Líneas a facturar"
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "Cantidad (UdM)"
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Fecha de creación"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mis Pedidos"
+
+#. module: sale
+#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción inválida!"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "# of Qty"
+
+#. module: sale
+#: code:addons/sale/sale.py:1327
+#, python-format
+msgid "Hour"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Fecha de orden"
+
+#. module: sale
+#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Enviada"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr "Todas las peticiones"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoría de producto"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impuestos:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
+
+#. module: sale
+#: field:sale.order,state:0 field:sale.report,state:0
+msgid "Order State"
+msgstr "Estado del pedido"
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr "Ventas Mensuales"
+
+#. module: sale
+#: code:addons/sale/sale.py:1078
+#, python-format
+msgid "Could not cancel sales order line!"
+msgstr ""
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Días de seguridad"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Abastecimiento de material sólido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Create Final Invoice"
+msgstr "Crear factura final"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Dirección de envío"
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr "Compañias"
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"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). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1272
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr "El nombre y dirección del contacto que solicitó la orden o petición"
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Son los días agregados que garantiza a los clientes por razones de seguridad"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Ctdad"
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr "Referencias"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr ""
+
+#. 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
+#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
+#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0 view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr "Total de impuestos excluidos"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr ""
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "¡La factura fue creada exitosamente!"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr "Ventas por empresa"
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr "Contacto que realiza el pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr "Factura pendiente"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forzar asignación"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "bajo pedido"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basado en el envío o en las cantidades ordenadas."
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Paquete relacionado"
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Crear orden de entrega"
+
+#. module: sale
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total de impuestos incluidos"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Crear paquete de productos"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Ventas por categoría de producto"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar petición"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
+msgid "Group By..."
+msgstr "Agroupar por ..."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Volver a Crear factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr "Entregas a facturar"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando fecha planificada"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método de abastecimiento"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr "Paquete de productos"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Documento del movimiento de la salida o del cliente."
+
+#. module: sale
+#: model:email.template,body:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+"       | Order number: *${object.name}*\n"
+"       | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Order date: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       | Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr "Confirmar pedido"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Crear orden de abastecimiento"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de stock"
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Advance Amount"
+
+#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr ""
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Cantidades enviadas"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr "Factura basada en pedidos de venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr "Paquete de productos"
+
+#. module: sale
+#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
+#: code:addons/sale/sale.py:1033
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: sale
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: sale
+#: code:addons/sale/sale.py:1156
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Grupo de facturas"
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser reviado por el cliente."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference UoM"
+msgstr ""
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Crear factura de la línea de pedido"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Medios de abastecimiento y facturación"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análisis de ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:1151
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Recrear Picking"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Peticiones"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El vendedor crea una factura manualmente, si la política de envío de las "
+"ordenes de pedido is 'Envío manual en proceso'. La factura es creada "
+"automáticamente si la política de envío es 'Pago antes de entrega'."
+
+#. module: sale
+#: help:sale.config.picking_policy,order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Puede generar facturas en base a las ordenes de pedido o en base a los "
+"envíos."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr ""
+
+#. module: sale
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0 view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio por unidad"
+
+#. module: sale
+#: selection:sale.order,state:0 view:sale.order.line:0
+#: selection:sale.order.line,state:0 selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid ""
+"You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Por hacer"
+
+#. module: sale
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr "Política para paquetes de productos"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documento del movimiento para el cliente."
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:604
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0 field:sale.order.line,product_id:0
+#: view:sale.report:0 field:sale.report,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Cancelar asignación"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr "sale.config.picking_policy"
+
+#. module: sale
+#: view:account.invoice.report:0 view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar las"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha de pedido"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Product UoM"
+msgstr "UdM del producto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Logistic"
+msgstr "Logística"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Orden"
+
+#. module: sale
+#: code:addons/sale/sale.py:1017
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1251
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"¡Planea vender %.2f %s pero solo dispone de  %.2f %s!\n"
+"El stock real es %.2f %s. (sin reservaciones)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "States"
+msgstr "Estados"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencia del cliente"
+
+#. module: sale
+#: field:sale.order,amount_total:0 view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: report:sale.order:0 view:sale.order.line:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Dependiendo de la configuración de la salida, el movimiento entre el lugar "
+"de salida y el cliente es realizado através de la orden de entrega "
+"manualmente o automáticamente."
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr ""
+
+#. module: sale
+#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
+msgid "To Invoice"
+msgstr "A facturar"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr ""
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr ""
+
+#. module: sale
+#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
+#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Compañia"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha de facturación"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "El moto a ser facturado por adelantado."
+
+#. module: sale
+#: code:addons/sale/sale.py:1269
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr ""
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto:"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr ""
+
+#. 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
+#: view:sale.report:0 field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Fecha de confirmación"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid "Warning"
+msgstr "Advertencia"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr "Ventas por mes"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr ""
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas de pedido"
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Tiempo de entrega"
+
+#. module: sale
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Order"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current year"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr ""
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
+
+#. module: sale
+#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
+#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
+#: view:sale.report:0 field:sale.report,user_id:0
+msgid "Salesman"
+msgstr "Vendedor"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Peticiones anteriores"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0 view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr "Facturar por adelantado"
+
+#. module: sale
+#: code:addons/sale/sale.py:624
+#, python-format
+msgid "The sales order '%s' has been cancelled."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Packings"
+msgstr ""
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr ""
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de ventas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Producto avanzado"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: sale
+#: code:addons/sale/sale.py:618
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Pedidos de ventas en proceso"
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Retraso de entrega"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr "Asignar"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Fecha de pedido"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr ""
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:322
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
+msgstr ""
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr "Cerrado"
+
+#. module: sale
+#: code:addons/sale/sale.py:1261
+#, python-format
+msgid "No Pricelist ! : "
+msgstr ""
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Entregado"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Debe asignar un lote de producción para este producto"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"If you have more than one shop reselling your company products, you can "
+"create and manage that from here. Whenever you will record a new quotation "
+"or sales order, it has to be linked to a shop. The shop also defines the "
+"warehouse from which the products will be delivered for each particular "
+"sales."
+msgstr ""
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr ""
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Buscar pedidos de ventas"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale
+#: code:addons/sale/sale.py:1255
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0 field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "Petición N°"
+
+#. module: sale
+#: field:sale.order,picked_rate:0 view:sale.report:0
+msgid "Picked"
+msgstr "Enviada"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr "Facturar desde albaranes"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Envío parcial"
+
+#~ msgid "Recreate Procurement"
+#~ msgstr "Recrear abastecimiento"
+
+#~ msgid "Steps To Deliver a Sale Order"
+#~ msgstr "Pasos para entregar un pedido de venta"
+
+#~ msgid "You invoice has been successfully created !"
+#~ msgstr "¡Su factura ha sido creada correctamente!"
+
+#~ msgid "Automatic Declaration"
+#~ msgstr "Declaración automática"
+
+#~ msgid "Delivery, from the warehouse to the customer."
+#~ msgstr "Entrega, desde el almacén hasta el cliente."
+
+#~ msgid "Make Invoice"
+#~ msgstr "Crear factura"
+
+#~ msgid ""
+#~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
+#~ "is, quotation is moved to  sale order."
+#~ msgstr ""
+#~ "Cuando presiona el botón Confirmar, el estado Borrador cambia a Manual. es "
+#~ "decir, el presupuesto cambia a pedido de venta."
+
+#~ msgid "Manual Designation"
+#~ msgstr "Designación manual"
+
+#~ msgid "Invoice after delivery"
+#~ msgstr "Facturar después del envío"
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Política de facturación"
+
+#~ msgid "Origin"
+#~ msgstr "Origen"
+
+#~ msgid "Outgoing Products"
+#~ msgstr "Productos salientes"
+
+#~ msgid "Reference"
+#~ msgstr "Referencia"
+
+#~ msgid "All at Once"
+#~ msgstr "Todo a la vez"
+
+#~ msgid "Procurement is created after confirmation of sale order."
+#~ msgstr "El abastecimiento es creado después de confirmar un pedido de venta."
+
+#~ msgid "Procure Method"
+#~ msgstr "Método abastecimiento"
+
+#~ msgid "Net Price"
+#~ msgstr "Precio neto"
+
+#~ msgid "My sales order in progress"
+#~ msgstr "Mis pedidos de ventas en proceso"
+
+#~ msgid ""
+#~ "The sale order will automatically create the invoice proposition (draft "
+#~ "invoice). Ordered and delivered quantities may not be the same. You have to "
+#~ "choose if you invoice based on ordered or shipped quantities. If the product "
+#~ "is a service, shipped quantities means hours spent on the associated tasks."
+#~ msgstr ""
+#~ "El pedido de venta creará automáticamente la propuesta de factura (factura "
+#~ "borrador). Las cantidades pedidas y las cantidades enviadas pueden no ser "
+#~ "las mismas. Tiene que decidir si factura basado en cantidades pedidas o "
+#~ "enviadas. Si el producto es un servicio, cantidades enviadas significa horas "
+#~ "dedicadas a las tareas asociadas."
+
+#~ msgid "All Sales Order"
+#~ msgstr "Todos los pedidos de ventas"
+
+#~ msgid "Sale Shop"
+#~ msgstr "Tienda de ventas"
+
+#~ 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 ""
+#~ "Se crea un albarán cuando presione 'Asigna' después de haber confirmado el "
+#~ "pedido de venta. Esta transacción convierte el pedido de venta a albarán."
+
+#~ msgid "My sales order waiting Invoice"
+#~ msgstr "Mis pedidos de ventas esperarando facturación"
+
+#~ msgid ""
+#~ "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
+#~ "will automatic create after delivery."
+#~ msgstr ""
+#~ "Cuando selecciona una política de envío = 'Factura automática después del "
+#~ "envío', la creará automáticamente después del envío."
+
+#~ msgid "Complete Delivery"
+#~ msgstr "Envío completo"
+
+#~ msgid "Manual Description"
+#~ msgstr "Descripción manual"
+
+#~ msgid "Sale Order Procurement"
+#~ msgstr "Abastecimiento pedido de venta"
+
+#~ msgid "Packing"
+#~ msgstr "Empaquetado/Albarán"
+
+#~ msgid "Invoice on Order After Delivery"
+#~ msgstr "Facturar pedido después del envío"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Related Packing"
+#~ msgstr "Albarán relacionado"
+
+#~ msgid "Payment Accounts"
+#~ msgstr "Cuentas de pago"
+
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
+
+#~ msgid "Customer Ref"
+#~ msgstr "Ref. cliente"
+
+#~ msgid "Sales orders"
+#~ msgstr "Pedidos de ventas"
+
+#~ msgid "Payment accounts"
+#~ msgstr "Cuentas de pago"
+
+#~ msgid "Draft Invoice"
+#~ msgstr "Factura borrador"
+
+#~ msgid "Draft customer invoice, to be reviewed by accountant."
+#~ msgstr "Factura de cliente borrador, para ser revisada por un contable."
+
+#~ msgid "Sales Order To Be Invoiced"
+#~ msgstr "Pedidos de ventas a facturar"
+
+#~ msgid "Procurement for each line"
+#~ msgstr "Abastecimiento para cada línea"
+
+#~ msgid "Packing Default Policy"
+#~ msgstr "Forma de envío por defecto"
+
+#~ msgid "Manages the delivery and invoicing progress"
+#~ msgstr "Gestiona el progreso de envío y facturación"
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Política de envío por defecto"
+
+#~ msgid "Sales Management"
+#~ msgstr "Ventas"
+
+#~ msgid "Order Ref"
+#~ msgstr "Ref. pedido"
+
+#~ msgid ""
+#~ "In sale order , procuerement for each line and it comes into the procurement "
+#~ "order"
+#~ msgstr ""
+#~ "En un pedido de venta, abastecer para cada línea y se convierte en la orden "
+#~ "de abastecimiento"
+
+#~ msgid "Uninvoiced Lines"
+#~ msgstr "Líneas no facturadas"
+
+#~ msgid ""
+#~ "This Configuration step use to set default picking policy when make sale "
+#~ "order"
+#~ msgstr ""
+#~ "Este paso fija la política de empaquetado por defecto cuando se crea un "
+#~ "pedido de venta"
+
+#~ msgid "Sales Process"
+#~ msgstr "Proceso de ventas"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+#~ "categoría."
+
+#~ msgid "My sales in shipping exception"
+#~ msgstr "Mis ventas en excepción de envío"
+
+#~ msgid "Sales Configuration"
+#~ msgstr "Configuración de ventas"
+
+#~ msgid "Procurement Corrected"
+#~ msgstr "Abastecimiento corregido"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Enviar & Factura manual"
+
+#~ msgid "Sale Procurement"
+#~ msgstr "Abastecimiento de venta"
+
+#~ msgid "Configure Sale Order Logistic"
+#~ msgstr "Configurar la logística de los pedidos de venta"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Packing Policy"
+#~ msgstr "Forma de envío"
+
+#~ msgid "Product sales"
+#~ msgstr "Ventas de producto"
+
+#~ msgid "Create Advance Invoice"
+#~ msgstr "Crear anticipo factura"
+
+#~ msgid "One procurement for each product."
+#~ msgstr "Un abastecimiento por cada producto."
+
+#~ msgid "Sale Pricelists"
+#~ msgstr "Tarifas de venta"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Envío directo"
+
+#~ msgid ""
+#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
+#~ "the sale order. This transaction moves the sale order to invoices."
+#~ msgstr ""
+#~ "Se crea la factura cuando presione 'Crear factura' después de haber "
+#~ "confirmado el pedido de venta. Esta transacción convierte el pedido de venta "
+#~ "a facturas."
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Sólo orden de entrega"
+
+#~ msgid "Sales order lines"
+#~ msgstr "Líneas del pedido de ventas"
+
+#~ msgid "Sequence"
+#~ msgstr "Secuencia"
+
+#~ msgid "Packing OUT is created for stockable products."
+#~ msgstr "Se crea un albarán de salida OUT para productos almacenables."
+
+#~ msgid "Other data"
+#~ msgstr "Otros datos"
+
+#~ msgid ""
+#~ "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 packing 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 'Date Ordered'."
+#~ msgstr ""
+#~ "Indica el estado del presupuesto o pedido de venta. El estado de excepción "
+#~ "se establece automáticamente cuando se produce una cancelación en la "
+#~ "validación de la factura (Excepción de factura) o en el procesado del "
+#~ "albarán (Excepción de envío). El estado 'Esperando planificación' se "
+#~ "establece cuando se confirma la factura pero se espera a que el planificador "
+#~ "procese el pedido en la fecha 'Fecha del pedido'."
+
+#~ msgid ""
+#~ "Confirming the packing list moves them to delivery order. This can be done "
+#~ "by clicking on 'Validate' button."
+#~ msgstr ""
+#~ "Al confirmar el albarán se convierte en una orden de entrega. Esto se puede "
+#~ "realizar haciendo clic en el botón 'Validar'."
+
+#~ msgid "Advance Payment"
+#~ msgstr "Pago anticipado"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Confirm sale order and Create invoice."
+#~ msgstr "Confirmar pedido de venta y crear factura."
+
+#~ msgid "Packing List & Delivery Order"
+#~ msgstr "Albarán & Orden de entrega"
+
+#~ msgid "Sale Order Lines"
+#~ msgstr "Líneas del pedido de venta"
+
+#~ msgid "Do you really want to create the invoices ?"
+#~ msgstr "¿Realmente desea crear las facturas?"
+
+#~ msgid "Invoice based on packing lists"
+#~ msgstr "Factura basada en albaranes"
+
+#~ msgid "Set Default"
+#~ msgstr "Establecer por defecto"
+
+#~ msgid "Sales order"
+#~ msgstr "Pedido de venta"
+
+#~ msgid "Quotation (A sale order in draft state)"
+#~ msgstr "Presupuesto (un pedido de venta en estado borrador)"
+
+#~ msgid "Sale Invoice"
+#~ msgstr "Factura de venta"
+
+#~ msgid "Open Advance Invoice"
+#~ msgstr "Abrir anticipo factura"
+
+#~ msgid "Deliver"
+#~ msgstr "Enviar"
+
+#~ msgid "Invoice from the Packing"
+#~ msgstr "Facturar desde el albarán"
+
+#~ msgid "Make invoices"
+#~ msgstr "Realizar facturas"
+
+#~ msgid ""
+#~ "The name and address of the contact that requested the order or quotation."
+#~ msgstr ""
+#~ "El nombre y la dirección del contacto que solicita el pedido o presupuesto."
+
+#~ msgid "Purchase Pricelists"
+#~ msgstr "Tarifas de compra"
+
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venta"
+
+#~ msgid "New Quotation"
+#~ msgstr "Nuevo presupuesto"
+
+#~ msgid "Total amount"
+#~ msgstr "Importe total"
+
+#~ msgid ""
+#~ "By default, Open ERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Por defecto, OpenERP puede gestionar rutas complejas y rutas de productos en "
+#~ "su almacén y en las ubicaciones de empresas. Esta opción le configurará los "
+#~ "métodos más comunes y sencillos para enviar productos al cliente en una o "
+#~ "dos operaciones hechas por el trabajador."
+
+#~ msgid "Configure Picking Policy for Sale Order"
+#~ msgstr "Configurar política de envío para el pedido de venta"
+
+#~ msgid "Invoice Corrected"
+#~ msgstr "Factura corregida"
+
+#~ msgid "Delivery Delay"
+#~ msgstr "Demora de entrega"
+
+#~ msgid "Related invoices"
+#~ msgstr "Facturas relacionadas"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Pago antes del envío"
+
+#~ msgid ""
+#~ "This is the list of invoices that have been generated for this sale order. "
+#~ "The same sale order may have been invoiced in several times (by line for "
+#~ "example)."
+#~ msgstr ""
+#~ "Ésta es la lista de facturas que se han generado para este pedido de venta. "
+#~ "El mismo pedido puede haberse facturado varias veces (por ejemplo por cada "
+#~ "línea)."
+
+#~ msgid "After confirming order, Create the invoice."
+#~ msgstr "Después de confirmar el pedido, crear la factura."
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid "My Sales Order"
+#~ msgstr "Mis pedidos de ventas"
+
+#~ msgid "Sale Order line"
+#~ msgstr "Línea pedido de venta"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de la acción."
+
+#~ msgid "VAT"
+#~ msgstr "VAT"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr ""
+#~ "Configurar la Politica de paquete de productos de los pedidos de ventas"
+
+#, python-format
+#~ msgid "Could not cancel sale order !"
+#~ msgstr "¡No se puede cancelar la orden de pedido!"
+
+#~ msgid "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Permite calcular los costos de envío en las peticiones."
+
+#~ msgid "Our Salesman"
+#~ msgstr "Nuestro vendedor"
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sale form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "¡Debe selectionar un cliente en el formulario de venta!\n"
+#~ "Por favor seleccione un cliente antes de escoger un producto."
+
+#, python-format
+#~ msgid "You cannot cancel a sale order line that has already been invoiced !"
+#~ msgstr "¡No puede cancelar una línea de pedido que ya fue facturada!"
+
+#, python-format
+#~ msgid "Could not cancel this sale order !"
+#~ msgstr "¡No es posible cancelar esta orden de pedido!"
+
+#, python-format
+#~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
+#~ msgstr "¡No es posible eliminar ordenes de pedidos que fueron confirmadas!"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr ""
+#~ "Provee algunas características para mejorar los reportes de las ordenes de "
+#~ "pedido."
+
+#~ msgid "  Year  "
+#~ msgstr "  Año  "
+
+#~ msgid "Do you really want to create the invoice(s) ?"
+#~ msgstr "¿Está seguro de crear la(s) factura(s)?"
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Fechas de las ordenes de pedido"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Línea de pedido"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Márgenes en ordenes de pedido"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Aplicación de configuración de Ventas"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Costos de entrega"
+
+#~ msgid "title"
+#~ msgstr "título"
+
+#~ msgid "Order date"
+#~ msgstr "Fecha de pedido"
+
+#~ msgid ""
+#~ "This is the list of picking list that have been generated for this invoice"
+#~ msgstr ""
+#~ "Ésta es la lista de paquete de productos que se han generado para esta "
+#~ "factura"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "¡Información de Paquete de productos!"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Por defecto, OpenERP puede manejar rutas complejas de productos en los "
+#~ "almacenes o ubicaciones de empresas. Ésto configurará los más simples y "
+#~ "comunes métodos de entrega de productos al cliente en una o dos operaciones "
+#~ "del trabajador."
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Paquete de productos y Orden de entrega"
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturación"
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Margen de rentabilidad calculando la diferencia entre el Precio unitario y "
+#~ "el costo."
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sale order."
+#~ msgstr "Debe primero cancelar todas las facturas de este pedido de venta."
+
+#~ msgid "   Month   "
+#~ msgstr "   Mes   "
+
+#~ msgid "    Month-1    "
+#~ msgstr "    Mes-1    "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "La política de envío se utiliza para configurar los pedidos si desea "
+#~ "entregar lo antes posible cuando un producto está disponible o esperar que "
+#~ "todos los productos esten disponibles."
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Progreso de configuración"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Fecha de pedido"
+
+#~ msgid "Payment Terms"
+#~ msgstr "Terminos de pago"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Invoicing journals"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Cantidad enviada"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Diseño mejorado de pedido de venta"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "!Stock insuficiente!"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Agrega fechas de entrega, de petición y de efectivo en los pedidos de ventas."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Permite agrupar y facturar las ordenes de entrega de acuerdo a los "
+#~ "diferentes tipos de facturación: diario, semanal, etc."
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Política de paquete de productos por defecto"
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Configura tu flujo de trabajo de ventas y tus valores por defecto"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "Optimizar su aplicación de ventas con funcionalidades adicionales."
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Configurar logística pedidos de venta"
+
+#~ msgid "Configure"
+#~ msgstr "Configurar"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Configurar su aplicación de gestión de ventas"
diff --git a/addons/sale_stock/i18n/es_MX.po b/addons/sale_stock/i18n/es_MX.po
new file mode 100644
index 00000000000..31f2e32d4a9
--- /dev/null
+++ b/addons/sale_stock/i18n/es_MX.po
@@ -0,0 +1,2665 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-01-18 01:15+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: 2011-09-05 05:21+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr "Ventas por comercial últimos 90 días"
+
+#. module: sale
+#: help:sale.installer,delivery:0
+msgid "Allows you to compute delivery costs on your quotations."
+msgstr "Le permite calcular los costos de envío en sus presupuestos."
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Si no dispone de suficientes existencias para enviarlo todo de una vez, "
+"¿acepta envíos parciales o no?"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Dirección de envío para el pedido de venta actual."
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr "Cancelar pedido"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Configure Sales Order Logistics"
+msgstr "Configurar logística pedidos de venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Payment Before Delivery"
+msgstr "Pago antes del envío"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "VAT"
+msgstr "IVA"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta."
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "All at Once"
+msgstr "Todo a la vez"
+
+#. module: sale
+#: field:sale.order,project_id:0
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"Here is a list of each sales order line to be invoiced. You can invoice "
+"sales orders partially, by lines of sales order. You do not need this list "
+"if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+"Esta es una lista de todas las líneas de pedidos de venta a facturar. Puede "
+"facturar pedidos de venta parcialmente, por líneas de pedido. No necesita "
+"esta lista si factura desde albaranes de salida o si factura pedidos de "
+"venta completos."
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Orden de abastecimiento"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Línea del pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"Sales Orders help you manage quotations and orders from your customers. "
+"OpenERP suggests that you start by creating a quotation. Once it is "
+"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+"handle several types of products so that a sales order may trigger tasks, "
+"delivery orders, manufacturing orders, purchases and so on. Based on the "
+"configuration of the sales order, a draft invoice will be generated so that "
+"you just have to confirm it when you want to bill your customer."
+msgstr ""
+"Los pedidos de ventas le ayudan a gestionar presupuestos y pedidos de sus "
+"clientes. OpenERP sugiere que comience por crear un presupuesto. Una vez "
+"esté confirmado, el presupuesto se convertirá en un pedido de venta. OpenERP "
+"puede gestionar varios tipos de productos de forma que un pedido de venta "
+"puede generar tareas, órdenes de entrega, órdenes de fabricación, compras, "
+"etc. Según la configuración del pedido de venta, se generará una factura en "
+"borrador de manera que sólo hay que confirmarla cuando se quiera facturar a "
+"su cliente."
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"El pedido de venta creará automáticamente la proposición de la factura "
+"(factura borrador). Las cantidades pedidas y entregadas pueden no ser las "
+"mismas. Debe elegir si desea que su factura se base en las cantidades "
+"pedidas o entregadas. Si el producto es un servicio, las cantidades enviadas "
+"son las horas dedicadas a las tareas asociadas."
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Plazo de pago por defecto"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+msgid "Configure Picking Policy for Sales Order"
+msgstr "Configurar la política envío para pedidos de venta"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr "Estado"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forzar asignación"
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades pedidas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr "Ventas por comercial"
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Movimientos de inventario"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Otra información"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"La factura se crea de forma automática si la política de facturación es "
+"\"Facturar desde el albarán\" o \"Facturar pedido después del envío\"."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Ventas. Realizar factura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Recrear albarán"
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Estos días por razones de seguridad se añaden a los que promete a los "
+"clientes."
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr "Tablero responsable ventas"
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Empaquetado"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Desde un pedido de venta"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre tienda"
+
+#. module: sale
+#: code:addons/sale/sale.py:1014
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+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 picking order after the payment of this invoice.\n"
+"  - The 'Shipping & Manual Invoice' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice.\n"
+"  - The 'Invoice On Order After Delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice From The Picking' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+"La política de envío se utiliza para sincronizar las operaciones de envío y "
+"facturación.\n"
+"  -La opción 'Pagar antes del envío' primero generará la factura y más tarde "
+"el albarán después del pago de dicha factura.\n"
+"  -La opción 'Envío y factura manual' creará el albarán directamente y "
+"esperará a que un usuario haga clic manualemente sobre el botón 'Facturar' "
+"para generar la factura en el estado borrador.\n"
+"  -La opción 'Facturar pedido después del envío' generará la factura en "
+"estado borrador basándose en el pedido de venta después de que todas los "
+"albaranes hayan sido realizados.\n"
+"  -La opción 'Facturar desde albarán' se utiliza para crear una factura "
+"durante el proceso de preparación del pedido."
+
+#. module: sale
+#: code:addons/sale/sale.py:939
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+"¡No hay ninguna cuenta de categoría de ingresos definida en las propiedades "
+"por defecto de la categoría del producto o la posición fiscal no está "
+"definida!"
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Está intentando asignar un lote que no es del mismo producto"
+
+#. module: sale
+#: code:addons/sale/sale.py:620
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "Modo no válido para test_state"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale
+#: code:addons/sale/sale.py:584
+#, python-format
+msgid "Could not cancel this sales order !"
+msgstr "¡No se puede cancelar este pedido de venta!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadísticas pedidos de venta"
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "La cuenta analítica relacionada con un pedido de venta."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa para el pedido de venta actual."
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Delivery Order Only"
+msgstr "Sólo orden de entrega"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Número de días entre la confirmación del pedido y el envío de los productos "
+"al cliente."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Número paquetes"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"El comercial confirma el presupuesto. El estado del pedido de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
+
+#. module: sale
+#: code:addons/sale/sale.py:971
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Debe cancelar primero los movimientos de stock asociados a esta línea de "
+"pedido de venta."
+
+#. module: sale
+#: code:addons/sale/sale.py:1042
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+"Seleccione un producto del tipo de servicio que se llama 'Producto "
+"avanzado'. Puede que tenga que crearlo y configurarlo como un valor por "
+"defecto para este campo."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                              "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+"No puede realizar un anticipo de un pedido de venta que está definido como "
+"'Factura automática después envío'."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,note:0
+#: view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Dirección de facturación para el pedido de venta actual."
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Enhance your core Sales Application with additional functionalities."
+msgstr "Optimizar su aplicación de ventas con funcionalidades adicionales."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Orden de entrega"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha confirmación"
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicación empresa"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "El importe total."
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Dirección de factura :"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Para cada línea de pedido de venta, se crea una orden de abastecimiento para "
+"suministrar el producto vendido."
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm, que significa 'Términos de Comercio Internacional', implica una "
+"serie de condiciones de venta que se utilizan en la transacción comercial."
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección de factura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Presupuesto / Pedido"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
+msgstr "Ventas. Abrir factura"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Setup your sales workflow and default values."
+msgstr "Configurar su flujo de ventas y valores por defecto."
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Pedido Nº"
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas del pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr "Líneas a facturar"
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "Cantidad (UdM)"
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mis ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:290
+#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1165
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Nº de ctdad"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,shipped:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr "Todos los presupuestos"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice On Order After Delivery"
+msgstr "Facturar pedido después de envío"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoría de producto"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
+
+#. module: sale
+#: view:sale.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: sale
+#: field:sale.order,state:0
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Estado del pedido"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "¿Desea crear la(s) factura(s)?"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr "Ventas por mes"
+
+#. module: sale
+#: code:addons/sale/sale.py:970
+#, python-format
+msgid "Could not cancel sales order line!"
+msgstr "¡No se puede cancelar línea pedido de venta!"
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Días seguridad"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Abastecimiento de material vendido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Create Final Invoice"
+msgstr "Crear factura final"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Dirección de envío"
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Indica que el pedido de venta ha sido entregado. Este campo se actualiza "
+"sólo después que el planificador(es) se ha ejecutado."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: sale
+#: model:ir.module.module,description:sale.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage quotations and sales orders.\n"
+"\n"
+"    * Workflow with validation steps:\n"
+"        - Quotation -> Sales order -> Invoice\n"
+"    * Invoicing methods:\n"
+"        - Invoice on order (before or after shipping)\n"
+"        - Invoice on delivery\n"
+"        - Invoice on timesheets\n"
+"        - Advance invoice\n"
+"    * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+"    * Products stocks and prices\n"
+"    * Delivery methods:\n"
+"        - all at once, multi-parcel\n"
+"        - delivery costs\n"
+"    * Dashboard for salesman that includes:\n"
+"    * Your open quotations\n"
+"    * Top 10 sales of the month\n"
+"    * Cases statistics\n"
+"    * Graph of sales by product\n"
+"    * Graph of cases of the month\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo base para gestionar presupuestos y pedidos de venta.\n"
+"\n"
+"    * Flujo de trabajo con etapas de validación:\n"
+"        - Presupuesto -> Pedido de venta -> Factura\n"
+"    * Métodos de facturación:\n"
+"        - Factura del pedido (antes o después del envío)\n"
+"        - Factura del albarán\n"
+"        - Factura de la hoja de servicios\n"
+"        - Avanzar factura\n"
+"    * Preferencias de los clientes (envío, facturación, incoterm, ...)\n"
+"    * Existencias de los productos y precios\n"
+"    * Formas de envío:\n"
+"        - Todo a la vez, En varios paquetes\n"
+"        - Gastos de envío\n"
+"    * El tablero para el comercial incluye:\n"
+"    * Sus presupuestos abiertos\n"
+"    * Las 10 mejores ventas del mes\n"
+"    * Estadísticas de casos\n"
+"    * Gráfico de las ventas por producto\n"
+"    * Gráfico de los casos por mes\n"
+"    "
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tienda ventas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale
+#: field:sale.config.picking_policy,picking_policy:0
+msgid "Picking Default Policy"
+msgstr "Política de empaquetado por defecto"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Esta es la lista de facturas que han sido generadas para este pedido de "
+"venta. El mismo pedido de venta puede haber sido facturado varias veces "
+"(línea a línea, por ejemplo)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr ""
+"El nombre y la dirección del contacto que ha solicitado el pedido o "
+"presupuesto."
+
+#. module: sale
+#: code:addons/sale/sale.py:966
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced !"
+msgstr ""
+"¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Ctdad"
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr "Referencias"
+
+#. 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
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale
+#: field:sale.installer,sale_order_dates:0
+msgid "Sales Order Dates"
+msgstr "Fechas en pedidos de venta"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: sale
+#: field:sale.installer,sale_margin:0
+msgid "Margins in Sales Orders"
+msgstr "Márgenes en pedidos de venta"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr "Total sin impuestos"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr "Ventas por empresa"
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr "Contacto del pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr "Abrir factura"
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_installer
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "Sales Application Configuration"
+msgstr "Configuración aplicaciones de ventas"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "bajo pedido"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basado en las cantidades enviadas o pedidas."
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Albarán relacionado"
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr "Ventas por cliente últimos 90 días"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estado borrador del pedido de venta"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Crear orden de entrega"
+
+#. module: sale
+#: field:sale.installer,delivery:0
+msgid "Delivery Costs"
+msgstr "Costes de envío"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total impuestos incluidos"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Crear albarán"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Ventas por categoría de producto"
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Partial Delivery"
+msgstr "Envío parcial"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar presupuesto"
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referencia del documento que ha generado esta solicitud de pedido de venta."
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Volver a Crear factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr "Albaranes a facturar"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando fecha planificada"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método abastecimiento"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr "Albarán"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order date"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Documento del movimiento a la salida o al cliente."
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr "Confirmar pedido"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Crear orden abastecimiento"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Shipping Policy"
+msgstr "Política de facturación"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Fecha en la que se crea el pedido de venta."
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento stock"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Importe avanzado"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Cantidades enviadas"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr "Factura basada en pedidos de venta"
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: sale
+#: code:addons/sale/sale.py:387
+#: code:addons/sale/sale.py:920
+#: code:addons/sale/sale.py:938
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: sale
+#: code:addons/sale/sale.py:570
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "¡No se puede cancelar el pedido de venta!"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: sale
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Shipping & Manual Invoice"
+msgstr "Enviar & Factura manual"
+
+#. module: sale
+#: code:addons/sale/sale.py:1051
+#, python-format
+msgid "Picking Information !"
+msgstr "¡Información albarán!"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management"
+msgstr "Ventas"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice From The Picking"
+msgstr "Factura desde el albarán"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contable."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,uom_name:0
+msgid "Reference UoM"
+msgstr "Referencia UdM"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Venta Línea_pedido Realizar_factura"
+
+#. module: sale
+#: help:sale.config.picking_policy,step:0
+msgid ""
+"By default, OpenERP is able to manage complex routing and paths of products "
+"in your warehouse and partner locations. This will configure the most common "
+"and simple methods to deliver products to the customer in one or two "
+"operations by the worker."
+msgstr ""
+"Por defecto, OpenERP es capaz de gestionar complejas rutas y caminos de los "
+"productos en su almacén y en las ubicaciones de otras empresas. Esto "
+"configurará los métodos más comunes y sencillos para entregar los productos "
+"al cliente en una o dos operaciones realizadas por el trabajador."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Presupuestos antiguos"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análisis de ventas"
+
+#. module: sale
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El comercial crea una factura manualmente si la política de facturación del "
+"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
+"automática si la política de facturación es 'Pago antes del envío'."
+
+#. module: sale
+#: help:sale.config.picking_policy,order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Puede generar facturas basadas en pedidos de venta o basadas en envíos."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_installer
+msgid "sale.installer"
+msgstr "venta.instalador"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:1014
+#, python-format
+msgid ""
+"You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+"¡Debe seleccionar un cliente en el formulario de ventas!\n"
+"Introduzca un cliente antes de seleccionar un producto."
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Picking List & Delivery Order"
+msgstr "Albarán y Orden de entrega"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Para hacer"
+
+#. module: sale
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr "Política de envío"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documento del movimiento al cliente."
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "El importe sin impuestos."
+
+#. module: sale
+#: code:addons/sale/sale.py:571
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Debe primero cancelar todos los albaranes relacionados con este pedido de "
+"venta."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Ventas. Anticipo pago factura"
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_invoiced
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Cancelar asignación"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr "sale.config.picking_policy"
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"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). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the date 'Ordered Date'."
+msgstr ""
+"Indica el estado del presupuesto o pedido de venta. \n"
+"El estado de excepción se establece automáticamente cuando se produce una "
+"operación de cancelación en la validación de factura (excepción de factura) "
+"o en el procesado del albarán (excepción de envío). \n"
+"El estado 'Esperando planificación' se establece cuando se confirma la "
+"factura, pero está esperando que el planificador la active en la fecha de "
+"\"Fecha pedido\"."
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar las"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha de pedido"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Product UoM"
+msgstr "UdM del producto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Logistic"
+msgstr "Logística"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pedido"
+
+#. module: sale
+#: code:addons/sale/sale.py:921
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función del control de facturación de los pedidos de venta, la factura "
+"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
+"pedido de venta puede generar una factura o un albarán tan pronto como sea "
+"confirmado por el comercial."
+
+#. module: sale
+#: code:addons/sale/sale.py:1116
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"¡Prevé vender %.2f %s pero sólo %.2f %s están disponibles!\n"
+"El stock real es %.2f %s. (sin reservas)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "States"
+msgstr "Estados"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencia cliente"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: code:addons/sale/sale.py:388
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Dependiendo de la configuración de la ubicación de salida, el movimiento "
+"entre la zona de salida y el cliente se realiza a través de la orden de "
+"entrega de forma manual o automática."
+
+#. module: sale
+#: code:addons/sale/sale.py:1165
+#, python-format
+msgid "Cannot delete a sales order line which is %s !"
+msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr "Realizar facturas"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Para facturar"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Fecha en la que se confirma el pedido de venta."
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "El importe a facturar por adelantado."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr ""
+"Esta es la lista de albaranes que han sido generados para este pedido de "
+"venta."
+
+#. module: sale
+#: help:sale.installer,sale_margin:0
+msgid ""
+"Gives the margin of profitability by calculating the difference between Unit "
+"Price and Cost Price."
+msgstr ""
+"Indica el margen de rentabilidad mediante el cálculo de la diferencia entre "
+"el precio unitario y el precio de coste."
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. 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
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: view:sale.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Fecha confirmación"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr "Ventas por mes"
+
+#. module: sale
+#: code:addons/sale/sale.py:1045
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"Ha seleccionado una cantidad de %d unidades.\n"
+"Pero no es compatible con el embalaje seleccionado.\n"
+"Aquí tiene una propuesta de cantidades acordes con este embalaje:\n"
+"\n"
+"EAN: %s Cantidad: %s Tipo de ul: %s"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"El albarán se crea tan pronto como se confirma el pedido de venta, a la vez "
+"que la orden de abastecimiento. Representa la asignación de los componentes "
+"del pedido de venta. Hay un albarán por línea del pedido de venta que "
+"evoluciona con la disponibilidad de los componentes."
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr "Ventas por categoría de producto últimos 90 días"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas pedido de ventas"
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Tiempo inicial entrega"
+
+#. module: sale
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Complete Delivery"
+msgstr "Envío completo"
+
+#. module: sale
+#: view:sale.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: sale
+#: help:sale.config.picking_policy,picking_policy:0
+msgid ""
+"The Shipping Policy is used to configure per order if you want to deliver as "
+"soon as possible when one product is available or you wait that all products "
+"are available.."
+msgstr ""
+"La política de envío se utiliza para configurar el pedido si debe entregarse "
+"tan pronto como sea posible cuando un producto está disponible o debe "
+"esperar a que todos los productos están disponibles."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"No se puede crear la factura a partir de esta línea de pedido de venta por "
+"las siguientes razones:\n"
+"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
+"\"cancelada\".\n"
+"2. La línea del pedido de venta está facturada."
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+#: field:sale.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Se crea automáticamente una orden de abastecimiento tan pronto como se "
+"confirma un pedido de venta o se paga la factura. Provoca la compra y la "
+"producción de productos según las reglas y los parámetros del pedido de "
+"venta. "
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera abastecimiento y facturación"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanzar factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "The sales order '%s' has been cancelled."
+msgstr "El pedido de venta '%s' ha sido cancelado."
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+"* El estado 'Borrador' se establece cuando se crea el pedido de venta.\n"
+"* El estado 'Confirmado' se establece cuando se confirma el pedido de "
+"venta.\n"
+"* El estado 'Excepción' se establece cuando el pedido de venta tiene una "
+"excepción.\n"
+"* El estado 'Realizado' se establece cuando las líneas del pedido de venta "
+"se han enviado.\n"
+"* El estado 'Cancelado' se establece cuando un usuario cancela el pedido de "
+"venta."
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "El importe de los impuestos."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Packings"
+msgstr "Albaranes"
+
+#. module: sale
+#: field:sale.config.picking_policy,progress:0
+#: field:sale.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+msgid "Product sales"
+msgstr "Ventas de producto"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Ordered Date"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de ventas"
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr "Envío directo"
+
+#. module: sale
+#: field:sale.installer,sale_journal:0
+msgid "Invoicing journals"
+msgstr "Diarios de facturación"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Producto avanzado"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped Qty"
+msgstr "Ctdad enviada"
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "¡La factura ha sido creada correctamente!"
+
+#. module: sale
+#: code:addons/sale/sale.py:585
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
+msgstr ""
+"Primero debe cancelar todas las facturas relacionadas con este pedido de "
+"venta."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Configure Your Sales Management Application"
+msgstr "Configurar su aplicación de gestión de ventas"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Pedidos de ventas en proceso"
+
+#. module: sale
+#: field:sale.installer,sale_layout:0
+msgid "Sales Order Layout Improvement"
+msgstr "Mejora plantilla pedido de venta"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Retraso realización"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Una orden de abastecimiento para cada línea del pedido de venta y para cada "
+"uno de los componentes."
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr "Asignar"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Pedido de venta confirmado a factura."
+
+#. module: sale
+#: code:addons/sale/sale.py:290
+#, python-format
+msgid "Cannot delete Sales Order(s) which are already confirmed !"
+msgstr "¡No se puede eliminar pedido(s) de venta que ya está confirmado!"
+
+#. module: sale
+#: code:addons/sale/sale.py:316
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
+msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Shipping Default Policy"
+msgstr "Política de envío por defecto"
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Entregado"
+
+#. module: sale
+#: code:addons/sale/sale.py:1115
+#, python-format
+msgid "Not enough stock !"
+msgstr "¡No hay stock suficiente!"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Debe asignar un lote de producción para este producto"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Layout Sequence"
+msgstr "Secuencia plantilla"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"If you have more than one shop reselling your company products, you can "
+"create and manage that from here. Whenever you will record a new quotation "
+"or sales order, it has to be linked to a shop. The shop also defines the "
+"warehouse from which the products will be delivered for each particular "
+"sales."
+msgstr ""
+"Si tiene más de una tienda donde vende los productos de su compañía, puede "
+"crearlas y gestionarlas desde aquí. Cada vez que codifique un nuevo "
+"presupuesto o pedido de venta, debe estar vinculado a una tienda. La tienda "
+"también define desde que almacén serán entregados los productos para cada "
+"venta."
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Indica que una factura ha sido pagada."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: sale
+#: help:sale.installer,sale_order_dates:0
+msgid "Adds commitment, requested and effective dates on Sales Orders."
+msgstr ""
+"Añade fechas de realización, solicitud y efectivo en pedidos de venta."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Anticipo"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: sale
+#: help:sale.installer,sale_journal:0
+msgid ""
+"Allows you to group and invoice your delivery orders according to different "
+"invoicing types: daily, weekly, etc."
+msgstr ""
+"Permite agrupar y facturar sus albaranes de acuerdo a diferentes tipos de "
+"facturación: diaria, semanal, etc."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: sale
+#: field:sale.config.picking_policy,step:0
+msgid "Steps To Deliver a Sales Order"
+msgstr "Pasos para entregar un pedido de venta"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Buscar pedido de venta"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Solicitud pedido de venta"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
+#. module: sale
+#: help:sale.installer,sale_layout:0
+msgid ""
+"Provides some features to improve the layout of the Sales Order reports."
+msgstr ""
+"Proporciona algunas funcionalidades para mejorar la plantilla de los "
+"informes de pedidos de ventas."
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Este informe realiza un análisis de sus presupuestos y pedidos de venta. El "
+"análisis verifica los ingresos de sus ventas y las ordena por diferentes "
+"grupos de criterios (comercial, empresa, producto, etc.). Utilice este "
+"informe para realizar un análisis sobre sus ventas todavía no facturadas. Si "
+"desea analizar sus ingresos, debería utilizar el informe de análisis de "
+"facturas en la aplicación de Contabilidad."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "Presupuesto Nº"
+
+#. module: sale
+#: field:sale.order,picked_rate:0
+#: view:sale.report:0
+msgid "Picked"
+msgstr "Enviada"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr "Facturar desde albaranes"
+
+#~ msgid "Configure Sale Order Logistic"
+#~ msgstr "Configurar la logística de los pedidos de venta"
+
+#~ msgid "Recreate Procurement"
+#~ msgstr "Recrear abastecimiento"
+
+#~ msgid "Steps To Deliver a Sale Order"
+#~ msgstr "Pasos para entregar un pedido de venta"
+
+#~ msgid "You invoice has been successfully created !"
+#~ msgstr "¡Su factura ha sido creada correctamente!"
+
+#~ msgid "Automatic Declaration"
+#~ msgstr "Declaración automática"
+
+#~ msgid ""
+#~ "This is the list of picking list that have been generated for this invoice"
+#~ msgstr "Ésta es la lista de albaranes que se han generado para esta factura"
+
+#~ msgid "Delivery, from the warehouse to the customer."
+#~ msgstr "Entrega, desde el almacén hasta el cliente."
+
+#~ msgid "After confirming order, Create the invoice."
+#~ msgstr "Después de confirmar el pedido, crear la factura."
+
+#~ msgid ""
+#~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
+#~ "is, quotation is moved to  sale order."
+#~ msgstr ""
+#~ "Cuando presiona el botón Confirmar, el estado Borrador cambia a Manual. es "
+#~ "decir, el presupuesto cambia a pedido de venta."
+
+#~ msgid "Manual Designation"
+#~ msgstr "Designación manual"
+
+#~ msgid "Invoice after delivery"
+#~ msgstr "Facturar después del envío"
+
+#~ msgid "Origin"
+#~ msgstr "Origen"
+
+#~ msgid "Outgoing Products"
+#~ msgstr "Productos salientes"
+
+#~ msgid "Reference"
+#~ msgstr "Referencia"
+
+#~ msgid "Procurement is created after confirmation of sale order."
+#~ msgstr "El abastecimiento es creado después de confirmar un pedido de venta."
+
+#~ msgid "Procure Method"
+#~ msgstr "Método abastecimiento"
+
+#~ msgid "Net Price"
+#~ msgstr "Precio neto"
+
+#~ msgid "My sales order in progress"
+#~ msgstr "Mis pedidos de ventas en proceso"
+
+#~ msgid ""
+#~ "The sale order will automatically create the invoice proposition (draft "
+#~ "invoice). Ordered and delivered quantities may not be the same. You have to "
+#~ "choose if you invoice based on ordered or shipped quantities. If the product "
+#~ "is a service, shipped quantities means hours spent on the associated tasks."
+#~ msgstr ""
+#~ "El pedido de venta creará automáticamente la propuesta de factura (factura "
+#~ "borrador). Las cantidades pedidas y las cantidades enviadas pueden no ser "
+#~ "las mismas. Tiene que decidir si factura basado en cantidades pedidas o "
+#~ "enviadas. Si el producto es un servicio, cantidades enviadas significa horas "
+#~ "dedicadas a las tareas asociadas."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sale order that is defined as 'Automatic "
+#~ "Invoice after delivery'."
+#~ msgstr ""
+#~ "No puede hacer un anticipo en un pedido de venta definido como 'Factura "
+#~ "automática después del envío'."
+
+#~ msgid "All Sales Order"
+#~ msgstr "Todos los pedidos de ventas"
+
+#~ msgid "Sale Shop"
+#~ msgstr "Tienda de ventas"
+
+#~ 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 ""
+#~ "Se crea un albarán cuando presione 'Asigna' después de haber confirmado el "
+#~ "pedido de venta. Esta transacción convierte el pedido de venta a albarán."
+
+#~ msgid "My sales order waiting Invoice"
+#~ msgstr "Mis pedidos de ventas esperarando facturación"
+
+#~ msgid ""
+#~ "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
+#~ "will automatic create after delivery."
+#~ msgstr ""
+#~ "Cuando selecciona una política de envío = 'Factura automática después del "
+#~ "envío', la creará automáticamente después del envío."
+
+#~ msgid "Manual Description"
+#~ msgstr "Descripción manual"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sale order."
+#~ msgstr ""
+#~ "Primero debe cancelar todas las facturas asociadas a este pedido de venta."
+
+#~ msgid "Sale Order Procurement"
+#~ msgstr "Abastecimiento pedido de venta"
+
+#~ msgid "Packing"
+#~ msgstr "Empaquetado/Albarán"
+
+#~ msgid "Invoice on Order After Delivery"
+#~ msgstr "Facturar pedido después del envío"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
+
+#~ msgid "Sales orders"
+#~ msgstr "Pedidos de ventas"
+
+#~ msgid "Payment accounts"
+#~ msgstr "Cuentas de pago"
+
+#~ msgid "Draft Invoice"
+#~ msgstr "Factura borrador"
+
+#~ msgid "Draft customer invoice, to be reviewed by accountant."
+#~ msgstr "Factura de cliente borrador, para ser revisada por un contable."
+
+#~ msgid "Sales Order To Be Invoiced"
+#~ msgstr "Pedidos de ventas a facturar"
+
+#~ msgid "Procurement for each line"
+#~ msgstr "Abastecimiento para cada línea"
+
+#~ msgid "My Quotations"
+#~ msgstr "Mis presupuestos"
+
+#~ msgid "Manages the delivery and invoicing progress"
+#~ msgstr "Gestiona el progreso de envío y facturación"
+
+#, python-format
+#~ msgid "Could not cancel sale order !"
+#~ msgstr "¡No puede cancelar el pedido de venta!"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelado"
+
+#~ msgid "Order Ref"
+#~ msgstr "Ref. pedido"
+
+#~ msgid ""
+#~ "In sale order , procuerement for each line and it comes into the procurement "
+#~ "order"
+#~ msgstr ""
+#~ "En un pedido de venta, abastecer para cada línea y se convierte en la orden "
+#~ "de abastecimiento"
+
+#~ msgid "Uninvoiced Lines"
+#~ msgstr "Líneas no facturadas"
+
+#~ msgid "Sales Process"
+#~ msgstr "Proceso de ventas"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+#~ "categoría."
+
+#~ msgid "My sales in shipping exception"
+#~ msgstr "Mis ventas en excepción de envío"
+
+#~ msgid "Sales Configuration"
+#~ msgstr "Configuración de ventas"
+
+#~ msgid "Procurement Corrected"
+#~ msgstr "Abastecimiento corregido"
+
+#~ msgid "Sale Procurement"
+#~ msgstr "Abastecimiento de venta"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Our Salesman"
+#~ msgstr "Nuestro comercial"
+
+#~ msgid "Create Advance Invoice"
+#~ msgstr "Crear anticipo factura"
+
+#~ msgid "One procurement for each product."
+#~ msgstr "Un abastecimiento por cada producto."
+
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venta"
+
+#~ msgid "Sale Pricelists"
+#~ msgstr "Tarifas de venta"
+
+#~ msgid ""
+#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
+#~ "the sale order. This transaction moves the sale order to invoices."
+#~ msgstr ""
+#~ "Se crea la factura cuando presione 'Crear factura' después de haber "
+#~ "confirmado el pedido de venta. Esta transacción convierte el pedido de venta "
+#~ "a facturas."
+
+#~ msgid "Make Invoice"
+#~ msgstr "Crear factura"
+
+#~ msgid "Sales order lines"
+#~ msgstr "Líneas del pedido de ventas"
+
+#~ msgid "Sequence"
+#~ msgstr "Secuencia"
+
+#~ msgid "Packing OUT is created for stockable products."
+#~ msgstr "Se crea un albarán de salida OUT para productos almacenables."
+
+#~ msgid "Other data"
+#~ msgstr "Otros datos"
+
+#~ msgid ""
+#~ "Confirming the packing list moves them to delivery order. This can be done "
+#~ "by clicking on 'Validate' button."
+#~ msgstr ""
+#~ "Al confirmar el albarán se convierte en una orden de entrega. Esto se puede "
+#~ "realizar haciendo clic en el botón 'Validar'."
+
+#~ msgid "Advance Payment"
+#~ msgstr "Pago anticipado"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Confirm sale order and Create invoice."
+#~ msgstr "Confirmar pedido de venta y crear factura."
+
+#~ msgid "Packing List & Delivery Order"
+#~ msgstr "Albarán & Orden de entrega"
+
+#~ msgid "Sale Order Lines"
+#~ msgstr "Líneas del pedido de venta"
+
+#~ msgid "Do you really want to create the invoices ?"
+#~ msgstr "¿Realmente desea crear las facturas?"
+
+#~ msgid "Invoice based on packing lists"
+#~ msgstr "Factura basada en albaranes"
+
+#~ msgid "Set Default"
+#~ msgstr "Establecer por defecto"
+
+#~ msgid "Sales order"
+#~ msgstr "Pedido de venta"
+
+#~ msgid "Quotation (A sale order in draft state)"
+#~ msgstr "Presupuesto (un pedido de venta en estado borrador)"
+
+#~ msgid "Sale Invoice"
+#~ msgstr "Factura de venta"
+
+#~ msgid "Open Advance Invoice"
+#~ msgstr "Abrir anticipo factura"
+
+#~ msgid "Deliver"
+#~ msgstr "Enviar"
+
+#, python-format
+#~ msgid "Could not cancel this sale order !"
+#~ msgstr "¡No se puede cancelar este pedido de venta!"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Línea pedido de venta"
+
+#~ msgid "Make invoices"
+#~ msgstr "Realizar facturas"
+
+#~ msgid ""
+#~ "The name and address of the contact that requested the order or quotation."
+#~ msgstr ""
+#~ "El nombre y la dirección del contacto que solicita el pedido o presupuesto."
+
+#~ msgid "Purchase Pricelists"
+#~ msgstr "Tarifas de compra"
+
+#, python-format
+#~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
+#~ msgstr ""
+#~ "¡No se puede eliminar pedido(s) de venta que ya está(n) confirmado(s)!"
+
+#~ msgid "New Quotation"
+#~ msgstr "Nuevo presupuesto"
+
+#~ msgid "Total amount"
+#~ msgstr "Importe total"
+
+#~ msgid "Configure Picking Policy for Sale Order"
+#~ msgstr "Configurar política de envío para el pedido de venta"
+
+#~ msgid "Payment Terms"
+#~ msgstr "Plazos de pago"
+
+#~ msgid "Invoice Corrected"
+#~ msgstr "Factura corregida"
+
+#~ msgid "Delivery Delay"
+#~ msgstr "Demora de entrega"
+
+#~ msgid "Related invoices"
+#~ msgstr "Facturas relacionadas"
+
+#~ msgid ""
+#~ "This is the list of invoices that have been generated for this sale order. "
+#~ "The same sale order may have been invoiced in several times (by line for "
+#~ "example)."
+#~ msgstr ""
+#~ "Ésta es la lista de facturas que se han generado para este pedido de venta. "
+#~ "El mismo pedido puede haberse facturado varias veces (por ejemplo por cada "
+#~ "línea)."
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid "My Sales Order"
+#~ msgstr "Mis pedidos de ventas"
+
+#~ msgid "Sale Order line"
+#~ msgstr "Línea pedido de venta"
+
+#~ msgid "Packing Default Policy"
+#~ msgstr "Forma de envío por defecto"
+
+#~ msgid "Packing Policy"
+#~ msgstr "Forma de envío"
+
+#~ msgid "Payment Accounts"
+#~ msgstr "Cuentas de pago"
+
+#~ msgid "Related Packing"
+#~ msgstr "Albarán relacionado"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#, python-format
+#~ msgid "You cannot cancel a sale order line that has already been invoiced !"
+#~ msgstr ""
+#~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
+
+#, python-format
+#~ msgid "You must first cancel all packing attached to this sale order."
+#~ msgstr ""
+#~ "Debe primero cancelar todos los albaranes asociados a este pedido de venta."
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sale form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "¡Debe seleccionar un cliente en el formulario de venta!\n"
+#~ "Por favor, seleccione un cliente antes de elegir un producto."
+
+#~ msgid "Invoice from the Packing"
+#~ msgstr "Facturar desde el albarán"
+
+#~ msgid "Customer Ref"
+#~ msgstr "Ref. cliente"
+
+#~ msgid ""
+#~ "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 packing 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 'Date Ordered'."
+#~ msgstr ""
+#~ "Indica el estado del presupuesto o pedido de venta. El estado de excepción "
+#~ "se establece automáticamente cuando se produce una cancelación en la "
+#~ "validación de la factura (Excepción de factura) o en el procesado del "
+#~ "albarán (Excepción de envío). El estado 'Esperando planificación' se "
+#~ "establece cuando se confirma la factura pero se espera a que el planificador "
+#~ "procese el pedido en la fecha 'Fecha del pedido'."
+
+#~ msgid ""
+#~ "By default, Open ERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Por defecto, OpenERP puede gestionar rutas complejas y rutas de productos en "
+#~ "su almacén y en las ubicaciones de empresas. Esta opción le configurará los "
+#~ "métodos más comunes y sencillos para enviar productos al cliente en una o "
+#~ "dos operaciones hechas por el trabajador."
+
+#~ msgid ""
+#~ "This Configuration step use to set default picking policy when make sale "
+#~ "order"
+#~ msgstr ""
+#~ "Este paso fija la política de empaquetado por defecto cuando se crea un "
+#~ "pedido de venta"
+
+#~ 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 ""
+#~ "La política de facturación se utiliza para sincronizar la factura y las "
+#~ "operaciones de envío.\n"
+#~ "  - La opción 'Pago antes del envío' primero genera la factura y luego "
+#~ "genera el albarán después del pago de esta factura.\n"
+#~ "  - La opción 'Envío '& Factura manual' creará el albarán directamente y "
+#~ "esperará a que el usuario haga clic manualmente en el botón 'Factura' para "
+#~ "generar la factura borrador.\n"
+#~ "  - La opción 'Factura según pedido después envío' generará la factura "
+#~ "borrador basada en el pedido de venta después de que todos los albaranes se "
+#~ "hayan procesado.\n"
+#~ "  - La opción 'Factura desde albarán' se utiliza para crear una factura "
+#~ "durante el proceso de los albaranes."
diff --git a/addons/sale_stock/i18n/es_VE.po b/addons/sale_stock/i18n/es_VE.po
new file mode 100644
index 00000000000..31f2e32d4a9
--- /dev/null
+++ b/addons/sale_stock/i18n/es_VE.po
@@ -0,0 +1,2665 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-01-18 01:15+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: 2011-09-05 05:21+0000\n"
+"X-Generator: Launchpad (build 13830)\n"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr "Ventas por comercial últimos 90 días"
+
+#. module: sale
+#: help:sale.installer,delivery:0
+msgid "Allows you to compute delivery costs on your quotations."
+msgstr "Le permite calcular los costos de envío en sus presupuestos."
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Si no dispone de suficientes existencias para enviarlo todo de una vez, "
+"¿acepta envíos parciales o no?"
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Dirección de envío para el pedido de venta actual."
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0
+#: report:sale.order:0
+msgid "Quantity"
+msgstr "Cantidad"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,day:0
+msgid "Day"
+msgstr "Día"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr "Cancelar pedido"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Configure Sales Order Logistics"
+msgstr "Configurar logística pedidos de venta"
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Payment Before Delivery"
+msgstr "Pago antes del envío"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr "¡Aviso!"
+
+#. module: sale
+#: report:sale.order:0
+msgid "VAT"
+msgstr "IVA"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Genera órdenes de abastecimiento para cada línea de pedido de venta."
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "All at Once"
+msgstr "Todo a la vez"
+
+#. module: sale
+#: field:sale.order,project_id:0
+#: view:sale.report:0
+#: field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Cuenta analítica"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"Here is a list of each sales order line to be invoiced. You can invoice "
+"sales orders partially, by lines of sales order. You do not need this list "
+"if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+"Esta es una lista de todas las líneas de pedidos de venta a facturar. Puede "
+"facturar pedidos de venta parcialmente, por líneas de pedido. No necesita "
+"esta lista si factura desde albaranes de salida o si factura pedidos de "
+"venta completos."
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Orden de abastecimiento"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Empresa"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Línea del pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"Sales Orders help you manage quotations and orders from your customers. "
+"OpenERP suggests that you start by creating a quotation. Once it is "
+"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+"handle several types of products so that a sales order may trigger tasks, "
+"delivery orders, manufacturing orders, purchases and so on. Based on the "
+"configuration of the sales order, a draft invoice will be generated so that "
+"you just have to confirm it when you want to bill your customer."
+msgstr ""
+"Los pedidos de ventas le ayudan a gestionar presupuestos y pedidos de sus "
+"clientes. OpenERP sugiere que comience por crear un presupuesto. Una vez "
+"esté confirmado, el presupuesto se convertirá en un pedido de venta. OpenERP "
+"puede gestionar varios tipos de productos de forma que un pedido de venta "
+"puede generar tareas, órdenes de entrega, órdenes de fabricación, compras, "
+"etc. Según la configuración del pedido de venta, se generará una factura en "
+"borrador de manera que sólo hay que confirmarla cuando se quiera facturar a "
+"su cliente."
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"El pedido de venta creará automáticamente la proposición de la factura "
+"(factura borrador). Las cantidades pedidas y entregadas pueden no ser las "
+"mismas. Debe elegir si desea que su factura se base en las cantidades "
+"pedidas o entregadas. Si el producto es un servicio, las cantidades enviadas "
+"son las horas dedicadas a las tareas asociadas."
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Plazo de pago por defecto"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+msgid "Configure Picking Policy for Sales Order"
+msgstr "Configurar la política envío para pedidos de venta"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr "Estado"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Desc.(%)"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forzar asignación"
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Cantidades pedidas"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr "Ventas por comercial"
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Movimientos de inventario"
+
+#. module: sale
+#: field:sale.order,name:0
+#: field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Referencia del pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Otra información"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr "Fechas"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"La factura se crea de forma automática si la política de facturación es "
+"\"Facturar desde el albarán\" o \"Facturar pedido después del envío\"."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Ventas. Realizar factura"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Recrear albarán"
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Descuento (%)"
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Estos días por razones de seguridad se añaden a los que promete a los "
+"clientes."
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr "Tablero responsable ventas"
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Empaquetado"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Desde un pedido de venta"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nombre tienda"
+
+#. module: sale
+#: code:addons/sale/sale.py:1014
+#, python-format
+msgid "No Customer Defined !"
+msgstr "¡No se ha definido un cliente!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Ventas en excepción"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr "Cambiar a borrador"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr "Condiciones"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+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 picking order after the payment of this invoice.\n"
+"  - The 'Shipping & Manual Invoice' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice.\n"
+"  - The 'Invoice On Order After Delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice From The Picking' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+"La política de envío se utiliza para sincronizar las operaciones de envío y "
+"facturación.\n"
+"  -La opción 'Pagar antes del envío' primero generará la factura y más tarde "
+"el albarán después del pago de dicha factura.\n"
+"  -La opción 'Envío y factura manual' creará el albarán directamente y "
+"esperará a que un usuario haga clic manualemente sobre el botón 'Facturar' "
+"para generar la factura en el estado borrador.\n"
+"  -La opción 'Facturar pedido después del envío' generará la factura en "
+"estado borrador basándose en el pedido de venta después de que todas los "
+"albaranes hayan sido realizados.\n"
+"  -La opción 'Facturar desde albarán' se utiliza para crear una factura "
+"durante el proceso de preparación del pedido."
+
+#. module: sale
+#: code:addons/sale/sale.py:939
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+"¡No hay ninguna cuenta de categoría de ingresos definida en las propiedades "
+"por defecto de la categoría del producto o la posición fiscal no está "
+"definida!"
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "Está intentando asignar un lote que no es del mismo producto"
+
+#. module: sale
+#: code:addons/sale/sale.py:620
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "Modo no válido para test_state"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Junio"
+
+#. module: sale
+#: code:addons/sale/sale.py:584
+#, python-format
+msgid "Could not cancel this sales order !"
+msgstr "¡No se puede cancelar este pedido de venta!"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estadísticas pedidos de venta"
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "La cuenta analítica relacionada con un pedido de venta."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Octubre"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Quotations"
+msgstr "Presupuestos"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Tarifa para el pedido de venta actual."
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Delivery Order Only"
+msgstr "Sólo orden de entrega"
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "IVA :"
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Número de días entre la confirmación del pedido y el envío de los productos "
+"al cliente."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Fecha presupuesto"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Posición fiscal"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "UoM"
+msgstr "UdM"
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Número paquetes"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "In Progress"
+msgstr "En proceso"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"El comercial confirma el presupuesto. El estado del pedido de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
+
+#. module: sale
+#: code:addons/sale/sale.py:971
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Debe cancelar primero los movimientos de stock asociados a esta línea de "
+"pedido de venta."
+
+#. module: sale
+#: code:addons/sale/sale.py:1042
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+"Seleccione un producto del tipo de servicio que se llama 'Producto "
+"avanzado'. Puede que tenga que crearlo y configurarlo como un valor por "
+"defecto para este campo."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel. :"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                              "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+"No puede realizar un anticipo de un pedido de venta que está definido como "
+"'Factura automática después envío'."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,note:0
+#: view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr "Notas"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Dirección de facturación para el pedido de venta actual."
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Enhance your core Sales Application with additional functionalities."
+msgstr "Optimizar su aplicación de ventas con funcionalidades adicionales."
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0
+#: field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Facturado"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Orden de entrega"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Fecha confirmación"
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Ubicación empresa"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique !"
+msgstr "¡La referencia del pedido debe ser única!"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "El importe total."
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotal"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Dirección de factura :"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Para cada línea de pedido de venta, se crea una orden de abastecimiento para "
+"suministrar el producto vendido."
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm, que significa 'Términos de Comercio Internacional', implica una "
+"serie de condiciones de venta que se utilizan en la transacción comercial."
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Dirección de factura"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Buscar líneas no facturadas"
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Presupuesto / Pedido"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# de líneas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
+msgstr "Ventas. Abrir factura"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Línea pedido de venta"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Setup your sales workflow and default values."
+msgstr "Configurar su flujo de ventas y valores por defecto."
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Almacén"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Pedido Nº"
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Líneas del pedido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr "Líneas a facturar"
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "Cantidad (UdM)"
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Fecha creación"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Líneas no facturadas y entregadas"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mis ventas"
+
+#. module: sale
+#: code:addons/sale/sale.py:290
+#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1165
+#, python-format
+msgid "Invalid action !"
+msgstr "¡Acción no válida!"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0
+#: field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Tarifa"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Nº de ctdad"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.report,shipped:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr "Todos los presupuestos"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice On Order After Delivery"
+msgstr "Facturar pedido después de envío"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "Septiembre"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Categoría de producto"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Impuestos :"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Movimientos de stock"
+
+#. module: sale
+#: view:sale.report:0
+msgid "  Year  "
+msgstr "  Año  "
+
+#. module: sale
+#: field:sale.order,state:0
+#: field:sale.report,state:0
+msgid "Order State"
+msgstr "Estado del pedido"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr "¿Desea crear la(s) factura(s)?"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr "Ventas por mes"
+
+#. module: sale
+#: code:addons/sale/sale.py:970
+#, python-format
+msgid "Could not cancel sales order line!"
+msgstr "¡No se puede cancelar línea pedido de venta!"
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Días seguridad"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Abastecimiento de material vendido"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Create Final Invoice"
+msgstr "Crear factura final"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Dirección de envío"
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Indica que el pedido de venta ha sido entregado. Este campo se actualiza "
+"sólo después que el planificador(es) se ha ejecutado."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Filtros extendidos..."
+
+#. module: sale
+#: model:ir.module.module,description:sale.module_meta_information
+msgid ""
+"\n"
+"    The base module to manage quotations and sales orders.\n"
+"\n"
+"    * Workflow with validation steps:\n"
+"        - Quotation -> Sales order -> Invoice\n"
+"    * Invoicing methods:\n"
+"        - Invoice on order (before or after shipping)\n"
+"        - Invoice on delivery\n"
+"        - Invoice on timesheets\n"
+"        - Advance invoice\n"
+"    * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+"    * Products stocks and prices\n"
+"    * Delivery methods:\n"
+"        - all at once, multi-parcel\n"
+"        - delivery costs\n"
+"    * Dashboard for salesman that includes:\n"
+"    * Your open quotations\n"
+"    * Top 10 sales of the month\n"
+"    * Cases statistics\n"
+"    * Graph of sales by product\n"
+"    * Graph of cases of the month\n"
+"    "
+msgstr ""
+"\n"
+"    El módulo base para gestionar presupuestos y pedidos de venta.\n"
+"\n"
+"    * Flujo de trabajo con etapas de validación:\n"
+"        - Presupuesto -> Pedido de venta -> Factura\n"
+"    * Métodos de facturación:\n"
+"        - Factura del pedido (antes o después del envío)\n"
+"        - Factura del albarán\n"
+"        - Factura de la hoja de servicios\n"
+"        - Avanzar factura\n"
+"    * Preferencias de los clientes (envío, facturación, incoterm, ...)\n"
+"    * Existencias de los productos y precios\n"
+"    * Formas de envío:\n"
+"        - Todo a la vez, En varios paquetes\n"
+"        - Gastos de envío\n"
+"    * El tablero para el comercial incluye:\n"
+"    * Sus presupuestos abiertos\n"
+"    * Las 10 mejores ventas del mes\n"
+"    * Estadísticas de casos\n"
+"    * Gráfico de las ventas por producto\n"
+"    * Gráfico de los casos por mes\n"
+"    "
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Tienda ventas"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "Noviembre"
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr "Historial"
+
+#. module: sale
+#: field:sale.config.picking_policy,picking_policy:0
+msgid "Picking Default Policy"
+msgstr "Política de empaquetado por defecto"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Esta es la lista de facturas que han sido generadas para este pedido de "
+"venta. El mismo pedido de venta puede haber sido facturado varias veces "
+"(línea a línea, por ejemplo)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Su referencia"
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr ""
+"El nombre y la dirección del contacto que ha solicitado el pedido o "
+"presupuesto."
+
+#. module: sale
+#: code:addons/sale/sale.py:966
+#, python-format
+msgid "You cannot cancel a sales order line that has already been invoiced !"
+msgstr ""
+"¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Ctdad"
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr "Referencias"
+
+#. 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
+#: view:sale.advance.payment.inv:0
+#: view:sale.make.invoice:0
+#: view:sale.order.line:0
+#: view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale
+#: field:sale.installer,sale_order_dates:0
+msgid "Sales Order Dates"
+msgstr "Fechas en pedidos de venta"
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Excepción"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Crear factura"
+
+#. module: sale
+#: field:sale.installer,sale_margin:0
+msgid "Margins in Sales Orders"
+msgstr "Márgenes en pedidos de venta"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr "Total sin impuestos"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Calcular"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr "Ventas por empresa"
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr "Contacto del pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr "Abrir factura"
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order.line:0
+msgid "Price"
+msgstr "Precio"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_installer
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "Sales Application Configuration"
+msgstr "Configuración aplicaciones de ventas"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Precio total"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "bajo pedido"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basado en las cantidades enviadas o pedidas."
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Albarán relacionado"
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Dirección de envío :"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr "Ventas por cliente últimos 90 días"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Estado borrador del pedido de venta"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Crear orden de entrega"
+
+#. module: sale
+#: field:sale.installer,delivery:0
+msgid "Delivery Costs"
+msgstr "Costes de envío"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Total impuestos incluidos"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Crear albarán"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Ventas por categoría de producto"
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Partial Delivery"
+msgstr "Envío parcial"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Confirmar presupuesto"
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referencia del documento que ha generado esta solicitud de pedido de venta."
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+#: view:sale.report:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Volver a Crear factura"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr "Albaranes a facturar"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Esperando fecha planificada"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método abastecimiento"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr "Albarán"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order date"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Documento del movimiento a la salida o al cliente."
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr "Confirmar pedido"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Crear orden abastecimiento"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Impuestos"
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Shipping Policy"
+msgstr "Política de facturación"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Fecha en la que se crea el pedido de venta."
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento stock"
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Información extra"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax :"
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Importe avanzado"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Cantidades enviadas"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr "Factura basada en pedidos de venta"
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: sale
+#: code:addons/sale/sale.py:387
+#: code:addons/sale/sale.py:920
+#: code:addons/sale/sale.py:938
+#, python-format
+msgid "Error !"
+msgstr "¡Error!"
+
+#. module: sale
+#: code:addons/sale/sale.py:570
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "¡No se puede cancelar el pedido de venta!"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Julio"
+
+#. module: sale
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Abastecimiento"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Excepción de envío"
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Agrupar las facturas"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Shipping & Manual Invoice"
+msgstr "Enviar & Factura manual"
+
+#. module: sale
+#: code:addons/sale/sale.py:1051
+#, python-format
+msgid "Picking Information !"
+msgstr "¡Información albarán!"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,month:0
+msgid "Month"
+msgstr "Mes"
+
+#. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
+msgid "Sales Management"
+msgstr "Ventas"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice From The Picking"
+msgstr "Factura desde el albarán"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Para ser revisado por el contable."
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,uom_name:0
+msgid "Reference UoM"
+msgstr "Referencia UdM"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Venta Línea_pedido Realizar_factura"
+
+#. module: sale
+#: help:sale.config.picking_policy,step:0
+msgid ""
+"By default, OpenERP is able to manage complex routing and paths of products "
+"in your warehouse and partner locations. This will configure the most common "
+"and simple methods to deliver products to the customer in one or two "
+"operations by the worker."
+msgstr ""
+"Por defecto, OpenERP es capaz de gestionar complejas rutas y caminos de los "
+"productos en su almacén y en las ubicaciones de otras empresas. Esto "
+"configurará los métodos más comunes y sencillos para entregar los productos "
+"al cliente en una o dos operaciones realizadas por el trabajador."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Presupuestos antiguos"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Pagado"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all
+#: view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Análisis de ventas"
+
+#. module: sale
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Propiedades"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Presupuesto"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"El comercial crea una factura manualmente si la política de facturación del "
+"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
+"automática si la política de facturación es 'Pago antes del envío'."
+
+#. module: sale
+#: help:sale.config.picking_policy,order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Puede generar facturas basadas en pedidos de venta o basadas en envíos."
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0
+#: view:sale.report:0
+msgid "Sales"
+msgstr "Ventas"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Precio unidad"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Done"
+msgstr "Realizado"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_installer
+msgid "sale.installer"
+msgstr "venta.instalador"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:1014
+#, python-format
+msgid ""
+"You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+"¡Debe seleccionar un cliente en el formulario de ventas!\n"
+"Introduzca un cliente antes de seleccionar un producto."
+
+#. module: sale
+#: selection:sale.config.picking_policy,step:0
+msgid "Picking List & Delivery Order"
+msgstr "Albarán y Orden de entrega"
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Documento origen"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Para hacer"
+
+#. module: sale
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr "Política de envío"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documento del movimiento al cliente."
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "El importe sin impuestos."
+
+#. module: sale
+#: code:addons/sale/sale.py:571
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Debe primero cancelar todos los albaranes relacionados con este pedido de "
+"venta."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Ventas. Anticipo pago factura"
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
+#: view:sale.order.line:0
+#: field:sale.order.line,product_id:0
+#: view:sale.report:0
+#: field:sale.report,product_id:0
+msgid "Product"
+msgstr "Producto"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_invoiced
+msgid "Invoicing"
+msgstr "Facturación"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Cancelar asignación"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr "sale.config.picking_policy"
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"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). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the date 'Ordered Date'."
+msgstr ""
+"Indica el estado del presupuesto o pedido de venta. \n"
+"El estado de excepción se establece automáticamente cuando se produce una "
+"operación de cancelación en la validación de factura (excepción de factura) "
+"o en el procesado del albarán (excepción de envío). \n"
+"El estado 'Esperando planificación' se establece cuando se confirma la "
+"factura, pero está esperando que el planificador la active en la fecha de "
+"\"Fecha pedido\"."
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Facturar las"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Fecha de pedido"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV del producto"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Manual en proceso"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Product UoM"
+msgstr "UdM del producto"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Logistic"
+msgstr "Logística"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Pedido"
+
+#. module: sale
+#: code:addons/sale/sale.py:921
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar excepción"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"En función del control de facturación de los pedidos de venta, la factura "
+"puede estar basada en las cantidades entregadas o pedidas. Por lo tanto, un "
+"pedido de venta puede generar una factura o un albarán tan pronto como sea "
+"confirmado por el comercial."
+
+#. module: sale
+#: code:addons/sale/sale.py:1116
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"¡Prevé vender %.2f %s pero sólo %.2f %s están disponibles!\n"
+"El stock real es %.2f %s. (sin reservas)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "States"
+msgstr "Estados"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr "res_config_contenidos"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referencia cliente"
+
+#. module: sale
+#: field:sale.order,amount_total:0
+#: view:sale.order.line:0
+msgid "Total"
+msgstr "Total"
+
+#. module: sale
+#: code:addons/sale/sale.py:388
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"No se ha definido un diario de ventas para esta compañía: \"%s\" (id:%d)"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Dependiendo de la configuración de la ubicación de salida, el movimiento "
+"entre la zona de salida y el cliente se realiza a través de la orden de "
+"entrega de forma manual o automática."
+
+#. module: sale
+#: code:addons/sale/sale.py:1165
+#, python-format
+msgid "Cannot delete a sales order line which is %s !"
+msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr "Realizar facturas"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Para facturar"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Fecha en la que se confirma el pedido de venta."
+
+#. module: sale
+#: field:sale.order,company_id:0
+#: field:sale.order.line,company_id:0
+#: view:sale.report:0
+#: field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Fecha factura"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "El importe a facturar por adelantado."
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Excepción de factura"
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr ""
+"Esta es la lista de albaranes que han sido generados para este pedido de "
+"venta."
+
+#. module: sale
+#: help:sale.installer,sale_margin:0
+msgid ""
+"Gives the margin of profitability by calculating the difference between Unit "
+"Price and Cost Price."
+msgstr ""
+"Indica el margen de rentabilidad mediante el cálculo de la diferencia entre "
+"el precio unitario y el precio de coste."
+
+#. module: sale
+#: view:sale.make.invoice:0
+#: view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Crear facturas"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Total neto :"
+
+#. module: sale
+#: selection:sale.order,state:0
+#: selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Cancelado"
+
+#. 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
+#: view:sale.report:0
+#: field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Tienda"
+
+#. module: sale
+#: view:sale.report:0
+msgid "   Month   "
+msgstr "   Mes   "
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Fecha confirmación"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid "Warning"
+msgstr "Aviso"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr "Ventas por mes"
+
+#. module: sale
+#: code:addons/sale/sale.py:1045
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"Ha seleccionado una cantidad de %d unidades.\n"
+"Pero no es compatible con el embalaje seleccionado.\n"
+"Aquí tiene una propuesta de cantidades acordes con este embalaje:\n"
+"\n"
+"EAN: %s Cantidad: %s Tipo de ul: %s"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order
+#: view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Pedido de venta"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Cantidad (UdV)"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"El albarán se crea tan pronto como se confirma el pedido de venta, a la vez "
+"que la orden de abastecimiento. Representa la asignación de los componentes "
+"del pedido de venta. Hay un albarán por línea del pedido de venta que "
+"evoluciona con la disponibilidad de los componentes."
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "¡Error! No puede crear compañías recursivas."
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr "Ventas por categoría de producto últimos 90 días"
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Líneas de factura"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Líneas pedido de ventas"
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Tiempo inicial entrega"
+
+#. module: sale
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuración"
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Complete Delivery"
+msgstr "Envío completo"
+
+#. module: sale
+#: view:sale.report:0
+msgid "    Month-1    "
+msgstr "    Mes-1    "
+
+#. module: sale
+#: help:sale.config.picking_policy,picking_policy:0
+msgid ""
+"The Shipping Policy is used to configure per order if you want to deliver as "
+"soon as possible when one product is available or you wait that all products "
+"are available.."
+msgstr ""
+"La política de envío se utiliza para configurar el pedido si debe entregarse "
+"tan pronto como sea posible cuando un producto está disponible o debe "
+"esperar a que todos los productos están disponibles."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:111
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"No se puede crear la factura a partir de esta línea de pedido de venta por "
+"las siguientes razones:\n"
+"1. El estado de esta línea del pedido de venta está en estado \"borrador\" o "
+"\"cancelada\".\n"
+"2. La línea del pedido de venta está facturada."
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Peso"
+
+#. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
+#: field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturas"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "Diciembre"
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+#: field:sale.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Se crea automáticamente una orden de abastecimiento tan pronto como se "
+"confirma un pedido de venta o se paga la factura. Provoca la compra y la "
+"producción de productos según las reglas y los parámetros del pedido de "
+"venta. "
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "No facturada"
+
+#. module: sale
+#: report:sale.order:0
+#: view:sale.order:0
+#: field:sale.order,user_id:0
+#: view:sale.order.line:0
+#: field:sale.order.line,salesman_id:0
+#: view:sale.report:0
+#: field:sale.report,user_id:0
+msgid "Salesman"
+msgstr "Comercial"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Genera abastecimiento y facturación"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Base imponible"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr "Avanzar factura"
+
+#. module: sale
+#: code:addons/sale/sale.py:591
+#, python-format
+msgid "The sales order '%s' has been cancelled."
+msgstr "El pedido de venta '%s' ha sido cancelado."
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+"* El estado 'Borrador' se establece cuando se crea el pedido de venta.\n"
+"* El estado 'Confirmado' se establece cuando se confirma el pedido de "
+"venta.\n"
+"* El estado 'Excepción' se establece cuando el pedido de venta tiene una "
+"excepción.\n"
+"* El estado 'Realizado' se establece cuando las líneas del pedido de venta "
+"se han enviado.\n"
+"* El estado 'Cancelado' se establece cuando un usuario cancela el pedido de "
+"venta."
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "El importe de los impuestos."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Packings"
+msgstr "Albaranes"
+
+#. module: sale
+#: field:sale.config.picking_policy,progress:0
+#: field:sale.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+msgid "Product sales"
+msgstr "Ventas de producto"
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Ordered Date"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+#: view:sale.order:0
+msgid "Sales Orders"
+msgstr "Pedidos de ventas"
+
+#. module: sale
+#: selection:sale.config.picking_policy,picking_policy:0
+msgid "Direct Delivery"
+msgstr "Envío directo"
+
+#. module: sale
+#: field:sale.installer,sale_journal:0
+msgid "Invoicing journals"
+msgstr "Diarios de facturación"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Producto avanzado"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped Qty"
+msgstr "Ctdad enviada"
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "¡La factura ha sido creada correctamente!"
+
+#. module: sale
+#: code:addons/sale/sale.py:585
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
+msgstr ""
+"Primero debe cancelar todas las facturas relacionadas con este pedido de "
+"venta."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Enero"
+
+#. module: sale
+#: view:sale.installer:0
+msgid "Configure Your Sales Management Application"
+msgstr "Configurar su aplicación de gestión de ventas"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Pedidos de ventas en proceso"
+
+#. module: sale
+#: field:sale.installer,sale_layout:0
+msgid "Sales Order Layout Improvement"
+msgstr "Mejora plantilla pedido de venta"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Error"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Retraso realización"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Una orden de abastecimiento para cada línea del pedido de venta y para cada "
+"uno de los componentes."
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr "Asignar"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Fecha pedido"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Pedido de venta confirmado a factura."
+
+#. module: sale
+#: code:addons/sale/sale.py:290
+#, python-format
+msgid "Cannot delete Sales Order(s) which are already confirmed !"
+msgstr "¡No se puede eliminar pedido(s) de venta que ya está confirmado!"
+
+#. module: sale
+#: code:addons/sale/sale.py:316
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
+msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "desde stock"
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Shipping Default Policy"
+msgstr "Política de envío por defecto"
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Entregado"
+
+#. module: sale
+#: code:addons/sale/sale.py:1115
+#, python-format
+msgid "Not enough stock !"
+msgstr "¡No hay stock suficiente!"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Debe asignar un lote de producción para este producto"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Layout Sequence"
+msgstr "Secuencia plantilla"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"If you have more than one shop reselling your company products, you can "
+"create and manage that from here. Whenever you will record a new quotation "
+"or sales order, it has to be linked to a shop. The shop also defines the "
+"warehouse from which the products will be delivered for each particular "
+"sales."
+msgstr ""
+"Si tiene más de una tienda donde vende los productos de su compañía, puede "
+"crearlas y gestionarlas desde aquí. Cada vez que codifique un nuevo "
+"presupuesto o pedido de venta, debe estar vinculado a una tienda. La tienda "
+"también define desde que almacén serán entregados los productos para cada "
+"venta."
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Indica que una factura ha sido pagada."
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order.line,name:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mayo"
+
+#. module: sale
+#: help:sale.installer,sale_order_dates:0
+msgid "Adds commitment, requested and effective dates on Sales Orders."
+msgstr ""
+"Añade fechas de realización, solicitud y efectivo en pedidos de venta."
+
+#. module: sale
+#: view:sale.order:0
+#: field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Anticipo"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Febrero"
+
+#. module: sale
+#: help:sale.installer,sale_journal:0
+msgid ""
+"Allows you to group and invoice your delivery orders according to different "
+"invoicing types: daily, weekly, etc."
+msgstr ""
+"Permite agrupar y facturar sus albaranes de acuerdo a diferentes tipos de "
+"facturación: diaria, semanal, etc."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "Abril"
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr "Contabilidad"
+
+#. module: sale
+#: field:sale.config.picking_policy,step:0
+msgid "Steps To Deliver a Sales Order"
+msgstr "Pasos para entregar un pedido de venta"
+
+#. module: sale
+#: view:sale.order:0
+#: view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Buscar pedido de venta"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Solicitud pedido de venta"
+
+#. module: sale
+#: report:sale.order:0
+#: field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Plazo de pago"
+
+#. module: sale
+#: help:sale.installer,sale_layout:0
+msgid ""
+"Provides some features to improve the layout of the Sales Order reports."
+msgstr ""
+"Proporciona algunas funcionalidades para mejorar la plantilla de los "
+"informes de pedidos de ventas."
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Este informe realiza un análisis de sus presupuestos y pedidos de venta. El "
+"análisis verifica los ingresos de sus ventas y las ordena por diferentes "
+"grupos de criterios (comercial, empresa, producto, etc.). Utilice este "
+"informe para realizar un análisis sobre sus ventas todavía no facturadas. Si "
+"desea analizar sus ingresos, debería utilizar el informe de análisis de "
+"facturas en la aplicación de Contabilidad."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "Presupuesto Nº"
+
+#. module: sale
+#: field:sale.order,picked_rate:0
+#: view:sale.report:0
+msgid "Picked"
+msgstr "Enviada"
+
+#. module: sale
+#: view:sale.report:0
+#: field:sale.report,year:0
+msgid "Year"
+msgstr "Año"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr "Facturar desde albaranes"
+
+#~ msgid "Configure Sale Order Logistic"
+#~ msgstr "Configurar la logística de los pedidos de venta"
+
+#~ msgid "Recreate Procurement"
+#~ msgstr "Recrear abastecimiento"
+
+#~ msgid "Steps To Deliver a Sale Order"
+#~ msgstr "Pasos para entregar un pedido de venta"
+
+#~ msgid "You invoice has been successfully created !"
+#~ msgstr "¡Su factura ha sido creada correctamente!"
+
+#~ msgid "Automatic Declaration"
+#~ msgstr "Declaración automática"
+
+#~ msgid ""
+#~ "This is the list of picking list that have been generated for this invoice"
+#~ msgstr "Ésta es la lista de albaranes que se han generado para esta factura"
+
+#~ msgid "Delivery, from the warehouse to the customer."
+#~ msgstr "Entrega, desde el almacén hasta el cliente."
+
+#~ msgid "After confirming order, Create the invoice."
+#~ msgstr "Después de confirmar el pedido, crear la factura."
+
+#~ msgid ""
+#~ "Whenever confirm button is clicked, the draft state is moved to manual. that "
+#~ "is, quotation is moved to  sale order."
+#~ msgstr ""
+#~ "Cuando presiona el botón Confirmar, el estado Borrador cambia a Manual. es "
+#~ "decir, el presupuesto cambia a pedido de venta."
+
+#~ msgid "Manual Designation"
+#~ msgstr "Designación manual"
+
+#~ msgid "Invoice after delivery"
+#~ msgstr "Facturar después del envío"
+
+#~ msgid "Origin"
+#~ msgstr "Origen"
+
+#~ msgid "Outgoing Products"
+#~ msgstr "Productos salientes"
+
+#~ msgid "Reference"
+#~ msgstr "Referencia"
+
+#~ msgid "Procurement is created after confirmation of sale order."
+#~ msgstr "El abastecimiento es creado después de confirmar un pedido de venta."
+
+#~ msgid "Procure Method"
+#~ msgstr "Método abastecimiento"
+
+#~ msgid "Net Price"
+#~ msgstr "Precio neto"
+
+#~ msgid "My sales order in progress"
+#~ msgstr "Mis pedidos de ventas en proceso"
+
+#~ msgid ""
+#~ "The sale order will automatically create the invoice proposition (draft "
+#~ "invoice). Ordered and delivered quantities may not be the same. You have to "
+#~ "choose if you invoice based on ordered or shipped quantities. If the product "
+#~ "is a service, shipped quantities means hours spent on the associated tasks."
+#~ msgstr ""
+#~ "El pedido de venta creará automáticamente la propuesta de factura (factura "
+#~ "borrador). Las cantidades pedidas y las cantidades enviadas pueden no ser "
+#~ "las mismas. Tiene que decidir si factura basado en cantidades pedidas o "
+#~ "enviadas. Si el producto es un servicio, cantidades enviadas significa horas "
+#~ "dedicadas a las tareas asociadas."
+
+#, python-format
+#~ msgid ""
+#~ "You cannot make an advance on a sale order that is defined as 'Automatic "
+#~ "Invoice after delivery'."
+#~ msgstr ""
+#~ "No puede hacer un anticipo en un pedido de venta definido como 'Factura "
+#~ "automática después del envío'."
+
+#~ msgid "All Sales Order"
+#~ msgstr "Todos los pedidos de ventas"
+
+#~ msgid "Sale Shop"
+#~ msgstr "Tienda de ventas"
+
+#~ 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 ""
+#~ "Se crea un albarán cuando presione 'Asigna' después de haber confirmado el "
+#~ "pedido de venta. Esta transacción convierte el pedido de venta a albarán."
+
+#~ msgid "My sales order waiting Invoice"
+#~ msgstr "Mis pedidos de ventas esperarando facturación"
+
+#~ msgid ""
+#~ "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
+#~ "will automatic create after delivery."
+#~ msgstr ""
+#~ "Cuando selecciona una política de envío = 'Factura automática después del "
+#~ "envío', la creará automáticamente después del envío."
+
+#~ msgid "Manual Description"
+#~ msgstr "Descripción manual"
+
+#, python-format
+#~ msgid "You must first cancel all invoices attached to this sale order."
+#~ msgstr ""
+#~ "Primero debe cancelar todas las facturas asociadas a este pedido de venta."
+
+#~ msgid "Sale Order Procurement"
+#~ msgstr "Abastecimiento pedido de venta"
+
+#~ msgid "Packing"
+#~ msgstr "Empaquetado/Albarán"
+
+#~ msgid "Invoice on Order After Delivery"
+#~ msgstr "Facturar pedido después del envío"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "¡XML inválido para la definición de la vista!"
+
+#~ msgid "Error: UOS must be in a different category than the UOM"
+#~ msgstr "Error: La UdV debe estar en una categoría diferente que la UdM"
+
+#~ msgid "Sales orders"
+#~ msgstr "Pedidos de ventas"
+
+#~ msgid "Payment accounts"
+#~ msgstr "Cuentas de pago"
+
+#~ msgid "Draft Invoice"
+#~ msgstr "Factura borrador"
+
+#~ msgid "Draft customer invoice, to be reviewed by accountant."
+#~ msgstr "Factura de cliente borrador, para ser revisada por un contable."
+
+#~ msgid "Sales Order To Be Invoiced"
+#~ msgstr "Pedidos de ventas a facturar"
+
+#~ msgid "Procurement for each line"
+#~ msgstr "Abastecimiento para cada línea"
+
+#~ msgid "My Quotations"
+#~ msgstr "Mis presupuestos"
+
+#~ msgid "Manages the delivery and invoicing progress"
+#~ msgstr "Gestiona el progreso de envío y facturación"
+
+#, python-format
+#~ msgid "Could not cancel sale order !"
+#~ msgstr "¡No puede cancelar el pedido de venta!"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancelado"
+
+#~ msgid "Order Ref"
+#~ msgstr "Ref. pedido"
+
+#~ msgid ""
+#~ "In sale order , procuerement for each line and it comes into the procurement "
+#~ "order"
+#~ msgstr ""
+#~ "En un pedido de venta, abastecer para cada línea y se convierte en la orden "
+#~ "de abastecimiento"
+
+#~ msgid "Uninvoiced Lines"
+#~ msgstr "Líneas no facturadas"
+
+#~ msgid "Sales Process"
+#~ msgstr "Proceso de ventas"
+
+#~ msgid ""
+#~ "Error: The default UOM and the purchase UOM must be in the same category."
+#~ msgstr ""
+#~ "Error: La UdM por defecto y la UdM de compra deben estar en la misma "
+#~ "categoría."
+
+#~ msgid "My sales in shipping exception"
+#~ msgstr "Mis ventas en excepción de envío"
+
+#~ msgid "Sales Configuration"
+#~ msgstr "Configuración de ventas"
+
+#~ msgid "Procurement Corrected"
+#~ msgstr "Abastecimiento corregido"
+
+#~ msgid "Sale Procurement"
+#~ msgstr "Abastecimiento de venta"
+
+#~ msgid "Status"
+#~ msgstr "Estado"
+
+#~ msgid "Our Salesman"
+#~ msgstr "Nuestro comercial"
+
+#~ msgid "Create Advance Invoice"
+#~ msgstr "Crear anticipo factura"
+
+#~ msgid "One procurement for each product."
+#~ msgstr "Un abastecimiento por cada producto."
+
+#~ msgid "Sale Order"
+#~ msgstr "Pedido de venta"
+
+#~ msgid "Sale Pricelists"
+#~ msgstr "Tarifas de venta"
+
+#~ msgid ""
+#~ "Invoice is created when 'Create Invoice' is being clicked after confirming "
+#~ "the sale order. This transaction moves the sale order to invoices."
+#~ msgstr ""
+#~ "Se crea la factura cuando presione 'Crear factura' después de haber "
+#~ "confirmado el pedido de venta. Esta transacción convierte el pedido de venta "
+#~ "a facturas."
+
+#~ msgid "Make Invoice"
+#~ msgstr "Crear factura"
+
+#~ msgid "Sales order lines"
+#~ msgstr "Líneas del pedido de ventas"
+
+#~ msgid "Sequence"
+#~ msgstr "Secuencia"
+
+#~ msgid "Packing OUT is created for stockable products."
+#~ msgstr "Se crea un albarán de salida OUT para productos almacenables."
+
+#~ msgid "Other data"
+#~ msgstr "Otros datos"
+
+#~ msgid ""
+#~ "Confirming the packing list moves them to delivery order. This can be done "
+#~ "by clicking on 'Validate' button."
+#~ msgstr ""
+#~ "Al confirmar el albarán se convierte en una orden de entrega. Esto se puede "
+#~ "realizar haciendo clic en el botón 'Validar'."
+
+#~ msgid "Advance Payment"
+#~ msgstr "Pago anticipado"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+#~ "especial!"
+
+#~ msgid "Confirm sale order and Create invoice."
+#~ msgstr "Confirmar pedido de venta y crear factura."
+
+#~ msgid "Packing List & Delivery Order"
+#~ msgstr "Albarán & Orden de entrega"
+
+#~ msgid "Sale Order Lines"
+#~ msgstr "Líneas del pedido de venta"
+
+#~ msgid "Do you really want to create the invoices ?"
+#~ msgstr "¿Realmente desea crear las facturas?"
+
+#~ msgid "Invoice based on packing lists"
+#~ msgstr "Factura basada en albaranes"
+
+#~ msgid "Set Default"
+#~ msgstr "Establecer por defecto"
+
+#~ msgid "Sales order"
+#~ msgstr "Pedido de venta"
+
+#~ msgid "Quotation (A sale order in draft state)"
+#~ msgstr "Presupuesto (un pedido de venta en estado borrador)"
+
+#~ msgid "Sale Invoice"
+#~ msgstr "Factura de venta"
+
+#~ msgid "Open Advance Invoice"
+#~ msgstr "Abrir anticipo factura"
+
+#~ msgid "Deliver"
+#~ msgstr "Enviar"
+
+#, python-format
+#~ msgid "Could not cancel this sale order !"
+#~ msgstr "¡No se puede cancelar este pedido de venta!"
+
+#~ msgid "Sale Order Line"
+#~ msgstr "Línea pedido de venta"
+
+#~ msgid "Make invoices"
+#~ msgstr "Realizar facturas"
+
+#~ msgid ""
+#~ "The name and address of the contact that requested the order or quotation."
+#~ msgstr ""
+#~ "El nombre y la dirección del contacto que solicita el pedido o presupuesto."
+
+#~ msgid "Purchase Pricelists"
+#~ msgstr "Tarifas de compra"
+
+#, python-format
+#~ msgid "Cannot delete Sale Order(s) which are already confirmed !"
+#~ msgstr ""
+#~ "¡No se puede eliminar pedido(s) de venta que ya está(n) confirmado(s)!"
+
+#~ msgid "New Quotation"
+#~ msgstr "Nuevo presupuesto"
+
+#~ msgid "Total amount"
+#~ msgstr "Importe total"
+
+#~ msgid "Configure Picking Policy for Sale Order"
+#~ msgstr "Configurar política de envío para el pedido de venta"
+
+#~ msgid "Payment Terms"
+#~ msgstr "Plazos de pago"
+
+#~ msgid "Invoice Corrected"
+#~ msgstr "Factura corregida"
+
+#~ msgid "Delivery Delay"
+#~ msgstr "Demora de entrega"
+
+#~ msgid "Related invoices"
+#~ msgstr "Facturas relacionadas"
+
+#~ msgid ""
+#~ "This is the list of invoices that have been generated for this sale order. "
+#~ "The same sale order may have been invoiced in several times (by line for "
+#~ "example)."
+#~ msgstr ""
+#~ "Ésta es la lista de facturas que se han generado para este pedido de venta. "
+#~ "El mismo pedido puede haberse facturado varias veces (por ejemplo por cada "
+#~ "línea)."
+
+#~ msgid "Error: Invalid ean code"
+#~ msgstr "Error: Código EAN erróneo"
+
+#~ msgid "My Sales Order"
+#~ msgstr "Mis pedidos de ventas"
+
+#~ msgid "Sale Order line"
+#~ msgstr "Línea pedido de venta"
+
+#~ msgid "Packing Default Policy"
+#~ msgstr "Forma de envío por defecto"
+
+#~ msgid "Packing Policy"
+#~ msgstr "Forma de envío"
+
+#~ msgid "Payment Accounts"
+#~ msgstr "Cuentas de pago"
+
+#~ msgid "Related Packing"
+#~ msgstr "Albarán relacionado"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nombre de modelo no válido en la definición de acción."
+
+#, python-format
+#~ msgid "You cannot cancel a sale order line that has already been invoiced !"
+#~ msgstr ""
+#~ "¡No puede cancelar una línea de pedido de venta que ya ha sido facturada!"
+
+#, python-format
+#~ msgid "You must first cancel all packing attached to this sale order."
+#~ msgstr ""
+#~ "Debe primero cancelar todos los albaranes asociados a este pedido de venta."
+
+#, python-format
+#~ msgid ""
+#~ "You have to select a customer in the sale form !\n"
+#~ "Please set one customer before choosing a product."
+#~ msgstr ""
+#~ "¡Debe seleccionar un cliente en el formulario de venta!\n"
+#~ "Por favor, seleccione un cliente antes de elegir un producto."
+
+#~ msgid "Invoice from the Packing"
+#~ msgstr "Facturar desde el albarán"
+
+#~ msgid "Customer Ref"
+#~ msgstr "Ref. cliente"
+
+#~ msgid ""
+#~ "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 packing 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 'Date Ordered'."
+#~ msgstr ""
+#~ "Indica el estado del presupuesto o pedido de venta. El estado de excepción "
+#~ "se establece automáticamente cuando se produce una cancelación en la "
+#~ "validación de la factura (Excepción de factura) o en el procesado del "
+#~ "albarán (Excepción de envío). El estado 'Esperando planificación' se "
+#~ "establece cuando se confirma la factura pero se espera a que el planificador "
+#~ "procese el pedido en la fecha 'Fecha del pedido'."
+
+#~ msgid ""
+#~ "By default, Open ERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "Por defecto, OpenERP puede gestionar rutas complejas y rutas de productos en "
+#~ "su almacén y en las ubicaciones de empresas. Esta opción le configurará los "
+#~ "métodos más comunes y sencillos para enviar productos al cliente en una o "
+#~ "dos operaciones hechas por el trabajador."
+
+#~ msgid ""
+#~ "This Configuration step use to set default picking policy when make sale "
+#~ "order"
+#~ msgstr ""
+#~ "Este paso fija la política de empaquetado por defecto cuando se crea un "
+#~ "pedido de venta"
+
+#~ 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 ""
+#~ "La política de facturación se utiliza para sincronizar la factura y las "
+#~ "operaciones de envío.\n"
+#~ "  - La opción 'Pago antes del envío' primero genera la factura y luego "
+#~ "genera el albarán después del pago de esta factura.\n"
+#~ "  - La opción 'Envío '& Factura manual' creará el albarán directamente y "
+#~ "esperará a que el usuario haga clic manualmente en el botón 'Factura' para "
+#~ "generar la factura borrador.\n"
+#~ "  - La opción 'Factura según pedido después envío' generará la factura "
+#~ "borrador basada en el pedido de venta después de que todos los albaranes se "
+#~ "hayan procesado.\n"
+#~ "  - La opción 'Factura desde albarán' se utiliza para crear una factura "
+#~ "durante el proceso de los albaranes."
diff --git a/addons/sale_stock/i18n/et.po b/addons/sale_stock/i18n/et.po
new file mode 100644
index 00000000000..54b7fc5a690
--- /dev/null
+++ b/addons/sale_stock/i18n/et.po
@@ -0,0 +1,703 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 13:58+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Tarnetellimus"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Kas sa aktsepteerid osalist tarnimist, kui sul pole piisavalt laovarusid, et "
+"tarnida kõik korraga."
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Valideeri"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Pood"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Müügikorraldus"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Saatmispoliitika"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Klient"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Ladu"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Sunni omistamine"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Inventuuri liikumised"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Hankimine"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "vigane viis test_olekule"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Pakendamine"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Omadused"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Omista"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "laost"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Arve"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Tühista"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Pakkide arv"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Loo arve"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Tarneklausel"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Kohale toimetama"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Tühista omistamine"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "korraldusel"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Nopitud"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/fi.po b/addons/sale_stock/i18n/fi.po
new file mode 100644
index 00000000000..c27764566d5
--- /dev/null
+++ b/addons/sale_stock/i18n/fi.po
@@ -0,0 +1,728 @@
+# Finnish 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: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 13:57+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"Language-Team: Finnish <fi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Toimitusmääräys"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Jos varastosaldo ei riitä kaikkien lähettämiseen kerrallaan, hyväksytkö "
+"osittaisen lähettämisen?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Hankintatapa"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "Keräilytiedot ! : "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Keräilylista"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Dokumentti siirrosta kohdepaikkaan tai asiakkalle."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Vahvista"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Myymälä"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Luo hankintatilaus"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Myyntitilaus"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Jokaiselle myyntitilausriville luodaan hankintatilaus myydyn tuotteen "
+"hankkimiseksi."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Toimituskäytäntö"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm tarkoittaa 'international commercial terms' kansainväliset "
+"toimitushedot, nämä määrittelevät sarjan myyntiehtoa joita käytetään "
+"kaupankäynnissä."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Ohjaa hankintatilauksia jokaiselle myyntitilausriville"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Varastosiirto"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Toimituksiin perustuva lasku"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Myyntitilaus"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Myyntitilauksen Rivi"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Asiakas"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Virhe! Rekursiivisiä yrityksiä ei voi luoda."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Nämä päivät lisätään asiakkaalle luvattuun aikaan toimituksen takaamiseksi."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Keräilylista"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Varasto"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Pakota luovutus"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Ei voi peruuttaa myyntitilausta !"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Toimitusviive"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokumentti siirrosta asiakkaalle"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Varastosiirrot"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Lasku luodaan automaattisesti jos toimitusmäärityksenä on 'laskuta "
+"keräilystä' tai 'laskuta tilauksesta toimituksen jälkeen'."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Hankinta"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Toimitettu"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "invalid mode for test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Hankintatilaus luodaan automaattisesti kun myyntitilaus on vahvistettu tai "
+"lasku maksettu. Se ohjaa hankintaa ja tuotantoa myyntitilausten parametrien "
+"ja sääntöjen mukaan. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Paketointi"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Konfiguraatio virhe !"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Varopäivät"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Myydyn materiaalin hankinta"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Myymälä"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Merkitsee että myyntitilaus on toimitettu. Tämä kenttä päivitetään vasta kun "
+"ajastimet on laukaistu."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Ominaisuudet"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr "Voit luoda laskuja myyntitilausten tai toimitusten pohjalta."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Myyntitilausten Tilastot"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Yritykset"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "Viitteen tulee olla uniikki yrityskohtaisesti!"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Yksi hankintatilaus jokaista myyntitilausriviä kohti ja jokaista komponettia "
+"kohti."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Luovuta"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Ei tarpeeksi varastoa ! : "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Päivien määrä tilausvahvistuksesta toimituksen lähettämiseen asiakkaalle."
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "varastosta"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Lasku"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Peruuta"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Pakkauksien määrä"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Tilausviitteen tulee olla uniikki yrityskohtaisesti!"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Toimitettu"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Sinun pitää ensin peruuttaa kaikki keräilyt jotka liittyvät tähän "
+"myyntitilaukseen."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Luo lasku"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Myynnin ennakkomaksulasku"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Sinun pitää ensin peruuttaa tähän myyntitilausriviin kiinnitetyt "
+"varastosiirrot."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(ei saatavilla)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Toimita"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Peruuta luovutus"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "tilauksesta"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Perustu joko lähetettyihin tai tilattuihin määriin"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Toimita kaikki tuotteet kerralla"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Liittyvä keräily"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Yrityksen nimen pitää olla uniikki!"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Myyntitilausehdotus"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Luo toimitusmääräin"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ohita poikkeus"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Suunnitelet myyväsi %.2f %s mutta sinulla on vain %.2f %s saatavilla !\n"
+"Todellinen varasto on %.2f %s (ilman varauksia)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Kerätty"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Toimita jokainen tuote kun saaatavilla"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Luo Keräyslista"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Riippuen paikan lähtöpisteen määrittelyista, siirto lähetysalueen ja "
+"asiakkaan välillä tehdään toimitusmääräimissä käsin tai automaattisest."
diff --git a/addons/sale_stock/i18n/fr.po b/addons/sale_stock/i18n/fr.po
new file mode 100644
index 00000000000..b03219bc653
--- /dev/null
+++ b/addons/sale_stock/i18n/fr.po
@@ -0,0 +1,738 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:14+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Bon de livraison"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Si vous n'avez pas suffisamment de stock pour livrer en une seule fois, "
+"acceptez vous les livraisons partielles ?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Méthode d'approvisionnement"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Bon de transfert"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Document du mouvement vers la sortie ou vers le client."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Valider"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Magasin"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Créer un ordre d'approvisionnement"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Commande client"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Pour chaque ligne de commande, un ordre d'approvisionnement est créé pour "
+"fournir le produit vendu."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Politique d'expédition"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm qui est la contraction de \"International Commercial terms\" "
+"(Termes commerciaux internationaux) implique une série de termes de vente "
+"qui sont utilisés dans les transactions commerciales."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Génère des ordres d'approvisionnements pour chaque ligne de commande"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Mouvement de stock"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Odre d'approvisionnement"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Facturer sur livraison"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Commande de ventes"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Ligne de commandes de vente"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"Le formulaire de la liste de préparation est créé dès que le bon de commande "
+"est confirmé, en même temps que l'ordre d’approvisionnement. Cela représente "
+"l'attribution d'une partie du bon de commande. Il y a 1 liste de préparation "
+"par ligne de vente qui évolue avec la disponibilité des parties."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Client"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"C'est le nombre de jours ajoutés à ce que vous avez promis au client par "
+"sécurité"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Bon de livraison"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Entrepôt"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forcer l'assignation"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Vous ne pouvez pas annuler le bon de commande !"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Délai de livraison"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Document du mouvement vers le client"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Mouvements de stock"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"La facture est créée automatiquement si la politique d'expédition est "
+"\"Facturer sur livraison\" ou \"Facturer sur commande après livraison\"."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Approvisionnement"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Expédié"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "Mode incorrect pour test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Un ordre d'approvisionnement est automatiquement créé lors de la "
+"confirmation des bons de commande ou quand la facture est payé. Il dirige "
+"les achats et la production de produits en fonction des règles et des "
+"paramètres des bons de commande. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Conditionnement"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Erreur de configuration !"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Jours de sécurité"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Approvisionnement des matériaux vendus"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Magasin"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Cela indique que les bons de commande ont bien été livrés. Ce champ est mis "
+"à jour seulement après que l'ordonnanceur ait été lancé."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Propriétés"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Vous pouvez créer des factures basées sur les commandes de vente ou les "
+"expéditions."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistiques sur les commandes de ventes"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Sociétés"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "La référence doit être unique par société !"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Un ordre d'approvisionnement pour chaque ligne de vente et pour chaque "
+"composant."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Assigner"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Pas assez de stock ! "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Nombre de jours entre la confirmation de la commande et l'expédition des "
+"produits au client"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Depuis le stock"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Facture"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Nombre de colis"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "La référence de commande doit être unique par société!"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Livré"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Vous devez d'abord annuler toutes les livraisons attachées à ce bon de "
+"commande."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Créer facture"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Facture de paiement d'avance"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Annuler d'abord les mouvements de stock attachés à cette ligne de bon de "
+"commandes."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Livraison"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Annuler l'assignation"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Sur commande"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basé sur les quantités expédiées ou commandées"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Livraison de tous les produits en une fois"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Bon de livraison lié"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Le nom de la société doit être unique !"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Réquisition du bon de commande"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Créer un bon de livraison"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ne pas traiter l'incident"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Vous tentez de vendre %.2f %s mais vous avez seulement %.2f %s disponibles "
+"!\n"
+"Le stock réel est %.2f %s. (sans les réservations)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Réceptionné"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Livrer chaque produit dès qu'il est disponible"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Créer un bon de transfert"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Selon la configuration de l'emplacement de sortie, le mouvement entre l'aire "
+"de sortie et le client est effectué via le bon de livraison manuellement ou "
+"automatiquement."
diff --git a/addons/sale_stock/i18n/gl.po b/addons/sale_stock/i18n/gl.po
new file mode 100644
index 00000000000..3be63d8d49f
--- /dev/null
+++ b/addons/sale_stock/i18n/gl.po
@@ -0,0 +1,702 @@
+# Galician translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 13:59+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Galician <gl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basado en nas cantidades enviadas ou pedidas."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/hr.po b/addons/sale_stock/i18n/hr.po
new file mode 100644
index 00000000000..2ac6aa969f4
--- /dev/null
+++ b/addons/sale_stock/i18n/hr.po
@@ -0,0 +1,725 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * sale
+# Drazen Bosak <drazen.bosak@gmail.com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:14+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Vinteh <>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+"Language: hr\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Otpremnica"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Prihvaćate li djelomičnu isporuku ako nemate na raspolaganju dovoljno robe "
+"na zalihi?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metoda nabave"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Lista odabira"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Dokument premještaja na izlaz ili kod kupca."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Ovjeri"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Prodavaonica"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Napravi zahtjev za nabavom"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Prodajna narudžba"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Za svaku stavku prodajnog naloga kreira se nalog za nabavu proizvoda koji se "
+"prodaje."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Pravila otpreme"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm (akronim za 'International Commercial terms') ukazuje da se radi o "
+"nizu komercijalnih izraza koji se koriste pri komercijalnim transakcijama."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Izvršava nalog za nabavu za svaku stavku prodajnog naloga."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Premještaj zalihe"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Narudžba nabave"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Faktura temeljena na isporukama"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Prodajni nalog"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Stavka prodajnog naloga"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"Kada se prodajni nalog potvrdi, otvara se forma sa listom za odabir i kreira "
+"se nalog za nabavu. Lista odabira dodjeljuje stavke prodajnom nalogu. "
+"Postoji jedna lista odabira za svaku stavku narudžbe koje se proširuje "
+"ovisno o dostupnosti dijelova."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Kupac"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Pogreška! Ne možete kreirati rekurzivne tvrtke."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "Sigurnosni dani dodani na broj dana dogovorenih sa kupcima"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Lista odabira"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladište"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Prisilno dodijeljivanje"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Nije moguće otkazati prodajni nalog!"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Glavno vrijeme dostave"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokument premještaja kod kupca."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Premještanje zaliha"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Faktura se kreira automatski ako je način dostave 'Faktura iz načina "
+"slaganja robe' ili 'Faktura na narudžbu nakon dostave'."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Nabava"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Otpremljeno"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "Neispravan način za test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Nalog za nabavu se automatski kreira čim je prodajni nalog potvrđen ili "
+"faktura plaćena. Nalog pokreće nabavu i proizvodnju prema pravilima i "
+"parametrima iz prodajnog naloga. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Pakiranje"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Greška kod konfiguracije!"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Sigurnosni dani"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Nabava prodanog materijala"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Prodavaonica"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Pokazatelj da je prodajni nalog dostavljen. Ovo polje se ažurira samo nakon "
+"pokretanja planera."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Svojstva"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr "Možete napraviti fakture prema ponudama ili otpremnicama."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistika prodajnih naloga"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Tvrtke"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "Vezna oznaka je već korištena."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Jedan nalog za nabavu za svaku stavku prodajnog naloga i za svaku komponentu."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Dodijeli"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr "Broj dana između potvrde narudžbe i otpremanja proizvoda kupcu"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Iz zalihe"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Odustani"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Broj paketa"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Poveznica narudžbe mora biti jedinstvena za Organizaciju!"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Dostavljeno"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr "Morate prije otkazati sve odabire vezane uz ovaj prodajni nalog."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Napravi fakturu"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Faktura za predujam"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Prvo morate otkazati sve skladišne dokumente vezane uz ovaj prodajni nalog."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Isporuči"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Otkaži dodjelu"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Po narudžbi"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Temeljeno na otpremljenim ili naručenim količinama."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Isporuči sve proizvode odjednom"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Pripadajući odabir"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Naziv organizacije mora biti jedinstven!"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Zahtjev za prodajnim nalogom"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Napravi otpremnicu"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Zanemari iznimku"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Planirate prodati %.2f %s ali vam je raspoloživo samo %.2f %s !\n"
+"Prava zaliha je %.2f %s. (bez rezervacija)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Odabran"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Isporuči svaki proizvod kada je dostupan"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Napravi listu odabira"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"U ovisnosti o postavkama izlazne lokacije, premještaj između izlaznog "
+"područja i kupca se izvršava preko otpremnice ručno ili automatski."
diff --git a/addons/sale_stock/i18n/hu.po b/addons/sale_stock/i18n/hu.po
new file mode 100644
index 00000000000..b06559a6da4
--- /dev/null
+++ b/addons/sale_stock/i18n/hu.po
@@ -0,0 +1,737 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#    * sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:01+0000\n"
+"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
+"<openerp@novotrade.hu>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Kiszállítási megbízás"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Ha nincs elegendő áruja raktáron, hogy egyszerre leszállítson mindent, "
+"elfogadja a részleges szállításokat?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Beszerzési módszer"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Kiszedési lista"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Dokumentum a gyártásnak vagy a vevőnek irányuló árumozgásról."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Érvényesítés"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Üzlet"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Beszerzési megbízás létrehozása"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Rendelés"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Minden értékesítési megbízási sorhoz létrejön egy beszerzési megbízás is az "
+"eladott termék előteremtésére."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Szállítási szabályok"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Az INCOTERMS, amely azt jelenti, hogy \"Nemzetközi Kereskedelmi "
+"Feltételek\", a nemzetközi kereskedelmi tranzakciókban használatos "
+"szakkifejezéseket tartalmazza."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Beszerzési megbízást generál minden értékesítési megbízási sorhoz."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Készletmozgás"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Beszerzési megbízás"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Értékesítési megbízás"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Értékesítési megbízási sor"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Vevő"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Hiba! Nem hozhat létre rekurzív vállalatokat."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "A vevőknek ígért, biztonsági okokból hozzáadott napok száma."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Kiszedési lista"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Raktár"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Hozzárendelés eröltetése"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Nem lehet visszavonni az értékesítési megbízást!"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Kiszállítás átfutási idő"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokumentum a vevőnek történő mozgásról."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Leltármozgás"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"A számla automatikusan létrejön, ha a kiszállítási szabály: számlázás "
+"kiszedésből vagy számlázás kiszállítás után."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Beszerzés"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Kiszállított"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "érvénytelen mód a tesztállapotban"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"A rendszer automatikusan egy beszerzési megbízást hoz létre, amint "
+"megerősítettük az értékesítési megbízást, vagy a számlát kifizették. A "
+"rendszer az értékesítési megbízásokon keresztül irányítja a szállítói "
+"megrendeléseket és a termékek gyártását is a beállított szabályoknak és az "
+"értékesítési megbízás paramétereinek megfelelően. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Csomagolás"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Biztonsági napok"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Az eladott anyagok beszerzése"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Értékesítési bolt"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Jelzi, hogy az értékesítési megbízás kiszállításra került. Ez a mező csak "
+"akkor frissül, ha az ütemező(k) elindult(ak)."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Tulajdonságok"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Létrehozhat számlát értékesítési megbízások vagy kiszállítások alapján."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Értékesítési megbízási statisztikák"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Vállalatok"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Egy beszerzési megbízás minden egyes értékesítési megbízási sorhoz és minden "
+"egyes alkotóelemhez."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Hozzárendelés"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"A megrendelés megerősítése és a termékek vevőnek történő kiszállítása között "
+"eltelt napok száma."
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "készletből"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Számla"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Mégsem"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Csomagok száma"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Kiszállított"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Először vissza kell vonnia minden ehhez az értékesítési megbízáshoz csatolt "
+"kiválasztást."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Számla készítése"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Értékesítési Fizetési számla"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Először érvénytelenítenie kell az ehhez az értékesítési megbízási sorhoz "
+"tartozó készletmozgásokat."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(nem alkalmazható)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Nemzetközi Kereskedelmi Feltételek"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Szállítás"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Számla sztornó"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Megendelésre"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "A kiszálított vagy a megrendelt mennyiség alapján."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Kapcsolódó kiszedések"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Értékesítési megbízás igénylés"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Kiszállítási megbízás létrehozása"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Hiba figyelmen kívül hagyása"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"El szertné adni a következő mennyiséget: %.2f %s, de csak a következő "
+"mennyiség érhető el a raktáron: %.2f %s!\n"
+"A valós készlet: %.2f %s. (foglalások nélkül)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Kiszedve"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Kiszedési lista létrehozása"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"A kiadási hely beállításától függően a kiadási terület és a vevő telephelye "
+"közötti árumozgás manuális vagy automatikus kiszállítási megbízással "
+"kezelhető."
diff --git a/addons/sale_stock/i18n/id.po b/addons/sale_stock/i18n/id.po
new file mode 100644
index 00000000000..cd9fcb7240d
--- /dev/null
+++ b/addons/sale_stock/i18n/id.po
@@ -0,0 +1,736 @@
+# Indonesian 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: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:16+0000\n"
+"Last-Translator: opix <inur.opix@gmail.com>\n"
+"Language-Team: Indonesian <id@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Pengiriman Order"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Jika anda tidak mempunya cukup stok yang akan dikirim, apakah anda setuju "
+"jika hanya dikirim sebagian?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metode Pengadaan"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Daftar Jemput"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Dokumen pindah ke output atau kepada pelanggan"
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Validasi"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Toko"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Buat Order Pengadaan"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Untuk setiap daftar pemesanan, a order pembelian dibuat untuk  persediaan  "
+"produk yang terjual."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Kebijakan dalam pengiriman"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterms yang merupakan singkatan dari  'istilah Komersial Internasional' "
+"menyiratkan seri istilah penjualan yang digunakan dalam transaksi komersial."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "meningkatkan order pengadaan pada setiap daftar order penjualan"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Perpindahan Stok"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Order procurement"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Sales order"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Daftar order penjualan"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"form dari daftar pengambilan dibuat begitu pesanan penjualan "
+"dikonfirmasikan, dalam waktu yang sama seperti  urutan  pengadaan. Ini "
+"merupakan  penugasan  bagian  untuk  urutan  penjualan. Ada 1 daftar "
+"pengambikab dengan  daftar sales order dengan ketersediaan  suku cadang."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Customer"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Error! Anda tidak dapat membuat perusahaan secara berulang ulang"
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Dimana anda menjanjikan kepada pelanggan masalah penambahan hari untuk "
+"keperluan keamanan"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Daftar Jemput"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Gudang"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Penetapan Tugas"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Order Penjualan tidak dapat di batalkan !"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Lama Waktu Pengiriman"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Berkas yang pindah pada rekanan"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Perpindahan Barang"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"invoice dibuat secara otomatis jika kebijakan pengiriman adalah 'invoicedari "
+"penjemputan' atau 'invoice setelah pengiriman\""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Pengadaan"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Dikirimkan"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "mode tidak sah untuk test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Perintah pengadaan secara otomatis  dibuat  segera setelah order penjualan "
+"dikonfirmasi atau sebagai faktur dibayar. Ini membuat pembelian dan produksi "
+"produk sehubungan dengan  peraturan  dan parameter urutan's penjualan "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Kemasan"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Keamanan hari"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Pengadaan material yang dijual"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Toko Penjualan"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Ini mengindikasikan bahwa order penjualan telah di kirim. Kolom ini di "
+"update hanya setelah penjadwalan telah di jalankan"
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Properti"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Dapat menghasilkan tagihan berdasarkan pesanan penjualan atau berdasarkan  "
+"pengiriman."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistik order penjualan"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Perusahaan"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Satu Pengadaan Agar setiap daftar pesanan penjualan dan untuk masing-masing  "
+"komponen."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Menetapkan"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Jumlah hari antara konfirmasi pemesanan pengiriman produk kepada pelanggan"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "dari stok"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Invoice"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Batal"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Nomor Kemasan"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Sudah Terkirim"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Anda harus membatalkan terlebih dahulu  semua pengambilan yang ada  pada "
+"order penjualan"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Buat Faktur"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Pembayaran faktur penjualan"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Anda harus terlebih dahulu membatalkan stock bergerak yang ada  pada daftar "
+"penjualan."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "tidak tersedia"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Pembatalan penugasan"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Dalam pemesanan"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Berdasarkan pengiriman atau dalam jumlah pemesanan"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Penjemputan terkait"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Permintaan Order Penjualan"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Buat pesanan pengiriman"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Abaikan pengecualian"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Anda berencana menjual %.2f %s tapi anda hanya mempunyai %.2f %s yang "
+"tersedia !\n"
+"Stok sebenarnya  %.2f %s. (tanpa pemesanan)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Sudah Diambil"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Buat daftar penjemputan"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Tergantung dari konfigurasi  lokasi output, perpindahan antara daerah output "
+"klien selesai melalui pemesanan pengiriman secara manual ataupun secara "
+"otomatis"
diff --git a/addons/sale_stock/i18n/is.po b/addons/sale_stock/i18n/is.po
new file mode 100644
index 00000000000..b95e1a9aee1
--- /dev/null
+++ b/addons/sale_stock/i18n/is.po
@@ -0,0 +1,704 @@
+# Icelandic translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 13:56+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Icelandic <is@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Ef þú hefur ekki nægan lager til að afhenta allt í einu, villtu þá leyfa að "
+"senda hluta sendingar eða ekki?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Staðfesta"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Gera reikn út frá sendingum"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Viðskiptavinur"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Lager færslur"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/it.po b/addons/sale_stock/i18n/it.po
new file mode 100644
index 00000000000..18b82bf51e7
--- /dev/null
+++ b/addons/sale_stock/i18n/it.po
@@ -0,0 +1,739 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:03+0000\n"
+"Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Ordine di consegna"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Se non si ha disponibile a magazzino tutto il materiale da consegnare in una "
+"sola volta, si accetta comunque la spedizione parziale oppure no?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metodo di approvvigionamento"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Lista prelievo"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Documento del movimento verso area di uscita o verso area cliente."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Convalida"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Negozio"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Crea l'ordine di approvvigionamento"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Ordine di Vendita"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Per ogni linea d'ordine viene creato un ordine di approvvigionamento per "
+"permettere la fornitura del prodotto venduto."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Politica di Spedizione"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterms, contrazione di 'International commercial terms', è una serie di "
+"termini di vendita utilizzati nelle transazioni commerciali fra stati."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+"Imposta gli ordini di approvvigionamento per ogni linea d'ordine di vendita"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Movimento di magazzino"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Ordine di approvvigionamento"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Ordine di vendita"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Linea d'ordine di vendita"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"Il form della lista di prelievo viene creato non appena l'ordine di vendita "
+"viene confermato, nello stesso tempo dell'ordine di approvvigionamento. Esso "
+"rappresenta l'assegnamento di tutte le merci all'ordine di vendita. Ad ogni "
+"linea d'ordine viene associata una lista prelievo che evolverà in funzione "
+"della disponibilità delle merci."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Errore! Non è possibile creare aziende ricorsive."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"I giorni aggiunti per sicurezza al tempo di consegna promesso al cliente"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Documento di trasporto"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazzino"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forza Assegnazione"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Non è possibile cancellare l'ordine di vendita!"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Tempo di consegna"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documento del movimento per il cliente."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Spostamenti Inventario"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"La fattura viene creata automaticamente se il metodo di spedizione risulta "
+"'Fattura da prelievo' o 'Fattura su ordine dopo la consegna'."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Approvvigionamento"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Spedite"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "stato invalido per test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Un ordine di approvvigionamento viene creato automaticamente non appena "
+"l'ordine di vendita viene confermato o la fattura viene pagata. Questo "
+"determina l'acquisto e la produzione delle merci in funzione delle regole e "
+"dei parametri dell'ordine di vendita. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Confezionamento"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Giorni di sicurezza"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Approviggionamento della merce venduta"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Negozio"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Indica che l'ordine di vendita è stato consegnato. Questo campo viene "
+"aggiornato solo dopo che lo (gli) scheduler sono partiti."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Proprietà"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"E' possibile generare fatture a partire dagli ordini di vendita o a partire "
+"dalle spedizioni."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistiche ordini di vendita"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Aziende"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Un ordine di approvigionamento per ogni linea d'ordine di vendita e per "
+"ciascuno dei componenti."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Assegna"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Numero di giorni che intercorrono fra la conferma dell'ordine e la "
+"spedizione della merce al cliente"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "da Stock"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Fattura"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Annulla"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Numero di Packages (divisione spedizione)"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Consegnato"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"È necessario prima cancellare tutti i prelievi legati a questo ordine di "
+"vendita."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Crea fattura"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Anticipo su fattura di vendita"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"È necessario prima cancellare i movimenti di magazzino collegati a questa "
+"linea d'ordine."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n/d)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Consegnare"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Annulla Assegnazione"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "su Ordine"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basato sulle quantità spedite o ordinate."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Prelievi correlati"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Richiesta ordine di vendita"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Crea ordine di consegna"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignora eccezione"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Si è pianificata la vendita di %.2f %s ma è disponibile solo la quantità  "
+"%.2f %s !\n"
+"Lo stock reale è pari a %.2f %s. (senza quantità riservate)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Prelevato"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Crea lista di prelievo"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Il movimento merci fra l'area magazzino di uscita e il magazzino del cliente "
+"viene effettuato attraverso l'ordine di consegna, manualmente o "
+"automaticamente, in funzione della configurazione dell'area di magazzino in "
+"uscita."
diff --git a/addons/sale_stock/i18n/ja.po b/addons/sale_stock/i18n/ja.po
new file mode 100644
index 00000000000..9d6ae049402
--- /dev/null
+++ b/addons/sale_stock/i18n/ja.po
@@ -0,0 +1,715 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:08+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "配達オーダー"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr "全てを一度に配達するための十分な在庫を持っていない場合、部分的な出荷を認めますか？"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "調達方法"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "集荷情報： "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "集荷リスト"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"あなたの選択した数量は %d です。\n"
+"しかし、それは選択した梱包と互換性がありません。\n"
+"これは、梱包による数量の提案です：\n"
+"EAN：%s　数量：%s　単位のタイプ：%s"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "製造品へのあるいは顧客への移動のドキュメント"
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "検証"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "店"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "調達オーダーの作成"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr "全ての受注オーダー行について、調達オーダーは販売された製品の供給を作成します。"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"インコタームは国際商業規則（International Commercial terms）の略で、商業取引で使用される販売条件のシリーズを表します。"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "全ての受注オーダー行のために調達オーダーを駆動します。"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "在庫移動"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "調達オーダー"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "配達基準の請求書"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "受注オーダー"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "受注オーダー行"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"受注オーダーが確認されると同時に調達オーダーとしてすぐに、集荷リストフォームが作成されます。これは受注オーダー部品の割り当てを表しています。受注オーダー行"
+"による１つの集荷リストは部品の入手可能性とともに展開します。"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "顧客"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "エラー。再帰的な関係となる会社を作ることはできません。"
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "これは安全目的のために顧客に約束するために加える日数です。"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "集荷リスト"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "倉庫"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "強制割当"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "受注オーダーはキャンセルできませんでした。"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "配達リードタイム"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "顧客への移動のドキュメント"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "在庫移動"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+"もし、オーダー時であれば、受注オーダーがタスクを作成するために確認された時、この受注オーダー行とリンクした発注オーダーまたは製造オーダーを調達するきっかけ"
+"となります。"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr "出荷方針が集荷時に請求または配達後に請求の場合は、請求書は自動的に作成されます。"
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "調達"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "出荷済"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "テスト状態では不正なモード"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"調達オーダーは、受注オーダーが確認された、または請求書が支払われた時に自動的に作成されます。それは支払と製品の製造のルールと受注オーダーのパラメータに関し"
+"て制御します。 "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "梱包"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "設定エラーです。"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "安全日数"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "受注済材料の調達"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "販売店"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr "これは受注オーダーが配達されたことを示します。この項目はスケジューラが起動された後にのみ更新されます。"
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "属性"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr "受注オーダー基準、または出荷基準の請求書を生成します。"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "受注オーダーの統計値"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "会社"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "参照は会社ごとに固有でなければいけません。"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr "各受注オーダー行と各構成部品のための１つの調達オーダー"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "割当"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "在庫不足です： "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr "オーダー確認から顧客に製品の出荷がなされるまでの日数"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "在庫から"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "請求書"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "パッケージ数"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "オーダー参照は、会社ごとに固有でなければなりません。"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "配達済"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr "最初にこの受注オーダーに結び付けられた全集荷をキャンセルする必要があります。"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "請求書作成"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "受注前払請求書"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr "最初にこの受注オーダー行に付随する在庫移動をキャンセルする必要があります。"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "（利用不可）"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "インコターム"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "割当のキャンセル"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "オーダー中"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "出荷またはオーダー数量基準"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "全ての製品を一緒に配達"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "関連する集荷"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "会社名は固有でなければいけません。"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "受注オーダー依頼"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "配達オーダーの作成"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "例外を無視"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"受注の計画量は %.2f %s。しかし %.2f %s のみ利用可能です。\n"
+"実在庫は %.2f %s です（予約を除く）。"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "集荷"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "利用可能になった時に各製品を配達"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "集荷リストの作成"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr "製造品場所の設定によって、製造領域と顧客の間の移動は、手動または自動的な配達オーダーを通して実施されます。"
diff --git a/addons/sale_stock/i18n/ko.po b/addons/sale_stock/i18n/ko.po
new file mode 100644
index 00000000000..04f8cedca3b
--- /dev/null
+++ b/addons/sale_stock/i18n/ko.po
@@ -0,0 +1,702 @@
+# 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: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:19+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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "배송 주문"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "검증"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "샵"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "판매 주문"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "선적 정책"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "고객"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "창고"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "할당"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "재고 이동"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "조달"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "test_state에 유효하지 않은 모드"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "포장"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "속성"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "할당"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "스톡으로부터"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "인보이스"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "취소"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "인보이스 생성"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "인코텀"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "배송"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "할당 취소"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "주문 상"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "인수됨"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/lo.po b/addons/sale_stock/i18n/lo.po
new file mode 100644
index 00000000000..e2333b779d6
--- /dev/null
+++ b/addons/sale_stock/i18n/lo.po
@@ -0,0 +1,702 @@
+# Lao translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:17+0000\n"
+"Last-Translator: Brice Muangkhot ສຸພາ ເມືອງໂຄຕ <bmuangkhot@gmail.com>\n"
+"Language-Team: Lao <lo@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/lt.po b/addons/sale_stock/i18n/lt.po
new file mode 100644
index 00000000000..0d9e99a3d6a
--- /dev/null
+++ b/addons/sale_stock/i18n/lt.po
@@ -0,0 +1,702 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 13:59+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Pristatymo užsakymas"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+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_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Patvirtinti"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Parduotuvė"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Pardavimo užsakymas"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Dokumentų generavimo metodas"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Sąskaita paremta prisatymais"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Klientas"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Sandėlis"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Paskyrimas"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Pristatymo laikotarpis"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Atsargų judėjimas"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Suplanuoti užsakymai"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "Klaidingas modelis test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Pakavimas"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Konfigūracijos klaida!"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Ypatybės"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Pardavimų užsakymų statistika"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Priskirti"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Iš sandėlio"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Sąskaita faktūra"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Atšaukti"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Pakuočių skaičius"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Sukurti sąskaitą faktūrą"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Pristatymas"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Atšaukti paskyrimą"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Užsakant"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Pristatyta"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/lv.po b/addons/sale_stock/i18n/lv.po
new file mode 100644
index 00000000000..b04a80b427f
--- /dev/null
+++ b/addons/sale_stock/i18n/lv.po
@@ -0,0 +1,702 @@
+# Latvian 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: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 13:56+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"Language-Team: Latvian <lv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Piegādes Pasūtījums"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Apstiprināt"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Veikals"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Tirdzniecības Pasūtījums"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Piegādes noteikumi"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Klients"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Noliktava"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Piespiedu Nodošana"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Kustība Noliktavā"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Iepirkums"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "nepareizs režīms test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Iepakojums"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Piešķirt"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "no noliktavā esošajām precēm"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Rēķins"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Atcelt"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Izveidot Rēķinu"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Inkoterms"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Nosūtīt"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Atcelt preču nodošanu"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Pieņemts piegādei"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/mn.po b/addons/sale_stock/i18n/mn.po
new file mode 100644
index 00000000000..cac83ec0e5e
--- /dev/null
+++ b/addons/sale_stock/i18n/mn.po
@@ -0,0 +1,738 @@
+# Mongolian 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: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:03+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Mongolian <mn@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Хүргэлтийн захиалга"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Хэрэв захиалгыг нэг дор бүгдийг нь хүргэхэд таны барааны нөөц хүрэлцэхгүй "
+"бол хэсэгчилсэн хүргэлтийг сонго"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Нөхөн дүүргэх хэлбэр"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "Бэлтгэх Мэдээлэл ! : "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Хүргэлтийн баримт"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"Та %d тооны нэгжийг сонгосон.\n"
+"Гэхдээ энэ нь сонгосон багцтай нийцтэй биш. \n"
+"Багцад санал болгох тоой ширхэг нь энд байна:\n"
+"EAN: %s Тоо ширхэг: %s Төрөл: %s"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Гарах байрлал эсвэл захиалагч руу хөдөлгөөний баримт"
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Батлах"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Дэлгүүр"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Татан авалтын захиалга үүсгэх"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Борлуулах захиалга"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Борлуулалтын захиалгын мөр бүрт татан авалтын захиалга зарагдсан барааг "
+"татахаар үүсгэгдэнэ."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Захиалга гүйцэтгэх арга"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm нь 'International Commercial terms'-н товчлол. 'Олон Худалдааны "
+"Нөхцөл' нь худалдааны гүйлгээнд хэрэглэгддэг борлуулалтын нөхцөл юм."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Борлуулалтын захиалгын мөр бүрийн татан авалтын захиалгыг удирдана"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Барааны хөдөлгөөн"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Нөхөн дүүргэлтийн захиалга"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Хүргэлт дээр үндэслэж нэхэмжлэх"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Борлуулалтын захиалга"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Борлуулалтын Захиалгын Мөр"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"Борлуулалтын захиалга батлагдмагц Бэлтгэх Жагсаалтын баримт үүсгэгдэхийн "
+"сацуу татан авалтын захиалга үүснэ. Энэ нь борлуулалтын захиалгын хэсэг "
+"болохыг илэрхийлнэ. Тэнд борлуулалтын захиалгын бэлтгэх 1 жагсаалт байх "
+"бөгөөд хэсгүүдийн байгаа эсэхтэй холбогддог."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Захиалагч"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Алдаа! Рекурсив компани үүсгэж болохгүй."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "Энэ бол захиалагчдаа амлахад нэмэгдэх нууц өдөрүүд юм."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Агуулахын баримт"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Агуулах"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Хөдөлгөөн Төлөвлөлт"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Борлуулалтын захиалгыг цуцлаж чадсангүй !"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Хүргэлтийн урьтал хугацаа"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Захиалгачийн хөдөлгөөний баримт."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Нөөцийн хөдөлгөөн"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+"Хэрэв 'Захиалахад' байвал борлуулалтын захиалга батлагдахад татан авалт хийх "
+"даалгавар, худалдан авалтын захиалга, үйлдвэрлэлийн захиалгыг үүсгэдэг."
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Хэрэв захиалга гүйцэлтгэх арга нь 'Хүргэлтээс нэхэмжлэл үүсэх' эсвэл "
+"'Хүргэлтийн дараа захиалга дээр үндэслэн нэхэмжлэл үүсэх' бол нэхэмжлэл "
+"автоматаар үүснэ."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Татан авалт"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Хүргэгдсэн"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "тохирохгүй төлөв байна"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Татан авах заиалга нь борлуулалтын захиалга батлагдмагц юмуу нэхэмлэл "
+"төлөгдмөгц үүснэ. Энэ нь худалдан авалт болон үйлдвэрлэлийг борлуулалтын "
+"захиалгын тохиргооны параметрээс шалтаалуулан эхлүүлнэ. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Савалгаа"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Тохиргооны алдаа !"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Аюулгүй өдөр"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Зарагдсан материалын нөхөн дүүргэлт"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Борлуулалтын Дэлгүүр"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Энэ нь борлуулалтын захиалга хүргэгдсэнийг илэрхийлнэ. Энэ талбар нь "
+"товлосон үйлдэл ажилласан дараа л шинэчлэгддэг."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Шинж чанар"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Та нэхэмжлэлийг борлуулалтын захиалга эсвэл хүргэлт дээр үндэслэн үүсгэх "
+"боломжтой."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Борлуулалтын захиалгын шинжилгээ"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Компаниуд"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "Код компаний хувьд үл давхцах байх ёстой!"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Нэг татан авах захиалга нь борлуулалтын захиалгын мөр бүрээр болон нэгж "
+"бүрээр."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Хувиарлах"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Бараа хүрэлцэхгүй байна ! : "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr "Захиалагчид барааг хүргэх баталгаажуулалтын хоорондын өдөрийн тоо"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Агуулахаас"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Нэхэмжлэл"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Цуцлах"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Савлагааны тоо"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Захиалгын код компанид үл давхцах байх ёстой!"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Хүргэгдсэн"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Борлуулалтын захиалгад холбогдох бэлтгэх баримтыг эхлээд бүгдийг цуцлах "
+"ёстой."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Нэхэмжлэл үүсгэх"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Борлуулалтын Урьдчилгаа Төлбөрийн Нэхэмжлэл"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Борлуулалтын захиалгын энэ мөртэй холбогдсон барааны хөдөлгөөнийг эхлээд "
+"цуцлах хэрэгтэй."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(б/гүй)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Худалдааны нөхцөл"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Хүргэлт"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Эрх шилжүүлэхийг цуцлах"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Захиалга"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Хүргэгдсэн эсвэл захиалсан тоо хэмжээн дээр үндэслэнэ."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Бүх барааг нэгэн зэрэг хүргэх"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Холбогдох хүргэлт"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Компаний нэр үл давхцах байх ёстой !"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Борлуулалтын Захиалгын Шаардах"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Хүргэлтийн захиалга үүсгэх"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Онцгой тохиолдлыг үл хэрэгс"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Та борлуулахаар төлөвлөж байгаа %.2f %s гэвч танд ердөө %.2f %s байна !\n"
+"Бодит байраа %.2f %s. (нөөцлөлт үгүйгээр)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Хүргэгдсэн"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Бараа байвал бүх барааг хүргэх"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Хүргэлтийн баримт үүсгэх"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Гарах байрлалын тохиргооноос хамааран гарах байрлал, захиалагчийн байрлал "
+"руу шилжилх шилжилт нь  Хүргэх Захиалгаар автоматаар эсвэл гараар хийгддэг."
diff --git a/addons/sale_stock/i18n/nb.po b/addons/sale_stock/i18n/nb.po
new file mode 100644
index 00000000000..bb37c0a31b9
--- /dev/null
+++ b/addons/sale_stock/i18n/nb.po
@@ -0,0 +1,734 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:09+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Leveringsordre"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Dersom du ikke har nok på lager til å levere alt på en gang, kan du "
+"akseptere delleveringer eller ikke?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Innkjøpsmetode"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "Plukking informasjon "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Plukkliste"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"Du valgte en mengde på %d enheter.\n"
+"Dette passer ikke overens med valgt forpakning.\n"
+"Foreslår følgende mengde i henhold til forpakning:\n"
+"EAN: %s Mengde: %s Forpakningstype: %s"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Dokumentering av bevegelse til utgående lokasjon eller kunde."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Valider"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Butikk"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Opprett innkjøpsordre"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Salgsordre"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"For hver salgsordrelinje dannes en bestilling for å anskaffe det solgte "
+"produktet."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Forsendelsesprinsipp"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm, som står for 'International Commercial terms', er en rekke "
+"salgstermer som benyttes i komersielle transaksjoner."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Danner inkjøpsordre for hver salgsordrelinje."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Lagerbevegelse"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Innkjøpsordre"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Faktura basert på leveringer"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Salgsordre"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Salgsordrelinje"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"Plukklisten dannes umiddelbart når en salgsordre bekreftes, samtidig med "
+"anskaffelsesordren. Den tilordner varer til salgsordren. Det dannes en "
+"plukkliste til salgsordren som utvides løpende med tilgjengelige produkter."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Kunde"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Feil ! Du kan ikke lage rekursive firmaer."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Dette er antall dager som for sikkerhet legges til det som er lovet kunde"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Plukkliste"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Lager"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Tvangsfordeling"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Kunne ikke kansellere salgsordre!"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Leveringstid"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokument av forsendelsen til kunden."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Lagerbevegelser"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+"Hvis 'Produsere på bestilling' initieres en anskaffelse når salgsordren "
+"bekreftes, slik at det opprettes en oppgave, bestilling eller "
+"produksjonsordre koblet til denne salgsordrelinjen."
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Fakturaen blir dannet automatisk dersom grunnregelen er 'Fakturering etter "
+"plukk' eller 'Fakturering av ordre etter utlevering'."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Innkjøp"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Sendt"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "Ugyldig form for test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"En anskaffelsesordre dannes automatisk når en salgsordre bekreftes eller "
+"faktura er betalt. Denne driver innkjøp og/eller produksjon av produktet i "
+"henhold til anskaffelsesregler og parametere på salgsordren. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Forpakning"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Konfigurasjonsfeil!"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Sikkerhetsdager"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Anskaffelse av solgt produkt"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Butikk"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Den indikerer at salgsordren har blitt levert. Dette feltet blir oppdatert "
+"kun etter at planleggeren(e) har blitt lansert."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Egenskaper"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr "Du kan lage fakturaer basert enten på salgsordre eller leveranser."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Salgsordrestatistikk"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Firmaer"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "Referanse må være unik pr firma!"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"En anskaffelsesordre for hver salgsordrelinje og for hver av komponentene."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Angi"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Ikke nok lager!: "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Antall dager mellom ordrebekreftelse og forsendelse av produktene til kunden"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "fra lager"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Kanseller"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Antall pakker"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Ordrereferanse må være unik pr. firma!"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Levert"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Du må først kansellere alle plukkinger knyttet til denne salgsordren."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Lag faktura"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Forskuddsfaktura"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Du må først slette lagerbevegelser knyttet til denne salsgordrelinjen."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Kanseller avtale"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "i ordre"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Basert på sendt eller bestilt kvantum."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Utlever alle produkter på en gang"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Tilhørende plukking"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Firmanavn må være unikt !"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Salgsordre rekvisisjon"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Opprett leveringsordre"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorer avvik"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Du planlegger å selge %.2f %s men du har bare %.2f %s tilgjengelig!\n"
+"Virkelig lagerbeholdning er %.2f %s (uten reservasjoner)."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Plukket"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Lever hvert produkt produkt når tilgjengelig"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Opprett plukkliste"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Avhengig av oppsettet av utgående lokasjon vil varebevegelsen fra utgående "
+"logistikk til kunde gjort gjennom en leveringsordre eller automatisk."
diff --git a/addons/sale_stock/i18n/nl.po b/addons/sale_stock/i18n/nl.po
new file mode 100644
index 00000000000..f719d2d7591
--- /dev/null
+++ b/addons/sale_stock/i18n/nl.po
@@ -0,0 +1,743 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-11-02 10:21+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:04+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr "Uitgaande levering <em>%s</em> <b>ingeplant</b> voor %s."
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Leveringsopdracht"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Indien er onvoldoende voorraad is om alles in een zending te leveren, worden "
+"er dan deelleveringen geaccepteerd?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Verwervingswijze"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "Orderverzamel informatie!: "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Verzamellijst"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"U heeft een hoeveelheid van %d geselecteerd.\n"
+"Maar het is niet in overeenstemming met de gekozen verpakking.\n"
+"Hier is een voorstel van de hoeveelheden, volgens de verpakking:\n"
+"EAN: %s Aantal: %s Type verpakking: %s"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Document van de mutatie naar de expeditie of naar de klant."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr "Beheer meerdere verkooppunten"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Bevestig"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Verkooppunten"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Verwervingsopdracht maken"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Verkooporder"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Bij elke verkooporderregel wordt een verwervingsopdracht gemaakt om in het "
+"verkochte product te voorzien."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr "Fout!"
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Behandelwijze"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Leveringsvoorwaarden of Incoterm wat staat voor 'International Commercial "
+"Terms', staat voor een reeks leveringsvoorwaarden die gebruikt worden in de "
+"commerciële transactie."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Stuurt verwervingsopdrachten aan voor elke verkooporderregel."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Voorraadmutatie"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr "Ongeldige actie!"
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr "Project urenstaat"
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr "Configuratiefout!"
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Verwervingsopdracht"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Factuur van leveringsopdracht"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Verkooporder"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr "Uitgaande leveringen"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Verkooporderregel"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"De verzamellijst wordt gemaakt zodra de verkooporder is bevestigd, op "
+"hetzelfde moment als de verwervingsopdracht. Het representeert de toekenning "
+"van onderdelen aan de verkooporder. Er is 1 verzamellijst per "
+"verkooporderregel die ontwikkelt met de beschikbaarheid van onderdelen."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Klant"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fout ! U kunt geen recursieve bedrijven maken."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr "Genereer facturen op basis van verkooporder"
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Dit is het aantal dagen dat als veiligheidsmarge wordt toegevoegd aan de "
+"beloofde levertijd."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Verzamellijst"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazijn"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forceer toewijzing"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr "De standaard factureer methode is"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Kan verkooporder niet annuleren !"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Leveringstermijn"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Document van de verplaatsing naar de klant."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr "Bekijk uitgaande levering"
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Voorraadmutaties"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "Standaard opties"
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+"Bij 'maak op bestelling' wordt wanneer de verkooporder is bevestigd een "
+"verwerving gestart, om een taak, inkooporder of productie order te koppelen "
+"aan deze verkooporderregel."
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"De factuur wordt automatisch gemaakt als het leveringsbeleid 'Factuur van "
+"pakbon' of 'Factuur van order na levering' is."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Levering"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Verzonden"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "invalid mode for test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Een verwervingsopdracht is automatisch gemaakt zodra de verkooporder is "
+"bevestigd of als de factuur is betaald. Het stuurt de inkoop en productie "
+"aan van producten volgens de regels en volgens de verkooporder parameters. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr "Order <b>geleverd</b>."
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr "Sta toevoegen afleveringskosten toe"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr "dagen"
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Verpakking"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr "Vooruitbetaling van %s %%"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Configuratiefout !"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Dagen veiligheidsmarge"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Verwerving van verkocht materiaal"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Verkoopfiliaal"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Dit geeft aan dat de verkooporder is geleverd. Dit veld wordt alleen "
+"bijgewerkt als de planning heeft loopt."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Waarden"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr "U dient een productie partij toe te wijzen voor dit product."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"U kunt facturen genereren op basis van verkooporder of op basis van "
+"leveringen."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Verkooporder statistieken"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Bedrijven"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "Bekijk factuur"
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "Referentie moet uniek zijn per bedrijf!"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Een verwervingsopdracht voor elke verkooporderregel en voor elk van de "
+"componenten."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Toekennen"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Niet genoeg voorraad! "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Aantal dagen tussen de orderbevestiging en de verzending van de producten "
+"naar de klant"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Uit Voorraad"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr "Factuur gebaseerd op verkooporders"
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Factuur"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Annuleer"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Aantal pakketten"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Orderreferentie moet uniek zijn per bedrijf!"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Geleverd"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"U moet eerst alle uitgaande leveringen bij deze verkooporder annuleren."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Maak factuur"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Verkoop vooruibetaling factuur"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"U moet eerst voorraadmutaties annuleren die zijn verbonden met deze "
+"verkooporderregel."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n.b.)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Leveringsvoorwaarden"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr "Het is niet mogelijk de verkooporder regel te annuleren!"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Lever"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Annuleer toewijzing"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Maak op bestelling"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Gebaseerd op de geleverde of bestelde hoeveelheden."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Lever alle producten tegelijk"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Gekoppelde picking"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "De naam van het bedrijf moet uniek zijn!"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Verkooporder aanvraag"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Afleveropdracht maken"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Fouten negeren"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"U wilt %.2f %s verkopen maar heeft slechts %.2f %s beschikbaar !\n"
+"De werkelijke voorraad is %.2f %s. (zonder reserveringen)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr "Maak uitgaande levering opnieuw"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+"Dit geeft u de mogelijkheid om meerdere verkooppunten te configureren."
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Verzameld"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Lever ieder product wanneer beschikbaar"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Verzamellijst maken"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Afhankelijk van de configuratie van de locatie Expeditie, wordt de "
+"verplaatsing tussen de expeditie en de klant gedaan via de afleveropdracht "
+"handmatig of automatisch."
diff --git a/addons/sale_stock/i18n/nl_BE.po b/addons/sale_stock/i18n/nl_BE.po
new file mode 100644
index 00000000000..8e13f94c004
--- /dev/null
+++ b/addons/sale_stock/i18n/nl_BE.po
@@ -0,0 +1,2661 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-03-20 15:57+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (Belgium) <nl_BE@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-09-07 04:58+0000\n"
+"X-Generator: Launchpad (build 15914)\n"
+
+#. module: sale
+#: field:sale.config.picking_policy,timesheet:0
+msgid "Based on Timesheet"
+msgstr "Volgens uurroosters"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid ""
+"Sale Order Lines that are confirmed, done or in exception state and haven't "
+"yet been invoiced"
+msgstr ""
+"Verkooporderlijn in status bevestigd, gereed of uitzondering en die nog niet "
+"zijn gefactureerd"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_salesman
+msgid "Sales by Salesman in last 90 days"
+msgstr "Omzet per verkoper in de afgelopen 90 dagen"
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Indien er onvoldoende voorraad is om alles in een zending te leveren, worden "
+"er dan deelleveringen geaccepteerd?"
+
+#. module: sale
+#: view:sale.order:0
+msgid "UoS"
+msgstr "VK-eenh."
+
+#. module: sale
+#: help:sale.order,partner_shipping_id:0
+msgid "Shipping address for current sales order."
+msgstr "Leveringsadres voor de huidige verkooporder."
+
+#. module: sale
+#: field:sale.advance.payment.inv,qtty:0 report:sale.order:0
+msgid "Quantity"
+msgstr "Hoeveelheid"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,day:0
+msgid "Day"
+msgstr "Dag"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
+msgid "Cancel Order"
+msgstr "Annuleer order"
+
+#. module: sale
+#: code:addons/sale/sale.py:638
+#, python-format
+msgid "The quotation '%s' has been converted to a sales order."
+msgstr "De offerte '%s' is omgezet in een verkooporder."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Quotation"
+msgstr "Offerte afdrukken"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice.py:42
+#, python-format
+msgid "Warning !"
+msgstr "Waarschuwing"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tax"
+msgstr ""
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Stuurt verwervingsopdrachten aan voor elke verkooporderlijn."
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,analytic_account_id:0
+#: field:sale.shop,project_id:0
+msgid "Analytic Account"
+msgstr "Analytische rekening"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_line_tree2
+msgid ""
+"Here is a list of each sales order line to be invoiced. You can invoice "
+"sales orders partially, by lines of sales order. You do not need this list "
+"if you invoice from the delivery orders or if you invoice sales totally."
+msgstr ""
+"Dit is een lijst van elke te factureren verkooporder. U kunt verkooporders "
+"deels factureren, per regel of per order. U heeft deze lijst niet nodig als "
+"u factureert vanaf leveringen of als u alle verkopen factureert."
+
+#. module: sale
+#: code:addons/sale/sale.py:295
+#, python-format
+msgid ""
+"In order to delete a confirmed sale order, you must cancel it before ! To "
+"cancel a sale order, you must first cancel related picking or delivery "
+"orders."
+msgstr ""
+"Als u een bevestigde verkooporder wilt verwijderen, moet u deze eerst "
+"annuleren. Om een verkooporder te kunnen annuleren, moeten eerst alle "
+"gekoppelde zendnota's of leveringsnota's worden geannuleerd."
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Verwervingsopdracht"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,partner_id:0
+msgid "Partner"
+msgstr "Relatie"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Factuur op basis van zendnota's"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Line"
+msgstr "Orderlijn"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_form
+msgid ""
+"Sales Orders help you manage quotations and orders from your customers. "
+"OpenERP suggests that you start by creating a quotation. Once it is "
+"confirmed, the quotation will be converted into a Sales Order. OpenERP can "
+"handle several types of products so that a sales order may trigger tasks, "
+"delivery orders, manufacturing orders, purchases and so on. Based on the "
+"configuration of the sales order, a draft invoice will be generated so that "
+"you just have to confirm it when you want to bill your customer."
+msgstr ""
+"Verkooporders helpen u bij het beheren van offertes en orders van uw "
+"klanten. OpenERP stelt voor dat u begint met het maken van een offerte. Als "
+"die is bevestigd, wordt de offerte omgezet in een verkooporder. OpenERP kan "
+"verschillende soorten producten verwerken zodat een verkooporder taken, "
+"leveringen, productieopdrachten, aankooporders enz. kan aansturen. Gebaseerd "
+"op de configuratie van de verkooporder wordt een conceptfactuur gegenereerd, "
+"die u alleen hoeft te bevestigen als u de klant wilt factureren."
+
+#. module: sale
+#: help:sale.order,invoice_quantity:0
+msgid ""
+"The sale order will automatically create the invoice proposition (draft "
+"invoice). Ordered and delivered quantities may not be the same. You have to "
+"choose if you want your invoice based on ordered or shipped quantities. If "
+"the product is a service, shipped quantities means hours spent on the "
+"associated tasks."
+msgstr ""
+"De verkooporder maakt automatisch de voorlopige factuur (conceptfactuur). "
+"Bestelde en geleverde aantallen kunnen verschillend zijn. U moet kiezen of u "
+"de factuur op basis van bestelde of geleverde aantallen wilt maken. Als een "
+"product een dienst is, betekenen geleverde aantallen de gewerkte uren op de "
+"verbonden taken."
+
+#. module: sale
+#: field:sale.shop,payment_default_id:0
+msgid "Default Payment Term"
+msgstr "Std. betalingstermijn"
+
+#. module: sale
+#: field:sale.config.picking_policy,deli_orders:0
+msgid "Based on Delivery Orders"
+msgstr "Volgens zendnota's"
+
+#. module: sale
+#: field:sale.config.picking_policy,time_unit:0
+msgid "Main Working Time Unit"
+msgstr "Hoofdeenheid werktijd"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.order.line,state:0
+#: view:sale.report:0
+msgid "State"
+msgstr "Status"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Disc.(%)"
+msgstr "Korting(%)"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,price_total:0
+msgid "Total Price"
+msgstr "Totale prijs"
+
+#. module: sale
+#: help:sale.make.invoice,grouped:0
+msgid "Check the box to group the invoices for the same customers"
+msgstr "Schakel het vakje in om facturen per klant te groeperen."
+
+#. module: sale
+#: view:sale.order:0
+msgid "My Sale Orders"
+msgstr "Mijn verkooporders"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Ordered Quantities"
+msgstr "Bestelde hoeveelheden"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Salesman"
+msgstr "Omzet per verkoper"
+
+#. module: sale
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Voorraadbewegingen"
+
+#. module: sale
+#: field:sale.order,name:0 field:sale.order.line,order_id:0
+msgid "Order Reference"
+msgstr "Orderreferentie"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Other Information"
+msgstr "Overige informatie"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Dates"
+msgstr "Datums"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"De factuur wordt automatisch gemaakt als het leveringsbeleid 'Factuur van "
+"zendnota' of 'Factuur volgens order na levering' is."
+
+#. module: sale
+#: field:sale.config.picking_policy,task_work:0
+msgid "Based on Tasks' Work"
+msgstr "Volgens taakwerk"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
+msgid "Quotations and Sales"
+msgstr "Offertes en verkopen"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_make_invoice
+msgid "Sales Make Invoice"
+msgstr "Verkoopfactuur maken"
+
+#. module: sale
+#: code:addons/sale/sale.py:330
+#, python-format
+msgid "Pricelist Warning!"
+msgstr "Prijslijstwaarschuwing"
+
+#. module: sale
+#: field:sale.order.line,discount:0
+msgid "Discount (%)"
+msgstr "Korting (%)"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
+msgid "My Quotations"
+msgstr "Mijn offertes"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.open_board_sales_manager
+#: model:ir.ui.menu,name:sale.menu_board_sales_manager
+msgid "Sales Manager Dashboard"
+msgstr "Verkoopmanagerdashboard"
+
+#. module: sale
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Verpakking"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleinvoice0
+msgid "From a sales order"
+msgstr "Van een verkooporder"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Naam verkooppunt"
+
+#. module: sale
+#: help:sale.order,order_policy:0
+msgid ""
+"The Invoice Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Deliver & Invoice on demand' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice based on the sale order or the sale order lines.\n"
+"  - The 'Invoice on order after delivery' choice will generate the draft "
+"invoice based on sales order after all picking lists have been finished.\n"
+"  - The 'Invoice based on deliveries' choice is used to create an invoice "
+"during the picking process."
+msgstr ""
+"Het factuurbeleid wordt gebruikt om facturatie- en leveringsbewerkingen te "
+"synchroniseren.\\n\n"
+"  - De optie 'Vooruitbetaling' genereert eerst de factuur en de zendnota pas "
+"na betaling van de factuur.\\n\n"
+"  - De optie 'Leveren & Handmatig factureren' maakt de zendnota direct en "
+"wacht met het genereren van een conceptfactuur totdat de gebruiker op de "
+"knop 'Factureren' klikt.\\n\n"
+"  - De optie 'Factuur volgens order na levering' genereert de conceptfactuur "
+"gebaseerd op de verkooporder, nadat alle zendnota's gereed zijn.\\n\n"
+"  - De optie 'Factuur van zendnota' wordt gebruikt om een factuur te maken "
+"gedurende het verzamelproces."
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Geen klant gedefinieerd"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree2
+msgid "Sales in Exception"
+msgstr "Verkooporders met uitgestelde levering"
+
+#. module: sale
+#: code:addons/sale/sale.py:1158 code:addons/sale/sale.py:1277
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:70
+#, python-format
+msgid "Configuration Error !"
+msgstr "Configuratiefout"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Conditions"
+msgstr "Voorwaarden"
+
+#. module: sale
+#: code:addons/sale/sale.py:1034
+#, python-format
+msgid ""
+"There is no income category account defined in default Properties for "
+"Product Category or Fiscal Position is not defined !"
+msgstr ""
+"Er is geen opbrengstrekening gedefinieerd in de standaardeigenschappen van "
+"de productcategorie of de fiscale positie is niet ingesteld."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "August"
+msgstr "Augustus"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr "U probeert een lot toe te kennen van een ander product."
+
+#. module: sale
+#: code:addons/sale/sale.py:655
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "invalid mode for test_state"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "June"
+msgstr "Juni"
+
+#. module: sale
+#: code:addons/sale/sale.py:617
+#, python-format
+msgid "Could not cancel this sales order !"
+msgstr "Kan verkooporder niet annuleren"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Verkooporderstatistieken"
+
+#. module: sale
+#: help:sale.order,project_id:0
+msgid "The analytic account related to a sales order."
+msgstr "De analytische rekening van een verkooporder."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "October"
+msgstr "Oktober"
+
+#. module: sale
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr "De referentie moet uniek zijn."
+
+#. module: sale
+#: view:board.board:0 view:sale.order:0 view:sale.report:0
+msgid "Quotations"
+msgstr "Offertes"
+
+#. module: sale
+#: help:sale.order,pricelist_id:0
+msgid "Pricelist for current sales order."
+msgstr "Prijslijst voor deze verkooporder."
+
+#. module: sale
+#: report:sale.order:0
+msgid "TVA :"
+msgstr "Btw:"
+
+#. module: sale
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Aantal dagen tussen de orderbevestiging en de verzending van de producten "
+"naar de klant."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation Date"
+msgstr "Offertedatum"
+
+#. module: sale
+#: field:sale.order,fiscal_position:0
+msgid "Fiscal Position"
+msgstr "Fiscale positie"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 field:sale.report,product_uom:0
+msgid "UoM"
+msgstr "Eenh."
+
+#. module: sale
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Aantal pakketten"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "In Progress"
+msgstr "In behandeling"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_confirmquotation0
+msgid ""
+"The salesman confirms the quotation. The state of the sales order becomes "
+"'In progress' or 'Manual in progress'."
+msgstr ""
+"De verkoper bevestigt de offerte. De status van de verkooporder wordt 'In "
+"behandeling' of 'Handmatig'."
+
+#. module: sale
+#: code:addons/sale/sale.py:1074
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced!"
+msgstr "U kunt geen verkooporderlijn annuleren die al is gefactureerd."
+
+#. module: sale
+#: code:addons/sale/sale.py:1079
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"U moet eerst voorraadbewegingen annuleren die zijn gekoppeld aan deze "
+"verkooporderlijn."
+
+#. module: sale
+#: code:addons/sale/sale.py:1147
+#, python-format
+msgid "(n/a)"
+msgstr "(n.b.)"
+
+#. module: sale
+#: help:sale.advance.payment.inv,product_id:0
+msgid ""
+"Select a product of type service which is called 'Advance Product'. You may "
+"have to create it and set it as a default value on this field."
+msgstr ""
+"Selecteer een product van het type Dienst dat 'Voorschotproduct' heet. U "
+"moet dit product wellicht eerst maken en instellen als standaardwaarde voor "
+"dit veld."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Tel. :"
+msgstr "Tel.:"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:64
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                              "
+"that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+"U kunt geen vooruitbetaling doen voor een verkooporder die is ingesteld als "
+"'Factuur na levering'."
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,note:0 view:sale.order.line:0
+#: field:sale.order.line,notes:0
+msgid "Notes"
+msgstr "Opmerkingen"
+
+#. module: sale
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "De firmanaam moet uniek zijn"
+
+#. module: sale
+#: help:sale.order,partner_invoice_id:0
+msgid "Invoice address for current sales order."
+msgstr "Factuuradres voor de huidige verkooporder."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Month-1"
+msgstr "Maand-1"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered month of the sales order"
+msgstr "Bestelmaand van verkooporder"
+
+#. module: sale
+#: code:addons/sale/sale.py:504
+#, python-format
+msgid ""
+"You cannot group sales having different currencies for the same partner."
+msgstr ""
+"U kunt geen verkopen met verschillende munten groeperen voor een relatie."
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Elk product leveren bij beschikbaarheid"
+
+#. module: sale
+#: field:sale.order,invoiced_rate:0 field:sale.order.line,invoiced:0
+msgid "Invoiced"
+msgstr "Gefactureerd"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Leveringsorder"
+
+#. module: sale
+#: field:sale.order,date_confirm:0
+msgid "Confirmation Date"
+msgstr "Bevestigingsdatum"
+
+#. module: sale
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale
+#: field:sale.order.line,address_allotment_id:0
+msgid "Allotment Partner"
+msgstr "Relatie rechtstr. levering"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "March"
+msgstr "Maart"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr "U kunt producten niet van of naar een weergavelocatie verplaatsen."
+
+#. module: sale
+#: field:sale.config.picking_policy,sale_orders:0
+msgid "Based on Sales Orders"
+msgstr "Volgens zendnota's"
+
+#. module: sale
+#: help:sale.order,amount_total:0
+msgid "The total amount."
+msgstr "Het totale bedrag"
+
+#. module: sale
+#: field:sale.order.line,price_subtotal:0
+msgid "Subtotal"
+msgstr "Subtotaal"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Invoice address :"
+msgstr "Factuuradres:"
+
+#. module: sale
+#: field:sale.order.line,sequence:0
+msgid "Line Sequence"
+msgstr "Lijnvolgorde"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Voor elke verkooporderlijn wordt een verwervingsopdracht gemaakt om het "
+"verkochte product te bestellen."
+
+#. module: sale
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm ('International Commercial Terms') staat voor een reeks "
+"verkoopvoorwaarden die worden gebruikt in de commerciële transactie."
+
+#. module: sale
+#: field:sale.order,partner_invoice_id:0
+msgid "Invoice Address"
+msgstr "Factuuradres"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Search Uninvoiced Lines"
+msgstr "Niet-gefactureerde lijnen zoeken"
+
+#. module: sale
+#: model:ir.actions.report.xml,name:sale.report_sale_order
+msgid "Quotation / Order"
+msgstr "Offerte / Order"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,nbr:0
+msgid "# of Lines"
+msgstr "# lijnen"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_open_invoice
+msgid "Sales Open Invoice"
+msgstr "Openstaande verkoopfactuur"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Verkooporderlijn"
+
+#. module: sale
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazijn"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Order N°"
+msgstr "Ordernr."
+
+#. module: sale
+#: field:sale.order,order_line:0
+msgid "Order Lines"
+msgstr "Orderlijnen"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Untaxed amount"
+msgstr "Bedrag excl. btw"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree2
+#: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
+msgid "Lines to Invoice"
+msgstr "Te factureren lijnen"
+
+#. module: sale
+#: field:sale.order.line,product_uom_qty:0
+msgid "Quantity (UoM)"
+msgstr "Hoeveelheid (eenh.)"
+
+#. module: sale
+#: field:sale.order,create_date:0
+msgid "Creation Date"
+msgstr "Creatiedatum"
+
+#. module: sale
+#: model:ir.ui.menu,name:sale.menu_sales_configuration_misc
+msgid "Miscellaneous"
+msgstr "Diversen"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_tree3
+msgid "Uninvoiced and Delivered Lines"
+msgstr "Niet-gefactureerde en geleverde lijnen"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Total :"
+msgstr "Totaal:"
+
+#. module: sale
+#: view:sale.report:0
+msgid "My Sales"
+msgstr "Mijn verkopen"
+
+#. module: sale
+#: code:addons/sale/sale.py:295 code:addons/sale/sale.py:1074
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Invalid action !"
+msgstr "Ongeldige actie"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Extra Info"
+msgstr "Extra informatie"
+
+#. module: sale
+#: field:sale.order,pricelist_id:0 field:sale.report,pricelist_id:0
+#: field:sale.shop,pricelist_id:0
+msgid "Pricelist"
+msgstr "Prijslijst"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,product_uom_qty:0
+msgid "# of Qty"
+msgstr "Hvh"
+
+#. module: sale
+#: code:addons/sale/sale.py:1327
+#, python-format
+msgid "Hour"
+msgstr "Uur"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Order Date"
+msgstr "Besteldatum"
+
+#. module: sale
+#: view:sale.order.line:0 view:sale.report:0 field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Verzonden"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree5
+msgid "All Quotations"
+msgstr "Alle offertes"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Options"
+msgstr "Opties"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "September"
+msgstr "September"
+
+#. module: sale
+#: code:addons/sale/sale.py:632
+#, python-format
+msgid "You cannot confirm a sale order which has no line."
+msgstr "Een verkooporder zonder orderlijnen kan niet worden bevestigd."
+
+#. module: sale
+#: code:addons/sale/sale.py:1259
+#, python-format
+msgid ""
+"You have to select a pricelist or a customer in the sales form !\n"
+"Please set one before choosing a product."
+msgstr ""
+"U moet een prijslijst of een klant kiezen in het verkoopformulier.\n"
+"Gelieve dit te doen voordat u een product kiest."
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,categ_id:0
+msgid "Category of Product"
+msgstr "Productcategorie"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Taxes :"
+msgstr "Btw:"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Stock Moves"
+msgstr "Voorraadbewegingen"
+
+#. module: sale
+#: field:sale.order,state:0 field:sale.report,state:0
+msgid "Order State"
+msgstr "Orderstatus"
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Do you really want to create the invoice(s)?"
+msgstr ""
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales By Month"
+msgstr "Verkopen per maand"
+
+#. module: sale
+#: code:addons/sale/sale.py:1078
+#, python-format
+msgid "Could not cancel sales order line!"
+msgstr "Kan verkooporderlijn niet annuleren"
+
+#. module: sale
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Veiligheidsmarge"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Verwerving van verkochte goederen"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Create Final Invoice"
+msgstr "Definitieve factuur maken"
+
+#. module: sale
+#: field:sale.order,partner_shipping_id:0
+msgid "Shipping Address"
+msgstr "Verzendadres"
+
+#. module: sale
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Dit geeft aan dat de verkooporder is geleverd. Dit veld wordt alleen "
+"bijgewerkt als de planner heeft gelopen."
+
+#. module: sale
+#: field:sale.order,date_order:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Extended Filters..."
+msgstr "Uitgebreide filters..."
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Exception"
+msgstr "Uitzondering"
+
+#. module: sale
+#: model:ir.model,name:sale.model_res_company
+msgid "Companies"
+msgstr "Bedrijven"
+
+#. module: sale
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sales order. \n"
+"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). \n"
+"The 'Waiting Schedule' state is set when the invoice is confirmed but "
+"waiting for the scheduler to run on the order date."
+msgstr ""
+"Geeft de status van de offerte of verkooporder. \\n\n"
+"Status Uitzondering wordt automatisch ingesteld als er een fout optreedt "
+"voor een factuur(Factuuruitzondering) of een zendnota "
+"(Leveringsuitzondering). \\n\n"
+"De 'Wacht op Planner' status wordt ingesteld als de factuur is bevestigd, "
+"maar wacht op de planner die op de 'Bestelde datum' zal lopen."
+
+#. module: sale
+#: code:addons/sale/sale.py:1272
+#, python-format
+msgid "No valid pricelist line found ! :"
+msgstr "Geen geldige prijslijstlijn gevonden"
+
+#. module: sale
+#: view:sale.order:0
+msgid "History"
+msgstr "Historiek"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Invoice on order after delivery"
+msgstr "Factuur volgens order na levering"
+
+#. module: sale
+#: help:sale.order,invoice_ids:0
+msgid ""
+"This is the list of invoices that have been generated for this sales order. "
+"The same sales order may have been invoiced in several times (by line for "
+"example)."
+msgstr ""
+"Dit is de lijst van facturen die zijn gegenereerd voor deze verkooporder. "
+"Dezelfde verkooporder kan in meerdere keren zijn gefactureerd (bijvoorbeeld "
+"per lijn)."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Your Reference"
+msgstr "Uw referentie"
+
+#. module: sale
+#: help:sale.order,partner_order_id:0
+msgid ""
+"The name and address of the contact who requested the order or quotation."
+msgstr ""
+"Naam en adres van de contactpersoon die de order of offerte heeft "
+"aangevraagd."
+
+#. module: sale
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Dit is het aantal dagen dat als veiligheidsmarge wordt toegevoegd aan de "
+"beloofde levertijd."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Qty"
+msgstr "Hvh"
+
+#. module: sale
+#: view:sale.order:0
+msgid "References"
+msgstr "Referenties"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "My Sales Order Lines"
+msgstr "Mijn verkooporderlijnen"
+
+#. 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
+#: view:sale.advance.payment.inv:0 view:sale.make.invoice:0
+#: view:sale.order.line:0 view:sale.order.line.make.invoice:0
+msgid "Cancel"
+msgstr "Annuleren"
+
+#. module: sale
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "De referentie moet uniek zijn."
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0 view:sale.order.line:0
+msgid "Create Invoice"
+msgstr "Factuur maken"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Excluded"
+msgstr "Totaal excl. btw"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order reference"
+msgstr "Orderreferentie"
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "You invoice has been successfully created!"
+msgstr "De factuur is met succes gemaakt."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Partner"
+msgstr "Verkopen per relatie"
+
+#. module: sale
+#: field:sale.order,partner_order_id:0
+msgid "Ordering Contact"
+msgstr "Orderadres"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
+#: view:sale.open.invoice:0
+msgid "Open Invoice"
+msgstr "Openstaande factuur"
+
+#. module: sale
+#: model:ir.actions.server,name:sale.ir_actions_server_edi_sale
+msgid "Auto-email confirmed sale orders"
+msgstr "Automatisch via e-mail bevestigde verkooporders"
+
+#. module: sale
+#: code:addons/sale/sale.py:413
+#, python-format
+msgid "There is no sales journal defined for this company: \"%s\" (id:%d)"
+msgstr ""
+"Er is geen verkoopdagboek gedefinieerd voor deze firma: \"%s\" (id:%d)"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Reservering afdwingen"
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Op bestelling"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Volgens verzonden of bestelde aantallen."
+
+#. module: sale
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Alle producten tegelijk leveren"
+
+#. module: sale
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Gekoppelde zendnota"
+
+#. module: sale
+#: field:sale.config.picking_policy,name:0
+msgid "Name"
+msgstr "Naam"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Shipping address :"
+msgstr "Verzendadres:"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_by_partner
+msgid "Sales per Customer in last 90 days"
+msgstr "Omzet per klant in de afgelopen 90 dagen"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_quotation0
+msgid "Draft state of sales order"
+msgstr "Conceptstatus van verkooporder"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Leveringsorder maken"
+
+#. module: sale
+#: code:addons/sale/sale.py:1303
+#, python-format
+msgid "Cannot delete a sales order line which is in state '%s'!"
+msgstr "Een verkooporderlijn die %s is, kan niet worden verwijderd."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoS)"
+msgstr "Hvh (VK)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Total Tax Included"
+msgstr "Totaal incl. btw"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Zendnota maken"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered date of the sales order"
+msgstr "Besteldatum van verkooporder"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales by Product Category"
+msgstr "Verkopen per productcategorie"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_confirmquotation0
+msgid "Confirm Quotation"
+msgstr "Offerte bevestigen"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:63
+#, python-format
+msgid "Error"
+msgstr "Fout"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0 view:sale.report:0
+msgid "Group By..."
+msgstr "Groeperen op..."
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Factuur opnieuw maken"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
+#: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
+msgid "Deliveries to Invoice"
+msgstr "Te factureren leveringen"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Waiting Schedule"
+msgstr "Volgende planning"
+
+#. module: sale
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Verwervingswijze"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_packinglist0
+msgid "Pick List"
+msgstr "Zendnota"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Set to Draft"
+msgstr "Terugzetten naar Voorlopig"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Document van de verplaatsing naar de verzendzone of naar de klant."
+
+#. module: sale
+#: model:email.template,body:sale.email_template_edi_sale
+msgid ""
+"\n"
+"Hello${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Here is your order confirmation for ${object.partner_id.name}:\n"
+"       | Order number: *${object.name}*\n"
+"       | Order total: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Order date: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Order reference: ${object.origin}\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       | Your reference: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the order confirmation, download it and even pay online using "
+"the following link:\n"
+"    ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
+msgstr ""
+"\n"
+"Hallo${object.partner_order_id.name and ' ' or "
+"''}${object.partner_order_id.name or ''},\n"
+"\n"
+"Hierbij vindt u uw orderbevestiging voor ${object.partner_id.name}:\n"
+"       | Ordernummer: *${object.name}*\n"
+"       | Ordertotaal: *${object.amount_total} "
+"${object.pricelist_id.currency_id.name}*\n"
+"       | Orderdatum: ${object.date_order}\n"
+"       % if object.origin:\n"
+"       | Orderreferentie: ${object.origin}\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       | Uw referentie: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       | Uw contactpersoon: ${object.user_id.name} "
+"${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"U kunt de orderbevestiging bekijken of downloaden, of on line betalen via de "
+"volgende link:\n"
+"    ${ctx.get('edi_web_url_view') or 'nvt'}\n"
+"\n"
+"% if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account:\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"order_name = quote(object.name)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"order_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Order%%20%s&invoice=%s&amo"
+"unt=%s\" \\\n"
+"             "
+"\"&currency_code=%s&button_subtype=services&no_note=1&bn=OpenERP_Order_PayNow"
+"_%s\" % \\\n"
+"             "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"%>\n"
+"U kunt ook onmiddellijk via Paypal betalen:\n"
+"    ${paypal_url}\n"
+"% endif\n"
+"\n"
+"Neem gerust contact met ons op als u vragen heeft.\n"
+"\n"
+"\n"
+"Bedankt dat u kiest voor ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+"            "
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_validate0
+msgid "Validate"
+msgstr "Goedkeuren"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Confirm Order"
+msgstr "Order bevestigen"
+
+#. module: sale
+#: model:process.transition,name:sale.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Verwervingsopdracht maken"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,amount_tax:0
+#: field:sale.order.line,tax_id:0
+msgid "Taxes"
+msgstr "Btw"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order ready to be invoiced"
+msgstr "Te factureren verkooporders"
+
+#. module: sale
+#: help:sale.order,create_date:0
+msgid "Date on which sales order is created."
+msgstr "Datum waarop verkooporder is gemaakt."
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_move
+msgid "Stock Move"
+msgstr "Voorraadbeweging"
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create Invoices"
+msgstr "Facturen maken"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current month"
+msgstr "Verkooporders gemaakt in deze maand"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Fax :"
+msgstr "Fax:"
+
+#. module: sale
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+"Als 'op bestelling' worden gebruikt, wordt een herbevoorrading gestart bij "
+"bevestiging van het verkooporder: er wordt een taak, een aankooporder of een "
+"productiebon gemaakt voor de verkooporderlijn."
+
+#. module: sale
+#: field:sale.advance.payment.inv,amount:0
+msgid "Advance Amount"
+msgstr "Voorschotbedrag"
+
+#. module: sale
+#: field:sale.config.picking_policy,charge_delivery:0
+msgid "Do you charge the delivery?"
+msgstr "Rekent u het transport aan?"
+
+#. module: sale
+#: selection:sale.order,invoice_quantity:0
+msgid "Shipped Quantities"
+msgstr "Verzonden hoeveelheden"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Sales Orders"
+msgstr "Factuur volgens verkooporder"
+
+#. module: sale
+#: code:addons/sale/sale.py:331
+#, python-format
+msgid ""
+"If you change the pricelist of this order (and eventually the currency), "
+"prices of existing order lines will not be updated."
+msgstr ""
+"Als u de prijslijst van dit order (en eventueel de munt) wijzigt, worden de "
+"prijzen van de bestaande orderlijnen niet bijgewerkt."
+
+#. module: sale
+#: model:ir.model,name:sale.model_stock_picking
+msgid "Picking List"
+msgstr "Zendnota"
+
+#. module: sale
+#: code:addons/sale/sale.py:412 code:addons/sale/sale.py:503
+#: code:addons/sale/sale.py:632 code:addons/sale/sale.py:1016
+#: code:addons/sale/sale.py:1033
+#, python-format
+msgid "Error !"
+msgstr "Fout"
+
+#. module: sale
+#: code:addons/sale/sale.py:603
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Kan verkooporder niet annuleren"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Qty(UoM)"
+msgstr "Hvh (eenh.)"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Ordered Year of the sales order"
+msgstr "Besteljaar van de verkooporder"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "July"
+msgstr "Juli"
+
+#. module: sale
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Bevoorrading"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Shipping Exception"
+msgstr "Verzenduitzondering"
+
+#. module: sale
+#: code:addons/sale/sale.py:1156
+#, python-format
+msgid "Picking Information ! : "
+msgstr "Verzendinformatie "
+
+#. module: sale
+#: field:sale.make.invoice,grouped:0
+msgid "Group the invoices"
+msgstr "Facturen groeperen"
+
+#. module: sale
+#: field:sale.order,order_policy:0
+msgid "Invoice Policy"
+msgstr "Factuurbeleid"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_config_picking_policy
+#: view:sale.config.picking_policy:0
+msgid "Setup your Invoicing Method"
+msgstr "Stel uw factuurmethode in"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_invoice0
+msgid "To be reviewed by the accountant."
+msgstr "Door de boekhouder te controleren."
+
+#. module: sale
+#: view:sale.report:0
+msgid "Reference UoM"
+msgstr "Referentie-eenheid"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid ""
+"This tool will help you to install the right module and configure the system "
+"according to the method you use to invoice your customers."
+msgstr ""
+"Hiermee kiest u de juiste module en stelt u het systeem in volgens de "
+"methode die u gebruikt om uw klanten te factureren."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order_line_make_invoice
+msgid "Sale OrderLine Make_invoice"
+msgstr "Factuur maken van verkooporderlijnen"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Invoice Exception"
+msgstr "Factuuruitzondering"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleorder0
+msgid "Drives procurement and invoicing"
+msgstr "Stuurt de verwervingen en facturatie"
+
+#. module: sale
+#: field:sale.order,invoiced:0
+msgid "Paid"
+msgstr "Betaald"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_report_all
+#: model:ir.ui.menu,name:sale.menu_report_product_all view:sale.report:0
+msgid "Sales Analysis"
+msgstr "Verkoopanalyse"
+
+#. module: sale
+#: code:addons/sale/sale.py:1151
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"U heeft een aantal van %d stuks geselecteerd.\\n\n"
+"Dat is echter niet verenigbaar met de geselecteerde verpakking.\\n\n"
+"Hier is een voorstel van aantallen volgens de verpakking:\n"
+"EAN: %s Aantal: %s Soort: %s"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Recreate Packing"
+msgstr "Zendnota opnieuw maken"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Eigenschappen"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_quotation0
+#: selection:sale.order,state:0 selection:sale.report,state:0
+msgid "Quotation"
+msgstr "Offerte"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_invoice0
+msgid ""
+"The Salesman creates an invoice manually, if the sales order shipping policy "
+"is 'Shipping and Manual in Progress'. The invoice is created automatically "
+"if the shipping policy is 'Payment before Delivery'."
+msgstr ""
+"De verkoper maakt zelf een factuur als verkooporder leveringsmethode "
+"'Levering en handmatige factuur' is. De factuur wordt automatisch gemaakt "
+"als de leveringsmethode 'Vooruitbetaling' is."
+
+#. module: sale
+#: help:sale.config.picking_policy,order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"U kunt facturen maken op basis van verkooporder of op basis van leveringen."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Confirmed sale order lines, not yet delivered"
+msgstr "Bevestigde verkooporderlijnen, nog niet geleverd"
+
+#. module: sale
+#: code:addons/sale/sale.py:473
+#, python-format
+msgid "Customer Invoices"
+msgstr "Verkoopfacturen"
+
+#. module: sale
+#: model:process.process,name:sale.process_process_salesprocess0
+#: view:sale.order:0 view:sale.report:0
+msgid "Sales"
+msgstr "Verkoop"
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,price_unit:0
+msgid "Unit Price"
+msgstr "Eenheidsprijs"
+
+#. module: sale
+#: selection:sale.order,state:0 view:sale.order.line:0
+#: selection:sale.order.line,state:0 selection:sale.report,state:0
+msgid "Done"
+msgstr "Gereed"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_invoice0
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Factuur"
+
+#. module: sale
+#: code:addons/sale/sale.py:1171
+#, python-format
+msgid ""
+"You have to select a customer in the sales form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+"U moet een klant kiezen in het verkoopformulier.\n"
+"Gelieve dit te doen voordat u een product kiest."
+
+#. module: sale
+#: field:sale.order,origin:0
+msgid "Source Document"
+msgstr "Brondocument"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "To Do"
+msgstr "Nog te doen"
+
+#. module: sale
+#: field:sale.order,picking_policy:0
+msgid "Picking Policy"
+msgstr "Verzendbeleid"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Document voor de verplaatsing naar de klant."
+
+#. module: sale
+#: help:sale.order,amount_untaxed:0
+msgid "The amount without tax."
+msgstr "Bedrag zonder btw"
+
+#. module: sale
+#: code:addons/sale/sale.py:604
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr "U moet eerst alle zendnota's voor deze verkooporder annuleren."
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Voorschotfactuur"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,month:0
+msgid "Month"
+msgstr "Maand"
+
+#. module: sale
+#: model:email.template,subject:sale.email_template_edi_sale
+msgid "${object.company_id.name} Order (Ref ${object.name or 'n/a' })"
+msgstr "${object.company_id.name} Order (Ref. ${object.name or 'nvt' })"
+
+#. module: sale
+#: view:sale.order.line:0 field:sale.order.line,product_id:0
+#: view:sale.report:0 field:sale.report,product_id:0
+msgid "Product"
+msgstr "Product"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Reservering annuleren"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr "sale.config.picking_policy"
+
+#. module: sale
+#: view:account.invoice.report:0 view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_turnover_by_month
+msgid "Monthly Turnover"
+msgstr "Maandelijkse omzet"
+
+#. module: sale
+#: field:sale.order,invoice_quantity:0
+msgid "Invoice on"
+msgstr "Factureer op"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Date Ordered"
+msgstr "Besteldatum"
+
+#. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "Productverkoopeenheid"
+
+#. module: sale
+#: selection:sale.report,state:0
+msgid "Manual In Progress"
+msgstr "Handmatig"
+
+#. module: sale
+#: field:sale.order.line,product_uom:0
+msgid "Product UoM"
+msgstr "Producteenheid"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Logistic"
+msgstr "Logistiek"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Order"
+msgstr "Order"
+
+#. module: sale
+#: code:addons/sale/sale.py:1017
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:71
+#, python-format
+msgid "There is no income account defined for this product: \"%s\" (id:%d)"
+msgstr ""
+"Er is geen opbrengstenrekening gedefinieerd voor dit product: \"%s\" (id:%d)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Uitzondering negeren"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleinvoice0
+msgid ""
+"Depending on the Invoicing control of the sales order, the invoice can be "
+"based on delivered or on ordered quantities. Thus, a sales order can "
+"generates an invoice or a delivery order as soon as it is confirmed by the "
+"salesman."
+msgstr ""
+"Afhankelijk van de facturatiemethode van de verkooporder kan de factuur "
+"gebaseerd zijn op bestelde of geleverde aantallen. Hierdoor kan een "
+"verkooporder een factuur of leveringsopdracht maken zodra de order wordt "
+"bevestigd door de verkoper."
+
+#. module: sale
+#: code:addons/sale/sale.py:1251
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"U wilt %.2f %s verkopen, maar er zijn slechts %.2f %s beschikbaar.\\n\n"
+"De werkelijke voorraad is %.2f %s (zonder reserveringen)."
+
+#. module: sale
+#: view:sale.order:0
+msgid "States"
+msgstr "Statussen"
+
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
+#. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Reference"
+msgstr "Referentie klant"
+
+#. module: sale
+#: field:sale.order,amount_total:0 view:sale.order.line:0
+msgid "Total"
+msgstr "Totaal"
+
+#. module: sale
+#: report:sale.order:0 view:sale.order.line:0
+msgid "Price"
+msgstr "Prijs"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Afhankelijk van de configuratie van de verzendlocatie (output), gebeurt de "
+"verplaatsing tussen de verzendlocatie en de klant via de zendnota manueel of "
+"automatisch."
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Pay before delivery"
+msgstr "Vooruitbetaling"
+
+#. module: sale
+#: view:board.board:0 model:ir.actions.act_window,name:sale.open_board_sales
+msgid "Sales Dashboard"
+msgstr "Verkoopdashboard"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
+#: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
+msgid "Make Invoices"
+msgstr "Facturen maken"
+
+#. module: sale
+#: view:sale.order:0 selection:sale.order,state:0 view:sale.order.line:0
+msgid "To Invoice"
+msgstr "Te factureren"
+
+#. module: sale
+#: help:sale.order,date_confirm:0
+msgid "Date on which sales order is confirmed."
+msgstr "Datum waarop verkooporder is bevestigd."
+
+#. module: sale
+#: field:sale.order,project_id:0
+msgid "Contract/Analytic Account"
+msgstr "Contract/Analytische rekening"
+
+#. module: sale
+#: field:sale.order,company_id:0 field:sale.order.line,company_id:0
+#: view:sale.report:0 field:sale.report,company_id:0
+#: field:sale.shop,company_id:0
+msgid "Company"
+msgstr "Bedrijf"
+
+#. module: sale
+#: field:sale.make.invoice,invoice_date:0
+msgid "Invoice Date"
+msgstr "Factuurdatum"
+
+#. module: sale
+#: help:sale.advance.payment.inv,amount:0
+msgid "The amount to be invoiced in advance."
+msgstr "Het bedrag dat vooruit wordt gefactureerd."
+
+#. module: sale
+#: code:addons/sale/sale.py:1269
+#, python-format
+msgid ""
+"Couldn't find a pricelist line matching this product and quantity.\n"
+"You have to change either the product, the quantity or the pricelist."
+msgstr ""
+"Geen prijslijstlijn gevonden voor dit product en deze hoeveelheid.\n"
+"U moet het product, de hoeveelheid of de prijslijst veranderen."
+
+#. module: sale
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of picking that has been generated for this sales order."
+msgstr "Dit is de lijst van zendnota's die voor deze verkoop zijn gemaakt."
+
+#. module: sale
+#: view:sale.make.invoice:0 view:sale.order.line.make.invoice:0
+msgid "Create invoices"
+msgstr "Facturen maken"
+
+#. module: sale
+#: report:sale.order:0
+msgid "Net Total :"
+msgstr "Nettototaal:"
+
+#. module: sale
+#: selection:sale.order,state:0 selection:sale.order.line,state:0
+#: selection:sale.report,state:0
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sales Order Lines related to a Sales Order of mine"
+msgstr "Verkooporderlijnen gekoppeld aan een van mijn verkooporders"
+
+#. 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
+#: view:sale.report:0 field:sale.report,shop_id:0
+msgid "Shop"
+msgstr "Verkooppunt"
+
+#. module: sale
+#: field:sale.report,date_confirm:0
+msgid "Date Confirm"
+msgstr "Bevestigingsdatum"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid "Warning"
+msgstr "Waarschuwing"
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_view_sales_by_month
+msgid "Sales by Month"
+msgstr "Verkopen per maand"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_order
+#: model:process.node,name:sale.process_node_order0
+#: model:process.node,name:sale.process_node_saleorder0
+#: model:res.request.link,name:sale.req_link_sale_order view:sale.order:0
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Verkooporder"
+
+#. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Hoeveelheid (verk.eenh.)"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines that are in 'done' state"
+msgstr "Afgewerkte verkooporderlijnen"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"De zendnota wordt gemaakt zodra de verkooporder is bevestigd, op hetzelfde "
+"moment als de verwervingsopdracht. Het representeert de toekenning van "
+"onderdelen aan de verkooporder. Er is 1 zendnota per verkooporderregel die "
+"ontwikkelt volgens de beschikbaarheid van onderdelen."
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Confirmed"
+msgstr "Bevestigd"
+
+#. module: sale
+#: field:sale.config.picking_policy,order_policy:0
+msgid "Main Method Based On"
+msgstr "Hoofdmethode volgens"
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_confirm0
+msgid "Confirm"
+msgstr "Bevestigen"
+
+#. module: sale
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "U kunt niet dezelfde bedrijven maken."
+
+#. module: sale
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_sales_product_total_price
+msgid "Sales by Product's Category in last 90 days"
+msgstr "Omzet per productcategorie in de afgelopen 90 dagen"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order.line,invoice_lines:0
+msgid "Invoice Lines"
+msgstr "Factuurlijnen"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Sales Order Lines"
+msgstr "Verkooporderlijnen"
+
+#. module: sale
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Leveringstermijn"
+
+#. module: sale
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuratie"
+
+#. module: sale
+#: code:addons/sale/edi/sale_order.py:146
+#, python-format
+msgid "EDI Pricelist (%s)"
+msgstr "EDI-prijslijst (%s)"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Print Order"
+msgstr "Order afdrukken"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in current year"
+msgstr "Verkooporders gemaakt in dit jaar"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_line_invoice.py:113
+#, python-format
+msgid ""
+"Invoice cannot be created for this Sales Order Line due to one of the "
+"following reasons:\n"
+"1.The state of this sales order line is either \"draft\" or \"cancel\"!\n"
+"2.The Sales Order Line is Invoiced!"
+msgstr ""
+"Factuur kan niet worden gemaakt voor deze verkooporderregel omdat:\\n\n"
+"1. de status van deze verkooporder \\\"concept\\\" is of \\\"geannuleerd\\"
+"\"\\n\n"
+"2. de verkooporderregel al is gefactureerd."
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale order lines done"
+msgstr "Afgewerkte verkooporderlijnen"
+
+#. module: sale
+#: field:sale.order.line,th_weight:0
+msgid "Weight"
+msgstr "Gewicht"
+
+#. module: sale
+#: view:sale.open.invoice:0 view:sale.order:0 field:sale.order,invoice_ids:0
+msgid "Invoices"
+msgstr "Facturen"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "December"
+msgstr "December"
+
+#. module: sale
+#: field:sale.config.picking_policy,config_logo:0
+msgid "Image"
+msgstr "Afbeelding"
+
+#. module: sale
+#: model:process.transition,note:sale.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Een verwervingsopdracht is automatisch gemaakt zodra de verkooporder is "
+"bevestigd of als de factuur is betaald. Het stuurt de aankoop en productie "
+"aan van producten volgens de regels en volgens de verkooporderparameters. "
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Uninvoiced"
+msgstr "Niet gefactureerd"
+
+#. module: sale
+#: report:sale.order:0 view:sale.order:0 field:sale.order,user_id:0
+#: view:sale.order.line:0 field:sale.order.line,salesman_id:0
+#: view:sale.report:0 field:sale.report,user_id:0
+msgid "Salesman"
+msgstr "Verkoper"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree
+msgid "Old Quotations"
+msgstr "Oude offertes"
+
+#. module: sale
+#: field:sale.order,amount_untaxed:0
+msgid "Untaxed Amount"
+msgstr "Bedrag excl. btw"
+
+#. module: sale
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:170
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0 view:sale.order:0
+#, python-format
+msgid "Advance Invoice"
+msgstr "Voorschotfactuur"
+
+#. module: sale
+#: code:addons/sale/sale.py:624
+#, python-format
+msgid "The sales order '%s' has been cancelled."
+msgstr "Verkooporder '%s' is geannuleerd."
+
+#. module: sale
+#: selection:sale.order.line,state:0
+msgid "Draft"
+msgstr "Concept"
+
+#. module: sale
+#: help:sale.order.line,state:0
+msgid ""
+"* The 'Draft' state is set when the related sales order in draft state.      "
+"               \n"
+"* The 'Confirmed' state is set when the related sales order is confirmed.    "
+"                 \n"
+"* The 'Exception' state is set when the related sales order is set as "
+"exception.                     \n"
+"* The 'Done' state is set when the sales order line has been picked.         "
+"            \n"
+"* The 'Cancelled' state is set when a user cancel the sales order related."
+msgstr ""
+"* De status 'Concept' betekent dat het een offerte is.                     \\"
+"n\n"
+"* De status 'Bevestigd'  betekent dat de verkooporder is goedgekeurd.        "
+"             \\n\n"
+"* De status 'Uitzondering' betekent dat er iets fouts is met de  "
+"verkooporder.      \\n\n"
+"* De status 'Gereed' betekent dat de verkooporderregel is verzonden.\\n\n"
+"* De status 'Geannuleerd' betekent dat gebruiker de verkooporder heeft "
+"geannuleerd."
+
+#. module: sale
+#: help:sale.order,amount_tax:0
+msgid "The tax amount."
+msgstr "Btw-bedrag"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Packings"
+msgstr "Zendnota's"
+
+#. module: sale
+#: view:sale.order.line:0
+msgid "Sale Order Lines ready to be invoiced"
+msgstr "Te factureren verkooporderlijnen"
+
+#. module: sale
+#: view:sale.report:0
+msgid "Sales order created in last month"
+msgstr "Verkooporders gemaakt in de afgelopen maand"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_email_templates
+#: model:ir.ui.menu,name:sale.menu_email_templates
+msgid "Email Templates"
+msgstr "E-mailsjablonen"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order view:sale.order:0
+msgid "Sales Orders"
+msgstr "Verkooporders"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop view:sale.shop:0
+msgid "Sales Shop"
+msgstr "Verkooppunt"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "November"
+msgstr "November"
+
+#. module: sale
+#: field:sale.advance.payment.inv,product_id:0
+msgid "Advance Product"
+msgstr "Voorschotproduct"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Compute"
+msgstr "Berekenen"
+
+#. module: sale
+#: code:addons/sale/sale.py:618
+#, python-format
+msgid "You must first cancel all invoices attached to this sales order."
+msgstr "U moet eerst alle facturen voor deze verkooporder annuleren."
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "January"
+msgstr "Januari"
+
+#. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_tree4
+msgid "Sales Order in Progress"
+msgstr "Lopende verkooporders"
+
+#. module: sale
+#: help:sale.order,origin:0
+msgid "Reference of the document that generated this sales order request."
+msgstr ""
+"Referentie van het document op basis waarvan deze verkooporder is gemaakt."
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,delay:0
+msgid "Commitment Delay"
+msgstr "Vertraging"
+
+#. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Deliver & invoice on demand"
+msgstr "Leveren & factureren op verzoek"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Een verwervingsopdracht voor elke verkooporderlijn en voor elk van de "
+"componenten."
+
+#. module: sale
+#: model:process.transition.action,name:sale.process_transition_action_assign0
+msgid "Assign"
+msgstr "Toewijzen"
+
+#. module: sale
+#: field:sale.report,date:0
+msgid "Date Order"
+msgstr "Besteldatum"
+
+#. module: sale
+#: model:process.node,note:sale.process_node_order0
+msgid "Confirmed sales order to invoice."
+msgstr "Te factureren verkooporders"
+
+#. module: sale
+#: view:sale.order:0
+msgid "Sales Order that haven't yet been confirmed"
+msgstr "Onbevestigde verkooporders"
+
+#. module: sale
+#: code:addons/sale/sale.py:322
+#, python-format
+msgid "The sales order '%s' has been set in draft state."
+msgstr "Verkooporder '%s' bevindt zich in conceptstatus."
+
+#. module: sale
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "uit voorraad"
+
+#. module: sale
+#: view:sale.open.invoice:0
+msgid "Close"
+msgstr "Sluiten"
+
+#. module: sale
+#: code:addons/sale/sale.py:1261
+#, python-format
+msgid "No Pricelist ! : "
+msgstr "Geen prijslijst "
+
+#. module: sale
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Geleverd"
+
+#. module: sale
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "U moet een productielot toekennen aan dit product"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_shop_form
+msgid ""
+"If you have more than one shop reselling your company products, you can "
+"create and manage that from here. Whenever you will record a new quotation "
+"or sales order, it has to be linked to a shop. The shop also defines the "
+"warehouse from which the products will be delivered for each particular "
+"sales."
+msgstr ""
+"Als uw producten in meer dan een verkooppunt worden verkocht, kunt u hier "
+"verkooppunten maken en beheren. Elke nieuwe offerte of verkooporder moet "
+"zijn gekoppeld aan een verkooppunt. Het verkooppunt bepaalt ook vanuit welk "
+"magazijn de producten worden geleverd."
+
+#. module: sale
+#: help:sale.order,invoiced:0
+msgid "It indicates that an invoice has been paid."
+msgstr "Geeft aan dat de factuur is betaald."
+
+#. module: sale
+#: report:sale.order:0 field:sale.order.line,name:0
+msgid "Description"
+msgstr "Omschrijving"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "May"
+msgstr "Mei"
+
+#. module: sale
+#: view:sale.order:0 field:sale.order,partner_id:0
+#: field:sale.order.line,order_partner_id:0
+msgid "Customer"
+msgstr "Klant"
+
+#. module: sale
+#: model:product.template,name:sale.advance_product_0_product_template
+msgid "Advance"
+msgstr "Voorschot"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "February"
+msgstr "Februari"
+
+#. module: sale
+#: selection:sale.report,month:0
+msgid "April"
+msgstr "April"
+
+#. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr "Boekhouding"
+
+#. module: sale
+#: view:sale.order:0 view:sale.order.line:0
+msgid "Search Sales Order"
+msgstr "Verkooporders zoeken"
+
+#. module: sale
+#: model:process.node,name:sale.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Verkoopofferte"
+
+#. module: sale
+#: code:addons/sale/sale.py:1255
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Onvoldoende voorraad "
+
+#. module: sale
+#: report:sale.order:0 field:sale.order,payment_term:0
+msgid "Payment Term"
+msgstr "Betalingstermijn"
+
+#. module: sale
+#: model:ir.actions.act_window,help:sale.action_order_report_all
+msgid ""
+"This report performs analysis on your quotations and sales orders. Analysis "
+"check your sales revenues and sort it by different group criteria (salesman, "
+"partner, product, etc.) Use this report to perform analysis on sales not "
+"having invoiced yet. If you want to analyse your turnover, you should use "
+"the Invoice Analysis report in the Accounting application."
+msgstr ""
+"Met dit overzicht analyseert u uw offertes en verkooporders.\n"
+"Volg uw inkomsten op, groepeer volgens verschillende criteria (verkoper, "
+"relatie, product, enz.). Gebruik dit overzicht voor niet-gefactureerde "
+"verkopen. Als u uw omzet wilt analyseren, moet u Factuuranalyse gebruiken in "
+"de boekhouding."
+
+#. module: sale
+#: report:sale.order:0
+msgid "Quotation N°"
+msgstr "Offertenr."
+
+#. module: sale
+#: field:sale.order,picked_rate:0 view:sale.report:0
+msgid "Picked"
+msgstr "Geleverd"
+
+#. module: sale
+#: view:sale.report:0 field:sale.report,year:0
+msgid "Year"
+msgstr "Jaar"
+
+#. module: sale
+#: selection:sale.config.picking_policy,order_policy:0
+msgid "Invoice Based on Deliveries"
+msgstr "Factuur op basis van zendnota's"
+
+#~ 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 "Allows you to compute delivery costs on your quotations."
+#~ msgstr "Geeft de mogelijkheid om verzendkosten te berekenen op offertes"
+
+#~ msgid "Configure Sales Order Logistics"
+#~ msgstr "Verkooporderlogistiek instellen"
+
+#~ msgid "Payment Before Delivery"
+#~ msgstr "Vooruitbetaling"
+
+#~ msgid "VAT"
+#~ msgstr "Btw"
+
+#~ msgid "All at Once"
+#~ msgstr "Complete leveringen"
+
+#~ msgid "Configure Picking Policy for Sales Order"
+#~ msgstr "Verzendbeleid voor verkooporder configureren"
+
+#~ 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 picking order after the payment of this invoice.\n"
+#~ "  - The 'Shipping & Manual Invoice' will create the picking order directly "
+#~ "and wait for the user to manually click on the 'Invoice' button to generate "
+#~ "the draft invoice.\n"
+#~ "  - The 'Invoice On Order After Delivery' choice will generate the draft "
+#~ "invoice based on sales order after all picking lists have been finished.\n"
+#~ "  - The 'Invoice From The Picking' choice is used to create an invoice "
+#~ "during the picking process."
+#~ msgstr ""
+#~ "Het leveringsbeleid wordt gebruikt om facturatie- en leveringsbewerkingen te "
+#~ "synchroniseren.\\n\n"
+#~ "  - De optie 'Vooruitbetaling' genereert eerst de factuur en de zendnota pas "
+#~ "na betaling van de factuur.\\n\n"
+#~ "  - De optie 'Leveren & Handmatig factureren' maakt de zendnota direct en "
+#~ "wacht met het genereren van een conceptfactuur totdat de gebruiker op de "
+#~ "knop 'Factureren' klikt.\\n\n"
+#~ "  - De optie 'Factuur volgens order na levering' genereert de conceptfactuur "
+#~ "gebaseerd op de verkooporder, nadat alle zendnota's gereed zijn.\\n\n"
+#~ "  - De optie 'Factuur van zendnota' wordt gebruikt om een factuur te maken "
+#~ "gedurende het verzamelproces."
+
+#~ msgid "Configure"
+#~ msgstr "Instellen"
+
+#~ msgid "Delivery Order Only"
+#~ msgstr "Alleen leveringsopdracht"
+
+#~ msgid "Enhance your core Sales Application with additional functionalities."
+#~ msgstr "Voeg extra mogelijkheden toe aan uw verkoopbeheer."
+
+#~ msgid "Order Reference must be unique !"
+#~ msgstr "De orderreferentie moet uniek zijn."
+
+#~ msgid "Setup your sales workflow and default values."
+#~ msgstr "Stel uw verkoopworkflow en standaardwaarden in."
+
+#~ msgid "Invoice On Order After Delivery"
+#~ msgstr "Factuur volgens order na levering"
+
+#~ msgid "  Year  "
+#~ msgstr "  Jaar  "
+
+#~ msgid "Do you really want to create the invoice(s) ?"
+#~ msgstr "Wilt u de factuur (facturen) maken?"
+
+#~ msgid ""
+#~ "\n"
+#~ "    The base module to manage quotations and sales orders.\n"
+#~ "\n"
+#~ "    * Workflow with validation steps:\n"
+#~ "        - Quotation -> Sales order -> Invoice\n"
+#~ "    * Invoicing methods:\n"
+#~ "        - Invoice on order (before or after shipping)\n"
+#~ "        - Invoice on delivery\n"
+#~ "        - Invoice on timesheets\n"
+#~ "        - Advance invoice\n"
+#~ "    * Partners preferences (shipping, invoicing, incoterm, ...)\n"
+#~ "    * Products stocks and prices\n"
+#~ "    * Delivery methods:\n"
+#~ "        - all at once, multi-parcel\n"
+#~ "        - delivery costs\n"
+#~ "    * Dashboard for salesman that includes:\n"
+#~ "    * Your open quotations\n"
+#~ "    * Top 10 sales of the month\n"
+#~ "    * Cases statistics\n"
+#~ "    * Graph of sales by product\n"
+#~ "    * Graph of cases of the month\n"
+#~ "    "
+#~ msgstr ""
+#~ "\n"
+#~ "    \\n\n"
+#~ "    De basismodule om offertes en verkooporders te beheren.\\n\n"
+#~ "\\n\n"
+#~ "    * Workflow met validatiestappen:\\n\n"
+#~ "        - Offerte -> Verkooporder -> Factuur\\n\n"
+#~ "    * Facturatiemethodes:\\n\n"
+#~ "        - Factuur volgens order (voor of na levering)\\n\n"
+#~ "        - Factuur bij levering\\n\n"
+#~ "        - Factuur volgens urenstaten\\n\n"
+#~ "        - Voorschotfactuur\\n\n"
+#~ "    * Relatievoorkeuren (levering, facturatie, voorwaarden, ...)\\n\n"
+#~ "    * Productvoorraad en prijzen\\n\n"
+#~ "    * Leveringsmethodes:\\n\n"
+#~ "        - complete leveringen, deelleveringen\\n\n"
+#~ "        - verzendkosten\\n\n"
+#~ "    * Dashboard voor verkoper met:\\n\n"
+#~ "    * Uw open offertes\\n\n"
+#~ "    * Top 10 verkopen deze maand\\n\"\n"
+#~ "    * Dossierstatistieken\\n\"\n"
+#~ "    * Grafiek van omzet per product\\n\"\n"
+#~ "    * Grafiek van dossiers per maand\\n\"\n"
+#~ "    "
+
+#~ msgid "Picking Default Policy"
+#~ msgstr "Standaard verzendbeleid"
+
+#, python-format
+#~ msgid "You cannot cancel a sales order line that has already been invoiced !"
+#~ msgstr "U kunt geen verkooporderlijn annuleren die al is gefactureerd."
+
+#~ msgid "Sales Order Dates"
+#~ msgstr "Verkooporderdatums"
+
+#~ msgid "Margins in Sales Orders"
+#~ msgstr "Marges in verkooporders"
+
+#~ msgid "Sales Application Configuration"
+#~ msgstr "Verkoopbeheer instellen"
+
+#~ msgid "Delivery Costs"
+#~ msgstr "Verzendkosten"
+
+#~ msgid "Partial Delivery"
+#~ msgstr "Gedeeltelijke levering"
+
+#~ msgid "title"
+#~ msgstr "Titel"
+
+#~ msgid "Order date"
+#~ msgstr "Besteldatum"
+
+#~ msgid "Shipping Policy"
+#~ msgstr "Verzendbeleid"
+
+#~ msgid "Shipping & Manual Invoice"
+#~ msgstr "Verzending & manuele factuur"
+
+#, python-format
+#~ msgid "Picking Information !"
+#~ msgstr "Verzendinformatie"
+
+#~ msgid "Sales Management"
+#~ msgstr "Verkoopbeheer"
+
+#~ msgid "Invoice From The Picking"
+#~ msgstr "Factuur van zendnota"
+
+#~ msgid ""
+#~ "By default, OpenERP is able to manage complex routing and paths of products "
+#~ "in your warehouse and partner locations. This will configure the most common "
+#~ "and simple methods to deliver products to the customer in one or two "
+#~ "operations by the worker."
+#~ msgstr ""
+#~ "OpenERP is standaard in staat om complexe routingpaden voor producten in uw "
+#~ "magazijn en relatielocaties te beheren. Hiermee kunt u op een algemene, "
+#~ "eenvoudige wijze producten leveren aan klanten waarvoor één of twee "
+#~ "bewerkingen door de medewerker nodig zijn."
+
+#~ msgid "sale.installer"
+#~ msgstr "sale.installer"
+
+#~ msgid "Picking List & Delivery Order"
+#~ msgstr "Zendnota & leveringsorder"
+
+#~ msgid "Invoicing"
+#~ msgstr "Facturatie"
+
+#~ msgid ""
+#~ "Gives the state of the quotation or sales order. \n"
+#~ "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). \n"
+#~ "The 'Waiting Schedule' state is set when the invoice is confirmed but "
+#~ "waiting for the scheduler to run on the date 'Ordered Date'."
+#~ msgstr ""
+#~ "Geeft de status van de offerte of verkooporder. \\n\n"
+#~ "Status Uitzondering wordt automatisch ingesteld als er een fout optreedt "
+#~ "voor een factuur(Factuuruitzondering) of een zendnota "
+#~ "(Leveringsuitzondering). \\n\n"
+#~ "De 'Wacht op Planner' status wordt ingesteld als de factuur is bevestigd, "
+#~ "maar wacht op de planner die op de 'Bestelde datum' zal lopen."
+
+#, python-format
+#~ msgid "Cannot delete a sales order line which is %s !"
+#~ msgstr "Een verkooporderlijn die %s is, kan niet worden verwijderd."
+
+#~ msgid ""
+#~ "Gives the margin of profitability by calculating the difference between Unit "
+#~ "Price and Cost Price."
+#~ msgstr ""
+#~ "Geeft de winstmarge door het verschil te berekenen tussen eenheidsprijs en "
+#~ "kostprijs."
+
+#~ msgid "   Month   "
+#~ msgstr "   Maand   "
+
+#, python-format
+#~ msgid ""
+#~ "You selected a quantity of %d Units.\n"
+#~ "But it's not compatible with the selected packaging.\n"
+#~ "Here is a proposition of quantities according to the packaging:\n"
+#~ "\n"
+#~ "EAN: %s Quantity: %s Type of ul: %s"
+#~ msgstr ""
+#~ "U heeft een aantal van %d stuks geselecteerd.\\n\n"
+#~ "Dat is echter niet verenigbaar met de geselecteerde verpakking.\\n\n"
+#~ "Hier is een voorstel van aantallen volgens de verpakking:\\n\n"
+#~ "\\n\n"
+#~ "EAN: %s Aantal: %s Soort: %s"
+
+#~ msgid "Complete Delivery"
+#~ msgstr "Volledige levering"
+
+#~ msgid "    Month-1    "
+#~ msgstr "    Maand-1    "
+
+#~ msgid ""
+#~ "The Shipping Policy is used to configure per order if you want to deliver as "
+#~ "soon as possible when one product is available or you wait that all products "
+#~ "are available.."
+#~ msgstr ""
+#~ "Het leverbeleid wordt gebruikt om per order te configureren of zo snel "
+#~ "mogelijk wordt geleverd of dat er wordt gewacht tot alle producten "
+#~ "beschikbaar zijn."
+
+#~ msgid "Configuration Progress"
+#~ msgstr "Configuratievoortgang"
+
+#~ msgid "Product sales"
+#~ msgstr "Verkopen per product"
+
+#~ msgid "Ordered Date"
+#~ msgstr "Besteldatum"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Rechtstreekse levering"
+
+#~ msgid "Invoicing journals"
+#~ msgstr "Facturatiedagboeken"
+
+#~ msgid "Shipped Qty"
+#~ msgstr "Verzonden hvh"
+
+#~ msgid "Configure Your Sales Management Application"
+#~ msgstr "Stel uw toepassing voor verkoopbeheer in"
+
+#~ msgid "Sales Order Layout Improvement"
+#~ msgstr "Aangepaste lay-out verkooporder"
+
+#, python-format
+#~ msgid "Cannot delete Sales Order(s) which are already confirmed !"
+#~ msgstr "Bevestigde verkooporders kunnen niet worden verwijderd."
+
+#~ msgid "Shipping Default Policy"
+#~ msgstr "Standaard verzendbeleid"
+
+#, python-format
+#~ msgid "Not enough stock !"
+#~ msgstr "Onvoldoende voorraad"
+
+#~ msgid "Layout Sequence"
+#~ msgstr "Volgorde lay-out"
+
+#~ msgid "Adds commitment, requested and effective dates on Sales Orders."
+#~ msgstr ""
+#~ "Voegt toegezegde, gevraagde en werkelijke datum toe aan verkooporders."
+
+#~ msgid ""
+#~ "Allows you to group and invoice your delivery orders according to different "
+#~ "invoicing types: daily, weekly, etc."
+#~ msgstr ""
+#~ "Hiermee kunt u zendnota's groeperen en factureren volgens de verschillende "
+#~ "facturatiesoorten: dagelijks, wekelijks, enz."
+
+#~ msgid "Steps To Deliver a Sales Order"
+#~ msgstr "Stappen om een verkooporder te leveren"
+
+#~ msgid ""
+#~ "Provides some features to improve the layout of the Sales Order reports."
+#~ msgstr "Biedt extra mogelijkheden om de verkooporderlay-out te verbeteren."
diff --git a/addons/sale_stock/i18n/oc.po b/addons/sale_stock/i18n/oc.po
new file mode 100644
index 00000000000..b9e1862eff4
--- /dev/null
+++ b/addons/sale_stock/i18n/oc.po
@@ -0,0 +1,702 @@
+# Occitan (post 1500) translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 13:57+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Occitan (post 1500) <oc@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Liurada"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/pl.po b/addons/sale_stock/i18n/pl.po
new file mode 100644
index 00000000000..52f61b0f15a
--- /dev/null
+++ b/addons/sale_stock/i18n/pl.po
@@ -0,0 +1,739 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 13:54+0000\n"
+"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Zamówienie dostawy"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Jeśli nie masz wystarczającego zapasu, aby dostarczyć wszystko od razu, to "
+"czy akceptujesz dostawę częściową?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metoda zapotrzebowania"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "Informacja o pobraniu ! : "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Pobranie"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"Wybrałeś ilość %d jednostek.\n"
+"Ale to jest niespójne z wybranym opakowaniem.\n"
+"Poniżej jest propozycja ilości dopasowana do opakowania:\n"
+"EAN: %s Ilość: %s Typ jl: %s"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Dokument przesunięcia do klienta."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Zatwierdź"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Sklep"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Utwórz zapotrzebowanie"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Zamówienie sprzedaży"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Dla każdej pozycji zamówienia jest tworzone Zapotrzebowanie, aby nabyć "
+"(zakupić lub wyprodukować) produkt."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Zasady wysyłki"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm jest skrótem od 'International Commercial terms' i jest zestawem "
+"warunków sprzedaży, które są skatalogowane do stosowania w międzynarodowych "
+"transakcjach."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Sporządza zapotrzebowania dla każdej pozycji zamówienia sprzedaży."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Przesunięcie zapasów"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Zapotrzebowanie"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Faktura wg dostaw"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Zamówienie sprzedaży"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Pozycja zamówienia sprzedaży"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"Kiedy sprzedawca potwierdzi zamówienie sprzedaży to jest automatycznie "
+"tworzone Pobranie, jak również Zapotrzebowanie."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Klient"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Błąd! Nie możesz tworzyć firm rekurencyjnych."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"To są dni dodane do twojej obietnicy klientowi na wszelki wypadek (wysyłka "
+"nastąpi o tyle dni wcześniej)."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Pobranie"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Magazyn"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Wymuś przypisanie"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Nie mozna anulować zamówienia sprzedaży !"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Czas dostawy"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokument przesunięcia do klienta"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Przesunięcia zapasów"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+"Jeśli 'na zamówienie', to po potwierdzeniu zamówienia zostanie uruchomione "
+"zapotrzebowanie na zadanie, zamówienie zakupu lub zamówienie produkcji "
+"związane z tą pozycją zamówienia sprzedaży."
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Faktura jest tworzona automatycznie, jeśli polityka wysyłki jest 'Faktura z "
+"pobrania' lub 'Faktura z zamówienia po wysyłce'."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Zapotrzebowanie"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Wysłano"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Zapotrzebowanie jest tworzone automatycznie po potwierdzeniu zamówienia "
+"sprzedaży lub po zapłaceniu faktury. Zapotrzebowanie generuje zamówienia "
+"zakupu lub produkcji na podstawie reguł w produkcie i w zamówieniu "
+"sprzedaży. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Pakowanie"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Błąd konfiguracji !"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Dni bezpieczeństwa"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Zapotrzebowanie na sprzedane materiały"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Sklep sprzedaży"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"To oznacza, że zamówienie zostało wydane. To pole jest ustawiane tylko, "
+"jeśli jest stosowany planista."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Właściwości"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Możesz generować faktury na podstawie zamówień lub na podstawie wydań."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statystyka zamówień sprzedaży"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Firmy"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "Odnośnik musi być unikalny w firmie!"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Jedno Zapotrzebowanie dla każdej pozycji zamówienia sprzedaży i dla każdego "
+"komponentu."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Przypisz"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Brak zapasu ! : "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Liczba dni pomiędzy potwierdzeniem zamówienia a wysyłką produktów do klienta"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "z zapasu"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Anuluj"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Liczba opakowań"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Odnośnik zamowienia musi być unikalny w firmie!"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Dostarczone"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Musisz najpierw anulować wszystkie pobrania związane z tym zamówieniem "
+"sprzedaży."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Utwórz fakturę"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Zaliczkowa faktura sprzedaży"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Musisz najpierw anulować przesunięcia zapasów związane z tą pozycją "
+"zamówienia sprzedaży."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(nd.)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Dostarcz"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Anuluj przypisanie"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "na zamówienie"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Oparte o wysłane lub zamówione ilości"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Wydaj wszystkie produkty na raz"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Powiązane pobranie"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Nazwa firmy musi być unikalna !"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Zlecenie zamówienia sprzedaży"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Utwórz zamówienie dostawy"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignoruj wyjątek"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Zaplanowałeś sprzedać %.2f %s ale dostępnych jest tylko %.2f %s  !\n"
+"Zapas rzeczywisty wynosi %.2f %s. (bez rezerwacji)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Wydano"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Wydaj produkty kiedy jest dostępny"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Utwórz pobranie"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Zależnie od ustawień strefy wydań przesunięcie produktów pomiędzy strefą "
+"wydań a klientem może być wykonane ręcznie lub automatycznie."
diff --git a/addons/sale_stock/i18n/pt.po b/addons/sale_stock/i18n/pt.po
new file mode 100644
index 00000000000..2f4dda7bf40
--- /dev/null
+++ b/addons/sale_stock/i18n/pt.po
@@ -0,0 +1,739 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:13+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Ordem de Entrega"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Se não tiver stock sufeciente disponível para entregar de uma vez, aceita "
+"transferências parciais ou não?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método de aquisição"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "Informação Picking! : "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Escolha Lista"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"Selecionou uma quantidade de Unidades %d.\n"
+"Mas não é compatível com a embalagem escolhida.\n"
+"Aqui está uma proposição de quantidades de acordo com a embalagem:\n"
+"EAN: %s Quantidade: %s Tipo de ul: %s"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Documento do movimento para a saída ou para o cliente."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Loja"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Criar ordem de aquisição"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Ordem de Venda"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Para cada linha de pedido de vendas, uma ordem de aquisição é criada para "
+"fornecer o artigo vendido."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Política de expedição"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm que significa \"International Commercial Terms\" implica numa série "
+"de vendas de termos que são utilizados na transação comercial."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Unidades de ordens de aquisição para cada linha de pedido de vendas."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Movimento do Stock"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Ordem de aquisição"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Fatura baseada nas entregas"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Ordem de venda"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Linha da ordem de venda"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"O formulário da Lista Pick é criado assim que a ordem de vendas é "
+"confirmada, ao mesmo tempo que a ordem de aquisição. Ele representa a "
+"atribuição de peças para a ordem de vendas. Há uma lista de seleção de linha "
+"da ordem de vendas que evolui com a disponibilidade das peças."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Não pode criar empresas recursivas."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Estes são os dias adicionados aos que prometeu aos clientes para fins de "
+"segurança"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Lista Picking"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Armazém"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forçar Atribuição"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Não foi possível cancelar a ordem de venda!"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Prazo de entrega da lead"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documento do movimento para o cliente."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Movimentos do Inventário"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+"Se 'em ordem', ele dispara um contrato de venda quando a ordem é confirmada "
+"para criar uma tarefa, a ordem de compra ou ordem de produção é ligada a "
+"esta linha de ordem de venda."
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"A fatura é criada automaticamente se a política de transporte é 'fatura "
+"baseada na recolha' ou 'fatura baseada na ordem após entrega'."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Aquisição"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "metodo inválido para test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"A ordem de aquisição é criada automaticamente, logo que uma ordem de vendas "
+"é confirmada ou a fatura é paga. Que impulsiona a compra e a produção de "
+"artigos em relação às regras e aos parâmetros da ordem de vendas. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Embalagem"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Erro Configuração !"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Dias de segurança"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Aprovisionamento do material vendido"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Loja"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Ele indica que a ordem de venda foi entregue. Este campo é atualizado "
+"somente depois que o horário(s) foram lançados."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Propriedades"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr "Pode gerar faturas baseadas na ordens de venda ou de envios."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estatísticas de ordens de venda"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "A referência deve ser única por empresa!"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Uma ordem de Aquisições para cada linha de pedido de vendas e para cada um "
+"dos componentes."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Atribuir"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Sem stock suficiente ! : "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Número de dias entre a confirmação da ordem de venda e a expedição dos "
+"artigos ao cliente."
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "do stock"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Fatura"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Número de Embalagens"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Ordem de referência deve ser única por empresa!"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Entregue"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Primeiro terá que cancelar todos as recolhas anexadas a esta ordem de venda."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Criar Fatura"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Fatura de Pagamento de Adiantamento das vendas"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Deve primeiro cancelar as movimentações de stock anexadas a esta linha de "
+"ordem de venda."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n/d)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Entrega"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Cancelar Atribuição"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "sob pedido"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Baseado nas quantidades expedidas ou nas da ordem de venda."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Entregar todos os artigos de uma só vez"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Escolher recepção"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "O nome da empresa deve ser único!"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Requisição da ordem de vendas"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Criar ordem de entrega"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar Excepção"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Pretende vender %.2f %s mas só tem %.2f %s disponível !\n"
+"O stock real é %.2f %s. (sem reservas)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Escolhido"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Entregar cada artigo quando estiver disponível"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Criar Lista de Pick"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Dependendo da configuração da localização do Output, o movimento entre o "
+"Output e que o cliente é feito manualmente ou automaticamente através da "
+"Ordem de Entrega ."
diff --git a/addons/sale_stock/i18n/pt_BR.po b/addons/sale_stock/i18n/pt_BR.po
new file mode 100644
index 00000000000..bf0538cd284
--- /dev/null
+++ b/addons/sale_stock/i18n/pt_BR.po
@@ -0,0 +1,744 @@
+# translation of pt_BR.po to
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pt_BR\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:04+0000\n"
+"Last-Translator: Fábio Martinelli - http://zupy.com.br "
+"<webmaster@guaru.net>\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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Ordem de Entrega"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Se não houver estoque disponível para entregar tudo de uma vez, você aceita "
+"embarques parciais?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Método de Aquisição"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "Informações de Separação ! : "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Lista de Seleção"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"Você selecionou uma quantidade de %d unidades.\n"
+"Mas não é compatível com a embalagem escolhida.\n"
+"Aqui segue uma proposta de quantidades compatível com a embalagem:\n"
+"AN: %s Quantidade: %s Tipo de : %s"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Documento de movimento para a saída ou para o cliente."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Validar"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Estabelecimento"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Criar Ordem de Compra"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Pedido de Venda"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Para cada linha do pedido de venda, um pedido de aquisição é criado para "
+"suprir o produto vendido."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Política de Embarque"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Inconterm, que significa 'Termos de Comércio Internacional' implica em uma "
+"série de termos para venda que são usados em transações comerciais."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Comanda os pedidos de aquisição para cada linha do pedido de venda."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Movimentações de Estoque"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Ordem de Compra"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Faturamento baseado nas entregas"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Pedido de Venda"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Linha de Pedido de Vendas"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"O formulário da Lista de Separação é criada assim que o pedido de venda é "
+"confirmado, no mesmo momento que o pedido de aquisição. Representa a "
+"atribuição de peças ao pedido. Existe uma lista de separação por linha de "
+"pedido de venda, a qual evolui com a disponibilidade das peças."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Erro! Você não pode criar empresas recursivas."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Esta é a adição de dias aos que você promete para clientes, para fins de "
+"segurança."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Lista de Separação"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Estoque"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forçar Atribuição"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Pedido de venda nao pode ser cancelado !"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Prazo de Entrega"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documento de mudança para o cliente."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Movimentação de Estoque"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+"Se 'No Pedido' ele aciona uma ação quando o pedido de venda for confirmado, "
+"para criar uma tarefa, pedido de compra, ou ordem de produção associado a "
+"esta linha de pedido."
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"A fatura é criada automaticamente se a política de transport é 'Escolha de "
+"Fatura' ou 'Fatura na ordem após entrega'."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Aquisição"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Enviado"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "Modo inválido para test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Um pedido de aquisição é criado automaticamente assim que o pedido de vendas "
+"é confirmado ou a fatura é paga. Isto direciona a compra e a produção de "
+"produtos de acordo com as regras e os parâmetros do pedido de venda. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Empacotamento"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Erro de Configuração !"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Dias de Segurança"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Compra de material vendido"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Loja de Vendas"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Indica que o pedido de venda foi entregue. Este campo é atualizado assim que "
+"o agendamento for executado."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Propriedades"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Você pode gerar Notas Fiscais baseadas nos pedidos de venda ou baseada nos "
+"embarques."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Estatísticas de Pedidos de Venda"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Empresas"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "A referência deve ser única por empresa!"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Um pedido de Aquisição para cada linha do pedido de venda e para cada um dos "
+"componentes."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Designar"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Sem Estoque Suficiente ! : "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Número de dias entre a confirmação do pedido e embarque dos produtos ao "
+"cliente."
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "do estoque"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Fatura"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Número de Pacotes"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Referência de ordem deve ser única por empresa!"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Entregue"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Primeiramente você precisa cancelar todas as separações relacionadas a este "
+"pedido de venda."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Criar Nota Fiscal"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Fatura de Vendas com Pagamento Antecipado"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Primeiramente você precisa cancelar o movimento de estoque relacionado a "
+"esta linha de pedido de venda."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Forma de Entrega"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Entrega"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Cancelar Designação"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "no pedido"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Baseado no embarque ou nas quantidades pedidas."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Envia todos os produtos de um vez"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Separações Relacionadas"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "O nome da empresa deve ser único !"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Solicitação para Pedido de Venda"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Criar Ordem de Entrega"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorar Excessão"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Você planeja vender %.2f %s mas tem somente %.2f %s disponível !\n"
+"O estoque real é %.2f %s. (sem reservas)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Separado"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Entrega cada produto quando disponível"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Criar lista de Opções"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Dependendo da configuração da localização de Saída, a mudança entre a área "
+"de saída e o cliente é feita através da Ordem de Entrega, manualmente ou "
+"automaticamente."
diff --git a/addons/sale_stock/i18n/ro.po b/addons/sale_stock/i18n/ro.po
new file mode 100644
index 00000000000..41ed2ff50c9
--- /dev/null
+++ b/addons/sale_stock/i18n/ro.po
@@ -0,0 +1,742 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 13:56+0000\n"
+"Last-Translator: Dorin <dhongu@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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Comanda de livrare"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Daca nu aveai suficient stoc disponibil pentru a livra tot odata, acceptati "
+"expedierile partiale sau nu?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metoda de aprovizionare"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "Informatii la ridicare !: "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Lista de ridicare"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"Ati selectat o cantitate de Unitati %d.\n"
+"Dar nu este compatibila cu ambalajul selectat.\n"
+"Iata o propunere de cantitati conforme cu ambalajul:\n"
+"EAN: %s Cantitate: %s Tip de ul: %s"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Documentul miscarii catre iesire sau catre client."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Valideaza"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Magazin"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Creeaza Comanda de Aprovizionare"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Comadă vânzare"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Pentru fiecare linie a comenzii de vanzare este creat un ordin de "
+"aprovizionare pentru a furniza produsul vandut."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Politica de expediere"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm care este prescurtarea de la \"Termeni Comerciali Internationali\" "
+"implica o serie de termeni de vanzare care sunt folositi in tranzactiile "
+"comerciale."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+"Acţioneza ordinele de aprovizionare pentru fiecare linie a comenzii de "
+"vânzare."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Miscare stoc"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Ordin de aprovizionare"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Factura bazata pe livrari"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Comanda de vanzare"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Linie comanda de vanzare"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"Formularul Lista de Ridicare este creat de indata ce comanda de vanzare este "
+"confirmata in acelasi timp cu ordinul de aprovizionare. Reprezinta "
+"atribuirea de piese la comanda de vanzare. Exista o lista de ridicare per "
+"linie comanda de vanzare care evolueaza odata cu disponibilitatea pieselor."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Client"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Eroare! Nu puteti crea companii recursive."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Acestea sunt zilele adaugate la cele promise clientilor in scop de siguranta"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Lista de ridicare"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Depozit"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Forteaza atribuirea"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Comanda de vanzare nu poate fi anulata !"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Timp de livrare"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Documentul miscarii catre client."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Miscari inventar"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+"Daca este bifat 'la comanda', declanseaza o aprovizionare atunci cand "
+"comanda de vanzare este confirmata pentru a crea o sarcina, o comanda de "
+"achizitie sau o comanda de productie legata de aceasta linie a comenzii de "
+"vanzare."
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Factura este creata in mod automat daca politica de expediere este \"Factura "
+"la ridicare\" sau \"Factura la comanda dupa livrare\"."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Aprovizionare"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Expediat"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "mod invalid pentru test_stare"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"O comanda de aprovizionare este creata automat de indata ce o comanda de "
+"vanzare este confirmata sau factura este platita. Ea conduce achizitionarea "
+"si productia produselor dupa norme si la parametrii comenzii de vanzare. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Ambalare"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Eroare de Configurare !"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Zile de siguranta"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Aprovizionarea materialelor vandute"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Magazin Vanzari"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Indica livrarea comenzii de vanzare. Acest camp este actualizat numai dupa "
+"ce programatorul (le) a(u) fost lansat(e)."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Proprietati"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Puteti genera facturi pe baza comenzilor de vanzare sau pe baza expedierilor."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistici comenzi de vanzare"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Companii"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "Referinta trebuie sa fie unica per Companie!"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"O comanda de aprovizionare pentru fiecare linie a comenzii de vanzare si "
+"pentru fiecare dintre componente."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Atribuie"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Stoc insuficient ! : "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Numarul de zile intre confirmarea comenzii si expedierea produselor la client"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "din stoc"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Anuleaza"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Numarul de pachete"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Referinta comenzii trebuie sa fie unica per Companie!"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Livrat"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Trebuie sa anulati mai intai toate ridicarile atasate acestei comenzi de "
+"vanzare."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Creeaza Factura"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Factura Vanzare cu Plata in Avans"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Trebuie sa anulati mai intai miscarile de stoc atasate la această linie a "
+"comenzii de vanzare."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Livrare"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Anulare Atribuire"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "la comanda"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Bazat pe cantitatile expediate sau comandate."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Livreaza toate produsele odata"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Ridicari asociate"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Numele companiei trebuie să fie unic !"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Cerere Comanda de vanzare"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Creeaza Comanda de livrare"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignora exceptia"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Intentionati sa vindeti %.2f%s, dar aveti doar %.2f%s disponibil !\n"
+"Stocul real este %.2f%s. (fara rezerve)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Ridicat(a)"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Livreaza fiecare produs atunci cand este disponibil"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Creeaza Lista de ridicare"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"In functie de configuratia locatiei de iesire, miscarea intre zona de iesire "
+"si client se face manual sau automat prin Comanda de  Livrare."
diff --git a/addons/sale_stock/i18n/ru.po b/addons/sale_stock/i18n/ru.po
new file mode 100644
index 00000000000..a73a6c4ceff
--- /dev/null
+++ b/addons/sale_stock/i18n/ru.po
@@ -0,0 +1,734 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:12+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Заказ на доставку"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Если у вас недостаточно места на складе, чтобы доставить все за раз, примите "
+"ли вы частичную доставку?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Метод снабжения"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "Информация по комплектованию ! : "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Комплектовочный лист"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Документ перемещения на выход или заказчику."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Утвердить"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Магазин"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Создать заказ на снабжение"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Заказ"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Для каждой позиции заказа на продажу создается заказ на снабжение для "
+"поставки проданных ТМЦ."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Политика доставки"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Инкоте́рмс (англ. Incoterms, International commerce terms) — международные "
+"правила по толкованию наиболее широко используемых торговых терминов в "
+"области внешней торговли."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+"Управление заказами на снабжение для каждой позиции заказа на продажу."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Движение запасов"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Заказ на закупку"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Счет основанный на отгрузке"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Заказ на продажу"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Позиция заказа на продажу"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"Форма комплектовочного листа создастся как только заказ на продажу будет "
+"подтвержден, в одно время с заказом на снабжение. Он представляет собой "
+"определение комплектующих для заказа на продажу. Один комплектовочный лист "
+"на позицию заказа на продажу, который будет меняться в соответствии с "
+"наличием комплектующих."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Клиент"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Ошибка ! Нельзя создать рекурсивные компании."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "Это количество дней, добавляемых к обещанному сроку для надежности"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Комплектовочный лист"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Склад"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Назначить насильно"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Нельзя отменить заказ на продажу !"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Время выполнения доставки"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Документ перемещения к заказчику."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Движение запасов"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Счет создается автоматически если политика доставки \"Счет из "
+"комплектования\" или \"Счет на заказ после доставки\"."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Снабжение"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Доставлено"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "неверный режим для test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Заказ на снабжение создастся автоматически как только заказ на продажу будет "
+"подтвержден или счет будет оплачен. Он определяет закупку и производство ТМЦ "
+"по правилам и параметрам заказа на продажу. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Упаковка"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Ошибка конфигурации !"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Запас по сроку (дней)"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Закупка проданного материала"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Магазин"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Показывает, что заказ на продажу был доставлен. Это поле обновляется только "
+"после запуска планировщика."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Свойства"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Вы можете создать счет на основе заказов на продажу или на основе доставок."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Статистика заказов на продажу"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Компании"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "Ссылка должна быть уникальна для каждой компании!"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+"Один заказ на снабжение для каждой позиции заказа на продажу и для каждого "
+"компонента."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Назначить"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Не достаточно запасов ! : "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Количество дней между подтверждением заказа и отгрузкой ТМЦ заказчику."
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "из запасов"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Счет"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Отмена"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Количество упаковок"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Доставлено"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Сначала вы должны отменить все комплектования связанные с этим заказом на "
+"продажу."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Создать счет"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Счет на авансовый платеж"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Сначала вы должны отменить перемещения ТМЦ связанные с этой позицией заказа "
+"на продажу."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(нет)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Инкотерм"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Отменить назначение"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "в заказе"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "На основании отгруженного или заказанного количества."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Отгрузка всех товаров за раз"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Связанное комплектование"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Название компании должно быть уникальным!"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Запрос заказа на продажу"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Создать заказ на доставку"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Игнорировать исключение"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Вы планируете продать %.2f %s но имеете только %.2f %s !\n"
+"Действительные запасы %.2f %s. (без резервов)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Скомплектовано"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Отгрузка каждого товара по готовности."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Создать комплектовочный лист"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"В зависимости от настройки исходящего места хранения, перемещение между "
+"зоной отгрузки и заказчиком выполняется с помощью заказа на доставку вручную "
+"или автоматически."
diff --git a/addons/sale_stock/i18n/sale_stock.pot b/addons/sale_stock/i18n/sale_stock.pot
new file mode 100644
index 00000000000..9a83904eda9
--- /dev/null
+++ b/addons/sale_stock/i18n/sale_stock.pot
@@ -0,0 +1,650 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * sale_stock
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0alpha\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-20 07:32+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_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid "To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid "If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid "You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid "You cannot make an advance on a sales order                          that is defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid "For every sales order line, a procurement order is created to supply the sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid "Incoterm which stands for 'International Commercial terms' implies its a series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid "Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid "The Pick List form is created as soon as the sales order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sales order. There is 1 pick list by sales order line which evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid "This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid "If 'on order', it triggers a procurement when the sale order is confirmed to create a task, purchase order or manufacturing order linked to this sale order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid "The invoice is created automatically if the shipping policy is 'Invoice from pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid "To allow your salesman to make invoices for sale order lines using the menu 'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid "A procurement order is automatically created as soon as a sales order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sales order's parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid "It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid "You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid "Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and particular user  with the effect of creating, editing and deleting either ways\n"
+"                and to automatically creates project tasks from procurement lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid "One Procurement order for each sales order line and for each of the components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid "Number of days between the order confirmation the shipping of the products to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid "Sales order by default will be configured to deliver all products at once instead of delivering each product when it is available. This may have an impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid "This is a list of delivery orders that has been generated for this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid "You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid "Depending on the configuration of the location Output, the move between the output area and the customer is done through the Delivery Order manually or automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/sk.po b/addons/sale_stock/i18n/sk.po
new file mode 100644
index 00000000000..8d6a530fe55
--- /dev/null
+++ b/addons/sale_stock/i18n/sk.po
@@ -0,0 +1,707 @@
+# Slovak 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: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:17+0000\n"
+"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
+"Language-Team: Slovak <sk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Overenie"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Obchod"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Podmienky dopravy"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Objednávka predaja"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Položka objednávky"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Zákazník"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Chyba! Nemôžte vytvárať rekurzívne spoločnosti."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Sklad"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Nemôžem zrušiť objednávku predaja !"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Dodané"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "neplatný režim pre test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Balenie"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Možnosti"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Môžete vytvárať faktúry na základe objednávok predaja alebo na základe "
+"dodania."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Štatistiky objednávok predaja"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Spoločnosti"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Priradiť"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Počet dní medzi potvrdenou objednávkou a expedíciu produktov k zákazníkovi"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "zo skladu"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Faktúra"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Zrušené"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Počet balíkov"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Dodané"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Vytvoriť faktúru"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Zálohová faktúra predaja"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "podľa objednávky"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Na základe odoslaného alebo objednaného množstva."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Ignorovať výnimku"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Máte v pláne predať %.2f %s, ale máte len %.2f %s k dispozícii !\n"
+"Skutočný počet na sklade je %.2f %s. (bez rezervácií)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/sl.po b/addons/sale_stock/i18n/sl.po
new file mode 100644
index 00000000000..8d1c1c6ce14
--- /dev/null
+++ b/addons/sale_stock/i18n/sl.po
@@ -0,0 +1,708 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:24+0000\n"
+"Last-Translator: ERP Basing <erp@basing.si>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Nalog za dostavo"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Če nimate dovolj zalog na voljo za dostavo vsega naenkrat, se strinjate z "
+"delnimi pošiljkami ?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metoda Naročnja"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Izberi seznam"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Dokument pemika za izhod ali za stranko"
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Potrdi"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Trgovina"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Ustvari vrstni red naročila."
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Prodajni nalog"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr "Pri vsaki prodaju ustvariti naročilo za dobavo prodajnih artiklov"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Pravilnik odpreme"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Pogoni naročil za vsako prodajo"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Prenos zaloge"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Javna naročila"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Postavka prodajnega naročila"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Kupec"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "Gre za dodajo dnevov, ki jih obljubim stranki zaradi varnosti"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladišče"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Sila dodelitev"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Ni bilo mogoče preklicati prodajnega naročila!"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Čas do Dobave"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokument premika straniki"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Premiki inventarja"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Nabava"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Poslano"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "Neveljaven način za test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Nabavno naročilo se ustvari samodejno, takoj ko je naročilnica potrjena ali "
+"ko je račun plačan. To požene nabavo in proizvodnjo artiklov glede na "
+"pravila in parametre iz naročilnice. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Pakiranje"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Varnostni Dnevi"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Nabava prodanega materiala"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Prodajna Trgovina"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Karakteristike"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr "Lahko ustvarite račun, na podlagi prodaje ali dostave."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistika prodaje naročil"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Podjetja"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr "Eno Nabavno naročilo za vsako naročilnico in za vsak sestavni del"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr "Število dni od potrditve naročila do odpreme artikla kupcu"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "iz zaloge"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Število paketov"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Dostavljeno"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr "Najprej prekličite vse Izbire povezane s tem naročilom"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Ustvari račun"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Prodaja Predplačilo Računa"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr "Najprej morate preklicati premik zaloge priloženo k tej prodaji."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Prekliči Dodelitev"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "na nalogu"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Na podlagi poslane ali naročene količine."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Povezano Izbiranje"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Ustvari nalog za dostavo"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Prezri Izjemo"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Načrtujete prodajo s %.2f%s, vendar imate samo %.2f%s na voljo!\n"
+"Dejanska zaloga je %.2f%s. (Brez rezervacije)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Prevzeto"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Ustvari Prevzemni Seznam"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/sq.po b/addons/sale_stock/i18n/sq.po
new file mode 100644
index 00000000000..8aceb5f9be0
--- /dev/null
+++ b/addons/sale_stock/i18n/sq.po
@@ -0,0 +1,702 @@
+# Albanian 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: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 13:52+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Albanian <sq@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/sr.po b/addons/sale_stock/i18n/sr.po
new file mode 100644
index 00000000000..44b99de0534
--- /dev/null
+++ b/addons/sale_stock/i18n/sr.po
@@ -0,0 +1,712 @@
+# Serbian 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: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:07+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Nalog za isporuku"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Ako nemas dovoljno lagera dostupnog da sve isporuci odjednom, prihvatas li "
+"parcijalne isporuke ili ne?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metod Nabavke"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Izborna Lista"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Dokumenat za pomeranje na izlaz ili za kupca."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Provera"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Prodavnica"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Kreiraj Nabavni Nalog"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Nalog za prodaju"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Opcije transporta"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Pomeranje lagera"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Nalog za Nabavku"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Prodajni Nalog"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Kupac"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Ovo su dani dodati onome sto su obecao klijentima iz sigurnosnih razloga."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Izborna lista"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladište"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Prinudni prenos"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Vreme trajanja Isporuke"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokumenat za pomeriti ka klijentu."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Premeštanje inventara"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Ova se faktura generise automatski ako je politika Dostave 'Faktura od "
+"Izvora'  ili ' faktura na zahtev nakon isporuke'."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Izvršavanje"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Isporuceno"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "pogrešan mod za test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Pakovanje"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "dani Sigurnosti"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Nabavka Prodatog materijala"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Osobine"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Mozes kreirati fakture bazirane na prodajnim nalozima pri isporukama."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistika Prodajnih Naloga"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Preduzeca"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Dodeljivanje"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "od akcije"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Broj paketa"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Isporuceno"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Kreiranje računa"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Isporuka"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Otkazivanje prenosa"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "na nalog"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Bazirano na isporucenim ili narucenim kolicinama."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Relacioni Izbor"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Kreiraj Dostavni Nalog"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"PLanirao si da prodas %.2f %s ali imas samo %.2f %s dostupno !\n"
+"Stvarni lager je %.2f %s. ( Bez rezervacija)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Isabrani"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Kreiranje Izborne liste"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Ovisno o konfiguraciji lokacije izlaza, pomeranje izmedju izlaznog dela i "
+"potrosaca je yradjena kroz Nalog Isporuke rucno ili automatski."
diff --git a/addons/sale_stock/i18n/sr@latin.po b/addons/sale_stock/i18n/sr@latin.po
new file mode 100644
index 00000000000..987fe2e1d78
--- /dev/null
+++ b/addons/sale_stock/i18n/sr@latin.po
@@ -0,0 +1,712 @@
+# Serbian 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: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:13+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Nalog za isporuku"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Ako nemas dovoljno lagera dostupnog da sve isporuci odjednom, prihvatas li "
+"parcijalne isporuke ili ne?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Metod Nabavke"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Izborna Lista"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Dokumenat za pomeranje na izlaz ili za kupca."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Provera"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Prodavnica"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Kreiraj Nabavni Nalog"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Nalog za prodaju"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Opcije transporta"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Pomeranje lagera"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Nalog za Nabavku"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Prodajni Nalog"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Kupac"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Ovo su dani dodati onome sto su obecao klijentima iz sigurnosnih razloga."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Izborna lista"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Skladište"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Prinudni prenos"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Vreme trajanja Isporuke"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokumenat za pomeriti ka klijentu."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Premeštanje inventara"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Ova se faktura generise automatski ako je politika Dostave 'Faktura od "
+"Izvora'  ili ' faktura na zahtev nakon isporuke'."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Izvršavanje"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Isporuceno"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "pogrešan mod za test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Pakovanje"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "dani Sigurnosti"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Nabavka Prodatog materijala"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Osobine"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Mozes kreirati fakture bazirane na prodajnim nalozima pri isporukama."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Statistika Prodajnih Naloga"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Preduzeca"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Dodeljivanje"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "od akcije"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Otkaži"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Broj paketa"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Isporuceno"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Kreiranje računa"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Isporuka"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Otkazivanje prenosa"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "na nalog"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Bazirano na isporucenim ili narucenim kolicinama."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Relacioni Izbor"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Kreiraj Dostavni Nalog"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"PLanirao si da prodas %.2f %s ali imas samo %.2f %s dostupno !\n"
+"Stvarni lager je %.2f %s. ( Bez rezervacija)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Isabrani"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Kreiranje Izborne liste"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Ovisno o konfiguraciji lokacije izlaza, pomeranje izmedju izlaznog dela i "
+"potrosaca je yradjena kroz Nalog Isporuke rucno ili automatski."
diff --git a/addons/sale_stock/i18n/sv.po b/addons/sale_stock/i18n/sv.po
new file mode 100644
index 00000000000..29543cccc37
--- /dev/null
+++ b/addons/sale_stock/i18n/sv.po
@@ -0,0 +1,735 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.14\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:08+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Leveransorder"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Om ni inte har tillräckligt lager tillgängligt för att leverera allt på en "
+"gång, accepterar ni delleveranser?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Anskaffningsmetod"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "Plockinformation!: "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Plocklista"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"Du har valt en mängd enheter %d.\n"
+"Men det är inte förenligt med den valda förpackningen.\n"
+"Här är ett förslag av mängder enligt förpackningen:\n"
+"EAN: %s Antal: %s Typ av UL: %s"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+"Dokumentation av bokföringstransaktionen till utleveransen eller till kunden"
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Validera"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Butik"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Skapa anskaffningsorder"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Kundorder"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"För varje orderrad skapas en inköpsorder för att täcka upp för den sålda "
+"produkten."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Leveransvillkor"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm som står för \"International Commercial terms\" innebär att en "
+"serie av försäljningenstermer som används i den kommersiella handeln."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Skapa anskaffningsorder för varje kundorderrad."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Lagertransaktion"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Inköpsorder"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Fakturera utgående från leveranser"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Kundorder"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Orderrad"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"Plocklisteformuläret skapas så snart kundorder bekräftas i samtidigt som "
+"anskaffningsordern. Den representerar tilldelningen av delar till "
+"kundordern. Det är 1 plocklistan genom orderrad som utvecklas med tillgången "
+"till delar."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Kund"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fel! Du kan inte skapa rekursiva företag."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Det här är det antal dagar som du lägger till det datum som du lovat kunden "
+"av säkerhetsskäl"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Plocklista"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Lager"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Force Assignation"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Kunde inte avbryta kundordern !"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Delivery Lead Time"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Dokumentation av bokföringstransaktionen till kunden"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Lagertransaktioner"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+"Om \"på beställning\", utlöser det en anskaffning när kundordern bekräftas "
+"att skapa en aktivitet, inköpsorder eller tillverkningsorder kopplad till "
+"denna orderrad."
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Fakturan skapas med automatik om plockpolicyn är 'fakturera från plock' "
+"eller 'fakturera från order efter leverans'."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Anskaffning"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Levererad"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "invalid mode for test_state"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"En inköpsorder skapas så snart kundordern är bekräftad eller fakturan "
+"betald. Utifrån hur reglerna är satta för kundorderparametrarna så föds "
+"inköpsorder eller produktionsunderlag. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Paketering"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Konfigurationsfel !"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Säkerhetsdagar"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Anskaffning av sålt material"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Butik"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Anger att kundordern är levererad. Detta fält uppdateras efter alla "
+"schemalagda åtgärder är sjösatta."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Egenskaper"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Du kan skapa fakturor baserat på kundorder eller baserat på leveranser."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Kundorderstatistik"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Företag"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "Referensen måste vara unik per bolag!"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr "En anskaffningsorder för varje kundorderrad och för varje komponent."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Tilldela"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Ej tillräckligt i lager!: "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Antal dagar mellan orderbekräftelse till leverans av produkter till kunden"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "från lager"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Faktura"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Avbryt"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Number Packages"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Orderreferensen måste vara unik per bolag!"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Levererad"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr "Du måste först avbryta all plockning bifogad till denna kundorder."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Skapa faktura"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Försäljning, avancerad fakturabetalning"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Du måste först avsluta lagerförändring som hör ihop med denna orderrad."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Leverera"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Cancel Assignation"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "beställt"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Baserat på levererade eller beställda antal."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Leverera alla produkter vid samma tillfälle"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "Relaterad plockning"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Bolagsnamnet måste vara unikt !"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Rekvisition för kundorder"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Skapa leveransorder"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "Bortse från undantag"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"Du planerar att sälja %.2f %s men har endast %.2f %s tillhanda !\n"
+"Det verkliga lagret är %.2f %s. (utan reservationer)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Plockad"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Leverera varje produkt när den är tillgänglig"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Skapa plocklista"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Beroende på konfigurationen av utlastningen, flytten mellan utlastningen och "
+"kunden sker genom leveransordern manuellt eller automatiskt."
diff --git a/addons/sale_stock/i18n/th.po b/addons/sale_stock/i18n/th.po
new file mode 100644
index 00000000000..cc823623b04
--- /dev/null
+++ b/addons/sale_stock/i18n/th.po
@@ -0,0 +1,702 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:04+0000\n"
+"Last-Translator: Rungsan Suyala <rungsan@gmail.com>\n"
+"Language-Team: Thai <th@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "ใบส่งสินค้า"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "วิธีการจัดซื้อ"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "ตรวจสอบ"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "ใบสั่งซื้อ"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "รายการใบสั่งขาย"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "ใบรายการรับ/จ่ายสินค้า"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "คลังสินค้า"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "ไม่สามารถยกเลิกใบสั่งขายได้"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "เคลื่อนย้ายสินค้า"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "จัดซื้อ"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "จัดส่งแล้ว"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "การบรรจุหีบห่อ"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "ร้าน"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "คุณสมบัติ"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "สถิติใบสั่งขาย"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "บริษัท"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "ใบแจ้งหนี้"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "ยกเลิก"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "สร้างใบแจ้งหนี้"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "อยู่ระหว่างการสั่งซื้อ"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "สร้างใบส่งสินค้า"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/tlh.po b/addons/sale_stock/i18n/tlh.po
new file mode 100644
index 00000000000..b8643e9cb6f
--- /dev/null
+++ b/addons/sale_stock/i18n/tlh.po
@@ -0,0 +1,701 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 13:52+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/tr.po b/addons/sale_stock/i18n/tr.po
new file mode 100644
index 00000000000..9b01c41e7a1
--- /dev/null
+++ b/addons/sale_stock/i18n/tr.po
@@ -0,0 +1,738 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:26+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Teslimat Emri"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Tek seferde teslimat için yeterli stok yoksa parçalı teslimat yapılmasını "
+"kabul eder misiniz ?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Satınalma Yöntemi"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "Toplama Bilgisi ! : "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "Seçim Listesi"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"%d Biriminde miktar seçtiniz.\n"
+"Ancak bu seçilen paketlemeyle uyumlu değil.\n"
+"Burada paketlemeye uygun olarak önerilen miktarlar var:\n"
+"EAN: %s Miktar: %s ul Türü: %s"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "Çıkışa ya da müşteriyeyapılan hareket belgesi."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Doğrula"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "İş Yeri"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "Satınalma Siparişi Oluştur"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Satış Siparişi"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+"Her satış siparişi sonrası, satılan ürünü temin edebilmek için "
+"tedarik/satınalma siparişi hazırlanır."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Sevkiyat Politikası"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+"Incoterm \"Uluslararası Ticari Terimler\"in kısaltması olup, teslim "
+"şekilleri ile ilgili terimleri içerir."
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "Her Satış siparişi kalemi için üretim emirlerini sürer."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "Stok Hareketi"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Satınalma Siparişi"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "Teslimatlara bağlı fatura"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Satış Siparişi"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "Satış Siparişi Kalemi"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+"Satış siparişi onaylanır onaylanmaz, tedarik siparişi ile eş zamanlı olarak "
+"paketleme listesi oluşturulur. Bu parçaların satış siparişine atanmasını "
+"temsil etmektedir. Satış sipariş kalemi içinde parçaların stokta "
+"bulunabilirliği ile bağlantılı olarak bir paketleme listesi vardır."
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Müşteri"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Hata! Yinelemeli şirketler oluşturamazsınız."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+"Bu bölüm, güvenli olması için müşterilere söz verilecek teslimat süresine "
+"eklenecek gün sayısı."
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "Paketleme Listesi"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Depo"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Güç Tahsisi"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "Satış siparişini iptal edemiyor !"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Teslimat Süresi"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "Müşteriye işlenen hareket belgesi"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Stok Hareketleri"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+"Eğer 'siparişte' ise, satış siparişi bir görev oluşturmak üzere onaylanırsa "
+"bir satınalmayı başlatır, satınalma siparişi ya da üretim emri bu satış "
+"siparişi öğesine bağlantılıdır."
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+"Teslimat politikası 'Paketlemeye göre faturalama' ya da 'Teslimat sonrası "
+"siparişten faturalama' ise faturalar otomatikman yaratılacak."
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Satınalma"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "Gönderildi"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "test_durumu için geçersiz mod"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+"Satış siparişi onaylandığı ya da fatura ödendiği anda tedarik siparişi "
+"otomatik olarak oluşturulur. Bu satış siparişi parametrelerini ve kuralları "
+"göz önünde bulundurarak satın alma ve ürünlerin üretimini yönetir. "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Paketleme"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "Yapılandırma Hatası!"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "Emniyet Günleri"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "Satılan malzemenin tedarik edilmesi"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "Satış Mağazası"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+"Satış siparişinin teslim edildiğini gösterir. Bu alan sadece iş düzenleyici "
+"başlatıldığı zaman güncellenir."
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Özellikler"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+"Faturaları satış siparişlerine ya da gönderilenlere dayanarak "
+"oluşturabilirsiniz."
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Satış Siparişi İstatistikleri"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Şirketler"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "Referans her şirket için benzersiz olmalı!"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr "Her satış siparişi öğesi ve her bileşen için bir Satınalma İşlemi."
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Ata"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "Yeterli stok yok !: "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Siparişin onaylanması ile ürünlerin müşteriye gönderilmesi arasında geçen "
+"gün sayısı"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "Stoktan"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Fatura"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "İptal"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Paketleri numarala"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "Sipariş Kaynağı Her Şirket İçin Eşsiz Olmalı!"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Sevk edildi"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+"Önce bu satış siparişine ait bütün paketleme işlemlerini iptal etmelisiniz."
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Fatura Oluştur"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "Peşin Ödemeli Satış Faturası"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+"Öncelikle bu satış sipariş kalemine bağlı olan stok hareketlerini iptal "
+"etmelisiniz."
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "Uygulanabilir değil"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Teslim Sekli"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Teslimat"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Atamayı iptal et"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Sipariş"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "Gönderilen ya da sipariş edilen miktar esas alındı."
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "Tüm ürünleri tek seferde teslim et"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "İlgili paketleme"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "Şirket adı benzersiz olmalı !"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "Satış Siparişi İsteği"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "Nakliye Siparişi oluştur"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "İstisnayı görmezden gel"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"%2f%s satmayı hedefliyorsunuz ama sadece %.2f%s var ! \n"
+"Asıl Stok %.2f%s. (rezervasyonlar hariç)"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Toplanma"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "Her ürün hazır olduğunda teslim et"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "Paketleme listesi oluştur"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
+"Çıkış konumunun yapılandırmasına bağlı olarak, müşteri ile çıkış konumu "
+"arasındaki hareket Teslimat Emri yoluyla elle ya da otomatik olarak yapılır."
diff --git a/addons/sale_stock/i18n/uk.po b/addons/sale_stock/i18n/uk.po
new file mode 100644
index 00000000000..01e97042259
--- /dev/null
+++ b/addons/sale_stock/i18n/uk.po
@@ -0,0 +1,701 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:04+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Доставити Замовлення"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Підтвердити"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Торгова точка"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Заявка на продаж"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Політика постачання"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Клієнт"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Склад"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Рух запасів"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Постачання"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Властивості"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "зі складу"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Інвойс"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Скасувати"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Створити інвойс"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "на заявку"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Відвантажено"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/vi.po b/addons/sale_stock/i18n/vi.po
new file mode 100644
index 00000000000..c64395e9ae1
--- /dev/null
+++ b/addons/sale_stock/i18n/vi.po
@@ -0,0 +1,705 @@
+# Vietnamese 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.
+# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 14:07+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Vietnamese <vi@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "Yêu cầu Giao hàng"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Nếu bạn không có đủ hàng để giao hàng toàn bộ một lần, bạn có chấp nhận giao "
+"hàng từng phần hay không?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "Phương pháp mua hàng"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "Xác nhận"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "Cửa hàng"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "Đơn chào hàng"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "Chính sách vận chuyển"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "Lệnh Mua sắm"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "Đơn hàng"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "Khách hàng"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Lỗi ! Bạn không thể tạo các công ty đệ quy."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "Kho hàng"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "Buộc phải uỷ thác"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "Thời gian giao hàng"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "Di chuyển hàng tồn kho"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "Thu mua hàng"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "hình thức không hợp lệ cho trạng thái kiểm tra"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "Đóng gói"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "Đặc tính"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "Thống kê đơn bán hàng"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "Các công ty"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "Chỉ định"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+"Số ngày từ lúc xác nhận đặt hàng tới lúc vận chuyển sản phẩm tới khách hàng"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "theo nhu cầu dự báo"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "Hóa đơn"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "Hủy"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Số lượng gói hàng"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "Đã giao hàng"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "Tạo hóa đơn"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "Incoterm"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "Giao hàng"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "Hủy phân phối"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "theo chào hàng"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "Chọn"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/i18n/zh_CN.po b/addons/sale_stock/i18n/zh_CN.po
new file mode 100644
index 00000000000..b69c8011aea
--- /dev/null
+++ b/addons/sale_stock/i18n/zh_CN.po
@@ -0,0 +1,705 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-10-30 16:29+0000\n"
+"Last-Translator: ccdos <ccdos@163.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:04+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr "允许销售员 使用菜单“按已交付数量开票”  根据发运单开发票"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "送货单"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr "如果库存不够一次全部交货，你是否接受部分交货？"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr "引起需求的方式"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr "装箱信息！： "
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr "装箱单"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+"你选择了 %d 单位的数量。但它不兼容选定的包装。\n"
+"这是对应该包装的建议数量：EAN: %s ，  数量: %s， 单位类型: %s"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr "调拨出去或调拨给客户的单据"
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr "管理多个商店"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "审核"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "商店"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr "创建采购订单"
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "销售订单"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr "对每个销售订单明细，将会创建对应的采购订单来供应销售的产品。"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr "错误！"
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "运送方式"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr "国际贸易术语包含一系列用于贸易事务的术语。"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr "由销售订单明细产生的采购订单。"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr "库存调拨"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr "非法的动作"
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr "项目时间表"
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr "设置错误!"
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr "采购订单"
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr "根据送货单生成发票"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr "销售订单"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr "送货单"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr "销售订单明细"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr "一旦销售订单被确认，装箱单就会和需求单一起生成。表示销售订单所产生的需求。有效的销售订单明细会相应产生一张装箱单。"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "客户"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "错误！您不能创建递归公司."
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr "基于销售单生成发票"
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr "基于安全的目的在承诺客户的时间的基础上需要增加的天数"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr "装箱单"
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "仓库"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "强制指定"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr "默认的开票方法"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr "不能取消销售订单 ！"
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr "送货提前期"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr "转移给客户的单据"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr "发运单视图"
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "库存调拨"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr "默认选项"
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr "项目MRP"
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr "如果是“来自订单”，当销售订单确认后它会触发一个需求，销售订单的明细会关联出采购订单或生产单。"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr "如果运送方式是“发票来自装箱单” 或 “送货后开票”， 系统将会自己创建发票。"
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "需求"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr "已送货"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr "允许销售员 使用菜单“逐行开票”  根据销售单明细逐行开发票"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr "test_state的模式无效"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr "需求会在销售订单确认或发票付款后自动生成。它是采购和生产则根据有关的规则和售订订单参数而得出的。 "
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr "基于发运单生产发票"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr "允许追加运输成本"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr "天数"
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "打包装"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr "当所有商品可用后一次性发运"
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr "允许开发运单"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr "%s %% 的预付款"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr "设置错误!"
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr "安全天数"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr "采购已下销售单的物料"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr "销售商店"
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr "它表示销售订单已经送货。只有运行调度程序（scheduler）后这个字段才会被修改。"
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr "属性"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr "你必须为这个产品指定序列号"
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr "订单行上面的产品属性"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr "你可以根据销售订单或送货单生成发票。"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr "你能移动从（到）这种类型视图的库位"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr "销售订单统计"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr "公司"
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr "查看发票"
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr "编号必须在公司内唯一！"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr "%s %s 的预付款"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr "一个需求单对应一个销售订单明细里的组件"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr "指定"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr "没足够的库存！： "
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr "从订单确认到开始运送货物给客户之间的天数"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "来自库存"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr "基于销售单的发票"
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "发票"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "包装数"
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr "订单号必须在一个公司范围内唯一"
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr "已送货"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr "你必须先取消销售订单上的所有装箱单。"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "生成发票"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr "允许你用 属性 来标记销售订单 明细"
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr "销售预付款发票"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr "你必须先取消所有属于此销售订单明细上的库存调拨。"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr "(n/a)"
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "贸易术语"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr "您企图为不一样的产品创建批号"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr "不能取消销售订单明细"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "送货"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "取消分配"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "来自订单"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr "已运送或被已订购的数量。"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr "一次性交货"
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr "关联的装箱单"
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "公司名必须唯一！"
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr "sale.config.settings"
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr "这是一个销售订单生产的发运单列表"
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr "销售订单申请"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr "生成送货单"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr "忽略异常"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+"你计划销售 %.2f %s 但是只要 %.2f %s 是有效的 ！\n"
+"实际库存有 %.2f %s。 （没有预订）"
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr "重建发运单"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr "允许配置和使用多个商店"
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "已装箱"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr "可以分批交货"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr "生成装箱单"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr "根据出库库位的设置，出库和客户之间的库存调拨是通过送货单手工或自动完成的。"
diff --git a/addons/sale_stock/i18n/zh_TW.po b/addons/sale_stock/i18n/zh_TW.po
new file mode 100644
index 00000000000..c5b38e65f72
--- /dev/null
+++ b/addons/sale_stock/i18n/zh_TW.po
@@ -0,0 +1,701 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# 	* sale
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2012-09-20 07:32+0000\n"
+"PO-Revision-Date: 2012-09-21 13: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: 2012-10-30 05:36+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_deli_orders:0
+msgid ""
+"To allow your salesman to make invoices for Delivery Orders using the menu "
+"'Deliveries to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:496
+#, python-format
+msgid "Delivery Order <em>%s</em> <b>scheduled</b> for %s."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_deliveryorder0
+msgid "Delivery Order"
+msgstr "交貨單"
+
+#. module: sale_stock
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr "如庫存不足以一次過交貨，是否接受部份交貨?"
+
+#. module: sale_stock
+#: field:sale.order.line,type:0
+msgid "Procurement Method"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:599
+#, python-format
+msgid "Picking Information ! : "
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_packinglist0
+msgid "Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:594
+#, python-format
+msgid ""
+"You selected a quantity of %d Units.\n"
+"But it's not compatible with the selected packaging.\n"
+"Here is a proposition of quantities according to the packaging:\n"
+"EAN: %s Quantity: %s Type of ul: %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_packinglist0
+msgid "Document of the move to the output or to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_multiple_shops:0
+msgid "Manage multiple shops"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_validate0
+msgid "Validate"
+msgstr "審核"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:679
+#, python-format
+msgid ""
+"You cannot make an advance on a sales order                          that is "
+"defined as 'Automatic Invoice after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.ui.menu,name:sale_stock.menu_action_shop_form
+msgid "Shop"
+msgstr "商店"
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleprocurement0
+msgid "Create Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:stock.picking.out,sale_id:0
+msgid "Sale Order"
+msgstr "銷貨單"
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0
+msgid ""
+"For every sales order line, a procurement order is created to supply the "
+"sold product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:678
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_policy:0
+msgid "Shipping Policy"
+msgstr "貨運規則"
+
+#. module: sale_stock
+#: help:sale.order,incoterm:0
+msgid ""
+"Incoterm which stands for 'International Commercial terms' implies its a "
+"series of sales terms which are used in the commercial transaction."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleorderprocurement0
+msgid "Drives procurement orders for every sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_move
+msgid "Stock Move"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid "Invalid Action!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_timesheet:0
+msgid "Project Timesheet"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,module_delivery:0
+msgid ""
+"Allows you to add delivery methods in sale orders and delivery orders.\n"
+"                You can define your own carrier and delivery grids for "
+"prices.\n"
+"                This installs the module delivery."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:647
+#, python-format
+msgid "Configuration Error!"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleprocurement0
+msgid "Procurement Order"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on deliveries"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order
+#: field:stock.picking,sale_id:0
+msgid "Sales Order"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking_out
+#: view:sale.order:0
+msgid "Delivery Orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_order_line
+#: field:stock.move,sale_line_id:0
+msgid "Sales Order Line"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_packing0
+msgid ""
+"The Pick List form is created as soon as the sales order is confirmed, in "
+"the same time as the procurement order. It represents the assignment of "
+"parts to the sales order. There is 1 pick list by sales order line which "
+"evolves with the availability of parts."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Customer"
+msgstr "客戶"
+
+#. module: sale_stock
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_so_lines:0
+msgid "Generate invoices based on the sale order"
+msgstr ""
+
+#. module: sale_stock
+#: help:res.company,security_lead:0
+msgid ""
+"This is the days added to what you promise to customers for security purpose"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.shop,warehouse_id:0
+msgid "Warehouse"
+msgstr "倉庫"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_forceassignation0
+msgid "Force Assignation"
+msgstr "強制指定"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_order_policy:0
+msgid "The default invoicing method is"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:233
+#, python-format
+msgid "Could not cancel sales order !"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,delay:0
+msgid "Delivery Lead Time"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_deliveryorder0
+msgid "Document of the move to the customer."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,move_ids:0
+msgid "Inventory Moves"
+msgstr "存貨調動"
+
+#. module: sale_stock
+#: view:sale.config.settings:0
+msgid "Default Options"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_project_mrp:0
+msgid "Project MRP"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,type:0
+msgid ""
+"If 'on order', it triggers a procurement when the sale order is confirmed to "
+"create a task, purchase order or manufacturing order linked to this sale "
+"order line."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0
+msgid ""
+"The invoice is created automatically if the shipping policy is 'Invoice from "
+"pick' or 'Invoice on order after delivery'."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,procurement_id:0
+msgid "Procurement"
+msgstr "採購"
+
+#. module: sale_stock
+#: view:sale.report:0
+#: field:sale.report,shipped:0
+#: field:sale.report,shipped_qty_1:0
+msgid "Shipped"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_invoice_so_lines:0
+msgid ""
+"To allow your salesman to make invoices for sale order lines using the menu "
+"'Lines to Invoice'."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:260
+#, python-format
+msgid "invalid mode for test_state"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_saleprocurement0
+msgid ""
+"A procurement order is automatically created as soon as a sales order is "
+"confirmed or as the invoice is paid. It drives the purchasing and the "
+"production of products regarding to the rules and to the sales order's "
+"parameters. "
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_invoice_deli_orders:0
+msgid "Generate invoices after and based on delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:499
+#, python-format
+msgid "Order <b>delivered</b>."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,module_delivery:0
+msgid "Allow adding shipping costs"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "days"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,product_packaging:0
+msgid "Packaging"
+msgstr "包裝"
+
+#. module: sale_stock
+#: field:sale.config.settings,default_picking_policy:0
+msgid "Deliver all at once when all products are available."
+msgstr ""
+
+#. module: sale_stock
+#: model:res.groups,name:sale_stock.group_invoice_deli_orders
+msgid "Enable Invoicing Delivery orders"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:689
+#, python-format
+msgid "Advance of %s %%"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:601
+#, python-format
+msgid "Configuration Error !"
+msgstr ""
+
+#. module: sale_stock
+#: field:res.company,security_lead:0
+msgid "Security Days"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_saleorderprocurement0
+msgid "Procurement of sold material"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_shop
+msgid "Sales Shop"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,shipped:0
+msgid ""
+"It indicates that the sales order has been delivered. This field is updated "
+"only after the scheduler(s) have been launched."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,property_ids:0
+msgid "Properties"
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You must assign a serial number for this product."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,group_mrp_properties:0
+msgid "Product properties on order lines"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,default_order_policy:0
+msgid ""
+"You can generate invoices based on sales orders or based on shippings."
+msgstr ""
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You cannot move products from or to a location of the type view."
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_report
+msgid "Sales Orders Statistics"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,task_work:0
+msgid ""
+"Lets you transfer the entries under tasks defined for Project Management to\n"
+"                the Timesheet line entries for particular date and "
+"particular user  with the effect of creating, editing and deleting either "
+"ways\n"
+"                and to automatically creates project tasks from procurement "
+"lines.\n"
+"                This installs the modules project_timesheet and project_mrp."
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "View Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:stock.picking:0
+#: sql_constraint:stock.picking.out:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:696
+#: code:addons/sale_stock/sale_stock.py:698
+#, python-format
+msgid "Advance of %s %s"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_saleprocurement0
+msgid ""
+"One Procurement order for each sales order line and for each of the "
+"components."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_assign0
+msgid "Assign"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:643
+#, python-format
+msgid "Not enough stock ! : "
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order.line,delay:0
+msgid ""
+"Number of days between the order confirmation the shipping of the products "
+"to the customer"
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "from stock"
+msgstr "自庫存"
+
+#. module: sale_stock
+#: help:sale.config.settings,default_picking_policy:0
+msgid ""
+"Sales order by default will be configured to deliver all products at once "
+"instead of delivering each product when it is available. This may have an "
+"impact on the shipping price."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.config.settings,default_order_policy:0
+msgid "Invoice based on sales orders"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_invoiceafterdelivery0
+msgid "Invoice"
+msgstr "發票"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel1
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancel2
+#: view:sale.order:0
+msgid "Cancel"
+msgstr "取消"
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:164
+#, python-format
+msgid ""
+"In order to delete a confirmed sales order, you must cancel it.\n"
+"To do so, you must first cancel related picking for delivery orders."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:sale.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,shipped:0
+msgid "Delivered"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:234
+#, python-format
+msgid "You must first cancel all picking attached to this sales order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_invoiceafterdelivery0
+msgid "Create Invoice"
+msgstr "開立發票"
+
+#. module: sale_stock
+#: help:sale.config.settings,group_mrp_properties:0
+msgid "Allows you to tag sale order lines with properties."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.config.settings,task_work:0
+msgid "Prepare invoices based on task's activities"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_advance_payment_inv
+msgid "Sales Advance Payment Invoice"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:660
+#, python-format
+msgid "You must first cancel stock moves attached to this sales order line."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:590
+#, python-format
+msgid "(n/a)"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,incoterm:0
+msgid "Incoterm"
+msgstr "國際商業用語"
+
+#. module: sale_stock
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product."
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:659
+#, python-format
+msgid "Cannot cancel sales order line!"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Deliver"
+msgstr "交貨"
+
+#. module: sale_stock
+#: model:process.transition.action,name:sale_stock.process_transition_action_cancelassignation0
+msgid "Cancel Assignation"
+msgstr "取消指派"
+
+#. module: sale_stock
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "按要求"
+
+#. module: sale_stock
+#: model:process.node,note:sale_stock.process_node_invoiceafterdelivery0
+msgid "Based on the shipped or on the ordered quantities."
+msgstr ""
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver all products at once"
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picking_ids:0
+msgid "Related Picking"
+msgstr ""
+
+#. module: sale_stock
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: sale_stock
+#: model:ir.model,name:sale_stock.model_sale_config_settings
+msgid "sale.config.settings"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.order,picking_ids:0
+msgid ""
+"This is a list of delivery orders that has been generated for this sales "
+"order."
+msgstr ""
+
+#. module: sale_stock
+#: model:process.node,name:sale_stock.process_node_saleorderprocurement0
+msgid "Sales Order Requisition"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_deliver0
+msgid "Create Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Ignore Exception"
+msgstr ""
+
+#. module: sale_stock
+#: code:addons/sale_stock/sale_stock.py:639
+#, python-format
+msgid ""
+"You plan to sell %.2f %s but you only have %.2f %s available !\n"
+"The real stock is %.2f %s. (without reservations)"
+msgstr ""
+
+#. module: sale_stock
+#: view:sale.order:0
+msgid "Recreate Delivery Order"
+msgstr ""
+
+#. module: sale_stock
+#: help:sale.config.settings,group_multiple_shops:0
+msgid "This allows to configure and use multiple shops."
+msgstr ""
+
+#. module: sale_stock
+#: field:sale.order,picked_rate:0
+msgid "Picked"
+msgstr "已提貨"
+
+#. module: sale_stock
+#: selection:sale.order,picking_policy:0
+msgid "Deliver each product when available"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,name:sale_stock.process_transition_packing0
+msgid "Create Pick List"
+msgstr ""
+
+#. module: sale_stock
+#: model:process.transition,note:sale_stock.process_transition_deliver0
+msgid ""
+"Depending on the configuration of the location Output, the move between the "
+"output area and the customer is done through the Delivery Order manually or "
+"automatically."
+msgstr ""
diff --git a/addons/sale_stock/process/sale_stock_process.xml b/addons/sale_stock/process/sale_stock_process.xml
new file mode 100644
index 00000000000..666f6ba6502
--- /dev/null
+++ b/addons/sale_stock/process/sale_stock_process.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        
+         <record id="process_node_saleorderprocurement0" model="process.node">
+            <field name="menu_id" ref="sale.menu_sale_order"/>
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Sales Order Requisition&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Drives procurement orders for every sales order line.&quot;&quot;&quot;" name="note"/>
+            <field name="subflow_id" ref="sale.process_process_salesprocess0"/>
+            <field name="process_id" ref="procurement.process_process_procurementprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('draft', 'waiting_date', 'manual', 'progress', 'shipping_except', 'invoice_except', 'done', 'cancel')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
+        
+        
+        <record id="process_node_saleprocurement0" model="process.node">
+            <field name="menu_id" ref="procurement.menu_stock_procurement_action"/>
+            <field name="model_id" ref="procurement.model_procurement_order"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Procurement Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;One Procurement order for each sales order line and for each of the components.&quot;&quot;&quot;" name="note"/>
+            <field name="subflow_id" ref="procurement.process_process_procurementprocess0"/>
+            <field name="process_id" ref="sale.process_process_salesprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state=='confirmed'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="1" name="flow_start"/>
+        </record>
+        
+        
+        
+        <record id="process_node_packinglist0" model="process.node">
+            <field name="model_id" ref="stock.model_stock_picking"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Pick List&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Document of the move to the output or to the customer.&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="sale.process_process_salesprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('assigned', 'confirmed')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+        <record id="process_node_deliveryorder0" model="process.node">
+            <field name="model_id" ref="stock.model_stock_picking"/>
+            <field eval="&quot;&quot;&quot;state&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Delivery Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Document of the move to the customer.&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="sale.process_process_salesprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state in ('done', 'assigned')&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+
+
+        <record id="process_node_invoiceafterdelivery0" model="process.node">
+            <field name="menu_id" ref="account.menu_action_invoice_tree1"/>
+            <field name="model_id" ref="account.model_account_invoice"/>
+            <field eval="&quot;&quot;&quot;subflow&quot;&quot;&quot;" name="kind"/>
+            <field eval="&quot;&quot;&quot;Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Based on the shipped or on the ordered quantities.&quot;&quot;&quot;" name="note"/>
+            <field name="process_id" ref="sale.process_process_salesprocess0"/>
+            <field name="subflow_id" ref="account.process_process_invoiceprocess0"/>
+            <field eval="&quot;&quot;&quot;object.state=='draft'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="0" name="flow_start"/>
+        </record>
+
+
+        <!--
+            Process Condition
+        -->
+
+        <record id="process_condition_conditionafterdelivery0" model="process.condition">
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="node_id" ref="process_node_invoiceafterdelivery0"/>
+            <field eval="&quot;&quot;&quot;object.order_policy=='postpaid'&quot;&quot;&quot;" name="model_states"/>
+            <field eval="&quot;&quot;&quot;condition_after_delivery&quot;&quot;&quot;" name="name"/>
+        </record>
+
+        <!--
+            Process Transition
+        -->
+        
+        <record id="process_transition_saleprocurement0" model="process.transition">
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Create Procurement Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;A procurement order is automatically created as soon as a sales order is confirmed or as the invoice is paid. It drives the purchasing and the production of products regarding to the rules and to the sales order's parameters. &quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_saleprocurement0"/>
+            <field model="process.node" name="source_node_id" ref="sale.process_node_saleorder0"/>
+        </record>
+
+        <record id="process_transition_packing0" model="process.transition">
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Create Pick List&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The Pick List form is created as soon as the sales order is confirmed, in the same time as the procurement order. It represents the assignment of parts to the sales order. There is 1 pick list by sales order line which evolves with the availability of parts.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_packinglist0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_saleprocurement0"/>
+        </record>
+
+        <record id="process_transition_deliver0" model="process.transition">
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Create Delivery Order&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;Depending on the configuration of the location Output, the move between the output area and the customer is done through the Delivery Order manually or automatically.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_deliveryorder0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
+        </record>
+
+        <record id="process_transition_invoiceafterdelivery0" model="process.transition">
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Create Invoice&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;The invoice is created automatically if the shipping policy is 'Invoice from pick' or 'Invoice on order after delivery'.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="process_node_invoiceafterdelivery0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_packinglist0"/>
+        </record>
+
+        <record id="process_transition_saleorderprocurement0" model="process.transition">
+            <field eval="[(6,0,[])]" name="transition_ids"/>
+            <field eval="&quot;&quot;&quot;Procurement of sold material&quot;&quot;&quot;" name="name"/>
+            <field eval="&quot;&quot;&quot;For every sales order line, a procurement order is created to supply the sold product.&quot;&quot;&quot;" name="note"/>
+            <field model="process.node" name="target_node_id" ref="procurement.process_node_procureproducts0"/>
+            <field model="process.node" name="source_node_id" ref="process_node_saleorderprocurement0"/>
+        </record>
+
+        <!--
+            Process Action
+        -->
+
+
+       <record id="process_transition_action_assign0" model="process.transition.action">
+            <field eval="&quot;&quot;&quot;action_assign&quot;&quot;&quot;" name="action"/>
+            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
+            <field eval="&quot;&quot;&quot;Assign&quot;&quot;&quot;" name="name"/>
+            <field name="transition_id" ref="process_transition_packing0"/>
+        </record>
+
+        <record id="process_transition_action_forceassignation0" model="process.transition.action">
+            <field eval="&quot;&quot;&quot;force_assign&quot;&quot;&quot;" name="action"/>
+            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
+            <field eval="&quot;&quot;&quot;Force Assignation&quot;&quot;&quot;" name="name"/>
+            <field name="transition_id" ref="process_transition_packing0"/>
+        </record>
+
+        <record id="process_transition_action_cancel1" model="process.transition.action">
+            <field eval="&quot;&quot;&quot;action_cancel&quot;&quot;&quot;" name="action"/>
+            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
+            <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
+            <field name="transition_id" ref="process_transition_packing0"/>
+        </record>
+
+        <record id="process_transition_action_cancelassignation0" model="process.transition.action">
+            <field eval="&quot;&quot;&quot;cancel_assign&quot;&quot;&quot;" name="action"/>
+            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
+            <field eval="&quot;&quot;&quot;Cancel Assignation&quot;&quot;&quot;" name="name"/>
+            <field name="transition_id" ref="process_transition_deliver0"/>
+        </record>
+
+        <record id="process_transition_action_validate0" model="process.transition.action">
+            <field eval="&quot;&quot;&quot;test_finished&quot;&quot;&quot;" name="action"/>
+            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
+            <field eval="&quot;&quot;&quot;Validate&quot;&quot;&quot;" name="name"/>
+            <field name="transition_id" ref="process_transition_deliver0"/>
+        </record>
+
+        <record id="process_transition_action_cancel2" model="process.transition.action">
+            <field eval="&quot;&quot;&quot;action_cancel&quot;&quot;&quot;" name="action"/>
+            <field eval="&quot;&quot;&quot;object&quot;&quot;&quot;" name="state"/>
+            <field eval="&quot;&quot;&quot;Cancel&quot;&quot;&quot;" name="name"/>
+            <field name="transition_id" ref="process_transition_deliver0"/>
+        </record>
+           
+   </data>
+</openerp>
diff --git a/addons/sale_stock/report/__init__.py b/addons/sale_stock/report/__init__.py
new file mode 100644
index 00000000000..418927acc78
--- /dev/null
+++ b/addons/sale_stock/report/__init__.py
@@ -0,0 +1,21 @@
+# -*- 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 sale_report
\ No newline at end of file
diff --git a/addons/sale_stock/report/sale_report.py b/addons/sale_stock/report/sale_report.py
new file mode 100644
index 00000000000..a523c0551f2
--- /dev/null
+++ b/addons/sale_stock/report/sale_report.py
@@ -0,0 +1,96 @@
+ # -*- 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 tools
+
+class sale_report(osv.osv):
+    _inherit = "sale.report"
+    _columns = {
+        'shipped': fields.boolean('Shipped', readonly=True),
+        'shipped_qty_1': fields.integer('Shipped', readonly=True),
+        'state': fields.selection([
+            ('draft', 'Quotation'),
+            ('waiting_date', 'Waiting Schedule'),
+            ('manual', 'Manual In Progress'),
+            ('progress', 'In Progress'),
+            ('shipping_except', 'Shipping Exception'),
+            ('invoice_except', 'Invoice Exception'),
+            ('done', 'Done'),
+            ('cancel', 'Cancelled')
+            ], 'Order Status', readonly=True),
+    }
+    
+    def init(self, cr):
+        tools.drop_view_if_exists(cr, 'sale_report')
+        cr.execute("""
+            create or replace view sale_report as (
+                select
+                    min(l.id) as id,
+                    l.product_id as product_id,
+                    t.uom_id as product_uom,
+                    sum(l.product_uom_qty / u.factor * u2.factor) as product_uom_qty,
+                    sum(l.product_uom_qty * l.price_unit * (100.0-l.discount) / 100.0) as price_total,
+                    1 as nbr,
+                    s.date_order as date,
+                    s.date_confirm as date_confirm,
+                    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.user_id as user_id,
+                    s.shop_id as shop_id,
+                    s.company_id as company_id,
+                    extract(epoch from avg(date_trunc('day',s.date_confirm)-date_trunc('day',s.create_date)))/(24*60*60)::decimal(16,2) as delay,
+                    s.state,
+                    t.categ_id as categ_id,
+                    s.shipped,
+                    s.shipped::integer as shipped_qty_1,
+                    s.pricelist_id as pricelist_id,
+                    s.project_id as analytic_account_id
+                from
+                    sale_order s
+                    left join sale_order_line l on (s.id=l.order_id)
+                        left join product_product p on (l.product_id=p.id)
+                            left join product_template t on (p.product_tmpl_id=t.id)
+                    left join product_uom u on (u.id=l.product_uom)
+                    left join product_uom u2 on (u2.id=t.uom_id)
+                group by
+                    l.product_id,
+                    l.product_uom_qty,
+                    l.order_id,
+                    t.uom_id,
+                    t.categ_id,
+                    s.date_order,
+                    s.date_confirm,
+                    s.partner_id,
+                    s.user_id,
+                    s.shop_id,
+                    s.company_id,
+                    s.state,
+                    s.shipped,
+                    s.pricelist_id,
+                    s.project_id
+            )
+        """)
+sale_report()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/sale_stock/report/sale_report_view.xml b/addons/sale_stock/report/sale_report_view.xml
new file mode 100644
index 00000000000..ae8b12ca168
--- /dev/null
+++ b/addons/sale_stock/report/sale_report_view.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+     <data>
+         <record id="view_order_product_tree_inherit" model="ir.ui.view">
+             <field name="name">sale.report.tree.sale.stock</field>
+             <field name="model">sale.report</field>
+             <field name="inherit_id" ref="sale.view_order_product_tree"/>
+             <field name="arch" type="xml">
+                 <field name="product_uom_qty" position="after">
+                     <field name="shipped_qty_1" sum="Shipped"/>
+                 </field>
+             </field>
+         </record>
+     </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py
new file mode 100644
index 00000000000..43e1cfc6778
--- /dev/null
+++ b/addons/sale_stock/res_config.py
@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import pooler
+from tools.translate import _
+
+class sale_configuration(osv.osv_memory):
+    _inherit = 'sale.config.settings'
+
+    _columns = {
+        'group_sale_delivery_address': fields.boolean("Allow a different address for delivery and invoicing ",
+            implied_group='sale.group_delivery_invoice_address',
+            help="Allows you to specify different delivery and invoice addresses on a sale order."),
+        'group_invoice_deli_orders': fields.boolean('Generate invoices after and based on delivery orders',
+            implied_group='sale_stock.group_invoice_deli_orders',
+            help="To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."),
+        'task_work': fields.boolean("Prepare invoices based on task's activities",
+            help="""Lets you transfer the entries under tasks defined for Project Management to
+                the Timesheet line entries for particular date and particular user  with the effect of creating, editing and deleting either ways
+                and to automatically creates project tasks from procurement lines.
+                This installs the modules project_timesheet and project_mrp."""),
+        'default_order_policy': fields.selection(
+            [('manual', 'Invoice based on sales orders'), ('picking', 'Invoice based on deliveries')],
+            'The default invoicing method is', default_model='sale.order',
+            help="You can generate invoices based on sales orders or based on shippings."),
+        'module_delivery': fields.boolean('Allow adding shipping costs',
+            help ="""Allows you to add delivery methods in sale orders and delivery orders.
+                You can define your own carrier and delivery grids for prices.
+                This installs the module delivery."""),
+        'default_picking_policy' : fields.boolean("Deliver all at once when all products are available.",
+            help = "Sales order by default will be configured to deliver all products at once instead of delivering each product when it is available. This may have an impact on the shipping price."),
+        'group_mrp_properties': fields.boolean('Product properties on order lines',
+            implied_group='sale.group_mrp_properties',
+            help="Allows you to tag sale order lines with properties."),
+        'group_multiple_shops': fields.boolean("Manage multiple shops",
+            implied_group='stock.group_locations',
+            help="This allows to configure and use multiple shops."),
+        'module_project_timesheet': fields.boolean("Project Timesheet"),
+        'module_project_mrp': fields.boolean("Project MRP"),
+    }
+
+    _defaults = {
+        'default_order_policy': 'manual',
+    }
+
+    def default_get(self, cr, uid, fields, context=None):
+        res = super(sale_configuration, self).default_get(cr, uid, fields, context)
+        # task_work, time_unit depend on other fields
+        res['task_work'] = res.get('module_project_mrp') and res.get('module_project_timesheet')
+        return res
+
+    def get_default_sale_config(self, cr, uid, ids, context=None):
+        ir_values = self.pool.get('ir.values')
+        default_picking_policy = ir_values.get_default(cr, uid, 'sale.order', 'picking_policy')
+        return {
+            'default_picking_policy': default_picking_policy == 'one',
+        }
+
+    def set_sale_defaults(self, cr, uid, ids, context=None):
+        ir_values = self.pool.get('ir.values')
+        ir_model_data = self.pool.get('ir.model.data')
+        wizard = self.browse(cr, uid, ids)[0]
+
+        default_picking_policy = 'one' if wizard.default_picking_policy else 'direct'
+        ir_values.set_default(cr, uid, 'sale.order', 'picking_policy', default_picking_policy)
+        res = super(sale_configuration, self).set_sale_defaults(cr, uid, ids, context)
+        return res
+    
+    def onchange_invoice_methods(self, cr, uid, ids, group_invoice_so_lines, group_invoice_deli_orders, context=None):
+        if not group_invoice_deli_orders:
+            return {'value': {'default_order_policy': 'manual'}}
+        if not group_invoice_so_lines:
+            return {'value': {'default_order_policy': 'picking'}}
+        return {}
diff --git a/addons/sale_stock/res_config_view.xml b/addons/sale_stock/res_config_view.xml
new file mode 100644
index 00000000000..ad3b91b2a30
--- /dev/null
+++ b/addons/sale_stock/res_config_view.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+         <record id="view_sales_config_sale_stock" model="ir.ui.view">
+             <field name="name">sale settings</field>
+             <field name="model">sale.config.settings</field>
+             <field name="inherit_id" ref="sale.view_sales_config"/>
+             <field name="arch" type="xml">
+                 <data>
+                     <xpath expr="//div[@name='Customer Features']" position="inside">
+                         <div>
+                              <field name="group_sale_delivery_address" class="oe_inline"/>
+                              <label for="group_sale_delivery_address"/>
+                         </div>
+                     </xpath>
+                     <xpath expr="//div[@name='group_invoice_so_lines']" position="replace">
+                         <div>
+                             <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
+                             <label for="group_invoice_so_lines"/>
+                         </div>
+                     </xpath>
+                     <xpath expr="//div[@name='timesheet']" position="before">
+                         <div>
+                             <field name="group_invoice_deli_orders" class="oe_inline" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
+                             <label for="group_invoice_deli_orders"/>
+                         </div>
+                         <div>
+                             <field name="task_work" class="oe_inline" on_change="onchange_task_work(task_work)"/>
+                             <label for="task_work"/>
+                         </div>
+                     </xpath>
+                     <xpath expr="//label[@string='Default Options']" position="replace">
+                         <label for="id" string="Default Options" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False),('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False),('task_work','=',False), ('module_account_analytic_analysis','=',False)]}"/>
+                     </xpath>
+                     <xpath expr="//div[@name='time_unit']" position="before">
+                         <div attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}">
+                             <label for="default_order_policy"/>
+                             <field name="default_order_policy" class="oe_inline"/>
+                         </div>
+                         <div attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}">
+                             <field name="module_delivery" class="oe_inline"/>
+                             <label for="module_delivery"/>
+                         </div>
+                     </xpath> 
+                     <group name='default_options' position="after">
+                         <field name="module_project_timesheet" invisible="1"/>
+                         <field name="module_project_mrp" invisible="1"/>
+                     </group>
+                     <div name='warehouse_features' position='inside'>
+                         <div name='default_picking_policy' attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}">
+                             <field name="default_picking_policy" class="oe_inline"/>
+                             <label for="default_picking_policy"/>
+                         </div>
+                     </div>
+                     <div name='module_sale_journal' position="before">
+                         <div>
+                             <field name="group_mrp_properties" class="oe_inline"/>
+                             <label for="group_mrp_properties"/>
+                         </div>
+                     </div>
+                     <xpath expr="//div[@name='module_sale_margin']" position="before">
+                         <div>
+                             <field name="group_multiple_shops" class="oe_inline"/>
+                             <label for="group_multiple_shops"/>
+                         </div>
+                     </xpath>
+                     <field name="group_invoice_so_lines" position="replace">
+                         <field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)" class="oe_inline"/>
+                     </field>
+                     <xpath expr="//div[@name='time_unit']" position="replace">
+                         <div attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}">
+                             <label for="time_unit"/>
+                             <field name="time_unit" domain="[('category_id.name','=','Working Time')]" class="oe_inline"/>
+                         </div>
+                     </xpath>
+                </data>
+             </field>
+         </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
new file mode 100644
index 00000000000..d60803aae16
--- /dev/null
+++ b/addons/sale_stock/sale_stock.py
@@ -0,0 +1,662 @@
+# -*- 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 datetime import datetime, timedelta
+from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
+from dateutil.relativedelta import relativedelta
+from osv import fields, osv
+import netsvc
+from tools.translate import _
+
+class sale_shop(osv.osv):
+    _inherit = "sale.shop"
+    _columns = {
+        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse'),
+    }
+
+sale_shop()
+
+class sale_order(osv.osv):
+    _inherit = "sale.order"
+    
+    def copy(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default.update({
+            'shipped': False,
+            'picking_ids': [],
+        })
+        return super(sale_order, self).copy(cr, uid, id, default, context=context)
+    
+    def shipping_policy_change(self, cr, uid, ids, policy, context=None):
+        if not policy:
+            return {}
+        inv_qty = 'order'
+        if policy == 'prepaid':
+            inv_qty = 'order'
+        elif policy == 'picking':
+            inv_qty = 'procurement'
+        return {'value': {'invoice_quantity': inv_qty}}
+
+    def write(self, cr, uid, ids, vals, context=None):
+        if vals.get('order_policy', False):
+            if vals['order_policy'] == 'prepaid':
+                vals.update({'invoice_quantity': 'order'})
+            elif vals['order_policy'] == 'picking':
+                vals.update({'invoice_quantity': 'procurement'})
+        return super(sale_order, self).write(cr, uid, ids, vals, context=context)
+
+    def create(self, cr, uid, vals, context=None):
+        if vals.get('order_policy', False):
+            if vals['order_policy'] == 'prepaid':
+                vals.update({'invoice_quantity': 'order'})
+            if vals['order_policy'] == 'picking':
+                vals.update({'invoice_quantity': 'procurement'})
+        order =  super(sale_order, self).create(cr, uid, vals, context=context)
+        return order
+
+    # This is False
+    def _picked_rate(self, cr, uid, ids, name, arg, context=None):
+        if not ids:
+            return {}
+        res = {}
+        tmp = {}
+        for id in ids:
+            tmp[id] = {'picked': 0.0, 'total': 0.0}
+        cr.execute('''SELECT
+                p.sale_id as sale_order_id, sum(m.product_qty) as nbr, mp.state as procurement_state, m.state as move_state, p.type as picking_type
+            FROM
+                stock_move m
+            LEFT JOIN
+                stock_picking p on (p.id=m.picking_id)
+            LEFT JOIN
+                procurement_order mp on (mp.move_id=m.id)
+            WHERE
+                p.sale_id IN %s GROUP BY m.state, mp.state, p.sale_id, p.type''', (tuple(ids),))
+
+        for item in cr.dictfetchall():
+            if item['move_state'] == 'cancel':
+                continue
+
+            if item['picking_type'] == 'in':#this is a returned picking
+                tmp[item['sale_order_id']]['total'] -= item['nbr'] or 0.0 # Deducting the return picking qty
+                if item['procurement_state'] == 'done' or item['move_state'] == 'done':
+                    tmp[item['sale_order_id']]['picked'] -= item['nbr'] or 0.0
+            else:
+                tmp[item['sale_order_id']]['total'] += item['nbr'] or 0.0
+                if item['procurement_state'] == 'done' or item['move_state'] == 'done':
+                    tmp[item['sale_order_id']]['picked'] += item['nbr'] or 0.0
+
+        for order in self.browse(cr, uid, ids, context=context):
+            if order.shipped:
+                res[order.id] = 100.0
+            else:
+                res[order.id] = tmp[order.id]['total'] and (100.0 * tmp[order.id]['picked'] / tmp[order.id]['total']) or 0.0
+        return res
+    
+    _columns = {
+          'state': fields.selection([
+            ('draft', 'Draft Quotation'),
+            ('sent', 'Quotation Sent'),
+            ('cancel', 'Cancelled'),
+            ('waiting_date', 'Waiting Schedule'),
+            ('progress', 'Sale Order'),
+            ('manual', 'Sale to Invoice'),
+            ('shipping_except', 'Shipping Exception'),
+            ('invoice_except', 'Invoice Exception'),
+            ('done', 'Done'),
+            ], 'Status', readonly=True,help="Gives the status of the quotation or sales order.\
+              \nThe exception status 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' status is set when the invoice is confirmed\
+               but waiting for the scheduler to run on the order date.", select=True),
+        'incoterm': fields.many2one('stock.incoterms', 'Incoterm', help="International Commercial Terms are a series of predefined commercial terms used in international transactions."),
+        'picking_policy': fields.selection([('direct', 'Deliver each product when available'), ('one', 'Deliver all products at once')],
+            'Shipping Policy', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
+            help="""Pick 'Deliver each product when available' if you allow partial delivery."""),
+        'order_policy': fields.selection([
+                ('manual', 'On Demand'),
+                ('picking', 'On Delivery Order'),
+                ('prepaid', 'Before Delivery'),
+            ], 'Create Invoice', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]},
+            help="""On demand: A draft invoice can be created from the sales order when needed. \nOn delivery order: A draft invoice can be created from the delivery order when the products have been delivered. \nBefore delivery: A draft invoice is created from the sales order and must be paid before the products can be delivered."""),
+        'picking_ids': fields.one2many('stock.picking.out', 'sale_id', 'Related Picking', readonly=True, help="This is a list of delivery orders that has been generated for this sales order."),
+        'shipped': fields.boolean('Delivered', readonly=True, help="It indicates that the sales order has been delivered. This field is updated only after the scheduler(s) have been launched."),
+        'picked_rate': fields.function(_picked_rate, string='Picked', type='float'),
+        'invoice_quantity': fields.selection([('order', 'Ordered Quantities'), ('procurement', 'Shipped Quantities')], 'Invoice on', 
+                                             help="The sale order will automatically create the invoice proposition (draft invoice).\
+                                              You have to choose  if you want your invoice based on ordered ", required=True, readonly=True, states={'draft': [('readonly', False)]}),
+    }
+    _defaults = {
+             'picking_policy': 'direct',
+             'order_policy': 'manual',
+             'invoice_quantity': 'order',
+         }
+
+    # Form filling
+    def unlink(self, cr, uid, ids, context=None):
+        sale_orders = self.read(cr, uid, ids, ['state'], context=context)
+        unlink_ids = []
+        for s in sale_orders:
+            if s['state'] in ['draft', 'cancel']:
+                unlink_ids.append(s['id'])
+            else:
+                raise osv.except_osv(_('Invalid Action!'), _('In order to delete a confirmed sales order, you must cancel it.\nTo do so, you must first cancel related picking for delivery orders.'))
+
+        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
+
+    def action_view_delivery(self, cr, uid, ids, context=None):
+        '''
+        This function returns an action that display existing delivery orders of given sale order ids. It can either be a in a list or in a form view, if there is only one delivery order to show.
+        '''
+        mod_obj = self.pool.get('ir.model.data')
+        act_obj = self.pool.get('ir.actions.act_window')
+
+        result = mod_obj.get_object_reference(cr, uid, 'stock', 'action_picking_tree')
+        id = result and result[1] or False
+        result = act_obj.read(cr, uid, [id], context=context)[0]
+        #compute the number of delivery orders to display
+        pick_ids = []
+        for so in self.browse(cr, uid, ids, context=context):
+            pick_ids += [picking.id for picking in so.picking_ids]
+        #choose the view_mode accordingly
+        if len(pick_ids) > 1:
+            result['domain'] = "[('id','in',["+','.join(map(str, pick_ids))+"])]"
+        else:
+            res = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
+            result['views'] = [(res and res[1] or False, 'form')]
+            result['res_id'] = pick_ids and pick_ids[0] or False
+        return result
+
+    def action_invoice_create(self, cr, uid, ids, grouped=False, states=['confirmed', 'done', 'exception'], date_inv = False, context=None):
+        picking_obj = self.pool.get('stock.picking')
+        res = super(sale_order,self).action_invoice_create( cr, uid, ids, grouped=grouped, states=states, date_inv = date_inv, context=context)
+        for order in self.browse(cr, uid, ids, context=context):
+            if order.order_policy == 'picking':
+                picking_obj.write(cr, uid, map(lambda x: x.id, order.picking_ids), {'invoice_state': 'invoiced'})
+        return res
+
+    def action_cancel(self, cr, uid, ids, context=None):
+        wf_service = netsvc.LocalService("workflow")
+        if context is None:
+            context = {}
+        sale_order_line_obj = self.pool.get('sale.order.line')
+        proc_obj = self.pool.get('procurement.order')
+        for sale in self.browse(cr, uid, ids, context=context):
+            for pick in sale.picking_ids:
+                if pick.state not in ('draft', 'cancel'):
+                    raise osv.except_osv(
+                        _('Cannot cancel sales order!'),
+                        _('You must first cancel all delivery order(s) attached to this sales order.'))
+                if pick.state == 'cancel':
+                    for mov in pick.move_lines:
+                        proc_ids = proc_obj.search(cr, uid, [('move_id', '=', mov.id)])
+                        if proc_ids:
+                            for proc in proc_ids:
+                                wf_service.trg_validate(uid, 'procurement.order', proc, 'button_check', cr)
+            for r in self.read(cr, uid, ids, ['picking_ids']):
+                for pick in r['picking_ids']:
+                    wf_service.trg_validate(uid, 'stock.picking', pick, 'button_cancel', cr)
+        return super(sale_order, self).action_cancel(cr, uid, ids, context=context)
+
+    def action_wait(self, cr, uid, ids, context=None):
+        res = super(sale_order, self).action_wait(cr, uid, ids, context=context)
+        for o in self.browse(cr, uid, ids):
+            noprod = self.test_no_product(cr, uid, o, context)
+            if noprod and o.order_policy=='picking':
+                self.write(cr, uid, [o.id], {'order_policy': 'manual'}, context=context)
+        return res
+
+    def procurement_lines_get(self, cr, uid, ids, *args):
+        res = []
+        for order in self.browse(cr, uid, ids, context={}):
+            for line in order.order_line:
+                if line.procurement_id:
+                    res.append(line.procurement_id.id)
+        return res
+
+    # if mode == 'finished':
+    #   returns True if all lines are done, False otherwise
+    # if mode == 'canceled':
+    #   returns True if there is at least one canceled line, False otherwise
+    def test_state(self, cr, uid, ids, mode, *args):
+        assert mode in ('finished', 'canceled'), _("invalid mode for test_state")
+        finished = True
+        canceled = False
+        write_done_ids = []
+        write_cancel_ids = []
+        for order in self.browse(cr, uid, ids, context={}):
+            for line in order.order_line:
+                if (not line.procurement_id) or (line.procurement_id.state=='done'):
+                    if line.state != 'done':
+                        write_done_ids.append(line.id)
+                else:
+                    finished = False
+                if line.procurement_id:
+                    if (line.procurement_id.state == 'cancel'):
+                        canceled = True
+                        if line.state != 'exception':
+                            write_cancel_ids.append(line.id)
+        if write_done_ids:
+            self.pool.get('sale.order.line').write(cr, uid, write_done_ids, {'state': 'done'})
+        if write_cancel_ids:
+            self.pool.get('sale.order.line').write(cr, uid, write_cancel_ids, {'state': 'exception'})
+
+        if mode == 'finished':
+            return finished
+        elif mode == 'canceled':
+            return canceled
+
+    def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
+        return {
+            'name': line.name.split('\n')[0],
+            'origin': order.name,
+            'date_planned': date_planned,
+            'product_id': line.product_id.id,
+            'product_qty': line.product_uom_qty,
+            'product_uom': line.product_uom.id,
+            'product_uos_qty': (line.product_uos and line.product_uos_qty)\
+                    or line.product_uom_qty,
+            'product_uos': (line.product_uos and line.product_uos.id)\
+                    or line.product_uom.id,
+            'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
+            'procure_method': line.type,
+            'move_id': move_id,
+            'company_id': order.company_id.id,
+            'note': '\n'.join(line.name.split('\n')[1:])
+        }
+
+    def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):
+        location_id = order.shop_id.warehouse_id.lot_stock_id.id
+        output_id = order.shop_id.warehouse_id.lot_output_id.id
+        return {
+            'name': line.name.split('\n')[0][:250],
+            'picking_id': picking_id,
+            'product_id': line.product_id.id,
+            'date': date_planned,
+            'date_expected': date_planned,
+            'product_qty': line.product_uom_qty,
+            'product_uom': line.product_uom.id,
+            'product_uos_qty': (line.product_uos and line.product_uos_qty) or line.product_uom_qty,
+            'product_uos': (line.product_uos and line.product_uos.id)\
+                    or line.product_uom.id,
+            'product_packaging': line.product_packaging.id,
+            'partner_id': line.address_allotment_id.id or order.partner_shipping_id.id,
+            'location_id': location_id,
+            'location_dest_id': output_id,
+            'sale_line_id': line.id,
+            'tracking_id': False,
+            'state': 'draft',
+            #'state': 'waiting',
+            'note': '\n'.join(line.name.split('\n')[1:]),
+            'company_id': order.company_id.id,
+            'price_unit': line.product_id.standard_price or 0.0
+        }
+
+    def _prepare_order_picking(self, cr, uid, order, context=None):
+        pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
+        return {
+            'name': pick_name,
+            'origin': order.name,
+            'date': order.date_order,
+            'type': 'out',
+            'state': 'auto',
+            'move_type': order.picking_policy,
+            'sale_id': order.id,
+            'partner_id': order.partner_shipping_id.id,
+            'note': order.note,
+            'invoice_state': (order.order_policy=='picking' and '2binvoiced') or 'none',
+            'company_id': order.company_id.id,
+        }
+
+    def ship_recreate(self, cr, uid, order, line, move_id, proc_id):
+        # FIXME: deals with potentially cancelled shipments, seems broken (specially if shipment has production lot)
+        """
+        Define ship_recreate for process after shipping exception
+        param order: sale order to which the order lines belong
+        param line: sale order line records to procure
+        param move_id: the ID of stock move
+        param proc_id: the ID of procurement
+        """
+        move_obj = self.pool.get('stock.move')
+        if order.state == 'shipping_except':
+            for pick in order.picking_ids:
+                for move in pick.move_lines:
+                    if move.state == 'cancel':
+                        mov_ids = move_obj.search(cr, uid, [('state', '=', 'cancel'),('sale_line_id', '=', line.id),('picking_id', '=', pick.id)])
+                        if mov_ids:
+                            for mov in move_obj.browse(cr, uid, mov_ids):
+                                # FIXME: the following seems broken: what if move_id doesn't exist? What if there are several mov_ids? Shouldn't that be a sum?
+                                move_obj.write(cr, uid, [move_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
+                                self.pool.get('procurement.order').write(cr, uid, [proc_id], {'product_qty': mov.product_qty, 'product_uos_qty': mov.product_uos_qty})
+        return True
+
+    def _get_date_planned(self, cr, uid, order, line, start_date, context=None):
+        date_planned = datetime.strptime(start_date, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=line.delay or 0.0)
+        date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        return date_planned
+
+    def _create_pickings_and_procurements(self, cr, uid, order, order_lines, picking_id=False, context=None):
+        """Create the required procurements to supply sale order lines, also connecting
+        the procurements to appropriate stock moves in order to bring the goods to the
+        sale order's requested location.
+
+        If ``picking_id`` is provided, the stock moves will be added to it, otherwise
+        a standard outgoing picking will be created to wrap the stock moves, as returned
+        by :meth:`~._prepare_order_picking`.
+
+        Modules that wish to customize the procurements or partition the stock moves over
+        multiple stock pickings may override this method and call ``super()`` with
+        different subsets of ``order_lines`` and/or preset ``picking_id`` values.
+
+        :param browse_record order: sale order to which the order lines belong
+        :param list(browse_record) order_lines: sale order line records to procure
+        :param int picking_id: optional ID of a stock picking to which the created stock moves
+                               will be added. A new picking will be created if ommitted.
+        :return: True
+        """
+        move_obj = self.pool.get('stock.move')
+        picking_obj = self.pool.get('stock.picking')
+        procurement_obj = self.pool.get('procurement.order')
+        proc_ids = []
+
+        for line in order_lines:
+            if line.state == 'done':
+                continue
+
+            date_planned = self._get_date_planned(cr, uid, order, line, order.date_order, context=context)
+
+            if line.product_id:
+                if line.product_id.product_tmpl_id.type in ('product', 'consu'):
+                    if not picking_id:
+                        picking_id = picking_obj.create(cr, uid, self._prepare_order_picking(cr, uid, order, context=context))
+                    move_id = move_obj.create(cr, uid, self._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, context=context))
+                else:
+                    # a service has no stock move
+                    move_id = False
+
+                proc_id = procurement_obj.create(cr, uid, self._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, context=context))
+                proc_ids.append(proc_id)
+                line.write({'procurement_id': proc_id})
+                self.ship_recreate(cr, uid, order, line, move_id, proc_id)
+
+        wf_service = netsvc.LocalService("workflow")
+        if picking_id:
+            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
+            self.delivery_send_note(cr, uid, [order.id], picking_id, context)
+
+
+        for proc_id in proc_ids:
+            wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
+
+        val = {}
+        if order.state == 'shipping_except':
+            val['state'] = 'progress'
+            val['shipped'] = False
+
+            if (order.order_policy == 'manual'):
+                for line in order.order_line:
+                    if (not line.invoiced) and (line.state not in ('cancel', 'draft')):
+                        val['state'] = 'manual'
+                        break
+        order.write(val)
+        return True
+
+    def action_ship_create(self, cr, uid, ids, context=None):
+        for order in self.browse(cr, uid, ids, context=context):
+            self._create_pickings_and_procurements(cr, uid, order, order.order_line, None, context=context)
+        return True
+
+    def action_ship_end(self, cr, uid, ids, context=None):
+        for order in self.browse(cr, uid, ids, context=context):
+            val = {'shipped': True}
+            if order.state == 'shipping_except':
+                val['state'] = 'progress'
+                if (order.order_policy == 'manual'):
+                    for line in order.order_line:
+                        if (not line.invoiced) and (line.state not in ('cancel', 'draft')):
+                            val['state'] = 'manual'
+                            break
+            for line in order.order_line:
+                towrite = []
+                if line.state == 'exception':
+                    towrite.append(line.id)
+                if towrite:
+                    self.pool.get('sale.order.line').write(cr, uid, towrite, {'state': 'done'}, context=context)
+            res = self.write(cr, uid, [order.id], val)
+            if res:
+                self.delivery_end_send_note(cr, uid, [order.id], context=context)
+        return True
+
+    def has_stockable_products(self, cr, uid, ids, *args):
+        for order in self.browse(cr, uid, ids):
+            for order_line in order.order_line:
+                if order_line.product_id and order_line.product_id.product_tmpl_id.type in ('product', 'consu'):
+                    return True
+        return False
+
+    # ------------------------------------------------
+    # OpenChatter methods and notifications
+    # ------------------------------------------------
+    
+    def get_needaction_user_ids(self, cr, uid, ids, context=None):
+        result = super(sale_order, self).get_needaction_user_ids(cr, uid, ids, context=context)
+        return result
+
+    def delivery_send_note(self, cr, uid, ids, picking_id, context=None):
+        for order in self.browse(cr, uid, ids, context=context):
+            for picking in (pck for pck in order.picking_ids if pck.id == picking_id):
+                # convert datetime field to a datetime, using server format, then
+                # convert it to the user TZ and re-render it with %Z to add the timezone
+                picking_datetime = fields.DT.datetime.strptime(picking.min_date, DEFAULT_SERVER_DATETIME_FORMAT)
+                picking_date_str = fields.datetime.context_timestamp(cr, uid, picking_datetime, context=context).strftime(DATETIME_FORMATS_MAP['%+'] + " (%Z)")
+                self.message_post(cr, uid, [order.id], body=_("Delivery Order <em>%s</em> <b>scheduled</b> for %s.") % (picking.name, picking_date_str), context=context)
+
+    def delivery_end_send_note(self, cr, uid, ids, context=None):
+        self.message_post(cr, uid, ids, body=_("Order <b>delivered</b>."), context=context)
+
+class sale_order_line(osv.osv):
+
+    def _number_packages(self, cr, uid, ids, field_name, arg, context=None):
+        res = {}
+        for line in self.browse(cr, uid, ids, context=context):
+            try:
+                res[line.id] = int((line.product_uom_qty+line.product_packaging.qty-0.0001) / line.product_packaging.qty)
+            except:
+                res[line.id] = 1
+        return res
+
+    _inherit = 'sale.order.line'
+    _columns = { 
+        'delay': fields.float('Delivery Lead Time', required=True, help="Number of days between the order confirmation and the shipping of the products to the customer", readonly=True, states={'draft': [('readonly', False)]}),
+        'procurement_id': fields.many2one('procurement.order', 'Procurement'),
+        'property_ids': fields.many2many('mrp.property', 'sale_order_line_property_rel', 'order_id', 'property_id', 'Properties', readonly=True, states={'draft': [('readonly', False)]}),
+        'product_packaging': fields.many2one('product.packaging', 'Packaging'),
+        'move_ids': fields.one2many('stock.move', 'sale_line_id', 'Inventory Moves', readonly=True),
+        'number_packages': fields.function(_number_packages, type='integer', string='Number Packages'),
+    }
+    _defaults = {
+        'delay': 0.0,
+        'product_packaging': False,
+    }
+
+    def _get_line_qty(self, cr, uid, line, context=None):
+        if line.procurement_id and not (line.order_id.invoice_quantity=='order'):
+            return self.pool.get('procurement.order').quantity_get(cr, uid,
+                   line.procurement_id.id, context=context)
+        else:
+            return super(sale_order_line, self)._get_line_qty(cr, uid, line, context=context)
+
+
+    def _get_line_uom(self, cr, uid, line, context=None):
+        if line.procurement_id and not (line.order_id.invoice_quantity=='order'):
+            return self.pool.get('procurement.order').uom_get(cr, uid,
+                    line.procurement_id.id, context=context)
+        else:
+            return super(sale_order_line, self)._get_line_uom(cr, uid, line, context=context)
+
+    def button_cancel(self, cr, uid, ids, context=None):
+        res = super(sale_order_line, self).button_cancel(cr, uid, ids, context=context)
+        for line in self.browse(cr, uid, ids, context=context):
+            for move_line in line.move_ids:
+                if move_line.state != 'cancel':
+                    raise osv.except_osv(
+                            _('Cannot cancel sales order line!'),
+                            _('You must first cancel stock moves attached to this sales order line.'))   
+        return res
+
+    def copy_data(self, cr, uid, id, default=None, context=None):
+        if not default:
+            default = {}
+        default.update({'move_ids': []})
+        return super(sale_order_line, self).copy_data(cr, uid, id, default, context=context)
+
+    def product_packaging_change(self, cr, uid, ids, pricelist, product, qty=0, uom=False,
+                                   partner_id=False, packaging=False, flag=False, context=None):
+        if not product:
+            return {'value': {'product_packaging': False}}
+        product_obj = self.pool.get('product.product')
+        product_uom_obj = self.pool.get('product.uom')
+        pack_obj = self.pool.get('product.packaging')
+        warning = {}
+        result = {}
+        warning_msgs = ''
+        if flag:
+            res = self.product_id_change(cr, uid, ids, pricelist=pricelist,
+                    product=product, qty=qty, uom=uom, partner_id=partner_id,
+                    packaging=packaging, flag=False, context=context)
+            warning_msgs = res.get('warning') and res['warning']['message']
+
+        products = product_obj.browse(cr, uid, product, context=context)
+        if not products.packaging:
+            packaging = result['product_packaging'] = False
+        elif not packaging and products.packaging and not flag:
+            packaging = products.packaging[0].id
+            result['product_packaging'] = packaging
+
+        if packaging:
+            default_uom = products.uom_id and products.uom_id.id
+            pack = pack_obj.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 or _('(n/a)')
+                qty_pack = pack.qty
+                type_ul = pack.ul
+                if not warning_msgs:
+                    warn_msg = _("You selected a quantity of %d Units.\n"
+                                "But it's not compatible with the selected packaging.\n"
+                                "Here is a proposition of quantities according to the packaging:\n"
+                                "EAN: %s Quantity: %s Type of ul: %s") % \
+                                    (qty, ean, qty_pack, type_ul.name)
+                    warning_msgs += _("Picking Information ! : ") + warn_msg + "\n\n"
+                warning = {
+                       'title': _('Configuration Error!'),
+                       'message': warning_msgs
+                }
+            result['product_uom_qty'] = qty
+
+        return {'value': result, 'warning': warning}
+
+    def product_id_change(self, cr, uid, ids, pricelist, 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, context=None):
+        context = context or {}
+        product_uom_obj = self.pool.get('product.uom')
+        partner_obj = self.pool.get('res.partner')
+        product_obj = self.pool.get('product.product')
+        warning = {}
+        res = super(sale_order_line, self).product_id_change(cr, uid, 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, packaging=packaging, fiscal_position=fiscal_position, flag=flag, context=context)
+
+        if not product:
+            res['value'].update({'product_packaging': False})
+            return res
+
+        #update of result obtained in super function
+        res_packing = self.product_packaging_change(cr, uid, ids, pricelist, product, qty, uom, partner_id, packaging, context=context)
+        res['value'].update(res_packing.get('value', {}))
+        warning_msgs = res_packing.get('warning') and res_packing['warning']['message'] or ''
+        product_obj = product_obj.browse(cr, uid, product, context=context)
+        res['value']['delay'] = (product_obj.sale_delay or 0.0)
+        res['value']['type'] = product_obj.procure_method
+
+        #check if product is available, and if not: raise an error
+        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 not uom2:
+            uom2 = product_obj.uom_id
+        compare_qty = float_compare(product_obj.virtual_available * uom2.factor, qty * product_obj.uom_id.factor, precision_rounding=product_obj.uom_id.rounding)
+        if (product_obj.type=='product') and int(compare_qty) == -1 \
+          and (product_obj.procure_method=='make_to_stock'):
+            warn_msg = _('You plan to sell %.2f %s but you only have %.2f %s available !\nThe real stock is %.2f %s. (without reservations)') % \
+                    (qty, uom2 and uom2.name or product_obj.uom_id.name,
+                     max(0,product_obj.virtual_available), product_obj.uom_id.name,
+                     max(0,product_obj.qty_available), product_obj.uom_id.name)
+            warning_msgs += _("Not enough stock ! : ") + warn_msg + "\n\n"
+
+        #update of warning messages
+        if warning_msgs:
+            warning = {
+                       'title': _('Configuration Error!'),
+                       'message' : warning_msgs
+                    }
+        res.update({'warning': warning})
+        return res
+
+
+class sale_advance_payment_inv(osv.osv_memory):
+    _inherit = "sale.advance.payment.inv"
+
+    def _create_invoices(self, cr, uid, inv_values, sale_id, context=None):
+        result = super(sale_advance_payment_inv, self)._create_invoices(cr, uid, inv_values, sale_id, context=context)
+        sale_obj = self.pool.get('sale.order')
+        sale_line_obj = self.pool.get('sale.order.line')
+        wizard = self.browse(cr, uid, [result], context)
+        sale = sale_obj.browse(cr, uid, sale_id, context=context)
+        if sale.order_policy == 'postpaid':
+            raise osv.except_osv(
+                _('Error!'),
+                _("You cannot make an advance on a sales order \
+                     that is defined as 'Automatic Invoice after delivery'."))
+
+        # If invoice on picking: add the cost on the SO
+        # If not, the advance will be deduced when generating the final invoice
+        line_name = inv_values.get('invoice_line') and inv_values.get('invoice_line')[0][2].get('name') or ''
+        line_tax = inv_values.get('invoice_line') and inv_values.get('invoice_line')[0][2].get('invoice_line_tax_id') or False
+        if sale.order_policy == 'picking':
+            vals = {
+                'order_id': sale.id,
+                'name': line_name,
+                'price_unit': -inv_amount,
+                'product_uom_qty': wizard.qtty or 1.0,
+                'product_uos_qty': wizard.qtty or 1.0,
+                'product_uos': res.get('uos_id', False),
+                'product_uom': res.get('uom_id', False),
+                'product_id': wizard.product_id.id or False,
+                'discount': False,
+                'tax_id': line_tax,
+            }
+            sale_line_obj.create(cr, uid, vals, context=context)
+        return result
diff --git a/addons/sale_stock/sale_stock_data.xml b/addons/sale_stock/sale_stock_data.xml
new file mode 100644
index 00000000000..bb4944bd87e
--- /dev/null
+++ b/addons/sale_stock/sale_stock_data.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+    
+        <!-- Resource: sale.shop -->
+        <record id="sale.sale_shop_1" model="sale.shop">
+            <field name="warehouse_id" ref="stock.warehouse0"/>
+        </record>
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/sale_stock/sale_stock_demo.xml b/addons/sale_stock/sale_stock_demo.xml
new file mode 100644
index 00000000000..15b1e60b829
--- /dev/null
+++ b/addons/sale_stock/sale_stock_demo.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+    
+        <record id="sale.sale_order_1" model="sale.order">
+            <field name="order_policy">prepaid</field>
+        </record>
+
+        <record id="sale.sale_order_4" model="sale.order">
+            <field name="order_policy">prepaid</field>
+        </record>
+
+        <record id="sale.sale_order_5" model="sale.order">
+            <field name="order_policy">picking</field>
+        </record>
+
+        <record id="sale.sale_order_6" model="sale.order">
+            <field name="order_policy">picking</field>
+        </record>
+        
+         <!-- Confirm some Sale Orders-->
+        <workflow action="order_confirm" model="sale.order" ref="sale.sale_order_1"/>
+        <workflow action="order_confirm" model="sale.order" ref="sale.sale_order_5"/>
+        
+        <record id="sale.sale_order_line_4" model="sale.order.line">
+            <field name="type">make_to_order</field>
+        </record>
+        
+        <record id="sale.sale_order_line_5" model="sale.order.line">
+             <field name="type">make_to_order</field>
+        </record>
+        
+        <record id="sale.sale_order_line_6" model="sale.order.line">
+            <field name="type">make_to_order</field>
+        </record>
+        
+        <record id="sale.sale_order_line_8" model="sale.order.line">
+             <field name="type">make_to_order</field>
+        </record>
+
+        <!-- Run all schedulers -->
+        <function model="procurement.order" name="run_scheduler"/>
+        
+    </data>
+</openerp>
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
new file mode 100644
index 00000000000..4c38e198b60
--- /dev/null
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record id="view_sale_shop_form_inherit" model="ir.ui.view">
+            <field name="name">sale.shop.inherit.form</field>
+            <field name="model">sale.shop</field>
+            <field name="inherit_id" ref="sale.view_shop_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='shop']" position="before">
+                     <label for="warehouse_id" class="oe_edit_only"/>
+                     <h2><field name="warehouse_id" required="1"/></h2>
+                </xpath>
+            </field>
+        </record>
+
+         <record id="view_shop_tree_inherit" model="ir.ui.view">
+             <field name="name">sale.shop.sale.stock</field>
+             <field name="model">sale.shop</field>
+             <field name="inherit_id" ref="sale.view_shop_tree"/>
+             <field name="arch" type="xml">
+                 <field name="name" position="after">
+                     <field name="warehouse_id"/>
+                 </field>
+             </field>
+         </record>
+
+        <menuitem action="sale.action_shop_form" id="menu_action_shop_form" parent="base.menu_base_config" sequence="35" groups="stock.group_locations"/>
+
+        <record id="view_order_form_inherit" model="ir.ui.view">
+            <field name="name">sale.order.form.sale.stock</field>
+            <field name="model">sale.order</field>
+            <field name="inherit_id" ref="sale.view_order_form"/>
+            <field name="arch" type="xml">
+                <data>
+                   <xpath expr="//button[@name='invoice_corrected']" position="after">
+                       <button name="ship_recreate" states="shipping_except" string="Recreate Delivery Order"/>
+                       <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
+                   </xpath>
+                   <xpath expr="//button[@name='action_view_invoice']" position="after">
+                       <field name="picking_ids" invisible="1"/>
+                       <button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
+                           attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
+                   </xpath>
+                    <xpath expr="//button[@name='action_cancel']" position="after">
+                        <button name="ship_cancel" states="shipping_except" string="Cancel"/>
+                    </xpath>
+                    <field name="state" position="replace">
+                        <field name="state" widget="statusbar" statusbar_visible="draft,sent,progress,invoiced,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
+                    </field>
+                   <field name="shop_id" position="replace">
+                        <field name="shop_id" on_change="onchange_shop_id(shop_id)" widget="selection" groups="stock.group_locations"/>
+                   </field>
+                   <field name="product_id" position="replace">
+                       <field name="product_id"
+                       context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}"
+                       groups="base.group_user" 
+                       on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/>
+                   </field>
+                   <field name="product_uom_qty" position="replace">
+                       <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" class="oe_inline"
+                           on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/>
+                   </field>
+
+                   <field name='invoiced' position="after">
+                       <field name="shipped"/>
+                       <field name="invoice_exists" invisible="1"/>
+                   </field>
+                   <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='type']" position="before">                   
+                       <label for="delay"/>
+                       <div>
+                           <field name="delay" class="oe_inline"/> days
+                       </div>
+                   </xpath>
+                   <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='address_allotment_id']" position="after">
+                       <field name="property_ids" widget="many2many_tags"
+                            groups="sale.group_mrp_properties"/>
+                   </xpath>
+                   <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/group/group/field[@name='tax_id']" position="before">
+                       <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_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" groups="product.group_stock_packaging"  />
+                   </xpath>
+                   <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/form[@string='Sales Order Lines']/div/field[@name='invoice_lines']" position="after">
+                       <label for="move_ids"/>
+                       <field name="move_ids" widget="many2many"/>
+                   </xpath>
+                   <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/tree[@string='Sales Order Lines']/field[@name='sequence']" position="after">
+                       <field name="delay" invisible="1"/>
+                   </xpath>
+                   <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/tree[@string='Sales Order Lines']/field[@name='tax_id']" position="after">
+                       <field name="type" invisible="1"/>
+                   </xpath>
+                   <xpath expr="//page[@string='Order Lines']/field[@name='order_line']/tree[@string='Sales Order Lines']/field[@name='th_weight']" position="after">
+                       <field name="product_packaging" invisible="1"/>
+                   </xpath>
+                   <xpath expr="//group[@name='sales_person']" position="before">
+                        <group name="logistics">
+                            <field name="incoterm" widget="selection" groups="base.group_user"/>
+                            <field name="picking_policy" required="True"/>
+                            <field name="order_policy" on_change="shipping_policy_change(order_policy)"/>
+                            <field name="invoice_quantity" invisible="True"/>
+                        </group>
+                   </xpath>
+                </data>
+           </field>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/sale_stock/sale_stock_workflow.xml b/addons/sale_stock/sale_stock_workflow.xml
new file mode 100644
index 00000000000..bb40661ba0f
--- /dev/null
+++ b/addons/sale_stock/sale_stock_workflow.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        
+        <!-- Activity -->
+        
+        <record id="act_wait_ship" model="workflow.activity">
+            <field name="wkf_id" ref="sale.wkf_sale"/>
+            <field name="name">wait_ship</field>
+        </record>
+        
+        <record id="act_cancel3" model="workflow.activity">
+            <field name="wkf_id" ref="sale.wkf_sale"/>
+            <field name="name">cancel3</field>
+            <field name="flow_stop">True</field>
+            <field name="kind">stopall</field>
+            <field name="action">action_cancel()</field>
+        </record>
+        
+        <record id="act_ship" model="workflow.activity">
+            <field name="wkf_id" ref="sale.wkf_sale"/>
+            <field name="name">ship</field>
+            <field name="kind">function</field>
+            <field name="action">action_ship_create()</field>
+        </record>
+
+        <record id="act_ship_except" model="workflow.activity">
+            <field name="wkf_id" ref="sale.wkf_sale"/>
+            <field name="name">ship_except</field>
+            <field name="kind">function</field>
+            <field name="action">write({'state':'shipping_except'})</field>
+        </record>
+        
+        <record id="act_ship_end" model="workflow.activity">
+            <field name="wkf_id" ref="sale.wkf_sale"/>
+            <field name="name">ship_end</field>
+            <field name="kind">function</field>
+            <field name="action">action_ship_end()</field>
+        </record>
+        
+        <record id="act_ship_cancel" model="workflow.activity">
+            <field name="wkf_id" ref="sale.wkf_sale"/>
+            <field name="name">ship_cancel</field>
+            <field name="flow_stop">True</field>
+            <field name="kind">stopall</field>
+            <field name="action">action_cancel()</field>
+        </record>
+        
+        <!-- Transistion -->
+        
+        <record id="trans_router_wait_ship" model="workflow.transition">
+            <field name="act_from" ref="sale.act_router"/>
+            <field name="act_to" ref="act_wait_ship"/>
+        </record>
+        
+        <record id="trans_router_wait_invoice_shipping" model="workflow.transition">
+            <field name="act_from" ref="sale.act_wait_invoice"/>
+            <field name="act_to" ref="sale.act_invoice_end"/>
+            <field name="condition">(order_policy=='picking')</field>
+        </record>
+
+        <record id="trans_wait_invoice_invoice" model="workflow.transition">
+            <field name="act_from" ref="sale.act_wait_invoice"/>
+            <field name="act_to" ref="sale.act_invoice"/>
+            <field name="condition">order_policy=='prepaid'</field>
+        </record>
+        
+        <record id="trans_wait_ship_cancel3" model="workflow.transition">
+            <field name="act_from" ref="act_wait_ship"/>
+            <field name="act_to" ref="act_cancel3"/>
+            <field name="signal">cancel</field>
+        </record>
+
+        <record id="trans_wait_ship_ship" model="workflow.transition">
+            <field name="act_from" ref="act_wait_ship"/>
+            <field name="act_to" ref="act_ship"/>
+            <field name="condition">(order_policy!='prepaid') or invoiced</field>
+        </record>
+        
+        <record id="trans_ship_end_done" model="workflow.transition">
+            <field name="act_from" ref="act_ship_end"/>
+            <field name="act_to" ref="sale.act_done"/>
+        </record>
+        
+        <record id="trans_ship_ship_end" model="workflow.transition">
+            <field name="act_from" ref="act_ship"/>
+            <field name="act_to" ref="act_ship_end"/>
+            <field name="trigger_model">procurement.order</field>
+            <field name="trigger_expr_id">procurement_lines_get()</field>
+            <field name="condition">test_state('finished')</field>
+        </record>
+        
+        <record id="trans_ship_ship_except" model="workflow.transition">
+            <field name="act_from" ref="act_ship"/>
+            <field name="act_to" ref="act_ship_except"/>
+            <field name="condition">test_state('canceled')</field>
+        </record>
+        
+        
+        <record id="trans_ship_except_ship" model="workflow.transition">
+            <field name="act_from" ref="act_ship_except"/>
+            <field name="act_to" ref="act_ship"/>
+            <field name="signal">ship_recreate</field>
+        </record>
+        
+        <record id="trans_ship_except_ship_end" model="workflow.transition">
+            <field name="act_from" ref="act_ship_except"/>
+            <field name="act_to" ref="act_ship_end"/>
+            <field name="signal">ship_corrected</field>
+        </record>
+        
+        <record id="trans_ship_except_ship_cancel" model="workflow.transition">
+            <field name="act_from" ref="act_ship_except"/>
+            <field name="act_to" ref="act_ship_cancel"/>
+            <field name="signal">ship_cancel</field>
+        </record>
+        
+    </data>
+</openerp>
diff --git a/addons/sale_stock/security/ir.model.access.csv b/addons/sale_stock/security/ir.model.access.csv
new file mode 100644
index 00000000000..5fb48828d8f
--- /dev/null
+++ b/addons/sale_stock/security/ir.model.access.csv
@@ -0,0 +1,16 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_stock_picking_salesman,stock_picking salesman,stock.model_stock_picking,base.group_sale_salesman,1,1,1,0
+access_stock_move_salesman,stock_move salesman,stock.model_stock_move,base.group_sale_salesman,1,1,1,0
+access_stock_move_manager,stock_move manager,stock.model_stock_move,base.group_sale_manager,1,1,1,1
+access_procurement_salesman,procurement.order salesman,procurement.model_procurement_order,base.group_sale_salesman,1,1,1,0
+access_procurement_manager,procurement.order manager,procurement.model_procurement_order,base.group_sale_manager,1,1,1,1
+access_sale_order_stock_worker,sale.order stock worker,model_sale_order,stock.group_stock_user,1,1,0,0
+access_sale_order_line_stock_worker,sale.order.line stock worker,model_sale_order_line,stock.group_stock_user,1,1,0,0
+access_report_stock_move_sales,report.stock.move.sale,stock.model_report_stock_move,base.group_sale_manager,1,1,1,1
+access_stock_picking_sales,stock.picking.sales,stock.model_stock_picking,base.group_sale_manager,1,1,1,1
+access_product_packaging_user,product.packaging.user,product.model_product_packaging,base.group_sale_salesman,1,1,1,0
+access_product_packaging_manager,product.packaging.manager,product.model_product_packaging,base.group_sale_manager,1,0,0,0
+access_stock_warehouse_user,stock.warehouse.user,stock.model_stock_warehouse,base.group_sale_salesman,1,0,0,0
+access_stock_location_user,stock.location.user,stock.model_stock_location,base.group_sale_salesman,1,0,0,0
+access_product_packaging_sale_manager,product.packaging salemanager,product.model_product_packaging,base.group_sale_manager,1,1,1,1
+access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0
\ No newline at end of file
diff --git a/addons/sale_stock/security/sale_stock_security.xml b/addons/sale_stock/security/sale_stock_security.xml
new file mode 100644
index 00000000000..7f93084d43d
--- /dev/null
+++ b/addons/sale_stock/security/sale_stock_security.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+    
+    <record id="group_invoice_deli_orders" model="res.groups">
+        <field name="name">Enable Invoicing Delivery orders</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+    
+    </data>
+</openerp>
diff --git a/addons/sale/stock.py b/addons/sale_stock/stock.py
similarity index 89%
rename from addons/sale/stock.py
rename to addons/sale_stock/stock.py
index c4e505a80e8..6fc5c061dda 100644
--- a/addons/sale/stock.py
+++ b/addons/sale_stock/stock.py
@@ -153,13 +153,14 @@ class stock_picking(osv.osv):
                 inv_name = picking.sale_id.client_order_ref + " : " + invoice_created.name
                 invoice_obj.write(cursor, user, [invoice_created.id], {'name': inv_name}, context=context)
             for sale_line in sale_lines:
+                account_id = False
+                if not type:
+                    type = context.get('inv_type', False)
+                if group:
+                    name = picking.name + '-' + sale_line.name
+                else:
+                    name = sale_line.name
                 if sale_line.product_id.type == 'service' and sale_line.invoiced == False:
-                    if not type:
-                        type = context.get('inv_type', False)
-                    if group:
-                        name = picking.name + '-' + sale_line.name
-                    else:
-                        name = sale_line.name
                     if type in ('out_invoice', 'out_refund'):
                         account_id = sale_line.product_id.product_tmpl_id.\
                                 property_account_income.id
@@ -173,16 +174,16 @@ class stock_picking(osv.osv):
                             account_id = sale_line.product_id.categ_id.\
                                     property_account_expense_categ.id
 
-                    vals = order_line_obj._prepare_order_line_invoice_line(cursor, user, sale_line, account_id, context)
-                    if vals: #note: in some cases we may not want to include all service lines as invoice lines
-                        vals['name'] = name
-                        vals['account_analytic_id'] = self._get_account_analytic_invoice(cursor, user, picking, sale_line)
-                        vals['invoice_id'] = invoices[result[picking.id]].id
-                        invoice_line_id = invoice_line_obj.create(cursor, user, vals, context=context)
-                        order_line_obj.write(cursor, user, [sale_line.id], {
-                            'invoiced': True,
-                            'invoice_lines': [(6, 0, [invoice_line_id])],
-                        })
+                vals = order_line_obj._prepare_order_line_invoice_line(cursor, user, sale_line, account_id, context)
+                if vals: #note: in some cases we may not want to include all service lines as invoice lines
+                    vals['name'] = name
+                    vals['account_analytic_id'] = self._get_account_analytic_invoice(cursor, user, picking, sale_line)
+                    vals['invoice_id'] = invoices[result[picking.id]].id
+                    invoice_line_id = invoice_line_obj.create(cursor, user, vals, context=context)
+                    order_line_obj.write(cursor, user, [sale_line.id], {
+                        'invoiced': True,
+                        'invoice_lines': [(6, 0, [invoice_line_id])],
+                    })
         return result
 
 # Redefinition of the new field in order to update the model stock.picking.out in the orm
diff --git a/addons/sale/stock_view.xml b/addons/sale_stock/stock_view.xml
similarity index 93%
rename from addons/sale/stock_view.xml
rename to addons/sale_stock/stock_view.xml
index eb0f1e415f5..d06526902fd 100644
--- a/addons/sale/stock_view.xml
+++ b/addons/sale_stock/stock_view.xml
@@ -9,9 +9,6 @@
                 <field name="move_type" position="before">
                     <field name="sale_id"/>
                 </field>
-                <label for="partner_id" position="replace">
-                    <label for="partner_id" class="oe_edit_only" string="Contact"/>
-                </label>
             </field>
         </record>
 
@@ -74,7 +71,7 @@
             <field name="context">{'default_type': 'out', 'contact_display': 'partner_address', 'search_default_to_invoice': 1, 'search_default_done': 1, 'default_invoice_state': '2binvoiced'}</field>
             <field name="search_view_id" ref="stock.view_picking_out_search"/>
         </record>
-        <menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="base.menu_invoiced" groups="sale.group_invoice_deli_orders" sequence="20"/>
+        <menuitem action="outgoing_picking_list_to_invoice" id="menu_action_picking_list_to_invoice" parent="base.menu_invoiced" groups="sale_stock.group_invoice_deli_orders" sequence="20"/>
 
     </data>
 </openerp>
diff --git a/addons/sale_stock/test/cancel_order_sale_stock.yml b/addons/sale_stock/test/cancel_order_sale_stock.yml
new file mode 100644
index 00000000000..6805a90ca80
--- /dev/null
+++ b/addons/sale_stock/test/cancel_order_sale_stock.yml
@@ -0,0 +1,72 @@
+-
+  In order to test the cancel sale order.
+  First I confirm order.
+-
+  !workflow {model: sale.order, action: order_confirm, ref: sale.sale_order_8}
+-
+  I send delivery in two shipments, so I am doing a partial delivery order.
+-
+  !python {model: stock.picking}: |
+    delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale.sale_order_8"))])
+    first_picking = self.browse(cr, uid, delivery_orders[0], context=context)
+    if first_picking.force_assign(cr, uid, first_picking):
+      first_move = first_picking.move_lines[0]
+      values = {'move%s'%(first_move.id): {'product_qty': 2, 'product_uom':ref('product.product_uom_unit')}}
+      first_picking.do_partial(values, context=context)
+-
+  Now I cancel latest shipment.
+-
+  !python {model: stock.picking}: |
+    import netsvc
+    delivery_orders = self.search(cr, uid, [('sale_id','=',ref("sale.sale_order_8"))])
+    last_delivery_order_id = delivery_orders[0]
+    wf_service = netsvc.LocalService("workflow")
+    wf_service.trg_validate(uid, 'stock.picking', last_delivery_order_id, 'button_cancel', cr)
+-
+  I run the scheduler.
+-
+  !python {model: procurement.order}: |
+
+     self.run_scheduler(cr, uid)
+-
+  I check order status in "Ship Exception".
+-
+  !assert {model: sale.order, id: sale.sale_order_8, string: Sale order should be in shipping exception}:
+    - state == "shipping_except"
+-
+  Now I regenerate shipment.
+-
+  !workflow {model: sale.order, action: ship_recreate, ref: sale.sale_order_8}
+-
+  I check state of order in 'To Invoice'.
+-
+  !assert {model: sale.order, id: sale.sale_order_8, string: Sale order should be In Progress state}:
+    - state == 'manual'
+-
+  I make invoice for order.
+-
+  !workflow {model: sale.order, action: manual_invoice, ref: sale.sale_order_8}
+-
+  To cancel the sale order from Invoice Exception, I have to cancel the invoice of sale order.
+-
+  !python {model: sale.order}: |
+    import netsvc
+    invoice_ids = self.browse(cr, uid, ref("sale.sale_order_8")).invoice_ids
+    wf_service = netsvc.LocalService("workflow")
+    first_invoice_id = invoice_ids[0]
+    wf_service.trg_validate(uid, 'account.invoice', first_invoice_id.id, 'invoice_cancel', cr)
+-
+  I check order status in "Invoice Exception" and related invoice is in cancel state.
+-
+  !assert {model: sale.order, id: sale.sale_order_8, string: Sale order should be in Invoice Exception state}:
+    - state == "invoice_except", "Order should be in Invoice Exception state after cancel Invoice"
+-
+  Then I click on the Ignore Exception button.
+-
+  !workflow {model: sale.order, action: invoice_corrected, ref: sale.sale_order_8}
+
+-
+  I check state of order in 'In Progress'.
+-
+  !assert {model: sale.order, id: sale.sale_order_8, string: Sale order should be In progress state}:
+    - state == 'progress'
\ No newline at end of file
diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale_stock/test/picking_order_policy.yml
similarity index 93%
rename from addons/sale/test/picking_order_policy.yml
rename to addons/sale_stock/test/picking_order_policy.yml
index aca8e14c0b5..af24bd20483 100644
--- a/addons/sale/test/picking_order_policy.yml
+++ b/addons/sale_stock/test/picking_order_policy.yml
@@ -3,17 +3,17 @@
 -
   First I check the total amount of the Quotation before Approved.
 -
-  !assert {model: sale.order, id: sale_order_6, string: The amount of the Quotation is not correctly computed}:
+  !assert {model: sale.order, id: sale.sale_order_6, string: The amount of the Quotation is not correctly computed}:
     - sum([l.price_subtotal for l in order_line]) == amount_untaxed
 -
   I confirm the quotation with Invoice based on deliveries policy.
 -
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_6}
+  !workflow {model: sale.order, action: order_confirm, ref: sale.sale_order_6}
 -
   I check that invoice should not created before dispatch delivery.
 -
   !python {model: sale.order}: |
-    order = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_6"))
+    order = self.pool.get('sale.order').browse(cr, uid, ref("sale.sale_order_6"))
     assert order.state == 'progress', 'Order should be in inprogress.'
     assert len(order.invoice_ids) == False, "Invoice should not created."
 -
@@ -23,7 +23,7 @@
     from datetime import datetime, timedelta
     from dateutil.relativedelta import relativedelta
     from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
-    order = self.browse(cr, uid, ref("sale_order_6"))
+    order = self.browse(cr, uid, ref("sale.sale_order_6"))
     for order_line in order.order_line:
         procurement = order_line.procurement_id
         date_planned = datetime.strptime(order.date_order, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=order_line.delay or 0.0)
@@ -45,7 +45,7 @@
     from datetime import datetime, timedelta
     from dateutil.relativedelta import relativedelta
     from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
-    sale_order = self.browse(cr, uid, ref("sale_order_6"))
+    sale_order = self.browse(cr, uid, ref("sale.sale_order_6"))
     assert sale_order.picking_ids, "Delivery order is not created."
     for picking in sale_order.picking_ids:
       assert picking.state == "auto" or "confirmed", "Delivery order should be in 'Waitting Availability' state."
@@ -77,7 +77,7 @@
   Now, I dispatch delivery order.
 -
   !python {model: stock.partial.picking}: |
-    order = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_6"))
+    order = self.pool.get('sale.order').browse(cr, uid, ref("sale.sale_order_6"))
     for pick in order.picking_ids:
         data = pick.force_assign()
         if data == True:
@@ -87,7 +87,7 @@
   I check sale order to verify shipment.
 -
   !python {model: sale.order}: |
-    order = self.pool.get('sale.order').browse(cr, uid, ref("sale_order_6"))
+    order = self.pool.get('sale.order').browse(cr, uid, ref("sale.sale_order_6"))
     assert order.shipped == True, "Sale order is not Delivered."
     assert order.picked_rate == 100, "Shipment progress is not 100%."
     #assert order.state == 'progress', 'Order should be in inprogress.'
@@ -97,7 +97,7 @@
 -
   !python {model: stock.invoice.onshipping}: |
     sale = self.pool.get('sale.order')
-    sale_order = sale.browse(cr, uid, ref("sale_order_6"))
+    sale_order = sale.browse(cr, uid, ref("sale.sale_order_6"))
     ship_ids = [x.id for x in sale_order.picking_ids]
     wiz_id = self.create(cr, uid, {'journal_id': ref('account.sales_journal')},
       {'active_ids': ship_ids, 'active_model': 'stock.picking'})
@@ -106,7 +106,7 @@
   I check the invoice details after dispatched delivery.
 -
   !python {model: sale.order}: |
-    order = self.browse(cr, uid, ref("sale_order_6"))
+    order = self.browse(cr, uid, ref("sale.sale_order_6"))
     assert order.invoice_ids, "Invoice is not created."
     ac = order.partner_id.property_account_receivable.id
     journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale'), ('company_id', '=', order.company_id.id)])
@@ -134,7 +134,7 @@
   !python {model: sale.order}: |
     import netsvc
     wf_service = netsvc.LocalService("workflow")
-    so = self.browse(cr, uid, ref("sale_order_6"))
+    so = self.browse(cr, uid, ref("sale.sale_order_6"))
     for invoice in so.invoice_ids:
       wf_service.trg_validate(uid, 'account.invoice', invoice.id, 'invoice_open', cr)
 -
@@ -142,7 +142,7 @@
 -
   !python {model: account.invoice}: |
     sale_order = self.pool.get('sale.order')
-    order = sale_order.browse(cr, uid, ref("sale_order_6"))
+    order = sale_order.browse(cr, uid, ref("sale.sale_order_6"))
     journal_ids = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'cash'), ('company_id', '=', order.company_id.id)], limit=1)
     for invoice in order.invoice_ids:
         invoice.pay_and_reconcile(
@@ -154,7 +154,7 @@
   I check the order after paid invoice.
 -
   !python {model: sale.order}: |
-    order = self.browse(cr, uid, ref("sale_order_6"))
+    order = self.browse(cr, uid, ref("sale.sale_order_6"))
     assert order.invoiced == True, "Sale order is not invoiced."
     assert order.invoiced_rate == 100, "Invoiced progress is not 100%."
     assert order.state == 'done', 'Order should be in closed.'
@@ -163,7 +163,7 @@
 -
   !python {model: sale.order}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.sale.order').create(cr, uid, [ref('sale_order_6')], {}, {})
+    (data, format) = netsvc.LocalService('report.sale.order').create(cr, uid, [ref('sale.sale_order_6')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'sale-sale_order.'+format), 'wb+').write(data)
 
diff --git a/addons/sale/test/prepaid_order_policy.yml b/addons/sale_stock/test/prepaid_order_policy.yml
similarity index 83%
rename from addons/sale/test/prepaid_order_policy.yml
rename to addons/sale_stock/test/prepaid_order_policy.yml
index fb51880a724..e35a9a82cf9 100644
--- a/addons/sale/test/prepaid_order_policy.yml
+++ b/addons/sale_stock/test/prepaid_order_policy.yml
@@ -1,11 +1,12 @@
 -
   Now I confirm the Quotation with "Pay before delivery" policy.
 -
-  !workflow {model: sale.order, action: order_confirm, ref: sale_order_4}
+  !workflow {model: sale.order, action: order_confirm, ref: sale.sale_order_4}
 -
   I check that delivery order should not created before invoice is paid.
 -
   !python {model: sale.order}: |
-    sale_order = self.browse(cr, uid, ref("sale_order_4"))
+    sale_order = self.browse(cr, uid, ref("sale.sale_order_4"))
     assert len(sale_order.picking_ids) == False, "Delivery order should not created before invoice."
     assert sale_order.invoice_ids, "Invoice should be created."
+
diff --git a/addons/sale_stock/test/sale_order_onchange.yml b/addons/sale_stock/test/sale_order_onchange.yml
new file mode 100644
index 00000000000..1026e5627c3
--- /dev/null
+++ b/addons/sale_stock/test/sale_order_onchange.yml
@@ -0,0 +1,22 @@
+-
+  In order to test the onchange of the Sale Order, I create a product
+-
+  !record {model: product.product, id: product_onchange1}:
+    name: 'Devil Worship Book'
+    list_price: 66.6
+    procure_method: 'make_to_order'
+-
+  Now i create a sale order that uses my new product
+-
+  !record {model: sale.order, id: sale_order_onchange1}:
+    partner_id: base.res_partner_2
+    order_line:
+      - product_id: sale_stock.product_onchange1
+        product_uom_qty: 10
+-
+  I verify that the onchange of product on sale order line was correctly triggered
+-
+  !assert {model: sale.order, id: sale_order_onchange1, string: The onchange function of product was not correctly triggered}:
+    - order_line[0].name == u'Devil Worship Book'
+    - order_line[0].price_unit == 66.6
+    - order_line[0].type == 'make_to_order'
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index f79024fa1c7..94eccba2a56 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -22,12 +22,12 @@
 
 
 {
-    "name" : "Share any Document",
-    "version" : "2.0",
-    "depends" : ["base", "mail"],
-    "author" : "OpenERP SA",
-    "category": 'Tools',
-    "description": """
+    'name' : 'Share any Document',
+    'version' : '2.0',
+    'depends' : ['base', 'mail'],
+    'author' : 'OpenERP SA',
+    'category': 'Tools',
+    'description': """
 This module adds generic sharing tools to your current OpenERP database.
 ========================================================================
 
@@ -42,7 +42,7 @@ This is extremely useful for collaborative work, knowledge sharing,
 synchronization with other companies.
     """,
     'website': 'http://www.openerp.com',
-    'demo_xml': ['share_demo.xml'],
+    'demo': ['share_demo.xml'],
     'data': [
         'security/share_security.xml',
         'res_users_view.xml',
@@ -50,12 +50,9 @@ synchronization with other companies.
     ],
     'installable': True,
     'web': True,
-    'certificate' : '001301246528927038493',
     'js': ['static/src/js/share.js'],
     'css': ['static/src/css/share.css'],
-    'qweb' : [
-        "static/src/xml/*.xml",
-    ],
+    'qweb' : ['static/src/xml/*.xml'],
     'images': ['images/share_wizard.jpeg','images/sharing_wizard_step1.jpeg', 'images/sharing_wizard_step2.jpeg'],
 }
 
diff --git a/addons/share/i18n/ar.po b/addons/share/i18n/ar.po
index 321fac7ad49..69eb799c181 100644
--- a/addons/share/i18n/ar.po
+++ b/addons/share/i18n/ar.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-01-13 21:14+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-10-08 15:06+0000\n"
+"Last-Translator: almodhesh <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -25,7 +25,7 @@ msgstr "عرض العنوان"
 #. module: share
 #: view:share.wizard:0
 msgid "Access granted!"
-msgstr ""
+msgstr "منح الوصول!"
 
 #. module: share
 #: field:share.wizard,user_type:0
@@ -50,13 +50,15 @@ msgstr "مشاركة"
 #. module: share
 #: field:share.wizard,share_root_url:0
 msgid "Share Access URL"
-msgstr ""
+msgstr "مشاركة الوصول URL"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:782
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
+"يمكنك استخدام معلومات تسجيل الدخول الخاصة بك الحالية(%s) وكلمة المرور "
+"لعرضها.\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:601
@@ -83,24 +85,25 @@ msgstr ""
 #. module: share
 #: field:share.wizard,embed_url:0 field:share.wizard.result.line,share_url:0
 msgid "Share URL"
-msgstr ""
+msgstr "مشاركة URL"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:776
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
-msgstr ""
+msgstr "هذا هو اعتمادك للوصول إلى هذه المناطق المحمية\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:643
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard"
 msgstr ""
+"يجب أن تكون عضوا في المجموعة مشاركة / المستخدم لاستخدام مشاركة صندوق الحوار"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Access info"
-msgstr ""
+msgstr "معلومات الولوج"
 
 #. module: share
 #: view:share.wizard:0
@@ -111,12 +114,12 @@ msgstr "حصة"
 #: code:addons/share/wizard/share_wizard.py:551
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
-msgstr ""
+msgstr "(تكرار للحصول على أذونات مشاركة تعديل)"
 
 #. module: share
 #: help:share.wizard,domain:0
 msgid "Optional domain for further data filtering"
-msgstr ""
+msgstr "المجال اختياري لمزيد من بيانات التصفية"
 
 #. module: share
 #: sql_constraint:res.users:0
@@ -159,7 +162,7 @@ msgstr "إغلاق"
 #: code:addons/share/wizard/share_wizard.py:640
 #, python-format
 msgid "Action and Access Mode are required to create a shared access"
-msgstr ""
+msgstr "نمط الإجراء والوصول لإنشاء مشاركة الوصول"
 
 #. module: share
 #: view:share.wizard:0
@@ -167,6 +170,7 @@ msgid ""
 "Please select the action that opens the screen containing the data you want "
 "to share."
 msgstr ""
+"الرجاء اختيار الإجراء الذي يفتح شاشة تحتوي على البيانات التي تريد مشاركتها."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:781
@@ -174,7 +178,7 @@ msgstr ""
 msgid ""
 "The documents have been automatically added to your current OpenERP "
 "documents.\n"
-msgstr ""
+msgstr "المستندات تمت إضافتها بشكل تلقائي لمستندات اوبن اي ار بي الخاصة بك\n"
 
 #. module: share
 #: view:share.wizard:0
@@ -184,7 +188,7 @@ msgstr "إلغاء"
 #. module: share
 #: field:res.groups,share:0
 msgid "Share Group"
-msgstr ""
+msgstr "مشاركة المجموعة"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:763
@@ -197,12 +201,12 @@ msgstr "لا بدّ من ذكر عنوان بريد إلكتروني"
 msgid ""
 "Optionally, you may specify an additional domain restriction that will be "
 "applied to the shared data."
-msgstr ""
+msgstr "اختيارياً، اختيار محدودية مجال لتطبيقها على المعلومات المشاركة."
 
 #. module: share
 #: help:share.wizard,name:0
 msgid "Title for the share (displayed to users as menu and shortcut name)"
-msgstr ""
+msgstr "عنوان المشاركة (تعرض للمستخدمين كقائمة واسم مختصر)"
 
 #. module: share
 #: view:share.wizard:0
@@ -212,7 +216,7 @@ msgstr "خيارات"
 #. module: share
 #: view:res.groups:0
 msgid "Regular groups only (no share groups"
-msgstr ""
+msgstr "المجموعات المنتظمة فقط( لا مجموعات مشاركة)"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:787
@@ -222,27 +226,32 @@ msgid ""
 "Sales, HR, etc.)\n"
 "It is open source and can be found on http://www.openerp.com."
 msgstr ""
+"OpenERP هي قوية ومجموعة من تطبيقات الأعمال سهل الاستعمال(إدارة علاقات "
+"العملاء,المبيعات, موارد بشرية, الخ.)\n"
+"هي مفتوحة المصدر ويمكنك الوصول إليها عن طريق هذا الرابط "
+"http://www.openerp.com."
 
 #. module: share
 #: field:share.wizard,action_id:0
 msgid "Action to share"
-msgstr ""
+msgstr "إجراء للمشاركة"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Optional: include a personal message"
-msgstr ""
+msgstr "اختياري: تضمين رسالة خاصة"
 
 #. module: share
 #: field:res.users,share:0
 msgid "Share User"
-msgstr ""
+msgstr "مشاركة المستخدم"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:647
 #, python-format
 msgid "Please indicate the emails of the persons to share with, one per line"
 msgstr ""
+"يرجى الإشارة إلى رسائل البريد الإلكتروني للأشخاص للمشاركة معه، واحد في كل سطر"
 
 #. module: share
 #: field:share.wizard,embed_code:0 field:share.wizard.result.line,user_id:0
@@ -252,13 +261,13 @@ msgstr "مجهول"
 #. module: share
 #: help:res.groups,share:0
 msgid "Group created to set access rights for sharing data with some users."
-msgstr ""
+msgstr "إنشاء مجموعة لتعيين حقوق الوصول لتبادل البيانات مع بعض المستخدمين."
 
 #. module: share
 #: help:share.wizard,action_id:0
 msgid ""
 "The action that opens the screen containing the data you wish to share."
-msgstr ""
+msgstr "الإجراء الذي يفتح شاشة تحتوي على البيانات التي ترغب في مشاركتها."
 
 #. module: share
 #: constraint:res.users:0
@@ -270,12 +279,12 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:526
 #, python-format
 msgid "(Copy for sharing)"
-msgstr ""
+msgstr "(نسخة من المشاركة)"
 
 #. module: share
 #: field:share.wizard.result.line,newly_created:0
 msgid "Newly created"
-msgstr ""
+msgstr "منشأة حديثاً"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:616
@@ -292,7 +301,7 @@ msgstr ""
 #. module: share
 #: help:share.wizard,share_root_url:0
 msgid "Main access page for users that are granted shared access"
-msgstr ""
+msgstr "صفحة الوصول الرئيسية للمستخدمين لضمان مشاركة الوصول"
 
 #. module: share
 #: sql_constraint:res.groups:0
@@ -343,12 +352,12 @@ msgstr "ملخّص"
 #: code:addons/share/wizard/share_wizard.py:493
 #, python-format
 msgid "Copied access for sharing"
-msgstr ""
+msgstr "نسخ الوصول للمشاركة"
 
 #. module: share
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 msgid "Share your documents"
-msgstr ""
+msgstr "مشاركة المستندات الخاصة بك"
 
 #. module: share
 #: view:share.wizard:0
@@ -370,22 +379,22 @@ msgstr "share.wizard.result.line"
 #. module: share
 #: help:share.wizard,user_type:0
 msgid "Select the type of user(s) you would like to share data with."
-msgstr ""
+msgstr "استخدم نوع المستخدم الذي تود مشاركة المعلومات معه"
 
 #. module: share
 #: field:share.wizard,view_type:0
 msgid "Current View Type"
-msgstr ""
+msgstr "نوع عرض الحالي"
 
 #. module: share
 #: selection:share.wizard,access_mode:0
 msgid "Can view"
-msgstr ""
+msgstr "امكانية المشاهدة"
 
 #. module: share
 #: selection:share.wizard,access_mode:0
 msgid "Can edit"
-msgstr ""
+msgstr "امكانية التعديل"
 
 #. module: share
 #: help:share.wizard,message:0
@@ -528,3 +537,10 @@ msgstr "مشاركة مع..."
 
 #~ msgid "Share with these people (one e-mail per line)"
 #~ msgstr "المشاركة مع هؤلاء الناس (بريد إلكتروني واحد في كل سطر)"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr "رسالة اختيارية شخصية، ليتم تضمينها في اخطار البريد الإلكتروني."
+
+#~ msgid "Use this link"
+#~ msgstr "استخدم هذا الرابط"
diff --git a/addons/share/i18n/bg.po b/addons/share/i18n/bg.po
index 3123368925a..4f059203132 100644
--- a/addons/share/i18n/bg.po
+++ b/addons/share/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/ca.po b/addons/share/i18n/ca.po
index 114b3045288..9a16c1d2689 100644
--- a/addons/share/i18n/ca.po
+++ b/addons/share/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/cs.po b/addons/share/i18n/cs.po
index 67b3cb8d2c8..d1e438aa4a9 100644
--- a/addons/share/i18n/cs.po
+++ b/addons/share/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: share
diff --git a/addons/share/i18n/da.po b/addons/share/i18n/da.po
index 8dc5e835007..9a0de1e7a28 100644
--- a/addons/share/i18n/da.po
+++ b/addons/share/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/de.po b/addons/share/i18n/de.po
index a2e31e0c23d..d77e63175cc 100644
--- a/addons/share/i18n/de.po
+++ b/addons/share/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/es.po b/addons/share/i18n/es.po
index 7dc14a87663..d5fae160bd5 100644
--- a/addons/share/i18n/es.po
+++ b/addons/share/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/es_CR.po b/addons/share/i18n/es_CR.po
index 8954fa8f44c..beb8935900c 100644
--- a/addons/share/i18n/es_CR.po
+++ b/addons/share/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: share
diff --git a/addons/share/i18n/fi.po b/addons/share/i18n/fi.po
index fcc6ba40dac..64ac58c2e3e 100644
--- a/addons/share/i18n/fi.po
+++ b/addons/share/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/fr.po b/addons/share/i18n/fr.po
index c5c2abaf54f..8fb7ed69085 100644
--- a/addons/share/i18n/fr.po
+++ b/addons/share/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/gl.po b/addons/share/i18n/gl.po
index 021d0f2477f..0aa686e7830 100644
--- a/addons/share/i18n/gl.po
+++ b/addons/share/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/hr.po b/addons/share/i18n/hr.po
index e81fd1bdffb..b2af3c150ff 100644
--- a/addons/share/i18n/hr.po
+++ b/addons/share/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/hu.po b/addons/share/i18n/hu.po
index 418114a4098..c1450a0efbf 100644
--- a/addons/share/i18n/hu.po
+++ b/addons/share/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/it.po b/addons/share/i18n/it.po
index 3e5dfb54fea..37f837c1220 100644
--- a/addons/share/i18n/it.po
+++ b/addons/share/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/ja.po b/addons/share/i18n/ja.po
index 923a964effd..f1b026f6239 100644
--- a/addons/share/i18n/ja.po
+++ b/addons/share/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/mn.po b/addons/share/i18n/mn.po
index c0a35c205f2..0090212d5a9 100644
--- a/addons/share/i18n/mn.po
+++ b/addons/share/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/nl.po b/addons/share/i18n/nl.po
index 71c2ccd7f48..c1d7854b15e 100644
--- a/addons/share/i18n/nl.po
+++ b/addons/share/i18n/nl.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-28 12:52+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"PO-Revision-Date: 2012-09-03 17:14+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <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: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
@@ -384,6 +384,7 @@ msgid ""
 "An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
+"Een e-mail bevestiging met instructies is verzonden naar de volgende mensen:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -415,6 +416,8 @@ msgstr "Kan bewerken"
 msgid ""
 "An optional personal message, to be included in the email notification."
 msgstr ""
+"Een optionele persoonlijk bericht, welke kan worden toegevoegd in de e-mail "
+"bevestiging."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -532,6 +535,8 @@ msgid ""
 "You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
+"U dient u e-mail adres in te stellen in uw gebruikersinstellingen, voordat u "
+"de 'share' knop kunt gebruiken."
 
 #. module: share
 #: help:share.wizard,access_mode:0
diff --git a/addons/share/i18n/pl.po b/addons/share/i18n/pl.po
index ee15f1e1391..4541586e6fc 100644
--- a/addons/share/i18n/pl.po
+++ b/addons/share/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/pt.po b/addons/share/i18n/pt.po
index 815da424225..e1403c904ef 100644
--- a/addons/share/i18n/pt.po
+++ b/addons/share/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/pt_BR.po b/addons/share/i18n/pt_BR.po
index 803f9f5f29d..1e78148465f 100644
--- a/addons/share/i18n/pt_BR.po
+++ b/addons/share/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/ro.po b/addons/share/i18n/ro.po
index 8dfc3ee799e..348681a6efe 100644
--- a/addons/share/i18n/ro.po
+++ b/addons/share/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/ru.po b/addons/share/i18n/ru.po
index f911a18ea17..2c8937f96a4 100644
--- a/addons/share/i18n/ru.po
+++ b/addons/share/i18n/ru.po
@@ -8,39 +8,39 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-04-26 05:57+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-09-10 14:15+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
 msgid "Display title"
-msgstr ""
+msgstr "Показ заголовка"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Access granted!"
-msgstr ""
+msgstr "Доступ предоставлен!"
 
 #. module: share
 #: field:share.wizard,user_type:0
 msgid "Sharing method"
-msgstr ""
+msgstr "Метод совместного доступа"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Share with these People (one email per line)"
-msgstr ""
+msgstr "Совместный доступ с этими людьми (один эл.адрес в строке)"
 
 #. module: share
 #: field:share.wizard,name:0
 msgid "Share Title"
-msgstr ""
+msgstr "Заголовок совместного доступа"
 
 #. module: share
 #: model:ir.module.category,name:share.module_category_share
@@ -50,19 +50,20 @@ msgstr "Совместный доступ"
 #. module: share
 #: field:share.wizard,share_root_url:0
 msgid "Share Access URL"
-msgstr ""
+msgstr "Адрес(URL) совместного доступа"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:782
 #, python-format
 msgid "You may use your current login (%s) and password to view them.\n"
 msgstr ""
+"Вы можете использовать ваш текущий логин (%s) и пароль, для их просмотра.\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:601
 #, python-format
 msgid "(Modified)"
-msgstr ""
+msgstr "(Изменено)"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:769
@@ -71,6 +72,7 @@ msgid ""
 "The documents are not attached, you can view them online directly on my "
 "OpenERP server at:"
 msgstr ""
+"Документы не вложены, их можно просмотреть онлайн на OpenERP сервере:"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:579
@@ -88,13 +90,15 @@ msgstr "Адрес совместного доступа"
 #: code:addons/share/wizard/share_wizard.py:776
 #, python-format
 msgid "These are your credentials to access this protected area:\n"
-msgstr ""
+msgstr "Это ваши учетные данные для доступа к защищенной области:\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:643
 #, python-format
 msgid "You must be a member of the Share/User group to use the share wizard"
 msgstr ""
+"Для использования мастера совместного использования, вы должны быть членом "
+"группы совместный доступ/пользователь"
 
 #. module: share
 #: view:share.wizard:0
@@ -110,12 +114,12 @@ msgstr "Совместный доступ"
 #: code:addons/share/wizard/share_wizard.py:551
 #, python-format
 msgid "(Duplicated for modified sharing permissions)"
-msgstr ""
+msgstr "(Дублирован для измененных прав совместного доступа)"
 
 #. module: share
 #: help:share.wizard,domain:0
 msgid "Optional domain for further data filtering"
-msgstr "Дополнительный домен для дальнейшей фильтрации данных"
+msgstr "Дополнительное ограничение для дальнейшей фильтрации данных"
 
 #. module: share
 #: sql_constraint:res.users:0
@@ -125,7 +129,7 @@ msgstr "Вы не можете иметь двух одинаковых поль
 #. module: share
 #: model:ir.model,name:share.model_ir_model_access
 msgid "ir.model.access"
-msgstr ""
+msgstr "ir.model.access"
 
 #. module: share
 #: view:share.wizard:0
@@ -141,13 +145,13 @@ msgstr "Пользователь"
 #. module: share
 #: view:share.wizard:0
 msgid "Sharing Options"
-msgstr ""
+msgstr "Параметры общего доступа"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:765
 #, python-format
 msgid "Hello,"
-msgstr ""
+msgstr "Здравствуйте,"
 
 #. module: share
 #: view:share.wizard:0
@@ -158,7 +162,7 @@ msgstr "Закрыть"
 #: code:addons/share/wizard/share_wizard.py:640
 #, python-format
 msgid "Action and Access Mode are required to create a shared access"
-msgstr ""
+msgstr "Действие и режим доступа необходимы для создания общего доступа"
 
 #. module: share
 #: view:share.wizard:0
@@ -176,6 +180,7 @@ msgid ""
 "The documents have been automatically added to your current OpenERP "
 "documents.\n"
 msgstr ""
+"Документы были автоматически добавлены к вашим текущим документам OpenERP .\n"
 
 #. module: share
 #: view:share.wizard:0
@@ -206,11 +211,13 @@ msgstr ""
 #: help:share.wizard,name:0
 msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
+"Название для общего доступа (выводится пользователям как меню и название "
+"закладки)"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Options"
-msgstr ""
+msgstr "Настройки"
 
 #. module: share
 #: view:res.groups:0
@@ -225,6 +232,9 @@ msgid ""
 "Sales, HR, etc.)\n"
 "It is open source and can be found on http://www.openerp.com."
 msgstr ""
+"OpenERP является мощным и удобным набором бизнес-приложений (CRM, продажи, "
+"кадры и т.д.)\n"
+"с открытым исходным кодом. Сайт: www.openerp.com ."
 
 #. module: share
 #: field:share.wizard,action_id:0
@@ -234,7 +244,7 @@ msgstr "Действие совместного доступа"
 #. module: share
 #: view:share.wizard:0
 msgid "Optional: include a personal message"
-msgstr ""
+msgstr "Дополнительно: включить личное сообщение"
 
 #. module: share
 #: field:res.users,share:0
@@ -246,11 +256,13 @@ msgstr "Совместный доступ с пользователем"
 #, python-format
 msgid "Please indicate the emails of the persons to share with, one per line"
 msgstr ""
+"Пожалуйста, укажите эл.адреса лиц для совместного доступа, один адрес в "
+"строке"
 
 #. module: share
 #: field:share.wizard,embed_code:0 field:share.wizard.result.line,user_id:0
 msgid "unknown"
-msgstr ""
+msgstr "неизвесно"
 
 #. module: share
 #: help:res.groups,share:0
@@ -271,7 +283,8 @@ msgstr ""
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
 msgstr ""
-"Выбранная организация отсутствует в списке разрешённых для этого пользователя"
+"Выбранная компания отсутствует в списке разрешённых компаний для этого "
+"пользователя"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:526
@@ -295,12 +308,14 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:767
 #, python-format
 msgid "I've shared %s with you!"
-msgstr ""
+msgstr "Я предоставил вам доступ к %s !"
 
 #. module: share
 #: help:share.wizard,share_root_url:0
 msgid "Main access page for users that are granted shared access"
 msgstr ""
+"Главная страница доступа для пользователей, которым предоставляется "
+"совместный доступ"
 
 #. module: share
 #: sql_constraint:res.groups:0
@@ -310,7 +325,7 @@ msgstr "Название группы должно быть уникальным
 #. module: share
 #: model:res.groups,name:share.group_share_user
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: share
 #: view:res.groups:0
@@ -333,7 +348,7 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid "Use this Link"
-msgstr ""
+msgstr "Используйте эту ссылку"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:779
@@ -344,7 +359,7 @@ msgstr "База данных"
 #. module: share
 #: field:share.wizard,domain:0
 msgid "Domain"
-msgstr "Домен"
+msgstr "Ограничение"
 
 #. module: share
 #: view:share.wizard:0 field:share.wizard,result_line_ids:0
@@ -360,12 +375,13 @@ msgstr "Скопированы права совместного доступа"
 #. module: share
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 msgid "Share your documents"
-msgstr ""
+msgstr "Поделитесь своими документами"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
+"Или вставьте следующий код туда, где вы хотите вставить ваши документы"
 
 #. module: share
 #: view:share.wizard:0
@@ -373,6 +389,7 @@ msgid ""
 "An email notification with instructions has been sent to the following "
 "people:"
 msgstr ""
+"Уведомление с инструкциями было отправлено по эл.почте следующим людям:"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -389,23 +406,23 @@ msgstr ""
 #. module: share
 #: field:share.wizard,view_type:0
 msgid "Current View Type"
-msgstr ""
+msgstr "Тип этого вида"
 
 #. module: share
 #: selection:share.wizard,access_mode:0
 msgid "Can view"
-msgstr ""
+msgstr "Можно просматривать"
 
 #. module: share
 #: selection:share.wizard,access_mode:0
 msgid "Can edit"
-msgstr ""
+msgstr "Можно редактировать"
 
 #. module: share
 #: help:share.wizard,message:0
 msgid ""
 "An optional personal message, to be included in the email notification."
-msgstr ""
+msgstr "Персональное сообщение, которое может быть включено в эл.письмо."
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
@@ -417,7 +434,7 @@ msgstr "res.users"
 #: code:addons/share/wizard/share_wizard.py:635
 #, python-format
 msgid "Sharing access could not be created"
-msgstr ""
+msgstr "Общий доступ не был создан"
 
 #. module: share
 #: help:res.users,share:0
@@ -425,7 +442,7 @@ msgid ""
 "External user with limited access, created only for the purpose of sharing "
 "data."
 msgstr ""
-"Внешний пользователь с ограниченным доступом, созданы только для обмена "
+"Внешний пользователь с ограниченным доступом, создан только для обмена "
 "данными."
 
 #. module: share
@@ -439,7 +456,7 @@ msgstr "Мастер совместного доступа"
 #: code:addons/share/wizard/share_wizard.py:740
 #, python-format
 msgid "Shared access created!"
-msgstr ""
+msgstr "Общий доступ создан!"
 
 #. module: share
 #: model:res.groups,comment:share.group_share_user
@@ -448,6 +465,10 @@ msgid ""
 "Members of this groups have access to the sharing wizard, which allows them "
 "to invite external users to view or edit some of their documents."
 msgstr ""
+"\n"
+"Члены этой группы имеют доступ к мастеру совместного доступа , который "
+"позволяет им приглашать внешних пользователей, для просмотра или изменения "
+"некоторых своих документов."
 
 #. module: share
 #: model:ir.model,name:share.model_res_groups
@@ -464,23 +485,23 @@ msgstr "Пароль"
 #. module: share
 #: field:share.wizard,new_users:0
 msgid "Emails"
-msgstr ""
+msgstr "Эл.почта"
 
 #. module: share
 #: field:share.wizard,embed_option_search:0
 msgid "Display search view"
-msgstr ""
+msgstr "Показать поиск"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:197
 #, python-format
 msgid "No email address configured"
-msgstr ""
+msgstr "Не настроен адрес эл.почты"
 
 #. module: share
 #: field:share.wizard,message:0
 msgid "Personal Message"
-msgstr ""
+msgstr "Личное сообщение"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:763
@@ -495,7 +516,7 @@ msgstr ""
 #. module: share
 #: field:share.wizard.result.line,login:0
 msgid "Login"
-msgstr ""
+msgstr "Имя пользователя"
 
 #. module: share
 #: view:res.users:0
@@ -510,7 +531,7 @@ msgstr "Режим доступа"
 #. module: share
 #: view:share.wizard:0
 msgid "Sharing: preparation"
-msgstr ""
+msgstr "Совместный доступ: подготовка"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:198
@@ -519,21 +540,23 @@ msgid ""
 "You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
+"Вы должны настроить ваш адрес электронной почты в настройках пользователя, "
+"прежде чем использовать кнопку \"Совместный доступ\"."
 
 #. module: share
 #: help:share.wizard,access_mode:0
 msgid "Access rights to be granted on the shared documents."
-msgstr ""
+msgstr "Права доступа будут предоставлены на документы совместного доступа"
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:8
 msgid "Link or embed..."
-msgstr ""
+msgstr "Ссылка или встроить ..."
 
 #. openerp-web
 #: /home/odo/repositories/addons/trunk/share/static/src/xml/share.xml:9
 msgid "Share with..."
-msgstr ""
+msgstr "Совместный доступ с..."
 
 #, python-format
 #~ msgid ""
@@ -673,3 +696,30 @@ msgstr ""
 
 #~ msgid "Congratulations, you have successfully setup a new shared access!"
 #~ msgstr "Поздравляю, вы успешно установили новый совместный доступ!"
+
+#~ msgid "Share with these people (one e-mail per line)"
+#~ msgstr "Совместный доступ с этими людьми (один e-mail в строке)"
+
+#~ msgid "Use this link"
+#~ msgstr "Используйте эту ссылку"
+
+#~ msgid ""
+#~ "An optional personal message, to be included in the e-mail notification."
+#~ msgstr "Необязательное личное сообщение для включения в e-mail уведомление."
+
+#~ msgid ""
+#~ "An e-mail notification with instructions has been sent to the following "
+#~ "people:"
+#~ msgstr "E-mail уведомление с инструкциями было отправлено следующим людям:"
+
+#, python-format
+#~ msgid "No e-mail address configured"
+#~ msgstr "Нет настроенного адреса e-mail"
+
+#, python-format
+#~ msgid ""
+#~ "You must configure your e-mail address in the user preferences before using "
+#~ "the Share button."
+#~ msgstr ""
+#~ "Вы должны настроить ваш адрес e-mail в параметрах пользователя перед "
+#~ "использованием кнопки совместного доступа."
diff --git a/addons/share/i18n/sv.po b/addons/share/i18n/sv.po
index 7e77fff76fb..056868b2879 100644
--- a/addons/share/i18n/sv.po
+++ b/addons/share/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/tr.po b/addons/share/i18n/tr.po
index f02fd6ae7b6..e50638e9075 100644
--- a/addons/share/i18n/tr.po
+++ b/addons/share/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/i18n/zh_CN.po b/addons/share/i18n/zh_CN.po
index 8884b191a48..8f75b240262 100644
--- a/addons/share/i18n/zh_CN.po
+++ b/addons/share/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:57+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:27+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: share
 #: field:share.wizard,embed_option_title:0
diff --git a/addons/share/ir_model.py b/addons/share/ir_model.py
index 008dd424fa5..0d90aec3eb7 100644
--- a/addons/share/ir_model.py
+++ b/addons/share/ir_model.py
@@ -40,6 +40,7 @@ class ir_model_access(osv.Model):
                         LEFT JOIN ir_module_category c ON (c.id=g.category_id)
                       WHERE
                         m.model=%s AND
+                        a.active IS true AND
                         (g.share IS NULL or g.share IS false) AND
                         a.perm_''' + access_mode, (model_name,))
         return [('%s/%s' % x) if x[0] else x[1] for x in cr.fetchall()]
diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml
index 9a657ffdbb6..cd9f7ad4f4c 100644
--- a/addons/share/res_users_view.xml
+++ b/addons/share/res_users_view.xml
@@ -25,13 +25,13 @@
         <record model="ir.ui.view" id="res_groups_search_sharing">
             <field name="name">res.groups.search.share</field>
             <field name="model">res.groups</field>
-            <field name="priority" eval="8"/>
+            <field name="inherit_id" ref="base.view_groups_search"/>
             <field name="arch" type="xml">
-                <search string="Groups">
-                    <field name="name" string="Group"/>
-                    <field name="share"/>
-                    <filter name="no_share" string="Regular groups only (no share groups)" icon="terp-partner" domain="[('share','=',False)]"/>
-                </search>
+                <field name="name" position="after">
+                    <filter name="share" string="Share Groups" domain="[('share','=',True)]"/>
+                    <filter name="no_share" string="Non-Share Groups" domain="[('share','=',False)]"/>
+                    <separator orientation="vertical"/>
+                </field>
             </field>
         </record>
 
diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js
index 6cc12a5bfa8..e627b555de3 100644
--- a/addons/share/static/src/js/share.js
+++ b/addons/share/static/src/js/share.js
@@ -15,7 +15,7 @@ openerp.share = function(session) {
         self.rpc('/web/session/eval_domain_and_context', {
             domains: [domain],
             contexts: [view.dataset.context]
-        }, function (result) {
+        }).done(function (result) {
             Share.create({
                 name: action.name,
                 record_name: rec_name,
@@ -24,9 +24,8 @@ openerp.share = function(session) {
                 user_type: user_type || 'embedded',
                 view_type: view.fields_view.type,
                 invite: invite || false,
-            }, function(result) {
-                var share_id = result.result;
-                var step1 = Share.call('go_step_1', [[share_id],], function(result) {
+            }).done(function(share_id) {
+                var step1 = Share.call('go_step_1', [[share_id]]).done(function(result) {
                     var action = result;
                     self.do_action(action);
                 });
@@ -38,7 +37,7 @@ openerp.share = function(session) {
         if (!session.session.share_flag) {
             session.session.share_flag = $.Deferred(function() {
                 var func = new session.web.Model("share.wizard").get_func("has_share");
-                func(session.session.uid).pipe(function(res) {
+                func(session.session.uid).then(function(res) {
                     if(res) {
                         session.session.share_flag.resolve();
                     } else {
@@ -89,7 +88,7 @@ openerp.share = function(session) {
         start: function() {
             start_res = this._super.apply(this, arguments);
             if (has_action_id) {
-                this.$element.find('button.oe_share_invite').show();
+                this.$el.find('button.oe_share_invite').show();
             }
             return start_res;
         }
@@ -100,7 +99,7 @@ openerp.share = function(session) {
             var self = this;
             this.check_if_action_is_defined();
             has_share(function() {
-                self.$element.delegate('button.oe_share_invite', 'click', self.on_click_share_invite);
+                self.$el.delegate('button.oe_share_invite', 'click', self.on_click_share_invite);
             });
             return this._super.apply(this, arguments);
         },
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 598bb085967..6a1f5681f4f 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -23,6 +23,7 @@ import random
 import time
 from urllib import quote_plus
 import uuid
+from openerp import SUPERUSER_ID
 
 import simplejson
 
@@ -73,7 +74,7 @@ class share_wizard(osv.TransientModel):
 
     def _user_type_selection(self, cr, uid, context=None):
         """Selection values may be easily overridden/extended via inheritance"""
-        return [('embedded', 'Direct link or embed code'), ('emails','Emails'), ]
+        return [('embedded', _('Direct link or embed code')), ('emails',_('Emails')), ]
 
     """Override of create() to auto-compute the action name"""
     def create(self, cr, uid, values, context=None):
@@ -256,7 +257,6 @@ class share_wizard(osv.TransientModel):
                         'email': new_user,
                         'groups_id': [(6,0,[group_id])],
                         'share': True,
-                        'message_email_pref': 'all',
                         'company_id': current_user.company_id.id
                 }, context)
                 new_line = { 'user_id': user_id,
@@ -545,7 +545,7 @@ class share_wizard(osv.TransientModel):
                             _logger.debug("Copying rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
                         else:
                             # otherwise we can simply link the rule to keep it dynamic
-                            rule_obj.write(cr, 1, [rule.id], {
+                            rule_obj.write(cr, SUPERUSER_ID, [rule.id], {
                                     'groups': [(4,group_id)]
                                 })
                             _logger.debug("Linking rule %s (%s) on model %s with domain: %s", rule.name, rule.id, model.model, rule.domain_force)
@@ -774,8 +774,8 @@ class share_wizard(osv.TransientModel):
             if res_id <= 0:
                 raise osv.except_osv(_('Record id not found'), _('The share engine has not been able to fetch a record_id for your invitation.'))
             self.pool.get(model.model).message_subscribe(cr, uid, [res_id], new_ids + existing_ids, context=context)
-            self.send_invite_email(cr, uid, wizard_data, context=context)
-            self.send_invite_note(cr, uid, model.model, res_id, wizard_data, context=context)
+            # self.send_invite_email(cr, uid, wizard_data, context=context)
+            # self.send_invite_note(cr, uid, model.model, res_id, wizard_data, context=context)
         
         # CLOSE
         #  A. Not invite: as before
@@ -819,9 +819,10 @@ class share_wizard(osv.TransientModel):
             elif tmp_idx == len(wizard_data.result_line_ids)-2:
                 body += ' and'
         body += '.'
-        return self.pool.get(model_name).message_append_note(cr, uid, [res_id], _('System Notification'), body, context=context)
+        return self.pool.get(model_name).message_post(cr, uid, [res_id], body=body, context=context)
     
     def send_invite_email(self, cr, uid, wizard_data, context=None):
+        # TDE Note: not updated because will disappear
         message_obj = self.pool.get('mail.message')
         notification_obj = self.pool.get('mail.notification')
         user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)
@@ -854,13 +855,13 @@ class share_wizard(osv.TransientModel):
     
     def send_emails(self, cr, uid, wizard_data, context=None):
         _logger.info('Sending share notifications by email...')
-        mail_message = self.pool.get('mail.message')
+        mail_mail = self.pool.get('mail.mail')
         user = self.pool.get('res.users').browse(cr, UID_ROOT, uid)
         if not user.email:
             raise osv.except_osv(_('Email required'), _('The current user must have an email address configured in User Preferences to be able to send outgoing emails.'))
         
         # TODO: also send an HTML version of this mail
-        msg_ids = []
+        mail_ids = []
         for result_line in wizard_data.result_line_ids:
             email_to = result_line.user_id.email
             if not email_to:
@@ -883,10 +884,14 @@ class share_wizard(osv.TransientModel):
             body += "--\n"
             body += _("OpenERP is a powerful and user-friendly suite of Business Applications (CRM, Sales, HR, etc.)\n"
                       "It is open source and can be found on http://www.openerp.com.")
-            msg_ids.append(mail_message.schedule_with_attach(cr, uid, user.email, [email_to], subject, body, model='share.wizard', context=context))
+            mail_ids.append(mail_mail.create(cr, uid, {
+                    'email_from': user.email,
+                    'email_to': email_to,
+                    'subject': subject,
+                    'body_html': '<pre>%s</pre>' % body}, context=context))
         # force direct delivery, as users expect instant notification
-        mail_message.send(cr, uid, msg_ids, context=context)
-        _logger.info('%d share notification(s) sent.', len(msg_ids))
+        mail_mail.send(cr, uid, mail_ids, context=context)
+        _logger.info('%d share notification(s) sent.', len(mail_ids))
 
     def onchange_embed_options(self, cr, uid, ids, opt_title, opt_search, context=None):
         wizard = self.browse(cr, uid, ids[0], context)
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 55d9c7c6c5a..966186121b6 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -20,69 +20,75 @@
 ##############################################################################
 
 {
-    "name" : "Warehouse Management",
-    "version" : "1.1",
-    "author" : "OpenERP SA",
-    "summary": "Inventory, Logistic, Storage",
-    "description" : """
-OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations.
-======================================================================================================
+    'name': 'Warehouse Management',
+    'version': '1.1',
+    'author': 'OpenERP SA',
+    'summary': 'Inventory, Logistic, Storage',
+    'description' : """
+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,
-    * Stock valuation (standard or average price, ...)
-    * Robustness faced with Inventory differences
-    * Automatic reordering rules (stock level, JIT, ...)
-    * Bar code supported
-    * Rapid detection of mistakes through double entry system
-    * Traceability (upstream/downstream, production lots, serial number, ...)
-    
-Dashboard for warehouse that includes:
---------------------------------------
-    * Procurement in exception
-    * List of Incoming Products
-    * List of Outgoing Products
-    * Graph : Products to receive in delay (date <= today)
-    * Graph : Products to send in delay (date <= today)
+The warehouse and inventory management is based on a hierarchical location structure, from warehouses to storage bins. 
+The double entry inventory system allows you to manage customers, suppliers as well as manufacturing inventories. 
+
+OpenERP has the capacity to manage lots and serial numbers ensuring compliance with the traceability requirements imposed by the majority of industries.
+
+Key Features
+-------------
+* Moves history and planning,
+* Stock valuation (standard or average price, ...)
+* Robustness faced with Inventory differences
+* Automatic reordering rules
+* Support for barcodes
+* Rapid detection of mistakes through double entry system
+* Traceability (Upstream / Downstream, Serial numbers, ...)
+
+Dashboard / Reports for Warehouse Management will include:
+----------------------------------------------------------
+* Incoming Products (Graph)
+* Outgoing Products (Graph)
+* Procurement in Exception
+* Inventory Analysis
+* Last Product Inventories
+* Moves Analysis
     """,
-    "website" : "http://www.openerp.com",
-    "images" : ["images/stock_forecast_report.png", "images/delivery_orders.jpeg", "images/inventory_analysis.jpeg","images/location.jpeg","images/moves_analysis.jpeg","images/physical_inventories.jpeg","images/warehouse_dashboard.jpeg"],
-    "depends" : ["product", "account"],
-    "category" : "Warehouse Management",
-    "sequence": 16,
-    "init_xml" : [],
-    "demo_xml" : [
-        "stock_demo.xml",
-#        "stock_demo.yml",
+    'website': 'http://www.openerp.com',
+    'images': ['images/stock_forecast_report.png', 'images/delivery_orders.jpeg', 'images/inventory_analysis.jpeg','images/location.jpeg','images/moves_analysis.jpeg','images/physical_inventories.jpeg','images/warehouse_dashboard.jpeg'],
+    'depends': ['product', 'account'],
+    'category': 'Warehouse Management',
+    'sequence': 16,
+    'demo': [
+        'stock_demo.xml',
+#        'stock_demo.yml',
     ],
-    "update_xml" : [
-        "security/stock_security.xml",
-        "security/ir.model.access.csv",
-        "stock_data.xml",
-        "wizard/stock_move_view.xml",
-        "wizard/stock_change_product_qty_view.xml",
-        "wizard/stock_partial_picking_view.xml",
-        "wizard/stock_partial_move_view.xml",
-        "wizard/stock_fill_inventory_view.xml",
-        "wizard/stock_invoice_onshipping_view.xml",
-        "wizard/stock_inventory_merge_view.xml",
-        "wizard/stock_location_product_view.xml",
-        "wizard/stock_splitinto_view.xml",
-        "wizard/stock_inventory_line_split_view.xml",
-        "wizard/stock_change_standard_price_view.xml",
+    'data': [
+        'security/stock_security.xml',
+        'security/ir.model.access.csv',
+        'stock_data.xml',
+        'wizard/stock_move_view.xml',
+        'wizard/stock_change_product_qty_view.xml',
+        'wizard/stock_partial_picking_view.xml',
+        'wizard/stock_partial_move_view.xml',
+        'wizard/stock_fill_inventory_view.xml',
+        'wizard/stock_invoice_onshipping_view.xml',
+        'wizard/stock_inventory_merge_view.xml',
+        'wizard/stock_location_product_view.xml',
+        'wizard/stock_splitinto_view.xml',
+        'wizard/stock_inventory_line_split_view.xml',
+        'wizard/stock_change_standard_price_view.xml',
         'wizard/stock_return_picking_view.xml',
-        "stock_workflow.xml",
-        "stock_incoterms.xml",
-        "stock_report.xml",
-        "stock_view.xml",
-        "stock_sequence.xml",
-        "product_data.xml",
-        "product_view.xml",
-        "partner_view.xml",
-        "report/report_stock_move_view.xml",
-        "report/report_stock_view.xml",
-        "board_warehouse_view.xml",
-        "res_config_view.xml",
+        'stock_workflow.xml',
+        'stock_incoterms.xml',
+        'stock_report.xml',
+        'stock_view.xml',
+        'stock_sequence.xml',
+        'product_data.xml',
+        'product_view.xml',
+        'partner_view.xml',
+        'report/report_stock_move_view.xml',
+        'report/report_stock_view.xml',
+        'board_warehouse_view.xml',
+        'res_config_view.xml',
     ],
     'test': [
 #        'test/opening_stock.yml',
@@ -92,8 +98,7 @@ Dashboard for warehouse that includes:
     'installable': True,
     'application': True,
     'auto_install': False,
-    'certificate': '0055421559965',
-    "css": [ 'static/src/css/stock.css' ],
+    'css': [ 'static/src/css/stock.css' ],
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index 4258721dc03..839a99c1fa7 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -14,26 +14,6 @@
             </field>
         </record>
 
-        <record id="action_incoming_product_board" model="ir.actions.act_window">
-            <field name="name">Incoming Shipments</field>
-            <field name="res_model">stock.move</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','in',('confirmed','assigned')),'|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
-            <field name="view_id" ref="stock.view_move_tree_reception_picking"/>
-        </record>
-
-        <record id="action_outgoing_product_board" model="ir.actions.act_window">
-            <field name="name">Delivery Orders</field>
-            <field name="res_model">stock.move</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="domain">[('state','in',('confirmed','assigned')),'|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
-            <field name="view_id" ref="stock.view_move_tree_reception_picking"/>
-        </record>
-
         <record model="ir.actions.act_window" id="action_stock_incoming_product_delay">
             <field name="name">Incoming Products</field>
             <field name="res_model">report.stock.move</field>
@@ -57,14 +37,11 @@
             <field name="model">board.board</field>
             <field name="arch" type="xml">
                 <form string="Warehouse board" version="7.0">
-                    <board style="2-1">
-                        <column>
-                            <action name="%(action_incoming_product_board)d" string="Incoming Shipments" creatable="true"/>
-                            <action name="%(action_outgoing_product_board)d" string="Delivery Orders" creatable="true"/>
-                        </column>
-
+                    <board style="1-1">
                         <column>
                             <action name="%(action_stock_incoming_product_delay)d" string="Incoming Products"/>
+                        </column>
+                        <column>
                             <action name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products"/>
                         </column>
                     </board>
@@ -84,7 +61,7 @@
                     parent="base.menu_reporting_dashboard" 
                     action="open_board_warehouse" 
                     sequence="25" 
-                    groups="group_stock_manager"/>
+                    groups="stock.group_stock_user"/>
 
     </data>
 </openerp>
diff --git a/addons/stock/i18n/ar.po b/addons/stock/i18n/ar.po
index da7ca3992f1..6d7fa8a2db1 100644
--- a/addons/stock/i18n/ar.po
+++ b/addons/stock/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/bg.po b/addons/stock/i18n/bg.po
index 970065c0bae..392b355c70b 100644
--- a/addons/stock/i18n/bg.po
+++ b/addons/stock/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index 506f5440794..49962931e36 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/ca.po b/addons/stock/i18n/ca.po
index faa6ee31f18..e2d8e54a796 100644
--- a/addons/stock/i18n/ca.po
+++ b/addons/stock/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/cs.po b/addons/stock/i18n/cs.po
index 0ee7107e283..d52be8cf01a 100644
--- a/addons/stock/i18n/cs.po
+++ b/addons/stock/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/da.po b/addons/stock/i18n/da.po
index 82b3ded0b73..19ff5cfc892 100644
--- a/addons/stock/i18n/da.po
+++ b/addons/stock/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index 50713363d5f..67e0768bad3 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-24 22:20+0000\n"
+"PO-Revision-Date: 2012-10-12 23:21+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -1868,7 +1868,7 @@ msgstr "Pinnwand Lagerwirtschaft"
 #. module: stock
 #: field:stock.incoterms,code:0
 msgid "Code"
-msgstr "Kurzbezeichnung"
+msgstr "Kurzbez."
 
 #. module: stock
 #: view:stock.inventory.line.split:0
@@ -2547,7 +2547,7 @@ msgstr "Lieferschein"
 msgid ""
 "The combination of serial number and internal reference must be unique !"
 msgstr ""
-"Die Kombination von Serinenummer und interner Referenz muss eindeutig sein."
+"Die Kombination von Seriennummer und interner Referenz muss eindeutig sein."
 
 #. module: stock
 #: view:stock.inventory:0
diff --git a/addons/stock/i18n/el.po b/addons/stock/i18n/el.po
index c0dd7d95f0e..95f0620b80c 100644
--- a/addons/stock/i18n/el.po
+++ b/addons/stock/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index c8908414236..584336412f8 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: model:ir.actions.todo.category,name:stock.category_stock_management_config
diff --git a/addons/stock/i18n/es_AR.po b/addons/stock/i18n/es_AR.po
index 03f7d54b1c1..f166b02acfc 100644
--- a/addons/stock/i18n/es_AR.po
+++ b/addons/stock/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/es_CL.po b/addons/stock/i18n/es_CL.po
index b19c6aaf8e4..b47077a5675 100644
--- a/addons/stock/i18n/es_CL.po
+++ b/addons/stock/i18n/es_CL.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/es_CR.po b/addons/stock/i18n/es_CR.po
index d169076cdf1..e7365486b31 100644
--- a/addons/stock/i18n/es_CR.po
+++ b/addons/stock/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: stock
diff --git a/addons/stock/i18n/es_DO.po b/addons/stock/i18n/es_DO.po
index f80352c3511..9e2951b91ca 100644
--- a/addons/stock/i18n/es_DO.po
+++ b/addons/stock/i18n/es_DO.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/es_EC.po b/addons/stock/i18n/es_EC.po
index 3c49f31799d..c3f09db4835 100644
--- a/addons/stock/i18n/es_EC.po
+++ b/addons/stock/i18n/es_EC.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/es_MX.po b/addons/stock/i18n/es_MX.po
index 3cf93515b09..04eb55aa611 100644
--- a/addons/stock/i18n/es_MX.po
+++ b/addons/stock/i18n/es_MX.po
@@ -1,92 +1,111 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* stock
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-18 09:19+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
-"Language-Team: \n"
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-09-27 04:54+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 04:57+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#~ msgid "Stock Management"
-#~ msgstr "Gestión de inventario"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outgoing Lots"
-msgstr "Lotes de seguimiento en salida"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_ups_upload
-msgid "Stock ups upload"
-msgstr "Stock ups carga"
-
-#. module: stock
-#: code:addons/stock/product.py:76
-#, python-format
-msgid "Variation Account is not specified for Product Category: %s"
 msgstr ""
-"No se ha especificado la cuenta de variación para la categoría de producto: "
-"%s"
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_move_split_lines
+msgid "Stock move Split lines"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_account_input_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"incoming stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the source location. This is the default "
+"value for all products in this category. It can also directly be set on each "
+"product"
+msgstr ""
+"Cuando en el campo Valoración inventario se tiene seleccionado Tiempo real "
+"(automatizado) , la contrapartida de los asientos contables para todos los "
+"movimientos de inventario entrantes, se mostrarán en esta cuenta contable, a "
+"menos de que exista un conjunto de valoración cuenta específica en la "
+"ubicación de destino. En el caso de que el producto es un servicio, se "
+"deberá de seleccionar la cuenta de gastos. Este es el valor por defecto para "
+"todos los productos en esta categoría. También puede directamente establecer "
+"en cada producto."
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr "Ubicación encadenada si fija"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Put in a new pack"
-msgstr "Poner en un paquete nuevo"
-
-#. module: stock
-#: field:stock.move.split.lines,action:0
-msgid "Action"
-msgstr "Acción"
+msgstr ""
 
 #. module: stock
+#: code:addons/stock/wizard/stock_traceability.py:54
 #: view:stock.production.lot:0
+#, python-format
 msgid "Upstream Traceability"
-msgstr "Trazabilidad hacia arriba"
+msgstr ""
+
+#. module: stock
+#: model:ir.actions.todo.category,name:stock.category_stock_management_config
+msgid "Stock Management"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 msgid "Last Product Inventories"
-msgstr "Último inventario de productos"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Today"
-msgstr "Hoy"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision Number"
-msgstr "Número de revisión"
+msgstr ""
 
 #. module: stock
-#: view:stock.move.memory.in:0
-#: view:stock.move.memory.out:0
+#: view:stock.move:0
+msgid "Orders processed Today or planned for Today"
+msgstr ""
+
+#. module: stock
+#: view:stock.partial.move.line:0 view:stock.partial.picking:0
+#: field:stock.partial.picking,move_ids:0 view:stock.partial.picking.line:0
+#: view:stock.return.picking.memory:0
 msgid "Product Moves"
-msgstr "Movimientos productos"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
+msgid "UoM Categories"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_move_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_move_report
 #: view:report.stock.move:0
 msgid "Moves Analysis"
-msgstr "Análisis movimientos"
+msgstr ""
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -94,8 +113,12 @@ msgid ""
 "Internal reference number in case it differs from the manufacturer's serial "
 "number"
 msgstr ""
-"Número interno de referencia en caso de que sea diferente del número de "
-"serie del fabricante."
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:47
+#, python-format
+msgid "You cannot perform this operation on more than one Stock Inventories."
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_inventory_form
@@ -104,39 +127,36 @@ msgid ""
 "per location. You can use it once a year when you do the general inventory "
 "or whenever you need it, to correct the current stock level of a product."
 msgstr ""
-"Los inventarios periódicos se utilizan para contar el número de productos "
-"disponibles por ubicación. Lo puede utilizar una vez al año cuando realice "
-"el inventario general, o cuando lo necesite, para corregir el nivel actual "
-"de stock de un producto."
+
+#. module: stock
+#: code:addons/stock/wizard/stock_change_product_qty.py:87
+#, python-format
+msgid "Quantity cannot be negative."
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Picking list"
-msgstr "Albarán"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 #: field:report.stock.inventory,product_qty:0
 #: field:report.stock.move,product_qty:0
 #: field:stock.change.product.qty,new_quantity:0
 #: field:stock.inventory.line,product_qty:0
 #: field:stock.inventory.line.split,qty:0
-#: report:stock.inventory.move:0
-#: field:stock.move,product_qty:0
-#: field:stock.move.consume,product_qty:0
-#: field:stock.move.memory.in,quantity:0
-#: field:stock.move.memory.out,quantity:0
-#: field:stock.move.scrap,product_qty:0
-#: field:stock.move.split,qty:0
-#: field:stock.move.split.lines,quantity:0
-#: field:stock.move.split.lines.exist,quantity:0
-#: report:stock.picking.list:0
-#: field:stock.report.prodlots,qty:0
-#: field:stock.report.tracklots,name:0
+#: field:stock.inventory.line.split.lines,quantity:0
+#: report:stock.inventory.move:0 field:stock.move,product_qty:0
+#: field:stock.move.consume,product_qty:0 field:stock.move.scrap,product_qty:0
+#: field:stock.move.split,qty:0 field:stock.move.split.lines,quantity:0
+#: field:stock.partial.move.line,quantity:0
+#: field:stock.partial.picking.line,quantity:0 report:stock.picking.list:0
+#: field:stock.report.prodlots,qty:0 field:stock.report.tracklots,name:0
+#: field:stock.return.picking.memory,quantity:0
 #: field:stock.split.into,quantity:0
 msgid "Quantity"
-msgstr "Cantidad"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree
@@ -144,76 +164,75 @@ msgid ""
 "This is the list of all delivery orders that have to be prepared, according "
 "to your different sales orders and your logistics rules."
 msgstr ""
-"Esta es la lista de albaranes de salida que deben ser preparados, en función "
-"de sus pedidos de venta y sus reglas logísticas."
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,day:0
+#: view:report.stock.move:0 field:report.stock.move,day:0
 msgid "Day"
-msgstr "Día"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-#: field:stock.inventory.line.split,product_uom:0
-#: view:stock.move:0
-#: field:stock.move.split,product_uom:0
-#: view:stock.picking:0
+#: view:stock.inventory:0 field:stock.inventory.line.split,product_uom:0
+#: view:stock.move:0 field:stock.move.split,product_uom:0 view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "UoM"
-msgstr "UdM"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:104
 #: model:ir.actions.act_window,name:stock.action_inventory_form
 #: model:ir.ui.menu,name:stock.menu_action_inventory_form
-#, python-format
 msgid "Physical Inventories"
-msgstr "Inventarios físicos"
+msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_journal:0
-#: view:report.stock.move:0
+#: field:product.category,property_stock_journal:0 view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
-msgstr "Diario de inventario"
-
-#. module: stock
-#: view:report.stock.move:0
-msgid "Incoming"
-msgstr "Entrada"
-
-#. module: stock
-#: help:product.category,property_stock_account_output_categ:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"outgoing stock moves will be posted in this account. This is the default "
-"value for all products in this category, it can also directly be set on each "
-"product."
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
-"asientos del diario para todos los movimientos de stock de salida se creará "
-"en esta cuenta. Este es el valor por defecto para todos los productos de "
-"esta categoría, también puede indicarse directamente en cada producto."
 
 #. module: stock
-#: code:addons/stock/stock.py:1170
-#: code:addons/stock/stock.py:2415
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Current month"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:222
+#, python-format
+msgid "Unable to assign all lots to this move!"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2516
 #, python-format
 msgid "Missing partial picking data for move #%s"
-msgstr "Faltan datos del albarán parcial para el movimiento #%s"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.server,name:stock.action_partial_move_server
 msgid "Deliver/Receive Products"
-msgstr "Enviar/Recibir productos"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:135
 #, python-format
 msgid "You cannot delete any record!"
-msgstr "¡No puede eliminar ningún registro!"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders to invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Assigned Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,update_cost:0
+#: field:stock.partial.picking.line,update_cost:0
+msgid "Need cost update"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:49
@@ -223,56 +242,51 @@ msgid ""
 "if you really want to change it '             #                        'for "
 "this product: \"%s\" (id: %d)"
 msgstr ""
-"La línea de movimiento actual ya está asignada a un albarán, elimínela "
-"primero si realmente quiere cambiarla ' # 'para este este producto: \"%s\" "
-"(id: %d)"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not Applicable"
-msgstr "No aplicable"
+msgstr ""
 
 #. module: stock
 #: help:stock.tracking,serial:0
 msgid "Other reference or serial number"
-msgstr "Otra referencia o número de serie."
+msgstr ""
 
 #. module: stock
-#: field:stock.move,origin:0
-#: view:stock.picking:0
-#: field:stock.picking,origin:0
+#: field:stock.move,origin:0 view:stock.picking:0 field:stock.picking,origin:0
 msgid "Origin"
-msgstr "Origen"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_stock_incoming_product_delay
+msgid "Incoming Products"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Non Inv"
-msgstr "No factura"
+msgstr ""
 
 #. module: stock
-#: view:stock.tracking:0
-msgid "Pack Identification"
-msgstr "Identificación paquete"
+#: code:addons/stock/wizard/stock_traceability.py:54
+#: view:stock.production.lot:0
+#, python-format
+msgid "Downstream Traceability"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: field:stock.move,picking_id:0
-#: field:stock.picking,name:0
+#: view:stock.move:0 field:stock.move,picking_id:0 field:stock.picking,name:0
 #: view:stock.production.lot:0
 msgid "Reference"
-msgstr "Referencia"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:666
-#: code:addons/stock/stock.py:1472
+#: code:addons/stock/stock.py:670 code:addons/stock/stock.py:1516
 #, python-format
 msgid "Products to Process"
-msgstr "Productos a procesar"
-
-#. module: stock
-#: constraint:product.category:0
-msgid "Error ! You can not create recursive categories."
-msgstr "¡Error! No puede crear categorías recursivas."
+msgstr ""
 
 #. module: stock
 #: help:stock.fill.inventory,set_stock_zero:0
@@ -280,238 +294,219 @@ msgid ""
 "If checked, all product quantities will be set to zero to help ensure a real "
 "physical inventory is done"
 msgstr ""
-"Si se marca, todas las cantidades de producto se ponen a cero para ayudar a "
-"realizar un inventario físico real."
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_move_split_lines
-msgid "Split lines"
-msgstr "Dividir líneas"
+#: view:stock.partial.move:0 view:stock.partial.picking:0
+msgid "_Validate"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1120
+#: code:addons/stock/stock.py:1149
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
 msgstr ""
-"¡No puede cancelar el albarán porqué el movimiento de stock está en estado "
-"realizado!"
 
 #. module: stock
-#: code:addons/stock/stock.py:2233
-#: code:addons/stock/stock.py:2274
-#: code:addons/stock/stock.py:2334
+#: code:addons/stock/stock.py:2337 code:addons/stock/stock.py:2379
+#: code:addons/stock/stock.py:2440
+#: code:addons/stock/wizard/stock_change_product_qty.py:87
 #: code:addons/stock/wizard/stock_fill_inventory.py:53
+#: code:addons/stock/wizard/stock_partial_picking.py:141
 #, python-format
 msgid "Warning!"
-msgstr "¡Aviso!"
+msgstr ""
 
 #. module: stock
 #: field:stock.invoice.onshipping,group:0
 msgid "Group by partner"
-msgstr "Agrupar por empresa"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_res_partner
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,partner_id:0
-#: view:report.stock.move:0
-#: field:report.stock.move,partner_id:0
-#: view:stock.move:0
-#: field:stock.move,partner_id:0
-#: view:stock.picking:0
+#: model:ir.model,name:stock.model_res_partner view:report.stock.inventory:0
+#: field:report.stock.inventory,partner_id:0 view:report.stock.move:0
+#: field:report.stock.move,partner_id:0 view:stock.move:0
+#: field:stock.move,partner_id:0 view:stock.picking:0
 #: field:stock.picking,partner_id:0
 msgid "Partner"
-msgstr "Empresa"
+msgstr ""
 
 #. module: stock
-#: help:stock.move.memory.in,currency:0
-#: help:stock.move.memory.out,currency:0
-msgid "Currency in which Unit cost is expressed"
-msgstr "Moneda en la que se expresa el coste unidad."
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
+#: code:addons/stock/stock.py:2119
 #, python-format
+msgid ""
+"Can not create Journal Entry, Input Account defined on this product and "
+"Valuation account on category of this product are same."
+msgstr ""
+
+#. module: stock
+#: selection:stock.return.picking,invoice_state:0
 msgid "No invoicing"
-msgstr "No facturación"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that have been processed"
+msgstr ""
 
 #. 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 "Lote de producción"
-
-#. module: stock
-#: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
-msgid "Units of Measure Categories"
-msgstr "Categorías de unidades de medida"
+msgstr ""
 
 #. module: stock
 #: help:stock.incoterms,code:0
 msgid "Code for Incoterms"
-msgstr "Código para Incoterms"
+msgstr ""
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves for this pack"
-msgstr "Movimientos para este paquete"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Incoming Shipments Available"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Internal Location"
-msgstr "Ubicación interna"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-msgid "Confirm Inventory"
-msgstr "Confirmar el inventario"
+#: view:stock.location.product:0
+msgid ""
+"(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to "
+"filter all resources of the day for the 'From' date and 23:59:59 for the "
+"'To' date)"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,state:0
-#: view:report.stock.move:0
-#: field:report.stock.move,state:0
-#: view:stock.inventory:0
-#: field:stock.inventory,state:0
-#: field:stock.inventory.line,state:0
-#: view:stock.move:0
-#: field:stock.move,state:0
-#: view:stock.picking:0
-#: field:stock.picking,state:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,state:0
+#: view:report.stock.move:0 field:report.stock.move,state:0
+#: view:stock.inventory:0 field:stock.inventory,state:0
+#: field:stock.inventory.line,state:0 view:stock.move:0
+#: field:stock.move,state:0 view:stock.picking:0 field:stock.picking,state:0
 #: report:stock.picking.list:0
 msgid "State"
-msgstr "Estado"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Accounting Information"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
-msgstr "Valor stock real"
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,day_diff2:0
 msgid "Lag (Days)"
-msgstr "Retraso (días)"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
 msgid "Action traceability "
-msgstr "Acción trazabilidad "
-
-#. module: stock
-#: field:stock.location,posy:0
-msgid "Shelves (Y)"
-msgstr "Estantería (Y)"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "UOM"
-msgstr "UdM"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: view:stock.move:0
-#: selection:stock.move,state:0
-#: view:stock.picking:0
-#: selection:stock.picking,state:0
-#: view:stock.production.lot:0
-#: field:stock.production.lot,stock_available:0
+#: selection:report.stock.move,state:0 view:stock.move:0
+#: selection:stock.move,state:0 view:stock.picking:0
+#: view:stock.production.lot:0 field:stock.production.lot,stock_available:0
 msgid "Available"
-msgstr "Reservado"
+msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-#: field:stock.picking,min_date:0
+#: view:stock.picking:0 field:stock.picking,min_date:0
 msgid "Expected Date"
-msgstr "Fecha prevista"
-
-#. module: stock
-#: view:board.board:0
-#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
-msgid "Outgoing Product"
-msgstr "Albarán de salida"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_warehouse_form
 msgid ""
 "Create and manage your warehouses and assign them a location from here"
-msgstr "Cree y gestione sus almacenes y asígneles una ubicación desde aquí."
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
 msgid "In Qty"
-msgstr "En cantidad"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:106
+#: code:addons/stock/wizard/stock_fill_inventory.py:116
 #, python-format
 msgid "No product in this location."
-msgstr "No hay producto en esta ubicación."
+msgstr ""
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
-msgstr "Ubicación de salida"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.split_into
 #: model:ir.model,name:stock.model_stock_split_into
 msgid "Split into"
-msgstr "Dividir en"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0
+msgid "Internal Locations"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
 msgid "Currency for average price"
-msgstr "Moneda para precio promedio"
-
-#. module: stock
-#: help:product.template,property_stock_account_input:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"incoming stock moves will be posted in this account. If not set on the "
-"product, the one from the product category is used."
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
-"asientos del diario para todos los movimientos de stock de entrada se creará "
-"en esta cuenta. Si no se indica en el producto, se utilizará la definida en "
-"la categoría del producto."
 
 #. module: stock
-#: field:report.stock.inventory,location_type:0
-#: field:stock.location,usage:0
+#: help:product.category,property_stock_valuation_account_id:0
+msgid ""
+"When real-time inventory valuation is enabled on a product, this account "
+"will hold the current value of the products."
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,location_type:0 field:stock.location,usage:0
 msgid "Location Type"
-msgstr "Tipo de ubicación"
+msgstr ""
 
 #. module: stock
-#: help:report.stock.move,type:0
-#: help:stock.picking,type:0
+#: help:report.stock.move,type:0 help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
-msgstr "Indica el tipo de envío, recepción o envío de mercancías."
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Item Labels"
-msgstr "Etiquetas artículos"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_move
 msgid "Moves Statistics"
-msgstr "Estadísticas de movimientos"
+msgstr ""
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots Filter"
-msgstr "Filtro lotes de producto"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-#: report:stock.inventory.move:0
-#: report:stock.picking.list:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0 report:stock.picking.list:0
 msgid "["
-msgstr "["
+msgstr ""
 
 #. module: stock
 #: help:stock.production.lot,stock_available:0
@@ -519,58 +514,58 @@ msgid ""
 "Current quantity of products with this Production Lot Number available in "
 "company warehouses"
 msgstr ""
-"Cantidad actual de productos con este número de lote de producción "
-"disponible en almacenes de la compañía."
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
 msgid "Move History (child moves)"
-msgstr "Historial movimientos (movimientos hijos)"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2015
+#: code:addons/stock/stock.py:2125
 #, python-format
 msgid ""
 "There is no stock output account defined for this product or its category: "
 "\"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de salida de stock para este producto o su "
-"categoría: \"%s\" (id: %d)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree6
 #: field:stock.picking,move_lines:0
 msgid "Internal Moves"
-msgstr "Albaranes internos"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,location_dest_id:0
 msgid "Destination Location"
-msgstr "Ubicación destino"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:754
+#: model:ir.model,name:stock.model_stock_partial_move_line
+msgid "stock.partial.move.line"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:760
 #, python-format
 msgid "You can not process picking without stock moves"
-msgstr "No puede procesar un albarán sin movimientos de stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_packaging_stock_action
 #: field:stock.move,product_packaging:0
 msgid "Packaging"
-msgstr "Empaquetado"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Order(Origin)"
-msgstr "Pedido (origen)"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Grand Total:"
-msgstr "Total:"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
@@ -580,53 +575,42 @@ msgid ""
 "buttons on the right of each line. You can filter the products to deliver by "
 "customer, products or sale order (using the Origin field)."
 msgstr ""
-"En esta lista encontrará todos los productos que ha de entregar a sus "
-"clientes. Puede procesar las entregas directamente desde esta lista usando "
-"los botones a la derecha de cada línea. Puede filtrar los productos a "
-"entregar por cliente, producto o pedido de venta (utilizando el campo "
-"origen)."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
 msgid "Inventory Control"
-msgstr "Control inventario"
+msgstr ""
 
 #. module: stock
-#: view:stock.location:0
-#: field:stock.location,comment:0
+#: view:stock.location:0 field:stock.location,comment:0
 msgid "Additional Information"
-msgstr "Información adicional"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Location / Product"
-msgstr "Ubicación / Producto"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1303
+#: field:stock.move,address_id:0
+msgid "Destination Address "
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1333
 #, python-format
 msgid "Reception"
-msgstr "Recepción"
+msgstr ""
 
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
-msgstr "Referencia adicional"
+msgstr ""
 
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
-msgstr "Revisiones de lote de producción"
-
-#. module: stock
-#: help:product.product,track_outgoing:0
-msgid ""
-"Forces to specify a Production Lot for all moves containing this product and "
-"going to a Customer Location"
 msgstr ""
-"Fuerza a indicar un lote de producción para todos los movimientos que "
-"contienen este producto y van a una ubicación del cliente."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_journal_form
@@ -636,97 +620,129 @@ msgid ""
 "worker/team that should perform the operation. Examples of stock journals "
 "may be: quality control, pick lists, packing, etc."
 msgstr ""
-"El sistema de existencias diarias le permite asignar a cada operación de "
-"existencias a un diario específico según el tipo de operación a realizar por "
-"el trabajador/equipo que debe realizar la operación. Ejemplos de diarios de "
-"existencias pueden ser: control de calidad, listas de selección, embalaje, "
-"etc."
 
 #. module: stock
-#: field:stock.location,complete_name:0
-#: field:stock.location,name:0
+#: field:stock.location,complete_name:0 field:stock.location,name:0
 msgid "Location Name"
-msgstr "Nombre ubicación"
+msgstr ""
+
+#. module: stock
+#: model:res.company,overdue_msg:stock.res_company_shop0
+#: model:res.company,overdue_msg:stock.res_company_tinyshop0
+msgid ""
+"Our records indicate that the following payments are still due. If the "
+"amount\n"
+"has already been paid, please disregard this notice. However, if you have "
+"any\n"
+"queries regarding your account, please contact us.\n"
+"Thank you in advance.\n"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Posted Inventory"
-msgstr "Inventario enviado"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: model:ir.actions.act_window,help:stock.action_picking_tree4
+msgid ""
+"The Incoming Shipments is the list of all orders you will receive from your "
+"suppliers. An incoming shipment contains a list of products to be received "
+"according to the original purchase order. You can validate the shipment "
+"totally or partially."
+msgstr ""
+
+#. module: stock
+#: field:stock.move.split.lines,wizard_exist_id:0
+msgid "Parent Wizard (for existing lines)"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
 msgid "Move Information"
-msgstr "Información de movimiento"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2131
+#, python-format
+msgid ""
+"There is no inventory Valuation account defined on the product category: "
+"\"%s\" (id: %d)"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Outgoing"
-msgstr "Salida"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "August"
-msgstr "Agosto"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_tracking_form
 #: model:ir.model,name:stock.model_stock_tracking
-#: model:ir.ui.menu,name:stock.menu_action_tracking_form
-#: view:stock.tracking:0
+#: model:ir.ui.menu,name:stock.menu_action_tracking_form view:stock.tracking:0
 msgid "Packs"
-msgstr "Paquetes"
+msgstr ""
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr "Está intentando asignar un lote que no es del mismo producto"
+msgstr ""
 
 #. module: stock
 #: view:res.partner:0
 msgid "Sales & Purchases"
-msgstr "Ventas y Compras"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "June"
-msgstr "Junio"
+msgstr ""
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
-msgstr "Ubicación de abastecimiento"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
 #: model:ir.ui.menu,name:stock.menu_action_production_lot_form
 #: field:stock.inventory.line.split,line_exist_ids:0
 #: field:stock.inventory.line.split,line_ids:0
-#: field:stock.move.split,line_exist_ids:0
-#: field:stock.move.split,line_ids:0
+#: field:stock.move.split,line_exist_ids:0 field:stock.move.split,line_ids:0
 msgid "Production Lots"
-msgstr "Lotes de producción"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Recipient"
-msgstr "Destinatario"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_refrigerator
+msgid "Refrigerator"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
 #: model:ir.ui.menu,name:stock.menu_action_location_tree
 msgid "Location Structure"
-msgstr "Estructura ubicaciones"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "October"
-msgstr "Octubre"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
 msgid "Inventory Line"
-msgstr "Línea inventario"
+msgstr ""
 
 #. module: stock
 #: help:product.category,property_stock_journal:0
@@ -734,20 +750,27 @@ msgid ""
 "When doing real-time inventory valuation, this is the Accounting Journal in "
 "which entries will be automatically posted when stock moves are processed."
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, este es el diario "
-"contable donde los asientos se crearán automáticamente cuando los "
-"movimientos de stock se procesen."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
 msgid "Process Picking"
-msgstr "Procesar albarán"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:358
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/product.py:417
 #, python-format
 msgid "Future Receptions"
-msgstr "Recepciones futuras"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,priority:0
+msgid "Urgent"
+msgstr ""
 
 #. module: stock
 #: help:stock.inventory.line.split,use_exist:0
@@ -756,149 +779,159 @@ msgid ""
 "Check this option to select existing lots in the list below, otherwise you "
 "should enter new ones line by line."
 msgstr ""
-"Marque esta opción para seleccionar lotes existentes en la lista inferior, "
-"de lo contrario debe introducir otros de nuevos línea por la línea."
+
+#. module: stock
+#: code:addons/stock/product.py:75
+#, python-format
+msgid "Valuation Account is not specified for Product Category: %s"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Destination Move"
-msgstr "Movimiento destino"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Process Now"
-msgstr "Procesar ahora"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,address_id:0
 msgid "Location Address"
-msgstr "Dirección ubicación"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
 msgstr ""
-"Lote de producción se utiliza para poner un número de serie a la producción."
 
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
 msgid "Location Input"
-msgstr "Ubicación de entrada"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,date:0
 msgid "Date of Order"
-msgstr "Fecha de la orden."
+msgstr ""
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Periodical (manual)"
-msgstr "Periódico (manual)"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
 msgid "Procurements"
-msgstr "Abastecimientos"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_3
 msgid "IT Suppliers"
-msgstr "Proveedores TI"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_draft
 msgid "Draft Physical Inventories"
-msgstr "Inventarios físicos borrador"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Transit Location for Inter-Companies Transfers"
-msgstr "Ubicación de tránsito para transferencias inter-compañías"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_auto_packing:0
+msgid "Automatic Move"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_product_quantity
 #: model:ir.model,name:stock.model_stock_change_product_qty
 #: view:stock.change.product.qty:0
 msgid "Change Product Quantity"
-msgstr "Cambiar cantidad producto"
+msgstr ""
+
+#. module: stock
+#: field:report.stock.inventory,month:0
+msgid "unknown"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
 msgid "Merge Inventory"
-msgstr "Fusionar inventario"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:374
+#: code:addons/stock/product.py:433
 #, python-format
 msgid "Future P&L"
-msgstr "P&L futuras"
+msgstr ""
 
 #. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_incoming_product_board
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
-#: view:stock.picking:0
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree4 view:stock.picking:0
 msgid "Incoming Shipments"
-msgstr "Albaranes de entrada"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:report.stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Scrap"
-msgstr "Desecho"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,child_ids:0
 msgid "Contains"
-msgstr "Contiene"
-
-#. module: stock
-#: view:board.board:0
-msgid "Incoming Products Delay"
-msgstr "Retraso albaranes entrada"
+msgstr ""
 
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
-msgstr "Ubicaciones stock"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: view:report.stock.move:0
+msgid "Incoming"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 #: field:stock.move,price_unit:0
 msgid "Unit Price"
-msgstr "Precio un."
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_split_lines_exist
-msgid "Exist Split lines"
-msgstr "Dividir líneas existentes"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,date_expected:0
 msgid "Scheduled Date"
-msgstr "Fecha prevista"
+msgstr ""
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr "Buscar paquete"
-
-#. module: stock
-#: selection:stock.move,priority:0
-msgid "Urgent"
-msgstr "Urgente"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
-#: report:stock.picking.list:0
-msgid "Journal"
-msgstr "Diario"
+msgid "Pickings already processed"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1315
+#: field:stock.partial.move.line,currency:0
+#: field:stock.partial.picking.line,currency:0
+msgid "Currency"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 report:stock.picking.list:0
+msgid "Journal"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1345
 #, python-format
 msgid "is scheduled %s."
 msgstr ""
@@ -910,24 +943,26 @@ 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 ""
-"Déjelo vacío si produce en la ubicación donde los productos terminados son "
-"necesarios. Indique un lugar si produce en una ubicación fija. Esto puede "
-"ser una ubicación de empresa si subcontrata las operaciones de fabricación."
 
 #. module: stock
 #: view:res.partner:0
 msgid "Inventory Properties"
-msgstr "Propiedades inventario"
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,day_diff:0
 msgid "Execution Lead Time (Days)"
-msgstr "Tiempo inicial de ejecución (días)"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_move
+msgid "Partial Move Processing Wizard"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
 msgid "Stock by Location"
-msgstr "Existencias por ubicacion"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,address_id:0
@@ -935,113 +970,88 @@ msgid ""
 "Optional address where goods are to be delivered, specifically used for "
 "allotment"
 msgstr ""
-"Dirección opcional cuando las mercancías deben ser entregadas, utilizado "
-"específicamente para lotes."
 
 #. module: stock
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Month-1"
-msgstr "Mes-1"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
 "By unchecking the active field, you may hide a location without deleting it."
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar la ubicación sin eliminarla."
 
 #. module: stock
-#: model:ir.actions.report.xml,name:stock.report_picking_list
-msgid "Packing list"
-msgstr "Albarán"
+#: code:addons/stock/wizard/stock_inventory_merge.py:44
+#, python-format
+msgid ""
+"Please select multiple physical inventories to merge in the list view."
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Pickings"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
 msgid "Virtual Stock"
-msgstr "Stock virtual"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "View"
-msgstr "Vista"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Last month"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr "Padre izquierdo"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:132
-#, python-format
-msgid "Delivery Information"
-msgstr "Información de envío"
+#: field:product.category,property_stock_valuation_account_id:0
+msgid "Stock Valuation Account"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:48
+#: code:addons/stock/stock.py:1349
 #, python-format
-msgid "Stock Inventory is done"
-msgstr "Inventario de stock realizado"
+msgid "is waiting."
+msgstr ""
 
 #. module: stock
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Error: Código EAN no válido"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:148
+#: code:addons/stock/product.py:147
 #, python-format
 msgid ""
 "There is no stock output account defined for this product: \"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de salida de stock para este producto: \"%s\" "
-"(id: %d)"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
 msgid "Production Location"
-msgstr "Ubicación de producción"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,address_id:0
 msgid "Address of partner"
-msgstr "Dirección de la empresa."
+msgstr ""
 
 #. module: stock
-#: model:res.company,overdue_msg:stock.res_company_shop0
-#: model:res.company,overdue_msg:stock.res_company_tinyshop0
-msgid ""
-"\n"
-"Date: %(date)s\n"
-"\n"
-"Dear %(partner_name)s,\n"
-"\n"
-"Please find in attachment a reminder of all your unpaid invoices, for a "
-"total amount due of:\n"
-"\n"
-"%(followup_amount).2f %(company_currency)s\n"
-"\n"
-"Thanks,\n"
-"--\n"
-"%(user_signature)s\n"
-"%(company_name)s\n"
-"        "
+#: field:report.stock.lines.date,date:0
+msgid "Latest Inventory Date"
 msgstr ""
-"\n"
-"Fecha: %(date)s\n"
-"\n"
-"Estimado %(partner_name)s,\n"
-"\n"
-"En el adjunto encontrará un recordatorio de todas las facturas no pagadas, "
-"por un importe total de:\n"
-"\n"
-"%(followup_amount).2f %(company_currency)s\n"
-"\n"
-"Gracias,\n"
-"--\n"
-"%(user_signature)s\n"
-"%(company_name)s\n"
-"        "
 
 #. module: stock
 #: help:stock.location,usage:0
@@ -1070,91 +1080,76 @@ msgid ""
 "location consumes the raw material and produces finished products\n"
 "                      "
 msgstr ""
-"* Ubicación proveedor: Ubicación virtual que representa la ubicación de "
-"origen para los productos procedentes de sus proveedores.\n"
-"\n"
-"* Vista: Ubicación virtual para crear una estructura jerárquica de su "
-"almacén, agregando sus ubicaciones hijas. No puede contener los productos "
-"directamente.\n"
-"\n"
-"* Ubicación interna: Ubicación física dentro de su propios almacenes.\n"
-"\n"
-"* Ubicación cliente: Ubicación virtual que representa la ubicación de "
-"destino para los productos enviados a sus clientes.\n"
-"\n"
-"* Inventario: Ubicación virtual que actúa como contrapartida de las "
-"operaciones de inventario utilizadas para corregir los niveles de "
-"existencias (inventarios físicos).\n"
-"\n"
-"* Abastecimiento: Ubicación virtual que actúa como contrapartida temporal de "
-"las operaciones de abastecimiento cuando el origen (proveedor o producción) "
-"no se conoce todavía. Esta ubicación debe estar vacía cuando el planificador "
-"de abastecimientos haya terminado de ejecutarse.\n"
-"\n"
-"* Producción: Ubicación virtual de contrapartida para operaciones de "
-"producción: esta ubicación consume la materia prima y produce los productos "
-"terminados.\n"
-"                      "
 
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
 msgid "Author"
-msgstr "Autor"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1302
+#: code:addons/stock/stock.py:1332
 #, python-format
 msgid "Delivery Order"
-msgstr "Albarán de salida"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_memory_in
-msgid "stock.move.memory.in"
-msgstr "stock.movimiento.memoria.entrada"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Manual Operation"
-msgstr "Operación manual"
+msgstr ""
 
 #. module: stock
-#: view:stock.location:0
-#: view:stock.move:0
+#: view:stock.location:0 view:stock.move:0
 msgid "Supplier"
-msgstr "Proveedor"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2727
+#, python-format
+msgid ""
+"In order to cancel this inventory, you must first unpost related journal "
+"entries."
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,date_done:0
 msgid "Date Done"
-msgstr "Fecha realizado"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:148
+#, python-format
+msgid ""
+"The uom rounding does not allow you to ship \"%s %s\", only roundings of "
+"\"%s %s\" is accepted by the uom."
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock moves that are Available (Ready to process)"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Expected Shipping Date"
-msgstr "Fecha de envío prevista"
-
-#. module: stock
-#: selection:stock.move,state:0
-msgid "Not Available"
-msgstr "No disponible"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "March"
-msgstr "Marzo"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
 #: model:ir.model,name:stock.model_stock_inventory_line_split
-#: view:stock.inventory:0
-#: view:stock.inventory.line:0
+#: view:stock.inventory:0 view:stock.inventory.line:0
 msgid "Split inventory lines"
-msgstr "Dividir líneas de inventario"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Physical Inventory"
-msgstr "Inventario físico"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_company_id:0
@@ -1162,9 +1157,6 @@ msgid ""
 "The company the Picking List containing the chained move will belong to "
 "(leave empty to use the default company determination rules"
 msgstr ""
-"La compañía a la que pertenece el albarán que contiene el movimiento "
-"encadenado (dejarlo vacío para utilizar las reglas por defecto para "
-"determinar la compañía)."
 
 #. module: stock
 #: help:stock.location,chained_picking_type:0
@@ -1173,53 +1165,53 @@ msgid ""
 "empty to automatically detect the type based on the source and destination "
 "locations)."
 msgstr ""
-"Tipo de envío del albarán que va a contener el movimiento encadenado (dejar "
-"vacío para detectar automáticamente el tipo basado en las ubicaciones de "
-"origen y destino)."
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Lot number"
-msgstr "Número de lote"
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory.line,product_uom:0
-#: field:stock.move.consume,product_uom:0
-#: field:stock.move.scrap,product_uom:0
+#: field:stock.move.consume,product_uom:0 field:stock.move.scrap,product_uom:0
 msgid "Product UOM"
-msgstr "UdM del producto"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr "Ubicaciones de empresas"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
+msgid "Current year"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Total quantity"
-msgstr "Cantidad total"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_consume
 #: view:stock.move.consume:0
 msgid "Consume Move"
-msgstr "Movimiento consumo"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
 msgid "European Customers"
-msgstr "Clientes europeos"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_delay:0
 msgid "Delay between original move and chained move in days"
-msgstr "Retraso entre movimiento original y movimiento encadenado en días."
+msgstr ""
 
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
-msgstr "Importar inventario de productos actual para la siguiente ubicación"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1230,17 +1222,21 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"Se utiliza sólo si selecciona un tipo de ubicación encadenada.\n"
-"La opción 'Movimiento automático' creará un movimiento de stock después del "
-"actual que se validará automáticamente. Con 'Operación manual', el "
-"movimiento de stock debe ser validado por un trabajador. Con 'Mov. "
-"automático, paso no añadido', la ubicación se reemplaza en el movimiento "
-"original."
 
 #. module: stock
-#: view:stock.production.lot:0
-msgid "Downstream Traceability"
-msgstr "Trazabilidad hacia abajo"
+#: view:stock.tracking:0
+msgid "Pack Identification"
+msgstr ""
+
+#. module: stock
+#: report:stock.picking.list:0
+msgid "Packing List:"
+msgstr ""
+
+#. module: stock
+#: selection:stock.move,state:0
+msgid "Waiting Another Move"
+msgstr ""
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1249,25 +1245,24 @@ msgid ""
 "default one, as the source location for stock moves generated by production "
 "orders"
 msgstr ""
-"Para los productos actuales, esta ubicación de stock se utilizará, en lugar "
-"de la de por defecto, como la ubicación de origen para los movimientos de "
-"stock generados por las órdenes de producción."
 
 #. module: stock
-#: code:addons/stock/stock.py:2006
-#, python-format
-msgid ""
-"Can not create Journal Entry, Output Account defined on this product and "
-"Variant account on category of this product are same."
+#: view:product.product:0
+msgid "Expected Stock Variations"
 msgstr ""
-"No se puede crear el asiento, la cuenta de salida definida en este producto "
-"y la cuenta variante de la categoría de producto son la misma."
 
 #. module: stock
-#: code:addons/stock/stock.py:1319
+#: help:stock.move,price_unit:0
+msgid ""
+"Technical field used to record the product cost set by the user during a "
+"picking confirmation (when average price costing method is used)"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1350
 #, python-format
 msgid "is in draft state."
-msgstr "está en estado borrador."
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_tracking_form
@@ -1275,242 +1270,228 @@ msgid ""
 "This is the list of all your packs. When you select a Pack, you can get the "
 "upstream or downstream traceability of the products contained in the pack."
 msgstr ""
-"Esta es la lista de todos sus albaranes. Cuando selecciona un albarán, puede "
-"obtener la trazabilidad hacia arriba o hacia abajo de los productos que "
-"forman este paquete."
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_ups_final
-msgid "Stock ups final"
-msgstr "Stock ups final"
-
-#. module: stock
-#: field:stock.location,chained_auto_packing:0
-msgid "Chaining Type"
-msgstr "Tipo encadenado"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
-#, python-format
+#: selection:stock.return.picking,invoice_state:0
 msgid "To be refunded/invoiced"
-msgstr "Para ser abonado/facturado"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
 msgid "Shop 1"
-msgstr "Tienda 1"
+msgstr ""
 
 #. module: stock
-#: view:stock.change.product.qty:0
-#: view:stock.change.standard.price:0
-#: view:stock.fill.inventory:0
-#: view:stock.inventory.merge:0
-#: view:stock.invoice.onshipping:0
-#: view:stock.location.product:0
-#: view:stock.move:0
-#: view:stock.move.track:0
-#: view:stock.picking:0
-#: view:stock.split.into:0
+#: view:stock.change.product.qty:0 view:stock.change.standard.price:0
+#: view:stock.fill.inventory:0 view:stock.inventory.merge:0
+#: view:stock.invoice.onshipping:0 view:stock.location.product:0
+#: view:stock.move:0 view:stock.partial.move:0 view:stock.partial.picking:0
+#: view:stock.picking:0 view:stock.return.picking:0 view:stock.split.into:0
 msgid "_Cancel"
-msgstr "_Cancelar"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Ready"
-msgstr "Preparado"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Calendar View"
-msgstr "Vista calendario"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional Info"
-msgstr "Información adicional"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1619
-#, python-format
-msgid "Operation forbidden"
-msgstr "Operación prohibida"
+#: field:stock.partial.move.line,move_id:0
+#: field:stock.partial.picking.line,move_id:0
+#: field:stock.return.picking.memory,move_id:0
+msgid "Move"
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,from_date:0
 msgid "From"
-msgstr "Desde"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:77
-#, python-format
-msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
-"¡Sólo puede devolver albaranes que estén confirmados, reservados o "
-"realizados!"
 
 #. module: stock
 #: view:stock.picking:0
-#: field:stock.picking,invoice_state:0
+msgid "Incoming Shipments already processed"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#, python-format
+msgid "You may only return pickings that are Confirmed, Available or Done!"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0 field:stock.picking,invoice_state:0
 msgid "Invoice Control"
-msgstr "Control factura"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
 msgid "Production lot revisions"
-msgstr "Revisiones de lote de producción"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Picking List"
-msgstr "Albarán interno"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
+#: selection:report.stock.move,state:0 view:stock.picking:0
 msgid "Waiting"
-msgstr "En espera"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: selection:stock.move.split.lines,action:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Split"
-msgstr "Dividir"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Search Stock Picking"
-msgstr "Buscar albarán stock"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:93
+#: code:addons/stock/product.py:92
 #, python-format
 msgid "Company is not specified in Location"
-msgstr "No se ha especificado una compañía en la ubicación"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
-#: field:stock.partial.move,type:0
 msgid "Type"
-msgstr "Tipo"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Available Pickings"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
 msgid "Generic IT Suppliers"
-msgstr "Proveedores TI genéricos"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock to be receive"
+msgstr ""
+
+#. module: stock
+#: help:stock.location,valuation_out_account_id:0
+msgid ""
+"Used for real-time inventory valuation. When set on a virtual location (non "
+"internal type), this account will be used to hold the value of products "
+"being moved out of this location and into an internal location, instead of "
+"the generic Stock Output Account set on the product. This has no effect for "
+"internal locations."
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Picking List:"
-msgstr "Albarán:"
+msgstr ""
 
 #. module: stock
-#: field:stock.inventory,date:0
-#: field:stock.move,create_date:0
-#: field:stock.production.lot,date:0
-#: field:stock.tracking,date:0
+#: field:stock.inventory,date:0 field:stock.move,create_date:0
+#: field:stock.production.lot,date:0 field:stock.tracking,date:0
 msgid "Creation Date"
-msgstr "Fecha creación"
+msgstr ""
 
 #. module: stock
 #: field:report.stock.lines.date,id:0
 msgid "Inventory Line Id"
-msgstr "Id línea de inventario"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,address_id:0
 msgid "Address of  customer or supplier."
-msgstr "Dirección del cliente o proveedor."
+msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,picking_id:0
+#: view:report.stock.move:0 field:report.stock.move,picking_id:0
 msgid "Packing"
-msgstr "Albarán"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr "Ubicación del cliente"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:85
+#: code:addons/stock/stock.py:2312
 #, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
+msgid "You can only delete draft moves."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:139
-#, python-format
-msgid "Receive Information"
-msgstr "Información de recepción"
+#: model:ir.model,name:stock.model_stock_inventory_line_split_lines
+msgid "Inventory Split lines"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr "Resumen inventario ubicación"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_replacement
-msgid "Stock Replacement"
-msgstr "Reemplazo stock"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "General Informations"
-msgstr "Información general"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_location_type:0
-msgid "None"
-msgstr "Ninguno"
+#: view:report.stock.inventory:0
+msgid "Analysis including future moves (similar to virtual stock)"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action3
-#: view:stock.tracking:0
+#: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
 msgid "Downstream traceability"
-msgstr "Trazabilidad hacia abajo"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #, python-format
 msgid "No Invoices were created"
-msgstr "No se han creado facturas"
+msgstr ""
 
 #. module: stock
-#: model:stock.location,name:stock.stock_location_company
-msgid "OpenERP S.A."
-msgstr "OpenERP S.A."
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:140
-#, python-format
-msgid "Receive"
-msgstr "Recibir"
+#: field:stock.location,posy:0
+msgid "Shelves (Y)"
+msgstr ""
 
 #. module: stock
 #: help:stock.incoterms,active:0
 msgid ""
 "By unchecking the active field, you may hide an INCOTERM without deleting it."
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar un INCOTERM sin eliminarlo."
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-#: field:stock.picking,date:0
+#: view:stock.move:0 view:stock.picking:0 field:stock.picking,date:0
 msgid "Order Date"
-msgstr "Fecha orden"
+msgstr ""
 
 #. module: stock
-#: field:stock.location,location_id:0
+#: code:addons/stock/wizard/stock_change_product_qty.py:88
+#, python-format
+msgid "INV: %s"
+msgstr ""
+
+#. module: stock
+#: view:stock.location:0 field:stock.location,location_id:0
 msgid "Parent Location"
-msgstr "Ubicación padre"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,state:0
@@ -1523,44 +1504,34 @@ msgid ""
 "* Done: has been processed, can't be modified or cancelled anymore\n"
 "* Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
-"* Borrador: No se ha confirmado todavía y no se planificará hasta que se "
-"confirme.\n"
-"* Confirmado: A la espera de la disponibilidad de productos.\n"
-"* Reservado: Productos reservados, esperando la confirmación del envío.\n"
-"* En espera: Esperando que otro movimiento se realice antes de que sea "
-"disponible de forma automática (por ejemplo, en flujos "
-"Obtener_bajo_pedido).\n"
-"* Realizado: Ha sido procesado, no se puede modificar o cancelar nunca más.\n"
-"* Cancelado: Se ha cancelado, no se puede confirmar nunca más."
 
 #. module: stock
 #: help:stock.location,company_id:0
 msgid "Let this field empty if this location is shared between all companies"
 msgstr ""
-"Deje este campo vacío si esta ubicación está compartida entre todas las "
-"compañías."
 
 #. module: stock
-#: code:addons/stock/stock.py:2233
+#: code:addons/stock/stock.py:2337
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
-msgstr "¡Introduzca una cantidad positiva a desechar!"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,chained_delay:0
 msgid "Chaining Lead Time"
-msgstr "Tiempo inicial encadenado"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:85
-#, python-format
-msgid "Cannot deliver products which are already delivered !"
-msgstr "¡No se pueden enviar productos que ya están enviados!"
+#: help:product.product,track_outgoing:0
+msgid ""
+"Forces to specify a Production Lot for all moves containing this product and "
+"going to a Customer Location"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
-msgstr "Stock factura en el envío"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,state:0
@@ -1572,36 +1543,31 @@ msgid ""
 " When the picking is done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
-"Cuando se crea un movimiento de stock está en estado 'Borrador'.\n"
-" Después se establece en estado 'No disponible' si el planificador no ha "
-"encontrado los productos.\n"
-" Cuando los productos están reservados se establece como 'Reservado'.\n"
-" Cuando el albarán se envía el estado es 'Realizado'.              \n"
-"El estado es 'En espera' si el movimiento está a la espera de otro."
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: field:res.partner,property_stock_supplier:0
 #: selection:stock.location,usage:0
 msgid "Supplier Location"
-msgstr "Ubicación del proveedor"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2254
+#: code:addons/stock/stock.py:2358
 #, python-format
 msgid "were scrapped"
-msgstr "estaban desechados"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Partial"
-msgstr "Parcial"
+#: help:stock.partial.move.line,currency:0
+#: help:stock.partial.picking.line,currency:0
+msgid "Currency in which Unit cost is expressed"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "September"
-msgstr "Septiembre"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,backorder_id:0
@@ -1609,283 +1575,271 @@ msgid ""
 "If this picking was split this field links to the picking that contains the "
 "other part that has been processed already."
 msgstr ""
-"Si este albarán se dividió, este campo enlaza con el albarán que contiene la "
-"otra parte que ya ha sido procesada."
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
 msgid "Stock Statistics"
-msgstr "Estadísticas de stock"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.memory.in,currency:0
-#: field:stock.move.memory.out,currency:0
-msgid "Currency"
-msgstr "Moneda"
+#: view:report.stock.move:0
+msgid "Month Planned"
+msgstr ""
 
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Manufacturing Lots"
-msgstr "Lotes seguimiento de fabricación"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_inventory_merge.py:44
-#, python-format
-msgid ""
-"Please select multiple physical inventories to merge in the list view."
+#: view:stock.picking:0
+msgid "Is a Back Order"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,valuation_out_account_id:0
+msgid "Stock Valuation Account (Outgoing)"
 msgstr ""
-"Seleccione varios inventarios físicos para fusionar en la vista lista."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
 #: model:ir.actions.act_window,name:stock.action_move_form2
-#: model:ir.ui.menu,name:stock.menu_action_move_form2
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
-#: view:stock.production.lot:0
+#: model:ir.ui.menu,name:stock.menu_action_move_form2 view:stock.inventory:0
+#: view:stock.move:0 view:stock.picking:0 view:stock.production.lot:0
 #: view:stock.tracking:0
 msgid "Stock Moves"
-msgstr "Movimientos de stock"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,type:0
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Sending Goods"
-msgstr "Envío mercancías"
+msgstr ""
+
+#. module: stock
+#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
+msgid "Product Categories"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Cancel Availability"
-msgstr "Cancelar disponibilidad"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,date_expected:0
 msgid "Scheduled date for the processing of this move"
-msgstr "Fecha planificada para el procesado de este movimiento."
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory,move_ids:0
 msgid "Created Moves"
-msgstr "Movimientos creados"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,valuation_in_account_id:0
+msgid "Stock Valuation Account (Incoming)"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
-msgstr "Estante 2"
+msgstr ""
 
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Tracking lot"
-msgstr "Lote seguimiento"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr "Albaranes pendientes"
+msgstr ""
 
 #. module: stock
-#: view:product.product:0
-#: view:product.template:0
+#: view:product.product:0 view:product.template:0
 msgid "Counter-Part Locations Properties"
-msgstr "Propiedades de las ubicaciones parte recíproca"
+msgstr ""
 
 #. module: stock
 #: view:stock.location:0
 msgid "Localization"
-msgstr "Ubicación"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_report_tracklots
-msgid "Stock report by tracking lots"
-msgstr "Informe de stock por lotes de seguimiento"
-
-#. module: stock
-#: code:addons/stock/product.py:370
+#: code:addons/stock/product.py:429
 #, python-format
 msgid "Delivered Qty"
-msgstr "Ctdad enviada"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line
-#: view:stock.inventory.line.split:0
-#: view:stock.move.split:0
+#: view:stock.inventory.line.split:0 view:stock.move.split:0
 msgid "Split in lots"
-msgstr "Dividir en lotes"
+msgstr ""
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Numbers"
-msgstr "Números lote de producción"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,date:0
-#: field:report.stock.move,date:0
-#: view:stock.inventory:0
-#: report:stock.inventory.move:0
-#: view:stock.move:0
-#: field:stock.move,date:0
-#: field:stock.partial.move,date:0
-#: field:stock.partial.picking,date:0
+#: help:product.template,property_stock_account_output:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"outgoing stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the destination location. When not set on "
+"the product, the one from the product category is used."
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Day Planned"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.inventory:0 field:report.stock.inventory,date:0
+#: field:report.stock.move,date:0 view:stock.inventory:0
+#: report:stock.inventory.move:0 view:stock.move:0 field:stock.move,date:0
+#: field:stock.partial.move,date:0 field:stock.partial.picking,date:0
 #: view:stock.picking:0
 msgid "Date"
-msgstr "Fecha"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
+msgstr ""
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
-msgstr "Ubicación stock"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:64
 #, python-format
 msgid "Merging is only allowed on draft inventories."
-msgstr "La fusión sólo es permitida en inventarios borrador."
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_dashboard_stock
 msgid "Dashboard"
-msgstr "Tablero"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_move_track
-msgid "Track moves"
-msgstr "Movimientos seguimiento"
+msgstr ""
 
 #. module: stock
 #: field:stock.incoterms,code:0
 msgid "Code"
-msgstr "Código"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory.line.split:0
 msgid "Lots Number"
-msgstr "Número lotes"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.open_board_warehouse
 #: model:ir.ui.menu,name:stock.menu_board_warehouse
 msgid "Warehouse Dashboard"
-msgstr "Tablero almacén"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:512
+#: code:addons/stock/stock.py:513
 #, python-format
 msgid "You can not remove a lot line !"
-msgstr "¡No puede eliminar una línea de lote!"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_move_scrap
-#: view:stock.move:0
-#: view:stock.move.scrap:0
-#: view:stock.picking:0
+#: model:ir.model,name:stock.model_stock_move_scrap view:stock.move:0
+#: view:stock.move.scrap:0 view:stock.picking:0
 msgid "Scrap Products"
-msgstr "Desechar productos"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1128
+#: code:addons/stock/stock.py:1157
 #, python-format
 msgid "You cannot remove the picking which is in %s state !"
-msgstr "¡No puede eliminar el albarán que está en estado %s!"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line.split:0
-#: view:stock.move.consume:0
-#: view:stock.move.scrap:0
-#: view:stock.move.split:0
-#: view:stock.picking:0
+#: view:stock.inventory.line.split:0 view:stock.move.consume:0
+#: view:stock.move.scrap:0 view:stock.move.split:0 view:stock.picking:0
 msgid "Cancel"
-msgstr "Cancelar"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking
 #: model:ir.model,name:stock.model_stock_return_picking
 msgid "Return Picking"
-msgstr "Devolver albarán"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Split in production lots"
-msgstr "Dividir en lotes de producción"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_location
-#: view:report.stock.inventory:0
+#: field:product.product,location_id:0 view:report.stock.inventory:0
 #: field:report.stock.inventory,location_id:0
 #: field:stock.change.product.qty,location_id:0
 #: field:stock.fill.inventory,location_id:0
-#: field:stock.inventory.line,location_id:0
-#: report:stock.inventory.move:0
-#: view:stock.location:0
-#: view:stock.move:0
-#: field:stock.move.consume,location_id:0
-#: field:stock.move.scrap,location_id:0
-#: field:stock.picking,location_id:0
-#: report:stock.picking.list:0
+#: field:stock.inventory.line,location_id:0 report:stock.inventory.move:0
+#: view:stock.location:0 view:stock.move:0
+#: field:stock.move.consume,location_id:0 field:stock.move.scrap,location_id:0
+#: field:stock.partial.move.line,location_id:0
+#: field:stock.partial.picking.line,location_id:0
+#: field:stock.picking,location_id:0 report:stock.picking.list:0
 #: field:stock.report.prodlots,location_id:0
 #: field:stock.report.tracklots,location_id:0
 msgid "Location"
-msgstr "Ubicación"
+msgstr ""
 
 #. module: stock
 #: view:product.template:0
 msgid "Information"
-msgstr "Información"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Shipping Address :"
-msgstr "Dirección de envío:"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:115
-#, python-format
-msgid "Provide the quantities of the returned products."
-msgstr "Indique las cantidades de los productos devueltos."
-
-#. module: stock
-#: code:addons/stock/stock.py:2009
-#, python-format
-msgid ""
-"Can not create Journal Entry, Input Account defined on this product and "
-"Variant account on category of this product are same."
 msgstr ""
-"No se puede crear el asiento, la cuenta de entrada definido en este producto "
-"y la cuenta variante en la categoría del producto son la misma."
+
+#. module: stock
+#: help:stock.location,valuation_in_account_id:0
+msgid ""
+"Used for real-time inventory valuation. When set on a virtual location (non "
+"internal type), this account will be used to hold the value of products "
+"being moved from an internal location into this location, instead of the "
+"generic Stock Output Account set on the product. This has no effect for "
+"internal locations."
+msgstr ""
+
+#. module: stock
+#: view:stock.return.picking:0
+msgid "Provide the quantities of the returned products."
+msgstr ""
 
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Cost Price"
-msgstr "Precio coste"
+msgstr ""
 
 #. module: stock
-#: view:product.product:0
-#: field:product.product,valuation:0
+#: view:product.product:0 field:product.product,valuation:0
 msgid "Inventory Valuation"
-msgstr "Valoración inventario"
-
-#. module: stock
-#: view:stock.picking:0
-msgid "Create Invoice"
-msgstr "Crear factura"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
-#: view:stock.picking:0
+msgid "Orders planned for today"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
 msgid "Process Later"
-msgstr "Procesar más tarde"
+msgstr ""
 
 #. module: stock
 #: help:res.partner,property_stock_supplier:0
@@ -1893,24 +1847,11 @@ 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 ""
-"Esta ubicación de stock será utilizada, en lugar de la ubicación por "
-"defecto, como la ubicación de origen para recibir mercancías desde esta "
-"empresa"
 
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
-msgstr "Dirección propietario"
-
-#. module: stock
-#: help:stock.move,price_unit:0
-msgid ""
-"Technical field used to record the product cost set by the user during a "
-"picking confirmation (when average price costing method is used)"
 msgstr ""
-"Campo técnico utilizado para registrar el coste del producto indicado por el "
-"usuario durante una confirmación de albarán (cuando se utiliza el método del "
-"precio medio de coste)."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_move_report
@@ -1919,51 +1860,58 @@ msgid ""
 "moves. Use this report when you want to analyse the different routes taken "
 "by your products and inventory management performance."
 msgstr ""
-"El análisis de movimientos le permite analizar y verificar fácilmente los "
-"movimientos de stock de su compañía. Utilice este informe cuando quiera "
-"analizar las diferentes rutas tomadas por sus productos y el rendimiento de "
-"la gestión de su inventario."
+
+#. module: stock
+#: code:addons/stock/stock.py:2116
+#, python-format
+msgid ""
+"Can not create Journal Entry, Output Account defined on this product and "
+"Valuation account on category of this product are same."
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
 msgid "Planned Lead Time (Days)"
-msgstr "Tiempo inicial planificado (días)"
+msgstr ""
 
 #. module: stock
 #: field:stock.change.standard.price,new_price:0
 msgid "Price"
-msgstr "Precio"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_return_picking_memory
+msgid "stock.return.picking.memory"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Search Inventory"
-msgstr "Buscar inventario"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.track,quantity:0
-msgid "Quantity per lot"
-msgstr "Cantidad por lote"
+#: model:ir.model,name:stock.model_stock_report_tracklots
+msgid "Stock report by tracking lots"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2012
+#: code:addons/stock/stock.py:2122
 #, python-format
 msgid ""
 "There is no stock input account defined for this product or its category: "
 "\"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de entrada de stock para este producto o su "
-"categoría: \"%s\" (id: %d)"
 
 #. module: stock
-#: code:addons/stock/product.py:360
+#: code:addons/stock/product.py:419
 #, python-format
 msgid "Received Qty"
-msgstr "Ctdad recibida"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Reference"
-msgstr "Referencia interna"
+msgstr ""
 
 #. module: stock
 #: help:stock.production.lot,prefix:0
@@ -1971,73 +1919,32 @@ msgid ""
 "Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
 "[INT_REF]"
 msgstr ""
-"Prefijo opcional a añadir cuando se muestre el número de serie: "
-"PREFIJO/SERIE [REF_INT]"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
 #: model:ir.model,name:stock.model_stock_fill_inventory
 #: view:stock.fill.inventory:0
 msgid "Import Inventory"
-msgstr "Importar inventario"
+msgstr ""
 
 #. module: stock
-#: field:stock.incoterms,name:0
-#: field:stock.move,name:0
+#: field:stock.incoterms,name:0 field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
-msgstr "Nombre"
+msgstr ""
 
 #. module: stock
 #: view:product.product:0
 msgid "Stocks"
-msgstr "Stocks"
+msgstr ""
 
 #. module: stock
-#: model:ir.module.module,description:stock.module_meta_information
+#: help:stock.partial.move,hide_tracking:0
+#: help:stock.partial.picking,hide_tracking:0
 msgid ""
-"OpenERP Inventory 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"
-"* Dashboard for warehouse that includes:\n"
-"    * Products to receive in delay (date < = today)\n"
-"    * Procurement in exception\n"
-"    * Graph : Number of Receive products vs planned (bar graph on week par "
-"day)\n"
-"    * Graph : Number of Delivery products vs planned (bar graph on week par "
-"day)\n"
-"    "
+"This field is for internal purpose. It is used to decide if the column "
+"prodlot has to be shown on the move_ids field or not"
 msgstr ""
-"El módulo de OpenERP de gestión de inventario puede gestionar múltiples "
-"almacenes, y varias ubicaciones estructuradas.\n"
-"Gracias a la gestión de doble entrada, el control de inventario es potente y "
-"flexible:\n"
-"* Historial de movimientos y planificación,\n"
-"* Diferentes métodos de inventario (FIFO, LIFO, ...)\n"
-"* Valoración de existencias (precio estándar o medio, ...)\n"
-"* Robustez frente a las diferencias de inventario\n"
-"* Normas de reordenación automática (nivel de existencias, JIT, ...)\n"
-"* Código de barras soportado\n"
-"* Detección rápida de errores a través del sistema de entrada doble\n"
-"* Trazabilidad (hacia arriba/hacia abajo, lotes de producción, número de "
-"serie, ...)\n"
-"* Panel de almacén que incluye:\n"
-"    * Productos a recibir con retraso (fecha <= hoy)\n"
-"    * Compras en excepción\n"
-"    * Gráfico: Número de productos Recibidos frente al previsto (gráfico de "
-"barras semanal por día)\n"
-"    * Gráfico: Número de productos Entregados frente al previsto (gráfico de "
-"barras semanal por día)\n"
-"    "
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -2046,49 +1953,47 @@ msgid ""
 "default one, as the source location for stock moves generated when you do an "
 "inventory"
 msgstr ""
-"Para los productos actuales, esta ubicación de stock se utilizará, en lugar "
-"de la por defecto, como la ubicación de origen para los movimientos de stock "
-"generados cuando realiza un inventario."
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Stockable"
-msgstr "Almacenable"
+msgstr ""
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Real Time (automated)"
-msgstr "Tiempo real (automatizado)"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid "Logistical shipping unit: pallet, box, pack ..."
-msgstr "Unidad de envío logística: Palet, caja, paquete, ..."
+msgstr ""
 
 #. module: stock
-#: view:stock.change.product.qty:0
-#: view:stock.change.standard.price:0
+#: view:stock.location:0
+msgid "Customer Locations"
+msgstr ""
+
+#. module: stock
+#: view:stock.change.product.qty:0 view:stock.change.standard.price:0
 msgid "_Apply"
-msgstr "_Aplicar"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
-#: report:stock.inventory.move:0
-#: report:stock.picking.list:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
+#: report:stock.inventory.move:0 report:stock.picking.list:0
 msgid "]"
-msgstr "]"
+msgstr ""
 
 #. module: stock
 #: field:product.template,property_stock_inventory:0
 msgid "Inventory Location"
-msgstr "Ubicación de inventario"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Total value"
-msgstr "Valor total"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_journal_id:0
@@ -2096,55 +2001,56 @@ msgid ""
 "Inventory Journal in which the chained move will be written, if the Chaining "
 "Type is not Transparent (no journal is used if left empty)"
 msgstr ""
-"Diario de inventario en el que el movimiento encadenado será escrito, si el "
-"tipo de encadenamiento no es transparente (no se utiliza ningún diario si se "
-"deja vacío)."
-
-#. module: stock
-#: view:board.board:0
-#: model:ir.actions.act_window,name:stock.action_incoming_product_board
-msgid "Incoming Product"
-msgstr "Albarán de entrada"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Creation"
-msgstr "Creación"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.memory.in,cost:0
-#: field:stock.move.memory.out,cost:0
+#: view:report.stock.inventory:0
+msgid ""
+"Analysis of current inventory (only moves that have already been processed)"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,cost:0
+#: field:stock.partial.picking.line,cost:0
 msgid "Cost"
-msgstr "Coste"
+msgstr ""
 
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
 #: field:product.template,property_stock_account_input:0
 #: field:stock.change.standard.price,stock_account_input:0
-#: field:stock.location,valuation_in_account_id:0
 msgid "Stock Input Account"
-msgstr "Cuenta entrada stock"
+msgstr "Cuenta por pagar transitoria o Gasto"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Shipping type specify, goods coming in or going out"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
 #: model:ir.ui.menu,name:stock.menu_warehouse_config
 msgid "Warehouse Management"
-msgstr "Gestión de almacenes"
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "Partial Delivery"
-msgstr "Entrega parcial"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr "Mov. automático, paso no añadido"
+msgstr ""
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "Stock Location Analysis"
-msgstr "Análisis ubicación stock"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,date:0
@@ -2152,57 +2058,46 @@ msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
 msgstr ""
-"Fecha del movimiento: Fecha planificada hasta que el movimiento esté "
-"realizado, después fecha real en que el movimiento ha sido procesado."
 
 #. module: stock
-#: field:report.stock.lines.date,date:0
-msgid "Latest Inventory Date"
-msgstr "Fecha último inventario"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
-#: view:stock.inventory:0
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
+#: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "Group By..."
-msgstr "Agrupar por..."
+msgstr ""
 
 #. module: stock
 #: view:stock.location:0
 msgid "Chained Locations"
-msgstr "Ubicaciones encadenadas"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
 msgid "Inventory loss"
-msgstr "Pérdidas de inventario"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1311
+#: code:addons/stock/stock.py:1341
 #, python-format
 msgid "Document"
-msgstr "Documento"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Picking List"
-msgstr "Albarán de entrada"
+msgstr ""
 
 #. module: stock
-#: field:stock.move,product_uom:0
-#: field:stock.move.memory.in,product_uom:0
-#: field:stock.move.memory.out,product_uom:0
+#: field:stock.move,product_uom:0 field:stock.partial.move.line,product_uom:0
+#: field:stock.partial.picking.line,product_uom:0
 msgid "Unit of Measure"
-msgstr "Unidad de medida"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:176
+#: code:addons/stock/product.py:175
 #, python-format
 msgid "Products: "
-msgstr "Productos: "
+msgstr ""
 
 #. module: stock
 #: help:product.product,track_production:0
@@ -2210,142 +2105,122 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "generated by a Manufacturing Order"
 msgstr ""
-"Fuerza a especificar un lote de producción para todos los movimientos que "
-"contienen este producto y generados por una orden de fabricación."
-
-#. module: stock
-#: model:ir.actions.act_window,name:stock.track_line_old
-#: view:stock.move.track:0
-msgid "Tracking a move"
-msgstr "Seguimiento de un movimiento"
 
 #. module: stock
 #: view:product.product:0
 msgid "Update"
-msgstr "Actualizar"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Set to Draft"
-msgstr "Cambiar a borrador"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_journal_form
 #: model:ir.ui.menu,name:stock.menu_action_stock_journal_form
 msgid "Stock Journals"
-msgstr "Diarios de stock"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,type:0
 msgid "Others"
-msgstr "Otros"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:90
+#: code:addons/stock/product.py:89
 #, python-format
 msgid "Could not find any difference between standard price and new price!"
 msgstr ""
-"¡No se puede encontrar ninguna diferencia entre precio estándar y precio "
-"nuevo!"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_partial_picking
-msgid "Partial Picking"
-msgstr "Empaquetado parcial"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_scrapped
 #: field:stock.move,scrapped:0
 msgid "Scrapped"
-msgstr "Desechado"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Products "
-msgstr "Productos "
+msgstr ""
 
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incoming Lots"
-msgstr "Lotes de seguimiento de entrada"
+msgstr ""
 
 #. module: stock
 #: view:board.board:0
 msgid "Warehouse board"
-msgstr "Tablero almacén"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:380
+#: code:addons/stock/product.py:439
 #, python-format
 msgid "Future Qty"
-msgstr "Ctdad futura"
+msgstr ""
 
 #. module: stock
-#: field:product.category,property_stock_variation:0
-msgid "Stock Variation Account"
-msgstr "Cuenta variación stock"
-
-#. module: stock
-#: field:stock.move,note:0
-#: view:stock.picking:0
-#: field:stock.picking,note:0
+#: field:stock.move,note:0 view:stock.picking:0 field:stock.picking,note:0
 msgid "Notes"
-msgstr "Notas"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Value"
-msgstr "Valor"
+msgstr ""
 
 #. module: stock
-#: field:report.stock.move,type:0
-#: field:stock.location,chained_picking_type:0
+#: field:report.stock.move,type:0 field:stock.location,chained_picking_type:0
 #: field:stock.picking,type:0
 msgid "Shipping Type"
-msgstr "Tipo de envío"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2210
-#, python-format
-msgid "You can only delete draft moves."
-msgstr "Sólo puede eliminar movimientos borrador."
+#: view:stock.move:0
+msgid "Stock moves that are Confirmed, Available or Waiting"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
 #: model:ir.actions.act_window,name:stock.act_product_location_open
-#: model:ir.ui.menu,name:stock.menu_stock_products_menu
-#: view:stock.inventory:0
-#: view:stock.picking:0
-#, python-format
+#: model:ir.ui.menu,name:stock.menu_product_in_config_stock
+#: model:ir.ui.menu,name:stock.menu_stock_product
+#: model:ir.ui.menu,name:stock.menu_stock_products_menu view:stock.inventory:0
+#: view:stock.partial.move:0 view:stock.partial.picking:0 view:stock.picking:0
 msgid "Products"
-msgstr "Productos"
+msgstr ""
+
+#. module: stock
+#: selection:stock.location,chained_location_type:0
+msgid "None"
+msgstr ""
 
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Change Price"
-msgstr "Cambiar precio"
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,move_type:0
 msgid "Delivery Method"
-msgstr "Método entrega"
+msgstr ""
 
 #. module: stock
 #: help:report.stock.move,location_dest_id:0
-#: help:stock.move,location_dest_id:0
-#: help:stock.picking,location_dest_id:0
+#: help:stock.move,location_dest_id:0 help:stock.picking,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr "Ubicación donde el sistema almacenará los productos finalizados."
+msgstr ""
 
 #. module: stock
-#: help:product.category,property_stock_variation:0
-msgid ""
-"When real-time inventory valuation is enabled on a product, this account "
-"will hold the current value of the products."
+#: view:stock.move:0
+msgid "Stock to be delivered (Available or not)"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_stock_outgoing_product_delay
+msgid "Outgoing Products"
 msgstr ""
-"Cuando está activada una valoración de inventario en tiempo real de un "
-"producto, esta cuenta contiene el valor actual de los productos."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2356,50 +2231,48 @@ msgid ""
 "the supplier or the purchase order reference. Then you can confirm all "
 "products received using the buttons on the right of each line."
 msgstr ""
-"Aquí podrá recibir los productos individuales, sin importar de que pedido de "
-"compra o albarán de entrada provienen. Encontrará la lista de todos los "
-"productos que está esperando. Una vez recibido el albarán, puede filtrar "
-"basándose en el nombre del proveedor o en la referencia del pedido de "
-"compra. Entonces, puede confirmar todos los productos recibidos usando los "
-"botones a la derecha de cada línea."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
 msgid "Stock Move"
-msgstr "Movimiento stock"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Delay(Days)"
-msgstr "Retraso (días)"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.memory.in,move_id:0
-#: field:stock.move.memory.out,move_id:0
-msgid "Move"
-msgstr "Movimiento"
+#: code:addons/stock/stock.py:1697
+#, python-format
+msgid "Operation forbidden"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,min_date:0
 msgid "Expected date for the picking to be processed"
-msgstr "Fecha prevista para procesar el albarán."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:376
+#: code:addons/stock/product.py:435
 #, python-format
 msgid "P&L Qty"
-msgstr "Ctdad P&L"
+msgstr ""
 
 #. module: stock
-#: view:stock.production.lot:0
-#: field:stock.production.lot,revisions:0
+#: view:stock.picking:0
+msgid "Internal Pickings to invoice"
+msgstr ""
+
+#. module: stock
+#: view:stock.production.lot:0 field:stock.production.lot,revisions:0
 msgid "Revisions"
-msgstr "Revisiones"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "This operation will cancel the shipment. Do you want to continue?"
-msgstr "Esta operación cancelará el envío. ¿Desea continuar?"
+msgstr ""
 
 #. module: stock
 #: help:product.product,valuation:0
@@ -2410,12 +2283,6 @@ msgid ""
 "current inventory value, and the stock input and stock output account will "
 "hold the counterpart moves for incoming and outgoing products."
 msgstr ""
-"Si la valoración en tiempo real está habilitada para un producto, el sistema "
-"automáticamente escribirá asientos en el diario correspondientes a los "
-"movimientos de stock. La cuenta de variación de inventario especificada en "
-"la categoría del producto representará el valor de inventario actual, y la "
-"cuenta de entrada y salida de stock contendrán las contrapartidas para los "
-"productos entrantes y salientes."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2424,19 +2291,13 @@ msgid ""
 "levels. Sort and group by selection criteria in order to better analyse and "
 "manage your company  activities."
 msgstr ""
-"El análisis de inventario le permite verificar y analizar fácilmente los "
-"niveles de stock de su compañia. Ordene y agrupe por criterios de selección "
-"para analizar y gestionar mejor las actividades de su empresa."
 
 #. module: stock
-#: help:report.stock.move,location_id:0
-#: help:stock.move,location_id:0
+#: help:report.stock.move,location_id:0 help:stock.move,location_id:0
 msgid ""
 "Sets a location if you produce at a fixed location. This can be a partner "
 "location if you subcontract the manufacturing operations."
 msgstr ""
-"Indica una ubicación si se producen en una ubicación fija. Puede ser una "
-"ubicación de empresa si subcontrata las operaciones de fabricación."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -2451,109 +2312,95 @@ msgid ""
 "location to the Stock location. Each report can be performed on physical, "
 "partner or virtual locations."
 msgstr ""
-"Defina sus ubicaciones para reflejar la estructura de su almacén y "
-"organización. OpenERP es capaz de manejar ubicaciones físicas (almacén, "
-"estante, caja, etc.), ubicaciones de empresa (clientes, proveedores) y "
-"ubicaciones virtuales que son la contrapartida de las operaciones de stock "
-"como los consumos por órdenes de la fabricación, inventarios, etc. Cada "
-"operación de stock en OpenERP mueve los productos de una ubicación a otra. "
-"Por ejemplo, si recibe productos de un proveedor, OpenERP moverá productos "
-"desde la ubicación del proveedor a la ubicación del stock. Cada informe "
-"puede ser realizado sobre ubicaciones físicas, de empresa o virtuales."
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
 msgid "Create"
-msgstr "Crear"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Dates"
-msgstr "Fechas"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,priority:0
 msgid "Priority"
-msgstr "Prioridad"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Source"
-msgstr "Origen"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2589
 #: model:ir.model,name:stock.model_stock_inventory
 #: selection:report.stock.inventory,location_type:0
-#: field:stock.inventory.line,inventory_id:0
-#: report:stock.inventory.move:0
+#: field:stock.inventory.line,inventory_id:0 report:stock.inventory.move:0
 #: selection:stock.location,usage:0
-#, python-format
 msgid "Inventory"
-msgstr "Inventario"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
 msgid "Picking List"
-msgstr "Albarán"
+msgstr ""
 
 #. module: stock
 #: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
 msgstr ""
-"¡La combinación de número de serie y referencia interna debe ser única!"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_ups
-msgid "Stock ups"
-msgstr "Stock ups"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Cancel Inventory"
-msgstr "Cancelar el inventario"
-
-#. module: stock
-#: field:stock.move.split.lines,name:0
-#: field:stock.move.split.lines.exist,name:0
-msgid "Tracking serial"
-msgstr "Seguimiento nº serie"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
-#: code:addons/stock/report/report_stock.py:135
-#: code:addons/stock/stock.py:754
+#: code:addons/stock/report/report_stock.py:135 code:addons/stock/stock.py:760
 #, python-format
 msgid "Error !"
-msgstr "¡Error!"
-
-#. module: stock
-#: model:ir.model,name:stock.model_stock_replacement_result
-msgid "Stock Replacement result"
-msgstr "Resultado reemplazo stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
 msgid "Units of Measure"
-msgstr "Unidades de medida"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
 msgid "Fixed Location"
-msgstr "Ubicaciones fijas"
+msgstr ""
 
 #. module: stock
+#: code:addons/stock/stock.py:2486
+#, python-format
+msgid "Product  '%s' is consumed with '%s' quantity."
+msgstr ""
+
+#. module: stock
+#: model:product.template,description:stock.product_icecream_product_template
+msgid ""
+"Ice cream can be mass-produced and thus is widely available in developed "
+"parts of the world. Ice cream can be purchased in large cartons (vats and "
+"squrounds) from supermarkets and grocery stores, in smaller quantities from "
+"ice cream shops, convenience stores, and milk bars, and in individual "
+"servings from small carts or vans at public events."
+msgstr ""
+
+#. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "July"
-msgstr "Julio"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Consumable"
-msgstr "Consumible"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_line_date
@@ -2563,259 +2410,233 @@ msgid ""
 "need this report in order to ensure that the stock of each product is "
 "controlled at least once a year."
 msgstr ""
-"Muestra los últimos inventarios realizados sobre sus productos y los ordena "
-"fácilmente con filtros específicos. Si realiza inventarios parciales "
-"frecuentemente, necesita este informe para asegurar que el stock de cada "
-"producto ha sido controlado al menos una vez al año."
+
+#. module: stock
+#: model:stock.location,name:stock.location_opening
+msgid "opening"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
 msgid "Stock Level Forecast"
-msgstr "Previsión nivel de stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_journal
-#: field:report.stock.move,stock_journal:0
-#: view:stock.journal:0
-#: field:stock.journal,name:0
-#: field:stock.picking,stock_journal_id:0
+#: field:report.stock.move,stock_journal:0 view:stock.journal:0
+#: field:stock.journal,name:0 field:stock.picking,stock_journal_id:0
 msgid "Stock Journal"
-msgstr "Diario de inventario"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Procurement"
-msgstr "Abastecimiento"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
-msgstr "Proveedores Maxtor"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:80
-#: code:addons/stock/wizard/stock_change_standard_price.py:106
+#: code:addons/stock/wizard/stock_change_product_qty.py:78
+#: code:addons/stock/wizard/stock_change_standard_price.py:107
 #, python-format
 msgid "Active ID is not set in Context"
-msgstr "No se ha establecido el ID activo en el Contexto"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Force Availability"
-msgstr "Forzar disponibilidad"
+msgstr ""
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.move_scrap
-#: view:stock.move.scrap:0
+#: model:ir.actions.act_window,name:stock.move_scrap view:stock.move.scrap:0
 msgid "Scrap Move"
-msgstr "Movimiento desecho"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:138
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
-#: model:ir.ui.menu,name:stock.menu_action_pdct_in
-#: view:stock.move:0
-#, python-format
+#: model:ir.ui.menu,name:stock.menu_action_pdct_in view:stock.move:0
 msgid "Receive Products"
-msgstr "Recibir productos"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:131
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
-#, python-format
 msgid "Deliver Products"
-msgstr "Enviar productos"
+msgstr ""
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "View Stock of Products"
-msgstr "Ver stock de productos"
+msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Internal Picking List"
-msgstr "Albarán interno"
-
-#. module: stock
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
 #: field:report.stock.move,month:0
 msgid "Month"
-msgstr "Mes"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,date_done:0
 msgid "Date of Completion"
-msgstr "Fecha de realización."
+msgstr ""
 
 #. module: stock
 #: help:stock.production.lot,name:0
 msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr "Lote de producción único, se mostrará como: PREFIJO/SERIE [REF_INT]"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.stock_location_company
+msgid "Your Company"
+msgstr ""
+
+#. module: stock
+#: constraint:stock.move:0
+msgid "You can not move products from or to a location of the type view."
+msgstr ""
 
 #. module: stock
 #: help:stock.tracking,active:0
 msgid ""
 "By unchecking the active field, you may hide a pack without deleting it."
 msgstr ""
-"Si el campo activo se desmarca, permite ocultar un paquete sin eliminarlo."
 
 #. module: stock
 #: view:stock.inventory.merge:0
 msgid "Yes"
-msgstr "Sí"
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory,inventory_line_id:0
 msgid "Inventories"
-msgstr "Inventarios"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Todo"
-msgstr "Por hacer"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,company_id:0
-#: view:report.stock.move:0
-#: field:report.stock.move,company_id:0
-#: field:stock.inventory,company_id:0
-#: field:stock.inventory.line,company_id:0
-#: field:stock.location,company_id:0
-#: field:stock.move,company_id:0
-#: field:stock.picking,company_id:0
-#: field:stock.production.lot,company_id:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,company_id:0
+#: view:report.stock.move:0 field:report.stock.move,company_id:0
+#: field:stock.inventory,company_id:0 field:stock.inventory.line,company_id:0
+#: field:stock.location,company_id:0 field:stock.move,company_id:0
+#: field:stock.picking,company_id:0 field:stock.production.lot,company_id:0
 #: field:stock.production.lot.revision,company_id:0
 #: field:stock.warehouse,company_id:0
 msgid "Company"
-msgstr "Compañía"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Unit Of Measure"
-msgstr "Unidad de medida"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:122
+#: code:addons/stock/product.py:121
 #, python-format
 msgid ""
 "There is no stock input account defined for this product: \"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de entrada de stock para este producto: \"%s\" "
-"(id: %d)"
 
 #. module: stock
-#: code:addons/stock/stock.py:2339
+#: code:addons/stock/stock.py:2445
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
 msgstr ""
-"¡No se puede consumir un movimiento con una cantidad negativa o cero!"
 
 #. module: stock
 #: field:stock.location,stock_real:0
 msgid "Real Stock"
-msgstr "Stock real"
+msgstr ""
 
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Fill Inventory"
-msgstr "Rellenar inventario"
+msgstr ""
 
 #. module: stock
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
-"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-"categoría."
 
 #. module: stock
-#: help:product.category,property_stock_account_input_categ:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"incoming stock moves will be posted in this account. This is the default "
-"value for all products in this category, it can also directly be set on each "
-"product."
+#: model:stock.location,name:stock.location_delivery_counter
+msgid "Delivery Counter"
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
-"asientos del diario para todos los movimientos de stock de entrada se creará "
-"en esta cuenta. Este es el valor por defecto para todos los productos de "
-"esta categoría, también puede indicarse directamente en cada producto."
 
 #. module: stock
-#: field:stock.production.lot.revision,date:0
-msgid "Revision Date"
-msgstr "Fecha de revisión"
-
-#. module: stock
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,prodlot_id:0
-#: view:stock.move:0
-#: field:stock.move.split.lines,lot_id:0
-#: field:stock.move.split.lines.exist,lot_id:0
-#: report:stock.picking.list:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,prodlot_id:0
+#: view:stock.move:0 report:stock.picking.list:0
 msgid "Lot"
-msgstr "Lote"
+msgstr ""
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Number"
-msgstr "Número lote de producción"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2697
+#, python-format
+msgid "Inventory '%s' is done."
+msgstr ""
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
 msgid "Quantity (UOS)"
-msgstr "Cantidad (UdV)"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1664
+#: code:addons/stock/stock.py:1743
 #, python-format
 msgid ""
 "You are moving %.2f %s products but only %.2f %s available in this lot."
 msgstr ""
-"Está moviendo %.2f %s productos pero sólo %.2f %s están disponibles en este "
-"lote."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Set Available"
-msgstr "Reservar"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Contact Address :"
-msgstr "Dirección de contacto :"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,backorder_id:0
 msgid "Back Order"
-msgstr "Albarán pendiente"
+msgstr ""
 
 #. module: stock
-#: field:stock.incoterms,active:0
-#: field:stock.location,active:0
+#: field:stock.incoterms,active:0 field:stock.location,active:0
 #: field:stock.tracking,active:0
 msgid "Active"
-msgstr "Activo"
-
-#. module: stock
-#: model:ir.module.module,shortdesc:stock.module_meta_information
-msgid "Inventory Management"
-msgstr "Almacenes y logística"
+msgstr ""
 
 #. module: stock
 #: view:product.template:0
 msgid "Properties"
-msgstr "Propiedades"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:974
+#: code:addons/stock/stock.py:1082
 #, python-format
 msgid "Error, no partner !"
-msgstr "¡Error, sin empresa!"
+msgstr ""
+
+#. module: stock
+#: field:stock.inventory.line.split.lines,wizard_exist_id:0
+#: field:stock.inventory.line.split.lines,wizard_id:0
+#: field:stock.move.split.lines,wizard_id:0
+msgid "Parent Wizard"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
@@ -2823,14 +2644,18 @@ msgstr "¡Error, sin empresa!"
 #: model:ir.ui.menu,name:stock.menu_action_incoterm_open
 #: view:stock.incoterms:0
 msgid "Incoterms"
-msgstr "Incoterms"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: model:ir.model,name:stock.model_stock_partial_picking_line
+msgid "stock.partial.picking.line"
+msgstr ""
+
+#. module: stock
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 #: report:stock.inventory.move:0
 msgid "Total:"
-msgstr "Total:"
+msgstr ""
 
 #. module: stock
 #: help:stock.incoterms,name:0
@@ -2839,9 +2664,6 @@ msgid ""
 "costs and responsibilities between buyer and seller and reflect state-of-the-"
 "art transportation practices."
 msgstr ""
-"Los Incoterms son una serie de términos de ventas. Se utilizan para dividir "
-"los costes de transacción y las responsabilidades entre el comprador y el "
-"vendedor, y reflejan las prácticas de transporte más recientes."
 
 #. module: stock
 #: help:stock.fill.inventory,recursive:0
@@ -2849,290 +2671,267 @@ msgid ""
 "If checked, products contained in child locations of selected location will "
 "be included as well."
 msgstr ""
-"Si se marca, los productos que figuran en las ubicaciones hijas de la "
-"ubicación seleccionada se incluirán también."
-
-#. module: stock
-#: field:stock.move.track,tracking_prefix:0
-msgid "Tracking prefix"
-msgstr "Prefijo seguimiento"
 
 #. module: stock
 #: field:stock.inventory,name:0
 msgid "Inventory Reference"
-msgstr "Referencia inventario"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1304
+#: code:addons/stock/stock.py:1334
 #, python-format
 msgid "Internal picking"
-msgstr "Albarán interno"
+msgstr ""
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "Open Product"
-msgstr "Abrir producto"
+msgstr ""
 
 #. module: stock
 #: field:stock.location.product,to_date:0
 msgid "To"
-msgstr "Hasta"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Process"
-msgstr "Procesar"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
-msgstr "Nombre de revisión"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
 #: model:ir.ui.menu,name:stock.menu_stock_root
-#: view:stock.warehouse:0
+#: field:product.product,warehouse_id:0 view:stock.warehouse:0
 msgid "Warehouse"
-msgstr "Almacén"
+msgstr ""
 
 #. module: stock
-#: view:stock.location.product:0
-msgid ""
-"(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to "
-"filter all resources of the day for the 'From' date and 23:59:59 for the "
-"'To' date)"
+#: view:stock.inventory:0
+msgid "Confirm Inventory"
 msgstr ""
-"(Déjelo vacío para abrir la situación actual. Ponga HH:MM:SS a 00:00:00 para "
-"filtrar todos los recursos del día en el campo fecha 'Desde' y 23:59:59 en "
-"el campo fecha 'Hasta'.)"
 
 #. module: stock
 #: view:product.category:0
 msgid "Accounting Stock Properties"
-msgstr "Propiedades contables del stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
-msgstr "Paquetes cliente"
+msgstr ""
 
 #. module: stock
-#: selection:report.stock.inventory,state:0
-#: view:report.stock.move:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: view:stock.move:0
-#: selection:stock.move,state:0
-#: view:stock.picking:0
+#: selection:report.stock.inventory,state:0 view:report.stock.move:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+#: view:stock.move:0 selection:stock.move,state:0 view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Done"
-msgstr "Realizado"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_change_standard_price
 #: model:ir.model,name:stock.model_stock_change_standard_price
 #: view:stock.change.standard.price:0
 msgid "Change Standard Price"
-msgstr "Cambiar precio estándar"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
 msgid "Virtual Locations"
-msgstr "Ubicaciones virtuales"
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "To Be Invoiced"
-msgstr "Para facturar"
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory,date_done:0
 msgid "Date done"
-msgstr "Fecha realización"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:975
+#: code:addons/stock/stock.py:1083
 #, python-format
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
 msgstr ""
-"Por favor indique una empresa en el albarán si desea generar factura."
 
 #. module: stock
 #: selection:stock.move,priority:0
 msgid "Not urgent"
-msgstr "No urgente"
-
-#. module: stock
-#: view:stock.move:0
-msgid "To Do"
-msgstr "Para hacer"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
 #: model:ir.ui.menu,name:stock.menu_action_warehouse_form
 msgid "Warehouses"
-msgstr "Almacenes"
+msgstr ""
 
 #. module: stock
 #: field:stock.journal,user_id:0
 msgid "Responsible"
-msgstr "Responsable"
-
-#. module: stock
-#: field:stock.move,returned_price:0
-msgid "Returned product price"
-msgstr "Precio producto devuelto"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr "Análisis inventario"
+msgstr ""
 
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
 msgid "Destination Journal"
-msgstr "Diario de destino"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
 #: model:stock.location,name:stock.stock_location_stock
 msgid "Stock"
-msgstr "Stock"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_product
-#: model:ir.ui.menu,name:stock.menu_product_in_config_stock
-#: model:ir.ui.menu,name:stock.menu_stock_product
-#: view:report.stock.inventory:0
-#: field:report.stock.inventory,product_id:0
-#: field:report.stock.lines.date,product_id:0
-#: view:report.stock.move:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,product_id:0
+#: field:report.stock.lines.date,product_id:0 view:report.stock.move:0
 #: field:report.stock.move,product_id:0
 #: field:stock.change.product.qty,product_id:0
 #: field:stock.inventory.line,product_id:0
-#: field:stock.inventory.line.split,product_id:0
-#: report:stock.inventory.move:0
-#: view:stock.move:0
-#: field:stock.move,product_id:0
-#: field:stock.move.consume,product_id:0
-#: field:stock.move.memory.in,product_id:0
-#: field:stock.move.memory.out,product_id:0
-#: field:stock.move.scrap,product_id:0
+#: field:stock.inventory.line.split,product_id:0 report:stock.inventory.move:0
+#: view:stock.move:0 field:stock.move,product_id:0
+#: field:stock.move.consume,product_id:0 field:stock.move.scrap,product_id:0
 #: field:stock.move.split,product_id:0
-#: view:stock.production.lot:0
+#: field:stock.partial.move.line,product_id:0
+#: field:stock.partial.picking.line,product_id:0 view:stock.production.lot:0
 #: field:stock.production.lot,product_id:0
 #: field:stock.report.prodlots,product_id:0
 #: field:stock.report.tracklots,product_id:0
+#: field:stock.return.picking.memory,product_id:0
 msgid "Product"
-msgstr "Producto"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:126
-#, python-format
+#: view:stock.return.picking:0
+msgid "Return"
+msgstr ""
+
+#. module: stock
+#: field:stock.return.picking,invoice_state:0
 msgid "Invoicing"
-msgstr "Facturación"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2274
-#: code:addons/stock/stock.py:2334
+#: view:stock.picking:0
+msgid "Assigned Internal Moves"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
+#: code:addons/stock/wizard/stock_partial_picking.py:141
 #, python-format
 msgid "Please provide Proper Quantity !"
-msgstr "¡Indique cantidad correcta!"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
-msgstr "UdV del producto"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,posz:0
 msgid "Height (Z)"
-msgstr "Altura (Z)"
-
-#. module: stock
-#: field:stock.ups,weight:0
-msgid "Lot weight"
-msgstr "Peso lote"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_consume
 #: view:stock.move.consume:0
 msgid "Consume Products"
-msgstr "Consumir productos"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1663
+#: code:addons/stock/stock.py:1742
 #, python-format
 msgid "Insufficient Stock in Lot !"
-msgstr "¡Stock insuficiente en el lote!"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,parent_right:0
 msgid "Right Parent"
-msgstr "Padre derecho"
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,address_id:0
 msgid "Address"
-msgstr "Dirección"
+msgstr ""
 
 #. module: stock
-#: report:lot.stock.overview:0
-#: report:lot.stock.overview_all:0
+#: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Variants"
-msgstr "Variantes"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,posx:0
 msgid "Corridor (X)"
-msgstr "Pasillo (X)"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_suppliers
 msgid "Suppliers"
-msgstr "Proveedores"
+msgstr ""
 
 #. module: stock
-#: field:report.stock.inventory,value:0
-#: field:report.stock.move,value:0
+#: field:report.stock.inventory,value:0 field:report.stock.move,value:0
 msgid "Total Value"
-msgstr "Valor total"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
 msgid "Products by Category"
-msgstr "Productos por categoría"
+msgstr ""
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_product_category_config_stock
-msgid "Products Categories"
-msgstr "Categorías de productos"
+#: selection:stock.picking,state:0
+msgid "Waiting Another Operation"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.memory.in,wizard_id:0
-#: field:stock.move.memory.out,wizard_id:0
+#: view:stock.location:0
+msgid "Supplier Locations"
+msgstr ""
+
+#. module: stock
+#: field:stock.partial.move.line,wizard_id:0
+#: field:stock.partial.picking.line,wizard_id:0
+#: field:stock.return.picking.memory,wizard_id:0
 msgid "Wizard"
-msgstr "Asistente"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Completed Stock-Moves"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
 #: model:ir.model,name:stock.model_stock_location_product
 msgid "Products by Location"
-msgstr "Productos por ubicación"
+msgstr ""
 
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
 msgid "Include children"
-msgstr "Incluir hijos"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
 msgid "Shelf 1"
-msgstr "Estante 1"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree6
@@ -3144,159 +2943,154 @@ msgid ""
 "preconfigured logistics rules, but you can also record manual stock "
 "operations."
 msgstr ""
-"Los movimientos internos muestran todas las operaciones de inventario que se "
-"deben realizar en su almacén. Todas las operaciones pueden ser clasificadas "
-"en diarios de stock, para que cada trabajador tenga su propia lista de "
-"operaciones a realizar en su propio diario. La mayor parte de operaciones "
-"son preparadas automáticamente por OpenERP según sus reglas de logística "
-"preconfiguradas, pero también puede registrar operaciones de stock de forma "
-"manual."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
-msgstr "Orden"
+msgstr ""
+
+#. module: stock
+#: view:product.product:0
+msgid "Cost Price :"
+msgstr ""
 
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
-msgstr "Referencia paquete"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,location_id:0
-#: field:stock.move,location_id:0
+#: view:report.stock.move:0 field:report.stock.move,location_id:0
+#: field:stock.inventory.line.split,location_id:0
+#: field:stock.move,location_id:0 field:stock.move.split,location_id:0
 msgid "Source Location"
-msgstr "Ubicación origen"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid " Waiting"
+msgstr ""
 
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
-msgstr "Asientos contables"
+msgstr ""
+
+#. module: stock
+#: model:res.groups,name:stock.group_stock_manager
+msgid "Manager"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Total"
-msgstr "Total"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
 msgid "Internal Shippings"
-msgstr "Envíos internos"
+msgstr ""
 
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
-msgstr "Activa cuenta relacionada"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
 msgid "Virtual Stock Value"
-msgstr "Valor stock virtual"
+msgstr ""
 
 #. module: stock
-#: view:product.product:0
-#: view:stock.inventory.line.split:0
+#: view:product.product:0 view:stock.inventory.line.split:0
 #: view:stock.move.split:0
 msgid "Lots"
-msgstr "Lotes"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "New Pack"
-msgstr "Nuevo paquete"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Destination"
-msgstr "Destinación"
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,move_type:0
 msgid "All at once"
-msgstr "Todo junto"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1620
+#: code:addons/stock/stock.py:1698
 #, python-format
 msgid ""
 "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
 "that have already been processed (except by the Administrator)"
 msgstr ""
-"Las cantidades, UdM, productos y ubicaciones no se pueden modificar en los "
-"movimientos de stock que ya han sido procesados (excepto por el "
-"administrador)"
 
 #. module: stock
-#: code:addons/stock/product.py:386
+#: code:addons/stock/product.py:445
 #, python-format
 msgid "Future Productions"
-msgstr "Producciones futuras"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr "Para facturar"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:115
-#, python-format
+#: view:stock.return.picking:0
 msgid "Return lines"
-msgstr "Líneas de devolución"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_lines_date
 #: view:report.stock.lines.date:0
 msgid "Dates of Inventories"
-msgstr "Fechas de inventarios"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total incoming quantity"
-msgstr "Cantidad de entrada total"
+msgstr ""
 
 #. module: stock
 #: field:report.stock.move,product_qty_out:0
 msgid "Out Qty"
-msgstr "Ctdad salida"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this production lot"
-msgstr "Movimientos para este lote de producción"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_move_memory_out
-msgid "stock.move.memory.out"
-msgstr "stock.movimiento.memoria.salida"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_fill_inventory.py:115
-#, python-format
-msgid "Message !"
-msgstr "¡ Mensaje !"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
+#: view:stock.move:0 view:stock.picking:0
 msgid "Put in current pack"
-msgstr "Poner en el paquete actual"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr "Regularización de inventario"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Reason"
-msgstr "Motivo"
+msgstr ""
 
 #. module: stock
-#: report:stock.picking.list:0
-msgid "Delivery Order:"
-msgstr "Albarán de salida:"
+#: model:product.template,name:stock.product_icecream_product_template
+msgid "Ice Cream"
+msgstr ""
+
+#. module: stock
+#: model:ir.model,name:stock.model_stock_partial_picking
+msgid "Partial Picking Processing Wizard"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
@@ -3308,107 +3102,102 @@ msgid ""
 "'Available' button to get all the lots you produced, received or delivered "
 "to customers."
 msgstr ""
-"Esta es la lista de todos los lotes de producción (números de serie) que "
-"registró. Cuando selecciona un lote, puede obtener la trazabilidad hacia "
-"arriba o hacia abajo de los productos que componen el lote. Por defecto, la "
-"lista es filtrada según los números de serie disponibles en su almacén, pero "
-"puede desmarcar el botón 'Disponible' para obtener todos los lotes que "
-"produjo, recibió o entregó a sus clientes."
 
 #. module: stock
 #: field:stock.location,icon:0
 msgid "Icon"
-msgstr "Icono"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:2209
-#: code:addons/stock/stock.py:2617
+#: code:addons/stock/stock.py:2311 code:addons/stock/stock.py:2726
 #, python-format
 msgid "UserError"
-msgstr "Error de usuario"
+msgstr ""
 
 #. module: stock
-#: view:stock.inventory.line.split:0
-#: view:stock.move.consume:0
-#: view:stock.move.scrap:0
-#: view:stock.move.split:0
-#: view:stock.move.track:0
-#: view:stock.split.into:0
+#: field:stock.partial.move,hide_tracking:0
+#: field:stock.partial.move.line,tracking:0
+#: field:stock.partial.picking,hide_tracking:0
+#: field:stock.partial.picking.line,tracking:0
+msgid "Tracking"
+msgstr ""
+
+#. module: stock
+#: view:stock.inventory.line.split:0 view:stock.move.consume:0
+#: view:stock.move.scrap:0 view:stock.move.split:0 view:stock.split.into:0
 msgid "Ok"
-msgstr "Aceptar"
+msgstr ""
+
+#. module: stock
+#: help:product.category,property_stock_account_output_categ:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"outgoing stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the destination location. This is the "
+"default value for all products in this category. It can also directly be set "
+"on each product"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
 msgid "Non European Customers"
-msgstr "Clientes no europeos"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:76
-#: code:addons/stock/product.py:90
-#: code:addons/stock/product.py:93
-#: code:addons/stock/product.py:100
-#: code:addons/stock/product.py:121
-#: code:addons/stock/product.py:147
-#: code:addons/stock/stock.py:2006
-#: code:addons/stock/stock.py:2009
-#: code:addons/stock/stock.py:2012
-#: code:addons/stock/stock.py:2015
-#: code:addons/stock/stock.py:2018
-#: code:addons/stock/stock.py:2021
-#: code:addons/stock/stock.py:2339
+#: code:addons/stock/product.py:75 code:addons/stock/product.py:89
+#: code:addons/stock/product.py:92 code:addons/stock/product.py:99
+#: code:addons/stock/product.py:120 code:addons/stock/product.py:146
+#: code:addons/stock/stock.py:2116 code:addons/stock/stock.py:2119
+#: code:addons/stock/stock.py:2122 code:addons/stock/stock.py:2125
+#: code:addons/stock/stock.py:2128 code:addons/stock/stock.py:2131
+#: code:addons/stock/stock.py:2445
 #: code:addons/stock/wizard/stock_fill_inventory.py:47
 #: code:addons/stock/wizard/stock_splitinto.py:49
 #: code:addons/stock/wizard/stock_splitinto.py:53
 #, python-format
 msgid "Error!"
-msgstr "¡Error!"
-
-#. module: stock
-#: code:addons/stock/stock.py:2021
-#, python-format
-msgid ""
-"There is no inventory variation account defined on the product category: "
-"\"%s\" (id: %d)"
 msgstr ""
-"No se ha definido una cuenta de variación de inventario en la categoría del "
-"producto: \"%s\" (id: %d)"
 
 #. module: stock
 #: view:stock.inventory.merge:0
 msgid "Do you want to merge theses inventories?"
-msgstr "¿Desea fusionar estos inventarios?"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
+#: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "Cancelled"
-msgstr "Cancelado"
+msgstr ""
 
 #. module: stock
-#: view:stock.move:0
+#: view:stock.picking:0
+msgid "Confirmed Delivery Orders"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 field:stock.partial.move,picking_id:0
+#: field:stock.partial.picking,picking_id:0
 msgid "Picking"
-msgstr "Albarán"
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,move_type:0
 msgid "It specifies goods to be delivered all at once or by direct delivery"
-msgstr "Indica si las mercancías se enviarán todas a la vez o directamente."
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #, python-format
 msgid "This picking list does not require invoicing."
-msgstr "Este albarán no requiere facturación."
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,type:0
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Getting Goods"
-msgstr "Recepción mercancías"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,chained_location_type:0
@@ -3424,36 +3213,39 @@ msgid ""
 "* Fixed Location: The chained location is taken from the next field: Chained "
 "Location if Fixed."
 msgstr ""
-"Determina si esta ubicación está encadenada a otra, por ejemplo cualquier "
-"producto que entre en esta ubicación debe ir a la siguiente ubicación "
-"encadenada. La ubicación encadenada se determina en función del tipo: \n"
-"*Ninguna: No se encadena con ninguna.\n"
-"*Cliente: Se utiliza la ubicación encadenada definida en el campo Ubicación "
-"del cliente del formulario del cliente especificado en el albarán de los "
-"productos entrantes.\n"
-"*Ubicación fija: Se utiliza la ubicación encadenada del siguiente campo: "
-"Ubicación encadenada si fija."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
 #: code:addons/stock/wizard/stock_inventory_merge.py:63
+#: code:addons/stock/wizard/stock_partial_picking.py:148
+#: code:addons/stock/wizard/stock_partial_picking.py:159
 #, python-format
 msgid "Warning"
-msgstr "Advertencia"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1318
-#: code:addons/stock/stock.py:2589
+#: code:addons/stock/stock.py:1348
 #, python-format
 msgid "is done."
-msgstr "está realizado."
+msgstr ""
 
 #. module: stock
+#: field:stock.production.lot.revision,date:0
+msgid "Revision Date"
+msgstr ""
+
+#. module: stock
+#: view:board.board:0
+#: model:ir.actions.act_window,name:stock.action_outgoing_product_board
 #: model:ir.actions.act_window,name:stock.action_picking_tree
-#: model:ir.ui.menu,name:stock.menu_action_picking_tree
-#: view:stock.picking:0
+#: model:ir.ui.menu,name:stock.menu_action_picking_tree view:stock.picking:0
 msgid "Delivery Orders"
-msgstr "Albaranes de salida"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Delivery orders already processed"
+msgstr ""
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -3461,126 +3253,126 @@ msgid ""
 "This stock location will be used, instead of the default one, as the "
 "destination location for goods you send to this partner"
 msgstr ""
-"Esta ubicación de stock será utilizada, en lugar de la ubicación por "
-"defecto, como la ubicación de destino para enviar mercancías a esta empresa"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
 #: view:stock.picking:0
-#: selection:stock.picking,state:0
 msgid "Confirmed"
-msgstr "Confirmado"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm"
-msgstr "Confirmar"
+msgstr ""
 
 #. module: stock
-#: help:stock.location,icon:0
-msgid "Icon show in  hierarchical tree view"
-msgstr "Icono mostrado en la vista de árbol jerárquica."
+#: view:stock.picking:0
+msgid "Check Availability"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
 #: view:stock.inventory.merge:0
 msgid "Merge Inventories"
-msgstr "Fusionar inventarios"
+msgstr ""
 
 #. module: stock
 #: help:stock.change.product.qty,new_quantity:0
 msgid "This quantity is expressed in the Default UoM of the product."
-msgstr "Esta cantidad está expresada en la UdM por defecto del producto."
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Reception:"
-msgstr "Recepción:"
+msgstr ""
 
 #. module: stock
 #: help:stock.location,scrap_location:0
 msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
 msgstr ""
-"Marque esta opción para permitir utilizar esta ubicación para poner "
-"mercancías desechadas/defectuosas."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
 msgid "Related Picking"
-msgstr "Albarán relacionado"
+msgstr ""
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Year Planned"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total outgoing quantity"
-msgstr "Cantidad de salida total"
+msgstr ""
 
 #. module: stock
-#: field:stock.picking,backorder_id:0
-msgid "Back Order of"
-msgstr "Albarán pendiente de"
+#: selection:stock.move,state:0 selection:stock.picking,state:0
+msgid "New"
+msgstr ""
 
 #. module: stock
-#: help:stock.move.memory.in,cost:0
-#: help:stock.move.memory.out,cost:0
+#: help:stock.partial.move.line,cost:0 help:stock.partial.picking.line,cost:0
 msgid "Unit Cost for this product line"
-msgstr "Coste unidad para esta línea de producto"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_category
 #: view:report.stock.inventory:0
-#: field:report.stock.inventory,product_categ_id:0
-#: view:report.stock.move:0
+#: field:report.stock.inventory,product_categ_id:0 view:report.stock.move:0
 #: field:report.stock.move,categ_id:0
 msgid "Product Category"
-msgstr "Categoría de producto"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_change_product_qty.py:88
-#, python-format
-msgid "INV: %s"
 msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
 msgid "Reporting"
-msgstr "Informe"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1313
+#: code:addons/stock/stock.py:1343
 #, python-format
 msgid " for the "
-msgstr " para el "
+msgstr ""
 
 #. module: stock
 #: view:stock.split.into:0
 msgid "Quantity to Leave in the Current Pack"
-msgstr "Cantidad a dejar en el paquete actual"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0
+msgid "Stock available to be delivered"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 #: view:stock.invoice.onshipping:0
 msgid "Create invoice"
-msgstr "Crear factura"
+msgstr ""
+
+#. module: stock
+#: view:stock.picking:0
+msgid "Confirmed Internal Moves"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
 msgid "Configuration"
-msgstr "Configuración"
+msgstr ""
 
 #. module: stock
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Lots"
-msgstr "Lotes existentes"
+msgstr ""
 
 #. module: stock
-#: field:product.product,location_id:0
 #: view:stock.location:0
 msgid "Stock Location"
-msgstr "Ubicación de stock"
+msgstr ""
 
 #. module: stock
 #: help:stock.change.standard.price,new_price:0
@@ -3591,105 +3383,94 @@ msgid ""
 "If cost price is decreased, stock variation account will be creadited and "
 "stock input account will be debited."
 msgstr ""
-"Si el precio de coste se incrementa, la cuenta la variación de existencias "
-"irá al debe y la cuenta de salida de stock irá al haber con el valor = "
-"(diferencia de cantidad * cantidad disponible).\n"
-"Si el precio de coste se reduce, la cuenta la variación de existencias irá "
-"al haber y la cuenta de entrada de stock irá al debe."
 
 #. module: stock
 #: field:stock.location,chained_journal_id:0
 msgid "Chaining Journal"
-msgstr "Diario encadenamiento"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:732
+#: model:ir.actions.report.xml,name:stock.report_picking_list
+msgid "Packing list"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:738
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
-msgstr "No suficiente stock, no ha sido posible reservar los productos."
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
 msgid "Customers"
-msgstr "Clientes"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:1317
+#: selection:stock.move,state:0 selection:stock.picking,state:0
+msgid "Waiting Availability"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:1347
 #, python-format
 msgid "is cancelled."
-msgstr "está cancelado."
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory.line:0
 msgid "Stock Inventory Lines"
-msgstr "Líneas regularización de inventario"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_partial_picking.py:97
-#, python-format
-msgid "Process Document"
-msgstr "Procesar documento"
+#: view:stock.move:0
+msgid "Waiting "
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:368
+#: code:addons/stock/product.py:427
 #, python-format
 msgid "Future Deliveries"
-msgstr "Entregas futuras"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
-msgstr "Información adicional"
-
-#. module: stock
-#: view:stock.move:0
-#: field:stock.move,tracking_id:0
-msgid "Pack"
-msgstr "Paquete"
-
-#. module: stock
-#: view:stock.move:0
-#: view:stock.picking:0
-msgid "Date Expected"
-msgstr "Fecha prevista"
-
-#. module: stock
-#: model:ir.actions.act_window,help:stock.action_picking_tree4
-msgid ""
-"The Incoming Shipments is the list of all orders you will receive from your "
-"supplier. An incoming shipment contains a list of products to be received "
-"according to the original purchase order. You can validate the shipment "
-"totally or partially."
 msgstr ""
-"Los albaranes de entrada son la lista de todos los pedidos que va a recibir "
-"de su proveedor. Un albarán de entrada contiene la lista de productos a "
-"recibir en función del pedido de compra original. Puede validar el envío "
-"totalmente o parcialmente."
+
+#. module: stock
+#: view:stock.move:0 field:stock.move,tracking_id:0
+msgid "Pack"
+msgstr ""
+
+#. module: stock
+#: view:stock.move:0 view:stock.picking:0
+msgid "Date Expected"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
-msgstr "Auto validar"
+msgstr ""
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Weight"
-msgstr "Peso"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
 msgid "Product Template"
-msgstr "Plantilla producto"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "December"
-msgstr "Diciembre"
+msgstr ""
 
 #. module: stock
-#: selection:stock.location,chained_auto_packing:0
-msgid "Automatic Move"
-msgstr "Movimiento automático"
+#: view:stock.production.lot:0
+msgid "Available Product Lots"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_move_form2
@@ -3698,19 +3479,16 @@ msgid ""
 "specific product. You can filter on the product to see all the past or "
 "future movements for the product."
 msgstr ""
-"Este menú le da la trazabilidad completa de las operaciones de inventario "
-"sobre un producto específico. Puede filtrar sobre el producto para ver todos "
-"los movimientos pasados o futuros para el producto."
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Return Products"
-msgstr "Devolver productos"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Validate Inventory"
-msgstr "Validar inventario"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -3718,69 +3496,62 @@ msgid ""
 "Technical field used to record the currency chosen by the user during a "
 "picking confirmation (when average price costing method is used)"
 msgstr ""
-"Campo técnico utilizado para registrar la moneda elegida por el usuario "
-"durante una confirmación de albarán (cuando se utiliza el método de precio "
-"medio de coste)."
+
+#. module: stock
+#: code:addons/stock/wizard/stock_fill_inventory.py:53
+#, python-format
+msgid "Stock Inventory is already Validated."
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Products Moves"
-msgstr "Movimientos de productos"
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Invoiced"
-msgstr "Facturado"
-
-#. module: stock
-#: field:stock.move,address_id:0
-msgid "Destination Address"
-msgstr "Dirección destino"
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Expected Date"
-msgstr "Fecha prevista máx."
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Picking"
-msgstr "Auto-Albarán"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
 msgid "Shop 2"
-msgstr "Tienda 2"
+msgstr ""
 
 #. module: stock
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "¡Error! No puede crear miembros asociados recursivos."
+#: field:stock.location,chained_auto_packing:0
+msgid "Chaining Type"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:report.stock.move:0
-#: selection:report.stock.move,type:0
-#: view:stock.location:0
+#: view:report.stock.inventory:0 view:report.stock.move:0
+#: selection:report.stock.move,type:0 view:stock.location:0
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Internal"
-msgstr "Interno"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
-#: selection:report.stock.move,state:0
-#: selection:stock.inventory,state:0
-#: selection:stock.move,state:0
-#: selection:stock.picking,state:0
+#: selection:report.stock.move,state:0 selection:stock.inventory,state:0
 msgid "Draft"
-msgstr "Borrador"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
 #: report:stock.inventory.move:0
 msgid "Stock Inventory"
-msgstr "Inventario stock"
+msgstr ""
 
 #. module: stock
 #: help:report.stock.inventory,state:0
@@ -3791,27 +3562,17 @@ msgid ""
 " When the picking it done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
-"Cuando se crea un movimiento de stock está en estado 'Borrador'.\n"
-" Después se establece en estado 'Confirmado'.\n"
-" Si está reservado en stock se establece como 'Reservado'.\n"
-" Cuando el albarán se envía el estado es 'Realizado'.              \n"
-"El estado es 'En espera' si el movimiento está a la espera de otro."
 
 #. module: stock
-#: view:board.board:0
-msgid "Outgoing Products Delay"
-msgstr "Retraso albaranes salida"
+#: view:stock.picking:0
+msgid "Create Invoice"
+msgstr ""
 
 #. module: stock
-#: field:stock.move.split.lines,use_exist:0
-msgid "Existing Lot"
-msgstr "Lote existente"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:194
+#: code:addons/stock/wizard/stock_return_picking.py:189
 #, python-format
 msgid "Please specify at least one non-zero quantity!"
-msgstr "¡Introduzca por lo menos una cantidad que no sea cero!"
+msgstr ""
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -3819,65 +3580,66 @@ msgid ""
 "For the current product, this stock location will be used, instead of the "
 "default one, as the source location for stock moves generated by procurements"
 msgstr ""
-"Para los productos actuales, esta ubicación de stock se utilizará, en lugar "
-"de la por defecto, como la ubicación de origen para los movimientos de stock "
-"generados por los abastecimientos."
 
 #. module: stock
-#: code:addons/stock/stock.py:1316
+#: code:addons/stock/stock.py:1346
 #, python-format
 msgid "is ready to process."
-msgstr "preparado para procesar."
+msgstr ""
 
 #. module: stock
 #: help:stock.picking,origin:0
 msgid "Reference of the document that produced this picking."
-msgstr "Referencia del documento que ha generado este albarán."
+msgstr ""
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
 msgid "Set to zero"
-msgstr "Inicializar a cero"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
+#: model:res.groups,name:stock.group_stock_user
+msgid "User"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
 #, python-format
 msgid "None of these picking lists require invoicing."
-msgstr "Ninguno de estos albaranes requiere facturación."
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "November"
-msgstr "Noviembre"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:101
-#: code:addons/stock/stock.py:2018
+#: code:addons/stock/product.py:100 code:addons/stock/stock.py:2128
 #, python-format
 msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
 msgstr ""
-"No se ha definido un diario en la categoría de producto: \"%s\" (id: %d)"
 
 #. module: stock
-#: code:addons/stock/product.py:382
+#: code:addons/stock/product.py:441
 #, python-format
 msgid "Unplanned Qty"
-msgstr "Ctdad no planificada"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
-msgstr "Compañía encadenada"
+msgstr ""
 
 #. module: stock
-#: view:stock.picking:0
-msgid "Check Availability"
-msgstr "Comprobar disponibilidad"
+#: help:stock.location,icon:0
+msgid "Icon show in  hierarchical tree view"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "January"
-msgstr "Enero"
+msgstr ""
 
 #. module: stock
 #: help:product.product,track_incoming:0
@@ -3885,43 +3647,35 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "coming from a Supplier Location"
 msgstr ""
-"Fuerza a introducir un lote de producción para todos los movimientos que "
-"contiene este producto y procedente de una ubicación de proveedores."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
 msgid "Future Stock Moves"
-msgstr "Movimientos de stock futuros"
+msgstr ""
 
 #. module: stock
 #: field:stock.move,move_history_ids2:0
 msgid "Move History (parent moves)"
-msgstr "Historial movimientos (mov. padres)"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:364
+#: code:addons/stock/product.py:423
 #, python-format
 msgid "Future Stock"
-msgstr "Stock futuro"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:512
-#: code:addons/stock/stock.py:1120
-#: code:addons/stock/stock.py:1128
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:101
+#: code:addons/stock/stock.py:513 code:addons/stock/stock.py:1149
+#: code:addons/stock/stock.py:1157
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:112
 #, python-format
 msgid "Error"
-msgstr "Error"
-
-#. module: stock
-#: field:stock.ups.final,xmlfile:0
-msgid "XML File"
-msgstr "Fichero XML"
+msgstr ""
 
 #. module: stock
 #: view:stock.change.product.qty:0
 msgid "Select Quantity"
-msgstr "Seleccionar cantidad"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_tree
@@ -3930,54 +3684,48 @@ msgid ""
 "click on a location to get the list of the products and their stock level in "
 "this particular location and all its children."
 msgstr ""
-"Esta es la estructura de los almacenes y ubicaciones de su compañía. Puede "
-"pulsar sobre una ubicación para obtener la lista de los productos y su nivel "
-"de stock en esta ubicación específica y todos sus hijas."
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
 #: field:stock.change.product.qty,prodlot_id:0
 #: field:stock.inventory.line,prod_lot_id:0
-#: report:stock.inventory.move:0
-#: field:stock.move,prodlot_id:0
-#: field:stock.move.memory.in,prodlot_id:0
-#: field:stock.move.memory.out,prodlot_id:0
-#: field:stock.move.split.lines.exist,prodlot_id:0
-#: view:stock.production.lot:0
+#: field:stock.inventory.line.split.lines,name:0
+#: field:stock.inventory.line.split.lines,prodlot_id:0
+#: report:stock.inventory.move:0 field:stock.move,prodlot_id:0
+#: field:stock.move.split.lines,name:0
+#: field:stock.move.split.lines,prodlot_id:0
+#: field:stock.partial.move.line,prodlot_id:0
+#: field:stock.partial.picking.line,prodlot_id:0 view:stock.production.lot:0
 #: field:stock.production.lot,name:0
 msgid "Production Lot"
-msgstr "Lote de producción"
+msgstr ""
 
 #. module: stock
-#: model:ir.ui.menu,name:stock.menu_traceability
-#: view:stock.move:0
-#: view:stock.picking:0
-#: view:stock.production.lot:0
-#: view:stock.tracking:0
+#: model:ir.ui.menu,name:stock.menu_traceability view:stock.move:0
+#: view:stock.picking:0 view:stock.production.lot:0 view:stock.tracking:0
 msgid "Traceability"
-msgstr "Trazabilidad"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "To invoice"
-msgstr "Para facturar"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
-#: model:ir.ui.menu,name:stock.menu_action_location_form
-#: view:stock.picking:0
+#: model:ir.ui.menu,name:stock.menu_action_location_form view:stock.picking:0
 msgid "Locations"
-msgstr "Ubicaciones"
+msgstr ""
 
 #. module: stock
 #: view:stock.picking:0
 msgid "General Information"
-msgstr "Información general"
+msgstr ""
 
 #. module: stock
 #: field:stock.production.lot,prefix:0
 msgid "Prefix"
-msgstr "Prefijo"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3986,1088 +3734,266 @@ msgid ""
 "Total quantity after split exceeds the quantity to split for this product: "
 "\"%s\" (id: %d)"
 msgstr ""
-"Cantidad total después de que la división exceda la cantidad para dividir "
-"para este producto: \"%s\" (id: %d)"
 
 #. module: stock
-#: view:stock.move:0
-#: field:stock.partial.move,product_moves_in:0
-#: field:stock.partial.move,product_moves_out:0
-#: field:stock.partial.picking,product_moves_in:0
-#: field:stock.partial.picking,product_moves_out:0
+#: help:product.template,property_stock_account_input:0
+msgid ""
+"When doing real-time inventory valuation, counterpart journal items for all "
+"incoming stock moves will be posted in this account, unless there is a "
+"specific valuation account set on the source location. When not set on the "
+"product, the one from the product category is used."
+msgstr ""
+"Cuando en el campo Valoración inventario se tiene seleccionado Tiempo real "
+"(automatizado) , la contrapartida de los asientos contables para todos los "
+"movimientos de inventario entrantes, se mostrarán en esta cuenta contable, a "
+"menos de que exista un conjunto de valoración cuenta específica en la "
+"ubicación de destino. En el caso de que el producto es un servicio, se "
+"deberá de seleccionar la cuenta de gastos. Si no se activa en el producto, "
+"el de la categoría de productos se utiliza."
+
+#. module: stock
+#: view:stock.move:0 field:stock.partial.move,move_ids:0
+#: field:stock.return.picking,product_return_moves:0
 msgid "Moves"
-msgstr "Movimientos"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,location_dest_id:0
+#: view:report.stock.move:0 field:report.stock.move,location_dest_id:0
+#: field:stock.partial.move.line,location_dest_id:0
+#: field:stock.partial.picking.line,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 msgid "Dest. Location"
-msgstr "Ubicación destino"
+msgstr ""
 
 #. module: stock
 #: help:stock.move,product_packaging:0
 msgid ""
 "It specifies attributes of packaging like type, quantity of packaging,etc."
 msgstr ""
-"Indica los atributos del empaquetado como el tipo, la cantidad de paquetes, "
-"etc."
-
-#. module: stock
-#: code:addons/stock/stock.py:2386
-#, python-format
-msgid "Product  '%s' is consumed with '%s' quantity."
-msgstr ""
-
-#. module: stock
-#: code:addons/stock/stock.py:2595
-#, python-format
-msgid "Inventory '%s' is done."
-msgstr ""
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr "Debe asignar un lote de producción para este producto"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
 msgid "Expected"
-msgstr "Previsto"
+msgstr ""
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: model:stock.location,name:stock.location_production
 #: selection:stock.location,usage:0
 msgid "Production"
-msgstr "Producción"
+msgstr ""
 
 #. module: stock
 #: view:stock.split.into:0
 msgid "Split Move"
-msgstr "Dividir movimiento"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/wizard/stock_return_picking.py:92
+#: field:stock.picking,backorder_id:0
+msgid "Back Order of"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_return_picking.py:106
 #, python-format
 msgid ""
 "There are no products to return (only lines in Done state and not fully "
 "returned yet can be returned)!"
 msgstr ""
-"¡No hay productos para devolver (sólo las líneas en estado Realizado y "
-"todavía no devueltas totalmente pueden ser devueltas)!"
+
+#. module: stock
+#: view:report.stock.move:0
+msgid "Future Stock-Moves"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
 msgid "Split in Production lots"
-msgstr "Dividir en lotes de producción"
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:213
+#, python-format
+msgid "Processing Error"
+msgstr ""
 
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Real"
-msgstr "Real"
+msgstr ""
 
 #. module: stock
-#: report:stock.picking.list:0
-#: view:stock.production.lot.revision:0
+#: report:stock.picking.list:0 view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
 msgid "Description"
-msgstr "Descripción"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "May"
-msgstr "Mayo"
-
-#. module: stock
-#: code:addons/stock/wizard/stock_partial_move.py:133
-#, python-format
-msgid "Deliver"
-msgstr "Enviar"
-
-#. module: stock
-#: help:product.template,property_stock_account_output:0
-msgid ""
-"When doing real-time inventory valuation, counterpart Journal Items for all "
-"outgoing stock moves will be posted in this account. If not set on the "
-"product, the one from the product category is used."
 msgstr ""
-"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
-"asientos del diario para todos los movimientos de stock de salida se creará "
-"en esta cuenta. Si no se indica en el producto, se utilizará la cuenta de la "
-"categoría del producto."
 
 #. module: stock
-#: model:ir.actions.act_window,name:stock.action5
-#: view:stock.tracking:0
+#: model:ir.actions.act_window,name:stock.action5 view:stock.tracking:0
 msgid "Upstream traceability"
-msgstr "Trazabilidad hacia arriba"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 #: report:lot.stock.overview_all:0
 msgid "Location Content"
-msgstr "Contenido ubicación"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/product.py:388
+#: code:addons/stock/product.py:447
 #, python-format
 msgid "Produced Qty"
-msgstr "Ctdad producida"
+msgstr ""
 
 #. module: stock
 #: field:product.category,property_stock_account_output_categ:0
 #: field:product.template,property_stock_account_output:0
 #: field:stock.change.standard.price,stock_account_output:0
-#: field:stock.location,valuation_out_account_id:0
 msgid "Stock Output Account"
-msgstr "Cuenta salida stock"
+msgstr "Cuenta por Cobrar Transitoria"
 
 #. module: stock
 #: field:stock.location,chained_location_type:0
 msgid "Chained Location Type"
-msgstr "Tipo ubicaciones encadenadas"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
 msgid "Stock report by production lots"
-msgstr "Reporte de inventario por lotes de producción"
+msgstr ""
 
 #. module: stock
-#: view:stock.location:0
-#: selection:stock.location,chained_location_type:0
+#: view:stock.location:0 selection:stock.location,chained_location_type:0
 #: view:stock.move:0
 msgid "Customer"
-msgstr "Cliente"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "February"
-msgstr "Febrero"
+msgstr ""
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Production Lot Identification"
-msgstr "Identificación lote de producción"
+msgstr ""
 
 #. module: stock
-#: field:stock.location,scrap_location:0
-#: view:stock.move.scrap:0
+#: model:stock.location,name:stock.location_refrigerator_small
+msgid "Small Refrigerator"
+msgstr ""
+
+#. module: stock
+#: model:stock.location,name:stock.location_convenience_shop
+msgid "Convenient Store"
+msgstr ""
+
+#. module: stock
+#: field:stock.location,scrap_location:0 view:stock.move.scrap:0
 msgid "Scrap Location"
-msgstr "Ubicación desecho"
+msgstr ""
 
 #. module: stock
+#: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "April"
-msgstr "Abril"
+msgstr ""
 
 #. module: stock
-#: view:report.stock.inventory:0
-#: view:stock.move:0
+#: view:report.stock.inventory:0 view:stock.move:0
 msgid "Future"
-msgstr "Futuro"
+msgstr ""
 
 #. module: stock
 #: field:stock.invoice.onshipping,invoice_date:0
 msgid "Invoiced date"
-msgstr "Fecha facturado"
+msgstr ""
 
 #. module: stock
-#: code:addons/stock/stock.py:732
-#: code:addons/stock/wizard/stock_fill_inventory.py:106
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:85
-#: code:addons/stock/wizard/stock_invoice_onshipping.py:87
-#: code:addons/stock/wizard/stock_return_picking.py:77
-#: code:addons/stock/wizard/stock_return_picking.py:92
-#: code:addons/stock/wizard/stock_return_picking.py:194
+#: code:addons/stock/stock.py:738
+#: code:addons/stock/wizard/stock_fill_inventory.py:116
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:96
+#: code:addons/stock/wizard/stock_invoice_onshipping.py:98
+#: code:addons/stock/wizard/stock_return_picking.py:99
+#: code:addons/stock/wizard/stock_return_picking.py:106
+#: code:addons/stock/wizard/stock_return_picking.py:189
 #, python-format
 msgid "Warning !"
-msgstr "¡Aviso!"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
 msgid "Output"
-msgstr "Salida"
+msgstr ""
 
 #. module: stock
-#: selection:stock.move.split.lines,action:0
-msgid "Keep in one lot"
-msgstr "Mantener en un lote"
+#: help:stock.tracking,name:0
+msgid ""
+"By default, the pack reference is generated following the sscc standard. "
+"(Serial number + 1 check digit)"
+msgstr ""
 
 #. module: stock
-#: view:product.product:0
-msgid "Cost Price:"
-msgstr "Precio coste:"
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_partial_picking.py:159
+#, python-format
+msgid ""
+"The rounding of the initial uom does not allow you to ship \"%s %s\", as it "
+"would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is "
+"accepted by the uom."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/wizard/stock_move.py:213
+#, python-format
+msgid ""
+"Production lot quantity %d of %s is larger than available quantity (%d) !"
+msgstr ""
+
+#. module: stock
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
 
 #. module: stock
 #: help:stock.move,move_dest_id:0
 msgid "Optional: next stock move when chaining them"
-msgstr "Opcional: Siguiente movimiento de stock cuando se encadenan."
+msgstr ""
 
 #. module: stock
-#: view:report.stock.move:0
-#: field:report.stock.move,year:0
+#: view:report.stock.inventory:0 field:report.stock.inventory,year:0
+#: view:report.stock.move:0 field:report.stock.move,year:0
 msgid "Year"
-msgstr "Año"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
-msgstr "Ubicaciones físicas"
+msgstr ""
 
 #. module: stock
-#: model:ir.model,name:stock.model_stock_partial_move
-msgid "Partial Move"
-msgstr "Movimiento parcial"
+#: view:stock.picking:0 selection:stock.picking,state:0
+msgid "Ready to Process"
+msgstr ""
 
 #. module: stock
-#: help:stock.location,posx:0
-#: help:stock.location,posy:0
+#: help:stock.location,posx:0 help:stock.location,posy:0
 #: help:stock.location,posz:0
 msgid "Optional localization details, for information purpose only"
-msgstr "Detalles de ubicación opcionales, sólo para fines de información."
-
-#~ msgid "Sub Products"
-#~ msgstr "Sub productos"
-
-#~ msgid "STOCK_SAVE"
-#~ msgstr "STOCK_SAVE"
-
-#~ msgid "STOCK_QUIT"
-#~ msgstr "STOCK_QUIT"
-
-#~ msgid "STOCK_CANCEL"
-#~ msgstr "STOCK_CANCEL"
-
-#~ msgid "STOCK_NEW"
-#~ msgstr "STOCK_NEW"
-
-#~ msgid "STOCK_UNDERLINE"
-#~ msgstr "STOCK_UNDERLINE"
-
-#~ msgid "STOCK_PREFERENCES"
-#~ msgstr "STOCK_PREFERENCES"
-
-#~ msgid "LIFO"
-#~ msgstr "LIFO"
-
-#~ msgid "terp-account"
-#~ msgstr "terp-account"
-
-#~ msgid "STOCK_SORT_ASCENDING"
-#~ msgstr "STOCK_SORT_ASCENDING"
-
-#~ msgid "Revision"
-#~ msgstr "Revisión"
-
-#~ msgid "STOCK_MEDIA_FORWARD"
-#~ msgstr "STOCK_MEDIA_FORWARD"
-
-#~ msgid "STOCK_ZOOM_100"
-#~ msgstr "STOCK_ZOOM_100"
-
-#~ msgid "Return packing"
-#~ msgstr "Devolución de paquete"
-
-#~ msgid "Fill Inventory for specific location"
-#~ msgstr "Rellenar inventario para una determinada ubicación"
-
-#~ msgid "Amount"
-#~ msgstr "Cantidad"
-
-#~ msgid "Products Received"
-#~ msgstr "Productos recibidos"
-
-#~ msgid "Move History"
-#~ msgstr "Histórico movimientos"
-
-#~ msgid "Make Parcel"
-#~ msgstr "Hacer envíos parciales"
-
-#~ msgid "STOCK_GOTO_TOP"
-#~ msgstr "STOCK_GOTO_TOP"
-
-#~ msgid "STOCK_ABOUT"
-#~ msgstr "STOCK_ABOUT"
-
-#~ msgid "terp-hr"
-#~ msgstr "terp-hr"
-
-#~ msgid "terp-purchase"
-#~ msgstr "terp-purchase"
-
-#~ msgid "STOCK_DND"
-#~ msgstr "STOCK_DND"
-
-#~ msgid "Products Sent"
-#~ msgstr "Productos enviados"
-
-#~ msgid "STOCK_GOTO_FIRST"
-#~ msgstr "STOCK_GOTO_FIRST"
-
-#~ msgid "Serial"
-#~ msgstr "Nº serie"
-
-#~ msgid "STOCK_FLOPPY"
-#~ msgstr "STOCK_FLOPPY"
-
-#~ msgid "Stock location"
-#~ msgstr "Ubicación de existencias"
-
-#~ msgid "Unreceived Products"
-#~ msgstr "Productos no recibidos"
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Include all childs for the location"
-#~ msgstr "Incluir todos los descendientes de la ubicación"
-
-#~ msgid "Track line"
-#~ msgstr "Línea de seguimiento"
-
-#~ msgid "STOCK_BOLD"
-#~ msgstr "STOCK_BOLD"
-
-#~ msgid "terp-graph"
-#~ msgstr "terp-graph"
-
-#~ msgid "Stock Level 1"
-#~ msgstr "Nivel de Existencias 1"
-
-#~ msgid "STOCK_MEDIA_REWIND"
-#~ msgstr "STOCK_MEDIA_REWIND"
-
-#~ msgid "Stock Properties"
-#~ msgstr "Propiedades de stock"
-
-#~ msgid "Draft Moves"
-#~ msgstr "Movimientos borrador"
-
-#~ msgid "Product Id"
-#~ msgstr "Id producto"
-
-#~ msgid "Customer Invoice"
-#~ msgstr "Factura de cliente"
-
-#~ msgid "Force to use a Production Lot during production order"
-#~ msgstr ""
-#~ "Fuerza a utilizar un lote de producción durante la orden de producción"
-
-#~ msgid "STOCK_CUT"
-#~ msgstr "STOCK_CUT"
-
-#~ 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 ""
-#~ "Para el actual producto (plantilla), esta ubicación de existencia se "
-#~ "utilizará, en lugar de la por defecto, como la ubicación origen para "
-#~ "movimientos de stock generados cuando realice un inventario"
-
-#~ msgid "This account will be used to value the output stock"
-#~ msgstr "Esta cuenta será utilizada para calcular las salidas de existencias"
-
-#~ msgid "STOCK_ZOOM_FIT"
-#~ msgstr "STOCK_ZOOM_FIT"
-
-#~ msgid ""
-#~ "This journal will be used for the accounting move generated by stock move"
-#~ msgstr ""
-#~ "Este diario será utilizado para contabilizar un movimiento generado por un "
-#~ "movimiento de Existencias"
-
-#~ msgid "Calendar of Deliveries"
-#~ msgstr "Calendario de entregas"
-
-#~ msgid "STOCK_SAVE_AS"
-#~ msgstr "STOCK_SAVE_AS"
-
-#~ msgid "STOCK_DIALOG_ERROR"
-#~ msgstr "STOCK_DIALOG_ERROR"
-
-#~ msgid "Latest Date of Inventory"
-#~ msgstr "Última fecha de inventario"
-
-#~ msgid "STOCK_INDEX"
-#~ msgstr "STOCK_INDEX"
-
-#~ msgid "STOCK_GOTO_BOTTOM"
-#~ msgstr "STOCK_GOTO_BOTTOM"
-
-#~ msgid "Tracking Lot"
-#~ msgstr "Lote de seguimiento"
-
-#~ msgid "STOCK_GO_FORWARD"
-#~ msgstr "STOCK_GO_FORWARD"
-
-#~ msgid "STOCK_UNDELETE"
-#~ msgstr "STOCK_UNDELETE"
-
-#~ msgid "STOCK_EXECUTE"
-#~ msgstr "STOCK_EXECUTE"
-
-#~ msgid "STOCK_DIALOG_QUESTION"
-#~ msgstr "STOCK_DIALOG_QUESTION"
-
-#~ msgid "Tracking/Serial"
-#~ msgstr "Seguimiento/Número de serie"
-
-#~ msgid "STOCK_SELECT_FONT"
-#~ msgstr "STOCK_SELECT_FONT"
-
-#~ msgid "STOCK_PASTE"
-#~ msgstr "STOCK_PASTE"
-
-#~ msgid ""
-#~ "Tracking lot is the code that will be put on the logistical unit/pallet"
-#~ msgstr ""
-#~ "Lote de seguimiento es el código que se colocará en la unidad/palet "
-#~ "logístico."
-
-#~ msgid "Tracking Number"
-#~ msgstr "Número seguimiento"
-
-#~ msgid "terp-stock"
-#~ msgstr "terp-stock"
-
-#~ msgid "Packing List:"
-#~ msgstr "Albarán:"
-
-#~ msgid "STOCK_MEDIA_RECORD"
-#~ msgstr "STOCK_MEDIA_RECORD"
-
-#~ msgid "Non Assigned Products:"
-#~ msgstr "Productos no asignados:"
-
-#~ msgid "terp-report"
-#~ msgstr "terp-report"
-
-#~ msgid "Location Content (With children)"
-#~ msgstr "Contenido ubicación (con hijos)"
-
-#~ msgid "STOCK_FILE"
-#~ msgstr "STOCK_FILE"
-
-#~ msgid "STOCK_EDIT"
-#~ msgstr "STOCK_EDIT"
-
-#~ msgid "STOCK_CONNECT"
-#~ msgstr "STOCK_CONNECT"
-
-#~ msgid "STOCK_GO_DOWN"
-#~ msgstr "STOCK_GO_DOWN"
-
-#~ msgid "STOCK_OK"
-#~ msgstr "STOCK_OK"
-
-#~ msgid "New Internal Packing"
-#~ msgstr "Nuevo albarán interno"
-
-#~ msgid "Finished products"
-#~ msgstr "Productos finalizados"
-
-#~ msgid "Date create"
-#~ msgstr "Fecha creación"
-
-#~ msgid "Set to Zero"
-#~ msgstr "Fijar a cero"
-
-#~ msgid "All Stock Moves"
-#~ msgstr "Todos los movimientos de stock"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "STOCK_HELP"
-#~ msgstr "STOCK_HELP"
-
-#~ msgid "This account will be used to value the input stock"
-#~ msgstr "Esta cuenta será utilizada para calcular el stock de entrada"
-
-#, python-format
-#~ msgid "Invoice state"
-#~ msgstr "Estado de la factura"
-
-#~ msgid "STOCK_UNDO"
-#~ msgstr "STOCK_UNDO"
-
-#~ msgid "Date Created"
-#~ msgstr "Fecha creación"
-
-#~ msgid "STOCK_GO_BACK"
-#~ msgstr "STOCK_GO_BACK"
-
-#~ msgid "STOCK_JUSTIFY_FILL"
-#~ msgstr "STOCK_JUSTIFY_FILL"
-
-#~ msgid "Allocation Method"
-#~ msgstr "Método asignación"
-
-#~ msgid "terp-administration"
-#~ msgstr "terp-administration"
-
-#~ msgid "STOCK_APPLY"
-#~ msgstr "STOCK_APPLY"
-
-#, python-format
-#~ msgid "Please select at least two inventories."
-#~ msgstr "Por favor, seleccione por lo menos dos inventarios."
-
-#~ msgid "Dest. Address"
-#~ msgstr "Dirección destinatario"
-
-#~ msgid "Periodical Inventory"
-#~ msgstr "Inventario periódico"
-
-#~ msgid "terp-crm"
-#~ msgstr "terp-crm"
-
-#~ msgid "STOCK_STRIKETHROUGH"
-#~ msgstr "STOCK_STRIKETHROUGH"
-
-#~ msgid "terp-partner"
-#~ msgstr "terp-partner"
-
-#~ msgid "Draft Periodical Inventories"
-#~ msgstr "Inventarios periódicos borrador"
-
-#~ msgid "STOCK_MISSING_IMAGE"
-#~ msgstr "STOCK_MISSING_IMAGE"
-
-#~ msgid "STOCK_SPELL_CHECK"
-#~ msgstr "STOCK_SPELL_CHECK"
-
-#~ msgid "Stock Tracking Lots"
-#~ msgstr "Lotes seguimiento de stock"
-
-#~ msgid "Origin Reference"
-#~ msgstr "Referencia origen"
-
-#~ msgid "Available Moves"
-#~ msgstr "Movimientos disponibles"
-
-#~ msgid "STOCK_HARDDISK"
-#~ msgstr "STOCK_HARDDISK"
-
-#~ msgid "Open Products"
-#~ msgstr "Abrir productos"
-
-#~ msgid "Input Packing List"
-#~ msgstr "Albaranes de entrada"
-
-#~ msgid "Packing List"
-#~ msgstr "Albarán"
-
-#~ msgid "STOCK_COPY"
-#~ msgstr "STOCK_COPY"
-
-#~ msgid "STOCK_CDROM"
-#~ msgstr "STOCK_CDROM"
-
-#~ msgid "Not from Packing"
-#~ msgstr "No a partir de albarán"
-
-#~ msgid "Internal Ref"
-#~ msgstr "Ref. interna"
-
-#~ msgid "STOCK_REFRESH"
-#~ msgstr "STOCK_REFRESH"
-
-#~ msgid "STOCK_STOP"
-#~ msgstr "STOCK_STOP"
-
-#~ msgid "STOCK_FIND_AND_REPLACE"
-#~ msgstr "STOCK_FIND_AND_REPLACE"
-
-#~ msgid "Validate"
-#~ msgstr "Validar"
-
-#~ msgid "STOCK_DIALOG_WARNING"
-#~ msgstr "STOCK_DIALOG_WARNING"
-
-#~ msgid "STOCK_ZOOM_IN"
-#~ msgstr "STOCK_ZOOM_IN"
-
-#~ msgid "STOCK_CONVERT"
-#~ msgstr "STOCK_CONVERT"
-
-#~ msgid "Move lines"
-#~ msgstr "Líneas de movimientos"
-
-#~ msgid "terp-calendar"
-#~ msgstr "terp-calendar"
-
-#~ msgid "STOCK_ITALIC"
-#~ msgstr "STOCK_ITALIC"
-
-#~ msgid "STOCK_YES"
-#~ msgstr "STOCK_YES"
-
-#~ msgid "Fill From Unreceived Products"
-#~ msgstr "Rellenar a partir de productos no recibidos"
-
-#~ msgid "Dest. Move"
-#~ msgstr "Mov. destino"
-
-#~ msgid "New Periodical Inventory"
-#~ msgstr "Nuevo inventario periódico"
-
-#~ msgid "FIFO"
-#~ msgstr "FIFO"
-
-#~ msgid "Delivery Orders to Process"
-#~ msgstr "Órdenes de entrega a procesar"
-
-#~ msgid "Invoice Status"
-#~ msgstr "Estado de facturación"
-
-#~ msgid "STOCK_JUSTIFY_LEFT"
-#~ msgstr "STOCK_JUSTIFY_LEFT"
-
-#~ msgid "Future Stock Forecast"
-#~ msgstr "Previsión de futuro stock"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Planned Date"
-#~ msgstr "Fecha prevista"
-
-#, python-format
-#~ msgid "No production sequence defined"
-#~ msgstr "No se ha definido una secuencia de producción"
-
-#~ msgid "STOCK_COLOR_PICKER"
-#~ msgstr "STOCK_COLOR_PICKER"
-
-#~ msgid "Lots by location"
-#~ msgstr "Lotes por ubicación"
-
-#~ msgid "STOCK_DELETE"
-#~ msgstr "STOCK_DELETE"
-
-#~ msgid "STOCK_CLEAR"
-#~ msgstr "STOCK_CLEAR"
-
-#~ msgid "Created Date"
-#~ msgstr "Fecha creación"
-
-#~ msgid "terp-mrp"
-#~ msgstr "terp-mrp"
-
-#~ msgid "STOCK_GO_UP"
-#~ msgstr "STOCK_GO_UP"
-
-#~ msgid "STOCK_SORT_DESCENDING"
-#~ msgstr "STOCK_SORT_DESCENDING"
-
-#~ msgid "Tracking Lots"
-#~ msgstr "Lotes seguimiento"
-
-#~ msgid "STOCK_HOME"
-#~ msgstr "STOCK_HOME"
-
-#~ msgid "STOCK_PROPERTIES"
-#~ msgstr "STOCK_PROPERTIES"
-
-#~ msgid "Create invoices"
-#~ msgstr "Crear facturas"
-
-#~ msgid "Set Stock to Zero"
-#~ msgstr "Fijar stock a cero"
-
-#~ msgid "STOCK_MEDIA_STOP"
-#~ msgstr "STOCK_MEDIA_STOP"
-
-#~ msgid "Make packing"
-#~ msgstr "Realizar albarán"
-
-#~ msgid "STOCK_DND_MULTIPLE"
-#~ msgstr "STOCK_DND_MULTIPLE"
-
-#~ msgid "STOCK_REMOVE"
-#~ msgstr "STOCK_REMOVE"
-
-#~ msgid "STOCK_DIALOG_AUTHENTICATION"
-#~ msgstr "STOCK_DIALOG_AUTHENTICATION"
-
-#~ msgid "STOCK_ZOOM_OUT"
-#~ msgstr "STOCK_ZOOM_OUT"
-
-#~ msgid "Nearest"
-#~ msgstr "El más cercano"
-
-#~ msgid "STOCK_SELECT_COLOR"
-#~ msgstr "STOCK_SELECT_COLOR"
-
-#~ msgid "STOCK_PRINT"
-#~ msgstr "STOCK_PRINT"
-
-#~ msgid "STOCK_NO"
-#~ msgstr "STOCK_NO"
-
-#~ msgid "Workshop"
-#~ msgstr "Tienda"
-
-#~ msgid "STOCK_REDO"
-#~ msgstr "STOCK_REDO"
-
-#~ msgid "Tiny sprl"
-#~ msgstr "Tiny sprl"
-
-#~ msgid "STOCK_CLOSE"
-#~ msgstr "STOCK_CLOSE"
-
-#~ msgid "Force to use a Production Lot during deliveries"
-#~ msgstr "Fuerza a utilizar un lote de producción durante las entregas"
-
-#~ msgid "Split move lines in two"
-#~ msgstr "Dividir líneas de movimiento en dos"
-
-#~ msgid "Return"
-#~ msgstr "Devolver"
-
-#~ msgid "Auto-Packing"
-#~ msgstr "Auto-Empaquetado"
-
-#~ msgid "STOCK_JUMP_TO"
-#~ msgstr "STOCK_JUMP_TO"
-
-#~ msgid "terp-tools"
-#~ msgstr "terp-tools"
-
-#~ msgid "Location Overview"
-#~ msgstr "Vista general ubicaciones"
-
-#~ msgid "STOCK_DIALOG_INFO"
-#~ msgstr "STOCK_DIALOG_INFO"
-
-#~ msgid "Split move line"
-#~ msgstr "Partir línea de movimiento"
-
-#~ msgid "terp-sale"
-#~ msgstr "terp-sale"
-
-#~ msgid "STOCK_ADD"
-#~ msgstr "STOCK_ADD"
-
-#~ msgid "Chained Delay (days)"
-#~ msgstr "Retraso encadenado (días)"
-
-#~ msgid "STOCK_MEDIA_PAUSE"
-#~ msgstr "STOCK_MEDIA_PAUSE"
-
-#~ msgid "STOCK_PRINT_PREVIEW"
-#~ msgstr "STOCK_PRINT_PREVIEW"
-
-#~ msgid "STOCK_FIND"
-#~ msgstr "STOCK_FIND"
-
-#~ msgid "Tracking"
-#~ msgstr "Seguimiento"
-
-#~ msgid ""
-#~ "This account will be used, instead of the default one, to value input stock"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará en lugar de la por defecto para valorar el stock de "
-#~ "entrada"
-
-#~ msgid "Components"
-#~ msgstr "Componentes"
-
-#~ msgid "Max. Planned Date"
-#~ msgstr "Fecha prevista máx."
-
-#~ msgid "STOCK_MEDIA_PLAY"
-#~ msgstr "STOCK_MEDIA_PLAY"
-
-#~ msgid "STOCK_OPEN"
-#~ msgstr "STOCK_OPEN"
-
-#~ msgid "STOCK_MEDIA_PREVIOUS"
-#~ msgstr "STOCK_MEDIA_PREVIOUS"
-
-#~ msgid "Stock Locations Structure"
-#~ msgstr "Estructura ubicaciones stock"
-
-#~ msgid "STOCK_DISCONNECT"
-#~ msgstr "STOCK_DISCONNECT"
-
-#~ msgid ""
-#~ "This account will be used, instead of the default one, to value output stock"
-#~ msgstr ""
-#~ "Esta cuenta será utilizada, en lugar de la por defecto, para calcular el "
-#~ "stock de salida"
-
-#~ msgid "Confirm (Do Not Process Now)"
-#~ msgstr "Confirmar (no procesar ahora)"
-
-#~ msgid "Moves Tracked"
-#~ msgstr "Seguimiento movimientos"
-
-#~ msgid "STOCK_NETWORK"
-#~ msgstr "STOCK_NETWORK"
-
-#~ msgid "terp-project"
-#~ msgstr "terp-project"
-
-#~ msgid "Stock by Lots"
-#~ msgstr "Stock por lotes"
-
-#~ msgid "STOCK_UNINDENT"
-#~ msgstr "STOCK_UNINDENT"
-
-#~ msgid "STOCK_GOTO_LAST"
-#~ msgstr "STOCK_GOTO_LAST"
-
-#~ msgid "STOCK_DIRECTORY"
-#~ msgstr "STOCK_DIRECTORY"
-
-#~ 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 "
-#~ "by production orders"
-#~ msgstr ""
-#~ "Para el actual producto (plantilla), esta ubicación de stock se utilizará, "
-#~ "en lugar de la por defecto, como la ubicación origen para movimientos de "
-#~ "stock generados por órdenes de producción"
-
-#~ msgid "Add"
-#~ msgstr "Añadir"
-
-#~ msgid "STOCK_JUSTIFY_CENTER"
-#~ msgstr "STOCK_JUSTIFY_CENTER"
-
-#~ msgid "Set Stock to 0"
-#~ msgstr "Fijar stock a 0"
-
-#~ msgid "Localisation"
-#~ msgstr "Ubicación"
-
-#~ msgid "Do you want to set stocks to zero ?"
-#~ msgstr "¿Desea fijar stocks a cero?"
-
-#~ msgid "Direct Delivery"
-#~ msgstr "Entrega directa"
-
-#~ msgid "STOCK_REVERT_TO_SAVED"
-#~ msgstr "STOCK_REVERT_TO_SAVED"
-
-#~ msgid "Track Production Lots"
-#~ msgstr "Lotes seguimiento de producción"
-
-#~ msgid "Split in Two"
-#~ msgstr "Partir en dos"
-
-#~ 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 "
-#~ "by procurements"
-#~ msgstr ""
-#~ "Para el actual producto (plantilla), esta ubicación de stock se utilizará, "
-#~ "en lugar de la por defecto, como la ubicación origen para movimientos de "
-#~ "stock generados por abastecimientos"
-
-#~ msgid "stock.picking.move.wizard"
-#~ msgstr "stock.picking.move.wizard"
-
-#~ msgid "Date Order"
-#~ msgstr "Fecha orden"
-
-#~ msgid "Supplier Invoice"
-#~ msgstr "Factura de proveedor"
-
-#, python-format
-#~ msgid "to be invoiced"
-#~ msgstr "Para facturar"
-
-#~ msgid "terp-product"
-#~ msgstr "terp-product"
-
-#~ msgid "Close"
-#~ msgstr "Cerrar"
-
-#~ msgid "Inventory Account"
-#~ msgstr "Cuenta inventario"
-
-#~ msgid "Set Stocks to Zero"
-#~ msgstr "Fijar stocks a cero"
-
-#~ msgid "Low Level"
-#~ msgstr "Nivel inferior"
-
-#~ msgid "STOCK_INDENT"
-#~ msgstr "STOCK_INDENT"
-
-#~ msgid "Delivery"
-#~ msgstr "Entrega"
-
-#~ msgid "Locations' Values"
-#~ msgstr "Valores ubicaciones"
-
-#~ msgid "STOCK_JUSTIFY_RIGHT"
-#~ msgstr "STOCK_JUSTIFY_RIGHT"
-
-#~ msgid "Inventory line"
-#~ msgstr "Línea de inventario"
-
-#~ msgid "Others info"
-#~ msgstr "Otras info."
-
-#~ msgid "STOCK_MEDIA_NEXT"
-#~ msgstr "STOCK_MEDIA_NEXT"
-
-#~ msgid "Move State"
-#~ msgstr "Estado de movimientos"
-
-#, python-format
-#~ msgid "Invoice is not created"
-#~ msgstr "No se ha creado factura"
-
-#, python-format
-#~ msgid "Invoice cannot be created from Packing."
-#~ msgstr "No se puede crear factura desde albaranes."
-
-#~ msgid "Future Delivery Orders"
-#~ msgstr "Órdenes de entrega futuras"
-
-#~ msgid ""
-#~ "This is used only if you selected a chained location type.\n"
-#~ "The 'Automatic Move' value will create a stock move after the current one "
-#~ "that will be validated automatically. With 'Manual Operation', the stock "
-#~ "move has to be validated by a worker. With 'Automatic No Step Added', the "
-#~ "location is replaced in the original move."
-#~ msgstr ""
-#~ "Se utiliza sólo si selecciona un tipo de ubicación encadenada.\n"
-#~ "La opción 'Movimiento automático' creará un movimiento de stock después del "
-#~ "actual que se validará automáticamente. Con 'Operación manual', el "
-#~ "movimiento de stock debe ser validado por un trabajador. Con 'Mov. "
-#~ "automático, paso no añadido', la ubicación se reemplaza en el movimiento "
-#~ "original."
-
-#~ msgid "Make Picking"
-#~ msgstr "Realizar albarán"
-
-#~ msgid "Packing result"
-#~ msgstr "Resultado albarán"
-
-#~ msgid "Available Packing"
-#~ msgstr "Albarán disponible"
-
-#~ msgid "Packing Done"
-#~ msgstr "Albarán realizado"
-
-#~ msgid "The packing has been successfully made !"
-#~ msgstr "¡El albarán ha sido realizado correctamente!"
-
-#~ msgid "Packing to Process"
-#~ msgstr "Albaranes a procesar"
-
-#~ msgid "Confirmed Packing Waiting Availability"
-#~ msgstr "Albarán confirmado esperando disponibilidad"
-
-#~ msgid "Partial packing"
-#~ msgstr "Albarán parcial"
-
-#~ msgid "Incoming Products"
-#~ msgstr "Albaranes de entrada"
-
-#~ msgid "Outgoing Products"
-#~ msgstr "Albaranes de salida"
-
-#~ msgid "Force to use a Production Lot during receptions"
-#~ msgstr "Fuerza a usar un lote de producción durante la recepción"
-
-#~ msgid "Print Item Labels"
-#~ msgstr "Imprimir etiquetas"
-
-#, python-format
-#~ msgid "Please select one and only one inventory !"
-#~ msgstr "¡ Por favor, seleccione un y sólo un inventario !"
-
-#, python-format
-#~ msgid "Invoice is already created."
-#~ msgstr "La factura ya está creada."
-
-#~ msgid "Units"
-#~ msgstr "Unidades"
-
-#~ msgid "Total :"
-#~ msgstr "Total:"
-
-#~ msgid ""
-#~ "Scheduled date for the movement of the products or real date if the move is "
-#~ "done."
-#~ msgstr ""
-#~ "Fecha programada para el movimiento de productos o fecha real si el "
-#~ "movimiento ha sido realizado."
-
-#~ msgid "New Reception Packing"
-#~ msgstr "Nuevo albarán de entrada"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#~ msgid "Customer Refund"
-#~ msgstr "Factura rectificativa (abono) de cliente"
-
-#~ msgid "Move Lines"
-#~ msgstr "Líneas movimiento"
-
-#~ msgid "Supplier Refund"
-#~ msgstr "Factura rectificativa (abono) de proveedor"
-
-#~ 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 ""
-#~ "El módulo de inventario y logística de OpenERP puede gestionar multi-"
-#~ "almacenes y multi-ubicaciones jerárquicas de stock.\n"
-#~ "Gracias a la gestión de partida doble, el control de inventario es potente y "
-#~ "flexible:\n"
-#~ "* Historial de movimientos y planificación,\n"
-#~ "* Métodos de inventario diferentes (FIFO, LIFO ...)\n"
-#~ "* Valoración de existencias (estándar o precio medio ...)\n"
-#~ "* Robustez frente a las diferencias de inventario\n"
-#~ "* Reglas automáticas de abastecimiento (nivel de stock mínimo, JIT ...)\n"
-#~ "* Soporte a código de barras\n"
-#~ "* Detección rápida de errores a través de sistema de partida doble\n"
-#~ "* Trazabilidad (hacia arriba/abajo, lotes de producción, número de serie "
-#~ "...)\n"
-#~ "    "
-
-#, python-format
-#~ msgid "is consumed with"
-#~ msgstr "es consumido con"
-
-#, python-format
-#~ msgid "Product "
-#~ msgstr "Producto "
-
-#, python-format
-#~ msgid "is scheduled"
-#~ msgstr "está planificado"
-
-#, python-format
-#~ msgid "quantity."
-#~ msgstr "cantidad."
-
-#, python-format
-#~ msgid "INV: "
-#~ msgstr "INV: "
+msgstr ""
diff --git a/addons/stock/i18n/es_VE.po b/addons/stock/i18n/es_VE.po
index 0151719fab8..39a57baf18d 100644
--- a/addons/stock/i18n/es_VE.po
+++ b/addons/stock/i18n/es_VE.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/et.po b/addons/stock/i18n/et.po
index 7d9a997eb10..c1b16da9327 100644
--- a/addons/stock/i18n/et.po
+++ b/addons/stock/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/fi.po b/addons/stock/i18n/fi.po
index de51e97f59f..3bdab372130 100644
--- a/addons/stock/i18n/fi.po
+++ b/addons/stock/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index d503ac66654..242de4a1c62 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:stock.inventory.line,product_uom:0
@@ -2538,7 +2538,7 @@ msgstr "Origine"
 #: field:stock.inventory.line,inventory_id:0 report:stock.inventory.move:0
 #: selection:stock.location,usage:0
 msgid "Inventory"
-msgstr "Gestion des stocks"
+msgstr "Inventaire"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking
diff --git a/addons/stock/i18n/gl.po b/addons/stock/i18n/gl.po
index 99d22e8c9ff..c06e638875f 100644
--- a/addons/stock/i18n/gl.po
+++ b/addons/stock/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po
index ae60973f770..2baf3a724aa 100644
--- a/addons/stock/i18n/hr.po
+++ b/addons/stock/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/hu.po b/addons/stock/i18n/hu.po
index 4cbb63817b2..e38ed595bdf 100644
--- a/addons/stock/i18n/hu.po
+++ b/addons/stock/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/id.po b/addons/stock/i18n/id.po
index b004eb0c7dd..e94d3f49032 100644
--- a/addons/stock/i18n/id.po
+++ b/addons/stock/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index 88563f1fca8..5d2505b602a 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/ja.po b/addons/stock/i18n/ja.po
index b8df8c1826f..dc3cc4f6aba 100644
--- a/addons/stock/i18n/ja.po
+++ b/addons/stock/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/ko.po b/addons/stock/i18n/ko.po
index 5baef13e47a..2b8830a1896 100644
--- a/addons/stock/i18n/ko.po
+++ b/addons/stock/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/lt.po b/addons/stock/i18n/lt.po
index 0882da20799..9946518c033 100644
--- a/addons/stock/i18n/lt.po
+++ b/addons/stock/i18n/lt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: lt\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/lv.po b/addons/stock/i18n/lv.po
index 1a5eb5ccc2e..3cbf30e92cd 100644
--- a/addons/stock/i18n/lv.po
+++ b/addons/stock/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/mk.po b/addons/stock/i18n/mk.po
index 97f95e20679..eb9fbeee500 100644
--- a/addons/stock/i18n/mk.po
+++ b/addons/stock/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index 8eccf7a4739..a78d139ce78 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/nb.po b/addons/stock/i18n/nb.po
index 8b5ec3b7181..faa3b5b8940 100644
--- a/addons/stock/i18n/nb.po
+++ b/addons/stock/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -36,11 +36,16 @@ msgid ""
 "value for all products in this category. It can also directly be set on each "
 "product"
 msgstr ""
+"Når du gjør real-time beholdningsvurdering vil motpart journal elementer for "
+"alle innkommende aksjen beveger seg bli postet i denne kontoen, med mindre "
+"det er en konkret vurdering konto sett på kildeplasseringen. Dette er "
+"standardverdien for alle produkter i denne kategorien. Det kan også direkte "
+"settes på hvert produkt"
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
 msgid "Chained Location If Fixed"
-msgstr ""
+msgstr "Lenket plassering Hvis Fixed"
 
 #. module: stock
 #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
@@ -161,6 +166,8 @@ msgid ""
 "This is the list of all delivery orders that have to be prepared, according "
 "to your different sales orders and your logistics rules."
 msgstr ""
+"Dette er listen over alle leveringsordre som må være forberedt, i henhold "
+"til dine forskjellige salgsordrer og logistikkregler."
 
 #. module: stock
 #: view:report.stock.move:0 field:report.stock.move,day:0
@@ -195,13 +202,13 @@ msgstr "Inneværende måned"
 #: code:addons/stock/wizard/stock_move.py:222
 #, python-format
 msgid "Unable to assign all lots to this move!"
-msgstr ""
+msgstr "Kan ikke tildele alle partier i denne farten!"
 
 #. module: stock
 #: code:addons/stock/stock.py:2516
 #, python-format
 msgid "Missing partial picking data for move #%s"
-msgstr ""
+msgstr "Mangler delvis plukking data for trekk #% s"
 
 #. module: stock
 #: model:ir.actions.server,name:stock.action_partial_move_server
@@ -223,7 +230,7 @@ msgstr "Plukkordre klar til fakturering"
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Delivery Orders"
-msgstr ""
+msgstr "Tildelte levering Bestillinger"
 
 #. module: stock
 #: field:stock.partial.move.line,update_cost:0
@@ -239,6 +246,9 @@ msgid ""
 "if you really want to change it '             #                        'for "
 "this product: \"%s\" (id: %d)"
 msgstr ""
+"Det gjeldende trekk linjen er allerede tildelt en pakke, må du fjerne det "
+"først hvis du virkelig ønsker å forandre det '#' for dette produktet: \"% "
+"s\" (id:%d)"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -297,7 +307,7 @@ msgstr ""
 #. module: stock
 #: view:stock.partial.move:0 view:stock.partial.picking:0
 msgid "_Validate"
-msgstr ""
+msgstr "_Validere"
 
 #. module: stock
 #: code:addons/stock/stock.py:1149
@@ -337,6 +347,9 @@ msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
 "Valuation account on category of this product are same."
 msgstr ""
+"Kan ikke opprette bilagsregistrering, inngangskontoen definert på dette "
+"produktet og verdivurderingskontoen på kategorien av dette produktet er "
+"samme."
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -414,7 +427,7 @@ msgstr "Forsinkelse (dager)"
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
 msgid "Action traceability "
-msgstr ""
+msgstr "handling sporbarhet "
 
 #. module: stock
 #: view:stock.move:0
@@ -478,6 +491,8 @@ msgid ""
 "When real-time inventory valuation is enabled on a product, this account "
 "will hold the current value of the products."
 msgstr ""
+"Når sanntid beholdningsvurdering er aktivert på et produkt, vil denne "
+"kontoen holde den aktuelle verdien av produktene."
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0 field:stock.location,usage:0
@@ -487,7 +502,7 @@ msgstr "Lokasjonstype"
 #. module: stock
 #: help:report.stock.move,type:0 help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
-msgstr ""
+msgstr "Angi frakttypen, varer kommer eller sendes."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
@@ -502,7 +517,7 @@ msgstr "Bevegelsesstatistikk"
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots Filter"
-msgstr ""
+msgstr "Sorter produktmasse"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
@@ -516,11 +531,13 @@ msgid ""
 "Current quantity of products with this Production Lot Number available in "
 "company warehouses"
 msgstr ""
+"Gjeldende mengde av produkter med denne produksjonen. Varenummer er "
+"tilgjengelig i selskapets varehus"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
 msgid "Move History (child moves)"
-msgstr ""
+msgstr "Flyttelogg (underordnedes flytting)"
 
 #. module: stock
 #: code:addons/stock/stock.py:2125
@@ -529,6 +546,8 @@ msgid ""
 "There is no stock output account defined for this product or its category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Det er ingen lager utgang konto definert for dette produktet eller kategori: "
+"\"% s\" (id:% d)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
@@ -545,7 +564,7 @@ msgstr "Bestemmelseslokasjon"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move_line
 msgid "stock.partial.move.line"
-msgstr ""
+msgstr "lager delvis flytte linjen"
 
 #. module: stock
 #: code:addons/stock/stock.py:760
@@ -577,6 +596,10 @@ msgid ""
 "buttons on the right of each line. You can filter the products to deliver by "
 "customer, products or sale order (using the Origin field)."
 msgstr ""
+"Du vil finne i denne listen alle produkter du har å levere til kundene dine. "
+"Du kan behandle leveransene direkte fra denne listen ved hjelp av knappene "
+"på høyre side av hver linje. Du kan filtrere produkter levere etter kundens, "
+"produkter eller salgsordre (ved hjelp av Origin feltet)."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
@@ -622,6 +645,10 @@ msgid ""
 "worker/team that should perform the operation. Examples of stock journals "
 "may be: quality control, pick lists, packing, etc."
 msgstr ""
+"Aksjen journal-systemet lar deg tilordne hver aksje operasjon til et bestemt "
+"tidsskrift i henhold til type operasjon å utføre eller arbeideren / laget "
+"som skal utføre operasjonen. Eksempler på lager tidsskrifter kan være: "
+"kvalitetskontroll, plukklister, pakking, osv."
 
 #. module: stock
 #: field:stock.location,complete_name:0 field:stock.location,name:0
@@ -639,6 +666,11 @@ msgid ""
 "queries regarding your account, please contact us.\n"
 "Thank you in advance.\n"
 msgstr ""
+"Våre rapporter viser at følgende betalinger fremdeles forfaller. Dersom "
+"beløpet\n"
+"allerede er betalt, se bort fra denne kunngjøringen. Men hvis du har noen\n"
+"spørsmål angående din konto, vennligst kontakt oss.\n"
+"Takk på forhånd.\n"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -653,11 +685,15 @@ msgid ""
 "according to the original purchase order. You can validate the shipment "
 "totally or partially."
 msgstr ""
+"Den inngående leveransen er listen over alle ordrer du vil motta fra dine "
+"leverandører. En innkommende forsendelse inneholder en liste over produkter "
+"som skal mottas i henhold til den opprinnelige bestillingen. Du kan bekrefte "
+"forsendelsen helt eller delvis."
 
 #. module: stock
 #: field:stock.move.split.lines,wizard_exist_id:0
 msgid "Parent Wizard (for existing lines)"
-msgstr ""
+msgstr "Overordnet veiviser (for eksisterende linjer)"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -671,6 +707,8 @@ msgid ""
 "There is no inventory Valuation account defined on the product category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Det er ingen beholdningsvurderingskonto definert på produktkategori: \"% s\" "
+"(id:% d)"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -752,6 +790,8 @@ msgid ""
 "When doing real-time inventory valuation, this is the Accounting Journal in "
 "which entries will be automatically posted when stock moves are processed."
 msgstr ""
+"Når du gjør real-time beholdningsvurdering, er dette regnskap Journal som "
+"oppføringene vil bli automatisk lagt når aksjekursene trekk er behandlet."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
@@ -781,17 +821,19 @@ msgid ""
 "Check this option to select existing lots in the list below, otherwise you "
 "should enter new ones line by line."
 msgstr ""
+"Kontroller dette alternativet for å velge eksisterende produkter i listen "
+"nedenfor, ellers må du skrive inn nye produkter linje for linje."
 
 #. module: stock
 #: code:addons/stock/product.py:75
 #, python-format
 msgid "Valuation Account is not specified for Product Category: %s"
-msgstr ""
+msgstr "Vurderingskonto er ikke spesifisert for produktkategori: %s"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Destination Move"
-msgstr ""
+msgstr "Flytting over distanse"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -843,7 +885,7 @@ msgstr "Utkast fysisk telling"
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Transit Location for Inter-Companies Transfers"
-msgstr ""
+msgstr "Transportlokasjon for konserninterne overføringer"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -865,7 +907,7 @@ msgstr "ukjent"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
 msgid "Merge Inventory"
-msgstr ""
+msgstr "Flett varelager"
 
 #. module: stock
 #: code:addons/stock/product.py:433
@@ -915,12 +957,12 @@ msgstr "Planlagt dato"
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr ""
+msgstr "Pakkesøk"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Pickings already processed"
-msgstr ""
+msgstr "Bytter allerede behandlet"
 
 #. module: stock
 #: field:stock.partial.move.line,currency:0
@@ -937,7 +979,7 @@ msgstr "Journal"
 #: code:addons/stock/stock.py:1345
 #, python-format
 msgid "is scheduled %s."
-msgstr ""
+msgstr "er planlagt% s."
 
 #. module: stock
 #: help:stock.picking,location_id:0
@@ -946,6 +988,10 @@ 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 ""
+"Lå stå tomt hvis du produserer på samme lokasjon som det ferdige produktet "
+"treng. Set en lokasjon hvis du produserer på en fast lokasjon. Dette kan "
+"være en partner dersom du benytter underleverandører til produksjons "
+"prosesser."
 
 #. module: stock
 #: view:res.partner:0
@@ -955,12 +1001,12 @@ msgstr "Lagerbeholdning egenskaper"
 #. module: stock
 #: field:report.stock.move,day_diff:0
 msgid "Execution Lead Time (Days)"
-msgstr ""
+msgstr "Gjennomføring ledetid(dager)"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move
 msgid "Partial Move Processing Wizard"
-msgstr ""
+msgstr "Delvis Flytte lastet veiviseren"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
@@ -973,6 +1019,7 @@ msgid ""
 "Optional address where goods are to be delivered, specifically used for "
 "allotment"
 msgstr ""
+"Valgfri adresse der varene skal leveres, spesielt brukt for tildeling"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
@@ -984,13 +1031,14 @@ msgstr "Måned-1"
 msgid ""
 "By unchecking the active field, you may hide a location without deleting it."
 msgstr ""
+"Ved å fjerne det aktive feltet, kan du skjule et varehus uten å slette det."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:44
 #, python-format
 msgid ""
 "Please select multiple physical inventories to merge in the list view."
-msgstr ""
+msgstr "Velg flere fysiske lager å slå sammen i listevisningen."
 
 #. module: stock
 #: view:stock.picking:0
@@ -1016,12 +1064,12 @@ msgstr "Forrige måned"
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "venstre forelder"
 
 #. module: stock
 #: field:product.category,property_stock_valuation_account_id:0
 msgid "Stock Valuation Account"
-msgstr ""
+msgstr "Lager verdivurdering konto"
 
 #. module: stock
 #: code:addons/stock/stock.py:1349
@@ -1040,6 +1088,7 @@ msgstr "Feil: Ugyldig ean kode"
 msgid ""
 "There is no stock output account defined for this product: \"%s\" (id: %d)"
 msgstr ""
+"Det er ingen vareutgangskonto definert til dette produktet: \"%s\" (id: %d)"
 
 #. module: stock
 #: field:product.template,property_stock_production:0
@@ -1083,6 +1132,29 @@ msgid ""
 "location consumes the raw material and produces finished products\n"
 "                      "
 msgstr ""
+"* Leverandør Sted: Virtuell beliggenhet representerer kildeplasseringen for "
+"produkter som kommer fra leverandører\n"
+"                       \n"
+"* Vis: Virtuell sted brukes til å lage en hierarkiske strukturer for "
+"varehuset, samles underordnede steder, kan ikke direkte inneholder "
+"produkter\n"
+"                       \n"
+"* Internt Sted: Fysiske steder inne dine egne varehus,\n"
+"                       \n"
+"* Kunden Sted: Virtuell beliggenhet representerer målplassering for "
+"produkter sendes til kunder.\n"
+"                       \n"
+"* Inventar: Virtual sted som tjener som motpart for inventar operasjoner "
+"brukes til å korrigere lagernivåer (Fysiske varelager)\n"
+"                       \n"
+"* Innkjøp: Virtuell sted som tjener som midlertidig motpart for innkjøp "
+"operasjoner når kilden (leverandør eller produksjon) er ikke kjent ennå. "
+"Denne plasseringen skal være tom når anskaffelsen planleggeren har kjørt "
+"ferdig.\n"
+"                       \n"
+"* Produksjon: Virtuell motstykke sted for produksjonsvirksomhet: dette "
+"stedet forbruker råstoff og produserer ferdige produkter\n"
+"                      "
 
 #. module: stock
 #: field:stock.production.lot.revision,author_id:0
@@ -1112,6 +1184,8 @@ msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
 "entries."
 msgstr ""
+"For å avbryte denne lagerbeholdingen, må du først unposte relaterte "
+"loggoppføringer."
 
 #. module: stock
 #: field:stock.picking,date_done:0
@@ -1125,11 +1199,13 @@ msgid ""
 "The uom rounding does not allow you to ship \"%s %s\", only roundings of "
 "\"%s %s\" is accepted by the uom."
 msgstr ""
+"Den enhetsavrundingen tillater deg ikke å sende \"%s %s\", bare avrundinger "
+"av \"%s %s\" blir godtatt av enheten."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
+msgstr "Lagerflyttinger som er ledige (klar for prosess)"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1168,6 +1244,8 @@ msgid ""
 "empty to automatically detect the type based on the source and destination "
 "locations)."
 msgstr ""
+"Frakt Type av plukkliste som skal inneholde lenket flytte (la stå tomt for å "
+"automatisk oppdage hvilken type basert på kilden og målet steder)."
 
 #. module: stock
 #: view:stock.move.split:0
@@ -1209,12 +1287,12 @@ msgstr "Europeiske kunder"
 #. module: stock
 #: help:stock.location,chained_delay:0
 msgid "Delay between original move and chained move in days"
-msgstr ""
+msgstr "Forsinkelse mellom original flytting og lenket flytting i dager"
 
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
-msgstr ""
+msgstr "Importer nåværende produktinventar fra følgende plassering"
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1225,11 +1303,16 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
+"Dette brukes kun hvis du velger en kjedet plassering type.\n"
+"'Automatisk flytte' verdi vil skape en aksje beveger seg etter gjeldende en "
+"som vil bli validert automatisk. Med 'Manuell drift \", har aksjen flytte "
+"for å bli godkjent av en arbeidstaker. Med \"Automatisk Ingen Step Lagt ', "
+"plasseringen erstattet i den opprinnelige trekk."
 
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Identification"
-msgstr ""
+msgstr "Pakkeidentifikasjon"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1239,7 +1322,7 @@ msgstr "Pakkseddel:"
 #. module: stock
 #: selection:stock.move,state:0
 msgid "Waiting Another Move"
-msgstr ""
+msgstr "Venter på en annen flytting"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1248,11 +1331,14 @@ msgid ""
 "default one, as the source location for stock moves generated by production "
 "orders"
 msgstr ""
+"For det gjeldene produktet, vil dette varehuset bli brukt, i stedet for "
+"standarden, som kildested for lagerbevegelser som genereres av "
+"produksjonsordrer"
 
 #. module: stock
 #: view:product.product:0
 msgid "Expected Stock Variations"
-msgstr ""
+msgstr "Ventede lagervariasjoner"
 
 #. module: stock
 #: help:stock.move,price_unit:0
@@ -1260,12 +1346,15 @@ msgid ""
 "Technical field used to record the product cost set by the user during a "
 "picking confirmation (when average price costing method is used)"
 msgstr ""
+"Det Teknisk feltet som brukes til å registrere produktet koster satt av "
+"brukeren under en plukke bekreftelse (når gjennomsnittlig pris koster "
+"metoden brukes)"
 
 #. module: stock
 #: code:addons/stock/stock.py:1350
 #, python-format
 msgid "is in draft state."
-msgstr ""
+msgstr "er i utkast."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_tracking_form
@@ -1273,11 +1362,13 @@ msgid ""
 "This is the list of all your packs. When you select a Pack, you can get the "
 "upstream or downstream traceability of the products contained in the pack."
 msgstr ""
+"Dette er listen over alle pakkene dine. Når du velger en pakke, kan du få "
+"oppstrøms- eller nedstrømssporbarhet av produktene som finnes i pakken."
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
 msgid "To be refunded/invoiced"
-msgstr ""
+msgstr "Skal få refundert/faktura"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
@@ -1323,13 +1414,13 @@ msgstr "Fra"
 #. module: stock
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "Innkommende leveranse er allerede behandlet"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:99
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
-msgstr ""
+msgstr "Du kan bare returnere bytter som er bekreftet, ledige eller ferdige!"
 
 #. module: stock
 #: view:stock.picking:0 field:stock.picking,invoice_state:0
@@ -1360,13 +1451,13 @@ msgstr "Splitt"
 #. module: stock
 #: view:stock.picking:0
 msgid "Search Stock Picking"
-msgstr ""
+msgstr "Søk lager Plukking"
 
 #. module: stock
 #: code:addons/stock/product.py:92
 #, python-format
 msgid "Company is not specified in Location"
-msgstr ""
+msgstr "Kompaniet er ikke spesifisert i lageret."
 
 #. module: stock
 #: view:report.stock.move:0
@@ -1376,17 +1467,17 @@ msgstr "Type"
 #. module: stock
 #: view:stock.picking:0
 msgid "Available Pickings"
-msgstr ""
+msgstr "Tilgjengelig Plukking"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
 msgid "Generic IT Suppliers"
-msgstr ""
+msgstr "Generiske IT leverandører"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be receive"
-msgstr ""
+msgstr "Varer som kommer"
 
 #. module: stock
 #: help:stock.location,valuation_out_account_id:0
@@ -1397,6 +1488,11 @@ msgid ""
 "the generic Stock Output Account set on the product. This has no effect for "
 "internal locations."
 msgstr ""
+"Brukes for ektetid beholdningsvurdering. Når sett på en virtuell plassering "
+"(ikke intern type), vil denne kontoen bli brukt til å holde verdien av "
+"produkter som blir flyttet ut av denne plasseringen og inn i en intern "
+"beliggenhet, i stedet for den generiske Stock Output kontoen satt på "
+"produktet. Dette har ingen effekt for interne steder."
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1440,13 +1536,13 @@ msgstr "Du kan bare slette forslag til bevegelser"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line_split_lines
 msgid "Inventory Split lines"
-msgstr ""
+msgstr "Inventar Split linjer"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
 #: report:lot.stock.overview:0
 msgid "Location Inventory Overview"
-msgstr ""
+msgstr "Plassering Varelager Oversikt"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1456,7 +1552,7 @@ msgstr "Generell informasjon"
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Analysis including future moves (similar to virtual stock)"
-msgstr ""
+msgstr "Analyse inkludert fremtidige trekk (ligner virtuell lager)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
@@ -1479,6 +1575,7 @@ msgstr "Hyller (Y)"
 msgid ""
 "By unchecking the active field, you may hide an INCOTERM without deleting it."
 msgstr ""
+"Ved å fjerne det aktive feltet, kan du skjule en INCOTERM uten å slette den."
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0 field:stock.picking,date:0
@@ -1489,7 +1586,7 @@ msgstr "Ordredato"
 #: code:addons/stock/wizard/stock_change_product_qty.py:88
 #, python-format
 msgid "INV: %s"
-msgstr ""
+msgstr "INV: %s"
 
 #. module: stock
 #: view:stock.location:0 field:stock.location,location_id:0
@@ -1507,6 +1604,13 @@ msgid ""
 "* Done: has been processed, can't be modified or cancelled anymore\n"
 "* Cancelled: has been cancelled, can't be confirmed anymore"
 msgstr ""
+"Utkast: ikke bekreftet ennå, og vil ikke bli planlagt før den er bekreftet\n"
+"* Bekreftet: venter fortsatt på tilgjengeligheten av produkter\n"
+"* Tilgjengelig: produkter reservert, bare venter på bekreftelse.\n"
+"* Venter: venter på en annen flytte for å gå videre før det blir automatisk "
+"tilgjengelig (f.eks lag-to-ordrestrømmer)\n"
+"* Ferdig: er behandlet, kan ikke endres eller avbestilles lenger\n"
+"* Avlyst: har blitt kansellert, kan ikke bekreftes lenger"
 
 #. module: stock
 #: help:stock.location,company_id:0
@@ -1522,7 +1626,7 @@ msgstr "Vennligst angi et positivt antall for skraping!"
 #. module: stock
 #: field:stock.location,chained_delay:0
 msgid "Chaining Lead Time"
-msgstr ""
+msgstr "Kjeding Leveringstid"
 
 #. module: stock
 #: help:product.product,track_outgoing:0
@@ -1530,11 +1634,13 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "going to a Customer Location"
 msgstr ""
+"Styrker for å angi en produksjon Lot ved all forflytning inneholder dette "
+"produktet og gå til en kunde Plassering."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
-msgstr ""
+msgstr "lager faktura på Shipping"
 
 #. module: stock
 #: help:stock.move,state:0
@@ -1546,6 +1652,12 @@ msgid ""
 " When the picking is done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
+"Når aksjen beveger seg er opprettet er det i \"Kladd\" tilstand.\n"
+"Etter det, er det satt til \"Ikke tilgjengelig\" stat hvis planleggeren ikke "
+"finne produkter.\n"
+"Når produktene er reservert det er satt til 'tilgjengelig'.\n"
+"Når plukking er gjort staten Ferdig.\n"
+"Staten er \"Venter\" hvis farten venter på en annen."
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1558,13 +1670,13 @@ msgstr "Leverandørlokasjon"
 #: code:addons/stock/stock.py:2358
 #, python-format
 msgid "were scrapped"
-msgstr ""
+msgstr "Ble vraket"
 
 #. module: stock
 #: help:stock.partial.move.line,currency:0
 #: help:stock.partial.picking.line,currency:0
 msgid "Currency in which Unit cost is expressed"
-msgstr ""
+msgstr "Valutaen som enhetskostnaden uttrykkes"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -1578,6 +1690,8 @@ msgid ""
 "If this picking was split this field links to the picking that contains the "
 "other part that has been processed already."
 msgstr ""
+"Hvis dette plukke ble delt, dette feltet linker til plukking som inneholder "
+"den andre delen som har blitt behandlet allerede."
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
@@ -1587,22 +1701,22 @@ msgstr "Lager statistikker"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month Planned"
-msgstr ""
+msgstr "Månedplanlagt"
 
 #. module: stock
 #: field:product.product,track_production:0
 msgid "Track Manufacturing Lots"
-msgstr ""
+msgstr "Spor Produksjon Massen"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "Er en restordre"
 
 #. module: stock
 #: field:stock.location,valuation_out_account_id:0
 msgid "Stock Valuation Account (Outgoing)"
-msgstr ""
+msgstr "Lagervurderingskonto (utgående)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -1623,7 +1737,7 @@ msgstr "Vareforsendelse"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_category_config_stock
 msgid "Product Categories"
-msgstr ""
+msgstr "Produktkategorier"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1633,7 +1747,7 @@ msgstr "Kanseller tilgjengelighet"
 #. module: stock
 #: help:stock.move,date_expected:0
 msgid "Scheduled date for the processing of this move"
-msgstr ""
+msgstr "Planlagt dato for behandling av dette trekket"
 
 #. module: stock
 #: field:stock.inventory,move_ids:0
@@ -1643,32 +1757,32 @@ msgstr "Dann bevegelser"
 #. module: stock
 #: field:stock.location,valuation_in_account_id:0
 msgid "Stock Valuation Account (Incoming)"
-msgstr ""
+msgstr "Lagervurderingskonto (innkommende)"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
-msgstr ""
+msgstr "Hylle 2"
 
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
 msgid "Tracking lot"
-msgstr ""
+msgstr "Sporingsrekke"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Tilbake ordnene"
 
 #. module: stock
 #: view:product.product:0 view:product.template:0
 msgid "Counter-Part Locations Properties"
-msgstr ""
+msgstr "Motpart Steder Egenskaper"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Localization"
-msgstr ""
+msgstr "Lokalisering"
 
 #. module: stock
 #: code:addons/stock/product.py:429
@@ -1680,12 +1794,12 @@ msgstr "Levert kvantum"
 #: model:ir.actions.act_window,name:stock.track_line
 #: view:stock.inventory.line.split:0 view:stock.move.split:0
 msgid "Split in lots"
-msgstr ""
+msgstr "Delt i varer"
 
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Numbers"
-msgstr ""
+msgstr "Produksjonsvarenummer"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -1695,11 +1809,15 @@ msgid ""
 "specific valuation account set on the destination location. When not set on "
 "the product, the one from the product category is used."
 msgstr ""
+"Når du gjør ektetid beholdningsvurdering vil motpart journal elementer for "
+"alle utgående aksjen beveger seg bli postet i denne kontoen, med mindre det "
+"er en konkret vurdering konto sett på målplassering. Når den ikke er satt på "
+"produktet, er en fra produktkategori brukes."
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Day Planned"
-msgstr ""
+msgstr "Dag planlagt"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,date:0
@@ -1713,7 +1831,7 @@ msgstr "Dato"
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utvidet Filtere ..."
 
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
@@ -1729,7 +1847,7 @@ msgstr "Samkjørimg er bare tillatt for fakturautkast."
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_dashboard_stock
 msgid "Dashboard"
-msgstr ""
+msgstr "Kontrollpanel"
 
 #. module: stock
 #: field:stock.incoterms,code:0
@@ -1739,13 +1857,13 @@ msgstr "Kode"
 #. module: stock
 #: view:stock.inventory.line.split:0
 msgid "Lots Number"
-msgstr ""
+msgstr "masse Antall"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.open_board_warehouse
 #: model:ir.ui.menu,name:stock.menu_board_warehouse
 msgid "Warehouse Dashboard"
-msgstr ""
+msgstr "Varehusets kontrollpanel"
 
 #. module: stock
 #: code:addons/stock/stock.py:513
@@ -1757,7 +1875,7 @@ msgstr "Du kan ikke fjerne en lot-linje!"
 #: model:ir.model,name:stock.model_stock_move_scrap view:stock.move:0
 #: view:stock.move.scrap:0 view:stock.picking:0
 msgid "Scrap Products"
-msgstr ""
+msgstr "Svinn Produkter"
 
 #. module: stock
 #: code:addons/stock/stock.py:1157
@@ -1775,7 +1893,7 @@ msgstr "Avbryt"
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking
 #: model:ir.model,name:stock.model_stock_return_picking
 msgid "Return Picking"
-msgstr ""
+msgstr "Returner Plukke"
 
 #. module: stock
 #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
@@ -1807,7 +1925,7 @@ msgstr "Informasjon"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Shipping Address :"
-msgstr ""
+msgstr "Leveringsadresse:"
 
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
@@ -1818,6 +1936,11 @@ msgid ""
 "generic Stock Output Account set on the product. This has no effect for "
 "internal locations."
 msgstr ""
+"Brukes for ektetid beholdningsvurdering. Når sett på en virtuell plassering "
+"(ikke intern type), vil denne kontoen bli brukt til å holde verdien av "
+"produkter som blir flyttet fra en intern sted inn denne plasseringen, stedet "
+"for den generiske lager Utgang kontoen satt på produktet. Dette har ingen "
+"effekt for interne steder."
 
 #. module: stock
 #: view:stock.return.picking:0
@@ -1837,7 +1960,7 @@ msgstr "Lagerbeholdingverdi"
 #. module: stock
 #: view:stock.move:0
 msgid "Orders planned for today"
-msgstr ""
+msgstr "Ordre planlagt for i dag"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -1865,6 +1988,9 @@ msgid ""
 "moves. Use this report when you want to analyse the different routes taken "
 "by your products and inventory management performance."
 msgstr ""
+"Flytter Analyse kan du enkelt sjekke og analysere bedriftens lager trekk. "
+"Bruk denne rapporten når du vil analysere de ulike rutene tatt av dine "
+"produkter og lagerstyring ytels"
 
 #. module: stock
 #: code:addons/stock/stock.py:2116
@@ -1873,11 +1999,13 @@ msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
 "Valuation account on category of this product are same."
 msgstr ""
+"Kan ikke opprette Bilagsregistrering, Utgang konto definert på dette "
+"produktet og Verdsettelse konto på kategori av dette produktet er samme."
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
 msgid "Planned Lead Time (Days)"
-msgstr ""
+msgstr "Planlagt Ledelse (dager)"
 
 #. module: stock
 #: field:stock.change.standard.price,new_price:0
@@ -1887,7 +2015,7 @@ msgstr "Pris"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
 msgid "stock.return.picking.memory"
-msgstr ""
+msgstr "lager.retur.plukking.minne"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1897,7 +2025,7 @@ msgstr "Søk lagerbeholdning"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
 msgid "Stock report by tracking lots"
-msgstr ""
+msgstr "Lager rapport ved å spore mye"
 
 #. module: stock
 #: code:addons/stock/stock.py:2122
@@ -1906,6 +2034,8 @@ msgid ""
 "There is no stock input account defined for this product or its category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Det er ingen lagerinngangskonto definert for dette produktet eller denne "
+"kategorien: \"%s\" (id: %d)"
 
 #. module: stock
 #: code:addons/stock/product.py:419
@@ -1924,13 +2054,15 @@ msgid ""
 "Optional prefix to prepend when displaying this serial number: PREFIX/SERIAL "
 "[INT_REF]"
 msgstr ""
+"Valgfri prefiks til foranstille når som viser dette serienummeret: PREFIX / "
+"SERIAL [INT_REF]"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_fill_inventory
 #: model:ir.model,name:stock.model_stock_fill_inventory
 #: view:stock.fill.inventory:0
 msgid "Import Inventory"
-msgstr ""
+msgstr "Import Varelager"
 
 #. module: stock
 #: field:stock.incoterms,name:0 field:stock.move,name:0
@@ -1950,6 +2082,8 @@ msgid ""
 "This field is for internal purpose. It is used to decide if the column "
 "prodlot has to be shown on the move_ids field or not"
 msgstr ""
+"Dette feltet er for intern formål. Den brukes til å avgjøre om kolonnen "
+"prodlot må vises på move_ids feltet eller ikke"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -1958,31 +2092,34 @@ msgid ""
 "default one, as the source location for stock moves generated when you do an "
 "inventory"
 msgstr ""
+"For det gjeldene produktet, vil dette varelageret blir brukt, i stedet for "
+"standaren, som kilde sted for lager bevegelser som genereres når du gjør en "
+"opptelling"
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Stockable"
-msgstr ""
+msgstr "Lagringsbare"
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Real Time (automated)"
-msgstr ""
+msgstr "Realtid (automatisert)"
 
 #. module: stock
 #: help:stock.move,tracking_id:0
 msgid "Logistical shipping unit: pallet, box, pack ..."
-msgstr ""
+msgstr "Logistisk skipsfartenhet: pall, boks, pakke ..."
 
 #. module: stock
 #: view:stock.location:0
 msgid "Customer Locations"
-msgstr ""
+msgstr "Kundelokasjon"
 
 #. module: stock
 #: view:stock.change.product.qty:0 view:stock.change.standard.price:0
 msgid "_Apply"
-msgstr ""
+msgstr "_Bruk"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
@@ -1998,7 +2135,7 @@ msgstr "Lagerlokasjon"
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Total value"
-msgstr ""
+msgstr "Totalsum"
 
 #. module: stock
 #: help:stock.location,chained_journal_id:0
@@ -2006,35 +2143,37 @@ msgid ""
 "Inventory Journal in which the chained move will be written, if the Chaining "
 "Type is not Transparent (no journal is used if left empty)"
 msgstr ""
+"Inventar Journal der lenket trekk vil bli skrevet, hvis Sammenkjeding Type "
+"er ikke Transparent (ingen journal brukes hvis venstre tom)"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Creation"
-msgstr ""
+msgstr "Opprettet"
 
 #. module: stock
 #: view:report.stock.inventory:0
 msgid ""
 "Analysis of current inventory (only moves that have already been processed)"
-msgstr ""
+msgstr "Analyse av dagens beholdning (kun trekk som allerede er behandlet)"
 
 #. module: stock
 #: field:stock.partial.move.line,cost:0
 #: field:stock.partial.picking.line,cost:0
 msgid "Cost"
-msgstr ""
+msgstr "Kostnad"
 
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
 #: field:product.template,property_stock_account_input:0
 #: field:stock.change.standard.price,stock_account_input:0
 msgid "Stock Input Account"
-msgstr ""
+msgstr "Lager Input-konto"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Shipping type specify, goods coming in or going out"
-msgstr ""
+msgstr "Spesifiser frakttypen, varer kommer inn eller går ut"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
@@ -2050,12 +2189,12 @@ msgstr "Delvis levering"
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr ""
+msgstr "Automatisk Ingen Trinn Lagt til."
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "Stock Location Analysis"
-msgstr ""
+msgstr "Lager Sted Analyse"
 
 #. module: stock
 #: help:stock.move,date:0
@@ -2063,18 +2202,20 @@ msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
 msgstr ""
+"Flytt dato: planlagte datoen til flyttingen er gjort, så datoen for selve "
+"flyttingen behandling."
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupper etter ..."
 
 #. module: stock
 #: view:stock.location:0
 msgid "Chained Locations"
-msgstr ""
+msgstr "Knyttede lokasjoner"
 
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
@@ -2090,13 +2231,13 @@ msgstr "Dokument"
 #. module: stock
 #: view:stock.picking:0
 msgid "Input Picking List"
-msgstr ""
+msgstr "Inngang plukkliste"
 
 #. module: stock
 #: field:stock.move,product_uom:0 field:stock.partial.move.line,product_uom:0
 #: field:stock.partial.picking.line,product_uom:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Enhet"
 
 #. module: stock
 #: code:addons/stock/product.py:175
@@ -2110,6 +2251,8 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "generated by a Manufacturing Order"
 msgstr ""
+"Styrker for å angi en produksjon Vare ved all forflytning inneholder dette "
+"produktet og generert av en Fremstilling bestilling"
 
 #. module: stock
 #: view:product.product:0
@@ -2142,7 +2285,7 @@ msgstr "Kan ikke finne differanse mellom standardpris og ny pris!"
 #: model:stock.location,name:stock.stock_location_scrapped
 #: field:stock.move,scrapped:0
 msgid "Scrapped"
-msgstr ""
+msgstr "Skrotet"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2152,18 +2295,18 @@ msgstr "Produkter "
 #. module: stock
 #: field:product.product,track_incoming:0
 msgid "Track Incoming Lots"
-msgstr ""
+msgstr "Spor innkommende varer"
 
 #. module: stock
 #: view:board.board:0
 msgid "Warehouse board"
-msgstr ""
+msgstr "varehus styret"
 
 #. module: stock
 #: code:addons/stock/product.py:439
 #, python-format
 msgid "Future Qty"
-msgstr ""
+msgstr "fremtidig Antall"
 
 #. module: stock
 #: field:stock.move,note:0 view:stock.picking:0 field:stock.picking,note:0
@@ -2184,7 +2327,7 @@ msgstr "Forsendelestype"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that are Confirmed, Available or Waiting"
-msgstr ""
+msgstr "Vareflyttinger som er godkjente, ledige eller ventende"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_location_open
@@ -2214,18 +2357,18 @@ msgstr "Leveringsmåte"
 #: help:report.stock.move,location_dest_id:0
 #: help:stock.move,location_dest_id:0 help:stock.picking,location_dest_id:0
 msgid "Location where the system will stock the finished products."
-msgstr ""
+msgstr "Lokasjon hvor systemet vil plassere de ferdige produktene."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be delivered (Available or not)"
-msgstr ""
+msgstr "Varer som skal leveres (ledige eller ikke)"
 
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_stock_outgoing_product_delay
 msgid "Outgoing Products"
-msgstr ""
+msgstr "Utgående produkter"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2236,6 +2379,11 @@ msgid ""
 "the supplier or the purchase order reference. Then you can confirm all "
 "products received using the buttons on the right of each line."
 msgstr ""
+"Her kan du motta individuelle produkter, uansett hva slags kjøpsordre eller "
+"plukkeordre de kommer fra. Du finner listen over alle produktene du venter "
+"på. Med en gang du får en ordre, kan du filtrere den basert på navnet til "
+"leverandøren eller kjøpsordrens referanse. Deretter kan du godkjenne alle "
+"produktene du har fått ved bruk av knappene til høyre for hver linje."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -2245,29 +2393,29 @@ msgstr "Lagerbevegelse"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Delay(Days)"
-msgstr ""
+msgstr "Forsinkelse (dager)"
 
 #. module: stock
 #: code:addons/stock/stock.py:1697
 #, python-format
 msgid "Operation forbidden"
-msgstr ""
+msgstr "Drift forbudt"
 
 #. module: stock
 #: help:stock.picking,min_date:0
 msgid "Expected date for the picking to be processed"
-msgstr ""
+msgstr "Forventet dato for plukkingen som skal behandles"
 
 #. module: stock
 #: code:addons/stock/product.py:435
 #, python-format
 msgid "P&L Qty"
-msgstr ""
+msgstr "P & L Antall"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Pickings to invoice"
-msgstr ""
+msgstr "Intern plukking til faktura."
 
 #. module: stock
 #: view:stock.production.lot:0 field:stock.production.lot,revisions:0
@@ -2277,7 +2425,7 @@ msgstr "Revisjoner"
 #. module: stock
 #: view:stock.picking:0
 msgid "This operation will cancel the shipment. Do you want to continue?"
-msgstr ""
+msgstr "Denne driften vil avbryte transporten. Vil du fortsette?"
 
 #. module: stock
 #: help:product.product,valuation:0
@@ -2288,6 +2436,11 @@ msgid ""
 "current inventory value, and the stock input and stock output account will "
 "hold the counterpart moves for incoming and outgoing products."
 msgstr ""
+"Hvis sanntidsbeskyttelse verdivurdering er aktivert for et produkt, vil "
+"systemet automatisk skrive posteringer tilsvarende lager move. Inventar "
+"variasjon kontoen satt på produktkategori vil representere den aktuelle "
+"beholdningen, og aksjen inngang og lager utgang konto vil holde motpart "
+"trekk for innkommende og utgående produkter."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2296,6 +2449,9 @@ msgid ""
 "levels. Sort and group by selection criteria in order to better analyse and "
 "manage your company  activities."
 msgstr ""
+"Inventar Analyse kan du enkelt sjekke og analysere bedriftens "
+"lagerbeholdning. Sortere og gruppere etter utvelgelseskriterier for å bedre "
+"analysere og administrere selskapets aktiviteter."
 
 #. module: stock
 #: help:report.stock.move,location_id:0 help:stock.move,location_id:0
@@ -2303,6 +2459,8 @@ msgid ""
 "Sets a location if you produce at a fixed location. This can be a partner "
 "location if you subcontract the manufacturing operations."
 msgstr ""
+"Angir et varehus hvis du produserer på et fast sted. Dette kan være et "
+"samarbeidssted hvis du setter bort produksjonsoperasjonene."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_location_form
@@ -2317,6 +2475,14 @@ msgid ""
 "location to the Stock location. Each report can be performed on physical, "
 "partner or virtual locations."
 msgstr ""
+"Definer dine steder å reflektere lageret struktur og organisering. OpenERP "
+"er i stand til å håndtere fysiske steder (varehus, hyller, bin, etc), "
+"partner steder (kunder, leverandører) og virtuelle steder som er motstykket "
+"til aksjen operasjoner som produksjonskostnadene bestillinger forbruk, "
+"varelager etc. Hver aksje drift i OpenERP flytter produkter fra ett sted til "
+"et annet. For eksempel, hvis du mottar produkter fra en leverandør, vil "
+"OpenERP flytte produkter fra Leverandør beliggenhet til Lager plassering. "
+"Hver rapport kan utføres på fysisk, partner eller virtuelle steder."
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -2326,7 +2492,7 @@ msgstr "Opprett"
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Dates"
-msgstr ""
+msgstr "Datoer"
 
 #. module: stock
 #: field:stock.move,priority:0
@@ -2336,7 +2502,7 @@ msgstr "Prioritet"
 #. module: stock
 #: view:stock.move:0
 msgid "Source"
-msgstr ""
+msgstr "Kilde"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory
@@ -2355,7 +2521,7 @@ msgstr "Plukkliste"
 #: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
-msgstr ""
+msgstr "Kombinasjonen av serienummer og intern referanse må være unikt!"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2373,7 +2539,7 @@ msgstr "Feil !"
 #: model:ir.ui.menu,name:stock.menu_stock_unit_measure_stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_form_action
 msgid "Units of Measure"
-msgstr ""
+msgstr "Enheter"
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -2384,7 +2550,7 @@ msgstr "Fast lokasjon"
 #: code:addons/stock/stock.py:2486
 #, python-format
 msgid "Product  '%s' is consumed with '%s' quantity."
-msgstr ""
+msgstr "Produkt '%s' er fortært med '%s' mengde."
 
 #. module: stock
 #: model:product.template,description:stock.product_icecream_product_template
@@ -2395,6 +2561,11 @@ msgid ""
 "ice cream shops, convenience stores, and milk bars, and in individual "
 "servings from small carts or vans at public events."
 msgstr ""
+"Iskrem kan bli masseprodusert og dermed er allment tilgjengelig i utviklede "
+"deler av verden. Iskrem kan kjøpes i store kartonger (vats og squrounds) fra "
+"supermarkeder og dagligvarebutikker, i mindre mengder fra iskrem butikker, "
+"kiosker og melk barer, og i enkelte porsjoner fra små vogner eller varebiler "
+"på offentlige arrangementer."
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -2405,7 +2576,7 @@ msgstr "Juli"
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Consumable"
-msgstr ""
+msgstr "Forbruksmateriell"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_line_date
@@ -2415,11 +2586,15 @@ msgid ""
 "need this report in order to ensure that the stock of each product is "
 "controlled at least once a year."
 msgstr ""
+"Vise de siste varelager gjort på dine produkter og enkelt sortere dem med "
+"spesifikke filtreringskriterier. Hvis du gjør hyppige og delvis varelager, "
+"trenger du denne rapporten for å sikre at bestanden av hvert produkt er "
+"kontrollert minst en gang i året."
 
 #. module: stock
 #: model:stock.location,name:stock.location_opening
 msgid "opening"
-msgstr ""
+msgstr "åpning"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -2442,24 +2617,24 @@ msgstr "Innkjøp"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
-msgstr ""
+msgstr "Maxtor leverandører"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_change_product_qty.py:78
 #: code:addons/stock/wizard/stock_change_standard_price.py:107
 #, python-format
 msgid "Active ID is not set in Context"
-msgstr ""
+msgstr "Aktiv ID er ikke satt i sammenheng."
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Force Availability"
-msgstr ""
+msgstr "Kraft Tilgjengelighet"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_scrap view:stock.move.scrap:0
 msgid "Scrap Move"
-msgstr ""
+msgstr "skrap Flytt"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
@@ -2471,7 +2646,7 @@ msgstr "Motta produkter"
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_out
 msgid "Deliver Products"
-msgstr ""
+msgstr "Lever produkter"
 
 #. module: stock
 #: view:stock.location.product:0
@@ -2492,23 +2667,24 @@ msgstr "Dato for ferdigstillelse"
 #. module: stock
 #: help:stock.production.lot,name:0
 msgid "Unique production lot, will be displayed as: PREFIX/SERIAL [INT_REF]"
-msgstr ""
+msgstr "Unike produksjon mye, vil bli vist som: PREFIX / SERIAL [INT_REF]"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "Your Company"
-msgstr ""
+msgstr "Ditt selskap"
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Kan ikke flytte produkter til eller fra en lokasjon av typen view."
 
 #. module: stock
 #: help:stock.tracking,active:0
 msgid ""
 "By unchecking the active field, you may hide a pack without deleting it."
 msgstr ""
+"Ved å fjerne det aktive feltet, kan du skjule en pakke uten å slette den."
 
 #. module: stock
 #: view:stock.inventory.merge:0
@@ -2539,7 +2715,7 @@ msgstr "Firma"
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Unit Of Measure"
-msgstr ""
+msgstr "Enhet"
 
 #. module: stock
 #: code:addons/stock/product.py:121
@@ -2547,12 +2723,13 @@ msgstr ""
 msgid ""
 "There is no stock input account defined for this product: \"%s\" (id: %d)"
 msgstr ""
+"Det er ingen lagerinngangskonto definert med dette produktet :\"%s\" (id: %d)"
 
 #. module: stock
 #: code:addons/stock/stock.py:2445
 #, python-format
 msgid "Can not consume a move with negative or zero quantity !"
-msgstr ""
+msgstr "Kan ikke forbruke et trekk med negativ eller null kvantitet!"
 
 #. module: stock
 #: field:stock.location,stock_real:0
@@ -2562,18 +2739,19 @@ msgstr "Virkelig lager"
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Fill Inventory"
-msgstr ""
+msgstr "Fyll Varelager"
 
 #. module: stock
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Feil: Standard målenheter og kjøp målenheter må være i samme kategori."
 
 #. module: stock
 #: model:stock.location,name:stock.location_delivery_counter
 msgid "Delivery Counter"
-msgstr ""
+msgstr "Leveringsskranke"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,prodlot_id:0
@@ -2584,13 +2762,13 @@ msgstr "Lot"
 #. module: stock
 #: view:stock.move.split:0
 msgid "Production Lot Number"
-msgstr ""
+msgstr "Produksjonsvarenummer"
 
 #. module: stock
 #: code:addons/stock/stock.py:2697
 #, python-format
 msgid "Inventory '%s' is done."
-msgstr ""
+msgstr "Varelager '%s' er ferdig."
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -2603,6 +2781,7 @@ msgstr "Kvantum (salgsenhet)"
 msgid ""
 "You are moving %.2f %s products but only %.2f %s available in this lot."
 msgstr ""
+"Du flytter %.2f %s prudukter, men bare %.2f %s er ledige i dette produktet."
 
 #. module: stock
 #: view:stock.move:0
@@ -2612,12 +2791,12 @@ msgstr "Gjør tilgjengelig"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Contact Address :"
-msgstr ""
+msgstr "Kontaktadresse:"
 
 #. module: stock
 #: field:stock.move,backorder_id:0
 msgid "Back Order"
-msgstr ""
+msgstr "Tilbakeordre"
 
 #. module: stock
 #: field:stock.incoterms,active:0 field:stock.location,active:0
@@ -2641,7 +2820,7 @@ msgstr "Feil, ingen klient !"
 #: field:stock.inventory.line.split.lines,wizard_id:0
 #: field:stock.move.split.lines,wizard_id:0
 msgid "Parent Wizard"
-msgstr ""
+msgstr "Overordnet veiviser"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
@@ -2654,7 +2833,7 @@ msgstr "Incoterms"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking_line
 msgid "stock.partial.picking.line"
-msgstr ""
+msgstr "lager delvis plukke linje"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
@@ -2676,22 +2855,24 @@ msgid ""
 "If checked, products contained in child locations of selected location will "
 "be included as well."
 msgstr ""
+"Hvis det er merket, vil produkter som finnes i barnets steder av valgte "
+"plasseringen være inkludert."
 
 #. module: stock
 #: field:stock.inventory,name:0
 msgid "Inventory Reference"
-msgstr ""
+msgstr "Inventar Referanse."
 
 #. module: stock
 #: code:addons/stock/stock.py:1334
 #, python-format
 msgid "Internal picking"
-msgstr ""
+msgstr "Intern plukking"
 
 #. module: stock
 #: view:stock.location.product:0
 msgid "Open Product"
-msgstr ""
+msgstr "Åpne produkt"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -2701,7 +2882,7 @@ msgstr "Til"
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Process"
-msgstr ""
+msgstr "Prosess"
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
@@ -2723,12 +2904,12 @@ msgstr "Bekreft beholdning"
 #. module: stock
 #: view:product.category:0
 msgid "Accounting Stock Properties"
-msgstr ""
+msgstr "Regnskapsmessige Lager Egenskaper"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_out
 msgid "Customers Packings"
-msgstr ""
+msgstr "Kunder Pakninger"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0 view:report.stock.move:0
@@ -2782,19 +2963,19 @@ msgstr "Lager"
 #. module: stock
 #: field:stock.journal,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ansvarlig"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_inventory_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_inventory_report
 #: view:report.stock.inventory:0
 msgid "Inventory Analysis"
-msgstr ""
+msgstr "Inventar Analyse"
 
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
 msgid "Destination Journal"
-msgstr ""
+msgstr "Destinasjon Journal"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
@@ -2830,19 +3011,19 @@ msgstr "Retur"
 #. module: stock
 #: field:stock.return.picking,invoice_state:0
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturering"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Internal Moves"
-msgstr ""
+msgstr "Tildelte Intern trekk"
 
 #. module: stock
 #: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
 #: code:addons/stock/wizard/stock_partial_picking.py:141
 #, python-format
 msgid "Please provide Proper Quantity !"
-msgstr ""
+msgstr "Vennligst gi riktig mengde!"
 
 #. module: stock
 #: field:stock.move,product_uos:0
@@ -2858,18 +3039,18 @@ msgstr "Høyde (Z)"
 #: model:ir.model,name:stock.model_stock_move_consume
 #: view:stock.move.consume:0
 msgid "Consume Products"
-msgstr ""
+msgstr "Forbruk Produkter"
 
 #. module: stock
 #: code:addons/stock/stock.py:1742
 #, python-format
 msgid "Insufficient Stock in Lot !"
-msgstr ""
+msgstr "Utilstrekkelig lager i Vare!"
 
 #. module: stock
 #: field:stock.location,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "høyere Overordnet"
 
 #. module: stock
 #: field:stock.picking,address_id:0
@@ -2894,7 +3075,7 @@ msgstr "Leverandører"
 #. module: stock
 #: field:report.stock.inventory,value:0 field:report.stock.move,value:0
 msgid "Total Value"
-msgstr ""
+msgstr "Total kostnad"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_product_by_category_stock_form
@@ -2904,24 +3085,24 @@ msgstr "Produkter per produktgruppe"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Waiting Another Operation"
-msgstr ""
+msgstr "Venter på en ny operasjon"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Supplier Locations"
-msgstr ""
+msgstr "Leverandørlokasjoner"
 
 #. module: stock
 #: field:stock.partial.move.line,wizard_id:0
 #: field:stock.partial.picking.line,wizard_id:0
 #: field:stock.return.picking.memory,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Veiviser"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Completed Stock-Moves"
-msgstr ""
+msgstr "Fullførte lagerflyttinger"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -2932,12 +3113,12 @@ msgstr "Produkter per lokasjon"
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
 msgid "Include children"
-msgstr ""
+msgstr "Inkluder underordede"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_components
 msgid "Shelf 1"
-msgstr ""
+msgstr "Hylle 1"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree6
@@ -2949,11 +3130,17 @@ msgid ""
 "preconfigured logistics rules, but you can also record manual stock "
 "operations."
 msgstr ""
+"Intern trekk viser alle Inventare operasjoner du må utføre i varehuset. Alle "
+"operasjoner kan kategoriseres i lager tidsskrifter, slik at hver enkelt "
+"arbeidstaker har sin egen liste over operasjoner for å utføre i sitt eget "
+"tidsskrift. De fleste operasjoner er forberedt automatisk av OpenERP henhold "
+"til forhåndskonfigurerte logistikk regler, men du kan også spille manuelle "
+"lager operasjoner."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Order"
-msgstr ""
+msgstr "Ordre"
 
 #. module: stock
 #: view:product.product:0
@@ -2963,7 +3150,7 @@ msgstr "Kostpris :"
 #. module: stock
 #: field:stock.tracking,name:0
 msgid "Pack Reference"
-msgstr ""
+msgstr "Pakkereferanse"
 
 #. module: stock
 #: view:report.stock.move:0 field:report.stock.move,location_id:0
@@ -2975,37 +3162,37 @@ msgstr "Kildelokasjon"
 #. module: stock
 #: view:stock.move:0
 msgid " Waiting"
-msgstr ""
+msgstr " Venter"
 
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
-msgstr ""
+msgstr "Regnskapspostene"
 
 #. module: stock
 #: model:res.groups,name:stock.group_stock_manager
 msgid "Manager"
-msgstr ""
+msgstr "Manager"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Total"
-msgstr ""
+msgstr "Totalt"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
 msgid "Internal Shippings"
-msgstr ""
+msgstr "Intern frakt"
 
 #. module: stock
 #: field:stock.change.standard.price,enable_stock_in_out_acc:0
 msgid "Enable Related Account"
-msgstr ""
+msgstr "Aktiver relatert konto"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
 msgid "Virtual Stock Value"
-msgstr ""
+msgstr "Virtuell Lager Verdi"
 
 #. module: stock
 #: view:product.product:0 view:stock.inventory.line.split:0
@@ -3021,7 +3208,7 @@ msgstr ""
 #. module: stock
 #: view:stock.move:0
 msgid "Destination"
-msgstr ""
+msgstr "Destinasjon"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -3035,17 +3222,19 @@ msgid ""
 "Quantities, UoMs, Products and Locations cannot be modified on stock moves "
 "that have already been processed (except by the Administrator)"
 msgstr ""
+"Mengder, enheter, produkter og steder kan ikke endres på lager trekk som "
+"allerede er behandlet (med unntak av Administrator)"
 
 #. module: stock
 #: code:addons/stock/product.py:445
 #, python-format
 msgid "Future Productions"
-msgstr ""
+msgstr "Fremtidige produkter"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Å fakturere"
 
 #. module: stock
 #: view:stock.return.picking:0
@@ -3061,42 +3250,42 @@ msgstr "Dato for lagerverdi"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total incoming quantity"
-msgstr ""
+msgstr "Totalt innkommende mengde."
 
 #. module: stock
 #: field:report.stock.move,product_qty_out:0
 msgid "Out Qty"
-msgstr ""
+msgstr "ut Antall"
 
 #. module: stock
 #: field:stock.production.lot,move_ids:0
 msgid "Moves for this production lot"
-msgstr ""
+msgstr "Flyttinger for denne produksjonsvaren"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Put in current pack"
-msgstr ""
+msgstr "Sett in gjeldende pakke"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr ""
+msgstr "Varelager"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Reason"
-msgstr ""
+msgstr "Grunn"
 
 #. module: stock
 #: model:product.template,name:stock.product_icecream_product_template
 msgid "Ice Cream"
-msgstr ""
+msgstr "Iskrem"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Delvis plukking Siden lastet veiviseren"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
@@ -3108,6 +3297,11 @@ msgid ""
 "'Available' button to get all the lots you produced, received or delivered "
 "to customers."
 msgstr ""
+"Dette er listen over alle produksjonen (serienumre) du har tatt opp. Når du "
+"velger en , kan du få oppstrøms eller nedstrøms sporbarhet av produktene som "
+"finnes i mye. Som standard er listen filtreres på serienumrene som er "
+"tilgjengelige på lageret, men du kan avmerk 'Tilgjengelig' knappen for å få "
+"alle tomtene du produserte, mottatt eller levert til kunden."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -3143,11 +3337,16 @@ msgid ""
 "default value for all products in this category. It can also directly be set "
 "on each product"
 msgstr ""
+"Når du gjør ektetid beholdningsvurdering vil motpart journal elementer for "
+"alle utgående aksjen beveger seg bli postet i denne kontoen, med mindre det "
+"er en konkret vurdering konto sett på målplassering. Dette er "
+"standardverdien for alle produkter i denne kategorien. Det kan også direkte "
+"settes på hvert produkt."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
 msgid "Non European Customers"
-msgstr ""
+msgstr "Kunder som ikke er fra Europa"
 
 #. module: stock
 #: code:addons/stock/product.py:75 code:addons/stock/product.py:89
@@ -3179,31 +3378,31 @@ msgstr "Kansellert"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Delivery Orders"
-msgstr ""
+msgstr "Godkjente leveringsordre"
 
 #. module: stock
 #: view:stock.move:0 field:stock.partial.move,picking_id:0
 #: field:stock.partial.picking,picking_id:0
 msgid "Picking"
-msgstr ""
+msgstr "Plukker"
 
 #. module: stock
 #: help:stock.picking,move_type:0
 msgid "It specifies goods to be delivered all at once or by direct delivery"
-msgstr ""
+msgstr "Den angir varer skal leveres på en gang eller ved direkte levering"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:96
 #, python-format
 msgid "This picking list does not require invoicing."
-msgstr ""
+msgstr "Denne plukklisten krever ikke fakturering."
 
 #. module: stock
 #: selection:report.stock.move,type:0
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Getting Goods"
-msgstr ""
+msgstr "Får produkter"
 
 #. module: stock
 #: help:stock.location,chained_location_type:0
@@ -3219,6 +3418,16 @@ msgid ""
 "* Fixed Location: The chained location is taken from the next field: Chained "
 "Location if Fixed."
 msgstr ""
+"Avgjør om denne plasseringen er lenket til et annet sted, det vil si alle "
+"innkommende produkt i denne plasseringen\n"
+"bør neste gå til lenket plassering. Den lenket posisjonen beregnes i henhold "
+"til typen:\n"
+"* Ingen: Ingen kjeding i det hele tatt\n"
+"* Kunde: Den lenket plasseringen vil bli tatt fra Kunden Location-feltet på "
+"Partner form av Partner som er angitt i Plukkliste av innkommende "
+"produkter.\n"
+"* Fast Beliggenhet: lenket beliggenhet er hentet fra det neste feltet: "
+"Lenket Plassering hvis den er fikset."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
@@ -3233,7 +3442,7 @@ msgstr "Advarsel"
 #: code:addons/stock/stock.py:1348
 #, python-format
 msgid "is done."
-msgstr ""
+msgstr "er ferdig."
 
 #. module: stock
 #: field:stock.production.lot.revision,date:0
@@ -3251,7 +3460,7 @@ msgstr "Leveringsordre"
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders already processed"
-msgstr ""
+msgstr "Leveringsordre er allerede behandlet"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -3259,6 +3468,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 ""
+"Denne lagerlokasjonen vil bli brukt, i stedet for en standard en, som "
+"målplassering for varer du sender til denne partneren"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -3286,18 +3497,20 @@ msgstr ""
 #. module: stock
 #: help:stock.change.product.qty,new_quantity:0
 msgid "This quantity is expressed in the Default UoM of the product."
-msgstr ""
+msgstr "Dette kvantumet er uttrykt i Standard målenheter av produktet."
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Reception:"
-msgstr ""
+msgstr "Resepsjon:"
 
 #. module: stock
 #: help:stock.location,scrap_location:0
 msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
 msgstr ""
+"Kryss av i denne boksen for å tillate å bruke dette stedet til å sette "
+"ødelagte/skadede varer."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_relate_picking
@@ -3312,17 +3525,17 @@ msgstr "Planlagt år"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total outgoing quantity"
-msgstr ""
+msgstr "Totalt utgående mengde"
 
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. module: stock
 #: help:stock.partial.move.line,cost:0 help:stock.partial.picking.line,cost:0
 msgid "Unit Cost for this product line"
-msgstr ""
+msgstr "Enhetskostnaden for denne produkt linjen."
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_category
@@ -3330,7 +3543,7 @@ msgstr ""
 #: field:report.stock.inventory,product_categ_id:0 view:report.stock.move:0
 #: field:report.stock.move,categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "Produktkategori"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
@@ -3341,7 +3554,7 @@ msgstr "Rapportering"
 #: code:addons/stock/stock.py:1343
 #, python-format
 msgid " for the "
-msgstr ""
+msgstr " for "
 
 #. module: stock
 #: view:stock.split.into:0
@@ -3351,7 +3564,7 @@ msgstr ""
 #. module: stock
 #: view:stock.move:0
 msgid "Stock available to be delivered"
-msgstr ""
+msgstr "Lager tilgjengelig til å bli levert"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
@@ -3362,7 +3575,7 @@ msgstr "Lag faktura"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Internal Moves"
-msgstr ""
+msgstr "Bekreftet Intern trekk"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -3373,7 +3586,7 @@ msgstr "Konfigurasjon"
 #: field:stock.inventory.line.split,use_exist:0
 #: field:stock.move.split,use_exist:0
 msgid "Existing Lots"
-msgstr ""
+msgstr "Eksisterende produkter"
 
 #. module: stock
 #: view:stock.location:0
@@ -3389,11 +3602,16 @@ msgid ""
 "If cost price is decreased, stock variation account will be creadited and "
 "stock input account will be debited."
 msgstr ""
+"Hvis kostprisen økes, vil lager variasjon konto bli belastet og lager utgang "
+"konto vil bli kreditert med verdi = (forskjell på mengden * mengde "
+"tilgjengelig).\n"
+"Hvis kostprisen er redusert, vil lager variasjon kontoen creadited og lager "
+"innspill konto vil bli belastet."
 
 #. module: stock
 #: field:stock.location,chained_journal_id:0
 msgid "Chaining Journal"
-msgstr ""
+msgstr "Kjeding Journal"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
@@ -3404,7 +3622,7 @@ msgstr "Pakkseddel"
 #: code:addons/stock/stock.py:738
 #, python-format
 msgid "Not enough stock, unable to reserve the products."
-msgstr ""
+msgstr "Ikke nok lager, ute av stand til å reservere produktene."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
@@ -3414,13 +3632,13 @@ msgstr "Kunder"
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "Waiting Availability"
-msgstr ""
+msgstr "Venter Tilgjengelighet"
 
 #. module: stock
 #: code:addons/stock/stock.py:1347
 #, python-format
 msgid "is cancelled."
-msgstr ""
+msgstr "er avbrutt"
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -3430,33 +3648,33 @@ msgstr "Lagerbeholdningslinje"
 #. module: stock
 #: view:stock.move:0
 msgid "Waiting "
-msgstr ""
+msgstr "Venter "
 
 #. module: stock
 #: code:addons/stock/product.py:427
 #, python-format
 msgid "Future Deliveries"
-msgstr ""
+msgstr "Fremtidige leveranser"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
-msgstr ""
+msgstr "Ytterligere info"
 
 #. module: stock
 #: view:stock.move:0 field:stock.move,tracking_id:0
 msgid "Pack"
-msgstr ""
+msgstr "Pakk"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Date Expected"
-msgstr ""
+msgstr "Forventet dato"
 
 #. module: stock
 #: field:stock.move,auto_validate:0
 msgid "Auto Validate"
-msgstr ""
+msgstr "Automatisk Valider"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -3466,17 +3684,17 @@ msgstr "Vekt"
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Produktmal"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "December"
-msgstr ""
+msgstr "Desember"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Available Product Lots"
-msgstr ""
+msgstr "Tilgjengelig produkt Masse"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_move_form2
@@ -3485,16 +3703,19 @@ msgid ""
 "specific product. You can filter on the product to see all the past or "
 "future movements for the product."
 msgstr ""
+"Denne menyen gir deg full sporbarhet av inventar operasjoner på et bestemt "
+"produkt. Du kan filtrere på produktet for å se alle de tidligere eller "
+"fremtidige bevegelser for produktet."
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Return Products"
-msgstr ""
+msgstr "returnere produkter"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Validate Inventory"
-msgstr ""
+msgstr "Valider Varelager"
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -3502,17 +3723,19 @@ msgid ""
 "Technical field used to record the currency chosen by the user during a "
 "picking confirmation (when average price costing method is used)"
 msgstr ""
+"Det Teknisk feltet som brukes til å registrere valutaen valgt av brukeren "
+"under en plukke bekreftelse (når gjennomsnittlig pris koster metoden brukes)"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:53
 #, python-format
 msgid "Stock Inventory is already Validated."
-msgstr ""
+msgstr "Lagerrutiner er allerede godkjent."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Products Moves"
-msgstr ""
+msgstr "Produkter Beveger seg."
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -3522,22 +3745,22 @@ msgstr "Fakturert"
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Expected Date"
-msgstr ""
+msgstr "Maks. forventet dato"
 
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Picking"
-msgstr ""
+msgstr "Automatisk - plukking"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
 msgid "Shop 2"
-msgstr ""
+msgstr "Butikk 2"
 
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
 msgid "Chaining Type"
-msgstr ""
+msgstr "Kjeding type"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
@@ -3557,7 +3780,7 @@ msgstr "Utkast"
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
 #: report:stock.inventory.move:0
 msgid "Stock Inventory"
-msgstr ""
+msgstr "Lagerrutiner"
 
 #. module: stock
 #: help:report.stock.inventory,state:0
@@ -3568,6 +3791,11 @@ msgid ""
 " When the picking it done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
+"Når aksjen beveger seg er opprettet er det i \"Kladd\" tilstand.\n"
+"Etter at det er satt til 'Bekreftet' tilstand.\n"
+"Hvis aksjen er tilgjengelige stat er satt til 'ledig'.\n"
+"Når plukking det gjort staten Ferdig.\n"
+"Staten er \"Venter\" hvis farten venter på en annen."
 
 #. module: stock
 #: view:stock.picking:0
@@ -3578,7 +3806,7 @@ msgstr "Opprett faktura"
 #: code:addons/stock/wizard/stock_return_picking.py:189
 #, python-format
 msgid "Please specify at least one non-zero quantity!"
-msgstr ""
+msgstr "Vennligst oppgi minst én ikke-null kvantitet!"
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
@@ -3586,17 +3814,19 @@ msgid ""
 "For the current product, this stock location will be used, instead of the "
 "default one, as the source location for stock moves generated by procurements"
 msgstr ""
+"For det aktuelle produktet, vil dette lager posisjon brukt, i stedet for "
+"standard ett slik kildeplasseringen for lager beveger generert av innkjøp"
 
 #. module: stock
 #: code:addons/stock/stock.py:1346
 #, python-format
 msgid "is ready to process."
-msgstr ""
+msgstr "Er klar til å behandle."
 
 #. module: stock
 #: help:stock.picking,origin:0
 msgid "Reference of the document that produced this picking."
-msgstr ""
+msgstr "Referanse til dokumentet som produserte denne plukking."
 
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
@@ -3606,24 +3836,24 @@ msgstr "Sett til null"
 #. module: stock
 #: model:res.groups,name:stock.group_stock_user
 msgid "User"
-msgstr ""
+msgstr "Bruker"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
 #, python-format
 msgid "None of these picking lists require invoicing."
-msgstr ""
+msgstr "Ingen av disse plukklistene krever fakturering."
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: stock
 #: code:addons/stock/product.py:100 code:addons/stock/stock.py:2128
 #, python-format
 msgid "There is no journal defined on the product category: \"%s\" (id: %d)"
-msgstr ""
+msgstr "Det er ingen journal definert på produktkategori: \"% s\" (id:% d)"
 
 #. module: stock
 #: code:addons/stock/product.py:441
@@ -3634,18 +3864,18 @@ msgstr "Uplanlagt kvantum"
 #. module: stock
 #: field:stock.location,chained_company_id:0
 msgid "Chained Company"
-msgstr ""
+msgstr "Lenket Selvskap"
 
 #. module: stock
 #: help:stock.location,icon:0
 msgid "Icon show in  hierarchical tree view"
-msgstr ""
+msgstr "Ikon Vises i hierarkisk trevisning"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
 #. module: stock
 #: help:product.product,track_incoming:0
@@ -3653,6 +3883,8 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "coming from a Supplier Location"
 msgstr ""
+"Styrker for å angi en produksjon Vare ved all forflytning inneholder dette "
+"produktet og kommer fra en leverandør Sted."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
@@ -3662,13 +3894,13 @@ msgstr "Framtidige lagerbevegelser"
 #. module: stock
 #: field:stock.move,move_history_ids2:0
 msgid "Move History (parent moves)"
-msgstr ""
+msgstr "Flytte Historie (foreldre trekk)"
 
 #. module: stock
 #: code:addons/stock/product.py:423
 #, python-format
 msgid "Future Stock"
-msgstr ""
+msgstr "Fremtidig lager"
 
 #. module: stock
 #: code:addons/stock/stock.py:513 code:addons/stock/stock.py:1149
@@ -3690,6 +3922,9 @@ msgid ""
 "click on a location to get the list of the products and their stock level in "
 "this particular location and all its children."
 msgstr ""
+"Dette er strukturen i bedriftens lagerbygninger og steder. Du kan klikke på "
+"et sted for å få en liste over hvilke produkter og deres lager nivå i dette "
+"bestemte stedet og alle sine barn."
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
@@ -3715,7 +3950,7 @@ msgstr "Sporbarhet"
 #. module: stock
 #: view:stock.picking:0
 msgid "To invoice"
-msgstr ""
+msgstr "til faktura"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
@@ -3731,7 +3966,7 @@ msgstr "Generell informasjon"
 #. module: stock
 #: field:stock.production.lot,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Prefiks"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:53
@@ -3740,6 +3975,8 @@ msgid ""
 "Total quantity after split exceeds the quantity to split for this product: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Total mengde etter splitt overskrider antallet å splitte for dette "
+"produktet: \"% s\" (id:% d)"
 
 #. module: stock
 #: help:product.template,property_stock_account_input:0
@@ -3749,6 +3986,10 @@ msgid ""
 "specific valuation account set on the source location. When not set on the "
 "product, the one from the product category is used."
 msgstr ""
+"Når du gjør ektetid beholdningsvurdering vil motpart journal elementer for "
+"alle innkommende aksjen beveger seg bli postet i denne kontoen, med mindre "
+"det er en konkret vurdering konto sett på kildeplasseringen. Når den ikke er "
+"satt på produktet, er en fra produktkategori brukes."
 
 #. module: stock
 #: view:stock.move:0 field:stock.partial.move,move_ids:0
@@ -3762,23 +4003,24 @@ msgstr "Bevegelser"
 #: field:stock.partial.picking.line,location_dest_id:0
 #: field:stock.picking,location_dest_id:0
 msgid "Dest. Location"
-msgstr ""
+msgstr "Dest. plassering"
 
 #. module: stock
 #: help:stock.move,product_packaging:0
 msgid ""
 "It specifies attributes of packaging like type, quantity of packaging,etc."
 msgstr ""
+"Den angir attributter for emballasje som type, mengde emballasje, etc."
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Du må velge en produksjonslot/batch for dette produktet"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Expected"
-msgstr ""
+msgstr "Forventet"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -3790,12 +4032,12 @@ msgstr "Produksjon"
 #. module: stock
 #: view:stock.split.into:0
 msgid "Split Move"
-msgstr ""
+msgstr "Delt Flytte"
 
 #. module: stock
 #: field:stock.picking,backorder_id:0
 msgid "Back Order of"
-msgstr ""
+msgstr "Restordre av"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:106
@@ -3804,27 +4046,29 @@ msgid ""
 "There are no products to return (only lines in Done state and not fully "
 "returned yet can be returned)!"
 msgstr ""
+"Det er ingen produkter å returnere (bare linjer i Ferdig staten og ikke "
+"fullt returnert ennå kan returneres)!"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Future Stock-Moves"
-msgstr ""
+msgstr "Fremtidig lager-flyttes"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
 msgid "Split in Production lots"
-msgstr ""
+msgstr "Split i produksjonslot/batch"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_move.py:213
 #, python-format
 msgid "Processing Error"
-msgstr ""
+msgstr "Lastet Feil"
 
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Real"
-msgstr ""
+msgstr "Ekte"
 
 #. module: stock
 #: report:stock.picking.list:0 view:stock.production.lot.revision:0
@@ -3836,7 +4080,7 @@ msgstr "Beskrivelse"
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "May"
-msgstr ""
+msgstr "Mai"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action5 view:stock.tracking:0
@@ -3847,7 +4091,7 @@ msgstr "Overliggende sporbarhet"
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 #: report:lot.stock.overview_all:0
 msgid "Location Content"
-msgstr ""
+msgstr "Plassering innhold"
 
 #. module: stock
 #: code:addons/stock/product.py:447
@@ -3865,7 +4109,7 @@ msgstr "Konto for utgående lager"
 #. module: stock
 #: field:stock.location,chained_location_type:0
 msgid "Chained Location Type"
-msgstr ""
+msgstr "Lenket Type beliggenhet"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_prodlots
@@ -3882,38 +4126,38 @@ msgstr "Kunde"
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Production Lot Identification"
-msgstr ""
+msgstr "Produksjon Vare Identifikasjon"
 
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator_small
 msgid "Small Refrigerator"
-msgstr ""
+msgstr "Lite kjøleskap"
 
 #. module: stock
 #: model:stock.location,name:stock.location_convenience_shop
 msgid "Convenient Store"
-msgstr ""
+msgstr "praktisk butikk"
 
 #. module: stock
 #: field:stock.location,scrap_location:0 view:stock.move.scrap:0
 msgid "Scrap Location"
-msgstr ""
+msgstr "skrap Beliggenhet"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
 #: selection:report.stock.move,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:stock.move:0
 msgid "Future"
-msgstr ""
+msgstr "Fremtid"
 
 #. module: stock
 #: field:stock.invoice.onshipping,invoice_date:0
@@ -3935,7 +4179,7 @@ msgstr "Advarsel !"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
 msgid "Output"
-msgstr ""
+msgstr "Utgang"
 
 #. module: stock
 #: help:stock.tracking,name:0
@@ -3943,11 +4187,13 @@ msgid ""
 "By default, the pack reference is generated following the sscc standard. "
 "(Serial number + 1 check digit)"
 msgstr ""
+"Som standard er pakken referansen generert etter SSCC standarden. "
+"(Serienummer + 1 kontrollsiffer)"
 
 #. module: stock
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive tilknyttede medlemmer."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:159
@@ -3957,6 +4203,9 @@ msgid ""
 "would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is "
 "accepted by the uom."
 msgstr ""
+"Avrunding av den første målenheter tillater ikke at du umiddelbart \"% s% "
+"s\", som det ville la en mengde \"% s% s\" til frakt og bare avrundinger av "
+"\"% s% s\" er akseptert av målenheter"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_move.py:213
@@ -3964,16 +4213,17 @@ msgstr ""
 msgid ""
 "Production lot quantity %d of %s is larger than available quantity (%d) !"
 msgstr ""
+"Produserer mye mengder% d av% s er større enn tilgjengelig mengde (% d)!"
 
 #. module: stock
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Feil! Du kan ikke lage uendelig struktur med uendelige kategorier."
 
 #. module: stock
 #: help:stock.move,move_dest_id:0
 msgid "Optional: next stock move when chaining them"
-msgstr ""
+msgstr "Valgfritt: neste lager trekk når du endrer dem"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,year:0
@@ -3989,13 +4239,13 @@ msgstr "Fysiske lokasjoner"
 #. module: stock
 #: view:stock.picking:0 selection:stock.picking,state:0
 msgid "Ready to Process"
-msgstr ""
+msgstr "Klar til å behandle"
 
 #. module: stock
 #: help:stock.location,posx:0 help:stock.location,posy:0
 #: help:stock.location,posz:0
 msgid "Optional localization details, for information purpose only"
-msgstr ""
+msgstr "Valgfrie lokalisering detaljer, for informasjonens hensikt bare"
 
 #~ msgid "Outgoing Product"
 #~ msgstr "Outgoing Product"
@@ -4513,3 +4763,15 @@ msgstr ""
 
 #~ msgid "STOCK_REDO"
 #~ msgstr "STOCK_REDO"
+
+#~ msgid "New pack"
+#~ msgstr "Ny pakke"
+
+#~ msgid "Do you want to merge theses inventories ?"
+#~ msgstr "Vil du slå sammen disse varelagerene?"
+
+#~ msgid "Merge inventories"
+#~ msgstr "Flett varelager"
+
+#~ msgid "Quantity to leave in the current pack"
+#~ msgstr "Antall å forlate i dagens pakke."
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 64d2d899e2c..499bf4cd1cc 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:48+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-09-24 13:55+0000\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:46+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -936,7 +936,7 @@ msgstr "Inkomende leveringen"
 #. module: stock
 #: view:report.stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Scrap"
-msgstr "Afval"
+msgstr "Afgekeurd"
 
 #. module: stock
 #: field:stock.location,child_ids:0
@@ -957,7 +957,7 @@ msgstr "Inkomend"
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 #: field:stock.move,price_unit:0
 msgid "Unit Price"
-msgstr "Unit Price"
+msgstr "Prijs"
 
 #. module: stock
 #: field:stock.move,date_expected:0
@@ -1179,7 +1179,7 @@ msgstr "Auteur"
 #: code:addons/stock/stock.py:1332
 #, python-format
 msgid "Delivery Order"
-msgstr "Leveringsbon"
+msgstr "Uitgaande levering"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1646,7 +1646,7 @@ msgstr "Laat dit veld leeg als deze locatie wordt gedeeld tussen bedrijven"
 #: code:addons/stock/stock.py:2337
 #, python-format
 msgid "Please provide a positive quantity to scrap!"
-msgstr "Geef een positieve hoeveelheid voor afval in!"
+msgstr "Geef een positieve hoeveelheid om af te keuren!"
 
 #. module: stock
 #: field:stock.location,chained_delay:0
@@ -1699,7 +1699,7 @@ msgstr "Leveranciers locatie"
 #: code:addons/stock/stock.py:2358
 #, python-format
 msgid "were scrapped"
-msgstr "zijn naar afval"
+msgstr "zijn afgekeurd"
 
 #. module: stock
 #: help:stock.partial.move.line,currency:0
@@ -1791,7 +1791,7 @@ msgstr "Voorraadwaarde rekening (inkomend)"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
 msgid "Shelf 2"
-msgstr "Schap 2"
+msgstr "Plank 2"
 
 #. module: stock
 #: field:stock.report.tracklots,tracking_id:0
@@ -1905,7 +1905,7 @@ msgstr "Een eenheidsregel kan niet worden verwijderd!"
 #: model:ir.model,name:stock.model_stock_move_scrap view:stock.move:0
 #: view:stock.move.scrap:0 view:stock.picking:0
 msgid "Scrap Products"
-msgstr "Afval producten"
+msgstr "Producten afkeuren"
 
 #. module: stock
 #: code:addons/stock/stock.py:1157
@@ -2043,7 +2043,7 @@ msgstr "Geplande levertijden (dagen)"
 #. module: stock
 #: field:stock.change.standard.price,new_price:0
 msgid "Price"
-msgstr "Prijs"
+msgstr "Bedrag"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
@@ -2286,7 +2286,7 @@ msgid ""
 "generated by a Manufacturing Order"
 msgstr ""
 "Forceert het specificeren van een productie partij voor alle mutaties van "
-"dit product en welke gegenereerd zijn door een productieorder"
+"dit product indien dit product is gegenereerd door een productieorder."
 
 #. module: stock
 #: view:product.product:0
@@ -2313,13 +2313,13 @@ msgstr "Overige"
 #: code:addons/stock/product.py:89
 #, python-format
 msgid "Could not find any difference between standard price and new price!"
-msgstr "Er is geen verschil tussen de standaard prijs en de nieuwe prijs!"
+msgstr "Er is geen verschil tussen de huidige kostprijs en de nieuwe prijs!"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_scrapped
 #: field:stock.move,scrapped:0
 msgid "Scrapped"
-msgstr "Afval"
+msgstr "Afgekeurd"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2672,7 +2672,7 @@ msgstr "Forceer beschikbaarheid"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_scrap view:stock.move.scrap:0
 msgid "Scrap Move"
-msgstr "Afvalmutatie"
+msgstr "Afkeur mutatie"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
@@ -3563,7 +3563,7 @@ msgstr "Ontvangst:"
 msgid ""
 "Check this box to allow using this location to put scrapped/damaged goods."
 msgstr ""
-"Vink deze optie aan om deze locatie te gebruiken voor afval en/of "
+"Vink deze optie aan om deze locatie te gebruiken voor afgekeurde en/of "
 "beschadigde producten."
 
 #. module: stock
@@ -4208,7 +4208,7 @@ msgstr "Warenhuis"
 #. module: stock
 #: field:stock.location,scrap_location:0 view:stock.move.scrap:0
 msgid "Scrap Location"
-msgstr "Afvallocatie"
+msgstr "Afkeurlocatie"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
diff --git a/addons/stock/i18n/nl_BE.po b/addons/stock/i18n/nl_BE.po
index df5f491d1d9..13fd85f8271 100644
--- a/addons/stock/i18n/nl_BE.po
+++ b/addons/stock/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 990ff503e32..556b07e0f70 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:31+0000\n"
+"PO-Revision-Date: 2012-08-26 10:20+0000\n"
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -3602,7 +3602,7 @@ msgstr "Klienci"
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "Waiting Availability"
-msgstr "Oczekują na dostępność"
+msgstr "Oczekiwanie na dostępność"
 
 #. module: stock
 #: code:addons/stock/stock.py:1347
diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po
index 54981d6e4de..3d64393fe2e 100644
--- a/addons/stock/i18n/pt.po
+++ b/addons/stock/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:41+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index d20f1fa0d59..b036b0e3851 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 17:43+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-10-17 00:35+0000\n"
+"Last-Translator: Syllas F. de O. Neto <syllasneto@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: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -24,7 +24,7 @@ msgstr "Rastrear lotes na saída"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
 msgid "Stock move Split lines"
-msgstr ""
+msgstr "Linhas de Movimentação de Estoque divididas"
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -35,6 +35,11 @@ msgid ""
 "value for all products in this category. It can also directly be set on each "
 "product"
 msgstr ""
+"Ao fazer a avaliação de estoque em tempo real, itens de contrapartida no "
+"diário para todos os movimentos de ações recebidas serão publicadas nesta "
+"conta, a menos que exista uma conta específica de avaliação no local de "
+"origem. Este é o valor padrão para todos os produtos desta categoria. Ela "
+"também pode ser definida diretamente em cada produto"
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
@@ -51,7 +56,7 @@ msgstr "Colocar em uma nova embalagem"
 #: view:stock.production.lot:0
 #, python-format
 msgid "Upstream Traceability"
-msgstr ""
+msgstr "Rastreabilidade Posterior"
 
 #. module: stock
 #: model:ir.actions.todo.category,name:stock.category_stock_management_config
@@ -77,7 +82,7 @@ msgstr "Número da Revisão"
 #. module: stock
 #: view:stock.move:0
 msgid "Orders processed Today or planned for Today"
-msgstr ""
+msgstr "Pedidos processados Hoje ou planejados para Hoje"
 
 #. module: stock
 #: view:stock.partial.move.line:0 view:stock.partial.picking:0
@@ -89,14 +94,14 @@ msgstr "Movimentações de Produto"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
 msgid "UoM Categories"
-msgstr "Categorias UoM"
+msgstr "Categorias UdM"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_move_report
 #: model:ir.ui.menu,name:stock.menu_action_stock_move_report
 #: view:report.stock.move:0
 msgid "Moves Analysis"
-msgstr "Analisa de movimentos"
+msgstr "Análise de Movimentos"
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -110,6 +115,7 @@ msgstr "Referencia interna se for diferente da referencia do fabricante"
 #, python-format
 msgid "You cannot perform this operation on more than one Stock Inventories."
 msgstr ""
+"Você não pode executar esta operação em mais de um Inventário de Estoque"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_inventory_form
@@ -127,7 +133,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_change_product_qty.py:87
 #, python-format
 msgid "Quantity cannot be negative."
-msgstr ""
+msgstr "A Quantidade não pode ser negativa"
 
 #. module: stock
 #: view:stock.picking:0
@@ -172,7 +178,7 @@ msgstr "Dia"
 #: view:stock.move:0 field:stock.move.split,product_uom:0 view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "UoM"
-msgstr "Unidade de Medida"
+msgstr "UdM"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form
@@ -195,7 +201,7 @@ msgstr "Mês atual"
 #: code:addons/stock/wizard/stock_move.py:222
 #, python-format
 msgid "Unable to assign all lots to this move!"
-msgstr ""
+msgstr "Não é possível associar todos os lotes a este movimento!"
 
 #. module: stock
 #: code:addons/stock/stock.py:2516
@@ -206,30 +212,30 @@ msgstr "Faltando dados de separação parcial para movimentação #%s"
 #. module: stock
 #: model:ir.actions.server,name:stock.action_partial_move_server
 msgid "Deliver/Receive Products"
-msgstr "Entregar/receber produtos"
+msgstr "Entregar/Receber Produtos"
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:78
 #: code:addons/stock/report/report_stock.py:135
 #, python-format
 msgid "You cannot delete any record!"
-msgstr "Você não pode apagar nenhum registro!"
+msgstr "Você não pode excluir nenhum registro!"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders to invoice"
-msgstr ""
+msgstr "Ordens de Entrega a faturar"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Delivery Orders"
-msgstr ""
+msgstr "Ordens de Entrega Atribuídas"
 
 #. module: stock
 #: field:stock.partial.move.line,update_cost:0
 #: field:stock.partial.picking.line,update_cost:0
 msgid "Need cost update"
-msgstr ""
+msgstr "Necessário atualização de custo"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:49
@@ -240,13 +246,13 @@ msgid ""
 "this product: \"%s\" (id: %d)"
 msgstr ""
 "A linha de movimento atual já está atribuída a um pacote. Por favor, remova "
-"ela primeiro se você realmente quer mudar ' # 'para este produto: \"%s\" "
-"(id:%d)"
+"ela primeiro se você realmente quer mudar ' # ' para este produto: \"%s\" "
+"(id: %d)"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Not Applicable"
-msgstr "Não aplicável"
+msgstr "Não Aplicável"
 
 #. module: stock
 #: help:stock.tracking,serial:0
@@ -262,19 +268,19 @@ msgstr "Origem"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_stock_incoming_product_delay
 msgid "Incoming Products"
-msgstr "Entrada de Produtos"
+msgstr "Recebimento de Produtos"
 
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Non Inv"
-msgstr "Sem Inv."
+msgstr "Sem Fat"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_traceability.py:54
 #: view:stock.production.lot:0
 #, python-format
 msgid "Downstream Traceability"
-msgstr ""
+msgstr "Rastreabilidade de Abastecimento"
 
 #. module: stock
 #: view:stock.move:0 field:stock.move,picking_id:0 field:stock.picking,name:0
@@ -307,8 +313,8 @@ msgstr "_Validar"
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
 msgstr ""
-"Você não pode cancelar a separação porque o movimento de estoque está com "
-"status concluído !"
+"Você não pode cancelar a separação porque o movimento de estoque está como "
+"Concluído !"
 
 #. module: stock
 #: code:addons/stock/stock.py:2337 code:addons/stock/stock.py:2379
@@ -318,7 +324,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_picking.py:141
 #, python-format
 msgid "Warning!"
-msgstr "Atenção!"
+msgstr "Aviso!"
 
 #. module: stock
 #: field:stock.invoice.onshipping,group:0
@@ -341,6 +347,9 @@ msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
 "Valuation account on category of this product are same."
 msgstr ""
+"Não é possível criar uma Entrada de Diário, a Conta de Entrada definida "
+"neste produto e a conta de Valorização na categoria deste produto são as "
+"mesmas."
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -350,7 +359,7 @@ msgstr "Sem faturamento"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that have been processed"
-msgstr ""
+msgstr "Movimentação de Estoque que foram processadas"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
@@ -372,7 +381,7 @@ msgstr "Movimentações desta embalagem"
 #. module: stock
 #: view:stock.picking:0
 msgid "Incoming Shipments Available"
-msgstr ""
+msgstr "Recebimentos Disponíveis"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -399,7 +408,7 @@ msgstr ""
 #: field:stock.move,state:0 view:stock.picking:0 field:stock.picking,state:0
 #: report:stock.picking.list:0
 msgid "State"
-msgstr "Estado"
+msgstr "Situação"
 
 #. module: stock
 #: view:stock.location:0
@@ -409,7 +418,7 @@ msgstr "Informação Contábil"
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
-msgstr "Valor do estoque real"
+msgstr "Valor Real do Estoque"
 
 #. module: stock
 #: field:report.stock.move,day_diff2:0
@@ -424,7 +433,7 @@ msgstr "Rastreabilidade da ação "
 #. module: stock
 #: view:stock.move:0
 msgid "UOM"
-msgstr "Unidade de Medida"
+msgstr "UdM"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -476,7 +485,7 @@ msgstr "Localizações Internas"
 #. module: stock
 #: field:stock.move,price_currency_id:0
 msgid "Currency for average price"
-msgstr "Moeda para preço medio"
+msgstr "Moeda para preço médio"
 
 #. module: stock
 #: help:product.category,property_stock_valuation_account_id:0
@@ -495,7 +504,7 @@ msgstr "Tipo de Localização"
 #. module: stock
 #: help:report.stock.move,type:0 help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
-msgstr ""
+msgstr "Tipo de transporte especificar, mercadorias entrando ou saindo."
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
@@ -505,7 +514,7 @@ msgstr "Etiquetas de Itens"
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_move
 msgid "Moves Statistics"
-msgstr "Estatísticas de movimentos"
+msgstr "Estatísticas de Movimentação"
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -557,7 +566,7 @@ msgstr "Local de destino"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move_line
 msgid "stock.partial.move.line"
-msgstr ""
+msgstr "stock.partial.move.line"
 
 #. module: stock
 #: code:addons/stock/stock.py:760
@@ -574,12 +583,12 @@ msgstr "Empacotamento"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Order(Origin)"
-msgstr "Pedido(Origem)"
+msgstr "Pedido (Origem)"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Grand Total:"
-msgstr "Grande Total:"
+msgstr "Total Geral:"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
@@ -607,7 +616,7 @@ msgstr "Informação Adicional"
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Location / Product"
-msgstr "Locação / Produto"
+msgstr "Localização / Produto"
 
 #. module: stock
 #: field:stock.move,address_id:0
@@ -669,7 +678,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Posted Inventory"
-msgstr "Inventário Postado"
+msgstr "Inventário Lançado"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_picking_tree4
@@ -679,16 +688,20 @@ msgid ""
 "according to the original purchase order. You can validate the shipment "
 "totally or partially."
 msgstr ""
+"Recebimentos de Entrada é uma lista de todos os pedidos que você vai receber "
+"de seus fornecedores. Uma expedição recebida contém uma lista de produtos a "
+"serem recebidas de acordo com a ordem de compra original. Você pode validar "
+"o envio total ou parcialmente."
 
 #. module: stock
 #: field:stock.move.split.lines,wizard_exist_id:0
 msgid "Parent Wizard (for existing lines)"
-msgstr ""
+msgstr "Assistente pai (por linhas existentes)"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Move Information"
-msgstr "Informações de Movimentação"
+msgstr "Informação da Movimentação"
 
 #. module: stock
 #: code:addons/stock/stock.py:2131
@@ -697,11 +710,13 @@ msgid ""
 "There is no inventory Valuation account defined on the product category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Não há nenhuma conta de Valorização inventário definido na categoria de "
+"produto: \"% s\" (id:% d)"
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Outgoing"
-msgstr "Saindo"
+msgstr "Enviando"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -735,7 +750,7 @@ msgstr "Junho"
 #. module: stock
 #: field:product.template,property_stock_procurement:0
 msgid "Procurement Location"
-msgstr "Localização de obtenção"
+msgstr "Localização da Aquisição"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_production_lot_form
@@ -754,13 +769,13 @@ msgstr "Destinatário"
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator
 msgid "Refrigerator"
-msgstr ""
+msgstr "Refrigerador"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
 #: model:ir.ui.menu,name:stock.menu_action_location_tree
 msgid "Location Structure"
-msgstr "Estrutura de Locais"
+msgstr "Estrutura da Localização"
 
 #. module: stock
 #: selection:report.stock.move,month:0
@@ -785,7 +800,7 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
 msgid "Process Picking"
-msgstr "Processo de Separação"
+msgstr "Processar Separação"
 
 #. module: stock
 #: sql_constraint:stock.picking:0
@@ -818,11 +833,12 @@ msgstr ""
 #, python-format
 msgid "Valuation Account is not specified for Product Category: %s"
 msgstr ""
+"Conta de Valorização não está especificada para a Categoria de Produtos: %s"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
 msgid "Destination Move"
-msgstr ""
+msgstr "Movimento para Destino"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -890,7 +906,7 @@ msgstr "Mudar Quantidade do Produto"
 #. module: stock
 #: field:report.stock.inventory,month:0
 msgid "unknown"
-msgstr ""
+msgstr "desconhecido"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
@@ -901,7 +917,7 @@ msgstr "Mesclar Inventário"
 #: code:addons/stock/product.py:433
 #, python-format
 msgid "Future P&L"
-msgstr ""
+msgstr "P&L Futuro"
 
 #. module: stock
 #: view:board.board:0
@@ -940,7 +956,7 @@ msgstr "Preço Unitário"
 #. module: stock
 #: field:stock.move,date_expected:0
 msgid "Scheduled Date"
-msgstr "Data programada"
+msgstr "Data Programada"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -950,7 +966,7 @@ msgstr "Procurar Embalagem"
 #. module: stock
 #: view:stock.picking:0
 msgid "Pickings already processed"
-msgstr ""
+msgstr "Separações já processadas"
 
 #. module: stock
 #: field:stock.partial.move.line,currency:0
@@ -967,7 +983,7 @@ msgstr "Diário"
 #: code:addons/stock/stock.py:1345
 #, python-format
 msgid "is scheduled %s."
-msgstr ""
+msgstr "está agendado %s."
 
 #. module: stock
 #: help:stock.picking,location_id:0
@@ -993,7 +1009,7 @@ msgstr "Prazo de Execução (Dias)"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move
 msgid "Partial Move Processing Wizard"
-msgstr ""
+msgstr "Assistente de Processamento de Movimentação Parcial"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
@@ -1031,7 +1047,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Pickings"
-msgstr ""
+msgstr "Separações Confirmadas"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -1047,23 +1063,23 @@ msgstr "Visualizar"
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Last month"
-msgstr ""
+msgstr "Mês passado"
 
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr ""
+msgstr "Pai Esquerda"
 
 #. module: stock
 #: field:product.category,property_stock_valuation_account_id:0
 msgid "Stock Valuation Account"
-msgstr ""
+msgstr "Conta de Valorização do Estoque"
 
 #. module: stock
 #: code:addons/stock/stock.py:1349
 #, python-format
 msgid "is waiting."
-msgstr ""
+msgstr "está aguardando."
 
 #. module: stock
 #: constraint:product.product:0
@@ -1172,6 +1188,8 @@ msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
 "entries."
 msgstr ""
+"Para cancelar este inventário, você precisa primeiro remover as entradas de "
+"diário relacionadas."
 
 #. module: stock
 #: field:stock.picking,date_done:0
@@ -1185,11 +1203,13 @@ msgid ""
 "The uom rounding does not allow you to ship \"%s %s\", only roundings of "
 "\"%s %s\" is accepted by the uom."
 msgstr ""
+"O arredondamento da UdM não permite que você envie \"% s% s\", apenas "
+"arredondamentos de \"% s% s\" são aceitos pela UdM."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
+msgstr "Movimentação de estoque Disponíveis (Prontas para processar)"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1220,6 +1240,8 @@ msgid ""
 "The company the Picking List containing the chained move will belong to "
 "(leave empty to use the default company determination rules"
 msgstr ""
+"A lista de baixa de estoque da empresa contendo a movimentação irá pertencer "
+"a (deixe em branco para utilizar o padrão definido nas regras da empresa)"
 
 #. module: stock
 #: help:stock.location,chained_picking_type:0
@@ -1246,12 +1268,12 @@ msgstr "UdM do Produto"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
 msgid "Partner Locations"
-msgstr "Localização dos Parceiros"
+msgstr "Local dos Parceiros"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
 msgid "Current year"
-msgstr ""
+msgstr "Ano Atual"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
@@ -1297,17 +1319,17 @@ msgstr ""
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Identification"
-msgstr "Identeificação de Pacote"
+msgstr "Identificação da Embalagem"
 
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Packing List:"
-msgstr "Lista de produtos"
+msgstr "Lista da Embalagem:"
 
 #. module: stock
 #: selection:stock.move,state:0
 msgid "Waiting Another Move"
-msgstr ""
+msgstr "Aguardando Outra Movimentação"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1323,7 +1345,7 @@ msgstr ""
 #. module: stock
 #: view:product.product:0
 msgid "Expected Stock Variations"
-msgstr ""
+msgstr "Variação de Estoque Esperada"
 
 #. module: stock
 #: help:stock.move,price_unit:0
@@ -1338,7 +1360,7 @@ msgstr ""
 #: code:addons/stock/stock.py:1350
 #, python-format
 msgid "is in draft state."
-msgstr "está com status provisório."
+msgstr "está com situação Provisório."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_tracking_form
@@ -1346,6 +1368,9 @@ msgid ""
 "This is the list of all your packs. When you select a Pack, you can get the "
 "upstream or downstream traceability of the products contained in the pack."
 msgstr ""
+"Esta é a lista com todas as suas embalagens. Quando você selecionar uma "
+"Embalagem, você pode ter uma rastreabilidade anterior ou posterior dos "
+"produtos contidos na embalagem."
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -1374,7 +1399,7 @@ msgstr "Pronto"
 #. module: stock
 #: view:stock.picking:0
 msgid "Calendar View"
-msgstr "Visualização do calendário"
+msgstr "Visão de Calendário"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1396,7 +1421,7 @@ msgstr "De"
 #. module: stock
 #: view:stock.picking:0
 msgid "Incoming Shipments already processed"
-msgstr ""
+msgstr "Recebimentos já processados"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:99
@@ -1409,7 +1434,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0 field:stock.picking,invoice_state:0
 msgid "Invoice Control"
-msgstr "Faturamento"
+msgstr "Controle de Faturas"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
@@ -1451,7 +1476,7 @@ msgstr "Tipo"
 #. module: stock
 #: view:stock.picking:0
 msgid "Available Pickings"
-msgstr ""
+msgstr "Separações Disponíveis"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
@@ -1461,7 +1486,7 @@ msgstr "Fornecedores Genéricos de IT"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be receive"
-msgstr ""
+msgstr "Estoque a receber"
 
 #. module: stock
 #: help:stock.location,valuation_out_account_id:0
@@ -1472,6 +1497,11 @@ msgid ""
 "the generic Stock Output Account set on the product. This has no effect for "
 "internal locations."
 msgstr ""
+"Usado para avaliação do estoque em tempo real. Quando aparece em um local "
+"virtual (tipo interno não), esta conta será usada para manter o valor de "
+"produtos que estão sendo movidos para fora do local e em um local interno, "
+"em vez da conta genérica de  Estoque de Saída definida no produto. Isto não "
+"tem efeito para locais internos."
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1504,18 +1534,18 @@ msgstr "Empacotamento"
 #: field:res.partner,property_stock_customer:0
 #: selection:stock.location,usage:0
 msgid "Customer Location"
-msgstr "Localizacão do Cliente"
+msgstr "Local do Cliente"
 
 #. module: stock
 #: code:addons/stock/stock.py:2312
 #, python-format
 msgid "You can only delete draft moves."
-msgstr "Você só pode apagar movimentos em rascunho"
+msgstr "Você só pode apagar movimentação provisórias"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line_split_lines
 msgid "Inventory Split lines"
-msgstr ""
+msgstr "Linhas de Inventário Divididas"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
@@ -1532,6 +1562,7 @@ msgstr "Informações Gerais"
 #: view:report.stock.inventory:0
 msgid "Analysis including future moves (similar to virtual stock)"
 msgstr ""
+"Análise incluindo movimentos futuros (semelhantes ao estoque virtual)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
@@ -1565,7 +1596,7 @@ msgstr "Data do Pedido"
 #: code:addons/stock/wizard/stock_change_product_qty.py:88
 #, python-format
 msgid "INV: %s"
-msgstr ""
+msgstr "FAT: %s"
 
 #. module: stock
 #: view:stock.location:0 field:stock.location,location_id:0
@@ -1620,7 +1651,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
-msgstr ""
+msgstr "Faturar Estoque no Envio"
 
 #. module: stock
 #: help:stock.move,state:0
@@ -1632,13 +1663,13 @@ msgid ""
 " When the picking is done the state is 'Done'.              \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
-"Quando o movimento de estoque é criado, estará com status 'Provisório'.\n"
-" Após isto, seu status será 'Não Disponível' se o agendamento não encontrar "
+"Quando o movimento de estoque é criado, estará com situação 'Provisório'.\n"
+"Após isto, sua situação será 'Não Disponível' se o agendamento não encontrar "
 "os produtos.\n"
-" Quando os produtos são reservados, o status será 'Disponível'.\n"
-" Quando a lista de separação estiver pronta, o status será 'Concluído'.      "
-"        \n"
-"O status será 'Aguardando' se o movimento estiver esperando por outro."
+"Quando os produtos são reservados, a situação será 'Disponível'.\n"
+"Quando a lista de separação estiver pronta, a situação será 'Concluído'.     "
+"         \n"
+"A situação será 'Aguardando' se o movimento estiver esperando por outro."
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1682,7 +1713,7 @@ msgstr "Estatísticas de Estoque"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month Planned"
-msgstr ""
+msgstr "Mês Planejado"
 
 #. module: stock
 #: field:product.product,track_production:0
@@ -1692,12 +1723,12 @@ msgstr "Rastrear Lotes de Fabricação"
 #. module: stock
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "É uma Devolução"
 
 #. module: stock
 #: field:stock.location,valuation_out_account_id:0
 msgid "Stock Valuation Account (Outgoing)"
-msgstr ""
+msgstr "Conta de Valorização do Estoque (Saindo)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -1738,7 +1769,7 @@ msgstr "Movimentações Criadas"
 #. module: stock
 #: field:stock.location,valuation_in_account_id:0
 msgid "Stock Valuation Account (Incoming)"
-msgstr ""
+msgstr "Conta de Valorização de Estoque (Entrada)"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
@@ -1753,7 +1784,7 @@ msgstr "Rastreamento de lote"
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Devoluções"
 
 #. module: stock
 #: view:product.product:0 view:product.template:0
@@ -1790,11 +1821,15 @@ msgid ""
 "specific valuation account set on the destination location. When not set on "
 "the product, the one from the product category is used."
 msgstr ""
+"Ao fazer avaliação de estoque em tempo real, itens de diário da "
+"contrapartida para todos os movimentos de saída será lançado nesta conta, a "
+"menos que há uma conta específica de valorização sobre o local de destino. "
+"Quando não definido no produto, o da categoria de produto é usado."
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Day Planned"
-msgstr ""
+msgstr "Dia Planejado"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,date:0
@@ -1819,7 +1854,7 @@ msgstr "Localizacão do Estoque"
 #: code:addons/stock/wizard/stock_inventory_merge.py:64
 #, python-format
 msgid "Merging is only allowed on draft inventories."
-msgstr "Fusões só são permitidas em rascunhos de inventários"
+msgstr "Só é possível mesclar em Inventários Provisórios"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_dashboard_stock
@@ -1858,7 +1893,7 @@ msgstr "Produtos Sucata"
 #: code:addons/stock/stock.py:1157
 #, python-format
 msgid "You cannot remove the picking which is in %s state !"
-msgstr "Você não pode remover separação com status %s !"
+msgstr "Você não pode remover separação com situação %s !"
 
 #. module: stock
 #: view:stock.inventory.line.split:0 view:stock.move.consume:0
@@ -1902,7 +1937,7 @@ msgstr "Informação"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Shipping Address :"
-msgstr "Endereço de Envio :"
+msgstr "Endereço de Entrega :"
 
 #. module: stock
 #: help:stock.location,valuation_in_account_id:0
@@ -1913,6 +1948,11 @@ msgid ""
 "generic Stock Output Account set on the product. This has no effect for "
 "internal locations."
 msgstr ""
+"Usado para avaliação do estoque em tempo real. Quando aparece em um local "
+"virtual (tipo interno não), esta conta será usada para manter o valor de "
+"produtos que estão sendo movidos de um local interno para este local, em vez "
+"da conta Estoque de saída definida no produto. Isto não tem efeito para "
+"locais internos."
 
 #. module: stock
 #: view:stock.return.picking:0
@@ -1932,7 +1972,7 @@ msgstr "Valorização de Inventário"
 #. module: stock
 #: view:stock.move:0
 msgid "Orders planned for today"
-msgstr ""
+msgstr "Ordens planejadas para hoje"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -1972,6 +2012,8 @@ msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
 "Valuation account on category of this product are same."
 msgstr ""
+"Não é possível criar uma entrada no diário, A Conta de Saída definida neste "
+"produto e a Conta de Valorização na categoria deste produto são as mesmas."
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
@@ -1986,17 +2028,17 @@ msgstr "Preço"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
 msgid "stock.return.picking.memory"
-msgstr ""
+msgstr "stock.return.picking.memory"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Search Inventory"
-msgstr "Pesquisar Invetário"
+msgstr "Pesquisar Inventário"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
 msgid "Stock report by tracking lots"
-msgstr ""
+msgstr "Relatório do Estoque por Lotes rastreados"
 
 #. module: stock
 #: code:addons/stock/stock.py:2122
@@ -2053,6 +2095,8 @@ msgid ""
 "This field is for internal purpose. It is used to decide if the column "
 "prodlot has to be shown on the move_ids field or not"
 msgstr ""
+"Este campo é para propósitos internos. É usado para decidir se a coluna do "
+"lote de produto mostrará no campo move_ids ou não"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -2083,7 +2127,7 @@ msgstr "Unidade logística de envio: pallet, caixa, pacote ..."
 #. module: stock
 #: view:stock.location:0
 msgid "Customer Locations"
-msgstr ""
+msgstr "Local do Cliente"
 
 #. module: stock
 #: view:stock.change.product.qty:0 view:stock.change.standard.price:0
@@ -2126,6 +2170,7 @@ msgstr "Criação"
 msgid ""
 "Analysis of current inventory (only moves that have already been processed)"
 msgstr ""
+"Análise do inventário atual (apenas movimentações que já foram processadas)"
 
 #. module: stock
 #: field:stock.partial.move.line,cost:0
@@ -2143,7 +2188,7 @@ msgstr "Conta de Entrada de Estoque"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Shipping type specify, goods coming in or going out"
-msgstr ""
+msgstr "Tipo de transporte especificar, mercadorias entrando ou saindo"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
@@ -2213,7 +2258,7 @@ msgstr "Unidade de Medida"
 #: code:addons/stock/product.py:175
 #, python-format
 msgid "Products: "
-msgstr "Protutos "
+msgstr "Produtos: "
 
 #. module: stock
 #: help:product.product,track_production:0
@@ -2282,7 +2327,7 @@ msgstr "Qtde Futura"
 #. module: stock
 #: field:stock.move,note:0 view:stock.picking:0 field:stock.picking,note:0
 msgid "Notes"
-msgstr "Anotações"
+msgstr "Observações"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
@@ -2293,12 +2338,13 @@ msgstr "Valor"
 #: field:report.stock.move,type:0 field:stock.location,chained_picking_type:0
 #: field:stock.picking,type:0
 msgid "Shipping Type"
-msgstr "Tipo de Movimentação"
+msgstr "Tipo de Envio"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that are Confirmed, Available or Waiting"
 msgstr ""
+"Movimentação de Estoque que estão Confirmadas, Disponíveis ou Aguardando"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_location_open
@@ -2333,7 +2379,7 @@ msgstr "Local onde o sistema estocará os produtos acabados"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be delivered (Available or not)"
-msgstr ""
+msgstr "Estoque a ser entregue (Disponível ou não)"
 
 #. module: stock
 #: view:board.board:0
@@ -2350,6 +2396,12 @@ msgid ""
 "the supplier or the purchase order reference. Then you can confirm all "
 "products received using the buttons on the right of each line."
 msgstr ""
+"Aqui você pode receber os produtos individualmente, independentemente da "
+"ordem de compra ou ordem de separação que eles vêm. Você vai encontrar a "
+"lista de todos os produtos que você está esperando. Depois de receber um "
+"pedido, você pode filtrar com base no nome do fornecedor ou a referência da "
+"ordem de compra. Depois, você pode confirmar todos os produtos recebidos, "
+"utilizando os botões do lado direito de cada linha."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -2376,12 +2428,12 @@ msgstr "Data prevista para separação ser processada"
 #: code:addons/stock/product.py:435
 #, python-format
 msgid "P&L Qty"
-msgstr ""
+msgstr "Qtd P&L"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Pickings to invoice"
-msgstr ""
+msgstr "Separações Interna para faturar"
 
 #. module: stock
 #: view:stock.production.lot:0 field:stock.production.lot,revisions:0
@@ -2402,6 +2454,12 @@ msgid ""
 "current inventory value, and the stock input and stock output account will "
 "hold the counterpart moves for incoming and outgoing products."
 msgstr ""
+"Se a avaliação em tempo real for habilitada para um produto, o sistema "
+"automaticamente fará lançamentos correspondentes na conta de movimentação do "
+"estoque. A variação do inventário definida na categoria de produto irá "
+"representar o valor do estoque atual, e a conta de entrada de estoque e "
+"saída de estoque irá realizar o movimentos de contrapartida para os produtos "
+"de entrada e saída."
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_inventory_report
@@ -2436,6 +2494,15 @@ msgid ""
 "location to the Stock location. Each report can be performed on physical, "
 "partner or virtual locations."
 msgstr ""
+"Definir os locais para refletir a estrutura e organização do armazém. O "
+"OpenERP é capaz de gerenciar os locais físicos (armazéns, prateleiras, "
+"caixa, etc), locais de parceiros (clientes, fornecedores) e locais virtuais "
+"que são a contraparte das operações de ações como os consumos das ordens de "
+"fabricação, estoques, etc Cada operação de ações em OpenERP movimenta os "
+"produtos de um local para outro. Por exemplo, se você receber produtos de um "
+"fornecedor, o OpenERP vai movimentar os produtos a partir do local do "
+"fornecedor para o local de Ações. Cada relatório pode ser executada em "
+"locais do parceiro, locais físicos ou locais virtuais."
 
 #. module: stock
 #: view:stock.invoice.onshipping:0
@@ -2474,7 +2541,7 @@ msgstr "Lista de Separação"
 #: sql_constraint:stock.production.lot:0
 msgid ""
 "The combination of serial number and internal reference must be unique !"
-msgstr "A combinação do serial e referência interna deve ser única !"
+msgstr "A combinação do número de serie e referência interna deve ser única!"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2503,7 +2570,7 @@ msgstr "Localização Fixa"
 #: code:addons/stock/stock.py:2486
 #, python-format
 msgid "Product  '%s' is consumed with '%s' quantity."
-msgstr ""
+msgstr "Produto '% s' é consumido com '% s' quantidade."
 
 #. module: stock
 #: model:product.template,description:stock.product_icecream_product_template
@@ -2514,6 +2581,11 @@ msgid ""
 "ice cream shops, convenience stores, and milk bars, and in individual "
 "servings from small carts or vans at public events."
 msgstr ""
+"Sorvete pode ser produzido em massa e, assim, está amplamente disponível em "
+"partes desenvolvidas do mundo. Sorvete pode ser comprado em embalagens "
+"grandes de supermercados e mercearias, em menores quantidades de "
+"sorveterias, lojas de conveniência, bares e leite, e em porções individuais "
+"de carros pequenos ou vans em eventos públicos."
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -2534,11 +2606,15 @@ msgid ""
 "need this report in order to ensure that the stock of each product is "
 "controlled at least once a year."
 msgstr ""
+"Exibir os últimos inventários feitos em seus produtos é fácil classificá-los "
+"com determinados critérios de filtragem. Se você fizer estoques freqüentes e "
+"parciais, você precisa deste relatório, a fim de garantir que o estoque de "
+"cada produto é controlado pelo menos uma vez por ano."
 
 #. module: stock
 #: model:stock.location,name:stock.location_opening
 msgid "opening"
-msgstr ""
+msgstr "abertura"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -2561,7 +2637,7 @@ msgstr "Aquisição"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
-msgstr ""
+msgstr "Fornecedores Maxtor"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_change_product_qty.py:78
@@ -2584,7 +2660,7 @@ msgstr "Movimentação de Sucata"
 #: model:ir.actions.act_window,name:stock.action_reception_picking_move
 #: model:ir.ui.menu,name:stock.menu_action_pdct_in view:stock.move:0
 msgid "Receive Products"
-msgstr "Produtos para Receber"
+msgstr "Receber Produtos"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_out_picking_move
@@ -2616,12 +2692,13 @@ msgstr "Lote de produção único, será mostrado como: PREFIXO/SERIAL [INT_REF]
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "Your Company"
-msgstr ""
+msgstr "Sua Empresa"
 
 #. module: stock
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
 msgstr ""
+"Você não pode mover os produtos de/para um Local do tipo Visualização"
 
 #. module: stock
 #: help:stock.tracking,active:0
@@ -2659,7 +2736,7 @@ msgstr "Empresa"
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Unit Of Measure"
-msgstr "Unidade De Medida"
+msgstr "Unidade de Medida"
 
 #. module: stock
 #: code:addons/stock/product.py:121
@@ -2696,7 +2773,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.location_delivery_counter
 msgid "Delivery Counter"
-msgstr ""
+msgstr "Contra Entrega"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,prodlot_id:0
@@ -2713,7 +2790,7 @@ msgstr "Número do Lote de Produção"
 #: code:addons/stock/stock.py:2697
 #, python-format
 msgid "Inventory '%s' is done."
-msgstr ""
+msgstr "Inventário '%s' concluído"
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -2742,7 +2819,7 @@ msgstr "Endereço de Contato :"
 #. module: stock
 #: field:stock.move,backorder_id:0
 msgid "Back Order"
-msgstr "Ordem de Compra"
+msgstr "Devolução"
 
 #. module: stock
 #: field:stock.incoterms,active:0 field:stock.location,active:0
@@ -2766,7 +2843,7 @@ msgstr "Erro, nenhum parceiro !"
 #: field:stock.inventory.line.split.lines,wizard_id:0
 #: field:stock.move.split.lines,wizard_id:0
 msgid "Parent Wizard"
-msgstr ""
+msgstr "Assistente Pai"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
@@ -2779,7 +2856,7 @@ msgstr "Inconterms"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking_line
 msgid "stock.partial.picking.line"
-msgstr ""
+msgstr "stock.partial.picking.line"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
@@ -2810,7 +2887,7 @@ msgstr ""
 #. module: stock
 #: field:stock.inventory,name:0
 msgid "Inventory Reference"
-msgstr "Referência de Invetário"
+msgstr "Referência de Inventário"
 
 #. module: stock
 #: code:addons/stock/stock.py:1334
@@ -2821,7 +2898,7 @@ msgstr "Separação interna"
 #. module: stock
 #: view:stock.location.product:0
 msgid "Open Product"
-msgstr ""
+msgstr "Abrir Produto"
 
 #. module: stock
 #: field:stock.location.product,to_date:0
@@ -2848,7 +2925,7 @@ msgstr "Armazém"
 #. module: stock
 #: view:stock.inventory:0
 msgid "Confirm Inventory"
-msgstr "Confirmar Estoque"
+msgstr "Confirmar Inventário"
 
 #. module: stock
 #: view:product.category:0
@@ -2883,7 +2960,7 @@ msgstr "Locais Virtuais"
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "To Be Invoiced"
-msgstr "Para Ser Faturado"
+msgstr "Para ser Faturado"
 
 #. module: stock
 #: field:stock.inventory,date_done:0
@@ -2925,7 +3002,7 @@ msgstr "Análises de Inventário"
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
 msgid "Destination Journal"
-msgstr "Diário de destino"
+msgstr "Diário de Destino"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
@@ -2966,7 +3043,7 @@ msgstr "Faturamento"
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Internal Moves"
-msgstr ""
+msgstr "Movimentação Interna Atribuída"
 
 #. module: stock
 #: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
@@ -2978,7 +3055,7 @@ msgstr "Por favor, entre com a Quantidade Adequada !"
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
-msgstr "Unidade de venda do Produto"
+msgstr "UdV do Produto"
 
 #. module: stock
 #: field:stock.location,posz:0
@@ -3000,7 +3077,7 @@ msgstr "Estoque Insuficiente no Lote !"
 #. module: stock
 #: field:stock.location,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "Próximo pai"
 
 #. module: stock
 #: field:stock.picking,address_id:0
@@ -3035,12 +3112,12 @@ msgstr "Produtos por Categoria"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Waiting Another Operation"
-msgstr ""
+msgstr "Aguardando outra Operação"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Supplier Locations"
-msgstr ""
+msgstr "Local do Fornecedor"
 
 #. module: stock
 #: field:stock.partial.move.line,wizard_id:0
@@ -3052,7 +3129,7 @@ msgstr "Assistente"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Completed Stock-Moves"
-msgstr ""
+msgstr "Movimentação de Estoque completa"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -3080,6 +3157,13 @@ msgid ""
 "preconfigured logistics rules, but you can also record manual stock "
 "operations."
 msgstr ""
+"Movimentações internas exibem todas as operações de inventário você tem que "
+"executar no seu armazém. Todas as operações podem ser classificados em "
+"diários de estoque, de modo que cada trabalhador tem a sua própria lista de "
+"operações para realizar em seu próprio diário. A maioria das operações são "
+"preparadas automaticamente pelo OpenERP acordo com as regras pré-"
+"configuradas de logística, mas você também pode gravar operações de ações "
+"manuais."
 
 #. module: stock
 #: view:stock.move:0
@@ -3089,7 +3173,7 @@ msgstr "Pedido"
 #. module: stock
 #: view:product.product:0
 msgid "Cost Price :"
-msgstr ""
+msgstr "Preço de Custo :"
 
 #. module: stock
 #: field:stock.tracking,name:0
@@ -3106,17 +3190,17 @@ msgstr "Local de Origem"
 #. module: stock
 #: view:stock.move:0
 msgid " Waiting"
-msgstr ""
+msgstr " Aguardando"
 
 #. module: stock
 #: view:product.template:0
 msgid "Accounting Entries"
-msgstr "Lançamentos de Contas"
+msgstr "Lançamentos Contábeis"
 
 #. module: stock
 #: model:res.groups,name:stock.group_stock_manager
 msgid "Manager"
-msgstr ""
+msgstr "Gerente"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -3224,12 +3308,12 @@ msgstr "Motivo"
 #. module: stock
 #: model:product.template,name:stock.product_icecream_product_template
 msgid "Ice Cream"
-msgstr ""
+msgstr "Sorvete"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Assistente de Separação Parcial"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
@@ -3241,6 +3325,12 @@ msgid ""
 "'Available' button to get all the lots you produced, received or delivered "
 "to customers."
 msgstr ""
+"Esta é a lista de todos os lotes de produção (número de série) que você "
+"gravou. Quando você seleciona um lote, você pode obter a rastreabilidade a "
+"anterior ou posterior dos produtos contidos no lote. Por padrão, a lista é "
+"filtrada sobre os números de série que estão disponíveis no seu armazém, mas "
+"você pode desmarcar o botão 'Disponível' para obter todos os lotes que você "
+"produziu, recebeu ou entregou a clientes."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -3276,6 +3366,11 @@ msgid ""
 "default value for all products in this category. It can also directly be set "
 "on each product"
 msgstr ""
+"Ao fazer uma avaliação de estoque em tempo real, itens de contrapartida "
+"diário para todos os movimentos de ações de saída serão lançados nesta "
+"conta, a menos que exista uma conta específica de valorização sobre o local "
+"de destino. Este é o valor padrão para todos os produtos desta categoria. "
+"Ela também pode ser definida diretamente em cada produto"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
@@ -3312,7 +3407,7 @@ msgstr "Cancelada"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Delivery Orders"
-msgstr ""
+msgstr "Ordens de Entrega Confirmadas"
 
 #. module: stock
 #: view:stock.move:0 field:stock.partial.move,picking_id:0
@@ -3354,6 +3449,16 @@ msgid ""
 "* Fixed Location: The chained location is taken from the next field: Chained "
 "Location if Fixed."
 msgstr ""
+"Determina se essa localização é encadeada a outro local, ou seja, qualquer "
+"produto de entrada neste local\n"
+"devem em seguida ir para o local encadeado. A localização encadeada é "
+"determinado de acordo com o tipo:\n"
+"* Nenhuma: Nenhuma encadeamento em tudo\n"
+"* Cliente: O local encadeado vai ser retirado do campo Localização Cliente "
+"no formulário de Parceiro do parceiro que é especificado na lista de "
+"separação dos produtos recebidos.\n"
+"* Local Fixo: A localização encadeada é retirada do seguinte campo: "
+"Localização Encadeada se Fixo."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:43
@@ -3386,7 +3491,7 @@ msgstr "Ordens de Entrega"
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders already processed"
-msgstr ""
+msgstr "Ordens de entrega já processada"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -3446,7 +3551,7 @@ msgstr "Separações Relacionadas"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Year Planned"
-msgstr ""
+msgstr "Ano Planejado"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3456,7 +3561,7 @@ msgstr "Quantidade total saindo"
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "New"
-msgstr ""
+msgstr "Novo"
 
 #. module: stock
 #: help:stock.partial.move.line,cost:0 help:stock.partial.picking.line,cost:0
@@ -3490,18 +3595,18 @@ msgstr "Quantidade para deixar na embalagem atual"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock available to be delivered"
-msgstr ""
+msgstr "Estoque disponível para ser entregue"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 #: view:stock.invoice.onshipping:0
 msgid "Create invoice"
-msgstr "Criar Nota Fiscal"
+msgstr "Criar Fatura"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Internal Moves"
-msgstr ""
+msgstr "Movimentos Internos Confirmados"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -3528,6 +3633,11 @@ msgid ""
 "If cost price is decreased, stock variation account will be creadited and "
 "stock input account will be debited."
 msgstr ""
+"Se o preço de custo aumenta, a conta da variação estoque será debitado e "
+"conta saída de estoque será creditado com o valor = (diferença de quantidade "
+"quantidade disponível *).\n"
+"Se o preço de custo é diminui, a conta variação de estoque será creditada e "
+"conta a entrada estoque será debitado."
 
 #. module: stock
 #: field:stock.location,chained_journal_id:0
@@ -3537,7 +3647,7 @@ msgstr "Diário de Encadeamentos"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 msgid "Packing list"
-msgstr "Packing List"
+msgstr "Romaneio"
 
 #. module: stock
 #: code:addons/stock/stock.py:738
@@ -3553,7 +3663,7 @@ msgstr "Clientes"
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "Waiting Availability"
-msgstr ""
+msgstr "Aguardando Disponibilidade"
 
 #. module: stock
 #: code:addons/stock/stock.py:1347
@@ -3569,7 +3679,7 @@ msgstr "Linhas de Inventário de Estoque"
 #. module: stock
 #: view:stock.move:0
 msgid "Waiting "
-msgstr ""
+msgstr "Aguardando "
 
 #. module: stock
 #: code:addons/stock/product.py:427
@@ -3605,7 +3715,7 @@ msgstr "Peso"
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
 msgid "Product Template"
-msgstr "Template de Produto"
+msgstr "Modelo de Produto"
 
 #. module: stock
 #: selection:report.stock.move,month:0
@@ -3615,7 +3725,7 @@ msgstr "Dezembro"
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Available Product Lots"
-msgstr ""
+msgstr "Lotes de Produto Disponíveis"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_move_form2
@@ -3652,7 +3762,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_fill_inventory.py:53
 #, python-format
 msgid "Stock Inventory is already Validated."
-msgstr ""
+msgstr "O Inventário do Estoque já está validado."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
@@ -3667,12 +3777,12 @@ msgstr "Faturado"
 #. module: stock
 #: field:stock.picking,max_date:0
 msgid "Max. Expected Date"
-msgstr "Máx. Data Prevista"
+msgstr "Data Prevista Máx."
 
 #. module: stock
 #: field:stock.picking,auto_picking:0
 msgid "Auto-Picking"
-msgstr "Auto-Separação"
+msgstr "Separação Automática"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
@@ -3696,7 +3806,7 @@ msgstr "Interno"
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0 selection:stock.inventory,state:0
 msgid "Draft"
-msgstr "Rascunho"
+msgstr "Provisório"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
@@ -3759,7 +3869,7 @@ msgstr "Coloque zero"
 #. module: stock
 #: model:res.groups,name:stock.group_stock_user
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
@@ -3846,6 +3956,9 @@ msgid ""
 "click on a location to get the list of the products and their stock level in "
 "this particular location and all its children."
 msgstr ""
+"Esta é a estrutura de armazéns da sua empresa e locais. Você pode clicar em "
+"um local para obter a lista dos produtos e seu nível de estoque, neste local "
+"em particular e todos os seus filhos."
 
 #. module: stock
 #: model:res.request.link,name:stock.req_link_tracking
@@ -3877,7 +3990,7 @@ msgstr "Para faturar"
 #: model:ir.actions.act_window,name:stock.action_location_form
 #: model:ir.ui.menu,name:stock.menu_action_location_form view:stock.picking:0
 msgid "Locations"
-msgstr "Localizações"
+msgstr "Locais"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3907,6 +4020,10 @@ msgid ""
 "specific valuation account set on the source location. When not set on the "
 "product, the one from the product category is used."
 msgstr ""
+"Ao fazer avaliação de estoque em tempo real, itens de diário de "
+"contrapartida para toda movimentação recebidas serão publicadas nesta conta, "
+"a menos que há um conta de avaliação específica no local de origem. Quando "
+"não definido no produto, o da categoria de produto é usado."
 
 #. module: stock
 #: view:stock.move:0 field:stock.partial.move,move_ids:0
@@ -3949,12 +4066,12 @@ msgstr "Produção"
 #. module: stock
 #: view:stock.split.into:0
 msgid "Split Move"
-msgstr "Movimento de Divisão"
+msgstr "Dividir Movimentação"
 
 #. module: stock
 #: field:stock.picking,backorder_id:0
 msgid "Back Order of"
-msgstr ""
+msgstr "Devolução de"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:106
@@ -3969,7 +4086,7 @@ msgstr ""
 #. module: stock
 #: view:report.stock.move:0
 msgid "Future Stock-Moves"
-msgstr ""
+msgstr "Movimentação Futura de Estoque"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
@@ -3980,7 +4097,7 @@ msgstr "Dividir em Lotes de Produção"
 #: code:addons/stock/wizard/stock_move.py:213
 #, python-format
 msgid "Processing Error"
-msgstr ""
+msgstr "Erro de Processamento"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -4053,12 +4170,12 @@ msgstr "Identificação do Lote de Produção"
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator_small
 msgid "Small Refrigerator"
-msgstr ""
+msgstr "Refrigerador Pequeno"
 
 #. module: stock
 #: model:stock.location,name:stock.location_convenience_shop
 msgid "Convenient Store"
-msgstr ""
+msgstr "Loja de Conveniência"
 
 #. module: stock
 #: field:stock.location,scrap_location:0 view:stock.move.scrap:0
@@ -4091,7 +4208,7 @@ msgstr "Data faturada"
 #: code:addons/stock/wizard/stock_return_picking.py:189
 #, python-format
 msgid "Warning !"
-msgstr "Atenção !"
+msgstr "Aviso!"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
@@ -4104,11 +4221,13 @@ msgid ""
 "By default, the pack reference is generated following the sscc standard. "
 "(Serial number + 1 check digit)"
 msgstr ""
+"Por padrão, o pacote de referência é gerado seguindo o padrão SSCC. (Número "
+"de série + 1 dígito de verificação)"
 
 #. module: stock
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:159
@@ -4118,6 +4237,9 @@ msgid ""
 "would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is "
 "accepted by the uom."
 msgstr ""
+"O arredondamento da UdM inicial não permite que você envie \"% s% s\", como "
+"seria deixar uma quantidade de \"% s% s\" para enviar se apenas "
+"arredondamentos de \"% s% s\" são aceito pela UdM."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_move.py:213
@@ -4125,11 +4247,13 @@ msgstr ""
 msgid ""
 "Production lot quantity %d of %s is larger than available quantity (%d) !"
 msgstr ""
+"A quantidade no Lote de Produção %d de %s é maior do que a quantidade "
+"disponível (%d) !"
 
 #. module: stock
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Erro! Você não pode criar categorias recursivas."
 
 #. module: stock
 #: help:stock.move,move_dest_id:0
@@ -4150,7 +4274,7 @@ msgstr "Localizações Físicas"
 #. module: stock
 #: view:stock.picking:0 selection:stock.picking,state:0
 msgid "Ready to Process"
-msgstr ""
+msgstr "Pronto para Processar"
 
 #. module: stock
 #: help:stock.location,posx:0 help:stock.location,posy:0
diff --git a/addons/stock/i18n/ro.po b/addons/stock/i18n/ro.po
index 21bd27472f3..7fde5b361ad 100644
--- a/addons/stock/i18n/ro.po
+++ b/addons/stock/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 104c6ca334f..b67cddb846b 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:04+0000\n"
+"PO-Revision-Date: 2012-09-20 14:52+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -24,7 +24,7 @@ msgstr "Отслеживать исходящие партии"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
 msgid "Stock move Split lines"
-msgstr ""
+msgstr "Строки разбиения перемещения запаса"
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -35,6 +35,10 @@ msgid ""
 "value for all products in this category. It can also directly be set on each "
 "product"
 msgstr ""
+"При проведении оценки инвентаризации в реальном времени, корреспондирующие "
+"элементы журнала для всех входящих перемещений запасов будут отправлены на "
+"этот счёт, если нет конкретного счёта заданного по исходному месту хранения. "
+"Его также можно установить непосредственно для каждого продукта."
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
@@ -160,8 +164,8 @@ msgid ""
 "This is the list of all delivery orders that have to be prepared, according "
 "to your different sales orders and your logistics rules."
 msgstr ""
-"Это список всех заказов на доставку, которые были приготовлены в "
-"соответствии с вашими заказами на продажу и правилами логистики."
+"Это список всех заказов доставки, которые были приготовлены в соответствии с "
+"вашими заказами продаж и правилами логистики."
 
 #. module: stock
 #: view:report.stock.move:0 field:report.stock.move,day:0
@@ -185,7 +189,7 @@ msgstr "Физические инвентаризации"
 #: field:product.category,property_stock_journal:0 view:report.stock.move:0
 #: field:stock.change.standard.price,stock_journal:0
 msgid "Stock journal"
-msgstr "Складская книга"
+msgstr "Складской журнал"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:report.stock.move:0
@@ -196,7 +200,7 @@ msgstr "Текущий месяц"
 #: code:addons/stock/wizard/stock_move.py:222
 #, python-format
 msgid "Unable to assign all lots to this move!"
-msgstr "Невозможно связать все лоты к этой записи!"
+msgstr "Невозможно назначить все партии для этого перемещения!"
 
 #. module: stock
 #: code:addons/stock/stock.py:2516
@@ -219,12 +223,12 @@ msgstr "Вы не можете удалить любую запись!"
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders to invoice"
-msgstr "Заказы на доставку для оплаты"
+msgstr "Заказы доставки для оплаты"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Delivery Orders"
-msgstr "Назначенные заказы на доставку"
+msgstr "Назначенные заказы доставки"
 
 #. module: stock
 #: field:stock.partial.move.line,update_cost:0
@@ -267,14 +271,14 @@ msgstr "Поступающие товары"
 #. module: stock
 #: view:report.stock.lines.date:0
 msgid "Non Inv"
-msgstr ""
+msgstr "Не инв."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_traceability.py:54
 #: view:stock.production.lot:0
 #, python-format
 msgid "Downstream Traceability"
-msgstr "Слежение за нижестоящим"
+msgstr "Нисходящее отслеживание"
 
 #. module: stock
 #: view:stock.move:0 field:stock.move,picking_id:0 field:stock.picking,name:0
@@ -389,7 +393,8 @@ msgid ""
 "'To' date)"
 msgstr ""
 "(оставьте пустым для открытия текущей ситуации. Установите HH:MM:SS на "
-"00:00:00 для фильтрации всех ресурсов дня с"
+"00:00:00 для фильтрации всех ресурсов дня с даты 'От' и 23:59:59 для даты "
+"'До')"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,state:0
@@ -470,7 +475,7 @@ msgstr "Разделить на"
 #. module: stock
 #: view:stock.location:0
 msgid "Internal Locations"
-msgstr "Внутренние помещения"
+msgstr "Внутренние места хранения"
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
@@ -484,7 +489,7 @@ msgid ""
 "will hold the current value of the products."
 msgstr ""
 "При оценке запасов в реальном времени, этот счет будет содержать текущую "
-"оценку стоимости ТМЦ"
+"оценку стоимости ТМЦ."
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0 field:stock.location,usage:0
@@ -554,7 +559,7 @@ msgstr "Место назначения"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move_line
 msgid "stock.partial.move.line"
-msgstr ""
+msgstr "stock.partial.move.line"
 
 #. module: stock
 #: code:addons/stock/stock.py:760
@@ -576,7 +581,7 @@ msgstr "Заказ(Происхождение)"
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
 msgid "Grand Total:"
-msgstr "Общий итог"
+msgstr "Общий итог:"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_out_picking_move
@@ -589,8 +594,7 @@ msgstr ""
 "Вы найдете в этом списке все ТМЦ, которые Вы должны отгрузить своим "
 "клиентам. Вы можете обработать отгрузки непосредственно из этого списка с "
 "помощью кнопки справа в каждой строке. Вы можете фильтровать ТМЦ для "
-"отгрузки по клиентам, по ТМЦ или заказам на продажу (используя поле "
-"Источник)."
+"отгрузки по клиентам, по ТМЦ или заказам продаж (используя поле Источник)."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
@@ -626,7 +630,7 @@ msgstr "Дополнительная ссылка"
 #. module: stock
 #: view:stock.production.lot.revision:0
 msgid "Production Lot Revisions"
-msgstr "Revisões do lote de producão"
+msgstr "Ревизии партии производства"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_journal_form
@@ -678,13 +682,13 @@ msgid ""
 msgstr ""
 "Поступающие грузы, это список всех заказов, которые вы ожидаете к получению "
 "от ваших поставщиков. Поступающий груз содержит список товаров, которые "
-"должны быть получены согласно заказу на поставку. Вы можете проверить груз "
+"должны быть получены согласно заказу закупки. Вы можете проверить груз "
 "полностью или частично."
 
 #. module: stock
 #: field:stock.move.split.lines,wizard_exist_id:0
 msgid "Parent Wizard (for existing lines)"
-msgstr ""
+msgstr "Родительский мастер (для существующих позиций)"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -698,6 +702,7 @@ msgid ""
 "There is no inventory Valuation account defined on the product category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Не определен счет оценки запасов для категории продукта: \"%s\" (id: %d)"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -817,7 +822,7 @@ msgstr ""
 #: code:addons/stock/product.py:75
 #, python-format
 msgid "Valuation Account is not specified for Product Category: %s"
-msgstr "Переоценочный счет не указан для категории продукта: %s"
+msgstr "СЧёт оценки не определён для категории продукта: %s"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
@@ -895,13 +900,13 @@ msgstr "неизвестно"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
 msgid "Merge Inventory"
-msgstr ""
+msgstr "Объединить инвентаризацию"
 
 #. module: stock
 #: code:addons/stock/product.py:433
 #, python-format
 msgid "Future P&L"
-msgstr ""
+msgstr "Будущие п/у"
 
 #. module: stock
 #: view:board.board:0
@@ -909,7 +914,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:stock.action_picking_tree4
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4 view:stock.picking:0
 msgid "Incoming Shipments"
-msgstr "Поступающие грузы"
+msgstr "Поступающие ТМЦ"
 
 #. module: stock
 #: view:report.stock.inventory:0 view:stock.move:0 view:stock.picking:0
@@ -950,7 +955,7 @@ msgstr "Искать упаковку"
 #. module: stock
 #: view:stock.picking:0
 msgid "Pickings already processed"
-msgstr "Сортировка уже осуществлена"
+msgstr "Комплектование уже осуществлено"
 
 #. module: stock
 #: field:stock.partial.move.line,currency:0
@@ -1033,7 +1038,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Pickings"
-msgstr "Подтвержденные сортировки"
+msgstr "Подтверждённые комплектования"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -1059,7 +1064,7 @@ msgstr ""
 #. module: stock
 #: field:product.category,property_stock_valuation_account_id:0
 msgid "Stock Valuation Account"
-msgstr ""
+msgstr "Счёт оценки запасов"
 
 #. module: stock
 #: code:addons/stock/stock.py:1349
@@ -1154,7 +1159,7 @@ msgstr "Автор"
 #: code:addons/stock/stock.py:1332
 #, python-format
 msgid "Delivery Order"
-msgstr "Заказ на доставку"
+msgstr "Заказ доставки"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
@@ -1173,8 +1178,8 @@ msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
 "entries."
 msgstr ""
-"В случае отмены этой инвентаризации, вам необходимо сначала удалить "
-"связанные записи в журнале"
+"Для отмены этой инвентаризации, вам необходимо сначала удалить связанные "
+"записи в журнале"
 
 #. module: stock
 #: field:stock.picking,date_done:0
@@ -1233,6 +1238,9 @@ msgid ""
 "empty to automatically detect the type based on the source and destination "
 "locations)."
 msgstr ""
+"Тип доставки из комплектовочного листа, который будет содержать сцепленное "
+"перемещение (оставьте пустым для автоматического определения типа на основе "
+"исходного и целевого мест хранения)."
 
 #. module: stock
 #: view:stock.move.split:0
@@ -1291,6 +1299,12 @@ 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
 #: view:stock.tracking:0
@@ -1300,7 +1314,7 @@ msgstr "Идентификация упаковки"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Packing List:"
-msgstr "Упаковочный перечень"
+msgstr "Упаковочный лист:"
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -1345,6 +1359,9 @@ msgid ""
 "This is the list of all your packs. When you select a Pack, you can get the "
 "upstream or downstream traceability of the products contained in the pack."
 msgstr ""
+"Это список всех ваших упаковок. Когда вы выбираете упаковку, вы можете "
+"получить восходящую или нисходящую отслеживаемость продуктов содержащихся в "
+"упаковке."
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -1423,7 +1440,7 @@ msgstr "Внутренний комплектовочный лист"
 #: selection:report.stock.inventory,state:0
 #: selection:report.stock.move,state:0 view:stock.picking:0
 msgid "Waiting"
-msgstr "В ожидании"
+msgstr "Ожидание"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -1449,7 +1466,7 @@ msgstr "Тип"
 #. module: stock
 #: view:stock.picking:0
 msgid "Available Pickings"
-msgstr ""
+msgstr "Доступные комплектования"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
@@ -1459,7 +1476,7 @@ msgstr "Общие поставщики ИТ"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be receive"
-msgstr ""
+msgstr "Запас для получения"
 
 #. module: stock
 #: help:stock.location,valuation_out_account_id:0
@@ -1470,6 +1487,11 @@ msgid ""
 "the generic Stock Output Account set on the product. This has no effect for "
 "internal locations."
 msgstr ""
+"Используется для оценки инвентаризации в реальном времени. Когда задан по "
+"виртуальному месту хранения (не внутреннего типа), этот счёт будет "
+"использован для хранения значения продуктов перемещённых из этого места "
+"хранения во внутреннее место хранения, вместо заданного исходящего счёта в "
+"товаре. Это не оказывает влияния на внутренние места хранения."
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1513,7 +1535,7 @@ msgstr "Вы можете удалить только черновик пере
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line_split_lines
 msgid "Inventory Split lines"
-msgstr ""
+msgstr "Строки разбития инвентаризации"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
@@ -1529,12 +1551,12 @@ msgstr "Общая информация"
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Analysis including future moves (similar to virtual stock)"
-msgstr ""
+msgstr "Анализ включающий будущие перемещения (подобно виртуальным остаткам)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
 msgid "Downstream traceability"
-msgstr "Отслеживание вниз"
+msgstr "Нисходящее отслеживание"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:112
@@ -1563,7 +1585,7 @@ msgstr "Дата заказа"
 #: code:addons/stock/wizard/stock_change_product_qty.py:88
 #, python-format
 msgid "INV: %s"
-msgstr ""
+msgstr "ИНВ: %s"
 
 #. module: stock
 #: view:stock.location:0 field:stock.location,location_id:0
@@ -1584,7 +1606,7 @@ msgstr ""
 "* Черновик: не подтверждено и не будет запланировано до подтверждения\n"
 "* Подтверждено: в ожидании доступных ТМЦ\n"
 "* Доступно: ТМЦ зарезервированы, ожидание подтверждения.\n"
-"* В ожидании: ожидает другого перемещения, перед тем, как станет доступно "
+"* Ожидание: ожидает другого перемещения, перед тем, как станет доступно "
 "автоматически (например, изготовить на заказ)\n"
 "* Сделано: было обработано, больше не может быть изменено или отменено\n"
 "* Отменено: было отменено, больше не может быть подтверждено"
@@ -1618,7 +1640,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_stock_invoice_onshipping
 msgid "Stock Invoice Onshipping"
-msgstr ""
+msgstr "Счёт по доставке"
 
 #. module: stock
 #: help:stock.move,state:0
@@ -1635,7 +1657,7 @@ msgstr ""
 "ТМЦ.\n"
 " Когда ТМЦ зарезервированы состояние \"Доступно\".\n"
 " Когда комплектование выполнено, то состояние \"Сделано\".\n"
-"Состояние \"В ожидании\", если перемещение ожидает другого перемещения."
+"Состояние \"Ожидание\", если перемещение ожидает другого перемещения."
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -1679,7 +1701,7 @@ msgstr "Статистика запасов"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month Planned"
-msgstr ""
+msgstr "Плановый месяц"
 
 #. module: stock
 #: field:product.product,track_production:0
@@ -1689,12 +1711,12 @@ msgstr "Отслеживать производимые партии"
 #. module: stock
 #: view:stock.picking:0
 msgid "Is a Back Order"
-msgstr ""
+msgstr "Является дозаказом"
 
 #. module: stock
 #: field:stock.location,valuation_out_account_id:0
 msgid "Stock Valuation Account (Outgoing)"
-msgstr ""
+msgstr "Счёт оценки запасов (исходящих)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -1735,7 +1757,7 @@ msgstr "Созданные перемещения товаров"
 #. module: stock
 #: field:stock.location,valuation_in_account_id:0
 msgid "Stock Valuation Account (Incoming)"
-msgstr ""
+msgstr "Счёт оценки запаса (входяшего)"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
@@ -1750,7 +1772,7 @@ msgstr "Отслеживаемая партия"
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Дозаказы"
 
 #. module: stock
 #: view:product.product:0 view:product.template:0
@@ -1787,11 +1809,15 @@ msgid ""
 "specific valuation account set on the destination location. When not set on "
 "the product, the one from the product category is used."
 msgstr ""
+"При проведении оценки инвентаризации в реальном времени, корреспондирующие "
+"элементы журнала для всех исходящих перемещений будут помещены на этот счёт, "
+"если нет задан счёт в месте назначения. Его также можно установить "
+"непосредственно для каждого продукта."
 
 #. module: stock
 #: view:report.stock.move:0
 msgid "Day Planned"
-msgstr ""
+msgstr "Запланированный день"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,date:0
@@ -1872,7 +1898,7 @@ msgstr "Разукомплектовать"
 #. module: stock
 #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 msgid "Split in production lots"
-msgstr "Разделить партию по отдельным серийным номерам"
+msgstr "Разделить в партии производства"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_location
@@ -1910,6 +1936,11 @@ msgid ""
 "generic Stock Output Account set on the product. This has no effect for "
 "internal locations."
 msgstr ""
+"Используется для оценки инвентаризации в реальном времени. Когда задан по "
+"виртуальному месту хранения (не внутреннего типа), этот счёт будет "
+"использован для хранения значения продуктов перемещённых из внутреннего "
+"места хранения в это место хранения, вместо заданного исходящего счёта в "
+"товаре. Это не оказывает влияния на внутренние места хранения."
 
 #. module: stock
 #: view:stock.return.picking:0
@@ -1929,7 +1960,7 @@ msgstr "Оценка запасов"
 #. module: stock
 #: view:stock.move:0
 msgid "Orders planned for today"
-msgstr ""
+msgstr "Документы запланированные на сегодня"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -1969,6 +2000,8 @@ msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
 "Valuation account on category of this product are same."
 msgstr ""
+"Невозможно создать запись журнала, определённый для этого продукта счёт "
+"выхода и счёт оценки по категории этого продукта один и тот же."
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
@@ -1983,7 +2016,7 @@ msgstr "Цена"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
 msgid "stock.return.picking.memory"
-msgstr ""
+msgstr "stock.return.picking.memory"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2048,6 +2081,8 @@ msgid ""
 "This field is for internal purpose. It is used to decide if the column "
 "prodlot has to be shown on the move_ids field or not"
 msgstr ""
+"Это поле для внутренних целей. Оно используется для принятия решения должна "
+"ли быть показана колонка prodlot в поле move_ids или нет"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -2078,7 +2113,7 @@ msgstr "Логистическая единица: поддон, ящик, уп
 #. module: stock
 #: view:stock.location:0
 msgid "Customer Locations"
-msgstr ""
+msgstr "Места хранения заказчиков"
 
 #. module: stock
 #: view:stock.change.product.qty:0 view:stock.change.standard.price:0
@@ -2107,6 +2142,9 @@ msgid ""
 "Inventory Journal in which the chained move will be written, if the Chaining "
 "Type is not Transparent (no journal is used if left empty)"
 msgstr ""
+"Журнал инвентаризации, в который будет записано сцеплённое перемещение, если "
+"тип сцепления - не прозрачный (нет используемого журнала, если оставить "
+"пустым)"
 
 #. module: stock
 #: view:stock.move:0
@@ -2118,6 +2156,8 @@ msgstr "Создание"
 msgid ""
 "Analysis of current inventory (only moves that have already been processed)"
 msgstr ""
+"Анализ текущей инвентаризации (только перемещения, которые уже были "
+"обработаны)"
 
 #. module: stock
 #: field:stock.partial.move.line,cost:0
@@ -2135,7 +2175,7 @@ msgstr "Счет стоимости входящих ТМЦ"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Shipping type specify, goods coming in or going out"
-msgstr ""
+msgstr "Тип доставки определяет приходящие или уходящие товары."
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
@@ -2156,7 +2196,7 @@ msgstr "Шаги не добавляются автоматически"
 #. module: stock
 #: view:stock.location.product:0
 msgid "Stock Location Analysis"
-msgstr "Анализ места хранения ТМЦ"
+msgstr "Анализ места хранения"
 
 #. module: stock
 #: help:stock.move,date:0
@@ -2172,7 +2212,7 @@ msgstr ""
 #: view:stock.inventory:0 view:stock.move:0 view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "Group By..."
-msgstr "Объединять по..."
+msgstr "Группировать по ..."
 
 #. module: stock
 #: view:stock.location:0
@@ -2289,7 +2329,7 @@ msgstr "Тип поставки"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that are Confirmed, Available or Waiting"
-msgstr ""
+msgstr "Перемещения которые подтверждены, доступны или в ожидании"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_location_open
@@ -2324,13 +2364,13 @@ msgstr "Место хранения, где система будет храни
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be delivered (Available or not)"
-msgstr ""
+msgstr "Товар для доставки (доступный или нет)"
 
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_stock_outgoing_product_delay
 msgid "Outgoing Products"
-msgstr "Изделия к отправке"
+msgstr "Исходящие ТМЦ"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_reception_picking_move
@@ -2342,10 +2382,10 @@ msgid ""
 "products received using the buttons on the right of each line."
 msgstr ""
 "Здесь вы можете принимать отдельные ТМЦ, независимо от того откуда они "
-"взялись, из заказа на закупку или на комплектование. Вы найдете список всех "
-"ТМЦ, которые вы ждете. При получении заказа, вы можете фильтровать по "
-"названию поставщика или по описанию заказа на закупку. Затем, вы можете "
-"подтвердить получение всех ТМЦ с помощью кнопок справа в каждой строке."
+"взялись, из заказа закупки или  комплектования. Вы найдете список всех ТМЦ, "
+"которые вы ждете. При получении заказа, вы можете фильтровать по названию "
+"поставщика или по описанию заказа закупки. Затем, вы можете подтвердить "
+"получение всех ТМЦ с помощью кнопок справа в каждой строке."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -2372,12 +2412,12 @@ msgstr "Ожидаемая дата обработки комплектован
 #: code:addons/stock/product.py:435
 #, python-format
 msgid "P&L Qty"
-msgstr ""
+msgstr "Кол-во п/у"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Pickings to invoice"
-msgstr ""
+msgstr "Внутренние комплектования для счёта"
 
 #. module: stock
 #: view:stock.production.lot:0 field:stock.production.lot,revisions:0
@@ -2514,7 +2554,7 @@ msgstr "Определенное место хранения"
 #: code:addons/stock/stock.py:2486
 #, python-format
 msgid "Product  '%s' is consumed with '%s' quantity."
-msgstr ""
+msgstr "Товар  '%s' израсходован в количестве '%s'."
 
 #. module: stock
 #: model:product.template,description:stock.product_icecream_product_template
@@ -2525,6 +2565,12 @@ msgid ""
 "ice cream shops, convenience stores, and milk bars, and in individual "
 "servings from small carts or vans at public events."
 msgstr ""
+"Мороженое может быть массово произведено и таким образом широко доступно в "
+"развитых частях мира. Мороженое может быть поставлено в больших коробках "
+"(баках и брикетах) из супермаркетов и продуктовых магазинов, в меньших "
+"количествах из магазинов мороженого, палаток и молочных баров, а в "
+"индивидуальном обслуживании из малых пакетов или стаканчиков на публичных "
+"мероприятиях."
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -2553,7 +2599,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.location_opening
 msgid "opening"
-msgstr ""
+msgstr "открытие"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
@@ -2576,14 +2622,14 @@ msgstr "Снабжение"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_4
 msgid "Maxtor Suppliers"
-msgstr ""
+msgstr "Поставщики Maxtor"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_change_product_qty.py:78
 #: code:addons/stock/wizard/stock_change_standard_price.py:107
 #, python-format
 msgid "Active ID is not set in Context"
-msgstr ""
+msgstr "Действующий ID не задан в контексте"
 
 #. module: stock
 #: view:stock.picking:0
@@ -2638,7 +2684,7 @@ msgstr "Ваша компания"
 #. module: stock
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Нельзя переместить ТМЦ в/из место хранения типа вид."
 
 #. module: stock
 #: help:stock.tracking,active:0
@@ -2707,13 +2753,13 @@ msgstr "Полная инвентаризация"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
-"Ошибка. ед.изм. по умолчанию и закупочные ед.изм. должны иметь одинаковую "
+"Ошибка: ед.изм. по умолчанию и закупочные ед.изм. должны иметь одинаковую "
 "категорию."
 
 #. module: stock
 #: model:stock.location,name:stock.location_delivery_counter
 msgid "Delivery Counter"
-msgstr ""
+msgstr "Счётчик доставки"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,prodlot_id:0
@@ -2730,7 +2776,7 @@ msgstr "Номер партии изделий"
 #: code:addons/stock/stock.py:2697
 #, python-format
 msgid "Inventory '%s' is done."
-msgstr ""
+msgstr "Инвентаризация '%s' сделана."
 
 #. module: stock
 #: field:stock.move,product_uos_qty:0
@@ -2758,7 +2804,7 @@ msgstr "Адрес контакта :"
 #. module: stock
 #: field:stock.move,backorder_id:0
 msgid "Back Order"
-msgstr ""
+msgstr "Дозаказ"
 
 #. module: stock
 #: field:stock.incoterms,active:0 field:stock.location,active:0
@@ -2782,7 +2828,7 @@ msgstr "Ошибка, нет партнера !"
 #: field:stock.inventory.line.split.lines,wizard_id:0
 #: field:stock.move.split.lines,wizard_id:0
 msgid "Parent Wizard"
-msgstr ""
+msgstr "Родительский мастер"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
@@ -2795,7 +2841,7 @@ msgstr "Инкотермс"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking_line
 msgid "stock.partial.picking.line"
-msgstr ""
+msgstr "stock.partial.picking.line"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
@@ -2854,7 +2900,7 @@ msgstr "Обработать"
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
-msgstr "Наименование ревизии"
+msgstr "Название ревизии"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
@@ -2914,7 +2960,7 @@ msgstr "Дата выполнения"
 msgid ""
 "Please put a partner on the picking list if you want to generate invoice."
 msgstr ""
-"Пожалуйста установите партнера на комплектовочный лист, если вы хотите "
+"Пожалуйста установите партнера в комплектовочном листе, если вы хотите "
 "создать счет."
 
 #. module: stock
@@ -2943,7 +2989,7 @@ msgstr "Анализ ТМЦ"
 #. module: stock
 #: field:stock.invoice.onshipping,journal_id:0
 msgid "Destination Journal"
-msgstr "Журнал"
+msgstr "Журнал назначения"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_tracking_lot_2_stock_report_tracklots
@@ -2969,12 +3015,12 @@ msgstr "Запасы"
 #: field:stock.report.tracklots,product_id:0
 #: field:stock.return.picking.memory,product_id:0
 msgid "Product"
-msgstr "Продукция"
+msgstr "Товар"
 
 #. module: stock
 #: view:stock.return.picking:0
 msgid "Return"
-msgstr ""
+msgstr "Возврат"
 
 #. module: stock
 #: field:stock.return.picking,invoice_state:0
@@ -2984,7 +3030,7 @@ msgstr "Выставление счета"
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Internal Moves"
-msgstr ""
+msgstr "Назначенные внутренние перемещения"
 
 #. module: stock
 #: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
@@ -2996,12 +3042,12 @@ msgstr "Пожалуйста, предоставьте правильное ко
 #. module: stock
 #: field:stock.move,product_uos:0
 msgid "Product UOS"
-msgstr "Вторая ед. изм."
+msgstr "Единица продажи"
 
 #. module: stock
 #: field:stock.location,posz:0
 msgid "Height (Z)"
-msgstr "Высота"
+msgstr "Высота (Z)"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_consume
@@ -3018,7 +3064,7 @@ msgstr "Недостаточно ТМЦ в партии !"
 #. module: stock
 #: field:stock.location,parent_right:0
 msgid "Right Parent"
-msgstr ""
+msgstr "Правый источник"
 
 #. module: stock
 #: field:stock.picking,address_id:0
@@ -3033,7 +3079,7 @@ msgstr "Варианты"
 #. module: stock
 #: field:stock.location,posx:0
 msgid "Corridor (X)"
-msgstr "Ряд ({)"
+msgstr "Ряд (X)"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_suppliers
@@ -3053,12 +3099,12 @@ msgstr "ТМЦ по категориям"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Waiting Another Operation"
-msgstr ""
+msgstr "Ожидание другой операции"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Supplier Locations"
-msgstr ""
+msgstr "Места хранения поставщиков"
 
 #. module: stock
 #: field:stock.partial.move.line,wizard_id:0
@@ -3070,7 +3116,7 @@ msgstr "Мастер"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Completed Stock-Moves"
-msgstr ""
+msgstr "Выполненные перемещения"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -3098,6 +3144,13 @@ msgid ""
 "preconfigured logistics rules, but you can also record manual stock "
 "operations."
 msgstr ""
+"Внутренние перемещения отображают все операции инвентаризации, которые вы "
+"должны выполнить на вашем складе. Все операции могут быть категоризированы в "
+"журналах запаса, так что каждый работник имеет свой собственный список "
+"операций для выполнения в своём собственном журнале. Большинство операций "
+"подготавливается автоматически OpenERP согласно вашим предварительно "
+"настроенным правилам логистики, но вы можете также записать ручные операции "
+"с запасом."
 
 #. module: stock
 #: view:stock.move:0
@@ -3124,7 +3177,7 @@ msgstr "Место хранения источника"
 #. module: stock
 #: view:stock.move:0
 msgid " Waiting"
-msgstr ""
+msgstr " Ожидание"
 
 #. module: stock
 #: view:product.template:0
@@ -3134,7 +3187,7 @@ msgstr "Бухгалтерские проводки"
 #. module: stock
 #: model:res.groups,name:stock.group_stock_manager
 msgid "Manager"
-msgstr ""
+msgstr "Менеджер"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -3191,7 +3244,7 @@ msgstr ""
 #: code:addons/stock/product.py:445
 #, python-format
 msgid "Future Productions"
-msgstr ""
+msgstr "Будущие производства"
 
 #. module: stock
 #: view:stock.picking:0
@@ -3201,7 +3254,7 @@ msgstr "В счет"
 #. module: stock
 #: view:stock.return.picking:0
 msgid "Return lines"
-msgstr "Позиции для возврата"
+msgstr "Позиции возврата"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_lines_date
@@ -3242,12 +3295,12 @@ msgstr "Причина"
 #. module: stock
 #: model:product.template,name:stock.product_icecream_product_template
 msgid "Ice Cream"
-msgstr ""
+msgstr "Мороженое"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Запуск мастера частичного комплектования"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_production_lot_form
@@ -3259,6 +3312,12 @@ msgid ""
 "'Available' button to get all the lots you produced, received or delivered "
 "to customers."
 msgstr ""
+"Это список всех партий производства (серийных номеров) записанных вами. "
+"Когда вы выбираете партию, вы можете получить восходящий или нисходящий учет "
+"движения продуктов содержащихся в партии. По умолчанию, список отфильтрован "
+"по серийным номерам, которые доступны на вашем складе, но вы можете "
+"отключить кнопку 'Доступные' для получения всех партий произведённых вами, "
+"полученных или поставленных покупателям."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -3294,6 +3353,10 @@ msgid ""
 "default value for all products in this category. It can also directly be set "
 "on each product"
 msgstr ""
+"При проведении оценки инвентаризации в реальном времени, корреспондирующие "
+"пункты журнала для всех входящих перемещений запасов будут отправлены на "
+"этот счёт, если нет конкретного счёта заданного по месту назначения. Его "
+"также можно установить непосредственно для каждого продукта."
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
@@ -3330,7 +3393,7 @@ msgstr "Отменено"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Delivery Orders"
-msgstr ""
+msgstr "Подтверждённые заказы доставки"
 
 #. module: stock
 #: view:stock.move:0 field:stock.partial.move,picking_id:0
@@ -3412,7 +3475,7 @@ msgstr "Заказы на доставку"
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders already processed"
-msgstr ""
+msgstr "Уже обработанные заказы доставки"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -3472,7 +3535,7 @@ msgstr "Связанное комплектование"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Year Planned"
-msgstr ""
+msgstr "Плановый год"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3482,7 +3545,7 @@ msgstr "Общее исходящее количество"
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "New"
-msgstr ""
+msgstr "Новый"
 
 #. module: stock
 #: help:stock.partial.move.line,cost:0 help:stock.partial.picking.line,cost:0
@@ -3516,7 +3579,7 @@ msgstr "Количество, оставляемое в текущей упак
 #. module: stock
 #: view:stock.move:0
 msgid "Stock available to be delivered"
-msgstr ""
+msgstr "Запас доступный для доставки"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
@@ -3527,7 +3590,7 @@ msgstr "Создать счет"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Internal Moves"
-msgstr ""
+msgstr "Подтвержденные внутренние перемещения"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -3563,7 +3626,7 @@ msgstr ""
 #. module: stock
 #: field:stock.location,chained_journal_id:0
 msgid "Chaining Journal"
-msgstr ""
+msgstr "Сцепленный журнал"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
@@ -3579,18 +3642,18 @@ msgstr "Не хватает остатка, нельзя зарезервиро
 #. module: stock
 #: model:stock.location,name:stock.stock_location_customers
 msgid "Customers"
-msgstr "Клиенты"
+msgstr "Заказчики"
 
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "Waiting Availability"
-msgstr ""
+msgstr "Ожидание поступления"
 
 #. module: stock
 #: code:addons/stock/stock.py:1347
 #, python-format
 msgid "is cancelled."
-msgstr "отменяется."
+msgstr "отменено."
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -3600,7 +3663,7 @@ msgstr "Позиции инвентаризации склада"
 #. module: stock
 #: view:stock.move:0
 msgid "Waiting "
-msgstr ""
+msgstr "Ожидание "
 
 #. module: stock
 #: code:addons/stock/product.py:427
@@ -3621,7 +3684,7 @@ msgstr "Упаковка"
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
 msgid "Date Expected"
-msgstr "Ожидаемый срок"
+msgstr "Ожидаемая дата"
 
 #. module: stock
 #: field:stock.move,auto_validate:0
@@ -3646,7 +3709,7 @@ msgstr "Декабрь"
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Available Product Lots"
-msgstr ""
+msgstr "Партии доступных ТМЦ"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_move_form2
@@ -3732,7 +3795,7 @@ msgstr "Черновик"
 #: model:ir.actions.report.xml,name:stock.report_stock_inventory_move
 #: report:stock.inventory.move:0
 msgid "Stock Inventory"
-msgstr "Складской учет"
+msgstr "Инвентаризация запаса"
 
 #. module: stock
 #: help:report.stock.inventory,state:0
@@ -3747,7 +3810,7 @@ msgstr ""
 " После этого состояние становится \"Подтверждено\".\n"
 " Если ТМЦ доступны состояние становится \"Доступно\".\n"
 " Когда комплектование выполнено, то состояние \"Сделано\".              \n"
-"Состояние \"В ожидании\", если перемещение ожидает другого перемещения."
+"Состояние \"Ожидание\", если перемещение ожидает другого перемещения."
 
 #. module: stock
 #: view:stock.picking:0
@@ -3789,7 +3852,7 @@ msgstr "Обнулить"
 #. module: stock
 #: model:res.groups,name:stock.group_stock_user
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:98
@@ -3939,12 +4002,16 @@ msgid ""
 "specific valuation account set on the source location. When not set on the "
 "product, the one from the product category is used."
 msgstr ""
+"При проведении оценки инвентаризации в реальном времени, корреспондирующие "
+"пункты журнала для всех входящих перемещений запасов будут отправлены на "
+"этот счёт, если нет конкретного счёта заданного по исходному месту хранения. "
+"Его также можно установить непосредственно для каждого товара."
 
 #. module: stock
 #: view:stock.move:0 field:stock.partial.move,move_ids:0
 #: field:stock.return.picking,product_return_moves:0
 msgid "Moves"
-msgstr "Перемещения товаров"
+msgstr "Перемещения"
 
 #. module: stock
 #: view:report.stock.move:0 field:report.stock.move,location_dest_id:0
@@ -3986,7 +4053,7 @@ msgstr "Разбивающее перемещение"
 #. module: stock
 #: field:stock.picking,backorder_id:0
 msgid "Back Order of"
-msgstr ""
+msgstr "Дозаказ из"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:106
@@ -4001,7 +4068,7 @@ msgstr ""
 #. module: stock
 #: view:report.stock.move:0
 msgid "Future Stock-Moves"
-msgstr ""
+msgstr "Будущие перемещения"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
@@ -4012,7 +4079,7 @@ msgstr "Разбиение в партиях изделий"
 #: code:addons/stock/wizard/stock_move.py:213
 #, python-format
 msgid "Processing Error"
-msgstr ""
+msgstr "Ошибка обработки"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -4034,7 +4101,7 @@ msgstr "Май"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action5 view:stock.tracking:0
 msgid "Upstream traceability"
-msgstr ""
+msgstr "Восходящее отслеживание"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
@@ -4069,7 +4136,7 @@ msgstr "Отчет по партиям изделий"
 #: view:stock.location:0 selection:stock.location,chained_location_type:0
 #: view:stock.move:0
 msgid "Customer"
-msgstr "Клиент"
+msgstr "Заказчик"
 
 #. module: stock
 #: selection:report.stock.inventory,month:0
@@ -4085,12 +4152,12 @@ msgstr "Идентификация партии изделий"
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator_small
 msgid "Small Refrigerator"
-msgstr ""
+msgstr "Маленький холодильник"
 
 #. module: stock
 #: model:stock.location,name:stock.location_convenience_shop
 msgid "Convenient Store"
-msgstr ""
+msgstr "Удобный магазин"
 
 #. module: stock
 #: field:stock.location,scrap_location:0 view:stock.move.scrap:0
@@ -4136,11 +4203,13 @@ msgid ""
 "By default, the pack reference is generated following the sscc standard. "
 "(Serial number + 1 check digit)"
 msgstr ""
+"По умолчанию, ссылка упаковки создана следуя стандарту sscc. (Серийный номер "
+"+ 1 контрольный знак)"
 
 #. module: stock
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:159
@@ -4150,6 +4219,9 @@ msgid ""
 "would let a quantity of \"%s %s\" to ship and only roundings of \"%s %s\" is "
 "accepted by the uom."
 msgstr ""
+"Округление исходной ед.изм. не позволяет вам доставить \"%s %s\", поскольку "
+"позволяет доставить количество \"%s %s\" доставки и только округляется до "
+"\"%s %s\" применимое при ед.изм."
 
 #. module: stock
 #: code:addons/stock/wizard/stock_move.py:213
@@ -4157,16 +4229,18 @@ msgstr ""
 msgid ""
 "Production lot quantity %d of %s is larger than available quantity (%d) !"
 msgstr ""
+"Количество в партии производства %d  %s больше, чем доступное количество "
+"(%d) !"
 
 #. module: stock
 #: constraint:product.category:0
 msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Ошибка ! Нельзя создавать рекурсивные категории."
 
 #. module: stock
 #: help:stock.move,move_dest_id:0
 msgid "Optional: next stock move when chaining them"
-msgstr "Опционально: следующее перемещение ТМЦ, при перемещении по цепочке"
+msgstr "Опционально: следующее перемещение ТМЦ при его сцеплении"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,year:0
@@ -4981,3 +5055,6 @@ msgstr "Дополнительные подробности локализаци
 
 #~ msgid "Merge inventories"
 #~ msgstr "Объединить инвентаризации"
+
+#~ msgid "Non Assigned Products:"
+#~ msgstr "Не назначенные товары:"
diff --git a/addons/stock/i18n/sl.po b/addons/stock/i18n/sl.po
index 2befa53408c..0dd4cfde4e8 100644
--- a/addons/stock/i18n/sl.po
+++ b/addons/stock/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/sq.po b/addons/stock/i18n/sq.po
index 03b8ec71b3c..d0e7a3ad702 100644
--- a/addons/stock/i18n/sq.po
+++ b/addons/stock/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:40+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:45+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/sr.po b/addons/stock/i18n/sr.po
index 210eaa97983..196a9ab4e52 100644
--- a/addons/stock/i18n/sr.po
+++ b/addons/stock/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/sr@latin.po b/addons/stock/i18n/sr@latin.po
index 3b429038d23..4c6c9b18ec6 100644
--- a/addons/stock/i18n/sr@latin.po
+++ b/addons/stock/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/sv.po b/addons/stock/i18n/sv.po
index 80f95257290..e4e0a6593e8 100644
--- a/addons/stock/i18n/sv.po
+++ b/addons/stock/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -229,7 +229,7 @@ msgstr ""
 #: field:stock.partial.move.line,update_cost:0
 #: field:stock.partial.picking.line,update_cost:0
 msgid "Need cost update"
-msgstr ""
+msgstr "Behöver kostnadsuppdateras"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:49
@@ -392,7 +392,7 @@ msgstr ""
 #: field:stock.move,state:0 view:stock.picking:0 field:stock.picking,state:0
 #: report:stock.picking.list:0
 msgid "State"
-msgstr "Status"
+msgstr "Leveransstatus"
 
 #. module: stock
 #: view:stock.location:0
@@ -1364,7 +1364,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0 field:stock.picking,invoice_state:0
 msgid "Invoice Control"
-msgstr "Fakturakontroll"
+msgstr "Fakturastatus"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot_revision
@@ -1690,7 +1690,7 @@ msgstr "Spårparti"
 #. module: stock
 #: view:stock.picking:0
 msgid "Back Orders"
-msgstr ""
+msgstr "Restordrar"
 
 #. module: stock
 #: view:product.product:0 view:product.template:0
@@ -2148,7 +2148,7 @@ msgstr ""
 #. module: stock
 #: view:product.product:0
 msgid "Update"
-msgstr ""
+msgstr "Updatera"
 
 #. module: stock
 #: view:stock.inventory:0
diff --git a/addons/stock/i18n/th.po b/addons/stock/i18n/th.po
index 471d28d629f..95124750cb4 100644
--- a/addons/stock/i18n/th.po
+++ b/addons/stock/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/tlh.po b/addons/stock/i18n/tlh.po
index 883dc0d2178..9db110c78bf 100644
--- a/addons/stock/i18n/tlh.po
+++ b/addons/stock/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index 3437b0b598e..10538867d96 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -24,7 +24,7 @@ msgstr "Giden Lotları İzle"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
 msgid "Stock move Split lines"
-msgstr ""
+msgstr "Stok hareketi Bölünmüş satırları"
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -35,6 +35,10 @@ msgid ""
 "value for all products in this category. It can also directly be set on each "
 "product"
 msgstr ""
+"Gerçek-zamanlı envanter değerlendirmesi yaparken, gelen tüm stokların "
+"hareketlerine karşılık gelen ait öğe günlükleri bu hesaba işlenecektir, "
+"kaynak konumda özel bir değerlendirme hesabı yoksa. Bu kategorideki ürünler "
+"için bu varsayılan değerdir. Her ürüne doğrudan da ayarlanabilir."
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
@@ -77,7 +81,7 @@ msgstr "Revizyon Numarası"
 #. module: stock
 #: view:stock.move:0
 msgid "Orders processed Today or planned for Today"
-msgstr ""
+msgstr "Bugün işlenen ya da Bugün için planlanan Siparişler"
 
 #. module: stock
 #: view:stock.partial.move.line:0 view:stock.partial.picking:0
@@ -89,7 +93,7 @@ msgstr "Ürün Hareketleri"
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_uom_categ_form_action
 msgid "UoM Categories"
-msgstr ""
+msgstr "Ölçü Birimi Kategorileri"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_move_report
@@ -128,7 +132,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_change_product_qty.py:87
 #, python-format
 msgid "Quantity cannot be negative."
-msgstr ""
+msgstr "Miktar eksi olamaz"
 
 #. module: stock
 #: view:stock.picking:0
@@ -196,7 +200,7 @@ msgstr "Bu ay"
 #: code:addons/stock/wizard/stock_move.py:222
 #, python-format
 msgid "Unable to assign all lots to this move!"
-msgstr ""
+msgstr "Bu harekete bütün partiler atanamıyor."
 
 #. module: stock
 #: code:addons/stock/stock.py:2516
@@ -219,18 +223,18 @@ msgstr "Hehangi bir kaydı silemezsiniz!"
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders to invoice"
-msgstr ""
+msgstr "Faturalanacak teslimat emirleri"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Delivery Orders"
-msgstr ""
+msgstr "Atanmış Teslimat Emirleri"
 
 #. module: stock
 #: field:stock.partial.move.line,update_cost:0
 #: field:stock.partial.picking.line,update_cost:0
 msgid "Need cost update"
-msgstr ""
+msgstr "Maliyein güncellenmesi gerekiyor"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:49
@@ -340,6 +344,8 @@ msgid ""
 "Can not create Journal Entry, Input Account defined on this product and "
 "Valuation account on category of this product are same."
 msgstr ""
+"Günlük Girişi oluşturulamıyor, bu ürünün tanımlı Giriş Hesabı ve bu ürünün "
+"kategorisindeki Değerlendirme Hesabı ile aynıdır."
 
 #. module: stock
 #: selection:stock.return.picking,invoice_state:0
@@ -349,7 +355,7 @@ msgstr "Faturalama yok"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that have been processed"
-msgstr ""
+msgstr "İşlenen stok hareketleri"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
@@ -371,7 +377,7 @@ msgstr "Bu pakete ait hareketler"
 #. module: stock
 #: view:stock.picking:0
 msgid "Incoming Shipments Available"
-msgstr ""
+msgstr "Mevcut Gelen Sevkiyatlar"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -470,7 +476,7 @@ msgstr "Böl"
 #. module: stock
 #: view:stock.location:0
 msgid "Internal Locations"
-msgstr ""
+msgstr "İç Konumlar"
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
@@ -554,7 +560,7 @@ msgstr "Hedef Lokasyon"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move_line
 msgid "stock.partial.move.line"
-msgstr ""
+msgstr "stok.kısmi.hareket.satır"
 
 #. module: stock
 #: code:addons/stock/stock.py:760
@@ -609,7 +615,7 @@ msgstr "Lokasyon / Ürün"
 #. module: stock
 #: field:stock.move,address_id:0
 msgid "Destination Address "
-msgstr ""
+msgstr "Varış Adresi "
 
 #. module: stock
 #: code:addons/stock/stock.py:1333
@@ -656,6 +662,12 @@ msgid ""
 "queries regarding your account, please contact us.\n"
 "Thank you in advance.\n"
 msgstr ""
+"Kayıtlarımız aşağıdaki ödemenin hala yapılmadığını göstermektedir. Eğer "
+"tutar\n"
+"önceden ödenmişse, lütfen bu notu dikkate almayın. Ancak, hesabınızla "
+"ilgili\n"
+"sorunuz varsa lütfen bizimle iletişim kurun.\n"
+"Şimdiden teşekkürler.\n"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -670,11 +682,14 @@ msgid ""
 "according to the original purchase order. You can validate the shipment "
 "totally or partially."
 msgstr ""
+"Gelen Nakliyeler tedarikçinizden alacağınız bütün siparişlerin listesidir. "
+"Gelen bir nakliye orijinal satınalma siparişine göre alınacak bütün ürünleri "
+"içerir. Nakliyeyi tamamen ya da parçalı olarak doğrulayabilirsiniz."
 
 #. module: stock
 #: field:stock.move.split.lines,wizard_exist_id:0
 msgid "Parent Wizard (for existing lines)"
-msgstr ""
+msgstr "Ana Sihirbaz (varolan satırlar için="
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -688,6 +703,8 @@ msgid ""
 "There is no inventory Valuation account defined on the product category: "
 "\"%s\" (id: %d)"
 msgstr ""
+"Ürün kategorisi üzerinde tanımlı hiçbir stok değerlemesi hesabı yoktur: "
+"\"%s\" (id: %d)"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -745,7 +762,7 @@ msgstr "Alıcı"
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator
 msgid "Refrigerator"
-msgstr ""
+msgstr "Buzdolabı"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_tree
@@ -808,7 +825,7 @@ msgstr ""
 #: code:addons/stock/product.py:75
 #, python-format
 msgid "Valuation Account is not specified for Product Category: %s"
-msgstr ""
+msgstr "Değerleme Hesabının tanımlanmadığı Ürün Kategorisi: %s"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
@@ -941,7 +958,7 @@ msgstr "Paket Arama"
 #. module: stock
 #: view:stock.picking:0
 msgid "Pickings already processed"
-msgstr ""
+msgstr "Toplama zaten yürütülmüş"
 
 #. module: stock
 #: field:stock.partial.move.line,currency:0
@@ -984,7 +1001,7 @@ msgstr "İcra Tamamlama Süresi (Gün)"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move
 msgid "Partial Move Processing Wizard"
-msgstr ""
+msgstr "Kısmi Hareket İşleme Sihirbazı"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
@@ -1024,7 +1041,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Pickings"
-msgstr ""
+msgstr "Onaylanmış Toplamalar"
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -1050,13 +1067,13 @@ msgstr "Sol Üst Öğe"
 #. module: stock
 #: field:product.category,property_stock_valuation_account_id:0
 msgid "Stock Valuation Account"
-msgstr ""
+msgstr "Stok Değerleme Hesabı"
 
 #. module: stock
 #: code:addons/stock/stock.py:1349
 #, python-format
 msgid "is waiting."
-msgstr ""
+msgstr "bekliyor."
 
 #. module: stock
 #: constraint:product.product:0
@@ -1162,6 +1179,8 @@ msgid ""
 "In order to cancel this inventory, you must first unpost related journal "
 "entries."
 msgstr ""
+"Bu envanteri silmek için önce ilişkili günlük girişlerinin işlenmesini "
+"kaldırmalısınız."
 
 #. module: stock
 #: field:stock.picking,date_done:0
@@ -1175,11 +1194,13 @@ msgid ""
 "The uom rounding does not allow you to ship \"%s %s\", only roundings of "
 "\"%s %s\" is accepted by the uom."
 msgstr ""
+"Ölçü biriminin yuvarlatılması \"%s%s\" sevkiyatını yüklemenize izin vermez, "
+"\"%s %s\" yuvarlatılması yalnızca ölçü birimince kabul edilir."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that are Available (Ready to process)"
-msgstr ""
+msgstr "Mevcut stok hareketleri (İşlenmeye hazır)"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1300,7 +1321,7 @@ msgstr "Çeki Listesi:"
 #. module: stock
 #: selection:stock.move,state:0
 msgid "Waiting Another Move"
-msgstr ""
+msgstr "Balka bir Hareket Bekliyor"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1315,7 +1336,7 @@ msgstr ""
 #. module: stock
 #: view:product.product:0
 msgid "Expected Stock Variations"
-msgstr ""
+msgstr "Umulan Stok Çeşitlilikleri"
 
 #. module: stock
 #: help:stock.move,price_unit:0
@@ -1446,7 +1467,7 @@ msgstr "Tipi"
 #. module: stock
 #: view:stock.picking:0
 msgid "Available Pickings"
-msgstr ""
+msgstr "Mevcut Toplamalar"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_5
@@ -1456,7 +1477,7 @@ msgstr "Genel IT Tedarikçileri"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be receive"
-msgstr ""
+msgstr "Alınacak stok"
 
 #. module: stock
 #: help:stock.location,valuation_out_account_id:0
@@ -1510,7 +1531,7 @@ msgstr "Sadece taslak hareketlerini silebilirsiniz."
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line_split_lines
 msgid "Inventory Split lines"
-msgstr ""
+msgstr "Bölünmüş Envanter Satırları"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview
@@ -1526,7 +1547,7 @@ msgstr "Genel Bilgiler"
 #. module: stock
 #: view:report.stock.inventory:0
 msgid "Analysis including future moves (similar to virtual stock)"
-msgstr ""
+msgstr "İnceleme gelecekteki hareketleri içerir (sanal stokla aynı)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action3 view:stock.tracking:0
@@ -1678,7 +1699,7 @@ msgstr "Stok İstatistikleri"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month Planned"
-msgstr ""
+msgstr "Planlanan Ay"
 
 #. module: stock
 #: field:product.product,track_production:0
@@ -1693,7 +1714,7 @@ msgstr "Birikmiş Sipariş mi (backorder)"
 #. module: stock
 #: field:stock.location,valuation_out_account_id:0
 msgid "Stock Valuation Account (Outgoing)"
-msgstr ""
+msgstr "Stok Değerleme Hesabı (Çıkan)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_open
@@ -1734,7 +1755,7 @@ msgstr "Oluşan Hareketler"
 #. module: stock
 #: field:stock.location,valuation_in_account_id:0
 msgid "Stock Valuation Account (Incoming)"
-msgstr ""
+msgstr "Stok Değerleme Hesabı (Girenn)"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_14
@@ -1790,7 +1811,7 @@ msgstr ""
 #. module: stock
 #: view:report.stock.move:0
 msgid "Day Planned"
-msgstr ""
+msgstr "Planlanan Gün"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,date:0
@@ -1928,7 +1949,7 @@ msgstr "Envanter Değerlendirmesi"
 #. module: stock
 #: view:stock.move:0
 msgid "Orders planned for today"
-msgstr ""
+msgstr "Bugün için planlanan Siparişler"
 
 #. module: stock
 #: view:stock.move:0 view:stock.picking:0
@@ -1967,6 +1988,8 @@ msgid ""
 "Can not create Journal Entry, Output Account defined on this product and "
 "Valuation account on category of this product are same."
 msgstr ""
+"Günlük Girişi oluşturulamıyor, bu üründe tanımlanan Çıkış Hesabı bu ürün "
+"kategorisindeki Değerlendirme hesabı ile aynı."
 
 #. module: stock
 #: field:report.stock.move,day_diff1:0
@@ -1981,7 +2004,7 @@ msgstr "Fiyat"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_return_picking_memory
 msgid "stock.return.picking.memory"
-msgstr ""
+msgstr "stok.dönüş.toplama.bellek"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2048,6 +2071,8 @@ msgid ""
 "This field is for internal purpose. It is used to decide if the column "
 "prodlot has to be shown on the move_ids field or not"
 msgstr ""
+"Bu alan iç amaçlar içindir. prodlot sütununun move_ids alanında gösterilip "
+"gösterilmeyeceğine karar vermek için kullanılır."
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -2078,7 +2103,7 @@ msgstr "Lojistik sevikayat ünitesi: palet, kutu, paket ..."
 #. module: stock
 #: view:stock.location:0
 msgid "Customer Locations"
-msgstr ""
+msgstr "Müşteri Konumları"
 
 #. module: stock
 #: view:stock.change.product.qty:0 view:stock.change.standard.price:0
@@ -2120,6 +2145,7 @@ msgstr "Oluşturma"
 msgid ""
 "Analysis of current inventory (only moves that have already been processed)"
 msgstr ""
+"Geçerli envanterin incelenmesi (yalnızca önceden işlenmiş hareketler)"
 
 #. module: stock
 #: field:stock.partial.move.line,cost:0
@@ -2137,7 +2163,7 @@ msgstr "Stok Giriş Hes."
 #. module: stock
 #: view:report.stock.move:0
 msgid "Shipping type specify, goods coming in or going out"
-msgstr ""
+msgstr "Nakliye türü belirtin, giren ya da çıkan ürünler"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_warehouse_mgmt
@@ -2292,7 +2318,7 @@ msgstr "Sevkiyat Tipi"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock moves that are Confirmed, Available or Waiting"
-msgstr ""
+msgstr "Onaylanmış stok hareketleri, Mevcut ya da Bekleyen"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_location_open
@@ -2327,7 +2353,7 @@ msgstr "Sistemin tamamlanan ürünleri stoklayacağı lokasyon."
 #. module: stock
 #: view:stock.move:0
 msgid "Stock to be delivered (Available or not)"
-msgstr ""
+msgstr "Teslim edilecek stok (Mevcut ya da değil)"
 
 #. module: stock
 #: view:board.board:0
@@ -2380,7 +2406,7 @@ msgstr "Kâr ve Zarar Miktarı"
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Pickings to invoice"
-msgstr ""
+msgstr "Faturalanacak İç Toplamalar"
 
 #. module: stock
 #: view:stock.production.lot:0 field:stock.production.lot,revisions:0
@@ -2632,7 +2658,7 @@ msgstr "Özgün ürün lotu PREFIX/SERIAL [INT_REF] olarak görüntülenecektir"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_company
 msgid "Your Company"
-msgstr ""
+msgstr "Firmanız"
 
 #. module: stock
 #: constraint:stock.move:0
@@ -2711,7 +2737,7 @@ msgstr "Hata: Varsayılan UOM ve satınalma UOM aynı kategoride olmalıdır."
 #. module: stock
 #: model:stock.location,name:stock.location_delivery_counter
 msgid "Delivery Counter"
-msgstr ""
+msgstr "Teslimat Sayacı"
 
 #. module: stock
 #: view:report.stock.inventory:0 field:report.stock.inventory,prodlot_id:0
@@ -2780,7 +2806,7 @@ msgstr "Hata, hiç ortak yok!"
 #: field:stock.inventory.line.split.lines,wizard_id:0
 #: field:stock.move.split.lines,wizard_id:0
 msgid "Parent Wizard"
-msgstr ""
+msgstr "Ana Sihirbaz"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_incoterms_tree
@@ -2793,7 +2819,7 @@ msgstr "Teslim Sekilleri"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_picking_line
 msgid "stock.partial.picking.line"
-msgstr ""
+msgstr "stok.kısmi.toplama.satır"
 
 #. module: stock
 #: report:lot.stock.overview:0 report:lot.stock.overview_all:0
@@ -2979,7 +3005,7 @@ msgstr "Faturalandırma"
 #. module: stock
 #: view:stock.picking:0
 msgid "Assigned Internal Moves"
-msgstr ""
+msgstr "Atanmış İç Hareketler"
 
 #. module: stock
 #: code:addons/stock/stock.py:2379 code:addons/stock/stock.py:2440
@@ -3048,12 +3074,12 @@ msgstr "Kategoriye Göre Ürün"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Waiting Another Operation"
-msgstr ""
+msgstr "Başka bir İşlem Bekliyor"
 
 #. module: stock
 #: view:stock.location:0
 msgid "Supplier Locations"
-msgstr ""
+msgstr "Tedarikçi Konumları"
 
 #. module: stock
 #: field:stock.partial.move.line,wizard_id:0
@@ -3065,7 +3091,7 @@ msgstr "Sihirbaz"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Completed Stock-Moves"
-msgstr ""
+msgstr "Tamamlanan Stok-Hareketleri"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_location_product
@@ -3108,7 +3134,7 @@ msgstr "Sipariş"
 #. module: stock
 #: view:product.product:0
 msgid "Cost Price :"
-msgstr ""
+msgstr "Maliyet Bedeli :"
 
 #. module: stock
 #: field:stock.tracking,name:0
@@ -3125,7 +3151,7 @@ msgstr "Kaynak Lokasyon"
 #. module: stock
 #: view:stock.move:0
 msgid " Waiting"
-msgstr ""
+msgstr " Bekliyor"
 
 #. module: stock
 #: view:product.template:0
@@ -3337,7 +3363,7 @@ msgstr "İptal edildi"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Delivery Orders"
-msgstr ""
+msgstr "Onaylanmış Teslimat Emirleri"
 
 #. module: stock
 #: view:stock.move:0 field:stock.partial.move,picking_id:0
@@ -3419,7 +3445,7 @@ msgstr "Teslimat Siparişleri"
 #. module: stock
 #: view:stock.picking:0
 msgid "Delivery orders already processed"
-msgstr ""
+msgstr "Halihazırda işlenmiş teslimat emirleri"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -3479,7 +3505,7 @@ msgstr "Bağlı Toplama"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Year Planned"
-msgstr ""
+msgstr "Planlanan Yıl"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3523,7 +3549,7 @@ msgstr "Mevcut pakette bırakılacak miktar"
 #. module: stock
 #: view:stock.move:0
 msgid "Stock available to be delivered"
-msgstr ""
+msgstr "Teslim edilecek mevcut stok"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
@@ -3534,7 +3560,7 @@ msgstr "Fatura Oluştur"
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirmed Internal Moves"
-msgstr ""
+msgstr "Onaylanmış İç Hareketler"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -3590,7 +3616,7 @@ msgstr "Müşteriler"
 #. module: stock
 #: selection:stock.move,state:0 selection:stock.picking,state:0
 msgid "Waiting Availability"
-msgstr ""
+msgstr "Uygunluk Bekliyor"
 
 #. module: stock
 #: code:addons/stock/stock.py:1347
@@ -3606,7 +3632,7 @@ msgstr "Stok Envanter Kalemleri"
 #. module: stock
 #: view:stock.move:0
 msgid "Waiting "
-msgstr ""
+msgstr "Bekliyor "
 
 #. module: stock
 #: code:addons/stock/product.py:427
@@ -3652,7 +3678,7 @@ msgstr "Aralık"
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Available Product Lots"
-msgstr ""
+msgstr "Mevcut Ürün Partileri"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_move_form2
@@ -4007,7 +4033,7 @@ msgstr ""
 #. module: stock
 #: view:report.stock.move:0
 msgid "Future Stock-Moves"
-msgstr ""
+msgstr "Gelecek Stok-Hareketleri"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split
@@ -4091,12 +4117,12 @@ msgstr "Üretim Lotu Tanımlaması"
 #. module: stock
 #: model:stock.location,name:stock.location_refrigerator_small
 msgid "Small Refrigerator"
-msgstr ""
+msgstr "Küçük Buzdolabı"
 
 #. module: stock
 #: model:stock.location,name:stock.location_convenience_shop
 msgid "Convenient Store"
-msgstr ""
+msgstr "Elverişli Depo"
 
 #. module: stock
 #: field:stock.location,scrap_location:0 view:stock.move.scrap:0
@@ -4162,7 +4188,7 @@ msgstr ""
 #, python-format
 msgid ""
 "Production lot quantity %d of %s is larger than available quantity (%d) !"
-msgstr ""
+msgstr "Ürün partisi miktarı %d (%s in) mevcut (%d) miktarından çoktur!"
 
 #. module: stock
 #: constraint:product.category:0
@@ -4188,7 +4214,7 @@ msgstr "Fiziksel Lokasyon"
 #. module: stock
 #: view:stock.picking:0 selection:stock.picking,state:0
 msgid "Ready to Process"
-msgstr ""
+msgstr "İşlenmeye Hazır"
 
 #. module: stock
 #: help:stock.location,posx:0 help:stock.location,posy:0
diff --git a/addons/stock/i18n/uk.po b/addons/stock/i18n/uk.po
index 58cc1dca17e..45f5b25006c 100644
--- a/addons/stock/i18n/uk.po
+++ b/addons/stock/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:47+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/vi.po b/addons/stock/i18n/vi.po
index dd3ba405278..e4718d2980b 100644
--- a/addons/stock/i18n/vi.po
+++ b/addons/stock/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:42+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 6369af93d36..64a500b1cca 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-20 09:34+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\n"
+"PO-Revision-Date: 2012-11-06 14:21+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-11-07 04:38+0000\n"
+"X-Generator: Launchpad (build 16232)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -940,7 +940,7 @@ msgstr "如果您需要在成品库位生产请留空.如在固定地点生产
 #. module: stock
 #: view:res.partner:0
 msgid "Inventory Properties"
-msgstr "盘点表属性"
+msgstr "库存属性"
 
 #. module: stock
 #: field:report.stock.move,day_diff:0
diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po
index 62ef6054749..76f87e019d5 100644
--- a/addons/stock/i18n/zh_TW.po
+++ b/addons/stock/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-09 04:43+0000\n"
-"X-Generator: Launchpad (build 15761)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
diff --git a/addons/stock/product.py b/addons/stock/product.py
index e0e55594eca..4d955495c28 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -32,7 +32,7 @@ class product_product(osv.osv):
         moves = move_pool.read_group(cr, uid, [
             ('product_id', 'in', ids),
             ('picking_id.type', '=', 'in'),
-            ('state','in',('draft','confirmed','assigned','pending'))
+            ('state','in',('confirmed','assigned','pending'))
         ], ['product_id'], ['product_id'])
         for move in moves:
             product_id = move['product_id'][0]
@@ -40,11 +40,11 @@ class product_product(osv.osv):
         moves = move_pool.read_group(cr, uid, [
             ('product_id', 'in', ids),
             ('picking_id.type', '=', 'out'),
-            ('state','in',('draft','confirmed','assigned','pending'))
+            ('state','in',('confirmed','assigned','pending'))
         ], ['product_id'], ['product_id'])
         for move in moves:
             product_id = move['product_id'][0]
-            res[product_id]['reception_count'] = move['product_id_count']
+            res[product_id]['delivery_count'] = move['product_id_count']
         return res
 
     def get_product_accounts(self, cr, uid, product_id, context=None):
@@ -370,14 +370,14 @@ class product_product(osv.osv):
                  "stored in the Stock Location of the Warehouse of this Shop, "
                  "or any of its children.\n"
                  "Otherwise, this includes goods stored in any Stock Location "
-                 "typed as 'internal'."),
+                 "with 'internal' type."),
         'virtual_available': fields.function(_product_available, multi='qty_available',
             type='float',  digits_compute=dp.get_precision('Product Unit of Measure'),
-            string='Quantity Available',
+            string='Forecasted Quantity',
             help="Forecast quantity (computed as Quantity On Hand "
                  "- Outgoing + Incoming)\n"
                  "In a context with a single Stock Location, this includes "
-                 "goods stored at this Location, or any of its children.\n"
+                 "goods stored in this location, or any of its children.\n"
                  "In a context with a single Warehouse, this includes "
                  "goods stored in the Stock Location of this Warehouse, or any "
                  "of its children.\n"
@@ -385,7 +385,7 @@ class product_product(osv.osv):
                  "stored in the Stock Location of the Warehouse of this Shop, "
                  "or any of its children.\n"
                  "Otherwise, this includes goods stored in any Stock Location "
-                 "typed as 'internal'."),
+                 "with 'internal' type."),
         'incoming_qty': fields.function(_product_available, multi='qty_available',
             type='float',  digits_compute=dp.get_precision('Product Unit of Measure'),
             string='Incoming',
@@ -399,21 +399,21 @@ class product_product(osv.osv):
                  "arriving to the Stock Location of the Warehouse of this "
                  "Shop, or any of its children.\n"
                  "Otherwise, this includes goods arriving to any Stock "
-                 "Location typed as 'internal'."),
+                 "Location with 'internal' type."),
         'outgoing_qty': fields.function(_product_available, multi='qty_available',
             type='float',  digits_compute=dp.get_precision('Product Unit of Measure'),
             string='Outgoing',
             help="Quantity of products that are planned to leave.\n"
                  "In a context with a single Stock Location, this includes "
-                 "goods leaving from this Location, or any of its children.\n"
+                 "goods leaving this Location, or any of its children.\n"
                  "In a context with a single Warehouse, this includes "
-                 "goods leaving from the Stock Location of this Warehouse, or "
+                 "goods leaving the Stock Location of this Warehouse, or "
                  "any of its children.\n"
                  "In a context with a single Shop, this includes goods "
-                 "leaving from the Stock Location of the Warehouse of this "
+                 "leaving the Stock Location of the Warehouse of this "
                  "Shop, or any of its children.\n"
-                 "Otherwise, this includes goods leaving from any Stock "
-                 "Location typed as 'internal'."),
+                 "Otherwise, this includes goods leaving any Stock "
+                 "Location with 'internal' type."),
         'track_production': fields.boolean('Track Manufacturing Lots', help="Forces to specify a Serial Number for all moves containing this product and generated by a Manufacturing Order"),
         'track_incoming': fields.boolean('Track Incoming Lots', help="Forces to specify a Serial Number for all moves containing this product and coming from a Supplier Location"),
         'track_outgoing': fields.boolean('Track Outgoing Lots', help="Forces to specify a Serial Number for all moves containing this product and going to a Customer Location"),
@@ -486,7 +486,7 @@ class product_template(osv.osv):
             string="Procurement Location",
             view_load=True,
             domain=[('usage','like','procurement')],
-            help="For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated by procurements"),
+            help="This stock location will be used, instead of the default one, as the source location for stock moves generated by procurements."),
         'property_stock_production': fields.property(
             'stock.location',
             type='many2one',
@@ -494,7 +494,7 @@ class product_template(osv.osv):
             string="Production Location",
             view_load=True,
             domain=[('usage','like','production')],
-            help="For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated by production orders"),
+            help="This stock location will be used, instead of the default one, as the source location for stock moves generated by manufacturing orders."),
         'property_stock_inventory': fields.property(
             'stock.location',
             type='many2one',
@@ -502,7 +502,7 @@ class product_template(osv.osv):
             string="Inventory Location",
             view_load=True,
             domain=[('usage','like','inventory')],
-            help="For the current product, this stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory"),
+            help="This stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory."),
         'property_stock_account_input': fields.property('account.account',
             type='many2one', relation='account.account',
             string='Stock Input Account', view_load=True,
@@ -513,8 +513,15 @@ class product_template(osv.osv):
             string='Stock Output Account', view_load=True,
             help="When doing real-time inventory valuation, counterpart journal items for all outgoing stock moves will be posted in this account, unless "
                  "there is a specific valuation account set on the destination location. When not set on the product, the one from the product category is used."),
+        'sale_delay': fields.float('Customer Lead Time', help="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."),
+        'loc_rack': fields.char('Rack', size=16),
+        'loc_row': fields.char('Row', size=16),
+        'loc_case': fields.char('Case', size=16),
     }
 
+    _defaults = {
+        'sale_delay': 7,
+    }
 product_template()
 
 class product_category(osv.osv):
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 1efc552bfa6..594843eff8d 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -17,15 +17,17 @@
         <record id="view_category_property_form" model="ir.ui.view">
             <field name="name">product.category.stock.property.form.inherit</field>
             <field name="model">product.category</field>
-            <field name="inherit_id" ref="product.product_category_form_view"/>
+            <field name="inherit_id" ref="account.view_category_property_form"/>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/sheet//group[@name='account_stock_property']" position="inside">
-                        <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
-                        <field name="property_stock_journal"/>
-                    </xpath>
+                    <group name="account_property" position="after">
+                        <group name="account_stock_property" string="Account Stock Properties" colspan="2">
+                            <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                            <field name="property_stock_valuation_account_id" domain="[('type','&lt;&gt;','view'), ('type','&lt;&gt;','consolidation')]"/>
+                            <field name="property_stock_journal"/>
+                        </group>
+                    </group>
                 </data>
             </field>
         </record>
@@ -35,6 +37,16 @@
             <field name="model">product.template</field>
             <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
+            	<group name="delay" position="inside">
+            		<field name="sale_delay" attrs="{'readonly':[('sale_ok','=',False)]}"/>
+            	</group>
+            	<group name="delay" position="after">
+            		<group name="store" string="Storage Location">
+                        <field name="loc_rack"/>
+                        <field name="loc_row"/>
+                    	<field name="loc_case"/>
+                	</group>
+                </group>
                 <page position="after" string="Information">
                     <page string="Properties">
                         <group string="Counter-Part Locations Properties" groups="stock.group_locations">
@@ -51,6 +63,63 @@
             </field>
         </record>
 
+        <record id="view_normal_procurement_locations_form" model="ir.ui.view">
+            <field name="name">product.normal.procurement.locations.inherit</field>
+            <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="arch" type="xml">
+                <group name="procurement_uom" position="before">
+                    <group name="delay" string="Delays">
+                        <label for="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
+                        <div attrs="{'invisible':[('type','=','service')]}">
+                            <field name="produce_delay" class="oe_inline"/> days
+                        </div>
+                        <field name="active"/>
+                    </group>
+                </group>
+                <xpath expr="//group[@string='Sale Conditions']" position="inside">
+                    <label for="sale_delay"/>
+                        <div>
+                            <field name="sale_delay" class="oe_inline"/> days
+                        </div>
+                </xpath>
+                <group name="status" position="before" version="7.0">
+                    <group string="Stock and Expected Variations" attrs="{'invisible': [('type', '=', 'service')]}" groups="base.group_user">
+                        <label for="qty_available"/>
+                            <div>
+                                <field name="qty_available" class="oe_inline"/>
+                                <button name="%(action_view_change_product_quantity)d" string="update"
+                                type="action"
+                                class="oe_link"/>
+                            </div>
+                            <field name="incoming_qty" class="oe_inline"/>
+                            <field name="outgoing_qty" class="oe_inline"/>
+                            <field name="virtual_available" class="oe_inline"/>
+                    </group>
+                    <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
+                        <field name="track_production" groups="stock.group_production_lot"/>
+                        <field name="track_incoming" groups="stock.group_tracking_lot"/>
+                        <field name="track_outgoing" groups="stock.group_tracking_lot"/>
+                    </group>
+                </group>
+                <group name="status" position="after" version="7.0">
+                     <group name="store" string="Storage Location">
+                         <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                         <field name="loc_rack" attrs="{'invisible':[('type','=','service')]}"/>
+                         <field name="loc_row" attrs="{'invisible':[('type','=','service')]}"/>
+                         <field name="loc_case" attrs="{'invisible':[('type','=','service')]}"/>
+                     </group>
+                </group>
+                <group name="Weights" position="after">
+                     <group name="store" groups="stock.group_locations" string="Counter-Part Locations Properties">
+                         <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
+                         <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
+                         <field name="property_stock_inventory"  attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','inventory')]"/>
+                     </group>
+                </group>
+            </field>
+        </record>
+
         <record id="view_product_standard_price_form" model="ir.ui.view">
             <field name="name">product.product.standard.price.form.inherit</field>
             <field name="model">product.product</field>
@@ -59,10 +128,10 @@
                 <field name="standard_price" position="replace" version="7.0">
                     <label string="Cost Price" for="standard_price" align="1.0" groups="base.group_user"/>
                     <div groups="base.group_user">
-                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/> - 
-                        <button name="%(action_view_change_standard_price)d" string="update"
+                        <field name="standard_price" attrs="{'readonly':[('cost_method','=','average')]}" nolabel="1"/>
+                        <button name="%(action_view_change_standard_price)d" string="- update"
                             type="action" attrs="{'invisible':[('cost_method','&lt;&gt;','average')]}"
-                            class="oe_link"/>
+                            class="oe_link" groups="product.group_costing_method"/>
                     </div>
                 </field>
             </field>
@@ -81,9 +150,9 @@
                             <field name="valuation" attrs="{'readonly':[('type', '=', 'service')]}"/>
                         </group>
                         <group colspan="2" col="2">
-                            <field name="property_stock_account_input" attrs="{'readonly':[('valuation', '!=', 'real_time')]}"
+                            <field name="property_stock_account_input" attrs="{'invisible':[('valuation', '!=', 'real_time')]}"
                                 domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
-                            <field name="property_stock_account_output" attrs="{'readonly':[('valuation', '!=', 'real_time')]}"
+                            <field name="property_stock_account_output" attrs="{'invisible':[('valuation', '!=', 'real_time')]}"
                                 domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         </group>
                     </group>
@@ -92,34 +161,6 @@
             </field>
         </record>
 
-        <record id="view_normal_stock_property_form" model="ir.ui.view">
-            <field name="name">product.normal.stock.form.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <group name="status" position="before" version="7.0">
-                    <group string="Stock and Expected Variations" attrs="{'invisible': [('type', '=', 'service')]}">
-                        <label for="qty_available"/>
-                        <div>
-                            <field name="qty_available" class="oe_inline"/>
-                            <button name="%(action_view_change_product_quantity)d" string="update"
-                                type="action" groups="stock.group_stock_manager,stock.group_stock_user"
-                                class="oe_link"/>
-                        </div>
-                        <label for="virtual_available" groups="base.group_user"/>
-                        <div groups="base.group_user">
-                            <field name="virtual_available" class="oe_inline"/>
-                            (+<field name="incoming_qty" class="oe_inline"/> -<field name="outgoing_qty" class="oe_inline"/>)
-                        </div>
-                    </group>
-                    <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
-                        <field name="track_production" groups="stock.group_production_lot"/>
-                        <field name="track_incoming" groups="stock.group_tracking_lot"/>
-                        <field name="track_outgoing" groups="stock.group_tracking_lot"/>
-                    </group>
-                </group>
-            </field>
-        </record>
 
         <record id="action_receive_move" model="ir.actions.act_window">
             <field name="name">Receptions</field>
@@ -130,7 +171,6 @@
             <field name="domain">[('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/>
-            <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to register a reception for this product. 
@@ -151,7 +191,6 @@
             <field name="domain">[('picking_id.type','=','out')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
             <field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/>
-            <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
                 Click to add a delivery order for this product.
@@ -163,66 +202,27 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="product.product_kanban_view">
-            <field name="name">Product Kanban</field>
+        <record model="ir.ui.view" id="product_kanban_stock_view">
+            <field name="name">Product Kanban Stock</field>
             <field name="model">product.product</field>
+            <field name="inherit_id" ref="product.product_kanban_view"/>
             <field name="arch" type="xml">
-                <kanban>
-                    <field name="color"/>
-                    <field name="type"/>
-                    <field name="image_medium"/>
-                    <field name="list_price"/>
+                <field name="list_price" position="after">
                     <field name="reception_count"/>
                     <field name="delivery_count"/>
-                    <templates>
-                        <t t-name="kanban-box">
-                            <div class="oe_product_vignette">
-                                <div class="oe_product_img">
-                                <a type="edit"><img t-att-src="kanban_image('product.product', 'image_medium', record.id.value)" class="oe_product_photo"/></a>
-                                </div>
-                                <div class="oe_product_desc">
-                                    <h4><a type="edit"><field name="name"></field></a></h4>
-                                    <ul>
-                                        <li t-if="record.code.raw_value">Code: <field name="code"/></li>
-                                        <li t-if="record.type.raw_value != 'service'">Stock on hand: <field name="qty_available"/> <field name="uom_id"/></li>
-                                        <li t-if="record.type.raw_value != 'service'">Stock available: <field name="virtual_available"/> <field name="uom_id"/></li>
-                                        <li>Price: <field name="lst_price"></field></li>
-                                        <!-- TODO the 'groups' attribute doesn't work in kanban views -->
-                                        <li groups="base.group_user">Cost: <field name="standard_price"></field></li>
-                                    </ul>
-                                    <div groups="base.group_user">
-                                        <a name="%(action_receive_move)d" type="action">
-                                            <t t-if="record.reception_count.value">Receptions(<t t-esc="record.reception_count.value"/>)</t>
-                                        </a>
-                                        <a name="%(action_deliver_move)d" type="action">
-                                            <t t-if="record.delivery_count.value">Deliveries(<t t-esc="record.delivery_count.value"/>)</t>
-                                        </a>
-                                    </div>
-                                </div>
-                            </div>
-                            <script>
-                                $('.oe_product_photo').load(function() { if($(this).width() > $(this).height()) { $(this).addClass('oe_product_photo_wide') } });
-                            </script>
-                            <div></div>
-                        </t>
-                    </templates>
-                </kanban>
-            </field>
-        </record>
-
-        <record id="view_normal_property_form" model="ir.ui.view">
-            <field name="name">product.normal.stock.property.form.inherit</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <group name="store" position="after">
-                    <group name="store" groups="stock.group_locations">
-                        <separator string="Counter-Part Locations Properties" colspan="2"/>
-                        <field name="property_stock_procurement" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','procurement')]"/>
-                        <field name="property_stock_production" attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','production')]"/>
-                        <field name="property_stock_inventory"  attrs="{'readonly':[('type','=','service')]}" domain="[('usage','=','inventory')]"/>
-                    </group>
-                </group>
+                </field>
+                <xpath expr="//div[@name='tags']" position="inside">
+                    <a name="%(action_receive_move)d" type="action" t-if="record.reception_count.raw_value>0">
+                        <t t-esc="record.reception_count.value"/> Receptions
+                    </a>
+                    <a name="%(action_deliver_move)d" type="action" t-if="record.delivery_count.raw_value>0">
+                        <t t-esc="record.delivery_count.value"/> Deliveries
+                    </a>
+                </xpath>
+                <ul position="inside">
+                    <li t-if="record.type.raw_value != 'service'">On hand: <field name="qty_available"/> <field name="uom_id"/></li>
+                    <li t-if="record.type.raw_value != 'service'">Forecasted: <field name="virtual_available"/> <field name="uom_id"/></li>
+                </ul>
             </field>
         </record>
 
diff --git a/addons/stock/report/lot_overview.py b/addons/stock/report/lot_overview.py
index 89974fa122b..bf2fd32e32c 100644
--- a/addons/stock/report/lot_overview.py
+++ b/addons/stock/report/lot_overview.py
@@ -34,7 +34,7 @@ class lot_overview(report_sxw.rml_parse):
             'grand_total_price':self._grand_total,
         })
 
-    def process(self,location_id):
+    def process(self, location_id):
         location_obj = pooler.get_pool(self.cr.dbname).get('stock.location')
         data = location_obj._product_get_report(self.cr,self.uid, [location_id])
 
diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml
index 9662eede03b..82c402a3fdf 100644
--- a/addons/stock/report/lot_overview.rml
+++ b/addons/stock/report/lot_overview.rml
@@ -184,7 +184,7 @@
                 <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account', currency_obj = o.company_id.currency_id)]]</para>
               </td>
             </tr>
           </blockTable>
@@ -198,7 +198,7 @@
               <para style="terp_default_Bold_9">Total:</para>
             </td>
             <td>
-              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
+              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account', currency_obj = o.company_id.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -215,7 +215,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account', currency_obj = o.company_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/stock/report/lot_overview_all.py b/addons/stock/report/lot_overview_all.py
index 0b4edcaecf4..552949ec4b2 100644
--- a/addons/stock/report/lot_overview_all.py
+++ b/addons/stock/report/lot_overview_all.py
@@ -34,7 +34,7 @@ class lot_overview_all(report_sxw.rml_parse):
             'grand_total_price':self._grand_total,
         })
 
-    def process(self,location_id):
+    def process(self, location_id):
         location_obj = pooler.get_pool(self.cr.dbname).get('stock.location')
         data = location_obj._product_get_all_report(self.cr,self.uid, [location_id])
         data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['complete_name'])[0]['complete_name']
diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml
index 3b2dc5f7751..51b93c6323b 100644
--- a/addons/stock/report/lot_overview_all.rml
+++ b/addons/stock/report/lot_overview_all.rml
@@ -184,7 +184,7 @@
                 <para style="terp_default_Right_9">[[ formatLang(p['price'], dp='Account') ]]</para>
               </td>
               <td>
-                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account') ]] [[ o.company_id.currency_id.symbol]]</para>
+                <para style="terp_default_Right_9">[[ formatLang(p['price_value'], dp='Account', currency_obj = o.company_id.currency_id)]]</para>
               </td>
             </tr>
           </blockTable>
@@ -198,7 +198,7 @@
               <para style="terp_default_Bold_9">Total:</para>
             </td>
             <td>
-              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
+              <para style="terp_tblheader_Details_Right">[[ formatLang(price_total(), dp='Account', currency_obj = o.company_id.currency_id) ]]</para>
             </td>
           </tr>
         </blockTable>
@@ -215,7 +215,7 @@
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account') ]] [[ o.company_id.currency_id.symbol ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(grand_total_price(), dp='Account', currency_obj = o.company_id.currency_id) ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index 27141c917a9..29a53fba7a2 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -29,14 +29,7 @@ class picking(report_sxw.rml_parse):
         super(picking, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
-            'get_qtytotal':self._get_qtytotal
         })
-    def _get_qtytotal(self,move_lines):
-        total = 0.0
-        uom = move_lines[0].product_uom.name
-        for move in move_lines:
-            total+=move.product_qty
-        return {'quantity':total,'uom':uom}
 
 report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 898c078157d..5f395c9f005 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -299,21 +299,6 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="388.0,56.0,77.0" style="Table2">
-      <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Centre">Total</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(get_qtytotal(picking.move_lines)['quantity']) ]] [[ get_qtytotal(picking.move_lines)['uom'] ]]</para>
-        </td>
-      </tr>
-    </blockTable>
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
diff --git a/addons/stock/report/product_stock.py b/addons/stock/report/product_stock.py
index b7dd254234c..1d882ad632b 100644
--- a/addons/stock/report/product_stock.py
+++ b/addons/stock/report/product_stock.py
@@ -42,7 +42,9 @@ class external_pdf(render):
 
 
 class report_stock(report_int):
-    def create(self, cr, uid, ids, datas, context={}):
+    def create(self, cr, uid, ids, datas, context=None):
+        if context is None:
+            context = {}
         product_ids = ids
         if 'location_id' in context:
             location_id = context['location_id']
diff --git a/addons/stock/report/report_stock.py b/addons/stock/report/report_stock.py
index a711cdf23ee..19fae806fc0 100644
--- a/addons/stock/report/report_stock.py
+++ b/addons/stock/report/report_stock.py
@@ -74,10 +74,9 @@ class stock_report_prodlots(osv.osv):
                 group by location_id, product_id, prodlot_id
             )""")
 
-    def unlink(self, cr, uid, ids, context={}):
+    def unlink(self, cr, uid, ids, context=None):
         raise osv.except_osv(_('Error!'), _('You cannot delete any record!'))
 
-
 stock_report_prodlots()
 
 class stock_report_tracklots(osv.osv):
@@ -130,8 +129,8 @@ class stock_report_tracklots(osv.osv):
                 ) as report
                 group by location_id, product_id, tracking_id
             )""")
-        
-    def unlink(self, cr, uid, ids, context={}):
+
+    def unlink(self, cr, uid, ids, context=None):
         raise osv.except_osv(_('Error!'), _('You cannot delete any record!'))
 
 stock_report_tracklots()
@@ -162,6 +161,7 @@ class report_stock_lines_date(osv.osv):
                 where p.active='true'
                 group by p.id
             )""")
+
 report_stock_lines_date()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/report_stock_move.py b/addons/stock/report/report_stock_move.py
index afd6bd4d1f4..4f8aedcd5a6 100644
--- a/addons/stock/report/report_stock_move.py
+++ b/addons/stock/report/report_stock_move.py
@@ -153,7 +153,8 @@ class report_stock_inventory(osv.osv):
         'date': fields.datetime('Date', 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')]),
+            ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+            ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True),
         'partner_id':fields.many2one('res.partner', 'Partner', readonly=True),
         'product_id':fields.many2one('product.product', 'Product', readonly=True),
         'product_categ_id':fields.many2one('product.category', 'Product Category', readonly=True),
@@ -166,6 +167,7 @@ class report_stock_inventory(osv.osv):
               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\'.\
               \nThe state is \'Waiting\' if the move is waiting for another one.'),
         'location_type': fields.selection([('supplier', 'Supplier Location'), ('view', 'View'), ('internal', 'Internal Location'), ('customer', 'Customer Location'), ('inventory', 'Inventory'), ('procurement', 'Procurement'), ('production', 'Production'), ('transit', 'Transit Location for Inter-Companies Transfers')], 'Location Type', required=True),
+        'scrap_location': fields.boolean('scrap'),
     }
     def init(self, cr):
         tools.drop_view_if_exists(cr, 'report_stock_inventory')
@@ -173,8 +175,10 @@ class report_stock_inventory(osv.osv):
 CREATE OR REPLACE view report_stock_inventory AS (
     (SELECT
         min(m.id) as id, m.date as date,
+        to_char(m.date, 'YYYY') as year,
+        to_char(m.date, 'MM') as month,
         m.partner_id as partner_id, m.location_id as location_id,
-        m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
+        m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type, l.scrap_location as scrap_location,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
 
@@ -191,12 +195,14 @@ CREATE OR REPLACE view report_stock_inventory AS (
             LEFT JOIN stock_location l ON (m.location_id=l.id)
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.partner_id, m.location_id,  m.location_dest_id,
-        m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id
+        m.prodlot_id, m.date, m.state, l.usage, l.scrap_location, m.company_id, pt.uom_id, to_char(m.date, 'YYYY'), to_char(m.date, 'MM')
 ) UNION ALL (
     SELECT
         -m.id as id, m.date as date,
+        to_char(m.date, 'YYYY') as year,
+        to_char(m.date, 'MM') as month,
         m.partner_id as partner_id, m.location_dest_id as location_id,
-        m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type,
+        m.product_id as product_id, pt.categ_id as product_categ_id, l.usage as location_type, l.scrap_location as scrap_location,
         m.company_id,
         m.state as state, m.prodlot_id as prodlot_id,
         coalesce(sum(pt.standard_price * m.product_qty * pu.factor / pu2.factor)::decimal, 0.0) as value,
@@ -212,7 +218,7 @@ CREATE OR REPLACE view report_stock_inventory AS (
             LEFT JOIN stock_location l ON (m.location_dest_id=l.id)
     GROUP BY
         m.id, m.product_id, m.product_uom, pt.categ_id, m.partner_id, m.location_id, m.location_dest_id,
-        m.prodlot_id, m.date, m.state, l.usage, m.company_id, pt.uom_id
+        m.prodlot_id, m.date, m.state, l.usage, l.scrap_location, m.company_id, pt.uom_id, to_char(m.date, 'YYYY'), to_char(m.date, 'MM')
     )
 );
         """)
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index a0227788d97..4f3e256389c 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -6,13 +6,14 @@
         id="stock.next_id_61"
         name="Warehouse"
         sequence="15"
-        parent="base.menu_reporting"/>
+        parent="base.menu_reporting"
+        groups="group_stock_manager"/>
 
     <record id="view_stock_tree" model="ir.ui.view">
         <field name="name">report.stock.move.tree</field>
         <field name="model">report.stock.move</field>
         <field name="arch" type="xml">
-            <tree string="Moves Analysis">
+            <tree string="Moves Analysis" create="false">
                 <field name="date" invisible="1"/>
                 <field name="year" invisible="1" />
                 <field name="month" invisible="1"/>
@@ -104,7 +105,7 @@
         <field name="name">report.stock.inventory.tree</field>
         <field name="model">report.stock.inventory</field>
         <field name="arch" type="xml">
-            <tree string="Inventory Analysis">
+            <tree string="Inventory Analysis" create="false">
                 <field name="date" invisible="1"/>
                 <field name="year" invisible="1" />
                 <field name="month" invisible="1"/>
@@ -154,7 +155,7 @@
                     <field name="state"/>
                     <field name="location_type"/>
                     <field name="date"/>
-                    <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('location_type','=','scrap')]"/>
+                    <filter icon="terp-go-home" name="location_type_scrap" string="Scrap" domain="[('scrap_location','=','True')]"/>
                 </group>
                 <group expand="1" string="Group By..." >
                     <filter string="Partner" name="group_partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
@@ -163,8 +164,10 @@
                     <filter name="group_lot" string="Lot" icon="terp-accessories-archiver" context="{'group_by':'prodlot_id'}"/>
                     <filter name="group_company" string="Company" groups="base.group_multi_company" icon="terp-go-home" context="{'group_by':'company_id'}"/>
                     <filter name="group_location" string="Location" icon="terp-go-home" context="{'group_by':'location_id'}"/>
-                    <filter string="Date" icon="terp-go-month" context="{'group_by':'date'}"/>
                     <filter string="Status" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
+                    <filter string="Date" icon="terp-go-today" context="{'group_by':'date'}"/>
+                    <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>
diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml
index f87a212d43b..f56d738636d 100644
--- a/addons/stock/report/report_stock_view.xml
+++ b/addons/stock/report/report_stock_view.xml
@@ -20,7 +20,7 @@
             <field name="name">report.stock.lines.date.tree</field>
             <field name="model">report.stock.lines.date</field>
             <field name="arch" type="xml">
-                <tree string="Dates of Inventories">
+                <tree string="Dates of Inventories" create="false">
                     <field name="product_id"/>
                     <field name="date" />
                 </tree>
diff --git a/addons/stock/report/stock_by_location.py b/addons/stock/report/stock_by_location.py
index 2dbe03a347e..8ed8800fb29 100644
--- a/addons/stock/report/stock_by_location.py
+++ b/addons/stock/report/stock_by_location.py
@@ -26,7 +26,7 @@ from report.interface import toxml
 #FIXME: we should use toxml
 
 class report_custom(report_rml):
-    def create_xml(self, cr, uid, ids, datas, context={}):
+    def create_xml(self, cr, uid, ids, datas, context=None):
         config = """
         <config>
             <date>09/09/2005</date>
diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py
index 5ee58bb9d2c..d92de2805b5 100644
--- a/addons/stock/report/stock_graph.py
+++ b/addons/stock/report/stock_graph.py
@@ -22,6 +22,7 @@ from pychart import *
 import pychart.legend
 import time
 from report.misc import choice_colors
+import tools
 
 #
 # Draw a graph for stocks
@@ -41,7 +42,7 @@ class stock_graph(object):
             product_name=product_name.replace('/', '//')
         if product_id not in self._datas:
             self._datas[product_id] = {}
-        self._names[product_id] = product_name
+        self._names[product_id] = tools.ustr(product_name)
         for (dt,stock) in datas:
             if not dt in self._datas[product_id]:
                 self._datas[product_id][dt]=0
diff --git a/addons/stock/report/stock_inventory_move_report.py b/addons/stock/report/stock_inventory_move_report.py
index e8c0d44bcc1..762373f1250 100644
--- a/addons/stock/report/stock_inventory_move_report.py
+++ b/addons/stock/report/stock_inventory_move_report.py
@@ -30,7 +30,7 @@ class stock_inventory_move(report_sxw.rml_parse):
              'qty_total':self._qty_total
         })
 
-    def _qty_total(self,objects):
+    def _qty_total(self, objects):
         total = 0.0
         uom = objects[0].product_uom.name
         for obj in objects:
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index 2e7018f4409..b150847153e 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -26,51 +26,50 @@ class stock_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
 
     _columns = {
-        'module_claim_from_delivery': fields.boolean("allow claim on deliveries",
+        'module_claim_from_delivery': fields.boolean("Allow claim on deliveries",
             help="""Adds a Claim link to the delivery order.
                 This installs the module claim_from_delivery."""),
-        'module_stock_invoice_directly': fields.boolean("create and open the invoice when the user finish a delivery order",
+        'module_stock_invoice_directly': fields.boolean("Create and open the invoice when the user finish a delivery order",
             help="""This allows to automatically launch the invoicing wizard if the delivery is
                 to be invoiced when you send or deliver goods.
                 This installs the module stock_invoice_directly."""),
-        'module_product_expiry': fields.boolean("expiry date on lots",
+        'module_product_expiry': fields.boolean("Expiry date on serial numbers",
             help="""Track different dates on products and serial numbers.
-                The following dates can be tracked:
-                    - end of life
-                    - best before date
-                    - removal date
-                    - alert date.
-                This installs the module product_expiry."""),
-        'module_stock_location': fields.boolean("create push/pull logistic rules",
+The following dates can be tracked:
+    - end of life
+    - best before date
+    - removal date
+    - alert date.
+This installs the module product_expiry."""),
+        'module_stock_location': fields.boolean("Create push/pull logistic rules",
             help="""Provide push and pull inventory flows.  Typical uses of this feature are:
                 manage product manufacturing chains, manage default locations per product,
                 define routes within your warehouse according to business needs, etc.
                 This installs the module stock_location."""),
-        'group_uom': fields.boolean("manage units of measure on products",
+        'group_uom': fields.boolean("Manage different units of measure for products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
-        'group_uos': fields.boolean("invoice products in a different unit of measure than the sale order",
+        'group_uos': fields.boolean("Invoice products in a different unit of measure than the sale order",
             implied_group='product.group_uos',
             help="""Allows you to sell units of a product, but invoice based on a different unit of measure.
                 For instance, you can sell pieces of meat that you invoice based on their weight."""),
-        'group_stock_packaging': fields.boolean("allow to define several packaging methods on products",
+        'group_stock_packaging': fields.boolean("Allow to define several packaging methods on products",
             implied_group='product.group_stock_packaging',
             help="""Allows you to create and manage your packaging dimensions and types you want to be maintained in your system."""),
-        'group_stock_production_lot': fields.boolean("track serial number on products",
+        'group_stock_production_lot': fields.boolean("Track serial number on products",
             implied_group='stock.group_production_lot',
-            help="""This allows you to manage products by using serial numbers.
-                When you select a lot, you can get the upstream or downstream traceability of the products contained in lot."""),
-        'group_stock_tracking_lot': fields.boolean("track serial number on logistic units (pallets)",
+            help="""This allows you to manage products by using serial numbers. When you select a serial number on product moves, you can get the upstream or downstream traceability of that product."""),
+        'group_stock_tracking_lot': fields.boolean("Track serial number on logistic units (pallets)",
             implied_group='stock.group_tracking_lot',
-            help="""Allows you to get the upstream or downstream traceability of the products contained in lot."""),
-        'group_stock_inventory_valuation': fields.boolean("generate accounting entries per stock movement",
+            help="""When you select a serial number on product moves, you can get the upstream or downstream traceability of that product."""),
+        'group_stock_inventory_valuation': fields.boolean("Generate accounting entries per stock movement",
             implied_group='stock.group_inventory_valuation',
             help="""Allows to configure inventory valuations on products and product categories."""),
-        'group_stock_multiple_locations': fields.boolean("manage multiple locations and warehouses",
+        'group_stock_multiple_locations': fields.boolean("Manage multiple locations and warehouses",
             implied_group='stock.group_locations',
             help="""This allows to configure and use multiple stock locations and warehouses,
                 instead of having a single default one."""),
-        'group_product_variant': fields.boolean("support multiple variants per products  ",
+        'group_product_variant': fields.boolean("Support multiple variants per products  ",
             implied_group='product.group_product_variant',
             help="""Allow to manage several variants per product. As an example, if you  sell T-Shirts, for the same "Linux T-Shirt", you may have variants on  sizes or colors; S, M, L, XL, XXL."""),
         'decimal_precision': fields.integer('Decimal precision on weight', help="As an example, a decimal precision of 2 will allow weights like: 9.99 kg, whereas a decimal precision of 4 will allow weights like:  0.0231 kg."),
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index f3abb9bbc95..9cc8553f4ea 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -2,6 +2,16 @@
 <openerp>
     <data>
 
+        <!-- After installation of the module, open the related menu -->
+        <record id="action_client_warehouse_menu" model="ir.actions.client">
+            <field name="name">Open Warehouse Menu</field>
+            <field name="tag">reload</field>
+            <field name="params" eval="{'menu_id': ref('menu_stock_root')}"/>
+        </record>
+        <record id="base.open_menu" model="ir.actions.todo">
+            <field name="action_id" ref="action_client_warehouse_menu"/>
+            <field name="state">open</field>
+        </record>
         <record id="view_stock_config_settings" model="ir.ui.view">
             <field name="name">stock settings</field>
             <field name="model">stock.config.settings</field>
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index f56696bcbaa..84b475adf1d 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -21,11 +21,11 @@ access_stock_production_lot_manager,stock.production.lot manager,model_stock_pro
 access_stock_production_lot_user,stock.production.lot user,model_stock_production_lot,stock.group_stock_user,1,1,1,1
 access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1
 access_stock_move_manager,stock.move manager,model_stock_move,stock.group_stock_manager,1,1,0,0
-access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,0,0,0
+access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,1,1,0
 access_stock_move_warehouse_manager,stock.move.manager,model_stock_move,stock.group_stock_manager,1,1,1,1
-access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,0,0,0
+access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,1,1,0
 access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,1,1,1
-access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,0,0,0
+access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,1,1,0
 access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,1,1,1
 access_stock_report_prodlots,stock.report.prodlots,model_stock_report_prodlots,stock.group_stock_manager,1,0,0,0
 access_stock_location_sale_manager,stock.location sale manager,model_stock_location,base.group_sale_manager,1,0,0,0
@@ -36,8 +36,8 @@ access_stock_report_tracklots,stock.report.tracklots,model_stock_report_tracklot
 access_report_stock_move_user,report.stock.move user,model_report_stock_move,stock.group_stock_user,1,0,0,0
 access_report_stock_move_manager,report.stock.move manager,model_report_stock_move,stock.group_stock_manager,1,1,1,1
 access_report_stock_inventory_user,report.stock.inventory user,model_report_stock_inventory,stock.group_stock_user,1,1,1,1
-access_product_product_stock_user,product_product_stock_user,product.model_product_product,stock.group_stock_user,1,0,0,0
-access_product_template_stock_user,product.template stock user,product.model_product_template,stock.group_stock_user,1,0,0,0
+access_product_product_stock_user,product_product_stock_user,product.model_product_product,stock.group_stock_user,1,1,0,0
+access_product_template_stock_user,product.template stock user,product.model_product_template,stock.group_stock_user,1,1,0,0
 access_account_invoice_user,account.invoice stock user,account.model_account_invoice,stock.group_stock_user,1,1,1,0
 access_account_invoice_line_user,account.invoice.line stock user,account.model_account_invoice_line,stock.group_stock_user,1,1,1,0
 access_account_invoice_tax_user,account.invoice.tax stock user,account.model_account_invoice_tax,stock.group_stock_user,1,1,1,0
@@ -61,3 +61,4 @@ access_product_group_res_partner_stock_manager,res_partner group_stock_manager,b
 access_product_pricelist_version_stock_manager,product.pricelist.version stock_manager,product.model_product_pricelist_version,stock.group_stock_manager,1,1,1,1
 access_product_pricelist_item_stock_manager,product.pricelist.item stock_manager,product.model_product_pricelist_item,stock.group_stock_manager,1,1,1,1
 access_account_account_stock_manager,account.account stock manager,account.model_account_account,stock.group_stock_manager,1,0,0,0
+access_board_stock_user,board.board user,board.model_board_board,stock.group_stock_user,1,1,0,0
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index c9f8a03a378..f052c458632 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -5,6 +5,7 @@
     <record id="group_stock_user" model="res.groups">
         <field name="name">User</field>
         <field name="category_id" ref="base.module_category_warehouse_management"/>
+        <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
     <record id="group_stock_manager" model="res.groups">
         <field name="name">Manager</field>
diff --git a/addons/stock/static/src/css/stock.css b/addons/stock/static/src/css/stock.css
index 449c1102fce..1efbaf5e3c4 100644
--- a/addons/stock/static/src/css/stock.css
+++ b/addons/stock/static/src/css/stock.css
@@ -9,8 +9,8 @@
 }
 
 .oe_product_img {
-    width: 150px;
-    height: 150px;
+    width: 80px;
+    height: 80px;
     text-align: center;
     overflow: hidden;
     -moz-border-radius: 3px;
@@ -25,15 +25,15 @@
 }
 
 .oe_product_photo {
-    width: 150px;
+    width: 80px;
     height: auto;
-    clip: rect(5px, 100px, 105px, 0px);
+    clip: rect(5px, 70px, 75px, 0px);
 }
 
 .oe_product_photo_wide {
-    height: 150px;
+    height: 80px;
     width: auto;
-    clip: rect(0px, 110px, 100px, 10px);
+    clip: rect(0px, 80px, 70px, 10px);
 }
 
 .oe_product_desc {
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index b770712429c..859cda8ce94 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -346,22 +346,28 @@ class stock_location(osv.osv):
         })
         return product_obj.get_product_available(cr, uid, product_ids, context=context)
 
-    def _product_get(self, cr, uid, id, product_ids=False, context=None, states=['done']):
+    def _product_get(self, cr, uid, id, product_ids=False, context=None, states=None):
         """
         @param product_ids:
         @param states:
         @return:
         """
+        if states is None:
+            states = ['done']
         ids = id and [id] or []
         return self._product_get_multi_location(cr, uid, ids, product_ids, context=context, states=states)
 
-    def _product_all_get(self, cr, uid, id, product_ids=False, context=None, states=['done']):
+    def _product_all_get(self, cr, uid, id, product_ids=False, context=None, states=None):
+        if states is None:
+            states = ['done']
         # build the list of ids of children of the location given by id
         ids = id and [id] or []
         location_ids = self.search(cr, uid, [('location_id', 'child_of', ids)])
         return self._product_get_multi_location(cr, uid, location_ids, product_ids, context, states)
 
-    def _product_virtual_get(self, cr, uid, id, product_ids=False, context=None, states=['done']):
+    def _product_virtual_get(self, cr, uid, id, product_ids=False, context=None, states=None):
+        if states is None:
+            states = ['done']
         return self._product_all_get(cr, uid, id, product_ids, context, ['confirmed', 'waiting', 'assigned', 'done'])
 
     def _product_reserve(self, cr, uid, ids, product_id, product_qty, context=None, lock=False):
@@ -419,7 +425,7 @@ class stock_location(osv.osv):
                     # so we ROLLBACK to the SAVEPOINT to restore the transaction to its earlier
                     # state, we return False as if the products were not available, and log it:
                     cr.execute("ROLLBACK TO stock_location_product_reserve")
-                    _logger.warn("Failed attempt to reserve %s x product %s, likely due to another transaction already in progress. Next attempt is likely to work. Detailed error available at DEBUG level.", product_qty, product_id)
+                    _logger.warning("Failed attempt to reserve %s x product %s, likely due to another transaction already in progress. Next attempt is likely to work. Detailed error available at DEBUG level.", product_qty, product_id)
                     _logger.debug("Trace of the failed product reservation attempt: ", exc_info=True)
                     return False
 
@@ -510,15 +516,19 @@ class stock_tracking(osv.osv):
         return self.name_get(cr, user, ids, context)
 
     def name_get(self, cr, uid, ids, context=None):
+        """Append the serial to the name"""
         if not len(ids):
             return []
-        res = [(r['id'], r['name']+' ['+(r['serial'] or '')+']') for r in self.read(cr, uid, ids, ['name', 'serial'], context)]
+        res = [ (r['id'], r['serial'] and '%s [%s]' % (r['name'], r['serial'])
+                                      or r['name'] )
+                for r in self.read(cr, uid, ids, ['name', 'serial'],
+                                   context=context) ]
         return res
 
     def unlink(self, cr, uid, ids, context=None):
         raise osv.except_osv(_('Error!'), _('You cannot remove a lot line.'))
 
-    def action_traceability(self, cr, uid, ids, context={}):
+    def action_traceability(self, cr, uid, ids, context=None):
         """ It traces the information of a product
         @param self: The object pointer.
         @param cr: A database cursor
@@ -608,7 +618,7 @@ class stock_picking(osv.osv):
 
     def create(self, cr, user, vals, context=None):
         if ('name' not in vals) or (vals.get('name')=='/'):
-            seq_obj_name =  'stock.picking.' + vals['type']
+            seq_obj_name =  self._name
             vals['name'] = self.pool.get('ir.sequence').get(cr, user, seq_obj_name)
         new_id = super(stock_picking, self).create(cr, user, vals, context)
         if new_id:
@@ -617,9 +627,9 @@ class stock_picking(osv.osv):
 
     _columns = {
         'name': fields.char('Reference', size=64, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
-        'origin': fields.char('Source', size=64, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Reference of the document", select=True),
+        'origin': fields.char('Source Document', size=64, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Reference of the document", select=True),
         'backorder_id': fields.many2one('stock.picking', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
-        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, readonly=True, help="Shipping type specify, goods coming in or going out."),
+        'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, help="Shipping type specify, goods coming in or going out."),
         'note': fields.text('Notes', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'stock_journal_id': fields.many2one('stock.journal','Stock Journal', select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'location_id': fields.many2one('stock.location', 'Location', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Keep empty if you produce at the location where the finished products are needed." \
@@ -643,8 +653,8 @@ class stock_picking(osv.osv):
             * Cancelled: has been cancelled, can't be confirmed anymore"""
         ),
         'min_date': fields.function(get_min_max_date, fnct_inv=_set_minimum_date, multi="min_max_date",
-                 store=True, type='datetime', string='Scheduled Date', select=1, help="Scheduled date for the shipment to be processed"),
-        'date': fields.datetime('Order Date', help="Date of order", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
+                 store=True, type='datetime', string='Scheduled Time', select=1, help="Scheduled time for the shipment to be processed"),
+        'date': fields.datetime('Time', help="Creation time, usually the time of the order.", select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'date_done': fields.datetime('Date Done', help="Date of Completion", states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}),
         'max_date': fields.function(get_min_max_date, fnct_inv=_set_maximum_date, multi="min_max_date",
                  store=True, type='datetime', string='Max. Expected Date', select=2),
@@ -673,6 +683,14 @@ class stock_picking(osv.osv):
     ]
 
     def action_process(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        """Open the partial picking wizard"""
+        context.update({
+            'active_model': self._name,
+            'active_ids': ids,
+            'active_id': len(ids) and ids[0] or False
+        })
         return {
             'view_type': 'form',
             'view_mode': 'form',
@@ -702,25 +720,37 @@ class stock_picking(osv.osv):
             for move in picking_obj.move_lines:
                 move_obj.write(cr, uid, [move.id], {'tracking_id': False,'prodlot_id':False, 'move_history_ids2': [(6, 0, [])], 'move_history_ids': [(6, 0, [])]})
         return res
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
+        if view_type == 'form' and not view_id:
+            mod_obj = self.pool.get('ir.model.data')
+            if self._name == "stock.picking.in":
+                model,view_id = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_in_form')
+            if self._name == "stock.picking.out":
+                model,view_id = mod_obj.get_object_reference(cr, uid, 'stock', 'view_picking_out_form')
+        return super(stock_picking,self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
 
     def onchange_partner_in(self, cr, uid, context=None, partner_id=None):
         return {}
 
     def action_explode(self, cr, uid, moves, context=None):
+        """Hook to allow other modules to split the moves of a picking."""
         return moves
 
     def action_confirm(self, cr, uid, ids, context=None):
         """ Confirms picking.
         @return: True
         """
+        pickings = self.browse(cr, uid, ids, context=context)
+        for picking in pickings:
+            if picking.state <> 'confirmed':
+                self.confirm_send_note(cr, uid, [picking.id], context=context)
         self.write(cr, uid, ids, {'state': 'confirmed'})
         todo = []
-        for picking in self.browse(cr, uid, ids, context=context):
+        for picking in pickings:
             for r in picking.move_lines:
                 if r.state == 'draft':
                     todo.append(r.id)
-
-
         todo = self.action_explode(cr, uid, todo, context)
         if len(todo):
             self.pool.get('stock.move').action_confirm(cr, uid, todo, context=context)
@@ -846,14 +876,20 @@ class stock_picking(osv.osv):
     # TODO: change and create a move if not parents
     #
     def action_done(self, cr, uid, ids, context=None):
-        """ Changes picking state to done.
+        """Changes picking state to done.
+        
+        This method is called at the end of the workflow by the activity "done".
         @return: True
         """
         self.write(cr, uid, ids, {'state': 'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S')})
         return True
 
     def action_move(self, cr, uid, ids, context=None):
-        """ Changes move state to assigned.
+        """Process the Stock Moves of the Picking
+        
+        This method is called by the workflow by the activity "move".
+        Normally that happens when the signal button_done is received (button 
+        "Done" pressed on a Picking view). 
         @return: True
         """
         for pick in self.browse(cr, uid, ids, context=context):
@@ -1154,8 +1190,9 @@ class stock_picking(osv.osv):
                 return True
             for move in pick.move_lines:
                 if move.state == 'done':
-                    raise osv.except_osv(_('Error!'), _('You cannot cancel picking because stock move is in done state!'))
+                    raise osv.except_osv(_('Error!'), _('You cannot cancel the picking as some moves have been done. You should cancel the picking lines.'))
         return True
+
     def unlink(self, cr, uid, ids, context=None):
         move_obj = self.pool.get('stock.move')
         if context is None:
@@ -1255,9 +1292,14 @@ class stock_picking(osv.osv):
             for move in too_few:
                 product_qty = move_product_qty[move.id]
                 if not new_picking:
+                    new_picking_name = pick.name
+                    self.write(cr, uid, [pick.id], 
+                               {'name': sequence_obj.get(cr, uid,
+                                            'stock.picking.%s'%(pick.type)),
+                               })
                     new_picking = self.copy(cr, uid, pick.id,
                             {
-                                'name': sequence_obj.get(cr, uid, 'stock.picking.%s'%(pick.type)),
+                                'name': new_picking_name,
                                 'move_lines' : [],
                                 'state':'draft',
                             })
@@ -1277,9 +1319,10 @@ class stock_picking(osv.osv):
                     move_obj.copy(cr, uid, move.id, defaults)
                 move_obj.write(cr, uid, [move.id],
                         {
-                            'product_qty' : move.product_qty - partial_qty[move.id],
+                            'product_qty': move.product_qty - partial_qty[move.id],
                             'product_uos_qty': move.product_qty - partial_qty[move.id], #TODO: put correct uos_qty
-
+                            'prodlot_id': False,
+                            'tracking_id': False,
                         })
 
             if new_picking:
@@ -1308,14 +1351,14 @@ class stock_picking(osv.osv):
                 wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_confirm', cr)
                 # Then we finish the good picking
                 self.write(cr, uid, [pick.id], {'backorder_id': new_picking})
-                self.action_move(cr, uid, [new_picking])
+                self.action_move(cr, uid, [new_picking], context=context)
                 wf_service.trg_validate(uid, 'stock.picking', new_picking, 'button_done', cr)
                 wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
                 delivered_pack_id = new_picking
                 back_order_name = self.browse(cr, uid, delivered_pack_id, context=context).name
                 self.back_order_send_note(cr, uid, ids, back_order_name, context)
             else:
-                self.action_move(cr, uid, [pick.id])
+                self.action_move(cr, uid, [pick.id], context=context)
                 wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr)
                 delivered_pack_id = pick.id
                 self.ship_done_send_note(cr, uid, ids, context)
@@ -1324,6 +1367,22 @@ class stock_picking(osv.osv):
             res[pick.id] = {'delivered_picking': delivered_pack.id or False}
 
         return res
+    
+    # views associated to each picking type
+    _VIEW_LIST = {
+        'out': 'view_picking_out_form',
+        'in': 'view_picking_in_form',
+        'internal': 'view_picking_form',
+    }
+    def _get_view_id(self, cr, uid, type):
+        """Get the view id suiting the given type
+        
+        @param type: the picking type as a string
+        @return: view i, or False if no view found
+        """
+        res = self.pool.get('ir.model.data').get_object_reference(cr, uid, 
+            'stock', self._VIEW_LIST.get(type, 'view_picking_form'))            
+        return res and res[1] or False
 
     def log_picking(self, cr, uid, ids, context=None):
         """ This function will create log messages for picking.
@@ -1334,7 +1393,6 @@ class stock_picking(osv.osv):
         """
         if context is None:
             context = {}
-        data_obj = self.pool.get('ir.model.data')
         for pick in self.browse(cr, uid, ids, context=context):
             msg=''
             if pick.auto_picking:
@@ -1344,11 +1402,6 @@ class stock_picking(osv.osv):
                 'in':_('Reception'),
                 'internal': _('Internal picking'),
             }
-            view_list = {
-                'out': 'view_picking_out_form',
-                'in': 'view_picking_in_form',
-                'internal': 'view_picking_form',
-            }
             message = type_list.get(pick.type, _('Document')) + " '" + (pick.name or '?') + "' "
             if pick.min_date:
                 msg= _(' for the ')+ datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y')
@@ -1360,8 +1413,7 @@ class stock_picking(osv.osv):
                 'auto': _('is waiting.'),
                 'draft': _('is in draft state.'),
             }
-            res = data_obj.get_object_reference(cr, uid, 'stock', view_list.get(pick.type, 'view_picking_form'))
-            context.update({'view_id': res and res[1] or False})
+            context['view_id'] = self._get_view_id(cr, uid, pick.type)
             message += state_list[pick.state]
         return True
 
@@ -1369,36 +1421,40 @@ class stock_picking(osv.osv):
     # OpenChatter methods and notifications
     # -----------------------------------------
 
-    def _get_document_type(self, type):
+    def _get_document_type(self, cr, uid, obj, context=None):
         type_dict = {
-                'out': 'Delivery order',
-                'in': 'Shipment',
-                'internal': 'Internal picking',
+                'out': _('Delivery order'),
+                'in': _('Shipment'),
+                'internal': _('Internal picking'),
         }
-        return type_dict.get(type, 'Stock picking')
+        return type_dict.get(obj.type, _('Picking'))
 
     def create_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s has been <b>created</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>created</b>.") % (self._get_document_type(cr, uid, obj, context=context)), context=context)
+
+    def confirm_send_note(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>confirmed</b>.") % (self._get_document_type(cr, uid, obj, context=context)), context=context)
 
     def scrap_send_note(self, cr, uid, ids, quantity, uom, name, context=None):
-        return self.message_append_note(cr, uid, ids, body= _("%s %s %s has been <b>moved to</b> scrap.") % (quantity, uom, name), context=context)
+        return self.message_post(cr, uid, ids, body= _("%s %s %s has been <b>moved to</b> scrap.") % (quantity, uom, name), context=context)
 
     def back_order_send_note(self, cr, uid, ids, back_name, context=None):
-        return self.message_append_note(cr, uid, ids, body=_("Back order <em>%s</em> has been <b>created</b>.") % (back_name), context=context)
+        return self.message_post(cr, uid, ids, body=_("Back order <em>%s</em> has been <b>created</b>.") % (back_name), context=context)
 
     def ship_done_send_note(self, cr, uid, ids, context=None):
         type_dict = {
-                'out': 'delivered',
-                'in': 'received',
-                'internal': 'moved',
+                'out': _("Products have been <b>delivered</b>."),
+                'in': _("Products have been <b>received</b>."),
+                'internal': _("Products have been <b>moved</b>."),
         }
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("Products have been <b>%s</b>.") % (type_dict.get(obj.type, 'move done')), context=context)
 
     def ship_cancel_send_note(self, cr, uid, ids, context=None):
         for obj in self.browse(cr, uid, ids, context=context):
-            self.message_append_note(cr, uid, [obj.id], body=_("%s has been <b>cancelled</b>.") % (self._get_document_type(obj.type)), context=context)
+            self.message_post(cr, uid, [obj.id], body=_("%s has been <b>cancelled</b>.") % (self._get_document_type(cr, uid, obj, context=context)), context=context)
 
 
 stock_picking()
@@ -1485,7 +1541,7 @@ class stock_production_lot(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type', '<>', 'service')]),
         'date': fields.datetime('Creation Date', required=True),
         'stock_available': fields.function(_get_stock, fnct_search=_stock_search, type="float", string="Available", select=True,
-            help="Current quantity of products with this Production Lot Number available in company warehouses",
+            help="Current quantity of products with this Serial Number available in company warehouses",
             digits_compute=dp.get_precision('Product Unit of Measure')),
         'revisions': fields.one2many('stock.production.lot.revision', 'lot_id', 'Revisions'),
         'company_id': fields.many2one('res.company', 'Company', select=True),
@@ -1497,7 +1553,7 @@ class stock_production_lot(osv.osv):
         'product_id': lambda x, y, z, c: c.get('product_id', False),
     }
     _sql_constraints = [
-        ('name_ref_uniq', 'unique (name, ref)', 'The combination of serial number and internal reference must be unique !'),
+        ('name_ref_uniq', 'unique (name, ref)', 'The combination of Serial Number and internal reference must be unique !'),
     ]
     def action_traceability(self, cr, uid, ids, context=None):
         """ It traces the information of a product
@@ -1577,7 +1633,13 @@ class stock_move(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         res = []
         for line in self.browse(cr, uid, ids, context=context):
-            res.append((line.id, (line.product_id.code or '/')+': '+line.location_id.name+' > '+line.location_dest_id.name))
+            name = line.location_id.name+' > '+line.location_dest_id.name
+            # optional prefixes
+            if line.product_id.code:
+                name = line.product_id.code + ': ' + name
+            if line.picking_id.origin:
+                name = line.picking_id.origin + '/ ' + name
+            res.append((line.id, name))
         return res
 
     def _check_tracking(self, cr, uid, ids, context=None):
@@ -1591,7 +1653,8 @@ class stock_move(osv.osv):
                    (move.product_id.track_production and move.location_id.usage == 'production') or \
                    (move.product_id.track_production and move.location_dest_id.usage == 'production') or \
                    (move.product_id.track_incoming and move.location_id.usage == 'supplier') or \
-                   (move.product_id.track_outgoing and move.location_dest_id.usage == 'customer') \
+                   (move.product_id.track_outgoing and move.location_dest_id.usage == 'customer') or \
+                   (move.product_id.track_incoming and move.location_id.usage == 'inventory') \
                )):
                 return False
         return True
@@ -1613,7 +1676,16 @@ class stock_move(osv.osv):
         'date_expected': fields.datetime('Scheduled Date', states={'done': [('readonly', True)]},required=True, select=True, help="Scheduled date for the processing of this move"),
         'product_id': fields.many2one('product.product', 'Product', required=True, select=True, domain=[('type','<>','service')],states={'done': [('readonly', True)]}),
 
-        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True,states={'done': [('readonly', True)]}),
+        'product_qty': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'),
+            required=True,states={'done': [('readonly', True)]},
+            help="This is the quantity of products from an inventory "
+                "point of view. For moves in the state 'done', this is the "
+                "quantity of products that were actually moved. For other "
+                "moves, this is the quantity of product that is planned to "
+                "be moved. Lowering this quantity does not generate a "
+                "backorder. Changing this quantity on assigned moves affects "
+                "the product reservation, and should be done with care."
+        ),
         'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True,states={'done': [('readonly', True)]}),
         'product_uos_qty': fields.float('Quantity (UOS)', digits_compute=dp.get_precision('Product Unit of Measure'), states={'done': [('readonly', True)]}),
         'product_uos': fields.many2one('product.uom', 'Product UOS', states={'done': [('readonly', True)]}),
@@ -1648,16 +1720,20 @@ class stock_move(osv.osv):
         'price_unit': fields.float('Unit Price', digits_compute= dp.get_precision('Account'), help="Technical field used to record the product cost set by the user during a picking confirmation (when average price costing method is used)"),
         'price_currency_id': fields.many2one('res.currency', 'Currency for average price', help="Technical field used to record the currency chosen by the user during a picking confirmation (when average price costing method is used)"),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True),
-        'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order", select=True),
+        'backorder_id': fields.related('picking_id','backorder_id',type='many2one', relation="stock.picking", string="Back Order of", select=True),
         'origin': fields.related('picking_id','origin',type='char', size=64, relation="stock.picking", string="Source", store=True),
 
         # used for colors in tree views:
         'scrapped': fields.related('location_dest_id','scrap_location',type='boolean',relation='stock.location',string='Scrapped', readonly=True),
+        'type': fields.related('picking_id', 'type', type='selection', selection=[('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], string='Shipping Type'),
     }
+
     def _check_location(self, cr, uid, ids, context=None):
         for record in self.browse(cr, uid, ids, context=context):
-            if (record.state=='done') and (record.location_dest_id.usage == 'view' or record.location_id.usage == 'view'):
-                return False
+            if (record.state=='done') and (record.location_id.usage == 'view'):
+                raise osv.except_osv(_('Error'), _('You cannot move product %s from a location of type view %s.')% (record.product_id.name, record.location_id.name))
+            if (record.state=='done') and (record.location_dest_id.usage == 'view' ):
+                raise osv.except_osv(_('Error'), _('You cannot move product %s to a location of type view %s.')% (record.product_id.name, record.location_dest_id.name))
         return True
 
     _constraints = [
@@ -1691,7 +1767,7 @@ class stock_move(osv.osv):
             location_id = property_out and property_out.id or False
         else:
             location_xml_id = False
-            if picking_type == 'in':
+            if picking_type in ('in', 'internal'):
                 location_xml_id = 'stock_location_stock'
             elif picking_type == 'out':
                 location_xml_id = 'stock_location_customers'
@@ -1722,7 +1798,7 @@ class stock_move(osv.osv):
             location_xml_id = False
             if picking_type == 'in':
                 location_xml_id = 'stock_location_suppliers'
-            elif picking_type == 'out':
+            elif picking_type in ('out', 'internal'):
                 location_xml_id = 'stock_location_stock'
             if location_xml_id:
                 location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
@@ -1732,10 +1808,25 @@ class stock_move(osv.osv):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         return user.company_id.partner_id.id
 
+    def _default_move_type(self, cr, uid, context=None):
+        """ Gets default type of move
+        @return: type
+        """
+        if context is None:
+            context = {}
+        picking_type = context.get('picking_type')
+        type = 'internal'
+        if picking_type == 'in':
+            type = 'in'
+        elif picking_type == 'out':
+            type = 'out'
+        return type
+
     _defaults = {
         'location_id': _default_location_source,
         'location_dest_id': _default_location_destination,
         'partner_id': _default_destination_address,
+        'type': _default_move_type,
         'state': 'draft',
         'priority': '1',
         'product_qty': 1.0,
@@ -1798,8 +1889,8 @@ class stock_move(osv.osv):
         warning = {}
         if (location.usage == 'internal') and (product_qty > (amount_actual or 0.0)):
             warning = {
-                'title': _('Insufficient Stock in Lot !'),
-                'message': _('You are moving %.2f %s products but only %.2f %s available in this lot.') % (product_qty, uom.name, amount_actual, uom.name)
+                'title': _('Insufficient Stock for Serial Number !'),
+                'message': _('You are moving %.2f %s but only %.2f %s available for this serial number.') % (product_qty, uom.name, amount_actual, uom.name)
             }
         return {'warning': warning}
 
@@ -1815,19 +1906,32 @@ class stock_move(osv.osv):
         result = {
                   'product_uos_qty': 0.00
           }
+        warning = {}
 
         if (not product_id) or (product_qty <=0.0):
+            result['product_qty'] = 0.0
             return {'value': result}
 
         product_obj = self.pool.get('product.product')
         uos_coeff = product_obj.read(cr, uid, product_id, ['uos_coeff'])
+        
+        # Warn if the quantity was decreased 
+        if ids:
+            for move in self.read(cr, uid, ids, ['product_qty']):
+                if product_qty < move['product_qty']:
+                    warning.update({
+                       'title': _('Information'),
+                       'message': _("By changing this quantity here, you accept the "
+                                "new quantity as complete: OpenERP will not "
+                                "automatically generate a back order.") })
+                break
 
         if product_uos and product_uom and (product_uom != product_uos):
             result['product_uos_qty'] = product_qty * uos_coeff['uos_coeff']
         else:
             result['product_uos_qty'] = product_qty
 
-        return {'value': result}
+        return {'value': result, 'warning': warning}
 
     def onchange_uos_quantity(self, cr, uid, ids, product_id, product_uos_qty,
                           product_uos, product_uom):
@@ -1841,19 +1945,30 @@ class stock_move(osv.osv):
         result = {
                   'product_qty': 0.00
           }
+        warning = {}
 
         if (not product_id) or (product_uos_qty <=0.0):
+            result['product_uos_qty'] = 0.0
             return {'value': result}
 
         product_obj = self.pool.get('product.product')
         uos_coeff = product_obj.read(cr, uid, product_id, ['uos_coeff'])
+        
+        # Warn if the quantity was decreased 
+        for move in self.read(cr, uid, ids, ['product_uos_qty']):
+            if product_uos_qty < move['product_uos_qty']:
+                warning.update({
+                   'title': _('Warning: No Back Order'),
+                   'message': _("By changing the quantity here, you accept the "
+                                "new quantity as complete: OpenERP will not "
+                                "automatically generate a Back Order.") })
+                break
 
         if product_uos and product_uom and (product_uom != product_uos):
             result['product_qty'] = product_uos_qty / uos_coeff['uos_coeff']
         else:
             result['product_qty'] = product_uos_qty
-
-        return {'value': result}
+        return {'value': result, 'warning': warning}
 
     def onchange_product_id(self, cr, uid, ids, prod_id=False, loc_id=False,
                             loc_dest_id=False, partner_id=False):
@@ -1879,7 +1994,8 @@ class stock_move(osv.osv):
             'product_uom': product.uom_id.id,
             'product_uos': uos_id,
             'product_qty': 1.00,
-            'product_uos_qty' : self.pool.get('stock.move').onchange_quantity(cr, uid, ids, prod_id, 1.00, product.uom_id.id, uos_id)['value']['product_uos_qty']
+            'product_uos_qty' : self.pool.get('stock.move').onchange_quantity(cr, uid, ids, prod_id, 1.00, product.uom_id.id, uos_id)['value']['product_uos_qty'],
+            'prodlot_id' : False,
         }
         if not ids:
             result['name'] = product.partner_ref
@@ -1889,6 +2005,24 @@ class stock_move(osv.osv):
             result['location_dest_id'] = loc_dest_id
         return {'value': result}
 
+    def onchange_move_type(self, cr, uid, ids, type, context=None):
+        """ On change of move type gives sorce and destination location.
+        @param type: Move Type
+        @return: Dictionary of values
+        """
+        mod_obj = self.pool.get('ir.model.data')
+        location_source_id = 'stock_location_stock'
+        location_dest_id = 'stock_location_stock'
+        if type == 'in':
+            location_source_id = 'stock_location_suppliers'
+            location_dest_id = 'stock_location_stock'
+        elif type == 'out':
+            location_source_id = 'stock_location_stock'
+            location_dest_id = 'stock_location_customers'
+        source_location = mod_obj.get_object_reference(cr, uid, 'stock', location_source_id)
+        dest_location = mod_obj.get_object_reference(cr, uid, 'stock', location_dest_id)
+        return {'value':{'location_id': source_location and source_location[1] or False, 'location_dest_id': dest_location and dest_location[1] or False}}
+
     def onchange_date(self, cr, uid, ids, date, date_expected, context=None):
         """ On change of Scheduled Date gives a Move date.
         @param date_expected: Scheduled Date
@@ -1989,14 +2123,14 @@ class stock_move(osv.osv):
                 old_ptype = location_obj.picking_type_get(cr, uid, picking.move_lines[0].location_id, picking.move_lines[0].location_dest_id)
                 if old_ptype != picking.type:
                     old_pick_name = seq_obj.get(cr, uid, 'stock.picking.' + old_ptype)
-                    self.pool.get('stock.picking').write(cr, uid, [picking.id], {'name': old_pick_name}, context=context)
+                    self.pool.get('stock.picking').write(cr, uid, [picking.id], {'name': old_pick_name, 'type': old_ptype}, context=context)
             else:
                 pickid = False
             for move, (loc, dummy, delay, dummy, company_id, ptype) in todo:
                 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'),
+                    'date': time.strftime('%Y-%m-%d'),
                     'picking_id': pickid,
                     'state': 'waiting',
                     'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context=context)  ,
@@ -2040,6 +2174,10 @@ class stock_move(osv.osv):
         @return: True
         """
         self.write(cr, uid, ids, {'state': 'assigned'})
+        wf_service = netsvc.LocalService('workflow')
+        for move in self.browse(cr, uid, ids, context):
+            if move.picking_id:
+                wf_service.trg_write(uid, 'stock.picking', move.picking_id.id, cr)
         return True
 
     def cancel_assign(self, cr, uid, ids, context=None):
@@ -2087,11 +2225,12 @@ class stock_move(osv.osv):
                     done.append(move.id)
                     pickings[move.picking_id.id] = 1
                     r = res.pop(0)
-                    cr.execute('update stock_move set location_id=%s, product_qty=%s where id=%s', (r[1], r[0], move.id))
+                    product_uos_qty = self.pool.get('stock.move').onchange_quantity(cr, uid, ids, move.product_id.id, r[0], move.product_id.uom_id.id, move.product_id.uos_id.id)['value']['product_uos_qty']
+                    cr.execute('update stock_move set location_id=%s, product_qty=%s, product_uos_qty=%s where id=%s', (r[1], r[0],product_uos_qty, move.id))
 
                     while res:
                         r = res.pop(0)
-                        move_id = self.copy(cr, uid, move.id, {'product_qty': r[0], 'location_id': r[1]})
+                        move_id = self.copy(cr, uid, move.id, {'product_uos_qty': product_uos_qty, 'product_qty': r[0], 'location_id': r[1]})
                         done.append(move_id)
         if done:
             count += len(done)
@@ -2241,7 +2380,11 @@ class stock_move(osv.osv):
                      or move.location_id.company_id != move.location_dest_id.company_id):
                 journal_id, acc_src, acc_dest, acc_valuation = self._get_accounting_data_for_valuation(cr, uid, move, src_company_ctx)
                 reference_amount, reference_currency_id = self._get_reference_accounting_values_for_valuation(cr, uid, move, src_company_ctx)
-                account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_valuation, acc_dest, reference_amount, reference_currency_id, context))]
+                #returning goods to supplier
+                if move.location_dest_id.usage == 'supplier':
+                    account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_valuation, acc_src, reference_amount, reference_currency_id, context))]
+                else:
+                    account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_valuation, acc_dest, reference_amount, reference_currency_id, context))]
 
             # Incoming moves (or cross-company input part)
             if move.location_dest_id.company_id \
@@ -2249,7 +2392,11 @@ class stock_move(osv.osv):
                      or move.location_id.company_id != move.location_dest_id.company_id):
                 journal_id, acc_src, acc_dest, acc_valuation = self._get_accounting_data_for_valuation(cr, uid, move, dest_company_ctx)
                 reference_amount, reference_currency_id = self._get_reference_accounting_values_for_valuation(cr, uid, move, src_company_ctx)
-                account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_src, acc_valuation, reference_amount, reference_currency_id, context))]
+                #goods return from customer
+                if move.location_id.usage == 'customer':
+                    account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_dest, acc_valuation, reference_amount, reference_currency_id, context))]
+                else:
+                    account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_src, acc_valuation, reference_amount, reference_currency_id, context))]
 
             move_obj = self.pool.get('account.move')
             for j_id, move_lines in account_moves:
@@ -2286,14 +2433,17 @@ class stock_move(osv.osv):
             if move.picking_id:
                 picking_ids.append(move.picking_id.id)
             if move.move_dest_id.id and (move.state != 'done'):
-                self.write(cr, uid, [move.id], {'move_history_ids': [(4, move.move_dest_id.id)]})
-                #cr.execute('insert into stock_move_history_ids (parent_id,child_id) values (%s,%s)', (move.id, move.move_dest_id.id))
-                if move.move_dest_id.state in ('waiting', 'confirmed'):
-                    self.force_assign(cr, uid, [move.move_dest_id.id], context=context)
-                    if move.move_dest_id.picking_id:
-                        wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr)
-                    if move.move_dest_id.auto_validate:
-                        self.action_done(cr, uid, [move.move_dest_id.id], context=context)
+                # Downstream move should only be triggered if this move is the last pending upstream move
+                other_upstream_move_ids = self.search(cr, uid, [('id','!=',move.id),('state','not in',['done','cancel']),
+                                            ('move_dest_id','=',move.move_dest_id.id)], context=context)
+                if not other_upstream_move_ids:
+                    self.write(cr, uid, [move.id], {'move_history_ids': [(4, move.move_dest_id.id)]})
+                    if move.move_dest_id.state in ('waiting', 'confirmed'):
+                        self.force_assign(cr, uid, [move.move_dest_id.id], context=context)
+                        if move.move_dest_id.picking_id:
+                            wf_service.trg_write(uid, 'stock.picking', move.move_dest_id.picking_id.id, cr)
+                        if move.move_dest_id.auto_validate:
+                            self.action_done(cr, uid, [move.move_dest_id.id], context=context)
 
             self._create_product_valuation_moves(cr, uid, move, context=context)
             if move.state not in ('confirmed','done','assigned'):
@@ -2407,8 +2557,6 @@ class stock_move(osv.osv):
                 'tracking_id': move.tracking_id.id,
                 'prodlot_id': move.prodlot_id.id,
             }
-            if move.location_id.usage <> 'internal':
-                default_val.update({'location_id': move.location_dest_id.id})
             new_move = self.copy(cr, uid, move.id, default_val)
 
             res += [new_move]
@@ -2422,6 +2570,7 @@ class stock_move(osv.osv):
         return res
 
     # action_split function is not used anywhere
+    # FIXME: deprecate this method
     def action_split(self, cr, uid, ids, quantity, split_by_qty=1, prefix=False, with_lot=True, context=None):
         """ Split Stock Move lines into production lot which specified split by quantity.
         @param cr: the database cursor
@@ -2538,11 +2687,6 @@ class stock_move(osv.osv):
                 }
                 self.write(cr, uid, [move.id], update_val)
 
-        product_obj = self.pool.get('product.product')
-        for new_move in self.browse(cr, uid, res, context=context):
-            message = _("Product has been consumed with '%s' quantity.") % (new_move.product_qty)
-            product_obj.message_append_note(cr, uid, [new_move.product_id.id], body=message, context=context)
-
         self.action_done(cr, uid, res, context=context)
 
         return res
@@ -2631,8 +2775,10 @@ class stock_move(osv.osv):
                 complete.append(self.browse(cr, uid, new_move))
             self.write(cr, uid, [move.id],
                     {
-                        'product_qty' : move.product_qty - product_qty,
-                        'product_uos_qty':move.product_qty - product_qty,
+                        'product_qty': move.product_qty - product_qty,
+                        'product_uos_qty': move.product_qty - product_qty,
+                        'prodlot_id': False,
+                        'tracking_id': False,
                     })
 
 
@@ -2671,7 +2817,7 @@ class stock_inventory(osv.osv):
         'name': fields.char('Inventory Reference', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date': fields.datetime('Creation Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
         'date_done': fields.datetime('Date done'),
-        'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', states={'done': [('readonly', True)]}),
+        'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', readonly=True, states={'draft': [('readonly', False)]}),
         'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
         'state': fields.selection( (('draft', 'Draft'), ('cancel','Cancelled'), ('confirm','Confirmed'), ('done', 'Done')), 'Status', readonly=True, select=True),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
@@ -2732,7 +2878,7 @@ class stock_inventory(osv.osv):
                 if change:
                     location_id = line.product_id.product_tmpl_id.property_stock_inventory.id
                     value = {
-                        'name': 'INV:' + str(line.inventory_id.id) + ':' + line.inventory_id.name,
+                        'name': _('INV:') + (line.inventory_id.name or ''),
                         'product_id': line.product_id.id,
                         'product_uom': line.product_uom.id,
                         'prodlot_id': lot_id,
@@ -2818,11 +2964,11 @@ class stock_inventory_line(osv.osv):
         @return:  Dictionary of changed values
         """
         if not product:
-            return {'value': {'product_qty': 0.0, 'product_uom': False}}
+            return {'value': {'product_qty': 0.0, 'product_uom': False, 'prod_lot_id': False}}
         obj_product = self.pool.get('product.product').browse(cr, uid, product)
         uom = uom or obj_product.uom_id.id
         amount = self.pool.get('stock.location')._product_get(cr, uid, location_id, [product], {'uom': uom, 'to_date': to_date, 'compute_child': False})[product]
-        result = {'product_qty': amount, 'product_uom': uom}
+        result = {'product_qty': amount, 'product_uom': uom, 'prod_lot_id': False}
         return {'value': result}
 
 stock_inventory_line()
@@ -2867,7 +3013,7 @@ class stock_picking_in(osv.osv):
     _name = "stock.picking.in"
     _inherit = "stock.picking"
     _table = "stock_picking"
-    _description = "Incomming Shipments"
+    _description = "Incoming Shipments"
 
     def check_access_rights(self, cr, uid, operation, raise_exception=True):
         #override in order to redirect the check of acces rights on the stock.picking object
@@ -2882,7 +3028,13 @@ class stock_picking_in(osv.osv):
         #instead of it's own workflow (which is not existing)
         return self.pool.get('stock.picking')._workflow_trigger(cr, uid, ids, trigger, context=context)
 
+    def _workflow_signal(self, cr, uid, ids, signal, context=None):
+        #override in order to fire the workflow signal on given stock.picking workflow instance
+        #instead of it's own workflow (which is not existing)
+        return self.pool.get('stock.picking')._workflow_signal(cr, uid, ids, signal, context=context)
+
     _columns = {
+        'backorder_id': fields.many2one('stock.picking.in', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
         'state': fields.selection(
             [('draft', 'Draft'),
             ('auto', 'Waiting Another Operation'),
@@ -2890,7 +3042,7 @@ class stock_picking_in(osv.osv):
             ('assigned', 'Ready to Receive'),
             ('done', 'Received'),
             ('cancel', 'Cancelled'),],
-            'State', readonly=True, select=True,
+            'Status', readonly=True, select=True,
             help="""* Draft: not confirmed yet and will not be scheduled until confirmed\n
                  * Waiting Another Operation: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n
                  * Waiting Availability: still waiting for the availability of products\n
@@ -2921,7 +3073,13 @@ class stock_picking_out(osv.osv):
         #instead of it's own workflow (which is not existing)
         return self.pool.get('stock.picking')._workflow_trigger(cr, uid, ids, trigger, context=context)
 
+    def _workflow_signal(self, cr, uid, ids, signal, context=None):
+        #override in order to fire the workflow signal on given stock.picking workflow instance
+        #instead of it's own workflow (which is not existing)
+        return self.pool.get('stock.picking')._workflow_signal(cr, uid, ids, signal, context=context)
+
     _columns = {
+        'backorder_id': fields.many2one('stock.picking.out', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True),
         'state': fields.selection(
             [('draft', 'Draft'),
             ('auto', 'Waiting Another Operation'),
@@ -2929,7 +3087,7 @@ class stock_picking_out(osv.osv):
             ('assigned', 'Ready to Deliver'),
             ('done', 'Delivered'),
             ('cancel', 'Cancelled'),],
-            'State', readonly=True, select=True,
+            'Status', readonly=True, select=True,
             help="""* Draft: not confirmed yet and will not be scheduled until confirmed\n
                  * Waiting Another Operation: waiting for another move to proceed before it becomes automatically available (e.g. in Make-To-Order flows)\n
                  * Waiting Availability: still waiting for the availability of products\n
diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml
index f4b3ab90d9c..a1ce136e304 100644
--- a/addons/stock/stock_data.xml
+++ b/addons/stock/stock_data.xml
@@ -2,12 +2,15 @@
 <openerp>
     <data noupdate="1">
         <!-- notify all employees of module installation -->
-        <function model="mail.group" name="message_append_note">
-            <!-- ids, subject, body, parent_id=False, type='notification', content_subtype='html' -->
-            <value eval="[ref('mail.group_all_employees')]"/>
-            <value>Module Warehouse Management has been installed</value>
-            <value>Manage your product inventoy and stock locations.  You can control your stock moves history and planning, perform stock valuation, and trace product lots upstream and downstream (based on serial numbers.)</value>
-        </function>
+        <record model="mail.message" id="module_install_notification">
+            <field name="model">mail.group</field>
+            <field name="res_id" ref="mail.group_all_employees"/>
+            <field name="type">notification</field>
+            <field name="subtype_id" ref="mail.mt_comment"/>
+            <field name="subject">Warehouse Management application installed!</field>
+            <field name="body"><![CDATA[<p>Manage your product inventoy and stock locations: you can control stock moves history and planning,
+watch your stock valuation, and track production lots upstream and downstream (based on serial numbers).</p>]]></field>
+        </record>
 
         <record id="stock_journal_sequence" model="ir.sequence">
             <field name="name">Stock Journal Sequence</field>
diff --git a/addons/stock/stock_demo.yml b/addons/stock/stock_demo.yml
index 93f488c8354..99565f0c08c 100644
--- a/addons/stock/stock_demo.yml
+++ b/addons/stock/stock_demo.yml
@@ -31,7 +31,6 @@
     name: Ice Cream
     type: product
     categ_id: product.product_category_1
-    supply_method: buy
     list_price: 100.0
     standard_price: 70.0
     uom_id: product.product_uom_kgm
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index 6c0b3e84cf2..c3569c48c3e 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -17,7 +17,7 @@
         
         <record id="seq_type_picking_internal" model="ir.sequence.type">
             <field name="name">Picking INT</field>
-            <field name="code">stock.picking.internal</field>
+            <field name="code">stock.picking</field>
         </record>
 
         <!--
@@ -42,7 +42,7 @@
         
         <record id="seq_picking_internal" model="ir.sequence">
             <field name="name">Picking INT</field>
-            <field name="code">stock.picking.internal</field>
+            <field name="code">stock.picking</field>
             <field name="prefix">INT/</field>
             <field name="padding">5</field>
             <field name="company_id" eval="False"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 6927bf68c25..a08597df60b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -106,23 +106,27 @@
             <field name="arch" type="xml">
                 <form string="Physical Inventory" version="7.0">
                 <header>
-                    <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" class="oe_highlight"/>
-                    <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_highlight"/>
+                    <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" class="oe_highlight" groups="stock.group_stock_user"/>
+                    <button name="action_done" states="confirm" string="Validate Inventory" type="object" class="oe_highlight" groups="stock.group_stock_manager"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
-                    <div>
-                        <label for="name" class="oe_edit_only"/>
-                        <field name="name" placeholder="e.g. Annual inventory" class="oe_inline"/> -
-                        <field name="date" class="oe_inline"/>
+                    <div class="oe_right oe_button_box">
+                        <button name="%(action_view_stock_fill_inventory)d" string="Fill Inventory" type="action" />
                     </div>
                     <group>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        <group>
+                            <field name="name" placeholder="e.g. Annual inventory"/>
+                        </group>
+                        <group>
+                            <field name="date"/>
+                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                        </group>
                     </group>
                     <notebook>
-                    <page string="General Informations">
+                    <page string="General Information">
                         <field name="inventory_line_id">
                             <tree string="Products" editable="bottom">
                                 <field domain="[('usage','=','internal')]" name="location_id" groups="stock.group_locations"/>
@@ -163,14 +167,14 @@
                                 <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
                                 <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
                                 <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                 <button name="%(track_line)d" string="Split in serial numbers" type="action"
+                                <button name="%(track_line)d" string="Split in serial numbers" type="action"
                                     icon="terp-stock_effects-object-colorize"
                                     attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                                     states="draft,done,cancel"
                                     context="{'inventory_id':parent.id}"
                                     groups="stock.group_production_lot"/>
-                                 <field groups="stock.group_tracking_lot" name="tracking_id"/>
-                                 <button name="%(split_into)d" string="Put in a new pack" type="action"
+                                <field groups="stock.group_tracking_lot" name="tracking_id"/>
+                                <button name="%(split_into)d" string="Put in a new pack" type="action"
                                     groups="stock.group_tracking_lot"
                                     icon="terp-stock_effects-object-colorize"
                                     context="{'inventory_id':parent.id}"
@@ -230,9 +234,9 @@
                             <field name="active"/>
                         </group>
                         <group groups="stock.group_tracking_lot" string="Traceability">
-                            <button name="action_traceability" icon="gtk-go-up" string="Upstream Traceability" type="object"
+                            <button name="action_traceability" string="Upstream Traceability" type="object"
                                  colspan="2"/>
-                            <button name="action_traceability" icon="gtk-go-down" string="Downstream Traceability" type="object"
+                            <button name="action_traceability" string="Downstream Traceability" type="object"
                                 context="{'type': 'move_history_ids'}" colspan="2"/>
                         </group>
                     </group>
@@ -267,7 +271,8 @@
               </p>
             </field>
         </record>
-        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/>
+        <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" 
+            sequence="3"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
             groups="product.group_stock_packaging"
             sequence="6"
@@ -278,10 +283,11 @@
             <field name="model">stock.tracking</field>
             <field name="field_parent">child_ids</field>
             <field name="arch" type="xml">
-                <tree colors="grey:not active" string="Packs">
+                <tree colors="grey:active == False" string="Packs">
                     <field name="name"/>
                     <field name="serial"/>
                     <field name="date"/>
+                    <field name="active" invisible="1"/>
                 </tree>
             </field>
         </record>
@@ -332,8 +338,8 @@
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
                     <div class="oe_button_box oe_right">
-                        <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': '', 'field': 'prodlot_id'}" icon="gtk-go-up"/>
-                        <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}" icon="gtk-go-down"/>
+                        <button name="action_traceability" string="Upstream Traceability" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
+                        <button name="action_traceability" string="Downstream Traceability" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
@@ -535,7 +541,7 @@
                         </group>
                         <group string="Chained Locations">
                             <field name="chained_location_type"/>
-                            <field name="chained_location_id"  attrs="{'required':[('chained_location_type','=','fixed')]}"/>
+                            <field name="chained_location_id"  attrs="{'required':[('chained_location_type','=','fixed')],'invisible':[('chained_location_type','in',['none','customer'])]}"/>
                             <field name="chained_auto_packing"/>
                             <field name="chained_delay"/>
                             <field name="chained_journal_id"/>
@@ -546,9 +552,9 @@
                             <field name="posx"/>
                             <field name="posy"/>
                             <field name="posz"/>
-                        </group><group string="Accounting Information">
-                            <field name="valuation_in_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
-                            <field name="valuation_out_account_id" attrs="{'readonly':[('usage','not in',('inventory','production'))]}"/>
+                        </group><group string="Accounting Information" attrs="{'invisible':[('usage','not in',('inventory','production'))]}">
+                            <field name="valuation_in_account_id"/>
+                            <field name="valuation_out_account_id"/>
                         </group>
                     </group>
                     <separator string="Additional Information"/>
@@ -741,157 +747,51 @@
             <field name="arch" type="xml">
                 <form string="Internal Picking List" version="7.0">
                 <header>
-                    <span groups="base.group_user">
-                        <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight"/>
-                        <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" class="oe_highlight"/>
-                        <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
-                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight"/>
-                        <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
-                        <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice/Refund"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight"/>
-                        <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action"/>
-                        <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
-                    </span>
+                    <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight" groups="base.group_user"/>
+                    <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" class="oe_highlight" groups="base.group_user"/>
+                    <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
+                    <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight" groups="base.group_user"/>
+                    <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
+                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice/Refund"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight" groups="base.group_user"/>
+                    <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" groups="base.group_user"/>
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" groups="base.group_user"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
                 <sheet>
-                    <label for="name" class="oe_edit_only"/>
                     <h1>
-                        <field name="name" class="oe_inline"/>
-                        <span attrs="{'invisible': [('origin','=',False)]}"> - </span>
-                        <field name="origin" placeholder="e.g. PO0032" class="oe_inline"/>
+                        <field name="name" class="oe_inline" attrs="{'invisible': [('name','=','/')]}" readonly="1"/>
                     </h1>
-                    <label for="partner_id" class="oe_edit_only"/>
-                    <h2>
-                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"/>
-                    </h2>
                     <group>
                         <group>
-                            <field name="backorder_id" readonly="1"/>
+                            <field name="partner_id" on_change="onchange_partner_in(partner_id)"/>
+                            <field name="backorder_id" readonly="1" attrs="{'invisible': [('backorder_id','=',False)]}"/>
                             <field name="invoice_state" string="Invoice Control" groups="account.group_account_invoice" attrs="{'invisible':[('invoice_state', '=', 'none')]}"/>
                             <field name="stock_journal_id" widget="selection" groups="account.group_account_user"/>
                         </group>
                         <group>
                             <field name="date"/>
-                            <field name="min_date" readonly="1"/>
+                            <field name="min_date" readonly="1" attrs="{'invisible': [('min_date','=',False)]}"/>
+                            <field name="origin" placeholder="e.g. PO0032" class="oe_inline"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Products">
-                            <field name="move_lines" context="{'address_in_id': partner_id}">
-                                <tree colors="grey:scrapped == True" string="Stock Moves">
-                                    <field name="product_id"/>
-                                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
-                                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
-                                    <field name="product_uos" groups="product.group_uos"/>
-                                    <button name="%(stock.move_scrap)d"
-                                        string="Scrap Products" type="action"
-                                        icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned"
-                                        groups="base.group_user"/>
-                                    <field name="scrapped" invisible="1"/>
-                                    <field name="prodlot_id" groups="stock.group_production_lot"/>
-                                    <button
-                                        name="%(stock.track_line)d"
-                                        string="Split in Serial Number"
-                                        groups="stock.group_production_lot"
-                                        type="action" icon="terp-stock_effects-object-colorize"
-                                        states="draft,waiting,confirmed,assigned"/>
-                                    <field groups="stock.group_tracking_lot" name="tracking_id"/>
-                                    <button name="setlast_tracking" string="Put in current pack" type="object"
-                                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                                        icon="terp-stock_effects-object-colorize"
-                                        groups="stock.group_tracking_lot"
-                                        states="draft,assigned,confirmed"/>
-                                    <button name="%(split_into)d" string="Put in a new pack" type="action"
-                                        groups="product.group_stock_packaging"
-                                        icon="terp-stock_effects-object-colorize"
-                                        states="draft,assigned,confirmed"/>
-                                    <field name="location_dest_id" groups="stock.group_locations"/>
-                                    <field name="state"/>
-                                </tree>
-                                <form string="Stock Moves" version="7.0">
-                                    <header>
-                                        <span groups="base.group_user">
-                                            <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                                            <button name="action_confirm" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                                            <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" icon="gtk-find"/>
-                                        </span>
-                                        <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
-                                    </header>
-                                    <group>
-                                        <group>
-                                            <field name="name" invisible="1"/>
-                                            <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
-                                            <label for="product_qty"/>
-                                            <div>
-                                                <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                                                <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
-                                                <button name="%(stock.move_scrap)d"
-                                                        string="Scrap" type="action"
-                                                        icon="gtk-convert" context="{'scrap': True}"
-                                                        states="draft,waiting,confirmed,assigned"
-                                                        groups="base.group_user"/>
-                                            </div>
-                                            <label for="product_uos_qty" groups="product.group_uos"/>
-                                            <div groups="product.group_uos">
-                                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
-                                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
-                                            </div>
-                                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
-                                        </group>
-                                        <group>
-                                            <field name="create_date" invisible="1"/>
-                                            <field name="date"/>
-                                            <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
-                                        </group>
-
-                                        <group string="Locations" groups="stock.group_locations">
-                                            <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
-                                            <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
-                                        </group>
-
-                                        <group groups="stock.group_tracking_lot" string="Traceability">
-                                            <label for="tracking_id"/>
-                                            <div>
-                                                <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
-                                                <button name="%(split_into)d" string="New Pack" type="action"
-                                                      groups="product.group_stock_packaging"
-                                                      icon="terp-stock_effects-object-colorize"
-                                                      states="draft,assigned,confirmed"/>
-                                            </div>
-
-                                            <label for="prodlot_id"/>
-                                            <div>
-                                                <field name="prodlot_id" groups="stock.group_production_lot"
-                                                    context="{'location_id':location_id, 'product_id':product_id}"
-                                                    domain="[('product_id','=?',product_id)]"
-                                                    on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
-                                                <button name="%(track_line)d"
-                                                    groups="stock.group_tracking_lot"
-                                                    states="draft,waiting,confirmed,assigned"
-                                                    string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
-                                            </div>
-                                        </group>
-                                    </group>
-                                </form>
-                            </field>
+                            <field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree', 'picking_type': 'internal'}"/>
+                            <field name="note" placeholder="Add an internal note..." class="oe_inline"/>
                         </page>
                         <page string="Additional Info">
                             <group>
                                 <group>
                                     <field name="move_type"/>
-                                    <field name="type" groups="base.group_user"/>
+                                    <field name="type" invisible="1"/>
                                     <field name="auto_picking" groups="base.group_user"/>
                                 </group>
                                 <group>
                                     <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                    <field name="date_done"/>
+                                    <field name="date_done" groups="base.group_no_one"/>
                                 </group>
                             </group>
                         </page>
-                        <page string="Notes">
-                            <field name="note" placeholder="Add an internal note..."/>
-                        </page>
                     </notebook>
                 </sheet>
                 </form>
@@ -911,7 +811,7 @@
                     <field name="product_id"/>
                     <field name="stock_journal_id"/>
                     <group expand="0" string="Group By...">
-                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
+                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <filter string="Order Date" icon="terp-go-month" domain="[]"  context="{'group_by':'date'}"/>
                         <filter string="Expected Date" icon="terp-go-month" domain="[]"  context="{'group_by':'min_date'}"/>
                         <filter string="Origin" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
@@ -970,11 +870,11 @@
         
         <record id="view_picking_out_tree" model="ir.ui.view">
             <field name="name">stock.picking.out.tree</field>
-            <field name="model">stock.picking</field>
+            <field name="model">stock.picking.out</field>
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';grey:state == 'cancel';red:state not in ('cancel', 'done') and min_date &lt; current_date" string="Delivery Orders">
                     <field name="name"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" string="Customer"/>
                     <field name="origin"/>
                     <field name="min_date"/>
                     <field name="date"/>
@@ -1000,18 +900,21 @@
                         <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight"/>
                     </xpath>
                     <xpath expr="/form/header//button[@name='action_process']" position="replace">
-                        <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" class="oe_highlight"/>
+                        <button name="action_process" states="assigned" string="Deliver" type="object" class="oe_highlight"/>
                     </xpath>
                     <xpath expr="/form/header//field[@name='state']" position="replace">
                         <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                     </xpath>
                     <xpath expr="//field[@name='partner_id']" position="replace">
-                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Customer"/>
+                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Customer"/>
+                    </xpath>
+                    <xpath expr="//field[@name='move_lines']" position="replace">
+                        <field name="move_lines" context="{'address_out_id': partner_id, 'picking_type': 'out', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
-                            <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                             <field name="message_follower_ids" widget="mail_followers"/>
+                            <field name="message_ids" widget="mail_thread"/>
                         </div>
                     </xpath>
                 </data>
@@ -1102,7 +1005,7 @@
             <field name="arch" type="xml">
                 <tree colors="blue:state == 'draft';grey:state == 'done';red:state not in ('cancel', 'done') and date &lt; current_date" string="Picking list">
                     <field name="name"/>
-                    <field name="partner_id"/>
+                    <field name="partner_id" string="Supplier"/>
                     <field name="backorder_id"/>
                     <field name="origin"/>
                     <field name="date"/>
@@ -1129,12 +1032,15 @@
                         <button name="action_process" states="assigned" string="Receive" type="object" class="oe_highlight"/>
                     </xpath>
                     <xpath expr="//field[@name='partner_id']" position="replace">
-                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
+                        <field name="partner_id" on_change="onchange_partner_in(partner_id)"  string="Supplier"/>
+                    </xpath>
+                    <xpath expr="//field[@name='move_lines']" position="replace">
+                        <field name="move_lines" context="{'address_in_id': partner_id, 'picking_type': 'in', 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
                         <div class="oe_chatter">
-                            <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
                             <field name="message_follower_ids" widget="mail_followers"/>
+                            <field name="message_ids" widget="mail_thread"/>
                         </div>
                     </xpath>
                 </data>
@@ -1205,17 +1111,18 @@
         </record>
         <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="1"/>
 
-        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/>
+        <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2" groups="stock.group_locations"/>
 
         <record id="view_move_tree" model="ir.ui.view">
             <field name="name">stock.move.tree</field>
             <field name="model">stock.move</field>
-            <field eval="6" name="priority"/>
+            <field eval="8" name="priority"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state == 'cancel';red:(state not in ('cancel','done')) and date > current_date" string="Moves" editable="top">
                     <field name="name"/>
                     <field name="picking_id" string="Reference"/>
                     <field name="origin"/>
+                    <field name="type" on_change="onchange_move_type(type)"/>
                     <field name="create_date" invisible="1" groups="base.group_no_one"/>
                     <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, False)"/>
                     <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
@@ -1249,6 +1156,45 @@
             </field>
         </record>
 
+        <record id="view_move_picking_tree" model="ir.ui.view">
+            <field name="name">stock.move.tree</field>
+            <field name="model">stock.move</field>
+            <field eval="4" name="priority"/>
+            <field name="arch" type="xml">
+                <tree colors="grey:scrapped == True" string="Stock Moves">
+                    <field name="product_id"/>
+                    <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                    <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
+                    <field name="product_uos" groups="product.group_uos"/>
+                    <button name="%(stock.move_scrap)d"
+                       string="Scrap Products" type="action"
+                       icon="gtk-convert" context="{'scrap': True}"
+                       states="draft,waiting,confirmed,assigned"
+                       groups="base.group_user"/>
+                    <field name="scrapped" invisible="1"/>
+                    <field name="prodlot_id" groups="stock.group_production_lot"/>
+                    <button
+                       name="%(stock.track_line)d"
+                       string="Split in Serial Number"
+                       groups="stock.group_production_lot"
+                       type="action" icon="terp-stock_effects-object-colorize"
+                       states="draft,waiting,confirmed,assigned"/>
+                     <field groups="stock.group_tracking_lot" name="tracking_id"/>
+                     <button name="setlast_tracking" string="Put in current pack" type="object"
+                        attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
+                        icon="terp-stock_effects-object-colorize"
+                        groups="stock.group_tracking_lot"
+                        states="draft,assigned,confirmed"/>
+                     <button name="%(split_into)d" string="Put in a new pack" type="action"
+                        groups="product.group_stock_packaging"
+                        icon="terp-stock_effects-object-colorize"
+                        states="draft,assigned,confirmed"/>
+                      <field name="location_dest_id" groups="stock.group_locations"/>
+                      <field name="state"/>
+                </tree>
+            </field>
+        </record>
+
         <record id="view_move_form" model="ir.ui.view">
             <field name="name">stock.move.form</field>
             <field name="model">stock.move</field>
@@ -1290,6 +1236,7 @@
                         </group>
                         <group name="origin_grp" string="Origin">
                             <field name="picking_id"/>
+                             <field name="type" on_change="onchange_move_type(type)"/>
                             <field name="location_id" groups="stock.group_locations"/>
                             <field name="create_date" groups="base.group_no_one"/>
                         </group>
@@ -1327,16 +1274,90 @@
             </field>
         </record>
 
+        <record id="view_move_picking_form" model="ir.ui.view">
+            <field name="name">stock.move.form</field>
+            <field name="model">stock.move</field>
+            <field eval="2" name="priority"/>
+            <field name="arch" type="xml">
+            <form string="Stock Moves" version="7.0">
+                <header>
+                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_user"/>
+                        <button name="action_confirm" states="draft" string="Confirm" type="object" groups="base.group_user"/>
+                        <button name="cancel_assign" states="assigned" string="Cancel Availability" type="object" groups="base.group_user"/>
+                        <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done"/>
+                </header>
+                <group>
+                    <group>
+                        <field name="name" invisible="1"/>
+                        <field name="product_id" on_change="onchange_product_id(product_id,location_id,location_dest_id, parent.partner_id)"/>
+                        <field name="type" invisible="1"/>
+                        <label for="product_qty"/>
+                        <div>
+                            <field name="product_qty" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                            <field name="product_uom" string="Unit Of Measure" groups="product.group_uom" class="oe_inline"/>
+                            <button name="%(stock.move_scrap)d"
+                                string="Scrap" type="action"
+                                icon="gtk-convert" context="{'scrap': True}"
+                                states="draft,waiting,confirmed,assigned"
+                                groups="base.group_user"/>
+                        </div>
+                            <label for="product_uos_qty" groups="product.group_uos"/>
+                            <div groups="product.group_uos">
+                                <field name="product_uos_qty" on_change="onchange_uos_quantity(product_id, product_uos_qty, product_uos, product_uom)" class="oe_inline"/>
+                                <field name="product_uos" on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)" class="oe_inline"/>
+                            </div>
+                            <field name="product_packaging" groups="product.group_stock_packaging" domain="[('product_id','=',product_id)]"/>
+                            </group>
+                            <group>
+                                <field name="create_date" invisible="1"/>
+                                <field name="date"/>
+                                <field name="date_expected" on_change="onchange_date(date,date_expected)"/>
+                            </group>
+
+                            <group string="Locations" groups="stock.group_locations">
+                                <field name="location_id" domain="[('usage','&lt;&gt;','view')]"/>
+                                <field name="location_dest_id" domain="[('usage','=','internal')]" groups="stock.group_locations"/>
+                            </group>
+
+                            <group groups="stock.group_tracking_lot" string="Traceability">
+                                <label for="tracking_id"/>
+                                <div>
+                                    <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
+                                      <button name="%(split_into)d" 
+                                            string="New Pack" type="action"
+                                            groups="product.group_stock_packaging"
+                                            icon="terp-stock_effects-object-colorize"
+                                            states="draft,assigned,confirmed"/>
+                                 </div>
+
+                                  <label for="prodlot_id"/>
+                                  <div>
+                                        <field name="prodlot_id" groups="stock.group_production_lot"
+                                            context="{'location_id':location_id, 'product_id':product_id}"
+                                            domain="[('product_id','=?',product_id)]"
+                                            on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
+                                        <button name="%(track_line)d"
+                                            groups="stock.group_tracking_lot"
+                                            states="draft,waiting,confirmed,assigned"
+                                            string="Split" type="action" icon="terp-stock_effects-object-colorize"/>
+                            </div>
+                        </group>
+                    </group>
+                </form>
+            </field>
+        </record>
+
         <record id="view_move_search" model="ir.ui.view">
             <field name="name">stock.move.search</field>
             <field name="model">stock.move</field>
             <field eval="3" name="priority"/>
             <field name="arch" type="xml">
                 <search string="Stock Moves">
-                    <field name="origin" string="Stock Moves"/>
+                    <field name="origin" domain="['|',('origin','ilike',self),('picking_id','ilike',self)]" string="Reference"/>
                     <field name="date" groups="base.group_no_one"/>
+
                     <filter icon="terp-camera_test" string="Ready" name="ready" domain="[('state','=','assigned')]" help="Stock moves that are Available (Ready to process)"/>
-                    <filter icon="terp-stock" string="Future" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
+                    <filter icon="terp-stock" string="To Do" name="future" domain="[('state','in',('assigned','confirmed','waiting'))]" help="Stock moves that are Confirmed, Available or Waiting"/>
                     <filter icon="terp-dialog-close" string="Done" name="done" domain="[('state','=','done')]" help="Stock moves that have been processed"/>
                     <separator/>
                     <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders processed Today or planned for Today"/>
@@ -1377,7 +1398,22 @@
               </p>
             </field>
         </record>
-        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3"/>
+        
+        <record model="ir.actions.act_window.view" id="action_stock_move_tree_all">
+            <field name="sequence" eval="1"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_move_tree"/>
+            <field name="act_window_id" ref="action_move_form2"/>
+        </record>
+
+        <record model="ir.actions.act_window.view" id="action_stock_move_form_all">
+            <field name="sequence" eval="3"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_move_form"/>
+        <field name="act_window_id" ref="action_move_form2"/>
+        </record>
+
+        <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3" groups="stock.group_locations"/>
 
         <!--
             Reception Picking (By Stock Move)
@@ -1389,8 +1425,10 @@
             <field name="priority" eval="6"/>
             <field name="arch" type="xml">
                 <tree colors="grey:state == 'cancel'" string="Moves">
-                    <field name="picking_id" string="Reference"/>
+                    <field name="date" widget="date"/>
+                    <field name="picking_id" string="Reference" invisible="1"/>
                     <field name="origin"/>
+                    <field name="partner_id" string="Supplier"/>
                     <field name="product_id"/>
                     <field name="product_qty"/>
                     <field name="product_uom" string="Unit of Measure" groups="product.group_uom"/>
@@ -1413,8 +1451,13 @@
                         groups="product.group_stock_packaging"
                         icon="terp-stock_effects-object-colorize"
                         states="draft,assigned,confirmed,done"/>
-                    <field name="date" groups="base.group_no_one"/>
                     <field name="state"/>
+                    <button name="%(action_partial_move_server)d"
+                        icon="terp-stock_effects-object-colorize" type="action"
+                        states="assigned" class="oe_highlight"/>
+                    <button name="action_done" states="draft,assigned,confirmed"
+                        icon="gtk-go-forward" type="object"
+                        class="oe_highlight"/>
                 </tree>
             </field>
         </record>
@@ -1435,66 +1478,17 @@
             </field>
         </record>
 
-        <record id="view_move_search_reception_incoming_picking" model="ir.ui.view">
-            <field name="name">stock.move.incoming.search2</field>
-            <field name="model">stock.move</field>
-            <field eval="6" name="priority"/>
-            <field name="arch" type="xml">
-                <search string="Stock Moves">
-                    <field name="origin" string="Stock Moves"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting " domain="[('state','in',('confirmed','assigned'))]" help="Stock to be receive"/>
-                    <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
-                    <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state', '=', 'done')]"/>
-                    <separator/>
-                    <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
-                    <field name="product_id"/>
-                    <field name="prodlot_id"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record id="view_move_search_reception_outcoming_picking" model="ir.ui.view">
-            <field name="name">stock.move.outgoing.search2</field>
-            <field name="model">stock.move</field>
-            <field eval="6" name="priority"/>
-            <field name="arch" type="xml">
-                <search string="Stock Moves">
-                    <field name="origin" string="Stock Moves"/>
-                    <filter icon="terp-gtk-go-back-rtl" name="receive" string="Waiting" domain="[('state','in',('confirmed','assigned'))]" help="Stock to be delivered (Available or not)"/>
-                    <filter icon="terp-check" name="available" string="Available" domain="[('state','in',('assigned',))]" help="Stock available to be delivered"/>
-                    <filter icon="terp-dialog-close" name="received" string="Done" domain="[('state','=','done')]"/>
-                    <separator/>
-                    <filter icon="terp-go-today" string="Today" domain="[('date','&lt;=',time.strftime('%%Y-%%m-%%d 23:59:59')),('date','&gt;=',time.strftime('%%Y-%%m-%%d 00:00:00'))]" help="Orders planned for today"/>
-                    <field name="product_id"/>
-                    <field name="prodlot_id"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'product_id'}"/>
-                        <filter string="Order" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'origin'}"/>
-                        <filter string="Status" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
-                        <filter string="Order Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}" groups="base.group_no_one"/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
         <record id="action_reception_picking_move" model="ir.actions.act_window">
-            <field name="name">Receive Products</field>
+            <field name="name">Incoming  Products</field>
             <field name="res_model">stock.move</field>
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context" eval="'{\'product_receive\' : True, \'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_suppliers'),ref('stock_location_stock') )"/>
-            <field name="search_view_id" ref="view_move_search_reception_incoming_picking"/>
+            <field name="context">{'product_receive': True, 'search_default_future': True, 'picking_type': 'in'}</field>
             <field name="help" type="html">
-              <p>
+              <p class="oe_view_nocontent_create">
                 Click to register a product reception. 
               </p><p>
                 Here you can receive individual products, no matter what
@@ -1627,9 +1621,11 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
             <field name="view_id" ref="view_move_tree_reception_picking"/>
-            <field name="context" eval="'{\'default_location_id\':%d, \'default_location_dest_id\':%d}' % (ref('stock_location_stock'),ref('stock_location_customers'))"/>
-            <field name="search_view_id" ref="view_move_search_reception_outcoming_picking"/>
+            <field name="context">{'picking_type': 'out', 'search_default_future': True}</field>
             <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to register a product delivery.
+              </p>
               <p>
                 You will find in this list all products you have to deliver to
                 your customers. You can process the deliveries directly from
@@ -1695,7 +1691,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="help" type="html">
-              <p>
+              <p class="oe_view_nocontent_create">
                 Click to create a new journal. 
               </p><p>
                 The stock journal system allows you to assign each stock
diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py
index 0cc97e10298..3c1ba2c17a0 100644
--- a/addons/stock/wizard/stock_change_product_qty.py
+++ b/addons/stock/wizard/stock_change_product_qty.py
@@ -30,7 +30,7 @@ class stock_change_product_qty(osv.osv_memory):
     _description = "Change Product Quantity"
     _columns = {
         'product_id' : fields.many2one('product.product', 'Product'),
-        'new_quantity': fields.float('Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, help='This quantity is expressed in the Default Unit of Measure of the product.'),
+        'new_quantity': fields.float('New Quantity on Hand', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, help='This quantity is expressed in the Default Unit of Measure of the product.'),
         'prodlot_id': fields.many2one('stock.production.lot', 'Serial Number', domain="[('product_id','=',product_id)]"),
         'location_id': fields.many2one('stock.location', 'Location', required=True, domain="[('usage', '=', 'internal')]"),
     }
@@ -113,7 +113,7 @@ class stock_change_product_qty(osv.osv_memory):
         for data in self.browse(cr, uid, ids, context=context):
             location_name = location_obj.browse(cr, uid, data.location_id.id, context=context).name
             message = _("<b>Quantity has been changed</b> to <em>%s %s </em> for <em>%s</em> location.") % (data.new_quantity, data.product_id.uom_id.name, location_name)
-            prod_obj.message_append_note(cr, uid, [data.product_id.id], body=message, context=context)
+            prod_obj.message_post(cr, uid, [data.product_id.id], body=message, context=context)
 
 stock_change_product_qty()
 
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index a533d9f837b..807a0a15df5 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -5,12 +5,12 @@
             <field name="name">Change Product Quantity</field>
             <field name="model">stock.change.product.qty</field>
             <field name="arch" type="xml">
-                <form string="Change Product Quantity" version="7.0">
-                    <group string="Select Quantity">
+                <form string="Update Product Quantity" version="7.0">
+                    <group>
                         <field name="new_quantity" />
                         <field name="product_id" invisible="1"/>
                         <field name="location_id" groups="stock.group_locations"/>
-                        <field name="prodlot_id" groups="stock.group_tracking_lot"/>
+                        <field name="prodlot_id"  context="{'search_default_product_id':product_id,'default_product_id':product_id}" groups="stock.group_tracking_lot"/>
                     </group>
                     <footer>
                         <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/>
@@ -22,7 +22,7 @@
         </record>
 
         <record id="action_view_change_product_quantity" model="ir.actions.act_window">
-            <field name="name">Change Product Quantity</field>
+            <field name="name">Update Product Quantity</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">stock.change.product.qty</field>
             <field name="view_type">form</field>
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 10a1d625e16..8422412a254 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -25,11 +25,23 @@ from tools.translate import _
 class stock_fill_inventory(osv.osv_memory):
     _name = "stock.fill.inventory"
     _description = "Import Inventory"
+
+    def _default_location(self, cr, uid, ids, context=None):
+        try:
+            loc_model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
+        except ValueError, e:
+            return False
+        return location_id or False
+
     _columns = {
         'location_id': fields.many2one('stock.location', 'Location', required=True),
         'recursive': fields.boolean("Include children",help="If checked, products contained in child locations of selected location will be included as well."),
         'set_stock_zero': fields.boolean("Set to zero",help="If checked, all product quantities will be set to zero to help ensure a real physical inventory is done"),
     }
+    _defaults = {
+        'location_id': _default_location,
+    }
+
     def view_init(self, cr, uid, fields_list, context=None):
         """
          Creates view dynamically and adding fields at runtime.
@@ -67,8 +79,6 @@ class stock_fill_inventory(osv.osv_memory):
 
         inventory_line_obj = self.pool.get('stock.inventory.line')
         location_obj = self.pool.get('stock.location')
-        product_obj = self.pool.get('product.product')
-        stock_location_obj = self.pool.get('stock.location')
         move_obj = self.pool.get('stock.move')
         uom_obj = self.pool.get('product.uom')
         if ids and len(ids):
@@ -97,16 +107,17 @@ class stock_fill_inventory(osv.osv_memory):
             for move in move_obj.browse(cr, uid, move_ids, context=context):
                 lot_id = move.prodlot_id.id
                 prod_id = move.product_id.id
-                if move.location_dest_id.id == location:
-                    qty = uom_obj._compute_qty(cr, uid, move.product_uom.id,move.product_qty, move.product_id.uom_id.id)
-                else:
-                    qty = -uom_obj._compute_qty(cr, uid, move.product_uom.id,move.product_qty, move.product_id.uom_id.id)
+                if move.location_dest_id.id != move.location_id.id:
+                    if move.location_dest_id.id == location:
+                        qty = uom_obj._compute_qty(cr, uid, move.product_uom.id,move.product_qty, move.product_id.uom_id.id)
+                    else:
+                        qty = -uom_obj._compute_qty(cr, uid, move.product_uom.id,move.product_qty, move.product_id.uom_id.id)
 
 
-                if datas.get((prod_id, lot_id)):
-                    qty += datas[(prod_id, lot_id)]['product_qty']
+                    if datas.get((prod_id, lot_id)):
+                        qty += datas[(prod_id, lot_id)]['product_qty']
 
-                datas[(prod_id, lot_id)] = {'product_id': prod_id, 'location_id': location, 'product_qty': qty, 'product_uom': move.product_id.uom_id.id, 'prod_lot_id': lot_id}
+                    datas[(prod_id, lot_id)] = {'product_id': prod_id, 'location_id': location, 'product_qty': qty, 'product_uom': move.product_id.uom_id.id, 'prod_lot_id': lot_id}
 
             if datas:
                 flag = True
diff --git a/addons/stock/wizard/stock_fill_inventory_view.xml b/addons/stock/wizard/stock_fill_inventory_view.xml
index 47e6355bcdc..3f25cd27f86 100644
--- a/addons/stock/wizard/stock_fill_inventory_view.xml
+++ b/addons/stock/wizard/stock_fill_inventory_view.xml
@@ -6,10 +6,10 @@
             <field name="model">stock.fill.inventory</field>
             <field name="arch" type="xml">
               <form string="Import Inventory" version="7.0">
-                  <separator string="Import current product inventory from the following location"/>
+                  <separator string="Import the current inventory"/>
                   <group>
-                      <field name="location_id"/>
-                      <field name="recursive"/>
+                      <field name="location_id" groups="stock.group_locations"/>
+                      <field name="recursive" groups="stock.group_locations"/>
                       <field name="set_stock_zero"/>
                   </group>
                   <footer>
@@ -21,14 +21,16 @@
             </field>
         </record>
 
-         <act_window name="Import Inventory"
-            res_model="stock.fill.inventory"
-            src_model="stock.inventory"
-            view_mode="form"
-            target="new"
-            context="{'search_default_in_location':1}"
-            key2="client_action_multi"
-            id="action_view_stock_fill_inventory"/>
-
+        <record id="action_view_stock_fill_inventory" model="ir.actions.act_window">
+            <field name="name">Fill Inventory</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.fill.inventory</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_stock_fill_inventory"/>
+            <field name="target">new</field>
+            <field name="context">{'search_default_in_location':1}</field>
+        </record>
+            
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_inventory_line_split_view.xml b/addons/stock/wizard/stock_inventory_line_split_view.xml
index fdc3aa03a60..92c91317e35 100644
--- a/addons/stock/wizard/stock_inventory_line_split_view.xml
+++ b/addons/stock/wizard/stock_inventory_line_split_view.xml
@@ -5,7 +5,7 @@
             <field name="name">Split Inventory Line</field>
             <field name="model">stock.inventory.line.split</field>
             <field name="arch" type="xml">
-                <form string="Split in Lots" version="7.0">
+                <form string="Split in Serial Numbers" version="7.0">
                     <group>
                         <field name="product_id" colspan="4" readonly="1"/>
                         <label for="qty"/>
diff --git a/addons/stock/wizard/stock_invoice_onshipping_view.xml b/addons/stock/wizard/stock_invoice_onshipping_view.xml
index 10d748624fc..a65afb377b3 100644
--- a/addons/stock/wizard/stock_invoice_onshipping_view.xml
+++ b/addons/stock/wizard/stock_invoice_onshipping_view.xml
@@ -21,7 +21,7 @@
         </record>
 
 
-        <act_window name="Create invoice"
+        <act_window name="Create Invoice"
             res_model="stock.invoice.onshipping"
             src_model="stock.picking.out"
             key2="client_action_multi"
@@ -30,5 +30,15 @@
             view_type="form"
             target="new"
             id="action_stock_invoice_onshipping"/>
+
+        <act_window name="Create Draft Invoices"
+            res_model="stock.invoice.onshipping"
+            src_model="stock.picking.in"
+            key2="client_action_multi"
+            multi="True"
+            view_mode="form"
+            view_type="form"
+            target="new"
+            id="action_stock_invoice_onshipping"/>
     </data>
 </openerp>
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index 1f3dcc3372d..538fa1c9441 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -170,7 +170,8 @@ class split_in_production_lot(osv.osv_memory):
         'product_uom': fields.many2one('product.uom', 'Unit of Measure'),
         'line_ids': fields.one2many('stock.move.split.lines', 'wizard_id', 'Serial Numbers'),
         'line_exist_ids': fields.one2many('stock.move.split.lines', 'wizard_exist_id', 'Serial Numbers'),
-        'use_exist' : fields.boolean('Existing Lots', help="Check this option to select existing lots in the list below, otherwise you should enter new ones line by line."),
+        'use_exist' : fields.boolean('Existing Serial Numbers',
+            help="Check this option to select existing serial numbers in the list below, otherwise you should enter new ones line by line."),
         'location_id': fields.many2one('stock.location', 'Source Location')
      }
 
@@ -271,8 +272,8 @@ class stock_move_split_lines_exist(osv.osv_memory):
     }
 
     def onchange_lot_id(self, cr, uid, ids, prodlot_id=False, product_qty=False,
-                        loc_id=False, product_id=False, uom_id=False):
+                        loc_id=False, product_id=False, uom_id=False,context=None):
         return self.pool.get('stock.move').onchange_lot_id(cr, uid, [], prodlot_id, product_qty,
-                        loc_id, product_id, uom_id)
+                        loc_id, product_id, uom_id, context)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index b3a7fbee885..5dc0d0d824c 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -12,10 +12,10 @@
                         <field name="product_id" readonly="1"/>
                         <label for="product_qty"/>
                         <div>
-                            <field name="product_qty"/>
-                            <field name="product_uom" nolabel="1" readonly="1"/>
+                            <field name="product_qty" class="oe_inline"/>
+                            <field name="product_uom" class="oe_inline" readonly="1" groups="product.group_uom"/>
                         </div>
-                        <field name="location_id"/>
+                        <field name="location_id" groups="stock.group_locations"/>
                     </group>
                     <footer>
                         <button name="do_move_consume" string="Ok" type="object" class="oe_highlight"/>
@@ -46,9 +46,10 @@
                         <label for="product_qty"/>
                         <div>
                             <field name="product_qty" class="oe_inline"/>
-                            <field name="product_uom" class="oe_inline" readonly="1"/>
+                            <field name="product_uom" class="oe_inline" readonly="1" groups="product.group_uom"/>
                         </div>
-                        <field name="location_id" string="Scrap Location" domain="[('usage','&lt;&gt;','view'),('scrap_location','=',True)]" widget="selection"/>
+                        <field name="location_id" string="Scrap Location" widget="selection"
+                            domain="[('usage','!=','view'),('scrap_location','=',True)]" groups="stock.group_locations"/>
                     </group>
                     <footer>
                         <button name="move_scrap" string="Ok" type="object" class="oe_highlight"  />
@@ -69,10 +70,10 @@
         </record>
 
         <record id="view_split_in_lots" model="ir.ui.view">
-                <field name="name">Split in lots</field>
+                <field name="name">Split in Serial Numbers</field>
                 <field name="model">stock.move.split</field>
                 <field name="arch" type="xml">
-                <form string="Split in Lots" version="7.0">
+                <form string="Split in Serial Numbers" version="7.0">
                     <group>
                         <field name="product_id" readonly="1"/>
                         <label for="qty"/>
@@ -85,37 +86,39 @@
                     </group>
                     <field name="line_ids" attrs="{'invisible':[('use_exist','=',True)]}">
                         <tree string="Serial Numbers" editable="bottom">
-                            <field name="name" string="Lots"/>
+                            <field name="name"/>
                             <field name="quantity" />
                         </tree>
                         <form string="Serial Number" version="7.0">
                             <group>
-                                <field name="name" string="Lot number"/>
+                                <field name="name"/>
                                 <field name="quantity" />
                             </group>
                         </form>
                     </field>
                     <field name="line_exist_ids" attrs="{'invisible':[('use_exist','!=',True)]}">
                         <tree string="Serial Numbers" editable="bottom">
-                            <field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
-                            <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
+                            <field name="prodlot_id" string="Serial Number" quick_create="false" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom, context)" context="{'product_id': parent.product_id}"/>
+                            <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom,context)" />
                         </tree>
                         <form string="Serial Number" version="7.0">
                             <group>
-                                <field name="prodlot_id" string="Lot number" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)"/>
-                                <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom)" />
+                                <field name="prodlot_id" domain="[('product_id','=',parent.product_id)]" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom, context)"/>
+                                <field name="quantity" on_change="onchange_lot_id(prodlot_id, quantity, parent.location_id, parent.product_id, parent.product_uom, context)" />
                             </group>
                         </form>
                     </field>
                     <footer>
-                        <button name="split_lot" string="Ok" type="object" icon="gtk-ok" class="oe_highlight"  />
+                        <button name="split_lot" string="Split" type="object" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
                 </form>
                 </field>
             </record>
 
             <record id="track_line" model="ir.actions.act_window">
-                <field name="name">Split in lots</field>
+                <field name="name">Split in Serial Numbers</field>
                 <field name="type">ir.actions.act_window</field>
                 <field name="res_model">stock.move.split</field>
                 <field name="view_type">form</field>
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml
index acfc4b1923c..54f15e99dff 100644
--- a/addons/stock/wizard/stock_partial_move_view.xml
+++ b/addons/stock/wizard/stock_partial_move_view.xml
@@ -44,7 +44,7 @@
                     <field name="prodlot_id" domain="[('product_id', '=', product_id)]" groups="stock.group_production_lot"/>
                     <field name="update_cost" invisible="1"/>
                     <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                    <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}" groups="base.group_multi_currency"/>
                 </tree>
             </field>
         </record>
@@ -63,7 +63,7 @@
                         <field name="prodlot_id" domain="[('product_id', '=', product_id)]"/>
                         <field name="update_cost" invisible="1"/>
                         <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}" groups="base.group_multi_currency"/>
                     </group>
                  </form>
             </field>
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index b3720b8a51b..61ae519f65f 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -38,7 +38,6 @@ class stock_partial_picking_line(osv.TransientModel):
             res[tracklot.id] = tracking
         return res
 
-
     _name = "stock.partial.picking.line"
     _rec_name = 'product_id'
     _columns = {
@@ -56,8 +55,17 @@ class stock_partial_picking_line(osv.TransientModel):
         'tracking': fields.function(_tracking, string='Tracking', type='boolean'), 
     }
 
+    def onchange_product_id(self, cr, uid, ids, product_id, context=None):
+        uom_id = False
+        if product_id:
+            product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+            uom_id = product.uom_id.id
+        return {'value': {'product_uom': uom_id}}
+
+
 class stock_partial_picking(osv.osv_memory):
     _name = "stock.partial.picking"
+    _rec_name = 'picking_id'
     _description = "Partial Picking Processing Wizard"
 
     def _hide_tracking(self, cursor, user, ids, name, arg, context=None):
@@ -78,7 +86,7 @@ class stock_partial_picking(osv.osv_memory):
         if context is None:
             context={}
         res = super(stock_partial_picking, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=submenu)
-        type = context.get('active_model','').split('.')[-1]
+        type = context.get('default_type', False)
         if type:
             doc = etree.XML(res['arch'])
             for node in doc.xpath("//button[@name='do_partial']"):
@@ -100,21 +108,10 @@ class stock_partial_picking(osv.osv_memory):
         picking_ids = context.get('active_ids', [])
         active_model = context.get('active_model')
 
-        if active_model == 'purchase.order':
-            for purchase_order in self.pool.get('purchase.order').browse(cr, uid, picking_ids, context=context):
-                picking_ids = [picking_id.id for picking_id in purchase_order.picking_ids]
-        elif active_model == 'sale.order':
-            for sale_order in self.pool.get('sale.order').browse(cr, uid, picking_ids, context=context):
-                picking_ids = [picking.id for picking in sale_order.picking_ids]
-
         if not picking_ids or len(picking_ids) != 1:
             # Partial Picking Processing may only be done for one picking at a time
             return res
-        # The check about active_model is there in case the client mismatched the context during propagation of it
-        # (already seen in previous bug where context passed was containing ir.ui.menu as active_model and the menu 
-        # ID as active_id). Though this should be fixed in clients now, this place is sensitive enough to ensure the
-        # consistancy of the context.
-        assert active_model in ('stock.picking', 'stock.picking.in', 'stock.picking.out', 'purchase.order', 'sale.order'), 'Bad context propagation'
+        assert active_model in ('stock.picking', 'stock.picking.in', 'stock.picking.out'), 'Bad context propagation'
         picking_id, = picking_ids
         if 'picking_id' in fields:
             res.update(picking_id=picking_id)
diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml
index 7de85594a26..98f599da48b 100644
--- a/addons/stock/wizard/stock_partial_picking_view.xml
+++ b/addons/stock/wizard/stock_partial_picking_view.xml
@@ -19,7 +19,7 @@
                     <separator string="Transfer Products" name="product_separator"/>
                     <field name="move_ids" context="{'hide_tracking': hide_tracking}">
                         <tree editable="bottom" string="Product Moves">
-                            <field name="product_id" />
+                            <field name="product_id" on_change="onchange_product_id(product_id)"/>
                             <field name="quantity" />
                             <field name="product_uom" groups="product.group_uom"/>
                             <field name="tracking" invisible="1"/>
@@ -71,7 +71,7 @@
                         <field name="prodlot_id" domain="[('product_id', '=', product_id)]" attrs="{'required':[('tracking','=',True)]}"/>
                         <field name="update_cost" invisible="1"/>
                         <field name="cost" attrs="{'invisible': [('update_cost','=', False)]}"/>
-                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}"/>
+                        <field name="currency" attrs="{'invisible': [('update_cost','=', False)]}" groups="base.group_multi_currency"/>
                     </group>
                  </form>
             </field>
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index fb8e327b71f..abe1754a49e 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -72,7 +72,7 @@ class stock_return_picking(osv.osv_memory):
                     res.update({'invoice_state': 'none'})
             return_history = self.get_return_history(cr, uid, record_id, context)       
             for line in pick.move_lines:
-                qty = line.product_qty - return_history[line.id]
+                qty = line.product_qty - return_history.get(line.id, 0)
                 if qty > 0:
                     result1.append({'product_id': line.product_id.id, 'quantity': qty,'move_id':line.id})
             if 'product_return_moves' in fields:
@@ -100,8 +100,8 @@ class stock_return_picking(osv.osv_memory):
             valid_lines = 0
             return_history = self.get_return_history(cr, uid, record_id, context)
             for m  in pick.move_lines:
-                if m.product_qty * m.product_uom.factor > return_history[m.id]:
-                        valid_lines += 1
+                if m.state == 'done' and m.product_qty * m.product_uom.factor > return_history.get(m.id, 0):
+                    valid_lines += 1
             if not valid_lines:
                 raise osv.except_osv(_('Warning!'), _("No products to return (only lines in Done state and not fully returned yet can be returned)!"))
         return res
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index 28007592f23..d61f6323f77 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.py
@@ -52,7 +52,6 @@ class action_traceability(osv.osv_memory):
         value = {
             'domain': "[('id','in',["+','.join(map(str, ids))+"])]",
             'name': ((type1=='move_history_ids2') and _('Upstream Traceability')) or _('Downstream Traceability'),
-            'view_type': 'tree',
             'view_mode': 'tree',
             'res_model': 'stock.move',
             'field_parent': type1,
diff --git a/addons/stock_invoice_directly/__openerp__.py b/addons/stock_invoice_directly/__openerp__.py
index c7c87af7ee0..d6f8472a8c6 100644
--- a/addons/stock_invoice_directly/__openerp__.py
+++ b/addons/stock_invoice_directly/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Invoice Picking Directly',
     'version': '1.0',
-    "category" : "Warehouse Management",
+    'category' : 'Warehouse Management',
     'description': """
 Invoice Wizard for Delivery.
 ============================
@@ -35,12 +35,10 @@ wizard if the delivery is to be invoiced.
     'website': 'http://www.openerp.com',
     'images': ['images/create_invoice.jpeg'],
     'depends': ['delivery', 'stock'],
-    'init_xml': [],
-    'update_xml': [],
-    'demo_xml': [],
+    'data': [],
+    'demo': [],
     'test': ['test/stock_invoice_directly.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0081385081261',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_invoice_directly/i18n/ar.po b/addons/stock_invoice_directly/i18n/ar.po
index 6803bb5532d..54aa922063d 100644
--- a/addons/stock_invoice_directly/i18n/ar.po
+++ b/addons/stock_invoice_directly/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/bg.po b/addons/stock_invoice_directly/i18n/bg.po
index 56f5ba39397..d3091bf77bd 100644
--- a/addons/stock_invoice_directly/i18n/bg.po
+++ b/addons/stock_invoice_directly/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/bs.po b/addons/stock_invoice_directly/i18n/bs.po
index e5566a0ff4b..540a0994ff9 100644
--- a/addons/stock_invoice_directly/i18n/bs.po
+++ b/addons/stock_invoice_directly/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/ca.po b/addons/stock_invoice_directly/i18n/ca.po
index 0179454ed0f..517b4156a39 100644
--- a/addons/stock_invoice_directly/i18n/ca.po
+++ b/addons/stock_invoice_directly/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/cs.po b/addons/stock_invoice_directly/i18n/cs.po
index bd30b7e11ea..b78644558e6 100644
--- a/addons/stock_invoice_directly/i18n/cs.po
+++ b/addons/stock_invoice_directly/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/da.po b/addons/stock_invoice_directly/i18n/da.po
index 225d7ba8cf8..cbf5dfcf58d 100644
--- a/addons/stock_invoice_directly/i18n/da.po
+++ b/addons/stock_invoice_directly/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/de.po b/addons/stock_invoice_directly/i18n/de.po
index e50d866c835..d1bba4a1915 100644
--- a/addons/stock_invoice_directly/i18n/de.po
+++ b/addons/stock_invoice_directly/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/el.po b/addons/stock_invoice_directly/i18n/el.po
index 30fd9b95ded..f2a75bbb477 100644
--- a/addons/stock_invoice_directly/i18n/el.po
+++ b/addons/stock_invoice_directly/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/es.po b/addons/stock_invoice_directly/i18n/es.po
index 7f620f8567e..85846019b4c 100644
--- a/addons/stock_invoice_directly/i18n/es.po
+++ b/addons/stock_invoice_directly/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/es_AR.po b/addons/stock_invoice_directly/i18n/es_AR.po
index 4692b98ca89..37cbef85df5 100644
--- a/addons/stock_invoice_directly/i18n/es_AR.po
+++ b/addons/stock_invoice_directly/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/es_CL.po b/addons/stock_invoice_directly/i18n/es_CL.po
index bdcbeeea96d..755b39ffc4f 100644
--- a/addons/stock_invoice_directly/i18n/es_CL.po
+++ b/addons/stock_invoice_directly/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/es_CR.po b/addons/stock_invoice_directly/i18n/es_CR.po
index 9a6eca86b07..417889ae3f2 100644
--- a/addons/stock_invoice_directly/i18n/es_CR.po
+++ b/addons/stock_invoice_directly/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: stock_invoice_directly
diff --git a/addons/stock_invoice_directly/i18n/et.po b/addons/stock_invoice_directly/i18n/et.po
index d5ba0f1a355..e0101f34149 100644
--- a/addons/stock_invoice_directly/i18n/et.po
+++ b/addons/stock_invoice_directly/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/fi.po b/addons/stock_invoice_directly/i18n/fi.po
index 518a326ac6e..ca76204cfdb 100644
--- a/addons/stock_invoice_directly/i18n/fi.po
+++ b/addons/stock_invoice_directly/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/fr.po b/addons/stock_invoice_directly/i18n/fr.po
index a60f8ba9b48..8af785a6de9 100644
--- a/addons/stock_invoice_directly/i18n/fr.po
+++ b/addons/stock_invoice_directly/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/gl.po b/addons/stock_invoice_directly/i18n/gl.po
index a5b68525864..8f27e7cb60d 100644
--- a/addons/stock_invoice_directly/i18n/gl.po
+++ b/addons/stock_invoice_directly/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/hr.po b/addons/stock_invoice_directly/i18n/hr.po
index 51341a659ec..35825ab2779 100644
--- a/addons/stock_invoice_directly/i18n/hr.po
+++ b/addons/stock_invoice_directly/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/hu.po b/addons/stock_invoice_directly/i18n/hu.po
index bcfcd41bbee..298c4456016 100644
--- a/addons/stock_invoice_directly/i18n/hu.po
+++ b/addons/stock_invoice_directly/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/id.po b/addons/stock_invoice_directly/i18n/id.po
index 079bdf91982..638c5702b53 100644
--- a/addons/stock_invoice_directly/i18n/id.po
+++ b/addons/stock_invoice_directly/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/it.po b/addons/stock_invoice_directly/i18n/it.po
index 681159929b1..87ea3a96298 100644
--- a/addons/stock_invoice_directly/i18n/it.po
+++ b/addons/stock_invoice_directly/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/ja.po b/addons/stock_invoice_directly/i18n/ja.po
index d170240e7a1..7dfd706055c 100644
--- a/addons/stock_invoice_directly/i18n/ja.po
+++ b/addons/stock_invoice_directly/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/ko.po b/addons/stock_invoice_directly/i18n/ko.po
index bb8550a8ea9..83d4126c36b 100644
--- a/addons/stock_invoice_directly/i18n/ko.po
+++ b/addons/stock_invoice_directly/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/lt.po b/addons/stock_invoice_directly/i18n/lt.po
index db809c21160..83d116d9ecd 100644
--- a/addons/stock_invoice_directly/i18n/lt.po
+++ b/addons/stock_invoice_directly/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/lv.po b/addons/stock_invoice_directly/i18n/lv.po
index dd31b23a580..bb0118396d7 100644
--- a/addons/stock_invoice_directly/i18n/lv.po
+++ b/addons/stock_invoice_directly/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/mk.po b/addons/stock_invoice_directly/i18n/mk.po
index 8c0824cf142..5347f3c9080 100644
--- a/addons/stock_invoice_directly/i18n/mk.po
+++ b/addons/stock_invoice_directly/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/mn.po b/addons/stock_invoice_directly/i18n/mn.po
index 9d59ef24c4b..e238552f74d 100644
--- a/addons/stock_invoice_directly/i18n/mn.po
+++ b/addons/stock_invoice_directly/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/nb.po b/addons/stock_invoice_directly/i18n/nb.po
index 599e9c826bc..7b5b866abff 100644
--- a/addons/stock_invoice_directly/i18n/nb.po
+++ b/addons/stock_invoice_directly/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/nl.po b/addons/stock_invoice_directly/i18n/nl.po
index 5f91b36777c..0df1be8f084 100644
--- a/addons/stock_invoice_directly/i18n/nl.po
+++ b/addons/stock_invoice_directly/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-09 07:02+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/nl_BE.po b/addons/stock_invoice_directly/i18n/nl_BE.po
index 792ea3b6ca5..ee8840ff16e 100644
--- a/addons/stock_invoice_directly/i18n/nl_BE.po
+++ b/addons/stock_invoice_directly/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/oc.po b/addons/stock_invoice_directly/i18n/oc.po
index 3530a5686a4..a264c285467 100644
--- a/addons/stock_invoice_directly/i18n/oc.po
+++ b/addons/stock_invoice_directly/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/pl.po b/addons/stock_invoice_directly/i18n/pl.po
index 89857ae81e9..4d28cf22735 100644
--- a/addons/stock_invoice_directly/i18n/pl.po
+++ b/addons/stock_invoice_directly/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/pt.po b/addons/stock_invoice_directly/i18n/pt.po
index 431a59a1c59..c30c5703e2f 100644
--- a/addons/stock_invoice_directly/i18n/pt.po
+++ b/addons/stock_invoice_directly/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/pt_BR.po b/addons/stock_invoice_directly/i18n/pt_BR.po
index fcdfc5acc8b..4902d38f3cf 100644
--- a/addons/stock_invoice_directly/i18n/pt_BR.po
+++ b/addons/stock_invoice_directly/i18n/pt_BR.po
@@ -13,13 +13,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
 msgid "Partial Picking Processing Wizard"
-msgstr ""
+msgstr "Assistente de Separação Parcial"
 
 #~ msgid "Invoice Picking Directly"
 #~ msgstr "Composição direta da Fatura"
diff --git a/addons/stock_invoice_directly/i18n/ro.po b/addons/stock_invoice_directly/i18n/ro.po
index 7f900c8e1fd..b2badcf9ac9 100644
--- a/addons/stock_invoice_directly/i18n/ro.po
+++ b/addons/stock_invoice_directly/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/ru.po b/addons/stock_invoice_directly/i18n/ru.po
index 45130dc8218..fb5f81c1476 100644
--- a/addons/stock_invoice_directly/i18n/ru.po
+++ b/addons/stock_invoice_directly/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sl.po b/addons/stock_invoice_directly/i18n/sl.po
index 716104c6d6e..844219cccf6 100644
--- a/addons/stock_invoice_directly/i18n/sl.po
+++ b/addons/stock_invoice_directly/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sq.po b/addons/stock_invoice_directly/i18n/sq.po
index 01f0fdb5209..dcf2e4d1ccd 100644
--- a/addons/stock_invoice_directly/i18n/sq.po
+++ b/addons/stock_invoice_directly/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sr.po b/addons/stock_invoice_directly/i18n/sr.po
index 5efec9e759d..841579cf7b2 100644
--- a/addons/stock_invoice_directly/i18n/sr.po
+++ b/addons/stock_invoice_directly/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sr@latin.po b/addons/stock_invoice_directly/i18n/sr@latin.po
index 14033be4705..1f6025af298 100644
--- a/addons/stock_invoice_directly/i18n/sr@latin.po
+++ b/addons/stock_invoice_directly/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/sv.po b/addons/stock_invoice_directly/i18n/sv.po
index 7f8c198140e..0b83d4cd54b 100644
--- a/addons/stock_invoice_directly/i18n/sv.po
+++ b/addons/stock_invoice_directly/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/tr.po b/addons/stock_invoice_directly/i18n/tr.po
index 2401b87748e..c1f6a102001 100644
--- a/addons/stock_invoice_directly/i18n/tr.po
+++ b/addons/stock_invoice_directly/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/uk.po b/addons/stock_invoice_directly/i18n/uk.po
index 92288212e9e..8695dfc86fb 100644
--- a/addons/stock_invoice_directly/i18n/uk.po
+++ b/addons/stock_invoice_directly/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/vi.po b/addons/stock_invoice_directly/i18n/vi.po
index 1c7c4c96010..047e102f6b7 100644
--- a/addons/stock_invoice_directly/i18n/vi.po
+++ b/addons/stock_invoice_directly/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/zh_CN.po b/addons/stock_invoice_directly/i18n/zh_CN.po
index 93e92e35a9f..41160a4ff70 100644
--- a/addons/stock_invoice_directly/i18n/zh_CN.po
+++ b/addons/stock_invoice_directly/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/i18n/zh_TW.po b/addons/stock_invoice_directly/i18n/zh_TW.po
index db809c21160..83d116d9ecd 100644
--- a/addons/stock_invoice_directly/i18n/zh_TW.po
+++ b/addons/stock_invoice_directly/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:22+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
diff --git a/addons/stock_invoice_directly/wizard/stock_invoice.py b/addons/stock_invoice_directly/wizard/stock_invoice.py
index 3725d9b6d7f..4bb0ab41d88 100644
--- a/addons/stock_invoice_directly/wizard/stock_invoice.py
+++ b/addons/stock_invoice_directly/wizard/stock_invoice.py
@@ -47,4 +47,4 @@ class invoice_directly(osv.osv_memory):
 
 invoice_directly()
 
-# 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/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index db2858bb44a..9d5386863e6 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -29,12 +29,13 @@ This module supplements the Warehouse application by effectively implementing Pu
 ============================================================================================================
 
 Typically this could be used to:
+--------------------------------
     * Manage product manufacturing chains
     * Manage default locations per product
     * Define routes within your warehouse according to business needs, such as:
-       - Quality Control
-       - After Sales Services
-       - Supplier Returns
+        - Quality Control
+        - After Sales Services
+        - Supplier Returns
 
     * Help rental management, by generating automated return moves for rented products
 
@@ -77,16 +78,17 @@ all the way between the Customer and Supplier.
 
 Technically, Pull flows allow to process procurement orders differently, not
 only depending on the product being considered, but also depending on which
-location holds the "need" for that product (i.e. the destination location of
+location holds the 'need' for that product (i.e. the destination location of
 that procurement order).
 
 Use-Case:
 ---------
 
 You can use the demo data as follow:
-  CPU1: Sell some CPU1 from Chicago Shop and run the scheduler
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  **CPU1:** Sell some CPU1 from Chicago Shop and run the scheduler
      - Warehouse: delivery order, Chicago Shop: reception
-  CPU3:
+  **CPU3:**
      - When receiving the product, it goes to Quality Control location then
        stored to shelf 2.
      - When delivering the customer: Pick List -> Packing -> Delivery Order from Gate A
@@ -94,19 +96,17 @@ You can use the demo data as follow:
     'author': 'OpenERP SA',
     'images': ['images/pulled_flow.jpeg','images/pushed_flow.jpeg'],
     'depends': ['procurement','stock','sale'],
-    'init_xml': [],
-    'update_xml': ['stock_location_view.xml', "security/stock_location_security.xml", 'security/ir.model.access.csv', 'procurement_pull_workflow.xml'],
-    'demo_xml': [
+    'data': ['stock_location_view.xml', 'security/stock_location_security.xml', 'security/ir.model.access.csv', 'procurement_pull_workflow.xml'],
+    'demo': [
         'stock_location_demo_cpu1.xml',
         'stock_location_demo_cpu3.yml',
     ],
     'installable': True,
-    'test':[
-            'test/stock_location_pull_flow.yml',
-            'test/stock_location_push_flow.yml',
+    'test': [
+        'test/stock_location_pull_flow.yml',
+        'test/stock_location_push_flow.yml',
     ],
     'auto_install': False,
-    'certificate': '0046505115101',
 }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_location/i18n/ar.po b/addons/stock_location/i18n/ar.po
index 66ec8c68949..a310eb13f4a 100644
--- a/addons/stock_location/i18n/ar.po
+++ b/addons/stock_location/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/bg.po b/addons/stock_location/i18n/bg.po
index 08c14be3a10..8cd80d3dd2d 100644
--- a/addons/stock_location/i18n/bg.po
+++ b/addons/stock_location/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/bs.po b/addons/stock_location/i18n/bs.po
index d2570e83eb3..f83528235e0 100644
--- a/addons/stock_location/i18n/bs.po
+++ b/addons/stock_location/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/ca.po b/addons/stock_location/i18n/ca.po
index 16028281334..72d90daba2b 100644
--- a/addons/stock_location/i18n/ca.po
+++ b/addons/stock_location/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/cs.po b/addons/stock_location/i18n/cs.po
index b199c0130fc..7eae6b7e63f 100644
--- a/addons/stock_location/i18n/cs.po
+++ b/addons/stock_location/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/da.po b/addons/stock_location/i18n/da.po
index 135433dd243..93e72e2a929 100644
--- a/addons/stock_location/i18n/da.po
+++ b/addons/stock_location/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/de.po b/addons/stock_location/i18n/de.po
index 58e0be05d26..333a20facdb 100644
--- a/addons/stock_location/i18n/de.po
+++ b/addons/stock_location/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/el.po b/addons/stock_location/i18n/el.po
index ab82c9b7246..1a8901a746b 100644
--- a/addons/stock_location/i18n/el.po
+++ b/addons/stock_location/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/stock_location/i18n/es.po b/addons/stock_location/i18n/es.po
index 8e517525bbc..520d6a90e48 100644
--- a/addons/stock_location/i18n/es.po
+++ b/addons/stock_location/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/es_AR.po b/addons/stock_location/i18n/es_AR.po
index 0f17a7651aa..60f71e3fe85 100644
--- a/addons/stock_location/i18n/es_AR.po
+++ b/addons/stock_location/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/es_CL.po b/addons/stock_location/i18n/es_CL.po
index d54e7c85878..d4c02049d27 100644
--- a/addons/stock_location/i18n/es_CL.po
+++ b/addons/stock_location/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/es_CR.po b/addons/stock_location/i18n/es_CR.po
index 14475084728..f4c1fdce7d0 100644
--- a/addons/stock_location/i18n/es_CR.po
+++ b/addons/stock_location/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: stock_location
diff --git a/addons/stock_location/i18n/et.po b/addons/stock_location/i18n/et.po
index 448062c874e..f2aafc67415 100644
--- a/addons/stock_location/i18n/et.po
+++ b/addons/stock_location/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/fi.po b/addons/stock_location/i18n/fi.po
index b58564561e6..0fabf45c7ac 100644
--- a/addons/stock_location/i18n/fi.po
+++ b/addons/stock_location/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/fr.po b/addons/stock_location/i18n/fr.po
index 0202ea37426..0978b03fb4f 100644
--- a/addons/stock_location/i18n/fr.po
+++ b/addons/stock_location/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/gl.po b/addons/stock_location/i18n/gl.po
index 34b587bb842..7811d9a103d 100644
--- a/addons/stock_location/i18n/gl.po
+++ b/addons/stock_location/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/hr.po b/addons/stock_location/i18n/hr.po
index d3a4de33ba4..a9fb079161d 100644
--- a/addons/stock_location/i18n/hr.po
+++ b/addons/stock_location/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/hu.po b/addons/stock_location/i18n/hu.po
index 9f4419ff9be..02ac2fb57f2 100644
--- a/addons/stock_location/i18n/hu.po
+++ b/addons/stock_location/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/id.po b/addons/stock_location/i18n/id.po
index 91fb3829c3f..9cdc56301c8 100644
--- a/addons/stock_location/i18n/id.po
+++ b/addons/stock_location/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/it.po b/addons/stock_location/i18n/it.po
index 8bc72a39124..b9c83e6a946 100644
--- a/addons/stock_location/i18n/it.po
+++ b/addons/stock_location/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-12 19:03+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-10-30 22:46+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-11-03 05:04+0000\n"
+"X-Generator: Launchpad (build 16218)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -164,7 +164,7 @@ msgstr "Azienda"
 #. module: stock_location
 #: view:product.product:0
 msgid "Logistics Flows"
-msgstr ""
+msgstr "Flussi logistici"
 
 #. module: stock_location
 #: help:stock.move,cancel_cascade:0
diff --git a/addons/stock_location/i18n/ja.po b/addons/stock_location/i18n/ja.po
index 29c22a7f507..d9fadc13ce9 100644
--- a/addons/stock_location/i18n/ja.po
+++ b/addons/stock_location/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/ko.po b/addons/stock_location/i18n/ko.po
index 2492e6da439..97ddd6c30b3 100644
--- a/addons/stock_location/i18n/ko.po
+++ b/addons/stock_location/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/lt.po b/addons/stock_location/i18n/lt.po
index 85d3ffb2510..7694f89c37f 100644
--- a/addons/stock_location/i18n/lt.po
+++ b/addons/stock_location/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/lv.po b/addons/stock_location/i18n/lv.po
index b6719c5a3ee..35e4428981a 100644
--- a/addons/stock_location/i18n/lv.po
+++ b/addons/stock_location/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/mk.po b/addons/stock_location/i18n/mk.po
index 785e4dc22fd..a20da4875ae 100644
--- a/addons/stock_location/i18n/mk.po
+++ b/addons/stock_location/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/mn.po b/addons/stock_location/i18n/mn.po
index 76408a9309a..b5e2165e413 100644
--- a/addons/stock_location/i18n/mn.po
+++ b/addons/stock_location/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/nb.po b/addons/stock_location/i18n/nb.po
index d118aae6097..2de53ea3900 100644
--- a/addons/stock_location/i18n/nb.po
+++ b/addons/stock_location/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/nl.po b/addons/stock_location/i18n/nl.po
index 49ab2d33d56..382e0ed36cd 100644
--- a/addons/stock_location/i18n/nl.po
+++ b/addons/stock_location/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-18 11:54+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -113,7 +113,7 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
-"Dit wordt gebruikt om paden te definieren waarlangs het produkt wordt "
+"Dit wordt gebruikt om paden te definieren waarlangs het product wordt "
 "verplaatst in de locatieboom.\n"
 "De 'Automatische verplaatsing' waarde maakt een voorraad verplaating aan na "
 "de huidige die automatisch gevalideerd wordt. Met 'Handmatige verwerking' "
diff --git a/addons/stock_location/i18n/nl_BE.po b/addons/stock_location/i18n/nl_BE.po
index 9a0a3fe4e1a..1afea4f9a19 100644
--- a/addons/stock_location/i18n/nl_BE.po
+++ b/addons/stock_location/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/pl.po b/addons/stock_location/i18n/pl.po
index 827e37bda92..e7c186a9d18 100644
--- a/addons/stock_location/i18n/pl.po
+++ b/addons/stock_location/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/pt.po b/addons/stock_location/i18n/pt.po
index 0f6237916f9..615497cc771 100644
--- a/addons/stock_location/i18n/pt.po
+++ b/addons/stock_location/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/pt_BR.po b/addons/stock_location/i18n/pt_BR.po
index 4de0b0ced38..1c8501cab7e 100644
--- a/addons/stock_location/i18n/pt_BR.po
+++ b/addons/stock_location/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -25,7 +25,7 @@ msgstr "Enviando Mercadorias"
 #. module: stock_location
 #: view:product.product:0
 msgid "Pulled Paths"
-msgstr ""
+msgstr "Caminhos Puxados"
 
 #. module: stock_location
 #: selection:product.pulled.flow,type_proc:0
@@ -35,7 +35,7 @@ msgstr "Movimento"
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location_path
 msgid "Pushed Flows"
-msgstr ""
+msgstr "Fluxos Empurrados"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
@@ -57,12 +57,14 @@ msgstr "Local de Origem"
 #: help:product.pulled.flow,cancel_cascade:0
 msgid "Allow you to cancel moves related to the product pull flow"
 msgstr ""
+"Permitir que você cancele movimentos relacionados com o fluxo empurrado do "
+"produto"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_product_pulled_flow
 #: field:product.product,flow_pull_ids:0
 msgid "Pulled Flows"
-msgstr ""
+msgstr "Fluxo Empurrado"
 
 #. module: stock_location
 #: constraint:stock.move:0
@@ -72,7 +74,7 @@ msgstr "Você deve atribuir um lote de produção para este produto"
 #. module: stock_location
 #: help:product.pulled.flow,location_src_id:0
 msgid "Location used by Destination Location to supply"
-msgstr ""
+msgstr "Local utilizado pelo local de destino para fornecimento"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -97,7 +99,7 @@ msgstr "Local"
 #: field:product.pulled.flow,invoice_state:0
 #: field:stock.location.path,invoice_state:0
 msgid "Invoice Status"
-msgstr "Status da Fatura"
+msgstr "Situação da Fatura"
 
 #. module: stock_location
 #: help:stock.location.path,auto:0
@@ -203,7 +205,7 @@ msgstr "Endereço de Parceiro"
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "To Be Invoiced"
-msgstr "Para Ser Faturado"
+msgstr "Para ser Faturado"
 
 #. module: stock_location
 #: help:stock.location.path,delay:0
@@ -224,7 +226,7 @@ msgstr "Tipo de Aquisição"
 #. module: stock_location
 #: help:product.pulled.flow,company_id:0
 msgid "Is used to know to which company belong packings and moves"
-msgstr ""
+msgstr "É usada para saber a que empresa pertencem embalagens e movimentos"
 
 #. module: stock_location
 #: field:product.pulled.flow,name:0
@@ -243,6 +245,7 @@ msgstr ""
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
 msgstr ""
+"Você não pode mover os produtos de/para um Local do tipo Visualização"
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
@@ -280,7 +283,7 @@ msgstr ""
 #. module: stock_location
 #: help:product.pulled.flow,location_id:0
 msgid "Is the destination location that needs supplying"
-msgstr ""
+msgstr "É o local de destino que necessita fornecimento"
 
 #. module: stock_location
 #: field:stock.location.path,product_id:0
@@ -291,7 +294,7 @@ msgstr "Produtos"
 #: code:addons/stock_location/procurement_pull.py:118
 #, python-format
 msgid "Pulled from another location via procurement %d"
-msgstr ""
+msgstr "Puxado de outro local através de aquisições %d"
 
 #. module: stock_location
 #: model:stock.location,name:stock_location.stock_location_qualitytest0
@@ -390,7 +393,7 @@ msgstr "Operação"
 #. module: stock_location
 #: view:stock.location.path:0
 msgid "Location Paths"
-msgstr ""
+msgstr "Caminhos de localização"
 
 #. module: stock_location
 #: field:product.pulled.flow,journal_id:0
@@ -408,7 +411,7 @@ msgstr "Cancelar em Cascata"
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Faturado"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
diff --git a/addons/stock_location/i18n/ro.po b/addons/stock_location/i18n/ro.po
index 486d20c806a..43b27d1e971 100644
--- a/addons/stock_location/i18n/ro.po
+++ b/addons/stock_location/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po
index c722dcde968..08399cb3588 100644
--- a/addons/stock_location/i18n/ru.po
+++ b/addons/stock_location/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
@@ -40,7 +40,7 @@ msgstr "Исходящие потоки"
 #. module: stock_location
 #: selection:stock.location.path,auto:0
 msgid "Automatic No Step Added"
-msgstr "Шаги не будут добавляться автоматически"
+msgstr "Автоматически без добавления шагов"
 
 #. module: stock_location
 #: view:product.product:0
@@ -88,6 +88,8 @@ msgid ""
 "Pulled procurement coming from original location %s, pull rule %s, via "
 "original Procurement %s (#%d)"
 msgstr ""
+"Входящее снабжение поступающее из исходного места %s, правило прихода %s, "
+"через исходное снабжение %s (#%d)"
 
 #. module: stock_location
 #: model:ir.model,name:stock_location.model_stock_location
@@ -110,6 +112,12 @@ 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
 #: view:product.product:0
@@ -227,7 +235,7 @@ msgstr ""
 #. module: stock_location
 #: field:product.pulled.flow,name:0
 msgid "Name"
-msgstr "Имя"
+msgstr "Название"
 
 #. module: stock_location
 #: help:product.product,path_ids:0
@@ -240,7 +248,7 @@ msgstr ""
 #. module: stock_location
 #: constraint:stock.move:0
 msgid "You can not move products from or to a location of the type view."
-msgstr ""
+msgstr "Нельзя переместить ТМЦ в/из место хранения типа вид."
 
 #. module: stock_location
 #: selection:stock.location.path,auto:0
@@ -251,7 +259,7 @@ msgstr "Ручное управление"
 #: model:ir.model,name:stock_location.model_product_product
 #: field:product.pulled.flow,product_id:0
 msgid "Product"
-msgstr "Продукция"
+msgstr "Товар"
 
 #. module: stock_location
 #: field:product.pulled.flow,procure_method:0
@@ -283,7 +291,7 @@ msgstr "Место хранения которое нуждается в пос
 #. module: stock_location
 #: field:stock.location.path,product_id:0
 msgid "Products"
-msgstr "Продукция"
+msgstr "Товары"
 
 #. module: stock_location
 #: code:addons/stock_location/procurement_pull.py:118
@@ -314,6 +322,8 @@ msgid ""
 "Picking for pulled procurement coming from original location %s, pull rule "
 "%s, via original Procurement %s (#%d)"
 msgstr ""
+"Комплектование для входящего снабжения приходящего из исходного места "
+"хранения %s, правило поступления %s, через исходное снабжение %s (#%d)"
 
 #. module: stock_location
 #: field:product.product,path_ids:0
@@ -327,6 +337,8 @@ msgid ""
 "Move for pulled procurement coming from original location %s, pull rule %s, "
 "via original Procurement %s (#%d)"
 msgstr ""
+"Перемещение для входящего снабжения поступающего из исходного места хранения "
+"%s, правило прихода %s, через исходное снабжение %s (#%d)"
 
 #. module: stock_location
 #: constraint:stock.move:0
@@ -364,7 +376,7 @@ msgstr "Тип действия"
 #. module: stock_location
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr "Ошибка: Неправильный штрих-код"
+msgstr "Ошибка: Неверный штрих-код"
 
 #. module: stock_location
 #: help:product.pulled.flow,picking_type:0
@@ -389,7 +401,7 @@ msgstr "Операция"
 #. module: stock_location
 #: view:stock.location.path:0
 msgid "Location Paths"
-msgstr "Расположение каталога"
+msgstr "Пути мест хранения"
 
 #. module: stock_location
 #: field:product.pulled.flow,journal_id:0
@@ -407,7 +419,7 @@ msgstr "Отменить каскад"
 #: selection:product.pulled.flow,invoice_state:0
 #: selection:stock.location.path,invoice_state:0
 msgid "Invoiced"
-msgstr "Счет"
+msgstr "Счет выставлен"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Неправильный XML для просмотра архитектуры!"
diff --git a/addons/stock_location/i18n/sl.po b/addons/stock_location/i18n/sl.po
index c319106ea0f..eb49fcf9875 100644
--- a/addons/stock_location/i18n/sl.po
+++ b/addons/stock_location/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/sq.po b/addons/stock_location/i18n/sq.po
index 7d509c1c234..939111b3d9f 100644
--- a/addons/stock_location/i18n/sq.po
+++ b/addons/stock_location/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:20+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/sv.po b/addons/stock_location/i18n/sv.po
index 89ec0d62228..1eef56cfb4b 100644
--- a/addons/stock_location/i18n/sv.po
+++ b/addons/stock_location/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/tlh.po b/addons/stock_location/i18n/tlh.po
index 842d3285744..03ae5f09c45 100644
--- a/addons/stock_location/i18n/tlh.po
+++ b/addons/stock_location/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/tr.po b/addons/stock_location/i18n/tr.po
index 00c6dd0d581..7d6c30e4dfd 100644
--- a/addons/stock_location/i18n/tr.po
+++ b/addons/stock_location/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/uk.po b/addons/stock_location/i18n/uk.po
index f6f689be874..4896f905bc2 100644
--- a/addons/stock_location/i18n/uk.po
+++ b/addons/stock_location/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/vi.po b/addons/stock_location/i18n/vi.po
index 889143ffea6..adf550f93c5 100644
--- a/addons/stock_location/i18n/vi.po
+++ b/addons/stock_location/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/zh_CN.po b/addons/stock_location/i18n/zh_CN.po
index a066ceda1a9..7e522bfc55e 100644
--- a/addons/stock_location/i18n/zh_CN.po
+++ b/addons/stock_location/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/i18n/zh_TW.po b/addons/stock_location/i18n/zh_TW.po
index 73bb284eb51..8db22be185c 100644
--- a/addons/stock_location/i18n/zh_TW.po
+++ b/addons/stock_location/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_location
 #: selection:product.pulled.flow,picking_type:0
diff --git a/addons/stock_location/procurement_pull.py b/addons/stock_location/procurement_pull.py
index 5482669f543..419118cda96 100644
--- a/addons/stock_location/procurement_pull.py
+++ b/addons/stock_location/procurement_pull.py
@@ -45,7 +45,7 @@ class procurement_order(osv.osv):
                     return (line.type_proc=='move') and (line.location_src_id)
         return False
 
-    def action_move_create(self, cr, uid, ids,context=None):
+    def action_move_create(self, cr, uid, ids, context=None):
         proc_obj = self.pool.get('procurement.order')
         move_obj = self.pool.get('stock.move')
         picking_obj=self.pool.get('stock.picking')
@@ -115,9 +115,9 @@ class procurement_order(osv.osv):
             if proc.move_id:
                 move_obj.write(cr, uid, [proc.move_id.id],
                     {'location_id':proc.location_id.id})
-            self.write(cr, uid, [proc.id], {'state':'running', 'message':_('Pulled from another location via procurement %d') % proc_id})
-            self.running_send_note(cr, uid, [proc.id], context=context)
-
+            msg = _('Pulled from another location.')
+            self.write(cr, uid, [proc.id], {'state':'running', 'message': msg})
+            self.message_post(cr, uid, [proc.id], body=msg, context=context)
             # trigger direct processing (the new procurement shares the same planned date as the original one, which is already being processed)
             wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_check', cr)
         return False
diff --git a/addons/stock_location/stock_location_view.xml b/addons/stock_location/stock_location_view.xml
index 720c7753df6..ddb2efc21e5 100644
--- a/addons/stock_location/stock_location_view.xml
+++ b/addons/stock_location/stock_location_view.xml
@@ -38,62 +38,59 @@
             <field name="model">product.product</field>
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Logistics Flows">
-                        <field name="flow_pull_ids" colspan="4" nolabel="1">
-                            <tree string="Pulled flows">
-                                <field name="name"/>
-                                <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
-                                <field name="type_proc"/>
-                                <field name="journal_id"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
-                            </tree>
-                            <form string="Pulled Paths">
-                                <group>
-                                    <group string="Conditions">
-                                        <field name="name" placeholder="Fulfill needs on location X from location Y "/>
-                                        <field name="location_id"/>
-                                    </group>
-                                    <group string="Action Type">
-                                        <field name="type_proc"/>
-                                        <field name="company_id"/>
-                                    </group>
+                <group name="inventory" position="after">
+                    <field name="flow_pull_ids" colspan="4" nolabel="1">
+                        <tree string="Pulled flows">
+                            <field name="name"/>
+                            <field name="location_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
+                            <field name="type_proc"/>
+                            <field name="journal_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </tree>
+                        <form string="Pulled Paths">
+                            <group>
+                                <group string="Conditions">
+                                    <field name="name" placeholder="Fulfill needs on location X from location Y "/>
+                                    <field name="location_id"/>
                                 </group>
-                                <group attrs="{'invisible':[('type_proc','!=','move')]}">
-                                    <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
-                                    <field name="picking_type"/>
-                                    <field name="partner_address_id"/>
-                                    <field name="procure_method"/>
-                                    <field name="cancel_cascade"/>
-                                    <field name="invoice_state"/>
-                                    <field name="journal_id"/>
+                                <group string="Action Type">
+                                    <field name="type_proc"/>
+                                    <field name="company_id"/>
                                 </group>
-                            </form>
-                        </field>
-                        <field name="path_ids">
-                        <field name="name"/>
-                            <tree string="Pushed flows">
-                                <field name="location_from_id"/>
-                                <field name="location_dest_id"/>
-                                <field name="auto"/>
-                                <field name="name"/>
-                                <field name="invoice_state"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
-                            </tree>
-                            <form string="Pushed flows">
-                                <field name="name" placeholder="When receiving at location X, move to location Y"/>
-                                <field name="location_from_id"/>
-                                <field name="location_dest_id"/>
-                                <field name="auto"/>
-                                <field name="delay"/>
-                                <field name="journal_id"/>
+                            </group>
+                            <group attrs="{'invisible':[('type_proc','!=','move')]}">
+                                <field name="location_src_id" attrs="{'required': [('type_proc', '=', 'move')]}"/>
                                 <field name="picking_type"/>
+                                <field name="partner_address_id"/>
+                                <field name="procure_method"/>
+                                <field name="cancel_cascade"/>
                                 <field name="invoice_state"/>
-                                <field name="company_id" groups="base.group_multi_company"/>
-                            </form>
-                        </field>
-                    </page>
-                </notebook>
+                                <field name="journal_id"/>
+                            </group>
+                        </form>
+                    </field>
+                    <field name="path_ids">
+                        <tree string="Pushed flows">
+                            <field name="location_from_id"/>
+                            <field name="location_dest_id"/>
+                            <field name="auto"/>
+                            <field name="name"/>
+                            <field name="invoice_state"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </tree>
+                        <form string="Pushed flows">
+                            <field name="name" placeholder="When receiving at location X, move to location Y"/>
+                            <field name="location_from_id"/>
+                            <field name="location_dest_id"/>
+                            <field name="auto"/>
+                            <field name="delay"/>
+                            <field name="journal_id"/>
+                            <field name="picking_type"/>
+                            <field name="invoice_state"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </form>
+                    </field>
+                </group>
             </field>
        </record>
     </data>
diff --git a/addons/stock_no_autopicking/__openerp__.py b/addons/stock_no_autopicking/__openerp__.py
index 7d9b84276d6..daae84252ad 100644
--- a/addons/stock_no_autopicking/__openerp__.py
+++ b/addons/stock_no_autopicking/__openerp__.py
@@ -23,24 +23,23 @@
 {
     'name': 'Picking Before Manufacturing',
     'version': '1.0',
-    "category" : "Warehouse Management",
+    'category' : 'Warehouse Management',
     'description': """
 This module allows an intermediate picking process to provide raw materials to production orders.
 =================================================================================================
 
 One example of usage of this module is to manage production made by your
 suppliers (sub-contracting). To achieve this, set the assembled product which is
-sub-contracted to "No Auto-Picking" and put the location of the supplier in the
+sub-contracted to 'No Auto-Picking' and put the location of the supplier in the
 routing of the assembly operation.
     """,
     'author': 'OpenERP SA',
     'depends': ['mrp'],
     'images': ['images/auto_picking.jpeg'],
-    'update_xml': ['stock_no_autopicking_view.xml'],
-    'demo_xml': [],
+    'data': ['stock_no_autopicking_view.xml'],
+    'demo': [],
     'test': ['test/stock_no_autopicking.yml'],
     'installable': True,
     'auto_install': False,
-    'certificate': '0075124168925',
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_no_autopicking/i18n/ar.po b/addons/stock_no_autopicking/i18n/ar.po
index 78f016f2f51..f5db87682da 100644
--- a/addons/stock_no_autopicking/i18n/ar.po
+++ b/addons/stock_no_autopicking/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/bg.po b/addons/stock_no_autopicking/i18n/bg.po
index fe4a42cc6f8..7bb5c6e851f 100644
--- a/addons/stock_no_autopicking/i18n/bg.po
+++ b/addons/stock_no_autopicking/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/bs.po b/addons/stock_no_autopicking/i18n/bs.po
index 6dadceeeb4b..142a14d90ef 100644
--- a/addons/stock_no_autopicking/i18n/bs.po
+++ b/addons/stock_no_autopicking/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/ca.po b/addons/stock_no_autopicking/i18n/ca.po
index 033c8e8fe29..bc1004c12b7 100644
--- a/addons/stock_no_autopicking/i18n/ca.po
+++ b/addons/stock_no_autopicking/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/cs.po b/addons/stock_no_autopicking/i18n/cs.po
index b8d41662266..b417a1642a9 100644
--- a/addons/stock_no_autopicking/i18n/cs.po
+++ b/addons/stock_no_autopicking/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/da.po b/addons/stock_no_autopicking/i18n/da.po
index 9b5dd540819..52e66ba4856 100644
--- a/addons/stock_no_autopicking/i18n/da.po
+++ b/addons/stock_no_autopicking/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/de.po b/addons/stock_no_autopicking/i18n/de.po
index 33f2aa9bc82..fa415f4d170 100644
--- a/addons/stock_no_autopicking/i18n/de.po
+++ b/addons/stock_no_autopicking/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/el.po b/addons/stock_no_autopicking/i18n/el.po
index 6721faf08fa..b4041f5dcd0 100644
--- a/addons/stock_no_autopicking/i18n/el.po
+++ b/addons/stock_no_autopicking/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/stock_no_autopicking/i18n/es.po b/addons/stock_no_autopicking/i18n/es.po
index 71454a3f847..4cfe4d37780 100644
--- a/addons/stock_no_autopicking/i18n/es.po
+++ b/addons/stock_no_autopicking/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/es_AR.po b/addons/stock_no_autopicking/i18n/es_AR.po
index 1cb00c27445..942afae4f26 100644
--- a/addons/stock_no_autopicking/i18n/es_AR.po
+++ b/addons/stock_no_autopicking/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/es_CL.po b/addons/stock_no_autopicking/i18n/es_CL.po
index 06a07bef26d..4ece3e45a2b 100644
--- a/addons/stock_no_autopicking/i18n/es_CL.po
+++ b/addons/stock_no_autopicking/i18n/es_CL.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/es_CR.po b/addons/stock_no_autopicking/i18n/es_CR.po
index 03b241c4699..39ce32827ec 100644
--- a/addons/stock_no_autopicking/i18n/es_CR.po
+++ b/addons/stock_no_autopicking/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: stock_no_autopicking
diff --git a/addons/stock_no_autopicking/i18n/et.po b/addons/stock_no_autopicking/i18n/et.po
index 85aabaa9dfc..09da2b9543b 100644
--- a/addons/stock_no_autopicking/i18n/et.po
+++ b/addons/stock_no_autopicking/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/fi.po b/addons/stock_no_autopicking/i18n/fi.po
index 5ed92f3fa39..6c77ae1b5e0 100644
--- a/addons/stock_no_autopicking/i18n/fi.po
+++ b/addons/stock_no_autopicking/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/fr.po b/addons/stock_no_autopicking/i18n/fr.po
index 0d3681c0911..b01f106efa9 100644
--- a/addons/stock_no_autopicking/i18n/fr.po
+++ b/addons/stock_no_autopicking/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/gl.po b/addons/stock_no_autopicking/i18n/gl.po
index 2af0d9e4f8f..86ba24ec1a0 100644
--- a/addons/stock_no_autopicking/i18n/gl.po
+++ b/addons/stock_no_autopicking/i18n/gl.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/hr.po b/addons/stock_no_autopicking/i18n/hr.po
index 790bed4564e..f5bff03e39a 100644
--- a/addons/stock_no_autopicking/i18n/hr.po
+++ b/addons/stock_no_autopicking/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/hu.po b/addons/stock_no_autopicking/i18n/hu.po
index 931cdc4601e..792c9854b98 100644
--- a/addons/stock_no_autopicking/i18n/hu.po
+++ b/addons/stock_no_autopicking/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/id.po b/addons/stock_no_autopicking/i18n/id.po
index 5b64d60aa5c..d40ec29bead 100644
--- a/addons/stock_no_autopicking/i18n/id.po
+++ b/addons/stock_no_autopicking/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/it.po b/addons/stock_no_autopicking/i18n/it.po
index 625c9e6a848..101c7683b18 100644
--- a/addons/stock_no_autopicking/i18n/it.po
+++ b/addons/stock_no_autopicking/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/ja.po b/addons/stock_no_autopicking/i18n/ja.po
index a2eed55e5b8..52f0e8fca77 100644
--- a/addons/stock_no_autopicking/i18n/ja.po
+++ b/addons/stock_no_autopicking/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/ko.po b/addons/stock_no_autopicking/i18n/ko.po
index 0332f4056c2..df9743ffb69 100644
--- a/addons/stock_no_autopicking/i18n/ko.po
+++ b/addons/stock_no_autopicking/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/lt.po b/addons/stock_no_autopicking/i18n/lt.po
index 2851c0d2fc1..deef8f9dd8b 100644
--- a/addons/stock_no_autopicking/i18n/lt.po
+++ b/addons/stock_no_autopicking/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/lv.po b/addons/stock_no_autopicking/i18n/lv.po
index df5c16d92d2..d02a73dd6b7 100644
--- a/addons/stock_no_autopicking/i18n/lv.po
+++ b/addons/stock_no_autopicking/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/mk.po b/addons/stock_no_autopicking/i18n/mk.po
index eceb2429485..54a4b2bd212 100644
--- a/addons/stock_no_autopicking/i18n/mk.po
+++ b/addons/stock_no_autopicking/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/mn.po b/addons/stock_no_autopicking/i18n/mn.po
index 8d11d8fd6a7..b658c9dcee6 100644
--- a/addons/stock_no_autopicking/i18n/mn.po
+++ b/addons/stock_no_autopicking/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/nl.po b/addons/stock_no_autopicking/i18n/nl.po
index f457df9f923..ca829bc46fd 100644
--- a/addons/stock_no_autopicking/i18n/nl.po
+++ b/addons/stock_no_autopicking/i18n/nl.po
@@ -8,18 +8,18 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-13 07:52+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
 msgid "Product"
-msgstr "Produkt"
+msgstr "Product"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_mrp_production
@@ -29,12 +29,13 @@ msgstr "Productieorder"
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
 msgid "Auto Picking"
-msgstr "Auto picking"
+msgstr "Automatisch verzamelen"
 
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
 msgid "Auto picking for raw materials of production orders."
-msgstr "Automatische picking voor basis materialen of productie orders."
+msgstr ""
+"Automatisch verzameling van grondstoffen/componenten van productie orders."
 
 #. module: stock_no_autopicking
 #: constraint:product.product:0
diff --git a/addons/stock_no_autopicking/i18n/nl_BE.po b/addons/stock_no_autopicking/i18n/nl_BE.po
index f2a62949034..37bf565123b 100644
--- a/addons/stock_no_autopicking/i18n/nl_BE.po
+++ b/addons/stock_no_autopicking/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/oc.po b/addons/stock_no_autopicking/i18n/oc.po
index f628d52b9fb..0f1f94a2af3 100644
--- a/addons/stock_no_autopicking/i18n/oc.po
+++ b/addons/stock_no_autopicking/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/pl.po b/addons/stock_no_autopicking/i18n/pl.po
index 3677da2e179..232e7fddccb 100644
--- a/addons/stock_no_autopicking/i18n/pl.po
+++ b/addons/stock_no_autopicking/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/pt.po b/addons/stock_no_autopicking/i18n/pt.po
index f759ab9b392..1290a58a37a 100644
--- a/addons/stock_no_autopicking/i18n/pt.po
+++ b/addons/stock_no_autopicking/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/pt_BR.po b/addons/stock_no_autopicking/i18n/pt_BR.po
index 4a338eaa5fe..10543679aea 100644
--- a/addons/stock_no_autopicking/i18n/pt_BR.po
+++ b/addons/stock_no_autopicking/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
@@ -29,12 +29,12 @@ msgstr "Ordem de Produção"
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
 msgid "Auto Picking"
-msgstr "Escolha Automática"
+msgstr "Separação Automática"
 
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
 msgid "Auto picking for raw materials of production orders."
-msgstr "Escolha Automática para matérias-primas de ordens de produção."
+msgstr "Separação Automática para matérias-primas da ordem de produção."
 
 #. module: stock_no_autopicking
 #: constraint:product.product:0
@@ -44,12 +44,12 @@ msgstr "Erro: Código EAN inválido"
 #. module: stock_no_autopicking
 #: sql_constraint:mrp.production:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "A referência deve ser única por empresa!"
 
 #. module: stock_no_autopicking
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "A quantidade do pedido não pode ser negativa ou zero!"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Invalido XML para Arquitetura da View"
diff --git a/addons/stock_no_autopicking/i18n/ro.po b/addons/stock_no_autopicking/i18n/ro.po
index 06dc4124781..40517115e4d 100644
--- a/addons/stock_no_autopicking/i18n/ro.po
+++ b/addons/stock_no_autopicking/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/ru.po b/addons/stock_no_autopicking/i18n/ru.po
index 00e8d8562dd..caf0a715c48 100644
--- a/addons/stock_no_autopicking/i18n/ru.po
+++ b/addons/stock_no_autopicking/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
@@ -44,12 +44,12 @@ msgstr "Ошибка: Неправильный штрих-код"
 #. module: stock_no_autopicking
 #: sql_constraint:mrp.production:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка должна быть уникальна для каждой компании!"
 
 #. module: stock_no_autopicking
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero!"
-msgstr ""
+msgstr "Заказываемое количество должно быть положительным!"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "Неправильный XML для просмотра архитектуры!"
diff --git a/addons/stock_no_autopicking/i18n/sl.po b/addons/stock_no_autopicking/i18n/sl.po
index 93b3782d73a..4221729dff2 100644
--- a/addons/stock_no_autopicking/i18n/sl.po
+++ b/addons/stock_no_autopicking/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/sq.po b/addons/stock_no_autopicking/i18n/sq.po
index 7407047f8b2..0f2e4eb1200 100644
--- a/addons/stock_no_autopicking/i18n/sq.po
+++ b/addons/stock_no_autopicking/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/sr@latin.po b/addons/stock_no_autopicking/i18n/sr@latin.po
index e0928ec2aae..79c57a55fba 100644
--- a/addons/stock_no_autopicking/i18n/sr@latin.po
+++ b/addons/stock_no_autopicking/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/sv.po b/addons/stock_no_autopicking/i18n/sv.po
index b272a4a28d8..c3df8dfddc9 100644
--- a/addons/stock_no_autopicking/i18n/sv.po
+++ b/addons/stock_no_autopicking/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/tlh.po b/addons/stock_no_autopicking/i18n/tlh.po
index 3d0d0420c61..f115aa9bdd8 100644
--- a/addons/stock_no_autopicking/i18n/tlh.po
+++ b/addons/stock_no_autopicking/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/tr.po b/addons/stock_no_autopicking/i18n/tr.po
index 45db5887393..7f4bef64727 100644
--- a/addons/stock_no_autopicking/i18n/tr.po
+++ b/addons/stock_no_autopicking/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/uk.po b/addons/stock_no_autopicking/i18n/uk.po
index 7026556b5e2..cbeeb625575 100644
--- a/addons/stock_no_autopicking/i18n/uk.po
+++ b/addons/stock_no_autopicking/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/vi.po b/addons/stock_no_autopicking/i18n/vi.po
index bb7f3cc85df..ae1b10b4ab9 100644
--- a/addons/stock_no_autopicking/i18n/vi.po
+++ b/addons/stock_no_autopicking/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/zh_CN.po b/addons/stock_no_autopicking/i18n/zh_CN.po
index ba4123fab2c..8aaec94674d 100644
--- a/addons/stock_no_autopicking/i18n/zh_CN.po
+++ b/addons/stock_no_autopicking/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/i18n/zh_TW.po b/addons/stock_no_autopicking/i18n/zh_TW.po
index 2537bafb0f6..dee6d2772db 100644
--- a/addons/stock_no_autopicking/i18n/zh_TW.po
+++ b/addons/stock_no_autopicking/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:20+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:18+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: stock_no_autopicking
 #: model:ir.model,name:stock_no_autopicking.model_product_product
diff --git a/addons/stock_no_autopicking/stock_no_autopicking_view.xml b/addons/stock_no_autopicking/stock_no_autopicking_view.xml
index 9fb2b703efe..a5a96efb58d 100644
--- a/addons/stock_no_autopicking/stock_no_autopicking_view.xml
+++ b/addons/stock_no_autopicking/stock_no_autopicking_view.xml
@@ -5,7 +5,7 @@
         <record model="ir.ui.view" id="view_product_form_auto_pick">
             <field name="name">product.normal.auto_pick.form</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view" />
+            <field name="inherit_id" ref="procurement.product_form_view_procurement_button"/>
             <field name="arch" type="xml">
                 <field name="product_manager" position="after">
                     <field name="auto_pick" />
diff --git a/addons/stock_planning/__init__.py b/addons/stock_planning/__init__.py
deleted file mode 100644
index 9873817f0f3..00000000000
--- a/addons/stock_planning/__init__.py
+++ /dev/null
@@ -1,26 +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 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
deleted file mode 100644
index f83aa11ef63..00000000000
--- a/addons/stock_planning/__openerp__.py
+++ /dev/null
@@ -1,248 +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/>.
-#
-##############################################################################
-
-{
-    "name": "Master Procurement Schedule",
-    "version": "1.2",
-    "author": "OpenERP SA and Grzegorz Grzelak (OpenGLOBE)",
-    "category" : "Manufacturing",
-    "images": ["images/master_procurement_schedule.jpeg","images/sales_forecast.jpeg","images/stock_planning_line.jpeg","images/stock_sales_period.jpeg"],
-    "depends": ["crm", "stock","sale"],
-    "description": """
-MPS allows to create a manual procurement plan apart of the normal MRP scheduling, which works automatically based on minimum stock rules.
-==========================================================================================================================================
-
-Quick Glossary:
----------------
-    - Stock Period - the time boundaries (between Start Date and End Date) for
-      your Sales and Stock forecasts and planning
-    - Sales Forecast - the quantity of products you plan to sell during the
-      related Stock Period.
-    - Stock Planning - the quantity of products you plan to purchase or produce
-      for the related Stock Period.
-
-To avoid confusion with the terms used by the ``sale_forecast`` module,
-("Sales Forecast" and "Planning" are amounts) we use terms "Stock and Sales
-Forecast" and "Stock Planning" to emphasize that we use quantity values.
-
-Where to begin:
----------------
-Using this module is done in three steps:
-    * Create Stock Periods via the Warehouse>Configuration>Stock Periods menu
-      (Mandatory step)
-    * Create Sale Forecasts fill them with forecast quantities, via the
-      Sales > Sales Forecast menu. (Optional step but useful for further planning)
-    * Create the actual MPS plan, check the balance and trigger the procurements
-      as required. The actual procurement is the final step for the Stock Period.
-
-Stock Period configuration:
----------------------------
-You have two menu items for Periods in "Warehouse > Configuration > Stock Periods".
-There are:
-    * "Create Stock Periods" - can automatically creating daily, weekly or
-      monthly periods.
-    * "Stock Periods" - allows to create any type of periods, change the dates
-      and change the state of period.
-
-Creating periods is the first step. You can create custom periods using the "New"
-button in "Stock Periods", but it is recommended to use the automatic assistant
-"Create Stock Periods".
-
-Remarks:
-    - These periods (Stock Periods) are completely distinct from Financial or
-      other periods in the system.
-    - Periods are not assigned to companies (when you use multicompany). Module
-      suppose that you use the same periods across companies. If you wish to use
-      different periods for different companies define them as you wish (they can
-      overlap). Later on in this text will be indications how to use such periods.
-    - When periods are created automatically their start and finish dates are with
-      start hour 00:00:00 and end hour 23:59:00. When you create daily periods they
-      will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00.
-      It works only in automatic creation of periods. When you create periods
-      manually you have to take care about hours because you can have incorrect
-      values form sales or stock.
-    - If you use overlapping periods for the same product, warehouse and company
-      results can be unpredictable.
-    - If current date doesn't belong to any period or you have holes between
-      periods results can be unpredictable.
-
-Sales Forecasts configuration:
-------------------------------
-You have few menus for Sales forecast in "Sales > Sales Forecasts":
-    - "Create Sales Forecasts" - can automatically create forecast lines
-      according to your needs
-    - "Sales Forecasts" - for managing the Sales forecasts
-
-Menu "Create Sales Forecasts" creates Forecasts for products from selected
-Category, for selected Period and for selected Warehouse.
-It is also possible to copy the previous forecast.
-
-Remarks:
-    - This tool doesn't duplicate lines if you already have an entry for the same
-      Product, Period, Warehouse, created or validated by the same user. If you
-      wish to create another forecast, if relevant lines exists you have to do it
-      manually as described below.
-    - When created lines are validated by someone else you can use this tool to
-      create another line for the same Period, Product and Warehouse.
-    - When you choose "Copy Last Forecast", created line take quantity and other
-      settings from your (validated by you or created by you if not validated yet)
-      forecast which is for last period before period of created forecast.
-
-On "Sales Forecast" form mainly you have to enter a forecast quantity in
-"Product Quantity". Further calculation can work for draft forecasts. But
-validation can save your data against any accidental changes. You can click
-"Validate" button but it is not mandatory.
-
-Instead of forecast quantity you may enter the amount of forecast sales via the
-"Product Amount" field. The system will count quantity from amount according to
-Sale price of the Product.
-
-All values on the form are expressed in unit of measure selected on form. You can
-select a unit of measure from the default category or from secondary category.
-When you change unit of measure the forecast product quantity will be re-computed
-according to new UoM.
-
-To work out your Sale Forecast you can use the "Sales History" of the product.
-You have to enter parameters to the top and left of this table and system will
-count sale quantities according to these parameters. So you can get results for
-a given sales team or period.
-
-
-MPS or Procurement Planning:
-----------------------------
-An MPS planning consists in Stock Planning lines, used to analyze and possibly
-drive the procurement of products for each relevant Stock Period and Warehouse.
-The menu is located in "Warehouse > Schedulers > Master Procurement Schedule":
-
-    - "Create Stock Planning Lines" - a wizard to help automatically create many
-      planning lines
-    - "Master Procurement Schedule" - management of your planning lines
-
-Similarly to the way Sales forecast serves to define your sales planning, the MPS
-lets you plan your procurements (Purchase/Manufacturing).You can quickly populate
-the MPS with the "Create Stock Planning Lines" wizard, and then proceed to review
-them via the "Master Procurement Schedule" menu.
-
-The "Create Stock Planning Lines" wizard lets you to quickly create all MPS lines
-for a given Product Category, and a given Period and Warehouse.When you enable
-the "All Products with Forecast" option of the wizard, the system creates lines
-for all products having sales forecast for selected Period and Warehouse (the
-selected Category will be ignored in this case).
-
-Under menu "Master Procurement Schedule" you will usually change the "Planned Out"
-and "Planned In" quantities and observe the resulting "Stock Simulation" value
-to decide if you need to procure more products for the given Period. "Planned Out"
-will be initially based on "Warehouse Forecast" which is the sum of all outgoing
-stock moves already planned for the Period and Warehouse. Of course you can alter
-this value to provide your own quantities. It is not necessary to have any forecast.
-"Planned In" quantity is used to calculate field "Incoming Left" which is the
-quantity to be procured to reach the "Stock Simulation" at the end of Period. You
-can compare "Stock Simulation" quantity to minimum stock rules visible on the form.
-And you can plan different quantity than in Minimum Stock Rules. Calculations are
-done for whole Warehouse by default, if you want to see values for Stock location
-of calculated warehouse you can check "Stock Location Only".
-
-When you are satisfied with the "Planned Out", "Planned In" and end of period
-"Stock Simulation", you can click on "Procure Incoming Left" to create a
-procurement for the "Incoming Left" quantity. You can decide if procurement will
-go to the to Stock or Input location of the Warehouse.
-
-If you don't want to Produce or Buy the product but just transfer the calculated
-quantity from another warehouse you can click "Supply from Another Warehouse"
-(instead of "Procure Incoming Left") and the system will create the appropriate
-picking list (stock moves). You can choose to take the goods from the Stock or
-the Output location of the source warehouse. Destination location (Stock or Input)
-in the destination warehouse will be taken as for the procurement case.
-
-To see update the quantities of "Confirmed In", "Confirmed Out", "Confirmed In
-Before", "Planned Out Before" and "Stock Simulation" you can press "Calculate
-Planning".
-
-All values on the form are expressed in unit of measure selected on form. You can
-select one of unit of measure from default category or from secondary category.
-When you change unit of measure the editable quantities will be re-computed
-according to new UoM. The others will be updated after pressing "Calculate Planning".
-
-Computation of Stock Simulation quantities:
--------------------------------------------
-The Stock Simulation value is the estimated stock quantity at the end of the
-period. The calculation always starts with the real stock on hand at the beginning
-of the current period, then adds or subtracts the computed quantities.
-When you are in the same period (current period is the same as calculated) Stock
-Simulation is calculated as follows:
-
-Stock Simulation = Stock of beginning of current Period - Planned Out + Planned In
-
-When you calculate period next to current:
-
-Stock Simulation = Stock of beginning of current Period - Planned Out of current Period
-    + Confirmed In of current Period  (incl. Already In) - Planned Out of calculated Period
-    + Planned In of calculated Period .
-
-As you see the calculated Period is taken the same way as in previous case, but
-the calculation in the current Period is a little bit different. First you should
-note that system takes for only Confirmed moves for the current period. This means
-that you should complete the planning and procurement of the current Period before
-going to the next one.
-
-When you plan for future Periods:
-
-Stock Simulation = Stock of beginning of current Period
-    - Sum of Planned Out of Periods before calculated
-    + Sum of Confirmed In of Periods before calculated (incl. Already In) 
-    - Planned Out of calculated Period
-    + Planned In of calculated Period.
-
-Here "Periods before calculated" designates all periods starting with the current
-until the period before the one being calculated.
-
-Remarks:
-
-    - Remember to make the proceed with the planning of each period in chronological
-      order, otherwise the numbers will not reflect the reality
-    - If you planned for future periods and find that real Confirmed Out is larger
-      than Planned Out in some periods before, you can repeat Planning and make
-      another procurement. You should do it in the same planning line. If you
-      create another planning line the suggestions can be wrong.
-    - When you wish to work with different periods for some products, define two
-      kinds of periods (e.g. Weekly and Monthly) and use them for different
-      products. Example: If you use always Weekly periods for Product A, and
-      Monthly periods for Product B all calculations will work correctly. You
-      can also use different kind of periods for the same product 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 applies to Forecasts lines.
-""",
-    "data": [
-        "security/stock_planning_security.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"],
-    "auto_install": False,
-    "installable": True,
-    "certificate" : "00872589676639788061",
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/stock_planning/i18n/ar.po b/addons/stock_planning/i18n/ar.po
deleted file mode 100644
index 4e214a9d7e0..00000000000
--- a/addons/stock_planning/i18n/ar.po
+++ /dev/null
@@ -1,1423 +0,0 @@
-# Arabic translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-17 03:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic <ar@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr "لا يوجد توقعات للفترة المحددة او لا يوجد منتجات في التصنيف المحدد !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"تحقق لحساب مكان المخزون للمستودع المحدد. اذا لم يكن الحساب المحدد تم "
-"للمدخلات, والمخزون ومكان المخرجات للمستودع."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "الحد الاقصى للقاعدة"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "تجميع حسب..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr "قيمة المستودع التي ستحول الى كمية المنتج طبقًا للاسعار."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "يجب ان يكون المتروك الاتي اكبر من 0 !"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"المخطط له في الفترات قبل حسابه. بين تاريخ البداية للفترة الحالية ويوم واحد "
-"قبل بداية الفترة المحسوبة."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"المستودع الذي سيهتم به التوقع. اذا كان خلال تخطيط المخزون ستحتاج الى مستودع "
-"المبيعات لكل المستودعات تختار اي مستودع الان."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "متوقع من"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "المتروكات الآتية"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "انشيء خطوط التوقعات"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr "كمية كل التحركات الخارجة المؤكدة في الفترة المحسوبة."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "انشيء فترات يومية"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "شركة"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"كل توقعات المبيعات للمستودع المحدد للمنتج المحدد خلال الفترة المحددة."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "مؤشرات الحد الأدنى لقاعدة المخزون"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "الفترة التي ستركز عليها التوقعات"
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "مكان المخزون فقط"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr "الكمية التي بالفعل ارسلت خارج هذا المستودع في الفترة الحالية."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "مؤكد في"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "موقف الفترة الحالية"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "إنشاء فترات شهرية"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "المخزون.الفترة.خطوط الانشاء"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "يعتزم الخروج قبل"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "كل المنتجات مع التوقعات"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "الفترات:"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr "الكمية المخُختارة بالفعل لهذا المستودع في الفترة الحالية."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "لا يوجد منتجات في التصنيف المحدد !"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "توقع المخزون والمبيعات"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "مخزون.البيع.التوقع"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "المخطط له في"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "مشابه للمخزون"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "المخزون.التخطيط.خطوط الانشاء"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"المؤكد الآتي في الفترات قبل الحساب (متضمنه فيها بالفعل). بين تاريخ البداية "
-"للفترة الحالية و قبل البداية بيوم من الفترة المحسوبة."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "أبحث عن توقع للمبيعات"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "فترة هذا المستخدم 5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr "سجل المشتريات او التزيد الداخلي لخط التخطيط هذا."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"كل التوقعات للمبيعات لكل الشركة (لكل المستودعات) للمنتج المحدد خلال الفترة "
-"المحددة."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "فترة هذا المستخدم 1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "فترة هذا المستخدم 3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "التخطيط للمخزون"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "قاعدة الحد الأدنى"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "عطلة الشراء القادمة"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "أنشئ"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "جدول الاستاذ للمشتريات"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "ماضي/مستقبل"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "حالة"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "تصنيف المنتج للمنتجات التي ستركز على التوقعات المُنشأه."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "فترة المخزون"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "المخزون.البيع.التوقع.خطوط الانشاء"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "المستودع"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"التثمين للمخزون في نهاية الفترة المحددة.\n"
-"عن الفترة الحالية هو:\n"
-"المخزون  الأولي - بالفعل + بالفعل في - من المتوقع نفاد +المتبقي الوارد.\n"
-"لفترات قدما هو:\n"
-"المخزون الأولي - خارج المخطط قبل + واردة قبل - خارج المخطط + المقررة في."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "تحقق من هذه الخانة لترى المبيعات للشركة ككل."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "لكل قسم :"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "الاتي من قبل"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "خطأ !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "هذا المستخدم"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "الخطة"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "تزويد من مستودع اخر"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "قم بحساب التخطيط"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "إجراء خاطئ!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "كمية المخزون لليوم الواحد قبل الفتره الحالية"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "انشيء فترات اسبوعية"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "الظاهر للفترة المحسوبة"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "إلغاء"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "مستخدم الفترة هذه 4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "فترة المخزون والمبيعات"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "توقع الشركة"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "لكل مستخدم :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "المستودع الذي سيركز عليه التخطيط"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "أُنشأت/التحقق من صلاحيتها بواسطة"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "توقع المستودع"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr "يجب ان تخصص مستودع للمصدر مختلف عن المستودع المحسوب (التخصيص) !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "فترة هذه الشركة 5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "وحدة القياس للمنتج"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "فترة هذه الشركة 2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "فترة هذه الشركة 3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "تاريخ البداية"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "مستخدم هذه الفترة 2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "التحقق من التوقعات"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"سيتم انشاء التوقعات للمنتجات من تصنيف المنتج المحدد من هذا الحقل. تم تجاهل "
-"هذا الحقل عند تحققك من خانة \"كل المنتجات المتوقعة\"."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "تخطيط الخارج"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "توقّع"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "مسودة"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "مغلق"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "مستودع "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "التخطيط والموقف للفترة المحسوبة"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"ادخل الكمية المخططة الخارجة من المستودع المحدد خلال الفترة المحددةللمنتج "
-"المحدد. لتخطط لهذه القيمة انظر الى الخارج المؤكد او توقعات المبيعات. يجب ان "
-"تكون هذه القيمة مساوية او اكبر من الخارج المؤكد."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "تزويد خارجي"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "انشأ توقعات للمبيعات"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "الفترة 4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "اسم الفترة"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "الفترة 2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "الفترة 3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "الفترة 1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "الخارج المؤكد"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "انشيء خطوط التخطيط للمخزون"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "معلومات عامة"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "توقع المبيعات"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "فترة هذا المستودع 1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "مستودع المصدر"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "مكان تزويد المخزون"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "تاريخ انتهاء فترة التخطيط."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"تحقق من هذه الخانة لانشاء التخطيط لكل المنتجات بأي توقع للمستودع والفترة "
-"المحددة. سيتم تجاهل حقل التصنيف للمنتج."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "بالفعل في"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "تصنيف وحدة قياس المنتج"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "فترة"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "تصنيف وحدة مبيعات المنتج"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "فعٍل وحدة القياس"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "ابحث عن تخطيط المخزون"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "انسخ اخر توقع"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "وتبين اي منتج يركز عليه هذا التوقع"
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "تم"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "فترات"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "إغلاق"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "تم التحقق"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "فتح"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "انسخ الكميات من اخر مخزون وتوقع البيع."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "فترة هذا القسم 1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "فترة  هذا القسم 3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "فترة هذا القسم 2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "فترة هذا القسم 5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "فترة هذا القسم 4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "فترة هذا المستودع 2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "فترة هذا المستودع 3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "مسئول"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "وحدة قياس افتراضية"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "فترة هذا المستودع 4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "فترة هذا المستودع 5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "الحالي"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "تخطيط.المخزون"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"وتبين اي مستودع يركز عليه هذا التوقع. اذا كان خلال تخطيط المخزون ستحتاج الى "
-"توقع مبيعات لكل المستودعات تختار اي مستودع الآن."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "لكل شركة"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"ادخل الكمية التي(بخطتك) يجب ان تدخل. غير هذه القيمة ولاحظ الظاهر من المخزون. "
-"هذه القيمة يجب ان تكون مساوية او اكثر من المؤكد."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "فترة هذه الشركة 4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "الفترة التي سيركز عليها التخطيط."
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "خارج بالفعل"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "المنتج الذي أُنشأ هذا التخطيط من أجله."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "لكل مستودع:"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "سجل المشتريات"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "تاريخ البداية لفترة التخطيط."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "مخزون"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr "الكمية لكل الآتي المؤكد يتحرك في الفترة المحسوبة."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "تاريخ الإنتهاء"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "ليست مصادرة"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "الاسم"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "وتبين اي فترة يركز عليه هذا التوقع."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "وحدة القياس"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "المنتج"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "توقعات المبيعات"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "فئة المنتج"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "يجب ان تخصص مستودع للمصدر !"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "تحصيل لمكان المخزون"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "إقرار"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr "الفترة لهذا التخطيط. ستُنشا المصادرة لبداية الفترة."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "المخزون الاولي"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "كمية المنتج"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"تحقق لأخذ التوقعات المتحقق منها فقط. اذا لم يتم التحقق منها سيأخذ النظام "
-"التوقعات للسحب ةالمتحقق منها."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "الفترة 5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "هذا المستودع"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "ويوضح من انشأ هذا التوقع, او من تحقق منه."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr "فريق المبيعات"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"الكمية المتروكة لكمية الآتي المخطط. تم حسابها باختلاف بين المخطط الداخل "
-"والمؤكد الداخل. للفترة الحالية بالفعل بالداخل تم حسابها ايضًا. هذه القيمة "
-"استخدمت لانشاء المشتريات للكمية المعدمة."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "احسب سجل المبيعات"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "فترة هذه الشركة 1"
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "انشيء مخزون وفترة مبيعات"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " مخزون أولي: "
-
-#~ msgid "Requisition history"
-#~ msgstr "سجل المصادرة"
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "أُستخدم المستودع كمصدر في تزويد تحرك الاختيار المُنشأ بواسطة ‘التزويد من "
-#~ "مستودع اخر‘."
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "تحقق لتجعل المشتريات لمكان المخزون للمستودع المحدد. اذا لم يتم تحديده ستُصنع "
-#~ "المشتريات لمكان المدخلات للمستودع."
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    تم تأكيده من قبل: "
-
-#~ msgid "This Department"
-#~ msgstr "هذا القسم"
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "اختار قائمة "
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    العطلة القادمة: "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "التخطيط اليدوي لـ "
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  تاريخ الانشاء: "
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr "وينشأ خطوط التخيطي للفترة المحددة والمستودع"
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr "اقصى كمية الموضوعه في الحد الادنى لقواعد المخزون للمستودع هذا"
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "ـم انشاء المشتريات في مزود تخطيط التصنيع "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " الخارج المؤكد: "
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "تستخدم وحدة القياس لتبين كميات حساب المخزون. يمكنك استخدام الوحدات من "
-#~ "التصنيف الافتراضي او من التصنيف الثاني (وحدة التصنيف الثاني)."
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "لاحظ : لا يوجد تكرار للخطوط المنشأه بواسطتك."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " خارج بالفعل: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " الخارج المتوقع: "
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "الكمية المتوقعه للخروج في الفترة المحددة. كالاختلاف بين الخارج المخطط و "
-#~ "الخارج المؤكد. بالنسبة للفترة الحالي بالفعل خارجة وتم حسابها ايضًا"
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr "وينشا خطوط التوقع للمستودع والفترة المحددة."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " المخطط الخارج: "
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "لا يمكنه حذف توقعات اليع المتحقق منه !"
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "المصادرة ("
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "انشيء فترات لتخطيط المبيعات و المخزون"
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    بالفعل في : "
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    الحد الادني للمخزون : "
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    مؤكد في "
-
-#~ msgid "Sales history"
-#~ msgstr "سجل المبيعات"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "الكمية المتوقعة"
-
-#~ msgid "Product Quantity"
-#~ msgstr "كمية المنتج"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " طبقًا للحالة:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " المخزون الظاهر: "
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    مخطط في: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " توقع للمستودع: "
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "تحقق من التزويد من مكان المخزون من مستودع التزويد. اذا لم يتم التحقق منها "
-#~ "فالتزويد سوف يتم من مكان المخرجات لمستودع التزويد. المستخدم في \" التزويد من "
-#~ "مستودع اخر\" مع مستودع التزويد."
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "الحد الادنى للكمية الموجودة في الحد الادنى لقواعد المخزون لهذا المستودع"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "للفترة: "
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "تزويد تخطيط التصنيع"
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "اختار المُنشأ من مزود تخطيط التصنيع بواسطة المستخدم: "
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "فترات التخطيط للمبيعات والمخزون"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " المخطط الخارج من قبل : "
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "فترات المبيعات والمخزون"
diff --git a/addons/stock_planning/i18n/bg.po b/addons/stock_planning/i18n/bg.po
deleted file mode 100644
index 1ebcfd8b23b..00000000000
--- a/addons/stock_planning/i18n/bg.po
+++ /dev/null
@@ -1,1187 +0,0 @@
-# Bulgarian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-02-11 12:21+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Bulgarian <bg@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"Няма прогнози за избрания период или няма продукти в избраната категория!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Групиране по..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Фирма"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Създаване на месечни периоди"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Създаване"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Състояние"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Склад"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Грешка!"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Прогнози"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Невалидно действие !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Отмяна"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "Мерни единици на продукт"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Начална дата"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Прогноза"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Приключен"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Склад "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Име на период"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Обща информация"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Период"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Завършен"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Периоди"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Затваряне"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Проверен"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Отваряне"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "По подразбиране Мер. ед."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Текущ"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Наличност"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Крайна дата"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Име"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "Мер. единици"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Продукт"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Категория на продукта"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Одобряване"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Този склад"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "Product Quantity"
-#~ msgstr "Количество на продукт"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "За период: "
diff --git a/addons/stock_planning/i18n/ca.po b/addons/stock_planning/i18n/ca.po
deleted file mode 100644
index 8202ca9e0e6..00000000000
--- a/addons/stock_planning/i18n/ca.po
+++ /dev/null
@@ -1,1940 +0,0 @@
-# Catalan translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:53+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Catalan <ca@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"No hi ha previsions per al període seleccionat o no hi ha productes en la "
-"categoria seleccionada!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Marqueu aquesta opció per calcular l'estoc només de la ubicació estoc del "
-"magatzem seleccionat. Si no es marca, el càlcul es realitza per a les "
-"ubicacions d'entrada i sortida d'estoc del magatzem."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Regla màxim"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Agrupa per..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Valor de la previsió que serà convertit en quantitat de producte en funció "
-"de preus."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "Entrades restants ha de ser major que 0!"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Sortides planificades en períodes anteriors al calculat. Entreu la data "
-"d'inici del període actual i un dia abans del començament del període "
-"calculat."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Magatzem al que les previsions es refereixen. Si durant la planificació "
-"d'estoc necessita previsions de vendes per a tots els magatzems de triar "
-"qualsevol magatzem ara."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Sortides previstes"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Entrades restants"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Crea línies de previsions"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr "Quantitats de totes les sortides confirmades en el període calculat."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Crea períodes diaris"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Companyia"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Totes les previsions de vendes per als magatzems seleccionats de productes "
-"seleccionats durant el període seleccionat."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Indicadors de regles d'estoc mínim"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Període al que concerneixen les previsions."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Només ubicacions d'estoc"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-"Quantitats que ja es van enviar fora d'aquest magatzem en el període actual."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Entrades confirmades"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Situació del període actual"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Crea períodes mensuals"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "estoc.període.crealínies"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Sortides planificades abans"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Tots els productes amb previsió"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Períodes :"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-"Quantitats que ja han estat recollides en aquest magatzem en el període "
-"actual."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "No hi ha productes en la categoria seleccionada!"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Previsions d'estoc i vendes"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "estoc.vendes.previsió"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Entrades planificades"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Simulació d'estoc"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "estoc.planificació.crealínies"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Entrades confirmades en períodes anteriors al calculat (incloent les "
-"entrades realitzades). Entreu la data d'inici del període actual i un dia "
-"abans del començament del període calculat."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Cerca previsions de vendes"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "El període d'aquest usuari5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-"Historial de proveïment o subministrament intern d'aquesta línia de "
-"planificació."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Totes les previsions de vendes per a tota l'empresa (per a tots els "
-"magatzems) dels productes seleccionats durant el període seleccionat."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "Aquest usuari periode1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "Aquest usuari periode3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Planificació d'estoc"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Regla de mínims"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Entrades proveïment restant"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Crea"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Pla mestre de proveïment"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Passat/Futur"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Estat"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "Categoria dels productes dels quals es crearan les previsions ."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "període estoc"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "estoc.venda.previsió.crealínies"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magatzem"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Simulació d'estoc al final del període seleccionat.\n"
-" Per al període actual és: \n"
-"Estoc inicial – sortides + entrades – sortides previstes + entrades "
-"esperades.\n"
-"Per als següents períodes és: \n"
-"Estoc inicial – sortides previstes anteriors + entrades anteriors – sortides "
-"previstes + entrades previstes."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr ""
-"Seleccioneu aquesta casella per veure les vendes de tota l'a companyia."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Per departament:"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Entrades abans"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Error!"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Aquest usuari"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Previsions"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Proveir des d'un altre magatzem"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Calcula planificació"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Acció no vàlida!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Quantitat d'estoc un dia abans del període actual."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Crea períodes setmanals"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Simulació calculada del període"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Aquest usuari període 4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Període d'estoc i vendes"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Previsió de la companyia"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Per usuari :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Magatzem que es referirà la planificació."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Creat/Validat per"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Previsió magatzem"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"Heu d'especificar un magatzem d'origen diferent del magatzem calculat (de "
-"destinació)!"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "El període d'aquesta companyia5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "UdM de producte"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "El període d'aquesta companyia2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "El període d'aquesta companyia3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Data d'inici"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "El període d'aquest usuari2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Previsions validades"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"Es crearà la planificació per als productes de la categoria de productes "
-"seleccionada amb aquest camp. Aquest camp s'ignora quan es marca l'opció "
-"\"Totes les previsions de productes”."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Sortides planificades"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Previsió"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Esborrany"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Tancat"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Magatzem "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Planificació i situació per al període calculat"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Introduïu la quantitat sortint planificada per al magatzem seleccionat "
-"durant el període seleccionat i per al producte seleccionat. Per planificar "
-"aquest valor podeu fixar-se en les sortides confirmades o les previsions de "
-"vendes. Aquest valor hauria de ser igual o superior a les sortides "
-"confirmades."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Subministrament intern"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr "%s Llista de selecció %s (%s,  %s) %s %s \n"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Crea previsions de vendes"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Període4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Nom del període"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Període2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Període3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Període1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Sortides confirmades"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Crea línies de planificació d'estoc"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Informació general"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Previsió de vendes"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Peridodo d'aquest magatzem1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Històric de vendes"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Magatzem d'origen"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Ubicació proveïment d'estoc"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Data de finalització per al període planificat."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Marqueu aquesta opció per crear la planificació de tots els productes que "
-"tinguin qualsevol previsió en el magatzem i període seleccionat. El camp "
-"categoria de producte serà ignorat."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr "MPS(%s) %s"
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Entrades realitzades"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Categoria UdM producte"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Període"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Categoria UdV producte"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "UdM activa"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Cerca planificació d'estoc"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Copia última previsió"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Mostra a quin producte es refereix aquesta previsió."
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Fet"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Períodes"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Tanca"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Validat"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Obre"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Copia quantitats des de l'estoc passat i previsió de vendes"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "El període d'aquest dept.1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "El període d'aquest dept.3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "El període d'aquest dept.2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "El període d'aquest dept.5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "El període d'aquest dept.4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "El període d'aquest magatzem2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "El període d'aquest magatzem3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "UdM per defecte"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "El període d'aquest magatzem4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "El període d'aquest magatzem5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Actual"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "estoc.planificació"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Mostra a quin magatzem es refereix aquesta previsió. Si durant la "
-"planificació d'estoc necessita previsions de vendes per a tots els magatzems "
-"escolliu ara un magatzem qualsevol."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Per empresa"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Introduïu la quantitat que (pel seu pla) ha d'entrar. Canvieu aquest valor i "
-"observeu la simulació d'estoc. Aquest valor hauria de ser igual o superior a "
-"les entrades confirmades."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "El període d'aquesta companyia4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Període al que es refereix la planificació."
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Sortides realitzades"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Producte pel qual ha estat creada aquesta planificació."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Per magatzem:"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Històric proveïments"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Data inicial per al període planificat."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Estoc"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr "Quantitats de totes les entrades confirmades en el període calculat."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Data final"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Núm. sol·licitud"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Nom"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Mostra a quin període es refereix aquesta previsió."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Producte"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Previsions de vendes"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Categoria del producte"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "Heu d'especificar un magatzem origen!"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Proveïment a ubicació estoc"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Aprova"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-"Període per a aquesta planificació. Es crearà una sol·licitud al principi "
-"del període."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Estoc inicial"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Quantitat de producte"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Marcque per utilitzar només les previsions validades. Si no es marca el "
-"sistema utilitza les previsions validades i esborrany."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Període5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Aquest magatzem"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Mostra qui va crear aquesta previsió, o qui la va validar."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Quantitat restant de la quantitat entrant planificada. Es calcula mitjançant "
-"la diferència entre les entrades planificades i les entrades confirmades. "
-"Per al període actual les entrades realitzades també es calculen. Aquest "
-"valor s'utilitza per crear proveïments per a la quantitat restant."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Calcula històric de vendes"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Aquesta empresa període1"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Estoc inicial: "
-
-#~ msgid "Requisition history"
-#~ msgstr "Historial comandes"
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Magatzem utilitzat com a origen en el moviment de subministrament creat per "
-#~ "'Subministra des d'un altre magatzem'."
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Marqueu aquesta opció per realitzar els proveïments en la ubicació estoc del "
-#~ "magatzem seleccionat. Si no es marca, el proveïment es realitzarà en la "
-#~ "ubicació d'entrada del magatzem."
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Crea períodes d'estoc i vendes"
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Entrades confirmades abans: "
-
-#~ msgid "This Department"
-#~ msgstr "Aquest departament"
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Entrades restant: "
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Llista de recollida "
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Data de creació: "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Planificació manual per a "
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Quantitat màxima establerta en les regles d'estoc mínim per a aquest "
-#~ "magatzem."
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "Proveïment creat en MPS per l'usuari: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Sortides confirmades: "
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Unitat de mesura utilitzada per mostrar les quantitats calculades d'estoc. "
-#~ "Podeu utilitzar les unitats de la categoria per defecte o les de la segona "
-#~ "categoria (categoria UdV)."
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr "Crea línies de planificació per al període i almacen seleccionats."
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Nota: No duplica les línies creades per vostè."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Sortides realitzades: "
-
-#~ msgid ""
-#~ "\n"
-#~ "This module is based on original OpenERP SA module stock_planning version "
-#~ "1.0 of the same name Master Procurement Schedule.\n"
-#~ "\n"
-#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
-#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
-#~ "\n"
-#~ "Terms used in the module:\n"
-#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
-#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-#~ "the Period.\n"
-#~ "- Stock Planning - is the quantity of products you plan to purchase or "
-#~ "produce for the Period.\n"
-#~ "\n"
-#~ "Because we have another module sale_forecast which uses terms \"Sales "
-#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-#~ "values. \n"
-#~ "\n"
-#~ "Activity with this module is divided to three steps:\n"
-#~ "- Creating Periods. Mandatory step.\n"
-#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
-#~ "useful for further planning.\n"
-#~ "- Creating Planning lines, entering quantities to them and making "
-#~ "Procurement. Making procurement is the final step for the Period.\n"
-#~ "\n"
-#~ "Periods\n"
-#~ "=======\n"
-#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
-#~ "There are:\n"
-#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-#~ "monthly periods.\n"
-#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-#~ "change the dates and change the State of period.\n"
-#~ "\n"
-#~ "Creating periods is the first step you have to do to use modules features. "
-#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
-#~ "Periods\" form or view but it is recommended to use automating tool.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- These periods (officially Stock and Sales Periods) are separated of "
-#~ "Financial or other periods in the system.\n"
-#~ "- Periods are not assigned to companies (when you use multicompany feature "
-#~ "at all). Module suppose that you use the same periods across companies. If "
-#~ "you wish to use different periods for different companies define them as you "
-#~ "wish (they can overlap). Later on in this text will be indications how to "
-#~ "use such periods.\n"
-#~ "- When periods are created automatically their start and finish dates are "
-#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
-#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-#~ "you create periods manually you have to take care about hours because you "
-#~ "can have incorrect values form sales or stock. \n"
-#~ "- If you use overlapping periods for the same product, warehouse and company "
-#~ "results can be unpredictable.\n"
-#~ "- If current date doesn't belong to any period or you have holes between "
-#~ "periods results can be unpredictable.\n"
-#~ "\n"
-#~ "Sales Forecasts\n"
-#~ "===============\n"
-#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
-#~ "Forecasts\".\n"
-#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-#~ "forecasts lines according to some parameters.\n"
-#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-#~ "forms.\n"
-#~ "\n"
-#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-#~ "products from selected Category, for selected Period and for selected "
-#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-#~ "settings of period before this one to created one.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
-#~ "Period, Warehouse and validated or created by you) already exists. If you "
-#~ "wish to create another forecast, if relevant lines exists you have to do it "
-#~ "manually using menus described bellow.\n"
-#~ "- When created lines are validated by someone else you can use this tool to "
-#~ "create another lines for the same Period, Product and Warehouse. \n"
-#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
-#~ "some settings from your (validated by you or created by you if not validated "
-#~ "yet) forecast which is for last period before period of created forecast. If "
-#~ "there are few your forecasts for period before this one (it is possible) "
-#~ "system takes one of them (no rule which of them).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menus \"Sales Forecasts\"\n"
-#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
-#~ "validation can save your data against any accidental changes. You can click "
-#~ "\"Validate\" button but it is not mandatory.\n"
-#~ "\n"
-#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
-#~ "\"Product Amount\". System will count quantity from amount according to Sale "
-#~ "price of the Product.\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
-#~ "for this product. You have to enter parameters to the top and left of this "
-#~ "table and system will count sale quantities according to these parameters. "
-#~ "So you can select fe. your department (at the top) then (to the left): last "
-#~ "period, period before last and period year ago.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "\n"
-#~ "\n"
-#~ "Procurement Planning\n"
-#~ "====================\n"
-#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-#~ "lines according to some parameters.\n"
-#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
-#~ "module which allows to create procurement.\n"
-#~ "\n"
-#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
-#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
-#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
-#~ "Planning Lines\", then you can review created planning and make procurement "
-#~ "using menu \"Master Procurement Schedule\".\n"
-#~ "\n"
-#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-#~ "lines for products from selected Category, for selected Period, and for "
-#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
-#~ "system creates lines for all products having forecast for selected Period "
-#~ "and Warehouse. Selected Category will be ignored in this case.\n"
-#~ "\n"
-#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
-#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-#~ "Simulation\" and decide if this value would be accurate for end of the "
-#~ "Period. \n"
-#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-#~ "all forecasts for Period and Warehouse. But your planning can be based on "
-#~ "any other information you have. It is not necessary to have any forecast. \n"
-#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-#~ "is the quantity to be procured to make stock as indicated in \"Stock "
-#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-#~ "quantity to minimum stock rules visible on the form. But you can plan "
-#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
-#~ "whole Warehouse by default. But if you want to see values for Stock location "
-#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
-#~ "\n"
-#~ "If after few tries you decide that you found correct quantities for "
-#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
-#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
-#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
-#~ "\n"
-#~ "\n"
-#~ "If you don't want to Produce or Buy the product but just pick calculated "
-#~ "quantity from another warehouse you can click \"Supply from Another "
-#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-#~ "with move from selected source Warehouse to calculated Warehouse (as "
-#~ "destination). You can also decide if this pick should be done from Stock or "
-#~ "Output location of source warehouse. Destination location (Stock or Input) "
-#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
-#~ "\n"
-#~ "\n"
-#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-#~ "have to click button \"Calculate Planning\".\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "How Stock Simulation field is calculated:\n"
-#~ "Generally Stock Simulation shows the stock for end of the calculated period "
-#~ "according to some planned or confirmed stock moves. Calculation always "
-#~ "starts with quantity of real stock of beginning of current period. Then "
-#~ "calculation adds or subtracts quantities of calculated period or periods "
-#~ "before calculated.\n"
-#~ "When you are in the same period (current period is the same as calculated) "
-#~ "Stock Simulation is calculated as follows:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out \n"
-#~ "\t+ Planned In\n"
-#~ "\n"
-#~ "When you calculate period next to current:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out of current Period \n"
-#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period .\n"
-#~ "\n"
-#~ "As you see calculated Period is taken the same way like in case above. But "
-#~ "calculation of current Period are made a little bit different. First you "
-#~ "should note that system takes for current Period only Confirmed In moves. It "
-#~ "means that you have to make planning and procurement for current Period "
-#~ "before this calculation (for Period next to current). \n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period \n"
-#~ "\t- Sum of Planned Out of Periods before calculated \n"
-#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period.\n"
-#~ "\n"
-#~ "Periods before calculated means periods starting from current till period "
-#~ "before calculated.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- Remember to make planning for all periods before calculated because "
-#~ "omitting these quantities and procurements can cause wrong suggestions for "
-#~ "procurements few periods ahead.\n"
-#~ "- If you made planning few periods ahead and you find that real Confirmed "
-#~ "Out is bigger than Planned Out in some periods before you can repeat "
-#~ "Planning and make another procurement. You should do it in the same planning "
-#~ "line. If you create another planning line the suggestions can be wrong.\n"
-#~ "- When you wish to work with different periods for some part of products "
-#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
-#~ "different products. Example: If you use always Weekly periods for Products "
-#~ "A, and Monthly periods for Products B your all calculations will work "
-#~ "correctly. You can also use different kind of periods for the same products "
-#~ "from different warehouse or companies. But you cannot use overlapping "
-#~ "periods for the same product, warehouse and company because results can be "
-#~ "unpredictable. The same apply to Forecasts lines.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Aquest mòdul es basa en la versió original d'OpenERP Estoc_planning SA mòdul "
-#~ "1.0 del mateix nom Programador de Compres Mestres. \n"
-#~ "\n"
-#~ "El propòsit de la MPS és permetre crear un manual de contractació (sol "
-#~ "licitud), a part del programador MRP (que funciona automàticament, basant-se "
-#~ "en regles d'existències mínimes). \n"
-#~ "\n"
-#~ "Els termes utilitzats en el mòdul: \n"
-#~ "- Estoc i Període de vendes - és el temps (entre data d'inici i data de "
-#~ "finalització) per al qual planifica l'Estoc i la Previsió de Vendes i fa la "
-#~ "Planificació de les compres. \n"
-#~ "- Estoc i pronòstic de vendes - és la quantitat de productes que planeja "
-#~ "vendre en el període. \n"
-#~ "- Planificació de Estoc - és la quantitat de productes que planeja comprar o "
-#~ "produir per al període. \n"
-#~ "\n"
-#~ "Perquè tenim una altra mòdul sale_forecast que utilitza els termes "
-#~ "\"Pronòstic de Vendes\" i \"Planificació\" com a valors de quantitat, "
-#~ "utilitzarem termes \"Estoc i Pronòstic de Vendes\" i \"Planificació del "
-#~ "Estoc\" per fer èmfasi que fem servir els valors de quantitat. \n"
-#~ "\n"
-#~ "L'activitat amb aquest mòdul es divideix en tres passos: \n"
-#~ "- Creació de Períodes. Pas obligatori. \n"
-#~ "- Creació de Pronòstics de Venda i introducció de les seves quantitats. Un "
-#~ "pas opcional però útil per a una major planificació. \n"
-#~ "- Creació de línies de Planificació, introducció de les seves quantitats i "
-#~ "fer Adquisicions. Fer compres és el pas final per al període. \n"
-#~ "\n"
-#~ "Períodes \n"
-#~ "========= \n"
-#~ "Té dues opcions de menú per Períodes en \"Gestió de Vendes - Configuració\". "
-#~ "Són les següents: \n"
-#~ "- \"Crear els Períodes de Vendes\" - Que automatitza la creació de períodes "
-#~ "diaris, setmanals o mensuals. \n"
-#~ "- \"Estoc i Períodes de vendes\" - Que permet crear qualsevol tipus de "
-#~ "períodes, el canvi de les dates i el canvi de l'Estat del període. \n"
-#~ "\n"
-#~ "Creació de períodes és el primer pas que ha de fer per utilitzar les "
-#~ "funcions dels mòduls. Podeu crear períodes personalitzats mitjançant el botó "
-#~ "\"Nou\" al formulari o vista d'\"Estoc i Períodes de Vendes\", però es "
-#~ "recomana utilitzar l'eina automàtica. \n"
-#~ "\n"
-#~ "Observacions: \n"
-#~ "- Aquests períodes (Estoc oficial i Períodes de Vendes) estan separen de "
-#~ "Finances o d'altres períodes en el sistema. \n"
-#~ "- Els Períodes no s'assignen a les companyies (en cap cas quan s'utilitza la "
-#~ "funció multicompanyia). El mòdul suposa que utilitza els mateixos períodes a "
-#~ "través de les companyies. Si voleu utilitzar períodes diferents per a "
-#~ "diferents companyies definiu al seu gust (poden solapar). Més endavant en "
-#~ "aquest text s'indica com utilitzar aquests períodes. \n"
-#~ "- Quan els períodes són creats automàticament les seves dates d'inici i "
-#~ "final s'inicien amb l'hora 00:00:00 i 23:59:00 com a hora final. Quan crea "
-#~ "períodes diaris tindran data d'inici 2010.01.31 00:00:00 i data de "
-#~ "finalització 2010.01.31 23:59:00. Funciona només en la creació automàtica "
-#~ "dels períodes. Quan creeu períodes manualment cal anar amb compte amb les "
-#~ "hores, ja que pot tenir valors incorrectes en vendes i estoc. \n"
-#~ "- Si utilitzeu períodes solapats per al mateix producte, magatzem i "
-#~ "companyia, els resultats poden ser imprevisibles. \n"
-#~ "- Si la data actual no pertany a cap període o si té forats entre els "
-#~ "períodes els resultats poden ser imprevisibles. \n"
-#~ "\n"
-#~ "Previsió de vendes \n"
-#~ "==================== \n"
-#~ "Té menús poques vendes previst en \"Gestió de Vendes - Pronòstics de "
-#~ "Vendes\". \n"
-#~ "- \"Creació de Pronòstics de Vendes per als Períodes de Vendes\" - que "
-#~ "automatitza la creació de línies de previsions d'acord amb alguns "
-#~ "paràmetres. \n"
-#~ "- \"Les Previsions de Vendes\" - alguns menús per a treballar amb llistes de "
-#~ "les previsions i les formes. \n"
-#~ "\n"
-#~ "Menú \"Crear Pronòstics de Vendes per Períodes de Vendes\" crea Pronòstics "
-#~ "per als productes de la categoria seleccionada, per al període i Magatzem "
-#~ "seleccionat. És una opció \"Còpia de l'Últim Pronòstic\" per copiar "
-#~ "previsions i altres ajustaments del període anterior a aquest per crear un. "
-#~ "\n"
-#~ "\n"
-#~ "Observacions: \n"
-#~ "- Aquesta eina no crea línies, si les línies oportunes (per al mateix "
-#~ "producte, Període i Magatzem, i validat o creat per vostè) ja existeixen. Si "
-#~ "voleu crear un altre pronòstic, si les línies pertinents hi ha de fer-ho "
-#~ "manualment usant els menús que es descriuen a continuació. \n"
-#~ "- Quan les línies es creen són validades per una altra persona que pot "
-#~ "utilitzar aquesta eina per crear altres línies per al mateix període, "
-#~ "Producte i Magatzem. \n"
-#~ "- Quan es tria \"Copiar Últim Pronòstic\" la línia creada té la quantitat i "
-#~ "alguns ajustos del seu (validat o creades per vostè, si no s'ha validat "
-#~ "encara) pronòstic que per a l'últim període anterior al període de la "
-#~ "previsió creada. Si hi ha pocs pronòstics per al període anterior a aquest "
-#~ "(és possible) el sistema pren una d'ells (no hi ha regla sobre quina). \n"
-#~ "\n"
-#~ "\n"
-#~ "Menús \"Previsió de Vendes\" \n"
-#~ "En el formulari \"Previsió de Vendes\" principalment ha d'introduir una "
-#~ "quantitat prevista a la \"Quantitat de Producte\". A més del càlcul pot "
-#~ "funcionar per a les previsions esborrany. No obstant això, la validació pot "
-#~ "guardar les seves dades contra qualsevol canvi accidental. Podeu fer clic en "
-#~ "botó \"Validar\", però no és obligatori. \n"
-#~ "\n"
-#~ "En lloc de la quantitat prevista es pot introduir la quantitat de previsió "
-#~ "de vendes en el camp \"Quantitat de Producte\". El sistema comptarà la "
-#~ "quantitat en funció del Preu de Venda del producte. \n"
-#~ "\n"
-#~ "Tots els valors del formulari s'expressen en la unitat de mesura "
-#~ "seleccionada en el formulari. Vostè pot seleccionar un de la unitat de "
-#~ "mesura de la categoria per defecte o de segona categoria. Quan es canvia la "
-#~ "unitat de mesura les quantitats es tornaran a calcular d'acord amb la nova "
-#~ "UOM: els valors editables (camps blaus) immediatament, els camps no "
-#~ "editables després de fer clic al botó \"Calcular Planificació\". \n"
-#~ "\n"
-#~ "Per trobar el valor adequat per Previsió de Venda es pot utilitzar la taula "
-#~ "\"Historial de vendes\" per a aquest producte. Has d'introduir els "
-#~ "paràmetres en la part superior esquerra d'aquesta taula i el sistema "
-#~ "comptarà les quantitats de venda d'acord amb aquests paràmetres. Així que "
-#~ "vostè pot seleccionar, per exemple. del seu departament (a la part superior) "
-#~ "i després (a l'esquerra): l'últim període, el període anterior a l'últim i "
-#~ "el període de fa un any. \n"
-#~ "\n"
-#~ "Observacions: \n"
-#~ "\n"
-#~ "\n"
-#~ "Planificació de les compres \n"
-#~ "==================== \n"
-#~ "Menú per a la Planificació del que pots trobar a \"Magatzem - Planificació "
-#~ "del Estoc\". \n"
-#~ "- \"Crea un fitxer de Planificació Líneas\" - li permet automatitzar la "
-#~ "creació de línies de planificació d'acord amb alguns paràmetres. \n"
-#~ "- \"Programador Mestre d'Adquisicions\" - és el menú més important del mòdul "
-#~ "que permet la creació de la contractació. \n"
-#~ "\n"
-#~ "D'acord amb les previsions de vendes, és la fase de planificació de vendes. "
-#~ "La planificació de compres (planificació) és la fase de programació de "
-#~ "compres o de producció. Vostè pot crear la planificació de les compres "
-#~ "ràpidament amb l'eina del menú \"Crea Línies de Planificació de Estoc\", "
-#~ "llavors pot revisar la planificació creada i fer compres usant el menú "
-#~ "\"Llista Mestra d'Adquisicions\". \n"
-#~ "\n"
-#~ "Menú \"Crear Línies de Planificació d'Estoc\" li permet crear ràpidament les "
-#~ "Línies de Planificació de productes de la categoria seleccionada, en "
-#~ "determinats períodes, i per al magatzem seleccionat. Al marcar l'opció "
-#~ "\"Tots els productes amb Pronòstic\" el sistema crea les línies per a tots "
-#~ "els productes que té previst per al període seleccionat i Magatzem. La "
-#~ "Categoria seleccionada es tindrà en compte en aquest cas. \n"
-#~ "\n"
-#~ "Sota el menú \"Programador Mestre d'Adquisicions\" en general, pot canviar "
-#~ "els valors \"Sortides planificades\" i \"Entrades planificades\" per "
-#~ "observar el camp \"Simulació de Estoc\" i decidir si aquest valor és exacte "
-#~ "per al final del període. \n"
-#~ "\"Planejat\" pot basar en la \"Previsió de magatzem\", que és la suma de "
-#~ "totes les previsions per al període i Magatzem. Però la planificació es pot "
-#~ "basar en qualsevol altra informació que tingui. No cal tenir cap pronòstic. "
-#~ "\n"
-#~ "\"Entrades planificades\" la quantitat s'utilitza per calcular el camp "
-#~ "\"Entrades Restants\" que és la quantitat que falta per adquirir per assolir "
-#~ "l'estoc, com s'indica en la \"Simulació de Estoc\" al final del període. "
-#~ "Vostè pot comparar la \"Simulació de Estoc\" amb les normes de quantitat "
-#~ "mínima d'existències visibles en el formulari. Però pot planejar una "
-#~ "quantitat diferent al de les Regles Mínimes de Estoc. El càlcul està fet per "
-#~ "a tot el magatzem per defecte. Però si vostè vol veure els valors de la "
-#~ "ubicació de l'estoc del magatzem calculat, podeu utilitzar la casella "
-#~ "\"Només Ubicació del Estoc\". \n"
-#~ "\n"
-#~ "Si després de diversos intents decideix que les quantitats són correctes per "
-#~ "a la qual \"Sortides planificades\" i el \"Entrades planificades\" i que "
-#~ "està satisfet amb el final d'existències del període calculat en la "
-#~ "\"Simulació del Estoc\" pot fer clic a \"Adquirir Entrades Restants \"per "
-#~ "obtenir la quantitat del camp\" Entrades Restants \"al Magatzem. El sistema "
-#~ "crea la corresponent ordre de Compres. Vostè pot decidir si la contractació "
-#~ "es farà per l'estoc o per a la ubicació d'entrada del Magatzem calculat. \n"
-#~ "\n"
-#~ "Si no vols Produir o Comprar el producte, però només has de triar la "
-#~ "quantitat calculada, des d'un altre magatzem pot fer clic a "
-#~ "\"Subministrament des Altre Magatzem\" (en lloc de \"Adquirir Entrades "
-#~ "Restants\"). El sistema crea la llista de selecció des del Magatzem origen "
-#~ "seleccionat fins el Magatzem calculat (com a destinació). També pot decidir "
-#~ "si aquesta selecció s'ha de fer de magatzem o la ubicació de sortida del "
-#~ "magatzem d'origen. La ubicació de destinació (magatzem o entrada) del "
-#~ "magatzem de destinació, s'utilitzarà com establert per \"Adquirir Entrades "
-#~ "Restants\". \n"
-#~ "\n"
-#~ "Per veure les quantitats adequades en els camps \"Entrada confirmada\", "
-#~ "\"Sortida Confirmada\", \"Entrada Confirmada Abans\", \"Sortides "
-#~ "planificades abans\" i \"Simulació de Estoc\" ha de fer clic al botó "
-#~ "\"Calcular Planificació\". \n"
-#~ "\n"
-#~ "Tots els valors en el formulari s'expressen en la unitat de mesura "
-#~ "seleccionada en el formulari. Vostè pot seleccionar un de la unitat de "
-#~ "mesura de la categoria per defecte o d'una segona categoria. Quan es canvia "
-#~ "la unitat de mesura les quantitats es tornaran a calcular d'acord amb UOM: "
-#~ "els valors editables immediatament (camps blaus), els camps no editables "
-#~ "després de fer clic al botó \"Calcular Planificació\". \n"
-#~ "\n"
-#~ "Com es calcula el camp Simulació del Estoc: \n"
-#~ "Generalment la Simulació del Estoc mostra l'estoc al final període calculat "
-#~ "d'acord amb alguns moviments d'estoc previst o confirmat. El càlcul s'inicia "
-#~ "sempre amb la quantitat d'estoc real del inici del període actual. Després "
-#~ "es calcula la suma o resta de les quantitats del període o períodes abans "
-#~ "calculats. \n"
-#~ "Quan està en el mateix període (període actual és el mateix que el calculat) "
-#~ "la Simulació del Estoc es calcula de la manera següent: \n"
-#~ "Simulació de Estoc = \n"
-#~ "[Tab] Estoc inicial del període actual \n"
-#~ "[Tab] - Sortides planificades \n"
-#~ "[Tab] + Entrades planificades \n"
-#~ "\n"
-#~ "Quan es calcula el període següent a l'actual: \n"
-#~ "Simulació del Estoc = \n"
-#~ "[Tab] Estoc inicial del període actual \n"
-#~ "[Tab] - Planificació de Sortides del Període actual \n"
-#~ "[Tab] + Entrades Confirmades en el període actual (incl. les Entrades ja "
-#~ "existents) \n"
-#~ "[Tab] - Sortides planificades del Període calculat \n"
-#~ "[Tab] + Entrades planificades en el Període calculat. \n"
-#~ "\n"
-#~ "Com pot veure el període calculat es pren de la mateixa manera que en el cas "
-#~ "anterior. No obstant això, el càlcul del període actual es fa de manera una "
-#~ "mica diferent. En primer lloc ha de tenir en compte que el sistema té per al "
-#~ "Període actual només Confirmats els moviments d'entrada. Això significa que "
-#~ "ha de fer la planificació i la compra per Període actual abans d'aquest "
-#~ "càlcul (per al Pròxim període a l'actual). \n"
-#~ "\n"
-#~ "Quan es calcula el període següent: \n"
-#~ "Col lecció de simulació = \n"
-#~ "[Tab] Estoc inicial del Període actual \n"
-#~ "[Tab] - Suma de Planificació de sortida dels períodes abans calculats \n"
-#~ "[Tab] + Suma Confirmats En períodes anteriors calculats (incl. les entrades "
-#~ "ja existents) \n"
-#~ "[Tab] - Sortides planificades del Període calculat \n"
-#~ "[Tab] + Entrades planificades del Període calculat. \n"
-#~ "\n"
-#~ "Els períodes anteriors calculats, significa que els període comença en "
-#~ "l'actual fins al període abans calculat. \n"
-#~ "\n"
-#~ "Observacions: \n"
-#~ "- Recordeu fer la planificació per a tots els períodes abans calculats a "
-#~ "causa de ometre aquestes quantitats i les adquisicions poden causar "
-#~ "suggeriments errònies per a les compres d'alguns períodes posteriors. \n"
-#~ "- Si ha realitzat la planificació d'uns pocs períodes posteriors i troba que "
-#~ "les Sortides Confirmades reals són més grans del que preveu en alguns "
-#~ "períodes abans que pugui repetir la Planificació i realitzar una altra "
-#~ "adquisició. Ho ha de fer en la mateixa línia de la planificació. Si es crea "
-#~ "una altra línia de planificació de suggeriments pot estar equivocada. \n"
-#~ "- Quan vol treballar amb diferents períodes per a una part dels productes, "
-#~ "defineixi dos tipus de períodes (pe setmanal i mensual) i els utilitzi'ls "
-#~ "per a diferents productes. Exemple: si utilitza sempre els períodes "
-#~ "setmanals per als productes A, i els períodes mensuals dels productes B tots "
-#~ "els seus càlculs funcionaran correctament. També pot utilitzar diferents "
-#~ "tipus de períodes per als mateixos productes de diferents magatzems de "
-#~ "diferents companyies. Però no es poden utilitzar períodes solapats per al "
-#~ "mateix producte d'un magatzem, i companyia perquè els resultats poden ser "
-#~ "imprevisibles. El mateix s'aplica a les línies de Previsions\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Sortides previstes: "
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Entrades realitzades: "
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Quantitat prevista per sortir en el període seleccionat. Diferència entre "
-#~ "les sortides previstes i les sortides confirmades. Per al període actual "
-#~ "també es calculen les sortides realitzades."
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr "Crea línies de previsió per al magatzem i període seleccionats."
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Sol·licitud ("
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Sortides planificades: "
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "No es poden esborrar previsions de vendes validades !"
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Estoc mínim: "
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Entrades confirmades: "
-
-#~ msgid "Sales history"
-#~ msgstr "Històric de vendes"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Quantitat prevista."
-
-#~ msgid "Product Quantity"
-#~ msgstr "Quantitat de producte"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " segons l'estat:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Previsió magatzem: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Simulació d'estoc: "
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Entrades planificades: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Per període: "
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "MPS("
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Albarà creat des de MPS per l'usuari: "
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Períodes de planificació d'estoc i vendes"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Sortides planificades abans: "
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Períodes d'estoc i vendes"
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Crea períodes per la planificació d'estoc i vendes"
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Quantitat mínima establerta en les regles d'estoc mínim per aquest magatzem."
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "Marqueu aquesta opció per subministrar des de la ubicació estoc del magatzem "
-#~ "de subministrament. Si no es marca, el subministrament es realitzarà des de "
-#~ "la ubicació de sortida del magatzem de subministrament. Utilitzat "
-#~ "'Subministrar des d'un altre magatzem' amb un magatzem de subministrament."
diff --git a/addons/stock_planning/i18n/da.po b/addons/stock_planning/i18n/da.po
deleted file mode 100644
index f233f8111c0..00000000000
--- a/addons/stock_planning/i18n/da.po
+++ /dev/null
@@ -1,1175 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-27 06:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
diff --git a/addons/stock_planning/i18n/de.po b/addons/stock_planning/i18n/de.po
deleted file mode 100644
index f8488ade805..00000000000
--- a/addons/stock_planning/i18n/de.po
+++ /dev/null
@@ -1,2005 +0,0 @@
-# German 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:13+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"Keine vorhandene Prognose für ausgew. Periode oder kein Produkt in der "
-"Kategorie !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Wähle Option für Bestandsberechnung des Lagerortes für das ausgew. "
-"Zentrallager. Ansonstenerfolgt die Berechnung für die Lagerorte "
-"Eingangslager, Hauptlager und Ausgangslagerdes Zentrallagers."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Max. Bestand Regel"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Gruppierung..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Ein prognostiz. Umsatz wird konvertiert in die Produkt Menge durch "
-"einfachePreisumrechnung für das Produkt."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "Die zu beschaffende Menge muss grösser als 0 sein!"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Geplanter Abgang vorheriger Perioden. Dieses ist der Zeitraum zwischen "
-"Beginn der aktuellen Planperiode bis einen Tag vor Start der Periode."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Zentrallager auf dem diese Prognose beruht. Falls Sie für die "
-"Bestandsplanung eine Prognose der Verkäufe aller Zentralläger benötigen, "
-"treffen Sie jetzt eine bel. Wahl."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Erwartete Abgänge"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Bedarfsmenge"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Erzeuge Positionen f.d. Prognose"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr "Menge aller bestätigen Warenabgänge für die zu planende Periode"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Erzeuge Tagesperioden"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Unternehmen"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Alle Verkaufsprognosen f.d.  ausgew. Zentrallager und das ausgew. Produkt "
-"innerhalb der ausgew. Periode."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Indikatoren Meldebestandregel"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Periode f. d. prognostiziert wird"
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Nur Lagerort"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-"Menge die aus dem Zentrallager in der aktuellen (Plan-)Periode abgegangen "
-"ist."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Bestätigter Eingang"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Aktueller Status d. Periode"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-"Dieser Assistent hilft bei der Erstellung von Lagerplanungsperioden. Diese "
-"Perioden sind unabhängig von Finanz-Perioden. Manuell können auch andere "
-"Perioden als Tag/Woche/Monat  hinzugefügt werden."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Erzeuge Monatl. Perioden"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.period.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Gepl. Abgang Vorperiode"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Alle Produkte mit Prognose"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-"Maximale Menge die in den Minimum-Bestands-Regeln für diesen Lagerort "
-"gesetzt sind"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Perioden :"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-"Ankreuzen um diesen Lagerort für Wareneingänge dieses Lagers zu verwenden. "
-"Sonst gehen Wareneingänge auf den entsprechenden Lagerort dieses Lagers"
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-"Menge die in der akt. Periode bereits vom Zentrallager versendet wurde."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Keine Produkte in der ausgew. Kategorie!"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Verkauf & Bestände Prognose"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.sale.forecast"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Erw. Eingänge"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Simulation Bestände"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planning.createlines"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Bereits bestätigte Wareneingänge (inklusive bereits eingangener Waren), "
-"d.h.im Zeitraum zwischen Beginn der aktuellen Periode bis einen Tag vor "
-"Start derneu zu berechnenden Periode."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Suche Verkauf Prognose"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "Dieser Benutzer Periode5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr "Historie Beschaffung intern od. extern"
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Alle Verkaufsprognosen für das gesamte Unternehm. (alle Zentralläger) für "
-"ein ausgew. Produkt innerhalb der ausgew. Periode."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "Dieser Benutzer Periode1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "Dieser Benutzer Periode3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Planung Bestände"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Meldebestandregel"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Berechne Bedarfsmenge"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Erstelle"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Masterplan Beschaffung (MPS)"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Vergang. / Zukunft"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Status"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "Produktkategorie auf die sich die Verbrauchsprognose bezieht."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "Lager Periode"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.sale.forecast.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Zentrallager"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Simulation des Lagerbestands zum Monatsende der gewählten Periode.\n"
-" Für die aktuelle Periode lautet das Ergebnis folgendermassen:: \n"
-"Anfangsbestand - Bereits erfolgte Abgänge + Bereits erfolgte Eingänge - "
-"Erwarteter Versand + Bedarfsmenge.\n"
-"Für zukünftige Perioden: \n"
-"Anfangsbestand - Geplante Abgänge Vorperioden + Geplante Eingänge "
-"Vorperioden - Zuk. Gepl. Abgang + Zuk. Gepl.Eingang."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Wähle Option um Verkäufe d. gesamten Unternehmens zu sehen."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Nach Abteilung:"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Erw. Eingang"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-" Beschaffungsauftag erstell aufgrund des Materialplanungssstems für "
-"Benutzer: %s   Erstellungsdatum: %s                                         "
-"\n"
-" Für Periode: %s                                         \n"
-" entsprechend Status:                                         \n"
-" Lagervorschau: %s                                         \n"
-" Anfangsbestand: %s                                         \n"
-" geplante Ausgänge: %s   Geplante Eingänge: %s                               "
-"          \n"
-" erledigte Ausgänge: %s    Erledigte Eingänge: %s                            "
-"             \n"
-" Bestätigte Ausgänge: %s    Bestätigte Eingänge: %s                          "
-"               \n"
-" Geplante Ausgänge vor: %s    Geplante Eingänge vor: %s                      "
-"                   \n"
-" Erwartete Ausgänge: %s   Restliche Eingänge: %s                             "
-"            \n"
-" Lager Simulation: %s    Minimum Bestand: %s"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Fehler !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Dieser Benutzer"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Prognosen"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Beschaffe aus and. Zentrallager"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Berechne Planung"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Fehlerhafte Aktion!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Bestand einen Tag vor akt. Periode"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr "Beschaffung Historie"
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-"Masseinheit für die Lagerkalkulation. Sie können entweder diese oder die "
-"sekundäre Kategorie (Verkaufseinheit) verwenden"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Erzeuge Wöchentl. Perioden"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-"Lagerperioden werden für die Lagerplanung verwendet und sind unabhängig von "
-"den Buchhaltungsperioden. Mit dem Assistenten können Sie diese erstellen und "
-"überwachen"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Simulation d. Periode"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Dieser Benutzer Periode4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Bestand und Verkauf Periode"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Unternehmens Prognose"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr "Minimum Bestand der in den Regeln für dieses Lager definiert ist."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Pro Benutzer:"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Zentrallager für diese Prognose"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Erstellt/Geprüft durch"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Prognose f. Zentrallager"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"Das Zentrallager für die Quelle sollte ein anderes sein als das errechnete "
-"(Ziel) Zentrallager !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr "Kann bestätigte Verkaufsvorschau nicht löschen!"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "Dieses Unternehmen Periode5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "Produkt ME"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr "Dieses Unternehmen Periode1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "Dieses Unternehmen Periode2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "Dieses Unternehmen Periode3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Start am"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "Dieser Benutzer Periode2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Genehmigte Prognose"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"Planung wird erzeugt für die Produkte die durch diese Kategorie ausgewählt "
-"wurden Dieses Feld wird ignoriert bei Aktivierung v. \"Alle Prognost. "
-"Produkte\" ."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Gepl. Abgang"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr "Vorschau Menge"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Prognose"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Entwurf"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Beendet"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Zentrallager "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-"Masseinheit für die Lagermengen. Sie können diese oder die sekundäre "
-"Kategorie (Verkaufseinheit) verwenden."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Prognose und akt. Situation f. Periode"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Erfassen den geplanten Abgang des ausgewählten Zentrallagers für die "
-"selektierten Perioden und Produkte. Vergleichen Sie für die Eingabe mit den "
-"Wert der bereits bestätigten Abgänge oder des Prognosewerts für den Verkauf. "
-"Der einzutragende Wert sollte größer oder gleich dem bereits bestätigten "
-"Abgang sein."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr "aktuelle Perioden"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Interne Beschaffung"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr "%s Lieferscheinliste %s (%s,  %s) %s %s \n"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Erzeuge Verkaufsprognose"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Periode4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Periode Bezeichn."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Periode2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Periode3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Periode1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-"Dieser Assistent hilft MPS Zeilen für  bestimmte Perioden und Lager zu "
-"erzeugen um diese nicht einzeln anlegen zu müssen.  Bestehende Zeilen werden "
-"nicht dupliziert."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Bestät. Abgang"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Erzeuge Pos. f. Planung Bestände"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Allgemeine Info"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Verkauf Prognose"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Dieses Zentrallager Periode1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Verkauf Historie"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Quelle Zentrallager"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr "Vorschau Menge"
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Lagerort Wareneingang"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Ende Datum f. Prognoseperiode"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Aktiviere d. Option um alle Produkte ohne bereits exist. Prognose für das "
-"gew. Zentrallager u. die gew. Periode auszuwählen. Die Produkt Kategorie "
-"field wird i.d. Fall ignoriert."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr "MPS(%s) %s"
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Bereits Eingegangen"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Produkt ME Kategorie"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-"Masseinheit für die Lagerkalkulation. Sie können entweder diese oder die "
-"sekundäre Kategorie (Verkaufseinheit) verwenden"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-"Der Einkaufsgeneralplan kann der hauptsächliche Treiber für die "
-"Lagernachbeschaffung sein oder die automatischen Bestellungen ergänzen( "
-"Minimale Lagermenge,...)\n"
-"Jede Zeile gibt einen Überblick über die eingehenden und ausgehenden Mengen "
-"in einer Lagerperiode für ein bestimmtes Lager und basierende auf den "
-"geplanten Lagerbuchungen.\n"
-"Die errechneten Mengen können manuell verändert werden und in einen "
-"Beschaffungsauftrag umgewandelt werden um die geplanten Mengen zu erreichen."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-"Lieferschein erstellt im MPS von Benutzer: %s   Erstellungsdatum: %s         "
-"                            \n"
-"Für Periode: %s   entspricht Status:                                     \n"
-" Lagervorschau: %s                                     \n"
-" Anfangsbestand: %s                                     \n"
-" Geplant Auslieferung: %s  Geplanter Eingang: %s                             "
-"        \n"
-" bereits ausgeliefert: %s  Bereits eingegangen: %s                           "
-"          \n"
-" bestätigte Auslieferung: %s   Bestätigter Eingang: %s                       "
-"              \n"
-" geplante Auslieferung vor: %s   Geplanter Eingang vor: %s                   "
-"                  \n"
-" erwartete Auslieferung: %s   restlicher Eingang: %s                         "
-"            \n"
-" Lager Simulation: %s   Minimumbestand: %s "
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Periode"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Produkt ME VK Kategorie"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "Aktive ME"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Suche Planung Bestände"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Kopiere letzte Prognose"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Zeigt Produkte f. diese Prognose"
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Erledigt"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Perioden"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr "Erstelle Lager Perioden"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Beenden"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Genehmigt"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Offen"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Kopiere Mengen von letztmaligem Bestand und Verkauf Prognose"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "Diese Abteilung Periode1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "Diese Abteilung Periode3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "Diese Abteilung Periode2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "Diese Abteilung Periode5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "Diese Abteilung Periode4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "Dieses Zentrallager Periode2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "Dieses Zentrallager Periode2"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-"Aktiveren, um vom Lagerort des Lagers zu liefern. Sonst wird das "
-"Ausgangslager des Lieferlagers verwendet. Wird in \"Lieferung von anderem "
-"lager\" verwendet."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Verantwortlich"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "Standard ME"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "Dieses Zentrallager Periode4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "Dieses Zentrallager Periode5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Aktuell"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-"Dieses Lager wird als Herkunft für einen Beschaffungsvorgang verwendet, wenn "
-"\"Beschaffung von anderem Lager\" gewählt wird."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planning"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Anzeige des Zentrallagers auf dem diese Prognose beruht. Falls Sie für die "
-"Bestandsplanung eine Prognose der Verkäufe aller Zentralläger benötigen, "
-"treffen Sie jetzt eine bel. Wahl."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr "%s Beschaffung (%s,  %s) %s %s \n"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Nach Unternehmen"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Gebe die erwartete Menge für den Eingang (Ihre Planung) ein. Ändere den Wert "
-"und beobachte Auswirkung auf die Bestandssimulation. Der Wert sollte grösser "
-"oder gleich dem bereits best. Eingang sein."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "Dieses Unternehmen Periode4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Periode auf die sich Prognose bezieht"
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Bereits Abgegangen"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Produkt auf das sich diese Planung bezieht"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Nach Zentrallager:"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Historie Beschaffung"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Start Datum der Prognose Periode"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr "Lagerperioden"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Lager"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr "Menge bestät. Eingang in d. Periode"
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Ende Datum"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Keine Anforderung"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Bezeichnung"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Zeigt Periode für diese Prognose"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "ME"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr "Abgeschlossene Perioden"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Verkauf Prognosen"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Produkt Kategorie"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "Sie müssen Zentrallager als Quelle wählen !"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Beschaffe für Lagerort"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Genehmige"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-"Periode für d. Planung. Anforderung wird erzeugt zum Beginn der Periode."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr "MPS für %s"
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Anfangsbestand"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Produkt Betrag"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Option zur ausschliessl. Auswahl von genehmigten Prognosen. Ansonsten werden "
-"genehmigte Prognosen sowie Prognosen im Entwurf Status herangezogen."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Periode5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Dieses Zentrallager"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr ""
-"Zeigt an wer die Prognose erstellt hat, bzw. wer Genehmigung erteilt hat."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr "Verkaufsteam"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Offene Liefermenge für die Planung des Eingangs. Dieses entspricht der "
-"Differenz zwischen geplantem Eingang und bereits bestät. Eingang. Für die "
-"aktuelle Periode werden auch die bereits erfolgten Eingängeberücksichtigt. "
-"Dieser Wert wird verwendet für die Beschaffung der fehlenden Menge."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-"Auslieferungsmengen die zusätzlich zum bestätigen Warenausgang erwartet "
-"werden als Differenz zwischen geplantem und bestätigtem Ausgang. Für die "
-"laufende Periode wird auch der tatsächlich stattgefundene Ausgang berechnet."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Berechne Verkauf Historie"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-"Dieser Assistent erzeugt viele Vorschauzeilen auf einmal. Danach müssen Sie "
-"nur die Mengen eintragen. Der Assistent erzeugt keine Duplikate für die "
-"selben Auswahlkriterien."
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Dieses Unternehmen Periode1"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Bereits Abgegangen: "
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Fehlerhafte Modellbezeichnung für diese Aktion"
-
-#~ msgid "Requisition history"
-#~ msgstr "Historie Anforderungen"
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Erzeuge Perioden f. Planung"
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Wähle Option um Beschaffungsvorschlag dem Hauptlager(-ort) des Zentrallagers "
-#~ "zuzuordnen. Ansonsten erfolgt eine Zuordnung der Beschaffung zum "
-#~ "Eingangslager(-ort)."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Gepl. Abgang Vorperiode: "
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Wir verwenden Zentrallager als Quelle für Wareneingänge die durch eine "
-#~ "'Beschaffung a. and. Zentrallager' generiert wurde."
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Bestät. Eingang Vorperiode "
-
-#~ msgid "This Department"
-#~ msgstr "Diese Abteilung"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Fehlerhafter XML Quellcode für diese Ansicht!"
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Datum Erstellung "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Manuelle Planung von "
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "Beschaffungsvorschlag im MPS durch Benutzer: "
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr "Max. Menge in Meldebestandregel"
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr "Erzeuge Prognosepositionen für ausgew. Periode u. Zentrallager."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Zentrallager Prognose: "
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "Kann bereits genehmigte Verkaufsprognose nicht löschen !"
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Hinweis: Duplizieren Sie keine bereits selbst erstellten Positionen."
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Genutzte Mengeneinheit für Anzeige und Berechnung der Kalkulation. Sie "
-#~ "können als Einheit die Standard Mengeneinheit nutzen oder alternativ die "
-#~ "Mengeneinheit für den Verkauf (ME VK)."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Gepl. Abgang: "
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Erzeuge Perioden f. Planung von Verkäufen u. Beständen"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module is based on original OpenERP SA module stock_planning version "
-#~ "1.0 of the same name Master Procurement Schedule.\n"
-#~ "\n"
-#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
-#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
-#~ "\n"
-#~ "Terms used in the module:\n"
-#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
-#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-#~ "the Period.\n"
-#~ "- Stock Planning - is the quantity of products you plan to purchase or "
-#~ "produce for the Period.\n"
-#~ "\n"
-#~ "Because we have another module sale_forecast which uses terms \"Sales "
-#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-#~ "values. \n"
-#~ "\n"
-#~ "Activity with this module is divided to three steps:\n"
-#~ "- Creating Periods. Mandatory step.\n"
-#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
-#~ "useful for further planning.\n"
-#~ "- Creating Planning lines, entering quantities to them and making "
-#~ "Procurement. Making procurement is the final step for the Period.\n"
-#~ "\n"
-#~ "Periods\n"
-#~ "=======\n"
-#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
-#~ "There are:\n"
-#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-#~ "monthly periods.\n"
-#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-#~ "change the dates and change the State of period.\n"
-#~ "\n"
-#~ "Creating periods is the first step you have to do to use modules features. "
-#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
-#~ "Periods\" form or view but it is recommended to use automating tool.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- These periods (officially Stock and Sales Periods) are separated of "
-#~ "Financial or other periods in the system.\n"
-#~ "- Periods are not assigned to companies (when you use multicompany feature "
-#~ "at all). Module suppose that you use the same periods across companies. If "
-#~ "you wish to use different periods for different companies define them as you "
-#~ "wish (they can overlap). Later on in this text will be indications how to "
-#~ "use such periods.\n"
-#~ "- When periods are created automatically their start and finish dates are "
-#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
-#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-#~ "you create periods manually you have to take care about hours because you "
-#~ "can have incorrect values form sales or stock. \n"
-#~ "- If you use overlapping periods for the same product, warehouse and company "
-#~ "results can be unpredictable.\n"
-#~ "- If current date doesn't belong to any period or you have holes between "
-#~ "periods results can be unpredictable.\n"
-#~ "\n"
-#~ "Sales Forecasts\n"
-#~ "===============\n"
-#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
-#~ "Forecasts\".\n"
-#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-#~ "forecasts lines according to some parameters.\n"
-#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-#~ "forms.\n"
-#~ "\n"
-#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-#~ "products from selected Category, for selected Period and for selected "
-#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-#~ "settings of period before this one to created one.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
-#~ "Period, Warehouse and validated or created by you) already exists. If you "
-#~ "wish to create another forecast, if relevant lines exists you have to do it "
-#~ "manually using menus described bellow.\n"
-#~ "- When created lines are validated by someone else you can use this tool to "
-#~ "create another lines for the same Period, Product and Warehouse. \n"
-#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
-#~ "some settings from your (validated by you or created by you if not validated "
-#~ "yet) forecast which is for last period before period of created forecast. If "
-#~ "there are few your forecasts for period before this one (it is possible) "
-#~ "system takes one of them (no rule which of them).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menus \"Sales Forecasts\"\n"
-#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
-#~ "validation can save your data against any accidental changes. You can click "
-#~ "\"Validate\" button but it is not mandatory.\n"
-#~ "\n"
-#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
-#~ "\"Product Amount\". System will count quantity from amount according to Sale "
-#~ "price of the Product.\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
-#~ "for this product. You have to enter parameters to the top and left of this "
-#~ "table and system will count sale quantities according to these parameters. "
-#~ "So you can select fe. your department (at the top) then (to the left): last "
-#~ "period, period before last and period year ago.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "\n"
-#~ "\n"
-#~ "Procurement Planning\n"
-#~ "====================\n"
-#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-#~ "lines according to some parameters.\n"
-#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
-#~ "module which allows to create procurement.\n"
-#~ "\n"
-#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
-#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
-#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
-#~ "Planning Lines\", then you can review created planning and make procurement "
-#~ "using menu \"Master Procurement Schedule\".\n"
-#~ "\n"
-#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-#~ "lines for products from selected Category, for selected Period, and for "
-#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
-#~ "system creates lines for all products having forecast for selected Period "
-#~ "and Warehouse. Selected Category will be ignored in this case.\n"
-#~ "\n"
-#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
-#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-#~ "Simulation\" and decide if this value would be accurate for end of the "
-#~ "Period. \n"
-#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-#~ "all forecasts for Period and Warehouse. But your planning can be based on "
-#~ "any other information you have. It is not necessary to have any forecast. \n"
-#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-#~ "is the quantity to be procured to make stock as indicated in \"Stock "
-#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-#~ "quantity to minimum stock rules visible on the form. But you can plan "
-#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
-#~ "whole Warehouse by default. But if you want to see values for Stock location "
-#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
-#~ "\n"
-#~ "If after few tries you decide that you found correct quantities for "
-#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
-#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
-#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
-#~ "\n"
-#~ "\n"
-#~ "If you don't want to Produce or Buy the product but just pick calculated "
-#~ "quantity from another warehouse you can click \"Supply from Another "
-#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-#~ "with move from selected source Warehouse to calculated Warehouse (as "
-#~ "destination). You can also decide if this pick should be done from Stock or "
-#~ "Output location of source warehouse. Destination location (Stock or Input) "
-#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
-#~ "\n"
-#~ "\n"
-#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-#~ "have to click button \"Calculate Planning\".\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "How Stock Simulation field is calculated:\n"
-#~ "Generally Stock Simulation shows the stock for end of the calculated period "
-#~ "according to some planned or confirmed stock moves. Calculation always "
-#~ "starts with quantity of real stock of beginning of current period. Then "
-#~ "calculation adds or subtracts quantities of calculated period or periods "
-#~ "before calculated.\n"
-#~ "When you are in the same period (current period is the same as calculated) "
-#~ "Stock Simulation is calculated as follows:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out \n"
-#~ "\t+ Planned In\n"
-#~ "\n"
-#~ "When you calculate period next to current:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out of current Period \n"
-#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period .\n"
-#~ "\n"
-#~ "As you see calculated Period is taken the same way like in case above. But "
-#~ "calculation of current Period are made a little bit different. First you "
-#~ "should note that system takes for current Period only Confirmed In moves. It "
-#~ "means that you have to make planning and procurement for current Period "
-#~ "before this calculation (for Period next to current). \n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period \n"
-#~ "\t- Sum of Planned Out of Periods before calculated \n"
-#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period.\n"
-#~ "\n"
-#~ "Periods before calculated means periods starting from current till period "
-#~ "before calculated.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- Remember to make planning for all periods before calculated because "
-#~ "omitting these quantities and procurements can cause wrong suggestions for "
-#~ "procurements few periods ahead.\n"
-#~ "- If you made planning few periods ahead and you find that real Confirmed "
-#~ "Out is bigger than Planned Out in some periods before you can repeat "
-#~ "Planning and make another procurement. You should do it in the same planning "
-#~ "line. If you create another planning line the suggestions can be wrong.\n"
-#~ "- When you wish to work with different periods for some part of products "
-#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
-#~ "different products. Example: If you use always Weekly periods for Products "
-#~ "A, and Monthly periods for Products B your all calculations will work "
-#~ "correctly. You can also use different kind of periods for the same products "
-#~ "from different warehouse or companies. But you cannot use overlapping "
-#~ "periods for the same product, warehouse and company because results can be "
-#~ "unpredictable. The same apply to Forecasts lines.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Dieses Modul basiert auf dem Modul stock_planning Version 1.0 für die "
-#~ "Funktionalität des Master Procurement Schedule (Beschaffungsvorschläge - "
-#~ "Materialdisposition).\n"
-#~ "Zweck dieses Moduls ist die manuelle Erstellung eines Beschaffungsvorschlags "
-#~ "unabhängigvom bisherigen Modul zur Errechnung autom. "
-#~ "Beschaffungsvorschläge.\n"
-#~ "\n"
-#~ "Terminologie die in diesem Modul verwendet wird:\n"
-#~ "- Bestand und Verkauf Periode - Zeitspanne (zwischen Start und Ende Datum) "
-#~ "für die SieBestände und Verkäufe für die Ermittlung v. "
-#~ "Beschaffungsvorschlägen prognostizieren.- Bestand und Verkauf Prognose - "
-#~ "Prognose von Verkaufsmengen für Produkte zukünftiger  Perioden.\n"
-#~ "- Planung Bestand - Planung der Bestände sowie zu beschaffender Mengen für "
-#~ "Produktein zukünftigen Perioden.\n"
-#~ "\n"
-#~ "Zur Vermeidung von begrifflichen Überschneidungen mit dem Modul "
-#~ "sale_forecast welchesdie Begriffe 'Verkäufe' , 'Forecast' oder 'Planung' "
-#~ "verwendet, werden anstatt dessen in diesem Modul die Begriffe 'Bestand und "
-#~ "Verkauf Prognose' und 'Planung Bestände'verwendet, um klarzustellen, dass "
-#~ "Mengen anstelle von Werten zur Planung und Prognose verwendet werden.\n"
-#~ "\n"
-#~ "Für die Arbeit mit diesem Modul ist ein Vorgehen in drei Schritten nötig: - "
-#~ "Erzeugen von Perioden. Dieser Schritt ist immer erforderlich. - Erzeugen "
-#~ "einer Verkaufs Prognose durch Erfassung von geplanten Mengen. Dieser Schritt "
-#~ "ist nicht zwingend aber dennoch nützlich für die weiteren Schritte. Erzeugen "
-#~ "von Prognospositionen, erfassen der Menge zu den einzelnen Positionen und "
-#~ "Starten des Beschaffungsvorschlags. Die Beschaffung selbst ist der letzte "
-#~ "Schritt. \n"
-#~ "Perioden\n"
-#~ "========\n"
-#~ "Sie finden zwei Menüpunkte für die Perioden unter 'Verkauf - Konfiguration'. "
-#~ "Diese beiden Menüs sind folgende:\n"
-#~ "- 'Erzeuge Verkauf Perioden' - Hierdurch werden tägl., wöchentl. oder "
-#~ "monatl. Perioden automatisch angelegt.\n"
-#~ "- 'Bestand und Verkauf Perioden' - Hierdurch können Sie beliebige Perioden "
-#~ "neu definieren und Änderungen der Zeiträume sowie der Stati vornehmen.\n"
-#~ "\n"
-#~ "Die Erstellung der Perioden ist der erste Schritt, der vorzunehmen ist.Sie "
-#~ "können individuelle Perioden durch Klick auf den 'Neu Button' im "
-#~ "Eingabeformular 'Bestand und Verkauf Perioden' vornehmen. Empfohlen wird "
-#~ "allerdings das Tool z. Automatisierung.\n"
-#~ "Hinweise:\n"
-#~ "- Die Perioden (offiziell Bestand und Verkauf Perioden) sind unabhängig "
-#~ "vonden Perioden der Finanzbuchhaltung oder anderen Perioden in OpenERP.\n"
-#~ "- Perioden sind nicht verbunden mit dem Unternehmen (Mandant), für den Fall "
-#~ "dass Siemit einem Multicompany Szenario arbeiten. Dieses Modul unterstellt "
-#~ "dass in allenUnternehmen mit dem gleichen Setup für Perioden gearbeitet "
-#~ "wird. Sollten Sie dennochunterschiedl. Perioden für verschiedene Unternehmen "
-#~ "benötigen können Sie verschiedenePerioden definieren (Überschneidung ist "
-#~ "auch möglich). Wie dieses anzuwenden ist, folgt später.\n"
-#~ "- Bei autom. Anlage von Perioden ist die Uhrzeit für das Start und Ende "
-#~ "Datum immer 00:00:00bzw. 23:59:00. Dieses funktioniert bei der autom. "
-#~ "Anlage. Sollten Sie per Hand Periodenneu anlegen müssen Sie auf die "
-#~ "Konfiguration der Stunden achten, da Sie ansonsten fehlerhafte Daten "
-#~ "erhalten können.\n"
-#~ "- Wenn Sie unterschiedl. sich überschneidende Perioden für dasselbe Produkt, "
-#~ "Zentrallager oderUnternehmen haben, kann das Ergebnis eventuell mit Fehlern "
-#~ "behaftet sein kann.\n"
-#~ "- Ebenso kann dieses bei Lücken in der Definition der Perioden eine "
-#~ "unerwünschte Folgesein.\n"
-#~ "Verkauf Prognose\n"
-#~ "================\n"
-#~ "Sie haben einige neue Menüs für die Verkaufs Prognose unter 'Verkauf - "
-#~ "Verkauf Prognose'.\n"
-#~ "- 'Erzeuge Verkauf Prognose f. Verkauf Perioden'- hierdurch werden "
-#~ "automatisch einzelne Positionen für die Bearbeitung der Prognose auf Basis "
-#~ "der Einstellungen generiert.\n"
-#~ "- 'Verkauf Prognose' - Menü für die Arbeit mit einzelnen Positionslisten und "
-#~ "den hierfür vorgesehenen Formularen.\n"
-#~ "\n"
-#~ "Das Menü 'Erzeuge Verkauf Prognose f. Verkauf Perioden' generiert Prognosen "
-#~ "für Produkte der gewählten Kategorie, der gew. Periode und das ausgew. "
-#~ "Zentrallager. Alsweitere Option kann durch 'Kopiere letzte Prognose' eine "
-#~ "Kopie einer vorherigenPrognose mit der entsprechenden Konfiguration "
-#~ "dupliziert werden.\n"
-#~ "Hinweise:\n"
-#~ "- Dieses Tool erzeugt keine neuen Positionen, wenn relevante Positionen (für "
-#~ "dasselbe Produkt, Periode, Zentrallager definiert durch den Benutzer) "
-#~ "bereits existieren.Wenn Sie eine alternative Prognosen für bereits "
-#~ "vorhandene Prognosepositionenerstellen wollen, gehen Sie folgendermassen "
-#~ "vor:\n"
-#~ "- Wenn ein anderer Benutzer die Positionen genehmigt hat, können Sie mit "
-#~ "diesem Tooleinfach weitere Positionen für dieselbe Periode, dasselbe Produkt "
-#~ "oder Zentrallager erstellen.\n"
-#~ "- Wenn Sie 'Kopiere letzte Prognose' klicken, werden Ihre Konfiguration und "
-#~ "Planmengenaus der unmittelbar vorherigen Periode übernommen. Sollte es "
-#~ "weitere Prognosen für dieselbe Periode bereits geben, wird ohne eine "
-#~ "bestimmte Regel eine Zufallsauswahl getroffen.\n"
-#~ "\n"
-#~ "\n"
-#~ "Inhalte im Menü 'Verkauf Prognose'\n"
-#~ "Im Formular 'Verkauf Prognose müssen Sie die prognostizierten Mengen im "
-#~ "Feld'Produkt Menge' erfassen. Alternative Berechnungen funktionieren "
-#~ "jederzeit im Status Entwurf.Möchten Sie keine Änderungen mehr zulassen "
-#~ "klicken Sie auf 'Genehmigen', welches allerdings nicht dem üblichen Vorgehen "
-#~ "entspricht.\n"
-#~ "Anstelle der Menge können Sie alternativ auch den Umsatzwert eingeben im "
-#~ "FeldVerkauf Umsatz(wert). Das System rechnet autom. über den Verkaufspreis "
-#~ "die Mengen aus.\n"
-#~ "Alle Werte für Mengen beruhen auf der ME (Mengeneinheit) die Sie hier "
-#~ "ausgewählt haben.Ändern Sie die Mengeneinheit werden alle Mengen "
-#~ "entsprechend umgerechnet. EditierbareWerte (blau) werden dabei sofort "
-#~ "umgerechnet, andere durch Klick auf 'Berechne Planung'.\n"
-#~ "Als Hilfe für realistische Planwerte können Sie die Tabelle 'Verkauf "
-#~ "Historie' für dasProdukt gut einsetzen. Erfassen Sie Ihre Parameter oberhalb "
-#~ "und links der Tabelle damitdas System die entsprechende Prognosemenge für "
-#~ "Sie ermittelt. Z.B. wählen Sie Ihre Abteilungoberhalb der Tabelle und links "
-#~ "die letzte und vorletzte Periode, sowie die Periode vor einem Jahr.\n"
-#~ "\n"
-#~ "Hinweise:\n"
-#~ "\n"
-#~ "\n"
-#~ "Planung Beschaffungsvorschlag\n"
-#~ "=============================\n"
-#~ "Dieses Menü finden Sie unter 'Lager - Planung Bestand'.\n"
-#~ "- 'Erzeuge Planung Bestand Positionen' - ermöglicht die autom. Erstellung "
-#~ "derrelevanten Planungspositionen in Abhängigkeit einiger vorab definierter "
-#~ "Parameter.- 'Automatischer Beschaffungsvorschlag' - das wichtigste Menü "
-#~ "dieses Modulszur autom. Errechnung von Beschaffungsvorschlägen.\n"
-#~ "\n"
-#~ "So wie die Prognose des Verkaufs ein wichtiger Teilschritt im "
-#~ "Planungsprozess ist, ist die Planung Beschaffungsvorschlag ein wichtiger "
-#~ "Schritt für die autom. Errechnung von Bestellungen oder "
-#~ "Fertigungsaufträgen.Das Tool wird über das Menü 'Erzeuge Planung "
-#~ "Beschaffungsvorschlag' gestartet, um dort die Planung individ. zu "
-#~ "konfigurieren und abschließend einen Beschaffungsvorschlag über das Menü "
-#~ "'Autom. Beschaffungsvorschlag' automatisch zu erstellen.\n"
-#~ "\n"
-#~ "Das Menü 'Erzeuge Planung Bestand Positionen' ermöglicht die schnelle "
-#~ "Erzeugung von einzelnenPlanungspositionen für Produkte der gewähl. "
-#~ "Kategorie, für eine gewähl. Periode und ein ausgewählt. Zentrallager. Durch "
-#~ "die Aktivierung der Option 'Alle Produkte mit Prognose' generiert das System "
-#~ "einzelne PositionenZeile für Zeile für die gew. Perioden und das "
-#~ "Zentrallager. Die ausgew. Kategorie wird in diesem Fall ignoriert.\n"
-#~ "\n"
-#~ "Im Menü 'Autom. Beschaffungsvorschlag' können grundsätzlich die beiden "
-#~ "Felder für 'Gepl. Abgang' und 'Gepl. Eingang' geändert werden, um dann über "
-#~ "das Feld 'Bestand Simulation \" zu entscheiden, ob der kalk. Bestand am Ende "
-#~ "der Periode dem kalk. Zielwert entspricht oder nicht. \n"
-#~ "'Geplanter Abgang' kann basieren auf 'Zentrallager Prognose', welches dann "
-#~ "der Summe aller Prognosen des Vertriebs für die Periode und dem Zentrallager "
-#~ "entspricht. Die Planung könnte auch auf anderen Daten basieren. Es ist nicht "
-#~ "erforderlich auf Vertriebsprognosen aufzusetzen.\n"
-#~ "'Geplanter Eingang' wird genutzt um das Feld 'Bedarfsmenge' zu berechnen, "
-#~ "welchesder zu beschaffenden Menge entspricht, die wiederum  über das Feld "
-#~ "'Simulation Bestand'zum Ende der Periode ermittelt wird. Sie können die "
-#~ "errechnete Menge in 'Simulation Bestand'mit den im Formular angezeigten "
-#~ "Meldebständen der Beschaffungsregeln abgleichen oder andereMengen planen. "
-#~ "Die Berechnung erfolgt im Standard für das gesamte Zentrallager. Um die "
-#~ "Wertefür einzelne Lagerorte zu sehen, können Sie die Check Box 'Nur "
-#~ "Lagerort' aktivieren.\n"
-#~ "\n"
-#~ "Sollten Sie nach einigen Simulationsläufen entscheiden, dass Ihre "
-#~ "Kalkulation für die beidenWerte 'Gepl. Ausgang' und 'Gepl. Eingang' richtig "
-#~ "ist und der Wert zum Ende des Monats in'Simulation Bestand' auch Ihren "
-#~ "Vorstellungen entspricht klicken Sie auf 'Beschaffe Bedarfsmenge'um die "
-#~ "angezeigte Menge  des Feldes 'Bedarfsmenge' für das Zentrallager zu "
-#~ "beschaffen. Das System erstellt hierauf einen entsprechenden "
-#~ "Beschaffungsauftrag. Sie könnennoch entscheiden, ob die Ware für das "
-#~ "Hauptlager oder alternativ für das Eingangs- oder Versandlagerim "
-#~ "Zentrallager beschafft werden soll.\n"
-#~ "\n"
-#~ "Wenn Sie weder die Waren einkaufen noch selbst fertigen wollen, sondern "
-#~ "anstatt dessendie Menge von einem anderen Zentrallager beziehen wollen, "
-#~ "klicken Sie auf 'Beschaffe aus anderem Zentrallager' anstelle 'Beschaffe "
-#~ "Bedarfsmenge'. Das System erstellt einen Lieferschein mit einer Umlagerung "
-#~ "vom Quell - Zentrallager zum Ziel - Zentrallager. Ausserdem kann gewählt "
-#~ "werden, ob die Lieferung vom Hauptlager oder vom Warenversandlager des "
-#~ "(Quell-) Zentrallagers kommen soll. Der Ziellagerort (Haupt- oder "
-#~ "Eingangslager) des (Ziel)- Zentrallagers wird als Vorgabewert genutzt bei "
-#~ "der enstprechenden Durchführung von 'Beschaffe Bedarfsmenge'.\n"
-#~ "\n"
-#~ "Um korrekte Mengen in den Feldern 'Bestät. Eingang', 'Bestät. Abgang', "
-#~ "'Best. Eingang Vorperioden', 'Best. Abgang Vorperioden' und 'Simulation "
-#~ "Bestand'  zu generieren, müssen Sie auf den Button 'Berechne Planung' "
-#~ "klicken.\n"
-#~ "Alle Werte für Mengen beruhen auf der ME (Mengeneinheit) die Sie hier "
-#~ "ausgewählt haben. Ändern Sie die Mengeneinheit werden alle Mengen "
-#~ "entsprechend umgerechnet. Editierbare Werte (blau) werden dabei sofort "
-#~ "umgerechnet, andere durch Klick auf 'Berechne Planung'. Wie wird die "
-#~ "Bestände Simulation berechnet:\n"
-#~ "Grundsätzl. zeigt eine Simulation die Bestandssituation zum Ende der "
-#~ "kalkulierten Periode gemäß der geplanten oder bereits bestätigen Eingänge u. "
-#~ "Abgänge. Berechnungenbeginnen immer mit dem Anfangsbestand zu Beginn der "
-#~ "Planperiode. Anschliessend werden Mengen aus vorherigen Perioden oder "
-#~ "aktuellen Perioden addiert oder subtrahiert um letzlich einen "
-#~ "Beschaffungsvorschlag zu errechnen.  Wenn Sie sich in der aktuellen Periode "
-#~ "befinden (aktuelle ist dieselbe wie berechnete), erfolgt  die Simulation der "
-#~ "Bestände wie folgt : \n"
-#~ " Simulation Bestand = \n"
-#~ "\tAnfangsbestand (Periode)\n"
-#~ "\t- Geplante Abgänge \n"
-#~ "\t+ Geplante Eingänge\n"
-#~ "\n"
-#~ "Wenn Sie für eine anschließende zukünftige Periode kalkulieren:\n"
-#~ " Simulation Bestand = \n"
-#~ "\tAnfangsbestand (für diese Periode)\n"
-#~ "\t- Geplante Abgänge akt. Periode \n"
-#~ "\t+ Bestät. Eingänge akt. Periode (inkl. erhalt. Waren)\n"
-#~ "\t- Geplante Abgänge zuk. Periode \n"
-#~ "\t+ Geplante Eingänge der zuk. Periode \n"
-#~ "\n"
-#~ "Wie Sie sehen erfolgt die Kalkulation etwas anders. Zuerst nutzt das System "
-#~ "als Wert für den Eingang der aktuellen Periode nur die bestät. "
-#~ "Wareneingänge. Dieses bedeutet dass sowohl die Prognose als auch der "
-#~ "Beschaffungsvorschlag selbst zuerst für die aktuelle Periode erfolgen muss. "
-#~ "Wenn Sie Perioden für die weitere Zukunft berechnen:\n"
-#~ " Simulation Bestand = \n"
-#~ "\tAnfangsbestand (Beginn der Planperiode)\n"
-#~ "\t- Summe Geplante Abgänge vor zu berechn. Periode \n"
-#~ "\t+ Summe Bestät. Eingänge vor zu berechn. Periode (inkl. erhalt. Waren)\n"
-#~ "\t- Geplante Abgänge zuk. Periode \n"
-#~ "\t+ Geplante Eingänge der zuk. Periode \n"
-#~ "\n"
-#~ "Perioden vor zu berechnender Periode bedeutet alle der zu berechnenden "
-#~ "Periode vorgelagerten Perioden.\n"
-#~ "\n"
-#~ "Hinweise:\n"
-#~ "- Denken Sie daran alle vorherigen Perioden zu kalkulieren, da ein Auslassen "
-#~ "von Perioden zu falschen Annahmen für die Beschaffungsvorschläge in "
-#~ "folgenden zukünftigen Perioden führen kann.\n"
-#~ "- Wenn Sie einige Perioden im voraus planen wollen und feststellen, dass der "
-#~ "bereits bestät.Abgang grösser ist als der geplante Abgang für vorherige "
-#~ "Perioden können Sie die Planung wiederholen und dadurch einen genaueren "
-#~ "Beschaffungsvorschlag errechnen. Sie sollten dieses in exakt der gleichen "
-#~ "Planungsposition vornehmen. Eine neue Planungsposition kann  ansonsten zu "
-#~ "Fehlern führen.\n"
-#~ "- Wenn Sie mit unterschiedlichen Perioden für die Planung verschiedener "
-#~ "Produkte arbeiten wollen, definieren Sie einfach zwei verschiedene "
-#~ "Periodentypen (z.B. wöchentl. / monatl.) und benutzen diese dann "
-#~ "entsprechend in Abhängigkeit vom Produkt. Beispiel:  Sie planen immer "
-#~ "Wöchentl. Perioden für Produkt A und Monatl. Perioden für Produkt B sollte "
-#~ "im Ergebnis alle Vorschläge korrekt berechnen. Sie können ebenfalls "
-#~ "unterschiedliche Planperioden für die gleichen Produkte bei "
-#~ "unterschiedlichen Zentrallägern oder Unternehmen (Mandanten) einsetzen. Sie "
-#~ "sollten allerdings Überschneidungen von Perioden für exakt die gleichen "
-#~ "Produkte, bei identischen Zentrallägern und Unternehmen vermeiden, das "
-#~ "dieses zu fehlerhaften Ergebnissen führen kann. Das gleiche gilt "
-#~ "entsprechend für einzelne Prognosepositionen im Verkauf.\n"
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Bedarfsmenge "
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr "Erzeuge Prognosepositionen für d. ausgew. Zentrallager u. d. Periode"
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Anforderung ("
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Erwartete Abgänge für die ausgew. Periode als Differenz zwischen Gepl. "
-#~ "Abgang und bereits best. Abgang. Für die aktuelle Periode wird zusätzlich "
-#~ "noch der bereits erfolgte Abgang herangezogen"
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Bereits Eingegangen "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Anfangsbestand: "
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Meldebestand: "
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Bestät. Eingang "
-
-#~ msgid "Sales history"
-#~ msgstr "Verkauf Historie"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Prognose Menge"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Simulation Bestand: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Bestät. Abgang: "
-
-#~ msgid "Product Quantity"
-#~ msgstr "Produkt Menge"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " abhängig v. Status:"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Die Objektbezeichnung muss mit einem x_ beginnen und darf keine "
-#~ "Sonderzeichen haben !"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Für Periode: "
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Gepl. Eingang: "
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "Wähle Option zur Beschaffung für das Hauptlager des Zentrallagers f.d. "
-#~ "Einkauf. Falls diese Option nicht aktiv ist wird für das entsprechende "
-#~ "Warenversandlager eingekauft. Wird genutzt bei Wahl von 'Beschaffung v. and. "
-#~ "Zentrallager' mit Zentrallager f.d. Einkauf."
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr "Min. Menge definiert in Meldebestandregel f.d. Zentrallager"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Erwarteter Abgang: "
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "MPS("
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Lieferschein durch MPS von Benutzer: "
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Perioden f. Bestand und Verkauf Prognose"
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Bestand u. Verkauf Perioden"
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Lieferschein "
diff --git a/addons/stock_planning/i18n/el.po b/addons/stock_planning/i18n/el.po
deleted file mode 100644
index be687818557..00000000000
--- a/addons/stock_planning/i18n/el.po
+++ /dev/null
@@ -1,1194 +0,0 @@
-# Greek translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-04-05 17:31+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Ομαδοποίηση ανά..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Εταιρεία"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Τοποθεσία Στοκ Μόνο"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-"Ποστότα που έχει ήδη εξαχθεί από αυτήν την αποθήκη για την τρέχουσα περίοδο."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Δημιουργία Μηνιαίων Περιόδων"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Περίοδοι:"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Κανένα προϊόν στην επιλεγμένη κατηγορία"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Πρόβλέψεις Στοκ και Πωλήσεων"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Αρχικό Στοκ: "
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Δημιουργία Περιόδων Στοκ και Πωλήσεων"
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Επιβεβαιώθηκε Πριν: "
-
-#~ msgid "This Department"
-#~ msgstr "Αυτό το Τμήμα"
diff --git a/addons/stock_planning/i18n/es.po b/addons/stock_planning/i18n/es.po
deleted file mode 100644
index 34f996a136f..00000000000
--- a/addons/stock_planning/i18n/es.po
+++ /dev/null
@@ -1,1952 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:05+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"¡No hay previsiones para el periodo seleccionado o no hay productos en la "
-"categoría seleccionada!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Marque esta opción para calcular el stock sólo de la ubicación stock del "
-"almacén seleccionado. Si no se marca, el cálculo se realiza para las "
-"ubicaciones de entrada, stock y salida del almacén."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Regla máximo"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Valor de la previsión que será convertido en cantidad de producto en función "
-"de precios."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "¡Entradas restantes debe ser mayor que 0!"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Salidas planificadas en periodos anteriores al calculado. Entre la fecha de "
-"inicio del periodo actual y un día antes del comienzo del periodo calculado."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Almacén al que conciernen las previsiones. Si durante la planificación de "
-"stock necesita previsiones de ventas para todos los almacenes escoja ahora "
-"un almacén cualquiera."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Salidas previstas"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Entradas restantes"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Crear líneas de previsiones"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr "Cantidades de todas las salidas confirmadas en el periodo calculado."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Crear periodos diarios"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Todas las previsiones de ventas para el almacén seleccionado del producto "
-"seleccionado durante el periodo seleccionado."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Indicadores de reglas de stock mínimo"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Periodo al que conciernen las previsiones."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Sólo ubicaciones de stock"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-"Cantidades que ya se enviaron fuera de este almacén en el período actual."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Entradas confirmadas"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Situación del periodo actual"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Crear periodos mensuales"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.periodo.crearlíneas"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Salidas planificadas antes"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Todos los productos con previsión"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Periodos :"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-"Cantidades que ya han sido recogidas en este almacén en el periodo actual."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "¡No hay productos en la categoría seleccionada!"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Previsiones de stock y ventas"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.ventas.prevision"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Entradas planificadas"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Simulación de stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planificación.crearlíneas"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Entradas confirmadas en periodos anteriores al calculado (incluyendo las "
-"entradas realizadas). Entre la fecha de inicio del periodo actual y un día "
-"antes del comienzo del periodo calculado."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Buscar previsiones de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "El periodo de este usuario5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-"Historial de abastecimiento o suministro interno de esta línea de "
-"planificación."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Todas las previsiones para la compañía entera (para todos los almacenes) del "
-"producto seleccionado durante el periodo seleccionado."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "El periodo de este usuario1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "El periodo de este usuario3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Planificación de stock"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Regla de mínimos"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Entradas abastecimiento restante"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Crear"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Plan maestro de abastecimiento"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Pasado/Futuro"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "Categoría de los productos cuyas previsiones se crearán."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "periodo stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.venta.previsión.crearlíneas"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Simulación de stock al final del período seleccionado.\n"
-" Para el periodo actual es: \n"
-"Stock inicial – salidas + entradas – salidas previstas + entradas "
-"esperadas.\n"
-" Para los siguientes periodos es: \n"
-"Stock inicial – salidas previstas anteriores + entradas anteriores – salidas "
-"previstas + entradas previstas."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Seleccione esta casilla para ver las ventas de todda la compañía."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Por departamento:"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Entradas antes"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "¡ Error !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Este usuario"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Previsiones"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Abastecer desde otro almacen"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Calcular planificación"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Cantidad stock un día antes del periodo actual."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Crear periodos semanales"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Simulación calculada del periodo"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Este periodo de usuario4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Periodo de stock y ventas"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Previsión de la compañía"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Por usuario :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Almacén que se referirá la planificación"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Creado/Validado por"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Previsión almacen"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"¡Debe especificar un almacén de origen diferente del almacén calculado (de "
-"destino)!"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "El periodo de esta compañía5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "UdM de producto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "El periodo de esta compañía2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "El periodo de esta compañía3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "El periodo de este usuario2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Previsiones validadas"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"Se creará la planificación para los productos de la categoría de productos "
-"seleccionada con este campo. Este campo se ignora cuando se marca la opción "
-"\"Todas las previsiones de productos”."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Salidas planificadas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Previsión"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Cerrada"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Almacén "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Planificación y situación para el periodo calculado"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Introduzca la cantidad saliente planificada para el almacén seleccionado "
-"durante el periodo seleccionado y para el producto seleccionado. Para "
-"planificar este valor puede fijarse en las salidas confirmadas o las "
-"previsiones de ventas. Este valor debería ser igual o superior a las salidas "
-"confirmadas."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Suministro interno"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Crear previsiones de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Periodo4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Nombre del período"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Periodo2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Periodo3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Periodo1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Salidas confirmadas"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Crear líneas de planificación de stock"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Información general"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Previsión de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Peridodo de este almacen1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Histórico de ventas"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Almacén origen"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Ubicación suministro de stock"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Fecha de fin para el periodo planificado."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Marque esta opción para crear la planificación de todos los productos que "
-"tengan cualquier previsión en el almacén y periodo seleccionado. El campo "
-"categoría de producto será ignorado."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Entradas realizadas"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Categoría UdM producto"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Periodo"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Categoría UdV producto"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "UdM activa"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Buscar planificación de stock"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Copiar última previsión"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Muestra a qué producto concierne esta previsión"
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Hecho"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Periodos"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Validado"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Copiar cantidades desde el stock pasado y previsión de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "El periodo de este depto.1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "El periodo de este depto.3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "El periodo de este depto.2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "El periodo de este depto.5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "El periodo de este depto.4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "El periodo de este almacén2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "El periodo de este almacén3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "UdM por defecto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "El periodo de este almacén4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "El periodo de este almacén5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Actual"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planificación"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Muestra a qué almacén concierne esta previsión. Si durante la planificación "
-"de stock necesita previsiones de ventas para todos los almacenes escoja "
-"ahora un almacén cualquiera."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Por compañía"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Introducir la cantidad que (por su plan) debe entrar. Cambie este valor y "
-"observe la simulación de stock. Este valor debería ser igual o superior a "
-"las entradas confirmadas."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "El periodo de esta compañía4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Periodo al cual concierne la planificación"
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Salidas realizadas"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Producto para el que ha sido creada esta planificación."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Por almacén :"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Histórico abastecimientos"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Fecha inicial para el periodo planificado."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Stock"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-"Cantidades de todas las entradas confirmadas en el periodo calculado."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Núm. solicitud"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Muestra a que periodo concierne esta previsión."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Previsiones de ventas"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Categoría de producto"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "¡Debe especificar un almacén origen!"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Abastecimiento a ubicación stock"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Aprobar"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-"Periodo para esta planificación. Se creará una solicitud al principio del "
-"periodo."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Stock inicial"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Cantidad de producto"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Marcar para usar sólo las previsiones validadas. Si no se marca el sistema "
-"usa las previsiones validadas y borrador."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Periodo5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Este almacén"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Muestra quién creó esta previsión, o quién la validó."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Cantidad restante de la cantidad entrante planificada. Se calcula mediante "
-"la diferencia entre las entradas planificadas y las entradas confirmadas. "
-"Para el periodo actual las entradas realizadas también se calculan. Este "
-"valor se usa para crear abastecimientos para la cantidad faltante."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Calcular historial de ventas"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Crear periodos de stock y ventas"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Stock inicial: "
-
-#~ msgid "Requisition history"
-#~ msgstr "Historial demandas"
-
-#~ msgid "This Department"
-#~ msgstr "Este departamento"
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Fecha de creación: "
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Nota: No duplica las líneas creadas por usted."
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr "Crear líneas de previsión para el almacén y periodo seleccionados."
-
-#~ msgid "Sales history"
-#~ msgstr "Histórico de ventas"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Cantidad prevista."
-
-#~ msgid "Product Quantity"
-#~ msgstr "Cantidad de producto"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " según el estado:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Previsión almacén: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Por periodo: "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Planificación manual para "
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr ""
-#~ "Crea líneas de planificación para el periodo y almacen seleccionados."
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "¡ No se pueden borrar previsiones de ventas validadas !"
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Crear periodos para planificación de stock y ventas"
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Stock mínimo: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Simulación de stock: "
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "Abastecimiento creado en MPS por el usuario: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas confirmadas: "
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Solicitud ("
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Entradas confirmadas: "
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Entradas confirmadas antes: "
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Esta compañía período1"
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Marque esta opción para realizar los abastecimientos en la ubicación stock "
-#~ "del almacén seleccionado. Si no se marca, el abastecimiento se realizará en "
-#~ "la ubicación de entrada del almacén."
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Cantidad prevista para salir en el período seleccionado. Diferencia entre "
-#~ "las salidas previstas y las salidas confirmadas. Para el periodo actual "
-#~ "también se calculan las salidas realizadas."
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Unidad de medida utilizada para mostrar las cantidades calculadas de stock. "
-#~ "Puede utilizar las unidades de la categoría por defecto o las de la segunda "
-#~ "categoría (categoría UdV)."
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Cantidad máxima establecida en las reglas de stock mínimo para este almacén."
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Periodos de stock y ventas"
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Cantidad mínima establecida en las reglas de stock mínimo para este almacén."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas realizadas: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas planificadas: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas planificadas antes: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas previstas: "
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Entradas restante: "
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Entradas realizadas: "
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Entradas planificadas: "
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Periodos de planificación de stock y ventas"
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Lista de recogida "
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Almacén usado como origen en el movimiento de suministro creado por "
-#~ "'Suministrar desde otro almacén'."
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "MPS("
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "Marque esta opción para suministrar desde la ubicación stock del almacén de "
-#~ "suministro. Si no se marca, el suministro se realizará desde la ubicación de "
-#~ "salida del almacén de suministro. Utilizado en 'Suministrar desde otro "
-#~ "almacén' con un almacén de suministro."
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Albarán creado desde MPS por el usuario: "
-
-#~ msgid ""
-#~ "\n"
-#~ "This module is based on original OpenERP SA module stock_planning version "
-#~ "1.0 of the same name Master Procurement Schedule.\n"
-#~ "\n"
-#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
-#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
-#~ "\n"
-#~ "Terms used in the module:\n"
-#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
-#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-#~ "the Period.\n"
-#~ "- Stock Planning - is the quantity of products you plan to purchase or "
-#~ "produce for the Period.\n"
-#~ "\n"
-#~ "Because we have another module sale_forecast which uses terms \"Sales "
-#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-#~ "values. \n"
-#~ "\n"
-#~ "Activity with this module is divided to three steps:\n"
-#~ "- Creating Periods. Mandatory step.\n"
-#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
-#~ "useful for further planning.\n"
-#~ "- Creating Planning lines, entering quantities to them and making "
-#~ "Procurement. Making procurement is the final step for the Period.\n"
-#~ "\n"
-#~ "Periods\n"
-#~ "=======\n"
-#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
-#~ "There are:\n"
-#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-#~ "monthly periods.\n"
-#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-#~ "change the dates and change the State of period.\n"
-#~ "\n"
-#~ "Creating periods is the first step you have to do to use modules features. "
-#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
-#~ "Periods\" form or view but it is recommended to use automating tool.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- These periods (officially Stock and Sales Periods) are separated of "
-#~ "Financial or other periods in the system.\n"
-#~ "- Periods are not assigned to companies (when you use multicompany feature "
-#~ "at all). Module suppose that you use the same periods across companies. If "
-#~ "you wish to use different periods for different companies define them as you "
-#~ "wish (they can overlap). Later on in this text will be indications how to "
-#~ "use such periods.\n"
-#~ "- When periods are created automatically their start and finish dates are "
-#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
-#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-#~ "you create periods manually you have to take care about hours because you "
-#~ "can have incorrect values form sales or stock. \n"
-#~ "- If you use overlapping periods for the same product, warehouse and company "
-#~ "results can be unpredictable.\n"
-#~ "- If current date doesn't belong to any period or you have holes between "
-#~ "periods results can be unpredictable.\n"
-#~ "\n"
-#~ "Sales Forecasts\n"
-#~ "===============\n"
-#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
-#~ "Forecasts\".\n"
-#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-#~ "forecasts lines according to some parameters.\n"
-#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-#~ "forms.\n"
-#~ "\n"
-#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-#~ "products from selected Category, for selected Period and for selected "
-#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-#~ "settings of period before this one to created one.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
-#~ "Period, Warehouse and validated or created by you) already exists. If you "
-#~ "wish to create another forecast, if relevant lines exists you have to do it "
-#~ "manually using menus described bellow.\n"
-#~ "- When created lines are validated by someone else you can use this tool to "
-#~ "create another lines for the same Period, Product and Warehouse. \n"
-#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
-#~ "some settings from your (validated by you or created by you if not validated "
-#~ "yet) forecast which is for last period before period of created forecast. If "
-#~ "there are few your forecasts for period before this one (it is possible) "
-#~ "system takes one of them (no rule which of them).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menus \"Sales Forecasts\"\n"
-#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
-#~ "validation can save your data against any accidental changes. You can click "
-#~ "\"Validate\" button but it is not mandatory.\n"
-#~ "\n"
-#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
-#~ "\"Product Amount\". System will count quantity from amount according to Sale "
-#~ "price of the Product.\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
-#~ "for this product. You have to enter parameters to the top and left of this "
-#~ "table and system will count sale quantities according to these parameters. "
-#~ "So you can select fe. your department (at the top) then (to the left): last "
-#~ "period, period before last and period year ago.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "\n"
-#~ "\n"
-#~ "Procurement Planning\n"
-#~ "====================\n"
-#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-#~ "lines according to some parameters.\n"
-#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
-#~ "module which allows to create procurement.\n"
-#~ "\n"
-#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
-#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
-#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
-#~ "Planning Lines\", then you can review created planning and make procurement "
-#~ "using menu \"Master Procurement Schedule\".\n"
-#~ "\n"
-#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-#~ "lines for products from selected Category, for selected Period, and for "
-#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
-#~ "system creates lines for all products having forecast for selected Period "
-#~ "and Warehouse. Selected Category will be ignored in this case.\n"
-#~ "\n"
-#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
-#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-#~ "Simulation\" and decide if this value would be accurate for end of the "
-#~ "Period. \n"
-#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-#~ "all forecasts for Period and Warehouse. But your planning can be based on "
-#~ "any other information you have. It is not necessary to have any forecast. \n"
-#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-#~ "is the quantity to be procured to make stock as indicated in \"Stock "
-#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-#~ "quantity to minimum stock rules visible on the form. But you can plan "
-#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
-#~ "whole Warehouse by default. But if you want to see values for Stock location "
-#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
-#~ "\n"
-#~ "If after few tries you decide that you found correct quantities for "
-#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
-#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
-#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
-#~ "\n"
-#~ "\n"
-#~ "If you don't want to Produce or Buy the product but just pick calculated "
-#~ "quantity from another warehouse you can click \"Supply from Another "
-#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-#~ "with move from selected source Warehouse to calculated Warehouse (as "
-#~ "destination). You can also decide if this pick should be done from Stock or "
-#~ "Output location of source warehouse. Destination location (Stock or Input) "
-#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
-#~ "\n"
-#~ "\n"
-#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-#~ "have to click button \"Calculate Planning\".\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "How Stock Simulation field is calculated:\n"
-#~ "Generally Stock Simulation shows the stock for end of the calculated period "
-#~ "according to some planned or confirmed stock moves. Calculation always "
-#~ "starts with quantity of real stock of beginning of current period. Then "
-#~ "calculation adds or subtracts quantities of calculated period or periods "
-#~ "before calculated.\n"
-#~ "When you are in the same period (current period is the same as calculated) "
-#~ "Stock Simulation is calculated as follows:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out \n"
-#~ "\t+ Planned In\n"
-#~ "\n"
-#~ "When you calculate period next to current:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out of current Period \n"
-#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period .\n"
-#~ "\n"
-#~ "As you see calculated Period is taken the same way like in case above. But "
-#~ "calculation of current Period are made a little bit different. First you "
-#~ "should note that system takes for current Period only Confirmed In moves. It "
-#~ "means that you have to make planning and procurement for current Period "
-#~ "before this calculation (for Period next to current). \n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period \n"
-#~ "\t- Sum of Planned Out of Periods before calculated \n"
-#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period.\n"
-#~ "\n"
-#~ "Periods before calculated means periods starting from current till period "
-#~ "before calculated.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- Remember to make planning for all periods before calculated because "
-#~ "omitting these quantities and procurements can cause wrong suggestions for "
-#~ "procurements few periods ahead.\n"
-#~ "- If you made planning few periods ahead and you find that real Confirmed "
-#~ "Out is bigger than Planned Out in some periods before you can repeat "
-#~ "Planning and make another procurement. You should do it in the same planning "
-#~ "line. If you create another planning line the suggestions can be wrong.\n"
-#~ "- When you wish to work with different periods for some part of products "
-#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
-#~ "different products. Example: If you use always Weekly periods for Products "
-#~ "A, and Monthly periods for Products B your all calculations will work "
-#~ "correctly. You can also use different kind of periods for the same products "
-#~ "from different warehouse or companies. But you cannot use overlapping "
-#~ "periods for the same product, warehouse and company because results can be "
-#~ "unpredictable. The same apply to Forecasts lines.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo se basa en la versión original de OpenERP stock_planning SA "
-#~ "módulo 1.0 del mismo nombre Programador de Compras Maestras.\n"
-#~ "\n"
-#~ "El propósito de la MPS es permitir crear un manual de contratación "
-#~ "(solicitud), aparte del programador MRP (que funciona automáticamente, "
-#~ "basándose en reglas de existencias mínimas).\n"
-#~ "\n"
-#~ "Los términos utilizados en el módulo:\n"
-#~ "- Stock y Período de ventas - es el tiempo (entre Fecha de inicio y Fecha de "
-#~ "finalización) para el que planifica el Stock y la Previsión de Ventas y hace "
-#~ "la Planificación de las Compras.\n"
-#~ "- Stock y pronóstico de ventas - es la cantidad de productos que planea "
-#~ "vender en el Período.\n"
-#~ "- Planificación de Stock - es la cantidad de productos que planea comprar o "
-#~ "producir para el Período.\n"
-#~ "\n"
-#~ "Porque tenemos otra módulo sale_forecast que utiliza los términos "
-#~ "\"Pronóstico de Ventas\" y \"Planificación\" como valores de cantidad, "
-#~ "utilizaremos términos \"Stock y Pronóstico de Ventas\" y \"Planificación del "
-#~ "Stock\" para hacer hincapié en que usamos los valores de cantidad.\n"
-#~ "\n"
-#~ "La actividad con este módulo se divide en tres pasos:\n"
-#~ "- Creación de Períodos. Paso obligatorio.\n"
-#~ "- Creación de Pronósticos de Venta e introducción de sus cantidades. Un paso "
-#~ "opcional pero útil para una mayor planificación.\n"
-#~ "- Creación de líneas de Planificación, introducción de sus cantidades y "
-#~ "hacer Adquisiciones. Hacer compras es el paso final para el Período.\n"
-#~ "\n"
-#~ "Períodos\n"
-#~ "=========\n"
-#~ "Tiene dos opciones de menú para Períodos en \"Gestión de Ventas - "
-#~ "Configuración\". Son las siguientes:\n"
-#~ "- \"Crear los Períodos de Ventas\" - Que automatiza la creación de periodos "
-#~ "diarios, semanales o mensuales.\n"
-#~ "- \"Stock y Períodos de ventas\" - Que permite crear cualquier tipo de "
-#~ "períodos, el cambio de las fechas y el cambio del Estado del período.\n"
-#~ "\n"
-#~ "Creación de periodos es el primer paso que tiene que hacer para utilizar las "
-#~ "funciones de los módulos. Puede crear períodos personalizados mediante el "
-#~ "botón \"Nuevo\" en el formulario o vista de \"Stock y Períodos de Ventas\", "
-#~ "pero se recomienda utilizar la herramienta automática.\n"
-#~ "\n"
-#~ "Observaciones:\n"
-#~ "- Estos períodos (Stock oficial y Períodos de Ventas) están separan de "
-#~ "Finanzas o de otros períodos en el sistema.\n"
-#~ "- Los Períodos no se asignan a las compañías (en ningún caso cuando se "
-#~ "utiliza la función multicompañía). El módulo supone que utiliza los mismos "
-#~ "períodos a través de las compañías. Si desea utilizar períodos diferentes "
-#~ "para diferentes compañías defínalos a su gusto (pueden solaparse). Más "
-#~ "adelante en este texto se indica cómo utilizar esos períodos.\n"
-#~ "- Cuando los períodos son creados automáticamente sus fechas de inicio y "
-#~ "final se inician con la hora 00:00:00 y 23:59:00 como hora final. Pe.cuando "
-#~ "crea períodos diarios tendrán fecha de inicio 01.31.2010 00:00:00 y fecha de "
-#~ "finalización 01.31.2010 23:59:00. Funciona sólo en la creación automática de "
-#~ "los períodos. Cuando crea períodos manualmente hay que tener cuidado con las "
-#~ "horas, ya que puede tener valores incorrectos en ventas y stock.\n"
-#~ "- Si utiliza períodos solapados para el mismo producto, almacén y compañía, "
-#~ "los resultados pueden ser impredecibles.\n"
-#~ "- Si la fecha actual no pertenece a ningún período o si tiene agujeros entre "
-#~ "los períodos los resultados pueden ser impredecibles.\n"
-#~ "\n"
-#~ "Previsión de ventas\n"
-#~ "====================\n"
-#~ "Tiene menús pocas ventas previsto en \"Gestión de Ventas - Pronósticos de "
-#~ "Ventas\".\n"
-#~ "- \"Creación de Pronósticos de Ventas para los Períodos de Ventas\" - que "
-#~ "automatiza la creación de líneas de previsiones de acuerdo con algunos "
-#~ "parámetros.\n"
-#~ "- \"Las Previsiones de Ventas\" - algunos menús para trabajar con listas de "
-#~ "las previsiones y las formas.\n"
-#~ "\n"
-#~ "Menú \"Crear Pronósticos de Ventas para Períodos de Ventas\" crea "
-#~ "Pronósticos para los productos de la Categoría seleccionada, para el Período "
-#~ "y Almacén seleccionado. Es una opción \"Copia del Último Pronóstico\" para "
-#~ "copiar previsiones y otros ajustes del período anterior a éste para crear "
-#~ "uno.\n"
-#~ "\n"
-#~ "Observaciones:\n"
-#~ "- Esta herramienta no crea líneas, si las líneas oportunas (para el mismo "
-#~ "Producto, Período y Almacén, y validado o creado por usted) ya existen. Si "
-#~ "desea crear otro pronóstico, si las líneas pertinentes existen tiene que "
-#~ "hacerlo manualmente usando los menús que se describen a continuación.\n"
-#~ "- Cuando las líneas se crean son validadas por otra persona que puede "
-#~ "utilizar esta herramienta para crear otras líneas para el mismo Período, "
-#~ "Producto y Almacén.\n"
-#~ "- Cuando se elige \"Copiar Último Pronóstico\" la línea creada tiene la "
-#~ "cantidad y algunos ajustes de su (validado o creadas por usted, si no se ha "
-#~ "validado aún) pronostico que para el último período anterior al período de "
-#~ "la previsión creada. Si hay pocos pronósticos para el período anterior a "
-#~ "éste (es posible) el sistema toma una de ellos (no existe regla sobre "
-#~ "cual).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menús \"Previsión de Ventas\"\n"
-#~ "En el formulario \"Pronóstico de Ventas\" principalmente tiene que "
-#~ "introducir una cantidad prevista en la \"Cantidad de Producto\". Además del "
-#~ "cálculo puede funcionar para las previsiones borrador. Sin embargo, la "
-#~ "validación puede guardar sus datos contra cualquier cambio accidental. Puede "
-#~ "hacer clic en botón \"Validar\", pero no es obligatorio.\n"
-#~ "\n"
-#~ "En lugar de la cantidad prevista se puede introducir la cantidad de "
-#~ "previsión de ventas en el campo \"Cantidad de Producto\". El sistema contará "
-#~ "la cantidad en función del Precio de Venta del Producto.\n"
-#~ "\n"
-#~ "Todos los valores del formulario se expresan en la unidad de medida "
-#~ "seleccionada en el formulario. Usted puede seleccionar uno de la unidad de "
-#~ "medida de la categoría por defecto o de segunda categoría. Cuando se cambia "
-#~ "la unidad de medida las cantiades se volverán a calcular de acuerdo con la "
-#~ "nueva UoM: los valores editables (campos azules) inmediatamente, los campos "
-#~ "no editables después de hacer clic en el botón \"Calcular Planificación\".\n"
-#~ "\n"
-#~ "Para encontrar el valor adecuado para Pronóstico de Venta se puede utilizar "
-#~ "la tabla \"Historial de ventas\" para este producto. Tienes que introducir "
-#~ "los parámetros en la parte superior izquierda de esta tabla y el sistema "
-#~ "contará las vantidades venta de acuerdo con estos parámetros. Así que usted "
-#~ "puede seleccionar, pe. de su departamento (en la parte superior) y luego (a "
-#~ "la izquierda): el último período, el período anterior al último y el período "
-#~ "de hace un año.\n"
-#~ "\n"
-#~ "Observaciones:\n"
-#~ "\n"
-#~ "\n"
-#~ "Planificación de las compras\n"
-#~ "====================\n"
-#~ "Menú para la Planificación de lo que puedes encontrar en \"Almacén - "
-#~ "Planificación del Stock\".\n"
-#~ "- \"Crear archivo de Planificación Lines\" - le permite automatizar la "
-#~ "creación de líneas de planificación de acuerdo con algunos parámetros.\n"
-#~ "- \"Programador Maestro de Adquisiciones\" - es el menú más importante del "
-#~ "módulo que permite la creación de la contratación.\n"
-#~ "\n"
-#~ "Con arreglo a las previsiones de ventas, es la fase de planificación de "
-#~ "ventas. La Planificación de compras (planificación) es la fase de "
-#~ "programación de compras o de producción. Usted puede crear la planificación "
-#~ "de las compras rápidamente con la herramienta del menú \"Crear Líneas de "
-#~ "Planificación de Stock\", entonces puede revisar la planificación creada y "
-#~ "hacer compras usando el menú \"Lista Maestra de Adquisiciones\".\n"
-#~ "\n"
-#~ "Menú \"Crear Líneas de Planificación de Stock\" le permite crear rápidamente "
-#~ "las Líneas de Planificación de productos de la categoría seleccionada, en "
-#~ "determinados períodos, y para el almacén seleccionado. Al marcar la opción "
-#~ "\"Todos los productos con Pronóstico\" el sistema crea las líneas para todos "
-#~ "los productos que tiene previsto para el Período seleccionado y Almacén. La "
-#~ "Categoría seleccionada se tendrá en cuenta en este caso.\n"
-#~ "\n"
-#~ "Debajo del menú \"Programador Maestro de Adquisiciones\" por lo general, "
-#~ "puede cambiar los valores \"Salidas planificadas\" y \"Entradas "
-#~ "planificadas\" para observar el campo \"Simulación de Stock\" y decidir si "
-#~ "este valor es exacto para el final del período.\n"
-#~ "\"Planeado\" puede basarse en la \"Pronóstico de Almacén\", que es la suma "
-#~ "de todas las previsiones para el período y Almacén. Pero la planificación se "
-#~ "puede basar en cualquier otra información que usted tenga. No es necesario "
-#~ "tener ningún pronóstico.\n"
-#~ "\"Entradas planificadas\" la cantidad se utiliza para calcular el campo "
-#~ "\"Entradas Restantes\" que es la cantidad que falta por adquirir para "
-#~ "alcanzar el stock, como se indica en la \"Simulación de Stock\" al final del "
-#~ "período. Usted puede comparar la \"Simulación de Stock\" con las normas de "
-#~ "cantidad mínima de existencias visibles en el formulario. Pero puede planear "
-#~ "una cantidad diferente al de las Reglas Mínimas de Stock. El cálculo está "
-#~ "hecho para todo el almacén por defecto. Pero si usted quiere ver los valores "
-#~ "de la ubicación del stock del almacén calculado, puede utilizar la casilla "
-#~ "\"Sólo Ubicación del Stock\".\n"
-#~ "\n"
-#~ "Si después de varios intentos decide que las cantidades son correctas para "
-#~ "lo \"Salidas planificadas\" y lo \"Entradas planificadas\" y que está "
-#~ "satisfecho con el final de existencias del período calculado en la "
-#~ "\"Simulación del Stock\" puede hacer clic en \"Adquirir Entradas Restantes\" "
-#~ "para obtener la cantidad del campo \"Entradas Restantes\" en el Almacén. El "
-#~ "sistema crea la correspondiente Orden de Compras. Usted puede decidir si la "
-#~ "contratación se hará para el stock o para la ubicación de entrada del "
-#~ "Almacén calculado.\n"
-#~ "\n"
-#~ "Si no quieres Producir o Comprar el producto, pero sólo debes elegir la "
-#~ "cantidad calculada, desde otro almacén puede hacer clic en \"Suministro "
-#~ "desde Otro Almacén\" (en lugar de \"Adquirir Entradas Restantes\"). El "
-#~ "sistema crea la lista de selección desde el Almacén origen seleccionado "
-#~ "hasta el Almacén calculado (como destino). También puede decidir si esta "
-#~ "selección debe hacerse de almacén o la ubicación de salida del almacén de "
-#~ "origen. La ubicación de destino (almacén o entrada) del almacén de destino, "
-#~ "se utilizará como establecido para \"Adquirir Entradas Restantes\".\n"
-#~ "\n"
-#~ "Para ver las cantidades adecuadas en los campos \"Entrada Confirmada\", "
-#~ "\"Salida Confirmada\", \"Entrada Confirmada Antes\", \"Salidas planificadas "
-#~ "antes\" y \"Simulación de Stock\" tiene que hacer clic en el botón "
-#~ "\"Calcular Planificación\".\n"
-#~ "\n"
-#~ "Todos los valores en el formulario se expresan en la unidad de medida "
-#~ "seleccionada en el formulario. Usted puede seleccionar uno de la unidad de "
-#~ "medida de la categoría por defecto o de una segunda categoría. Cuando se "
-#~ "cambia la unidad de medida las cantidades se volverán a calcular de acuerdo "
-#~ "con UoM: los valores editables inmediatamente (campos azules), los campos no "
-#~ "editables después de hacer clic en el botón \"Calcular Planificación\".\n"
-#~ "\n"
-#~ "Cómo se calcula el campo Simulación del Stock:\n"
-#~ "Generalmente la Simulación del Stock muestra el stock al final período "
-#~ "calculado de acuerdo con algunos movimientos de stock previsto o confirmado. "
-#~ "El cálculo se inicia siempre con la cantidad de stock real del inicio del "
-#~ "período actual. Luego se calcula la suma o resta de las cantidades del "
-#~ "período o períodos antes calculados.\n"
-#~ "Cuando está en el mismo período (período actual es el mismo que el "
-#~ "calculado) la Simulación del Stock se calcula como sigue:\n"
-#~ "Simulación de Stock = \n"
-#~ "\t Stock inicial del período actual\n"
-#~ "\t - Salidas planificadas \n"
-#~ "\t + Entradas planificadas\n"
-#~ "\n"
-#~ "Cuando se calcula el período siguiente al actual:\n"
-#~ "Simulación del Stock = \n"
-#~ "\t Stock inicial del período actual \n"
-#~ "\t - Planificación de Salidas del Período actual\n"
-#~ "\t + Entradas Confirmadas en el Período actual (incl. las Entradas ya "
-#~ "existentes)\n"
-#~ "\t - Salidas planificadas del Período calculado \n"
-#~ "\t + Entradas planificadas en el Período calculado.\n"
-#~ "\n"
-#~ "Como puede ver el período calculado se toma de la misma forma que en el caso "
-#~ "anterior. Sin embargo, el cálculo del período actual se hace de manera un "
-#~ "poco diferente. En primer lugar debe tener en cuenta que el sistema tiene "
-#~ "para el Período actual sólo Confirmados los movimientos de entrada. Esto "
-#~ "significa que tiene que hacer la planificación y la compra para Período "
-#~ "actual antes de este cálculo (para el Próximo período al actual).\n"
-#~ "\n"
-#~ "Cuando se calcula el período siguiente:\n"
-#~ "Colección de simulación = \n"
-#~ "\t Stock inicial del Período actual \n"
-#~ "\t - Suma de Planificación de salida de los períodos antes calculados \n"
-#~ "\t + Suma de Confirmados En períodos anteriores calculados (incl. las "
-#~ "entradas ya existentes) \n"
-#~ "\t - Salidas Planificadas del Período calculado \n"
-#~ "\t + Entradas Planificadas del Período calculado.\n"
-#~ "\n"
-#~ "Los períodos anteriores calculados, significa que los períodos comienzados "
-#~ "en el actual hasta el período antes calculado.\n"
-#~ "\n"
-#~ "Observaciones:\n"
-#~ "- Recuerde hacer la planificación para todos los períodos antes calculados "
-#~ "debido a omitir estas cantidades y las adquisiciones pueden causar "
-#~ "sugerencias erróneas para las compras de algunos períodos posteriores.\n"
-#~ "- Si ha realizado la planificación de unos pocos períodos posteriores y "
-#~ "encuentra que las Salidas Confirmadas reales son mayores de lo previsto en "
-#~ "algunos períodos antes de que pueda repetirse la Planificación y realizar "
-#~ "otra adquisición. Debe hacerlo en la misma línea de la planificación. Si se "
-#~ "crea otra línea de planificación de sugerencias puede estar equivocada.\n"
-#~ "- Cuando desea trabajar con diferentes períodos para una parte de los "
-#~ "productos, defina dos tipos de períodos (pe. semanal y mensual) y los "
-#~ "utilícelos para diferentes productos. Ejemplo: si utiliza siempre los "
-#~ "períodos semanales para los productos A, y los períodos mensuales de los "
-#~ "productos B todos sus cálculos funcionarán correctamente. También puede "
-#~ "utilizar diferentes tipos de períodos para los mismos productos de "
-#~ "diferentes almacenes de diferentes compañías. Pero no se pueden utilizar "
-#~ "períodos solapados para el mismo producto de un almacén, y compañía porque "
-#~ "los resultados pueden ser impredecibles. Lo mismo se aplica a las líneas de "
-#~ "Previsiones.\n"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre del modelo inválido en la definición de acción."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/stock_planning/i18n/es_CL.po b/addons/stock_planning/i18n/es_CL.po
deleted file mode 100644
index adb36196647..00000000000
--- a/addons/stock_planning/i18n/es_CL.po
+++ /dev/null
@@ -1,1924 +0,0 @@
-# Spanish (Chile) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-10-24 20:18+0000\n"
-"Last-Translator: Francisco Reyes Acuña <Unknown>\n"
-"Language-Team: Spanish (Chile) <es_CL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"¡No hay previsiones para el periodo seleccionado o no hay productos en la "
-"categoría seleccionada!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Marque esta opción para calcular el stock sólo de la ubicación stock del "
-"almacén seleccionado. Si no se marca, el cálculo se realiza para las "
-"ubicaciones de entrada, stock y salida del almacén."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Regla máximo"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Valor de la previsión que será convertido en cantidad de producto en función "
-"de precios."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "¡Entradas restantes debe ser mayor que 0!"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Salidas planificadas en periodos anteriores al calculado. Entre la fecha de "
-"inicio del periodo actual y un día antes del comienzo del periodo calculado."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Almacén al que conciernen las previsiones. Si durante la planificación de "
-"stock necesita previsiones de ventas para todos los almacenes escoja ahora "
-"un almacén cualquiera."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Salidas previstas"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Entradas restantes"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Crear líneas de previsiones"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr "Cantidades de todas las salidas confirmadas en el periodo calculado."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Crear periodos diarios"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Todas las previsiones de ventas para el almacén seleccionado del producto "
-"seleccionado durante el periodo seleccionado."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Indicadores de reglas de stock mínimo"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Periodo al que conciernen las previsiones."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Sólo ubicaciones de stock"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-"Cantidades que ya se enviaron fuera de este almacén en el período actual."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Entradas confirmadas"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Situación del periodo actual"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Crear períodos mensuales"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.periodo.crearlíneas"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Salidas planificadas antes"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Todos los productos con previsión"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Periodos :"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-"Cantidades que ya han sido recogidas en este almacén en el periodo actual."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "¡No hay productos en la categoría seleccionada!"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Previsiones de stock y ventas"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.ventas.prevision"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Entradas planificadas"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Simulación de stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planificación.crearlíneas"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Entradas confirmadas en periodos anteriores al calculado (incluyendo las "
-"entradas realizadas). Entre la fecha de inicio del periodo actual y un día "
-"antes del comienzo del periodo calculado."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Buscar previsiones de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "El periodo de este usuario5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-"Historial de abastecimiento o suministro interno de esta línea de "
-"planificación."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Todas las previsiones para la compañía entera (para todos los almacenes) del "
-"producto seleccionado durante el periodo seleccionado."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "El periodo de este usuario1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "El periodo de este usuario3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Planificación de stock"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Regla de mínimos"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Entradas abastecimiento restante"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Crear"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Plan maestro de abastecimiento"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Pasado/Futuro"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "Categoría de los productos cuyas previsiones se crearán."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "periodo stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.venta.previsión.crearlíneas"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Simulación de stock al final del período seleccionado.\n"
-" Para el periodo actual es: \n"
-"Stock inicial – salidas + entradas – salidas previstas + entradas "
-"esperadas.\n"
-" Para los siguientes periodos es: \n"
-"Stock inicial – salidas previstas anteriores + entradas anteriores – salidas "
-"previstas + entradas previstas."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Seleccione esta casilla para ver las ventas de todda la compañía."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Por departamento:"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Entradas antes"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "¡ Error !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Este usuario"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Previsiones"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Abastecer desde otro almacén"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Calcular planificación"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Cantidad stock un día antes del periodo actual."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Crear periodos semanales"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Simulación calculada del periodo"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Este periodo de usuario4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Periodo de stock y ventas"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Previsión de la compañía"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Por usuario :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Almacén que se referirá la planificación"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Creado/Validado por"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Previsión almacen"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"¡Debe especificar un almacén de origen diferente del almacén calculado (de "
-"destino)!"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "El periodo de esta compañía5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "UdM del producto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "El periodo de esta compañía2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "El periodo de esta compañía3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Fecha de inicio"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "El periodo de este usuario2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Previsiones validadas"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"Se creará la planificación para los productos de la categoría de productos "
-"seleccionada con este campo. Este campo se ignora cuando se marca la opción "
-"\"Todas las previsiones de productos”."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Salidas planificadas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Previsión"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Cerrada"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Almacén "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Planificación y situación para el periodo calculado"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Introduzca la cantidad saliente planificada para el almacén seleccionado "
-"durante el periodo seleccionado y para el producto seleccionado. Para "
-"planificar este valor puede fijarse en las salidas confirmadas o las "
-"previsiones de ventas. Este valor debería ser igual o superior a las salidas "
-"confirmadas."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Suministro interno"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr "%s Lista de selección %s (%s, %s) %s %s \n"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Crear previsiones de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Periodo4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Nombre del período"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Periodo2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Periodo3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Periodo1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Salidas confirmadas"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Crear líneas de planificación de stock"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Información General"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Previsión de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Peridodo de este almacen1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Almacén origen"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Ubicación suministro de stock"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Fecha de fin para el periodo planificado."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Marque esta opción para crear la planificación de todos los productos que "
-"tengan cualquier previsión en el almacén y periodo seleccionado. El campo "
-"categoría de producto será ignorado."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr "Copy text \t MPS(%s) %s"
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Entradas realizadas"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Categoría UdM producto"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Período"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Categoría UdV producto"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "UdM activa"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Buscar planificación de stock"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Copiar última previsión"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Muestra a qué producto concierne esta previsión"
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Listo"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Periodos"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Validado"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Copiar cantidades desde el stock pasado y previsión de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "El periodo de este depto.1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "El periodo de este depto.3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "El periodo de este depto.2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "El periodo de este depto.5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "El periodo de este depto.4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "El periodo de este almacén2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "El periodo de este almacén3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "UdM por defecto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "El periodo de este almacén4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "El periodo de este almacén5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Actual"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planificación"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Muestra a qué almacén concierne esta previsión. Si durante la planificación "
-"de stock necesita previsiones de ventas para todos los almacenes escoja "
-"ahora un almacén cualquiera."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Por compañía"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Introducir la cantidad que (por su plan) debe entrar. Cambie este valor y "
-"observe la simulación de stock. Este valor debería ser igual o superior a "
-"las entradas confirmadas."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "El periodo de esta compañía4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Periodo al cual concierne la planificación"
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Salidas realizadas"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Producto para el que ha sido creada esta planificación."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Por almacén :"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Histórico abastecimientos"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Fecha inicial para el periodo planificado."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Stock"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-"Cantidades de todas las entradas confirmadas en el periodo calculado."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Fecha de término"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "No solicitar"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Muestra a que periodo concierne esta previsión."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Previsiones de ventas"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Categoría del producto"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "¡Debe especificar un almacén de origen!"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Abastecimiento a ubicación stock"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Aprobar"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-"Periodo para esta planificación. Se creará una solicitud al principio del "
-"periodo."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Stock inicial"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Cantidad de producto"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Marcar para usar sólo las previsiones validadas. Si no se marca el sistema "
-"usa las previsiones validadas y borrador."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Periodo5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Este almacén"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Muestra quién creó esta previsión, o quién la validó."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Cantidad restante de la cantidad entrante planificada. Se calcula mediante "
-"la diferencia entre las entradas planificadas y las entradas confirmadas. "
-"Para el periodo actual las entradas realizadas también se calculan. Este "
-"valor se usa para crear abastecimientos para la cantidad faltante."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Calcular historial de ventas"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Esta compañía período1"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Stock inicial: "
-
-#~ msgid "Requisition history"
-#~ msgstr "Historial demandas"
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Almacén usado como origen en el movimiento de suministro creado por "
-#~ "'Suministrar desde otro almacén'."
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Marque esta opción para realizar los abastecimientos en la ubicación stock "
-#~ "del almacén seleccionado. Si no se marca, el abastecimiento se realizará en "
-#~ "la ubicación de entrada del almacén."
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Crear periodos de stock y ventas"
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Entradas confirmadas antes: "
-
-#~ msgid "This Department"
-#~ msgstr "Este departamento"
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Entradas restante: "
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Fecha de creación: "
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Cantidad máxima establecida en las reglas de stock mínimo para este almacén."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas confirmadas: "
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Unidad de medida utilizada para mostrar las cantidades calculadas de stock. "
-#~ "Puede utilizar las unidades de la categoría por defecto o las de la segunda "
-#~ "categoría (categoría UdV)."
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr ""
-#~ "Crea líneas de planificación para el periodo y almacén seleccionados."
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Nota: No duplica las líneas creadas por usted."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas realizadas: "
-
-#~ msgid ""
-#~ "\n"
-#~ "This module is based on original OpenERP SA module stock_planning version "
-#~ "1.0 of the same name Master Procurement Schedule.\n"
-#~ "\n"
-#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
-#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
-#~ "\n"
-#~ "Terms used in the module:\n"
-#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
-#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-#~ "the Period.\n"
-#~ "- Stock Planning - is the quantity of products you plan to purchase or "
-#~ "produce for the Period.\n"
-#~ "\n"
-#~ "Because we have another module sale_forecast which uses terms \"Sales "
-#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-#~ "values. \n"
-#~ "\n"
-#~ "Activity with this module is divided to three steps:\n"
-#~ "- Creating Periods. Mandatory step.\n"
-#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
-#~ "useful for further planning.\n"
-#~ "- Creating Planning lines, entering quantities to them and making "
-#~ "Procurement. Making procurement is the final step for the Period.\n"
-#~ "\n"
-#~ "Periods\n"
-#~ "=======\n"
-#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
-#~ "There are:\n"
-#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-#~ "monthly periods.\n"
-#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-#~ "change the dates and change the State of period.\n"
-#~ "\n"
-#~ "Creating periods is the first step you have to do to use modules features. "
-#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
-#~ "Periods\" form or view but it is recommended to use automating tool.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- These periods (officially Stock and Sales Periods) are separated of "
-#~ "Financial or other periods in the system.\n"
-#~ "- Periods are not assigned to companies (when you use multicompany feature "
-#~ "at all). Module suppose that you use the same periods across companies. If "
-#~ "you wish to use different periods for different companies define them as you "
-#~ "wish (they can overlap). Later on in this text will be indications how to "
-#~ "use such periods.\n"
-#~ "- When periods are created automatically their start and finish dates are "
-#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
-#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-#~ "you create periods manually you have to take care about hours because you "
-#~ "can have incorrect values form sales or stock. \n"
-#~ "- If you use overlapping periods for the same product, warehouse and company "
-#~ "results can be unpredictable.\n"
-#~ "- If current date doesn't belong to any period or you have holes between "
-#~ "periods results can be unpredictable.\n"
-#~ "\n"
-#~ "Sales Forecasts\n"
-#~ "===============\n"
-#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
-#~ "Forecasts\".\n"
-#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-#~ "forecasts lines according to some parameters.\n"
-#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-#~ "forms.\n"
-#~ "\n"
-#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-#~ "products from selected Category, for selected Period and for selected "
-#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-#~ "settings of period before this one to created one.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
-#~ "Period, Warehouse and validated or created by you) already exists. If you "
-#~ "wish to create another forecast, if relevant lines exists you have to do it "
-#~ "manually using menus described bellow.\n"
-#~ "- When created lines are validated by someone else you can use this tool to "
-#~ "create another lines for the same Period, Product and Warehouse. \n"
-#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
-#~ "some settings from your (validated by you or created by you if not validated "
-#~ "yet) forecast which is for last period before period of created forecast. If "
-#~ "there are few your forecasts for period before this one (it is possible) "
-#~ "system takes one of them (no rule which of them).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menus \"Sales Forecasts\"\n"
-#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
-#~ "validation can save your data against any accidental changes. You can click "
-#~ "\"Validate\" button but it is not mandatory.\n"
-#~ "\n"
-#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
-#~ "\"Product Amount\". System will count quantity from amount according to Sale "
-#~ "price of the Product.\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
-#~ "for this product. You have to enter parameters to the top and left of this "
-#~ "table and system will count sale quantities according to these parameters. "
-#~ "So you can select fe. your department (at the top) then (to the left): last "
-#~ "period, period before last and period year ago.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "\n"
-#~ "\n"
-#~ "Procurement Planning\n"
-#~ "====================\n"
-#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-#~ "lines according to some parameters.\n"
-#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
-#~ "module which allows to create procurement.\n"
-#~ "\n"
-#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
-#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
-#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
-#~ "Planning Lines\", then you can review created planning and make procurement "
-#~ "using menu \"Master Procurement Schedule\".\n"
-#~ "\n"
-#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-#~ "lines for products from selected Category, for selected Period, and for "
-#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
-#~ "system creates lines for all products having forecast for selected Period "
-#~ "and Warehouse. Selected Category will be ignored in this case.\n"
-#~ "\n"
-#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
-#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-#~ "Simulation\" and decide if this value would be accurate for end of the "
-#~ "Period. \n"
-#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-#~ "all forecasts for Period and Warehouse. But your planning can be based on "
-#~ "any other information you have. It is not necessary to have any forecast. \n"
-#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-#~ "is the quantity to be procured to make stock as indicated in \"Stock "
-#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-#~ "quantity to minimum stock rules visible on the form. But you can plan "
-#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
-#~ "whole Warehouse by default. But if you want to see values for Stock location "
-#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
-#~ "\n"
-#~ "If after few tries you decide that you found correct quantities for "
-#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
-#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
-#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
-#~ "\n"
-#~ "\n"
-#~ "If you don't want to Produce or Buy the product but just pick calculated "
-#~ "quantity from another warehouse you can click \"Supply from Another "
-#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-#~ "with move from selected source Warehouse to calculated Warehouse (as "
-#~ "destination). You can also decide if this pick should be done from Stock or "
-#~ "Output location of source warehouse. Destination location (Stock or Input) "
-#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
-#~ "\n"
-#~ "\n"
-#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-#~ "have to click button \"Calculate Planning\".\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "How Stock Simulation field is calculated:\n"
-#~ "Generally Stock Simulation shows the stock for end of the calculated period "
-#~ "according to some planned or confirmed stock moves. Calculation always "
-#~ "starts with quantity of real stock of beginning of current period. Then "
-#~ "calculation adds or subtracts quantities of calculated period or periods "
-#~ "before calculated.\n"
-#~ "When you are in the same period (current period is the same as calculated) "
-#~ "Stock Simulation is calculated as follows:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out \n"
-#~ "\t+ Planned In\n"
-#~ "\n"
-#~ "When you calculate period next to current:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out of current Period \n"
-#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period .\n"
-#~ "\n"
-#~ "As you see calculated Period is taken the same way like in case above. But "
-#~ "calculation of current Period are made a little bit different. First you "
-#~ "should note that system takes for current Period only Confirmed In moves. It "
-#~ "means that you have to make planning and procurement for current Period "
-#~ "before this calculation (for Period next to current). \n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period \n"
-#~ "\t- Sum of Planned Out of Periods before calculated \n"
-#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period.\n"
-#~ "\n"
-#~ "Periods before calculated means periods starting from current till period "
-#~ "before calculated.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- Remember to make planning for all periods before calculated because "
-#~ "omitting these quantities and procurements can cause wrong suggestions for "
-#~ "procurements few periods ahead.\n"
-#~ "- If you made planning few periods ahead and you find that real Confirmed "
-#~ "Out is bigger than Planned Out in some periods before you can repeat "
-#~ "Planning and make another procurement. You should do it in the same planning "
-#~ "line. If you create another planning line the suggestions can be wrong.\n"
-#~ "- When you wish to work with different periods for some part of products "
-#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
-#~ "different products. Example: If you use always Weekly periods for Products "
-#~ "A, and Monthly periods for Products B your all calculations will work "
-#~ "correctly. You can also use different kind of periods for the same products "
-#~ "from different warehouse or companies. But you cannot use overlapping "
-#~ "periods for the same product, warehouse and company because results can be "
-#~ "unpredictable. The same apply to Forecasts lines.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo se basa en la versión original de OpenERP stock_planning SA "
-#~ "módulo 1.0 del mismo nombre Programador de Compras Maestras.\n"
-#~ "\n"
-#~ "El propósito de la MPS es permitir crear un manual de contratación "
-#~ "(solicitud), aparte del programador MRP (que funciona automáticamente, "
-#~ "basándose en reglas de existencias mínimas).\n"
-#~ "\n"
-#~ "Los términos utilizados en el módulo:\n"
-#~ "- Stock y Período de ventas - es el tiempo (entre Fecha de inicio y Fecha de "
-#~ "finalización) para el que planifica el Stock y la Previsión de Ventas y hace "
-#~ "la Planificación de las Compras.\n"
-#~ "- Stock y pronóstico de ventas - es la cantidad de productos que planea "
-#~ "vender en el Período.\n"
-#~ "- Planificación de Stock - es la cantidad de productos que planea comprar o "
-#~ "producir para el Período.\n"
-#~ "\n"
-#~ "Porque tenemos otra módulo sale_forecast que utiliza los términos "
-#~ "\"Pronóstico de Ventas\" y \"Planificación\" como valores de cantidad, "
-#~ "utilizaremos términos \"Stock y Pronóstico de Ventas\" y \"Planificación del "
-#~ "Stock\" para hacer hincapié en que usamos los valores de cantidad.\n"
-#~ "\n"
-#~ "La actividad con este módulo se divide en tres pasos:\n"
-#~ "- Creación de Períodos. Paso obligatorio.\n"
-#~ "- Creación de Pronósticos de Venta e introducción de sus cantidades. Un paso "
-#~ "opcional pero útil para una mayor planificación.\n"
-#~ "- Creación de líneas de Planificación, introducción de sus cantidades y "
-#~ "hacer Adquisiciones. Hacer compras es el paso final para el Período.\n"
-#~ "\n"
-#~ "Períodos\n"
-#~ "=========\n"
-#~ "Tiene dos opciones de menú para Períodos en \"Gestión de Ventas - "
-#~ "Configuración\". Son las siguientes:\n"
-#~ "- \"Crear los Períodos de Ventas\" - Que automatiza la creación de periodos "
-#~ "diarios, semanales o mensuales.\n"
-#~ "- \"Stock y Períodos de ventas\" - Que permite crear cualquier tipo de "
-#~ "períodos, el cambio de las fechas y el cambio del Estado del período.\n"
-#~ "\n"
-#~ "Creación de periodos es el primer paso que tiene que hacer para utilizar las "
-#~ "funciones de los módulos. Puede crear períodos personalizados mediante el "
-#~ "botón \"Nuevo\" en el formulario o vista de \"Stock y Períodos de Ventas\", "
-#~ "pero se recomienda utilizar la herramienta automática.\n"
-#~ "\n"
-#~ "Observaciones:\n"
-#~ "- Estos períodos (Stock oficial y Períodos de Ventas) están separan de "
-#~ "Finanzas o de otros períodos en el sistema.\n"
-#~ "- Los Períodos no se asignan a las compañías (en ningún caso cuando se "
-#~ "utiliza la función multicompañía). El módulo supone que utiliza los mismos "
-#~ "períodos a través de las compañías. Si desea utilizar períodos diferentes "
-#~ "para diferentes compañías defínalos a su gusto (pueden solaparse). Más "
-#~ "adelante en este texto se indica cómo utilizar esos períodos.\n"
-#~ "- Cuando los períodos son creados automáticamente sus fechas de inicio y "
-#~ "final se inician con la hora 00:00:00 y 23:59:00 como hora final. Pe.cuando "
-#~ "crea períodos diarios tendrán fecha de inicio 01.31.2010 00:00:00 y fecha de "
-#~ "finalización 01.31.2010 23:59:00. Funciona sólo en la creación automática de "
-#~ "los períodos. Cuando crea períodos manualmente hay que tener cuidado con las "
-#~ "horas, ya que puede tener valores incorrectos en ventas y stock.\n"
-#~ "- Si utiliza períodos solapados para el mismo producto, almacén y compañía, "
-#~ "los resultados pueden ser impredecibles.\n"
-#~ "- Si la fecha actual no pertenece a ningún período o si tiene agujeros entre "
-#~ "los períodos los resultados pueden ser impredecibles.\n"
-#~ "\n"
-#~ "Previsión de ventas\n"
-#~ "====================\n"
-#~ "Tiene menús pocas ventas previsto en \"Gestión de Ventas - Pronósticos de "
-#~ "Ventas\".\n"
-#~ "- \"Creación de Pronósticos de Ventas para los Períodos de Ventas\" - que "
-#~ "automatiza la creación de líneas de previsiones de acuerdo con algunos "
-#~ "parámetros.\n"
-#~ "- \"Las Previsiones de Ventas\" - algunos menús para trabajar con listas de "
-#~ "las previsiones y las formas.\n"
-#~ "\n"
-#~ "Menú \"Crear Pronósticos de Ventas para Períodos de Ventas\" crea "
-#~ "Pronósticos para los productos de la Categoría seleccionada, para el Período "
-#~ "y Almacén seleccionado. Es una opción \"Copia del Último Pronóstico\" para "
-#~ "copiar previsiones y otros ajustes del período anterior a éste para crear "
-#~ "uno.\n"
-#~ "\n"
-#~ "Observaciones:\n"
-#~ "- Esta herramienta no crea líneas, si las líneas oportunas (para el mismo "
-#~ "Producto, Período y Almacén, y validado o creado por usted) ya existen. Si "
-#~ "desea crear otro pronóstico, si las líneas pertinentes existen tiene que "
-#~ "hacerlo manualmente usando los menús que se describen a continuación.\n"
-#~ "- Cuando las líneas se crean son validadas por otra persona que puede "
-#~ "utilizar esta herramienta para crear otras líneas para el mismo Período, "
-#~ "Producto y Almacén.\n"
-#~ "- Cuando se elige \"Copiar Último Pronóstico\" la línea creada tiene la "
-#~ "cantidad y algunos ajustes de su (validado o creadas por usted, si no se ha "
-#~ "validado aún) pronostico que para el último período anterior al período de "
-#~ "la previsión creada. Si hay pocos pronósticos para el período anterior a "
-#~ "éste (es posible) el sistema toma una de ellos (no existe regla sobre "
-#~ "cual).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menús \"Previsión de Ventas\"\n"
-#~ "En el formulario \"Pronóstico de Ventas\" principalmente tiene que "
-#~ "introducir una cantidad prevista en la \"Cantidad de Producto\". Además del "
-#~ "cálculo puede funcionar para las previsiones borrador. Sin embargo, la "
-#~ "validación puede guardar sus datos contra cualquier cambio accidental. Puede "
-#~ "hacer clic en botón \"Validar\", pero no es obligatorio.\n"
-#~ "\n"
-#~ "En lugar de la cantidad prevista se puede introducir la cantidad de "
-#~ "previsión de ventas en el campo \"Cantidad de Producto\". El sistema contará "
-#~ "la cantidad en función del Precio de Venta del Producto.\n"
-#~ "\n"
-#~ "Todos los valores del formulario se expresan en la unidad de medida "
-#~ "seleccionada en el formulario. Usted puede seleccionar uno de la unidad de "
-#~ "medida de la categoría por defecto o de segunda categoría. Cuando se cambia "
-#~ "la unidad de medida las cantiades se volverán a calcular de acuerdo con la "
-#~ "nueva UoM: los valores editables (campos azules) inmediatamente, los campos "
-#~ "no editables después de hacer clic en el botón \"Calcular Planificación\".\n"
-#~ "\n"
-#~ "Para encontrar el valor adecuado para Pronóstico de Venta se puede utilizar "
-#~ "la tabla \"Historial de ventas\" para este producto. Tienes que introducir "
-#~ "los parámetros en la parte superior izquierda de esta tabla y el sistema "
-#~ "contará las vantidades venta de acuerdo con estos parámetros. Así que usted "
-#~ "puede seleccionar, pe. de su departamento (en la parte superior) y luego (a "
-#~ "la izquierda): el último período, el período anterior al último y el período "
-#~ "de hace un año.\n"
-#~ "\n"
-#~ "Observaciones:\n"
-#~ "\n"
-#~ "\n"
-#~ "Planificación de las compras\n"
-#~ "====================\n"
-#~ "Menú para la Planificación de lo que puedes encontrar en \"Almacén - "
-#~ "Planificación del Stock\".\n"
-#~ "- \"Crear archivo de Planificación Lines\" - le permite automatizar la "
-#~ "creación de líneas de planificación de acuerdo con algunos parámetros.\n"
-#~ "- \"Programador Maestro de Adquisiciones\" - es el menú más importante del "
-#~ "módulo que permite la creación de la contratación.\n"
-#~ "\n"
-#~ "Con arreglo a las previsiones de ventas, es la fase de planificación de "
-#~ "ventas. La Planificación de compras (planificación) es la fase de "
-#~ "programación de compras o de producción. Usted puede crear la planificación "
-#~ "de las compras rápidamente con la herramienta del menú \"Crear Líneas de "
-#~ "Planificación de Stock\", entonces puede revisar la planificación creada y "
-#~ "hacer compras usando el menú \"Lista Maestra de Adquisiciones\".\n"
-#~ "\n"
-#~ "Menú \"Crear Líneas de Planificación de Stock\" le permite crear rápidamente "
-#~ "las Líneas de Planificación de productos de la categoría seleccionada, en "
-#~ "determinados períodos, y para el almacén seleccionado. Al marcar la opción "
-#~ "\"Todos los productos con Pronóstico\" el sistema crea las líneas para todos "
-#~ "los productos que tiene previsto para el Período seleccionado y Almacén. La "
-#~ "Categoría seleccionada se tendrá en cuenta en este caso.\n"
-#~ "\n"
-#~ "Debajo del menú \"Programador Maestro de Adquisiciones\" por lo general, "
-#~ "puede cambiar los valores \"Salidas planificadas\" y \"Entradas "
-#~ "planificadas\" para observar el campo \"Simulación de Stock\" y decidir si "
-#~ "este valor es exacto para el final del período.\n"
-#~ "\"Planeado\" puede basarse en la \"Pronóstico de Almacén\", que es la suma "
-#~ "de todas las previsiones para el período y Almacén. Pero la planificación se "
-#~ "puede basar en cualquier otra información que usted tenga. No es necesario "
-#~ "tener ningún pronóstico.\n"
-#~ "\"Entradas planificadas\" la cantidad se utiliza para calcular el campo "
-#~ "\"Entradas Restantes\" que es la cantidad que falta por adquirir para "
-#~ "alcanzar el stock, como se indica en la \"Simulación de Stock\" al final del "
-#~ "período. Usted puede comparar la \"Simulación de Stock\" con las normas de "
-#~ "cantidad mínima de existencias visibles en el formulario. Pero puede planear "
-#~ "una cantidad diferente al de las Reglas Mínimas de Stock. El cálculo está "
-#~ "hecho para todo el almacén por defecto. Pero si usted quiere ver los valores "
-#~ "de la ubicación del stock del almacén calculado, puede utilizar la casilla "
-#~ "\"Sólo Ubicación del Stock\".\n"
-#~ "\n"
-#~ "Si después de varios intentos decide que las cantidades son correctas para "
-#~ "lo \"Salidas planificadas\" y lo \"Entradas planificadas\" y que está "
-#~ "satisfecho con el final de existencias del período calculado en la "
-#~ "\"Simulación del Stock\" puede hacer clic en \"Adquirir Entradas Restantes\" "
-#~ "para obtener la cantidad del campo \"Entradas Restantes\" en el Almacén. El "
-#~ "sistema crea la correspondiente Orden de Compras. Usted puede decidir si la "
-#~ "contratación se hará para el stock o para la ubicación de entrada del "
-#~ "Almacén calculado.\n"
-#~ "\n"
-#~ "Si no quieres Producir o Comprar el producto, pero sólo debes elegir la "
-#~ "cantidad calculada, desde otro almacén puede hacer clic en \"Suministro "
-#~ "desde Otro Almacén\" (en lugar de \"Adquirir Entradas Restantes\"). El "
-#~ "sistema crea la lista de selección desde el Almacén origen seleccionado "
-#~ "hasta el Almacén calculado (como destino). También puede decidir si esta "
-#~ "selección debe hacerse de almacén o la ubicación de salida del almacén de "
-#~ "origen. La ubicación de destino (almacén o entrada) del almacén de destino, "
-#~ "se utilizará como establecido para \"Adquirir Entradas Restantes\".\n"
-#~ "\n"
-#~ "Para ver las cantidades adecuadas en los campos \"Entrada Confirmada\", "
-#~ "\"Salida Confirmada\", \"Entrada Confirmada Antes\", \"Salidas planificadas "
-#~ "antes\" y \"Simulación de Stock\" tiene que hacer clic en el botón "
-#~ "\"Calcular Planificación\".\n"
-#~ "\n"
-#~ "Todos los valores en el formulario se expresan en la unidad de medida "
-#~ "seleccionada en el formulario. Usted puede seleccionar uno de la unidad de "
-#~ "medida de la categoría por defecto o de una segunda categoría. Cuando se "
-#~ "cambia la unidad de medida las cantidades se volverán a calcular de acuerdo "
-#~ "con UoM: los valores editables inmediatamente (campos azules), los campos no "
-#~ "editables después de hacer clic en el botón \"Calcular Planificación\".\n"
-#~ "\n"
-#~ "Cómo se calcula el campo Simulación del Stock:\n"
-#~ "Generalmente la Simulación del Stock muestra el stock al final período "
-#~ "calculado de acuerdo con algunos movimientos de stock previsto o confirmado. "
-#~ "El cálculo se inicia siempre con la cantidad de stock real del inicio del "
-#~ "período actual. Luego se calcula la suma o resta de las cantidades del "
-#~ "período o períodos antes calculados.\n"
-#~ "Cuando está en el mismo período (período actual es el mismo que el "
-#~ "calculado) la Simulación del Stock se calcula como sigue:\n"
-#~ "Simulación de Stock = \n"
-#~ "\t Stock inicial del período actual\n"
-#~ "\t - Salidas planificadas \n"
-#~ "\t + Entradas planificadas\n"
-#~ "\n"
-#~ "Cuando se calcula el período siguiente al actual:\n"
-#~ "Simulación del Stock = \n"
-#~ "\t Stock inicial del período actual \n"
-#~ "\t - Planificación de Salidas del Período actual\n"
-#~ "\t + Entradas Confirmadas en el Período actual (incl. las Entradas ya "
-#~ "existentes)\n"
-#~ "\t - Salidas planificadas del Período calculado \n"
-#~ "\t + Entradas planificadas en el Período calculado.\n"
-#~ "\n"
-#~ "Como puede ver el período calculado se toma de la misma forma que en el caso "
-#~ "anterior. Sin embargo, el cálculo del período actual se hace de manera un "
-#~ "poco diferente. En primer lugar debe tener en cuenta que el sistema tiene "
-#~ "para el Período actual sólo Confirmados los movimientos de entrada. Esto "
-#~ "significa que tiene que hacer la planificación y la compra para Período "
-#~ "actual antes de este cálculo (para el Próximo período al actual).\n"
-#~ "\n"
-#~ "Cuando se calcula el período siguiente:\n"
-#~ "Colección de simulación = \n"
-#~ "\t Stock inicial del Período actual \n"
-#~ "\t - Suma de Planificación de salida de los períodos antes calculados \n"
-#~ "\t + Suma de Confirmados En períodos anteriores calculados (incl. las "
-#~ "entradas ya existentes) \n"
-#~ "\t - Salidas Planificadas del Período calculado \n"
-#~ "\t + Entradas Planificadas del Período calculado.\n"
-#~ "\n"
-#~ "Los períodos anteriores calculados, significa que los períodos comienzados "
-#~ "en el actual hasta el período antes calculado.\n"
-#~ "\n"
-#~ "Observaciones:\n"
-#~ "- Recuerde hacer la planificación para todos los períodos antes calculados "
-#~ "debido a omitir estas cantidades y las adquisiciones pueden causar "
-#~ "sugerencias erróneas para las compras de algunos períodos posteriores.\n"
-#~ "- Si ha realizado la planificación de unos pocos períodos posteriores y "
-#~ "encuentra que las Salidas Confirmadas reales son mayores de lo previsto en "
-#~ "algunos períodos antes de que pueda repetirse la Planificación y realizar "
-#~ "otra adquisición. Debe hacerlo en la misma línea de la planificación. Si se "
-#~ "crea otra línea de planificación de sugerencias puede estar equivocada.\n"
-#~ "- Cuando desea trabajar con diferentes períodos para una parte de los "
-#~ "productos, defina dos tipos de períodos (pe. semanal y mensual) y los "
-#~ "utilícelos para diferentes productos. Ejemplo: si utiliza siempre los "
-#~ "períodos semanales para los productos A, y los períodos mensuales de los "
-#~ "productos B todos sus cálculos funcionarán correctamente. También puede "
-#~ "utilizar diferentes tipos de períodos para los mismos productos de "
-#~ "diferentes almacenes de diferentes compañías. Pero no se pueden utilizar "
-#~ "períodos solapados para el mismo producto de un almacén, y compañía porque "
-#~ "los resultados pueden ser impredecibles. Lo mismo se aplica a las líneas de "
-#~ "Previsiones.\n"
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Crear periodos para planificación de stock y ventas"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas previstas: "
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Entradas realizadas: "
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Cantidad prevista para salir en el período seleccionado. Diferencia entre "
-#~ "las salidas previstas y las salidas confirmadas. Para el periodo actual "
-#~ "también se calculan las salidas realizadas."
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr "Crear líneas de previsión para el almacén y periodo seleccionados."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas planificadas: "
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "¡ No se pueden borrar previsiones de ventas validadas !"
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Solicitud ("
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Stock mínimo: "
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Entradas confirmadas: "
-
-#~ msgid "Sales history"
-#~ msgstr "Histórico de ventas"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Cantidad prevista."
-
-#~ msgid "Product Quantity"
-#~ msgstr "Cantidad de producto"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " según el estado:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Previsión almacén: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Simulación de stock: "
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Entradas planificadas: "
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Cantidad mínima establecida en las reglas de stock mínimo para este almacén."
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "Marque esta opción para suministrar desde la ubicación stock del almacén de "
-#~ "suministro. Si no se marca, el suministro se realizará desde la ubicación de "
-#~ "salida del almacén de suministro. Utilizado en 'Suministrar desde otro "
-#~ "almacén' con un almacén de suministro."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Por periodo: "
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "MPS("
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Periodos de planificación de stock y ventas"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas planificadas antes: "
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Periodos de stock y ventas"
diff --git a/addons/stock_planning/i18n/es_CR.po b/addons/stock_planning/i18n/es_CR.po
deleted file mode 100644
index 295b2f20579..00000000000
--- a/addons/stock_planning/i18n/es_CR.po
+++ /dev/null
@@ -1,2024 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-22 22:27+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez.contreras@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-"Language: es\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"¡No hay previsiones para el periodo seleccionado o no hay productos en la "
-"categoría seleccionada!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Marque esta opción para calcular el stock sólo de la ubicación stock del "
-"almacén seleccionado. Si no se marca, el cálculo se realiza para las "
-"ubicaciones de entrada, stock y salida del almacén."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Regla máximo"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Valor de la previsión que será convertido en cantidad de producto en función "
-"de precios."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "¡Entradas restantes debe ser mayor que 0!"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Salidas planificadas en periodos anteriores al calculado. Entre la fecha de "
-"inicio del periodo actual y un día antes del comienzo del periodo calculado."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Almacén al que conciernen las previsiones. Si durante la planificación de "
-"stock necesita previsiones de ventas para todos los almacenes escoja ahora "
-"un almacén cualquiera."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Salidas previstas"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Entradas restantes"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Crear líneas de previsiones"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr "Cantidades de todas las salidas confirmadas en el periodo calculado."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Crear periodos diarios"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Todas las previsiones de ventas para el almacén seleccionado del producto "
-"seleccionado durante el periodo seleccionado."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Indicadores de reglas de stock mínimo"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Periodo al que conciernen las previsiones."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Sólo ubicaciones de stock"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-"Cantidades que ya se enviaron fuera de este almacén en el período actual."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Entradas confirmadas"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Situación del periodo actual"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-"Este asistente le ayuda con la creación de periodos de planificación de "
-"acciones. Estos períodos son independientes de los ejercicios económicos. Si "
-"necesita otros períodos de día, semana o mes base, también se puede añadir a "
-"continuación de forma manual."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Crear periodos mensuales"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.periodo.crearlíneas"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Salidas planificadas antes"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Todos los productos con previsión"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-"Cantidad máxima fijada en las Reglas mínimas para el archivo de almacenes"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Periodos :"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-"Verifique que las adquisiciones de valores a la ubicación del almacén "
-"seleccionado. Si no se selecciona la contratación se hará en el lugar de "
-"entrada del almacén."
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-"Cantidades que ya han sido recogidas en este almacén en el periodo actual."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "¡No hay productos en la categoría seleccionada!"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Previsiones de stock y ventas"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.ventas.prevision"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Entradas planificadas"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Simulación de stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planificación.crearlíneas"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Entradas confirmadas en periodos anteriores al calculado (incluyendo las "
-"entradas realizadas). Entre la fecha de inicio del periodo actual y un día "
-"antes del comienzo del periodo calculado."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Buscar previsiones de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "El periodo de este usuario5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-"Historial de abastecimiento o suministro interno de esta línea de "
-"planificación."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Todas las previsiones para la compañía entera (para todos los almacenes) del "
-"producto seleccionado durante el periodo seleccionado."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "El periodo de este usuario1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "El periodo de este usuario3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Planificación de stock"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Regla de mínimos"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Entradas abastecimiento restante"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Crear"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Plan maestro de abastecimiento"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Pasado/Futuro"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "Categoría de los productos cuyas previsiones se crearán."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "periodo stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.venta.previsión.crearlíneas"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Simulación de stock al final del período seleccionado.\n"
-" Para el periodo actual es: \n"
-"Stock inicial – salidas + entradas – salidas previstas + entradas "
-"esperadas.\n"
-" Para los siguientes periodos es: \n"
-"Stock inicial – salidas previstas anteriores + entradas anteriores – salidas "
-"previstas + entradas previstas."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Seleccione esta casilla para ver las ventas de todda la compañía."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Por departamento:"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Entradas antes"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-" Contratación creada por MPS para el usuario:% s Fecha de creación:% s\n"
-"  Para el periodo de:% s\n"
-"  acuerdo con el estado:\n"
-"  Pronóstico de almacén:% s\n"
-"  Stock inicial:% s\n"
-"  Planificación de salida:% s programa En: %s\n"
-"  Ya de salida:% s ya se encuentran en: %s\n"
-"  Confirmado salida:% s Confirmado En: %s\n"
-"  Planeado Antes:% s Confirmado En Antes: %s\n"
-"  Se espera de salida: Izquierda entrante%s : %s\n"
-"  Simulación de archivo: Stock mínimo de%s: %s"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "¡ Error !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Este usuario"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Previsiones"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Abastecer desde otro almacen"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Calcular planificación"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Cantidad stock un día antes del periodo actual."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr "Historia de Contratación"
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-"Unidad de medida utilizada para mostrar las cantidades de existencias "
-"calculation.You puede utilizar unidades de la categoría por defecto o de "
-"segunda categoría (categoría EES)."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Crear periodos semanales"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-"Períodos de archivo se utilizan para la planificación de acciones. Períodos "
-"de archivo son independientes de los períodos de la cuenta. Usted puede "
-"utilizar el asistente para la creación de periodos y revisar aquí."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Simulación calculada del periodo"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Este periodo de usuario4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Periodo de stock y ventas"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Previsión de la compañía"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-"La cantidad mínima establecida en las Reglas mínimas para el archivo de "
-"almacenes"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Por usuario :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Almacén que se referirá la planificación"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Creado/Validado por"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Previsión almacen"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"¡Debe especificar un almacén de origen diferente del almacén calculado (de "
-"destino)!"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr "¡No se puede eliminar una previsión de ventas validado!"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "El periodo de esta compañía5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "UdM de producto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr "Esta compañía periodo1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "El periodo de esta compañía2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "El periodo de esta compañía3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "El periodo de este usuario2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Previsiones validadas"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"Se creará la planificación para los productos de la categoría de productos "
-"seleccionada con este campo. Este campo se ignora cuando se marca la opción "
-"\"Todas las previsiones de productos”."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Salidas planificadas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr "Pronóstico de cantidad"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Previsión"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Cerrada"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Almacén "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-"Unidad de medida utilizada para mostrar las cantidades de existencias "
-"calculation.You puede utilizar unidades forman categoría por defecto o de "
-"segunda categoría (categoría EES)."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Planificación y situación para el periodo calculado"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Introduzca la cantidad saliente planificada para el almacén seleccionado "
-"durante el periodo seleccionado y para el producto seleccionado. Para "
-"planificar este valor puede fijarse en las salidas confirmadas o las "
-"previsiones de ventas. Este valor debería ser igual o superior a las salidas "
-"confirmadas."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr "Períodos actuales"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Suministro interno"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr "%s lista de selección%s (%s,%s)%s%s \n"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Crear previsiones de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Periodo4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Nombre del período"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Periodo2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Periodo3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Periodo1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-"Este asistente ayuda a crear líneas de MPS de planificación para un período "
-"determinado seleccionado y el almacén, por lo que no tiene que crearlos uno "
-"por uno. El asistente no duplicar líneas, si ya existen para esta selección."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Salidas confirmadas"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Crear líneas de planificación de stock"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Información general"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Previsión de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Peridodo de este almacen1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Almacén origen"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr "Pronóstico de cantidad del producto."
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Ubicación suministro de stock"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Fecha de fin para el periodo planificado."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Marque esta opción para crear la planificación de todos los productos que "
-"tengan cualquier previsión en el almacén y periodo seleccionado. El campo "
-"categoría de producto será ignorado."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr "MPS (%s)%s"
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Entradas realizadas"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Categoría UdM producto"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-"Esta previsión cantidad de ventas es una indicación de Stock Planner para "
-"hacer compras de forma manual o automática para complementar las "
-"adquisiciones. Puede utilizar la contratación manual con esta previsión, "
-"cuando algunos períodos son excepcionales para las reglas usuales de "
-"existencias mínimas."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-"El programa de adquisiciones maestro puede ser el principal motor para la "
-"reposición de almacén, o puede complementar la programación automática de "
-"planificación de necesidades (normas mínimas de derechos, etc.)\n"
-"Cada línea MPS le da una visión pre-computados de las cantidades que entran "
-"y salen de un determinado producto durante un período determinado archivo en "
-"un almacén determinado, sobre la base de los niveles de stock actuales y "
-"futuras,\n"
-"así como los movimientos de stock planificadas. Las cantidades previstas se "
-"puede modificar de forma manual, y cuando esté satisfecho con el resultado "
-"(simulado) la cantidad de archivo, puede desencadenar la adquisición de lo "
-"que falta para llegar a sus cantidades deseadas"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-"Elige creado a partir de MPS por el usuario:%s Fecha de creación:%s\n"
-"Para el periodo de:%s en función del estado:\n"
-"  Pronóstico de almacén:%s\n"
-"  Stock inicial:%s\n"
-"  Planificación de salida:%s programa En:%s\n"
-"  Ya de salida:%s ya se encuentran en:%s\n"
-"  Confirmado salida:% s Confirmado En:% s\n"
-"  Planeado Antes:% s Confirmado En Antes:% s\n"
-"  Se espera de salida: Izquierda entrante% s:% s\n"
-"  Simulación de archivo: Stock mínimo de% s:% s "
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Periodo"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Categoría UdV producto"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "UdM activa"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Buscar planificación de stock"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Copiar última previsión"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Muestra a qué producto concierne esta previsión"
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Hecho"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Periodos"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr "Crear períodos de stocks"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Validado"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Copiar cantidades desde el stock pasado y previsión de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "El periodo de este depto.1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "El periodo de este depto.3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "El periodo de este depto.2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "El periodo de este depto.5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "El periodo de este depto.4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "El periodo de este almacén2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "El periodo de este almacén3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-"Verifique que el suministro procedente de la ubicación de archivo de almacén "
-"de suministros. Si está desactivado el suministro se hará desde la ubicación "
-"de salida del almacén de suministros. Se utiliza en \"El suministro de otro "
-"almacén\" con almacén de suministros."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "UdM por defecto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "El periodo de este almacén4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "El periodo de este almacén5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Actual"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-"Almacén utilizado como fuente de suministro de selección se mueven creado "
-"por 'El suministro de otro almacén."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planificación"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Muestra a qué almacén concierne esta previsión. Si durante la planificación "
-"de stock necesita previsiones de ventas para todos los almacenes escoja "
-"ahora un almacén cualquiera."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr "%s Contratación(% s,% s)%s%s \n"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Por compañía"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Introducir la cantidad que (por su plan) debe entrar. Cambie este valor y "
-"observe la simulación de stock. Este valor debería ser igual o superior a "
-"las entradas confirmadas."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "El periodo de esta compañía4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Periodo al cual concierne la planificación"
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Salidas realizadas"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Producto para el que ha sido creada esta planificación."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Por almacén :"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Histórico abastecimientos"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Fecha inicial para el periodo planificado."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr "Periodos de Stock"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Stock"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-"Cantidades de todas las entradas confirmadas en el periodo calculado."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Núm. solicitud"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Muestra a que periodo concierne esta previsión."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr "Periodos cerrados"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Previsiones de ventas"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Categoría de producto"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "¡Debe especificar un almacén origen!"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Abastecimiento a ubicación stock"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Aprobar"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-"Periodo para esta planificación. Se creará una solicitud al principio del "
-"periodo."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr "MPS planeado para %s"
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Stock inicial"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Cantidad de producto"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Marcar para usar sólo las previsiones validadas. Si no se marca el sistema "
-"usa las previsiones validadas y borrador."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Periodo5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Este almacén"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Muestra quién creó esta previsión, o quién la validó."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr "Equipo de ventas"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Cantidad restante de la cantidad entrante planificada. Se calcula mediante "
-"la diferencia entre las entradas planificadas y las entradas confirmadas. "
-"Para el periodo actual las entradas realizadas también se calculan. Este "
-"valor se usa para crear abastecimientos para la cantidad faltante."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-"Cantidad esperada que en el período seleccionado, además de salida "
-"confirmada. Como diferencia entre planificado y confirmada de salida. Para "
-"el período actual ya de salida se calcula también"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Calcular historial de ventas"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-"Este asistente ayuda a crear muchas líneas de pronóstico a la vez. Después "
-"de su creación sólo tiene que rellenar las cantidades previstas. El "
-"asistente no duplicar la línea cuando otro existe para la misma selección."
-
-#~ msgid "Sales history"
-#~ msgstr "Histórico de ventas"
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Crear periodos de stock y ventas"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Stock inicial: "
-
-#~ msgid "Requisition history"
-#~ msgstr "Historial demandas"
-
-#~ msgid "This Department"
-#~ msgstr "Este departamento"
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Fecha de creación: "
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Nota: No duplica las líneas creadas por usted."
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr "Crear líneas de previsión para el almacén y periodo seleccionados."
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Cantidad prevista."
-
-#~ msgid "Product Quantity"
-#~ msgstr "Cantidad de producto"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " según el estado:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Previsión almacén: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Por periodo: "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Planificación manual para "
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr ""
-#~ "Crea líneas de planificación para el periodo y almacen seleccionados."
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "¡ No se pueden borrar previsiones de ventas validadas !"
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Crear periodos para planificación de stock y ventas"
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Stock mínimo: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Simulación de stock: "
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "Abastecimiento creado en MPS por el usuario: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas confirmadas: "
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Solicitud ("
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Entradas confirmadas: "
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Entradas confirmadas antes: "
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Esta compañía período1"
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Marque esta opción para realizar los abastecimientos en la ubicación stock "
-#~ "del almacén seleccionado. Si no se marca, el abastecimiento se realizará en "
-#~ "la ubicación de entrada del almacén."
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Cantidad prevista para salir en el período seleccionado. Diferencia entre "
-#~ "las salidas previstas y las salidas confirmadas. Para el periodo actual "
-#~ "también se calculan las salidas realizadas."
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Unidad de medida utilizada para mostrar las cantidades calculadas de stock. "
-#~ "Puede utilizar las unidades de la categoría por defecto o las de la segunda "
-#~ "categoría (categoría UdV)."
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Cantidad máxima establecida en las reglas de stock mínimo para este almacén."
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Periodos de stock y ventas"
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Cantidad mínima establecida en las reglas de stock mínimo para este almacén."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas realizadas: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas planificadas: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas planificadas antes: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Salidas previstas: "
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Entradas restante: "
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Entradas realizadas: "
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Entradas planificadas: "
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Periodos de planificación de stock y ventas"
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Lista de recogida "
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Almacén usado como origen en el movimiento de suministro creado por "
-#~ "'Suministrar desde otro almacén'."
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "MPS("
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "Marque esta opción para suministrar desde la ubicación stock del almacén de "
-#~ "suministro. Si no se marca, el suministro se realizará desde la ubicación de "
-#~ "salida del almacén de suministro. Utilizado en 'Suministrar desde otro "
-#~ "almacén' con un almacén de suministro."
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Albarán creado desde MPS por el usuario: "
-
-#~ msgid ""
-#~ "\n"
-#~ "This module is based on original OpenERP SA module stock_planning version "
-#~ "1.0 of the same name Master Procurement Schedule.\n"
-#~ "\n"
-#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
-#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
-#~ "\n"
-#~ "Terms used in the module:\n"
-#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
-#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-#~ "the Period.\n"
-#~ "- Stock Planning - is the quantity of products you plan to purchase or "
-#~ "produce for the Period.\n"
-#~ "\n"
-#~ "Because we have another module sale_forecast which uses terms \"Sales "
-#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-#~ "values. \n"
-#~ "\n"
-#~ "Activity with this module is divided to three steps:\n"
-#~ "- Creating Periods. Mandatory step.\n"
-#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
-#~ "useful for further planning.\n"
-#~ "- Creating Planning lines, entering quantities to them and making "
-#~ "Procurement. Making procurement is the final step for the Period.\n"
-#~ "\n"
-#~ "Periods\n"
-#~ "=======\n"
-#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
-#~ "There are:\n"
-#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-#~ "monthly periods.\n"
-#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-#~ "change the dates and change the State of period.\n"
-#~ "\n"
-#~ "Creating periods is the first step you have to do to use modules features. "
-#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
-#~ "Periods\" form or view but it is recommended to use automating tool.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- These periods (officially Stock and Sales Periods) are separated of "
-#~ "Financial or other periods in the system.\n"
-#~ "- Periods are not assigned to companies (when you use multicompany feature "
-#~ "at all). Module suppose that you use the same periods across companies. If "
-#~ "you wish to use different periods for different companies define them as you "
-#~ "wish (they can overlap). Later on in this text will be indications how to "
-#~ "use such periods.\n"
-#~ "- When periods are created automatically their start and finish dates are "
-#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
-#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-#~ "you create periods manually you have to take care about hours because you "
-#~ "can have incorrect values form sales or stock. \n"
-#~ "- If you use overlapping periods for the same product, warehouse and company "
-#~ "results can be unpredictable.\n"
-#~ "- If current date doesn't belong to any period or you have holes between "
-#~ "periods results can be unpredictable.\n"
-#~ "\n"
-#~ "Sales Forecasts\n"
-#~ "===============\n"
-#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
-#~ "Forecasts\".\n"
-#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-#~ "forecasts lines according to some parameters.\n"
-#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-#~ "forms.\n"
-#~ "\n"
-#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-#~ "products from selected Category, for selected Period and for selected "
-#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-#~ "settings of period before this one to created one.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
-#~ "Period, Warehouse and validated or created by you) already exists. If you "
-#~ "wish to create another forecast, if relevant lines exists you have to do it "
-#~ "manually using menus described bellow.\n"
-#~ "- When created lines are validated by someone else you can use this tool to "
-#~ "create another lines for the same Period, Product and Warehouse. \n"
-#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
-#~ "some settings from your (validated by you or created by you if not validated "
-#~ "yet) forecast which is for last period before period of created forecast. If "
-#~ "there are few your forecasts for period before this one (it is possible) "
-#~ "system takes one of them (no rule which of them).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menus \"Sales Forecasts\"\n"
-#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
-#~ "validation can save your data against any accidental changes. You can click "
-#~ "\"Validate\" button but it is not mandatory.\n"
-#~ "\n"
-#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
-#~ "\"Product Amount\". System will count quantity from amount according to Sale "
-#~ "price of the Product.\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
-#~ "for this product. You have to enter parameters to the top and left of this "
-#~ "table and system will count sale quantities according to these parameters. "
-#~ "So you can select fe. your department (at the top) then (to the left): last "
-#~ "period, period before last and period year ago.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "\n"
-#~ "\n"
-#~ "Procurement Planning\n"
-#~ "====================\n"
-#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-#~ "lines according to some parameters.\n"
-#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
-#~ "module which allows to create procurement.\n"
-#~ "\n"
-#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
-#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
-#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
-#~ "Planning Lines\", then you can review created planning and make procurement "
-#~ "using menu \"Master Procurement Schedule\".\n"
-#~ "\n"
-#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-#~ "lines for products from selected Category, for selected Period, and for "
-#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
-#~ "system creates lines for all products having forecast for selected Period "
-#~ "and Warehouse. Selected Category will be ignored in this case.\n"
-#~ "\n"
-#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
-#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-#~ "Simulation\" and decide if this value would be accurate for end of the "
-#~ "Period. \n"
-#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-#~ "all forecasts for Period and Warehouse. But your planning can be based on "
-#~ "any other information you have. It is not necessary to have any forecast. \n"
-#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-#~ "is the quantity to be procured to make stock as indicated in \"Stock "
-#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-#~ "quantity to minimum stock rules visible on the form. But you can plan "
-#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
-#~ "whole Warehouse by default. But if you want to see values for Stock location "
-#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
-#~ "\n"
-#~ "If after few tries you decide that you found correct quantities for "
-#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
-#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
-#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
-#~ "\n"
-#~ "\n"
-#~ "If you don't want to Produce or Buy the product but just pick calculated "
-#~ "quantity from another warehouse you can click \"Supply from Another "
-#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-#~ "with move from selected source Warehouse to calculated Warehouse (as "
-#~ "destination). You can also decide if this pick should be done from Stock or "
-#~ "Output location of source warehouse. Destination location (Stock or Input) "
-#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
-#~ "\n"
-#~ "\n"
-#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-#~ "have to click button \"Calculate Planning\".\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "How Stock Simulation field is calculated:\n"
-#~ "Generally Stock Simulation shows the stock for end of the calculated period "
-#~ "according to some planned or confirmed stock moves. Calculation always "
-#~ "starts with quantity of real stock of beginning of current period. Then "
-#~ "calculation adds or subtracts quantities of calculated period or periods "
-#~ "before calculated.\n"
-#~ "When you are in the same period (current period is the same as calculated) "
-#~ "Stock Simulation is calculated as follows:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out \n"
-#~ "\t+ Planned In\n"
-#~ "\n"
-#~ "When you calculate period next to current:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out of current Period \n"
-#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period .\n"
-#~ "\n"
-#~ "As you see calculated Period is taken the same way like in case above. But "
-#~ "calculation of current Period are made a little bit different. First you "
-#~ "should note that system takes for current Period only Confirmed In moves. It "
-#~ "means that you have to make planning and procurement for current Period "
-#~ "before this calculation (for Period next to current). \n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period \n"
-#~ "\t- Sum of Planned Out of Periods before calculated \n"
-#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period.\n"
-#~ "\n"
-#~ "Periods before calculated means periods starting from current till period "
-#~ "before calculated.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- Remember to make planning for all periods before calculated because "
-#~ "omitting these quantities and procurements can cause wrong suggestions for "
-#~ "procurements few periods ahead.\n"
-#~ "- If you made planning few periods ahead and you find that real Confirmed "
-#~ "Out is bigger than Planned Out in some periods before you can repeat "
-#~ "Planning and make another procurement. You should do it in the same planning "
-#~ "line. If you create another planning line the suggestions can be wrong.\n"
-#~ "- When you wish to work with different periods for some part of products "
-#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
-#~ "different products. Example: If you use always Weekly periods for Products "
-#~ "A, and Monthly periods for Products B your all calculations will work "
-#~ "correctly. You can also use different kind of periods for the same products "
-#~ "from different warehouse or companies. But you cannot use overlapping "
-#~ "periods for the same product, warehouse and company because results can be "
-#~ "unpredictable. The same apply to Forecasts lines.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo se basa en la versión original de OpenERP stock_planning SA "
-#~ "módulo 1.0 del mismo nombre Programador de Compras Maestras.\n"
-#~ "\n"
-#~ "El propósito de la MPS es permitir crear un manual de contratación "
-#~ "(solicitud), aparte del programador MRP (que funciona automáticamente, "
-#~ "basándose en reglas de existencias mínimas).\n"
-#~ "\n"
-#~ "Los términos utilizados en el módulo:\n"
-#~ "- Stock y Período de ventas - es el tiempo (entre Fecha de inicio y Fecha de "
-#~ "finalización) para el que planifica el Stock y la Previsión de Ventas y hace "
-#~ "la Planificación de las Compras.\n"
-#~ "- Stock y pronóstico de ventas - es la cantidad de productos que planea "
-#~ "vender en el Período.\n"
-#~ "- Planificación de Stock - es la cantidad de productos que planea comprar o "
-#~ "producir para el Período.\n"
-#~ "\n"
-#~ "Porque tenemos otra módulo sale_forecast que utiliza los términos "
-#~ "\"Pronóstico de Ventas\" y \"Planificación\" como valores de cantidad, "
-#~ "utilizaremos términos \"Stock y Pronóstico de Ventas\" y \"Planificación del "
-#~ "Stock\" para hacer hincapié en que usamos los valores de cantidad.\n"
-#~ "\n"
-#~ "La actividad con este módulo se divide en tres pasos:\n"
-#~ "- Creación de Períodos. Paso obligatorio.\n"
-#~ "- Creación de Pronósticos de Venta e introducción de sus cantidades. Un paso "
-#~ "opcional pero útil para una mayor planificación.\n"
-#~ "- Creación de líneas de Planificación, introducción de sus cantidades y "
-#~ "hacer Adquisiciones. Hacer compras es el paso final para el Período.\n"
-#~ "\n"
-#~ "Períodos\n"
-#~ "=========\n"
-#~ "Tiene dos opciones de menú para Períodos en \"Gestión de Ventas - "
-#~ "Configuración\". Son las siguientes:\n"
-#~ "- \"Crear los Períodos de Ventas\" - Que automatiza la creación de periodos "
-#~ "diarios, semanales o mensuales.\n"
-#~ "- \"Stock y Períodos de ventas\" - Que permite crear cualquier tipo de "
-#~ "períodos, el cambio de las fechas y el cambio del Estado del período.\n"
-#~ "\n"
-#~ "Creación de periodos es el primer paso que tiene que hacer para utilizar las "
-#~ "funciones de los módulos. Puede crear períodos personalizados mediante el "
-#~ "botón \"Nuevo\" en el formulario o vista de \"Stock y Períodos de Ventas\", "
-#~ "pero se recomienda utilizar la herramienta automática.\n"
-#~ "\n"
-#~ "Observaciones:\n"
-#~ "- Estos períodos (Stock oficial y Períodos de Ventas) están separan de "
-#~ "Finanzas o de otros períodos en el sistema.\n"
-#~ "- Los Períodos no se asignan a las compañías (en ningún caso cuando se "
-#~ "utiliza la función multicompañía). El módulo supone que utiliza los mismos "
-#~ "períodos a través de las compañías. Si desea utilizar períodos diferentes "
-#~ "para diferentes compañías defínalos a su gusto (pueden solaparse). Más "
-#~ "adelante en este texto se indica cómo utilizar esos períodos.\n"
-#~ "- Cuando los períodos son creados automáticamente sus fechas de inicio y "
-#~ "final se inician con la hora 00:00:00 y 23:59:00 como hora final. Pe.cuando "
-#~ "crea períodos diarios tendrán fecha de inicio 01.31.2010 00:00:00 y fecha de "
-#~ "finalización 01.31.2010 23:59:00. Funciona sólo en la creación automática de "
-#~ "los períodos. Cuando crea períodos manualmente hay que tener cuidado con las "
-#~ "horas, ya que puede tener valores incorrectos en ventas y stock.\n"
-#~ "- Si utiliza períodos solapados para el mismo producto, almacén y compañía, "
-#~ "los resultados pueden ser impredecibles.\n"
-#~ "- Si la fecha actual no pertenece a ningún período o si tiene agujeros entre "
-#~ "los períodos los resultados pueden ser impredecibles.\n"
-#~ "\n"
-#~ "Previsión de ventas\n"
-#~ "====================\n"
-#~ "Tiene menús pocas ventas previsto en \"Gestión de Ventas - Pronósticos de "
-#~ "Ventas\".\n"
-#~ "- \"Creación de Pronósticos de Ventas para los Períodos de Ventas\" - que "
-#~ "automatiza la creación de líneas de previsiones de acuerdo con algunos "
-#~ "parámetros.\n"
-#~ "- \"Las Previsiones de Ventas\" - algunos menús para trabajar con listas de "
-#~ "las previsiones y las formas.\n"
-#~ "\n"
-#~ "Menú \"Crear Pronósticos de Ventas para Períodos de Ventas\" crea "
-#~ "Pronósticos para los productos de la Categoría seleccionada, para el Período "
-#~ "y Almacén seleccionado. Es una opción \"Copia del Último Pronóstico\" para "
-#~ "copiar previsiones y otros ajustes del período anterior a éste para crear "
-#~ "uno.\n"
-#~ "\n"
-#~ "Observaciones:\n"
-#~ "- Esta herramienta no crea líneas, si las líneas oportunas (para el mismo "
-#~ "Producto, Período y Almacén, y validado o creado por usted) ya existen. Si "
-#~ "desea crear otro pronóstico, si las líneas pertinentes existen tiene que "
-#~ "hacerlo manualmente usando los menús que se describen a continuación.\n"
-#~ "- Cuando las líneas se crean son validadas por otra persona que puede "
-#~ "utilizar esta herramienta para crear otras líneas para el mismo Período, "
-#~ "Producto y Almacén.\n"
-#~ "- Cuando se elige \"Copiar Último Pronóstico\" la línea creada tiene la "
-#~ "cantidad y algunos ajustes de su (validado o creadas por usted, si no se ha "
-#~ "validado aún) pronostico que para el último período anterior al período de "
-#~ "la previsión creada. Si hay pocos pronósticos para el período anterior a "
-#~ "éste (es posible) el sistema toma una de ellos (no existe regla sobre "
-#~ "cual).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menús \"Previsión de Ventas\"\n"
-#~ "En el formulario \"Pronóstico de Ventas\" principalmente tiene que "
-#~ "introducir una cantidad prevista en la \"Cantidad de Producto\". Además del "
-#~ "cálculo puede funcionar para las previsiones borrador. Sin embargo, la "
-#~ "validación puede guardar sus datos contra cualquier cambio accidental. Puede "
-#~ "hacer clic en botón \"Validar\", pero no es obligatorio.\n"
-#~ "\n"
-#~ "En lugar de la cantidad prevista se puede introducir la cantidad de "
-#~ "previsión de ventas en el campo \"Cantidad de Producto\". El sistema contará "
-#~ "la cantidad en función del Precio de Venta del Producto.\n"
-#~ "\n"
-#~ "Todos los valores del formulario se expresan en la unidad de medida "
-#~ "seleccionada en el formulario. Usted puede seleccionar uno de la unidad de "
-#~ "medida de la categoría por defecto o de segunda categoría. Cuando se cambia "
-#~ "la unidad de medida las cantiades se volverán a calcular de acuerdo con la "
-#~ "nueva UoM: los valores editables (campos azules) inmediatamente, los campos "
-#~ "no editables después de hacer clic en el botón \"Calcular Planificación\".\n"
-#~ "\n"
-#~ "Para encontrar el valor adecuado para Pronóstico de Venta se puede utilizar "
-#~ "la tabla \"Historial de ventas\" para este producto. Tienes que introducir "
-#~ "los parámetros en la parte superior izquierda de esta tabla y el sistema "
-#~ "contará las vantidades venta de acuerdo con estos parámetros. Así que usted "
-#~ "puede seleccionar, pe. de su departamento (en la parte superior) y luego (a "
-#~ "la izquierda): el último período, el período anterior al último y el período "
-#~ "de hace un año.\n"
-#~ "\n"
-#~ "Observaciones:\n"
-#~ "\n"
-#~ "\n"
-#~ "Planificación de las compras\n"
-#~ "====================\n"
-#~ "Menú para la Planificación de lo que puedes encontrar en \"Almacén - "
-#~ "Planificación del Stock\".\n"
-#~ "- \"Crear archivo de Planificación Lines\" - le permite automatizar la "
-#~ "creación de líneas de planificación de acuerdo con algunos parámetros.\n"
-#~ "- \"Programador Maestro de Adquisiciones\" - es el menú más importante del "
-#~ "módulo que permite la creación de la contratación.\n"
-#~ "\n"
-#~ "Con arreglo a las previsiones de ventas, es la fase de planificación de "
-#~ "ventas. La Planificación de compras (planificación) es la fase de "
-#~ "programación de compras o de producción. Usted puede crear la planificación "
-#~ "de las compras rápidamente con la herramienta del menú \"Crear Líneas de "
-#~ "Planificación de Stock\", entonces puede revisar la planificación creada y "
-#~ "hacer compras usando el menú \"Lista Maestra de Adquisiciones\".\n"
-#~ "\n"
-#~ "Menú \"Crear Líneas de Planificación de Stock\" le permite crear rápidamente "
-#~ "las Líneas de Planificación de productos de la categoría seleccionada, en "
-#~ "determinados períodos, y para el almacén seleccionado. Al marcar la opción "
-#~ "\"Todos los productos con Pronóstico\" el sistema crea las líneas para todos "
-#~ "los productos que tiene previsto para el Período seleccionado y Almacén. La "
-#~ "Categoría seleccionada se tendrá en cuenta en este caso.\n"
-#~ "\n"
-#~ "Debajo del menú \"Programador Maestro de Adquisiciones\" por lo general, "
-#~ "puede cambiar los valores \"Salidas planificadas\" y \"Entradas "
-#~ "planificadas\" para observar el campo \"Simulación de Stock\" y decidir si "
-#~ "este valor es exacto para el final del período.\n"
-#~ "\"Planeado\" puede basarse en la \"Pronóstico de Almacén\", que es la suma "
-#~ "de todas las previsiones para el período y Almacén. Pero la planificación se "
-#~ "puede basar en cualquier otra información que usted tenga. No es necesario "
-#~ "tener ningún pronóstico.\n"
-#~ "\"Entradas planificadas\" la cantidad se utiliza para calcular el campo "
-#~ "\"Entradas Restantes\" que es la cantidad que falta por adquirir para "
-#~ "alcanzar el stock, como se indica en la \"Simulación de Stock\" al final del "
-#~ "período. Usted puede comparar la \"Simulación de Stock\" con las normas de "
-#~ "cantidad mínima de existencias visibles en el formulario. Pero puede planear "
-#~ "una cantidad diferente al de las Reglas Mínimas de Stock. El cálculo está "
-#~ "hecho para todo el almacén por defecto. Pero si usted quiere ver los valores "
-#~ "de la ubicación del stock del almacén calculado, puede utilizar la casilla "
-#~ "\"Sólo Ubicación del Stock\".\n"
-#~ "\n"
-#~ "Si después de varios intentos decide que las cantidades son correctas para "
-#~ "lo \"Salidas planificadas\" y lo \"Entradas planificadas\" y que está "
-#~ "satisfecho con el final de existencias del período calculado en la "
-#~ "\"Simulación del Stock\" puede hacer clic en \"Adquirir Entradas Restantes\" "
-#~ "para obtener la cantidad del campo \"Entradas Restantes\" en el Almacén. El "
-#~ "sistema crea la correspondiente Orden de Compras. Usted puede decidir si la "
-#~ "contratación se hará para el stock o para la ubicación de entrada del "
-#~ "Almacén calculado.\n"
-#~ "\n"
-#~ "Si no quieres Producir o Comprar el producto, pero sólo debes elegir la "
-#~ "cantidad calculada, desde otro almacén puede hacer clic en \"Suministro "
-#~ "desde Otro Almacén\" (en lugar de \"Adquirir Entradas Restantes\"). El "
-#~ "sistema crea la lista de selección desde el Almacén origen seleccionado "
-#~ "hasta el Almacén calculado (como destino). También puede decidir si esta "
-#~ "selección debe hacerse de almacén o la ubicación de salida del almacén de "
-#~ "origen. La ubicación de destino (almacén o entrada) del almacén de destino, "
-#~ "se utilizará como establecido para \"Adquirir Entradas Restantes\".\n"
-#~ "\n"
-#~ "Para ver las cantidades adecuadas en los campos \"Entrada Confirmada\", "
-#~ "\"Salida Confirmada\", \"Entrada Confirmada Antes\", \"Salidas planificadas "
-#~ "antes\" y \"Simulación de Stock\" tiene que hacer clic en el botón "
-#~ "\"Calcular Planificación\".\n"
-#~ "\n"
-#~ "Todos los valores en el formulario se expresan en la unidad de medida "
-#~ "seleccionada en el formulario. Usted puede seleccionar uno de la unidad de "
-#~ "medida de la categoría por defecto o de una segunda categoría. Cuando se "
-#~ "cambia la unidad de medida las cantidades se volverán a calcular de acuerdo "
-#~ "con UoM: los valores editables inmediatamente (campos azules), los campos no "
-#~ "editables después de hacer clic en el botón \"Calcular Planificación\".\n"
-#~ "\n"
-#~ "Cómo se calcula el campo Simulación del Stock:\n"
-#~ "Generalmente la Simulación del Stock muestra el stock al final período "
-#~ "calculado de acuerdo con algunos movimientos de stock previsto o confirmado. "
-#~ "El cálculo se inicia siempre con la cantidad de stock real del inicio del "
-#~ "período actual. Luego se calcula la suma o resta de las cantidades del "
-#~ "período o períodos antes calculados.\n"
-#~ "Cuando está en el mismo período (período actual es el mismo que el "
-#~ "calculado) la Simulación del Stock se calcula como sigue:\n"
-#~ "Simulación de Stock = \n"
-#~ "\t Stock inicial del período actual\n"
-#~ "\t - Salidas planificadas \n"
-#~ "\t + Entradas planificadas\n"
-#~ "\n"
-#~ "Cuando se calcula el período siguiente al actual:\n"
-#~ "Simulación del Stock = \n"
-#~ "\t Stock inicial del período actual \n"
-#~ "\t - Planificación de Salidas del Período actual\n"
-#~ "\t + Entradas Confirmadas en el Período actual (incl. las Entradas ya "
-#~ "existentes)\n"
-#~ "\t - Salidas planificadas del Período calculado \n"
-#~ "\t + Entradas planificadas en el Período calculado.\n"
-#~ "\n"
-#~ "Como puede ver el período calculado se toma de la misma forma que en el caso "
-#~ "anterior. Sin embargo, el cálculo del período actual se hace de manera un "
-#~ "poco diferente. En primer lugar debe tener en cuenta que el sistema tiene "
-#~ "para el Período actual sólo Confirmados los movimientos de entrada. Esto "
-#~ "significa que tiene que hacer la planificación y la compra para Período "
-#~ "actual antes de este cálculo (para el Próximo período al actual).\n"
-#~ "\n"
-#~ "Cuando se calcula el período siguiente:\n"
-#~ "Colección de simulación = \n"
-#~ "\t Stock inicial del Período actual \n"
-#~ "\t - Suma de Planificación de salida de los períodos antes calculados \n"
-#~ "\t + Suma de Confirmados En períodos anteriores calculados (incl. las "
-#~ "entradas ya existentes) \n"
-#~ "\t - Salidas Planificadas del Período calculado \n"
-#~ "\t + Entradas Planificadas del Período calculado.\n"
-#~ "\n"
-#~ "Los períodos anteriores calculados, significa que los períodos comienzados "
-#~ "en el actual hasta el período antes calculado.\n"
-#~ "\n"
-#~ "Observaciones:\n"
-#~ "- Recuerde hacer la planificación para todos los períodos antes calculados "
-#~ "debido a omitir estas cantidades y las adquisiciones pueden causar "
-#~ "sugerencias erróneas para las compras de algunos períodos posteriores.\n"
-#~ "- Si ha realizado la planificación de unos pocos períodos posteriores y "
-#~ "encuentra que las Salidas Confirmadas reales son mayores de lo previsto en "
-#~ "algunos períodos antes de que pueda repetirse la Planificación y realizar "
-#~ "otra adquisición. Debe hacerlo en la misma línea de la planificación. Si se "
-#~ "crea otra línea de planificación de sugerencias puede estar equivocada.\n"
-#~ "- Cuando desea trabajar con diferentes períodos para una parte de los "
-#~ "productos, defina dos tipos de períodos (pe. semanal y mensual) y los "
-#~ "utilícelos para diferentes productos. Ejemplo: si utiliza siempre los "
-#~ "períodos semanales para los productos A, y los períodos mensuales de los "
-#~ "productos B todos sus cálculos funcionarán correctamente. También puede "
-#~ "utilizar diferentes tipos de períodos para los mismos productos de "
-#~ "diferentes almacenes de diferentes compañías. Pero no se pueden utilizar "
-#~ "períodos solapados para el mismo producto de un almacén, y compañía porque "
-#~ "los resultados pueden ser impredecibles. Lo mismo se aplica a las líneas de "
-#~ "Previsiones.\n"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre del modelo inválido en la definición de acción."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/stock_planning/i18n/es_MX.po b/addons/stock_planning/i18n/es_MX.po
deleted file mode 100644
index 6e5078e5364..00000000000
--- a/addons/stock_planning/i18n/es_MX.po
+++ /dev/null
@@ -1,1889 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-18 22:43+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"¡No hay previsiones para el periodo seleccionado o no hay productos en la "
-"categoría seleccionada!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Marque esta opción para calcular el stock sólo de la ubicación stock del "
-"almacén seleccionado. Si no se marca, el cálculo se realiza para las "
-"ubicaciones de entrada, stock y salida del almacén."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Regla máximo"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Copmany Period1"
-msgstr "Esta compañía período1"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Valor de la previsión que será convertido en cantidad de producto en función "
-"de precios."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:621
-#: code:addons/stock_planning/stock_planning.py:663
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "¡Entradas restantes debe ser mayor que 0!"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Salidas planificadas en periodos anteriores al calculado. Entre la fecha de "
-"inicio del periodo actual y un día antes del comienzo del periodo calculado."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "¡No hay productos en la categoría seleccionada!"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Almacén al que conciernen las previsiones. Si durante la planificación de "
-"stock necesita previsiones de ventas para todos los almacenes escoja ahora "
-"un almacén cualquiera."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Salidas previstas"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Entradas restantes"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Requisition history"
-msgstr "Historial demandas"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Crear líneas de previsiones"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr "Cantidades de todas las salidas confirmadas en el periodo calculado."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Crear periodos diarios"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:640
-#: code:addons/stock_planning/stock_planning.py:682
-#, python-format
-msgid ""
-"\n"
-" Initial Stock: "
-msgstr ""
-"\n"
-" Stock inicial: "
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Todas las previsiones de ventas para el almacén seleccionado del producto "
-"seleccionado durante el periodo seleccionado."
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock and Sales Periods"
-msgstr "Crear periodos de stock y ventas"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Indicadores de reglas de stock mínimo"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Periodo al que conciernen las previsiones."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Sólo ubicaciones de stock"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-"Cantidades que ya se enviaron fuera de este almacén en el período actual."
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Chect to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-"Marque esta opción para realizar los abastecimientos en la ubicación stock "
-"del almacén seleccionado. Si no se marca, el abastecimiento se realizará en "
-"la ubicación de entrada del almacén."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Situación del periodo actual"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Crear periodos mensuales"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warhouse'."
-msgstr ""
-"Almacén usado como origen en el movimiento de suministro creado por "
-"'Suministrar desde otro almacén'."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.periodo.crearlíneas"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Salidas planificadas antes"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Todos los productos con previsión"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Periodos :"
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-"Cantidades que ya han sido recogidas en este almacén en el periodo actual."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:644
-#: code:addons/stock_planning/stock_planning.py:686
-#, python-format
-msgid "    Confirmed In Before: "
-msgstr "    Entradas confirmadas antes: "
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Previsiones de stock y ventas"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.ventas.prevision"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_dept_id:0
-msgid "This Department"
-msgstr "Este departamento"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Entradas planificadas"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Simulación de stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planificación.crearlíneas"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Entradas confirmadas en periodos anteriores al calculado (incluyendo las "
-"entradas realizadas). Entre la fecha de inicio del periodo actual y un día "
-"antes del comienzo del periodo calculado."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Buscar previsiones de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "El periodo de este usuario5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-"Historial de abastecimiento o suministro interno de esta línea de "
-"planificación."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Todas las previsiones para la compañía entera (para todos los almacenes) del "
-"producto seleccionado durante el periodo seleccionado."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "El periodo de este usuario1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "El periodo de este usuario3"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Planificación de stock"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Regla de mínimos"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Entradas abastecimiento restante"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:646
-#: code:addons/stock_planning/stock_planning.py:688
-#, python-format
-msgid "    Incoming Left: "
-msgstr "    Entradas restante: "
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:719
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Crear"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.module.module,shortdesc:stock_planning.module_meta_information
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Plan maestro de abastecimiento"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:636
-#: code:addons/stock_planning/stock_planning.py:678
-#, python-format
-msgid "  Creation Date: "
-msgstr "  Fecha de creación: "
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Periodo"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "Categoría de los productos cuyas previsiones se crearán."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "periodo stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.venta.previsión.crearlíneas"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Simulación de stock al final del período seleccionado.\n"
-" Para el periodo actual es: \n"
-"Stock inicial – salidas + entradas – salidas previstas + entradas "
-"esperadas.\n"
-" Para los siguientes periodos es: \n"
-"Stock inicial – salidas previstas anteriores + entradas anteriores – salidas "
-"previstas + entradas previstas."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Seleccione esta casilla para ver las ventas de todda la compañía."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Buscar planificación de stock"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Entradas antes"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Categoría de producto"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:621
-#: code:addons/stock_planning/stock_planning.py:663
-#: code:addons/stock_planning/stock_planning.py:665
-#: code:addons/stock_planning/stock_planning.py:667
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "¡ Error !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#, python-format
-msgid "Manual planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Este usuario"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:643
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"\n"
-" Confirmed Out: "
-msgstr ""
-"\n"
-" Salidas confirmadas: "
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Previsiones"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Abastecer desde otro almacen"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Calcular planificación"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:636
-#, python-format
-msgid ""
-" Procurement created in MPS by user: %s   Creation Date: %s                  "
-"                       \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:140
-#, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Cantidad stock un día antes del periodo actual."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Crear periodos semanales"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-msgstr ""
-"Cantidad máxima establecida en las reglas de stock mínimo para este almacén."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:665
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "¡Debe especificar un almacén origen!"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-msgid "Creates planning lines for selected period and warehouse."
-msgstr ""
-"Crea líneas de planificación para el periodo y almacen seleccionados."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Este periodo de usuario4"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Note: Doesn't duplicate existing lines created by you."
-msgstr "Nota: No duplica las líneas creadas por usted."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Periodo de stock y ventas"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Previsión de la compañía"
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quanities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-"Unidad de medida utilizada para mostrar las cantidades calculadas de stock. "
-"Puede utilizar las unidades de la categoría por defecto o las de la segunda "
-"categoría (categoría UdV)."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Por usuario :"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Previsiones de ventas"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Nombre del período"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Creado/Validado por"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Suministro interno"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "El periodo de esta compañía4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "El periodo de esta compañía5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "El periodo de esta compañía2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "El periodo de esta compañía3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:642
-#: code:addons/stock_planning/stock_planning.py:684
-#, python-format
-msgid ""
-"\n"
-" Already Out: "
-msgstr ""
-"\n"
-" Salidas realizadas: "
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Previsiones validadas"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"Se creará la planificación para los productos de la categoría de productos "
-"seleccionada con este campo. Este campo se ignora cuando se marca la opción "
-"\"Todas las previsiones de productos”."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Salidas planificadas"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Por departamento:"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Previsión"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Cerrada"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Almacén "
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:646
-#: code:addons/stock_planning/stock_planning.py:688
-#, python-format
-msgid ""
-"\n"
-" Expected Out: "
-msgstr ""
-"\n"
-" Salidas previstas: "
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create periods for Stock and Sales Planning"
-msgstr "Crear periodos para planificación de stock y ventas"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Introduzca la cantidad saliente planificada para el almacén seleccionado "
-"durante el periodo seleccionado y para el producto seleccionado. Para "
-"planificar este valor puede fijarse en las salidas confirmadas o las "
-"previsiones de ventas. Este valor debería ser igual o superior a las salidas "
-"confirmadas."
-
-#. module: stock_planning
-#: model:ir.module.module,description:stock_planning.module_meta_information
-msgid ""
-"\n"
-"This module is based on original OpenERP SA module stock_planning version "
-"1.0 of the same name Master Procurement Schedule.\n"
-"\n"
-"Purpose of MPS is to allow create a manual procurement (requisition) apart "
-"of MRP scheduler (which works automatically on minimum stock rules).\n"
-"\n"
-"Terms used in the module:\n"
-"- Stock and Sales Period - is the time (between Start Date and End Date) for "
-"which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-"- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-"the Period.\n"
-"- Stock Planning - is the quantity of products you plan to purchase or "
-"produce for the Period.\n"
-"\n"
-"Because we have another module sale_forecast which uses terms \"Sales "
-"Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-"Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-"values. \n"
-"\n"
-"Activity with this module is divided to three steps:\n"
-"- Creating Periods. Mandatory step.\n"
-"- Creating Sale Forecasts and entering quantities to them. Optional step but "
-"useful for further planning.\n"
-"- Creating Planning lines, entering quantities to them and making "
-"Procurement. Making procurement is the final step for the Period.\n"
-"\n"
-"Periods\n"
-"=======\n"
-"You have two menu items for Periods in \"Sales Management - Configuration\". "
-"There are:\n"
-"- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-"monthly periods.\n"
-"- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-"change the dates and change the State of period.\n"
-"\n"
-"Creating periods is the first step you have to do to use modules features. "
-"You can create custom periods using \"New\" button in \"Stock and Sales "
-"Periods\" form or view but it is recommended to use automating tool.\n"
-"\n"
-"Remarks:\n"
-"- These periods (officially Stock and Sales Periods) are separated of "
-"Financial or other periods in the system.\n"
-"- Periods are not assigned to companies (when you use multicompany feature "
-"at all). Module suppose that you use the same periods across companies. If "
-"you wish to use different periods for different companies define them as you "
-"wish (they can overlap). Later on in this text will be indications how to "
-"use such periods.\n"
-"- When periods are created automatically their start and finish dates are "
-"with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-"periods they will have start date 31.01.2010 00:00:00 and end date "
-"31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-"you create periods manually you have to take care about hours because you "
-"can have incorrect values form sales or stock. \n"
-"- If you use overlapping periods for the same product, warehouse and company "
-"results can be unpredictable.\n"
-"- If current date doesn't belong to any period or you have holes between "
-"periods results can be unpredictable.\n"
-"\n"
-"Sales Forecasts\n"
-"===============\n"
-"You have few menus for Sales forecast in \"Sales Management - Sales "
-"Forecasts\".\n"
-"- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-"forecasts lines according to some parameters.\n"
-"- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-"forms.\n"
-"\n"
-"Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-"products from selected Category, for selected Period and for selected "
-"Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-"settings of period before this one to created one.\n"
-"\n"
-"Remarks:\n"
-"- This tool doesn't create lines, if relevant lines (for the same Product, "
-"Period, Warehouse and validated or created by you) already exists. If you "
-"wish to create another forecast, if relevant lines exists you have to do it "
-"manually using menus described bellow.\n"
-"- When created lines are validated by someone else you can use this tool to "
-"create another lines for the same Period, Product and Warehouse. \n"
-"- When you choose \"Copy Last Forecast\" created line takes quantity and "
-"some settings from your (validated by you or created by you if not validated "
-"yet) forecast which is for last period before period of created forecast. If "
-"there are few your forecasts for period before this one (it is possible) "
-"system takes one of them (no rule which of them).\n"
-"\n"
-"\n"
-"Menus \"Sales Forecasts\"\n"
-"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-"\"Product Quantity\". Further calculation can work for draft forecasts. But "
-"validation can save your data against any accidental changes. You can click "
-"\"Validate\" button but it is not mandatory.\n"
-"\n"
-"Instead of forecast quantity you can enter amount of forecast sales in field "
-"\"Product Amount\". System will count quantity from amount according to Sale "
-"price of the Product.\n"
-"\n"
-"All values on the form are expressed in unit of measure selected on form. "
-"You can select one of unit of measure from default category or from second "
-"category. When you change unit of measure the quanities will be recalculated "
-"according to new UoM: editable values (blue fields) immediately, non edited "
-"fields after clicking of \"Calculate Planning\" button.\n"
-"\n"
-"To find proper value for Sale Forecast you can use \"Sales History\" table "
-"for this product. You have to enter parameters to the top and left of this "
-"table and system will count sale quantities according to these parameters. "
-"So you can select fe. your department (at the top) then (to the left): last "
-"period, period before last and period year ago.\n"
-"\n"
-"Remarks:\n"
-"\n"
-"\n"
-"Procurement Planning\n"
-"====================\n"
-"Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-"- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-"lines according to some parameters.\n"
-"- \"Master Procurement Scheduler\" - is the most important menu of the "
-"module which allows to create procurement.\n"
-"\n"
-"As Sales forecast is phase of planning sales. The Procurement Planning "
-"(Planning) is the phase of scheduling Purchasing or Producing. You can "
-"create Procurement Planning quickly using tool from menu \"Create Stock "
-"Planning Lines\", then you can review created planning and make procurement "
-"using menu \"Master Procurement Schedule\".\n"
-"\n"
-"Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-"lines for products from selected Category, for selected Period, and for "
-"selected Warehouse. When you check option \"All Products with Forecast\" "
-"system creates lines for all products having forecast for selected Period "
-"and Warehouse. Selected Category will be ignored in this case.\n"
-"\n"
-"Under menu \"Master Procurement Scheduler\" you can generally change the "
-"values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-"Simulation\" and decide if this value would be accurate for end of the "
-"Period. \n"
-"\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-"all forecasts for Period and Warehouse. But your planning can be based on "
-"any other information you have. It is not necessary to have any forecast. \n"
-"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-"is the quantity to be procured to make stock as indicated in \"Stock "
-"Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-"quantity to minimum stock rules visible on the form. But you can plan "
-"different quantity than in Minimum Stock Rules. Calculation is made for "
-"whole Warehouse by default. But if you want to see values for Stock location "
-"of calculated warehouse you can use check box \"Stock Location Only\".\n"
-"\n"
-"If after few tries you decide that you found correct quantities for "
-"\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-"stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-"Left\" button to procure quantity of field \"Incoming Left\" into the "
-"Warehouse. System creates appropriate Procurement Order. You can decide if "
-"procurement will be made to Stock or Input location of calculated Warehouse. "
-"\n"
-"\n"
-"If you don't want to Produce or Buy the product but just pick calculated "
-"quantity from another warehouse you can click \"Supply from Another "
-"Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-"with move from selected source Warehouse to calculated Warehouse (as "
-"destination). You can also decide if this pick should be done from Stock or "
-"Output location of source warehouse. Destination location (Stock or Input) "
-"of destination warehouse will be used as set for \"Procure Incoming Left\". "
-"\n"
-"\n"
-"To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-"\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-"have to click button \"Calculate Planning\".\n"
-"\n"
-"All values on the form are expressed in unit of measure selected on form. "
-"You can select one of unit of measure from default category or from second "
-"category. When you change unit of measure the quanities will be recalculated "
-"according to new UoM: editable values (blue fields) immediately, non edited "
-"fields after clicking of \"Calculate Planning\" button.\n"
-"\n"
-"How Stock Simulation field is calculated:\n"
-"Generally Stock Simulation shows the stock for end of the calculated period "
-"according to some planned or confirmed stock moves. Calculation always "
-"starts with quantity of real stock of beginning of current period. Then "
-"calculation adds or subtracts quantities of calculated period or periods "
-"before calculated.\n"
-"When you are in the same period (current period is the same as calculated) "
-"Stock Simulation is calculated as follows:\n"
-"Stock Simulation = \n"
-"\tStock of beginning of current Period\n"
-"\t- Planned Out \n"
-"\t+ Planned In\n"
-"\n"
-"When you calculate period next to current:\n"
-"Stock Simulation = \n"
-"\tStock of beginning of current Period\n"
-"\t- Planned Out of current Period \n"
-"\t+ Confirmed In of current Period  (incl. Already In)\n"
-"\t- Planned Out of calculated Period \n"
-"\t+ Planned In of calculated Period .\n"
-"\n"
-"As you see calculated Period is taken the same way like in case above. But "
-"calculation of current Period are made a little bit different. First you "
-"should note that system takes for current Period only Confirmed In moves. It "
-"means that you have to make planning and procurement for current Period "
-"before this calculation (for Period next to current). \n"
-"\n"
-"When you calculate Period ahead:\n"
-"Stock Simulation = \n"
-"\tStock of beginning of current Period \n"
-"\t- Sum of Planned Out of Periods before calculated \n"
-"\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-"\t- Planned Out of calculated Period \n"
-"\t+ Planned In of calculated Period.\n"
-"\n"
-"Periods before calculated means periods starting from current till period "
-"before calculated.\n"
-"\n"
-"Remarks:\n"
-"- Remember to make planning for all periods before calculated because "
-"omitting these quantities and procurements can cause wrong suggestions for "
-"procurements few periods ahead.\n"
-"- If you made planning few periods ahead and you find that real Confirmed "
-"Out is bigger than Planned Out in some periods before you can repeat "
-"Planning and make another procurement. You should do it in the same planning "
-"line. If you create another planning line the suggestions can be wrong.\n"
-"- When you wish to work with different periods for some part of products "
-"define two kinds of periods (fe. Weekly and Monthly) and use them for "
-"different products. Example: If you use always Weekly periods for Products "
-"A, and Monthly periods for Products B your all calculations will work "
-"correctly. You can also use different kind of periods for the same products "
-"from different warehouse or companies. But you cannot use overlapping "
-"periods for the same product, warehouse and company because results can be "
-"unpredictable. The same apply to Forecasts lines.\n"
-msgstr ""
-"\n"
-"Este módulo se basa en la versión original de OpenERP stock_planning SA "
-"módulo 1.0 del mismo nombre Programador de Compras Maestras.\n"
-"\n"
-"El propósito de la MPS es permitir crear un manual de contratación "
-"(solicitud), aparte del programador MRP (que funciona automáticamente, "
-"basándose en reglas de existencias mínimas).\n"
-"\n"
-"Los términos utilizados en el módulo:\n"
-"- Stock y Período de ventas - es el tiempo (entre Fecha de inicio y Fecha de "
-"finalización) para el que planifica el Stock y la Previsión de Ventas y hace "
-"la Planificación de las Compras.\n"
-"- Stock y pronóstico de ventas - es la cantidad de productos que planea "
-"vender en el Período.\n"
-"- Planificación de Stock - es la cantidad de productos que planea comprar o "
-"producir para el Período.\n"
-"\n"
-"Porque tenemos otra módulo sale_forecast que utiliza los términos "
-"\"Pronóstico de Ventas\" y \"Planificación\" como valores de cantidad, "
-"utilizaremos términos \"Stock y Pronóstico de Ventas\" y \"Planificación del "
-"Stock\" para hacer hincapié en que usamos los valores de cantidad.\n"
-"\n"
-"La actividad con este módulo se divide en tres pasos:\n"
-"- Creación de Períodos. Paso obligatorio.\n"
-"- Creación de Pronósticos de Venta e introducción de sus cantidades. Un paso "
-"opcional pero útil para una mayor planificación.\n"
-"- Creación de líneas de Planificación, introducción de sus cantidades y "
-"hacer Adquisiciones. Hacer compras es el paso final para el Período.\n"
-"\n"
-"Períodos\n"
-"=========\n"
-"Tiene dos opciones de menú para Períodos en \"Gestión de Ventas - "
-"Configuración\". Son las siguientes:\n"
-"- \"Crear los Períodos de Ventas\" - Que automatiza la creación de periodos "
-"diarios, semanales o mensuales.\n"
-"- \"Stock y Períodos de ventas\" - Que permite crear cualquier tipo de "
-"períodos, el cambio de las fechas y el cambio del Estado del período.\n"
-"\n"
-"Creación de periodos es el primer paso que tiene que hacer para utilizar las "
-"funciones de los módulos. Puede crear períodos personalizados mediante el "
-"botón \"Nuevo\" en el formulario o vista de \"Stock y Períodos de Ventas\", "
-"pero se recomienda utilizar la herramienta automática.\n"
-"\n"
-"Observaciones:\n"
-"- Estos períodos (Stock oficial y Períodos de Ventas) están separan de "
-"Finanzas o de otros períodos en el sistema.\n"
-"- Los Períodos no se asignan a las compañías (en ningún caso cuando se "
-"utiliza la función multicompañía). El módulo supone que utiliza los mismos "
-"períodos a través de las compañías. Si desea utilizar períodos diferentes "
-"para diferentes compañías defínalos a su gusto (pueden solaparse). Más "
-"adelante en este texto se indica cómo utilizar esos períodos.\n"
-"- Cuando los períodos son creados automáticamente sus fechas de inicio y "
-"final se inician con la hora 00:00:00 y 23:59:00 como hora final. Pe.cuando "
-"crea períodos diarios tendrán fecha de inicio 01.31.2010 00:00:00 y fecha de "
-"finalización 01.31.2010 23:59:00. Funciona sólo en la creación automática de "
-"los períodos. Cuando crea períodos manualmente hay que tener cuidado con las "
-"horas, ya que puede tener valores incorrectos en ventas y stock.\n"
-"- Si utiliza períodos solapados para el mismo producto, almacén y compañía, "
-"los resultados pueden ser impredecibles.\n"
-"- Si la fecha actual no pertenece a ningún período o si tiene agujeros entre "
-"los períodos los resultados pueden ser impredecibles.\n"
-"\n"
-"Previsión de ventas\n"
-"====================\n"
-"Tiene menús pocas ventas previsto en \"Gestión de Ventas - Pronósticos de "
-"Ventas\".\n"
-"- \"Creación de Pronósticos de Ventas para los Períodos de Ventas\" - que "
-"automatiza la creación de líneas de previsiones de acuerdo con algunos "
-"parámetros.\n"
-"- \"Las Previsiones de Ventas\" - algunos menús para trabajar con listas de "
-"las previsiones y las formas.\n"
-"\n"
-"Menú \"Crear Pronósticos de Ventas para Períodos de Ventas\" crea "
-"Pronósticos para los productos de la Categoría seleccionada, para el Período "
-"y Almacén seleccionado. Es una opción \"Copia del Último Pronóstico\" para "
-"copiar previsiones y otros ajustes del período anterior a éste para crear "
-"uno.\n"
-"\n"
-"Observaciones:\n"
-"- Esta herramienta no crea líneas, si las líneas oportunas (para el mismo "
-"Producto, Período y Almacén, y validado o creado por usted) ya existen. Si "
-"desea crear otro pronóstico, si las líneas pertinentes existen tiene que "
-"hacerlo manualmente usando los menús que se describen a continuación.\n"
-"- Cuando las líneas se crean son validadas por otra persona que puede "
-"utilizar esta herramienta para crear otras líneas para el mismo Período, "
-"Producto y Almacén.\n"
-"- Cuando se elige \"Copiar Último Pronóstico\" la línea creada tiene la "
-"cantidad y algunos ajustes de su (validado o creadas por usted, si no se ha "
-"validado aún) pronostico que para el último período anterior al período de "
-"la previsión creada. Si hay pocos pronósticos para el período anterior a "
-"éste (es posible) el sistema toma una de ellos (no existe regla sobre "
-"cual).\n"
-"\n"
-"\n"
-"Menús \"Previsión de Ventas\"\n"
-"En el formulario \"Pronóstico de Ventas\" principalmente tiene que "
-"introducir una cantidad prevista en la \"Cantidad de Producto\". Además del "
-"cálculo puede funcionar para las previsiones borrador. Sin embargo, la "
-"validación puede guardar sus datos contra cualquier cambio accidental. Puede "
-"hacer clic en botón \"Validar\", pero no es obligatorio.\n"
-"\n"
-"En lugar de la cantidad prevista se puede introducir la cantidad de "
-"previsión de ventas en el campo \"Cantidad de Producto\". El sistema contará "
-"la cantidad en función del Precio de Venta del Producto.\n"
-"\n"
-"Todos los valores del formulario se expresan en la unidad de medida "
-"seleccionada en el formulario. Usted puede seleccionar uno de la unidad de "
-"medida de la categoría por defecto o de segunda categoría. Cuando se cambia "
-"la unidad de medida las cantiades se volverán a calcular de acuerdo con la "
-"nueva UoM: los valores editables (campos azules) inmediatamente, los campos "
-"no editables después de hacer clic en el botón \"Calcular Planificación\".\n"
-"\n"
-"Para encontrar el valor adecuado para Pronóstico de Venta se puede utilizar "
-"la tabla \"Historial de ventas\" para este producto. Tienes que introducir "
-"los parámetros en la parte superior izquierda de esta tabla y el sistema "
-"contará las vantidades venta de acuerdo con estos parámetros. Así que usted "
-"puede seleccionar, pe. de su departamento (en la parte superior) y luego (a "
-"la izquierda): el último período, el período anterior al último y el período "
-"de hace un año.\n"
-"\n"
-"Observaciones:\n"
-"\n"
-"\n"
-"Planificación de las compras\n"
-"====================\n"
-"Menú para la Planificación de lo que puedes encontrar en \"Almacén - "
-"Planificación del Stock\".\n"
-"- \"Crear archivo de Planificación Lines\" - le permite automatizar la "
-"creación de líneas de planificación de acuerdo con algunos parámetros.\n"
-"- \"Programador Maestro de Adquisiciones\" - es el menú más importante del "
-"módulo que permite la creación de la contratación.\n"
-"\n"
-"Con arreglo a las previsiones de ventas, es la fase de planificación de "
-"ventas. La Planificación de compras (planificación) es la fase de "
-"programación de compras o de producción. Usted puede crear la planificación "
-"de las compras rápidamente con la herramienta del menú \"Crear Líneas de "
-"Planificación de Stock\", entonces puede revisar la planificación creada y "
-"hacer compras usando el menú \"Lista Maestra de Adquisiciones\".\n"
-"\n"
-"Menú \"Crear Líneas de Planificación de Stock\" le permite crear rápidamente "
-"las Líneas de Planificación de productos de la categoría seleccionada, en "
-"determinados períodos, y para el almacén seleccionado. Al marcar la opción "
-"\"Todos los productos con Pronóstico\" el sistema crea las líneas para todos "
-"los productos que tiene previsto para el Período seleccionado y Almacén. La "
-"Categoría seleccionada se tendrá en cuenta en este caso.\n"
-"\n"
-"Debajo del menú \"Programador Maestro de Adquisiciones\" por lo general, "
-"puede cambiar los valores \"Salidas planificadas\" y \"Entradas "
-"planificadas\" para observar el campo \"Simulación de Stock\" y decidir si "
-"este valor es exacto para el final del período.\n"
-"\"Planeado\" puede basarse en la \"Pronóstico de Almacén\", que es la suma "
-"de todas las previsiones para el período y Almacén. Pero la planificación se "
-"puede basar en cualquier otra información que usted tenga. No es necesario "
-"tener ningún pronóstico.\n"
-"\"Entradas planificadas\" la cantidad se utiliza para calcular el campo "
-"\"Entradas Restantes\" que es la cantidad que falta por adquirir para "
-"alcanzar el stock, como se indica en la \"Simulación de Stock\" al final del "
-"período. Usted puede comparar la \"Simulación de Stock\" con las normas de "
-"cantidad mínima de existencias visibles en el formulario. Pero puede planear "
-"una cantidad diferente al de las Reglas Mínimas de Stock. El cálculo está "
-"hecho para todo el almacén por defecto. Pero si usted quiere ver los valores "
-"de la ubicación del stock del almacén calculado, puede utilizar la casilla "
-"\"Sólo Ubicación del Stock\".\n"
-"\n"
-"Si después de varios intentos decide que las cantidades son correctas para "
-"lo \"Salidas planificadas\" y lo \"Entradas planificadas\" y que está "
-"satisfecho con el final de existencias del período calculado en la "
-"\"Simulación del Stock\" puede hacer clic en \"Adquirir Entradas Restantes\" "
-"para obtener la cantidad del campo \"Entradas Restantes\" en el Almacén. El "
-"sistema crea la correspondiente Orden de Compras. Usted puede decidir si la "
-"contratación se hará para el stock o para la ubicación de entrada del "
-"Almacén calculado.\n"
-"\n"
-"Si no quieres Producir o Comprar el producto, pero sólo debes elegir la "
-"cantidad calculada, desde otro almacén puede hacer clic en \"Suministro "
-"desde Otro Almacén\" (en lugar de \"Adquirir Entradas Restantes\"). El "
-"sistema crea la lista de selección desde el Almacén origen seleccionado "
-"hasta el Almacén calculado (como destino). También puede decidir si esta "
-"selección debe hacerse de almacén o la ubicación de salida del almacén de "
-"origen. La ubicación de destino (almacén o entrada) del almacén de destino, "
-"se utilizará como establecido para \"Adquirir Entradas Restantes\".\n"
-"\n"
-"Para ver las cantidades adecuadas en los campos \"Entrada Confirmada\", "
-"\"Salida Confirmada\", \"Entrada Confirmada Antes\", \"Salidas planificadas "
-"antes\" y \"Simulación de Stock\" tiene que hacer clic en el botón "
-"\"Calcular Planificación\".\n"
-"\n"
-"Todos los valores en el formulario se expresan en la unidad de medida "
-"seleccionada en el formulario. Usted puede seleccionar uno de la unidad de "
-"medida de la categoría por defecto o de una segunda categoría. Cuando se "
-"cambia la unidad de medida las cantidades se volverán a calcular de acuerdo "
-"con UoM: los valores editables inmediatamente (campos azules), los campos no "
-"editables después de hacer clic en el botón \"Calcular Planificación\".\n"
-"\n"
-"Cómo se calcula el campo Simulación del Stock:\n"
-"Generalmente la Simulación del Stock muestra el stock al final período "
-"calculado de acuerdo con algunos movimientos de stock previsto o confirmado. "
-"El cálculo se inicia siempre con la cantidad de stock real del inicio del "
-"período actual. Luego se calcula la suma o resta de las cantidades del "
-"período o períodos antes calculados.\n"
-"Cuando está en el mismo período (período actual es el mismo que el "
-"calculado) la Simulación del Stock se calcula como sigue:\n"
-"Simulación de Stock = \n"
-"\t Stock inicial del período actual\n"
-"\t - Salidas planificadas \n"
-"\t + Entradas planificadas\n"
-"\n"
-"Cuando se calcula el período siguiente al actual:\n"
-"Simulación del Stock = \n"
-"\t Stock inicial del período actual \n"
-"\t - Planificación de Salidas del Período actual\n"
-"\t + Entradas Confirmadas en el Período actual (incl. las Entradas ya "
-"existentes)\n"
-"\t - Salidas planificadas del Período calculado \n"
-"\t + Entradas planificadas en el Período calculado.\n"
-"\n"
-"Como puede ver el período calculado se toma de la misma forma que en el caso "
-"anterior. Sin embargo, el cálculo del período actual se hace de manera un "
-"poco diferente. En primer lugar debe tener en cuenta que el sistema tiene "
-"para el Período actual sólo Confirmados los movimientos de entrada. Esto "
-"significa que tiene que hacer la planificación y la compra para Período "
-"actual antes de este cálculo (para el Próximo período al actual).\n"
-"\n"
-"Cuando se calcula el período siguiente:\n"
-"Colección de simulación = \n"
-"\t Stock inicial del Período actual \n"
-"\t - Suma de Planificación de salida de los períodos antes calculados \n"
-"\t + Suma de Confirmados En períodos anteriores calculados (incl. las "
-"entradas ya existentes) \n"
-"\t - Salidas Planificadas del Período calculado \n"
-"\t + Entradas Planificadas del Período calculado.\n"
-"\n"
-"Los períodos anteriores calculados, significa que los períodos comienzados "
-"en el actual hasta el período antes calculado.\n"
-"\n"
-"Observaciones:\n"
-"- Recuerde hacer la planificación para todos los períodos antes calculados "
-"debido a omitir estas cantidades y las adquisiciones pueden causar "
-"sugerencias erróneas para las compras de algunos períodos posteriores.\n"
-"- Si ha realizado la planificación de unos pocos períodos posteriores y "
-"encuentra que las Salidas Confirmadas reales son mayores de lo previsto en "
-"algunos períodos antes de que pueda repetirse la Planificación y realizar "
-"otra adquisición. Debe hacerlo en la misma línea de la planificación. Si se "
-"crea otra línea de planificación de sugerencias puede estar equivocada.\n"
-"- Cuando desea trabajar con diferentes períodos para una parte de los "
-"productos, defina dos tipos de períodos (pe. semanal y mensual) y los "
-"utilícelos para diferentes productos. Ejemplo: si utiliza siempre los "
-"períodos semanales para los productos A, y los períodos mensuales de los "
-"productos B todos sus cálculos funcionarán correctamente. También puede "
-"utilizar diferentes tipos de períodos para los mismos productos de "
-"diferentes almacenes de diferentes compañías. Pero no se pueden utilizar "
-"períodos solapados para el mismo producto de un almacén, y compañía porque "
-"los resultados pueden ser impredecibles. Lo mismo se aplica a las líneas de "
-"Previsiones.\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:140
-#, python-format
-msgid "Cannot delete Validated Sale Forecasts !"
-msgstr "¡ No se pueden borrar previsiones de ventas validadas !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#: code:addons/stock_planning/stock_planning.py:683
-#, python-format
-msgid ""
-"\n"
-" Planned Out: "
-msgstr ""
-"\n"
-" Salidas planificadas: "
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:667
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"¡Debe especificar un almacén de origen diferente del almacén calculado (de "
-"destino)!"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Crear previsiones de ventas"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Creates forecast lines for selected warehouse and period."
-msgstr "Crear líneas de previsión para el almacén y periodo seleccionados."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:656
-#, python-format
-msgid "%s Requisition (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:655
-#, python-format
-msgid "Requisition ("
-msgstr "Solicitud ("
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period. As a difference between "
-"Planned Out and Confirmed Out. For current period Already Out is also "
-"calculated"
-msgstr ""
-"Cantidad prevista para salir en el período seleccionado. Diferencia entre "
-"las salidas previstas y las salidas confirmadas. Para el periodo actual "
-"también se calculan las salidas realizadas."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Periodo4"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:642
-#: code:addons/stock_planning/stock_planning.py:684
-#, python-format
-msgid "    Already In: "
-msgstr "    Entradas realizadas: "
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Periodo2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Periodo3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Periodo1"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:647
-#: code:addons/stock_planning/stock_planning.py:689
-#, python-format
-msgid "    Minimum stock: "
-msgstr "    Stock mínimo: "
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "UdM activa"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Crear líneas de planificación de stock"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Información general"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Previsión de ventas"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Planificación y situación para el periodo calculado"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Peridodo de este almacen1"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Previsión almacen"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:643
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid "    Confirmed In: "
-msgstr "    Entradas confirmadas: "
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Histórico de ventas"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Almacén origen"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecasted quantity."
-msgstr "Cantidad prevista."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Stock"
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Ubicación suministro de stock"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Fecha de fin para el periodo planificado."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "El periodo de este usuario2"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Marque esta opción para crear la planificación de todos los productos que "
-"tengan cualquier previsión en el almacén y periodo seleccionado. El campo "
-"categoría de producto será ignorado."
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Entradas realizadas"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Categoría UdM producto"
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Entradas confirmadas"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Pasado/Futuro"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Categoría UdV producto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Product Quantity"
-msgstr "Cantidad de producto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Copiar última previsión"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Muestra a qué producto concierne esta previsión"
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Hecho"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Periodos"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:638
-#: code:addons/stock_planning/stock_planning.py:680
-#, python-format
-msgid " according to state:"
-msgstr " según el estado:"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Validado"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Copiar cantidades desde el stock pasado y previsión de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "El periodo de este depto.1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "El periodo de este depto.3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "El periodo de este depto.2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "El periodo de este depto.5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "El periodo de este depto.4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "El periodo de este almacén2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "El periodo de este almacén3"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Salidas confirmadas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "UdM por defecto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "El periodo de este almacén4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "El periodo de este almacén5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Actual"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planificación"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Muestra a qué almacén concierne esta previsión. Si durante la planificación "
-"de stock necesita previsiones de ventas para todos los almacenes escoja "
-"ahora un almacén cualquiera."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Almacén que se referirá la planificación"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:647
-#: code:addons/stock_planning/stock_planning.py:689
-#, python-format
-msgid ""
-"\n"
-" Stock Simulation: "
-msgstr ""
-"\n"
-" Simulación de stock: "
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Introducir la cantidad que (por su plan) debe entrar. Cambie este valor y "
-"observe la simulación de stock. Este valor debería ser igual o superior a "
-"las entradas confirmadas."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Periodo al cual concierne la planificación"
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Salidas realizadas"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Producto para el que ha sido creada esta planificación."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Por almacén :"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:639
-#: code:addons/stock_planning/stock_planning.py:681
-#, python-format
-msgid ""
-"\n"
-" Warehouse Forecast: "
-msgstr ""
-"\n"
-" Previsión almacén: "
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Histórico abastecimientos"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Fecha inicial para el periodo planificado."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#: code:addons/stock_planning/stock_planning.py:683
-#, python-format
-msgid "    Planned In: "
-msgstr "    Entradas planificadas: "
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Por compañía"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Cantidad restante de la cantidad entrante planificada. Se calcula mediante "
-"la diferencia entre las entradas planificadas y las entradas confirmadas. "
-"Para el periodo actual las entradas realizadas también se calculan. Este "
-"valor se usa para crear abastecimientos para la cantidad faltante."
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-"Cantidades de todas las entradas confirmadas en el periodo calculado."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warhouse' with Supply Warehouse."
-msgstr ""
-"Marque esta opción para suministrar desde la ubicación stock del almacén de "
-"suministro. Si no se marca, el suministro se realizará desde la ubicación de "
-"salida del almacén de suministro. Utilizado en 'Suministrar desde otro "
-"almacén' con un almacén de suministro."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Núm. solicitud"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-msgstr ""
-"Cantidad mínima establecida en las reglas de stock mínimo para este almacén."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Muestra a que periodo concierne esta previsión."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Simulación calculada del periodo"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:638
-#: code:addons/stock_planning/stock_planning.py:680
-#, python-format
-msgid ""
-"\n"
-"For period: "
-msgstr ""
-"\n"
-"Por periodo: "
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "UdM de producto"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:627
-#: code:addons/stock_planning/stock_planning.py:673
-#: code:addons/stock_planning/stock_planning.py:697
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:627
-#: code:addons/stock_planning/stock_planning.py:671
-#: code:addons/stock_planning/stock_planning.py:693
-#, python-format
-msgid "MPS("
-msgstr "MPS("
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:680
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Abastecimiento a ubicación stock"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Aprobar"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-"Periodo para esta planificación. Se creará una solicitud al principio del "
-"periodo."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Calcular historial de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Cantidad de producto"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Marcar para usar sólo las previsiones validadas. Si no se marca el sistema "
-"usa las previsiones validadas y borrador."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Periodo5"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-msgid "Stock and Sales Planning Periods"
-msgstr "Periodos de planificación de stock y ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Este almacén"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock and Sales Periods"
-msgstr "Periodos de stock y ventas"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Muestra quién creó esta previsión, o quién la validó."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:644
-#: code:addons/stock_planning/stock_planning.py:686
-#, python-format
-msgid ""
-"\n"
-" Planned Out Before: "
-msgstr ""
-"\n"
-" Salidas planificadas antes: "
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Stock inicial"
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Planificación manual para "
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "Abastecimiento creado en MPS por el usuario: "
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Lista de recogida "
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Albarán creado desde MPS por el usuario: "
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre del modelo inválido en la definición de acción."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/stock_planning/i18n/es_VE.po b/addons/stock_planning/i18n/es_VE.po
deleted file mode 100644
index 6e5078e5364..00000000000
--- a/addons/stock_planning/i18n/es_VE.po
+++ /dev/null
@@ -1,1889 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-01-18 22:43+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:51+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"¡No hay previsiones para el periodo seleccionado o no hay productos en la "
-"categoría seleccionada!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Marque esta opción para calcular el stock sólo de la ubicación stock del "
-"almacén seleccionado. Si no se marca, el cálculo se realiza para las "
-"ubicaciones de entrada, stock y salida del almacén."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Regla máximo"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Copmany Period1"
-msgstr "Esta compañía período1"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Valor de la previsión que será convertido en cantidad de producto en función "
-"de precios."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:621
-#: code:addons/stock_planning/stock_planning.py:663
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "¡Entradas restantes debe ser mayor que 0!"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Salidas planificadas en periodos anteriores al calculado. Entre la fecha de "
-"inicio del periodo actual y un día antes del comienzo del periodo calculado."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "¡No hay productos en la categoría seleccionada!"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Almacén al que conciernen las previsiones. Si durante la planificación de "
-"stock necesita previsiones de ventas para todos los almacenes escoja ahora "
-"un almacén cualquiera."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Salidas previstas"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Entradas restantes"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Requisition history"
-msgstr "Historial demandas"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Crear líneas de previsiones"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr "Cantidades de todas las salidas confirmadas en el periodo calculado."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Crear periodos diarios"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:640
-#: code:addons/stock_planning/stock_planning.py:682
-#, python-format
-msgid ""
-"\n"
-" Initial Stock: "
-msgstr ""
-"\n"
-" Stock inicial: "
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Todas las previsiones de ventas para el almacén seleccionado del producto "
-"seleccionado durante el periodo seleccionado."
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock and Sales Periods"
-msgstr "Crear periodos de stock y ventas"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Indicadores de reglas de stock mínimo"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Periodo al que conciernen las previsiones."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Sólo ubicaciones de stock"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-"Cantidades que ya se enviaron fuera de este almacén en el período actual."
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Chect to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-"Marque esta opción para realizar los abastecimientos en la ubicación stock "
-"del almacén seleccionado. Si no se marca, el abastecimiento se realizará en "
-"la ubicación de entrada del almacén."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Situación del periodo actual"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Crear periodos mensuales"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warhouse'."
-msgstr ""
-"Almacén usado como origen en el movimiento de suministro creado por "
-"'Suministrar desde otro almacén'."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.periodo.crearlíneas"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Salidas planificadas antes"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Todos los productos con previsión"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Periodos :"
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-"Cantidades que ya han sido recogidas en este almacén en el periodo actual."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:644
-#: code:addons/stock_planning/stock_planning.py:686
-#, python-format
-msgid "    Confirmed In Before: "
-msgstr "    Entradas confirmadas antes: "
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Previsiones de stock y ventas"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.ventas.prevision"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_dept_id:0
-msgid "This Department"
-msgstr "Este departamento"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Entradas planificadas"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Simulación de stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planificación.crearlíneas"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Entradas confirmadas en periodos anteriores al calculado (incluyendo las "
-"entradas realizadas). Entre la fecha de inicio del periodo actual y un día "
-"antes del comienzo del periodo calculado."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Buscar previsiones de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "El periodo de este usuario5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-"Historial de abastecimiento o suministro interno de esta línea de "
-"planificación."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Todas las previsiones para la compañía entera (para todos los almacenes) del "
-"producto seleccionado durante el periodo seleccionado."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "El periodo de este usuario1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "El periodo de este usuario3"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Planificación de stock"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Regla de mínimos"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Entradas abastecimiento restante"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:646
-#: code:addons/stock_planning/stock_planning.py:688
-#, python-format
-msgid "    Incoming Left: "
-msgstr "    Entradas restante: "
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:719
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Crear"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.module.module,shortdesc:stock_planning.module_meta_information
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Plan maestro de abastecimiento"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:636
-#: code:addons/stock_planning/stock_planning.py:678
-#, python-format
-msgid "  Creation Date: "
-msgstr "  Fecha de creación: "
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Periodo"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "Categoría de los productos cuyas previsiones se crearán."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "periodo stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.venta.previsión.crearlíneas"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Simulación de stock al final del período seleccionado.\n"
-" Para el periodo actual es: \n"
-"Stock inicial – salidas + entradas – salidas previstas + entradas "
-"esperadas.\n"
-" Para los siguientes periodos es: \n"
-"Stock inicial – salidas previstas anteriores + entradas anteriores – salidas "
-"previstas + entradas previstas."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Seleccione esta casilla para ver las ventas de todda la compañía."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Buscar planificación de stock"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Entradas antes"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Categoría de producto"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:621
-#: code:addons/stock_planning/stock_planning.py:663
-#: code:addons/stock_planning/stock_planning.py:665
-#: code:addons/stock_planning/stock_planning.py:667
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "¡ Error !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#, python-format
-msgid "Manual planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Este usuario"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:643
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"\n"
-" Confirmed Out: "
-msgstr ""
-"\n"
-" Salidas confirmadas: "
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Previsiones"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Abastecer desde otro almacen"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Calcular planificación"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:636
-#, python-format
-msgid ""
-" Procurement created in MPS by user: %s   Creation Date: %s                  "
-"                       \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:140
-#, python-format
-msgid "Invalid action !"
-msgstr "¡Acción no válida!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Cantidad stock un día antes del periodo actual."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Crear periodos semanales"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-msgstr ""
-"Cantidad máxima establecida en las reglas de stock mínimo para este almacén."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:665
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "¡Debe especificar un almacén origen!"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-msgid "Creates planning lines for selected period and warehouse."
-msgstr ""
-"Crea líneas de planificación para el periodo y almacen seleccionados."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Este periodo de usuario4"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Note: Doesn't duplicate existing lines created by you."
-msgstr "Nota: No duplica las líneas creadas por usted."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Periodo de stock y ventas"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Previsión de la compañía"
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quanities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-"Unidad de medida utilizada para mostrar las cantidades calculadas de stock. "
-"Puede utilizar las unidades de la categoría por defecto o las de la segunda "
-"categoría (categoría UdV)."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Por usuario :"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Previsiones de ventas"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Nombre del período"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Creado/Validado por"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Suministro interno"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "El periodo de esta compañía4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "El periodo de esta compañía5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "El periodo de esta compañía2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "El periodo de esta compañía3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:642
-#: code:addons/stock_planning/stock_planning.py:684
-#, python-format
-msgid ""
-"\n"
-" Already Out: "
-msgstr ""
-"\n"
-" Salidas realizadas: "
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Previsiones validadas"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"Se creará la planificación para los productos de la categoría de productos "
-"seleccionada con este campo. Este campo se ignora cuando se marca la opción "
-"\"Todas las previsiones de productos”."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Salidas planificadas"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Por departamento:"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Previsión"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Cerrada"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Almacén "
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:646
-#: code:addons/stock_planning/stock_planning.py:688
-#, python-format
-msgid ""
-"\n"
-" Expected Out: "
-msgstr ""
-"\n"
-" Salidas previstas: "
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create periods for Stock and Sales Planning"
-msgstr "Crear periodos para planificación de stock y ventas"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Introduzca la cantidad saliente planificada para el almacén seleccionado "
-"durante el periodo seleccionado y para el producto seleccionado. Para "
-"planificar este valor puede fijarse en las salidas confirmadas o las "
-"previsiones de ventas. Este valor debería ser igual o superior a las salidas "
-"confirmadas."
-
-#. module: stock_planning
-#: model:ir.module.module,description:stock_planning.module_meta_information
-msgid ""
-"\n"
-"This module is based on original OpenERP SA module stock_planning version "
-"1.0 of the same name Master Procurement Schedule.\n"
-"\n"
-"Purpose of MPS is to allow create a manual procurement (requisition) apart "
-"of MRP scheduler (which works automatically on minimum stock rules).\n"
-"\n"
-"Terms used in the module:\n"
-"- Stock and Sales Period - is the time (between Start Date and End Date) for "
-"which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-"- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-"the Period.\n"
-"- Stock Planning - is the quantity of products you plan to purchase or "
-"produce for the Period.\n"
-"\n"
-"Because we have another module sale_forecast which uses terms \"Sales "
-"Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-"Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-"values. \n"
-"\n"
-"Activity with this module is divided to three steps:\n"
-"- Creating Periods. Mandatory step.\n"
-"- Creating Sale Forecasts and entering quantities to them. Optional step but "
-"useful for further planning.\n"
-"- Creating Planning lines, entering quantities to them and making "
-"Procurement. Making procurement is the final step for the Period.\n"
-"\n"
-"Periods\n"
-"=======\n"
-"You have two menu items for Periods in \"Sales Management - Configuration\". "
-"There are:\n"
-"- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-"monthly periods.\n"
-"- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-"change the dates and change the State of period.\n"
-"\n"
-"Creating periods is the first step you have to do to use modules features. "
-"You can create custom periods using \"New\" button in \"Stock and Sales "
-"Periods\" form or view but it is recommended to use automating tool.\n"
-"\n"
-"Remarks:\n"
-"- These periods (officially Stock and Sales Periods) are separated of "
-"Financial or other periods in the system.\n"
-"- Periods are not assigned to companies (when you use multicompany feature "
-"at all). Module suppose that you use the same periods across companies. If "
-"you wish to use different periods for different companies define them as you "
-"wish (they can overlap). Later on in this text will be indications how to "
-"use such periods.\n"
-"- When periods are created automatically their start and finish dates are "
-"with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-"periods they will have start date 31.01.2010 00:00:00 and end date "
-"31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-"you create periods manually you have to take care about hours because you "
-"can have incorrect values form sales or stock. \n"
-"- If you use overlapping periods for the same product, warehouse and company "
-"results can be unpredictable.\n"
-"- If current date doesn't belong to any period or you have holes between "
-"periods results can be unpredictable.\n"
-"\n"
-"Sales Forecasts\n"
-"===============\n"
-"You have few menus for Sales forecast in \"Sales Management - Sales "
-"Forecasts\".\n"
-"- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-"forecasts lines according to some parameters.\n"
-"- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-"forms.\n"
-"\n"
-"Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-"products from selected Category, for selected Period and for selected "
-"Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-"settings of period before this one to created one.\n"
-"\n"
-"Remarks:\n"
-"- This tool doesn't create lines, if relevant lines (for the same Product, "
-"Period, Warehouse and validated or created by you) already exists. If you "
-"wish to create another forecast, if relevant lines exists you have to do it "
-"manually using menus described bellow.\n"
-"- When created lines are validated by someone else you can use this tool to "
-"create another lines for the same Period, Product and Warehouse. \n"
-"- When you choose \"Copy Last Forecast\" created line takes quantity and "
-"some settings from your (validated by you or created by you if not validated "
-"yet) forecast which is for last period before period of created forecast. If "
-"there are few your forecasts for period before this one (it is possible) "
-"system takes one of them (no rule which of them).\n"
-"\n"
-"\n"
-"Menus \"Sales Forecasts\"\n"
-"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-"\"Product Quantity\". Further calculation can work for draft forecasts. But "
-"validation can save your data against any accidental changes. You can click "
-"\"Validate\" button but it is not mandatory.\n"
-"\n"
-"Instead of forecast quantity you can enter amount of forecast sales in field "
-"\"Product Amount\". System will count quantity from amount according to Sale "
-"price of the Product.\n"
-"\n"
-"All values on the form are expressed in unit of measure selected on form. "
-"You can select one of unit of measure from default category or from second "
-"category. When you change unit of measure the quanities will be recalculated "
-"according to new UoM: editable values (blue fields) immediately, non edited "
-"fields after clicking of \"Calculate Planning\" button.\n"
-"\n"
-"To find proper value for Sale Forecast you can use \"Sales History\" table "
-"for this product. You have to enter parameters to the top and left of this "
-"table and system will count sale quantities according to these parameters. "
-"So you can select fe. your department (at the top) then (to the left): last "
-"period, period before last and period year ago.\n"
-"\n"
-"Remarks:\n"
-"\n"
-"\n"
-"Procurement Planning\n"
-"====================\n"
-"Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-"- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-"lines according to some parameters.\n"
-"- \"Master Procurement Scheduler\" - is the most important menu of the "
-"module which allows to create procurement.\n"
-"\n"
-"As Sales forecast is phase of planning sales. The Procurement Planning "
-"(Planning) is the phase of scheduling Purchasing or Producing. You can "
-"create Procurement Planning quickly using tool from menu \"Create Stock "
-"Planning Lines\", then you can review created planning and make procurement "
-"using menu \"Master Procurement Schedule\".\n"
-"\n"
-"Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-"lines for products from selected Category, for selected Period, and for "
-"selected Warehouse. When you check option \"All Products with Forecast\" "
-"system creates lines for all products having forecast for selected Period "
-"and Warehouse. Selected Category will be ignored in this case.\n"
-"\n"
-"Under menu \"Master Procurement Scheduler\" you can generally change the "
-"values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-"Simulation\" and decide if this value would be accurate for end of the "
-"Period. \n"
-"\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-"all forecasts for Period and Warehouse. But your planning can be based on "
-"any other information you have. It is not necessary to have any forecast. \n"
-"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-"is the quantity to be procured to make stock as indicated in \"Stock "
-"Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-"quantity to minimum stock rules visible on the form. But you can plan "
-"different quantity than in Minimum Stock Rules. Calculation is made for "
-"whole Warehouse by default. But if you want to see values for Stock location "
-"of calculated warehouse you can use check box \"Stock Location Only\".\n"
-"\n"
-"If after few tries you decide that you found correct quantities for "
-"\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-"stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-"Left\" button to procure quantity of field \"Incoming Left\" into the "
-"Warehouse. System creates appropriate Procurement Order. You can decide if "
-"procurement will be made to Stock or Input location of calculated Warehouse. "
-"\n"
-"\n"
-"If you don't want to Produce or Buy the product but just pick calculated "
-"quantity from another warehouse you can click \"Supply from Another "
-"Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-"with move from selected source Warehouse to calculated Warehouse (as "
-"destination). You can also decide if this pick should be done from Stock or "
-"Output location of source warehouse. Destination location (Stock or Input) "
-"of destination warehouse will be used as set for \"Procure Incoming Left\". "
-"\n"
-"\n"
-"To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-"\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-"have to click button \"Calculate Planning\".\n"
-"\n"
-"All values on the form are expressed in unit of measure selected on form. "
-"You can select one of unit of measure from default category or from second "
-"category. When you change unit of measure the quanities will be recalculated "
-"according to new UoM: editable values (blue fields) immediately, non edited "
-"fields after clicking of \"Calculate Planning\" button.\n"
-"\n"
-"How Stock Simulation field is calculated:\n"
-"Generally Stock Simulation shows the stock for end of the calculated period "
-"according to some planned or confirmed stock moves. Calculation always "
-"starts with quantity of real stock of beginning of current period. Then "
-"calculation adds or subtracts quantities of calculated period or periods "
-"before calculated.\n"
-"When you are in the same period (current period is the same as calculated) "
-"Stock Simulation is calculated as follows:\n"
-"Stock Simulation = \n"
-"\tStock of beginning of current Period\n"
-"\t- Planned Out \n"
-"\t+ Planned In\n"
-"\n"
-"When you calculate period next to current:\n"
-"Stock Simulation = \n"
-"\tStock of beginning of current Period\n"
-"\t- Planned Out of current Period \n"
-"\t+ Confirmed In of current Period  (incl. Already In)\n"
-"\t- Planned Out of calculated Period \n"
-"\t+ Planned In of calculated Period .\n"
-"\n"
-"As you see calculated Period is taken the same way like in case above. But "
-"calculation of current Period are made a little bit different. First you "
-"should note that system takes for current Period only Confirmed In moves. It "
-"means that you have to make planning and procurement for current Period "
-"before this calculation (for Period next to current). \n"
-"\n"
-"When you calculate Period ahead:\n"
-"Stock Simulation = \n"
-"\tStock of beginning of current Period \n"
-"\t- Sum of Planned Out of Periods before calculated \n"
-"\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-"\t- Planned Out of calculated Period \n"
-"\t+ Planned In of calculated Period.\n"
-"\n"
-"Periods before calculated means periods starting from current till period "
-"before calculated.\n"
-"\n"
-"Remarks:\n"
-"- Remember to make planning for all periods before calculated because "
-"omitting these quantities and procurements can cause wrong suggestions for "
-"procurements few periods ahead.\n"
-"- If you made planning few periods ahead and you find that real Confirmed "
-"Out is bigger than Planned Out in some periods before you can repeat "
-"Planning and make another procurement. You should do it in the same planning "
-"line. If you create another planning line the suggestions can be wrong.\n"
-"- When you wish to work with different periods for some part of products "
-"define two kinds of periods (fe. Weekly and Monthly) and use them for "
-"different products. Example: If you use always Weekly periods for Products "
-"A, and Monthly periods for Products B your all calculations will work "
-"correctly. You can also use different kind of periods for the same products "
-"from different warehouse or companies. But you cannot use overlapping "
-"periods for the same product, warehouse and company because results can be "
-"unpredictable. The same apply to Forecasts lines.\n"
-msgstr ""
-"\n"
-"Este módulo se basa en la versión original de OpenERP stock_planning SA "
-"módulo 1.0 del mismo nombre Programador de Compras Maestras.\n"
-"\n"
-"El propósito de la MPS es permitir crear un manual de contratación "
-"(solicitud), aparte del programador MRP (que funciona automáticamente, "
-"basándose en reglas de existencias mínimas).\n"
-"\n"
-"Los términos utilizados en el módulo:\n"
-"- Stock y Período de ventas - es el tiempo (entre Fecha de inicio y Fecha de "
-"finalización) para el que planifica el Stock y la Previsión de Ventas y hace "
-"la Planificación de las Compras.\n"
-"- Stock y pronóstico de ventas - es la cantidad de productos que planea "
-"vender en el Período.\n"
-"- Planificación de Stock - es la cantidad de productos que planea comprar o "
-"producir para el Período.\n"
-"\n"
-"Porque tenemos otra módulo sale_forecast que utiliza los términos "
-"\"Pronóstico de Ventas\" y \"Planificación\" como valores de cantidad, "
-"utilizaremos términos \"Stock y Pronóstico de Ventas\" y \"Planificación del "
-"Stock\" para hacer hincapié en que usamos los valores de cantidad.\n"
-"\n"
-"La actividad con este módulo se divide en tres pasos:\n"
-"- Creación de Períodos. Paso obligatorio.\n"
-"- Creación de Pronósticos de Venta e introducción de sus cantidades. Un paso "
-"opcional pero útil para una mayor planificación.\n"
-"- Creación de líneas de Planificación, introducción de sus cantidades y "
-"hacer Adquisiciones. Hacer compras es el paso final para el Período.\n"
-"\n"
-"Períodos\n"
-"=========\n"
-"Tiene dos opciones de menú para Períodos en \"Gestión de Ventas - "
-"Configuración\". Son las siguientes:\n"
-"- \"Crear los Períodos de Ventas\" - Que automatiza la creación de periodos "
-"diarios, semanales o mensuales.\n"
-"- \"Stock y Períodos de ventas\" - Que permite crear cualquier tipo de "
-"períodos, el cambio de las fechas y el cambio del Estado del período.\n"
-"\n"
-"Creación de periodos es el primer paso que tiene que hacer para utilizar las "
-"funciones de los módulos. Puede crear períodos personalizados mediante el "
-"botón \"Nuevo\" en el formulario o vista de \"Stock y Períodos de Ventas\", "
-"pero se recomienda utilizar la herramienta automática.\n"
-"\n"
-"Observaciones:\n"
-"- Estos períodos (Stock oficial y Períodos de Ventas) están separan de "
-"Finanzas o de otros períodos en el sistema.\n"
-"- Los Períodos no se asignan a las compañías (en ningún caso cuando se "
-"utiliza la función multicompañía). El módulo supone que utiliza los mismos "
-"períodos a través de las compañías. Si desea utilizar períodos diferentes "
-"para diferentes compañías defínalos a su gusto (pueden solaparse). Más "
-"adelante en este texto se indica cómo utilizar esos períodos.\n"
-"- Cuando los períodos son creados automáticamente sus fechas de inicio y "
-"final se inician con la hora 00:00:00 y 23:59:00 como hora final. Pe.cuando "
-"crea períodos diarios tendrán fecha de inicio 01.31.2010 00:00:00 y fecha de "
-"finalización 01.31.2010 23:59:00. Funciona sólo en la creación automática de "
-"los períodos. Cuando crea períodos manualmente hay que tener cuidado con las "
-"horas, ya que puede tener valores incorrectos en ventas y stock.\n"
-"- Si utiliza períodos solapados para el mismo producto, almacén y compañía, "
-"los resultados pueden ser impredecibles.\n"
-"- Si la fecha actual no pertenece a ningún período o si tiene agujeros entre "
-"los períodos los resultados pueden ser impredecibles.\n"
-"\n"
-"Previsión de ventas\n"
-"====================\n"
-"Tiene menús pocas ventas previsto en \"Gestión de Ventas - Pronósticos de "
-"Ventas\".\n"
-"- \"Creación de Pronósticos de Ventas para los Períodos de Ventas\" - que "
-"automatiza la creación de líneas de previsiones de acuerdo con algunos "
-"parámetros.\n"
-"- \"Las Previsiones de Ventas\" - algunos menús para trabajar con listas de "
-"las previsiones y las formas.\n"
-"\n"
-"Menú \"Crear Pronósticos de Ventas para Períodos de Ventas\" crea "
-"Pronósticos para los productos de la Categoría seleccionada, para el Período "
-"y Almacén seleccionado. Es una opción \"Copia del Último Pronóstico\" para "
-"copiar previsiones y otros ajustes del período anterior a éste para crear "
-"uno.\n"
-"\n"
-"Observaciones:\n"
-"- Esta herramienta no crea líneas, si las líneas oportunas (para el mismo "
-"Producto, Período y Almacén, y validado o creado por usted) ya existen. Si "
-"desea crear otro pronóstico, si las líneas pertinentes existen tiene que "
-"hacerlo manualmente usando los menús que se describen a continuación.\n"
-"- Cuando las líneas se crean son validadas por otra persona que puede "
-"utilizar esta herramienta para crear otras líneas para el mismo Período, "
-"Producto y Almacén.\n"
-"- Cuando se elige \"Copiar Último Pronóstico\" la línea creada tiene la "
-"cantidad y algunos ajustes de su (validado o creadas por usted, si no se ha "
-"validado aún) pronostico que para el último período anterior al período de "
-"la previsión creada. Si hay pocos pronósticos para el período anterior a "
-"éste (es posible) el sistema toma una de ellos (no existe regla sobre "
-"cual).\n"
-"\n"
-"\n"
-"Menús \"Previsión de Ventas\"\n"
-"En el formulario \"Pronóstico de Ventas\" principalmente tiene que "
-"introducir una cantidad prevista en la \"Cantidad de Producto\". Además del "
-"cálculo puede funcionar para las previsiones borrador. Sin embargo, la "
-"validación puede guardar sus datos contra cualquier cambio accidental. Puede "
-"hacer clic en botón \"Validar\", pero no es obligatorio.\n"
-"\n"
-"En lugar de la cantidad prevista se puede introducir la cantidad de "
-"previsión de ventas en el campo \"Cantidad de Producto\". El sistema contará "
-"la cantidad en función del Precio de Venta del Producto.\n"
-"\n"
-"Todos los valores del formulario se expresan en la unidad de medida "
-"seleccionada en el formulario. Usted puede seleccionar uno de la unidad de "
-"medida de la categoría por defecto o de segunda categoría. Cuando se cambia "
-"la unidad de medida las cantiades se volverán a calcular de acuerdo con la "
-"nueva UoM: los valores editables (campos azules) inmediatamente, los campos "
-"no editables después de hacer clic en el botón \"Calcular Planificación\".\n"
-"\n"
-"Para encontrar el valor adecuado para Pronóstico de Venta se puede utilizar "
-"la tabla \"Historial de ventas\" para este producto. Tienes que introducir "
-"los parámetros en la parte superior izquierda de esta tabla y el sistema "
-"contará las vantidades venta de acuerdo con estos parámetros. Así que usted "
-"puede seleccionar, pe. de su departamento (en la parte superior) y luego (a "
-"la izquierda): el último período, el período anterior al último y el período "
-"de hace un año.\n"
-"\n"
-"Observaciones:\n"
-"\n"
-"\n"
-"Planificación de las compras\n"
-"====================\n"
-"Menú para la Planificación de lo que puedes encontrar en \"Almacén - "
-"Planificación del Stock\".\n"
-"- \"Crear archivo de Planificación Lines\" - le permite automatizar la "
-"creación de líneas de planificación de acuerdo con algunos parámetros.\n"
-"- \"Programador Maestro de Adquisiciones\" - es el menú más importante del "
-"módulo que permite la creación de la contratación.\n"
-"\n"
-"Con arreglo a las previsiones de ventas, es la fase de planificación de "
-"ventas. La Planificación de compras (planificación) es la fase de "
-"programación de compras o de producción. Usted puede crear la planificación "
-"de las compras rápidamente con la herramienta del menú \"Crear Líneas de "
-"Planificación de Stock\", entonces puede revisar la planificación creada y "
-"hacer compras usando el menú \"Lista Maestra de Adquisiciones\".\n"
-"\n"
-"Menú \"Crear Líneas de Planificación de Stock\" le permite crear rápidamente "
-"las Líneas de Planificación de productos de la categoría seleccionada, en "
-"determinados períodos, y para el almacén seleccionado. Al marcar la opción "
-"\"Todos los productos con Pronóstico\" el sistema crea las líneas para todos "
-"los productos que tiene previsto para el Período seleccionado y Almacén. La "
-"Categoría seleccionada se tendrá en cuenta en este caso.\n"
-"\n"
-"Debajo del menú \"Programador Maestro de Adquisiciones\" por lo general, "
-"puede cambiar los valores \"Salidas planificadas\" y \"Entradas "
-"planificadas\" para observar el campo \"Simulación de Stock\" y decidir si "
-"este valor es exacto para el final del período.\n"
-"\"Planeado\" puede basarse en la \"Pronóstico de Almacén\", que es la suma "
-"de todas las previsiones para el período y Almacén. Pero la planificación se "
-"puede basar en cualquier otra información que usted tenga. No es necesario "
-"tener ningún pronóstico.\n"
-"\"Entradas planificadas\" la cantidad se utiliza para calcular el campo "
-"\"Entradas Restantes\" que es la cantidad que falta por adquirir para "
-"alcanzar el stock, como se indica en la \"Simulación de Stock\" al final del "
-"período. Usted puede comparar la \"Simulación de Stock\" con las normas de "
-"cantidad mínima de existencias visibles en el formulario. Pero puede planear "
-"una cantidad diferente al de las Reglas Mínimas de Stock. El cálculo está "
-"hecho para todo el almacén por defecto. Pero si usted quiere ver los valores "
-"de la ubicación del stock del almacén calculado, puede utilizar la casilla "
-"\"Sólo Ubicación del Stock\".\n"
-"\n"
-"Si después de varios intentos decide que las cantidades son correctas para "
-"lo \"Salidas planificadas\" y lo \"Entradas planificadas\" y que está "
-"satisfecho con el final de existencias del período calculado en la "
-"\"Simulación del Stock\" puede hacer clic en \"Adquirir Entradas Restantes\" "
-"para obtener la cantidad del campo \"Entradas Restantes\" en el Almacén. El "
-"sistema crea la correspondiente Orden de Compras. Usted puede decidir si la "
-"contratación se hará para el stock o para la ubicación de entrada del "
-"Almacén calculado.\n"
-"\n"
-"Si no quieres Producir o Comprar el producto, pero sólo debes elegir la "
-"cantidad calculada, desde otro almacén puede hacer clic en \"Suministro "
-"desde Otro Almacén\" (en lugar de \"Adquirir Entradas Restantes\"). El "
-"sistema crea la lista de selección desde el Almacén origen seleccionado "
-"hasta el Almacén calculado (como destino). También puede decidir si esta "
-"selección debe hacerse de almacén o la ubicación de salida del almacén de "
-"origen. La ubicación de destino (almacén o entrada) del almacén de destino, "
-"se utilizará como establecido para \"Adquirir Entradas Restantes\".\n"
-"\n"
-"Para ver las cantidades adecuadas en los campos \"Entrada Confirmada\", "
-"\"Salida Confirmada\", \"Entrada Confirmada Antes\", \"Salidas planificadas "
-"antes\" y \"Simulación de Stock\" tiene que hacer clic en el botón "
-"\"Calcular Planificación\".\n"
-"\n"
-"Todos los valores en el formulario se expresan en la unidad de medida "
-"seleccionada en el formulario. Usted puede seleccionar uno de la unidad de "
-"medida de la categoría por defecto o de una segunda categoría. Cuando se "
-"cambia la unidad de medida las cantidades se volverán a calcular de acuerdo "
-"con UoM: los valores editables inmediatamente (campos azules), los campos no "
-"editables después de hacer clic en el botón \"Calcular Planificación\".\n"
-"\n"
-"Cómo se calcula el campo Simulación del Stock:\n"
-"Generalmente la Simulación del Stock muestra el stock al final período "
-"calculado de acuerdo con algunos movimientos de stock previsto o confirmado. "
-"El cálculo se inicia siempre con la cantidad de stock real del inicio del "
-"período actual. Luego se calcula la suma o resta de las cantidades del "
-"período o períodos antes calculados.\n"
-"Cuando está en el mismo período (período actual es el mismo que el "
-"calculado) la Simulación del Stock se calcula como sigue:\n"
-"Simulación de Stock = \n"
-"\t Stock inicial del período actual\n"
-"\t - Salidas planificadas \n"
-"\t + Entradas planificadas\n"
-"\n"
-"Cuando se calcula el período siguiente al actual:\n"
-"Simulación del Stock = \n"
-"\t Stock inicial del período actual \n"
-"\t - Planificación de Salidas del Período actual\n"
-"\t + Entradas Confirmadas en el Período actual (incl. las Entradas ya "
-"existentes)\n"
-"\t - Salidas planificadas del Período calculado \n"
-"\t + Entradas planificadas en el Período calculado.\n"
-"\n"
-"Como puede ver el período calculado se toma de la misma forma que en el caso "
-"anterior. Sin embargo, el cálculo del período actual se hace de manera un "
-"poco diferente. En primer lugar debe tener en cuenta que el sistema tiene "
-"para el Período actual sólo Confirmados los movimientos de entrada. Esto "
-"significa que tiene que hacer la planificación y la compra para Período "
-"actual antes de este cálculo (para el Próximo período al actual).\n"
-"\n"
-"Cuando se calcula el período siguiente:\n"
-"Colección de simulación = \n"
-"\t Stock inicial del Período actual \n"
-"\t - Suma de Planificación de salida de los períodos antes calculados \n"
-"\t + Suma de Confirmados En períodos anteriores calculados (incl. las "
-"entradas ya existentes) \n"
-"\t - Salidas Planificadas del Período calculado \n"
-"\t + Entradas Planificadas del Período calculado.\n"
-"\n"
-"Los períodos anteriores calculados, significa que los períodos comienzados "
-"en el actual hasta el período antes calculado.\n"
-"\n"
-"Observaciones:\n"
-"- Recuerde hacer la planificación para todos los períodos antes calculados "
-"debido a omitir estas cantidades y las adquisiciones pueden causar "
-"sugerencias erróneas para las compras de algunos períodos posteriores.\n"
-"- Si ha realizado la planificación de unos pocos períodos posteriores y "
-"encuentra que las Salidas Confirmadas reales son mayores de lo previsto en "
-"algunos períodos antes de que pueda repetirse la Planificación y realizar "
-"otra adquisición. Debe hacerlo en la misma línea de la planificación. Si se "
-"crea otra línea de planificación de sugerencias puede estar equivocada.\n"
-"- Cuando desea trabajar con diferentes períodos para una parte de los "
-"productos, defina dos tipos de períodos (pe. semanal y mensual) y los "
-"utilícelos para diferentes productos. Ejemplo: si utiliza siempre los "
-"períodos semanales para los productos A, y los períodos mensuales de los "
-"productos B todos sus cálculos funcionarán correctamente. También puede "
-"utilizar diferentes tipos de períodos para los mismos productos de "
-"diferentes almacenes de diferentes compañías. Pero no se pueden utilizar "
-"períodos solapados para el mismo producto de un almacén, y compañía porque "
-"los resultados pueden ser impredecibles. Lo mismo se aplica a las líneas de "
-"Previsiones.\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:140
-#, python-format
-msgid "Cannot delete Validated Sale Forecasts !"
-msgstr "¡ No se pueden borrar previsiones de ventas validadas !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#: code:addons/stock_planning/stock_planning.py:683
-#, python-format
-msgid ""
-"\n"
-" Planned Out: "
-msgstr ""
-"\n"
-" Salidas planificadas: "
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:667
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"¡Debe especificar un almacén de origen diferente del almacén calculado (de "
-"destino)!"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Crear previsiones de ventas"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Creates forecast lines for selected warehouse and period."
-msgstr "Crear líneas de previsión para el almacén y periodo seleccionados."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:656
-#, python-format
-msgid "%s Requisition (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:655
-#, python-format
-msgid "Requisition ("
-msgstr "Solicitud ("
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period. As a difference between "
-"Planned Out and Confirmed Out. For current period Already Out is also "
-"calculated"
-msgstr ""
-"Cantidad prevista para salir en el período seleccionado. Diferencia entre "
-"las salidas previstas y las salidas confirmadas. Para el periodo actual "
-"también se calculan las salidas realizadas."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Periodo4"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:642
-#: code:addons/stock_planning/stock_planning.py:684
-#, python-format
-msgid "    Already In: "
-msgstr "    Entradas realizadas: "
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Periodo2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Periodo3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Periodo1"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:647
-#: code:addons/stock_planning/stock_planning.py:689
-#, python-format
-msgid "    Minimum stock: "
-msgstr "    Stock mínimo: "
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "UdM activa"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Crear líneas de planificación de stock"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Información general"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Previsión de ventas"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Planificación y situación para el periodo calculado"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Peridodo de este almacen1"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Previsión almacen"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:643
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid "    Confirmed In: "
-msgstr "    Entradas confirmadas: "
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Histórico de ventas"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Almacén origen"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecasted quantity."
-msgstr "Cantidad prevista."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Stock"
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Ubicación suministro de stock"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Fecha de fin para el periodo planificado."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "El periodo de este usuario2"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Marque esta opción para crear la planificación de todos los productos que "
-"tengan cualquier previsión en el almacén y periodo seleccionado. El campo "
-"categoría de producto será ignorado."
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Entradas realizadas"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Categoría UdM producto"
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Entradas confirmadas"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Pasado/Futuro"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Categoría UdV producto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Product Quantity"
-msgstr "Cantidad de producto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Copiar última previsión"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Muestra a qué producto concierne esta previsión"
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Hecho"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Periodos"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:638
-#: code:addons/stock_planning/stock_planning.py:680
-#, python-format
-msgid " according to state:"
-msgstr " según el estado:"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Validado"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Copiar cantidades desde el stock pasado y previsión de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "El periodo de este depto.1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "El periodo de este depto.3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "El periodo de este depto.2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "El periodo de este depto.5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "El periodo de este depto.4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "El periodo de este almacén2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "El periodo de este almacén3"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Salidas confirmadas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "UdM por defecto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "El periodo de este almacén4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "El periodo de este almacén5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Actual"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planificación"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Muestra a qué almacén concierne esta previsión. Si durante la planificación "
-"de stock necesita previsiones de ventas para todos los almacenes escoja "
-"ahora un almacén cualquiera."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Almacén que se referirá la planificación"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:647
-#: code:addons/stock_planning/stock_planning.py:689
-#, python-format
-msgid ""
-"\n"
-" Stock Simulation: "
-msgstr ""
-"\n"
-" Simulación de stock: "
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Introducir la cantidad que (por su plan) debe entrar. Cambie este valor y "
-"observe la simulación de stock. Este valor debería ser igual o superior a "
-"las entradas confirmadas."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Periodo al cual concierne la planificación"
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Salidas realizadas"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Producto para el que ha sido creada esta planificación."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Por almacén :"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:639
-#: code:addons/stock_planning/stock_planning.py:681
-#, python-format
-msgid ""
-"\n"
-" Warehouse Forecast: "
-msgstr ""
-"\n"
-" Previsión almacén: "
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Histórico abastecimientos"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Fecha inicial para el periodo planificado."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#: code:addons/stock_planning/stock_planning.py:683
-#, python-format
-msgid "    Planned In: "
-msgstr "    Entradas planificadas: "
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Por compañía"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Cantidad restante de la cantidad entrante planificada. Se calcula mediante "
-"la diferencia entre las entradas planificadas y las entradas confirmadas. "
-"Para el periodo actual las entradas realizadas también se calculan. Este "
-"valor se usa para crear abastecimientos para la cantidad faltante."
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-"Cantidades de todas las entradas confirmadas en el periodo calculado."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warhouse' with Supply Warehouse."
-msgstr ""
-"Marque esta opción para suministrar desde la ubicación stock del almacén de "
-"suministro. Si no se marca, el suministro se realizará desde la ubicación de "
-"salida del almacén de suministro. Utilizado en 'Suministrar desde otro "
-"almacén' con un almacén de suministro."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Núm. solicitud"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-msgstr ""
-"Cantidad mínima establecida en las reglas de stock mínimo para este almacén."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Muestra a que periodo concierne esta previsión."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Simulación calculada del periodo"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Producto"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:638
-#: code:addons/stock_planning/stock_planning.py:680
-#, python-format
-msgid ""
-"\n"
-"For period: "
-msgstr ""
-"\n"
-"Por periodo: "
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "UdM de producto"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:627
-#: code:addons/stock_planning/stock_planning.py:673
-#: code:addons/stock_planning/stock_planning.py:697
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:627
-#: code:addons/stock_planning/stock_planning.py:671
-#: code:addons/stock_planning/stock_planning.py:693
-#, python-format
-msgid "MPS("
-msgstr "MPS("
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:680
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Abastecimiento a ubicación stock"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Aprobar"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-"Periodo para esta planificación. Se creará una solicitud al principio del "
-"periodo."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Calcular historial de ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Cantidad de producto"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Marcar para usar sólo las previsiones validadas. Si no se marca el sistema "
-"usa las previsiones validadas y borrador."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Periodo5"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-msgid "Stock and Sales Planning Periods"
-msgstr "Periodos de planificación de stock y ventas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Este almacén"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock and Sales Periods"
-msgstr "Periodos de stock y ventas"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Muestra quién creó esta previsión, o quién la validó."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:644
-#: code:addons/stock_planning/stock_planning.py:686
-#, python-format
-msgid ""
-"\n"
-" Planned Out Before: "
-msgstr ""
-"\n"
-" Salidas planificadas antes: "
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Stock inicial"
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Planificación manual para "
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "Abastecimiento creado en MPS por el usuario: "
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Lista de recogida "
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Albarán creado desde MPS por el usuario: "
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre del modelo inválido en la definición de acción."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
diff --git a/addons/stock_planning/i18n/fi.po b/addons/stock_planning/i18n/fi.po
deleted file mode 100644
index 4b5620f2f77..00000000000
--- a/addons/stock_planning/i18n/fi.po
+++ /dev/null
@@ -1,1439 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:26+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"Ei ennusteita valitulle ajanjaksolle tai ei tuotteita valitussa kategoriassa "
-"!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Valitse laskeaksesi varatopaikat vain valitussa varastossa. Jos ei valittu, "
-"laskenta tehdään tuleville, varasto ja lähtöpaikoille varastossa."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Maksimisääntä"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Ryhmittely.."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr "Ennustemäärä joka muutetaan tuotemääriksi hintojen mukaan"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "Jäljelläolevan vastaanoton määrä tulee olla yli 0 !"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Suunnitellut lähtömäärät jaksoilla ennen laskentaa. Jakso nykyisen jakson "
-"alkupäivän ja laskettu päivämäärä -1 pv välillä."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Varasto, jota ennusteet koskevat. Jos varastonsuunnittelun aikana tarvitset "
-"myyntiennustetta kaikille varastoille valitse mikä tahansa varasto nyt"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Odotettu lähtö"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Jäljelläolevat saapuvat"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Luo ennusterivit"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-"Kaikkien vahvistettujen lähtevien siirtojen määrä lasketulla ajanjaksolla."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Luo päivittäiset jaksot"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Yritys"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Kaikki myyntiennusteet valitulle varastolle tai valitulle tuotteelle "
-"valittuna ajanjaksona."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Minimivaraston sääntöjen indikaattorit"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Jakso jota ennusteet koskevat."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Vain varastopaikka"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-"Määrä joka on jo lähetetty ulos tästä varastosta nykyisellä jaksolla."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Vahvistetut saapumiset"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Nykyisen jakson tilanne"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Luo kuukausijaksot"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Suunniteltu lähtö ennen"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Kaikki tuotteet joilla ennuste"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr "Maksimimäärä asetettuna minimivarasto säännöissä tälle varastolle"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Jaksot :"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr "Määrä joka on jo keräilty tästä varastosta nykyisellä jaksolla."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Ei tuotteita valitussa kategoriassa !"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Varasto ja myyntiennuste"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Suunniteltu saapuminen"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Varastosimulaatio"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Vahvistetut saapumisjaksot ennen laskettua (mukana myös jo saapuneet). "
-"Nykyisen jakson alkupäivän ja laskettu jakso -1 päivää välillä."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Etsi myyntiennuste"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "Käyttäjän jakso 5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr "Hankintahistoria tai sisäinen toimitus tälle suunnittelulinjalle."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Kaikki myyntiennusteet kokok yritykselle (kaikille varastoille) valitulle "
-"tuotteelle valittuna jaksona."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "Käyttäjän jakso 1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "Käyttäjän jakso 3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Varaston suunnittelu"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Minimisääntö"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Hanki loput saapuvat"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Luo"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Päähankintaaikataulu"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Mennyt/Tuleva"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Tila"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "Tuotekategoria tuotteille jota luotu ennuste koskee"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "Varastojakso"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Varasto"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Valitse tämä nähdäksesi myynnin koko yrityksessä"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Osastoittain :"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Sapuu ennen"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Virhe !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Tämä käyttäjä"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Ennusteet"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Hanki toisesta varastosta"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Laske suunnitelmat"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Virheellinen toiminto!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Varaston määrä päivää ennen nykyistä jaksoa"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr "Hankintahistoria"
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Luo viikottaiset jaksot"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Laske jakson simulaatio"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Peruuta"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Käyttäjän jakso 4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Varasto ja myyntijakso"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Yrityksen ennuste"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-"Mimimimäärä joka on asetettu mimimivarastosäännöissä tälle varastolle"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Käyttäjää kohti :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Varasto jota suunnittelu koskee."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Luonut/Tarkistanut"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Varaston ennuste"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"Sinun pitää määritellä lähtövarasto joka on jokin muu kuin laskettu (kohde) "
-"varasto !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr "Ei voida poistaa vahvistettua myyntiennustett!"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "Yrityksen jakso 5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "Tuotteen mittayksikkö"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr "Tämän yrityksen jakso1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "Yrityksen jakso 2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "Yrityksen jakso 3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Alkupäivä"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "Käyttäjän jakso 2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Tarkistetut ennusteet"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"Suunnittelut luodaan tuotteille tähän kenttään valitusta tuotekategoriasta. "
-"Tämä kenttä ohitetaan jos valitset ruudun \"Kaikki ennustetut tuotteet\""
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Suunniteltu lähtö"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr "Ennustettu määrä"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Ennuste"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Luonnos"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Suljettu"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Varasto "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Suunnittelu ja tilanne lasketulle jaksolle"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Syötä ennustettu lähtevä määrä valitusta varastosta valitulla jaksolla "
-"valitulle tuotteelle. Tämän arvon suunnittelua varten katso vahvistettuja "
-"lähtöjä tai myyntiennusteita."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr "Nykyiset jaksot"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Sisäinen toimitus"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr "%s Keräilylista %s (%s, %s) %s %s \n"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Luo myyntiennusteet"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Jakso 4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Jakson nimi"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Jakso 2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Jakso 3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Jakso 1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Vahvistettu lähtö"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Luo varastosuunnittelun rivit"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Yleiset tiedot"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Myyntiennuste"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Tämän varaston jakso 1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Myyntihistoria"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Lähdevarasto"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr "Ennustettu tuotemäärä."
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Varastotoimituksen paikka"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Suunnittelujakson loppupäivä"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Valitse tämä laatikko luodaksesi suunnitelmat kaikille tuotteille joilla on "
-"ennuste valitulle varastolle ja jaksolle. Tuotekategoria kenttä ohitetaan."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Jo saapuneet"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Tuotteen mittayksikkökategoria"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Jakso"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Tuotteen Varastokategoria"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "Aktiivinen mittayksikkö"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Hae varastosuunnitelma"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Kopioi viimeinen ennuste"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Näyttää mitä tuotetta tämä ennuste koskee"
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Valmis"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Jaksot"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr "Luo varaston jaksot"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Sulje"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Vahvistettu"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Avoin"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Kopioi määrät edellisestä varasto ja myyntiennusteesta"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "Osaston jakso 1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "Osaston jakso 3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "Osaston jakso 2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "Osaston jakso 5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "Osaston jakso 4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "Varaston jakso 2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "Varaston jakso 3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Vastuuhenkilö"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "Oletusmittayksikkö"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "Varaston jakso 4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "Varaston jakso 5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Nykyinen"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-"Varasto jota käytetään siirtokeräilyn lähteenä, valittaessa 'Toimita "
-"toisesta varastosta'."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Näyttää mitä varastoa ennuste koskee. Jos varastosuunnittelun aikana "
-"tarvitset myyntiennustetta kaikille varastoille, valitse mikä tahansa "
-"varasto nyt."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr "%s Hankinta (%s, %s) %s %s \n"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Yrityksittäin"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Syötä määrä joka (suunnitelman mukaan) tulisi saapua. Muuta tätä arvoa ja "
-"seuraa varastosimulaatiota. Tämän arvon tulisi olla yhtä suuri tai suurempi "
-"kuin vahvistettu saapuminen."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "Yrityksen jakso 4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Jakso jota suunnittelu koskee"
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Jo lähtenyt"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Tuote jolle suunnittelu on luotu."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Varastoittain :"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Hankintahistoria"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Suunnittelujakson alkupäivä."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr "Varaston jaksot"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Varasto"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr "Kaikkien saapuvien siirtojen määrä lasketulle jaksolle."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Loppupvm"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Ei pyyntöä"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Nimi"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Näyttää mitä jaksoa tämä ennuste koskee."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "Mittayksikkö"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr "Suljetut jaksot"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Tuote"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Myyntiennusteet"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Tuotteen kategoria"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "Sinun pitää määritellä lähdevarasto !"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Hanki varastopaikalle"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Hyväksy"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr "Tämän suunnittelun jakso. Pyyntö luodaan tämän jakson alkuun."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Alkuvarasto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Tuotteiden määrä"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Valitse ottaaaksesi mukaan vain vahvistetut ennusteet, jos ei valittu "
-"järjestelmä ottaa huomioon vahvisteut ja luonnos tilassa olevat ennusteet"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Jakso 5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Tämä varasto"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Näyttää kuka luo tämän ennusteen tai kuka vahvisti."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr "Myyntitiimi"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Määrä joka on jäljellä saapuvasta määrästä. Tämä lasketaan erotuksena "
-"suunnitellun ja vahvistetutn saapumisen välillä. Nykyiselle jaksolle myös jo "
-"saapuneet lasketaan. Tätä arvoa käytetään luomaan hankinnat puuttuvalle "
-"määrälle."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Laske myyntihistoria"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Yrityksen jakso 1"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Alkuvarasto: "
-
-#~ msgid "Requisition history"
-#~ msgstr "Pyyntöhistoria"
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Luo varasto ja myynti jaksot"
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Vahvistettu saapumeinen ennen: "
-
-#~ msgid "This Department"
-#~ msgstr "Tämä osasto"
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Saapuvia jäljellä: "
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Keräilylista "
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Luontipäivä: "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Käsin tehty suunnitelma "
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr "Maksimimäärä asetettu minimivarasto säännöissä tälle varastolle"
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "Hankinta luotu MPS:ssä käyttäjän toimesta: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Vahvistettu lähtö: "
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Mittayksikkö jolla varastolaskelmat näytetään. Voit käyttää joko "
-#~ "oletuskategorian yksiköitä tai toisen kategorian yksiköitä "
-#~ "(mittayksikkökategoria)."
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr "Luo suunnittelurivit valitulle kaudelle ja varastolle"
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Huom! Ei kopioi itse luomiasi aikaisempia rivejä"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Jo Lähtenyt: "
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Luo jaksot varasto ja myyntisuunnittelua vaten"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Odotettu lähtö: "
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Minimivarasto: "
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Vahvistetut saapumiset: "
-
-#~ msgid "Sales history"
-#~ msgstr "Myyntihistoria"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Ennustettumäärä"
-
-#~ msgid "Product Quantity"
-#~ msgstr "Tuotteen kappalemäärä"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " tilan mukaan:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Varastoennuste: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Varastosimulaatio: "
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Suunnitellut saapumiset: "
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "Valitse toimittaaksesi toimitusvaraston varastopaikasta. Jos ei valittu "
-#~ "toimitus tehdään toimitusvaraston lähtöpaikasta. Käytetään \"toimita "
-#~ "toisesta varastosta\" toimitusvaraston yhteydessä."
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr "Minimimäärä asetettu  minimivarastosäännössä tälle varastolle"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Jaksolle: "
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Keräilyn luonut MPS:ssä käyttäjä: "
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Varasto jota käytetään lähteenä toimituskeräilyssä joka luodaan "
-#~ "vaihtoehdolla 'Toimita toisesta varastosta'."
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Valitse tehdäksesi hankinta valitun varaston varastopaikalle. Jos ei valittu "
-#~ "hankinta tehdään varaston sisääntulopaikale."
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Jo saapuneet: "
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Määrä jonka odotetaan lähtevän valitun jakson aikana. Erotus suunniteltujen "
-#~ "lähtöjen ja vahvistettujen lähtöjen välillä. Nykyiselle jaksolle myös jo "
-#~ "lähteneet lasketaan"
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr "Luo ennusterivit valitulle varastolle ja jaksolle."
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Pyyntö ("
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Suunnitellut lähdöt: "
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "Ei voi poistaa hyväksyttyjä myyntiennusteita !"
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Varasto ja myyntiennuksteiden jaksot"
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Varasto ja myyntijaksot"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Suunnitellut lähdöt ennen: "
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Virheellinen mallin nimi toiminnon määrittelyssä."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Objektin nimi täytyy alkaa X_ eikä se saa sisältää mitää erikoismerkkejä!"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
diff --git a/addons/stock_planning/i18n/fr.po b/addons/stock_planning/i18n/fr.po
deleted file mode 100644
index a16cfe1d6af..00000000000
--- a/addons/stock_planning/i18n/fr.po
+++ /dev/null
@@ -1,1970 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* stock_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:21+0000\n"
-"Last-Translator: lholivier <olivier.lenoir@free.fr>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"Aucune prévision pour la période sélectionnée ou aucun produit dans la "
-"catégorie sélectionnée !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Cochez pour effectuer le calcul uniquement sur les emplacements de stock de "
-"l'entrepôt sélectionné. Si non coché, le calcul est effectué pour les "
-"emplacements de stock, d'entrée et de sortie du dépôt."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Règle du stock maximum"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Regrouper par..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Valeur de la prévision qui sera convertie en quantité de produit en fonction "
-"des prix."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "Le reste à recevoir doit être supérieur à 0 !"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Sorties planifiées sur les périodes avant recalcul. Entre la date de départ "
-"de la période actuelle et jusqu'à un jour avant le début de la période "
-"calculée."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"L'entrepôt sur lequel portent les prévisions. Si au cours de la "
-"planification du stock vous allez utiliser des prévisions pour tous les "
-"entrepôts, vous pouvez choisir n'importe quel entrepôt ici."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Planifié en sortie"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Reste à recevoir"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Créer une ligne de prévisions"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-"Quantité de tous les mouvements de sortie confirmés sur la période calculée."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Créer des périodes journalières."
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Société"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Toutes les prévisions de ventes pour le dépôt sélectionné du produit "
-"sélectionné pendant la période sélectionnée."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Indicateurs de la règle de stock minimimum"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Périodes sur lesquelles vont porter les prévisions."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Uniquement les emplacements de stock."
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr "Quantité déjà expédiée depuis ce dépôt pour la période actuelle."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Entrées confirmées"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Situation de la période actuelle."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Créer des périodes mensuelles"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.period.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Sorties planifiées avant"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Tous les produits avec prévisions"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Périodes :"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr "Quantité qui a déjà été prélevée dans ce dépôt pour cette période."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Pas de produit dans la catégorie sélectionnée !"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Prévisions de stock et de vente"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.sale.forecast"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Entrées prévues"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Simulation de stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planning.createlines"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Produits entrants confirmés dans la période avant le calcul (incluant déjà "
-"les entrées). Entre la date de démarrage de la période actuelle et un jour "
-"avant le démarrage de la période calculée."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Rechercher des les prévisions de vente"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "Période5 de cet utilisateur"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-"Historique d'approvisionnement interne ou externe de cette ligne de "
-"planification."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Toutes les prévisions de vente pour l'intégralité de la société (pour tous "
-"les dépôts) du produit sélectionné pour la période sélectionnée."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "Période1 de cet utilisateur"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "Période3 de cet utilisateur"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Planification du stock"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Règle du stock minimum"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Approvisionner pour le reste à recevoir"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Créer"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Plan directeur d'approvisionnement"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Passé/futur"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "État"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-"Catégorie de produit des produits sur lesquels vont porter les prévisions."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "Période de stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.sale.forecast.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Entrepôt"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Simulation de stock à la fin de la période sélectionnée.\n"
-" Pour la période actuelle, c'est: \n"
-"stock initial - sorties déjà effectuées + entrées déjà effectuées - sorties "
-"prévues + reste à recevoir.\n"
-"Pour les périodes à venir, c'est:\n"
-"Stock initial - sorties planifiées avant + réceptions avant - sorties + "
-"entrées."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Cocher pour voir les ventes de toute la société."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Par département:"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Produits entrants avant"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Erreur !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Cet utilisateur"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Prévisions"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Approvisionner depuis un autre dépôt"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Calculer la planification"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Action non valide !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Quantité en stock un jour avant la période actuelle"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr "Historique des approvisonnements"
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Créer des périodes hebdomadaires"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Simulation de la période calculée"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Période4 de cet utilisateur"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Période de stock et de vente"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Prévisions pour la société"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Par utilisateur :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Entrepôt sur lequel va porter la planification"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Créé/validé par"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Prévision de l'entrepôt"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"Vous devez indiquer un entrepôt d'origine différent de l'entrepôt calculé "
-"(de destination) !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "Période5 de cette société"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "UdM produit"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr "Cet période de société"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "Période2 de cette société"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "Période3 de cette société"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Date de début"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "Période2 de cet utilisateur"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Prévisions validées"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"La planification sera créée pour les produits de la catégorie de produits "
-"sélectionnée dans ce champ. Ce champ est ignoré quand vous cochez la case "
-"'tous les produits avec prévisions'."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Sorties planifiées"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Prévisions"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Brouilon"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Fermée"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Entrepôt "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Planification et situation pour la période calculée"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Saisir la quantité planifiée en sortie pour l'entrepôt sélectionné pour la "
-"période sélectionnée pour le produit sélectionné. Pour planifier cette "
-"valeur, regardez les sorties confirmées ou les prévisions de vente. Cette "
-"valeur devrait être plus grande ou égale aux sorties confirmées."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr "Périodes courantes"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Approvisionnement intenre"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr "%s Liste de colisage %s (%s,  %s) %s %s \n"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Créer des prévisions de ventes"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Période4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Nom de la Période"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Période2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Période3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Période1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Sorties confirmées"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Créer les lignes de planification de stock"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Informations générales"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Prévisions de ventes"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Ce dépôt Période1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Historique de ventes"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Entrepôt d'origine"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Emplacement d'approvisionnement du stock"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Date de fin de la période de planification"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Cocher cette case pour créer la planification pour tous les produits qui ont "
-"une prévision pour l'entrepôt et la période sélectionnés. Le champ catégorie "
-"de produits sera ignoré."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr "MPS(%s) %s"
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Déjà entré"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Catégorie d'UdM du produit"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-"Colisage issu de MPS (processus d'approvisionnement automatique) par "
-"l'utilisateur : %s   Date de création : %s                                   "
-"  \n"
-"Pour la période : %s  selon l'état :                                     \n"
-" Prévision de stockage : %s                                     \n"
-" Stock initial : %s                                     \n"
-" Sorties planifiées : %s Rentrées planifiées : %s                            "
-"         \n"
-" Déjà sorti : %s Déjà rentré : %s                                     \n"
-" Sorties confirmées : %s Rentrées confirmées : %s                            "
-"         \n"
-" Sorties planifiées avant : %s    Rentrées planifiées avant : %s             "
-"                        \n"
-" Sorties attendues : %s Rentrées restantes : %s                              "
-"       \n"
-" Simulation de Stock : %s  Stock Minimum : %s "
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Période"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Catégorie d'UdV du produit"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "UdM active"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Rechercher dans la planification du stock"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Copier la dernière prévision"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Affiche le produit concerné par la prévision."
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Terminé"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Périodes"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr "Créer les prériodes de stock"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Fermer"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Validé"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Ouverte"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Copier les quantités de la dernière prévision de stock et de vente"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "Période1 de ce département"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "Période3 de ce département"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "Période2 de ce département"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "Période5 de ce département"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "Période4 de ce département"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "Période2 de cet entrepôt"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "Période3 de cet entrepôt"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "UdM par défaut"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "Période4 de cet entrepôt"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "Période5 de cet entrepôt"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Actuel"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planning"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Affiche l'entrepôt sur lequel portent les prévisions. Si pendant la "
-"planification du stock vous avez besoin de prévisions de stock pour tous les "
-"entrepôts, vous pouvez choisir n'importe quel entrepôt ici."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr "%s Approvisionnement (%s,  %s) %s %s \n"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Par société"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Saisissez la quantité qui (selon votre plan) devrait entrer. Modifiez cette "
-"valeur et observez la simulation de stock. Cette valeur devrait être "
-"supérieure ou égale aux entrées confirmées."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "Période4 de cette société"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Période sur laquelle va porter la planification."
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Déja sortis"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Produit pour lequel la planification est créée."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Par entrepôt :"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Historique d'approvisionnement"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Date de début de la période de planification"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr "Périodes de stock"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Stock"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-"Quantité pour tous les mouvements d'entrées confirmées dans la période "
-"calculée."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Date de fin"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Pas de demande"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Nom"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Affiche la période sur laquelle porte cette prévision."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr "Périodes fermés"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Produit"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Prévisions de vente"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Catégorie de produits"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "Vous devez indiquer un dépôt d'origine !"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Approvisionner l'emplacement de stock"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Approuver"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-"Période de cette planification. La demande sera créée pour le début de cette "
-"période."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Stock initial"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Montant du produit"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Cochez pour n'utilisez que des prévisions validées. Si non coché, le système "
-"utilisera les prévisions validées et en brouillon."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Période5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Cet entrepôt"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Affiche l'utilisateur qui a créé ou validé cette prévision."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr "Équipe commerciale"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Quantité restante dans les quantités entrantes planifiées. Ceci est calculé "
-"comme la différence entre les entrées planifiées et les entrées confirmées. "
-"Pour la période actuelle, les entrées déjà réalisées sont aussi calculées. "
-"Cette valeur est utilisée pour créer un approvisionnement pour la quantité "
-"manquante."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Calculer l'historique de vente"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Période 1 de cette société"
-
-#~ msgid "Requisition history"
-#~ msgstr "Historique des réquisitions"
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Créer des périodes de stock et de vente."
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Dépôt utilisé en tant qu'origine dans un mouvement d'approvisionnement créé "
-#~ "par 'Approvisionner à partir d'un autre dépôt'."
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Cochez pour approvisionner l'emplacement de stock du dépôt sélectionné. Si "
-#~ "non coché, l'approvisionnement se fera sur l'emplacement d'entrée du dépôt."
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Entrées confirmées avant: "
-
-#~ msgid "This Department"
-#~ msgstr "Ce département"
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Liste de prélèvement "
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Date de création: "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Planification manuelle pour "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " sorties confirmées: "
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr ""
-#~ "Crée des lignes de planification pour la période et le dépôt sélectionnés."
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr "Quantité maximum fixée dans la règle de stock minimum pour ce dépôt."
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Unité de mesure utilisée pour indiquer les quantités pour le calcul de "
-#~ "stock. Vous pouvez utiliser des unités de la catégorie par défaut ou de la "
-#~ "catégorie secondaire."
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Créer les périodes pour la planification du stock et des ventes"
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Déjà entré: "
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Réquisition ("
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Stock minimum: "
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Entrants confirmés: "
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Quantité prévisionnelle"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " d'après l'état:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Simulation de stock: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Prévisions du dépôt: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Pour la période: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Entrées planifiées avant: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Stock initial: "
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr ""
-#~ "Approvisionnement créé dans le programme directeur par un utilisateur: "
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Note: ne duplique pas les lignes existantes créées par vous."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Sorties attendues : "
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Quantité planifée de sortie pour la période. C'est la différence entre le "
-#~ "planifié entrant et les sorties confirmées. Pour la période en cours, les "
-#~ "quantités sorties est aussi calculé."
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr ""
-#~ "Crée des lignes de prévisions pour l'entrepôt et la période sélectionnés."
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "Impossible de supprimer des prévisions de ventes validées !"
-
-#~ msgid "Sales history"
-#~ msgstr "Historique de ventes"
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Quantité minimum définie dans la règle de stock minimum pour cet entrepôt."
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Périodes de planification des stocks et des ventes"
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Périodes de stock et ventes"
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Entrants planifiés : "
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "Cochez pour approvisionner à partir de l'emplacement de stock de l'entrepôt "
-#~ "d'origine. Si non coché, l'approvisionnement sera fait à partir de "
-#~ "l'emplacement de sortie de l'entrepôt d'origine. Utilisé dans "
-#~ "\"Approvisionner depuis un autre entrepôt\" avec l'approvisionnement "
-#~ "d'entrepôt."
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "PDA ("
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Mouvement créé à partir du PDA par l'utilisateur : "
-
-#~ msgid "Product Quantity"
-#~ msgstr "Quantité de produit"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Sorties planifiées : "
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Entrées à traiter : "
-
-#~ msgid ""
-#~ "\n"
-#~ "This module is based on original OpenERP SA module stock_planning version "
-#~ "1.0 of the same name Master Procurement Schedule.\n"
-#~ "\n"
-#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
-#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
-#~ "\n"
-#~ "Terms used in the module:\n"
-#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
-#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-#~ "the Period.\n"
-#~ "- Stock Planning - is the quantity of products you plan to purchase or "
-#~ "produce for the Period.\n"
-#~ "\n"
-#~ "Because we have another module sale_forecast which uses terms \"Sales "
-#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-#~ "values. \n"
-#~ "\n"
-#~ "Activity with this module is divided to three steps:\n"
-#~ "- Creating Periods. Mandatory step.\n"
-#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
-#~ "useful for further planning.\n"
-#~ "- Creating Planning lines, entering quantities to them and making "
-#~ "Procurement. Making procurement is the final step for the Period.\n"
-#~ "\n"
-#~ "Periods\n"
-#~ "=======\n"
-#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
-#~ "There are:\n"
-#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-#~ "monthly periods.\n"
-#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-#~ "change the dates and change the State of period.\n"
-#~ "\n"
-#~ "Creating periods is the first step you have to do to use modules features. "
-#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
-#~ "Periods\" form or view but it is recommended to use automating tool.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- These periods (officially Stock and Sales Periods) are separated of "
-#~ "Financial or other periods in the system.\n"
-#~ "- Periods are not assigned to companies (when you use multicompany feature "
-#~ "at all). Module suppose that you use the same periods across companies. If "
-#~ "you wish to use different periods for different companies define them as you "
-#~ "wish (they can overlap). Later on in this text will be indications how to "
-#~ "use such periods.\n"
-#~ "- When periods are created automatically their start and finish dates are "
-#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
-#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-#~ "you create periods manually you have to take care about hours because you "
-#~ "can have incorrect values form sales or stock. \n"
-#~ "- If you use overlapping periods for the same product, warehouse and company "
-#~ "results can be unpredictable.\n"
-#~ "- If current date doesn't belong to any period or you have holes between "
-#~ "periods results can be unpredictable.\n"
-#~ "\n"
-#~ "Sales Forecasts\n"
-#~ "===============\n"
-#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
-#~ "Forecasts\".\n"
-#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-#~ "forecasts lines according to some parameters.\n"
-#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-#~ "forms.\n"
-#~ "\n"
-#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-#~ "products from selected Category, for selected Period and for selected "
-#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-#~ "settings of period before this one to created one.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
-#~ "Period, Warehouse and validated or created by you) already exists. If you "
-#~ "wish to create another forecast, if relevant lines exists you have to do it "
-#~ "manually using menus described bellow.\n"
-#~ "- When created lines are validated by someone else you can use this tool to "
-#~ "create another lines for the same Period, Product and Warehouse. \n"
-#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
-#~ "some settings from your (validated by you or created by you if not validated "
-#~ "yet) forecast which is for last period before period of created forecast. If "
-#~ "there are few your forecasts for period before this one (it is possible) "
-#~ "system takes one of them (no rule which of them).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menus \"Sales Forecasts\"\n"
-#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
-#~ "validation can save your data against any accidental changes. You can click "
-#~ "\"Validate\" button but it is not mandatory.\n"
-#~ "\n"
-#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
-#~ "\"Product Amount\". System will count quantity from amount according to Sale "
-#~ "price of the Product.\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
-#~ "for this product. You have to enter parameters to the top and left of this "
-#~ "table and system will count sale quantities according to these parameters. "
-#~ "So you can select fe. your department (at the top) then (to the left): last "
-#~ "period, period before last and period year ago.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "\n"
-#~ "\n"
-#~ "Procurement Planning\n"
-#~ "====================\n"
-#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-#~ "lines according to some parameters.\n"
-#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
-#~ "module which allows to create procurement.\n"
-#~ "\n"
-#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
-#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
-#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
-#~ "Planning Lines\", then you can review created planning and make procurement "
-#~ "using menu \"Master Procurement Schedule\".\n"
-#~ "\n"
-#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-#~ "lines for products from selected Category, for selected Period, and for "
-#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
-#~ "system creates lines for all products having forecast for selected Period "
-#~ "and Warehouse. Selected Category will be ignored in this case.\n"
-#~ "\n"
-#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
-#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-#~ "Simulation\" and decide if this value would be accurate for end of the "
-#~ "Period. \n"
-#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-#~ "all forecasts for Period and Warehouse. But your planning can be based on "
-#~ "any other information you have. It is not necessary to have any forecast. \n"
-#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-#~ "is the quantity to be procured to make stock as indicated in \"Stock "
-#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-#~ "quantity to minimum stock rules visible on the form. But you can plan "
-#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
-#~ "whole Warehouse by default. But if you want to see values for Stock location "
-#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
-#~ "\n"
-#~ "If after few tries you decide that you found correct quantities for "
-#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
-#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
-#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
-#~ "\n"
-#~ "\n"
-#~ "If you don't want to Produce or Buy the product but just pick calculated "
-#~ "quantity from another warehouse you can click \"Supply from Another "
-#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-#~ "with move from selected source Warehouse to calculated Warehouse (as "
-#~ "destination). You can also decide if this pick should be done from Stock or "
-#~ "Output location of source warehouse. Destination location (Stock or Input) "
-#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
-#~ "\n"
-#~ "\n"
-#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-#~ "have to click button \"Calculate Planning\".\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "How Stock Simulation field is calculated:\n"
-#~ "Generally Stock Simulation shows the stock for end of the calculated period "
-#~ "according to some planned or confirmed stock moves. Calculation always "
-#~ "starts with quantity of real stock of beginning of current period. Then "
-#~ "calculation adds or subtracts quantities of calculated period or periods "
-#~ "before calculated.\n"
-#~ "When you are in the same period (current period is the same as calculated) "
-#~ "Stock Simulation is calculated as follows:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out \n"
-#~ "\t+ Planned In\n"
-#~ "\n"
-#~ "When you calculate period next to current:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out of current Period \n"
-#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period .\n"
-#~ "\n"
-#~ "As you see calculated Period is taken the same way like in case above. But "
-#~ "calculation of current Period are made a little bit different. First you "
-#~ "should note that system takes for current Period only Confirmed In moves. It "
-#~ "means that you have to make planning and procurement for current Period "
-#~ "before this calculation (for Period next to current). \n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period \n"
-#~ "\t- Sum of Planned Out of Periods before calculated \n"
-#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period.\n"
-#~ "\n"
-#~ "Periods before calculated means periods starting from current till period "
-#~ "before calculated.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- Remember to make planning for all periods before calculated because "
-#~ "omitting these quantities and procurements can cause wrong suggestions for "
-#~ "procurements few periods ahead.\n"
-#~ "- If you made planning few periods ahead and you find that real Confirmed "
-#~ "Out is bigger than Planned Out in some periods before you can repeat "
-#~ "Planning and make another procurement. You should do it in the same planning "
-#~ "line. If you create another planning line the suggestions can be wrong.\n"
-#~ "- When you wish to work with different periods for some part of products "
-#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
-#~ "different products. Example: If you use always Weekly periods for Products "
-#~ "A, and Monthly periods for Products B your all calculations will work "
-#~ "correctly. You can also use different kind of periods for the same products "
-#~ "from different warehouse or companies. But you cannot use overlapping "
-#~ "periods for the same product, warehouse and company because results can be "
-#~ "unpredictable. The same apply to Forecasts lines.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ce module est basé sur la version du module stock_planning originel "
-#~ "d'OpenERP SA du même nom que Planificateur d'approvisionnements.\n"
-#~ "\n"
-#~ "Le but du planificateur d'approvisionnements est de permettre de créer un "
-#~ "approvisionnement manuel (demande) au lieu du planificateur MRP (qui "
-#~ "travaille automatiquement sur les règles de stock minimum).\n"
-#~ "\n"
-#~ "Termes utilisés dans ce module :\n"
-#~ "- Période de stock et de ventes - est le temps (entre la date de démarrage "
-#~ "et la date de fin) pour lequel vous planifiez les prévisions de stock et de "
-#~ "ventes et vous faites le planning des approvisionnements.\n"
-#~ "- Prévision de stock et de ventes - est la quantité de produits que vous "
-#~ "planifiez de vendre dans la période.\n"
-#~ "- Planification du stock - est la quantité de produits que vous planifiez "
-#~ "d'acheter ou de produire durant la période.\n"
-#~ "\n"
-#~ "Parce que nous avosn un autre module sale_forecast qui utilise les termes "
-#~ "'Prévisions de ventes\" et \"Planification\" comme des valeurs pour les "
-#~ "montants, nous utiliserons les termes \"Prévision de stock et de ventes\" et "
-#~ "\"Planification du stock\" pour insister sur le fait que nous utilisons des "
-#~ "valeurs quantitatives.\n"
-#~ "\n"
-#~ "L'activité avec ce module est divisée en trois étapes :\n"
-#~ "- Création des périodes. Étape obligatoire.\n"
-#~ "- Création des prévisions de vente et entrée des quantités pour cela. Étape "
-#~ "optionnelle mais utile pour d'autres planifications.\n"
-#~ "- Création des lignes de planification, entrée des quantités pour cela et "
-#~ "pour créer les approvisionnements. Créer les approvisionnements est al "
-#~ "dernière étape de la période.\n"
-#~ "\n"
-#~ "Périodes\n"
-#~ "========\n"
-#~ "Vous avez deux entrées de menu pour les périodes dans \"Ventes - "
-#~ "Configuration\". Il y a:\n"
-#~ "- \"Créer les périodes de ventes\" - qui créé automatiquement les périodes "
-#~ "journalières, hebdomadaires ou mensuelles.\n"
-#~ "- \"Périodes de stock et de vente\" - qui permet de créer tout type de "
-#~ "périodes, de modifier les dates et de changer les états de la période.\n"
-#~ "\n"
-#~ "Créer les périodes est la première étape que vous devez faire pour utiliser "
-#~ "les fonctionnalités de ce module. Vous pouvez créer des périodes "
-#~ "personnalisées en utilisant le bouton \"Nouveau\" dans la vue ou la liste "
-#~ "\"Périodes de stock et de ventes\" mais il est recommandé d'utiliser les "
-#~ "outils automatiques.\n"
-#~ "\n"
-#~ "Remarques :\n"
-#~ "- Ces périodes (officiellement périodes de stock et de ventes) sont séparées "
-#~ "de la finance ou des autres modules dans le système.\n"
-#~ "- Les périodes ne sont pas assignées aux sociétés (quand vous utiliser les "
-#~ "fonctionnalités multi-sociétés). Le module suppose que vous utilisiez les "
-#~ "mêmes périodes pour toutes les sociétés. Si vous souhaitez utiliser des "
-#~ "périodes différentes pour des sociétés différentes, définissez les comme "
-#~ "vous le voulez (elles peuvent se chevaucher). Plus tard dans ce texte seront "
-#~ "écrites les indications pour utiliser chaque période.\n"
-#~ "- Quand les périodes sont créées automatiquement leurs dates de début et de "
-#~ "fin démarrent à 00:00:00 et se terminent à 23:59:00. Fe. Lorsque vous créer "
-#~ "des périodes journalières, elle auront une date de démarrage du genre "
-#~ "31.01.2010 00:00:00 et une date de fin 31.01.2010 23:59:00. Cela fonctionne "
-#~ "seulement avec une création automatique des périodes. Lorsque vous créer "
-#~ "manuellement des périodes, vous devez faire attention aux heures car vous "
-#~ "pouvez avoir des velurs incorrectes venant des ventes ou du stock\n"
-#~ "- Si vous utiliser des périodes qui se chevauchent pour le mêm produit, le "
-#~ "même entrepôt ou la mêm société, les résultats ppeuvent être incertains.\n"
-#~ "- Si la date actuelle n'appartient à aucune période ou si vous avez des "
-#~ "trous entre les périodes, les résultats peuvent être incertains.\n"
-#~ "\n"
-#~ "Prévisions de vente\n"
-#~ "===================\n"
-#~ "Vous avez quelques menus pour les prévisions de ventes in \"Ventes - "
-#~ "Prévisions de vente\".\n"
-#~ "- \"Créer les prévisions de ventes pour les périodes\" - qui créé "
-#~ "automatiquement les lignes de prévisions en fonction de plusieurs "
-#~ "paramètres.\n"
-#~ "- \"Prévisions de vente\" - quelques menus pour travailler avec les listes "
-#~ "et les formulaires de prévisions.\n"
-#~ "\n"
-#~ "Le menu \"Créer des prévisions de vente pour les périodes\" créé les "
-#~ "prévisions pour les produits de la catégorie sélectionnée, pour la période "
-#~ "et pour l'entrepôt sélectionné. Il y a une option \"Copier la dernière "
-#~ "prévision\" pour copier la prévision ainsi que les autres paramètres de la "
-#~ "période avant celle-ci pour en créer une nouvelle.\n"
-#~ "\n"
-#~ "Remarques:\n"
-#~ "- Cet outil ne créé pas de lignes si des lignes significatives (pour le même "
-#~ "produit, la même période et le même entrepôt et validées ou créées par vous) "
-#~ "existe déjà. Si vous souhaitez créer une autre prévision et que des lignes "
-#~ "significatives existent, vous devez le faire manuellement en utilsant les "
-#~ "menus décrits plus bas.\n"
-#~ "- Lorsque des lignes créées sont validées par quelqu'un, vous pouvez "
-#~ "utiliser cet outil pour créer d'autres lignes pour la même période, le même "
-#~ "produit et le même entrepôt.\n"
-#~ "- Lorsque vous choisissez \"Copier la dernière prévision\" le slignes créées "
-#~ "prennent les quantités et certains paramètres depuis votre (validés ou créés "
-#~ "par vous si ils ne sont pas encore validés) prévision qui es la dernière "
-#~ "période avant la période de la prévision créée. Si il y a plusieurs "
-#~ "prévisions pour la période avant celle-ci (c'est possible), le système "
-#~ "prendra l'une d'elles (aucune règle n'est définie pour cela).\n"
-#~ "\n"
-#~ "Menus \"Prévisions de vente\"\n"
-#~ "Sur le formulaire de \"prévisions de vente\", vous devez entrer une quantité "
-#~ "prévue dans le champ \"Quantité de produit\". D'autres calculs peuvent être "
-#~ "lancés pour les prévisions en brouillon. Mais la validation peut sauvegarder "
-#~ "vos données contre tout changement accidentel. Vous pouvez cliquer sur le "
-#~ "bouton \"Valider\" mais ce n'est pas obligatoire.\n"
-#~ "\n"
-#~ "À la place de la quantité prévue vous pouvez entrer le montant des "
-#~ "prévisions de vente dans le champ \"Montant produit\". Le système comptera "
-#~ "la quantité depuis le montant en fonction des prix de vente des produits.\n"
-#~ "\n"
-#~ "Toutes les valeurs dans le formulaire sont exprimées dans l'unité de mesure "
-#~ "sélectionnée dans le formulaire. Vous pouvez sélectionné une unité de mesure "
-#~ "depuis la catégorie par défaut ou depuis la seconde catégorie. Quand vous "
-#~ "modifier l'unié de mesure, les quantités seront recalculées en fonction de "
-#~ "la nouvelle unité de mesure : valeurs éditables (champs en bleu) "
-#~ "immédiatement, champs non-éditables après avoir cliqué sur le bouton "
-#~ "\"Calculer la planification\".\n"
-#~ "\n"
-#~ "Pour trouver la bonne valeur pour les prévisions de vente, vous pouvez "
-#~ "utiliser le tableau \"Historique des ventes\" pour ce produit. Vous devez "
-#~ "entrer les paramètres en haut et à gauche du tableau et le système calculera "
-#~ "la quantité de ventes en fonction de ces paramètres. Donc vous pouvez "
-#~ "sélectionner fe. votre département (en haut) puis (à gauche) : dernière "
-#~ "période, période avant la dernière et la période d'il y a un an.\n"
-#~ "\n"
-#~ "\n"
-#~ "Planification des approvisionnements\n"
-#~ "====================================\n"
-#~ "Vous pouvez trouver le menu pour la planification dans \"Entrepôt - "
-#~ "Planification du stock\".\n"
-#~ "- \"Créer des lignes de planification de stock\" - vous permet d'automatiser "
-#~ "la création des lignes de planification en fonction de quelques paramètres.\n"
-#~ "- \"Planificateur d'approvisionnements\" - est le menu le plus important du "
-#~ "module qui permet de créer des approvisionnements.\n"
-#~ "\n"
-#~ "Commes les prévisions de ventes sont une phase de la planification des "
-#~ "ventes, la planification des approvisionnements est une phase des plannings "
-#~ "d'achat et de production. Vous pouvez créer rapidement une planification des "
-#~ "approvisionnements en utlisant l'outil depuis le menu \"Créer des lignes de "
-#~ "planification de stock\", ensuite, vous pouvez revoir les planification "
-#~ "créées et faire les approvisionnement depuis le menu \"Planificateur "
-#~ "d'approvisionnements\".\n"
-#~ "\n"
-#~ "Le menu \"Créer des lignes de planification de stock\" vous permet de créer "
-#~ "rapideùent des lignes de planification pour les produits de la catégorie "
-#~ "sélectionnée, pour la période et pour l'entrepôt sélectionnée. Lorsque vous "
-#~ "cocher l'option \"Tous les produits avec prévision\", le système va créé des "
-#~ "lignes pour tous les produits qui ont des prévisions pour la période et "
-#~ "l'entrepôt sélectionné. Dans ce cas, la catégorie sélectionnée sera "
-#~ "ignorée.\n"
-#~ "\n"
-#~ "Sous le menu \"Planificateur d'approvisionnements\", vous pouvez "
-#~ "généralement modifier les valeurs \"Sorties planifiées\" et \"Entrées "
-#~ "planifiées\" pour observer le champ \"Simulation du stock\" et dévider si la "
-#~ "valeur sera correcte pour la fin de la période.\n"
-#~ "Les \"Sorties planifiées\" peuvent être basées sur les \"prévisions "
-#~ "d'entrepôt\" qui sont la somme de toutes les prévisions pour la période et "
-#~ "l'entrepôt. Mais notre planification peut être basée sur toute autre "
-#~ "information que vous avez. Il n'est pas nécessaire d'avoir une prévision.\n"
-#~ "La quantité dans \"Entrées planifiées\" est utilisée pour calculer le champ "
-#~ "\"Entrées à traiter\" qui est la quantité devant être apportée pour avoir le "
-#~ "même stock que celui indiqué dans \"Simulation du stock\" à la fin de la "
-#~ "période. Vous pouvez comparer la quantité dans \"Simulation du stock\" avec "
-#~ "la règle de stock minimum visible dans le formulaire. Mais vous pouvez "
-#~ "planifier une quantité différente que celle dans Règles de stock minimum. "
-#~ "Par défaut, le calcul est fait pour tous les entrepôts. Mais si vous voulez "
-#~ "voir les valeurs pour les emplacements de stock des entrepôts, vous pouvez "
-#~ "utiliser la case à cocher \"Emplacements de stock seulement\".\n"
-#~ "\n"
-#~ "Si après quelques essais vous décidez que vous avez trouvé les quantités "
-#~ "correctes pour les \"Sorties planifiées\" et les \"Entrées planifiées\" et "
-#~ "que vous êtes satisfait avec le stock calculé dans \"Simulation du stock\" "
-#~ "pour la fin de la période, vous pouvez cliquer sur le bouton "
-#~ "\"Approvisionner les entrées à traiter\" pour approvisionner la quantité "
-#~ "inscrite dans \"Entrées à traiter\" dans l'entrepôt. Le système créé les "
-#~ "ordres d'approvisionnements appropriés. Vous pouvez décider si "
-#~ "l'approvisionnement sera fait du Stock ou de l'emplacement d'entrée de "
-#~ "l'entrepôt calculé.\n"
-#~ "\n"
-#~ "Si vous ne voulez pas produire ou acheter les produits mais simplement "
-#~ "préparer les quantités calculées depuis un autre entrepôt, vous pouvez "
-#~ "cliquer sur \"Approvisionner depuis un autre entrepôt\" (au lieu de "
-#~ "\"Approvisionner les entrées à traiter\"). Le système créé une liste de "
-#~ "préparation avec le mouvement depuis l'entrepôt sélectionné jusqu'à "
-#~ "l'entrepôt calculé (comme destination). Vous pouvez aussi décider si cette "
-#~ "préparation doit être faite depuis le stock ou depuis l'emplacement de "
-#~ "sortie de l'entrepôt source. L'emplacement de destination (Stock ou Entrée) "
-#~ "de lentrpôt de destination sera utilisé pour remplir le champ "
-#~ "\"Approvisionnement des entrées à traiter\".\n"
-#~ "\n"
-#~ "Pour voir les bonnes quantités dans les champs \"Entrées confirmées\", "
-#~ "\"Sorties confirmées\", \"Entrés confirmées avant\", \"Sorties confirmées "
-#~ "avant\" et \"Simulation du stock\", vous devez cliquez sur le bouton "
-#~ "\"Calculer la planification\".\n"
-#~ "\n"
-#~ "Toutes les valeurs sur le formulaire sont exprimées dans l'unité de mesure "
-#~ "sélectionnée dans le formulaire. Vous pouvez en sléectionner une autre "
-#~ "depuis la catégorie par défaut ou depuis la catégorie secondaire. Lorsque "
-#~ "vous changez l'unité de mesure, les quantités seront recalculées en focntion "
-#~ "de la nouvelle UdM : les valeurs modifiables (champs en bleu) immédiatement, "
-#~ "champs non modifiables après avoir cliqué sur le bouton \"Calcul de la "
-#~ "planification\".\n"
-#~ "\n"
-#~ "Comment le champ \"Simulation du stock\" est calculé :\n"
-#~ "Généralement, le champ \"Simulation du stock\" affiche le stock pour la fin "
-#~ "de la période calculée en fonction de plusieurs mouvements de stocks "
-#~ "planifiés ou confirmés. Le calcul démarre toujours avec la quantité de stock "
-#~ "réel du début de la période courante. Puis, le calcul ajoute ou soustrait "
-#~ "les quantités de la période calculée ou des périodes avant le calcul.\n"
-#~ "Lorsque vous êtes dans la même période (la période courante est la même que "
-#~ "celle calculée), la simulation du stock est calculée comme suit :\n"
-#~ "Simulation du stock =\n"
-#~ "\tStock au début de la période courante\n"
-#~ "\t- Sorties planifiées\n"
-#~ "\t+ Entrées planifiées\n"
-#~ "\n"
-#~ "Quand vous calculer la prochaine période :\n"
-#~ "Simulation du stock = \n"
-#~ "\tStock au début de la période courante\n"
-#~ "\t- Sorties planifiées de la période courante\n"
-#~ "\t+ Entrées confirmées de la période courante (incl. les entrées en cours)\n"
-#~ "\t- Sorties planifiées de la période calculée\n"
-#~ "\t+ Entrées planifiées de la période calculée.\n"
-#~ "\n"
-#~ "Comme vous voyez, la période calculée est calculée de la même façon que le "
-#~ "cas du dessus. Mais le calcul de la période courante est fait un peit peu "
-#~ "différement. PRemièrement, vous devez noter que le système prend seulement "
-#~ "les mouvement en entrée confirmés pour la période courante. Cela veut dire "
-#~ "que vous devez faire la planification et l'approvisionnement de la période "
-#~ "avant le calcul (pour la préiode suivante).\n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Quand vous calculez la période à venir :\n"
-#~ "Simulation du stock =\n"
-#~ "\tStock du début de la période courante\n"
-#~ "\t- Somme des sorties planifiées de la période avant celle calculée\n"
-#~ "\t+ Somme des entrées confirmées de la période avant celle calculée (incl. "
-#~ "les entrées en cours)\n"
-#~ "\t- Sorties planifiées de la période calculée\n"
-#~ "\t+ Entrées planifiées de la période calculée.\n"
-#~ "\n"
-#~ "Périodes avant celle calculée veut dire les périodes démarrées depuis "
-#~ "l'actuelle jusqu'à la période avant le calcul.\n"
-#~ "\n"
-#~ "Remarques :\n"
-#~ "- Souvenez-vous qu'il faut planifier toutes les périodes avant le calcul "
-#~ "parce qu'ommettre les quantités et les approvisionnements peut provoquer de "
-#~ "fausses suggestions pour les approvisionnement des quelques périodes "
-#~ "précédentes.\n"
-#~ "- Si vous planifiez quelques périodes en avance et que vous trouvez que les "
-#~ "sorties réelles confirmées sont trop grandes par rapport aux sorties "
-#~ "planifiées dans les quelques périodes avant, vous pouvez refaire la "
-#~ "planification et refaire un approvisionnement. Vous devez faire cela dans la "
-#~ "ligne de planifications. Si vous créer une autre ligne de planification, les "
-#~ "suggestions pourraient être fausses.\n"
-#~ "- Lorsque vous souhaitez travailler avec différentes périodes pour quelques "
-#~ "parties des produits, définissez deux sortes de périodes (ie. Hebdomadaires "
-#~ "et mensuelles) et utiliser les pour les différentes produits. Exemple : si "
-#~ "vous utilisez toujours des périodes hebdomadaires pour le produit A, et des "
-#~ "périodes mensuelles pour le produit B, tous vos calculs vont se faire "
-#~ "correctement. Vous pouvez également utiliser des types différents de "
-#~ "périodes pour les mêmes produits mais avec des entreprôts ou des sociétés "
-#~ "différentes. Mais vous ne pouvez pas utiliser des périodes qui se "
-#~ "chevauchent pour le même produit, le même entreprôt et la même société car "
-#~ "les résultats peuvent être incertains. Cela s'applique aussi sur les lignes "
-#~ "de prévisions.\n"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Déjà sorti : "
diff --git a/addons/stock_planning/i18n/gl.po b/addons/stock_planning/i18n/gl.po
deleted file mode 100644
index 9ee3ac37964..00000000000
--- a/addons/stock_planning/i18n/gl.po
+++ /dev/null
@@ -1,1855 +0,0 @@
-# Galician translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:25+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Galician <gl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"Non hai previsións para o período seleccionado ou non hai produtos na "
-"categoría seleccionada!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Marque esta opción para calcular o stock só do lugar stock do almacén "
-"seleccionado. Se non se marca, o cálculo se realiza para os lugares de "
-"entrada, stock e saída do almacén."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Regra máximo"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Valor da previsión que se converterá en cantidade de produto en función dos "
-"prezos."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "Entradas restantes debe ser maior que 0!"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Saídas planificadas en períodos anteriores ó calculado. Entre a data de "
-"inicio do período actual e un día antes do comezo do período calculado."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Almacén ó que concernen as previsións. Se durante a planificación de stock "
-"precisa previsións de vendas para tódolos almacéns escolla agora un almacén "
-"calquera."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Saídas previstas"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Entradas restantes"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Crear liñas de previsións"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr "Cantidades de tódalas saídas confirmadas no período calculado."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Crear períodos diarios"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Tódalas previsións de vendas para o almacén seleccionado do produto "
-"seleccionado durante o periodo seleccionado."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Indicadores de regras de stock mínimo"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Período ó que concernen as previsións."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Só lugares de stock"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr "Cantidades que xa se enviaron fóra deste almacén no período actual."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Entradas confirmadas"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Situación do período actual"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Crear períodos mensuais"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.período.crearliñas"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Saídas planificadas antes"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Tódolos produtos con previsión"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Períodos:"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr "Cantidades que xa foron recollidas neste almacén no período actual."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Non hai produtos na categoría seleccionada!"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Previsións de stock e vendas"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.vendas.previsión"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Entradas planificadas"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Simulación de stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planificación.crearliñas"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Entradas confirmadas en períodos anteriores ó calculado (incluíndo as "
-"entradas realizadas). Entre a data de inicio do período actual e un día "
-"antes do comezo do período calculado."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Buscar previsións de vendas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "O período deste usuario5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-"Historial do abastecemento ou subministración interna desta liña de "
-"planificación."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Tódalas previsións para a compañía enteira (para tódolos almacéns) do "
-"produto seleccionado durante o período seleccionado."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "O período deste usuario1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "O período deste usuario3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Planificación de stock"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Regra de mínimos"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Entradas abastecemento restante"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Crear"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Plan mestre de abastecemento"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Pasado/Futuro"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "Categoría dos produtos cuxas previsións se crearán."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "período stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.venda.previsión.crearliñas"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Almacén"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Simulación de stock ó final do período seleccionado. Para o período actual "
-"é: Stock inicial – saídas + entradas – saídas previstas + entradas "
-"esperadas. Para os seguintes períodos é: Stock inicial – saídas previstas "
-"anteriores + entradas anteriores – saídas previstas + entradas previstas."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Seleccione esta casa para ver as vendas de toda a compañía."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Por departamento:"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Entradas antes"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Erro!"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Este usuario"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Previsións"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Abastecer desde outro almacen"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Calcular planificación"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Acción non válida!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Cantidade do stock un día antes do período actual."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Crear períodos semanais"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Simulación calculada do período"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Anular"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Este período de usuario4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Período de stock e vendas"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Previsión da compañía"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Por usuario:"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Almacén ó cal se referirá a planificación"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Creado/Validado por"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Previsión almacén"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"Debe especificar un almacén de orixe diferente do almacén calculado (de "
-"destino)!"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "O período desta compañía5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "UdM do produto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "O período desta compañía2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "O período desta compañía3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Data de comezo"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "O período deste usuario2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Previsións validadas"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"Crearase a planificación para os produtos da categoría de produtos "
-"seleccionada con este campo. Cando se marca a opción \"Tódalas previsións de "
-"produtos\", ignórase este campo."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Saídas planificadas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Previsión"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Proxecto"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Pechado"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Almacén "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Planificación e situación para o período calculado"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Introduza a cantidade saínte planificada para o almacén seleccionado durante "
-"o período seleccionado e para o produto seleccionado. Para planificar este "
-"valor, pódese fixar nas saídas confirmadas ou nas previsións de vendas. Este "
-"valor debería ser igual ou superior ás saídas confirmadas."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Subministración interna"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Crear previsións de vendas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Período4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Nome do Período"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Período2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Período3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Período1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Saídas confirmadas"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Crear liñas de planificación do stock"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Información xeral"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Previsión de vendas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Período deste almacén1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Histórico de vendas"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Almacén orixe"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Lugar de subministración do stock"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Data de fin para o período planificado."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Para crear a planificación de tódolos produtos que teñan calquera previsión "
-"no almacén e período seleccionado, marque esta opción. Ignorarase o campo "
-"categoría de produto."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Entradas realizadas"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Categoría UdM produto"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Período"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Categoría UdV produto"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "UdM activa"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Buscar planificación de stock"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Copiar última previsión"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Amosa a que produto atangue esta previsión"
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Feito"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Períodos"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Pechar"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Validado"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Aberto"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Copiar cantidades desde o stock pasado e previsión de vendas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "O período deste Dpto.1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "O período deste Dpto.3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "O período deste Dpto.2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "O período deste Dpto.5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "O período deste Dpto.4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "O período deste almacén2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "O período deste almacén3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Responsable"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "UdM por defecto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "O período deste almacén4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "O período deste almacén5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Corrente"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planificación"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Amosa a que almacén concirne esta previsión. Se durante a planificación de "
-"stock precisa previsións de vendas para tódolos almacéns, escolla agora un "
-"almacén calquera."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Por compañía"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Introducir a cantidade que (polo seu plan) debe entrar. Cambie este valor e "
-"observe a simulación do stock. Este valor debería ser igual ou superior ás "
-"entradas confirmadas."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "O período desta compañía4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Período ó cal atangue a planificación"
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Saídas realizadas"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Produto para o que foi creada esta planificación."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Por almacén:"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Histórico abastecementos"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Data inicial para o período planificado."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Stock"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr "Cantidades de tódalas entradas confirmadas no período calculado."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Data de remate"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Nº solicitude"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Amosa a que período atangue esta previsión."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "UoM"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Produto"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Previsións de vendas"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Categoría de Produto"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "Debe especificar un almacén de orixe!"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Abastecemento ó lugar do stock"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Aprobar"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-"Período para esta planificación. Crearase unha solicitude ó principio do "
-"período."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Stock inicial"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Cantidade de produto"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Marcar para usar só as previsións validadas. Se non se marca, o sistema usa "
-"as previsións validadas e o borrador."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Período5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Este almacén"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Amosa quen creou esta previsión, ou quen a validou."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Cantidade restante da cantidade entrante planificada. Calcúlase mediante a "
-"diferenza entre as entradas planificadas e as confirmadas. Para o período "
-"actual tamén se calculan as entradas realizadas. Este valor úsase para crear "
-"abastecementos para a cantidade que falta."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Calcular historial de vendas"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Esta compañía período1"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Stock inicial: "
-
-#~ msgid "Requisition history"
-#~ msgstr "Historial demandas"
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Almacén usado como orixe no movemento do subministro creado por "
-#~ "'Subministrar desde outro almacén'."
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Marque esta opción para realizar os abastecementos no lugar de stock do "
-#~ "almacén seleccionado. Se non se marca, realizarase o abastecemento no lugar "
-#~ "de entrada do almacén."
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Crear períodos de stock e vendas"
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Entradas confirmadas antes: "
-
-#~ msgid "This Department"
-#~ msgstr "Este departamento"
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Entrada restante: "
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Lista de recollida "
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Data de creación: "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Planificación manual para "
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Cantidade máxima establecida nas regras de stock mínimo para este almacén."
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "Abastecemento creado en MPS polo usuario: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Saídas confirmadas: "
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Unidade de medida utilizada para amosar as cantidades calculadas de stock. "
-#~ "Pode utilizar as unidades da categoría por defecto ou as da segunda "
-#~ "categoría (categoría UdV)."
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr "Crea liñas de planificación para o período e almacén seleccionados."
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Nota: Non duplica as liñas creadas por vostede."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Saídas realizadas: "
-
-#~ msgid ""
-#~ "\n"
-#~ "This module is based on original OpenERP SA module stock_planning version "
-#~ "1.0 of the same name Master Procurement Schedule.\n"
-#~ "\n"
-#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
-#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
-#~ "\n"
-#~ "Terms used in the module:\n"
-#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
-#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-#~ "the Period.\n"
-#~ "- Stock Planning - is the quantity of products you plan to purchase or "
-#~ "produce for the Period.\n"
-#~ "\n"
-#~ "Because we have another module sale_forecast which uses terms \"Sales "
-#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-#~ "values. \n"
-#~ "\n"
-#~ "Activity with this module is divided to three steps:\n"
-#~ "- Creating Periods. Mandatory step.\n"
-#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
-#~ "useful for further planning.\n"
-#~ "- Creating Planning lines, entering quantities to them and making "
-#~ "Procurement. Making procurement is the final step for the Period.\n"
-#~ "\n"
-#~ "Periods\n"
-#~ "=======\n"
-#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
-#~ "There are:\n"
-#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-#~ "monthly periods.\n"
-#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-#~ "change the dates and change the State of period.\n"
-#~ "\n"
-#~ "Creating periods is the first step you have to do to use modules features. "
-#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
-#~ "Periods\" form or view but it is recommended to use automating tool.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- These periods (officially Stock and Sales Periods) are separated of "
-#~ "Financial or other periods in the system.\n"
-#~ "- Periods are not assigned to companies (when you use multicompany feature "
-#~ "at all). Module suppose that you use the same periods across companies. If "
-#~ "you wish to use different periods for different companies define them as you "
-#~ "wish (they can overlap). Later on in this text will be indications how to "
-#~ "use such periods.\n"
-#~ "- When periods are created automatically their start and finish dates are "
-#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
-#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-#~ "you create periods manually you have to take care about hours because you "
-#~ "can have incorrect values form sales or stock. \n"
-#~ "- If you use overlapping periods for the same product, warehouse and company "
-#~ "results can be unpredictable.\n"
-#~ "- If current date doesn't belong to any period or you have holes between "
-#~ "periods results can be unpredictable.\n"
-#~ "\n"
-#~ "Sales Forecasts\n"
-#~ "===============\n"
-#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
-#~ "Forecasts\".\n"
-#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-#~ "forecasts lines according to some parameters.\n"
-#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-#~ "forms.\n"
-#~ "\n"
-#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-#~ "products from selected Category, for selected Period and for selected "
-#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-#~ "settings of period before this one to created one.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
-#~ "Period, Warehouse and validated or created by you) already exists. If you "
-#~ "wish to create another forecast, if relevant lines exists you have to do it "
-#~ "manually using menus described bellow.\n"
-#~ "- When created lines are validated by someone else you can use this tool to "
-#~ "create another lines for the same Period, Product and Warehouse. \n"
-#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
-#~ "some settings from your (validated by you or created by you if not validated "
-#~ "yet) forecast which is for last period before period of created forecast. If "
-#~ "there are few your forecasts for period before this one (it is possible) "
-#~ "system takes one of them (no rule which of them).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menus \"Sales Forecasts\"\n"
-#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
-#~ "validation can save your data against any accidental changes. You can click "
-#~ "\"Validate\" button but it is not mandatory.\n"
-#~ "\n"
-#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
-#~ "\"Product Amount\". System will count quantity from amount according to Sale "
-#~ "price of the Product.\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
-#~ "for this product. You have to enter parameters to the top and left of this "
-#~ "table and system will count sale quantities according to these parameters. "
-#~ "So you can select fe. your department (at the top) then (to the left): last "
-#~ "period, period before last and period year ago.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "\n"
-#~ "\n"
-#~ "Procurement Planning\n"
-#~ "====================\n"
-#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-#~ "lines according to some parameters.\n"
-#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
-#~ "module which allows to create procurement.\n"
-#~ "\n"
-#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
-#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
-#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
-#~ "Planning Lines\", then you can review created planning and make procurement "
-#~ "using menu \"Master Procurement Schedule\".\n"
-#~ "\n"
-#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-#~ "lines for products from selected Category, for selected Period, and for "
-#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
-#~ "system creates lines for all products having forecast for selected Period "
-#~ "and Warehouse. Selected Category will be ignored in this case.\n"
-#~ "\n"
-#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
-#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-#~ "Simulation\" and decide if this value would be accurate for end of the "
-#~ "Period. \n"
-#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-#~ "all forecasts for Period and Warehouse. But your planning can be based on "
-#~ "any other information you have. It is not necessary to have any forecast. \n"
-#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-#~ "is the quantity to be procured to make stock as indicated in \"Stock "
-#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-#~ "quantity to minimum stock rules visible on the form. But you can plan "
-#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
-#~ "whole Warehouse by default. But if you want to see values for Stock location "
-#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
-#~ "\n"
-#~ "If after few tries you decide that you found correct quantities for "
-#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
-#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
-#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
-#~ "\n"
-#~ "\n"
-#~ "If you don't want to Produce or Buy the product but just pick calculated "
-#~ "quantity from another warehouse you can click \"Supply from Another "
-#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-#~ "with move from selected source Warehouse to calculated Warehouse (as "
-#~ "destination). You can also decide if this pick should be done from Stock or "
-#~ "Output location of source warehouse. Destination location (Stock or Input) "
-#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
-#~ "\n"
-#~ "\n"
-#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-#~ "have to click button \"Calculate Planning\".\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "How Stock Simulation field is calculated:\n"
-#~ "Generally Stock Simulation shows the stock for end of the calculated period "
-#~ "according to some planned or confirmed stock moves. Calculation always "
-#~ "starts with quantity of real stock of beginning of current period. Then "
-#~ "calculation adds or subtracts quantities of calculated period or periods "
-#~ "before calculated.\n"
-#~ "When you are in the same period (current period is the same as calculated) "
-#~ "Stock Simulation is calculated as follows:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out \n"
-#~ "\t+ Planned In\n"
-#~ "\n"
-#~ "When you calculate period next to current:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out of current Period \n"
-#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period .\n"
-#~ "\n"
-#~ "As you see calculated Period is taken the same way like in case above. But "
-#~ "calculation of current Period are made a little bit different. First you "
-#~ "should note that system takes for current Period only Confirmed In moves. It "
-#~ "means that you have to make planning and procurement for current Period "
-#~ "before this calculation (for Period next to current). \n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period \n"
-#~ "\t- Sum of Planned Out of Periods before calculated \n"
-#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period.\n"
-#~ "\n"
-#~ "Periods before calculated means periods starting from current till period "
-#~ "before calculated.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- Remember to make planning for all periods before calculated because "
-#~ "omitting these quantities and procurements can cause wrong suggestions for "
-#~ "procurements few periods ahead.\n"
-#~ "- If you made planning few periods ahead and you find that real Confirmed "
-#~ "Out is bigger than Planned Out in some periods before you can repeat "
-#~ "Planning and make another procurement. You should do it in the same planning "
-#~ "line. If you create another planning line the suggestions can be wrong.\n"
-#~ "- When you wish to work with different periods for some part of products "
-#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
-#~ "different products. Example: If you use always Weekly periods for Products "
-#~ "A, and Monthly periods for Products B your all calculations will work "
-#~ "correctly. You can also use different kind of periods for the same products "
-#~ "from different warehouse or companies. But you cannot use overlapping "
-#~ "periods for the same product, warehouse and company because results can be "
-#~ "unpredictable. The same apply to Forecasts lines.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo baséase na versión orixinal de OpenERP stock_planning SA módulo "
-#~ "1.0 do mesmo nome Programador de Compras Mestras. O propósito da MPS é "
-#~ "permitir crear un manual de contratación (solicitude), á parte do "
-#~ "programador MRP (que funciona automaticamente, baseándose en regras de "
-#~ "existencias mínimas). Os termos utilizados no módulo:- Stock e Período de "
-#~ "vendas – é o tempo (entre a Data de comezo e a Data de remate) para o que "
-#~ "planifica o Stock e a Previsión de Vendas e fai a Planificación das Compras.-"
-#~ " Stock e prognóstico de vendas – é a cantidade de produtos que planea vender "
-#~ "no Período.- Planificación de Stock – é a cantidade de produtos que planea "
-#~ "mercar ou producir para o Período. Porque temos outro módulo sale_forecast "
-#~ "que utiliza os termos \"Prognóstico de Vendas\" e \"Planificación\" como "
-#~ "valores de cantidade, utilizaremos termos \"Stock e Prognóstico de Vendas\" "
-#~ "e \"Planificación do Stock\" para salientar que usamos os valores de "
-#~ "cantidade. A actividade con este módulo divídese en tres pasos:- Creación de "
-#~ "Períodos. Paso obrigatorio.- Creación de Prognósticos de Venda e introdución "
-#~ "das súas cantidades. Un paso opcional pero útil para unha maior "
-#~ "planificación.- Creación de liñas de Planificación, introdución das súas "
-#~ "cantidades e facer Adquisicións. Facer compras é o paso final para o "
-#~ "Período. Períodos=========Ten dúas opcións de menú para Períodos en "
-#~ "\"Xestión de Vendas - Configuración\". Son as seguintes:- \"Crear os "
-#~ "Períodos de Vendas\" - Que automatiza a creación de períodos diarios, "
-#~ "semanais ou mensuais.- \"Stock e Períodos de vendas\" - Que permite crear "
-#~ "calquera tipo de períodos, o cambio das datas e o cambio do Estado do "
-#~ "período. Creación de períodos é o primeiro paso para utilizar as funcións "
-#~ "dos módulos. Pode crear períodos personalizados mediante o botón \"Novo\" no "
-#~ "formulario ou vista de \"Stock e Períodos de Vendas\", pero recoméndase "
-#~ "utilizar a ferramenta automática. Observacións:- Estes períodos (Stock "
-#~ "oficial e Períodos de Vendas) separan de Finanzas ou doutros períodos no "
-#~ "sistema.- Os Períodos non se asignan ás compañías (en ningún caso cando se "
-#~ "utiliza a función multicompañía). O módulo supón que utiliza os mesmos "
-#~ "períodos a través das compañías. Se desexa utilizar períodos diferentes para "
-#~ "diferentes compañías, defínaos ó seu gusto (pódense solapar). Máis adiante "
-#~ "neste texto indícase cómo utilizar eses períodos.- Cando os períodos se "
-#~ "crean automaticamente, as súas datas de comezo e final comezan coa hora "
-#~ "00:00:00 e 23:59:00 como hora final. Ex. Cando cree períodos diarios, terán "
-#~ "como data de inicio 01.31.2010 00:00:00 e  como data de remate 01.31.2010 "
-#~ "23:59:00. Só funciona na creación automática dos períodos. Cando cree "
-#~ "períodos manualmente hai que ter coidado coas horas, xa que pode ter valores "
-#~ "incorrectos en vendas e stock.- Se utiliza períodos solapados para o mesmo "
-#~ "produto, almacén e compañía, se cadra os resultados non se poden predicir.- "
-#~ "Se a data actual non pertence a ningún período ou se ten baleiros entre os "
-#~ "períodos, se cadra os resultados non se poden predicir. Previsión de "
-#~ "vendas====================Ten menús poucas vendas previsto en \"Xestión de "
-#~ "Vendas - Prognósticos de Vendas\".- \"Creación de Prognósticos de Vendas "
-#~ "para os Períodos de Vendas\" - que automatiza a creación de liñas de "
-#~ "previsións de acordo con algúns parámetros.- \"As Previsións de Vendas\" - "
-#~ "algúns menús para traballar con listas das previsións e as formas. Menú "
-#~ "\"Crear Prognósticos de Vendas para Períodos de Vendas\" crea Prognósticos "
-#~ "para os produtos da Categoría seleccionada, para o Período e Almacén "
-#~ "seleccionado. É unha opción \"Copia do Último Prognóstico\" para copiar "
-#~ "previsións e outros axustes do período anterior a este para crear un. "
-#~ "Observacións:- Esta ferramenta non crea liñas, se as liñas oportunas (para o "
-#~ "mesmo Produto, Período e Almacén, e validado ou creado por vostede) xa "
-#~ "existen. Se desexa crear outro prognóstico, se as liñas pertinentes existen "
-#~ "ten que facelo manualmente usando os menús que se describen a continuación.- "
-#~ "Cando se crean as liñas, son validadas por outra persoa que pode utilizar "
-#~ "esta ferramenta para crear outras liñas para o mesmo Período, Produto e "
-#~ "Almacén.- Cando se elixe \"Copiar Último Prognóstico\" a liña creada ten a "
-#~ "cantidade e algúns axustes do seu (validado ou creadas por vostede, se aínda "
-#~ "non se validou) prognóstico que para o último período anterior ó período da "
-#~ "previsión creada. Se hai poucos prognósticos para o período anterior a este "
-#~ "(é posible) o sistema toma unha deles (non existe regra sobre cal). Menús "
-#~ "\"Previsión de Vendas \"No formulario \"Prognóstico de Vendas\" "
-#~ "principalmente ten que introducir unha cantidade prevista na \"Cantidade de "
-#~ "Produto\". Ademais do cálculo pode funcionar para as previsións borrador. "
-#~ "Porén, a validación pode gardar os seus datos contra calquera cambio "
-#~ "accidental. Pode facer clic no botón \"Validar\", pero non é obrigatorio. No "
-#~ "lugar da cantidade prevista pódese introducir a cantidade de previsión de "
-#~ "vendas no campo \"Cantidade de Produto\". O sistema contará a cantidade en "
-#~ "función do Prezo de Venda do Produto. Tódolos valores do formulario "
-#~ "exprésanse na unidade de medida seleccionada no formulario. Vostede pode "
-#~ "seleccionar un na unidade de medida da categoría por defecto ou de segunda "
-#~ "categoría. Cando se cambia a unidade de medida as cantidades volveranse a "
-#~ "calcular de acordo coa nova UoM: os valores editables (campos azuis) "
-#~ "inmediatamente, os campos non editables despois de facer clic no botón "
-#~ "\"Calcular Planificación\". Para atopar o valor axeitado para o Prognóstico "
-#~ "de Venda, pódese utilizar a táboa \"Historial de vendas\" para este produto. "
-#~ "Tes que introducir os parámetros na parte superior esquerda desta táboa e o "
-#~ "sistema contará as cantidades de venda de acordo con estes parámetros. Así "
-#~ "que vostede pode seleccionar, por exemplo do seu departamento (na parte "
-#~ "superior) e logo (á esquerda): o último período, o período anterior ó último "
-#~ "e o período de fai un ano. Observacións: Planificación das "
-#~ "compras====================Menú para a Planificación do que podes atopar en "
-#~ "\"Almacén - Planificación do Stock\".- \"Crear arquivo de Planificación "
-#~ "Lines\" - permítelle automatizar a creación de liñas de planificación de "
-#~ "acordo con algúns parámetros.- \"Programador Mestre de Adquisicións\" – é o "
-#~ "menú máis importante do módulo que permite a creación da contratación. Con "
-#~ "arranxo ás previsións de vendas, é a fase de planificación de vendas. A "
-#~ "Planificación de compras (planificación) é a fase de programación de compras "
-#~ "ou de produción. Vostede pode crear a planificación das compras rapidamente "
-#~ "coa ferramenta do menú \"Crear Liñas de Planificación de Stock\", entón pode "
-#~ "revisar a planificación creada e facer compras usando o menú \"Lista Mestre "
-#~ "de Adquisicións\". Menú \"Crear Liñas de Planificación de Stock\" permítelle "
-#~ "crear rapidamente as Liñas de Planificación de produtos da categoría "
-#~ "seleccionada, en determinados períodos, e para o almacén seleccionado. Ó "
-#~ "marcar a opción \"Tódolos produtos con Prognóstico\"o sistema crea as liñas "
-#~ "para tódolos produtos que ten previsto para o Período seleccionado e "
-#~ "Almacén. A Categoría seleccionada terase en conta neste caso. Debaixo do "
-#~ "menú \"Programador Mestre de Adquisicións\" polo xeral, pode cambiar os "
-#~ "valores \"Saídas planificadas\" e \"Entradas planificadas\" para observar o "
-#~ "campo \"Simulación de Stock\" e decidir se este valor é exacto para o final "
-#~ "do período. \"Planeado\" pódese basear no \"Prognóstico de Almacén\", que é "
-#~ "a suma de tódalas previsións para o período e Almacén. Pero a planificación "
-#~ "pódese basear en calquera outra información que vostede teña. Non cómpre ter "
-#~ "ningún prognóstico.\"Entradas planificadas\" utilízase a cantidade para "
-#~ "calcular o campo \"Entradas Restantes\" que é a cantidade que falta por "
-#~ "adquirir para acadar o stock, como se indica na \"Simulación de Stock\" ó "
-#~ "final do período. Vostede pode comparar a \"Simulación de Stock\" coas "
-#~ "normas de cantidade mínima de existencias visibles no formulario. Pero pode "
-#~ "planear unha cantidade diferente ó das Regras Mínimas de Stock. O cálculo "
-#~ "está feito para todo o almacén por defecto. Pero se vostede quere ver os "
-#~ "valores do lugar do stock do almacén calculado, pode utilizar a casa \"Só "
-#~ "lugar do Stock\". Se despois de varios intentos decide que as cantidades son "
-#~ "correctas para  \"Saídas planificadas\" e \"Entradas planificadas\" e que "
-#~ "está satisfeito co final de existencias do período calculado na \"Simulación "
-#~ "do Stock\" pode facer clic en \"Adquirir Entradas Restantes\" para obter a "
-#~ "cantidade do campo \"Entradas Restantes\" no Almacén. O sistema crea a "
-#~ "correspondente Orde de Compras. Vostede pode decidir se a contratación se "
-#~ "fará para o stock ou para o lugar de entrada do Almacén calculado. Se non "
-#~ "queres Producir ou Comprar o produto, pero só debes elixir a cantidade "
-#~ "calculada, desde outro almacén pode facer clic en \"Subministración desde "
-#~ "Outro Almacén\" (en lugar de \"Adquirir Entradas Restantes\"). O sistema "
-#~ "crea a lista de selección desde o Almacén de orixe seleccionado ata o "
-#~ "Almacén calculado (como destino). Tamén pode decidir se se debe facer esta "
-#~ "selección de almacén ou o lugar de saída do almacén de orixe. O lugar de "
-#~ "destino (almacén ou entrada) do almacén de destino, utilizarase como "
-#~ "establecido para \"Adquirir Entradas Restantes\". Para ver as cantidades "
-#~ "axeitadas nos campos \"Entrada Confirmada\", \"Saída Confirmada\", \"Entrada "
-#~ "Confirmada Antes\", \"Saídas planificadas antes\" e \"Simulación de Stock\" "
-#~ "ten que facer clic no botón \"Calcular Planificación\".Tódolos valores no "
-#~ "formulario exprésanse na unidade de medida seleccionada no formulario. "
-#~ "Vostede pode seleccionar un da unidade de medida da categoría por defecto ou "
-#~ "dunha segunda categoría. Cando se cambia a unidade de medida as cantidades "
-#~ "volveranse a calcular de acordo con UoM: os valores editables inmediatamente "
-#~ "(campos azuis), os campos non editables despois de facer clic no botón "
-#~ "\"Calcular Planificación\".Cómo se calcula o campo Simulación do Stock: "
-#~ "Xeralmente a Simulación do Stock amosa o stock ó final período calculado de "
-#~ "acordo con algúns movementos de stock previsto ou confirmado. Iníciase o "
-#~ "cálculo sempre coa cantidade de stock real do inicio do período actual. "
-#~ "Calcúlase logo a suma ou resta das cantidades do período ou períodos antes "
-#~ "calculados. Cando está no mesmo período (período actual é o mesmo có "
-#~ "calculado) a Simulación do Stock calcúlase como sigue: Simulación de Stock = "
-#~ "\t Stock inicial do período actual\t - Saídas planificadas \t + Entradas "
-#~ "planificadas Cando se calcula o período seguinte ó actual: Simulación do "
-#~ "Stock = \t Stock inicial do período actual \t - Planificación de Saídas do "
-#~ "Período actual\t + Entradas Confirmadas no Período actual (incl. as Entradas "
-#~ "xa existentes)\t - Saídas planificadas do Período calculado \t + Entradas "
-#~ "planificadas no Período calculado.Como pode ver o período calculado tómase "
-#~ "da mesma forma que no caso anterior. Porén, o cálculo do período actual "
-#~ "faise de xeito un pouco diferente. En primeiro lugar debe ter en conta que o "
-#~ "sistema ten para o Período actual só Confirmados os movementos de entrada. "
-#~ "Isto significa que ten que facer a planificación e a compra para Período "
-#~ "actual antes deste cálculo (para o Próximo período ó actual). Cando se "
-#~ "calcula o período seguinte: Colección de simulación = \t Stock inicial do "
-#~ "Período actual \t - Suma de Planificación de saída dos períodos antes "
-#~ "calculados \t + Suma de Confirmados En períodos anteriores calculados (incl. "
-#~ "as entradas xa existentes) \t - Saídas Planificadas do Período calculado \t "
-#~ "+ Entradas Planificadas do Período calculado. Os períodos anteriores "
-#~ "calculados, significa que os períodos comezados no actual ata o período "
-#~ "antes calculado. Observacións:- Lembre facer a planificación para tódolos "
-#~ "períodos antes calculados, omitir estas cantidades e as adquisicións poden "
-#~ "causar suxestións erróneas para as compras dalgúns períodos posteriores. - "
-#~ "Se realizou a planificación duns poucos períodos posteriores e atopa que as "
-#~ "Saídas Confirmadas reais son maiores co previsto nalgúns períodos antes de "
-#~ "que se poida repetir a Planificación e realizar outra adquisición. Debe "
-#~ "facelo na mesma liña da planificación. Se se crea outra liña de "
-#~ "planificación de suxestións pode estar equivocada.- Cando desexa traballar "
-#~ "con diferentes períodos para unha parte dos produtos, defina dous tipos de "
-#~ "períodos (Ex. semanal e mensual) e utilíceos para os diferentes produtos. "
-#~ "Exemplo: se utiliza sempre os períodos semanais para os produtos A, e os "
-#~ "períodos mensuais dos produtos B tódolos seus cálculos funcionarán "
-#~ "correctamente. Tamén pode utilizar diferentes tipos de períodos para os "
-#~ "mesmos produtos de diferentes almacéns de diferentes compañías. Pero non se "
-#~ "poden utilizar períodos solapados para o mesmo produto dun almacén, e "
-#~ "compañía porque se cadra non se poden predicir os resultados. Aplícase o "
-#~ "mesmo ás liñas de Previsións.\n"
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Crear períodos para planificación de stock e vendas"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Saídas previstas: "
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Entradas realizadas: "
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Cantidade prevista para saír no período seleccionado. Diferenza entre as "
-#~ "saídas previstas e as saídas confirmadas. Para o período actual tamén se "
-#~ "calculan as saídas realizadas."
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr "Crear liñas de previsión para o almacén e período seleccionados."
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Solicitude ("
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Saídas planificadas: "
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "Non se poden borrar as previsións de vendas validadas!"
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Stock mínimo: "
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Entradas confirmadas: "
-
-#~ msgid "Sales history"
-#~ msgstr "Histórico de vendas"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Cantidade prevista."
-
-#~ msgid "Product Quantity"
-#~ msgstr "Cantidad de produto"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " segundo o estado:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Previsión almacén: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Simulación de stock: "
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Entradas planificadas: "
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "Marque esta opción para subministrar desde o lugar do stock do almacén de "
-#~ "subministración. Se non se marca, realizarase a subministración desde o "
-#~ "lugar de saída do almacén de subministración. Utilizado en 'Subministrar "
-#~ "desde outro almacén' cun almacén de subministración."
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Cantidade mínima establecida nas regras de stock mínimo para este almacén."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Por período: "
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "MPS("
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Albará creado desde MPS polo usuario: "
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Períodos de planificación de stock e vendas"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Saídas planificadas antes: "
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Períodos de stock e vendas"
diff --git a/addons/stock_planning/i18n/hr.po b/addons/stock_planning/i18n/hr.po
deleted file mode 100644
index 3b3b28029bb..00000000000
--- a/addons/stock_planning/i18n/hr.po
+++ /dev/null
@@ -1,1913 +0,0 @@
-# Croatian 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:33+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Croatian <hr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"Ne postoje predviđanja zalihe za odabrani period, ili nema proizvoda za "
-"odabranu kategoriju !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Pravilo maksimuma"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Grupiraj po..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Vrijednost predviđanja koja će se promijeniti u količinu proizvoda u skladu "
-"s cijenama."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "Ostatak ulaza mora biti veći od 0 !"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Očekivani izlaz u periodima prije kalkulacije. Između datuma početka "
-"trenutnog perioda i dan prije početka perioda kalkulacije."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Skladište predviđanja. Ako vam je tijekom planiranja zalihe potrebno "
-"predviđanje prodaje za sva skladišta odaberite bilo koje skladište sada."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Očekivani izlaz"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Ostatak ulaza"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Kreiraj stavke predviđanja"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr "Količina svih potvrđenih izlaznih prijenosa u periodu kalkulacije"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Kreiraj dnevne periode"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Organizacija"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr "Sve prognoze prodaje za skladište, proizvod i period."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Pokazatelji pravila minimalne zalihe"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Period na koji se odnose predviđanja."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Samo lokacija zalihe"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr "Količina već izašla iz ovog skladišta u trenutnom periodu."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Potvrđen ulaz"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Stanje trenutnog perioda"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Stvori mjesečna razdoblja"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.period.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Prethodno očekivani izlaz:"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Svi proizvodi sa predviđanjem"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Razdoblja:"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr "Količina koja je primljena u skladište u trenutnom periodu."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Nema proizvoda u odabranoj kategoriji !"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Predviđanje zalihe i prodaje"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.sale.forecast"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Očekivani ulaz"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Simulacija zalihe"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "zaliha.plairanje.createlines"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Potvrđeni ulazi u periodima prije kalkulacije (uključujući robu koja je već "
-"na skladištu). Između datuma početka trenutnog perioda i dan prije početka "
-"perioda kalkulacije."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Pretraži predviđanja prodaje"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "Period5 ovog korisnika"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr "Povijest nabava ili internih nabava za ovu stavku planiranja."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Sva predviđanja prodaje na nivou organizacije (sva skladišta) za odabrani "
-"proizvod tijekom odabranog perioda."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "Ovaj korisnik period1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "Period3 ovog korisnika"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Planiranje zalihe"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Pravilo minimuma"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Nabavi ostatak ulaza"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Stvori"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Raspored glavne nabave"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Prethodno/buduće"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Stanje"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "Odnosi se na kategorije proizvoda za koje se radi predviđanje."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "Period zalihe"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.sale.forecast.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Skladište"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Simulacija zalihe na kraju odabranog perioda..\n"
-" Za trenutni period: \n"
-"Početna zaliha - već izašlo + već ušlo - očekivani izlaz + ostatak ulaza.\n"
-"Za sljedeći period:: \n"
-"Početna zaliha - prethodno očekivani izlaz + prethodno očekivani ulaz - "
-"očekivani izlaz + očekivani ulaz."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Označite kućicu da vidite prodaju za cijelu organizaciju."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Po odjelu:"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Prethodno očekivani ulaz"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Pogreška !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Ovaj korisnik"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Predviđanja"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Opskrba iz drugog skladišta"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Napravi plan"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Neispravna akcija !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Količina na zalihi dan prije trenutnog perioda."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Kreiraj tjedne periode"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Simulacija perioda kalkulacije"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Odustani"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Period4 ovog korisnika"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Skladišno i prodajno razdoblje"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Predviđanje za organizaciju"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Po korisniku :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Skladište na koje se odnosi planiranje."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Kreirao/Potvrdio"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Predviđanje za skladište"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"Morate odabrati početno skladište drukčije od izračunatog (odredišnog) "
-"skladišta !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "Period5 ove organizacije"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "JM Proizvoda"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "Period2 ove organizacije"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "Period3 ove organizacije"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Početni datum"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "Period2 ovog korisnika"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Potvrđena predviđanja"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"Planiranje će se kreirati za proizvode iz odabrane grupe. Ovo polje se ne "
-"koristi kada je označeno  \"Svi proizvodi predviđanja\"."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Očekivani izlaz"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Prognoza"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Nacrt"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Zatvoren"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Skladište "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Planiranje i situacija za izračunati period"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Unesite planiranu izlaznu količinu odabranog proizvoda iz odabranog "
-"skladišta za unijeti period. Za planiranje ove vrijednosti pogledajte "
-"potvrđeni izlaz ili predviđanja prodaje. Ova vrijednost bi trebala biti ista "
-"ili veća od potvrđenog izlaza."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Interna nabava"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Kreiraj predviđanja prodaje"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Razdoblje4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Naziv Perioda"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Razdoblje2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Period3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Period1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Potvrđeni izlaz"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Kreiraj stavke planiranja zalihe"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Opći podaci"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Prognoza prodaje"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Period1 ovog skladišta"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Povijest prodaje"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Izvorno skladište"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Lokacija nabave"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Datum završetka za planirani period"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Označite ovu kućicu da kreirate planiranje za sve proizvode koji koriste "
-"predviđanje za odabrano skladište i period. Polje grupe proizvoda se "
-"ignorira."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Već ušlo"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Kategorija JM"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Period"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Kategorija JS proizvoda"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "Aktivna JM"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Traži planiranje zalihe"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Kopiraj posljednje predviđanje"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Određuje proizvode na koje se odnosi ovo predviđanje."
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Izvršeno"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Razdoblja"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Zatvori"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Provjereno"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Otvoreno"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Kopiraj količine iz prethodnog predviđanja zalihe i prodaje."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "Period1 ovog odjela"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "Period3 ovog odjela"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "Period2 ovog odjela"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "Period5 ovog odjela"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "Period4 ovog odjela"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "Period2 ovog skladišta"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "Period3 ovog skladišta"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Odgovoran"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "Uobičajena JM"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "Period4 ovog skladišta"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "Period5 ovog skladišta"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Trenutno"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planning"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Pokazuje na koje se skladište predviđanje odnosi. Ako vam je tijekom "
-"planiranja zalihe potrebno predviđanje prodaje za sva skladišta odaberite "
-"skladište sada."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Po organizaciji"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Unesite količinu koja (prema vašem planu) treba ući na skladište. "
-"Promijenite ovu vrijednost i provjerite simulaciju zalihe. Ova vrijednost bi "
-"trebala biti jednaka ili veća od količine potvrđenog ulaza."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "Period4 ove organizacije"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Period na koji se odnosi planiranje."
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Već izašao"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Proizvod za koji se kreira planiranje."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Po skladištu:"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Povijest nabave"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Početni datum za period planiranja."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr "Stock Periods"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Zaliha"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr "Količina svih potvrđenih prijenosa ulaza u periodu kalkulacije."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Završni Datum"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Bez zahtjevnica"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Naziv"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Pokazuje period predviđanja."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "JM"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Proizvod"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Predviđanja prodaje:"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Grupa proizvoda"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "Morate odrediti početno skladište !"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Nabavi na lokaciju zalihe"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Odobri"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr "Period ovog planiranja. Nabava će se kreirati za početak perioda."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Početna zaliha"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Količina proizvoda"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Označite za korištenje samo potvrđenih predviđanja zalihe. Ako vrijednost "
-"nije označena, sustav uzima u obzir valjana predviđanja i nacrte."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Razdoblje5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Ovo skladište"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Shows who created this prognoza, or who validated."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Preostala količina za planiranu ulaznu količinu. Ovo je izračunata "
-"vrijednost između planiranog i potvrđenog ulaza. Za trenutni period trenutni "
-"ulaz je već izbračunat. Ova vrijednost se koristi za kreiranje nabave za "
-"manjak količina."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Izračunaj povijest prodaje"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Period1 tvrtke"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Već vani: "
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Pogrešan naziv u definiciji akcije."
-
-#~ msgid "Requisition history"
-#~ msgstr "Povijest rekvizicije"
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Kreiraj periode zalihe i prodaje"
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Označite za nabavu na lokaciju zalihe u odabrano skladište. Ako nije "
-#~ "označeno, nabava će se obaviti na ulaznu lokaciju skladišta."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Prethodno očekivani izlaz: "
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Izlazno skladište u prijenosu robe koje kreira  'Opskrba sa drugog skladišta'"
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Potvrđen ulaz prije: "
-
-#~ msgid "This Department"
-#~ msgstr "Ovaj odjel"
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Pick lista "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Nevažeći XML za arhitekturu View-a"
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Datum kreiranja: "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Korisničko planiranje za "
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "Nabavu kreirao u RGN korisnik: "
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Maksimalna količina postavljena u pravilima minimalne zalihe za ovo skladište"
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr "Kreira stavke planiranja za odabrani period i skladište."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Predviđanje za skladište: "
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "Ne možete izbrisati potvrđena predviđanja prodaje !"
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Napomena: Ne duplicira postojeće stavke koje ste već kreirali."
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Jedinica mjere za prikaz količina kalkulacije zalihe. Možete koristiti "
-#~ "jedinice iz predefinirane kategorije ili iz druge kategorije (kategorija "
-#~ "jedinice zalihe)."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Očekivani izlaz: "
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Kreiraj periode za planiranje zalihe i prodaje"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module is based on original OpenERP SA module stock_planning version "
-#~ "1.0 of the same name Master Procurement Schedule.\n"
-#~ "\n"
-#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
-#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
-#~ "\n"
-#~ "Terms used in the module:\n"
-#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
-#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-#~ "the Period.\n"
-#~ "- Stock Planning - is the quantity of products you plan to purchase or "
-#~ "produce for the Period.\n"
-#~ "\n"
-#~ "Because we have another module sale_forecast which uses terms \"Sales "
-#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-#~ "values. \n"
-#~ "\n"
-#~ "Activity with this module is divided to three steps:\n"
-#~ "- Creating Periods. Mandatory step.\n"
-#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
-#~ "useful for further planning.\n"
-#~ "- Creating Planning lines, entering quantities to them and making "
-#~ "Procurement. Making procurement is the final step for the Period.\n"
-#~ "\n"
-#~ "Periods\n"
-#~ "=======\n"
-#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
-#~ "There are:\n"
-#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-#~ "monthly periods.\n"
-#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-#~ "change the dates and change the State of period.\n"
-#~ "\n"
-#~ "Creating periods is the first step you have to do to use modules features. "
-#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
-#~ "Periods\" form or view but it is recommended to use automating tool.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- These periods (officially Stock and Sales Periods) are separated of "
-#~ "Financial or other periods in the system.\n"
-#~ "- Periods are not assigned to companies (when you use multicompany feature "
-#~ "at all). Module suppose that you use the same periods across companies. If "
-#~ "you wish to use different periods for different companies define them as you "
-#~ "wish (they can overlap). Later on in this text will be indications how to "
-#~ "use such periods.\n"
-#~ "- When periods are created automatically their start and finish dates are "
-#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
-#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-#~ "you create periods manually you have to take care about hours because you "
-#~ "can have incorrect values form sales or stock. \n"
-#~ "- If you use overlapping periods for the same product, warehouse and company "
-#~ "results can be unpredictable.\n"
-#~ "- If current date doesn't belong to any period or you have holes between "
-#~ "periods results can be unpredictable.\n"
-#~ "\n"
-#~ "Sales Forecasts\n"
-#~ "===============\n"
-#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
-#~ "Forecasts\".\n"
-#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-#~ "forecasts lines according to some parameters.\n"
-#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-#~ "forms.\n"
-#~ "\n"
-#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-#~ "products from selected Category, for selected Period and for selected "
-#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-#~ "settings of period before this one to created one.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
-#~ "Period, Warehouse and validated or created by you) already exists. If you "
-#~ "wish to create another forecast, if relevant lines exists you have to do it "
-#~ "manually using menus described bellow.\n"
-#~ "- When created lines are validated by someone else you can use this tool to "
-#~ "create another lines for the same Period, Product and Warehouse. \n"
-#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
-#~ "some settings from your (validated by you or created by you if not validated "
-#~ "yet) forecast which is for last period before period of created forecast. If "
-#~ "there are few your forecasts for period before this one (it is possible) "
-#~ "system takes one of them (no rule which of them).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menus \"Sales Forecasts\"\n"
-#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
-#~ "validation can save your data against any accidental changes. You can click "
-#~ "\"Validate\" button but it is not mandatory.\n"
-#~ "\n"
-#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
-#~ "\"Product Amount\". System will count quantity from amount according to Sale "
-#~ "price of the Product.\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
-#~ "for this product. You have to enter parameters to the top and left of this "
-#~ "table and system will count sale quantities according to these parameters. "
-#~ "So you can select fe. your department (at the top) then (to the left): last "
-#~ "period, period before last and period year ago.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "\n"
-#~ "\n"
-#~ "Procurement Planning\n"
-#~ "====================\n"
-#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-#~ "lines according to some parameters.\n"
-#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
-#~ "module which allows to create procurement.\n"
-#~ "\n"
-#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
-#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
-#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
-#~ "Planning Lines\", then you can review created planning and make procurement "
-#~ "using menu \"Master Procurement Schedule\".\n"
-#~ "\n"
-#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-#~ "lines for products from selected Category, for selected Period, and for "
-#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
-#~ "system creates lines for all products having forecast for selected Period "
-#~ "and Warehouse. Selected Category will be ignored in this case.\n"
-#~ "\n"
-#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
-#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-#~ "Simulation\" and decide if this value would be accurate for end of the "
-#~ "Period. \n"
-#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-#~ "all forecasts for Period and Warehouse. But your planning can be based on "
-#~ "any other information you have. It is not necessary to have any forecast. \n"
-#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-#~ "is the quantity to be procured to make stock as indicated in \"Stock "
-#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-#~ "quantity to minimum stock rules visible on the form. But you can plan "
-#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
-#~ "whole Warehouse by default. But if you want to see values for Stock location "
-#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
-#~ "\n"
-#~ "If after few tries you decide that you found correct quantities for "
-#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
-#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
-#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
-#~ "\n"
-#~ "\n"
-#~ "If you don't want to Produce or Buy the product but just pick calculated "
-#~ "quantity from another warehouse you can click \"Supply from Another "
-#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-#~ "with move from selected source Warehouse to calculated Warehouse (as "
-#~ "destination). You can also decide if this pick should be done from Stock or "
-#~ "Output location of source warehouse. Destination location (Stock or Input) "
-#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
-#~ "\n"
-#~ "\n"
-#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-#~ "have to click button \"Calculate Planning\".\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "How Stock Simulation field is calculated:\n"
-#~ "Generally Stock Simulation shows the stock for end of the calculated period "
-#~ "according to some planned or confirmed stock moves. Calculation always "
-#~ "starts with quantity of real stock of beginning of current period. Then "
-#~ "calculation adds or subtracts quantities of calculated period or periods "
-#~ "before calculated.\n"
-#~ "When you are in the same period (current period is the same as calculated) "
-#~ "Stock Simulation is calculated as follows:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out \n"
-#~ "\t+ Planned In\n"
-#~ "\n"
-#~ "When you calculate period next to current:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out of current Period \n"
-#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period .\n"
-#~ "\n"
-#~ "As you see calculated Period is taken the same way like in case above. But "
-#~ "calculation of current Period are made a little bit different. First you "
-#~ "should note that system takes for current Period only Confirmed In moves. It "
-#~ "means that you have to make planning and procurement for current Period "
-#~ "before this calculation (for Period next to current). \n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period \n"
-#~ "\t- Sum of Planned Out of Periods before calculated \n"
-#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period.\n"
-#~ "\n"
-#~ "Periods before calculated means periods starting from current till period "
-#~ "before calculated.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- Remember to make planning for all periods before calculated because "
-#~ "omitting these quantities and procurements can cause wrong suggestions for "
-#~ "procurements few periods ahead.\n"
-#~ "- If you made planning few periods ahead and you find that real Confirmed "
-#~ "Out is bigger than Planned Out in some periods before you can repeat "
-#~ "Planning and make another procurement. You should do it in the same planning "
-#~ "line. If you create another planning line the suggestions can be wrong.\n"
-#~ "- When you wish to work with different periods for some part of products "
-#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
-#~ "different products. Example: If you use always Weekly periods for Products "
-#~ "A, and Monthly periods for Products B your all calculations will work "
-#~ "correctly. You can also use different kind of periods for the same products "
-#~ "from different warehouse or companies. But you cannot use overlapping "
-#~ "periods for the same product, warehouse and company because results can be "
-#~ "unpredictable. The same apply to Forecasts lines.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ovaj modul temelji se na originalnom OpenERP SA modulu stock_planning "
-#~ "verzija 1.0 istog naziva kao i raspored glavne nabave.\n"
-#~ "\n"
-#~ "Svrha RGN je da se dopusti ručno kreiranje nabave (rekvizicije) odvojeno od "
-#~ "RGN planera (koji automatski koristi pravila minimalne zalihe).\n"
-#~ "\n"
-#~ "Termini korišteni u modulu:\n"
-#~ "- Period zalihe i prodaje - vrijeme (između datuma početka i završetka) za "
-#~ "koje radite predviđanje zalihe i prodaje i plan nabave.\n"
-#~ "- Predviđanje zalihe i prodaje - količina proizvoda za koju očekujete da "
-#~ "ćete je prodati u odabranom periodu.\n"
-#~ "- Planiranje zalihe - količina proizvoda koju planirate kupiti ili "
-#~ "proizvesti u odabranom periodu.\n"
-#~ "\n"
-#~ "Pošto postoji modul module_sale_forecast koji koristi termine \"Predviđanje "
-#~ "prodaje\" i \"Planiranje\" kao vrijednosti iznosa koristit ćemo izraze "
-#~ "\"Predviđanje zalihe i prodaje\" i \"Planiranje zalihe\" da naglasimo da "
-#~ "koristimo količine, a ne iznose. \n"
-#~ "\n"
-#~ "Aktivnosti u ovom modulu podijeljene su u tri koraka:\n"
-#~ "- Kreiranje perioda. Obavezan korak.\n"
-#~ "- Kreiranje predviđanja prodaje i unos količina u njih. Opcionalan korak, "
-#~ "ali koristan za daljnje planiranje.\n"
-#~ "- Kreiranje stavki planiranja, unos količina stavki i pokretanje nabave. "
-#~ "Nabavljanje je konačan korak za period.\n"
-#~ "\n"
-#~ "Periodi\n"
-#~ "=======\n"
-#~ "Postoje dvije stavke izbornika za periode u \"Upravljanje prodajom - "
-#~ "Podešavanje\". To su:\n"
-#~ "- \"Kreiraj periode prodaje\" - automatizira kreiranje po dnevnim, tjednim "
-#~ "ili mjesečnim periodima.\n"
-#~ "- \"Periodi zalihe i prodaje\" - dozvoljava kreiranje bilo kojeg tipa "
-#~ "perioda, promjene datuma i stanja perioda.\n"
-#~ "\n"
-#~ "Kreiranje perioda je prvi korak prema korištenju mogućnosti modula. Možete "
-#~ "kreirati vlastite periode korištenjem gumba \"Novi\" na formi \"Periodi "
-#~ "zalihe i prodaje\" ili u view-u, ali preporučavamo korištenje "
-#~ "automatiziranog alata.\n"
-#~ "\n"
-#~ "Napomene:\n"
-#~ "- Ovi periodi (službeno periodi zalihe i prodaje) su odvojeni od "
-#~ "financijskih i ostalih perioda u sustavu.\n"
-#~ "- Periodi nisu pridruženi tvrtkama (kada koristite svojstvo više tvrtki "
-#~ "uopće). Modul pretpostavlja da koristite iste periode kroz različite tvrtke. "
-#~ "Ako želite koristiti različite periode za različite tvrtke možete ih "
-#~ "definirati kako želite (mogu se preklapati). Kasnije će se objasniti kako da "
-#~ "se koriste takvi periodi.\n"
-#~ "- Kada se automatski kreiraju periodi njihovi datumi početka i završetka "
-#~ "počinju sa 00:00:00 i završavaju sa 23:59:00. Npr. kada kreirate dnevne "
-#~ "periode imat će datum početka 31.01.2010 00:00:00 i datum završetka "
-#~ "31.01.2010 23:59:00. Ovo funkcionira samo kod automatskog kreiranja perioda. "
-#~ "Kada se periodi kreiraju ručno, potrebno je unijeti sate početka i završetka "
-#~ "da ne bi došlo do pogrešnih vrijednosti na formama prodaje ili zalihe. \n"
-#~ "- Ako koristite preklapajuće periode za isti proizvod, rezultati za "
-#~ "skladište i tvrtku mogu biti nepredvidljivi.\n"
-#~ "- Ako trenutni period ne pripada niti u jedan period ili imate praznine "
-#~ "između perioda rezulatati mogu biti nepredvidljivi.\n"
-#~ "\n"
-#~ "Predviđanja prodaje\n"
-#~ "===============\n"
-#~ "Postoji nekoliko izbornika za predviđanje prodaje u \"Upravljanje prodajom - "
-#~ "Predviđanja prodaje\".\n"
-#~ "- \"Kreiraj predviđanja prodaje za periode prodaje\" - automatizira "
-#~ "kreiranje stavki predviđanja prema korisničkim postavkama.\n"
-#~ "- \"Predviđanja prodaje\" - nekoliko izbornika za rad s listama i formama "
-#~ "predviđanja.\n"
-#~ "\n"
-#~ "Izbornik \"Kreiraj predviđanja prodaje za periode prodaje\" kreira "
-#~ "predviđanja za proizvode iz odabrane kategorije, odabranog perioda i "
-#~ "odabranog skladišta. To je mogućnost \"Kopiraj posljednje predviđanje\" za "
-#~ "kopiranje predviđanja i ostalih postavki prethodnog perioda u kreirani.\n"
-#~ "\n"
-#~ "Napomene:\n"
-#~ "- Ovaj alat ne kreira stavke, ako odgovarajuće stavke (za isti proizvod, "
-#~ "period, skladište i potvrdili ste ih ili kreirali) već postoje. Ako želite "
-#~ "kreirati novo predviđanje, ako odgovarajuće stavke postoje morate ih unijeti "
-#~ "ručno korištenjem izbornika koji su opisani dolje.\n"
-#~ "- Kada netko drugi potvrdi kreirane stavke možete koristiti ovaj alat za "
-#~ "kreiranje drugih stavki za isti period, proizvod i skladište. \n"
-#~ "- Kada odaberete \"Kopiraj posljednje predviđanje\" kreirana stavka uzima "
-#~ "količinu i neke postavke iz vašeg (vi ste potvrdili ili kreirali ako još "
-#~ "nije potvrđena) predviđanja iz prethodnog perioda prije perioda kreiranog "
-#~ "predviđanja. Ako ste kreirali više predviđanja u prethodnom periodu (to je "
-#~ "moguće) sustav uzima jedno od njih (ne postoji pravilo koje).\n"
-#~ "\n"
-#~ "\n"
-#~ "Izbornik \"Predviđanja prodaje\"\n"
-#~ "Na formi \"Predviđanje prodaje\" uglavnom morate unijeti predviđenu količinu "
-#~ "u polje \"Količina proizvoda\". Daljnje kalkulacije mogu se izvesti za "
-#~ "nacrte predviđanja. Ali potvrđivanje snima vaše podatke da se spriječe "
-#~ "slučajne promjene. Možete kliknuti na gumb \"Potvrdi\" ali nije obvezno.\n"
-#~ "\n"
-#~ "Umjesto predviđene količine  možete unijeti iznos predviđanja prodaje u "
-#~ "polje \"Iznos prodaje\". Sustav će odrediti količinu prema prodajnoj cijeni "
-#~ "proizvoda.\n"
-#~ "\n"
-#~ "Sve vrijednosti na formi su izražene u jedinici mjere odabranoj na formi. "
-#~ "Možete odabrati jedinicu mjere iz predefinirane kategorije ili iz neke druge "
-#~ "kategorije. Kada promijenite jedinicu mjere količine će se preračunati prema "
-#~ "novoj JM: promjenjiva polja (plava) odmah, a nepromjenjiva polja nakon klika "
-#~ "na gumb \"Napravi plan\" .\n"
-#~ "\n"
-#~ "Za određivanje ispravne vrijednosti za predviđanje prodaje možete koristiti "
-#~ "\"Povijest prodaje\" tablicu za ovaj proizvod. Morate unijeti parametre u "
-#~ "gornji i lijevi dio tablice i sustav će izračunati prodane količine prema "
-#~ "tim parametrima. Tako možete npr. odabrati svoj odjel (na vrhu) onda "
-#~ "(lijevo): posljednji period, period koji je prethodio posljednjem i period "
-#~ "prije godinu dana.\n"
-#~ "\n"
-#~ "Napomene:\n"
-#~ "\n"
-#~ "\n"
-#~ "Plan nabave\n"
-#~ "====================\n"
-#~ "Izbornik za planiranje nalazi se u \"Skladište - Planiranje zalihe\".\n"
-#~ "- \"Kreiraj stavke planiranja zalihe\" - automatizira kreiranje stavki "
-#~ "planiranja prema parametrima.\n"
-#~ "- \"Raspored glavne nabave\" - najvažniji izbornik modula koji dozvoljava "
-#~ "kreiranje nabave.\n"
-#~ "\n"
-#~ "Predviđanje prodaje je faza planiranja prodaje. Plan nabave (Planiranje) je "
-#~ "faza automatiziranja kupovine ili proizvodnje. Možete kreirati plan nabave "
-#~ "brzo korištenjem alata iz izbornika \"Kreiraj stavke planiranja zalihe\", "
-#~ "onda možete pregledati kreirani plan i započeti nabavu korištenjem izbornika "
-#~ "\"Raspored glavne nabave\".\n"
-#~ "\n"
-#~ "Izbornik \"Kreiraj stavke planiranja zalihe\" dozvoljava brzo kreiranje "
-#~ "stavki planiranja iz odabrane kategorije, za odabrani period i odabrano "
-#~ "skladište. Kada odaberete \"Svi proizvodi sa predviđanjem\" sustav kreria "
-#~ "stavke za sve proizvode sa predviđanjem za odabrani period i skladište. "
-#~ "Odabrana kategorija se tada ignorira.\n"
-#~ "\n"
-#~ "Pod izbornikom \"Raspored glavne nabave\" možete mijenjati vrijednosti polja "
-#~ "\"Očekivani izlaz\" i \"Očekivani ulaz\" provjeravati polje \"Simulacija "
-#~ "zalihe\" i odlučiti hoće li ova vrijednost biti točna za kraj perioda. \n"
-#~ "\"Očekivani izlaz\" može se temeljiti na polju \"Predviđanje skladišta\" "
-#~ "koje je suma svih predviđanja za period i skladište. Vaše planiranje može "
-#~ "biti temeljeno i na nekoj drugoj informaciji koju imate. Nije nužno imati "
-#~ "predviđanje. \n"
-#~ "\"Očekivani ulaz\" količina se koristi za izračun polja \"Ostatak ulaza\" "
-#~ "što predstavlja količinu koju je potrebno nabaviti za zalihu kao što "
-#~ "pokazuje vrijednost polja \"Simulacija zalihe\" na kraju perioda. Možete "
-#~ "usporediti vrijednost polja \"Simulacija zalihe\" sa pravilima minimalne "
-#~ "zalihe vidljivima na formi. Ali možete planirati količinu drukčiju od "
-#~ "količine u pravilima minimalne količine. Kalkulacija se prema osnovnim "
-#~ "postavkama radi za cijelo skladište. Ako želite vidjeti vrijednosti lokacije "
-#~ "zalihe skladišta možete označiti kućicu \"Samo lokacija zalihe\".\n"
-#~ "\n"
-#~ "Ako ste nakon nekoliko pokušaja odredili ispravne količine za \"Očekivani "
-#~ "izlaz\" i \"Očekivani ulaz\" i zadovoljni ste sa zalihom kraja perioda "
-#~ "izračunatom u polju \"Simulacija zalihe\" možete kliknuti na gumb \"Nabavi "
-#~ "ostatak ulaza\" za nabavu količina polja \"Ostatak ulaza\" u skladište. "
-#~ "Sustav kreira odgovarajuće dokumente nabave. Možete odabrati hoće li se "
-#~ "nabava vršiti na zalihu ili na ulaznu lokaciju odabranog skladišta. \n"
-#~ "\n"
-#~ "Ako ne želite proizvesti ili kupiti proizvodm samo odaberite potrebnu "
-#~ "količinu iz drugog skladišta i kliknite na gumb \"Prebaci iz drugog "
-#~ "skladišta\" (umjesto gumba \"Nabavi ostatak ulaza\"). Sustav kreira listu "
-#~ "proizvoda sa prijenosom iz odabranog izvorišnog skladišta na skladište na "
-#~ "kojem se vrši izračun (kao odredište).  Možete odlučiti hoće li se lista "
-#~ "proizvoda raditi sa zalihe ili izlazne lokacije izvorišnog skladišta. "
-#~ "Odredišna lokacija (zaliha ili ulaz) odredišnog skladišta koristit će se za "
-#~ "akciju \"Nabavi ostatak ulaza\".\n"
-#~ "\n"
-#~ "Klikom na gumb \"Napravi plan\" prikazuju se valjane vrijednosti polja "
-#~ "\"Potvrđeni ulaz\", \"Potvrđeni izlaz\", \"Potvrđen ulaz prije\", \"Potvrđen "
-#~ "izlaz prije\" i \"Simulacija zalihe\".\n"
-#~ "\n"
-#~ "Sve vrijednosti na formi su izražene u jedinici mjere odabranoj na formi. "
-#~ "Možete odabrati jedinicu mjere iz predefinirane kategorije ili iz neke druge "
-#~ "kategorije. Kada promijenite jedinicu mjere količine će se preračunati prema "
-#~ "novoj JM: promjenjiva polja (plava) odmah, a nepromjenjiva polja nakon klika "
-#~ "na gumb \"Napravi plan\" .\n"
-#~ "\n"
-#~ "\n"
-#~ "Simulacija zalihe računa se na sljedeći način:\n"
-#~ "Općenito simulacija zalihe prikazuje zalihu za kraj perioda kalkulacije "
-#~ "prema planiranim ili potvrđenim prijenosima zalihe. Kalkulacija uvijek "
-#~ "započinje sa količinom realne zalihe na početku trenutnog perioda. Zatim "
-#~ "kalkulacija dodaje ili oduzima količine perioda kalkulacije ili perioda "
-#~ "prije kalkulacije.\n"
-#~ "Kada se radi o istom periodu (trenutni period je isti kao period "
-#~ "kalkulacije) simulacija zalihe izračunava se na sljedeći način:\n"
-#~ "Simulacija zalihe = \n"
-#~ "\tPočetna zaliha trenutnog perioda\n"
-#~ "\t- Očekivani izlaz \n"
-#~ "\t+Očekivani ulaz \n"
-#~ "\n"
-#~ "Kada računate sljedeći period:\n"
-#~ "Simulacija zalihe = \n"
-#~ "\tPočetna zaliha trenutnog perioda\n"
-#~ "\t- Očekivani izlaz trenutnog perioda \n"
-#~ "\t+Potvrđen ulaz trenutnog perioda (uključujući već postojeće količine)\t- "
-#~ "Očekivani izlaz perioda kalkulacije \n"
-#~ "\t+Očekivani ulaz perioda kalkulacije \n"
-#~ "\n"
-#~ "Period kalkulacije se uzima na sličan način kao u slučaju gore. Kalkulacije "
-#~ "trenutnog perioda se rade malo drukčije.Prvo primijetite da sustav za "
-#~ "trenutni period uzima samo potvrđene ulaze. To znači da morate napraviti "
-#~ "planiranje i nabavu za trenutni period prije ove kalkulacije (za sljedeći "
-#~ "period). \n"
-#~ "\n"
-#~ "Kad računate sljedeći period:\n"
-#~ "Simulacija zalihe = \n"
-#~ "\tPočetna zaliha trenutnog perioda\n"
-#~ "\t- suma očekivanih izlaza perioda prije perioda kalkulacije \n"
-#~ "\t+ suma očekivanih ulaza perioda prije perioda kalkulacije (uključujući već "
-#~ "postojeće količine) \n"
-#~ "\t- Očekivani izlaz perioda kalkulacije \n"
-#~ "\t+Očekivani ulaz perioda kalkulacije \n"
-#~ "\n"
-#~ "Periodi prije perioda kalkulacije označavaju periode od trenutnog do perioda "
-#~ "kalkulacije.\n"
-#~ "\n"
-#~ "Napomene:\n"
-#~ "- Sjetite se da obavite planiranje za sve periode prije kalkulacija jer "
-#~ "nedostatak ovih količina i kreiranih nabava može prouzročiti krive "
-#~ "prijedloge za nabavu za periode koji slijede.\n"
-#~ "- Ako ste obavili planiranje za nekoliko perioda unaprijed i ustanovite da "
-#~ "je Potvrđeni izlaz veći od Očekivanog izlaza u nekim periodima prije možete "
-#~ "ponoviti planiranje i napraviti drugu nabavu. Trebali bi to napraviti u "
-#~ "istoj stavci planiranja. Ako kreirate drugu stavku planiranja prijedlozi "
-#~ "mogu biti neispravni.\n"
-#~ "- Kada želite raditi sa različitim periodima za jedan dio proizvoda odredite "
-#~ "dvije vrste perioda (npr. tjedni i mjesečni) i koristite ih za različite "
-#~ "proizvode. Primjer: Ako uvijek koristite tjedne periode za proizvod A, i "
-#~ "mjesečne periode za proizvod B sve kalkulacije će biti ispravne. Također "
-#~ "možete koristiti različite vrste perioda za iste proizvode iz različitih "
-#~ "skladišta ili tvrtki. Ali ne možete koristiti periode koji se preklapaju za "
-#~ "isti proizvod, skladište i tvrtku jer rezultati mogu biti nepredvidljivi. "
-#~ "Isto se odnosi na stavke predviđanja.\n"
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Ostatak ulaza: "
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr "Kreira stavke predviđanja za odabrano skladište i period."
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Rekvizicija ("
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Količina za koju se očekuje izlaz u odabranom periodu. Kao razlika između "
-#~ "očekivanog i potvrđenog izlaza. Za trenutni period količina koja je već "
-#~ "izašla sa skladišta se također računa."
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Već ušlo: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Početna zaliha: "
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Minimalna zaliha: "
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Potvrđen ulaz: "
-
-#~ msgid "Sales history"
-#~ msgstr "Povijest prodaje"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Predviđena količina."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Simulacija zalihe: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Potvrđen izlaz: "
-
-#~ msgid "Product Quantity"
-#~ msgstr "Količina proizvoda"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " Prema stanju:"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "Naziv objekta mora počinjati sa x_ i ne smije sadržavati posebne znakove !"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Za period: "
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Očekivan ulaz: "
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "Označite za opskrbu sa lokacije zalihe skladišta. Ako nije označeno opskrba "
-#~ "će se voditi sa izlazne lokacije skladišta. Koristi se u 'Opskrba sa drugog "
-#~ "skladišta' sa skladištem."
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Minimalna količina postavljena u pravilima minimalne zalihe za ovo skladište"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Očekivani izlaz: "
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "RGN("
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Izbor kreirao iz rasporeda glavne nabave korisnik: "
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Period planiranja zalihe i prodaje"
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Period zalihe i prodaje"
diff --git a/addons/stock_planning/i18n/hu.po b/addons/stock_planning/i18n/hu.po
deleted file mode 100644
index c017525670f..00000000000
--- a/addons/stock_planning/i18n/hu.po
+++ /dev/null
@@ -1,1253 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#    * stock_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:09+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"Nincs előrejelzés a kiválasztott időszakban vagy nincsenek termékek a "
-"kiválasztott kategóriában !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Maximum szabály"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Csoportosítás..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Előrejelzési sorok létrehozása"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Napi időszakok létrehozása"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Vállalat"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"A kiválasztott termék kiválasztott raktárának minden értékesítési "
-"előrejelzése a kiválasztott időszakban."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Minimum készlet szabály mutatók"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Csak a készlethelyszínek"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Havi időszak létrehozása"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.period.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Összes termék előrejelzésekkel"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Időszakok :"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Nincs termék a kiválasztott kategóriában !"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Készlet és értékesítés előrejelzés"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.sale.forecast"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Készlet szimuláció"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planning.createlines"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Értékesítési előrejelzés keresése"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"A kiválasztott termék minden értékesítési előrejelzése a kiválasztott "
-"időszakban (az egész vállalatra és minden raktárra)."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Készlettervezés"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Minimum szabály"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Létrehozás"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Múlt/Jövő"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Állapot"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.sale.forecast.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Raktár"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr ""
-"Jelölje be ezt a négyzetet, ha az egész vállalatra látni szeretné az "
-"értékesítést."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Osztályonként/Részlegenként"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Hiba !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Ez a felhasználó"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Előrejelzések"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Ellátás egy másik raktárból"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Érvénytelen művelet !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Heti időszakok létrehozása"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Készlet és értékesítés időszak"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Vállalati előrejelzés"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Felhasználónként :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Raktár, amelyre a tervezés vonatkozik."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Raktár előrejelzés"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "Termék ME"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Kezdő dátum"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Jóváhagyott előrejelzések"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Előrejelzés"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Tervezet"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Lezárt"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Raktár "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Belső ellátás"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Értékesítési előrejelzések létrehozása"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Időszak neve"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Időszak2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Időszak3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Időszak1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Készlettervezési sorok létrehozása"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Általános információ"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Értékesítési előrejelzés"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Értékesítési előzmény"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Forrásraktár"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Tervezési időszak záró dátuma"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Termék ME kategória"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Időszak"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Termék ME kategória"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "Aktív ME"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Készlettervezés keresése"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Utolsó előrejelzés másolása"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Megmutatja, hogy melyik termékre vonatkozik ez az előrejelzés."
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Kész"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Időszakok"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Jóváhagyott"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Felelős"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "Alapértelmezett mértékegység"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Jelenleg"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planning"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Vállalatonként"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Időszak, amelyre a tervezés vonatkozik."
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Termék, amelyre a tervezés vonatkozik."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Raktáranként :"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Beszerzési előzmény"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Tervezési időszak kezdő dátuma"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Készlet"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Záró dátum"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Név"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Megmutatja, hogy melyik időszakra vonatkozik az előrejelzés."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "ME"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Termék"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Értékesítési előrejelzések"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Termék kategória"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "Meg kell adni a forrásraktárt !"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Jóváhagyás"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Kezdeti készlet"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Termékösszeg"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Időszak5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Ez a raktár"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr ""
-"Megmutatja, hogy ki hozta létre ezt az előrejelzést, vagy ki hagyta jóvá."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Kezdeti készlet: "
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Készlet- és értékesítési időszakok létrehozása"
-
-#~ msgid "This Department"
-#~ msgstr "Ez a(z) osztály/részleg"
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Létrehozás dátuma: "
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Minimum készlet: "
-
-#~ msgid "Sales history"
-#~ msgstr "Értékesítési előzmény"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Előrejelzett mennyiség"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Raktár előrejelzés: "
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Készlet és értékesítés tervezésének időszakai"
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Készlet és értékesítési időszakok"
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "Nem lehet törölni a jóváhagyott értékesítési előrejelzéseket !"
-
-#~ msgid "Product Quantity"
-#~ msgstr "Termékmennyiség"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " állapot szerint:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Készletszimuláció: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Időszakra: "
diff --git a/addons/stock_planning/i18n/it.po b/addons/stock_planning/i18n/it.po
deleted file mode 100644
index e82bf9cc481..00000000000
--- a/addons/stock_planning/i18n/it.po
+++ /dev/null
@@ -1,1432 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:46+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"Non ci sono previsioni per il periodo selezionao o non ci sono prodotti "
-"nella categoria selezionata !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Regola dei Massimi"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Raggruppa per..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Valori previsti che verranno convertiti in Quantità di Prodotto in base ai "
-"prezzi."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "Gli arrivi rimanenti devono essere maggiori di 0!"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Pianificato in periodi prima dei calcoli. Tra la data di inizio del periodo "
-"corrente ed un giorno prima dell'inizio del periodo calcolato."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Attese in Uscita"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Merci in arrivo rimanenti"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Crea Linee di Previsione"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-"Quantità di tutti i movimenti in uscita confermati nel Periodo calcolato."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Crea Periodi Giornalieri"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Azienda"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Tutte le previsioni di vendita dei Prodotti selezionai dai Magazzini "
-"indicati durante il Periodo selezionato."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Indicatori delle Scorte Minime"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Periodo sul quale verrà eseguita la previsione."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Solo Posizione delle Scorte"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr "Quantità spedita dal magazzino nel periodo corrente."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Arrivo Confermato"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Situazione del Periodo Corrente"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Creare periodi mensili"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "scorte.periodo.crealinee"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Uscite Pianificate in Anticipo"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Tutti i Prodotti con Previsioni"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Periodi :"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr "Quantità già prelevata nel periodo corrente da questo magazzino."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Nessun prodotto nella categoria selezionata !"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Previsione Scorte e Vendite"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "scorte.vendita.previsione"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Pianificate in entrata"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Simulazione Scorte"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "scorte.pianificazione.crealinee"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Arrivi confermati nei periodi prima dell'elaborazione (Inclusi i già "
-"stoccati). Tra la data di inizio del periodo corrente ed un giorno prima "
-"l'inizio del periodo elaborato."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Cerca le Previsioni delle Vendite"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "Questo Utente Periodo5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-"Storico degli approvvigionamenti delle provviste interne della linea di "
-"pianificazione corrente."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Tutte le previsioni di vendita di tutte le aziende (per tutti i Magazzini) "
-"del Prodotto selezionato nel Periodo scelto."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "Questo Utente Periodo1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "Questo Utente Periodo3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Pianificazione delle Scorte"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Regola dei Minimi"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Crea"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Programma Principale degli Approvvigionamenti"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Passato/Futuro"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Stato"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "Categoria di prodotti che verranno inclusi nelle previsioni."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "Periodo di Scorta"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "scorte.vendita.previsione.crealinee"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazzino"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Marca questo box per vedere le vendite dell'intera azienda."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Per Dipartimento"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Precedentemente in Arrivo"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Errore !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Questo Utente"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Previsioni"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Fornitura da un altro Magazzino"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Calcola Pianificazione"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Azione non valida !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Quantità di Scorte il giorno precedente al periodo corrente."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Crea Periodi Settimanali"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Elaborazione Simulazione Periodo"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Cancella"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Questo Utente Periodo4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Periodo delle Scorte e delle Vendite"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Previsioni Aziendali"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Per Utente :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Magazzino usato per la pianificazione."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Creato/Verificato da"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Previsioni Magazzino"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"Devi selezionare un Magazzino di base diverso dal Magazzino di destinazione "
-"calcolato !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "Questa Azienda Periodo5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "UoM Prodotto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "Questa Azienda Periodo2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "Questa Azienda Periodo3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Data di Inizio"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "Questo Utente Periodo2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Previsioni Convalidate"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"La pianificazione verrà creata dalle Categorie di Prodotti selezionate da "
-"questo campo. Questo campo verrà ignorato quando verrà marcato il box "
-"\"Tutte le Previsioni dei Prodotti\"."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Pianificate in Uscita"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Previsione"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Bozza"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Chiuso"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Magazzino "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Piani e Situazioni del Periodo Calcolato"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Inserire la quantità programmata in uscita del Prodotto dal Magazzino "
-"selezionato relativo al Periodo in esame. Per pianificare questo valore, "
-"controllare le Previsioni di Vendita o le Conferme in Uscita. Questo valore "
-"dovrebbe essere maggiore o uguale alle Conferme di Uscita stesse."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Provvista Interna"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Crea le Previsioni di Vendita"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Periodo4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Nome Periodo"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Periodo2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Periodo3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Periodo1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Confermate in Uscita"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Crea linee di Pianificazione Scorte"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Informazioni generali"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Previsioni Vendite"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Questo Magazzino Periodo1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Storico Vendite"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Magazzino Sorgente"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Luogo di Rifornimento Scorte"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Data finale per il periodo di pianificazione."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Marca questo box per creare pianificazioni di tutti i prodotti che sono "
-"stati inclusi in qualsiasi previsione dal Magazzino ed il Periodo "
-"selezionato. Il campo Categoria Prodotti verrà ignorato."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Già Arrivate"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Categoria Prodotto UoM"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Periodo"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Categoria Prodotto UoS"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "UoM Attivo"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Ricerca Pianificazione delle Scorte"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Copia l'ultima Previsione"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Mostra quali sono i prodotti inclusi in questa previsione."
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Eseguito"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Periodi"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Chiudi"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Confermato"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Aperto"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Copia le quantità dall'ultima Previsione di Magazzino e Vendite"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "Questo Dipartimento Periodo1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "Questo Dipartimento Periodo3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "Questo Dipartimento Periodo2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "Questo Dipartimento Periodo5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "Questo Dipartimento Periodo4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "Questo Magazzino Periodo2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "Questo Magazzino Periodo3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Responsabile"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "U.M. di default"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "Questo Magazzino Periodo4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "Questo Magazzino Periodo5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Attuale"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "scorte.pianificazione"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Mostra a quale Magazzino fa riferimento questa previsione. Se durante la "
-"pianificazione delle scorte hai bisogno delle previsioni di vendita per "
-"tutti i magazzini, scegli un magazzino ora."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Per Azienda"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Inserire la quantità che dovrebbe arrivare secondo il piano. Cambiare questo "
-"valore ed osservare la simulazione delle Scorte. Questo valore dovrebbe "
-"essere maggiore o uguale a quello delle merci Confermate in magazzino."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "Questa Azienda Periodo4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Periodo al quale si riferisce la pianificazione."
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Già Uscite"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Prodotti per i quali è stata creata la pianificazione."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Per Magazzino :"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Storico Approvvigionamenti"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Data Iniziale per la pianificazione del periodo."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Scorte"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-"Quantità di tutti i movimenti confermati in arrivo del Periodo elaborato."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Data Finale"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Nessuna Acquisizione"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Mostra a quale periodo si riferisce la previsione."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "UoM"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Prodotto"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Previsioni delle Vendite"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Categoria prodotto"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "Devi specificare un Magazzino Sorgente !"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Ottieni dal luogo delle Scorte"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Approva"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-"Periodo per questa pianificazione. L'istanza verrà creata per l'inizio del "
-"periodo."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Scorte Iniziali"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Ammontare del Prodotto"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Marca per usare solo le previsioni convalidate. Se non è marcato il sistema "
-"prenderà sia le convalidate che le bozze delle previsioni."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Periodo5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Questo Magazzino"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr ""
-"Mostra chi ha creato questa Previsione, o chi ha provveduto alla convalida."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Quantità rimanenti per la pianificazione degli arrivi. Questa è calcolata "
-"secondo la differenza tra le merci Pianificate in Entrata e le Confermate in "
-"Entrata. Per le merci già arrivate è già calcolato per il periodo corrente. "
-"Questo valore è usato per creare gli approvvigionamenti delle quantità "
-"mancanti."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Storico Elaborazione Vendite"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Questa Azienda Periodo1"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Scorte Iniziali: "
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Magazzino usato come fonte di rifornimento creato da 'Rifornisci da altro "
-#~ "Magazzino'."
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Crea Periodi per Scorte e Vendite"
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Già Confermato: "
-
-#~ msgid "This Department"
-#~ msgstr "Questo Dipartimento"
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Data di Creazione: "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Pianificazione Manuale per "
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Quantità Massima stabilita nella regola dei Minimi delle Scorte per questo "
-#~ "Magazzino"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Confermate in Uscita: "
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Unità di Misura usata per mostrare le quantità nei calcoli delle Scorte. "
-#~ "Puoi usare unità dalla categoria di base o da una categoria secondaria "
-#~ "(categoria UoS)."
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr ""
-#~ "Crea linee di pianificazione per il periodo ed il magazzino selezionato."
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Nota: Non duplicare le linee esistenti create dall'utente."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Già Uscite: "
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Marca per fare gli approvvigionamenti di scorte nei magazzini selezionati. "
-#~ "Se non sono selezionati gli approvvigionamenti saranno fatti nella zona di "
-#~ "arrivo del magazzino."
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Crea periodi per la Pianificazione delle Vendite e delle Riserve"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Previste in Uscita: "
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Già Arrivate: "
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Quantià prevista in uscita per il periodo selezionato. Come differenza tra "
-#~ "le Pianificate in Arrivo e le Confermate in Uscita. Sono anche calcolate le "
-#~ "merci già uscite nel periodo corrente"
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr ""
-#~ "Crea le linee di previsione per i periodi ed i Magazzini selezionati."
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Acquisizioni ("
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Pianificate in Uscita: "
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "Non è possibile cancellare le Previsioni sulle Vendite Convalidati !"
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Scorte Minime: "
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Confermate e Arrivate: "
-
-#~ msgid "Sales history"
-#~ msgstr "Storico Vendite"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Quantità previste."
-
-#~ msgid "Product Quantity"
-#~ msgstr "Quantità prodotto"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " secondo lo stato:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Previsione di Magazzino: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Simulazione Scorte: "
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Pianificate in Entrata: "
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Quantità minima impostata nella regola dei Minimi delle Scorte per questo "
-#~ "Magazzino"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Per periodo: "
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "MPS("
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Scegli tra le MPS create dall'utente: "
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Periodi di Pianificazione Scorte e Vendite"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Pianificate in Anticipo: "
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Periodi di Scorte e Vendite"
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "Approvvigionamenti creati nel MPS dall'utente: "
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Arrivi Mancanti: "
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Pick List "
diff --git a/addons/stock_planning/i18n/ja.po b/addons/stock_planning/i18n/ja.po
deleted file mode 100644
index 8a870c907e4..00000000000
--- a/addons/stock_planning/i18n/ja.po
+++ /dev/null
@@ -1,1220 +0,0 @@
-# Japanese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-07-30 16:28+0000\n"
-"Last-Translator: Akira Hiyama <Unknown>\n"
-"Language-Team: Japanese <ja@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr "選択した期間の予測がないか、選択された分類の中に製品がありません。"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr "選択された倉庫のみの在庫場所を計算するためにチェックします。選択しない場合の計算は倉庫の入力、在庫、出力場所によってなされます。"
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "最大値のルール"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "グループ化…"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr "予測値は価格により製品数量に変換されます。"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "入荷の残りは0より大きい必要があります。"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr "計算される前に期間内で計画された出荷です。現在の期間の開始日と計算された期間の開始１日前の間です。"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr "予測値が関係する倉庫です。在庫計画の期間に全ての倉庫の受注予測を必要とするなら、今、倉庫を選択して下さい。"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "期待された出荷"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "入荷残り"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "予測行の作成"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr "計算された期間の全ての確認された出荷移動の数量"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "1日の期間の作成"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "会社"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr "選択した期間中に選択した製品の選択した倉庫のための全ての受注予測です。"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "最小在庫ルールの指標"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "予測が関係する期間"
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "在庫場所のみ"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr "現在の期間でこの倉庫の既に割り当てられた数量"
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "入庫確認"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "現在期間の状況"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-"このウィザードは在庫計画の期間の作成を手助けします。こららの期間は会計上の期間とは独立しています。日、週、月ベースの他の期間を必要とする場合は、手動で追加"
-"することができます。"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "月次期間の作成"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "先行計画出荷"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "予想を持つ全製品"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr "この倉庫のため、最大数量が最小在庫ルールで設定されます。"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "期間："
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr "選択された倉庫の在庫場所で調達を行うためにチェックします。選択しない場合は、倉庫の入力場所の中で調達が行われます。"
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr "現在の期間に既にこの倉庫に集められた数量"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "選択された分類の中に製品がありません。"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "在庫と受注予測"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "計画入庫"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "在庫シミュレーション"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr "計算する前に期間内で確認された入庫（既に入庫分を含む）です。現在の期間の開始日と計算された期間の開始１日前の間です。"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "受注予測の検索"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "このユーザの期間5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr "この計画行の調達、または内部供給の履歴"
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr "選択した期間中に選択した製品の会社全体（全ての倉庫）ための全ての受注予測です。"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "このユーザの期間1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "このユーザの期間3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "在庫計画"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "最小値のルール"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "調達入庫の残り"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "作成"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "マスター調達スケジュール"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "過去 / 将来"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "状態"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "作成された予測が関係するであろう製品の製品分類です。"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "在庫期間"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "倉庫"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"選択された期間終了時の在庫シミュレーション\n"
-"　現在の期間のため：\n"
-"初期在庫 - 既出庫 + 既入庫 - 期待出庫 + 入庫残\n"
-"　その先の期間のため：\n"
-"初期在庫 - 先行計画出庫 + 先行入庫 - 計画出庫 + 計画入庫"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "会社の全体のための受注を見るためにこのボックスをチェックして下さい。"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "部署毎："
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "先行入庫"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-" MPSによりユーザのために作成された調達：%s　作成日：%s　\n"
-" 期間：%s　\n"
-" 状態に応じて：　\n"
-" 倉庫予測：%s　\n"
-" 初期在庫：%s　\n"
-" 計画出庫：%s　計画入庫：%s　\n"
-" 既出庫：%s　既入庫：%s　\n"
-" 確認済出庫：%s　確認済入庫：%s　\n"
-" 先行計画出庫：%s　先行確認済入庫：%s　\n"
-" 期待出庫：%s　入庫残：%s　\n"
-" 在庫シミュレーション：%s　最小在庫：%s"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "エラー"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "このユーザ"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "予測"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "他の倉庫からの供給"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "計画の計算"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "無効なアクションです。"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "現在の期間前の1日の在庫数量"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr "調達履歴"
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr "在庫計算の数量を表示するため使用する単位。デフォルト分類から、または第2分類（販売単位分類）から単位を使うことができます。"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "週毎の期間を作成"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-"在庫期間は在庫計画のために使用されます。在庫期間はアカウント期間から独立しています。ここからウィザードを使用して期間の作成やレビューができます。"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "計算済期間シミュレーション"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "キャンセル"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "このユーザの期間4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "在庫と受注の期間"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "会社の予測"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr "最小数量はこの倉庫のために最小在庫ルールで設定します。"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "ユーザ毎："
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "計画が関連する倉庫"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "作成者 / 検証者"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "倉庫予測"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr "計算された（到着先）倉庫と異なる、元の倉庫を指定する必要があります。"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr "検証済受注予測は削除できません。"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "この会社の期間5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "製品単位"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr "この会社の期間1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "この会社の期間2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "この会社の期間3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "開始日"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "このユーザの期間2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "検証済予測"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr "計画はこの項目により選択した製品分類の製品のために作成されます。全ての製品予測をチェックした場合、この項目は無視されます。"
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "計画出庫"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr "予測数量"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "予測"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "ドラフト"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "閉じた"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "倉庫 "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr "在庫計算の数量を示すために使用される単位。デフォルト分類から、または第2分類（販売単位分類）から単位を使用することができます。"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "計算された期間のための計画と状況"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"選択した製品の選択した期間中の選択した倉庫からの計画出荷数量を入力します。出荷確認や受注予測ではこの値を見て計画します。この値は確認出荷以上である必要があ"
-"ります。"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr "現在期間"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "内部供給"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr "%s 集荷リスト %s (%s, %s) %s %s \n"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "受注予測の作成"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "期間4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "期間名"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "期間2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "期間3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "期間1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-"このウィザードは所定の選択された期間と倉庫のためにMPS計画行の作成を手助けします。そしてひとつひとつそれを作る必要はありません。それらがこの選択のために"
-"既に存在するなら、ウィザードは重複する行を作成しません。"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "確認済出庫"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "在庫計画行の作成"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "一般情報"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "受注予測"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "この倉庫の期間1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "受注履歴"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "元の倉庫"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr "製品数量の予測"
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "在庫供給場所"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "計画期間の終了日"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr "選択した倉庫と期間の全ての製品が任意の予測を持つための計画を作成するにはこのボックスをチェックします。製品分類項目は無視されます。"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr "MPS（%s）%s"
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "既入庫"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "製品単位分類"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-"この受注予測数量は在庫計画者が調達を手動で行う、あるいは自動調達を補完するための表示です。幾つかの期間が通常の最小在庫ルールの例外である場合、この予測とと"
-"もに手動の調達を使うことができます。"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-"マスタ調達スケジュールは倉庫の補充のための主な操縦者になることができ、または自動MRPスケジューリング（最小在庫ルール他）を補完します。\n"
-"各MPS行は現在と未来の在庫レベルを基本として、計画された在庫移動と同様、与えられた倉庫の中の与えられた在庫期間のために、与えられた製品の入庫と出庫の前も"
-"って計算された概観を与えます。予測数量は手動で変更することができます。そしてシミュレート結果の在庫数量に満足したなら、希望の数量に到達しないものの調達のき"
-"っかけとすることができます。"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-"MPSからユーザにより作成された集荷：%s　作成日：%s　\n"
-" 期間：%s　\n"
-" 状態に応じて：　\n"
-" 倉庫予測：%s　\n"
-" 初期在庫：%s　\n"
-" 計画出庫：%s　計画入庫：%s　\n"
-" 既出庫：%s　既入庫：%s　\n"
-" 確認済出庫：%s　確認済入庫：%s　\n"
-" 先行計画出庫：%s　先行確認済入庫：%s　\n"
-" 期待出庫：%s　入庫残：%s　\n"
-" 在庫シミュレーション：%s　最小在庫：%s "
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "期間"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "製品販売単位分類"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "アクティブな単位"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "在庫計画の検索"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "最終予測のコピー"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "この予測に関連する製品の表示"
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "完了"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "期間"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr "在庫期間の作成"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "閉じる"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "検証済"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "開く"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "最終在庫と受注予測から数量をコピー"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "この部門の期間1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "この部門の期間3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "この部門の期間2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "この部門の期間5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "この部門の期間4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "この倉庫の期間2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "この倉庫の期間3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-"供給倉庫の在庫場所から供給する場合はチェックします。チェックしない場合は供給倉庫の出力場所から供給されます。供給倉庫の他の倉庫場所から供給で使用されます。"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "担当"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "デフォルト単位"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "この倉庫の期間4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "この倉庫の期間5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "現在"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr "倉庫は、他の倉庫からの供給によって作成された、供給集荷移動の元として使用されます。"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr "この予測がどの倉庫に関連するかを表示します。在庫計画の期間に全ての倉庫の受注予測が必要な場合、今、倉庫を選択して下さい。"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr "%s 調達 (%s, %s) %s %s \n"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "会社毎"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr "入庫すべき（計画による）数量を入力します。この値を変更し、在庫シミュレーションを観察します。この値は確認済入庫以上である必要があります。"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "この会社の期間4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "計画が関連する期間"
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "既出庫"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "この計画が作成される対象の製品"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "倉庫毎："
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "調達履歴"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "開始期間の開始日"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr "在庫期間"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "在庫"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr "計算された期間の全ての確認済入庫移動の数量"
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "終了日"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "命令書なし"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "名称"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "この予測が関連する期間を表示"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "単位"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr "閉鎖済期間"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "製品"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "受注予測"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "製品分類"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "元の倉庫を指定する必要があります。"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "在庫場所"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "承認"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr "この計画の期間。命令書は期間の開始時に作成されます。"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr "%s のためのMPS計画"
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "初期在庫"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "製品アカウント"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr "予測のみを検証するためにチェックします。チェックしない場合は、システムが検証とドラフト予測を行います。"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "期間5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "この倉庫"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "誰がこの予測を作成したのか、検証したのかを示します"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr "営業チーム"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"計画された入庫数量のために残された数量。これは計画入庫と確認済入庫の間の計算された差です。現在の期間のために、既入庫も計算されます。この値は不足数量のため"
-"に調達を生成するのに使用されます。"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr "確認済出庫とは別に選択された期間に出庫すると期待される数量。計画出庫と確認済出庫の差です。現在期間の既出庫もまた計算されます。"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "受注履歴の計算"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-"このウィザードは一度に複数の予測行を作成するのを手助けします。それが作成された後、あなたは予測数量を埋める必要があります。同じ選択に対して同じものが存在す"
-"る場合、ウィザードは行を重複させません。"
diff --git a/addons/stock_planning/i18n/lv.po b/addons/stock_planning/i18n/lv.po
deleted file mode 100644
index f0f74501807..00000000000
--- a/addons/stock_planning/i18n/lv.po
+++ /dev/null
@@ -1,1175 +0,0 @@
-# Latvian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-03-21 14:42+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Latvian <lv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
diff --git a/addons/stock_planning/i18n/mn.po b/addons/stock_planning/i18n/mn.po
deleted file mode 100644
index c45722a8b20..00000000000
--- a/addons/stock_planning/i18n/mn.po
+++ /dev/null
@@ -1,1976 +0,0 @@
-# Mongolian 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:48+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr "Сонгосон ангилалд хамрагдах бараа алга !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Төлөвлөлтийг сонгосон агуулахын зөвхөн хадгалалтын байрлалд тооцоолно. Хэрэв "
-"сонгохгүй бол агуулахын оролтын болон гаралтын, хадгалалтын байрлалуудад "
-"тооцоолно."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Зохистой дээд хэмжээ"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Бүлэглэвэл"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Борлуулахаар төлөвлөж буй барааны тоо хэмжээг зарах үнээр тооцсон нийт дүн."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "Хүлээж буй орлого нь тэгээс их байх ёстой !"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Тухайн мөчлөг эхлэхээс өмнө тухайн бараанд төлөвлөж байсан зарлагын тоо "
-"хэмжээ."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Борлуулалт төлөвлөж буй агуулахын сонгоно. Хэрэв бүх агуулахын хэмжээнд "
-"нэгдсэн төлөвлөгөө зохиох бол аль нэг үндсэн агуулахыг заавал сонгоно."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Хүлээж буй зарлага"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Хүлээж буй орлого"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Борлуулалтын төлөвлөгөө үүсгэх"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-"Тухайн агуулахаас зарлагад гаргахаар батлагдсан тоо хэмжээ. (энэ тоо хэмжээ "
-"нь бодит үлдэгдлээс хараахан хасагдаагүй)"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Өдрөөр мөчлөг үүсгэх"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Компани"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Тухайн агуулахын тухайн мөчлөгт бүртгэсэн борлуулалтын төлөвлөгөө буюу "
-"таамаглалын дүн."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Зохистой нөөцийн бодлого"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Төлөвлөгөө нь аль нэг мөчлөгт хамааралтай байна."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Зөвхөн хадгалалтын байрлал"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr "Тухайн мөчлөгт тухайн агуулахаас зарлага гаргасан тоо хэмжээ."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Батлагдсан орлого"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Тухайн мөчлөгийн гүйцэтгэл"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-"Энэ харилцах цонх нь нөөцийн төлөвлөлтийн мөчлөг тодорхойлоход тусалдаг. "
-"Эдгээр мөчлөг нь санхүүгийн мөчлөгтэй хамааралгүй. Хэрэв өдөр, долооног, сар "
-"гэснээс өөр мөчлөг хэрэглэмээр байвал гараараа нэмж болно."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Сарын мөчлөг үүсгэх"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.period.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Өмнөх төлөвлөгдсөн зарлага"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Борлуулалт төлөвлөгдсөн бараа"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-"Энэ агуулахын хувьд хамгийн бага нөөцийн дүрэм дахь хамгийн их тоо хэмжээ"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Мөчлөг:"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-"Сонгосон агуулахын татан авалт үүсгэх барааны байрлалыг сонго. Хэрэв "
-"сонгогдоогүй байвал татан авалт нь агуулахын орох байрлалд хийгдэнэ."
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr "Тухайн мөчлөгт тухайн агуулахад орлогод авсан тоо хэмжээ."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Сонгосон ангилалд бараа алга !"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Борлуулалтын төлөвлөгөө"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.sale.forecast"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Төлөвлөсөн орлого"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Үлдэх нөөцийн таамаглал"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planning.createlines"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Тухайн мөчлөг эхлэхээс өмнө тухайн бараанд хийгдсэн татан авалтын тоо хэмжээ."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Борлуулалтын төлөвлөгөө хайх"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "Хэрэглэгч мөчлөг5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-"Тухайн төлөвлөгөөтэй холбоотой нөхөн дүүргэлт болон дотоод татан авалтын "
-"түүх."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Нийт компаны буюу бүх агуулахын хэмжээнд сонгосон мөчлөгт бүртгэсэн "
-"борлуулалтын төлөвлөгөөний дүн."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "Хэрэглэгч мөчлөг1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "Хэрэглэгч мөчлөг3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Татан авалтын төлөвлөгөө"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Зохистой доод хэмжээ"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Хүлээж буй орлогыг бэлтгэх"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Үүсгэх"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Татан авалтын мастер төлөвлөгөө"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Өнгөрсөн/Ирээдүй"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Төлөв"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-"Тухайн ангилалын хамрагдах бараануудад борлуулалтын төлөвлөгөө үүсгэнэ."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "Нөөцийн мөчлөг"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.sale.forecast.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Агуулах"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Тухайн мөчлөг дуусах үеийн нөөцийн таамаглал.\n"
-" Тухайн мөчлөгт: \n"
-"Эхний үлдэгдэл - Зарлагад гарсан + Орлогод авсан - Хүлээж буй зарлага + "
-"Хүлээж буй орлого.\n"
-" Хойшхи мөчлөгүүдэд энэ нь: \n"
-"Эхний үлдэгдэл - Өмнөх төлөвлөгдсөн зарлага + Өмнөх гүйцэтгэгдсэн орлого - "
-"Төлөвлөсөн зарлага + Төлөвлөсөн орлого."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Чеклэгдсэн бол компаниудын борлуулалтын харах"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Хэлтэс :"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Өмнөх гүйцэтгэгдсэн орлого"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-" МТТ-р үүсгэгдсэн татан авалтын зориулагдсан хэрэглэгч: %s   Creation Date: "
-"%s                                         \n"
-" Мөчлөг: %s                                         \n"
-" Төлөв:                                         \n"
-" Урьдчилсан таамагийн агуулах: %s                                         \n"
-" Анхны нөөц: %s                                         \n"
-" Гарахаар төлөвлөгдсөн: %s    Planned In: %s                                 "
-"        \n"
-" Гарсан: %s    Already In: %s                                         \n"
-" Гарахаар батлагдсан: %s    Confirmed In: %s                                 "
-"        \n"
-" Хугацаанаас өмнө гарахаар төлөвлөгдсөн: %s    Хугацаанаас өмнө гарахаар "
-"батлагдсан: %s                                         \n"
-" Гарахаар таамаглагдсан: %s    Ирж байгаа: %s                                "
-"         \n"
-" Нөөцийн симуляци: %s    Хамгийн бага нөөц: %s"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Алдаа !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Хэрэглэгч"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Борлуулалтын төлөвлөгөө"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Бусад агуулахаас татан авах"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Төлөвлөлт тооцоолох"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Хүчингүй үйл ажиллагаа !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Тухайн мөчлөг эхлэх үеийн тухайн агуулах дээрх барааны үлдэгдэл."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr "Татан авалтын түүх"
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-"Нөөцийн тооцооллын тоо хэмжээг харуулахад хэрэглэгдэх хэмжих нэгж. Анхны "
-"ангилалаас хэмжих нэгжийг хэрэглэж болно эсвэл хоёрдогч ангилалаас (барааны "
-"борлуулалтын нэгж) хэрэглэж болно."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Долоо хоногоор мөчлөг үүсгэх"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-"Нөөцийн мөчлөгүүд нь нөөцийн төлөвлөлтөд хэрэглэгддэг. Нөөцийн мөчлөгүүд нь "
-"санхүүгийн мөчлөгтэй хамааралгүй. Энэ харилцах цонхоор мөчлөгүүдийг үүсгэж "
-"шалгаж болно."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Өмнөх мөчлөгийн харьцуулалт"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Цуцлах"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Хэрэглэгч эргэлт4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Бараа ба борлуулалтын эргэлтийн мөчлөг"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Компаны борлуулалтын төлөвлөгөө"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr "Энэ агуулахын Хамгийн бага нөөцийн дүрэмийн хамгийн бага тоо хэмжээ"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Борлуулагч :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Татан авалт төлөвлөж буй агуулах"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Үүсгэсэн/Баталсан"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Агуулахын борлуулалтын төлөвлөгөө"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr "Та төлөвлөж буй агуулахаас өөр хангамжын агуулахыг сонгох ёстой !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr "Шалгагдсан борлуулалтын урьдчилсан таамагийг устгах боломжгүй!"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "Компани Мөчлөг5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "Хэмжих нэгж"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr "Энэ компанийн Мөчлөг1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "Компани Мөчлөг2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "Компани Мөчлөг3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Эхлэх огноо"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "Хэрэглэгч Мөчлөг2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Зөвхөн батлагдсан төлөвлөгөө"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"Тухайн барааны ангилалд хамрагдах бүх барааг төлөвлөнө. Хэрэв \"Борлуулалт "
-"төлөвлөгдсөн бараа\" талбарыг сонгосон бол уг барааны ангилал хэрэглэгдэхгүй."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Төлөвлөсөн зарлага"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr "Урьдчилсан таамагийн тоо хэмжээ"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Төлөвлөгөө"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Ноорог"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Хаалттай"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Агуулах "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-"Нөөцийн тооцооллын тоо хэмжээг харуулахад хэрэглэгддэг хэмжих нэгж. Анхны "
-"ангилалын нэгжийг ашиглаж болно эсвэл хоёрдогч ангилалын (борлуулалтын "
-"хэмжих нэгж) хэмжих нэгжийг хэрэглэж болно."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Мөчлөгийн төлөвлөгөө"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Тухайн агуулахаас тухайн мөчлөгт зарлагад гаргахаар төлөвлөж буй тоо хэмжээ. "
-"Уг тоо хэмжээг агуулахын батлагдсан төлөвтэй бараа гаргах баримтууд болон "
-"борлуулалтын төлөвлөгөөнөөс тооцож гаргана. Уг тоо хэмжээ нь батлагдсан "
-"гарах тоо хэмжээнээс их буюу тэнцүү байх ёстой."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr "Идэвхтэй Мөчлөгүүд"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Дотоод түгээлт"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr "%s Бэлтгэх жагсаалт %s (%s,  %s) %s %s \n"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Борлуулалтын төлөвлөгөө үүсгэх"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Мөчлөг4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Мөчлөгийн нэр"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Мөчлөг2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Мөчлөг3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Мөчлөг1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-"Энэ харилцах цонх нь сонгосон агуулах болон мөчлөгийн МТТ төлөвлөлтийн "
-"мөрүүдийг үүсгэхэд тусладаг. Ингэснээр эдгээрийг нэг нэгээр нь үүсгэх "
-"хэрэггүй. Энэ харилцах цонх нь хэрэв мөр байж байвал давхардуулж үүсгэдэггүй."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Батлагдсан зарлага"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Татан авалтын төлөвлөгөө үүсгэх"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Ерөнхий мэдээлэл"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Борлуулалтын төлөвлөгөө"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Компани Мөчлөг1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Борлуулалтын түүх"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Хангамжын агуулах"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr "Барааны тоо хэмжээний урьдчилсан таамаг."
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Хадгалалтын байрлалаас татах"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Мөчлөг үүсгэх хугацааны төгсгөл"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Сонгосон агуулах болон мөчлөгийн хувьд борлуулалт төлөвлөгдсөн бүх бараанд "
-"татан авалт төлөвлөнө. Энэ тохиолдолд барааны ангилал талбар хэрэглэгдэхгүй."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr "MPS(%s) %s"
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Орлогод авсан"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Барааны х.н-ийн ангилал"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-"Борлуулалтын урьдчилсан таамагийн тоо хэмжээ нь нөөц төлөвлөгчийг гараар "
-"эсвэл автоматаар татан авалт хийх үзүүлэлт болдог. Зарим мөчлөгийн хувьд "
-"хамгийн бага нөөцийн дүрмийн сондгойрол үүссэн тохиолдолд гар татан авалтыг "
-"ашиглаж болно."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-"Мастер Татан авалтын Тов (МТТ) нь агуулахын нөхөн дүүргэлтийн үндсэн "
-"жолоодогч нь байдаг, түүнчлэн үйлдвэрлэлийн товлолтын гүйцэлдүүлэгч байдаг "
-"(хамгийн бага нөөцийн дүрэм гэх мэт)\n"
-"МТТ-н мөр бүр нь өгөгдсөн агуулах дээр өгөгдсөн нөөцийн орох гарах тоо "
-"хэмжээний тоймыг өгдөг. Үүнийг өгөхдөө одоогийн болон ирээдүйн үлдэгдэл, "
-"нөөцийн төлөвлөгдсөн хөдөлгөөн зэрэгийг тооцдог. Урьдчилсан таамагийн тоо "
-"хэмжээг гараараа өөрчилөх боломжтой бөгөөд өөрийн сонирхолд нийцсэн нөөцийн "
-"тоо хэмжээг оруулсан дараагаараа шаардлагатай хэмжээнд хүрэхэд шаардлагатай "
-"татан авалтуудыг үүсгэх боломжтой."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-"МТТ-с бэлтгэлт үүсгэсэн хэрэглэгч: %s   Үүсгэсэн огноо: %s                   "
-"                  \n"
-"Мөчлөг: %s   Төлөв:                                     \n"
-" Урьдчилсан таамагийн агуулах: %s                                     \n"
-" Анхны Нөөц: %s                                     \n"
-" Гарахаар төлөвлөгдсөн: %s  Орохоор төлөвлөгдсөн: %s                         "
-"            \n"
-" Гарчихсан: %s  Орчихсон: %s                                     \n"
-" Гарахаар батлагдсан: %s   Орохоор батлагдсан: %s                            "
-"         \n"
-" Энэ хугацаанаас өмнө гарахаар төлөвлөгдсөн: %s   Энэ хугацаанаас өмнө "
-"гарахаар батлагдсан: %s                                     \n"
-" Гарахаар таамаглагдсан: %s   Ороогүй үйлдэгдэл: %s                          "
-"           \n"
-" Нөөцийн симуляци: %s   Хамгийн бага нөөц: %s "
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Мөчлөг"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Хэмжих нэгжийн ангилал"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "Идэвхитэй х.нэгж"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Бараа төлөвлөлт Хайх"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Өмнөх төлөвлөгөөг хуулбарлах"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Энэ урьдчилсан таамагийн барааг харуулна."
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "дууссан"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Мөчлөгүүд"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr "Нөөцийн Мөчлөгүүдийг Үүсгэх"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Хаах"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Батлагдсан"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Нээлттэй"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Сүүлд хийсэн борлуулалтын төлөвлөгөөг хуулбарлан үүсгэнэ."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "Хэлтэс Мөчлөг1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "Хэлтэс Мөчлөг3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "Хэлтэс Мөчлөг2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "Хэлтэс Мөчлөг5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "Хэлтэс Мөчлөг4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "Агуулах Мөчлөг2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "Агуулах Мөчлөг3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-"Нийлүүлэлтийн агуулахын хадгалах байрлалаас нийлүүлэхийн тулд тэмдэглэнэ. "
-"Хэрэв тэмдэглэгдээгүй байвал нийлүүлэлт нь нийлүүлэлтийн агуулахын гарах "
-"байрлалаас нийлүүлэгдэнэ. Нийлүүлэх агуулахтай 'Өөр агуулахаас нийлүүлэх' "
-"тохиолдолд хэрэглэгддэг."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Хариуцлагатай"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "Үндсэн х.нэгж"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "Агуулах Мөчлөг4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "Агуулах Мөчлөг5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Урсгал"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-"Нийлүүлэх бэлтгэл нь 'Өөр агуулахаас нийлүүлэх'-р үүсгэгдэхэд агуулах нь эх "
-"агуулах болж хэрэглэгдэнэ."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planning"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Борлуулалт төлөвлөж буй агуулахын сонгоно. Хэрэв бүх агуулахын хэмжээнд "
-"нэгдсэн төлөвлөгөө зохиох бол аль нэг үндсэн агуулахыг заавал сонгоно."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr "%s Татан авалт (%s,  %s) %s %s \n"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Компаны борлуулалт"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Тухайн мөчлөгт орлогод авахаар төлөвлөж буй тоо хэмжээ. Энэ утгыг өөрчилсний "
-"дараа Төлөвлөлт тооцоолох товч дээр дарна. Энэ тоо хэмжээ нь батлагдсан "
-"орлогоос их буюу тэнцүү байх ёстой."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "Компани Мөчлөг4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Татан авалт төлөвлөх гэж буй нөөц төлөвлөлтийн мөчлөг."
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Зарлагад гаргасан"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Энэ төлөвлөгөөний бараа."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Агуулах :"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Худалдан авалтын түүх"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Мөчлөг үүсгэх хугацааны эхлэл"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr "Нөөцийн мөчлөгүүд"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Бараа"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-"Тухайн агуулахад орлогод авахаар батлагдсан тоо хэмжээ. (энэ тоо хэмжээ нь "
-"бодит үлдэгдэл хараахан нэмэгдээгүй)"
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Дуусах огноо"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Захиалга үүсгээгүй"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Нэр"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Борлуулалтын төлөвлөгөөний хамрах мөчлөгийг сонгоно."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "Хэмжих нэгж"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr "Хаагдсан Мөчлөгүүд"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Бараа"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Борлуулалтын төлөвлөгөө"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Барааны ангилал"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "Та хангамжын агуулахыг сонгох шаардлагатай !"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Хадгалах байрлалд татан авах"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Батлах"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr "Нөөцийн мөчлөг. Төлөвлөгөөт захиалгууд мөчлөгийн эхлэлд үүснэ."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr "МТТ төлөвлөлт хийгдэх %s"
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Эхний үлдэгдэл"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Борлуулалтын мөнгөн дүн"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Зөвхөн батлагдсан борлуулалтын төлөвлөгөөг тооцох. Хэрэв сонгохгүй бол "
-"систем батлагдсан болон ноорог төлөвлөгөөг нийлүүлж тооцно."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Мөчлөг5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Агуулах"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Төлөвлөгөө үүсгэсэн болон батласан этгээд."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr "Борлуулалтын баг"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Тухайн мөчлөгт орлогод авахаар төлөвлөсөн тоо хэмжээнээс батлагдсан болон "
-"гүйцэтгэгдсэн орлогыг хассан үлдэгдэл. Энэ тоо хэмжээ нь нөхөн дүүргэх санал "
-"үүсгэхэд хэрэглэгдэнэ."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-"Сонгосон мөчлөг дахь гарахаар батлагдснаас бусад гарахаар таамаглагдаж "
-"байгаа тоо хэмжээ. Гарахаар төлөвлөгдсөн болон гараар батлагдсаны ялгавар. "
-"Идэвхтэй мөчлөг дахь гарчихсан тоо хэмжээ мөн тооцогдоно."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Түүх тооцоолох"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-"Энэ харилцах цонх нь урьдчилсан таамагийн олон мөрийг нэгэн зэрэг үүсгэдэг. "
-"Эдгээрийг үүсгэсэн дараагаараа зөвхөн урьдчилсан таамагийн тоо хэмжээг л "
-"оруулах ажил үлдэнэ. Энэ харилцах цонх нь байгаа мөрийг давхардуулж "
-"үүсгэдэггүй."
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Энэ Компани мөчлөг1"
-
-#~ msgid "Requisition history"
-#~ msgstr "Захиалгын түүх"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Эхний бараа: "
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Нөөц төлөвлөлтийн мөчлөг үүсгэх"
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Нөхөн дүүргэлтийн захиалга үүсгэхдээ тухайн агуулахын хадгалалтын байрлалд "
-#~ "нөхөн дүүргэнэ. Хэрэв сонгохгүй бол тухайн агуулахын оролтын байрлалд нөхөн "
-#~ "дүүргэнэ."
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Энэ агуулах нь 'Бусад агуулахаас татан авах' үед барааг нийлүүлж буй дотоод "
-#~ "агуулахаар хэрэглэгдэнэ."
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Батлагдсаны өмнө: "
-
-#~ msgid "This Department"
-#~ msgstr "Хэлтэс"
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Хүлээж буй орлого: "
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Сонголтын жагсаалт "
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Үүсгэсэн огноо: "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Гараар төлөвлөх нь: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Зарлагад гарсан: "
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr ""
-#~ "Мастер төлөвлөгөөний дагуу хэрэглэгчийн зүгээс нөхөн дүүргэлтийн санал "
-#~ "үүсгэсэн: "
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr "Тухайн агуулахад тохируулсан зохистой нөөцийн дээд хэмжээ"
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr "Сонгосон мөчлөг болон агуулахад татан авалтын төлөвлөгөө үүсгэнэ."
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Жич: Таны нэг үүсгэсэн төлөвлөгөө дахин үүсэхгүй."
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Борлуулалтын төлөвлөсөн тоо хэмжээг илэрхийлэх барааны хэмжих нэгж. Та "
-#~ "барааны үндсэн хэмжих нэгж болон хоёрдогч хэмжих нэгжийг ашиглах боломжтой."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Гаргасан: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Хүлээж буй зарлага: "
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Нөөц төлөвлөлтийн мөчлөг үүсгэх"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module is based on original OpenERP SA module stock_planning version "
-#~ "1.0 of the same name Master Procurement Schedule.\n"
-#~ "\n"
-#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
-#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
-#~ "\n"
-#~ "Terms used in the module:\n"
-#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
-#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-#~ "the Period.\n"
-#~ "- Stock Planning - is the quantity of products you plan to purchase or "
-#~ "produce for the Period.\n"
-#~ "\n"
-#~ "Because we have another module sale_forecast which uses terms \"Sales "
-#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-#~ "values. \n"
-#~ "\n"
-#~ "Activity with this module is divided to three steps:\n"
-#~ "- Creating Periods. Mandatory step.\n"
-#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
-#~ "useful for further planning.\n"
-#~ "- Creating Planning lines, entering quantities to them and making "
-#~ "Procurement. Making procurement is the final step for the Period.\n"
-#~ "\n"
-#~ "Periods\n"
-#~ "=======\n"
-#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
-#~ "There are:\n"
-#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-#~ "monthly periods.\n"
-#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-#~ "change the dates and change the State of period.\n"
-#~ "\n"
-#~ "Creating periods is the first step you have to do to use modules features. "
-#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
-#~ "Periods\" form or view but it is recommended to use automating tool.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- These periods (officially Stock and Sales Periods) are separated of "
-#~ "Financial or other periods in the system.\n"
-#~ "- Periods are not assigned to companies (when you use multicompany feature "
-#~ "at all). Module suppose that you use the same periods across companies. If "
-#~ "you wish to use different periods for different companies define them as you "
-#~ "wish (they can overlap). Later on in this text will be indications how to "
-#~ "use such periods.\n"
-#~ "- When periods are created automatically their start and finish dates are "
-#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
-#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-#~ "you create periods manually you have to take care about hours because you "
-#~ "can have incorrect values form sales or stock. \n"
-#~ "- If you use overlapping periods for the same product, warehouse and company "
-#~ "results can be unpredictable.\n"
-#~ "- If current date doesn't belong to any period or you have holes between "
-#~ "periods results can be unpredictable.\n"
-#~ "\n"
-#~ "Sales Forecasts\n"
-#~ "===============\n"
-#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
-#~ "Forecasts\".\n"
-#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-#~ "forecasts lines according to some parameters.\n"
-#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-#~ "forms.\n"
-#~ "\n"
-#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-#~ "products from selected Category, for selected Period and for selected "
-#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-#~ "settings of period before this one to created one.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
-#~ "Period, Warehouse and validated or created by you) already exists. If you "
-#~ "wish to create another forecast, if relevant lines exists you have to do it "
-#~ "manually using menus described bellow.\n"
-#~ "- When created lines are validated by someone else you can use this tool to "
-#~ "create another lines for the same Period, Product and Warehouse. \n"
-#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
-#~ "some settings from your (validated by you or created by you if not validated "
-#~ "yet) forecast which is for last period before period of created forecast. If "
-#~ "there are few your forecasts for period before this one (it is possible) "
-#~ "system takes one of them (no rule which of them).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menus \"Sales Forecasts\"\n"
-#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
-#~ "validation can save your data against any accidental changes. You can click "
-#~ "\"Validate\" button but it is not mandatory.\n"
-#~ "\n"
-#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
-#~ "\"Product Amount\". System will count quantity from amount according to Sale "
-#~ "price of the Product.\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
-#~ "for this product. You have to enter parameters to the top and left of this "
-#~ "table and system will count sale quantities according to these parameters. "
-#~ "So you can select fe. your department (at the top) then (to the left): last "
-#~ "period, period before last and period year ago.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "\n"
-#~ "\n"
-#~ "Procurement Planning\n"
-#~ "====================\n"
-#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-#~ "lines according to some parameters.\n"
-#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
-#~ "module which allows to create procurement.\n"
-#~ "\n"
-#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
-#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
-#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
-#~ "Planning Lines\", then you can review created planning and make procurement "
-#~ "using menu \"Master Procurement Schedule\".\n"
-#~ "\n"
-#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-#~ "lines for products from selected Category, for selected Period, and for "
-#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
-#~ "system creates lines for all products having forecast for selected Period "
-#~ "and Warehouse. Selected Category will be ignored in this case.\n"
-#~ "\n"
-#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
-#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-#~ "Simulation\" and decide if this value would be accurate for end of the "
-#~ "Period. \n"
-#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-#~ "all forecasts for Period and Warehouse. But your planning can be based on "
-#~ "any other information you have. It is not necessary to have any forecast. \n"
-#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-#~ "is the quantity to be procured to make stock as indicated in \"Stock "
-#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-#~ "quantity to minimum stock rules visible on the form. But you can plan "
-#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
-#~ "whole Warehouse by default. But if you want to see values for Stock location "
-#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
-#~ "\n"
-#~ "If after few tries you decide that you found correct quantities for "
-#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
-#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
-#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
-#~ "\n"
-#~ "\n"
-#~ "If you don't want to Produce or Buy the product but just pick calculated "
-#~ "quantity from another warehouse you can click \"Supply from Another "
-#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-#~ "with move from selected source Warehouse to calculated Warehouse (as "
-#~ "destination). You can also decide if this pick should be done from Stock or "
-#~ "Output location of source warehouse. Destination location (Stock or Input) "
-#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
-#~ "\n"
-#~ "\n"
-#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-#~ "have to click button \"Calculate Planning\".\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "How Stock Simulation field is calculated:\n"
-#~ "Generally Stock Simulation shows the stock for end of the calculated period "
-#~ "according to some planned or confirmed stock moves. Calculation always "
-#~ "starts with quantity of real stock of beginning of current period. Then "
-#~ "calculation adds or subtracts quantities of calculated period or periods "
-#~ "before calculated.\n"
-#~ "When you are in the same period (current period is the same as calculated) "
-#~ "Stock Simulation is calculated as follows:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out \n"
-#~ "\t+ Planned In\n"
-#~ "\n"
-#~ "When you calculate period next to current:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out of current Period \n"
-#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period .\n"
-#~ "\n"
-#~ "As you see calculated Period is taken the same way like in case above. But "
-#~ "calculation of current Period are made a little bit different. First you "
-#~ "should note that system takes for current Period only Confirmed In moves. It "
-#~ "means that you have to make planning and procurement for current Period "
-#~ "before this calculation (for Period next to current). \n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period \n"
-#~ "\t- Sum of Planned Out of Periods before calculated \n"
-#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period.\n"
-#~ "\n"
-#~ "Periods before calculated means periods starting from current till period "
-#~ "before calculated.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- Remember to make planning for all periods before calculated because "
-#~ "omitting these quantities and procurements can cause wrong suggestions for "
-#~ "procurements few periods ahead.\n"
-#~ "- If you made planning few periods ahead and you find that real Confirmed "
-#~ "Out is bigger than Planned Out in some periods before you can repeat "
-#~ "Planning and make another procurement. You should do it in the same planning "
-#~ "line. If you create another planning line the suggestions can be wrong.\n"
-#~ "- When you wish to work with different periods for some part of products "
-#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
-#~ "different products. Example: If you use always Weekly periods for Products "
-#~ "A, and Monthly periods for Products B your all calculations will work "
-#~ "correctly. You can also use different kind of periods for the same products "
-#~ "from different warehouse or companies. But you cannot use overlapping "
-#~ "periods for the same product, warehouse and company because results can be "
-#~ "unpredictable. The same apply to Forecasts lines.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "This module is based on original OpenERP SA module stock_planning version "
-#~ "1.0 of the same name Master Procurement Schedule.\n"
-#~ "\n"
-#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
-#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
-#~ "\n"
-#~ "Terms used in the module:\n"
-#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
-#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-#~ "the Period.\n"
-#~ "- Stock Planning - is the quantity of products you plan to purchase or "
-#~ "produce for the Period.\n"
-#~ "\n"
-#~ "Because we have another module sale_forecast which uses terms \"Sales "
-#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-#~ "values. \n"
-#~ "\n"
-#~ "Activity with this module is divided to three steps:\n"
-#~ "- Creating Periods. Mandatory step.\n"
-#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
-#~ "useful for further planning.\n"
-#~ "- Creating Planning lines, entering quantities to them and making "
-#~ "Procurement. Making procurement is the final step for the Period.\n"
-#~ "\n"
-#~ "Periods\n"
-#~ "=======\n"
-#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
-#~ "There are:\n"
-#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-#~ "monthly periods.\n"
-#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-#~ "change the dates and change the State of period.\n"
-#~ "\n"
-#~ "Creating periods is the first step you have to do to use modules features. "
-#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
-#~ "Periods\" form or view but it is recommended to use automating tool.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- These periods (officially Stock and Sales Periods) are separated of "
-#~ "Financial or other periods in the system.\n"
-#~ "- Periods are not assigned to companies (when you use multicompany feature "
-#~ "at all). Module suppose that you use the same periods across companies. If "
-#~ "you wish to use different periods for different companies define them as you "
-#~ "wish (they can overlap). Later on in this text will be indications how to "
-#~ "use such periods.\n"
-#~ "- When periods are created automatically their start and finish dates are "
-#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
-#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-#~ "you create periods manually you have to take care about hours because you "
-#~ "can have incorrect values form sales or stock. \n"
-#~ "- If you use overlapping periods for the same product, warehouse and company "
-#~ "results can be unpredictable.\n"
-#~ "- If current date doesn't belong to any period or you have holes between "
-#~ "periods results can be unpredictable.\n"
-#~ "\n"
-#~ "Sales Forecasts\n"
-#~ "===============\n"
-#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
-#~ "Forecasts\".\n"
-#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-#~ "forecasts lines according to some parameters.\n"
-#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-#~ "forms.\n"
-#~ "\n"
-#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-#~ "products from selected Category, for selected Period and for selected "
-#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-#~ "settings of period before this one to created one.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
-#~ "Period, Warehouse and validated or created by you) already exists. If you "
-#~ "wish to create another forecast, if relevant lines exists you have to do it "
-#~ "manually using menus described bellow.\n"
-#~ "- When created lines are validated by someone else you can use this tool to "
-#~ "create another lines for the same Period, Product and Warehouse. \n"
-#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
-#~ "some settings from your (validated by you or created by you if not validated "
-#~ "yet) forecast which is for last period before period of created forecast. If "
-#~ "there are few your forecasts for period before this one (it is possible) "
-#~ "system takes one of them (no rule which of them).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menus \"Sales Forecasts\"\n"
-#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
-#~ "validation can save your data against any accidental changes. You can click "
-#~ "\"Validate\" button but it is not mandatory.\n"
-#~ "\n"
-#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
-#~ "\"Product Amount\". System will count quantity from amount according to Sale "
-#~ "price of the Product.\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
-#~ "for this product. You have to enter parameters to the top and left of this "
-#~ "table and system will count sale quantities according to these parameters. "
-#~ "So you can select fe. your department (at the top) then (to the left): last "
-#~ "period, period before last and period year ago.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "\n"
-#~ "\n"
-#~ "Procurement Planning\n"
-#~ "====================\n"
-#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-#~ "lines according to some parameters.\n"
-#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
-#~ "module which allows to create procurement.\n"
-#~ "\n"
-#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
-#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
-#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
-#~ "Planning Lines\", then you can review created planning and make procurement "
-#~ "using menu \"Master Procurement Schedule\".\n"
-#~ "\n"
-#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-#~ "lines for products from selected Category, for selected Period, and for "
-#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
-#~ "system creates lines for all products having forecast for selected Period "
-#~ "and Warehouse. Selected Category will be ignored in this case.\n"
-#~ "\n"
-#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
-#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-#~ "Simulation\" and decide if this value would be accurate for end of the "
-#~ "Period. \n"
-#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-#~ "all forecasts for Period and Warehouse. But your planning can be based on "
-#~ "any other information you have. It is not necessary to have any forecast. \n"
-#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-#~ "is the quantity to be procured to make stock as indicated in \"Stock "
-#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-#~ "quantity to minimum stock rules visible on the form. But you can plan "
-#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
-#~ "whole Warehouse by default. But if you want to see values for Stock location "
-#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
-#~ "\n"
-#~ "If after few tries you decide that you found correct quantities for "
-#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
-#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
-#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
-#~ "\n"
-#~ "\n"
-#~ "If you don't want to Produce or Buy the product but just pick calculated "
-#~ "quantity from another warehouse you can click \"Supply from Another "
-#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-#~ "with move from selected source Warehouse to calculated Warehouse (as "
-#~ "destination). You can also decide if this pick should be done from Stock or "
-#~ "Output location of source warehouse. Destination location (Stock or Input) "
-#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
-#~ "\n"
-#~ "\n"
-#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-#~ "have to click button \"Calculate Planning\".\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "How Stock Simulation field is calculated:\n"
-#~ "Generally Stock Simulation shows the stock for end of the calculated period "
-#~ "according to some planned or confirmed stock moves. Calculation always "
-#~ "starts with quantity of real stock of beginning of current period. Then "
-#~ "calculation adds or subtracts quantities of calculated period or periods "
-#~ "before calculated.\n"
-#~ "When you are in the same period (current period is the same as calculated) "
-#~ "Stock Simulation is calculated as follows:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out \n"
-#~ "\t+ Planned In\n"
-#~ "\n"
-#~ "When you calculate period next to current:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out of current Period \n"
-#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period .\n"
-#~ "\n"
-#~ "As you see calculated Period is taken the same way like in case above. But "
-#~ "calculation of current Period are made a little bit different. First you "
-#~ "should note that system takes for current Period only Confirmed In moves. It "
-#~ "means that you have to make planning and procurement for current Period "
-#~ "before this calculation (for Period next to current). \n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period \n"
-#~ "\t- Sum of Planned Out of Periods before calculated \n"
-#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period.\n"
-#~ "\n"
-#~ "Periods before calculated means periods starting from current till period "
-#~ "before calculated.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- Remember to make planning for all periods before calculated because "
-#~ "omitting these quantities and procurements can cause wrong suggestions for "
-#~ "procurements few periods ahead.\n"
-#~ "- If you made planning few periods ahead and you find that real Confirmed "
-#~ "Out is bigger than Planned Out in some periods before you can repeat "
-#~ "Planning and make another procurement. You should do it in the same planning "
-#~ "line. If you create another planning line the suggestions can be wrong.\n"
-#~ "- When you wish to work with different periods for some part of products "
-#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
-#~ "different products. Example: If you use always Weekly periods for Products "
-#~ "A, and Monthly periods for Products B your all calculations will work "
-#~ "correctly. You can also use different kind of periods for the same products "
-#~ "from different warehouse or companies. But you cannot use overlapping "
-#~ "periods for the same product, warehouse and company because results can be "
-#~ "unpredictable. The same apply to Forecasts lines.\n"
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "Батлагдсан борлуулатын төлөвлөгөөг устгах боломжгүй !"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Төлөвлөгдсөн гаралт: "
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr ""
-#~ "Сонгосон агуулах болон мөчлөгт тохируулан борлуулалтын төлөвлөгөө үүсгэнэ."
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Захиалга ("
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Тухайн мөчлөгт зарлагад гаргахаар төлөвлөсөн тоо хэмжээнээс батлагдсан болон "
-#~ "гүйцэтгэгдсэн зарлагын хэмжээг хассан үлдэгдэл."
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Орлогод авсан: "
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Зохистой доод хэмжээ: "
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Орлогод авсан: "
-
-#~ msgid "Sales history"
-#~ msgstr "Борлуулалтын түүх"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Борлуулахаар төлөвлөж буй тоо хэмжээ."
-
-#~ msgid "Product Quantity"
-#~ msgstr "Тоо хэмжээ"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " according to state:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Төлөвлөлт таамаглал: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Агуулахын борлуулалтын төлөвлөгөө: "
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Төлөвлөсөн орлого: "
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "Хангажмын агуулахын хадгалалтын байрлалаас татан авах. Хэрэв сонгохгүй бол "
-#~ "хангамжын агуулахын гарах байрлалаас татан авна. Энэ тохиргоо нь 'Бусад "
-#~ "агуулахаас татан авах' үед хэрэглэгдэнэ."
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr "Тухайн агуулахад тохируулсан зохистой нөөцийн доод хэмжээ"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Мөглөгт: "
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "Мастер төлөвлөгөө("
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Мастер төлөвлөгөөний дагуу агуулахын баримт үүссэн: "
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Нөөц төлөвлөлтийн мөчлөг"
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Нөөц төлөвлөлтийн мөчлөг"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Өмнөх төлөвлөгдсөн зарлага "
diff --git a/addons/stock_planning/i18n/nb.po b/addons/stock_planning/i18n/nb.po
deleted file mode 100644
index f018ef92c0f..00000000000
--- a/addons/stock_planning/i18n/nb.po
+++ /dev/null
@@ -1,1178 +0,0 @@
-# Norwegian Bokmal translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-07-23 11:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Norwegian Bokmal <nb@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Maksimumsregel"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Grupper etter..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Forventet ut"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Lag prognoselinjer"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Lag perioder pr dag"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Firma"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Perioder som forslaget vil omhandle"
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Bare algerlokasjon"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Bekreftet inn"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Opprett månedlige perioder"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Planlagt ut før"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Alle produkter med forslag"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Perioder :"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Ingen produkter i valgt kategori!"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.sale.forecast"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Lagersimulering"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planning.createlines"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Søk salgsprognose"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "Denne brukerperiode1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "Denne brukerperiode3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Minimumsregel"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Opprett"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Tidligere/framtidig"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Status"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "lagerperiode"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.sale.forecast.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Lager"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Kryss her for å se salget for hele firmaet"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Pr. avdeling :"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Inngående før"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Feil!"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Denne bruker"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Prognose"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Levering fra annet lager"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Ugyldig aksjon!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Lagerbeholdning en dag før gjeldende periode"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Lag ukentlige perioder"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Kanseller"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Denne brukerperiode4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Lager og salgsperiode"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Firmaprognose"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Pr. bruker :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Laget/godkjent av"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Lagerprognose"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr "Kan ikke slette en godkjent salgsprognose!"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "Dette firmaet periode5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "Produkt måleenhet"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr "Dette firmaet periode1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "Dette firmaet periode2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "Dette firmaet periode3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Startdato"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "Denne brukerperiode2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Godkjente prognoser"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Planlagt ut"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr "Prognose kvantum"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Prognose"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Utkast"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Lukket"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr "Gjeldende perioder"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Intern levering"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Lag salgsprognoser"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Periode4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Periodenavn"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Periode2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Periode3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Periode1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Bekreftet ut"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Lag lagerprognose linjer"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Generell informasjon"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Salgsprognose"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Dette lager periode1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Kilde lager"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr "Prognose prduktkvantum"
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Sluttdato for planleggingsperiode"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Allerede inne"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Produktenhetskategori"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Periode"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Produkt salgsenhetskategori"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "Aktiv enhet"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Søk lagerplanlegging"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Kopier siste prognose"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Viser hvilke produkter som denne pronosen omhandler"
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Utført"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Perioder"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr "Lag lagerperioder"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Lukk"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Validert"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Åpen"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Kopier kvantum fra siste lager og salgsprognose"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "Denne avdelingsperiode1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "Denne avdelingsperiode3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "Denne avdelingsperiode2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "Denne avdelingsperiode5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "Denne avdelingsperiode4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "Dette lagers periode2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "Dette lagers periode3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Ansvarlig"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "Standard måleenhet"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "Dette lagers periode4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "Dette lagers periode5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Gjeldende"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planning"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Pr. firma"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "Dette firmaets periode4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Periode som planleggingen omhandler"
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Allerede ute"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Pr. lager :"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Innkjøpshistorikk"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Startdato for planleggingsperioden."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr "Lagerperioder"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Lager"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Sluttdato"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Ingen rekvisisjon"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Navn"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Viser hvilken periode prognosen omhandler."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "Måleenhet"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr "Lukkede perioder"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Produktkategori"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Godkjenne"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Inngående lager"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Produktbeløp"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Periode5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Dette lager"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Viser hvem som laget prognosen, eller godkjente."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr "Salgsteam"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Kalkuler salgshistorikk"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "Sales history"
-#~ msgstr "Salgshistorikk"
diff --git a/addons/stock_planning/i18n/nl.po b/addons/stock_planning/i18n/nl.po
deleted file mode 100644
index c1b903c2e6c..00000000000
--- a/addons/stock_planning/i18n/nl.po
+++ /dev/null
@@ -1,1259 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:07+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <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: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"Geen prognose voor de geselecteerde periode of geen producten in de "
-"geselecteerde catagorie!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Vink aan om alleen de voorraadlocatie van het huidige magazijn te berekenen. "
-"Indien niet geselecteerd wordt de berekening gemaakt voor inkomend, voorraad "
-"en uitgaande locatie van het magazijn."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Maximum regel"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Groepeer op..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Prognose waarde welke geconverteeerd wordt naar productie hoeveelheid, "
-"oveenkomstig de prijzen."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "Inkomend restant moet groter zijn dan o!"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Verwacht uit"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Inkoment restant"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Maak prognose regels"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-"Hoeveeheid van alle bevestigde uitgaande mutaties in de berekende periode."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Maak dagelijkse periodes"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Bedrijf"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Alle verkoopprognoses voor het geselecteerde magazijn, van de geselecteerde "
-"producten gedurende de geselecteerde periode."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Minimum voorraad regels indicatoren"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Periode waar de 'forcasts' betrekking op hebben."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Alleen voorraadlocatie"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-"Hoeveelheid welke al is verscheept uit het magazijn gedurende de huidige "
-"periode."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Bevestigd in"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Huidige periodesituatie"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Creëer maandelijkse Periodes"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.period.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Gepland uit voor"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Alle producten met prognose"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-"Het voor dit magazijn bij de 'Minimale Voorraad Regels'  gedefinieerde  "
-"maximale aantal."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Periodes:"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr "Het aantal dat in de huidige periode reeds in dit magazijn"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Geen producten in de geselecteerde catagorie!"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Voorraad en verkoop prognose"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.sale.forecast"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Gepland In"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Voorraad simulatie"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planning.createlines"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Zoek verkoop prognose"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "Deze gebruiker periode5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr "Historie van verwerving of interne leveringen van dezeplanningsregel"
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Alle verkoop-prognoses voor dit bedrijf van het geselecteerde product in de "
-"geselecteerde periode (berekend over alle magazijnen)"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "Deze gebruiker periode1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "Deze gebruiker periode3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Voorraadplanning"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Minimum regel"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Verwerk inkomend over"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Maken"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Productieplanning"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Verleden/Toekomst"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Status"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "voorraad periode"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.sale.forecast.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazijn"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Voorraad simulatie aan het einde van de geselecteerde periode.\n"
-" Voor de huidige periode is deze: \n"
-" Huidige voorraad - Reeds eruit + Reeds binnen - Verwacht uit + Nog te "
-"ontvangen\n"
-"Voor de aankomende periode:\n"
-" Huidige voorraad - Eerder gepland eruit + Eerder binnen - Gepland eruit + "
-"Gepland nog te ontvangen"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Vink dit aan om de verkopen van het gehele bedrijf te zien."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Per afdeling:"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Inkomend voor"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Fout !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Deze gebruiker"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Prognose"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Lever vanuit ander magazijn"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Bereken planning"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Foutieve handeling!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Voorraad hoeveelheid 1 dag voor huidige periode."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr "Verwervinghistorie"
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Maak wekelijkse periodes"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Berekende periode simulatie"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Annuleer"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Deze gebruiker periode4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Voorraad en verkoop periode"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Bedrijf prognose"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-"Minimum hoeveelheid ingesteld in minimale voorraadregel voor dit magazijn."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Per gebruiker:"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Magazijn waarvoor deze planning is."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Gemaakt/Gecontroleerd door"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Magazijn"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr "Een gevalideerde verkoop-prognose kan niet verwijderd worden."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "Dit bedrijf periode5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "Product maateenheid"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr "Dit bedrijf periode1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "Dit bedrijf periode2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "Dit bedrijf periode3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Startdatum"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "Deze gebruiker periode2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Bevestigde prognose"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Geplanned uit"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr "Prognose hoeveelheid"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Prognose"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Concept"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Gesloten"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Magazijn "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Planning en situatie voor de berekende periode"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr "Huidige periodes"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Interne levering"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr "%s Pick Liijs %s (%s,  %s) %s %s \n"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Maak een verkoopprognose"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Periode4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Periodenaam"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Periode2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Periode3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Periode1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Bevestigd uit"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Maak productieplannigsregels"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Algemene info"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Verkoopprognose"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Dit magazijn periode1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Verkoophistorie"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Bron magazijn"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr "Prognose productie hoeveelheid"
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Voorraadlevering locatie"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Einddatum voor planningperiode"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr "MPS(%s) %s"
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Reeds binnen"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Product maateenheid categorie"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Periode"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Product maateenheid voorraad  categorie"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "Actieve maateenheid"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Zoek voorraad planning"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Kopieer laatste prognose"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Laat zien over welke producten deze prognose gaat"
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Gereed"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Periodes"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr "Maak voorraadperiodes"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Sluiten"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Gecontroleerd"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Open"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Kopieer hoeveelheden van productie en verkoopprognose"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "Deze diepte periode1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "Deze diepte periode3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "Deze diepte periode2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "Deze diepte periode5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "Dit magazijn periode2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "Dit magazijn periode3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Verantwoordelijke"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "Standaard maateenheid"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "Dit magazijn periode4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "Dit magazijn periode5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Huidig"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planning"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr "%s Verwerving (%s,  %s) %s %s \n"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Per bedrijf"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "Dit bedrijf periode4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Periode waarover deze planning gaat."
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Reeds buiten"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Producten waar deze planning voor gemaakt is."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Per magazijn:"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Verwerving historie"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Startdatum voor plannigsperiode"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr "Voorraadperiodes"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Voorraad"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-"Hoeveelheid van alle bevestigde inkomende mutaties in de berekende periode."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Einddatum"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Geen vordering"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Naam"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Geeft aan over welke periode deze prognose gaat."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "Eenheid"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr "Afgesloten periodes"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Product"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Verkoop prognose"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Productcategorie"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "U dient een bronmagazijn te specificeren!"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Verwerf naar vororaadlocatie"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Goedkeuren"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr "Productieplanning v oor %s"
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Huidige voorraad"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Product bedrag"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Periode5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Dit magazijn"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Laat zien wie deze prognose heeft gemaakt of heeft goedgekeurd."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr "Verkoopteam"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Bereken verkoophistorie"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Dit bedrijf periode 1"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Oorspronkelijke voorraaad: "
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Maak voorraad en verkoop periodes"
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Bevestigd in voor "
-
-#~ msgid "This Department"
-#~ msgstr "Deze afdeling"
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Aanmaakdatum "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Handmatige planning voor "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Bevestigd Uit "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Reeds uit: "
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Maak periodes voor voorraad en verkoopplanning"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Verwacht Uit: "
-
-#~ msgid "Sales history"
-#~ msgstr "Verkoophistorie"
diff --git a/addons/stock_planning/i18n/pl.po b/addons/stock_planning/i18n/pl.po
deleted file mode 100644
index 84c811ad19c..00000000000
--- a/addons/stock_planning/i18n/pl.po
+++ /dev/null
@@ -1,1451 +0,0 @@
-# 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:13+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <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: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"Brak prognoz dla wybranego okresu lub brak produktów w wybranej kategorii !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Zaznacz, aby obliczyć tylko strefę składowania wybranego Magazynu. Jeśli nie "
-"zaznaczono, to obliczenie będzie dotyczyło strefy przyjęć, składowania i "
-"wydań danego Magazynu."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Maksimum"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Grupuj wg..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Wartość prognozy, która będzie skonwertowana do ilości według ceny produktu."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "Brakujące przyjęcia musi być większe od 0 !"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Wydania planowane w okresach przed okresem obliczanym. Pomiędzy początkiem "
-"bieżącego okresu a jednym dniem przed okresem obliczanym."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Magazyn którego dotyczy prognoza. Jeśli w czasie planowania zapasów będziesz "
-"potrzebował prognozy dla wszystkich magazynów, to teraz wybierz dowolny z "
-"nich."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Spodziewane wydania"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Brakujące przyjęcia"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Utwórz prognozy"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr "Ilość wszystkich potwierdzonych wydań w obliczanym okresie."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Utwórz okresy dniowe"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Firma"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Wszystkie prognozy sprzedaży dla wybranego magazynu i dla wybranego produktu "
-"w wybranym okresie."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Wskaźniki reguł minimalnych zapasów"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Okres, którego będzie dotyczyła prognoza"
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Tylko strefa magazynowa"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr "Ilość, która już została wydana z tego magazynu w bieżącym okresie."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Potwierdzone przyjęcia"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Sytuacja bieżącego okresu"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Utwórz okresy miesięczne"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Wydania planowane wcześniej"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Wszystkie produkty z prognozami"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Okresy :"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr "Ilość już przyjęta do tego magazynu w bieżącym okresie."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Brak produktu w wybranej kategorii !"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Prognoza magazynowa i sprzedażowa"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Planowane przyjęcia"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Symulacja zapasu"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Potwierdzone przyjęcia w okresach wcześniejszych niż obliczany (łącznie z "
-"'Już przyjęte'). Chodzi o przyjęcia pomiędzy początkiem bieżącego okresu a "
-"dzień przed początkiem okresu obliczanego."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Przeszukuj prognozy sprzedaży"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "Ten użytkownik okres5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr "Historia zapotrzebowań lub pobrań wewnętrznych dla tego planowania."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Wszystkie prognozy dla całej firmy (wszystkich magazynów) dla wybranego "
-"Produktu w trakcie wybranego Okresu."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "Ten użytkownik Okres1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "Ten użytkownik Okres3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Planowanie zapasów"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Reguła minimum"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Zapotrzebowanie na brakujące przyjęcia"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Utwórz"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Główny planista zapotrzebowania (MPS)"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Przeszły/Przyszły"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Stan"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "Kategoria produktów, których ma dotyczyć tworzona prognoza."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Magazyn"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Symulacja zapasu na koniec wybranego Okresu.\n"
-" Dla bieżącego okresu: \n"
-"Zapas początkowy - Już wydane + Już przyjęte - Spodziewane wydania + "
-"Brakujące przyjęcia.\n"
-" Dla przyszłych: \n"
-"Zapas początkowy - Planowane wcześniejsze wydania + Przyjęcia wcześniejsze - "
-"Planowane wydania + Planowane przyjęcia."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Zaznacz, aby zobaczyć sprzedaż całej firmy."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Na dział :"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Przyjęcia wcześniejsze"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Błąd !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Ten użytkownik"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Prognozy"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Pobierz z innego magazynu"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Oblicz planowanie"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Niedozwolona akcja !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Ilość zapasu jeden dzień przed bieżącym okresem."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Utwórz okresy tygodniowe"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Symulacja obliczengo okresu"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Anuluj"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Ten użytkownik Okres4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Okres magzynowania i sprzedaży"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Prognoza dla firmy"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Na użytkownika :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Magazyn, którego dotyczy planowanie."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Utworzył/Zatwierdził"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Prognoza dla magazynu"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr "Musisz podać magazyn źródłowy inny niż obliczany (docelowy) !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "ta firma Okres5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "JM produktu"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "Ta firma Okres2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "Ta firma Okres3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Data Początkowa"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "Ten użytkownik Okres2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Zatwierdzone prognozy"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"Planowanie zostanie utworzone dla produktów z kategorii wybranej w tym polu. "
-"Pole to jest ignorowane, jeśli zaznaczyłeś pole \"Wszystkie produkty z "
-"prognozą\"."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Planowane wydania"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Prognoza"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Projekt"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Zamknięte"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Magazyn "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Planowanie i sytuacja dla obliczanego okresu"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Wprowadź ilości planowanych wydań z wybranego Magazynu w trakcie wybranego "
-"Okresu dla wybranego Produktu. Do planowania tej wartości możesz obserwować "
-"Potwierdzone wydania lub Prognozę sprzedaży. Wartość ta powinna być równa "
-"lub większa od Potwierdzone wydania."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Zapotrzebowanie wewnętrzne"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Utwórz prognozy sprzedaży"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Okres4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Nazwa okresu"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Okres2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Okres3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Okres1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Potwierdzone wydania"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Utwórz pozycje planowania"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Informacje ogólne"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Prognoza sprzedaży"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Ten magazyn Okres1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Historia sprzedaży"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Magazyn źródłowy"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Strefa pobrania"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Data końcowa okresu planowania."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Zaznacz to pole, aby utworzyć planowania dla wszystkich produktów, dla "
-"których istnieją prognozy w wybranym Magazynie i dla wybranego Okresu. "
-"Kategoria produktu będzie ignorowana."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Już przyjęte"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Kategoria JM produktu"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Okres"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Kategoria JS produktu"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "Aktywna JM"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Przeszukuj planowania"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Kopiuj ostatnią prognozę"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Pokazuje, którego produktu dotyczy prognoza"
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Wykonano"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Okresy"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Zamknij"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Zatwierdzone"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Otwarte"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Kopiuje ilości z ostatniej prognozy"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "Ten dział Okres1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "Ten dział Okres3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "Ten dział Okres2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "ten wydział Okres5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "Ten dział Okres4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "Ten magazyn Okres2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "Ten magazyn Okres3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Odpowiedzialny"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "Domyślna JM"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "Ten magazyn Okres4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "Ten magazyn Okres5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Bieżący"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Pokazuje, którego magazynu dotyczy prognoza. Jeśli w trakcie planowania "
-"będziesz potrzebował prognozę dla wszystkich magazynów, to teraz wybierz "
-"dowolny magazyn."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Na firmę"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Wprowadź ilość, która (wg twoich planów) powinna być przyjęta. Ta wartość "
-"powinna być równa lub większa od Potwierdzone przyjęcia. Zmieniaj ją i "
-"obserwuj Symulację zapasu."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "Ta firma Okres4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Okres, którego dotyczy planowanie."
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Już wydane"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Produkt, którego dotyczy planowanie."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Na magazyn :"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Historia zapotrzebowań"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Data początkowa okresu planowania"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Zapasy"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr "Ilość produktów w potwierdzonych przyjęciach w obliczanym Okresie."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Data końcowa"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Brak zapotrzebowań"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Nazwa"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Pokazuje, którego okresu dotyczy prognoza."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "JM"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Produkt"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Prognozy sprzedaży"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Kategoria Produktu"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "Musisz podac magazyn źródłowy !"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Zapotrzebowanie do strefy składowania"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Aprobuj"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-"Okres dla tego planowania. Zapotrzebowanie zostanie wygenerowane na początek "
-"tego okresu."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Zapas początkowy"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Wartość produktów"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Zaznacz, aby brać pod uwagę tylko zatwierdzone prognozy. Jeśli nie "
-"zaznaczone system weźmie pod uwagę prognozy zatwierdzone i projektowane."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Okres5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Ten magazyn"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Pokazuje kto utworzył lub kto zatwierdził prognozę."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Ilość brakująca do Planowane przyjęcia. Jest to różnica pomiędzy Planowane "
-"przyjęcia i Potwierdzone przyjęcia. Dla bieżącego okresu Już przyjęte są "
-"również uwzględniane. Ta wartość jest stosowana do tworzenia zapotrzebowania "
-"na brakującą ilość."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Oblicz historię sprzedaży"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
-#~ msgid "This Department"
-#~ msgstr "Ten dział"
-
-#~ msgid "Requisition history"
-#~ msgstr "Historia zapotrzebowań"
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Utwórz okresy magazynowe i sprzedaży"
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Potwierdzone wcześniej: "
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Magazyn stosowany jako źródło pobrania utworzonego przez 'Pobierz z innego "
-#~ "magazynu'."
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Data utworzenia: "
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "Niewłaściwy XML dla architektury widoku!"
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Ręczne planowanie dla "
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "Zapotrzebowanie utworzone w MPS prze użytkownika: "
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Ilość planowana do wydania w wybranym okresie. Jest to różnica pomiędzy "
-#~ "Planowane wydania i Potwierdzone wydania. Dla bieżącego okresu Już wydane "
-#~ "równiez są wliczane."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Planowane wydania: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Wcześniejsze planowane wydania: "
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Brakujące przyjęcia: "
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Już przyjęte: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Już wydane: "
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Ta firma Okres1"
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Zaznacz, aby zapotrzebowanie dotyczyło strefy składowania wybranego "
-#~ "Magazynu. Jeśli nie zaznaczone, to zapotrzebowanie zostanie utworzone dla "
-#~ "strefy przyjęć."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Prognoza Magazynu: "
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "Nie mozna usuwać zatwierdzonych prognoz !"
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Pobranie "
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr "Tworzy planowania dla wybranego Okresu i Magazynu."
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Ilość maksymalna ustawiona w regule minimalnych zapasów dal tego Magazynu"
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Jednostka miary stosowana do wyświetlania ilości w obliczeniach zapasów. "
-#~ "Możesz stosować jednostki z domyślnej kategorii lub z drugiej kategorii "
-#~ "(kategorii jednostek sprzedaży)."
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Uwaga: Nie powiela istniejących pozycji utworzonych przez ciebie."
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr "Tworzy prognozy dla wybranego magazynu i okresu"
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Utwórz okresy dla planowania magazynowego i sprzedaży"
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Zapotrzebowanie ("
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Zapas minimalny: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Zapas początkowy: "
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Potwierdzone przyjęcia: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Potwierdzone wydania: "
-
-#~ msgid "Sales history"
-#~ msgstr "Historia sprzedaży"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Ilość prognozowana"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Symulacja zapasu: "
-
-#~ msgid "Product Quantity"
-#~ msgstr "Ilość produktu"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " w zależności od satnu:"
-
-#~ 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 !"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Dla okresu: "
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Planowane przyjęcia: "
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "Zaznacz, aby pobrać ze strefy składowania Magazynu źródłowego. Jeśli nie "
-#~ "zaznaczone, to pobranie będzie dokonane ze strefy wydań Magazynu źródłowego. "
-#~ "Stosowane w 'Pobierz z innego magazynu' z magazynem źródłowym."
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Ilość minimalna ustawiona regule minimalnego zapasu dla tego Magazynu"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Spodziewane wydania: "
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Pobranie utworzone z MPS przez użytkownika: "
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Okresy planowania magazynowego i sprzedaży"
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Okresy magazynowe i sprzedaży"
diff --git a/addons/stock_planning/i18n/pt.po b/addons/stock_planning/i18n/pt.po
deleted file mode 100644
index dce79d7fb03..00000000000
--- a/addons/stock_planning/i18n/pt.po
+++ /dev/null
@@ -1,1982 +0,0 @@
-# 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2010-12-20 19:48+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"Sem previsões para o período selecionado ou nenhum artigo na categoria "
-"selecionada!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Verifique para calcular a localização do stock somente do armazém "
-"selecionado. Se não for selecionada o cálculo é feito para a entrada e saída "
-"do stock localizado no armazém."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Regra máxima"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Previsão do valor que será convertido em quantidade do artigo de acordo com "
-"os preços."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "A entrada da Esquerda deve ser maior que 0!"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Planeado em períodos calculados antes. Entre a data de início do período "
-"corrente e um dia antes do início do período calculado."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Armazém onde as previsões são uma preocupação. Se durante o planeamento de "
-"ações que vai precisar de previsão de vendas para todos os armazéns escolha "
-"qualquer armazém agora."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Saída esperada"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Entrada à esquerda"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Criar linhas de Previsões"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-"Quantidade de todos os movimentos de saída confirmados no período calculado."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Criar períodos diários"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Empresa"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Todas as previsões de vendas para os Armazéns selecionados e artigo "
-"selecionado durante período selecionado."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Indicadores da regra mínima de stock"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Período onde as previsões são uma preocupação."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Localização só do stock"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-"Quantidade que já foi enviada para fora deste armazém no período corrente."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Confirmado em"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Situação do período corrente"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-"Este assistente ajuda com a criação de períodos de planeamento dos stocks. "
-"Estes períodos são independentes dos períodos financeiros. Se precisar de "
-"outros períodos do dia, semana ou mês-baseado, também pode adicionar, de "
-"seguida, manualmente."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Criar períodos mensais"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.period.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Planeado antes"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Todos os artigos com Previsão"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-"Quantidade máxima fixada no regulamento interno do stock mínimo para este "
-"Armazém"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Períodos:"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-"Verifique os contratos a localidade do stock do armazém selecionado. Se não "
-"selecionar os contratos será feita num local de entrada do armazém."
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr "Quantidade que levantada neste armazém no período corrente."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Não há artigos na categoria selecionada!"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Stock e Previsão de Vendas"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.sale.forecast"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Planeado em"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Simulação do Stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planning.createlines"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Confirmada entrada em períodos calculados antes(Já Incluindo Em). Entre a "
-"data de início do período corrente e um dia antes do início do período "
-"calculado."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Previsão da pesquisa de vendas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "Período 5 do utilizador"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-"Histórico de contratos ou de abastecimentos internos desta linha de "
-"planeamento."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Todas as previsões de vendas para a toda a empresa (para todos os Armazéns) "
-"do artigo selecionado durante período selecionado."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "Período 1 deste utilizador"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "Período 3 deste utilizador"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Planeamento  de Stock"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Regra mínima"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Obter entrada à esqueda"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Criar"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Master Procurement Schedule"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Passado/Futuro"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-"Categoria do artigo dos artigos que criaram as previsões serão uma "
-"preocupação."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "Período do stock"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.sale.forecast.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Armazém"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Simulação de ações no final do período selecionado. \n"
-" Para o período atual é: \n"
-"Stock inicial - Já está fora + Já está em - Esperado para fora + deixaram de "
-"entrada.\n"
-"Por períodos à frente é: \n"
-"Stock inicial - planeado antes + Chegou Antes - Planeado para fora+ Entrada "
-"Planeada."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Marque esta caixa para ver as vendas para a empresa inteira."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Por departamento:"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Entrada anterior"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-" Aquisições criadas por MPS do utilizador: %s Data de criação: %s\n"
-" Por período: %s\n"
-" de acordo com o estado:\n"
-" Previsão do Armazém: %s\n"
-" Stock inicial: %s\n"
-" Planeado: %s Planeado em: %s\n"
-" Está Out: %s Está In: %s\n"
-" Confirmado Out: %s Confirmado In: %s\n"
-" Planeada antes: %s Confirmado Antes Em:%s\n"
-" Esperado Out: %s Entrada left: %s\n"
-" Simulação do stock: %s stock mínimo: %s"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Erro !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Este utilizador"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Previsões"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Fornecimento de outro armazém"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Calcular planeamento"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Ação Inválida!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Quantidade do stock um dia antes do período atual."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr "Histórico de aquisições"
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-"Unidade de medida utilizada para mostrar as quantidades dos cálculos do "
-"stock. Pode usar unidades de categoria padrão ou de segunda categoria "
-"(categoria RUs)."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Criar períodos semanais"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-"Períodos do stock são usados para o planeamento dos stocks. Períodos dos "
-"stocks são independente dos períodos de conta. Pode usar o assistente para "
-"criar períodos e revê-los aqui."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Simulação de período calculado"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Período 4 deste utilizador"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Stock e período de vendas"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Previsão da empresa"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-"Quantidade mínima definida no Regimento do stock mínimo para este Armazém"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Por utilizador:"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Armazém onde a previsão é preocupante."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Criado/Validado por"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Previsão do armazém"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"Deve especificar um Armazém de Origem diferente do Armazém (destino) "
-"calculado !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr "Não é possível excluir uma previsão de vendas validada!"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "Período 5 desta empresa"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "UdM do artigo"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr "Período 1 desta empresa"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "Período 2 desta empresa"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "Periodo 3 desta empresa"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Data Inicial"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "Período 2 deste utilizador"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Previsões validadas"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"Planeamento será criado para os artigos da categoria do artigo selecionado "
-"por este campo. Este campo é ignorado quando marcar a caixa \"Todos os "
-"Artigos Previstos\" ."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Fora do planeamento"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr "Previsão da quantidade"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Previsão"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Rascunho"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Encerrado"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Armazém "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-"Unidade de medida utilizada para mostrar as quantidades de stock "
-"calculadas.Pode utilizar unidades de formas categoria padrão ou de segunda "
-"categoria (categoria RUs)."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Planeamento e situação para cálculo do período"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Digite quantidade de saída do armazém selecionado planeado durante o período "
-"selecionado de artigos selecionados. Para planear este valor veja  em "
-"Previsões  de vendas Confirmadas para fora. Este valor deve ser igual ou "
-"superior a Confirmado para fora."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr "Períodos atuais"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Fornecimento interno"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr "%s Lista Pick %s (%s, %s) %s %s \n"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Criar Previsões de Vendas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Período 4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Nome do Período"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Período 2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Período 3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Período 1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-"Este assistente ajuda a criar MPS linhas de planeamento para um determinado "
-"período selecionado e armazém, para que não tenha que criá-los um a um. O "
-"assistente não duplica linhas se eles já existirem para esta seleção."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Confirmado a"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Criar Stock e Linhas de planeamento"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Informações gerais"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Previsão de vendas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Período 1 desta empresa"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Armazém fornecedor"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr "Previsões da quantidade do artigo."
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Localização do fornecedor de Stock"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Data final para período de planeamento."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Marque esta caixa para criar o planeamento para todos os artigos com "
-"qualquer previsão para Armazém e período selecionado. Campo da Categoria do "
-"artigo será ignorado."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr "MPS(%s) %s"
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Já está em"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Artigo de categoria UdM"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-"Esta quantidade previsão de vendas é uma indicação para Planeador de Stock "
-"para fazer compras manualmente ou para complementar aquisição automática. "
-"Pode utilizar os contratos manuais com esta previsão quando alguns períodos "
-"são excepcionais para as regras habituais do stock mínimo."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-"O Cronograma de Aquisições Master pode ser o principal motor para o "
-"reabastecimento do armazém, ou pode complementar a programação MRP "
-"automática (regras do stock mínimo, etc.)\n"
-"Cada linha MPS dá-lhe uma visão pré-cálculada das quantidades de entrada e "
-"saída de um determinado artigo por um período do stock dado num Armazém "
-"dado, com base nos níveis de stock atuais e futuros,\n"
-"bem como os movimentos do stock planeados. As quantidades de previsão podem "
-"ser alteradas manualmente, e quando estiver satisfeito com o resultado "
-"(simulado) Quantidade de Ações, pode acionar a aquisição de que está a "
-"faltar para alcançar as quantidades desejadas"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-"Escolha criada a partir de MPS pelo utilizador: %s Data de criação: %s\n"
-" Por período: %s acordo com o estado:\n"
-" Previsões do Armazém: %s\n"
-" Stock inicial: %s\n"
-" Planeado: %s Planeado In: %s\n"
-" Já Out: %s Já In: %s\n"
-" Confirmado Out: %s Confirmado In: %s\n"
-" Planeada antes: %s Confirmado Antes Em: %s\n"
-" Esperado Out: %s Esquerda entrada: %s\n"
-" Simulação do stock: %s stock mínimo: %s "
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Período"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Artigo da categoria UoS"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "Ativar UdM"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Planear pesquisa de Stock"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Cópia da última previsão"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Shows which product this forecast concerns."
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Concluído"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Períodos"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr "Criar Períodos de Stock"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Fechar"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Validado"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Abrir"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Copia quantidades do stock passado e Previsão de Venda."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "Período 1 deste departamento"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "Período 3 deste departamento"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "Período 2 deste departamento"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "Período 5 deste departamento"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "Período 4 deste departamento"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "Período 2 deste armazém"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "Período 3 deste armazém"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-"Verifique para fornecer a partir da localidade do stock do armazém de "
-"abastecimento. Se não for marcado o fornecimento será feito a partir do "
-"local de saída do armazém do abastecimento. Usado em 'Abastecimento de outro "
-"Armazém', com armazém de abastecimento."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Responsável"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "UdM padrão"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "Período 4 deste armazém"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "Período 5 deste armazém"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Atual"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-"Armazém usado como fonte de abastecimento de pick se criados movimentos por "
-"\"Fornecimento de outro armazém\"."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planning"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Mostra qual armazém tem uma previsão preocupante. Se durante o planeamento "
-"do stock precisar de previsão de vendas para todos os armazéns, escolha "
-"qualquer armazém agora."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr "%s Aquisição (%s, %s) %s %s \n"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Por Empresa"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Digite a quantidade que (pelo seu plano) deve ir lá dentro. Altere este "
-"valor e observe a simulação do stock. Este valor deve ser igual ou superior "
-"ao Em Confirmado."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "Período 4 desta empresa"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Período em que o planeamento incidirá."
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Already Out"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Planeamento é criado para este artigo."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Por armazém:"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Histórico de aquisições"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Data inicial para planeamento do período."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr "Períodos do stock"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Stock"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-"Quantidade de todos os movimentos de entrada confirmados no Período "
-"calculado."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Data Final"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Sem requisição"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Mostra que período esta revisão preocupa."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr "Períodos fechados"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Artigo"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Previsão de vendas"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Categoria do Artigo"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "Deve especificar um armazém de fornecimento!"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Para adquirir localização do stock"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Aprovar"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-"Período para este planeamento. Requisição será criada para o inicio do "
-"período"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr "Planeamento MPS para %s"
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Stock Inicial"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Valor do artigo"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Confira para ter validadas apenas as previsões. Caso o sistema não tenha "
-"verificado a validação e as previsões propostas."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Período 5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Este armazém"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Mostra quem criou esta previsão, ou quem validou."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr "Equipa de vendas"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Quantidade deixada para entrada de quantidade planeada. Está calculada a "
-"diferença entre Planeamento em e Confirmado em. Para o período atual Já Em "
-"também é calculado. Este valor é usado para criar compras por falta de "
-"quantidade."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-"Quantidade esperada para sair no período selecionado, além Confirmado Out. "
-"Como a diferença entre Planeado Out e o Confirmado Out. Para o período atual "
-"já foi também calculado"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Calcular histórico de vendas"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-"Este assistente ajuda a criar linhas de previsão de uma só vez. Depois de "
-"criá-los, só tem que preencher as quantidades previstas. O assistente não "
-"duplica a linha, quando existir outro para a mesma seleção."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " existências iniciais: "
-
-#~ msgid "This Department"
-#~ msgstr "Este departamento"
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Data de criação: "
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Stock mínimo: "
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Quantidade prevista."
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Período 1 desta empresa"
-
-#~ msgid "Requisition history"
-#~ msgstr "Histórico de requisição"
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Armazém utilizado como fonte de abastecimento para escolher o movimento "
-#~ "criado pelo  'Abastecimento de outro Armazém '."
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Verifique a localidade do stock para fazer compras no armazém seleccionado. "
-#~ "Se não seleccionar as compras serão feitas na entrada do armazém."
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Criar stock e períodos de vendas"
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Confirmado antes: "
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Entrada à esquerda: "
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Lista Pick "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Planear Manual para "
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Quantidade máxima fixada nas Regras Mínimas de stock para este Armazém"
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "Aquisições criadas em MPS pelo utilizador: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Confirmado para fora: "
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Unidade de medida utilizada para mostrar a quantidades do stock calculado. "
-#~ "Pode usar unidades de categoria padrão ou a partir da segunda "
-#~ "categoria(categoria UOS)."
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr "Cria linhas de planeamento para o período seleccionado e armazém."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Já está fora: "
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Criar períodos para stock e planeamento de vendas"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Esperado para fora: "
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Já está em: "
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Quantidade esperada para sair no período seleccionado. Como uma diferença "
-#~ "entre o planeado e Confirmado para fora. Para o período actual que já está "
-#~ "fora também é calculado"
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr "Cria linhas de previsão para armazém e período seleccionado."
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Requisição ("
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Planeado para fora: "
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "Não é possível eliminar uma Previsão de vendas validada !"
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Confirmado em: "
-
-#~ msgid "Sales history"
-#~ msgstr "Histórico de vendas"
-
-#~ msgid "Product Quantity"
-#~ msgstr "Quantidade do artigo"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " acordo com o estado:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Previsão do armazém: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Simulação do Stock: "
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "Verifique para o fornecimento do local de Stock do Armazém de Abastecimento. "
-#~ "Se não for verificado o Fornecimento será feito a partir do local de saída "
-#~ "do armazém de abastecimento. Usado em 'fornecimento de outro armazém' com "
-#~ "Armazém de Abastecimento."
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Planeado em: "
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Quantidade mínima definida em Regra mínima de stock para este armazém"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Para período: "
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "MPS("
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Escolha MPS criado pelo utilizador: "
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Stock e planeamento de períodos de venda"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Planeado antes: "
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Stock e períodos de venda"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module is based on original OpenERP SA module stock_planning version "
-#~ "1.0 of the same name Master Procurement Schedule.\n"
-#~ "\n"
-#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
-#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
-#~ "\n"
-#~ "Terms used in the module:\n"
-#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
-#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-#~ "the Period.\n"
-#~ "- Stock Planning - is the quantity of products you plan to purchase or "
-#~ "produce for the Period.\n"
-#~ "\n"
-#~ "Because we have another module sale_forecast which uses terms \"Sales "
-#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-#~ "values. \n"
-#~ "\n"
-#~ "Activity with this module is divided to three steps:\n"
-#~ "- Creating Periods. Mandatory step.\n"
-#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
-#~ "useful for further planning.\n"
-#~ "- Creating Planning lines, entering quantities to them and making "
-#~ "Procurement. Making procurement is the final step for the Period.\n"
-#~ "\n"
-#~ "Periods\n"
-#~ "=======\n"
-#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
-#~ "There are:\n"
-#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-#~ "monthly periods.\n"
-#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-#~ "change the dates and change the State of period.\n"
-#~ "\n"
-#~ "Creating periods is the first step you have to do to use modules features. "
-#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
-#~ "Periods\" form or view but it is recommended to use automating tool.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- These periods (officially Stock and Sales Periods) are separated of "
-#~ "Financial or other periods in the system.\n"
-#~ "- Periods are not assigned to companies (when you use multicompany feature "
-#~ "at all). Module suppose that you use the same periods across companies. If "
-#~ "you wish to use different periods for different companies define them as you "
-#~ "wish (they can overlap). Later on in this text will be indications how to "
-#~ "use such periods.\n"
-#~ "- When periods are created automatically their start and finish dates are "
-#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
-#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-#~ "you create periods manually you have to take care about hours because you "
-#~ "can have incorrect values form sales or stock. \n"
-#~ "- If you use overlapping periods for the same product, warehouse and company "
-#~ "results can be unpredictable.\n"
-#~ "- If current date doesn't belong to any period or you have holes between "
-#~ "periods results can be unpredictable.\n"
-#~ "\n"
-#~ "Sales Forecasts\n"
-#~ "===============\n"
-#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
-#~ "Forecasts\".\n"
-#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-#~ "forecasts lines according to some parameters.\n"
-#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-#~ "forms.\n"
-#~ "\n"
-#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-#~ "products from selected Category, for selected Period and for selected "
-#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-#~ "settings of period before this one to created one.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
-#~ "Period, Warehouse and validated or created by you) already exists. If you "
-#~ "wish to create another forecast, if relevant lines exists you have to do it "
-#~ "manually using menus described bellow.\n"
-#~ "- When created lines are validated by someone else you can use this tool to "
-#~ "create another lines for the same Period, Product and Warehouse. \n"
-#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
-#~ "some settings from your (validated by you or created by you if not validated "
-#~ "yet) forecast which is for last period before period of created forecast. If "
-#~ "there are few your forecasts for period before this one (it is possible) "
-#~ "system takes one of them (no rule which of them).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menus \"Sales Forecasts\"\n"
-#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
-#~ "validation can save your data against any accidental changes. You can click "
-#~ "\"Validate\" button but it is not mandatory.\n"
-#~ "\n"
-#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
-#~ "\"Product Amount\". System will count quantity from amount according to Sale "
-#~ "price of the Product.\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
-#~ "for this product. You have to enter parameters to the top and left of this "
-#~ "table and system will count sale quantities according to these parameters. "
-#~ "So you can select fe. your department (at the top) then (to the left): last "
-#~ "period, period before last and period year ago.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "\n"
-#~ "\n"
-#~ "Procurement Planning\n"
-#~ "====================\n"
-#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-#~ "lines according to some parameters.\n"
-#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
-#~ "module which allows to create procurement.\n"
-#~ "\n"
-#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
-#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
-#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
-#~ "Planning Lines\", then you can review created planning and make procurement "
-#~ "using menu \"Master Procurement Schedule\".\n"
-#~ "\n"
-#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-#~ "lines for products from selected Category, for selected Period, and for "
-#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
-#~ "system creates lines for all products having forecast for selected Period "
-#~ "and Warehouse. Selected Category will be ignored in this case.\n"
-#~ "\n"
-#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
-#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-#~ "Simulation\" and decide if this value would be accurate for end of the "
-#~ "Period. \n"
-#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-#~ "all forecasts for Period and Warehouse. But your planning can be based on "
-#~ "any other information you have. It is not necessary to have any forecast. \n"
-#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-#~ "is the quantity to be procured to make stock as indicated in \"Stock "
-#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-#~ "quantity to minimum stock rules visible on the form. But you can plan "
-#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
-#~ "whole Warehouse by default. But if you want to see values for Stock location "
-#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
-#~ "\n"
-#~ "If after few tries you decide that you found correct quantities for "
-#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
-#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
-#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
-#~ "\n"
-#~ "\n"
-#~ "If you don't want to Produce or Buy the product but just pick calculated "
-#~ "quantity from another warehouse you can click \"Supply from Another "
-#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-#~ "with move from selected source Warehouse to calculated Warehouse (as "
-#~ "destination). You can also decide if this pick should be done from Stock or "
-#~ "Output location of source warehouse. Destination location (Stock or Input) "
-#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
-#~ "\n"
-#~ "\n"
-#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-#~ "have to click button \"Calculate Planning\".\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "How Stock Simulation field is calculated:\n"
-#~ "Generally Stock Simulation shows the stock for end of the calculated period "
-#~ "according to some planned or confirmed stock moves. Calculation always "
-#~ "starts with quantity of real stock of beginning of current period. Then "
-#~ "calculation adds or subtracts quantities of calculated period or periods "
-#~ "before calculated.\n"
-#~ "When you are in the same period (current period is the same as calculated) "
-#~ "Stock Simulation is calculated as follows:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out \n"
-#~ "\t+ Planned In\n"
-#~ "\n"
-#~ "When you calculate period next to current:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out of current Period \n"
-#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period .\n"
-#~ "\n"
-#~ "As you see calculated Period is taken the same way like in case above. But "
-#~ "calculation of current Period are made a little bit different. First you "
-#~ "should note that system takes for current Period only Confirmed In moves. It "
-#~ "means that you have to make planning and procurement for current Period "
-#~ "before this calculation (for Period next to current). \n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period \n"
-#~ "\t- Sum of Planned Out of Periods before calculated \n"
-#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period.\n"
-#~ "\n"
-#~ "Periods before calculated means periods starting from current till period "
-#~ "before calculated.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- Remember to make planning for all periods before calculated because "
-#~ "omitting these quantities and procurements can cause wrong suggestions for "
-#~ "procurements few periods ahead.\n"
-#~ "- If you made planning few periods ahead and you find that real Confirmed "
-#~ "Out is bigger than Planned Out in some periods before you can repeat "
-#~ "Planning and make another procurement. You should do it in the same planning "
-#~ "line. If you create another planning line the suggestions can be wrong.\n"
-#~ "- When you wish to work with different periods for some part of products "
-#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
-#~ "different products. Example: If you use always Weekly periods for Products "
-#~ "A, and Monthly periods for Products B your all calculations will work "
-#~ "correctly. You can also use different kind of periods for the same products "
-#~ "from different warehouse or companies. But you cannot use overlapping "
-#~ "periods for the same product, warehouse and company because results can be "
-#~ "unpredictable. The same apply to Forecasts lines.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Este módulo é baseado no original OpenERP SA módulo stock_planning versão "
-#~ "1.0 do mesmo nome Programa Mestre de Aquisições.\n"
-#~ "\n"
-#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
-#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
-#~ "\n"
-#~ "Terms used in the module:\n"
-#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
-#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-#~ "the Period.\n"
-#~ "- Stock Planning - is the quantity of products you plan to purchase or "
-#~ "produce for the Period.\n"
-#~ "\n"
-#~ "Because we have another module sale_forecast which uses terms \"Sales "
-#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-#~ "values. \n"
-#~ "\n"
-#~ "Activity with this module is divided to three steps:\n"
-#~ "- Creating Periods. Mandatory step.\n"
-#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
-#~ "useful for further planning.\n"
-#~ "- Creating Planning lines, entering quantities to them and making "
-#~ "Procurement. Making procurement is the final step for the Period.\n"
-#~ "\n"
-#~ "Periods\n"
-#~ "=======\n"
-#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
-#~ "There are:\n"
-#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-#~ "monthly periods.\n"
-#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-#~ "change the dates and change the State of period.\n"
-#~ "\n"
-#~ "Creating periods is the first step you have to do to use modules features. "
-#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
-#~ "Periods\" form or view but it is recommended to use automating tool.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- These periods (officially Stock and Sales Periods) are separated of "
-#~ "Financial or other periods in the system.\n"
-#~ "- Periods are not assigned to companies (when you use multicompany feature "
-#~ "at all). Module suppose that you use the same periods across companies. If "
-#~ "you wish to use different periods for different companies define them as you "
-#~ "wish (they can overlap). Later on in this text will be indications how to "
-#~ "use such periods.\n"
-#~ "- When periods are created automatically their start and finish dates are "
-#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
-#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-#~ "you create periods manually you have to take care about hours because you "
-#~ "can have incorrect values form sales or stock. \n"
-#~ "- If you use overlapping periods for the same product, warehouse and company "
-#~ "results can be unpredictable.\n"
-#~ "- If current date doesn't belong to any period or you have holes between "
-#~ "periods results can be unpredictable.\n"
-#~ "\n"
-#~ "Sales Forecasts\n"
-#~ "===============\n"
-#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
-#~ "Forecasts\".\n"
-#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-#~ "forecasts lines according to some parameters.\n"
-#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-#~ "forms.\n"
-#~ "\n"
-#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-#~ "products from selected Category, for selected Period and for selected "
-#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-#~ "settings of period before this one to created one.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
-#~ "Period, Warehouse and validated or created by you) already exists. If you "
-#~ "wish to create another forecast, if relevant lines exists you have to do it "
-#~ "manually using menus described bellow.\n"
-#~ "- When created lines are validated by someone else you can use this tool to "
-#~ "create another lines for the same Period, Product and Warehouse. \n"
-#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
-#~ "some settings from your (validated by you or created by you if not validated "
-#~ "yet) forecast which is for last period before period of created forecast. If "
-#~ "there are few your forecasts for period before this one (it is possible) "
-#~ "system takes one of them (no rule which of them).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menus \"Sales Forecasts\"\n"
-#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
-#~ "validation can save your data against any accidental changes. You can click "
-#~ "\"Validate\" button but it is not mandatory.\n"
-#~ "\n"
-#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
-#~ "\"Product Amount\". System will count quantity from amount according to Sale "
-#~ "price of the Product.\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
-#~ "for this product. You have to enter parameters to the top and left of this "
-#~ "table and system will count sale quantities according to these parameters. "
-#~ "So you can select fe. your department (at the top) then (to the left): last "
-#~ "period, period before last and period year ago.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "\n"
-#~ "\n"
-#~ "Procurement Planning\n"
-#~ "====================\n"
-#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-#~ "lines according to some parameters.\n"
-#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
-#~ "module which allows to create procurement.\n"
-#~ "\n"
-#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
-#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
-#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
-#~ "Planning Lines\", then you can review created planning and make procurement "
-#~ "using menu \"Master Procurement Schedule\".\n"
-#~ "\n"
-#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-#~ "lines for products from selected Category, for selected Period, and for "
-#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
-#~ "system creates lines for all products having forecast for selected Period "
-#~ "and Warehouse. Selected Category will be ignored in this case.\n"
-#~ "\n"
-#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
-#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-#~ "Simulation\" and decide if this value would be accurate for end of the "
-#~ "Period. \n"
-#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-#~ "all forecasts for Period and Warehouse. But your planning can be based on "
-#~ "any other information you have. It is not necessary to have any forecast. \n"
-#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-#~ "is the quantity to be procured to make stock as indicated in \"Stock "
-#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-#~ "quantity to minimum stock rules visible on the form. But you can plan "
-#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
-#~ "whole Warehouse by default. But if you want to see values for Stock location "
-#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
-#~ "\n"
-#~ "If after few tries you decide that you found correct quantities for "
-#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
-#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
-#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
-#~ "\n"
-#~ "\n"
-#~ "If you don't want to Produce or Buy the product but just pick calculated "
-#~ "quantity from another warehouse you can click \"Supply from Another "
-#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-#~ "with move from selected source Warehouse to calculated Warehouse (as "
-#~ "destination). You can also decide if this pick should be done from Stock or "
-#~ "Output location of source warehouse. Destination location (Stock or Input) "
-#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
-#~ "\n"
-#~ "\n"
-#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-#~ "have to click button \"Calculate Planning\".\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "How Stock Simulation field is calculated:\n"
-#~ "Generally Stock Simulation shows the stock for end of the calculated period "
-#~ "according to some planned or confirmed stock moves. Calculation always "
-#~ "starts with quantity of real stock of beginning of current period. Then "
-#~ "calculation adds or subtracts quantities of calculated period or periods "
-#~ "before calculated.\n"
-#~ "When you are in the same period (current period is the same as calculated) "
-#~ "Stock Simulation is calculated as follows:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out \n"
-#~ "\t+ Planned In\n"
-#~ "\n"
-#~ "When you calculate period next to current:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out of current Period \n"
-#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period .\n"
-#~ "\n"
-#~ "As you see calculated Period is taken the same way like in case above. But "
-#~ "calculation of current Period are made a little bit different. First you "
-#~ "should note that system takes for current Period only Confirmed In moves. It "
-#~ "means that you have to make planning and procurement for current Period "
-#~ "before this calculation (for Period next to current). \n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period \n"
-#~ "\t- Sum of Planned Out of Periods before calculated \n"
-#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period.\n"
-#~ "\n"
-#~ "Periods before calculated means periods starting from current till period "
-#~ "before calculated.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- Remember to make planning for all periods before calculated because "
-#~ "omitting these quantities and procurements can cause wrong suggestions for "
-#~ "procurements few periods ahead.\n"
-#~ "- If you made planning few periods ahead and you find that real Confirmed "
-#~ "Out is bigger than Planned Out in some periods before you can repeat "
-#~ "Planning and make another procurement. You should do it in the same planning "
-#~ "line. If you create another planning line the suggestions can be wrong.\n"
-#~ "- When you wish to work with different periods for some part of products "
-#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
-#~ "different products. Example: If you use always Weekly periods for Products "
-#~ "A, and Monthly periods for Products B your all calculations will work "
-#~ "correctly. You can also use different kind of periods for the same products "
-#~ "from different warehouse or companies. But you cannot use overlapping "
-#~ "periods for the same product, warehouse and company because results can be "
-#~ "unpredictable. The same apply to Forecasts lines.\n"
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Nota: Não duplica linhas existentes criados por si."
diff --git a/addons/stock_planning/i18n/pt_BR.po b/addons/stock_planning/i18n/pt_BR.po
deleted file mode 100644
index a351bbe4477..00000000000
--- a/addons/stock_planning/i18n/pt_BR.po
+++ /dev/null
@@ -1,1450 +0,0 @@
-# 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:13+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <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: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"Sem previsão para o período selecionado ou nenhum produto na categoria "
-"selecionada !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Marque para calcular o local de estoque do armazém selecionado apenas. Se "
-"não marcar, o cálculo é feito pelo local de entrada, estoque e saída do "
-"armazém."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Regra de Máximo"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Agrupar Por..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Valor de previsão que será convertido para Quantidade do Produto de acordo "
-"com os preços."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "Entrada Restante deve ser maior que 0 !"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Saída Planejada em períodos antes do calculado. Entre a data inicial do "
-"período atual e um dia antes de iniciar o período calculado."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Armazém para o qual as previsões incidirão. Se durante o planejamento de "
-"estoque você precisar da previsão de vendas para todos os armazéns, escolha "
-"todos os armazéns agora."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Saída Prevista"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Entrada Restante"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Criar Linhas Previstas"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-"Quantidade de todos os movimentos de saída confirmados no Período calculado."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Criar Períodos Diários"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Empresa"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Todas as previsões de venda do o Armazém selecionado para o Produto "
-"selecionado durante o Período selecionado."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Indicadores de Regra para Estoque Mínimo"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Período no qual as previsões vão incidir."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Apenas Local de Estoque"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr "Quantidade que foi despachada deste armazém no período atual."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Entrada Confirmada"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Situação do Período Atual"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Criar Períodos Mensais"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.period.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Planejamento de Saída Anterior"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Todos os Produtos com Previsão"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Períodos :"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr "Quantidade que já foi retirada deste armazém no período atual."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Não há produto na categoria selecionada !"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Previsão de Estoque e Vendas"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.sale.forecast"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Entrada Planejada"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Simulação de Estoque"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planning.createlines"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Entrada confirmada em períodos antes do calculado (Incluisive Entrada "
-"Confirmada). Entre a data inicial do período atual e um dia antes do início "
-"do período calculado."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Procurar Previsão de Vendas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "Este Usuário Periodo5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-"Histórico de aquisicão ou suprimento interno para esta linha de planejamento."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Todas as previsões de vendas para toda a empresa (todos os Armazéns) do "
-"Produto selecionado durante o Período selecionado."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "Este Usuário Periodo1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "Este Usuário Periodo3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Planejamento de Estoque"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Regra para Mínimos"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Adquirir Entrada Restante"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Criar"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Agenda Principal de Aquisição"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Passado/Futuro"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Status"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-"Categoria de Produto dos produtos sobre os quais a previsão criada irá "
-"incidir."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "período do estoque"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.sale.forecast.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Armazém"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Simulação de Estoque no final do Período selecionado.\n"
-" Para o período atual é: \n"
-"Estoque Inicial - Saída Realizada + Entrada Realizada - Saída Prevista + "
-"Entrada Restante.\n"
-"Para próximos períodos será: \n"
-"Estoque Inicial - Saída Planejada Anterior + Entrada Anterior - Saída "
-"Planejada + Entrada Planejada."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Marque este box para ver as vendas da empresa toda."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Por Departamento :"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Chegada Antes de"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Erro !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Este Usuário"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Previsões"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Suprir a partir de outro Armazém"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Calcular Planejamento"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Ação invalida !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Quantidade em estoque um dia antes do período atual."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Criar Períodos Semanais"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Simulação do Período Calculado"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Este Usuário Periodo4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Período de Estoque e Vendas"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Previsão para a Empresa"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Por Usuário :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Armazém sobre o qual o planejamento incidirá."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Criado/Validado por"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Previsão para Armazém"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"Você precisa especificar um Armazém Origem diferente do Armazém Calculado "
-"(destino) !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "Esta Empresa Periodo5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "UdM do Produto"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "Esta Empresa Periodo2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "Esta Empresa Periodo3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Data de Início"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "Este Usuário Periodo2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Previsões Validadas"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"O planejamento será criado para os produtos da Categoria de Produto "
-"selecionada neste campo. Ele é ignorado quando você marca o box \"Todos os "
-"Produtos em Previsão\"."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Saída Planejada"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Previsão"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Provisório"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Fechada"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Armazém "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Planejamento e Situação do Período Calculado"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Lance a quantidade planejada de saída do Armazém, Período e Produto "
-"selecionado. Para planejar este valor, olhe na Saída Confirmada ou Previsões "
-"de Vendas. Este valor deve ser igual ou maior que a Saída Confirmada."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Suprimento Interno"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Criar Previsões de Vendas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Periodo4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Nome do Período"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Periodo2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Periodo3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Periodo1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Saída Confirmada"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Criar Linhas de Planejamento de Estoque"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Informação Geral"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Previsão de Vendas"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Este Armazém Periodo1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Histórico de Vendas"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Armazém Origem"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Local para Suprimento de Estoque"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Data de encerramento para o período de planejamento."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Marque esta caixa para criar o planejamento para todos os produtos com "
-"previsão para o Armazém e Período selecionado. O campo Categoria de Produto "
-"será ignorado."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Entrada Confirmada"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Categoria para UdM do Produto"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Período"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Categoria da UdS do Produto"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "UdM Ativa"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Procurar Planejamento de Estoque"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Copiar Última Previsão"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Mostra o produto sobre o qual esta previsão incide."
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Concluído"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Períodos"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Fechar"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Validado"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Aberto"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Copiar quantidades da última Previsão de Estoque e Vendas."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "Este Depto Periodo1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "Este Depto Periodo3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "Este Depto Periodo2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "Este Depto Periodo5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "Este Depto Periodo4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "Este Armazém Periodo2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "Este Armazém Periodo3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Responsável"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "UdM Padrão"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "Este Armazém Periodo4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "Este Armazém Periodo5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Atual"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planning"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Mostra em qual armazém esta previsão incide. Se durante o planejamento de "
-"estoque você vai precisar da previsão de vendas para todos os armazéns, "
-"escolha qualquer armazém agora."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Por Empresa"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Entre com a quantidade que (pelos seus planos) deveria chegar. Mude este "
-"valor e observe a simulação de Estoque. Este valor deveria ser igual ou "
-"maior que a Entrada Confirmada."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "Esta Empresa Periodo4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Período sobre o qual o planejamento incidirá."
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Saída Realizada"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Produto para o qual este planejamento foi criado."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Por Armazém :"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Histórico de Aquisição"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Data inicial para o período de planejamento."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Estoque"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-"Quantidade de todos os movimentos de entrada confirmados no Período "
-"calculado."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Data Final"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Sem Requisição"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Nome"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Mostra o período sobre o qual esta previsão incide."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "UdM"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Produto"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Previsão de Vendas"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Categoria de Produto"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "Você precisa especificar um Armazém Origem !"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Aquisição para o Local de Estoque"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Aprovar"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-"Período para este planejamento. A Requisição será criada para o início do "
-"período."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Estoque Inicial"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Montante do Produto"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Marque para usar apenas previsões validadas. Se não marcar, o sistema usa "
-"previsões validadas e provisórias."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Periodo5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Este Armazém"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Mostra quem criou esta previsão ou quem validou."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Quantidade restante da quantidade de entrada Planejada. É calculada pela "
-"diferença entre a Entrada Planejada e Entrada Confirmada. Para o período "
-"atual, a Entrada Realizada é calculada também. Este valor é usado para criar "
-"aquisições para quantidade em falta."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Histórico do Cálculo de Vendas"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Estoque Inicial: "
-
-#~ msgid "Requisition history"
-#~ msgstr "Histórico de requisição"
-
-#~ msgid "This Department"
-#~ msgstr "Este Departamento"
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Lista de Separação "
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Data de Criação: "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Planejamento Manual para "
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr "Quantidade máxima nas Regras de Estoque Mínimo para este Armazém"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Saída Confirmada: "
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr "Cria linhas de planejamento para o período e armazém selecionado."
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "Previsões de Venda Validadas não podem ser excluídas !"
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Criar períodos para Planejamento de Estoque e Vendas"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Saída Prevista: "
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr "Criar linhas de previsão para o armazém e período selecionado."
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Requisição ("
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Saída Planejada: "
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Estoque mínimo: "
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Entrada Confirmada: "
-
-#~ msgid "Sales history"
-#~ msgstr "Histórico de Vendas"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Quantidade prevista"
-
-#~ msgid "Product Quantity"
-#~ msgstr "Quantidade do Produto"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " de acordo com o status:"
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Entrada Planejada: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Previsão para Armazém: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Simulação de Estoque: "
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Esta Empresa Periodo1"
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Criar Períodos de Estoque e Vendas"
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Entrada Confirmada: "
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Unidade de Medida usada para mostrar a quantidade calculada de estoque. Você "
-#~ "pode usar da categoria padrão ou da segunda categoria (categoria UdS )."
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "Aquisição criada no MPS pelo usuário: "
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Nota: Não duplique linhas existentes criadas por você."
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Quantidade mínima configurada nas Regras de Estoque Mínimo para este Armazém"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Para o período: "
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Períodos de Planejamento para Estoque e Vendas"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Saída Planejada Anterior: "
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Entrada Confirmada Anterior: "
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Armazém usado como origem no suprimento criado pelo 'Suprir a partir de "
-#~ "Outro Armazém'."
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Entrada Restante: "
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Períodos para Estoque e Vendas"
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "MPS("
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Separação criada pelo MPS pelo usuário: "
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Marque para criar aquisição para o local de estoque do armazém selecionado. "
-#~ "Se não selecionar, a aquisição será feita no local de entrada do armazém."
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Quantidade prevista para sair no período selecionado. É uma diferença entre "
-#~ "a Saída Planejada e a Saída Confirmada. Para o período atual, a Saída "
-#~ "Realizada também é calculada"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Saída Realizada: "
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "Marque para abastecer a partir do Local de estoque do Armazém de "
-#~ "Fornecimento. Se não estiver marcado, o abastecimeto será feito a partir do "
-#~ "Local de saída do Armazém do Fornecimento. Usado no 'Suprir a partir de "
-#~ "Outro Armazém' com Armazém de Suprimento."
diff --git a/addons/stock_planning/i18n/ro.po b/addons/stock_planning/i18n/ro.po
deleted file mode 100644
index 63b1aba0387..00000000000
--- a/addons/stock_planning/i18n/ro.po
+++ /dev/null
@@ -1,2033 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:28+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"Nici o previziune pentru perioada selectata sau nici un produs in categoria "
-"selectata !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Bifati pentru calcularea locatiei stocului doar pentru depozitul selectat. "
-"Daca nu selectati, calculul se face pentru locatia de intrare, a stocului si "
-"de iesire a depozitului."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Regula maxima"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Grupeaza dupa..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Valoarea previziunii care va fi transformata in Cantitatea Produsului in "
-"functie de preturi."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "Produsele intrate ramase trebuie sa fie mai mari de 0 !"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-"Produsele planificate sa iasa in perioade inainte de calculare. Intre data "
-"de inceput a perioadei actuale si o zi inainte de inceputul perioadei "
-"calculate."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Depozitul vizat de previziuni. Daca in timpul planificarii stocului veti "
-"avea nevoie de previziunea vanzarilor pentru toate depozitele, atunci "
-"alegeti acum orice depozit."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Produse asteptate sa iasa"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "Primire produse ramase"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "Creare Linii Previziuni"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-"Cantitatea tuturor miscarilor de iesire confirmate in Perioada calculata."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Creare Perioade Zilnice"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Companie"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Toate previziunile vanzarilor pentru Depozitul selectat si Produsul selectat "
-"in timpul Perioadei selectate."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Indicatorii regulii stocului minim"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Perioada vizata de previziune."
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Doar locatia stocului"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-"Cantitatea care este deja expediata din acest depozit in perioada curenta."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "Produse confirmate pentru intrare"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "Situatia perioadei curente"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-"Acest asistent va ajuta la crearea perioadelor de planificare a stocului. "
-"Aceste perioade sunt independente de perioadele financiare. Daca aveti "
-"nevoie de alte perioade decat cele bazate pe zi-, saptamana-, sau luna-, le "
-"puteti de asemenea adauga manual."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Creeaza Perioade Lunar"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stoc.perioada.creeaza_linii"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "Produse planificate pentru iesire inainte de"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "Toate produsele cu Previziune"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-"Cantitatea maxima setata in Regulile Stocului Minim pentru acest Depozit"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Perioade :"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-"Bifati pentru a face aprovizionarea in stocul locatiei depozitului selectat. "
-"Daca nu e selectat, aprovizionarea va fi facuta in locatia de intrare a "
-"depozitului."
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-"Cantitatea care este deja ridicata din acest depozit in perioada curenta."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Nici un produs in categoria selectata !"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Stoc si Previziune vanzari"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stoc.previziune.vanzare"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "Produse planificate sa intre"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Simulare stoc"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stoc.planificare.crearelinii"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-"Primire produse confirmata in perioadele dinainte de calculare (inclusiv "
-"primite deja). Intre data de inceput a perioadei actuale cu o zi inaintea "
-"inceperii perioadei calculate."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Cauta Previziune a vanzarilor"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "Perioada5 a acestui utilizator"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-"Istoricul aprovizionarii sau aprovizionarea interna a acestei linii de "
-"planificare."
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-"Toate estimarile vanzarilor pentru intreaga companie (pentru toate "
-"Depozitele) a Produsului selectat in timpul Perioadei selectate."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "Perioada1 a acestui utilizator"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "Perioada3 a acestui utilizator"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Planificarea stocului"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Regula minima"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "Asigurarea primirii produselor ramase"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Creeaza"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "Program principal de aprovizionare"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "Trecut/Viitor"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Stare"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-"Categoria produsului cu produsele care sunt vizate de previziunile create."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "perioada stoc"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stoc.vanzare.estimare.crearelinii"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Depozit"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"Simularea stocului la sfarsitul Perioadei selectate.\n"
-"Pentru perioada curenta este: \n"
-"Stoc initial - Produse iesite deja + Produse primite deja - Produse "
-"asteptate sa iasa + Primire produse ramase.\n"
-"Pentru perioada viitoare este: \n"
-"Stoc initial - Produse planificate sa iasa inainte de + Primire produse "
-"inainte de - Produse planificate sa iasa + Produse planificate sa intre."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr ""
-"Bifati aceasta casuta pentru a vedea vanzarile pentru intreaga companie."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "Per departament :"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "Primire produse inainte de"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-" Aprovizionare creata de catre MPS pentru utilizator; %s Data Crearii:%s     "
-"                                    \n"
-"  Pentru perioada: %s                                         \n"
-"  in functie de stare:                                         \n"
-"  Previziune Depozit: %s                                         \n"
-"  Stoc Initial: %s                                         \n"
-"  Produse planificate sa iasa: %s Produse planificate sa intre: %s           "
-"                              \n"
-"  Iesite deja: %s Primite deja: %s                                         \n"
-"  Confirmate pentru iesire: %s Confirmate pentru primire: %s                 "
-"                        \n"
-"  Planificate sa iasa inainte de: %s Produse primite confirmate inainte de: "
-"%s                                         \n"
-"  Asteptate sa iasa: %s Primire produse ramase: %s                           "
-"              \n"
-"  Simulare Stoc: %s Stoc Minim: %s"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Eroare !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Utilizatorul acesta"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Previziuni"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Aprovizionare dintr-un alt depozit"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Calculeaza Planificare"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Actiune invalida !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Cantitatea stocului cu o zi inainte de perioada curenta."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr "Istoric aprovizionare"
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-"Unitatea de Masura folosita pentru a afisa cantitatile de calcul stoc."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Creeaza Perioade Saptamanale"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-"Perioadele de stoc sunt folosite pentru planificarea stocului. Perioadele de "
-"stoc sunt independente de perioadele de cont. Puteti folosi asistentul "
-"pentru a crea perioade si a le verifica aici."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "Simulare Perioada calculata"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Anuleaza"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Perioada4 a acestui utilizator"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "Stocul si Perioada de vanzare"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Previziune Companie"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-"Cantitatea minima setata in Regulile Stocului Minim pentru acest Depozit"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "Per Utilizator :"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "Depozitul care va fi vizat de planificare."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Creat/Validat de"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "Estimare depozit"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-"Trebuie sa specificati un Depozit Sursa diferit de Depozitul calculat "
-"(destinatie) !"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr "Nu se poate sterge o estimare de vanzari validata!"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "Perioada5 a acestei companii"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "UdeM a produsului"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr "Perioada1 a acestei Companii"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "Perioada2 a acestei Companii"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "Perioada3 a acestei Companii"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Data de inceput"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "Perioada2 a acestui Utilizator"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Estimari validate"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-"Planificarea va fi creata pentru produsele din Categoria Produsului "
-"selectate in acest camp. Acest camp este ignorat atunci cand bifati casuta "
-"\"Toate Produsele Prognozate\"."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "Produse planificate sa iasa"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr "Cantitate Estimata"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Estimare"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Ciorna"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Inchis"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Depozit "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-"Unitatea de Masura folosita pentru a afisa cantitatile calculului de stoc. "
-"Puteti folosi unitatile din categoria predefinita sau din cea de-a doua "
-"categorie (categoria UdeV)."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "Planificarea si Situatia pentru Perioada calculata"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-"Introduceti cantitatea planificata pentru iesire din Depozitul selectat in "
-"timpul Perioadei selectate a Produsului selectat. Pentru a planifica aceasta "
-"valoare uitati-va in Iesire confirmata sau in Estimarile vanzarilor. Aceasta "
-"valoare ar trebui sa fie egala cu sau mai mare decat cea a Iesirii "
-"confirmate."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr "Perioade actuale"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Aprovizionare interna"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr "%s Lista de ridicare %s (%s,    %s) %s %s \n"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "Creeaza Estimari ale Vanzarilor"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Perioada4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Denumire perioada"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Perioada2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Perioada3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Perioada1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-"Acest asistent ajuta la crearea liniilor planificarii MPS pentru o anumita "
-"perioada selectata si un anumit depozit selectat, astfel ca nu trebuie sa le "
-"creati unul cate unul. Asistentul nu copiaza linii daca ele exista deja "
-"pentru aceasta selectie."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "Confirmare iesire produse"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "Creare linii de planificare stoc"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Informatii generale"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "Estimare Vanzari"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "Perioada1 a acestui depozit"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "Istoric vanzari"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "Depozitul Sursa"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr "Estimeaza cantitatea Produsului."
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "Locatia aprovizionarii stocului"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "Data de sfarsit pentru perioada planificata."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-"Bifati aceasta casuta pentru a crea planificarea tuturor produselor care au "
-"vreo estimare pentru Depozitul si Perioada selectat(a). Campul Categoria "
-"produsului va fi ignorat."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr "PAP(%s) %s"
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "Produse primite deja"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Categoria UdeM a produsului"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-"Aceasta estimare a cantitatii vanzarilor este un indicator pentru "
-"Planificarea Stocului pentru a face aprovizionarea manual sau pentru a "
-"completa aprovizionarea automata. Puteti folosi aprovizionarea manuala cu "
-"aceasta estimare atunci cand unele perioade sunt exceptionale pentru "
-"regulile obisnuite de stoc minim."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-"Calendarul Aprovizionarii Principale poate fi determinantul principal pentru "
-"reaprovizionarea depozitului, sau poate completa programarea automata MRP "
-"(regulile stocului minim, etc.).\n"
-"Fiecare linie MRP va ofera o privire de ansamblu pre-calculata a "
-"cantitatilor care intra si care ies ale unui anumit produs pentru o anumita "
-"Perioada a Stocului dintr-un anumit Depozit, pe baza nivelurilor de stoc "
-"actuale si viitoare,\n"
-"precum si a miscarilor planificate ale stocului. Cantitatile estimate pot fi "
-"modificate manual, iar atunci cand sunteti multumit de rezultatele "
-"(simulate) ale cantitatii Stocului, atunci puteti declansa aprovizionarea a "
-"ceea ce va lipseste pentru a ajunge la cantitatile dorite de dumneavoastra."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-"Preluarea creata din PAP de catre utilizator: %s Data crearii: %s            "
-"                         \n"
-"Pentru perioada: %s in functie de stare:                                     "
-" \n"
-"Estimare depozit: %s                                      \n"
-"Stoc initial: %s                                     \n"
-"Produse planificate pentru iesire: %s Produse planificate pentru intrare: %s "
-"                                    \n"
-"Produse iesite deja: %s Produse intrate deja: %s                             "
-"        \n"
-"Confirmare iesire produse: %s Confirmare intrare produse: %s                 "
-"                    \n"
-"Produse planificate pentru iesire inainte de: %s Produse confirmate pentru "
-"intrare inainte de: %s                                      \n"
-"Produse asteptate sa iasa: %s Primire produse ramase: %s                     "
-"                \n"
-"Simulare stoc: %s Stoc minim: %s "
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Perioada"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "Categoria UdeV a produsului"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "UdeM activa"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Cautare Planificare stoc"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "Copiaza ultima estimare"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "Arata care este produsul vizat de aceasta estimare."
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Efectuat"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Perioade"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr "Creeaza Intervale de Stoc"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "Inchide"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Validat(a)"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "Deschide"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "Copiaza cantitatile din ultima Estimare a stocului si a vanzarii."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "Perioada1 a acestui Departament"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "Perioada3 a acestui Departament"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "Perioada2 a acestui Departament"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "Perioada5 a acestui Departament"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "Perioada4 a acestui Departament"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "Perioada2 a acestui Depozit"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "Perioada3 a acestui Depozit"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-"Bifati pentru a face aprovizionarea din Locatia stocului Depozitului de "
-"Aprovizionare. Daca nu bifati, aprovizionarea se va face din Locatia de "
-"iesire a Depozitului de Aprovizionare. Folosit in 'Aprovizioneaza dintr-un "
-"Alt Depozit' cu Depozitul de Aprovizionare."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Responsabil"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "UdeM predefinita"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "Perioada4 a acestui Depozit"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "Perioada5 a acestui Depozit"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "Actual(a)"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-"Depozit folosit ca sursa in miscarea de ridicare a aprovizionarii creat de "
-"catre 'Aprovizioneaza dintr-un Alt Depozit'."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stoc.planificare"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-"Arata care este depozitul vizat de aceasta estimare. Daca in timpul "
-"planificarii stocului veti avea nevoie de estimarile vanzarilor pentru toate "
-"depozitele, alegeti orice depozit acum."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr "%s Aprovizionare (%s, %s) %s %s \n"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "Per Companie"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-"Introduceti cantitatea care ar trebui sa apara (conform planului "
-"dumneavoastra). Schimbati aceasta valoare si observati Simularea stocului. "
-"Aceasta valoare ar trebui sa fie egala sau mai mare decat cea a Confirmarii "
-"primirii produselor."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "Perioada4 a acestei Companii"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "Perioada care este vizata de planificare."
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "Produse iesite deja"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "Produsul pentru care este creata aceasta planificare."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "Per Depozit :"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "Istoric Aprovizionare"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Data de inceput pentru perioada planificata."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr "Perioade de Stoc"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "Stoc"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-"Cantitatea tuturor miscarilor de primire confirmate in Perioada calculata."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Data de sfarsit"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "Nicio Solicitare"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Nume"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "Arata perioada vizata de aceasta estimare."
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "UdeM"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr "Perioade Inchise"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "Produs"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Previziuni Vanzari"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Categoria Produsului"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "Trebuie sa specificati un Depozit Sursa !"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "Achizitionare in Locatia stocului"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Aproba"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-"Perioada pentru aceasta planificare. Solicitarea va fi creata pentru "
-"inceputul perioadei."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr "Planificarea MPS pentru %s"
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Stocul initial"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Suma produs"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-"Bifati pentru a primi doar estimarile validate. Daca nu bifati, sistemul ia "
-"in considerare si estimarile validate si pe cele ciorna."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Perioada5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Depozitul acesta"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "Arata cine a creat aceasta estimare sau cine a validat-o."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr "Echipa de vanzari"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-"Cantitatea ramasa si cantitatea planificata sa intre. Aceasta este diferenta "
-"calculata intre Planificare intrare produse si Confirmare intrare produse. "
-"Pentru perioada curenta se calculeaza si Produsele primite deja. Aceasta "
-"valoare este folosita pentru a crea acizitionarea cantitatii lipsa."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-"Cantitatea prevazuta sa iasa in intervalul selectat pe langa cea Confirmata "
-"sa iasa. Ca o diferenta intre Planificat sa iasa si Confirmat sa iasa. "
-"Pentru perioada actuala sunt calculate si Produsele iesite deja"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "Calculeaza Istoric Vanzari"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-"Acest asistent ajuta la crearea multor linii de estimare deodata. Dupa "
-"crearea lor, d-voastra trebuie doar sa completati cantitatile estimate. "
-"Asistentul nu face copii ale liniei atunci cand deja exista una pentru "
-"aceeasi selectie."
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Perioada1 pentru aceasta companie"
-
-#~ msgid "Requisition history"
-#~ msgstr "Istoric solicitari"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Stoc initial: "
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "Creare Stoc si Perioade de vanzare"
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr ""
-#~ "Bifati pentru a face aprovizionarea in locatia stocului a depozitului "
-#~ "selectat. Daca nu selectati, aprovizionarea se va face in locatia de intrare "
-#~ "a depozitului."
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr ""
-#~ "Depozit folosit ca sursa in miscarea de preluare a aprovizionarii creata de "
-#~ "'Aprovizionare dintr-un alt depozit'."
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    Produse confirmate pentru primire inainte de: "
-
-#~ msgid "This Department"
-#~ msgstr "Departamentul acesta"
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    Primire produse ramase: "
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Data crearii: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Produse confirmate pentru iesire: "
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Cantitatea maxima setata in Regulile Stocului Minim pentru acest Depozit"
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr "Creeaza linii de planificare pentru perioada si depozitul selectate."
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Nota: Nu copiaza linii existente create de dumneavoastra."
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr ""
-#~ "Unitatea de Masura folosita pentru a arata cantitatile in calculul stocului. "
-#~ "Puteti folosi unitatile din categoria default sau din a doua categorie "
-#~ "(categoria UoS)."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Produse iesite deja: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Produse asteptate sa iasa: "
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Creare perioade pentru Planificarea Stocului si a Vanzarilor"
-
-#~ msgid ""
-#~ "\n"
-#~ "This module is based on original OpenERP SA module stock_planning version "
-#~ "1.0 of the same name Master Procurement Schedule.\n"
-#~ "\n"
-#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
-#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
-#~ "\n"
-#~ "Terms used in the module:\n"
-#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
-#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-#~ "the Period.\n"
-#~ "- Stock Planning - is the quantity of products you plan to purchase or "
-#~ "produce for the Period.\n"
-#~ "\n"
-#~ "Because we have another module sale_forecast which uses terms \"Sales "
-#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-#~ "values. \n"
-#~ "\n"
-#~ "Activity with this module is divided to three steps:\n"
-#~ "- Creating Periods. Mandatory step.\n"
-#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
-#~ "useful for further planning.\n"
-#~ "- Creating Planning lines, entering quantities to them and making "
-#~ "Procurement. Making procurement is the final step for the Period.\n"
-#~ "\n"
-#~ "Periods\n"
-#~ "=======\n"
-#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
-#~ "There are:\n"
-#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-#~ "monthly periods.\n"
-#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-#~ "change the dates and change the State of period.\n"
-#~ "\n"
-#~ "Creating periods is the first step you have to do to use modules features. "
-#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
-#~ "Periods\" form or view but it is recommended to use automating tool.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- These periods (officially Stock and Sales Periods) are separated of "
-#~ "Financial or other periods in the system.\n"
-#~ "- Periods are not assigned to companies (when you use multicompany feature "
-#~ "at all). Module suppose that you use the same periods across companies. If "
-#~ "you wish to use different periods for different companies define them as you "
-#~ "wish (they can overlap). Later on in this text will be indications how to "
-#~ "use such periods.\n"
-#~ "- When periods are created automatically their start and finish dates are "
-#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
-#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-#~ "you create periods manually you have to take care about hours because you "
-#~ "can have incorrect values form sales or stock. \n"
-#~ "- If you use overlapping periods for the same product, warehouse and company "
-#~ "results can be unpredictable.\n"
-#~ "- If current date doesn't belong to any period or you have holes between "
-#~ "periods results can be unpredictable.\n"
-#~ "\n"
-#~ "Sales Forecasts\n"
-#~ "===============\n"
-#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
-#~ "Forecasts\".\n"
-#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-#~ "forecasts lines according to some parameters.\n"
-#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-#~ "forms.\n"
-#~ "\n"
-#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-#~ "products from selected Category, for selected Period and for selected "
-#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-#~ "settings of period before this one to created one.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
-#~ "Period, Warehouse and validated or created by you) already exists. If you "
-#~ "wish to create another forecast, if relevant lines exists you have to do it "
-#~ "manually using menus described bellow.\n"
-#~ "- When created lines are validated by someone else you can use this tool to "
-#~ "create another lines for the same Period, Product and Warehouse. \n"
-#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
-#~ "some settings from your (validated by you or created by you if not validated "
-#~ "yet) forecast which is for last period before period of created forecast. If "
-#~ "there are few your forecasts for period before this one (it is possible) "
-#~ "system takes one of them (no rule which of them).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menus \"Sales Forecasts\"\n"
-#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
-#~ "validation can save your data against any accidental changes. You can click "
-#~ "\"Validate\" button but it is not mandatory.\n"
-#~ "\n"
-#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
-#~ "\"Product Amount\". System will count quantity from amount according to Sale "
-#~ "price of the Product.\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
-#~ "for this product. You have to enter parameters to the top and left of this "
-#~ "table and system will count sale quantities according to these parameters. "
-#~ "So you can select fe. your department (at the top) then (to the left): last "
-#~ "period, period before last and period year ago.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "\n"
-#~ "\n"
-#~ "Procurement Planning\n"
-#~ "====================\n"
-#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-#~ "lines according to some parameters.\n"
-#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
-#~ "module which allows to create procurement.\n"
-#~ "\n"
-#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
-#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
-#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
-#~ "Planning Lines\", then you can review created planning and make procurement "
-#~ "using menu \"Master Procurement Schedule\".\n"
-#~ "\n"
-#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-#~ "lines for products from selected Category, for selected Period, and for "
-#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
-#~ "system creates lines for all products having forecast for selected Period "
-#~ "and Warehouse. Selected Category will be ignored in this case.\n"
-#~ "\n"
-#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
-#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-#~ "Simulation\" and decide if this value would be accurate for end of the "
-#~ "Period. \n"
-#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-#~ "all forecasts for Period and Warehouse. But your planning can be based on "
-#~ "any other information you have. It is not necessary to have any forecast. \n"
-#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-#~ "is the quantity to be procured to make stock as indicated in \"Stock "
-#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-#~ "quantity to minimum stock rules visible on the form. But you can plan "
-#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
-#~ "whole Warehouse by default. But if you want to see values for Stock location "
-#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
-#~ "\n"
-#~ "If after few tries you decide that you found correct quantities for "
-#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
-#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
-#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
-#~ "\n"
-#~ "\n"
-#~ "If you don't want to Produce or Buy the product but just pick calculated "
-#~ "quantity from another warehouse you can click \"Supply from Another "
-#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-#~ "with move from selected source Warehouse to calculated Warehouse (as "
-#~ "destination). You can also decide if this pick should be done from Stock or "
-#~ "Output location of source warehouse. Destination location (Stock or Input) "
-#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
-#~ "\n"
-#~ "\n"
-#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-#~ "have to click button \"Calculate Planning\".\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "How Stock Simulation field is calculated:\n"
-#~ "Generally Stock Simulation shows the stock for end of the calculated period "
-#~ "according to some planned or confirmed stock moves. Calculation always "
-#~ "starts with quantity of real stock of beginning of current period. Then "
-#~ "calculation adds or subtracts quantities of calculated period or periods "
-#~ "before calculated.\n"
-#~ "When you are in the same period (current period is the same as calculated) "
-#~ "Stock Simulation is calculated as follows:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out \n"
-#~ "\t+ Planned In\n"
-#~ "\n"
-#~ "When you calculate period next to current:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out of current Period \n"
-#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period .\n"
-#~ "\n"
-#~ "As you see calculated Period is taken the same way like in case above. But "
-#~ "calculation of current Period are made a little bit different. First you "
-#~ "should note that system takes for current Period only Confirmed In moves. It "
-#~ "means that you have to make planning and procurement for current Period "
-#~ "before this calculation (for Period next to current). \n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period \n"
-#~ "\t- Sum of Planned Out of Periods before calculated \n"
-#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period.\n"
-#~ "\n"
-#~ "Periods before calculated means periods starting from current till period "
-#~ "before calculated.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- Remember to make planning for all periods before calculated because "
-#~ "omitting these quantities and procurements can cause wrong suggestions for "
-#~ "procurements few periods ahead.\n"
-#~ "- If you made planning few periods ahead and you find that real Confirmed "
-#~ "Out is bigger than Planned Out in some periods before you can repeat "
-#~ "Planning and make another procurement. You should do it in the same planning "
-#~ "line. If you create another planning line the suggestions can be wrong.\n"
-#~ "- When you wish to work with different periods for some part of products "
-#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
-#~ "different products. Example: If you use always Weekly periods for Products "
-#~ "A, and Monthly periods for Products B your all calculations will work "
-#~ "correctly. You can also use different kind of periods for the same products "
-#~ "from different warehouse or companies. But you cannot use overlapping "
-#~ "periods for the same product, warehouse and company because results can be "
-#~ "unpredictable. The same apply to Forecasts lines.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Acest modul se bazeaza pe modulul original OpenERP stock_planning "
-#~ "(planificarea_stocului) versiunea 1.0 cu acelasi nume ca si Programarea "
-#~ "Aprovizionarii Principale.\n"
-#~ "\n"
-#~ "Scopul PAP este de a permite crearea unei aprovizionari manuale (solicitare) "
-#~ "in afara de programarea MRP (care functioneaza automat pe baza regulilor "
-#~ "stocului minim).\n"
-#~ "\n"
-#~ "Termeni folositi in modul:\n"
-#~ "- Stocul si Perioada vanzarii – este perioada (intre Data de inceput si Data "
-#~ "de sfarsit) pentru care planificati Stocul si Estimarea Vanzarii si faceti "
-#~ "Planificarea Aprovizionarii.\n"
-#~ "- Stocul si Estimarea Vanzarii – este cantitatea de produse pe care planuiti "
-#~ "sa le vindeti in Perioada respectiva.\n"
-#~ "- Planificarea Stocului – este cantitatea de produse pe care planuiti sa le "
-#~ "cumparati sau sa le produceti pentru Perioada respectiva.\n"
-#~ "\n"
-#~ "Pentru ca avem un alt modul sale_forecast (estimare_vanzari) care foloseste "
-#~ "termenii \"Estimarea vanzarii\" si \"Planificare\" drept valori sumative, "
-#~ "noi vom folosi termenii \"Stocul si Estimarea Vanzarii\" si \"Planificarea "
-#~ "stocului\" pentru a sublinia faptul ca folosim valori cantitative.\n"
-#~ "\n"
-#~ "Activitatea in acest modul este impartita in trei pasi:\n"
-#~ "- Crearea Perioadelor. Pas obligatoriu.\n"
-#~ "- Crearea Estimarilor vanzarilor si introducerea cantitatilor. Pas optional, "
-#~ "dar folositor pentru planificarea ulterioara.\n"
-#~ "- Crearea liniilor Planificarii, introducerea cantitatilor si efectuarea "
-#~ "Achizitionarii. Efectuarea Achizitionarii este pasul final pentru Perioada "
-#~ "respectiva.\n"
-#~ "\n"
-#~ "Perioade\n"
-#~ "==========\n"
-#~ "Aveti doua elemente ale meniului pentru Perioade in \"Managementul vanzarii "
-#~ "– Configurare\". Ele sunt:\n"
-#~ "-\"Creare Perioade vanzari\" – care creeaza automat perioade zilnice, "
-#~ "saptamanale sau lunare.\n"
-#~ "-\"Stoc si Perioade vanzari\" – care permite crearea oricarui tip de "
-#~ "perioade, schimbarea datelor si schimbarea Starii perioadei.\n"
-#~ "\n"
-#~ "Crearea perioadelor este primul pas pe care trebuie sa il faceti pentru a "
-#~ "folosi caracteristicile modulelor. Puteti crea perioade personalizate "
-#~ "folosind butonul \"Nou\" din formularul \"Stocul si Perioadele vanzarii\" "
-#~ "sau sa le vizualizati, dar este recomandat sa folositi unealta automata.\n"
-#~ "\n"
-#~ "Comentarii:\n"
-#~ "- Aceste perioade (official Stocul si Perioadele vanzarilor) sunt separate "
-#~ "de Financiar sau alte perioade din system.\n"
-#~ "- Perioadele nu sunt atribuite companiilor (atunci cand folositi "
-#~ "caracteristica multicompanie). Modulul presupune folosirea acelorasi "
-#~ "perioade intre companii. Daca doriti sa folositi perioade diferite pentru "
-#~ "companii diferite, definiti-le asa cum doriti (ele se pot suprapune). "
-#~ "Ulterior vi se vor da indicatii despre cum sa folositi asemenea perioade.\n"
-#~ "- Atunci cand perioadele sunt create automat, datele lor de inceput si de "
-#~ "sfarsit au ora de inceput 00:00:00 si ora de sfarsit 23:59:00. Atunci cand "
-#~ "creati perioade zilnice ele vor avea data de inceput 31.01.2010 00:00:00 si "
-#~ "data de sfarsit 31.01.2010 23:59:00. Acest lucru functioneaza doar la "
-#~ "crearea automata a perioadelor. Atunci cand creati perioade manual, trebuie "
-#~ "sa aveti grija la ore pentru ca puteti avea valori incorecte din vanzari sau "
-#~ "stoc. \n"
-#~ "- Daca folositi perioade care se suprapun pentru acelasi/aceeasi produs, "
-#~ "depozit si companie, rezultatele pot fi imprevizibile.\n"
-#~ "- Daca data curenta nu apartine nici unei perioade sau daca aveti goluri "
-#~ "intre perioade, rezultatele pot fi imprevizibile.\n"
-#~ "\n"
-#~ "Estimari vanzari\n"
-#~ "=================\n"
-#~ "Aveti cateva meniuri pentru Estimarea vanzarilor in \"Managementul Vanzarii "
-#~ "– Estimare Vanzari\".\n"
-#~ "- \"Creare Estimare vanzari pentru Perioadele de vanzari\" – ceea ce "
-#~ "automatizeaza crearea liniilor estimarilor in functie de anumiti "
-#~ "parametric.\n"
-#~ "- \"Estimari vanzari\" – cateva meniuri pentru a lucra cu listele "
-#~ "estimarilor si forme.\n"
-#~ "\n"
-#~ "Meniul \"Creare Estimari vanzari pentru Perioadele de vanzari\" creeaza "
-#~ "Estimari pentru produse din categoria selectata, pentru Perioada selectata "
-#~ "si pentru Depozitul selectat. Este o optiune \"Copiaza ultima estimare\" "
-#~ "pentru a copia estimarea si alte setari ale perioadei in cea create.\n"
-#~ "\n"
-#~ "Comentarii:\n"
-#~ "- Aceasta unealta nu creeaza linii, daca deja exista liniile relevante "
-#~ "(pentru acelasi/aceeasi Produs, Perioada, Depozit si validate sau create de "
-#~ "dumneavoastra). Daca doriti sa creati o alta estimare, daca liniile "
-#~ "pertinente exista deja, trebuie sa faceti acest lucru manual folosind "
-#~ "meniurile descrise mai jos.\n"
-#~ "- Atunci cand liniile create sunt validate de altcineva, puteti folosi "
-#~ "aceasta unealta pentru a crea alte linii pentru aceeasi/acelasi Perioada, "
-#~ "Produs si Depozit.\n"
-#~ "- Cand alegeti \"Copiaza Ultima Estimare\", pozitiile create iau cantitatea "
-#~ "si unele setari de la estimarea dumneavoastra (validata de dumneavoastra sau "
-#~ "creata de dumneavoastra daca inca nu a fost validata) care este pentru "
-#~ "ultima perioada inaintea perioadei pentru care a fost facuta estimarea. Daca "
-#~ "exista cateva estimari pentru perioada de dinaintea acesteia (este posibil) "
-#~ "sistemul va lua una din ele (nu exista vreo regula cu privire la care dintre "
-#~ "ele).\n"
-#~ "\n"
-#~ "\n"
-#~ "Meniurile \"Estimarile vanzarilor\" \n"
-#~ "In formularul \"Estimarea vanzarilor\" trebuie sa introduceti o cantitate "
-#~ "estimata in \"Cantitatea Produsului\". Calculele ulterioare pot functiona "
-#~ "pentru estimarile ciorna. Dar validarea poate salva datele ca sa nu apara "
-#~ "modificari accidentale. Puteti face click pe butonul \"Validare\", dar nu "
-#~ "este obligatoriu.\n"
-#~ "\n"
-#~ "In locul cantitatii estimate, puteti introduce suma vanzarilor estimate in "
-#~ "campul \"Suma Produs\". Sistemul va socoti cantitatea din suma in functie de "
-#~ "Pretul de vanzare al Produsului.\n"
-#~ "\n"
-#~ "Toate valorile din formular sunt exprimate in unitatea de masura selectata "
-#~ "in formular.Puteti selecta o unitate de masura din categoria predefinita sau "
-#~ "din a doua categorie. Atunci cand schimbati unitatea de masura cantitatile "
-#~ "vor fi recalculate conform noii UdeM: valori care pot fi scrise (campuri "
-#~ "albastre) imediat, campuri care nu pot fi editate dup ace faceti click pe "
-#~ "butonul \"Calculare Planificare\".\n"
-#~ "\n"
-#~ "Pentru a gasi valoarea adecvata pentru Estimarea vanzarii puteti folosi "
-#~ "tabelul \"Istoric vanzari\" pentru acest produs. Trebuie sa introduceti "
-#~ "parametrii in partea de sus si in partea stanga a acestui table, iar "
-#~ "sistemul va calcula cantitatile de vanzare in functie de acesti "
-#~ "parametri.Astfel, puteti selecta departamentul dumneavoastra (in partea de "
-#~ "sus), apoi (in partea stanga): ultima perioada, perioada dinaintea ultimei "
-#~ "perioade si perioada cu un an in urma. \n"
-#~ "\n"
-#~ "Comentarii:\n"
-#~ "\n"
-#~ "\n"
-#~ "Planificare achizitie\n"
-#~ "====================\n"
-#~ "Puteti gasi meniul pentru Planificare in \"Depozit – Planificare Stoc\".\n"
-#~ "- \"Creare Linii Planificare Stoc\" – va permite sa automatizati crearea "
-#~ "liniilor conform unor parametric.\n"
-#~ "- \"Programare Achizitionare Principala\" – este cel mai important meniu al "
-#~ "modulului care permite crearea aprovizionarii.\n"
-#~ "\n"
-#~ "Ca Estimarea vanzarii este etapa planificarii vanzarii. Planificarea "
-#~ "Aprovizionarii (Planificare) este etapa programarii Cumpararii sau "
-#~ "Productiei. Puteti crea Planificarea Aprovizionarii repede folosind "
-#~ "instrumentul din meniul \"Creare Linii pentru Planificarea Stocului\", apoi "
-#~ "puteti revedea planificarea create si sa faceti achizitionarea folosind "
-#~ "meniul \"Programare Achizitionare Principala\".\n"
-#~ "\n"
-#~ "Meniul \"Creare Linii pentru Planificarea Stocului\" va permite sa create "
-#~ "rapid linii ale Planificarii pentru produsele din Categoria selectata, "
-#~ "pentru Perioada selectata, si pentru Depozitul selectat. Atunci cand bifati "
-#~ "optiunea \"Toate Produsele cu Estimare\", sistemul creeaza linii pentru "
-#~ "toate produsele care au o estimare pentru Perioada si Depozitul selectat(a). "
-#~ "Categoria selectata va fi ignorata in acest caz.\n"
-#~ "\n"
-#~ "In meniul \"Programare Achizitionare Principala\" puteti schimba valorile "
-#~ "\"Produse planificate pentru iesire\" si \"Produse planificate pentru "
-#~ "primire\" pentru a respecta campul \"Simulare Stoc\" si a decide daca "
-#~ "aceasta valoare va fi exacta la sfarsitul Perioadei.\n"
-#~ "\"Produse planificate pentru iesire\" se poate baza pe \"Estimarea "
-#~ "Depozitului\" care este suma tuturor estimarilor pentru Perioada si Depozit. "
-#~ "Dar planificarea dumneavoastra se poate baza pe orice alte informatii pe "
-#~ "care le aveti. Nu este necesar sa aveti vreo estimare.\n"
-#~ "Cantitatea din \"Produse planificate pentru primire\" este folosita pentru a "
-#~ "calcula campul \"Primire produse ramase\" care este cantitatea ce trebuie "
-#~ "achizitionata pentru a face stocul asa cum este indicat in \"Simulare Stoc\" "
-#~ "la sfarsitul Perioadei. Puteti compara cantitatea din \"Simularea stocului\" "
-#~ "cu regulile stocului minim vizibile in formular. Dar puteti planifica o "
-#~ "cantitate diferita decat cea din Regulile Stocului Minim. Calculul este "
-#~ "efectuat pentru intregul Depozit prin default. Dar daca doriti sa vedeti "
-#~ "valorile pentru Locatia stocului a depozitului calculate puteti bifa casuta "
-#~ "\"Doar Locatia Stocului\".\n"
-#~ "\n"
-#~ "\n"
-#~ "Daca dupa cateva incercari decideti ca ati gasit cantitatile corecte pentru "
-#~ "\"Produse planificate pentru iesire\" si \"Produse planificate pentru "
-#~ "primire\" si sunteti multumit de stocul calculat pentru sfarsitul perioadei "
-#~ "in \"Simulare Stoc\" puteti face click pe butonul \"Achizitionare Primire\" "
-#~ "Produse Ramase pentru a achizitiona cantitatea din campul \"Primire produse "
-#~ "ramase\" in Depozit. Sistemul creeaza Comanda adecvata de achizitionare. "
-#~ "Dumneavoastra puteti decide daca achizitionarea va fi facuta in Locatia "
-#~ "Stocului sau in locatia de intrare a Depozitului calculat.\n"
-#~ "\n"
-#~ "Daca nu doriti sa Achizitionati sau sa Cumparati produsul, ci doar sa "
-#~ "ridicati cantitatea calculata din alt depozit, puteti face click pe "
-#~ "\"Aprovizionare din alt Depozit\" (in loc de  \"Achizitionare Produse "
-#~ "ramase\"). Sistemul creeaza lista de preluare prin miscarea din Depozitul "
-#~ "sursa selectat in Depozitul calculat (ca destinatie). De asemenea, puteti "
-#~ "decide daca aceasta miscare ar trebui facuta din locatia Stocului sau "
-#~ "Locatia de Iesire a depozitului sursa. Locatia destinatie (Stoc sau Intrare) "
-#~ "a depozitului destinatie va fi folosita pentru \"Achizitionare Produse "
-#~ "ramase\". \n"
-#~ "\n"
-#~ "Pentru a vedea cantitatile adecvate in campurile \"CProduse confirmate "
-#~ "pentru primire\", \"Produse confirmate pentru iesire\", \"Produse confirmate "
-#~ "pentru primire inainte de\", \"Produse planificate pentru iesire inainte "
-#~ "de\" si \"Simulare Stoc\" trebuie sa faceti click pe butonul \"Calculeaza "
-#~ "Planificarea\".\n"
-#~ "\n"
-#~ "Toate valorile din formular sunt exprimate in unitatea de masura selectata "
-#~ "in formular. Puteti selecta o unitate de masura din categoria predefinita "
-#~ "sau din a doua categorie. Atunci cand schimbati unitatea de masura, "
-#~ "cantitatile vor fi recalculate conform noii UdeM: valori care pot fi editate "
-#~ "(campurile albastre) imediat, campuri care nu pot fi editate dup ace faceti "
-#~ "click pe butonul \"Calculeaza Planificarea\".\n"
-#~ "\n"
-#~ "Cum este calculat campul Simularea Stocului:\n"
-#~ "Simularea Stocului arata in general stocul pentru sfarsitul perioadei "
-#~ "calculate in functie de niste miscari planificate sau confirmate ale "
-#~ "stocului. Calculul incepe intotdeauna cu cantitatea stocului real la "
-#~ "inceputul perioadei curente. Apoi calculul aduna sau scade cantitati pentru "
-#~ "perioada calculata sau perioadele inainte de calculare.\n"
-#~ "Atunci cand va aflati in aceeasi perioada (perioada curenta este aceeasi cu "
-#~ "cea calculata), Simularea Stocului este calculata dupa cum urmeaza:\n"
-#~ "Simularea Stocului=\n"
-#~ "\tStocul la inceputul Perioadei curente\n"
-#~ "t- Produse planificate pentru iesire \n"
-#~ "t+ Produse planificate pentru intrare \n"
-#~ "\n"
-#~ "Atunci cand calculati perioada urmatoare celei actuale: \n"
-#~ "Simulare Stoc = \n"
-#~ "\tStocul la inceputul Perioadei curente\n"
-#~ "\t- Produse planificate pentru iesire in Perioada curenta \n"
-#~ "\t+ Produse confirmate pentru primire in Perioada curenta (inclusive "
-#~ "Produsele primite deja)\n"
-#~ "\t- Produse planificate pentru iesire in Perioada calculata \n"
-#~ "\t+ Produse planificate pentru intrare in Perioada calculata.\n"
-#~ "\n"
-#~ "Dupa cum vedeti, Perioada calculata este ca si in cazul de mai sus. Dar "
-#~ "calcularea Perioadei curente este putin diferita. Mai intai, trebuie sa "
-#~ "observati ca sistemul ia in considerare pentru Perioada curenta doar "
-#~ "miscarile Confirmarii primire produse. Aceasta inseamna ca trebuie sa faceti "
-#~ "planificarea si achizitionarea pentru Perioada curenta inainte de a face "
-#~ "aceste calcule (pentru Perioada urmatoare celei curente). \n"
-#~ "\n"
-#~ "Atunci cand calculati Perioada urmatoare:\n"
-#~ "Simulare stoc = \n"
-#~ "\tStocul la inceputul Perioadei curente \n"
-#~ "\t- Suma Produselor planificate pentru iesire in Perioadele inainte de "
-#~ "calculare \n"
-#~ "\t+ Suma Produselor confirmate pentru intrare in Perioadele inainte de "
-#~ "calculare (inclusive cele primite deja) \n"
-#~ "\t- Produsele planificate pentru iesire in Perioada calculata \n"
-#~ "\t+ Produsele planificate pentru intrare in Perioada calculata. \n"
-#~ "\n"
-#~ "Perioadele inainte de calculare inseamna perioadele incepand cu perioada "
-#~ "curenta pana in momentul dinaintea calcularii.\n"
-#~ "\n"
-#~ "Comentarii:\n"
-#~ "Amintiti-va sa faceti planificarea pentru toate perioadele dinaintea "
-#~ "calcularii pentru ca omiterea acestor cantitati si achizitii poate cauza "
-#~ "sugestii gresite pentru achzitionarile din perioadele viitoare.\n"
-#~ "- Daca ati planificat cu cateva perioade inainte si descoperiti ca Produsele "
-#~ "confirmate pentru iesire reale sunt mai mari decat Produsele planificate "
-#~ "pentru iesire in unele perioade puteti repeta Planificarea si sa faceti o "
-#~ "alta achizitionare. Ar trebui sa respectati aceeasi planificare. Daca create "
-#~ "o alta linie a planificarii, sugestiile pot fi gresite. \n"
-#~ "- Cand doriti sa lucrati cu perioade diferite pentru o parte dintre produse, "
-#~ "definiti doua tipuri de perioade (Saptamanale si Lunare) si folositi-le "
-#~ "pentru produse diferite. De exemplu: Daca folositi introtdeauna Perioadele "
-#~ "saptamanale pentru Produsele A, si perioadele lunare pentru Produsele B, "
-#~ "toate calculele dumneavoastră vor fi corecte. De asemenea, puteţi folosi "
-#~ "tipuri diferite de perioade pentru aceleaşi produse de la depozite sau "
-#~ "companii diferite. Dar nu puteţi folosi perioade care se suprapun pentru "
-#~ "acelaşi produs, depozit sau companie deoarece rezultatele pot fi "
-#~ "imprevizibile. Acelaşi lucru se aplica liniilor Estimarilor.\n"
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "Nu se pot sterge Previziunile vanzarilor validate !"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " Produse planificate pentru iesire: "
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr ""
-#~ "Creeaza linii ale estimarii pentru depozitul si perioada selectat(a)."
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "Solicitare ("
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr ""
-#~ "Cantitatea asteptata sa iasa in perioada selectata. Ca o diferenta intre "
-#~ "Produse planificate pentru iesire si Produse confirmate pentru iesire. "
-#~ "Pentru perioada curenta se calculeaza si produsele care au iesit deja"
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    Produse deja intrate: "
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    Stoc minim: "
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    Produse confirmate pentru primire: "
-
-#~ msgid "Sales history"
-#~ msgstr "Istoric vanzari"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "Cantitatea estimata."
-
-#~ msgid "Product Quantity"
-#~ msgstr "Cantitatea produsului"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " in functie de stare:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " Simulare stoc: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " Estimare Depozit: "
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    Planificare intrare produse: "
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr ""
-#~ "Bifati pentru a face aprovizionarea din Locatia stocului Depozitului de "
-#~ "aprovizionare. Daca nu bifati, aprovizionarea se va face din Locatia de "
-#~ "iesire a Depozitului de aprovizionare. Folosit in 'Aprovizionare dintr-un "
-#~ "alt depozit' cu Depozitul de aprovizionare'."
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Cantitatea minima setata in Regulile Stocului Minim pentru acest Depozit"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Pentru perioada: "
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "PAP("
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "Stoc si Perioadele de planificare a vanzarilor"
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "Stoc si Perioadele de vanzare"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " Produse planificate pentru iesire inainte de: "
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Ristă de ridicare "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Planificare manuală pentru "
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "Aprovizionare creată in MPS de către utilizator: "
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "Ridicare creată din MPS de către utilizator: "
diff --git a/addons/stock_planning/i18n/ru.po b/addons/stock_planning/i18n/ru.po
deleted file mode 100644
index fa1fad8c44d..00000000000
--- a/addons/stock_planning/i18n/ru.po
+++ /dev/null
@@ -1,1248 +0,0 @@
-# Russian 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: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:16+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-"Нет прогнозов на выбранный период или нет продуктов в выбранной категории!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-"Отметьте для расчета мест хранения выбранного склада. Если не отмечено, "
-"расчет производится для входа, хранения и выхода склада."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Правило максимума"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Объединять по..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-"Прогноз стоимости , который будет преобразован в количество продукта "
-"согласно ценам."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "Ожидаемый выход"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-"Количество подтвержденных исходящих перемещений в рассчитанном периоде."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "Создать ежедневные периоды"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Компания"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-"Прогноз всех продаж по выбранному складу выбранного товара в течение "
-"выбранного периода."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "Индикаторы правил минимальных запасов"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "Период, которого касаются прогнозы"
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "Только место хранения"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr "Количество, которое уже отправлено с этого склада в текущем периоде."
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "Создать периоды по месяцам"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.period.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "Периоды :"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "В выбранной категории нет товаров !"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "Прогноз запасов и продаж"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.sale.forecast"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "Моделирование запасов"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planning.createlines"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "Поиск прогноза продаж"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "Приод5 этого пользователя"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "Приод1 этого пользователя"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "Приод3 этого пользователя"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "Планирование запасов"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "Правило минимума"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Создать"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "Состояние"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "Категория ТМЦ, для ТМЦ которых коснется созданный прогноз."
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.sale.forecast.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "Склад"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "Отметьте, чтобы увидеть продажи всей компании."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "По отделу :"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Ошибка !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "Этот пользователь"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Прогнозы"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "Поставить с другого склада"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "Вычислить планирование"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "Неверное действие !"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "Складские остатки за день перед текущим периодом."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "Создать еженедельные периоды"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "Отмена"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "Период4 этого пользователя"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "Прогноз по организации"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "На пользователя:"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "Создано/Утверждено"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "Период5 этой организации"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "Ед. изм. ТМЦ"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "Период2 этой организации"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "Период3 этой организации"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "Дата начала"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "Утвержденные прогнозы"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "Прогноз"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "Черновик"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "Закрыто"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "Склад "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "Внутренний источник"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "Период4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "Название периода"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "Период2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "Период3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "Период1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "Общая информация"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "История продаж"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "Категория ед. изм. ТМЦ"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "Период"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "Активная ед. изм."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "Поиск планирования запасов"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "Сделано"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "Периоды"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "Утверждено"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "Ответственный"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "Ед. изм. по умолчанию"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planning"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "По компании"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "Период4 этой организации"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "По складу :"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "История снабжения"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "Дата начала планируемого периода."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "Дата окончания"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "Название"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "Ед. изм."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "ТМЦ"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "Прогнозы продаж"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "Категория ТМЦ"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "Необходимо указать склад источник!"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "Утвердить"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "Начальный остаток"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "Сумма ТМЦ"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "Период5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "Этот склад"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Недопустимое имя модели в определении действия."
-
-#~ msgid "This Department"
-#~ msgstr "Этот отдел"
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "Планирование вручную для "
-
-#~ msgid "Sales history"
-#~ msgstr "История продаж"
-
-#~ msgid "Product Quantity"
-#~ msgstr "Количество ТМЦ"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " в соответствии с состоянием:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "Для периода: "
-
-#~ msgid "Requisition history"
-#~ msgstr "История запросов"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Исходные остатки: "
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Период1 этой компании"
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "Комплектовочный лист "
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  Дата создания: "
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr ""
-#~ "Максимальное количество, установленное правилом минимальных запасов для "
-#~ "этого склада"
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "Примечание: не дублировать существующие строки, созданные вами."
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "Нельзя удалить проверенный прогноз продаж !"
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "Создать периоды для планирования запасов и продаж"
diff --git a/addons/stock_planning/i18n/stock_planning.pot b/addons/stock_planning/i18n/stock_planning.pot
deleted file mode 100644
index 30075b7f595..00000000000
--- a/addons/stock_planning/i18n/stock_planning.pot
+++ /dev/null
@@ -1,1088 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* stock_planning
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.1rc1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-02-08 00:37+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid "No forecasts for selected period or no products in selected category !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid "Check to calculate stock location of selected warehouse only. If not selected calculation is made for input, stock and output location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid "Forecast value which will be converted to Product Quantity according to prices."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid "Planned Out in periods before calculated. Between start date of current period and one day before start of calculated period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse which forecasts will concern. If during stock planning you will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid "All sales forecasts for selected Warehouse of selected Product during selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid "Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid "This wizard helps with the creation of stock planning periods. These periods are independent of financial periods. If you need periods other than day-, week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid "Check to make procurement to stock location of selected warehouse. If not selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid "Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid "Confirmed incoming in periods before calculated (Including Already In). Between start date of current period and one day before start of calculated period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid "All sales forecasts for whole company (for all Warehouses) of selected Product during selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid "Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned In."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid " Procurement created by MPS for user: %s   Creation Date: %s                                         \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                         \n"
-" Planned Out Before: %s    Confirmed In Before: %s                                         \n"
-" Expected Out: %s    Incoming Left: %s                                         \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid "Unit of Measure used to show the quantities of stock calculation.You can use units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid "Stock periods are used for stock planning. Stock periods are independent of account periods. You can use wizard for creating periods and review them here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid "You must specify a Source Warehouse different than calculated (destination) Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid "Planning will be created for products from Product Category selected by this field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid "Unit of Measure used to show the quantities of stock calculation.You can use units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid "Enter planned outgoing quantity from selected Warehouse during the selected Period of selected Product. To plan this value look at Confirmed Out or Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-""
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid "This wizard helps create MPS planning lines for a given selected period and warehouse, so you don't have to create them one by one. The wizard doesn't duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid "Check this box to create planning for all products having any forecast for selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid "This quantity sales forecast is an indication for Stock Planner to make procurement manually or to complement automatic procurement. You can use manual procurement with this forecast when some periods are exceptional for usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid "The Master Procurement Schedule can be the main driver for warehouse replenishment, or can complement the automatic MRP scheduling (minimum stock rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing quantities of a given product for a given Stock Period in a given Warehouse, based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered manually, and when satisfied with resulting (simulated) Stock quantity, you can trigger the procurement of what is missing to reach your desired quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid "Pick created from MPS by user: %s   Creation Date: %s                                     \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                                     \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid "Check to supply from Stock location of Supply Warehouse. If not checked supply will be made from Output location of Supply Warehouse. Used in 'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid "Warehouse used as source in supply pick move created by 'Supply from Another Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid "Shows which warehouse this forecast concerns. If during stock planning you will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-""
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid "Enter quantity which (by your plan) should come in. Change this value and observe Stock simulation. This value should be equal or greater than Confirmed In."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid "Period for this planning. Requisition will be created for beginning of the period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid "Check to take validated forecasts only. If not checked system takes validated and draft forecasts."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid "Quantity left to Planned incoming quantity. This is calculated difference between Planned In and Confirmed In. For current period Already In is also calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid "Quantity expected to go out in selected period besides Confirmed Out. As a difference between Planned Out and Confirmed Out. For current period Already Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid "This wizard helps create many forecast lines at once. After creating them you only have to fill in the forecast quantities. The wizard doesn't duplicate the line when another one exist for the same selection."
-msgstr ""
-
diff --git a/addons/stock_planning/i18n/sv.po b/addons/stock_planning/i18n/sv.po
deleted file mode 100644
index 3a86414a488..00000000000
--- a/addons/stock_planning/i18n/sv.po
+++ /dev/null
@@ -1,1183 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-04-12 20:16+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Gruppera på"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Företag"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr "Största kvantitet som fastställs i minimilagerregel för detta lager"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "Inga produkter i vald kategori"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr "Minsta kvantitet som fastställs i minimilagerregel för detta lager"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " Ingående Lager: "
diff --git a/addons/stock_planning/i18n/tr.po b/addons/stock_planning/i18n/tr.po
deleted file mode 100644
index 694608531c0..00000000000
--- a/addons/stock_planning/i18n/tr.po
+++ /dev/null
@@ -1,1178 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-01-25 17:40+0000\n"
-"Last-Translator: Ahmet Altınışık <Unknown>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr "Seçilen kategoride seçilmiş dönem için öngörü ya da ürün yok."
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "Ençok Kuralı"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "Gruplandır..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "Şirket"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "Oluştur"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "Hata !"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "Tahminler"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "Bu Firma Dönem1"
diff --git a/addons/stock_planning/i18n/zh_CN.po b/addons/stock_planning/i18n/zh_CN.po
deleted file mode 100644
index 44847c778ae..00000000000
--- a/addons/stock_planning/i18n/zh_CN.po
+++ /dev/null
@@ -1,1636 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 17:49+0000\n"
-"Last-Translator: openerp-china.black-jack <onetimespeed@gmail.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: 2012-08-07 05:32+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#, python-format
-msgid ""
-"No forecasts for selected period or no products in selected category !"
-msgstr "选定的周期没预计,选定的分类没产品!"
-
-#. module: stock_planning
-#: help:stock.planning,stock_only:0
-msgid ""
-"Check to calculate stock location of selected warehouse only. If not "
-"selected calculation is made for input, stock and output location of "
-"warehouse."
-msgstr "如果没选定仓库的入仓,库存,出仓的计算方式,检查选定仓库的库位."
-
-#. module: stock_planning
-#: field:stock.planning,maximum_op:0
-msgid "Maximum Rule"
-msgstr "最大库存规则"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Group By..."
-msgstr "分组..."
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_amt:0
-msgid ""
-"Forecast value which will be converted to Product Quantity according to "
-"prices."
-msgstr "估值将为价格乘于产品数量."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#, python-format
-msgid "Incoming Left must be greater than 0 !"
-msgstr "即将入库必须大于0!"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_before:0
-msgid ""
-"Planned Out in periods before calculated. Between start date of current "
-"period and one day before start of calculated period."
-msgstr "在计算周期前的计划出库,在本周期开始时间和计算周期前的某天."
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,warehouse_id:0
-msgid ""
-"Warehouse which forecasts will concern. If during stock planning you will "
-"need sales forecast for all warehouses choose any warehouse now."
-msgstr "关注仓库的预计.如果在库存计划期间您需要在所有仓库中选择一个当前仓库做销售预计."
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_left:0
-msgid "Expected Out"
-msgstr "预计出仓"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid " "
-msgstr " "
-
-#. module: stock_planning
-#: field:stock.planning,incoming_left:0
-msgid "Incoming Left"
-msgstr "即将入库"
-
-#. module: stock_planning
-#: view:stock.sale.forecast.createlines:0
-msgid "Create Forecasts Lines"
-msgstr "创建预计明细"
-
-#. module: stock_planning
-#: help:stock.planning,outgoing:0
-msgid "Quantity of all confirmed outgoing moves in calculated Period."
-msgstr "确认所有计算周期内的出仓调拨数量."
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Daily Periods"
-msgstr "创建周期"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,company_id:0
-#: field:stock.planning.createlines,company_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,company_id:0
-#: field:stock.sale.forecast.createlines,company_id:0
-msgid "Company"
-msgstr "公司"
-
-#. module: stock_planning
-#: help:stock.planning,warehouse_forecast:0
-msgid ""
-"All sales forecasts for selected Warehouse of selected Product during "
-"selected Period."
-msgstr "在选定周期指定的仓库里其选择的产品的所有销售预计."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Minimum Stock Rule Indicators"
-msgstr "最小库存规则标识"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,period_id:0
-msgid "Period which forecasts will concern."
-msgstr "关注这周期的预计"
-
-#. module: stock_planning
-#: field:stock.planning,stock_only:0
-msgid "Stock Location Only"
-msgstr "只有库存库位"
-
-#. module: stock_planning
-#: help:stock.planning,already_out:0
-msgid ""
-"Quantity which is already dispatched out of this warehouse in current period."
-msgstr "本期这仓库已派件出去的数量"
-
-#. module: stock_planning
-#: field:stock.planning,incoming:0
-msgid "Confirmed In"
-msgstr "已确认的入库"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Current Period Situation"
-msgstr "本期状况"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_createlines_form
-msgid ""
-"This wizard helps with the creation of stock planning periods. These periods "
-"are independent of financial periods. If you need periods other than day-, "
-"week- or month-based, you may also add then manually."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Monthly Periods"
-msgstr "创建月度"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period_createlines
-msgid "stock.period.createlines"
-msgstr "stock.period.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,outgoing_before:0
-msgid "Planned Out Before"
-msgstr "之前的计划出库"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,forecasted_products:0
-msgid "All Products with Forecast"
-msgstr "所有产品的预计"
-
-#. module: stock_planning
-#: help:stock.planning,maximum_op:0
-msgid "Maximum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Periods :"
-msgstr "周期:"
-
-#. module: stock_planning
-#: help:stock.planning,procure_to_stock:0
-msgid ""
-"Check to make procurement to stock location of selected warehouse. If not "
-"selected procurement will be made into input location of warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,already_in:0
-msgid ""
-"Quantity which is already picked up to this warehouse in current period."
-msgstr "本期这仓库已装箱的数量."
-
-#. module: stock_planning
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "No products in selected category !"
-msgstr "在选定的分类没产品!"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Stock and Sales Forecast"
-msgstr "库存和销售预计"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast
-msgid "stock.sale.forecast"
-msgstr "stock.sale.forecast"
-
-#. module: stock_planning
-#: field:stock.planning,to_procure:0
-msgid "Planned In"
-msgstr "计划入库"
-
-#. module: stock_planning
-#: field:stock.planning,stock_simulation:0
-msgid "Stock Simulation"
-msgstr "库存模拟"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning_createlines
-msgid "stock.planning.createlines"
-msgstr "stock.planning.createlines"
-
-#. module: stock_planning
-#: help:stock.planning,incoming_before:0
-msgid ""
-"Confirmed incoming in periods before calculated (Including Already In). "
-"Between start date of current period and one day before start of calculated "
-"period."
-msgstr "确认计算周期前即将入库(已包括入库).在本期开始日期和在计算周期开始前的某天."
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Search  Sales Forecast"
-msgstr "搜索销售预计"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_user:0
-msgid "This User Period5"
-msgstr "用户周期 5"
-
-#. module: stock_planning
-#: help:stock.planning,history:0
-msgid "History of procurement or internal supply of this planning line."
-msgstr "需求日志或计划明细里的内部供求"
-
-#. module: stock_planning
-#: help:stock.planning,company_forecast:0
-msgid ""
-"All sales forecasts for whole company (for all Warehouses) of selected "
-"Product during selected Period."
-msgstr "公司在选定的周期其指定产品的所有的预计销售(所有仓库)."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_user:0
-msgid "This User Period1"
-msgstr "用户周期 1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_user:0
-msgid "This User Period3"
-msgstr "用户周期 3"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock Planning"
-msgstr "库存计划"
-
-#. module: stock_planning
-#: field:stock.planning,minimum_op:0
-msgid "Minimum Rule"
-msgstr "最少库存规则"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procure Incoming Left"
-msgstr "接收(即将入库)入库"
-
-#. module: stock_planning
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Create"
-msgstr "创建"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_manual
-#: view:stock.planning:0
-msgid "Master Procurement Schedule"
-msgstr "主需求日程表"
-
-#. module: stock_planning
-#: field:stock.planning,line_time:0
-msgid "Past/Future"
-msgstr "过去/未来"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: field:stock.period,state:0
-#: field:stock.planning,state:0
-#: field:stock.sale.forecast,state:0
-msgid "State"
-msgstr "状态"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category of products which created forecasts will concern."
-msgstr "关注对这产品分类创建的产品预计"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_period
-msgid "stock period"
-msgstr "库存周期"
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
-msgid "stock.sale.forecast.createlines"
-msgstr "stock.sale.forecast.createlines"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_id:0
-#: field:stock.planning.createlines,warehouse_id:0
-#: field:stock.sale.forecast,warehouse_id:0
-#: field:stock.sale.forecast.createlines,warehouse_id:0
-msgid "Warehouse"
-msgstr "仓库"
-
-#. module: stock_planning
-#: help:stock.planning,stock_simulation:0
-msgid ""
-"Stock simulation at the end of selected Period.\n"
-" For current period it is: \n"
-"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
-"For periods ahead it is: \n"
-"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
-"In."
-msgstr ""
-"在选定周期结束时库存的模拟\n"
-"    对本期它是: 初始库存 - 已出库 + 已进库 - 预计出库 + 即将入库\n"
-"    对未来周期它是: 初始库存 - 之前的计划出库 +之前的即将入库 - 计划出库 + 计划入库"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,analyze_company:0
-msgid "Check this box to see the sales for whole company."
-msgstr "勾选,查看公司的销售"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Department :"
-msgstr "每个部门:"
-
-#. module: stock_planning
-#: field:stock.planning,incoming_before:0
-msgid "Incoming Before"
-msgstr "之前的入库"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:641
-#, python-format
-msgid ""
-" Procurement created by MPS for user: %s   Creation Date: %s                 "
-"                        \n"
-" For period: %s                                         \n"
-" according to state:                                         \n"
-" Warehouse Forecast: %s                                         \n"
-" Initial Stock: %s                                         \n"
-" Planned Out: %s    Planned In: %s                                         \n"
-" Already Out: %s    Already In: %s                                         \n"
-" Confirmed Out: %s    Confirmed In: %s                                       "
-"  \n"
-" Planned Out Before: %s    Confirmed In Before: %s                           "
-"              \n"
-" Expected Out: %s    Incoming Left: %s                                       "
-"  \n"
-" Stock Simulation: %s    Minimum stock: %s"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:626
-#: code:addons/stock_planning/stock_planning.py:670
-#: code:addons/stock_planning/stock_planning.py:672
-#: code:addons/stock_planning/stock_planning.py:674
-#: code:addons/stock_planning/wizard/stock_planning_createlines.py:73
-#: code:addons/stock_planning/wizard/stock_planning_forecast.py:60
-#, python-format
-msgid "Error !"
-msgstr "错误！"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_user_id:0
-msgid "This User"
-msgstr "该用户"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecasts"
-msgstr "预计"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Supply from Another Warehouse"
-msgstr "从其它仓库提供"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculate Planning"
-msgstr "计算计划"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Invalid action !"
-msgstr "无效的动作！"
-
-#. module: stock_planning
-#: help:stock.planning,stock_start:0
-msgid "Stock quantity one day before current period."
-msgstr "在本期前一天的库存数量."
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Procurement history"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units from default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Create Weekly Periods"
-msgstr "创建周周期"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_period_form
-msgid ""
-"Stock periods are used for stock planning. Stock periods are independent of "
-"account periods. You can use wizard for creating periods and review them "
-"here."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Calculated Period Simulation"
-msgstr "计算出的周期模拟"
-
-#. module: stock_planning
-#: view:stock.period.createlines:0
-msgid "Cancel"
-msgstr "取消"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_user:0
-msgid "This User Period4"
-msgstr "用户周期 4"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Stock and Sales Period"
-msgstr "库存和销售周期"
-
-#. module: stock_planning
-#: field:stock.planning,company_forecast:0
-msgid "Company Forecast"
-msgstr "公司预计"
-
-#. module: stock_planning
-#: help:stock.planning,minimum_op:0
-msgid "Minimum quantity set in Minimum Stock Rules for this Warehouse"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per User :"
-msgstr "每个用户:"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,warehouse_id:0
-msgid "Warehouse which planning will concern."
-msgstr "关注的仓库计划."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,user_id:0
-msgid "Created/Validated by"
-msgstr "创建/审核"
-
-#. module: stock_planning
-#: field:stock.planning,warehouse_forecast:0
-msgid "Warehouse Forecast"
-msgstr "仓库预计"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:674
-#, python-format
-msgid ""
-"You must specify a Source Warehouse different than calculated (destination) "
-"Warehouse !"
-msgstr "您必须指定源仓库不同于计算的(目标)仓库!"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:146
-#, python-format
-msgid "Cannot delete a validated sales forecast!"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_company:0
-msgid "This Company Period5"
-msgstr "公司周期 5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uom:0
-msgid "Product UoM"
-msgstr "产品计量单位"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_company:0
-msgid "This Company Period1"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_company:0
-msgid "This Company Period2"
-msgstr "公司周期 2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_company:0
-msgid "This Company Period3"
-msgstr "公司周期 3"
-
-#. module: stock_planning
-#: field:stock.period,date_start:0
-#: field:stock.period.createlines,date_start:0
-msgid "Start Date"
-msgstr "开始日期"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_user:0
-msgid "This User Period2"
-msgstr "用户周期 2"
-
-#. module: stock_planning
-#: field:stock.planning,confirmed_forecasts_only:0
-msgid "Validated Forecasts"
-msgstr "审核预计"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,product_categ_id:0
-msgid ""
-"Planning will be created for products from Product Category selected by this "
-"field. This field is ignored when you check \"All Forecasted Product\" box."
-msgstr "计划将在选定的产品分类里创建.当您勾选\"所有产品预计\"这字段将被忽略."
-
-#. module: stock_planning
-#: field:stock.planning,planned_outgoing:0
-msgid "Planned Out"
-msgstr "计划出仓"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_qty:0
-msgid "Forecast Quantity"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Forecast"
-msgstr "预计"
-
-#. module: stock_planning
-#: selection:stock.period,state:0
-#: selection:stock.planning,state:0
-#: selection:stock.sale.forecast,state:0
-msgid "Draft"
-msgstr "草稿"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed"
-msgstr "已关闭"
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: view:stock.sale.forecast:0
-msgid "Warehouse "
-msgstr "仓库 "
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_uom:0
-msgid ""
-"Unit of Measure used to show the quantities of stock calculation.You can use "
-"units form default category or from second category (UoS category)."
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Planning and Situation for Calculated Period"
-msgstr "计算周期的计划和状况"
-
-#. module: stock_planning
-#: help:stock.planning,planned_outgoing:0
-msgid ""
-"Enter planned outgoing quantity from selected Warehouse during the selected "
-"Period of selected Product. To plan this value look at Confirmed Out or "
-"Sales Forecasts. This value should be equal or greater than Confirmed Out."
-msgstr "在选择的产品选定的周期内输入指定仓库的计划出库数量.计划值看作确认的出库或销售预计.该值应大于或等于确认的出库."
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Internal Supply"
-msgstr "内部提供"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:724
-#, python-format
-msgid "%s Pick List %s (%s,  %s) %s %s \n"
-msgstr "%s 包装列表 %s (%s, %s) %s %s \n"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
-msgid "Create Sales Forecasts"
-msgstr "创建销售预计"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_id:0
-msgid "Period4"
-msgstr "周期 4"
-
-#. module: stock_planning
-#: field:stock.period,name:0
-#: field:stock.period.createlines,name:0
-msgid "Period Name"
-msgstr "周期名称"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_id:0
-msgid "Period2"
-msgstr "周期 2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_id:0
-msgid "Period3"
-msgstr "周期 3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_id:0
-msgid "Period1"
-msgstr "周期 1"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_planning_createlines_form
-msgid ""
-"This wizard helps create MPS planning lines for a given selected period and "
-"warehouse, so you don't have to create them one by one. The wizard doesn't "
-"duplicate lines if they already exist for this selection."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,outgoing:0
-msgid "Confirmed Out"
-msgstr "已确认的出库"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
-#: view:stock.planning.createlines:0
-msgid "Create Stock Planning Lines"
-msgstr "创建库存计划明细"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "General Info"
-msgstr "一般信息"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
-msgid "Sales Forecast"
-msgstr "销售预计"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
-msgid "This Warehouse Period1"
-msgstr "仓库周期 1"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Sales History"
-msgstr "销售日志"
-
-#. module: stock_planning
-#: field:stock.planning,supply_warehouse_id:0
-msgid "Source Warehouse"
-msgstr "源仓库"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_qty:0
-msgid "Forecast Product quantity."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_supply_location:0
-msgid "Stock Supply Location"
-msgstr "库存存货库位"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_stop:0
-msgid "Ending date for planning period."
-msgstr "计划周期的结束日期."
-
-#. module: stock_planning
-#: help:stock.planning.createlines,forecasted_products:0
-msgid ""
-"Check this box to create planning for all products having any forecast for "
-"selected Warehouse and Period. Product Category field will be ignored."
-msgstr "勾选这选项将为选定的仓库和周期计划所有产品的预计.产品分类字段将被忽略."
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:632
-#: code:addons/stock_planning/stock_planning.py:678
-#: code:addons/stock_planning/stock_planning.py:702
-#, python-format
-msgid "MPS(%s) %s"
-msgstr "主生产计划(%s) %s"
-
-#. module: stock_planning
-#: field:stock.planning,already_in:0
-msgid "Already In"
-msgstr "已入库"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom_categ:0
-#: field:stock.planning,product_uos_categ:0
-#: field:stock.sale.forecast,product_uom_categ:0
-msgid "Product UoM Category"
-msgstr "产品计量单位类别"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_sale_forecast_form
-msgid ""
-"This quantity sales forecast is an indication for Stock Planner to make "
-"procurement manually or to complement automatic procurement. You can use "
-"manual procurement with this forecast when some periods are exceptional for "
-"usual minimum stock rules."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_view_stock_planning_form
-msgid ""
-"The Master Procurement Schedule can be the main driver for warehouse "
-"replenishment, or can complement the automatic MRP scheduling (minimum stock "
-"rules, etc.).\n"
-"Each MPS line gives you a pre-computed overview of the incoming and outgoing "
-"quantities of a given product for a given Stock Period in a given Warehouse, "
-"based on the current and future stock levels,\n"
-"as well as the planned stock moves. The forecast quantities can be altered "
-"manually, and when satisfied with resulting (simulated) Stock quantity, you "
-"can trigger the procurement of what is missing to reach your desired "
-"quantities"
-msgstr ""
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:685
-#, python-format
-msgid ""
-"Pick created from MPS by user: %s   Creation Date: %s                        "
-"             \n"
-"For period: %s   according to state:                                     \n"
-" Warehouse Forecast: %s                                     \n"
-" Initial Stock: %s                                     \n"
-" Planned Out: %s  Planned In: %s                                     \n"
-" Already Out: %s  Already In: %s                                     \n"
-" Confirmed Out: %s   Confirmed In: %s                                     \n"
-" Planned Out Before: %s   Confirmed In Before: %s                            "
-"         \n"
-" Expected Out: %s   Incoming Left: %s                                     \n"
-" Stock Simulation: %s   Minimum stock: %s "
-msgstr ""
-"用户: %s 主生产计划创建的包装 . 创建日期 : %s .\n"
-"周期: %s 的状态:\n"
-"仓库预计: %s\n"
-"初始库存: %s\n"
-"计划出库: %s , 计划入库: %s .\n"
-"已出库: %s , 已入库: %s .\n"
-"确认出库: %s , 确认入库: %s .\n"
-"计划前出库: %s , 计划前入库: %s .\n"
-"预计出库: %s , 即将入库: %s .\n"
-"库存模拟: %s , 最少库存: %s . "
-
-#. module: stock_planning
-#: field:stock.planning,period_id:0
-#: field:stock.planning.createlines,period_id:0
-#: field:stock.sale.forecast,period_id:0
-#: field:stock.sale.forecast.createlines,period_id:0
-msgid "Period"
-msgstr "周期"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_uos_categ:0
-msgid "Product UoS Category"
-msgstr "产品销售单位类别"
-
-#. module: stock_planning
-#: field:stock.planning,active_uom:0
-#: field:stock.sale.forecast,active_uom:0
-msgid "Active UoM"
-msgstr "有效的计量单位"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Search Stock Planning"
-msgstr "查询库存计划"
-
-#. module: stock_planning
-#: field:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy Last Forecast"
-msgstr "复制最近预计"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,product_id:0
-msgid "Shows which product this forecast concerns."
-msgstr "显示关注的哪个产品的预计"
-
-#. module: stock_planning
-#: selection:stock.planning,state:0
-msgid "Done"
-msgstr "完成"
-
-#. module: stock_planning
-#: field:stock.period.createlines,period_ids:0
-msgid "Periods"
-msgstr "周期"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
-msgid "Create Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-#: view:stock.planning.createlines:0
-#: view:stock.sale.forecast.createlines:0
-msgid "Close"
-msgstr "结束"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-#: selection:stock.sale.forecast,state:0
-msgid "Validated"
-msgstr "已审核"
-
-#. module: stock_planning
-#: view:stock.period:0
-#: selection:stock.period,state:0
-msgid "Open"
-msgstr "开始"
-
-#. module: stock_planning
-#: help:stock.sale.forecast.createlines,copy_forecast:0
-msgid "Copy quantities from last Stock and Sale Forecast."
-msgstr "复制最近库存和销售估计的数量."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period1_per_dept:0
-msgid "This Dept Period1"
-msgstr "部门周期 1"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_dept:0
-msgid "This Dept Period3"
-msgstr "部门周期 3"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_dept:0
-msgid "This Dept Period2"
-msgstr "部门周期 2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_dept:0
-msgid "This Dept Period5"
-msgstr "部门周期 5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_dept:0
-msgid "This Dept Period4"
-msgstr "部门周期 4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
-msgid "This Warehouse Period2"
-msgstr "仓库周期 2"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
-msgid "This Warehouse Period3"
-msgstr "仓库周期 3"
-
-#. module: stock_planning
-#: help:stock.planning,stock_supply_location:0
-msgid ""
-"Check to supply from Stock location of Supply Warehouse. If not checked "
-"supply will be made from Output location of Supply Warehouse. Used in "
-"'Supply from Another Warehouse' with Supply Warehouse."
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,create_uid:0
-msgid "Responsible"
-msgstr "负责人"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Default UOM"
-msgstr "默认计量单位"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
-msgid "This Warehouse Period4"
-msgstr "仓库周期 4"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
-msgid "This Warehouse Period5"
-msgstr "仓库周期 5"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Current"
-msgstr "当前的"
-
-#. module: stock_planning
-#: help:stock.planning,supply_warehouse_id:0
-msgid ""
-"Warehouse used as source in supply pick move created by 'Supply from Another "
-"Warehouse'."
-msgstr ""
-
-#. module: stock_planning
-#: model:ir.model,name:stock_planning.model_stock_planning
-msgid "stock.planning"
-msgstr "stock.planning"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,warehouse_id:0
-msgid ""
-"Shows which warehouse this forecast concerns. If during stock planning you "
-"will need sales forecast for all warehouses choose any warehouse now."
-msgstr "显示关注的仓库的预计.如果在库存计划期间,您将需要在所有的仓库中选择一个做销售预计"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:661
-#, python-format
-msgid "%s Procurement (%s,  %s) %s %s \n"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyze_company:0
-msgid "Per Company"
-msgstr "每个公司"
-
-#. module: stock_planning
-#: help:stock.planning,to_procure:0
-msgid ""
-"Enter quantity which (by your plan) should come in. Change this value and "
-"observe Stock simulation. This value should be equal or greater than "
-"Confirmed In."
-msgstr "输入数量(您的计划)入库.修改该值和观察库存模拟.该值将大于等于确认的入库."
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period4_per_company:0
-msgid "This Company Period4"
-msgstr "公司周期 4"
-
-#. module: stock_planning
-#: help:stock.planning.createlines,period_id:0
-msgid "Period which planning will concern."
-msgstr "关注周期的计划"
-
-#. module: stock_planning
-#: field:stock.planning,already_out:0
-msgid "Already Out"
-msgstr "已出库"
-
-#. module: stock_planning
-#: help:stock.planning,product_id:0
-msgid "Product which this planning is created for."
-msgstr "创建产品的计划"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Per Warehouse :"
-msgstr "每个仓库:"
-
-#. module: stock_planning
-#: field:stock.planning,history:0
-msgid "Procurement History"
-msgstr "需求日志"
-
-#. module: stock_planning
-#: help:stock.period.createlines,date_start:0
-msgid "Starting date for planning period."
-msgstr "计划周期的开始日期."
-
-#. module: stock_planning
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
-#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period
-#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
-#: view:stock.period:0
-#: view:stock.period.createlines:0
-msgid "Stock Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "Stock"
-msgstr "库存"
-
-#. module: stock_planning
-#: help:stock.planning,incoming:0
-msgid "Quantity of all confirmed incoming moves in calculated Period."
-msgstr "在计算周期里已确认入库的数量."
-
-#. module: stock_planning
-#: field:stock.period,date_stop:0
-#: field:stock.period.createlines,date_stop:0
-msgid "End Date"
-msgstr "结束日期"
-
-#. module: stock_planning
-#: view:stock.planning:0
-msgid "No Requisition"
-msgstr "没请求"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,name:0
-msgid "Name"
-msgstr "名称"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,period_id:0
-msgid "Shows which period this forecast concerns."
-msgstr "显示关注周期的预计"
-
-#. module: stock_planning
-#: field:stock.planning,product_uom:0
-msgid "UoM"
-msgstr "计量单位"
-
-#. module: stock_planning
-#: view:stock.period:0
-msgid "Closed Periods"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.planning:0
-#: field:stock.planning,product_id:0
-#: view:stock.sale.forecast:0
-#: field:stock.sale.forecast,product_id:0
-msgid "Product"
-msgstr "产品"
-
-#. module: stock_planning
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
-#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
-#: view:stock.sale.forecast:0
-msgid "Sales Forecasts"
-msgstr "销售预计"
-
-#. module: stock_planning
-#: field:stock.planning.createlines,product_categ_id:0
-#: field:stock.sale.forecast.createlines,product_categ_id:0
-msgid "Product Category"
-msgstr "产品分类"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:672
-#, python-format
-msgid "You must specify a Source Warehouse !"
-msgstr "您必须要指定源仓库"
-
-#. module: stock_planning
-#: field:stock.planning,procure_to_stock:0
-msgid "Procure To Stock Location"
-msgstr "库存库位的产品"
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Approve"
-msgstr "审批"
-
-#. module: stock_planning
-#: help:stock.planning,period_id:0
-msgid ""
-"Period for this planning. Requisition will be created for beginning of the "
-"period."
-msgstr "这计划的周期.在周期开始创建"
-
-#. module: stock_planning
-#: code:addons/stock_planning/stock_planning.py:631
-#, python-format
-msgid "MPS planning for %s"
-msgstr ""
-
-#. module: stock_planning
-#: field:stock.planning,stock_start:0
-msgid "Initial Stock"
-msgstr "初始库存"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,product_amt:0
-msgid "Product Amount"
-msgstr "产品金额"
-
-#. module: stock_planning
-#: help:stock.planning,confirmed_forecasts_only:0
-msgid ""
-"Check to take validated forecasts only. If not checked system takes "
-"validated and draft forecasts."
-msgstr "选择要去审核的预计.如果不选定系统去审核和对预计做草稿"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_period5_id:0
-msgid "Period5"
-msgstr "周期 5"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_warehouse_id:0
-msgid "This Warehouse"
-msgstr "仓库"
-
-#. module: stock_planning
-#: help:stock.sale.forecast,user_id:0
-msgid "Shows who created this forecast, or who validated."
-msgstr "显示谁创建这预计或谁去审核"
-
-#. module: stock_planning
-#: field:stock.sale.forecast,analyzed_team_id:0
-msgid "Sales Team"
-msgstr ""
-
-#. module: stock_planning
-#: help:stock.planning,incoming_left:0
-msgid ""
-"Quantity left to Planned incoming quantity. This is calculated difference "
-"between Planned In and Confirmed In. For current period Already In is also "
-"calculated. This value is used to create procurement for lacking quantity."
-msgstr "即将入库的数量是在计划入库和确认入库间的差,该值用于创建需求缺少的数量."
-
-#. module: stock_planning
-#: help:stock.planning,outgoing_left:0
-msgid ""
-"Quantity expected to go out in selected period besides Confirmed Out. As a "
-"difference between Planned Out and Confirmed Out. For current period Already "
-"Out is also calculated"
-msgstr ""
-
-#. module: stock_planning
-#: view:stock.sale.forecast:0
-msgid "Calculate Sales History"
-msgstr "计算销售日志"
-
-#. module: stock_planning
-#: model:ir.actions.act_window,help:stock_planning.action_stock_sale_forecast_createlines_form
-msgid ""
-"This wizard helps create many forecast lines at once. After creating them "
-"you only have to fill in the forecast quantities. The wizard doesn't "
-"duplicate the line when another one exist for the same selection."
-msgstr ""
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Initial Stock: "
-#~ msgstr ""
-#~ "\n"
-#~ " 初始仓库: "
-
-#~ msgid "Requisition history"
-#~ msgstr "请求日志"
-
-#~ msgid ""
-#~ "Warehouse used as source in supply pick move created by 'Supply from Another "
-#~ "Warhouse'."
-#~ msgstr "仓库作为调拨的起点."
-
-#~ msgid "Create Stock and Sales Periods"
-#~ msgstr "创建库存和销售周期"
-
-#~ msgid "This Department"
-#~ msgstr "这部门"
-
-#, python-format
-#~ msgid "  Creation Date: "
-#~ msgstr "  创建日期: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Confirmed Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " 确认出库: "
-
-#~ msgid "Creates planning lines for selected period and warehouse."
-#~ msgstr "选定周期和仓库创建计划明细."
-
-#~ msgid "Note: Doesn't duplicate existing lines created by you."
-#~ msgstr "注: 您不能重复现有的明细."
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Already Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " 已出库: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Expected Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " 预计出仓 : "
-
-#, python-format
-#~ msgid "    Already In: "
-#~ msgstr "    已进库: "
-
-#, python-format
-#~ msgid "Requisition ("
-#~ msgstr "请求("
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out: "
-#~ msgstr ""
-#~ "\n"
-#~ " 计划出库: "
-
-#~ msgid "Creates forecast lines for selected warehouse and period."
-#~ msgstr "对选定的仓库和周期创建预计明细."
-
-#, python-format
-#~ msgid "    Minimum stock: "
-#~ msgstr "    最少库存: "
-
-#~ msgid "Sales history"
-#~ msgstr "销售日志"
-
-#~ msgid "Forecasted quantity."
-#~ msgstr "预计数量"
-
-#~ msgid "Product Quantity"
-#~ msgstr "产品数量"
-
-#, python-format
-#~ msgid " according to state:"
-#~ msgstr " 根据状态:"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Warehouse Forecast: "
-#~ msgstr ""
-#~ "\n"
-#~ " 仓库预计: "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Stock Simulation: "
-#~ msgstr ""
-#~ "\n"
-#~ " 仓库模拟: "
-
-#, python-format
-#~ msgid "    Planned In: "
-#~ msgstr "    计划入库 "
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ "For period: "
-#~ msgstr ""
-#~ "\n"
-#~ "周期: "
-
-#, python-format
-#~ msgid "MPS("
-#~ msgstr "主生产计划("
-
-#~ msgid "Stock and Sales Planning Periods"
-#~ msgstr "库存和销售计划周期"
-
-#~ msgid "Stock and Sales Periods"
-#~ msgstr "库存和销售周期"
-
-#~ msgid "This Copmany Period1"
-#~ msgstr "公司周期 1"
-
-#, python-format
-#~ msgid "    Incoming Left: "
-#~ msgstr "    即将入库 "
-
-#, python-format
-#~ msgid "Manual planning for "
-#~ msgstr "手动计划 "
-
-#, python-format
-#~ msgid "Procurement created in MPS by user: "
-#~ msgstr "在MPS(主生产计划)由用户创建需求： "
-
-#, python-format
-#~ msgid "Pick created from MPS by user: "
-#~ msgstr "在MPS(主生产计划)由用户创建的装箱单： "
-
-#~ msgid ""
-#~ "\n"
-#~ "This module is based on original OpenERP SA module stock_planning version "
-#~ "1.0 of the same name Master Procurement Schedule.\n"
-#~ "\n"
-#~ "Purpose of MPS is to allow create a manual procurement (requisition) apart "
-#~ "of MRP scheduler (which works automatically on minimum stock rules).\n"
-#~ "\n"
-#~ "Terms used in the module:\n"
-#~ "- Stock and Sales Period - is the time (between Start Date and End Date) for "
-#~ "which you plan Stock and Sales Forecast and make Procurement Planning. \n"
-#~ "- Stock and Sales Forecast - is the quantity of products you plan to sell in "
-#~ "the Period.\n"
-#~ "- Stock Planning - is the quantity of products you plan to purchase or "
-#~ "produce for the Period.\n"
-#~ "\n"
-#~ "Because we have another module sale_forecast which uses terms \"Sales "
-#~ "Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
-#~ "Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
-#~ "values. \n"
-#~ "\n"
-#~ "Activity with this module is divided to three steps:\n"
-#~ "- Creating Periods. Mandatory step.\n"
-#~ "- Creating Sale Forecasts and entering quantities to them. Optional step but "
-#~ "useful for further planning.\n"
-#~ "- Creating Planning lines, entering quantities to them and making "
-#~ "Procurement. Making procurement is the final step for the Period.\n"
-#~ "\n"
-#~ "Periods\n"
-#~ "=======\n"
-#~ "You have two menu items for Periods in \"Sales Management - Configuration\". "
-#~ "There are:\n"
-#~ "- \"Create Sales Periods\" - Which automates creating daily, weekly or "
-#~ "monthly periods.\n"
-#~ "- \"Stock and sales Periods\" - Which allows to create any type of periods, "
-#~ "change the dates and change the State of period.\n"
-#~ "\n"
-#~ "Creating periods is the first step you have to do to use modules features. "
-#~ "You can create custom periods using \"New\" button in \"Stock and Sales "
-#~ "Periods\" form or view but it is recommended to use automating tool.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- These periods (officially Stock and Sales Periods) are separated of "
-#~ "Financial or other periods in the system.\n"
-#~ "- Periods are not assigned to companies (when you use multicompany feature "
-#~ "at all). Module suppose that you use the same periods across companies. If "
-#~ "you wish to use different periods for different companies define them as you "
-#~ "wish (they can overlap). Later on in this text will be indications how to "
-#~ "use such periods.\n"
-#~ "- When periods are created automatically their start and finish dates are "
-#~ "with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
-#~ "periods they will have start date 31.01.2010 00:00:00 and end date "
-#~ "31.01.2010 23:59:00. It works only in automatic creation of periods. When "
-#~ "you create periods manually you have to take care about hours because you "
-#~ "can have incorrect values form sales or stock. \n"
-#~ "- If you use overlapping periods for the same product, warehouse and company "
-#~ "results can be unpredictable.\n"
-#~ "- If current date doesn't belong to any period or you have holes between "
-#~ "periods results can be unpredictable.\n"
-#~ "\n"
-#~ "Sales Forecasts\n"
-#~ "===============\n"
-#~ "You have few menus for Sales forecast in \"Sales Management - Sales "
-#~ "Forecasts\".\n"
-#~ "- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
-#~ "forecasts lines according to some parameters.\n"
-#~ "- \"Sales Forecasts\" - few menus for working with forecasts lists and "
-#~ "forms.\n"
-#~ "\n"
-#~ "Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
-#~ "products from selected Category, for selected Period and for selected "
-#~ "Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
-#~ "settings of period before this one to created one.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- This tool doesn't create lines, if relevant lines (for the same Product, "
-#~ "Period, Warehouse and validated or created by you) already exists. If you "
-#~ "wish to create another forecast, if relevant lines exists you have to do it "
-#~ "manually using menus described bellow.\n"
-#~ "- When created lines are validated by someone else you can use this tool to "
-#~ "create another lines for the same Period, Product and Warehouse. \n"
-#~ "- When you choose \"Copy Last Forecast\" created line takes quantity and "
-#~ "some settings from your (validated by you or created by you if not validated "
-#~ "yet) forecast which is for last period before period of created forecast. If "
-#~ "there are few your forecasts for period before this one (it is possible) "
-#~ "system takes one of them (no rule which of them).\n"
-#~ "\n"
-#~ "\n"
-#~ "Menus \"Sales Forecasts\"\n"
-#~ "On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
-#~ "\"Product Quantity\". Further calculation can work for draft forecasts. But "
-#~ "validation can save your data against any accidental changes. You can click "
-#~ "\"Validate\" button but it is not mandatory.\n"
-#~ "\n"
-#~ "Instead of forecast quantity you can enter amount of forecast sales in field "
-#~ "\"Product Amount\". System will count quantity from amount according to Sale "
-#~ "price of the Product.\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "To find proper value for Sale Forecast you can use \"Sales History\" table "
-#~ "for this product. You have to enter parameters to the top and left of this "
-#~ "table and system will count sale quantities according to these parameters. "
-#~ "So you can select fe. your department (at the top) then (to the left): last "
-#~ "period, period before last and period year ago.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "\n"
-#~ "\n"
-#~ "Procurement Planning\n"
-#~ "====================\n"
-#~ "Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
-#~ "- \"Create Stock Planning Lines\" - allows you to automate creating planning "
-#~ "lines according to some parameters.\n"
-#~ "- \"Master Procurement Scheduler\" - is the most important menu of the "
-#~ "module which allows to create procurement.\n"
-#~ "\n"
-#~ "As Sales forecast is phase of planning sales. The Procurement Planning "
-#~ "(Planning) is the phase of scheduling Purchasing or Producing. You can "
-#~ "create Procurement Planning quickly using tool from menu \"Create Stock "
-#~ "Planning Lines\", then you can review created planning and make procurement "
-#~ "using menu \"Master Procurement Schedule\".\n"
-#~ "\n"
-#~ "Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
-#~ "lines for products from selected Category, for selected Period, and for "
-#~ "selected Warehouse. When you check option \"All Products with Forecast\" "
-#~ "system creates lines for all products having forecast for selected Period "
-#~ "and Warehouse. Selected Category will be ignored in this case.\n"
-#~ "\n"
-#~ "Under menu \"Master Procurement Scheduler\" you can generally change the "
-#~ "values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
-#~ "Simulation\" and decide if this value would be accurate for end of the "
-#~ "Period. \n"
-#~ "\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
-#~ "all forecasts for Period and Warehouse. But your planning can be based on "
-#~ "any other information you have. It is not necessary to have any forecast. \n"
-#~ "\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
-#~ "is the quantity to be procured to make stock as indicated in \"Stock "
-#~ "Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
-#~ "quantity to minimum stock rules visible on the form. But you can plan "
-#~ "different quantity than in Minimum Stock Rules. Calculation is made for "
-#~ "whole Warehouse by default. But if you want to see values for Stock location "
-#~ "of calculated warehouse you can use check box \"Stock Location Only\".\n"
-#~ "\n"
-#~ "If after few tries you decide that you found correct quantities for "
-#~ "\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
-#~ "stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
-#~ "Left\" button to procure quantity of field \"Incoming Left\" into the "
-#~ "Warehouse. System creates appropriate Procurement Order. You can decide if "
-#~ "procurement will be made to Stock or Input location of calculated Warehouse. "
-#~ "\n"
-#~ "\n"
-#~ "If you don't want to Produce or Buy the product but just pick calculated "
-#~ "quantity from another warehouse you can click \"Supply from Another "
-#~ "Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
-#~ "with move from selected source Warehouse to calculated Warehouse (as "
-#~ "destination). You can also decide if this pick should be done from Stock or "
-#~ "Output location of source warehouse. Destination location (Stock or Input) "
-#~ "of destination warehouse will be used as set for \"Procure Incoming Left\". "
-#~ "\n"
-#~ "\n"
-#~ "To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
-#~ "\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
-#~ "have to click button \"Calculate Planning\".\n"
-#~ "\n"
-#~ "All values on the form are expressed in unit of measure selected on form. "
-#~ "You can select one of unit of measure from default category or from second "
-#~ "category. When you change unit of measure the quanities will be recalculated "
-#~ "according to new UoM: editable values (blue fields) immediately, non edited "
-#~ "fields after clicking of \"Calculate Planning\" button.\n"
-#~ "\n"
-#~ "How Stock Simulation field is calculated:\n"
-#~ "Generally Stock Simulation shows the stock for end of the calculated period "
-#~ "according to some planned or confirmed stock moves. Calculation always "
-#~ "starts with quantity of real stock of beginning of current period. Then "
-#~ "calculation adds or subtracts quantities of calculated period or periods "
-#~ "before calculated.\n"
-#~ "When you are in the same period (current period is the same as calculated) "
-#~ "Stock Simulation is calculated as follows:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out \n"
-#~ "\t+ Planned In\n"
-#~ "\n"
-#~ "When you calculate period next to current:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period\n"
-#~ "\t- Planned Out of current Period \n"
-#~ "\t+ Confirmed In of current Period  (incl. Already In)\n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period .\n"
-#~ "\n"
-#~ "As you see calculated Period is taken the same way like in case above. But "
-#~ "calculation of current Period are made a little bit different. First you "
-#~ "should note that system takes for current Period only Confirmed In moves. It "
-#~ "means that you have to make planning and procurement for current Period "
-#~ "before this calculation (for Period next to current). \n"
-#~ "\n"
-#~ "When you calculate Period ahead:\n"
-#~ "Stock Simulation = \n"
-#~ "\tStock of beginning of current Period \n"
-#~ "\t- Sum of Planned Out of Periods before calculated \n"
-#~ "\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
-#~ "\t- Planned Out of calculated Period \n"
-#~ "\t+ Planned In of calculated Period.\n"
-#~ "\n"
-#~ "Periods before calculated means periods starting from current till period "
-#~ "before calculated.\n"
-#~ "\n"
-#~ "Remarks:\n"
-#~ "- Remember to make planning for all periods before calculated because "
-#~ "omitting these quantities and procurements can cause wrong suggestions for "
-#~ "procurements few periods ahead.\n"
-#~ "- If you made planning few periods ahead and you find that real Confirmed "
-#~ "Out is bigger than Planned Out in some periods before you can repeat "
-#~ "Planning and make another procurement. You should do it in the same planning "
-#~ "line. If you create another planning line the suggestions can be wrong.\n"
-#~ "- When you wish to work with different periods for some part of products "
-#~ "define two kinds of periods (fe. Weekly and Monthly) and use them for "
-#~ "different products. Example: If you use always Weekly periods for Products "
-#~ "A, and Monthly periods for Products B your all calculations will work "
-#~ "correctly. You can also use different kind of periods for the same products "
-#~ "from different warehouse or companies. But you cannot use overlapping "
-#~ "periods for the same product, warehouse and company because results can be "
-#~ "unpredictable. The same apply to Forecasts lines.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "这模块的主要目标：在MPS(主生产计划)外能手动生成采购(正规请求)，MPS是根据最少库存规则来自动工作。\n"
-#~ "模块里的术语：\n"
-#~ "    仓库和销售周期：您库存计划，销售预测和制造需求计划(MRP)的开始日期与结束日期之间时间。\n"
-#~ "    仓库和销售预测：是在周期内您计划销售产品的数量。\n"
-#~ "    仓库计划：在周期内您计划采购产品的数量。\n"
-#~ "\n"
-#~ "因为在销售预测模块也使用术语“销售预测”和“计划”但它们是金额值。所以在这模块使用“仓库和销售预测”和“仓库计划”来强调这是一个数量值。\n"
-#~ "\n"
-#~ "本模块的三个操作步骤：\n"
-#~ "    1.创建周期，必须步骤。\n"
-#~ "    2.建立销售预测并输入数量，可选步骤，但它是下一步所必须的。\n"
-#~ "    3.建立计划的明细并输入数量，这是在周期内采购或生产的数量。\n"
-
-#~ msgid ""
-#~ "Chect to make procurement to stock location of selected warehouse. If not "
-#~ "selected procurement will be made into input location of warehouse."
-#~ msgstr "选择指定仓库需求的库位,如果不选择需求将用这仓库的入库库位."
-
-#, python-format
-#~ msgid "    Confirmed In Before: "
-#~ msgstr "    之前的确认入库: "
-
-#, python-format
-#~ msgid "Pick List "
-#~ msgstr "装箱单 "
-
-#~ msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr "这仓库最小库存规则设置里的最大数量"
-
-#~ msgid ""
-#~ "Unit of Measure used to show the quanities of stock calculation.You can use "
-#~ "units form default category or from second category (UoS category)."
-#~ msgstr "计量单位用于显示库存数量,单位您可以使用默认分类或者第二分类(销售单位分类)."
-
-#~ msgid "Create periods for Stock and Sales Planning"
-#~ msgstr "创建库存和销售计划周期"
-
-#~ msgid ""
-#~ "Quantity expected to go out in selected period. As a difference between "
-#~ "Planned Out and Confirmed Out. For current period Already Out is also "
-#~ "calculated"
-#~ msgstr "在选定周期的出库预计数量.作为计划出库和确认出库的差,对本期已出库的已经计算进去."
-
-#, python-format
-#~ msgid "Cannot delete Validated Sale Forecasts !"
-#~ msgstr "不能删除已审核的销售预计!"
-
-#, python-format
-#~ msgid "    Confirmed In: "
-#~ msgstr "    已确认的入库: "
-
-#~ msgid ""
-#~ "Check to supply from Stock location of Supply Warehouse. If not checked "
-#~ "supply will be made from Output location of Supply Warehouse. Used in "
-#~ "'Supply from Another Warhouse' with Supply Warehouse."
-#~ msgstr "选择供货仓库的的库存库位.如果不选择将使用供应商仓库的出库库位作为供货地点.用在\"从其它仓库供货\"的那个供应商仓库."
-
-#~ msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
-#~ msgstr "这仓库最低库存量规则的数量"
-
-#, python-format
-#~ msgid ""
-#~ "\n"
-#~ " Planned Out Before: "
-#~ msgstr ""
-#~ "\n"
-#~ " 之前的计划出库 "
diff --git a/addons/stock_planning/security/ir.model.access.csv b/addons/stock_planning/security/ir.model.access.csv
deleted file mode 100644
index 4846c79905f..00000000000
--- a/addons/stock_planning/security/ir.model.access.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_stock_planning_manager,stock.planning manager,model_stock_planning,stock.group_stock_manager,1,0,0,0
-access_stock_planning_user,stock.planning user,model_stock_planning,stock.group_stock_user,1,1,1,1
-access_stock_sale_forecast_user,stock.sale.forecast user,model_stock_sale_forecast,base.group_sale_salesman,1,1,1,1
-access_stock_sale_forecast_manager,stock.sale.forecast manager,model_stock_sale_forecast,base.group_sale_manager,1,0,0,0
-access_stock_period_manager,stock.period manager,model_stock_period,base.group_sale_salesman,1,1,1,1
diff --git a/addons/stock_planning/security/stock_planning_security.xml b/addons/stock_planning/security/stock_planning_security.xml
deleted file mode 100644
index 62f15e005bb..00000000000
--- a/addons/stock_planning/security/stock_planning_security.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-<!-- multi -->
-     <record model="ir.rule" id="stock_planning_comp_rule">
-        <field name="name">stock_planning multi-company</field>
-        <field name="model_id" ref="model_stock_planning"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-     <record model="ir.rule" id="stock_sale_forecast_comp_rule">
-        <field name="name">stock_sale_forecast multi-company</field>
-        <field name="model_id" ref="model_stock_sale_forecast"/>
-        <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
deleted file mode 100644
index 7fcaf23045e..00000000000
--- a/addons/stock_planning/stock_planning.py
+++ /dev/null
@@ -1,747 +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 time
-from datetime import datetime
-from dateutil.relativedelta import relativedelta
-
-from osv import osv, fields
-import netsvc
-from tools.translate import _
-import logging
-import decimal_precision as dp
-
-_logger = logging.getLogger(__name__)
-
-
-def rounding(fl, round_value):
-    if not round_value:
-        return fl
-    return round(fl / round_value) * round_value
-
-# 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):
-    _name = "stock.period"
-    _description = "stock period"
-    _order = "date_start"
-    _columns = {
-        'name': fields.char('Period Name', size=64, required=True),
-        'date_start': fields.datetime('Start Date', required=True),
-        'date_stop': fields.datetime('End Date', required=True),
-        'state': fields.selection([('draft','Draft'), ('open','Open'),('close','Close')], 'Status'),
-    }
-    _defaults = {
-        'state': 'draft'
-    }
-
-    def button_open(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'open'})
-        return True
-
-    def button_close(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'close'})
-        return True
-
-stock_period()
-
-# Stock and Sales Forecast object. Previously stock_planning_sale_prevision.
-# A lot of changes in 1.1
-class stock_sale_forecast(osv.osv):
-    _name = "stock.sale.forecast"
-
-    _columns = {
-        'company_id':fields.many2one('res.company', 'Company', required=True),
-        'create_uid': fields.many2one('res.users', 'Responsible'),
-        'name': fields.char('Name', size=64, readonly=True, states={'draft': [('readonly',False)]}),
-        'user_id': fields.many2one('res.users', 'Created/Validated by',readonly=True, \
-                                        help='Shows who created this forecast, or who validated.'),
-        'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', required=True, readonly=True, states={'draft': [('readonly',False)]}, \
-                                        help='Shows which warehouse this forecast concerns. '\
-                                         '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, readonly=True, states={'draft':[('readonly',False)]}, \
-                                        help = 'Shows which period this forecast concerns.'),
-        'product_id': fields.many2one('product.product', 'Product', readonly=True, required=True, states={'draft':[('readonly',False)]}, \
-                                        help = 'Shows which product this forecast concerns.'),
-        'product_qty': fields.float('Forecast Quantity', digits_compute=dp.get_precision('Product Unit of Measure'), required=True, readonly=True, \
-                                        states={'draft':[('readonly',False)]}, help= 'Forecast Product quantity.'),
-        'product_amt': fields.float('Product Amount', readonly=True, states={'draft':[('readonly',False)]}, \
-                                        help='Forecast value which will be converted to Product Quantity according to prices.'),
-        'product_uom_categ': fields.many2one('product.uom.categ', 'Product Unit of Measure Category'),  # Invisible field for product_uom domain
-        'product_uom': fields.many2one('product.uom', 'Product Unit of Measure', required=True, readonly=True, states={'draft':[('readonly',False)]}, \
-                        help = "Unit of Measure used to show the quantities of stock calculation." \
-                        "You can use units form default category or from second category (UoS category)."),
-        'product_uos_categ' : fields.many2one('product.uom.categ', 'Product UoS Category'), # Invisible field for product_uos domain
-# Field used in onchange_uom to check what uom was before change and recalculate quantities according to old uom (active_uom) and new uom.
-        'active_uom': fields.many2one('product.uom',  string = "Active Unit of Measure"),
-        'state': fields.selection([('draft','Draft'),('validated','Validated')],'Status',readonly=True),
-        'analyzed_period1_id': fields.many2one('stock.period', 'Period1', readonly=True, states={'draft':[('readonly',False)]},),
-        'analyzed_period2_id': fields.many2one('stock.period', 'Period2', readonly=True, states={'draft':[('readonly',False)]},),
-        'analyzed_period3_id': fields.many2one('stock.period', 'Period3', readonly=True, states={'draft':[('readonly',False)]},),
-        'analyzed_period4_id': fields.many2one('stock.period', 'Period4', readonly=True, states={'draft':[('readonly',False)]},),
-        'analyzed_period5_id': fields.many2one('stock.period' , 'Period5', readonly=True, states={'draft':[('readonly',False)]},),
-        'analyzed_user_id': fields.many2one('res.users', 'This User', required=False, readonly=True, states={'draft':[('readonly',False)]},),
-        'analyzed_team_id': fields.many2one('crm.case.section', 'Sales Team', required=False, \
-                                    readonly=True, states={'draft':[('readonly',False)]},),
-        'analyzed_warehouse_id': fields.many2one('stock.warehouse' , 'This Warehouse', required=False, \
-                                    readonly=True, states={'draft':[('readonly',False)]}),
-        'analyze_company': fields.boolean('Per Company', readonly=True, states={'draft':[('readonly',False)]}, \
-                                    help = "Check this box to see the sales for whole company."),
-        'analyzed_period1_per_user': fields.float('This User Period1', readonly=True),
-        'analyzed_period2_per_user': fields.float('This User Period2', readonly=True),
-        'analyzed_period3_per_user': fields.float('This User Period3', readonly=True),
-        'analyzed_period4_per_user': fields.float('This User Period4', readonly=True),
-        'analyzed_period5_per_user': fields.float('This User Period5', readonly=True),
-        'analyzed_period1_per_dept': fields.float('This Dept Period1', readonly=True),
-        'analyzed_period2_per_dept': fields.float('This Dept Period2', readonly=True),
-        'analyzed_period3_per_dept': fields.float('This Dept Period3', readonly=True),
-        'analyzed_period4_per_dept': fields.float('This Dept Period4', readonly=True),
-        'analyzed_period5_per_dept': fields.float('This Dept Period5', readonly=True),
-        'analyzed_period1_per_warehouse': fields.float('This Warehouse Period1', readonly=True),
-        'analyzed_period2_per_warehouse': fields.float('This Warehouse Period2', readonly=True),
-        'analyzed_period3_per_warehouse': fields.float('This Warehouse Period3', readonly=True),
-        'analyzed_period4_per_warehouse': fields.float('This Warehouse Period4', readonly=True),
-        'analyzed_period5_per_warehouse': fields.float('This Warehouse Period5', readonly=True),
-        'analyzed_period1_per_company': fields.float('This Company Period1', readonly=True),
-        'analyzed_period2_per_company': fields.float('This Company Period2', readonly=True),
-        'analyzed_period3_per_company': fields.float('This Company Period3', readonly=True),
-        'analyzed_period4_per_company': fields.float('This Company Period4', readonly=True),
-        'analyzed_period5_per_company': fields.float('This Company Period5', readonly=True),
-    }
-    _defaults = {
-        'user_id': lambda obj, cr, uid, context: uid,
-        'state': 'draft',
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.sale.forecast', context=c),
-    }
-
-    def action_validate(self, cr, uid, ids, *args):
-        self.write(cr, uid, ids, {'state': 'validated','user_id': uid})
-        return True
-
-    def unlink(self, cr, uid, ids, context=None):
-        forecasts = self.read(cr, uid, ids, ['state'])
-        unlink_ids = []
-        for t in forecasts:
-            if t['state'] in ('draft'):
-                unlink_ids.append(t['id'])
-            else:
-                raise osv.except_osv(_('Invalid Action!'), _('Cannot delete a validated sales forecast.'))
-        osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
-        return True
-
-    def onchange_company(self, cr, uid, ids, company_id=False):
-        result = {}
-        if not company_id:
-            return result
-        result['warehouse_id'] = False
-        result['analyzed_user_id'] = False
-        result['analyzed_team_id'] = False
-        result['analyzed_warehouse_id'] = False
-        return {'value': result}
-
-    def product_id_change(self, cr, uid, ids, product_id=False):
-        ret = {}
-        if product_id:
-            product_rec =  self.pool.get('product.product').browse(cr, uid, product_id)
-            ret['product_uom'] = product_rec.uom_id.id
-            ret['product_uom_categ'] = product_rec.uom_id.category_id.id
-            ret['product_uos_categ'] = product_rec.uos_id and product_rec.uos_id.category_id.id or False
-            ret['active_uom'] = product_rec.uom_id.id
-        else:
-            ret['product_uom'] = False
-            ret['product_uom_categ'] = False
-            ret['product_uos_categ'] = False
-        res = {'value': ret}
-        return res
-
-    def onchange_uom(self, cr, uid, ids, product_uom=False, product_qty=0.0,
-                     active_uom=False, product_id=False):
-        ret = {}
-        if product_uom and product_id:
-            coeff_uom2def = self._to_default_uom_factor(cr, uid, product_id, active_uom, {})
-            coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, product_id, product_uom, {})
-            coeff = coeff_uom2def * coeff_def2uom
-            ret['product_qty'] = rounding(coeff * product_qty, round_value)
-            ret['active_uom'] = product_uom
-        return {'value': ret}
-
-    def product_amt_change(self, cr, uid, ids, product_amt=0.0, product_uom=False, product_id=False):
-        round_value = 1
-        qty = 0.0
-        if product_amt and product_id:
-            product = self.pool.get('product.product').browse(cr, uid, product_id)
-            coeff_def2uom = 1
-            if (product_uom != product.uom_id.id):
-                coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, product_id, product_uom, {})
-            qty = rounding(coeff_def2uom * product_amt/(product.product_tmpl_id.list_price), round_value)
-        res = {'value': {'product_qty': qty}}
-        return res
-
-    def _to_default_uom_factor(self, cr, uid, product_id, uom_id, context=None):
-        uom_obj = self.pool.get('product.uom')
-        product_obj = self.pool.get('product.product')
-        product = product_obj.browse(cr, uid, product_id, context=context)
-        uom = uom_obj.browse(cr, uid, uom_id, context=context)
-        coef = uom.factor
-        if uom.category_id.id <> product.uom_id.category_id.id:
-            coef = coef * product.uos_coeff
-        return product.uom_id.factor / coef
-
-    def _from_default_uom_factor(self, cr, uid, product_id, uom_id, context=None):
-        uom_obj = self.pool.get('product.uom')
-        product_obj = self.pool.get('product.product')
-        product = product_obj.browse(cr, uid, product_id, context=context)
-        uom = uom_obj.browse(cr, uid, uom_id, context=context)
-        res = uom.factor
-        if uom.category_id.id <> product.uom_id.category_id.id:
-            res = res * product.uos_coeff
-        return res / product.uom_id.factor, uom.rounding
-
-    def _sales_per_users(self, cr, uid, so, so_line, company, users):
-        cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \
-                   "WHERE (sol.id IN %s) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN %s) AND (s.company_id=%s) " \
-                    "AND (s.user_id IN %s) " ,(tuple(so_line), tuple(so), company, tuple(users)))
-        ret = cr.fetchone()[0] or 0.0
-        return ret
-
-    def _sales_per_warehouse(self, cr, uid, so, so_line, company, shops):
-        cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \
-                   "WHERE (sol.id IN %s) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN %s)AND (s.company_id=%s) " \
-                    "AND (s.shop_id IN %s)" ,(tuple(so_line), tuple(so), company, tuple(shops)))
-        ret = cr.fetchone()[0] or 0.0
-        return ret
-
-    def _sales_per_company(self, cr, uid, so, so_line, company):
-        cr.execute("SELECT sum(sol.product_uom_qty) FROM sale_order_line AS sol LEFT JOIN sale_order AS s ON (s.id = sol.order_id) " \
-                   "WHERE (sol.id IN %s) AND (s.state NOT IN (\'draft\',\'cancel\')) AND (s.id IN %s) AND (s.company_id=%s)", (tuple(so_line), tuple(so), company))
-        ret = cr.fetchone()[0] or 0.0
-        return ret
-
-    def calculate_sales_history(self, cr, uid, ids, context, *args):
-        sales = [[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],]
-        for obj in self.browse(cr, uid, ids, context=context):
-            periods = obj.analyzed_period1_id, obj.analyzed_period2_id, obj.analyzed_period3_id, obj.analyzed_period4_id, obj.analyzed_period5_id
-            so_obj = self.pool.get('sale.order')
-            so_line_obj = self.pool.get('sale.order.line')
-            so_line_product_ids = so_line_obj.search(cr, uid, [('product_id','=', obj.product_id.id)], context = context)
-            if so_line_product_ids:
-                shops = users = None
-                if obj.analyzed_warehouse_id:
-                    shops = self.pool.get('sale.shop').search(cr, uid,[('warehouse_id','=', obj.analyzed_warehouse_id.id)], context = context)
-                if obj.analyzed_team_id:
-                    users = [u.id for u in obj.analyzed_team_id.member_ids]
-                factor, _ = self._from_default_uom_factor(cr, uid, obj.product_id.id, obj.product_uom.id, context=context)
-                for i, period in enumerate(periods):
-                    if period:
-                        so_period_ids = so_obj.search(cr, uid, [('date_order','>=',period.date_start),('date_order','<=',period.date_stop) ], context = context)
-                        if so_period_ids:
-                            if obj.analyzed_user_id:
-                                sales[i][0] = self._sales_per_users(cr, uid, so_period_ids, so_line_product_ids, obj.company_id.id, [obj.analyzed_user_id.id])
-                                sales[i][0] *= factor
-                            if users:
-                                sales[i][1] = self._sales_per_users(cr, uid, so_period_ids,  so_line_product_ids, obj.company_id.id, users)
-                                sales[i][1] *= factor
-                            if shops:
-                                sales[i][2] = self._sales_per_warehouse(cr, uid, so_period_ids,  so_line_product_ids, obj.company_id.id, shops)
-                                sales[i][2] *= factor
-                            if obj.analyze_company:
-                                sales[i][3] = self._sales_per_company(cr, uid, so_period_ids, so_line_product_ids, obj.company_id.id, )
-                                sales[i][3] *= factor
-        self.write(cr, uid, ids, {
-            'analyzed_period1_per_user': sales[0][0],
-            'analyzed_period2_per_user': sales[1][0],
-            'analyzed_period3_per_user': sales[2][0],
-            'analyzed_period4_per_user': sales[3][0],
-            'analyzed_period5_per_user': sales[4][0],
-            'analyzed_period1_per_dept': sales[0][1],
-            'analyzed_period2_per_dept': sales[1][1],
-            'analyzed_period3_per_dept': sales[2][1],
-            'analyzed_period4_per_dept': sales[3][1],
-            'analyzed_period5_per_dept': sales[4][1],
-            'analyzed_period1_per_warehouse': sales[0][2],
-            'analyzed_period2_per_warehouse': sales[1][2],
-            'analyzed_period3_per_warehouse': sales[2][2],
-            'analyzed_period4_per_warehouse': sales[3][2],
-            'analyzed_period5_per_warehouse': sales[4][2],
-            'analyzed_period1_per_company': sales[0][3],
-            'analyzed_period2_per_company': sales[1][3],
-            'analyzed_period3_per_company': sales[2][3],
-            'analyzed_period4_per_company': sales[3][3],
-            'analyzed_period5_per_company': sales[4][3],
-        })
-        return True
-
-stock_sale_forecast()
-
-# The main Stock Planning object
-# A lot of changes by contributor in ver 1.1
-class stock_planning(osv.osv):
-    _name = "stock.planning"
-
-    def _get_in_out(self, cr, uid, val, date_start, date_stop, direction, done, context=None):
-        if context is None:
-            context = {}
-        product_obj = self.pool.get('product.product')
-        mapping = {'in': {
-                        'field': "incoming_qty",
-                        'adapter': lambda x: x,
-                  },
-                  'out': {
-                        'field': "outgoing_qty",
-                        'adapter': lambda x: -x,
-                  },
-        }
-        context['from_date'] = date_start
-        context['to_date'] = date_stop
-        locations = [val.warehouse_id.lot_stock_id.id,]
-        if not val.stock_only:
-            locations.extend([val.warehouse_id.lot_input_id.id, val.warehouse_id.lot_output_id.id])
-        context['location'] = locations
-        context['compute_child'] = True
-        prod_id = val.product_id.id
-        if done:
-            context.update({ 'states':('done',), 'what':(direction,) })
-            prod_ids = [prod_id]
-            st = product_obj.get_product_available(cr, uid, prod_ids, context=context)
-            res = mapping[direction]['adapter'](st.get(prod_id,0.0))
-        else:
-            product = product_obj.read(cr, uid, prod_id,[], context)
-            product_qty = product[mapping[direction]['field']]
-            res = mapping[direction]['adapter'](product_qty)
-        return res
-
-    def _get_outgoing_before(self, cr, uid, val, date_start, date_stop, context=None):
-        cr.execute("SELECT sum(planning.planned_outgoing), planning.product_uom \
-                    FROM stock_planning AS planning \
-                    LEFT JOIN stock_period AS period \
-                    ON (planning.period_id = period.id) \
-                    WHERE (period.date_stop >= %s) AND (period.date_stop <= %s) \
-                        AND (planning.product_id = %s) AND (planning.company_id = %s) \
-                    GROUP BY planning.product_uom", \
-                        (date_start, date_stop, val.product_id.id, val.company_id.id,))
-        planning_qtys = cr.fetchall()
-        res = self._to_default_uom(cr, uid, val, planning_qtys, context)
-        return res
-
-    def _to_default_uom(self, cr, uid, val, qtys, context=None):
-        res_qty = 0
-        if qtys:
-            for qty, prod_uom in qtys:
-                coef = self._to_default_uom_factor(cr, uid, val.product_id.id, prod_uom, context=context)
-                res_qty += qty * coef
-        return res_qty
-
-    def _to_form_uom(self, cr, uid, val, qtys, context=None):
-        res_qty = 0
-        if qtys:
-            for qty, prod_uom in qtys:
-                coef = self._to_default_uom_factor(cr, uid, val.product_id.id, prod_uom, context=context)
-                res_coef, round_value = self._from_default_uom_factor(cr, uid, val.product_id.id, val.product_uom.id, context=context)
-                coef = coef * res_coef
-                res_qty += rounding(qty * coef, round_value)
-        return res_qty
-
-
-    def _get_forecast(self, cr, uid, ids, field_names, arg, context=None):
-        res = {}
-        for val in self.browse(cr, uid, ids, context=context):
-            res[val.id] = {}
-            valid_part = val.confirmed_forecasts_only and " AND state = 'validated'" or ""
-            cr.execute('SELECT sum(product_qty), product_uom  \
-                        FROM stock_sale_forecast \
-                        WHERE product_id = %s AND period_id = %s AND company_id = %s '+valid_part+ \
-                       'GROUP BY product_uom', \
-                            (val.product_id.id,val.period_id.id, val.company_id.id))
-            company_qtys = cr.fetchall()
-            res[val.id]['company_forecast'] = self._to_form_uom(cr, uid, val, company_qtys, context)
-
-            cr.execute('SELECT sum(product_qty), product_uom \
-                        FROM stock_sale_forecast \
-                        WHERE product_id = %s and period_id = %s AND warehouse_id = %s ' + valid_part + \
-                       'GROUP BY product_uom', \
-                        (val.product_id.id,val.period_id.id, val.warehouse_id.id))
-            warehouse_qtys = cr.fetchall()
-            res[val.id]['warehouse_forecast'] = self._to_form_uom(cr, uid, val, warehouse_qtys, context)
-#            res[val.id]['warehouse_forecast'] = rounding(res[val.id]['warehouse_forecast'],  val.product_id.uom_id.rounding)
-        return res
-
-    def _get_stock_start(self, cr, uid, val, date, context=None):
-        if context is None:
-            context = {}
-        context['from_date'] = None
-        context['to_date'] = date
-        locations = [val.warehouse_id.lot_stock_id.id,]
-        if not val.stock_only:
-            locations.extend([val.warehouse_id.lot_input_id.id, val.warehouse_id.lot_output_id.id])
-        context['location'] = locations
-        context['compute_child'] = True
-        product_obj =  self.pool.get('product.product').read(cr, uid,val.product_id.id,[], context)
-        res = product_obj['qty_available']     # value for stock_start
-        return res
-
-    def _get_past_future(self, cr, uid, ids, field_names, arg, context=None):
-        res = {}
-        for val in self.browse(cr, uid, ids, context=context):
-            if val.period_id.date_stop < time.strftime('%Y-%m-%d'):
-                res[val.id] = 'Past'
-            else:
-                res[val.id] = 'Future'
-        return res
-
-    def _get_op(self, cr, uid, ids, field_names, arg, context=None):  # op = OrderPoint
-        res = {}
-        for val in self.browse(cr, uid, ids, context=context):
-            res[val.id]={}
-            cr.execute("SELECT product_min_qty, product_max_qty, product_uom  \
-                        FROM stock_warehouse_orderpoint \
-                        WHERE warehouse_id = %s AND product_id = %s AND active = 'TRUE'", (val.warehouse_id.id, val.product_id.id))
-            ret = cr.fetchone() or [0.0,0.0,False]
-            coef = 1
-            round_value = 1
-            if ret[2]:
-                coef = self._to_default_uom_factor(cr, uid, val.product_id.id, ret[2], context)
-                res_coef, round_value = self._from_default_uom_factor(cr, uid, val.product_id.id, val.product_uom.id, context=context)
-                coef = coef * res_coef
-            res[val.id]['minimum_op'] = rounding(ret[0]*coef, round_value)
-            res[val.id]['maximum_op'] = rounding(ret[1]*coef, round_value)
-        return res
-
-    def onchange_company(self, cr, uid, ids, company_id=False):
-        result = {}
-        if company_id:
-            result['warehouse_id'] = False
-        return {'value': result}
-
-    def onchange_uom(self, cr, uid, ids, product_uom=False, product_id=False, active_uom=False,
-                     planned_outgoing=0.0, to_procure=0.0):
-        ret = {}
-        if not product_uom:
-            return {}
-        if active_uom:
-            coeff_uom2def = self._to_default_uom_factor(cr, uid, product_id, active_uom, {})
-            coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, product_id, product_uom, {})
-            coeff = coeff_uom2def * coeff_def2uom
-            ret['planned_outgoing'] = rounding(coeff * planned_outgoing, round_value)
-            ret['to_procure'] = rounding(coeff * to_procure, round_value)
-        ret['active_uom'] = product_uom
-        return {'value': ret}
-
-    _columns = {
-        'company_id': fields.many2one('res.company', 'Company', required = True),
-        'history': fields.text('Procurement History', readonly=True, help = "History of procurement or internal supply of this planning line."),
-        'state' : fields.selection([('draft','Draft'),('done','Done')],'Status',readonly=True),
-        'period_id': fields.many2one('stock.period' , 'Period', required=True, \
-                help = 'Period for this planning. Requisition will be created for beginning of the period.', select=True),
-        'warehouse_id': fields.many2one('stock.warehouse','Warehouse', required=True),
-        'product_id': fields.many2one('product.product' , 'Product', required=True, help = 'Product which this planning is created for.'),
-        'product_uom_categ' : fields.many2one('product.uom.categ', 'Product Unit of Measure Category'), # Invisible field for product_uom domain
-        'product_uom': fields.many2one('product.uom', 'Unit of Measure', required=True, help = "Unit of Measure used to show the quantities of stock calculation." \
-                        "You can use units from default category or from second category (UoS category)."),
-        'product_uos_categ': fields.many2one('product.uom.categ', 'Product Unit of Measure Category'), # Invisible field for product_uos domain
-# Field used in onchange_uom to check what uom was before change to recalculate quantities according to old uom (active_uom) and new uom.
-        'active_uom': fields.many2one('product.uom',  string = "Active Unit of Measure"), #  It works only in Forecast
-        'planned_outgoing': fields.float('Planned Out', required=True,  \
-                help = 'Enter planned outgoing quantity from selected Warehouse during the selected Period of selected Product. '\
-                        'To plan this value look at Confirmed Out or Sales Forecasts. This value should be equal or greater than Confirmed Out.'),
-        'company_forecast': fields.function(_get_forecast, string ='Company Forecast', multi = 'company', \
-                help = 'All sales forecasts for whole company (for all Warehouses) of selected Product during selected Period.'),
-        'warehouse_forecast': fields.function(_get_forecast, string ='Warehouse Forecast',  multi = 'warehouse',\
-                help = 'All sales forecasts for selected Warehouse of selected Product during selected Period.'),
-        'stock_simulation': fields.float('Stock Simulation', readonly =True, \
-                help = 'Stock simulation at the end of selected Period.\n For current period it is: \n' \
-                       'Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n' \
-                        'For periods ahead it is: \nInitial Stock - Planned Out Before + Incoming Before - Planned Out + Planned In.'),
-        'incoming': fields.float('Confirmed In', readonly=True, \
-                help = 'Quantity of all confirmed incoming moves in calculated Period.'),
-        'outgoing': fields.float('Confirmed Out', readonly=True, \
-                help = 'Quantity of all confirmed outgoing moves in calculated Period.'),
-        'incoming_left': fields.float('Incoming Left', readonly=True,  \
-                help = 'Quantity left to Planned incoming quantity. This is calculated difference between Planned In and Confirmed In. ' \
-                        'For current period Already In is also calculated. This value is used to create procurement for lacking quantity.'),
-        'outgoing_left': fields.float('Expected Out', readonly=True, \
-                help = 'Quantity expected to go out in selected period besides Confirmed Out. As a difference between Planned Out and Confirmed Out. ' \
-                        'For current period Already Out is also calculated'),
-        'to_procure': fields.float(string='Planned In', required=True, \
-                help = 'Enter quantity which (by your plan) should come in. Change this value and observe Stock simulation. ' \
-                        'This value should be equal or greater than Confirmed In.'),
-        'line_time': fields.function(_get_past_future, type='char', string='Past/Future'),
-        'minimum_op': fields.function(_get_op, type='float', string = 'Minimum Rule', multi= 'minimum', \
-                            help = 'Minimum quantity set in Minimum Stock Rules for this Warehouse'),
-        'maximum_op': fields.function(_get_op, type='float', string = 'Maximum Rule', multi= 'maximum', \
-                            help = 'Maximum quantity set in Minimum Stock Rules for this Warehouse'),
-        'outgoing_before': fields.float('Planned Out Before', readonly=True, \
-                            help= 'Planned Out in periods before calculated. '\
-                                    'Between start date of current period and one day before start of calculated period.'),
-        'incoming_before': fields.float('Incoming Before', readonly = True, \
-                            help= 'Confirmed incoming in periods before calculated (Including Already In). '\
-                                    'Between start date of current period and one day before start of calculated period.'),
-        'stock_start': fields.float('Initial Stock', readonly=True, \
-                            help= 'Stock quantity one day before current period.'),
-        'already_out': fields.float('Already Out', readonly=True, \
-                            help= 'Quantity which is already dispatched out of this warehouse in current period.'),
-        'already_in': fields.float('Already In', readonly=True, \
-                            help= 'Quantity which is already picked up to this warehouse in current period.'),
-        'stock_only': fields.boolean("Stock Location Only", help = "Check to calculate stock location of selected warehouse only. " \
-                                        "If not selected calculation is made for input, stock and output location of warehouse."),
-        "procure_to_stock": fields.boolean("Procure To Stock Location", help = "Check to make procurement to stock location of selected warehouse. " \
-                                        "If not selected procurement will be made into input location of warehouse."),
-        "confirmed_forecasts_only": fields.boolean("Validated Forecasts", help = "Check to take validated forecasts only. " \
-                    "If not checked system takes validated and draft forecasts."),
-        'supply_warehouse_id': fields.many2one('stock.warehouse','Source Warehouse', help = "Warehouse used as source in supply pick move created by 'Supply from Another Warehouse'."),
-        "stock_supply_location": fields.boolean("Stock Supply Location", help = "Check to supply from Stock location of Supply Warehouse. " \
-                "If not checked supply will be made from Output location of Supply Warehouse. Used in 'Supply from Another Warehouse' with Supply Warehouse."),
-
-    }
-
-    _defaults = {
-        'state': 'draft' ,
-        'to_procure': 0.0,
-        'planned_outgoing': 0.0,
-        'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.planning', context=c),
-    }
-
-    _order = 'period_id'
-
-    def _to_default_uom_factor(self, cr, uid, product_id, uom_id, context=None):
-        uom_obj = self.pool.get('product.uom')
-        product_obj = self.pool.get('product.product')
-        product = product_obj.browse(cr, uid, product_id, context=context)
-        uom = uom_obj.browse(cr, uid, uom_id, context=context)
-        coef = uom.factor
-        if uom.category_id.id != product.uom_id.category_id.id:
-            coef = coef * product.uos_coeff
-        return product.uom_id.factor / coef
-
-
-    def _from_default_uom_factor(self, cr, uid, product_id, uom_id, context=None):
-        uom_obj = self.pool.get('product.uom')
-        product_obj = self.pool.get('product.product')
-        product = product_obj.browse(cr, uid, product_id, context=context)
-        uom = uom_obj.browse(cr, uid, uom_id, context=context)
-        res = uom.factor
-        if uom.category_id.id != product.uom_id.category_id.id:
-            res = res * product.uos_coeff
-        return res / product.uom_id.factor, uom.rounding
-
-    def calculate_planning(self, cr, uid, ids, context, *args):
-        one_second = relativedelta(seconds=1)
-        today = datetime.today()
-        current_date_beginning_c = datetime(today.year, today.month, today.day)
-        current_date_end_c = current_date_beginning_c  + relativedelta(days=1, seconds=-1)  # to get hour 23:59:59
-        current_date_beginning = current_date_beginning_c.strftime('%Y-%m-%d %H:%M:%S')
-        current_date_end = current_date_end_c.strftime('%Y-%m-%d %H:%M:%S')
-        _logger.debug("Calculate Planning: current date beg: %s and end: %s", current_date_beginning, current_date_end)
-        for val in self.browse(cr, uid, ids, context=context):
-            day = datetime.strptime(val.period_id.date_start, '%Y-%m-%d %H:%M:%S')
-            dbefore = datetime(day.year, day.month, day.day) - one_second
-            day_before_calculated_period = dbefore.strftime('%Y-%m-%d %H:%M:%S')   # one day before start of calculated period
-            _logger.debug("Day before calculated period: %s ", day_before_calculated_period)
-            cr.execute("SELECT date_start \
-                    FROM stock_period AS period \
-                    LEFT JOIN stock_planning AS planning \
-                    ON (planning.period_id = period.id) \
-                    WHERE (period.date_stop >= %s) AND (period.date_start <= %s) AND \
-                        planning.product_id = %s", (current_date_end, current_date_end, val.product_id.id,)) #
-            date = cr.fetchone()
-            start_date_current_period = date and date[0] or False
-            start_date_current_period = start_date_current_period or current_date_beginning
-            day = datetime.strptime(start_date_current_period, '%Y-%m-%d %H:%M:%S')
-            dbefore = datetime(day.year, day.month, day.day) - one_second
-            date_for_start = dbefore.strftime('%Y-%m-%d %H:%M:%S')   # one day before current period
-            _logger.debug("Date for start: %s", date_for_start)
-            already_out = self._get_in_out(cr, uid, val, start_date_current_period, current_date_end, direction='out', done=True, context=context),
-            already_in = self._get_in_out(cr, uid, val, start_date_current_period, current_date_end, direction='in', done=True, context=context),
-            outgoing = self._get_in_out(cr, uid, val, val.period_id.date_start, val.period_id.date_stop, direction='out', done=False, context=context),
-            incoming = self._get_in_out(cr, uid, val, val.period_id.date_start, val.period_id.date_stop, direction='in', done=False, context=context),
-            outgoing_before = self._get_outgoing_before(cr, uid, val, start_date_current_period, day_before_calculated_period, context=context),
-            incoming_before = self._get_in_out(cr, uid, val, start_date_current_period, day_before_calculated_period, direction='in', done=False, context=context),
-            stock_start = self._get_stock_start(cr, uid, val, date_for_start, context=context),
-            if start_date_current_period == val.period_id.date_start:   # current period is calculated
-                current = True
-            else:
-                current = False
-            factor, round_value = self._from_default_uom_factor(cr, uid, val.product_id.id, val.product_uom.id, context=context)
-            self.write(cr, uid, ids, {
-                'already_out': rounding(already_out[0]*factor,round_value),
-                'already_in': rounding(already_in[0]*factor,round_value),
-                'outgoing': rounding(outgoing[0]*factor,round_value),
-                'incoming': rounding(incoming[0]*factor,round_value),
-                'outgoing_before' : rounding(outgoing_before[0]*factor,round_value),
-                'incoming_before': rounding((incoming_before[0]+ (not current and already_in[0]))*factor,round_value),
-                'outgoing_left': rounding(val.planned_outgoing - (outgoing[0] + (current and already_out[0]))*factor,round_value),
-                'incoming_left': rounding(val.to_procure - (incoming[0] + (current and already_in[0]))*factor,round_value),
-                'stock_start': rounding(stock_start[0]*factor,round_value),
-                'stock_simulation': rounding(val.to_procure - val.planned_outgoing + (stock_start[0]+ incoming_before[0] - outgoing_before[0] \
-                                     + (not current and already_in[0]))*factor,round_value),
-            })
-        return True
-
-# method below converts quantities and uoms to general OpenERP standard with UoM Qty, UoM, UoS Qty, UoS.
-# from stock_planning standard where you have one Qty and one UoM (any from UoM or UoS category)
-# so if UoM is from UoM category it is used as UoM in standard and if product has UoS the UoS will be calcualated.
-# If UoM is from UoS category it is recalculated to basic UoS from product (in planning you can use any UoS from UoS category)
-# and basic UoM is calculated.
-    def _qty_to_standard(self, cr, uid, val, context=None):
-        uos = False
-        uos_qty = 0.0
-        if val.product_uom.category_id.id == val.product_id.uom_id.category_id.id:
-            uom_qty = val.incoming_left
-            uom = val.product_uom.id
-            if val.product_id.uos_id:
-                uos = val.product_id.uos_id.id
-                coeff_uom2def = self._to_default_uom_factor(cr, uid, val.product_id.id, val.product_uom.id, {})
-                coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val.product_id.id, uos, {})
-                uos_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value)
-        elif val.product_uom.category_id.id == val.product_id.uos_id.category_id.id:
-            coeff_uom2def = self._to_default_uom_factor(cr, uid, val.product_id.id, val.product_uom.id, {})
-            uos = val.product_id.uos_id.id
-            coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val.product_id.id, uos, {})
-            uos_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value)
-            uom = val.product_id.uom_id.id
-            coeff_def2uom, round_value = self._from_default_uom_factor(cr, uid, val.product_id.id, uom, {})
-            uom_qty = rounding(val.incoming_left * coeff_uom2def * coeff_def2uom, round_value)
-        return uom_qty, uom, uos_qty, uos
-
-    def procure_incomming_left(self, cr, uid, ids, context, *args):
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.incoming_left <= 0:
-                raise osv.except_osv(_('Error!'), _('Incoming Left must be greater than 0.'))
-            uom_qty, uom, uos_qty, uos = self._qty_to_standard(cr, uid, obj, context)
-            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            proc_id = self.pool.get('procurement.order').create(cr, uid, {
-                        'company_id' : obj.company_id.id,
-                        'name': _('MPS planning for %s') %(obj.period_id.name),
-                        'origin': _('MPS(%s) %s') %(user.login, obj.period_id.name),
-                        'date_planned': obj.period_id.date_start,
-                        'product_id': obj.product_id.id,
-                        'product_qty': uom_qty,
-                        'product_uom': uom,
-                        'product_uos_qty': uos_qty,
-                        'product_uos': uos,
-                        'location_id': obj.procure_to_stock and obj.warehouse_id.lot_stock_id.id or obj.warehouse_id.lot_input_id.id,
-                        'procure_method': 'make_to_order',
-                        'note' : _(' Procurement created by MPS for user: %s   Creation Date: %s \
-                                        \n For period: %s \
-                                        \n according to state: \
-                                        \n Warehouse Forecast: %s \
-                                        \n Initial Stock: %s \
-                                        \n Planned Out: %s    Planned In: %s \
-                                        \n Already Out: %s    Already In: %s \
-                                        \n Confirmed Out: %s    Confirmed In: %s \
-                                        \n Planned Out Before: %s    Confirmed In Before: %s \
-                                        \n Expected Out: %s    Incoming Left: %s \
-                                        \n Stock Simulation: %s    Minimum stock: %s') %(user.login, time.strftime('%Y-%m-%d %H:%M:%S'),
-                                        obj.period_id.name, obj.warehouse_forecast, obj.planned_outgoing, obj.stock_start, obj.to_procure,
-                                        obj.already_out, obj.already_in, obj.outgoing, obj.incoming, obj.outgoing_before, obj.incoming_before,
-                                        obj.outgoing_left, obj.incoming_left, obj.stock_simulation, obj.minimum_op)
-                            }, context=context)
-            wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
-            self.calculate_planning(cr, uid, ids, context)
-            prev_text = obj.history or ""
-            self.write(cr, uid, ids, {
-                    'history': _('%s Procurement (%s,  %s) %s %s \n') % (prev_text, user.login, time.strftime('%Y.%m.%d %H:%M'),
-                    obj.incoming_left, obj.product_uom.name)
-                })
-
-        return True
-
-    def internal_supply(self, cr, uid, ids, context, *args):
-        for obj in self.browse(cr, uid, ids, context=context):
-            if obj.incoming_left <= 0:
-                raise osv.except_osv(_('Error!'), _('Incoming Left must be greater than 0.'))
-            if not obj.supply_warehouse_id:
-                raise osv.except_osv(_('Error!'), _('You must specify a Source Warehouse.'))
-            if obj.supply_warehouse_id.id == obj.warehouse_id.id:
-                raise osv.except_osv(_('Error!'), _('You must specify a Source Warehouse different than calculated (destination) Warehouse.'))
-            uom_qty, uom, uos_qty, uos = self._qty_to_standard(cr, uid, obj, context)
-            user = self.pool.get('res.users').browse(cr, uid, uid, context)
-            picking_id = self.pool.get('stock.picking').create(cr, uid, {
-                        'origin': _('MPS(%s) %s') %(user.login, obj.period_id.name),
-                        'type': 'internal',
-                        'state': 'auto',
-                        'date': obj.period_id.date_start,
-                        'move_type': 'direct',
-                        'invoice_state':  'none',
-                        'company_id': obj.company_id.id,
-                        'note': _('Pick created from MPS by user: %s   Creation Date: %s \
-                                    \nFor period: %s   according to state: \
-                                    \n Warehouse Forecast: %s \
-                                    \n Initial Stock: %s \
-                                    \n Planned Out: %s  Planned In: %s \
-                                    \n Already Out: %s  Already In: %s \
-                                    \n Confirmed Out: %s   Confirmed In: %s \
-                                    \n Planned Out Before: %s   Confirmed In Before: %s \
-                                    \n Expected Out: %s   Incoming Left: %s \
-                                    \n Stock Simulation: %s   Minimum stock: %s ')
-                                    % (user.login, time.strftime('%Y-%m-%d %H:%M:%S'), obj.period_id.name, obj.warehouse_forecast,
-                                       obj.stock_start, obj.planned_outgoing, obj.to_procure, obj.already_out, obj.already_in,
-                                       obj.outgoing, obj.incoming, obj.outgoing_before, obj.incoming_before,
-                                       obj.outgoing_left, obj.incoming_left, obj.stock_simulation, obj.minimum_op)
-                        })
-
-            move_id = self.pool.get('stock.move').create(cr, uid, {
-                        'name': _('MPS(%s) %s') %(user.login, obj.period_id.name),
-                        'picking_id': picking_id,
-                        'product_id': obj.product_id.id,
-                        'date': obj.period_id.date_start,
-                        'product_qty': uom_qty,
-                        'product_uom': uom,
-                        'product_uos_qty': uos_qty,
-                        'product_uos': uos,
-                        'location_id': obj.stock_supply_location and obj.supply_warehouse_id.lot_stock_id.id or \
-                                                                obj.supply_warehouse_id.lot_output_id.id,
-                        'location_dest_id': obj.procure_to_stock and obj.warehouse_id.lot_stock_id.id or \
-                                                                obj.warehouse_id.lot_input_id.id,
-                        'tracking_id': False,
-                        'company_id': obj.company_id.id,
-                    })
-            wf_service = netsvc.LocalService("workflow")
-            wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
-
-        self.calculate_planning(cr, uid, ids, context)
-        prev_text = obj.history or ""
-        pick_name = self.pool.get('stock.picking').browse(cr, uid, picking_id).name
-        self.write(cr, uid, ids, {
-                    'history': _('%s Pick List %s (%s,  %s) %s %s \n') % (prev_text, pick_name, user.login, time.strftime('%Y.%m.%d %H:%M'),
-                    obj.incoming_left, obj.product_uom.name)
-                })
-
-        return True
-
-    def product_id_change(self, cr, uid, ids, product_id):
-        ret = {}
-        if product_id:
-            product_rec =  self.pool.get('product.product').browse(cr, uid, product_id)
-            ret['product_uom'] = product_rec.uom_id.id
-            ret['active_uom'] = product_rec.uom_id.id
-            ret['product_uom_categ'] = product_rec.uom_id.category_id.id
-            ret['product_uos_categ'] = product_rec.uos_id and product_rec.uos_id.category_id.id or False
-        else:
-            ret['product_uom'] = False
-            ret['product_uom_categ'] = False
-            ret['product_uos_categ'] = False
-        res = {'value': ret}
-        return res
-
-stock_planning()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
deleted file mode 100644
index 56c3b9a1eaa..00000000000
--- a/addons/stock_planning/stock_planning_view.xml
+++ /dev/null
@@ -1,347 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <menuitem id="menu_stock_period_main"
-                  name="Stock Periods"
-                  parent="stock.menu_stock_configuration" sequence="20"/>
-
-        <!-- Periods tree and form section -->
-
-        <record id="view_stock_period_form" model="ir.ui.view">
-            <field name="name">stock.period.form</field>
-            <field name="model">stock.period</field>
-            <field name="arch" type="xml">
-                <form string="Stock Period" version="7.0">
-                    <header>
-                        <button name="button_open" string="Open" states="draft" type="object"/>
-                        <button name="button_close" string="Close" states="open" type="object"/>
-                        <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
-                    </header>
-                    <sheet string="Stock Periods">
-                        <group col="4">
-                            <field name="name"/>
-                            <newline/>
-                            <field name="date_start"/>
-                            <field name="date_stop"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_stock_period_tree" model="ir.ui.view">
-            <field name="name">stock.period.tree</field>
-            <field name="model">stock.period</field>
-            <field name="arch" type="xml">
-                <tree string="Stock and Sales Period" editable="bottom" colors="gray:state == 'close';black:state in ('draft','open')">
-                    <field name="name"/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_stock_period_search" model="ir.ui.view">
-            <field name="name">stock.period.search</field>
-            <field name="model">stock.period</field>
-            <field name="arch" type="xml">
-                <search string="Stock Periods">
-                    <field name="name" string="Stock Periods"/>
-                    <field name="date_start"/>
-                    <field name="date_stop"/>
-                    <filter string="Current" domain="[('state','in',['draft','open'])]" icon="terp-check" help="Current Periods"/>
-                    <filter string="Closed" domain="[('state','=','close')]" icon="gtk-stop" help="Closed Periods"/>
-                </search>
-            </field>
-        </record>
-
-        <record id="action_stock_period_form" model="ir.actions.act_window">
-            <field name="name">Stock Periods</field>
-            <field name="res_model">stock.period</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_stock_period_search"/>
-            <field name="help">Stock periods are used for stock planning. Stock periods are independent of account periods. You can use wizard for creating periods and review them here.</field>
-
-        </record>
-
-        <menuitem
-            id="menu_stock_period"
-            parent="stock.menu_stock_configuration"
-            action="action_stock_period_form"
-            sequence = "25"/>
-
-        <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>
-            <field name="arch" type="xml">
-                <form string="Stock and Sale Forecast" version="7.0">
-                <header>
-                    <button name="action_validate" string="Approve" states="draft" type="object" class="oe_highlight"/>
-                    <field name="state" widget="statusbar"/>
-                </header>
-                <sheet string="Stock and Sales Forecast">
-                    <group colspan = "4" col = "4" class="oe_header">
-                        <group colspan = "2" col="2" >
-                            <field name="company_id"
-                                        groups="base.group_multi_company"
-                                        widget="selection"
-                                        on_change="onchange_company(company_id)"/>
-                            <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"
-                                         domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
-                                         on_change = "onchange_uom(product_uom, product_qty, active_uom, product_id)"/>
-                            <field name="active_uom" invisible = "True" />
-                        </group>
-                        <group colspan = "2" col="2" >
-                            <field name="user_id"/>
-                            <field name="product_amt" on_change="product_amt_change(product_amt, product_uom, product_id)" />
-                            <field name="product_qty"  />
-                        </group>
-                    </group>
-                    <separator colspan ="4" string="Sales History"/>
-                    <group colspan = "4" col = "5">
-                        <label string = " "/>
-                        <label string = "Per User :"/>
-                        <label string = "Per Department :"/>
-                        <label string = "Per Warehouse :"/>
-                        <label string = ""/>
-                        <label string = "Periods :"/>
-                        <field name="analyzed_user_id" nolabel = "1" domain = "[('company_id','=',company_id)] "/>
-                        <field name="analyzed_team_id" nolabel = "1" />
-                        <field name="analyzed_warehouse_id" nolabel = "1" domain = "[('company_id','=',company_id)] " />
-                        <group colspan = "1" col = "2">
-                            <field name = "analyze_company"/>
-                        </group>
-                        <field name = "analyzed_period1_id" nolabel = "1"  />
-                        <field name = "analyzed_period1_per_user" nolabel = "1" />
-                        <field name = "analyzed_period1_per_dept" nolabel = "1" />
-                        <field name = "analyzed_period1_per_warehouse" nolabel = "1" />
-                        <field name = "analyzed_period1_per_company" nolabel = "1"/>
-                        <field name = "analyzed_period2_id" nolabel = "1" />
-                        <field name = "analyzed_period2_per_user" nolabel = "1" />
-                        <field name = "analyzed_period2_per_dept" nolabel = "1" />
-                        <field name = "analyzed_period2_per_warehouse" nolabel = "1" />
-                        <field name = "analyzed_period2_per_company" nolabel = "1" />
-                        <field name = "analyzed_period3_id" nolabel = "1"/>
-                        <field name = "analyzed_period3_per_user" nolabel = "1" />
-                        <field name = "analyzed_period3_per_dept" nolabel = "1" />
-                        <field name = "analyzed_period3_per_warehouse" nolabel = "1" />
-                        <field name = "analyzed_period3_per_company" nolabel = "1" />
-                        <field name = "analyzed_period4_id" nolabel = "1" />
-                        <field name = "analyzed_period4_per_user" nolabel = "1" />
-                        <field name = "analyzed_period4_per_dept" nolabel = "1" />
-                        <field name = "analyzed_period4_per_warehouse" nolabel = "1" />
-                        <field name = "analyzed_period4_per_company" nolabel = "1" />
-                        <field name = "analyzed_period5_id" nolabel = "1" />
-                        <field name = "analyzed_period5_per_user" nolabel = "1" />
-                        <field name = "analyzed_period5_per_dept" nolabel = "1" />
-                        <field name = "analyzed_period5_per_warehouse" nolabel = "1" />
-                        <field name = "analyzed_period5_per_company" nolabel = "1" />
-                        <button name="calculate_sales_history" icon="gtk-execute"
-                                string="Calculate Sales History" type="object" colspan = "1" states="draft" />
-                    </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record id="view_stock_sale_forecast_tree" model="ir.ui.view">
-             <field name="name">stock.sale.forecast.tree</field>
-            <field name="model">stock.sale.forecast</field>
-            <field name="arch" type="xml">
-                <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>
-
-       <record id="view_stock_sale_forecast_graph" model="ir.ui.view">
-             <field name="name">stock.sale.forecast.graph</field>
-            <field name="model">stock.sale.forecast</field>
-            <field name="arch" type="xml">
-                <graph string="Stock and Sales Forecast" type = "bar">
-                    <field name="period_id"/>
-                    <field name="product_qty"/>
-                    <field name="product_id"/>
-                </graph>
-            </field>
-        </record>
-
-        <!-- Forecast section -->
-
-        <menuitem id="menu_stock_sale_forecast" name="Sales Forecasts"
-                parent="base.menu_base_partner" sequence="5"/>
-
-        <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="arch" type="xml">
-                <search string="Search  Sales Forecast">
-                    <filter icon="terp-camera_test" string="Validated" domain="[('state','=','validated')]" />
-                    <field name="company_id"/>
-                    <field name="warehouse_id" />
-                    <field name="period_id" />
-                    <field name="product_id"/>
-                    <field name="create_uid"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
-                        <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
-                       <filter string='Default Unit of Measure' icon="terp-mrp" domain="[]" context="{'group_by' : 'product_uom'}" />
-                    </group>
-              </search>
-            </field>
-        </record>
-
-
-        <record id="action_view_stock_sale_forecast_form" model="ir.actions.act_window">
-            <field name="name">Sales Forecast</field>
-            <field name="res_model">stock.sale.forecast</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form,graph</field>
-            <field name="context">{"search_default_create_uid":uid}</field>
-            <field name="help">This quantity sales forecast is an indication for Stock Planner to make procurement manually or to complement automatic procurement. You can use manual procurement with this forecast when some periods are exceptional for usual minimum stock rules.</field>
-        </record>
-
-        <menuitem id="menu_stock_sale_forecast_all"
-                  name="Sales Forecasts"
-                  parent="menu_stock_sale_forecast"
-                  action="action_view_stock_sale_forecast_form"/>
-
-        <!-- Planning section -->
-
-        <menuitem id="menu_stock_planning_manual" name="Master Procurement Schedule" parent="procurement.menu_stock_sched" sequence="10"/>
-
-        <record id="view_stock_planning_form" model="ir.ui.view">
-            <field name="name">stock.planning.form</field>
-            <field name="model">stock.planning</field>
-            <field name="priority">50</field>
-            <field name="arch" type="xml">
-                <form string="Stock Planning" version="7.0">
-                    <group>
-                        <group string="General Info">
-                            <field name="company_id" 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"
-                                         domain = "[('category_id','in',[product_uom_categ,product_uos_categ])]"
-                                         on_change = "onchange_uom(product_uom, product_id, active_uom, planned_outgoing, to_procure)"/>
-                            <field name="active_uom" invisible = "True"/>
-                            <separator string="Current Period Situation" colspan="2"/>
-                            <field name="stock_start"/>
-                            <field name="already_out"/>
-                            <field name="already_in"/>
-                            <separator string="Minimum Stock Rule Indicators" colspan="2"/>
-                            <field name="minimum_op"/>
-                            <field name="maximum_op"/>
-                            <separator string="Forecasts" colspan="2"/>
-                            <field name="warehouse_forecast"/>
-                            <field name="company_forecast"/>
-                            <field name="confirmed_forecasts_only"/>
-                        </group>
- 
-                        <group>
-                            <button name="calculate_planning" string="Compute Planning" type="object" icon="gtk-execute"/>
-                            <separator string="Planning and Situation for Calculated Period" colspan="2"/>
-                            <field name="planned_outgoing"/>
-                            <field name="outgoing"/>
-                            <field name="outgoing_left"/>
-                            <field name="to_procure"/>
-                            <field name="incoming"/>
-                            <label for="incoming_left"/>
-                            <div>
-                                <field name="incoming_left" class="oe_inline"/>
-                                <button name="procure_incomming_left" icon="gtk-convert" string="Make Procurement" type="object" class="oe_inline"/>
-                                <button name="internal_supply" string="Make Picking" help="Supply from Another Warehouse" icon="gtk-convert" type="object" class="oe_inline"/>
-                            </div>
-                            <field name="stock_only"/>
-                            <separator string="Calculated Period Simulation" colspan="2"/>
-                            <field name="outgoing_before"/>
-                            <field name="incoming_before"/>
-                            <field name="stock_simulation"/>
-                            <field name="procure_to_stock"/>
-                            <separator string="Internal Supply" colspan="2"/>
-                            <field name="supply_warehouse_id" domain = "[('company_id','=',company_id)] "/>
-                            <field name="stock_supply_location"/>
-                        </group>
-                    </group>
-                    <group string="Procurement History" colspan="4">
-                        <field name="history" nolabel="1" colspan="4"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-       <record id="view_stock_planning_filter" model="ir.ui.view">
-            <field name="name">stock.planning.list.select</field>
-            <field name="model">stock.planning</field>
-            <field name="arch" type="xml">
-                <search string="Search Stock Planning">
-                    <filter icon="terp-purchase" string="No Requisition" domain="[('history','=',False)]" />
-                    <field name="company_id"/>
-                    <field name="warehouse_id"/>
-                    <field name="period_id"/>
-                    <field name="product_id"/>
-                    <group expand="0" string="Group By...">
-                        <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}"/>
-                        <filter string="Warehouse " icon="terp-go-home" domain="[]" context="{'group_by':'warehouse_id'}"/>
-                        <filter string="Product" icon="terp-accessories-archiver" domain="[]"  context="{'group_by':'product_id'}"/>
-                    </group>
-              </search>
-            </field>
-        </record>
-
-
-        <record id="view_stock_planning_tree" model="ir.ui.view">
-             <field name="name">stock.planning.tree</field>
-            <field name="model">stock.planning</field>
-            <field name="arch" type="xml">
-                <tree string="Master Procurement Schedule" colors ="blue:line_time=='Past';black:line_time=='Future'">
-                    <field name="period_id"/>
-                    <field name="company_id" invisible="1"/>
-                    <field name="product_id" on_change="product_id_change(product_id)" />
-                    <field name="product_uom"/>
-                    <field name="warehouse_forecast" string="Forecast"/>
-                    <field name="planned_outgoing"/>
-                    <field name="to_procure"/>
-                    <field name="line_time" invisible="1"/>
-                    <field name="stock_simulation" string="Stock"/>   <!-- previously stock_start -->
-                    <field name="warehouse_id" domain = "[('company_id','=',company_id)] " />
-                </tree>
-            </field>
-        </record>
-
-        <record id="action_view_stock_planning_form" model="ir.actions.act_window">
-            <field name="name">Master Procurement Schedule</field>
-            <field name="res_model">stock.planning</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="help">The Master Procurement Schedule can be the main driver for warehouse replenishment, or can complement the automatic MRP scheduling (minimum stock rules, etc.).
-Each MPS line gives you a pre-computed overview of the incoming and outgoing quantities of a given product for a given Stock Period in a given Warehouse, based on the current and future stock levels,
-as well as the planned stock moves. The forecast quantities can be altered manually, and when satisfied with resulting (simulated) Stock quantity, you can trigger the procurement of what is missing to reach your desired quantities</field>
-        </record>
-
-        <menuitem
-            id="menu_stock_planning"
-            parent="menu_stock_planning_manual"
-            action="action_view_stock_planning_form"/>
-
-</data>
-</openerp>
diff --git a/addons/stock_planning/test/stock_planning.yml b/addons/stock_planning/test/stock_planning.yml
deleted file mode 100644
index 0c9bb5ff5ec..00000000000
--- a/addons/stock_planning/test/stock_planning.yml
+++ /dev/null
@@ -1,257 +0,0 @@
--
-  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: !eval "'%s-07-01 00:00:00' %(datetime.now().year)"
-    date_stop: !eval "'%s-07-06 23:59:00' %(datetime.now().year)"
-    name: !eval "'%s, week 27' %(datetime.now().year)"
--
-  I create stock period for the second week of July.
--
-  !record {model: stock.period, id: stock_period_02}:
-    date_start: !eval "'%s-07-07 00:00:00' %(datetime.now().year)"
-    date_stop: !eval "'%s-07-12 23:59:00' %(datetime.now().year)"
-    name: !eval "'%s, week 28' %(datetime.now().year)"
--
-  I create stock period for the third week of July.
--
-  !record {model: stock.period, id: stock_period_03}:
-    date_start: !eval "'%s-07-15 00:00:00' %(datetime.now().year)"
-    date_stop: !eval "'%s-07-20 23:59:00' %(datetime.now().year)"
-    name: !eval "'%s, week 29' %(datetime.now().year)"
--
-  I create stock period for the fourth week of July.
--
-  !record {model: stock.period, id: stock_period_04}:
-    date_start: !eval "'%s-07-22 00:00:00' %(datetime.now().year)"
-    date_stop: !eval "'%s-07-27 23:59:00' %(datetime.now().year)"
-    name: !eval "'%s, week 30' %(datetime.now().year)"
--
-  I create stock period for the fifth week of July.
--
-  !record {model: stock.period, id: stock_period_05}:
-    date_start: !eval "'%s-07-29 00:00:00' %(datetime.now().year)"
-    date_stop: !eval "'%s-07-31 23:59:00' %(datetime.now().year)"
-    name: !eval "'%s, week 31' %(datetime.now().year)"
--
-  I validate in open state module stock.period
--
-  !python {model: stock.period}: |
-    self.button_open(cr, uid, [ref("stock_period_01")], {"lang": 'en_GB', "tz": False, "active_model": 'ir.ui.menu', "active_id": ref("stock_planning.menu_stock_period_main"), "active_ids": [ref("stock_planning.menu_stock_period_main")], "department_id": False})
-
--
-  I validate in close state module stock.period
--
-  !python {model: stock.period}: |
-    self.button_close(cr, uid, [ref("stock_period_01")], {"lang": 'en_GB', "tz": False, "active_model": 'ir.ui.menu', "active_id": ref("stock_planning.menu_stock_period_main"), "active_ids": [ref("stock_planning.menu_stock_period_main")], "department_id": False})
-
--
-  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_4
-    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 stock.period.createlines for the first week of August.
--
-  !record {model: stock.period.createlines, id: stock_period_createlines_week01}:
-    date_start: !eval "'%s-08-01' %(datetime.now().year)"
-    date_stop: !eval "'%s-08-06' %(datetime.now().year)"
-    name: !eval "'%s, week 31' %(datetime.now().year)"
-
--
-  Performing an osv_memory action create_stock_periods on module stock.period.createlines
--
-  !python {model: stock.period.createlines}: |
-    self.create_stock_periods(cr, uid, [ref("stock_period_createlines_week01")], {"lang":
-      'en_US', "name": 'Weekly', "interval": 6, "active_model": "ir.ui.menu", "active_ids": [ref("stock_planning.menu_stock_period_creatlines")],
-      "tz": False, "active_id": ref("stock_planning.menu_stock_period_creatlines"),
-      })
--
-  I create stock.period.createlines for the month of August - September
--
-  !record {model: stock.period.createlines, id: stock_period_createlines_month01}:
-    date_start: !eval "'%s-08-01' %(datetime.now().year)"
-    date_stop: !eval "'%s-09-01' %(datetime.now().year)"
-    name: !eval "'%s, month 8' %(datetime.now().year)"
-
--
-  Performing an osv_memory action create_stock_periods on module stock.period.createlines
--
-  !python {model: stock.period.createlines}: |
-    self.create_stock_periods(cr, uid, [ref("stock_period_createlines_month01")], {"lang":
-      'en_US', "name": 'Monthly', "interval": 6, "active_model": "ir.ui.menu", "active_ids": [ref("stock_planning.menu_stock_period_creatlines")],
-      "tz": False, "active_id": ref("stock_planning.menu_stock_period_creatlines"),
-      })
-
--
-  I create stock.period.createlines for the Day of August 
--
-  !record {model: stock.period.createlines, id: stock_period_createlines_day01}:
-    date_start: !eval "'%s-08-01' %(datetime.now().year)"
-    date_stop: !eval "'%s-08-01' %(datetime.now().year)"
-    name: !eval "'%s, day 01' %(datetime.now().year)"
-
--
-  Performing an osv_memory action create_stock_periods on module stock.period.createlines
--
-  !python {model: stock.period.createlines}: |
-    self.create_stock_periods(cr, uid, [ref("stock_period_createlines_day01")], {"lang":
-      'en_US', "name": 'Daily', "interval": 6, "active_model": "ir.ui.menu", "active_ids": [ref("stock_planning.menu_stock_period_creatlines")],
-      "tz": False, "active_id": ref("stock_planning.menu_stock_period_creatlines"),
-      })
-
--
-  I Read date_start on module stock.period.createlines.
--
-  !python {model: stock.period.createlines }: |
-    self._get_new_period_start(cr, uid,{"lang":'en_US', "active_model": "ir.ui.menu", 
-    "active_ids": [ref("stock_planning.menu_stock_period_creatlines")],
-     "tz": False, "active_id": ref("stock_planning.menu_stock_period_creatlines"),"department_id": False
-      })
-
--
-  I create a sale order for PC and Laptop.
--
-  !record {model: sale.order, id: sale_order_so0}:
-    date_order: !eval time.strftime('%Y-07-20')
-    invoice_quantity: order
-    name: TESTSO006
-    order_line:
-      - name: '[PC200] PC Assemble + 2GB RAM'
-        price_unit: 750.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 5.0
-        state: draft
-        delay: 2.0
-        product_id: product.product_product_4
-        product_uos_qty: 5.0
-        th_weight: 0.0
-        type: make_to_stock
-      - name: '[LAP-E5] Laptop E5023'
-        price_unit: 2950.0
-        product_uom: product.product_uom_unit
-        product_uom_qty: 12.0
-        state: draft
-        delay: 3.0
-        product_id: product.product_product_25
-        product_uos_qty: 12.0
-        th_weight: 0.0
-        type: make_to_stock
-    order_policy: manual
-    partner_id: base.res_partner_7
-    partner_invoice_id: base.res_partner_address_13
-    partner_shipping_id: base.res_partner_address_13
-    picking_policy: direct
-    pricelist_id: product.list0
-    shop_id: sale.sale_shop_1
--
-  Now I want to calculate sales history for both the products PC and Laptop and forecast the quantity.
--
-  !python {model: stock.sale.forecast}: |
-    forecast_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_4'))])
-    write_dict = {'product_qty': 30.0,
-    'analyzed_period1_id': ref("stock_period_03"),
-    'analyzed_user_id': ref("base.user_root"),
-    'analyzed_warehouse_id': ref("stock.warehouse0")}
-    context = {"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"), }
-    self.write(cr, uid, forecast_ids, write_dict)
-    self.calculate_sales_history(cr, uid, forecast_ids, context)
-    self.action_validate(cr, uid, forecast_ids, context)
-
--
-  Now I applying onchange and unlink forecast record for the product PC.
--
-  !python {model: stock.sale.forecast}: |
-    forecast_ids = self.search(cr, uid, [('product_id','=',ref('product.product_product_5'))])
-    self.unlink(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"), })
-    self.product_id_change(cr, uid, forecast_ids, ref('product.product_product_20'))
-    self.onchange_uom(cr, uid, forecast_ids, ref('product.product_uom_unit'), False, ref('product.product_uom_unit'), ref('product.product_product_20'))
-    self.product_amt_change(cr, uid, forecast_ids, 5.0, ref('product.product_uom_unit'), ref('product.product_product_20'))
-    self.product_amt_change(cr, uid, forecast_ids, 5.0, ref('product.product_uom_unit'), ref('product.product_product_20'))
-    self._to_default_uom_factor(cr, uid, ref('product.product_product_20'), ref('product.product_uom_unit'), {})
-    self.onchange_company(cr, uid, forecast_ids, ref('base.res_partner_2'))
-
--
-  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_4
-    warehouse_id: stock.warehouse0
-
--
-  I create source warehouse for supply from another warehouse.
--
-  !record {model: stock.warehouse, id: stock_warehouse_0}:
-    name: shop1
-    company_id: base.main_company
-    lot_input_id: stock.stock_location_stock
-    lot_stock_id: stock.stock_location_stock
-    lot_output_id: stock.stock_location_output
-
--
-  Performing an osv_memory action create_planning on module stock.planning.createlines
--
-  !python {model: stock.planning.createlines}: |
-    self.onchange_company(cr, uid, ref("stock_planning_createlines_0"), ref('base.res_partner_2'))
-    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_3')),('period_id','=',ref('stock_period_03'))])
-    self.write(cr, uid, planning_ids, {'to_procure': 30.0,'planned_outgoing': 40.0,'supply_warehouse_id': ref("stock_warehouse_0")})
-    self.onchange_company(cr, uid, planning_ids, ref('base.res_partner_2'))
-    self.onchange_uom(cr, uid, planning_ids, ref('product.product_uom_unit'), ref('product.product_product_3'),ref('product.product_uom_unit'), False, False)
-    self.product_id_change(cr, uid, planning_ids, ref('product.product_product_20'))
-    context = {"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,
-      }
-    self.calculate_planning(cr, uid, planning_ids, context)
-    self.internal_supply(cr, uid, planning_ids, context)
-    
--
-  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_3')),('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}: |
-    import datetime
-    proc_ids = self.search(cr, uid, [('origin','=','MPS(admin) %s, week 29' % (datetime.datetime.now().year)),('product_id','=',ref("product.product_product_3"))])
-    assert proc_ids,'No Procurements!'
diff --git a/addons/stock_planning/wizard/__init__.py b/addons/stock_planning/wizard/__init__.py
deleted file mode 100644
index 876b4afdf68..00000000000
--- a/addons/stock_planning/wizard/__init__.py
+++ /dev/null
@@ -1,26 +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 stock_planning_create_periods
-import stock_planning_forecast
-import stock_planning_createlines
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods.py b/addons/stock_planning/wizard/stock_planning_create_periods.py
deleted file mode 100644
index 963ff416822..00000000000
--- a/addons/stock_planning/wizard/stock_planning_create_periods.py
+++ /dev/null
@@ -1,115 +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 datetime import datetime
-from dateutil.relativedelta import relativedelta
-
-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 = datetime.strptime(last_date,"%Y-%m-%d %H:%M:%S")+ relativedelta(days=1)
-            period_start = period_start - relativedelta(hours=period_start.hour, minutes=period_start.minute, seconds=period_start.second)
-        else:
-            period_start = 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, help="Starting date for planning period."),
-        'date_stop': fields.date('End Date', required=True, help="Ending date for planning period."),
-        'period_ids': fields.one2many('stock.period', 'planning_id', 'Periods'),
-        'period_ids': fields.many2many('stock.period', 'stock_period_createlines_stock_period_rel', 'wizard_id', 'period_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_stp = datetime.strptime(p.date_stop, '%Y-%m-%d')
-            ds = datetime.strptime(p.date_start, '%Y-%m-%d')
-
-            while ds <= dt_stp:
-                if name =='Daily':
-                    de = ds + relativedelta(days=(interval + 1), seconds =-1)
-                    new_id = period_obj.create(cr, uid, {
-                    'name': de.strftime('%Y-%m-%d'),
-                    'date_start': ds.strftime('%Y-%m-%d %H:%M:%S'),
-                    'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),
-                    })
-                    ds = ds + relativedelta(days=(interval + 1))
-                if name =="Weekly":
-                    de = ds + relativedelta(days=(interval + 1), seconds =-1)
-                    if dt_stp < de:
-                        de = dt_stp + relativedelta(days=1, seconds =-1)
-                    else:
-                        de = ds + relativedelta(days=(interval + 1), seconds =-1)
-                    new_name = ds.strftime('Week %W-%Y')
-                    if ds.strftime('%Y') != de.strftime('%Y'):
-                        new_name = ds.strftime('Week %W-%Y') + ', ' + de.strftime('Week %W-%Y')
-                    new_id = period_obj.create(cr, uid, {
-                    'name': new_name,
-                    'date_start': ds.strftime('%Y-%m-%d %H:%M:%S'),
-                    'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),
-                    })
-                    ds = ds + relativedelta(days=(interval + 1))
-                if name == "Monthly":
-                    de = ds + relativedelta(months=interval, seconds=-1)
-                    if dt_stp < de:
-                        de = dt_stp + relativedelta(days=1, seconds =-1)
-                    else:
-                        de = ds + relativedelta(months=interval, seconds=-1)
-                    new_name = ds.strftime('%Y/%m')
-                    if ds.strftime('%m') != de.strftime('%m'):
-                        new_name = ds.strftime('%Y/%m') + '-' + de.strftime('%Y/%m')
-                    new_id =period_obj.create(cr, uid, {
-                    'name': new_name, 
-                    'date_start': ds.strftime('%Y-%m-%d %H:%M:%S'),
-                    'date_stop': de.strftime('%Y-%m-%d %H:%M:%S'),
-                    })
-                    ds = ds + relativedelta(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
deleted file mode 100644
index 4db5379c491..00000000000
--- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?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="arch" type="xml">
-                <form string="Stock Periods" version="7.0">
-                    <group col="4">
-                        <label for="date_start" string="Duration"/>
-                        <div>
-                            <field name="date_start"/>
-                            <label string="-"/>
-                            <field name="date_stop"/>
-                        </div>
-                    </group>
-                    <footer>
-                        <button name="create_stock_periods" string="Create Daily Periods" type="object" class="oe_highlight"/>
-                        or
-                        <button name="create_stock_periods" string="Create Weekly Periods" type="object" context="{'interval': 6, 'name': 'Weekly'}" class="oe_highlight"/>
-                        or
-                        <button name="create_stock_periods" string="Create Monthly Periods" type="object" context="{'interval': 1, 'name': 'Monthly'}" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_stock_period_createlines_form" model="ir.actions.act_window">
-            <field name="name">Stock 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="help">This wizard helps with the creation of stock planning periods. These periods are independent of financial periods. If you need periods other than day-, week- or month-based, you may also add then manually.</field>
-            <field name="target">new</field>
-        </record>
-
-        <menuitem id="menu_stock_period_creatlines"
-            name="Create Stock Periods"
-            parent="stock.menu_stock_configuration"
-            action="action_stock_period_createlines_form"
-            sequence = "20"/>
-    </data>
-</openerp>
diff --git a/addons/stock_planning/wizard/stock_planning_createlines.py b/addons/stock_planning/wizard/stock_planning_createlines.py
deleted file mode 100644
index 394606ebb4d..00000000000
--- a/addons/stock_planning/wizard/stock_planning_createlines.py
+++ /dev/null
@@ -1,139 +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 _
-
-# 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')
-        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_id.id, f.warehouse_id.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)])
-                products_id1 = product_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)])
-            if len(products_id1)==0:
-                raise osv.except_osv(_('Error!'), _('No forecasts for selected period or no products available 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()
-                    if ret:
-                        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,
-
-                    }))
-
-        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',
-        }
-
-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
deleted file mode 100644
index 2befba6d820..00000000000
--- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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="arch" type="xml">
-                <form string="Create Stock Planning Lines" version="7.0">
-                    <group col="4">
-                        <field name="period_id"/>
-                        <field name="company_id" widget= "selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>
-                        <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
-                        <field name="forecasted_products"/>
-                        <field name="product_categ_id" attrs="{'required':[('forecasted_products','=',0)]}"/>
-                    </group>
-                    <footer>
-                        <button name="create_planning" string="Create" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel"/>
-                    </footer>
-                </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="src_model">stock.planning</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="help">This wizard helps create MPS planning lines for a given selected period and warehouse, so you don't have to create them one by one. The wizard doesn't duplicate lines if they already exist for this selection.</field>
-            <field name="target">new</field>
-        </record>
-
-        <menuitem
-            id="menu_stock_planning_createlines"
-            parent="menu_stock_planning_manual"
-            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
deleted file mode 100644
index 3dad3624aa4..00000000000
--- a/addons/stock_planning/wizard/stock_planning_forecast.py
+++ /dev/null
@@ -1,108 +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 _
-
-# 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"
-
-
-    _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')
-        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)])
-            products_ids = product_obj.search(cr, uid, [('categ_id','in',prod_categ_ids)])
-            if len(products_ids) == 0:
-                raise osv.except_osv(_('Error!'), _('No products available 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
-                    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,
-                     }))
-
-        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',
-        }
-
-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
deleted file mode 100644
index 705e0a8cfb7..00000000000
--- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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="arch" type="xml">
-                <form string="Create Forecasts Lines" version="7.0">
-                    <group col="4">
-                        <field name="period_id"/>
-                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                        <field name="warehouse_id" domain = "[('company_id','=',company_id)] "/>
-                        <field name="copy_forecast"/>
-                        <field name="product_categ_id" widget="selection"/>
-                    </group>
-                    <footer>
-                        <button name="create_forecast" string="Create" type="object" class="oe_highlight"/>
-                        or
-                        <button string="Cancel" class="oe_link" special="cancel" />
-                    </footer>
-                </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>
-            <field name="help">This wizard helps create many forecast lines at once. After creating them you only have to fill in the forecast quantities. The wizard doesn't duplicate the line when another one exist for the same selection.</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 3a4220efe52..b301525eb42 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -31,18 +31,17 @@ Create recurring documents.
 This module allows to create new documents and add subscriptions on that document.
 
 e.g. To have an invoice generated automatically periodically:
+-------------------------------------------------------------
     * Define a document type based on Invoice object
     * Define a subscription whose source document is the document defined as
       above. Specify the interval information and partner to be invoice.
     """,
     'author': 'OpenERP SA',
-    'depends': ['base_tools'],
-    'init_xml': [],
-    'update_xml': ['security/subcription_security.xml', 'security/ir.model.access.csv', 'subscription_view.xml'],
-    'demo_xml': ['subscription_demo.xml',],
+    'depends': [],
+    'data': ['security/subcription_security.xml', 'security/ir.model.access.csv', 'subscription_view.xml'],
+    'demo': ['subscription_demo.xml',],
     'installable': True,
     'auto_install': False,
-    'certificate': '0029454782573',
     'images': ['images/subscription_document_fields.jpeg','images/subscriptions.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/subscription/i18n/ar.po b/addons/subscription/i18n/ar.po
index 4f9bdb47b5d..40f92108e15 100644
--- a/addons/subscription/i18n/ar.po
+++ b/addons/subscription/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -35,7 +35,7 @@ msgstr "هذا الأسبوع"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Search Subscription"
-msgstr ""
+msgstr "بحث عن اشتراكات"
 
 #. module: subscription
 #: field:subscription.subscription,date_init:0
@@ -56,7 +56,7 @@ msgstr "الحالة"
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription_history
 msgid "Subscription history"
-msgstr ""
+msgstr "تاريخ الإشتراك"
 
 #. module: subscription
 #: selection:subscription.subscription,state:0
@@ -94,7 +94,7 @@ msgstr "الاشتراكات"
 #. module: subscription
 #: field:subscription.subscription,interval_number:0
 msgid "Interval Qty"
-msgstr ""
+msgstr "كمية الفواصل"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -115,7 +115,7 @@ msgstr "قيد التنفيذ"
 #. module: subscription
 #: view:subscription.subscription.history:0
 msgid "Subscription History"
-msgstr ""
+msgstr "تاريخ الإشتراك"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -144,6 +144,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "subscription document without removing it."
 msgstr ""
+"إذا تم تعيين الحقل النشط إلى خطأ ، سوف تسمح لك بإخفاء وثيقة الاشتراك دون "
+"إزالته."
 
 #. module: subscription
 #: field:subscription.document,name:0
@@ -188,7 +190,7 @@ msgstr "نشط"
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
 msgid "Cron Job"
-msgstr ""
+msgstr "وظيفة دورية"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription
@@ -205,18 +207,18 @@ msgstr "شريك"
 #. module: subscription
 #: help:subscription.subscription,cron_id:0
 msgid "Scheduler which runs on subscription"
-msgstr ""
+msgstr "جدولة الذي يعمل على الاشتراك"
 
 #. module: subscription
 #: model:ir.ui.menu,name:subscription.config_recuuring_event
 #: model:ir.ui.menu,name:subscription.next_id_45
 msgid "Recurring Events"
-msgstr ""
+msgstr "أحداث المتكررة"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Subsription Data"
-msgstr ""
+msgstr "تاريخ الإشتراك"
 
 #. module: subscription
 #: help:subscription.subscription,note:0
diff --git a/addons/subscription/i18n/bg.po b/addons/subscription/i18n/bg.po
index 419b4d03e27..39d67e4a373 100644
--- a/addons/subscription/i18n/bg.po
+++ b/addons/subscription/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/bs.po b/addons/subscription/i18n/bs.po
index 9c50ee4dce2..7b39e4684bb 100644
--- a/addons/subscription/i18n/bs.po
+++ b/addons/subscription/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ca.po b/addons/subscription/i18n/ca.po
index 55d3824baaf..6ed39cd375b 100644
--- a/addons/subscription/i18n/ca.po
+++ b/addons/subscription/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/cs.po b/addons/subscription/i18n/cs.po
index b01d8a8053e..24a26f145cc 100644
--- a/addons/subscription/i18n/cs.po
+++ b/addons/subscription/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/da.po b/addons/subscription/i18n/da.po
index 56cb44be775..caba174923c 100644
--- a/addons/subscription/i18n/da.po
+++ b/addons/subscription/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/de.po b/addons/subscription/i18n/de.po
index bc104f81fcd..0c4994736cf 100644
--- a/addons/subscription/i18n/de.po
+++ b/addons/subscription/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/es.po b/addons/subscription/i18n/es.po
index 3217c56d46d..9c95a215ac5 100644
--- a/addons/subscription/i18n/es.po
+++ b/addons/subscription/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/es_AR.po b/addons/subscription/i18n/es_AR.po
index 8eb40f81418..5f54e17c220 100644
--- a/addons/subscription/i18n/es_AR.po
+++ b/addons/subscription/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/es_CR.po b/addons/subscription/i18n/es_CR.po
index ed16153a390..13da06358f6 100644
--- a/addons/subscription/i18n/es_CR.po
+++ b/addons/subscription/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: subscription
diff --git a/addons/subscription/i18n/et.po b/addons/subscription/i18n/et.po
index d78616b6b98..7087aeb30d4 100644
--- a/addons/subscription/i18n/et.po
+++ b/addons/subscription/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/fi.po b/addons/subscription/i18n/fi.po
index 38409585cdf..e9f898fd1dc 100644
--- a/addons/subscription/i18n/fi.po
+++ b/addons/subscription/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/fr.po b/addons/subscription/i18n/fr.po
index 2f98ea78770..b9b08cb363c 100644
--- a/addons/subscription/i18n/fr.po
+++ b/addons/subscription/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/gl.po b/addons/subscription/i18n/gl.po
index 0845920e139..00bdf980cce 100644
--- a/addons/subscription/i18n/gl.po
+++ b/addons/subscription/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/hr.po b/addons/subscription/i18n/hr.po
index 3f6c7ef49e8..ea867695176 100644
--- a/addons/subscription/i18n/hr.po
+++ b/addons/subscription/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/hu.po b/addons/subscription/i18n/hu.po
index cf8f3962e22..b6df3b75f1e 100644
--- a/addons/subscription/i18n/hu.po
+++ b/addons/subscription/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/id.po b/addons/subscription/i18n/id.po
index c290b5cc596..64579b40e91 100644
--- a/addons/subscription/i18n/id.po
+++ b/addons/subscription/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/it.po b/addons/subscription/i18n/it.po
index 862d3ca075c..47355d6db14 100644
--- a/addons/subscription/i18n/it.po
+++ b/addons/subscription/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ja.po b/addons/subscription/i18n/ja.po
index a9774f4b156..f9ac02a9086 100644
--- a/addons/subscription/i18n/ja.po
+++ b/addons/subscription/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ko.po b/addons/subscription/i18n/ko.po
index 4eda73fa924..abe2bc3e1a1 100644
--- a/addons/subscription/i18n/ko.po
+++ b/addons/subscription/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -36,7 +36,7 @@ msgstr ""
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Search Subscription"
-msgstr ""
+msgstr "검색 구독"
 
 #. module: subscription
 #: field:subscription.subscription,date_init:0
@@ -100,7 +100,7 @@ msgstr "인터벌 수량"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Stop"
-msgstr "중단"
+msgstr "끝나기"
 
 #. module: subscription
 #: view:subscription.subscription:0
diff --git a/addons/subscription/i18n/lt.po b/addons/subscription/i18n/lt.po
index 51b14626662..2e7501fa3ee 100644
--- a/addons/subscription/i18n/lt.po
+++ b/addons/subscription/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/nl.po b/addons/subscription/i18n/nl.po
index 9821bd76a52..1fe871997e2 100644
--- a/addons/subscription/i18n/nl.po
+++ b/addons/subscription/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-08 10:35+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -110,7 +110,7 @@ msgstr "Naar Concept"
 #: view:subscription.subscription:0
 #: selection:subscription.subscription,state:0
 msgid "Running"
-msgstr "Loopt"
+msgstr "In behandeling"
 
 #. module: subscription
 #: view:subscription.subscription.history:0
diff --git a/addons/subscription/i18n/nl_BE.po b/addons/subscription/i18n/nl_BE.po
index 2eaba75b635..a5382898f5a 100644
--- a/addons/subscription/i18n/nl_BE.po
+++ b/addons/subscription/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/pl.po b/addons/subscription/i18n/pl.po
index 2c335d06a76..a98efcd83be 100644
--- a/addons/subscription/i18n/pl.po
+++ b/addons/subscription/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/pt.po b/addons/subscription/i18n/pt.po
index 4ad1ad07207..1459df2ed2c 100644
--- a/addons/subscription/i18n/pt.po
+++ b/addons/subscription/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/pt_BR.po b/addons/subscription/i18n/pt_BR.po
index 293af628b7b..1dd3d6f177b 100644
--- a/addons/subscription/i18n/pt_BR.po
+++ b/addons/subscription/i18n/pt_BR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
@@ -157,7 +157,7 @@ msgstr "Nome"
 #: code:addons/subscription/subscription.py:136
 #, python-format
 msgid "You cannot delete an active subscription !"
-msgstr ""
+msgstr "Você não pode excluir uma inscrição ativa!"
 
 #. module: subscription
 #: field:subscription.document,field_ids:0
diff --git a/addons/subscription/i18n/ro.po b/addons/subscription/i18n/ro.po
index 94b2b0862c6..5165378aa6a 100644
--- a/addons/subscription/i18n/ro.po
+++ b/addons/subscription/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/ru.po b/addons/subscription/i18n/ru.po
index 9d9c1742f38..51749592eee 100644
--- a/addons/subscription/i18n/ru.po
+++ b/addons/subscription/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/sl.po b/addons/subscription/i18n/sl.po
index 0f57f703100..05b9cdabe56 100644
--- a/addons/subscription/i18n/sl.po
+++ b/addons/subscription/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/sq.po b/addons/subscription/i18n/sq.po
index 7b2b1d262f2..6b5bd7c04ba 100644
--- a/addons/subscription/i18n/sq.po
+++ b/addons/subscription/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/sv.po b/addons/subscription/i18n/sv.po
index 2f4d5268764..23b1278b669 100644
--- a/addons/subscription/i18n/sv.po
+++ b/addons/subscription/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/tlh.po b/addons/subscription/i18n/tlh.po
index a9d620ae671..b6c65274c55 100644
--- a/addons/subscription/i18n/tlh.po
+++ b/addons/subscription/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/tr.po b/addons/subscription/i18n/tr.po
index 05ae29ebb15..2e86d7d69ee 100644
--- a/addons/subscription/i18n/tr.po
+++ b/addons/subscription/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/uk.po b/addons/subscription/i18n/uk.po
index 764e2a13743..fa83671a6bc 100644
--- a/addons/subscription/i18n/uk.po
+++ b/addons/subscription/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/vi.po b/addons/subscription/i18n/vi.po
index dad2d180a3e..cd92d143d8f 100644
--- a/addons/subscription/i18n/vi.po
+++ b/addons/subscription/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/zh_CN.po b/addons/subscription/i18n/zh_CN.po
index 54f418b58e1..4b1244be06e 100644
--- a/addons/subscription/i18n/zh_CN.po
+++ b/addons/subscription/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/i18n/zh_TW.po b/addons/subscription/i18n/zh_TW.po
index a880ce4a6a5..2b9c6e7a3a1 100644
--- a/addons/subscription/i18n/zh_TW.po
+++ b/addons/subscription/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 04:51+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: subscription
 #: field:subscription.subscription,doc_source:0
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 45916e04aee..25137f6303c 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -72,7 +72,7 @@ class subscription_subscription(osv.osv):
         'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'Status'),
         'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128, help="User can choose the source document on which he wants to create documents"),
         'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created', readonly=True),
-        'cron_id': fields.many2one('ir.cron', 'Cron Job', help="Scheduler which runs on subscription"),
+        'cron_id': fields.many2one('ir.cron', 'Cron Job', help="Scheduler which runs on subscription", states={'running':[('readonly',True)], 'done':[('readonly',True)]}),
         'note': fields.text('Notes', help="Description or Summary of Subscription"),
     }
     _defaults = {
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index dd3e1634420..2b9acbb7985 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <!-- Top menu item -->
+        <menuitem name="Tools" id="base.menu_tools" sequence="160"/>
         <menuitem id="next_id_45" name="Recurring Events" parent="base.menu_tools" sequence="4"/>
 
         <!-- Subscription Views -->
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 150623b0db7..d5e4c3af10c 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -34,30 +34,31 @@ 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': 'OpenERP SA',
-    'depends': ['base_tools', 'mail'],
-    'update_xml': ['survey_report.xml',
-                   'survey_data.xml',
-                   'wizard/survey_selection.xml',
-                   'wizard/survey_answer.xml',
-                   'security/survey_security.xml',
-                   'security/ir.model.access.csv',
-                   'survey_view.xml',
-                   'wizard/survey_print_statistics.xml',
-                   'wizard/survey_print_answer.xml',
-                   'wizard/survey_browse_answer.xml',
-                   'wizard/survey_print.xml',
-                   'wizard/survey_send_invitation.xml'],
-    'demo_xml': ['survey_demo.xml'],
+    'depends': ['mail'],
+    'data': [
+        'survey_report.xml',
+        'survey_data.xml',
+        'wizard/survey_selection.xml',
+        'wizard/survey_answer.xml',
+        'security/survey_security.xml',
+        'security/ir.model.access.csv',
+        'survey_view.xml',
+        'wizard/survey_print_statistics.xml',
+        'wizard/survey_print_answer.xml',
+        'wizard/survey_browse_answer.xml',
+        'wizard/survey_print.xml',
+        'wizard/survey_send_invitation.xml'
+    ],
+    'demo': ['survey_demo.xml'],
     'test': [
         'test/draft2open2close_survey.yml',
         'test/draft2open2close_request.yml',
         'test/survey_question_type.yml',
         'test/survey_report.yml',
     ],
-    'css': ['static/src/css/survey.css'],
     'installable': True,
     'auto_install': False,
-    'certificate' : '001131639736864143245',
-    'images': ['images/survey_answers.jpeg','images/survey_pages.jpeg','images/surveys.jpeg'],
+    'images': ['images/survey_answers.jpeg','images/survey_pages.jpeg','images/surveys.jpeg'],   
+    'css': ['static/src/css/survey.css','static/css/survey.css'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/survey/i18n/ar.po b/addons/survey/i18n/ar.po
index 90b9f947584..94178fc6305 100644
--- a/addons/survey/i18n/ar.po
+++ b/addons/survey/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -75,7 +75,7 @@ msgstr "الإستفتاءات"
 #. module: survey
 #: field:survey.question,in_visible_answer_type:0
 msgid "Is Answer Type Invisible?"
-msgstr ""
+msgstr "نوع الإجابة غير مرأي؟"
 
 #. module: survey
 #: view:survey:0
@@ -93,7 +93,7 @@ msgstr "النتائج:"
 #. module: survey
 #: view:survey.request:0
 msgid "Survey Request"
-msgstr ""
+msgstr "طلب استطلاع"
 
 #. module: survey
 #: selection:survey.question,required_type:0
@@ -103,7 +103,7 @@ msgstr "مدي"
 #. module: survey
 #: view:survey.response.line:0
 msgid "Table Answer"
-msgstr ""
+msgstr "جدول الإجابة"
 
 #. module: survey
 #: field:survey.history,date:0
@@ -122,6 +122,8 @@ msgid ""
 "You must enter one or more menu                                 choices in "
 "column heading (white spaces not allowed)"
 msgstr ""
+"يجب عليك إدخال قائمة اختيار واحدة أو أكثر في العمود (المساحات البيضاء غير "
+"مسموحة)"
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_menu_choice:0
@@ -136,24 +138,24 @@ msgstr "النص"
 #. module: survey
 #: field:survey.question,allow_comment:0
 msgid "Allow Comment Field"
-msgstr ""
+msgstr "السماح لحقل التعليق"
 
 #. module: survey
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "A4 (210mm x 297mm)"
-msgstr ""
+msgstr "A4 (210mm x 297mm)"
 
 #. module: survey
 #: field:survey.question,comment_maximum_date:0
 #: field:survey.question,validation_maximum_date:0
 msgid "Maximum date"
-msgstr ""
+msgstr "التاريخ الأقصى"
 
 #. module: survey
 #: field:survey.question,in_visible_menu_choice:0
 msgid "Is Menu Choice Invisible?"
-msgstr ""
+msgstr "هل خيار القائمة مرئي؟"
 
 #. module: survey
 #: view:survey:0
diff --git a/addons/survey/i18n/bg.po b/addons/survey/i18n/bg.po
index 49368b05023..1ee760eb981 100644
--- a/addons/survey/i18n/bg.po
+++ b/addons/survey/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/ca.po b/addons/survey/i18n/ca.po
index 5d87a6b1e99..9af8c7704e0 100644
--- a/addons/survey/i18n/ca.po
+++ b/addons/survey/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/cs.po b/addons/survey/i18n/cs.po
index 603426b10c8..6564c5e70ca 100644
--- a/addons/survey/i18n/cs.po
+++ b/addons/survey/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/da.po b/addons/survey/i18n/da.po
index 7d0f6916030..9bf52a54a22 100644
--- a/addons/survey/i18n/da.po
+++ b/addons/survey/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/de.po b/addons/survey/i18n/de.po
index 59d4c0b231e..673a279efcb 100644
--- a/addons/survey/i18n/de.po
+++ b/addons/survey/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/es.po b/addons/survey/i18n/es.po
index 542e8dba498..64a836c2071 100644
--- a/addons/survey/i18n/es.po
+++ b/addons/survey/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/es_CR.po b/addons/survey/i18n/es_CR.po
index c751c1245be..3c03d128060 100644
--- a/addons/survey/i18n/es_CR.po
+++ b/addons/survey/i18n/es_CR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: survey
diff --git a/addons/survey/i18n/et.po b/addons/survey/i18n/et.po
index 5ee32250d64..ac409aaad6d 100644
--- a/addons/survey/i18n/et.po
+++ b/addons/survey/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/fi.po b/addons/survey/i18n/fi.po
index 6a4ab67cee6..c73d61d9745 100644
--- a/addons/survey/i18n/fi.po
+++ b/addons/survey/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/fr.po b/addons/survey/i18n/fr.po
index 5c382abec0b..67782f77158 100644
--- a/addons/survey/i18n/fr.po
+++ b/addons/survey/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/gl.po b/addons/survey/i18n/gl.po
index 24f9660fdb8..a26e2eb7492 100644
--- a/addons/survey/i18n/gl.po
+++ b/addons/survey/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/hr.po b/addons/survey/i18n/hr.po
index db5e01173cb..bbae1174415 100644
--- a/addons/survey/i18n/hr.po
+++ b/addons/survey/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: survey
diff --git a/addons/survey/i18n/hu.po b/addons/survey/i18n/hu.po
index b6d8d13b24e..562a14cee02 100644
--- a/addons/survey/i18n/hu.po
+++ b/addons/survey/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/it.po b/addons/survey/i18n/it.po
index 421d2796cc1..7be2b4f807b 100644
--- a/addons/survey/i18n/it.po
+++ b/addons/survey/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/ja.po b/addons/survey/i18n/ja.po
index 3fd844147f1..889e12babac 100644
--- a/addons/survey/i18n/ja.po
+++ b/addons/survey/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/mn.po b/addons/survey/i18n/mn.po
index 3462e0a73dc..3402143c440 100644
--- a/addons/survey/i18n/mn.po
+++ b/addons/survey/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/nl.po b/addons/survey/i18n/nl.po
index dffbd08800b..e7e891ed681 100644
--- a/addons/survey/i18n/nl.po
+++ b/addons/survey/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:25+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/pl.po b/addons/survey/i18n/pl.po
index 870b76cd9f5..e9fce56a182 100644
--- a/addons/survey/i18n/pl.po
+++ b/addons/survey/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/pt.po b/addons/survey/i18n/pt.po
index 815394a20db..f881e365eba 100644
--- a/addons/survey/i18n/pt.po
+++ b/addons/survey/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:23+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/pt_BR.po b/addons/survey/i18n/pt_BR.po
index bf587481f21..2740c2759ff 100644
--- a/addons/survey/i18n/pt_BR.po
+++ b/addons/survey/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2012-05-10 18:26+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-10-17 00:09+0000\n"
+"Last-Translator: ERIVELTON PIRES GUEDES <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: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
@@ -534,6 +534,11 @@ msgid ""
 "etc. You can edit survey manually or click on the 'Edit Survey' for a "
 "WYSIWYG interface."
 msgstr ""
+"Você pode criar pesquisas para vários propósitos: entrevistas de "
+"recrutamento, avaliação periódica de empregados, campanhas de marketing, "
+"etc. Uma pesquisa é feita de páginas contendo questões de vários tipos: "
+"texto, múltipla escolha, etc. Você pode editar a pesquisa manualmente ou "
+"clicar em \"Editar pesquisa\" para uma interface do tipo WYSIWYG."
 
 #. module: survey
 #: view:survey:0
@@ -745,7 +750,7 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "When the question is not answered, display this error message:"
-msgstr ""
+msgstr "Quando a questão não for respondida mostrar esta mensagem de erro:"
 
 #. module: survey
 #: view:survey:0
@@ -762,7 +767,7 @@ msgstr ""
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_browse_survey_response
 msgid "Browse Answers"
-msgstr ""
+msgstr "Navegar pelas respostas"
 
 #. module: survey
 #: field:survey.response.answer,comment_field:0
@@ -796,7 +801,7 @@ msgstr "Responder Pesquisa"
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Comment Field"
-msgstr ""
+msgstr "Campo de comentário"
 
 #. module: survey
 #: selection:survey.response,response_type:0
@@ -823,7 +828,7 @@ msgstr "Página"
 #. module: survey
 #: field:survey.question,comment_column:0
 msgid "Add comment column in matrix"
-msgstr ""
+msgstr "Acrescentar coluna de comentário na matriz"
 
 #. module: survey
 #: field:survey.answer,response:0
@@ -842,6 +847,8 @@ msgstr ""
 #: view:survey.question:0
 msgid "When the comment is an invalid format, display this error message"
 msgstr ""
+"Quando o comentário estiver num formato inválido mostrar esta mensagem de "
+"erro"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_selection.py:83
@@ -860,7 +867,7 @@ msgstr "Questões"
 #. module: survey
 #: help:survey,response_user:0
 msgid "Set to one if  you require only one Answer per user"
-msgstr ""
+msgstr "Informe 1 caso somente uma resposta por usuário sejá requerida"
 
 #. module: survey
 #: field:survey,users:0
@@ -1645,7 +1652,7 @@ msgstr "Ponto Flutuante"
 #. module: survey
 #: view:survey.response.line:0
 msgid "Single Textboxes"
-msgstr ""
+msgstr "Caixas de texto simples"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_send_invitation.py:74
diff --git a/addons/survey/i18n/ro.po b/addons/survey/i18n/ro.po
index a87e24a2c81..584c66786ac 100644
--- a/addons/survey/i18n/ro.po
+++ b/addons/survey/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/ru.po b/addons/survey/i18n/ru.po
index 5236db3c6de..20ef953c8ad 100644
--- a/addons/survey/i18n/ru.po
+++ b/addons/survey/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/sl.po b/addons/survey/i18n/sl.po
index bb7167c85c2..746acc13ba1 100644
--- a/addons/survey/i18n/sl.po
+++ b/addons/survey/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/sr.po b/addons/survey/i18n/sr.po
index c5d09693c3b..528690e52d4 100644
--- a/addons/survey/i18n/sr.po
+++ b/addons/survey/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/sr@latin.po b/addons/survey/i18n/sr@latin.po
index c32513bfd12..db34d3b9778 100644
--- a/addons/survey/i18n/sr@latin.po
+++ b/addons/survey/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/sv.po b/addons/survey/i18n/sv.po
index 7b705966817..016cc1e05d7 100644
--- a/addons/survey/i18n/sv.po
+++ b/addons/survey/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/i18n/tr.po b/addons/survey/i18n/tr.po
index fcd6aeed244..a89c58dbb9b 100644
--- a/addons/survey/i18n/tr.po
+++ b/addons/survey/i18n/tr.po
@@ -14,14 +14,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
 #: view:survey.print.answer:0
 msgid "Print Option"
-msgstr ""
+msgstr "Yazdırma Seçenekleri"
 
 #. module: survey
 #: code:addons/survey/survey.py:417
@@ -35,13 +35,13 @@ msgstr ""
 #. module: survey
 #: view:survey.question.wiz:0
 msgid "Your Messages"
-msgstr ""
+msgstr "Mesajlarınız"
 
 #. module: survey
 #: field:survey.question,comment_valid_type:0
 #: field:survey.question,validation_type:0
 msgid "Text Validation"
-msgstr ""
+msgstr "Karakter Kontrolü"
 
 #. module: survey
 #: code:addons/survey/survey.py:429
@@ -56,12 +56,12 @@ msgstr ""
 #: view:survey:0
 #: field:survey,invited_user_ids:0
 msgid "Invited User"
-msgstr ""
+msgstr "Davetli Kullanıcı"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Character"
-msgstr ""
+msgstr "Karakter"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_form1
@@ -70,12 +70,12 @@ msgstr ""
 #: model:ir.ui.menu,name:survey.menu_survey_form
 #: model:ir.ui.menu,name:survey.menu_surveys
 msgid "Surveys"
-msgstr ""
+msgstr "Anketler"
 
 #. module: survey
 #: field:survey.question,in_visible_answer_type:0
 msgid "Is Answer Type Invisible?"
-msgstr ""
+msgstr "Anket Türü gizli mi?"
 
 #. module: survey
 #: view:survey:0
@@ -93,27 +93,27 @@ msgstr "Sonuçlar :"
 #. module: survey
 #: view:survey.request:0
 msgid "Survey Request"
-msgstr ""
+msgstr "Anket İsteği"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "A Range"
-msgstr ""
+msgstr "Aralık"
 
 #. module: survey
 #: view:survey.response.line:0
 msgid "Table Answer"
-msgstr ""
+msgstr "Tablo Cevabı"
 
 #. module: survey
 #: field:survey.history,date:0
 msgid "Date started"
-msgstr ""
+msgstr "Başlangıç Tarihi"
 
 #. module: survey
 #: field:survey,history:0
 msgid "History Lines"
-msgstr ""
+msgstr "Geçmiş Satırlar"
 
 #. module: survey
 #: code:addons/survey/survey.py:443
@@ -122,63 +122,65 @@ msgid ""
 "You must enter one or more menu                                 choices in "
 "column heading (white spaces not allowed)"
 msgstr ""
+"Kolon başlığında bir veya birden fazla seçenek girmelisiniz (Boşluk "
+"kullanamazsınız)"
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_menu_choice:0
 msgid "Is Menu Choice Invisible??"
-msgstr ""
+msgstr "Menü seçeneği görünmez olacak mı?"
 
 #. module: survey
 #: field:survey.send.invitation,mail:0
 msgid "Body"
-msgstr ""
+msgstr "Gövde"
 
 #. module: survey
 #: field:survey.question,allow_comment:0
 msgid "Allow Comment Field"
-msgstr ""
+msgstr "Yorum Alanına İzin Ver"
 
 #. module: survey
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "A4 (210mm x 297mm)"
-msgstr ""
+msgstr "A4 (210mm x 297mm)"
 
 #. module: survey
 #: field:survey.question,comment_maximum_date:0
 #: field:survey.question,validation_maximum_date:0
 msgid "Maximum date"
-msgstr ""
+msgstr "Maksimum Tarih"
 
 #. module: survey
 #: field:survey.question,in_visible_menu_choice:0
 msgid "Is Menu Choice Invisible?"
-msgstr ""
+msgstr "Menü Seçeneği Görünmez mi?"
 
 #. module: survey
 #: view:survey:0
 msgid "Completed"
-msgstr ""
+msgstr "Tamamlandı"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "Exactly"
-msgstr ""
+msgstr "Tam olarak"
 
 #. module: survey
 #: view:survey:0
 msgid "Open Date"
-msgstr ""
+msgstr "Başlangıç Tarihi"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Taslak Olarak Kaydet"
 
 #. module: survey
 #: field:survey.question,is_comment_require:0
 msgid "Add Comment Field"
-msgstr ""
+msgstr "Yorum Alanı Ekle"
 
 #. module: survey
 #: code:addons/survey/survey.py:396
@@ -192,12 +194,12 @@ msgstr ""
 #. module: survey
 #: field:survey.question,tot_resp:0
 msgid "Total Answer"
-msgstr ""
+msgstr "Toplam Cevap"
 
 #. module: survey
 #: field:survey.tbl.column.heading,name:0
 msgid "Row Number"
-msgstr ""
+msgstr "Satır Numarası"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_name_wiz
@@ -207,12 +209,12 @@ msgstr ""
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_question_form
 msgid "Survey Questions"
-msgstr ""
+msgstr "Anket Soruları"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Choices (Only One Answers Per Row)"
-msgstr ""
+msgstr "Seçenekler Matrisi (Satır başına bir cevap)"
 
 #. module: survey
 #: code:addons/survey/survey.py:470
@@ -229,78 +231,78 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Survey Question"
-msgstr ""
+msgstr "Anket Sorusu"
 
 #. module: survey
 #: view:survey.question.column.heading:0
 msgid "Use if question type is rating_scale"
-msgstr ""
+msgstr "Soru ölçülebilir (rating scale) ise seçiniz"
 
 #. module: survey
 #: field:survey.print,page_number:0
 #: field:survey.print.answer,page_number:0
 msgid "Include Page Number"
-msgstr ""
+msgstr "Sayfa Numarası Dahil"
 
 #. module: survey
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Ok"
-msgstr ""
+msgstr "Tamam"
 
 #. module: survey
 #: field:survey.page,title:0
 msgid "Page Title"
-msgstr ""
+msgstr "Sayfa Başlığı"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_define_survey
 msgid "Define Surveys"
-msgstr ""
+msgstr "Anket Tanımla"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_history
 msgid "Survey History"
-msgstr ""
+msgstr "Anket Geçmişi"
 
 #. module: survey
 #: field:survey.response.answer,comment:0
 #: field:survey.response.line,comment:0
 msgid "Notes"
-msgstr ""
+msgstr "Notlar"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.request:0
 msgid "Search Survey"
-msgstr ""
+msgstr "Anket Ara"
 
 #. module: survey
 #: field:survey.response.answer,answer:0
 #: field:survey.tbl.column.heading,value:0
 msgid "Value"
-msgstr ""
+msgstr "Değer"
 
 #. module: survey
 #: field:survey.question,column_heading_ids:0
 msgid " Column heading"
-msgstr ""
+msgstr " Sütun Başlığı"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_run_survey_form
 msgid "Answer a Survey"
-msgstr ""
+msgstr "Anket Cevapla"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:87
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Hata!"
 
 #. module: survey
 #: field:survey,tot_comp_survey:0
 msgid "Total Completed Survey"
-msgstr ""
+msgstr "Toplam Cevaplanan Anket"
 
 #. module: survey
 #: view:survey.response.answer:0
@@ -310,24 +312,24 @@ msgstr ""
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_analysis
 msgid "Survey Statistics"
-msgstr ""
+msgstr "Anket İstatistiği"
 
 #. module: survey
 #: selection:survey,state:0
 #: view:survey.request:0
 #: selection:survey.request,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "İptal Edildi"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Rating Scale"
-msgstr ""
+msgstr "Ölçüm Skalası (Rating Scale)"
 
 #. module: survey
 #: field:survey.question,comment_field_type:0
 msgid "Comment Field Type"
-msgstr ""
+msgstr "Yorum Alanı Türü"
 
 #. module: survey
 #: code:addons/survey/survey.py:370
@@ -375,12 +377,12 @@ msgstr ""
 #: code:addons/survey/wizard/survey_send_invitation.py:74
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Uyarı!"
 
 #. module: survey
 #: selection:survey.question,comment_field_type:0
 msgid "Single Line Of Text"
-msgstr ""
+msgstr "Yazının tek satırı"
 
 #. module: survey
 #: view:survey.send.invitation:0
@@ -391,108 +393,108 @@ msgstr ""
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Choice (Multiple Answer)"
-msgstr ""
+msgstr "Çoktan Seçmeli"
 
 #. module: survey
 #: view:survey:0
 msgid "Edit Survey"
-msgstr ""
+msgstr "Anket Düzenle"
 
 #. module: survey
 #: view:survey.response.line:0
 msgid "Survey Answer Line"
-msgstr ""
+msgstr "Anket Cevap Satırı"
 
 #. module: survey
 #: field:survey.question.column.heading,menu_choice:0
 msgid "Menu Choice"
-msgstr ""
+msgstr "Menü Seçeneği"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "At Most"
-msgstr ""
+msgstr "En Çok"
 
 #. module: survey
 #: view:survey:0
 msgid "My Survey(s)"
-msgstr ""
+msgstr "Anketlerim"
 
 #. module: survey
 #: field:survey.question,is_validation_require:0
 msgid "Validate Text"
-msgstr ""
+msgstr "Metnin geçerliliğini denetle"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "_Cancel"
-msgstr ""
+msgstr "İptal Et"
 
 #. module: survey
 #: field:survey.response.line,single_text:0
 msgid "Text"
-msgstr ""
+msgstr "Metin"
 
 #. module: survey
 #: constraint:res.users:0
 msgid "The chosen company is not in the allowed companies for this user"
-msgstr ""
+msgstr "Bu kullanıcının seçilen şirkete erişim hakkı yok"
 
 #. module: survey
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Letter (8.5\" x 11\")"
-msgstr ""
+msgstr "Mektup (8.5\" x 11\")"
 
 #. module: survey
 #: view:survey:0
 #: field:survey,responsible_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Sorumlu"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_request
 msgid "survey.request"
-msgstr ""
+msgstr "İstek"
 
 #. module: survey
 #: field:survey.send.invitation,mail_subject:0
 #: field:survey.send.invitation,mail_subject_existing:0
 msgid "Subject"
-msgstr ""
+msgstr "Konu"
 
 #. module: survey
 #: field:survey.question,comment_maximum_float:0
 #: field:survey.question,validation_maximum_float:0
 msgid "Maximum decimal number"
-msgstr ""
+msgstr "Maksimum ondalık sayı"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_tbl_column_heading
 msgid "survey.tbl.column.heading"
-msgstr ""
+msgstr "Başlık"
 
 #. module: survey
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Aynı kullanıcı adı ile iki kullanıcı oluşturamazsınız !"
 
 #. module: survey
 #: field:survey.send.invitation,mail_from:0
 msgid "From"
-msgstr ""
+msgstr "Gönderen"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Don't Validate Comment Text."
-msgstr ""
+msgstr "Metnin geçerliliğini kontrol etme"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Whole Number"
-msgstr ""
+msgstr "Bütün bir numara olmalı"
 
 #. module: survey
 #: field:survey.answer,question_id:0
@@ -501,17 +503,17 @@ msgstr ""
 #: field:survey.question.column.heading,question_id:0
 #: field:survey.response.line,question_id:0
 msgid "Question"
-msgstr ""
+msgstr "Soru"
 
 #. module: survey
 #: view:survey.page:0
 msgid "Search Survey Page"
-msgstr ""
+msgstr "Anket Sayfası Ara"
 
 #. module: survey
 #: field:survey.question.wiz,name:0
 msgid "Number"
-msgstr ""
+msgstr "Sayı"
 
 #. module: survey
 #: code:addons/survey/survey.py:439
@@ -519,7 +521,7 @@ msgstr ""
 msgid ""
 "You must enter one or more menu choices                                 in "
 "column heading"
-msgstr ""
+msgstr "Sütun başlığında bir veya daha fazla seçenek girmelisiniz."
 
 #. module: survey
 #: model:ir.actions.act_window,help:survey.action_survey_form1
@@ -536,106 +538,106 @@ msgstr ""
 #: view:survey.request:0
 #: field:survey.request,state:0
 msgid "State"
-msgstr ""
+msgstr "Durum"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Evaluation Plan Phase"
-msgstr ""
+msgstr "Eleme Planı Fazı"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Between"
-msgstr ""
+msgstr "Arasında"
 
 #. module: survey
 #: view:survey.print:0
 #: view:survey.print.answer:0
 #: view:survey.print.statistics:0
 msgid "Print"
-msgstr ""
+msgstr "Yazdır"
 
 #. module: survey
 #: view:survey:0
 msgid "New"
-msgstr ""
+msgstr "Yeni"
 
 #. module: survey
 #: field:survey.question,make_comment_field:0
 msgid "Make Comment Field an Answer Choice"
-msgstr ""
+msgstr "Yorum Alanını Seçeneklerden Biri Yap"
 
 #. module: survey
 #: view:survey:0
 #: field:survey,type:0
 msgid "Type"
-msgstr ""
+msgstr "Tür"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_answer_surveys
 msgid "Answer Surveys"
-msgstr ""
+msgstr "Anket Yanıtla"
 
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Not Finished"
-msgstr ""
+msgstr "Bitmedi"
 
 #. module: survey
 #: view:survey.print:0
 msgid "Survey Print"
-msgstr ""
+msgstr "Anket Yazdır"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "Select Partner"
-msgstr ""
+msgstr "Ortak Seç"
 
 #. module: survey
 #: field:survey.question,type:0
 msgid "Question Type"
-msgstr ""
+msgstr "Soru Tipi"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:126
 #, python-format
 msgid "You can not answer this survey more than %s times"
-msgstr ""
+msgstr "Bu anketi %s kereden fazla yanıtlayamazsınız."
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_answer
 msgid "Answers"
-msgstr ""
+msgstr "Cevaplar"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:119
 #, python-format
 msgid "You can not answer because the survey is not open"
-msgstr ""
+msgstr "Anket aktif değil, yanıtlayamazsınız."
 
 #. module: survey
 #: selection:survey.response,response_type:0
 msgid "Link"
-msgstr ""
+msgstr "Bağlantı"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_type_form
 #: model:ir.model,name:survey.model_survey_type
 #: view:survey.type:0
 msgid "Survey Type"
-msgstr ""
+msgstr "Anket Türü"
 
 #. module: survey
 #: field:survey.page,sequence:0
 msgid "Page Nr"
-msgstr ""
+msgstr "Sayfa No"
 
 #. module: survey
 #: view:survey:0
@@ -644,12 +646,12 @@ msgstr ""
 #: field:survey.question,descriptive_text:0
 #: selection:survey.question,type:0
 msgid "Descriptive Text"
-msgstr ""
+msgstr "Açıklayıcı Metin"
 
 #. module: survey
 #: field:survey.question,minimum_req_ans:0
 msgid "Minimum Required Answer"
-msgstr ""
+msgstr "Gerekli Minimum Cevap Sayısı"
 
 #. module: survey
 #: code:addons/survey/survey.py:479
@@ -658,74 +660,76 @@ msgid ""
 "You must enter one or more menu choices in column heading (white spaces not "
 "allowed)"
 msgstr ""
+"Sütun başılığında bir veya daha fazla seçenek girmelisiniz (Boşluk "
+"kullanamazsınız)"
 
 #. module: survey
 #: field:survey.question,req_error_msg:0
 msgid "Error Message"
-msgstr ""
+msgstr "Hata Mesajı"
 
 #. module: survey
 #: code:addons/survey/survey.py:477
 #, python-format
 msgid "You must enter one or more menu choices in column heading"
-msgstr ""
+msgstr "Sütun başılığında bir veya daha fazla seçenek girmelisiniz"
 
 #. module: survey
 #: field:survey.request,date_deadline:0
 msgid "Deadline date"
-msgstr ""
+msgstr "Bitiş Tarihi"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Date"
-msgstr ""
+msgstr "Tarih olmalı"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print
 msgid "survey.print"
-msgstr ""
+msgstr "Yazdır"
 
 #. module: survey
 #: view:survey.question.column.heading:0
 #: field:survey.question.column.heading,title:0
 msgid "Column Heading"
-msgstr ""
+msgstr "Sütun Başlığı"
 
 #. module: survey
 #: field:survey.question,is_require_answer:0
 msgid "Require Answer to Question"
-msgstr ""
+msgstr "Cevap zorunlu olsun"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_request_tree
 #: model:ir.ui.menu,name:survey.menu_survey_type_form1
 msgid "Survey Requests"
-msgstr ""
+msgstr "Anket İstekleri"
 
 #. module: survey
 #: code:addons/survey/survey.py:370
 #: code:addons/survey/survey.py:457
 #, python-format
 msgid "You must enter one or more column heading."
-msgstr ""
+msgstr "Sütun başılığında bir veya daha fazla seçenek girmelisiniz"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:745
 #: code:addons/survey/wizard/survey_answer.py:940
 #, python-format
 msgid "Please enter an integer value"
-msgstr ""
+msgstr "Lütfen bir Tamsayı değer girin"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_browse_answer
 msgid "survey.browse.answer"
-msgstr ""
+msgstr "Cevap"
 
 #. module: survey
 #: selection:survey.question,comment_field_type:0
 msgid "Paragraph of Text"
-msgstr ""
+msgstr "Metnin Paragrafı"
 
 #. module: survey
 #: code:addons/survey/survey.py:423
@@ -741,30 +745,30 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "When the question is not answered, display this error message:"
-msgstr ""
+msgstr "Bu soruya cevap vermediniz."
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Options"
-msgstr ""
+msgstr "Seçenekler"
 
 #. module: survey
 #: view:survey.send.invitation.log:0
 msgid "_Ok"
-msgstr ""
+msgstr "_Tamam"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_browse_survey_response
 msgid "Browse Answers"
-msgstr ""
+msgstr "Cevapları İncele"
 
 #. module: survey
 #: field:survey.response.answer,comment_field:0
 #: view:survey.response.line:0
 msgid "Comment"
-msgstr ""
+msgstr "Açıklama"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_answer
@@ -774,70 +778,70 @@ msgstr ""
 #: view:survey.response.answer:0
 #: view:survey.response.line:0
 msgid "Survey Answer"
-msgstr ""
+msgstr "Anket Cevabı"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Selection"
-msgstr ""
+msgstr "Seçim"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_browse_survey_response
 #: view:survey:0
 msgid "Answer Survey"
-msgstr ""
+msgstr "Anket Cevapları"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Comment Field"
-msgstr ""
+msgstr "Yorum Alanı"
 
 #. module: survey
 #: selection:survey.response,response_type:0
 msgid "Manually"
-msgstr ""
+msgstr "El ile"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "_Send"
-msgstr ""
+msgstr "_Gönder"
 
 #. module: survey
 #: help:survey,responsible_id:0
 msgid "User responsible for survey"
-msgstr ""
+msgstr "Anket sorumlu kullanıcı"
 
 #. module: survey
 #: field:survey,page_ids:0
 #: view:survey.question:0
 #: field:survey.response.line,page_id:0
 msgid "Page"
-msgstr ""
+msgstr "Sayfa"
 
 #. module: survey
 #: field:survey.question,comment_column:0
 msgid "Add comment column in matrix"
-msgstr ""
+msgstr "Matrise Yorum Alanı Ekle"
 
 #. module: survey
 #: field:survey.answer,response:0
 msgid "#Answer"
-msgstr ""
+msgstr "#Cevap"
 
 #. module: survey
 #: field:survey.print,without_pagebreak:0
 #: field:survey.print.answer,without_pagebreak:0
 msgid "Print Without Page Breaks"
-msgstr ""
+msgstr "Sayfa Aralıksız Yazdır"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "When the comment is an invalid format, display this error message"
-msgstr ""
+msgstr "Girdiğiniz metnin formatı yanlış, düzeltiniz."
 
 #. module: survey
 #: code:addons/survey/wizard/survey_selection.py:83
@@ -845,28 +849,28 @@ msgstr ""
 msgid ""
 "You can not give more response. Please contact the author of this survey for "
 "further assistance."
-msgstr ""
+msgstr "Daha fazla cevap veremezsiniz. Anket sahibi ile iletişime geçiniz."
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_page_question
 #: model:ir.actions.act_window,name:survey.act_survey_question
 msgid "Questions"
-msgstr ""
+msgstr "Sorular"
 
 #. module: survey
 #: help:survey,response_user:0
 msgid "Set to one if  you require only one Answer per user"
-msgstr ""
+msgstr "Eğer kullanıcı başına bir cevap gerekiyorsa seçiniz"
 
 #. module: survey
 #: field:survey,users:0
 msgid "Users"
-msgstr ""
+msgstr "Kullanıcılar"
 
 #. module: survey
 #: view:survey.send.invitation:0
 msgid "Message"
-msgstr ""
+msgstr "Mesaj"
 
 #. module: survey
 #: view:survey:0
@@ -877,82 +881,82 @@ msgstr ""
 #. module: survey
 #: field:survey.question,maximum_req_ans:0
 msgid "Maximum Required Answer"
-msgstr ""
+msgstr "Maksimum Gerekli Cevap"
 
 #. module: survey
 #: field:survey.name.wiz,page_no:0
 msgid "Page Number"
-msgstr ""
+msgstr "Sayfa Numarası"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:87
 #, python-format
 msgid "Cannot locate survey for the question wizard!"
-msgstr ""
+msgstr "Soru sihirbazı için anket yüklenemiyor."
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "and"
-msgstr ""
+msgstr "ve"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_print_statistics
 #: view:survey.print.statistics:0
 msgid "Survey Print Statistics"
-msgstr ""
+msgstr "Anket Yazdırma İstatistiği"
 
 #. module: survey
 #: field:survey.send.invitation.log,note:0
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "When the choices do not add up correctly, display this error message"
-msgstr ""
+msgstr "Girdiğiniz seçenek düzgün eklenemedi!"
 
 #. module: survey
 #: field:survey,date_close:0
 msgid "Survey Close Date"
-msgstr ""
+msgstr "Anket Bitiş Tarihi"
 
 #. module: survey
 #: field:survey,date_open:0
 msgid "Survey Open Date"
-msgstr ""
+msgstr "Anket Başlangıç Tarihi"
 
 #. module: survey
 #: field:survey.question.column.heading,in_visible_rating_weight:0
 msgid "Is Rating Scale Invisible ??"
-msgstr ""
+msgstr "Öçlüm skalası (rating scale) görünmez mi?"
 
 #. module: survey
 #: view:survey.browse.answer:0
 #: view:survey.name.wiz:0
 msgid "Start"
-msgstr ""
+msgstr "Başla"
 
 #. module: survey
 #: code:addons/survey/survey.py:472
 #, python-format
 msgid "Maximum Required Answer is greater than Minimum Required Answer"
-msgstr ""
+msgstr "Maksimum gerekli cevap sayısı minimumdan daha fazla"
 
 #. module: survey
 #: field:survey.question,comment_maximum_no:0
 #: field:survey.question,validation_maximum_no:0
 msgid "Maximum number"
-msgstr ""
+msgstr "Maksimum Numara"
 
 #. module: survey
 #: selection:survey.request,state:0
 #: selection:survey.response.line,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Taslak"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print_statistics
@@ -962,12 +966,12 @@ msgstr ""
 #. module: survey
 #: selection:survey,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Kapatıldı"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Drop-down Menus"
-msgstr ""
+msgstr "Açılır Menü Matrisi"
 
 #. module: survey
 #: view:survey:0
@@ -989,133 +993,133 @@ msgstr ""
 #: field:survey.send.invitation,partner_ids:0
 #: field:survey.tbl.column.heading,response_table_id:0
 msgid "Answer"
-msgstr ""
+msgstr "Cevap"
 
 #. module: survey
 #: field:survey,max_response_limit:0
 msgid "Maximum Answer Limit"
-msgstr ""
+msgstr "Maksimum Cevap Limiti"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
 msgid "Send Invitations"
-msgstr ""
+msgstr "Davetiyeleri Gönder"
 
 #. module: survey
 #: field:survey.name.wiz,store_ans:0
 msgid "Store Answer"
-msgstr ""
+msgstr "Cevapları Sakla"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Date and Time"
-msgstr ""
+msgstr "Tarih ve Zaman"
 
 #. module: survey
 #: field:survey,state:0
 #: field:survey.response,state:0
 #: field:survey.response.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "Durum"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_print
 msgid "Print Survey"
-msgstr ""
+msgstr "Anketi Yazdır"
 
 #. module: survey
 #: field:survey,send_response:0
 msgid "E-mail Notification on Answer"
-msgstr ""
+msgstr "Cevaplandığında Email ile Uyar"
 
 #. module: survey
 #: field:survey.response.answer,value_choice:0
 msgid "Value Choice"
-msgstr ""
+msgstr "Seçenek Ederi (Değeri)"
 
 #. module: survey
 #: view:survey:0
 msgid "Started"
-msgstr ""
+msgstr "Başlanmış"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_print_answer
 #: view:survey:0
 #: view:survey.print.answer:0
 msgid "Print Answer"
-msgstr ""
+msgstr "Cevap Yazdır"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes"
-msgstr ""
+msgstr "Birden fazla metin kutucuğu"
 
 #. module: survey
 #: selection:survey.print,orientation:0
 #: selection:survey.print.answer,orientation:0
 msgid "Landscape(Horizontal)"
-msgstr ""
+msgstr "Yatay"
 
 #. module: survey
 #: field:survey.question,no_of_rows:0
 msgid "No of Rows"
-msgstr ""
+msgstr "Satır Sayısı"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.name.wiz:0
 msgid "Survey Details"
-msgstr ""
+msgstr "Anket Hakkında"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Textboxes With Different Type"
-msgstr ""
+msgstr "Birden fazla değişik tipte metin kutucuğu"
 
 #. module: survey
 #: view:survey.question.column.heading:0
 msgid "Menu Choices (each choice on separate lines)"
-msgstr ""
+msgstr "Menü Seçenekleri (Her seçenek farklı satırda)"
 
 #. module: survey
 #: field:survey.response,response_type:0
 msgid "Answer Type"
-msgstr ""
+msgstr "Cevap Türü"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Validation"
-msgstr ""
+msgstr "Validation"
 
 #. module: survey
 #: view:survey.request:0
 #: selection:survey.request,state:0
 msgid "Waiting Answer"
-msgstr ""
+msgstr "Cevap Bekliyor"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be A Decimal Number"
-msgstr ""
+msgstr "Ondalık Sayı Olmalı"
 
 #. module: survey
 #: field:res.users,survey_id:0
 msgid "Groups"
-msgstr ""
+msgstr "Gruplar"
 
 #. module: survey
 #: selection:survey.answer,type:0
 #: selection:survey.question,type:0
 msgid "Date"
-msgstr ""
+msgstr "Tarih"
 
 #. module: survey
 #: view:survey:0
 msgid "All New Survey"
-msgstr ""
+msgstr "Tüm Yeni Anketler"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_send_invitation
@@ -1128,12 +1132,12 @@ msgstr ""
 #: field:survey.request,user_id:0
 #: field:survey.response,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Kullanıcı"
 
 #. module: survey
 #: field:survey.name.wiz,transfer:0
 msgid "Page Transfer"
-msgstr ""
+msgstr "Sayfa Transferi"
 
 #. module: survey
 #: selection:survey.response.line,state:0
@@ -1144,24 +1148,24 @@ msgstr ""
 #: field:survey.print,paper_size:0
 #: field:survey.print.answer,paper_size:0
 msgid "Paper Size"
-msgstr ""
+msgstr "Kağıt Boyutu"
 
 #. module: survey
 #: field:survey.response.answer,column_id:0
 #: field:survey.tbl.column.heading,column_id:0
 msgid "Column"
-msgstr ""
+msgstr "Sütun"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response_line
 msgid "Survey Response Line"
-msgstr ""
+msgstr "Anket Cevap Hattı"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_selection.py:80
 #, python-format
 msgid "You can not give response for this survey more than %s times"
-msgstr ""
+msgstr "Bu ankete %s kereden fazla cevap veremezsiniz"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.report_survey_form
@@ -1182,22 +1186,22 @@ msgstr ""
 #: field:survey.request,survey_id:0
 #: field:survey.response,survey_id:0
 msgid "Survey"
-msgstr ""
+msgstr "Anket"
 
 #. module: survey
 #: field:survey.question,in_visible_rating_weight:0
 msgid "Is Rating Scale Invisible?"
-msgstr ""
+msgstr "Ölçüm skalası (rating scale) görünmez mi?"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Integer"
-msgstr ""
+msgstr "Tamsayı"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Numerical Textboxes"
-msgstr ""
+msgstr "Nümerik Kutucuk"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_wiz
@@ -1207,28 +1211,28 @@ msgstr ""
 #. module: survey
 #: view:survey:0
 msgid "History"
-msgstr ""
+msgstr "Geçmiş Bilgisi"
 
 #. module: survey
 #: view:survey.request:0
 msgid "Late"
-msgstr ""
+msgstr "Geçmiş Anketler"
 
 #. module: survey
 #: field:survey.type,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_statistics
 msgid "Surveys Statistics"
-msgstr ""
+msgstr "Anket İstatistiği"
 
 #. module: survey
 #: field:survey.print,orientation:0
 #: field:survey.print.answer,orientation:0
 msgid "Orientation"
-msgstr ""
+msgstr "Sayfa yönü"
 
 #. module: survey
 #: view:survey:0
@@ -1236,55 +1240,55 @@ msgstr ""
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Seq"
-msgstr ""
+msgstr "Sıra"
 
 #. module: survey
 #: field:survey.request,email:0
 msgid "E-mail"
-msgstr ""
+msgstr "E-mail"
 
 #. module: survey
 #: field:survey.question,comment_minimum_no:0
 #: field:survey.question,validation_minimum_no:0
 msgid "Minimum number"
-msgstr ""
+msgstr "Minimum Sayı"
 
 #. module: survey
 #: field:survey.question,req_ans:0
 msgid "#Required Answer"
-msgstr ""
+msgstr "#Boş geçemezsiniz"
 
 #. module: survey
 #: field:survey.answer,sequence:0
 #: field:survey.question,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Sıra"
 
 #. module: survey
 #: field:survey.question,comment_label:0
 msgid "Field Label"
-msgstr ""
+msgstr "Alan İsmi"
 
 #. module: survey
 #: view:survey:0
 msgid "Other"
-msgstr ""
+msgstr "Diğeri"
 
 #. module: survey
 #: view:survey.request:0
 #: selection:survey.request,state:0
 msgid "Done"
-msgstr ""
+msgstr "Tamamlandı"
 
 #. module: survey
 #: view:survey:0
 msgid "Test Survey"
-msgstr ""
+msgstr "Test Anketi"
 
 #. module: survey
 #: field:survey.question,rating_allow_one_column_require:0
 msgid "Allow Only One Answer per Column (Forced Ranking)"
-msgstr ""
+msgstr "Sütun Başına Sadece Bir Cevaba İzin ver"
 
 #. module: survey
 #: view:survey:0
@@ -1294,29 +1298,29 @@ msgstr ""
 #: view:survey.print.answer:0
 #: view:survey.print.statistics:0
 msgid "Cancel"
-msgstr ""
+msgstr "İptal"
 
 #. module: survey
 #: view:survey:0
 msgid "Close"
-msgstr ""
+msgstr "Kapat"
 
 #. module: survey
 #: field:survey.question,comment_minimum_float:0
 #: field:survey.question,validation_minimum_float:0
 msgid "Minimum decimal number"
-msgstr ""
+msgstr "Minimum Ondalık Sayı"
 
 #. module: survey
 #: view:survey:0
 #: selection:survey,state:0
 msgid "Open"
-msgstr ""
+msgstr "Açık"
 
 #. module: survey
 #: field:survey,tot_start_survey:0
 msgid "Total Started Survey"
-msgstr ""
+msgstr "Toplam Başlatılmış Anket"
 
 #. module: survey
 #: code:addons/survey/survey.py:462
@@ -1324,7 +1328,7 @@ msgstr ""
 msgid ""
 "#Required Answer you entered is greater than the number of answer. Please "
 "use a number that is smaller than %d."
-msgstr ""
+msgstr "#Lütfen %d sayısından daha küçük sayı giriniz."
 
 #. module: survey
 #: help:survey,max_response_limit:0
@@ -1334,7 +1338,7 @@ msgstr ""
 #. module: survey
 #: selection:survey.response,state:0
 msgid "Finished "
-msgstr ""
+msgstr "Bitti "
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_question_column_heading
@@ -1344,81 +1348,81 @@ msgstr ""
 #. module: survey
 #: field:survey.answer,average:0
 msgid "#Avg"
-msgstr ""
+msgstr "#Ort"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Matrix of Choices (Multiple Answers Per Row)"
-msgstr ""
+msgstr "Seçenekler Matrisi (Satır başına birden çok cevap)"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_name
 msgid "Give Survey Answer"
-msgstr ""
+msgstr "Anket Cevapla"
 
 #. module: survey
 #: model:ir.model,name:survey.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: survey
 #: help:survey.browse.answer,response_id:0
 msgid ""
 "If this field is empty, all answers of the selected survey will be print."
-msgstr ""
+msgstr "Eğer bu alan boş ise, seçili anketin tüm cevapları yazdırılır."
 
 #. module: survey
 #: selection:survey.response.line,state:0
 msgid "Answered"
-msgstr ""
+msgstr "Cevaplanmış"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:425
 #, python-format
 msgid "Complete Survey Answer"
-msgstr ""
+msgstr "Anketi Yanıtlar"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Comment/Essay Box"
-msgstr ""
+msgstr "Yorum Kutusu"
 
 #. module: survey
 #: field:survey.answer,type:0
 msgid "Type of Answer"
-msgstr ""
+msgstr "Cevap Türü"
 
 #. module: survey
 #: field:survey.question,required_type:0
 msgid "Respondent must answer"
-msgstr ""
+msgstr "Mutlaka cevaplanmalı"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
 #: view:survey.send.invitation:0
 msgid "Send Invitation"
-msgstr ""
+msgstr "Davetiye Gönder"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:779
 #, python-format
 msgid "You cannot select the same answer more than one time"
-msgstr ""
+msgstr "Aynı cevabı birden fazla kez seçemezsiniz"
 
 #. module: survey
 #: view:survey.question:0
 msgid "Search Question"
-msgstr ""
+msgstr "Cevaplarda Ara"
 
 #. module: survey
 #: field:survey,title:0
 msgid "Survey Title"
-msgstr ""
+msgstr "Anket Başlığı"
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Single Textbox"
-msgstr ""
+msgstr "Tek Metin Kutusu"
 
 #. module: survey
 #: view:survey:0
@@ -1428,49 +1432,49 @@ msgstr ""
 #: field:survey.page,note:0
 #: view:survey.response.line:0
 msgid "Description"
-msgstr ""
+msgstr "Tanım"
 
 #. module: survey
 #: view:survey.name.wiz:0
 msgid "Select Survey"
-msgstr ""
+msgstr "Anket Seç"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "At Least"
-msgstr ""
+msgstr "En Az"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation_log
 #: model:ir.model,name:survey.model_survey_send_invitation_log
 msgid "survey.send.invitation.log"
-msgstr ""
+msgstr "survey.send.invitation.log"
 
 #. module: survey
 #: selection:survey.print,orientation:0
 #: selection:survey.print.answer,orientation:0
 msgid "Portrait(Vertical)"
-msgstr ""
+msgstr "Dikey"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be Specific Length"
-msgstr ""
+msgstr "Belirtilen Uzunlukta Olmalı"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: field:survey.question,page_id:0
 msgid "Survey Page"
-msgstr ""
+msgstr "Anket Sayfası"
 
 #. module: survey
 #: view:survey:0
 #: view:survey.page:0
 #: view:survey.question:0
 msgid "Required Answer"
-msgstr ""
+msgstr "Boş geçemezsiniz"
 
 #. module: survey
 #: code:addons/survey/survey.py:468
@@ -1479,23 +1483,25 @@ msgid ""
 "Minimum Required Answer you entered is greater than the number of answer. "
 "Please use a number that is smaller than %d."
 msgstr ""
+"Girdiğiniz minimum cevap sayısı verdiğiniz cevaplardan fazladır. Lütfen %d "
+"sayısından küçük bir sayı giriniz"
 
 #. module: survey
 #: code:addons/survey/survey.py:453
 #, python-format
 msgid "You must enter one or more answer."
-msgstr ""
+msgstr "Bir veya daha fazla cevap girmelisiniz"
 
 #. module: survey
 #: view:survey:0
 msgid "All Open Survey"
-msgstr ""
+msgstr "Tüm Açık Anketler"
 
 #. module: survey
 #: model:ir.actions.report.xml,name:survey.survey_browse_response
 #: field:survey.browse.answer,response_id:0
 msgid "Survey Answers"
-msgstr ""
+msgstr "Anket Cevaplarında"
 
 #. module: survey
 #: view:survey.browse.answer:0
@@ -1505,12 +1511,12 @@ msgstr ""
 #. module: survey
 #: model:ir.ui.menu,name:survey.menu_print_survey_answer
 msgid "Surveys Answers"
-msgstr ""
+msgstr "Anketlerin Cevapları"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.act_survey_pages
 msgid "Pages"
-msgstr ""
+msgstr "Sayfalar"
 
 #. module: survey
 #: code:addons/survey/survey.py:401
@@ -1520,33 +1526,35 @@ msgid ""
 "than the number of answer.                                    Please use a "
 "number that is smaller than %d."
 msgstr ""
+"Girdiğiniz cevap sayısı verdiğiniz cevaplardan fazladır. Lütfen %d "
+"sayısından küçük bir sayı giriniz"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_answer.py:971
 #, python-format
 msgid "You cannot select same answer more than one time'"
-msgstr ""
+msgstr "Aynı cevabı birden fazla kez seçemezsiniz"
 
 #. module: survey
 #: selection:survey.print,paper_size:0
 #: selection:survey.print.answer,paper_size:0
 msgid "Legal (8.5\" x 14\")"
-msgstr ""
+msgstr "Legal (8.5\" x 14\")"
 
 #. module: survey
 #: field:survey.type,name:0
 msgid "Name"
-msgstr ""
+msgstr "Adı"
 
 #. module: survey
 #: view:survey.page:0
 msgid "#Questions"
-msgstr ""
+msgstr "#Sorular"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_response
 msgid "survey.response"
-msgstr ""
+msgstr "survey.response"
 
 #. module: survey
 #: field:survey.question,comment_valid_err_msg:0
@@ -1554,7 +1562,7 @@ msgstr ""
 #: field:survey.question,numeric_required_sum_err_msg:0
 #: field:survey.question,validation_valid_err_msg:0
 msgid "Error message"
-msgstr ""
+msgstr "Hata mesajı"
 
 #. module: survey
 #: view:survey.send.invitation:0
@@ -1566,7 +1574,7 @@ msgstr ""
 #: code:addons/survey/survey.py:382
 #, python-format
 msgid "You must enter one or more Answer."
-msgstr ""
+msgstr "En az bir veya daha fazla cevap girmelisiniz"
 
 #. module: survey
 #: code:addons/survey/survey.py:411
@@ -1580,12 +1588,12 @@ msgstr ""
 #. module: survey
 #: field:survey.answer,menu_choice:0
 msgid "Menu Choices"
-msgstr ""
+msgstr "Menü Seçenekleri"
 
 #. module: survey
 #: field:survey,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: survey
 #: code:addons/survey/survey.py:433
@@ -1593,43 +1601,43 @@ msgstr ""
 msgid ""
 "Maximum Required Answer is greater                                     than "
 "Minimum Required Answer"
-msgstr ""
+msgstr "Maksimum gerekli cevap sayısı minimum gerekliden daha fazla."
 
 #. module: survey
 #: view:survey.send.invitation.log:0
 msgid "User creation"
-msgstr ""
+msgstr "Kullanıcı Tarafından Yaratılmış"
 
 #. module: survey
 #: selection:survey.question,required_type:0
 msgid "All"
-msgstr ""
+msgstr "Hepsi"
 
 #. module: survey
 #: selection:survey.question,comment_valid_type:0
 #: selection:survey.question,validation_type:0
 msgid "Must Be An Email Address"
-msgstr ""
+msgstr "Email Adresi olmalı."
 
 #. module: survey
 #: selection:survey.question,type:0
 msgid "Multiple Choice (Only One Answer)"
-msgstr ""
+msgstr "Çoktan Seçmeli (Sadece Bir Cevap)"
 
 #. module: survey
 #: field:survey.answer,in_visible_answer_type:0
 msgid "Is Answer Type Invisible??"
-msgstr ""
+msgstr "Cevap Tipi Görünmez mi?"
 
 #. module: survey
 #: model:ir.model,name:survey.model_survey_print_answer
 msgid "survey.print.answer"
-msgstr ""
+msgstr "Anketi Yazdır"
 
 #. module: survey
 #: view:survey.answer:0
 msgid "Menu Choices (each choice on separate by lines)"
-msgstr ""
+msgstr "Menü Seçenekleri (Her seçenek satır ile ayrı)"
 
 #. module: survey
 #: selection:survey.answer,type:0
@@ -1639,34 +1647,34 @@ msgstr ""
 #. module: survey
 #: view:survey.response.line:0
 msgid "Single Textboxes"
-msgstr ""
+msgstr "Tek metin Kutucuğu"
 
 #. module: survey
 #: code:addons/survey/wizard/survey_send_invitation.py:74
 #, python-format
 msgid "%sSurvey is not in open state"
-msgstr ""
+msgstr "%s anket aktif durumda değil."
 
 #. module: survey
 #: field:survey.question.column.heading,rating_weight:0
 msgid "Weight"
-msgstr ""
+msgstr "Etki"
 
 #. module: survey
 #: selection:survey.answer,type:0
 msgid "Date & Time"
-msgstr ""
+msgstr "Tarih ve Zaman"
 
 #. module: survey
 #: field:survey.response,date_create:0
 #: field:survey.response.line,date_create:0
 msgid "Create Date"
-msgstr ""
+msgstr "Oluşturulma Tarihi"
 
 #. module: survey
 #: field:survey.question,column_name:0
 msgid "Column Name"
-msgstr ""
+msgstr "Sütun Adı"
 
 #. module: survey
 #: model:ir.actions.act_window,name:survey.action_survey_page_form
@@ -1674,37 +1682,46 @@ msgstr ""
 #: model:ir.ui.menu,name:survey.menu_survey_page_form1
 #: view:survey.page:0
 msgid "Survey Pages"
-msgstr ""
+msgstr "Anket Sayfaları"
 
 #. module: survey
 #: field:survey.question,numeric_required_sum:0
 msgid "Sum of all choices"
-msgstr ""
+msgstr "Bütün tercihlerin toplamı"
 
 #. module: survey
 #: selection:survey.question,type:0
 #: view:survey.response.line:0
 msgid "Table"
-msgstr ""
+msgstr "Tablo"
 
 #. module: survey
 #: code:addons/survey/survey.py:630
 #, python-format
 msgid "You cannot duplicate the resource!"
-msgstr ""
+msgstr "Kaynağın bir eşini kopyalayamazsınız(duplicate)"
 
 #. module: survey
 #: field:survey.question,comment_minimum_date:0
 #: field:survey.question,validation_minimum_date:0
 msgid "Minimum date"
-msgstr ""
+msgstr "Minimum Tarih"
 
 #. module: survey
 #: field:survey,response_user:0
 msgid "Maximum Answer per User"
-msgstr ""
+msgstr "Kullanıcı başına maksimum cevap sayısı"
 
 #. module: survey
 #: field:survey.name.wiz,page:0
 msgid "Page Position"
-msgstr ""
+msgstr "Sayfa Pozisyonu"
+
+#~ msgid "Send reminder for existing user"
+#~ msgstr "Mevcut Kullanıcılara Uyarıcı Gönder"
+
+#~ msgid "Select Survey and related answer"
+#~ msgstr "Anketi ve ilgili cevapları seç"
+
+#~ msgid "Send mail for new user"
+#~ msgstr "Yeni Kullanıcıya Email GÖnder"
diff --git a/addons/survey/i18n/zh_CN.po b/addons/survey/i18n/zh_CN.po
index 618ef6fd827..71a42c1cba3 100644
--- a/addons/survey/i18n/zh_CN.po
+++ b/addons/survey/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:26+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:24+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: survey
 #: view:survey.print:0
diff --git a/addons/survey/specification/survey.png b/addons/survey/specification/survey.png
index 8cf0f7022c1..52acff391d0 100644
Binary files a/addons/survey/specification/survey.png and b/addons/survey/specification/survey.png differ
diff --git a/addons/survey/specification/survey_page.png b/addons/survey/specification/survey_page.png
index 2f8d19d5dd8..4fceac4b81b 100644
Binary files a/addons/survey/specification/survey_page.png and b/addons/survey/specification/survey_page.png differ
diff --git a/addons/survey/specification/survey_question.png b/addons/survey/specification/survey_question.png
index b939ae2ad47..516606902cb 100644
Binary files a/addons/survey/specification/survey_question.png and b/addons/survey/specification/survey_question.png differ
diff --git a/addons/survey/specification/survey_response.png b/addons/survey/specification/survey_response.png
index 67bc1aa9432..af78bd1977d 100644
Binary files a/addons/survey/specification/survey_response.png and b/addons/survey/specification/survey_response.png differ
diff --git a/addons/survey/static/src/css/survey.css b/addons/survey/static/src/css/survey.css
index c18f584c9ed..34d686c6e77 100644
--- a/addons/survey/static/src/css/survey.css
+++ b/addons/survey/static/src/css/survey.css
@@ -1,14 +1,11 @@
-.oe_survey_responsible{
-    height: auto;
-    width: 200px;
-    font-size: 14px;
+.openerp .oe_survey_title {
+    font-weight: bold;
+    font-size: 19px;
+    margin: 8px 0px 8px 0px;
+    color: #5B5B5B;
 }
 
-.oe_survey_start_date{
-    height: auto;
+.openerp .oe_kanban_survey {
     width: 200px;
-    font-size: 14px;
-}
-.oe_survey_rate{
-    font-size: 14px;
+
 }
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 93bd48be30c..ad903ffd06b 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -35,7 +35,7 @@ class survey_type(osv.osv):
     _name = 'survey.type'
     _description = 'Survey Type'
     _columns = {
-        'name': fields.char("Name", size=128, required=1),
+        'name': fields.char("Name", size=128, required=1, translate=True),
         'code': fields.char("Code", size=64),
     }
 survey_type()
@@ -77,6 +77,7 @@ class survey(osv.osv):
         'tot_comp_survey': lambda * a: 0,
         'send_response': lambda * a: 1,
         'response_user': lambda * a:1,
+        'date_open': fields.datetime.now,
     }
 
     def survey_open(self, cr, uid, ids, arg):
@@ -94,7 +95,7 @@ class survey(osv.osv):
     def copy(self, cr, uid, ids, default=None, context=None):
         vals = {}
         current_rec = self.read(cr, uid, ids, context=context)
-        title = current_rec.get('title') + ' (Copy)'
+        title = _("%s (copy)") % (current_rec.get('title'))
         vals.update({'title':title})
         vals.update({'history':[],'tot_start_survey':0,'tot_comp_survey':0})
         return super(survey, self).copy(cr, uid, ids, vals, context=context)
@@ -143,15 +144,58 @@ class survey(osv.osv):
                 'nodestroy':True,
             }
         return report
-    
+
     def fill_survey(self, cr, uid, ids, context=None):
+        sur_obj = self.read(cr, uid, ids,['title', 'page_ids'], context=context)
+        for sur in sur_obj:
+            name = sur['title']
+            pages = sur['page_ids']
+            if not pages:
+                raise osv.except_osv(_('Warning!'), _('This survey has no question defined. Please define the questions and answers first.'))
+            context.update({'active':False,'survey_id': ids[0]})
         return {
             'view_type': 'form',
             'view_mode': 'form',
             'res_model': 'survey.question.wiz',
             'type': 'ir.actions.act_window',
             'target': 'new',
-            'context': {'survey_id': ids[0]}
+            'name': name,
+            'context': context
+        }
+    def test_survey(self, cr, uid, ids, context=None):
+        sur_obj = self.read(cr, uid, ids,['title','page_ids'], context=context)
+        for sur in sur_obj:
+            name = sur['title']
+            pages = sur['page_ids']
+            if not pages:
+                raise osv.except_osv(_('Warning!'), _('This survey has no pages defined. Please define pages first.'))
+            context.update({'active':False,'survey_id': ids[0]})
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'survey.question.wiz',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'name': name,
+            'context': context
+        }
+
+    def edit_survey(self, cr, uid, ids, context=None):
+        sur_obj = self.read(cr, uid, ids,['title','page_ids'], context=context)
+        for sur in sur_obj:
+            name = sur['title']
+            pages = sur['page_ids']
+            if not pages:
+                raise osv.except_osv(_('Warning!'), _('This survey has no question defined. Please define the questions and answers first.'))
+            context.update({'survey_id': ids[0]})
+        return {
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'survey.question.wiz',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'name': name,
+            'context': context
         }
 
 survey()
@@ -214,7 +258,7 @@ class survey_page(osv.osv):
     def copy(self, cr, uid, ids, default=None, context=None):
         vals = {}
         current_rec = self.read(cr, uid, ids, context=context)
-        title = current_rec.get('title') + ' (Copy)'
+        title = _("%s (copy)") % (current_rec.get('title'))
         vals.update({'title':title})
         return super(survey_page, self).copy(cr, uid, ids, vals, context=context)
 
@@ -361,7 +405,7 @@ class survey_question(osv.osv):
 
     def write(self, cr, uid, ids, vals, context=None):
         questions = self.read(cr,uid, ids, ['answer_choice_ids', 'type', 'required_type',\
-                        'req_ans', 'minimum_req_ans', 'maximum_req_ans', 'column_heading_ids'])
+                        'req_ans', 'minimum_req_ans', 'maximum_req_ans', 'column_heading_ids', 'page_id', 'question'])
         for question in questions:
             col_len = len(question['column_heading_ids'])
             if vals.has_key('column_heading_ids'):
@@ -379,7 +423,7 @@ class survey_question(osv.osv):
             if que_type in ['matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans',\
                              'matrix_of_drop_down_menus', 'rating_scale']:
                 if not col_len:
-                    raise osv.except_osv(_('Warning!'),_("You must enter one or more column headings."))
+                    raise osv.except_osv(_('Warning!'),_('You must enter one or more column headings for question "%s" of page %s.') % (question['question'], question['page_id'][1]))
             ans_len = len(question['answer_choice_ids'])
 
             if vals.has_key('answer_choice_ids'):
@@ -391,7 +435,7 @@ class survey_question(osv.osv):
 
             if que_type not in ['descriptive_text', 'single_textbox', 'comment','table']:
                 if not ans_len:
-                    raise osv.except_osv(_('Warning!'),_("You must enter one or more Answers."))
+                    raise osv.except_osv(_('Warning!'),_('You must enter one or more Answers for question "%s" of page %s.') % (question['question'], question['page_id'][1]))
             req_type = ""
 
             if vals.has_key('required_type'):
@@ -460,13 +504,14 @@ class survey_question(osv.osv):
     def create(self, cr, uid, vals, context=None):
         minimum_ans = 0
         maximum_ans = 0
+        page = self.pool.get('survey.page').browse(cr, uid, vals['page_id'], context=context).title
         if vals.has_key('answer_choice_ids') and  not len(vals['answer_choice_ids']):
             if vals.has_key('type') and vals['type'] not in ['descriptive_text', 'single_textbox', 'comment','table']:
-                raise osv.except_osv(_('Warning!'),_("You must enter one or more answers."))
+                raise osv.except_osv(_('Warning!'),_('You must enter one or more answers for question "%s" of page %s .') % (vals['question'], page))
 
         if vals.has_key('column_heading_ids') and  not len(vals['column_heading_ids']):
             if vals.has_key('type') and vals['type'] in ['matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale']:
-                raise osv.except_osv(_('Warning!'),_("You must enter one or more column heading."))
+                raise osv.except_osv(_('Warning!'),_('You must enter one or more column headings for question "%s" of page %s.')% (vals['question'], page))
 
         if vals['type'] in ['multiple_choice_multiple_ans','matrix_of_choices_only_one_ans', 'matrix_of_choices_only_multi_ans', 'matrix_of_drop_down_menus', 'rating_scale','multiple_textboxes','numerical_textboxes','date','date_and_time']:
             if vals.has_key('is_require_answer') and vals.has_key('required_type') and vals['required_type'] in ['at least', 'at most', 'exactly']:
@@ -526,7 +571,7 @@ class survey_question_column_heading(osv.osv):
     _description = 'Survey Question Column Heading'
     _rec_name = 'title'
 
-    def _get_in_visible_rating_weight(self,cr, uid, context=None):
+    def _get_in_visible_rating_weight(self, cr, uid, context=None):
         if context is None:
             context = {}
         if context.get('in_visible_rating_weight', False):
@@ -579,7 +624,7 @@ class survey_answer(osv.osv):
             }
         return val
 
-    def _get_in_visible_answer_type(self,cr, uid, context=None):
+    def _get_in_visible_answer_type(self, cr, uid, context=None):
         if context is None:
             context = {}
         return context.get('in_visible_answer_type', False)
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index 3bfac20d44b..6f89095c699 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -13,6 +13,7 @@
             <field name="max_response_limit">20</field>
             <field name="type" ref="survey_type2"/>
             <field name="state">open</field>
+            <field name="color">5</field>
             <field name="tot_comp_survey">1</field>
             <field name="tot_start_survey">1</field>
             <field name="response_user">5</field>
@@ -1402,6 +1403,7 @@
         <record id="survey_0" model="survey">
             <field eval="&quot;&quot;&quot;OpenERP Feedback&quot;&quot;&quot;" name="title"/>
             <field name="responsible_id" ref="base.user_demo"/>
+            <field name="color">4</field>
             <field name="max_response_limit">20</field>
             <field name="type" ref="survey_type2"/>
             <field name="state">open</field>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index b8c6f97e45b..f6920c68d34 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+        <!-- Top menu item -->
+        <menuitem name="Tools" id="base.menu_tools" sequence="160"/>
 
         <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools" sequence="2" groups="base.group_tool_user,base.group_tool_manager,base.group_survey_user"/>
         
@@ -26,41 +28,41 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box oe_right">
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
-                        <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
+                        <button name="test_survey" states="open,draft,close,cancel" string="Test Survey" type="object" icon="gtk-new" context="{'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
+                        <button name="fill_survey" states="open" string="Answer Survey" type="object" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
+                        <button name="action_print_survey" states="open,draft,close,cancel" string="Print Answer" type="object"/>
+                        <button name="edit_survey" states="open,draft,close,cancel"
+                            string="Edit Survey" type="object" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
+
                     </div>
                     <div class="oe_title">
                         <label for="title" class="oe_edit_only"/>
                         <h1>
-                            <field name="title"/>
+                            <field name="title" attrs="{'readonly':[('state','=','close')]}"/>
                         </h1>
                     </div>
                     <group>
                         <group>
                             <field name="id" invisible="1"/>
-                            <field name="responsible_id" class="oe_inline"/>
-                            <field name="send_response"/>
-                            <field name="type"/>
+                            <field name="responsible_id" class="oe_inline" attrs="{'readonly':[('state','=','close')]}"/>
+                            <field name="send_response" attrs="{'readonly':[('state','=','close')]}"/>
+                            <field name="type" attrs="{'readonly':[('state','=','close')]}"/>
                         </group>
                         <group>
-                            <field name="max_response_limit" attrs="{'readonly':[('state','in',('open','close'))]}"/>
-                            <field name="response_user" attrs="{'readonly':[('state','in',('open','close'))]}"/>
+                            <field name="max_response_limit" attrs="{'readonly':[('state','=','close')]}"/>
+                            <field name="response_user" attrs="{'readonly':[('state','=','close')]}"/>
                         </group>
                      </group>
                      <notebook>
                         <page string="Survey Details">
-                            <field name="note" colspan="4" placeholder="Survey description..."/>
-                            <label for="page_ids"/>
-                            <field name="page_ids" colspan="4" mode="tree">
+                            <field name="page_ids" colspan="4" mode="tree" attrs="{'readonly':[('state','=','close')]}">
                                 <form string="Survey Page" version="7.0">
                                     <sheet>
                                     <label for="title" class="oe_edit_only"/>
                                     <h1>
                                         <field name="title"/>
                                     </h1>
-                                    <group>
-                                        <field name="note" placeholder="Description on the survey page..." nolabel="1"/>
-                                    </group>
+                                    <field name="note" placeholder="Description on the survey page..."/>
                                     <newline/>
                                     <group>
                                         <label for="question_ids"/>
@@ -210,6 +212,7 @@
                                     </sheet>
                                     </form>
                                 </field>
+                            <field name="note" placeholder="Survey description..." attrs="{'readonly':[('state','=','close')]}"/>
                         </page>
                         <page string="Invited User">
                             <field name="invited_user_ids" readonly="1"/>
@@ -254,13 +257,11 @@
                     <field name="tot_start_survey" string="Started"/>
                     <field name="tot_comp_survey" string="Completed"/>
                     <field name="state"/>
-                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                        string="Test Survey" type="action" icon="gtk-new"
-                        context="{'active':True,'survey_id': active_id}"/>
-                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                        string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
-                    <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel"
-                        string="Edit Survey" type="action" icon="gtk-edit" context="{'active':True,'edit' : True,'survey_id': active_id}"/>
+                    <button name="test_survey" states="open,draft,close,cancel"
+                        string="Test Survey" type="object" icon="gtk-new"
+                        context="{'survey_id': active_id}"/>
+                    <button name="fill_survey" states="open"
+                        string="Answer Survey" type="object" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>                   
                     <button name="action_print_survey" states="open,draft,close,cancel"
                                     string="Print Answer" type="object" icon="gtk-print"/>
                 </tree>
@@ -295,35 +296,30 @@
                 <kanban>
                     <field name="title"/>
                     <field name="date_open"/>
+                    <field name="tot_comp_survey"/>
+                    <field name="max_response_limit"/>
+                    <field name="responsible_id"/>
                     <field name="color"/>
                     <templates>
                         <t t-name="kanban-box">
-                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card">
+                            <div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_survey">
                                 <div class="oe_dropdown_toggle oe_dropdown_kanban">
                                     <span class="oe_e">i</span>
                                     <ul class="oe_dropdown_menu">
-                                        <li><a type="edit">Edit...</a></li>
-                                        <li><a type="delete">Delete</a></li>
+                                        <t t-if="widget.view.is_action_enabled('edit')"><li><a type="edit">Edit...</a></li></t>
+                                        <t t-if="widget.view.is_action_enabled('delete')"><li><a type="delete">Delete</a></li></t>
                                         <li><ul class="oe_kanban_colorpicker" data-field="color"/></li>
                                     </ul>
                                 </div>
                                 <div class="oe_kanban_content">
                                     <h3 class="oe_kanban_ellipsis"><t t-esc="record.title.raw_value.toString()"></t></h3>
-                                    <div class="oe_survey_responsible">
-                                       <t t-if="record.responsible_id.raw_value">By: <field name="responsible_id"/></t>
-                                   </div><br/>
-                                   <div class="oe_survey_start_date">
-                                       <t t-if="record.date_open.raw_value">
-                                           Opened at
-                                           <t t-esc="record.date_open.raw_value.getDate()"/>
-                                           <t t-esc="record.date_open.raw_value.toString('MMM')"/>,
-                                           <t t-esc="record.date_open.raw_value.getFullYear()"/>
-                                       </t>
-                                   </div><br/>
-                                   <div class="oe_survey_rate">
-                                       Rate:
-                                        <a name="fill_survey" type="object">Fill</a>
-                                   </div>
+                                    <div>
+                                        Answers: <field name="tot_comp_survey"/>
+                                        <t t-if="record.max_response_limit.raw_value > 0"> / <field name="max_response_limit"/></t>
+                                    </div>
+                                    <br/>
+                                    <a name="fill_survey" type="object">Answer Survey</a>
+                                    <img t-att-src="kanban_image('res.users', 'image_small', record.responsible_id.raw_value)" t-att-title="record.responsible_id.value" width="24" height="24" class="oe_kanban_avatar oe_right"/>
                                 </div>
                             </div>
                         </t>
@@ -1129,7 +1125,8 @@
                     <field name="date_deadline"/>
                     <field name="survey_id"/>
                     <field name="user_id" on_change="on_change_user(user_id)"/>
-                     <field name="response" readonly="1"/>
+                    <field name="email"/>
+                    <field name="response" readonly="1"/>
                     </group>
                     </sheet>
                 </form>
@@ -1143,6 +1140,7 @@
                 <tree string="Evaluation Plan Phase" colors="red:date_deadline&lt;current_date">
                     <field name="date_deadline"/>
                     <field name="user_id"/>
+                    <field name="email"/>
                     <field name="survey_id"/>
                     <field name="response" />
                     <field name="state" />
diff --git a/addons/survey/wizard/__init__.py b/addons/survey/wizard/__init__.py
index aa1270da751..0ea0e5cd424 100644
--- a/addons/survey/wizard/__init__.py
+++ b/addons/survey/wizard/__init__.py
@@ -27,4 +27,4 @@ import survey_selection
 import survey_answer
 import survey_print
 
-# 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/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index 66098b45fa8..17253447c4f 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -134,6 +134,8 @@ class survey_question_wiz(osv.osv_memory):
                         page_number += 1
                     if sur_name_rec.page_no > - 1:
                         pre_button = True
+                    else:
+                        flag = True
                 else:
                     if sur_name_rec.page_no != 0:
                         p_id = p_id[sur_name_rec.page_no - 1]
@@ -146,8 +148,26 @@ class survey_question_wiz(osv.osv_memory):
                         pre_button = True
                 if flag:
                     pag_rec = page_obj.browse(cr, uid, p_id, context=context)
-                    xml_form = etree.Element('form', {'string': tools.ustr(pag_rec.title)})
-                    xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
+                    note = False
+                    question_ids = []
+                    if pag_rec:
+                        title = pag_rec.title
+                        note = pag_rec.note
+                        question_ids = pag_rec.question_ids
+                    else:
+                        title = sur_rec.title
+                    xml_form = etree.Element('form', {'string': tools.ustr(title)})
+                    if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
+                        context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer})
+                        xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Add Page','icon': "gtk-new", 'type' :'object','name':"action_new_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Edit Page','icon': "gtk-edit", 'type' :'object','name':"action_edit_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Delete Page','icon': "gtk-delete", 'type' :'object','name':"action_delete_page", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_group3, 'button', {'string' :'Add Question','icon': "gtk-new", 'type' :'object','name':"action_new_question", 'context' : tools.ustr(context)})
+
+                    # FP Note
+                    xml_group = xml_form
+
                     if context.has_key('response_id') and context.get('response_id', False) \
                          and int(context.get('response_id',0)[0]) > 0:
                         # TODO: l10n, cleanup this code to make it readable. Or template?
@@ -162,13 +182,12 @@ class survey_question_wiz(osv.osv_memory):
 
                     if wiz_id:
                         fields["wizardid_" + str(wiz_id)] = {'type':'char', 'size' : 255, 'string':"", 'views':{}}
-                        etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0)})
+                        etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0),'modifiers':'{"invisible":true}'})
 
-                    if pag_rec.note:
-                        xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
-                        for que_test in pag_rec.note.split('\n'):
-                            etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
-                    que_ids = pag_rec.question_ids
+                    if note:
+                        for que_test in note.split('\n'):
+                            etree.SubElement(xml_form, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
+                    que_ids = question_ids
                     qu_no = 0
 
                     for que in que_ids:
@@ -180,19 +199,17 @@ class survey_question_wiz(osv.osv_memory):
                             star = '*'
                         else:
                             star = ''
-                        xml_group = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '4'})
-
                         if context.has_key('active') and context.get('active',False) and \
                                     context.has_key('edit'):
-                            xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '2'})
-                            etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '3'})
+                            etree.SubElement(xml_form, 'separator', {'string': star+to_xml(separator_string)})
+
                             xml_group1 = etree.SubElement(xml_form, 'group', {'col': '2', 'colspan': '2'})
                             context.update({'question_id' : tools.ustr(que.id),'page_number': sur_name_rec.page_no , 'transfer' : sur_name_read.transfer, 'page_id' : p_id})
                             etree.SubElement(xml_group1, 'button', {'string':'','icon': "gtk-edit", 'type' :'object', 'name':"action_edit_question", 'context' : tools.ustr(context)})
                             etree.SubElement(xml_group1, 'button', {'string':'','icon': "gtk-delete", 'type' :'object','name':"action_delete_question", 'context' : tools.ustr(context)})
                         else:
-                            xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
-                            etree.SubElement(xml_group, 'separator', {'string': star+to_xml(separator_string), 'colspan': '4'})
+                            etree.SubElement(xml_form, 'newline')
+                            etree.SubElement(xml_form, 'separator', {'string': star+to_xml(separator_string)})
 
                         ans_ids = que_rec.answer_choice_ids
                         xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
@@ -352,36 +369,29 @@ class survey_question_wiz(osv.osv_memory):
                                     etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_other", 'nolabel':"1" ,'colspan':"4"})
                                     fields[tools.ustr(que.id) + "_other"] = {'type': 'text', 'string': '', 'views':{}}
 
-                    etree.SubElement(xml_form, 'separator', {'colspan': '4'})
-                    xml_group = etree.SubElement(xml_form, 'group', {'col': '6', 'colspan': '4'})
-                    etree.SubElement(xml_group, 'field', {'name': 'progress_bar_' + tools.ustr(page_number) , 'widget':'progressbar'})
-                    fields['progress_bar_' + tools.ustr(page_number)] = {'type':'float', 'string':"Progress", 'views':{}}
-                    etree.SubElement(xml_group, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages)})
-                    etree.SubElement(xml_group, 'button', {'icon': "gtk-cancel", 'special': "cancel",'string':"Cancel"})
-                    
+                    xml_footer = etree.SubElement(xml_form, 'footer', {'col': '8', 'colspan': '1', 'width':"100%"})
+
                     if pre_button:
-                        etree.SubElement(xml_group, 'button', {'colspan':"1",'icon':"gtk-go-back",'name':"action_previous",'string':"Previous",'type':"object"})
+                        etree.SubElement(xml_footer, 'label', {'string': ""})
+                        etree.SubElement(xml_footer, 'button', {'name':"action_previous",'string':"Previous",'type':"object"})
                     but_string = "Next"
                     if int(page_number) + 1 == total_pages:
                         but_string = "Done"
-
                     if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and  context.get('response_no',0) + 1 == len(context.get('response_id',0)):
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context)})
+                        etree.SubElement(xml_footer, 'label', {'string': ""})
+                        etree.SubElement(xml_footer, 'button', {'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context), 'class':"oe_highlight"})
                     elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context)})
+                        etree.SubElement(xml_footer, 'label', {'string': ""})
+                        etree.SubElement(xml_footer, 'button', {'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context), 'class':"oe_highlight"})
                     elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_footer, 'label', {'string': ""})
+                        etree.SubElement(xml_footer, 'button', {'special': "cancel", 'string' : 'Done', 'context' : tools.ustr(context), 'class':"oe_highlight"})
                     else:
-                        etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context)})
-
-                    if context.has_key('active') and context.get('active',False) and context.has_key('edit'):
-                        etree.SubElement(xml_form, 'separator', {'string' : '','colspan': '4'})
-                        context.update({'page_id' : tools.ustr(p_id),'page_number' : sur_name_rec.page_no , 'transfer' : sur_name_read.transfer})
-                        xml_group3 = etree.SubElement(xml_form, 'group', {'col': '4', 'colspan': '4'})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Add Page','icon': "gtk-new", 'type' :'object','name':"action_new_page", 'context' : tools.ustr(context)})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Edit Page','icon': "gtk-edit", 'type' :'object','name':"action_edit_page", 'context' : tools.ustr(context)})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Delete Page','icon': "gtk-delete", 'type' :'object','name':"action_delete_page", 'context' : tools.ustr(context)})
-                        etree.SubElement(xml_group3, 'button', {'string' :'Add Question','icon': "gtk-new", 'type' :'object','name':"action_new_question", 'context' : tools.ustr(context)})
+                        etree.SubElement(xml_footer, 'label', {'string': ""})
+                        etree.SubElement(xml_footer, 'button', {'name':"action_next",'string': tools.ustr(but_string) ,'type':"object",'context' : tools.ustr(context), 'class':"oe_highlight"})
+                    etree.SubElement(xml_footer, 'label', {'string': "or"})
+                    etree.SubElement(xml_footer, 'button', {'special': "cancel",'string':"Exit",'class':"oe_link"})
+                    etree.SubElement(xml_footer, 'label', {'string': tools.ustr(page_number+ 1) + "/" + tools.ustr(total_pages), 'class':"oe_survey_title_page oe_right"})
 
                     root = xml_form.getroottree()
                     result['arch'] = etree.tostring(root)
@@ -393,40 +403,53 @@ class survey_question_wiz(osv.osv_memory):
 
                     # mark the survey request as done; call 'survey_req_done' on its actual model
                     survey_req_obj = self.pool.get(context.get('active_model'))
-                    if survey_req_obj and hasattr(survey_req_obj, 'survey_req_done'):
+                    if survey_req_obj and hasattr(survey_req_obj, 'survey_req_done'): 
                         survey_req_obj.survey_req_done(cr, uid, context.get('active_ids', []), context=context)
 
                     if sur_rec.send_response:
                         survey_data = survey_obj.browse(cr, uid, survey_id)
                         response_id = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))['response']
-                        context.update({'response_id':response_id})
                         report = self.create_report(cr, uid, [survey_id], 'report.survey.browse.response', survey_data.title,context)
                         attachments = {}
-                        file = open(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
-                        file_data = ""
-                        while 1:
-                            line = file.readline()
-                            file_data += line
-                            if not line:
-                                break
+                        pdf_filename = addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf"
+                        if os.path.exists(pdf_filename):
+                            file = open(pdf_filename)
+                            file_data = ""
+                            while 1:
+                                line = file.readline()
+                                file_data += line
+                                if not line:
+                                    break
 
-                        attachments[survey_data.title + ".pdf"] = file_data
-                        file.close()
-                        os.remove(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
-                        
+                            attachments[survey_data.title + ".pdf"] = file_data
+                            file.close()
+                            os.remove(addons.get_module_resource('survey', 'report') + survey_data.title + ".pdf")
+                        context.update({'response_id':response_id})
                         user_email = user_obj.browse(cr, uid, uid, context).email
                         resp_email = survey_data.responsible_id and survey_data.responsible_id.email or False
 
                         if user_email and resp_email:
                             user_name = user_obj.browse(cr, uid, uid, context=context).name
                             mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_name) + " has given the Response Of " + survey_data.title + " Survey.\nThe Response has been attached herewith.\n\n Thanks."
-                            mail_message.schedule_with_attach(cr, uid, user_email, [resp_email], "Survey Answer Of " + str(user_name) , mail, attachments=attachments, context=context)
+                            vals = {'state': 'outgoing',
+                                    'subject': "Survey Answer Of " + user_name,
+                                    'body_html': '<pre>%s</pre>' % mail,
+                                    'email_to': [resp_email],
+                                    'email_from': user_email}
+                            if attachments:
+                                vals['attachment_ids'] = [(0,0,{'name': a_name,
+                                                                'datas_fname': a_name,
+                                                                'datas': str(a_content).encode('base64')})
+                                                                for a_name, a_content in attachments.items()]
+                            self.pool.get('mail.mail').create(cr, uid, vals, context=context)
 
                     xml_form = etree.Element('form', {'string': _('Complete Survey Answer')})
-                    etree.SubElement(xml_form, 'separator', {'string': 'Complete Survey', 'colspan': "4"})
+                    xml_footer = etree.SubElement(xml_form, 'footer', {'col': '6', 'colspan': '4' ,'class': 'oe_survey_title_height'})
+
+                    etree.SubElement(xml_form, 'separator', {'string': 'Survey Completed', 'colspan': "4"})
                     etree.SubElement(xml_form, 'label', {'string': 'Thanks for your Answer'})
                     etree.SubElement(xml_form, 'newline')
-                    etree.SubElement(xml_form, 'button', {'icon': "gtk-go-forward", 'special':"cancel",'string':"OK",'colspan':"2"})
+                    etree.SubElement(xml_footer, 'button', {'special':"cancel",'string':"OK",'colspan':"2",'class':'oe_highlight'})
                     root = xml_form.getroottree()
                     result['arch'] = etree.tostring(root)
                     result['fields'] = {}
@@ -435,7 +458,7 @@ class survey_question_wiz(osv.osv_memory):
 
     def create_report(self, cr, uid, res_ids, report_name=False, file_name=False, context=None):
         """
-        If any user give answer of survey then last create report of this answer and if 'Email Notification on Answer' set True in survey  then send mail on responsible person of this survey and attach survey answer report in pdf format.
+        If any user give answer of survey then last create report of this answer and if 'E-mail Notification on Answer' set True in survey  then send mail on responsible person of this survey and attach survey answer report in pdf format.
         """
         if not report_name or not res_ids:
             return (False, Exception('Report name and Resources ids are required !!!'))
@@ -463,7 +486,6 @@ class survey_question_wiz(osv.osv_memory):
 
         except Exception,e:
             return (False, str(e))
-
         return (True, ret_file_name)
 
     def default_get(self, cr, uid, fields_list, context=None):
@@ -480,7 +502,6 @@ class survey_question_wiz(osv.osv_memory):
                 value[field] = tot_per
         response_obj = self.pool.get('survey.response')
         surv_name_wiz = self.pool.get('survey.name.wiz')
-
         if context.has_key('response_id') and context.get('response_id') and int(context['response_id'][0]) > 0:
             data = super(survey_question_wiz, self).default_get(cr, uid, fields_list, context)
             response_ans = response_obj.browse(cr, uid, context['response_id'][context['response_no']])
@@ -527,11 +548,11 @@ class survey_question_wiz(osv.osv_memory):
                                     value[field] = ans.answer
 
         else:
+            
             if not context.has_key('sur_name_id'):
                 return value
             if context.has_key('active') and context.get('active',False):
                 return value
-            
             sur_name_read = surv_name_wiz.read(cr, uid, context.get('sur_name_id',False))
             ans_list = []
 
@@ -539,7 +560,6 @@ class survey_question_wiz(osv.osv_memory):
                 for field in fields_list:
                     if field in list(val):
                         value[field] = val[field]
-
         return value
 
     def create(self, cr, uid, vals, context=None):
@@ -593,8 +613,9 @@ class survey_question_wiz(osv.osv_memory):
                     self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
                     self.pool.get(context.get('object',False)).survey_req_done(cr, uid, [int(context.get('cur_id'))], context)
                 else:
-                    self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
-        if sur_name_read['store_ans'] and type(sur_name_read['store_ans']) == dict:
+                    self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})        
+        if sur_name_read['store_ans'] and type(safe_eval(sur_name_read['store_ans'])) == dict:
+            sur_name_read['store_ans'] = safe_eval(sur_name_read['store_ans'])
             for key,val in sur_name_read['store_ans'].items():
                 for field in vals:
                     if field.split('_')[0] == val['question_id']:
@@ -998,7 +1019,7 @@ class survey_question_wiz(osv.osv_memory):
 
         return survey_question_wiz_id
 
-    def action_new_question(self,cr, uid, ids, context=None):
+    def action_new_question(self, cr, uid, ids, context=None):
         """
         New survey.Question form.
         """
@@ -1040,7 +1061,7 @@ class survey_question_wiz(osv.osv_memory):
             'context': context
         }
 
-    def action_edit_page(self,cr, uid, ids, context=None):
+    def action_edit_page(self, cr, uid, ids, context=None):
         """
         Edit survey.page.
         """
@@ -1062,7 +1083,7 @@ class survey_question_wiz(osv.osv_memory):
             'context': context
         }
 
-    def action_delete_page(self,cr, uid, ids, context=None):
+    def action_delete_page(self, cr, uid, ids, context=None):
         """
         Delete survey.page.
         """
@@ -1073,6 +1094,10 @@ class survey_question_wiz(osv.osv_memory):
                 context.pop(key)
 
         self.pool.get('survey.page').unlink(cr, uid, [context.get('page_id',False)])
+        for survey in self.pool.get('survey').browse(cr, uid, [context.get('survey_id',False)], context=context):
+            if not survey.page_ids:
+                return {'type':'ir.actions.act_window_close'}
+
         search_id = self.pool.get('ir.ui.view').search(cr,uid,[('model','=','survey.question.wiz'),\
                                             ('name','=','Survey Search')])
         surv_name_wiz = self.pool.get('survey.name.wiz')
@@ -1088,7 +1113,7 @@ class survey_question_wiz(osv.osv_memory):
             'context': context
         }
 
-    def action_edit_question(self,cr, uid, ids, context=None):
+    def action_edit_question(self, cr, uid, ids, context=None):
         """
         Edit survey.question.
         """
@@ -1110,7 +1135,7 @@ class survey_question_wiz(osv.osv_memory):
             'context': context
         }
 
-    def action_delete_question(self,cr, uid, ids, context=None):
+    def action_delete_question(self, cr, uid, ids, context=None):
         """
         Delete survey.question.
         """
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index 3460ad41bb3..b02f9fb2be5 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -5,8 +5,8 @@
         <!--
             Survey Question Wizard
          -->
-        <record id="view_survey_question_message" model="ir.ui.view">
-            <field name="name">Answer Survey</field>
+        <record id="view_survey_question_message" model="ir.ui.view">           
+            <field name="name">Survey Answer</field>
             <field name="model">survey.question.wiz</field>
             <field name="arch" type="xml">
                 <form string="Your Messages"  version="7.0">
@@ -26,7 +26,6 @@
         </record>
 
         <record id="action_view_survey_question_message" model="ir.actions.act_window">
-            <field name="name">Answer Survey</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">survey.question.wiz</field>
             <field name="view_type">form</field>
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index da439959ec5..936e3363bde 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -50,9 +50,6 @@ class survey_send_invitation(osv.osv_memory):
     _defaults = {
         'send_mail': lambda *a: 1,
         'send_mail_existing': lambda *a: 1,
-        'mail_subject': lambda *a: "Invitation",
-        'mail_subject_existing': lambda *a: "Invitation",
-        'mail_from': lambda *a: tools.config['email_from']
     }
 
     def genpasswd(self):
@@ -67,14 +64,23 @@ class survey_send_invitation(osv.osv_memory):
         msg = ""
         name = ""
         for sur in survey_obj.browse(cr, uid, context.get('active_ids', []), context=context):
-            name += "\t --> " + sur.title + "\n"
+            name += "\n --> " + sur.title + "\n"
             if sur.state != 'open':
                 msg +=  sur.title + "\n"
+            data['mail_subject'] = _("Invitation for %s") % (sur.title)
+            data['mail_subject_existing'] = _("Invitation for %s") % (sur.title)
+            data['mail_from'] = sur.responsible_id.email
         if msg:
-            raise osv.except_osv(_('Warning!'), _('%sSurvey is not in open state') % msg)
-        data['mail'] = '''Hello %(name)s, \n\n We are inviting you for following survey. \
-                    \n  ''' + name + '''\n Your login ID: %(login)s, Your password: %(passwd)s
-                    \n link :- http://'''+ str(socket.gethostname()) + ''':8080 \n\n Thanks,'''
+            raise osv.except_osv(_('Warning!'), _('The following surveys are not in open state: %s') % msg)
+        data['mail'] = _('''
+Hello %%(name)s, \n\n
+Would you please spent some of your time to fill-in our survey: \n%s\n
+You can access this survey with the following parameters:
+ URL: %s
+ Your login ID: %%(login)s\n
+ Your password: %%(passwd)s\n
+\n\n
+Thanks,''') % (name, self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url', default='http://localhost:8069', context=context))
         return data
 
     def create_report(self, cr, uid, res_ids, report_name=False, file_name=False):
@@ -116,7 +122,6 @@ class survey_send_invitation(osv.osv_memory):
         existing = ""
         created = ""
         error = ""
-        user_exists = False
         new_user = []
         attachments = {}
         current_sur = survey_ref.browse(cr, uid, context.get('active_id'), context=context)
@@ -150,8 +155,14 @@ class survey_send_invitation(osv.osv_memory):
                 mail = record['mail']%{'login':partner.email, 'passwd':user.password, \
                                             'name' : partner.name}
                 if record['send_mail_existing']:
-                    mail_message.schedule_with_attach(cr, uid, record['mail_from'], [partner.email] , \
-                                     record['mail_subject_existing'] , mail, context=context)
+                    vals = {
+                        'state': 'outgoing',
+                        'subject': record['mail_subject_existing'],
+                        'body_html': '<pre>%s</pre>' % mail,
+                        'email_to': partner.email,
+                        'email_from': record['mail_from'],
+                    }
+                    self.pool.get('mail.mail').create(cr, uid, vals, context=context)
                     existing+= "- %s (Login: %s,  Password: %s)\n" % (user.name, partner.email, \
                                                                       user.password)
                 continue
@@ -160,8 +171,19 @@ class survey_send_invitation(osv.osv_memory):
             out+= partner.email + ',' + passwd + '\n'
             mail= record['mail'] % {'login' : partner.email, 'passwd' : passwd, 'name' : partner.name}
             if record['send_mail']:
-                ans = mail_message.schedule_with_attach(cr, uid, record['mail_from'], [partner.email], \
-                                       record['mail_subject'], mail, attachments=attachments, context=context)
+                vals = {
+                        'state': 'outgoing',
+                        'subject': record['mail_subject'],
+                        'body_html': '<pre>%s</pre>' % mail,
+                        'email_to': partner.email,
+                        'email_from': record['mail_from'],
+                }
+                if attachments:
+                    vals['attachment_ids'] = [(0,0,{'name': a_name,
+                                                    'datas_fname': a_name,
+                                                    'datas': str(a_content).encode('base64')})
+                                                    for a_name, a_content in attachments.items()]
+                ans = self.pool.get('mail.mail').create(cr, uid, vals, context=context)
                 if ans:
                     res_data = {'name': partner.name or _('Unknown'),
                                 'login': partner.email,
diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml
index 340cb58b5cf..a611973d772 100644
--- a/addons/survey/wizard/survey_send_invitation.xml
+++ b/addons/survey/wizard/survey_send_invitation.xml
@@ -16,7 +16,7 @@
                     </header>
                     <group col="4">
                         <separator string="Select Partner" colspan="4"/>
-                        <field name="partner_ids" nolabel="1"  colspan="4"/>
+                        <field name="partner_ids" nolabel="1" colspan="4" widget="many2many_tags"/>
                         <separator colspan="4" string="Send Mail for New User"/>
                         <field name="send_mail" nolabel="1"/>
                         <field name="mail_subject" colspan="3"/>
diff --git a/addons/warning/__openerp__.py b/addons/warning/__openerp__.py
index 2391020d20c..e44b9624251 100644
--- a/addons/warning/__openerp__.py
+++ b/addons/warning/__openerp__.py
@@ -33,11 +33,10 @@ picking and invoice. The message is triggered by the form's onchange event.
     """,
     'author': 'OpenERP SA',
     'depends': ['base', 'sale', 'purchase'],
-    'update_xml': ['warning_view.xml'],
-    'demo_xml': [],
+    'data': ['warning_view.xml'],
+    'demo': [],
     'installable': True,
     'auto_install': False,
-    'certificate': '0080334018749',
     'images': ['images/customers_warnings.jpeg','images/sale_order_warning.jpeg'],
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/warning/i18n/ar.po b/addons/warning/i18n/ar.po
index 3cd194d6c7c..fd67a050cad 100644
--- a/addons/warning/i18n/ar.po
+++ b/addons/warning/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
@@ -31,12 +31,12 @@ msgstr "خط امر الشراء"
 #. module: warning
 #: field:product.product,sale_line_warn_msg:0
 msgid "Message for Sale Order Line"
-msgstr ""
+msgstr "رسالة لخط طلب البيع"
 
 #. module: warning
 #: field:product.product,purchase_line_warn_msg:0
 msgid "Message for Purchase Order Line"
-msgstr ""
+msgstr "رسالة لخط طلب المشتروات"
 
 #. module: warning
 #: model:ir.model,name:warning.model_stock_picking
@@ -46,12 +46,12 @@ msgstr "قائمة الالتقاط"
 #. module: warning
 #: field:product.product,sale_line_warn:0
 msgid "Sale Order Line"
-msgstr ""
+msgstr "خط طلب البيع"
 
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Purchasing this Product"
-msgstr ""
+msgstr "تحذير عند شراء هذا المنتج"
 
 #. module: warning
 #: model:ir.model,name:warning.model_product_product
@@ -82,7 +82,7 @@ msgstr "تحذير"
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "Blocking Message"
-msgstr ""
+msgstr "رسالة حظر"
 
 #. module: warning
 #: field:res.partner,picking_warn:0
@@ -92,7 +92,7 @@ msgstr ""
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Invoice"
-msgstr ""
+msgstr "تحذير على الفاتورة"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -102,7 +102,7 @@ msgstr ""
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "No Message"
-msgstr ""
+msgstr "لا توجد رسالة"
 
 #. module: warning
 #: model:ir.model,name:warning.model_account_invoice
@@ -113,7 +113,7 @@ msgstr "فاتورة"
 #. module: warning
 #: view:product.product:0
 msgid "Warning when Selling this Product"
-msgstr ""
+msgstr "تحذير عند بيع هذا المنتج"
 
 #. module: warning
 #: field:res.partner,sale_warn:0
@@ -123,7 +123,7 @@ msgstr "طلب بيع"
 #. module: warning
 #: field:res.partner,invoice_warn_msg:0
 msgid "Message for Invoice"
-msgstr ""
+msgstr "رسالة للفاتورة"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order
@@ -139,7 +139,7 @@ msgstr ""
 #. module: warning
 #: field:res.partner,sale_warn_msg:0
 msgid "Message for Sale Order"
-msgstr ""
+msgstr "رسالة لطلب البيع"
 
 #. module: warning
 #: field:res.partner,purchase_warn_msg:0
@@ -206,12 +206,12 @@ msgstr ""
 #: code:addons/warning/warning.py:247
 #, python-format
 msgid "Warning for %s"
-msgstr ""
+msgstr "تحذير لـ %s"
 
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Sale Order"
-msgstr ""
+msgstr "تحذير على طلب البيع"
 
 #. module: warning
 #: constraint:product.product:0
diff --git a/addons/warning/i18n/bg.po b/addons/warning/i18n/bg.po
index c39818d6c92..13f24d1621c 100644
--- a/addons/warning/i18n/bg.po
+++ b/addons/warning/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/bs.po b/addons/warning/i18n/bs.po
index 6f1063c82cd..c256cb110d4 100644
--- a/addons/warning/i18n/bs.po
+++ b/addons/warning/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/ca.po b/addons/warning/i18n/ca.po
index 26b65284152..56da20d4591 100644
--- a/addons/warning/i18n/ca.po
+++ b/addons/warning/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/cs.po b/addons/warning/i18n/cs.po
index 1c829186bfb..6dd4c4b3a77 100644
--- a/addons/warning/i18n/cs.po
+++ b/addons/warning/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/da.po b/addons/warning/i18n/da.po
index d4ad0768d81..29e1afc2cfa 100644
--- a/addons/warning/i18n/da.po
+++ b/addons/warning/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/de.po b/addons/warning/i18n/de.po
index b8eb618de5c..80d83a9ee39 100644
--- a/addons/warning/i18n/de.po
+++ b/addons/warning/i18n/de.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/el.po b/addons/warning/i18n/el.po
index d8d70ed3051..e2ca2f993a3 100644
--- a/addons/warning/i18n/el.po
+++ b/addons/warning/i18n/el.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/es.po b/addons/warning/i18n/es.po
index 64c2e7f7670..b140aec6248 100644
--- a/addons/warning/i18n/es.po
+++ b/addons/warning/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/es_AR.po b/addons/warning/i18n/es_AR.po
index 6b884050565..cdb0136239d 100644
--- a/addons/warning/i18n/es_AR.po
+++ b/addons/warning/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/es_CR.po b/addons/warning/i18n/es_CR.po
index a44bf835ce2..0d80ac0c4ad 100644
--- a/addons/warning/i18n/es_CR.po
+++ b/addons/warning/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: \n"
 
 #. module: warning
diff --git a/addons/warning/i18n/et.po b/addons/warning/i18n/et.po
index 9d2498d49a8..53d1c13d437 100644
--- a/addons/warning/i18n/et.po
+++ b/addons/warning/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/fi.po b/addons/warning/i18n/fi.po
index f9b1be28f98..e0fb16409f0 100644
--- a/addons/warning/i18n/fi.po
+++ b/addons/warning/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/fr.po b/addons/warning/i18n/fr.po
index ddfc569c25d..9119bdfd394 100644
--- a/addons/warning/i18n/fr.po
+++ b/addons/warning/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/gl.po b/addons/warning/i18n/gl.po
index 3cdfb0448b2..7be329f95b9 100644
--- a/addons/warning/i18n/gl.po
+++ b/addons/warning/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/hr.po b/addons/warning/i18n/hr.po
index e9faa3935cf..b8befb00155 100644
--- a/addons/warning/i18n/hr.po
+++ b/addons/warning/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: hr\n"
 
 #. module: warning
diff --git a/addons/warning/i18n/hu.po b/addons/warning/i18n/hu.po
index 39594cbb441..39b40c291e5 100644
--- a/addons/warning/i18n/hu.po
+++ b/addons/warning/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/id.po b/addons/warning/i18n/id.po
index f1c93212b62..6d348bb747d 100644
--- a/addons/warning/i18n/id.po
+++ b/addons/warning/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/it.po b/addons/warning/i18n/it.po
index 4e24deee656..5a2915f7791 100644
--- a/addons/warning/i18n/it.po
+++ b/addons/warning/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/ja.po b/addons/warning/i18n/ja.po
index 01d57ef1c33..e61df191244 100644
--- a/addons/warning/i18n/ja.po
+++ b/addons/warning/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/ko.po b/addons/warning/i18n/ko.po
index c64853eaae8..4b41f12acc9 100644
--- a/addons/warning/i18n/ko.po
+++ b/addons/warning/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/lt.po b/addons/warning/i18n/lt.po
index 0fdb8805b10..2e2c728d821 100644
--- a/addons/warning/i18n/lt.po
+++ b/addons/warning/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/mn.po b/addons/warning/i18n/mn.po
index 8ee259dcfd1..4b8d25d2e14 100644
--- a/addons/warning/i18n/mn.po
+++ b/addons/warning/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/nb.po b/addons/warning/i18n/nb.po
index 3a1ca3cc299..bc8856c3479 100644
--- a/addons/warning/i18n/nb.po
+++ b/addons/warning/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/nl.po b/addons/warning/i18n/nl.po
index 9e8ad6a88bf..0da2444c7ea 100644
--- a/addons/warning/i18n/nl.po
+++ b/addons/warning/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:37+0000\n"
 "PO-Revision-Date: 2012-02-09 07:01+0000\n"
-"Last-Translator: Erwin <Unknown>\n"
+"Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
@@ -195,7 +195,7 @@ msgstr "Ongeldige BBA gestructureerde communicatie!"
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
-msgstr "Waarschuwing op de pickinglijst"
+msgstr "Waarschuwing op de verzamellijst"
 
 #. module: warning
 #: view:res.partner:0
diff --git a/addons/warning/i18n/nl_BE.po b/addons/warning/i18n/nl_BE.po
index 9f6e0f2db73..5c8b3c06ba6 100644
--- a/addons/warning/i18n/nl_BE.po
+++ b/addons/warning/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/pl.po b/addons/warning/i18n/pl.po
index bef2ae64477..36a2ff455ba 100644
--- a/addons/warning/i18n/pl.po
+++ b/addons/warning/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/pt.po b/addons/warning/i18n/pt.po
index bde4f7af791..fc51fa0a546 100644
--- a/addons/warning/i18n/pt.po
+++ b/addons/warning/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/pt_BR.po b/addons/warning/i18n/pt_BR.po
index a3d38486249..59b40ce3ec9 100644
--- a/addons/warning/i18n/pt_BR.po
+++ b/addons/warning/i18n/pt_BR.po
@@ -13,14 +13,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr "Referência ordem deve ser única por empresa!"
+msgstr "A Referência do Pedido deve ser única por Empresa!"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -62,7 +62,7 @@ msgstr "Produto"
 #: view:product.product:0
 #: view:res.partner:0
 msgid "Warnings"
-msgstr "Alertas"
+msgstr "Avisos"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -72,7 +72,7 @@ msgstr "Alertas"
 #: selection:res.partner,purchase_warn:0
 #: selection:res.partner,sale_warn:0
 msgid "Warning"
-msgstr "Alerta"
+msgstr "Aviso"
 
 #. module: warning
 #: selection:product.product,purchase_line_warn:0
@@ -160,9 +160,9 @@ msgid ""
 "Selecting \"Blocking Message\" will throw an exception with the message and "
 "block the flow. The Message has to be written in the next field."
 msgstr ""
-"Selecionando a opção de \"aviso\" irá notificar o usuário com a mensagem, "
+"Selecionando a opção de \"Aviso\" irá notificar o usuário com a mensagem, "
 "marcar \"Bloqueio de Mensagem\" irá lançar uma exceção com a mensagem e "
-"bloquear o fluxo. A mensagem tem de ser escrita no campo próximo."
+"bloquear o fluxo. A mensagem tem de ser escrita no campo a seguir."
 
 #. module: warning
 #: code:addons/warning/warning.py:67
@@ -178,12 +178,12 @@ msgstr "Alerta para %s !"
 #. module: warning
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr "Número da fatura deve ser único por empresa!"
+msgstr "O número da fatura deve ser único por Empresa!"
 
 #. module: warning
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr "Erro! Você não pode criar recursiva a membros associados."
+msgstr "Erro! Você não pode criar membros associados recursivamente."
 
 #. module: warning
 #: constraint:account.invoice:0
@@ -193,7 +193,7 @@ msgstr "Inválida Comunicação BBA Estruturado!"
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
-msgstr "Aviso sobre a separação"
+msgstr "Aviso sobre a Separação"
 
 #. module: warning
 #: view:res.partner:0
@@ -209,7 +209,7 @@ msgstr "Aviso no Pedido de Compra"
 #: code:addons/warning/warning.py:247
 #, python-format
 msgid "Warning for %s"
-msgstr "Atenção para %s"
+msgstr "Aviso para %s"
 
 #. module: warning
 #: view:res.partner:0
diff --git a/addons/warning/i18n/ro.po b/addons/warning/i18n/ro.po
index 4752bbcb7fd..5ecf0656402 100644
--- a/addons/warning/i18n/ro.po
+++ b/addons/warning/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/ru.po b/addons/warning/i18n/ru.po
index 0f61603de42..5c703534547 100644
--- a/addons/warning/i18n/ru.po
+++ b/addons/warning/i18n/ru.po
@@ -13,14 +13,14 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
 #: sql_constraint:sale.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка на заказ должны быть уникальной для каждой компании!"
 
 #. module: warning
 #: model:ir.model,name:warning.model_purchase_order_line
@@ -134,7 +134,7 @@ msgstr "Заказ на закупку"
 #. module: warning
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Ссылка должна быть уникальна для каждой компании!"
 
 #. module: warning
 #: field:res.partner,sale_warn_msg:0
@@ -178,17 +178,17 @@ msgstr "Сигнал о %s !"
 #. module: warning
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Номер счета должен быть уникальным для компании!"
 
 #. module: warning
 #: constraint:res.partner:0
 msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивные ссылки на участников."
 
 #. module: warning
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Неверна структурная связь BBA!"
 
 #. module: warning
 #: view:res.partner:0
diff --git a/addons/warning/i18n/sl.po b/addons/warning/i18n/sl.po
index 54fc88b9ef5..5c51edb9de0 100644
--- a/addons/warning/i18n/sl.po
+++ b/addons/warning/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/sq.po b/addons/warning/i18n/sq.po
index b859c7ce59d..5ad2c781436 100644
--- a/addons/warning/i18n/sq.po
+++ b/addons/warning/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/sr.po b/addons/warning/i18n/sr.po
index 85b62faea7d..2671e06cd50 100644
--- a/addons/warning/i18n/sr.po
+++ b/addons/warning/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/sr@latin.po b/addons/warning/i18n/sr@latin.po
index d59a729a241..71ad1637c5d 100644
--- a/addons/warning/i18n/sr@latin.po
+++ b/addons/warning/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/sv.po b/addons/warning/i18n/sv.po
index 2bdb10155e5..5a58997ec0a 100644
--- a/addons/warning/i18n/sv.po
+++ b/addons/warning/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:23+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/tlh.po b/addons/warning/i18n/tlh.po
index 2781a73eb87..3eb41e33b50 100644
--- a/addons/warning/i18n/tlh.po
+++ b/addons/warning/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/tr.po b/addons/warning/i18n/tr.po
index c1edd440a56..191c15f726f 100644
--- a/addons/warning/i18n/tr.po
+++ b/addons/warning/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/uk.po b/addons/warning/i18n/uk.po
index 004478c61b7..4066cf85eae 100644
--- a/addons/warning/i18n/uk.po
+++ b/addons/warning/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/vi.po b/addons/warning/i18n/vi.po
index 03ddb4c7e18..3cc98b80bd3 100644
--- a/addons/warning/i18n/vi.po
+++ b/addons/warning/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/zh_CN.po b/addons/warning/i18n/zh_CN.po
index 96353f59b75..32213a66d0e 100644
--- a/addons/warning/i18n/zh_CN.po
+++ b/addons/warning/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/i18n/zh_TW.po b/addons/warning/i18n/zh_TW.po
index 534702508e7..f4e048b5280 100644
--- a/addons/warning/i18n/zh_TW.po
+++ b/addons/warning/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:24+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:21+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: warning
 #: sql_constraint:purchase.order:0
diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index f04f97d6f8a..9e6c2a0a2b8 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -174,6 +174,60 @@ class stock_picking(osv.osv):
 
 stock_picking()
 
+# FIXME:(class stock_picking_in and stock_picking_out) this is a temporary workaround because of a framework bug (ref: lp:996816). 
+# It should be removed as soon as the bug is fixed
+class stock_picking_in(osv.osv):
+    _inherit = 'stock.picking.in'
+
+    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+        if not partner_id:
+            return {}
+        partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+        warning = {}
+        title = False
+        message = False
+        if partner.picking_warn != 'no-message':
+            if partner.picking_warn == 'block':
+                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.picking_warn_msg)
+            title = _("Warning for %s") % partner.name
+            message = partner.picking_warn_msg
+            warning = {
+                'title': title,
+                'message': message
+            }
+        result =  super(stock_picking_in, self).onchange_partner_in(cr, uid, context, partner_id)
+        if result.get('warning',False):
+            warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
+            warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
+
+        return {'value': result.get('value',{}), 'warning':warning}
+
+class stock_picking_out(osv.osv):
+    _inherit = 'stock.picking.out'
+
+    def onchange_partner_in(self, cr, uid, context, partner_id=None):
+        if not partner_id:
+            return {}
+        partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+        warning = {}
+        title = False
+        message = False
+        if partner.picking_warn != 'no-message':
+            if partner.picking_warn == 'block':
+                raise osv.except_osv(_('Alert for %s !') % (partner.name), partner.picking_warn_msg)
+            title = _("Warning for %s") % partner.name
+            message = partner.picking_warn_msg
+            warning = {
+                'title': title,
+                'message': message
+            }
+        result =  super(stock_picking_out, self).onchange_partner_in(cr, uid, context, partner_id)
+        if result.get('warning',False):
+            warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']
+            warning['message'] = message and message + ' ' + result['warning']['message'] or result['warning']['message']
+
+        return {'value': result.get('value',{}), 'warning':warning}
+
 class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
@@ -228,8 +282,8 @@ sale_order_line()
 
 class purchase_order_line(osv.osv):
     _inherit = 'purchase.order.line'
-    def product_id_change(self,cr, uid, ids, pricelist, product, qty, uom,
-            partner_id, date_order=False, fiscal_position=False, date_planned=False,
+    def onchange_product_id(self,cr, uid, ids, pricelist, product, qty, uom,
+            partner_id, date_order=False, fiscal_position_id=False, date_planned=False,
             name=False, price_unit=False, notes=False, context=None):
         warning = {}
         if not product:
@@ -247,8 +301,8 @@ class purchase_order_line(osv.osv):
             warning['title'] = title
             warning['message'] = message
 
-        result =  super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom,
-            partner_id, date_order, fiscal_position)
+        result =  super(purchase_order_line, self).onchange_product_id(cr, uid, ids, pricelist, product, qty, uom,
+            partner_id, date_order, fiscal_position_id)
 
         if result.get('warning',False):
             warning['title'] = title and title +' & '+result['warning']['title'] or result['warning']['title']
diff --git a/addons/warning/warning_view.xml b/addons/warning/warning_view.xml
index 3f3bbefdbab..d88dc8101a5 100644
--- a/addons/warning/warning_view.xml
+++ b/addons/warning/warning_view.xml
@@ -41,20 +41,18 @@
         <record id="product_warning_form_view" model="ir.ui.view">
             <field name="name">product.warning.form.inherit</field>
             <field name="model">product.product</field>
-            <field name="inherit_id" ref="product.product_normal_form_view"/>
+            <field name="inherit_id" ref="procurement.product_template_form_view_procurement"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
                     <page string="Warnings">
-                        <group colspan="2" col="2">
-                            <separator string="Warning when Selling this Product" colspan="4"/>
-                            <field name="sale_line_warn"  nolabel="1" />
-                            <field name="sale_line_warn_msg" colspan="3" nolabel="1" 
+                        <group string="Warning when Selling this Product">
+                            <field name="sale_line_warn"/>
+                            <field name="sale_line_warn_msg"
                                     attrs="{'required':[('sale_line_warn','!=','no-message')],'readonly':[('sale_line_warn','=','no-message')]}"/>
                         </group>
-                        <group colspan="2" col="2">
-                            <separator string="Warning when Purchasing this Product" colspan="4" />
-                            <field name="purchase_line_warn"  nolabel="1" />
-                            <field name="purchase_line_warn_msg" colspan="3" nolabel="1" 
+                        <group string="Warning when Purchasing this Product">
+                            <field name="purchase_line_warn"/>
+                            <field name="purchase_line_warn_msg"
                                     attrs="{'required':[('purchase_line_warn','!=','no-message')],'readonly':[('purchase_line_warn','=','no-message')]}"/>
                         </group>
                     </page>
diff --git a/addons/web_analytics/__init__.py b/addons/web_analytics/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/analytic_contract_project/__openerp__.py b/addons/web_analytics/__openerp__.py
similarity index 64%
rename from addons/analytic_contract_project/__openerp__.py
rename to addons/web_analytics/__openerp__.py
index 4e4f621663c..66ec959ac7b 100644
--- a/addons/analytic_contract_project/__openerp__.py
+++ b/addons/web_analytics/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#    Copyright (C) 2010-2012 OpenERP s.a. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -18,21 +18,23 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 {
-    "name" : "Contract on Project",
-    "version": "1.1",
-    "author" : "OpenERP SA",
-    'category': 'Hidden',
-    "website" : "http://www.openerp.com",
-    "depends" : ["project", "account_analytic_analysis"],
-    "description": """
-Add "Contract Data" in project view.
+    'name': 'Google Analytics',
+    'version': '1.0',
+    'category': 'Tools',
+    'complexity': "easy",
+    'description': """
+Google Analytics.
+==============================
+
+Collects web application usage with Google Analytics.
     """,
-    "init_xml" : [],
-    "update_xml": ["analytic_contract_project_view.xml"],
-    'demo_xml': [],
+    'author': 'OpenERP SA',
+    'website': 'http://openerp.com',
+    'depends': ['web', 'auth_signup'],
+    'data': [],
     'installable': True,
-    'auto_install': True,
+    'active': False,
+    'js': ['static/src/js/web_analytics.js'],
 }
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+
diff --git a/addons/web_analytics/static/src/img/icon.png b/addons/web_analytics/static/src/img/icon.png
new file mode 100644
index 00000000000..320c1f3ec34
Binary files /dev/null and b/addons/web_analytics/static/src/img/icon.png differ
diff --git a/addons/web_analytics/static/src/js/web_analytics.js b/addons/web_analytics/static/src/js/web_analytics.js
new file mode 100644
index 00000000000..0de8e9e087b
--- /dev/null
+++ b/addons/web_analytics/static/src/js/web_analytics.js
@@ -0,0 +1,134 @@
+
+var _gaq = _gaq || [];  // asynchronous stack used by google analytics
+
+openerp.web_analytics = function(instance) {
+
+    /** The Google Analytics Module inserts the Google Analytics JS Snippet
+     *  at the top of the page, and sends to google an url each time the
+     *  openerp url is changed.
+     *  The pushes of the urls is made by triggering the 'state_pushed' event in the
+     *  web_client.do_push_state() method which is responsible of changing the openerp current url
+     */
+
+    // Google Analytics Code snippet
+    (function() {
+        var ga   = document.createElement('script');
+        ga.type  = 'text/javascript';
+        ga.async = true
+        ga.src   = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(ga,s);
+    })();
+
+    if (instance.webclient) {
+
+        // Set the account and domain to start tracking
+        _gaq.push(['_setAccount', 'UA-7333765-1']);    // vta@openerp.com localhost
+        _gaq.push(['_setDomainName', 'none']);  // Change for the real domain
+
+        // Track user types
+        if (instance.session.uid !== 1) {
+            if ((/\.demo.openerp.com/).test(instance.session.server)) {
+                _gaq.push(['_setCustomVar', 1, 'User Type', 'Demo User', 1]);
+            } else {
+                _gaq.push(['_setCustomVar', 1, 'User Type', 'Normal User', 1]);
+            }
+        } else {
+            _gaq.push(['_setCustomVar', 1, 'User Type', 'Admin User', 1]);
+        }
+
+        // Track object usage 
+        _gaq.push(['_setCustomVar', 2, 'Object', 'no_model', 3]);
+        // Tack view usage
+        _gaq.push(['_setCustomVar', 3, 'View Type', 'default', 3]);
+
+        _gaq.push(['_trackPageview']);
+
+        var self = this;
+        instance.webclient.on('state_pushed', self, function(state) {
+            // Track only pages corresponding to a 'normal' view of OpenERP, views
+            // related to client actions are tracked by the action manager
+            if (state.model && state.view_type) {                
+                // Track object usage 
+                _gaq.push(['_setCustomVar', 2, 'Object', state.model, 3]);
+                // Tack view usage
+                _gaq.push(['_setCustomVar', 3, 'View Type', state.view_type, 3]);
+                // Track the page
+                var url = instance.web_analytics.parseUrl({'model': state.model, 'view_type': state.view_type});
+                _gaq.push(['_trackPageview', url]);
+            }
+        });
+    }
+
+    // Track the events related with the creation and the  modification of records
+    instance.web.FormView = instance.web.FormView.extend({
+        init: function(parent, dataset, view_id, options) {
+            this._super.apply(this, arguments);
+            var self = this;
+            this.on('record_created', self, function(r) {
+                var url = instance.web_analytics.parseUrl({'model': this.model, 'view_type': 'form'});
+                _gaq.push(['_trackEvent', this.model, 'on_button_create_save', url]);
+            });
+            this.on('record_saved', self, function(r) {
+                var url = instance.web_analytics.parseUrl({'model': this.model, 'view_type': 'form'});
+                _gaq.push(['_trackEvent', this.model, 'on_button_edit_save', url]);
+            });
+        }
+    });
+
+    // Track client actions
+    instance.web.ActionManager.include({
+        ir_actions_client: function (action, options) {
+            var url = instance.web_analytics.parseUrl({'action': action.tag});
+            _gaq.push(['_trackPageview', url]);
+            return this._super.apply(this, arguments);
+        },
+    });
+
+    // Track button events
+    instance.web.View.include({
+        do_execute_action: function(action_data, dataset, record_id, on_closed) {
+            console.log(action_data);
+            var category = this.model || dataset.model || '';
+            var action;
+            if (action_data.name && _.isNaN(action_data.name-0)) {
+                action = action_data.name;                
+            } else {
+                action = action_data.string || action_data.special || '';
+            }
+            var label = instance.web_analytics.parseUrl({'model': category, 'view_type': this.view_type});
+            _gaq.push(['_trackEvent', category, action, label]);
+            return this._super.apply(this, arguments);
+        },
+    });
+
+    // Track error events
+    instance.web.CrashManager = instance.web.CrashManager.extend({
+        show_error: function(error) {
+            var hash = window.location.hash;
+            var params = $.deparam(hash.substr(hash.indexOf('#')+1));
+            var options = {};
+            if (params.model && params.view_type) {
+                options = {'model': params.model, 'view_type': params.view_type};
+            } else {
+                options = {'action': params.action};
+            }
+            var label = instance.web_analytics.parseUrl(options);
+            if (error.code) {
+                _gaq.push(['_trackEvent', error.message, error.data.fault_code, label, ,true]);
+            } else {
+                _gaq.push(['_trackEvent', error.type, error.data.debug, label, ,true]);
+            }
+            this._super.apply(this, arguments);
+        },
+    });
+
+    instance.web_analytics.parseUrl = function(options) {
+        var url = '';
+        _.each(options, function(value, key) {
+            url += '/' + key + '=' + value;
+        });
+        return url;
+    };
+
+};
\ No newline at end of file
diff --git a/addons/web_linkedin/__openerp__.py b/addons/web_linkedin/__openerp__.py
index 122453d6096..6ce78cfca47 100644
--- a/addons/web_linkedin/__openerp__.py
+++ b/addons/web_linkedin/__openerp__.py
@@ -1,26 +1,19 @@
 {
-    "name" : "LinkedIn Integration",
+    'name' : 'LinkedIn Integration',
     'version': '0.1',
     'category': 'Tools',
-    'complexity': "easy",
-    "description":
+    'complexity': 'easy',
+    'description':
         """
-        OpenERP Web LinkedIn module.
-        This module provides the Integration of the LinkedIn with OpenERP.
+OpenERP Web LinkedIn module.
+============================
+This module provides the Integration of the LinkedIn with OpenERP.
         """,
-    'update_xml': [
-        'web_linkedin_view.xml',
-    ],
-    "depends" : ["base"],
-    "js": [
-        "static/src/js/*.js"
-        ],
-    "css": [
-        "static/src/css/*.css"
-        ],
-    'qweb': [
-        "static/src/xml/*.xml"
-        ],
+    'data': ['web_linkedin_view.xml'],
+    'depends' : ['crm'],
+    'js': ['static/src/js/*.js'],
+    'css': ['static/src/css/*.css'],
+    'qweb': ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/web_linkedin/static/src/js/linkedin.js b/addons/web_linkedin/static/src/js/linkedin.js
index 575a4cf9a85..d6237e48d51 100644
--- a/addons/web_linkedin/static/src/js/linkedin.js
+++ b/addons/web_linkedin/static/src/js/linkedin.js
@@ -14,13 +14,13 @@ openerp.web_linkedin = function(instance) {
         },
         test_linkedin: function() {
             var self = this;
-            return this.test_api_key().pipe(function() {
+            return this.test_api_key().then(function() {
                 if (self.linkedin_added)
                     return self.linkedin_def.promise();
                 var tag = document.createElement('script');
                 tag.type = 'text/javascript';
                 tag.src = "http://platform.linkedin.com/in.js";
-                tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true';
+                tag.innerHTML = 'api_key : ' + self.api_key + '\nauthorize : true\nscope: r_network r_contactinfo';
                 document.getElementsByTagName('head')[0].appendChild(tag);
                 self.linkedin_added = true;
                 $(tag).load(function() {
@@ -37,7 +37,7 @@ openerp.web_linkedin = function(instance) {
             if (this.api_key) {
                 return $.when();
             }
-            return new instance.web.Model("ir.config_parameter").call("get_param", ["web.linkedin.apikey"]).pipe(function(a) {
+            return new instance.web.Model("ir.config_parameter").call("get_param", ["web.linkedin.apikey"]).then(function(a) {
                 if (!!a) {
                     self.api_key = a;
                     return true;
@@ -69,30 +69,26 @@ openerp.web_linkedin = function(instance) {
         },
         search_linkedin: function() {
             var self = this;
-            this.display_dm.add(instance.web_linkedin.tester.test_linkedin()).then(function() {
+            this.display_dm.add(instance.web_linkedin.tester.test_linkedin()).done(function() {
                 var pop = new instance.web_linkedin.LinkedinPopup(self, self.get("value"));
                 pop.open();
                 pop.on("selected", this, function(entity) {
                     self.selected_entity(entity);
                 });
-            }, _.bind(this.linkedin_disabled, this));
+            }).fail(_.bind(this.linkedin_disabled, this));
         },
         linkedin_disabled: function() {
-            if (instance.session.uid !== 1) {
-                instance.web.dialog($(QWeb.render("LinkedIn.DisabledWarning")), {
-                    title: _t("LinkedIn is not enabled"),
-                    buttons: [
-                        {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
-                    ]
-                });
-            } else {
-                new instance.web_linkedin.KeyWizard(this).open();
-            }
+            instance.web.dialog($(QWeb.render("LinkedIn.DisabledWarning")), {
+                title: _t("LinkedIn is not enabled"),
+                buttons: [
+                    {text: _t("Ok"), click: function() { $(this).dialog("close"); }}
+                ]
+            });
         },
         selected_entity: function(entity) {
             var self = this;
-            this.create_on_change(entity).then(function(to_change) {
-                self.view.on_processed_onchange({value:to_change});
+            this.create_on_change(entity).done(function(to_change) {
+                self.view.set_values(to_change);
             });
         },
         create_on_change: function(entity) {
@@ -105,13 +101,13 @@ openerp.web_linkedin = function(instance) {
                 to_change.image = false;
                 if (entity.logoUrl) {
                     defs.push(self.rpc('/web_linkedin/binary/url2binary',
-                                       {'url': entity.logoUrl}).pipe(function(data){
+                                       {'url': entity.logoUrl}).then(function(data){
                         to_change.image = data;
                     }));
                 }
                 to_change.website = entity.websiteUrl;
                 to_change.phone = false;
-                _.each(entity.locations.values || [], function(el) {
+                _.each((entity.locations || {}).values || [], function(el) {
                     to_change.phone = el.contactInfo.phone1;
                 });
                 var children_def = $.Deferred();
@@ -121,8 +117,10 @@ openerp.web_linkedin = function(instance) {
                         "count": 25,
                     }).result(function(result) {
                         children_def.resolve(result);
+                    }).error(function() {
+                        children_def.reject();
                     });
-                defs.push(children_def.pipe(function(result) {
+                defs.push(children_def.then(function(result) {
                     result = _.reject(result.people.values || [], function(el) {
                         return ! el.formattedName;
                     });
@@ -130,10 +128,12 @@ openerp.web_linkedin = function(instance) {
                         el.__type = "people";
                         return self.create_on_change(el);
                     });
-                    return $.when.apply($, defs).pipe(function() {
+                    return $.when.apply($, defs).then(function() {
                         var p_to_change = _.toArray(arguments);
                         to_change.child_ids = p_to_change;
                     });
+                }, function() {
+                    return $.when();
                 }));
                 /* TODO
                 to_change.linkedinUrl = _.str.sprintf("http://www.linkedin.com/company/%d", entity.id);
@@ -144,7 +144,7 @@ openerp.web_linkedin = function(instance) {
                 to_change.image = false;
                 if (entity.pictureUrl) {
                     defs.push(self.rpc('/web_linkedin/binary/url2binary',
-                                       {'url': entity.pictureUrl}).pipe(function(data){
+                                       {'url': entity.pictureUrl}).then(function(data){
                         to_change.image = data;
                     }));
                 }
@@ -163,7 +163,7 @@ openerp.web_linkedin = function(instance) {
                 to_change.linkedinUrl = entity.publicProfileUrl;
                 */
             }
-            return $.when.apply($, defs).pipe(function() {
+            return $.when.apply($, defs).then(function() {
                 return to_change;
             });
         },
@@ -186,7 +186,7 @@ openerp.web_linkedin = function(instance) {
             this._super();
             var self = this;
             this.on("authentified", this, this.authentified);
-            instance.web_linkedin.tester.test_authentication().then(function() {
+            instance.web_linkedin.tester.test_authentication().done(function() {
                 self.trigger("authentified");
             });
         },
@@ -200,7 +200,7 @@ openerp.web_linkedin = function(instance) {
                     encodeURI(this.text), this.limit)).result(function (result) {
                 cdef.resolve(result);
             });
-            var def = cdef.pipe(function(companies) {
+            var def = cdef.then(function(companies) {
                 var lst = companies.companies.values || [];
                 lst = _.first(lst, self.limit);
                 lst = _.map(lst, function(el) {
@@ -214,7 +214,7 @@ openerp.web_linkedin = function(instance) {
                 params({"keywords": this.text, "count": this.limit}).result(function(result) {
                 pdef.resolve(result);
             });
-            var def2 = pdef.pipe(function(people) {
+            var def2 = pdef.then(function(people) {
                 var plst = people.people.values || [];
                 plst = _.first(plst, self.limit);
                 plst = _.map(plst, function(el) {
@@ -237,8 +237,8 @@ openerp.web_linkedin = function(instance) {
                     $row.appendTo($elem);
                 }
                 pc.appendTo($row);
-                pc.$element.css("display", "table-cell");
-                pc.$element.css("width", "20%");
+                pc.$el.css("display", "table-cell");
+                pc.$el.css("width", "20%");
                 pc.on("selected", self, function(data) {
                     self.trigger("selected", data);
                     self.destroy();
@@ -259,7 +259,7 @@ openerp.web_linkedin = function(instance) {
         },
         start: function() {
             var self = this;
-            this.$element.click(function() {
+            this.$el.click(function() {
                 self.trigger("selected", self.data);
             });
             if (this.data.__type === "company") {
@@ -272,24 +272,5 @@ openerp.web_linkedin = function(instance) {
             }
         },
     });
-    
-    
-    instance.web_linkedin.KeyWizard = instance.web.Dialog.extend({
-        template: "LinkedIn.KeyWizard", 
-        init: function(parent, text) {
-            this._super(parent, {title:_t("LinkedIn API Key")});
-            this.api_domain = window.location.origin;
-        },
-        start: function() {
-            this._super();
-            var self = this;
-            this.$("button").click(function() {
-                var value = self.$("input").val();
-                return new instance.web.Model("ir.config_parameter").call("set_param", ["web.linkedin.apikey", value]).pipe(function() {
-                    self.destroy();
-                });
-            });
-        },
-    });
 };
 // vim:et fdc=0 fdl=0:
diff --git a/addons/web_linkedin/static/src/xml/linkedin.xml b/addons/web_linkedin/static/src/xml/linkedin.xml
index 30a7abb3443..4956fd7df5a 100644
--- a/addons/web_linkedin/static/src/xml/linkedin.xml
+++ b/addons/web_linkedin/static/src/xml/linkedin.xml
@@ -30,30 +30,7 @@
     <t t-name="LinkedIn.DisabledWarning">
         <div>
             LinkedIn access was not enabled on this server.
-            Please ask your administrator to activate it.
-        </div>
-    </t>
-    <t t-name="LinkedIn.KeyWizard">
-        <div>
-            <p>
-                To use the LinkedIn module with this database, an API Key is required. Please follow this procedure:
-            </p>
-            <ul>
-                <li>Go to this URL: 
-                    <a href="https://www.linkedin.com/secure/developer" target="_blank">https://www.linkedin.com/secure/developer</a>.
-                </li>
-                <li>Log into LinkedIn.</li>
-                <li>Add a new application and fill the form:
-                    <ul>
-                        <li>JavaScript API Domain: <t t-esc="widget.api_domain"/></li>
-                        <li>The programming tool is Javascript</li>
-                    </ul>
-                </li>
-                <li>Copy the API key here:
-                    <input type="text"/>
-                    <button>Apply</button>
-                </li>
-            </ul>
+            Please ask your administrator to configure it in Settings > Configuration > Sales > Social Network Integration.
         </div>
     </t>
 </templates>
\ No newline at end of file
diff --git a/addons/web_linkedin/web_linkedin.py b/addons/web_linkedin/web_linkedin.py
index 5c8ffc57cb5..71865c7fcc1 100644
--- a/addons/web_linkedin/web_linkedin.py
+++ b/addons/web_linkedin/web_linkedin.py
@@ -19,21 +19,33 @@
 #
 ##############################################################################
 
-try:
-    # embedded
-    import openerp.addons.web.common.http as openerpweb
-except ImportError:
-    # standalone
-    import web.common.http as openerpweb
-
 import base64
 import urllib2
 
-class Binary(openerpweb.Controller):
+import openerp
+from osv import osv, fields
+
+class Binary(openerp.addons.web.http.Controller):
     _cp_path = "/web_linkedin/binary"
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def url2binary(self, req,url):
         bfile = urllib2.urlopen(url)
         return base64.b64encode(bfile.read())
+    
+class web_linkedin_settings(osv.osv_memory):
+    _inherit = 'sale.config.settings'
+    _columns = {
+        'api_key': fields.char(string="API Key", size=50),
+        'server_domain': fields.char(size=100),
+    }
+    
+    def get_default_linkedin(self, cr, uid, fields, context=None):
+        key = self.pool.get("ir.config_parameter").get_param(cr, uid, "web.linkedin.apikey") or ""
+        dom = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url')
+        return {'api_key': key, 'server_domain': dom,}
+    
+    def set_linkedin(self, cr, uid, ids, context=None):
+        key = self.browse(cr, uid, ids[0], context)["api_key"] or ""
+        self.pool.get("ir.config_parameter").set_param(cr, uid, "web.linkedin.apikey", key)
 
diff --git a/addons/web_linkedin/web_linkedin_view.xml b/addons/web_linkedin/web_linkedin_view.xml
index b636722e2c7..e2d4903a2d6 100644
--- a/addons/web_linkedin/web_linkedin_view.xml
+++ b/addons/web_linkedin/web_linkedin_view.xml
@@ -4,18 +4,43 @@
         <record id="view_linkedin_partner_form" model="ir.ui.view">
             <field name="name">res.partner.linkedin.inherit</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="name" position="replace">
                     <field name="name" default_focus="1" nolabel="1" widget="linkedin" />
                 </field>
-                <!--<field name="title" position="before">
-                    <field name="linkedin_id" invisible="1"/>
-                    <field name="profile_id" invisible="1"/>
-                    <field name="twitter_id" invisible="1"/>
-                </field>-->
             </field>
        </record>
+        
+        <record id="view_linkedin_config_settings" model="ir.ui.view">
+            <field name="name">linkedin_settings</field>
+            <field name="model">sale.config.settings</field>
+            <field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
+            <field name="arch" type="xml">
+                <div name="LinkedIn" position="inside">
+                    <div attrs="{'invisible':[('module_web_linkedin','=',False)]}">
+                        <p>
+                            To use the LinkedIn module with this database, an API Key is required. Please follow this procedure:
+                        </p>
+                        <ul>
+                            <li>Go to this URL: 
+                                <a href="https://www.linkedin.com/secure/developer" target="_blank">https://www.linkedin.com/secure/developer</a>.
+                            </li>
+                            <li>Log into LinkedIn.</li>
+                            <li>Add a new application and fill the form:
+                                <ul>
+                                    <li>JavaScript API Domain: <field name="server_domain" readonly="1" style="width:0"/></li>
+                                    <li>The programming tool is Javascript</li>
+                                </ul>
+                            </li>
+                            <li>Copy the <strong>API key</strong> here:
+                                <field name="api_key" attrs="{'required':[('module_web_linkedin','=',True)]}" class="oe_inline"/>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </field>
+        </record>
+        
    </data>
 </openerp>
diff --git a/addons/web_livechat/i18n/ar.po b/addons/web_livechat/i18n/ar.po
index bd84afda409..1654d3d36fe 100644
--- a/addons/web_livechat/i18n/ar.po
+++ b/addons/web_livechat/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/bg.po b/addons/web_livechat/i18n/bg.po
index 285b640b8c5..66b19668e7d 100644
--- a/addons/web_livechat/i18n/bg.po
+++ b/addons/web_livechat/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/ca.po b/addons/web_livechat/i18n/ca.po
index 4a83e2026e2..b1169295908 100644
--- a/addons/web_livechat/i18n/ca.po
+++ b/addons/web_livechat/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/cs.po b/addons/web_livechat/i18n/cs.po
index 98a7bbb22a1..976106e0e94 100644
--- a/addons/web_livechat/i18n/cs.po
+++ b/addons/web_livechat/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/da.po b/addons/web_livechat/i18n/da.po
index 8c9acc8dd1d..b82ca26b903 100644
--- a/addons/web_livechat/i18n/da.po
+++ b/addons/web_livechat/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/de.po b/addons/web_livechat/i18n/de.po
index 2214d149f7b..fe35ae2f0ff 100644
--- a/addons/web_livechat/i18n/de.po
+++ b/addons/web_livechat/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/es.po b/addons/web_livechat/i18n/es.po
index 2d6f5240b16..68cd0325a0f 100644
--- a/addons/web_livechat/i18n/es.po
+++ b/addons/web_livechat/i18n/es.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/es_CR.po b/addons/web_livechat/i18n/es_CR.po
index 253dab7f524..75953d9c6d2 100644
--- a/addons/web_livechat/i18n/es_CR.po
+++ b/addons/web_livechat/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 "Language: es\n"
 
 #. module: web_livechat
diff --git a/addons/web_livechat/i18n/fi.po b/addons/web_livechat/i18n/fi.po
index ded1ab3317e..397951798cf 100644
--- a/addons/web_livechat/i18n/fi.po
+++ b/addons/web_livechat/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/fr.po b/addons/web_livechat/i18n/fr.po
index e900a6fe511..c152dfa00ba 100644
--- a/addons/web_livechat/i18n/fr.po
+++ b/addons/web_livechat/i18n/fr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/gl.po b/addons/web_livechat/i18n/gl.po
index 736da165d3c..6c5799f150a 100644
--- a/addons/web_livechat/i18n/gl.po
+++ b/addons/web_livechat/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/hr.po b/addons/web_livechat/i18n/hr.po
index ed2d11a9788..ace5c877c4a 100644
--- a/addons/web_livechat/i18n/hr.po
+++ b/addons/web_livechat/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/it.po b/addons/web_livechat/i18n/it.po
index 6755ccff6ba..b1be45a92f5 100644
--- a/addons/web_livechat/i18n/it.po
+++ b/addons/web_livechat/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/ja.po b/addons/web_livechat/i18n/ja.po
index a931d6ef838..fc32c756176 100644
--- a/addons/web_livechat/i18n/ja.po
+++ b/addons/web_livechat/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/mn.po b/addons/web_livechat/i18n/mn.po
index e92377fa24b..c0d90bea95f 100644
--- a/addons/web_livechat/i18n/mn.po
+++ b/addons/web_livechat/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/nl.po b/addons/web_livechat/i18n/nl.po
index d934db4842f..535b88e68a1 100644
--- a/addons/web_livechat/i18n/nl.po
+++ b/addons/web_livechat/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/oc.po b/addons/web_livechat/i18n/oc.po
index 140f86729b6..d1853dfc03f 100644
--- a/addons/web_livechat/i18n/oc.po
+++ b/addons/web_livechat/i18n/oc.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/pt.po b/addons/web_livechat/i18n/pt.po
index c0a87b4192a..c68de32c639 100644
--- a/addons/web_livechat/i18n/pt.po
+++ b/addons/web_livechat/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/pt_BR.po b/addons/web_livechat/i18n/pt_BR.po
index 19b0032e513..2d8fe1ea7ad 100644
--- a/addons/web_livechat/i18n/pt_BR.po
+++ b/addons/web_livechat/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/ro.po b/addons/web_livechat/i18n/ro.po
index b5db6402738..e77a17c51da 100644
--- a/addons/web_livechat/i18n/ro.po
+++ b/addons/web_livechat/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/ru.po b/addons/web_livechat/i18n/ru.po
index 4c372861896..984c1c66af8 100644
--- a/addons/web_livechat/i18n/ru.po
+++ b/addons/web_livechat/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/sk.po b/addons/web_livechat/i18n/sk.po
index 3cd16219187..e199d6d8724 100644
--- a/addons/web_livechat/i18n/sk.po
+++ b/addons/web_livechat/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/sl.po b/addons/web_livechat/i18n/sl.po
index e5b6ca91da7..0b5dabb7a0b 100644
--- a/addons/web_livechat/i18n/sl.po
+++ b/addons/web_livechat/i18n/sl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/sr@latin.po b/addons/web_livechat/i18n/sr@latin.po
index edff7cf8f96..885d1cb0166 100644
--- a/addons/web_livechat/i18n/sr@latin.po
+++ b/addons/web_livechat/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/sv.po b/addons/web_livechat/i18n/sv.po
index e5e79c978be..59411043d08 100644
--- a/addons/web_livechat/i18n/sv.po
+++ b/addons/web_livechat/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/tr.po b/addons/web_livechat/i18n/tr.po
index b6db67ba9f2..4994fb4c424 100644
--- a/addons/web_livechat/i18n/tr.po
+++ b/addons/web_livechat/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_livechat/i18n/zh_CN.po b/addons/web_livechat/i18n/zh_CN.po
index fd2677ef7d3..42b99002b00 100644
--- a/addons/web_livechat/i18n/zh_CN.po
+++ b/addons/web_livechat/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-07 05:37+0000\n"
-"X-Generator: Launchpad (build 15745)\n"
+"X-Launchpad-Export-Date: 2012-10-30 05:34+0000\n"
+"X-Generator: Launchpad (build 16206)\n"
 
 #. module: web_livechat
 #: sql_constraint:publisher_warranty.contract:0
diff --git a/addons/web_shortcuts/__openerp__.py b/addons/web_shortcuts/__openerp__.py
index b587215a501..aa23ed2bfa6 100644
--- a/addons/web_shortcuts/__openerp__.py
+++ b/addons/web_shortcuts/__openerp__.py
@@ -27,21 +27,16 @@ Enable shortcuts feature in the web client.
 ===========================================
 
 Add a Shortcut icon in the systray in order to access the user's shortcuts (if any).
+
 Add a Shortcut icon besides the views title in order to add/remove a shortcut.
     """,
     'author': 'OpenERP SA',
     'website': 'http://openerp.com',
     'depends': ['base'],
-    'update_xml': [],
-    'js' : [
-        'static/src/js/web_shortcuts.js',
-    ],
-    'css' : [
-        'static/src/css/web_shortcuts.css',
-    ],
-    'qweb' : [
-        "static/src/xml/*.xml",
-    ],
+    'data': [],
+    'js' : ['static/src/js/web_shortcuts.js'],
+    'css' : ['static/src/css/web_shortcuts.css'],
+    'qweb' : ['static/src/xml/*.xml'],
     'installable': True,
     'auto_install': False,
 }
diff --git a/addons/web_shortcuts/controllers/main.py b/addons/web_shortcuts/controllers/main.py
index 23f4bbd3fbe..2cdf232ac0f 100644
--- a/addons/web_shortcuts/controllers/main.py
+++ b/addons/web_shortcuts/controllers/main.py
@@ -1,16 +1,9 @@
-try:
-    # embedded
-    import openerp.addons.web.common.http as openerpweb
-    import openerp.addons.web.controllers.main as webmain
-except ImportError:
-    # standalone
-    import web.common.http as openerpweb
-    import web.controllers.main as webmain
+import openerp
 
-class Shortcuts(openerpweb.Controller):
+class Shortcuts(openerp.addons.web.http.Controller):
     _cp_path = "/web/shortcuts"
 
-    @openerpweb.jsonrequest
+    @openerp.addons.web.http.jsonrequest
     def list(self, req):
         return req.session.model('ir.ui.view_sc').get_sc(
             req.session._uid, "ir.ui.menu", req.session.eval_context(req.context))
diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js
index a2d0fe43596..918feb4634d 100644
--- a/addons/web_shortcuts/static/src/js/web_shortcuts.js
+++ b/addons/web_shortcuts/static/src/js/web_shortcuts.js
@@ -39,14 +39,14 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
         var self = this;
         this._super();
         this.trigger('load');
-        this.$element.on('click', '.oe_systray_shortcuts_items a', function() {
+        this.$el.on('click', '.oe_systray_shortcuts_items a', function() {
             self.trigger('click', $(this));
         });
     },
     load: function() {
         var self = this;
-        this.$element.find('.oe_systray_shortcuts_items').empty();
-        return this.rpc('/web/shortcuts/list', {}, function(shortcuts) {
+        this.$el.find('.oe_systray_shortcuts_items').empty();
+        return this.rpc('/web/shortcuts/list', {}).done(function(shortcuts) {
             _.each(shortcuts, function(sc) {
                 self.trigger('display', sc);
             });
@@ -54,23 +54,19 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
     },
     add: function (sc) {
         var self = this;
-        this.dataset.create(sc, function (out) {
-            self.trigger('display', {
-                name : sc.name,
-                id : out.result,
-                res_id : sc.res_id
-            });
+        this.dataset.create(sc).then(function(out){
+            self.trigger('load');
         });
     },
     display: function(sc) {
         var self = this;
-        this.$element.find('.oe_systray_shortcuts_items').append();
+        this.$el.find('.oe_systray_shortcuts_items').append();
         var $sc = $(QWeb.render('Systray.Shortcuts.Item', {'shortcut': sc}));
-        $sc.appendTo(self.$element.find('.oe_systray_shortcuts_items'));
+        $sc.appendTo(self.$el.find('.oe_systray_shortcuts_items'));
     },
     remove: function (menu_id) {
         var menu_id = this.session.active_id;
-        var $shortcut = this.$element.find('.oe_systray_shortcuts_items li a[data-id=' + menu_id + ']');
+        var $shortcut = this.$el.find('.oe_systray_shortcuts_items li a[data-id=' + menu_id + ']');
         var shortcut_id = $shortcut.data('shortcut-id');
         $shortcut.remove();
         this.dataset.unlink([shortcut_id]);
@@ -80,15 +76,15 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
             id = $link.data('id');
         self.session.active_id = id;
         // TODO: Use do_action({menu_id: id, type: 'ir.actions.menu'})
-        self.rpc('/web/menu/action', {'menu_id': id}, function(ir_menu_data) {
+        self.rpc('/web/menu/action', {'menu_id': id}).done(function(ir_menu_data) {
             if (ir_menu_data.action.length){
-                instance.webclient.user_menu.on_action({action_id: ir_menu_data.action[0][2].id});
+                instance.webclient.on_menu_action({action_id: ir_menu_data.action[0][2].id});
             }
         });
-        this.$element.find('.oe_systray_shortcuts').trigger('mouseout');
+        this.$el.find('.oe_systray_shortcuts').trigger('mouseout');
     },
     has: function(menu_id) {
-        return !!this.$element.find('a[data-id=' + menu_id + ']').length;
+        return !!this.$el.find('a[data-id=' + menu_id + ']').length;
     }
 });
 
@@ -96,21 +92,21 @@ instance.web.UserMenu.include({
     do_update: function() {
         var self = this;
         this._super.apply(this, arguments);
-        this.update_promise.then(function() {
+        this.update_promise.done(function() {
             if (self.shortcuts) {
                 self.shortcuts.trigger('load');
             } else {
                 self.shortcuts = new instance.web_shortcuts.Shortcuts(self);
-                self.shortcuts.appendTo(instance.webclient.$element.find('.oe_systray'));
+                self.shortcuts.appendTo(instance.webclient.$el.find('.oe_systray'));
             }
         });
     },
 });
 
 instance.web.ViewManagerAction.include({
-    on_mode_switch: function (view_type, no_store) {
+    switch_mode: function (view_type, no_store) {
         var self = this;
-        this._super.apply(this, arguments).then(function() {
+        this._super.apply(this, arguments).done(function() {
             self.shortcut_check(self.views[view_type]);
         });
     },
@@ -119,7 +115,7 @@ instance.web.ViewManagerAction.include({
         var shortcuts_menu = instance.webclient.user_menu.shortcuts;
         var grandparent = this.getParent() && this.getParent().getParent();
         // display shortcuts if on the first view for the action
-        var $shortcut_toggle = this.$element.find('.oe_shortcuts_toggle');
+        var $shortcut_toggle = this.$el.find('.oe_shortcuts_toggle');
         if (!this.action.name ||
                 !(view.view_type === this.views_src[0].view_type
                     && view.view_id === this.views_src[0].view_id)) {